diff --git a/.changes/2.10.10.json b/.changes/2.10.10.json
new file mode 100644
index 000000000000..30862214c3a5
--- /dev/null
+++ b/.changes/2.10.10.json
@@ -0,0 +1,36 @@
+{
+    "version": "2.10.10",
+    "date": "2019-11-06",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "AWS Budgets",
+            "description": "Documentation updates for budgets to track Savings Plans utilization and coverage"
+        },
+        {
+            "type": "feature",
+            "category": "AWS Cost Explorer Service",
+            "description": "This launch provides customers with access to Savings Plans management APIs."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Elastic File System",
+            "description": "EFS customers can select a lifecycle policy that automatically moves files that have not been accessed for 7 days into the EFS Infrequent Access (EFS IA) storage class. EFS IA provides price/performance that is cost-optimized for files that are not accessed every day."
+        },
+        {
+            "type": "feature",
+            "category": "AWS Signer",
+            "description": "This release adds support for tagging code-signing profiles in AWS Signer."
+        },
+        {
+            "type": "feature",
+            "category": "AWS Savings Plans",
+            "description": "This is the first release of Savings Plans, a new flexible pricing model that offers low prices on Amazon EC2 and AWS Fargate usage."
+        },
+        {
+            "type": "feature",
+            "category": "AWS CodeBuild",
+            "description": "Add support for Build Number, Secrets Manager and Exported Environment Variables."
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.changes/2.10.11.json b/.changes/2.10.11.json
new file mode 100644
index 000000000000..d00a706f5582
--- /dev/null
+++ b/.changes/2.10.11.json
@@ -0,0 +1,16 @@
+{
+    "version": "2.10.11",
+    "date": "2019-11-06",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "AWS SDK for Java v2",
+            "description": "Added the web identity credentials provider to the default credential chain"
+        },
+        {
+            "type": "feature",
+            "category": "AWS Savings Plans",
+            "description": "This is the first release of Savings Plans, a new flexible pricing model that offers low prices on Amazon EC2 and AWS Fargate usage."
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.changes/2.10.12.json b/.changes/2.10.12.json
new file mode 100644
index 000000000000..f5493dd810b4
--- /dev/null
+++ b/.changes/2.10.12.json
@@ -0,0 +1,36 @@
+{
+    "version": "2.10.12",
+    "date": "2019-11-07",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "Amazon Simple Systems Manager (SSM)",
+            "description": "AWS Systems Manager Session Manager target length increased to 400."
+        },
+        {
+            "type": "feature",
+            "category": "Netty NIO HTTP Client",
+            "description": "Switch from setting the absolute URI in HTTP requests with no `Host` header to setting the absolute request path and query paramters and a `Host` header."
+        },
+        {
+            "type": "feature",
+            "category": "AWS SSO OIDC",
+            "description": "This is an initial release of AWS Single Sign-On OAuth device code authorization service."
+        },
+        {
+            "type": "feature",
+            "category": "AWS S3",
+            "description": "Added support for presignPutObject in S3Presigner."
+        },
+        {
+            "type": "feature",
+            "category": "AWS Single Sign-On",
+            "description": "This is an initial release of AWS Single Sign-On (SSO) end-user access. This release adds support for accessing AWS accounts assigned in AWS SSO using short term credentials."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Comprehend",
+            "description": "This release adds new languages (ar, hi, ko, ja, zh, zh-TW) for Amazon Comprehend's DetectSentiment, DetectEntities, DetectKeyPhrases, BatchDetectSentiment, BatchDetectEntities and BatchDetectKeyPhrases APIs"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.changes/2.10.13.json b/.changes/2.10.13.json
new file mode 100644
index 000000000000..962c28a5fa65
--- /dev/null
+++ b/.changes/2.10.13.json
@@ -0,0 +1,16 @@
+{
+    "version": "2.10.13",
+    "date": "2019-11-08",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "Amazon EC2 Container Registry",
+            "description": "This release contains ticket fixes for Amazon ECR."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Cognito Identity",
+            "description": "This release adds support for disabling classic flow."
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.changes/2.10.14.json b/.changes/2.10.14.json
new file mode 100644
index 000000000000..ff057f494e75
--- /dev/null
+++ b/.changes/2.10.14.json
@@ -0,0 +1,21 @@
+{
+    "version": "2.10.14",
+    "date": "2019-11-11",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "Amazon Polly",
+            "description": "Add `PollyPresigner` which enables support for presigning `SynthesizeSpeech` requests."
+        },
+        {
+            "type": "feature",
+            "category": "AWS CloudFormation",
+            "description": "The Resource Import feature enables customers to import existing AWS resources into new or existing CloudFormation Stacks."
+        },
+        {
+            "type": "feature",
+            "category": "AWS Cost Explorer Service",
+            "description": "This launch provides customers with access to GetCostAndUsageWithResources API."
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.changes/2.10.15.json b/.changes/2.10.15.json
new file mode 100644
index 000000000000..d4b7f744262d
--- /dev/null
+++ b/.changes/2.10.15.json
@@ -0,0 +1,31 @@
+{
+    "version": "2.10.15",
+    "date": "2019-11-12",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "AWS Marketplace Catalog Service",
+            "description": "This is the first release for the AWS Marketplace Catalog service which allows you to list, describe and manage change requests on your published entities on AWS Marketplace."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon DynamoDB",
+            "description": "Amazon DynamoDB enables you to restore your data to a new DynamoDB table using a point-in-time or on-demand backup. You now can modify the settings on the new restored table. Specifically, you can exclude some or all of the local and global secondary indexes from being created with the restored table. In addition, you can change the billing mode and provisioned capacity settings."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Transcribe Service",
+            "description": "With this release, Amazon Transcribe now supports transcriptions from audio sources in Welsh English (en-WL), Scottish English(en-AB), Irish English(en-IE), Farsi(fa-IR), Tamil(ta-IN), Indonesian(id-ID), Portuguese (pt-PT), Dutch(nl-NL)."
+        },
+        {
+            "type": "feature",
+            "category": "Elastic Load Balancing",
+            "description": "You can configure your Application Load Balancer to either drop invalid header fields or forward them to targets."
+        },
+        {
+            "type": "feature",
+            "category": "AWS CodePipeline",
+            "description": "AWS CodePipeline now supports the use of variables in action configuration."
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.changes/2.10.16.json b/.changes/2.10.16.json
new file mode 100644
index 000000000000..3214de451465
--- /dev/null
+++ b/.changes/2.10.16.json
@@ -0,0 +1,31 @@
+{
+    "version": "2.10.16",
+    "date": "2019-11-13",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "Amazon Simple Email Service",
+            "description": "This is the first release of version 2 of the Amazon SES API. You can use this API to configure your Amazon SES account, and to send email. This API extends the functionality that exists in the previous version of the Amazon SES API."
+        },
+        {
+            "type": "feature",
+            "category": "AWS IoT",
+            "description": "This release adds the custom fields definition support in the index definition for AWS IoT Fleet Indexing Service. Custom fields can be used as an aggregation field to run aggregations with both existing GetStatistics API and newly added GetCardinality, GetPercentiles APIs. GetStatistics will return all statistics (min/max/sum/avg/count...) with this release. For more information, please refer to our latest documentation: https://docs.aws.amazon.com/iot/latest/developerguide/iot-indexing.html"
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Data Lifecycle Manager",
+            "description": "You can now add tags to a lifecycle policy in Data Lifecycle Manager (DLM). Tags allow you to categorize your policies in different ways, such as by department, purpose or owner. You can also enable resource level permissions based on tags to set access control on ability to modify or delete a tagged policy."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon CloudSearch",
+            "description": "Amazon CloudSearch domains let you require that all traffic to the domain arrive over HTTPS. This security feature helps you block clients that send unencrypted requests to the domain."
+        },
+        {
+            "type": "feature",
+            "category": "AWS Data Exchange",
+            "description": "Introducing AWS Data Exchange, a service that makes it easy for AWS customers to securely create, manage, access, and exchange data sets in the cloud."
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.changes/2.10.17.json b/.changes/2.10.17.json
new file mode 100644
index 000000000000..d8b7ac2d3058
--- /dev/null
+++ b/.changes/2.10.17.json
@@ -0,0 +1,31 @@
+{
+    "version": "2.10.17",
+    "date": "2019-11-14",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "AWSMarketplace Metering",
+            "description": "Added CustomerNotEntitledException in MeterUsage API for Container use case."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Connect Service",
+            "description": "This release enhances the existing user management APIs and adds 3 new APIs - TagResource, UntagResource, and ListTagsForResource to support tagging Amazon Connect users, which facilitates more granular access controls for Amazon Connect users within an Amazon Connect instance. You can learn more about the new APIs here: https://docs.aws.amazon.com/connect/latest/APIReference/Welcome.html."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Simple Systems Manager (SSM)",
+            "description": "Updates support for adding attachments to Systems Manager Automation documents"
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Cognito Identity Provider",
+            "description": "This release adds a new setting at user pool client to prevent user existence related errors during authentication, confirmation, and password recovery related operations. This release also adds support to enable or disable specific authentication flows for a user pool client."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Personalize",
+            "description": "Amazon Personalize: Adds ability to get batch recommendations by creating a batch inference job."
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.changes/2.10.18.json b/.changes/2.10.18.json
new file mode 100644
index 000000000000..a8ea4c81e4af
--- /dev/null
+++ b/.changes/2.10.18.json
@@ -0,0 +1,66 @@
+{
+    "version": "2.10.18",
+    "date": "2019-11-15",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "Amazon CloudWatch Logs",
+            "description": "Documentation updates for logs"
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Simple Systems Manager (SSM)",
+            "description": "This release updates AWS Systems Manager Parameter Store documentation for the enhanced search capability."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Elastic Compute Cloud",
+            "description": "You can now add tags while copying snapshots. Previously, a user had to first copy the snapshot and then add tags to the copied snapshot manually. Moving forward, you can specify the list of tags you wish to be applied to the copied snapshot as a parameter on the Copy Snapshot API."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Chime",
+            "description": "This release adds support for Chime Room Management APIs"
+        },
+        {
+            "type": "feature",
+            "category": "AWS SDK for Java v2",
+            "description": "When SdkException or one of its children is created without a 'message', inherit the message from the exception 'cause' (if any). This should reduce the chance of an exception being raised by the SDK with a null message."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Cognito Identity Provider",
+            "description": "This release adds a new option in the User Pool to allow specifying sender's name in the emails sent by Amazon Cognito. This release also adds support to add SES Configuration Set to the emails sent by Amazon Cognito."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon WorkSpaces",
+            "description": "Added APIs to register your directories with Amazon WorkSpaces and to modify directory details."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Elastic MapReduce",
+            "description": "Access to the cluster ARN makes it easier for you to author resource-level permissions policies in AWS Identity and Access Management. To simplify the process of obtaining the cluster ARN, Amazon EMR has added a new field containing the cluster ARN to all API responses that include the cluster ID."
+        },
+        {
+            "type": "feature",
+            "category": "AWS Elemental MediaConvert",
+            "description": "AWS Elemental MediaConvert SDK has added support for DolbyVision encoding, and SCTE35 & ESAM insertion to DASH ISO EMSG."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Elastic Kubernetes Service",
+            "description": "Introducing Amazon EKS managed node groups, a new feature that lets you easily provision worker nodes for Amazon EKS clusters and keep them up to date using the Amazon EKS management console, CLI, and APIs."
+        },
+        {
+            "type": "feature",
+            "category": "Elastic Load Balancing",
+            "description": "Documentation-only change to the default value of the routing.http.drop_invalid_header_fields.enabled attribute."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon GuardDuty",
+            "description": "This release includes new operations related to findings export, including: CreatePublishingDestination, UpdatePublishingDestination, DescribePublishingDestination, DeletePublishingDestination and ListPublishingDestinations."
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.changes/2.10.19.json b/.changes/2.10.19.json
new file mode 100644
index 000000000000..fc378ff7f1c8
--- /dev/null
+++ b/.changes/2.10.19.json
@@ -0,0 +1,51 @@
+{
+    "version": "2.10.19",
+    "date": "2019-11-18",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "AWS Cost Explorer Service",
+            "description": "add EstimatedOnDemandCostWithCurrentCommitment to GetSavingsPlansPurchaseRecommendationRequest API"
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Simple Systems Manager (SSM)",
+            "description": "The release contains new API and API changes for AWS Systems Manager Explorer product."
+        },
+        {
+            "type": "bugfix",
+            "category": "Netty NIO HTTP Client",
+            "description": "Update default connectionMaxIdleTimeout of NettyNioAsyncClient to 5 seconds"
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Simple Storage Service",
+            "description": "Added support for S3 Replication for existing objects. This release allows customers who have requested and been granted access to replicate existing S3 objects across buckets."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon SageMaker Runtime",
+            "description": "Amazon SageMaker Runtime now supports a new TargetModel header to invoke a specific model hosted on multi model endpoints."
+        },
+        {
+            "type": "feature",
+            "category": "AWS CloudFormation",
+            "description": "This release introduces APIs for the CloudFormation Registry, a new service to submit and discover resource providers with which you can manage third-party resources natively in CloudFormation."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Relational Database Service",
+            "description": "Documentation updates for rds"
+        },
+        {
+            "type": "feature",
+            "category": "Amazon SageMaker Service",
+            "description": "Amazon SageMaker now supports multi-model endpoints to host multiple models on an endpoint using a single inference container."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Pinpoint",
+            "description": "This release of the Amazon Pinpoint API introduces support for using and managing message templates for messages that are sent through the voice channel. It also introduces support for specifying default values for message variables in message templates."
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.changes/2.10.20.json b/.changes/2.10.20.json
new file mode 100644
index 000000000000..ed52fb1dd804
--- /dev/null
+++ b/.changes/2.10.20.json
@@ -0,0 +1,51 @@
+{
+    "version": "2.10.20",
+    "date": "2019-11-19",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "AWS Identity and Access Management",
+            "description": "IAM reports the timestamp when a role's credentials were last used to make an AWS request. This helps you identify unused roles and remove them confidently from your AWS accounts."
+        },
+        {
+            "type": "feature",
+            "category": "AWS IoT",
+            "description": "As part of this release, we are extending the capability of AWS IoT Rules Engine to send messages directly to customer's own web services/applications. Customers can now create topic rules with HTTP actions to route messages from IoT Core directly to URL's that they own. Ownership is proved by creating and confirming topic rule destinations."
+        },
+        {
+            "type": "feature",
+            "category": "AWS CodeBuild",
+            "description": "Add support for ARM and GPU-enhanced build environments and a new SSD-backed Linux compute type with additional CPU and memory in CodeBuild"
+        },
+        {
+            "type": "feature",
+            "category": "AWS Config",
+            "description": "AWSConfig launches support for conformance packs. A conformance pack is a new resource type that allows you to package a collection of Config rules and remediation actions into a single entity. You can create and deploy conformance packs into your account or across all accounts in your organization"
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Elastic Compute Cloud",
+            "description": "This release adds support for RunInstances to specify the metadata options for new instances; adds a new API, ModifyInstanceMetadataOptions, which lets you modify the metadata options for a running or stopped instance; and adds support for CreateCustomerGateway to specify a device name."
+        },
+        {
+            "type": "feature",
+            "category": "Elastic Load Balancing",
+            "description": "This release allows forward actions on Application Load Balancers to route requests to multiple target groups, based on the weight you specify for each target group."
+        },
+        {
+            "type": "feature",
+            "category": "AWS Lambda",
+            "description": "This release provides three new runtimes to support Node.js 12 (initially 12.13.0), Python 3.8 and Java 11."
+        },
+        {
+            "type": "feature",
+            "category": "AWS CloudFormation",
+            "description": "This release of AWS CloudFormation StackSets enables users to detect drift on a stack set and the stack instances that belong to that stack set."
+        },
+        {
+            "type": "feature",
+            "category": "Auto Scaling",
+            "description": "Amazon EC2 Auto Scaling now supports Instance Weighting and Max Instance Lifetime. Instance Weighting allows specifying the capacity units for each instance type included in the MixedInstancesPolicy and how they would contribute to your application's performance. Max Instance Lifetime allows specifying the maximum length of time that an instance can be in service. If any instances are approaching this limit, Amazon EC2 Auto Scaling gradually replaces them."
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.changes/2.10.21.json b/.changes/2.10.21.json
new file mode 100644
index 000000000000..440fa04fbf2f
--- /dev/null
+++ b/.changes/2.10.21.json
@@ -0,0 +1,91 @@
+{
+    "version": "2.10.21",
+    "date": "2019-11-20",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "AWS Application Discovery Service",
+            "description": "New exception type for use with Migration Hub home region"
+        },
+        {
+            "type": "feature",
+            "category": "Amazon EC2 Container Service",
+            "description": "Added support for CPU and memory task-level overrides on the RunTask and StartTask APIs. Added location information to Tasks."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Data Lifecycle Manager",
+            "description": "DLM now supports Fast Snapshot Restore. You can enable Fast Restore on snapshots created by DLM, provide the AZs and the number of snapshots to be enabled with this capability."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Kinesis Firehose",
+            "description": "With this release, Amazon Kinesis Data Firehose allows server side encryption with customer managed CMKs. Customer managed CMKs ( \"Customer Master Keys\") are AWS Key Management Service (KMS) keys that are fully managed by the customer. With customer managed CMKs, customers can establish and maintain their key policies, IAM policies, rotating policies and add tags. For more information about AWS KMS and CMKs, please refer to: https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html. Please refer to the following link to create CMKs: https://docs.aws.amazon.com/kms/latest/developerguide/importing-keys-create-cmk.html"
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Simple Storage Service",
+            "description": "This release introduces support for Amazon S3 Replication Time Control, a new feature of S3 Replication that provides a predictable replication time backed by a Service Level Agreement. S3 Replication Time Control helps customers meet compliance or business requirements for data replication, and provides visibility into the replication process with new Amazon CloudWatch Metrics."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Elastic Compute Cloud",
+            "description": "This release of Amazon Elastic Compute Cloud (Amazon EC2) introduces support for Amazon Elastic Block Store (Amazon EBS) fast snapshot restores."
+        },
+        {
+            "type": "feature",
+            "category": "AWS CloudTrail",
+            "description": "1. This release adds two new APIs, GetInsightSelectors and PutInsightSelectors, which let you configure CloudTrail Insights event delivery on a trail. An Insights event is a new type of event that is generated when CloudTrail detects unusual activity in your AWS account. In this release, only \"ApiCallRateInsight\" is a supported Insights event type. 2. This release also adds the new \"ExcludeManagementEventSource\" option to the existing PutEventSelectors API. This field currently supports only AWS Key Management Services."
+        },
+        {
+            "type": "feature",
+            "category": "AWS Migration Hub",
+            "description": "New exception type for use with Migration Hub home region"
+        },
+        {
+            "type": "feature",
+            "category": "Amazon QuickSight",
+            "description": "Amazon QuickSight now supports programmatic creation and management of data sources, data sets, dashboards and templates with new APIs. Templates hold dashboard metadata, and can be used to create copies connected to the same or different dataset as required. Also included in this release are APIs for SPICE ingestions, fine-grained access control over AWS resources using AWS Identity and Access Management (IAM) policies, as well AWS tagging. APIs are supported for both Standard and Enterprise Edition, with edition-specific support for specific functionality."
+        },
+        {
+            "type": "feature",
+            "category": "AWS Storage Gateway",
+            "description": "The new DescribeAvailabilityMonitorTest API provides the results of the most recent High Availability monitoring test. The new StartAvailabilityMonitorTest API verifies the storage gateway is configured for High Availability monitoring. The new ActiveDirectoryStatus response element has been added to the DescribeSMBSettings and JoinDomain APIs to indicate the status of the gateway after the most recent JoinDomain operation. The new TimeoutInSeconds parameter of the JoinDomain API allows for the configuration of the timeout in which the JoinDomain operation must complete."
+        },
+        {
+            "type": "feature",
+            "category": "AWS Elemental MediaStore",
+            "description": "This release fixes a broken link in the SDK documentation."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Chime",
+            "description": "Adds APIs to create and manage meeting session resources for the Amazon Chime SDK"
+        },
+        {
+            "type": "feature",
+            "category": "AWS Migration Hub Config",
+            "description": "AWS Migration Hub Config Service allows you to get and set the Migration Hub home region for use with AWS Migration Hub and Application Discovery Service"
+        },
+        {
+            "type": "feature",
+            "category": "AWS DataSync",
+            "description": "Update to configure task to run periodically on a schedule"
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Transcribe Service",
+            "description": "With this release Amazon Transcribe enables alternative transcriptions so that you can see different interpretations of transcribed audio."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon FSx",
+            "description": "Announcing a Multi-AZ deployment type for Amazon FSx for Windows File Server, providing fully-managed Windows file storage with high availability and redundancy across multiple AWS Availability Zones."
+        },
+        {
+            "type": "feature",
+            "category": "AWS CodeCommit",
+            "description": "This release adds support for creating pull request approval rules and pull request approval rule templates in AWS CodeCommit. This allows developers to block merges of pull requests, contingent on the approval rules being satisfiied."
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.changes/2.10.22.json b/.changes/2.10.22.json
new file mode 100644
index 000000000000..0117625e976a
--- /dev/null
+++ b/.changes/2.10.22.json
@@ -0,0 +1,71 @@
+{
+    "version": "2.10.22",
+    "date": "2019-11-21",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "AWS AppSync",
+            "description": "AppSync: AWS AppSync now supports the ability to add, configure, and maintain caching for your AWS AppSync GraphQL API."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Connect Service",
+            "description": "This release adds a new API: StartChatContact. You can use it to programmatically start a chat on the specified Amazon Connect instance. Learn more here: https://docs.aws.amazon.com/connect/latest/APIReference/Welcome.html"
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Connect Participant Service",
+            "description": "This release adds 5 new APIs: CreateParticipantConnection, DisconnectParticipant, GetTranscript, SendEvent, and SendMessage. For Amazon Connect chat, you can use them to programmatically perform participant actions on the configured Amazon Connect instance. Learn more here: https://docs.aws.amazon.com/connect-participant/latest/APIReference/Welcome.html"
+        },
+        {
+            "type": "feature",
+            "category": "Amazon DynamoDB",
+            "description": "With this release, you can convert an existing Amazon DynamoDB table to a global table by adding replicas in other AWS Regions."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Lex Model Building Service",
+            "description": "Amazon Lex now supports Sentiment Analysis"
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Lex Runtime Service",
+            "description": "Amazon Lex now supports Sentiment Analysis"
+        },
+        {
+            "type": "feature",
+            "category": "AWSMarketplace Metering",
+            "description": "Documentation updates for the AWS Marketplace Metering Service."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Simple Systems Manager (SSM)",
+            "description": "The release contains new API and API changes for AWS Systems Manager Explorer product."
+        },
+        {
+            "type": "feature",
+            "category": "AWS Config",
+            "description": "AWS Config launches Custom Configuration Items. A new feature which allows customers to publish resource configuration for third-party resources, custom, or on-premises servers."
+        },
+        {
+            "type": "feature",
+            "category": "AWS Amplify",
+            "description": "This release of AWS Amplify Console introduces support for backend environments. Backend environments are containers for AWS deployments. Each environment is a collection of AWS resources."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Transcribe Service",
+            "description": "With this release, Amazon Transcribe now supports transcriptions from audio sources in Hebrew (he-IL), Swiss German (de-CH), Japanese (ja-JP), Turkish (tr-TR), Arabic-Gulf (ar-AE), Malay (ms-MY), Telugu (te-IN)"
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Elastic Compute Cloud",
+            "description": "This release adds support for attaching AWS License Manager Configurations to Amazon Machine Image (AMI) using ImportImage API; and adds support for running different instance sizes on EC2 Dedicated Hosts"
+        },
+        {
+            "type": "feature",
+            "category": "AWS Glue",
+            "description": "This release adds support for Glue 1.0 compatible ML Transforms."
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.changes/2.10.23.json b/.changes/2.10.23.json
new file mode 100644
index 000000000000..b80453b65e8b
--- /dev/null
+++ b/.changes/2.10.23.json
@@ -0,0 +1,71 @@
+{
+    "version": "2.10.23",
+    "date": "2019-11-22",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "AWS Certificate Manager",
+            "description": "This release adds support for Tag-Based IAM for AWS Certificate Manager and adding tags to certificates upon creation."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Simple Notification Service",
+            "description": "Added documentation for the dead-letter queue feature."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Forecast Service",
+            "description": "This release adds two key updates to existing APIs. 1. Amazon Forecast can now generate forecasts in any quantile using the optional parameter forecastTypes in the CreateForecast API and 2. You can get additional details (metrics and relevant error messages) on your AutoML runs using the DescribePredictor and GetAccuracyMetrics APIs."
+        },
+        {
+            "type": "feature",
+            "category": "AWS Auto Scaling Plans",
+            "description": "Update default endpoint for AWS Auto Scaling."
+        },
+        {
+            "type": "feature",
+            "category": "Application Auto Scaling",
+            "description": "Update default endpoint for Application Auto Scaling."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Elastic MapReduce",
+            "description": "Amazon EMR adds support for concurrent step execution and cancelling running steps. Amazon EMR has added a new Outpost ARN field in the ListCluster and DescribeCluster API responses that is populated for clusters launched in an AWS Outpost subnet."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Elastic Compute Cloud",
+            "description": "This release adds two new APIs (DescribeInstanceTypes and DescribeInstanceTypeOfferings) that give customers access to instance type attributes and regional and zonal offerings."
+        },
+        {
+            "type": "feature",
+            "category": "AWS Elemental MediaPackage VOD",
+            "description": "Includes the submission time of Asset ingestion request in the API response for Create/List/Describe Assets."
+        },
+        {
+            "type": "bugfix",
+            "category": "AWS SDK for Java v2",
+            "description": "The ProcessCredentialsProvider now supports credential files up to 64 KB by default through an increase of the processOutputLimit from 1024 bytes to 64000 bytes."
+        },
+        {
+            "type": "feature",
+            "category": "AWS CodeBuild",
+            "description": "Add Canonical ARN to LogsLocation."
+        },
+        {
+            "type": "feature",
+            "category": "AWS Security Token Service",
+            "description": "Support tagging for STS sessions and tag based access control for the STS APIs"
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Rekognition",
+            "description": "This release adds enhanced face filtering support to the IndexFaces API operation, and introduces face filtering for CompareFaces and SearchFacesByImage API operations."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Simple Systems Manager (SSM)",
+            "description": "Add RebootOption and LastNoRebootInstallOperationTime for DescribeInstancePatchStates and DescribeInstancePatchStatesForPatchGroup API"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.changes/2.10.24.json b/.changes/2.10.24.json
new file mode 100644
index 000000000000..ea4f4eafb49f
--- /dev/null
+++ b/.changes/2.10.24.json
@@ -0,0 +1,151 @@
+{
+    "version": "2.10.24",
+    "date": "2019-11-25",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "AWS Elemental MediaPackage VOD",
+            "description": "Adds a domain name to PackagingGroups, representing the fully qualified domain name for Assets created in the group."
+        },
+        {
+            "type": "feature",
+            "category": "AWS Cost Explorer Service",
+            "description": "This launch provides customers with access to Cost Category Public Beta APIs."
+        },
+        {
+            "type": "feature",
+            "category": "AWS Resource Access Manager",
+            "description": "AWS RAM provides new APIs to view the permissions granted to principals in a resource share. This release also creates corresponding resource shares for supported services that use resource policies, as well as an API to promote them to standard shares that can be managed in RAM."
+        },
+        {
+            "type": "feature",
+            "category": "AWS IoT",
+            "description": "This release adds: 1) APIs for fleet provisioning claim and template, 2) endpoint configuration and custom domains, 3) support for enhanced custom authentication, d) support for 4 additional audit checks: Device and CA certificate key quality checks, IoT role alias over-permissive check and IoT role alias access to unused services check, 5) extended capability of AWS IoT Rules Engine to support IoT SiteWise rule action. The IoT SiteWise rule action lets you send messages from IoT sensors and applications to IoT SiteWise asset properties"
+        },
+        {
+            "type": "feature",
+            "category": "Elastic Load Balancing",
+            "description": "This release of Elastic Load Balancing V2 adds new subnet features for Network Load Balancers and a new routing algorithm for Application Load Balancers."
+        },
+        {
+            "type": "feature",
+            "category": "AWS CodeBuild",
+            "description": "CodeBuild adds support for test reporting"
+        },
+        {
+            "type": "feature",
+            "category": "AWS Elemental MediaConvert",
+            "description": "AWS Elemental MediaConvert SDK has added support for 8K outputs and support for QuickTime Animation Codec (RLE) inputs."
+        },
+        {
+            "type": "feature",
+            "category": "AWS Elemental MediaLive",
+            "description": "AWS Elemental MediaLive now supports the ability to create a multiple program transport stream (MPTS)."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Comprehend",
+            "description": "Amazon Comprehend now supports real-time analysis with Custom Classification"
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Cognito Identity Provider",
+            "description": "Amazon Cognito Userpools now supports Sign in with Apple as an Identity Provider."
+        },
+        {
+            "type": "feature",
+            "category": "AWS Lambda",
+            "description": "Added the function state and update status to the output of GetFunctionConfiguration and other actions. Check the state information to ensure that a function is ready before you perform operations on it. Functions take time to become ready when you connect them to a VPC.Added the EventInvokeConfig type and operations to configure error handling options for asynchronous invocation. Use PutFunctionEventInvokeConfig to configure the number of retries and the maximum age of events when you invoke the function asynchronously.Added on-failure and on-success destination settings for asynchronous invocation. Configure destinations to send an invocation record to an SNS topic, an SQS queue, an EventBridge event bus, or a Lambda function.Added error handling options to event source mappings. This enables you to configure the number of retries, configure the maximum age of records, or retry with smaller batches when an error occurs when a function processes a Kinesis or DynamoDB stream.Added the on-failure destination setting to event source mappings. This enables you to send discarded events to an SNS topic or SQS queue when all retries fail or when the maximum record age is exceeded when a function processes a Kinesis or DynamoDB stream.Added the ParallelizationFactor option to event source mappings to increase concurrency per shard when a function processes a Kinesis or DynamoDB stream."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Data Lifecycle Manager",
+            "description": "You can now set time based retention policies on Data Lifecycle Manager. With this launch, DLM allows you to set snapshot retention period in the following interval units: days, weeks, months and years."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Simple Systems Manager (SSM)",
+            "description": "AWS Systems Manager Documents now supports more Document Types: ApplicationConfiguration, ApplicationConfigurationSchema and DeploymentStrategy. This release also extends Document Permissions capabilities and introduces a new Force flag for DeleteDocument API."
+        },
+        {
+            "type": "feature",
+            "category": "AWS Key Management Service",
+            "description": "AWS Key Management Service (KMS) now enables creation and use of asymmetric Customer Master Keys (CMKs) and the generation of asymmetric data key pairs."
+        },
+        {
+            "type": "feature",
+            "category": "AWS IoT Secure Tunneling",
+            "description": "This release adds support for IoT Secure Tunneling to remote access devices behind restricted firewalls."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Relational Database Service",
+            "description": "Cluster Endpoints can now be tagged by using --tags in the create-db-cluster-endpoint API"
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Athena",
+            "description": "This release adds additional query lifecycle metrics to the QueryExecutionStatistics object in GetQueryExecution response."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Simple Email Service",
+            "description": "This release includes support for automatically suppressing email addresses that result in hard bounce or complaint events at the account level, and for managing addresses on this account-level suppression list."
+        },
+        {
+            "type": "feature",
+            "category": "Application Auto Scaling",
+            "description": "This release supports auto scaling of document classifier endpoints for Comprehend; and supports target tracking based on the average capacity utilization metric for AppStream 2.0 fleets."
+        },
+        {
+            "type": "feature",
+            "category": "AWS WAFV2",
+            "description": "This release introduces new set of APIs (\"wafv2\") for AWS WAF. Major changes include single set of APIs for creating/updating resources in global and regional scope, and rules are configured directly into web ACL instead of being referenced. The previous APIs (\"waf\" and \"waf-regional\") are now referred as AWS WAF Classic. For more information visit: https://docs.aws.amazon.com/waf/latest/APIReference/Welcome.html"
+        },
+        {
+            "type": "feature",
+            "category": "Amazon AppConfig",
+            "description": "Introducing AWS AppConfig, a new service that enables customers to quickly deploy validated configurations to applications of any size in a controlled and monitored fashion."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Lex Runtime Service",
+            "description": "Amazon Lex adds \"sessionId\" attribute to the PostText and PostContent response."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon CloudWatch Application Insights",
+            "description": "CloudWatch Application Insights for .NET and SQL Server includes the follwing features: -Tagging Create and manage tags for your applications.-Custom log pattern matching. Define custom log patterns to be detected and monitored.-Resource-level permissions. Specify applications users can access."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Elastic Compute Cloud",
+            "description": "This release adds two new APIs: 1. ModifyDefaultCreditSpecification, which allows you to set default credit specification at the account level per AWS Region, per burstable performance instance family, so that all new burstable performance instances in the account launch using the new default credit specification. 2. GetDefaultCreditSpecification, which allows you to get current default credit specification per AWS Region, per burstable performance instance family. This release also adds new client exceptions for StartInstances and StopInstances."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon CloudWatch",
+            "description": "This release adds a new feature called \"Contributor Insights\". \"Contributor Insights\" supports the following 6 new APIs (PutInsightRule, DeleteInsightRules, EnableInsightRules, DisableInsightRules, DescribeInsightRules and GetInsightRuleReport)."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Kinesis Analytics",
+            "description": "Kinesis Data Analytics service adds support to configure Java applications to access resources in a VPC. Also releasing support to configure Java applications to set allowNonRestoreState flag through the service APIs."
+        },
+        {
+            "type": "feature",
+            "category": "Alexa For Business",
+            "description": "API update for Alexa for Business: This update enables the use of meeting room configuration that can be applied to a room profile. These settings help improve and measure utilization on Alexa for Business enabled rooms. New features include end meeting reminders, intelligent room release and room utilization analytics report."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Redshift",
+            "description": "This release contains changes for 1. Redshift Scheduler 2. Update to the DescribeNodeConfigurationOptions to include a new action type recommend-node-config"
+        },
+        {
+            "type": "feature",
+            "category": "AWS Greengrass",
+            "description": "IoT Greengrass supports machine learning resources in 'No container' mode."
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.changes/2.10.25.json b/.changes/2.10.25.json
new file mode 100644
index 000000000000..e5890b50688f
--- /dev/null
+++ b/.changes/2.10.25.json
@@ -0,0 +1,71 @@
+{
+    "version": "2.10.25",
+    "date": "2019-11-26",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "AWS Directory Service",
+            "description": "This release will introduce optional encryption over LDAP network traffic using SSL certificates between customer's self-managed AD and AWS Directory Services instances. The release also provides APIs for Certificate management."
+        },
+        {
+            "type": "feature",
+            "category": "AWS Organizations",
+            "description": "Introduces the DescribeEffectivePolicy action, which returns the contents of the policy that's in effect for the account."
+        },
+        {
+            "type": "feature",
+            "category": "AWS RDS DataService",
+            "description": "Type hints to improve handling of some specific parameter types (date/time, decimal etc) for ExecuteStatement and BatchExecuteStatement APIs"
+        },
+        {
+            "type": "feature",
+            "category": "AWS Resource Groups Tagging API",
+            "description": "You can use tag policies to help standardize on tags across your organization's resources."
+        },
+        {
+            "type": "feature",
+            "category": "AWSServerlessApplicationRepository",
+            "description": "AWS Serverless Application Repository now supports verified authors. Verified means that AWS has made a good faith review, as a reasonable and prudent service provider, of the information provided by the requester and has confirmed that the requester's identity is as claimed."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon WorkSpaces",
+            "description": "For the WorkspaceBundle API, added the image identifier and the time of the last update."
+        },
+        {
+            "type": "bugfix",
+            "category": "AWS Kinesis",
+            "description": "Reducing default read timeout and write timeout to 10 seconds for Kinesis client."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Cognito Identity Provider",
+            "description": "This release adds a new setting for a user pool to configure which recovery methods a user can use to recover their account via the forgot password operation."
+        },
+        {
+            "type": "feature",
+            "category": "Netty NIO HTTP Client",
+            "description": "Detect unhealthy http2 connections when read or write times out by sending PING frames"
+        },
+        {
+            "type": "feature",
+            "category": "AWS MediaTailor",
+            "description": "AWS Elemental MediaTailor SDK now allows configuration of the Live Pre-Roll feature for HLS and DASH streams."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon DynamoDB",
+            "description": "1) Amazon Contributor Insights for Amazon DynamoDB is a diagnostic tool for identifying frequently accessed keys and understanding database traffic trends. 2) Support for displaying new fields when a table's encryption state is Inaccessible or the table have been Archived."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Elastic Inference",
+            "description": "Amazon Elastic Inference allows customers to attach Elastic Inference Accelerators to Amazon EC2 and Amazon ECS tasks, thus providing low-cost GPU-powered acceleration and reducing the cost of running deep learning inference. This release allows customers to add or remove tags for their Elastic Inference Accelerators."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon QuickSight",
+            "description": "Documentation updates for QuickSight"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.changes/2.10.26.json b/.changes/2.10.26.json
new file mode 100644
index 000000000000..defe9cc2190b
--- /dev/null
+++ b/.changes/2.10.26.json
@@ -0,0 +1,31 @@
+{
+    "version": "2.10.26",
+    "date": "2019-12-02",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "Schemas",
+            "description": "This release introduces support for Amazon EventBridge schema registry, making it easy to discover and write code for events in EventBridge."
+        },
+        {
+            "type": "feature",
+            "category": "AWS License Manager",
+            "description": "AWS License Manager now automates discovery of bring-your-own-license usage across the customers organization. With few simple settings, customers can add bring your own license product information along with licensing rules, which would enable License Manager to automatically track the instances that have the specified products installed. If License Manager detects any violation of licensing rules, it would notify the customers designated license administrator to take corrective action."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon DynamoDB Enhanced Client [Preview]",
+            "description": "Write operations (put, get, delete) now support 'conditionExpression'"
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Elastic Compute Cloud",
+            "description": "AWS now provides a new BYOL experience for software licenses, such as Windows and SQL Server, that require a dedicated physical server. You can now enjoy the flexibility and cost effectiveness of using your own licenses on Amazon EC2 Dedicated Hosts, but with the simplicity, resiliency, and elasticity of AWS. You can specify your Dedicated Host management preferences, such as host allocation, host capacity utilization, and instance placement in AWS License Manager. Once set up, AWS takes care of these administrative tasks on your behalf, so that you can seamlessly launch virtual machines (instances) on Dedicated Hosts just like you would launch an EC2 instance with AWS provided licenses."
+        },
+        {
+            "type": "feature",
+            "category": "EC2 Image Builder",
+            "description": "This is the first release of EC2 Image Builder, a service that provides a managed experience for automating the creation of EC2 AMIs."
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.changes/2.10.27.json b/.changes/2.10.27.json
new file mode 100644
index 000000000000..735404abfa66
--- /dev/null
+++ b/.changes/2.10.27.json
@@ -0,0 +1,11 @@
+{
+    "version": "2.10.27",
+    "date": "2019-12-02",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "Access Analyzer",
+            "description": "Introducing AWS IAM Access Analyzer, an IAM feature that makes it easy for AWS customers to ensure that their resource-based policies provide only the intended access to resources outside their AWS accounts."
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.changes/2.10.28.json b/.changes/2.10.28.json
new file mode 100644
index 000000000000..7b8732bc8899
--- /dev/null
+++ b/.changes/2.10.28.json
@@ -0,0 +1,81 @@
+{
+    "version": "2.10.28",
+    "date": "2019-12-03",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "Amazon Elastic Kubernetes Service",
+            "description": "Introducing Amazon EKS with Fargate. Customers can now use Amazon EKS to launch pods directly onto AWS Fargate, the serverless compute engine built for containers on AWS."
+        },
+        {
+            "type": "feature",
+            "category": "AWS Network Manager",
+            "description": "This is the initial SDK release for AWS Network Manager."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Fraud Detector",
+            "description": "Amazon Fraud Detector is a fully managed service that makes it easy to identify potentially fraudulent online activities such as online payment fraud and the creation of fake accounts. Amazon Fraud Detector uses your data, machine learning (ML), and more than 20 years of fraud detection expertise from Amazon to automatically identify potentially fraudulent online activity so you can catch more fraud faster."
+        },
+        {
+            "type": "feature",
+            "category": "AWS Compute Optimizer",
+            "description": "Initial release of AWS Compute Optimizer. AWS Compute Optimizer recommends optimal AWS Compute resources to reduce costs and improve performance for your workloads."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Textract",
+            "description": "This SDK Release introduces Amazon Augmented AI support for Amazon Textract AnalyzeDocument API. Image byte payloads for synchronous operations have increased from 5 MB to 10 MB."
+        },
+        {
+            "type": "feature",
+            "category": "AWS S3 Control",
+            "description": "Amazon S3 Access Points is a new S3 feature that simplifies managing data access at scale for shared data sets on Amazon S3. Access Points provide a customizable way to access the objects in a bucket, with a unique hostname and access policy that enforces the specific permissions and network controls for any request made through the access point. This represents a new way of provisioning access to shared data sets."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon EC2 Container Service",
+            "description": "This release supports ECS Capacity Providers, Fargate Spot, and ECS Cluster Auto Scaling. These features enable new ways for ECS to manage compute capacity used by tasks."
+        },
+        {
+            "type": "feature",
+            "category": "AWSKendraFrontendService",
+            "description": "It is a preview launch of Amazon Kendra. Amazon Kendra is a managed, highly accurate and easy to use enterprise search service that is powered by machine learning."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Elasticsearch Service",
+            "description": "UltraWarm storage provides a cost-effective way to store large amounts of read-only data on Amazon Elasticsearch Service. Rather than attached storage, UltraWarm nodes use Amazon S3 and a sophisticated caching solution to improve performance. For indices that you are not actively writing to and query less frequently, UltraWarm storage offers significantly lower costs per GiB. In Elasticsearch, these warm indices behave just like any other index. You can query them using the same APIs or use them to create dashboards in Kibana."
+        },
+        {
+            "type": "feature",
+            "category": "AWS Outposts",
+            "description": "This is the initial release for AWS Outposts, a fully managed service that extends AWS infrastructure, services, APIs, and tools to customer sites. AWS Outposts enables you to launch and run EC2 instances and EBS volumes locally at your on-premises location. This release introduces new APIs for creating and viewing Outposts."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Simple Storage Service",
+            "description": "Amazon S3 Access Points is a new S3 feature that simplifies managing data access at scale for shared data sets on Amazon S3. Access Points provide a customizable way to access the objects in a bucket, with a unique hostname and access policy that enforces the specific permissions and network controls for any request made through the access point. This represents a new way of provisioning access to shared data sets."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon CodeGuru Profiler",
+            "description": "(New Service) Amazon CodeGuru Profiler analyzes application CPU utilization and latency characteristics to show you where you are spending the most cycles in your application. This analysis is presented in an interactive flame graph that helps you easily understand which paths consume the most resources, verify that your application is performing as expected, and uncover areas that can be optimized further."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Augmented AI Runtime",
+            "description": "This release adds support for Amazon Augmented AI, which makes it easy to build workflows for human review of machine learning predictions."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon CodeGuru Reviewer",
+            "description": "This is the preview release of Amazon CodeGuru Reviewer."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Elastic Compute Cloud",
+            "description": "This release adds support for the following features: 1. An option to enable acceleration for Site-to-Site VPN connections; 2. Inf1 instances featuring up to 16 AWS Inferentia chips; 3. The ability to associate route tables with internet gateways and virtual private gateways; 4. AWS Local Zones that place compute, storage, database, and other select services; 5. Launching and viewing EC2 instances and EBS volumes running locally in Outposts; 6. Peering Transit Gateways between regions simplifying creation of secure and private global networks on AWS; 7. Transit Gateway Multicast, enabling multicast routing within and between VPCs using Transit Gateway as a multicast router."
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.changes/2.10.29.json b/.changes/2.10.29.json
new file mode 100644
index 000000000000..2be5a2908220
--- /dev/null
+++ b/.changes/2.10.29.json
@@ -0,0 +1,46 @@
+{
+    "version": "2.10.29",
+    "date": "2019-12-03",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "AWS Step Functions",
+            "description": "This release of the AWS Step Functions SDK introduces support for Express Workflows."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Relational Database Service",
+            "description": "This release adds support for the Amazon RDS Proxy"
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Rekognition",
+            "description": "This SDK Release introduces APIs for Amazon Rekognition Custom Labels feature (CreateProjects, CreateProjectVersion,DescribeProjects, DescribeProjectVersions, StartProjectVersion, StopProjectVersion and DetectCustomLabels). Also new is AugmentedAI (Human In The Loop) Support for DetectModerationLabels in Amazon Rekognition."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon SageMaker Service",
+            "description": "You can now use SageMaker Autopilot for automatically training and tuning candidate models using a combination of various feature engineering, ML algorithms, and hyperparameters determined from the user's input data. SageMaker Automatic Model Tuning now supports tuning across multiple algorithms. With Amazon SageMaker Experiments users can create Experiments, ExperimentTrials, and ExperimentTrialComponents to track, organize, and evaluate their ML training jobs. With Amazon SageMaker Debugger, users can easily debug training jobs using a number of pre-built rules provided by Amazon SageMaker, or build custom rules. With Amazon SageMaker Processing, users can run on-demand, distributed, and fully managed jobs for data pre- or post- processing or model evaluation. With Amazon SageMaker Model Monitor, a user can create MonitoringSchedules to automatically monitor endpoints to detect data drift and other issues and get alerted on them. This release also includes the preview version of Amazon SageMaker Studio with Domains, UserProfiles, and Apps. This release also includes the preview version of Amazon Augmented AI to easily implement human review of machine learning predictions by creating FlowDefinitions, HumanTaskUis, and HumanLoops."
+        },
+        {
+            "type": "feature",
+            "category": "AWS Lambda",
+            "description": "- Added the ProvisionedConcurrency type and operations. Allocate provisioned concurrency to enable your function to scale up without fluctuations in latency. Use PutProvisionedConcurrencyConfig to configure provisioned concurrency on a version of a function, or on an alias."
+        },
+        {
+            "type": "feature",
+            "category": "Application Auto Scaling",
+            "description": "This release supports auto scaling of provisioned concurrency for AWS Lambda."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Elastic Block Store",
+            "description": "This release introduces the EBS direct APIs for Snapshots: 1. ListSnapshotBlocks, which lists the block indexes and block tokens for blocks in an Amazon EBS snapshot. 2. ListChangedBlocks, which lists the block indexes and block tokens for blocks that are different between two snapshots of the same volume/snapshot lineage. 3. GetSnapshotBlock, which returns the data in a block of an Amazon EBS snapshot."
+        },
+        {
+            "type": "bugfix",
+            "category": "Amazon S3",
+            "description": "Interacting with an access point in a different region to the one the S3 client is configured for will no longer result in the request being signed for the wrong region and rejected by S3."
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.changes/2.10.30.json b/.changes/2.10.30.json
new file mode 100644
index 000000000000..72427a8b0f5e
--- /dev/null
+++ b/.changes/2.10.30.json
@@ -0,0 +1,31 @@
+{
+    "version": "2.10.30",
+    "date": "2019-12-04",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "AmazonApiGatewayV2",
+            "description": "Amazon API Gateway now supports HTTP APIs (beta), enabling customers to quickly build high performance RESTful APIs that are up to 71% cheaper than REST APIs also available from API Gateway. HTTP APIs are optimized for building APIs that proxy to AWS Lambda functions or HTTP backends, making them ideal for serverless workloads. Using HTTP APIs, you can secure your APIs using OIDC and OAuth 2 out of box, quickly build web applications using a simple CORS experience, and get started immediately with automatic deployment and simple create workflows."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Kinesis Video Signaling Channels",
+            "description": "Announcing support for WebRTC in Kinesis Video Streams, as fully managed capability. You can now use simple APIs to enable your connected devices, web, and mobile apps with real-time two-way media streaming capabilities."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Kinesis Video Streams",
+            "description": "Introduces management of signaling channels for Kinesis Video Streams."
+        },
+        {
+            "type": "bugfix",
+            "category": "Netty NIO HTTP Client",
+            "description": "Fixed an issue where receiving a GOAWAY that would cause the closing of all streams could cause all outstanding streams to be completed successfully instead of exceptionally."
+        },
+        {
+            "type": "bugfix",
+            "category": "Netty NIO HTTP Client",
+            "description": "Fixed an issue where closing the last stream on a connection that had been closed or received a GOAWAY did not close the connection."
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.changes/2.10.31.json b/.changes/2.10.31.json
new file mode 100644
index 000000000000..f2a27b9ed723
--- /dev/null
+++ b/.changes/2.10.31.json
@@ -0,0 +1,36 @@
+{
+    "version": "2.10.31",
+    "date": "2019-12-09",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "Managed Streaming for Kafka",
+            "description": "AWS MSK has added support for Open Monitoring with Prometheus."
+        },
+        {
+            "type": "feature",
+            "category": "AWS Key Management Service",
+            "description": "The Verify operation now returns KMSInvalidSignatureException on invalid signatures. The Sign and Verify operations now return KMSInvalidStateException when a request is made against a CMK pending deletion."
+        },
+        {
+            "type": "feature",
+            "category": "Netty NIO HTTP Client",
+            "description": "Close HTTP/2 connections if they have had 0 streams for 5 seconds. This can be disabled using `useIdleConnectionReaper(false)` or have the time period adjusted using `connectionMaxIdleTime(...)` on the `NettyNioAsyncHttpClient.Builder`."
+        },
+        {
+            "type": "feature",
+            "category": "Netty NIO HTTP Client",
+            "description": "Periodically ping HTTP/2 connections and close them if the service does not respond. The ping periodicity and timeout time is not currently configurable."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Simple Systems Manager (SSM)",
+            "description": "Adds the SSM GetCalendarState API and ChangeCalendar SSM Document type. These features enable the forthcoming Systems Manager Change Calendar feature, which will allow you to schedule events during which actions should (or should not) be performed."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon QuickSight",
+            "description": "Documentation updates for QuickSight"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.changes/2.10.32.json b/.changes/2.10.32.json
new file mode 100644
index 000000000000..937ef7cab10f
--- /dev/null
+++ b/.changes/2.10.32.json
@@ -0,0 +1,11 @@
+{
+    "version": "2.10.32",
+    "date": "2019-12-10",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "AWSKendraFrontendService",
+            "description": "1. Adding DocumentTitleFieldName as an optional configuration for SharePoint. 2. updating s3 object pattern to support all s3 keys."
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.changes/2.10.33.json b/.changes/2.10.33.json
new file mode 100644
index 000000000000..d52799f34216
--- /dev/null
+++ b/.changes/2.10.33.json
@@ -0,0 +1,16 @@
+{
+    "version": "2.10.33",
+    "date": "2019-12-11",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "Amazon Elastic Compute Cloud",
+            "description": "This release allows customers to attach multiple Elastic Inference Accelerators to a single EC2 instance. It adds support for a Count parameter for each Elastic Inference Accelerator type you specify on the RunInstances and LaunchTemplate APIs."
+        },
+        {
+            "type": "feature",
+            "category": "AWS SDK for Java v2",
+            "description": "Adds a `has*` method to requests and responses that have a List or Map property."
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.changes/2.10.34.json b/.changes/2.10.34.json
new file mode 100644
index 000000000000..240cb63b85cf
--- /dev/null
+++ b/.changes/2.10.34.json
@@ -0,0 +1,16 @@
+{
+    "version": "2.10.34",
+    "date": "2019-12-12",
+    "entries": [
+        {
+            "type": "bugfix",
+            "category": "AWS SDK for Java v2",
+            "description": "Fixing exception using `RequestBody.fromInputStream` on non-resettable `InputStreams` by making `reset` conditional on `markSupported`. See [#1544](https://github.com/aws/aws-sdk-java-v2/issues/1544) / [#1545](https://github.com/aws/aws-sdk-java-v2/issues/1545)"
+        },
+        {
+            "type": "feature",
+            "category": "Access Analyzer",
+            "description": "This release includes improvements and fixes bugs for the IAM Access Analyzer feature."
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.changes/2.10.35.json b/.changes/2.10.35.json
new file mode 100644
index 000000000000..2b511b0bb05e
--- /dev/null
+++ b/.changes/2.10.35.json
@@ -0,0 +1,21 @@
+{
+    "version": "2.10.35",
+    "date": "2019-12-13",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "AWS CodeBuild",
+            "description": "CodeBuild adds support for cross account"
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Simple Email Service",
+            "description": "Added the ability to use your own public-private key pair to configure DKIM authentication for a domain identity."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Detective",
+            "description": "This is the initial release of Amazon Detective."
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.changes/2.10.36.json b/.changes/2.10.36.json
new file mode 100644
index 000000000000..81f1306f41f6
--- /dev/null
+++ b/.changes/2.10.36.json
@@ -0,0 +1,26 @@
+{
+    "version": "2.10.36",
+    "date": "2019-12-16",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "AmazonMQ",
+            "description": "Amazon MQ now supports throughput-optimized message brokers, backed by Amazon EBS."
+        },
+        {
+            "type": "feature",
+            "category": "AWS Comprehend Medical",
+            "description": "New Ontology linking APIs will provides medication concepts normalization and Diagnoses codes from input text. In this release we will provide two APIs - RxNorm and ICD10-CM."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon S3",
+            "description": "CopyObjectRequest now has `destinationBucket` and `destinationKey` properties for clarity.\nThe existing names, `bucket` and `key`, are deprecated."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Elastic Compute Cloud",
+            "description": "You can now configure your EC2 Fleet to preferentially use EC2 Capacity Reservations for launching On-Demand instances, enabling you to fully utilize the available (and unused) Capacity Reservations before launching On-Demand instances on net new capacity."
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.changes/2.10.37.json b/.changes/2.10.37.json
new file mode 100644
index 000000000000..108eb477483d
--- /dev/null
+++ b/.changes/2.10.37.json
@@ -0,0 +1,36 @@
+{
+    "version": "2.10.37",
+    "date": "2019-12-17",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "Amazon Simple Systems Manager (SSM)",
+            "description": "Added support for Cloud Watch Output and Document Version to the Run Command tasks in Maintenance Windows."
+        },
+        {
+            "type": "feature",
+            "category": "AWS IoT",
+            "description": "Added a new Over-the-Air (OTA) Update feature that allows you to use different, or multiple, protocols to transfer an image from the AWS cloud to IoT devices."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Kinesis Analytics",
+            "description": "Kinesis Data Analytics service now supports running Java applications using Flink 1.8."
+        },
+        {
+            "type": "feature",
+            "category": "AWS Elemental MediaLive",
+            "description": "AWS Elemental MediaLive now supports HLS ID3 segment tagging, HLS redundant manifests for CDNs that support different publishing/viewing endpoints, fragmented MP4 (fMP4), and frame capture intervals specified in milliseconds."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon EC2 Container Service",
+            "description": "Documentation updates for Amazon ECS."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Elastic Compute Cloud",
+            "description": "Documentation updates for Amazon EC2"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.changes/2.10.38.json b/.changes/2.10.38.json
new file mode 100644
index 000000000000..56d491584d3e
--- /dev/null
+++ b/.changes/2.10.38.json
@@ -0,0 +1,31 @@
+{
+    "version": "2.10.38",
+    "date": "2019-12-18",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "Amazon Simple Storage Service",
+            "description": "Updates Amazon S3 endpoints allowing you to configure your client to opt-in to using S3 with the us-east-1 regional endpoint, instead of global."
+        },
+        {
+            "type": "feature",
+            "category": "AWS Resource Groups Tagging API",
+            "description": "Documentation updates for resourcegroupstaggingapi"
+        },
+        {
+            "type": "feature",
+            "category": "AWS OpsWorks CM",
+            "description": "AWS OpsWorks CM now supports tagging, and tag-based access control, of servers and backups."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Elastic Compute Cloud",
+            "description": "This release introduces the ability to tag Elastic Graphics accelerators. You can use tags to organize and identify your accelerators for cost allocation."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon CloudFront",
+            "description": "Documentation updates for CloudFront"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.changes/2.10.39.json b/.changes/2.10.39.json
new file mode 100644
index 000000000000..ea5f3af373e6
--- /dev/null
+++ b/.changes/2.10.39.json
@@ -0,0 +1,56 @@
+{
+    "version": "2.10.39",
+    "date": "2019-12-19",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "Amazon Elastic Compute Cloud",
+            "description": "We are updating the supportedRootDevices field to supportedRootDeviceTypes for DescribeInstanceTypes API to ensure that the actual value is returned, correcting a previous error in the model."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Data Lifecycle Manager",
+            "description": "You can now copy snapshots across regions using Data Lifecycle Manager (DLM). You can enable policies which, along with create, can now also copy snapshots to one or more AWS region(s). Copies can be scheduled for up to three regions from a single policy and retention periods are set for each region separately."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Simple Systems Manager (SSM)",
+            "description": "This release allows customers to add tags to Automation execution, enabling them to sort and filter executions in different ways, such as by resource, purpose, owner, or environment."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Personalize Runtime",
+            "description": "Add context map to get-recommendations and get-personalized-ranking request objects to provide contextual metadata at inference time"
+        },
+        {
+            "type": "feature",
+            "category": "Amazon GameLift",
+            "description": "Amazon GameLift now supports ARNs for all key GameLift resources, tagging for GameLift resource authorization management, and updated documentation that articulates GameLift's resource authorization strategy."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Lex Model Building Service",
+            "description": "Amazon Lex now supports conversation logs and slot obfuscation."
+        },
+        {
+            "type": "feature",
+            "category": "Netty NIO HTTP Client",
+            "description": "`SETTINGS_INITIAL_WINDOW_SIZE` is now configurable on HTTP/2 connections opened by the Netty client using `Http2Configuration#initialWindowSize(Integer)` along with `NettyNioAsyncHttpClient.Builder#http2Configuration(Http2Configuration)`. See https://tools.ietf.org/html/rfc7540#section-6.5.2 for more information."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Transcribe Service",
+            "description": "Amazon Transcribe supports job queuing for the StartTranscriptionJob API."
+        },
+        {
+            "type": "bugfix",
+            "category": "Amazon S3",
+            "description": "Fixed an issue where a 'checksum mismatch' error is raised whenever a PutObject request is retried while using an async client."
+        },
+        {
+            "type": "feature",
+            "category": "AWS CodeStar connections",
+            "description": "Public beta for Bitbucket Cloud support in AWS CodePipeline through integration with AWS CodeStar connections."
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.changes/2.10.40.json b/.changes/2.10.40.json
new file mode 100644
index 000000000000..27e005b45fca
--- /dev/null
+++ b/.changes/2.10.40.json
@@ -0,0 +1,56 @@
+{
+    "version": "2.10.40",
+    "date": "2019-12-20",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "Amazon Relational Database Service",
+            "description": "This release adds an operation that enables users to specify whether a database is restarted when its SSL/TLS certificate is rotated. Only customers who do not use SSL/TLS should use this operation."
+        },
+        {
+            "type": "bugfix",
+            "category": "Amazon S3",
+            "description": "Fixed an issue where the SDK would attempt to validate the checksum on a PutObjectRequest when S3 was returning invalid checksums. This would cause all requests to buckets with customer-managed-key service-side encryption to fail."
+        },
+        {
+            "type": "feature",
+            "category": "AWS Device Farm",
+            "description": "Introduced browser testing support through AWS Device Farm"
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Redshift",
+            "description": "Documentation updates for Amazon Redshift RA3 node types."
+        },
+        {
+            "type": "feature",
+            "category": "AWS SecurityHub",
+            "description": "Additional resource types are now fully supported in the AWS Security Finding Format (ASFF). These resources include AwsElbv2LoadBalancer, AwsKmsKey, AwsIamRole, AwsSqsQueue, AwsLambdaFunction, AwsSnsTopic, and AwsCloudFrontDistribution. Each of these resource types includes an accompanying resource details object with fields for security finding providers to populate. Updates were made to the AwsIamAccessKey resource details object to include information on principal ID and name. To learn more, visit our documentation on the ASFF."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Elastic Compute Cloud",
+            "description": "This release introduces the ability to tag key pairs, placement groups, export tasks, import image tasks, import snapshot tasks and export image tasks. You can use tags to organize and identify your resources for cost allocation."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Simple Systems Manager (SSM)",
+            "description": "This release updates the attachments support to include AttachmentReference source for Automation documents."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Transcribe Service",
+            "description": "AWS Transcribe now supports vocabulary filtering that allows customers to input words to the service that they don't want to see in the output transcript."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Elastic Kubernetes Service",
+            "description": "Amazon EKS now supports restricting access to the API server public endpoint by applying CIDR blocks"
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Pinpoint",
+            "description": "This release of the Amazon Pinpoint API introduces versioning support for message templates."
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.changes/2.10.41.json b/.changes/2.10.41.json
new file mode 100644
index 000000000000..1236ebe1d24b
--- /dev/null
+++ b/.changes/2.10.41.json
@@ -0,0 +1,21 @@
+{
+    "version": "2.10.41",
+    "date": "2019-12-23",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "Amazon Detective",
+            "description": "Updated the documentation for Amazon Detective."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon FSx",
+            "description": "This release adds a new family of APIs (create-data-repository-task, describe-data-repository-task, and cancel-data-repository-task) that allow users to perform operations between their file system and its linked data repository."
+        },
+        {
+            "type": "feature",
+            "category": "AWS Health APIs and Notifications",
+            "description": "With this release, you can now centrally aggregate AWS Health events from all accounts in your AWS organization. Visit AWS Health documentation to learn more about enabling and using this feature: https://docs.aws.amazon.com/health/latest/ug/organizational-view-health.html."
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.changes/2.10.42.json b/.changes/2.10.42.json
new file mode 100644
index 000000000000..f248a856c652
--- /dev/null
+++ b/.changes/2.10.42.json
@@ -0,0 +1,36 @@
+{
+    "version": "2.10.42",
+    "date": "2020-01-02",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "Amazon Lightsail",
+            "description": "This release adds support for Certificate Authority (CA) certificate identifier to managed databases in Amazon Lightsail."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon EC2 Container Registry",
+            "description": "Adds waiters for ImageScanComplete and LifecyclePolicyPreviewComplete"
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Lex Model Building Service",
+            "description": "Documentation updates for Amazon Lex."
+        },
+        {
+            "type": "feature",
+            "category": "AWS Cost Explorer Service",
+            "description": "Documentation updates for GetReservationUtilization for the Cost Explorer API."
+        },
+        {
+            "type": "bugfix",
+            "category": "AWS SDK for Java v2",
+            "description": "Fix unmarshalling for models with xml attributes. See [#1488](https://github.com/aws/aws-sdk-java-v2/issues/1488)."
+        },
+        {
+            "type": "bugfix",
+            "category": "Netty NIO Http Client",
+            "description": "Propagate exception properly when an exception is thrown from protocol initialization."
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.changes/2.10.43.json b/.changes/2.10.43.json
new file mode 100644
index 000000000000..5babc4d8bb6d
--- /dev/null
+++ b/.changes/2.10.43.json
@@ -0,0 +1,36 @@
+{
+    "version": "2.10.43",
+    "date": "2020-01-06",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "AWS SDK for Java v2",
+            "description": "Add `RequestBody.fromRemainingByteBuffer(ByteBuffer)` that copies only the remaining readable bytes of the buffer. See [#1534](https://github.com/aws/aws-sdk-java-v2/issues/1534)"
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Elastic Compute Cloud",
+            "description": "This release supports service providers configuring a private DNS name for services other than AWS services and services available in the AWS marketplace. This feature allows consumers to access the service using an existing DNS name without making changes to their applications."
+        },
+        {
+            "type": "bugfix",
+            "category": "AWS SDK for Java v2",
+            "description": "Reduce ReadTimeout and ConnectTimeout for accessing EC2 metadata instance service"
+        },
+        {
+            "type": "feature",
+            "category": "AWS Elemental MediaPackage",
+            "description": "You can now restrict direct access to AWS Elemental MediaPackage by securing requests for live content using CDN authorization. With CDN authorization, content requests require a specific HTTP header and authorization code."
+        },
+        {
+            "type": "bugfix",
+            "category": "Amazon S3",
+            "description": "Requests that return an error response in the body of the HTTP response with a successful (200) status code will now correctly be handled as a failed request by the SDK."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Comprehend",
+            "description": "Amazon Comprehend now supports Multilabel document classification"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.changes/2.10.44.json b/.changes/2.10.44.json
new file mode 100644
index 000000000000..a20340f5a968
--- /dev/null
+++ b/.changes/2.10.44.json
@@ -0,0 +1,21 @@
+{
+    "version": "2.10.44",
+    "date": "2020-01-07",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "AWS X-Ray",
+            "description": "Documentation updates for xray"
+        },
+        {
+            "type": "feature",
+            "category": "AWS Migration Hub",
+            "description": "ListApplicationStates API provides a list of all application migration states"
+        },
+        {
+            "type": "feature",
+            "category": "AWS CodeBuild",
+            "description": "Add encryption key override to StartBuild API in AWS CodeBuild."
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.changes/2.10.45.json b/.changes/2.10.45.json
new file mode 100644
index 000000000000..345285efb682
--- /dev/null
+++ b/.changes/2.10.45.json
@@ -0,0 +1,31 @@
+{
+    "version": "2.10.45",
+    "date": "2020-01-08",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "Amazon Translate",
+            "description": "This release adds a new family of APIs for asynchronous batch translation service that provides option to translate large collection of text or HTML documents stored in Amazon S3 folder. This service accepts a batch of up to 5 GB in size per API call with each document not exceeding 1 MB size and the number of documents not exceeding 1 million per batch. See documentation for more information."
+        },
+        {
+            "type": "feature",
+            "category": "Firewall Management Service",
+            "description": "AWS Firewall Manager now supports tagging, and tag-based access control, of policies."
+        },
+        {
+            "type": "feature",
+            "category": "AWS Step Functions",
+            "description": "Add sfn specific http configurations. See [#1325](https://github.com/aws/aws-sdk-java-v2/issues/1325)"
+        },
+        {
+            "type": "bugfix",
+            "category": "Amazon EC2",
+            "description": "Fix NPE when calling `CopySnapshot`. Fixes [#1564](https://github.com/aws/aws-sdk-java-v2/issues/1564)"
+        },
+        {
+            "type": "feature",
+            "category": "AWS Cost Explorer Service",
+            "description": "Documentation updates for CreateCostCategoryDefinition and UpdateCostCategoryDefinition API"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.changes/2.10.46.json b/.changes/2.10.46.json
new file mode 100644
index 000000000000..fa6f8c9dad67
--- /dev/null
+++ b/.changes/2.10.46.json
@@ -0,0 +1,26 @@
+{
+    "version": "2.10.46",
+    "date": "2020-01-09",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "Amazon CloudWatch Logs",
+            "description": "Documentation updates for logs"
+        },
+        {
+            "type": "feature",
+            "category": "AWS Security Token Service",
+            "description": "Documentation updates for sts"
+        },
+        {
+            "type": "feature",
+            "category": "Amazon S3",
+            "description": "Add support for Tagging builder in `CreateMultipartUploadRequest`. See [#1440](https://github.com/aws/aws-sdk-java-v2/issues/1440)"
+        },
+        {
+            "type": "bugfix",
+            "category": "AWS SDK for Java v2",
+            "description": "Increase the priority of the AWS_WEB_IDENTITY_TOKEN_FILE/AWS_ROLE_ARN/AWS_ROLE_SESSION_NAME environment variables when loading credentials so that they are considered before web_identity_token_file/role_arn/role_session_name profile properties. This is consistent with the other AWS SDKs, including the CLI."
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.changes/2.10.47.json b/.changes/2.10.47.json
new file mode 100644
index 000000000000..67a82e693156
--- /dev/null
+++ b/.changes/2.10.47.json
@@ -0,0 +1,51 @@
+{
+    "version": "2.10.47",
+    "date": "2020-01-10",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "Amazon Relational Database Service",
+            "description": "This release adds an operation that enables users to override the system-default SSL/TLS certificate for new Amazon RDS DB instances temporarily, or remove the customer override."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Elastic Compute Cloud",
+            "description": "This release introduces the ability to tag egress only internet gateways, local gateways, local gateway route tables, local gateway virtual interfaces, local gateway virtual interface groups, local gateway route table VPC association and local gateway route table virtual interface group association. You can use tags to organize and identify your resources for cost allocation."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon WorkSpaces",
+            "description": "Added the migrate feature to Amazon WorkSpaces."
+        },
+        {
+            "type": "feature",
+            "category": "AWS SDK for Java v2",
+            "description": "Updated service endpoint metadata."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Chime",
+            "description": "Add shared profile support to new and existing users"
+        },
+        {
+            "type": "feature",
+            "category": "AWS Transfer for SFTP",
+            "description": "This release introduces a new endpoint type that allows you to attach Elastic IP addresses from your AWS account with your server's endpoint directly and whitelist access to your server by client's internet IP address(es) using VPC Security Groups."
+        },
+        {
+            "type": "feature",
+            "category": "AWS SDK for Java v2",
+            "description": "Updated service endpoints and added global endpoints for iso and iso-b."
+        },
+        {
+            "type": "bugfix",
+            "category": "Amazon S3",
+            "description": "Fix an issue where s3#listObjects incorrectly decoded marker field. See [#1574](https://github.com/aws/aws-sdk-java-v2/issues/1574)."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon SageMaker Service",
+            "description": "SageMaker ListTrialComponents API filter by TrialName and ExperimentName."
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.changes/2.10.48.json b/.changes/2.10.48.json
new file mode 100644
index 000000000000..f1c00df53d78
--- /dev/null
+++ b/.changes/2.10.48.json
@@ -0,0 +1,26 @@
+{
+    "version": "2.10.48",
+    "date": "2020-01-13",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "Amazon Elastic Compute Cloud",
+            "description": "Documentation updates for the StopInstances API. You can now stop and start an Amazon EBS-backed Spot Instance at will, instead of relying on the Stop interruption behavior to stop your Spot Instances when interrupted."
+        },
+        {
+            "type": "bugfix",
+            "category": "Amazon S3",
+            "description": "Fixed bug prevent GetBucketBolicy from ever being successful using the asynchronous S3 client."
+        },
+        {
+            "type": "feature",
+            "category": "AWS Backup",
+            "description": "Cross-region backup is a new AWS Backup feature that allows enterprises to copy backups across multiple AWS services to different regions."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Elastic File System",
+            "description": "This release adds support for managing EFS file system policies and EFS Access Points."
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.changes/2.10.49.json b/.changes/2.10.49.json
new file mode 100644
index 000000000000..2964ff467b6d
--- /dev/null
+++ b/.changes/2.10.49.json
@@ -0,0 +1,11 @@
+{
+    "version": "2.10.49",
+    "date": "2020-01-14",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "Amazon Elastic Compute Cloud",
+            "description": "This release adds support for partition placement groups and instance metadata option in Launch Templates"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.changes/2.10.50.json b/.changes/2.10.50.json
new file mode 100644
index 000000000000..29de159bf5d0
--- /dev/null
+++ b/.changes/2.10.50.json
@@ -0,0 +1,36 @@
+{
+    "version": "2.10.50",
+    "date": "2020-01-15",
+    "entries": [
+        {
+            "type": "bugfix",
+            "category": "Amazon Transcribe Service",
+            "description": "Fixed an issue where streaming transcriptions would fail with signature validation errors if the date changed during the request."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Simple Systems Manager (SSM)",
+            "description": "Document updates for Patch Manager 'NoReboot' feature."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Elastic Compute Cloud",
+            "description": "General Update to EC2 Docs and SDKs"
+        },
+        {
+            "type": "feature",
+            "category": "AWS Organizations",
+            "description": "Updated description for PolicyID parameter and ConstraintViolationException."
+        },
+        {
+            "type": "feature",
+            "category": "AWS SDK for Java v2",
+            "description": "Updated service endpoint metadata."
+        },
+        {
+            "type": "feature",
+            "category": "AWS SecurityHub",
+            "description": "Add support for DescribeStandardsControls and UpdateStandardsControl. These new Security Hub API operations are used to track and manage whether a compliance standards control is enabled."
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.changes/2.10.51.json b/.changes/2.10.51.json
new file mode 100644
index 000000000000..a11e9ee1cfc1
--- /dev/null
+++ b/.changes/2.10.51.json
@@ -0,0 +1,26 @@
+{
+    "version": "2.10.51",
+    "date": "2020-01-16",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "Amazon Elastic Compute Cloud",
+            "description": "Client VPN now supports Port Configuration for VPN Endpoints, allowing usage of either port 443 or port 1194."
+        },
+        {
+            "type": "feature",
+            "category": "AWS Directory Service",
+            "description": "To reduce the number of errors our customers are facing, we have modified the requirements of input parameters for two of Directory Service APIs."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon SageMaker Service",
+            "description": "This release adds two new APIs (UpdateWorkforce and DescribeWorkforce) to SageMaker Ground Truth service for workforce IP whitelisting."
+        },
+        {
+            "type": "feature",
+            "category": "AWS SDK for Java v2",
+            "description": "Updated service endpoint metadata."
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.changes/2.10.52.json b/.changes/2.10.52.json
new file mode 100644
index 000000000000..70463cd52e87
--- /dev/null
+++ b/.changes/2.10.52.json
@@ -0,0 +1,41 @@
+{
+    "version": "2.10.52",
+    "date": "2020-01-17",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "AWS CloudHSM V2",
+            "description": "This release introduces resource-level and tag-based access control for AWS CloudHSM resources. You can now tag CloudHSM backups, tag CloudHSM clusters on creation, and tag a backup as you copy it to another region."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Neptune",
+            "description": "This release includes Deletion Protection for Amazon Neptune databases."
+        },
+        {
+            "type": "feature",
+            "category": "AWS SDK for Java v2",
+            "description": "Updated service endpoint metadata."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon EC2 Container Service",
+            "description": "This release provides a public preview for specifying Amazon EFS file systems as volumes in your Amazon ECS task definitions."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Redshift",
+            "description": "Documentation updates for redshift"
+        },
+        {
+            "type": "feature",
+            "category": "AWS Elemental MediaConvert",
+            "description": "AWS Elemental MediaConvert SDK has added support for MP3 audio only outputs."
+        },
+        {
+            "type": "feature",
+            "category": "AWS Batch",
+            "description": "This release ensures INACTIVE job definitions are permanently deleted after 180 days."
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.changes/2.10.53.json b/.changes/2.10.53.json
new file mode 100644
index 000000000000..91314cfc854f
--- /dev/null
+++ b/.changes/2.10.53.json
@@ -0,0 +1,36 @@
+{
+    "version": "2.10.53",
+    "date": "2020-01-20",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "AWS Key Management Service",
+            "description": "The ConnectCustomKeyStore operation now provides new error codes (USER_LOGGED_IN and USER_NOT_FOUND) for customers to better troubleshoot if their connect custom key store operation fails. Password length validation during CreateCustomKeyStore now also occurs on the client side."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon CloudWatch",
+            "description": "Updating DescribeAnomalyDetectors API to return AnomalyDetector Status value in response."
+        },
+        {
+            "type": "feature",
+            "category": "Alexa For Business",
+            "description": "Add support for CreatedTime and ConnectionStatusUpdatedTime in response of SearchDevices API."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Elastic Compute Cloud",
+            "description": "This release provides support for a preview of bringing your own IPv6 addresses (BYOIP for IPv6) for use in AWS."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon CloudWatch Application Insights",
+            "description": "This release adds support for a list API to retrieve the configuration events logged during periodic updates to an application by Amazon CloudWatch Application Insights."
+        },
+        {
+            "type": "feature",
+            "category": "AWS Lambda",
+            "description": "Added reason codes to StateReasonCode (InvalidSubnet, InvalidSecurityGroup) and LastUpdateStatusReasonCode (SubnetOutOfIPAddresses, InvalidSubnet, InvalidSecurityGroup) for functions that connect to a VPC."
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.changes/2.10.54.json b/.changes/2.10.54.json
new file mode 100644
index 000000000000..5a4d34a1dbcc
--- /dev/null
+++ b/.changes/2.10.54.json
@@ -0,0 +1,41 @@
+{
+    "version": "2.10.54",
+    "date": "2020-01-21",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "AWS CodePipeline",
+            "description": "AWS CodePipeline enables an ability to stop pipeline executions."
+        },
+        {
+            "type": "feature",
+            "category": "AWS Application Discovery Service",
+            "description": "Documentation updates for the AWS Application Discovery Service."
+        },
+        {
+            "type": "feature",
+            "category": "AWS SDK for Java v2",
+            "description": "Updated service endpoint metadata."
+        },
+        {
+            "type": "feature",
+            "category": "AWS IoT Events",
+            "description": "Documentation updates for iotcolumbo"
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Elastic Compute Cloud",
+            "description": "Add an enum value to the result of DescribeByoipCidrs to support CIDRs that are not publicly advertisable."
+        },
+        {
+            "type": "bugfix",
+            "category": "Netty NIO Http Client",
+            "description": "Fixed a bug where an inactive http2 connection without `GOAWAY` frame received might get reused in a new request, causing `ClosedChannelException`"
+        },
+        {
+            "type": "feature",
+            "category": "AWS Marketplace Commerce Analytics",
+            "description": "Remove 4 deprecated data sets, change some data sets available dates to 2017-09-15"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.changes/2.10.55.json b/.changes/2.10.55.json
new file mode 100644
index 000000000000..27994f2cf066
--- /dev/null
+++ b/.changes/2.10.55.json
@@ -0,0 +1,36 @@
+{
+    "version": "2.10.55",
+    "date": "2020-01-23",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "Amazon Relational Database Service",
+            "description": "This SDK release introduces APIs that automate the export of Amazon RDS snapshot data to Amazon S3. The new APIs include: StartExportTask, CancelExportTask, DescribeExportTasks. These APIs automate the extraction of data from an RDS snapshot and export it to an Amazon S3 bucket. The data is stored in a compressed, consistent, and query-able format. After the data is exported, you can query it directly using tools such as Amazon Athena or Redshift Spectrum. You can also consume the data as part of a data lake solution. If you archive the data in S3 Infrequent Access or Glacier, you can reduce long term data storage costs by applying data lifecycle policies."
+        },
+        {
+            "type": "feature",
+            "category": "AWS SDK for Java v2",
+            "description": "Updated service endpoint metadata."
+        },
+        {
+            "type": "feature",
+            "category": "AWS SDK for Java v2",
+            "description": "Added ServiceMetadata.servicePartitions() to get partition metadata for a specific service"
+        },
+        {
+            "type": "feature",
+            "category": "AWS Identity and Access Management",
+            "description": "This release enables the Identity and Access Management policy simulator to simulate permissions boundary policies."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon DynamoDB Enhanced Client [Preview]",
+            "description": "Support for non-blocking asynchronous calling of all mapper operations"
+        },
+        {
+            "type": "feature",
+            "category": "AWS SDK for Java v2",
+            "description": "Improved error messages on UnknownHostExceptions"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.changes/2.10.56.json b/.changes/2.10.56.json
new file mode 100644
index 000000000000..dab2bee26028
--- /dev/null
+++ b/.changes/2.10.56.json
@@ -0,0 +1,46 @@
+{
+    "version": "2.10.56",
+    "date": "2020-01-24",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "Amazon Elastic Kubernetes Service",
+            "description": "Adding new error codes for Nodegroups in EKS"
+        },
+        {
+            "type": "feature",
+            "category": "Amazon EC2",
+            "description": "Adds EC2ThrottledException as a recognized throttling exception to be retried"
+        },
+        {
+            "type": "feature",
+            "category": "AWS OpsWorks CM",
+            "description": "AWS OpsWorks for Chef Automate now supports in-place upgrade to Chef Automate 2. Eligible servers can be updated through the management console, CLI and APIs."
+        },
+        {
+            "type": "feature",
+            "category": "AWS SDK for Java v2",
+            "description": "Updated service endpoint metadata."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon WorkSpaces",
+            "description": "Documentation updates for WorkSpaces"
+        },
+        {
+            "type": "feature",
+            "category": "Amazon EC2 Container Service",
+            "description": "This release provides support for tagging Amazon ECS task sets for services using external deployment controllers."
+        },
+        {
+            "type": "bugfix",
+            "category": "Netty NIO HTTP Client",
+            "description": "Fix issue where DNS resolution for a host is only made once for the initial request to the host. If the DNS entries change for a hostname, the client will resolve the new address until the client is closed and recreated."
+        },
+        {
+            "type": "feature",
+            "category": "AWS DataSync",
+            "description": "AWS DataSync now supports FSx for Windows File Server Locations"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.changes/2.10.57.json b/.changes/2.10.57.json
new file mode 100644
index 000000000000..6de1d762eff8
--- /dev/null
+++ b/.changes/2.10.57.json
@@ -0,0 +1,71 @@
+{
+    "version": "2.10.57",
+    "date": "2020-02-04",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "AWS Storage Gateway",
+            "description": "Adding KVM as a support hypervisor"
+        },
+        {
+            "type": "feature",
+            "category": "AWS SDK for Java v2",
+            "description": "Updated service endpoint metadata."
+        },
+        {
+            "type": "bugfix",
+            "category": "Netty NIO HTTP Client",
+            "description": "Deliver exceptions to stream channels correctly if there's an exception thrown on connection. This also fixes a bug where publisher signals onComplete if the stream is closed as a result of outbound GOAWAY."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon WorkMail",
+            "description": "This release adds support for tagging Amazon WorkMail organizations."
+        },
+        {
+            "type": "bugfix",
+            "category": "Amazon S3",
+            "description": "Fixed an issue where fields in `ListObjectVersionsResponse` and `ListMultipartUploadsResponse` are not decoded correctly when encodingType is specified as url. See [#1601](https://github.com/aws/aws-sdk-java-v2/issues/1601)"
+        },
+        {
+            "type": "feature",
+            "category": "AWS IoT",
+            "description": "Updated ThrottlingException documentation to report that the error code is 400, and not 429, to reflect actual system behaviour."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon DynamoDB Enhanced Client [Preview]",
+            "description": "Changing usage of typed builders for PutItem, UpdateItem and StaticTableSchema to explicitly provide class type."
+        },
+        {
+            "type": "feature",
+            "category": "Managed Streaming for Kafka",
+            "description": "This release enables AWS MSK customers to list Apache Kafka versions that are supported on AWS MSK clusters. Also includes changes to expose additional details of a cluster's state in DescribeCluster and ListClusters APIs."
+        },
+        {
+            "type": "bugfix",
+            "category": "Netty NIO HTTP Client",
+            "description": "Throws `IOException` for the race condition where an HTTP2 connection gets reused at the same time it gets inactive so that failed requests can be retried"
+        },
+        {
+            "type": "feature",
+            "category": "Amazon DynamoDB Enhanced Client [Preview]",
+            "description": "Renames top level sync/async MappedDatabase interfaces as DynamoDbEnhancedClient interfaces. Also adds builder definitions to the interfaces together with a static method that returns the default implementation of the builder."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Simple Systems Manager (SSM)",
+            "description": "This feature ensures that an instance is patched up to the available patches on a particular date. It can be enabled by selecting the 'ApproveUntilDate' option as the auto-approval rule while creating the patch baseline. ApproveUntilDate - The cutoff date for auto approval of released patches. Any patches released on or before this date will be installed automatically."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon CloudFront",
+            "description": "Documentation updates for CloudFront"
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Elastic Compute Cloud",
+            "description": "Amazon VPC Flow Logs adds support for 1-minute aggregation intervals."
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.changes/2.10.58.json b/.changes/2.10.58.json
new file mode 100644
index 000000000000..52ddb0cc73b8
--- /dev/null
+++ b/.changes/2.10.58.json
@@ -0,0 +1,41 @@
+{
+    "version": "2.10.58",
+    "date": "2020-02-05",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "Amazon Data Lifecycle Manager",
+            "description": "Updated the maximum number of tags that can be added to a snapshot using DLM to 45."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Elastic Compute Cloud",
+            "description": "This release provides support for tagging when you create a VPC endpoint, or VPC endpoint service."
+        },
+        {
+            "type": "feature",
+            "category": "AWS Ground Station",
+            "description": "Adds dataflowEndpointRegion property to DataflowEndpointConfig. The dateCreated, lastUpdated, and tags properties on GetSatellite have been deprecated."
+        },
+        {
+            "type": "feature",
+            "category": "AWS Elemental MediaConvert",
+            "description": "AWS Elemental MediaConvert SDK has added support for fine-tuned QVBR quality level."
+        },
+        {
+            "type": "feature",
+            "category": "AWS Resource Groups Tagging API",
+            "description": "Documentation-only update that adds services to the list of supported services."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Forecast Query Service",
+            "description": "Documentation updates for Amazon Forecast."
+        },
+        {
+            "type": "feature",
+            "category": "AWS SecurityHub",
+            "description": "Additional resource types are now supported in the AWS Security Finding Format (ASFF). The following new resource types are added, each having an accompanying resource details object with fields for security finding providers to populate: AwsCodeBuildProject, AwsEc2NetworkInterface, AwsEc2SecurityGroup, AwsElasticsearchDomain, AwsLambdaLayerVersion, AwsRdsDbInstance, and AwsWafWebAcl. The following resource types are added without an accompanying details object: AutoscalingAutoscalingGroup, AwsDynamoDbTable, AwsEc2Eip, AwsEc2Snapshot, AwsEc2Volume, AwsRdsDbSnapshot, AwsRedshiftCluster, and AwsS3Object. The number of allowed resources per finding is increased from 10 to 32. A new field is added in the Compliance object, RelatedRequirements. To learn more, visit our documentation on the ASFF."
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.changes/2.10.59.json b/.changes/2.10.59.json
new file mode 100644
index 000000000000..131bac6dd0a2
--- /dev/null
+++ b/.changes/2.10.59.json
@@ -0,0 +1,41 @@
+{
+    "version": "2.10.59",
+    "date": "2020-02-06",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "AWS CodeBuild",
+            "description": "AWS CodeBuild adds support for Amazon Elastic File Systems"
+        },
+        {
+            "type": "feature",
+            "category": "AWS AppSync",
+            "description": "AWS AppSync now supports X-Ray"
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Elastic Block Store",
+            "description": "Documentation updates for EBS direct APIs."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon DynamoDB Enhanced Client [Preview]",
+            "description": "In order to make operations more easily discoverable by an IDE, specific operation methods have been added to the enhanced client interface. An operation method takes a corresponding request object as parameter. Meanwhile, the generic execute() method is removed. This change affects only batch and transcribe operations at the database level."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon EC2 Container Registry",
+            "description": "This release contains updated text for the GetAuthorizationToken API."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Lex Model Building Service",
+            "description": "Amazon Lex now supports AMAZON.AlphaNumeric with regular expressions."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Elastic Compute Cloud",
+            "description": "This release adds platform details and billing info to the DescribeImages API."
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.changes/2.10.60.json b/.changes/2.10.60.json
new file mode 100644
index 000000000000..7daeb137527c
--- /dev/null
+++ b/.changes/2.10.60.json
@@ -0,0 +1,31 @@
+{
+    "version": "2.10.60",
+    "date": "2020-02-07",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "AWS RoboMaker",
+            "description": "This release adds support for simulation job batches"
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Relational Database Service",
+            "description": "Documentation updates for RDS: when restoring a DB cluster from a snapshot, must create DB instances"
+        },
+        {
+            "type": "feature",
+            "category": "AWS SDK for Java v2",
+            "description": "Updated service endpoint metadata."
+        },
+        {
+            "type": "feature",
+            "category": "EC2 Image Builder",
+            "description": "This version of the SDK includes bug fixes and documentation updates."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon DynamoDB Enhanced Client [Preview]",
+            "description": "Improves discoverability by renaming the table and index interfaces to be consistent with the client interface naming, and by adding operation methods for createTable(), scan() and query(), as applicable. These methods take a request object as parameter. Execute() methods for the index interface is removed since they are no longer needed."
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.changes/2.10.61.json b/.changes/2.10.61.json
new file mode 100644
index 000000000000..8fbb38ecde08
--- /dev/null
+++ b/.changes/2.10.61.json
@@ -0,0 +1,21 @@
+{
+    "version": "2.10.61",
+    "date": "2020-02-10",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "Amazon DocumentDB with MongoDB compatibility",
+            "description": "Added clarifying information that Amazon DocumentDB shares operational technology with Amazon RDS and Amazon Neptune."
+        },
+        {
+            "type": "feature",
+            "category": "AWS Key Management Service",
+            "description": "The ConnectCustomKeyStore API now provides a new error code (SUBNET_NOT_FOUND) for customers to better troubleshoot if their \"connect-custom-key-store\" operation fails."
+        },
+        {
+            "type": "feature",
+            "category": "AWS SDK for Java v2",
+            "description": "Updated service endpoint metadata."
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.changes/2.10.62.json b/.changes/2.10.62.json
new file mode 100644
index 000000000000..ee20a57c70c1
--- /dev/null
+++ b/.changes/2.10.62.json
@@ -0,0 +1,21 @@
+{
+    "version": "2.10.62",
+    "date": "2020-02-11",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "AWS CloudFormation",
+            "description": "This release of AWS CloudFormation StackSets allows you to centrally manage deployments to all the accounts in your organization or specific organizational units (OUs) in AWS Organizations. You will also be able to enable automatic deployments to any new accounts added to your organization or OUs. The permissions needed to deploy across accounts will automatically be taken care of by the StackSets service."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Elastic Compute Cloud",
+            "description": "Amazon EC2 Now Supports Tagging Spot Fleet."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Cognito Identity Provider",
+            "description": "Features:This release adds a new setting for a user pool to allow if customer wants their user signup/signin with case insensitive username. The current default setting is case sensitive, and for our next release we will change it to case insensitive."
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.changes/2.10.63.json b/.changes/2.10.63.json
new file mode 100644
index 000000000000..4bb888d063d0
--- /dev/null
+++ b/.changes/2.10.63.json
@@ -0,0 +1,41 @@
+{
+    "version": "2.10.63",
+    "date": "2020-02-12",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "Amazon Neptune",
+            "description": "This launch enables Neptune start-db-cluster and stop-db-cluster. Stopping and starting Amazon Neptune clusters helps you manage costs for development and test environments. You can temporarily stop all the DB instances in your cluster, instead of setting up and tearing down all the DB instances each time that you use the cluster."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Elastic Compute Cloud",
+            "description": "This release adds support for tagging public IPv4 pools."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Chime",
+            "description": "Documentation updates for Amazon Chime"
+        },
+        {
+            "type": "feature",
+            "category": "AWS Directory Service",
+            "description": "Release to add the ExpirationDateTime as an output to ListCertificates so as to ease customers to look into their certificate lifetime and make timely decisions about renewing them."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Elasticsearch Service",
+            "description": "Amazon Elasticsearch Service now offers fine-grained access control, which adds multiple capabilities to give tighter control over data. New features include the ability to use roles to define granular permissions for indices, documents, or fields and to extend Kibana with read-only views and secure multi-tenant support."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon WorkMail",
+            "description": "This release adds support for access control rules management in Amazon WorkMail."
+        },
+        {
+            "type": "feature",
+            "category": "AWS Glue",
+            "description": "Adding ability to add arguments that cannot be overridden to AWS Glue jobs"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.changes/2.10.64.json b/.changes/2.10.64.json
new file mode 100644
index 000000000000..1f93f2b9406a
--- /dev/null
+++ b/.changes/2.10.64.json
@@ -0,0 +1,26 @@
+{
+    "version": "2.10.64",
+    "date": "2020-02-13",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "Amazon DynamoDB Enhanced Client [Preview]",
+            "description": "Improves discoverability by adding operation methods for deleteItem(), getItem(), putItem and updateItem(), as applicable. These methods take a request object as parameter. Execute() methods for the table interface is removed since they are no longer needed."
+        },
+        {
+            "type": "feature",
+            "category": "Netty NIO HTTP Client",
+            "description": "When there is an I/O error on an http2 request, the SDK will start shutting down the connection - stopping using the http2 connection for new requests and closing it after all streams are finished."
+        },
+        {
+            "type": "feature",
+            "category": "AWS SDK for Java v2",
+            "description": "Updated service endpoint metadata."
+        },
+        {
+            "type": "feature",
+            "category": "AWS Elemental MediaPackage VOD",
+            "description": "Adds support for DASH with multiple media presentation description periods triggered by presence of SCTE-35 ad markers in the manifest.Also adds optional configuration for DASH SegmentTemplateFormat to refer to segments by Number with Duration, Number with Timeline or Time with Timeline and compact the manifest by combining duplicate SegmentTemplate tags."
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.changes/2.10.65.json b/.changes/2.10.65.json
new file mode 100644
index 000000000000..ae1367df3b1d
--- /dev/null
+++ b/.changes/2.10.65.json
@@ -0,0 +1,31 @@
+{
+    "version": "2.10.65",
+    "date": "2020-02-14",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "AWS MediaTailor",
+            "description": "AWS Elemental MediaTailor SDK now allows configuration of Personalization Threshold for HLS and DASH streams."
+        },
+        {
+            "type": "feature",
+            "category": "AWS Shield",
+            "description": "This release adds support for associating Amazon Route 53 health checks to AWS Shield Advanced protected resources."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Elastic Compute Cloud",
+            "description": "You can now enable Multi-Attach on Provisioned IOPS io1 volumes through the create-volume API."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon S3",
+            "description": "Added support for presigning `CreateMultipartUpload`, `UploadPart`, `CompleteMultipartUpload`, and `AbortMultipartUpload` requests."
+        },
+        {
+            "type": "feature",
+            "category": "AWS SecurityHub",
+            "description": "Security Hub has released a new DescribeStandards API action. This API action allows a customer to list all of the standards available in an account. For each standard, the list provides the customer with the standard name, description, and ARN. Customers can use the ARN as an input to the BatchEnableStandards API action. To learn more, visit our API documentation."
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.changes/2.10.66.json b/.changes/2.10.66.json
new file mode 100644
index 000000000000..bf3812e1dffd
--- /dev/null
+++ b/.changes/2.10.66.json
@@ -0,0 +1,31 @@
+{
+    "version": "2.10.66",
+    "date": "2020-02-17",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "AWS Cloud9",
+            "description": "AWS Cloud9 now supports the ability to tag Cloud9 development environments."
+        },
+        {
+            "type": "feature",
+            "category": "AWS SDK for Java v2",
+            "description": "Updated service endpoint metadata."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Elastic Compute Cloud",
+            "description": "Documentation updates for EC2"
+        },
+        {
+            "type": "feature",
+            "category": "Amazon DynamoDB",
+            "description": "Amazon DynamoDB enables you to restore your DynamoDB backup or table data across AWS Regions such that the restored table is created in a different AWS Region from where the source table or backup resides. You can do cross-region restores between AWS commercial Regions, AWS China Regions, and AWS GovCloud (US) Regions."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Rekognition",
+            "description": "This update adds the ability to detect text in videos and adds filters to image and video text detection."
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.changes/2.10.67.json b/.changes/2.10.67.json
new file mode 100644
index 000000000000..5e45aa097449
--- /dev/null
+++ b/.changes/2.10.67.json
@@ -0,0 +1,21 @@
+{
+    "version": "2.10.67",
+    "date": "2020-02-18",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "Amazon Relational Database Service",
+            "description": "This release supports Microsoft Active Directory authentication for Amazon Aurora."
+        },
+        {
+            "type": "feature",
+            "category": "Auto Scaling",
+            "description": "Amazon EC2 Auto Scaling now supports the ability to enable/disable target tracking, step scaling, and simple scaling policies."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Chime",
+            "description": "Added AudioFallbackUrl to support Chime SDK client."
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.changes/2.10.68.json b/.changes/2.10.68.json
new file mode 100644
index 000000000000..ea76797ecf61
--- /dev/null
+++ b/.changes/2.10.68.json
@@ -0,0 +1,26 @@
+{
+    "version": "2.10.68",
+    "date": "2020-02-19",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "AWS Lambda",
+            "description": "AWS Lambda now supports Ruby 2.7"
+        },
+        {
+            "type": "feature",
+            "category": "AWS SDK for Java v2",
+            "description": "Updated service endpoint metadata."
+        },
+        {
+            "type": "feature",
+            "category": "Auto Scaling",
+            "description": "Doc update for EC2 Auto Scaling: Add Enabled parameter for PutScalingPolicy"
+        },
+        {
+            "type": "feature",
+            "category": "AWS Service Catalog",
+            "description": "\"ListPortfolioAccess\" API now has a new optional parameter \"OrganizationParentId\". When it is provided and if the portfolio with the \"PortfolioId\" given was shared with an organization or organizational unit with \"OrganizationParentId\", all accounts in the organization sub-tree under parent which inherit an organizational portfolio share will be listed, rather than all accounts with external shares. To accommodate long lists returned from the new option, the API now supports pagination."
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.changes/2.10.69.json b/.changes/2.10.69.json
new file mode 100644
index 000000000000..468ca3ee42f2
--- /dev/null
+++ b/.changes/2.10.69.json
@@ -0,0 +1,21 @@
+{
+    "version": "2.10.69",
+    "date": "2020-02-20",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "AWS Savings Plans",
+            "description": "Added support for AWS Lambda in Compute Savings Plans"
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Pinpoint",
+            "description": "As of this release of the Amazon Pinpoint API, the Title property is optional for the CampaignEmailMessage object."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon AppConfig",
+            "description": "This release adds exponential growth type support for deployment strategies."
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.changes/2.10.7.json b/.changes/2.10.7.json
new file mode 100644
index 000000000000..3b7657d25986
--- /dev/null
+++ b/.changes/2.10.7.json
@@ -0,0 +1,21 @@
+{
+    "version": "2.10.7",
+    "date": "2019-11-01",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "Amazon Pinpoint",
+            "description": "This release of the Amazon Pinpoint API introduces support for using and managing journeys, and querying analytics data for journeys."
+        },
+        {
+            "type": "feature",
+            "category": "AWS CloudTrail",
+            "description": "This release adds two new APIs, GetTrail and ListTrails, and support for adding tags when you create a trail by using a new TagsList parameter on CreateTrail operations."
+        },
+        {
+            "type": "feature",
+            "category": "AWS Database Migration Service",
+            "description": "This release contains task timeline attributes in replication task statistics. This release also adds a note to the documentation for the CdcStartPosition task request parameter. This note describes how to enable the use of native CDC start points for a PostgreSQL source by setting the new slotName extra connection attribute on the source endpoint to the name of an existing logical replication slot."
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.changes/2.10.70.json b/.changes/2.10.70.json
new file mode 100644
index 000000000000..6d775f264f33
--- /dev/null
+++ b/.changes/2.10.70.json
@@ -0,0 +1,26 @@
+{
+    "version": "2.10.70",
+    "date": "2020-02-21",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "Amazon DynamoDB Enhanced Client [Preview]",
+            "description": "Improves discoverability by adding consumer-style methods for all client, table and index operations."
+        },
+        {
+            "type": "feature",
+            "category": "EC2 Image Builder",
+            "description": "This release of EC2 Image Builder increases the maximum policy document size for Image Builder resource-based policy APIs."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Redshift",
+            "description": "Extend elastic resize to support resizing clusters to different instance types."
+        },
+        {
+            "type": "feature",
+            "category": "AWS WAFV2",
+            "description": "Documentation updates for AWS WAF (wafv2) to correct the guidance for associating a web ACL to a CloudFront distribution."
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.changes/2.10.71.json b/.changes/2.10.71.json
new file mode 100644
index 000000000000..7160a6a2ec6d
--- /dev/null
+++ b/.changes/2.10.71.json
@@ -0,0 +1,36 @@
+{
+    "version": "2.10.71",
+    "date": "2020-02-24",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "Amazon DocumentDB with MongoDB compatibility",
+            "description": "Documentation updates for docdb"
+        },
+        {
+            "type": "feature",
+            "category": "AWS IoT Events",
+            "description": "Documentation updates for iotcolumbo"
+        },
+        {
+            "type": "feature",
+            "category": "Amazon FSx",
+            "description": "Announcing persistent file systems for Amazon FSx for Lustre that are ideal for longer-term storage and workloads, and a new generation of scratch file systems that offer higher burst throughput for spiky workloads."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon CloudWatch Events",
+            "description": "This release allows you to create and manage tags for event buses."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon EventBridge",
+            "description": "This release allows you to create and manage tags for event buses."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Import/Export Snowball",
+            "description": "AWS Snowball adds a field for entering your GSTIN when creating AWS Snowball jobs in the Asia Pacific (Mumbai) region."
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.changes/2.10.72.json b/.changes/2.10.72.json
new file mode 100644
index 000000000000..8d4773e1d13e
--- /dev/null
+++ b/.changes/2.10.72.json
@@ -0,0 +1,36 @@
+{
+    "version": "2.10.72",
+    "date": "2020-02-25",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "AWS Secrets Manager",
+            "description": "This release increases the maximum allowed size of SecretString or SecretBinary from 10KB to 64KB in the CreateSecret, UpdateSecret, PutSecretValue and GetSecretValue APIs."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon DynamoDB Enhanced Client [Preview]",
+            "description": "Improves discoverability by adding consumer-style methods for all client, table and index operations."
+        },
+        {
+            "type": "feature",
+            "category": "AWS Step Functions",
+            "description": "This release adds support for CloudWatch Logs for Standard Workflows."
+        },
+        {
+            "type": "feature",
+            "category": "AWS SDK for Java v2",
+            "description": "Updated service endpoint metadata."
+        },
+        {
+            "type": "feature",
+            "category": "Managed Streaming for Kafka",
+            "description": "Amazon MSK has added support for Broker Log delivery to CloudWatch, S3, and Firehose."
+        },
+        {
+            "type": "feature",
+            "category": "AWS Outposts",
+            "description": "This release adds DeleteSite and DeleteOutpost."
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.changes/2.10.73.json b/.changes/2.10.73.json
new file mode 100644
index 000000000000..f1d6943a2737
--- /dev/null
+++ b/.changes/2.10.73.json
@@ -0,0 +1,36 @@
+{
+    "version": "2.10.73",
+    "date": "2020-02-26",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "Amazon Elastic Compute Cloud",
+            "description": "This release changes the RunInstances CLI and SDK's so that if you do not specify a client token, a randomly generated token is used for the request to ensure idempotency."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon SageMaker Service",
+            "description": "SageMaker UpdateEndpoint API now supports retained variant properties, e.g., instance count, variant weight. SageMaker ListTrials API filter by TrialComponentName. Make ExperimentConfig name length limits consistent with CreateExperiment, CreateTrial, and CreateTrialComponent APIs."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Transcribe Service",
+            "description": "Amazon Transcribe's Automatic Content Redaction feature enables you to automatically redact sensitive personally identifiable information (PII) from transcription results. It replaces each instance of an identified PII utterance with a [PII] tag in the transcript."
+        },
+        {
+            "type": "feature",
+            "category": "AWS SDK for Java v2",
+            "description": "Updated service endpoint metadata."
+        },
+        {
+            "type": "feature",
+            "category": "AWS SecurityHub",
+            "description": "Security Hub has added to the DescribeProducts API operation a new response field called IntegrationTypes. The IntegrationTypes field lists the types of actions that a product performs relative to Security Hub such as send findings to Security Hub and receive findings from Security Hub."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon DynamoDB Enhanced Client [Preview]",
+            "description": "Added the BeanTableSchema implementation of TableSchema that allows a TableSchema to be instantiated from an annotated Java bean class which can then be used with the DynamoDB Enhanced Client."
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.changes/2.10.74.json b/.changes/2.10.74.json
new file mode 100644
index 000000000000..532b19f173c2
--- /dev/null
+++ b/.changes/2.10.74.json
@@ -0,0 +1,21 @@
+{
+    "version": "2.10.74",
+    "date": "2020-02-27",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "AWS SDK for Java v2",
+            "description": "Updated service endpoint metadata."
+        },
+        {
+            "type": "feature",
+            "category": "AWS Global Accelerator",
+            "description": "This release adds support for adding tags to accelerators and bringing your own IP address to AWS Global Accelerator (BYOIP)."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Lightsail",
+            "description": "Adds support to create notification contacts in Amazon Lightsail, and to create instance, database, and load balancer metric alarms that notify you based on the value of a metric relative to a threshold that you specify."
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.changes/2.10.75.json b/.changes/2.10.75.json
new file mode 100644
index 000000000000..eeccf6eea273
--- /dev/null
+++ b/.changes/2.10.75.json
@@ -0,0 +1,51 @@
+{
+    "version": "2.10.75",
+    "date": "2020-02-28",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "Amazon QuickSight",
+            "description": "Added SearchDashboards API that allows listing of dashboards that a specific user has access to."
+        },
+        {
+            "type": "feature",
+            "category": "AWS Glue",
+            "description": "AWS Glue adds resource tagging support for Machine Learning Transforms and adds a new API, ListMLTransforms to support tag filtering. With this feature, customers can use tags in AWS Glue to organize and control access to Machine Learning Transforms."
+        },
+        {
+            "type": "feature",
+            "category": "Elastic Load Balancing",
+            "description": "Added a target group attribute to support sticky sessions for Network Load Balancers."
+        },
+        {
+            "type": "feature",
+            "category": "Access Analyzer",
+            "description": "This release includes improvements and fixes bugs for the IAM Access Analyzer feature."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon CodeGuru Profiler",
+            "description": "Documentation updates for Amazon CodeGuru Profiler"
+        },
+        {
+            "type": "feature",
+            "category": "AWS App Mesh",
+            "description": "App Mesh now supports Transport Layer Security (TLS) between Virtual Nodes in a Mesh. Customers can use managed certificates from an AWS Certificate Manager Private Certificate Authority or bring their own certificates from the local file system to encrypt traffic between their workloads. See https://docs.aws.amazon.com/app-mesh/latest/userguide/virtual-node-tls.html for details."
+        },
+        {
+            "type": "feature",
+            "category": "AWS Config",
+            "description": "Accepts a structured query language (SQL) SELECT command and an aggregator name, performs the corresponding search on resources aggregated by the aggregator, and returns resource configurations matching the properties."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Augmented AI Runtime",
+            "description": "This release updates Amazon Augmented AI ListHumanLoops API, DescribeHumanLoop response, StartHumanLoop response and type names of SDK fields."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon WorkDocs",
+            "description": "Documentation updates for workdocs"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.changes/2.10.76.json b/.changes/2.10.76.json
new file mode 100644
index 000000000000..60ce783decd5
--- /dev/null
+++ b/.changes/2.10.76.json
@@ -0,0 +1,11 @@
+{
+    "version": "2.10.76",
+    "date": "2020-02-28",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "AWS Config",
+            "description": "Correcting list of supported resource types."
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.changes/2.10.77.json b/.changes/2.10.77.json
new file mode 100644
index 000000000000..adfc3c738537
--- /dev/null
+++ b/.changes/2.10.77.json
@@ -0,0 +1,21 @@
+{
+    "version": "2.10.77",
+    "date": "2020-03-02",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "Amazon CloudWatch",
+            "description": "Introducing Amazon CloudWatch Composite Alarms"
+        },
+        {
+            "type": "feature",
+            "category": "AWS SDK for Java v2",
+            "description": "Updated service endpoint metadata."
+        },
+        {
+            "type": "feature",
+            "category": "AWS Comprehend Medical",
+            "description": "New Time Expression feature, part of DetectEntitiesV2 API will provide temporal relations to existing NERe entities such as Medication, Test, Treatment, Procedure and Medical conditions."
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.changes/2.10.78.json b/.changes/2.10.78.json
new file mode 100644
index 000000000000..9701522dba63
--- /dev/null
+++ b/.changes/2.10.78.json
@@ -0,0 +1,16 @@
+{
+    "version": "2.10.78",
+    "date": "2020-03-03",
+    "entries": [
+        {
+            "type": "bugfix",
+            "category": "Netty NIO HTTP Client",
+            "description": "Fix an issue where the Netty client was prematurely considering an HTTP/2 request body as sent, but was still in the process of being transferred to the remote endpoint."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Elastic Compute Cloud",
+            "description": "Amazon VPC Flow Logs adds support for tags and tagging on resource creation."
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.changes/2.10.79.json b/.changes/2.10.79.json
new file mode 100644
index 000000000000..97fe6ea69f16
--- /dev/null
+++ b/.changes/2.10.79.json
@@ -0,0 +1,11 @@
+{
+    "version": "2.10.79",
+    "date": "2020-03-04",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "Amazon Pinpoint",
+            "description": "This release of the Amazon Pinpoint API introduces support for integrating recommender models with email, push notification, and SMS message templates. You can now use these types of templates to connect to recommender models and add personalized recommendations to messages that you send from campaigns and journeys."
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.changes/2.10.8.json b/.changes/2.10.8.json
new file mode 100644
index 000000000000..7347f9ec3b50
--- /dev/null
+++ b/.changes/2.10.8.json
@@ -0,0 +1,21 @@
+{
+    "version": "2.10.8",
+    "date": "2019-11-04",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "AWS RoboMaker",
+            "description": "RoboMaker Fleet Management launch a feature to verify your robot is ready to download and install the new robot application using a download condition file, which is a script run on the robot prior to downloading the new deployment."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon DynamoDB Accelerator (DAX)",
+            "description": "Documentation updates for dax"
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Elastic Compute Cloud",
+            "description": "Documentation updates for ec2"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.changes/2.10.80.json b/.changes/2.10.80.json
new file mode 100644
index 000000000000..7502199d9427
--- /dev/null
+++ b/.changes/2.10.80.json
@@ -0,0 +1,36 @@
+{
+    "version": "2.10.80",
+    "date": "2020-03-05",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "Amazon DynamoDB Enhanced Client [Preview]",
+            "description": "Adds javadoc to operation methods and request/response objects."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon GuardDuty",
+            "description": "Add a new finding field for EC2 findings indicating the instance's local IP address involved in the threat."
+        },
+        {
+            "type": "feature",
+            "category": "AWS SDK for Java v2",
+            "description": "Updated service endpoint metadata."
+        },
+        {
+            "type": "feature",
+            "category": "AWS OpsWorks CM",
+            "description": "Updated the Tag regex pattern to align with AWS tagging APIs."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Elastic Kubernetes Service",
+            "description": "Amazon EKS now supports adding a KMS key to your cluster for envelope encryption of Kubernetes secrets."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Elastic Compute Cloud",
+            "description": "You can now create AWS Client VPN Endpoints with a specified VPC and Security Group. Additionally, you can modify these attributes when modifying the endpoint."
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.changes/2.10.81.json b/.changes/2.10.81.json
new file mode 100644
index 000000000000..a1860553e473
--- /dev/null
+++ b/.changes/2.10.81.json
@@ -0,0 +1,41 @@
+{
+    "version": "2.10.81",
+    "date": "2020-03-06",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "Amazon Elastic Compute Cloud",
+            "description": "This release provides customers with a self-service option to enable Local Zones."
+        },
+        {
+            "type": "feature",
+            "category": "AWS RoboMaker",
+            "description": "Added support for streaming a GUI from robot and simulation applications"
+        },
+        {
+            "type": "feature",
+            "category": "AWS SDK for Java v2",
+            "description": "Updated service endpoint metadata."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon GuardDuty",
+            "description": "Amazon GuardDuty findings now include the OutpostArn if the finding is generated for an AWS Outposts EC2 host."
+        },
+        {
+            "type": "bugfix",
+            "category": "Netty NIO Http Client",
+            "description": "Expand Http2 connection-level flow control window when a new stream is acquired on that connection so that the connection-level window size is proportional to the number of streams."
+        },
+        {
+            "type": "feature",
+            "category": "AWS Signer",
+            "description": "This release enables signing image format override in PutSigningProfile requests, adding two more enum fields, JSONEmbedded and JSONDetached. This release also extends the length limit of SigningProfile name from 20 to 64."
+        },
+        {
+            "type": "feature",
+            "category": "AWS App Mesh",
+            "description": "App Mesh now supports sharing a Mesh with other AWS accounts. Customers can use AWS Resource Access Manager to share their Mesh with other accounts in their organization to connection applications within a single service mesh. See https://docs.aws.amazon.com/app-mesh/latest/userguide/sharing.html for details."
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.changes/2.10.82.json b/.changes/2.10.82.json
new file mode 100644
index 000000000000..d8424bd86bca
--- /dev/null
+++ b/.changes/2.10.82.json
@@ -0,0 +1,46 @@
+{
+    "version": "2.10.82",
+    "date": "2020-03-09",
+    "entries": [
+        {
+            "type": "bugfix",
+            "category": "AWS SDK for Java v2",
+            "description": "Use the last seen HTTP/1.1 header value for headers defined to only appear once in an HTTP message instead of merging them all into a list. The order in which header values are inspected is: headers set by the request marshaller, overridden headers set on the client, then finally overridden headers set on the SDK request object. See https://tools.ietf.org/html/rfc2616#section-4.2 for more information."
+        },
+        {
+            "type": "feature",
+            "category": "AWS SDK for Java v2",
+            "description": "Added support for \"retry modes\". A retry mode allows configuring multiple SDK parameters at once using default retry profiles, some of which are standardized between AWS SDK languages. See RetryMode javadoc for more information."
+        },
+        {
+            "type": "bugfix",
+            "category": "AWS SDK for Java v2",
+            "description": "Fixed an issue where specifying your own retry policy would override AWS and service-specific retry conditions. By default, all retry policies now have AWS and service-specific retry conditions added. This can be disabled via the new `RetryPolicy.furtherRefinementsAllowed(false)`."
+        },
+        {
+            "type": "bugfix",
+            "category": "AWS SDK for Java v2",
+            "description": "Fixed an issue where the retry condition returned by `RetryPolicy.retryCondition` differed from the one specified by `RetryPolicy.Builder.retryCondition`. The old value can be accessed via the new `RetryPolicy.aggregateRetryCondition`."
+        },
+        {
+            "type": "feature",
+            "category": "AWS SDK for Java v2",
+            "description": "Added the ability to configure or disable the default retry throttling behavior of the SDK that 'kicks in' during a large volume of retriable service call errors. This behavior can now be configured via `RetryPolicy.retryCapacityCondition`."
+        },
+        {
+            "type": "feature",
+            "category": "AWS Elemental MediaLive",
+            "description": "AWS Elemental MediaLive now supports the ability to configure the Preferred Channel Pipeline for channels contributing to a Multiplex."
+        },
+        {
+            "type": "feature",
+            "category": "AWS Database Migration Service",
+            "description": "Added new settings for Kinesis target to include detailed transaction info; to capture table DDL details; to use single-line unformatted json, which can be directly queried by AWS Athena if data is streamed into S3 through AWS Kinesis Firehose. Added CdcInsertsAndUpdates in S3 target settings to allow capture ongoing insertions and updates only."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Elastic Compute Cloud",
+            "description": "Amazon Virtual Private Cloud (VPC) NAT Gateway adds support for tagging on resource creation."
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.changes/2.10.83.json b/.changes/2.10.83.json
new file mode 100644
index 000000000000..b9cff19f5f85
--- /dev/null
+++ b/.changes/2.10.83.json
@@ -0,0 +1,36 @@
+{
+    "version": "2.10.83",
+    "date": "2020-03-10",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "AWS Marketplace Commerce Analytics",
+            "description": "Change the disbursement data set to look past 31 days instead until the beginning of the month."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Transcribe Service",
+            "description": "Amazon Transcribe's Automatic Content Redaction feature enables you to automatically redact sensitive personally identifiable information (PII) from transcription results. It replaces each instance of an identified PII utterance with a [PII] tag in the transcript."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Elastic Compute Cloud",
+            "description": "Documentation updates for EC2"
+        },
+        {
+            "type": "feature",
+            "category": "AWSServerlessApplicationRepository",
+            "description": "AWS Serverless Application Repository now supports sharing applications privately with AWS Organizations."
+        },
+        {
+            "type": "bugfix",
+            "category": "AWS SDK for Java v2",
+            "description": "Reverts a recent change from 2.10.70 where the json protocol type was changed to application/json, this is now back to application/x-amz-json-1.1."
+        },
+        {
+            "type": "feature",
+            "category": "AWS IoT Events",
+            "description": "API update that adds a new parameter, durationExpression, to SetTimerAction, and deprecates seconds"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.changes/2.10.84.json b/.changes/2.10.84.json
new file mode 100644
index 000000000000..b66000168d94
--- /dev/null
+++ b/.changes/2.10.84.json
@@ -0,0 +1,16 @@
+{
+    "version": "2.10.84",
+    "date": "2020-03-11",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "Amazon Redshift",
+            "description": "Amazon Redshift now supports operations to pause and resume a cluster on demand or on a schedule."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Elastic File System",
+            "description": "Documentation updates for elasticfilesystem"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.changes/2.10.85.json b/.changes/2.10.85.json
new file mode 100644
index 000000000000..f34778978c26
--- /dev/null
+++ b/.changes/2.10.85.json
@@ -0,0 +1,36 @@
+{
+    "version": "2.10.85",
+    "date": "2020-03-12",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "Amazon Elastic Compute Cloud",
+            "description": "Documentation updates for EC2"
+        },
+        {
+            "type": "feature",
+            "category": "AWS IoT",
+            "description": "As part of this release, we are extending capability of AWS IoT Rules Engine to support IoT Cloudwatch log action. The IoT Cloudwatch log rule action lets you send messages from IoT sensors and applications to Cloudwatch logs for troubleshooting and debugging."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Lex Model Building Service",
+            "description": "Amazon Lex now supports tagging for bots, bot aliases and bot channels."
+        },
+        {
+            "type": "feature",
+            "category": "AWS SDK for Java v2",
+            "description": "Updated service endpoint metadata."
+        },
+        {
+            "type": "feature",
+            "category": "AmazonApiGatewayV2",
+            "description": "Amazon API Gateway HTTP APIs is now generally available. HTTP APIs offer the core functionality of REST API at up to 71% lower price compared to REST API, 60% lower p99 latency, and is significantly easier to use. As part of general availability, we added new features to route requests to private backends such as private ALBs, NLBs, and IP/ports. We also brought over a set of features from REST API such as Stage Variables, and Stage/Route level throttling. Custom domain names can also now be used with both REST And HTTP APIs."
+        },
+        {
+            "type": "feature",
+            "category": "AWS SecurityHub",
+            "description": "The AWS Security Finding Format is being augmented with the following changes. 21 new resource types without corresponding details objects are added. Another new resource type, AwsS3Object, has an accompanying details object. Severity.Label is a new string field that indicates the severity of a finding. The available values are: INFORMATIONAL, LOW, MEDIUM, HIGH, CRITICAL. The new string field Workflow.Status indicates the status of the investigation into a finding. The available values are: NEW, NOTIFIED, RESOLVED, SUPPRESSED."
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.changes/2.10.86.json b/.changes/2.10.86.json
new file mode 100644
index 000000000000..de89348d4a8e
--- /dev/null
+++ b/.changes/2.10.86.json
@@ -0,0 +1,11 @@
+{
+    "version": "2.10.86",
+    "date": "2020-03-13",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "Amazon AppConfig",
+            "description": "This release adds S3 as a configuration source provider."
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.changes/2.10.87.json b/.changes/2.10.87.json
new file mode 100644
index 000000000000..1290e9d73f89
--- /dev/null
+++ b/.changes/2.10.87.json
@@ -0,0 +1,41 @@
+{
+    "version": "2.10.87",
+    "date": "2020-03-16",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "Amazon Simple Systems Manager (SSM)",
+            "description": "Resource data sync for AWS Systems Manager Inventory now includes destination data sharing. This feature enables you to synchronize inventory data from multiple AWS accounts into a central Amazon S3 bucket. To use this feature, all AWS accounts must be listed in AWS Organizations."
+        },
+        {
+            "type": "feature",
+            "category": "AWS SDK for Java v2",
+            "description": "Updated service endpoint metadata."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon EC2 Container Service",
+            "description": "This release adds the ability to update the task placement strategy and constraints for Amazon ECS services."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon ElastiCache",
+            "description": "Amazon ElastiCache now supports Global Datastore for Redis. Global Datastore for Redis offers fully managed, fast, reliable and secure cross-region replication. Using Global Datastore for Redis, you can create cross-region read replica clusters for ElastiCache for Redis to enable low-latency reads and disaster recovery across regions. You can create, modify and describe a Global Datastore, as well as add or remove regions from your Global Datastore and promote a region as primary in Global Datastore."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon DynamoDB Enhanced Client [Preview]",
+            "description": "The enhanced DDB client table schema now supports custom AttributeConverterProviders, and StaticAttribute can take individual AttributeConverter to override default attribute converter behavior."
+        },
+        {
+            "type": "feature",
+            "category": "AWS S3 Control",
+            "description": "Amazon S3 now supports Batch Operations job tagging."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Cognito Identity Provider",
+            "description": "Additional response field \"CompromisedCredentialsDetected\" added to AdminListUserAuthEvents."
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.changes/2.10.88.json b/.changes/2.10.88.json
new file mode 100644
index 000000000000..018bc306c56b
--- /dev/null
+++ b/.changes/2.10.88.json
@@ -0,0 +1,21 @@
+{
+    "version": "2.10.88",
+    "date": "2020-03-17",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "AWS Elemental MediaConvert",
+            "description": "AWS Elemental MediaConvert SDK has added support for: AV1 encoding in File Group MP4, DASH and CMAF DASH outputs; PCM/WAV audio output in MPEG2-TS containers; and Opus audio in Webm inputs."
+        },
+        {
+            "type": "feature",
+            "category": "AWS SDK for Java v2",
+            "description": "Updated service endpoint metadata."
+        },
+        {
+            "type": "bugfix",
+            "category": "AWS SDK for Java v2",
+            "description": "Fix an issue where the signing key is created only once at the start of the request for event streaming requests. This causes requests that span two or more days to have signing errors once the date changes because the signing key was derived only once using the date at the beginning of the request."
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.changes/2.10.89.json b/.changes/2.10.89.json
new file mode 100644
index 000000000000..51e74182eb77
--- /dev/null
+++ b/.changes/2.10.89.json
@@ -0,0 +1,26 @@
+{
+    "version": "2.10.89",
+    "date": "2020-03-18",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "Amazon Personalize",
+            "description": "[Personalize] Adds support for returning hyperparameter values of the best performing model in a HPO job."
+        },
+        {
+            "type": "feature",
+            "category": "AWS MediaConnect",
+            "description": "Feature adds the ability for a flow to have multiple redundant sources that provides resiliency to a source failing. The new APIs added to enable the feature are, AddFlowSources, RemoveFlowSource and UpdateFlow."
+        },
+        {
+            "type": "feature",
+            "category": "AWS SDK for Java v2",
+            "description": "Updated service endpoint metadata."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Relational Database Service",
+            "description": "Updated the MaxRecords type in DescribeExportTasks to Integer."
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.changes/2.10.9.json b/.changes/2.10.9.json
new file mode 100644
index 000000000000..edfdcbe9a4a3
--- /dev/null
+++ b/.changes/2.10.9.json
@@ -0,0 +1,16 @@
+{
+    "version": "2.10.9",
+    "date": "2019-11-05",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "AWS CodeStar Notifications",
+            "description": "This release adds a notification manager for events in repositories, build projects, deployments, and pipelines. You can now configure rules and receive notifications about events that occur for resources. Each notification includes a status message as well as a link to the resource (repository, build project, deployment application, or pipeline) whose event generated the notification."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Relational Database Service",
+            "description": "Documentation updates for Amazon RDS"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.changes/2.10.90.json b/.changes/2.10.90.json
new file mode 100644
index 000000000000..1bc2885b9927
--- /dev/null
+++ b/.changes/2.10.90.json
@@ -0,0 +1,16 @@
+{
+    "version": "2.10.90",
+    "date": "2020-03-19",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "AWS Outposts",
+            "description": "Documentation updates for AWS Outposts."
+        },
+        {
+            "type": "feature",
+            "category": "AWS Certificate Manager",
+            "description": "AWS Certificate Manager documentation updated on API calls ImportCertificate and ListCertificate. Specific updates included input constraints, private key size for import and next token size for list."
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.changes/2.10.91.json b/.changes/2.10.91.json
new file mode 100644
index 000000000000..d9deebd17e5a
--- /dev/null
+++ b/.changes/2.10.91.json
@@ -0,0 +1,16 @@
+{
+    "version": "2.10.91",
+    "date": "2020-03-20",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "AWS SDK for Java v2",
+            "description": "Updated service endpoint metadata."
+        },
+        {
+            "type": "feature",
+            "category": "AWS Service Catalog",
+            "description": "Added \"productId\" and \"portfolioId\" to responses from CreateConstraint, UpdateConstraint, ListConstraintsForPortfolio, and DescribeConstraint APIs"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.changes/2.11.0.json b/.changes/2.11.0.json
new file mode 100644
index 000000000000..c7ab334f3017
--- /dev/null
+++ b/.changes/2.11.0.json
@@ -0,0 +1,31 @@
+{
+    "version": "2.11.0",
+    "date": "2020-03-23",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "Amazon Elastic Kubernetes Service",
+            "description": "Adding new error code IamLimitExceeded for Nodegroups in EKS"
+        },
+        {
+            "type": "feature",
+            "category": "AmazonApiGatewayV2",
+            "description": "Documentation updates to reflect that the default timeout for integrations is now 30 seconds for HTTP APIs."
+        },
+        {
+            "type": "feature",
+            "category": "AWS SDK for Java v2",
+            "description": "Updating dependency version: netty 4.1.42.Final -> 4.1.46.Final (contains the fix for reducing heap usage for netty client)"
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Route 53",
+            "description": "Documentation updates for Route 53."
+        },
+        {
+            "type": "feature",
+            "category": "AWS SDK for Java v2",
+            "description": "Bump minor version to '2.11.0-SNAPSHOT' because of [#1692](https://github.com/aws/aws-sdk-java-v2/issues/1692)"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.changes/2.11.1.json b/.changes/2.11.1.json
new file mode 100644
index 000000000000..9100677a3b14
--- /dev/null
+++ b/.changes/2.11.1.json
@@ -0,0 +1,31 @@
+{
+    "version": "2.11.1",
+    "date": "2020-03-24",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "Amazon Elastic Kubernetes Service",
+            "description": "Adding new error codes: Ec2SubnetInvalidConfiguration and NodeCreationFailure for Nodegroups in EKS"
+        },
+        {
+            "type": "feature",
+            "category": "AWS SDK for Java v2",
+            "description": "Updated service endpoint metadata."
+        },
+        {
+            "type": "feature",
+            "category": "AWS Organizations",
+            "description": "Introduces actions for giving a member account administrative Organizations permissions for an AWS service. You can run this action only for AWS services that support this feature."
+        },
+        {
+            "type": "feature",
+            "category": "AWS RDS DataService",
+            "description": "Documentation updates for rds-data"
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Athena",
+            "description": "Documentation updates for Athena, including QueryExecutionStatus QUEUED and RUNNING states. QUEUED now indicates that the query has been submitted to the service. RUNNING indicates that the query is in execution phase."
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.changes/2.11.2.json b/.changes/2.11.2.json
new file mode 100644
index 000000000000..93008d01a6b2
--- /dev/null
+++ b/.changes/2.11.2.json
@@ -0,0 +1,76 @@
+{
+    "version": "2.11.2",
+    "date": "2020-03-25",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "AWS SDK for Java v2",
+            "description": "Reduced the number of times the profile file configuration is read from disk on client creation from 3-5 to 1."
+        },
+        {
+            "type": "feature",
+            "category": "AWS X-Ray",
+            "description": "GetTraceSummaries - Now provides additional root cause attribute ClientImpacting which indicates whether root cause impacted trace client."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Elasticsearch Service",
+            "description": "Adding support for customer packages (dictionary files) to Amazon Elasticsearch Service"
+        },
+        {
+            "type": "bugfix",
+            "category": "Amazon DynamoDB",
+            "description": "Fixed an issue that could cause a null-pointer-exception when using anonymous credentials with endpoint discovery enabled."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Managed Blockchain",
+            "description": "Amazon Managed Blockchain now has support to publish Hyperledger Fabric peer node, chaincode, and certificate authority (CA) logs to Amazon CloudWatch Logs."
+        },
+        {
+            "type": "feature",
+            "category": "AWS SDK for Java v2",
+            "description": "Updated service endpoint metadata."
+        },
+        {
+            "type": "bugfix",
+            "category": "Amazon DynamoDB Enhanced Client [Preview]",
+            "description": "Performance improvements."
+        },
+        {
+            "type": "feature",
+            "category": "AWS Cost Explorer Service",
+            "description": "Customers can now receive Savings Plans recommendations at the member (linked) account level."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Detective",
+            "description": "The new ACCEPTED_BUT_DISABLED member account status indicates that a member account that accepted the invitation is blocked from contributing data to the behavior graph. The reason is provided in the new DISABLED_REASON property. The new StartMonitoringMember operation enables a blocked member account."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon CloudWatch Application Insights",
+            "description": "Amazon CloudWatch Application Insights for .NET and SQL Server now integrates with Amazon CloudWatch Events (AWS CodeDeploy, AWS Health and Amazon EC2 state changes). This feature enables customers to view events related to problems detected by CloudWatch Application Insights, and reduce mean-time-to-resolution (MTTR)."
+        },
+        {
+            "type": "feature",
+            "category": "AWS SDK for Java v2",
+            "description": "Added a `defaultProfileFile` and `defaultProfileName` option to the client override configuration. Setting this configuration value is equivalent to setting the environment or system properties for the profile file and profile name. Specifically, it sets the default profile file and profile name used by the client."
+        },
+        {
+            "type": "bugfix",
+            "category": "Amazon S3",
+            "description": "Fixed a bug where explicitly disabling use-arn-region on S3Configuration would have lower priority than the environment variable, system property or profile property."
+        },
+        {
+            "type": "bugfix",
+            "category": "Amazon DynamoDB",
+            "description": "Fixed an issue where endpoint discovery configuration specified in the profile file was being ignored."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon DynamoDB",
+            "description": "When endpoint discovery is enabled, the endpoint discovery process is now initialized with the first request, instead of 60 seconds after the first request."
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.changes/2.11.3.json b/.changes/2.11.3.json
new file mode 100644
index 000000000000..615edf7e4152
--- /dev/null
+++ b/.changes/2.11.3.json
@@ -0,0 +1,26 @@
+{
+    "version": "2.11.3",
+    "date": "2020-03-26",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "Amazon SageMaker Service",
+            "description": "This release updates Amazon Augmented AI CreateFlowDefinition API and DescribeFlowDefinition response."
+        },
+        {
+            "type": "feature",
+            "category": "AWS SDK for Java v2",
+            "description": "Updated service endpoint metadata."
+        },
+        {
+            "type": "feature",
+            "category": "AWS SecurityHub",
+            "description": "Security Hub has now made it easier to opt out of default standards when you enable Security Hub. We added a new Boolean parameter to EnableSecurityHub called EnableDefaultStandards. If that parameter is true, Security Hub's default standards are enabled. A new Boolean parameter for standards, EnabledByDefault, indicates whether a standard is a default standard. Today, the only default standard is CIS AWS Foundations Benchmark v1.2. Additional default standards will be added in the future.To learn more, visit our documentation on the EnableSecurityHub API action."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon FSx",
+            "description": "This release includes two changes: a new lower-cost, storage type called HDD (Hard Disk Drive), and a new generation of the Single-AZ deployment type called Single AZ 2. The HDD storage type can be selected on Multi AZ 1 and Single AZ 2 deployment types."
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.changes/2.11.4.json b/.changes/2.11.4.json
new file mode 100644
index 000000000000..dbab31a8ff86
--- /dev/null
+++ b/.changes/2.11.4.json
@@ -0,0 +1,31 @@
+{
+    "version": "2.11.4",
+    "date": "2020-03-27",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "AWS Service Catalog",
+            "description": "Added \"LocalRoleName\" as an acceptable Parameter for Launch type in CreateConstraint and UpdateConstraint APIs"
+        },
+        {
+            "type": "feature",
+            "category": "AWS Global Accelerator",
+            "description": "This update adds an event history to the ListByoipCidr API call. This enables you to see the changes that you've made for an IP address range that you bring to AWS Global Accelerator through bring your own IP address (BYOIP)."
+        },
+        {
+            "type": "feature",
+            "category": "AWS SDK for Java v2",
+            "description": "Updated service endpoint metadata."
+        },
+        {
+            "type": "feature",
+            "category": "AWSKendraFrontendService",
+            "description": "The Amazon Kendra Microsoft SharePoint data source now supports include and exclude regular expressions and change log features. Include and exclude regular expressions enable you to provide a list of regular expressions to match the display URL of SharePoint documents to either include or exclude documents respectively. When you enable the changelog feature it enables Amazon Kendra to use the SharePoint change log to determine which documents to update in the index."
+        },
+        {
+            "type": "bugfix",
+            "category": "AWS SDK for Java v2",
+            "description": "Remove the `LimitExceededException` as a throttling error as it seems many services don't treat it as a throttling error."
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.changes/2.11.5.json b/.changes/2.11.5.json
new file mode 100644
index 000000000000..b24f9e69994d
--- /dev/null
+++ b/.changes/2.11.5.json
@@ -0,0 +1,16 @@
+{
+    "version": "2.11.5",
+    "date": "2020-03-30",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "AWS SDK for Java v2",
+            "description": "Updated service endpoint metadata."
+        },
+        {
+            "type": "feature",
+            "category": "Access Analyzer",
+            "description": "This release adds support for the creation and management of IAM Access Analyzer analyzers with type organization. An analyzer with type organization continuously monitors all supported resources within the AWS organization and reports findings when they allow access from outside the organization."
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.changes/2.11.6.json b/.changes/2.11.6.json
new file mode 100644
index 000000000000..41dd8a73c063
--- /dev/null
+++ b/.changes/2.11.6.json
@@ -0,0 +1,76 @@
+{
+    "version": "2.11.6",
+    "date": "2020-03-31",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "AWS Organizations",
+            "description": "Documentation updates for AWS Organizations"
+        },
+        {
+            "type": "feature",
+            "category": "AWS OpsWorks CM",
+            "description": "Documentation updates for OpsWorks-CM CreateServer values."
+        },
+        {
+            "type": "feature",
+            "category": "AWS Glue",
+            "description": "Add two enums for MongoDB connection: Added \"CONNECTION_URL\" to \"ConnectionPropertyKey\" and added \"MONGODB\" to \"ConnectionType\""
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Elastic Inference",
+            "description": "This release includes improvements for the Amazon Elastic Inference service."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Detective",
+            "description": "Removing the notes that Detective is in preview, in preparation for the Detective GA release."
+        },
+        {
+            "type": "feature",
+            "category": "AWS SDK for Java v2",
+            "description": "Updated service endpoint metadata."
+        },
+        {
+            "type": "feature",
+            "category": "AWS WAFV2",
+            "description": "Added support for AWS Firewall Manager for WAFv2 and PermissionPolicy APIs for WAFv2."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon AppConfig",
+            "description": "This release adds an event log to deployments. In the case of a deployment rollback, the event log details the rollback reason."
+        },
+        {
+            "type": "feature",
+            "category": "AWS Elemental MediaStore",
+            "description": "This release adds support for CloudWatch Metrics. You can now set a policy on your container to dictate which metrics MediaStore sends to CloudWatch."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Rekognition",
+            "description": "This release adds DeleteProject and DeleteProjectVersion APIs to Amazon Rekognition Custom Labels."
+        },
+        {
+            "type": "feature",
+            "category": "AWS Storage Gateway",
+            "description": "Adding audit logging support for SMB File Shares"
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Pinpoint",
+            "description": "This release of the Amazon Pinpoint API introduces MMS support for SMS messages."
+        },
+        {
+            "type": "feature",
+            "category": "AWS Lambda",
+            "description": "AWS Lambda now supports .NET Core 3.1"
+        },
+        {
+            "type": "feature",
+            "category": "Firewall Management Service",
+            "description": "This release contains FMS wafv2 support."
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.changes/2.11.7.json b/.changes/2.11.7.json
new file mode 100644
index 000000000000..61f57b57194d
--- /dev/null
+++ b/.changes/2.11.7.json
@@ -0,0 +1,21 @@
+{
+    "version": "2.11.7",
+    "date": "2020-04-01",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "AWS SDK for Java v2",
+            "description": "Updated service endpoint metadata."
+        },
+        {
+            "type": "feature",
+            "category": "AWS MediaConnect",
+            "description": "You can now send content from your virtual private cloud (VPC) to your MediaConnect flow without going over the public internet."
+        },
+        {
+            "type": "feature",
+            "category": "AWS IoT",
+            "description": "This release introduces Dimensions for AWS IoT Device Defender. Dimensions can be used in Security Profiles to collect and monitor fine-grained metrics."
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md
new file mode 100644
index 000000000000..b3680fa48f95
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug-report.md
@@ -0,0 +1,38 @@
+---
+name: "\U0001F41B Bug report"
+about: Create a report to help us improve
+labels: bug, needs-triage
+---
+
+<!--- Provide a general summary of the issue in the Title above -->
+
+## Describe the bug
+<!--- A clear and concise description of what the bug is -->
+
+## Expected Behavior
+<!--- Tell us what should happen -->
+
+## Current Behavior
+<!--- Tell us what happens instead of the expected behavior -->
+
+<!--- Include full errors, uncaught exceptions, stack traces, and relevant logs -->
+<!--- To turn on SDK logging, follow instructions here: http://docs.aws.amazon.com/sdk-for-java/v2/developer-guide/java-dg-logging.html -->
+<!--- If service responses are relevant, please include wirelogs -->
+
+## Steps to Reproduce
+<!--- Provide a self-contained, concise snippet of code that can be used to reproduce the issue -->
+<!--- For more complex issues provide a repo with the smallest sample that reproduces the bug -->
+<!--- Avoid including business logic or unrelated code, it makes diagnosis more difficult -->
+
+## Possible Solution
+<!--- Not required, but suggest a fix/reason for the bug -->
+
+## Context
+<!--- How has this issue affected you? What are you trying to accomplish? -->
+<!--- Providing context helps us come up with a solution that is most useful in the real world -->
+
+## Your Environment
+<!--- Include as many relevant details about the environment where the bug was discovered -->
+* AWS Java SDK version used:
+* JDK version used:
+* Operating System and version:
diff --git a/.github/ISSUE_TEMPLATE/feature-request.md b/.github/ISSUE_TEMPLATE/feature-request.md
new file mode 100644
index 000000000000..43530d2152da
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature-request.md
@@ -0,0 +1,36 @@
+---
+name: "\U0001F680 Feature Request"
+about: Suggest an idea for this project
+labels: feature-request, needs-triage
+---
+
+<!--- Provide a general summary of the issue in the Title above -->
+
+## Describe the Feature
+<!--- A clear and concise description of the feature you are proposing -->
+
+## Is your Feature Request related to a problem?
+<!--- A description of the issue, e.g. I'm always frustrated when... -->
+
+## Proposed Solution
+<!--- Not required, but suggest how to implement the addition or change -->
+
+## Describe alternatives you've considered
+<!--- Any alternative solutions or features you've considered -->
+
+## Additional Context
+<!--- How has this issue affected you? What are you trying to accomplish? -->
+<!--- Providing context helps us come up with a solution that is most useful in the real world -->
+
+
+
+
+
+- [ ] I may be able to implement this feature request
+
+
+## Your Environment
+<!--- Include as many relevant details about the environment where the bug was discovered -->
+* AWS Java SDK version used:
+* JDK version used:
+* Operating System and version:
diff --git a/.github/ISSUE_TEMPLATE/general-issue.md b/.github/ISSUE_TEMPLATE/general-issue.md
new file mode 100644
index 000000000000..aad931388a4c
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/general-issue.md
@@ -0,0 +1,28 @@
+---
+name: "\U0001F4AC General Issue"
+about: Create a new issue
+labels: guidance, needs-triage
+---
+
+<!--- Provide a general summary of the issue in the Title above -->
+
+## Describe the issue
+<!--- A clear and concise description of the issue -->
+
+## Steps to Reproduce
+<!--- Provide a self-contained, concise snippet of code that can be used to reproduce the issue -->
+<!--- For more complex issues provide a repo with the smallest reproducible example -->
+<!--- Avoid including business logic or unrelated code, it makes diagnosis more difficult -->
+
+## Current Behavior
+<!--- Tell us what happens instead of the expected behavior -->
+
+<!--- Include full errors, uncaught exceptions, stack traces, and relevant logs -->
+<!--- To turn on SDK logging, follow instructions here: http://docs.aws.amazon.com/sdk-for-java/v2/developer-guide/java-dg-logging.html -->
+<!--- If service responses are relevant, please include wirelogs -->
+
+## Your Environment
+<!--- Include as many relevant details about the environment where the bug was discovered -->
+* AWS Java SDK version used:
+* JDK version used:
+* Operating System and version:
diff --git a/.travis.yml b/.travis.yml
index 5682fd599751..cf0b98cddd92 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +1,12 @@
 language: java
 jdk:
-  - oraclejdk8
+  - openjdk8
   - openjdk11
 sudo: true
-dist: precise
+dist: xenial
 install: /bin/true
+env:
+  - AWS_REGION=us-west-2
 notifications:
   email:
     - github-awsforjava@amazon.com
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1a455d8e52d5..4f30c0afcaf1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,2214 @@
+# __2.11.7__ __2020-04-01__
+## __AWS IoT__
+  - ### Features
+    - This release introduces Dimensions for AWS IoT Device Defender. Dimensions can be used in Security Profiles to collect and monitor fine-grained metrics.
+
+## __AWS MediaConnect__
+  - ### Features
+    - You can now send content from your virtual private cloud (VPC) to your MediaConnect flow without going over the public internet.
+
+## __AWS SDK for Java v2__
+  - ### Features
+    - Updated service endpoint metadata.
+
+# __2.11.6__ __2020-03-31__
+## __AWS Elemental MediaStore__
+  - ### Features
+    - This release adds support for CloudWatch Metrics. You can now set a policy on your container to dictate which metrics MediaStore sends to CloudWatch.
+
+## __AWS Glue__
+  - ### Features
+    - Add two enums for MongoDB connection: Added "CONNECTION_URL" to "ConnectionPropertyKey" and added "MONGODB" to "ConnectionType"
+
+## __AWS Lambda__
+  - ### Features
+    - AWS Lambda now supports .NET Core 3.1
+
+## __AWS OpsWorks CM__
+  - ### Features
+    - Documentation updates for OpsWorks-CM CreateServer values.
+
+## __AWS Organizations__
+  - ### Features
+    - Documentation updates for AWS Organizations
+
+## __AWS SDK for Java v2__
+  - ### Features
+    - Updated service endpoint metadata.
+
+## __AWS Storage Gateway__
+  - ### Features
+    - Adding audit logging support for SMB File Shares
+
+## __AWS WAFV2__
+  - ### Features
+    - Added support for AWS Firewall Manager for WAFv2 and PermissionPolicy APIs for WAFv2.
+
+## __Amazon AppConfig__
+  - ### Features
+    - This release adds an event log to deployments. In the case of a deployment rollback, the event log details the rollback reason.
+
+## __Amazon Detective__
+  - ### Features
+    - Removing the notes that Detective is in preview, in preparation for the Detective GA release.
+
+## __Amazon Elastic Inference__
+  - ### Features
+    - This release includes improvements for the Amazon Elastic Inference service.
+
+## __Amazon Pinpoint__
+  - ### Features
+    - This release of the Amazon Pinpoint API introduces MMS support for SMS messages.
+
+## __Amazon Rekognition__
+  - ### Features
+    - This release adds DeleteProject and DeleteProjectVersion APIs to Amazon Rekognition Custom Labels.
+
+## __Firewall Management Service__
+  - ### Features
+    - This release contains FMS wafv2 support.
+
+# __2.11.5__ __2020-03-30__
+## __AWS SDK for Java v2__
+  - ### Features
+    - Updated service endpoint metadata.
+
+## __Access Analyzer__
+  - ### Features
+    - This release adds support for the creation and management of IAM Access Analyzer analyzers with type organization. An analyzer with type organization continuously monitors all supported resources within the AWS organization and reports findings when they allow access from outside the organization.
+
+# __2.11.4__ __2020-03-27__
+## __AWS Global Accelerator__
+  - ### Features
+    - This update adds an event history to the ListByoipCidr API call. This enables you to see the changes that you've made for an IP address range that you bring to AWS Global Accelerator through bring your own IP address (BYOIP).
+
+## __AWS SDK for Java v2__
+  - ### Features
+    - Updated service endpoint metadata.
+
+  - ### Bugfixes
+    - Remove the `LimitExceededException` as a throttling error as it seems many services don't treat it as a throttling error.
+
+## __AWS Service Catalog__
+  - ### Features
+    - Added "LocalRoleName" as an acceptable Parameter for Launch type in CreateConstraint and UpdateConstraint APIs
+
+## __AWSKendraFrontendService__
+  - ### Features
+    - The Amazon Kendra Microsoft SharePoint data source now supports include and exclude regular expressions and change log features. Include and exclude regular expressions enable you to provide a list of regular expressions to match the display URL of SharePoint documents to either include or exclude documents respectively. When you enable the changelog feature it enables Amazon Kendra to use the SharePoint change log to determine which documents to update in the index.
+
+# __2.11.3__ __2020-03-26__
+## __AWS SDK for Java v2__
+  - ### Features
+    - Updated service endpoint metadata.
+
+## __AWS SecurityHub__
+  - ### Features
+    - Security Hub has now made it easier to opt out of default standards when you enable Security Hub. We added a new Boolean parameter to EnableSecurityHub called EnableDefaultStandards. If that parameter is true, Security Hub's default standards are enabled. A new Boolean parameter for standards, EnabledByDefault, indicates whether a standard is a default standard. Today, the only default standard is CIS AWS Foundations Benchmark v1.2. Additional default standards will be added in the future.To learn more, visit our documentation on the EnableSecurityHub API action.
+
+## __Amazon FSx__
+  - ### Features
+    - This release includes two changes: a new lower-cost, storage type called HDD (Hard Disk Drive), and a new generation of the Single-AZ deployment type called Single AZ 2. The HDD storage type can be selected on Multi AZ 1 and Single AZ 2 deployment types.
+
+## __Amazon SageMaker Service__
+  - ### Features
+    - This release updates Amazon Augmented AI CreateFlowDefinition API and DescribeFlowDefinition response.
+
+# __2.11.2__ __2020-03-25__
+## __AWS Cost Explorer Service__
+  - ### Features
+    - Customers can now receive Savings Plans recommendations at the member (linked) account level.
+
+## __AWS SDK for Java v2__
+  - ### Features
+    - Added a `defaultProfileFile` and `defaultProfileName` option to the client override configuration. Setting this configuration value is equivalent to setting the environment or system properties for the profile file and profile name. Specifically, it sets the default profile file and profile name used by the client.
+    - Reduced the number of times the profile file configuration is read from disk on client creation from 3-5 to 1.
+    - Updated service endpoint metadata.
+
+## __AWS X-Ray__
+  - ### Features
+    - GetTraceSummaries - Now provides additional root cause attribute ClientImpacting which indicates whether root cause impacted trace client.
+
+## __Amazon CloudWatch Application Insights__
+  - ### Features
+    - Amazon CloudWatch Application Insights for .NET and SQL Server now integrates with Amazon CloudWatch Events (AWS CodeDeploy, AWS Health and Amazon EC2 state changes). This feature enables customers to view events related to problems detected by CloudWatch Application Insights, and reduce mean-time-to-resolution (MTTR).
+
+## __Amazon Detective__
+  - ### Features
+    - The new ACCEPTED_BUT_DISABLED member account status indicates that a member account that accepted the invitation is blocked from contributing data to the behavior graph. The reason is provided in the new DISABLED_REASON property. The new StartMonitoringMember operation enables a blocked member account.
+
+## __Amazon DynamoDB__
+  - ### Features
+    - When endpoint discovery is enabled, the endpoint discovery process is now initialized with the first request, instead of 60 seconds after the first request.
+
+  - ### Bugfixes
+    - Fixed an issue that could cause a null-pointer-exception when using anonymous credentials with endpoint discovery enabled.
+    - Fixed an issue where endpoint discovery configuration specified in the profile file was being ignored.
+
+## __Amazon DynamoDB Enhanced Client [Preview]__
+  - ### Bugfixes
+    - Performance improvements.
+
+## __Amazon Elasticsearch Service__
+  - ### Features
+    - Adding support for customer packages (dictionary files) to Amazon Elasticsearch Service
+
+## __Amazon Managed Blockchain__
+  - ### Features
+    - Amazon Managed Blockchain now has support to publish Hyperledger Fabric peer node, chaincode, and certificate authority (CA) logs to Amazon CloudWatch Logs.
+
+## __Amazon S3__
+  - ### Bugfixes
+    - Fixed a bug where explicitly disabling use-arn-region on S3Configuration would have lower priority than the environment variable, system property or profile property.
+
+# __2.11.1__ __2020-03-24__
+## __AWS Organizations__
+  - ### Features
+    - Introduces actions for giving a member account administrative Organizations permissions for an AWS service. You can run this action only for AWS services that support this feature.
+
+## __AWS RDS DataService__
+  - ### Features
+    - Documentation updates for rds-data
+
+## __AWS SDK for Java v2__
+  - ### Features
+    - Updated service endpoint metadata.
+
+## __Amazon Athena__
+  - ### Features
+    - Documentation updates for Athena, including QueryExecutionStatus QUEUED and RUNNING states. QUEUED now indicates that the query has been submitted to the service. RUNNING indicates that the query is in execution phase.
+
+## __Amazon Elastic Kubernetes Service__
+  - ### Features
+    - Adding new error codes: Ec2SubnetInvalidConfiguration and NodeCreationFailure for Nodegroups in EKS
+
+# __2.11.0__ __2020-03-23__
+## __AWS SDK for Java v2__
+  - ### Features
+    - Bump minor version to '2.11.0-SNAPSHOT' because of [#1692](https://github.com/aws/aws-sdk-java-v2/issues/1692)
+    - Updating dependency version: netty 4.1.42.Final -> 4.1.46.Final (contains the fix for reducing heap usage for netty client)
+
+## __Amazon Elastic Kubernetes Service__
+  - ### Features
+    - Adding new error code IamLimitExceeded for Nodegroups in EKS
+
+## __Amazon Route 53__
+  - ### Features
+    - Documentation updates for Route 53.
+
+## __AmazonApiGatewayV2__
+  - ### Features
+    - Documentation updates to reflect that the default timeout for integrations is now 30 seconds for HTTP APIs.
+
+# __2.10.91__ __2020-03-20__
+## __AWS SDK for Java v2__
+  - ### Features
+    - Updated service endpoint metadata.
+
+## __AWS Service Catalog__
+  - ### Features
+    - Added "productId" and "portfolioId" to responses from CreateConstraint, UpdateConstraint, ListConstraintsForPortfolio, and DescribeConstraint APIs
+
+# __2.10.90__ __2020-03-19__
+## __AWS Certificate Manager__
+  - ### Features
+    - AWS Certificate Manager documentation updated on API calls ImportCertificate and ListCertificate. Specific updates included input constraints, private key size for import and next token size for list.
+
+## __AWS Outposts__
+  - ### Features
+    - Documentation updates for AWS Outposts.
+
+# __2.10.89__ __2020-03-18__
+## __AWS MediaConnect__
+  - ### Features
+    - Feature adds the ability for a flow to have multiple redundant sources that provides resiliency to a source failing. The new APIs added to enable the feature are, AddFlowSources, RemoveFlowSource and UpdateFlow.
+
+## __AWS SDK for Java v2__
+  - ### Features
+    - Updated service endpoint metadata.
+
+## __Amazon Personalize__
+  - ### Features
+    - [Personalize] Adds support for returning hyperparameter values of the best performing model in a HPO job.
+
+## __Amazon Relational Database Service__
+  - ### Features
+    - Updated the MaxRecords type in DescribeExportTasks to Integer.
+
+# __2.10.88__ __2020-03-17__
+## __AWS Elemental MediaConvert__
+  - ### Features
+    - AWS Elemental MediaConvert SDK has added support for: AV1 encoding in File Group MP4, DASH and CMAF DASH outputs; PCM/WAV audio output in MPEG2-TS containers; and Opus audio in Webm inputs.
+
+## __AWS SDK for Java v2__
+  - ### Features
+    - Updated service endpoint metadata.
+
+  - ### Bugfixes
+    - Fix an issue where the signing key is created only once at the start of the request for event streaming requests. This causes requests that span two or more days to have signing errors once the date changes because the signing key was derived only once using the date at the beginning of the request.
+
+# __2.10.87__ __2020-03-16__
+## __AWS S3 Control__
+  - ### Features
+    - Amazon S3 now supports Batch Operations job tagging.
+
+## __AWS SDK for Java v2__
+  - ### Features
+    - Updated service endpoint metadata.
+
+## __Amazon Cognito Identity Provider__
+  - ### Features
+    - Additional response field "CompromisedCredentialsDetected" added to AdminListUserAuthEvents.
+
+## __Amazon DynamoDB Enhanced Client [Preview]__
+  - ### Features
+    - The enhanced DDB client table schema now supports custom AttributeConverterProviders, and StaticAttribute can take individual AttributeConverter to override default attribute converter behavior.
+
+## __Amazon EC2 Container Service__
+  - ### Features
+    - This release adds the ability to update the task placement strategy and constraints for Amazon ECS services.
+
+## __Amazon ElastiCache__
+  - ### Features
+    - Amazon ElastiCache now supports Global Datastore for Redis. Global Datastore for Redis offers fully managed, fast, reliable and secure cross-region replication. Using Global Datastore for Redis, you can create cross-region read replica clusters for ElastiCache for Redis to enable low-latency reads and disaster recovery across regions. You can create, modify and describe a Global Datastore, as well as add or remove regions from your Global Datastore and promote a region as primary in Global Datastore.
+
+## __Amazon Simple Systems Manager (SSM)__
+  - ### Features
+    - Resource data sync for AWS Systems Manager Inventory now includes destination data sharing. This feature enables you to synchronize inventory data from multiple AWS accounts into a central Amazon S3 bucket. To use this feature, all AWS accounts must be listed in AWS Organizations.
+
+# __2.10.86__ __2020-03-13__
+## __Amazon AppConfig__
+  - ### Features
+    - This release adds S3 as a configuration source provider.
+
+# __2.10.85__ __2020-03-12__
+## __AWS IoT__
+  - ### Features
+    - As part of this release, we are extending capability of AWS IoT Rules Engine to support IoT Cloudwatch log action. The IoT Cloudwatch log rule action lets you send messages from IoT sensors and applications to Cloudwatch logs for troubleshooting and debugging.
+
+## __AWS SDK for Java v2__
+  - ### Features
+    - Updated service endpoint metadata.
+
+## __AWS SecurityHub__
+  - ### Features
+    - The AWS Security Finding Format is being augmented with the following changes. 21 new resource types without corresponding details objects are added. Another new resource type, AwsS3Object, has an accompanying details object. Severity.Label is a new string field that indicates the severity of a finding. The available values are: INFORMATIONAL, LOW, MEDIUM, HIGH, CRITICAL. The new string field Workflow.Status indicates the status of the investigation into a finding. The available values are: NEW, NOTIFIED, RESOLVED, SUPPRESSED.
+
+## __Amazon Elastic Compute Cloud__
+  - ### Features
+    - Documentation updates for EC2
+
+## __Amazon Lex Model Building Service__
+  - ### Features
+    - Amazon Lex now supports tagging for bots, bot aliases and bot channels.
+
+## __AmazonApiGatewayV2__
+  - ### Features
+    - Amazon API Gateway HTTP APIs is now generally available. HTTP APIs offer the core functionality of REST API at up to 71% lower price compared to REST API, 60% lower p99 latency, and is significantly easier to use. As part of general availability, we added new features to route requests to private backends such as private ALBs, NLBs, and IP/ports. We also brought over a set of features from REST API such as Stage Variables, and Stage/Route level throttling. Custom domain names can also now be used with both REST And HTTP APIs.
+
+# __2.10.84__ __2020-03-11__
+## __Amazon Elastic File System__
+  - ### Features
+    - Documentation updates for elasticfilesystem
+
+## __Amazon Redshift__
+  - ### Features
+    - Amazon Redshift now supports operations to pause and resume a cluster on demand or on a schedule.
+
+# __2.10.83__ __2020-03-10__
+## __AWS IoT Events__
+  - ### Features
+    - API update that adds a new parameter, durationExpression, to SetTimerAction, and deprecates seconds
+
+## __AWS Marketplace Commerce Analytics__
+  - ### Features
+    - Change the disbursement data set to look past 31 days instead until the beginning of the month.
+
+## __AWS SDK for Java v2__
+  - ### Bugfixes
+    - Reverts a recent change from 2.10.70 where the json protocol type was changed to application/json, this is now back to application/x-amz-json-1.1.
+
+## __AWSServerlessApplicationRepository__
+  - ### Features
+    - AWS Serverless Application Repository now supports sharing applications privately with AWS Organizations.
+
+## __Amazon Elastic Compute Cloud__
+  - ### Features
+    - Documentation updates for EC2
+
+## __Amazon Transcribe Service__
+  - ### Features
+    - Amazon Transcribe's Automatic Content Redaction feature enables you to automatically redact sensitive personally identifiable information (PII) from transcription results. It replaces each instance of an identified PII utterance with a [PII] tag in the transcript.
+
+# __2.10.82__ __2020-03-09__
+## __AWS Database Migration Service__
+  - ### Features
+    - Added new settings for Kinesis target to include detailed transaction info; to capture table DDL details; to use single-line unformatted json, which can be directly queried by AWS Athena if data is streamed into S3 through AWS Kinesis Firehose. Added CdcInsertsAndUpdates in S3 target settings to allow capture ongoing insertions and updates only.
+
+## __AWS Elemental MediaLive__
+  - ### Features
+    - AWS Elemental MediaLive now supports the ability to configure the Preferred Channel Pipeline for channels contributing to a Multiplex.
+
+## __AWS SDK for Java v2__
+  - ### Features
+    - Added support for "retry modes". A retry mode allows configuring multiple SDK parameters at once using default retry profiles, some of which are standardized between AWS SDK languages. See RetryMode javadoc for more information.
+    - Added the ability to configure or disable the default retry throttling behavior of the SDK that 'kicks in' during a large volume of retriable service call errors. This behavior can now be configured via `RetryPolicy.retryCapacityCondition`.
+
+  - ### Bugfixes
+    - Fixed an issue where specifying your own retry policy would override AWS and service-specific retry conditions. By default, all retry policies now have AWS and service-specific retry conditions added. This can be disabled via the new `RetryPolicy.furtherRefinementsAllowed(false)`.
+    - Fixed an issue where the retry condition returned by `RetryPolicy.retryCondition` differed from the one specified by `RetryPolicy.Builder.retryCondition`. The old value can be accessed via the new `RetryPolicy.aggregateRetryCondition`.
+    - Use the last seen HTTP/1.1 header value for headers defined to only appear once in an HTTP message instead of merging them all into a list. The order in which header values are inspected is: headers set by the request marshaller, overridden headers set on the client, then finally overridden headers set on the SDK request object. See https://tools.ietf.org/html/rfc2616#section-4.2 for more information.
+
+## __Amazon Elastic Compute Cloud__
+  - ### Features
+    - Amazon Virtual Private Cloud (VPC) NAT Gateway adds support for tagging on resource creation.
+
+# __2.10.81__ __2020-03-06__
+## __AWS App Mesh__
+  - ### Features
+    - App Mesh now supports sharing a Mesh with other AWS accounts. Customers can use AWS Resource Access Manager to share their Mesh with other accounts in their organization to connection applications within a single service mesh. See https://docs.aws.amazon.com/app-mesh/latest/userguide/sharing.html for details.
+
+## __AWS RoboMaker__
+  - ### Features
+    - Added support for streaming a GUI from robot and simulation applications
+
+## __AWS SDK for Java v2__
+  - ### Features
+    - Updated service endpoint metadata.
+
+## __AWS Signer__
+  - ### Features
+    - This release enables signing image format override in PutSigningProfile requests, adding two more enum fields, JSONEmbedded and JSONDetached. This release also extends the length limit of SigningProfile name from 20 to 64.
+
+## __Amazon Elastic Compute Cloud__
+  - ### Features
+    - This release provides customers with a self-service option to enable Local Zones.
+
+## __Amazon GuardDuty__
+  - ### Features
+    - Amazon GuardDuty findings now include the OutpostArn if the finding is generated for an AWS Outposts EC2 host.
+
+## __Netty NIO Http Client__
+  - ### Bugfixes
+    - Expand Http2 connection-level flow control window when a new stream is acquired on that connection so that the connection-level window size is proportional to the number of streams.
+
+# __2.10.80__ __2020-03-05__
+## __AWS OpsWorks CM__
+  - ### Features
+    - Updated the Tag regex pattern to align with AWS tagging APIs.
+
+## __AWS SDK for Java v2__
+  - ### Features
+    - Updated service endpoint metadata.
+
+## __Amazon DynamoDB Enhanced Client [Preview]__
+  - ### Features
+    - Adds javadoc to operation methods and request/response objects.
+
+## __Amazon Elastic Compute Cloud__
+  - ### Features
+    - You can now create AWS Client VPN Endpoints with a specified VPC and Security Group. Additionally, you can modify these attributes when modifying the endpoint.
+
+## __Amazon Elastic Kubernetes Service__
+  - ### Features
+    - Amazon EKS now supports adding a KMS key to your cluster for envelope encryption of Kubernetes secrets.
+
+## __Amazon GuardDuty__
+  - ### Features
+    - Add a new finding field for EC2 findings indicating the instance's local IP address involved in the threat.
+
+# __2.10.79__ __2020-03-04__
+## __Amazon Pinpoint__
+  - ### Features
+    - This release of the Amazon Pinpoint API introduces support for integrating recommender models with email, push notification, and SMS message templates. You can now use these types of templates to connect to recommender models and add personalized recommendations to messages that you send from campaigns and journeys.
+
+# __2.10.78__ __2020-03-03__
+## __Amazon Elastic Compute Cloud__
+  - ### Features
+    - Amazon VPC Flow Logs adds support for tags and tagging on resource creation.
+
+## __Netty NIO HTTP Client__
+  - ### Bugfixes
+    - Fix an issue where the Netty client was prematurely considering an HTTP/2 request body as sent, but was still in the process of being transferred to the remote endpoint.
+
+# __2.10.77__ __2020-03-02__
+## __AWS Comprehend Medical__
+  - ### Features
+    - New Time Expression feature, part of DetectEntitiesV2 API will provide temporal relations to existing NERe entities such as Medication, Test, Treatment, Procedure and Medical conditions.
+
+## __AWS SDK for Java v2__
+  - ### Features
+    - Updated service endpoint metadata.
+
+## __Amazon CloudWatch__
+  - ### Features
+    - Introducing Amazon CloudWatch Composite Alarms
+
+# __2.10.76__ __2020-02-28__
+## __AWS Config__
+  - ### Features
+    - Correcting list of supported resource types.
+
+# __2.10.75__ __2020-02-28__
+## __AWS App Mesh__
+  - ### Features
+    - App Mesh now supports Transport Layer Security (TLS) between Virtual Nodes in a Mesh. Customers can use managed certificates from an AWS Certificate Manager Private Certificate Authority or bring their own certificates from the local file system to encrypt traffic between their workloads. See https://docs.aws.amazon.com/app-mesh/latest/userguide/virtual-node-tls.html for details.
+
+## __AWS Config__
+  - ### Features
+    - Accepts a structured query language (SQL) SELECT command and an aggregator name, performs the corresponding search on resources aggregated by the aggregator, and returns resource configurations matching the properties.
+
+## __AWS Glue__
+  - ### Features
+    - AWS Glue adds resource tagging support for Machine Learning Transforms and adds a new API, ListMLTransforms to support tag filtering. With this feature, customers can use tags in AWS Glue to organize and control access to Machine Learning Transforms.
+
+## __Access Analyzer__
+  - ### Features
+    - This release includes improvements and fixes bugs for the IAM Access Analyzer feature.
+
+## __Amazon Augmented AI Runtime__
+  - ### Features
+    - This release updates Amazon Augmented AI ListHumanLoops API, DescribeHumanLoop response, StartHumanLoop response and type names of SDK fields.
+
+## __Amazon CodeGuru Profiler__
+  - ### Features
+    - Documentation updates for Amazon CodeGuru Profiler
+
+## __Amazon QuickSight__
+  - ### Features
+    - Added SearchDashboards API that allows listing of dashboards that a specific user has access to.
+
+## __Amazon WorkDocs__
+  - ### Features
+    - Documentation updates for workdocs
+
+## __Elastic Load Balancing__
+  - ### Features
+    - Added a target group attribute to support sticky sessions for Network Load Balancers.
+
+# __2.10.74__ __2020-02-27__
+## __AWS Global Accelerator__
+  - ### Features
+    - This release adds support for adding tags to accelerators and bringing your own IP address to AWS Global Accelerator (BYOIP).
+
+## __AWS SDK for Java v2__
+  - ### Features
+    - Updated service endpoint metadata.
+
+## __Amazon Lightsail__
+  - ### Features
+    - Adds support to create notification contacts in Amazon Lightsail, and to create instance, database, and load balancer metric alarms that notify you based on the value of a metric relative to a threshold that you specify.
+
+# __2.10.73__ __2020-02-26__
+## __AWS SDK for Java v2__
+  - ### Features
+    - Updated service endpoint metadata.
+
+## __AWS SecurityHub__
+  - ### Features
+    - Security Hub has added to the DescribeProducts API operation a new response field called IntegrationTypes. The IntegrationTypes field lists the types of actions that a product performs relative to Security Hub such as send findings to Security Hub and receive findings from Security Hub.
+
+## __Amazon DynamoDB Enhanced Client [Preview]__
+  - ### Features
+    - Added the BeanTableSchema implementation of TableSchema that allows a TableSchema to be instantiated from an annotated Java bean class which can then be used with the DynamoDB Enhanced Client.
+
+## __Amazon Elastic Compute Cloud__
+  - ### Features
+    - This release changes the RunInstances CLI and SDK's so that if you do not specify a client token, a randomly generated token is used for the request to ensure idempotency.
+
+## __Amazon SageMaker Service__
+  - ### Features
+    - SageMaker UpdateEndpoint API now supports retained variant properties, e.g., instance count, variant weight. SageMaker ListTrials API filter by TrialComponentName. Make ExperimentConfig name length limits consistent with CreateExperiment, CreateTrial, and CreateTrialComponent APIs.
+
+## __Amazon Transcribe Service__
+  - ### Features
+    - Amazon Transcribe's Automatic Content Redaction feature enables you to automatically redact sensitive personally identifiable information (PII) from transcription results. It replaces each instance of an identified PII utterance with a [PII] tag in the transcript.
+
+# __2.10.72__ __2020-02-25__
+## __AWS Outposts__
+  - ### Features
+    - This release adds DeleteSite and DeleteOutpost.
+
+## __AWS SDK for Java v2__
+  - ### Features
+    - Updated service endpoint metadata.
+
+## __AWS Secrets Manager__
+  - ### Features
+    - This release increases the maximum allowed size of SecretString or SecretBinary from 10KB to 64KB in the CreateSecret, UpdateSecret, PutSecretValue and GetSecretValue APIs.
+
+## __AWS Step Functions__
+  - ### Features
+    - This release adds support for CloudWatch Logs for Standard Workflows.
+
+## __Amazon DynamoDB Enhanced Client [Preview]__
+  - ### Features
+    - Improves discoverability by adding consumer-style methods for all client, table and index operations.
+
+## __Managed Streaming for Kafka__
+  - ### Features
+    - Amazon MSK has added support for Broker Log delivery to CloudWatch, S3, and Firehose.
+
+# __2.10.71__ __2020-02-24__
+## __AWS IoT Events__
+  - ### Features
+    - Documentation updates for iotcolumbo
+
+## __Amazon CloudWatch Events__
+  - ### Features
+    - This release allows you to create and manage tags for event buses.
+
+## __Amazon DocumentDB with MongoDB compatibility__
+  - ### Features
+    - Documentation updates for docdb
+
+## __Amazon EventBridge__
+  - ### Features
+    - This release allows you to create and manage tags for event buses.
+
+## __Amazon FSx__
+  - ### Features
+    - Announcing persistent file systems for Amazon FSx for Lustre that are ideal for longer-term storage and workloads, and a new generation of scratch file systems that offer higher burst throughput for spiky workloads.
+
+## __Amazon Import/Export Snowball__
+  - ### Features
+    - AWS Snowball adds a field for entering your GSTIN when creating AWS Snowball jobs in the Asia Pacific (Mumbai) region.
+
+# __2.10.70__ __2020-02-21__
+## __AWS WAFV2__
+  - ### Features
+    - Documentation updates for AWS WAF (wafv2) to correct the guidance for associating a web ACL to a CloudFront distribution.
+
+## __Amazon DynamoDB Enhanced Client [Preview]__
+  - ### Features
+    - Improves discoverability by adding consumer-style methods for all client, table and index operations.
+
+## __Amazon Redshift__
+  - ### Features
+    - Extend elastic resize to support resizing clusters to different instance types.
+
+## __EC2 Image Builder__
+  - ### Features
+    - This release of EC2 Image Builder increases the maximum policy document size for Image Builder resource-based policy APIs.
+
+# __2.10.69__ __2020-02-20__
+## __AWS Savings Plans__
+  - ### Features
+    - Added support for AWS Lambda in Compute Savings Plans
+
+## __Amazon AppConfig__
+  - ### Features
+    - This release adds exponential growth type support for deployment strategies.
+
+## __Amazon Pinpoint__
+  - ### Features
+    - As of this release of the Amazon Pinpoint API, the Title property is optional for the CampaignEmailMessage object.
+
+# __2.10.68__ __2020-02-19__
+## __AWS Lambda__
+  - ### Features
+    - AWS Lambda now supports Ruby 2.7
+
+## __AWS SDK for Java v2__
+  - ### Features
+    - Updated service endpoint metadata.
+
+## __AWS Service Catalog__
+  - ### Features
+    - "ListPortfolioAccess" API now has a new optional parameter "OrganizationParentId". When it is provided and if the portfolio with the "PortfolioId" given was shared with an organization or organizational unit with "OrganizationParentId", all accounts in the organization sub-tree under parent which inherit an organizational portfolio share will be listed, rather than all accounts with external shares. To accommodate long lists returned from the new option, the API now supports pagination.
+
+## __Auto Scaling__
+  - ### Features
+    - Doc update for EC2 Auto Scaling: Add Enabled parameter for PutScalingPolicy
+
+# __2.10.67__ __2020-02-18__
+## __Amazon Chime__
+  - ### Features
+    - Added AudioFallbackUrl to support Chime SDK client.
+
+## __Amazon Relational Database Service__
+  - ### Features
+    - This release supports Microsoft Active Directory authentication for Amazon Aurora.
+
+## __Auto Scaling__
+  - ### Features
+    - Amazon EC2 Auto Scaling now supports the ability to enable/disable target tracking, step scaling, and simple scaling policies.
+
+# __2.10.66__ __2020-02-17__
+## __AWS Cloud9__
+  - ### Features
+    - AWS Cloud9 now supports the ability to tag Cloud9 development environments.
+
+## __AWS SDK for Java v2__
+  - ### Features
+    - Updated service endpoint metadata.
+
+## __Amazon DynamoDB__
+  - ### Features
+    - Amazon DynamoDB enables you to restore your DynamoDB backup or table data across AWS Regions such that the restored table is created in a different AWS Region from where the source table or backup resides. You can do cross-region restores between AWS commercial Regions, AWS China Regions, and AWS GovCloud (US) Regions.
+
+## __Amazon Elastic Compute Cloud__
+  - ### Features
+    - Documentation updates for EC2
+
+## __Amazon Rekognition__
+  - ### Features
+    - This update adds the ability to detect text in videos and adds filters to image and video text detection.
+
+# __2.10.65__ __2020-02-14__
+## __AWS MediaTailor__
+  - ### Features
+    - AWS Elemental MediaTailor SDK now allows configuration of Personalization Threshold for HLS and DASH streams.
+
+## __AWS SecurityHub__
+  - ### Features
+    - Security Hub has released a new DescribeStandards API action. This API action allows a customer to list all of the standards available in an account. For each standard, the list provides the customer with the standard name, description, and ARN. Customers can use the ARN as an input to the BatchEnableStandards API action. To learn more, visit our API documentation.
+
+## __AWS Shield__
+  - ### Features
+    - This release adds support for associating Amazon Route 53 health checks to AWS Shield Advanced protected resources.
+
+## __Amazon Elastic Compute Cloud__
+  - ### Features
+    - You can now enable Multi-Attach on Provisioned IOPS io1 volumes through the create-volume API.
+
+## __Amazon S3__
+  - ### Features
+    - Added support for presigning `CreateMultipartUpload`, `UploadPart`, `CompleteMultipartUpload`, and `AbortMultipartUpload` requests.
+
+# __2.10.64__ __2020-02-13__
+## __AWS Elemental MediaPackage VOD__
+  - ### Features
+    - Adds support for DASH with multiple media presentation description periods triggered by presence of SCTE-35 ad markers in the manifest.Also adds optional configuration for DASH SegmentTemplateFormat to refer to segments by Number with Duration, Number with Timeline or Time with Timeline and compact the manifest by combining duplicate SegmentTemplate tags.
+
+## __AWS SDK for Java v2__
+  - ### Features
+    - Updated service endpoint metadata.
+
+## __Amazon DynamoDB Enhanced Client [Preview]__
+  - ### Features
+    - Improves discoverability by adding operation methods for deleteItem(), getItem(), putItem and updateItem(), as applicable. These methods take a request object as parameter. Execute() methods for the table interface is removed since they are no longer needed.
+
+## __Netty NIO HTTP Client__
+  - ### Features
+    - When there is an I/O error on an http2 request, the SDK will start shutting down the connection - stopping using the http2 connection for new requests and closing it after all streams are finished.
+
+# __2.10.63__ __2020-02-12__
+## __AWS Directory Service__
+  - ### Features
+    - Release to add the ExpirationDateTime as an output to ListCertificates so as to ease customers to look into their certificate lifetime and make timely decisions about renewing them.
+
+## __AWS Glue__
+  - ### Features
+    - Adding ability to add arguments that cannot be overridden to AWS Glue jobs
+
+## __Amazon Chime__
+  - ### Features
+    - Documentation updates for Amazon Chime
+
+## __Amazon Elastic Compute Cloud__
+  - ### Features
+    - This release adds support for tagging public IPv4 pools.
+
+## __Amazon Elasticsearch Service__
+  - ### Features
+    - Amazon Elasticsearch Service now offers fine-grained access control, which adds multiple capabilities to give tighter control over data. New features include the ability to use roles to define granular permissions for indices, documents, or fields and to extend Kibana with read-only views and secure multi-tenant support.
+
+## __Amazon Neptune__
+  - ### Features
+    - This launch enables Neptune start-db-cluster and stop-db-cluster. Stopping and starting Amazon Neptune clusters helps you manage costs for development and test environments. You can temporarily stop all the DB instances in your cluster, instead of setting up and tearing down all the DB instances each time that you use the cluster.
+
+## __Amazon WorkMail__
+  - ### Features
+    - This release adds support for access control rules management in Amazon WorkMail.
+
+# __2.10.62__ __2020-02-11__
+## __AWS CloudFormation__
+  - ### Features
+    - This release of AWS CloudFormation StackSets allows you to centrally manage deployments to all the accounts in your organization or specific organizational units (OUs) in AWS Organizations. You will also be able to enable automatic deployments to any new accounts added to your organization or OUs. The permissions needed to deploy across accounts will automatically be taken care of by the StackSets service.
+
+## __Amazon Cognito Identity Provider__
+  - ### Features
+    - Features:This release adds a new setting for a user pool to allow if customer wants their user signup/signin with case insensitive username. The current default setting is case sensitive, and for our next release we will change it to case insensitive.
+
+## __Amazon Elastic Compute Cloud__
+  - ### Features
+    - Amazon EC2 Now Supports Tagging Spot Fleet.
+
+# __2.10.61__ __2020-02-10__
+## __AWS Key Management Service__
+  - ### Features
+    - The ConnectCustomKeyStore API now provides a new error code (SUBNET_NOT_FOUND) for customers to better troubleshoot if their "connect-custom-key-store" operation fails.
+
+## __AWS SDK for Java v2__
+  - ### Features
+    - Updated service endpoint metadata.
+
+## __Amazon DocumentDB with MongoDB compatibility__
+  - ### Features
+    - Added clarifying information that Amazon DocumentDB shares operational technology with Amazon RDS and Amazon Neptune.
+
+# __2.10.60__ __2020-02-07__
+## __AWS RoboMaker__
+  - ### Features
+    - This release adds support for simulation job batches
+
+## __AWS SDK for Java v2__
+  - ### Features
+    - Updated service endpoint metadata.
+
+## __Amazon DynamoDB Enhanced Client [Preview]__
+  - ### Features
+    - Improves discoverability by renaming the table and index interfaces to be consistent with the client interface naming, and by adding operation methods for createTable(), scan() and query(), as applicable. These methods take a request object as parameter. Execute() methods for the index interface is removed since they are no longer needed.
+
+## __Amazon Relational Database Service__
+  - ### Features
+    - Documentation updates for RDS: when restoring a DB cluster from a snapshot, must create DB instances
+
+## __EC2 Image Builder__
+  - ### Features
+    - This version of the SDK includes bug fixes and documentation updates.
+
+# __2.10.59__ __2020-02-06__
+## __AWS AppSync__
+  - ### Features
+    - AWS AppSync now supports X-Ray
+
+## __AWS CodeBuild__
+  - ### Features
+    - AWS CodeBuild adds support for Amazon Elastic File Systems
+
+## __Amazon DynamoDB Enhanced Client [Preview]__
+  - ### Features
+    - In order to make operations more easily discoverable by an IDE, specific operation methods have been added to the enhanced client interface. An operation method takes a corresponding request object as parameter. Meanwhile, the generic execute() method is removed. This change affects only batch and transcribe operations at the database level.
+
+## __Amazon EC2 Container Registry__
+  - ### Features
+    - This release contains updated text for the GetAuthorizationToken API.
+
+## __Amazon Elastic Block Store__
+  - ### Features
+    - Documentation updates for EBS direct APIs.
+
+## __Amazon Elastic Compute Cloud__
+  - ### Features
+    - This release adds platform details and billing info to the DescribeImages API.
+
+## __Amazon Lex Model Building Service__
+  - ### Features
+    - Amazon Lex now supports AMAZON.AlphaNumeric with regular expressions.
+
+# __2.10.58__ __2020-02-05__
+## __AWS Elemental MediaConvert__
+  - ### Features
+    - AWS Elemental MediaConvert SDK has added support for fine-tuned QVBR quality level.
+
+## __AWS Ground Station__
+  - ### Features
+    - Adds dataflowEndpointRegion property to DataflowEndpointConfig. The dateCreated, lastUpdated, and tags properties on GetSatellite have been deprecated.
+
+## __AWS Resource Groups Tagging API__
+  - ### Features
+    - Documentation-only update that adds services to the list of supported services.
+
+## __AWS SecurityHub__
+  - ### Features
+    - Additional resource types are now supported in the AWS Security Finding Format (ASFF). The following new resource types are added, each having an accompanying resource details object with fields for security finding providers to populate: AwsCodeBuildProject, AwsEc2NetworkInterface, AwsEc2SecurityGroup, AwsElasticsearchDomain, AwsLambdaLayerVersion, AwsRdsDbInstance, and AwsWafWebAcl. The following resource types are added without an accompanying details object: AutoscalingAutoscalingGroup, AwsDynamoDbTable, AwsEc2Eip, AwsEc2Snapshot, AwsEc2Volume, AwsRdsDbSnapshot, AwsRedshiftCluster, and AwsS3Object. The number of allowed resources per finding is increased from 10 to 32. A new field is added in the Compliance object, RelatedRequirements. To learn more, visit our documentation on the ASFF.
+
+## __Amazon Data Lifecycle Manager__
+  - ### Features
+    - Updated the maximum number of tags that can be added to a snapshot using DLM to 45.
+
+## __Amazon Elastic Compute Cloud__
+  - ### Features
+    - This release provides support for tagging when you create a VPC endpoint, or VPC endpoint service.
+
+## __Amazon Forecast Query Service__
+  - ### Features
+    - Documentation updates for Amazon Forecast.
+
+# __2.10.57__ __2020-02-04__
+## __AWS IoT__
+  - ### Features
+    - Updated ThrottlingException documentation to report that the error code is 400, and not 429, to reflect actual system behaviour.
+
+## __AWS SDK for Java v2__
+  - ### Features
+    - Updated service endpoint metadata.
+
+## __AWS Storage Gateway__
+  - ### Features
+    - Adding KVM as a support hypervisor
+
+## __Amazon CloudFront__
+  - ### Features
+    - Documentation updates for CloudFront
+
+## __Amazon DynamoDB Enhanced Client [Preview]__
+  - ### Features
+    - Changing usage of typed builders for PutItem, UpdateItem and StaticTableSchema to explicitly provide class type.
+    - Renames top level sync/async MappedDatabase interfaces as DynamoDbEnhancedClient interfaces. Also adds builder definitions to the interfaces together with a static method that returns the default implementation of the builder.
+
+## __Amazon Elastic Compute Cloud__
+  - ### Features
+    - Amazon VPC Flow Logs adds support for 1-minute aggregation intervals.
+
+## __Amazon S3__
+  - ### Bugfixes
+    - Fixed an issue where fields in `ListObjectVersionsResponse` and `ListMultipartUploadsResponse` are not decoded correctly when encodingType is specified as url. See [#1601](https://github.com/aws/aws-sdk-java-v2/issues/1601)
+
+## __Amazon Simple Systems Manager (SSM)__
+  - ### Features
+    - This feature ensures that an instance is patched up to the available patches on a particular date. It can be enabled by selecting the 'ApproveUntilDate' option as the auto-approval rule while creating the patch baseline. ApproveUntilDate - The cutoff date for auto approval of released patches. Any patches released on or before this date will be installed automatically.
+
+## __Amazon WorkMail__
+  - ### Features
+    - This release adds support for tagging Amazon WorkMail organizations.
+
+## __Managed Streaming for Kafka__
+  - ### Features
+    - This release enables AWS MSK customers to list Apache Kafka versions that are supported on AWS MSK clusters. Also includes changes to expose additional details of a cluster's state in DescribeCluster and ListClusters APIs.
+
+## __Netty NIO HTTP Client__
+  - ### Bugfixes
+    - Deliver exceptions to stream channels correctly if there's an exception thrown on connection. This also fixes a bug where publisher signals onComplete if the stream is closed as a result of outbound GOAWAY.
+    - Throws `IOException` for the race condition where an HTTP2 connection gets reused at the same time it gets inactive so that failed requests can be retried
+
+# __2.10.56__ __2020-01-24__
+## __AWS DataSync__
+  - ### Features
+    - AWS DataSync now supports FSx for Windows File Server Locations
+
+## __AWS OpsWorks CM__
+  - ### Features
+    - AWS OpsWorks for Chef Automate now supports in-place upgrade to Chef Automate 2. Eligible servers can be updated through the management console, CLI and APIs.
+
+## __AWS SDK for Java v2__
+  - ### Features
+    - Updated service endpoint metadata.
+
+## __Amazon EC2__
+  - ### Features
+    - Adds EC2ThrottledException as a recognized throttling exception to be retried
+
+## __Amazon EC2 Container Service__
+  - ### Features
+    - This release provides support for tagging Amazon ECS task sets for services using external deployment controllers.
+
+## __Amazon Elastic Kubernetes Service__
+  - ### Features
+    - Adding new error codes for Nodegroups in EKS
+
+## __Amazon WorkSpaces__
+  - ### Features
+    - Documentation updates for WorkSpaces
+
+## __Netty NIO HTTP Client__
+  - ### Bugfixes
+    - Fix issue where DNS resolution for a host is only made once for the initial request to the host. If the DNS entries change for a hostname, the client will resolve the new address until the client is closed and recreated.
+
+# __2.10.55__ __2020-01-23__
+## __AWS Identity and Access Management__
+  - ### Features
+    - This release enables the Identity and Access Management policy simulator to simulate permissions boundary policies.
+
+## __AWS SDK for Java v2__
+  - ### Features
+    - Added ServiceMetadata.servicePartitions() to get partition metadata for a specific service
+    - Improved error messages on UnknownHostExceptions
+    - Updated service endpoint metadata.
+
+## __Amazon DynamoDB Enhanced Client [Preview]__
+  - ### Features
+    - Support for non-blocking asynchronous calling of all mapper operations
+
+## __Amazon Relational Database Service__
+  - ### Features
+    - This SDK release introduces APIs that automate the export of Amazon RDS snapshot data to Amazon S3. The new APIs include: StartExportTask, CancelExportTask, DescribeExportTasks. These APIs automate the extraction of data from an RDS snapshot and export it to an Amazon S3 bucket. The data is stored in a compressed, consistent, and query-able format. After the data is exported, you can query it directly using tools such as Amazon Athena or Redshift Spectrum. You can also consume the data as part of a data lake solution. If you archive the data in S3 Infrequent Access or Glacier, you can reduce long term data storage costs by applying data lifecycle policies.
+
+# __2.10.54__ __2020-01-21__
+## __AWS Application Discovery Service__
+  - ### Features
+    - Documentation updates for the AWS Application Discovery Service.
+
+## __AWS CodePipeline__
+  - ### Features
+    - AWS CodePipeline enables an ability to stop pipeline executions.
+
+## __AWS IoT Events__
+  - ### Features
+    - Documentation updates for iotcolumbo
+
+## __AWS Marketplace Commerce Analytics__
+  - ### Features
+    - Remove 4 deprecated data sets, change some data sets available dates to 2017-09-15
+
+## __AWS SDK for Java v2__
+  - ### Features
+    - Updated service endpoint metadata.
+
+## __Amazon Elastic Compute Cloud__
+  - ### Features
+    - Add an enum value to the result of DescribeByoipCidrs to support CIDRs that are not publicly advertisable.
+
+## __Netty NIO Http Client__
+  - ### Bugfixes
+    - Fixed a bug where an inactive http2 connection without `GOAWAY` frame received might get reused in a new request, causing `ClosedChannelException`
+
+# __2.10.53__ __2020-01-20__
+## __AWS Key Management Service__
+  - ### Features
+    - The ConnectCustomKeyStore operation now provides new error codes (USER_LOGGED_IN and USER_NOT_FOUND) for customers to better troubleshoot if their connect custom key store operation fails. Password length validation during CreateCustomKeyStore now also occurs on the client side.
+
+## __AWS Lambda__
+  - ### Features
+    - Added reason codes to StateReasonCode (InvalidSubnet, InvalidSecurityGroup) and LastUpdateStatusReasonCode (SubnetOutOfIPAddresses, InvalidSubnet, InvalidSecurityGroup) for functions that connect to a VPC.
+
+## __Alexa For Business__
+  - ### Features
+    - Add support for CreatedTime and ConnectionStatusUpdatedTime in response of SearchDevices API.
+
+## __Amazon CloudWatch__
+  - ### Features
+    - Updating DescribeAnomalyDetectors API to return AnomalyDetector Status value in response.
+
+## __Amazon CloudWatch Application Insights__
+  - ### Features
+    - This release adds support for a list API to retrieve the configuration events logged during periodic updates to an application by Amazon CloudWatch Application Insights.
+
+## __Amazon Elastic Compute Cloud__
+  - ### Features
+    - This release provides support for a preview of bringing your own IPv6 addresses (BYOIP for IPv6) for use in AWS.
+
+# __2.10.52__ __2020-01-17__
+## __AWS Batch__
+  - ### Features
+    - This release ensures INACTIVE job definitions are permanently deleted after 180 days.
+
+## __AWS CloudHSM V2__
+  - ### Features
+    - This release introduces resource-level and tag-based access control for AWS CloudHSM resources. You can now tag CloudHSM backups, tag CloudHSM clusters on creation, and tag a backup as you copy it to another region.
+
+## __AWS Elemental MediaConvert__
+  - ### Features
+    - AWS Elemental MediaConvert SDK has added support for MP3 audio only outputs.
+
+## __AWS SDK for Java v2__
+  - ### Features
+    - Updated service endpoint metadata.
+
+## __Amazon EC2 Container Service__
+  - ### Features
+    - This release provides a public preview for specifying Amazon EFS file systems as volumes in your Amazon ECS task definitions.
+
+## __Amazon Neptune__
+  - ### Features
+    - This release includes Deletion Protection for Amazon Neptune databases.
+
+## __Amazon Redshift__
+  - ### Features
+    - Documentation updates for redshift
+
+# __2.10.51__ __2020-01-16__
+## __AWS Directory Service__
+  - ### Features
+    - To reduce the number of errors our customers are facing, we have modified the requirements of input parameters for two of Directory Service APIs.
+
+## __AWS SDK for Java v2__
+  - ### Features
+    - Updated service endpoint metadata.
+
+## __Amazon Elastic Compute Cloud__
+  - ### Features
+    - Client VPN now supports Port Configuration for VPN Endpoints, allowing usage of either port 443 or port 1194.
+
+## __Amazon SageMaker Service__
+  - ### Features
+    - This release adds two new APIs (UpdateWorkforce and DescribeWorkforce) to SageMaker Ground Truth service for workforce IP whitelisting.
+
+# __2.10.50__ __2020-01-15__
+## __AWS Organizations__
+  - ### Features
+    - Updated description for PolicyID parameter and ConstraintViolationException.
+
+## __AWS SDK for Java v2__
+  - ### Features
+    - Updated service endpoint metadata.
+
+## __AWS SecurityHub__
+  - ### Features
+    - Add support for DescribeStandardsControls and UpdateStandardsControl. These new Security Hub API operations are used to track and manage whether a compliance standards control is enabled.
+
+## __Amazon Elastic Compute Cloud__
+  - ### Features
+    - General Update to EC2 Docs and SDKs
+
+## __Amazon Simple Systems Manager (SSM)__
+  - ### Features
+    - Document updates for Patch Manager 'NoReboot' feature.
+
+## __Amazon Transcribe Service__
+  - ### Bugfixes
+    - Fixed an issue where streaming transcriptions would fail with signature validation errors if the date changed during the request.
+
+# __2.10.49__ __2020-01-14__
+## __Amazon Elastic Compute Cloud__
+  - ### Features
+    - This release adds support for partition placement groups and instance metadata option in Launch Templates
+
+# __2.10.48__ __2020-01-13__
+## __AWS Backup__
+  - ### Features
+    - Cross-region backup is a new AWS Backup feature that allows enterprises to copy backups across multiple AWS services to different regions.
+
+## __Amazon Elastic Compute Cloud__
+  - ### Features
+    - Documentation updates for the StopInstances API. You can now stop and start an Amazon EBS-backed Spot Instance at will, instead of relying on the Stop interruption behavior to stop your Spot Instances when interrupted.
+
+## __Amazon Elastic File System__
+  - ### Features
+    - This release adds support for managing EFS file system policies and EFS Access Points.
+
+## __Amazon S3__
+  - ### Bugfixes
+    - Fixed bug prevent GetBucketBolicy from ever being successful using the asynchronous S3 client.
+
+# __2.10.47__ __2020-01-10__
+## __AWS SDK for Java v2__
+  - ### Features
+    - Updated service endpoint metadata.
+    - Updated service endpoints and added global endpoints for iso and iso-b.
+
+## __AWS Transfer for SFTP__
+  - ### Features
+    - This release introduces a new endpoint type that allows you to attach Elastic IP addresses from your AWS account with your server's endpoint directly and whitelist access to your server by client's internet IP address(es) using VPC Security Groups.
+
+## __Amazon Chime__
+  - ### Features
+    - Add shared profile support to new and existing users
+
+## __Amazon Elastic Compute Cloud__
+  - ### Features
+    - This release introduces the ability to tag egress only internet gateways, local gateways, local gateway route tables, local gateway virtual interfaces, local gateway virtual interface groups, local gateway route table VPC association and local gateway route table virtual interface group association. You can use tags to organize and identify your resources for cost allocation.
+
+## __Amazon Relational Database Service__
+  - ### Features
+    - This release adds an operation that enables users to override the system-default SSL/TLS certificate for new Amazon RDS DB instances temporarily, or remove the customer override.
+
+## __Amazon S3__
+  - ### Bugfixes
+    - Fix an issue where s3#listObjects incorrectly decoded marker field. See [#1574](https://github.com/aws/aws-sdk-java-v2/issues/1574).
+
+## __Amazon SageMaker Service__
+  - ### Features
+    - SageMaker ListTrialComponents API filter by TrialName and ExperimentName.
+
+## __Amazon WorkSpaces__
+  - ### Features
+    - Added the migrate feature to Amazon WorkSpaces.
+
+# __2.10.46__ __2020-01-09__
+## __AWS SDK for Java v2__
+  - ### Bugfixes
+    - Increase the priority of the AWS_WEB_IDENTITY_TOKEN_FILE/AWS_ROLE_ARN/AWS_ROLE_SESSION_NAME environment variables when loading credentials so that they are considered before web_identity_token_file/role_arn/role_session_name profile properties. This is consistent with the other AWS SDKs, including the CLI.
+
+## __AWS Security Token Service__
+  - ### Features
+    - Documentation updates for sts
+
+## __Amazon CloudWatch Logs__
+  - ### Features
+    - Documentation updates for logs
+
+## __Amazon S3__
+  - ### Features
+    - Add support for Tagging builder in `CreateMultipartUploadRequest`. See [#1440](https://github.com/aws/aws-sdk-java-v2/issues/1440)
+
+# __2.10.45__ __2020-01-08__
+## __AWS Cost Explorer Service__
+  - ### Features
+    - Documentation updates for CreateCostCategoryDefinition and UpdateCostCategoryDefinition API
+
+## __AWS Step Functions__
+  - ### Features
+    - Add sfn specific http configurations. See [#1325](https://github.com/aws/aws-sdk-java-v2/issues/1325)
+
+## __Amazon EC2__
+  - ### Bugfixes
+    - Fix NPE when calling `CopySnapshot`. Fixes [#1564](https://github.com/aws/aws-sdk-java-v2/issues/1564)
+
+## __Amazon Translate__
+  - ### Features
+    - This release adds a new family of APIs for asynchronous batch translation service that provides option to translate large collection of text or HTML documents stored in Amazon S3 folder. This service accepts a batch of up to 5 GB in size per API call with each document not exceeding 1 MB size and the number of documents not exceeding 1 million per batch. See documentation for more information.
+
+## __Firewall Management Service__
+  - ### Features
+    - AWS Firewall Manager now supports tagging, and tag-based access control, of policies.
+
+# __2.10.44__ __2020-01-07__
+## __AWS CodeBuild__
+  - ### Features
+    - Add encryption key override to StartBuild API in AWS CodeBuild.
+
+## __AWS Migration Hub__
+  - ### Features
+    - ListApplicationStates API provides a list of all application migration states
+
+## __AWS X-Ray__
+  - ### Features
+    - Documentation updates for xray
+
+# __2.10.43__ __2020-01-06__
+## __AWS Elemental MediaPackage__
+  - ### Features
+    - You can now restrict direct access to AWS Elemental MediaPackage by securing requests for live content using CDN authorization. With CDN authorization, content requests require a specific HTTP header and authorization code.
+
+## __AWS SDK for Java v2__
+  - ### Features
+    - Add `RequestBody.fromRemainingByteBuffer(ByteBuffer)` that copies only the remaining readable bytes of the buffer. See [#1534](https://github.com/aws/aws-sdk-java-v2/issues/1534)
+
+  - ### Bugfixes
+    - Reduce ReadTimeout and ConnectTimeout for accessing EC2 metadata instance service
+
+## __Amazon Comprehend__
+  - ### Features
+    - Amazon Comprehend now supports Multilabel document classification
+
+## __Amazon Elastic Compute Cloud__
+  - ### Features
+    - This release supports service providers configuring a private DNS name for services other than AWS services and services available in the AWS marketplace. This feature allows consumers to access the service using an existing DNS name without making changes to their applications.
+
+## __Amazon S3__
+  - ### Bugfixes
+    - Requests that return an error response in the body of the HTTP response with a successful (200) status code will now correctly be handled as a failed request by the SDK.
+
+# __2.10.42__ __2020-01-02__
+## __AWS Cost Explorer Service__
+  - ### Features
+    - Documentation updates for GetReservationUtilization for the Cost Explorer API.
+
+## __AWS SDK for Java v2__
+  - ### Bugfixes
+    - Fix unmarshalling for models with xml attributes. See [#1488](https://github.com/aws/aws-sdk-java-v2/issues/1488).
+
+## __Amazon EC2 Container Registry__
+  - ### Features
+    - Adds waiters for ImageScanComplete and LifecyclePolicyPreviewComplete
+
+## __Amazon Lex Model Building Service__
+  - ### Features
+    - Documentation updates for Amazon Lex.
+
+## __Amazon Lightsail__
+  - ### Features
+    - This release adds support for Certificate Authority (CA) certificate identifier to managed databases in Amazon Lightsail.
+
+## __Netty NIO Http Client__
+  - ### Bugfixes
+    - Propagate exception properly when an exception is thrown from protocol initialization.
+
+# __2.10.41__ __2019-12-23__
+## __AWS Health APIs and Notifications__
+  - ### Features
+    - With this release, you can now centrally aggregate AWS Health events from all accounts in your AWS organization. Visit AWS Health documentation to learn more about enabling and using this feature: https://docs.aws.amazon.com/health/latest/ug/organizational-view-health.html.
+
+## __Amazon Detective__
+  - ### Features
+    - Updated the documentation for Amazon Detective.
+
+## __Amazon FSx__
+  - ### Features
+    - This release adds a new family of APIs (create-data-repository-task, describe-data-repository-task, and cancel-data-repository-task) that allow users to perform operations between their file system and its linked data repository.
+
+# __2.10.40__ __2019-12-20__
+## __AWS Device Farm__
+  - ### Features
+    - Introduced browser testing support through AWS Device Farm
+
+## __AWS SecurityHub__
+  - ### Features
+    - Additional resource types are now fully supported in the AWS Security Finding Format (ASFF). These resources include AwsElbv2LoadBalancer, AwsKmsKey, AwsIamRole, AwsSqsQueue, AwsLambdaFunction, AwsSnsTopic, and AwsCloudFrontDistribution. Each of these resource types includes an accompanying resource details object with fields for security finding providers to populate. Updates were made to the AwsIamAccessKey resource details object to include information on principal ID and name. To learn more, visit our documentation on the ASFF.
+
+## __Amazon Elastic Compute Cloud__
+  - ### Features
+    - This release introduces the ability to tag key pairs, placement groups, export tasks, import image tasks, import snapshot tasks and export image tasks. You can use tags to organize and identify your resources for cost allocation.
+
+## __Amazon Elastic Kubernetes Service__
+  - ### Features
+    - Amazon EKS now supports restricting access to the API server public endpoint by applying CIDR blocks
+
+## __Amazon Pinpoint__
+  - ### Features
+    - This release of the Amazon Pinpoint API introduces versioning support for message templates.
+
+## __Amazon Redshift__
+  - ### Features
+    - Documentation updates for Amazon Redshift RA3 node types.
+
+## __Amazon Relational Database Service__
+  - ### Features
+    - This release adds an operation that enables users to specify whether a database is restarted when its SSL/TLS certificate is rotated. Only customers who do not use SSL/TLS should use this operation.
+
+## __Amazon S3__
+  - ### Bugfixes
+    - Fixed an issue where the SDK would attempt to validate the checksum on a PutObjectRequest when S3 was returning invalid checksums. This would cause all requests to buckets with customer-managed-key service-side encryption to fail.
+
+## __Amazon Simple Systems Manager (SSM)__
+  - ### Features
+    - This release updates the attachments support to include AttachmentReference source for Automation documents.
+
+## __Amazon Transcribe Service__
+  - ### Features
+    - AWS Transcribe now supports vocabulary filtering that allows customers to input words to the service that they don't want to see in the output transcript.
+
+# __2.10.39__ __2019-12-19__
+## __AWS CodeStar connections__
+  - ### Features
+    - Public beta for Bitbucket Cloud support in AWS CodePipeline through integration with AWS CodeStar connections.
+
+## __Amazon Data Lifecycle Manager__
+  - ### Features
+    - You can now copy snapshots across regions using Data Lifecycle Manager (DLM). You can enable policies which, along with create, can now also copy snapshots to one or more AWS region(s). Copies can be scheduled for up to three regions from a single policy and retention periods are set for each region separately.
+
+## __Amazon Elastic Compute Cloud__
+  - ### Features
+    - We are updating the supportedRootDevices field to supportedRootDeviceTypes for DescribeInstanceTypes API to ensure that the actual value is returned, correcting a previous error in the model.
+
+## __Amazon GameLift__
+  - ### Features
+    - Amazon GameLift now supports ARNs for all key GameLift resources, tagging for GameLift resource authorization management, and updated documentation that articulates GameLift's resource authorization strategy.
+
+## __Amazon Lex Model Building Service__
+  - ### Features
+    - Amazon Lex now supports conversation logs and slot obfuscation.
+
+## __Amazon Personalize Runtime__
+  - ### Features
+    - Add context map to get-recommendations and get-personalized-ranking request objects to provide contextual metadata at inference time
+
+## __Amazon S3__
+  - ### Bugfixes
+    - Fixed an issue where a 'checksum mismatch' error is raised whenever a PutObject request is retried while using an async client.
+
+## __Amazon Simple Systems Manager (SSM)__
+  - ### Features
+    - This release allows customers to add tags to Automation execution, enabling them to sort and filter executions in different ways, such as by resource, purpose, owner, or environment.
+
+## __Amazon Transcribe Service__
+  - ### Features
+    - Amazon Transcribe supports job queuing for the StartTranscriptionJob API.
+
+## __Netty NIO HTTP Client__
+  - ### Features
+    - `SETTINGS_INITIAL_WINDOW_SIZE` is now configurable on HTTP/2 connections opened by the Netty client using `Http2Configuration#initialWindowSize(Integer)` along with `NettyNioAsyncHttpClient.Builder#http2Configuration(Http2Configuration)`. See https://tools.ietf.org/html/rfc7540#section-6.5.2 for more information.
+
+# __2.10.38__ __2019-12-18__
+## __AWS OpsWorks CM__
+  - ### Features
+    - AWS OpsWorks CM now supports tagging, and tag-based access control, of servers and backups.
+
+## __AWS Resource Groups Tagging API__
+  - ### Features
+    - Documentation updates for resourcegroupstaggingapi
+
+## __Amazon CloudFront__
+  - ### Features
+    - Documentation updates for CloudFront
+
+## __Amazon Elastic Compute Cloud__
+  - ### Features
+    - This release introduces the ability to tag Elastic Graphics accelerators. You can use tags to organize and identify your accelerators for cost allocation.
+
+## __Amazon Simple Storage Service__
+  - ### Features
+    - Updates Amazon S3 endpoints allowing you to configure your client to opt-in to using S3 with the us-east-1 regional endpoint, instead of global.
+
+# __2.10.37__ __2019-12-17__
+## __AWS Elemental MediaLive__
+  - ### Features
+    - AWS Elemental MediaLive now supports HLS ID3 segment tagging, HLS redundant manifests for CDNs that support different publishing/viewing endpoints, fragmented MP4 (fMP4), and frame capture intervals specified in milliseconds.
+
+## __AWS IoT__
+  - ### Features
+    - Added a new Over-the-Air (OTA) Update feature that allows you to use different, or multiple, protocols to transfer an image from the AWS cloud to IoT devices.
+
+## __Amazon EC2 Container Service__
+  - ### Features
+    - Documentation updates for Amazon ECS.
+
+## __Amazon Elastic Compute Cloud__
+  - ### Features
+    - Documentation updates for Amazon EC2
+
+## __Amazon Kinesis Analytics__
+  - ### Features
+    - Kinesis Data Analytics service now supports running Java applications using Flink 1.8.
+
+## __Amazon Simple Systems Manager (SSM)__
+  - ### Features
+    - Added support for Cloud Watch Output and Document Version to the Run Command tasks in Maintenance Windows.
+
+# __2.10.36__ __2019-12-16__
+## __AWS Comprehend Medical__
+  - ### Features
+    - New Ontology linking APIs will provides medication concepts normalization and Diagnoses codes from input text. In this release we will provide two APIs - RxNorm and ICD10-CM.
+
+## __Amazon Elastic Compute Cloud__
+  - ### Features
+    - You can now configure your EC2 Fleet to preferentially use EC2 Capacity Reservations for launching On-Demand instances, enabling you to fully utilize the available (and unused) Capacity Reservations before launching On-Demand instances on net new capacity.
+
+## __Amazon S3__
+  - ### Features
+    - CopyObjectRequest now has `destinationBucket` and `destinationKey` properties for clarity.
+      The existing names, `bucket` and `key`, are deprecated.
+
+## __AmazonMQ__
+  - ### Features
+    - Amazon MQ now supports throughput-optimized message brokers, backed by Amazon EBS.
+
+# __2.10.35__ __2019-12-13__
+## __AWS CodeBuild__
+  - ### Features
+    - CodeBuild adds support for cross account
+
+## __Amazon Detective__
+  - ### Features
+    - This is the initial release of Amazon Detective.
+
+## __Amazon Simple Email Service__
+  - ### Features
+    - Added the ability to use your own public-private key pair to configure DKIM authentication for a domain identity.
+
+# __2.10.34__ __2019-12-12__
+## __AWS SDK for Java v2__
+  - ### Bugfixes
+    - Fixing exception using `RequestBody.fromInputStream` on non-resettable `InputStreams` by making `reset` conditional on `markSupported`. See [#1544](https://github.com/aws/aws-sdk-java-v2/issues/1544) / [#1545](https://github.com/aws/aws-sdk-java-v2/issues/1545)
+
+## __Access Analyzer__
+  - ### Features
+    - This release includes improvements and fixes bugs for the IAM Access Analyzer feature.
+
+# __2.10.33__ __2019-12-11__
+## __AWS SDK for Java v2__
+  - ### Features
+    - Adds a `has*` method to requests and responses that have a List or Map property.
+
+## __Amazon Elastic Compute Cloud__
+  - ### Features
+    - This release allows customers to attach multiple Elastic Inference Accelerators to a single EC2 instance. It adds support for a Count parameter for each Elastic Inference Accelerator type you specify on the RunInstances and LaunchTemplate APIs.
+
+# __2.10.32__ __2019-12-10__
+## __AWSKendraFrontendService__
+  - ### Features
+    - 1. Adding DocumentTitleFieldName as an optional configuration for SharePoint. 2. updating s3 object pattern to support all s3 keys.
+
+# __2.10.31__ __2019-12-09__
+## __AWS Key Management Service__
+  - ### Features
+    - The Verify operation now returns KMSInvalidSignatureException on invalid signatures. The Sign and Verify operations now return KMSInvalidStateException when a request is made against a CMK pending deletion.
+
+## __Amazon QuickSight__
+  - ### Features
+    - Documentation updates for QuickSight
+
+## __Amazon Simple Systems Manager (SSM)__
+  - ### Features
+    - Adds the SSM GetCalendarState API and ChangeCalendar SSM Document type. These features enable the forthcoming Systems Manager Change Calendar feature, which will allow you to schedule events during which actions should (or should not) be performed.
+
+## __Managed Streaming for Kafka__
+  - ### Features
+    - AWS MSK has added support for Open Monitoring with Prometheus.
+
+## __Netty NIO HTTP Client__
+  - ### Features
+    - Close HTTP/2 connections if they have had 0 streams for 5 seconds. This can be disabled using `useIdleConnectionReaper(false)` or have the time period adjusted using `connectionMaxIdleTime(...)` on the `NettyNioAsyncHttpClient.Builder`.
+    - Periodically ping HTTP/2 connections and close them if the service does not respond. The ping periodicity and timeout time is not currently configurable.
+
+# __2.10.30__ __2019-12-04__
+## __Amazon Kinesis Video Signaling Channels__
+  - ### Features
+    - Announcing support for WebRTC in Kinesis Video Streams, as fully managed capability. You can now use simple APIs to enable your connected devices, web, and mobile apps with real-time two-way media streaming capabilities.
+
+## __Amazon Kinesis Video Streams__
+  - ### Features
+    - Introduces management of signaling channels for Kinesis Video Streams.
+
+## __AmazonApiGatewayV2__
+  - ### Features
+    - Amazon API Gateway now supports HTTP APIs (beta), enabling customers to quickly build high performance RESTful APIs that are up to 71% cheaper than REST APIs also available from API Gateway. HTTP APIs are optimized for building APIs that proxy to AWS Lambda functions or HTTP backends, making them ideal for serverless workloads. Using HTTP APIs, you can secure your APIs using OIDC and OAuth 2 out of box, quickly build web applications using a simple CORS experience, and get started immediately with automatic deployment and simple create workflows.
+
+## __Netty NIO HTTP Client__
+  - ### Bugfixes
+    - Fixed an issue where closing the last stream on a connection that had been closed or received a GOAWAY did not close the connection.
+    - Fixed an issue where receiving a GOAWAY that would cause the closing of all streams could cause all outstanding streams to be completed successfully instead of exceptionally.
+
+# __2.10.29__ __2019-12-03__
+## __AWS Lambda__
+  - ### Features
+    - - Added the ProvisionedConcurrency type and operations. Allocate provisioned concurrency to enable your function to scale up without fluctuations in latency. Use PutProvisionedConcurrencyConfig to configure provisioned concurrency on a version of a function, or on an alias.
+
+## __AWS Step Functions__
+  - ### Features
+    - This release of the AWS Step Functions SDK introduces support for Express Workflows.
+
+## __Amazon Elastic Block Store__
+  - ### Features
+    - This release introduces the EBS direct APIs for Snapshots: 1. ListSnapshotBlocks, which lists the block indexes and block tokens for blocks in an Amazon EBS snapshot. 2. ListChangedBlocks, which lists the block indexes and block tokens for blocks that are different between two snapshots of the same volume/snapshot lineage. 3. GetSnapshotBlock, which returns the data in a block of an Amazon EBS snapshot.
+
+## __Amazon Rekognition__
+  - ### Features
+    - This SDK Release introduces APIs for Amazon Rekognition Custom Labels feature (CreateProjects, CreateProjectVersion,DescribeProjects, DescribeProjectVersions, StartProjectVersion, StopProjectVersion and DetectCustomLabels). Also new is AugmentedAI (Human In The Loop) Support for DetectModerationLabels in Amazon Rekognition.
+
+## __Amazon Relational Database Service__
+  - ### Features
+    - This release adds support for the Amazon RDS Proxy
+
+## __Amazon S3__
+  - ### Bugfixes
+    - Interacting with an access point in a different region to the one the S3 client is configured for will no longer result in the request being signed for the wrong region and rejected by S3.
+
+## __Amazon SageMaker Service__
+  - ### Features
+    - You can now use SageMaker Autopilot for automatically training and tuning candidate models using a combination of various feature engineering, ML algorithms, and hyperparameters determined from the user's input data. SageMaker Automatic Model Tuning now supports tuning across multiple algorithms. With Amazon SageMaker Experiments users can create Experiments, ExperimentTrials, and ExperimentTrialComponents to track, organize, and evaluate their ML training jobs. With Amazon SageMaker Debugger, users can easily debug training jobs using a number of pre-built rules provided by Amazon SageMaker, or build custom rules. With Amazon SageMaker Processing, users can run on-demand, distributed, and fully managed jobs for data pre- or post- processing or model evaluation. With Amazon SageMaker Model Monitor, a user can create MonitoringSchedules to automatically monitor endpoints to detect data drift and other issues and get alerted on them. This release also includes the preview version of Amazon SageMaker Studio with Domains, UserProfiles, and Apps. This release also includes the preview version of Amazon Augmented AI to easily implement human review of machine learning predictions by creating FlowDefinitions, HumanTaskUis, and HumanLoops.
+
+## __Application Auto Scaling__
+  - ### Features
+    - This release supports auto scaling of provisioned concurrency for AWS Lambda.
+
+# __2.10.28__ __2019-12-03__
+## __AWS Compute Optimizer__
+  - ### Features
+    - Initial release of AWS Compute Optimizer. AWS Compute Optimizer recommends optimal AWS Compute resources to reduce costs and improve performance for your workloads.
+
+## __AWS Network Manager__
+  - ### Features
+    - This is the initial SDK release for AWS Network Manager.
+
+## __AWS Outposts__
+  - ### Features
+    - This is the initial release for AWS Outposts, a fully managed service that extends AWS infrastructure, services, APIs, and tools to customer sites. AWS Outposts enables you to launch and run EC2 instances and EBS volumes locally at your on-premises location. This release introduces new APIs for creating and viewing Outposts.
+
+## __AWS S3 Control__
+  - ### Features
+    - Amazon S3 Access Points is a new S3 feature that simplifies managing data access at scale for shared data sets on Amazon S3. Access Points provide a customizable way to access the objects in a bucket, with a unique hostname and access policy that enforces the specific permissions and network controls for any request made through the access point. This represents a new way of provisioning access to shared data sets.
+
+## __AWSKendraFrontendService__
+  - ### Features
+    - It is a preview launch of Amazon Kendra. Amazon Kendra is a managed, highly accurate and easy to use enterprise search service that is powered by machine learning.
+
+## __Amazon Augmented AI Runtime__
+  - ### Features
+    - This release adds support for Amazon Augmented AI, which makes it easy to build workflows for human review of machine learning predictions.
+
+## __Amazon CodeGuru Profiler__
+  - ### Features
+    - (New Service) Amazon CodeGuru Profiler analyzes application CPU utilization and latency characteristics to show you where you are spending the most cycles in your application. This analysis is presented in an interactive flame graph that helps you easily understand which paths consume the most resources, verify that your application is performing as expected, and uncover areas that can be optimized further.
+
+## __Amazon CodeGuru Reviewer__
+  - ### Features
+    - This is the preview release of Amazon CodeGuru Reviewer.
+
+## __Amazon EC2 Container Service__
+  - ### Features
+    - This release supports ECS Capacity Providers, Fargate Spot, and ECS Cluster Auto Scaling. These features enable new ways for ECS to manage compute capacity used by tasks.
+
+## __Amazon Elastic Compute Cloud__
+  - ### Features
+    - This release adds support for the following features: 1. An option to enable acceleration for Site-to-Site VPN connections; 2. Inf1 instances featuring up to 16 AWS Inferentia chips; 3. The ability to associate route tables with internet gateways and virtual private gateways; 4. AWS Local Zones that place compute, storage, database, and other select services; 5. Launching and viewing EC2 instances and EBS volumes running locally in Outposts; 6. Peering Transit Gateways between regions simplifying creation of secure and private global networks on AWS; 7. Transit Gateway Multicast, enabling multicast routing within and between VPCs using Transit Gateway as a multicast router.
+
+## __Amazon Elastic Kubernetes Service__
+  - ### Features
+    - Introducing Amazon EKS with Fargate. Customers can now use Amazon EKS to launch pods directly onto AWS Fargate, the serverless compute engine built for containers on AWS.
+
+## __Amazon Elasticsearch Service__
+  - ### Features
+    - UltraWarm storage provides a cost-effective way to store large amounts of read-only data on Amazon Elasticsearch Service. Rather than attached storage, UltraWarm nodes use Amazon S3 and a sophisticated caching solution to improve performance. For indices that you are not actively writing to and query less frequently, UltraWarm storage offers significantly lower costs per GiB. In Elasticsearch, these warm indices behave just like any other index. You can query them using the same APIs or use them to create dashboards in Kibana.
+
+## __Amazon Fraud Detector__
+  - ### Features
+    - Amazon Fraud Detector is a fully managed service that makes it easy to identify potentially fraudulent online activities such as online payment fraud and the creation of fake accounts. Amazon Fraud Detector uses your data, machine learning (ML), and more than 20 years of fraud detection expertise from Amazon to automatically identify potentially fraudulent online activity so you can catch more fraud faster.
+
+## __Amazon Simple Storage Service__
+  - ### Features
+    - Amazon S3 Access Points is a new S3 feature that simplifies managing data access at scale for shared data sets on Amazon S3. Access Points provide a customizable way to access the objects in a bucket, with a unique hostname and access policy that enforces the specific permissions and network controls for any request made through the access point. This represents a new way of provisioning access to shared data sets.
+
+## __Amazon Textract__
+  - ### Features
+    - This SDK Release introduces Amazon Augmented AI support for Amazon Textract AnalyzeDocument API. Image byte payloads for synchronous operations have increased from 5 MB to 10 MB.
+
+# __2.10.27__ __2019-12-02__
+## __Access Analyzer__
+  - ### Features
+    - Introducing AWS IAM Access Analyzer, an IAM feature that makes it easy for AWS customers to ensure that their resource-based policies provide only the intended access to resources outside their AWS accounts.
+
+# __2.10.26__ __2019-12-02__
+## __AWS License Manager__
+  - ### Features
+    - AWS License Manager now automates discovery of bring-your-own-license usage across the customers organization. With few simple settings, customers can add bring your own license product information along with licensing rules, which would enable License Manager to automatically track the instances that have the specified products installed. If License Manager detects any violation of licensing rules, it would notify the customers designated license administrator to take corrective action.
+
+## __Amazon DynamoDB Enhanced Client [Preview]__
+  - ### Features
+    - Write operations (put, get, delete) now support 'conditionExpression'
+
+## __Amazon Elastic Compute Cloud__
+  - ### Features
+    - AWS now provides a new BYOL experience for software licenses, such as Windows and SQL Server, that require a dedicated physical server. You can now enjoy the flexibility and cost effectiveness of using your own licenses on Amazon EC2 Dedicated Hosts, but with the simplicity, resiliency, and elasticity of AWS. You can specify your Dedicated Host management preferences, such as host allocation, host capacity utilization, and instance placement in AWS License Manager. Once set up, AWS takes care of these administrative tasks on your behalf, so that you can seamlessly launch virtual machines (instances) on Dedicated Hosts just like you would launch an EC2 instance with AWS provided licenses.
+
+## __EC2 Image Builder__
+  - ### Features
+    - This is the first release of EC2 Image Builder, a service that provides a managed experience for automating the creation of EC2 AMIs.
+
+## __Schemas__
+  - ### Features
+    - This release introduces support for Amazon EventBridge schema registry, making it easy to discover and write code for events in EventBridge.
+
+# __2.10.25__ __2019-11-26__
+## __AWS Directory Service__
+  - ### Features
+    - This release will introduce optional encryption over LDAP network traffic using SSL certificates between customer's self-managed AD and AWS Directory Services instances. The release also provides APIs for Certificate management.
+
+## __AWS Kinesis__
+  - ### Bugfixes
+    - Reducing default read timeout and write timeout to 10 seconds for Kinesis client.
+
+## __AWS MediaTailor__
+  - ### Features
+    - AWS Elemental MediaTailor SDK now allows configuration of the Live Pre-Roll feature for HLS and DASH streams.
+
+## __AWS Organizations__
+  - ### Features
+    - Introduces the DescribeEffectivePolicy action, which returns the contents of the policy that's in effect for the account.
+
+## __AWS RDS DataService__
+  - ### Features
+    - Type hints to improve handling of some specific parameter types (date/time, decimal etc) for ExecuteStatement and BatchExecuteStatement APIs
+
+## __AWS Resource Groups Tagging API__
+  - ### Features
+    - You can use tag policies to help standardize on tags across your organization's resources.
+
+## __AWSServerlessApplicationRepository__
+  - ### Features
+    - AWS Serverless Application Repository now supports verified authors. Verified means that AWS has made a good faith review, as a reasonable and prudent service provider, of the information provided by the requester and has confirmed that the requester's identity is as claimed.
+
+## __Amazon Cognito Identity Provider__
+  - ### Features
+    - This release adds a new setting for a user pool to configure which recovery methods a user can use to recover their account via the forgot password operation.
+
+## __Amazon DynamoDB__
+  - ### Features
+    - 1) Amazon Contributor Insights for Amazon DynamoDB is a diagnostic tool for identifying frequently accessed keys and understanding database traffic trends. 2) Support for displaying new fields when a table's encryption state is Inaccessible or the table have been Archived.
+
+## __Amazon Elastic Inference__
+  - ### Features
+    - Amazon Elastic Inference allows customers to attach Elastic Inference Accelerators to Amazon EC2 and Amazon ECS tasks, thus providing low-cost GPU-powered acceleration and reducing the cost of running deep learning inference. This release allows customers to add or remove tags for their Elastic Inference Accelerators.
+
+## __Amazon QuickSight__
+  - ### Features
+    - Documentation updates for QuickSight
+
+## __Amazon WorkSpaces__
+  - ### Features
+    - For the WorkspaceBundle API, added the image identifier and the time of the last update.
+
+## __Netty NIO HTTP Client__
+  - ### Features
+    - Detect unhealthy http2 connections when read or write times out by sending PING frames
+
+# __2.10.24__ __2019-11-25__
+## __AWS CodeBuild__
+  - ### Features
+    - CodeBuild adds support for test reporting
+
+## __AWS Cost Explorer Service__
+  - ### Features
+    - This launch provides customers with access to Cost Category Public Beta APIs.
+
+## __AWS Elemental MediaConvert__
+  - ### Features
+    - AWS Elemental MediaConvert SDK has added support for 8K outputs and support for QuickTime Animation Codec (RLE) inputs.
+
+## __AWS Elemental MediaLive__
+  - ### Features
+    - AWS Elemental MediaLive now supports the ability to create a multiple program transport stream (MPTS).
+
+## __AWS Elemental MediaPackage VOD__
+  - ### Features
+    - Adds a domain name to PackagingGroups, representing the fully qualified domain name for Assets created in the group.
+
+## __AWS Greengrass__
+  - ### Features
+    - IoT Greengrass supports machine learning resources in 'No container' mode.
+
+## __AWS IoT__
+  - ### Features
+    - This release adds: 1) APIs for fleet provisioning claim and template, 2) endpoint configuration and custom domains, 3) support for enhanced custom authentication, d) support for 4 additional audit checks: Device and CA certificate key quality checks, IoT role alias over-permissive check and IoT role alias access to unused services check, 5) extended capability of AWS IoT Rules Engine to support IoT SiteWise rule action. The IoT SiteWise rule action lets you send messages from IoT sensors and applications to IoT SiteWise asset properties
+
+## __AWS IoT Secure Tunneling__
+  - ### Features
+    - This release adds support for IoT Secure Tunneling to remote access devices behind restricted firewalls.
+
+## __AWS Key Management Service__
+  - ### Features
+    - AWS Key Management Service (KMS) now enables creation and use of asymmetric Customer Master Keys (CMKs) and the generation of asymmetric data key pairs.
+
+## __AWS Lambda__
+  - ### Features
+    - Added the function state and update status to the output of GetFunctionConfiguration and other actions. Check the state information to ensure that a function is ready before you perform operations on it. Functions take time to become ready when you connect them to a VPC.Added the EventInvokeConfig type and operations to configure error handling options for asynchronous invocation. Use PutFunctionEventInvokeConfig to configure the number of retries and the maximum age of events when you invoke the function asynchronously.Added on-failure and on-success destination settings for asynchronous invocation. Configure destinations to send an invocation record to an SNS topic, an SQS queue, an EventBridge event bus, or a Lambda function.Added error handling options to event source mappings. This enables you to configure the number of retries, configure the maximum age of records, or retry with smaller batches when an error occurs when a function processes a Kinesis or DynamoDB stream.Added the on-failure destination setting to event source mappings. This enables you to send discarded events to an SNS topic or SQS queue when all retries fail or when the maximum record age is exceeded when a function processes a Kinesis or DynamoDB stream.Added the ParallelizationFactor option to event source mappings to increase concurrency per shard when a function processes a Kinesis or DynamoDB stream.
+
+## __AWS Resource Access Manager__
+  - ### Features
+    - AWS RAM provides new APIs to view the permissions granted to principals in a resource share. This release also creates corresponding resource shares for supported services that use resource policies, as well as an API to promote them to standard shares that can be managed in RAM.
+
+## __AWS WAFV2__
+  - ### Features
+    - This release introduces new set of APIs ("wafv2") for AWS WAF. Major changes include single set of APIs for creating/updating resources in global and regional scope, and rules are configured directly into web ACL instead of being referenced. The previous APIs ("waf" and "waf-regional") are now referred as AWS WAF Classic. For more information visit: https://docs.aws.amazon.com/waf/latest/APIReference/Welcome.html
+
+## __Alexa For Business__
+  - ### Features
+    - API update for Alexa for Business: This update enables the use of meeting room configuration that can be applied to a room profile. These settings help improve and measure utilization on Alexa for Business enabled rooms. New features include end meeting reminders, intelligent room release and room utilization analytics report.
+
+## __Amazon AppConfig__
+  - ### Features
+    - Introducing AWS AppConfig, a new service that enables customers to quickly deploy validated configurations to applications of any size in a controlled and monitored fashion.
+
+## __Amazon Athena__
+  - ### Features
+    - This release adds additional query lifecycle metrics to the QueryExecutionStatistics object in GetQueryExecution response.
+
+## __Amazon CloudWatch__
+  - ### Features
+    - This release adds a new feature called "Contributor Insights". "Contributor Insights" supports the following 6 new APIs (PutInsightRule, DeleteInsightRules, EnableInsightRules, DisableInsightRules, DescribeInsightRules and GetInsightRuleReport).
+
+## __Amazon CloudWatch Application Insights__
+  - ### Features
+    - CloudWatch Application Insights for .NET and SQL Server includes the follwing features: -Tagging Create and manage tags for your applications.-Custom log pattern matching. Define custom log patterns to be detected and monitored.-Resource-level permissions. Specify applications users can access.
+
+## __Amazon Cognito Identity Provider__
+  - ### Features
+    - Amazon Cognito Userpools now supports Sign in with Apple as an Identity Provider.
+
+## __Amazon Comprehend__
+  - ### Features
+    - Amazon Comprehend now supports real-time analysis with Custom Classification
+
+## __Amazon Data Lifecycle Manager__
+  - ### Features
+    - You can now set time based retention policies on Data Lifecycle Manager. With this launch, DLM allows you to set snapshot retention period in the following interval units: days, weeks, months and years.
+
+## __Amazon Elastic Compute Cloud__
+  - ### Features
+    - This release adds two new APIs: 1. ModifyDefaultCreditSpecification, which allows you to set default credit specification at the account level per AWS Region, per burstable performance instance family, so that all new burstable performance instances in the account launch using the new default credit specification. 2. GetDefaultCreditSpecification, which allows you to get current default credit specification per AWS Region, per burstable performance instance family. This release also adds new client exceptions for StartInstances and StopInstances.
+
+## __Amazon Kinesis Analytics__
+  - ### Features
+    - Kinesis Data Analytics service adds support to configure Java applications to access resources in a VPC. Also releasing support to configure Java applications to set allowNonRestoreState flag through the service APIs.
+
+## __Amazon Lex Runtime Service__
+  - ### Features
+    - Amazon Lex adds "sessionId" attribute to the PostText and PostContent response.
+
+## __Amazon Redshift__
+  - ### Features
+    - This release contains changes for 1. Redshift Scheduler 2. Update to the DescribeNodeConfigurationOptions to include a new action type recommend-node-config
+
+## __Amazon Relational Database Service__
+  - ### Features
+    - Cluster Endpoints can now be tagged by using --tags in the create-db-cluster-endpoint API
+
+## __Amazon Simple Email Service__
+  - ### Features
+    - This release includes support for automatically suppressing email addresses that result in hard bounce or complaint events at the account level, and for managing addresses on this account-level suppression list.
+
+## __Amazon Simple Systems Manager (SSM)__
+  - ### Features
+    - AWS Systems Manager Documents now supports more Document Types: ApplicationConfiguration, ApplicationConfigurationSchema and DeploymentStrategy. This release also extends Document Permissions capabilities and introduces a new Force flag for DeleteDocument API.
+
+## __Application Auto Scaling__
+  - ### Features
+    - This release supports auto scaling of document classifier endpoints for Comprehend; and supports target tracking based on the average capacity utilization metric for AppStream 2.0 fleets.
+
+## __Elastic Load Balancing__
+  - ### Features
+    - This release of Elastic Load Balancing V2 adds new subnet features for Network Load Balancers and a new routing algorithm for Application Load Balancers.
+
+# __2.10.23__ __2019-11-22__
+## __AWS Auto Scaling Plans__
+  - ### Features
+    - Update default endpoint for AWS Auto Scaling.
+
+## __AWS Certificate Manager__
+  - ### Features
+    - This release adds support for Tag-Based IAM for AWS Certificate Manager and adding tags to certificates upon creation.
+
+## __AWS CodeBuild__
+  - ### Features
+    - Add Canonical ARN to LogsLocation.
+
+## __AWS Elemental MediaPackage VOD__
+  - ### Features
+    - Includes the submission time of Asset ingestion request in the API response for Create/List/Describe Assets.
+
+## __AWS SDK for Java v2__
+  - ### Bugfixes
+    - The ProcessCredentialsProvider now supports credential files up to 64 KB by default through an increase of the processOutputLimit from 1024 bytes to 64000 bytes.
+
+## __AWS Security Token Service__
+  - ### Features
+    - Support tagging for STS sessions and tag based access control for the STS APIs
+
+## __Amazon Elastic Compute Cloud__
+  - ### Features
+    - This release adds two new APIs (DescribeInstanceTypes and DescribeInstanceTypeOfferings) that give customers access to instance type attributes and regional and zonal offerings.
+
+## __Amazon Elastic MapReduce__
+  - ### Features
+    - Amazon EMR adds support for concurrent step execution and cancelling running steps. Amazon EMR has added a new Outpost ARN field in the ListCluster and DescribeCluster API responses that is populated for clusters launched in an AWS Outpost subnet.
+
+## __Amazon Forecast Service__
+  - ### Features
+    - This release adds two key updates to existing APIs. 1. Amazon Forecast can now generate forecasts in any quantile using the optional parameter forecastTypes in the CreateForecast API and 2. You can get additional details (metrics and relevant error messages) on your AutoML runs using the DescribePredictor and GetAccuracyMetrics APIs.
+
+## __Amazon Rekognition__
+  - ### Features
+    - This release adds enhanced face filtering support to the IndexFaces API operation, and introduces face filtering for CompareFaces and SearchFacesByImage API operations.
+
+## __Amazon Simple Notification Service__
+  - ### Features
+    - Added documentation for the dead-letter queue feature.
+
+## __Amazon Simple Systems Manager (SSM)__
+  - ### Features
+    - Add RebootOption and LastNoRebootInstallOperationTime for DescribeInstancePatchStates and DescribeInstancePatchStatesForPatchGroup API
+
+## __Application Auto Scaling__
+  - ### Features
+    - Update default endpoint for Application Auto Scaling.
+
+# __2.10.22__ __2019-11-21__
+## __AWS Amplify__
+  - ### Features
+    - This release of AWS Amplify Console introduces support for backend environments. Backend environments are containers for AWS deployments. Each environment is a collection of AWS resources.
+
+## __AWS AppSync__
+  - ### Features
+    - AppSync: AWS AppSync now supports the ability to add, configure, and maintain caching for your AWS AppSync GraphQL API.
+
+## __AWS Config__
+  - ### Features
+    - AWS Config launches Custom Configuration Items. A new feature which allows customers to publish resource configuration for third-party resources, custom, or on-premises servers.
+
+## __AWS Glue__
+  - ### Features
+    - This release adds support for Glue 1.0 compatible ML Transforms.
+
+## __AWSMarketplace Metering__
+  - ### Features
+    - Documentation updates for the AWS Marketplace Metering Service.
+
+## __Amazon Connect Participant Service__
+  - ### Features
+    - This release adds 5 new APIs: CreateParticipantConnection, DisconnectParticipant, GetTranscript, SendEvent, and SendMessage. For Amazon Connect chat, you can use them to programmatically perform participant actions on the configured Amazon Connect instance. Learn more here: https://docs.aws.amazon.com/connect-participant/latest/APIReference/Welcome.html
+
+## __Amazon Connect Service__
+  - ### Features
+    - This release adds a new API: StartChatContact. You can use it to programmatically start a chat on the specified Amazon Connect instance. Learn more here: https://docs.aws.amazon.com/connect/latest/APIReference/Welcome.html
+
+## __Amazon DynamoDB__
+  - ### Features
+    - With this release, you can convert an existing Amazon DynamoDB table to a global table by adding replicas in other AWS Regions.
+
+## __Amazon Elastic Compute Cloud__
+  - ### Features
+    - This release adds support for attaching AWS License Manager Configurations to Amazon Machine Image (AMI) using ImportImage API; and adds support for running different instance sizes on EC2 Dedicated Hosts
+
+## __Amazon Lex Model Building Service__
+  - ### Features
+    - Amazon Lex now supports Sentiment Analysis
+
+## __Amazon Lex Runtime Service__
+  - ### Features
+    - Amazon Lex now supports Sentiment Analysis
+
+## __Amazon Simple Systems Manager (SSM)__
+  - ### Features
+    - The release contains new API and API changes for AWS Systems Manager Explorer product.
+
+## __Amazon Transcribe Service__
+  - ### Features
+    - With this release, Amazon Transcribe now supports transcriptions from audio sources in Hebrew (he-IL), Swiss German (de-CH), Japanese (ja-JP), Turkish (tr-TR), Arabic-Gulf (ar-AE), Malay (ms-MY), Telugu (te-IN)
+
+# __2.10.21__ __2019-11-20__
+## __AWS Application Discovery Service__
+  - ### Features
+    - New exception type for use with Migration Hub home region
+
+## __AWS CloudTrail__
+  - ### Features
+    - 1. This release adds two new APIs, GetInsightSelectors and PutInsightSelectors, which let you configure CloudTrail Insights event delivery on a trail. An Insights event is a new type of event that is generated when CloudTrail detects unusual activity in your AWS account. In this release, only "ApiCallRateInsight" is a supported Insights event type. 2. This release also adds the new "ExcludeManagementEventSource" option to the existing PutEventSelectors API. This field currently supports only AWS Key Management Services.
+
+## __AWS CodeCommit__
+  - ### Features
+    - This release adds support for creating pull request approval rules and pull request approval rule templates in AWS CodeCommit. This allows developers to block merges of pull requests, contingent on the approval rules being satisfiied.
+
+## __AWS DataSync__
+  - ### Features
+    - Update to configure task to run periodically on a schedule
+
+## __AWS Elemental MediaStore__
+  - ### Features
+    - This release fixes a broken link in the SDK documentation.
+
+## __AWS Migration Hub__
+  - ### Features
+    - New exception type for use with Migration Hub home region
+
+## __AWS Migration Hub Config__
+  - ### Features
+    - AWS Migration Hub Config Service allows you to get and set the Migration Hub home region for use with AWS Migration Hub and Application Discovery Service
+
+## __AWS Storage Gateway__
+  - ### Features
+    - The new DescribeAvailabilityMonitorTest API provides the results of the most recent High Availability monitoring test. The new StartAvailabilityMonitorTest API verifies the storage gateway is configured for High Availability monitoring. The new ActiveDirectoryStatus response element has been added to the DescribeSMBSettings and JoinDomain APIs to indicate the status of the gateway after the most recent JoinDomain operation. The new TimeoutInSeconds parameter of the JoinDomain API allows for the configuration of the timeout in which the JoinDomain operation must complete.
+
+## __Amazon Chime__
+  - ### Features
+    - Adds APIs to create and manage meeting session resources for the Amazon Chime SDK
+
+## __Amazon Data Lifecycle Manager__
+  - ### Features
+    - DLM now supports Fast Snapshot Restore. You can enable Fast Restore on snapshots created by DLM, provide the AZs and the number of snapshots to be enabled with this capability.
+
+## __Amazon EC2 Container Service__
+  - ### Features
+    - Added support for CPU and memory task-level overrides on the RunTask and StartTask APIs. Added location information to Tasks.
+
+## __Amazon Elastic Compute Cloud__
+  - ### Features
+    - This release of Amazon Elastic Compute Cloud (Amazon EC2) introduces support for Amazon Elastic Block Store (Amazon EBS) fast snapshot restores.
+
+## __Amazon FSx__
+  - ### Features
+    - Announcing a Multi-AZ deployment type for Amazon FSx for Windows File Server, providing fully-managed Windows file storage with high availability and redundancy across multiple AWS Availability Zones.
+
+## __Amazon Kinesis Firehose__
+  - ### Features
+    - With this release, Amazon Kinesis Data Firehose allows server side encryption with customer managed CMKs. Customer managed CMKs ( "Customer Master Keys") are AWS Key Management Service (KMS) keys that are fully managed by the customer. With customer managed CMKs, customers can establish and maintain their key policies, IAM policies, rotating policies and add tags. For more information about AWS KMS and CMKs, please refer to: https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html. Please refer to the following link to create CMKs: https://docs.aws.amazon.com/kms/latest/developerguide/importing-keys-create-cmk.html
+
+## __Amazon QuickSight__
+  - ### Features
+    - Amazon QuickSight now supports programmatic creation and management of data sources, data sets, dashboards and templates with new APIs. Templates hold dashboard metadata, and can be used to create copies connected to the same or different dataset as required. Also included in this release are APIs for SPICE ingestions, fine-grained access control over AWS resources using AWS Identity and Access Management (IAM) policies, as well AWS tagging. APIs are supported for both Standard and Enterprise Edition, with edition-specific support for specific functionality.
+
+## __Amazon Simple Storage Service__
+  - ### Features
+    - This release introduces support for Amazon S3 Replication Time Control, a new feature of S3 Replication that provides a predictable replication time backed by a Service Level Agreement. S3 Replication Time Control helps customers meet compliance or business requirements for data replication, and provides visibility into the replication process with new Amazon CloudWatch Metrics.
+
+## __Amazon Transcribe Service__
+  - ### Features
+    - With this release Amazon Transcribe enables alternative transcriptions so that you can see different interpretations of transcribed audio.
+
+# __2.10.20__ __2019-11-19__
+## __AWS CloudFormation__
+  - ### Features
+    - This release of AWS CloudFormation StackSets enables users to detect drift on a stack set and the stack instances that belong to that stack set.
+
+## __AWS CodeBuild__
+  - ### Features
+    - Add support for ARM and GPU-enhanced build environments and a new SSD-backed Linux compute type with additional CPU and memory in CodeBuild
+
+## __AWS Config__
+  - ### Features
+    - AWSConfig launches support for conformance packs. A conformance pack is a new resource type that allows you to package a collection of Config rules and remediation actions into a single entity. You can create and deploy conformance packs into your account or across all accounts in your organization
+
+## __AWS Identity and Access Management__
+  - ### Features
+    - IAM reports the timestamp when a role's credentials were last used to make an AWS request. This helps you identify unused roles and remove them confidently from your AWS accounts.
+
+## __AWS IoT__
+  - ### Features
+    - As part of this release, we are extending the capability of AWS IoT Rules Engine to send messages directly to customer's own web services/applications. Customers can now create topic rules with HTTP actions to route messages from IoT Core directly to URL's that they own. Ownership is proved by creating and confirming topic rule destinations.
+
+## __AWS Lambda__
+  - ### Features
+    - This release provides three new runtimes to support Node.js 12 (initially 12.13.0), Python 3.8 and Java 11.
+
+## __Amazon Elastic Compute Cloud__
+  - ### Features
+    - This release adds support for RunInstances to specify the metadata options for new instances; adds a new API, ModifyInstanceMetadataOptions, which lets you modify the metadata options for a running or stopped instance; and adds support for CreateCustomerGateway to specify a device name.
+
+## __Auto Scaling__
+  - ### Features
+    - Amazon EC2 Auto Scaling now supports Instance Weighting and Max Instance Lifetime. Instance Weighting allows specifying the capacity units for each instance type included in the MixedInstancesPolicy and how they would contribute to your application's performance. Max Instance Lifetime allows specifying the maximum length of time that an instance can be in service. If any instances are approaching this limit, Amazon EC2 Auto Scaling gradually replaces them.
+
+## __Elastic Load Balancing__
+  - ### Features
+    - This release allows forward actions on Application Load Balancers to route requests to multiple target groups, based on the weight you specify for each target group.
+
+# __2.10.19__ __2019-11-18__
+## __AWS CloudFormation__
+  - ### Features
+    - This release introduces APIs for the CloudFormation Registry, a new service to submit and discover resource providers with which you can manage third-party resources natively in CloudFormation.
+
+## __AWS Cost Explorer Service__
+  - ### Features
+    - add EstimatedOnDemandCostWithCurrentCommitment to GetSavingsPlansPurchaseRecommendationRequest API
+
+## __Amazon Pinpoint__
+  - ### Features
+    - This release of the Amazon Pinpoint API introduces support for using and managing message templates for messages that are sent through the voice channel. It also introduces support for specifying default values for message variables in message templates.
+
+## __Amazon Relational Database Service__
+  - ### Features
+    - Documentation updates for rds
+
+## __Amazon SageMaker Runtime__
+  - ### Features
+    - Amazon SageMaker Runtime now supports a new TargetModel header to invoke a specific model hosted on multi model endpoints.
+
+## __Amazon SageMaker Service__
+  - ### Features
+    - Amazon SageMaker now supports multi-model endpoints to host multiple models on an endpoint using a single inference container.
+
+## __Amazon Simple Storage Service__
+  - ### Features
+    - Added support for S3 Replication for existing objects. This release allows customers who have requested and been granted access to replicate existing S3 objects across buckets.
+
+## __Amazon Simple Systems Manager (SSM)__
+  - ### Features
+    - The release contains new API and API changes for AWS Systems Manager Explorer product.
+
+## __Netty NIO HTTP Client__
+  - ### Bugfixes
+    - Update default connectionMaxIdleTimeout of NettyNioAsyncClient to 5 seconds
+
+# __2.10.18__ __2019-11-15__
+## __AWS Elemental MediaConvert__
+  - ### Features
+    - AWS Elemental MediaConvert SDK has added support for DolbyVision encoding, and SCTE35 & ESAM insertion to DASH ISO EMSG.
+
+## __AWS SDK for Java v2__
+  - ### Features
+    - When SdkException or one of its children is created without a 'message', inherit the message from the exception 'cause' (if any). This should reduce the chance of an exception being raised by the SDK with a null message.
+
+## __Amazon Chime__
+  - ### Features
+    - This release adds support for Chime Room Management APIs
+
+## __Amazon CloudWatch Logs__
+  - ### Features
+    - Documentation updates for logs
+
+## __Amazon Cognito Identity Provider__
+  - ### Features
+    - This release adds a new option in the User Pool to allow specifying sender's name in the emails sent by Amazon Cognito. This release also adds support to add SES Configuration Set to the emails sent by Amazon Cognito.
+
+## __Amazon Elastic Compute Cloud__
+  - ### Features
+    - You can now add tags while copying snapshots. Previously, a user had to first copy the snapshot and then add tags to the copied snapshot manually. Moving forward, you can specify the list of tags you wish to be applied to the copied snapshot as a parameter on the Copy Snapshot API.
+
+## __Amazon Elastic Kubernetes Service__
+  - ### Features
+    - Introducing Amazon EKS managed node groups, a new feature that lets you easily provision worker nodes for Amazon EKS clusters and keep them up to date using the Amazon EKS management console, CLI, and APIs.
+
+## __Amazon Elastic MapReduce__
+  - ### Features
+    - Access to the cluster ARN makes it easier for you to author resource-level permissions policies in AWS Identity and Access Management. To simplify the process of obtaining the cluster ARN, Amazon EMR has added a new field containing the cluster ARN to all API responses that include the cluster ID.
+
+## __Amazon GuardDuty__
+  - ### Features
+    - This release includes new operations related to findings export, including: CreatePublishingDestination, UpdatePublishingDestination, DescribePublishingDestination, DeletePublishingDestination and ListPublishingDestinations.
+
+## __Amazon Simple Systems Manager (SSM)__
+  - ### Features
+    - This release updates AWS Systems Manager Parameter Store documentation for the enhanced search capability.
+
+## __Amazon WorkSpaces__
+  - ### Features
+    - Added APIs to register your directories with Amazon WorkSpaces and to modify directory details.
+
+## __Elastic Load Balancing__
+  - ### Features
+    - Documentation-only change to the default value of the routing.http.drop_invalid_header_fields.enabled attribute.
+
+# __2.10.17__ __2019-11-14__
+## __AWSMarketplace Metering__
+  - ### Features
+    - Added CustomerNotEntitledException in MeterUsage API for Container use case.
+
+## __Amazon Cognito Identity Provider__
+  - ### Features
+    - This release adds a new setting at user pool client to prevent user existence related errors during authentication, confirmation, and password recovery related operations. This release also adds support to enable or disable specific authentication flows for a user pool client.
+
+## __Amazon Connect Service__
+  - ### Features
+    - This release enhances the existing user management APIs and adds 3 new APIs - TagResource, UntagResource, and ListTagsForResource to support tagging Amazon Connect users, which facilitates more granular access controls for Amazon Connect users within an Amazon Connect instance. You can learn more about the new APIs here: https://docs.aws.amazon.com/connect/latest/APIReference/Welcome.html.
+
+## __Amazon Personalize__
+  - ### Features
+    - Amazon Personalize: Adds ability to get batch recommendations by creating a batch inference job.
+
+## __Amazon Simple Systems Manager (SSM)__
+  - ### Features
+    - Updates support for adding attachments to Systems Manager Automation documents
+
+# __2.10.16__ __2019-11-13__
+## __AWS Data Exchange__
+  - ### Features
+    - Introducing AWS Data Exchange, a service that makes it easy for AWS customers to securely create, manage, access, and exchange data sets in the cloud.
+
+## __AWS IoT__
+  - ### Features
+    - This release adds the custom fields definition support in the index definition for AWS IoT Fleet Indexing Service. Custom fields can be used as an aggregation field to run aggregations with both existing GetStatistics API and newly added GetCardinality, GetPercentiles APIs. GetStatistics will return all statistics (min/max/sum/avg/count...) with this release. For more information, please refer to our latest documentation: https://docs.aws.amazon.com/iot/latest/developerguide/iot-indexing.html
+
+## __Amazon CloudSearch__
+  - ### Features
+    - Amazon CloudSearch domains let you require that all traffic to the domain arrive over HTTPS. This security feature helps you block clients that send unencrypted requests to the domain.
+
+## __Amazon Data Lifecycle Manager__
+  - ### Features
+    - You can now add tags to a lifecycle policy in Data Lifecycle Manager (DLM). Tags allow you to categorize your policies in different ways, such as by department, purpose or owner. You can also enable resource level permissions based on tags to set access control on ability to modify or delete a tagged policy.
+
+## __Amazon Simple Email Service__
+  - ### Features
+    - This is the first release of version 2 of the Amazon SES API. You can use this API to configure your Amazon SES account, and to send email. This API extends the functionality that exists in the previous version of the Amazon SES API.
+
+# __2.10.15__ __2019-11-12__
+## __AWS CodePipeline__
+  - ### Features
+    - AWS CodePipeline now supports the use of variables in action configuration.
+
+## __AWS Marketplace Catalog Service__
+  - ### Features
+    - This is the first release for the AWS Marketplace Catalog service which allows you to list, describe and manage change requests on your published entities on AWS Marketplace.
+
+## __Amazon DynamoDB__
+  - ### Features
+    - Amazon DynamoDB enables you to restore your data to a new DynamoDB table using a point-in-time or on-demand backup. You now can modify the settings on the new restored table. Specifically, you can exclude some or all of the local and global secondary indexes from being created with the restored table. In addition, you can change the billing mode and provisioned capacity settings.
+
+## __Amazon Transcribe Service__
+  - ### Features
+    - With this release, Amazon Transcribe now supports transcriptions from audio sources in Welsh English (en-WL), Scottish English(en-AB), Irish English(en-IE), Farsi(fa-IR), Tamil(ta-IN), Indonesian(id-ID), Portuguese (pt-PT), Dutch(nl-NL).
+
+## __Elastic Load Balancing__
+  - ### Features
+    - You can configure your Application Load Balancer to either drop invalid header fields or forward them to targets.
+
+# __2.10.14__ __2019-11-11__
+## __AWS CloudFormation__
+  - ### Features
+    - The Resource Import feature enables customers to import existing AWS resources into new or existing CloudFormation Stacks.
+
+## __AWS Cost Explorer Service__
+  - ### Features
+    - This launch provides customers with access to GetCostAndUsageWithResources API.
+
+## __Amazon Polly__
+  - ### Features
+    - Add `PollyPresigner` which enables support for presigning `SynthesizeSpeech` requests.
+
+# __2.10.13__ __2019-11-08__
+## __Amazon Cognito Identity__
+  - ### Features
+    - This release adds support for disabling classic flow.
+
+## __Amazon EC2 Container Registry__
+  - ### Features
+    - This release contains ticket fixes for Amazon ECR.
+
+# __2.10.12__ __2019-11-07__
+## __AWS S3__
+  - ### Features
+    - Added support for presignPutObject in S3Presigner.
+
+## __AWS SSO OIDC__
+  - ### Features
+    - This is an initial release of AWS Single Sign-On OAuth device code authorization service.
+
+## __AWS Single Sign-On__
+  - ### Features
+    - This is an initial release of AWS Single Sign-On (SSO) end-user access. This release adds support for accessing AWS accounts assigned in AWS SSO using short term credentials.
+
+## __Amazon Comprehend__
+  - ### Features
+    - This release adds new languages (ar, hi, ko, ja, zh, zh-TW) for Amazon Comprehend's DetectSentiment, DetectEntities, DetectKeyPhrases, BatchDetectSentiment, BatchDetectEntities and BatchDetectKeyPhrases APIs
+
+## __Amazon Simple Systems Manager (SSM)__
+  - ### Features
+    - AWS Systems Manager Session Manager target length increased to 400.
+
+## __Netty NIO HTTP Client__
+  - ### Features
+    - Switch from setting the absolute URI in HTTP requests with no `Host` header to setting the absolute request path and query paramters and a `Host` header.
+
+# __2.10.11__ __2019-11-06__
+## __AWS SDK for Java v2__
+  - ### Features
+    - Added the web identity credentials provider to the default credential chain
+
+## __AWS Savings Plans__
+  - ### Features
+    - This is the first release of Savings Plans, a new flexible pricing model that offers low prices on Amazon EC2 and AWS Fargate usage.
+
+# __2.10.10__ __2019-11-06__
+## __AWS Budgets__
+  - ### Features
+    - Documentation updates for budgets to track Savings Plans utilization and coverage
+
+## __AWS CodeBuild__
+  - ### Features
+    - Add support for Build Number, Secrets Manager and Exported Environment Variables.
+
+## __AWS Cost Explorer Service__
+  - ### Features
+    - This launch provides customers with access to Savings Plans management APIs.
+
+## __AWS Savings Plans__
+  - ### Features
+    - This is the first release of Savings Plans, a new flexible pricing model that offers low prices on Amazon EC2 and AWS Fargate usage.
+
+## __AWS Signer__
+  - ### Features
+    - This release adds support for tagging code-signing profiles in AWS Signer.
+
+## __Amazon Elastic File System__
+  - ### Features
+    - EFS customers can select a lifecycle policy that automatically moves files that have not been accessed for 7 days into the EFS Infrequent Access (EFS IA) storage class. EFS IA provides price/performance that is cost-optimized for files that are not accessed every day.
+
+# __2.10.9__ __2019-11-05__
+## __AWS CodeStar Notifications__
+  - ### Features
+    - This release adds a notification manager for events in repositories, build projects, deployments, and pipelines. You can now configure rules and receive notifications about events that occur for resources. Each notification includes a status message as well as a link to the resource (repository, build project, deployment application, or pipeline) whose event generated the notification.
+
+## __Amazon Relational Database Service__
+  - ### Features
+    - Documentation updates for Amazon RDS
+
+# __2.10.8__ __2019-11-04__
+## __AWS RoboMaker__
+  - ### Features
+    - RoboMaker Fleet Management launch a feature to verify your robot is ready to download and install the new robot application using a download condition file, which is a script run on the robot prior to downloading the new deployment.
+
+## __Amazon DynamoDB Accelerator (DAX)__
+  - ### Features
+    - Documentation updates for dax
+
+## __Amazon Elastic Compute Cloud__
+  - ### Features
+    - Documentation updates for ec2
+
+# __2.10.7__ __2019-11-01__
+## __AWS CloudTrail__
+  - ### Features
+    - This release adds two new APIs, GetTrail and ListTrails, and support for adding tags when you create a trail by using a new TagsList parameter on CreateTrail operations.
+
+## __AWS Database Migration Service__
+  - ### Features
+    - This release contains task timeline attributes in replication task statistics. This release also adds a note to the documentation for the CdcStartPosition task request parameter. This note describes how to enable the use of native CDC start points for a PostgreSQL source by setting the new slotName extra connection attribute on the source endpoint to the name of an existing logical replication slot.
+
+## __Amazon Pinpoint__
+  - ### Features
+    - This release of the Amazon Pinpoint API introduces support for using and managing journeys, and querying analytics data for journeys.
+
 # __2.10.6__ __2019-10-31__
 ## __AWS Amplify__
   - ### Features
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 1f040805e1bd..fe86c5fb7638 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -88,7 +88,7 @@ Please keep the following in mind when considering a code contribution:
 
    Any code you submit will be released under this license. If you are
    contributing a large/substantial feature, you may be asked to sign a
-   [Contributor License Agreement (CLA)][cla].
+   Contributor License Agreement (CLA).
 * For anything but very small or quick changes, you should always start by
   checking the [Issues][issues] page to see if the work is already being done
   by another person.
@@ -165,7 +165,6 @@ when contributing to the SDK.
 [markdown]: https://guides.github.com/features/mastering-markdown/
 [issues]: https://github.com/aws/aws-sdk-java-v2/issues
 [pull-requests]: https://github.com/aws/aws-sdk-java-v2/pulls
-[cla]: https://github.com/aws/aws-cla
 [label-bug]: https://github.com/aws/aws-sdk-java-v2/labels/Bug
 [label-doc-issue]: https://github.com/aws/aws-sdk-java-v2/labels/Documentation%20Issue
 [label-feature-request]: https://github.com/aws/aws-sdk-java-v2/labels/Feature%20Request
diff --git a/NOTICE.txt b/NOTICE.txt
index 434630a6dbfc..e277e4c2c445 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -1,5 +1,5 @@
 AWS SDK for Java 2.0
-Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 
 This product includes software developed by
 Amazon Technologies, Inc (http://www.amazon.com/).
@@ -10,5 +10,7 @@ THIRD PARTY COMPONENTS
 This software includes third party software subject to the following copyrights:
 - XML parsing and utility functions from JetS3t - Copyright 2006-2009 James Murty.
 - PKCS#1 PEM encoded private key parsing and utility functions from oauth.googlecode.com - Copyright 1998-2010 AOL Inc.
+- Apache Commons Lang - https://github.com/apache/commons-lang
+- Netty Reactive Streams - https://github.com/playframework/netty-reactive-streams
 
 The licenses for these third party components are included in LICENSE.txt
diff --git a/README.md b/README.md
index 1ec46c292273..9eff33ae8e04 100644
--- a/README.md
+++ b/README.md
@@ -16,6 +16,7 @@ artifact source.
 * [Sample Code](#sample-code)
 * [API Docs][docs-api]
 * [Developer Guide][docs-guide] ([source][docs-guide-source])
+* [Maven Archetypes](archetypes/README.md)
 * [Issues][sdk-issues]
 * [SDK Blog][blog]
 * [Giving Feedback](#giving-feedback)
@@ -48,7 +49,7 @@ To automatically manage module versions (currently all modules have the same ver
     <dependency>
       <groupId>software.amazon.awssdk</groupId>
       <artifactId>bom</artifactId>
-      <version>2.10.6</version>
+      <version>2.11.7</version>
       <type>pom</type>
       <scope>import</scope>
     </dependency>
@@ -82,12 +83,12 @@ Alternatively you can add dependencies for the specific services you use only:
 <dependency>
   <groupId>software.amazon.awssdk</groupId>
   <artifactId>ec2</artifactId>
-  <version>2.10.6</version>
+  <version>2.11.7</version>
 </dependency>
 <dependency>
   <groupId>software.amazon.awssdk</groupId>
   <artifactId>s3</artifactId>
-  <version>2.10.6</version>
+  <version>2.11.7</version>
 </dependency>
 ```
 
@@ -99,7 +100,7 @@ You can import the whole SDK into your project (includes *ALL* services). Please
 <dependency>
   <groupId>software.amazon.awssdk</groupId>
   <artifactId>aws-sdk-java</artifactId>
-  <version>2.10.6</version>
+  <version>2.11.7</version>
 </dependency>
 ```
 
diff --git a/archetypes/README.md b/archetypes/README.md
new file mode 100755
index 000000000000..70980eb12890
--- /dev/null
+++ b/archetypes/README.md
@@ -0,0 +1,9 @@
+# Maven Archetypes for AWS SDK for Java 2.x
+
+## Description
+This module contains maven archetypes for AWS Java SDK 2.x.
+
+## Archetypes
+
+- [archetype-lambda](archetype-lambda/README.md) - a lambda function template using AWS Java SDK 2.x
+
diff --git a/archetypes/archetype-lambda/README.md b/archetypes/archetype-lambda/README.md
new file mode 100755
index 000000000000..1992b020ddfa
--- /dev/null
+++ b/archetypes/archetype-lambda/README.md
@@ -0,0 +1,65 @@
+# Maven Archetype for lambda function using AWS SDK for Java 2.x
+
+## Description
+This is an Apache Maven Archetype to create a lambda function template using [AWS Java SDK 2.x][aws-java-sdk-v2]. The generated template
+has the optimized configurations and follows the best practices to reduce start up time.
+
+## Usage
+
+You can use `mvn archetype:generate` to generate a project using this archetype. See [maven archetype usage guidance][maven-archetype-usage] for more information.
+
+- Interactive mode
+
+```
+mvn archetype:generate \
+  -DarchetypeGroupId=software.amazon.awssdk \
+  -DarchetypeArtifactId=archetype-lambda \
+  -DarchetypeVersion=2.x\
+```
+
+- Batch mode
+
+```
+mvn archetype:generate \
+    -DarchetypeGroupId=software.amazon.awssdk \
+    -DarchetypeArtifactId=archetype-lambda \
+    -DarchetypeVersion=2.x\
+    -DgroupId=com.test \
+    -DartifactId=sample-project \
+    -Dservice=s3  \
+    -Dregion=us-west-2 \
+    -DinteractiveMode=false \
+```
+
+### Parameters
+      
+Parameter Name | Default Value | Description
+---|---|---
+`service` (required) | n/a | Specifies the service client to be used in the lambda function, eg: s3, dynamodb. You can find available services [here][java-sdk-v2-services].
+`region` (required) | n/a | Specifies the region to be set for the SDK client in the application
+`groupId`(required) | n/a | Specifies the group ID of the project
+`artifactId`(required) | n/a | Specifies the artifact ID of the project
+`httpClient` | url-connection-client | Specifies the http client to be used by the SDK client. Available options are `url-connection-client` (sync), `apache-client` (sync), `netty-nio-client` (async). See [http clients][sdk-http-clients]
+`handlerClassName` | `"App"`| Specifies the class name of the handler, which will be used as the lambda function name. It should be camel case.
+`javaSdkVersion` | Same version as the archetype version | Specifies the version of the AWS Java SDK 2.x to be used
+`version` | 1.0-SNAPSHOT | Specifies the version of the project
+`package` | ${groupId} | Specifies the package name for the classes
+
+### Deployment
+
+To deploy the lambda function, you can use [SAM CLI][sam-cli]. The generated project contains a default [SAM template][sam-template] file `template.yaml` where you can 
+configure different properties of your lambda function such as memory size and timeout.
+
+```
+sam deploy --guided
+```
+
+Please refer to [deploying lambda apps][deploying-lambda-apps] for more info.
+
+[aws-java-sdk-v2]: https://github.com/aws/aws-sdk-java-v2
+[java-sdk-v2-services]: https://github.com/aws/aws-sdk-java-v2/tree/master/services
+[sdk-http-clients]: https://github.com/aws/aws-sdk-java-v2/tree/master/http-clients
+[deploying-lambda-apps]: https://docs.aws.amazon.com/lambda/latest/dg/deploying-lambda-apps.html
+[sam-cli]:https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/serverless-getting-started.html
+[maven-archetype-usage]: https://maven.apache.org/archetype/maven-archetype-plugin/usage.html
+[sam-template]: https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-resource-function.html
diff --git a/archetypes/archetype-lambda/pom.xml b/archetypes/archetype-lambda/pom.xml
new file mode 100644
index 000000000000..c8dc4e8715e6
--- /dev/null
+++ b/archetypes/archetype-lambda/pom.xml
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2010-2020 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.
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>archetypes</artifactId>
+        <groupId>software.amazon.awssdk</groupId>
+        <version>2.11.8-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>archetype-lambda</artifactId>
+    <packaging>maven-archetype</packaging>
+    <name>AWS Java SDK :: Archetype Lambda</name>
+    <description>
+        The AWS SDK for Java - Maven archetype for Java lambda function using AWS Java SDK 2.x
+    </description>
+
+    <properties>
+        <maven.archetype.version>3.1.2</maven.archetype.version>
+        <exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
+    </properties>
+
+    <dependencies>
+        <!-- Depends on the artifacts of all services to generate serviceMapping.vm -->
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>aws-sdk-java</artifactId>
+            <version>${awsjavasdk.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    <build>
+        <!-- Filtering the resource properties to get ${project.version} from archetype metadata.
+        See https://stackoverflow.com/a/22300149 -->
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+                <includes>
+                    <include>META-INF/maven/archetype-metadata.xml</include>
+                </includes>
+            </resource>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>false</filtering>
+                <excludes>
+                    <exclude>META-INF/maven/archetype-metadata.xml</exclude>
+                </excludes>
+            </resource>
+        </resources>
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.archetype</groupId>
+                <artifactId>archetype-packaging</artifactId>
+                <version>${maven.archetype.version}</version>
+            </extension>
+        </extensions>
+
+        <plugins>
+            <plugin>
+                <artifactId>exec-maven-plugin</artifactId>
+                <groupId>org.codehaus.mojo</groupId>
+                <version>${exec-maven-plugin.version}</version>
+                <executions>
+                    <execution>
+                        <id>map-service-to-client-prefix</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>python</executable>
+                            <commandlineArgs>${basedir}/src/main/resources/map-service-to-client-prefix</commandlineArgs>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-archetype-plugin</artifactId>
+                <version>${maven.archetype.version}</version>
+                <configuration>
+                    <noLog>true</noLog>
+                    <ignoreEOLStyle>true</ignoreEOLStyle>
+                    <skip>${skip.unit.tests}</skip>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>integration-test</id>
+                        <phase>verify</phase>
+                        <goals>
+                            <goal>integration-test</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <!-- Skip dependency analysis because it's unnecessary for this module -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <version>${maven-dependency-plugin.version}</version>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file
diff --git a/archetypes/archetype-lambda/src/main/resources/META-INF/maven/archetype-metadata.xml b/archetypes/archetype-lambda/src/main/resources/META-INF/maven/archetype-metadata.xml
new file mode 100644
index 000000000000..cae4983caaf1
--- /dev/null
+++ b/archetypes/archetype-lambda/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archetype-descriptor xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0 http://maven.apache.org/xsd/archetype-descriptor-1.0.0.xsd" name="zoewanglambdatesting"
+    xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <fileSets>
+    <fileSet filtered="true" packaged="true" encoding="UTF-8">
+      <directory>src/main/java</directory>
+      <includes>
+        <include>**/*.java</include>
+      </includes>
+    </fileSet>
+    <fileSet filtered="true" packaged="true" encoding="UTF-8">
+      <directory>src/test/java</directory>
+      <includes>
+        <include>**/*.java</include>
+      </includes>
+    </fileSet>
+    <fileSet filtered="true" encoding="UTF-8">
+      <directory/>
+      <includes>
+        <include>.gitignore</include>
+        <include>template.yaml</include>
+        <include>README.md</include>
+      </includes>
+    </fileSet>
+  </fileSets>
+  <requiredProperties>
+    <requiredProperty key="handlerClassName">
+      <defaultValue>App</defaultValue>
+    </requiredProperty>
+    <requiredProperty key="javaSdkVersion">
+      <defaultValue>${project.version}</defaultValue>
+      <validationRegex>\d+\.\d+.\d+</validationRegex>
+    </requiredProperty>
+    <requiredProperty key="service">
+    </requiredProperty>
+    <requiredProperty key="httpClient">
+      <defaultValue>url-connection-client</defaultValue>
+      <validationRegex>(url-connection-client|apache-client|netty-nio-client)</validationRegex>
+    </requiredProperty>
+    <requiredProperty key="region">
+     <validationRegex>^\w+-(\w+-)+\d+$</validationRegex>
+    </requiredProperty>
+    <!-- Required to pass the netty-open-ssl-version property from parent pom to velocity-->
+    <requiredProperty key="nettyOpenSslVersion">
+      <defaultValue>${netty-open-ssl-version}</defaultValue>
+    </requiredProperty>
+  </requiredProperties>
+</archetype-descriptor>
diff --git a/archetypes/archetype-lambda/src/main/resources/archetype-resources/.gitignore b/archetypes/archetype-lambda/src/main/resources/archetype-resources/.gitignore
new file mode 100644
index 000000000000..a500caff54ac
--- /dev/null
+++ b/archetypes/archetype-lambda/src/main/resources/archetype-resources/.gitignore
@@ -0,0 +1,17 @@
+# Eclipse
+.classpath
+.project
+.settings/
+
+# Intellij
+.idea/
+*.iml
+*.iws
+
+# Mac
+.DS_Store
+
+# Maven
+target/
+
+**/dependency-reduced-pom.xml
diff --git a/archetypes/archetype-lambda/src/main/resources/archetype-resources/README.md b/archetypes/archetype-lambda/src/main/resources/archetype-resources/README.md
new file mode 100644
index 000000000000..f8effbaa17ad
--- /dev/null
+++ b/archetypes/archetype-lambda/src/main/resources/archetype-resources/README.md
@@ -0,0 +1,45 @@
+#[[#]]# ${handlerClassName}
+
+This project contains an AWS Lambda maven application with [AWS Java SDK 2.x](https://github.com/aws/aws-sdk-java-v2) dependencies.
+
+#[[##]]# Prerequisites
+- Java 1.8+
+- Apache Maven
+- [AWS SAM CLI](https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/serverless-sam-cli-install.html)
+- Docker
+
+#[[##]]# Development
+
+The generated function handler class just returns the input. The configured AWS Java SDK client is created in `DependencyFactory` class and you can 
+add the code to interact with the SDK client based on your use case.
+
+#[[####]]# Building the project
+```
+mvn clean install
+```
+
+#[[####]]# Testing it locally
+```
+sam local invoke
+```
+
+#[[####]]# Adding more SDK clients
+To add more service clients, you need to add the specific services modules in `pom.xml` and create the clients in `DependencyFactory` following the same 
+pattern as ${serviceClientVariable}Client.
+
+#[[##]]# Deployment
+
+The generated project contains a default [SAM template](https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-resource-function.html) file `template.yaml` where you can 
+configure different properties of your lambda function such as memory size and timeout. You might also need to add specific policies to the lambda function
+so that it can access other AWS resources.
+
+To deploy the application, you can run the following command:
+
+```
+sam deploy --guided
+```
+
+See [Deploying Serverless Applications](https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/serverless-deploying.html) for more info.
+
+
+
diff --git a/archetypes/archetype-lambda/src/main/resources/archetype-resources/pom.xml b/archetypes/archetype-lambda/src/main/resources/archetype-resources/pom.xml
new file mode 100644
index 000000000000..035954af7d98
--- /dev/null
+++ b/archetypes/archetype-lambda/src/main/resources/archetype-resources/pom.xml
@@ -0,0 +1,108 @@
+#parse ( "global.vm")
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>${groupId}</groupId>
+    <artifactId>${artifactId}</artifactId>
+    <version>${version}</version>
+    <packaging>jar</packaging>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.shade.plugin.version>3.1.1</maven.shade.plugin.version>
+        <maven.compiler.plugin.version>3.6.1</maven.compiler.plugin.version>
+        <exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
+        <aws.java.sdk.version>${javaSdkVersion}</aws.java.sdk.version>
+        <aws.lambda.java.version>1.2.0</aws.lambda.java.version>
+        <junit5.version>5.4.2</junit5.version>
+#if( $httpClient == 'netty-nio-client')
+        <netty.openssl.version>${nettyOpenSslVersion}</netty.openssl.version>
+#end
+    </properties>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>software.amazon.awssdk</groupId>
+                <artifactId>bom</artifactId>
+                <version>${aws.java.sdk.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <dependencies>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>${moduleName}</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>software.amazon.awssdk</groupId>
+                    <artifactId>netty-nio-client</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>software.amazon.awssdk</groupId>
+                    <artifactId>apache-client</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>${httpClient}</artifactId>
+        </dependency>
+
+#if( $httpClient == 'netty-nio-client')
+        <!-- Adding netty-tcnative dependency so that netty async client uses openSSL as sslProvider if supported
+        See https://github.com/aws/aws-sdk-java-v2/blob/master/docs/BestPractices.md#use-openssl-for-netty-async-client -->
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-tcnative-boringssl-static</artifactId>
+            <version>${netty.openssl.version}</version>
+        </dependency>
+#end
+        <dependency>
+            <groupId>com.amazonaws</groupId>
+            <artifactId>aws-lambda-java-core</artifactId>
+            <version>${aws.lambda.java.version}</version>
+        </dependency>
+
+        <!-- Test Dependencies -->
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>${junit5.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>${maven.compiler.plugin.version}</version>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>${maven.shade.plugin.version}</version>
+                <configuration>
+                    <createDependencyReducedPom>false</createDependencyReducedPom>
+                    <finalName>${artifactId}</finalName>
+                </configuration>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/archetypes/archetype-lambda/src/main/resources/archetype-resources/src/main/java/DependencyFactory.java b/archetypes/archetype-lambda/src/main/resources/archetype-resources/src/main/java/DependencyFactory.java
new file mode 100644
index 000000000000..f9f4ed2f2e3b
--- /dev/null
+++ b/archetypes/archetype-lambda/src/main/resources/archetype-resources/src/main/java/DependencyFactory.java
@@ -0,0 +1,27 @@
+#parse ( "global.vm")
+
+package ${package};
+
+import software.amazon.awssdk.auth.credentials.EnvironmentVariableCredentialsProvider;
+import software.amazon.awssdk.http.${httpClientPackageName};
+import software.amazon.awssdk.regions.Region;
+import software.amazon.awssdk.services.${servicePackage}.${serviceClientClassName};
+
+/**
+ * The module containing all dependencies required by the {@link ${handlerClassName}}.
+ */
+public class DependencyFactory {
+
+    private DependencyFactory() {}
+
+    /**
+     * @return an instance of ${serviceClientClassName}
+     */
+    public static ${serviceClientClassName} ${serviceClientVariable}Client() {
+        return ${serviceClientClassName}.builder()
+                       .credentialsProvider(EnvironmentVariableCredentialsProvider.create())
+                       .region(Region.${regionEnum})
+                       .httpClientBuilder(${httpClientClassName}.builder())
+                       .build();
+    }
+}
diff --git a/archetypes/archetype-lambda/src/main/resources/archetype-resources/src/main/java/__handlerClassName__.java b/archetypes/archetype-lambda/src/main/resources/archetype-resources/src/main/java/__handlerClassName__.java
new file mode 100644
index 000000000000..8a66c4aa925d
--- /dev/null
+++ b/archetypes/archetype-lambda/src/main/resources/archetype-resources/src/main/java/__handlerClassName__.java
@@ -0,0 +1,29 @@
+#parse ( "global.vm")
+package ${package};
+
+import com.amazonaws.services.lambda.runtime.Context;
+import com.amazonaws.services.lambda.runtime.RequestHandler;
+import software.amazon.awssdk.services.${servicePackage}.${serviceClientClassName};
+
+/**
+ * Lambda function entry point. You can change to use other pojo type or implement
+ * a different RequestHandler.
+ *
+ * @see <a href=https://docs.aws.amazon.com/lambda/latest/dg/java-handler.html>Lambda Java Handler</a> for more information
+ */
+public class ${handlerClassName} implements RequestHandler<Object, Object> {
+    private final ${serviceClientClassName} ${serviceClientVariable}Client;
+
+    public ${handlerClassName}() {
+        // Initialize the SDK client outside of the handler method so that it can be reused for subsequent invocations.
+        // It is initialized when the class is loaded.
+        ${serviceClientVariable}Client = DependencyFactory.${serviceClientVariable}Client();
+        // Consider invoking a simple api here to pre-warm up the application, eg: dynamodb#listTables
+    }
+
+    @Override
+    public Object handleRequest(final Object input, final Context context) {
+        // TODO: invoking the api call using ${serviceClientVariable}Client.
+        return input;
+    }
+}
diff --git a/archetypes/archetype-lambda/src/main/resources/archetype-resources/src/test/java/__handlerClassName__Test.java b/archetypes/archetype-lambda/src/main/resources/archetype-resources/src/test/java/__handlerClassName__Test.java
new file mode 100644
index 000000000000..beecf7a3c67a
--- /dev/null
+++ b/archetypes/archetype-lambda/src/main/resources/archetype-resources/src/test/java/__handlerClassName__Test.java
@@ -0,0 +1,18 @@
+#set( $symbol_pound = '#' )
+#set( $symbol_dollar = '$' )
+#set( $symbol_escape = '\' )
+package ${package};
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.api.Test;
+
+public class ${handlerClassName}Test {
+
+    @Test
+    public void handleRequest_shouldReturnConstantValue() {
+        ${handlerClassName} function = new ${handlerClassName}();
+        Object result = function.handleRequest("echo", null);
+        assertEquals("echo", result);
+    }
+}
diff --git a/archetypes/archetype-lambda/src/main/resources/archetype-resources/template.yaml b/archetypes/archetype-lambda/src/main/resources/archetype-resources/template.yaml
new file mode 100644
index 000000000000..5d6bb1592002
--- /dev/null
+++ b/archetypes/archetype-lambda/src/main/resources/archetype-resources/template.yaml
@@ -0,0 +1,19 @@
+AWSTemplateFormatVersion: '2010-09-09'
+Transform: AWS::Serverless-2016-10-31
+Resources:
+  # See https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-resource-function.html
+  # for more info to see how to tune the lambda function configs based on your use case.
+  ${handlerClassName}Function:
+    Type: AWS::Serverless::Function
+    Properties:
+      Runtime: java8
+      Handler: ${package}.${handlerClassName}::handleRequest
+      Timeout: 60
+      MemorySize: 512
+      CodeUri: ./target/${artifactId}.jar
+      # Attach policies here to give the function permission to access other AWS resources if needed
+      # See: https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst
+      # eg:
+      #Policies:
+      # - S3ReadPolicy:
+      #     BucketName: test-bucket
\ No newline at end of file
diff --git a/archetypes/archetype-lambda/src/main/resources/global.vm b/archetypes/archetype-lambda/src/main/resources/global.vm
new file mode 100644
index 000000000000..610b556958ff
--- /dev/null
+++ b/archetypes/archetype-lambda/src/main/resources/global.vm
@@ -0,0 +1,36 @@
+## global variables used by the project
+#parse ("serviceMapping.vm")
+#set( $symbol_pound = '#' )
+#set( $symbol_dollar = '$' )
+#set( $symbol_escape = '\' )
+## customize wafregional and dynamodbstreams because they reside in waf and dynamodb modules respectively.
+#if ($service == 'dynamodbstreams')
+    #set ($moduleName = 'dynamodb')
+    #set ($serviceClientPrefix = 'DynamoDbStreams')
+    #set ($servicePackage = 'dynamodb.streams')
+#elseif ($service == 'wafregional')
+    #set ($moduleName = 'waf')
+    #set ($serviceClientPrefix = 'WafRegional')
+    #set ($servicePackage = 'waf.regional')
+#else
+## map the serviceId to service package and service client class name
+    #set ( $servicePackage = $service)
+    #set ($moduleName = $service)
+    #set ( $serviceClientPrefix = $serviceMapping[$service])
+#end
+#set ( $serviceClientVariable = $serviceClientPrefix.substring(0,1).toLowerCase() + $serviceClientPrefix.substring(1))
+#set( $regionEnum = $region.replace("-", "_").toUpperCase() )
+## map the client module name to the client class name and pacakge name
+#if( $httpClient == 'url-connection-client')
+    #set ($httpClientClassName = 'UrlConnectionHttpClient')
+    #set ($httpClientPackageName = 'urlconnection.' + $httpClientClassName)
+    #set ($serviceClientClassName = $serviceClientPrefix + 'Client')
+#elseif ( $httpClient == 'apache-client')
+    #set ($httpClientClassName = 'ApacheHttpClient')
+    #set ($httpClientPackageName = 'apache.' + $httpClientClassName)
+    #set ($serviceClientClassName = $serviceClientPrefix + 'Client')
+#elseif ( $httpClient == 'netty-nio-client')
+    #set ($httpClientClassName = 'NettyNioAsyncHttpClient')
+    #set ($httpClientPackageName = 'nio.netty.' + $httpClientClassName)
+    #set ($serviceClientClassName = $serviceClientPrefix + 'AsyncClient')
+#end
diff --git a/archetypes/archetype-lambda/src/main/resources/map-service-to-client-prefix b/archetypes/archetype-lambda/src/main/resources/map-service-to-client-prefix
new file mode 100755
index 000000000000..8574844e7283
--- /dev/null
+++ b/archetypes/archetype-lambda/src/main/resources/map-service-to-client-prefix
@@ -0,0 +1,50 @@
+#!/usr/bin/env python
+
+import json
+import os
+import string
+
+MAPPING_FILE_NAME = 'serviceMapping.vm'
+RESOURCES_ROOT_DIR = os.path.join(os.path.dirname(os.path.abspath(__file__)))
+ARCHETYPE_LAMBDA_ROOT_DIR = os.path.dirname(os.path.dirname(os.path.abspath(os.path.join(RESOURCES_ROOT_DIR, "../"))))
+SERVICE_DIR = os.path.join(
+    os.path.dirname(os.path.dirname(os.path.abspath(os.path.join(__file__, "../../../../")))),
+    'services'
+)
+
+def load_all_service_modules():
+    service_mapping = {}
+    for f in [f for f in os.listdir(SERVICE_DIR) if os.path.isdir(os.path.join(SERVICE_DIR, f)) & os.path.exists(os.path.join(SERVICE_DIR, f, 'target'))]:
+        for s in [s for s in os.listdir(os.path.join(SERVICE_DIR, f, 'target', 'generated-sources/sdk/software/amazon/awssdk/services', f)) if s.endswith('AsyncClient.java') & s.startswith('Default')]:
+            service_mapping[f] = find_client_prefix(s)
+    return service_mapping
+
+def find_client_prefix(d):
+    index = d.find('AsyncClient.java')
+    return d[7:index]
+
+def write_to_vm_file(service_mapping):
+    target = os.path.join(ARCHETYPE_LAMBDA_ROOT_DIR, 'target')
+
+    if not os.path.exists(target):
+        os.mkdir(target)
+
+    target = os.path.join(ARCHETYPE_LAMBDA_ROOT_DIR, 'target', 'classes')
+
+    if not os.path.exists(target):
+        os.mkdir(target)
+
+    filename = os.path.join(target, MAPPING_FILE_NAME)
+
+    with open(filename, 'w') as f:
+        f.write('#set ( $serviceMapping =')
+        f.write(json.dumps(service_mapping))
+        f.write(')')
+    return filename
+
+def main():
+    service_mapping = load_all_service_modules()
+    write_to_vm_file(service_mapping)
+
+if __name__ == '__main__':
+    main()
diff --git a/archetypes/archetype-lambda/src/test/resources/projects/apachehttpclient/archetype.properties b/archetypes/archetype-lambda/src/test/resources/projects/apachehttpclient/archetype.properties
new file mode 100644
index 000000000000..682c1bdf1f84
--- /dev/null
+++ b/archetypes/archetype-lambda/src/test/resources/projects/apachehttpclient/archetype.properties
@@ -0,0 +1,10 @@
+groupId=software.amazonaws.test
+artifactId=test-apache-artifact
+version=1.0-SNAPSHOT
+package=software.amazonaws.test
+service=dynamodb
+httpClient=apache-client
+handlerClassName=MyApacheFunction
+region=ap-southeast-1
+javaSdkVersion=2.11.0
+nettyOpenSslVersion=2.0.29.Final
\ No newline at end of file
diff --git a/archetypes/archetype-lambda/src/test/resources/projects/apachehttpclient/goal.txt b/archetypes/archetype-lambda/src/test/resources/projects/apachehttpclient/goal.txt
new file mode 100644
index 000000000000..4a1a71d3364c
--- /dev/null
+++ b/archetypes/archetype-lambda/src/test/resources/projects/apachehttpclient/goal.txt
@@ -0,0 +1 @@
+verify
\ No newline at end of file
diff --git a/archetypes/archetype-lambda/src/test/resources/projects/apachehttpclient/reference/README.md b/archetypes/archetype-lambda/src/test/resources/projects/apachehttpclient/reference/README.md
new file mode 100644
index 000000000000..30bf8a316d7e
--- /dev/null
+++ b/archetypes/archetype-lambda/src/test/resources/projects/apachehttpclient/reference/README.md
@@ -0,0 +1,45 @@
+# MyApacheFunction
+
+This project contains an AWS Lambda maven application with [AWS Java SDK 2.x](https://github.com/aws/aws-sdk-java-v2) dependencies.
+
+## Prerequisites
+- Java 1.8+
+- Apache Maven
+- [AWS SAM CLI](https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/serverless-sam-cli-install.html)
+- Docker
+
+## Development
+
+The generated function handler class just returns the input. The configured AWS Java SDK client is created in `DependencyFactory` class and you can 
+add the code to interact with the SDK client based on your use case.
+
+#### Building the project
+```
+mvn clean install
+```
+
+#### Testing it locally
+```
+sam local invoke
+```
+
+#### Adding more SDK clients
+To add more service clients, you need to add the specific services modules in `pom.xml` and create the clients in `DependencyFactory` following the same 
+pattern as dynamoDbClient.
+
+## Deployment
+
+The generated project contains a default [SAM template](https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-resource-function.html) file `template.yaml` where you can 
+configure different properties of your lambda function such as memory size and timeout. You might also need to add specific policies to the lambda function
+so that it can access other AWS resources.
+
+To deploy the application, you can run the following command:
+
+```
+sam deploy --guided
+```
+
+See [Deploying Serverless Applications](https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/serverless-deploying.html) for more info.
+
+
+
diff --git a/archetypes/archetype-lambda/src/test/resources/projects/apachehttpclient/reference/pom.xml b/archetypes/archetype-lambda/src/test/resources/projects/apachehttpclient/reference/pom.xml
new file mode 100644
index 000000000000..2f1c10b9e1e4
--- /dev/null
+++ b/archetypes/archetype-lambda/src/test/resources/projects/apachehttpclient/reference/pom.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>software.amazonaws.test</groupId>
+    <artifactId>test-apache-artifact</artifactId>
+    <version>1.0-SNAPSHOT</version>
+    <packaging>jar</packaging>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.shade.plugin.version>3.1.1</maven.shade.plugin.version>
+        <maven.compiler.plugin.version>3.6.1</maven.compiler.plugin.version>
+        <exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
+        <aws.java.sdk.version>2.11.0</aws.java.sdk.version>
+        <aws.lambda.java.version>1.2.0</aws.lambda.java.version>
+        <junit5.version>5.4.2</junit5.version>
+    </properties>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>software.amazon.awssdk</groupId>
+                <artifactId>bom</artifactId>
+                <version>${aws.java.sdk.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <dependencies>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>dynamodb</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>software.amazon.awssdk</groupId>
+                    <artifactId>netty-nio-client</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>software.amazon.awssdk</groupId>
+                    <artifactId>apache-client</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>apache-client</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.amazonaws</groupId>
+            <artifactId>aws-lambda-java-core</artifactId>
+            <version>${aws.lambda.java.version}</version>
+        </dependency>
+
+        <!-- Test Dependencies -->
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>${junit5.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>${maven.compiler.plugin.version}</version>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>${maven.shade.plugin.version}</version>
+                <configuration>
+                    <createDependencyReducedPom>false</createDependencyReducedPom>
+                    <finalName>test-apache-artifact</finalName>
+                </configuration>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/archetypes/archetype-lambda/src/test/resources/projects/apachehttpclient/reference/src/main/java/software/amazonaws/test/DependencyFactory.java b/archetypes/archetype-lambda/src/test/resources/projects/apachehttpclient/reference/src/main/java/software/amazonaws/test/DependencyFactory.java
new file mode 100644
index 000000000000..f6ecbd48a31f
--- /dev/null
+++ b/archetypes/archetype-lambda/src/test/resources/projects/apachehttpclient/reference/src/main/java/software/amazonaws/test/DependencyFactory.java
@@ -0,0 +1,26 @@
+
+package software.amazonaws.test;
+
+import software.amazon.awssdk.auth.credentials.EnvironmentVariableCredentialsProvider;
+import software.amazon.awssdk.http.apache.ApacheHttpClient;
+import software.amazon.awssdk.regions.Region;
+import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
+
+/**
+ * The module containing all dependencies required by the {@link MyApacheFunction}.
+ */
+public class DependencyFactory {
+
+    private DependencyFactory() {}
+
+    /**
+     * @return an instance of DynamoDbClient
+     */
+    public static DynamoDbClient dynamoDbClient() {
+        return DynamoDbClient.builder()
+                       .credentialsProvider(EnvironmentVariableCredentialsProvider.create())
+                       .region(Region.AP_SOUTHEAST_1)
+                       .httpClientBuilder(ApacheHttpClient.builder())
+                       .build();
+    }
+}
diff --git a/archetypes/archetype-lambda/src/test/resources/projects/apachehttpclient/reference/src/main/java/software/amazonaws/test/MyApacheFunction.java b/archetypes/archetype-lambda/src/test/resources/projects/apachehttpclient/reference/src/main/java/software/amazonaws/test/MyApacheFunction.java
new file mode 100644
index 000000000000..8f9f860811c6
--- /dev/null
+++ b/archetypes/archetype-lambda/src/test/resources/projects/apachehttpclient/reference/src/main/java/software/amazonaws/test/MyApacheFunction.java
@@ -0,0 +1,28 @@
+package software.amazonaws.test;
+
+import com.amazonaws.services.lambda.runtime.Context;
+import com.amazonaws.services.lambda.runtime.RequestHandler;
+import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
+
+/**
+ * Lambda function entry point. You can change to use other pojo type or implement
+ * a different RequestHandler.
+ *
+ * @see <a href=https://docs.aws.amazon.com/lambda/latest/dg/java-handler.html>Lambda Java Handler</a> for more information
+ */
+public class MyApacheFunction implements RequestHandler<Object, Object> {
+    private final DynamoDbClient dynamoDbClient;
+
+    public MyApacheFunction() {
+        // Initialize the SDK client outside of the handler method so that it can be reused for subsequent invocations.
+        // It is initialized when the class is loaded.
+        dynamoDbClient = DependencyFactory.dynamoDbClient();
+        // Consider invoking a simple api here to pre-warm up the application, eg: dynamodb#listTables
+    }
+
+    @Override
+    public Object handleRequest(final Object input, final Context context) {
+        // TODO: invoking the api call using dynamoDbClient.
+        return input;
+    }
+}
diff --git a/archetypes/archetype-lambda/src/test/resources/projects/apachehttpclient/reference/src/test/java/software/amazonaws/test/MyApacheFunctionTest.java b/archetypes/archetype-lambda/src/test/resources/projects/apachehttpclient/reference/src/test/java/software/amazonaws/test/MyApacheFunctionTest.java
new file mode 100644
index 000000000000..b55287348392
--- /dev/null
+++ b/archetypes/archetype-lambda/src/test/resources/projects/apachehttpclient/reference/src/test/java/software/amazonaws/test/MyApacheFunctionTest.java
@@ -0,0 +1,15 @@
+package software.amazonaws.test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.api.Test;
+
+public class MyApacheFunctionTest {
+
+    @Test
+    public void handleRequest_shouldReturnConstantValue() {
+        MyApacheFunction function = new MyApacheFunction();
+        Object result = function.handleRequest("echo", null);
+        assertEquals("echo", result);
+    }
+}
diff --git a/archetypes/archetype-lambda/src/test/resources/projects/apachehttpclient/reference/template.yaml b/archetypes/archetype-lambda/src/test/resources/projects/apachehttpclient/reference/template.yaml
new file mode 100644
index 000000000000..513c0aed185b
--- /dev/null
+++ b/archetypes/archetype-lambda/src/test/resources/projects/apachehttpclient/reference/template.yaml
@@ -0,0 +1,19 @@
+AWSTemplateFormatVersion: '2010-09-09'
+Transform: AWS::Serverless-2016-10-31
+Resources:
+  # See https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-resource-function.html
+  # for more info to see how to tune the lambda function configs based on your use case.
+  MyApacheFunctionFunction:
+    Type: AWS::Serverless::Function
+    Properties:
+      Runtime: java8
+      Handler: software.amazonaws.test.MyApacheFunction::handleRequest
+      Timeout: 60
+      MemorySize: 512
+      CodeUri: ./target/test-apache-artifact.jar
+      # Attach policies here to give the function permission to access other AWS resources if needed
+      # See: https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst
+      # eg:
+      #Policies:
+      # - S3ReadPolicy:
+      #     BucketName: test-bucket
\ No newline at end of file
diff --git a/archetypes/archetype-lambda/src/test/resources/projects/dynamodbstreamsclient/archetype.properties b/archetypes/archetype-lambda/src/test/resources/projects/dynamodbstreamsclient/archetype.properties
new file mode 100644
index 000000000000..148e110f2ee0
--- /dev/null
+++ b/archetypes/archetype-lambda/src/test/resources/projects/dynamodbstreamsclient/archetype.properties
@@ -0,0 +1,25 @@
+#
+# 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.
+#
+
+groupId=software.amazonaws.test
+artifactId=test-dynamodbstreams-artifact
+version=1.0-SNAPSHOT
+package=software.amazonaws.test
+service=dynamodbstreams
+httpClient=apache-client
+handlerClassName=MyDynamoDbStreamsFunction
+region=ap-southeast-1
+javaSdkVersion=2.11.0
+nettyOpenSslVersion=2.0.29.Final
\ No newline at end of file
diff --git a/archetypes/archetype-lambda/src/test/resources/projects/dynamodbstreamsclient/goal.txt b/archetypes/archetype-lambda/src/test/resources/projects/dynamodbstreamsclient/goal.txt
new file mode 100644
index 000000000000..4a1a71d3364c
--- /dev/null
+++ b/archetypes/archetype-lambda/src/test/resources/projects/dynamodbstreamsclient/goal.txt
@@ -0,0 +1 @@
+verify
\ No newline at end of file
diff --git a/archetypes/archetype-lambda/src/test/resources/projects/dynamodbstreamsclient/reference/README.md b/archetypes/archetype-lambda/src/test/resources/projects/dynamodbstreamsclient/reference/README.md
new file mode 100644
index 000000000000..2fc00d2e4ac0
--- /dev/null
+++ b/archetypes/archetype-lambda/src/test/resources/projects/dynamodbstreamsclient/reference/README.md
@@ -0,0 +1,45 @@
+# MyDynamoDbStreamsFunction
+
+This project contains an AWS Lambda maven application with [AWS Java SDK 2.x](https://github.com/aws/aws-sdk-java-v2) dependencies.
+
+## Prerequisites
+- Java 1.8+
+- Apache Maven
+- [AWS SAM CLI](https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/serverless-sam-cli-install.html)
+- Docker
+
+## Development
+
+The generated function handler class just returns the input. The configured AWS Java SDK client is created in `DependencyFactory` class and you can 
+add the code to interact with the SDK client based on your use case.
+
+#### Building the project
+```
+mvn clean install
+```
+
+#### Testing it locally
+```
+sam local invoke
+```
+
+#### Adding more SDK clients
+To add more service clients, you need to add the specific services modules in `pom.xml` and create the clients in `DependencyFactory` following the same 
+pattern as dynamoDbStreamsClient.
+
+## Deployment
+
+The generated project contains a default [SAM template](https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-resource-function.html) file `template.yaml` where you can 
+configure different properties of your lambda function such as memory size and timeout. You might also need to add specific policies to the lambda function
+so that it can access other AWS resources.
+
+To deploy the application, you can run the following command:
+
+```
+sam deploy --guided
+```
+
+See [Deploying Serverless Applications](https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/serverless-deploying.html) for more info.
+
+
+
diff --git a/archetypes/archetype-lambda/src/test/resources/projects/dynamodbstreamsclient/reference/pom.xml b/archetypes/archetype-lambda/src/test/resources/projects/dynamodbstreamsclient/reference/pom.xml
new file mode 100644
index 000000000000..fa7e7cce3210
--- /dev/null
+++ b/archetypes/archetype-lambda/src/test/resources/projects/dynamodbstreamsclient/reference/pom.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>software.amazonaws.test</groupId>
+    <artifactId>test-dynamodbstreams-artifact</artifactId>
+    <version>1.0-SNAPSHOT</version>
+    <packaging>jar</packaging>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.shade.plugin.version>3.1.1</maven.shade.plugin.version>
+        <maven.compiler.plugin.version>3.6.1</maven.compiler.plugin.version>
+        <exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
+        <aws.java.sdk.version>2.11.0</aws.java.sdk.version>
+        <aws.lambda.java.version>1.2.0</aws.lambda.java.version>
+        <junit5.version>5.4.2</junit5.version>
+    </properties>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>software.amazon.awssdk</groupId>
+                <artifactId>bom</artifactId>
+                <version>${aws.java.sdk.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <dependencies>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>dynamodb</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>software.amazon.awssdk</groupId>
+                    <artifactId>netty-nio-client</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>software.amazon.awssdk</groupId>
+                    <artifactId>apache-client</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>apache-client</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.amazonaws</groupId>
+            <artifactId>aws-lambda-java-core</artifactId>
+            <version>${aws.lambda.java.version}</version>
+        </dependency>
+
+        <!-- Test Dependencies -->
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>${junit5.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>${maven.compiler.plugin.version}</version>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>${maven.shade.plugin.version}</version>
+                <configuration>
+                    <createDependencyReducedPom>false</createDependencyReducedPom>
+                    <finalName>test-dynamodbstreams-artifact</finalName>
+                </configuration>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/archetypes/archetype-lambda/src/test/resources/projects/dynamodbstreamsclient/reference/src/main/java/software/amazonaws/test/DependencyFactory.java b/archetypes/archetype-lambda/src/test/resources/projects/dynamodbstreamsclient/reference/src/main/java/software/amazonaws/test/DependencyFactory.java
new file mode 100644
index 000000000000..b8bdd17acc85
--- /dev/null
+++ b/archetypes/archetype-lambda/src/test/resources/projects/dynamodbstreamsclient/reference/src/main/java/software/amazonaws/test/DependencyFactory.java
@@ -0,0 +1,26 @@
+
+package software.amazonaws.test;
+
+import software.amazon.awssdk.auth.credentials.EnvironmentVariableCredentialsProvider;
+import software.amazon.awssdk.http.apache.ApacheHttpClient;
+import software.amazon.awssdk.regions.Region;
+import software.amazon.awssdk.services.dynamodb.streams.DynamoDbStreamsClient;
+
+/**
+ * The module containing all dependencies required by the {@link MyDynamoDbStreamsFunction}.
+ */
+public class DependencyFactory {
+
+    private DependencyFactory() {}
+
+    /**
+     * @return an instance of DynamoDbStreamsClient
+     */
+    public static DynamoDbStreamsClient dynamoDbStreamsClient() {
+        return DynamoDbStreamsClient.builder()
+                       .credentialsProvider(EnvironmentVariableCredentialsProvider.create())
+                       .region(Region.AP_SOUTHEAST_1)
+                       .httpClientBuilder(ApacheHttpClient.builder())
+                       .build();
+    }
+}
diff --git a/archetypes/archetype-lambda/src/test/resources/projects/dynamodbstreamsclient/reference/src/main/java/software/amazonaws/test/MyDynamoDbStreamsFunction.java b/archetypes/archetype-lambda/src/test/resources/projects/dynamodbstreamsclient/reference/src/main/java/software/amazonaws/test/MyDynamoDbStreamsFunction.java
new file mode 100644
index 000000000000..2722fbfdba68
--- /dev/null
+++ b/archetypes/archetype-lambda/src/test/resources/projects/dynamodbstreamsclient/reference/src/main/java/software/amazonaws/test/MyDynamoDbStreamsFunction.java
@@ -0,0 +1,28 @@
+package software.amazonaws.test;
+
+import com.amazonaws.services.lambda.runtime.Context;
+import com.amazonaws.services.lambda.runtime.RequestHandler;
+import software.amazon.awssdk.services.dynamodb.streams.DynamoDbStreamsClient;
+
+/**
+ * Lambda function entry point. You can change to use other pojo type or implement
+ * a different RequestHandler.
+ *
+ * @see <a href=https://docs.aws.amazon.com/lambda/latest/dg/java-handler.html>Lambda Java Handler</a> for more information
+ */
+public class MyDynamoDbStreamsFunction implements RequestHandler<Object, Object> {
+    private final DynamoDbStreamsClient dynamoDbStreamsClient;
+
+    public MyDynamoDbStreamsFunction() {
+        // Initialize the SDK client outside of the handler method so that it can be reused for subsequent invocations.
+        // It is initialized when the class is loaded.
+        dynamoDbStreamsClient = DependencyFactory.dynamoDbStreamsClient();
+        // Consider invoking a simple api here to pre-warm up the application, eg: dynamodb#listTables
+    }
+
+    @Override
+    public Object handleRequest(final Object input, final Context context) {
+        // TODO: invoking the api call using dynamoDbStreamsClient.
+        return input;
+    }
+}
diff --git a/archetypes/archetype-lambda/src/test/resources/projects/dynamodbstreamsclient/reference/src/test/java/software/amazonaws/test/MyDynamoDbStreamsFunctionTest.java b/archetypes/archetype-lambda/src/test/resources/projects/dynamodbstreamsclient/reference/src/test/java/software/amazonaws/test/MyDynamoDbStreamsFunctionTest.java
new file mode 100644
index 000000000000..7553684cf11a
--- /dev/null
+++ b/archetypes/archetype-lambda/src/test/resources/projects/dynamodbstreamsclient/reference/src/test/java/software/amazonaws/test/MyDynamoDbStreamsFunctionTest.java
@@ -0,0 +1,15 @@
+package software.amazonaws.test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.api.Test;
+
+public class MyDynamoDbStreamsFunctionTest {
+
+    @Test
+    public void handleRequest_shouldReturnConstantValue() {
+        MyDynamoDbStreamsFunction function = new MyDynamoDbStreamsFunction();
+        Object result = function.handleRequest("echo", null);
+        assertEquals("echo", result);
+    }
+}
diff --git a/archetypes/archetype-lambda/src/test/resources/projects/dynamodbstreamsclient/reference/template.yaml b/archetypes/archetype-lambda/src/test/resources/projects/dynamodbstreamsclient/reference/template.yaml
new file mode 100644
index 000000000000..797f24dc0751
--- /dev/null
+++ b/archetypes/archetype-lambda/src/test/resources/projects/dynamodbstreamsclient/reference/template.yaml
@@ -0,0 +1,19 @@
+AWSTemplateFormatVersion: '2010-09-09'
+Transform: AWS::Serverless-2016-10-31
+Resources:
+  # See https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-resource-function.html
+  # for more info to see how to tune the lambda function configs based on your use case.
+  MyDynamoDbStreamsFunctionFunction:
+    Type: AWS::Serverless::Function
+    Properties:
+      Runtime: java8
+      Handler: software.amazonaws.test.MyDynamoDbStreamsFunction::handleRequest
+      Timeout: 60
+      MemorySize: 512
+      CodeUri: ./target/test-dynamodbstreams-artifact.jar
+      # Attach policies here to give the function permission to access other AWS resources if needed
+      # See: https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst
+      # eg:
+      #Policies:
+      # - S3ReadPolicy:
+      #     BucketName: test-bucket
\ No newline at end of file
diff --git a/archetypes/archetype-lambda/src/test/resources/projects/nettyclient/archetype.properties b/archetypes/archetype-lambda/src/test/resources/projects/nettyclient/archetype.properties
new file mode 100644
index 000000000000..b5ef44cbd770
--- /dev/null
+++ b/archetypes/archetype-lambda/src/test/resources/projects/nettyclient/archetype.properties
@@ -0,0 +1,11 @@
+groupId=software.amazonaws.test
+artifactId=test-netty-artifact
+version=1.0-SNAPSHOT
+package=software.amazonaws.test
+service=kinesis
+httpClient=netty-nio-client
+handlerClassName=MyNettyFunction
+region=us-east-1
+javaSdkVersion=2.11.0
+nettyOpenSslVersion=2.0.29.Final
+
diff --git a/archetypes/archetype-lambda/src/test/resources/projects/nettyclient/goal.txt b/archetypes/archetype-lambda/src/test/resources/projects/nettyclient/goal.txt
new file mode 100644
index 000000000000..4a1a71d3364c
--- /dev/null
+++ b/archetypes/archetype-lambda/src/test/resources/projects/nettyclient/goal.txt
@@ -0,0 +1 @@
+verify
\ No newline at end of file
diff --git a/archetypes/archetype-lambda/src/test/resources/projects/nettyclient/reference/README.md b/archetypes/archetype-lambda/src/test/resources/projects/nettyclient/reference/README.md
new file mode 100644
index 000000000000..e265f49bbdc4
--- /dev/null
+++ b/archetypes/archetype-lambda/src/test/resources/projects/nettyclient/reference/README.md
@@ -0,0 +1,45 @@
+# MyNettyFunction
+
+This project contains an AWS Lambda maven application with [AWS Java SDK 2.x](https://github.com/aws/aws-sdk-java-v2) dependencies.
+
+## Prerequisites
+- Java 1.8+
+- Apache Maven
+- [AWS SAM CLI](https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/serverless-sam-cli-install.html)
+- Docker
+
+## Development
+
+The generated function handler class just returns the input. The configured AWS Java SDK client is created in `DependencyFactory` class and you can 
+add the code to interact with the SDK client based on your use case.
+
+#### Building the project
+```
+mvn clean install
+```
+
+#### Testing it locally
+```
+sam local invoke
+```
+
+#### Adding more SDK clients
+To add more service clients, you need to add the specific services modules in `pom.xml` and create the clients in `DependencyFactory` following the same 
+pattern as kinesisClient.
+
+## Deployment
+
+The generated project contains a default [SAM template](https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-resource-function.html) file `template.yaml` where you can 
+configure different properties of your lambda function such as memory size and timeout. You might also need to add specific policies to the lambda function
+so that it can access other AWS resources.
+
+To deploy the application, you can run the following command:
+
+```
+sam deploy --guided
+```
+
+See [Deploying Serverless Applications](https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/serverless-deploying.html) for more info.
+
+
+
diff --git a/archetypes/archetype-lambda/src/test/resources/projects/nettyclient/reference/pom.xml b/archetypes/archetype-lambda/src/test/resources/projects/nettyclient/reference/pom.xml
new file mode 100644
index 000000000000..003cb97c99c7
--- /dev/null
+++ b/archetypes/archetype-lambda/src/test/resources/projects/nettyclient/reference/pom.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>software.amazonaws.test</groupId>
+    <artifactId>test-netty-artifact</artifactId>
+    <version>1.0-SNAPSHOT</version>
+    <packaging>jar</packaging>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.shade.plugin.version>3.1.1</maven.shade.plugin.version>
+        <maven.compiler.plugin.version>3.6.1</maven.compiler.plugin.version>
+        <exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
+        <aws.java.sdk.version>2.11.0</aws.java.sdk.version>
+        <aws.lambda.java.version>1.2.0</aws.lambda.java.version>
+        <junit5.version>5.4.2</junit5.version>
+        <netty.openssl.version>2.0.29.Final</netty.openssl.version>
+    </properties>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>software.amazon.awssdk</groupId>
+                <artifactId>bom</artifactId>
+                <version>${aws.java.sdk.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <dependencies>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>kinesis</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>software.amazon.awssdk</groupId>
+                    <artifactId>netty-nio-client</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>software.amazon.awssdk</groupId>
+                    <artifactId>apache-client</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>netty-nio-client</artifactId>
+        </dependency>
+
+        <!-- Adding netty-tcnative dependency so that netty async client uses openSSL as sslProvider if supported
+        See https://github.com/aws/aws-sdk-java-v2/blob/master/docs/BestPractices.md#use-openssl-for-netty-async-client -->
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-tcnative-boringssl-static</artifactId>
+            <version>${netty.openssl.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.amazonaws</groupId>
+            <artifactId>aws-lambda-java-core</artifactId>
+            <version>${aws.lambda.java.version}</version>
+        </dependency>
+
+        <!-- Test Dependencies -->
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>${junit5.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>${maven.compiler.plugin.version}</version>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>${maven.shade.plugin.version}</version>
+                <configuration>
+                    <createDependencyReducedPom>false</createDependencyReducedPom>
+                    <finalName>test-netty-artifact</finalName>
+                </configuration>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/archetypes/archetype-lambda/src/test/resources/projects/nettyclient/reference/src/main/java/software/amazonaws/test/DependencyFactory.java b/archetypes/archetype-lambda/src/test/resources/projects/nettyclient/reference/src/main/java/software/amazonaws/test/DependencyFactory.java
new file mode 100644
index 000000000000..ab3f3792bb7e
--- /dev/null
+++ b/archetypes/archetype-lambda/src/test/resources/projects/nettyclient/reference/src/main/java/software/amazonaws/test/DependencyFactory.java
@@ -0,0 +1,26 @@
+
+package software.amazonaws.test;
+
+import software.amazon.awssdk.auth.credentials.EnvironmentVariableCredentialsProvider;
+import software.amazon.awssdk.http.nio.netty.NettyNioAsyncHttpClient;
+import software.amazon.awssdk.regions.Region;
+import software.amazon.awssdk.services.kinesis.KinesisAsyncClient;
+
+/**
+ * The module containing all dependencies required by the {@link MyNettyFunction}.
+ */
+public class DependencyFactory {
+
+    private DependencyFactory() {}
+
+    /**
+     * @return an instance of KinesisAsyncClient
+     */
+    public static KinesisAsyncClient kinesisClient() {
+        return KinesisAsyncClient.builder()
+                       .credentialsProvider(EnvironmentVariableCredentialsProvider.create())
+                       .region(Region.US_EAST_1)
+                       .httpClientBuilder(NettyNioAsyncHttpClient.builder())
+                       .build();
+    }
+}
diff --git a/archetypes/archetype-lambda/src/test/resources/projects/nettyclient/reference/src/main/java/software/amazonaws/test/MyNettyFunction.java b/archetypes/archetype-lambda/src/test/resources/projects/nettyclient/reference/src/main/java/software/amazonaws/test/MyNettyFunction.java
new file mode 100644
index 000000000000..0016c30c56e0
--- /dev/null
+++ b/archetypes/archetype-lambda/src/test/resources/projects/nettyclient/reference/src/main/java/software/amazonaws/test/MyNettyFunction.java
@@ -0,0 +1,28 @@
+package software.amazonaws.test;
+
+import com.amazonaws.services.lambda.runtime.Context;
+import com.amazonaws.services.lambda.runtime.RequestHandler;
+import software.amazon.awssdk.services.kinesis.KinesisAsyncClient;
+
+/**
+ * Lambda function entry point. You can change to use other pojo type or implement
+ * a different RequestHandler.
+ *
+ * @see <a href=https://docs.aws.amazon.com/lambda/latest/dg/java-handler.html>Lambda Java Handler</a> for more information
+ */
+public class MyNettyFunction implements RequestHandler<Object, Object> {
+    private final KinesisAsyncClient kinesisClient;
+
+    public MyNettyFunction() {
+        // Initialize the SDK client outside of the handler method so that it can be reused for subsequent invocations.
+        // It is initialized when the class is loaded.
+        kinesisClient = DependencyFactory.kinesisClient();
+        // Consider invoking a simple api here to pre-warm up the application, eg: dynamodb#listTables
+    }
+
+    @Override
+    public Object handleRequest(final Object input, final Context context) {
+        // TODO: invoking the api call using kinesisClient.
+        return input;
+    }
+}
diff --git a/archetypes/archetype-lambda/src/test/resources/projects/nettyclient/reference/src/test/java/software/amazonaws/test/MyNettyFunctionTest.java b/archetypes/archetype-lambda/src/test/resources/projects/nettyclient/reference/src/test/java/software/amazonaws/test/MyNettyFunctionTest.java
new file mode 100644
index 000000000000..46e9272647aa
--- /dev/null
+++ b/archetypes/archetype-lambda/src/test/resources/projects/nettyclient/reference/src/test/java/software/amazonaws/test/MyNettyFunctionTest.java
@@ -0,0 +1,15 @@
+package software.amazonaws.test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.api.Test;
+
+public class MyNettyFunctionTest {
+
+    @Test
+    public void handleRequest_shouldReturnConstantValue() {
+        MyNettyFunction function = new MyNettyFunction();
+        Object result = function.handleRequest("echo", null);
+        assertEquals("echo", result);
+    }
+}
diff --git a/archetypes/archetype-lambda/src/test/resources/projects/nettyclient/reference/template.yaml b/archetypes/archetype-lambda/src/test/resources/projects/nettyclient/reference/template.yaml
new file mode 100644
index 000000000000..e674e2599da3
--- /dev/null
+++ b/archetypes/archetype-lambda/src/test/resources/projects/nettyclient/reference/template.yaml
@@ -0,0 +1,19 @@
+AWSTemplateFormatVersion: '2010-09-09'
+Transform: AWS::Serverless-2016-10-31
+Resources:
+  # See https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-resource-function.html
+  # for more info to see how to tune the lambda function configs based on your use case.
+  MyNettyFunctionFunction:
+    Type: AWS::Serverless::Function
+    Properties:
+      Runtime: java8
+      Handler: software.amazonaws.test.MyNettyFunction::handleRequest
+      Timeout: 60
+      MemorySize: 512
+      CodeUri: ./target/test-netty-artifact.jar
+      # Attach policies here to give the function permission to access other AWS resources if needed
+      # See: https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst
+      # eg:
+      #Policies:
+      # - S3ReadPolicy:
+      #     BucketName: test-bucket
\ No newline at end of file
diff --git a/archetypes/archetype-lambda/src/test/resources/projects/urlhttpclient/archetype.properties b/archetypes/archetype-lambda/src/test/resources/projects/urlhttpclient/archetype.properties
new file mode 100644
index 000000000000..4b987f49a274
--- /dev/null
+++ b/archetypes/archetype-lambda/src/test/resources/projects/urlhttpclient/archetype.properties
@@ -0,0 +1,10 @@
+groupId=software.amazonaws.test
+artifactId=test-url-connection-client-artifact
+version=1.0-SNAPSHOT
+package=software.amazonaws.test
+service=s3
+httpClient=url-connection-client
+handlerClassName=App
+region=us-west-2
+javaSdkVersion=2.11.0
+nettyOpenSslVersion=2.0.29.Final
\ No newline at end of file
diff --git a/archetypes/archetype-lambda/src/test/resources/projects/urlhttpclient/goal.txt b/archetypes/archetype-lambda/src/test/resources/projects/urlhttpclient/goal.txt
new file mode 100644
index 000000000000..4a1a71d3364c
--- /dev/null
+++ b/archetypes/archetype-lambda/src/test/resources/projects/urlhttpclient/goal.txt
@@ -0,0 +1 @@
+verify
\ No newline at end of file
diff --git a/archetypes/archetype-lambda/src/test/resources/projects/urlhttpclient/reference/README.md b/archetypes/archetype-lambda/src/test/resources/projects/urlhttpclient/reference/README.md
new file mode 100644
index 000000000000..6b17a7840213
--- /dev/null
+++ b/archetypes/archetype-lambda/src/test/resources/projects/urlhttpclient/reference/README.md
@@ -0,0 +1,45 @@
+# App
+
+This project contains an AWS Lambda maven application with [AWS Java SDK 2.x](https://github.com/aws/aws-sdk-java-v2) dependencies.
+
+## Prerequisites
+- Java 1.8+
+- Apache Maven
+- [AWS SAM CLI](https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/serverless-sam-cli-install.html)
+- Docker
+
+## Development
+
+The generated function handler class just returns the input. The configured AWS Java SDK client is created in `DependencyFactory` class and you can 
+add the code to interact with the SDK client based on your use case.
+
+#### Building the project
+```
+mvn clean install
+```
+
+#### Testing it locally
+```
+sam local invoke
+```
+
+#### Adding more SDK clients
+To add more service clients, you need to add the specific services modules in `pom.xml` and create the clients in `DependencyFactory` following the same 
+pattern as s3Client.
+
+## Deployment
+
+The generated project contains a default [SAM template](https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-resource-function.html) file `template.yaml` where you can 
+configure different properties of your lambda function such as memory size and timeout. You might also need to add specific policies to the lambda function
+so that it can access other AWS resources.
+
+To deploy the application, you can run the following command:
+
+```
+sam deploy --guided
+```
+
+See [Deploying Serverless Applications](https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/serverless-deploying.html) for more info.
+
+
+
diff --git a/archetypes/archetype-lambda/src/test/resources/projects/urlhttpclient/reference/pom.xml b/archetypes/archetype-lambda/src/test/resources/projects/urlhttpclient/reference/pom.xml
new file mode 100644
index 000000000000..addcc8788bcb
--- /dev/null
+++ b/archetypes/archetype-lambda/src/test/resources/projects/urlhttpclient/reference/pom.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>software.amazonaws.test</groupId>
+    <artifactId>test-url-connection-client-artifact</artifactId>
+    <version>1.0-SNAPSHOT</version>
+    <packaging>jar</packaging>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.shade.plugin.version>3.1.1</maven.shade.plugin.version>
+        <maven.compiler.plugin.version>3.6.1</maven.compiler.plugin.version>
+        <exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
+        <aws.java.sdk.version>2.11.0</aws.java.sdk.version>
+        <aws.lambda.java.version>1.2.0</aws.lambda.java.version>
+        <junit5.version>5.4.2</junit5.version>
+    </properties>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>software.amazon.awssdk</groupId>
+                <artifactId>bom</artifactId>
+                <version>${aws.java.sdk.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <dependencies>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>s3</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>software.amazon.awssdk</groupId>
+                    <artifactId>netty-nio-client</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>software.amazon.awssdk</groupId>
+                    <artifactId>apache-client</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>url-connection-client</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.amazonaws</groupId>
+            <artifactId>aws-lambda-java-core</artifactId>
+            <version>${aws.lambda.java.version}</version>
+        </dependency>
+
+        <!-- Test Dependencies -->
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>${junit5.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>${maven.compiler.plugin.version}</version>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>${maven.shade.plugin.version}</version>
+                <configuration>
+                    <createDependencyReducedPom>false</createDependencyReducedPom>
+                    <finalName>test-url-connection-client-artifact</finalName>
+                </configuration>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/archetypes/archetype-lambda/src/test/resources/projects/urlhttpclient/reference/src/main/java/software/amazonaws/test/App.java b/archetypes/archetype-lambda/src/test/resources/projects/urlhttpclient/reference/src/main/java/software/amazonaws/test/App.java
new file mode 100644
index 000000000000..3d3588fee28a
--- /dev/null
+++ b/archetypes/archetype-lambda/src/test/resources/projects/urlhttpclient/reference/src/main/java/software/amazonaws/test/App.java
@@ -0,0 +1,28 @@
+package software.amazonaws.test;
+
+import com.amazonaws.services.lambda.runtime.Context;
+import com.amazonaws.services.lambda.runtime.RequestHandler;
+import software.amazon.awssdk.services.s3.S3Client;
+
+/**
+ * Lambda function entry point. You can change to use other pojo type or implement
+ * a different RequestHandler.
+ *
+ * @see <a href=https://docs.aws.amazon.com/lambda/latest/dg/java-handler.html>Lambda Java Handler</a> for more information
+ */
+public class App implements RequestHandler<Object, Object> {
+    private final S3Client s3Client;
+
+    public App() {
+        // Initialize the SDK client outside of the handler method so that it can be reused for subsequent invocations.
+        // It is initialized when the class is loaded.
+        s3Client = DependencyFactory.s3Client();
+        // Consider invoking a simple api here to pre-warm up the application, eg: dynamodb#listTables
+    }
+
+    @Override
+    public Object handleRequest(final Object input, final Context context) {
+        // TODO: invoking the api call using s3Client.
+        return input;
+    }
+}
diff --git a/archetypes/archetype-lambda/src/test/resources/projects/urlhttpclient/reference/src/main/java/software/amazonaws/test/DependencyFactory.java b/archetypes/archetype-lambda/src/test/resources/projects/urlhttpclient/reference/src/main/java/software/amazonaws/test/DependencyFactory.java
new file mode 100644
index 000000000000..926269195a94
--- /dev/null
+++ b/archetypes/archetype-lambda/src/test/resources/projects/urlhttpclient/reference/src/main/java/software/amazonaws/test/DependencyFactory.java
@@ -0,0 +1,26 @@
+
+package software.amazonaws.test;
+
+import software.amazon.awssdk.auth.credentials.EnvironmentVariableCredentialsProvider;
+import software.amazon.awssdk.http.urlconnection.UrlConnectionHttpClient;
+import software.amazon.awssdk.regions.Region;
+import software.amazon.awssdk.services.s3.S3Client;
+
+/**
+ * The module containing all dependencies required by the {@link App}.
+ */
+public class DependencyFactory {
+
+    private DependencyFactory() {}
+
+    /**
+     * @return an instance of S3Client
+     */
+    public static S3Client s3Client() {
+        return S3Client.builder()
+                       .credentialsProvider(EnvironmentVariableCredentialsProvider.create())
+                       .region(Region.US_WEST_2)
+                       .httpClientBuilder(UrlConnectionHttpClient.builder())
+                       .build();
+    }
+}
diff --git a/archetypes/archetype-lambda/src/test/resources/projects/urlhttpclient/reference/src/test/java/software/amazonaws/test/AppTest.java b/archetypes/archetype-lambda/src/test/resources/projects/urlhttpclient/reference/src/test/java/software/amazonaws/test/AppTest.java
new file mode 100644
index 000000000000..8400b37496b7
--- /dev/null
+++ b/archetypes/archetype-lambda/src/test/resources/projects/urlhttpclient/reference/src/test/java/software/amazonaws/test/AppTest.java
@@ -0,0 +1,15 @@
+package software.amazonaws.test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.api.Test;
+
+public class AppTest {
+
+    @Test
+    public void handleRequest_shouldReturnConstantValue() {
+        App function = new App();
+        Object result = function.handleRequest("echo", null);
+        assertEquals("echo", result);
+    }
+}
diff --git a/archetypes/archetype-lambda/src/test/resources/projects/urlhttpclient/reference/template.yaml b/archetypes/archetype-lambda/src/test/resources/projects/urlhttpclient/reference/template.yaml
new file mode 100644
index 000000000000..ca0bb619fd4e
--- /dev/null
+++ b/archetypes/archetype-lambda/src/test/resources/projects/urlhttpclient/reference/template.yaml
@@ -0,0 +1,19 @@
+AWSTemplateFormatVersion: '2010-09-09'
+Transform: AWS::Serverless-2016-10-31
+Resources:
+  # See https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-resource-function.html
+  # for more info to see how to tune the lambda function configs based on your use case.
+  AppFunction:
+    Type: AWS::Serverless::Function
+    Properties:
+      Runtime: java8
+      Handler: software.amazonaws.test.App::handleRequest
+      Timeout: 60
+      MemorySize: 512
+      CodeUri: ./target/test-url-connection-client-artifact.jar
+      # Attach policies here to give the function permission to access other AWS resources if needed
+      # See: https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst
+      # eg:
+      #Policies:
+      # - S3ReadPolicy:
+      #     BucketName: test-bucket
\ No newline at end of file
diff --git a/archetypes/archetype-lambda/src/test/resources/projects/wafregionalclient/archetype.properties b/archetypes/archetype-lambda/src/test/resources/projects/wafregionalclient/archetype.properties
new file mode 100644
index 000000000000..de95a87a7f91
--- /dev/null
+++ b/archetypes/archetype-lambda/src/test/resources/projects/wafregionalclient/archetype.properties
@@ -0,0 +1,25 @@
+#
+# 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.
+#
+
+groupId=software.amazonaws.test
+artifactId=test-wafregional-artifact
+version=1.0-SNAPSHOT
+package=software.amazonaws.test
+service=wafregional
+httpClient=apache-client
+handlerClassName=MyWafRegionalFunction
+region=ap-southeast-1
+javaSdkVersion=2.11.0
+nettyOpenSslVersion=2.0.29.Final
\ No newline at end of file
diff --git a/archetypes/archetype-lambda/src/test/resources/projects/wafregionalclient/goal.txt b/archetypes/archetype-lambda/src/test/resources/projects/wafregionalclient/goal.txt
new file mode 100644
index 000000000000..4a1a71d3364c
--- /dev/null
+++ b/archetypes/archetype-lambda/src/test/resources/projects/wafregionalclient/goal.txt
@@ -0,0 +1 @@
+verify
\ No newline at end of file
diff --git a/archetypes/archetype-lambda/src/test/resources/projects/wafregionalclient/reference/README.md b/archetypes/archetype-lambda/src/test/resources/projects/wafregionalclient/reference/README.md
new file mode 100644
index 000000000000..cdff80c819bd
--- /dev/null
+++ b/archetypes/archetype-lambda/src/test/resources/projects/wafregionalclient/reference/README.md
@@ -0,0 +1,45 @@
+# MyWafRegionalFunction
+
+This project contains an AWS Lambda maven application with [AWS Java SDK 2.x](https://github.com/aws/aws-sdk-java-v2) dependencies.
+
+## Prerequisites
+- Java 1.8+
+- Apache Maven
+- [AWS SAM CLI](https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/serverless-sam-cli-install.html)
+- Docker
+
+## Development
+
+The generated function handler class just returns the input. The configured AWS Java SDK client is created in `DependencyFactory` class and you can 
+add the code to interact with the SDK client based on your use case.
+
+#### Building the project
+```
+mvn clean install
+```
+
+#### Testing it locally
+```
+sam local invoke
+```
+
+#### Adding more SDK clients
+To add more service clients, you need to add the specific services modules in `pom.xml` and create the clients in `DependencyFactory` following the same 
+pattern as wafRegionalClient.
+
+## Deployment
+
+The generated project contains a default [SAM template](https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-resource-function.html) file `template.yaml` where you can 
+configure different properties of your lambda function such as memory size and timeout. You might also need to add specific policies to the lambda function
+so that it can access other AWS resources.
+
+To deploy the application, you can run the following command:
+
+```
+sam deploy --guided
+```
+
+See [Deploying Serverless Applications](https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/serverless-deploying.html) for more info.
+
+
+
diff --git a/archetypes/archetype-lambda/src/test/resources/projects/wafregionalclient/reference/pom.xml b/archetypes/archetype-lambda/src/test/resources/projects/wafregionalclient/reference/pom.xml
new file mode 100644
index 000000000000..68fe5c93a944
--- /dev/null
+++ b/archetypes/archetype-lambda/src/test/resources/projects/wafregionalclient/reference/pom.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>software.amazonaws.test</groupId>
+    <artifactId>test-wafregional-artifact</artifactId>
+    <version>1.0-SNAPSHOT</version>
+    <packaging>jar</packaging>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.shade.plugin.version>3.1.1</maven.shade.plugin.version>
+        <maven.compiler.plugin.version>3.6.1</maven.compiler.plugin.version>
+        <exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
+        <aws.java.sdk.version>2.11.0</aws.java.sdk.version>
+        <aws.lambda.java.version>1.2.0</aws.lambda.java.version>
+        <junit5.version>5.4.2</junit5.version>
+    </properties>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>software.amazon.awssdk</groupId>
+                <artifactId>bom</artifactId>
+                <version>${aws.java.sdk.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <dependencies>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>waf</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>software.amazon.awssdk</groupId>
+                    <artifactId>netty-nio-client</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>software.amazon.awssdk</groupId>
+                    <artifactId>apache-client</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>apache-client</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.amazonaws</groupId>
+            <artifactId>aws-lambda-java-core</artifactId>
+            <version>${aws.lambda.java.version}</version>
+        </dependency>
+
+        <!-- Test Dependencies -->
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>${junit5.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>${maven.compiler.plugin.version}</version>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>${maven.shade.plugin.version}</version>
+                <configuration>
+                    <createDependencyReducedPom>false</createDependencyReducedPom>
+                    <finalName>test-wafregional-artifact</finalName>
+                </configuration>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/archetypes/archetype-lambda/src/test/resources/projects/wafregionalclient/reference/src/main/java/software/amazonaws/test/DependencyFactory.java b/archetypes/archetype-lambda/src/test/resources/projects/wafregionalclient/reference/src/main/java/software/amazonaws/test/DependencyFactory.java
new file mode 100644
index 000000000000..31bacbfa33ef
--- /dev/null
+++ b/archetypes/archetype-lambda/src/test/resources/projects/wafregionalclient/reference/src/main/java/software/amazonaws/test/DependencyFactory.java
@@ -0,0 +1,26 @@
+
+package software.amazonaws.test;
+
+import software.amazon.awssdk.auth.credentials.EnvironmentVariableCredentialsProvider;
+import software.amazon.awssdk.http.apache.ApacheHttpClient;
+import software.amazon.awssdk.regions.Region;
+import software.amazon.awssdk.services.waf.regional.WafRegionalClient;
+
+/**
+ * The module containing all dependencies required by the {@link MyWafRegionalFunction}.
+ */
+public class DependencyFactory {
+
+    private DependencyFactory() {}
+
+    /**
+     * @return an instance of WafRegionalClient
+     */
+    public static WafRegionalClient wafRegionalClient() {
+        return WafRegionalClient.builder()
+                       .credentialsProvider(EnvironmentVariableCredentialsProvider.create())
+                       .region(Region.AP_SOUTHEAST_1)
+                       .httpClientBuilder(ApacheHttpClient.builder())
+                       .build();
+    }
+}
diff --git a/archetypes/archetype-lambda/src/test/resources/projects/wafregionalclient/reference/src/main/java/software/amazonaws/test/MyWafRegionalFunction.java b/archetypes/archetype-lambda/src/test/resources/projects/wafregionalclient/reference/src/main/java/software/amazonaws/test/MyWafRegionalFunction.java
new file mode 100644
index 000000000000..9f02b456977a
--- /dev/null
+++ b/archetypes/archetype-lambda/src/test/resources/projects/wafregionalclient/reference/src/main/java/software/amazonaws/test/MyWafRegionalFunction.java
@@ -0,0 +1,28 @@
+package software.amazonaws.test;
+
+import com.amazonaws.services.lambda.runtime.Context;
+import com.amazonaws.services.lambda.runtime.RequestHandler;
+import software.amazon.awssdk.services.waf.regional.WafRegionalClient;
+
+/**
+ * Lambda function entry point. You can change to use other pojo type or implement
+ * a different RequestHandler.
+ *
+ * @see <a href=https://docs.aws.amazon.com/lambda/latest/dg/java-handler.html>Lambda Java Handler</a> for more information
+ */
+public class MyWafRegionalFunction implements RequestHandler<Object, Object> {
+    private final WafRegionalClient wafRegionalClient;
+
+    public MyWafRegionalFunction() {
+        // Initialize the SDK client outside of the handler method so that it can be reused for subsequent invocations.
+        // It is initialized when the class is loaded.
+        wafRegionalClient = DependencyFactory.wafRegionalClient();
+        // Consider invoking a simple api here to pre-warm up the application, eg: dynamodb#listTables
+    }
+
+    @Override
+    public Object handleRequest(final Object input, final Context context) {
+        // TODO: invoking the api call using wafRegionalClient.
+        return input;
+    }
+}
diff --git a/archetypes/archetype-lambda/src/test/resources/projects/wafregionalclient/reference/src/test/java/software/amazonaws/test/MyWafRegionalFunctionTest.java b/archetypes/archetype-lambda/src/test/resources/projects/wafregionalclient/reference/src/test/java/software/amazonaws/test/MyWafRegionalFunctionTest.java
new file mode 100644
index 000000000000..adc0157faf76
--- /dev/null
+++ b/archetypes/archetype-lambda/src/test/resources/projects/wafregionalclient/reference/src/test/java/software/amazonaws/test/MyWafRegionalFunctionTest.java
@@ -0,0 +1,15 @@
+package software.amazonaws.test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.api.Test;
+
+public class MyWafRegionalFunctionTest {
+
+    @Test
+    public void handleRequest_shouldReturnConstantValue() {
+        MyWafRegionalFunction function = new MyWafRegionalFunction();
+        Object result = function.handleRequest("echo", null);
+        assertEquals("echo", result);
+    }
+}
diff --git a/archetypes/archetype-lambda/src/test/resources/projects/wafregionalclient/reference/template.yaml b/archetypes/archetype-lambda/src/test/resources/projects/wafregionalclient/reference/template.yaml
new file mode 100644
index 000000000000..70ee17fae8a3
--- /dev/null
+++ b/archetypes/archetype-lambda/src/test/resources/projects/wafregionalclient/reference/template.yaml
@@ -0,0 +1,19 @@
+AWSTemplateFormatVersion: '2010-09-09'
+Transform: AWS::Serverless-2016-10-31
+Resources:
+  # See https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-resource-function.html
+  # for more info to see how to tune the lambda function configs based on your use case.
+  MyWafRegionalFunctionFunction:
+    Type: AWS::Serverless::Function
+    Properties:
+      Runtime: java8
+      Handler: software.amazonaws.test.MyWafRegionalFunction::handleRequest
+      Timeout: 60
+      MemorySize: 512
+      CodeUri: ./target/test-wafregional-artifact.jar
+      # Attach policies here to give the function permission to access other AWS resources if needed
+      # See: https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst
+      # eg:
+      #Policies:
+      # - S3ReadPolicy:
+      #     BucketName: test-bucket
\ No newline at end of file
diff --git a/archetypes/pom.xml b/archetypes/pom.xml
new file mode 100644
index 000000000000..c0b3b6bc9e01
--- /dev/null
+++ b/archetypes/pom.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2010-2020 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.
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>aws-sdk-java-pom</artifactId>
+        <groupId>software.amazon.awssdk</groupId>
+        <version>2.11.8-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>archetypes</artifactId>
+    <name>AWS Java SDK :: Archetypes</name>
+    <modules>
+        <module>archetype-lambda</module>
+    </modules>
+    <packaging>pom</packaging>
+    <description>
+        Maven Archetypes for applications using Java SDK 2.x
+    </description>
+</project>
\ No newline at end of file
diff --git a/aws-sdk-java/build.properties b/aws-sdk-java/build.properties
index ecf2dae6fcb1..15ec2da1fc71 100644
--- a/aws-sdk-java/build.properties
+++ b/aws-sdk-java/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/aws-sdk-java/pom.xml b/aws-sdk-java/pom.xml
index 767c3a8d19a9..05f3c137f192 100644
--- a/aws-sdk-java/pom.xml
+++ b/aws-sdk-java/pom.xml
@@ -1,10 +1,25 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+  ~ 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.
+  -->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>aws-sdk-java</artifactId>
@@ -955,6 +970,146 @@ Amazon AutoScaling, etc).</description>
             <artifactId>workmailmessageflow</artifactId>
             <version>${awsjavasdk.version}</version>
         </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>codestarnotifications</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>savingsplans</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>sso</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>ssooidc</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>marketplacecatalog</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>sesv2</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>dataexchange</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>migrationhubconfig</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>connectparticipant</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>wafv2</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>appconfig</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>iotsecuretunneling</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>elasticinference</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>imagebuilder</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>schemas</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>accessanalyzer</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>computeoptimizer</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>networkmanager</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>kendra</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>frauddetector</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>codegurureviewer</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>codeguruprofiler</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>outposts</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>sagemakera2iruntime</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>ebs</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>kinesisvideosignaling</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>detective</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>codestarconnections</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
     </dependencies>
     <build>
         <finalName>${project.artifactId}-${project.version}</finalName>
diff --git a/bom-internal/pom.xml b/bom-internal/pom.xml
index c6c805cfb0b7..d174d998a091 100644
--- a/bom-internal/pom.xml
+++ b/bom-internal/pom.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ 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.
+  -->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>aws-sdk-java-pom</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -186,7 +201,7 @@
             <dependency>
                 <groupId>com.puppycrawl.tools</groupId>
                 <artifactId>checkstyle</artifactId>
-                <version>8.7</version>
+                <version>8.29</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -285,6 +300,12 @@
                 <version>${junit.version}</version>
                 <scope>test</scope>
             </dependency>
+            <dependency>
+                <groupId>org.testng</groupId>
+                <artifactId>testng</artifactId>
+                <version>${testng.version}</version>
+                <scope>test</scope>
+            </dependency>
             <dependency>
                 <groupId>org.hamcrest</groupId>
                 <artifactId>hamcrest-all</artifactId>
diff --git a/bom/build.properties b/bom/build.properties
index ecf2dae6fcb1..15ec2da1fc71 100644
--- a/bom/build.properties
+++ b/bom/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/bom/pom.xml b/bom/pom.xml
index 4355c871c1b0..d0756c704b7d 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -1,10 +1,25 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+  ~ 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.
+  -->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>bom</artifactId>
@@ -44,6 +59,11 @@
                 <artifactId>annotations</artifactId>
                 <version>${awsjavasdk.version}</version>
             </dependency>
+            <dependency>
+                <groupId>software.amazon.awssdk</groupId>
+                <artifactId>arns</artifactId>
+                <version>${awsjavasdk.version}</version>
+            </dependency>
             <dependency>
                 <groupId>software.amazon.awssdk</groupId>
                 <artifactId>auth</artifactId>
@@ -1065,6 +1085,146 @@
                 <artifactId>workmailmessageflow</artifactId>
                 <version>${awsjavasdk.version}</version>
             </dependency>
+            <dependency>
+                <groupId>software.amazon.awssdk</groupId>
+                <artifactId>codestarnotifications</artifactId>
+                <version>${awsjavasdk.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>software.amazon.awssdk</groupId>
+                <artifactId>savingsplans</artifactId>
+                <version>${awsjavasdk.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>software.amazon.awssdk</groupId>
+                <artifactId>sso</artifactId>
+                <version>${awsjavasdk.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>software.amazon.awssdk</groupId>
+                <artifactId>ssooidc</artifactId>
+                <version>${awsjavasdk.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>software.amazon.awssdk</groupId>
+                <artifactId>marketplacecatalog</artifactId>
+                <version>${awsjavasdk.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>software.amazon.awssdk</groupId>
+                <artifactId>sesv2</artifactId>
+                <version>${awsjavasdk.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>software.amazon.awssdk</groupId>
+                <artifactId>dataexchange</artifactId>
+                <version>${awsjavasdk.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>software.amazon.awssdk</groupId>
+                <artifactId>migrationhubconfig</artifactId>
+                <version>${awsjavasdk.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>software.amazon.awssdk</groupId>
+                <artifactId>connectparticipant</artifactId>
+                <version>${awsjavasdk.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>software.amazon.awssdk</groupId>
+                <artifactId>wafv2</artifactId>
+                <version>${awsjavasdk.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>software.amazon.awssdk</groupId>
+                <artifactId>appconfig</artifactId>
+                <version>${awsjavasdk.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>software.amazon.awssdk</groupId>
+                <artifactId>iotsecuretunneling</artifactId>
+                <version>${awsjavasdk.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>software.amazon.awssdk</groupId>
+                <artifactId>elasticinference</artifactId>
+                <version>${awsjavasdk.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>software.amazon.awssdk</groupId>
+                <artifactId>imagebuilder</artifactId>
+                <version>${awsjavasdk.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>software.amazon.awssdk</groupId>
+                <artifactId>schemas</artifactId>
+                <version>${awsjavasdk.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>software.amazon.awssdk</groupId>
+                <artifactId>accessanalyzer</artifactId>
+                <version>${awsjavasdk.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>software.amazon.awssdk</groupId>
+                <artifactId>computeoptimizer</artifactId>
+                <version>${awsjavasdk.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>software.amazon.awssdk</groupId>
+                <artifactId>networkmanager</artifactId>
+                <version>${awsjavasdk.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>software.amazon.awssdk</groupId>
+                <artifactId>kendra</artifactId>
+                <version>${awsjavasdk.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>software.amazon.awssdk</groupId>
+                <artifactId>frauddetector</artifactId>
+                <version>${awsjavasdk.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>software.amazon.awssdk</groupId>
+                <artifactId>codegurureviewer</artifactId>
+                <version>${awsjavasdk.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>software.amazon.awssdk</groupId>
+                <artifactId>codeguruprofiler</artifactId>
+                <version>${awsjavasdk.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>software.amazon.awssdk</groupId>
+                <artifactId>outposts</artifactId>
+                <version>${awsjavasdk.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>software.amazon.awssdk</groupId>
+                <artifactId>sagemakera2iruntime</artifactId>
+                <version>${awsjavasdk.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>software.amazon.awssdk</groupId>
+                <artifactId>ebs</artifactId>
+                <version>${awsjavasdk.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>software.amazon.awssdk</groupId>
+                <artifactId>kinesisvideosignaling</artifactId>
+                <version>${awsjavasdk.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>software.amazon.awssdk</groupId>
+                <artifactId>detective</artifactId>
+                <version>${awsjavasdk.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>software.amazon.awssdk</groupId>
+                <artifactId>codestarconnections</artifactId>
+                <version>${awsjavasdk.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 </project>
diff --git a/build-tools/pom.xml b/build-tools/pom.xml
index 58ebb2a6a409..d19195ce8964 100644
--- a/build-tools/pom.xml
+++ b/build-tools/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -66,7 +66,7 @@
         <dependency>
             <groupId>com.puppycrawl.tools</groupId>
             <artifactId>checkstyle</artifactId>
-            <version>8.18</version>
+            <version>8.29</version>
         </dependency>
     </dependencies>
 
diff --git a/build-tools/src/main/java/software/amazon/awssdk/buildtools/checkstyle/MissingSdkAnnotationCheck.java b/build-tools/src/main/java/software/amazon/awssdk/buildtools/checkstyle/MissingSdkAnnotationCheck.java
index d5c530900ed7..b62dd26a170e 100644
--- a/build-tools/src/main/java/software/amazon/awssdk/buildtools/checkstyle/MissingSdkAnnotationCheck.java
+++ b/build-tools/src/main/java/software/amazon/awssdk/buildtools/checkstyle/MissingSdkAnnotationCheck.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/build-tools/src/main/java/software/amazon/awssdk/buildtools/checkstyle/PluralEnumNames.java b/build-tools/src/main/java/software/amazon/awssdk/buildtools/checkstyle/PluralEnumNames.java
index 02407ca3b149..119521b31a0b 100644
--- a/build-tools/src/main/java/software/amazon/awssdk/buildtools/checkstyle/PluralEnumNames.java
+++ b/build-tools/src/main/java/software/amazon/awssdk/buildtools/checkstyle/PluralEnumNames.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -19,6 +19,7 @@
 import com.puppycrawl.tools.checkstyle.api.DetailAST;
 import com.puppycrawl.tools.checkstyle.api.TokenTypes;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -27,7 +28,7 @@
  */
 public class PluralEnumNames extends AbstractCheck {
     private static final List<String> PLURAL_ENDINGS = Arrays.asList("S", "s");
-    private static final List<String> NON_PLURAL_ENDINGS = Arrays.asList("Status");
+    private static final List<String> NON_PLURAL_ENDINGS = Collections.singletonList("Status");
 
     @Override
     public int[] getDefaultTokens() {
diff --git a/build-tools/src/main/java/software/amazon/awssdk/buildtools/checkstyle/SdkPublicMethodNameCheck.java b/build-tools/src/main/java/software/amazon/awssdk/buildtools/checkstyle/SdkPublicMethodNameCheck.java
index 49d9ea14043b..84a30f0710a4 100644
--- a/build-tools/src/main/java/software/amazon/awssdk/buildtools/checkstyle/SdkPublicMethodNameCheck.java
+++ b/build-tools/src/main/java/software/amazon/awssdk/buildtools/checkstyle/SdkPublicMethodNameCheck.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/build-tools/src/main/java/software/amazon/awssdk/buildtools/checkstyle/UnnecessaryFinalOnLocalVariableCheck.java b/build-tools/src/main/java/software/amazon/awssdk/buildtools/checkstyle/UnnecessaryFinalOnLocalVariableCheck.java
index b4f6d95189b2..087aa2d56819 100644
--- a/build-tools/src/main/java/software/amazon/awssdk/buildtools/checkstyle/UnnecessaryFinalOnLocalVariableCheck.java
+++ b/build-tools/src/main/java/software/amazon/awssdk/buildtools/checkstyle/UnnecessaryFinalOnLocalVariableCheck.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/build-tools/src/main/resources/software/amazon/awssdk/checkstyle-suppressions.xml b/build-tools/src/main/resources/software/amazon/awssdk/checkstyle-suppressions.xml
index 46ccc646f25f..394a616bb1ed 100644
--- a/build-tools/src/main/resources/software/amazon/awssdk/checkstyle-suppressions.xml
+++ b/build-tools/src/main/resources/software/amazon/awssdk/checkstyle-suppressions.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
diff --git a/build-tools/src/main/resources/software/amazon/awssdk/checkstyle.xml b/build-tools/src/main/resources/software/amazon/awssdk/checkstyle.xml
index 3f7b933aa0d6..1d42ef9f8f7f 100644
--- a/build-tools/src/main/resources/software/amazon/awssdk/checkstyle.xml
+++ b/build-tools/src/main/resources/software/amazon/awssdk/checkstyle.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -34,7 +34,7 @@
     <!-- Files must contain a copyright header. -->
     <module name="Header">
         <property name="header"
-                  value="/*\n * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.\n *\n * Licensed under the Apache License, Version 2.0 (the &quot;License&quot;).\n * You may not use this file except in compliance with the License.\n * A copy of the License is located at\n *\n *  http://aws.amazon.com/apache2.0\n *\n * or in the &quot;license&quot; file accompanying this file. This file is distributed\n * on an &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either\n * express or implied. See the License for the specific language governing\n * permissions and limitations under the License.\n */"/>
+                  value="/*\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n *\n * Licensed under the Apache License, Version 2.0 (the &quot;License&quot;).\n * You may not use this file except in compliance with the License.\n * A copy of the License is located at\n *\n *  http://aws.amazon.com/apache2.0\n *\n * or in the &quot;license&quot; file accompanying this file. This file is distributed\n * on an &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either\n * express or implied. See the License for the specific language governing\n * permissions and limitations under the License.\n */"/>
     </module>
 
     <module name="SuppressionFilter">
@@ -69,12 +69,6 @@
             <property name="allowNonPrintableEscapes" value="true"/>
         </module>
 
-        <!-- Enforce maximum line lengths. -->
-        <module name="LineLength">
-            <property name="max" value="130"/>
-            <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
-        </module>
-
         <!-- Stars must not be used in import statements. -->
         <module name="AvoidStarImport"/>
 
@@ -386,4 +380,11 @@
         <!-- Checks that no 'final' are added on local variables -->
         <module name="software.amazon.awssdk.buildtools.checkstyle.UnnecessaryFinalOnLocalVariableCheck" />
     </module>
+
+        <!-- Enforce maximum line lengths. -->
+    <module name="LineLength">
+        <property name="max" value="130"/>
+        <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
+    </module>
+
 </module>
diff --git a/build-tools/src/main/resources/software/amazon/awssdk/intellij-codestyle.xml b/build-tools/src/main/resources/software/amazon/awssdk/intellij-codestyle.xml
index e6e6e5ef6a68..3e7114b50570 100644
--- a/build-tools/src/main/resources/software/amazon/awssdk/intellij-codestyle.xml
+++ b/build-tools/src/main/resources/software/amazon/awssdk/intellij-codestyle.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
diff --git a/build-tools/src/main/resources/software/amazon/awssdk/intellij-copyright-profile.xml b/build-tools/src/main/resources/software/amazon/awssdk/intellij-copyright-profile.xml
index 6b4399c9aaca..7c0ca15e282c 100644
--- a/build-tools/src/main/resources/software/amazon/awssdk/intellij-copyright-profile.xml
+++ b/build-tools/src/main/resources/software/amazon/awssdk/intellij-copyright-profile.xml
@@ -1,6 +1,21 @@
+<!--
+  ~ 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.
+  -->
+
 <component name="CopyrightManager">
   <copyright>
-    <option name="notice" value="Copyright 2010-&amp;#36;{today.year} Amazon.com, Inc. or its affiliates. All Rights Reserved.&#10; &#10;Licensed under the Apache License, Version 2.0 (the &quot;License&quot;).&#10;You may not use this file except in compliance with the License.&#10;A copy of the License is located at&#10; &#10; http://aws.amazon.com/apache2.0&#10; &#10;or in the &quot;license&quot; file accompanying this file. This file is distributed&#10;on an &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either&#10;express or implied. See the License for the specific language governing&#10;permissions and limitations under the License." />
+    <option name="notice" value="Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.&#10; &#10;Licensed under the Apache License, Version 2.0 (the &quot;License&quot;).&#10;You may not use this file except in compliance with the License.&#10;A copy of the License is located at&#10; &#10; http://aws.amazon.com/apache2.0&#10; &#10;or in the &quot;license&quot; file accompanying this file. This file is distributed&#10;on an &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either&#10;express or implied. See the License for the specific language governing&#10;permissions and limitations under the License." />
     <option name="myName" value="AWS Java SDK 2.0" />
   </copyright>
 </component>
diff --git a/build-tools/src/main/resources/software/amazon/awssdk/spotbugs-suppressions.xml b/build-tools/src/main/resources/software/amazon/awssdk/spotbugs-suppressions.xml
index 69f864b741af..d1809a003d7d 100644
--- a/build-tools/src/main/resources/software/amazon/awssdk/spotbugs-suppressions.xml
+++ b/build-tools/src/main/resources/software/amazon/awssdk/spotbugs-suppressions.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -150,4 +150,13 @@
         <Method name="createKeyStore"/>
         <Bug pattern="RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE"/>
     </Match>
+
+    <!-- If we're not sure about the RV_RETURN_VALUE_IGNORED_NO_SIDE_EFFECT, skip the warning. -->
+    <Match>
+        <Package name="~software.amazon.awssdk.http.nio.netty.*"/>
+        <Bug pattern="RV_RETURN_VALUE_IGNORED_NO_SIDE_EFFECT"/>
+        <Not>
+            <Confidence value="1"/>
+        </Not>
+    </Match>
 </FindBugsFilter>
diff --git a/buildspecs/integ-test.yml b/buildspecs/integ-test.yml
index ff4a67b98e8e..9b6260b8bc9a 100644
--- a/buildspecs/integ-test.yml
+++ b/buildspecs/integ-test.yml
@@ -7,7 +7,7 @@ phases:
 
   build:
     commands:
-      - mvn clean install -Dskip.unit.tests -P integration-tests -Dfindbugs.skip -Dcheckstyle.skip -pl !:dynamodbdocument-v1,!:dynamodbmapper-v1 -T1C
+      - mvn clean install -Dskip.unit.tests -P integration-tests -Dfindbugs.skip -Dcheckstyle.skip -T1C
       - JAVA_VERSION=$(java -version 2>&1 | grep -i version | cut -d'"' -f2 | cut -d'.' -f1-1)
       - echo $JAVA_VERSION
       - |
diff --git a/buildspecs/on-demand-integ-test.yml b/buildspecs/on-demand-integ-test.yml
index 72889bad78db..29e21c8777df 100644
--- a/buildspecs/on-demand-integ-test.yml
+++ b/buildspecs/on-demand-integ-test.yml
@@ -7,7 +7,7 @@ phases:
 
   build:
     commands:
-      - mvn clean install -Dskip.unit.tests -P integration-tests -Dfindbugs.skip -Dcheckstyle.skip -pl !:dynamodbmapper-v1 -Dfailsafe.rerunFailingTestsCount=1 --fail-at-end
+      - mvn clean install -Dskip.unit.tests -P integration-tests -Dfindbugs.skip -Dcheckstyle.skip -Dfailsafe.rerunFailingTestsCount=1 --fail-at-end
       - JAVA_VERSION=$(java -version 2>&1 | grep -i version | cut -d'"' -f2 | cut -d'.' -f1-1)
       - echo $JAVA_VERSION
       - |
diff --git a/buildspecs/release-javadoc.yml b/buildspecs/release-javadoc.yml
index ebdbdbe0979f..0c2040e3975e 100644
--- a/buildspecs/release-javadoc.yml
+++ b/buildspecs/release-javadoc.yml
@@ -15,7 +15,7 @@ phases:
   build:
     commands:
     - mvn install -P quick -T1C
-    - mvn install javadoc:aggregate -B -Ppublic-javadoc -Dcheckstyle.skip -Dspotbugs.skip -DskipTests -Ddoclint=none -pl '!:dynamodbdocument-v1,!:dynamodbmapper-v1,!:protocol-tests,!:protocol-tests-core,!:codegen-generated-classes-test,!:sdk-benchmarks,!:module-path-tests,!:test-utils,!:http-client-tests,!:tests-coverage-reporting'
+    - mvn install javadoc:aggregate -B -Ppublic-javadoc -Dcheckstyle.skip -Dspotbugs.skip -DskipTests -Ddoclint=none -pl '!:protocol-tests,!:protocol-tests-core,!:codegen-generated-classes-test,!:sdk-benchmarks,!:module-path-tests,!:test-utils,!:http-client-tests,!:tests-coverage-reporting'
     - RELEASE_VERSION=`mvn -q -Dexec.executable=echo -Dexec.args='${project.version}' --non-recursive exec:exec`
     -
     - aws s3 sync target/site/apidocs/ $DOC_PATH/$RELEASE_VERSION/
diff --git a/buildspecs/release-to-maven.yml b/buildspecs/release-to-maven.yml
index 1fa534c1e158..f419e07d75b6 100644
--- a/buildspecs/release-to-maven.yml
+++ b/buildspecs/release-to-maven.yml
@@ -20,7 +20,7 @@ phases:
       if ! curl -f --head $SONATYPE_URL; then
         mkdir -p $CREDENTIALS
         aws s3 cp s3://aws-java-sdk-release-credentials/ $CREDENTIALS/ --recursive
-        mvn clean deploy -B -s $SETTINGS_XML -Dgpg.homedir=$GPG_HOME -Ppublishing -DperformRelease -Dspotbugs.skip -DskipTests -Dcheckstyle.skip -Ddoclint=none -pl !:dynamodbdocument-v1,!:dynamodbmapper-v1,!:protocol-tests,!:protocol-tests-core,!:codegen-generated-classes-test,!:sdk-benchmarks,!:module-path-tests,!:tests-coverage-reporting,!:stability-tests -DautoReleaseAfterClose=true -DstagingProgressTimeoutMinutes=30
+        mvn clean deploy -B -s $SETTINGS_XML -Dgpg.homedir=$GPG_HOME -Ppublishing -DperformRelease -Dspotbugs.skip -DskipTests -Dcheckstyle.skip -Ddoclint=none -pl !:protocol-tests,!:protocol-tests-core,!:codegen-generated-classes-test,!:sdk-benchmarks,!:module-path-tests,!:tests-coverage-reporting,!:stability-tests -DautoReleaseAfterClose=true -DstagingProgressTimeoutMinutes=30
       else
         echo "This version was already released."
       fi
diff --git a/bundle/build.properties b/bundle/build.properties
index ecf2dae6fcb1..15ec2da1fc71 100644
--- a/bundle/build.properties
+++ b/bundle/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/bundle/pom.xml b/bundle/pom.xml
index fa43c3a5b293..754b81f93d99 100644
--- a/bundle/pom.xml
+++ b/bundle/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>bundle</artifactId>
     <packaging>jar</packaging>
@@ -60,15 +60,6 @@
     <build>
         <pluginManagement>
             <plugins>
-                <plugin>
-                    <artifactId>maven-dependency-plugin</artifactId>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <configuration>
-                        <ignoredUnusedDeclaredDependencies>
-                            <ignoredUnusedDeclaredDependency>software.amazon.awssdk:aws-sdk-java</ignoredUnusedDeclaredDependency>
-                        </ignoredUnusedDeclaredDependencies>
-                    </configuration>
-                </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-shade-plugin</artifactId>
diff --git a/codegen-lite-maven-plugin/pom.xml b/codegen-lite-maven-plugin/pom.xml
index 144dd4aa7cec..4dc1a66e81e8 100644
--- a/codegen-lite-maven-plugin/pom.xml
+++ b/codegen-lite-maven-plugin/pom.xml
@@ -1,4 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ 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.
+  -->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -7,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>codegen-lite-maven-plugin</artifactId>
diff --git a/codegen-lite-maven-plugin/src/main/java/software/amazon/awssdk/codegen/lite/maven/plugin/RegionGenerationMojo.java b/codegen-lite-maven-plugin/src/main/java/software/amazon/awssdk/codegen/lite/maven/plugin/RegionGenerationMojo.java
index 94d10946405b..ceee556742d1 100644
--- a/codegen-lite-maven-plugin/src/main/java/software/amazon/awssdk/codegen/lite/maven/plugin/RegionGenerationMojo.java
+++ b/codegen-lite-maven-plugin/src/main/java/software/amazon/awssdk/codegen/lite/maven/plugin/RegionGenerationMojo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -92,13 +92,9 @@ public void generateRegionClass(Path baseSourcesDirectory, Partitions partitions
     public void generateServiceMetadata(Path baseSourcesDirectory, Partitions partitions) {
         Path sourcesDirectory = baseSourcesDirectory.resolve(SERVICE_METADATA_BASE.replace(".", "/"));
         Set<String> services = new HashSet<>();
-        partitions.getPartitions().stream().forEach(p -> services.addAll(p.getServices().keySet()));
+        partitions.getPartitions().forEach(p -> services.addAll(p.getServices().keySet()));
 
-        services.stream()
-                // Use hardcoded file for elasticache until the incorrect fips endpoint is fixed
-                //TODO Remove once elasticache endpoints are fixed at source
-                .filter(s -> !"elasticache".equals(s))
-                .forEach(s -> new CodeGenerator(sourcesDirectory.toString(), new ServiceMetadataGenerator(partitions,
+        services.forEach(s -> new CodeGenerator(sourcesDirectory.toString(), new ServiceMetadataGenerator(partitions,
                                                                                                           s,
                                                                                                           SERVICE_METADATA_BASE,
                                                                                                           REGION_BASE))
diff --git a/codegen-lite/pom.xml b/codegen-lite/pom.xml
index 8fff06cd6052..a0cb1447a45f 100644
--- a/codegen-lite/pom.xml
+++ b/codegen-lite/pom.xml
@@ -1,4 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ 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.
+  -->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -6,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>codegen-lite</artifactId>
     <name>AWS Java SDK :: Code Generator Lite</name>
diff --git a/codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/CodeGenerator.java b/codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/CodeGenerator.java
index 6238e07c7a52..56c6798c6a80 100644
--- a/codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/CodeGenerator.java
+++ b/codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/CodeGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/PoetClass.java b/codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/PoetClass.java
index 2769d71ae266..d38f0593c615 100644
--- a/codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/PoetClass.java
+++ b/codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/PoetClass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/Utils.java b/codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/Utils.java
index 371e38e6a690..2e12c8ca10c1 100644
--- a/codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/Utils.java
+++ b/codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/Utils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/emitters/CodeTransformer.java b/codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/emitters/CodeTransformer.java
index c98cffc6609c..056b5eadff42 100644
--- a/codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/emitters/CodeTransformer.java
+++ b/codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/emitters/CodeTransformer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/emitters/CodeWriter.java b/codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/emitters/CodeWriter.java
index 86c60b76bd25..4a2bb49277db 100644
--- a/codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/emitters/CodeWriter.java
+++ b/codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/emitters/CodeWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/emitters/JavaCodeFormatter.java b/codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/emitters/JavaCodeFormatter.java
index 4ffd3cd0891f..e4ac3581dcf3 100644
--- a/codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/emitters/JavaCodeFormatter.java
+++ b/codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/emitters/JavaCodeFormatter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/emitters/LinkRemover.java b/codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/emitters/LinkRemover.java
index 35f5cbab6230..d1955ad5ae17 100644
--- a/codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/emitters/LinkRemover.java
+++ b/codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/emitters/LinkRemover.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/emitters/UnusedImportRemover.java b/codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/emitters/UnusedImportRemover.java
index c4bf9616b0cc..a2410d38dce6 100644
--- a/codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/emitters/UnusedImportRemover.java
+++ b/codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/emitters/UnusedImportRemover.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/regions/PartitionMetadataGenerator.java b/codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/regions/PartitionMetadataGenerator.java
index 25ad7b565336..5f0f505a4e89 100644
--- a/codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/regions/PartitionMetadataGenerator.java
+++ b/codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/regions/PartitionMetadataGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/regions/PartitionMetadataProviderGenerator.java b/codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/regions/PartitionMetadataProviderGenerator.java
index d5b67c3a5cf0..4555dd209725 100644
--- a/codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/regions/PartitionMetadataProviderGenerator.java
+++ b/codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/regions/PartitionMetadataProviderGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -82,7 +82,6 @@ private CodeBlock partitions(Partitions partitions) {
         CodeBlock.Builder builder = CodeBlock.builder().add("$T.<String, PartitionMetadata>builder()", ImmutableMap.class);
 
         partitions.getPartitions()
-                  .stream()
                   .forEach(p -> builder.add(".put($S, new $T())", p.getPartition(), partitionMetadataClass(p.getPartition())));
 
         return builder.add(".build()").build();
diff --git a/codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/regions/RegionGenerator.java b/codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/regions/RegionGenerator.java
index f50f71fb5df8..fa5467bc847f 100644
--- a/codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/regions/RegionGenerator.java
+++ b/codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/regions/RegionGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -109,7 +109,12 @@ private void regions(TypeSpec.Builder builder) {
 
         addGlobalRegions(builder);
 
-        regionsArray.add(regionsCodeBlock + ", ").add("AWS_GLOBAL, ").add("AWS_CN_GLOBAL, ").add("AWS_US_GOV_GLOBAL");
+        regionsArray.add(regionsCodeBlock + ", ")
+                    .add("AWS_GLOBAL, ")
+                    .add("AWS_CN_GLOBAL, ")
+                    .add("AWS_US_GOV_GLOBAL, ")
+                    .add("AWS_ISO_GLOBAL, ")
+                    .add("AWS_ISO_B_GLOBAL");
         regionsArray.add("))");
 
         TypeName listOfRegions = ParameterizedTypeName.get(ClassName.get(List.class), className());
@@ -130,6 +135,14 @@ private void addGlobalRegions(TypeSpec.Builder builder) {
                .addField(FieldSpec.builder(className(), "AWS_US_GOV_GLOBAL")
                                   .addModifiers(PUBLIC, STATIC, FINAL)
                                   .initializer("$T.of($S, true)", className(), "aws-us-gov-global")
+                                  .build())
+               .addField(FieldSpec.builder(className(), "AWS_ISO_GLOBAL")
+                                  .addModifiers(PUBLIC, STATIC, FINAL)
+                                  .initializer("$T.of($S, true)", className(), "aws-iso-global")
+                                  .build())
+               .addField(FieldSpec.builder(className(), "AWS_ISO_B_GLOBAL")
+                                  .addModifiers(PUBLIC, STATIC, FINAL)
+                                  .initializer("$T.of($S, true)", className(), "aws-iso-b-global")
                                   .build());
     }
 
diff --git a/codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/regions/RegionMetadataGenerator.java b/codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/regions/RegionMetadataGenerator.java
index a1cfe810f271..92011139d2c6 100644
--- a/codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/regions/RegionMetadataGenerator.java
+++ b/codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/regions/RegionMetadataGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/regions/RegionMetadataLoader.java b/codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/regions/RegionMetadataLoader.java
index 366414225840..984cc6d930b5 100644
--- a/codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/regions/RegionMetadataLoader.java
+++ b/codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/regions/RegionMetadataLoader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/regions/RegionMetadataProviderGenerator.java b/codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/regions/RegionMetadataProviderGenerator.java
index 3c49b91a3871..0203bbbfb649 100644
--- a/codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/regions/RegionMetadataProviderGenerator.java
+++ b/codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/regions/RegionMetadataProviderGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -83,7 +83,6 @@ private CodeBlock regions(Partitions partitions) {
         CodeBlock.Builder builder = CodeBlock.builder().add("$T.<Region, RegionMetadata>builder()", ImmutableMap.class);
 
         partitions.getPartitions()
-                  .stream()
                   .forEach(p -> p.getRegions()
                                  .keySet()
                                  .forEach(r -> builder.add(".put(Region.$L, new $T())", regionClass(r), regionMetadataClass(r))));
diff --git a/codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/regions/RegionValidationUtil.java b/codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/regions/RegionValidationUtil.java
index 65f2389b839d..63343bea5ddf 100644
--- a/codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/regions/RegionValidationUtil.java
+++ b/codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/regions/RegionValidationUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -24,7 +24,8 @@ public final class RegionValidationUtil {
 
     private static final String FIPS_PREFIX = "fips-";
 
-    private RegionValidationUtil() {}
+    private RegionValidationUtil() {
+    }
 
     /**
      * Determines if a given region string is a "valid" AWS region.
diff --git a/codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/regions/ServiceMetadataGenerator.java b/codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/regions/ServiceMetadataGenerator.java
index 3bb16edab5ce..d00774ef1d5a 100644
--- a/codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/regions/ServiceMetadataGenerator.java
+++ b/codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/regions/ServiceMetadataGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -50,16 +50,16 @@
 public class ServiceMetadataGenerator implements PoetClass {
 
     private final Partitions partitions;
-    private final String service;
+    private final String serviceEndpointPrefix;
     private final String basePackage;
     private final String regionBasePackage;
 
     public ServiceMetadataGenerator(Partitions partitions,
-                                    String service,
+                                    String serviceEndpointPrefix,
                                     String basePackage,
                                     String regionBasePackage) {
         this.partitions = partitions;
-        this.service = service;
+        this.serviceEndpointPrefix = serviceEndpointPrefix;
         this.basePackage = basePackage;
         this.regionBasePackage = regionBasePackage;
     }
@@ -68,6 +68,8 @@ public ServiceMetadataGenerator(Partitions partitions,
     public TypeSpec poetClass() {
         TypeName listOfRegions = ParameterizedTypeName.get(ClassName.get(List.class), ClassName.get(regionBasePackage, "Region"));
         TypeName mapOfStringString = ParameterizedTypeName.get(Map.class, String.class, String.class);
+        TypeName listOfServicePartitionMetadata =
+            ParameterizedTypeName.get(ClassName.get(List.class), ClassName.get(regionBasePackage, "ServicePartitionMetadata"));
 
         return TypeSpec.classBuilder(className())
                        .addModifiers(Modifier.PUBLIC)
@@ -79,7 +81,7 @@ public TypeSpec poetClass() {
                        .addSuperinterface(ClassName.get(regionBasePackage, "ServiceMetadata"))
                        .addField(FieldSpec.builder(String.class, "ENDPOINT_PREFIX")
                                           .addModifiers(PRIVATE, FINAL, STATIC)
-                                          .initializer("$S", service)
+                                          .initializer("$S", serviceEndpointPrefix)
                                           .build())
                        .addField(FieldSpec.builder(mapOfStringString, "PARTITION_OVERRIDDEN_ENDPOINTS")
                                           .addModifiers(PRIVATE, FINAL, STATIC)
@@ -97,15 +99,20 @@ public TypeSpec poetClass() {
                                           .addModifiers(PRIVATE, FINAL, STATIC)
                                           .initializer(signingRegionOverrides(partitions))
                                           .build())
+                       .addField(FieldSpec.builder(listOfServicePartitionMetadata, "PARTITIONS")
+                                          .addModifiers(PRIVATE, FINAL, STATIC)
+                                          .initializer(servicePartitions(partitions))
+                                          .build())
                        .addMethod(regions())
                        .addMethod(endpointFor())
                        .addMethod(signingRegion())
+                       .addMethod(partitions(listOfServicePartitionMetadata))
                        .build();
     }
 
     @Override
     public ClassName className() {
-        String sanitizedServiceName = service.replace(".", "-");
+        String sanitizedServiceName = serviceEndpointPrefix.replace(".", "-");
         return ClassName.get(basePackage, Stream.of(sanitizedServiceName.split("-"))
                                                 .map(Utils::capitalize)
                                                 .collect(Collectors.joining()) + "ServiceMetadata");
@@ -131,7 +138,6 @@ private CodeBlock serviceEndpoints(Partitions partitions) {
         CodeBlock.Builder builder = CodeBlock.builder().add("$T.<String, String>builder()", ImmutableMap.class);
 
         services.entrySet()
-                .stream()
                 .forEach(s -> s.getValue().getEndpoints()
                                .entrySet()
                                .stream()
@@ -151,8 +157,8 @@ private CodeBlock regionsField(Partitions partitions) {
 
         partitions.getPartitions()
                   .stream()
-                  .filter(p -> p.getServices().containsKey(service))
-                  .forEach(p -> regions.addAll(p.getServices().get(service).getEndpoints().keySet()
+                  .filter(p -> p.getServices().containsKey(serviceEndpointPrefix))
+                  .forEach(p -> regions.addAll(p.getServices().get(serviceEndpointPrefix).getEndpoints().keySet()
                                                 .stream()
                                                 .filter(r -> RegionValidationUtil.validRegion(r, p.getRegionRegex()))
                                                 .collect(Collectors.toList())));
@@ -173,7 +179,6 @@ private CodeBlock signingRegionOverrides(Partitions partitions) {
         CodeBlock.Builder builder = CodeBlock.builder().add("$T.<String, String>builder()", ImmutableMap.class);
 
         serviceData.entrySet()
-                   .stream()
                    .forEach(s -> s.getValue().getEndpoints()
                                   .entrySet()
                                   .stream()
@@ -187,6 +192,39 @@ private CodeBlock signingRegionOverrides(Partitions partitions) {
         return builder.add(".build()").build();
     }
 
+    private CodeBlock servicePartitions(Partitions partitions) {
+        return CodeBlock.builder()
+                        .add("$T.unmodifiableList($T.asList(", Collections.class, Arrays.class)
+                        .add(commaSeparatedServicePartitions(partitions))
+                        .add("))")
+                        .build();
+    }
+
+    private CodeBlock commaSeparatedServicePartitions(Partitions partitions) {
+        ClassName defaultServicePartitionMetadata = ClassName.get(regionBasePackage + ".internal",
+                                                                  "DefaultServicePartitionMetadata");
+        return partitions.getPartitions()
+                  .stream()
+                  .filter(p -> p.getServices().containsKey(serviceEndpointPrefix))
+                  .map(p -> CodeBlock.of("new $T($S, $L)",
+                                         defaultServicePartitionMetadata,
+                                         p.getPartition(),
+                                         globalRegion(p)))
+                  .collect(CodeBlock.joining(","));
+    }
+
+    private CodeBlock globalRegion(Partition partition) {
+        ClassName region = ClassName.get(regionBasePackage, "Region");
+        Service service = partition.getServices().get(this.serviceEndpointPrefix);
+        boolean hasGlobalRegionForPartition = service.isRegionalized() != null &&
+                                              !service.isRegionalized() &&
+                                              service.isPartitionWideEndpointAvailable();
+        String globalRegionForPartition = hasGlobalRegionForPartition ? service.getPartitionEndpoint() : null;
+        return globalRegionForPartition == null
+                                    ? CodeBlock.of("null")
+                                    : CodeBlock.of("$T.of($S)", region, globalRegionForPartition);
+    }
+
     private MethodSpec regions() {
         TypeName listOfRegions = ParameterizedTypeName.get(ClassName.get(List.class),
                                                            ClassName.get(regionBasePackage, "Region"));
@@ -221,15 +259,23 @@ private MethodSpec signingRegion() {
                          .build();
     }
 
+    private MethodSpec partitions(TypeName listOfServicePartitionMetadata) {
+        return MethodSpec.methodBuilder("servicePartitions")
+                         .addModifiers(Modifier.PUBLIC)
+                         .addAnnotation(Override.class)
+                         .returns(listOfServicePartitionMetadata)
+                         .addStatement("return $L", "PARTITIONS")
+                         .build();
+    }
+
     private Map<Partition, Service> getServiceData(Partitions partitions) {
         Map<Partition, Service> serviceData = new TreeMap<>(Comparator.comparing(Partition::getPartition));
 
         partitions.getPartitions()
-                  .stream()
                   .forEach(p -> p.getServices()
                                  .entrySet()
                                  .stream()
-                                 .filter(s -> s.getKey().equalsIgnoreCase(service))
+                                 .filter(s -> s.getKey().equalsIgnoreCase(serviceEndpointPrefix))
                                  .forEach(s -> serviceData.put(p, s.getValue())));
 
         return serviceData;
diff --git a/codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/regions/ServiceMetadataProviderGenerator.java b/codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/regions/ServiceMetadataProviderGenerator.java
index 395891000fcd..f169fac71f7a 100644
--- a/codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/regions/ServiceMetadataProviderGenerator.java
+++ b/codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/regions/ServiceMetadataProviderGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -86,10 +86,8 @@ private CodeBlock regions(Partitions partitions) {
         Set<String> seenServices = new HashSet<>();
 
         partitions.getPartitions()
-                  .stream()
                   .forEach(p -> p.getServices()
                                  .keySet()
-                                 .stream()
                                  .forEach(s -> {
                                      if (!seenServices.contains(s)) {
                                          builder.add(".put($S, new $T())", s, serviceMetadataClass(s));
@@ -101,6 +99,10 @@ private CodeBlock regions(Partitions partitions) {
     }
 
     private ClassName serviceMetadataClass(String service) {
+        if ("s3".equals(service)) {
+            // This class contains extra logic for detecting the regional endpoint flag
+            return ClassName.get(basePackage, "EnhancedS3ServiceMetadata");
+        }
         String sanitizedServiceName = service.replace(".", "-");
         return ClassName.get(basePackage, Stream.of(sanitizedServiceName.split("-"))
                                                 .map(Utils::capitalize)
diff --git a/codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/regions/model/CredentialScope.java b/codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/regions/model/CredentialScope.java
index 341c6c19418e..d34bc65d319a 100644
--- a/codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/regions/model/CredentialScope.java
+++ b/codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/regions/model/CredentialScope.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/regions/model/Endpoint.java b/codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/regions/model/Endpoint.java
index 8c89a3e29f76..ace3435126ec 100644
--- a/codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/regions/model/Endpoint.java
+++ b/codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/regions/model/Endpoint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -54,7 +54,8 @@ public final class Endpoint implements Cloneable {
      */
     private String sslCommonName;
 
-    public Endpoint() {}
+    public Endpoint() {
+    }
 
     /**
      * Merges the given endpoints and returns the merged one.
diff --git a/codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/regions/model/Partition.java b/codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/regions/model/Partition.java
index b457a97d3a9e..e225d47bfd82 100644
--- a/codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/regions/model/Partition.java
+++ b/codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/regions/model/Partition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -62,7 +62,8 @@ public final class Partition {
      */
     private Endpoint defaults;
 
-    public Partition() {}
+    public Partition() {
+    }
 
     public Partition(@JsonProperty(value = "partition") String partition,
                      @JsonProperty(value = "regions") Map<String, PartitionRegion>
diff --git a/codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/regions/model/PartitionRegion.java b/codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/regions/model/PartitionRegion.java
index f437b3aa167b..1d4b7d4bdf0d 100644
--- a/codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/regions/model/PartitionRegion.java
+++ b/codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/regions/model/PartitionRegion.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -30,7 +30,8 @@ public final class PartitionRegion {
      */
     private String description;
 
-    public PartitionRegion() {}
+    public PartitionRegion() {
+    }
 
     public PartitionRegion(@JsonProperty(value = "description") String description) {
         this.description = Validate.notNull(description, "Region description");
diff --git a/codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/regions/model/Partitions.java b/codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/regions/model/Partitions.java
index 074456022064..c0d5dd4c1b12 100644
--- a/codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/regions/model/Partitions.java
+++ b/codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/regions/model/Partitions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -36,7 +36,8 @@ public final class Partitions {
      */
     private List<Partition> partitions;
 
-    public Partitions() {}
+    public Partitions() {
+    }
 
     public Partitions(@JsonProperty(value = "version") String version,
                       @JsonProperty(value = "partitions") List<Partition> partitions) {
diff --git a/codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/regions/model/Service.java b/codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/regions/model/Service.java
index db89355e5a83..4a95600c5416 100644
--- a/codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/regions/model/Service.java
+++ b/codegen-lite/src/main/java/software/amazon/awssdk/codegen/lite/regions/model/Service.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -45,9 +45,10 @@ public final class Service {
     /**
      * Returns true if the service is regionalized.
      */
-    private boolean isRegionalized;
+    private Boolean isRegionalized;
 
-    public Service() {}
+    public Service() {
+    }
 
     public Service(@JsonProperty(value = "endpoints") Map<String, Endpoint> endpoints) {
         this.endpoints = Validate.paramNotNull(endpoints, "endpoints");
@@ -99,7 +100,7 @@ public void setPartitionEndpoint(String partitionEndpoint) {
     /**
      * returns true if the service is regionalized.
      */
-    public boolean isRegionalized() {
+    public Boolean isRegionalized() {
         return isRegionalized;
     }
 
@@ -107,7 +108,7 @@ public boolean isRegionalized() {
      * sets the regionalized property for a service..
      */
     @JsonProperty(value = "isRegionalized")
-    public void setIsRegionalized(boolean regionalized) {
+    public void setIsRegionalized(Boolean regionalized) {
         isRegionalized = regionalized;
     }
 
diff --git a/codegen-lite/src/test/java/software/amazon/awssdk/codegen/lite/PoetMatchers.java b/codegen-lite/src/test/java/software/amazon/awssdk/codegen/lite/PoetMatchers.java
index 727009dec96f..e7c9ed5d2ee5 100644
--- a/codegen-lite/src/test/java/software/amazon/awssdk/codegen/lite/PoetMatchers.java
+++ b/codegen-lite/src/test/java/software/amazon/awssdk/codegen/lite/PoetMatchers.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen-lite/src/test/java/software/amazon/awssdk/codegen/lite/regions/RegionGenerationTest.java b/codegen-lite/src/test/java/software/amazon/awssdk/codegen/lite/regions/RegionGenerationTest.java
index b3c214c8fdcb..223ec4d50532 100644
--- a/codegen-lite/src/test/java/software/amazon/awssdk/codegen/lite/regions/RegionGenerationTest.java
+++ b/codegen-lite/src/test/java/software/amazon/awssdk/codegen/lite/regions/RegionGenerationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -26,7 +26,7 @@
 
 public class RegionGenerationTest {
 
-    private static final String ENDPOINTS = "/software/amazon/awssdk/codegen/lite/endpoints.json";
+    private static final String ENDPOINTS = "/software/amazon/awssdk/codegen/lite/test-endpoints.json";
     private static final String SERVICE_METADATA_BASE = "software.amazon.awssdk.regions.servicemetadata";
     private static final String REGION_METADATA_BASE = "software.amazon.awssdk.regions.regionmetadata";
     private static final String PARTITION_METADATA_BASE = "software.amazon.awssdk.regions.partitionmetadata";
diff --git a/codegen-lite/src/test/java/software/amazon/awssdk/codegen/lite/regions/RegionValidationUtilTest.java b/codegen-lite/src/test/java/software/amazon/awssdk/codegen/lite/regions/RegionValidationUtilTest.java
index 497669e8ef39..80c47e3c2f90 100644
--- a/codegen-lite/src/test/java/software/amazon/awssdk/codegen/lite/regions/RegionValidationUtilTest.java
+++ b/codegen-lite/src/test/java/software/amazon/awssdk/codegen/lite/regions/RegionValidationUtilTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen-lite/src/test/resources/software/amazon/awssdk/codegen/lite/regions/regions.java b/codegen-lite/src/test/resources/software/amazon/awssdk/codegen/lite/regions/regions.java
index 7d0adb1f49d2..6b3750874bd6 100644
--- a/codegen-lite/src/test/resources/software/amazon/awssdk/codegen/lite/regions/regions.java
+++ b/codegen-lite/src/test/resources/software/amazon/awssdk/codegen/lite/regions/regions.java
@@ -80,10 +80,14 @@ public final class Region {
 
     public static final Region AWS_US_GOV_GLOBAL = Region.of("aws-us-gov-global", true);
 
+    public static final Region AWS_ISO_GLOBAL = Region.of("aws-iso-global", true);
+
+    public static final Region AWS_ISO_B_GLOBAL = Region.of("aws-iso-b-global", true);
+
     private static final List<Region> REGIONS = Collections.unmodifiableList(Arrays.asList(AP_SOUTH_1, EU_WEST_3, EU_WEST_2,
-            EU_WEST_1, AP_NORTHEAST_3, AP_NORTHEAST_2, AP_NORTHEAST_1, CA_CENTRAL_1, SA_EAST_1, CN_NORTH_1, US_GOV_WEST_1,
-            AP_SOUTHEAST_1, AP_SOUTHEAST_2, EU_CENTRAL_1, US_EAST_1, US_EAST_2, US_WEST_1, CN_NORTHWEST_1, US_WEST_2, AWS_GLOBAL,
-            AWS_CN_GLOBAL, AWS_US_GOV_GLOBAL));
+                                                                                           EU_WEST_1, AP_NORTHEAST_3, AP_NORTHEAST_2, AP_NORTHEAST_1, CA_CENTRAL_1, SA_EAST_1, CN_NORTH_1, US_GOV_WEST_1,
+                                                                                           AP_SOUTHEAST_1, AP_SOUTHEAST_2, EU_CENTRAL_1, US_EAST_1, US_EAST_2, US_WEST_1, CN_NORTHWEST_1, US_WEST_2, AWS_GLOBAL,
+                                                                                           AWS_CN_GLOBAL, AWS_US_GOV_GLOBAL, AWS_ISO_GLOBAL, AWS_ISO_B_GLOBAL));
 
     private final boolean isGlobalRegion;
 
diff --git a/codegen-lite/src/test/resources/software/amazon/awssdk/codegen/lite/regions/s3-service-metadata.java b/codegen-lite/src/test/resources/software/amazon/awssdk/codegen/lite/regions/s3-service-metadata.java
index bae9ee6da3e3..027d9a3bc765 100644
--- a/codegen-lite/src/test/resources/software/amazon/awssdk/codegen/lite/regions/s3-service-metadata.java
+++ b/codegen-lite/src/test/resources/software/amazon/awssdk/codegen/lite/regions/s3-service-metadata.java
@@ -9,6 +9,8 @@
 import software.amazon.awssdk.annotations.SdkPublicApi;
 import software.amazon.awssdk.regions.Region;
 import software.amazon.awssdk.regions.ServiceMetadata;
+import software.amazon.awssdk.regions.ServicePartitionMetadata;
+import software.amazon.awssdk.regions.internal.DefaultServicePartitionMetadata;
 import software.amazon.awssdk.utils.ImmutableMap;
 
 @Generated("software.amazon.awssdk:codegen")
@@ -19,22 +21,27 @@ public final class S3ServiceMetadata implements ServiceMetadata {
     private static final Map<String, String> PARTITION_OVERRIDDEN_ENDPOINTS = ImmutableMap.<String, String> builder().build();
 
     private static final Map<String, String> REGION_OVERRIDDEN_ENDPOINTS = ImmutableMap.<String, String> builder()
-            .put("ap-northeast-1", "s3.ap-northeast-1.amazonaws.com").put("ap-southeast-1", "s3.ap-southeast-1.amazonaws.com")
-            .put("ap-southeast-2", "s3.ap-southeast-2.amazonaws.com").put("eu-west-1", "s3.eu-west-1.amazonaws.com")
-            .put("sa-east-1", "s3.sa-east-1.amazonaws.com").put("us-east-1", "s3.amazonaws.com")
-            .put("us-west-1", "s3.us-west-1.amazonaws.com").put("us-west-2", "s3.us-west-2.amazonaws.com")
-            .put("fips-us-gov-west-1", "s3-fips-us-gov-west-1.amazonaws.com")
-            .put("us-gov-west-1", "s3.us-gov-west-1.amazonaws.com").build();
-
-    private static final List<Region> REGIONS = Collections.unmodifiableList(Arrays.asList(Region.of("ap-northeast-1"),
-            Region.of("ap-northeast-2"), Region.of("ap-northeast-3"), Region.of("ap-south-1"), Region.of("ap-southeast-1"),
-            Region.of("ap-southeast-2"), Region.of("ca-central-1"), Region.of("eu-central-1"), Region.of("eu-west-1"),
-            Region.of("eu-west-2"), Region.of("eu-west-3"), Region.of("sa-east-1"), Region.of("us-east-1"),
-            Region.of("us-east-2"), Region.of("us-west-1"), Region.of("us-west-2"), Region.of("cn-north-1"),
-            Region.of("cn-northwest-1"), Region.of("fips-us-gov-west-1"), Region.of("us-gov-west-1")));
+        .put("ap-northeast-1", "s3.ap-northeast-1.amazonaws.com").put("ap-southeast-1", "s3.ap-southeast-1.amazonaws.com")
+        .put("ap-southeast-2", "s3.ap-southeast-2.amazonaws.com").put("eu-west-1", "s3.eu-west-1.amazonaws.com")
+        .put("sa-east-1", "s3.sa-east-1.amazonaws.com").put("us-east-1", "s3.amazonaws.com")
+        .put("us-west-1", "s3.us-west-1.amazonaws.com").put("us-west-2", "s3.us-west-2.amazonaws.com")
+        .put("fips-us-gov-west-1", "s3-fips-us-gov-west-1.amazonaws.com")
+        .put("us-gov-west-1", "s3.us-gov-west-1.amazonaws.com").build();
+
+    private static final List<Region> REGIONS = Collections.unmodifiableList(
+        Arrays.asList(Region.of("ap-northeast-1"),
+                      Region.of("ap-northeast-2"), Region.of("ap-northeast-3"), Region.of("ap-south-1"), Region.of("ap-southeast-1"),
+                      Region.of("ap-southeast-2"), Region.of("ca-central-1"), Region.of("eu-central-1"), Region.of("eu-west-1"),
+                      Region.of("eu-west-2"), Region.of("eu-west-3"), Region.of("sa-east-1"), Region.of("us-east-1"),
+                      Region.of("us-east-2"), Region.of("us-west-1"), Region.of("us-west-2"), Region.of("cn-north-1"),
+                      Region.of("cn-northwest-1"), Region.of("fips-us-gov-west-1"), Region.of("us-gov-west-1")));
 
     private static final Map<String, String> SIGNING_REGION_OVERRIDES = ImmutableMap.<String, String> builder()
-            .put("fips-us-gov-west-1", "us-gov-west-1").build();
+        .put("fips-us-gov-west-1", "us-gov-west-1").build();
+
+    private static final List<ServicePartitionMetadata> PARTITIONS = Collections.unmodifiableList(Arrays.asList(
+        new DefaultServicePartitionMetadata("aws", null), new DefaultServicePartitionMetadata("aws-cn", null),
+        new DefaultServicePartitionMetadata("aws-us-gov", null)));
 
     @Override
     public List<Region> regions() {
@@ -44,11 +51,16 @@ public List<Region> regions() {
     @Override
     public URI endpointFor(Region region) {
         return URI.create(REGION_OVERRIDDEN_ENDPOINTS.containsKey(region.id()) ? REGION_OVERRIDDEN_ENDPOINTS.get(region.id())
-                : computeEndpoint(ENDPOINT_PREFIX, PARTITION_OVERRIDDEN_ENDPOINTS, region));
+                                                                               : computeEndpoint(ENDPOINT_PREFIX, PARTITION_OVERRIDDEN_ENDPOINTS, region));
     }
 
     @Override
     public Region signingRegion(Region region) {
         return Region.of(SIGNING_REGION_OVERRIDES.getOrDefault(region.id(), region.id()));
     }
+
+    @Override
+    public List<ServicePartitionMetadata> servicePartitions() {
+        return PARTITIONS;
+    }
 }
diff --git a/codegen-lite/src/test/resources/software/amazon/awssdk/codegen/lite/regions/service-metadata-provider.java b/codegen-lite/src/test/resources/software/amazon/awssdk/codegen/lite/regions/service-metadata-provider.java
index b781aa2503c5..ee84f112bdba 100644
--- a/codegen-lite/src/test/resources/software/amazon/awssdk/codegen/lite/regions/service-metadata-provider.java
+++ b/codegen-lite/src/test/resources/software/amazon/awssdk/codegen/lite/regions/service-metadata-provider.java
@@ -1,5 +1,4 @@
 package software.amazon.awssdk.regions;
-
 import java.util.Map;
 import software.amazon.awssdk.annotations.Generated;
 import software.amazon.awssdk.annotations.SdkPublicApi;
@@ -56,6 +55,7 @@
 import software.amazon.awssdk.regions.servicemetadata.ElasticmapreduceServiceMetadata;
 import software.amazon.awssdk.regions.servicemetadata.ElastictranscoderServiceMetadata;
 import software.amazon.awssdk.regions.servicemetadata.EmailServiceMetadata;
+import software.amazon.awssdk.regions.servicemetadata.EnhancedS3ServiceMetadata;
 import software.amazon.awssdk.regions.servicemetadata.EntitlementMarketplaceServiceMetadata;
 import software.amazon.awssdk.regions.servicemetadata.EsServiceMetadata;
 import software.amazon.awssdk.regions.servicemetadata.EventsServiceMetadata;
@@ -107,7 +107,6 @@
 import software.amazon.awssdk.regions.servicemetadata.Route53domainsServiceMetadata;
 import software.amazon.awssdk.regions.servicemetadata.RuntimeLexServiceMetadata;
 import software.amazon.awssdk.regions.servicemetadata.RuntimeSagemakerServiceMetadata;
-import software.amazon.awssdk.regions.servicemetadata.S3ServiceMetadata;
 import software.amazon.awssdk.regions.servicemetadata.SagemakerServiceMetadata;
 import software.amazon.awssdk.regions.servicemetadata.SdbServiceMetadata;
 import software.amazon.awssdk.regions.servicemetadata.SecretsmanagerServiceMetadata;
@@ -196,7 +195,7 @@ public final class GeneratedServiceMetadataProvider implements ServiceMetadataPr
             .put("redshift", new RedshiftServiceMetadata()).put("rekognition", new RekognitionServiceMetadata())
             .put("resource-groups", new ResourceGroupsServiceMetadata()).put("route53", new Route53ServiceMetadata())
             .put("route53domains", new Route53domainsServiceMetadata()).put("runtime.lex", new RuntimeLexServiceMetadata())
-            .put("runtime.sagemaker", new RuntimeSagemakerServiceMetadata()).put("s3", new S3ServiceMetadata())
+            .put("runtime.sagemaker", new RuntimeSagemakerServiceMetadata()).put("s3", new EnhancedS3ServiceMetadata())
             .put("sagemaker", new SagemakerServiceMetadata()).put("sdb", new SdbServiceMetadata())
             .put("secretsmanager", new SecretsmanagerServiceMetadata())
             .put("serverlessrepo", new ServerlessrepoServiceMetadata())
diff --git a/codegen-lite/src/test/resources/software/amazon/awssdk/codegen/lite/regions/sts-service-metadata.java b/codegen-lite/src/test/resources/software/amazon/awssdk/codegen/lite/regions/sts-service-metadata.java
index b622f4a7ee45..a88b40b8378a 100644
--- a/codegen-lite/src/test/resources/software/amazon/awssdk/codegen/lite/regions/sts-service-metadata.java
+++ b/codegen-lite/src/test/resources/software/amazon/awssdk/codegen/lite/regions/sts-service-metadata.java
@@ -1,18 +1,3 @@
-/*
- * Copyright 2010-2019 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.
- */
-
 package software.amazon.awssdk.regions.servicemetadata;
 
 import java.net.URI;
@@ -24,6 +9,8 @@
 import software.amazon.awssdk.annotations.SdkPublicApi;
 import software.amazon.awssdk.regions.Region;
 import software.amazon.awssdk.regions.ServiceMetadata;
+import software.amazon.awssdk.regions.ServicePartitionMetadata;
+import software.amazon.awssdk.regions.internal.DefaultServicePartitionMetadata;
 import software.amazon.awssdk.utils.ImmutableMap;
 
 @Generated("software.amazon.awssdk:codegen")
@@ -51,6 +38,10 @@ public final class StsServiceMetadata implements ServiceMetadata {
         .put("ap-northeast-2", "ap-northeast-2").put("us-east-1-fips", "us-east-1").put("us-east-2-fips", "us-east-2")
         .put("us-west-1-fips", "us-west-1").put("us-west-2-fips", "us-west-2").build();
 
+    private static final List<ServicePartitionMetadata> PARTITIONS = Collections.unmodifiableList(Arrays.asList(
+        new DefaultServicePartitionMetadata("aws", null), new DefaultServicePartitionMetadata("aws-cn", null),
+        new DefaultServicePartitionMetadata("aws-us-gov", null)));
+
     @Override
     public List<Region> regions() {
         return REGIONS;
@@ -66,4 +57,9 @@ public URI endpointFor(Region region) {
     public Region signingRegion(Region region) {
         return Region.of(SIGNING_REGION_OVERRIDES.getOrDefault(region.id(), region.id()));
     }
+
+    @Override
+    public List<ServicePartitionMetadata> servicePartitions() {
+        return PARTITIONS;
+    }
 }
diff --git a/codegen-lite/src/test/resources/software/amazon/awssdk/codegen/lite/endpoints.json b/codegen-lite/src/test/resources/software/amazon/awssdk/codegen/lite/test-endpoints.json
similarity index 100%
rename from codegen-lite/src/test/resources/software/amazon/awssdk/codegen/lite/endpoints.json
rename to codegen-lite/src/test/resources/software/amazon/awssdk/codegen/lite/test-endpoints.json
diff --git a/codegen-maven-plugin/build.properties b/codegen-maven-plugin/build.properties
index ecf2dae6fcb1..59c37a425758 100644
--- a/codegen-maven-plugin/build.properties
+++ b/codegen-maven-plugin/build.properties
@@ -1,12 +1,12 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-#
+# 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
diff --git a/codegen-maven-plugin/pom.xml b/codegen-maven-plugin/pom.xml
index bb6e839dcf38..0fad221360f8 100644
--- a/codegen-maven-plugin/pom.xml
+++ b/codegen-maven-plugin/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -22,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>codegen-maven-plugin</artifactId>
diff --git a/codegen-maven-plugin/src/main/java/software/amazon/awssdk/codegen/maven/plugin/GenerationMojo.java b/codegen-maven-plugin/src/main/java/software/amazon/awssdk/codegen/maven/plugin/GenerationMojo.java
index 42e406e4e94c..df1ac2ae1480 100644
--- a/codegen-maven-plugin/src/main/java/software/amazon/awssdk/codegen/maven/plugin/GenerationMojo.java
+++ b/codegen-maven-plugin/src/main/java/software/amazon/awssdk/codegen/maven/plugin/GenerationMojo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/build.properties b/codegen/build.properties
index ecf2dae6fcb1..15ec2da1fc71 100644
--- a/codegen/build.properties
+++ b/codegen/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/codegen/pom.xml b/codegen/pom.xml
index dfb28605f921..e399462cc313 100644
--- a/codegen/pom.xml
+++ b/codegen/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>codegen</artifactId>
     <name>AWS Java SDK :: Code Generator</name>
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/AddCustomAuthorizers.java b/codegen/src/main/java/software/amazon/awssdk/codegen/AddCustomAuthorizers.java
index d66089a37525..011d5bb88dcd 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/AddCustomAuthorizers.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/AddCustomAuthorizers.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/AddEmptyInputShape.java b/codegen/src/main/java/software/amazon/awssdk/codegen/AddEmptyInputShape.java
index 44d89e00fc04..172fcbe137cd 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/AddEmptyInputShape.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/AddEmptyInputShape.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -54,7 +54,7 @@ private Map<String, ShapeModel> addEmptyInputShapes(
             Map<String, OperationModel> javaOperationMap) {
         Map<String, Operation> operations = serviceModel.getOperations();
 
-        Map<String, ShapeModel> emptyInputShapes = new HashMap<String, ShapeModel>();
+        Map<String, ShapeModel> emptyInputShapes = new HashMap<>();
 
         for (Map.Entry<String, Operation> entry : operations.entrySet()) {
             String operationName = entry.getKey();
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/AddEmptyOutputShape.java b/codegen/src/main/java/software/amazon/awssdk/codegen/AddEmptyOutputShape.java
index a3991376736f..78ed00857022 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/AddEmptyOutputShape.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/AddEmptyOutputShape.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/AddExceptionShapes.java b/codegen/src/main/java/software/amazon/awssdk/codegen/AddExceptionShapes.java
index d7d3bafa73b3..e6884fa04c28 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/AddExceptionShapes.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/AddExceptionShapes.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -42,7 +42,7 @@ public Map<String, ShapeModel> process(Map<String, OperationModel> currentOperat
 
     private Map<String, ShapeModel> constructExceptionShapes() {
         // Java shape models, to be constructed
-        Map<String, ShapeModel> javaShapes = new HashMap<String, ShapeModel>();
+        Map<String, ShapeModel> javaShapes = new HashMap<>();
 
         for (Map.Entry<String, Shape> shape : getServiceModel().getShapes().entrySet()) {
             if (shape.getValue().isException()) {
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/AddInputShapes.java b/codegen/src/main/java/software/amazon/awssdk/codegen/AddInputShapes.java
index a542b732bac0..2715b8257e7f 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/AddInputShapes.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/AddInputShapes.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -43,7 +43,7 @@ public Map<String, ShapeModel> process(Map<String, OperationModel> currentOperat
 
     private Map<String, ShapeModel> constructInputShapes() {
         // Java input shape models, to be constructed
-        Map<String, ShapeModel> javaShapes = new HashMap<String, ShapeModel>();
+        Map<String, ShapeModel> javaShapes = new HashMap<>();
 
         for (Map.Entry<String, Operation> entry : getServiceModel().getOperations().entrySet()) {
 
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/AddMetadata.java b/codegen/src/main/java/software/amazon/awssdk/codegen/AddMetadata.java
index 067015c76568..e93c478c3bd2 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/AddMetadata.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/AddMetadata.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/AddModelShapes.java b/codegen/src/main/java/software/amazon/awssdk/codegen/AddModelShapes.java
index 652d54070db9..92664189df4b 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/AddModelShapes.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/AddModelShapes.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/AddOperations.java b/codegen/src/main/java/software/amazon/awssdk/codegen/AddOperations.java
index 5d439a6ecb51..256f390c523b 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/AddOperations.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/AddOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -143,7 +143,7 @@ private static String getResultShapeName(Operation operation, Map<String, Shape>
 
     public Map<String, OperationModel> constructOperations() {
 
-        Map<String, OperationModel> javaOperationModels = new TreeMap<String, OperationModel>();
+        Map<String, OperationModel> javaOperationModels = new TreeMap<>();
         Map<String, Shape> c2jShapes = serviceModel.getShapes();
 
         for (Map.Entry<String, Operation> entry : serviceModel.getOperations().entrySet()) {
@@ -234,6 +234,6 @@ private Integer getHttpStatusCode(ErrorTrait errorTrait) {
     }
 
     private boolean isPaginated(Operation op) {
-        return paginators.keySet().contains(op.getName()) && paginators.get(op.getName()).isValid();
+        return paginators.containsKey(op.getName()) && paginators.get(op.getName()).isValid();
     }
 }
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/AddOutputShapes.java b/codegen/src/main/java/software/amazon/awssdk/codegen/AddOutputShapes.java
index e30ab22bd679..d89af5e409e3 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/AddOutputShapes.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/AddOutputShapes.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -47,7 +47,7 @@ private Map<String, ShapeModel> constructOutputShapes() {
         Map<String, Shape> c2jShapes = getServiceModel().getShapes();
 
         // Java shape models, to be constructed
-        Map<String, ShapeModel> javaShapes = new HashMap<String, ShapeModel>();
+        Map<String, ShapeModel> javaShapes = new HashMap<>();
 
         for (Map.Entry<String, Operation> entry : operations.entrySet()) {
 
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/AddShapes.java b/codegen/src/main/java/software/amazon/awssdk/codegen/AddShapes.java
index d91b446532d7..ebc8014709b3 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/AddShapes.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/AddShapes.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -179,6 +179,7 @@ private MemberModel generateMemberModel(String c2jMemberName, Member c2jMemberDe
                 .withFluentEnumGetterMethodName(namingStrategy.getFluentEnumGetterMethodName(c2jMemberName, parentShape, shape))
                 .withFluentSetterMethodName(namingStrategy.getFluentSetterMethodName(c2jMemberName, parentShape, shape))
                 .withFluentEnumSetterMethodName(namingStrategy.getFluentEnumSetterMethodName(c2jMemberName, parentShape, shape))
+                .withExistenceCheckMethodName(namingStrategy.getExistenceCheckMethodName(c2jMemberName, parentShape))
                 .withBeanStyleGetterMethodName(namingStrategy.getBeanStyleGetterMethodName(c2jMemberName, parentShape, shape))
                 .withBeanStyleSetterMethodName(namingStrategy.getBeanStyleSetterMethodName(c2jMemberName, parentShape, shape));
         memberModel.setIdempotencyToken(c2jMemberDefinition.isIdempotencyToken());
@@ -196,6 +197,20 @@ private MemberModel generateMemberModel(String c2jMemberName, Member c2jMemberDe
         fillContainerTypeMemberMetadata(allC2jShapes, c2jMemberDefinition.getShape(), memberModel,
                                         protocol);
 
+
+        String deprecatedName = c2jMemberDefinition.getDeprecatedName();
+        if (StringUtils.isNotBlank(deprecatedName)) {
+            checkForValidDeprecatedName(c2jMemberName, shape);
+
+            memberModel.setDeprecatedName(deprecatedName);
+            memberModel.setDeprecatedFluentGetterMethodName(
+                namingStrategy.getFluentGetterMethodName(deprecatedName, parentShape, shape));
+            memberModel.setDeprecatedFluentSetterMethodName(
+                namingStrategy.getFluentSetterMethodName(deprecatedName, parentShape, shape));
+            memberModel.setDeprecatedBeanStyleSetterMethodName(
+                namingStrategy.getBeanStyleSetterMethodName(deprecatedName, parentShape, shape));
+        }
+
         ParameterHttpMapping httpMapping = generateParameterHttpMapping(parentShape,
                                                                               c2jMemberName,
                                                                               c2jMemberDefinition,
@@ -218,6 +233,26 @@ private MemberModel generateMemberModel(String c2jMemberName, Member c2jMemberDe
         return memberModel;
     }
 
+    private void checkForValidDeprecatedName(String c2jMemberName, Shape memberShape) {
+        if (memberShape.getEnumValues() != null) {
+            throw new IllegalStateException(String.format(
+                "Member %s has enum values and a deprecated name. Codegen does not support this.",
+                c2jMemberName));
+        }
+
+        if (isListShape(memberShape)) {
+            throw new IllegalStateException(String.format(
+                "Member %s is a list and has a deprecated name. Codegen does not support this.",
+                c2jMemberName));
+        }
+
+        if (isMapShape(memberShape)) {
+            throw new IllegalStateException(String.format(
+                "Member %s is a map and has a deprecated name. Codegen does not support this.",
+                c2jMemberName));
+        }
+    }
+
     private boolean isSensitiveShapeOrContainer(Member member, Map<String, Shape> allC2jShapes) {
         if (member == null) {
             return false;
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/C2jModels.java b/codegen/src/main/java/software/amazon/awssdk/codegen/C2jModels.java
index 0de819399271..e2d4825a7f24 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/C2jModels.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/C2jModels.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/CodeGenerator.java b/codegen/src/main/java/software/amazon/awssdk/codegen/CodeGenerator.java
index 9867b6a013c6..0a8437e44cb4 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/CodeGenerator.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/CodeGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/ExamplesCustomizer.java b/codegen/src/main/java/software/amazon/awssdk/codegen/ExamplesCustomizer.java
index a935528dcc19..1480e8d9d3b4 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/ExamplesCustomizer.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/ExamplesCustomizer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/IntermediateModelBuilder.java b/codegen/src/main/java/software/amazon/awssdk/codegen/IntermediateModelBuilder.java
index 58171649b66d..565d567cb7c9 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/IntermediateModelBuilder.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/IntermediateModelBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -100,12 +100,11 @@ public IntermediateModel build() {
 
         customization.preprocess(service);
 
-        Map<String, OperationModel> operations = new TreeMap<>();
         Map<String, ShapeModel> shapes = new HashMap<>();
-        Map<String, AuthorizerModel> authorizers = new HashMap<>();
 
-        operations.putAll(new AddOperations(this).constructOperations());
-        authorizers.putAll(new AddCustomAuthorizers(this.service, getNamingStrategy()).constructAuthorizers());
+        Map<String, OperationModel> operations = new TreeMap<>(new AddOperations(this).constructOperations());
+        Map<String, AuthorizerModel> authorizers =
+            new HashMap<>(new AddCustomAuthorizers(this.service, getNamingStrategy()).constructAuthorizers());
 
         OperationModel endpointOperation = null;
 
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/IntermediateModelShapeProcessor.java b/codegen/src/main/java/software/amazon/awssdk/codegen/IntermediateModelShapeProcessor.java
index b4dc7d76e615..498200922a9f 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/IntermediateModelShapeProcessor.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/IntermediateModelShapeProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/RemoveUnusedShapes.java b/codegen/src/main/java/software/amazon/awssdk/codegen/RemoveUnusedShapes.java
index 7af07e62a8ef..90667eb7478d 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/RemoveUnusedShapes.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/RemoveUnusedShapes.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -40,7 +40,7 @@ private RemoveUnusedShapes() {
 
     public static Map<String, ShapeModel> removeUnusedShapes(IntermediateModel model) {
 
-        Map<String, ShapeModel> out = new HashMap<String, ShapeModel>();
+        Map<String, ShapeModel> out = new HashMap<>();
         Map<String, ShapeModel> in = model.getShapes();
 
         for (OperationModel opModel : model.getOperations().values()) {
@@ -114,20 +114,20 @@ private static void addShapeAndMembers(String shapeName,
     private static List<String> resolveMemberShapes(MemberModel member) {
 
         if (member == null) {
-            return new LinkedList<String>();
+            return new LinkedList<>();
         }
         if (member.getEnumType() != null) {
             return Collections.singletonList(member.getEnumType());
         } else if (member.isList()) {
             return resolveMemberShapes(member.getListModel().getListMemberModel());
         } else if (member.isMap()) {
-            List<String> memberShapes = new LinkedList<String>();
+            List<String> memberShapes = new LinkedList<>();
             memberShapes.addAll(resolveMemberShapes(member.getMapModel().getKeyModel()));
             memberShapes.addAll(resolveMemberShapes(member.getMapModel().getValueModel()));
             return memberShapes;
         } else if (member.isSimple()) {
             // member is scalar, do nothing
-            return new LinkedList<String>();
+            return new LinkedList<>();
         } else {
             // member is a structure.
             return Collections.singletonList(member.getVariable().getSimpleType());
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/customization/CodegenCustomizationProcessor.java b/codegen/src/main/java/software/amazon/awssdk/codegen/customization/CodegenCustomizationProcessor.java
index c96399b00268..8c2c01579ffe 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/customization/CodegenCustomizationProcessor.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/customization/CodegenCustomizationProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/customization/CodegenCustomizationProcessorChain.java b/codegen/src/main/java/software/amazon/awssdk/codegen/customization/CodegenCustomizationProcessorChain.java
index 81e8c9861ad9..64fbb68743f9 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/customization/CodegenCustomizationProcessorChain.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/customization/CodegenCustomizationProcessorChain.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/customization/processors/DefaultCustomizationProcessor.java b/codegen/src/main/java/software/amazon/awssdk/codegen/customization/processors/DefaultCustomizationProcessor.java
index 6a8e548ad095..d6bb8fc1ec14 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/customization/processors/DefaultCustomizationProcessor.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/customization/processors/DefaultCustomizationProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/customization/processors/MetadataModifiersProcessor.java b/codegen/src/main/java/software/amazon/awssdk/codegen/customization/processors/MetadataModifiersProcessor.java
index 3804f2544ab8..1c0786425507 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/customization/processors/MetadataModifiersProcessor.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/customization/processors/MetadataModifiersProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/customization/processors/OperationModifiersProcessor.java b/codegen/src/main/java/software/amazon/awssdk/codegen/customization/processors/OperationModifiersProcessor.java
index 81d510254151..3b380ab64500 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/customization/processors/OperationModifiersProcessor.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/customization/processors/OperationModifiersProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -42,7 +42,7 @@ final class OperationModifiersProcessor implements CodegenCustomizationProcessor
 
     private final Map<String, OperationModifier> operationModifiers;
 
-    private final Set<String> createdWrapperShapes = new HashSet<String>();
+    private final Set<String> createdWrapperShapes = new HashSet<>();
 
     OperationModifiersProcessor(Map<String, OperationModifier> operationModifiers) {
         this.operationModifiers = operationModifiers;
@@ -69,7 +69,6 @@ public void preprocess(ServiceModel serviceModel) {
                         serviceModel, operationName, modifier);
                 // Keep track of all the wrappers we created
                 createdWrapperShapes.add(createdWrapperShape);
-                continue;
             }
         }
 
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/customization/processors/RemoveExceptionMessagePropertyProcessor.java b/codegen/src/main/java/software/amazon/awssdk/codegen/customization/processors/RemoveExceptionMessagePropertyProcessor.java
index 98855127e36b..30b3604654c2 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/customization/processors/RemoveExceptionMessagePropertyProcessor.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/customization/processors/RemoveExceptionMessagePropertyProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/customization/processors/RenameShapesProcessor.java b/codegen/src/main/java/software/amazon/awssdk/codegen/customization/processors/RenameShapesProcessor.java
index 2f622aae9395..463136aa9b9b 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/customization/processors/RenameShapesProcessor.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/customization/processors/RenameShapesProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/customization/processors/ShapeModifiersProcessor.java b/codegen/src/main/java/software/amazon/awssdk/codegen/customization/processors/ShapeModifiersProcessor.java
index 0d0608482527..4deb239b5935 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/customization/processors/ShapeModifiersProcessor.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/customization/processors/ShapeModifiersProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -199,7 +199,7 @@ private void preprocessModifyShapeMembers(ServiceModel serviceModel, Shape shape
         if (modifier.getInject() != null) {
             for (Map<String, Member> injects : modifier.getInject()) {
                 if (shape.getMembers() == null) {
-                    shape.setMembers(new HashMap<String, Member>());
+                    shape.setMembers(new HashMap<>());
                 }
                 shape.getMembers().putAll(injects);
             }
@@ -219,6 +219,10 @@ private void doModifyShapeMembers(ServiceModel serviceModel, Shape shape, String
                 member.setLocationName(memberToModify);
             }
 
+            if (modifyModel.isExistingNameDeprecated()) {
+                member.setDeprecatedName(memberToModify);
+            }
+
             shape.getMembers().put(modifyModel.getEmitPropertyName(), member);
         }
         if (modifyModel.getEmitAsType() != null) {
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/customization/processors/ShapeSubstitutionsProcessor.java b/codegen/src/main/java/software/amazon/awssdk/codegen/customization/processors/ShapeSubstitutionsProcessor.java
index 6f9de28b6c0d..77a88149b9d4 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/customization/processors/ShapeSubstitutionsProcessor.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/customization/processors/ShapeSubstitutionsProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -46,12 +46,12 @@ final class ShapeSubstitutionsProcessor implements CodegenCustomizationProcessor
     /**
      * parentShapeName -> {memberName -> originalShape}
      */
-    private final Map<String, Map<String, String>> substitutedShapeMemberReferences = new HashMap<String, Map<String, String>>();
+    private final Map<String, Map<String, String>> substitutedShapeMemberReferences = new HashMap<>();
 
     /**
      * parentShapeName -> {listTypeMemberName -> originalShapeOfTheMemberOfTheListTypeMember...}
      */
-    private final Map<String, Map<String, String>> substitutedListMemberReferences = new HashMap<String, Map<String, String>>();
+    private final Map<String, Map<String, String>> substitutedListMemberReferences = new HashMap<>();
 
     ShapeSubstitutionsProcessor(
             Map<String, ShapeSubstitution> shapeSubstitutions) {
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/docs/AsyncOperationDocProvider.java b/codegen/src/main/java/software/amazon/awssdk/codegen/docs/AsyncOperationDocProvider.java
index 8550647d421a..280f7fa251c6 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/docs/AsyncOperationDocProvider.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/docs/AsyncOperationDocProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/docs/ClientType.java b/codegen/src/main/java/software/amazon/awssdk/codegen/docs/ClientType.java
index 807c2d3987d9..41202446c991 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/docs/ClientType.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/docs/ClientType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/docs/DocConfiguration.java b/codegen/src/main/java/software/amazon/awssdk/codegen/docs/DocConfiguration.java
index aa90f3f28159..15069d885770 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/docs/DocConfiguration.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/docs/DocConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/docs/DocumentationBuilder.java b/codegen/src/main/java/software/amazon/awssdk/codegen/docs/DocumentationBuilder.java
index 1e0e4bd65bf4..8e91c2493f7d 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/docs/DocumentationBuilder.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/docs/DocumentationBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -260,7 +260,7 @@ private StringBuilder formatThrows(StringBuilder str, String exName, String exDo
 
     private StringBuilder formatTag(StringBuilder str, String tagName, List<String> tagVals) {
         return str.append("@").append(tagName).append(" ")
-                  .append(tagVals.stream().collect(Collectors.joining(" ")))
+                  .append(String.join(" ", tagVals))
                   .append(LF);
     }
 
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/docs/Factory.java b/codegen/src/main/java/software/amazon/awssdk/codegen/docs/Factory.java
index bcbed6b676aa..7eb821378a44 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/docs/Factory.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/docs/Factory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/docs/OperationDocProvider.java b/codegen/src/main/java/software/amazon/awssdk/codegen/docs/OperationDocProvider.java
index b29686a65ff8..f99859b8a019 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/docs/OperationDocProvider.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/docs/OperationDocProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/docs/OperationDocs.java b/codegen/src/main/java/software/amazon/awssdk/codegen/docs/OperationDocs.java
index 666bd6ce6a9d..58a804207b7c 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/docs/OperationDocs.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/docs/OperationDocs.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/docs/PaginationDocs.java b/codegen/src/main/java/software/amazon/awssdk/codegen/docs/PaginationDocs.java
index 5d502032b966..67738c7ba8b7 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/docs/PaginationDocs.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/docs/PaginationDocs.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/docs/SimpleMethodOverload.java b/codegen/src/main/java/software/amazon/awssdk/codegen/docs/SimpleMethodOverload.java
index bae52b775778..473c2dcaac33 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/docs/SimpleMethodOverload.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/docs/SimpleMethodOverload.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/docs/SyncOperationDocProvider.java b/codegen/src/main/java/software/amazon/awssdk/codegen/docs/SyncOperationDocProvider.java
index a9c58c18c440..3f14c67ac969 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/docs/SyncOperationDocProvider.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/docs/SyncOperationDocProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/CodeEmitter.java b/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/CodeEmitter.java
index d8fa9f8c7ac8..0c6b9f7d5b35 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/CodeEmitter.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/CodeEmitter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/CodeTransformer.java b/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/CodeTransformer.java
index 2dd29a09bbb6..c300dcf24d4c 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/CodeTransformer.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/CodeTransformer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/CodeWriter.java b/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/CodeWriter.java
index 3ccc129d58f7..1e654e73f752 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/CodeWriter.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/CodeWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/GeneratorPathProvider.java b/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/GeneratorPathProvider.java
index 349727f661ae..a0d219066560 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/GeneratorPathProvider.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/GeneratorPathProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/GeneratorTask.java b/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/GeneratorTask.java
index e53f8c0902d2..baf96be14a4b 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/GeneratorTask.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/GeneratorTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/GeneratorTaskExecutor.java b/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/GeneratorTaskExecutor.java
index 894ea11cdb54..e9420b1460ec 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/GeneratorTaskExecutor.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/GeneratorTaskExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/GeneratorTaskParams.java b/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/GeneratorTaskParams.java
index 4f1e02edfe7a..702f00a78be2 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/GeneratorTaskParams.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/GeneratorTaskParams.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/JavaCodeFormatter.java b/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/JavaCodeFormatter.java
index 9ae2106e4a1d..fc6442b69ec1 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/JavaCodeFormatter.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/JavaCodeFormatter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/LinkRemover.java b/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/LinkRemover.java
index 694c349664c3..50a34c65af99 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/LinkRemover.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/LinkRemover.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/PoetGeneratorTask.java b/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/PoetGeneratorTask.java
index b6e5bfc40e80..74d70fdc0817 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/PoetGeneratorTask.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/PoetGeneratorTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/SimpleGeneratorTask.java b/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/SimpleGeneratorTask.java
index 695f674bd5b6..d2d5864fd869 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/SimpleGeneratorTask.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/SimpleGeneratorTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/UnusedImportRemover.java b/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/UnusedImportRemover.java
index 8e51b9f3e329..567c56277226 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/UnusedImportRemover.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/UnusedImportRemover.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/tasks/ApiGatewayGeneratorTasks.java b/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/tasks/ApiGatewayGeneratorTasks.java
index 2dcb3c9aebcd..48cf7f8ed2d9 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/tasks/ApiGatewayGeneratorTasks.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/tasks/ApiGatewayGeneratorTasks.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/tasks/AsyncClientGeneratorTasks.java b/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/tasks/AsyncClientGeneratorTasks.java
index fdc1929c68af..1009f8c0bb01 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/tasks/AsyncClientGeneratorTasks.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/tasks/AsyncClientGeneratorTasks.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/tasks/AwsGeneratorTasks.java b/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/tasks/AwsGeneratorTasks.java
index 7631dc7bab6c..ba09c861c2fe 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/tasks/AwsGeneratorTasks.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/tasks/AwsGeneratorTasks.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/tasks/BaseExceptionClassGeneratorTasks.java b/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/tasks/BaseExceptionClassGeneratorTasks.java
index 8124363de2dd..f485f11f8592 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/tasks/BaseExceptionClassGeneratorTasks.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/tasks/BaseExceptionClassGeneratorTasks.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -15,7 +15,7 @@
 
 package software.amazon.awssdk.codegen.emitters.tasks;
 
-import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import software.amazon.awssdk.codegen.emitters.GeneratorTask;
 import software.amazon.awssdk.codegen.emitters.GeneratorTaskParams;
@@ -42,7 +42,8 @@ protected boolean hasTasks() {
     @Override
     protected List<GeneratorTask> createTasks() throws Exception {
         info("Emitting Base Service Exception class");
-        return Arrays.asList(new PoetGeneratorTask(modelClassDir, model.getFileHeader(), new BaseExceptionClass(model)));
+        return Collections.singletonList(
+            new PoetGeneratorTask(modelClassDir, model.getFileHeader(), new BaseExceptionClass(model)));
     }
 
 }
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/tasks/BaseGeneratorTasks.java b/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/tasks/BaseGeneratorTasks.java
index 8b84611bd774..80ec5ab65b71 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/tasks/BaseGeneratorTasks.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/tasks/BaseGeneratorTasks.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -71,7 +71,7 @@ public Iterator<GeneratorTask> iterator() {
             if (hasTasks()) {
                 return createTasks().iterator();
             } else {
-                return Collections.<GeneratorTask>emptyList().iterator();
+                return Collections.emptyIterator();
             }
         } catch (Exception e) {
             throw new RuntimeException(e);
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/tasks/CommonClientGeneratorTasks.java b/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/tasks/CommonClientGeneratorTasks.java
index 51c7d557dd68..d0ba3e897a24 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/tasks/CommonClientGeneratorTasks.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/tasks/CommonClientGeneratorTasks.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/tasks/CommonGeneratorTasks.java b/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/tasks/CommonGeneratorTasks.java
index 6f4f6108102f..6880fa58199e 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/tasks/CommonGeneratorTasks.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/tasks/CommonGeneratorTasks.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/tasks/EventStreamGeneratorTasks.java b/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/tasks/EventStreamGeneratorTasks.java
index dce5d97c8554..9d4a94137407 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/tasks/EventStreamGeneratorTasks.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/tasks/EventStreamGeneratorTasks.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/tasks/MarshallerGeneratorTasks.java b/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/tasks/MarshallerGeneratorTasks.java
index 48f7ae3ec290..cc4e91135863 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/tasks/MarshallerGeneratorTasks.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/tasks/MarshallerGeneratorTasks.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/tasks/ModelClassGeneratorTasks.java b/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/tasks/ModelClassGeneratorTasks.java
index a7e693788c5d..0f6717dd3834 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/tasks/ModelClassGeneratorTasks.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/tasks/ModelClassGeneratorTasks.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/tasks/PackageInfoGeneratorTasks.java b/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/tasks/PackageInfoGeneratorTasks.java
index 1358345dfb27..ec8a5ea50058 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/tasks/PackageInfoGeneratorTasks.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/tasks/PackageInfoGeneratorTasks.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/tasks/PaginatorsGeneratorTasks.java b/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/tasks/PaginatorsGeneratorTasks.java
index 5e8670dc4851..8fe5a063cec2 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/tasks/PaginatorsGeneratorTasks.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/tasks/PaginatorsGeneratorTasks.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/tasks/SharedModelsTaskParamsValidator.java b/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/tasks/SharedModelsTaskParamsValidator.java
index 6a176f6f250f..0d01799149b3 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/tasks/SharedModelsTaskParamsValidator.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/tasks/SharedModelsTaskParamsValidator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/tasks/SyncClientGeneratorTasks.java b/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/tasks/SyncClientGeneratorTasks.java
index 55ce2aeb8055..ea7a875053de 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/tasks/SyncClientGeneratorTasks.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/emitters/tasks/SyncClientGeneratorTasks.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/internal/ClassLoaderHelper.java b/codegen/src/main/java/software/amazon/awssdk/codegen/internal/ClassLoaderHelper.java
index 8e752a10483b..5f8791a2a7ad 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/internal/ClassLoaderHelper.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/internal/ClassLoaderHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/internal/Constant.java b/codegen/src/main/java/software/amazon/awssdk/codegen/internal/Constant.java
index 7ba27c4b3f41..d62d1abfda11 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/internal/Constant.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/internal/Constant.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/internal/DocumentationUtils.java b/codegen/src/main/java/software/amazon/awssdk/codegen/internal/DocumentationUtils.java
index dacae57969a6..93bc7e4bbe3d 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/internal/DocumentationUtils.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/internal/DocumentationUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -36,6 +36,11 @@ public final class DocumentationUtils {
 
     private static final String DEFAULT_GETTER_PARAM = "The value of the %s property for this object.";
 
+    private static final String DEFAULT_EXISTENCE_CHECK = "Returns true if the %s property was specified by the sender "
+                                                          + "(it may be empty), or false if the sender did not specify "
+                                                          + "the value (it will be empty). For responses returned by the SDK, "
+                                                          + "the sender is the AWS service.";
+
     private static final String DEFAULT_FLUENT_RETURN =
             "Returns a reference to this object so that method calls can be chained together.";
 
@@ -164,4 +169,8 @@ public static String defaultGetterParam() {
     public static String defaultFluentReturn() {
         return DEFAULT_FLUENT_RETURN;
     }
+
+    public static String defaultExistenceCheck() {
+        return DEFAULT_EXISTENCE_CHECK;
+    }
 }
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/internal/Jackson.java b/codegen/src/main/java/software/amazon/awssdk/codegen/internal/Jackson.java
index b2c9ee477796..40ad83628a0a 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/internal/Jackson.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/internal/Jackson.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/internal/TypeUtils.java b/codegen/src/main/java/software/amazon/awssdk/codegen/internal/TypeUtils.java
index 290a3e578db1..1d6b554bd99e 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/internal/TypeUtils.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/internal/TypeUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/internal/Utils.java b/codegen/src/main/java/software/amazon/awssdk/codegen/internal/Utils.java
index c47fe9843971..a4288ae7fd05 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/internal/Utils.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/internal/Utils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/model/config/customization/AuthPolicyActions.java b/codegen/src/main/java/software/amazon/awssdk/codegen/model/config/customization/AuthPolicyActions.java
index 49f690cf89bd..17e63020c71b 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/model/config/customization/AuthPolicyActions.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/model/config/customization/AuthPolicyActions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/model/config/customization/ConvenienceTypeOverload.java b/codegen/src/main/java/software/amazon/awssdk/codegen/model/config/customization/ConvenienceTypeOverload.java
index edc58d0269f0..000a28364757 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/model/config/customization/ConvenienceTypeOverload.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/model/config/customization/ConvenienceTypeOverload.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/model/config/customization/CustomizationConfig.java b/codegen/src/main/java/software/amazon/awssdk/codegen/model/config/customization/CustomizationConfig.java
index cfa9a1b39fc2..a56e74414697 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/model/config/customization/CustomizationConfig.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/model/config/customization/CustomizationConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/model/config/customization/MetadataConfig.java b/codegen/src/main/java/software/amazon/awssdk/codegen/model/config/customization/MetadataConfig.java
index 8a07e1c1d89c..8674cf81783f 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/model/config/customization/MetadataConfig.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/model/config/customization/MetadataConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/model/config/customization/ModifyModelShapeModifier.java b/codegen/src/main/java/software/amazon/awssdk/codegen/model/config/customization/ModifyModelShapeModifier.java
index f02b9b88e937..b2f2465ea567 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/model/config/customization/ModifyModelShapeModifier.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/model/config/customization/ModifyModelShapeModifier.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -17,6 +17,14 @@
 
 public class ModifyModelShapeModifier {
 
+    /**
+     * Indicates whether a renamed member should create getters and setters under the existing name
+     */
+    private boolean existingNameDeprecated;
+
+    /**
+     * Sets a name for a member used by the SDK, eliminating the existing name
+     */
     private String emitPropertyName;
 
     /**
@@ -41,6 +49,14 @@ public class ModifyModelShapeModifier {
 
     private String unmarshallLocationName;
 
+    public boolean isExistingNameDeprecated() {
+        return existingNameDeprecated;
+    }
+
+    public void setExistingNameDeprecated(boolean existingNameDeprecated) {
+        this.existingNameDeprecated = existingNameDeprecated;
+    }
+
     public String getEmitPropertyName() {
         return emitPropertyName;
     }
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/model/config/customization/OperationModifier.java b/codegen/src/main/java/software/amazon/awssdk/codegen/model/config/customization/OperationModifier.java
index ee2cae21747b..20fb75ee91ec 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/model/config/customization/OperationModifier.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/model/config/customization/OperationModifier.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/model/config/customization/ShapeModifier.java b/codegen/src/main/java/software/amazon/awssdk/codegen/model/config/customization/ShapeModifier.java
index 4bd58c33dda7..2ff84f8f3329 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/model/config/customization/ShapeModifier.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/model/config/customization/ShapeModifier.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/model/config/customization/ShapeSubstitution.java b/codegen/src/main/java/software/amazon/awssdk/codegen/model/config/customization/ShapeSubstitution.java
index 79b3dd02601d..14e5480d4b6e 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/model/config/customization/ShapeSubstitution.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/model/config/customization/ShapeSubstitution.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/model/config/customization/ShareModelConfig.java b/codegen/src/main/java/software/amazon/awssdk/codegen/model/config/customization/ShareModelConfig.java
index 71e8f1036e0b..f8fcfb12a0c8 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/model/config/customization/ShareModelConfig.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/model/config/customization/ShareModelConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/model/config/customization/UtilitiesMethod.java b/codegen/src/main/java/software/amazon/awssdk/codegen/model/config/customization/UtilitiesMethod.java
index cc218f8e1b2f..331c3481ae8d 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/model/config/customization/UtilitiesMethod.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/model/config/customization/UtilitiesMethod.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/ArgumentModel.java b/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/ArgumentModel.java
index cdf7a8857041..5013db7d3f9e 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/ArgumentModel.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/ArgumentModel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/AuthorizerModel.java b/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/AuthorizerModel.java
index dbcd9a2fd46f..ce98c0dfea8e 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/AuthorizerModel.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/AuthorizerModel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/DocumentationModel.java b/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/DocumentationModel.java
index 530fa40733d9..5be891040acc 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/DocumentationModel.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/DocumentationModel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/EndpointDiscovery.java b/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/EndpointDiscovery.java
index a0f20d96dfdf..91a5f3b60f25 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/EndpointDiscovery.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/EndpointDiscovery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/EnumModel.java b/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/EnumModel.java
index 080bfc52abda..cc1d00793396 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/EnumModel.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/EnumModel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/Example.java b/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/Example.java
index 4fd5cb701cde..bec2ee81f756 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/Example.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/Example.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/ExampleComments.java b/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/ExampleComments.java
index 5567a5d8bb07..00e01896cea9 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/ExampleComments.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/ExampleComments.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/ExceptionModel.java b/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/ExceptionModel.java
index 80970ab2351e..5af04c441e0b 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/ExceptionModel.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/ExceptionModel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/HasDeprecation.java b/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/HasDeprecation.java
index 9666f4795467..26cc341c48e4 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/HasDeprecation.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/HasDeprecation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/IntermediateModel.java b/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/IntermediateModel.java
index 7d12cdcebf49..1b04bf63fda2 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/IntermediateModel.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/IntermediateModel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -20,7 +20,6 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import java.io.IOException;
 import java.io.InputStream;
-import java.time.ZonedDateTime;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -166,17 +165,10 @@ public String getFileHeader() throws IOException {
     private String loadDefaultFileHeader() throws IOException {
         try (InputStream inputStream = getClass()
             .getResourceAsStream("/software/amazon/awssdk/codegen/DefaultFileHeader.txt")) {
-            return IoUtils.toUtf8String(inputStream)
-                          .replaceFirst("%COPYRIGHT_DATE_RANGE%", getCopyrightDateRange());
+            return IoUtils.toUtf8String(inputStream);
         }
     }
 
-    private String getCopyrightDateRange() {
-        int currentYear = ZonedDateTime.now().getYear();
-        int copyrightStartYear = currentYear - 5;
-        return String.format("%d-%d", copyrightStartYear, currentYear);
-    }
-
     public String getSdkBaseResponseFqcn() {
         if (metadata.getProtocol() == Protocol.API_GATEWAY) {
             return "software.amazon.awssdk.opensdk.BaseResult";
@@ -212,15 +204,11 @@ public boolean hasPaginators() {
 
     public boolean containsRequestSigners() {
         return getShapes().values().stream()
-                          .filter(ShapeModel::isRequestSignerAware)
-                          .findAny()
-                          .isPresent();
+                          .anyMatch(ShapeModel::isRequestSignerAware);
     }
 
     public boolean containsRequestEventStreams() {
         return getOperations().values().stream()
-                              .filter(opModel -> opModel.hasEventStreamInput())
-                              .findAny()
-                              .isPresent();
+                              .anyMatch(OperationModel::hasEventStreamInput);
     }
 }
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/ListModel.java b/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/ListModel.java
index 93427bccd83f..44ec17a60305 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/ListModel.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/ListModel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -105,6 +105,6 @@ public String getTemplateImplType() {
 
     public String getSimpleType() {
         int startIndex = memberType.lastIndexOf(".");
-        return memberType.substring(startIndex + 1, memberType.length());
+        return memberType.substring(startIndex + 1);
     }
 }
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/MapModel.java b/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/MapModel.java
index e7a4a951a283..a431851ecfac 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/MapModel.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/MapModel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/MemberModel.java b/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/MemberModel.java
index 2e397e6b236e..f4ccd26fbd5d 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/MemberModel.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/MemberModel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -16,6 +16,7 @@
 package software.amazon.awssdk.codegen.model.intermediate;
 
 import static software.amazon.awssdk.codegen.internal.Constant.LF;
+import static software.amazon.awssdk.codegen.internal.DocumentationUtils.defaultExistenceCheck;
 import static software.amazon.awssdk.codegen.internal.DocumentationUtils.defaultFluentReturn;
 import static software.amazon.awssdk.codegen.internal.DocumentationUtils.defaultGetter;
 import static software.amazon.awssdk.codegen.internal.DocumentationUtils.defaultGetterParam;
@@ -24,11 +25,15 @@
 import static software.amazon.awssdk.codegen.internal.DocumentationUtils.stripHtmlTags;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.squareup.javapoet.ClassName;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import software.amazon.awssdk.codegen.internal.TypeUtils;
 import software.amazon.awssdk.core.SdkBytes;
 import software.amazon.awssdk.core.protocol.MarshallingType;
+import software.amazon.awssdk.core.util.SdkAutoConstructList;
+import software.amazon.awssdk.core.util.SdkAutoConstructMap;
 import software.amazon.awssdk.protocols.core.PathMarshaller;
 import software.amazon.awssdk.utils.StringUtils;
 
@@ -70,6 +75,8 @@ public class MemberModel extends DocumentationModel {
 
     private String fluentEnumSetterMethodName;
 
+    private String existenceCheckMethodName;
+
     private String beanStyleGetterName;
 
     private String beanStyleSetterName;
@@ -88,6 +95,14 @@ public class MemberModel extends DocumentationModel {
 
     private boolean xmlAttribute;
 
+    private String deprecatedName;
+
+    private String fluentDeprecatedGetterMethodName;
+
+    private String fluentDeprecatedSetterMethodName;
+
+    private String deprecatedBeanStyleSetterMethodName;
+
     public String getName() {
         return name;
     }
@@ -247,6 +262,19 @@ public MemberModel withFluentEnumSetterMethodName(String fluentEnumSetterMethodN
         return this;
     }
 
+    public String getExistenceCheckMethodName() {
+        return existenceCheckMethodName;
+    }
+
+    public void setExistenceCheckMethodName(String existenceCheckMethodName) {
+        this.existenceCheckMethodName = existenceCheckMethodName;
+    }
+
+    public MemberModel withExistenceCheckMethodName(String existenceCheckMethodName) {
+        setExistenceCheckMethodName(existenceCheckMethodName);
+        return this;
+    }
+
     public ReturnTypeModel getGetterModel() {
         return getterModel;
     }
@@ -408,6 +436,12 @@ public String getGetterDocumentation() {
             }
         }
 
+        if (getAutoConstructClassIfExists().isPresent()) {
+            appendParagraph(docBuilder,
+                            "You can use {@link #%s()} to see if a value was sent in this field.",
+                            getExistenceCheckMethodName());
+        }
+
         String variableDesc = StringUtils.isNotBlank(documentation) ? documentation : defaultGetterParam().replace("%s", name);
 
         docBuilder.append("@return ")
@@ -417,6 +451,14 @@ public String getGetterDocumentation() {
         return docBuilder.toString();
     }
 
+    public String getDeprecatedGetterDocumentation() {
+        String getterDocumentation = getGetterDocumentation();
+        return getterDocumentation
+               + LF
+               + "@deprecated Use {@link #" + getFluentGetterMethodName() + "()}"
+               + LF;
+    }
+
     private boolean returnTypeIs(Class<?> clazz) {
         String returnType = this.getGetterModel().getReturnType();
         return returnType != null && returnType.startsWith(clazz.getName()); // Use startsWith in case it's parametrized
@@ -429,6 +471,17 @@ public String getFluentSetterDocumentation() {
                + getEnumDoc();
     }
 
+    public String getExistenceCheckDocumentation() {
+        return defaultExistenceCheck().replace("%s", name) + LF;
+    }
+
+    public String getDeprecatedSetterDocumentation() {
+        return getFluentSetterDocumentation()
+            + LF
+            + "@deprecated Use {@link #" + getFluentSetterMethodName() + "(" + setterModel.getSimpleType() + ")}"
+            + LF;
+    }
+
     public String getDefaultConsumerFluentSetterDocumentation() {
         return (StringUtils.isNotBlank(documentation) ? documentation : defaultSetter().replace("%s", name) + "\n")
                + LF
@@ -559,6 +612,19 @@ public MemberModel withXmlAttribtue(boolean xmlAttribtue) {
         return this;
     }
 
+    public String getDeprecatedName() {
+        return deprecatedName;
+    }
+
+    public void setDeprecatedName(String deprecatedName) {
+        this.deprecatedName = deprecatedName;
+    }
+
+    public MemberModel withDeprecatedName(String deprecatedName) {
+        this.deprecatedName = deprecatedName;
+        return this;
+    }
+
     @JsonIgnore
     public boolean hasBuilder() {
         return !(isSimple() || isList() || isMap());
@@ -613,4 +679,38 @@ private void appendParagraph(StringBuilder builder, String content, Object... co
                .append("</p>")
                .append(LF);
     }
+
+    public Optional<ClassName> getAutoConstructClassIfExists() {
+        if (isList()) {
+            return Optional.of(ClassName.get(SdkAutoConstructList.class));
+        } else if (isMap()) {
+            return Optional.of(ClassName.get(SdkAutoConstructMap.class));
+        }
+
+        return Optional.empty();
+    }
+
+    public void setDeprecatedFluentGetterMethodName(String fluentDeprecatedGetterMethodName) {
+        this.fluentDeprecatedGetterMethodName = fluentDeprecatedGetterMethodName;
+    }
+
+    public String getDeprecatedFluentGetterMethodName() {
+        return fluentDeprecatedGetterMethodName;
+    }
+
+    public void setDeprecatedFluentSetterMethodName(String fluentDeprecatedSetterMethodName) {
+        this.fluentDeprecatedSetterMethodName = fluentDeprecatedSetterMethodName;
+    }
+
+    public String getDeprecatedFluentSetterMethodName() {
+        return fluentDeprecatedSetterMethodName;
+    }
+
+    public String getDeprecatedBeanStyleSetterMethodName() {
+        return deprecatedBeanStyleSetterMethodName;
+    }
+
+    public void setDeprecatedBeanStyleSetterMethodName(String deprecatedBeanStyleSetterMethodName) {
+        this.deprecatedBeanStyleSetterMethodName = deprecatedBeanStyleSetterMethodName;
+    }
 }
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/Metadata.java b/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/Metadata.java
index f9a39d8157a2..4b3a563e7e65 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/Metadata.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/Metadata.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -519,6 +519,11 @@ public boolean isXmlProtocol() {
                protocol == Protocol.REST_XML;
     }
 
+    public boolean isQueryProtocol() {
+        return protocol == Protocol.EC2 ||
+               protocol == Protocol.QUERY;
+    }
+
     /**
      * @return True for RESTful protocols. False for all other protocols (RPC, Query, etc).
      */
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/OperationModel.java b/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/OperationModel.java
index 51121901e596..de862f089813 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/OperationModel.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/OperationModel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/ParameterHttpMapping.java b/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/ParameterHttpMapping.java
index e5e3b3caa007..d7558849477e 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/ParameterHttpMapping.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/ParameterHttpMapping.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/Protocol.java b/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/Protocol.java
index 03211290107d..9dff6efd810b 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/Protocol.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/Protocol.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/ReturnTypeModel.java b/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/ReturnTypeModel.java
index 90a9744c2f91..0fb9af1c491c 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/ReturnTypeModel.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/ReturnTypeModel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/ServiceExamples.java b/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/ServiceExamples.java
index cef2d1595ead..6d372049137f 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/ServiceExamples.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/ServiceExamples.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/ShapeMarshaller.java b/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/ShapeMarshaller.java
index 970b07acecb1..eae9a1b77758 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/ShapeMarshaller.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/ShapeMarshaller.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/ShapeModel.java b/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/ShapeModel.java
index a0ece88f1744..55070f2dfce6 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/ShapeModel.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/ShapeModel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -165,7 +165,7 @@ public MemberModel getPayloadMember() {
      */
     @JsonIgnore
     public List<MemberModel> getUnboundMembers() {
-        List<MemberModel> unboundMembers = new ArrayList<MemberModel>();
+        List<MemberModel> unboundMembers = new ArrayList<>();
         if (members != null) {
             for (MemberModel member : members) {
                 if (member.getHttp().getLocation() == null) {
@@ -227,7 +227,7 @@ public MemberModel getExplicitEventPayloadMember() {
      * If all members in shape have eventheader trait, then there is no payload
      */
     public boolean hasNoEventPayload() {
-        return members == null || members.stream().allMatch(m -> m.isEventHeader());
+        return members == null || members.stream().allMatch(MemberModel::isEventHeader);
     }
 
     public boolean isHasStreamingMember() {
@@ -350,7 +350,7 @@ public void setMembers(List<MemberModel> members) {
 
     public void addMember(MemberModel member) {
         if (this.members == null) {
-            this.members = new ArrayList<MemberModel>();
+            this.members = new ArrayList<>();
         }
         members.add(member);
     }
@@ -365,7 +365,7 @@ public void setEnums(List<EnumModel> enums) {
 
     public void addEnum(EnumModel enumModel) {
         if (this.enums == null) {
-            this.enums = new ArrayList<EnumModel>();
+            this.enums = new ArrayList<>();
         }
         this.enums.add(enumModel);
     }
@@ -403,7 +403,7 @@ public void setCustomization(ShapeCustomizationInfo customization) {
     }
 
     public Map<String, MemberModel> getMembersAsMap() {
-        Map<String, MemberModel> shapeMembers = new HashMap<String, MemberModel>();
+        Map<String, MemberModel> shapeMembers = new HashMap<>();
 
         // Creating a map of shape's members. This map is used below when
         // fetching the details of a member.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/ShapeType.java b/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/ShapeType.java
index 31d9b5b5a2ed..3c46182cbbd1 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/ShapeType.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/ShapeType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/ShapeUnmarshaller.java b/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/ShapeUnmarshaller.java
index 45bde7a1cccf..f6b061bee210 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/ShapeUnmarshaller.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/ShapeUnmarshaller.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/SimpleMethodFormModel.java b/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/SimpleMethodFormModel.java
index e8aa06f80722..bf207e890416 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/SimpleMethodFormModel.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/SimpleMethodFormModel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/VariableModel.java b/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/VariableModel.java
index 7edc68ee4550..13524f10d3c1 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/VariableModel.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/VariableModel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/customization/ArtificialResultWrapper.java b/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/customization/ArtificialResultWrapper.java
index 3518e50544cc..e8adab25b48c 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/customization/ArtificialResultWrapper.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/customization/ArtificialResultWrapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/customization/ShapeCustomizationInfo.java b/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/customization/ShapeCustomizationInfo.java
index 40893a21fdcb..b6d3950985b2 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/customization/ShapeCustomizationInfo.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/customization/ShapeCustomizationInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/model/service/Acceptor.java b/codegen/src/main/java/software/amazon/awssdk/codegen/model/service/Acceptor.java
index 9118e37f9edc..3b6e9815346f 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/model/service/Acceptor.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/model/service/Acceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/model/service/AuthType.java b/codegen/src/main/java/software/amazon/awssdk/codegen/model/service/AuthType.java
index fa525894bed2..4af92150dde0 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/model/service/AuthType.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/model/service/AuthType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/model/service/Authorizer.java b/codegen/src/main/java/software/amazon/awssdk/codegen/model/service/Authorizer.java
index d94042346f33..a62a4d032312 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/model/service/Authorizer.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/model/service/Authorizer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/model/service/EndpointTrait.java b/codegen/src/main/java/software/amazon/awssdk/codegen/model/service/EndpointTrait.java
index d4453cd97293..d80c999cd6c9 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/model/service/EndpointTrait.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/model/service/EndpointTrait.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/model/service/ErrorMap.java b/codegen/src/main/java/software/amazon/awssdk/codegen/model/service/ErrorMap.java
index b1bb5780fa00..fbbdbed09967 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/model/service/ErrorMap.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/model/service/ErrorMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/model/service/ErrorTrait.java b/codegen/src/main/java/software/amazon/awssdk/codegen/model/service/ErrorTrait.java
index 54d95f48f885..0a9b02f72c44 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/model/service/ErrorTrait.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/model/service/ErrorTrait.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/model/service/HostPrefixProcessor.java b/codegen/src/main/java/software/amazon/awssdk/codegen/model/service/HostPrefixProcessor.java
index cf527c7c27f1..40e29a6760c4 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/model/service/HostPrefixProcessor.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/model/service/HostPrefixProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/model/service/Http.java b/codegen/src/main/java/software/amazon/awssdk/codegen/model/service/Http.java
index f1b7de095052..521d51373574 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/model/service/Http.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/model/service/Http.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/model/service/Input.java b/codegen/src/main/java/software/amazon/awssdk/codegen/model/service/Input.java
index e9f184fbc614..f5210e05eb81 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/model/service/Input.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/model/service/Input.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/model/service/Location.java b/codegen/src/main/java/software/amazon/awssdk/codegen/model/service/Location.java
index 322f330877a6..fc29f2eb6444 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/model/service/Location.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/model/service/Location.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/model/service/MapKeyType.java b/codegen/src/main/java/software/amazon/awssdk/codegen/model/service/MapKeyType.java
index 8f7c77c331dd..789988d804be 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/model/service/MapKeyType.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/model/service/MapKeyType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/model/service/MapValueType.java b/codegen/src/main/java/software/amazon/awssdk/codegen/model/service/MapValueType.java
index 47c1f7f994fb..79c709714002 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/model/service/MapValueType.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/model/service/MapValueType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/model/service/Member.java b/codegen/src/main/java/software/amazon/awssdk/codegen/model/service/Member.java
index 5dd0b088fb0d..f8baf33f4676 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/model/service/Member.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/model/service/Member.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -61,6 +61,8 @@ public class Member {
 
     private boolean xmlAttribute;
 
+    private String deprecatedName;
+
     public String getShape() {
         return shape;
     }
@@ -212,4 +214,12 @@ public boolean isXmlAttribute() {
     public void setXmlAttribute(boolean xmlAttribute) {
         this.xmlAttribute = xmlAttribute;
     }
+
+    public void setDeprecatedName(String deprecatedName) {
+        this.deprecatedName = deprecatedName;
+    }
+
+    public String getDeprecatedName() {
+        return deprecatedName;
+    }
 }
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/model/service/Operation.java b/codegen/src/main/java/software/amazon/awssdk/codegen/model/service/Operation.java
index c773e383297c..5698841a7e1b 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/model/service/Operation.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/model/service/Operation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/model/service/Output.java b/codegen/src/main/java/software/amazon/awssdk/codegen/model/service/Output.java
index 7571af828d21..df2b312e465c 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/model/service/Output.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/model/service/Output.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/model/service/PaginatorDefinition.java b/codegen/src/main/java/software/amazon/awssdk/codegen/model/service/PaginatorDefinition.java
index 608fe49eee3c..f48b1209cc9a 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/model/service/PaginatorDefinition.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/model/service/PaginatorDefinition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/model/service/Paginators.java b/codegen/src/main/java/software/amazon/awssdk/codegen/model/service/Paginators.java
index 733c7ce1dd47..4fce28717e90 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/model/service/Paginators.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/model/service/Paginators.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/model/service/ServiceMetadata.java b/codegen/src/main/java/software/amazon/awssdk/codegen/model/service/ServiceMetadata.java
index 18abd072b5ac..01dfb12a27fa 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/model/service/ServiceMetadata.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/model/service/ServiceMetadata.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/model/service/ServiceModel.java b/codegen/src/main/java/software/amazon/awssdk/codegen/model/service/ServiceModel.java
index 1e638801a56e..d09375e4437e 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/model/service/ServiceModel.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/model/service/ServiceModel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/model/service/Shape.java b/codegen/src/main/java/software/amazon/awssdk/codegen/model/service/Shape.java
index 532645f3ca4d..6b1128d46335 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/model/service/Shape.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/model/service/Shape.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/model/service/ShapeType.java b/codegen/src/main/java/software/amazon/awssdk/codegen/model/service/ShapeType.java
index d4e3ffd237cb..1c707b73e193 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/model/service/ShapeType.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/model/service/ShapeType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/model/service/WaiterDefinition.java b/codegen/src/main/java/software/amazon/awssdk/codegen/model/service/WaiterDefinition.java
index f99626444303..c55ecbc7b31b 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/model/service/WaiterDefinition.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/model/service/WaiterDefinition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/model/service/Waiters.java b/codegen/src/main/java/software/amazon/awssdk/codegen/model/service/Waiters.java
index ac3f9bfb5e17..efb63b52efa8 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/model/service/Waiters.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/model/service/Waiters.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/model/service/XmlNamespace.java b/codegen/src/main/java/software/amazon/awssdk/codegen/model/service/XmlNamespace.java
index 962d59eb8de3..7b50141d4a93 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/model/service/XmlNamespace.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/model/service/XmlNamespace.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/naming/DefaultNamingStrategy.java b/codegen/src/main/java/software/amazon/awssdk/codegen/naming/DefaultNamingStrategy.java
index 6d951af11d96..1367f5428f85 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/naming/DefaultNamingStrategy.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/naming/DefaultNamingStrategy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -23,6 +23,8 @@
 import static software.amazon.awssdk.codegen.internal.Constant.REQUEST_CLASS_SUFFIX;
 import static software.amazon.awssdk.codegen.internal.Constant.RESPONSE_CLASS_SUFFIX;
 import static software.amazon.awssdk.codegen.internal.Utils.unCapitalize;
+import static software.amazon.awssdk.utils.internal.CodegenNamingUtils.pascalCase;
+import static software.amazon.awssdk.utils.internal.CodegenNamingUtils.splitOnWordBoundaries;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -183,10 +185,6 @@ private String screamCase(String word) {
         return Stream.of(splitOnWordBoundaries(word)).map(s -> s.toUpperCase(Locale.US)).collect(joining("_"));
     }
 
-    private String pascalCase(String word) {
-        return Stream.of(splitOnWordBoundaries(word)).map(StringUtils::lowerCase).map(Utils::capitalize).collect(joining());
-    }
-
     private String getCustomizedPackageName(String serviceName, String defaultPattern) {
         return String.format(defaultPattern, StringUtils.lowerCase(serviceName));
     }
@@ -292,6 +290,13 @@ public String getFluentEnumGetterMethodName(String memberName, Shape parentShape
         return getterMethodName;
     }
 
+    @Override
+    public String getExistenceCheckMethodName(String memberName, Shape parentShape) {
+        String existenceCheckMethodName = Utils.unCapitalize(memberName);
+        existenceCheckMethodName = rewriteInvalidMemberName(existenceCheckMethodName, parentShape);
+        return String.format("has%s", Utils.capitalize(existenceCheckMethodName));
+    }
+
     @Override
     public String getBeanStyleGetterMethodName(String memberName, Shape parentShape, Shape c2jShape) {
         String fluentGetterMethodName = getFluentGetterMethodName(memberName, parentShape, c2jShape);
@@ -350,31 +355,4 @@ private boolean isDisallowedNameForShape(String name, Shape parentShape) {
             return RESERVED_STRUCTURE_METHOD_NAMES.contains(name);
         }
     }
-
-    private String[] splitOnWordBoundaries(String toSplit) {
-        String result = toSplit;
-
-        // All non-alphanumeric characters are spaces
-        result = result.replaceAll("[^A-Za-z0-9]+", " "); // acm-success -> "acm success"
-
-        // If a number has a standalone v in front of it, separate it out (version).
-        result = result.replaceAll("([^a-z]{2,})v([0-9]+)", "$1 v$2 ") // TESTv4 -> "TEST v4 "
-                       .replaceAll("([^A-Z]{2,})V([0-9]+)", "$1 V$2 "); // TestV4 -> "Test V4 "
-
-        // Add a space between camelCased words
-        result = String.join(" ", result.split("(?<=[a-z])(?=[A-Z]([a-zA-Z]|[0-9]))")); // AcmSuccess -> "Acm Success"
-
-        // Add a space after acronyms
-        result = result.replaceAll("([A-Z]+)([A-Z][a-z])", "$1 $2"); // ACMSuccess -> "ACM Success"
-
-        // Add space after a number in the middle of a word
-        result = result.replaceAll("([0-9])([a-zA-Z])", "$1 $2"); // s3ec2 -> "s3 ec2"
-
-        // Remove extra spaces - multiple consecutive ones or those and the beginning/end of words
-        result = result.replaceAll(" +", " ") // "Foo  Bar" -> "Foo Bar"
-                       .trim(); // " Foo " -> Foo
-
-        return result.split(" ");
-    }
-
 }
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/naming/NamingStrategy.java b/codegen/src/main/java/software/amazon/awssdk/codegen/naming/NamingStrategy.java
index 039bac59f91b..e7da7fbe9a1a 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/naming/NamingStrategy.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/naming/NamingStrategy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -146,4 +146,13 @@ public interface NamingStrategy {
      * @return Name of field for {@link SdkField} pojo.
      */
     String getSdkFieldFieldName(MemberModel memberModel);
+
+    /**
+     * Names a method that would check for existence of the member in the response.
+     *
+     * @param memberName The member name to get the method name for.
+     * @param parentShape The shape containing the member.
+     * @return Name of an existence check method.
+     */
+    String getExistenceCheckMethodName(String memberName, Shape parentShape);
 }
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/ClassSpec.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/ClassSpec.java
index b63081cc0c5c..a8265f0dc7f1 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/ClassSpec.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/ClassSpec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/PoetCollectors.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/PoetCollectors.java
index 7b95d6e155d6..9cf82634e873 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/PoetCollectors.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/PoetCollectors.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -24,7 +24,8 @@
  * A set of {@link Collector} implementations, similar to {@link Collectors}, but for poet types.
  */
 public final class PoetCollectors {
-    private PoetCollectors() {}
+    private PoetCollectors() {
+    }
 
     /**
      * Join a stream of code blocks into one code block.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/PoetExtensions.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/PoetExtensions.java
index 0d870a1fce7d..94d0831cd347 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/PoetExtensions.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/PoetExtensions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/PoetUtils.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/PoetUtils.java
index 25f0b8c7b130..db57074fc515 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/PoetUtils.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/PoetUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/StaticImport.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/StaticImport.java
index 0bc5042685f5..a023ff6d23cc 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/StaticImport.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/StaticImport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/builder/AsyncClientBuilderClass.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/builder/AsyncClientBuilderClass.java
index 8eb22f866635..4686ea235649 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/builder/AsyncClientBuilderClass.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/builder/AsyncClientBuilderClass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/builder/AsyncClientBuilderInterface.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/builder/AsyncClientBuilderInterface.java
index 9afff1b10d83..5348972b5df9 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/builder/AsyncClientBuilderInterface.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/builder/AsyncClientBuilderInterface.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/builder/BaseClientBuilderClass.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/builder/BaseClientBuilderClass.java
index 250330934c0c..c94af0736de7 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/builder/BaseClientBuilderClass.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/builder/BaseClientBuilderClass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -18,14 +18,16 @@
 import static javax.lang.model.element.Modifier.FINAL;
 import static javax.lang.model.element.Modifier.PRIVATE;
 import static javax.lang.model.element.Modifier.PROTECTED;
-import static javax.lang.model.element.Modifier.STATIC;
 
 import com.squareup.javapoet.ClassName;
 import com.squareup.javapoet.CodeBlock;
 import com.squareup.javapoet.FieldSpec;
 import com.squareup.javapoet.MethodSpec;
+import com.squareup.javapoet.ParameterizedTypeName;
+import com.squareup.javapoet.TypeName;
 import com.squareup.javapoet.TypeSpec;
 import com.squareup.javapoet.TypeVariableName;
+import java.util.Collections;
 import java.util.List;
 import javax.lang.model.element.Modifier;
 import software.amazon.awssdk.annotations.SdkInternalApi;
@@ -40,12 +42,12 @@
 import software.amazon.awssdk.core.client.config.SdkClientConfiguration;
 import software.amazon.awssdk.core.client.config.SdkClientOption;
 import software.amazon.awssdk.core.endpointdiscovery.providers.DefaultEndpointDiscoveryProviderChain;
-import software.amazon.awssdk.core.endpointdiscovery.providers.EndpointDiscoveryProviderChain;
 import software.amazon.awssdk.core.interceptor.ClasspathInterceptorChainFactory;
 import software.amazon.awssdk.core.interceptor.ExecutionInterceptor;
 import software.amazon.awssdk.core.signer.Signer;
 import software.amazon.awssdk.http.Protocol;
 import software.amazon.awssdk.http.SdkHttpConfigurationOption;
+import software.amazon.awssdk.protocols.query.interceptor.QueryParametersToBodyInterceptor;
 import software.amazon.awssdk.utils.AttributeMap;
 import software.amazon.awssdk.utils.CollectionUtils;
 import software.amazon.awssdk.utils.StringUtils;
@@ -77,11 +79,6 @@ public TypeSpec poetSpec() {
                                      ClassName.get(basePackage, model.getMetadata().getAsyncBuilder()));
 
         if (model.getEndpointOperation().isPresent()) {
-            builder.addField(FieldSpec.builder(EndpointDiscoveryProviderChain.class, "CHAIN")
-                                      .addModifiers(PRIVATE, STATIC, FINAL)
-                                      .initializer("new $T()", DefaultEndpointDiscoveryProviderChain.class)
-                                      .build());
-
             builder.addField(FieldSpec.builder(boolean.class, "endpointDiscoveryEnabled")
                                       .addModifiers(PROTECTED)
                                       .initializer("false")
@@ -154,10 +151,12 @@ private MethodSpec mergeServiceDefaultsMethod() {
                                                         + ".CRC32_FROM_COMPRESSED_DATA_ENABLED, $L)",
                                                         SdkClientOption.class, crc32FromCompressedDataEnabled);
 
-        if (StringUtils.isNotBlank(model.getCustomizationConfig().getCustomRetryPolicy())) {
-            builder.addCode(".option($T.RETRY_POLICY, $T.defaultPolicy())", SdkClientOption.class,
-                            PoetUtils.classNameFromFqcn(model.getCustomizationConfig().getCustomRetryPolicy()));
+        String clientConfigClassName = model.getCustomizationConfig().getServiceSpecificClientConfigClass();
+        if (StringUtils.isNotBlank(clientConfigClassName)) {
+            builder.addCode(".option($T.SERVICE_CONFIGURATION, $T.builder().build())",
+                            SdkClientOption.class, ClassName.bestGuess(clientConfigClassName));
         }
+
         builder.addCode(");");
         return builder.build();
     }
@@ -170,28 +169,65 @@ private MethodSpec finalizeServiceConfigurationMethod() {
                          .addAnnotation(Override.class)
                          .addModifiers(PROTECTED, FINAL)
                          .returns(SdkClientConfiguration.class)
-                         .addParameter(SdkClientConfiguration.class, "config")
-                         .addCode("$1T interceptorFactory = new $1T();\n", ClasspathInterceptorChainFactory.class)
-                         .addCode("$T<$T> interceptors = interceptorFactory.getInterceptors($S);\n",
-                                  List.class, ExecutionInterceptor.class, requestHandlerPath)
-                         .addCode("interceptors = $T.mergeLists(interceptors, config.option($T.EXECUTION_INTERCEPTORS));\n",
-                                  CollectionUtils.class, SdkClientOption.class);
+                         .addParameter(SdkClientConfiguration.class, "config");
+
+        // Initialize configuration values
+
+        builder.addCode("$1T interceptorFactory = new $1T();\n", ClasspathInterceptorChainFactory.class)
+               .addCode("$T<$T> interceptors = interceptorFactory.getInterceptors($S);\n",
+                        List.class, ExecutionInterceptor.class, requestHandlerPath)
+               .addCode("interceptors = $T.mergeLists(interceptors, config.option($T.EXECUTION_INTERCEPTORS));\n",
+                        CollectionUtils.class, SdkClientOption.class);
+
+        if (model.getMetadata().isQueryProtocol()) {
+            TypeName listType = ParameterizedTypeName.get(List.class, ExecutionInterceptor.class);
+            builder.addStatement("$T protocolInterceptors = $T.singletonList(new $T())",
+                                 listType,
+                                 Collections.class,
+                                 QueryParametersToBodyInterceptor.class);
+            builder.addStatement("interceptors = $T.mergeLists(interceptors, protocolInterceptors)",
+                                 CollectionUtils.class);
+        }
 
         if (model.getEndpointOperation().isPresent()) {
             builder.beginControlFlow("if (!endpointDiscoveryEnabled)")
-                   .addStatement("endpointDiscoveryEnabled = CHAIN.resolveEndpointDiscovery()")
+                   .addStatement("$1T chain = new $1T(config)", DefaultEndpointDiscoveryProviderChain.class)
+                   .addStatement("endpointDiscoveryEnabled = chain.resolveEndpointDiscovery()")
                    .endControlFlow();
+        }
 
-            builder.addCode("return config.toBuilder()\n" +
-                                  "       .option($1T.EXECUTION_INTERCEPTORS, interceptors)\n" +
-                                  "       .option($1T.ENDPOINT_DISCOVERY_ENABLED, endpointDiscoveryEnabled)\n" +
-                                  "       .build();", SdkClientOption.class);
-        } else {
-            builder.addCode("return config.toBuilder()\n" +
-                                  "       .option($T.EXECUTION_INTERCEPTORS, interceptors)\n" +
-                                  "       .build();", SdkClientOption.class);
+        String clientConfigClassName = model.getCustomizationConfig().getServiceSpecificClientConfigClass();
+        if (StringUtils.isNotBlank(clientConfigClassName)) {
+            ClassName clientConfigClass = ClassName.bestGuess(clientConfigClassName);
+            builder.addCode("$1T.Builder c = (($1T) config.option($2T.SERVICE_CONFIGURATION)).toBuilder();" +
+                            "c.profileFile(c.profileFile() != null ? c.profileFile() : config.option($2T.PROFILE_FILE))" +
+                            " .profileName(c.profileName() != null ? c.profileName() : config.option($2T.PROFILE_NAME));",
+                            clientConfigClass, SdkClientOption.class);
         }
 
+        // Update configuration
+
+        builder.addCode("return config.toBuilder()\n");
+
+        if (model.getEndpointOperation().isPresent()) {
+            builder.addCode(".option($T.ENDPOINT_DISCOVERY_ENABLED, endpointDiscoveryEnabled)\n",
+                            SdkClientOption.class);
+        }
+
+        builder.addCode(".option($1T.EXECUTION_INTERCEPTORS, interceptors)", SdkClientOption.class);
+
+        if (StringUtils.isNotBlank(model.getCustomizationConfig().getCustomRetryPolicy())) {
+            builder.addCode(".option($1T.RETRY_POLICY, $2T.resolveRetryPolicy(config))",
+                            SdkClientOption.class,
+                            PoetUtils.classNameFromFqcn(model.getCustomizationConfig().getCustomRetryPolicy()));
+        }
+
+        if (StringUtils.isNotBlank(clientConfigClassName)) {
+            builder.addCode(".option($T.SERVICE_CONFIGURATION, c.build())", SdkClientOption.class);
+        }
+
+        builder.addCode(".build();");
+
         return builder.build();
     }
 
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/builder/BaseClientBuilderInterface.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/builder/BaseClientBuilderInterface.java
index 64af5f3292b2..eca3edac13b0 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/builder/BaseClientBuilderInterface.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/builder/BaseClientBuilderInterface.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/builder/SyncClientBuilderClass.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/builder/SyncClientBuilderClass.java
index 41bb82083d73..323415e20241 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/builder/SyncClientBuilderClass.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/builder/SyncClientBuilderClass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/builder/SyncClientBuilderInterface.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/builder/SyncClientBuilderInterface.java
index 9578e22b53c6..951c1147d0d2 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/builder/SyncClientBuilderInterface.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/builder/SyncClientBuilderInterface.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/AsyncClientClass.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/AsyncClientClass.java
index 19ce5f4eb9b2..b7045285fd95 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/AsyncClientClass.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/AsyncClientClass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -194,9 +194,9 @@ protected MethodSpec.Builder operationBody(MethodSpec.Builder builder, Operation
                .beginControlFlow("try")
                .addCode(ClientClassUtils.callApplySignerOverrideMethod(opModel))
                .addCode(ClientClassUtils.addEndpointTraitCode(opModel))
-               .addCode(protocolSpec.responseHandler(model, opModel))
-               .addCode(protocolSpec.errorResponseHandler(opModel))
-               .addCode(eventToByteBufferPublisher(opModel));
+               .addCode(protocolSpec.responseHandler(model, opModel));
+        protocolSpec.errorResponseHandler(opModel).ifPresent(builder::addCode);
+        builder.addCode(eventToByteBufferPublisher(opModel));
 
         if (opModel.getEndpointDiscovery() != null) {
             builder.addStatement("$T cachedEndpoint = null", URI.class);
@@ -298,7 +298,7 @@ private MethodSpec utilitiesMethod() {
                          .addAnnotation(Override.class)
                          .addStatement("return $T.create($L)",
                                        returnType,
-                                       config.getCreateMethodParams().stream().collect(Collectors.joining(",")))
+                                       String.join(",", config.getCreateMethodParams()))
                          .build();
     }
 }
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/AsyncClientInterface.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/AsyncClientInterface.java
index 40a9a0bebac4..d9eeabfad3f9 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/AsyncClientInterface.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/AsyncClientInterface.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/ClientClassUtils.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/ClientClassUtils.java
index 1b4878aa798d..ac354fdad9c1 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/ClientClassUtils.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/ClientClassUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/ClientSimpleMethodsIntegrationTests.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/ClientSimpleMethodsIntegrationTests.java
index d90f7ee8927e..75cf6ff0c546 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/ClientSimpleMethodsIntegrationTests.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/ClientSimpleMethodsIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -49,7 +49,7 @@ public TypeSpec poetSpec() {
                                                                .build())
                                             .addMethod(setup());
 
-        model.simpleMethodsRequiringTesting().stream().map(o -> simpleMethodsTest(o)).forEach(builder::addMethod);
+        model.simpleMethodsRequiringTesting().stream().map(this::simpleMethodsTest).forEach(builder::addMethod);
 
         return builder.build();
     }
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/SyncClientClass.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/SyncClientClass.java
index edff7d2dc241..cd26f0fc0a5b 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/SyncClientClass.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/SyncClientClass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -167,8 +167,9 @@ private List<MethodSpec> operationMethodSpecs(OperationModel opModel) {
                                                        .addAnnotation(Override.class)
                                                        .addCode(ClientClassUtils.callApplySignerOverrideMethod(opModel))
                                                        .addCode(ClientClassUtils.addEndpointTraitCode(opModel))
-                                                       .addCode(protocolSpec.responseHandler(model, opModel))
-                                                       .addCode(protocolSpec.errorResponseHandler(opModel));
+                                                       .addCode(protocolSpec.responseHandler(model, opModel));
+
+        protocolSpec.errorResponseHandler(opModel).ifPresent(method::addCode);
 
         if (opModel.getEndpointDiscovery() != null) {
             method.addStatement("$T cachedEndpoint = null", URI.class);
@@ -234,7 +235,7 @@ private MethodSpec utilitiesMethod() {
                          .addAnnotation(Override.class)
                          .addStatement("return $T.create($L)",
                                        returnType,
-                                       config.getCreateMethodParams().stream().collect(Collectors.joining(",")))
+                                       String.join(",", config.getCreateMethodParams()))
                          .build();
     }
 
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/SyncClientInterface.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/SyncClientInterface.java
index 8014b4dc45c3..33ef274073d5 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/SyncClientInterface.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/SyncClientInterface.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/specs/Ec2ProtocolSpec.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/specs/Ec2ProtocolSpec.java
index 1fdd6eb16270..e595f6739719 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/specs/Ec2ProtocolSpec.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/specs/Ec2ProtocolSpec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/specs/JsonProtocolSpec.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/specs/JsonProtocolSpec.java
index ce106d81ece4..83e01de1c01f 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/specs/JsonProtocolSpec.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/specs/JsonProtocolSpec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -143,14 +143,14 @@ public CodeBlock responseHandler(IntermediateModel model, OperationModel opModel
     }
 
     @Override
-    public CodeBlock errorResponseHandler(OperationModel opModel) {
+    public Optional<CodeBlock> errorResponseHandler(OperationModel opModel) {
         String protocolFactory = protocolFactoryLiteral(model, opModel);
 
-        return CodeBlock
-            .builder()
-            .add("\n\n$T<$T> errorResponseHandler = createErrorResponseHandler($L, operationMetadata);",
-                 HttpResponseHandler.class, AwsServiceException.class, protocolFactory)
-            .build();
+        return Optional.of(
+            CodeBlock.builder()
+                     .add("\n\n$T<$T> errorResponseHandler = createErrorResponseHandler($L, operationMetadata);",
+                          HttpResponseHandler.class, AwsServiceException.class, protocolFactory)
+                     .build());
     }
 
     @Override
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/specs/ProtocolSpec.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/specs/ProtocolSpec.java
index 2904eee87b61..38ba7afc1f8f 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/specs/ProtocolSpec.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/specs/ProtocolSpec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -46,7 +46,7 @@ public interface ProtocolSpec {
 
     CodeBlock responseHandler(IntermediateModel model, OperationModel opModel);
 
-    CodeBlock errorResponseHandler(OperationModel opModel);
+    Optional<CodeBlock> errorResponseHandler(OperationModel opModel);
 
     CodeBlock executionHandler(OperationModel opModel);
 
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/specs/QueryProtocolSpec.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/specs/QueryProtocolSpec.java
index 2e6e817d1fb2..cd6b0b2dc94d 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/specs/QueryProtocolSpec.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/specs/QueryProtocolSpec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -35,7 +35,7 @@
 public class QueryProtocolSpec implements ProtocolSpec {
 
     protected final PoetExtensions poetExtensions;
-    private final IntermediateModel intermediateModel;
+    protected final IntermediateModel intermediateModel;
 
     public QueryProtocolSpec(IntermediateModel intermediateModel, PoetExtensions poetExtensions) {
         this.intermediateModel = intermediateModel;
@@ -84,10 +84,12 @@ public CodeBlock responseHandler(IntermediateModel model,
     }
 
     @Override
-    public CodeBlock errorResponseHandler(OperationModel opModel) {
-        return CodeBlock.builder().add("\n\n$T errorResponseHandler = protocolFactory.createErrorResponseHandler();",
-                                       ParameterizedTypeName.get(HttpResponseHandler.class, AwsServiceException.class))
-                        .build();
+    public Optional<CodeBlock> errorResponseHandler(OperationModel opModel) {
+        return Optional.of(
+            CodeBlock.builder()
+                     .add("\n\n$T errorResponseHandler = protocolFactory.createErrorResponseHandler();",
+                          ParameterizedTypeName.get(HttpResponseHandler.class, AwsServiceException.class))
+                     .build());
     }
 
     @Override
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/specs/XmlProtocolSpec.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/specs/XmlProtocolSpec.java
index 436253f91f6f..55beb7078878 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/specs/XmlProtocolSpec.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/specs/XmlProtocolSpec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -17,6 +17,9 @@
 
 import com.squareup.javapoet.ClassName;
 import com.squareup.javapoet.CodeBlock;
+import com.squareup.javapoet.ParameterizedTypeName;
+import com.squareup.javapoet.TypeName;
+import java.util.Optional;
 import software.amazon.awssdk.codegen.model.intermediate.IntermediateModel;
 import software.amazon.awssdk.codegen.model.intermediate.OperationModel;
 import software.amazon.awssdk.codegen.poet.PoetExtensions;
@@ -49,6 +52,29 @@ protected Class<?> protocolFactoryClass() {
     @Override
     public CodeBlock responseHandler(IntermediateModel model,
                                      OperationModel opModel) {
+
+        if (opModel.hasStreamingOutput()) {
+            return streamingResponseHandler(opModel);
+        }
+
+        ClassName responseType = poetExtensions.getModelClass(opModel.getReturnType().getReturnType());
+
+        TypeName handlerType = ParameterizedTypeName.get(
+            ClassName.get(HttpResponseHandler.class),
+            ParameterizedTypeName.get(ClassName.get(software.amazon.awssdk.core.Response.class), responseType));
+
+        return CodeBlock.builder()
+                        .addStatement("\n\n$T responseHandler = protocolFactory.createCombinedResponseHandler"
+                                      + "($T::builder,"
+                                      + "new $T().withHasStreamingSuccessResponse($L))",
+                                      handlerType,
+                                      responseType,
+                                      XmlOperationMetadata.class,
+                                      opModel.hasStreamingOutput())
+                        .build();
+    }
+
+    private CodeBlock streamingResponseHandler(OperationModel opModel) {
         ClassName responseType = poetExtensions.getModelClass(opModel.getReturnType().getReturnType());
 
         return CodeBlock.builder()
@@ -62,4 +88,92 @@ public CodeBlock responseHandler(IntermediateModel model,
                         .build();
     }
 
+    @Override
+    public Optional<CodeBlock> errorResponseHandler(OperationModel opModel) {
+        return opModel.hasStreamingOutput() ? streamingErrorResponseHandler(opModel) : Optional.empty();
+    }
+
+    private Optional<CodeBlock> streamingErrorResponseHandler(OperationModel opModel) {
+        return super.errorResponseHandler(opModel);
+    }
+
+    @Override
+    public CodeBlock executionHandler(OperationModel opModel) {
+        if (opModel.hasStreamingOutput()) {
+            return streamingExecutionHandler(opModel);
+        }
+
+        TypeName responseType = poetExtensions.getModelClass(opModel.getReturnType().getReturnType());
+        ClassName requestType = poetExtensions.getModelClass(opModel.getInput().getVariableType());
+        ClassName marshaller = poetExtensions.getTransformClass(opModel.getInputShape().getShapeName() + "Marshaller");
+        CodeBlock.Builder codeBlock = CodeBlock
+            .builder()
+            .add("\n\nreturn clientHandler.execute(new $T<$T, $T>()" +
+                 ".withOperationName(\"$N\")\n" +
+                 ".withCombinedResponseHandler($N)" +
+                 hostPrefixExpression(opModel) +
+                 discoveredEndpoint(opModel) +
+                 ".withInput($L)",
+                 software.amazon.awssdk.core.client.handler.ClientExecutionParams.class,
+                 requestType,
+                 responseType,
+                 opModel.getOperationName(),
+                 "responseHandler",
+                 opModel.getInput().getVariableName());
+        if (opModel.hasStreamingInput()) {
+            return codeBlock.add(".withRequestBody(requestBody)")
+                            .add(".withMarshaller($L));", syncStreamingMarshaller(intermediateModel, opModel, marshaller))
+                            .build();
+        }
+        return codeBlock.add(".withMarshaller(new $T(protocolFactory)) $L);", marshaller,
+                             opModel.hasStreamingOutput() ? ", responseTransformer" : "").build();
+    }
+
+    private CodeBlock streamingExecutionHandler(OperationModel opModel) {
+        return super.executionHandler(opModel);
+    }
+
+    @Override
+    public CodeBlock asyncExecutionHandler(IntermediateModel intermediateModel, OperationModel opModel) {
+        if (opModel.hasStreamingOutput()) {
+            return asyncStreamingExecutionHandler(intermediateModel, opModel);
+        }
+
+        ClassName pojoResponseType = poetExtensions.getModelClass(opModel.getReturnType().getReturnType());
+        ClassName requestType = poetExtensions.getModelClass(opModel.getInput().getVariableType());
+        ClassName marshaller = poetExtensions.getRequestTransformClass(opModel.getInputShape().getShapeName() + "Marshaller");
+
+        String asyncRequestBody = opModel.hasStreamingInput() ? ".withAsyncRequestBody(requestBody)"
+            : "";
+        TypeName executeFutureValueType = executeFutureValueType(opModel, poetExtensions);
+        CodeBlock.Builder builder =
+            CodeBlock.builder().add("\n\n$T<$T> executeFuture = clientHandler.execute(new $T<$T, $T>()"
+                                    + "\n" +
+                                    ".withOperationName(\"$N\")\n" +
+                                    ".withMarshaller($L)" +
+                                    ".withCombinedResponseHandler($N)" +
+                                    hostPrefixExpression(opModel) +
+                                    asyncRequestBody +
+                                    ".withInput($L) $L);",
+                                    java.util.concurrent.CompletableFuture.class,
+                                    executeFutureValueType,
+                                    software.amazon.awssdk.core.client.handler.ClientExecutionParams.class,
+                                    requestType,
+                                    pojoResponseType,
+                                    opModel.getOperationName(),
+                                    asyncMarshaller(intermediateModel, opModel, marshaller, "protocolFactory"),
+                                    "responseHandler",
+                                    opModel.getInput().getVariableName(),
+                                    opModel.hasStreamingOutput() ? ", asyncResponseTransformer" : "");
+
+        if (opModel.hasStreamingOutput()) {
+            builder.add("executeFuture$L;", streamingOutputWhenComplete("asyncResponseTransformer"));
+        }
+        builder.addStatement("return executeFuture");
+        return builder.build();
+    }
+
+    private CodeBlock asyncStreamingExecutionHandler(IntermediateModel intermediateModel, OperationModel opModel) {
+        return super.asyncExecutionHandler(intermediateModel, opModel);
+    }
 }
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/common/EnumClass.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/common/EnumClass.java
index ac389e514344..ca70418ae2bb 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/common/EnumClass.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/common/EnumClass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/endpointdiscovery/EndpointDiscoveryAsyncCacheLoaderGenerator.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/endpointdiscovery/EndpointDiscoveryAsyncCacheLoaderGenerator.java
index 80b23f922f8c..2ebf9a991d4d 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/endpointdiscovery/EndpointDiscoveryAsyncCacheLoaderGenerator.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/endpointdiscovery/EndpointDiscoveryAsyncCacheLoaderGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/endpointdiscovery/EndpointDiscoveryCacheLoaderGenerator.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/endpointdiscovery/EndpointDiscoveryCacheLoaderGenerator.java
index 2ab5f7e9a611..5661979673c5 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/endpointdiscovery/EndpointDiscoveryCacheLoaderGenerator.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/endpointdiscovery/EndpointDiscoveryCacheLoaderGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/eventstream/EventStreamResponseHandlerBuilderImplSpec.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/eventstream/EventStreamResponseHandlerBuilderImplSpec.java
index fc6fcab7e5eb..d48affea50b2 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/eventstream/EventStreamResponseHandlerBuilderImplSpec.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/eventstream/EventStreamResponseHandlerBuilderImplSpec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/eventstream/EventStreamResponseHandlerBuilderInterfaceSpec.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/eventstream/EventStreamResponseHandlerBuilderInterfaceSpec.java
index aef3c47d85e6..efd2622d713e 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/eventstream/EventStreamResponseHandlerBuilderInterfaceSpec.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/eventstream/EventStreamResponseHandlerBuilderInterfaceSpec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/eventstream/EventStreamResponseHandlerSpec.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/eventstream/EventStreamResponseHandlerSpec.java
index 815bda5b316b..0ffc1ef4071c 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/eventstream/EventStreamResponseHandlerSpec.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/eventstream/EventStreamResponseHandlerSpec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/eventstream/EventStreamUtils.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/eventstream/EventStreamUtils.java
index 462c49b15ca4..cbd1489bfde4 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/eventstream/EventStreamUtils.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/eventstream/EventStreamUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -149,9 +149,7 @@ public static boolean isRequestEvent(IntermediateModel model, ShapeModel eventSh
             ShapeModel eventStreamShape = getBaseEventStreamShape(model, eventShape);
             return model.getOperations().values()
                         .stream()
-                        .filter(o -> doesShapeContainsEventStream(o.getInputShape(), eventStreamShape))
-                        .findAny()
-                        .isPresent();
+                        .anyMatch(o -> doesShapeContainsEventStream(o.getInputShape(), eventStreamShape));
         } catch (IllegalStateException e) {
             return false;
         }
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/eventstream/EventStreamVisitorBuilderImplSpec.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/eventstream/EventStreamVisitorBuilderImplSpec.java
index 7fa91e936554..f56e293bcf72 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/eventstream/EventStreamVisitorBuilderImplSpec.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/eventstream/EventStreamVisitorBuilderImplSpec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/eventstream/EventStreamVisitorBuilderInterfaceSpec.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/eventstream/EventStreamVisitorBuilderInterfaceSpec.java
index 7222c1c41799..ff40c110ee32 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/eventstream/EventStreamVisitorBuilderInterfaceSpec.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/eventstream/EventStreamVisitorBuilderInterfaceSpec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/eventstream/EventStreamVisitorInterfaceSpec.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/eventstream/EventStreamVisitorInterfaceSpec.java
index 27dfa3b875c7..9eaba0c50b15 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/eventstream/EventStreamVisitorInterfaceSpec.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/eventstream/EventStreamVisitorInterfaceSpec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/AbstractMemberSetters.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/AbstractMemberSetters.java
index f7f0338a0dea..9872c27d1114 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/AbstractMemberSetters.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/AbstractMemberSetters.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -73,6 +73,10 @@ protected MethodSpec.Builder fluentSetterBuilder(TypeName returnType) {
         return fluentSetterBuilder(memberAsParameter(), returnType);
     }
 
+    protected MethodSpec.Builder fluentSetterBuilder(String methodName, TypeName returnType) {
+        return fluentSetterBuilder(methodName, memberAsParameter(), returnType);
+    }
+
     protected MethodSpec.Builder fluentSetterBuilder(ParameterSpec setterParam, TypeName returnType) {
         return fluentSetterBuilder(memberModel().getFluentSetterMethodName(), setterParam, returnType);
     }
@@ -86,11 +90,15 @@ protected MethodSpec.Builder fluentSetterBuilder(String methodName, ParameterSpe
     }
 
     protected MethodSpec.Builder beanStyleSetterBuilder() {
-        return beanStyleSetterBuilder(memberAsBeanStyleParameter());
+        return beanStyleSetterBuilder(memberAsBeanStyleParameter(), memberModel().getBeanStyleSetterMethodName());
     }
 
-    protected MethodSpec.Builder beanStyleSetterBuilder(ParameterSpec setterParam) {
-        return MethodSpec.methodBuilder(memberModel().getBeanStyleSetterMethodName())
+    protected MethodSpec.Builder deprecatedBeanStyleSetterBuilder() {
+        return beanStyleSetterBuilder(memberAsBeanStyleParameter(), memberModel().getDeprecatedBeanStyleSetterMethodName());
+    }
+
+    protected MethodSpec.Builder beanStyleSetterBuilder(ParameterSpec setterParam, String methodName) {
+        return MethodSpec.methodBuilder(methodName)
                 .addParameter(setterParam)
                 .addModifiers(Modifier.PUBLIC, Modifier.FINAL);
     }
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/AccessorsFactory.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/AccessorsFactory.java
index eeab96f0a120..0b5a2b13795d 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/AccessorsFactory.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/AccessorsFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -80,7 +80,7 @@ public List<MethodSpec> fluentSetters(MemberModel memberModel, TypeName returnTy
         return new NonCollectionSetters(intermediateModel, shapeModel, memberModel, typeProvider).fluent(returnType);
     }
 
-    public MethodSpec beanStyleSetter(MemberModel memberModel) {
+    public List<MethodSpec> beanStyleSetters(MemberModel memberModel) {
         if (memberModel.isList()) {
             return new ListSetters(intermediateModel, shapeModel, memberModel, typeProvider).beanStyle();
         }
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/AwsServiceBaseRequestSpec.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/AwsServiceBaseRequestSpec.java
index 1f14ec856a87..c3ba7de4175b 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/AwsServiceBaseRequestSpec.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/AwsServiceBaseRequestSpec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/AwsServiceBaseResponseSpec.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/AwsServiceBaseResponseSpec.java
index b0308ed932c1..5c1c8f009363 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/AwsServiceBaseResponseSpec.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/AwsServiceBaseResponseSpec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/AwsServiceModel.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/AwsServiceModel.java
index e58d2c6b9c8e..65689e909b5a 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/AwsServiceModel.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/AwsServiceModel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -50,6 +50,7 @@
 import software.amazon.awssdk.codegen.poet.eventstream.EventStreamUtils;
 import software.amazon.awssdk.core.SdkField;
 import software.amazon.awssdk.core.SdkPojo;
+import software.amazon.awssdk.utils.StringUtils;
 import software.amazon.awssdk.utils.builder.ToCopyableBuilder;
 
 /**
@@ -233,12 +234,12 @@ private MethodSpec.Builder acceptMethodSpec(ClassName modelClass, ClassName resp
         return MethodSpec.methodBuilder("accept")
                          .addModifiers(PUBLIC)
                          .addJavadoc(new DocumentationBuilder()
-                                             .description("Calls the appropriate visit method depending on "
-                                                          + "the subtype of {@link $T}.")
-                                             .param("visitor", "Visitor to invoke.")
-                                             .build(), modelClass)
+                                         .description("Calls the appropriate visit method depending on "
+                                                      + "the subtype of {@link $T}.")
+                                         .param("visitor", "Visitor to invoke.")
+                                         .build(), modelClass)
                          .addParameter(responseHandlerClass
-                                               .nestedClass("Visitor"), "visitor");
+                                           .nestedClass("Visitor"), "visitor");
     }
 
     @Override
@@ -295,7 +296,7 @@ private TypeName responseBaseClass() {
 
     private ClassName exceptionBaseClass() {
         String customExceptionBase = intermediateModel.getCustomizationConfig()
-                .getSdkModeledExceptionBaseClassName();
+                                                      .getSdkModeledExceptionBaseClassName();
         if (customExceptionBase != null) {
             return poetExtensions.getModelClass(customExceptionBase);
         }
@@ -304,8 +305,8 @@ private ClassName exceptionBaseClass() {
 
     private TypeName toCopyableBuilderInterface() {
         return ParameterizedTypeName.get(ClassName.get(ToCopyableBuilder.class),
-                className().nestedClass("Builder"),
-                className());
+                                         className().nestedClass("Builder"),
+                                         className());
     }
 
     private List<MethodSpec> modelClassMethods() {
@@ -355,10 +356,7 @@ private MethodSpec getValueForField() {
 
         methodBuilder.beginControlFlow("switch ($L)", "fieldName");
 
-        shapeModel.getNonStreamingMembers().forEach(m -> methodBuilder.addCode("case $S:", m.getC2jName())
-                                                                      .addStatement("return $T.ofNullable(clazz.cast($L()))",
-                                                                                    Optional.class,
-                                                                                    m.getFluentGetterMethodName()));
+        shapeModel.getNonStreamingMembers().forEach(m -> addCasesForMember(methodBuilder, m));
 
         methodBuilder.addCode("default:");
         methodBuilder.addStatement("return $T.empty()", Optional.class);
@@ -367,6 +365,20 @@ private MethodSpec getValueForField() {
         return methodBuilder.build();
     }
 
+    private void addCasesForMember(MethodSpec.Builder methodBuilder, MemberModel member) {
+        methodBuilder.addCode("case $S:", member.getC2jName())
+                     .addStatement("return $T.ofNullable(clazz.cast($L()))",
+                                   Optional.class,
+                                   member.getFluentGetterMethodName());
+
+        if (shouldGenerateDeprecatedNameGetter(member)) {
+            methodBuilder.addCode("case $S:", member.getDeprecatedName())
+                         .addStatement("return $T.ofNullable(clazz.cast($L()))",
+                                       Optional.class,
+                                       member.getFluentGetterMethodName());
+        }
+    }
+
     private List<MethodSpec> memberGetters() {
         return shapeModel.getNonStreamingMembers().stream()
                          .filter(m -> !m.getHttp().getIsStreaming())
@@ -381,14 +393,24 @@ private Stream<MethodSpec> memberGetters(MemberModel member) {
             result.add(enumMemberGetter(member));
         }
 
+        member.getAutoConstructClassIfExists()
+              .ifPresent(autoConstructClass -> result.add(existenceCheckGetter(member, autoConstructClass)));
+
+        if (shouldGenerateDeprecatedNameGetter(member)) {
+            result.add(deprecatedMemberGetter(member));
+        }
+
         result.add(memberGetter(member));
 
         return result.stream();
     }
 
+    private boolean shouldGenerateDeprecatedNameGetter(MemberModel member) {
+        return StringUtils.isNotBlank(member.getDeprecatedName());
+    }
+
     private boolean shouldGenerateEnumGetter(MemberModel member) {
         return member.getEnumType() != null || MemberCopierSpec.isEnumCopyAvailable(member);
-
     }
 
     private MethodSpec enumMemberGetter(MemberModel member) {
@@ -409,6 +431,30 @@ private MethodSpec memberGetter(MemberModel member) {
                          .build();
     }
 
+    private MethodSpec existenceCheckGetter(MemberModel member, ClassName autoConstructClass) {
+        return MethodSpec.methodBuilder(member.getExistenceCheckMethodName())
+                         .addJavadoc("$L", member.getExistenceCheckDocumentation())
+                         .addModifiers(PUBLIC)
+                         .returns(TypeName.BOOLEAN)
+                         .addCode(existenceCheckStatement(member, autoConstructClass))
+                         .build();
+    }
+
+    private CodeBlock existenceCheckStatement(MemberModel member, ClassName autoConstructClass) {
+        String variableName = member.getVariable().getVariableName();
+        return CodeBlock.of("return $N != null && !($N instanceof $T);", variableName, variableName, autoConstructClass);
+    }
+
+    private MethodSpec deprecatedMemberGetter(MemberModel member) {
+        return MethodSpec.methodBuilder(member.getDeprecatedFluentGetterMethodName())
+                         .addJavadoc("$L", member.getDeprecatedGetterDocumentation())
+                         .addModifiers(PUBLIC)
+                         .addAnnotation(Deprecated.class)
+                         .returns(typeProvider.returnType(member))
+                         .addCode(getterStatement(member))
+                         .build();
+    }
+
     private CodeBlock enumGetterStatement(MemberModel member) {
         String fieldName = member.getVariable().getVariableName();
         if (member.isList() || member.isMap()) {
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/BaseExceptionClass.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/BaseExceptionClass.java
index 052a903a2ec0..25a785bf8e80 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/BaseExceptionClass.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/BaseExceptionClass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/BeanGetterHelper.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/BeanGetterHelper.java
index 702c27c3c664..c9a2db4777fd 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/BeanGetterHelper.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/BeanGetterHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/ExceptionProperties.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/ExceptionProperties.java
index f383cadf26b5..3a25f227bd44 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/ExceptionProperties.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/ExceptionProperties.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -17,16 +17,15 @@
 
 import com.squareup.javapoet.ClassName;
 import com.squareup.javapoet.MethodSpec;
-
 import java.util.Arrays;
 import java.util.List;
 import javax.lang.model.element.Modifier;
-
 import software.amazon.awssdk.awscore.exception.AwsErrorDetails;
 
 public class ExceptionProperties {
 
-    private ExceptionProperties() {}
+    private ExceptionProperties() {
+    }
 
     public static List<MethodSpec> builderInterfaceMethods(ClassName className) {
         return Arrays.asList(
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/ListSetters.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/ListSetters.java
index 383f970a8760..8987fb22124e 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/ListSetters.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/ListSetters.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -24,6 +24,7 @@
 import com.squareup.javapoet.TypeName;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
@@ -117,11 +118,11 @@ public List<MethodSpec> fluent(TypeName returnType) {
     }
 
     @Override
-    public MethodSpec beanStyle() {
+    public List<MethodSpec> beanStyle() {
         MethodSpec.Builder builder = beanStyleSetterBuilder()
             .addCode(memberModel().isCollectionWithBuilderMember() ? copySetterBuilderBody() : beanCopySetterBody());
 
-        return builder.build();
+        return Collections.singletonList(builder.build());
 
     }
 
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/MapSetters.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/MapSetters.java
index a7221828c740..10025258afc5 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/MapSetters.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/MapSetters.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -19,6 +19,7 @@
 import com.squareup.javapoet.ParameterSpec;
 import com.squareup.javapoet.TypeName;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import software.amazon.awssdk.codegen.internal.Utils;
 import software.amazon.awssdk.codegen.model.intermediate.IntermediateModel;
@@ -75,11 +76,11 @@ public List<MethodSpec> fluent(TypeName returnType) {
     }
 
     @Override
-    public MethodSpec beanStyle() {
+    public List<MethodSpec> beanStyle() {
         MethodSpec.Builder builder = beanStyleSetterBuilder()
                 .addCode(memberModel().isCollectionWithBuilderMember() ? copySetterBuilderBody() : beanCopySetterBody());
 
-        return builder.build();
+        return Collections.singletonList(builder.build());
     }
 
     private ParameterSpec mapWithEnumAsParameter() {
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/MemberCopierSpec.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/MemberCopierSpec.java
index 7e0f79bc24e1..ab95b64346dd 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/MemberCopierSpec.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/MemberCopierSpec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/MemberSetters.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/MemberSetters.java
index a434c99ff59b..1e4645b6c027 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/MemberSetters.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/MemberSetters.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -28,6 +28,6 @@ interface MemberSetters {
 
     List<MethodSpec> fluent(TypeName returnType);
 
-    MethodSpec beanStyle();
+    List<MethodSpec> beanStyle();
 }
 
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/ModelBuilderSpecs.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/ModelBuilderSpecs.java
index e6b183d0aa72..b5967dab40d2 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/ModelBuilderSpecs.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/ModelBuilderSpecs.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -200,11 +200,11 @@ private MethodSpec modelCopyConstructor() {
 
     private List<MethodSpec> accessors() {
         List<MethodSpec> accessors = new ArrayList<>();
-        shapeModel.getNonStreamingMembers().stream()
+        shapeModel.getNonStreamingMembers()
                   .forEach(m -> {
                       accessors.add(accessorsFactory.beanStyleGetter(m));
                       accessors.addAll(accessorsFactory.fluentSetters(m, builderInterfaceName()));
-                      accessors.add(accessorsFactory.beanStyleSetter(m));
+                      accessors.addAll(accessorsFactory.beanStyleSetters(m));
                       accessors.addAll(accessorsFactory.convenienceSetters(m, builderInterfaceName()));
                   });
 
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/ModelMethodOverrides.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/ModelMethodOverrides.java
index a2688beff41e..943a423c4822 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/ModelMethodOverrides.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/ModelMethodOverrides.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/NonCollectionSetters.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/NonCollectionSetters.java
index 849868524e60..023feb492f68 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/NonCollectionSetters.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/NonCollectionSetters.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -30,6 +30,7 @@
 import software.amazon.awssdk.codegen.model.intermediate.MemberModel;
 import software.amazon.awssdk.codegen.model.intermediate.ShapeModel;
 import software.amazon.awssdk.codegen.poet.PoetUtils;
+import software.amazon.awssdk.utils.StringUtils;
 
 class NonCollectionSetters extends AbstractMemberSetters {
     NonCollectionSetters(IntermediateModel intermediateModel,
@@ -51,6 +52,18 @@ public List<MethodSpec> fluentDeclarations(TypeName returnType) {
                                        .build());
         }
 
+        if (memberModel().getDeprecatedName() != null) {
+            MethodSpec.Builder builder = fluentAbstractSetterDeclaration(
+                memberModel().getDeprecatedFluentSetterMethodName(),
+                memberAsParameter(),
+                returnType);
+
+            fluentDeclarations.add(builder
+                                       .addJavadoc("$L", memberModel().getDeprecatedSetterDocumentation())
+                                       .addAnnotation(Deprecated.class)
+                                       .build());
+        }
+
         if (memberModel().hasBuilder()) {
             fluentDeclarations.add(fluentConsumerFluentSetter(returnType));
         }
@@ -68,6 +81,10 @@ public List<MethodSpec> fluent(TypeName returnType) {
             fluentSetters.add(fluentEnumToStringSetter(returnType));
         }
 
+        if (memberModel().getDeprecatedName() != null) {
+            fluentSetters.add(fluentAssignmentSetter(memberModel().getDeprecatedFluentSetterMethodName(), returnType));
+        }
+
         return fluentSetters;
     }
 
@@ -96,11 +113,21 @@ public MethodSpec fluentConvenience(TypeName returnType, ConvenienceTypeOverload
     }
 
     @Override
-    public MethodSpec beanStyle() {
-        MethodSpec.Builder builder = beanStyleSetterBuilder()
-            .addCode(beanCopySetterBody());
+    public List<MethodSpec> beanStyle() {
+        List<MethodSpec> methods = new ArrayList<>();
+        methods.add(beanStyleSetterBuilder()
+                        .addCode(beanCopySetterBody())
+                        .build());
+
+        if (StringUtils.isNotBlank(memberModel().getDeprecatedBeanStyleSetterMethodName())) {
+            methods.add(deprecatedBeanStyleSetterBuilder()
+                            .addCode(beanCopySetterBody())
+                            .addAnnotation(Deprecated.class)
+                            .addJavadoc("@deprecated Use {@link #" + memberModel().getBeanStyleSetterMethodName() + "} instead")
+                            .build());
+        }
 
-        return builder.build();
+        return methods;
     }
 
     private MethodSpec fluentAssignmentSetter(TypeName returnType) {
@@ -109,6 +136,12 @@ private MethodSpec fluentAssignmentSetter(TypeName returnType) {
             .build();
     }
 
+    private MethodSpec fluentAssignmentSetter(String methodName, TypeName returnType) {
+        return fluentSetterBuilder(methodName, returnType)
+            .addCode(copySetterBody().toBuilder().addStatement("return this").build())
+            .build();
+    }
+
     private MethodSpec fluentEnumToStringSetter(TypeName returnType) {
         return fluentSetterBuilder(modeledParam(), returnType)
             .addCode(enumToStringAssignmentBody().toBuilder().addStatement("return this").build())
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/ResponseMetadataSpec.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/ResponseMetadataSpec.java
index 868feb4cd347..abe739f8aa56 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/ResponseMetadataSpec.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/ResponseMetadataSpec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -30,9 +30,9 @@
 import software.amazon.awssdk.codegen.poet.ClassSpec;
 import software.amazon.awssdk.codegen.poet.PoetExtensions;
 import software.amazon.awssdk.codegen.poet.PoetUtils;
-import software.amazon.awssdk.codegen.utils.NamingUtils;
 import software.amazon.awssdk.utils.CollectionUtils;
 import software.amazon.awssdk.utils.StringUtils;
+import software.amazon.awssdk.utils.internal.CodegenNamingUtils;
 
 /**
  * Generate ResponseMetadata class
@@ -108,7 +108,7 @@ private List<MethodSpec> metadataMethods() {
      * Convert key (UPPER_CASE) to method name.
      */
     private String convertMethodName(String key) {
-        String pascalCase = NamingUtils.pascalCase(key);
+        String pascalCase = CodegenNamingUtils.pascalCase(key);
         return StringUtils.uncapitalize(pascalCase);
     }
 
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/ServiceModelCopiers.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/ServiceModelCopiers.java
index a3970cbca83d..dbb7493c9f57 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/ServiceModelCopiers.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/ServiceModelCopiers.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/ShapeModelSpec.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/ShapeModelSpec.java
index bf9a9717541c..f82651216e24 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/ShapeModelSpec.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/ShapeModelSpec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/TypeProvider.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/TypeProvider.java
index c19f509d0528..a759463165a6 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/TypeProvider.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/TypeProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/paginators/AsyncResponseClassSpec.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/paginators/AsyncResponseClassSpec.java
index c7069a7da89e..b6396e5581a6 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/paginators/AsyncResponseClassSpec.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/paginators/AsyncResponseClassSpec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/paginators/PaginatorsClassSpec.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/paginators/PaginatorsClassSpec.java
index 2a5a29e1e6c7..ce001db96df5 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/paginators/PaginatorsClassSpec.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/paginators/PaginatorsClassSpec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -212,11 +212,9 @@ protected CodeBlock nextPageMethodBody() {
      * return client.listTables(firstRequest.toBuilder().exclusiveStartTableName(response.lastEvaluatedTableName()).build());
      */
     protected String codeToGetNextPageIfOldResponseIsNotNull() {
-        StringBuilder sb = new StringBuilder();
-        sb.append(String.format("return %s.%s(%s)", CLIENT_MEMBER,
-                                operationModel.getMethodName(),
-                                constructRequestFromLastPage(PREVIOUS_PAGE_METHOD_ARGUMENT)));
-        return sb.toString();
+        return String.format("return %s.%s(%s)", CLIENT_MEMBER,
+                                  operationModel.getMethodName(),
+                                  constructRequestFromLastPage(PREVIOUS_PAGE_METHOD_ARGUMENT));
     }
 
     /**
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/paginators/SyncResponseClassSpec.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/paginators/SyncResponseClassSpec.java
index 38510bda15af..5718ed479c8a 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/paginators/SyncResponseClassSpec.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/paginators/SyncResponseClassSpec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -180,8 +180,9 @@ private MethodSpec getMethodsSpecForSingleResultKey(String resultKey) {
                                                                                       resultKeyType)))
                          .addCode(getIteratorLambdaBlock(resultKey, resultKeyModel))
                          .addCode("\n")
-                         .addStatement("return $T.builder().pagesIterable(this).itemIteratorFunction(getIterator).build()",
-                                       PaginatedItemsIterable.class)
+                         .addStatement("return $T.<$T, $T>builder().pagesIterable(this).itemIteratorFunction(getIterator).build"
+                                       + "()",
+                                       PaginatedItemsIterable.class, responseType(), resultKeyType)
                          .addJavadoc(CodeBlock.builder()
                                               .add("Returns an iterable to iterate through the paginated {@link $T#$L()} member."
                                                    + " The returned iterable is used to iterate through the results across all "
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/paginators/customizations/SameTokenAsyncResponseClassSpec.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/paginators/customizations/SameTokenAsyncResponseClassSpec.java
index 46732dbd8095..44f67e11f49b 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/paginators/customizations/SameTokenAsyncResponseClassSpec.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/paginators/customizations/SameTokenAsyncResponseClassSpec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/paginators/customizations/SameTokenSyncResponseClassSpec.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/paginators/customizations/SameTokenSyncResponseClassSpec.java
index b6bccb3c51ae..b372a275709a 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/paginators/customizations/SameTokenSyncResponseClassSpec.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/paginators/customizations/SameTokenSyncResponseClassSpec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/transform/MarshallerSpec.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/transform/MarshallerSpec.java
index d24751272512..ddf7f221f386 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/transform/MarshallerSpec.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/transform/MarshallerSpec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/transform/protocols/EventStreamJsonMarshallerSpec.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/transform/protocols/EventStreamJsonMarshallerSpec.java
index acf562ca44a3..a2bc02eb508b 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/transform/protocols/EventStreamJsonMarshallerSpec.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/transform/protocols/EventStreamJsonMarshallerSpec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/transform/protocols/JsonMarshallerSpec.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/transform/protocols/JsonMarshallerSpec.java
index 1225ead6b039..be28936b5a8d 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/transform/protocols/JsonMarshallerSpec.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/transform/protocols/JsonMarshallerSpec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/transform/protocols/MarshallerProtocolSpec.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/transform/protocols/MarshallerProtocolSpec.java
index b1aa26d665dd..818fd3686a88 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/transform/protocols/MarshallerProtocolSpec.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/transform/protocols/MarshallerProtocolSpec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/transform/protocols/QueryMarshallerSpec.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/transform/protocols/QueryMarshallerSpec.java
index 7f91261557f5..6fc999cfd63a 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/transform/protocols/QueryMarshallerSpec.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/transform/protocols/QueryMarshallerSpec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/transform/protocols/XmlMarshallerSpec.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/transform/protocols/XmlMarshallerSpec.java
index c1865b9bfc3f..fa960eb1f311 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/transform/protocols/XmlMarshallerSpec.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/transform/protocols/XmlMarshallerSpec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/utils/CompositeIterable.java b/codegen/src/main/java/software/amazon/awssdk/codegen/utils/CompositeIterable.java
index eeefc6ea7f5a..e379f9ad7110 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/utils/CompositeIterable.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/utils/CompositeIterable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/utils/ModelLoaderUtils.java b/codegen/src/main/java/software/amazon/awssdk/codegen/utils/ModelLoaderUtils.java
index 9c349bc83707..57b929268c50 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/utils/ModelLoaderUtils.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/utils/ModelLoaderUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/utils/NamingUtils.java b/codegen/src/main/java/software/amazon/awssdk/codegen/utils/NamingUtils.java
deleted file mode 100644
index 9ee55b7439a1..000000000000
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/utils/NamingUtils.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.codegen.utils;
-
-import static java.util.stream.Collectors.joining;
-
-import java.util.stream.Stream;
-import software.amazon.awssdk.codegen.internal.Utils;
-import software.amazon.awssdk.utils.StringUtils;
-
-public final class NamingUtils {
-
-    private NamingUtils() {
-    }
-
-    public static String[] splitOnWordBoundaries(String toSplit) {
-        String result = toSplit;
-
-        // All non-alphanumeric characters are spaces
-        result = result.replaceAll("[^A-Za-z0-9]+", " "); // acm-success -> "acm success"
-
-        // If a number has a standalone v in front of it, separate it out (version).
-        result = result.replaceAll("([^a-z]{2,})v([0-9]+)", "$1 v$2 ") // TESTv4 -> "TEST v4 "
-                       .replaceAll("([^A-Z]{2,})V([0-9]+)", "$1 V$2 "); // TestV4 -> "Test V4 "
-
-        // Add a space between camelCased words
-        result = String.join(" ", result.split("(?<=[a-z])(?=[A-Z]([a-zA-Z]|[0-9]))")); // AcmSuccess -> "Acm Success"
-
-        // Add a space after acronyms
-        result = result.replaceAll("([A-Z]+)([A-Z][a-z])", "$1 $2"); // ACMSuccess -> "ACM Success"
-
-        // Add space after a number in the middle of a word
-        result = result.replaceAll("([0-9])([a-zA-Z])", "$1 $2"); // s3ec2 -> "s3 ec2"
-
-        // Remove extra spaces - multiple consecutive ones or those and the beginning/end of words
-        result = result.replaceAll(" +", " ") // "Foo  Bar" -> "Foo Bar"
-                       .trim(); // " Foo " -> Foo
-
-        return result.split(" ");
-    }
-
-    public static String pascalCase(String word) {
-        return Stream.of(splitOnWordBoundaries(word)).map(StringUtils::lowerCase).map(Utils::capitalize).collect(joining());
-    }
-
-    public static String pascalCase(String... words) {
-        return Stream.of(words).map(StringUtils::lowerCase).map(Utils::capitalize).collect(joining());
-    }
-}
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/utils/PaginatorUtils.java b/codegen/src/main/java/software/amazon/awssdk/codegen/utils/PaginatorUtils.java
index d8a123a7b83c..8fdd34852aef 100644
--- a/codegen/src/main/java/software/amazon/awssdk/codegen/utils/PaginatorUtils.java
+++ b/codegen/src/main/java/software/amazon/awssdk/codegen/utils/PaginatorUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/main/resources/software/amazon/awssdk/codegen/DefaultFileHeader.txt b/codegen/src/main/resources/software/amazon/awssdk/codegen/DefaultFileHeader.txt
index 1d9f42a23f03..792bd275bf6e 100644
--- a/codegen/src/main/resources/software/amazon/awssdk/codegen/DefaultFileHeader.txt
+++ b/codegen/src/main/resources/software/amazon/awssdk/codegen/DefaultFileHeader.txt
@@ -1,5 +1,5 @@
 /*
- * Copyright %COPYRIGHT_DATE_RANGE% Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/test/java/software/amazon/awssdk/codegen/emitters/CodeTransformerTest.java b/codegen/src/test/java/software/amazon/awssdk/codegen/emitters/CodeTransformerTest.java
index f151a481cf6b..48d97e5804b8 100644
--- a/codegen/src/test/java/software/amazon/awssdk/codegen/emitters/CodeTransformerTest.java
+++ b/codegen/src/test/java/software/amazon/awssdk/codegen/emitters/CodeTransformerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/test/java/software/amazon/awssdk/codegen/emitters/PoetGeneratorTaskIntegrationTest.java b/codegen/src/test/java/software/amazon/awssdk/codegen/emitters/PoetGeneratorTaskIntegrationTest.java
index 7dd109dcefc0..541600beefd7 100644
--- a/codegen/src/test/java/software/amazon/awssdk/codegen/emitters/PoetGeneratorTaskIntegrationTest.java
+++ b/codegen/src/test/java/software/amazon/awssdk/codegen/emitters/PoetGeneratorTaskIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/test/java/software/amazon/awssdk/codegen/emitters/UnusedImportRemoverTest.java b/codegen/src/test/java/software/amazon/awssdk/codegen/emitters/UnusedImportRemoverTest.java
index 8936d863dc39..20766c8cd6c6 100644
--- a/codegen/src/test/java/software/amazon/awssdk/codegen/emitters/UnusedImportRemoverTest.java
+++ b/codegen/src/test/java/software/amazon/awssdk/codegen/emitters/UnusedImportRemoverTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/test/java/software/amazon/awssdk/codegen/internal/DocumentationUtilsTest.java b/codegen/src/test/java/software/amazon/awssdk/codegen/internal/DocumentationUtilsTest.java
index 67b07b9f0a8a..a07e367409cc 100644
--- a/codegen/src/test/java/software/amazon/awssdk/codegen/internal/DocumentationUtilsTest.java
+++ b/codegen/src/test/java/software/amazon/awssdk/codegen/internal/DocumentationUtilsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/test/java/software/amazon/awssdk/codegen/internal/UtilsTest.java b/codegen/src/test/java/software/amazon/awssdk/codegen/internal/UtilsTest.java
index 4d5b409dcdca..cacce1621c53 100644
--- a/codegen/src/test/java/software/amazon/awssdk/codegen/internal/UtilsTest.java
+++ b/codegen/src/test/java/software/amazon/awssdk/codegen/internal/UtilsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/test/java/software/amazon/awssdk/codegen/model/intermediate/DocumentationBuilderTest.java b/codegen/src/test/java/software/amazon/awssdk/codegen/model/intermediate/DocumentationBuilderTest.java
index 17916976f3f7..08e87d5696e9 100644
--- a/codegen/src/test/java/software/amazon/awssdk/codegen/model/intermediate/DocumentationBuilderTest.java
+++ b/codegen/src/test/java/software/amazon/awssdk/codegen/model/intermediate/DocumentationBuilderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/test/java/software/amazon/awssdk/codegen/model/intermediate/ServiceExamplesSerializationTest.java b/codegen/src/test/java/software/amazon/awssdk/codegen/model/intermediate/ServiceExamplesSerializationTest.java
index 5264b1e33cdd..7a4f28277f86 100644
--- a/codegen/src/test/java/software/amazon/awssdk/codegen/model/intermediate/ServiceExamplesSerializationTest.java
+++ b/codegen/src/test/java/software/amazon/awssdk/codegen/model/intermediate/ServiceExamplesSerializationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/test/java/software/amazon/awssdk/codegen/model/service/HostPrefixProcessorTest.java b/codegen/src/test/java/software/amazon/awssdk/codegen/model/service/HostPrefixProcessorTest.java
index 707c99389536..6f6b13e1ea3e 100644
--- a/codegen/src/test/java/software/amazon/awssdk/codegen/model/service/HostPrefixProcessorTest.java
+++ b/codegen/src/test/java/software/amazon/awssdk/codegen/model/service/HostPrefixProcessorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/test/java/software/amazon/awssdk/codegen/model/service/PaginatorDefinitionTest.java b/codegen/src/test/java/software/amazon/awssdk/codegen/model/service/PaginatorDefinitionTest.java
index 76f5b2e4e98f..a1c09b74f7fd 100644
--- a/codegen/src/test/java/software/amazon/awssdk/codegen/model/service/PaginatorDefinitionTest.java
+++ b/codegen/src/test/java/software/amazon/awssdk/codegen/model/service/PaginatorDefinitionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/test/java/software/amazon/awssdk/codegen/naming/DefaultNamingStrategyTest.java b/codegen/src/test/java/software/amazon/awssdk/codegen/naming/DefaultNamingStrategyTest.java
index 78740af1a0c3..88f1298f12fb 100644
--- a/codegen/src/test/java/software/amazon/awssdk/codegen/naming/DefaultNamingStrategyTest.java
+++ b/codegen/src/test/java/software/amazon/awssdk/codegen/naming/DefaultNamingStrategyTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/test/java/software/amazon/awssdk/codegen/poet/ClientTestModels.java b/codegen/src/test/java/software/amazon/awssdk/codegen/poet/ClientTestModels.java
index d4a3dd51607d..25c34a37d3d4 100644
--- a/codegen/src/test/java/software/amazon/awssdk/codegen/poet/ClientTestModels.java
+++ b/codegen/src/test/java/software/amazon/awssdk/codegen/poet/ClientTestModels.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/test/java/software/amazon/awssdk/codegen/poet/PoetCollectorsTest.java b/codegen/src/test/java/software/amazon/awssdk/codegen/poet/PoetCollectorsTest.java
index 372bdd8e74f6..99a2b9331ad2 100644
--- a/codegen/src/test/java/software/amazon/awssdk/codegen/poet/PoetCollectorsTest.java
+++ b/codegen/src/test/java/software/amazon/awssdk/codegen/poet/PoetCollectorsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/test/java/software/amazon/awssdk/codegen/poet/PoetMatchers.java b/codegen/src/test/java/software/amazon/awssdk/codegen/poet/PoetMatchers.java
index 8cdab0199cf0..fecc4c6dde32 100644
--- a/codegen/src/test/java/software/amazon/awssdk/codegen/poet/PoetMatchers.java
+++ b/codegen/src/test/java/software/amazon/awssdk/codegen/poet/PoetMatchers.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/test/java/software/amazon/awssdk/codegen/poet/builder/BuilderClassTest.java b/codegen/src/test/java/software/amazon/awssdk/codegen/poet/builder/BuilderClassTest.java
index 2b8b0b4c9b6f..c0238bc3115e 100644
--- a/codegen/src/test/java/software/amazon/awssdk/codegen/poet/builder/BuilderClassTest.java
+++ b/codegen/src/test/java/software/amazon/awssdk/codegen/poet/builder/BuilderClassTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -38,6 +38,11 @@ public void baseClientBuilderClass() throws Exception {
         validateGeneration(BaseClientBuilderClass::new, "test-client-builder-class.java");
     }
 
+    @Test
+    public void baseQueryClientBuilderClass() throws Exception {
+        validateQueryGeneration(BaseClientBuilderClass::new, "test-query-client-builder-class.java");
+    }
+
     @Test
     public void syncClientBuilderInterface() throws Exception {
         validateGeneration(SyncClientBuilderInterface::new, "test-sync-client-builder-interface.java");
@@ -61,4 +66,8 @@ public void asyncClientBuilderClass() throws Exception {
     private void validateGeneration(Function<IntermediateModel, ClassSpec> generatorConstructor, String expectedClassName) {
         assertThat(generatorConstructor.apply(ClientTestModels.jsonServiceModels()), generatesTo(expectedClassName));
     }
+
+    private void validateQueryGeneration(Function<IntermediateModel, ClassSpec> generatorConstructor, String expectedClassName) {
+        assertThat(generatorConstructor.apply(ClientTestModels.queryServiceModels()), generatesTo(expectedClassName));
+    }
 }
diff --git a/codegen/src/test/java/software/amazon/awssdk/codegen/poet/client/PoetClientFunctionalTests.java b/codegen/src/test/java/software/amazon/awssdk/codegen/poet/client/PoetClientFunctionalTests.java
index 42080f1e4c5c..bddf732ff708 100644
--- a/codegen/src/test/java/software/amazon/awssdk/codegen/poet/client/PoetClientFunctionalTests.java
+++ b/codegen/src/test/java/software/amazon/awssdk/codegen/poet/client/PoetClientFunctionalTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/test/java/software/amazon/awssdk/codegen/poet/common/EnumClassTest.java b/codegen/src/test/java/software/amazon/awssdk/codegen/poet/common/EnumClassTest.java
index be217307468e..80c8fcf87907 100644
--- a/codegen/src/test/java/software/amazon/awssdk/codegen/poet/common/EnumClassTest.java
+++ b/codegen/src/test/java/software/amazon/awssdk/codegen/poet/common/EnumClassTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/test/java/software/amazon/awssdk/codegen/poet/endpointdiscovery/EndpointDiscoveryCacheLoaderGeneratorTest.java b/codegen/src/test/java/software/amazon/awssdk/codegen/poet/endpointdiscovery/EndpointDiscoveryCacheLoaderGeneratorTest.java
index 42e05a13526f..6bd879fc697a 100644
--- a/codegen/src/test/java/software/amazon/awssdk/codegen/poet/endpointdiscovery/EndpointDiscoveryCacheLoaderGeneratorTest.java
+++ b/codegen/src/test/java/software/amazon/awssdk/codegen/poet/endpointdiscovery/EndpointDiscoveryCacheLoaderGeneratorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/test/java/software/amazon/awssdk/codegen/poet/eventstream/EventStreamFunctionalTests.java b/codegen/src/test/java/software/amazon/awssdk/codegen/poet/eventstream/EventStreamFunctionalTests.java
index 04fbdbf4090a..5c5bef2ec990 100644
--- a/codegen/src/test/java/software/amazon/awssdk/codegen/poet/eventstream/EventStreamFunctionalTests.java
+++ b/codegen/src/test/java/software/amazon/awssdk/codegen/poet/eventstream/EventStreamFunctionalTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/test/java/software/amazon/awssdk/codegen/poet/model/AwsModelSpecTest.java b/codegen/src/test/java/software/amazon/awssdk/codegen/poet/model/AwsModelSpecTest.java
index ad8083da34c7..60e3bbfe05d6 100644
--- a/codegen/src/test/java/software/amazon/awssdk/codegen/poet/model/AwsModelSpecTest.java
+++ b/codegen/src/test/java/software/amazon/awssdk/codegen/poet/model/AwsModelSpecTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/test/java/software/amazon/awssdk/codegen/poet/model/AwsModelSpecWithoutAutoConstructContainersTest.java b/codegen/src/test/java/software/amazon/awssdk/codegen/poet/model/AwsModelSpecWithoutAutoConstructContainersTest.java
index 065e50acd34f..834b9fc6ceb2 100644
--- a/codegen/src/test/java/software/amazon/awssdk/codegen/poet/model/AwsModelSpecWithoutAutoConstructContainersTest.java
+++ b/codegen/src/test/java/software/amazon/awssdk/codegen/poet/model/AwsModelSpecWithoutAutoConstructContainersTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/test/java/software/amazon/awssdk/codegen/poet/model/AwsServiceBaseRequestSpecTest.java b/codegen/src/test/java/software/amazon/awssdk/codegen/poet/model/AwsServiceBaseRequestSpecTest.java
index 344d7f0032ae..0f6a6a9b16ad 100644
--- a/codegen/src/test/java/software/amazon/awssdk/codegen/poet/model/AwsServiceBaseRequestSpecTest.java
+++ b/codegen/src/test/java/software/amazon/awssdk/codegen/poet/model/AwsServiceBaseRequestSpecTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/test/java/software/amazon/awssdk/codegen/poet/model/AwsServiceBaseResponseSpecTest.java b/codegen/src/test/java/software/amazon/awssdk/codegen/poet/model/AwsServiceBaseResponseSpecTest.java
index 8242b712f3b0..3b58688d4f4f 100644
--- a/codegen/src/test/java/software/amazon/awssdk/codegen/poet/model/AwsServiceBaseResponseSpecTest.java
+++ b/codegen/src/test/java/software/amazon/awssdk/codegen/poet/model/AwsServiceBaseResponseSpecTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/test/java/software/amazon/awssdk/codegen/poet/model/BaseExceptionClassSpecTest.java b/codegen/src/test/java/software/amazon/awssdk/codegen/poet/model/BaseExceptionClassSpecTest.java
index ac417e475900..964def2d18b5 100644
--- a/codegen/src/test/java/software/amazon/awssdk/codegen/poet/model/BaseExceptionClassSpecTest.java
+++ b/codegen/src/test/java/software/amazon/awssdk/codegen/poet/model/BaseExceptionClassSpecTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/test/java/software/amazon/awssdk/codegen/poet/model/DeprecatedNameTest.java b/codegen/src/test/java/software/amazon/awssdk/codegen/poet/model/DeprecatedNameTest.java
new file mode 100644
index 000000000000..d55f85dbb13b
--- /dev/null
+++ b/codegen/src/test/java/software/amazon/awssdk/codegen/poet/model/DeprecatedNameTest.java
@@ -0,0 +1,57 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.codegen.poet.model;
+
+import java.io.File;
+import org.junit.Test;
+import software.amazon.awssdk.codegen.C2jModels;
+import software.amazon.awssdk.codegen.IntermediateModelBuilder;
+import software.amazon.awssdk.codegen.model.config.customization.CustomizationConfig;
+import software.amazon.awssdk.codegen.model.service.ServiceModel;
+import software.amazon.awssdk.codegen.utils.ModelLoaderUtils;
+
+public class DeprecatedNameTest {
+    @Test(expected = IllegalStateException.class)
+    public void throwsOnListDeprecation() {
+        runTest("listdeprecationfailure");
+    }
+
+    @Test(expected = IllegalStateException.class)
+    public void throwsOnMapDeprecation() {
+        runTest("mapdeprecationfailure");
+    }
+
+    @Test(expected = IllegalStateException.class)
+    public void throwsOnEnumDeprecation() {
+        runTest("enumdeprecationfailure");
+    }
+
+    private void runTest(String testName) {
+        File serviceModelFile = new File(getClass().getResource("./deprecatedname/" + testName + ".json").getFile());
+        File customizationConfigFile = new File(getClass()
+                                                    .getResource("./deprecatedname/" + testName + ".customization")
+                                                    .getFile());
+        ServiceModel serviceModel = ModelLoaderUtils.loadModel(ServiceModel.class, serviceModelFile);
+        CustomizationConfig basicConfig = ModelLoaderUtils.loadModel(CustomizationConfig.class, customizationConfigFile);
+
+        new IntermediateModelBuilder(
+            C2jModels.builder()
+                     .serviceModel(serviceModel)
+                     .customizationConfig(basicConfig)
+                     .build())
+            .build();
+    }
+}
diff --git a/codegen/src/test/java/software/amazon/awssdk/codegen/poet/model/ModelCopierSpecTest.java b/codegen/src/test/java/software/amazon/awssdk/codegen/poet/model/ModelCopierSpecTest.java
index e2441cfbccfb..0c6d4e11af45 100644
--- a/codegen/src/test/java/software/amazon/awssdk/codegen/poet/model/ModelCopierSpecTest.java
+++ b/codegen/src/test/java/software/amazon/awssdk/codegen/poet/model/ModelCopierSpecTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/test/java/software/amazon/awssdk/codegen/poet/model/ModelCopierSpecWithoutAutoConstructContainersTest.java b/codegen/src/test/java/software/amazon/awssdk/codegen/poet/model/ModelCopierSpecWithoutAutoConstructContainersTest.java
index 11e8f3ed8158..27f1cbb6eabe 100644
--- a/codegen/src/test/java/software/amazon/awssdk/codegen/poet/model/ModelCopierSpecWithoutAutoConstructContainersTest.java
+++ b/codegen/src/test/java/software/amazon/awssdk/codegen/poet/model/ModelCopierSpecWithoutAutoConstructContainersTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/test/java/software/amazon/awssdk/codegen/poet/model/ResponseMetadataSpecTest.java b/codegen/src/test/java/software/amazon/awssdk/codegen/poet/model/ResponseMetadataSpecTest.java
index 00a4e078cb3f..f4a42ee702a3 100644
--- a/codegen/src/test/java/software/amazon/awssdk/codegen/poet/model/ResponseMetadataSpecTest.java
+++ b/codegen/src/test/java/software/amazon/awssdk/codegen/poet/model/ResponseMetadataSpecTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/test/java/software/amazon/awssdk/codegen/poet/model/TestMemberModels.java b/codegen/src/test/java/software/amazon/awssdk/codegen/poet/model/TestMemberModels.java
index 29446fa45b2e..3770333d5898 100644
--- a/codegen/src/test/java/software/amazon/awssdk/codegen/poet/model/TestMemberModels.java
+++ b/codegen/src/test/java/software/amazon/awssdk/codegen/poet/model/TestMemberModels.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/test/java/software/amazon/awssdk/codegen/poet/model/XmlNamespaceModelTest.java b/codegen/src/test/java/software/amazon/awssdk/codegen/poet/model/XmlNamespaceModelTest.java
index 6aa72592a1f6..98462155d5f5 100644
--- a/codegen/src/test/java/software/amazon/awssdk/codegen/poet/model/XmlNamespaceModelTest.java
+++ b/codegen/src/test/java/software/amazon/awssdk/codegen/poet/model/XmlNamespaceModelTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -56,8 +56,8 @@ public XmlNamespaceModelTest(ShapeModel shapeModel) {
     private static void setUp() throws IOException {
         File serviceModelFile = new File(XmlNamespaceModelTest.class.getResource("xmlnamespace/service-2.json")
                                                                .getFile());
-        File configFile = new File(AwsModelSpecTest.class
-                                       .getResource("customization.config")
+        File configFile = new File(XmlNamespaceModelTest.class
+                                       .getResource("xmlnamespace/customization.config")
                                        .getFile());
 
         intermediateModel = new IntermediateModelBuilder(
diff --git a/codegen/src/test/java/software/amazon/awssdk/codegen/poet/paginators/PaginatedResponseClassSpecTest.java b/codegen/src/test/java/software/amazon/awssdk/codegen/poet/paginators/PaginatedResponseClassSpecTest.java
index f12bda4dfbc8..c1ac57d25dfb 100644
--- a/codegen/src/test/java/software/amazon/awssdk/codegen/poet/paginators/PaginatedResponseClassSpecTest.java
+++ b/codegen/src/test/java/software/amazon/awssdk/codegen/poet/paginators/PaginatedResponseClassSpecTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/test/java/software/amazon/awssdk/codegen/poet/transform/CustomDefaultValueSupplier.java b/codegen/src/test/java/software/amazon/awssdk/codegen/poet/transform/CustomDefaultValueSupplier.java
index a0a5f9b72d26..59801e37fa93 100644
--- a/codegen/src/test/java/software/amazon/awssdk/codegen/poet/transform/CustomDefaultValueSupplier.java
+++ b/codegen/src/test/java/software/amazon/awssdk/codegen/poet/transform/CustomDefaultValueSupplier.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/codegen/src/test/java/software/amazon/awssdk/codegen/poet/transform/MarshallerSpecTest.java b/codegen/src/test/java/software/amazon/awssdk/codegen/poet/transform/MarshallerSpecTest.java
index b79fbf4aaa82..e02a982710dd 100644
--- a/codegen/src/test/java/software/amazon/awssdk/codegen/poet/transform/MarshallerSpecTest.java
+++ b/codegen/src/test/java/software/amazon/awssdk/codegen/poet/transform/MarshallerSpecTest.java
@@ -1,3 +1,18 @@
+/*
+ * 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.
+ */
+
 package software.amazon.awssdk.codegen.poet.transform;
 
 import static java.util.stream.Collectors.toList;
diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/builder/test-client-builder-class.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/builder/test-client-builder-class.java
index ae99b4def3d6..9621075e01f7 100644
--- a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/builder/test-client-builder-class.java
+++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/builder/test-client-builder-class.java
@@ -2,6 +2,7 @@
 
 import java.util.List;
 import software.amazon.MyServiceHttpConfig;
+import software.amazon.MyServiceRetryPolicy;
 import software.amazon.awssdk.annotations.Generated;
 import software.amazon.awssdk.annotations.SdkInternalApi;
 import software.amazon.awssdk.auth.signer.Aws4Signer;
@@ -33,8 +34,9 @@ protected final String serviceName() {
 
     @Override
     protected final SdkClientConfiguration mergeServiceDefaults(SdkClientConfiguration config) {
-        return config.merge(c -> c.option(SdkAdvancedClientOption.SIGNER, defaultSigner()).option(
-            SdkClientOption.CRC32_FROM_COMPRESSED_DATA_ENABLED, false));
+        return config.merge(c -> c.option(SdkAdvancedClientOption.SIGNER, defaultSigner())
+                                  .option(SdkClientOption.CRC32_FROM_COMPRESSED_DATA_ENABLED, false)
+                                  .option(SdkClientOption.SERVICE_CONFIGURATION, ServiceConfiguration.builder().build()));
     }
 
     @Override
@@ -43,7 +45,13 @@ protected final SdkClientConfiguration finalizeServiceConfiguration(SdkClientCon
         List<ExecutionInterceptor> interceptors = interceptorFactory
             .getInterceptors("software/amazon/awssdk/services/json/execution.interceptors");
         interceptors = CollectionUtils.mergeLists(interceptors, config.option(SdkClientOption.EXECUTION_INTERCEPTORS));
-        return config.toBuilder().option(SdkClientOption.EXECUTION_INTERCEPTORS, interceptors).build();
+        ServiceConfiguration.Builder c = ((ServiceConfiguration) config.option(SdkClientOption.SERVICE_CONFIGURATION))
+            .toBuilder();
+        c.profileFile(c.profileFile() != null ? c.profileFile() : config.option(SdkClientOption.PROFILE_FILE)).profileName(
+            c.profileName() != null ? c.profileName() : config.option(SdkClientOption.PROFILE_NAME));
+        return config.toBuilder().option(SdkClientOption.EXECUTION_INTERCEPTORS, interceptors)
+                     .option(SdkClientOption.RETRY_POLICY, MyServiceRetryPolicy.resolveRetryPolicy(config))
+                     .option(SdkClientOption.SERVICE_CONFIGURATION, c.build()).build();
     }
 
     private Signer defaultSigner() {
@@ -70,4 +78,3 @@ protected final AttributeMap serviceHttpConfig() {
         return result;
     }
 }
-
diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/builder/test-query-client-builder-class.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/builder/test-query-client-builder-class.java
new file mode 100644
index 000000000000..7e3e5318feb7
--- /dev/null
+++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/builder/test-query-client-builder-class.java
@@ -0,0 +1,59 @@
+package software.amazon.awssdk.services.query;
+
+import java.util.Collections;
+import java.util.List;
+import software.amazon.awssdk.annotations.Generated;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.auth.signer.Aws4Signer;
+import software.amazon.awssdk.awscore.client.builder.AwsDefaultClientBuilder;
+import software.amazon.awssdk.core.client.config.SdkAdvancedClientOption;
+import software.amazon.awssdk.core.client.config.SdkClientConfiguration;
+import software.amazon.awssdk.core.client.config.SdkClientOption;
+import software.amazon.awssdk.core.interceptor.ClasspathInterceptorChainFactory;
+import software.amazon.awssdk.core.interceptor.ExecutionInterceptor;
+import software.amazon.awssdk.core.signer.Signer;
+import software.amazon.awssdk.protocols.query.interceptor.QueryParametersToBodyInterceptor;
+import software.amazon.awssdk.utils.CollectionUtils;
+
+/**
+ * Internal base class for {@link DefaultQueryClientBuilder} and {@link DefaultQueryAsyncClientBuilder}.
+ */
+@Generated("software.amazon.awssdk:codegen")
+@SdkInternalApi
+abstract class DefaultQueryBaseClientBuilder<B extends QueryBaseClientBuilder<B, C>, C> extends AwsDefaultClientBuilder<B, C> {
+    @Override
+    protected final String serviceEndpointPrefix() {
+        return "query-service";
+    }
+
+    @Override
+    protected final String serviceName() {
+        return "Query";
+    }
+
+    @Override
+    protected final SdkClientConfiguration mergeServiceDefaults(SdkClientConfiguration config) {
+        return config.merge(c -> c.option(SdkAdvancedClientOption.SIGNER, defaultSigner()).option(
+            SdkClientOption.CRC32_FROM_COMPRESSED_DATA_ENABLED, false));
+    }
+
+    @Override
+    protected final SdkClientConfiguration finalizeServiceConfiguration(SdkClientConfiguration config) {
+        ClasspathInterceptorChainFactory interceptorFactory = new ClasspathInterceptorChainFactory();
+        List<ExecutionInterceptor> interceptors = interceptorFactory
+            .getInterceptors("software/amazon/awssdk/services/query/execution.interceptors");
+        interceptors = CollectionUtils.mergeLists(interceptors, config.option(SdkClientOption.EXECUTION_INTERCEPTORS));
+        List<ExecutionInterceptor> protocolInterceptors = Collections.singletonList(new QueryParametersToBodyInterceptor());
+        interceptors = CollectionUtils.mergeLists(interceptors, protocolInterceptors);
+        return config.toBuilder().option(SdkClientOption.EXECUTION_INTERCEPTORS, interceptors).build();
+    }
+
+    private Signer defaultSigner() {
+        return Aws4Signer.create();
+    }
+
+    @Override
+    protected final String signingName() {
+        return "query-service";
+    }
+}
diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/c2j/json/customization.config b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/c2j/json/customization.config
index 33a8160445fc..ba01475ef717 100644
--- a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/c2j/json/customization.config
+++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/c2j/json/customization.config
@@ -5,6 +5,7 @@
     "presignersFqcn": "software.amazon.awssdk.services.acm.presign.AcmClientPresigners",
     "serviceSpecificHttpConfig": "software.amazon.MyServiceHttpConfig",
     "serviceSpecificClientConfigClass": "ServiceConfiguration",
+    "customRetryPolicy": "software.amazon.MyServiceRetryPolicy",
     "verifiedSimpleMethods" : ["paginatedOperationWithResultKey"],
     "blacklistedSimpleMethods" : [
         "eventStreamOperation"
diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/alltypesrequest.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/alltypesrequest.java
index cfec45f55b30..5837fbeee093 100644
--- a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/alltypesrequest.java
+++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/alltypesrequest.java
@@ -27,6 +27,8 @@
 import software.amazon.awssdk.core.traits.MapTrait;
 import software.amazon.awssdk.core.util.DefaultSdkAutoConstructList;
 import software.amazon.awssdk.core.util.DefaultSdkAutoConstructMap;
+import software.amazon.awssdk.core.util.SdkAutoConstructList;
+import software.amazon.awssdk.core.util.SdkAutoConstructMap;
 import software.amazon.awssdk.utils.CollectionUtils;
 import software.amazon.awssdk.utils.ToString;
 import software.amazon.awssdk.utils.builder.CopyableBuilder;
@@ -36,344 +38,344 @@
  */
 @Generated("software.amazon.awssdk:codegen")
 public final class AllTypesRequest extends JsonProtocolTestsRequest implements
-        ToCopyableBuilder<AllTypesRequest.Builder, AllTypesRequest> {
+                                                                    ToCopyableBuilder<AllTypesRequest.Builder, AllTypesRequest> {
     private static final SdkField<String> STRING_MEMBER_FIELD = SdkField.<String> builder(MarshallingType.STRING)
-            .getter(getter(AllTypesRequest::stringMember)).setter(setter(Builder::stringMember))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("StringMember").build()).build();
+        .getter(getter(AllTypesRequest::stringMember)).setter(setter(Builder::stringMember))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("StringMember").build()).build();
 
     private static final SdkField<Integer> INTEGER_MEMBER_FIELD = SdkField.<Integer> builder(MarshallingType.INTEGER)
-            .getter(getter(AllTypesRequest::integerMember)).setter(setter(Builder::integerMember))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("IntegerMember").build()).build();
+        .getter(getter(AllTypesRequest::integerMember)).setter(setter(Builder::integerMember))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("IntegerMember").build()).build();
 
     private static final SdkField<Boolean> BOOLEAN_MEMBER_FIELD = SdkField.<Boolean> builder(MarshallingType.BOOLEAN)
-            .getter(getter(AllTypesRequest::booleanMember)).setter(setter(Builder::booleanMember))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("BooleanMember").build()).build();
+        .getter(getter(AllTypesRequest::booleanMember)).setter(setter(Builder::booleanMember))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("BooleanMember").build()).build();
 
     private static final SdkField<Float> FLOAT_MEMBER_FIELD = SdkField.<Float> builder(MarshallingType.FLOAT)
-            .getter(getter(AllTypesRequest::floatMember)).setter(setter(Builder::floatMember))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("FloatMember").build()).build();
+        .getter(getter(AllTypesRequest::floatMember)).setter(setter(Builder::floatMember))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("FloatMember").build()).build();
 
     private static final SdkField<Double> DOUBLE_MEMBER_FIELD = SdkField.<Double> builder(MarshallingType.DOUBLE)
-            .getter(getter(AllTypesRequest::doubleMember)).setter(setter(Builder::doubleMember))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("DoubleMember").build()).build();
+        .getter(getter(AllTypesRequest::doubleMember)).setter(setter(Builder::doubleMember))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("DoubleMember").build()).build();
 
     private static final SdkField<Long> LONG_MEMBER_FIELD = SdkField.<Long> builder(MarshallingType.LONG)
-            .getter(getter(AllTypesRequest::longMember)).setter(setter(Builder::longMember))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("LongMember").build()).build();
+        .getter(getter(AllTypesRequest::longMember)).setter(setter(Builder::longMember))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("LongMember").build()).build();
 
     private static final SdkField<List<String>> SIMPLE_LIST_FIELD = SdkField
-            .<List<String>> builder(MarshallingType.LIST)
-            .getter(getter(AllTypesRequest::simpleList))
-            .setter(setter(Builder::simpleList))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("SimpleList").build(),
-                    ListTrait
-                            .builder()
-                            .memberLocationName(null)
-                            .memberFieldInfo(
-                                    SdkField.<String> builder(MarshallingType.STRING)
-                                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
-                                                    .locationName("member").build()).build()).build()).build();
+        .<List<String>> builder(MarshallingType.LIST)
+        .getter(getter(AllTypesRequest::simpleList))
+        .setter(setter(Builder::simpleList))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("SimpleList").build(),
+                ListTrait
+                    .builder()
+                    .memberLocationName(null)
+                    .memberFieldInfo(
+                        SdkField.<String> builder(MarshallingType.STRING)
+                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
+                                                 .locationName("member").build()).build()).build()).build();
 
     private static final SdkField<List<String>> LIST_OF_ENUMS_FIELD = SdkField
-            .<List<String>> builder(MarshallingType.LIST)
-            .getter(getter(AllTypesRequest::listOfEnumsAsStrings))
-            .setter(setter(Builder::listOfEnumsWithStrings))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("ListOfEnums").build(),
-                    ListTrait
-                            .builder()
-                            .memberLocationName(null)
-                            .memberFieldInfo(
-                                    SdkField.<String> builder(MarshallingType.STRING)
-                                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
-                                                    .locationName("member").build()).build()).build()).build();
+        .<List<String>> builder(MarshallingType.LIST)
+        .getter(getter(AllTypesRequest::listOfEnumsAsStrings))
+        .setter(setter(Builder::listOfEnumsWithStrings))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("ListOfEnums").build(),
+                ListTrait
+                    .builder()
+                    .memberLocationName(null)
+                    .memberFieldInfo(
+                        SdkField.<String> builder(MarshallingType.STRING)
+                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
+                                                 .locationName("member").build()).build()).build()).build();
 
     private static final SdkField<List<Map<String, String>>> LIST_OF_MAPS_FIELD = SdkField
-            .<List<Map<String, String>>> builder(MarshallingType.LIST)
-            .getter(getter(AllTypesRequest::listOfMaps))
-            .setter(setter(Builder::listOfMaps))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("ListOfMaps").build(),
-                    ListTrait
-                            .builder()
-                            .memberLocationName(null)
-                            .memberFieldInfo(
-                                    SdkField.<Map<String, String>> builder(MarshallingType.MAP)
-                                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
-                                                    .locationName("member").build(),
-                                                    MapTrait.builder()
-                                                            .keyLocationName("key")
-                                                            .valueLocationName("value")
-                                                            .valueFieldInfo(
-                                                                    SdkField.<String> builder(MarshallingType.STRING)
-                                                                            .traits(LocationTrait.builder()
-                                                                                    .location(MarshallLocation.PAYLOAD)
-                                                                                    .locationName("value").build()).build())
-                                                            .build()).build()).build()).build();
+        .<List<Map<String, String>>> builder(MarshallingType.LIST)
+        .getter(getter(AllTypesRequest::listOfMaps))
+        .setter(setter(Builder::listOfMaps))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("ListOfMaps").build(),
+                ListTrait
+                    .builder()
+                    .memberLocationName(null)
+                    .memberFieldInfo(
+                        SdkField.<Map<String, String>> builder(MarshallingType.MAP)
+                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
+                                                 .locationName("member").build(),
+                                    MapTrait.builder()
+                                            .keyLocationName("key")
+                                            .valueLocationName("value")
+                                            .valueFieldInfo(
+                                                SdkField.<String> builder(MarshallingType.STRING)
+                                                    .traits(LocationTrait.builder()
+                                                                         .location(MarshallLocation.PAYLOAD)
+                                                                         .locationName("value").build()).build())
+                                            .build()).build()).build()).build();
 
     private static final SdkField<List<SimpleStruct>> LIST_OF_STRUCTS_FIELD = SdkField
-            .<List<SimpleStruct>> builder(MarshallingType.LIST)
-            .getter(getter(AllTypesRequest::listOfStructs))
-            .setter(setter(Builder::listOfStructs))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("ListOfStructs").build(),
-                    ListTrait
-                            .builder()
-                            .memberLocationName(null)
-                            .memberFieldInfo(
-                                    SdkField.<SimpleStruct> builder(MarshallingType.SDK_POJO)
-                                            .constructor(SimpleStruct::builder)
-                                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
-                                                    .locationName("member").build()).build()).build()).build();
+        .<List<SimpleStruct>> builder(MarshallingType.LIST)
+        .getter(getter(AllTypesRequest::listOfStructs))
+        .setter(setter(Builder::listOfStructs))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("ListOfStructs").build(),
+                ListTrait
+                    .builder()
+                    .memberLocationName(null)
+                    .memberFieldInfo(
+                        SdkField.<SimpleStruct> builder(MarshallingType.SDK_POJO)
+                            .constructor(SimpleStruct::builder)
+                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
+                                                 .locationName("member").build()).build()).build()).build();
 
     private static final SdkField<List<Map<String, String>>> LIST_OF_MAP_OF_ENUM_TO_STRING_FIELD = SdkField
-            .<List<Map<String, String>>> builder(MarshallingType.LIST)
-            .getter(getter(AllTypesRequest::listOfMapOfEnumToStringAsStrings))
-            .setter(setter(Builder::listOfMapOfEnumToStringWithStrings))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("ListOfMapOfEnumToString").build(),
-                    ListTrait
-                            .builder()
-                            .memberLocationName(null)
-                            .memberFieldInfo(
-                                    SdkField.<Map<String, String>> builder(MarshallingType.MAP)
-                                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
-                                                    .locationName("member").build(),
-                                                    MapTrait.builder()
-                                                            .keyLocationName("key")
-                                                            .valueLocationName("value")
-                                                            .valueFieldInfo(
-                                                                    SdkField.<String> builder(MarshallingType.STRING)
-                                                                            .traits(LocationTrait.builder()
-                                                                                    .location(MarshallLocation.PAYLOAD)
-                                                                                    .locationName("value").build()).build())
-                                                            .build()).build()).build()).build();
+        .<List<Map<String, String>>> builder(MarshallingType.LIST)
+        .getter(getter(AllTypesRequest::listOfMapOfEnumToStringAsStrings))
+        .setter(setter(Builder::listOfMapOfEnumToStringWithStrings))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("ListOfMapOfEnumToString").build(),
+                ListTrait
+                    .builder()
+                    .memberLocationName(null)
+                    .memberFieldInfo(
+                        SdkField.<Map<String, String>> builder(MarshallingType.MAP)
+                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
+                                                 .locationName("member").build(),
+                                    MapTrait.builder()
+                                            .keyLocationName("key")
+                                            .valueLocationName("value")
+                                            .valueFieldInfo(
+                                                SdkField.<String> builder(MarshallingType.STRING)
+                                                    .traits(LocationTrait.builder()
+                                                                         .location(MarshallLocation.PAYLOAD)
+                                                                         .locationName("value").build()).build())
+                                            .build()).build()).build()).build();
 
     private static final SdkField<Map<String, List<Integer>>> MAP_OF_STRING_TO_INTEGER_LIST_FIELD = SdkField
-            .<Map<String, List<Integer>>> builder(MarshallingType.MAP)
-            .getter(getter(AllTypesRequest::mapOfStringToIntegerList))
-            .setter(setter(Builder::mapOfStringToIntegerList))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("MapOfStringToIntegerList").build(),
-                    MapTrait.builder()
-                            .keyLocationName("key")
-                            .valueLocationName("value")
-                            .valueFieldInfo(
-                                    SdkField.<List<Integer>> builder(MarshallingType.LIST)
-                                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
-                                                    .locationName("value").build(),
-                                                    ListTrait
-                                                            .builder()
-                                                            .memberLocationName(null)
-                                                            .memberFieldInfo(
-                                                                    SdkField.<Integer> builder(MarshallingType.INTEGER)
-                                                                            .traits(LocationTrait.builder()
-                                                                                    .location(MarshallLocation.PAYLOAD)
-                                                                                    .locationName("member").build()).build())
-                                                            .build()).build()).build()).build();
+        .<Map<String, List<Integer>>> builder(MarshallingType.MAP)
+        .getter(getter(AllTypesRequest::mapOfStringToIntegerList))
+        .setter(setter(Builder::mapOfStringToIntegerList))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("MapOfStringToIntegerList").build(),
+                MapTrait.builder()
+                        .keyLocationName("key")
+                        .valueLocationName("value")
+                        .valueFieldInfo(
+                            SdkField.<List<Integer>> builder(MarshallingType.LIST)
+                                .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
+                                                     .locationName("value").build(),
+                                        ListTrait
+                                            .builder()
+                                            .memberLocationName(null)
+                                            .memberFieldInfo(
+                                                SdkField.<Integer> builder(MarshallingType.INTEGER)
+                                                    .traits(LocationTrait.builder()
+                                                                         .location(MarshallLocation.PAYLOAD)
+                                                                         .locationName("member").build()).build())
+                                            .build()).build()).build()).build();
 
     private static final SdkField<Map<String, String>> MAP_OF_STRING_TO_STRING_FIELD = SdkField
-            .<Map<String, String>> builder(MarshallingType.MAP)
-            .getter(getter(AllTypesRequest::mapOfStringToString))
-            .setter(setter(Builder::mapOfStringToString))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("MapOfStringToString").build(),
-                    MapTrait.builder()
-                            .keyLocationName("key")
-                            .valueLocationName("value")
-                            .valueFieldInfo(
-                                    SdkField.<String> builder(MarshallingType.STRING)
-                                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
-                                                    .locationName("value").build()).build()).build()).build();
+        .<Map<String, String>> builder(MarshallingType.MAP)
+        .getter(getter(AllTypesRequest::mapOfStringToString))
+        .setter(setter(Builder::mapOfStringToString))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("MapOfStringToString").build(),
+                MapTrait.builder()
+                        .keyLocationName("key")
+                        .valueLocationName("value")
+                        .valueFieldInfo(
+                            SdkField.<String> builder(MarshallingType.STRING)
+                                .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
+                                                     .locationName("value").build()).build()).build()).build();
 
     private static final SdkField<Map<String, SimpleStruct>> MAP_OF_STRING_TO_SIMPLE_STRUCT_FIELD = SdkField
-            .<Map<String, SimpleStruct>> builder(MarshallingType.MAP)
-            .getter(getter(AllTypesRequest::mapOfStringToSimpleStruct))
-            .setter(setter(Builder::mapOfStringToSimpleStruct))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("MapOfStringToSimpleStruct").build(),
-                    MapTrait.builder()
-                            .keyLocationName("key")
-                            .valueLocationName("value")
-                            .valueFieldInfo(
-                                    SdkField.<SimpleStruct> builder(MarshallingType.SDK_POJO)
-                                            .constructor(SimpleStruct::builder)
-                                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
-                                                    .locationName("value").build()).build()).build()).build();
+        .<Map<String, SimpleStruct>> builder(MarshallingType.MAP)
+        .getter(getter(AllTypesRequest::mapOfStringToSimpleStruct))
+        .setter(setter(Builder::mapOfStringToSimpleStruct))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("MapOfStringToSimpleStruct").build(),
+                MapTrait.builder()
+                        .keyLocationName("key")
+                        .valueLocationName("value")
+                        .valueFieldInfo(
+                            SdkField.<SimpleStruct> builder(MarshallingType.SDK_POJO)
+                                .constructor(SimpleStruct::builder)
+                                .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
+                                                     .locationName("value").build()).build()).build()).build();
 
     private static final SdkField<Map<String, String>> MAP_OF_ENUM_TO_ENUM_FIELD = SdkField
-            .<Map<String, String>> builder(MarshallingType.MAP)
-            .getter(getter(AllTypesRequest::mapOfEnumToEnumAsStrings))
-            .setter(setter(Builder::mapOfEnumToEnumWithStrings))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("MapOfEnumToEnum").build(),
-                    MapTrait.builder()
-                            .keyLocationName("key")
-                            .valueLocationName("value")
-                            .valueFieldInfo(
-                                    SdkField.<String> builder(MarshallingType.STRING)
-                                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
-                                                    .locationName("value").build()).build()).build()).build();
+        .<Map<String, String>> builder(MarshallingType.MAP)
+        .getter(getter(AllTypesRequest::mapOfEnumToEnumAsStrings))
+        .setter(setter(Builder::mapOfEnumToEnumWithStrings))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("MapOfEnumToEnum").build(),
+                MapTrait.builder()
+                        .keyLocationName("key")
+                        .valueLocationName("value")
+                        .valueFieldInfo(
+                            SdkField.<String> builder(MarshallingType.STRING)
+                                .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
+                                                     .locationName("value").build()).build()).build()).build();
 
     private static final SdkField<Map<String, String>> MAP_OF_ENUM_TO_STRING_FIELD = SdkField
-            .<Map<String, String>> builder(MarshallingType.MAP)
-            .getter(getter(AllTypesRequest::mapOfEnumToStringAsStrings))
-            .setter(setter(Builder::mapOfEnumToStringWithStrings))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("MapOfEnumToString").build(),
-                    MapTrait.builder()
-                            .keyLocationName("key")
-                            .valueLocationName("value")
-                            .valueFieldInfo(
-                                    SdkField.<String> builder(MarshallingType.STRING)
-                                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
-                                                    .locationName("value").build()).build()).build()).build();
+        .<Map<String, String>> builder(MarshallingType.MAP)
+        .getter(getter(AllTypesRequest::mapOfEnumToStringAsStrings))
+        .setter(setter(Builder::mapOfEnumToStringWithStrings))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("MapOfEnumToString").build(),
+                MapTrait.builder()
+                        .keyLocationName("key")
+                        .valueLocationName("value")
+                        .valueFieldInfo(
+                            SdkField.<String> builder(MarshallingType.STRING)
+                                .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
+                                                     .locationName("value").build()).build()).build()).build();
 
     private static final SdkField<Map<String, String>> MAP_OF_STRING_TO_ENUM_FIELD = SdkField
-            .<Map<String, String>> builder(MarshallingType.MAP)
-            .getter(getter(AllTypesRequest::mapOfStringToEnumAsStrings))
-            .setter(setter(Builder::mapOfStringToEnumWithStrings))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("MapOfStringToEnum").build(),
-                    MapTrait.builder()
-                            .keyLocationName("key")
-                            .valueLocationName("value")
-                            .valueFieldInfo(
-                                    SdkField.<String> builder(MarshallingType.STRING)
-                                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
-                                                    .locationName("value").build()).build()).build()).build();
+        .<Map<String, String>> builder(MarshallingType.MAP)
+        .getter(getter(AllTypesRequest::mapOfStringToEnumAsStrings))
+        .setter(setter(Builder::mapOfStringToEnumWithStrings))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("MapOfStringToEnum").build(),
+                MapTrait.builder()
+                        .keyLocationName("key")
+                        .valueLocationName("value")
+                        .valueFieldInfo(
+                            SdkField.<String> builder(MarshallingType.STRING)
+                                .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
+                                                     .locationName("value").build()).build()).build()).build();
 
     private static final SdkField<Map<String, SimpleStruct>> MAP_OF_ENUM_TO_SIMPLE_STRUCT_FIELD = SdkField
-            .<Map<String, SimpleStruct>> builder(MarshallingType.MAP)
-            .getter(getter(AllTypesRequest::mapOfEnumToSimpleStructAsStrings))
-            .setter(setter(Builder::mapOfEnumToSimpleStructWithStrings))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("MapOfEnumToSimpleStruct").build(),
-                    MapTrait.builder()
-                            .keyLocationName("key")
-                            .valueLocationName("value")
-                            .valueFieldInfo(
-                                    SdkField.<SimpleStruct> builder(MarshallingType.SDK_POJO)
-                                            .constructor(SimpleStruct::builder)
-                                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
-                                                    .locationName("value").build()).build()).build()).build();
+        .<Map<String, SimpleStruct>> builder(MarshallingType.MAP)
+        .getter(getter(AllTypesRequest::mapOfEnumToSimpleStructAsStrings))
+        .setter(setter(Builder::mapOfEnumToSimpleStructWithStrings))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("MapOfEnumToSimpleStruct").build(),
+                MapTrait.builder()
+                        .keyLocationName("key")
+                        .valueLocationName("value")
+                        .valueFieldInfo(
+                            SdkField.<SimpleStruct> builder(MarshallingType.SDK_POJO)
+                                .constructor(SimpleStruct::builder)
+                                .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
+                                                     .locationName("value").build()).build()).build()).build();
 
     private static final SdkField<Map<String, List<String>>> MAP_OF_ENUM_TO_LIST_OF_ENUMS_FIELD = SdkField
-            .<Map<String, List<String>>> builder(MarshallingType.MAP)
-            .getter(getter(AllTypesRequest::mapOfEnumToListOfEnumsAsStrings))
-            .setter(setter(Builder::mapOfEnumToListOfEnumsWithStrings))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("MapOfEnumToListOfEnums").build(),
-                    MapTrait.builder()
-                            .keyLocationName("key")
-                            .valueLocationName("value")
-                            .valueFieldInfo(
-                                    SdkField.<List<String>> builder(MarshallingType.LIST)
-                                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
-                                                    .locationName("value").build(),
-                                                    ListTrait
-                                                            .builder()
-                                                            .memberLocationName(null)
-                                                            .memberFieldInfo(
-                                                                    SdkField.<String> builder(MarshallingType.STRING)
-                                                                            .traits(LocationTrait.builder()
-                                                                                    .location(MarshallLocation.PAYLOAD)
-                                                                                    .locationName("member").build()).build())
-                                                            .build()).build()).build()).build();
+        .<Map<String, List<String>>> builder(MarshallingType.MAP)
+        .getter(getter(AllTypesRequest::mapOfEnumToListOfEnumsAsStrings))
+        .setter(setter(Builder::mapOfEnumToListOfEnumsWithStrings))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("MapOfEnumToListOfEnums").build(),
+                MapTrait.builder()
+                        .keyLocationName("key")
+                        .valueLocationName("value")
+                        .valueFieldInfo(
+                            SdkField.<List<String>> builder(MarshallingType.LIST)
+                                .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
+                                                     .locationName("value").build(),
+                                        ListTrait
+                                            .builder()
+                                            .memberLocationName(null)
+                                            .memberFieldInfo(
+                                                SdkField.<String> builder(MarshallingType.STRING)
+                                                    .traits(LocationTrait.builder()
+                                                                         .location(MarshallLocation.PAYLOAD)
+                                                                         .locationName("member").build()).build())
+                                            .build()).build()).build()).build();
 
     private static final SdkField<Map<String, Map<String, String>>> MAP_OF_ENUM_TO_MAP_OF_STRING_TO_ENUM_FIELD = SdkField
-            .<Map<String, Map<String, String>>> builder(MarshallingType.MAP)
-            .getter(getter(AllTypesRequest::mapOfEnumToMapOfStringToEnumAsStrings))
-            .setter(setter(Builder::mapOfEnumToMapOfStringToEnumWithStrings))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("MapOfEnumToMapOfStringToEnum")
-                    .build(),
-                    MapTrait.builder()
-                            .keyLocationName("key")
-                            .valueLocationName("value")
-                            .valueFieldInfo(
-                                    SdkField.<Map<String, String>> builder(MarshallingType.MAP)
-                                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
-                                                    .locationName("value").build(),
-                                                    MapTrait.builder()
-                                                            .keyLocationName("key")
-                                                            .valueLocationName("value")
-                                                            .valueFieldInfo(
-                                                                    SdkField.<String> builder(MarshallingType.STRING)
-                                                                            .traits(LocationTrait.builder()
-                                                                                    .location(MarshallLocation.PAYLOAD)
-                                                                                    .locationName("value").build()).build())
-                                                            .build()).build()).build()).build();
+        .<Map<String, Map<String, String>>> builder(MarshallingType.MAP)
+        .getter(getter(AllTypesRequest::mapOfEnumToMapOfStringToEnumAsStrings))
+        .setter(setter(Builder::mapOfEnumToMapOfStringToEnumWithStrings))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("MapOfEnumToMapOfStringToEnum")
+                             .build(),
+                MapTrait.builder()
+                        .keyLocationName("key")
+                        .valueLocationName("value")
+                        .valueFieldInfo(
+                            SdkField.<Map<String, String>> builder(MarshallingType.MAP)
+                                .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
+                                                     .locationName("value").build(),
+                                        MapTrait.builder()
+                                                .keyLocationName("key")
+                                                .valueLocationName("value")
+                                                .valueFieldInfo(
+                                                    SdkField.<String> builder(MarshallingType.STRING)
+                                                        .traits(LocationTrait.builder()
+                                                                             .location(MarshallLocation.PAYLOAD)
+                                                                             .locationName("value").build()).build())
+                                                .build()).build()).build()).build();
 
     private static final SdkField<Instant> TIMESTAMP_MEMBER_FIELD = SdkField.<Instant> builder(MarshallingType.INSTANT)
-            .getter(getter(AllTypesRequest::timestampMember)).setter(setter(Builder::timestampMember))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("TimestampMember").build()).build();
+        .getter(getter(AllTypesRequest::timestampMember)).setter(setter(Builder::timestampMember))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("TimestampMember").build()).build();
 
     private static final SdkField<StructWithTimestamp> STRUCT_WITH_NESTED_TIMESTAMP_MEMBER_FIELD = SdkField
-            .<StructWithTimestamp> builder(MarshallingType.SDK_POJO)
-            .getter(getter(AllTypesRequest::structWithNestedTimestampMember))
-            .setter(setter(Builder::structWithNestedTimestampMember))
-            .constructor(StructWithTimestamp::builder)
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("StructWithNestedTimestampMember")
-                    .build()).build();
+        .<StructWithTimestamp> builder(MarshallingType.SDK_POJO)
+        .getter(getter(AllTypesRequest::structWithNestedTimestampMember))
+        .setter(setter(Builder::structWithNestedTimestampMember))
+        .constructor(StructWithTimestamp::builder)
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("StructWithNestedTimestampMember")
+                             .build()).build();
 
     private static final SdkField<SdkBytes> BLOB_ARG_FIELD = SdkField.<SdkBytes> builder(MarshallingType.SDK_BYTES)
-            .getter(getter(AllTypesRequest::blobArg)).setter(setter(Builder::blobArg))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("BlobArg").build()).build();
+        .getter(getter(AllTypesRequest::blobArg)).setter(setter(Builder::blobArg))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("BlobArg").build()).build();
 
     private static final SdkField<StructWithNestedBlobType> STRUCT_WITH_NESTED_BLOB_FIELD = SdkField
-            .<StructWithNestedBlobType> builder(MarshallingType.SDK_POJO).getter(getter(AllTypesRequest::structWithNestedBlob))
-            .setter(setter(Builder::structWithNestedBlob)).constructor(StructWithNestedBlobType::builder)
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("StructWithNestedBlob").build())
-            .build();
+        .<StructWithNestedBlobType> builder(MarshallingType.SDK_POJO).getter(getter(AllTypesRequest::structWithNestedBlob))
+                                                                     .setter(setter(Builder::structWithNestedBlob)).constructor(StructWithNestedBlobType::builder)
+                                                                     .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("StructWithNestedBlob").build())
+                                                                     .build();
 
     private static final SdkField<Map<String, SdkBytes>> BLOB_MAP_FIELD = SdkField
-            .<Map<String, SdkBytes>> builder(MarshallingType.MAP)
-            .getter(getter(AllTypesRequest::blobMap))
-            .setter(setter(Builder::blobMap))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("BlobMap").build(),
-                    MapTrait.builder()
-                            .keyLocationName("key")
-                            .valueLocationName("value")
-                            .valueFieldInfo(
-                                    SdkField.<SdkBytes> builder(MarshallingType.SDK_BYTES)
-                                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
-                                                    .locationName("value").build()).build()).build()).build();
+        .<Map<String, SdkBytes>> builder(MarshallingType.MAP)
+        .getter(getter(AllTypesRequest::blobMap))
+        .setter(setter(Builder::blobMap))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("BlobMap").build(),
+                MapTrait.builder()
+                        .keyLocationName("key")
+                        .valueLocationName("value")
+                        .valueFieldInfo(
+                            SdkField.<SdkBytes> builder(MarshallingType.SDK_BYTES)
+                                .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
+                                                     .locationName("value").build()).build()).build()).build();
 
     private static final SdkField<List<SdkBytes>> LIST_OF_BLOBS_FIELD = SdkField
-            .<List<SdkBytes>> builder(MarshallingType.LIST)
-            .getter(getter(AllTypesRequest::listOfBlobs))
-            .setter(setter(Builder::listOfBlobs))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("ListOfBlobs").build(),
-                    ListTrait
-                            .builder()
-                            .memberLocationName(null)
-                            .memberFieldInfo(
-                                    SdkField.<SdkBytes> builder(MarshallingType.SDK_BYTES)
-                                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
-                                                    .locationName("member").build()).build()).build()).build();
+        .<List<SdkBytes>> builder(MarshallingType.LIST)
+        .getter(getter(AllTypesRequest::listOfBlobs))
+        .setter(setter(Builder::listOfBlobs))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("ListOfBlobs").build(),
+                ListTrait
+                    .builder()
+                    .memberLocationName(null)
+                    .memberFieldInfo(
+                        SdkField.<SdkBytes> builder(MarshallingType.SDK_BYTES)
+                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
+                                                 .locationName("member").build()).build()).build()).build();
 
     private static final SdkField<RecursiveStructType> RECURSIVE_STRUCT_FIELD = SdkField
-            .<RecursiveStructType> builder(MarshallingType.SDK_POJO).getter(getter(AllTypesRequest::recursiveStruct))
-            .setter(setter(Builder::recursiveStruct)).constructor(RecursiveStructType::builder)
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("RecursiveStruct").build()).build();
+        .<RecursiveStructType> builder(MarshallingType.SDK_POJO).getter(getter(AllTypesRequest::recursiveStruct))
+                                                                .setter(setter(Builder::recursiveStruct)).constructor(RecursiveStructType::builder)
+                                                                .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("RecursiveStruct").build()).build();
 
     private static final SdkField<BaseType> POLYMORPHIC_TYPE_WITH_SUB_TYPES_FIELD = SdkField
-            .<BaseType> builder(MarshallingType.SDK_POJO)
-            .getter(getter(AllTypesRequest::polymorphicTypeWithSubTypes))
-            .setter(setter(Builder::polymorphicTypeWithSubTypes))
-            .constructor(BaseType::builder)
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("PolymorphicTypeWithSubTypes")
-                    .build()).build();
+        .<BaseType> builder(MarshallingType.SDK_POJO)
+        .getter(getter(AllTypesRequest::polymorphicTypeWithSubTypes))
+        .setter(setter(Builder::polymorphicTypeWithSubTypes))
+        .constructor(BaseType::builder)
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("PolymorphicTypeWithSubTypes")
+                             .build()).build();
 
     private static final SdkField<SubTypeOne> POLYMORPHIC_TYPE_WITHOUT_SUB_TYPES_FIELD = SdkField
-            .<SubTypeOne> builder(MarshallingType.SDK_POJO)
-            .getter(getter(AllTypesRequest::polymorphicTypeWithoutSubTypes))
-            .setter(setter(Builder::polymorphicTypeWithoutSubTypes))
-            .constructor(SubTypeOne::builder)
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("PolymorphicTypeWithoutSubTypes")
-                    .build()).build();
+        .<SubTypeOne> builder(MarshallingType.SDK_POJO)
+        .getter(getter(AllTypesRequest::polymorphicTypeWithoutSubTypes))
+        .setter(setter(Builder::polymorphicTypeWithoutSubTypes))
+        .constructor(SubTypeOne::builder)
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("PolymorphicTypeWithoutSubTypes")
+                             .build()).build();
 
     private static final SdkField<String> ENUM_TYPE_FIELD = SdkField.<String> builder(MarshallingType.STRING)
-            .getter(getter(AllTypesRequest::enumTypeAsString)).setter(setter(Builder::enumType))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("EnumType").build()).build();
+        .getter(getter(AllTypesRequest::enumTypeAsString)).setter(setter(Builder::enumType))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("EnumType").build()).build();
 
     private static final List<SdkField<?>> SDK_FIELDS = Collections.unmodifiableList(Arrays.asList(STRING_MEMBER_FIELD,
-            INTEGER_MEMBER_FIELD, BOOLEAN_MEMBER_FIELD, FLOAT_MEMBER_FIELD, DOUBLE_MEMBER_FIELD, LONG_MEMBER_FIELD,
-            SIMPLE_LIST_FIELD, LIST_OF_ENUMS_FIELD, LIST_OF_MAPS_FIELD, LIST_OF_STRUCTS_FIELD,
-            LIST_OF_MAP_OF_ENUM_TO_STRING_FIELD, MAP_OF_STRING_TO_INTEGER_LIST_FIELD, MAP_OF_STRING_TO_STRING_FIELD,
-            MAP_OF_STRING_TO_SIMPLE_STRUCT_FIELD, MAP_OF_ENUM_TO_ENUM_FIELD, MAP_OF_ENUM_TO_STRING_FIELD,
-            MAP_OF_STRING_TO_ENUM_FIELD, MAP_OF_ENUM_TO_SIMPLE_STRUCT_FIELD, MAP_OF_ENUM_TO_LIST_OF_ENUMS_FIELD,
-            MAP_OF_ENUM_TO_MAP_OF_STRING_TO_ENUM_FIELD, TIMESTAMP_MEMBER_FIELD, STRUCT_WITH_NESTED_TIMESTAMP_MEMBER_FIELD,
-            BLOB_ARG_FIELD, STRUCT_WITH_NESTED_BLOB_FIELD, BLOB_MAP_FIELD, LIST_OF_BLOBS_FIELD, RECURSIVE_STRUCT_FIELD,
-            POLYMORPHIC_TYPE_WITH_SUB_TYPES_FIELD, POLYMORPHIC_TYPE_WITHOUT_SUB_TYPES_FIELD, ENUM_TYPE_FIELD));
+                                                                                                   INTEGER_MEMBER_FIELD, BOOLEAN_MEMBER_FIELD, FLOAT_MEMBER_FIELD, DOUBLE_MEMBER_FIELD, LONG_MEMBER_FIELD,
+                                                                                                   SIMPLE_LIST_FIELD, LIST_OF_ENUMS_FIELD, LIST_OF_MAPS_FIELD, LIST_OF_STRUCTS_FIELD,
+                                                                                                   LIST_OF_MAP_OF_ENUM_TO_STRING_FIELD, MAP_OF_STRING_TO_INTEGER_LIST_FIELD, MAP_OF_STRING_TO_STRING_FIELD,
+                                                                                                   MAP_OF_STRING_TO_SIMPLE_STRUCT_FIELD, MAP_OF_ENUM_TO_ENUM_FIELD, MAP_OF_ENUM_TO_STRING_FIELD,
+                                                                                                   MAP_OF_STRING_TO_ENUM_FIELD, MAP_OF_ENUM_TO_SIMPLE_STRUCT_FIELD, MAP_OF_ENUM_TO_LIST_OF_ENUMS_FIELD,
+                                                                                                   MAP_OF_ENUM_TO_MAP_OF_STRING_TO_ENUM_FIELD, TIMESTAMP_MEMBER_FIELD, STRUCT_WITH_NESTED_TIMESTAMP_MEMBER_FIELD,
+                                                                                                   BLOB_ARG_FIELD, STRUCT_WITH_NESTED_BLOB_FIELD, BLOB_MAP_FIELD, LIST_OF_BLOBS_FIELD, RECURSIVE_STRUCT_FIELD,
+                                                                                                   POLYMORPHIC_TYPE_WITH_SUB_TYPES_FIELD, POLYMORPHIC_TYPE_WITHOUT_SUB_TYPES_FIELD, ENUM_TYPE_FIELD));
 
     private final String stringMember;
 
@@ -471,7 +473,7 @@ private AllTypesRequest(BuilderImpl builder) {
 
     /**
      * Returns the value of the StringMember property for this object.
-     * 
+     *
      * @return The value of the StringMember property for this object.
      */
     public String stringMember() {
@@ -480,7 +482,7 @@ public String stringMember() {
 
     /**
      * Returns the value of the IntegerMember property for this object.
-     * 
+     *
      * @return The value of the IntegerMember property for this object.
      */
     public Integer integerMember() {
@@ -489,7 +491,7 @@ public Integer integerMember() {
 
     /**
      * Returns the value of the BooleanMember property for this object.
-     * 
+     *
      * @return The value of the BooleanMember property for this object.
      */
     public Boolean booleanMember() {
@@ -498,7 +500,7 @@ public Boolean booleanMember() {
 
     /**
      * Returns the value of the FloatMember property for this object.
-     * 
+     *
      * @return The value of the FloatMember property for this object.
      */
     public Float floatMember() {
@@ -507,7 +509,7 @@ public Float floatMember() {
 
     /**
      * Returns the value of the DoubleMember property for this object.
-     * 
+     *
      * @return The value of the DoubleMember property for this object.
      */
     public Double doubleMember() {
@@ -516,19 +518,30 @@ public Double doubleMember() {
 
     /**
      * Returns the value of the LongMember property for this object.
-     * 
+     *
      * @return The value of the LongMember property for this object.
      */
     public Long longMember() {
         return longMember;
     }
 
+    /**
+     * Returns true if the SimpleList property was specified by the sender (it may be empty), or false if the sender did
+     * not specify the value (it will be empty). For responses returned by the SDK, the sender is the AWS service.
+     */
+    public boolean hasSimpleList() {
+        return simpleList != null && !(simpleList instanceof SdkAutoConstructList);
+    }
+
     /**
      * Returns the value of the SimpleList property for this object.
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
-     * 
+     * <p>
+     * You can use {@link #hasSimpleList()} to see if a value was sent in this field.
+     * </p>
+     *
      * @return The value of the SimpleList property for this object.
      */
     public List<String> simpleList() {
@@ -540,43 +553,79 @@ public List<String> simpleList() {
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
-     * 
+     * <p>
+     * You can use {@link #hasListOfEnums()} to see if a value was sent in this field.
+     * </p>
+     *
      * @return The value of the ListOfEnums property for this object.
      */
     public List<EnumType> listOfEnums() {
         return ListOfEnumsCopier.copyStringToEnum(listOfEnums);
     }
 
+    /**
+     * Returns true if the ListOfEnums property was specified by the sender (it may be empty), or false if the sender
+     * did not specify the value (it will be empty). For responses returned by the SDK, the sender is the AWS service.
+     */
+    public boolean hasListOfEnums() {
+        return listOfEnums != null && !(listOfEnums instanceof SdkAutoConstructList);
+    }
+
     /**
      * Returns the value of the ListOfEnums property for this object.
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
-     * 
+     * <p>
+     * You can use {@link #hasListOfEnums()} to see if a value was sent in this field.
+     * </p>
+     *
      * @return The value of the ListOfEnums property for this object.
      */
     public List<String> listOfEnumsAsStrings() {
         return listOfEnums;
     }
 
+    /**
+     * Returns true if the ListOfMaps property was specified by the sender (it may be empty), or false if the sender did
+     * not specify the value (it will be empty). For responses returned by the SDK, the sender is the AWS service.
+     */
+    public boolean hasListOfMaps() {
+        return listOfMaps != null && !(listOfMaps instanceof SdkAutoConstructList);
+    }
+
     /**
      * Returns the value of the ListOfMaps property for this object.
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
-     * 
+     * <p>
+     * You can use {@link #hasListOfMaps()} to see if a value was sent in this field.
+     * </p>
+     *
      * @return The value of the ListOfMaps property for this object.
      */
     public List<Map<String, String>> listOfMaps() {
         return listOfMaps;
     }
 
+    /**
+     * Returns true if the ListOfStructs property was specified by the sender (it may be empty), or false if the sender
+     * did not specify the value (it will be empty). For responses returned by the SDK, the sender is the AWS service.
+     */
+    public boolean hasListOfStructs() {
+        return listOfStructs != null && !(listOfStructs instanceof SdkAutoConstructList);
+    }
+
     /**
      * Returns the value of the ListOfStructs property for this object.
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
-     * 
+     * <p>
+     * You can use {@link #hasListOfStructs()} to see if a value was sent in this field.
+     * </p>
+     *
      * @return The value of the ListOfStructs property for this object.
      */
     public List<SimpleStruct> listOfStructs() {
@@ -588,55 +637,106 @@ public List<SimpleStruct> listOfStructs() {
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
-     * 
+     * <p>
+     * You can use {@link #hasListOfMapOfEnumToString()} to see if a value was sent in this field.
+     * </p>
+     *
      * @return The value of the ListOfMapOfEnumToString property for this object.
      */
     public List<Map<EnumType, String>> listOfMapOfEnumToString() {
         return ListOfMapOfEnumToStringCopier.copyStringToEnum(listOfMapOfEnumToString);
     }
 
+    /**
+     * Returns true if the ListOfMapOfEnumToString property was specified by the sender (it may be empty), or false if
+     * the sender did not specify the value (it will be empty). For responses returned by the SDK, the sender is the AWS
+     * service.
+     */
+    public boolean hasListOfMapOfEnumToString() {
+        return listOfMapOfEnumToString != null && !(listOfMapOfEnumToString instanceof SdkAutoConstructList);
+    }
+
     /**
      * Returns the value of the ListOfMapOfEnumToString property for this object.
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
-     * 
+     * <p>
+     * You can use {@link #hasListOfMapOfEnumToString()} to see if a value was sent in this field.
+     * </p>
+     *
      * @return The value of the ListOfMapOfEnumToString property for this object.
      */
     public List<Map<String, String>> listOfMapOfEnumToStringAsStrings() {
         return listOfMapOfEnumToString;
     }
 
+    /**
+     * Returns true if the MapOfStringToIntegerList property was specified by the sender (it may be empty), or false if
+     * the sender did not specify the value (it will be empty). For responses returned by the SDK, the sender is the AWS
+     * service.
+     */
+    public boolean hasMapOfStringToIntegerList() {
+        return mapOfStringToIntegerList != null && !(mapOfStringToIntegerList instanceof SdkAutoConstructMap);
+    }
+
     /**
      * Returns the value of the MapOfStringToIntegerList property for this object.
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
-     * 
+     * <p>
+     * You can use {@link #hasMapOfStringToIntegerList()} to see if a value was sent in this field.
+     * </p>
+     *
      * @return The value of the MapOfStringToIntegerList property for this object.
      */
     public Map<String, List<Integer>> mapOfStringToIntegerList() {
         return mapOfStringToIntegerList;
     }
 
+    /**
+     * Returns true if the MapOfStringToString property was specified by the sender (it may be empty), or false if the
+     * sender did not specify the value (it will be empty). For responses returned by the SDK, the sender is the AWS
+     * service.
+     */
+    public boolean hasMapOfStringToString() {
+        return mapOfStringToString != null && !(mapOfStringToString instanceof SdkAutoConstructMap);
+    }
+
     /**
      * Returns the value of the MapOfStringToString property for this object.
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
-     * 
+     * <p>
+     * You can use {@link #hasMapOfStringToString()} to see if a value was sent in this field.
+     * </p>
+     *
      * @return The value of the MapOfStringToString property for this object.
      */
     public Map<String, String> mapOfStringToString() {
         return mapOfStringToString;
     }
 
+    /**
+     * Returns true if the MapOfStringToSimpleStruct property was specified by the sender (it may be empty), or false if
+     * the sender did not specify the value (it will be empty). For responses returned by the SDK, the sender is the AWS
+     * service.
+     */
+    public boolean hasMapOfStringToSimpleStruct() {
+        return mapOfStringToSimpleStruct != null && !(mapOfStringToSimpleStruct instanceof SdkAutoConstructMap);
+    }
+
     /**
      * Returns the value of the MapOfStringToSimpleStruct property for this object.
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
-     * 
+     * <p>
+     * You can use {@link #hasMapOfStringToSimpleStruct()} to see if a value was sent in this field.
+     * </p>
+     *
      * @return The value of the MapOfStringToSimpleStruct property for this object.
      */
     public Map<String, SimpleStruct> mapOfStringToSimpleStruct() {
@@ -648,19 +748,34 @@ public Map<String, SimpleStruct> mapOfStringToSimpleStruct() {
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
-     * 
+     * <p>
+     * You can use {@link #hasMapOfEnumToEnum()} to see if a value was sent in this field.
+     * </p>
+     *
      * @return The value of the MapOfEnumToEnum property for this object.
      */
     public Map<EnumType, EnumType> mapOfEnumToEnum() {
         return MapOfEnumToEnumCopier.copyStringToEnum(mapOfEnumToEnum);
     }
 
+    /**
+     * Returns true if the MapOfEnumToEnum property was specified by the sender (it may be empty), or false if the
+     * sender did not specify the value (it will be empty). For responses returned by the SDK, the sender is the AWS
+     * service.
+     */
+    public boolean hasMapOfEnumToEnum() {
+        return mapOfEnumToEnum != null && !(mapOfEnumToEnum instanceof SdkAutoConstructMap);
+    }
+
     /**
      * Returns the value of the MapOfEnumToEnum property for this object.
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
-     * 
+     * <p>
+     * You can use {@link #hasMapOfEnumToEnum()} to see if a value was sent in this field.
+     * </p>
+     *
      * @return The value of the MapOfEnumToEnum property for this object.
      */
     public Map<String, String> mapOfEnumToEnumAsStrings() {
@@ -672,19 +787,34 @@ public Map<String, String> mapOfEnumToEnumAsStrings() {
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
-     * 
+     * <p>
+     * You can use {@link #hasMapOfEnumToString()} to see if a value was sent in this field.
+     * </p>
+     *
      * @return The value of the MapOfEnumToString property for this object.
      */
     public Map<EnumType, String> mapOfEnumToString() {
         return MapOfEnumToStringCopier.copyStringToEnum(mapOfEnumToString);
     }
 
+    /**
+     * Returns true if the MapOfEnumToString property was specified by the sender (it may be empty), or false if the
+     * sender did not specify the value (it will be empty). For responses returned by the SDK, the sender is the AWS
+     * service.
+     */
+    public boolean hasMapOfEnumToString() {
+        return mapOfEnumToString != null && !(mapOfEnumToString instanceof SdkAutoConstructMap);
+    }
+
     /**
      * Returns the value of the MapOfEnumToString property for this object.
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
-     * 
+     * <p>
+     * You can use {@link #hasMapOfEnumToString()} to see if a value was sent in this field.
+     * </p>
+     *
      * @return The value of the MapOfEnumToString property for this object.
      */
     public Map<String, String> mapOfEnumToStringAsStrings() {
@@ -696,19 +826,34 @@ public Map<String, String> mapOfEnumToStringAsStrings() {
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
-     * 
+     * <p>
+     * You can use {@link #hasMapOfStringToEnum()} to see if a value was sent in this field.
+     * </p>
+     *
      * @return The value of the MapOfStringToEnum property for this object.
      */
     public Map<String, EnumType> mapOfStringToEnum() {
         return MapOfStringToEnumCopier.copyStringToEnum(mapOfStringToEnum);
     }
 
+    /**
+     * Returns true if the MapOfStringToEnum property was specified by the sender (it may be empty), or false if the
+     * sender did not specify the value (it will be empty). For responses returned by the SDK, the sender is the AWS
+     * service.
+     */
+    public boolean hasMapOfStringToEnum() {
+        return mapOfStringToEnum != null && !(mapOfStringToEnum instanceof SdkAutoConstructMap);
+    }
+
     /**
      * Returns the value of the MapOfStringToEnum property for this object.
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
-     * 
+     * <p>
+     * You can use {@link #hasMapOfStringToEnum()} to see if a value was sent in this field.
+     * </p>
+     *
      * @return The value of the MapOfStringToEnum property for this object.
      */
     public Map<String, String> mapOfStringToEnumAsStrings() {
@@ -720,19 +865,34 @@ public Map<String, String> mapOfStringToEnumAsStrings() {
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
-     * 
+     * <p>
+     * You can use {@link #hasMapOfEnumToSimpleStruct()} to see if a value was sent in this field.
+     * </p>
+     *
      * @return The value of the MapOfEnumToSimpleStruct property for this object.
      */
     public Map<EnumType, SimpleStruct> mapOfEnumToSimpleStruct() {
         return MapOfEnumToSimpleStructCopier.copyStringToEnum(mapOfEnumToSimpleStruct);
     }
 
+    /**
+     * Returns true if the MapOfEnumToSimpleStruct property was specified by the sender (it may be empty), or false if
+     * the sender did not specify the value (it will be empty). For responses returned by the SDK, the sender is the AWS
+     * service.
+     */
+    public boolean hasMapOfEnumToSimpleStruct() {
+        return mapOfEnumToSimpleStruct != null && !(mapOfEnumToSimpleStruct instanceof SdkAutoConstructMap);
+    }
+
     /**
      * Returns the value of the MapOfEnumToSimpleStruct property for this object.
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
-     * 
+     * <p>
+     * You can use {@link #hasMapOfEnumToSimpleStruct()} to see if a value was sent in this field.
+     * </p>
+     *
      * @return The value of the MapOfEnumToSimpleStruct property for this object.
      */
     public Map<String, SimpleStruct> mapOfEnumToSimpleStructAsStrings() {
@@ -744,19 +904,34 @@ public Map<String, SimpleStruct> mapOfEnumToSimpleStructAsStrings() {
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
-     * 
+     * <p>
+     * You can use {@link #hasMapOfEnumToListOfEnums()} to see if a value was sent in this field.
+     * </p>
+     *
      * @return The value of the MapOfEnumToListOfEnums property for this object.
      */
     public Map<EnumType, List<EnumType>> mapOfEnumToListOfEnums() {
         return MapOfEnumToListOfEnumsCopier.copyStringToEnum(mapOfEnumToListOfEnums);
     }
 
+    /**
+     * Returns true if the MapOfEnumToListOfEnums property was specified by the sender (it may be empty), or false if
+     * the sender did not specify the value (it will be empty). For responses returned by the SDK, the sender is the AWS
+     * service.
+     */
+    public boolean hasMapOfEnumToListOfEnums() {
+        return mapOfEnumToListOfEnums != null && !(mapOfEnumToListOfEnums instanceof SdkAutoConstructMap);
+    }
+
     /**
      * Returns the value of the MapOfEnumToListOfEnums property for this object.
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
-     * 
+     * <p>
+     * You can use {@link #hasMapOfEnumToListOfEnums()} to see if a value was sent in this field.
+     * </p>
+     *
      * @return The value of the MapOfEnumToListOfEnums property for this object.
      */
     public Map<String, List<String>> mapOfEnumToListOfEnumsAsStrings() {
@@ -768,19 +943,34 @@ public Map<String, List<String>> mapOfEnumToListOfEnumsAsStrings() {
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
-     * 
+     * <p>
+     * You can use {@link #hasMapOfEnumToMapOfStringToEnum()} to see if a value was sent in this field.
+     * </p>
+     *
      * @return The value of the MapOfEnumToMapOfStringToEnum property for this object.
      */
     public Map<EnumType, Map<String, EnumType>> mapOfEnumToMapOfStringToEnum() {
         return MapOfEnumToMapOfStringToEnumCopier.copyStringToEnum(mapOfEnumToMapOfStringToEnum);
     }
 
+    /**
+     * Returns true if the MapOfEnumToMapOfStringToEnum property was specified by the sender (it may be empty), or false
+     * if the sender did not specify the value (it will be empty). For responses returned by the SDK, the sender is the
+     * AWS service.
+     */
+    public boolean hasMapOfEnumToMapOfStringToEnum() {
+        return mapOfEnumToMapOfStringToEnum != null && !(mapOfEnumToMapOfStringToEnum instanceof SdkAutoConstructMap);
+    }
+
     /**
      * Returns the value of the MapOfEnumToMapOfStringToEnum property for this object.
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
-     * 
+     * <p>
+     * You can use {@link #hasMapOfEnumToMapOfStringToEnum()} to see if a value was sent in this field.
+     * </p>
+     *
      * @return The value of the MapOfEnumToMapOfStringToEnum property for this object.
      */
     public Map<String, Map<String, String>> mapOfEnumToMapOfStringToEnumAsStrings() {
@@ -789,7 +979,7 @@ public Map<String, Map<String, String>> mapOfEnumToMapOfStringToEnumAsStrings()
 
     /**
      * Returns the value of the TimestampMember property for this object.
-     * 
+     *
      * @return The value of the TimestampMember property for this object.
      */
     public Instant timestampMember() {
@@ -798,7 +988,7 @@ public Instant timestampMember() {
 
     /**
      * Returns the value of the StructWithNestedTimestampMember property for this object.
-     * 
+     *
      * @return The value of the StructWithNestedTimestampMember property for this object.
      */
     public StructWithTimestamp structWithNestedTimestampMember() {
@@ -807,7 +997,7 @@ public StructWithTimestamp structWithNestedTimestampMember() {
 
     /**
      * Returns the value of the BlobArg property for this object.
-     * 
+     *
      * @return The value of the BlobArg property for this object.
      */
     public SdkBytes blobArg() {
@@ -816,31 +1006,53 @@ public SdkBytes blobArg() {
 
     /**
      * Returns the value of the StructWithNestedBlob property for this object.
-     * 
+     *
      * @return The value of the StructWithNestedBlob property for this object.
      */
     public StructWithNestedBlobType structWithNestedBlob() {
         return structWithNestedBlob;
     }
 
+    /**
+     * Returns true if the BlobMap property was specified by the sender (it may be empty), or false if the sender did
+     * not specify the value (it will be empty). For responses returned by the SDK, the sender is the AWS service.
+     */
+    public boolean hasBlobMap() {
+        return blobMap != null && !(blobMap instanceof SdkAutoConstructMap);
+    }
+
     /**
      * Returns the value of the BlobMap property for this object.
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
-     * 
+     * <p>
+     * You can use {@link #hasBlobMap()} to see if a value was sent in this field.
+     * </p>
+     *
      * @return The value of the BlobMap property for this object.
      */
     public Map<String, SdkBytes> blobMap() {
         return blobMap;
     }
 
+    /**
+     * Returns true if the ListOfBlobs property was specified by the sender (it may be empty), or false if the sender
+     * did not specify the value (it will be empty). For responses returned by the SDK, the sender is the AWS service.
+     */
+    public boolean hasListOfBlobs() {
+        return listOfBlobs != null && !(listOfBlobs instanceof SdkAutoConstructList);
+    }
+
     /**
      * Returns the value of the ListOfBlobs property for this object.
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
-     * 
+     * <p>
+     * You can use {@link #hasListOfBlobs()} to see if a value was sent in this field.
+     * </p>
+     *
      * @return The value of the ListOfBlobs property for this object.
      */
     public List<SdkBytes> listOfBlobs() {
@@ -849,7 +1061,7 @@ public List<SdkBytes> listOfBlobs() {
 
     /**
      * Returns the value of the RecursiveStruct property for this object.
-     * 
+     *
      * @return The value of the RecursiveStruct property for this object.
      */
     public RecursiveStructType recursiveStruct() {
@@ -858,7 +1070,7 @@ public RecursiveStructType recursiveStruct() {
 
     /**
      * Returns the value of the PolymorphicTypeWithSubTypes property for this object.
-     * 
+     *
      * @return The value of the PolymorphicTypeWithSubTypes property for this object.
      */
     public BaseType polymorphicTypeWithSubTypes() {
@@ -867,7 +1079,7 @@ public BaseType polymorphicTypeWithSubTypes() {
 
     /**
      * Returns the value of the PolymorphicTypeWithoutSubTypes property for this object.
-     * 
+     *
      * @return The value of the PolymorphicTypeWithoutSubTypes property for this object.
      */
     public SubTypeOne polymorphicTypeWithoutSubTypes() {
@@ -881,7 +1093,7 @@ public SubTypeOne polymorphicTypeWithoutSubTypes() {
      * return {@link EnumType#UNKNOWN_TO_SDK_VERSION}. The raw value returned by the service is available from
      * {@link #enumTypeAsString}.
      * </p>
-     * 
+     *
      * @return The value of the EnumType property for this object.
      * @see EnumType
      */
@@ -896,7 +1108,7 @@ public EnumType enumType() {
      * return {@link EnumType#UNKNOWN_TO_SDK_VERSION}. The raw value returned by the service is available from
      * {@link #enumTypeAsString}.
      * </p>
-     * 
+     *
      * @return The value of the EnumType property for this object.
      * @see EnumType
      */
@@ -972,30 +1184,30 @@ public boolean equalsBySdkFields(Object obj) {
         }
         AllTypesRequest other = (AllTypesRequest) obj;
         return Objects.equals(stringMember(), other.stringMember()) && Objects.equals(integerMember(), other.integerMember())
-                && Objects.equals(booleanMember(), other.booleanMember()) && Objects.equals(floatMember(), other.floatMember())
-                && Objects.equals(doubleMember(), other.doubleMember()) && Objects.equals(longMember(), other.longMember())
-                && Objects.equals(simpleList(), other.simpleList())
-                && Objects.equals(listOfEnumsAsStrings(), other.listOfEnumsAsStrings())
-                && Objects.equals(listOfMaps(), other.listOfMaps()) && Objects.equals(listOfStructs(), other.listOfStructs())
-                && Objects.equals(listOfMapOfEnumToStringAsStrings(), other.listOfMapOfEnumToStringAsStrings())
-                && Objects.equals(mapOfStringToIntegerList(), other.mapOfStringToIntegerList())
-                && Objects.equals(mapOfStringToString(), other.mapOfStringToString())
-                && Objects.equals(mapOfStringToSimpleStruct(), other.mapOfStringToSimpleStruct())
-                && Objects.equals(mapOfEnumToEnumAsStrings(), other.mapOfEnumToEnumAsStrings())
-                && Objects.equals(mapOfEnumToStringAsStrings(), other.mapOfEnumToStringAsStrings())
-                && Objects.equals(mapOfStringToEnumAsStrings(), other.mapOfStringToEnumAsStrings())
-                && Objects.equals(mapOfEnumToSimpleStructAsStrings(), other.mapOfEnumToSimpleStructAsStrings())
-                && Objects.equals(mapOfEnumToListOfEnumsAsStrings(), other.mapOfEnumToListOfEnumsAsStrings())
-                && Objects.equals(mapOfEnumToMapOfStringToEnumAsStrings(), other.mapOfEnumToMapOfStringToEnumAsStrings())
-                && Objects.equals(timestampMember(), other.timestampMember())
-                && Objects.equals(structWithNestedTimestampMember(), other.structWithNestedTimestampMember())
-                && Objects.equals(blobArg(), other.blobArg())
-                && Objects.equals(structWithNestedBlob(), other.structWithNestedBlob())
-                && Objects.equals(blobMap(), other.blobMap()) && Objects.equals(listOfBlobs(), other.listOfBlobs())
-                && Objects.equals(recursiveStruct(), other.recursiveStruct())
-                && Objects.equals(polymorphicTypeWithSubTypes(), other.polymorphicTypeWithSubTypes())
-                && Objects.equals(polymorphicTypeWithoutSubTypes(), other.polymorphicTypeWithoutSubTypes())
-                && Objects.equals(enumTypeAsString(), other.enumTypeAsString());
+               && Objects.equals(booleanMember(), other.booleanMember()) && Objects.equals(floatMember(), other.floatMember())
+               && Objects.equals(doubleMember(), other.doubleMember()) && Objects.equals(longMember(), other.longMember())
+               && Objects.equals(simpleList(), other.simpleList())
+               && Objects.equals(listOfEnumsAsStrings(), other.listOfEnumsAsStrings())
+               && Objects.equals(listOfMaps(), other.listOfMaps()) && Objects.equals(listOfStructs(), other.listOfStructs())
+               && Objects.equals(listOfMapOfEnumToStringAsStrings(), other.listOfMapOfEnumToStringAsStrings())
+               && Objects.equals(mapOfStringToIntegerList(), other.mapOfStringToIntegerList())
+               && Objects.equals(mapOfStringToString(), other.mapOfStringToString())
+               && Objects.equals(mapOfStringToSimpleStruct(), other.mapOfStringToSimpleStruct())
+               && Objects.equals(mapOfEnumToEnumAsStrings(), other.mapOfEnumToEnumAsStrings())
+               && Objects.equals(mapOfEnumToStringAsStrings(), other.mapOfEnumToStringAsStrings())
+               && Objects.equals(mapOfStringToEnumAsStrings(), other.mapOfStringToEnumAsStrings())
+               && Objects.equals(mapOfEnumToSimpleStructAsStrings(), other.mapOfEnumToSimpleStructAsStrings())
+               && Objects.equals(mapOfEnumToListOfEnumsAsStrings(), other.mapOfEnumToListOfEnumsAsStrings())
+               && Objects.equals(mapOfEnumToMapOfStringToEnumAsStrings(), other.mapOfEnumToMapOfStringToEnumAsStrings())
+               && Objects.equals(timestampMember(), other.timestampMember())
+               && Objects.equals(structWithNestedTimestampMember(), other.structWithNestedTimestampMember())
+               && Objects.equals(blobArg(), other.blobArg())
+               && Objects.equals(structWithNestedBlob(), other.structWithNestedBlob())
+               && Objects.equals(blobMap(), other.blobMap()) && Objects.equals(listOfBlobs(), other.listOfBlobs())
+               && Objects.equals(recursiveStruct(), other.recursiveStruct())
+               && Objects.equals(polymorphicTypeWithSubTypes(), other.polymorphicTypeWithSubTypes())
+               && Objects.equals(polymorphicTypeWithoutSubTypes(), other.polymorphicTypeWithoutSubTypes())
+               && Objects.equals(enumTypeAsString(), other.enumTypeAsString());
     }
 
     /**
@@ -1005,88 +1217,88 @@ public boolean equalsBySdkFields(Object obj) {
     @Override
     public String toString() {
         return ToString.builder("AllTypesRequest").add("StringMember", stringMember()).add("IntegerMember", integerMember())
-                .add("BooleanMember", booleanMember()).add("FloatMember", floatMember()).add("DoubleMember", doubleMember())
-                .add("LongMember", longMember()).add("SimpleList", simpleList()).add("ListOfEnums", listOfEnumsAsStrings())
-                .add("ListOfMaps", listOfMaps()).add("ListOfStructs", listOfStructs())
-                .add("ListOfMapOfEnumToString", listOfMapOfEnumToStringAsStrings())
-                .add("MapOfStringToIntegerList", mapOfStringToIntegerList()).add("MapOfStringToString", mapOfStringToString())
-                .add("MapOfStringToSimpleStruct", mapOfStringToSimpleStruct()).add("MapOfEnumToEnum", mapOfEnumToEnumAsStrings())
-                .add("MapOfEnumToString", mapOfEnumToStringAsStrings()).add("MapOfStringToEnum", mapOfStringToEnumAsStrings())
-                .add("MapOfEnumToSimpleStruct", mapOfEnumToSimpleStructAsStrings())
-                .add("MapOfEnumToListOfEnums", mapOfEnumToListOfEnumsAsStrings())
-                .add("MapOfEnumToMapOfStringToEnum", mapOfEnumToMapOfStringToEnumAsStrings())
-                .add("TimestampMember", timestampMember())
-                .add("StructWithNestedTimestampMember", structWithNestedTimestampMember()).add("BlobArg", blobArg())
-                .add("StructWithNestedBlob", structWithNestedBlob()).add("BlobMap", blobMap()).add("ListOfBlobs", listOfBlobs())
-                .add("RecursiveStruct", recursiveStruct()).add("PolymorphicTypeWithSubTypes", polymorphicTypeWithSubTypes())
-                .add("PolymorphicTypeWithoutSubTypes", polymorphicTypeWithoutSubTypes()).add("EnumType", enumTypeAsString())
-                .build();
+                       .add("BooleanMember", booleanMember()).add("FloatMember", floatMember()).add("DoubleMember", doubleMember())
+                       .add("LongMember", longMember()).add("SimpleList", simpleList()).add("ListOfEnums", listOfEnumsAsStrings())
+                       .add("ListOfMaps", listOfMaps()).add("ListOfStructs", listOfStructs())
+                       .add("ListOfMapOfEnumToString", listOfMapOfEnumToStringAsStrings())
+                       .add("MapOfStringToIntegerList", mapOfStringToIntegerList()).add("MapOfStringToString", mapOfStringToString())
+                       .add("MapOfStringToSimpleStruct", mapOfStringToSimpleStruct()).add("MapOfEnumToEnum", mapOfEnumToEnumAsStrings())
+                       .add("MapOfEnumToString", mapOfEnumToStringAsStrings()).add("MapOfStringToEnum", mapOfStringToEnumAsStrings())
+                       .add("MapOfEnumToSimpleStruct", mapOfEnumToSimpleStructAsStrings())
+                       .add("MapOfEnumToListOfEnums", mapOfEnumToListOfEnumsAsStrings())
+                       .add("MapOfEnumToMapOfStringToEnum", mapOfEnumToMapOfStringToEnumAsStrings())
+                       .add("TimestampMember", timestampMember())
+                       .add("StructWithNestedTimestampMember", structWithNestedTimestampMember()).add("BlobArg", blobArg())
+                       .add("StructWithNestedBlob", structWithNestedBlob()).add("BlobMap", blobMap()).add("ListOfBlobs", listOfBlobs())
+                       .add("RecursiveStruct", recursiveStruct()).add("PolymorphicTypeWithSubTypes", polymorphicTypeWithSubTypes())
+                       .add("PolymorphicTypeWithoutSubTypes", polymorphicTypeWithoutSubTypes()).add("EnumType", enumTypeAsString())
+                       .build();
     }
 
     public <T> Optional<T> getValueForField(String fieldName, Class<T> clazz) {
         switch (fieldName) {
-        case "StringMember":
-            return Optional.ofNullable(clazz.cast(stringMember()));
-        case "IntegerMember":
-            return Optional.ofNullable(clazz.cast(integerMember()));
-        case "BooleanMember":
-            return Optional.ofNullable(clazz.cast(booleanMember()));
-        case "FloatMember":
-            return Optional.ofNullable(clazz.cast(floatMember()));
-        case "DoubleMember":
-            return Optional.ofNullable(clazz.cast(doubleMember()));
-        case "LongMember":
-            return Optional.ofNullable(clazz.cast(longMember()));
-        case "SimpleList":
-            return Optional.ofNullable(clazz.cast(simpleList()));
-        case "ListOfEnums":
-            return Optional.ofNullable(clazz.cast(listOfEnumsAsStrings()));
-        case "ListOfMaps":
-            return Optional.ofNullable(clazz.cast(listOfMaps()));
-        case "ListOfStructs":
-            return Optional.ofNullable(clazz.cast(listOfStructs()));
-        case "ListOfMapOfEnumToString":
-            return Optional.ofNullable(clazz.cast(listOfMapOfEnumToStringAsStrings()));
-        case "MapOfStringToIntegerList":
-            return Optional.ofNullable(clazz.cast(mapOfStringToIntegerList()));
-        case "MapOfStringToString":
-            return Optional.ofNullable(clazz.cast(mapOfStringToString()));
-        case "MapOfStringToSimpleStruct":
-            return Optional.ofNullable(clazz.cast(mapOfStringToSimpleStruct()));
-        case "MapOfEnumToEnum":
-            return Optional.ofNullable(clazz.cast(mapOfEnumToEnumAsStrings()));
-        case "MapOfEnumToString":
-            return Optional.ofNullable(clazz.cast(mapOfEnumToStringAsStrings()));
-        case "MapOfStringToEnum":
-            return Optional.ofNullable(clazz.cast(mapOfStringToEnumAsStrings()));
-        case "MapOfEnumToSimpleStruct":
-            return Optional.ofNullable(clazz.cast(mapOfEnumToSimpleStructAsStrings()));
-        case "MapOfEnumToListOfEnums":
-            return Optional.ofNullable(clazz.cast(mapOfEnumToListOfEnumsAsStrings()));
-        case "MapOfEnumToMapOfStringToEnum":
-            return Optional.ofNullable(clazz.cast(mapOfEnumToMapOfStringToEnumAsStrings()));
-        case "TimestampMember":
-            return Optional.ofNullable(clazz.cast(timestampMember()));
-        case "StructWithNestedTimestampMember":
-            return Optional.ofNullable(clazz.cast(structWithNestedTimestampMember()));
-        case "BlobArg":
-            return Optional.ofNullable(clazz.cast(blobArg()));
-        case "StructWithNestedBlob":
-            return Optional.ofNullable(clazz.cast(structWithNestedBlob()));
-        case "BlobMap":
-            return Optional.ofNullable(clazz.cast(blobMap()));
-        case "ListOfBlobs":
-            return Optional.ofNullable(clazz.cast(listOfBlobs()));
-        case "RecursiveStruct":
-            return Optional.ofNullable(clazz.cast(recursiveStruct()));
-        case "PolymorphicTypeWithSubTypes":
-            return Optional.ofNullable(clazz.cast(polymorphicTypeWithSubTypes()));
-        case "PolymorphicTypeWithoutSubTypes":
-            return Optional.ofNullable(clazz.cast(polymorphicTypeWithoutSubTypes()));
-        case "EnumType":
-            return Optional.ofNullable(clazz.cast(enumTypeAsString()));
-        default:
-            return Optional.empty();
+            case "StringMember":
+                return Optional.ofNullable(clazz.cast(stringMember()));
+            case "IntegerMember":
+                return Optional.ofNullable(clazz.cast(integerMember()));
+            case "BooleanMember":
+                return Optional.ofNullable(clazz.cast(booleanMember()));
+            case "FloatMember":
+                return Optional.ofNullable(clazz.cast(floatMember()));
+            case "DoubleMember":
+                return Optional.ofNullable(clazz.cast(doubleMember()));
+            case "LongMember":
+                return Optional.ofNullable(clazz.cast(longMember()));
+            case "SimpleList":
+                return Optional.ofNullable(clazz.cast(simpleList()));
+            case "ListOfEnums":
+                return Optional.ofNullable(clazz.cast(listOfEnumsAsStrings()));
+            case "ListOfMaps":
+                return Optional.ofNullable(clazz.cast(listOfMaps()));
+            case "ListOfStructs":
+                return Optional.ofNullable(clazz.cast(listOfStructs()));
+            case "ListOfMapOfEnumToString":
+                return Optional.ofNullable(clazz.cast(listOfMapOfEnumToStringAsStrings()));
+            case "MapOfStringToIntegerList":
+                return Optional.ofNullable(clazz.cast(mapOfStringToIntegerList()));
+            case "MapOfStringToString":
+                return Optional.ofNullable(clazz.cast(mapOfStringToString()));
+            case "MapOfStringToSimpleStruct":
+                return Optional.ofNullable(clazz.cast(mapOfStringToSimpleStruct()));
+            case "MapOfEnumToEnum":
+                return Optional.ofNullable(clazz.cast(mapOfEnumToEnumAsStrings()));
+            case "MapOfEnumToString":
+                return Optional.ofNullable(clazz.cast(mapOfEnumToStringAsStrings()));
+            case "MapOfStringToEnum":
+                return Optional.ofNullable(clazz.cast(mapOfStringToEnumAsStrings()));
+            case "MapOfEnumToSimpleStruct":
+                return Optional.ofNullable(clazz.cast(mapOfEnumToSimpleStructAsStrings()));
+            case "MapOfEnumToListOfEnums":
+                return Optional.ofNullable(clazz.cast(mapOfEnumToListOfEnumsAsStrings()));
+            case "MapOfEnumToMapOfStringToEnum":
+                return Optional.ofNullable(clazz.cast(mapOfEnumToMapOfStringToEnumAsStrings()));
+            case "TimestampMember":
+                return Optional.ofNullable(clazz.cast(timestampMember()));
+            case "StructWithNestedTimestampMember":
+                return Optional.ofNullable(clazz.cast(structWithNestedTimestampMember()));
+            case "BlobArg":
+                return Optional.ofNullable(clazz.cast(blobArg()));
+            case "StructWithNestedBlob":
+                return Optional.ofNullable(clazz.cast(structWithNestedBlob()));
+            case "BlobMap":
+                return Optional.ofNullable(clazz.cast(blobMap()));
+            case "ListOfBlobs":
+                return Optional.ofNullable(clazz.cast(listOfBlobs()));
+            case "RecursiveStruct":
+                return Optional.ofNullable(clazz.cast(recursiveStruct()));
+            case "PolymorphicTypeWithSubTypes":
+                return Optional.ofNullable(clazz.cast(polymorphicTypeWithSubTypes()));
+            case "PolymorphicTypeWithoutSubTypes":
+                return Optional.ofNullable(clazz.cast(polymorphicTypeWithoutSubTypes()));
+            case "EnumType":
+                return Optional.ofNullable(clazz.cast(enumTypeAsString()));
+            default:
+                return Optional.empty();
         }
     }
 
@@ -1256,7 +1468,7 @@ public interface Builder extends JsonProtocolTestsRequest.Builder, SdkPojo, Copy
          *
          * When the {@link Consumer} completes, {@link List<SimpleStruct>.Builder#build()} is called immediately and its
          * result is passed to {@link #listOfStructs(List<SimpleStruct>)}.
-         * 
+         *
          * @param listOfStructs
          *        a consumer that will call methods on {@link List<SimpleStruct>.Builder}
          * @return Returns a reference to this object so that method calls can be chained together.
@@ -1443,7 +1655,7 @@ public interface Builder extends JsonProtocolTestsRequest.Builder, SdkPojo, Copy
          *
          * When the {@link Consumer} completes, {@link StructWithTimestamp.Builder#build()} is called immediately and
          * its result is passed to {@link #structWithNestedTimestampMember(StructWithTimestamp)}.
-         * 
+         *
          * @param structWithNestedTimestampMember
          *        a consumer that will call methods on {@link StructWithTimestamp.Builder}
          * @return Returns a reference to this object so that method calls can be chained together.
@@ -1451,7 +1663,7 @@ public interface Builder extends JsonProtocolTestsRequest.Builder, SdkPojo, Copy
          */
         default Builder structWithNestedTimestampMember(Consumer<StructWithTimestamp.Builder> structWithNestedTimestampMember) {
             return structWithNestedTimestampMember(StructWithTimestamp.builder().applyMutation(structWithNestedTimestampMember)
-                    .build());
+                                                                      .build());
         }
 
         /**
@@ -1480,7 +1692,7 @@ default Builder structWithNestedTimestampMember(Consumer<StructWithTimestamp.Bui
          *
          * When the {@link Consumer} completes, {@link StructWithNestedBlobType.Builder#build()} is called immediately
          * and its result is passed to {@link #structWithNestedBlob(StructWithNestedBlobType)}.
-         * 
+         *
          * @param structWithNestedBlob
          *        a consumer that will call methods on {@link StructWithNestedBlobType.Builder}
          * @return Returns a reference to this object so that method calls can be chained together.
@@ -1534,7 +1746,7 @@ default Builder structWithNestedBlob(Consumer<StructWithNestedBlobType.Builder>
          *
          * When the {@link Consumer} completes, {@link RecursiveStructType.Builder#build()} is called immediately and
          * its result is passed to {@link #recursiveStruct(RecursiveStructType)}.
-         * 
+         *
          * @param recursiveStruct
          *        a consumer that will call methods on {@link RecursiveStructType.Builder}
          * @return Returns a reference to this object so that method calls can be chained together.
@@ -1561,7 +1773,7 @@ default Builder recursiveStruct(Consumer<RecursiveStructType.Builder> recursiveS
          *
          * When the {@link Consumer} completes, {@link BaseType.Builder#build()} is called immediately and its result is
          * passed to {@link #polymorphicTypeWithSubTypes(BaseType)}.
-         * 
+         *
          * @param polymorphicTypeWithSubTypes
          *        a consumer that will call methods on {@link BaseType.Builder}
          * @return Returns a reference to this object so that method calls can be chained together.
@@ -1588,7 +1800,7 @@ default Builder polymorphicTypeWithSubTypes(Consumer<BaseType.Builder> polymorph
          *
          * When the {@link Consumer} completes, {@link SubTypeOne.Builder#build()} is called immediately and its result
          * is passed to {@link #polymorphicTypeWithoutSubTypes(SubTypeOne)}.
-         * 
+         *
          * @param polymorphicTypeWithoutSubTypes
          *        a consumer that will call methods on {@link SubTypeOne.Builder}
          * @return Returns a reference to this object so that method calls can be chained together.
@@ -1887,7 +2099,7 @@ public final void setListOfMaps(Collection<? extends Map<String, String>> listOf
 
         public final Collection<SimpleStruct.Builder> getListOfStructs() {
             return listOfStructs != null ? listOfStructs.stream().map(SimpleStruct::toBuilder).collect(Collectors.toList())
-                    : null;
+                                         : null;
         }
 
         @Override
@@ -1907,7 +2119,7 @@ public final Builder listOfStructs(SimpleStruct... listOfStructs) {
         @SafeVarargs
         public final Builder listOfStructs(Consumer<SimpleStruct.Builder>... listOfStructs) {
             listOfStructs(Stream.of(listOfStructs).map(c -> SimpleStruct.builder().applyMutation(c).build())
-                    .collect(Collectors.toList()));
+                                .collect(Collectors.toList()));
             return this;
         }
 
@@ -1966,7 +2178,7 @@ public final void setMapOfStringToString(Map<String, String> mapOfStringToString
 
         public final Map<String, SimpleStruct.Builder> getMapOfStringToSimpleStruct() {
             return mapOfStringToSimpleStruct != null ? CollectionUtils.mapValues(mapOfStringToSimpleStruct,
-                    SimpleStruct::toBuilder) : null;
+                                                                                 SimpleStruct::toBuilder) : null;
         }
 
         @Override
@@ -2041,7 +2253,7 @@ public final void setMapOfStringToEnumWithStrings(Map<String, String> mapOfStrin
 
         public final Map<String, SimpleStruct.Builder> getMapOfEnumToSimpleStructAsStrings() {
             return mapOfEnumToSimpleStruct != null ? CollectionUtils.mapValues(mapOfEnumToSimpleStruct, SimpleStruct::toBuilder)
-                    : null;
+                                                   : null;
         }
 
         @Override
@@ -2126,7 +2338,7 @@ public final Builder structWithNestedTimestampMember(StructWithTimestamp structW
 
         public final void setStructWithNestedTimestampMember(StructWithTimestamp.BuilderImpl structWithNestedTimestampMember) {
             this.structWithNestedTimestampMember = structWithNestedTimestampMember != null ? structWithNestedTimestampMember
-                    .build() : null;
+                .build() : null;
         }
 
         public final ByteBuffer getBlobArg() {
@@ -2159,7 +2371,7 @@ public final void setStructWithNestedBlob(StructWithNestedBlobType.BuilderImpl s
 
         public final Map<String, ByteBuffer> getBlobMap() {
             return blobMap == null ? null : blobMap.entrySet().stream()
-                    .collect(Collectors.toMap(e -> e.getKey(), e -> e.getValue().asByteBuffer()));
+                                                   .collect(Collectors.toMap(e -> e.getKey(), e -> e.getValue().asByteBuffer()));
         }
 
         @Override
@@ -2170,7 +2382,7 @@ public final Builder blobMap(Map<String, SdkBytes> blobMap) {
 
         public final void setBlobMap(Map<String, ByteBuffer> blobMap) {
             blobMap(blobMap == null ? null : blobMap.entrySet().stream()
-                    .collect(Collectors.toMap(e -> e.getKey(), e -> SdkBytes.fromByteBuffer(e.getValue()))));
+                                                    .collect(Collectors.toMap(e -> e.getKey(), e -> SdkBytes.fromByteBuffer(e.getValue()))));
         }
 
         public final List<ByteBuffer> getListOfBlobs() {
@@ -2192,7 +2404,7 @@ public final Builder listOfBlobs(SdkBytes... listOfBlobs) {
 
         public final void setListOfBlobs(Collection<ByteBuffer> listOfBlobs) {
             listOfBlobs(listOfBlobs == null ? null : listOfBlobs.stream().map(SdkBytes::fromByteBuffer)
-                    .collect(Collectors.toList()));
+                                                                .collect(Collectors.toList()));
         }
 
         public final RecursiveStructType.Builder getRecursiveStruct() {
@@ -2235,7 +2447,7 @@ public final Builder polymorphicTypeWithoutSubTypes(SubTypeOne polymorphicTypeWi
 
         public final void setPolymorphicTypeWithoutSubTypes(SubTypeOne.BuilderImpl polymorphicTypeWithoutSubTypes) {
             this.polymorphicTypeWithoutSubTypes = polymorphicTypeWithoutSubTypes != null ? polymorphicTypeWithoutSubTypes.build()
-                    : null;
+                                                                                         : null;
         }
 
         public final String getEnumTypeAsString() {
diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/alltypesresponse.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/alltypesresponse.java
index 7ca4367ea5e9..925fed5ebbb0 100644
--- a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/alltypesresponse.java
+++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/alltypesresponse.java
@@ -26,6 +26,8 @@
 import software.amazon.awssdk.core.traits.MapTrait;
 import software.amazon.awssdk.core.util.DefaultSdkAutoConstructList;
 import software.amazon.awssdk.core.util.DefaultSdkAutoConstructMap;
+import software.amazon.awssdk.core.util.SdkAutoConstructList;
+import software.amazon.awssdk.core.util.SdkAutoConstructMap;
 import software.amazon.awssdk.utils.CollectionUtils;
 import software.amazon.awssdk.utils.ToString;
 import software.amazon.awssdk.utils.builder.CopyableBuilder;
@@ -35,344 +37,344 @@
  */
 @Generated("software.amazon.awssdk:codegen")
 public final class AllTypesResponse extends JsonProtocolTestsResponse implements
-        ToCopyableBuilder<AllTypesResponse.Builder, AllTypesResponse> {
+                                                                      ToCopyableBuilder<AllTypesResponse.Builder, AllTypesResponse> {
     private static final SdkField<String> STRING_MEMBER_FIELD = SdkField.<String> builder(MarshallingType.STRING)
-            .getter(getter(AllTypesResponse::stringMember)).setter(setter(Builder::stringMember))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("StringMember").build()).build();
+        .getter(getter(AllTypesResponse::stringMember)).setter(setter(Builder::stringMember))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("StringMember").build()).build();
 
     private static final SdkField<Integer> INTEGER_MEMBER_FIELD = SdkField.<Integer> builder(MarshallingType.INTEGER)
-            .getter(getter(AllTypesResponse::integerMember)).setter(setter(Builder::integerMember))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("IntegerMember").build()).build();
+        .getter(getter(AllTypesResponse::integerMember)).setter(setter(Builder::integerMember))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("IntegerMember").build()).build();
 
     private static final SdkField<Boolean> BOOLEAN_MEMBER_FIELD = SdkField.<Boolean> builder(MarshallingType.BOOLEAN)
-            .getter(getter(AllTypesResponse::booleanMember)).setter(setter(Builder::booleanMember))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("BooleanMember").build()).build();
+        .getter(getter(AllTypesResponse::booleanMember)).setter(setter(Builder::booleanMember))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("BooleanMember").build()).build();
 
     private static final SdkField<Float> FLOAT_MEMBER_FIELD = SdkField.<Float> builder(MarshallingType.FLOAT)
-            .getter(getter(AllTypesResponse::floatMember)).setter(setter(Builder::floatMember))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("FloatMember").build()).build();
+        .getter(getter(AllTypesResponse::floatMember)).setter(setter(Builder::floatMember))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("FloatMember").build()).build();
 
     private static final SdkField<Double> DOUBLE_MEMBER_FIELD = SdkField.<Double> builder(MarshallingType.DOUBLE)
-            .getter(getter(AllTypesResponse::doubleMember)).setter(setter(Builder::doubleMember))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("DoubleMember").build()).build();
+        .getter(getter(AllTypesResponse::doubleMember)).setter(setter(Builder::doubleMember))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("DoubleMember").build()).build();
 
     private static final SdkField<Long> LONG_MEMBER_FIELD = SdkField.<Long> builder(MarshallingType.LONG)
-            .getter(getter(AllTypesResponse::longMember)).setter(setter(Builder::longMember))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("LongMember").build()).build();
+        .getter(getter(AllTypesResponse::longMember)).setter(setter(Builder::longMember))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("LongMember").build()).build();
 
     private static final SdkField<List<String>> SIMPLE_LIST_FIELD = SdkField
-            .<List<String>> builder(MarshallingType.LIST)
-            .getter(getter(AllTypesResponse::simpleList))
-            .setter(setter(Builder::simpleList))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("SimpleList").build(),
-                    ListTrait
-                            .builder()
-                            .memberLocationName(null)
-                            .memberFieldInfo(
-                                    SdkField.<String> builder(MarshallingType.STRING)
-                                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
-                                                    .locationName("member").build()).build()).build()).build();
+        .<List<String>> builder(MarshallingType.LIST)
+        .getter(getter(AllTypesResponse::simpleList))
+        .setter(setter(Builder::simpleList))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("SimpleList").build(),
+                ListTrait
+                    .builder()
+                    .memberLocationName(null)
+                    .memberFieldInfo(
+                        SdkField.<String> builder(MarshallingType.STRING)
+                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
+                                                 .locationName("member").build()).build()).build()).build();
 
     private static final SdkField<List<String>> LIST_OF_ENUMS_FIELD = SdkField
-            .<List<String>> builder(MarshallingType.LIST)
-            .getter(getter(AllTypesResponse::listOfEnumsAsStrings))
-            .setter(setter(Builder::listOfEnumsWithStrings))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("ListOfEnums").build(),
-                    ListTrait
-                            .builder()
-                            .memberLocationName(null)
-                            .memberFieldInfo(
-                                    SdkField.<String> builder(MarshallingType.STRING)
-                                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
-                                                    .locationName("member").build()).build()).build()).build();
+        .<List<String>> builder(MarshallingType.LIST)
+        .getter(getter(AllTypesResponse::listOfEnumsAsStrings))
+        .setter(setter(Builder::listOfEnumsWithStrings))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("ListOfEnums").build(),
+                ListTrait
+                    .builder()
+                    .memberLocationName(null)
+                    .memberFieldInfo(
+                        SdkField.<String> builder(MarshallingType.STRING)
+                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
+                                                 .locationName("member").build()).build()).build()).build();
 
     private static final SdkField<List<Map<String, String>>> LIST_OF_MAPS_FIELD = SdkField
-            .<List<Map<String, String>>> builder(MarshallingType.LIST)
-            .getter(getter(AllTypesResponse::listOfMaps))
-            .setter(setter(Builder::listOfMaps))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("ListOfMaps").build(),
-                    ListTrait
-                            .builder()
-                            .memberLocationName(null)
-                            .memberFieldInfo(
-                                    SdkField.<Map<String, String>> builder(MarshallingType.MAP)
-                                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
-                                                    .locationName("member").build(),
-                                                    MapTrait.builder()
-                                                            .keyLocationName("key")
-                                                            .valueLocationName("value")
-                                                            .valueFieldInfo(
-                                                                    SdkField.<String> builder(MarshallingType.STRING)
-                                                                            .traits(LocationTrait.builder()
-                                                                                    .location(MarshallLocation.PAYLOAD)
-                                                                                    .locationName("value").build()).build())
-                                                            .build()).build()).build()).build();
+        .<List<Map<String, String>>> builder(MarshallingType.LIST)
+        .getter(getter(AllTypesResponse::listOfMaps))
+        .setter(setter(Builder::listOfMaps))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("ListOfMaps").build(),
+                ListTrait
+                    .builder()
+                    .memberLocationName(null)
+                    .memberFieldInfo(
+                        SdkField.<Map<String, String>> builder(MarshallingType.MAP)
+                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
+                                                 .locationName("member").build(),
+                                    MapTrait.builder()
+                                            .keyLocationName("key")
+                                            .valueLocationName("value")
+                                            .valueFieldInfo(
+                                                SdkField.<String> builder(MarshallingType.STRING)
+                                                    .traits(LocationTrait.builder()
+                                                                         .location(MarshallLocation.PAYLOAD)
+                                                                         .locationName("value").build()).build())
+                                            .build()).build()).build()).build();
 
     private static final SdkField<List<SimpleStruct>> LIST_OF_STRUCTS_FIELD = SdkField
-            .<List<SimpleStruct>> builder(MarshallingType.LIST)
-            .getter(getter(AllTypesResponse::listOfStructs))
-            .setter(setter(Builder::listOfStructs))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("ListOfStructs").build(),
-                    ListTrait
-                            .builder()
-                            .memberLocationName(null)
-                            .memberFieldInfo(
-                                    SdkField.<SimpleStruct> builder(MarshallingType.SDK_POJO)
-                                            .constructor(SimpleStruct::builder)
-                                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
-                                                    .locationName("member").build()).build()).build()).build();
+        .<List<SimpleStruct>> builder(MarshallingType.LIST)
+        .getter(getter(AllTypesResponse::listOfStructs))
+        .setter(setter(Builder::listOfStructs))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("ListOfStructs").build(),
+                ListTrait
+                    .builder()
+                    .memberLocationName(null)
+                    .memberFieldInfo(
+                        SdkField.<SimpleStruct> builder(MarshallingType.SDK_POJO)
+                            .constructor(SimpleStruct::builder)
+                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
+                                                 .locationName("member").build()).build()).build()).build();
 
     private static final SdkField<List<Map<String, String>>> LIST_OF_MAP_OF_ENUM_TO_STRING_FIELD = SdkField
-            .<List<Map<String, String>>> builder(MarshallingType.LIST)
-            .getter(getter(AllTypesResponse::listOfMapOfEnumToStringAsStrings))
-            .setter(setter(Builder::listOfMapOfEnumToStringWithStrings))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("ListOfMapOfEnumToString").build(),
-                    ListTrait
-                            .builder()
-                            .memberLocationName(null)
-                            .memberFieldInfo(
-                                    SdkField.<Map<String, String>> builder(MarshallingType.MAP)
-                                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
-                                                    .locationName("member").build(),
-                                                    MapTrait.builder()
-                                                            .keyLocationName("key")
-                                                            .valueLocationName("value")
-                                                            .valueFieldInfo(
-                                                                    SdkField.<String> builder(MarshallingType.STRING)
-                                                                            .traits(LocationTrait.builder()
-                                                                                    .location(MarshallLocation.PAYLOAD)
-                                                                                    .locationName("value").build()).build())
-                                                            .build()).build()).build()).build();
+        .<List<Map<String, String>>> builder(MarshallingType.LIST)
+        .getter(getter(AllTypesResponse::listOfMapOfEnumToStringAsStrings))
+        .setter(setter(Builder::listOfMapOfEnumToStringWithStrings))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("ListOfMapOfEnumToString").build(),
+                ListTrait
+                    .builder()
+                    .memberLocationName(null)
+                    .memberFieldInfo(
+                        SdkField.<Map<String, String>> builder(MarshallingType.MAP)
+                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
+                                                 .locationName("member").build(),
+                                    MapTrait.builder()
+                                            .keyLocationName("key")
+                                            .valueLocationName("value")
+                                            .valueFieldInfo(
+                                                SdkField.<String> builder(MarshallingType.STRING)
+                                                    .traits(LocationTrait.builder()
+                                                                         .location(MarshallLocation.PAYLOAD)
+                                                                         .locationName("value").build()).build())
+                                            .build()).build()).build()).build();
 
     private static final SdkField<Map<String, List<Integer>>> MAP_OF_STRING_TO_INTEGER_LIST_FIELD = SdkField
-            .<Map<String, List<Integer>>> builder(MarshallingType.MAP)
-            .getter(getter(AllTypesResponse::mapOfStringToIntegerList))
-            .setter(setter(Builder::mapOfStringToIntegerList))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("MapOfStringToIntegerList").build(),
-                    MapTrait.builder()
-                            .keyLocationName("key")
-                            .valueLocationName("value")
-                            .valueFieldInfo(
-                                    SdkField.<List<Integer>> builder(MarshallingType.LIST)
-                                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
-                                                    .locationName("value").build(),
-                                                    ListTrait
-                                                            .builder()
-                                                            .memberLocationName(null)
-                                                            .memberFieldInfo(
-                                                                    SdkField.<Integer> builder(MarshallingType.INTEGER)
-                                                                            .traits(LocationTrait.builder()
-                                                                                    .location(MarshallLocation.PAYLOAD)
-                                                                                    .locationName("member").build()).build())
-                                                            .build()).build()).build()).build();
+        .<Map<String, List<Integer>>> builder(MarshallingType.MAP)
+        .getter(getter(AllTypesResponse::mapOfStringToIntegerList))
+        .setter(setter(Builder::mapOfStringToIntegerList))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("MapOfStringToIntegerList").build(),
+                MapTrait.builder()
+                        .keyLocationName("key")
+                        .valueLocationName("value")
+                        .valueFieldInfo(
+                            SdkField.<List<Integer>> builder(MarshallingType.LIST)
+                                .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
+                                                     .locationName("value").build(),
+                                        ListTrait
+                                            .builder()
+                                            .memberLocationName(null)
+                                            .memberFieldInfo(
+                                                SdkField.<Integer> builder(MarshallingType.INTEGER)
+                                                    .traits(LocationTrait.builder()
+                                                                         .location(MarshallLocation.PAYLOAD)
+                                                                         .locationName("member").build()).build())
+                                            .build()).build()).build()).build();
 
     private static final SdkField<Map<String, String>> MAP_OF_STRING_TO_STRING_FIELD = SdkField
-            .<Map<String, String>> builder(MarshallingType.MAP)
-            .getter(getter(AllTypesResponse::mapOfStringToString))
-            .setter(setter(Builder::mapOfStringToString))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("MapOfStringToString").build(),
-                    MapTrait.builder()
-                            .keyLocationName("key")
-                            .valueLocationName("value")
-                            .valueFieldInfo(
-                                    SdkField.<String> builder(MarshallingType.STRING)
-                                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
-                                                    .locationName("value").build()).build()).build()).build();
+        .<Map<String, String>> builder(MarshallingType.MAP)
+        .getter(getter(AllTypesResponse::mapOfStringToString))
+        .setter(setter(Builder::mapOfStringToString))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("MapOfStringToString").build(),
+                MapTrait.builder()
+                        .keyLocationName("key")
+                        .valueLocationName("value")
+                        .valueFieldInfo(
+                            SdkField.<String> builder(MarshallingType.STRING)
+                                .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
+                                                     .locationName("value").build()).build()).build()).build();
 
     private static final SdkField<Map<String, SimpleStruct>> MAP_OF_STRING_TO_SIMPLE_STRUCT_FIELD = SdkField
-            .<Map<String, SimpleStruct>> builder(MarshallingType.MAP)
-            .getter(getter(AllTypesResponse::mapOfStringToSimpleStruct))
-            .setter(setter(Builder::mapOfStringToSimpleStruct))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("MapOfStringToSimpleStruct").build(),
-                    MapTrait.builder()
-                            .keyLocationName("key")
-                            .valueLocationName("value")
-                            .valueFieldInfo(
-                                    SdkField.<SimpleStruct> builder(MarshallingType.SDK_POJO)
-                                            .constructor(SimpleStruct::builder)
-                                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
-                                                    .locationName("value").build()).build()).build()).build();
+        .<Map<String, SimpleStruct>> builder(MarshallingType.MAP)
+        .getter(getter(AllTypesResponse::mapOfStringToSimpleStruct))
+        .setter(setter(Builder::mapOfStringToSimpleStruct))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("MapOfStringToSimpleStruct").build(),
+                MapTrait.builder()
+                        .keyLocationName("key")
+                        .valueLocationName("value")
+                        .valueFieldInfo(
+                            SdkField.<SimpleStruct> builder(MarshallingType.SDK_POJO)
+                                .constructor(SimpleStruct::builder)
+                                .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
+                                                     .locationName("value").build()).build()).build()).build();
 
     private static final SdkField<Map<String, String>> MAP_OF_ENUM_TO_ENUM_FIELD = SdkField
-            .<Map<String, String>> builder(MarshallingType.MAP)
-            .getter(getter(AllTypesResponse::mapOfEnumToEnumAsStrings))
-            .setter(setter(Builder::mapOfEnumToEnumWithStrings))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("MapOfEnumToEnum").build(),
-                    MapTrait.builder()
-                            .keyLocationName("key")
-                            .valueLocationName("value")
-                            .valueFieldInfo(
-                                    SdkField.<String> builder(MarshallingType.STRING)
-                                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
-                                                    .locationName("value").build()).build()).build()).build();
+        .<Map<String, String>> builder(MarshallingType.MAP)
+        .getter(getter(AllTypesResponse::mapOfEnumToEnumAsStrings))
+        .setter(setter(Builder::mapOfEnumToEnumWithStrings))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("MapOfEnumToEnum").build(),
+                MapTrait.builder()
+                        .keyLocationName("key")
+                        .valueLocationName("value")
+                        .valueFieldInfo(
+                            SdkField.<String> builder(MarshallingType.STRING)
+                                .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
+                                                     .locationName("value").build()).build()).build()).build();
 
     private static final SdkField<Map<String, String>> MAP_OF_ENUM_TO_STRING_FIELD = SdkField
-            .<Map<String, String>> builder(MarshallingType.MAP)
-            .getter(getter(AllTypesResponse::mapOfEnumToStringAsStrings))
-            .setter(setter(Builder::mapOfEnumToStringWithStrings))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("MapOfEnumToString").build(),
-                    MapTrait.builder()
-                            .keyLocationName("key")
-                            .valueLocationName("value")
-                            .valueFieldInfo(
-                                    SdkField.<String> builder(MarshallingType.STRING)
-                                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
-                                                    .locationName("value").build()).build()).build()).build();
+        .<Map<String, String>> builder(MarshallingType.MAP)
+        .getter(getter(AllTypesResponse::mapOfEnumToStringAsStrings))
+        .setter(setter(Builder::mapOfEnumToStringWithStrings))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("MapOfEnumToString").build(),
+                MapTrait.builder()
+                        .keyLocationName("key")
+                        .valueLocationName("value")
+                        .valueFieldInfo(
+                            SdkField.<String> builder(MarshallingType.STRING)
+                                .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
+                                                     .locationName("value").build()).build()).build()).build();
 
     private static final SdkField<Map<String, String>> MAP_OF_STRING_TO_ENUM_FIELD = SdkField
-            .<Map<String, String>> builder(MarshallingType.MAP)
-            .getter(getter(AllTypesResponse::mapOfStringToEnumAsStrings))
-            .setter(setter(Builder::mapOfStringToEnumWithStrings))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("MapOfStringToEnum").build(),
-                    MapTrait.builder()
-                            .keyLocationName("key")
-                            .valueLocationName("value")
-                            .valueFieldInfo(
-                                    SdkField.<String> builder(MarshallingType.STRING)
-                                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
-                                                    .locationName("value").build()).build()).build()).build();
+        .<Map<String, String>> builder(MarshallingType.MAP)
+        .getter(getter(AllTypesResponse::mapOfStringToEnumAsStrings))
+        .setter(setter(Builder::mapOfStringToEnumWithStrings))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("MapOfStringToEnum").build(),
+                MapTrait.builder()
+                        .keyLocationName("key")
+                        .valueLocationName("value")
+                        .valueFieldInfo(
+                            SdkField.<String> builder(MarshallingType.STRING)
+                                .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
+                                                     .locationName("value").build()).build()).build()).build();
 
     private static final SdkField<Map<String, SimpleStruct>> MAP_OF_ENUM_TO_SIMPLE_STRUCT_FIELD = SdkField
-            .<Map<String, SimpleStruct>> builder(MarshallingType.MAP)
-            .getter(getter(AllTypesResponse::mapOfEnumToSimpleStructAsStrings))
-            .setter(setter(Builder::mapOfEnumToSimpleStructWithStrings))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("MapOfEnumToSimpleStruct").build(),
-                    MapTrait.builder()
-                            .keyLocationName("key")
-                            .valueLocationName("value")
-                            .valueFieldInfo(
-                                    SdkField.<SimpleStruct> builder(MarshallingType.SDK_POJO)
-                                            .constructor(SimpleStruct::builder)
-                                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
-                                                    .locationName("value").build()).build()).build()).build();
+        .<Map<String, SimpleStruct>> builder(MarshallingType.MAP)
+        .getter(getter(AllTypesResponse::mapOfEnumToSimpleStructAsStrings))
+        .setter(setter(Builder::mapOfEnumToSimpleStructWithStrings))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("MapOfEnumToSimpleStruct").build(),
+                MapTrait.builder()
+                        .keyLocationName("key")
+                        .valueLocationName("value")
+                        .valueFieldInfo(
+                            SdkField.<SimpleStruct> builder(MarshallingType.SDK_POJO)
+                                .constructor(SimpleStruct::builder)
+                                .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
+                                                     .locationName("value").build()).build()).build()).build();
 
     private static final SdkField<Map<String, List<String>>> MAP_OF_ENUM_TO_LIST_OF_ENUMS_FIELD = SdkField
-            .<Map<String, List<String>>> builder(MarshallingType.MAP)
-            .getter(getter(AllTypesResponse::mapOfEnumToListOfEnumsAsStrings))
-            .setter(setter(Builder::mapOfEnumToListOfEnumsWithStrings))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("MapOfEnumToListOfEnums").build(),
-                    MapTrait.builder()
-                            .keyLocationName("key")
-                            .valueLocationName("value")
-                            .valueFieldInfo(
-                                    SdkField.<List<String>> builder(MarshallingType.LIST)
-                                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
-                                                    .locationName("value").build(),
-                                                    ListTrait
-                                                            .builder()
-                                                            .memberLocationName(null)
-                                                            .memberFieldInfo(
-                                                                    SdkField.<String> builder(MarshallingType.STRING)
-                                                                            .traits(LocationTrait.builder()
-                                                                                    .location(MarshallLocation.PAYLOAD)
-                                                                                    .locationName("member").build()).build())
-                                                            .build()).build()).build()).build();
+        .<Map<String, List<String>>> builder(MarshallingType.MAP)
+        .getter(getter(AllTypesResponse::mapOfEnumToListOfEnumsAsStrings))
+        .setter(setter(Builder::mapOfEnumToListOfEnumsWithStrings))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("MapOfEnumToListOfEnums").build(),
+                MapTrait.builder()
+                        .keyLocationName("key")
+                        .valueLocationName("value")
+                        .valueFieldInfo(
+                            SdkField.<List<String>> builder(MarshallingType.LIST)
+                                .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
+                                                     .locationName("value").build(),
+                                        ListTrait
+                                            .builder()
+                                            .memberLocationName(null)
+                                            .memberFieldInfo(
+                                                SdkField.<String> builder(MarshallingType.STRING)
+                                                    .traits(LocationTrait.builder()
+                                                                         .location(MarshallLocation.PAYLOAD)
+                                                                         .locationName("member").build()).build())
+                                            .build()).build()).build()).build();
 
     private static final SdkField<Map<String, Map<String, String>>> MAP_OF_ENUM_TO_MAP_OF_STRING_TO_ENUM_FIELD = SdkField
-            .<Map<String, Map<String, String>>> builder(MarshallingType.MAP)
-            .getter(getter(AllTypesResponse::mapOfEnumToMapOfStringToEnumAsStrings))
-            .setter(setter(Builder::mapOfEnumToMapOfStringToEnumWithStrings))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("MapOfEnumToMapOfStringToEnum")
-                    .build(),
-                    MapTrait.builder()
-                            .keyLocationName("key")
-                            .valueLocationName("value")
-                            .valueFieldInfo(
-                                    SdkField.<Map<String, String>> builder(MarshallingType.MAP)
-                                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
-                                                    .locationName("value").build(),
-                                                    MapTrait.builder()
-                                                            .keyLocationName("key")
-                                                            .valueLocationName("value")
-                                                            .valueFieldInfo(
-                                                                    SdkField.<String> builder(MarshallingType.STRING)
-                                                                            .traits(LocationTrait.builder()
-                                                                                    .location(MarshallLocation.PAYLOAD)
-                                                                                    .locationName("value").build()).build())
-                                                            .build()).build()).build()).build();
+        .<Map<String, Map<String, String>>> builder(MarshallingType.MAP)
+        .getter(getter(AllTypesResponse::mapOfEnumToMapOfStringToEnumAsStrings))
+        .setter(setter(Builder::mapOfEnumToMapOfStringToEnumWithStrings))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("MapOfEnumToMapOfStringToEnum")
+                             .build(),
+                MapTrait.builder()
+                        .keyLocationName("key")
+                        .valueLocationName("value")
+                        .valueFieldInfo(
+                            SdkField.<Map<String, String>> builder(MarshallingType.MAP)
+                                .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
+                                                     .locationName("value").build(),
+                                        MapTrait.builder()
+                                                .keyLocationName("key")
+                                                .valueLocationName("value")
+                                                .valueFieldInfo(
+                                                    SdkField.<String> builder(MarshallingType.STRING)
+                                                        .traits(LocationTrait.builder()
+                                                                             .location(MarshallLocation.PAYLOAD)
+                                                                             .locationName("value").build()).build())
+                                                .build()).build()).build()).build();
 
     private static final SdkField<Instant> TIMESTAMP_MEMBER_FIELD = SdkField.<Instant> builder(MarshallingType.INSTANT)
-            .getter(getter(AllTypesResponse::timestampMember)).setter(setter(Builder::timestampMember))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("TimestampMember").build()).build();
+        .getter(getter(AllTypesResponse::timestampMember)).setter(setter(Builder::timestampMember))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("TimestampMember").build()).build();
 
     private static final SdkField<StructWithTimestamp> STRUCT_WITH_NESTED_TIMESTAMP_MEMBER_FIELD = SdkField
-            .<StructWithTimestamp> builder(MarshallingType.SDK_POJO)
-            .getter(getter(AllTypesResponse::structWithNestedTimestampMember))
-            .setter(setter(Builder::structWithNestedTimestampMember))
-            .constructor(StructWithTimestamp::builder)
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("StructWithNestedTimestampMember")
-                    .build()).build();
+        .<StructWithTimestamp> builder(MarshallingType.SDK_POJO)
+        .getter(getter(AllTypesResponse::structWithNestedTimestampMember))
+        .setter(setter(Builder::structWithNestedTimestampMember))
+        .constructor(StructWithTimestamp::builder)
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("StructWithNestedTimestampMember")
+                             .build()).build();
 
     private static final SdkField<SdkBytes> BLOB_ARG_FIELD = SdkField.<SdkBytes> builder(MarshallingType.SDK_BYTES)
-            .getter(getter(AllTypesResponse::blobArg)).setter(setter(Builder::blobArg))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("BlobArg").build()).build();
+        .getter(getter(AllTypesResponse::blobArg)).setter(setter(Builder::blobArg))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("BlobArg").build()).build();
 
     private static final SdkField<StructWithNestedBlobType> STRUCT_WITH_NESTED_BLOB_FIELD = SdkField
-            .<StructWithNestedBlobType> builder(MarshallingType.SDK_POJO).getter(getter(AllTypesResponse::structWithNestedBlob))
-            .setter(setter(Builder::structWithNestedBlob)).constructor(StructWithNestedBlobType::builder)
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("StructWithNestedBlob").build())
-            .build();
+        .<StructWithNestedBlobType> builder(MarshallingType.SDK_POJO).getter(getter(AllTypesResponse::structWithNestedBlob))
+                                                                     .setter(setter(Builder::structWithNestedBlob)).constructor(StructWithNestedBlobType::builder)
+                                                                     .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("StructWithNestedBlob").build())
+                                                                     .build();
 
     private static final SdkField<Map<String, SdkBytes>> BLOB_MAP_FIELD = SdkField
-            .<Map<String, SdkBytes>> builder(MarshallingType.MAP)
-            .getter(getter(AllTypesResponse::blobMap))
-            .setter(setter(Builder::blobMap))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("BlobMap").build(),
-                    MapTrait.builder()
-                            .keyLocationName("key")
-                            .valueLocationName("value")
-                            .valueFieldInfo(
-                                    SdkField.<SdkBytes> builder(MarshallingType.SDK_BYTES)
-                                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
-                                                    .locationName("value").build()).build()).build()).build();
+        .<Map<String, SdkBytes>> builder(MarshallingType.MAP)
+        .getter(getter(AllTypesResponse::blobMap))
+        .setter(setter(Builder::blobMap))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("BlobMap").build(),
+                MapTrait.builder()
+                        .keyLocationName("key")
+                        .valueLocationName("value")
+                        .valueFieldInfo(
+                            SdkField.<SdkBytes> builder(MarshallingType.SDK_BYTES)
+                                .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
+                                                     .locationName("value").build()).build()).build()).build();
 
     private static final SdkField<List<SdkBytes>> LIST_OF_BLOBS_FIELD = SdkField
-            .<List<SdkBytes>> builder(MarshallingType.LIST)
-            .getter(getter(AllTypesResponse::listOfBlobs))
-            .setter(setter(Builder::listOfBlobs))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("ListOfBlobs").build(),
-                    ListTrait
-                            .builder()
-                            .memberLocationName(null)
-                            .memberFieldInfo(
-                                    SdkField.<SdkBytes> builder(MarshallingType.SDK_BYTES)
-                                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
-                                                    .locationName("member").build()).build()).build()).build();
+        .<List<SdkBytes>> builder(MarshallingType.LIST)
+        .getter(getter(AllTypesResponse::listOfBlobs))
+        .setter(setter(Builder::listOfBlobs))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("ListOfBlobs").build(),
+                ListTrait
+                    .builder()
+                    .memberLocationName(null)
+                    .memberFieldInfo(
+                        SdkField.<SdkBytes> builder(MarshallingType.SDK_BYTES)
+                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
+                                                 .locationName("member").build()).build()).build()).build();
 
     private static final SdkField<RecursiveStructType> RECURSIVE_STRUCT_FIELD = SdkField
-            .<RecursiveStructType> builder(MarshallingType.SDK_POJO).getter(getter(AllTypesResponse::recursiveStruct))
-            .setter(setter(Builder::recursiveStruct)).constructor(RecursiveStructType::builder)
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("RecursiveStruct").build()).build();
+        .<RecursiveStructType> builder(MarshallingType.SDK_POJO).getter(getter(AllTypesResponse::recursiveStruct))
+                                                                .setter(setter(Builder::recursiveStruct)).constructor(RecursiveStructType::builder)
+                                                                .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("RecursiveStruct").build()).build();
 
     private static final SdkField<BaseType> POLYMORPHIC_TYPE_WITH_SUB_TYPES_FIELD = SdkField
-            .<BaseType> builder(MarshallingType.SDK_POJO)
-            .getter(getter(AllTypesResponse::polymorphicTypeWithSubTypes))
-            .setter(setter(Builder::polymorphicTypeWithSubTypes))
-            .constructor(BaseType::builder)
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("PolymorphicTypeWithSubTypes")
-                    .build()).build();
+        .<BaseType> builder(MarshallingType.SDK_POJO)
+        .getter(getter(AllTypesResponse::polymorphicTypeWithSubTypes))
+        .setter(setter(Builder::polymorphicTypeWithSubTypes))
+        .constructor(BaseType::builder)
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("PolymorphicTypeWithSubTypes")
+                             .build()).build();
 
     private static final SdkField<SubTypeOne> POLYMORPHIC_TYPE_WITHOUT_SUB_TYPES_FIELD = SdkField
-            .<SubTypeOne> builder(MarshallingType.SDK_POJO)
-            .getter(getter(AllTypesResponse::polymorphicTypeWithoutSubTypes))
-            .setter(setter(Builder::polymorphicTypeWithoutSubTypes))
-            .constructor(SubTypeOne::builder)
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("PolymorphicTypeWithoutSubTypes")
-                    .build()).build();
+        .<SubTypeOne> builder(MarshallingType.SDK_POJO)
+        .getter(getter(AllTypesResponse::polymorphicTypeWithoutSubTypes))
+        .setter(setter(Builder::polymorphicTypeWithoutSubTypes))
+        .constructor(SubTypeOne::builder)
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("PolymorphicTypeWithoutSubTypes")
+                             .build()).build();
 
     private static final SdkField<String> ENUM_TYPE_FIELD = SdkField.<String> builder(MarshallingType.STRING)
-            .getter(getter(AllTypesResponse::enumTypeAsString)).setter(setter(Builder::enumType))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("EnumType").build()).build();
+        .getter(getter(AllTypesResponse::enumTypeAsString)).setter(setter(Builder::enumType))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("EnumType").build()).build();
 
     private static final List<SdkField<?>> SDK_FIELDS = Collections.unmodifiableList(Arrays.asList(STRING_MEMBER_FIELD,
-            INTEGER_MEMBER_FIELD, BOOLEAN_MEMBER_FIELD, FLOAT_MEMBER_FIELD, DOUBLE_MEMBER_FIELD, LONG_MEMBER_FIELD,
-            SIMPLE_LIST_FIELD, LIST_OF_ENUMS_FIELD, LIST_OF_MAPS_FIELD, LIST_OF_STRUCTS_FIELD,
-            LIST_OF_MAP_OF_ENUM_TO_STRING_FIELD, MAP_OF_STRING_TO_INTEGER_LIST_FIELD, MAP_OF_STRING_TO_STRING_FIELD,
-            MAP_OF_STRING_TO_SIMPLE_STRUCT_FIELD, MAP_OF_ENUM_TO_ENUM_FIELD, MAP_OF_ENUM_TO_STRING_FIELD,
-            MAP_OF_STRING_TO_ENUM_FIELD, MAP_OF_ENUM_TO_SIMPLE_STRUCT_FIELD, MAP_OF_ENUM_TO_LIST_OF_ENUMS_FIELD,
-            MAP_OF_ENUM_TO_MAP_OF_STRING_TO_ENUM_FIELD, TIMESTAMP_MEMBER_FIELD, STRUCT_WITH_NESTED_TIMESTAMP_MEMBER_FIELD,
-            BLOB_ARG_FIELD, STRUCT_WITH_NESTED_BLOB_FIELD, BLOB_MAP_FIELD, LIST_OF_BLOBS_FIELD, RECURSIVE_STRUCT_FIELD,
-            POLYMORPHIC_TYPE_WITH_SUB_TYPES_FIELD, POLYMORPHIC_TYPE_WITHOUT_SUB_TYPES_FIELD, ENUM_TYPE_FIELD));
+                                                                                                   INTEGER_MEMBER_FIELD, BOOLEAN_MEMBER_FIELD, FLOAT_MEMBER_FIELD, DOUBLE_MEMBER_FIELD, LONG_MEMBER_FIELD,
+                                                                                                   SIMPLE_LIST_FIELD, LIST_OF_ENUMS_FIELD, LIST_OF_MAPS_FIELD, LIST_OF_STRUCTS_FIELD,
+                                                                                                   LIST_OF_MAP_OF_ENUM_TO_STRING_FIELD, MAP_OF_STRING_TO_INTEGER_LIST_FIELD, MAP_OF_STRING_TO_STRING_FIELD,
+                                                                                                   MAP_OF_STRING_TO_SIMPLE_STRUCT_FIELD, MAP_OF_ENUM_TO_ENUM_FIELD, MAP_OF_ENUM_TO_STRING_FIELD,
+                                                                                                   MAP_OF_STRING_TO_ENUM_FIELD, MAP_OF_ENUM_TO_SIMPLE_STRUCT_FIELD, MAP_OF_ENUM_TO_LIST_OF_ENUMS_FIELD,
+                                                                                                   MAP_OF_ENUM_TO_MAP_OF_STRING_TO_ENUM_FIELD, TIMESTAMP_MEMBER_FIELD, STRUCT_WITH_NESTED_TIMESTAMP_MEMBER_FIELD,
+                                                                                                   BLOB_ARG_FIELD, STRUCT_WITH_NESTED_BLOB_FIELD, BLOB_MAP_FIELD, LIST_OF_BLOBS_FIELD, RECURSIVE_STRUCT_FIELD,
+                                                                                                   POLYMORPHIC_TYPE_WITH_SUB_TYPES_FIELD, POLYMORPHIC_TYPE_WITHOUT_SUB_TYPES_FIELD, ENUM_TYPE_FIELD));
 
     private final String stringMember;
 
@@ -470,7 +472,7 @@ private AllTypesResponse(BuilderImpl builder) {
 
     /**
      * Returns the value of the StringMember property for this object.
-     * 
+     *
      * @return The value of the StringMember property for this object.
      */
     public String stringMember() {
@@ -479,7 +481,7 @@ public String stringMember() {
 
     /**
      * Returns the value of the IntegerMember property for this object.
-     * 
+     *
      * @return The value of the IntegerMember property for this object.
      */
     public Integer integerMember() {
@@ -488,7 +490,7 @@ public Integer integerMember() {
 
     /**
      * Returns the value of the BooleanMember property for this object.
-     * 
+     *
      * @return The value of the BooleanMember property for this object.
      */
     public Boolean booleanMember() {
@@ -497,7 +499,7 @@ public Boolean booleanMember() {
 
     /**
      * Returns the value of the FloatMember property for this object.
-     * 
+     *
      * @return The value of the FloatMember property for this object.
      */
     public Float floatMember() {
@@ -506,7 +508,7 @@ public Float floatMember() {
 
     /**
      * Returns the value of the DoubleMember property for this object.
-     * 
+     *
      * @return The value of the DoubleMember property for this object.
      */
     public Double doubleMember() {
@@ -515,19 +517,30 @@ public Double doubleMember() {
 
     /**
      * Returns the value of the LongMember property for this object.
-     * 
+     *
      * @return The value of the LongMember property for this object.
      */
     public Long longMember() {
         return longMember;
     }
 
+    /**
+     * Returns true if the SimpleList property was specified by the sender (it may be empty), or false if the sender did
+     * not specify the value (it will be empty). For responses returned by the SDK, the sender is the AWS service.
+     */
+    public boolean hasSimpleList() {
+        return simpleList != null && !(simpleList instanceof SdkAutoConstructList);
+    }
+
     /**
      * Returns the value of the SimpleList property for this object.
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
-     * 
+     * <p>
+     * You can use {@link #hasSimpleList()} to see if a value was sent in this field.
+     * </p>
+     *
      * @return The value of the SimpleList property for this object.
      */
     public List<String> simpleList() {
@@ -539,43 +552,79 @@ public List<String> simpleList() {
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
-     * 
+     * <p>
+     * You can use {@link #hasListOfEnums()} to see if a value was sent in this field.
+     * </p>
+     *
      * @return The value of the ListOfEnums property for this object.
      */
     public List<EnumType> listOfEnums() {
         return ListOfEnumsCopier.copyStringToEnum(listOfEnums);
     }
 
+    /**
+     * Returns true if the ListOfEnums property was specified by the sender (it may be empty), or false if the sender
+     * did not specify the value (it will be empty). For responses returned by the SDK, the sender is the AWS service.
+     */
+    public boolean hasListOfEnums() {
+        return listOfEnums != null && !(listOfEnums instanceof SdkAutoConstructList);
+    }
+
     /**
      * Returns the value of the ListOfEnums property for this object.
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
-     * 
+     * <p>
+     * You can use {@link #hasListOfEnums()} to see if a value was sent in this field.
+     * </p>
+     *
      * @return The value of the ListOfEnums property for this object.
      */
     public List<String> listOfEnumsAsStrings() {
         return listOfEnums;
     }
 
+    /**
+     * Returns true if the ListOfMaps property was specified by the sender (it may be empty), or false if the sender did
+     * not specify the value (it will be empty). For responses returned by the SDK, the sender is the AWS service.
+     */
+    public boolean hasListOfMaps() {
+        return listOfMaps != null && !(listOfMaps instanceof SdkAutoConstructList);
+    }
+
     /**
      * Returns the value of the ListOfMaps property for this object.
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
-     * 
+     * <p>
+     * You can use {@link #hasListOfMaps()} to see if a value was sent in this field.
+     * </p>
+     *
      * @return The value of the ListOfMaps property for this object.
      */
     public List<Map<String, String>> listOfMaps() {
         return listOfMaps;
     }
 
+    /**
+     * Returns true if the ListOfStructs property was specified by the sender (it may be empty), or false if the sender
+     * did not specify the value (it will be empty). For responses returned by the SDK, the sender is the AWS service.
+     */
+    public boolean hasListOfStructs() {
+        return listOfStructs != null && !(listOfStructs instanceof SdkAutoConstructList);
+    }
+
     /**
      * Returns the value of the ListOfStructs property for this object.
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
-     * 
+     * <p>
+     * You can use {@link #hasListOfStructs()} to see if a value was sent in this field.
+     * </p>
+     *
      * @return The value of the ListOfStructs property for this object.
      */
     public List<SimpleStruct> listOfStructs() {
@@ -587,55 +636,106 @@ public List<SimpleStruct> listOfStructs() {
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
-     * 
+     * <p>
+     * You can use {@link #hasListOfMapOfEnumToString()} to see if a value was sent in this field.
+     * </p>
+     *
      * @return The value of the ListOfMapOfEnumToString property for this object.
      */
     public List<Map<EnumType, String>> listOfMapOfEnumToString() {
         return ListOfMapOfEnumToStringCopier.copyStringToEnum(listOfMapOfEnumToString);
     }
 
+    /**
+     * Returns true if the ListOfMapOfEnumToString property was specified by the sender (it may be empty), or false if
+     * the sender did not specify the value (it will be empty). For responses returned by the SDK, the sender is the AWS
+     * service.
+     */
+    public boolean hasListOfMapOfEnumToString() {
+        return listOfMapOfEnumToString != null && !(listOfMapOfEnumToString instanceof SdkAutoConstructList);
+    }
+
     /**
      * Returns the value of the ListOfMapOfEnumToString property for this object.
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
-     * 
+     * <p>
+     * You can use {@link #hasListOfMapOfEnumToString()} to see if a value was sent in this field.
+     * </p>
+     *
      * @return The value of the ListOfMapOfEnumToString property for this object.
      */
     public List<Map<String, String>> listOfMapOfEnumToStringAsStrings() {
         return listOfMapOfEnumToString;
     }
 
+    /**
+     * Returns true if the MapOfStringToIntegerList property was specified by the sender (it may be empty), or false if
+     * the sender did not specify the value (it will be empty). For responses returned by the SDK, the sender is the AWS
+     * service.
+     */
+    public boolean hasMapOfStringToIntegerList() {
+        return mapOfStringToIntegerList != null && !(mapOfStringToIntegerList instanceof SdkAutoConstructMap);
+    }
+
     /**
      * Returns the value of the MapOfStringToIntegerList property for this object.
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
-     * 
+     * <p>
+     * You can use {@link #hasMapOfStringToIntegerList()} to see if a value was sent in this field.
+     * </p>
+     *
      * @return The value of the MapOfStringToIntegerList property for this object.
      */
     public Map<String, List<Integer>> mapOfStringToIntegerList() {
         return mapOfStringToIntegerList;
     }
 
+    /**
+     * Returns true if the MapOfStringToString property was specified by the sender (it may be empty), or false if the
+     * sender did not specify the value (it will be empty). For responses returned by the SDK, the sender is the AWS
+     * service.
+     */
+    public boolean hasMapOfStringToString() {
+        return mapOfStringToString != null && !(mapOfStringToString instanceof SdkAutoConstructMap);
+    }
+
     /**
      * Returns the value of the MapOfStringToString property for this object.
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
-     * 
+     * <p>
+     * You can use {@link #hasMapOfStringToString()} to see if a value was sent in this field.
+     * </p>
+     *
      * @return The value of the MapOfStringToString property for this object.
      */
     public Map<String, String> mapOfStringToString() {
         return mapOfStringToString;
     }
 
+    /**
+     * Returns true if the MapOfStringToSimpleStruct property was specified by the sender (it may be empty), or false if
+     * the sender did not specify the value (it will be empty). For responses returned by the SDK, the sender is the AWS
+     * service.
+     */
+    public boolean hasMapOfStringToSimpleStruct() {
+        return mapOfStringToSimpleStruct != null && !(mapOfStringToSimpleStruct instanceof SdkAutoConstructMap);
+    }
+
     /**
      * Returns the value of the MapOfStringToSimpleStruct property for this object.
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
-     * 
+     * <p>
+     * You can use {@link #hasMapOfStringToSimpleStruct()} to see if a value was sent in this field.
+     * </p>
+     *
      * @return The value of the MapOfStringToSimpleStruct property for this object.
      */
     public Map<String, SimpleStruct> mapOfStringToSimpleStruct() {
@@ -647,19 +747,34 @@ public Map<String, SimpleStruct> mapOfStringToSimpleStruct() {
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
-     * 
+     * <p>
+     * You can use {@link #hasMapOfEnumToEnum()} to see if a value was sent in this field.
+     * </p>
+     *
      * @return The value of the MapOfEnumToEnum property for this object.
      */
     public Map<EnumType, EnumType> mapOfEnumToEnum() {
         return MapOfEnumToEnumCopier.copyStringToEnum(mapOfEnumToEnum);
     }
 
+    /**
+     * Returns true if the MapOfEnumToEnum property was specified by the sender (it may be empty), or false if the
+     * sender did not specify the value (it will be empty). For responses returned by the SDK, the sender is the AWS
+     * service.
+     */
+    public boolean hasMapOfEnumToEnum() {
+        return mapOfEnumToEnum != null && !(mapOfEnumToEnum instanceof SdkAutoConstructMap);
+    }
+
     /**
      * Returns the value of the MapOfEnumToEnum property for this object.
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
-     * 
+     * <p>
+     * You can use {@link #hasMapOfEnumToEnum()} to see if a value was sent in this field.
+     * </p>
+     *
      * @return The value of the MapOfEnumToEnum property for this object.
      */
     public Map<String, String> mapOfEnumToEnumAsStrings() {
@@ -671,19 +786,34 @@ public Map<String, String> mapOfEnumToEnumAsStrings() {
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
-     * 
+     * <p>
+     * You can use {@link #hasMapOfEnumToString()} to see if a value was sent in this field.
+     * </p>
+     *
      * @return The value of the MapOfEnumToString property for this object.
      */
     public Map<EnumType, String> mapOfEnumToString() {
         return MapOfEnumToStringCopier.copyStringToEnum(mapOfEnumToString);
     }
 
+    /**
+     * Returns true if the MapOfEnumToString property was specified by the sender (it may be empty), or false if the
+     * sender did not specify the value (it will be empty). For responses returned by the SDK, the sender is the AWS
+     * service.
+     */
+    public boolean hasMapOfEnumToString() {
+        return mapOfEnumToString != null && !(mapOfEnumToString instanceof SdkAutoConstructMap);
+    }
+
     /**
      * Returns the value of the MapOfEnumToString property for this object.
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
-     * 
+     * <p>
+     * You can use {@link #hasMapOfEnumToString()} to see if a value was sent in this field.
+     * </p>
+     *
      * @return The value of the MapOfEnumToString property for this object.
      */
     public Map<String, String> mapOfEnumToStringAsStrings() {
@@ -695,19 +825,34 @@ public Map<String, String> mapOfEnumToStringAsStrings() {
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
-     * 
+     * <p>
+     * You can use {@link #hasMapOfStringToEnum()} to see if a value was sent in this field.
+     * </p>
+     *
      * @return The value of the MapOfStringToEnum property for this object.
      */
     public Map<String, EnumType> mapOfStringToEnum() {
         return MapOfStringToEnumCopier.copyStringToEnum(mapOfStringToEnum);
     }
 
+    /**
+     * Returns true if the MapOfStringToEnum property was specified by the sender (it may be empty), or false if the
+     * sender did not specify the value (it will be empty). For responses returned by the SDK, the sender is the AWS
+     * service.
+     */
+    public boolean hasMapOfStringToEnum() {
+        return mapOfStringToEnum != null && !(mapOfStringToEnum instanceof SdkAutoConstructMap);
+    }
+
     /**
      * Returns the value of the MapOfStringToEnum property for this object.
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
-     * 
+     * <p>
+     * You can use {@link #hasMapOfStringToEnum()} to see if a value was sent in this field.
+     * </p>
+     *
      * @return The value of the MapOfStringToEnum property for this object.
      */
     public Map<String, String> mapOfStringToEnumAsStrings() {
@@ -719,19 +864,34 @@ public Map<String, String> mapOfStringToEnumAsStrings() {
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
-     * 
+     * <p>
+     * You can use {@link #hasMapOfEnumToSimpleStruct()} to see if a value was sent in this field.
+     * </p>
+     *
      * @return The value of the MapOfEnumToSimpleStruct property for this object.
      */
     public Map<EnumType, SimpleStruct> mapOfEnumToSimpleStruct() {
         return MapOfEnumToSimpleStructCopier.copyStringToEnum(mapOfEnumToSimpleStruct);
     }
 
+    /**
+     * Returns true if the MapOfEnumToSimpleStruct property was specified by the sender (it may be empty), or false if
+     * the sender did not specify the value (it will be empty). For responses returned by the SDK, the sender is the AWS
+     * service.
+     */
+    public boolean hasMapOfEnumToSimpleStruct() {
+        return mapOfEnumToSimpleStruct != null && !(mapOfEnumToSimpleStruct instanceof SdkAutoConstructMap);
+    }
+
     /**
      * Returns the value of the MapOfEnumToSimpleStruct property for this object.
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
-     * 
+     * <p>
+     * You can use {@link #hasMapOfEnumToSimpleStruct()} to see if a value was sent in this field.
+     * </p>
+     *
      * @return The value of the MapOfEnumToSimpleStruct property for this object.
      */
     public Map<String, SimpleStruct> mapOfEnumToSimpleStructAsStrings() {
@@ -743,19 +903,34 @@ public Map<String, SimpleStruct> mapOfEnumToSimpleStructAsStrings() {
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
-     * 
+     * <p>
+     * You can use {@link #hasMapOfEnumToListOfEnums()} to see if a value was sent in this field.
+     * </p>
+     *
      * @return The value of the MapOfEnumToListOfEnums property for this object.
      */
     public Map<EnumType, List<EnumType>> mapOfEnumToListOfEnums() {
         return MapOfEnumToListOfEnumsCopier.copyStringToEnum(mapOfEnumToListOfEnums);
     }
 
+    /**
+     * Returns true if the MapOfEnumToListOfEnums property was specified by the sender (it may be empty), or false if
+     * the sender did not specify the value (it will be empty). For responses returned by the SDK, the sender is the AWS
+     * service.
+     */
+    public boolean hasMapOfEnumToListOfEnums() {
+        return mapOfEnumToListOfEnums != null && !(mapOfEnumToListOfEnums instanceof SdkAutoConstructMap);
+    }
+
     /**
      * Returns the value of the MapOfEnumToListOfEnums property for this object.
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
-     * 
+     * <p>
+     * You can use {@link #hasMapOfEnumToListOfEnums()} to see if a value was sent in this field.
+     * </p>
+     *
      * @return The value of the MapOfEnumToListOfEnums property for this object.
      */
     public Map<String, List<String>> mapOfEnumToListOfEnumsAsStrings() {
@@ -767,19 +942,34 @@ public Map<String, List<String>> mapOfEnumToListOfEnumsAsStrings() {
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
-     * 
+     * <p>
+     * You can use {@link #hasMapOfEnumToMapOfStringToEnum()} to see if a value was sent in this field.
+     * </p>
+     *
      * @return The value of the MapOfEnumToMapOfStringToEnum property for this object.
      */
     public Map<EnumType, Map<String, EnumType>> mapOfEnumToMapOfStringToEnum() {
         return MapOfEnumToMapOfStringToEnumCopier.copyStringToEnum(mapOfEnumToMapOfStringToEnum);
     }
 
+    /**
+     * Returns true if the MapOfEnumToMapOfStringToEnum property was specified by the sender (it may be empty), or false
+     * if the sender did not specify the value (it will be empty). For responses returned by the SDK, the sender is the
+     * AWS service.
+     */
+    public boolean hasMapOfEnumToMapOfStringToEnum() {
+        return mapOfEnumToMapOfStringToEnum != null && !(mapOfEnumToMapOfStringToEnum instanceof SdkAutoConstructMap);
+    }
+
     /**
      * Returns the value of the MapOfEnumToMapOfStringToEnum property for this object.
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
-     * 
+     * <p>
+     * You can use {@link #hasMapOfEnumToMapOfStringToEnum()} to see if a value was sent in this field.
+     * </p>
+     *
      * @return The value of the MapOfEnumToMapOfStringToEnum property for this object.
      */
     public Map<String, Map<String, String>> mapOfEnumToMapOfStringToEnumAsStrings() {
@@ -788,7 +978,7 @@ public Map<String, Map<String, String>> mapOfEnumToMapOfStringToEnumAsStrings()
 
     /**
      * Returns the value of the TimestampMember property for this object.
-     * 
+     *
      * @return The value of the TimestampMember property for this object.
      */
     public Instant timestampMember() {
@@ -797,7 +987,7 @@ public Instant timestampMember() {
 
     /**
      * Returns the value of the StructWithNestedTimestampMember property for this object.
-     * 
+     *
      * @return The value of the StructWithNestedTimestampMember property for this object.
      */
     public StructWithTimestamp structWithNestedTimestampMember() {
@@ -806,7 +996,7 @@ public StructWithTimestamp structWithNestedTimestampMember() {
 
     /**
      * Returns the value of the BlobArg property for this object.
-     * 
+     *
      * @return The value of the BlobArg property for this object.
      */
     public SdkBytes blobArg() {
@@ -815,31 +1005,53 @@ public SdkBytes blobArg() {
 
     /**
      * Returns the value of the StructWithNestedBlob property for this object.
-     * 
+     *
      * @return The value of the StructWithNestedBlob property for this object.
      */
     public StructWithNestedBlobType structWithNestedBlob() {
         return structWithNestedBlob;
     }
 
+    /**
+     * Returns true if the BlobMap property was specified by the sender (it may be empty), or false if the sender did
+     * not specify the value (it will be empty). For responses returned by the SDK, the sender is the AWS service.
+     */
+    public boolean hasBlobMap() {
+        return blobMap != null && !(blobMap instanceof SdkAutoConstructMap);
+    }
+
     /**
      * Returns the value of the BlobMap property for this object.
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
-     * 
+     * <p>
+     * You can use {@link #hasBlobMap()} to see if a value was sent in this field.
+     * </p>
+     *
      * @return The value of the BlobMap property for this object.
      */
     public Map<String, SdkBytes> blobMap() {
         return blobMap;
     }
 
+    /**
+     * Returns true if the ListOfBlobs property was specified by the sender (it may be empty), or false if the sender
+     * did not specify the value (it will be empty). For responses returned by the SDK, the sender is the AWS service.
+     */
+    public boolean hasListOfBlobs() {
+        return listOfBlobs != null && !(listOfBlobs instanceof SdkAutoConstructList);
+    }
+
     /**
      * Returns the value of the ListOfBlobs property for this object.
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
-     * 
+     * <p>
+     * You can use {@link #hasListOfBlobs()} to see if a value was sent in this field.
+     * </p>
+     *
      * @return The value of the ListOfBlobs property for this object.
      */
     public List<SdkBytes> listOfBlobs() {
@@ -848,7 +1060,7 @@ public List<SdkBytes> listOfBlobs() {
 
     /**
      * Returns the value of the RecursiveStruct property for this object.
-     * 
+     *
      * @return The value of the RecursiveStruct property for this object.
      */
     public RecursiveStructType recursiveStruct() {
@@ -857,7 +1069,7 @@ public RecursiveStructType recursiveStruct() {
 
     /**
      * Returns the value of the PolymorphicTypeWithSubTypes property for this object.
-     * 
+     *
      * @return The value of the PolymorphicTypeWithSubTypes property for this object.
      */
     public BaseType polymorphicTypeWithSubTypes() {
@@ -866,7 +1078,7 @@ public BaseType polymorphicTypeWithSubTypes() {
 
     /**
      * Returns the value of the PolymorphicTypeWithoutSubTypes property for this object.
-     * 
+     *
      * @return The value of the PolymorphicTypeWithoutSubTypes property for this object.
      */
     public SubTypeOne polymorphicTypeWithoutSubTypes() {
@@ -880,7 +1092,7 @@ public SubTypeOne polymorphicTypeWithoutSubTypes() {
      * return {@link EnumType#UNKNOWN_TO_SDK_VERSION}. The raw value returned by the service is available from
      * {@link #enumTypeAsString}.
      * </p>
-     * 
+     *
      * @return The value of the EnumType property for this object.
      * @see EnumType
      */
@@ -895,7 +1107,7 @@ public EnumType enumType() {
      * return {@link EnumType#UNKNOWN_TO_SDK_VERSION}. The raw value returned by the service is available from
      * {@link #enumTypeAsString}.
      * </p>
-     * 
+     *
      * @return The value of the EnumType property for this object.
      * @see EnumType
      */
@@ -971,30 +1183,30 @@ public boolean equalsBySdkFields(Object obj) {
         }
         AllTypesResponse other = (AllTypesResponse) obj;
         return Objects.equals(stringMember(), other.stringMember()) && Objects.equals(integerMember(), other.integerMember())
-                && Objects.equals(booleanMember(), other.booleanMember()) && Objects.equals(floatMember(), other.floatMember())
-                && Objects.equals(doubleMember(), other.doubleMember()) && Objects.equals(longMember(), other.longMember())
-                && Objects.equals(simpleList(), other.simpleList())
-                && Objects.equals(listOfEnumsAsStrings(), other.listOfEnumsAsStrings())
-                && Objects.equals(listOfMaps(), other.listOfMaps()) && Objects.equals(listOfStructs(), other.listOfStructs())
-                && Objects.equals(listOfMapOfEnumToStringAsStrings(), other.listOfMapOfEnumToStringAsStrings())
-                && Objects.equals(mapOfStringToIntegerList(), other.mapOfStringToIntegerList())
-                && Objects.equals(mapOfStringToString(), other.mapOfStringToString())
-                && Objects.equals(mapOfStringToSimpleStruct(), other.mapOfStringToSimpleStruct())
-                && Objects.equals(mapOfEnumToEnumAsStrings(), other.mapOfEnumToEnumAsStrings())
-                && Objects.equals(mapOfEnumToStringAsStrings(), other.mapOfEnumToStringAsStrings())
-                && Objects.equals(mapOfStringToEnumAsStrings(), other.mapOfStringToEnumAsStrings())
-                && Objects.equals(mapOfEnumToSimpleStructAsStrings(), other.mapOfEnumToSimpleStructAsStrings())
-                && Objects.equals(mapOfEnumToListOfEnumsAsStrings(), other.mapOfEnumToListOfEnumsAsStrings())
-                && Objects.equals(mapOfEnumToMapOfStringToEnumAsStrings(), other.mapOfEnumToMapOfStringToEnumAsStrings())
-                && Objects.equals(timestampMember(), other.timestampMember())
-                && Objects.equals(structWithNestedTimestampMember(), other.structWithNestedTimestampMember())
-                && Objects.equals(blobArg(), other.blobArg())
-                && Objects.equals(structWithNestedBlob(), other.structWithNestedBlob())
-                && Objects.equals(blobMap(), other.blobMap()) && Objects.equals(listOfBlobs(), other.listOfBlobs())
-                && Objects.equals(recursiveStruct(), other.recursiveStruct())
-                && Objects.equals(polymorphicTypeWithSubTypes(), other.polymorphicTypeWithSubTypes())
-                && Objects.equals(polymorphicTypeWithoutSubTypes(), other.polymorphicTypeWithoutSubTypes())
-                && Objects.equals(enumTypeAsString(), other.enumTypeAsString());
+               && Objects.equals(booleanMember(), other.booleanMember()) && Objects.equals(floatMember(), other.floatMember())
+               && Objects.equals(doubleMember(), other.doubleMember()) && Objects.equals(longMember(), other.longMember())
+               && Objects.equals(simpleList(), other.simpleList())
+               && Objects.equals(listOfEnumsAsStrings(), other.listOfEnumsAsStrings())
+               && Objects.equals(listOfMaps(), other.listOfMaps()) && Objects.equals(listOfStructs(), other.listOfStructs())
+               && Objects.equals(listOfMapOfEnumToStringAsStrings(), other.listOfMapOfEnumToStringAsStrings())
+               && Objects.equals(mapOfStringToIntegerList(), other.mapOfStringToIntegerList())
+               && Objects.equals(mapOfStringToString(), other.mapOfStringToString())
+               && Objects.equals(mapOfStringToSimpleStruct(), other.mapOfStringToSimpleStruct())
+               && Objects.equals(mapOfEnumToEnumAsStrings(), other.mapOfEnumToEnumAsStrings())
+               && Objects.equals(mapOfEnumToStringAsStrings(), other.mapOfEnumToStringAsStrings())
+               && Objects.equals(mapOfStringToEnumAsStrings(), other.mapOfStringToEnumAsStrings())
+               && Objects.equals(mapOfEnumToSimpleStructAsStrings(), other.mapOfEnumToSimpleStructAsStrings())
+               && Objects.equals(mapOfEnumToListOfEnumsAsStrings(), other.mapOfEnumToListOfEnumsAsStrings())
+               && Objects.equals(mapOfEnumToMapOfStringToEnumAsStrings(), other.mapOfEnumToMapOfStringToEnumAsStrings())
+               && Objects.equals(timestampMember(), other.timestampMember())
+               && Objects.equals(structWithNestedTimestampMember(), other.structWithNestedTimestampMember())
+               && Objects.equals(blobArg(), other.blobArg())
+               && Objects.equals(structWithNestedBlob(), other.structWithNestedBlob())
+               && Objects.equals(blobMap(), other.blobMap()) && Objects.equals(listOfBlobs(), other.listOfBlobs())
+               && Objects.equals(recursiveStruct(), other.recursiveStruct())
+               && Objects.equals(polymorphicTypeWithSubTypes(), other.polymorphicTypeWithSubTypes())
+               && Objects.equals(polymorphicTypeWithoutSubTypes(), other.polymorphicTypeWithoutSubTypes())
+               && Objects.equals(enumTypeAsString(), other.enumTypeAsString());
     }
 
     /**
@@ -1004,88 +1216,88 @@ public boolean equalsBySdkFields(Object obj) {
     @Override
     public String toString() {
         return ToString.builder("AllTypesResponse").add("StringMember", stringMember()).add("IntegerMember", integerMember())
-                .add("BooleanMember", booleanMember()).add("FloatMember", floatMember()).add("DoubleMember", doubleMember())
-                .add("LongMember", longMember()).add("SimpleList", simpleList()).add("ListOfEnums", listOfEnumsAsStrings())
-                .add("ListOfMaps", listOfMaps()).add("ListOfStructs", listOfStructs())
-                .add("ListOfMapOfEnumToString", listOfMapOfEnumToStringAsStrings())
-                .add("MapOfStringToIntegerList", mapOfStringToIntegerList()).add("MapOfStringToString", mapOfStringToString())
-                .add("MapOfStringToSimpleStruct", mapOfStringToSimpleStruct()).add("MapOfEnumToEnum", mapOfEnumToEnumAsStrings())
-                .add("MapOfEnumToString", mapOfEnumToStringAsStrings()).add("MapOfStringToEnum", mapOfStringToEnumAsStrings())
-                .add("MapOfEnumToSimpleStruct", mapOfEnumToSimpleStructAsStrings())
-                .add("MapOfEnumToListOfEnums", mapOfEnumToListOfEnumsAsStrings())
-                .add("MapOfEnumToMapOfStringToEnum", mapOfEnumToMapOfStringToEnumAsStrings())
-                .add("TimestampMember", timestampMember())
-                .add("StructWithNestedTimestampMember", structWithNestedTimestampMember()).add("BlobArg", blobArg())
-                .add("StructWithNestedBlob", structWithNestedBlob()).add("BlobMap", blobMap()).add("ListOfBlobs", listOfBlobs())
-                .add("RecursiveStruct", recursiveStruct()).add("PolymorphicTypeWithSubTypes", polymorphicTypeWithSubTypes())
-                .add("PolymorphicTypeWithoutSubTypes", polymorphicTypeWithoutSubTypes()).add("EnumType", enumTypeAsString())
-                .build();
+                       .add("BooleanMember", booleanMember()).add("FloatMember", floatMember()).add("DoubleMember", doubleMember())
+                       .add("LongMember", longMember()).add("SimpleList", simpleList()).add("ListOfEnums", listOfEnumsAsStrings())
+                       .add("ListOfMaps", listOfMaps()).add("ListOfStructs", listOfStructs())
+                       .add("ListOfMapOfEnumToString", listOfMapOfEnumToStringAsStrings())
+                       .add("MapOfStringToIntegerList", mapOfStringToIntegerList()).add("MapOfStringToString", mapOfStringToString())
+                       .add("MapOfStringToSimpleStruct", mapOfStringToSimpleStruct()).add("MapOfEnumToEnum", mapOfEnumToEnumAsStrings())
+                       .add("MapOfEnumToString", mapOfEnumToStringAsStrings()).add("MapOfStringToEnum", mapOfStringToEnumAsStrings())
+                       .add("MapOfEnumToSimpleStruct", mapOfEnumToSimpleStructAsStrings())
+                       .add("MapOfEnumToListOfEnums", mapOfEnumToListOfEnumsAsStrings())
+                       .add("MapOfEnumToMapOfStringToEnum", mapOfEnumToMapOfStringToEnumAsStrings())
+                       .add("TimestampMember", timestampMember())
+                       .add("StructWithNestedTimestampMember", structWithNestedTimestampMember()).add("BlobArg", blobArg())
+                       .add("StructWithNestedBlob", structWithNestedBlob()).add("BlobMap", blobMap()).add("ListOfBlobs", listOfBlobs())
+                       .add("RecursiveStruct", recursiveStruct()).add("PolymorphicTypeWithSubTypes", polymorphicTypeWithSubTypes())
+                       .add("PolymorphicTypeWithoutSubTypes", polymorphicTypeWithoutSubTypes()).add("EnumType", enumTypeAsString())
+                       .build();
     }
 
     public <T> Optional<T> getValueForField(String fieldName, Class<T> clazz) {
         switch (fieldName) {
-        case "StringMember":
-            return Optional.ofNullable(clazz.cast(stringMember()));
-        case "IntegerMember":
-            return Optional.ofNullable(clazz.cast(integerMember()));
-        case "BooleanMember":
-            return Optional.ofNullable(clazz.cast(booleanMember()));
-        case "FloatMember":
-            return Optional.ofNullable(clazz.cast(floatMember()));
-        case "DoubleMember":
-            return Optional.ofNullable(clazz.cast(doubleMember()));
-        case "LongMember":
-            return Optional.ofNullable(clazz.cast(longMember()));
-        case "SimpleList":
-            return Optional.ofNullable(clazz.cast(simpleList()));
-        case "ListOfEnums":
-            return Optional.ofNullable(clazz.cast(listOfEnumsAsStrings()));
-        case "ListOfMaps":
-            return Optional.ofNullable(clazz.cast(listOfMaps()));
-        case "ListOfStructs":
-            return Optional.ofNullable(clazz.cast(listOfStructs()));
-        case "ListOfMapOfEnumToString":
-            return Optional.ofNullable(clazz.cast(listOfMapOfEnumToStringAsStrings()));
-        case "MapOfStringToIntegerList":
-            return Optional.ofNullable(clazz.cast(mapOfStringToIntegerList()));
-        case "MapOfStringToString":
-            return Optional.ofNullable(clazz.cast(mapOfStringToString()));
-        case "MapOfStringToSimpleStruct":
-            return Optional.ofNullable(clazz.cast(mapOfStringToSimpleStruct()));
-        case "MapOfEnumToEnum":
-            return Optional.ofNullable(clazz.cast(mapOfEnumToEnumAsStrings()));
-        case "MapOfEnumToString":
-            return Optional.ofNullable(clazz.cast(mapOfEnumToStringAsStrings()));
-        case "MapOfStringToEnum":
-            return Optional.ofNullable(clazz.cast(mapOfStringToEnumAsStrings()));
-        case "MapOfEnumToSimpleStruct":
-            return Optional.ofNullable(clazz.cast(mapOfEnumToSimpleStructAsStrings()));
-        case "MapOfEnumToListOfEnums":
-            return Optional.ofNullable(clazz.cast(mapOfEnumToListOfEnumsAsStrings()));
-        case "MapOfEnumToMapOfStringToEnum":
-            return Optional.ofNullable(clazz.cast(mapOfEnumToMapOfStringToEnumAsStrings()));
-        case "TimestampMember":
-            return Optional.ofNullable(clazz.cast(timestampMember()));
-        case "StructWithNestedTimestampMember":
-            return Optional.ofNullable(clazz.cast(structWithNestedTimestampMember()));
-        case "BlobArg":
-            return Optional.ofNullable(clazz.cast(blobArg()));
-        case "StructWithNestedBlob":
-            return Optional.ofNullable(clazz.cast(structWithNestedBlob()));
-        case "BlobMap":
-            return Optional.ofNullable(clazz.cast(blobMap()));
-        case "ListOfBlobs":
-            return Optional.ofNullable(clazz.cast(listOfBlobs()));
-        case "RecursiveStruct":
-            return Optional.ofNullable(clazz.cast(recursiveStruct()));
-        case "PolymorphicTypeWithSubTypes":
-            return Optional.ofNullable(clazz.cast(polymorphicTypeWithSubTypes()));
-        case "PolymorphicTypeWithoutSubTypes":
-            return Optional.ofNullable(clazz.cast(polymorphicTypeWithoutSubTypes()));
-        case "EnumType":
-            return Optional.ofNullable(clazz.cast(enumTypeAsString()));
-        default:
-            return Optional.empty();
+            case "StringMember":
+                return Optional.ofNullable(clazz.cast(stringMember()));
+            case "IntegerMember":
+                return Optional.ofNullable(clazz.cast(integerMember()));
+            case "BooleanMember":
+                return Optional.ofNullable(clazz.cast(booleanMember()));
+            case "FloatMember":
+                return Optional.ofNullable(clazz.cast(floatMember()));
+            case "DoubleMember":
+                return Optional.ofNullable(clazz.cast(doubleMember()));
+            case "LongMember":
+                return Optional.ofNullable(clazz.cast(longMember()));
+            case "SimpleList":
+                return Optional.ofNullable(clazz.cast(simpleList()));
+            case "ListOfEnums":
+                return Optional.ofNullable(clazz.cast(listOfEnumsAsStrings()));
+            case "ListOfMaps":
+                return Optional.ofNullable(clazz.cast(listOfMaps()));
+            case "ListOfStructs":
+                return Optional.ofNullable(clazz.cast(listOfStructs()));
+            case "ListOfMapOfEnumToString":
+                return Optional.ofNullable(clazz.cast(listOfMapOfEnumToStringAsStrings()));
+            case "MapOfStringToIntegerList":
+                return Optional.ofNullable(clazz.cast(mapOfStringToIntegerList()));
+            case "MapOfStringToString":
+                return Optional.ofNullable(clazz.cast(mapOfStringToString()));
+            case "MapOfStringToSimpleStruct":
+                return Optional.ofNullable(clazz.cast(mapOfStringToSimpleStruct()));
+            case "MapOfEnumToEnum":
+                return Optional.ofNullable(clazz.cast(mapOfEnumToEnumAsStrings()));
+            case "MapOfEnumToString":
+                return Optional.ofNullable(clazz.cast(mapOfEnumToStringAsStrings()));
+            case "MapOfStringToEnum":
+                return Optional.ofNullable(clazz.cast(mapOfStringToEnumAsStrings()));
+            case "MapOfEnumToSimpleStruct":
+                return Optional.ofNullable(clazz.cast(mapOfEnumToSimpleStructAsStrings()));
+            case "MapOfEnumToListOfEnums":
+                return Optional.ofNullable(clazz.cast(mapOfEnumToListOfEnumsAsStrings()));
+            case "MapOfEnumToMapOfStringToEnum":
+                return Optional.ofNullable(clazz.cast(mapOfEnumToMapOfStringToEnumAsStrings()));
+            case "TimestampMember":
+                return Optional.ofNullable(clazz.cast(timestampMember()));
+            case "StructWithNestedTimestampMember":
+                return Optional.ofNullable(clazz.cast(structWithNestedTimestampMember()));
+            case "BlobArg":
+                return Optional.ofNullable(clazz.cast(blobArg()));
+            case "StructWithNestedBlob":
+                return Optional.ofNullable(clazz.cast(structWithNestedBlob()));
+            case "BlobMap":
+                return Optional.ofNullable(clazz.cast(blobMap()));
+            case "ListOfBlobs":
+                return Optional.ofNullable(clazz.cast(listOfBlobs()));
+            case "RecursiveStruct":
+                return Optional.ofNullable(clazz.cast(recursiveStruct()));
+            case "PolymorphicTypeWithSubTypes":
+                return Optional.ofNullable(clazz.cast(polymorphicTypeWithSubTypes()));
+            case "PolymorphicTypeWithoutSubTypes":
+                return Optional.ofNullable(clazz.cast(polymorphicTypeWithoutSubTypes()));
+            case "EnumType":
+                return Optional.ofNullable(clazz.cast(enumTypeAsString()));
+            default:
+                return Optional.empty();
         }
     }
 
@@ -1255,7 +1467,7 @@ public interface Builder extends JsonProtocolTestsResponse.Builder, SdkPojo, Cop
          *
          * When the {@link Consumer} completes, {@link List<SimpleStruct>.Builder#build()} is called immediately and its
          * result is passed to {@link #listOfStructs(List<SimpleStruct>)}.
-         * 
+         *
          * @param listOfStructs
          *        a consumer that will call methods on {@link List<SimpleStruct>.Builder}
          * @return Returns a reference to this object so that method calls can be chained together.
@@ -1442,7 +1654,7 @@ public interface Builder extends JsonProtocolTestsResponse.Builder, SdkPojo, Cop
          *
          * When the {@link Consumer} completes, {@link StructWithTimestamp.Builder#build()} is called immediately and
          * its result is passed to {@link #structWithNestedTimestampMember(StructWithTimestamp)}.
-         * 
+         *
          * @param structWithNestedTimestampMember
          *        a consumer that will call methods on {@link StructWithTimestamp.Builder}
          * @return Returns a reference to this object so that method calls can be chained together.
@@ -1450,7 +1662,7 @@ public interface Builder extends JsonProtocolTestsResponse.Builder, SdkPojo, Cop
          */
         default Builder structWithNestedTimestampMember(Consumer<StructWithTimestamp.Builder> structWithNestedTimestampMember) {
             return structWithNestedTimestampMember(StructWithTimestamp.builder().applyMutation(structWithNestedTimestampMember)
-                    .build());
+                                                                      .build());
         }
 
         /**
@@ -1479,7 +1691,7 @@ default Builder structWithNestedTimestampMember(Consumer<StructWithTimestamp.Bui
          *
          * When the {@link Consumer} completes, {@link StructWithNestedBlobType.Builder#build()} is called immediately
          * and its result is passed to {@link #structWithNestedBlob(StructWithNestedBlobType)}.
-         * 
+         *
          * @param structWithNestedBlob
          *        a consumer that will call methods on {@link StructWithNestedBlobType.Builder}
          * @return Returns a reference to this object so that method calls can be chained together.
@@ -1533,7 +1745,7 @@ default Builder structWithNestedBlob(Consumer<StructWithNestedBlobType.Builder>
          *
          * When the {@link Consumer} completes, {@link RecursiveStructType.Builder#build()} is called immediately and
          * its result is passed to {@link #recursiveStruct(RecursiveStructType)}.
-         * 
+         *
          * @param recursiveStruct
          *        a consumer that will call methods on {@link RecursiveStructType.Builder}
          * @return Returns a reference to this object so that method calls can be chained together.
@@ -1560,7 +1772,7 @@ default Builder recursiveStruct(Consumer<RecursiveStructType.Builder> recursiveS
          *
          * When the {@link Consumer} completes, {@link BaseType.Builder#build()} is called immediately and its result is
          * passed to {@link #polymorphicTypeWithSubTypes(BaseType)}.
-         * 
+         *
          * @param polymorphicTypeWithSubTypes
          *        a consumer that will call methods on {@link BaseType.Builder}
          * @return Returns a reference to this object so that method calls can be chained together.
@@ -1587,7 +1799,7 @@ default Builder polymorphicTypeWithSubTypes(Consumer<BaseType.Builder> polymorph
          *
          * When the {@link Consumer} completes, {@link SubTypeOne.Builder#build()} is called immediately and its result
          * is passed to {@link #polymorphicTypeWithoutSubTypes(SubTypeOne)}.
-         * 
+         *
          * @param polymorphicTypeWithoutSubTypes
          *        a consumer that will call methods on {@link SubTypeOne.Builder}
          * @return Returns a reference to this object so that method calls can be chained together.
@@ -1880,7 +2092,7 @@ public final void setListOfMaps(Collection<? extends Map<String, String>> listOf
 
         public final Collection<SimpleStruct.Builder> getListOfStructs() {
             return listOfStructs != null ? listOfStructs.stream().map(SimpleStruct::toBuilder).collect(Collectors.toList())
-                    : null;
+                                         : null;
         }
 
         @Override
@@ -1900,7 +2112,7 @@ public final Builder listOfStructs(SimpleStruct... listOfStructs) {
         @SafeVarargs
         public final Builder listOfStructs(Consumer<SimpleStruct.Builder>... listOfStructs) {
             listOfStructs(Stream.of(listOfStructs).map(c -> SimpleStruct.builder().applyMutation(c).build())
-                    .collect(Collectors.toList()));
+                                .collect(Collectors.toList()));
             return this;
         }
 
@@ -1959,7 +2171,7 @@ public final void setMapOfStringToString(Map<String, String> mapOfStringToString
 
         public final Map<String, SimpleStruct.Builder> getMapOfStringToSimpleStruct() {
             return mapOfStringToSimpleStruct != null ? CollectionUtils.mapValues(mapOfStringToSimpleStruct,
-                    SimpleStruct::toBuilder) : null;
+                                                                                 SimpleStruct::toBuilder) : null;
         }
 
         @Override
@@ -2034,7 +2246,7 @@ public final void setMapOfStringToEnumWithStrings(Map<String, String> mapOfStrin
 
         public final Map<String, SimpleStruct.Builder> getMapOfEnumToSimpleStructAsStrings() {
             return mapOfEnumToSimpleStruct != null ? CollectionUtils.mapValues(mapOfEnumToSimpleStruct, SimpleStruct::toBuilder)
-                    : null;
+                                                   : null;
         }
 
         @Override
@@ -2119,7 +2331,7 @@ public final Builder structWithNestedTimestampMember(StructWithTimestamp structW
 
         public final void setStructWithNestedTimestampMember(StructWithTimestamp.BuilderImpl structWithNestedTimestampMember) {
             this.structWithNestedTimestampMember = structWithNestedTimestampMember != null ? structWithNestedTimestampMember
-                    .build() : null;
+                .build() : null;
         }
 
         public final ByteBuffer getBlobArg() {
@@ -2152,7 +2364,7 @@ public final void setStructWithNestedBlob(StructWithNestedBlobType.BuilderImpl s
 
         public final Map<String, ByteBuffer> getBlobMap() {
             return blobMap == null ? null : blobMap.entrySet().stream()
-                    .collect(Collectors.toMap(e -> e.getKey(), e -> e.getValue().asByteBuffer()));
+                                                   .collect(Collectors.toMap(e -> e.getKey(), e -> e.getValue().asByteBuffer()));
         }
 
         @Override
@@ -2163,7 +2375,7 @@ public final Builder blobMap(Map<String, SdkBytes> blobMap) {
 
         public final void setBlobMap(Map<String, ByteBuffer> blobMap) {
             blobMap(blobMap == null ? null : blobMap.entrySet().stream()
-                    .collect(Collectors.toMap(e -> e.getKey(), e -> SdkBytes.fromByteBuffer(e.getValue()))));
+                                                    .collect(Collectors.toMap(e -> e.getKey(), e -> SdkBytes.fromByteBuffer(e.getValue()))));
         }
 
         public final List<ByteBuffer> getListOfBlobs() {
@@ -2185,7 +2397,7 @@ public final Builder listOfBlobs(SdkBytes... listOfBlobs) {
 
         public final void setListOfBlobs(Collection<ByteBuffer> listOfBlobs) {
             listOfBlobs(listOfBlobs == null ? null : listOfBlobs.stream().map(SdkBytes::fromByteBuffer)
-                    .collect(Collectors.toList()));
+                                                                .collect(Collectors.toList()));
         }
 
         public final RecursiveStructType.Builder getRecursiveStruct() {
@@ -2228,7 +2440,7 @@ public final Builder polymorphicTypeWithoutSubTypes(SubTypeOne polymorphicTypeWi
 
         public final void setPolymorphicTypeWithoutSubTypes(SubTypeOne.BuilderImpl polymorphicTypeWithoutSubTypes) {
             this.polymorphicTypeWithoutSubTypes = polymorphicTypeWithoutSubTypes != null ? polymorphicTypeWithoutSubTypes.build()
-                    : null;
+                                                                                         : null;
         }
 
         public final String getEnumTypeAsString() {
diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/customization.config b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/customization.config
index 4b0a0eeb124b..089c236467d7 100644
--- a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/customization.config
+++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/customization.config
@@ -4,5 +4,20 @@
         "nestedContainers",
         "operationWithNoInputOrOutput",
         "eventStreamOperation"
-    ]
+    ],
+    "shapeModifiers": {
+        "DeprecatedRenameRequest": {
+            "modify": [
+                {
+                    "OriginalNameNoDeprecation": {
+                        "emitPropertyName":"NewNameNoDeprecation"
+                    },
+                    "OriginalNameDeprecated": {
+                        "emitPropertyName": "NewName",
+                        "existingNameDeprecated": true
+                    }
+                }
+            ]
+        }
+    }
 }
\ No newline at end of file
diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/deprecatedname/enumdeprecationfailure.customization b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/deprecatedname/enumdeprecationfailure.customization
new file mode 100644
index 000000000000..4f787d06e2fd
--- /dev/null
+++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/deprecatedname/enumdeprecationfailure.customization
@@ -0,0 +1,14 @@
+{
+  "shapeModifiers": {
+    "EnumDeprecationFailureRequest": {
+      "modify": [
+        {
+          "CannotDeprecateEnum": {
+            "emitPropertyName": "ShouldNotWork",
+            "existingNameDeprecated": true
+          }
+        }
+      ]
+    }
+  }
+}
\ No newline at end of file
diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/deprecatedname/enumdeprecationfailure.json b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/deprecatedname/enumdeprecationfailure.json
new file mode 100644
index 000000000000..ce4f58ae1d26
--- /dev/null
+++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/deprecatedname/enumdeprecationfailure.json
@@ -0,0 +1,42 @@
+{
+  "version":"2.0",
+  "metadata":{
+    "apiVersion":"2016-03-11",
+    "endpointPrefix":"restjson",
+    "jsonVersion":"1.1",
+    "protocol":"rest-json",
+    "serviceAbbreviation":"JsonProtocolTests",
+    "serviceFullName":"AWS DR Tools JSON Protocol Tests",
+    "serviceId":"Json Protocol Tests",
+    "signatureVersion":"v4",
+    "targetPrefix":"ProtocolTestsJsonRpcService",
+    "timestampFormat":"unixTimestamp",
+    "uid":"restjson-2016-03-11"
+  },
+  "operations":{
+    "EnumDeprecationFailure": {
+      "name": "EnumDeprecationFailure",
+      "http": {
+        "method": "POST",
+        "requestUri": "/"
+      },
+      "input": {"shape": "EnumDeprecationFailureRequest"},
+      "output": {"shape": "String"}
+    }
+  },
+  "shapes":{
+    "EnumDeprecationFailureRequest":{
+      "type": "structure",
+      "members": {
+        "CannotDeprecateEnum":{"shape": "EnumType"}
+      }
+    },
+    "String":{"type":"string"},
+    "EnumType": {
+      "type":"string",
+      "enum": [
+        "EnumValue1", "EnumValue2"
+      ]
+    }
+  }
+}
diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/deprecatedname/listdeprecationfailure.customization b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/deprecatedname/listdeprecationfailure.customization
new file mode 100644
index 000000000000..69ca31ade33c
--- /dev/null
+++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/deprecatedname/listdeprecationfailure.customization
@@ -0,0 +1,14 @@
+{
+  "shapeModifiers": {
+    "ListDeprecationFailureRequest": {
+      "modify": [
+        {
+          "CannotDeprecateList": {
+            "emitPropertyName": "ShouldNotWork",
+            "existingNameDeprecated": true
+          }
+        }
+      ]
+    }
+  }
+}
\ No newline at end of file
diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/deprecatedname/listdeprecationfailure.json b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/deprecatedname/listdeprecationfailure.json
new file mode 100644
index 000000000000..98b9469eaef3
--- /dev/null
+++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/deprecatedname/listdeprecationfailure.json
@@ -0,0 +1,40 @@
+{
+  "version":"2.0",
+  "metadata":{
+    "apiVersion":"2016-03-11",
+    "endpointPrefix":"restjson",
+    "jsonVersion":"1.1",
+    "protocol":"rest-json",
+    "serviceAbbreviation":"JsonProtocolTests",
+    "serviceFullName":"AWS DR Tools JSON Protocol Tests",
+    "serviceId":"Json Protocol Tests",
+    "signatureVersion":"v4",
+    "targetPrefix":"ProtocolTestsJsonRpcService",
+    "timestampFormat":"unixTimestamp",
+    "uid":"restjson-2016-03-11"
+  },
+  "operations":{
+    "ListDeprecationFailure": {
+      "name": "ListDeprecationFailure",
+      "http": {
+        "method": "POST",
+        "requestUri": "/"
+      },
+      "input": {"shape": "ListDeprecationFailureRequest"},
+      "output": {"shape": "String"}
+    }
+  },
+  "shapes":{
+    "ListDeprecationFailureRequest":{
+      "type": "structure",
+      "members": {
+        "CannotDeprecateList":{"shape": "ListOfStrings"}
+      }
+    },
+    "ListOfStrings":{
+      "type":"list",
+      "member":{"shape":"String"}
+    },
+    "String":{"type":"string"}
+  }
+}
diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/deprecatedname/mapdeprecationfailure.customization b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/deprecatedname/mapdeprecationfailure.customization
new file mode 100644
index 000000000000..358ff9456c26
--- /dev/null
+++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/deprecatedname/mapdeprecationfailure.customization
@@ -0,0 +1,14 @@
+{
+  "shapeModifiers": {
+    "MapDeprecationFailureRequest": {
+      "modify": [
+        {
+          "CannotDeprecateMap": {
+            "emitPropertyName": "ShouldNotWork",
+            "existingNameDeprecated": true
+          }
+        }
+      ]
+    }
+  }
+}
\ No newline at end of file
diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/deprecatedname/mapdeprecationfailure.json b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/deprecatedname/mapdeprecationfailure.json
new file mode 100644
index 000000000000..5d021a2fcc30
--- /dev/null
+++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/deprecatedname/mapdeprecationfailure.json
@@ -0,0 +1,41 @@
+{
+  "version":"2.0",
+  "metadata":{
+    "apiVersion":"2016-03-11",
+    "endpointPrefix":"restjson",
+    "jsonVersion":"1.1",
+    "protocol":"rest-json",
+    "serviceAbbreviation":"JsonProtocolTests",
+    "serviceFullName":"AWS DR Tools JSON Protocol Tests",
+    "serviceId":"Json Protocol Tests",
+    "signatureVersion":"v4",
+    "targetPrefix":"ProtocolTestsJsonRpcService",
+    "timestampFormat":"unixTimestamp",
+    "uid":"restjson-2016-03-11"
+  },
+  "operations":{
+    "MapDeprecationFailure": {
+      "name": "MapDeprecationFailure",
+      "http": {
+        "method": "POST",
+        "requestUri": "/"
+      },
+      "input": {"shape": "MapDeprecationFailureRequest"},
+      "output": {"shape": "String"}
+    }
+  },
+  "shapes":{
+    "MapDeprecationFailureRequest":{
+      "type": "structure",
+      "members": {
+        "CannotDeprecateMap":{"shape": "MapOfStringToString"}
+      }
+    },
+    "MapOfStringToString":{
+      "type":"map",
+      "key":{"shape":"String"},
+      "value":{"shape":"String"}
+    },
+    "String":{"type":"string"}
+  }
+}
diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/deprecatedrenamerequest.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/deprecatedrenamerequest.java
new file mode 100644
index 000000000000..8abff1b4d0be
--- /dev/null
+++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/deprecatedrenamerequest.java
@@ -0,0 +1,272 @@
+package software.amazon.awssdk.services.jsonprotocoltests.model;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.function.BiConsumer;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import software.amazon.awssdk.annotations.Generated;
+import software.amazon.awssdk.awscore.AwsRequestOverrideConfiguration;
+import software.amazon.awssdk.core.SdkField;
+import software.amazon.awssdk.core.SdkPojo;
+import software.amazon.awssdk.core.protocol.MarshallLocation;
+import software.amazon.awssdk.core.protocol.MarshallingType;
+import software.amazon.awssdk.core.traits.LocationTrait;
+import software.amazon.awssdk.utils.ToString;
+import software.amazon.awssdk.utils.builder.CopyableBuilder;
+import software.amazon.awssdk.utils.builder.ToCopyableBuilder;
+
+/**
+ */
+@Generated("software.amazon.awssdk:codegen")
+public final class DeprecatedRenameRequest extends JsonProtocolTestsRequest implements
+                                                                            ToCopyableBuilder<DeprecatedRenameRequest.Builder, DeprecatedRenameRequest> {
+    private static final SdkField<String> NEW_NAME_NO_DEPRECATION_FIELD = SdkField.<String> builder(MarshallingType.STRING)
+        .getter(getter(DeprecatedRenameRequest::newNameNoDeprecation)).setter(setter(Builder::newNameNoDeprecation))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("OriginalNameNoDeprecation").build())
+        .build();
+
+    private static final SdkField<String> NEW_NAME_FIELD = SdkField.<String> builder(MarshallingType.STRING)
+        .getter(getter(DeprecatedRenameRequest::newName)).setter(setter(Builder::newName))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("OriginalNameDeprecated").build())
+        .build();
+
+    private static final List<SdkField<?>> SDK_FIELDS = Collections.unmodifiableList(Arrays.asList(NEW_NAME_NO_DEPRECATION_FIELD,
+                                                                                                   NEW_NAME_FIELD));
+
+    private final String newNameNoDeprecation;
+
+    private final String newName;
+
+    private DeprecatedRenameRequest(BuilderImpl builder) {
+        super(builder);
+        this.newNameNoDeprecation = builder.newNameNoDeprecation;
+        this.newName = builder.newName;
+    }
+
+    /**
+     * Returns the value of the NewNameNoDeprecation property for this object.
+     *
+     * @return The value of the NewNameNoDeprecation property for this object.
+     */
+    public String newNameNoDeprecation() {
+        return newNameNoDeprecation;
+    }
+
+    /**
+     * Returns the value of the NewName property for this object.
+     *
+     * @return The value of the NewName property for this object.
+     * @deprecated Use {@link #newName()}
+     */
+    @Deprecated
+    public String originalNameDeprecated() {
+        return newName;
+    }
+
+    /**
+     * Returns the value of the NewName property for this object.
+     *
+     * @return The value of the NewName property for this object.
+     */
+    public String newName() {
+        return newName;
+    }
+
+    @Override
+    public Builder toBuilder() {
+        return new BuilderImpl(this);
+    }
+
+    public static Builder builder() {
+        return new BuilderImpl();
+    }
+
+    public static Class<? extends Builder> serializableBuilderClass() {
+        return BuilderImpl.class;
+    }
+
+    @Override
+    public int hashCode() {
+        int hashCode = 1;
+        hashCode = 31 * hashCode + super.hashCode();
+        hashCode = 31 * hashCode + Objects.hashCode(newNameNoDeprecation());
+        hashCode = 31 * hashCode + Objects.hashCode(newName());
+        return hashCode;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        return super.equals(obj) && equalsBySdkFields(obj);
+    }
+
+    @Override
+    public boolean equalsBySdkFields(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (!(obj instanceof DeprecatedRenameRequest)) {
+            return false;
+        }
+        DeprecatedRenameRequest other = (DeprecatedRenameRequest) obj;
+        return Objects.equals(newNameNoDeprecation(), other.newNameNoDeprecation()) && Objects.equals(newName(), other.newName());
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     */
+    @Override
+    public String toString() {
+        return ToString.builder("DeprecatedRenameRequest").add("NewNameNoDeprecation", newNameNoDeprecation())
+                       .add("NewName", newName()).build();
+    }
+
+    public <T> Optional<T> getValueForField(String fieldName, Class<T> clazz) {
+        switch (fieldName) {
+            case "NewNameNoDeprecation":
+                return Optional.ofNullable(clazz.cast(newNameNoDeprecation()));
+            case "NewName":
+                return Optional.ofNullable(clazz.cast(newName()));
+            case "OriginalNameDeprecated":
+                return Optional.ofNullable(clazz.cast(newName()));
+            default:
+                return Optional.empty();
+        }
+    }
+
+    @Override
+    public List<SdkField<?>> sdkFields() {
+        return SDK_FIELDS;
+    }
+
+    private static <T> Function<Object, T> getter(Function<DeprecatedRenameRequest, T> g) {
+        return obj -> g.apply((DeprecatedRenameRequest) obj);
+    }
+
+    private static <T> BiConsumer<Object, T> setter(BiConsumer<Builder, T> s) {
+        return (obj, val) -> s.accept((Builder) obj, val);
+    }
+
+    public interface Builder extends JsonProtocolTestsRequest.Builder, SdkPojo, CopyableBuilder<Builder, DeprecatedRenameRequest> {
+        /**
+         * Sets the value of the NewNameNoDeprecation property for this object.
+         *
+         * @param newNameNoDeprecation
+         *        The new value for the NewNameNoDeprecation property for this object.
+         * @return Returns a reference to this object so that method calls can be chained together.
+         */
+        Builder newNameNoDeprecation(String newNameNoDeprecation);
+
+        /**
+         * Sets the value of the NewName property for this object.
+         *
+         * @param newName
+         *        The new value for the NewName property for this object.
+         * @return Returns a reference to this object so that method calls can be chained together.
+         */
+        Builder newName(String newName);
+
+        /**
+         * Sets the value of the NewName property for this object.
+         *
+         * @param newName
+         *        The new value for the NewName property for this object.
+         * @return Returns a reference to this object so that method calls can be chained together.
+         * @deprecated Use {@link #newName(String)}
+         */
+        @Deprecated
+        Builder originalNameDeprecated(String newName);
+
+        @Override
+        Builder overrideConfiguration(AwsRequestOverrideConfiguration overrideConfiguration);
+
+        @Override
+        Builder overrideConfiguration(Consumer<AwsRequestOverrideConfiguration.Builder> builderConsumer);
+    }
+
+    static final class BuilderImpl extends JsonProtocolTestsRequest.BuilderImpl implements Builder {
+        private String newNameNoDeprecation;
+
+        private String newName;
+
+        private BuilderImpl() {
+        }
+
+        private BuilderImpl(DeprecatedRenameRequest model) {
+            super(model);
+            newNameNoDeprecation(model.newNameNoDeprecation);
+            newName(model.newName);
+        }
+
+        public final String getNewNameNoDeprecation() {
+            return newNameNoDeprecation;
+        }
+
+        @Override
+        public final Builder newNameNoDeprecation(String newNameNoDeprecation) {
+            this.newNameNoDeprecation = newNameNoDeprecation;
+            return this;
+        }
+
+        public final void setNewNameNoDeprecation(String newNameNoDeprecation) {
+            this.newNameNoDeprecation = newNameNoDeprecation;
+        }
+
+        public final String getNewName() {
+            return newName;
+        }
+
+        @Override
+        public final Builder newName(String newName) {
+            this.newName = newName;
+            return this;
+        }
+
+        @Override
+        public final Builder originalNameDeprecated(String newName) {
+            this.newName = newName;
+            return this;
+        }
+
+        public final void setNewName(String newName) {
+            this.newName = newName;
+        }
+
+        /**
+         * @deprecated Use {@link #setNewName} instead
+         */
+        @Deprecated
+        public final void setOriginalNameDeprecated(String newName) {
+            this.newName = newName;
+        }
+
+        @Override
+        public Builder overrideConfiguration(AwsRequestOverrideConfiguration overrideConfiguration) {
+            super.overrideConfiguration(overrideConfiguration);
+            return this;
+        }
+
+        @Override
+        public Builder overrideConfiguration(Consumer<AwsRequestOverrideConfiguration.Builder> builderConsumer) {
+            super.overrideConfiguration(builderConsumer);
+            return this;
+        }
+
+        @Override
+        public DeprecatedRenameRequest build() {
+            return new DeprecatedRenameRequest(this);
+        }
+
+        @Override
+        public List<SdkField<?>> sdkFields() {
+            return SDK_FIELDS;
+        }
+    }
+}
diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/deprecatedrenameresponse.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/deprecatedrenameresponse.java
new file mode 100644
index 000000000000..edc103223d16
--- /dev/null
+++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/deprecatedrenameresponse.java
@@ -0,0 +1,217 @@
+package software.amazon.awssdk.services.jsonprotocoltests.model;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.function.BiConsumer;
+import java.util.function.Function;
+import software.amazon.awssdk.annotations.Generated;
+import software.amazon.awssdk.core.SdkField;
+import software.amazon.awssdk.core.SdkPojo;
+import software.amazon.awssdk.core.protocol.MarshallLocation;
+import software.amazon.awssdk.core.protocol.MarshallingType;
+import software.amazon.awssdk.core.traits.LocationTrait;
+import software.amazon.awssdk.utils.ToString;
+import software.amazon.awssdk.utils.builder.CopyableBuilder;
+import software.amazon.awssdk.utils.builder.ToCopyableBuilder;
+
+/**
+ */
+@Generated("software.amazon.awssdk:codegen")
+public final class DeprecatedRenameResponse extends JsonProtocolTestsResponse implements
+                                                                              ToCopyableBuilder<DeprecatedRenameResponse.Builder, DeprecatedRenameResponse> {
+    private static final SdkField<String> ORIGINAL_NAME_NO_DEPRECATION_FIELD = SdkField.<String> builder(MarshallingType.STRING)
+        .getter(getter(DeprecatedRenameResponse::originalNameNoDeprecation))
+        .setter(setter(Builder::originalNameNoDeprecation))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("OriginalNameNoDeprecation").build())
+        .build();
+
+    private static final SdkField<String> ORIGINAL_NAME_DEPRECATED_FIELD = SdkField.<String> builder(MarshallingType.STRING)
+        .getter(getter(DeprecatedRenameResponse::originalNameDeprecated)).setter(setter(Builder::originalNameDeprecated))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("OriginalNameDeprecated").build())
+        .build();
+
+    private static final List<SdkField<?>> SDK_FIELDS = Collections.unmodifiableList(Arrays.asList(
+        ORIGINAL_NAME_NO_DEPRECATION_FIELD, ORIGINAL_NAME_DEPRECATED_FIELD));
+
+    private final String originalNameNoDeprecation;
+
+    private final String originalNameDeprecated;
+
+    private DeprecatedRenameResponse(BuilderImpl builder) {
+        super(builder);
+        this.originalNameNoDeprecation = builder.originalNameNoDeprecation;
+        this.originalNameDeprecated = builder.originalNameDeprecated;
+    }
+
+    /**
+     * Returns the value of the OriginalNameNoDeprecation property for this object.
+     *
+     * @return The value of the OriginalNameNoDeprecation property for this object.
+     */
+    public String originalNameNoDeprecation() {
+        return originalNameNoDeprecation;
+    }
+
+    /**
+     * Returns the value of the OriginalNameDeprecated property for this object.
+     *
+     * @return The value of the OriginalNameDeprecated property for this object.
+     */
+    public String originalNameDeprecated() {
+        return originalNameDeprecated;
+    }
+
+    @Override
+    public Builder toBuilder() {
+        return new BuilderImpl(this);
+    }
+
+    public static Builder builder() {
+        return new BuilderImpl();
+    }
+
+    public static Class<? extends Builder> serializableBuilderClass() {
+        return BuilderImpl.class;
+    }
+
+    @Override
+    public int hashCode() {
+        int hashCode = 1;
+        hashCode = 31 * hashCode + super.hashCode();
+        hashCode = 31 * hashCode + Objects.hashCode(originalNameNoDeprecation());
+        hashCode = 31 * hashCode + Objects.hashCode(originalNameDeprecated());
+        return hashCode;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        return super.equals(obj) && equalsBySdkFields(obj);
+    }
+
+    @Override
+    public boolean equalsBySdkFields(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (!(obj instanceof DeprecatedRenameResponse)) {
+            return false;
+        }
+        DeprecatedRenameResponse other = (DeprecatedRenameResponse) obj;
+        return Objects.equals(originalNameNoDeprecation(), other.originalNameNoDeprecation())
+               && Objects.equals(originalNameDeprecated(), other.originalNameDeprecated());
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     */
+    @Override
+    public String toString() {
+        return ToString.builder("DeprecatedRenameResponse").add("OriginalNameNoDeprecation", originalNameNoDeprecation())
+                       .add("OriginalNameDeprecated", originalNameDeprecated()).build();
+    }
+
+    public <T> Optional<T> getValueForField(String fieldName, Class<T> clazz) {
+        switch (fieldName) {
+            case "OriginalNameNoDeprecation":
+                return Optional.ofNullable(clazz.cast(originalNameNoDeprecation()));
+            case "OriginalNameDeprecated":
+                return Optional.ofNullable(clazz.cast(originalNameDeprecated()));
+            default:
+                return Optional.empty();
+        }
+    }
+
+    @Override
+    public List<SdkField<?>> sdkFields() {
+        return SDK_FIELDS;
+    }
+
+    private static <T> Function<Object, T> getter(Function<DeprecatedRenameResponse, T> g) {
+        return obj -> g.apply((DeprecatedRenameResponse) obj);
+    }
+
+    private static <T> BiConsumer<Object, T> setter(BiConsumer<Builder, T> s) {
+        return (obj, val) -> s.accept((Builder) obj, val);
+    }
+
+    public interface Builder extends JsonProtocolTestsResponse.Builder, SdkPojo,
+                                     CopyableBuilder<Builder, DeprecatedRenameResponse> {
+        /**
+         * Sets the value of the OriginalNameNoDeprecation property for this object.
+         *
+         * @param originalNameNoDeprecation
+         *        The new value for the OriginalNameNoDeprecation property for this object.
+         * @return Returns a reference to this object so that method calls can be chained together.
+         */
+        Builder originalNameNoDeprecation(String originalNameNoDeprecation);
+
+        /**
+         * Sets the value of the OriginalNameDeprecated property for this object.
+         *
+         * @param originalNameDeprecated
+         *        The new value for the OriginalNameDeprecated property for this object.
+         * @return Returns a reference to this object so that method calls can be chained together.
+         */
+        Builder originalNameDeprecated(String originalNameDeprecated);
+    }
+
+    static final class BuilderImpl extends JsonProtocolTestsResponse.BuilderImpl implements Builder {
+        private String originalNameNoDeprecation;
+
+        private String originalNameDeprecated;
+
+        private BuilderImpl() {
+        }
+
+        private BuilderImpl(DeprecatedRenameResponse model) {
+            super(model);
+            originalNameNoDeprecation(model.originalNameNoDeprecation);
+            originalNameDeprecated(model.originalNameDeprecated);
+        }
+
+        public final String getOriginalNameNoDeprecation() {
+            return originalNameNoDeprecation;
+        }
+
+        @Override
+        public final Builder originalNameNoDeprecation(String originalNameNoDeprecation) {
+            this.originalNameNoDeprecation = originalNameNoDeprecation;
+            return this;
+        }
+
+        public final void setOriginalNameNoDeprecation(String originalNameNoDeprecation) {
+            this.originalNameNoDeprecation = originalNameNoDeprecation;
+        }
+
+        public final String getOriginalNameDeprecated() {
+            return originalNameDeprecated;
+        }
+
+        @Override
+        public final Builder originalNameDeprecated(String originalNameDeprecated) {
+            this.originalNameDeprecated = originalNameDeprecated;
+            return this;
+        }
+
+        public final void setOriginalNameDeprecated(String originalNameDeprecated) {
+            this.originalNameDeprecated = originalNameDeprecated;
+        }
+
+        @Override
+        public DeprecatedRenameResponse build() {
+            return new DeprecatedRenameResponse(this);
+        }
+
+        @Override
+        public List<SdkField<?>> sdkFields() {
+            return SDK_FIELDS;
+        }
+    }
+}
diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/existencechecknamingrequest.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/existencechecknamingrequest.java
new file mode 100644
index 000000000000..756474a69e14
--- /dev/null
+++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/existencechecknamingrequest.java
@@ -0,0 +1,456 @@
+package software.amazon.awssdk.services.jsonprotocoltests.model;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.function.BiConsumer;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import software.amazon.awssdk.annotations.Generated;
+import software.amazon.awssdk.awscore.AwsRequestOverrideConfiguration;
+import software.amazon.awssdk.core.SdkField;
+import software.amazon.awssdk.core.SdkPojo;
+import software.amazon.awssdk.core.protocol.MarshallLocation;
+import software.amazon.awssdk.core.protocol.MarshallingType;
+import software.amazon.awssdk.core.traits.ListTrait;
+import software.amazon.awssdk.core.traits.LocationTrait;
+import software.amazon.awssdk.core.traits.MapTrait;
+import software.amazon.awssdk.core.util.DefaultSdkAutoConstructList;
+import software.amazon.awssdk.core.util.DefaultSdkAutoConstructMap;
+import software.amazon.awssdk.core.util.SdkAutoConstructList;
+import software.amazon.awssdk.core.util.SdkAutoConstructMap;
+import software.amazon.awssdk.utils.ToString;
+import software.amazon.awssdk.utils.builder.CopyableBuilder;
+import software.amazon.awssdk.utils.builder.ToCopyableBuilder;
+
+/**
+ */
+@Generated("software.amazon.awssdk:codegen")
+public final class ExistenceCheckNamingRequest extends JsonProtocolTestsRequest implements
+                                                                                ToCopyableBuilder<ExistenceCheckNamingRequest.Builder, ExistenceCheckNamingRequest> {
+    private static final SdkField<List<String>> BUILD_FIELD = SdkField
+        .<List<String>> builder(MarshallingType.LIST)
+        .getter(getter(ExistenceCheckNamingRequest::build))
+        .setter(setter(Builder::build))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("Build").build(),
+                ListTrait
+                    .builder()
+                    .memberLocationName(null)
+                    .memberFieldInfo(
+                        SdkField.<String> builder(MarshallingType.STRING)
+                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
+                                                 .locationName("member").build()).build()).build()).build();
+
+    private static final SdkField<List<String>> SUPER_FIELD = SdkField
+        .<List<String>> builder(MarshallingType.LIST)
+        .getter(getter(ExistenceCheckNamingRequest::superValue))
+        .setter(setter(Builder::superValue))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("super").build(),
+                ListTrait
+                    .builder()
+                    .memberLocationName(null)
+                    .memberFieldInfo(
+                        SdkField.<String> builder(MarshallingType.STRING)
+                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
+                                                 .locationName("member").build()).build()).build()).build();
+
+    private static final SdkField<Map<String, String>> TO_STRING_FIELD = SdkField
+        .<Map<String, String>> builder(MarshallingType.MAP)
+        .getter(getter(ExistenceCheckNamingRequest::toStringValue))
+        .setter(setter(Builder::toStringValue))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("toString").build(),
+                MapTrait.builder()
+                        .keyLocationName("key")
+                        .valueLocationName("value")
+                        .valueFieldInfo(
+                            SdkField.<String> builder(MarshallingType.STRING)
+                                .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
+                                                     .locationName("value").build()).build()).build()).build();
+
+    private static final SdkField<Map<String, String>> EQUALS_FIELD = SdkField
+        .<Map<String, String>> builder(MarshallingType.MAP)
+        .getter(getter(ExistenceCheckNamingRequest::equalsValue))
+        .setter(setter(Builder::equalsValue))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("equals").build(),
+                MapTrait.builder()
+                        .keyLocationName("key")
+                        .valueLocationName("value")
+                        .valueFieldInfo(
+                            SdkField.<String> builder(MarshallingType.STRING)
+                                .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
+                                                     .locationName("value").build()).build()).build()).build();
+
+    private static final List<SdkField<?>> SDK_FIELDS = Collections.unmodifiableList(Arrays.asList(BUILD_FIELD, SUPER_FIELD,
+                                                                                                   TO_STRING_FIELD, EQUALS_FIELD));
+
+    private final List<String> build;
+
+    private final List<String> superValue;
+
+    private final Map<String, String> toStringValue;
+
+    private final Map<String, String> equalsValue;
+
+    private ExistenceCheckNamingRequest(BuilderImpl builder) {
+        super(builder);
+        this.build = builder.build;
+        this.superValue = builder.superValue;
+        this.toStringValue = builder.toStringValue;
+        this.equalsValue = builder.equalsValue;
+    }
+
+    /**
+     * Returns true if the Build property was specified by the sender (it may be empty), or false if the sender did not
+     * specify the value (it will be empty). For responses returned by the SDK, the sender is the AWS service.
+     */
+    public boolean hasBuild() {
+        return build != null && !(build instanceof SdkAutoConstructList);
+    }
+
+    /**
+     * Returns the value of the Build property for this object.
+     * <p>
+     * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
+     * </p>
+     * <p>
+     * You can use {@link #hasBuild()} to see if a value was sent in this field.
+     * </p>
+     *
+     * @return The value of the Build property for this object.
+     */
+    public List<String> build() {
+        return build;
+    }
+
+    /**
+     * Returns true if the Super property was specified by the sender (it may be empty), or false if the sender did not
+     * specify the value (it will be empty). For responses returned by the SDK, the sender is the AWS service.
+     */
+    public boolean hasSuperValue() {
+        return superValue != null && !(superValue instanceof SdkAutoConstructList);
+    }
+
+    /**
+     * Returns the value of the Super property for this object.
+     * <p>
+     * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
+     * </p>
+     * <p>
+     * You can use {@link #hasSuperValue()} to see if a value was sent in this field.
+     * </p>
+     *
+     * @return The value of the Super property for this object.
+     */
+    public List<String> superValue() {
+        return superValue;
+    }
+
+    /**
+     * Returns true if the ToString property was specified by the sender (it may be empty), or false if the sender did
+     * not specify the value (it will be empty). For responses returned by the SDK, the sender is the AWS service.
+     */
+    public boolean hasToStringValue() {
+        return toStringValue != null && !(toStringValue instanceof SdkAutoConstructMap);
+    }
+
+    /**
+     * Returns the value of the ToString property for this object.
+     * <p>
+     * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
+     * </p>
+     * <p>
+     * You can use {@link #hasToStringValue()} to see if a value was sent in this field.
+     * </p>
+     *
+     * @return The value of the ToString property for this object.
+     */
+    public Map<String, String> toStringValue() {
+        return toStringValue;
+    }
+
+    /**
+     * Returns true if the Equals property was specified by the sender (it may be empty), or false if the sender did not
+     * specify the value (it will be empty). For responses returned by the SDK, the sender is the AWS service.
+     */
+    public boolean hasEqualsValue() {
+        return equalsValue != null && !(equalsValue instanceof SdkAutoConstructMap);
+    }
+
+    /**
+     * Returns the value of the Equals property for this object.
+     * <p>
+     * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
+     * </p>
+     * <p>
+     * You can use {@link #hasEqualsValue()} to see if a value was sent in this field.
+     * </p>
+     *
+     * @return The value of the Equals property for this object.
+     */
+    public Map<String, String> equalsValue() {
+        return equalsValue;
+    }
+
+    @Override
+    public Builder toBuilder() {
+        return new BuilderImpl(this);
+    }
+
+    public static Builder builder() {
+        return new BuilderImpl();
+    }
+
+    public static Class<? extends Builder> serializableBuilderClass() {
+        return BuilderImpl.class;
+    }
+
+    @Override
+    public int hashCode() {
+        int hashCode = 1;
+        hashCode = 31 * hashCode + super.hashCode();
+        hashCode = 31 * hashCode + Objects.hashCode(build());
+        hashCode = 31 * hashCode + Objects.hashCode(superValue());
+        hashCode = 31 * hashCode + Objects.hashCode(toStringValue());
+        hashCode = 31 * hashCode + Objects.hashCode(equalsValue());
+        return hashCode;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        return super.equals(obj) && equalsBySdkFields(obj);
+    }
+
+    @Override
+    public boolean equalsBySdkFields(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (!(obj instanceof ExistenceCheckNamingRequest)) {
+            return false;
+        }
+        ExistenceCheckNamingRequest other = (ExistenceCheckNamingRequest) obj;
+        return Objects.equals(build(), other.build()) && Objects.equals(superValue(), other.superValue())
+               && Objects.equals(toStringValue(), other.toStringValue()) && Objects.equals(equalsValue(), other.equalsValue());
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     */
+    @Override
+    public String toString() {
+        return ToString.builder("ExistenceCheckNamingRequest").add("Build", build()).add("Super", superValue())
+                       .add("ToString", toStringValue()).add("Equals", equalsValue()).build();
+    }
+
+    public <T> Optional<T> getValueForField(String fieldName, Class<T> clazz) {
+        switch (fieldName) {
+            case "Build":
+                return Optional.ofNullable(clazz.cast(build()));
+            case "super":
+                return Optional.ofNullable(clazz.cast(superValue()));
+            case "toString":
+                return Optional.ofNullable(clazz.cast(toStringValue()));
+            case "equals":
+                return Optional.ofNullable(clazz.cast(equalsValue()));
+            default:
+                return Optional.empty();
+        }
+    }
+
+    @Override
+    public List<SdkField<?>> sdkFields() {
+        return SDK_FIELDS;
+    }
+
+    private static <T> Function<Object, T> getter(Function<ExistenceCheckNamingRequest, T> g) {
+        return obj -> g.apply((ExistenceCheckNamingRequest) obj);
+    }
+
+    private static <T> BiConsumer<Object, T> setter(BiConsumer<Builder, T> s) {
+        return (obj, val) -> s.accept((Builder) obj, val);
+    }
+
+    public interface Builder extends JsonProtocolTestsRequest.Builder, SdkPojo,
+                                     CopyableBuilder<Builder, ExistenceCheckNamingRequest> {
+        /**
+         * Sets the value of the Build property for this object.
+         *
+         * @param build
+         *        The new value for the Build property for this object.
+         * @return Returns a reference to this object so that method calls can be chained together.
+         */
+        Builder build(Collection<String> build);
+
+        /**
+         * Sets the value of the Build property for this object.
+         *
+         * @param build
+         *        The new value for the Build property for this object.
+         * @return Returns a reference to this object so that method calls can be chained together.
+         */
+        Builder build(String... build);
+
+        /**
+         * Sets the value of the Super property for this object.
+         *
+         * @param superValue
+         *        The new value for the Super property for this object.
+         * @return Returns a reference to this object so that method calls can be chained together.
+         */
+        Builder superValue(Collection<String> superValue);
+
+        /**
+         * Sets the value of the Super property for this object.
+         *
+         * @param superValue
+         *        The new value for the Super property for this object.
+         * @return Returns a reference to this object so that method calls can be chained together.
+         */
+        Builder superValue(String... superValue);
+
+        /**
+         * Sets the value of the ToString property for this object.
+         *
+         * @param toStringValue
+         *        The new value for the ToString property for this object.
+         * @return Returns a reference to this object so that method calls can be chained together.
+         */
+        Builder toStringValue(Map<String, String> toStringValue);
+
+        /**
+         * Sets the value of the Equals property for this object.
+         *
+         * @param equalsValue
+         *        The new value for the Equals property for this object.
+         * @return Returns a reference to this object so that method calls can be chained together.
+         */
+        Builder equalsValue(Map<String, String> equalsValue);
+
+        @Override
+        Builder overrideConfiguration(AwsRequestOverrideConfiguration overrideConfiguration);
+
+        @Override
+        Builder overrideConfiguration(Consumer<AwsRequestOverrideConfiguration.Builder> builderConsumer);
+    }
+
+    static final class BuilderImpl extends JsonProtocolTestsRequest.BuilderImpl implements Builder {
+        private List<String> build = DefaultSdkAutoConstructList.getInstance();
+
+        private List<String> superValue = DefaultSdkAutoConstructList.getInstance();
+
+        private Map<String, String> toStringValue = DefaultSdkAutoConstructMap.getInstance();
+
+        private Map<String, String> equalsValue = DefaultSdkAutoConstructMap.getInstance();
+
+        private BuilderImpl() {
+        }
+
+        private BuilderImpl(ExistenceCheckNamingRequest model) {
+            super(model);
+            build(model.build);
+            superValue(model.superValue);
+            toStringValue(model.toStringValue);
+            equalsValue(model.equalsValue);
+        }
+
+        public final Collection<String> getBuild() {
+            return build;
+        }
+
+        @Override
+        public final Builder build(Collection<String> build) {
+            this.build = ListOfStringsCopier.copy(build);
+            return this;
+        }
+
+        @Override
+        @SafeVarargs
+        public final Builder build(String... build) {
+            build(Arrays.asList(build));
+            return this;
+        }
+
+        public final void setBuild(Collection<String> build) {
+            this.build = ListOfStringsCopier.copy(build);
+        }
+
+        public final Collection<String> getSuperValue() {
+            return superValue;
+        }
+
+        @Override
+        public final Builder superValue(Collection<String> superValue) {
+            this.superValue = ListOfStringsCopier.copy(superValue);
+            return this;
+        }
+
+        @Override
+        @SafeVarargs
+        public final Builder superValue(String... superValue) {
+            superValue(Arrays.asList(superValue));
+            return this;
+        }
+
+        public final void setSuperValue(Collection<String> superValue) {
+            this.superValue = ListOfStringsCopier.copy(superValue);
+        }
+
+        public final Map<String, String> getToStringValue() {
+            return toStringValue;
+        }
+
+        @Override
+        public final Builder toStringValue(Map<String, String> toStringValue) {
+            this.toStringValue = MapOfStringToStringCopier.copy(toStringValue);
+            return this;
+        }
+
+        public final void setToStringValue(Map<String, String> toStringValue) {
+            this.toStringValue = MapOfStringToStringCopier.copy(toStringValue);
+        }
+
+        public final Map<String, String> getEqualsValue() {
+            return equalsValue;
+        }
+
+        @Override
+        public final Builder equalsValue(Map<String, String> equalsValue) {
+            this.equalsValue = MapOfStringToStringCopier.copy(equalsValue);
+            return this;
+        }
+
+        public final void setEqualsValue(Map<String, String> equalsValue) {
+            this.equalsValue = MapOfStringToStringCopier.copy(equalsValue);
+        }
+
+        @Override
+        public Builder overrideConfiguration(AwsRequestOverrideConfiguration overrideConfiguration) {
+            super.overrideConfiguration(overrideConfiguration);
+            return this;
+        }
+
+        @Override
+        public Builder overrideConfiguration(Consumer<AwsRequestOverrideConfiguration.Builder> builderConsumer) {
+            super.overrideConfiguration(builderConsumer);
+            return this;
+        }
+
+        @Override
+        public ExistenceCheckNamingRequest build() {
+            return new ExistenceCheckNamingRequest(this);
+        }
+
+        @Override
+        public List<SdkField<?>> sdkFields() {
+            return SDK_FIELDS;
+        }
+    }
+}
diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/existencechecknamingresponse.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/existencechecknamingresponse.java
new file mode 100644
index 000000000000..216f3fe6fdf8
--- /dev/null
+++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/existencechecknamingresponse.java
@@ -0,0 +1,436 @@
+package software.amazon.awssdk.services.jsonprotocoltests.model;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.function.BiConsumer;
+import java.util.function.Function;
+import software.amazon.awssdk.annotations.Generated;
+import software.amazon.awssdk.core.SdkField;
+import software.amazon.awssdk.core.SdkPojo;
+import software.amazon.awssdk.core.protocol.MarshallLocation;
+import software.amazon.awssdk.core.protocol.MarshallingType;
+import software.amazon.awssdk.core.traits.ListTrait;
+import software.amazon.awssdk.core.traits.LocationTrait;
+import software.amazon.awssdk.core.traits.MapTrait;
+import software.amazon.awssdk.core.util.DefaultSdkAutoConstructList;
+import software.amazon.awssdk.core.util.DefaultSdkAutoConstructMap;
+import software.amazon.awssdk.core.util.SdkAutoConstructList;
+import software.amazon.awssdk.core.util.SdkAutoConstructMap;
+import software.amazon.awssdk.utils.ToString;
+import software.amazon.awssdk.utils.builder.CopyableBuilder;
+import software.amazon.awssdk.utils.builder.ToCopyableBuilder;
+
+/**
+ */
+@Generated("software.amazon.awssdk:codegen")
+public final class ExistenceCheckNamingResponse extends JsonProtocolTestsResponse implements
+                                                                                  ToCopyableBuilder<ExistenceCheckNamingResponse.Builder, ExistenceCheckNamingResponse> {
+    private static final SdkField<List<String>> BUILD_FIELD = SdkField
+        .<List<String>> builder(MarshallingType.LIST)
+        .getter(getter(ExistenceCheckNamingResponse::build))
+        .setter(setter(Builder::build))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("Build").build(),
+                ListTrait
+                    .builder()
+                    .memberLocationName(null)
+                    .memberFieldInfo(
+                        SdkField.<String> builder(MarshallingType.STRING)
+                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
+                                                 .locationName("member").build()).build()).build()).build();
+
+    private static final SdkField<List<String>> SUPER_FIELD = SdkField
+        .<List<String>> builder(MarshallingType.LIST)
+        .getter(getter(ExistenceCheckNamingResponse::superValue))
+        .setter(setter(Builder::superValue))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("super").build(),
+                ListTrait
+                    .builder()
+                    .memberLocationName(null)
+                    .memberFieldInfo(
+                        SdkField.<String> builder(MarshallingType.STRING)
+                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
+                                                 .locationName("member").build()).build()).build()).build();
+
+    private static final SdkField<Map<String, String>> TO_STRING_FIELD = SdkField
+        .<Map<String, String>> builder(MarshallingType.MAP)
+        .getter(getter(ExistenceCheckNamingResponse::toStringValue))
+        .setter(setter(Builder::toStringValue))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("toString").build(),
+                MapTrait.builder()
+                        .keyLocationName("key")
+                        .valueLocationName("value")
+                        .valueFieldInfo(
+                            SdkField.<String> builder(MarshallingType.STRING)
+                                .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
+                                                     .locationName("value").build()).build()).build()).build();
+
+    private static final SdkField<Map<String, String>> EQUALS_FIELD = SdkField
+        .<Map<String, String>> builder(MarshallingType.MAP)
+        .getter(getter(ExistenceCheckNamingResponse::equalsValue))
+        .setter(setter(Builder::equalsValue))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("equals").build(),
+                MapTrait.builder()
+                        .keyLocationName("key")
+                        .valueLocationName("value")
+                        .valueFieldInfo(
+                            SdkField.<String> builder(MarshallingType.STRING)
+                                .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
+                                                     .locationName("value").build()).build()).build()).build();
+
+    private static final List<SdkField<?>> SDK_FIELDS = Collections.unmodifiableList(Arrays.asList(BUILD_FIELD, SUPER_FIELD,
+                                                                                                   TO_STRING_FIELD, EQUALS_FIELD));
+
+    private final List<String> build;
+
+    private final List<String> superValue;
+
+    private final Map<String, String> toStringValue;
+
+    private final Map<String, String> equalsValue;
+
+    private ExistenceCheckNamingResponse(BuilderImpl builder) {
+        super(builder);
+        this.build = builder.build;
+        this.superValue = builder.superValue;
+        this.toStringValue = builder.toStringValue;
+        this.equalsValue = builder.equalsValue;
+    }
+
+    /**
+     * Returns true if the Build property was specified by the sender (it may be empty), or false if the sender did not
+     * specify the value (it will be empty). For responses returned by the SDK, the sender is the AWS service.
+     */
+    public boolean hasBuild() {
+        return build != null && !(build instanceof SdkAutoConstructList);
+    }
+
+    /**
+     * Returns the value of the Build property for this object.
+     * <p>
+     * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
+     * </p>
+     * <p>
+     * You can use {@link #hasBuild()} to see if a value was sent in this field.
+     * </p>
+     *
+     * @return The value of the Build property for this object.
+     */
+    public List<String> build() {
+        return build;
+    }
+
+    /**
+     * Returns true if the Super property was specified by the sender (it may be empty), or false if the sender did not
+     * specify the value (it will be empty). For responses returned by the SDK, the sender is the AWS service.
+     */
+    public boolean hasSuperValue() {
+        return superValue != null && !(superValue instanceof SdkAutoConstructList);
+    }
+
+    /**
+     * Returns the value of the Super property for this object.
+     * <p>
+     * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
+     * </p>
+     * <p>
+     * You can use {@link #hasSuperValue()} to see if a value was sent in this field.
+     * </p>
+     *
+     * @return The value of the Super property for this object.
+     */
+    public List<String> superValue() {
+        return superValue;
+    }
+
+    /**
+     * Returns true if the ToString property was specified by the sender (it may be empty), or false if the sender did
+     * not specify the value (it will be empty). For responses returned by the SDK, the sender is the AWS service.
+     */
+    public boolean hasToStringValue() {
+        return toStringValue != null && !(toStringValue instanceof SdkAutoConstructMap);
+    }
+
+    /**
+     * Returns the value of the ToString property for this object.
+     * <p>
+     * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
+     * </p>
+     * <p>
+     * You can use {@link #hasToStringValue()} to see if a value was sent in this field.
+     * </p>
+     *
+     * @return The value of the ToString property for this object.
+     */
+    public Map<String, String> toStringValue() {
+        return toStringValue;
+    }
+
+    /**
+     * Returns true if the Equals property was specified by the sender (it may be empty), or false if the sender did not
+     * specify the value (it will be empty). For responses returned by the SDK, the sender is the AWS service.
+     */
+    public boolean hasEqualsValue() {
+        return equalsValue != null && !(equalsValue instanceof SdkAutoConstructMap);
+    }
+
+    /**
+     * Returns the value of the Equals property for this object.
+     * <p>
+     * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
+     * </p>
+     * <p>
+     * You can use {@link #hasEqualsValue()} to see if a value was sent in this field.
+     * </p>
+     *
+     * @return The value of the Equals property for this object.
+     */
+    public Map<String, String> equalsValue() {
+        return equalsValue;
+    }
+
+    @Override
+    public Builder toBuilder() {
+        return new BuilderImpl(this);
+    }
+
+    public static Builder builder() {
+        return new BuilderImpl();
+    }
+
+    public static Class<? extends Builder> serializableBuilderClass() {
+        return BuilderImpl.class;
+    }
+
+    @Override
+    public int hashCode() {
+        int hashCode = 1;
+        hashCode = 31 * hashCode + super.hashCode();
+        hashCode = 31 * hashCode + Objects.hashCode(build());
+        hashCode = 31 * hashCode + Objects.hashCode(superValue());
+        hashCode = 31 * hashCode + Objects.hashCode(toStringValue());
+        hashCode = 31 * hashCode + Objects.hashCode(equalsValue());
+        return hashCode;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        return super.equals(obj) && equalsBySdkFields(obj);
+    }
+
+    @Override
+    public boolean equalsBySdkFields(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (!(obj instanceof ExistenceCheckNamingResponse)) {
+            return false;
+        }
+        ExistenceCheckNamingResponse other = (ExistenceCheckNamingResponse) obj;
+        return Objects.equals(build(), other.build()) && Objects.equals(superValue(), other.superValue())
+               && Objects.equals(toStringValue(), other.toStringValue()) && Objects.equals(equalsValue(), other.equalsValue());
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     */
+    @Override
+    public String toString() {
+        return ToString.builder("ExistenceCheckNamingResponse").add("Build", build()).add("Super", superValue())
+                       .add("ToString", toStringValue()).add("Equals", equalsValue()).build();
+    }
+
+    public <T> Optional<T> getValueForField(String fieldName, Class<T> clazz) {
+        switch (fieldName) {
+            case "Build":
+                return Optional.ofNullable(clazz.cast(build()));
+            case "super":
+                return Optional.ofNullable(clazz.cast(superValue()));
+            case "toString":
+                return Optional.ofNullable(clazz.cast(toStringValue()));
+            case "equals":
+                return Optional.ofNullable(clazz.cast(equalsValue()));
+            default:
+                return Optional.empty();
+        }
+    }
+
+    @Override
+    public List<SdkField<?>> sdkFields() {
+        return SDK_FIELDS;
+    }
+
+    private static <T> Function<Object, T> getter(Function<ExistenceCheckNamingResponse, T> g) {
+        return obj -> g.apply((ExistenceCheckNamingResponse) obj);
+    }
+
+    private static <T> BiConsumer<Object, T> setter(BiConsumer<Builder, T> s) {
+        return (obj, val) -> s.accept((Builder) obj, val);
+    }
+
+    public interface Builder extends JsonProtocolTestsResponse.Builder, SdkPojo,
+                                     CopyableBuilder<Builder, ExistenceCheckNamingResponse> {
+        /**
+         * Sets the value of the Build property for this object.
+         *
+         * @param build
+         *        The new value for the Build property for this object.
+         * @return Returns a reference to this object so that method calls can be chained together.
+         */
+        Builder build(Collection<String> build);
+
+        /**
+         * Sets the value of the Build property for this object.
+         *
+         * @param build
+         *        The new value for the Build property for this object.
+         * @return Returns a reference to this object so that method calls can be chained together.
+         */
+        Builder build(String... build);
+
+        /**
+         * Sets the value of the Super property for this object.
+         *
+         * @param superValue
+         *        The new value for the Super property for this object.
+         * @return Returns a reference to this object so that method calls can be chained together.
+         */
+        Builder superValue(Collection<String> superValue);
+
+        /**
+         * Sets the value of the Super property for this object.
+         *
+         * @param superValue
+         *        The new value for the Super property for this object.
+         * @return Returns a reference to this object so that method calls can be chained together.
+         */
+        Builder superValue(String... superValue);
+
+        /**
+         * Sets the value of the ToString property for this object.
+         *
+         * @param toStringValue
+         *        The new value for the ToString property for this object.
+         * @return Returns a reference to this object so that method calls can be chained together.
+         */
+        Builder toStringValue(Map<String, String> toStringValue);
+
+        /**
+         * Sets the value of the Equals property for this object.
+         *
+         * @param equalsValue
+         *        The new value for the Equals property for this object.
+         * @return Returns a reference to this object so that method calls can be chained together.
+         */
+        Builder equalsValue(Map<String, String> equalsValue);
+    }
+
+    static final class BuilderImpl extends JsonProtocolTestsResponse.BuilderImpl implements Builder {
+        private List<String> build = DefaultSdkAutoConstructList.getInstance();
+
+        private List<String> superValue = DefaultSdkAutoConstructList.getInstance();
+
+        private Map<String, String> toStringValue = DefaultSdkAutoConstructMap.getInstance();
+
+        private Map<String, String> equalsValue = DefaultSdkAutoConstructMap.getInstance();
+
+        private BuilderImpl() {
+        }
+
+        private BuilderImpl(ExistenceCheckNamingResponse model) {
+            super(model);
+            build(model.build);
+            superValue(model.superValue);
+            toStringValue(model.toStringValue);
+            equalsValue(model.equalsValue);
+        }
+
+        public final Collection<String> getBuild() {
+            return build;
+        }
+
+        @Override
+        public final Builder build(Collection<String> build) {
+            this.build = ListOfStringsCopier.copy(build);
+            return this;
+        }
+
+        @Override
+        @SafeVarargs
+        public final Builder build(String... build) {
+            build(Arrays.asList(build));
+            return this;
+        }
+
+        public final void setBuild(Collection<String> build) {
+            this.build = ListOfStringsCopier.copy(build);
+        }
+
+        public final Collection<String> getSuperValue() {
+            return superValue;
+        }
+
+        @Override
+        public final Builder superValue(Collection<String> superValue) {
+            this.superValue = ListOfStringsCopier.copy(superValue);
+            return this;
+        }
+
+        @Override
+        @SafeVarargs
+        public final Builder superValue(String... superValue) {
+            superValue(Arrays.asList(superValue));
+            return this;
+        }
+
+        public final void setSuperValue(Collection<String> superValue) {
+            this.superValue = ListOfStringsCopier.copy(superValue);
+        }
+
+        public final Map<String, String> getToStringValue() {
+            return toStringValue;
+        }
+
+        @Override
+        public final Builder toStringValue(Map<String, String> toStringValue) {
+            this.toStringValue = MapOfStringToStringCopier.copy(toStringValue);
+            return this;
+        }
+
+        public final void setToStringValue(Map<String, String> toStringValue) {
+            this.toStringValue = MapOfStringToStringCopier.copy(toStringValue);
+        }
+
+        public final Map<String, String> getEqualsValue() {
+            return equalsValue;
+        }
+
+        @Override
+        public final Builder equalsValue(Map<String, String> equalsValue) {
+            this.equalsValue = MapOfStringToStringCopier.copy(equalsValue);
+            return this;
+        }
+
+        public final void setEqualsValue(Map<String, String> equalsValue) {
+            this.equalsValue = MapOfStringToStringCopier.copy(equalsValue);
+        }
+
+        @Override
+        public ExistenceCheckNamingResponse build() {
+            return new ExistenceCheckNamingResponse(this);
+        }
+
+        @Override
+        public List<SdkField<?>> sdkFields() {
+            return SDK_FIELDS;
+        }
+    }
+}
diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/nestedcontainersrequest.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/nestedcontainersrequest.java
index 3c80560e1f3d..c734af10203e 100644
--- a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/nestedcontainersrequest.java
+++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/nestedcontainersrequest.java
@@ -21,6 +21,8 @@
 import software.amazon.awssdk.core.traits.MapTrait;
 import software.amazon.awssdk.core.util.DefaultSdkAutoConstructList;
 import software.amazon.awssdk.core.util.DefaultSdkAutoConstructMap;
+import software.amazon.awssdk.core.util.SdkAutoConstructList;
+import software.amazon.awssdk.core.util.SdkAutoConstructMap;
 import software.amazon.awssdk.utils.ToString;
 import software.amazon.awssdk.utils.builder.CopyableBuilder;
 import software.amazon.awssdk.utils.builder.ToCopyableBuilder;
@@ -29,104 +31,104 @@
  */
 @Generated("software.amazon.awssdk:codegen")
 public final class NestedContainersRequest extends JsonProtocolTestsRequest implements
-        ToCopyableBuilder<NestedContainersRequest.Builder, NestedContainersRequest> {
+                                                                            ToCopyableBuilder<NestedContainersRequest.Builder, NestedContainersRequest> {
     private static final SdkField<List<List<String>>> LIST_OF_LIST_OF_STRINGS_FIELD = SdkField
-            .<List<List<String>>> builder(MarshallingType.LIST)
-            .getter(getter(NestedContainersRequest::listOfListOfStrings))
-            .setter(setter(Builder::listOfListOfStrings))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("ListOfListOfStrings").build(),
-                    ListTrait
-                            .builder()
-                            .memberLocationName(null)
-                            .memberFieldInfo(
-                                    SdkField.<List<String>> builder(MarshallingType.LIST)
-                                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
-                                                    .locationName("member").build(),
-                                                    ListTrait
-                                                            .builder()
-                                                            .memberLocationName(null)
-                                                            .memberFieldInfo(
-                                                                    SdkField.<String> builder(MarshallingType.STRING)
-                                                                            .traits(LocationTrait.builder()
-                                                                                    .location(MarshallLocation.PAYLOAD)
-                                                                                    .locationName("member").build()).build())
-                                                            .build()).build()).build()).build();
+        .<List<List<String>>> builder(MarshallingType.LIST)
+        .getter(getter(NestedContainersRequest::listOfListOfStrings))
+        .setter(setter(Builder::listOfListOfStrings))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("ListOfListOfStrings").build(),
+                ListTrait
+                    .builder()
+                    .memberLocationName(null)
+                    .memberFieldInfo(
+                        SdkField.<List<String>> builder(MarshallingType.LIST)
+                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
+                                                 .locationName("member").build(),
+                                    ListTrait
+                                        .builder()
+                                        .memberLocationName(null)
+                                        .memberFieldInfo(
+                                            SdkField.<String> builder(MarshallingType.STRING)
+                                                .traits(LocationTrait.builder()
+                                                                     .location(MarshallLocation.PAYLOAD)
+                                                                     .locationName("member").build()).build())
+                                        .build()).build()).build()).build();
 
     private static final SdkField<List<List<List<String>>>> LIST_OF_LIST_OF_LIST_OF_STRINGS_FIELD = SdkField
-            .<List<List<List<String>>>> builder(MarshallingType.LIST)
-            .getter(getter(NestedContainersRequest::listOfListOfListOfStrings))
-            .setter(setter(Builder::listOfListOfListOfStrings))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("ListOfListOfListOfStrings").build(),
-                    ListTrait
-                            .builder()
-                            .memberLocationName(null)
-                            .memberFieldInfo(
-                                    SdkField.<List<List<String>>> builder(MarshallingType.LIST)
-                                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
-                                                    .locationName("member").build(),
-                                                    ListTrait
+        .<List<List<List<String>>>> builder(MarshallingType.LIST)
+        .getter(getter(NestedContainersRequest::listOfListOfListOfStrings))
+        .setter(setter(Builder::listOfListOfListOfStrings))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("ListOfListOfListOfStrings").build(),
+                ListTrait
+                    .builder()
+                    .memberLocationName(null)
+                    .memberFieldInfo(
+                        SdkField.<List<List<String>>> builder(MarshallingType.LIST)
+                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
+                                                 .locationName("member").build(),
+                                    ListTrait
+                                        .builder()
+                                        .memberLocationName(null)
+                                        .memberFieldInfo(
+                                            SdkField.<List<String>> builder(MarshallingType.LIST)
+                                                .traits(LocationTrait.builder()
+                                                                     .location(MarshallLocation.PAYLOAD)
+                                                                     .locationName("member").build(),
+                                                        ListTrait
                                                             .builder()
                                                             .memberLocationName(null)
                                                             .memberFieldInfo(
-                                                                    SdkField.<List<String>> builder(MarshallingType.LIST)
-                                                                            .traits(LocationTrait.builder()
-                                                                                    .location(MarshallLocation.PAYLOAD)
-                                                                                    .locationName("member").build(),
-                                                                                    ListTrait
-                                                                                            .builder()
-                                                                                            .memberLocationName(null)
-                                                                                            .memberFieldInfo(
-                                                                                                    SdkField.<String> builder(
-                                                                                                            MarshallingType.STRING)
-                                                                                                            .traits(LocationTrait
-                                                                                                                    .builder()
-                                                                                                                    .location(
-                                                                                                                            MarshallLocation.PAYLOAD)
-                                                                                                                    .locationName(
-                                                                                                                            "member")
-                                                                                                                    .build())
-                                                                                                            .build()).build())
-                                                                            .build()).build()).build()).build()).build();
+                                                                SdkField.<String> builder(
+                                                                    MarshallingType.STRING)
+                                                                    .traits(LocationTrait
+                                                                                .builder()
+                                                                                .location(
+                                                                                    MarshallLocation.PAYLOAD)
+                                                                                .locationName(
+                                                                                    "member")
+                                                                                .build())
+                                                                    .build()).build())
+                                                .build()).build()).build()).build()).build();
 
     private static final SdkField<Map<String, List<List<String>>>> MAP_OF_STRING_TO_LIST_OF_LIST_OF_STRINGS_FIELD = SdkField
-            .<Map<String, List<List<String>>>> builder(MarshallingType.MAP)
-            .getter(getter(NestedContainersRequest::mapOfStringToListOfListOfStrings))
-            .setter(setter(Builder::mapOfStringToListOfListOfStrings))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("MapOfStringToListOfListOfStrings")
-                    .build(),
-                    MapTrait.builder()
-                            .keyLocationName("key")
-                            .valueLocationName("value")
-                            .valueFieldInfo(
-                                    SdkField.<List<List<String>>> builder(MarshallingType.LIST)
-                                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
-                                                    .locationName("value").build(),
-                                                    ListTrait
-                                                            .builder()
-                                                            .memberLocationName(null)
-                                                            .memberFieldInfo(
-                                                                    SdkField.<List<String>> builder(MarshallingType.LIST)
-                                                                            .traits(LocationTrait.builder()
-                                                                                    .location(MarshallLocation.PAYLOAD)
-                                                                                    .locationName("member").build(),
-                                                                                    ListTrait
-                                                                                            .builder()
-                                                                                            .memberLocationName(null)
-                                                                                            .memberFieldInfo(
-                                                                                                    SdkField.<String> builder(
-                                                                                                            MarshallingType.STRING)
-                                                                                                            .traits(LocationTrait
-                                                                                                                    .builder()
-                                                                                                                    .location(
-                                                                                                                            MarshallLocation.PAYLOAD)
-                                                                                                                    .locationName(
-                                                                                                                            "member")
-                                                                                                                    .build())
-                                                                                                            .build()).build())
-                                                                            .build()).build()).build()).build()).build();
+        .<Map<String, List<List<String>>>> builder(MarshallingType.MAP)
+        .getter(getter(NestedContainersRequest::mapOfStringToListOfListOfStrings))
+        .setter(setter(Builder::mapOfStringToListOfListOfStrings))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("MapOfStringToListOfListOfStrings")
+                             .build(),
+                MapTrait.builder()
+                        .keyLocationName("key")
+                        .valueLocationName("value")
+                        .valueFieldInfo(
+                            SdkField.<List<List<String>>> builder(MarshallingType.LIST)
+                                .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
+                                                     .locationName("value").build(),
+                                        ListTrait
+                                            .builder()
+                                            .memberLocationName(null)
+                                            .memberFieldInfo(
+                                                SdkField.<List<String>> builder(MarshallingType.LIST)
+                                                    .traits(LocationTrait.builder()
+                                                                         .location(MarshallLocation.PAYLOAD)
+                                                                         .locationName("member").build(),
+                                                            ListTrait
+                                                                .builder()
+                                                                .memberLocationName(null)
+                                                                .memberFieldInfo(
+                                                                    SdkField.<String> builder(
+                                                                        MarshallingType.STRING)
+                                                                        .traits(LocationTrait
+                                                                                    .builder()
+                                                                                    .location(
+                                                                                        MarshallLocation.PAYLOAD)
+                                                                                    .locationName(
+                                                                                        "member")
+                                                                                    .build())
+                                                                        .build()).build())
+                                                    .build()).build()).build()).build()).build();
 
     private static final List<SdkField<?>> SDK_FIELDS = Collections.unmodifiableList(Arrays.asList(LIST_OF_LIST_OF_STRINGS_FIELD,
-            LIST_OF_LIST_OF_LIST_OF_STRINGS_FIELD, MAP_OF_STRING_TO_LIST_OF_LIST_OF_STRINGS_FIELD));
+                                                                                                   LIST_OF_LIST_OF_LIST_OF_STRINGS_FIELD, MAP_OF_STRING_TO_LIST_OF_LIST_OF_STRINGS_FIELD));
 
     private final List<List<String>> listOfListOfStrings;
 
@@ -141,36 +143,72 @@ private NestedContainersRequest(BuilderImpl builder) {
         this.mapOfStringToListOfListOfStrings = builder.mapOfStringToListOfListOfStrings;
     }
 
+    /**
+     * Returns true if the ListOfListOfStrings property was specified by the sender (it may be empty), or false if the
+     * sender did not specify the value (it will be empty). For responses returned by the SDK, the sender is the AWS
+     * service.
+     */
+    public boolean hasListOfListOfStrings() {
+        return listOfListOfStrings != null && !(listOfListOfStrings instanceof SdkAutoConstructList);
+    }
+
     /**
      * Returns the value of the ListOfListOfStrings property for this object.
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
-     * 
+     * <p>
+     * You can use {@link #hasListOfListOfStrings()} to see if a value was sent in this field.
+     * </p>
+     *
      * @return The value of the ListOfListOfStrings property for this object.
      */
     public List<List<String>> listOfListOfStrings() {
         return listOfListOfStrings;
     }
 
+    /**
+     * Returns true if the ListOfListOfListOfStrings property was specified by the sender (it may be empty), or false if
+     * the sender did not specify the value (it will be empty). For responses returned by the SDK, the sender is the AWS
+     * service.
+     */
+    public boolean hasListOfListOfListOfStrings() {
+        return listOfListOfListOfStrings != null && !(listOfListOfListOfStrings instanceof SdkAutoConstructList);
+    }
+
     /**
      * Returns the value of the ListOfListOfListOfStrings property for this object.
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
-     * 
+     * <p>
+     * You can use {@link #hasListOfListOfListOfStrings()} to see if a value was sent in this field.
+     * </p>
+     *
      * @return The value of the ListOfListOfListOfStrings property for this object.
      */
     public List<List<List<String>>> listOfListOfListOfStrings() {
         return listOfListOfListOfStrings;
     }
 
+    /**
+     * Returns true if the MapOfStringToListOfListOfStrings property was specified by the sender (it may be empty), or
+     * false if the sender did not specify the value (it will be empty). For responses returned by the SDK, the sender
+     * is the AWS service.
+     */
+    public boolean hasMapOfStringToListOfListOfStrings() {
+        return mapOfStringToListOfListOfStrings != null && !(mapOfStringToListOfListOfStrings instanceof SdkAutoConstructMap);
+    }
+
     /**
      * Returns the value of the MapOfStringToListOfListOfStrings property for this object.
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
-     * 
+     * <p>
+     * You can use {@link #hasMapOfStringToListOfListOfStrings()} to see if a value was sent in this field.
+     * </p>
+     *
      * @return The value of the MapOfStringToListOfListOfStrings property for this object.
      */
     public Map<String, List<List<String>>> mapOfStringToListOfListOfStrings() {
@@ -218,8 +256,8 @@ public boolean equalsBySdkFields(Object obj) {
         }
         NestedContainersRequest other = (NestedContainersRequest) obj;
         return Objects.equals(listOfListOfStrings(), other.listOfListOfStrings())
-                && Objects.equals(listOfListOfListOfStrings(), other.listOfListOfListOfStrings())
-                && Objects.equals(mapOfStringToListOfListOfStrings(), other.mapOfStringToListOfListOfStrings());
+               && Objects.equals(listOfListOfListOfStrings(), other.listOfListOfListOfStrings())
+               && Objects.equals(mapOfStringToListOfListOfStrings(), other.mapOfStringToListOfListOfStrings());
     }
 
     /**
@@ -229,20 +267,20 @@ public boolean equalsBySdkFields(Object obj) {
     @Override
     public String toString() {
         return ToString.builder("NestedContainersRequest").add("ListOfListOfStrings", listOfListOfStrings())
-                .add("ListOfListOfListOfStrings", listOfListOfListOfStrings())
-                .add("MapOfStringToListOfListOfStrings", mapOfStringToListOfListOfStrings()).build();
+                       .add("ListOfListOfListOfStrings", listOfListOfListOfStrings())
+                       .add("MapOfStringToListOfListOfStrings", mapOfStringToListOfListOfStrings()).build();
     }
 
     public <T> Optional<T> getValueForField(String fieldName, Class<T> clazz) {
         switch (fieldName) {
-        case "ListOfListOfStrings":
-            return Optional.ofNullable(clazz.cast(listOfListOfStrings()));
-        case "ListOfListOfListOfStrings":
-            return Optional.ofNullable(clazz.cast(listOfListOfListOfStrings()));
-        case "MapOfStringToListOfListOfStrings":
-            return Optional.ofNullable(clazz.cast(mapOfStringToListOfListOfStrings()));
-        default:
-            return Optional.empty();
+            case "ListOfListOfStrings":
+                return Optional.ofNullable(clazz.cast(listOfListOfStrings()));
+            case "ListOfListOfListOfStrings":
+                return Optional.ofNullable(clazz.cast(listOfListOfListOfStrings()));
+            case "MapOfStringToListOfListOfStrings":
+                return Optional.ofNullable(clazz.cast(mapOfStringToListOfListOfStrings()));
+            default:
+                return Optional.empty();
         }
     }
 
@@ -304,7 +342,7 @@ public interface Builder extends JsonProtocolTestsRequest.Builder, SdkPojo, Copy
          * @return Returns a reference to this object so that method calls can be chained together.
          */
         Builder mapOfStringToListOfListOfStrings(
-                Map<String, ? extends Collection<? extends Collection<String>>> mapOfStringToListOfListOfStrings);
+            Map<String, ? extends Collection<? extends Collection<String>>> mapOfStringToListOfListOfStrings);
 
         @Override
         Builder overrideConfiguration(AwsRequestOverrideConfiguration overrideConfiguration);
@@ -357,7 +395,7 @@ public final Collection<? extends Collection<? extends Collection<String>>> getL
 
         @Override
         public final Builder listOfListOfListOfStrings(
-                Collection<? extends Collection<? extends Collection<String>>> listOfListOfListOfStrings) {
+            Collection<? extends Collection<? extends Collection<String>>> listOfListOfListOfStrings) {
             this.listOfListOfListOfStrings = ListOfListOfListOfStringsCopier.copy(listOfListOfListOfStrings);
             return this;
         }
@@ -370,7 +408,7 @@ public final Builder listOfListOfListOfStrings(Collection<? extends Collection<S
         }
 
         public final void setListOfListOfListOfStrings(
-                Collection<? extends Collection<? extends Collection<String>>> listOfListOfListOfStrings) {
+            Collection<? extends Collection<? extends Collection<String>>> listOfListOfListOfStrings) {
             this.listOfListOfListOfStrings = ListOfListOfListOfStringsCopier.copy(listOfListOfListOfStrings);
         }
 
@@ -380,13 +418,13 @@ public final void setListOfListOfListOfStrings(
 
         @Override
         public final Builder mapOfStringToListOfListOfStrings(
-                Map<String, ? extends Collection<? extends Collection<String>>> mapOfStringToListOfListOfStrings) {
+            Map<String, ? extends Collection<? extends Collection<String>>> mapOfStringToListOfListOfStrings) {
             this.mapOfStringToListOfListOfStrings = MapOfStringToListOfListOfStringsCopier.copy(mapOfStringToListOfListOfStrings);
             return this;
         }
 
         public final void setMapOfStringToListOfListOfStrings(
-                Map<String, ? extends Collection<? extends Collection<String>>> mapOfStringToListOfListOfStrings) {
+            Map<String, ? extends Collection<? extends Collection<String>>> mapOfStringToListOfListOfStrings) {
             this.mapOfStringToListOfListOfStrings = MapOfStringToListOfListOfStringsCopier.copy(mapOfStringToListOfListOfStrings);
         }
 
diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/nestedcontainersresponse.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/nestedcontainersresponse.java
index 1eb04bece957..9f70cd352697 100644
--- a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/nestedcontainersresponse.java
+++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/nestedcontainersresponse.java
@@ -19,6 +19,8 @@
 import software.amazon.awssdk.core.traits.MapTrait;
 import software.amazon.awssdk.core.util.DefaultSdkAutoConstructList;
 import software.amazon.awssdk.core.util.DefaultSdkAutoConstructMap;
+import software.amazon.awssdk.core.util.SdkAutoConstructList;
+import software.amazon.awssdk.core.util.SdkAutoConstructMap;
 import software.amazon.awssdk.utils.ToString;
 import software.amazon.awssdk.utils.builder.CopyableBuilder;
 import software.amazon.awssdk.utils.builder.ToCopyableBuilder;
@@ -27,104 +29,104 @@
  */
 @Generated("software.amazon.awssdk:codegen")
 public final class NestedContainersResponse extends JsonProtocolTestsResponse implements
-        ToCopyableBuilder<NestedContainersResponse.Builder, NestedContainersResponse> {
+                                                                              ToCopyableBuilder<NestedContainersResponse.Builder, NestedContainersResponse> {
     private static final SdkField<List<List<String>>> LIST_OF_LIST_OF_STRINGS_FIELD = SdkField
-            .<List<List<String>>> builder(MarshallingType.LIST)
-            .getter(getter(NestedContainersResponse::listOfListOfStrings))
-            .setter(setter(Builder::listOfListOfStrings))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("ListOfListOfStrings").build(),
-                    ListTrait
-                            .builder()
-                            .memberLocationName(null)
-                            .memberFieldInfo(
-                                    SdkField.<List<String>> builder(MarshallingType.LIST)
-                                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
-                                                    .locationName("member").build(),
-                                                    ListTrait
-                                                            .builder()
-                                                            .memberLocationName(null)
-                                                            .memberFieldInfo(
-                                                                    SdkField.<String> builder(MarshallingType.STRING)
-                                                                            .traits(LocationTrait.builder()
-                                                                                    .location(MarshallLocation.PAYLOAD)
-                                                                                    .locationName("member").build()).build())
-                                                            .build()).build()).build()).build();
+        .<List<List<String>>> builder(MarshallingType.LIST)
+        .getter(getter(NestedContainersResponse::listOfListOfStrings))
+        .setter(setter(Builder::listOfListOfStrings))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("ListOfListOfStrings").build(),
+                ListTrait
+                    .builder()
+                    .memberLocationName(null)
+                    .memberFieldInfo(
+                        SdkField.<List<String>> builder(MarshallingType.LIST)
+                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
+                                                 .locationName("member").build(),
+                                    ListTrait
+                                        .builder()
+                                        .memberLocationName(null)
+                                        .memberFieldInfo(
+                                            SdkField.<String> builder(MarshallingType.STRING)
+                                                .traits(LocationTrait.builder()
+                                                                     .location(MarshallLocation.PAYLOAD)
+                                                                     .locationName("member").build()).build())
+                                        .build()).build()).build()).build();
 
     private static final SdkField<List<List<List<String>>>> LIST_OF_LIST_OF_LIST_OF_STRINGS_FIELD = SdkField
-            .<List<List<List<String>>>> builder(MarshallingType.LIST)
-            .getter(getter(NestedContainersResponse::listOfListOfListOfStrings))
-            .setter(setter(Builder::listOfListOfListOfStrings))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("ListOfListOfListOfStrings").build(),
-                    ListTrait
-                            .builder()
-                            .memberLocationName(null)
-                            .memberFieldInfo(
-                                    SdkField.<List<List<String>>> builder(MarshallingType.LIST)
-                                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
-                                                    .locationName("member").build(),
-                                                    ListTrait
+        .<List<List<List<String>>>> builder(MarshallingType.LIST)
+        .getter(getter(NestedContainersResponse::listOfListOfListOfStrings))
+        .setter(setter(Builder::listOfListOfListOfStrings))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("ListOfListOfListOfStrings").build(),
+                ListTrait
+                    .builder()
+                    .memberLocationName(null)
+                    .memberFieldInfo(
+                        SdkField.<List<List<String>>> builder(MarshallingType.LIST)
+                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
+                                                 .locationName("member").build(),
+                                    ListTrait
+                                        .builder()
+                                        .memberLocationName(null)
+                                        .memberFieldInfo(
+                                            SdkField.<List<String>> builder(MarshallingType.LIST)
+                                                .traits(LocationTrait.builder()
+                                                                     .location(MarshallLocation.PAYLOAD)
+                                                                     .locationName("member").build(),
+                                                        ListTrait
                                                             .builder()
                                                             .memberLocationName(null)
                                                             .memberFieldInfo(
-                                                                    SdkField.<List<String>> builder(MarshallingType.LIST)
-                                                                            .traits(LocationTrait.builder()
-                                                                                    .location(MarshallLocation.PAYLOAD)
-                                                                                    .locationName("member").build(),
-                                                                                    ListTrait
-                                                                                            .builder()
-                                                                                            .memberLocationName(null)
-                                                                                            .memberFieldInfo(
-                                                                                                    SdkField.<String> builder(
-                                                                                                            MarshallingType.STRING)
-                                                                                                            .traits(LocationTrait
-                                                                                                                    .builder()
-                                                                                                                    .location(
-                                                                                                                            MarshallLocation.PAYLOAD)
-                                                                                                                    .locationName(
-                                                                                                                            "member")
-                                                                                                                    .build())
-                                                                                                            .build()).build())
-                                                                            .build()).build()).build()).build()).build();
+                                                                SdkField.<String> builder(
+                                                                    MarshallingType.STRING)
+                                                                    .traits(LocationTrait
+                                                                                .builder()
+                                                                                .location(
+                                                                                    MarshallLocation.PAYLOAD)
+                                                                                .locationName(
+                                                                                    "member")
+                                                                                .build())
+                                                                    .build()).build())
+                                                .build()).build()).build()).build()).build();
 
     private static final SdkField<Map<String, List<List<String>>>> MAP_OF_STRING_TO_LIST_OF_LIST_OF_STRINGS_FIELD = SdkField
-            .<Map<String, List<List<String>>>> builder(MarshallingType.MAP)
-            .getter(getter(NestedContainersResponse::mapOfStringToListOfListOfStrings))
-            .setter(setter(Builder::mapOfStringToListOfListOfStrings))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("MapOfStringToListOfListOfStrings")
-                    .build(),
-                    MapTrait.builder()
-                            .keyLocationName("key")
-                            .valueLocationName("value")
-                            .valueFieldInfo(
-                                    SdkField.<List<List<String>>> builder(MarshallingType.LIST)
-                                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
-                                                    .locationName("value").build(),
-                                                    ListTrait
-                                                            .builder()
-                                                            .memberLocationName(null)
-                                                            .memberFieldInfo(
-                                                                    SdkField.<List<String>> builder(MarshallingType.LIST)
-                                                                            .traits(LocationTrait.builder()
-                                                                                    .location(MarshallLocation.PAYLOAD)
-                                                                                    .locationName("member").build(),
-                                                                                    ListTrait
-                                                                                            .builder()
-                                                                                            .memberLocationName(null)
-                                                                                            .memberFieldInfo(
-                                                                                                    SdkField.<String> builder(
-                                                                                                            MarshallingType.STRING)
-                                                                                                            .traits(LocationTrait
-                                                                                                                    .builder()
-                                                                                                                    .location(
-                                                                                                                            MarshallLocation.PAYLOAD)
-                                                                                                                    .locationName(
-                                                                                                                            "member")
-                                                                                                                    .build())
-                                                                                                            .build()).build())
-                                                                            .build()).build()).build()).build()).build();
+        .<Map<String, List<List<String>>>> builder(MarshallingType.MAP)
+        .getter(getter(NestedContainersResponse::mapOfStringToListOfListOfStrings))
+        .setter(setter(Builder::mapOfStringToListOfListOfStrings))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("MapOfStringToListOfListOfStrings")
+                             .build(),
+                MapTrait.builder()
+                        .keyLocationName("key")
+                        .valueLocationName("value")
+                        .valueFieldInfo(
+                            SdkField.<List<List<String>>> builder(MarshallingType.LIST)
+                                .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
+                                                     .locationName("value").build(),
+                                        ListTrait
+                                            .builder()
+                                            .memberLocationName(null)
+                                            .memberFieldInfo(
+                                                SdkField.<List<String>> builder(MarshallingType.LIST)
+                                                    .traits(LocationTrait.builder()
+                                                                         .location(MarshallLocation.PAYLOAD)
+                                                                         .locationName("member").build(),
+                                                            ListTrait
+                                                                .builder()
+                                                                .memberLocationName(null)
+                                                                .memberFieldInfo(
+                                                                    SdkField.<String> builder(
+                                                                        MarshallingType.STRING)
+                                                                        .traits(LocationTrait
+                                                                                    .builder()
+                                                                                    .location(
+                                                                                        MarshallLocation.PAYLOAD)
+                                                                                    .locationName(
+                                                                                        "member")
+                                                                                    .build())
+                                                                        .build()).build())
+                                                    .build()).build()).build()).build()).build();
 
     private static final List<SdkField<?>> SDK_FIELDS = Collections.unmodifiableList(Arrays.asList(LIST_OF_LIST_OF_STRINGS_FIELD,
-            LIST_OF_LIST_OF_LIST_OF_STRINGS_FIELD, MAP_OF_STRING_TO_LIST_OF_LIST_OF_STRINGS_FIELD));
+                                                                                                   LIST_OF_LIST_OF_LIST_OF_STRINGS_FIELD, MAP_OF_STRING_TO_LIST_OF_LIST_OF_STRINGS_FIELD));
 
     private final List<List<String>> listOfListOfStrings;
 
@@ -139,36 +141,72 @@ private NestedContainersResponse(BuilderImpl builder) {
         this.mapOfStringToListOfListOfStrings = builder.mapOfStringToListOfListOfStrings;
     }
 
+    /**
+     * Returns true if the ListOfListOfStrings property was specified by the sender (it may be empty), or false if the
+     * sender did not specify the value (it will be empty). For responses returned by the SDK, the sender is the AWS
+     * service.
+     */
+    public boolean hasListOfListOfStrings() {
+        return listOfListOfStrings != null && !(listOfListOfStrings instanceof SdkAutoConstructList);
+    }
+
     /**
      * Returns the value of the ListOfListOfStrings property for this object.
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
-     * 
+     * <p>
+     * You can use {@link #hasListOfListOfStrings()} to see if a value was sent in this field.
+     * </p>
+     *
      * @return The value of the ListOfListOfStrings property for this object.
      */
     public List<List<String>> listOfListOfStrings() {
         return listOfListOfStrings;
     }
 
+    /**
+     * Returns true if the ListOfListOfListOfStrings property was specified by the sender (it may be empty), or false if
+     * the sender did not specify the value (it will be empty). For responses returned by the SDK, the sender is the AWS
+     * service.
+     */
+    public boolean hasListOfListOfListOfStrings() {
+        return listOfListOfListOfStrings != null && !(listOfListOfListOfStrings instanceof SdkAutoConstructList);
+    }
+
     /**
      * Returns the value of the ListOfListOfListOfStrings property for this object.
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
-     * 
+     * <p>
+     * You can use {@link #hasListOfListOfListOfStrings()} to see if a value was sent in this field.
+     * </p>
+     *
      * @return The value of the ListOfListOfListOfStrings property for this object.
      */
     public List<List<List<String>>> listOfListOfListOfStrings() {
         return listOfListOfListOfStrings;
     }
 
+    /**
+     * Returns true if the MapOfStringToListOfListOfStrings property was specified by the sender (it may be empty), or
+     * false if the sender did not specify the value (it will be empty). For responses returned by the SDK, the sender
+     * is the AWS service.
+     */
+    public boolean hasMapOfStringToListOfListOfStrings() {
+        return mapOfStringToListOfListOfStrings != null && !(mapOfStringToListOfListOfStrings instanceof SdkAutoConstructMap);
+    }
+
     /**
      * Returns the value of the MapOfStringToListOfListOfStrings property for this object.
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
-     * 
+     * <p>
+     * You can use {@link #hasMapOfStringToListOfListOfStrings()} to see if a value was sent in this field.
+     * </p>
+     *
      * @return The value of the MapOfStringToListOfListOfStrings property for this object.
      */
     public Map<String, List<List<String>>> mapOfStringToListOfListOfStrings() {
@@ -216,8 +254,8 @@ public boolean equalsBySdkFields(Object obj) {
         }
         NestedContainersResponse other = (NestedContainersResponse) obj;
         return Objects.equals(listOfListOfStrings(), other.listOfListOfStrings())
-                && Objects.equals(listOfListOfListOfStrings(), other.listOfListOfListOfStrings())
-                && Objects.equals(mapOfStringToListOfListOfStrings(), other.mapOfStringToListOfListOfStrings());
+               && Objects.equals(listOfListOfListOfStrings(), other.listOfListOfListOfStrings())
+               && Objects.equals(mapOfStringToListOfListOfStrings(), other.mapOfStringToListOfListOfStrings());
     }
 
     /**
@@ -227,20 +265,20 @@ public boolean equalsBySdkFields(Object obj) {
     @Override
     public String toString() {
         return ToString.builder("NestedContainersResponse").add("ListOfListOfStrings", listOfListOfStrings())
-                .add("ListOfListOfListOfStrings", listOfListOfListOfStrings())
-                .add("MapOfStringToListOfListOfStrings", mapOfStringToListOfListOfStrings()).build();
+                       .add("ListOfListOfListOfStrings", listOfListOfListOfStrings())
+                       .add("MapOfStringToListOfListOfStrings", mapOfStringToListOfListOfStrings()).build();
     }
 
     public <T> Optional<T> getValueForField(String fieldName, Class<T> clazz) {
         switch (fieldName) {
-        case "ListOfListOfStrings":
-            return Optional.ofNullable(clazz.cast(listOfListOfStrings()));
-        case "ListOfListOfListOfStrings":
-            return Optional.ofNullable(clazz.cast(listOfListOfListOfStrings()));
-        case "MapOfStringToListOfListOfStrings":
-            return Optional.ofNullable(clazz.cast(mapOfStringToListOfListOfStrings()));
-        default:
-            return Optional.empty();
+            case "ListOfListOfStrings":
+                return Optional.ofNullable(clazz.cast(listOfListOfStrings()));
+            case "ListOfListOfListOfStrings":
+                return Optional.ofNullable(clazz.cast(listOfListOfListOfStrings()));
+            case "MapOfStringToListOfListOfStrings":
+                return Optional.ofNullable(clazz.cast(mapOfStringToListOfListOfStrings()));
+            default:
+                return Optional.empty();
         }
     }
 
@@ -258,7 +296,7 @@ private static <T> BiConsumer<Object, T> setter(BiConsumer<Builder, T> s) {
     }
 
     public interface Builder extends JsonProtocolTestsResponse.Builder, SdkPojo,
-            CopyableBuilder<Builder, NestedContainersResponse> {
+                                     CopyableBuilder<Builder, NestedContainersResponse> {
         /**
          * Sets the value of the ListOfListOfStrings property for this object.
          *
@@ -303,7 +341,7 @@ public interface Builder extends JsonProtocolTestsResponse.Builder, SdkPojo,
          * @return Returns a reference to this object so that method calls can be chained together.
          */
         Builder mapOfStringToListOfListOfStrings(
-                Map<String, ? extends Collection<? extends Collection<String>>> mapOfStringToListOfListOfStrings);
+            Map<String, ? extends Collection<? extends Collection<String>>> mapOfStringToListOfListOfStrings);
     }
 
     static final class BuilderImpl extends JsonProtocolTestsResponse.BuilderImpl implements Builder {
@@ -350,7 +388,7 @@ public final Collection<? extends Collection<? extends Collection<String>>> getL
 
         @Override
         public final Builder listOfListOfListOfStrings(
-                Collection<? extends Collection<? extends Collection<String>>> listOfListOfListOfStrings) {
+            Collection<? extends Collection<? extends Collection<String>>> listOfListOfListOfStrings) {
             this.listOfListOfListOfStrings = ListOfListOfListOfStringsCopier.copy(listOfListOfListOfStrings);
             return this;
         }
@@ -363,7 +401,7 @@ public final Builder listOfListOfListOfStrings(Collection<? extends Collection<S
         }
 
         public final void setListOfListOfListOfStrings(
-                Collection<? extends Collection<? extends Collection<String>>> listOfListOfListOfStrings) {
+            Collection<? extends Collection<? extends Collection<String>>> listOfListOfListOfStrings) {
             this.listOfListOfListOfStrings = ListOfListOfListOfStringsCopier.copy(listOfListOfListOfStrings);
         }
 
@@ -373,13 +411,13 @@ public final void setListOfListOfListOfStrings(
 
         @Override
         public final Builder mapOfStringToListOfListOfStrings(
-                Map<String, ? extends Collection<? extends Collection<String>>> mapOfStringToListOfListOfStrings) {
+            Map<String, ? extends Collection<? extends Collection<String>>> mapOfStringToListOfListOfStrings) {
             this.mapOfStringToListOfListOfStrings = MapOfStringToListOfListOfStringsCopier.copy(mapOfStringToListOfListOfStrings);
             return this;
         }
 
         public final void setMapOfStringToListOfListOfStrings(
-                Map<String, ? extends Collection<? extends Collection<String>>> mapOfStringToListOfListOfStrings) {
+            Map<String, ? extends Collection<? extends Collection<String>>> mapOfStringToListOfListOfStrings) {
             this.mapOfStringToListOfListOfStrings = MapOfStringToListOfListOfStringsCopier.copy(mapOfStringToListOfListOfStrings);
         }
 
diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/nonautoconstructcontainers/alltypesrequest.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/nonautoconstructcontainers/alltypesrequest.java
index 6128273ce81f..dc32c003d951 100644
--- a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/nonautoconstructcontainers/alltypesrequest.java
+++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/nonautoconstructcontainers/alltypesrequest.java
@@ -25,6 +25,8 @@
 import software.amazon.awssdk.core.traits.ListTrait;
 import software.amazon.awssdk.core.traits.LocationTrait;
 import software.amazon.awssdk.core.traits.MapTrait;
+import software.amazon.awssdk.core.util.SdkAutoConstructList;
+import software.amazon.awssdk.core.util.SdkAutoConstructMap;
 import software.amazon.awssdk.utils.CollectionUtils;
 import software.amazon.awssdk.utils.ToString;
 import software.amazon.awssdk.utils.builder.CopyableBuilder;
@@ -34,344 +36,344 @@
  */
 @Generated("software.amazon.awssdk:codegen")
 public final class AllTypesRequest extends JsonProtocolTestsRequest implements
-        ToCopyableBuilder<AllTypesRequest.Builder, AllTypesRequest> {
+                                                                    ToCopyableBuilder<AllTypesRequest.Builder, AllTypesRequest> {
     private static final SdkField<String> STRING_MEMBER_FIELD = SdkField.<String> builder(MarshallingType.STRING)
-            .getter(getter(AllTypesRequest::stringMember)).setter(setter(Builder::stringMember))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("StringMember").build()).build();
+        .getter(getter(AllTypesRequest::stringMember)).setter(setter(Builder::stringMember))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("StringMember").build()).build();
 
     private static final SdkField<Integer> INTEGER_MEMBER_FIELD = SdkField.<Integer> builder(MarshallingType.INTEGER)
-            .getter(getter(AllTypesRequest::integerMember)).setter(setter(Builder::integerMember))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("IntegerMember").build()).build();
+        .getter(getter(AllTypesRequest::integerMember)).setter(setter(Builder::integerMember))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("IntegerMember").build()).build();
 
     private static final SdkField<Boolean> BOOLEAN_MEMBER_FIELD = SdkField.<Boolean> builder(MarshallingType.BOOLEAN)
-            .getter(getter(AllTypesRequest::booleanMember)).setter(setter(Builder::booleanMember))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("BooleanMember").build()).build();
+        .getter(getter(AllTypesRequest::booleanMember)).setter(setter(Builder::booleanMember))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("BooleanMember").build()).build();
 
     private static final SdkField<Float> FLOAT_MEMBER_FIELD = SdkField.<Float> builder(MarshallingType.FLOAT)
-            .getter(getter(AllTypesRequest::floatMember)).setter(setter(Builder::floatMember))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("FloatMember").build()).build();
+        .getter(getter(AllTypesRequest::floatMember)).setter(setter(Builder::floatMember))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("FloatMember").build()).build();
 
     private static final SdkField<Double> DOUBLE_MEMBER_FIELD = SdkField.<Double> builder(MarshallingType.DOUBLE)
-            .getter(getter(AllTypesRequest::doubleMember)).setter(setter(Builder::doubleMember))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("DoubleMember").build()).build();
+        .getter(getter(AllTypesRequest::doubleMember)).setter(setter(Builder::doubleMember))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("DoubleMember").build()).build();
 
     private static final SdkField<Long> LONG_MEMBER_FIELD = SdkField.<Long> builder(MarshallingType.LONG)
-            .getter(getter(AllTypesRequest::longMember)).setter(setter(Builder::longMember))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("LongMember").build()).build();
+        .getter(getter(AllTypesRequest::longMember)).setter(setter(Builder::longMember))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("LongMember").build()).build();
 
     private static final SdkField<List<String>> SIMPLE_LIST_FIELD = SdkField
-            .<List<String>> builder(MarshallingType.LIST)
-            .getter(getter(AllTypesRequest::simpleList))
-            .setter(setter(Builder::simpleList))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("SimpleList").build(),
-                    ListTrait
-                            .builder()
-                            .memberLocationName(null)
-                            .memberFieldInfo(
-                                    SdkField.<String> builder(MarshallingType.STRING)
-                                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
-                                                    .locationName("member").build()).build()).build()).build();
+        .<List<String>> builder(MarshallingType.LIST)
+        .getter(getter(AllTypesRequest::simpleList))
+        .setter(setter(Builder::simpleList))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("SimpleList").build(),
+                ListTrait
+                    .builder()
+                    .memberLocationName(null)
+                    .memberFieldInfo(
+                        SdkField.<String> builder(MarshallingType.STRING)
+                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
+                                                 .locationName("member").build()).build()).build()).build();
 
     private static final SdkField<List<String>> LIST_OF_ENUMS_FIELD = SdkField
-            .<List<String>> builder(MarshallingType.LIST)
-            .getter(getter(AllTypesRequest::listOfEnumsAsStrings))
-            .setter(setter(Builder::listOfEnumsWithStrings))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("ListOfEnums").build(),
-                    ListTrait
-                            .builder()
-                            .memberLocationName(null)
-                            .memberFieldInfo(
-                                    SdkField.<String> builder(MarshallingType.STRING)
-                                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
-                                                    .locationName("member").build()).build()).build()).build();
+        .<List<String>> builder(MarshallingType.LIST)
+        .getter(getter(AllTypesRequest::listOfEnumsAsStrings))
+        .setter(setter(Builder::listOfEnumsWithStrings))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("ListOfEnums").build(),
+                ListTrait
+                    .builder()
+                    .memberLocationName(null)
+                    .memberFieldInfo(
+                        SdkField.<String> builder(MarshallingType.STRING)
+                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
+                                                 .locationName("member").build()).build()).build()).build();
 
     private static final SdkField<List<Map<String, String>>> LIST_OF_MAPS_FIELD = SdkField
-            .<List<Map<String, String>>> builder(MarshallingType.LIST)
-            .getter(getter(AllTypesRequest::listOfMaps))
-            .setter(setter(Builder::listOfMaps))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("ListOfMaps").build(),
-                    ListTrait
-                            .builder()
-                            .memberLocationName(null)
-                            .memberFieldInfo(
-                                    SdkField.<Map<String, String>> builder(MarshallingType.MAP)
-                                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
-                                                    .locationName("member").build(),
-                                                    MapTrait.builder()
-                                                            .keyLocationName("key")
-                                                            .valueLocationName("value")
-                                                            .valueFieldInfo(
-                                                                    SdkField.<String> builder(MarshallingType.STRING)
-                                                                            .traits(LocationTrait.builder()
-                                                                                    .location(MarshallLocation.PAYLOAD)
-                                                                                    .locationName("value").build()).build())
-                                                            .build()).build()).build()).build();
+        .<List<Map<String, String>>> builder(MarshallingType.LIST)
+        .getter(getter(AllTypesRequest::listOfMaps))
+        .setter(setter(Builder::listOfMaps))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("ListOfMaps").build(),
+                ListTrait
+                    .builder()
+                    .memberLocationName(null)
+                    .memberFieldInfo(
+                        SdkField.<Map<String, String>> builder(MarshallingType.MAP)
+                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
+                                                 .locationName("member").build(),
+                                    MapTrait.builder()
+                                            .keyLocationName("key")
+                                            .valueLocationName("value")
+                                            .valueFieldInfo(
+                                                SdkField.<String> builder(MarshallingType.STRING)
+                                                    .traits(LocationTrait.builder()
+                                                                         .location(MarshallLocation.PAYLOAD)
+                                                                         .locationName("value").build()).build())
+                                            .build()).build()).build()).build();
 
     private static final SdkField<List<SimpleStruct>> LIST_OF_STRUCTS_FIELD = SdkField
-            .<List<SimpleStruct>> builder(MarshallingType.LIST)
-            .getter(getter(AllTypesRequest::listOfStructs))
-            .setter(setter(Builder::listOfStructs))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("ListOfStructs").build(),
-                    ListTrait
-                            .builder()
-                            .memberLocationName(null)
-                            .memberFieldInfo(
-                                    SdkField.<SimpleStruct> builder(MarshallingType.SDK_POJO)
-                                            .constructor(SimpleStruct::builder)
-                                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
-                                                    .locationName("member").build()).build()).build()).build();
+        .<List<SimpleStruct>> builder(MarshallingType.LIST)
+        .getter(getter(AllTypesRequest::listOfStructs))
+        .setter(setter(Builder::listOfStructs))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("ListOfStructs").build(),
+                ListTrait
+                    .builder()
+                    .memberLocationName(null)
+                    .memberFieldInfo(
+                        SdkField.<SimpleStruct> builder(MarshallingType.SDK_POJO)
+                            .constructor(SimpleStruct::builder)
+                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
+                                                 .locationName("member").build()).build()).build()).build();
 
     private static final SdkField<List<Map<String, String>>> LIST_OF_MAP_OF_ENUM_TO_STRING_FIELD = SdkField
-            .<List<Map<String, String>>> builder(MarshallingType.LIST)
-            .getter(getter(AllTypesRequest::listOfMapOfEnumToStringAsStrings))
-            .setter(setter(Builder::listOfMapOfEnumToStringWithStrings))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("ListOfMapOfEnumToString").build(),
-                    ListTrait
-                            .builder()
-                            .memberLocationName(null)
-                            .memberFieldInfo(
-                                    SdkField.<Map<String, String>> builder(MarshallingType.MAP)
-                                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
-                                                    .locationName("member").build(),
-                                                    MapTrait.builder()
-                                                            .keyLocationName("key")
-                                                            .valueLocationName("value")
-                                                            .valueFieldInfo(
-                                                                    SdkField.<String> builder(MarshallingType.STRING)
-                                                                            .traits(LocationTrait.builder()
-                                                                                    .location(MarshallLocation.PAYLOAD)
-                                                                                    .locationName("value").build()).build())
-                                                            .build()).build()).build()).build();
+        .<List<Map<String, String>>> builder(MarshallingType.LIST)
+        .getter(getter(AllTypesRequest::listOfMapOfEnumToStringAsStrings))
+        .setter(setter(Builder::listOfMapOfEnumToStringWithStrings))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("ListOfMapOfEnumToString").build(),
+                ListTrait
+                    .builder()
+                    .memberLocationName(null)
+                    .memberFieldInfo(
+                        SdkField.<Map<String, String>> builder(MarshallingType.MAP)
+                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
+                                                 .locationName("member").build(),
+                                    MapTrait.builder()
+                                            .keyLocationName("key")
+                                            .valueLocationName("value")
+                                            .valueFieldInfo(
+                                                SdkField.<String> builder(MarshallingType.STRING)
+                                                    .traits(LocationTrait.builder()
+                                                                         .location(MarshallLocation.PAYLOAD)
+                                                                         .locationName("value").build()).build())
+                                            .build()).build()).build()).build();
 
     private static final SdkField<Map<String, List<Integer>>> MAP_OF_STRING_TO_INTEGER_LIST_FIELD = SdkField
-            .<Map<String, List<Integer>>> builder(MarshallingType.MAP)
-            .getter(getter(AllTypesRequest::mapOfStringToIntegerList))
-            .setter(setter(Builder::mapOfStringToIntegerList))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("MapOfStringToIntegerList").build(),
-                    MapTrait.builder()
-                            .keyLocationName("key")
-                            .valueLocationName("value")
-                            .valueFieldInfo(
-                                    SdkField.<List<Integer>> builder(MarshallingType.LIST)
-                                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
-                                                    .locationName("value").build(),
-                                                    ListTrait
-                                                            .builder()
-                                                            .memberLocationName(null)
-                                                            .memberFieldInfo(
-                                                                    SdkField.<Integer> builder(MarshallingType.INTEGER)
-                                                                            .traits(LocationTrait.builder()
-                                                                                    .location(MarshallLocation.PAYLOAD)
-                                                                                    .locationName("member").build()).build())
-                                                            .build()).build()).build()).build();
+        .<Map<String, List<Integer>>> builder(MarshallingType.MAP)
+        .getter(getter(AllTypesRequest::mapOfStringToIntegerList))
+        .setter(setter(Builder::mapOfStringToIntegerList))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("MapOfStringToIntegerList").build(),
+                MapTrait.builder()
+                        .keyLocationName("key")
+                        .valueLocationName("value")
+                        .valueFieldInfo(
+                            SdkField.<List<Integer>> builder(MarshallingType.LIST)
+                                .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
+                                                     .locationName("value").build(),
+                                        ListTrait
+                                            .builder()
+                                            .memberLocationName(null)
+                                            .memberFieldInfo(
+                                                SdkField.<Integer> builder(MarshallingType.INTEGER)
+                                                    .traits(LocationTrait.builder()
+                                                                         .location(MarshallLocation.PAYLOAD)
+                                                                         .locationName("member").build()).build())
+                                            .build()).build()).build()).build();
 
     private static final SdkField<Map<String, String>> MAP_OF_STRING_TO_STRING_FIELD = SdkField
-            .<Map<String, String>> builder(MarshallingType.MAP)
-            .getter(getter(AllTypesRequest::mapOfStringToString))
-            .setter(setter(Builder::mapOfStringToString))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("MapOfStringToString").build(),
-                    MapTrait.builder()
-                            .keyLocationName("key")
-                            .valueLocationName("value")
-                            .valueFieldInfo(
-                                    SdkField.<String> builder(MarshallingType.STRING)
-                                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
-                                                    .locationName("value").build()).build()).build()).build();
+        .<Map<String, String>> builder(MarshallingType.MAP)
+        .getter(getter(AllTypesRequest::mapOfStringToString))
+        .setter(setter(Builder::mapOfStringToString))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("MapOfStringToString").build(),
+                MapTrait.builder()
+                        .keyLocationName("key")
+                        .valueLocationName("value")
+                        .valueFieldInfo(
+                            SdkField.<String> builder(MarshallingType.STRING)
+                                .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
+                                                     .locationName("value").build()).build()).build()).build();
 
     private static final SdkField<Map<String, SimpleStruct>> MAP_OF_STRING_TO_SIMPLE_STRUCT_FIELD = SdkField
-            .<Map<String, SimpleStruct>> builder(MarshallingType.MAP)
-            .getter(getter(AllTypesRequest::mapOfStringToSimpleStruct))
-            .setter(setter(Builder::mapOfStringToSimpleStruct))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("MapOfStringToSimpleStruct").build(),
-                    MapTrait.builder()
-                            .keyLocationName("key")
-                            .valueLocationName("value")
-                            .valueFieldInfo(
-                                    SdkField.<SimpleStruct> builder(MarshallingType.SDK_POJO)
-                                            .constructor(SimpleStruct::builder)
-                                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
-                                                    .locationName("value").build()).build()).build()).build();
+        .<Map<String, SimpleStruct>> builder(MarshallingType.MAP)
+        .getter(getter(AllTypesRequest::mapOfStringToSimpleStruct))
+        .setter(setter(Builder::mapOfStringToSimpleStruct))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("MapOfStringToSimpleStruct").build(),
+                MapTrait.builder()
+                        .keyLocationName("key")
+                        .valueLocationName("value")
+                        .valueFieldInfo(
+                            SdkField.<SimpleStruct> builder(MarshallingType.SDK_POJO)
+                                .constructor(SimpleStruct::builder)
+                                .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
+                                                     .locationName("value").build()).build()).build()).build();
 
     private static final SdkField<Map<String, String>> MAP_OF_ENUM_TO_ENUM_FIELD = SdkField
-            .<Map<String, String>> builder(MarshallingType.MAP)
-            .getter(getter(AllTypesRequest::mapOfEnumToEnumAsStrings))
-            .setter(setter(Builder::mapOfEnumToEnumWithStrings))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("MapOfEnumToEnum").build(),
-                    MapTrait.builder()
-                            .keyLocationName("key")
-                            .valueLocationName("value")
-                            .valueFieldInfo(
-                                    SdkField.<String> builder(MarshallingType.STRING)
-                                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
-                                                    .locationName("value").build()).build()).build()).build();
+        .<Map<String, String>> builder(MarshallingType.MAP)
+        .getter(getter(AllTypesRequest::mapOfEnumToEnumAsStrings))
+        .setter(setter(Builder::mapOfEnumToEnumWithStrings))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("MapOfEnumToEnum").build(),
+                MapTrait.builder()
+                        .keyLocationName("key")
+                        .valueLocationName("value")
+                        .valueFieldInfo(
+                            SdkField.<String> builder(MarshallingType.STRING)
+                                .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
+                                                     .locationName("value").build()).build()).build()).build();
 
     private static final SdkField<Map<String, String>> MAP_OF_ENUM_TO_STRING_FIELD = SdkField
-            .<Map<String, String>> builder(MarshallingType.MAP)
-            .getter(getter(AllTypesRequest::mapOfEnumToStringAsStrings))
-            .setter(setter(Builder::mapOfEnumToStringWithStrings))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("MapOfEnumToString").build(),
-                    MapTrait.builder()
-                            .keyLocationName("key")
-                            .valueLocationName("value")
-                            .valueFieldInfo(
-                                    SdkField.<String> builder(MarshallingType.STRING)
-                                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
-                                                    .locationName("value").build()).build()).build()).build();
+        .<Map<String, String>> builder(MarshallingType.MAP)
+        .getter(getter(AllTypesRequest::mapOfEnumToStringAsStrings))
+        .setter(setter(Builder::mapOfEnumToStringWithStrings))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("MapOfEnumToString").build(),
+                MapTrait.builder()
+                        .keyLocationName("key")
+                        .valueLocationName("value")
+                        .valueFieldInfo(
+                            SdkField.<String> builder(MarshallingType.STRING)
+                                .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
+                                                     .locationName("value").build()).build()).build()).build();
 
     private static final SdkField<Map<String, String>> MAP_OF_STRING_TO_ENUM_FIELD = SdkField
-            .<Map<String, String>> builder(MarshallingType.MAP)
-            .getter(getter(AllTypesRequest::mapOfStringToEnumAsStrings))
-            .setter(setter(Builder::mapOfStringToEnumWithStrings))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("MapOfStringToEnum").build(),
-                    MapTrait.builder()
-                            .keyLocationName("key")
-                            .valueLocationName("value")
-                            .valueFieldInfo(
-                                    SdkField.<String> builder(MarshallingType.STRING)
-                                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
-                                                    .locationName("value").build()).build()).build()).build();
+        .<Map<String, String>> builder(MarshallingType.MAP)
+        .getter(getter(AllTypesRequest::mapOfStringToEnumAsStrings))
+        .setter(setter(Builder::mapOfStringToEnumWithStrings))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("MapOfStringToEnum").build(),
+                MapTrait.builder()
+                        .keyLocationName("key")
+                        .valueLocationName("value")
+                        .valueFieldInfo(
+                            SdkField.<String> builder(MarshallingType.STRING)
+                                .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
+                                                     .locationName("value").build()).build()).build()).build();
 
     private static final SdkField<Map<String, SimpleStruct>> MAP_OF_ENUM_TO_SIMPLE_STRUCT_FIELD = SdkField
-            .<Map<String, SimpleStruct>> builder(MarshallingType.MAP)
-            .getter(getter(AllTypesRequest::mapOfEnumToSimpleStructAsStrings))
-            .setter(setter(Builder::mapOfEnumToSimpleStructWithStrings))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("MapOfEnumToSimpleStruct").build(),
-                    MapTrait.builder()
-                            .keyLocationName("key")
-                            .valueLocationName("value")
-                            .valueFieldInfo(
-                                    SdkField.<SimpleStruct> builder(MarshallingType.SDK_POJO)
-                                            .constructor(SimpleStruct::builder)
-                                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
-                                                    .locationName("value").build()).build()).build()).build();
+        .<Map<String, SimpleStruct>> builder(MarshallingType.MAP)
+        .getter(getter(AllTypesRequest::mapOfEnumToSimpleStructAsStrings))
+        .setter(setter(Builder::mapOfEnumToSimpleStructWithStrings))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("MapOfEnumToSimpleStruct").build(),
+                MapTrait.builder()
+                        .keyLocationName("key")
+                        .valueLocationName("value")
+                        .valueFieldInfo(
+                            SdkField.<SimpleStruct> builder(MarshallingType.SDK_POJO)
+                                .constructor(SimpleStruct::builder)
+                                .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
+                                                     .locationName("value").build()).build()).build()).build();
 
     private static final SdkField<Map<String, List<String>>> MAP_OF_ENUM_TO_LIST_OF_ENUMS_FIELD = SdkField
-            .<Map<String, List<String>>> builder(MarshallingType.MAP)
-            .getter(getter(AllTypesRequest::mapOfEnumToListOfEnumsAsStrings))
-            .setter(setter(Builder::mapOfEnumToListOfEnumsWithStrings))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("MapOfEnumToListOfEnums").build(),
-                    MapTrait.builder()
-                            .keyLocationName("key")
-                            .valueLocationName("value")
-                            .valueFieldInfo(
-                                    SdkField.<List<String>> builder(MarshallingType.LIST)
-                                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
-                                                    .locationName("value").build(),
-                                                    ListTrait
-                                                            .builder()
-                                                            .memberLocationName(null)
-                                                            .memberFieldInfo(
-                                                                    SdkField.<String> builder(MarshallingType.STRING)
-                                                                            .traits(LocationTrait.builder()
-                                                                                    .location(MarshallLocation.PAYLOAD)
-                                                                                    .locationName("member").build()).build())
-                                                            .build()).build()).build()).build();
+        .<Map<String, List<String>>> builder(MarshallingType.MAP)
+        .getter(getter(AllTypesRequest::mapOfEnumToListOfEnumsAsStrings))
+        .setter(setter(Builder::mapOfEnumToListOfEnumsWithStrings))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("MapOfEnumToListOfEnums").build(),
+                MapTrait.builder()
+                        .keyLocationName("key")
+                        .valueLocationName("value")
+                        .valueFieldInfo(
+                            SdkField.<List<String>> builder(MarshallingType.LIST)
+                                .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
+                                                     .locationName("value").build(),
+                                        ListTrait
+                                            .builder()
+                                            .memberLocationName(null)
+                                            .memberFieldInfo(
+                                                SdkField.<String> builder(MarshallingType.STRING)
+                                                    .traits(LocationTrait.builder()
+                                                                         .location(MarshallLocation.PAYLOAD)
+                                                                         .locationName("member").build()).build())
+                                            .build()).build()).build()).build();
 
     private static final SdkField<Map<String, Map<String, String>>> MAP_OF_ENUM_TO_MAP_OF_STRING_TO_ENUM_FIELD = SdkField
-            .<Map<String, Map<String, String>>> builder(MarshallingType.MAP)
-            .getter(getter(AllTypesRequest::mapOfEnumToMapOfStringToEnumAsStrings))
-            .setter(setter(Builder::mapOfEnumToMapOfStringToEnumWithStrings))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("MapOfEnumToMapOfStringToEnum")
-                    .build(),
-                    MapTrait.builder()
-                            .keyLocationName("key")
-                            .valueLocationName("value")
-                            .valueFieldInfo(
-                                    SdkField.<Map<String, String>> builder(MarshallingType.MAP)
-                                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
-                                                    .locationName("value").build(),
-                                                    MapTrait.builder()
-                                                            .keyLocationName("key")
-                                                            .valueLocationName("value")
-                                                            .valueFieldInfo(
-                                                                    SdkField.<String> builder(MarshallingType.STRING)
-                                                                            .traits(LocationTrait.builder()
-                                                                                    .location(MarshallLocation.PAYLOAD)
-                                                                                    .locationName("value").build()).build())
-                                                            .build()).build()).build()).build();
+        .<Map<String, Map<String, String>>> builder(MarshallingType.MAP)
+        .getter(getter(AllTypesRequest::mapOfEnumToMapOfStringToEnumAsStrings))
+        .setter(setter(Builder::mapOfEnumToMapOfStringToEnumWithStrings))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("MapOfEnumToMapOfStringToEnum")
+                             .build(),
+                MapTrait.builder()
+                        .keyLocationName("key")
+                        .valueLocationName("value")
+                        .valueFieldInfo(
+                            SdkField.<Map<String, String>> builder(MarshallingType.MAP)
+                                .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
+                                                     .locationName("value").build(),
+                                        MapTrait.builder()
+                                                .keyLocationName("key")
+                                                .valueLocationName("value")
+                                                .valueFieldInfo(
+                                                    SdkField.<String> builder(MarshallingType.STRING)
+                                                        .traits(LocationTrait.builder()
+                                                                             .location(MarshallLocation.PAYLOAD)
+                                                                             .locationName("value").build()).build())
+                                                .build()).build()).build()).build();
 
     private static final SdkField<Instant> TIMESTAMP_MEMBER_FIELD = SdkField.<Instant> builder(MarshallingType.INSTANT)
-            .getter(getter(AllTypesRequest::timestampMember)).setter(setter(Builder::timestampMember))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("TimestampMember").build()).build();
+        .getter(getter(AllTypesRequest::timestampMember)).setter(setter(Builder::timestampMember))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("TimestampMember").build()).build();
 
     private static final SdkField<StructWithTimestamp> STRUCT_WITH_NESTED_TIMESTAMP_MEMBER_FIELD = SdkField
-            .<StructWithTimestamp> builder(MarshallingType.SDK_POJO)
-            .getter(getter(AllTypesRequest::structWithNestedTimestampMember))
-            .setter(setter(Builder::structWithNestedTimestampMember))
-            .constructor(StructWithTimestamp::builder)
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("StructWithNestedTimestampMember")
-                    .build()).build();
+        .<StructWithTimestamp> builder(MarshallingType.SDK_POJO)
+        .getter(getter(AllTypesRequest::structWithNestedTimestampMember))
+        .setter(setter(Builder::structWithNestedTimestampMember))
+        .constructor(StructWithTimestamp::builder)
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("StructWithNestedTimestampMember")
+                             .build()).build();
 
     private static final SdkField<SdkBytes> BLOB_ARG_FIELD = SdkField.<SdkBytes> builder(MarshallingType.SDK_BYTES)
-            .getter(getter(AllTypesRequest::blobArg)).setter(setter(Builder::blobArg))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("BlobArg").build()).build();
+        .getter(getter(AllTypesRequest::blobArg)).setter(setter(Builder::blobArg))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("BlobArg").build()).build();
 
     private static final SdkField<StructWithNestedBlobType> STRUCT_WITH_NESTED_BLOB_FIELD = SdkField
-            .<StructWithNestedBlobType> builder(MarshallingType.SDK_POJO).getter(getter(AllTypesRequest::structWithNestedBlob))
-            .setter(setter(Builder::structWithNestedBlob)).constructor(StructWithNestedBlobType::builder)
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("StructWithNestedBlob").build())
-            .build();
+        .<StructWithNestedBlobType> builder(MarshallingType.SDK_POJO).getter(getter(AllTypesRequest::structWithNestedBlob))
+                                                                     .setter(setter(Builder::structWithNestedBlob)).constructor(StructWithNestedBlobType::builder)
+                                                                     .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("StructWithNestedBlob").build())
+                                                                     .build();
 
     private static final SdkField<Map<String, SdkBytes>> BLOB_MAP_FIELD = SdkField
-            .<Map<String, SdkBytes>> builder(MarshallingType.MAP)
-            .getter(getter(AllTypesRequest::blobMap))
-            .setter(setter(Builder::blobMap))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("BlobMap").build(),
-                    MapTrait.builder()
-                            .keyLocationName("key")
-                            .valueLocationName("value")
-                            .valueFieldInfo(
-                                    SdkField.<SdkBytes> builder(MarshallingType.SDK_BYTES)
-                                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
-                                                    .locationName("value").build()).build()).build()).build();
+        .<Map<String, SdkBytes>> builder(MarshallingType.MAP)
+        .getter(getter(AllTypesRequest::blobMap))
+        .setter(setter(Builder::blobMap))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("BlobMap").build(),
+                MapTrait.builder()
+                        .keyLocationName("key")
+                        .valueLocationName("value")
+                        .valueFieldInfo(
+                            SdkField.<SdkBytes> builder(MarshallingType.SDK_BYTES)
+                                .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
+                                                     .locationName("value").build()).build()).build()).build();
 
     private static final SdkField<List<SdkBytes>> LIST_OF_BLOBS_FIELD = SdkField
-            .<List<SdkBytes>> builder(MarshallingType.LIST)
-            .getter(getter(AllTypesRequest::listOfBlobs))
-            .setter(setter(Builder::listOfBlobs))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("ListOfBlobs").build(),
-                    ListTrait
-                            .builder()
-                            .memberLocationName(null)
-                            .memberFieldInfo(
-                                    SdkField.<SdkBytes> builder(MarshallingType.SDK_BYTES)
-                                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
-                                                    .locationName("member").build()).build()).build()).build();
+        .<List<SdkBytes>> builder(MarshallingType.LIST)
+        .getter(getter(AllTypesRequest::listOfBlobs))
+        .setter(setter(Builder::listOfBlobs))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("ListOfBlobs").build(),
+                ListTrait
+                    .builder()
+                    .memberLocationName(null)
+                    .memberFieldInfo(
+                        SdkField.<SdkBytes> builder(MarshallingType.SDK_BYTES)
+                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
+                                                 .locationName("member").build()).build()).build()).build();
 
     private static final SdkField<RecursiveStructType> RECURSIVE_STRUCT_FIELD = SdkField
-            .<RecursiveStructType> builder(MarshallingType.SDK_POJO).getter(getter(AllTypesRequest::recursiveStruct))
-            .setter(setter(Builder::recursiveStruct)).constructor(RecursiveStructType::builder)
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("RecursiveStruct").build()).build();
+        .<RecursiveStructType> builder(MarshallingType.SDK_POJO).getter(getter(AllTypesRequest::recursiveStruct))
+                                                                .setter(setter(Builder::recursiveStruct)).constructor(RecursiveStructType::builder)
+                                                                .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("RecursiveStruct").build()).build();
 
     private static final SdkField<BaseType> POLYMORPHIC_TYPE_WITH_SUB_TYPES_FIELD = SdkField
-            .<BaseType> builder(MarshallingType.SDK_POJO)
-            .getter(getter(AllTypesRequest::polymorphicTypeWithSubTypes))
-            .setter(setter(Builder::polymorphicTypeWithSubTypes))
-            .constructor(BaseType::builder)
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("PolymorphicTypeWithSubTypes")
-                    .build()).build();
+        .<BaseType> builder(MarshallingType.SDK_POJO)
+        .getter(getter(AllTypesRequest::polymorphicTypeWithSubTypes))
+        .setter(setter(Builder::polymorphicTypeWithSubTypes))
+        .constructor(BaseType::builder)
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("PolymorphicTypeWithSubTypes")
+                             .build()).build();
 
     private static final SdkField<SubTypeOne> POLYMORPHIC_TYPE_WITHOUT_SUB_TYPES_FIELD = SdkField
-            .<SubTypeOne> builder(MarshallingType.SDK_POJO)
-            .getter(getter(AllTypesRequest::polymorphicTypeWithoutSubTypes))
-            .setter(setter(Builder::polymorphicTypeWithoutSubTypes))
-            .constructor(SubTypeOne::builder)
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("PolymorphicTypeWithoutSubTypes")
-                    .build()).build();
+        .<SubTypeOne> builder(MarshallingType.SDK_POJO)
+        .getter(getter(AllTypesRequest::polymorphicTypeWithoutSubTypes))
+        .setter(setter(Builder::polymorphicTypeWithoutSubTypes))
+        .constructor(SubTypeOne::builder)
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("PolymorphicTypeWithoutSubTypes")
+                             .build()).build();
 
     private static final SdkField<String> ENUM_TYPE_FIELD = SdkField.<String> builder(MarshallingType.STRING)
-            .getter(getter(AllTypesRequest::enumTypeAsString)).setter(setter(Builder::enumType))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("EnumType").build()).build();
+        .getter(getter(AllTypesRequest::enumTypeAsString)).setter(setter(Builder::enumType))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("EnumType").build()).build();
 
     private static final List<SdkField<?>> SDK_FIELDS = Collections.unmodifiableList(Arrays.asList(STRING_MEMBER_FIELD,
-            INTEGER_MEMBER_FIELD, BOOLEAN_MEMBER_FIELD, FLOAT_MEMBER_FIELD, DOUBLE_MEMBER_FIELD, LONG_MEMBER_FIELD,
-            SIMPLE_LIST_FIELD, LIST_OF_ENUMS_FIELD, LIST_OF_MAPS_FIELD, LIST_OF_STRUCTS_FIELD,
-            LIST_OF_MAP_OF_ENUM_TO_STRING_FIELD, MAP_OF_STRING_TO_INTEGER_LIST_FIELD, MAP_OF_STRING_TO_STRING_FIELD,
-            MAP_OF_STRING_TO_SIMPLE_STRUCT_FIELD, MAP_OF_ENUM_TO_ENUM_FIELD, MAP_OF_ENUM_TO_STRING_FIELD,
-            MAP_OF_STRING_TO_ENUM_FIELD, MAP_OF_ENUM_TO_SIMPLE_STRUCT_FIELD, MAP_OF_ENUM_TO_LIST_OF_ENUMS_FIELD,
-            MAP_OF_ENUM_TO_MAP_OF_STRING_TO_ENUM_FIELD, TIMESTAMP_MEMBER_FIELD, STRUCT_WITH_NESTED_TIMESTAMP_MEMBER_FIELD,
-            BLOB_ARG_FIELD, STRUCT_WITH_NESTED_BLOB_FIELD, BLOB_MAP_FIELD, LIST_OF_BLOBS_FIELD, RECURSIVE_STRUCT_FIELD,
-            POLYMORPHIC_TYPE_WITH_SUB_TYPES_FIELD, POLYMORPHIC_TYPE_WITHOUT_SUB_TYPES_FIELD, ENUM_TYPE_FIELD));
+                                                                                                   INTEGER_MEMBER_FIELD, BOOLEAN_MEMBER_FIELD, FLOAT_MEMBER_FIELD, DOUBLE_MEMBER_FIELD, LONG_MEMBER_FIELD,
+                                                                                                   SIMPLE_LIST_FIELD, LIST_OF_ENUMS_FIELD, LIST_OF_MAPS_FIELD, LIST_OF_STRUCTS_FIELD,
+                                                                                                   LIST_OF_MAP_OF_ENUM_TO_STRING_FIELD, MAP_OF_STRING_TO_INTEGER_LIST_FIELD, MAP_OF_STRING_TO_STRING_FIELD,
+                                                                                                   MAP_OF_STRING_TO_SIMPLE_STRUCT_FIELD, MAP_OF_ENUM_TO_ENUM_FIELD, MAP_OF_ENUM_TO_STRING_FIELD,
+                                                                                                   MAP_OF_STRING_TO_ENUM_FIELD, MAP_OF_ENUM_TO_SIMPLE_STRUCT_FIELD, MAP_OF_ENUM_TO_LIST_OF_ENUMS_FIELD,
+                                                                                                   MAP_OF_ENUM_TO_MAP_OF_STRING_TO_ENUM_FIELD, TIMESTAMP_MEMBER_FIELD, STRUCT_WITH_NESTED_TIMESTAMP_MEMBER_FIELD,
+                                                                                                   BLOB_ARG_FIELD, STRUCT_WITH_NESTED_BLOB_FIELD, BLOB_MAP_FIELD, LIST_OF_BLOBS_FIELD, RECURSIVE_STRUCT_FIELD,
+                                                                                                   POLYMORPHIC_TYPE_WITH_SUB_TYPES_FIELD, POLYMORPHIC_TYPE_WITHOUT_SUB_TYPES_FIELD, ENUM_TYPE_FIELD));
 
     private final String stringMember;
 
@@ -469,7 +471,7 @@ private AllTypesRequest(BuilderImpl builder) {
 
     /**
      * Returns the value of the StringMember property for this object.
-     * 
+     *
      * @return The value of the StringMember property for this object.
      */
     public String stringMember() {
@@ -478,7 +480,7 @@ public String stringMember() {
 
     /**
      * Returns the value of the IntegerMember property for this object.
-     * 
+     *
      * @return The value of the IntegerMember property for this object.
      */
     public Integer integerMember() {
@@ -487,7 +489,7 @@ public Integer integerMember() {
 
     /**
      * Returns the value of the BooleanMember property for this object.
-     * 
+     *
      * @return The value of the BooleanMember property for this object.
      */
     public Boolean booleanMember() {
@@ -496,7 +498,7 @@ public Boolean booleanMember() {
 
     /**
      * Returns the value of the FloatMember property for this object.
-     * 
+     *
      * @return The value of the FloatMember property for this object.
      */
     public Float floatMember() {
@@ -505,7 +507,7 @@ public Float floatMember() {
 
     /**
      * Returns the value of the DoubleMember property for this object.
-     * 
+     *
      * @return The value of the DoubleMember property for this object.
      */
     public Double doubleMember() {
@@ -514,19 +516,30 @@ public Double doubleMember() {
 
     /**
      * Returns the value of the LongMember property for this object.
-     * 
+     *
      * @return The value of the LongMember property for this object.
      */
     public Long longMember() {
         return longMember;
     }
 
+    /**
+     * Returns true if the SimpleList property was specified by the sender (it may be empty), or false if the sender did
+     * not specify the value (it will be empty). For responses returned by the SDK, the sender is the AWS service.
+     */
+    public boolean hasSimpleList() {
+        return simpleList != null && !(simpleList instanceof SdkAutoConstructList);
+    }
+
     /**
      * Returns the value of the SimpleList property for this object.
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
-     * 
+     * <p>
+     * You can use {@link #hasSimpleList()} to see if a value was sent in this field.
+     * </p>
+     *
      * @return The value of the SimpleList property for this object.
      */
     public List<String> simpleList() {
@@ -538,43 +551,79 @@ public List<String> simpleList() {
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
-     * 
+     * <p>
+     * You can use {@link #hasListOfEnums()} to see if a value was sent in this field.
+     * </p>
+     *
      * @return The value of the ListOfEnums property for this object.
      */
     public List<EnumType> listOfEnums() {
         return ListOfEnumsCopier.copyStringToEnum(listOfEnums);
     }
 
+    /**
+     * Returns true if the ListOfEnums property was specified by the sender (it may be empty), or false if the sender
+     * did not specify the value (it will be empty). For responses returned by the SDK, the sender is the AWS service.
+     */
+    public boolean hasListOfEnums() {
+        return listOfEnums != null && !(listOfEnums instanceof SdkAutoConstructList);
+    }
+
     /**
      * Returns the value of the ListOfEnums property for this object.
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
-     * 
+     * <p>
+     * You can use {@link #hasListOfEnums()} to see if a value was sent in this field.
+     * </p>
+     *
      * @return The value of the ListOfEnums property for this object.
      */
     public List<String> listOfEnumsAsStrings() {
         return listOfEnums;
     }
 
+    /**
+     * Returns true if the ListOfMaps property was specified by the sender (it may be empty), or false if the sender did
+     * not specify the value (it will be empty). For responses returned by the SDK, the sender is the AWS service.
+     */
+    public boolean hasListOfMaps() {
+        return listOfMaps != null && !(listOfMaps instanceof SdkAutoConstructList);
+    }
+
     /**
      * Returns the value of the ListOfMaps property for this object.
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
-     * 
+     * <p>
+     * You can use {@link #hasListOfMaps()} to see if a value was sent in this field.
+     * </p>
+     *
      * @return The value of the ListOfMaps property for this object.
      */
     public List<Map<String, String>> listOfMaps() {
         return listOfMaps;
     }
 
+    /**
+     * Returns true if the ListOfStructs property was specified by the sender (it may be empty), or false if the sender
+     * did not specify the value (it will be empty). For responses returned by the SDK, the sender is the AWS service.
+     */
+    public boolean hasListOfStructs() {
+        return listOfStructs != null && !(listOfStructs instanceof SdkAutoConstructList);
+    }
+
     /**
      * Returns the value of the ListOfStructs property for this object.
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
-     * 
+     * <p>
+     * You can use {@link #hasListOfStructs()} to see if a value was sent in this field.
+     * </p>
+     *
      * @return The value of the ListOfStructs property for this object.
      */
     public List<SimpleStruct> listOfStructs() {
@@ -586,55 +635,106 @@ public List<SimpleStruct> listOfStructs() {
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
-     * 
+     * <p>
+     * You can use {@link #hasListOfMapOfEnumToString()} to see if a value was sent in this field.
+     * </p>
+     *
      * @return The value of the ListOfMapOfEnumToString property for this object.
      */
     public List<Map<EnumType, String>> listOfMapOfEnumToString() {
         return ListOfMapOfEnumToStringCopier.copyStringToEnum(listOfMapOfEnumToString);
     }
 
+    /**
+     * Returns true if the ListOfMapOfEnumToString property was specified by the sender (it may be empty), or false if
+     * the sender did not specify the value (it will be empty). For responses returned by the SDK, the sender is the AWS
+     * service.
+     */
+    public boolean hasListOfMapOfEnumToString() {
+        return listOfMapOfEnumToString != null && !(listOfMapOfEnumToString instanceof SdkAutoConstructList);
+    }
+
     /**
      * Returns the value of the ListOfMapOfEnumToString property for this object.
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
-     * 
+     * <p>
+     * You can use {@link #hasListOfMapOfEnumToString()} to see if a value was sent in this field.
+     * </p>
+     *
      * @return The value of the ListOfMapOfEnumToString property for this object.
      */
     public List<Map<String, String>> listOfMapOfEnumToStringAsStrings() {
         return listOfMapOfEnumToString;
     }
 
+    /**
+     * Returns true if the MapOfStringToIntegerList property was specified by the sender (it may be empty), or false if
+     * the sender did not specify the value (it will be empty). For responses returned by the SDK, the sender is the AWS
+     * service.
+     */
+    public boolean hasMapOfStringToIntegerList() {
+        return mapOfStringToIntegerList != null && !(mapOfStringToIntegerList instanceof SdkAutoConstructMap);
+    }
+
     /**
      * Returns the value of the MapOfStringToIntegerList property for this object.
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
-     * 
+     * <p>
+     * You can use {@link #hasMapOfStringToIntegerList()} to see if a value was sent in this field.
+     * </p>
+     *
      * @return The value of the MapOfStringToIntegerList property for this object.
      */
     public Map<String, List<Integer>> mapOfStringToIntegerList() {
         return mapOfStringToIntegerList;
     }
 
+    /**
+     * Returns true if the MapOfStringToString property was specified by the sender (it may be empty), or false if the
+     * sender did not specify the value (it will be empty). For responses returned by the SDK, the sender is the AWS
+     * service.
+     */
+    public boolean hasMapOfStringToString() {
+        return mapOfStringToString != null && !(mapOfStringToString instanceof SdkAutoConstructMap);
+    }
+
     /**
      * Returns the value of the MapOfStringToString property for this object.
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
-     * 
+     * <p>
+     * You can use {@link #hasMapOfStringToString()} to see if a value was sent in this field.
+     * </p>
+     *
      * @return The value of the MapOfStringToString property for this object.
      */
     public Map<String, String> mapOfStringToString() {
         return mapOfStringToString;
     }
 
+    /**
+     * Returns true if the MapOfStringToSimpleStruct property was specified by the sender (it may be empty), or false if
+     * the sender did not specify the value (it will be empty). For responses returned by the SDK, the sender is the AWS
+     * service.
+     */
+    public boolean hasMapOfStringToSimpleStruct() {
+        return mapOfStringToSimpleStruct != null && !(mapOfStringToSimpleStruct instanceof SdkAutoConstructMap);
+    }
+
     /**
      * Returns the value of the MapOfStringToSimpleStruct property for this object.
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
-     * 
+     * <p>
+     * You can use {@link #hasMapOfStringToSimpleStruct()} to see if a value was sent in this field.
+     * </p>
+     *
      * @return The value of the MapOfStringToSimpleStruct property for this object.
      */
     public Map<String, SimpleStruct> mapOfStringToSimpleStruct() {
@@ -646,19 +746,34 @@ public Map<String, SimpleStruct> mapOfStringToSimpleStruct() {
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
-     * 
+     * <p>
+     * You can use {@link #hasMapOfEnumToEnum()} to see if a value was sent in this field.
+     * </p>
+     *
      * @return The value of the MapOfEnumToEnum property for this object.
      */
     public Map<EnumType, EnumType> mapOfEnumToEnum() {
         return MapOfEnumToEnumCopier.copyStringToEnum(mapOfEnumToEnum);
     }
 
+    /**
+     * Returns true if the MapOfEnumToEnum property was specified by the sender (it may be empty), or false if the
+     * sender did not specify the value (it will be empty). For responses returned by the SDK, the sender is the AWS
+     * service.
+     */
+    public boolean hasMapOfEnumToEnum() {
+        return mapOfEnumToEnum != null && !(mapOfEnumToEnum instanceof SdkAutoConstructMap);
+    }
+
     /**
      * Returns the value of the MapOfEnumToEnum property for this object.
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
-     * 
+     * <p>
+     * You can use {@link #hasMapOfEnumToEnum()} to see if a value was sent in this field.
+     * </p>
+     *
      * @return The value of the MapOfEnumToEnum property for this object.
      */
     public Map<String, String> mapOfEnumToEnumAsStrings() {
@@ -670,19 +785,34 @@ public Map<String, String> mapOfEnumToEnumAsStrings() {
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
-     * 
+     * <p>
+     * You can use {@link #hasMapOfEnumToString()} to see if a value was sent in this field.
+     * </p>
+     *
      * @return The value of the MapOfEnumToString property for this object.
      */
     public Map<EnumType, String> mapOfEnumToString() {
         return MapOfEnumToStringCopier.copyStringToEnum(mapOfEnumToString);
     }
 
+    /**
+     * Returns true if the MapOfEnumToString property was specified by the sender (it may be empty), or false if the
+     * sender did not specify the value (it will be empty). For responses returned by the SDK, the sender is the AWS
+     * service.
+     */
+    public boolean hasMapOfEnumToString() {
+        return mapOfEnumToString != null && !(mapOfEnumToString instanceof SdkAutoConstructMap);
+    }
+
     /**
      * Returns the value of the MapOfEnumToString property for this object.
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
-     * 
+     * <p>
+     * You can use {@link #hasMapOfEnumToString()} to see if a value was sent in this field.
+     * </p>
+     *
      * @return The value of the MapOfEnumToString property for this object.
      */
     public Map<String, String> mapOfEnumToStringAsStrings() {
@@ -694,19 +824,34 @@ public Map<String, String> mapOfEnumToStringAsStrings() {
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
-     * 
+     * <p>
+     * You can use {@link #hasMapOfStringToEnum()} to see if a value was sent in this field.
+     * </p>
+     *
      * @return The value of the MapOfStringToEnum property for this object.
      */
     public Map<String, EnumType> mapOfStringToEnum() {
         return MapOfStringToEnumCopier.copyStringToEnum(mapOfStringToEnum);
     }
 
+    /**
+     * Returns true if the MapOfStringToEnum property was specified by the sender (it may be empty), or false if the
+     * sender did not specify the value (it will be empty). For responses returned by the SDK, the sender is the AWS
+     * service.
+     */
+    public boolean hasMapOfStringToEnum() {
+        return mapOfStringToEnum != null && !(mapOfStringToEnum instanceof SdkAutoConstructMap);
+    }
+
     /**
      * Returns the value of the MapOfStringToEnum property for this object.
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
-     * 
+     * <p>
+     * You can use {@link #hasMapOfStringToEnum()} to see if a value was sent in this field.
+     * </p>
+     *
      * @return The value of the MapOfStringToEnum property for this object.
      */
     public Map<String, String> mapOfStringToEnumAsStrings() {
@@ -718,19 +863,34 @@ public Map<String, String> mapOfStringToEnumAsStrings() {
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
-     * 
+     * <p>
+     * You can use {@link #hasMapOfEnumToSimpleStruct()} to see if a value was sent in this field.
+     * </p>
+     *
      * @return The value of the MapOfEnumToSimpleStruct property for this object.
      */
     public Map<EnumType, SimpleStruct> mapOfEnumToSimpleStruct() {
         return MapOfEnumToSimpleStructCopier.copyStringToEnum(mapOfEnumToSimpleStruct);
     }
 
+    /**
+     * Returns true if the MapOfEnumToSimpleStruct property was specified by the sender (it may be empty), or false if
+     * the sender did not specify the value (it will be empty). For responses returned by the SDK, the sender is the AWS
+     * service.
+     */
+    public boolean hasMapOfEnumToSimpleStruct() {
+        return mapOfEnumToSimpleStruct != null && !(mapOfEnumToSimpleStruct instanceof SdkAutoConstructMap);
+    }
+
     /**
      * Returns the value of the MapOfEnumToSimpleStruct property for this object.
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
-     * 
+     * <p>
+     * You can use {@link #hasMapOfEnumToSimpleStruct()} to see if a value was sent in this field.
+     * </p>
+     *
      * @return The value of the MapOfEnumToSimpleStruct property for this object.
      */
     public Map<String, SimpleStruct> mapOfEnumToSimpleStructAsStrings() {
@@ -742,19 +902,34 @@ public Map<String, SimpleStruct> mapOfEnumToSimpleStructAsStrings() {
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
-     * 
+     * <p>
+     * You can use {@link #hasMapOfEnumToListOfEnums()} to see if a value was sent in this field.
+     * </p>
+     *
      * @return The value of the MapOfEnumToListOfEnums property for this object.
      */
     public Map<EnumType, List<EnumType>> mapOfEnumToListOfEnums() {
         return MapOfEnumToListOfEnumsCopier.copyStringToEnum(mapOfEnumToListOfEnums);
     }
 
+    /**
+     * Returns true if the MapOfEnumToListOfEnums property was specified by the sender (it may be empty), or false if
+     * the sender did not specify the value (it will be empty). For responses returned by the SDK, the sender is the AWS
+     * service.
+     */
+    public boolean hasMapOfEnumToListOfEnums() {
+        return mapOfEnumToListOfEnums != null && !(mapOfEnumToListOfEnums instanceof SdkAutoConstructMap);
+    }
+
     /**
      * Returns the value of the MapOfEnumToListOfEnums property for this object.
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
-     * 
+     * <p>
+     * You can use {@link #hasMapOfEnumToListOfEnums()} to see if a value was sent in this field.
+     * </p>
+     *
      * @return The value of the MapOfEnumToListOfEnums property for this object.
      */
     public Map<String, List<String>> mapOfEnumToListOfEnumsAsStrings() {
@@ -766,19 +941,34 @@ public Map<String, List<String>> mapOfEnumToListOfEnumsAsStrings() {
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
-     * 
+     * <p>
+     * You can use {@link #hasMapOfEnumToMapOfStringToEnum()} to see if a value was sent in this field.
+     * </p>
+     *
      * @return The value of the MapOfEnumToMapOfStringToEnum property for this object.
      */
     public Map<EnumType, Map<String, EnumType>> mapOfEnumToMapOfStringToEnum() {
         return MapOfEnumToMapOfStringToEnumCopier.copyStringToEnum(mapOfEnumToMapOfStringToEnum);
     }
 
+    /**
+     * Returns true if the MapOfEnumToMapOfStringToEnum property was specified by the sender (it may be empty), or false
+     * if the sender did not specify the value (it will be empty). For responses returned by the SDK, the sender is the
+     * AWS service.
+     */
+    public boolean hasMapOfEnumToMapOfStringToEnum() {
+        return mapOfEnumToMapOfStringToEnum != null && !(mapOfEnumToMapOfStringToEnum instanceof SdkAutoConstructMap);
+    }
+
     /**
      * Returns the value of the MapOfEnumToMapOfStringToEnum property for this object.
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
-     * 
+     * <p>
+     * You can use {@link #hasMapOfEnumToMapOfStringToEnum()} to see if a value was sent in this field.
+     * </p>
+     *
      * @return The value of the MapOfEnumToMapOfStringToEnum property for this object.
      */
     public Map<String, Map<String, String>> mapOfEnumToMapOfStringToEnumAsStrings() {
@@ -787,7 +977,7 @@ public Map<String, Map<String, String>> mapOfEnumToMapOfStringToEnumAsStrings()
 
     /**
      * Returns the value of the TimestampMember property for this object.
-     * 
+     *
      * @return The value of the TimestampMember property for this object.
      */
     public Instant timestampMember() {
@@ -796,7 +986,7 @@ public Instant timestampMember() {
 
     /**
      * Returns the value of the StructWithNestedTimestampMember property for this object.
-     * 
+     *
      * @return The value of the StructWithNestedTimestampMember property for this object.
      */
     public StructWithTimestamp structWithNestedTimestampMember() {
@@ -805,7 +995,7 @@ public StructWithTimestamp structWithNestedTimestampMember() {
 
     /**
      * Returns the value of the BlobArg property for this object.
-     * 
+     *
      * @return The value of the BlobArg property for this object.
      */
     public SdkBytes blobArg() {
@@ -814,31 +1004,53 @@ public SdkBytes blobArg() {
 
     /**
      * Returns the value of the StructWithNestedBlob property for this object.
-     * 
+     *
      * @return The value of the StructWithNestedBlob property for this object.
      */
     public StructWithNestedBlobType structWithNestedBlob() {
         return structWithNestedBlob;
     }
 
+    /**
+     * Returns true if the BlobMap property was specified by the sender (it may be empty), or false if the sender did
+     * not specify the value (it will be empty). For responses returned by the SDK, the sender is the AWS service.
+     */
+    public boolean hasBlobMap() {
+        return blobMap != null && !(blobMap instanceof SdkAutoConstructMap);
+    }
+
     /**
      * Returns the value of the BlobMap property for this object.
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
-     * 
+     * <p>
+     * You can use {@link #hasBlobMap()} to see if a value was sent in this field.
+     * </p>
+     *
      * @return The value of the BlobMap property for this object.
      */
     public Map<String, SdkBytes> blobMap() {
         return blobMap;
     }
 
+    /**
+     * Returns true if the ListOfBlobs property was specified by the sender (it may be empty), or false if the sender
+     * did not specify the value (it will be empty). For responses returned by the SDK, the sender is the AWS service.
+     */
+    public boolean hasListOfBlobs() {
+        return listOfBlobs != null && !(listOfBlobs instanceof SdkAutoConstructList);
+    }
+
     /**
      * Returns the value of the ListOfBlobs property for this object.
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
-     * 
+     * <p>
+     * You can use {@link #hasListOfBlobs()} to see if a value was sent in this field.
+     * </p>
+     *
      * @return The value of the ListOfBlobs property for this object.
      */
     public List<SdkBytes> listOfBlobs() {
@@ -847,7 +1059,7 @@ public List<SdkBytes> listOfBlobs() {
 
     /**
      * Returns the value of the RecursiveStruct property for this object.
-     * 
+     *
      * @return The value of the RecursiveStruct property for this object.
      */
     public RecursiveStructType recursiveStruct() {
@@ -856,7 +1068,7 @@ public RecursiveStructType recursiveStruct() {
 
     /**
      * Returns the value of the PolymorphicTypeWithSubTypes property for this object.
-     * 
+     *
      * @return The value of the PolymorphicTypeWithSubTypes property for this object.
      */
     public BaseType polymorphicTypeWithSubTypes() {
@@ -865,7 +1077,7 @@ public BaseType polymorphicTypeWithSubTypes() {
 
     /**
      * Returns the value of the PolymorphicTypeWithoutSubTypes property for this object.
-     * 
+     *
      * @return The value of the PolymorphicTypeWithoutSubTypes property for this object.
      */
     public SubTypeOne polymorphicTypeWithoutSubTypes() {
@@ -879,7 +1091,7 @@ public SubTypeOne polymorphicTypeWithoutSubTypes() {
      * return {@link EnumType#UNKNOWN_TO_SDK_VERSION}. The raw value returned by the service is available from
      * {@link #enumTypeAsString}.
      * </p>
-     * 
+     *
      * @return The value of the EnumType property for this object.
      * @see EnumType
      */
@@ -894,7 +1106,7 @@ public EnumType enumType() {
      * return {@link EnumType#UNKNOWN_TO_SDK_VERSION}. The raw value returned by the service is available from
      * {@link #enumTypeAsString}.
      * </p>
-     * 
+     *
      * @return The value of the EnumType property for this object.
      * @see EnumType
      */
@@ -995,6 +1207,7 @@ public boolean equalsBySdkFields(Object obj) {
                && Objects.equals(polymorphicTypeWithoutSubTypes(), other.polymorphicTypeWithoutSubTypes())
                && Objects.equals(enumTypeAsString(), other.enumTypeAsString());
     }
+
     /**
      * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
      * redacted from this string using a placeholder value.
@@ -1002,88 +1215,88 @@ public boolean equalsBySdkFields(Object obj) {
     @Override
     public String toString() {
         return ToString.builder("AllTypesRequest").add("StringMember", stringMember()).add("IntegerMember", integerMember())
-                .add("BooleanMember", booleanMember()).add("FloatMember", floatMember()).add("DoubleMember", doubleMember())
-                .add("LongMember", longMember()).add("SimpleList", simpleList()).add("ListOfEnums", listOfEnumsAsStrings())
-                .add("ListOfMaps", listOfMaps()).add("ListOfStructs", listOfStructs())
-                .add("ListOfMapOfEnumToString", listOfMapOfEnumToStringAsStrings())
-                .add("MapOfStringToIntegerList", mapOfStringToIntegerList()).add("MapOfStringToString", mapOfStringToString())
-                .add("MapOfStringToSimpleStruct", mapOfStringToSimpleStruct()).add("MapOfEnumToEnum", mapOfEnumToEnumAsStrings())
-                .add("MapOfEnumToString", mapOfEnumToStringAsStrings()).add("MapOfStringToEnum", mapOfStringToEnumAsStrings())
-                .add("MapOfEnumToSimpleStruct", mapOfEnumToSimpleStructAsStrings())
-                .add("MapOfEnumToListOfEnums", mapOfEnumToListOfEnumsAsStrings())
-                .add("MapOfEnumToMapOfStringToEnum", mapOfEnumToMapOfStringToEnumAsStrings())
-                .add("TimestampMember", timestampMember())
-                .add("StructWithNestedTimestampMember", structWithNestedTimestampMember()).add("BlobArg", blobArg())
-                .add("StructWithNestedBlob", structWithNestedBlob()).add("BlobMap", blobMap()).add("ListOfBlobs", listOfBlobs())
-                .add("RecursiveStruct", recursiveStruct()).add("PolymorphicTypeWithSubTypes", polymorphicTypeWithSubTypes())
-                .add("PolymorphicTypeWithoutSubTypes", polymorphicTypeWithoutSubTypes()).add("EnumType", enumTypeAsString())
-                .build();
+                       .add("BooleanMember", booleanMember()).add("FloatMember", floatMember()).add("DoubleMember", doubleMember())
+                       .add("LongMember", longMember()).add("SimpleList", simpleList()).add("ListOfEnums", listOfEnumsAsStrings())
+                       .add("ListOfMaps", listOfMaps()).add("ListOfStructs", listOfStructs())
+                       .add("ListOfMapOfEnumToString", listOfMapOfEnumToStringAsStrings())
+                       .add("MapOfStringToIntegerList", mapOfStringToIntegerList()).add("MapOfStringToString", mapOfStringToString())
+                       .add("MapOfStringToSimpleStruct", mapOfStringToSimpleStruct()).add("MapOfEnumToEnum", mapOfEnumToEnumAsStrings())
+                       .add("MapOfEnumToString", mapOfEnumToStringAsStrings()).add("MapOfStringToEnum", mapOfStringToEnumAsStrings())
+                       .add("MapOfEnumToSimpleStruct", mapOfEnumToSimpleStructAsStrings())
+                       .add("MapOfEnumToListOfEnums", mapOfEnumToListOfEnumsAsStrings())
+                       .add("MapOfEnumToMapOfStringToEnum", mapOfEnumToMapOfStringToEnumAsStrings())
+                       .add("TimestampMember", timestampMember())
+                       .add("StructWithNestedTimestampMember", structWithNestedTimestampMember()).add("BlobArg", blobArg())
+                       .add("StructWithNestedBlob", structWithNestedBlob()).add("BlobMap", blobMap()).add("ListOfBlobs", listOfBlobs())
+                       .add("RecursiveStruct", recursiveStruct()).add("PolymorphicTypeWithSubTypes", polymorphicTypeWithSubTypes())
+                       .add("PolymorphicTypeWithoutSubTypes", polymorphicTypeWithoutSubTypes()).add("EnumType", enumTypeAsString())
+                       .build();
     }
 
     public <T> Optional<T> getValueForField(String fieldName, Class<T> clazz) {
         switch (fieldName) {
-        case "StringMember":
-            return Optional.ofNullable(clazz.cast(stringMember()));
-        case "IntegerMember":
-            return Optional.ofNullable(clazz.cast(integerMember()));
-        case "BooleanMember":
-            return Optional.ofNullable(clazz.cast(booleanMember()));
-        case "FloatMember":
-            return Optional.ofNullable(clazz.cast(floatMember()));
-        case "DoubleMember":
-            return Optional.ofNullable(clazz.cast(doubleMember()));
-        case "LongMember":
-            return Optional.ofNullable(clazz.cast(longMember()));
-        case "SimpleList":
-            return Optional.ofNullable(clazz.cast(simpleList()));
-        case "ListOfEnums":
-            return Optional.ofNullable(clazz.cast(listOfEnumsAsStrings()));
-        case "ListOfMaps":
-            return Optional.ofNullable(clazz.cast(listOfMaps()));
-        case "ListOfStructs":
-            return Optional.ofNullable(clazz.cast(listOfStructs()));
-        case "ListOfMapOfEnumToString":
-            return Optional.ofNullable(clazz.cast(listOfMapOfEnumToStringAsStrings()));
-        case "MapOfStringToIntegerList":
-            return Optional.ofNullable(clazz.cast(mapOfStringToIntegerList()));
-        case "MapOfStringToString":
-            return Optional.ofNullable(clazz.cast(mapOfStringToString()));
-        case "MapOfStringToSimpleStruct":
-            return Optional.ofNullable(clazz.cast(mapOfStringToSimpleStruct()));
-        case "MapOfEnumToEnum":
-            return Optional.ofNullable(clazz.cast(mapOfEnumToEnumAsStrings()));
-        case "MapOfEnumToString":
-            return Optional.ofNullable(clazz.cast(mapOfEnumToStringAsStrings()));
-        case "MapOfStringToEnum":
-            return Optional.ofNullable(clazz.cast(mapOfStringToEnumAsStrings()));
-        case "MapOfEnumToSimpleStruct":
-            return Optional.ofNullable(clazz.cast(mapOfEnumToSimpleStructAsStrings()));
-        case "MapOfEnumToListOfEnums":
-            return Optional.ofNullable(clazz.cast(mapOfEnumToListOfEnumsAsStrings()));
-        case "MapOfEnumToMapOfStringToEnum":
-            return Optional.ofNullable(clazz.cast(mapOfEnumToMapOfStringToEnumAsStrings()));
-        case "TimestampMember":
-            return Optional.ofNullable(clazz.cast(timestampMember()));
-        case "StructWithNestedTimestampMember":
-            return Optional.ofNullable(clazz.cast(structWithNestedTimestampMember()));
-        case "BlobArg":
-            return Optional.ofNullable(clazz.cast(blobArg()));
-        case "StructWithNestedBlob":
-            return Optional.ofNullable(clazz.cast(structWithNestedBlob()));
-        case "BlobMap":
-            return Optional.ofNullable(clazz.cast(blobMap()));
-        case "ListOfBlobs":
-            return Optional.ofNullable(clazz.cast(listOfBlobs()));
-        case "RecursiveStruct":
-            return Optional.ofNullable(clazz.cast(recursiveStruct()));
-        case "PolymorphicTypeWithSubTypes":
-            return Optional.ofNullable(clazz.cast(polymorphicTypeWithSubTypes()));
-        case "PolymorphicTypeWithoutSubTypes":
-            return Optional.ofNullable(clazz.cast(polymorphicTypeWithoutSubTypes()));
-        case "EnumType":
-            return Optional.ofNullable(clazz.cast(enumTypeAsString()));
-        default:
-            return Optional.empty();
+            case "StringMember":
+                return Optional.ofNullable(clazz.cast(stringMember()));
+            case "IntegerMember":
+                return Optional.ofNullable(clazz.cast(integerMember()));
+            case "BooleanMember":
+                return Optional.ofNullable(clazz.cast(booleanMember()));
+            case "FloatMember":
+                return Optional.ofNullable(clazz.cast(floatMember()));
+            case "DoubleMember":
+                return Optional.ofNullable(clazz.cast(doubleMember()));
+            case "LongMember":
+                return Optional.ofNullable(clazz.cast(longMember()));
+            case "SimpleList":
+                return Optional.ofNullable(clazz.cast(simpleList()));
+            case "ListOfEnums":
+                return Optional.ofNullable(clazz.cast(listOfEnumsAsStrings()));
+            case "ListOfMaps":
+                return Optional.ofNullable(clazz.cast(listOfMaps()));
+            case "ListOfStructs":
+                return Optional.ofNullable(clazz.cast(listOfStructs()));
+            case "ListOfMapOfEnumToString":
+                return Optional.ofNullable(clazz.cast(listOfMapOfEnumToStringAsStrings()));
+            case "MapOfStringToIntegerList":
+                return Optional.ofNullable(clazz.cast(mapOfStringToIntegerList()));
+            case "MapOfStringToString":
+                return Optional.ofNullable(clazz.cast(mapOfStringToString()));
+            case "MapOfStringToSimpleStruct":
+                return Optional.ofNullable(clazz.cast(mapOfStringToSimpleStruct()));
+            case "MapOfEnumToEnum":
+                return Optional.ofNullable(clazz.cast(mapOfEnumToEnumAsStrings()));
+            case "MapOfEnumToString":
+                return Optional.ofNullable(clazz.cast(mapOfEnumToStringAsStrings()));
+            case "MapOfStringToEnum":
+                return Optional.ofNullable(clazz.cast(mapOfStringToEnumAsStrings()));
+            case "MapOfEnumToSimpleStruct":
+                return Optional.ofNullable(clazz.cast(mapOfEnumToSimpleStructAsStrings()));
+            case "MapOfEnumToListOfEnums":
+                return Optional.ofNullable(clazz.cast(mapOfEnumToListOfEnumsAsStrings()));
+            case "MapOfEnumToMapOfStringToEnum":
+                return Optional.ofNullable(clazz.cast(mapOfEnumToMapOfStringToEnumAsStrings()));
+            case "TimestampMember":
+                return Optional.ofNullable(clazz.cast(timestampMember()));
+            case "StructWithNestedTimestampMember":
+                return Optional.ofNullable(clazz.cast(structWithNestedTimestampMember()));
+            case "BlobArg":
+                return Optional.ofNullable(clazz.cast(blobArg()));
+            case "StructWithNestedBlob":
+                return Optional.ofNullable(clazz.cast(structWithNestedBlob()));
+            case "BlobMap":
+                return Optional.ofNullable(clazz.cast(blobMap()));
+            case "ListOfBlobs":
+                return Optional.ofNullable(clazz.cast(listOfBlobs()));
+            case "RecursiveStruct":
+                return Optional.ofNullable(clazz.cast(recursiveStruct()));
+            case "PolymorphicTypeWithSubTypes":
+                return Optional.ofNullable(clazz.cast(polymorphicTypeWithSubTypes()));
+            case "PolymorphicTypeWithoutSubTypes":
+                return Optional.ofNullable(clazz.cast(polymorphicTypeWithoutSubTypes()));
+            case "EnumType":
+                return Optional.ofNullable(clazz.cast(enumTypeAsString()));
+            default:
+                return Optional.empty();
         }
     }
 
@@ -1253,7 +1466,7 @@ public interface Builder extends JsonProtocolTestsRequest.Builder, SdkPojo, Copy
          *
          * When the {@link Consumer} completes, {@link List<SimpleStruct>.Builder#build()} is called immediately and its
          * result is passed to {@link #listOfStructs(List<SimpleStruct>)}.
-         * 
+         *
          * @param listOfStructs
          *        a consumer that will call methods on {@link List<SimpleStruct>.Builder}
          * @return Returns a reference to this object so that method calls can be chained together.
@@ -1440,7 +1653,7 @@ public interface Builder extends JsonProtocolTestsRequest.Builder, SdkPojo, Copy
          *
          * When the {@link Consumer} completes, {@link StructWithTimestamp.Builder#build()} is called immediately and
          * its result is passed to {@link #structWithNestedTimestampMember(StructWithTimestamp)}.
-         * 
+         *
          * @param structWithNestedTimestampMember
          *        a consumer that will call methods on {@link StructWithTimestamp.Builder}
          * @return Returns a reference to this object so that method calls can be chained together.
@@ -1448,7 +1661,7 @@ public interface Builder extends JsonProtocolTestsRequest.Builder, SdkPojo, Copy
          */
         default Builder structWithNestedTimestampMember(Consumer<StructWithTimestamp.Builder> structWithNestedTimestampMember) {
             return structWithNestedTimestampMember(StructWithTimestamp.builder().applyMutation(structWithNestedTimestampMember)
-                    .build());
+                                                                      .build());
         }
 
         /**
@@ -1477,7 +1690,7 @@ default Builder structWithNestedTimestampMember(Consumer<StructWithTimestamp.Bui
          *
          * When the {@link Consumer} completes, {@link StructWithNestedBlobType.Builder#build()} is called immediately
          * and its result is passed to {@link #structWithNestedBlob(StructWithNestedBlobType)}.
-         * 
+         *
          * @param structWithNestedBlob
          *        a consumer that will call methods on {@link StructWithNestedBlobType.Builder}
          * @return Returns a reference to this object so that method calls can be chained together.
@@ -1531,7 +1744,7 @@ default Builder structWithNestedBlob(Consumer<StructWithNestedBlobType.Builder>
          *
          * When the {@link Consumer} completes, {@link RecursiveStructType.Builder#build()} is called immediately and
          * its result is passed to {@link #recursiveStruct(RecursiveStructType)}.
-         * 
+         *
          * @param recursiveStruct
          *        a consumer that will call methods on {@link RecursiveStructType.Builder}
          * @return Returns a reference to this object so that method calls can be chained together.
@@ -1558,7 +1771,7 @@ default Builder recursiveStruct(Consumer<RecursiveStructType.Builder> recursiveS
          *
          * When the {@link Consumer} completes, {@link BaseType.Builder#build()} is called immediately and its result is
          * passed to {@link #polymorphicTypeWithSubTypes(BaseType)}.
-         * 
+         *
          * @param polymorphicTypeWithSubTypes
          *        a consumer that will call methods on {@link BaseType.Builder}
          * @return Returns a reference to this object so that method calls can be chained together.
@@ -1585,7 +1798,7 @@ default Builder polymorphicTypeWithSubTypes(Consumer<BaseType.Builder> polymorph
          *
          * When the {@link Consumer} completes, {@link SubTypeOne.Builder#build()} is called immediately and its result
          * is passed to {@link #polymorphicTypeWithoutSubTypes(SubTypeOne)}.
-         * 
+         *
          * @param polymorphicTypeWithoutSubTypes
          *        a consumer that will call methods on {@link SubTypeOne.Builder}
          * @return Returns a reference to this object so that method calls can be chained together.
@@ -1884,7 +2097,7 @@ public final void setListOfMaps(Collection<? extends Map<String, String>> listOf
 
         public final Collection<SimpleStruct.Builder> getListOfStructs() {
             return listOfStructs != null ? listOfStructs.stream().map(SimpleStruct::toBuilder).collect(Collectors.toList())
-                    : null;
+                                         : null;
         }
 
         @Override
@@ -1904,7 +2117,7 @@ public final Builder listOfStructs(SimpleStruct... listOfStructs) {
         @SafeVarargs
         public final Builder listOfStructs(Consumer<SimpleStruct.Builder>... listOfStructs) {
             listOfStructs(Stream.of(listOfStructs).map(c -> SimpleStruct.builder().applyMutation(c).build())
-                    .collect(Collectors.toList()));
+                                .collect(Collectors.toList()));
             return this;
         }
 
@@ -1963,7 +2176,7 @@ public final void setMapOfStringToString(Map<String, String> mapOfStringToString
 
         public final Map<String, SimpleStruct.Builder> getMapOfStringToSimpleStruct() {
             return mapOfStringToSimpleStruct != null ? CollectionUtils.mapValues(mapOfStringToSimpleStruct,
-                    SimpleStruct::toBuilder) : null;
+                                                                                 SimpleStruct::toBuilder) : null;
         }
 
         @Override
@@ -2038,7 +2251,7 @@ public final void setMapOfStringToEnumWithStrings(Map<String, String> mapOfStrin
 
         public final Map<String, SimpleStruct.Builder> getMapOfEnumToSimpleStructAsStrings() {
             return mapOfEnumToSimpleStruct != null ? CollectionUtils.mapValues(mapOfEnumToSimpleStruct, SimpleStruct::toBuilder)
-                    : null;
+                                                   : null;
         }
 
         @Override
@@ -2123,7 +2336,7 @@ public final Builder structWithNestedTimestampMember(StructWithTimestamp structW
 
         public final void setStructWithNestedTimestampMember(StructWithTimestamp.BuilderImpl structWithNestedTimestampMember) {
             this.structWithNestedTimestampMember = structWithNestedTimestampMember != null ? structWithNestedTimestampMember
-                    .build() : null;
+                .build() : null;
         }
 
         public final ByteBuffer getBlobArg() {
@@ -2156,7 +2369,7 @@ public final void setStructWithNestedBlob(StructWithNestedBlobType.BuilderImpl s
 
         public final Map<String, ByteBuffer> getBlobMap() {
             return blobMap == null ? null : blobMap.entrySet().stream()
-                    .collect(Collectors.toMap(e -> e.getKey(), e -> e.getValue().asByteBuffer()));
+                                                   .collect(Collectors.toMap(e -> e.getKey(), e -> e.getValue().asByteBuffer()));
         }
 
         @Override
@@ -2167,7 +2380,7 @@ public final Builder blobMap(Map<String, SdkBytes> blobMap) {
 
         public final void setBlobMap(Map<String, ByteBuffer> blobMap) {
             blobMap(blobMap == null ? null : blobMap.entrySet().stream()
-                    .collect(Collectors.toMap(e -> e.getKey(), e -> SdkBytes.fromByteBuffer(e.getValue()))));
+                                                    .collect(Collectors.toMap(e -> e.getKey(), e -> SdkBytes.fromByteBuffer(e.getValue()))));
         }
 
         public final List<ByteBuffer> getListOfBlobs() {
@@ -2189,7 +2402,7 @@ public final Builder listOfBlobs(SdkBytes... listOfBlobs) {
 
         public final void setListOfBlobs(Collection<ByteBuffer> listOfBlobs) {
             listOfBlobs(listOfBlobs == null ? null : listOfBlobs.stream().map(SdkBytes::fromByteBuffer)
-                    .collect(Collectors.toList()));
+                                                                .collect(Collectors.toList()));
         }
 
         public final RecursiveStructType.Builder getRecursiveStruct() {
@@ -2232,7 +2445,7 @@ public final Builder polymorphicTypeWithoutSubTypes(SubTypeOne polymorphicTypeWi
 
         public final void setPolymorphicTypeWithoutSubTypes(SubTypeOne.BuilderImpl polymorphicTypeWithoutSubTypes) {
             this.polymorphicTypeWithoutSubTypes = polymorphicTypeWithoutSubTypes != null ? polymorphicTypeWithoutSubTypes.build()
-                    : null;
+                                                                                         : null;
         }
 
         public final String getEnumTypeAsString() {
diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/nonautoconstructcontainers/alltypesresponse.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/nonautoconstructcontainers/alltypesresponse.java
index cc8136962373..159af2333b92 100644
--- a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/nonautoconstructcontainers/alltypesresponse.java
+++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/nonautoconstructcontainers/alltypesresponse.java
@@ -24,6 +24,8 @@
 import software.amazon.awssdk.core.traits.ListTrait;
 import software.amazon.awssdk.core.traits.LocationTrait;
 import software.amazon.awssdk.core.traits.MapTrait;
+import software.amazon.awssdk.core.util.SdkAutoConstructList;
+import software.amazon.awssdk.core.util.SdkAutoConstructMap;
 import software.amazon.awssdk.utils.CollectionUtils;
 import software.amazon.awssdk.utils.ToString;
 import software.amazon.awssdk.utils.builder.CopyableBuilder;
@@ -33,344 +35,344 @@
  */
 @Generated("software.amazon.awssdk:codegen")
 public final class AllTypesResponse extends JsonProtocolTestsResponse implements
-        ToCopyableBuilder<AllTypesResponse.Builder, AllTypesResponse> {
+                                                                      ToCopyableBuilder<AllTypesResponse.Builder, AllTypesResponse> {
     private static final SdkField<String> STRING_MEMBER_FIELD = SdkField.<String> builder(MarshallingType.STRING)
-            .getter(getter(AllTypesResponse::stringMember)).setter(setter(Builder::stringMember))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("StringMember").build()).build();
+        .getter(getter(AllTypesResponse::stringMember)).setter(setter(Builder::stringMember))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("StringMember").build()).build();
 
     private static final SdkField<Integer> INTEGER_MEMBER_FIELD = SdkField.<Integer> builder(MarshallingType.INTEGER)
-            .getter(getter(AllTypesResponse::integerMember)).setter(setter(Builder::integerMember))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("IntegerMember").build()).build();
+        .getter(getter(AllTypesResponse::integerMember)).setter(setter(Builder::integerMember))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("IntegerMember").build()).build();
 
     private static final SdkField<Boolean> BOOLEAN_MEMBER_FIELD = SdkField.<Boolean> builder(MarshallingType.BOOLEAN)
-            .getter(getter(AllTypesResponse::booleanMember)).setter(setter(Builder::booleanMember))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("BooleanMember").build()).build();
+        .getter(getter(AllTypesResponse::booleanMember)).setter(setter(Builder::booleanMember))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("BooleanMember").build()).build();
 
     private static final SdkField<Float> FLOAT_MEMBER_FIELD = SdkField.<Float> builder(MarshallingType.FLOAT)
-            .getter(getter(AllTypesResponse::floatMember)).setter(setter(Builder::floatMember))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("FloatMember").build()).build();
+        .getter(getter(AllTypesResponse::floatMember)).setter(setter(Builder::floatMember))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("FloatMember").build()).build();
 
     private static final SdkField<Double> DOUBLE_MEMBER_FIELD = SdkField.<Double> builder(MarshallingType.DOUBLE)
-            .getter(getter(AllTypesResponse::doubleMember)).setter(setter(Builder::doubleMember))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("DoubleMember").build()).build();
+        .getter(getter(AllTypesResponse::doubleMember)).setter(setter(Builder::doubleMember))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("DoubleMember").build()).build();
 
     private static final SdkField<Long> LONG_MEMBER_FIELD = SdkField.<Long> builder(MarshallingType.LONG)
-            .getter(getter(AllTypesResponse::longMember)).setter(setter(Builder::longMember))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("LongMember").build()).build();
+        .getter(getter(AllTypesResponse::longMember)).setter(setter(Builder::longMember))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("LongMember").build()).build();
 
     private static final SdkField<List<String>> SIMPLE_LIST_FIELD = SdkField
-            .<List<String>> builder(MarshallingType.LIST)
-            .getter(getter(AllTypesResponse::simpleList))
-            .setter(setter(Builder::simpleList))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("SimpleList").build(),
-                    ListTrait
-                            .builder()
-                            .memberLocationName(null)
-                            .memberFieldInfo(
-                                    SdkField.<String> builder(MarshallingType.STRING)
-                                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
-                                                    .locationName("member").build()).build()).build()).build();
+        .<List<String>> builder(MarshallingType.LIST)
+        .getter(getter(AllTypesResponse::simpleList))
+        .setter(setter(Builder::simpleList))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("SimpleList").build(),
+                ListTrait
+                    .builder()
+                    .memberLocationName(null)
+                    .memberFieldInfo(
+                        SdkField.<String> builder(MarshallingType.STRING)
+                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
+                                                 .locationName("member").build()).build()).build()).build();
 
     private static final SdkField<List<String>> LIST_OF_ENUMS_FIELD = SdkField
-            .<List<String>> builder(MarshallingType.LIST)
-            .getter(getter(AllTypesResponse::listOfEnumsAsStrings))
-            .setter(setter(Builder::listOfEnumsWithStrings))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("ListOfEnums").build(),
-                    ListTrait
-                            .builder()
-                            .memberLocationName(null)
-                            .memberFieldInfo(
-                                    SdkField.<String> builder(MarshallingType.STRING)
-                                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
-                                                    .locationName("member").build()).build()).build()).build();
+        .<List<String>> builder(MarshallingType.LIST)
+        .getter(getter(AllTypesResponse::listOfEnumsAsStrings))
+        .setter(setter(Builder::listOfEnumsWithStrings))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("ListOfEnums").build(),
+                ListTrait
+                    .builder()
+                    .memberLocationName(null)
+                    .memberFieldInfo(
+                        SdkField.<String> builder(MarshallingType.STRING)
+                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
+                                                 .locationName("member").build()).build()).build()).build();
 
     private static final SdkField<List<Map<String, String>>> LIST_OF_MAPS_FIELD = SdkField
-            .<List<Map<String, String>>> builder(MarshallingType.LIST)
-            .getter(getter(AllTypesResponse::listOfMaps))
-            .setter(setter(Builder::listOfMaps))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("ListOfMaps").build(),
-                    ListTrait
-                            .builder()
-                            .memberLocationName(null)
-                            .memberFieldInfo(
-                                    SdkField.<Map<String, String>> builder(MarshallingType.MAP)
-                                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
-                                                    .locationName("member").build(),
-                                                    MapTrait.builder()
-                                                            .keyLocationName("key")
-                                                            .valueLocationName("value")
-                                                            .valueFieldInfo(
-                                                                    SdkField.<String> builder(MarshallingType.STRING)
-                                                                            .traits(LocationTrait.builder()
-                                                                                    .location(MarshallLocation.PAYLOAD)
-                                                                                    .locationName("value").build()).build())
-                                                            .build()).build()).build()).build();
+        .<List<Map<String, String>>> builder(MarshallingType.LIST)
+        .getter(getter(AllTypesResponse::listOfMaps))
+        .setter(setter(Builder::listOfMaps))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("ListOfMaps").build(),
+                ListTrait
+                    .builder()
+                    .memberLocationName(null)
+                    .memberFieldInfo(
+                        SdkField.<Map<String, String>> builder(MarshallingType.MAP)
+                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
+                                                 .locationName("member").build(),
+                                    MapTrait.builder()
+                                            .keyLocationName("key")
+                                            .valueLocationName("value")
+                                            .valueFieldInfo(
+                                                SdkField.<String> builder(MarshallingType.STRING)
+                                                    .traits(LocationTrait.builder()
+                                                                         .location(MarshallLocation.PAYLOAD)
+                                                                         .locationName("value").build()).build())
+                                            .build()).build()).build()).build();
 
     private static final SdkField<List<SimpleStruct>> LIST_OF_STRUCTS_FIELD = SdkField
-            .<List<SimpleStruct>> builder(MarshallingType.LIST)
-            .getter(getter(AllTypesResponse::listOfStructs))
-            .setter(setter(Builder::listOfStructs))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("ListOfStructs").build(),
-                    ListTrait
-                            .builder()
-                            .memberLocationName(null)
-                            .memberFieldInfo(
-                                    SdkField.<SimpleStruct> builder(MarshallingType.SDK_POJO)
-                                            .constructor(SimpleStruct::builder)
-                                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
-                                                    .locationName("member").build()).build()).build()).build();
+        .<List<SimpleStruct>> builder(MarshallingType.LIST)
+        .getter(getter(AllTypesResponse::listOfStructs))
+        .setter(setter(Builder::listOfStructs))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("ListOfStructs").build(),
+                ListTrait
+                    .builder()
+                    .memberLocationName(null)
+                    .memberFieldInfo(
+                        SdkField.<SimpleStruct> builder(MarshallingType.SDK_POJO)
+                            .constructor(SimpleStruct::builder)
+                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
+                                                 .locationName("member").build()).build()).build()).build();
 
     private static final SdkField<List<Map<String, String>>> LIST_OF_MAP_OF_ENUM_TO_STRING_FIELD = SdkField
-            .<List<Map<String, String>>> builder(MarshallingType.LIST)
-            .getter(getter(AllTypesResponse::listOfMapOfEnumToStringAsStrings))
-            .setter(setter(Builder::listOfMapOfEnumToStringWithStrings))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("ListOfMapOfEnumToString").build(),
-                    ListTrait
-                            .builder()
-                            .memberLocationName(null)
-                            .memberFieldInfo(
-                                    SdkField.<Map<String, String>> builder(MarshallingType.MAP)
-                                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
-                                                    .locationName("member").build(),
-                                                    MapTrait.builder()
-                                                            .keyLocationName("key")
-                                                            .valueLocationName("value")
-                                                            .valueFieldInfo(
-                                                                    SdkField.<String> builder(MarshallingType.STRING)
-                                                                            .traits(LocationTrait.builder()
-                                                                                    .location(MarshallLocation.PAYLOAD)
-                                                                                    .locationName("value").build()).build())
-                                                            .build()).build()).build()).build();
+        .<List<Map<String, String>>> builder(MarshallingType.LIST)
+        .getter(getter(AllTypesResponse::listOfMapOfEnumToStringAsStrings))
+        .setter(setter(Builder::listOfMapOfEnumToStringWithStrings))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("ListOfMapOfEnumToString").build(),
+                ListTrait
+                    .builder()
+                    .memberLocationName(null)
+                    .memberFieldInfo(
+                        SdkField.<Map<String, String>> builder(MarshallingType.MAP)
+                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
+                                                 .locationName("member").build(),
+                                    MapTrait.builder()
+                                            .keyLocationName("key")
+                                            .valueLocationName("value")
+                                            .valueFieldInfo(
+                                                SdkField.<String> builder(MarshallingType.STRING)
+                                                    .traits(LocationTrait.builder()
+                                                                         .location(MarshallLocation.PAYLOAD)
+                                                                         .locationName("value").build()).build())
+                                            .build()).build()).build()).build();
 
     private static final SdkField<Map<String, List<Integer>>> MAP_OF_STRING_TO_INTEGER_LIST_FIELD = SdkField
-            .<Map<String, List<Integer>>> builder(MarshallingType.MAP)
-            .getter(getter(AllTypesResponse::mapOfStringToIntegerList))
-            .setter(setter(Builder::mapOfStringToIntegerList))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("MapOfStringToIntegerList").build(),
-                    MapTrait.builder()
-                            .keyLocationName("key")
-                            .valueLocationName("value")
-                            .valueFieldInfo(
-                                    SdkField.<List<Integer>> builder(MarshallingType.LIST)
-                                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
-                                                    .locationName("value").build(),
-                                                    ListTrait
-                                                            .builder()
-                                                            .memberLocationName(null)
-                                                            .memberFieldInfo(
-                                                                    SdkField.<Integer> builder(MarshallingType.INTEGER)
-                                                                            .traits(LocationTrait.builder()
-                                                                                    .location(MarshallLocation.PAYLOAD)
-                                                                                    .locationName("member").build()).build())
-                                                            .build()).build()).build()).build();
+        .<Map<String, List<Integer>>> builder(MarshallingType.MAP)
+        .getter(getter(AllTypesResponse::mapOfStringToIntegerList))
+        .setter(setter(Builder::mapOfStringToIntegerList))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("MapOfStringToIntegerList").build(),
+                MapTrait.builder()
+                        .keyLocationName("key")
+                        .valueLocationName("value")
+                        .valueFieldInfo(
+                            SdkField.<List<Integer>> builder(MarshallingType.LIST)
+                                .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
+                                                     .locationName("value").build(),
+                                        ListTrait
+                                            .builder()
+                                            .memberLocationName(null)
+                                            .memberFieldInfo(
+                                                SdkField.<Integer> builder(MarshallingType.INTEGER)
+                                                    .traits(LocationTrait.builder()
+                                                                         .location(MarshallLocation.PAYLOAD)
+                                                                         .locationName("member").build()).build())
+                                            .build()).build()).build()).build();
 
     private static final SdkField<Map<String, String>> MAP_OF_STRING_TO_STRING_FIELD = SdkField
-            .<Map<String, String>> builder(MarshallingType.MAP)
-            .getter(getter(AllTypesResponse::mapOfStringToString))
-            .setter(setter(Builder::mapOfStringToString))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("MapOfStringToString").build(),
-                    MapTrait.builder()
-                            .keyLocationName("key")
-                            .valueLocationName("value")
-                            .valueFieldInfo(
-                                    SdkField.<String> builder(MarshallingType.STRING)
-                                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
-                                                    .locationName("value").build()).build()).build()).build();
+        .<Map<String, String>> builder(MarshallingType.MAP)
+        .getter(getter(AllTypesResponse::mapOfStringToString))
+        .setter(setter(Builder::mapOfStringToString))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("MapOfStringToString").build(),
+                MapTrait.builder()
+                        .keyLocationName("key")
+                        .valueLocationName("value")
+                        .valueFieldInfo(
+                            SdkField.<String> builder(MarshallingType.STRING)
+                                .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
+                                                     .locationName("value").build()).build()).build()).build();
 
     private static final SdkField<Map<String, SimpleStruct>> MAP_OF_STRING_TO_SIMPLE_STRUCT_FIELD = SdkField
-            .<Map<String, SimpleStruct>> builder(MarshallingType.MAP)
-            .getter(getter(AllTypesResponse::mapOfStringToSimpleStruct))
-            .setter(setter(Builder::mapOfStringToSimpleStruct))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("MapOfStringToSimpleStruct").build(),
-                    MapTrait.builder()
-                            .keyLocationName("key")
-                            .valueLocationName("value")
-                            .valueFieldInfo(
-                                    SdkField.<SimpleStruct> builder(MarshallingType.SDK_POJO)
-                                            .constructor(SimpleStruct::builder)
-                                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
-                                                    .locationName("value").build()).build()).build()).build();
+        .<Map<String, SimpleStruct>> builder(MarshallingType.MAP)
+        .getter(getter(AllTypesResponse::mapOfStringToSimpleStruct))
+        .setter(setter(Builder::mapOfStringToSimpleStruct))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("MapOfStringToSimpleStruct").build(),
+                MapTrait.builder()
+                        .keyLocationName("key")
+                        .valueLocationName("value")
+                        .valueFieldInfo(
+                            SdkField.<SimpleStruct> builder(MarshallingType.SDK_POJO)
+                                .constructor(SimpleStruct::builder)
+                                .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
+                                                     .locationName("value").build()).build()).build()).build();
 
     private static final SdkField<Map<String, String>> MAP_OF_ENUM_TO_ENUM_FIELD = SdkField
-            .<Map<String, String>> builder(MarshallingType.MAP)
-            .getter(getter(AllTypesResponse::mapOfEnumToEnumAsStrings))
-            .setter(setter(Builder::mapOfEnumToEnumWithStrings))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("MapOfEnumToEnum").build(),
-                    MapTrait.builder()
-                            .keyLocationName("key")
-                            .valueLocationName("value")
-                            .valueFieldInfo(
-                                    SdkField.<String> builder(MarshallingType.STRING)
-                                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
-                                                    .locationName("value").build()).build()).build()).build();
+        .<Map<String, String>> builder(MarshallingType.MAP)
+        .getter(getter(AllTypesResponse::mapOfEnumToEnumAsStrings))
+        .setter(setter(Builder::mapOfEnumToEnumWithStrings))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("MapOfEnumToEnum").build(),
+                MapTrait.builder()
+                        .keyLocationName("key")
+                        .valueLocationName("value")
+                        .valueFieldInfo(
+                            SdkField.<String> builder(MarshallingType.STRING)
+                                .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
+                                                     .locationName("value").build()).build()).build()).build();
 
     private static final SdkField<Map<String, String>> MAP_OF_ENUM_TO_STRING_FIELD = SdkField
-            .<Map<String, String>> builder(MarshallingType.MAP)
-            .getter(getter(AllTypesResponse::mapOfEnumToStringAsStrings))
-            .setter(setter(Builder::mapOfEnumToStringWithStrings))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("MapOfEnumToString").build(),
-                    MapTrait.builder()
-                            .keyLocationName("key")
-                            .valueLocationName("value")
-                            .valueFieldInfo(
-                                    SdkField.<String> builder(MarshallingType.STRING)
-                                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
-                                                    .locationName("value").build()).build()).build()).build();
+        .<Map<String, String>> builder(MarshallingType.MAP)
+        .getter(getter(AllTypesResponse::mapOfEnumToStringAsStrings))
+        .setter(setter(Builder::mapOfEnumToStringWithStrings))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("MapOfEnumToString").build(),
+                MapTrait.builder()
+                        .keyLocationName("key")
+                        .valueLocationName("value")
+                        .valueFieldInfo(
+                            SdkField.<String> builder(MarshallingType.STRING)
+                                .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
+                                                     .locationName("value").build()).build()).build()).build();
 
     private static final SdkField<Map<String, String>> MAP_OF_STRING_TO_ENUM_FIELD = SdkField
-            .<Map<String, String>> builder(MarshallingType.MAP)
-            .getter(getter(AllTypesResponse::mapOfStringToEnumAsStrings))
-            .setter(setter(Builder::mapOfStringToEnumWithStrings))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("MapOfStringToEnum").build(),
-                    MapTrait.builder()
-                            .keyLocationName("key")
-                            .valueLocationName("value")
-                            .valueFieldInfo(
-                                    SdkField.<String> builder(MarshallingType.STRING)
-                                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
-                                                    .locationName("value").build()).build()).build()).build();
+        .<Map<String, String>> builder(MarshallingType.MAP)
+        .getter(getter(AllTypesResponse::mapOfStringToEnumAsStrings))
+        .setter(setter(Builder::mapOfStringToEnumWithStrings))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("MapOfStringToEnum").build(),
+                MapTrait.builder()
+                        .keyLocationName("key")
+                        .valueLocationName("value")
+                        .valueFieldInfo(
+                            SdkField.<String> builder(MarshallingType.STRING)
+                                .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
+                                                     .locationName("value").build()).build()).build()).build();
 
     private static final SdkField<Map<String, SimpleStruct>> MAP_OF_ENUM_TO_SIMPLE_STRUCT_FIELD = SdkField
-            .<Map<String, SimpleStruct>> builder(MarshallingType.MAP)
-            .getter(getter(AllTypesResponse::mapOfEnumToSimpleStructAsStrings))
-            .setter(setter(Builder::mapOfEnumToSimpleStructWithStrings))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("MapOfEnumToSimpleStruct").build(),
-                    MapTrait.builder()
-                            .keyLocationName("key")
-                            .valueLocationName("value")
-                            .valueFieldInfo(
-                                    SdkField.<SimpleStruct> builder(MarshallingType.SDK_POJO)
-                                            .constructor(SimpleStruct::builder)
-                                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
-                                                    .locationName("value").build()).build()).build()).build();
+        .<Map<String, SimpleStruct>> builder(MarshallingType.MAP)
+        .getter(getter(AllTypesResponse::mapOfEnumToSimpleStructAsStrings))
+        .setter(setter(Builder::mapOfEnumToSimpleStructWithStrings))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("MapOfEnumToSimpleStruct").build(),
+                MapTrait.builder()
+                        .keyLocationName("key")
+                        .valueLocationName("value")
+                        .valueFieldInfo(
+                            SdkField.<SimpleStruct> builder(MarshallingType.SDK_POJO)
+                                .constructor(SimpleStruct::builder)
+                                .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
+                                                     .locationName("value").build()).build()).build()).build();
 
     private static final SdkField<Map<String, List<String>>> MAP_OF_ENUM_TO_LIST_OF_ENUMS_FIELD = SdkField
-            .<Map<String, List<String>>> builder(MarshallingType.MAP)
-            .getter(getter(AllTypesResponse::mapOfEnumToListOfEnumsAsStrings))
-            .setter(setter(Builder::mapOfEnumToListOfEnumsWithStrings))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("MapOfEnumToListOfEnums").build(),
-                    MapTrait.builder()
-                            .keyLocationName("key")
-                            .valueLocationName("value")
-                            .valueFieldInfo(
-                                    SdkField.<List<String>> builder(MarshallingType.LIST)
-                                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
-                                                    .locationName("value").build(),
-                                                    ListTrait
-                                                            .builder()
-                                                            .memberLocationName(null)
-                                                            .memberFieldInfo(
-                                                                    SdkField.<String> builder(MarshallingType.STRING)
-                                                                            .traits(LocationTrait.builder()
-                                                                                    .location(MarshallLocation.PAYLOAD)
-                                                                                    .locationName("member").build()).build())
-                                                            .build()).build()).build()).build();
+        .<Map<String, List<String>>> builder(MarshallingType.MAP)
+        .getter(getter(AllTypesResponse::mapOfEnumToListOfEnumsAsStrings))
+        .setter(setter(Builder::mapOfEnumToListOfEnumsWithStrings))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("MapOfEnumToListOfEnums").build(),
+                MapTrait.builder()
+                        .keyLocationName("key")
+                        .valueLocationName("value")
+                        .valueFieldInfo(
+                            SdkField.<List<String>> builder(MarshallingType.LIST)
+                                .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
+                                                     .locationName("value").build(),
+                                        ListTrait
+                                            .builder()
+                                            .memberLocationName(null)
+                                            .memberFieldInfo(
+                                                SdkField.<String> builder(MarshallingType.STRING)
+                                                    .traits(LocationTrait.builder()
+                                                                         .location(MarshallLocation.PAYLOAD)
+                                                                         .locationName("member").build()).build())
+                                            .build()).build()).build()).build();
 
     private static final SdkField<Map<String, Map<String, String>>> MAP_OF_ENUM_TO_MAP_OF_STRING_TO_ENUM_FIELD = SdkField
-            .<Map<String, Map<String, String>>> builder(MarshallingType.MAP)
-            .getter(getter(AllTypesResponse::mapOfEnumToMapOfStringToEnumAsStrings))
-            .setter(setter(Builder::mapOfEnumToMapOfStringToEnumWithStrings))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("MapOfEnumToMapOfStringToEnum")
-                    .build(),
-                    MapTrait.builder()
-                            .keyLocationName("key")
-                            .valueLocationName("value")
-                            .valueFieldInfo(
-                                    SdkField.<Map<String, String>> builder(MarshallingType.MAP)
-                                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
-                                                    .locationName("value").build(),
-                                                    MapTrait.builder()
-                                                            .keyLocationName("key")
-                                                            .valueLocationName("value")
-                                                            .valueFieldInfo(
-                                                                    SdkField.<String> builder(MarshallingType.STRING)
-                                                                            .traits(LocationTrait.builder()
-                                                                                    .location(MarshallLocation.PAYLOAD)
-                                                                                    .locationName("value").build()).build())
-                                                            .build()).build()).build()).build();
+        .<Map<String, Map<String, String>>> builder(MarshallingType.MAP)
+        .getter(getter(AllTypesResponse::mapOfEnumToMapOfStringToEnumAsStrings))
+        .setter(setter(Builder::mapOfEnumToMapOfStringToEnumWithStrings))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("MapOfEnumToMapOfStringToEnum")
+                             .build(),
+                MapTrait.builder()
+                        .keyLocationName("key")
+                        .valueLocationName("value")
+                        .valueFieldInfo(
+                            SdkField.<Map<String, String>> builder(MarshallingType.MAP)
+                                .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
+                                                     .locationName("value").build(),
+                                        MapTrait.builder()
+                                                .keyLocationName("key")
+                                                .valueLocationName("value")
+                                                .valueFieldInfo(
+                                                    SdkField.<String> builder(MarshallingType.STRING)
+                                                        .traits(LocationTrait.builder()
+                                                                             .location(MarshallLocation.PAYLOAD)
+                                                                             .locationName("value").build()).build())
+                                                .build()).build()).build()).build();
 
     private static final SdkField<Instant> TIMESTAMP_MEMBER_FIELD = SdkField.<Instant> builder(MarshallingType.INSTANT)
-            .getter(getter(AllTypesResponse::timestampMember)).setter(setter(Builder::timestampMember))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("TimestampMember").build()).build();
+        .getter(getter(AllTypesResponse::timestampMember)).setter(setter(Builder::timestampMember))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("TimestampMember").build()).build();
 
     private static final SdkField<StructWithTimestamp> STRUCT_WITH_NESTED_TIMESTAMP_MEMBER_FIELD = SdkField
-            .<StructWithTimestamp> builder(MarshallingType.SDK_POJO)
-            .getter(getter(AllTypesResponse::structWithNestedTimestampMember))
-            .setter(setter(Builder::structWithNestedTimestampMember))
-            .constructor(StructWithTimestamp::builder)
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("StructWithNestedTimestampMember")
-                    .build()).build();
+        .<StructWithTimestamp> builder(MarshallingType.SDK_POJO)
+        .getter(getter(AllTypesResponse::structWithNestedTimestampMember))
+        .setter(setter(Builder::structWithNestedTimestampMember))
+        .constructor(StructWithTimestamp::builder)
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("StructWithNestedTimestampMember")
+                             .build()).build();
 
     private static final SdkField<SdkBytes> BLOB_ARG_FIELD = SdkField.<SdkBytes> builder(MarshallingType.SDK_BYTES)
-            .getter(getter(AllTypesResponse::blobArg)).setter(setter(Builder::blobArg))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("BlobArg").build()).build();
+        .getter(getter(AllTypesResponse::blobArg)).setter(setter(Builder::blobArg))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("BlobArg").build()).build();
 
     private static final SdkField<StructWithNestedBlobType> STRUCT_WITH_NESTED_BLOB_FIELD = SdkField
-            .<StructWithNestedBlobType> builder(MarshallingType.SDK_POJO).getter(getter(AllTypesResponse::structWithNestedBlob))
-            .setter(setter(Builder::structWithNestedBlob)).constructor(StructWithNestedBlobType::builder)
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("StructWithNestedBlob").build())
-            .build();
+        .<StructWithNestedBlobType> builder(MarshallingType.SDK_POJO).getter(getter(AllTypesResponse::structWithNestedBlob))
+                                                                     .setter(setter(Builder::structWithNestedBlob)).constructor(StructWithNestedBlobType::builder)
+                                                                     .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("StructWithNestedBlob").build())
+                                                                     .build();
 
     private static final SdkField<Map<String, SdkBytes>> BLOB_MAP_FIELD = SdkField
-            .<Map<String, SdkBytes>> builder(MarshallingType.MAP)
-            .getter(getter(AllTypesResponse::blobMap))
-            .setter(setter(Builder::blobMap))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("BlobMap").build(),
-                    MapTrait.builder()
-                            .keyLocationName("key")
-                            .valueLocationName("value")
-                            .valueFieldInfo(
-                                    SdkField.<SdkBytes> builder(MarshallingType.SDK_BYTES)
-                                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
-                                                    .locationName("value").build()).build()).build()).build();
+        .<Map<String, SdkBytes>> builder(MarshallingType.MAP)
+        .getter(getter(AllTypesResponse::blobMap))
+        .setter(setter(Builder::blobMap))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("BlobMap").build(),
+                MapTrait.builder()
+                        .keyLocationName("key")
+                        .valueLocationName("value")
+                        .valueFieldInfo(
+                            SdkField.<SdkBytes> builder(MarshallingType.SDK_BYTES)
+                                .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
+                                                     .locationName("value").build()).build()).build()).build();
 
     private static final SdkField<List<SdkBytes>> LIST_OF_BLOBS_FIELD = SdkField
-            .<List<SdkBytes>> builder(MarshallingType.LIST)
-            .getter(getter(AllTypesResponse::listOfBlobs))
-            .setter(setter(Builder::listOfBlobs))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("ListOfBlobs").build(),
-                    ListTrait
-                            .builder()
-                            .memberLocationName(null)
-                            .memberFieldInfo(
-                                    SdkField.<SdkBytes> builder(MarshallingType.SDK_BYTES)
-                                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
-                                                    .locationName("member").build()).build()).build()).build();
+        .<List<SdkBytes>> builder(MarshallingType.LIST)
+        .getter(getter(AllTypesResponse::listOfBlobs))
+        .setter(setter(Builder::listOfBlobs))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("ListOfBlobs").build(),
+                ListTrait
+                    .builder()
+                    .memberLocationName(null)
+                    .memberFieldInfo(
+                        SdkField.<SdkBytes> builder(MarshallingType.SDK_BYTES)
+                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
+                                                 .locationName("member").build()).build()).build()).build();
 
     private static final SdkField<RecursiveStructType> RECURSIVE_STRUCT_FIELD = SdkField
-            .<RecursiveStructType> builder(MarshallingType.SDK_POJO).getter(getter(AllTypesResponse::recursiveStruct))
-            .setter(setter(Builder::recursiveStruct)).constructor(RecursiveStructType::builder)
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("RecursiveStruct").build()).build();
+        .<RecursiveStructType> builder(MarshallingType.SDK_POJO).getter(getter(AllTypesResponse::recursiveStruct))
+                                                                .setter(setter(Builder::recursiveStruct)).constructor(RecursiveStructType::builder)
+                                                                .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("RecursiveStruct").build()).build();
 
     private static final SdkField<BaseType> POLYMORPHIC_TYPE_WITH_SUB_TYPES_FIELD = SdkField
-            .<BaseType> builder(MarshallingType.SDK_POJO)
-            .getter(getter(AllTypesResponse::polymorphicTypeWithSubTypes))
-            .setter(setter(Builder::polymorphicTypeWithSubTypes))
-            .constructor(BaseType::builder)
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("PolymorphicTypeWithSubTypes")
-                    .build()).build();
+        .<BaseType> builder(MarshallingType.SDK_POJO)
+        .getter(getter(AllTypesResponse::polymorphicTypeWithSubTypes))
+        .setter(setter(Builder::polymorphicTypeWithSubTypes))
+        .constructor(BaseType::builder)
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("PolymorphicTypeWithSubTypes")
+                             .build()).build();
 
     private static final SdkField<SubTypeOne> POLYMORPHIC_TYPE_WITHOUT_SUB_TYPES_FIELD = SdkField
-            .<SubTypeOne> builder(MarshallingType.SDK_POJO)
-            .getter(getter(AllTypesResponse::polymorphicTypeWithoutSubTypes))
-            .setter(setter(Builder::polymorphicTypeWithoutSubTypes))
-            .constructor(SubTypeOne::builder)
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("PolymorphicTypeWithoutSubTypes")
-                    .build()).build();
+        .<SubTypeOne> builder(MarshallingType.SDK_POJO)
+        .getter(getter(AllTypesResponse::polymorphicTypeWithoutSubTypes))
+        .setter(setter(Builder::polymorphicTypeWithoutSubTypes))
+        .constructor(SubTypeOne::builder)
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("PolymorphicTypeWithoutSubTypes")
+                             .build()).build();
 
     private static final SdkField<String> ENUM_TYPE_FIELD = SdkField.<String> builder(MarshallingType.STRING)
-            .getter(getter(AllTypesResponse::enumTypeAsString)).setter(setter(Builder::enumType))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("EnumType").build()).build();
+        .getter(getter(AllTypesResponse::enumTypeAsString)).setter(setter(Builder::enumType))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("EnumType").build()).build();
 
     private static final List<SdkField<?>> SDK_FIELDS = Collections.unmodifiableList(Arrays.asList(STRING_MEMBER_FIELD,
-            INTEGER_MEMBER_FIELD, BOOLEAN_MEMBER_FIELD, FLOAT_MEMBER_FIELD, DOUBLE_MEMBER_FIELD, LONG_MEMBER_FIELD,
-            SIMPLE_LIST_FIELD, LIST_OF_ENUMS_FIELD, LIST_OF_MAPS_FIELD, LIST_OF_STRUCTS_FIELD,
-            LIST_OF_MAP_OF_ENUM_TO_STRING_FIELD, MAP_OF_STRING_TO_INTEGER_LIST_FIELD, MAP_OF_STRING_TO_STRING_FIELD,
-            MAP_OF_STRING_TO_SIMPLE_STRUCT_FIELD, MAP_OF_ENUM_TO_ENUM_FIELD, MAP_OF_ENUM_TO_STRING_FIELD,
-            MAP_OF_STRING_TO_ENUM_FIELD, MAP_OF_ENUM_TO_SIMPLE_STRUCT_FIELD, MAP_OF_ENUM_TO_LIST_OF_ENUMS_FIELD,
-            MAP_OF_ENUM_TO_MAP_OF_STRING_TO_ENUM_FIELD, TIMESTAMP_MEMBER_FIELD, STRUCT_WITH_NESTED_TIMESTAMP_MEMBER_FIELD,
-            BLOB_ARG_FIELD, STRUCT_WITH_NESTED_BLOB_FIELD, BLOB_MAP_FIELD, LIST_OF_BLOBS_FIELD, RECURSIVE_STRUCT_FIELD,
-            POLYMORPHIC_TYPE_WITH_SUB_TYPES_FIELD, POLYMORPHIC_TYPE_WITHOUT_SUB_TYPES_FIELD, ENUM_TYPE_FIELD));
+                                                                                                   INTEGER_MEMBER_FIELD, BOOLEAN_MEMBER_FIELD, FLOAT_MEMBER_FIELD, DOUBLE_MEMBER_FIELD, LONG_MEMBER_FIELD,
+                                                                                                   SIMPLE_LIST_FIELD, LIST_OF_ENUMS_FIELD, LIST_OF_MAPS_FIELD, LIST_OF_STRUCTS_FIELD,
+                                                                                                   LIST_OF_MAP_OF_ENUM_TO_STRING_FIELD, MAP_OF_STRING_TO_INTEGER_LIST_FIELD, MAP_OF_STRING_TO_STRING_FIELD,
+                                                                                                   MAP_OF_STRING_TO_SIMPLE_STRUCT_FIELD, MAP_OF_ENUM_TO_ENUM_FIELD, MAP_OF_ENUM_TO_STRING_FIELD,
+                                                                                                   MAP_OF_STRING_TO_ENUM_FIELD, MAP_OF_ENUM_TO_SIMPLE_STRUCT_FIELD, MAP_OF_ENUM_TO_LIST_OF_ENUMS_FIELD,
+                                                                                                   MAP_OF_ENUM_TO_MAP_OF_STRING_TO_ENUM_FIELD, TIMESTAMP_MEMBER_FIELD, STRUCT_WITH_NESTED_TIMESTAMP_MEMBER_FIELD,
+                                                                                                   BLOB_ARG_FIELD, STRUCT_WITH_NESTED_BLOB_FIELD, BLOB_MAP_FIELD, LIST_OF_BLOBS_FIELD, RECURSIVE_STRUCT_FIELD,
+                                                                                                   POLYMORPHIC_TYPE_WITH_SUB_TYPES_FIELD, POLYMORPHIC_TYPE_WITHOUT_SUB_TYPES_FIELD, ENUM_TYPE_FIELD));
 
     private final String stringMember;
 
@@ -468,7 +470,7 @@ private AllTypesResponse(BuilderImpl builder) {
 
     /**
      * Returns the value of the StringMember property for this object.
-     * 
+     *
      * @return The value of the StringMember property for this object.
      */
     public String stringMember() {
@@ -477,7 +479,7 @@ public String stringMember() {
 
     /**
      * Returns the value of the IntegerMember property for this object.
-     * 
+     *
      * @return The value of the IntegerMember property for this object.
      */
     public Integer integerMember() {
@@ -486,7 +488,7 @@ public Integer integerMember() {
 
     /**
      * Returns the value of the BooleanMember property for this object.
-     * 
+     *
      * @return The value of the BooleanMember property for this object.
      */
     public Boolean booleanMember() {
@@ -495,7 +497,7 @@ public Boolean booleanMember() {
 
     /**
      * Returns the value of the FloatMember property for this object.
-     * 
+     *
      * @return The value of the FloatMember property for this object.
      */
     public Float floatMember() {
@@ -504,7 +506,7 @@ public Float floatMember() {
 
     /**
      * Returns the value of the DoubleMember property for this object.
-     * 
+     *
      * @return The value of the DoubleMember property for this object.
      */
     public Double doubleMember() {
@@ -513,19 +515,30 @@ public Double doubleMember() {
 
     /**
      * Returns the value of the LongMember property for this object.
-     * 
+     *
      * @return The value of the LongMember property for this object.
      */
     public Long longMember() {
         return longMember;
     }
 
+    /**
+     * Returns true if the SimpleList property was specified by the sender (it may be empty), or false if the sender did
+     * not specify the value (it will be empty). For responses returned by the SDK, the sender is the AWS service.
+     */
+    public boolean hasSimpleList() {
+        return simpleList != null && !(simpleList instanceof SdkAutoConstructList);
+    }
+
     /**
      * Returns the value of the SimpleList property for this object.
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
-     * 
+     * <p>
+     * You can use {@link #hasSimpleList()} to see if a value was sent in this field.
+     * </p>
+     *
      * @return The value of the SimpleList property for this object.
      */
     public List<String> simpleList() {
@@ -537,43 +550,79 @@ public List<String> simpleList() {
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
-     * 
+     * <p>
+     * You can use {@link #hasListOfEnums()} to see if a value was sent in this field.
+     * </p>
+     *
      * @return The value of the ListOfEnums property for this object.
      */
     public List<EnumType> listOfEnums() {
         return ListOfEnumsCopier.copyStringToEnum(listOfEnums);
     }
 
+    /**
+     * Returns true if the ListOfEnums property was specified by the sender (it may be empty), or false if the sender
+     * did not specify the value (it will be empty). For responses returned by the SDK, the sender is the AWS service.
+     */
+    public boolean hasListOfEnums() {
+        return listOfEnums != null && !(listOfEnums instanceof SdkAutoConstructList);
+    }
+
     /**
      * Returns the value of the ListOfEnums property for this object.
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
-     * 
+     * <p>
+     * You can use {@link #hasListOfEnums()} to see if a value was sent in this field.
+     * </p>
+     *
      * @return The value of the ListOfEnums property for this object.
      */
     public List<String> listOfEnumsAsStrings() {
         return listOfEnums;
     }
 
+    /**
+     * Returns true if the ListOfMaps property was specified by the sender (it may be empty), or false if the sender did
+     * not specify the value (it will be empty). For responses returned by the SDK, the sender is the AWS service.
+     */
+    public boolean hasListOfMaps() {
+        return listOfMaps != null && !(listOfMaps instanceof SdkAutoConstructList);
+    }
+
     /**
      * Returns the value of the ListOfMaps property for this object.
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
-     * 
+     * <p>
+     * You can use {@link #hasListOfMaps()} to see if a value was sent in this field.
+     * </p>
+     *
      * @return The value of the ListOfMaps property for this object.
      */
     public List<Map<String, String>> listOfMaps() {
         return listOfMaps;
     }
 
+    /**
+     * Returns true if the ListOfStructs property was specified by the sender (it may be empty), or false if the sender
+     * did not specify the value (it will be empty). For responses returned by the SDK, the sender is the AWS service.
+     */
+    public boolean hasListOfStructs() {
+        return listOfStructs != null && !(listOfStructs instanceof SdkAutoConstructList);
+    }
+
     /**
      * Returns the value of the ListOfStructs property for this object.
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
-     * 
+     * <p>
+     * You can use {@link #hasListOfStructs()} to see if a value was sent in this field.
+     * </p>
+     *
      * @return The value of the ListOfStructs property for this object.
      */
     public List<SimpleStruct> listOfStructs() {
@@ -585,55 +634,106 @@ public List<SimpleStruct> listOfStructs() {
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
-     * 
+     * <p>
+     * You can use {@link #hasListOfMapOfEnumToString()} to see if a value was sent in this field.
+     * </p>
+     *
      * @return The value of the ListOfMapOfEnumToString property for this object.
      */
     public List<Map<EnumType, String>> listOfMapOfEnumToString() {
         return ListOfMapOfEnumToStringCopier.copyStringToEnum(listOfMapOfEnumToString);
     }
 
+    /**
+     * Returns true if the ListOfMapOfEnumToString property was specified by the sender (it may be empty), or false if
+     * the sender did not specify the value (it will be empty). For responses returned by the SDK, the sender is the AWS
+     * service.
+     */
+    public boolean hasListOfMapOfEnumToString() {
+        return listOfMapOfEnumToString != null && !(listOfMapOfEnumToString instanceof SdkAutoConstructList);
+    }
+
     /**
      * Returns the value of the ListOfMapOfEnumToString property for this object.
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
-     * 
+     * <p>
+     * You can use {@link #hasListOfMapOfEnumToString()} to see if a value was sent in this field.
+     * </p>
+     *
      * @return The value of the ListOfMapOfEnumToString property for this object.
      */
     public List<Map<String, String>> listOfMapOfEnumToStringAsStrings() {
         return listOfMapOfEnumToString;
     }
 
+    /**
+     * Returns true if the MapOfStringToIntegerList property was specified by the sender (it may be empty), or false if
+     * the sender did not specify the value (it will be empty). For responses returned by the SDK, the sender is the AWS
+     * service.
+     */
+    public boolean hasMapOfStringToIntegerList() {
+        return mapOfStringToIntegerList != null && !(mapOfStringToIntegerList instanceof SdkAutoConstructMap);
+    }
+
     /**
      * Returns the value of the MapOfStringToIntegerList property for this object.
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
-     * 
+     * <p>
+     * You can use {@link #hasMapOfStringToIntegerList()} to see if a value was sent in this field.
+     * </p>
+     *
      * @return The value of the MapOfStringToIntegerList property for this object.
      */
     public Map<String, List<Integer>> mapOfStringToIntegerList() {
         return mapOfStringToIntegerList;
     }
 
+    /**
+     * Returns true if the MapOfStringToString property was specified by the sender (it may be empty), or false if the
+     * sender did not specify the value (it will be empty). For responses returned by the SDK, the sender is the AWS
+     * service.
+     */
+    public boolean hasMapOfStringToString() {
+        return mapOfStringToString != null && !(mapOfStringToString instanceof SdkAutoConstructMap);
+    }
+
     /**
      * Returns the value of the MapOfStringToString property for this object.
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
-     * 
+     * <p>
+     * You can use {@link #hasMapOfStringToString()} to see if a value was sent in this field.
+     * </p>
+     *
      * @return The value of the MapOfStringToString property for this object.
      */
     public Map<String, String> mapOfStringToString() {
         return mapOfStringToString;
     }
 
+    /**
+     * Returns true if the MapOfStringToSimpleStruct property was specified by the sender (it may be empty), or false if
+     * the sender did not specify the value (it will be empty). For responses returned by the SDK, the sender is the AWS
+     * service.
+     */
+    public boolean hasMapOfStringToSimpleStruct() {
+        return mapOfStringToSimpleStruct != null && !(mapOfStringToSimpleStruct instanceof SdkAutoConstructMap);
+    }
+
     /**
      * Returns the value of the MapOfStringToSimpleStruct property for this object.
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
-     * 
+     * <p>
+     * You can use {@link #hasMapOfStringToSimpleStruct()} to see if a value was sent in this field.
+     * </p>
+     *
      * @return The value of the MapOfStringToSimpleStruct property for this object.
      */
     public Map<String, SimpleStruct> mapOfStringToSimpleStruct() {
@@ -645,19 +745,34 @@ public Map<String, SimpleStruct> mapOfStringToSimpleStruct() {
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
-     * 
+     * <p>
+     * You can use {@link #hasMapOfEnumToEnum()} to see if a value was sent in this field.
+     * </p>
+     *
      * @return The value of the MapOfEnumToEnum property for this object.
      */
     public Map<EnumType, EnumType> mapOfEnumToEnum() {
         return MapOfEnumToEnumCopier.copyStringToEnum(mapOfEnumToEnum);
     }
 
+    /**
+     * Returns true if the MapOfEnumToEnum property was specified by the sender (it may be empty), or false if the
+     * sender did not specify the value (it will be empty). For responses returned by the SDK, the sender is the AWS
+     * service.
+     */
+    public boolean hasMapOfEnumToEnum() {
+        return mapOfEnumToEnum != null && !(mapOfEnumToEnum instanceof SdkAutoConstructMap);
+    }
+
     /**
      * Returns the value of the MapOfEnumToEnum property for this object.
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
-     * 
+     * <p>
+     * You can use {@link #hasMapOfEnumToEnum()} to see if a value was sent in this field.
+     * </p>
+     *
      * @return The value of the MapOfEnumToEnum property for this object.
      */
     public Map<String, String> mapOfEnumToEnumAsStrings() {
@@ -669,19 +784,34 @@ public Map<String, String> mapOfEnumToEnumAsStrings() {
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
-     * 
+     * <p>
+     * You can use {@link #hasMapOfEnumToString()} to see if a value was sent in this field.
+     * </p>
+     *
      * @return The value of the MapOfEnumToString property for this object.
      */
     public Map<EnumType, String> mapOfEnumToString() {
         return MapOfEnumToStringCopier.copyStringToEnum(mapOfEnumToString);
     }
 
+    /**
+     * Returns true if the MapOfEnumToString property was specified by the sender (it may be empty), or false if the
+     * sender did not specify the value (it will be empty). For responses returned by the SDK, the sender is the AWS
+     * service.
+     */
+    public boolean hasMapOfEnumToString() {
+        return mapOfEnumToString != null && !(mapOfEnumToString instanceof SdkAutoConstructMap);
+    }
+
     /**
      * Returns the value of the MapOfEnumToString property for this object.
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
-     * 
+     * <p>
+     * You can use {@link #hasMapOfEnumToString()} to see if a value was sent in this field.
+     * </p>
+     *
      * @return The value of the MapOfEnumToString property for this object.
      */
     public Map<String, String> mapOfEnumToStringAsStrings() {
@@ -693,19 +823,34 @@ public Map<String, String> mapOfEnumToStringAsStrings() {
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
-     * 
+     * <p>
+     * You can use {@link #hasMapOfStringToEnum()} to see if a value was sent in this field.
+     * </p>
+     *
      * @return The value of the MapOfStringToEnum property for this object.
      */
     public Map<String, EnumType> mapOfStringToEnum() {
         return MapOfStringToEnumCopier.copyStringToEnum(mapOfStringToEnum);
     }
 
+    /**
+     * Returns true if the MapOfStringToEnum property was specified by the sender (it may be empty), or false if the
+     * sender did not specify the value (it will be empty). For responses returned by the SDK, the sender is the AWS
+     * service.
+     */
+    public boolean hasMapOfStringToEnum() {
+        return mapOfStringToEnum != null && !(mapOfStringToEnum instanceof SdkAutoConstructMap);
+    }
+
     /**
      * Returns the value of the MapOfStringToEnum property for this object.
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
-     * 
+     * <p>
+     * You can use {@link #hasMapOfStringToEnum()} to see if a value was sent in this field.
+     * </p>
+     *
      * @return The value of the MapOfStringToEnum property for this object.
      */
     public Map<String, String> mapOfStringToEnumAsStrings() {
@@ -717,19 +862,34 @@ public Map<String, String> mapOfStringToEnumAsStrings() {
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
-     * 
+     * <p>
+     * You can use {@link #hasMapOfEnumToSimpleStruct()} to see if a value was sent in this field.
+     * </p>
+     *
      * @return The value of the MapOfEnumToSimpleStruct property for this object.
      */
     public Map<EnumType, SimpleStruct> mapOfEnumToSimpleStruct() {
         return MapOfEnumToSimpleStructCopier.copyStringToEnum(mapOfEnumToSimpleStruct);
     }
 
+    /**
+     * Returns true if the MapOfEnumToSimpleStruct property was specified by the sender (it may be empty), or false if
+     * the sender did not specify the value (it will be empty). For responses returned by the SDK, the sender is the AWS
+     * service.
+     */
+    public boolean hasMapOfEnumToSimpleStruct() {
+        return mapOfEnumToSimpleStruct != null && !(mapOfEnumToSimpleStruct instanceof SdkAutoConstructMap);
+    }
+
     /**
      * Returns the value of the MapOfEnumToSimpleStruct property for this object.
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
-     * 
+     * <p>
+     * You can use {@link #hasMapOfEnumToSimpleStruct()} to see if a value was sent in this field.
+     * </p>
+     *
      * @return The value of the MapOfEnumToSimpleStruct property for this object.
      */
     public Map<String, SimpleStruct> mapOfEnumToSimpleStructAsStrings() {
@@ -741,19 +901,34 @@ public Map<String, SimpleStruct> mapOfEnumToSimpleStructAsStrings() {
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
-     * 
+     * <p>
+     * You can use {@link #hasMapOfEnumToListOfEnums()} to see if a value was sent in this field.
+     * </p>
+     *
      * @return The value of the MapOfEnumToListOfEnums property for this object.
      */
     public Map<EnumType, List<EnumType>> mapOfEnumToListOfEnums() {
         return MapOfEnumToListOfEnumsCopier.copyStringToEnum(mapOfEnumToListOfEnums);
     }
 
+    /**
+     * Returns true if the MapOfEnumToListOfEnums property was specified by the sender (it may be empty), or false if
+     * the sender did not specify the value (it will be empty). For responses returned by the SDK, the sender is the AWS
+     * service.
+     */
+    public boolean hasMapOfEnumToListOfEnums() {
+        return mapOfEnumToListOfEnums != null && !(mapOfEnumToListOfEnums instanceof SdkAutoConstructMap);
+    }
+
     /**
      * Returns the value of the MapOfEnumToListOfEnums property for this object.
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
-     * 
+     * <p>
+     * You can use {@link #hasMapOfEnumToListOfEnums()} to see if a value was sent in this field.
+     * </p>
+     *
      * @return The value of the MapOfEnumToListOfEnums property for this object.
      */
     public Map<String, List<String>> mapOfEnumToListOfEnumsAsStrings() {
@@ -765,19 +940,34 @@ public Map<String, List<String>> mapOfEnumToListOfEnumsAsStrings() {
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
-     * 
+     * <p>
+     * You can use {@link #hasMapOfEnumToMapOfStringToEnum()} to see if a value was sent in this field.
+     * </p>
+     *
      * @return The value of the MapOfEnumToMapOfStringToEnum property for this object.
      */
     public Map<EnumType, Map<String, EnumType>> mapOfEnumToMapOfStringToEnum() {
         return MapOfEnumToMapOfStringToEnumCopier.copyStringToEnum(mapOfEnumToMapOfStringToEnum);
     }
 
+    /**
+     * Returns true if the MapOfEnumToMapOfStringToEnum property was specified by the sender (it may be empty), or false
+     * if the sender did not specify the value (it will be empty). For responses returned by the SDK, the sender is the
+     * AWS service.
+     */
+    public boolean hasMapOfEnumToMapOfStringToEnum() {
+        return mapOfEnumToMapOfStringToEnum != null && !(mapOfEnumToMapOfStringToEnum instanceof SdkAutoConstructMap);
+    }
+
     /**
      * Returns the value of the MapOfEnumToMapOfStringToEnum property for this object.
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
-     * 
+     * <p>
+     * You can use {@link #hasMapOfEnumToMapOfStringToEnum()} to see if a value was sent in this field.
+     * </p>
+     *
      * @return The value of the MapOfEnumToMapOfStringToEnum property for this object.
      */
     public Map<String, Map<String, String>> mapOfEnumToMapOfStringToEnumAsStrings() {
@@ -786,7 +976,7 @@ public Map<String, Map<String, String>> mapOfEnumToMapOfStringToEnumAsStrings()
 
     /**
      * Returns the value of the TimestampMember property for this object.
-     * 
+     *
      * @return The value of the TimestampMember property for this object.
      */
     public Instant timestampMember() {
@@ -795,7 +985,7 @@ public Instant timestampMember() {
 
     /**
      * Returns the value of the StructWithNestedTimestampMember property for this object.
-     * 
+     *
      * @return The value of the StructWithNestedTimestampMember property for this object.
      */
     public StructWithTimestamp structWithNestedTimestampMember() {
@@ -804,7 +994,7 @@ public StructWithTimestamp structWithNestedTimestampMember() {
 
     /**
      * Returns the value of the BlobArg property for this object.
-     * 
+     *
      * @return The value of the BlobArg property for this object.
      */
     public SdkBytes blobArg() {
@@ -813,31 +1003,53 @@ public SdkBytes blobArg() {
 
     /**
      * Returns the value of the StructWithNestedBlob property for this object.
-     * 
+     *
      * @return The value of the StructWithNestedBlob property for this object.
      */
     public StructWithNestedBlobType structWithNestedBlob() {
         return structWithNestedBlob;
     }
 
+    /**
+     * Returns true if the BlobMap property was specified by the sender (it may be empty), or false if the sender did
+     * not specify the value (it will be empty). For responses returned by the SDK, the sender is the AWS service.
+     */
+    public boolean hasBlobMap() {
+        return blobMap != null && !(blobMap instanceof SdkAutoConstructMap);
+    }
+
     /**
      * Returns the value of the BlobMap property for this object.
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
-     * 
+     * <p>
+     * You can use {@link #hasBlobMap()} to see if a value was sent in this field.
+     * </p>
+     *
      * @return The value of the BlobMap property for this object.
      */
     public Map<String, SdkBytes> blobMap() {
         return blobMap;
     }
 
+    /**
+     * Returns true if the ListOfBlobs property was specified by the sender (it may be empty), or false if the sender
+     * did not specify the value (it will be empty). For responses returned by the SDK, the sender is the AWS service.
+     */
+    public boolean hasListOfBlobs() {
+        return listOfBlobs != null && !(listOfBlobs instanceof SdkAutoConstructList);
+    }
+
     /**
      * Returns the value of the ListOfBlobs property for this object.
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
-     * 
+     * <p>
+     * You can use {@link #hasListOfBlobs()} to see if a value was sent in this field.
+     * </p>
+     *
      * @return The value of the ListOfBlobs property for this object.
      */
     public List<SdkBytes> listOfBlobs() {
@@ -846,7 +1058,7 @@ public List<SdkBytes> listOfBlobs() {
 
     /**
      * Returns the value of the RecursiveStruct property for this object.
-     * 
+     *
      * @return The value of the RecursiveStruct property for this object.
      */
     public RecursiveStructType recursiveStruct() {
@@ -855,7 +1067,7 @@ public RecursiveStructType recursiveStruct() {
 
     /**
      * Returns the value of the PolymorphicTypeWithSubTypes property for this object.
-     * 
+     *
      * @return The value of the PolymorphicTypeWithSubTypes property for this object.
      */
     public BaseType polymorphicTypeWithSubTypes() {
@@ -864,7 +1076,7 @@ public BaseType polymorphicTypeWithSubTypes() {
 
     /**
      * Returns the value of the PolymorphicTypeWithoutSubTypes property for this object.
-     * 
+     *
      * @return The value of the PolymorphicTypeWithoutSubTypes property for this object.
      */
     public SubTypeOne polymorphicTypeWithoutSubTypes() {
@@ -878,7 +1090,7 @@ public SubTypeOne polymorphicTypeWithoutSubTypes() {
      * return {@link EnumType#UNKNOWN_TO_SDK_VERSION}. The raw value returned by the service is available from
      * {@link #enumTypeAsString}.
      * </p>
-     * 
+     *
      * @return The value of the EnumType property for this object.
      * @see EnumType
      */
@@ -893,7 +1105,7 @@ public EnumType enumType() {
      * return {@link EnumType#UNKNOWN_TO_SDK_VERSION}. The raw value returned by the service is available from
      * {@link #enumTypeAsString}.
      * </p>
-     * 
+     *
      * @return The value of the EnumType property for this object.
      * @see EnumType
      */
@@ -1002,88 +1214,88 @@ public boolean equalsBySdkFields(Object obj) {
     @Override
     public String toString() {
         return ToString.builder("AllTypesResponse").add("StringMember", stringMember()).add("IntegerMember", integerMember())
-                .add("BooleanMember", booleanMember()).add("FloatMember", floatMember()).add("DoubleMember", doubleMember())
-                .add("LongMember", longMember()).add("SimpleList", simpleList()).add("ListOfEnums", listOfEnumsAsStrings())
-                .add("ListOfMaps", listOfMaps()).add("ListOfStructs", listOfStructs())
-                .add("ListOfMapOfEnumToString", listOfMapOfEnumToStringAsStrings())
-                .add("MapOfStringToIntegerList", mapOfStringToIntegerList()).add("MapOfStringToString", mapOfStringToString())
-                .add("MapOfStringToSimpleStruct", mapOfStringToSimpleStruct()).add("MapOfEnumToEnum", mapOfEnumToEnumAsStrings())
-                .add("MapOfEnumToString", mapOfEnumToStringAsStrings()).add("MapOfStringToEnum", mapOfStringToEnumAsStrings())
-                .add("MapOfEnumToSimpleStruct", mapOfEnumToSimpleStructAsStrings())
-                .add("MapOfEnumToListOfEnums", mapOfEnumToListOfEnumsAsStrings())
-                .add("MapOfEnumToMapOfStringToEnum", mapOfEnumToMapOfStringToEnumAsStrings())
-                .add("TimestampMember", timestampMember())
-                .add("StructWithNestedTimestampMember", structWithNestedTimestampMember()).add("BlobArg", blobArg())
-                .add("StructWithNestedBlob", structWithNestedBlob()).add("BlobMap", blobMap()).add("ListOfBlobs", listOfBlobs())
-                .add("RecursiveStruct", recursiveStruct()).add("PolymorphicTypeWithSubTypes", polymorphicTypeWithSubTypes())
-                .add("PolymorphicTypeWithoutSubTypes", polymorphicTypeWithoutSubTypes()).add("EnumType", enumTypeAsString())
-                .build();
+                       .add("BooleanMember", booleanMember()).add("FloatMember", floatMember()).add("DoubleMember", doubleMember())
+                       .add("LongMember", longMember()).add("SimpleList", simpleList()).add("ListOfEnums", listOfEnumsAsStrings())
+                       .add("ListOfMaps", listOfMaps()).add("ListOfStructs", listOfStructs())
+                       .add("ListOfMapOfEnumToString", listOfMapOfEnumToStringAsStrings())
+                       .add("MapOfStringToIntegerList", mapOfStringToIntegerList()).add("MapOfStringToString", mapOfStringToString())
+                       .add("MapOfStringToSimpleStruct", mapOfStringToSimpleStruct()).add("MapOfEnumToEnum", mapOfEnumToEnumAsStrings())
+                       .add("MapOfEnumToString", mapOfEnumToStringAsStrings()).add("MapOfStringToEnum", mapOfStringToEnumAsStrings())
+                       .add("MapOfEnumToSimpleStruct", mapOfEnumToSimpleStructAsStrings())
+                       .add("MapOfEnumToListOfEnums", mapOfEnumToListOfEnumsAsStrings())
+                       .add("MapOfEnumToMapOfStringToEnum", mapOfEnumToMapOfStringToEnumAsStrings())
+                       .add("TimestampMember", timestampMember())
+                       .add("StructWithNestedTimestampMember", structWithNestedTimestampMember()).add("BlobArg", blobArg())
+                       .add("StructWithNestedBlob", structWithNestedBlob()).add("BlobMap", blobMap()).add("ListOfBlobs", listOfBlobs())
+                       .add("RecursiveStruct", recursiveStruct()).add("PolymorphicTypeWithSubTypes", polymorphicTypeWithSubTypes())
+                       .add("PolymorphicTypeWithoutSubTypes", polymorphicTypeWithoutSubTypes()).add("EnumType", enumTypeAsString())
+                       .build();
     }
 
     public <T> Optional<T> getValueForField(String fieldName, Class<T> clazz) {
         switch (fieldName) {
-        case "StringMember":
-            return Optional.ofNullable(clazz.cast(stringMember()));
-        case "IntegerMember":
-            return Optional.ofNullable(clazz.cast(integerMember()));
-        case "BooleanMember":
-            return Optional.ofNullable(clazz.cast(booleanMember()));
-        case "FloatMember":
-            return Optional.ofNullable(clazz.cast(floatMember()));
-        case "DoubleMember":
-            return Optional.ofNullable(clazz.cast(doubleMember()));
-        case "LongMember":
-            return Optional.ofNullable(clazz.cast(longMember()));
-        case "SimpleList":
-            return Optional.ofNullable(clazz.cast(simpleList()));
-        case "ListOfEnums":
-            return Optional.ofNullable(clazz.cast(listOfEnumsAsStrings()));
-        case "ListOfMaps":
-            return Optional.ofNullable(clazz.cast(listOfMaps()));
-        case "ListOfStructs":
-            return Optional.ofNullable(clazz.cast(listOfStructs()));
-        case "ListOfMapOfEnumToString":
-            return Optional.ofNullable(clazz.cast(listOfMapOfEnumToStringAsStrings()));
-        case "MapOfStringToIntegerList":
-            return Optional.ofNullable(clazz.cast(mapOfStringToIntegerList()));
-        case "MapOfStringToString":
-            return Optional.ofNullable(clazz.cast(mapOfStringToString()));
-        case "MapOfStringToSimpleStruct":
-            return Optional.ofNullable(clazz.cast(mapOfStringToSimpleStruct()));
-        case "MapOfEnumToEnum":
-            return Optional.ofNullable(clazz.cast(mapOfEnumToEnumAsStrings()));
-        case "MapOfEnumToString":
-            return Optional.ofNullable(clazz.cast(mapOfEnumToStringAsStrings()));
-        case "MapOfStringToEnum":
-            return Optional.ofNullable(clazz.cast(mapOfStringToEnumAsStrings()));
-        case "MapOfEnumToSimpleStruct":
-            return Optional.ofNullable(clazz.cast(mapOfEnumToSimpleStructAsStrings()));
-        case "MapOfEnumToListOfEnums":
-            return Optional.ofNullable(clazz.cast(mapOfEnumToListOfEnumsAsStrings()));
-        case "MapOfEnumToMapOfStringToEnum":
-            return Optional.ofNullable(clazz.cast(mapOfEnumToMapOfStringToEnumAsStrings()));
-        case "TimestampMember":
-            return Optional.ofNullable(clazz.cast(timestampMember()));
-        case "StructWithNestedTimestampMember":
-            return Optional.ofNullable(clazz.cast(structWithNestedTimestampMember()));
-        case "BlobArg":
-            return Optional.ofNullable(clazz.cast(blobArg()));
-        case "StructWithNestedBlob":
-            return Optional.ofNullable(clazz.cast(structWithNestedBlob()));
-        case "BlobMap":
-            return Optional.ofNullable(clazz.cast(blobMap()));
-        case "ListOfBlobs":
-            return Optional.ofNullable(clazz.cast(listOfBlobs()));
-        case "RecursiveStruct":
-            return Optional.ofNullable(clazz.cast(recursiveStruct()));
-        case "PolymorphicTypeWithSubTypes":
-            return Optional.ofNullable(clazz.cast(polymorphicTypeWithSubTypes()));
-        case "PolymorphicTypeWithoutSubTypes":
-            return Optional.ofNullable(clazz.cast(polymorphicTypeWithoutSubTypes()));
-        case "EnumType":
-            return Optional.ofNullable(clazz.cast(enumTypeAsString()));
-        default:
-            return Optional.empty();
+            case "StringMember":
+                return Optional.ofNullable(clazz.cast(stringMember()));
+            case "IntegerMember":
+                return Optional.ofNullable(clazz.cast(integerMember()));
+            case "BooleanMember":
+                return Optional.ofNullable(clazz.cast(booleanMember()));
+            case "FloatMember":
+                return Optional.ofNullable(clazz.cast(floatMember()));
+            case "DoubleMember":
+                return Optional.ofNullable(clazz.cast(doubleMember()));
+            case "LongMember":
+                return Optional.ofNullable(clazz.cast(longMember()));
+            case "SimpleList":
+                return Optional.ofNullable(clazz.cast(simpleList()));
+            case "ListOfEnums":
+                return Optional.ofNullable(clazz.cast(listOfEnumsAsStrings()));
+            case "ListOfMaps":
+                return Optional.ofNullable(clazz.cast(listOfMaps()));
+            case "ListOfStructs":
+                return Optional.ofNullable(clazz.cast(listOfStructs()));
+            case "ListOfMapOfEnumToString":
+                return Optional.ofNullable(clazz.cast(listOfMapOfEnumToStringAsStrings()));
+            case "MapOfStringToIntegerList":
+                return Optional.ofNullable(clazz.cast(mapOfStringToIntegerList()));
+            case "MapOfStringToString":
+                return Optional.ofNullable(clazz.cast(mapOfStringToString()));
+            case "MapOfStringToSimpleStruct":
+                return Optional.ofNullable(clazz.cast(mapOfStringToSimpleStruct()));
+            case "MapOfEnumToEnum":
+                return Optional.ofNullable(clazz.cast(mapOfEnumToEnumAsStrings()));
+            case "MapOfEnumToString":
+                return Optional.ofNullable(clazz.cast(mapOfEnumToStringAsStrings()));
+            case "MapOfStringToEnum":
+                return Optional.ofNullable(clazz.cast(mapOfStringToEnumAsStrings()));
+            case "MapOfEnumToSimpleStruct":
+                return Optional.ofNullable(clazz.cast(mapOfEnumToSimpleStructAsStrings()));
+            case "MapOfEnumToListOfEnums":
+                return Optional.ofNullable(clazz.cast(mapOfEnumToListOfEnumsAsStrings()));
+            case "MapOfEnumToMapOfStringToEnum":
+                return Optional.ofNullable(clazz.cast(mapOfEnumToMapOfStringToEnumAsStrings()));
+            case "TimestampMember":
+                return Optional.ofNullable(clazz.cast(timestampMember()));
+            case "StructWithNestedTimestampMember":
+                return Optional.ofNullable(clazz.cast(structWithNestedTimestampMember()));
+            case "BlobArg":
+                return Optional.ofNullable(clazz.cast(blobArg()));
+            case "StructWithNestedBlob":
+                return Optional.ofNullable(clazz.cast(structWithNestedBlob()));
+            case "BlobMap":
+                return Optional.ofNullable(clazz.cast(blobMap()));
+            case "ListOfBlobs":
+                return Optional.ofNullable(clazz.cast(listOfBlobs()));
+            case "RecursiveStruct":
+                return Optional.ofNullable(clazz.cast(recursiveStruct()));
+            case "PolymorphicTypeWithSubTypes":
+                return Optional.ofNullable(clazz.cast(polymorphicTypeWithSubTypes()));
+            case "PolymorphicTypeWithoutSubTypes":
+                return Optional.ofNullable(clazz.cast(polymorphicTypeWithoutSubTypes()));
+            case "EnumType":
+                return Optional.ofNullable(clazz.cast(enumTypeAsString()));
+            default:
+                return Optional.empty();
         }
     }
 
@@ -1253,7 +1465,7 @@ public interface Builder extends JsonProtocolTestsResponse.Builder, SdkPojo, Cop
          *
          * When the {@link Consumer} completes, {@link List<SimpleStruct>.Builder#build()} is called immediately and its
          * result is passed to {@link #listOfStructs(List<SimpleStruct>)}.
-         * 
+         *
          * @param listOfStructs
          *        a consumer that will call methods on {@link List<SimpleStruct>.Builder}
          * @return Returns a reference to this object so that method calls can be chained together.
@@ -1440,7 +1652,7 @@ public interface Builder extends JsonProtocolTestsResponse.Builder, SdkPojo, Cop
          *
          * When the {@link Consumer} completes, {@link StructWithTimestamp.Builder#build()} is called immediately and
          * its result is passed to {@link #structWithNestedTimestampMember(StructWithTimestamp)}.
-         * 
+         *
          * @param structWithNestedTimestampMember
          *        a consumer that will call methods on {@link StructWithTimestamp.Builder}
          * @return Returns a reference to this object so that method calls can be chained together.
@@ -1448,7 +1660,7 @@ public interface Builder extends JsonProtocolTestsResponse.Builder, SdkPojo, Cop
          */
         default Builder structWithNestedTimestampMember(Consumer<StructWithTimestamp.Builder> structWithNestedTimestampMember) {
             return structWithNestedTimestampMember(StructWithTimestamp.builder().applyMutation(structWithNestedTimestampMember)
-                    .build());
+                                                                      .build());
         }
 
         /**
@@ -1477,7 +1689,7 @@ default Builder structWithNestedTimestampMember(Consumer<StructWithTimestamp.Bui
          *
          * When the {@link Consumer} completes, {@link StructWithNestedBlobType.Builder#build()} is called immediately
          * and its result is passed to {@link #structWithNestedBlob(StructWithNestedBlobType)}.
-         * 
+         *
          * @param structWithNestedBlob
          *        a consumer that will call methods on {@link StructWithNestedBlobType.Builder}
          * @return Returns a reference to this object so that method calls can be chained together.
@@ -1531,7 +1743,7 @@ default Builder structWithNestedBlob(Consumer<StructWithNestedBlobType.Builder>
          *
          * When the {@link Consumer} completes, {@link RecursiveStructType.Builder#build()} is called immediately and
          * its result is passed to {@link #recursiveStruct(RecursiveStructType)}.
-         * 
+         *
          * @param recursiveStruct
          *        a consumer that will call methods on {@link RecursiveStructType.Builder}
          * @return Returns a reference to this object so that method calls can be chained together.
@@ -1558,7 +1770,7 @@ default Builder recursiveStruct(Consumer<RecursiveStructType.Builder> recursiveS
          *
          * When the {@link Consumer} completes, {@link BaseType.Builder#build()} is called immediately and its result is
          * passed to {@link #polymorphicTypeWithSubTypes(BaseType)}.
-         * 
+         *
          * @param polymorphicTypeWithSubTypes
          *        a consumer that will call methods on {@link BaseType.Builder}
          * @return Returns a reference to this object so that method calls can be chained together.
@@ -1585,7 +1797,7 @@ default Builder polymorphicTypeWithSubTypes(Consumer<BaseType.Builder> polymorph
          *
          * When the {@link Consumer} completes, {@link SubTypeOne.Builder#build()} is called immediately and its result
          * is passed to {@link #polymorphicTypeWithoutSubTypes(SubTypeOne)}.
-         * 
+         *
          * @param polymorphicTypeWithoutSubTypes
          *        a consumer that will call methods on {@link SubTypeOne.Builder}
          * @return Returns a reference to this object so that method calls can be chained together.
@@ -1878,7 +2090,7 @@ public final void setListOfMaps(Collection<? extends Map<String, String>> listOf
 
         public final Collection<SimpleStruct.Builder> getListOfStructs() {
             return listOfStructs != null ? listOfStructs.stream().map(SimpleStruct::toBuilder).collect(Collectors.toList())
-                    : null;
+                                         : null;
         }
 
         @Override
@@ -1898,7 +2110,7 @@ public final Builder listOfStructs(SimpleStruct... listOfStructs) {
         @SafeVarargs
         public final Builder listOfStructs(Consumer<SimpleStruct.Builder>... listOfStructs) {
             listOfStructs(Stream.of(listOfStructs).map(c -> SimpleStruct.builder().applyMutation(c).build())
-                    .collect(Collectors.toList()));
+                                .collect(Collectors.toList()));
             return this;
         }
 
@@ -1957,7 +2169,7 @@ public final void setMapOfStringToString(Map<String, String> mapOfStringToString
 
         public final Map<String, SimpleStruct.Builder> getMapOfStringToSimpleStruct() {
             return mapOfStringToSimpleStruct != null ? CollectionUtils.mapValues(mapOfStringToSimpleStruct,
-                    SimpleStruct::toBuilder) : null;
+                                                                                 SimpleStruct::toBuilder) : null;
         }
 
         @Override
@@ -2032,7 +2244,7 @@ public final void setMapOfStringToEnumWithStrings(Map<String, String> mapOfStrin
 
         public final Map<String, SimpleStruct.Builder> getMapOfEnumToSimpleStructAsStrings() {
             return mapOfEnumToSimpleStruct != null ? CollectionUtils.mapValues(mapOfEnumToSimpleStruct, SimpleStruct::toBuilder)
-                    : null;
+                                                   : null;
         }
 
         @Override
@@ -2117,7 +2329,7 @@ public final Builder structWithNestedTimestampMember(StructWithTimestamp structW
 
         public final void setStructWithNestedTimestampMember(StructWithTimestamp.BuilderImpl structWithNestedTimestampMember) {
             this.structWithNestedTimestampMember = structWithNestedTimestampMember != null ? structWithNestedTimestampMember
-                    .build() : null;
+                .build() : null;
         }
 
         public final ByteBuffer getBlobArg() {
@@ -2150,7 +2362,7 @@ public final void setStructWithNestedBlob(StructWithNestedBlobType.BuilderImpl s
 
         public final Map<String, ByteBuffer> getBlobMap() {
             return blobMap == null ? null : blobMap.entrySet().stream()
-                    .collect(Collectors.toMap(e -> e.getKey(), e -> e.getValue().asByteBuffer()));
+                                                   .collect(Collectors.toMap(e -> e.getKey(), e -> e.getValue().asByteBuffer()));
         }
 
         @Override
@@ -2161,7 +2373,7 @@ public final Builder blobMap(Map<String, SdkBytes> blobMap) {
 
         public final void setBlobMap(Map<String, ByteBuffer> blobMap) {
             blobMap(blobMap == null ? null : blobMap.entrySet().stream()
-                    .collect(Collectors.toMap(e -> e.getKey(), e -> SdkBytes.fromByteBuffer(e.getValue()))));
+                                                    .collect(Collectors.toMap(e -> e.getKey(), e -> SdkBytes.fromByteBuffer(e.getValue()))));
         }
 
         public final List<ByteBuffer> getListOfBlobs() {
@@ -2183,7 +2395,7 @@ public final Builder listOfBlobs(SdkBytes... listOfBlobs) {
 
         public final void setListOfBlobs(Collection<ByteBuffer> listOfBlobs) {
             listOfBlobs(listOfBlobs == null ? null : listOfBlobs.stream().map(SdkBytes::fromByteBuffer)
-                    .collect(Collectors.toList()));
+                                                                .collect(Collectors.toList()));
         }
 
         public final RecursiveStructType.Builder getRecursiveStruct() {
@@ -2226,7 +2438,7 @@ public final Builder polymorphicTypeWithoutSubTypes(SubTypeOne polymorphicTypeWi
 
         public final void setPolymorphicTypeWithoutSubTypes(SubTypeOne.BuilderImpl polymorphicTypeWithoutSubTypes) {
             this.polymorphicTypeWithoutSubTypes = polymorphicTypeWithoutSubTypes != null ? polymorphicTypeWithoutSubTypes.build()
-                    : null;
+                                                                                         : null;
         }
 
         public final String getEnumTypeAsString() {
diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/nonautoconstructcontainers/existencechecknamingrequest.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/nonautoconstructcontainers/existencechecknamingrequest.java
new file mode 100644
index 000000000000..b3fcf025dd2e
--- /dev/null
+++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/nonautoconstructcontainers/existencechecknamingrequest.java
@@ -0,0 +1,454 @@
+package software.amazon.awssdk.services.jsonprotocoltests.model;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.function.BiConsumer;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import software.amazon.awssdk.annotations.Generated;
+import software.amazon.awssdk.awscore.AwsRequestOverrideConfiguration;
+import software.amazon.awssdk.core.SdkField;
+import software.amazon.awssdk.core.SdkPojo;
+import software.amazon.awssdk.core.protocol.MarshallLocation;
+import software.amazon.awssdk.core.protocol.MarshallingType;
+import software.amazon.awssdk.core.traits.ListTrait;
+import software.amazon.awssdk.core.traits.LocationTrait;
+import software.amazon.awssdk.core.traits.MapTrait;
+import software.amazon.awssdk.core.util.SdkAutoConstructList;
+import software.amazon.awssdk.core.util.SdkAutoConstructMap;
+import software.amazon.awssdk.utils.ToString;
+import software.amazon.awssdk.utils.builder.CopyableBuilder;
+import software.amazon.awssdk.utils.builder.ToCopyableBuilder;
+
+/**
+ */
+@Generated("software.amazon.awssdk:codegen")
+public final class ExistenceCheckNamingRequest extends JsonProtocolTestsRequest implements
+                                                                                ToCopyableBuilder<ExistenceCheckNamingRequest.Builder, ExistenceCheckNamingRequest> {
+    private static final SdkField<List<String>> BUILD_FIELD = SdkField
+        .<List<String>> builder(MarshallingType.LIST)
+        .getter(getter(ExistenceCheckNamingRequest::build))
+        .setter(setter(Builder::build))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("Build").build(),
+                ListTrait
+                    .builder()
+                    .memberLocationName(null)
+                    .memberFieldInfo(
+                        SdkField.<String> builder(MarshallingType.STRING)
+                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
+                                                 .locationName("member").build()).build()).build()).build();
+
+    private static final SdkField<List<String>> SUPER_FIELD = SdkField
+        .<List<String>> builder(MarshallingType.LIST)
+        .getter(getter(ExistenceCheckNamingRequest::superValue))
+        .setter(setter(Builder::superValue))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("super").build(),
+                ListTrait
+                    .builder()
+                    .memberLocationName(null)
+                    .memberFieldInfo(
+                        SdkField.<String> builder(MarshallingType.STRING)
+                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
+                                                 .locationName("member").build()).build()).build()).build();
+
+    private static final SdkField<Map<String, String>> TO_STRING_FIELD = SdkField
+        .<Map<String, String>> builder(MarshallingType.MAP)
+        .getter(getter(ExistenceCheckNamingRequest::toStringValue))
+        .setter(setter(Builder::toStringValue))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("toString").build(),
+                MapTrait.builder()
+                        .keyLocationName("key")
+                        .valueLocationName("value")
+                        .valueFieldInfo(
+                            SdkField.<String> builder(MarshallingType.STRING)
+                                .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
+                                                     .locationName("value").build()).build()).build()).build();
+
+    private static final SdkField<Map<String, String>> EQUALS_FIELD = SdkField
+        .<Map<String, String>> builder(MarshallingType.MAP)
+        .getter(getter(ExistenceCheckNamingRequest::equalsValue))
+        .setter(setter(Builder::equalsValue))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("equals").build(),
+                MapTrait.builder()
+                        .keyLocationName("key")
+                        .valueLocationName("value")
+                        .valueFieldInfo(
+                            SdkField.<String> builder(MarshallingType.STRING)
+                                .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
+                                                     .locationName("value").build()).build()).build()).build();
+
+    private static final List<SdkField<?>> SDK_FIELDS = Collections.unmodifiableList(Arrays.asList(BUILD_FIELD, SUPER_FIELD,
+                                                                                                   TO_STRING_FIELD, EQUALS_FIELD));
+
+    private final List<String> build;
+
+    private final List<String> superValue;
+
+    private final Map<String, String> toStringValue;
+
+    private final Map<String, String> equalsValue;
+
+    private ExistenceCheckNamingRequest(BuilderImpl builder) {
+        super(builder);
+        this.build = builder.build;
+        this.superValue = builder.superValue;
+        this.toStringValue = builder.toStringValue;
+        this.equalsValue = builder.equalsValue;
+    }
+
+    /**
+     * Returns true if the Build property was specified by the sender (it may be empty), or false if the sender did not
+     * specify the value (it will be empty). For responses returned by the SDK, the sender is the AWS service.
+     */
+    public boolean hasBuild() {
+        return build != null && !(build instanceof SdkAutoConstructList);
+    }
+
+    /**
+     * Returns the value of the Build property for this object.
+     * <p>
+     * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
+     * </p>
+     * <p>
+     * You can use {@link #hasBuild()} to see if a value was sent in this field.
+     * </p>
+     *
+     * @return The value of the Build property for this object.
+     */
+    public List<String> build() {
+        return build;
+    }
+
+    /**
+     * Returns true if the Super property was specified by the sender (it may be empty), or false if the sender did not
+     * specify the value (it will be empty). For responses returned by the SDK, the sender is the AWS service.
+     */
+    public boolean hasSuperValue() {
+        return superValue != null && !(superValue instanceof SdkAutoConstructList);
+    }
+
+    /**
+     * Returns the value of the Super property for this object.
+     * <p>
+     * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
+     * </p>
+     * <p>
+     * You can use {@link #hasSuperValue()} to see if a value was sent in this field.
+     * </p>
+     *
+     * @return The value of the Super property for this object.
+     */
+    public List<String> superValue() {
+        return superValue;
+    }
+
+    /**
+     * Returns true if the ToString property was specified by the sender (it may be empty), or false if the sender did
+     * not specify the value (it will be empty). For responses returned by the SDK, the sender is the AWS service.
+     */
+    public boolean hasToStringValue() {
+        return toStringValue != null && !(toStringValue instanceof SdkAutoConstructMap);
+    }
+
+    /**
+     * Returns the value of the ToString property for this object.
+     * <p>
+     * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
+     * </p>
+     * <p>
+     * You can use {@link #hasToStringValue()} to see if a value was sent in this field.
+     * </p>
+     *
+     * @return The value of the ToString property for this object.
+     */
+    public Map<String, String> toStringValue() {
+        return toStringValue;
+    }
+
+    /**
+     * Returns true if the Equals property was specified by the sender (it may be empty), or false if the sender did not
+     * specify the value (it will be empty). For responses returned by the SDK, the sender is the AWS service.
+     */
+    public boolean hasEqualsValue() {
+        return equalsValue != null && !(equalsValue instanceof SdkAutoConstructMap);
+    }
+
+    /**
+     * Returns the value of the Equals property for this object.
+     * <p>
+     * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
+     * </p>
+     * <p>
+     * You can use {@link #hasEqualsValue()} to see if a value was sent in this field.
+     * </p>
+     *
+     * @return The value of the Equals property for this object.
+     */
+    public Map<String, String> equalsValue() {
+        return equalsValue;
+    }
+
+    @Override
+    public Builder toBuilder() {
+        return new BuilderImpl(this);
+    }
+
+    public static Builder builder() {
+        return new BuilderImpl();
+    }
+
+    public static Class<? extends Builder> serializableBuilderClass() {
+        return BuilderImpl.class;
+    }
+
+    @Override
+    public int hashCode() {
+        int hashCode = 1;
+        hashCode = 31 * hashCode + super.hashCode();
+        hashCode = 31 * hashCode + Objects.hashCode(build());
+        hashCode = 31 * hashCode + Objects.hashCode(superValue());
+        hashCode = 31 * hashCode + Objects.hashCode(toStringValue());
+        hashCode = 31 * hashCode + Objects.hashCode(equalsValue());
+        return hashCode;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        return super.equals(obj) && equalsBySdkFields(obj);
+    }
+
+    @Override
+    public boolean equalsBySdkFields(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (!(obj instanceof ExistenceCheckNamingRequest)) {
+            return false;
+        }
+        ExistenceCheckNamingRequest other = (ExistenceCheckNamingRequest) obj;
+        return Objects.equals(build(), other.build()) && Objects.equals(superValue(), other.superValue())
+               && Objects.equals(toStringValue(), other.toStringValue()) && Objects.equals(equalsValue(), other.equalsValue());
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     */
+    @Override
+    public String toString() {
+        return ToString.builder("ExistenceCheckNamingRequest").add("Build", build()).add("Super", superValue())
+                       .add("ToString", toStringValue()).add("Equals", equalsValue()).build();
+    }
+
+    public <T> Optional<T> getValueForField(String fieldName, Class<T> clazz) {
+        switch (fieldName) {
+            case "Build":
+                return Optional.ofNullable(clazz.cast(build()));
+            case "super":
+                return Optional.ofNullable(clazz.cast(superValue()));
+            case "toString":
+                return Optional.ofNullable(clazz.cast(toStringValue()));
+            case "equals":
+                return Optional.ofNullable(clazz.cast(equalsValue()));
+            default:
+                return Optional.empty();
+        }
+    }
+
+    @Override
+    public List<SdkField<?>> sdkFields() {
+        return SDK_FIELDS;
+    }
+
+    private static <T> Function<Object, T> getter(Function<ExistenceCheckNamingRequest, T> g) {
+        return obj -> g.apply((ExistenceCheckNamingRequest) obj);
+    }
+
+    private static <T> BiConsumer<Object, T> setter(BiConsumer<Builder, T> s) {
+        return (obj, val) -> s.accept((Builder) obj, val);
+    }
+
+    public interface Builder extends JsonProtocolTestsRequest.Builder, SdkPojo,
+                                     CopyableBuilder<Builder, ExistenceCheckNamingRequest> {
+        /**
+         * Sets the value of the Build property for this object.
+         *
+         * @param build
+         *        The new value for the Build property for this object.
+         * @return Returns a reference to this object so that method calls can be chained together.
+         */
+        Builder build(Collection<String> build);
+
+        /**
+         * Sets the value of the Build property for this object.
+         *
+         * @param build
+         *        The new value for the Build property for this object.
+         * @return Returns a reference to this object so that method calls can be chained together.
+         */
+        Builder build(String... build);
+
+        /**
+         * Sets the value of the Super property for this object.
+         *
+         * @param superValue
+         *        The new value for the Super property for this object.
+         * @return Returns a reference to this object so that method calls can be chained together.
+         */
+        Builder superValue(Collection<String> superValue);
+
+        /**
+         * Sets the value of the Super property for this object.
+         *
+         * @param superValue
+         *        The new value for the Super property for this object.
+         * @return Returns a reference to this object so that method calls can be chained together.
+         */
+        Builder superValue(String... superValue);
+
+        /**
+         * Sets the value of the ToString property for this object.
+         *
+         * @param toStringValue
+         *        The new value for the ToString property for this object.
+         * @return Returns a reference to this object so that method calls can be chained together.
+         */
+        Builder toStringValue(Map<String, String> toStringValue);
+
+        /**
+         * Sets the value of the Equals property for this object.
+         *
+         * @param equalsValue
+         *        The new value for the Equals property for this object.
+         * @return Returns a reference to this object so that method calls can be chained together.
+         */
+        Builder equalsValue(Map<String, String> equalsValue);
+
+        @Override
+        Builder overrideConfiguration(AwsRequestOverrideConfiguration overrideConfiguration);
+
+        @Override
+        Builder overrideConfiguration(Consumer<AwsRequestOverrideConfiguration.Builder> builderConsumer);
+    }
+
+    static final class BuilderImpl extends JsonProtocolTestsRequest.BuilderImpl implements Builder {
+        private List<String> build;
+
+        private List<String> superValue;
+
+        private Map<String, String> toStringValue;
+
+        private Map<String, String> equalsValue;
+
+        private BuilderImpl() {
+        }
+
+        private BuilderImpl(ExistenceCheckNamingRequest model) {
+            super(model);
+            build(model.build);
+            superValue(model.superValue);
+            toStringValue(model.toStringValue);
+            equalsValue(model.equalsValue);
+        }
+
+        public final Collection<String> getBuild() {
+            return build;
+        }
+
+        @Override
+        public final Builder build(Collection<String> build) {
+            this.build = ListOfStringsCopier.copy(build);
+            return this;
+        }
+
+        @Override
+        @SafeVarargs
+        public final Builder build(String... build) {
+            build(Arrays.asList(build));
+            return this;
+        }
+
+        public final void setBuild(Collection<String> build) {
+            this.build = ListOfStringsCopier.copy(build);
+        }
+
+        public final Collection<String> getSuperValue() {
+            return superValue;
+        }
+
+        @Override
+        public final Builder superValue(Collection<String> superValue) {
+            this.superValue = ListOfStringsCopier.copy(superValue);
+            return this;
+        }
+
+        @Override
+        @SafeVarargs
+        public final Builder superValue(String... superValue) {
+            superValue(Arrays.asList(superValue));
+            return this;
+        }
+
+        public final void setSuperValue(Collection<String> superValue) {
+            this.superValue = ListOfStringsCopier.copy(superValue);
+        }
+
+        public final Map<String, String> getToStringValue() {
+            return toStringValue;
+        }
+
+        @Override
+        public final Builder toStringValue(Map<String, String> toStringValue) {
+            this.toStringValue = MapOfStringToStringCopier.copy(toStringValue);
+            return this;
+        }
+
+        public final void setToStringValue(Map<String, String> toStringValue) {
+            this.toStringValue = MapOfStringToStringCopier.copy(toStringValue);
+        }
+
+        public final Map<String, String> getEqualsValue() {
+            return equalsValue;
+        }
+
+        @Override
+        public final Builder equalsValue(Map<String, String> equalsValue) {
+            this.equalsValue = MapOfStringToStringCopier.copy(equalsValue);
+            return this;
+        }
+
+        public final void setEqualsValue(Map<String, String> equalsValue) {
+            this.equalsValue = MapOfStringToStringCopier.copy(equalsValue);
+        }
+
+        @Override
+        public Builder overrideConfiguration(AwsRequestOverrideConfiguration overrideConfiguration) {
+            super.overrideConfiguration(overrideConfiguration);
+            return this;
+        }
+
+        @Override
+        public Builder overrideConfiguration(Consumer<AwsRequestOverrideConfiguration.Builder> builderConsumer) {
+            super.overrideConfiguration(builderConsumer);
+            return this;
+        }
+
+        @Override
+        public ExistenceCheckNamingRequest build() {
+            return new ExistenceCheckNamingRequest(this);
+        }
+
+        @Override
+        public List<SdkField<?>> sdkFields() {
+            return SDK_FIELDS;
+        }
+    }
+}
diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/nonautoconstructcontainers/existencechecknamingresponse.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/nonautoconstructcontainers/existencechecknamingresponse.java
new file mode 100644
index 000000000000..240b64882028
--- /dev/null
+++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/nonautoconstructcontainers/existencechecknamingresponse.java
@@ -0,0 +1,434 @@
+package software.amazon.awssdk.services.jsonprotocoltests.model;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.function.BiConsumer;
+import java.util.function.Function;
+import software.amazon.awssdk.annotations.Generated;
+import software.amazon.awssdk.core.SdkField;
+import software.amazon.awssdk.core.SdkPojo;
+import software.amazon.awssdk.core.protocol.MarshallLocation;
+import software.amazon.awssdk.core.protocol.MarshallingType;
+import software.amazon.awssdk.core.traits.ListTrait;
+import software.amazon.awssdk.core.traits.LocationTrait;
+import software.amazon.awssdk.core.traits.MapTrait;
+import software.amazon.awssdk.core.util.SdkAutoConstructList;
+import software.amazon.awssdk.core.util.SdkAutoConstructMap;
+import software.amazon.awssdk.utils.ToString;
+import software.amazon.awssdk.utils.builder.CopyableBuilder;
+import software.amazon.awssdk.utils.builder.ToCopyableBuilder;
+
+/**
+ */
+@Generated("software.amazon.awssdk:codegen")
+public final class ExistenceCheckNamingResponse extends JsonProtocolTestsResponse implements
+                                                                                  ToCopyableBuilder<ExistenceCheckNamingResponse.Builder, ExistenceCheckNamingResponse> {
+    private static final SdkField<List<String>> BUILD_FIELD = SdkField
+        .<List<String>> builder(MarshallingType.LIST)
+        .getter(getter(ExistenceCheckNamingResponse::build))
+        .setter(setter(Builder::build))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("Build").build(),
+                ListTrait
+                    .builder()
+                    .memberLocationName(null)
+                    .memberFieldInfo(
+                        SdkField.<String> builder(MarshallingType.STRING)
+                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
+                                                 .locationName("member").build()).build()).build()).build();
+
+    private static final SdkField<List<String>> SUPER_FIELD = SdkField
+        .<List<String>> builder(MarshallingType.LIST)
+        .getter(getter(ExistenceCheckNamingResponse::superValue))
+        .setter(setter(Builder::superValue))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("super").build(),
+                ListTrait
+                    .builder()
+                    .memberLocationName(null)
+                    .memberFieldInfo(
+                        SdkField.<String> builder(MarshallingType.STRING)
+                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
+                                                 .locationName("member").build()).build()).build()).build();
+
+    private static final SdkField<Map<String, String>> TO_STRING_FIELD = SdkField
+        .<Map<String, String>> builder(MarshallingType.MAP)
+        .getter(getter(ExistenceCheckNamingResponse::toStringValue))
+        .setter(setter(Builder::toStringValue))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("toString").build(),
+                MapTrait.builder()
+                        .keyLocationName("key")
+                        .valueLocationName("value")
+                        .valueFieldInfo(
+                            SdkField.<String> builder(MarshallingType.STRING)
+                                .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
+                                                     .locationName("value").build()).build()).build()).build();
+
+    private static final SdkField<Map<String, String>> EQUALS_FIELD = SdkField
+        .<Map<String, String>> builder(MarshallingType.MAP)
+        .getter(getter(ExistenceCheckNamingResponse::equalsValue))
+        .setter(setter(Builder::equalsValue))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("equals").build(),
+                MapTrait.builder()
+                        .keyLocationName("key")
+                        .valueLocationName("value")
+                        .valueFieldInfo(
+                            SdkField.<String> builder(MarshallingType.STRING)
+                                .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
+                                                     .locationName("value").build()).build()).build()).build();
+
+    private static final List<SdkField<?>> SDK_FIELDS = Collections.unmodifiableList(Arrays.asList(BUILD_FIELD, SUPER_FIELD,
+                                                                                                   TO_STRING_FIELD, EQUALS_FIELD));
+
+    private final List<String> build;
+
+    private final List<String> superValue;
+
+    private final Map<String, String> toStringValue;
+
+    private final Map<String, String> equalsValue;
+
+    private ExistenceCheckNamingResponse(BuilderImpl builder) {
+        super(builder);
+        this.build = builder.build;
+        this.superValue = builder.superValue;
+        this.toStringValue = builder.toStringValue;
+        this.equalsValue = builder.equalsValue;
+    }
+
+    /**
+     * Returns true if the Build property was specified by the sender (it may be empty), or false if the sender did not
+     * specify the value (it will be empty). For responses returned by the SDK, the sender is the AWS service.
+     */
+    public boolean hasBuild() {
+        return build != null && !(build instanceof SdkAutoConstructList);
+    }
+
+    /**
+     * Returns the value of the Build property for this object.
+     * <p>
+     * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
+     * </p>
+     * <p>
+     * You can use {@link #hasBuild()} to see if a value was sent in this field.
+     * </p>
+     *
+     * @return The value of the Build property for this object.
+     */
+    public List<String> build() {
+        return build;
+    }
+
+    /**
+     * Returns true if the Super property was specified by the sender (it may be empty), or false if the sender did not
+     * specify the value (it will be empty). For responses returned by the SDK, the sender is the AWS service.
+     */
+    public boolean hasSuperValue() {
+        return superValue != null && !(superValue instanceof SdkAutoConstructList);
+    }
+
+    /**
+     * Returns the value of the Super property for this object.
+     * <p>
+     * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
+     * </p>
+     * <p>
+     * You can use {@link #hasSuperValue()} to see if a value was sent in this field.
+     * </p>
+     *
+     * @return The value of the Super property for this object.
+     */
+    public List<String> superValue() {
+        return superValue;
+    }
+
+    /**
+     * Returns true if the ToString property was specified by the sender (it may be empty), or false if the sender did
+     * not specify the value (it will be empty). For responses returned by the SDK, the sender is the AWS service.
+     */
+    public boolean hasToStringValue() {
+        return toStringValue != null && !(toStringValue instanceof SdkAutoConstructMap);
+    }
+
+    /**
+     * Returns the value of the ToString property for this object.
+     * <p>
+     * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
+     * </p>
+     * <p>
+     * You can use {@link #hasToStringValue()} to see if a value was sent in this field.
+     * </p>
+     *
+     * @return The value of the ToString property for this object.
+     */
+    public Map<String, String> toStringValue() {
+        return toStringValue;
+    }
+
+    /**
+     * Returns true if the Equals property was specified by the sender (it may be empty), or false if the sender did not
+     * specify the value (it will be empty). For responses returned by the SDK, the sender is the AWS service.
+     */
+    public boolean hasEqualsValue() {
+        return equalsValue != null && !(equalsValue instanceof SdkAutoConstructMap);
+    }
+
+    /**
+     * Returns the value of the Equals property for this object.
+     * <p>
+     * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
+     * </p>
+     * <p>
+     * You can use {@link #hasEqualsValue()} to see if a value was sent in this field.
+     * </p>
+     *
+     * @return The value of the Equals property for this object.
+     */
+    public Map<String, String> equalsValue() {
+        return equalsValue;
+    }
+
+    @Override
+    public Builder toBuilder() {
+        return new BuilderImpl(this);
+    }
+
+    public static Builder builder() {
+        return new BuilderImpl();
+    }
+
+    public static Class<? extends Builder> serializableBuilderClass() {
+        return BuilderImpl.class;
+    }
+
+    @Override
+    public int hashCode() {
+        int hashCode = 1;
+        hashCode = 31 * hashCode + super.hashCode();
+        hashCode = 31 * hashCode + Objects.hashCode(build());
+        hashCode = 31 * hashCode + Objects.hashCode(superValue());
+        hashCode = 31 * hashCode + Objects.hashCode(toStringValue());
+        hashCode = 31 * hashCode + Objects.hashCode(equalsValue());
+        return hashCode;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        return super.equals(obj) && equalsBySdkFields(obj);
+    }
+
+    @Override
+    public boolean equalsBySdkFields(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (!(obj instanceof ExistenceCheckNamingResponse)) {
+            return false;
+        }
+        ExistenceCheckNamingResponse other = (ExistenceCheckNamingResponse) obj;
+        return Objects.equals(build(), other.build()) && Objects.equals(superValue(), other.superValue())
+               && Objects.equals(toStringValue(), other.toStringValue()) && Objects.equals(equalsValue(), other.equalsValue());
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     */
+    @Override
+    public String toString() {
+        return ToString.builder("ExistenceCheckNamingResponse").add("Build", build()).add("Super", superValue())
+                       .add("ToString", toStringValue()).add("Equals", equalsValue()).build();
+    }
+
+    public <T> Optional<T> getValueForField(String fieldName, Class<T> clazz) {
+        switch (fieldName) {
+            case "Build":
+                return Optional.ofNullable(clazz.cast(build()));
+            case "super":
+                return Optional.ofNullable(clazz.cast(superValue()));
+            case "toString":
+                return Optional.ofNullable(clazz.cast(toStringValue()));
+            case "equals":
+                return Optional.ofNullable(clazz.cast(equalsValue()));
+            default:
+                return Optional.empty();
+        }
+    }
+
+    @Override
+    public List<SdkField<?>> sdkFields() {
+        return SDK_FIELDS;
+    }
+
+    private static <T> Function<Object, T> getter(Function<ExistenceCheckNamingResponse, T> g) {
+        return obj -> g.apply((ExistenceCheckNamingResponse) obj);
+    }
+
+    private static <T> BiConsumer<Object, T> setter(BiConsumer<Builder, T> s) {
+        return (obj, val) -> s.accept((Builder) obj, val);
+    }
+
+    public interface Builder extends JsonProtocolTestsResponse.Builder, SdkPojo,
+                                     CopyableBuilder<Builder, ExistenceCheckNamingResponse> {
+        /**
+         * Sets the value of the Build property for this object.
+         *
+         * @param build
+         *        The new value for the Build property for this object.
+         * @return Returns a reference to this object so that method calls can be chained together.
+         */
+        Builder build(Collection<String> build);
+
+        /**
+         * Sets the value of the Build property for this object.
+         *
+         * @param build
+         *        The new value for the Build property for this object.
+         * @return Returns a reference to this object so that method calls can be chained together.
+         */
+        Builder build(String... build);
+
+        /**
+         * Sets the value of the Super property for this object.
+         *
+         * @param superValue
+         *        The new value for the Super property for this object.
+         * @return Returns a reference to this object so that method calls can be chained together.
+         */
+        Builder superValue(Collection<String> superValue);
+
+        /**
+         * Sets the value of the Super property for this object.
+         *
+         * @param superValue
+         *        The new value for the Super property for this object.
+         * @return Returns a reference to this object so that method calls can be chained together.
+         */
+        Builder superValue(String... superValue);
+
+        /**
+         * Sets the value of the ToString property for this object.
+         *
+         * @param toStringValue
+         *        The new value for the ToString property for this object.
+         * @return Returns a reference to this object so that method calls can be chained together.
+         */
+        Builder toStringValue(Map<String, String> toStringValue);
+
+        /**
+         * Sets the value of the Equals property for this object.
+         *
+         * @param equalsValue
+         *        The new value for the Equals property for this object.
+         * @return Returns a reference to this object so that method calls can be chained together.
+         */
+        Builder equalsValue(Map<String, String> equalsValue);
+    }
+
+    static final class BuilderImpl extends JsonProtocolTestsResponse.BuilderImpl implements Builder {
+        private List<String> build;
+
+        private List<String> superValue;
+
+        private Map<String, String> toStringValue;
+
+        private Map<String, String> equalsValue;
+
+        private BuilderImpl() {
+        }
+
+        private BuilderImpl(ExistenceCheckNamingResponse model) {
+            super(model);
+            build(model.build);
+            superValue(model.superValue);
+            toStringValue(model.toStringValue);
+            equalsValue(model.equalsValue);
+        }
+
+        public final Collection<String> getBuild() {
+            return build;
+        }
+
+        @Override
+        public final Builder build(Collection<String> build) {
+            this.build = ListOfStringsCopier.copy(build);
+            return this;
+        }
+
+        @Override
+        @SafeVarargs
+        public final Builder build(String... build) {
+            build(Arrays.asList(build));
+            return this;
+        }
+
+        public final void setBuild(Collection<String> build) {
+            this.build = ListOfStringsCopier.copy(build);
+        }
+
+        public final Collection<String> getSuperValue() {
+            return superValue;
+        }
+
+        @Override
+        public final Builder superValue(Collection<String> superValue) {
+            this.superValue = ListOfStringsCopier.copy(superValue);
+            return this;
+        }
+
+        @Override
+        @SafeVarargs
+        public final Builder superValue(String... superValue) {
+            superValue(Arrays.asList(superValue));
+            return this;
+        }
+
+        public final void setSuperValue(Collection<String> superValue) {
+            this.superValue = ListOfStringsCopier.copy(superValue);
+        }
+
+        public final Map<String, String> getToStringValue() {
+            return toStringValue;
+        }
+
+        @Override
+        public final Builder toStringValue(Map<String, String> toStringValue) {
+            this.toStringValue = MapOfStringToStringCopier.copy(toStringValue);
+            return this;
+        }
+
+        public final void setToStringValue(Map<String, String> toStringValue) {
+            this.toStringValue = MapOfStringToStringCopier.copy(toStringValue);
+        }
+
+        public final Map<String, String> getEqualsValue() {
+            return equalsValue;
+        }
+
+        @Override
+        public final Builder equalsValue(Map<String, String> equalsValue) {
+            this.equalsValue = MapOfStringToStringCopier.copy(equalsValue);
+            return this;
+        }
+
+        public final void setEqualsValue(Map<String, String> equalsValue) {
+            this.equalsValue = MapOfStringToStringCopier.copy(equalsValue);
+        }
+
+        @Override
+        public ExistenceCheckNamingResponse build() {
+            return new ExistenceCheckNamingResponse(this);
+        }
+
+        @Override
+        public List<SdkField<?>> sdkFields() {
+            return SDK_FIELDS;
+        }
+    }
+}
diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/nonautoconstructcontainers/nestedcontainersrequest.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/nonautoconstructcontainers/nestedcontainersrequest.java
index 76a751608e17..38e5650c3b77 100644
--- a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/nonautoconstructcontainers/nestedcontainersrequest.java
+++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/nonautoconstructcontainers/nestedcontainersrequest.java
@@ -19,6 +19,8 @@
 import software.amazon.awssdk.core.traits.ListTrait;
 import software.amazon.awssdk.core.traits.LocationTrait;
 import software.amazon.awssdk.core.traits.MapTrait;
+import software.amazon.awssdk.core.util.SdkAutoConstructList;
+import software.amazon.awssdk.core.util.SdkAutoConstructMap;
 import software.amazon.awssdk.utils.ToString;
 import software.amazon.awssdk.utils.builder.CopyableBuilder;
 import software.amazon.awssdk.utils.builder.ToCopyableBuilder;
@@ -139,11 +141,23 @@ private NestedContainersRequest(BuilderImpl builder) {
         this.mapOfStringToListOfListOfStrings = builder.mapOfStringToListOfListOfStrings;
     }
 
+    /**
+     * Returns true if the ListOfListOfStrings property was specified by the sender (it may be empty), or false if the
+     * sender did not specify the value (it will be empty). For responses returned by the SDK, the sender is the AWS
+     * service.
+     */
+    public boolean hasListOfListOfStrings() {
+        return listOfListOfStrings != null && !(listOfListOfStrings instanceof SdkAutoConstructList);
+    }
+
     /**
      * Returns the value of the ListOfListOfStrings property for this object.
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
+     * <p>
+     * You can use {@link #hasListOfListOfStrings()} to see if a value was sent in this field.
+     * </p>
      *
      * @return The value of the ListOfListOfStrings property for this object.
      */
@@ -151,11 +165,23 @@ public List<List<String>> listOfListOfStrings() {
         return listOfListOfStrings;
     }
 
+    /**
+     * Returns true if the ListOfListOfListOfStrings property was specified by the sender (it may be empty), or false if
+     * the sender did not specify the value (it will be empty). For responses returned by the SDK, the sender is the AWS
+     * service.
+     */
+    public boolean hasListOfListOfListOfStrings() {
+        return listOfListOfListOfStrings != null && !(listOfListOfListOfStrings instanceof SdkAutoConstructList);
+    }
+
     /**
      * Returns the value of the ListOfListOfListOfStrings property for this object.
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
+     * <p>
+     * You can use {@link #hasListOfListOfListOfStrings()} to see if a value was sent in this field.
+     * </p>
      *
      * @return The value of the ListOfListOfListOfStrings property for this object.
      */
@@ -163,11 +189,23 @@ public List<List<List<String>>> listOfListOfListOfStrings() {
         return listOfListOfListOfStrings;
     }
 
+    /**
+     * Returns true if the MapOfStringToListOfListOfStrings property was specified by the sender (it may be empty), or
+     * false if the sender did not specify the value (it will be empty). For responses returned by the SDK, the sender
+     * is the AWS service.
+     */
+    public boolean hasMapOfStringToListOfListOfStrings() {
+        return mapOfStringToListOfListOfStrings != null && !(mapOfStringToListOfListOfStrings instanceof SdkAutoConstructMap);
+    }
+
     /**
      * Returns the value of the MapOfStringToListOfListOfStrings property for this object.
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
+     * <p>
+     * You can use {@link #hasMapOfStringToListOfListOfStrings()} to see if a value was sent in this field.
+     * </p>
      *
      * @return The value of the MapOfStringToListOfListOfStrings property for this object.
      */
diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/nonautoconstructcontainers/nestedcontainersresponse.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/nonautoconstructcontainers/nestedcontainersresponse.java
index 546300f1a288..5a6ce5eb91b9 100644
--- a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/nonautoconstructcontainers/nestedcontainersresponse.java
+++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/nonautoconstructcontainers/nestedcontainersresponse.java
@@ -17,6 +17,8 @@
 import software.amazon.awssdk.core.traits.ListTrait;
 import software.amazon.awssdk.core.traits.LocationTrait;
 import software.amazon.awssdk.core.traits.MapTrait;
+import software.amazon.awssdk.core.util.SdkAutoConstructList;
+import software.amazon.awssdk.core.util.SdkAutoConstructMap;
 import software.amazon.awssdk.utils.ToString;
 import software.amazon.awssdk.utils.builder.CopyableBuilder;
 import software.amazon.awssdk.utils.builder.ToCopyableBuilder;
@@ -137,11 +139,23 @@ private NestedContainersResponse(BuilderImpl builder) {
         this.mapOfStringToListOfListOfStrings = builder.mapOfStringToListOfListOfStrings;
     }
 
+    /**
+     * Returns true if the ListOfListOfStrings property was specified by the sender (it may be empty), or false if the
+     * sender did not specify the value (it will be empty). For responses returned by the SDK, the sender is the AWS
+     * service.
+     */
+    public boolean hasListOfListOfStrings() {
+        return listOfListOfStrings != null && !(listOfListOfStrings instanceof SdkAutoConstructList);
+    }
+
     /**
      * Returns the value of the ListOfListOfStrings property for this object.
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
+     * <p>
+     * You can use {@link #hasListOfListOfStrings()} to see if a value was sent in this field.
+     * </p>
      *
      * @return The value of the ListOfListOfStrings property for this object.
      */
@@ -149,11 +163,23 @@ public List<List<String>> listOfListOfStrings() {
         return listOfListOfStrings;
     }
 
+    /**
+     * Returns true if the ListOfListOfListOfStrings property was specified by the sender (it may be empty), or false if
+     * the sender did not specify the value (it will be empty). For responses returned by the SDK, the sender is the AWS
+     * service.
+     */
+    public boolean hasListOfListOfListOfStrings() {
+        return listOfListOfListOfStrings != null && !(listOfListOfListOfStrings instanceof SdkAutoConstructList);
+    }
+
     /**
      * Returns the value of the ListOfListOfListOfStrings property for this object.
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
+     * <p>
+     * You can use {@link #hasListOfListOfListOfStrings()} to see if a value was sent in this field.
+     * </p>
      *
      * @return The value of the ListOfListOfListOfStrings property for this object.
      */
@@ -161,11 +187,23 @@ public List<List<List<String>>> listOfListOfListOfStrings() {
         return listOfListOfListOfStrings;
     }
 
+    /**
+     * Returns true if the MapOfStringToListOfListOfStrings property was specified by the sender (it may be empty), or
+     * false if the sender did not specify the value (it will be empty). For responses returned by the SDK, the sender
+     * is the AWS service.
+     */
+    public boolean hasMapOfStringToListOfListOfStrings() {
+        return mapOfStringToListOfListOfStrings != null && !(mapOfStringToListOfListOfStrings instanceof SdkAutoConstructMap);
+    }
+
     /**
      * Returns the value of the MapOfStringToListOfListOfStrings property for this object.
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
+     * <p>
+     * You can use {@link #hasMapOfStringToListOfListOfStrings()} to see if a value was sent in this field.
+     * </p>
      *
      * @return The value of the MapOfStringToListOfListOfStrings property for this object.
      */
diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/nonautoconstructcontainers/recursivestructtype.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/nonautoconstructcontainers/recursivestructtype.java
index 670d19192b10..3debfa54135e 100644
--- a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/nonautoconstructcontainers/recursivestructtype.java
+++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/nonautoconstructcontainers/recursivestructtype.java
@@ -21,6 +21,8 @@
 import software.amazon.awssdk.core.traits.ListTrait;
 import software.amazon.awssdk.core.traits.LocationTrait;
 import software.amazon.awssdk.core.traits.MapTrait;
+import software.amazon.awssdk.core.util.SdkAutoConstructList;
+import software.amazon.awssdk.core.util.SdkAutoConstructMap;
 import software.amazon.awssdk.utils.CollectionUtils;
 import software.amazon.awssdk.utils.ToString;
 import software.amazon.awssdk.utils.builder.CopyableBuilder;
@@ -106,11 +108,22 @@ public RecursiveStructType recursiveStruct() {
         return recursiveStruct;
     }
 
+    /**
+     * Returns true if the RecursiveList property was specified by the sender (it may be empty), or false if the sender
+     * did not specify the value (it will be empty). For responses returned by the SDK, the sender is the AWS service.
+     */
+    public boolean hasRecursiveList() {
+        return recursiveList != null && !(recursiveList instanceof SdkAutoConstructList);
+    }
+
     /**
      * Returns the value of the RecursiveList property for this object.
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
+     * <p>
+     * You can use {@link #hasRecursiveList()} to see if a value was sent in this field.
+     * </p>
      *
      * @return The value of the RecursiveList property for this object.
      */
@@ -118,11 +131,22 @@ public List<RecursiveStructType> recursiveList() {
         return recursiveList;
     }
 
+    /**
+     * Returns true if the RecursiveMap property was specified by the sender (it may be empty), or false if the sender
+     * did not specify the value (it will be empty). For responses returned by the SDK, the sender is the AWS service.
+     */
+    public boolean hasRecursiveMap() {
+        return recursiveMap != null && !(recursiveMap instanceof SdkAutoConstructMap);
+    }
+
     /**
      * Returns the value of the RecursiveMap property for this object.
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
+     * <p>
+     * You can use {@link #hasRecursiveMap()} to see if a value was sent in this field.
+     * </p>
      *
      * @return The value of the RecursiveMap property for this object.
      */
@@ -395,4 +419,3 @@ public List<SdkField<?>> sdkFields() {
         }
     }
 }
-
diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/recursivestructtype.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/recursivestructtype.java
index b50935ab7279..c8be308b6e77 100644
--- a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/recursivestructtype.java
+++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/recursivestructtype.java
@@ -23,6 +23,8 @@
 import software.amazon.awssdk.core.traits.MapTrait;
 import software.amazon.awssdk.core.util.DefaultSdkAutoConstructList;
 import software.amazon.awssdk.core.util.DefaultSdkAutoConstructMap;
+import software.amazon.awssdk.core.util.SdkAutoConstructList;
+import software.amazon.awssdk.core.util.SdkAutoConstructMap;
 import software.amazon.awssdk.utils.CollectionUtils;
 import software.amazon.awssdk.utils.ToString;
 import software.amazon.awssdk.utils.builder.CopyableBuilder;
@@ -32,46 +34,46 @@
  */
 @Generated("software.amazon.awssdk:codegen")
 public final class RecursiveStructType implements SdkPojo, Serializable,
-        ToCopyableBuilder<RecursiveStructType.Builder, RecursiveStructType> {
+                                                  ToCopyableBuilder<RecursiveStructType.Builder, RecursiveStructType> {
     private static final SdkField<String> NO_RECURSE_FIELD = SdkField.<String> builder(MarshallingType.STRING)
-            .getter(getter(RecursiveStructType::noRecurse)).setter(setter(Builder::noRecurse))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("NoRecurse").build()).build();
+        .getter(getter(RecursiveStructType::noRecurse)).setter(setter(Builder::noRecurse))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("NoRecurse").build()).build();
 
     private static final SdkField<RecursiveStructType> RECURSIVE_STRUCT_FIELD = SdkField
-            .<RecursiveStructType> builder(MarshallingType.SDK_POJO).getter(getter(RecursiveStructType::recursiveStruct))
-            .setter(setter(Builder::recursiveStruct)).constructor(RecursiveStructType::builder)
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("RecursiveStruct").build()).build();
+        .<RecursiveStructType> builder(MarshallingType.SDK_POJO).getter(getter(RecursiveStructType::recursiveStruct))
+                                                                .setter(setter(Builder::recursiveStruct)).constructor(RecursiveStructType::builder)
+                                                                .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("RecursiveStruct").build()).build();
 
     private static final SdkField<List<RecursiveStructType>> RECURSIVE_LIST_FIELD = SdkField
-            .<List<RecursiveStructType>> builder(MarshallingType.LIST)
-            .getter(getter(RecursiveStructType::recursiveList))
-            .setter(setter(Builder::recursiveList))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("RecursiveList").build(),
-                    ListTrait
-                            .builder()
-                            .memberLocationName(null)
-                            .memberFieldInfo(
-                                    SdkField.<RecursiveStructType> builder(MarshallingType.SDK_POJO)
-                                            .constructor(RecursiveStructType::builder)
-                                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
-                                                    .locationName("member").build()).build()).build()).build();
+        .<List<RecursiveStructType>> builder(MarshallingType.LIST)
+        .getter(getter(RecursiveStructType::recursiveList))
+        .setter(setter(Builder::recursiveList))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("RecursiveList").build(),
+                ListTrait
+                    .builder()
+                    .memberLocationName(null)
+                    .memberFieldInfo(
+                        SdkField.<RecursiveStructType> builder(MarshallingType.SDK_POJO)
+                            .constructor(RecursiveStructType::builder)
+                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
+                                                 .locationName("member").build()).build()).build()).build();
 
     private static final SdkField<Map<String, RecursiveStructType>> RECURSIVE_MAP_FIELD = SdkField
-            .<Map<String, RecursiveStructType>> builder(MarshallingType.MAP)
-            .getter(getter(RecursiveStructType::recursiveMap))
-            .setter(setter(Builder::recursiveMap))
-            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("RecursiveMap").build(),
-                    MapTrait.builder()
-                            .keyLocationName("key")
-                            .valueLocationName("value")
-                            .valueFieldInfo(
-                                    SdkField.<RecursiveStructType> builder(MarshallingType.SDK_POJO)
-                                            .constructor(RecursiveStructType::builder)
-                                            .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
-                                                    .locationName("value").build()).build()).build()).build();
+        .<Map<String, RecursiveStructType>> builder(MarshallingType.MAP)
+        .getter(getter(RecursiveStructType::recursiveMap))
+        .setter(setter(Builder::recursiveMap))
+        .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD).locationName("RecursiveMap").build(),
+                MapTrait.builder()
+                        .keyLocationName("key")
+                        .valueLocationName("value")
+                        .valueFieldInfo(
+                            SdkField.<RecursiveStructType> builder(MarshallingType.SDK_POJO)
+                                .constructor(RecursiveStructType::builder)
+                                .traits(LocationTrait.builder().location(MarshallLocation.PAYLOAD)
+                                                     .locationName("value").build()).build()).build()).build();
 
     private static final List<SdkField<?>> SDK_FIELDS = Collections.unmodifiableList(Arrays.asList(NO_RECURSE_FIELD,
-            RECURSIVE_STRUCT_FIELD, RECURSIVE_LIST_FIELD, RECURSIVE_MAP_FIELD));
+                                                                                                   RECURSIVE_STRUCT_FIELD, RECURSIVE_LIST_FIELD, RECURSIVE_MAP_FIELD));
 
     private static final long serialVersionUID = 1L;
 
@@ -92,7 +94,7 @@ private RecursiveStructType(BuilderImpl builder) {
 
     /**
      * Returns the value of the NoRecurse property for this object.
-     * 
+     *
      * @return The value of the NoRecurse property for this object.
      */
     public String noRecurse() {
@@ -101,31 +103,53 @@ public String noRecurse() {
 
     /**
      * Returns the value of the RecursiveStruct property for this object.
-     * 
+     *
      * @return The value of the RecursiveStruct property for this object.
      */
     public RecursiveStructType recursiveStruct() {
         return recursiveStruct;
     }
 
+    /**
+     * Returns true if the RecursiveList property was specified by the sender (it may be empty), or false if the sender
+     * did not specify the value (it will be empty). For responses returned by the SDK, the sender is the AWS service.
+     */
+    public boolean hasRecursiveList() {
+        return recursiveList != null && !(recursiveList instanceof SdkAutoConstructList);
+    }
+
     /**
      * Returns the value of the RecursiveList property for this object.
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
-     * 
+     * <p>
+     * You can use {@link #hasRecursiveList()} to see if a value was sent in this field.
+     * </p>
+     *
      * @return The value of the RecursiveList property for this object.
      */
     public List<RecursiveStructType> recursiveList() {
         return recursiveList;
     }
 
+    /**
+     * Returns true if the RecursiveMap property was specified by the sender (it may be empty), or false if the sender
+     * did not specify the value (it will be empty). For responses returned by the SDK, the sender is the AWS service.
+     */
+    public boolean hasRecursiveMap() {
+        return recursiveMap != null && !(recursiveMap instanceof SdkAutoConstructMap);
+    }
+
     /**
      * Returns the value of the RecursiveMap property for this object.
      * <p>
      * Attempts to modify the collection returned by this method will result in an UnsupportedOperationException.
      * </p>
-     * 
+     * <p>
+     * You can use {@link #hasRecursiveMap()} to see if a value was sent in this field.
+     * </p>
+     *
      * @return The value of the RecursiveMap property for this object.
      */
     public Map<String, RecursiveStructType> recursiveMap() {
@@ -173,7 +197,7 @@ public boolean equalsBySdkFields(Object obj) {
         }
         RecursiveStructType other = (RecursiveStructType) obj;
         return Objects.equals(noRecurse(), other.noRecurse()) && Objects.equals(recursiveStruct(), other.recursiveStruct())
-                && Objects.equals(recursiveList(), other.recursiveList()) && Objects.equals(recursiveMap(), other.recursiveMap());
+               && Objects.equals(recursiveList(), other.recursiveList()) && Objects.equals(recursiveMap(), other.recursiveMap());
     }
 
     /**
@@ -183,21 +207,21 @@ public boolean equalsBySdkFields(Object obj) {
     @Override
     public String toString() {
         return ToString.builder("RecursiveStructType").add("NoRecurse", noRecurse()).add("RecursiveStruct", recursiveStruct())
-                .add("RecursiveList", recursiveList()).add("RecursiveMap", recursiveMap()).build();
+                       .add("RecursiveList", recursiveList()).add("RecursiveMap", recursiveMap()).build();
     }
 
     public <T> Optional<T> getValueForField(String fieldName, Class<T> clazz) {
         switch (fieldName) {
-        case "NoRecurse":
-            return Optional.ofNullable(clazz.cast(noRecurse()));
-        case "RecursiveStruct":
-            return Optional.ofNullable(clazz.cast(recursiveStruct()));
-        case "RecursiveList":
-            return Optional.ofNullable(clazz.cast(recursiveList()));
-        case "RecursiveMap":
-            return Optional.ofNullable(clazz.cast(recursiveMap()));
-        default:
-            return Optional.empty();
+            case "NoRecurse":
+                return Optional.ofNullable(clazz.cast(noRecurse()));
+            case "RecursiveStruct":
+                return Optional.ofNullable(clazz.cast(recursiveStruct()));
+            case "RecursiveList":
+                return Optional.ofNullable(clazz.cast(recursiveList()));
+            case "RecursiveMap":
+                return Optional.ofNullable(clazz.cast(recursiveMap()));
+            default:
+                return Optional.empty();
         }
     }
 
@@ -241,7 +265,7 @@ public interface Builder extends SdkPojo, CopyableBuilder<Builder, RecursiveStru
          *
          * When the {@link Consumer} completes, {@link RecursiveStructType.Builder#build()} is called immediately and
          * its result is passed to {@link #recursiveStruct(RecursiveStructType)}.
-         * 
+         *
          * @param recursiveStruct
          *        a consumer that will call methods on {@link RecursiveStructType.Builder}
          * @return Returns a reference to this object so that method calls can be chained together.
@@ -277,7 +301,7 @@ default Builder recursiveStruct(Consumer<Builder> recursiveStruct) {
          *
          * When the {@link Consumer} completes, {@link List<RecursiveStructType>.Builder#build()} is called immediately
          * and its result is passed to {@link #recursiveList(List<RecursiveStructType>)}.
-         * 
+         *
          * @param recursiveList
          *        a consumer that will call methods on {@link List<RecursiveStructType>.Builder}
          * @return Returns a reference to this object so that method calls can be chained together.
@@ -344,7 +368,7 @@ public final void setRecursiveStruct(BuilderImpl recursiveStruct) {
 
         public final Collection<Builder> getRecursiveList() {
             return recursiveList != null ? recursiveList.stream().map(RecursiveStructType::toBuilder)
-                    .collect(Collectors.toList()) : null;
+                                                        .collect(Collectors.toList()) : null;
         }
 
         @Override
@@ -364,7 +388,7 @@ public final Builder recursiveList(RecursiveStructType... recursiveList) {
         @SafeVarargs
         public final Builder recursiveList(Consumer<Builder>... recursiveList) {
             recursiveList(Stream.of(recursiveList).map(c -> RecursiveStructType.builder().applyMutation(c).build())
-                    .collect(Collectors.toList()));
+                                .collect(Collectors.toList()));
             return this;
         }
 
diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/service-2.json b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/service-2.json
index 4e14315af1f2..b0e427ae9de6 100644
--- a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/service-2.json
+++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/service-2.json
@@ -42,6 +42,15 @@
         "requestUri":"/"
       }
     },
+    "DeprecatedRename": {
+      "name": "DeprecatedRename",
+      "http": {
+        "method": "POST",
+        "requestUri": "/"
+      },
+      "input": {"shape": "DeprecatedRenameRequest"},
+      "output": {"shape": "DeprecatedRenameResponse"}
+    },
     "StreamingInputOperation":{
       "name":"StreamingInputOperation",
       "http":{
@@ -80,6 +89,19 @@
       "input": {
         "shape": "EventStreamOperationWithOnlyInputRequest"
       }
+    },
+    "ExistenceCheckNaming": {
+      "name": "ExistenceCheckNaming",
+      "http": {
+        "method": "POST",
+        "requestUri": "/2016-03-11/ExistenceCheckNaming"
+      },
+      "input": {
+        "shape": "ExistenceCheckNamingRequest"
+      },
+      "output": {
+        "shape": "ExistenceCheckNamingResponse"
+      }
     }
   },
   "shapes":{
@@ -131,6 +153,20 @@
     },
     "BlobType":{"type":"blob"},
     "Boolean":{"type":"boolean"},
+    "DeprecatedRenameRequest":{
+      "type": "structure",
+      "members": {
+        "OriginalNameNoDeprecation":{"shape": "String"},
+        "OriginalNameDeprecated": {"shape": "String"}
+      }
+    },
+    "DeprecatedRenameResponse":{
+      "type": "structure",
+      "members": {
+        "OriginalNameNoDeprecation":{"shape": "String"},
+        "OriginalNameDeprecated": {"shape": "String"}
+      }
+    },
     "Double":{"type":"double"},
     "EmptyModeledException":{
       "type":"structure",
@@ -138,6 +174,24 @@
       },
       "exception":true
     },
+    "ExistenceCheckNamingRequest": {
+      "type": "structure",
+      "members": {
+        "Build":{"shape": "ListOfStrings"},
+        "super":{"shape": "ListOfStrings"},
+        "toString":{"shape": "MapOfStringToString"},
+        "equals":{"shape": "MapOfStringToString"}
+      }
+    },
+    "ExistenceCheckNamingResponse": {
+      "type": "structure",
+      "members": {
+        "Build":{"shape": "ListOfStrings"},
+        "super":{"shape": "ListOfStrings"},
+        "toString":{"shape": "MapOfStringToString"},
+        "equals":{"shape": "MapOfStringToString"}
+      }
+    },
     "Float":{"type":"float"},
     "IdempotentOperationStructure":{
       "type":"structure",
diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/xmlnamespace/customization.config b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/xmlnamespace/customization.config
new file mode 100644
index 000000000000..5e44eaa81f83
--- /dev/null
+++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/xmlnamespace/customization.config
@@ -0,0 +1,8 @@
+{
+  "blacklistedSimpleMethods": [
+    "allTypes",
+    "nestedContainers",
+    "operationWithNoInputOrOutput",
+    "eventStreamOperation"
+  ]
+}
\ No newline at end of file
diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/paginators/PaginatedOperationWithResultKeyIterable.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/paginators/PaginatedOperationWithResultKeyIterable.java
index 65a3e068c96c..2123bbb49de9 100644
--- a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/paginators/PaginatedOperationWithResultKeyIterable.java
+++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/paginators/PaginatedOperationWithResultKeyIterable.java
@@ -104,7 +104,8 @@ public final SdkIterable<SimpleStruct> items() {
             }
             return Collections.emptyIterator();
         };
-        return PaginatedItemsIterable.builder().pagesIterable(this).itemIteratorFunction(getIterator).build();
+        return PaginatedItemsIterable.<PaginatedOperationWithResultKeyResponse, SimpleStruct> builder().pagesIterable(this)
+                                                                                                       .itemIteratorFunction(getIterator).build();
     }
 
     private class PaginatedOperationWithResultKeyResponseFetcher implements
diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/paginators/customizations/SameTokenPaginationApiIterable.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/paginators/customizations/SameTokenPaginationApiIterable.java
index 038735137696..fa2738b9e8cb 100644
--- a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/paginators/customizations/SameTokenPaginationApiIterable.java
+++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/paginators/customizations/SameTokenPaginationApiIterable.java
@@ -99,7 +99,8 @@ public final SdkIterable<SimpleStruct> items() {
             }
             return Collections.emptyIterator();
         };
-        return PaginatedItemsIterable.builder().pagesIterable(this).itemIteratorFunction(getIterator).build();
+        return PaginatedItemsIterable.<SameTokenPaginationApiResponse, SimpleStruct> builder().pagesIterable(this)
+                                                                                              .itemIteratorFunction(getIterator).build();
     }
 
     private class SameTokenPaginationApiResponseFetcher implements SyncPageFetcher<SameTokenPaginationApiResponse> {
diff --git a/core/annotations/pom.xml b/core/annotations/pom.xml
index 9e821d494405..dc45bde62beb 100644
--- a/core/annotations/pom.xml
+++ b/core/annotations/pom.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ 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.
+  -->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>core</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/core/annotations/src/main/java/software/amazon/awssdk/annotations/Generated.java b/core/annotations/src/main/java/software/amazon/awssdk/annotations/Generated.java
index 82102c3d0924..3c649551a73e 100644
--- a/core/annotations/src/main/java/software/amazon/awssdk/annotations/Generated.java
+++ b/core/annotations/src/main/java/software/amazon/awssdk/annotations/Generated.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/annotations/src/main/java/software/amazon/awssdk/annotations/Immutable.java b/core/annotations/src/main/java/software/amazon/awssdk/annotations/Immutable.java
index 0d98cd4e1b6a..cf172c06a6d8 100644
--- a/core/annotations/src/main/java/software/amazon/awssdk/annotations/Immutable.java
+++ b/core/annotations/src/main/java/software/amazon/awssdk/annotations/Immutable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/annotations/src/main/java/software/amazon/awssdk/annotations/NotThreadSafe.java b/core/annotations/src/main/java/software/amazon/awssdk/annotations/NotThreadSafe.java
index e8097e5683bb..0b43a2f2392a 100644
--- a/core/annotations/src/main/java/software/amazon/awssdk/annotations/NotThreadSafe.java
+++ b/core/annotations/src/main/java/software/amazon/awssdk/annotations/NotThreadSafe.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/annotations/src/main/java/software/amazon/awssdk/annotations/ReviewBeforeRelease.java b/core/annotations/src/main/java/software/amazon/awssdk/annotations/ReviewBeforeRelease.java
index 0cb16ed58688..8c14f26a8fea 100644
--- a/core/annotations/src/main/java/software/amazon/awssdk/annotations/ReviewBeforeRelease.java
+++ b/core/annotations/src/main/java/software/amazon/awssdk/annotations/ReviewBeforeRelease.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/annotations/src/main/java/software/amazon/awssdk/annotations/SdkInternalApi.java b/core/annotations/src/main/java/software/amazon/awssdk/annotations/SdkInternalApi.java
index da18811b4ba8..16117b3bbd1b 100644
--- a/core/annotations/src/main/java/software/amazon/awssdk/annotations/SdkInternalApi.java
+++ b/core/annotations/src/main/java/software/amazon/awssdk/annotations/SdkInternalApi.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/annotations/src/main/java/software/amazon/awssdk/annotations/SdkProtectedApi.java b/core/annotations/src/main/java/software/amazon/awssdk/annotations/SdkProtectedApi.java
index 2f47fff57bdb..edf0580666fe 100644
--- a/core/annotations/src/main/java/software/amazon/awssdk/annotations/SdkProtectedApi.java
+++ b/core/annotations/src/main/java/software/amazon/awssdk/annotations/SdkProtectedApi.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/annotations/src/main/java/software/amazon/awssdk/annotations/SdkPublicApi.java b/core/annotations/src/main/java/software/amazon/awssdk/annotations/SdkPublicApi.java
index 560369ed6652..9a8104527f7a 100644
--- a/core/annotations/src/main/java/software/amazon/awssdk/annotations/SdkPublicApi.java
+++ b/core/annotations/src/main/java/software/amazon/awssdk/annotations/SdkPublicApi.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/annotations/src/main/java/software/amazon/awssdk/annotations/SdkTestInternalApi.java b/core/annotations/src/main/java/software/amazon/awssdk/annotations/SdkTestInternalApi.java
index de45d7345a08..7cc8d4dea5b7 100644
--- a/core/annotations/src/main/java/software/amazon/awssdk/annotations/SdkTestInternalApi.java
+++ b/core/annotations/src/main/java/software/amazon/awssdk/annotations/SdkTestInternalApi.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/annotations/src/main/java/software/amazon/awssdk/annotations/ThreadSafe.java b/core/annotations/src/main/java/software/amazon/awssdk/annotations/ThreadSafe.java
index 972f226428df..0df611a9c101 100644
--- a/core/annotations/src/main/java/software/amazon/awssdk/annotations/ThreadSafe.java
+++ b/core/annotations/src/main/java/software/amazon/awssdk/annotations/ThreadSafe.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/annotations/src/main/java/software/amazon/awssdk/annotations/package-info.java b/core/annotations/src/main/java/software/amazon/awssdk/annotations/package-info.java
index 18e533682f61..06933e2a9790 100644
--- a/core/annotations/src/main/java/software/amazon/awssdk/annotations/package-info.java
+++ b/core/annotations/src/main/java/software/amazon/awssdk/annotations/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/arns/pom.xml b/core/arns/pom.xml
index 6c6fd0dcc55a..85bececede5c 100644
--- a/core/arns/pom.xml
+++ b/core/arns/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>core</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/core/arns/src/main/java/software/amazon/awssdk/arns/Arn.java b/core/arns/src/main/java/software/amazon/awssdk/arns/Arn.java
index 21cb1f12b09d..638c575f0081 100644
--- a/core/arns/src/main/java/software/amazon/awssdk/arns/Arn.java
+++ b/core/arns/src/main/java/software/amazon/awssdk/arns/Arn.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/arns/src/main/java/software/amazon/awssdk/arns/ArnResource.java b/core/arns/src/main/java/software/amazon/awssdk/arns/ArnResource.java
index b46b5ca5cdb1..b3af63262032 100644
--- a/core/arns/src/main/java/software/amazon/awssdk/arns/ArnResource.java
+++ b/core/arns/src/main/java/software/amazon/awssdk/arns/ArnResource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/arns/src/test/java/software/amazon/awssdk/arns/ArnResourceTest.java b/core/arns/src/test/java/software/amazon/awssdk/arns/ArnResourceTest.java
index df2802e5f663..e5fa6c0b6d8d 100644
--- a/core/arns/src/test/java/software/amazon/awssdk/arns/ArnResourceTest.java
+++ b/core/arns/src/test/java/software/amazon/awssdk/arns/ArnResourceTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/arns/src/test/java/software/amazon/awssdk/arns/ArnTest.java b/core/arns/src/test/java/software/amazon/awssdk/arns/ArnTest.java
index 3a922fe8687c..8e5b7061d22a 100644
--- a/core/arns/src/test/java/software/amazon/awssdk/arns/ArnTest.java
+++ b/core/arns/src/test/java/software/amazon/awssdk/arns/ArnTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/auth/pom.xml b/core/auth/pom.xml
index d15231092a22..a3fdd347c4ec 100644
--- a/core/auth/pom.xml
+++ b/core/auth/pom.xml
@@ -1,4 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ 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.
+  -->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -7,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>core</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
 
     <artifactId>auth</artifactId>
diff --git a/core/auth/src/it/java/software/amazon/awssdk/auth/credentials/InstanceProfileCredentialsProviderIntegrationTest.java b/core/auth/src/it/java/software/amazon/awssdk/auth/credentials/InstanceProfileCredentialsProviderIntegrationTest.java
index 189c3e514043..3647d0de88a3 100644
--- a/core/auth/src/it/java/software/amazon/awssdk/auth/credentials/InstanceProfileCredentialsProviderIntegrationTest.java
+++ b/core/auth/src/it/java/software/amazon/awssdk/auth/credentials/InstanceProfileCredentialsProviderIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/AnonymousCredentialsProvider.java b/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/AnonymousCredentialsProvider.java
index 29c1662dd998..b4d7d22f4580 100644
--- a/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/AnonymousCredentialsProvider.java
+++ b/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/AnonymousCredentialsProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/AwsBasicCredentials.java b/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/AwsBasicCredentials.java
index 14f8de09c3ad..794526712339 100644
--- a/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/AwsBasicCredentials.java
+++ b/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/AwsBasicCredentials.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/AwsCredentials.java b/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/AwsCredentials.java
index ecd24408750c..b907d77a892a 100644
--- a/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/AwsCredentials.java
+++ b/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/AwsCredentials.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/AwsCredentialsProvider.java b/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/AwsCredentialsProvider.java
index 095f42741cff..0e8ddb4aad3b 100644
--- a/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/AwsCredentialsProvider.java
+++ b/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/AwsCredentialsProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/AwsCredentialsProviderChain.java b/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/AwsCredentialsProviderChain.java
index 12b58a726ca4..fcc62e51af42 100644
--- a/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/AwsCredentialsProviderChain.java
+++ b/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/AwsCredentialsProviderChain.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -160,7 +160,8 @@ private static final class BuilderImpl implements Builder {
         private Boolean reuseLastProviderEnabled = true;
         private List<AwsCredentialsProvider> credentialsProviders = new ArrayList<>();
 
-        private BuilderImpl() {}
+        private BuilderImpl() {
+        }
 
         @Override
         public Builder reuseLastProviderEnabled(Boolean reuseLastProviderEnabled) {
diff --git a/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/AwsSessionCredentials.java b/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/AwsSessionCredentials.java
index 94fca729c651..8acd9efd02b9 100644
--- a/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/AwsSessionCredentials.java
+++ b/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/AwsSessionCredentials.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/ChildProfileCredentialsProviderFactory.java b/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/ChildProfileCredentialsProviderFactory.java
index 2229ef8dc56e..620e32decfe2 100644
--- a/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/ChildProfileCredentialsProviderFactory.java
+++ b/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/ChildProfileCredentialsProviderFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/ContainerCredentialsProvider.java b/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/ContainerCredentialsProvider.java
index 1872e10cc133..1d2bdc249ab8 100644
--- a/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/ContainerCredentialsProvider.java
+++ b/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/ContainerCredentialsProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -17,7 +17,6 @@
 
 import static java.util.Collections.singletonMap;
 import static java.util.Collections.unmodifiableSet;
-import static java.util.stream.Collectors.joining;
 
 import java.io.IOException;
 import java.net.URI;
@@ -138,7 +137,7 @@ private URI createGenericContainerUrl() {
                                                  uri,
                                                  SdkSystemSetting.AWS_CONTAINER_CREDENTIALS_FULL_URI
                                                                  .environmentVariable(),
-                                                 ALLOWED_HOSTS.stream().collect(joining(","))))
+                                                               String.join(",", ALLOWED_HOSTS)))
                                         .build();
             }
             return uri;
diff --git a/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/CredentialUtils.java b/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/CredentialUtils.java
index 09bcfcddd5fe..6e4879b59c2a 100644
--- a/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/CredentialUtils.java
+++ b/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/CredentialUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/DefaultCredentialsProvider.java b/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/DefaultCredentialsProvider.java
index a8cbf236fbbb..764112223ae4 100644
--- a/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/DefaultCredentialsProvider.java
+++ b/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/DefaultCredentialsProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -17,6 +17,7 @@
 
 import software.amazon.awssdk.annotations.SdkPublicApi;
 import software.amazon.awssdk.auth.credentials.internal.LazyAwsCredentialsProvider;
+import software.amazon.awssdk.profiles.ProfileFile;
 import software.amazon.awssdk.utils.SdkAutoCloseable;
 import software.amazon.awssdk.utils.ToString;
 
@@ -34,6 +35,7 @@
  * @see SystemPropertyCredentialsProvider
  * @see EnvironmentVariableCredentialsProvider
  * @see ProfileCredentialsProvider
+ * @see WebIdentityTokenFileCredentialsProvider
  * @see ContainerCredentialsProvider
  * @see InstanceProfileCredentialsProvider
  */
@@ -70,7 +72,11 @@ private static LazyAwsCredentialsProvider createChain(Builder builder) {
             AwsCredentialsProvider[] credentialsProviders = new AwsCredentialsProvider[] {
                     SystemPropertyCredentialsProvider.create(),
                     EnvironmentVariableCredentialsProvider.create(),
-                    ProfileCredentialsProvider.create(),
+                    WebIdentityTokenFileCredentialsProvider.create(),
+                    ProfileCredentialsProvider.builder()
+                                              .profileFile(builder.profileFile)
+                                              .profileName(builder.profileName)
+                                              .build(),
                     ContainerCredentialsProvider.builder()
                                                 .asyncCredentialUpdateEnabled(asyncCredentialUpdateEnabled)
                                                 .build(),
@@ -114,13 +120,26 @@ public String toString() {
      * Configuration that defines the {@link DefaultCredentialsProvider}'s behavior.
      */
     public static final class Builder {
+        private ProfileFile profileFile;
+        private String profileName;
         private Boolean reuseLastProviderEnabled = true;
         private Boolean asyncCredentialUpdateEnabled = false;
 
         /**
          * Created with {@link #builder()}.
          */
-        private Builder() {}
+        private Builder() {
+        }
+
+        public Builder profileFile(ProfileFile profileFile) {
+            this.profileFile = profileFile;
+            return this;
+        }
+
+        public Builder profileName(String profileName) {
+            this.profileName = profileName;
+            return this;
+        }
 
         /**
          * Controls whether the provider should reuse the last successful credentials provider in the chain. Reusing the last
diff --git a/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/EnvironmentVariableCredentialsProvider.java b/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/EnvironmentVariableCredentialsProvider.java
index 3efbe3367ea1..18d566687718 100644
--- a/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/EnvironmentVariableCredentialsProvider.java
+++ b/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/EnvironmentVariableCredentialsProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/HttpCredentialsProvider.java b/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/HttpCredentialsProvider.java
index 6bad1959657f..f2e1aa03d600 100644
--- a/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/HttpCredentialsProvider.java
+++ b/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/HttpCredentialsProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/InstanceProfileCredentialsProvider.java b/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/InstanceProfileCredentialsProvider.java
index 7ddb2c6adf7c..3a704dbcb969 100644
--- a/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/InstanceProfileCredentialsProvider.java
+++ b/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/InstanceProfileCredentialsProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -17,9 +17,13 @@
 
 import java.io.IOException;
 import java.net.URI;
+import java.util.HashMap;
+import java.util.Map;
 import software.amazon.awssdk.annotations.SdkPublicApi;
 import software.amazon.awssdk.core.SdkSystemSetting;
 import software.amazon.awssdk.core.exception.SdkClientException;
+import software.amazon.awssdk.core.internal.util.UserAgentUtils;
+import software.amazon.awssdk.regions.internal.util.EC2MetadataUtils;
 import software.amazon.awssdk.regions.util.HttpResourcesUtils;
 import software.amazon.awssdk.regions.util.ResourcesEndpointProvider;
 import software.amazon.awssdk.utils.ToString;
@@ -33,9 +37,9 @@
  */
 @SdkPublicApi
 public final class InstanceProfileCredentialsProvider extends HttpCredentialsProvider {
+    private static final String EC2_METADATA_TOKEN_HEADER = "x-aws-ec2-metadata-token";
 
     private static final String SECURITY_CREDENTIALS_RESOURCE = "/latest/meta-data/iam/security-credentials/";
-    private final ResourcesEndpointProvider credentialsEndpointProvider = new InstanceProviderCredentialsEndpointProvider();
 
     /**
      * @see #builder()
@@ -62,7 +66,7 @@ public static InstanceProfileCredentialsProvider create() {
 
     @Override
     protected ResourcesEndpointProvider getCredentialsEndpointProvider() {
-        return credentialsEndpointProvider;
+        return new InstanceProviderCredentialsEndpointProvider(getToken());
     }
 
     @Override
@@ -75,13 +79,45 @@ public String toString() {
         return ToString.create("InstanceProfileCredentialsProvider");
     }
 
+    private String getToken() {
+        return EC2MetadataUtils.getToken();
+    }
+
+    private static ResourcesEndpointProvider includeTokenHeader(ResourcesEndpointProvider provider, String token) {
+        return new ResourcesEndpointProvider() {
+            @Override
+            public URI endpoint() throws IOException {
+                return provider.endpoint();
+            }
+
+            @Override
+            public Map<String, String> headers() {
+                Map<String, String> headers = new HashMap<>(provider.headers());
+                headers.put(EC2_METADATA_TOKEN_HEADER, token);
+                return headers;
+            }
+        };
+    }
+
     private static final class InstanceProviderCredentialsEndpointProvider implements ResourcesEndpointProvider {
+        private final String metadataToken;
+
+        private InstanceProviderCredentialsEndpointProvider(String metadataToken) {
+            this.metadataToken = metadataToken;
+        }
+
         @Override
         public URI endpoint() throws IOException {
             String host = SdkSystemSetting.AWS_EC2_METADATA_SERVICE_ENDPOINT.getStringValueOrThrow();
 
             URI endpoint = URI.create(host + SECURITY_CREDENTIALS_RESOURCE);
-            String securityCredentialsList = HttpResourcesUtils.instance().readResource(endpoint);
+            ResourcesEndpointProvider endpointProvider = () -> endpoint;
+
+            if (metadataToken != null) {
+                endpointProvider = includeTokenHeader(endpointProvider, metadataToken);
+            }
+
+            String securityCredentialsList = HttpResourcesUtils.instance().readResource(endpointProvider);
             String[] securityCredentials = securityCredentialsList.trim().split("\n");
 
             if (securityCredentials.length == 0) {
@@ -90,8 +126,23 @@ public URI endpoint() throws IOException {
 
             return URI.create(host + SECURITY_CREDENTIALS_RESOURCE + securityCredentials[0]);
         }
+
+        @Override
+        public Map<String, String> headers() {
+            Map<String, String> requestHeaders = new HashMap<>();
+            requestHeaders.put("User-Agent", UserAgentUtils.getUserAgent());
+            requestHeaders.put("Accept", "*/*");
+            requestHeaders.put("Connection", "keep-alive");
+
+            if (metadataToken != null) {
+                requestHeaders.put(EC2_METADATA_TOKEN_HEADER, metadataToken);
+            }
+
+            return requestHeaders;
+        }
     }
 
+
     /**
      * A builder for creating a custom a {@link InstanceProfileCredentialsProvider}.
      */
diff --git a/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/ProcessCredentialsProvider.java b/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/ProcessCredentialsProvider.java
index 2f1cee14bd55..fac87fbb0e69 100644
--- a/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/ProcessCredentialsProvider.java
+++ b/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/ProcessCredentialsProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -53,7 +53,7 @@
  *     start to be refreshed. This allows the credentials to be refreshed *before* they are reported to expire. Default: 15
  *     seconds.</li>
  *     <li>ProcessOutputLimit - The maximum amount of data that can be returned by the external process before an exception is
- *     raised. Default: 1024 bytes.</li>
+ *     raised. Default: 64000 bytes (64KB).</li>
  * </ul>
  */
 @SdkPublicApi
@@ -222,12 +222,13 @@ public static class Builder {
         private Boolean asyncCredentialUpdateEnabled = false;
         private String command;
         private Duration credentialRefreshThreshold = Duration.ofSeconds(15);
-        private long processOutputLimit = 1024;
+        private long processOutputLimit = 64000;
 
         /**
          * @see #builder()
          */
-        private Builder() {}
+        private Builder() {
+        }
 
         /**
          * Configure whether the provider should fetch credentials asynchronously in the background. If this is true, threads are
@@ -264,7 +265,7 @@ public Builder credentialRefreshThreshold(Duration credentialRefreshThreshold) {
          * Configure the maximum amount of data that can be returned by the external process before an exception is
          * raised.
          *
-         * <p>Default: 1024 bytes.</p>
+         * <p>Default: 64000 bytes (64KB).</p>
          */
         public Builder processOutputLimit(long outputByteLimit) {
             this.processOutputLimit = outputByteLimit;
diff --git a/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/ProfileCredentialsProvider.java b/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/ProfileCredentialsProvider.java
index fe13174f2c31..1a4dd42e870d 100644
--- a/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/ProfileCredentialsProvider.java
+++ b/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/ProfileCredentialsProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -21,7 +21,6 @@
 import software.amazon.awssdk.annotations.SdkPublicApi;
 import software.amazon.awssdk.annotations.SdkTestInternalApi;
 import software.amazon.awssdk.auth.credentials.internal.ProfileCredentialsUtils;
-import software.amazon.awssdk.core.SdkSystemSetting;
 import software.amazon.awssdk.core.exception.SdkClientException;
 import software.amazon.awssdk.profiles.ProfileFile;
 import software.amazon.awssdk.profiles.ProfileFileSystemSetting;
@@ -163,7 +162,7 @@ public interface Builder {
 
         /**
          * Define the name of the profile that should be used by this credentials provider. By default, the value in
-         * {@link SdkSystemSetting#AWS_PROFILE} is used.
+         * {@link ProfileFileSystemSetting#AWS_PROFILE} is used.
          */
         Builder profileName(String profileName);
 
diff --git a/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/StaticCredentialsProvider.java b/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/StaticCredentialsProvider.java
index e52efdab2e83..aa67c4dd68b4 100644
--- a/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/StaticCredentialsProvider.java
+++ b/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/StaticCredentialsProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/SystemPropertyCredentialsProvider.java b/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/SystemPropertyCredentialsProvider.java
index b4320ffb6580..135b6ce88565 100644
--- a/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/SystemPropertyCredentialsProvider.java
+++ b/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/SystemPropertyCredentialsProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/WebIdentityTokenCredentialsProviderFactory.java b/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/WebIdentityTokenCredentialsProviderFactory.java
index 9faeb71c373e..0772b895f0a9 100644
--- a/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/WebIdentityTokenCredentialsProviderFactory.java
+++ b/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/WebIdentityTokenCredentialsProviderFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/WebIdentityTokenFileCredentialsProvider.java b/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/WebIdentityTokenFileCredentialsProvider.java
index ab439ada4998..168ecb3a1965 100644
--- a/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/WebIdentityTokenFileCredentialsProvider.java
+++ b/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/WebIdentityTokenFileCredentialsProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -156,7 +156,7 @@ public Builder webIdentityTokenFile(Path webIdentityTokenFile) {
             return this;
         }
 
-        public void setwebIdentityTokenFile(Path webIdentityTokenFile) {
+        public void setWebIdentityTokenFile(Path webIdentityTokenFile) {
             webIdentityTokenFile(webIdentityTokenFile);
         }
 
diff --git a/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/internal/ContainerCredentialsRetryPolicy.java b/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/internal/ContainerCredentialsRetryPolicy.java
index 352dd2aff1ce..448d19aee53c 100644
--- a/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/internal/ContainerCredentialsRetryPolicy.java
+++ b/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/internal/ContainerCredentialsRetryPolicy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/internal/CredentialSourceType.java b/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/internal/CredentialSourceType.java
index 61c82a75bcc9..db3de2845d49 100644
--- a/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/internal/CredentialSourceType.java
+++ b/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/internal/CredentialSourceType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/internal/LazyAwsCredentialsProvider.java b/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/internal/LazyAwsCredentialsProvider.java
index 54260eca2e8a..6999e25af250 100644
--- a/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/internal/LazyAwsCredentialsProvider.java
+++ b/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/internal/LazyAwsCredentialsProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -20,6 +20,7 @@
 import software.amazon.awssdk.auth.credentials.AwsCredentials;
 import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;
 import software.amazon.awssdk.utils.IoUtils;
+import software.amazon.awssdk.utils.Lazy;
 import software.amazon.awssdk.utils.SdkAutoCloseable;
 import software.amazon.awssdk.utils.ToString;
 
@@ -29,11 +30,10 @@
  */
 @SdkInternalApi
 public class LazyAwsCredentialsProvider implements AwsCredentialsProvider, SdkAutoCloseable {
-    private final Supplier<AwsCredentialsProvider> delegateConstructor;
-    private volatile AwsCredentialsProvider delegate;
+    private final Lazy<AwsCredentialsProvider> delegate;
 
     private LazyAwsCredentialsProvider(Supplier<AwsCredentialsProvider> delegateConstructor) {
-        this.delegateConstructor = delegateConstructor;
+        this.delegate = new Lazy<>(delegateConstructor);
     }
 
     public static LazyAwsCredentialsProvider create(Supplier<AwsCredentialsProvider> delegateConstructor) {
@@ -42,14 +42,7 @@ public static LazyAwsCredentialsProvider create(Supplier<AwsCredentialsProvider>
 
     @Override
     public AwsCredentials resolveCredentials() {
-        if (delegate == null) {
-            synchronized (this) {
-                if (delegate == null) {
-                    delegate = delegateConstructor.get();
-                }
-            }
-        }
-        return delegate.resolveCredentials();
+        return delegate.getValue().resolveCredentials();
     }
 
     @Override
@@ -60,7 +53,6 @@ public void close() {
     @Override
     public String toString() {
         return ToString.builder("LazyAwsCredentialsProvider")
-                       .add("delegateConstructor", delegateConstructor)
                        .add("delegate", delegate)
                        .build();
     }
diff --git a/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/internal/ProfileCredentialsUtils.java b/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/internal/ProfileCredentialsUtils.java
index d2646ec6a57a..c57cfe17b6c9 100644
--- a/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/internal/ProfileCredentialsUtils.java
+++ b/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/internal/ProfileCredentialsUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/internal/SystemSettingsCredentialsProvider.java b/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/internal/SystemSettingsCredentialsProvider.java
index 74e84a210900..c84cc44c6237 100644
--- a/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/internal/SystemSettingsCredentialsProvider.java
+++ b/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/internal/SystemSettingsCredentialsProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/internal/WebIdentityCredentialsUtils.java b/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/internal/WebIdentityCredentialsUtils.java
index 9c2136ec4db0..b73f7ec1dfce 100644
--- a/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/internal/WebIdentityCredentialsUtils.java
+++ b/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/internal/WebIdentityCredentialsUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -28,7 +28,8 @@ public final class WebIdentityCredentialsUtils {
     private static final String STS_WEB_IDENTITY_CREDENTIALS_PROVIDER_FACTORY =
         "software.amazon.awssdk.services.sts.internal.StsWebIdentityCredentialsProviderFactory";
 
-    private WebIdentityCredentialsUtils() {}
+    private WebIdentityCredentialsUtils() {
+    }
 
     /**
      * Resolves the StsWebIdentityCredentialsProviderFactory from the Sts module if on the classpath to allow
diff --git a/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/internal/WebIdentityTokenCredentialProperties.java b/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/internal/WebIdentityTokenCredentialProperties.java
index 06375802e356..0d6687edd5ac 100644
--- a/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/internal/WebIdentityTokenCredentialProperties.java
+++ b/core/auth/src/main/java/software/amazon/awssdk/auth/credentials/internal/WebIdentityTokenCredentialProperties.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/auth/src/main/java/software/amazon/awssdk/auth/signer/Aws4Signer.java b/core/auth/src/main/java/software/amazon/awssdk/auth/signer/Aws4Signer.java
index 05934f34b9f3..bad5428c3a8c 100644
--- a/core/auth/src/main/java/software/amazon/awssdk/auth/signer/Aws4Signer.java
+++ b/core/auth/src/main/java/software/amazon/awssdk/auth/signer/Aws4Signer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/auth/src/main/java/software/amazon/awssdk/auth/signer/Aws4UnsignedPayloadSigner.java b/core/auth/src/main/java/software/amazon/awssdk/auth/signer/Aws4UnsignedPayloadSigner.java
index ffc9a3ec78e6..271f7a95457c 100644
--- a/core/auth/src/main/java/software/amazon/awssdk/auth/signer/Aws4UnsignedPayloadSigner.java
+++ b/core/auth/src/main/java/software/amazon/awssdk/auth/signer/Aws4UnsignedPayloadSigner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/auth/src/main/java/software/amazon/awssdk/auth/signer/AwsS3V4Signer.java b/core/auth/src/main/java/software/amazon/awssdk/auth/signer/AwsS3V4Signer.java
index 9d27859a473a..6dc3385d0ef5 100644
--- a/core/auth/src/main/java/software/amazon/awssdk/auth/signer/AwsS3V4Signer.java
+++ b/core/auth/src/main/java/software/amazon/awssdk/auth/signer/AwsS3V4Signer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/auth/src/main/java/software/amazon/awssdk/auth/signer/AwsSignerExecutionAttribute.java b/core/auth/src/main/java/software/amazon/awssdk/auth/signer/AwsSignerExecutionAttribute.java
index 5f20a9c92957..5b8fcfc026d0 100644
--- a/core/auth/src/main/java/software/amazon/awssdk/auth/signer/AwsSignerExecutionAttribute.java
+++ b/core/auth/src/main/java/software/amazon/awssdk/auth/signer/AwsSignerExecutionAttribute.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/auth/src/main/java/software/amazon/awssdk/auth/signer/EventStreamAws4Signer.java b/core/auth/src/main/java/software/amazon/awssdk/auth/signer/EventStreamAws4Signer.java
index 560057f54498..474046cf2202 100644
--- a/core/auth/src/main/java/software/amazon/awssdk/auth/signer/EventStreamAws4Signer.java
+++ b/core/auth/src/main/java/software/amazon/awssdk/auth/signer/EventStreamAws4Signer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -20,7 +20,8 @@
 
 @SdkProtectedApi
 public final class EventStreamAws4Signer extends BaseEventStreamAsyncAws4Signer {
-    private EventStreamAws4Signer() {}
+    private EventStreamAws4Signer() {
+    }
 
     public static EventStreamAws4Signer create() {
         return new EventStreamAws4Signer();
diff --git a/core/auth/src/main/java/software/amazon/awssdk/auth/signer/S3SignerExecutionAttribute.java b/core/auth/src/main/java/software/amazon/awssdk/auth/signer/S3SignerExecutionAttribute.java
index 391a58c9853c..69576d3d193f 100644
--- a/core/auth/src/main/java/software/amazon/awssdk/auth/signer/S3SignerExecutionAttribute.java
+++ b/core/auth/src/main/java/software/amazon/awssdk/auth/signer/S3SignerExecutionAttribute.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/auth/src/main/java/software/amazon/awssdk/auth/signer/internal/AbstractAws4Signer.java b/core/auth/src/main/java/software/amazon/awssdk/auth/signer/internal/AbstractAws4Signer.java
index 3d841b58eea6..0ae639f517dd 100644
--- a/core/auth/src/main/java/software/amazon/awssdk/auth/signer/internal/AbstractAws4Signer.java
+++ b/core/auth/src/main/java/software/amazon/awssdk/auth/signer/internal/AbstractAws4Signer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -15,16 +15,15 @@
 
 package software.amazon.awssdk.auth.signer.internal;
 
-import static software.amazon.awssdk.utils.DateUtils.numberOfDaysSinceEpoch;
 import static software.amazon.awssdk.utils.StringUtils.lowerCase;
 
 import java.io.InputStream;
 import java.nio.charset.Charset;
+import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.TimeUnit;
 import software.amazon.awssdk.annotations.SdkInternalApi;
 import software.amazon.awssdk.auth.credentials.AwsCredentials;
 import software.amazon.awssdk.auth.credentials.AwsSessionCredentials;
@@ -160,24 +159,28 @@ protected abstract void processRequestPayload(SdkHttpFullRequest.Builder mutable
      * http://docs.aws.amazon
      * .com/general/latest/gr/sigv4-calculate-signature.html
      */
-    protected byte[] deriveSigningKey(AwsCredentials credentials, Aws4SignerRequestParams signerRequestParams) {
-
-        String cacheKey = computeSigningCacheKeyName(credentials, signerRequestParams);
-        long daysSinceEpochSigningDate = numberOfDaysSinceEpoch(signerRequestParams.getRequestSigningDateTimeMilli());
+    protected final byte[] deriveSigningKey(AwsCredentials credentials, Aws4SignerRequestParams signerRequestParams) {
+        return deriveSigningKey(credentials,
+                Instant.ofEpochMilli(signerRequestParams.getRequestSigningDateTimeMilli()),
+                signerRequestParams.getRegionName(),
+                signerRequestParams.getServiceSigningName());
+    }
 
+    protected final byte[] deriveSigningKey(AwsCredentials credentials, Instant signingInstant, String region, String service) {
+        String cacheKey = createSigningCacheKeyName(credentials, region, service);
         SignerKey signerKey = SIGNER_CACHE.get(cacheKey);
 
-        if (signerKey != null && daysSinceEpochSigningDate == signerKey.getNumberOfDaysSinceEpoch()) {
+        if (signerKey != null && signerKey.isValidForDate(signingInstant)) {
             return signerKey.getSigningKey();
         }
 
         LOG.trace(() -> "Generating a new signing key as the signing key not available in the cache for the date: " +
-            TimeUnit.DAYS.toMillis(daysSinceEpochSigningDate));
+                signingInstant.toEpochMilli());
         byte[] signingKey = newSigningKey(credentials,
-            signerRequestParams.getFormattedRequestSigningDate(),
-            signerRequestParams.getRegionName(),
-            signerRequestParams.getServiceSigningName());
-        SIGNER_CACHE.add(cacheKey, new SignerKey(daysSinceEpochSigningDate, signingKey));
+                Aws4SignerUtils.formatDateStamp(signingInstant),
+                region,
+                service);
+        SIGNER_CACHE.add(cacheKey, new SignerKey(signingInstant, signingKey));
         return signingKey;
     }
 
@@ -228,14 +231,10 @@ private String createStringToSign(String canonicalRequest,
         return stringToSign;
     }
 
-
-    /**
-     * Computes the name to be used to reference the signing key in the cache.
-     */
-    private String computeSigningCacheKeyName(AwsCredentials credentials,
-                                              Aws4SignerRequestParams signerRequestParams) {
-        return credentials.secretAccessKey() + "-" + signerRequestParams.getRegionName() + "-" +
-               signerRequestParams.getServiceSigningName();
+    private String createSigningCacheKeyName(AwsCredentials credentials,
+                                             String regionName,
+                                             String serviceName) {
+        return credentials.secretAccessKey() + "-" + regionName + "-" + serviceName;
     }
 
     /**
diff --git a/core/auth/src/main/java/software/amazon/awssdk/auth/signer/internal/AbstractAwsSigner.java b/core/auth/src/main/java/software/amazon/awssdk/auth/signer/internal/AbstractAwsSigner.java
index 893705186fb2..aa7e31376207 100644
--- a/core/auth/src/main/java/software/amazon/awssdk/auth/signer/internal/AbstractAwsSigner.java
+++ b/core/auth/src/main/java/software/amazon/awssdk/auth/signer/internal/AbstractAwsSigner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/auth/src/main/java/software/amazon/awssdk/auth/signer/internal/AsyncSigV4SubscriberAdapter.java b/core/auth/src/main/java/software/amazon/awssdk/auth/signer/internal/AsyncSigV4SubscriberAdapter.java
index 52351111d2eb..9cfa40f7b094 100644
--- a/core/auth/src/main/java/software/amazon/awssdk/auth/signer/internal/AsyncSigV4SubscriberAdapter.java
+++ b/core/auth/src/main/java/software/amazon/awssdk/auth/signer/internal/AsyncSigV4SubscriberAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/auth/src/main/java/software/amazon/awssdk/auth/signer/internal/Aws4SignerRequestParams.java b/core/auth/src/main/java/software/amazon/awssdk/auth/signer/internal/Aws4SignerRequestParams.java
index eb4ae5ae59cc..8c577e81cde5 100644
--- a/core/auth/src/main/java/software/amazon/awssdk/auth/signer/internal/Aws4SignerRequestParams.java
+++ b/core/auth/src/main/java/software/amazon/awssdk/auth/signer/internal/Aws4SignerRequestParams.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/auth/src/main/java/software/amazon/awssdk/auth/signer/internal/Aws4SignerUtils.java b/core/auth/src/main/java/software/amazon/awssdk/auth/signer/internal/Aws4SignerUtils.java
index 7b543198a5e3..2ca42ca7d3e5 100644
--- a/core/auth/src/main/java/software/amazon/awssdk/auth/signer/internal/Aws4SignerUtils.java
+++ b/core/auth/src/main/java/software/amazon/awssdk/auth/signer/internal/Aws4SignerUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -46,6 +46,10 @@ public static String formatDateStamp(long timeMilli) {
         return DATE_FORMATTER.format(Instant.ofEpochMilli(timeMilli));
     }
 
+    public static String formatDateStamp(Instant instant) {
+        return DATE_FORMATTER.format(instant);
+    }
+
     /**
      * Returns a string representation of the given date time in
      * yyyyMMdd'T'HHmmss'Z' format. The date returned is in the UTC zone.
diff --git a/core/auth/src/main/java/software/amazon/awssdk/auth/signer/internal/AwsChunkedEncodingInputStream.java b/core/auth/src/main/java/software/amazon/awssdk/auth/signer/internal/AwsChunkedEncodingInputStream.java
index 8abfd4e2aa89..d11c1b14bcb8 100644
--- a/core/auth/src/main/java/software/amazon/awssdk/auth/signer/internal/AwsChunkedEncodingInputStream.java
+++ b/core/auth/src/main/java/software/amazon/awssdk/auth/signer/internal/AwsChunkedEncodingInputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/auth/src/main/java/software/amazon/awssdk/auth/signer/internal/BaseAsyncAws4Signer.java b/core/auth/src/main/java/software/amazon/awssdk/auth/signer/internal/BaseAsyncAws4Signer.java
index 3ab593570bf5..df25b40c41ee 100644
--- a/core/auth/src/main/java/software/amazon/awssdk/auth/signer/internal/BaseAsyncAws4Signer.java
+++ b/core/auth/src/main/java/software/amazon/awssdk/auth/signer/internal/BaseAsyncAws4Signer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -20,7 +20,6 @@
 import java.util.regex.Pattern;
 import software.amazon.awssdk.annotations.SdkInternalApi;
 import software.amazon.awssdk.annotations.SdkTestInternalApi;
-import software.amazon.awssdk.auth.credentials.AwsCredentials;
 import software.amazon.awssdk.auth.signer.params.Aws4SignerParams;
 import software.amazon.awssdk.core.async.AsyncRequestBody;
 import software.amazon.awssdk.core.exception.SdkClientException;
@@ -57,11 +56,8 @@ public AsyncRequestBody signAsyncRequestBody(SdkHttpFullRequest request, AsyncRe
     @SdkTestInternalApi
     protected final AsyncRequestBody signAsync(SdkHttpFullRequest request, AsyncRequestBody asyncRequestBody,
                                                Aws4SignerRequestParams requestParams, Aws4SignerParams signingParams) {
-        AwsCredentials sanitizedCredentials = sanitizeCredentials(signingParams.awsCredentials());
-        byte[] signingKey = deriveSigningKey(sanitizedCredentials, requestParams);
-
         String headerSignature = getHeaderSignature(request);
-        return transformRequestProvider(headerSignature, signingKey, requestParams, signingParams, asyncRequestBody);
+        return transformRequestProvider(headerSignature, requestParams, signingParams, asyncRequestBody);
     }
 
     /**
@@ -70,7 +66,6 @@ protected final AsyncRequestBody signAsync(SdkHttpFullRequest request, AsyncRequ
      * Can be overriden by subclasses to provide specific signing method
      */
     protected abstract AsyncRequestBody transformRequestProvider(String headerSignature,
-                                                                 byte[] signingKey,
                                                                  Aws4SignerRequestParams signerRequestParams,
                                                                  Aws4SignerParams signerParams,
                                                                  AsyncRequestBody asyncRequestBody);
diff --git a/core/auth/src/main/java/software/amazon/awssdk/auth/signer/internal/BaseAws4Signer.java b/core/auth/src/main/java/software/amazon/awssdk/auth/signer/internal/BaseAws4Signer.java
index 1ac07719f21b..256b143ea845 100644
--- a/core/auth/src/main/java/software/amazon/awssdk/auth/signer/internal/BaseAws4Signer.java
+++ b/core/auth/src/main/java/software/amazon/awssdk/auth/signer/internal/BaseAws4Signer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/auth/src/main/java/software/amazon/awssdk/auth/signer/internal/BaseEventStreamAsyncAws4Signer.java b/core/auth/src/main/java/software/amazon/awssdk/auth/signer/internal/BaseEventStreamAsyncAws4Signer.java
index d7b3cf179f3f..e50ac4e1450f 100644
--- a/core/auth/src/main/java/software/amazon/awssdk/auth/signer/internal/BaseEventStreamAsyncAws4Signer.java
+++ b/core/auth/src/main/java/software/amazon/awssdk/auth/signer/internal/BaseEventStreamAsyncAws4Signer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -20,7 +20,9 @@
 import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;
 import java.time.Instant;
+import java.util.Arrays;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.Map;
 import java.util.Optional;
 import java.util.TreeMap;
@@ -28,6 +30,7 @@
 import org.reactivestreams.Publisher;
 import org.reactivestreams.Subscriber;
 import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.auth.credentials.AwsCredentials;
 import software.amazon.awssdk.auth.signer.params.Aws4SignerParams;
 import software.amazon.awssdk.core.async.AsyncRequestBody;
 import software.amazon.awssdk.core.async.SdkPublisher;
@@ -49,6 +52,8 @@ public abstract class BaseEventStreamAsyncAws4Signer extends BaseAsyncAws4Signer
     private static final String HTTP_CONTENT_SHA_256 = "STREAMING-AWS4-HMAC-SHA256-EVENTS";
     private static final String EVENT_STREAM_PAYLOAD = "AWS4-HMAC-SHA256-PAYLOAD";
 
+    private static final int PAYLOAD_TRUNCATE_LENGTH = 32;
+
 
     protected BaseEventStreamAsyncAws4Signer() {
     }
@@ -67,7 +72,6 @@ public SdkHttpFullRequest sign(SdkHttpFullRequest request, Aws4SignerParams sign
 
     @Override
     protected AsyncRequestBody transformRequestProvider(String headerSignature,
-                                                        byte[] signingKey,
                                                         Aws4SignerRequestParams signerRequestParams,
                                                         Aws4SignerParams signerParams,
                                                         AsyncRequestBody asyncRequestBody) {
@@ -80,7 +84,8 @@ protected AsyncRequestBody transformRequestProvider(String headerSignature,
          * Map publisher with signing function
          */
         Publisher<ByteBuffer> publisherWithSignedFrame =
-            transformRequestBodyPublisher(publisherWithTrailingEmptyFrame, headerSignature, signingKey, signerRequestParams);
+            transformRequestBodyPublisher(publisherWithTrailingEmptyFrame, headerSignature,
+                                          signerParams.awsCredentials(), signerRequestParams);
 
         AsyncRequestBody transformedRequestBody = AsyncRequestBody.fromPublisher(publisherWithSignedFrame);
 
@@ -105,16 +110,16 @@ private static Publisher<ByteBuffer> appendEmptyFrame(Publisher<ByteBuffer> publ
     }
 
     private Publisher<ByteBuffer> transformRequestBodyPublisher(Publisher<ByteBuffer> publisher, String headerSignature,
-                                                                byte[] signingKey, Aws4SignerRequestParams signerRequestParams) {
+                                                                AwsCredentials credentials,
+                                                                Aws4SignerRequestParams signerRequestParams) {
         return SdkPublisher.adapt(publisher)
-                           .map(getDataFrameSigner(headerSignature, signingKey, signerRequestParams));
+                           .map(getDataFrameSigner(headerSignature, credentials, signerRequestParams));
     }
 
-    private Function<ByteBuffer, ByteBuffer> getDataFrameSigner(String headerSignature, byte[] signingKey,
+    private Function<ByteBuffer, ByteBuffer> getDataFrameSigner(String headerSignature,
+                                                                AwsCredentials credentials,
                                                                 Aws4SignerRequestParams signerRequestParams) {
         return new Function<ByteBuffer, ByteBuffer>() {
-
-            final byte[] key = signingKey;
             final Aws4SignerRequestParams requestParams = signerRequestParams;
 
             /**
@@ -129,14 +134,21 @@ public ByteBuffer apply(ByteBuffer byteBuffer) {
                  */
                 Map<String, HeaderValue> nonSignatureHeaders = new HashMap<>();
                 Instant signingInstant = requestParams.getSigningClock().instant();
-                String signingDate = Aws4SignerUtils.formatTimestamp(signingInstant);
                 nonSignatureHeaders.put(EVENT_STREAM_DATE, HeaderValue.fromTimestamp(signingInstant));
 
+                /**
+                 * Derive Signing Key
+                 */
+                AwsCredentials sanitizedCredentials = sanitizeCredentials(credentials);
+                byte[] signingKey = deriveSigningKey(sanitizedCredentials,
+                                                     signingInstant,
+                                                     requestParams.getRegionName(),
+                                                     requestParams.getServiceSigningName());
                 /**
                  * Calculate rolling signature
                  */
                 byte[] payload = byteBuffer.array();
-                byte[] signatureBytes = signEventStream(priorSignature, key, signingDate, requestParams,
+                byte[] signatureBytes = signEventStream(priorSignature, signingKey, signingInstant, requestParams,
                                                         nonSignatureHeaders, payload);
                 priorSignature = BinaryUtils.toHex(signatureBytes);
 
@@ -151,6 +163,13 @@ public ByteBuffer apply(ByteBuffer byteBuffer) {
                  * Encode signed event to byte
                  */
                 Message signedMessage = new Message(sortHeaders(headers), payload);
+
+                if (LOG.isLoggingLevelEnabled("trace")) {
+                    LOG.trace(() -> "Signed message: " + toDebugString(signedMessage, false));
+                } else {
+                    LOG.debug(() -> "Signed message: " + toDebugString(signedMessage, true));
+                }
+
                 return signedMessage.toByteBuffer();
             }
         };
@@ -162,7 +181,7 @@ public ByteBuffer apply(ByteBuffer byteBuffer) {
      *
      * @param priorSignature signature of previous frame (Header frame is the 0th frame)
      * @param signingKey derived signing key
-     * @param date siging date
+     * @param signingInstant the instant at which this message is being signed
      * @param requestParams request parameters
      * @param nonSignatureHeaders non-signature headers
      * @param payload event stream payload
@@ -171,7 +190,7 @@ public ByteBuffer apply(ByteBuffer byteBuffer) {
     private byte[] signEventStream(
         String priorSignature,
         byte[] signingKey,
-        String date,
+        Instant signingInstant,
         Aws4SignerRequestParams requestParams,
         Map<String, HeaderValue> nonSignatureHeaders,
         byte[] payload) {
@@ -180,9 +199,9 @@ private byte[] signEventStream(
         String stringToSign =
             EVENT_STREAM_PAYLOAD +
             SignerConstant.LINE_SEPARATOR +
-            date +
+            Aws4SignerUtils.formatTimestamp(signingInstant) +
             SignerConstant.LINE_SEPARATOR +
-            requestParams.getScope() +
+            computeScope(signingInstant, requestParams) +
             SignerConstant.LINE_SEPARATOR +
             priorSignature +
             SignerConstant.LINE_SEPARATOR +
@@ -195,6 +214,13 @@ private byte[] signEventStream(
                     SigningAlgorithm.HmacSHA256);
     }
 
+    private String computeScope(Instant signingInstant, Aws4SignerRequestParams requestParams) {
+        return Aws4SignerUtils.formatDateStamp(signingInstant) + "/" +
+               requestParams.getRegionName() + "/" +
+               requestParams.getServiceSigningName() + "/" +
+               SignerConstant.AWS4_TERMINATOR;
+    }
+
     /**
      * Sort headers in alphabetic order, with exception that EVENT_STREAM_SIGNATURE header always at last
      *
@@ -244,4 +270,45 @@ public Optional<Long> contentLength() {
         }
     }
 
+    static String toDebugString(Message m, boolean truncatePayload) {
+        StringBuilder sb = new StringBuilder("Message = {headers={");
+        Map<String, HeaderValue> headers = m.getHeaders();
+
+        Iterator<Map.Entry<String, HeaderValue>> headersIter = headers.entrySet().iterator();
+
+        while (headersIter.hasNext()) {
+            Map.Entry<String, HeaderValue> h = headersIter.next();
+
+            sb.append(h.getKey()).append("={").append(h.getValue().toString()).append("}");
+
+            if (headersIter.hasNext()) {
+                sb.append(", ");
+            }
+        }
+
+        sb.append("}, payload=");
+
+        byte[] payload = m.getPayload();
+        byte[] payloadToLog;
+
+        // We don't actually need to truncate if the payload length is already within the truncate limit
+        truncatePayload = truncatePayload && payload.length > PAYLOAD_TRUNCATE_LENGTH;
+
+        if (truncatePayload) {
+            // Would be nice if BinaryUtils.toHex() could take an array index range instead so we don't need to copy
+            payloadToLog = Arrays.copyOf(payload, PAYLOAD_TRUNCATE_LENGTH);
+        } else {
+            payloadToLog = payload;
+        }
+
+        sb.append(BinaryUtils.toHex(payloadToLog));
+
+        if (truncatePayload) {
+            sb.append("...");
+        }
+
+        sb.append("}");
+
+        return sb.toString();
+    }
 }
diff --git a/core/auth/src/main/java/software/amazon/awssdk/auth/signer/internal/BoundedLinkedHashMap.java b/core/auth/src/main/java/software/amazon/awssdk/auth/signer/internal/BoundedLinkedHashMap.java
index 59c4aa01f94d..20d2d75bd070 100644
--- a/core/auth/src/main/java/software/amazon/awssdk/auth/signer/internal/BoundedLinkedHashMap.java
+++ b/core/auth/src/main/java/software/amazon/awssdk/auth/signer/internal/BoundedLinkedHashMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/auth/src/main/java/software/amazon/awssdk/auth/signer/internal/ChunkContentIterator.java b/core/auth/src/main/java/software/amazon/awssdk/auth/signer/internal/ChunkContentIterator.java
index 527b826d0c33..0a40d7571812 100644
--- a/core/auth/src/main/java/software/amazon/awssdk/auth/signer/internal/ChunkContentIterator.java
+++ b/core/auth/src/main/java/software/amazon/awssdk/auth/signer/internal/ChunkContentIterator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/auth/src/main/java/software/amazon/awssdk/auth/signer/internal/DecodedStreamBuffer.java b/core/auth/src/main/java/software/amazon/awssdk/auth/signer/internal/DecodedStreamBuffer.java
index 5161ce43ba21..9cb5b48283a8 100644
--- a/core/auth/src/main/java/software/amazon/awssdk/auth/signer/internal/DecodedStreamBuffer.java
+++ b/core/auth/src/main/java/software/amazon/awssdk/auth/signer/internal/DecodedStreamBuffer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/auth/src/main/java/software/amazon/awssdk/auth/signer/internal/FifoCache.java b/core/auth/src/main/java/software/amazon/awssdk/auth/signer/internal/FifoCache.java
index 29838e0c4f0c..ccb3b108915d 100644
--- a/core/auth/src/main/java/software/amazon/awssdk/auth/signer/internal/FifoCache.java
+++ b/core/auth/src/main/java/software/amazon/awssdk/auth/signer/internal/FifoCache.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -43,7 +43,7 @@ public FifoCache(final int maxSize) {
             throw new IllegalArgumentException("maxSize " + maxSize
                                                + " must be at least 1");
         }
-        map = new BoundedLinkedHashMap<String, T>(maxSize);
+        map = new BoundedLinkedHashMap<>(maxSize);
         ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
         rlock = lock.readLock();
         wlock = lock.writeLock();
diff --git a/core/auth/src/main/java/software/amazon/awssdk/auth/signer/internal/SignerConstant.java b/core/auth/src/main/java/software/amazon/awssdk/auth/signer/internal/SignerConstant.java
index f211641d758a..591e80746204 100644
--- a/core/auth/src/main/java/software/amazon/awssdk/auth/signer/internal/SignerConstant.java
+++ b/core/auth/src/main/java/software/amazon/awssdk/auth/signer/internal/SignerConstant.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/auth/src/main/java/software/amazon/awssdk/auth/signer/internal/SignerKey.java b/core/auth/src/main/java/software/amazon/awssdk/auth/signer/internal/SignerKey.java
index ed2ef8cb1002..4dc7dcde2526 100644
--- a/core/auth/src/main/java/software/amazon/awssdk/auth/signer/internal/SignerKey.java
+++ b/core/auth/src/main/java/software/amazon/awssdk/auth/signer/internal/SignerKey.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -15,8 +15,10 @@
 
 package software.amazon.awssdk.auth.signer.internal;
 
+import java.time.Instant;
 import software.amazon.awssdk.annotations.Immutable;
 import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.utils.DateUtils;
 
 /**
  * Holds the signing key and the number of days since epoch for the date for
@@ -26,29 +28,25 @@
 @SdkInternalApi
 public final class SignerKey {
 
-    private final long numberOfDaysSinceEpoch;
+    private final long daysSinceEpoch;
 
     private final byte[] signingKey;
 
-    public SignerKey(long numberOfDaysSinceEpoch, byte[] signingKey) {
-        if (numberOfDaysSinceEpoch <= 0L) {
+    public SignerKey(Instant date, byte[] signingKey) {
+        if (date == null) {
             throw new IllegalArgumentException(
-                    "Not able to cache signing key. Signing date to be cached is invalid");
+                    "Not able to cache signing key. Signing date to be is null");
         }
         if (signingKey == null) {
             throw new IllegalArgumentException(
                     "Not able to cache signing key. Signing Key to be cached are null");
         }
-        this.numberOfDaysSinceEpoch = numberOfDaysSinceEpoch;
+        this.daysSinceEpoch = DateUtils.numberOfDaysSinceEpoch(date.toEpochMilli());
         this.signingKey = signingKey.clone();
     }
 
-    /**
-     * Returns the number of days since epoch for the date used for generating
-     * signing key.
-     */
-    public long getNumberOfDaysSinceEpoch() {
-        return numberOfDaysSinceEpoch;
+    public boolean isValidForDate(Instant other) {
+        return daysSinceEpoch == DateUtils.numberOfDaysSinceEpoch(other.toEpochMilli());
     }
 
     /**
diff --git a/core/auth/src/main/java/software/amazon/awssdk/auth/signer/internal/SigningAlgorithm.java b/core/auth/src/main/java/software/amazon/awssdk/auth/signer/internal/SigningAlgorithm.java
index ddf424ef0990..388c1b38112f 100644
--- a/core/auth/src/main/java/software/amazon/awssdk/auth/signer/internal/SigningAlgorithm.java
+++ b/core/auth/src/main/java/software/amazon/awssdk/auth/signer/internal/SigningAlgorithm.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/auth/src/main/java/software/amazon/awssdk/auth/signer/params/Aws4PresignerParams.java b/core/auth/src/main/java/software/amazon/awssdk/auth/signer/params/Aws4PresignerParams.java
index 80fb5c1f0baa..4a3fff21cd92 100644
--- a/core/auth/src/main/java/software/amazon/awssdk/auth/signer/params/Aws4PresignerParams.java
+++ b/core/auth/src/main/java/software/amazon/awssdk/auth/signer/params/Aws4PresignerParams.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/auth/src/main/java/software/amazon/awssdk/auth/signer/params/Aws4SignerParams.java b/core/auth/src/main/java/software/amazon/awssdk/auth/signer/params/Aws4SignerParams.java
index 40c0a7719fdd..457dc43ccc12 100644
--- a/core/auth/src/main/java/software/amazon/awssdk/auth/signer/params/Aws4SignerParams.java
+++ b/core/auth/src/main/java/software/amazon/awssdk/auth/signer/params/Aws4SignerParams.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/auth/src/main/java/software/amazon/awssdk/auth/signer/params/AwsS3V4SignerParams.java b/core/auth/src/main/java/software/amazon/awssdk/auth/signer/params/AwsS3V4SignerParams.java
index 40e56a10b5a6..9eeb5a5001a7 100644
--- a/core/auth/src/main/java/software/amazon/awssdk/auth/signer/params/AwsS3V4SignerParams.java
+++ b/core/auth/src/main/java/software/amazon/awssdk/auth/signer/params/AwsS3V4SignerParams.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/AwsCredentialsProviderChainTest.java b/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/AwsCredentialsProviderChainTest.java
index cd33ba93b449..ea8b688e3161 100644
--- a/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/AwsCredentialsProviderChainTest.java
+++ b/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/AwsCredentialsProviderChainTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/ContainerCredentialsEndpointProviderTest.java b/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/ContainerCredentialsEndpointProviderTest.java
index b4d163d23ad3..d7ccc4622a30 100644
--- a/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/ContainerCredentialsEndpointProviderTest.java
+++ b/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/ContainerCredentialsEndpointProviderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/ContainerCredentialsProviderTest.java b/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/ContainerCredentialsProviderTest.java
index 5657e6988207..507b855d3831 100644
--- a/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/ContainerCredentialsProviderTest.java
+++ b/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/ContainerCredentialsProviderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/ContainerCredentialsRetryPolicyTest.java b/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/ContainerCredentialsRetryPolicyTest.java
index b962e4366141..38b4b7c8d4fd 100644
--- a/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/ContainerCredentialsRetryPolicyTest.java
+++ b/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/ContainerCredentialsRetryPolicyTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/CredentialsEndpointRetryParametersTest.java b/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/CredentialsEndpointRetryParametersTest.java
index 67f59266c121..aad419e649ba 100644
--- a/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/CredentialsEndpointRetryParametersTest.java
+++ b/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/CredentialsEndpointRetryParametersTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/EC2MetadataServiceMock.java b/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/EC2MetadataServiceMock.java
index 99d0e7d7b140..495fff4f943d 100644
--- a/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/EC2MetadataServiceMock.java
+++ b/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/EC2MetadataServiceMock.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -26,6 +26,8 @@
 import java.net.Socket;
 import java.util.List;
 import org.apache.commons.io.IOUtils;
+import software.amazon.awssdk.auth.signer.internal.SignerTestUtils;
+import software.amazon.awssdk.utils.StringUtils;
 
 /**
  * Mock server for imitating the Amazon EC2 Instance Metadata Service. Tests can
@@ -99,6 +101,7 @@ private ServerSocket startServerSocket() {
      * and response with a predefined response file.
      */
     private static class EC2MockMetadataServiceListenerThread extends Thread {
+        private static final String TOKEN_RESOURCE_PATH = "/latest/api/token";
         private ServerSocket serverSocket;
         private final String credentialsResource;
         private String responseFileName;
@@ -164,7 +167,13 @@ public void run() {
                                                             .toString());
                         outputStream.write(httpResponse.getBytes());
 
-                    } else {
+                    } else if (TOKEN_RESOURCE_PATH.equals(resourcePath)) {
+                        httpResponse = "HTTP/1.1 404 Not Found\r\n" +
+                                       "Content-Length: 0\r\n" +
+                                       "\r\n";
+                        outputStream.write(httpResponse.getBytes());
+                    }
+                    else {
                         throw new RuntimeException("Unknown resource requested: " + resourcePath);
                     }
                 } catch (IOException e) {
diff --git a/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/HttpCredentialsProviderTest.java b/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/HttpCredentialsProviderTest.java
index 15d889eca9e2..3e16b3dd3f05 100644
--- a/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/HttpCredentialsProviderTest.java
+++ b/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/HttpCredentialsProviderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/InstanceProfileCredentialsProviderTest.java b/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/InstanceProfileCredentialsProviderTest.java
new file mode 100644
index 000000000000..17b9b71a5b80
--- /dev/null
+++ b/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/InstanceProfileCredentialsProviderTest.java
@@ -0,0 +1,213 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.auth.credentials;
+
+import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
+import static com.github.tomakehurst.wiremock.client.WireMock.equalTo;
+import static com.github.tomakehurst.wiremock.client.WireMock.get;
+import static com.github.tomakehurst.wiremock.client.WireMock.getRequestedFor;
+import static com.github.tomakehurst.wiremock.client.WireMock.put;
+import static com.github.tomakehurst.wiremock.client.WireMock.putRequestedFor;
+import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
+import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo;
+import static org.hamcrest.Matchers.instanceOf;
+import com.github.tomakehurst.wiremock.client.WireMock;
+import com.github.tomakehurst.wiremock.junit.WireMockRule;
+import java.net.SocketTimeoutException;
+import java.time.Duration;
+import java.time.Instant;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+import software.amazon.awssdk.core.SdkSystemSetting;
+import software.amazon.awssdk.core.exception.SdkClientException;
+import software.amazon.awssdk.core.internal.util.UserAgentUtils;
+import software.amazon.awssdk.utils.DateUtils;
+
+public class InstanceProfileCredentialsProviderTest {
+    private static final String TOKEN_RESOURCE_PATH = "/latest/api/token";
+    private static final String CREDENTIALS_RESOURCE_PATH = "/latest/meta-data/iam/security-credentials/";
+    private static final String STUB_CREDENTIALS = "{\"AccessKeyId\":\"ACCESS_KEY_ID\",\"SecretAccessKey\":\"SECRET_ACCESS_KEY\","
+            + "\"Expiration\":\"" + DateUtils.formatIso8601Date(Instant.now().plus(Duration.ofDays(1)))
+            + "\"}";
+    private static final String TOKEN_HEADER = "x-aws-ec2-metadata-token";
+    private static final String EC2_METADATA_TOKEN_TTL_HEADER = "x-aws-ec2-metadata-token-ttl-seconds";
+
+
+    @Rule
+    public ExpectedException thrown = ExpectedException.none();
+
+    @Rule
+    public WireMockRule mockMetadataEndpoint = new WireMockRule();
+
+    @Before
+    public void methodSetup() {
+        System.setProperty(SdkSystemSetting.AWS_EC2_METADATA_SERVICE_ENDPOINT.property(), "http://localhost:" + mockMetadataEndpoint.port());
+    }
+
+    @AfterClass
+    public static void teardown() {
+        System.clearProperty(SdkSystemSetting.AWS_EC2_METADATA_SERVICE_ENDPOINT.property());
+    }
+
+    @Test
+    public void resolveCredentials_metadataLookupDisabled_throws() {
+        System.setProperty(SdkSystemSetting.AWS_EC2_METADATA_DISABLED.property(), "true");
+        thrown.expect(SdkClientException.class);
+        thrown.expectMessage("Loading credentials from local endpoint is disabled");
+        try {
+            InstanceProfileCredentialsProvider.builder().build().resolveCredentials();
+        } finally {
+            System.clearProperty(SdkSystemSetting.AWS_EC2_METADATA_DISABLED.property());
+        }
+    }
+
+    @Test
+    public void resolveCredentials_requestsIncludeUserAgent() {
+        String stubToken = "some-token";
+        stubFor(put(urlPathEqualTo(TOKEN_RESOURCE_PATH)).willReturn(aResponse().withBody(stubToken)));
+        stubFor(get(urlPathEqualTo(CREDENTIALS_RESOURCE_PATH)).willReturn(aResponse().withBody("some-profile")));
+        stubFor(get(urlPathEqualTo(CREDENTIALS_RESOURCE_PATH + "some-profile")).willReturn(aResponse().withBody(STUB_CREDENTIALS)));
+
+        InstanceProfileCredentialsProvider provider = InstanceProfileCredentialsProvider.builder().build();
+
+        provider.resolveCredentials();
+
+        String userAgentHeader = "User-Agent";
+        String userAgent = UserAgentUtils.getUserAgent();
+        WireMock.verify(putRequestedFor(urlPathEqualTo(TOKEN_RESOURCE_PATH)).withHeader(userAgentHeader, equalTo(userAgent)));
+        WireMock.verify(getRequestedFor(urlPathEqualTo(CREDENTIALS_RESOURCE_PATH)).withHeader(userAgentHeader, equalTo(userAgent)));
+        WireMock.verify(getRequestedFor(urlPathEqualTo(CREDENTIALS_RESOURCE_PATH + "some-profile")).withHeader(userAgentHeader, equalTo(userAgent)));
+    }
+
+    @Test
+    public void resolveCredentials_queriesTokenResource() {
+        stubFor(put(urlPathEqualTo(TOKEN_RESOURCE_PATH)).willReturn(aResponse().withBody("some-token")));
+        stubFor(get(urlPathEqualTo(CREDENTIALS_RESOURCE_PATH)).willReturn(aResponse().withBody("some-profile")));
+        stubFor(get(urlPathEqualTo(CREDENTIALS_RESOURCE_PATH + "some-profile")).willReturn(aResponse().withBody(STUB_CREDENTIALS)));
+
+        InstanceProfileCredentialsProvider provider = InstanceProfileCredentialsProvider.builder().build();
+
+        provider.resolveCredentials();
+
+        WireMock.verify(putRequestedFor(urlPathEqualTo(TOKEN_RESOURCE_PATH)).withHeader(EC2_METADATA_TOKEN_TTL_HEADER, equalTo("21600")));
+    }
+
+    @Test
+    public void resolveCredentials_queriesTokenResource_includedInCredentialsRequests() {
+        String stubToken = "some-token";
+        stubFor(put(urlPathEqualTo(TOKEN_RESOURCE_PATH)).willReturn(aResponse().withBody(stubToken)));
+        stubFor(get(urlPathEqualTo(CREDENTIALS_RESOURCE_PATH)).willReturn(aResponse().withBody("some-profile")));
+        stubFor(get(urlPathEqualTo(CREDENTIALS_RESOURCE_PATH + "some-profile")).willReturn(aResponse().withBody(STUB_CREDENTIALS)));
+
+        InstanceProfileCredentialsProvider provider = InstanceProfileCredentialsProvider.builder().build();
+
+        provider.resolveCredentials();
+
+        WireMock.verify(getRequestedFor(urlPathEqualTo(CREDENTIALS_RESOURCE_PATH)).withHeader(TOKEN_HEADER, equalTo(stubToken)));
+        WireMock.verify(getRequestedFor(urlPathEqualTo(CREDENTIALS_RESOURCE_PATH + "some-profile")).withHeader(TOKEN_HEADER, equalTo(stubToken)));
+    }
+
+    @Test
+    public void resolveCredentials_queriesTokenResource_403Error_fallbackToInsecure() {
+        stubFor(put(urlPathEqualTo(TOKEN_RESOURCE_PATH)).willReturn(aResponse().withStatus(403).withBody("oops")));
+        stubFor(get(urlPathEqualTo(CREDENTIALS_RESOURCE_PATH)).willReturn(aResponse().withBody("some-profile")));
+        stubFor(get(urlPathEqualTo(CREDENTIALS_RESOURCE_PATH + "some-profile")).willReturn(aResponse().withBody(STUB_CREDENTIALS)));
+
+        InstanceProfileCredentialsProvider provider = InstanceProfileCredentialsProvider.builder().build();
+
+        provider.resolveCredentials();
+
+        WireMock.verify(getRequestedFor(urlPathEqualTo(CREDENTIALS_RESOURCE_PATH)));
+        WireMock.verify(getRequestedFor(urlPathEqualTo(CREDENTIALS_RESOURCE_PATH + "some-profile")));
+    }
+
+    @Test
+    public void resolveCredentials_queriesTokenResource_404Error_fallbackToInsecure() {
+        stubFor(put(urlPathEqualTo(TOKEN_RESOURCE_PATH)).willReturn(aResponse().withStatus(404).withBody("oops")));
+        stubFor(get(urlPathEqualTo(CREDENTIALS_RESOURCE_PATH)).willReturn(aResponse().withBody("some-profile")));
+        stubFor(get(urlPathEqualTo(CREDENTIALS_RESOURCE_PATH + "some-profile")).willReturn(aResponse().withBody(STUB_CREDENTIALS)));
+
+        InstanceProfileCredentialsProvider provider = InstanceProfileCredentialsProvider.builder().build();
+
+        provider.resolveCredentials();
+
+        WireMock.verify(getRequestedFor(urlPathEqualTo(CREDENTIALS_RESOURCE_PATH)));
+        WireMock.verify(getRequestedFor(urlPathEqualTo(CREDENTIALS_RESOURCE_PATH + "some-profile")));
+    }
+
+    @Test
+    public void resolveCredentials_queriesTokenResource_405Error_fallbackToInsecure() {
+        stubFor(put(urlPathEqualTo(TOKEN_RESOURCE_PATH)).willReturn(aResponse().withStatus(405).withBody("oops")));
+        stubFor(get(urlPathEqualTo(CREDENTIALS_RESOURCE_PATH)).willReturn(aResponse().withBody("some-profile")));
+        stubFor(get(urlPathEqualTo(CREDENTIALS_RESOURCE_PATH + "some-profile")).willReturn(aResponse().withBody(STUB_CREDENTIALS)));
+
+        InstanceProfileCredentialsProvider provider = InstanceProfileCredentialsProvider.builder().build();
+
+        provider.resolveCredentials();
+
+        WireMock.verify(getRequestedFor(urlPathEqualTo(CREDENTIALS_RESOURCE_PATH)));
+        WireMock.verify(getRequestedFor(urlPathEqualTo(CREDENTIALS_RESOURCE_PATH + "some-profile")));
+    }
+
+    @Test
+    public void resolveCredentials_queriesTokenResource_400Error_throws() {
+        thrown.expect(SdkClientException.class);
+        thrown.expectMessage("token");
+
+        stubFor(put(urlPathEqualTo(TOKEN_RESOURCE_PATH)).willReturn(aResponse().withStatus(400).withBody("oops")));
+
+        InstanceProfileCredentialsProvider provider = InstanceProfileCredentialsProvider.builder().build();
+
+        provider.resolveCredentials();
+    }
+
+    @Test
+    public void resolveCredentials_queriesTokenResource_socketTimeout_fallbackToInsecure() {
+        stubFor(put(urlPathEqualTo(TOKEN_RESOURCE_PATH)).willReturn(aResponse().withBody("some-token").withFixedDelay(Integer.MAX_VALUE)));
+        stubFor(get(urlPathEqualTo(CREDENTIALS_RESOURCE_PATH)).willReturn(aResponse().withBody("some-profile")));
+        stubFor(get(urlPathEqualTo(CREDENTIALS_RESOURCE_PATH + "some-profile")).willReturn(aResponse().withBody(STUB_CREDENTIALS)));
+
+        InstanceProfileCredentialsProvider provider = InstanceProfileCredentialsProvider.builder().build();
+
+        provider.resolveCredentials();
+
+        WireMock.verify(getRequestedFor(urlPathEqualTo(CREDENTIALS_RESOURCE_PATH)));
+        WireMock.verify(getRequestedFor(urlPathEqualTo(CREDENTIALS_RESOURCE_PATH + "some-profile")));
+    }
+
+    @Test
+    public void resolveCredentials_endpointSettingEmpty_throws() {
+        thrown.expect(SdkClientException.class);
+
+        System.setProperty(SdkSystemSetting.AWS_EC2_METADATA_SERVICE_ENDPOINT.property(), "");
+        InstanceProfileCredentialsProvider provider = InstanceProfileCredentialsProvider.builder().build();
+
+        provider.resolveCredentials();
+    }
+
+    @Test
+    public void resolveCredentials_endpointSettingHostNotExists_throws() {
+        thrown.expect(SdkClientException.class);
+
+        System.setProperty(SdkSystemSetting.AWS_EC2_METADATA_SERVICE_ENDPOINT.property(), "some-host-that-does-not-exist");
+        InstanceProfileCredentialsProvider provider = InstanceProfileCredentialsProvider.builder().build();
+
+        provider.resolveCredentials();
+    }
+}
diff --git a/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/NoopTestRequest.java b/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/NoopTestRequest.java
index 3cfbacec90d9..ba1e9eb60163 100644
--- a/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/NoopTestRequest.java
+++ b/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/NoopTestRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/ProcessCredentialsProviderTest.java b/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/ProcessCredentialsProviderTest.java
index 81fc65413d52..95dc28c091a5 100644
--- a/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/ProcessCredentialsProviderTest.java
+++ b/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/ProcessCredentialsProviderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -24,6 +24,8 @@
 import java.io.UncheckedIOException;
 import java.time.Duration;
 import java.time.Instant;
+
+import org.assertj.core.api.Assertions;
 import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.BeforeClass;
@@ -33,6 +35,9 @@
 import software.amazon.awssdk.utils.Platform;
 
 public class ProcessCredentialsProviderTest {
+
+    private final static String PROCESS_RESOURCE_PATH = "/resources/process/";
+    private final static String RANDOM_SESSION_TOKEN = "RANDOM_TOKEN";
     private static String scriptLocation;
  
     @BeforeClass
@@ -98,8 +103,10 @@ public void resultsAreCached() {
     public void expirationBufferOverrideIsApplied() {
         ProcessCredentialsProvider credentialsProvider =
                 ProcessCredentialsProvider.builder()
-                                          .command(scriptLocation + " accessKeyId secretAccessKey sessionToken " +
-                                                   DateUtils.formatIso8601Date(Instant.now().plusSeconds(20)))
+                                          .command(String.format("%s accessKeyId secretAccessKey %s %s",
+                                                         scriptLocation,
+                                                         RANDOM_SESSION_TOKEN,
+                                                         DateUtils.formatIso8601Date(Instant.now().plusSeconds(20))))
                                           .credentialRefreshThreshold(Duration.ofSeconds(20))
                                           .build();
 
@@ -132,10 +139,36 @@ public void processOutputLimitIsEnforced() {
                                   .resolveCredentials();
     }
 
+    @Test
+    public void processOutputLimitDefaultPassesLargeInput() {
+
+        String LONG_SESSION_TOKEN = "lYzvmByqdS1E69QQVEavDDHabQ2GuYKYABKRA4xLbAXpdnFtV030UH4" +
+                "bQoZWCDcfADFvBwBm3ixEFTYMjn5XQozpFV2QAsWHirCVcEJ5DC60KPCNBcDi4KLNJfbsp3r6kKTOmYOeqhEyiC4emDX33X2ppZsa5" +
+                "1iwr6ShIZPOUPmuR4WDglmWubgO2q5tZv48xA5idkcHEmtGdoL343sY24q4gMh21eeBnF6ikjZdfvZ0Mn86UQ8r05AD346rSwM5bFs" +
+                "t019ZkJIjLHD3HoKJ44EndRvSvQClXfJCmmQDH5INiXdFLLNm0dzT3ynbVIW5x1YYBWptyts4NUSy2eJ3dTPjYICpQVCkbuNVA7PqR" +
+                "ctUyE8lU7uvnrIVnx9xTgl34J6D9VJKHQkPuGvbtN6w4CVtXoPAQcE8tlkKyOQmIeqEahhaqLW15t692SI6hwBW0b8DxCQawX5ukt4" +
+                "f5gZoRFz3u8qHMSnm5oEnTgv7C5AAs0V680YvelFMNYvSoSbDnoThxfTIG9msj7WBh7iNa7mI8TXmvOegQtDWR011ZOo8dR3jnhWNH" +
+                "nSW4CRB7iSC5DMZ2y56dYS28XGBl01LYXF5ZTJJfLwQEhbRWSTdXIBJq07E0YxRu0SaLokA4uknOoicwXnD7LMCld4hFjuypYgWBuk" +
+                "3pC09CPA0MJjQNTTAvxGqDTqSWoXWDZRIMUWyGyz3FCkpPUjv4mIpVYt2bGl6cHsMBzVnpL6yXMCw2mNqJx8Rvi4gQaHH6LzvHbVKR" +
+                "w4kE53703DNOc8cA9Zc0efJa4NHOFxc4XmMOtjGW7vbWPp0CTVCJLG94ddSFJrimpamPM59bs12x2ih51EpOFR5ITIxJnd79HEkYDU" +
+                "xRIOuPIe4VpM01RnFN4g3ChDqmjQ03wQY9I8Mvh59u3MujggQfwAhCc84MAz0jVukoMfhAAhMNUPLuwRj0qpqr6B3DdKZ4KDFWF2Ga" +
+                "Iu1sEFlKvPdfF1uefbTj6YdjUciWu1UBH47VbIcTbvbwmUiu2javB21kOenyDoelK5GUM4u0uPeXIOOhtZsJb8kz88h1joWkaKr2fc" +
+                "jrIS08FM47Y4Z2Mi4zfwyN54L";
+
+        ProcessCredentialsProvider credentialsProvider = ProcessCredentialsProvider.builder()
+                .command(scriptLocation + " accessKeyId secretAccessKey " + LONG_SESSION_TOKEN)
+                .build();
+
+        AwsSessionCredentials sessionCredentials = (AwsSessionCredentials) credentialsProvider.resolveCredentials();
+
+        Assertions.assertThat(sessionCredentials.accessKeyId()).isEqualTo("accessKeyId");
+        Assertions.assertThat(sessionCredentials.sessionToken()).isNotNull();
+    }
+
     public static String copyProcessCredentialsScript() {
         String scriptClasspathFilename = Platform.isWindows() ? "windows-credentials-script.bat"
                                                               : "linux-credentials-script.sh";
-        String scriptClasspathLocation = "/resources/process/" + scriptClasspathFilename;
+        String scriptClasspathLocation = PROCESS_RESOURCE_PATH + scriptClasspathFilename;
 
         InputStream scriptInputStream = null;
         OutputStream scriptOutputStream = null;
diff --git a/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/ProfileCredentialsProviderTest.java b/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/ProfileCredentialsProviderTest.java
index 3de935acb09b..8be07bb42bf0 100644
--- a/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/ProfileCredentialsProviderTest.java
+++ b/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/ProfileCredentialsProviderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/StaticCredentialsProviderTest.java b/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/StaticCredentialsProviderTest.java
index feefc4b1ded7..19c99236eee6 100644
--- a/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/StaticCredentialsProviderTest.java
+++ b/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/StaticCredentialsProviderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/internal/AwsSessionCredentialsTest.java b/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/internal/AwsSessionCredentialsTest.java
index e2f47fc1355c..de34421dee4b 100644
--- a/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/internal/AwsSessionCredentialsTest.java
+++ b/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/internal/AwsSessionCredentialsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/internal/LazyAwsCredentialsProviderTest.java b/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/internal/LazyAwsCredentialsProviderTest.java
index f669402b1fac..25fcbd0f1f2a 100644
--- a/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/internal/LazyAwsCredentialsProviderTest.java
+++ b/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/internal/LazyAwsCredentialsProviderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/internal/ProfileCredentialsUtilsTest.java b/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/internal/ProfileCredentialsUtilsTest.java
index 9ab5e24161eb..eaf9a1f067e7 100644
--- a/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/internal/ProfileCredentialsUtilsTest.java
+++ b/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/internal/ProfileCredentialsUtilsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/auth/src/test/java/software/amazon/awssdk/auth/signer/AbstractAws4SignerTest.java b/core/auth/src/test/java/software/amazon/awssdk/auth/signer/AbstractAws4SignerTest.java
index 6176784ec531..9b028c2444bf 100644
--- a/core/auth/src/test/java/software/amazon/awssdk/auth/signer/AbstractAws4SignerTest.java
+++ b/core/auth/src/test/java/software/amazon/awssdk/auth/signer/AbstractAws4SignerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/auth/src/test/java/software/amazon/awssdk/auth/signer/Aws4EventStreamSignerTest.java b/core/auth/src/test/java/software/amazon/awssdk/auth/signer/Aws4EventStreamSignerTest.java
index c77d9fe0512f..eedded3748f9 100644
--- a/core/auth/src/test/java/software/amazon/awssdk/auth/signer/Aws4EventStreamSignerTest.java
+++ b/core/auth/src/test/java/software/amazon/awssdk/auth/signer/Aws4EventStreamSignerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/auth/src/test/java/software/amazon/awssdk/auth/signer/Aws4SignerTest.java b/core/auth/src/test/java/software/amazon/awssdk/auth/signer/Aws4SignerTest.java
index e36a52f3b22e..ef2ee593a995 100644
--- a/core/auth/src/test/java/software/amazon/awssdk/auth/signer/Aws4SignerTest.java
+++ b/core/auth/src/test/java/software/amazon/awssdk/auth/signer/Aws4SignerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/auth/src/test/java/software/amazon/awssdk/auth/signer/EventStreamAws4SignerTest.java b/core/auth/src/test/java/software/amazon/awssdk/auth/signer/EventStreamAws4SignerTest.java
new file mode 100644
index 000000000000..6c4b8bbec0a2
--- /dev/null
+++ b/core/auth/src/test/java/software/amazon/awssdk/auth/signer/EventStreamAws4SignerTest.java
@@ -0,0 +1,105 @@
+package software.amazon.awssdk.auth.signer;
+
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import io.reactivex.Flowable;
+import java.net.URI;
+import java.nio.ByteBuffer;
+import java.time.Clock;
+import java.time.Instant;
+import java.time.ZoneId;
+import java.time.ZoneOffset;
+import java.util.Base64;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.Callable;
+import org.junit.Test;
+import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
+import software.amazon.awssdk.auth.credentials.AwsCredentials;
+import software.amazon.awssdk.auth.signer.internal.SignerTestUtils;
+import software.amazon.awssdk.core.async.AsyncRequestBody;
+import software.amazon.awssdk.http.SdkHttpFullRequest;
+import software.amazon.awssdk.http.SdkHttpMethod;
+import software.amazon.awssdk.regions.Region;
+import software.amazon.eventstream.HeaderValue;
+import software.amazon.eventstream.Message;
+import software.amazon.eventstream.MessageDecoder;
+
+public class EventStreamAws4SignerTest {
+    /**
+     * Verify that when an event stream is open from one day to the next, the signature is properly signed for the day of the
+     * event.
+     */
+    @Test
+    public void openStreamEventSignaturesCanRollOverBetweenDays() {
+        EventStreamAws4Signer signer = EventStreamAws4Signer.create();
+
+        Region region = Region.US_WEST_2;
+        AwsCredentials credentials = AwsBasicCredentials.create("a", "s");
+        String signingName = "name";
+        AdjustableClock clock = new AdjustableClock();
+        clock.time = Instant.parse("2020-01-01T23:59:59Z");
+
+        SdkHttpFullRequest initialRequest = SdkHttpFullRequest.builder()
+                                                              .uri(URI.create("http://localhost:8080"))
+                                                              .method(SdkHttpMethod.GET)
+                                                              .build();
+        SdkHttpFullRequest signedRequest = SignerTestUtils.signRequest(signer, initialRequest, credentials, signingName, clock,
+                                                                       region.id());
+
+        ByteBuffer event = new Message(Collections.emptyMap(), "foo".getBytes(UTF_8)).toByteBuffer();
+
+        Callable<ByteBuffer> lastEvent = () -> {
+            clock.time = Instant.parse("2020-01-02T00:00:00Z");
+            return event;
+        };
+
+        AsyncRequestBody requestBody = AsyncRequestBody.fromPublisher(Flowable.concatArray(Flowable.just(event),
+                                                                                           Flowable.fromCallable(lastEvent)));
+
+        AsyncRequestBody signedBody = SignerTestUtils.signAsyncRequest(signer, signedRequest, requestBody, credentials,
+                                                                       signingName, clock, region.id());
+
+        List<Message> signedMessages = readMessages(signedBody);
+        assertThat(signedMessages.size()).isEqualTo(3);
+
+        Map<String, HeaderValue> firstMessageHeaders = signedMessages.get(0).getHeaders();
+        assertThat(firstMessageHeaders.get(":date").getTimestamp()).isEqualTo("2020-01-01T23:59:59Z");
+        assertThat(Base64.getEncoder().encodeToString(firstMessageHeaders.get(":chunk-signature").getByteArray()))
+            .isEqualTo("EFt7ZU043r/TJE8U+1GxJXscmNxoqmIdGtUIl8wE9u0=");
+
+        Map<String, HeaderValue> lastMessageHeaders = signedMessages.get(2).getHeaders();
+        assertThat(lastMessageHeaders.get(":date").getTimestamp()).isEqualTo("2020-01-02T00:00:00Z");
+        assertThat(Base64.getEncoder().encodeToString(lastMessageHeaders.get(":chunk-signature").getByteArray()))
+            .isEqualTo("UTRGo0D7BQytiVkH1VofR/8f3uFsM4V5QR1A8grr1+M=");
+
+    }
+
+    private List<Message> readMessages(AsyncRequestBody signedBody) {
+        MessageDecoder decoder = new MessageDecoder();
+        Flowable.fromPublisher(signedBody).blockingForEach(x -> decoder.feed(x.array()));
+        return decoder.getDecodedMessages();
+    }
+
+    private static class AdjustableClock extends Clock {
+        private Instant time;
+
+        @Override
+        public ZoneId getZone() {
+            return ZoneOffset.UTC;
+        }
+
+        @Override
+        public Clock withZone(ZoneId zone) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public Instant instant() {
+            return time;
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/core/auth/src/test/java/software/amazon/awssdk/auth/signer/internal/Aws4SignerRequestParamsTest.java b/core/auth/src/test/java/software/amazon/awssdk/auth/signer/internal/Aws4SignerRequestParamsTest.java
index 58eaeb33b388..8b470001fbb0 100644
--- a/core/auth/src/test/java/software/amazon/awssdk/auth/signer/internal/Aws4SignerRequestParamsTest.java
+++ b/core/auth/src/test/java/software/amazon/awssdk/auth/signer/internal/Aws4SignerRequestParamsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/auth/src/test/java/software/amazon/awssdk/auth/signer/internal/BaseEventStreamAsyncAws4SignerTest.java b/core/auth/src/test/java/software/amazon/awssdk/auth/signer/internal/BaseEventStreamAsyncAws4SignerTest.java
new file mode 100644
index 000000000000..6e78ea6f8f79
--- /dev/null
+++ b/core/auth/src/test/java/software/amazon/awssdk/auth/signer/internal/BaseEventStreamAsyncAws4SignerTest.java
@@ -0,0 +1,89 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.auth.signer.internal;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import java.util.Arrays;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Random;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import software.amazon.awssdk.utils.BinaryUtils;
+import software.amazon.eventstream.HeaderValue;
+import software.amazon.eventstream.Message;
+
+public class BaseEventStreamAsyncAws4SignerTest {
+    private static Map<String, HeaderValue> headers;
+
+    @BeforeClass
+    public static void setup() {
+        headers = new LinkedHashMap<>();
+        headers.put("header1", HeaderValue.fromInteger(42));
+        headers.put("header2", HeaderValue.fromBoolean(false));
+        headers.put("header3", HeaderValue.fromString("Hello world"));
+    }
+
+    @Test
+    public void toDebugString_emptyPayload_generatesCorrectString() {
+        Message m = new Message(headers, new byte[0]);
+
+        assertThat(BaseEventStreamAsyncAws4Signer.toDebugString(m, false))
+                .isEqualTo("Message = {headers={header1={42}, header2={false}, header3={\"Hello world\"}}, payload=}");
+    }
+
+    @Test
+    public void toDebugString_noHeaders_emptyPayload_generatesCorrectString() {
+        Message m = new Message(new LinkedHashMap<>(), new byte[0]);
+
+        assertThat(BaseEventStreamAsyncAws4Signer.toDebugString(m, false))
+                .isEqualTo("Message = {headers={}, payload=}");
+    }
+
+    @Test
+    public void toDebugString_largePayload_truncate_generatesCorrectString() {
+        byte[] payload = new byte[128];
+        new Random().nextBytes(payload);
+        Message m = new Message(headers, payload);
+
+        byte[] first32 = Arrays.copyOf(payload, 32);
+        String expectedPayloadString = BinaryUtils.toHex(first32);
+        assertThat(BaseEventStreamAsyncAws4Signer.toDebugString(m, true))
+                .isEqualTo("Message = {headers={header1={42}, header2={false}, header3={\"Hello world\"}}, payload=" + expectedPayloadString + "...}");
+    }
+
+    @Test
+    public void toDebugString_largePayload_noTruncate_generatesCorrectString() {
+        byte[] payload = new byte[128];
+        new Random().nextBytes(payload);
+        Message m = new Message(headers, payload);
+
+        String expectedPayloadString = BinaryUtils.toHex(payload);
+        assertThat(BaseEventStreamAsyncAws4Signer.toDebugString(m, false))
+                .isEqualTo("Message = {headers={header1={42}, header2={false}, header3={\"Hello world\"}}, payload=" + expectedPayloadString + "}");
+    }
+
+    @Test
+    public void toDebugString_smallPayload_truncate_doesNotAddEllipsis() {
+        byte[] payload = new byte[8];
+        new Random().nextBytes(payload);
+        Message m = new Message(headers, payload);
+
+        String expectedPayloadString = BinaryUtils.toHex(payload);
+        assertThat(BaseEventStreamAsyncAws4Signer.toDebugString(m, true))
+                .isEqualTo("Message = {headers={header1={42}, header2={false}, header3={\"Hello world\"}}, payload=" + expectedPayloadString + "}");
+    }
+}
diff --git a/core/auth/src/test/java/software/amazon/awssdk/auth/signer/internal/FifoCacheTest.java b/core/auth/src/test/java/software/amazon/awssdk/auth/signer/internal/FifoCacheTest.java
index 244e56185729..7988bc17db3e 100644
--- a/core/auth/src/test/java/software/amazon/awssdk/auth/signer/internal/FifoCacheTest.java
+++ b/core/auth/src/test/java/software/amazon/awssdk/auth/signer/internal/FifoCacheTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/auth/src/test/java/software/amazon/awssdk/auth/signer/internal/SignerKeyTest.java b/core/auth/src/test/java/software/amazon/awssdk/auth/signer/internal/SignerKeyTest.java
new file mode 100644
index 000000000000..9100c163965c
--- /dev/null
+++ b/core/auth/src/test/java/software/amazon/awssdk/auth/signer/internal/SignerKeyTest.java
@@ -0,0 +1,50 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.auth.signer.internal;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import java.time.Instant;
+import org.junit.Test;
+
+public class SignerKeyTest {
+
+    @Test
+    public void isValidForDate_dayBefore_false() {
+        Instant signerDate = Instant.parse("2020-03-03T23:59:59Z");
+        SignerKey key = new SignerKey(signerDate, new byte[0]);
+        Instant dayBefore = Instant.parse("2020-03-02T23:59:59Z");
+
+        assertThat(key.isValidForDate(dayBefore)).isFalse();
+    }
+
+    @Test
+    public void isValidForDate_sameDay_true() {
+        Instant signerDate = Instant.parse("2020-03-03T23:59:59Z");
+        SignerKey key = new SignerKey(signerDate, new byte[0]);
+        Instant sameDay = Instant.parse("2020-03-03T01:02:03Z");
+
+        assertThat(key.isValidForDate(sameDay)).isTrue();
+    }
+
+    @Test
+    public void isValidForDate_dayAfter_false() {
+        Instant signerDate = Instant.parse("2020-03-03T23:59:59Z");
+        SignerKey key = new SignerKey(signerDate, new byte[0]);
+        Instant dayAfter = Instant.parse("2020-03-04T00:00:00Z");
+
+        assertThat(key.isValidForDate(dayAfter)).isFalse();
+    }
+}
diff --git a/core/auth/src/test/java/software/amazon/awssdk/auth/signer/internal/SignerTestUtils.java b/core/auth/src/test/java/software/amazon/awssdk/auth/signer/internal/SignerTestUtils.java
index cb9bf935a674..9fc7be4e6fd0 100644
--- a/core/auth/src/test/java/software/amazon/awssdk/auth/signer/internal/SignerTestUtils.java
+++ b/core/auth/src/test/java/software/amazon/awssdk/auth/signer/internal/SignerTestUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/auth/src/test/resources/jetty-logging.properties b/core/auth/src/test/resources/jetty-logging.properties
index 0b7cafa3b426..6d7baed3e770 100644
--- a/core/auth/src/test/resources/jetty-logging.properties
+++ b/core/auth/src/test/resources/jetty-logging.properties
@@ -1,3 +1,18 @@
+#
+# 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.
+#
+
 # Set up logging implementation
 org.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.StdErrLog
 org.eclipse.jetty.LEVEL=INFO
diff --git a/core/auth/src/test/resources/log4j.properties b/core/auth/src/test/resources/log4j.properties
index 63c957f7a291..f59ce7e9b749 100644
--- a/core/auth/src/test/resources/log4j.properties
+++ b/core/auth/src/test/resources/log4j.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/core/auth/src/test/resources/resources/process/linux-credentials-script.sh b/core/auth/src/test/resources/resources/process/linux-credentials-script.sh
index 9d2b51a171cb..03c802ec3034 100644
--- a/core/auth/src/test/resources/resources/process/linux-credentials-script.sh
+++ b/core/auth/src/test/resources/resources/process/linux-credentials-script.sh
@@ -4,8 +4,12 @@ echo '"Version": 1,';
 echo "\"AccessKeyId\": \"$1\",";
 echo "\"SecretAccessKey\": \"$2\"";
 if [[ $# -ge 3 ]]; then
-    echo ','
-    echo "\"SessionToken\": \"$RANDOM\"";
+    echo ',';
+    if [[ "$3" = "RANDOM_TOKEN" ]]; then
+        echo "\"SessionToken\": \"$RANDOM\""
+    else
+        echo "\"SessionToken\": \"$3\""
+    fi;
 fi;
 if [[ $# -ge 4 ]]; then
     echo ','
diff --git a/core/auth/src/test/resources/resources/process/windows-credentials-script.bat b/core/auth/src/test/resources/resources/process/windows-credentials-script.bat
index c8cabe4967aa..bb5ed72f070c 100644
--- a/core/auth/src/test/resources/resources/process/windows-credentials-script.bat
+++ b/core/auth/src/test/resources/resources/process/windows-credentials-script.bat
@@ -6,7 +6,11 @@ ECHO "AccessKeyId": "%1",
 ECHO "SecretAccessKey": "%2"
 IF NOT "%3"=="" (
     ECHO ,
-    ECHO "SessionToken": "%RANDOM"
+    IF "%3"=="RANDOM_TOKEN" (
+        ECHO "SessionToken": "%RANDOM%"
+    ) ELSE (
+        ECHO "SessionToken": "%3"
+    )
 )
 IF NOT "%4"=="" (
     ECHO ,
diff --git a/core/aws-core/pom.xml b/core/aws-core/pom.xml
index c4ca3e133f76..911bb417db04 100644
--- a/core/aws-core/pom.xml
+++ b/core/aws-core/pom.xml
@@ -1,4 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ 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.
+  -->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -7,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>core</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
 
     <artifactId>aws-core</artifactId>
@@ -33,6 +48,11 @@
             <artifactId>auth</artifactId>
             <version>${awsjavasdk.version}</version>
         </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>profiles</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
         <dependency>
             <artifactId>sdk-core</artifactId>
             <groupId>software.amazon.awssdk</groupId>
diff --git a/core/aws-core/src/main/java/software/amazon/awssdk/awscore/AwsExecutionAttribute.java b/core/aws-core/src/main/java/software/amazon/awssdk/awscore/AwsExecutionAttribute.java
index a58e8485a991..4071e0bec0ff 100644
--- a/core/aws-core/src/main/java/software/amazon/awssdk/awscore/AwsExecutionAttribute.java
+++ b/core/aws-core/src/main/java/software/amazon/awssdk/awscore/AwsExecutionAttribute.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -17,6 +17,7 @@
 
 import software.amazon.awssdk.annotations.SdkPublicApi;
 import software.amazon.awssdk.auth.signer.AwsSignerExecutionAttribute;
+import software.amazon.awssdk.awscore.client.config.AwsClientOption;
 import software.amazon.awssdk.core.interceptor.ExecutionAttribute;
 import software.amazon.awssdk.core.interceptor.ExecutionInterceptor;
 import software.amazon.awssdk.core.interceptor.SdkExecutionAttribute;
@@ -33,5 +34,11 @@ public final class AwsExecutionAttribute extends SdkExecutionAttribute {
      */
     public static final ExecutionAttribute<Region> AWS_REGION = new ExecutionAttribute<>("AwsRegion");
 
-    private AwsExecutionAttribute() {}
+    /**
+     * The {@link AwsClientOption#ENDPOINT_PREFIX} for the client.
+     */
+    public static final ExecutionAttribute<String> ENDPOINT_PREFIX = new ExecutionAttribute<>("AwsEndpointPrefix");
+
+    private AwsExecutionAttribute() {
+    }
 }
diff --git a/core/aws-core/src/main/java/software/amazon/awssdk/awscore/AwsRequest.java b/core/aws-core/src/main/java/software/amazon/awssdk/awscore/AwsRequest.java
index 455f114d3a24..e993a66cbc2c 100644
--- a/core/aws-core/src/main/java/software/amazon/awssdk/awscore/AwsRequest.java
+++ b/core/aws-core/src/main/java/software/amazon/awssdk/awscore/AwsRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/aws-core/src/main/java/software/amazon/awssdk/awscore/AwsRequestOverrideConfiguration.java b/core/aws-core/src/main/java/software/amazon/awssdk/awscore/AwsRequestOverrideConfiguration.java
index 17cb2b02f41f..da8f7e7abd92 100644
--- a/core/aws-core/src/main/java/software/amazon/awssdk/awscore/AwsRequestOverrideConfiguration.java
+++ b/core/aws-core/src/main/java/software/amazon/awssdk/awscore/AwsRequestOverrideConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/aws-core/src/main/java/software/amazon/awssdk/awscore/AwsResponse.java b/core/aws-core/src/main/java/software/amazon/awssdk/awscore/AwsResponse.java
index 61659aa0cb30..15f21e97457c 100644
--- a/core/aws-core/src/main/java/software/amazon/awssdk/awscore/AwsResponse.java
+++ b/core/aws-core/src/main/java/software/amazon/awssdk/awscore/AwsResponse.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/aws-core/src/main/java/software/amazon/awssdk/awscore/AwsResponseMetadata.java b/core/aws-core/src/main/java/software/amazon/awssdk/awscore/AwsResponseMetadata.java
index 9b61de5a9b05..f9e326f62317 100644
--- a/core/aws-core/src/main/java/software/amazon/awssdk/awscore/AwsResponseMetadata.java
+++ b/core/aws-core/src/main/java/software/amazon/awssdk/awscore/AwsResponseMetadata.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/aws-core/src/main/java/software/amazon/awssdk/awscore/DefaultAwsResponseMetadata.java b/core/aws-core/src/main/java/software/amazon/awssdk/awscore/DefaultAwsResponseMetadata.java
index 528792e54e2b..eaa8fa2fc2d5 100644
--- a/core/aws-core/src/main/java/software/amazon/awssdk/awscore/DefaultAwsResponseMetadata.java
+++ b/core/aws-core/src/main/java/software/amazon/awssdk/awscore/DefaultAwsResponseMetadata.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/aws-core/src/main/java/software/amazon/awssdk/awscore/client/builder/AwsAsyncClientBuilder.java b/core/aws-core/src/main/java/software/amazon/awssdk/awscore/client/builder/AwsAsyncClientBuilder.java
index 60d211345992..a318d2016c81 100644
--- a/core/aws-core/src/main/java/software/amazon/awssdk/awscore/client/builder/AwsAsyncClientBuilder.java
+++ b/core/aws-core/src/main/java/software/amazon/awssdk/awscore/client/builder/AwsAsyncClientBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/aws-core/src/main/java/software/amazon/awssdk/awscore/client/builder/AwsClientBuilder.java b/core/aws-core/src/main/java/software/amazon/awssdk/awscore/client/builder/AwsClientBuilder.java
index 1d086185633e..e8b22a8b28d7 100644
--- a/core/aws-core/src/main/java/software/amazon/awssdk/awscore/client/builder/AwsClientBuilder.java
+++ b/core/aws-core/src/main/java/software/amazon/awssdk/awscore/client/builder/AwsClientBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/aws-core/src/main/java/software/amazon/awssdk/awscore/client/builder/AwsDefaultClientBuilder.java b/core/aws-core/src/main/java/software/amazon/awssdk/awscore/client/builder/AwsDefaultClientBuilder.java
index 98b1ae31d582..d775c9016cb8 100644
--- a/core/aws-core/src/main/java/software/amazon/awssdk/awscore/client/builder/AwsDefaultClientBuilder.java
+++ b/core/aws-core/src/main/java/software/amazon/awssdk/awscore/client/builder/AwsDefaultClientBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -16,6 +16,8 @@
 package software.amazon.awssdk.awscore.client.builder;
 
 import java.net.URI;
+import java.util.Collections;
+import java.util.List;
 import java.util.Optional;
 import software.amazon.awssdk.annotations.SdkProtectedApi;
 import software.amazon.awssdk.annotations.SdkTestInternalApi;
@@ -23,20 +25,24 @@
 import software.amazon.awssdk.auth.credentials.DefaultCredentialsProvider;
 import software.amazon.awssdk.awscore.client.config.AwsAdvancedClientOption;
 import software.amazon.awssdk.awscore.client.config.AwsClientOption;
-import software.amazon.awssdk.awscore.internal.EndpointUtils;
+import software.amazon.awssdk.awscore.endpoint.DefaultServiceEndpointBuilder;
+import software.amazon.awssdk.awscore.interceptor.HelpfulUnknownHostExceptionInterceptor;
 import software.amazon.awssdk.awscore.retry.AwsRetryPolicy;
 import software.amazon.awssdk.core.client.builder.SdkDefaultClientBuilder;
 import software.amazon.awssdk.core.client.config.SdkAdvancedClientOption;
 import software.amazon.awssdk.core.client.config.SdkClientConfiguration;
 import software.amazon.awssdk.core.client.config.SdkClientOption;
+import software.amazon.awssdk.core.interceptor.ExecutionInterceptor;
+import software.amazon.awssdk.core.retry.RetryMode;
+import software.amazon.awssdk.core.retry.RetryPolicy;
 import software.amazon.awssdk.http.SdkHttpClient;
 import software.amazon.awssdk.http.async.SdkAsyncHttpClient;
+import software.amazon.awssdk.profiles.ProfileFile;
 import software.amazon.awssdk.regions.Region;
 import software.amazon.awssdk.regions.ServiceMetadata;
-import software.amazon.awssdk.regions.providers.AwsRegionProvider;
 import software.amazon.awssdk.regions.providers.DefaultAwsRegionProviderChain;
-import software.amazon.awssdk.regions.providers.LazyAwsRegionProvider;
 import software.amazon.awssdk.utils.AttributeMap;
+import software.amazon.awssdk.utils.CollectionUtils;
 
 /**
  * An SDK-internal implementation of the methods in {@link AwsClientBuilder}, {@link AwsAsyncClientBuilder} and
@@ -61,8 +67,6 @@ public abstract class AwsDefaultClientBuilder<BuilderT extends AwsClientBuilder<
     extends SdkDefaultClientBuilder<BuilderT, ClientT>
     implements AwsClientBuilder<BuilderT, ClientT> {
     private static final String DEFAULT_ENDPOINT_PROTOCOL = "https";
-    private static final AwsRegionProvider DEFAULT_REGION_PROVIDER =
-            new LazyAwsRegionProvider(DefaultAwsRegionProviderChain::new);
 
     protected AwsDefaultClientBuilder() {
         super();
@@ -108,13 +112,12 @@ protected AttributeMap serviceHttpConfig() {
     @Override
     protected final SdkClientConfiguration mergeChildDefaults(SdkClientConfiguration configuration) {
         SdkClientConfiguration config = mergeServiceDefaults(configuration);
-        return config.merge(c -> c.option(AwsClientOption.AWS_REGION, resolveRegion(config))
-                                  .option(AwsAdvancedClientOption.ENABLE_DEFAULT_REGION_DETECTION, true)
-                                  .option(AwsClientOption.CREDENTIALS_PROVIDER, DefaultCredentialsProvider.create())
-                                  .option(SdkClientOption.RETRY_POLICY, AwsRetryPolicy.defaultRetryPolicy())
+
+        return config.merge(c -> c.option(AwsAdvancedClientOption.ENABLE_DEFAULT_REGION_DETECTION, true)
                                   .option(SdkAdvancedClientOption.DISABLE_HOST_PREFIX_INJECTION, false)
                                   .option(AwsClientOption.SERVICE_SIGNING_NAME, signingName())
-                                  .option(SdkClientOption.SERVICE_NAME, serviceName()));
+                                  .option(SdkClientOption.SERVICE_NAME, serviceName())
+                                  .option(AwsClientOption.ENDPOINT_PREFIX, serviceEndpointPrefix()));
     }
 
     /**
@@ -126,11 +129,19 @@ protected SdkClientConfiguration mergeServiceDefaults(SdkClientConfiguration con
 
     @Override
     protected final SdkClientConfiguration finalizeChildConfiguration(SdkClientConfiguration configuration) {
-        SdkClientConfiguration config = configuration.toBuilder()
-                                                     .option(SdkClientOption.ENDPOINT, resolveEndpoint(configuration))
-                                                     .option(AwsClientOption.SIGNING_REGION, resolveSigningRegion(configuration))
-                                                     .build();
-        return finalizeServiceConfiguration(config);
+        configuration = finalizeServiceConfiguration(configuration);
+
+        configuration = configuration.toBuilder()
+                                     .option(AwsClientOption.AWS_REGION, resolveRegion(configuration))
+                                     .build();
+
+        return configuration.toBuilder()
+                            .option(AwsClientOption.CREDENTIALS_PROVIDER, resolveCredentials(configuration))
+                            .option(SdkClientOption.ENDPOINT, resolveEndpoint(configuration))
+                            .option(SdkClientOption.EXECUTION_INTERCEPTORS, addAwsInterceptors(configuration))
+                            .option(AwsClientOption.SIGNING_REGION, resolveSigningRegion(configuration))
+                            .option(SdkClientOption.RETRY_POLICY, resolveAwsRetryPolicy(configuration))
+                            .build();
     }
 
     /**
@@ -153,9 +164,15 @@ private Region resolveSigningRegion(SdkClientConfiguration config) {
      */
     private URI resolveEndpoint(SdkClientConfiguration config) {
         return Optional.ofNullable(config.option(SdkClientOption.ENDPOINT))
-                       .orElseGet(() -> EndpointUtils.buildEndpoint(DEFAULT_ENDPOINT_PROTOCOL,
-                                                                    serviceEndpointPrefix(),
-                                                                    config.option(AwsClientOption.AWS_REGION)));
+                       .orElseGet(() -> endpointFromConfig(config));
+    }
+
+    private URI endpointFromConfig(SdkClientConfiguration config) {
+        return new DefaultServiceEndpointBuilder(serviceEndpointPrefix(), DEFAULT_ENDPOINT_PROTOCOL)
+            .withRegion(config.option(AwsClientOption.AWS_REGION))
+            .withProfileFile(config.option(SdkClientOption.PROFILE_FILE))
+            .withProfileName(config.option(SdkClientOption.PROFILE_NAME))
+            .getServiceEndpoint();
     }
 
     /**
@@ -175,7 +192,44 @@ private Region regionFromDefaultProvider(SdkClientConfiguration config) {
         if (defaultRegionDetectionEnabled != null && !defaultRegionDetectionEnabled) {
             throw new IllegalStateException("No region was configured, and use-region-provider-chain was disabled.");
         }
-        return DEFAULT_REGION_PROVIDER.getRegion();
+
+        ProfileFile profileFile = config.option(SdkClientOption.PROFILE_FILE);
+        String profileName = config.option(SdkClientOption.PROFILE_NAME);
+        return DefaultAwsRegionProviderChain.builder()
+                                            .profileFile(() -> profileFile)
+                                            .profileName(profileName)
+                                            .build()
+                                            .getRegion();
+    }
+
+    /**
+     * Resolve the credentials that should be used based on the customer's configuration.
+     */
+    private AwsCredentialsProvider resolveCredentials(SdkClientConfiguration config) {
+        return config.option(AwsClientOption.CREDENTIALS_PROVIDER) != null
+               ? config.option(AwsClientOption.CREDENTIALS_PROVIDER)
+               : DefaultCredentialsProvider.builder()
+                                           .profileFile(config.option(SdkClientOption.PROFILE_FILE))
+                                           .profileName(config.option(SdkClientOption.PROFILE_NAME))
+                                           .build();
+    }
+
+    private RetryPolicy resolveAwsRetryPolicy(SdkClientConfiguration config) {
+        RetryPolicy policy = config.option(SdkClientOption.RETRY_POLICY);
+
+        if (policy != null) {
+            if (policy.additionalRetryConditionsAllowed()) {
+                return AwsRetryPolicy.addRetryConditions(policy);
+            } else {
+                return policy;
+            }
+        }
+
+        RetryMode retryMode = RetryMode.resolver()
+                                       .profileFile(() -> config.option(SdkClientOption.PROFILE_FILE))
+                                       .profileName(config.option(SdkClientOption.PROFILE_NAME))
+                                       .resolve();
+        return AwsRetryPolicy.forRetryMode(retryMode);
     }
 
     @Override
@@ -197,4 +251,14 @@ public final BuilderT credentialsProvider(AwsCredentialsProvider credentialsProv
     public final void setCredentialsProvider(AwsCredentialsProvider credentialsProvider) {
         credentialsProvider(credentialsProvider);
     }
+
+    private List<ExecutionInterceptor> addAwsInterceptors(SdkClientConfiguration config) {
+        List<ExecutionInterceptor> interceptors = awsInterceptors();
+        interceptors = CollectionUtils.mergeLists(interceptors, config.option(SdkClientOption.EXECUTION_INTERCEPTORS));
+        return interceptors;
+    }
+
+    private List<ExecutionInterceptor> awsInterceptors() {
+        return Collections.singletonList(new HelpfulUnknownHostExceptionInterceptor());
+    }
 }
diff --git a/core/aws-core/src/main/java/software/amazon/awssdk/awscore/client/builder/AwsSyncClientBuilder.java b/core/aws-core/src/main/java/software/amazon/awssdk/awscore/client/builder/AwsSyncClientBuilder.java
index 10aca94d429e..f4dbfdf4035f 100644
--- a/core/aws-core/src/main/java/software/amazon/awssdk/awscore/client/builder/AwsSyncClientBuilder.java
+++ b/core/aws-core/src/main/java/software/amazon/awssdk/awscore/client/builder/AwsSyncClientBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/aws-core/src/main/java/software/amazon/awssdk/awscore/client/config/AwsAdvancedClientOption.java b/core/aws-core/src/main/java/software/amazon/awssdk/awscore/client/config/AwsAdvancedClientOption.java
index 444460fbddfc..f004a74b5a9c 100644
--- a/core/aws-core/src/main/java/software/amazon/awssdk/awscore/client/config/AwsAdvancedClientOption.java
+++ b/core/aws-core/src/main/java/software/amazon/awssdk/awscore/client/config/AwsAdvancedClientOption.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/aws-core/src/main/java/software/amazon/awssdk/awscore/client/config/AwsClientOption.java b/core/aws-core/src/main/java/software/amazon/awssdk/awscore/client/config/AwsClientOption.java
index 3fba7909ad4e..44e6f69851c8 100644
--- a/core/aws-core/src/main/java/software/amazon/awssdk/awscore/client/config/AwsClientOption.java
+++ b/core/aws-core/src/main/java/software/amazon/awssdk/awscore/client/config/AwsClientOption.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -45,6 +45,14 @@ public final class AwsClientOption<T> extends ClientOption<T> {
      */
     public static final AwsClientOption<String> SERVICE_SIGNING_NAME = new AwsClientOption<>(String.class);
 
+    /**
+     * The first part of the URL in the DNS name for the service. Eg. in the endpoint "dynamodb.amazonaws.com", this is the
+     * "dynamodb".
+     *
+     * For standard services, this should match the "endpointPrefix" field in the AWS model.
+     */
+    public static final AwsClientOption<String> ENDPOINT_PREFIX = new AwsClientOption<>(String.class);
+
     private AwsClientOption(Class<T> valueClass) {
         super(valueClass);
     }
diff --git a/core/aws-core/src/main/java/software/amazon/awssdk/awscore/client/handler/AwsAsyncClientHandler.java b/core/aws-core/src/main/java/software/amazon/awssdk/awscore/client/handler/AwsAsyncClientHandler.java
index 8e8ddb510bf9..a731247f4f28 100644
--- a/core/aws-core/src/main/java/software/amazon/awssdk/awscore/client/handler/AwsAsyncClientHandler.java
+++ b/core/aws-core/src/main/java/software/amazon/awssdk/awscore/client/handler/AwsAsyncClientHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -28,6 +28,7 @@
 import software.amazon.awssdk.core.client.handler.ClientExecutionParams;
 import software.amazon.awssdk.core.client.handler.SdkAsyncClientHandler;
 import software.amazon.awssdk.core.http.ExecutionContext;
+import software.amazon.awssdk.core.interceptor.ExecutionAttributes;
 
 /**
  * Async client handler for AWS SDK clients.
@@ -60,8 +61,8 @@ public <InputT extends SdkRequest, OutputT extends SdkResponse, ReturnT> Complet
 
     @Override
     protected <InputT extends SdkRequest, OutputT extends SdkResponse> ExecutionContext createExecutionContext(
-        ClientExecutionParams<InputT, OutputT> executionParams) {
-        return AwsClientHandlerUtils.createExecutionContext(executionParams, clientConfiguration);
+        ClientExecutionParams<InputT, OutputT> executionParams, ExecutionAttributes executionAttributes) {
+        return AwsClientHandlerUtils.createExecutionContext(executionParams, clientConfiguration, executionAttributes);
     }
 
 }
diff --git a/core/aws-core/src/main/java/software/amazon/awssdk/awscore/client/handler/AwsClientHandlerUtils.java b/core/aws-core/src/main/java/software/amazon/awssdk/awscore/client/handler/AwsClientHandlerUtils.java
index add11ba27c8e..eaaac5e52503 100644
--- a/core/aws-core/src/main/java/software/amazon/awssdk/awscore/client/handler/AwsClientHandlerUtils.java
+++ b/core/aws-core/src/main/java/software/amazon/awssdk/awscore/client/handler/AwsClientHandlerUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -30,6 +30,7 @@
 import software.amazon.awssdk.awscore.AwsRequestOverrideConfiguration;
 import software.amazon.awssdk.awscore.client.config.AwsAdvancedClientOption;
 import software.amazon.awssdk.awscore.client.config.AwsClientOption;
+import software.amazon.awssdk.core.RequestOverrideConfiguration;
 import software.amazon.awssdk.core.SdkRequest;
 import software.amazon.awssdk.core.SdkResponse;
 import software.amazon.awssdk.core.client.config.SdkClientConfiguration;
@@ -57,7 +58,8 @@ private AwsClientHandlerUtils() {
 
     static <InputT extends SdkRequest, OutputT extends SdkResponse> ExecutionContext createExecutionContext(
         ClientExecutionParams<InputT, OutputT> executionParams,
-        SdkClientConfiguration clientConfig) {
+        SdkClientConfiguration clientConfig,
+        ExecutionAttributes executionAttributes) {
 
         SdkRequest originalRequest = executionParams.getInput();
         AwsCredentialsProvider clientCredentials = clientConfig.option(AwsClientOption.CREDENTIALS_PROVIDER);
@@ -71,17 +73,20 @@ static <InputT extends SdkRequest, OutputT extends SdkResponse> ExecutionContext
 
         Validate.validState(credentials != null, "Credential providers must never return null.");
 
-        ExecutionAttributes executionAttributes = new ExecutionAttributes()
+        executionAttributes
             .putAttribute(AwsSignerExecutionAttribute.SERVICE_CONFIG, clientConfig.option(SdkClientOption.SERVICE_CONFIGURATION))
             .putAttribute(AwsSignerExecutionAttribute.AWS_CREDENTIALS, credentials)
             .putAttribute(AwsSignerExecutionAttribute.SERVICE_SIGNING_NAME,
                           clientConfig.option(AwsClientOption.SERVICE_SIGNING_NAME))
             .putAttribute(AwsExecutionAttribute.AWS_REGION, clientConfig.option(AwsClientOption.AWS_REGION))
+            .putAttribute(AwsExecutionAttribute.ENDPOINT_PREFIX, clientConfig.option(AwsClientOption.ENDPOINT_PREFIX))
             .putAttribute(AwsSignerExecutionAttribute.SIGNING_REGION, clientConfig.option(AwsClientOption.SIGNING_REGION))
             .putAttribute(SdkInternalExecutionAttribute.IS_FULL_DUPLEX, executionParams.isFullDuplex())
             .putAttribute(SdkExecutionAttribute.CLIENT_TYPE, clientConfig.option(SdkClientOption.CLIENT_TYPE))
             .putAttribute(SdkExecutionAttribute.SERVICE_NAME, clientConfig.option(SdkClientOption.SERVICE_NAME))
-            .putAttribute(SdkExecutionAttribute.OPERATION_NAME, executionParams.getOperationName());
+            .putAttribute(SdkExecutionAttribute.OPERATION_NAME, executionParams.getOperationName())
+            .putAttribute(SdkExecutionAttribute.ENDPOINT_OVERRIDDEN,
+                          clientConfig.option(SdkClientOption.ENDPOINT_OVERRIDDEN));
 
         ExecutionInterceptorChain executionInterceptorChain =
                 new ExecutionInterceptorChain(clientConfig.option(SdkClientOption.EXECUTION_INTERCEPTORS));
@@ -125,7 +130,7 @@ public static ByteBuffer encodeEventStreamRequestToByteBuffer(SdkHttpFullRequest
     private static Signer computeSigner(SdkRequest originalRequest,
                                         SdkClientConfiguration clientConfiguration) {
         return originalRequest.overrideConfiguration()
-                              .flatMap(config -> config.signer())
+                              .flatMap(RequestOverrideConfiguration::signer)
                               .orElse(clientConfiguration.option(AwsAdvancedClientOption.SIGNER));
     }
 }
diff --git a/core/aws-core/src/main/java/software/amazon/awssdk/awscore/client/handler/AwsSyncClientHandler.java b/core/aws-core/src/main/java/software/amazon/awssdk/awscore/client/handler/AwsSyncClientHandler.java
index dd6f96414613..3edc19686430 100644
--- a/core/aws-core/src/main/java/software/amazon/awssdk/awscore/client/handler/AwsSyncClientHandler.java
+++ b/core/aws-core/src/main/java/software/amazon/awssdk/awscore/client/handler/AwsSyncClientHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -64,13 +64,19 @@ public <InputT extends SdkRequest, OutputT extends SdkResponse, ReturnT> ReturnT
 
     @Override
     protected <InputT extends SdkRequest, OutputT extends SdkResponse> ExecutionContext createExecutionContext(
-        ClientExecutionParams<InputT, OutputT> executionParams) {
-        return AwsClientHandlerUtils.createExecutionContext(executionParams, clientConfiguration);
+        ClientExecutionParams<InputT, OutputT> executionParams, ExecutionAttributes executionAttributes) {
+        return AwsClientHandlerUtils.createExecutionContext(executionParams, clientConfiguration, executionAttributes);
     }
 
     private <InputT extends SdkRequest, OutputT> ClientExecutionParams<InputT, OutputT> addCrc32Validation(
         ClientExecutionParams<InputT, OutputT> executionParams) {
-        return executionParams.withResponseHandler(new Crc32ValidationResponseHandler<>(executionParams.getResponseHandler()));
+        if (executionParams.getCombinedResponseHandler() != null) {
+            return executionParams.withCombinedResponseHandler(
+                new Crc32ValidationResponseHandler<>(executionParams.getCombinedResponseHandler()));
+        } else {
+            return executionParams.withResponseHandler(
+                new Crc32ValidationResponseHandler<>(executionParams.getResponseHandler()));
+        }
     }
 
     /**
diff --git a/core/aws-core/src/main/java/software/amazon/awssdk/awscore/endpoint/DefaultServiceEndpointBuilder.java b/core/aws-core/src/main/java/software/amazon/awssdk/awscore/endpoint/DefaultServiceEndpointBuilder.java
index e4cafc3c0c3b..4d7b2b2f1f68 100644
--- a/core/aws-core/src/main/java/software/amazon/awssdk/awscore/endpoint/DefaultServiceEndpointBuilder.java
+++ b/core/aws-core/src/main/java/software/amazon/awssdk/awscore/endpoint/DefaultServiceEndpointBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -19,6 +19,7 @@
 import java.net.URISyntaxException;
 import software.amazon.awssdk.annotations.NotThreadSafe;
 import software.amazon.awssdk.annotations.SdkProtectedApi;
+import software.amazon.awssdk.profiles.ProfileFile;
 import software.amazon.awssdk.regions.Region;
 import software.amazon.awssdk.regions.ServiceMetadata;
 import software.amazon.awssdk.utils.Validate;
@@ -31,10 +32,12 @@
 // TODO We may not need this anymore, we should default to AWS partition when resolving
 // a region we don't know about yet.
 public final class DefaultServiceEndpointBuilder {
-
     private final String serviceName;
     private final String protocol;
+
     private Region region;
+    private ProfileFile profileFile;
+    private String profileName;
 
     public DefaultServiceEndpointBuilder(String serviceName, String protocol) {
         this.serviceName = Validate.paramNotNull(serviceName, "serviceName");
@@ -49,8 +52,20 @@ public DefaultServiceEndpointBuilder withRegion(Region region) {
         return this;
     }
 
+    public DefaultServiceEndpointBuilder withProfileFile(ProfileFile profileFile) {
+        this.profileFile = profileFile;
+        return this;
+    }
+
+    public DefaultServiceEndpointBuilder withProfileName(String profileName) {
+        this.profileName = profileName;
+        return this;
+    }
+
     public URI getServiceEndpoint() {
-        ServiceMetadata serviceMetadata = ServiceMetadata.of(serviceName);
+        ServiceMetadata serviceMetadata = ServiceMetadata.of(serviceName)
+                                                         .reconfigure(c -> c.profileFile(() -> profileFile)
+                                                                            .profileName(profileName));
         return withProtocol(serviceMetadata.endpointFor(region));
     }
 
diff --git a/core/aws-core/src/main/java/software/amazon/awssdk/awscore/eventstream/DefaultEventStreamResponseHandlerBuilder.java b/core/aws-core/src/main/java/software/amazon/awssdk/awscore/eventstream/DefaultEventStreamResponseHandlerBuilder.java
index eb18057ce9b9..c5342aabd402 100644
--- a/core/aws-core/src/main/java/software/amazon/awssdk/awscore/eventstream/DefaultEventStreamResponseHandlerBuilder.java
+++ b/core/aws-core/src/main/java/software/amazon/awssdk/awscore/eventstream/DefaultEventStreamResponseHandlerBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/aws-core/src/main/java/software/amazon/awssdk/awscore/eventstream/EventStreamAsyncResponseTransformer.java b/core/aws-core/src/main/java/software/amazon/awssdk/awscore/eventstream/EventStreamAsyncResponseTransformer.java
index 174378f43377..d801bb9c19e6 100644
--- a/core/aws-core/src/main/java/software/amazon/awssdk/awscore/eventstream/EventStreamAsyncResponseTransformer.java
+++ b/core/aws-core/src/main/java/software/amazon/awssdk/awscore/eventstream/EventStreamAsyncResponseTransformer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/aws-core/src/main/java/software/amazon/awssdk/awscore/eventstream/EventStreamResponseHandler.java b/core/aws-core/src/main/java/software/amazon/awssdk/awscore/eventstream/EventStreamResponseHandler.java
index 77baff4cf6a6..093ab3420a75 100644
--- a/core/aws-core/src/main/java/software/amazon/awssdk/awscore/eventstream/EventStreamResponseHandler.java
+++ b/core/aws-core/src/main/java/software/amazon/awssdk/awscore/eventstream/EventStreamResponseHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/aws-core/src/main/java/software/amazon/awssdk/awscore/eventstream/EventStreamResponseHandlerFromBuilder.java b/core/aws-core/src/main/java/software/amazon/awssdk/awscore/eventstream/EventStreamResponseHandlerFromBuilder.java
index ee1c48888afc..2cfe1bf6c8e4 100644
--- a/core/aws-core/src/main/java/software/amazon/awssdk/awscore/eventstream/EventStreamResponseHandlerFromBuilder.java
+++ b/core/aws-core/src/main/java/software/amazon/awssdk/awscore/eventstream/EventStreamResponseHandlerFromBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/aws-core/src/main/java/software/amazon/awssdk/awscore/eventstream/EventStreamTaggedUnionJsonMarshaller.java b/core/aws-core/src/main/java/software/amazon/awssdk/awscore/eventstream/EventStreamTaggedUnionJsonMarshaller.java
index cc1dae4628ed..be7fa785cd4d 100644
--- a/core/aws-core/src/main/java/software/amazon/awssdk/awscore/eventstream/EventStreamTaggedUnionJsonMarshaller.java
+++ b/core/aws-core/src/main/java/software/amazon/awssdk/awscore/eventstream/EventStreamTaggedUnionJsonMarshaller.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/aws-core/src/main/java/software/amazon/awssdk/awscore/eventstream/EventStreamTaggedUnionPojoSupplier.java b/core/aws-core/src/main/java/software/amazon/awssdk/awscore/eventstream/EventStreamTaggedUnionPojoSupplier.java
index ead629f4e9b0..f780ae9ecb20 100644
--- a/core/aws-core/src/main/java/software/amazon/awssdk/awscore/eventstream/EventStreamTaggedUnionPojoSupplier.java
+++ b/core/aws-core/src/main/java/software/amazon/awssdk/awscore/eventstream/EventStreamTaggedUnionPojoSupplier.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/aws-core/src/main/java/software/amazon/awssdk/awscore/eventstream/RestEventStreamAsyncResponseTransformer.java b/core/aws-core/src/main/java/software/amazon/awssdk/awscore/eventstream/RestEventStreamAsyncResponseTransformer.java
index aecadf150b45..5e9f84cea3f2 100644
--- a/core/aws-core/src/main/java/software/amazon/awssdk/awscore/eventstream/RestEventStreamAsyncResponseTransformer.java
+++ b/core/aws-core/src/main/java/software/amazon/awssdk/awscore/eventstream/RestEventStreamAsyncResponseTransformer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -17,7 +17,6 @@
 
 import java.nio.ByteBuffer;
 import java.util.concurrent.CompletableFuture;
-
 import software.amazon.awssdk.annotations.SdkProtectedApi;
 import software.amazon.awssdk.core.SdkResponse;
 import software.amazon.awssdk.core.async.AsyncResponseTransformer;
diff --git a/core/aws-core/src/main/java/software/amazon/awssdk/awscore/exception/AwsErrorDetails.java b/core/aws-core/src/main/java/software/amazon/awssdk/awscore/exception/AwsErrorDetails.java
index 289d4a188238..8073839e45d6 100644
--- a/core/aws-core/src/main/java/software/amazon/awssdk/awscore/exception/AwsErrorDetails.java
+++ b/core/aws-core/src/main/java/software/amazon/awssdk/awscore/exception/AwsErrorDetails.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -204,7 +204,8 @@ protected static final class BuilderImpl implements Builder {
         private SdkHttpResponse sdkHttpResponse;
         private SdkBytes rawResponse;
 
-        private BuilderImpl() {}
+        private BuilderImpl() {
+        }
 
         private BuilderImpl(AwsErrorDetails awsErrorDetails) {
             this.errorMessage = awsErrorDetails.errorMessage();
diff --git a/core/aws-core/src/main/java/software/amazon/awssdk/awscore/exception/AwsServiceException.java b/core/aws-core/src/main/java/software/amazon/awssdk/awscore/exception/AwsServiceException.java
index 05ffe3c1bf61..ac8146aef8fc 100644
--- a/core/aws-core/src/main/java/software/amazon/awssdk/awscore/exception/AwsServiceException.java
+++ b/core/aws-core/src/main/java/software/amazon/awssdk/awscore/exception/AwsServiceException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/aws-core/src/main/java/software/amazon/awssdk/awscore/interceptor/GlobalServiceExecutionInterceptor.java b/core/aws-core/src/main/java/software/amazon/awssdk/awscore/interceptor/GlobalServiceExecutionInterceptor.java
index 244f85e73437..43f0f0566908 100644
--- a/core/aws-core/src/main/java/software/amazon/awssdk/awscore/interceptor/GlobalServiceExecutionInterceptor.java
+++ b/core/aws-core/src/main/java/software/amazon/awssdk/awscore/interceptor/GlobalServiceExecutionInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -15,41 +15,22 @@
 
 package software.amazon.awssdk.awscore.interceptor;
 
-import java.net.UnknownHostException;
 import software.amazon.awssdk.annotations.SdkProtectedApi;
-import software.amazon.awssdk.awscore.AwsExecutionAttribute;
-import software.amazon.awssdk.core.exception.SdkClientException;
 import software.amazon.awssdk.core.interceptor.Context;
 import software.amazon.awssdk.core.interceptor.ExecutionAttributes;
 import software.amazon.awssdk.core.interceptor.ExecutionInterceptor;
 
 /**
- * An interceptor that can be used for global services that will tell the customer when they're using a global service that
- * doesn't support non-global regions.
+ * A more specific version of {@link HelpfulUnknownHostExceptionInterceptor} that was used for older IAM clients. This can be
+ * removed if we ever drop backwards-compatibility with older IAM client versions, because newer IAM client versions do not
+ * depend on this interceptor.
  */
 @SdkProtectedApi
-public final class GlobalServiceExecutionInterceptor implements ExecutionInterceptor {
-    @Override
-    public void onExecutionFailure(Context.FailedExecution context, ExecutionAttributes executionAttributes) {
-        if (hasCause(context.exception(), UnknownHostException.class) &&
-            !executionAttributes.getAttribute(AwsExecutionAttribute.AWS_REGION).isGlobalRegion()) {
-            throw SdkClientException.builder()
-                                    .message("This is a global service. Consider setting AWS_GLOBAL or another global " +
-                                         "region when creating your client.")
-                                    .cause(context.exception())
-                                    .build();
-        }
-    }
-
-    private boolean hasCause(Throwable thrown, Class<? extends Throwable> cause) {
-        if (thrown == null) {
-            return false;
-        }
+public class GlobalServiceExecutionInterceptor implements ExecutionInterceptor {
+    private static final HelpfulUnknownHostExceptionInterceptor DELEGATE = new HelpfulUnknownHostExceptionInterceptor();
 
-        if (cause.isAssignableFrom(thrown.getClass())) {
-            return true;
-        }
-
-        return hasCause(thrown.getCause(), cause);
+    @Override
+    public Throwable modifyException(Context.FailedExecution context, ExecutionAttributes executionAttributes) {
+        return DELEGATE.modifyException(context, executionAttributes);
     }
 }
diff --git a/core/aws-core/src/main/java/software/amazon/awssdk/awscore/interceptor/HelpfulUnknownHostExceptionInterceptor.java b/core/aws-core/src/main/java/software/amazon/awssdk/awscore/interceptor/HelpfulUnknownHostExceptionInterceptor.java
new file mode 100644
index 000000000000..2572e1b79f32
--- /dev/null
+++ b/core/aws-core/src/main/java/software/amazon/awssdk/awscore/interceptor/HelpfulUnknownHostExceptionInterceptor.java
@@ -0,0 +1,137 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.awscore.interceptor;
+
+import java.net.UnknownHostException;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.awscore.AwsExecutionAttribute;
+import software.amazon.awssdk.core.exception.SdkClientException;
+import software.amazon.awssdk.core.interceptor.Context;
+import software.amazon.awssdk.core.interceptor.ExecutionAttributes;
+import software.amazon.awssdk.core.interceptor.ExecutionInterceptor;
+import software.amazon.awssdk.regions.PartitionMetadata;
+import software.amazon.awssdk.regions.Region;
+import software.amazon.awssdk.regions.RegionMetadata;
+import software.amazon.awssdk.regions.ServiceMetadata;
+import software.amazon.awssdk.regions.ServicePartitionMetadata;
+
+/**
+ * This interceptor will monitor for {@link UnknownHostException}s and provide the customer with additional information they can
+ * use to debug or fix the problem.
+ */
+@SdkInternalApi
+public final class HelpfulUnknownHostExceptionInterceptor implements ExecutionInterceptor {
+    @Override
+    public Throwable modifyException(Context.FailedExecution context, ExecutionAttributes executionAttributes) {
+        if (!hasCause(context.exception(), UnknownHostException.class)) {
+            return context.exception();
+        }
+
+        StringBuilder error = new StringBuilder();
+        error.append("Received an UnknownHostException when attempting to interact with a service. See cause for the "
+                     + "exact endpoint that is failing to resolve. ");
+
+        Optional<String> globalRegionErrorDetails = getGlobalRegionErrorDetails(executionAttributes);
+
+        if (globalRegionErrorDetails.isPresent()) {
+            error.append(globalRegionErrorDetails.get());
+        } else {
+            error.append("If this is happening on an endpoint that previously worked, there may be a network connectivity "
+                         + "issue or your DNS cache could be storing endpoints for too long.");
+        }
+
+        return SdkClientException.builder().message(error.toString()).cause(context.exception()).build();
+    }
+
+    /**
+     * If the customer is interacting with a global service (one with a single endpoint/region for an entire partition), this
+     * will return error details that can instruct the customer on how to configure their client for success.
+     */
+    private Optional<String> getGlobalRegionErrorDetails(ExecutionAttributes executionAttributes) {
+        Region clientRegion = clientRegion(executionAttributes);
+        if (clientRegion.isGlobalRegion()) {
+            return Optional.empty();
+        }
+
+        List<ServicePartitionMetadata> globalPartitionsForService = globalPartitionsForService(executionAttributes);
+        if (globalPartitionsForService.isEmpty()) {
+            return Optional.empty();
+        }
+
+        String clientPartition = Optional.ofNullable(clientRegion.metadata())
+                                         .map(RegionMetadata::partition)
+                                         .map(PartitionMetadata::id)
+                                         .orElse(null);
+
+        Optional<Region> globalRegionForClientRegion =
+            globalPartitionsForService.stream()
+                                      .filter(p -> p.partition().id().equals(clientPartition))
+                                      .findAny()
+                                      .flatMap(ServicePartitionMetadata::globalRegion);
+
+        if (!globalRegionForClientRegion.isPresent()) {
+            String globalRegionsForThisService = globalPartitionsForService.stream()
+                                                                           .map(ServicePartitionMetadata::globalRegion)
+                                                                           .filter(Optional::isPresent)
+                                                                           .map(Optional::get)
+                                                                           .filter(Region::isGlobalRegion)
+                                                                           .map(Region::id)
+                                                                           .collect(Collectors.joining("/"));
+
+            return Optional.of("This specific service may be a global service, in which case you should configure a global "
+                               + "region like " + globalRegionsForThisService + " on the client.");
+        }
+
+        Region globalRegion = globalRegionForClientRegion.get();
+
+        return Optional.of("This specific service is global in the same partition as the region configured on this client ("
+                           + clientRegion + "). If this is the first time you're trying to talk to this service in this region, "
+                           + "you should try configuring the global region on your client, instead: " + globalRegion);
+    }
+
+    /**
+     * Retrieve the region configured on the client.
+     */
+    private Region clientRegion(ExecutionAttributes executionAttributes) {
+        return executionAttributes.getAttribute(AwsExecutionAttribute.AWS_REGION);
+    }
+
+    /**
+     * Retrieve all global partitions for the AWS service that we're interacting with.
+     */
+    private List<ServicePartitionMetadata> globalPartitionsForService(ExecutionAttributes executionAttributes) {
+        return ServiceMetadata.of(executionAttributes.getAttribute(AwsExecutionAttribute.ENDPOINT_PREFIX))
+                              .servicePartitions()
+                              .stream()
+                              .filter(sp -> sp.globalRegion().isPresent())
+                              .collect(Collectors.toList());
+    }
+
+    private boolean hasCause(Throwable thrown, Class<? extends Throwable> cause) {
+        if (thrown == null) {
+            return false;
+        }
+
+        if (cause.isAssignableFrom(thrown.getClass())) {
+            return true;
+        }
+
+        return hasCause(thrown.getCause(), cause);
+    }
+}
diff --git a/core/aws-core/src/main/java/software/amazon/awssdk/awscore/internal/AwsErrorCode.java b/core/aws-core/src/main/java/software/amazon/awssdk/awscore/internal/AwsErrorCode.java
index 5d632e4c125a..989450330004 100644
--- a/core/aws-core/src/main/java/software/amazon/awssdk/awscore/internal/AwsErrorCode.java
+++ b/core/aws-core/src/main/java/software/amazon/awssdk/awscore/internal/AwsErrorCode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -44,6 +44,7 @@ public final class AwsErrorCode {
         throttlingErrorCodes.add("BandwidthLimitExceeded");
         throttlingErrorCodes.add("RequestThrottled");
         throttlingErrorCodes.add("RequestThrottledException");
+        throttlingErrorCodes.add("EC2ThrottledException");
         THROTTLING_ERROR_CODES = unmodifiableSet(throttlingErrorCodes);
 
         Set<String> definiteClockSkewErrorCodes = new HashSet<>(3);
@@ -60,6 +61,8 @@ public final class AwsErrorCode {
 
         Set<String> retryableErrorCodes = new HashSet<>(1);
         retryableErrorCodes.add("PriorRequestNotComplete");
+        retryableErrorCodes.add("RequestTimeout");
+        retryableErrorCodes.add("RequestTimeoutException");
         RETRYABLE_ERROR_CODES = unmodifiableSet(retryableErrorCodes);
     }
 
diff --git a/core/aws-core/src/main/java/software/amazon/awssdk/awscore/internal/AwsStatusCode.java b/core/aws-core/src/main/java/software/amazon/awssdk/awscore/internal/AwsStatusCode.java
index 7a49baee3e5b..eaf254ddb8ab 100644
--- a/core/aws-core/src/main/java/software/amazon/awssdk/awscore/internal/AwsStatusCode.java
+++ b/core/aws-core/src/main/java/software/amazon/awssdk/awscore/internal/AwsStatusCode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/aws-core/src/main/java/software/amazon/awssdk/awscore/internal/EndpointUtils.java b/core/aws-core/src/main/java/software/amazon/awssdk/awscore/internal/EndpointUtils.java
deleted file mode 100644
index 6736b1740777..000000000000
--- a/core/aws-core/src/main/java/software/amazon/awssdk/awscore/internal/EndpointUtils.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.awscore.internal;
-
-import java.net.URI;
-import software.amazon.awssdk.annotations.SdkInternalApi;
-import software.amazon.awssdk.awscore.endpoint.DefaultServiceEndpointBuilder;
-import software.amazon.awssdk.regions.Region;
-import software.amazon.awssdk.utils.Validate;
-
-/**
- * A collection of utility methods centered around generating service endpoints from various pieces of information.
- */
-@SdkInternalApi
-public final class EndpointUtils {
-    private EndpointUtils() {}
-
-    /**
-     * Generate an endpoint from the provided endpoint protocol, url prefix, and region.
-     *
-     * @param protocol The protocol that should be used when communicating with AWS (usually http or https).
-     * @param serviceEndpointPrefix The endpoint prefix that should be used when communicating with AWS (usually the
-     *                              endpointPrefix in the service's model).
-     * @param region The AWS region that should be communicated with.
-     * @return The AWS endpoint to use for communication.
-     */
-    public static URI buildEndpoint(String protocol, String serviceEndpointPrefix, Region region) {
-        Validate.paramNotNull(protocol, "protocol");
-        Validate.paramNotNull(serviceEndpointPrefix, "serviceEndpointPrefix");
-        Validate.paramNotNull(region, "region");
-        return new DefaultServiceEndpointBuilder(serviceEndpointPrefix, protocol).withRegion(region).getServiceEndpoint();
-    }
-}
diff --git a/core/aws-core/src/main/java/software/amazon/awssdk/awscore/internal/client/config/AwsClientOptionValidation.java b/core/aws-core/src/main/java/software/amazon/awssdk/awscore/internal/client/config/AwsClientOptionValidation.java
index 2c9fc5e77478..5dce8619099a 100644
--- a/core/aws-core/src/main/java/software/amazon/awssdk/awscore/internal/client/config/AwsClientOptionValidation.java
+++ b/core/aws-core/src/main/java/software/amazon/awssdk/awscore/internal/client/config/AwsClientOptionValidation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -27,7 +27,8 @@
  */
 @SdkInternalApi
 public final class AwsClientOptionValidation extends SdkClientOptionValidation {
-    private AwsClientOptionValidation() {}
+    private AwsClientOptionValidation() {
+    }
 
     public static void validateAsyncClientOptions(SdkClientConfiguration c) {
         validateClientOptions(c);
diff --git a/core/aws-core/src/main/java/software/amazon/awssdk/awscore/presigner/PresignRequest.java b/core/aws-core/src/main/java/software/amazon/awssdk/awscore/presigner/PresignRequest.java
index c815ce7ae224..9e24358a47f7 100644
--- a/core/aws-core/src/main/java/software/amazon/awssdk/awscore/presigner/PresignRequest.java
+++ b/core/aws-core/src/main/java/software/amazon/awssdk/awscore/presigner/PresignRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -79,7 +79,8 @@ public int hashCode() {
     protected abstract static class DefaultBuilder<B extends DefaultBuilder<B>> implements Builder {
         private Duration signatureDuration;
 
-        protected DefaultBuilder() {}
+        protected DefaultBuilder() {
+        }
 
         protected DefaultBuilder(PresignRequest request) {
             this.signatureDuration = request.signatureDuration;
diff --git a/core/aws-core/src/main/java/software/amazon/awssdk/awscore/presigner/PresignedRequest.java b/core/aws-core/src/main/java/software/amazon/awssdk/awscore/presigner/PresignedRequest.java
index 4ea652cbcd88..f3da23bf11f5 100644
--- a/core/aws-core/src/main/java/software/amazon/awssdk/awscore/presigner/PresignedRequest.java
+++ b/core/aws-core/src/main/java/software/amazon/awssdk/awscore/presigner/PresignedRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -184,7 +184,8 @@ protected abstract static class DefaultBuilder<B extends DefaultBuilder<B>> impl
         private SdkBytes signedPayload;
         private SdkHttpRequest httpRequest;
 
-        protected DefaultBuilder() {}
+        protected DefaultBuilder() {
+        }
 
         protected DefaultBuilder(PresignedRequest request) {
             this.expiration = request.expiration;
diff --git a/core/aws-core/src/main/java/software/amazon/awssdk/awscore/presigner/SdkPresigner.java b/core/aws-core/src/main/java/software/amazon/awssdk/awscore/presigner/SdkPresigner.java
index 1c25896d8ba6..83d513174d8f 100644
--- a/core/aws-core/src/main/java/software/amazon/awssdk/awscore/presigner/SdkPresigner.java
+++ b/core/aws-core/src/main/java/software/amazon/awssdk/awscore/presigner/SdkPresigner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/aws-core/src/main/java/software/amazon/awssdk/awscore/retry/AwsRetryPolicy.java b/core/aws-core/src/main/java/software/amazon/awssdk/awscore/retry/AwsRetryPolicy.java
index 5b9fc17e6a88..4899a2601b02 100644
--- a/core/aws-core/src/main/java/software/amazon/awssdk/awscore/retry/AwsRetryPolicy.java
+++ b/core/aws-core/src/main/java/software/amazon/awssdk/awscore/retry/AwsRetryPolicy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -18,6 +18,7 @@
 import software.amazon.awssdk.annotations.SdkPublicApi;
 import software.amazon.awssdk.awscore.internal.AwsErrorCode;
 import software.amazon.awssdk.awscore.retry.conditions.RetryOnErrorCodeCondition;
+import software.amazon.awssdk.core.retry.RetryMode;
 import software.amazon.awssdk.core.retry.RetryPolicy;
 import software.amazon.awssdk.core.retry.conditions.OrRetryCondition;
 import software.amazon.awssdk.core.retry.conditions.RetryCondition;
@@ -31,12 +32,38 @@ public final class AwsRetryPolicy {
     private AwsRetryPolicy() {
     }
 
+    /**
+     * Retrieve the {@link RetryCondition#defaultRetryCondition()} with AWS-specific conditions added.
+     */
     public static RetryCondition defaultRetryCondition() {
-        return OrRetryCondition.create(RetryCondition.defaultRetryCondition(),
-                                       RetryOnErrorCodeCondition.create(AwsErrorCode.RETRYABLE_ERROR_CODES));
+        return OrRetryCondition.create(RetryCondition.defaultRetryCondition(), awsRetryCondition());
     }
 
+    /**
+     * Retrieve the {@link RetryPolicy#defaultRetryPolicy()} with AWS-specific conditions added.
+     */
     public static RetryPolicy defaultRetryPolicy() {
-        return RetryPolicy.defaultRetryPolicy().toBuilder().retryCondition(defaultRetryCondition()).build();
+        return forRetryMode(RetryMode.defaultRetryMode());
+    }
+
+    /**
+     * Retrieve the {@link RetryPolicy#defaultRetryPolicy()} with AWS-specific conditions added. This uses the specified
+     * {@link RetryMode} when constructing the {@link RetryPolicy}.
+     */
+    public static RetryPolicy forRetryMode(RetryMode retryMode) {
+        return addRetryConditions(RetryPolicy.forRetryMode(retryMode));
+    }
+
+    /**
+     * Update the provided {@link RetryPolicy} to add AWS-specific conditions.
+     */
+    public static RetryPolicy addRetryConditions(RetryPolicy condition) {
+        return condition.toBuilder()
+                        .retryCondition(OrRetryCondition.create(condition.retryCondition(), awsRetryCondition()))
+                        .build();
+    }
+
+    private static RetryOnErrorCodeCondition awsRetryCondition() {
+        return RetryOnErrorCodeCondition.create(AwsErrorCode.RETRYABLE_ERROR_CODES);
     }
 }
diff --git a/core/aws-core/src/main/java/software/amazon/awssdk/awscore/retry/conditions/RetryOnErrorCodeCondition.java b/core/aws-core/src/main/java/software/amazon/awssdk/awscore/retry/conditions/RetryOnErrorCodeCondition.java
index 8fd542c522e8..6673b13440f2 100644
--- a/core/aws-core/src/main/java/software/amazon/awssdk/awscore/retry/conditions/RetryOnErrorCodeCondition.java
+++ b/core/aws-core/src/main/java/software/amazon/awssdk/awscore/retry/conditions/RetryOnErrorCodeCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/aws-core/src/main/java/software/amazon/awssdk/awscore/util/AwsHeader.java b/core/aws-core/src/main/java/software/amazon/awssdk/awscore/util/AwsHeader.java
index c4478847d5fb..bda478a7ea47 100644
--- a/core/aws-core/src/main/java/software/amazon/awssdk/awscore/util/AwsHeader.java
+++ b/core/aws-core/src/main/java/software/amazon/awssdk/awscore/util/AwsHeader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/aws-core/src/main/java/software/amazon/awssdk/awscore/util/AwsHostNameUtils.java b/core/aws-core/src/main/java/software/amazon/awssdk/awscore/util/AwsHostNameUtils.java
index 16a5d6b8d930..eb44ac136c83 100644
--- a/core/aws-core/src/main/java/software/amazon/awssdk/awscore/util/AwsHostNameUtils.java
+++ b/core/aws-core/src/main/java/software/amazon/awssdk/awscore/util/AwsHostNameUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/aws-core/src/test/java/software/amazon/awssdk/awscore/client/builder/DefaultAwsClientBuilderTest.java b/core/aws-core/src/test/java/software/amazon/awssdk/awscore/client/builder/DefaultAwsClientBuilderTest.java
index 9f26e87d55bb..c32600c5f014 100644
--- a/core/aws-core/src/test/java/software/amazon/awssdk/awscore/client/builder/DefaultAwsClientBuilderTest.java
+++ b/core/aws-core/src/test/java/software/amazon/awssdk/awscore/client/builder/DefaultAwsClientBuilderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/aws-core/src/test/java/software/amazon/awssdk/awscore/client/endpoint/DefaultServiceEndpointBuilderTest.java b/core/aws-core/src/test/java/software/amazon/awssdk/awscore/client/endpoint/DefaultServiceEndpointBuilderTest.java
index e8c13d978c79..90fa1f40034d 100644
--- a/core/aws-core/src/test/java/software/amazon/awssdk/awscore/client/endpoint/DefaultServiceEndpointBuilderTest.java
+++ b/core/aws-core/src/test/java/software/amazon/awssdk/awscore/client/endpoint/DefaultServiceEndpointBuilderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/aws-core/src/test/java/software/amazon/awssdk/awscore/client/http/NoopTestAwsRequest.java b/core/aws-core/src/test/java/software/amazon/awssdk/awscore/client/http/NoopTestAwsRequest.java
index d55afe982d78..a87238aafa71 100644
--- a/core/aws-core/src/test/java/software/amazon/awssdk/awscore/client/http/NoopTestAwsRequest.java
+++ b/core/aws-core/src/test/java/software/amazon/awssdk/awscore/client/http/NoopTestAwsRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/aws-core/src/test/java/software/amazon/awssdk/awscore/client/utils/HttpTestUtils.java b/core/aws-core/src/test/java/software/amazon/awssdk/awscore/client/utils/HttpTestUtils.java
index 9fc12690cc00..e7ff085f290d 100644
--- a/core/aws-core/src/test/java/software/amazon/awssdk/awscore/client/utils/HttpTestUtils.java
+++ b/core/aws-core/src/test/java/software/amazon/awssdk/awscore/client/utils/HttpTestUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -21,8 +21,8 @@
 import java.util.concurrent.Executors;
 import software.amazon.awssdk.core.client.config.SdkAdvancedAsyncClientOption;
 import software.amazon.awssdk.core.client.config.SdkAdvancedClientOption;
-import software.amazon.awssdk.core.client.config.SdkClientOption;
 import software.amazon.awssdk.core.client.config.SdkClientConfiguration;
+import software.amazon.awssdk.core.client.config.SdkClientOption;
 import software.amazon.awssdk.core.internal.http.AmazonSyncHttpClient;
 import software.amazon.awssdk.core.internal.http.loader.DefaultSdkHttpClientBuilder;
 import software.amazon.awssdk.core.retry.RetryPolicy;
diff --git a/core/aws-core/src/test/java/software/amazon/awssdk/awscore/client/utils/ValidSdkObjects.java b/core/aws-core/src/test/java/software/amazon/awssdk/awscore/client/utils/ValidSdkObjects.java
index df11173862b5..ac00131437b5 100644
--- a/core/aws-core/src/test/java/software/amazon/awssdk/awscore/client/utils/ValidSdkObjects.java
+++ b/core/aws-core/src/test/java/software/amazon/awssdk/awscore/client/utils/ValidSdkObjects.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/aws-core/src/test/java/software/amazon/awssdk/awscore/eventstream/EventStreamAsyncResponseTransformerTest.java b/core/aws-core/src/test/java/software/amazon/awssdk/awscore/eventstream/EventStreamAsyncResponseTransformerTest.java
index 0995b0518872..d8ca1069a97b 100644
--- a/core/aws-core/src/test/java/software/amazon/awssdk/awscore/eventstream/EventStreamAsyncResponseTransformerTest.java
+++ b/core/aws-core/src/test/java/software/amazon/awssdk/awscore/eventstream/EventStreamAsyncResponseTransformerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/aws-core/src/test/java/software/amazon/awssdk/awscore/exception/AwsServiceExceptionTest.java b/core/aws-core/src/test/java/software/amazon/awssdk/awscore/exception/AwsServiceExceptionTest.java
index 11b8849f4d8b..b9e003a4c4e4 100644
--- a/core/aws-core/src/test/java/software/amazon/awssdk/awscore/exception/AwsServiceExceptionTest.java
+++ b/core/aws-core/src/test/java/software/amazon/awssdk/awscore/exception/AwsServiceExceptionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/aws-core/src/test/java/software/amazon/awssdk/awscore/interceptor/HelpfulUnknownHostExceptionInterceptorTest.java b/core/aws-core/src/test/java/software/amazon/awssdk/awscore/interceptor/HelpfulUnknownHostExceptionInterceptorTest.java
new file mode 100644
index 000000000000..471eedcff9b8
--- /dev/null
+++ b/core/aws-core/src/test/java/software/amazon/awssdk/awscore/interceptor/HelpfulUnknownHostExceptionInterceptorTest.java
@@ -0,0 +1,118 @@
+package software.amazon.awssdk.awscore.interceptor;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.IOException;
+import java.net.UnknownHostException;
+import org.junit.Test;
+import org.mockito.Mockito;
+import software.amazon.awssdk.awscore.AwsExecutionAttribute;
+import software.amazon.awssdk.core.SdkRequest;
+import software.amazon.awssdk.core.exception.SdkClientException;
+import software.amazon.awssdk.core.interceptor.ExecutionAttributes;
+import software.amazon.awssdk.core.interceptor.ExecutionInterceptor;
+import software.amazon.awssdk.core.interceptor.InterceptorContext;
+import software.amazon.awssdk.core.internal.interceptor.DefaultFailedExecutionContext;
+import software.amazon.awssdk.regions.Region;
+
+public class HelpfulUnknownHostExceptionInterceptorTest {
+    private static final ExecutionInterceptor INTERCEPTOR = new HelpfulUnknownHostExceptionInterceptor();
+
+    @Test
+    public void modifyException_skipsNonUnknownHostExceptions() {
+        IOException exception = new IOException();
+        assertThat(modifyException(exception)).isEqualTo(exception);
+    }
+
+    @Test
+    public void modifyException_supportsNestedUnknownHostExceptions() {
+        Exception exception = new UnknownHostException();
+        exception.initCause(new IOException());
+        exception = new IllegalArgumentException(exception);
+        exception = new UnsupportedOperationException(exception);
+
+        assertThat(modifyException(exception, Region.AWS_GLOBAL)).isInstanceOf(SdkClientException.class);
+    }
+
+    @Test
+    public void modifyException_returnsGenericHelp_forGlobalRegions() {
+        UnknownHostException exception = new UnknownHostException();
+        assertThat(modifyException(exception, Region.AWS_GLOBAL))
+            .isInstanceOf(SdkClientException.class)
+            .hasMessageContaining("network");
+    }
+
+    @Test
+    public void modifyException_returnsGenericHelp_forUnknownServices() {
+        UnknownHostException exception = new UnknownHostException();
+        assertThat(modifyException(exception, Region.US_EAST_1, "millems-hotdog-stand"))
+            .isInstanceOf(SdkClientException.class)
+            .satisfies(t -> doesNotHaveMessageContaining(t, "global"))
+            .hasMessageContaining("network");
+    }
+
+    @Test
+    public void modifyException_returnsGenericHelp_forUnknownServicesInUnknownRegions() {
+        UnknownHostException exception = new UnknownHostException();
+        assertThat(modifyException(exception, Region.of("cn-north-99"), "millems-hotdog-stand"))
+            .isInstanceOf(SdkClientException.class)
+            .satisfies(t -> doesNotHaveMessageContaining(t, "global"))
+            .hasMessageContaining("network");
+    }
+
+    @Test
+    public void modifyException_returnsGenericHelp_forServicesRegionalizedInAllPartitions() {
+        UnknownHostException exception = new UnknownHostException();
+        assertThat(modifyException(exception, Region.US_EAST_1, "dynamodb"))
+            .isInstanceOf(SdkClientException.class)
+            .satisfies(t -> doesNotHaveMessageContaining(t, "global"))
+            .hasMessageContaining("network");
+    }
+
+    @Test
+    public void modifyException_returnsGenericGlobalRegionHelp_forServicesGlobalInSomePartitionOtherThanTheClientPartition() {
+        UnknownHostException exception = new UnknownHostException();
+        assertThat(modifyException(exception, Region.of("cn-north-99"), "iam"))
+            .isInstanceOf(SdkClientException.class)
+            .satisfies(t -> doesNotHaveMessageContaining(t, "network"))
+            .hasMessageContaining("aws-global")
+            .hasMessageContaining("aws-cn-global");
+    }
+
+    @Test
+    public void modifyException_returnsSpecificGlobalRegionHelp_forServicesGlobalInTheClientRegionPartition() {
+        UnknownHostException exception = new UnknownHostException();
+        assertThat(modifyException(exception, Region.of("cn-north-1"), "iam"))
+            .isInstanceOf(SdkClientException.class)
+            .satisfies(t -> doesNotHaveMessageContaining(t, "aws-global"))
+            .hasMessageContaining("aws-cn-global");
+    }
+
+    private void doesNotHaveMessageContaining(Throwable throwable, String value) {
+        assertThat(throwable.getMessage()).doesNotContain(value);
+    }
+
+    private Throwable modifyException(Throwable throwable) {
+        return modifyException(throwable, null);
+    }
+
+    private Throwable modifyException(Throwable throwable, Region clientRegion) {
+        return modifyException(throwable, clientRegion, null);
+    }
+
+    private Throwable modifyException(Throwable throwable, Region clientRegion, String serviceEndpointPrefix) {
+        SdkRequest sdkRequest = Mockito.mock(SdkRequest.class);
+
+        DefaultFailedExecutionContext context =
+            DefaultFailedExecutionContext.builder()
+                                         .interceptorContext(InterceptorContext.builder().request(sdkRequest).build())
+                                         .exception(throwable)
+                                         .build();
+
+        ExecutionAttributes executionAttributes =
+            new ExecutionAttributes().putAttribute(AwsExecutionAttribute.AWS_REGION, clientRegion)
+                                     .putAttribute(AwsExecutionAttribute.ENDPOINT_PREFIX, serviceEndpointPrefix);
+
+        return INTERCEPTOR.modifyException(context, executionAttributes);
+    }
+}
\ No newline at end of file
diff --git a/core/aws-core/src/test/java/software/amazon/awssdk/awscore/retry/AwsRetryPolicyTest.java b/core/aws-core/src/test/java/software/amazon/awssdk/awscore/retry/AwsRetryPolicyTest.java
index e3f287ad11d0..002e93f81633 100644
--- a/core/aws-core/src/test/java/software/amazon/awssdk/awscore/retry/AwsRetryPolicyTest.java
+++ b/core/aws-core/src/test/java/software/amazon/awssdk/awscore/retry/AwsRetryPolicyTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -102,6 +102,17 @@ public void doesNotRetryOnNonRetryableErrorCode() {
         assertFalse(shouldRetry(applyErrorCode("ValidationError")));
     }
 
+    @Test
+    public void retriesOnEC2ThrottledException() {
+        AwsServiceException ex = AwsServiceException.builder()
+                                                    .awsErrorDetails(AwsErrorDetails.builder()
+                                                                                    .errorCode("EC2ThrottledException")
+                                                                                    .build())
+                                                    .build();
+
+        assertTrue(shouldRetry(b -> b.exception(ex)));
+    }
+
     private boolean shouldRetry(Consumer<RetryPolicyContext.Builder> builder) {
         return defaultRetryCondition().shouldRetry(RetryPolicyContext.builder().applyMutation(builder).build());
     }
diff --git a/core/aws-core/src/test/java/software/amazon/awssdk/awscore/retry/RetryOnErrorCodeConditionTest.java b/core/aws-core/src/test/java/software/amazon/awssdk/awscore/retry/RetryOnErrorCodeConditionTest.java
index e9e17b15dd44..bb72774c6511 100644
--- a/core/aws-core/src/test/java/software/amazon/awssdk/awscore/retry/RetryOnErrorCodeConditionTest.java
+++ b/core/aws-core/src/test/java/software/amazon/awssdk/awscore/retry/RetryOnErrorCodeConditionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/aws-core/src/test/java/software/amazon/awssdk/awscore/util/AwsHostNameUtilsTest.java b/core/aws-core/src/test/java/software/amazon/awssdk/awscore/util/AwsHostNameUtilsTest.java
index 265057f4445a..91a2cb1cfd90 100644
--- a/core/aws-core/src/test/java/software/amazon/awssdk/awscore/util/AwsHostNameUtilsTest.java
+++ b/core/aws-core/src/test/java/software/amazon/awssdk/awscore/util/AwsHostNameUtilsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/pom.xml b/core/pom.xml
index c9e8c36561be..76a1bd7b08aa 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>aws-sdk-java-pom</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
 
     <artifactId>core</artifactId>
@@ -34,13 +34,13 @@
 
     <modules>
         <module>annotations</module>
+        <module>arns</module>
         <module>auth</module>
         <module>sdk-core</module>
         <module>aws-core</module>
         <module>profiles</module>
         <module>regions</module>
         <module>protocols</module>
-        <module>arns</module>
     </modules>
 
     <dependencyManagement>
diff --git a/core/profiles/pom.xml b/core/profiles/pom.xml
index 68668d7b4949..d01d58e1cffa 100644
--- a/core/profiles/pom.xml
+++ b/core/profiles/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -22,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>core</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
 
     <artifactId>profiles</artifactId>
diff --git a/core/profiles/src/main/java/software/amazon/awssdk/profiles/Profile.java b/core/profiles/src/main/java/software/amazon/awssdk/profiles/Profile.java
index 9fd066ca45a9..5a03c4cf808b 100644
--- a/core/profiles/src/main/java/software/amazon/awssdk/profiles/Profile.java
+++ b/core/profiles/src/main/java/software/amazon/awssdk/profiles/Profile.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -150,7 +150,8 @@ private static final class BuilderImpl implements Builder {
         /**
          * @see #builder()
          */
-        private BuilderImpl() {}
+        private BuilderImpl() {
+        }
 
         @Override
         public Builder name(String name) {
diff --git a/core/profiles/src/main/java/software/amazon/awssdk/profiles/ProfileFile.java b/core/profiles/src/main/java/software/amazon/awssdk/profiles/ProfileFile.java
index 6e1f3695e4c7..6bd3066abeab 100644
--- a/core/profiles/src/main/java/software/amazon/awssdk/profiles/ProfileFile.java
+++ b/core/profiles/src/main/java/software/amazon/awssdk/profiles/ProfileFile.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -80,7 +80,10 @@ public static Aggregator aggregator() {
      * Get the default profile file, using the credentials file from "~/.aws/credentials", the config file from "~/.aws/config"
      * and the "default" profile. This default behavior can be customized using the
      * {@link ProfileFileSystemSetting#AWS_SHARED_CREDENTIALS_FILE}, {@link ProfileFileSystemSetting#AWS_CONFIG_FILE} and
-     * {@link ProfileFileSystemSetting#AWS_PROFILE} settings or by specifying a different profile file and profile name
+     * {@link ProfileFileSystemSetting#AWS_PROFILE} settings or by specifying a different profile file and profile name.
+     *
+     * <p>
+     * The file is read each time this method is invoked.
      */
     public static ProfileFile defaultProfileFile() {
         return ProfileFile.aggregator()
@@ -134,17 +137,17 @@ public int hashCode() {
     private static void addCredentialsFile(ProfileFile.Aggregator builder) {
         ProfileFileLocation.credentialsFileLocation()
                            .ifPresent(l -> builder.addFile(ProfileFile.builder()
-                                                                       .content(l)
-                                                                       .type(ProfileFile.Type.CREDENTIALS)
-                                                                       .build()));
+                                                                      .content(l)
+                                                                      .type(ProfileFile.Type.CREDENTIALS)
+                                                                      .build()));
     }
 
     private static void addConfigFile(ProfileFile.Aggregator builder) {
         ProfileFileLocation.configurationFileLocation()
                            .ifPresent(l -> builder.addFile(ProfileFile.builder()
-                                                                       .content(l)
-                                                                       .type(ProfileFile.Type.CONFIGURATION)
-                                                                       .build()));
+                                                                      .content(l)
+                                                                      .type(ProfileFile.Type.CONFIGURATION)
+                                                                      .build()));
     }
 
     /**
@@ -210,7 +213,8 @@ private static final class BuilderImpl implements Builder {
         private Path contentLocation;
         private Type type;
 
-        private BuilderImpl() {}
+        private BuilderImpl() {
+        }
 
         @Override
         public Builder content(InputStream contentStream) {
diff --git a/core/profiles/src/main/java/software/amazon/awssdk/profiles/ProfileFileLocation.java b/core/profiles/src/main/java/software/amazon/awssdk/profiles/ProfileFileLocation.java
index aa50a8acdd60..a3f5dc63db15 100644
--- a/core/profiles/src/main/java/software/amazon/awssdk/profiles/ProfileFileLocation.java
+++ b/core/profiles/src/main/java/software/amazon/awssdk/profiles/ProfileFileLocation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/profiles/src/main/java/software/amazon/awssdk/profiles/ProfileFileSystemSetting.java b/core/profiles/src/main/java/software/amazon/awssdk/profiles/ProfileFileSystemSetting.java
index f89f5aeecc7b..0a52b1a449bd 100644
--- a/core/profiles/src/main/java/software/amazon/awssdk/profiles/ProfileFileSystemSetting.java
+++ b/core/profiles/src/main/java/software/amazon/awssdk/profiles/ProfileFileSystemSetting.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/profiles/src/main/java/software/amazon/awssdk/profiles/ProfileProperty.java b/core/profiles/src/main/java/software/amazon/awssdk/profiles/ProfileProperty.java
index 2e7e24ae3caf..6f1070ea8a2f 100644
--- a/core/profiles/src/main/java/software/amazon/awssdk/profiles/ProfileProperty.java
+++ b/core/profiles/src/main/java/software/amazon/awssdk/profiles/ProfileProperty.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -86,5 +86,19 @@ public final class ProfileProperty {
 
     public static final String WEB_IDENTITY_TOKEN_FILE = "web_identity_token_file";
 
-    private ProfileProperty() {}
+    /**
+     * The S3 regional endpoint setting for the {@code us-east-1} region. Setting the value to {@code regional} causes
+     * the SDK to use the {@code s3.us-east-1.amazonaws.com} endpoint when using the {@code US_EAST_1} region instead of
+     * the global {@code s3.amazonaws.com}. Using the regional endpoint is disabled by default.
+     */
+    public static final String S3_US_EAST_1_REGIONAL_ENDPOINT = "s3_us_east_1_regional_endpoint";
+
+    /**
+     * The "retry mode" to be used for clients created using the currently-configured profile. Values supported by all SDKs are
+     * "legacy" and "standard". See the {@code RetryMode} class JavaDoc for more information.
+     */
+    public static final String RETRY_MODE = "retry_mode";
+
+    private ProfileProperty() {
+    }
 }
diff --git a/core/profiles/src/main/java/software/amazon/awssdk/profiles/internal/ProfileFileReader.java b/core/profiles/src/main/java/software/amazon/awssdk/profiles/internal/ProfileFileReader.java
index 99eda03eb688..f111df7b2413 100644
--- a/core/profiles/src/main/java/software/amazon/awssdk/profiles/internal/ProfileFileReader.java
+++ b/core/profiles/src/main/java/software/amazon/awssdk/profiles/internal/ProfileFileReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -42,9 +42,10 @@ public final class ProfileFileReader {
 
     private static final Pattern EMPTY_LINE = Pattern.compile("^[\t ]*$");
 
-    private static final Pattern VALID_IDENTIFIER = Pattern.compile("^[A-Za-z0-9_\\-]*$");
+    private static final Pattern VALID_IDENTIFIER = Pattern.compile("^[A-Za-z0-9_\\-/.%@]*$");
 
-    private ProfileFileReader() {}
+    private ProfileFileReader() {
+    }
 
     /**
      * Parses the input and returns a mutable map from profile name to a map of properties. This will not close the provided
@@ -213,7 +214,7 @@ private static Optional<String> parseProfileDefinition(ParserState state, String
         // If the profile name includes invalid characters, it should be ignored.
         if (!isValidIdentifier(profileName)) {
             log.warn(() -> "Ignoring profile '" + standardizedProfileName + "' on line " + state.currentLineNumber + " because " +
-                           "it was not alphanumeric with dashes or underscores.");
+                           "it was not alphanumeric with only these special characters: - / . % @ _");
             return Optional.empty();
         }
 
@@ -256,7 +257,7 @@ private static Optional<Pair<String, String>> parsePropertyDefinition(ParserStat
         // If the profile name includes invalid characters, it should be ignored.
         if (!isValidIdentifier(propertyKey)) {
             log.warn(() -> "Ignoring property '" + propertyKey + "' on line " + state.currentLineNumber + " because " +
-                           "its name was not alphanumeric with dashes or underscores.");
+                           "its name was not alphanumeric with only these special characters: - / . % @ _");
             return Optional.empty();
         }
 
diff --git a/core/profiles/src/test/java/software/amazon/awssdk/profiles/ProfileFileLocationTest.java b/core/profiles/src/test/java/software/amazon/awssdk/profiles/ProfileFileLocationTest.java
index 121faea40298..cf848bd64707 100644
--- a/core/profiles/src/test/java/software/amazon/awssdk/profiles/ProfileFileLocationTest.java
+++ b/core/profiles/src/test/java/software/amazon/awssdk/profiles/ProfileFileLocationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/profiles/src/test/java/software/amazon/awssdk/profiles/ProfileFileTest.java b/core/profiles/src/test/java/software/amazon/awssdk/profiles/ProfileFileTest.java
index d949eddc0ac6..d39126d60206 100644
--- a/core/profiles/src/test/java/software/amazon/awssdk/profiles/ProfileFileTest.java
+++ b/core/profiles/src/test/java/software/amazon/awssdk/profiles/ProfileFileTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -326,14 +326,14 @@ public void invalidPropertyNamesAreIgnored() {
 
     @Test
     public void allValidProfileNameCharactersAreSupported() {
-        assertThat(configFileProfiles("[profile ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_]"))
-            .isEqualTo(profiles(profile("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_")));
+        assertThat(configFileProfiles("[profile ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_./%@]"))
+            .isEqualTo(profiles(profile("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_./%@")));
     }
 
     @Test
     public void allValidPropertyNameCharactersAreSupported() {
-        assertThat(configFileProfiles("[profile foo]\nABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_ = value"))
-            .isEqualTo(profiles(profile("foo", property("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_",
+        assertThat(configFileProfiles("[profile foo]\nABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_./%@ = value"))
+            .isEqualTo(profiles(profile("foo", property("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_./%@",
                                                         "value"))));
     }
 
diff --git a/core/protocols/aws-cbor-protocol/pom.xml b/core/protocols/aws-cbor-protocol/pom.xml
index 1d2972c3a448..8e2baca4c320 100644
--- a/core/protocols/aws-cbor-protocol/pom.xml
+++ b/core/protocols/aws-cbor-protocol/pom.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ 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.
+  -->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>protocols</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/core/protocols/aws-cbor-protocol/src/main/java/software/amazon/awssdk/protocols/cbor/AwsCborProtocolFactory.java b/core/protocols/aws-cbor-protocol/src/main/java/software/amazon/awssdk/protocols/cbor/AwsCborProtocolFactory.java
index 3a9c37bec1f5..86fc70e23fc2 100644
--- a/core/protocols/aws-cbor-protocol/src/main/java/software/amazon/awssdk/protocols/cbor/AwsCborProtocolFactory.java
+++ b/core/protocols/aws-cbor-protocol/src/main/java/software/amazon/awssdk/protocols/cbor/AwsCborProtocolFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/protocols/aws-cbor-protocol/src/main/java/software/amazon/awssdk/protocols/cbor/internal/AwsStructuredCborFactory.java b/core/protocols/aws-cbor-protocol/src/main/java/software/amazon/awssdk/protocols/cbor/internal/AwsStructuredCborFactory.java
index 76c48f341e3a..d9f9144d6bf2 100644
--- a/core/protocols/aws-cbor-protocol/src/main/java/software/amazon/awssdk/protocols/cbor/internal/AwsStructuredCborFactory.java
+++ b/core/protocols/aws-cbor-protocol/src/main/java/software/amazon/awssdk/protocols/cbor/internal/AwsStructuredCborFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/protocols/aws-cbor-protocol/src/main/java/software/amazon/awssdk/protocols/cbor/internal/SdkCborGenerator.java b/core/protocols/aws-cbor-protocol/src/main/java/software/amazon/awssdk/protocols/cbor/internal/SdkCborGenerator.java
index 002c1bea2aa8..0520530a5103 100644
--- a/core/protocols/aws-cbor-protocol/src/main/java/software/amazon/awssdk/protocols/cbor/internal/SdkCborGenerator.java
+++ b/core/protocols/aws-cbor-protocol/src/main/java/software/amazon/awssdk/protocols/cbor/internal/SdkCborGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/protocols/aws-cbor-protocol/src/main/java/software/amazon/awssdk/protocols/cbor/internal/SdkStructuredCborFactory.java b/core/protocols/aws-cbor-protocol/src/main/java/software/amazon/awssdk/protocols/cbor/internal/SdkStructuredCborFactory.java
index aca1307d771f..3e014774db63 100644
--- a/core/protocols/aws-cbor-protocol/src/main/java/software/amazon/awssdk/protocols/cbor/internal/SdkStructuredCborFactory.java
+++ b/core/protocols/aws-cbor-protocol/src/main/java/software/amazon/awssdk/protocols/cbor/internal/SdkStructuredCborFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/protocols/aws-cbor-protocol/src/test/java/software/amazon/awssdk/protocols/cbor/AwsCborProtocolFactoryTest.java b/core/protocols/aws-cbor-protocol/src/test/java/software/amazon/awssdk/protocols/cbor/AwsCborProtocolFactoryTest.java
index 4dcbc1a27df3..6cc6cbaf2ccd 100644
--- a/core/protocols/aws-cbor-protocol/src/test/java/software/amazon/awssdk/protocols/cbor/AwsCborProtocolFactoryTest.java
+++ b/core/protocols/aws-cbor-protocol/src/test/java/software/amazon/awssdk/protocols/cbor/AwsCborProtocolFactoryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/protocols/aws-ion-protocol/pom.xml b/core/protocols/aws-ion-protocol/pom.xml
index a788cedd2a4b..e9be1f4696c2 100644
--- a/core/protocols/aws-ion-protocol/pom.xml
+++ b/core/protocols/aws-ion-protocol/pom.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ 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.
+  -->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>protocols</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/core/protocols/aws-ion-protocol/src/main/java/software/amazon/awssdk/protocols/ion/AwsIonProtocolFactory.java b/core/protocols/aws-ion-protocol/src/main/java/software/amazon/awssdk/protocols/ion/AwsIonProtocolFactory.java
index dff6a6b6f8e4..5e976913b51d 100644
--- a/core/protocols/aws-ion-protocol/src/main/java/software/amazon/awssdk/protocols/ion/AwsIonProtocolFactory.java
+++ b/core/protocols/aws-ion-protocol/src/main/java/software/amazon/awssdk/protocols/ion/AwsIonProtocolFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/protocols/aws-ion-protocol/src/main/java/software/amazon/awssdk/protocols/ion/internal/AwsStructuredIonFactory.java b/core/protocols/aws-ion-protocol/src/main/java/software/amazon/awssdk/protocols/ion/internal/AwsStructuredIonFactory.java
index a3e789b73444..85345e33245e 100644
--- a/core/protocols/aws-ion-protocol/src/main/java/software/amazon/awssdk/protocols/ion/internal/AwsStructuredIonFactory.java
+++ b/core/protocols/aws-ion-protocol/src/main/java/software/amazon/awssdk/protocols/ion/internal/AwsStructuredIonFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/protocols/aws-ion-protocol/src/main/java/software/amazon/awssdk/protocols/ion/internal/CompositeErrorCodeParser.java b/core/protocols/aws-ion-protocol/src/main/java/software/amazon/awssdk/protocols/ion/internal/CompositeErrorCodeParser.java
index 13b522378222..0d3bdb20aeb0 100644
--- a/core/protocols/aws-ion-protocol/src/main/java/software/amazon/awssdk/protocols/ion/internal/CompositeErrorCodeParser.java
+++ b/core/protocols/aws-ion-protocol/src/main/java/software/amazon/awssdk/protocols/ion/internal/CompositeErrorCodeParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/protocols/aws-ion-protocol/src/main/java/software/amazon/awssdk/protocols/ion/internal/IonErrorCodeParser.java b/core/protocols/aws-ion-protocol/src/main/java/software/amazon/awssdk/protocols/ion/internal/IonErrorCodeParser.java
index 50d59b5c8ede..64d91e3b080b 100644
--- a/core/protocols/aws-ion-protocol/src/main/java/software/amazon/awssdk/protocols/ion/internal/IonErrorCodeParser.java
+++ b/core/protocols/aws-ion-protocol/src/main/java/software/amazon/awssdk/protocols/ion/internal/IonErrorCodeParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/protocols/aws-ion-protocol/src/main/java/software/amazon/awssdk/protocols/ion/internal/IonFactory.java b/core/protocols/aws-ion-protocol/src/main/java/software/amazon/awssdk/protocols/ion/internal/IonFactory.java
index a1b1ab35a97e..7425516f5ee6 100644
--- a/core/protocols/aws-ion-protocol/src/main/java/software/amazon/awssdk/protocols/ion/internal/IonFactory.java
+++ b/core/protocols/aws-ion-protocol/src/main/java/software/amazon/awssdk/protocols/ion/internal/IonFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/protocols/aws-ion-protocol/src/main/java/software/amazon/awssdk/protocols/ion/internal/IonParser.java b/core/protocols/aws-ion-protocol/src/main/java/software/amazon/awssdk/protocols/ion/internal/IonParser.java
index 09e204e35dc2..f93568dd43af 100644
--- a/core/protocols/aws-ion-protocol/src/main/java/software/amazon/awssdk/protocols/ion/internal/IonParser.java
+++ b/core/protocols/aws-ion-protocol/src/main/java/software/amazon/awssdk/protocols/ion/internal/IonParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/protocols/aws-ion-protocol/src/main/java/software/amazon/awssdk/protocols/ion/internal/SdkIonGenerator.java b/core/protocols/aws-ion-protocol/src/main/java/software/amazon/awssdk/protocols/ion/internal/SdkIonGenerator.java
index 1c92a263ab3a..4d758970d2d2 100644
--- a/core/protocols/aws-ion-protocol/src/main/java/software/amazon/awssdk/protocols/ion/internal/SdkIonGenerator.java
+++ b/core/protocols/aws-ion-protocol/src/main/java/software/amazon/awssdk/protocols/ion/internal/SdkIonGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/protocols/aws-ion-protocol/src/main/java/software/amazon/awssdk/protocols/ion/internal/SdkStructuredIonFactory.java b/core/protocols/aws-ion-protocol/src/main/java/software/amazon/awssdk/protocols/ion/internal/SdkStructuredIonFactory.java
index fb04ff63011c..639ea5e60bbe 100644
--- a/core/protocols/aws-ion-protocol/src/main/java/software/amazon/awssdk/protocols/ion/internal/SdkStructuredIonFactory.java
+++ b/core/protocols/aws-ion-protocol/src/main/java/software/amazon/awssdk/protocols/ion/internal/SdkStructuredIonFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/protocols/aws-ion-protocol/src/test/java/software/amazon/awssdk/protocols/ion/AwsStructuredIonFactoryTest.java b/core/protocols/aws-ion-protocol/src/test/java/software/amazon/awssdk/protocols/ion/AwsStructuredIonFactoryTest.java
index d9599cd682b1..2b2fab841717 100644
--- a/core/protocols/aws-ion-protocol/src/test/java/software/amazon/awssdk/protocols/ion/AwsStructuredIonFactoryTest.java
+++ b/core/protocols/aws-ion-protocol/src/test/java/software/amazon/awssdk/protocols/ion/AwsStructuredIonFactoryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/protocols/aws-ion-protocol/src/test/java/software/amazon/awssdk/protocols/ion/IonFactoryTest.java b/core/protocols/aws-ion-protocol/src/test/java/software/amazon/awssdk/protocols/ion/IonFactoryTest.java
index edead0a92c31..31c9b82298a3 100644
--- a/core/protocols/aws-ion-protocol/src/test/java/software/amazon/awssdk/protocols/ion/IonFactoryTest.java
+++ b/core/protocols/aws-ion-protocol/src/test/java/software/amazon/awssdk/protocols/ion/IonFactoryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/protocols/aws-ion-protocol/src/test/java/software/amazon/awssdk/protocols/ion/IonParserTest.java b/core/protocols/aws-ion-protocol/src/test/java/software/amazon/awssdk/protocols/ion/IonParserTest.java
index 337b12ac1e02..ca829c900c83 100644
--- a/core/protocols/aws-ion-protocol/src/test/java/software/amazon/awssdk/protocols/ion/IonParserTest.java
+++ b/core/protocols/aws-ion-protocol/src/test/java/software/amazon/awssdk/protocols/ion/IonParserTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/protocols/aws-ion-protocol/src/test/java/software/amazon/awssdk/protocols/ion/IonRoundtripTest.java b/core/protocols/aws-ion-protocol/src/test/java/software/amazon/awssdk/protocols/ion/IonRoundtripTest.java
index 895bf3f2bafa..ba5429205563 100644
--- a/core/protocols/aws-ion-protocol/src/test/java/software/amazon/awssdk/protocols/ion/IonRoundtripTest.java
+++ b/core/protocols/aws-ion-protocol/src/test/java/software/amazon/awssdk/protocols/ion/IonRoundtripTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/protocols/aws-ion-protocol/src/test/java/software/amazon/awssdk/protocols/ion/ValidSdkObjects.java b/core/protocols/aws-ion-protocol/src/test/java/software/amazon/awssdk/protocols/ion/ValidSdkObjects.java
index 63ddcc3d30f2..eabb349822ba 100644
--- a/core/protocols/aws-ion-protocol/src/test/java/software/amazon/awssdk/protocols/ion/ValidSdkObjects.java
+++ b/core/protocols/aws-ion-protocol/src/test/java/software/amazon/awssdk/protocols/ion/ValidSdkObjects.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/protocols/aws-json-protocol/pom.xml b/core/protocols/aws-json-protocol/pom.xml
index 36cf4510dd7c..d28646888042 100644
--- a/core/protocols/aws-json-protocol/pom.xml
+++ b/core/protocols/aws-json-protocol/pom.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ 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.
+  -->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>protocols</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/AwsJsonProtocol.java b/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/AwsJsonProtocol.java
index c0188854aa63..98f923f0f114 100644
--- a/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/AwsJsonProtocol.java
+++ b/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/AwsJsonProtocol.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/AwsJsonProtocolFactory.java b/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/AwsJsonProtocolFactory.java
index 072ea031301f..fe6217c5f431 100644
--- a/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/AwsJsonProtocolFactory.java
+++ b/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/AwsJsonProtocolFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/AwsJsonProtocolMetadata.java b/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/AwsJsonProtocolMetadata.java
index 130b2d8046f1..47ccb9491b80 100644
--- a/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/AwsJsonProtocolMetadata.java
+++ b/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/AwsJsonProtocolMetadata.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/BaseAwsJsonProtocolFactory.java b/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/BaseAwsJsonProtocolFactory.java
index 0e183ad8ffdf..b85f58246e43 100644
--- a/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/BaseAwsJsonProtocolFactory.java
+++ b/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/BaseAwsJsonProtocolFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/BaseAwsStructuredJsonFactory.java b/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/BaseAwsStructuredJsonFactory.java
index 63819e81d98a..a27196287e4c 100644
--- a/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/BaseAwsStructuredJsonFactory.java
+++ b/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/BaseAwsStructuredJsonFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/DefaultJsonContentTypeResolver.java b/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/DefaultJsonContentTypeResolver.java
index 24731d9d2307..12b6eda2b838 100644
--- a/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/DefaultJsonContentTypeResolver.java
+++ b/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/DefaultJsonContentTypeResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -32,6 +32,7 @@ public DefaultJsonContentTypeResolver(String prefix) {
 
     @Override
     public String resolveContentType(AwsJsonProtocolMetadata protocolMetadata) {
+        //Changing this to 'application/json' may break clients expecting 'application/x-amz-json-1.1'
         return prefix + protocolMetadata.protocolVersion();
     }
 }
diff --git a/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/ErrorCodeParser.java b/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/ErrorCodeParser.java
index 1143f2e20540..bb7fc7d487af 100644
--- a/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/ErrorCodeParser.java
+++ b/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/ErrorCodeParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/JsonContent.java b/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/JsonContent.java
index 0889183932f1..bb5edba9ee11 100644
--- a/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/JsonContent.java
+++ b/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/JsonContent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/JsonContentTypeResolver.java b/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/JsonContentTypeResolver.java
index 8d0ff1eb29bd..59e395af105b 100644
--- a/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/JsonContentTypeResolver.java
+++ b/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/JsonContentTypeResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/JsonOperationMetadata.java b/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/JsonOperationMetadata.java
index 87074578b86a..874528a2babe 100644
--- a/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/JsonOperationMetadata.java
+++ b/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/JsonOperationMetadata.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/SdkJsonGenerator.java b/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/SdkJsonGenerator.java
index 559af86a646e..0e91bfbd019e 100644
--- a/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/SdkJsonGenerator.java
+++ b/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/SdkJsonGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/StructuredJsonFactory.java b/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/StructuredJsonFactory.java
index 2ef486ce682b..c88840d4d927 100644
--- a/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/StructuredJsonFactory.java
+++ b/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/StructuredJsonFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/StructuredJsonGenerator.java b/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/StructuredJsonGenerator.java
index e411878f5f67..98b83699849c 100644
--- a/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/StructuredJsonGenerator.java
+++ b/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/StructuredJsonGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -32,8 +32,6 @@ public interface StructuredJsonGenerator {
      */
     StructuredJsonGenerator NO_OP = new StructuredJsonGenerator() {
 
-        private final byte[] emptyBytes = new byte[0];
-
         @Override
         public StructuredJsonGenerator writeStartArray() {
             return this;
@@ -126,7 +124,7 @@ public StructuredJsonGenerator writeNumber(String number) {
 
         @Override
         public byte[] getBytes() {
-            return emptyBytes;
+            return null;
         }
 
         @Override
diff --git a/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/AwsStructuredPlainJsonFactory.java b/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/AwsStructuredPlainJsonFactory.java
index ec1efc9166d0..14d97b854627 100644
--- a/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/AwsStructuredPlainJsonFactory.java
+++ b/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/AwsStructuredPlainJsonFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/dom/JsonDomParser.java b/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/dom/JsonDomParser.java
index 1392ceba41fa..914376cd4db1 100644
--- a/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/dom/JsonDomParser.java
+++ b/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/dom/JsonDomParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/dom/SdkArrayNode.java b/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/dom/SdkArrayNode.java
index 6088da13dab3..2f2521946205 100644
--- a/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/dom/SdkArrayNode.java
+++ b/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/dom/SdkArrayNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/dom/SdkEmbeddedObject.java b/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/dom/SdkEmbeddedObject.java
index ea70f1beabe5..1d2d413df357 100644
--- a/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/dom/SdkEmbeddedObject.java
+++ b/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/dom/SdkEmbeddedObject.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/dom/SdkJsonNode.java b/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/dom/SdkJsonNode.java
index 366b5e6e50c2..83a93e7370b5 100644
--- a/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/dom/SdkJsonNode.java
+++ b/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/dom/SdkJsonNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/dom/SdkNullNode.java b/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/dom/SdkNullNode.java
index 40056340b43c..3d8739cd4345 100644
--- a/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/dom/SdkNullNode.java
+++ b/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/dom/SdkNullNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/dom/SdkObjectNode.java b/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/dom/SdkObjectNode.java
index e8cc7d2a8fad..59ab40887a02 100644
--- a/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/dom/SdkObjectNode.java
+++ b/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/dom/SdkObjectNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/dom/SdkScalarNode.java b/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/dom/SdkScalarNode.java
index b75aed0d9456..98c1eb862b7e 100644
--- a/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/dom/SdkScalarNode.java
+++ b/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/dom/SdkScalarNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/marshall/HeaderMarshaller.java b/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/marshall/HeaderMarshaller.java
index fee5eaa946b4..c8af60708ac0 100644
--- a/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/marshall/HeaderMarshaller.java
+++ b/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/marshall/HeaderMarshaller.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/marshall/JsonMarshaller.java b/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/marshall/JsonMarshaller.java
index facfa5e7ab17..7b6ba85abbc5 100644
--- a/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/marshall/JsonMarshaller.java
+++ b/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/marshall/JsonMarshaller.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -24,14 +24,11 @@
  *
  * @param <T> Type to marshall.
  */
+@FunctionalInterface
 @SdkInternalApi
 public interface JsonMarshaller<T> extends Marshaller<T> {
 
-    JsonMarshaller<Void> NULL = new JsonMarshaller<Void>() {
-        @Override
-        public void marshall(Void val, JsonMarshallerContext context, String paramName, SdkField<Void> sdkField) {
-        }
-    };
+    JsonMarshaller<Void> NULL = (val, context, paramName, sdkField) -> { };
 
     /**
      * Marshall the data into the request.
diff --git a/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/marshall/JsonMarshallerContext.java b/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/marshall/JsonMarshallerContext.java
index 15c4f97da95a..3d4581ed4a58 100644
--- a/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/marshall/JsonMarshallerContext.java
+++ b/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/marshall/JsonMarshallerContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/marshall/JsonMarshallerRegistry.java b/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/marshall/JsonMarshallerRegistry.java
index 3c50226973c6..a95beb6e2760 100644
--- a/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/marshall/JsonMarshallerRegistry.java
+++ b/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/marshall/JsonMarshallerRegistry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/marshall/JsonProtocolMarshaller.java b/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/marshall/JsonProtocolMarshaller.java
index eefe150a73ff..18adefe81d61 100644
--- a/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/marshall/JsonProtocolMarshaller.java
+++ b/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/marshall/JsonProtocolMarshaller.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -201,9 +201,12 @@ private SdkHttpFullRequest finishMarshalling() {
             }
 
             byte[] content = jsonGenerator.getBytes();
-            request.contentStreamProvider(() -> new ByteArrayInputStream(content));
-            if (content.length > 0) {
-                request.putHeader(CONTENT_LENGTH, Integer.toString(content.length));
+
+            if (content != null) {
+                request.contentStreamProvider(() -> new ByteArrayInputStream(content));
+                if (content.length > 0) {
+                    request.putHeader(CONTENT_LENGTH, Integer.toString(content.length));
+                }
             }
         }
 
@@ -214,7 +217,7 @@ private SdkHttpFullRequest finishMarshalling() {
         if (!request.headers().containsKey(CONTENT_TYPE) && !hasEvent) {
             if (hasEventStreamingInput) {
                 request.putHeader(CONTENT_TYPE, MIMETYPE_EVENT_STREAM);
-            } else if (contentType != null && !hasStreamingInput) {
+            } else if (contentType != null && !hasStreamingInput && request.contentStreamProvider() != null) {
                 request.putHeader(CONTENT_TYPE, contentType);
             }
         }
diff --git a/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/marshall/JsonProtocolMarshallerBuilder.java b/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/marshall/JsonProtocolMarshallerBuilder.java
index c8b32bfb9719..1a4446d4776a 100644
--- a/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/marshall/JsonProtocolMarshallerBuilder.java
+++ b/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/marshall/JsonProtocolMarshallerBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/marshall/NullAsEmptyBodyProtocolRequestMarshaller.java b/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/marshall/NullAsEmptyBodyProtocolRequestMarshaller.java
index 26fb8c7ab0c0..9b3c444ef1fa 100644
--- a/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/marshall/NullAsEmptyBodyProtocolRequestMarshaller.java
+++ b/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/marshall/NullAsEmptyBodyProtocolRequestMarshaller.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/marshall/QueryParamMarshaller.java b/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/marshall/QueryParamMarshaller.java
index d857e4d4feee..3d491fb6f392 100644
--- a/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/marshall/QueryParamMarshaller.java
+++ b/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/marshall/QueryParamMarshaller.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/marshall/SimpleTypeJsonMarshaller.java b/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/marshall/SimpleTypeJsonMarshaller.java
index c269e52e5101..756691904224 100644
--- a/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/marshall/SimpleTypeJsonMarshaller.java
+++ b/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/marshall/SimpleTypeJsonMarshaller.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -93,34 +93,31 @@ public void marshall(Boolean val, StructuredJsonGenerator jsonGenerator, JsonMar
         }
     };
 
-    public static final JsonMarshaller<Instant> INSTANT = new JsonMarshaller<Instant>() {
-        @Override
-        public void marshall(Instant val, JsonMarshallerContext context, String paramName, SdkField<Instant> sdkField) {
-            StructuredJsonGenerator jsonGenerator = context.jsonGenerator();
-            if (paramName != null) {
-                jsonGenerator.writeFieldName(paramName);
-            }
-            TimestampFormatTrait trait = sdkField.getTrait(TimestampFormatTrait.class);
-            if (trait != null) {
-                switch (trait.format()) {
-                    case UNIX_TIMESTAMP:
-                        jsonGenerator.writeNumber(DateUtils.formatUnixTimestampInstant(val));
-                        break;
-                    case RFC_822:
-                        jsonGenerator.writeValue(DateUtils.formatRfc1123Date(val));
-                        break;
-                    case ISO_8601:
-                        jsonGenerator.writeValue(DateUtils.formatIso8601Date(val));
-                        break;
-                    default:
-                        throw SdkClientException.create("Unrecognized timestamp format - " + trait.format());
-                }
-            } else {
-                // Important to fallback to the jsonGenerator implementation as that may differ per wire format,
-                // irrespective of protocol. I.E. CBOR would default to unix timestamp as milliseconds while JSON
-                // will default to unix timestamp as seconds with millisecond decimal precision.
-                jsonGenerator.writeValue(val);
+    public static final JsonMarshaller<Instant> INSTANT = (val, context, paramName, sdkField) -> {
+        StructuredJsonGenerator jsonGenerator = context.jsonGenerator();
+        if (paramName != null) {
+            jsonGenerator.writeFieldName(paramName);
+        }
+        TimestampFormatTrait trait = sdkField.getTrait(TimestampFormatTrait.class);
+        if (trait != null) {
+            switch (trait.format()) {
+                case UNIX_TIMESTAMP:
+                    jsonGenerator.writeNumber(DateUtils.formatUnixTimestampInstant(val));
+                    break;
+                case RFC_822:
+                    jsonGenerator.writeValue(DateUtils.formatRfc1123Date(val));
+                    break;
+                case ISO_8601:
+                    jsonGenerator.writeValue(DateUtils.formatIso8601Date(val));
+                    break;
+                default:
+                    throw SdkClientException.create("Unrecognized timestamp format - " + trait.format());
             }
+        } else {
+            // Important to fallback to the jsonGenerator implementation as that may differ per wire format,
+            // irrespective of protocol. I.E. CBOR would default to unix timestamp as milliseconds while JSON
+            // will default to unix timestamp as seconds with millisecond decimal precision.
+            jsonGenerator.writeValue(val);
         }
     };
 
diff --git a/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/marshall/SimpleTypePathMarshaller.java b/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/marshall/SimpleTypePathMarshaller.java
index e3d4810a06a5..8b48a9ab1b61 100644
--- a/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/marshall/SimpleTypePathMarshaller.java
+++ b/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/marshall/SimpleTypePathMarshaller.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/unmarshall/AwsJsonErrorMessageParser.java b/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/unmarshall/AwsJsonErrorMessageParser.java
index f9941934d51f..954504d7d25f 100644
--- a/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/unmarshall/AwsJsonErrorMessageParser.java
+++ b/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/unmarshall/AwsJsonErrorMessageParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/unmarshall/AwsJsonProtocolErrorUnmarshaller.java b/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/unmarshall/AwsJsonProtocolErrorUnmarshaller.java
index f9c883a391ae..ac1de74e5c37 100644
--- a/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/unmarshall/AwsJsonProtocolErrorUnmarshaller.java
+++ b/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/unmarshall/AwsJsonProtocolErrorUnmarshaller.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/unmarshall/AwsJsonResponseHandler.java b/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/unmarshall/AwsJsonResponseHandler.java
index 41f4b04e086c..0c20eafc4d2f 100644
--- a/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/unmarshall/AwsJsonResponseHandler.java
+++ b/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/unmarshall/AwsJsonResponseHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/unmarshall/ErrorMessageParser.java b/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/unmarshall/ErrorMessageParser.java
index ef1b164f44f2..9eab0e57cd36 100644
--- a/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/unmarshall/ErrorMessageParser.java
+++ b/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/unmarshall/ErrorMessageParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/unmarshall/HeaderUnmarshaller.java b/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/unmarshall/HeaderUnmarshaller.java
index 8c029f2f7cfb..f7dbbdf266ad 100644
--- a/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/unmarshall/HeaderUnmarshaller.java
+++ b/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/unmarshall/HeaderUnmarshaller.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/unmarshall/JsonErrorCodeParser.java b/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/unmarshall/JsonErrorCodeParser.java
index 706c44e3cab7..dcaf190e3565 100644
--- a/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/unmarshall/JsonErrorCodeParser.java
+++ b/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/unmarshall/JsonErrorCodeParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/unmarshall/JsonProtocolUnmarshaller.java b/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/unmarshall/JsonProtocolUnmarshaller.java
index f3c06838bbed..68aa66bd8a5c 100644
--- a/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/unmarshall/JsonProtocolUnmarshaller.java
+++ b/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/unmarshall/JsonProtocolUnmarshaller.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -121,11 +121,11 @@ private static SdkPojo unmarshallStructured(JsonUnmarshallerContext context, Sdk
         if (jsonContent == null || jsonContent.isNull()) {
             return null;
         }
-        SdkField<?> valueInfo = field.getTrait(MapTrait.class).valueFieldInfo();
+        SdkField<Object> valueInfo = field.getTrait(MapTrait.class).valueFieldInfo();
         Map<String, Object> map = new HashMap<>();
         jsonContent.fields().forEach((fieldName, value) -> {
             JsonUnmarshaller<Object> unmarshaller = context.getUnmarshaller(valueInfo.location(), valueInfo.marshallingType());
-            map.put(fieldName, unmarshaller.unmarshall(context, value, (SdkField<Object>) valueInfo));
+            map.put(fieldName, unmarshaller.unmarshall(context, value, valueInfo));
         });
         return map;
     }
@@ -137,10 +137,10 @@ private static List<?> unmarshallList(JsonUnmarshallerContext context, SdkJsonNo
         return jsonContent.items()
                           .stream()
                           .map(item -> {
-                              SdkField<?> memberInfo = field.getTrait(ListTrait.class).memberFieldInfo();
+                              SdkField<Object> memberInfo = field.getTrait(ListTrait.class).memberFieldInfo();
                               JsonUnmarshaller<Object> unmarshaller = context.getUnmarshaller(memberInfo.location(),
                                                                                               memberInfo.marshallingType());
-                              return unmarshaller.unmarshall(context, item, (SdkField<Object>) memberInfo);
+                              return unmarshaller.unmarshall(context, item, memberInfo);
                           })
                           .collect(Collectors.toList());
     }
diff --git a/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/unmarshall/JsonResponseHandler.java b/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/unmarshall/JsonResponseHandler.java
index ff044e2f8668..fbf0e001069f 100644
--- a/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/unmarshall/JsonResponseHandler.java
+++ b/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/unmarshall/JsonResponseHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/unmarshall/JsonUnmarshaller.java b/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/unmarshall/JsonUnmarshaller.java
index 64ce4e65e599..b71e0adbbdac 100644
--- a/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/unmarshall/JsonUnmarshaller.java
+++ b/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/unmarshall/JsonUnmarshaller.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/unmarshall/JsonUnmarshallerContext.java b/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/unmarshall/JsonUnmarshallerContext.java
index d5a49627627e..e740350fc0ab 100644
--- a/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/unmarshall/JsonUnmarshallerContext.java
+++ b/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/unmarshall/JsonUnmarshallerContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/unmarshall/JsonUnmarshallerRegistry.java b/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/unmarshall/JsonUnmarshallerRegistry.java
index 9bbd66cae0e3..ff461163f5d3 100644
--- a/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/unmarshall/JsonUnmarshallerRegistry.java
+++ b/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/unmarshall/JsonUnmarshallerRegistry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/unmarshall/SdkJsonErrorMessageParser.java b/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/unmarshall/SdkJsonErrorMessageParser.java
index c747f5991c64..02fac7fb163b 100644
--- a/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/unmarshall/SdkJsonErrorMessageParser.java
+++ b/core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/unmarshall/SdkJsonErrorMessageParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/protocols/aws-json-protocol/src/test/java/software/amazon/awssdk/protocols/json/AwsJsonErrorMessageParserTest.java b/core/protocols/aws-json-protocol/src/test/java/software/amazon/awssdk/protocols/json/AwsJsonErrorMessageParserTest.java
index b454876d192a..073ba292b3ca 100644
--- a/core/protocols/aws-json-protocol/src/test/java/software/amazon/awssdk/protocols/json/AwsJsonErrorMessageParserTest.java
+++ b/core/protocols/aws-json-protocol/src/test/java/software/amazon/awssdk/protocols/json/AwsJsonErrorMessageParserTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/protocols/aws-json-protocol/src/test/java/software/amazon/awssdk/protocols/json/JsonErrorCodeParserTest.java b/core/protocols/aws-json-protocol/src/test/java/software/amazon/awssdk/protocols/json/JsonErrorCodeParserTest.java
index df433959049a..9c4b94faee02 100644
--- a/core/protocols/aws-json-protocol/src/test/java/software/amazon/awssdk/protocols/json/JsonErrorCodeParserTest.java
+++ b/core/protocols/aws-json-protocol/src/test/java/software/amazon/awssdk/protocols/json/JsonErrorCodeParserTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/protocols/aws-json-protocol/src/test/java/software/amazon/awssdk/protocols/json/SdkJsonGeneratorTest.java b/core/protocols/aws-json-protocol/src/test/java/software/amazon/awssdk/protocols/json/SdkJsonGeneratorTest.java
index 058e1cf01e02..7a81210c06fe 100644
--- a/core/protocols/aws-json-protocol/src/test/java/software/amazon/awssdk/protocols/json/SdkJsonGeneratorTest.java
+++ b/core/protocols/aws-json-protocol/src/test/java/software/amazon/awssdk/protocols/json/SdkJsonGeneratorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/protocols/aws-json-protocol/src/test/java/software/amazon/awssdk/protocols/json/ValidSdkObjects.java b/core/protocols/aws-json-protocol/src/test/java/software/amazon/awssdk/protocols/json/ValidSdkObjects.java
index ba368c8e9a28..4fbb78221816 100644
--- a/core/protocols/aws-json-protocol/src/test/java/software/amazon/awssdk/protocols/json/ValidSdkObjects.java
+++ b/core/protocols/aws-json-protocol/src/test/java/software/amazon/awssdk/protocols/json/ValidSdkObjects.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/protocols/aws-json-protocol/src/test/java/software/amazon/awssdk/protocols/json/internal/dom/JsonDomParserTest.java b/core/protocols/aws-json-protocol/src/test/java/software/amazon/awssdk/protocols/json/internal/dom/JsonDomParserTest.java
index 96aa0b4cf508..ab8ae765a369 100644
--- a/core/protocols/aws-json-protocol/src/test/java/software/amazon/awssdk/protocols/json/internal/dom/JsonDomParserTest.java
+++ b/core/protocols/aws-json-protocol/src/test/java/software/amazon/awssdk/protocols/json/internal/dom/JsonDomParserTest.java
@@ -1,3 +1,18 @@
+/*
+ * 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.
+ */
+
 package software.amazon.awssdk.protocols.json.internal.dom;
 
 
diff --git a/core/protocols/aws-query-protocol/pom.xml b/core/protocols/aws-query-protocol/pom.xml
index 935d10a19e2d..fcb7686f5da5 100644
--- a/core/protocols/aws-query-protocol/pom.xml
+++ b/core/protocols/aws-query-protocol/pom.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ 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.
+  -->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>protocols</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/core/protocols/aws-query-protocol/src/main/java/software/amazon/awssdk/protocols/query/AwsEc2ProtocolFactory.java b/core/protocols/aws-query-protocol/src/main/java/software/amazon/awssdk/protocols/query/AwsEc2ProtocolFactory.java
index 3c6e5536b426..072b696587dc 100644
--- a/core/protocols/aws-query-protocol/src/main/java/software/amazon/awssdk/protocols/query/AwsEc2ProtocolFactory.java
+++ b/core/protocols/aws-query-protocol/src/main/java/software/amazon/awssdk/protocols/query/AwsEc2ProtocolFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/protocols/aws-query-protocol/src/main/java/software/amazon/awssdk/protocols/query/AwsQueryProtocolFactory.java b/core/protocols/aws-query-protocol/src/main/java/software/amazon/awssdk/protocols/query/AwsQueryProtocolFactory.java
index e097f849d623..ae2891123282 100644
--- a/core/protocols/aws-query-protocol/src/main/java/software/amazon/awssdk/protocols/query/AwsQueryProtocolFactory.java
+++ b/core/protocols/aws-query-protocol/src/main/java/software/amazon/awssdk/protocols/query/AwsQueryProtocolFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/protocols/aws-query-protocol/src/main/java/software/amazon/awssdk/protocols/query/interceptor/QueryParametersToBodyInterceptor.java b/core/protocols/aws-query-protocol/src/main/java/software/amazon/awssdk/protocols/query/interceptor/QueryParametersToBodyInterceptor.java
new file mode 100644
index 000000000000..3c8b5f7663a9
--- /dev/null
+++ b/core/protocols/aws-query-protocol/src/main/java/software/amazon/awssdk/protocols/query/interceptor/QueryParametersToBodyInterceptor.java
@@ -0,0 +1,81 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.protocols.query.interceptor;
+
+import static java.util.Collections.singletonList;
+import static software.amazon.awssdk.utils.StringUtils.lowerCase;
+
+import java.io.ByteArrayInputStream;
+import java.nio.charset.StandardCharsets;
+import software.amazon.awssdk.annotations.SdkProtectedApi;
+import software.amazon.awssdk.core.interceptor.Context;
+import software.amazon.awssdk.core.interceptor.ExecutionAttributes;
+import software.amazon.awssdk.core.interceptor.ExecutionInterceptor;
+import software.amazon.awssdk.http.SdkHttpFullRequest;
+import software.amazon.awssdk.http.SdkHttpMethod;
+import software.amazon.awssdk.http.SdkHttpRequest;
+import software.amazon.awssdk.utils.CollectionUtils;
+import software.amazon.awssdk.utils.http.SdkHttpUtils;
+
+/**
+ * Modifies an HTTP request by moving query parameters to the body under the following conditions:
+ * - It is a POST request
+ * - There is no content stream provider
+ * - There are query parameters to transfer
+ * <p>
+ * This interceptor is automatically inserted by codegen for services using Query Protocol
+ */
+@SdkProtectedApi
+public final class QueryParametersToBodyInterceptor implements ExecutionInterceptor {
+
+    private static final String DEFAULT_CONTENT_TYPE = "application/x-www-form-urlencoded; charset=" +
+            lowerCase(StandardCharsets.UTF_8.toString());
+
+    @Override
+    public SdkHttpRequest modifyHttpRequest(Context.ModifyHttpRequest context,
+                                            ExecutionAttributes executionAttributes) {
+
+        SdkHttpRequest httpRequest = context.httpRequest();
+
+        if (!(httpRequest instanceof SdkHttpFullRequest)) {
+            return httpRequest;
+        }
+
+        SdkHttpFullRequest httpFullRequest = (SdkHttpFullRequest) httpRequest;
+        if (shouldPutParamsInBody(httpFullRequest)) {
+            return changeQueryParametersToFormData(httpFullRequest);
+        }
+        return httpFullRequest;
+    }
+
+    private boolean shouldPutParamsInBody(SdkHttpFullRequest input) {
+        return input.method() == SdkHttpMethod.POST &&
+                !input.contentStreamProvider().isPresent() &&
+                !CollectionUtils.isNullOrEmpty(input.rawQueryParameters());
+    }
+
+    private SdkHttpRequest changeQueryParametersToFormData(SdkHttpFullRequest input) {
+        byte[] params = SdkHttpUtils.encodeAndFlattenFormData(input.rawQueryParameters()).orElse("")
+                .getBytes(StandardCharsets.UTF_8);
+
+        return input.toBuilder().clearQueryParameters()
+                .contentStreamProvider(() -> new ByteArrayInputStream(params))
+                .putHeader("Content-Length", singletonList(String.valueOf(params.length)))
+                .putHeader("Content-Type", singletonList(DEFAULT_CONTENT_TYPE))
+                .build();
+    }
+
+}
diff --git a/core/protocols/aws-query-protocol/src/main/java/software/amazon/awssdk/protocols/query/internal/marshall/ListQueryMarshaller.java b/core/protocols/aws-query-protocol/src/main/java/software/amazon/awssdk/protocols/query/internal/marshall/ListQueryMarshaller.java
index d0d76d03cee8..3acd1e9d5288 100644
--- a/core/protocols/aws-query-protocol/src/main/java/software/amazon/awssdk/protocols/query/internal/marshall/ListQueryMarshaller.java
+++ b/core/protocols/aws-query-protocol/src/main/java/software/amazon/awssdk/protocols/query/internal/marshall/ListQueryMarshaller.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/protocols/aws-query-protocol/src/main/java/software/amazon/awssdk/protocols/query/internal/marshall/MapQueryMarshaller.java b/core/protocols/aws-query-protocol/src/main/java/software/amazon/awssdk/protocols/query/internal/marshall/MapQueryMarshaller.java
index bb58cc5f98f7..81951313ed87 100644
--- a/core/protocols/aws-query-protocol/src/main/java/software/amazon/awssdk/protocols/query/internal/marshall/MapQueryMarshaller.java
+++ b/core/protocols/aws-query-protocol/src/main/java/software/amazon/awssdk/protocols/query/internal/marshall/MapQueryMarshaller.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/protocols/aws-query-protocol/src/main/java/software/amazon/awssdk/protocols/query/internal/marshall/QueryMarshaller.java b/core/protocols/aws-query-protocol/src/main/java/software/amazon/awssdk/protocols/query/internal/marshall/QueryMarshaller.java
index bf6046a1c531..a6ee83b905b1 100644
--- a/core/protocols/aws-query-protocol/src/main/java/software/amazon/awssdk/protocols/query/internal/marshall/QueryMarshaller.java
+++ b/core/protocols/aws-query-protocol/src/main/java/software/amazon/awssdk/protocols/query/internal/marshall/QueryMarshaller.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -24,6 +24,7 @@
  *
  * @param <T> Type being marshalled.
  */
+@FunctionalInterface
 @SdkInternalApi
 public interface QueryMarshaller<T> extends Marshaller<T> {
 
diff --git a/core/protocols/aws-query-protocol/src/main/java/software/amazon/awssdk/protocols/query/internal/marshall/QueryMarshallerContext.java b/core/protocols/aws-query-protocol/src/main/java/software/amazon/awssdk/protocols/query/internal/marshall/QueryMarshallerContext.java
index 36e933968fdd..9a8babbdfdce 100644
--- a/core/protocols/aws-query-protocol/src/main/java/software/amazon/awssdk/protocols/query/internal/marshall/QueryMarshallerContext.java
+++ b/core/protocols/aws-query-protocol/src/main/java/software/amazon/awssdk/protocols/query/internal/marshall/QueryMarshallerContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/protocols/aws-query-protocol/src/main/java/software/amazon/awssdk/protocols/query/internal/marshall/QueryMarshallerRegistry.java b/core/protocols/aws-query-protocol/src/main/java/software/amazon/awssdk/protocols/query/internal/marshall/QueryMarshallerRegistry.java
index b5bbdcc49d1b..55e15d405d88 100644
--- a/core/protocols/aws-query-protocol/src/main/java/software/amazon/awssdk/protocols/query/internal/marshall/QueryMarshallerRegistry.java
+++ b/core/protocols/aws-query-protocol/src/main/java/software/amazon/awssdk/protocols/query/internal/marshall/QueryMarshallerRegistry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/protocols/aws-query-protocol/src/main/java/software/amazon/awssdk/protocols/query/internal/marshall/QueryProtocolMarshaller.java b/core/protocols/aws-query-protocol/src/main/java/software/amazon/awssdk/protocols/query/internal/marshall/QueryProtocolMarshaller.java
index e6298d62c093..518ed1685e54 100644
--- a/core/protocols/aws-query-protocol/src/main/java/software/amazon/awssdk/protocols/query/internal/marshall/QueryProtocolMarshaller.java
+++ b/core/protocols/aws-query-protocol/src/main/java/software/amazon/awssdk/protocols/query/internal/marshall/QueryProtocolMarshaller.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/protocols/aws-query-protocol/src/main/java/software/amazon/awssdk/protocols/query/internal/marshall/SimpleTypeQueryMarshaller.java b/core/protocols/aws-query-protocol/src/main/java/software/amazon/awssdk/protocols/query/internal/marshall/SimpleTypeQueryMarshaller.java
index ff2c4f506bba..98fcdb53ea9d 100644
--- a/core/protocols/aws-query-protocol/src/main/java/software/amazon/awssdk/protocols/query/internal/marshall/SimpleTypeQueryMarshaller.java
+++ b/core/protocols/aws-query-protocol/src/main/java/software/amazon/awssdk/protocols/query/internal/marshall/SimpleTypeQueryMarshaller.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/protocols/aws-query-protocol/src/main/java/software/amazon/awssdk/protocols/query/internal/unmarshall/AwsQueryResponseHandler.java b/core/protocols/aws-query-protocol/src/main/java/software/amazon/awssdk/protocols/query/internal/unmarshall/AwsQueryResponseHandler.java
index 6d52c5471f6f..1df64688999b 100644
--- a/core/protocols/aws-query-protocol/src/main/java/software/amazon/awssdk/protocols/query/internal/unmarshall/AwsQueryResponseHandler.java
+++ b/core/protocols/aws-query-protocol/src/main/java/software/amazon/awssdk/protocols/query/internal/unmarshall/AwsQueryResponseHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/protocols/aws-query-protocol/src/main/java/software/amazon/awssdk/protocols/query/internal/unmarshall/AwsXmlErrorUnmarshaller.java b/core/protocols/aws-query-protocol/src/main/java/software/amazon/awssdk/protocols/query/internal/unmarshall/AwsXmlErrorUnmarshaller.java
new file mode 100644
index 000000000000..1ff4f6f44ce7
--- /dev/null
+++ b/core/protocols/aws-query-protocol/src/main/java/software/amazon/awssdk/protocols/query/internal/unmarshall/AwsXmlErrorUnmarshaller.java
@@ -0,0 +1,232 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.protocols.query.internal.unmarshall;
+
+import static software.amazon.awssdk.utils.FunctionalUtils.invokeSafely;
+
+import java.time.Duration;
+import java.util.List;
+import java.util.Optional;
+import java.util.function.Supplier;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.awscore.AwsExecutionAttribute;
+import software.amazon.awssdk.awscore.exception.AwsErrorDetails;
+import software.amazon.awssdk.awscore.exception.AwsServiceException;
+import software.amazon.awssdk.core.SdkBytes;
+import software.amazon.awssdk.core.SdkPojo;
+import software.amazon.awssdk.core.interceptor.ExecutionAttributes;
+import software.amazon.awssdk.core.interceptor.SdkExecutionAttribute;
+import software.amazon.awssdk.http.SdkHttpFullResponse;
+import software.amazon.awssdk.protocols.core.ExceptionMetadata;
+import software.amazon.awssdk.protocols.query.unmarshall.XmlElement;
+import software.amazon.awssdk.protocols.query.unmarshall.XmlErrorUnmarshaller;
+
+/**
+ * Unmarshalls an AWS XML exception from parsed XML.
+ */
+@SdkInternalApi
+public final class AwsXmlErrorUnmarshaller {
+    private static final String X_AMZN_REQUEST_ID_HEADER = "x-amzn-RequestId";
+
+    private final List<ExceptionMetadata> exceptions;
+    private final Supplier<SdkPojo> defaultExceptionSupplier;
+
+    private final XmlErrorUnmarshaller errorUnmarshaller;
+
+    private AwsXmlErrorUnmarshaller(Builder builder) {
+        this.exceptions = builder.exceptions;
+        this.errorUnmarshaller = builder.errorUnmarshaller;
+        this.defaultExceptionSupplier = builder.defaultExceptionSupplier;
+    }
+
+    /**
+     * @return New Builder instance.
+     */
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    /**
+     * Unmarshal an AWS XML exception
+     * @param documentRoot The parsed payload document
+     * @param errorRoot The specific element of the parsed payload document that contains the error to be marshalled
+     *                  or empty if it could not be located.
+     * @param documentBytes The raw bytes of the original payload document if they are available
+     * @param response The HTTP response object
+     * @param executionAttributes {@link ExecutionAttributes} for the current execution
+     * @return An {@link AwsServiceException} unmarshalled from the XML.
+     */
+    public AwsServiceException unmarshall(XmlElement documentRoot,
+                                          Optional<XmlElement> errorRoot,
+                                          Optional<SdkBytes> documentBytes,
+                                          SdkHttpFullResponse response,
+                                          ExecutionAttributes executionAttributes) {
+        String errorCode = getErrorCode(errorRoot);
+
+        AwsServiceException.Builder builder = errorRoot
+            .map(e -> invokeSafely(() -> unmarshallFromErrorCode(response, e, errorCode)))
+            .orElseGet(this::defaultException);
+
+        AwsErrorDetails awsErrorDetails =
+            AwsErrorDetails.builder()
+                           .errorCode(errorCode)
+                           .errorMessage(builder.message())
+                           .rawResponse(documentBytes.orElse(null))
+                           .sdkHttpResponse(response)
+                           .serviceName(executionAttributes.getAttribute(AwsExecutionAttribute.SERVICE_NAME))
+                           .build();
+
+        builder.requestId(getRequestId(response, documentRoot))
+               .statusCode(response.statusCode())
+               .clockSkew(getClockSkew(executionAttributes))
+               .awsErrorDetails(awsErrorDetails);
+
+        return builder.build();
+    }
+
+    private Duration getClockSkew(ExecutionAttributes executionAttributes) {
+        Integer timeOffset = executionAttributes.getAttribute(SdkExecutionAttribute.TIME_OFFSET);
+        return timeOffset == null ? null : Duration.ofSeconds(timeOffset);
+    }
+
+    /**
+     * @return Builder for the default service exception. Used when the error code doesn't match
+     * any known modeled exception or when we can't determine the error code.
+     */
+    private AwsServiceException.Builder defaultException() {
+        return (AwsServiceException.Builder) defaultExceptionSupplier.get();
+    }
+
+    /**
+     * Unmarshalls the XML into the appropriate modeled exception based on the error code. If the error code
+     * is not present or does not match any known exception we unmarshall into the base service exception.
+     *
+     * @param errorRoot Root of <Error/> element. Contains any modeled fields of the exception.
+     * @param errorCode Error code identifying the modeled exception.
+     * @return Unmarshalled exception builder.
+     */
+    private AwsServiceException.Builder unmarshallFromErrorCode(SdkHttpFullResponse response,
+                                                                XmlElement errorRoot,
+                                                                String errorCode) {
+        SdkPojo sdkPojo = exceptions.stream()
+                                    .filter(e -> e.errorCode().equals(errorCode))
+                                    .map(ExceptionMetadata::exceptionBuilderSupplier)
+                                    .findAny()
+                                    .orElse(defaultExceptionSupplier)
+                                    .get();
+
+        AwsServiceException.Builder builder =
+            ((AwsServiceException) errorUnmarshaller.unmarshall(sdkPojo, errorRoot, response)).toBuilder();
+        builder.message(getMessage(errorRoot));
+        return builder;
+    }
+
+    /**
+     * Extracts the error code (used to identify the modeled exception) from the <Error/>
+     * element.
+     *
+     * @param errorRoot Error element root.
+     * @return Error code or null if not present.
+     */
+    private String getErrorCode(Optional<XmlElement> errorRoot) {
+        return errorRoot.map(e -> e.getOptionalElementByName("Code")
+                                   .map(XmlElement::textContent)
+                                   .orElse(null))
+                        .orElse(null);
+    }
+
+    /**
+     * Extracts the error message from the XML document. The message is in the <Error/>
+     * element for all services.
+     *
+     * @param errorRoot Error element root.
+     * @return Error message or null if not present.
+     */
+    private String getMessage(XmlElement errorRoot) {
+        return errorRoot.getOptionalElementByName("Message")
+                        .map(XmlElement::textContent)
+                        .orElse(null);
+    }
+
+    /**
+     * Extracts the request ID from the XML document. Request ID is a top level element
+     * for all protocols, it may be RequestId or RequestID depending on the service.
+     *
+     * @param document Root XML document.
+     * @return Request ID string or null if not present.
+     */
+    private String getRequestId(SdkHttpFullResponse response, XmlElement document) {
+        XmlElement requestId = document.getOptionalElementByName("RequestId")
+                                       .orElse(document.getElementByName("RequestID"));
+        return requestId != null ?
+               requestId.textContent() :
+               response.firstMatchingHeader(X_AMZN_REQUEST_ID_HEADER).orElse(null);
+    }
+
+    /**
+     * Builder for {@link AwsXmlErrorUnmarshaller}.
+     */
+    public static final class Builder {
+
+        private List<ExceptionMetadata> exceptions;
+        private Supplier<SdkPojo> defaultExceptionSupplier;
+        private XmlErrorUnmarshaller errorUnmarshaller;
+
+        private Builder() {
+        }
+
+        /**
+         * List of {@link ExceptionMetadata} to represent the modeled exceptions for the service.
+         * For AWS services the error type is a string representing the type of the modeled exception.
+         *
+         * @return This builder for method chaining.
+         */
+        public Builder exceptions(List<ExceptionMetadata> exceptions) {
+            this.exceptions = exceptions;
+            return this;
+        }
+
+        /**
+         * Default exception type if "error code" does not match any known modeled exception. This is the generated
+         * base exception for the service (i.e. DynamoDbException).
+         *
+         * @return This builder for method chaining.
+         */
+        public Builder defaultExceptionSupplier(Supplier<SdkPojo> defaultExceptionSupplier) {
+            this.defaultExceptionSupplier = defaultExceptionSupplier;
+            return this;
+        }
+
+        /**
+         * The unmarshaller to use. The unmarshaller only unmarshalls any modeled fields of the exception,
+         * additional metadata is extracted by {@link AwsXmlErrorUnmarshaller}.
+         *
+         * @param errorUnmarshaller Error unmarshaller to use.
+         * @return This builder for method chaining.
+         */
+        public Builder errorUnmarshaller(XmlErrorUnmarshaller errorUnmarshaller) {
+            this.errorUnmarshaller = errorUnmarshaller;
+            return this;
+        }
+
+        /**
+         * @return New instance of {@link AwsXmlErrorUnmarshaller}.
+         */
+        public AwsXmlErrorUnmarshaller build() {
+            return new AwsXmlErrorUnmarshaller(this);
+        }
+    }
+}
diff --git a/core/protocols/aws-query-protocol/src/main/java/software/amazon/awssdk/protocols/query/internal/unmarshall/ListQueryUnmarshaller.java b/core/protocols/aws-query-protocol/src/main/java/software/amazon/awssdk/protocols/query/internal/unmarshall/ListQueryUnmarshaller.java
index a0a550fafcec..fdbaf536b063 100644
--- a/core/protocols/aws-query-protocol/src/main/java/software/amazon/awssdk/protocols/query/internal/unmarshall/ListQueryUnmarshaller.java
+++ b/core/protocols/aws-query-protocol/src/main/java/software/amazon/awssdk/protocols/query/internal/unmarshall/ListQueryUnmarshaller.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/protocols/aws-query-protocol/src/main/java/software/amazon/awssdk/protocols/query/internal/unmarshall/MapQueryUnmarshaller.java b/core/protocols/aws-query-protocol/src/main/java/software/amazon/awssdk/protocols/query/internal/unmarshall/MapQueryUnmarshaller.java
index fb1c33522c4c..9f7b36e276d6 100644
--- a/core/protocols/aws-query-protocol/src/main/java/software/amazon/awssdk/protocols/query/internal/unmarshall/MapQueryUnmarshaller.java
+++ b/core/protocols/aws-query-protocol/src/main/java/software/amazon/awssdk/protocols/query/internal/unmarshall/MapQueryUnmarshaller.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/protocols/aws-query-protocol/src/main/java/software/amazon/awssdk/protocols/query/internal/unmarshall/QueryProtocolUnmarshaller.java b/core/protocols/aws-query-protocol/src/main/java/software/amazon/awssdk/protocols/query/internal/unmarshall/QueryProtocolUnmarshaller.java
index 3442d5c6d920..8b4359bb8cdc 100644
--- a/core/protocols/aws-query-protocol/src/main/java/software/amazon/awssdk/protocols/query/internal/unmarshall/QueryProtocolUnmarshaller.java
+++ b/core/protocols/aws-query-protocol/src/main/java/software/amazon/awssdk/protocols/query/internal/unmarshall/QueryProtocolUnmarshaller.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/protocols/aws-query-protocol/src/main/java/software/amazon/awssdk/protocols/query/internal/unmarshall/QueryUnmarshaller.java b/core/protocols/aws-query-protocol/src/main/java/software/amazon/awssdk/protocols/query/internal/unmarshall/QueryUnmarshaller.java
index 1b99e23c424b..0fac5dfb2882 100644
--- a/core/protocols/aws-query-protocol/src/main/java/software/amazon/awssdk/protocols/query/internal/unmarshall/QueryUnmarshaller.java
+++ b/core/protocols/aws-query-protocol/src/main/java/software/amazon/awssdk/protocols/query/internal/unmarshall/QueryUnmarshaller.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/protocols/aws-query-protocol/src/main/java/software/amazon/awssdk/protocols/query/internal/unmarshall/QueryUnmarshallerContext.java b/core/protocols/aws-query-protocol/src/main/java/software/amazon/awssdk/protocols/query/internal/unmarshall/QueryUnmarshallerContext.java
index e29409b5082f..3b1c77955af9 100644
--- a/core/protocols/aws-query-protocol/src/main/java/software/amazon/awssdk/protocols/query/internal/unmarshall/QueryUnmarshallerContext.java
+++ b/core/protocols/aws-query-protocol/src/main/java/software/amazon/awssdk/protocols/query/internal/unmarshall/QueryUnmarshallerContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/protocols/aws-query-protocol/src/main/java/software/amazon/awssdk/protocols/query/internal/unmarshall/QueryUnmarshallerRegistry.java b/core/protocols/aws-query-protocol/src/main/java/software/amazon/awssdk/protocols/query/internal/unmarshall/QueryUnmarshallerRegistry.java
index a4ad50f5f53c..89fbbffaa163 100644
--- a/core/protocols/aws-query-protocol/src/main/java/software/amazon/awssdk/protocols/query/internal/unmarshall/QueryUnmarshallerRegistry.java
+++ b/core/protocols/aws-query-protocol/src/main/java/software/amazon/awssdk/protocols/query/internal/unmarshall/QueryUnmarshallerRegistry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/protocols/aws-query-protocol/src/main/java/software/amazon/awssdk/protocols/query/internal/unmarshall/SimpleTypeQueryUnmarshaller.java b/core/protocols/aws-query-protocol/src/main/java/software/amazon/awssdk/protocols/query/internal/unmarshall/SimpleTypeQueryUnmarshaller.java
index 04dc56da9583..161649126bbe 100644
--- a/core/protocols/aws-query-protocol/src/main/java/software/amazon/awssdk/protocols/query/internal/unmarshall/SimpleTypeQueryUnmarshaller.java
+++ b/core/protocols/aws-query-protocol/src/main/java/software/amazon/awssdk/protocols/query/internal/unmarshall/SimpleTypeQueryUnmarshaller.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/protocols/aws-query-protocol/src/main/java/software/amazon/awssdk/protocols/query/unmarshall/AwsXmlErrorProtocolUnmarshaller.java b/core/protocols/aws-query-protocol/src/main/java/software/amazon/awssdk/protocols/query/unmarshall/AwsXmlErrorProtocolUnmarshaller.java
index 873ee9965c5f..009f6a14195a 100644
--- a/core/protocols/aws-query-protocol/src/main/java/software/amazon/awssdk/protocols/query/unmarshall/AwsXmlErrorProtocolUnmarshaller.java
+++ b/core/protocols/aws-query-protocol/src/main/java/software/amazon/awssdk/protocols/query/unmarshall/AwsXmlErrorProtocolUnmarshaller.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -15,25 +15,21 @@
 
 package software.amazon.awssdk.protocols.query.unmarshall;
 
-import static software.amazon.awssdk.utils.FunctionalUtils.invokeSafely;
-
 import java.io.IOException;
-import java.time.Duration;
 import java.util.List;
 import java.util.Optional;
 import java.util.function.Function;
 import java.util.function.Supplier;
 import software.amazon.awssdk.annotations.SdkProtectedApi;
-import software.amazon.awssdk.awscore.AwsExecutionAttribute;
 import software.amazon.awssdk.awscore.exception.AwsErrorDetails;
 import software.amazon.awssdk.awscore.exception.AwsServiceException;
 import software.amazon.awssdk.core.SdkBytes;
 import software.amazon.awssdk.core.SdkPojo;
 import software.amazon.awssdk.core.http.HttpResponseHandler;
 import software.amazon.awssdk.core.interceptor.ExecutionAttributes;
-import software.amazon.awssdk.core.interceptor.SdkExecutionAttribute;
 import software.amazon.awssdk.http.SdkHttpFullResponse;
 import software.amazon.awssdk.protocols.core.ExceptionMetadata;
+import software.amazon.awssdk.protocols.query.internal.unmarshall.AwsXmlErrorUnmarshaller;
 import software.amazon.awssdk.utils.Pair;
 
 /**
@@ -86,17 +82,16 @@
 @SdkProtectedApi
 public final class AwsXmlErrorProtocolUnmarshaller implements HttpResponseHandler<AwsServiceException> {
 
-    private final List<ExceptionMetadata> exceptions;
-    private final Supplier<SdkPojo> defaultExceptionSupplier;
+    private final AwsXmlErrorUnmarshaller awsXmlErrorUnmarshaller;
     private final Function<XmlElement, Optional<XmlElement>> errorRootExtractor;
 
-    private final XmlErrorUnmarshaller errorUnmarshaller;
-
     private AwsXmlErrorProtocolUnmarshaller(Builder builder) {
-        this.exceptions = builder.exceptions;
         this.errorRootExtractor = builder.errorRootExtractor;
-        this.errorUnmarshaller = builder.errorUnmarshaller;
-        this.defaultExceptionSupplier = builder.defaultExceptionSupplier;
+        this.awsXmlErrorUnmarshaller = AwsXmlErrorUnmarshaller.builder()
+                                                              .defaultExceptionSupplier(builder.defaultExceptionSupplier)
+                                                              .exceptions(builder.exceptions)
+                                                              .errorUnmarshaller(builder.errorUnmarshaller)
+                                                              .build();
     }
 
     @Override
@@ -104,32 +99,8 @@ public AwsServiceException handle(SdkHttpFullResponse response, ExecutionAttribu
         Pair<XmlElement, SdkBytes> xmlAndBytes = parseXml(response);
         XmlElement document = xmlAndBytes.left();
         Optional<XmlElement> errorRoot = errorRootExtractor.apply(document);
-        String errorCode = getErrorCode(errorRoot);
-
-        AwsServiceException.Builder builder = errorRoot
-            .map(e -> invokeSafely(() -> unmarshallFromErrorCode(response, e, errorCode)))
-            .orElseGet(this::defaultException);
-
-        AwsErrorDetails awsErrorDetails =
-            AwsErrorDetails.builder()
-                           .errorCode(errorCode)
-                           .errorMessage(builder.message())
-                           .rawResponse(xmlAndBytes.right())
-                           .sdkHttpResponse(response)
-                           .serviceName(executionAttributes.getAttribute(AwsExecutionAttribute.SERVICE_NAME))
-                           .build();
-
-        builder.requestId(getRequestId(response, document))
-               .statusCode(response.statusCode())
-               .clockSkew(getClockSkew(executionAttributes))
-               .awsErrorDetails(awsErrorDetails);
-
-        return builder.build();
-    }
-
-    private Duration getClockSkew(ExecutionAttributes executionAttributes) {
-        Integer timeOffset = executionAttributes.getAttribute(SdkExecutionAttribute.TIME_OFFSET);
-        return timeOffset == null ? null : Duration.ofSeconds(timeOffset);
+        return awsXmlErrorUnmarshaller.unmarshall(document, errorRoot, Optional.of(xmlAndBytes.right()), response,
+                                                  executionAttributes);
     }
 
     /**
@@ -173,79 +144,6 @@ private SdkBytes emptyXmlBytes() {
         return SdkBytes.fromUtf8String("<eof/>");
     }
 
-    /**
-     * @return Builder for the default service exception. Used when the error code doesn't match
-     * any known modeled exception or when we can't determine the error code.
-     */
-    private AwsServiceException.Builder defaultException() {
-        return (AwsServiceException.Builder) defaultExceptionSupplier.get();
-    }
-
-    /**
-     * Unmarshalls the XML into the appropriate modeled exception based on the error code. If the error code
-     * is not present or does not match any known exception we unmarshall into the base service exception.
-     *
-     * @param errorRoot Root of <Error/> element. Contains any modeled fields of the exception.
-     * @param errorCode Error code identifying the modeled exception.
-     * @return Unmarshalled exception builder.
-     */
-    private AwsServiceException.Builder unmarshallFromErrorCode(SdkHttpFullResponse response,
-                                                                XmlElement errorRoot,
-                                                                String errorCode) {
-        SdkPojo sdkPojo = exceptions.stream()
-                                    .filter(e -> e.errorCode().equals(errorCode))
-                                    .map(ExceptionMetadata::exceptionBuilderSupplier)
-                                    .findAny()
-                                    .orElse(defaultExceptionSupplier)
-                                    .get();
-
-        AwsServiceException.Builder builder =
-            ((AwsServiceException) errorUnmarshaller.unmarshall(sdkPojo, errorRoot, response)).toBuilder();
-        builder.message(getMessage(errorRoot));
-        return builder;
-    }
-
-    /**
-     * Extracts the error code (used to identify the modeled exception) from the <Error/>
-     * element.
-     *
-     * @param errorRoot Error element root.
-     * @return Error code or null if not present.
-     */
-    private String getErrorCode(Optional<XmlElement> errorRoot) {
-        return errorRoot.map(e -> e.getOptionalElementByName("Code")
-                                   .map(XmlElement::textContent)
-                                   .orElse(null))
-                        .orElse(null);
-    }
-
-    /**
-     * Extracts the error message from the XML document. The message is in the <Error/>
-     * element for all services.
-     *
-     * @param errorRoot Error element root.
-     * @return Error message or null if not present.
-     */
-    private String getMessage(XmlElement errorRoot) {
-        return errorRoot.getOptionalElementByName("Message")
-                        .map(XmlElement::textContent)
-                        .orElse(null);
-    }
-
-    /**
-     * Extracts the request ID from the XML document. Request ID is a top level element
-     * for all protocols, it may be RequestId or RequestID depending on the service.
-     *
-     * @param document Root XML document.
-     * @return Request ID string or null if not present.
-     */
-    private String getRequestId(SdkHttpFullResponse response, XmlElement document) {
-        XmlElement requestId = document.getOptionalElementByName("RequestId")
-                                       .orElse(document.getElementByName("RequestID"));
-        return requestId != null ?
-               requestId.textContent() :
-               response.firstMatchingHeader(X_AMZN_REQUEST_ID_HEADER).orElse(null);
-    }
 
     /**
      * @return New Builder instance.
diff --git a/core/protocols/aws-query-protocol/src/main/java/software/amazon/awssdk/protocols/query/unmarshall/XmlDomParser.java b/core/protocols/aws-query-protocol/src/main/java/software/amazon/awssdk/protocols/query/unmarshall/XmlDomParser.java
index 25a56400ce17..59be4ec94c33 100644
--- a/core/protocols/aws-query-protocol/src/main/java/software/amazon/awssdk/protocols/query/unmarshall/XmlDomParser.java
+++ b/core/protocols/aws-query-protocol/src/main/java/software/amazon/awssdk/protocols/query/unmarshall/XmlDomParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -16,9 +16,13 @@
 package software.amazon.awssdk.protocols.query.unmarshall;
 
 import java.io.InputStream;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
 import javax.xml.stream.XMLEventReader;
 import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.events.Attribute;
 import javax.xml.stream.events.StartElement;
 import javax.xml.stream.events.XMLEvent;
 import software.amazon.awssdk.annotations.SdkProtectedApi;
@@ -59,6 +63,11 @@ public static XmlElement parse(InputStream inputStream) {
     private static XmlElement parseElement(StartElement startElement, XMLEventReader reader) throws XMLStreamException {
         XmlElement.Builder elementBuilder = XmlElement.builder()
                                                       .elementName(startElement.getName().getLocalPart());
+
+        if (startElement.getAttributes().hasNext()) {
+            parseAttributes(startElement, elementBuilder);
+        }
+
         XMLEvent nextEvent;
         do {
             nextEvent = reader.nextEvent();
@@ -71,6 +80,21 @@ private static XmlElement parseElement(StartElement startElement, XMLEventReader
         return elementBuilder.build();
     }
 
+    /**
+     * Parse the attributes of the element.
+     */
+    @SuppressWarnings("unchecked")
+    private static void parseAttributes(StartElement startElement, XmlElement.Builder elementBuilder) {
+        Iterator<Attribute> iterator = startElement.getAttributes();
+        Map<String, String> attributes = new HashMap<>();
+        iterator.forEachRemaining(a -> {
+            String key = a.getName().getPrefix() + ":" + a.getName().getLocalPart();
+            attributes.put(key, a.getValue());
+        });
+
+        elementBuilder.attributes(attributes);
+    }
+
     /**
      * Reads all characters until the next end element event.
      *
diff --git a/core/protocols/aws-query-protocol/src/main/java/software/amazon/awssdk/protocols/query/unmarshall/XmlElement.java b/core/protocols/aws-query-protocol/src/main/java/software/amazon/awssdk/protocols/query/unmarshall/XmlElement.java
index 1fc044fd464f..ecb8a3ed1eff 100644
--- a/core/protocols/aws-query-protocol/src/main/java/software/amazon/awssdk/protocols/query/unmarshall/XmlElement.java
+++ b/core/protocols/aws-query-protocol/src/main/java/software/amazon/awssdk/protocols/query/unmarshall/XmlElement.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -19,6 +19,7 @@
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 import software.amazon.awssdk.annotations.SdkProtectedApi;
 import software.amazon.awssdk.core.exception.SdkClientException;
@@ -35,12 +36,14 @@ public final class XmlElement {
     private final HashMap<String, List<XmlElement>> childrenByElement;
     private final List<XmlElement> children;
     private final String textContent;
+    private final Map<String, String> attributes;
 
     private XmlElement(Builder builder) {
         this.elementName = builder.elementName;
         this.childrenByElement = new HashMap<>(builder.childrenByElement);
         this.children = Collections.unmodifiableList(new ArrayList<>(builder.children));
         this.textContent = builder.textContent;
+        this.attributes = Collections.unmodifiableMap(new HashMap<>(builder.attributes));
     }
 
     /**
@@ -109,6 +112,20 @@ public String textContent() {
         return textContent;
     }
 
+    /**
+     * Retrieves an optional attribute by attribute name.
+     */
+    public Optional<String> getOptionalAttributeByName(String attribute) {
+        return Optional.ofNullable(attributes.get(attribute));
+    }
+
+    /**
+     * Retrieves the attributes associated with the element
+     */
+    public Map<String, String> attributes() {
+        return attributes;
+    }
+
     /**
      * @return New {@link Builder} instance.
      */
@@ -129,9 +146,10 @@ public static XmlElement empty() {
     public static final class Builder {
 
         private String elementName;
-        private final HashMap<String, List<XmlElement>> childrenByElement = new HashMap<>();
+        private final Map<String, List<XmlElement>> childrenByElement = new HashMap<>();
         private final List<XmlElement> children = new ArrayList<>();
         private String textContent = "";
+        private Map<String, String> attributes = new HashMap<>();
 
         private Builder() {
         }
@@ -153,6 +171,11 @@ public Builder textContent(String textContent) {
             return this;
         }
 
+        public Builder attributes(Map<String, String> attributes) {
+            this.attributes = attributes;
+            return this;
+        }
+
         public XmlElement build() {
             return new XmlElement(this);
         }
diff --git a/core/protocols/aws-query-protocol/src/main/java/software/amazon/awssdk/protocols/query/unmarshall/XmlErrorUnmarshaller.java b/core/protocols/aws-query-protocol/src/main/java/software/amazon/awssdk/protocols/query/unmarshall/XmlErrorUnmarshaller.java
index 4613e081dd5c..1c03c36a8970 100644
--- a/core/protocols/aws-query-protocol/src/main/java/software/amazon/awssdk/protocols/query/unmarshall/XmlErrorUnmarshaller.java
+++ b/core/protocols/aws-query-protocol/src/main/java/software/amazon/awssdk/protocols/query/unmarshall/XmlErrorUnmarshaller.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/protocols/aws-query-protocol/src/test/java/software/amazon/awssdk/protocols/query/XmlDomParserTest.java b/core/protocols/aws-query-protocol/src/test/java/software/amazon/awssdk/protocols/query/XmlDomParserTest.java
index 640cde5eacc6..16ea0957c23e 100644
--- a/core/protocols/aws-query-protocol/src/test/java/software/amazon/awssdk/protocols/query/XmlDomParserTest.java
+++ b/core/protocols/aws-query-protocol/src/test/java/software/amazon/awssdk/protocols/query/XmlDomParserTest.java
@@ -1,3 +1,18 @@
+/*
+ * 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.
+ */
+
 package software.amazon.awssdk.protocols.query;
 
 
@@ -33,6 +48,22 @@ public void simpleXmlDocument_ParsedCorrectly() {
             .isEqualTo("42");
     }
 
+    @Test
+    public void xmlWithAttributes_ParsedCorrectly() {
+        String xml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
+                     + "<Struct xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:type=\"foo\" xsi:nil=\"bar\">"
+                     + " <stringMember>stringVal</stringMember>"
+                     + "</Struct>";
+        XmlElement element = XmlDomParser.parse(new StringInputStream(xml));
+        assertThat(element.elementName()).isEqualTo("Struct");
+        assertThat(element.children()).hasSize(1);
+        assertThat(element.getElementsByName("stringMember"))
+            .hasSize(1);
+        assertThat(element.attributes()).hasSize(2);
+        assertThat(element.getOptionalAttributeByName("xsi:type").get()).isEqualTo("foo");
+        assertThat(element.getOptionalAttributeByName("xsi:nil").get()).isEqualTo("bar");
+    }
+
     @Test
     public void multipleElementsWithSameName_ParsedCorrectly() {
         String xml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
diff --git a/core/protocols/aws-query-protocol/src/test/java/software/amazon/awssdk/protocols/query/interceptor/QueryParametersToBodyInterceptorTest.java b/core/protocols/aws-query-protocol/src/test/java/software/amazon/awssdk/protocols/query/interceptor/QueryParametersToBodyInterceptorTest.java
new file mode 100644
index 000000000000..2398ab806589
--- /dev/null
+++ b/core/protocols/aws-query-protocol/src/test/java/software/amazon/awssdk/protocols/query/interceptor/QueryParametersToBodyInterceptorTest.java
@@ -0,0 +1,154 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.protocols.query.interceptor;
+
+import org.junit.Before;
+import org.junit.Test;
+import software.amazon.awssdk.core.Protocol;
+import software.amazon.awssdk.core.SdkRequest;
+import software.amazon.awssdk.core.async.AsyncRequestBody;
+import software.amazon.awssdk.core.interceptor.ExecutionAttributes;
+import software.amazon.awssdk.core.sync.RequestBody;
+import software.amazon.awssdk.http.ContentStreamProvider;
+import software.amazon.awssdk.http.SdkHttpFullRequest;
+import software.amazon.awssdk.http.SdkHttpMethod;
+import software.amazon.awssdk.http.SdkHttpRequest;
+import software.amazon.awssdk.utils.IoUtils;
+
+import java.io.ByteArrayInputStream;
+import java.net.URI;
+import java.nio.charset.StandardCharsets;
+import java.util.Optional;
+import java.util.stream.Stream;
+
+import static java.util.Collections.singletonList;
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class QueryParametersToBodyInterceptorTest {
+
+    public static final URI HTTP_LOCALHOST = URI.create("http://localhost:8080");
+
+    private QueryParametersToBodyInterceptor interceptor;
+    private ExecutionAttributes executionAttributes;
+
+    private SdkHttpFullRequest.Builder requestBuilder;
+
+    @Before
+    public void setup() {
+
+        interceptor = new QueryParametersToBodyInterceptor();
+        executionAttributes = new ExecutionAttributes();
+
+        requestBuilder = SdkHttpFullRequest.builder()
+                .protocol(Protocol.HTTPS.toString())
+                .method(SdkHttpMethod.POST)
+                .putRawQueryParameter("key", singletonList("value"))
+                .uri(HTTP_LOCALHOST);
+    }
+
+    @Test
+    public void postRequestsWithNoBodyHaveTheirParametersMovedToTheBody() throws Exception {
+
+        SdkHttpFullRequest request = requestBuilder.build();
+
+        SdkHttpFullRequest output = (SdkHttpFullRequest) interceptor.modifyHttpRequest(
+                new HttpRequestOnlyContext(request, null), executionAttributes);
+
+        assertThat(output.rawQueryParameters()).hasSize(0);
+        assertThat(output.headers())
+                .containsKey("Content-Length")
+                .containsEntry("Content-Type", singletonList("application/x-www-form-urlencoded; charset=utf-8"));
+        assertThat(output.contentStreamProvider()).isNotEmpty();
+    }
+
+    @Test
+    public void nonPostRequestsWithNoBodyAreUnaltered() throws Exception {
+        Stream.of(SdkHttpMethod.values())
+              .filter(m -> !m.equals(SdkHttpMethod.POST))
+              .forEach(this::nonPostRequestsUnaltered);
+    }
+
+    @Test
+    public void postWithContentIsUnaltered() throws Exception {
+        byte[] contentBytes = "hello".getBytes(StandardCharsets.UTF_8);
+        ContentStreamProvider contentProvider = () -> new ByteArrayInputStream(contentBytes);
+
+        SdkHttpFullRequest request = requestBuilder.contentStreamProvider(contentProvider).build();
+
+        SdkHttpFullRequest output = (SdkHttpFullRequest) interceptor.modifyHttpRequest(
+                new HttpRequestOnlyContext(request, null), executionAttributes);
+
+        assertThat(output.rawQueryParameters()).hasSize(1);
+        assertThat(output.headers()).hasSize(0);
+        assertThat(IoUtils.toByteArray(output.contentStreamProvider().get().newStream())).isEqualTo(contentBytes);
+    }
+
+    @Test
+    public void onlyAlterRequestsIfParamsArePresent() throws Exception {
+        SdkHttpFullRequest request = requestBuilder.clearQueryParameters().build();
+
+        SdkHttpFullRequest output = (SdkHttpFullRequest) interceptor.modifyHttpRequest(
+                new HttpRequestOnlyContext(request, null), executionAttributes);
+
+        assertThat(output.rawQueryParameters()).hasSize(0);
+        assertThat(output.headers()).hasSize(0);
+        assertThat(output.contentStreamProvider()).isEmpty();
+    }
+
+    private void nonPostRequestsUnaltered(SdkHttpMethod method) {
+
+        SdkHttpFullRequest request = requestBuilder.method(method).build();
+
+        SdkHttpFullRequest output = (SdkHttpFullRequest) interceptor.modifyHttpRequest(
+                new HttpRequestOnlyContext(request, null), executionAttributes);
+
+        assertThat(output.rawQueryParameters()).hasSize(1);
+        assertThat(output.headers()).hasSize(0);
+        assertThat(output.contentStreamProvider()).isEmpty();
+    }
+
+    public final class HttpRequestOnlyContext implements software.amazon.awssdk.core.interceptor.Context.ModifyHttpRequest {
+
+        private final SdkHttpRequest request;
+        private final RequestBody requestBody;
+
+        public HttpRequestOnlyContext(SdkHttpRequest request,
+                                      RequestBody requestBody) {
+            this.request = request;
+            this.requestBody = requestBody;
+        }
+
+        @Override
+        public SdkRequest request() {
+            return null;
+        }
+
+        @Override
+        public SdkHttpRequest httpRequest() {
+            return request;
+        }
+
+        @Override
+        public Optional<RequestBody> requestBody() {
+            return Optional.ofNullable(requestBody);
+        }
+
+        @Override
+        public Optional<AsyncRequestBody> asyncRequestBody() {
+            return Optional.empty();
+        }
+    }
+}
diff --git a/core/protocols/aws-xml-protocol/pom.xml b/core/protocols/aws-xml-protocol/pom.xml
index 0d522f35a8c3..f5aec0f4d18c 100644
--- a/core/protocols/aws-xml-protocol/pom.xml
+++ b/core/protocols/aws-xml-protocol/pom.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ 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.
+  -->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>protocols</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -61,6 +76,25 @@
             <artifactId>assertj-core</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
-
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifestEntries>
+                            <Automatic-Module-Name>software.amazon.awssdk.protocols.xml</Automatic-Module-Name>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/core/protocols/aws-xml-protocol/src/main/java/software/amazon/awssdk/protocols/xml/AwsS3ProtocolFactory.java b/core/protocols/aws-xml-protocol/src/main/java/software/amazon/awssdk/protocols/xml/AwsS3ProtocolFactory.java
index 24390da1e211..448f994fff09 100644
--- a/core/protocols/aws-xml-protocol/src/main/java/software/amazon/awssdk/protocols/xml/AwsS3ProtocolFactory.java
+++ b/core/protocols/aws-xml-protocol/src/main/java/software/amazon/awssdk/protocols/xml/AwsS3ProtocolFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -16,8 +16,15 @@
 package software.amazon.awssdk.protocols.xml;
 
 import java.util.Optional;
+import java.util.function.Supplier;
 import software.amazon.awssdk.annotations.SdkProtectedApi;
+import software.amazon.awssdk.awscore.AwsResponse;
+import software.amazon.awssdk.core.Response;
+import software.amazon.awssdk.core.SdkPojo;
+import software.amazon.awssdk.core.http.HttpResponseHandler;
 import software.amazon.awssdk.protocols.query.unmarshall.XmlElement;
+import software.amazon.awssdk.protocols.xml.internal.unmarshall.AwsXmlPredicatedResponseHandler;
+import software.amazon.awssdk.protocols.xml.internal.unmarshall.DecorateErrorFromResponseBodyUnmarshaller;
 
 /**
  * Factory to generate the various protocol handlers and generators to be used for communicating with
@@ -25,7 +32,6 @@
  */
 @SdkProtectedApi
 public final class AwsS3ProtocolFactory extends AwsXmlProtocolFactory {
-
     private AwsS3ProtocolFactory(Builder builder) {
         super(builder);
     }
@@ -57,4 +63,21 @@ public AwsS3ProtocolFactory build() {
             return new AwsS3ProtocolFactory(this);
         }
     }
+
+    @Override
+    public <T extends AwsResponse> HttpResponseHandler<Response<T>> createCombinedResponseHandler(
+        Supplier<SdkPojo> pojoSupplier, XmlOperationMetadata staxOperationMetadata) {
+
+        return createErrorCouldBeInBodyResponseHandler(pojoSupplier, staxOperationMetadata);
+    }
+
+    private <T extends AwsResponse> HttpResponseHandler<Response<T>> createErrorCouldBeInBodyResponseHandler(
+        Supplier<SdkPojo> pojoSupplier, XmlOperationMetadata staxOperationMetadata) {
+
+        return new AwsXmlPredicatedResponseHandler<>(r -> pojoSupplier.get(),
+                                                     createResponseTransformer(pojoSupplier),
+                                                     createErrorTransformer(),
+                                                     DecorateErrorFromResponseBodyUnmarshaller.of(this::getErrorRoot),
+                                                     staxOperationMetadata.isHasStreamingSuccessResponse());
+    }
 }
diff --git a/core/protocols/aws-xml-protocol/src/main/java/software/amazon/awssdk/protocols/xml/AwsXmlProtocolFactory.java b/core/protocols/aws-xml-protocol/src/main/java/software/amazon/awssdk/protocols/xml/AwsXmlProtocolFactory.java
index 0bf4377430b8..c771e82f7193 100644
--- a/core/protocols/aws-xml-protocol/src/main/java/software/amazon/awssdk/protocols/xml/AwsXmlProtocolFactory.java
+++ b/core/protocols/aws-xml-protocol/src/main/java/software/amazon/awssdk/protocols/xml/AwsXmlProtocolFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -20,14 +20,17 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
+import java.util.function.Function;
 import java.util.function.Supplier;
 import software.amazon.awssdk.annotations.SdkProtectedApi;
 import software.amazon.awssdk.awscore.AwsResponse;
 import software.amazon.awssdk.awscore.exception.AwsServiceException;
+import software.amazon.awssdk.core.Response;
 import software.amazon.awssdk.core.SdkPojo;
 import software.amazon.awssdk.core.client.config.SdkClientConfiguration;
 import software.amazon.awssdk.core.client.config.SdkClientOption;
 import software.amazon.awssdk.core.http.HttpResponseHandler;
+import software.amazon.awssdk.core.internal.http.CombinedResponseHandler;
 import software.amazon.awssdk.http.SdkHttpFullRequest;
 import software.amazon.awssdk.protocols.core.ExceptionMetadata;
 import software.amazon.awssdk.protocols.core.OperationInfo;
@@ -37,7 +40,10 @@
 import software.amazon.awssdk.protocols.query.unmarshall.XmlElement;
 import software.amazon.awssdk.protocols.xml.internal.marshall.XmlGenerator;
 import software.amazon.awssdk.protocols.xml.internal.marshall.XmlProtocolMarshaller;
+import software.amazon.awssdk.protocols.xml.internal.unmarshall.AwsXmlErrorTransformer;
 import software.amazon.awssdk.protocols.xml.internal.unmarshall.AwsXmlResponseHandler;
+import software.amazon.awssdk.protocols.xml.internal.unmarshall.AwsXmlResponseTransformer;
+import software.amazon.awssdk.protocols.xml.internal.unmarshall.AwsXmlUnmarshallingContext;
 import software.amazon.awssdk.protocols.xml.internal.unmarshall.XmlProtocolUnmarshaller;
 
 /**
@@ -62,6 +68,8 @@ public class AwsXmlProtocolFactory {
     public static final OperationMetadataAttribute<String> ROOT_MARSHALL_LOCATION_ATTRIBUTE =
         new OperationMetadataAttribute<>(String.class);
 
+    private static final XmlProtocolUnmarshaller XML_PROTOCOL_UNMARSHALLER = XmlProtocolUnmarshaller.create();
+
     private final List<ExceptionMetadata> modeledExceptions;
     private final Supplier<SdkPojo> defaultServiceExceptionSupplier;
     private final AwsXmlErrorProtocolUnmarshaller errorUnmarshaller;
@@ -75,13 +83,13 @@ public class AwsXmlProtocolFactory {
             .builder()
             .defaultExceptionSupplier(defaultServiceExceptionSupplier)
             .exceptions(modeledExceptions)
-            .errorUnmarshaller(XmlProtocolUnmarshaller.builder().build())
+            .errorUnmarshaller(XML_PROTOCOL_UNMARSHALLER)
             .errorRootExtractor(this::getErrorRoot)
             .build();
     }
 
     /**
-     * Creates an instance of {@link XmlProtocolMarshaller} to be used for marshalling the requess.
+     * Creates an instance of {@link XmlProtocolMarshaller} to be used for marshalling the request.
      *
      * @param operationInfo Info required to marshall the request
      */
@@ -96,14 +104,36 @@ public ProtocolMarshaller<SdkHttpFullRequest> createProtocolMarshaller(Operation
     public <T extends AwsResponse> HttpResponseHandler<T> createResponseHandler(Supplier<SdkPojo> pojoSupplier,
                                                                                 XmlOperationMetadata staxOperationMetadata) {
         return new AwsXmlResponseHandler<>(
-            XmlProtocolUnmarshaller.builder().build(), r -> pojoSupplier.get(),
+            XML_PROTOCOL_UNMARSHALLER, r -> pojoSupplier.get(),
             staxOperationMetadata.isHasStreamingSuccessResponse());
     }
 
+    protected <T extends AwsResponse> Function<AwsXmlUnmarshallingContext, T> createResponseTransformer(
+        Supplier<SdkPojo> pojoSupplier) {
+
+        return new AwsXmlResponseTransformer<>(
+            XML_PROTOCOL_UNMARSHALLER, r -> pojoSupplier.get());
+    }
+
+    protected Function<AwsXmlUnmarshallingContext, AwsServiceException> createErrorTransformer() {
+        return AwsXmlErrorTransformer.builder()
+                                     .defaultExceptionSupplier(defaultServiceExceptionSupplier)
+                                     .exceptions(modeledExceptions)
+                                     .errorUnmarshaller(XML_PROTOCOL_UNMARSHALLER)
+                                     .build();
+    }
+
     public HttpResponseHandler<AwsServiceException> createErrorResponseHandler() {
         return errorUnmarshaller;
     }
 
+    public <T extends AwsResponse> HttpResponseHandler<Response<T>> createCombinedResponseHandler(
+        Supplier<SdkPojo> pojoSupplier, XmlOperationMetadata staxOperationMetadata) {
+
+        return new CombinedResponseHandler<>(createResponseHandler(pojoSupplier, staxOperationMetadata),
+                                             createErrorResponseHandler());
+    }
+
     /**
      * Extracts the <Error/> element from the root XML document. This method is protected as S3 has
      * a slightly different location.
diff --git a/core/protocols/aws-xml-protocol/src/main/java/software/amazon/awssdk/protocols/xml/XmlOperationMetadata.java b/core/protocols/aws-xml-protocol/src/main/java/software/amazon/awssdk/protocols/xml/XmlOperationMetadata.java
index b43d33f065e4..dfda61a4528e 100644
--- a/core/protocols/aws-xml-protocol/src/main/java/software/amazon/awssdk/protocols/xml/XmlOperationMetadata.java
+++ b/core/protocols/aws-xml-protocol/src/main/java/software/amazon/awssdk/protocols/xml/XmlOperationMetadata.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/protocols/aws-xml-protocol/src/main/java/software/amazon/awssdk/protocols/xml/internal/marshall/HeaderMarshaller.java b/core/protocols/aws-xml-protocol/src/main/java/software/amazon/awssdk/protocols/xml/internal/marshall/HeaderMarshaller.java
index b5fc8259cdab..8ad1c8264242 100644
--- a/core/protocols/aws-xml-protocol/src/main/java/software/amazon/awssdk/protocols/xml/internal/marshall/HeaderMarshaller.java
+++ b/core/protocols/aws-xml-protocol/src/main/java/software/amazon/awssdk/protocols/xml/internal/marshall/HeaderMarshaller.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/protocols/aws-xml-protocol/src/main/java/software/amazon/awssdk/protocols/xml/internal/marshall/QueryParamMarshaller.java b/core/protocols/aws-xml-protocol/src/main/java/software/amazon/awssdk/protocols/xml/internal/marshall/QueryParamMarshaller.java
index c72837240fc8..f7f905892af6 100644
--- a/core/protocols/aws-xml-protocol/src/main/java/software/amazon/awssdk/protocols/xml/internal/marshall/QueryParamMarshaller.java
+++ b/core/protocols/aws-xml-protocol/src/main/java/software/amazon/awssdk/protocols/xml/internal/marshall/QueryParamMarshaller.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/protocols/aws-xml-protocol/src/main/java/software/amazon/awssdk/protocols/xml/internal/marshall/SimpleTypePathMarshaller.java b/core/protocols/aws-xml-protocol/src/main/java/software/amazon/awssdk/protocols/xml/internal/marshall/SimpleTypePathMarshaller.java
index 2f8454be8e30..9e2620ee5e93 100644
--- a/core/protocols/aws-xml-protocol/src/main/java/software/amazon/awssdk/protocols/xml/internal/marshall/SimpleTypePathMarshaller.java
+++ b/core/protocols/aws-xml-protocol/src/main/java/software/amazon/awssdk/protocols/xml/internal/marshall/SimpleTypePathMarshaller.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/protocols/aws-xml-protocol/src/main/java/software/amazon/awssdk/protocols/xml/internal/marshall/XmlGenerator.java b/core/protocols/aws-xml-protocol/src/main/java/software/amazon/awssdk/protocols/xml/internal/marshall/XmlGenerator.java
index fd927784dc09..3ce773f633f0 100644
--- a/core/protocols/aws-xml-protocol/src/main/java/software/amazon/awssdk/protocols/xml/internal/marshall/XmlGenerator.java
+++ b/core/protocols/aws-xml-protocol/src/main/java/software/amazon/awssdk/protocols/xml/internal/marshall/XmlGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/protocols/aws-xml-protocol/src/main/java/software/amazon/awssdk/protocols/xml/internal/marshall/XmlMarshaller.java b/core/protocols/aws-xml-protocol/src/main/java/software/amazon/awssdk/protocols/xml/internal/marshall/XmlMarshaller.java
index 458572480c09..e26bd4b38f19 100644
--- a/core/protocols/aws-xml-protocol/src/main/java/software/amazon/awssdk/protocols/xml/internal/marshall/XmlMarshaller.java
+++ b/core/protocols/aws-xml-protocol/src/main/java/software/amazon/awssdk/protocols/xml/internal/marshall/XmlMarshaller.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -24,6 +24,7 @@
  *
  * @param <T> Type to marshall.
  */
+@FunctionalInterface
 @SdkInternalApi
 public interface XmlMarshaller<T> extends Marshaller<T> {
 
diff --git a/core/protocols/aws-xml-protocol/src/main/java/software/amazon/awssdk/protocols/xml/internal/marshall/XmlMarshallerContext.java b/core/protocols/aws-xml-protocol/src/main/java/software/amazon/awssdk/protocols/xml/internal/marshall/XmlMarshallerContext.java
index 00d03de296d8..7e7b3bf45035 100644
--- a/core/protocols/aws-xml-protocol/src/main/java/software/amazon/awssdk/protocols/xml/internal/marshall/XmlMarshallerContext.java
+++ b/core/protocols/aws-xml-protocol/src/main/java/software/amazon/awssdk/protocols/xml/internal/marshall/XmlMarshallerContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/protocols/aws-xml-protocol/src/main/java/software/amazon/awssdk/protocols/xml/internal/marshall/XmlMarshallerRegistry.java b/core/protocols/aws-xml-protocol/src/main/java/software/amazon/awssdk/protocols/xml/internal/marshall/XmlMarshallerRegistry.java
index bc2fa3a7e346..adf8bef921ae 100644
--- a/core/protocols/aws-xml-protocol/src/main/java/software/amazon/awssdk/protocols/xml/internal/marshall/XmlMarshallerRegistry.java
+++ b/core/protocols/aws-xml-protocol/src/main/java/software/amazon/awssdk/protocols/xml/internal/marshall/XmlMarshallerRegistry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/protocols/aws-xml-protocol/src/main/java/software/amazon/awssdk/protocols/xml/internal/marshall/XmlPayloadMarshaller.java b/core/protocols/aws-xml-protocol/src/main/java/software/amazon/awssdk/protocols/xml/internal/marshall/XmlPayloadMarshaller.java
index fd97b9abe580..b7a78f3ea4ca 100644
--- a/core/protocols/aws-xml-protocol/src/main/java/software/amazon/awssdk/protocols/xml/internal/marshall/XmlPayloadMarshaller.java
+++ b/core/protocols/aws-xml-protocol/src/main/java/software/amazon/awssdk/protocols/xml/internal/marshall/XmlPayloadMarshaller.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/protocols/aws-xml-protocol/src/main/java/software/amazon/awssdk/protocols/xml/internal/marshall/XmlProtocolMarshaller.java b/core/protocols/aws-xml-protocol/src/main/java/software/amazon/awssdk/protocols/xml/internal/marshall/XmlProtocolMarshaller.java
index 868ef9e54eee..10b07ea0d795 100644
--- a/core/protocols/aws-xml-protocol/src/main/java/software/amazon/awssdk/protocols/xml/internal/marshall/XmlProtocolMarshaller.java
+++ b/core/protocols/aws-xml-protocol/src/main/java/software/amazon/awssdk/protocols/xml/internal/marshall/XmlProtocolMarshaller.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/protocols/aws-xml-protocol/src/main/java/software/amazon/awssdk/protocols/xml/internal/marshall/XmlWriter.java b/core/protocols/aws-xml-protocol/src/main/java/software/amazon/awssdk/protocols/xml/internal/marshall/XmlWriter.java
index 37e3b1909e27..4ef99766def8 100644
--- a/core/protocols/aws-xml-protocol/src/main/java/software/amazon/awssdk/protocols/xml/internal/marshall/XmlWriter.java
+++ b/core/protocols/aws-xml-protocol/src/main/java/software/amazon/awssdk/protocols/xml/internal/marshall/XmlWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/protocols/aws-xml-protocol/src/main/java/software/amazon/awssdk/protocols/xml/internal/unmarshall/AwsXmlErrorTransformer.java b/core/protocols/aws-xml-protocol/src/main/java/software/amazon/awssdk/protocols/xml/internal/unmarshall/AwsXmlErrorTransformer.java
new file mode 100644
index 000000000000..d5a3a2f304c0
--- /dev/null
+++ b/core/protocols/aws-xml-protocol/src/main/java/software/amazon/awssdk/protocols/xml/internal/unmarshall/AwsXmlErrorTransformer.java
@@ -0,0 +1,116 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.protocols.xml.internal.unmarshall;
+
+import java.util.List;
+import java.util.Optional;
+import java.util.function.Function;
+import java.util.function.Supplier;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.awscore.exception.AwsServiceException;
+import software.amazon.awssdk.core.SdkPojo;
+import software.amazon.awssdk.protocols.core.ExceptionMetadata;
+import software.amazon.awssdk.protocols.query.internal.unmarshall.AwsXmlErrorUnmarshaller;
+import software.amazon.awssdk.protocols.query.unmarshall.XmlErrorUnmarshaller;
+
+/**
+ * A transformer function that takes a parsed XML response and converts it into an {@link AwsServiceException}. Used
+ * as a component in the {@link AwsXmlPredicatedResponseHandler}.
+ */
+@SdkInternalApi
+public final class AwsXmlErrorTransformer
+        implements Function<AwsXmlUnmarshallingContext, AwsServiceException> {
+
+    private final AwsXmlErrorUnmarshaller awsXmlErrorUnmarshaller;
+
+    private AwsXmlErrorTransformer(Builder builder) {
+        this.awsXmlErrorUnmarshaller = AwsXmlErrorUnmarshaller.builder()
+                                                              .defaultExceptionSupplier(builder.defaultExceptionSupplier)
+                                                              .exceptions(builder.exceptions)
+                                                              .errorUnmarshaller(builder.errorUnmarshaller)
+                                                              .build();
+    }
+
+    @Override
+    public AwsServiceException apply(AwsXmlUnmarshallingContext context) {
+        return awsXmlErrorUnmarshaller.unmarshall(context.parsedRootXml(),
+                                                  Optional.ofNullable(context.parsedErrorXml()),
+                                                  Optional.empty(),
+                                                  context.sdkHttpFullResponse(),
+                                                  context.executionAttributes());
+    }
+
+    /**
+     * @return New Builder instance.
+     */
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    /**
+     * Builder for {@link AwsXmlErrorTransformer}.
+     */
+    public static final class Builder {
+
+        private List<ExceptionMetadata> exceptions;
+        private Supplier<SdkPojo> defaultExceptionSupplier;
+        private XmlErrorUnmarshaller errorUnmarshaller;
+
+        private Builder() {
+        }
+
+        /**
+         * List of {@link ExceptionMetadata} to represent the modeled exceptions for the service.
+         * For AWS services the error type is a string representing the type of the modeled exception.
+         *
+         * @return This builder for method chaining.
+         */
+        public Builder exceptions(List<ExceptionMetadata> exceptions) {
+            this.exceptions = exceptions;
+            return this;
+        }
+
+        /**
+         * Default exception type if "error code" does not match any known modeled exception. This is the generated
+         * base exception for the service (i.e. DynamoDbException).
+         *
+         * @return This builder for method chaining.
+         */
+        public Builder defaultExceptionSupplier(Supplier<SdkPojo> defaultExceptionSupplier) {
+            this.defaultExceptionSupplier = defaultExceptionSupplier;
+            return this;
+        }
+
+        /**
+         * The unmarshaller to use. The unmarshaller only unmarshalls any modeled fields of the exception,
+         * additional metadata is extracted by {@link AwsXmlErrorTransformer}.
+         *
+         * @param errorUnmarshaller Error unmarshaller to use.
+         * @return This builder for method chaining.
+         */
+        public Builder errorUnmarshaller(XmlErrorUnmarshaller errorUnmarshaller) {
+            this.errorUnmarshaller = errorUnmarshaller;
+            return this;
+        }
+
+        /**
+         * @return New instance of {@link AwsXmlErrorTransformer}.
+         */
+        public AwsXmlErrorTransformer build() {
+            return new AwsXmlErrorTransformer(this);
+        }
+    }
+}
diff --git a/core/protocols/aws-xml-protocol/src/main/java/software/amazon/awssdk/protocols/xml/internal/unmarshall/AwsXmlPredicatedResponseHandler.java b/core/protocols/aws-xml-protocol/src/main/java/software/amazon/awssdk/protocols/xml/internal/unmarshall/AwsXmlPredicatedResponseHandler.java
new file mode 100644
index 000000000000..d3d255496669
--- /dev/null
+++ b/core/protocols/aws-xml-protocol/src/main/java/software/amazon/awssdk/protocols/xml/internal/unmarshall/AwsXmlPredicatedResponseHandler.java
@@ -0,0 +1,180 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.protocols.xml.internal.unmarshall;
+
+import java.util.Optional;
+import java.util.function.Function;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.core.Response;
+import software.amazon.awssdk.core.SdkPojo;
+import software.amazon.awssdk.core.SdkStandardLogger;
+import software.amazon.awssdk.core.exception.RetryableException;
+import software.amazon.awssdk.core.exception.SdkClientException;
+import software.amazon.awssdk.core.exception.SdkException;
+import software.amazon.awssdk.core.http.HttpResponseHandler;
+import software.amazon.awssdk.core.interceptor.ExecutionAttributes;
+import software.amazon.awssdk.http.SdkHttpFullResponse;
+import software.amazon.awssdk.protocols.query.unmarshall.XmlElement;
+import software.amazon.awssdk.utils.IoUtils;
+
+/**
+ * Unmarshalls an HTTP response into either a successful response POJO, or into a (possibly modeled) exception based
+ * on a predicate that the unmarshalled response can be tested against. Returns a wrapper {@link Response} object which
+ * may contain either the unmarshalled success POJO, or the unmarshalled exception.
+ *
+ * @param <OutputT> Type of successful unmarshalled POJO.
+ */
+@SdkInternalApi
+public class AwsXmlPredicatedResponseHandler<OutputT> implements HttpResponseHandler<Response<OutputT>> {
+    private static final Logger log = LoggerFactory.getLogger(AwsXmlPredicatedResponseHandler.class);
+
+    private final Function<SdkHttpFullResponse, SdkPojo> pojoSupplier;
+    private final Function<AwsXmlUnmarshallingContext, OutputT> successResponseTransformer;
+    private final Function<AwsXmlUnmarshallingContext, ? extends SdkException> errorResponseTransformer;
+    private final Function<AwsXmlUnmarshallingContext, AwsXmlUnmarshallingContext> decorateContextWithError;
+    private final boolean needsConnectionLeftOpen;
+
+    /**
+     * Standard constructor
+     * @param pojoSupplier A method that supplies an empty builder of the correct type
+     * @param successResponseTransformer A function that can unmarshall a response object from parsed XML
+     * @param errorResponseTransformer A function that can unmarshall an exception object from parsed XML
+     * @param decorateContextWithError A function that determines if the response was an error or not
+     * @param needsConnectionLeftOpen true if the underlying connection should not be closed once parsed
+     */
+    public AwsXmlPredicatedResponseHandler(
+        Function<SdkHttpFullResponse, SdkPojo> pojoSupplier,
+        Function<AwsXmlUnmarshallingContext, OutputT> successResponseTransformer,
+        Function<AwsXmlUnmarshallingContext, ? extends SdkException> errorResponseTransformer,
+        Function<AwsXmlUnmarshallingContext, AwsXmlUnmarshallingContext> decorateContextWithError,
+        boolean needsConnectionLeftOpen) {
+
+        this.pojoSupplier = pojoSupplier;
+        this.successResponseTransformer = successResponseTransformer;
+        this.errorResponseTransformer = errorResponseTransformer;
+        this.decorateContextWithError = decorateContextWithError;
+        this.needsConnectionLeftOpen = needsConnectionLeftOpen;
+    }
+
+    /**
+     * Handle a response
+     * @param httpResponse The HTTP response object
+     * @param executionAttributes The attributes attached to this particular execution.
+     * @return A wrapped response object with the unmarshalled result in it.
+     */
+    @Override
+    public Response<OutputT> handle(SdkHttpFullResponse httpResponse, ExecutionAttributes executionAttributes) {
+        boolean didRequestFail = true;
+        try {
+            Response<OutputT> response = handleResponse(httpResponse, executionAttributes);
+            didRequestFail = !response.isSuccess();
+            return response;
+        } finally {
+            closeInputStreamIfNeeded(httpResponse, didRequestFail);
+        }
+    }
+
+    private Response<OutputT> handleResponse(SdkHttpFullResponse httpResponse,
+                                             ExecutionAttributes executionAttributes) {
+
+        AwsXmlUnmarshallingContext parsedResponse = parseResponse(httpResponse, executionAttributes);
+        parsedResponse = decorateContextWithError.apply(parsedResponse);
+
+        if (parsedResponse.isResponseSuccess()) {
+            OutputT response = handleSuccessResponse(parsedResponse);
+            return Response.<OutputT>builder().httpResponse(httpResponse)
+                                              .response(response)
+                                              .isSuccess(true)
+                                              .build();
+        } else {
+            return Response.<OutputT>builder().httpResponse(httpResponse)
+                                              .exception(handleErrorResponse(parsedResponse))
+                                              .isSuccess(false)
+                                              .build();
+        }
+    }
+
+    private AwsXmlUnmarshallingContext parseResponse(SdkHttpFullResponse httpFullResponse,
+                                                     ExecutionAttributes executionAttributes) {
+        XmlElement document = XmlResponseParserUtils.parse(pojoSupplier.apply(httpFullResponse), httpFullResponse);
+
+        return AwsXmlUnmarshallingContext.builder()
+                                         .parsedXml(document)
+                                         .executionAttributes(executionAttributes)
+                                         .sdkHttpFullResponse(httpFullResponse)
+                                         .build();
+    }
+
+    /**
+     * Handles a successful response from a service call by unmarshalling the results using the
+     * specified response handler.
+     *
+     * @return The contents of the response, unmarshalled using the specified response handler.
+     */
+    private OutputT handleSuccessResponse(AwsXmlUnmarshallingContext parsedResponse) {
+        try {
+            SdkStandardLogger.REQUEST_LOGGER.debug(() -> "Received successful response: "
+                                                         + parsedResponse.sdkHttpFullResponse().statusCode());
+            return successResponseTransformer.apply(parsedResponse);
+        } catch (RetryableException e) {
+            throw e;
+        } catch (Exception e) {
+            if (e instanceof SdkException && ((SdkException) e).retryable()) {
+                throw (SdkException) e;
+            }
+
+            String errorMessage =
+                    "Unable to unmarshall response (" + e.getMessage() + "). Response Code: "
+                    + parsedResponse.sdkHttpFullResponse().statusCode() + ", Response Text: "
+                    + parsedResponse.sdkHttpFullResponse().statusText().orElse(null);
+            throw SdkClientException.builder().message(errorMessage).cause(e).build();
+        }
+    }
+
+    /**
+     * Responsible for handling an error response, including unmarshalling the error response
+     * into the most specific exception type possible, and throwing the exception.
+     */
+    private SdkException handleErrorResponse(AwsXmlUnmarshallingContext parsedResponse) {
+        try {
+            SdkException exception = errorResponseTransformer.apply(parsedResponse);
+            exception.fillInStackTrace();
+            SdkStandardLogger.REQUEST_LOGGER.debug(() -> "Received error response: " + exception);
+            return exception;
+        } catch (Exception e) {
+            String errorMessage = String.format("Unable to unmarshall error response (%s). " +
+                                                "Response Code: %d, Response Text: %s", e.getMessage(),
+                                                parsedResponse.sdkHttpFullResponse().statusCode(),
+                                                parsedResponse.sdkHttpFullResponse().statusText().orElse("null"));
+            throw SdkClientException.builder().message(errorMessage).cause(e).build();
+        }
+    }
+
+    /**
+     * Close the input stream if required.
+     */
+    private void closeInputStreamIfNeeded(SdkHttpFullResponse httpResponse,
+                                          boolean didRequestFail) {
+        // Always close on failed requests. Close on successful requests unless it needs connection left open
+        if (didRequestFail || !needsConnectionLeftOpen) {
+            Optional.ofNullable(httpResponse)
+                    .flatMap(SdkHttpFullResponse::content) // If no content, no need to close
+                    .ifPresent(s -> IoUtils.closeQuietly(s, log));
+        }
+    }
+}
diff --git a/core/protocols/aws-xml-protocol/src/main/java/software/amazon/awssdk/protocols/xml/internal/unmarshall/AwsXmlResponseHandler.java b/core/protocols/aws-xml-protocol/src/main/java/software/amazon/awssdk/protocols/xml/internal/unmarshall/AwsXmlResponseHandler.java
index 39590e068a59..71a8b7ae57bd 100644
--- a/core/protocols/aws-xml-protocol/src/main/java/software/amazon/awssdk/protocols/xml/internal/unmarshall/AwsXmlResponseHandler.java
+++ b/core/protocols/aws-xml-protocol/src/main/java/software/amazon/awssdk/protocols/xml/internal/unmarshall/AwsXmlResponseHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/protocols/aws-xml-protocol/src/main/java/software/amazon/awssdk/protocols/xml/internal/unmarshall/AwsXmlResponseTransformer.java b/core/protocols/aws-xml-protocol/src/main/java/software/amazon/awssdk/protocols/xml/internal/unmarshall/AwsXmlResponseTransformer.java
new file mode 100644
index 000000000000..3a2affb06db3
--- /dev/null
+++ b/core/protocols/aws-xml-protocol/src/main/java/software/amazon/awssdk/protocols/xml/internal/unmarshall/AwsXmlResponseTransformer.java
@@ -0,0 +1,78 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.protocols.xml.internal.unmarshall;
+
+import static software.amazon.awssdk.awscore.util.AwsHeader.AWS_REQUEST_ID;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Function;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.awscore.AwsResponse;
+import software.amazon.awssdk.awscore.AwsResponseMetadata;
+import software.amazon.awssdk.awscore.DefaultAwsResponseMetadata;
+import software.amazon.awssdk.core.SdkPojo;
+import software.amazon.awssdk.core.SdkStandardLogger;
+import software.amazon.awssdk.http.SdkHttpFullResponse;
+import software.amazon.awssdk.http.SdkHttpResponse;
+import software.amazon.awssdk.protocols.query.unmarshall.XmlElement;
+
+/**
+ * A transformer function that takes a parsed XML response and converts it into an {@link AwsResponse}. Used
+ * as a component in the {@link AwsXmlPredicatedResponseHandler}.
+ */
+@SdkInternalApi
+public final class AwsXmlResponseTransformer<T extends AwsResponse>
+        implements Function<AwsXmlUnmarshallingContext, T> {
+
+    private static final String X_AMZN_REQUEST_ID_HEADER = "x-amzn-RequestId";
+
+    private final XmlProtocolUnmarshaller unmarshaller;
+    private final Function<SdkHttpFullResponse, SdkPojo> pojoSupplier;
+
+    public AwsXmlResponseTransformer(XmlProtocolUnmarshaller unmarshaller,
+                                     Function<SdkHttpFullResponse, SdkPojo> pojoSupplier) {
+        this.unmarshaller = unmarshaller;
+        this.pojoSupplier = pojoSupplier;
+    }
+
+    @Override
+    public T apply(AwsXmlUnmarshallingContext context) {
+        return unmarshallResponse(context.sdkHttpFullResponse(), context.parsedRootXml());
+    }
+
+    @SuppressWarnings("unchecked")
+    private T unmarshallResponse(SdkHttpFullResponse response, XmlElement parsedXml) {
+        SdkStandardLogger.REQUEST_LOGGER.trace(() -> "Unmarshalling parsed service response XML.");
+        T result = unmarshaller.unmarshall(pojoSupplier.apply(response), parsedXml, response);
+        SdkStandardLogger.REQUEST_LOGGER.trace(() -> "Done unmarshalling parsed service response.");
+        AwsResponseMetadata responseMetadata = generateResponseMetadata(response);
+        return (T) result.toBuilder().responseMetadata(responseMetadata).build();
+    }
+
+    /**
+     * Create the default {@link AwsResponseMetadata}. This might be wrapped by a service
+     * specific metadata object to provide modeled access to additional metadata. (See S3 and Kinesis).
+     */
+    private AwsResponseMetadata generateResponseMetadata(SdkHttpResponse response) {
+        Map<String, String> metadata = new HashMap<>();
+        metadata.put(AWS_REQUEST_ID,
+                     response.firstMatchingHeader(X_AMZN_REQUEST_ID_HEADER).orElse(null));
+
+        response.headers().forEach((key, value) -> metadata.put(key, value.get(0)));
+        return DefaultAwsResponseMetadata.create(metadata);
+    }
+}
diff --git a/core/protocols/aws-xml-protocol/src/main/java/software/amazon/awssdk/protocols/xml/internal/unmarshall/AwsXmlUnmarshallingContext.java b/core/protocols/aws-xml-protocol/src/main/java/software/amazon/awssdk/protocols/xml/internal/unmarshall/AwsXmlUnmarshallingContext.java
new file mode 100644
index 000000000000..730fca7daa88
--- /dev/null
+++ b/core/protocols/aws-xml-protocol/src/main/java/software/amazon/awssdk/protocols/xml/internal/unmarshall/AwsXmlUnmarshallingContext.java
@@ -0,0 +1,168 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.protocols.xml.internal.unmarshall;
+
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.core.interceptor.ExecutionAttributes;
+import software.amazon.awssdk.http.SdkHttpFullResponse;
+import software.amazon.awssdk.protocols.query.unmarshall.XmlElement;
+
+/**
+ * A data class to hold all the context of an unmarshalling stage for the AWS XML protocol as orchestrated by
+ * {@link AwsXmlPredicatedResponseHandler}.
+ */
+@SdkInternalApi
+public class AwsXmlUnmarshallingContext {
+    private final SdkHttpFullResponse sdkHttpFullResponse;
+    private final XmlElement parsedXml;
+    private final ExecutionAttributes executionAttributes;
+    private final Boolean isResponseSuccess;
+    private final XmlElement parsedErrorXml;
+
+    private AwsXmlUnmarshallingContext(Builder builder) {
+        this.sdkHttpFullResponse = builder.sdkHttpFullResponse;
+        this.parsedXml = builder.parsedXml;
+        this.executionAttributes = builder.executionAttributes;
+        this.isResponseSuccess = builder.isResponseSuccess;
+        this.parsedErrorXml = builder.parsedErrorXml;
+    }
+
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    /**
+     * The HTTP response.
+     */
+    public SdkHttpFullResponse sdkHttpFullResponse() {
+        return sdkHttpFullResponse;
+    }
+
+    /**
+     * The parsed XML of the body, or null if there was no body.
+     */
+    public XmlElement parsedRootXml() {
+        return parsedXml;
+    }
+
+    /**
+     * The {@link ExecutionAttributes} associated with this request.
+     */
+    public ExecutionAttributes executionAttributes() {
+        return executionAttributes;
+    }
+
+    /**
+     * true if the response indicates success; false if not; null if that has not been determined yet
+     */
+    public Boolean isResponseSuccess() {
+        return isResponseSuccess;
+    }
+
+    /**
+     * The parsed XML of just the error. null if not found or determined yet.
+     */
+    public XmlElement parsedErrorXml() {
+        return parsedErrorXml;
+    }
+
+    public Builder toBuilder() {
+        return builder().sdkHttpFullResponse(this.sdkHttpFullResponse)
+                        .parsedXml(this.parsedXml)
+                        .executionAttributes(this.executionAttributes)
+                        .isResponseSuccess(this.isResponseSuccess)
+                        .parsedErrorXml(this.parsedErrorXml);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        AwsXmlUnmarshallingContext that = (AwsXmlUnmarshallingContext) o;
+
+        if (sdkHttpFullResponse != null ? ! sdkHttpFullResponse.equals(that.sdkHttpFullResponse) :
+            that.sdkHttpFullResponse != null) {
+            return false;
+        }
+        if (parsedXml != null ? ! parsedXml.equals(that.parsedXml) : that.parsedXml != null) {
+            return false;
+        }
+        if (executionAttributes != null ? ! executionAttributes.equals(that.executionAttributes) :
+            that.executionAttributes != null) {
+            return false;
+        }
+        if (isResponseSuccess != null ? ! isResponseSuccess.equals(that.isResponseSuccess) :
+            that.isResponseSuccess != null) {
+            return false;
+        }
+        return parsedErrorXml != null ? parsedErrorXml.equals(that.parsedErrorXml) : that.parsedErrorXml == null;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = sdkHttpFullResponse != null ? sdkHttpFullResponse.hashCode() : 0;
+        result = 31 * result + (parsedXml != null ? parsedXml.hashCode() : 0);
+        result = 31 * result + (executionAttributes != null ? executionAttributes.hashCode() : 0);
+        result = 31 * result + (isResponseSuccess != null ? isResponseSuccess.hashCode() : 0);
+        result = 31 * result + (parsedErrorXml != null ? parsedErrorXml.hashCode() : 0);
+        return result;
+    }
+
+    public static final class Builder {
+        private SdkHttpFullResponse sdkHttpFullResponse;
+        private XmlElement parsedXml;
+        private ExecutionAttributes executionAttributes;
+        private Boolean isResponseSuccess;
+        private XmlElement parsedErrorXml;
+
+        private Builder() {
+        }
+
+        public Builder sdkHttpFullResponse(SdkHttpFullResponse sdkHttpFullResponse) {
+            this.sdkHttpFullResponse = sdkHttpFullResponse;
+            return this;
+        }
+
+        public Builder parsedXml(XmlElement parsedXml) {
+            this.parsedXml = parsedXml;
+            return this;
+        }
+
+        public Builder executionAttributes(ExecutionAttributes executionAttributes) {
+            this.executionAttributes = executionAttributes;
+            return this;
+        }
+
+        public Builder isResponseSuccess(Boolean isResponseSuccess) {
+            this.isResponseSuccess = isResponseSuccess;
+            return this;
+        }
+
+        public Builder parsedErrorXml(XmlElement parsedErrorXml) {
+            this.parsedErrorXml = parsedErrorXml;
+            return this;
+        }
+
+        public AwsXmlUnmarshallingContext build() {
+            return new AwsXmlUnmarshallingContext(this);
+        }
+    }
+}
diff --git a/core/protocols/aws-xml-protocol/src/main/java/software/amazon/awssdk/protocols/xml/internal/unmarshall/DecorateErrorFromResponseBodyUnmarshaller.java b/core/protocols/aws-xml-protocol/src/main/java/software/amazon/awssdk/protocols/xml/internal/unmarshall/DecorateErrorFromResponseBodyUnmarshaller.java
new file mode 100644
index 000000000000..2d31826adefa
--- /dev/null
+++ b/core/protocols/aws-xml-protocol/src/main/java/software/amazon/awssdk/protocols/xml/internal/unmarshall/DecorateErrorFromResponseBodyUnmarshaller.java
@@ -0,0 +1,83 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.protocols.xml.internal.unmarshall;
+
+import java.util.Optional;
+import java.util.function.Function;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.protocols.query.unmarshall.XmlElement;
+
+/**
+ * A function that decorates a {@link AwsXmlUnmarshallingContext} that already contains the parsed XML of the
+ * response body with parsed error XML if the HTTP response status indicates failure or a serialized error is found
+ * in the XML body of a 'successful' response. This is a non-standard error handling behavior that is used by some
+ * non-streaming S3 operations.
+ */
+@SdkInternalApi
+public class DecorateErrorFromResponseBodyUnmarshaller
+    implements Function<AwsXmlUnmarshallingContext, AwsXmlUnmarshallingContext> {
+
+    private static final String ERROR_IN_SUCCESS_BODY_ELEMENT_NAME = "Error";
+
+    private final Function<XmlElement, Optional<XmlElement>> errorRootLocationFunction;
+
+    private DecorateErrorFromResponseBodyUnmarshaller(Function<XmlElement, Optional<XmlElement>> errorRootLocationFunction) {
+        this.errorRootLocationFunction = errorRootLocationFunction;
+    }
+
+    /**
+     * Constructs a function that can be used to decorate a parsed error from a response if one is found.
+     * @param errorRootFunction A function that can be used to locate the root of the serialized error in the XML
+     *                          body if the HTTP status code of the response indicates an error. This function is not
+     *                          applied for HTTP responses that indicate success, instead the root of the document
+     *                          will always be checked for an element tagged 'Error'.
+     * @return An unmarshalling function that will decorate the unmarshalling context with a parsed error if one is
+     * found in the response.
+     */
+    public static DecorateErrorFromResponseBodyUnmarshaller of(Function<XmlElement, Optional<XmlElement>> errorRootFunction) {
+        return new DecorateErrorFromResponseBodyUnmarshaller(errorRootFunction);
+    }
+
+    @Override
+    public AwsXmlUnmarshallingContext apply(AwsXmlUnmarshallingContext context) {
+        Optional<XmlElement> parsedRootXml = Optional.ofNullable(context.parsedRootXml());
+
+        if (!context.sdkHttpFullResponse().isSuccessful()) {
+            // Request was non-2xx, defer to protocol handler for error root
+            Optional<XmlElement> parsedErrorXml = parsedRootXml.flatMap(errorRootLocationFunction);
+            return context.toBuilder().isResponseSuccess(false).parsedErrorXml(parsedErrorXml.orElse(null)).build();
+        }
+
+        // Check body to see if an error turned up there
+        Optional<XmlElement> parsedErrorXml = parsedRootXml.isPresent() ?
+            getErrorRootFromSuccessBody(context.parsedRootXml()) : Optional.empty();
+
+        // Request had an HTTP success code, but an error was found in the body
+        return parsedErrorXml.map(xmlElement -> context.toBuilder()
+                                                       .isResponseSuccess(false)
+                                                       .parsedErrorXml(xmlElement)
+                                                       .build())
+                             // Otherwise the response can be considered successful
+                             .orElseGet(() -> context.toBuilder()
+                                                     .isResponseSuccess(true)
+                                                     .build());
+    }
+
+    private static Optional<XmlElement> getErrorRootFromSuccessBody(XmlElement document) {
+        return ERROR_IN_SUCCESS_BODY_ELEMENT_NAME.equals(document.elementName()) ?
+            Optional.of(document) : Optional.empty();
+    }
+}
diff --git a/core/protocols/aws-xml-protocol/src/main/java/software/amazon/awssdk/protocols/xml/internal/unmarshall/HeaderUnmarshaller.java b/core/protocols/aws-xml-protocol/src/main/java/software/amazon/awssdk/protocols/xml/internal/unmarshall/HeaderUnmarshaller.java
index 10f51623fbf4..ac23dcad2220 100644
--- a/core/protocols/aws-xml-protocol/src/main/java/software/amazon/awssdk/protocols/xml/internal/unmarshall/HeaderUnmarshaller.java
+++ b/core/protocols/aws-xml-protocol/src/main/java/software/amazon/awssdk/protocols/xml/internal/unmarshall/HeaderUnmarshaller.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/protocols/aws-xml-protocol/src/main/java/software/amazon/awssdk/protocols/xml/internal/unmarshall/XmlPayloadUnmarshaller.java b/core/protocols/aws-xml-protocol/src/main/java/software/amazon/awssdk/protocols/xml/internal/unmarshall/XmlPayloadUnmarshaller.java
index 4abda25bd29f..c26a77e5f773 100644
--- a/core/protocols/aws-xml-protocol/src/main/java/software/amazon/awssdk/protocols/xml/internal/unmarshall/XmlPayloadUnmarshaller.java
+++ b/core/protocols/aws-xml-protocol/src/main/java/software/amazon/awssdk/protocols/xml/internal/unmarshall/XmlPayloadUnmarshaller.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/protocols/aws-xml-protocol/src/main/java/software/amazon/awssdk/protocols/xml/internal/unmarshall/XmlProtocolUnmarshaller.java b/core/protocols/aws-xml-protocol/src/main/java/software/amazon/awssdk/protocols/xml/internal/unmarshall/XmlProtocolUnmarshaller.java
index de7141fa3c3e..3912f75f57b2 100644
--- a/core/protocols/aws-xml-protocol/src/main/java/software/amazon/awssdk/protocols/xml/internal/unmarshall/XmlProtocolUnmarshaller.java
+++ b/core/protocols/aws-xml-protocol/src/main/java/software/amazon/awssdk/protocols/xml/internal/unmarshall/XmlProtocolUnmarshaller.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -29,10 +29,10 @@
 import software.amazon.awssdk.core.protocol.MarshallingType;
 import software.amazon.awssdk.core.traits.PayloadTrait;
 import software.amazon.awssdk.core.traits.TimestampFormatTrait;
+import software.amazon.awssdk.core.traits.XmlAttributeTrait;
 import software.amazon.awssdk.http.SdkHttpFullResponse;
 import software.amazon.awssdk.protocols.core.StringToInstant;
 import software.amazon.awssdk.protocols.core.StringToValueConverter;
-import software.amazon.awssdk.protocols.query.unmarshall.XmlDomParser;
 import software.amazon.awssdk.protocols.query.unmarshall.XmlElement;
 import software.amazon.awssdk.protocols.query.unmarshall.XmlErrorUnmarshaller;
 import software.amazon.awssdk.utils.CollectionUtils;
@@ -49,12 +49,14 @@ public final class XmlProtocolUnmarshaller implements XmlErrorUnmarshaller {
     private XmlProtocolUnmarshaller() {
     }
 
+    public static XmlProtocolUnmarshaller create() {
+        return new XmlProtocolUnmarshaller();
+    }
+
     public <TypeT extends SdkPojo> TypeT unmarshall(SdkPojo sdkPojo,
                                                     SdkHttpFullResponse response) {
 
-        XmlElement document = hasPayloadMembers(sdkPojo) && response.content().isPresent()
-                              ? XmlDomParser.parse(response.content().get()) : null;
-
+        XmlElement document = XmlResponseParserUtils.parse(sdkPojo, response);
         return unmarshall(sdkPojo, document, response);
     }
 
@@ -79,30 +81,38 @@ SdkPojo unmarshall(XmlUnmarshallerContext context, SdkPojo sdkPojo, XmlElement r
             XmlUnmarshaller<Object> unmarshaller = REGISTRY.getUnmarshaller(field.location(), field.marshallingType());
 
             if (root != null && field.location() == MarshallLocation.PAYLOAD) {
-                List<XmlElement> element = isExplicitPayloadMember(field) ?
-                                           singletonList(root) :
-                                           root.getElementsByName(field.unmarshallLocationName());
-                if (!CollectionUtils.isNullOrEmpty(element)) {
-                    Object unmarshalled = unmarshaller.unmarshall(context, element, (SdkField<Object>) field);
-                    field.set(sdkPojo, unmarshalled);
+                if (isAttribute(field)) {
+                    root.getOptionalAttributeByName(field.unmarshallLocationName())
+                        .ifPresent(e -> field.set(sdkPojo, e));
+                } else {
+                    List<XmlElement> element = isExplicitPayloadMember(field) ?
+                                               singletonList(root) :
+                                               root.getElementsByName(field.unmarshallLocationName());
+
+                    if (!CollectionUtils.isNullOrEmpty(element)) {
+                        Object unmarshalled = unmarshaller.unmarshall(context, element, (SdkField<Object>) field);
+                        field.set(sdkPojo, unmarshalled);
+                    }
                 }
             } else {
                 Object unmarshalled = unmarshaller.unmarshall(context, null, (SdkField<Object>) field);
                 field.set(sdkPojo, unmarshalled);
             }
         }
+
+        if (!(sdkPojo instanceof Buildable)) {
+            throw new RuntimeException("The sdkPojo passed to the unmarshaller is not buildable (must implement "
+                                       + "Buildable)");
+        }
         return (SdkPojo) ((Buildable) sdkPojo).build();
     }
 
-    private boolean isExplicitPayloadMember(SdkField<?> field) {
-        return field.containsTrait(PayloadTrait.class);
+    private boolean isAttribute(SdkField<?> field) {
+        return field.containsTrait(XmlAttributeTrait.class);
     }
 
-    private boolean hasPayloadMembers(SdkPojo sdkPojo) {
-        return sdkPojo.sdkFields().stream()
-                      .filter(f -> f.location() == MarshallLocation.PAYLOAD)
-                      .findAny()
-                      .isPresent();
+    private boolean isExplicitPayloadMember(SdkField<?> field) {
+        return field.containsTrait(PayloadTrait.class);
     }
 
     private static Map<MarshallLocation, TimestampFormatTrait.Format> getDefaultTimestampFormats() {
@@ -139,27 +149,4 @@ private static XmlUnmarshallerRegistry createUnmarshallerRegistry() {
             .payloadUnmarshaller(MarshallingType.MAP, XmlPayloadUnmarshaller::unmarshallMap)
             .build();
     }
-
-    /**
-     * @return New {@link Builder} instance.
-     */
-    public static Builder builder() {
-        return new Builder();
-    }
-
-    /**
-     * Builder for {@link XmlProtocolUnmarshaller}.
-     */
-    public static final class Builder {
-
-        private Builder() {
-        }
-
-        /**
-         * @return New instance of {@link XmlProtocolUnmarshaller}.
-         */
-        public XmlProtocolUnmarshaller build() {
-            return new XmlProtocolUnmarshaller();
-        }
-    }
 }
diff --git a/core/protocols/aws-xml-protocol/src/main/java/software/amazon/awssdk/protocols/xml/internal/unmarshall/XmlResponseParserUtils.java b/core/protocols/aws-xml-protocol/src/main/java/software/amazon/awssdk/protocols/xml/internal/unmarshall/XmlResponseParserUtils.java
new file mode 100644
index 000000000000..55836b80f1f9
--- /dev/null
+++ b/core/protocols/aws-xml-protocol/src/main/java/software/amazon/awssdk/protocols/xml/internal/unmarshall/XmlResponseParserUtils.java
@@ -0,0 +1,67 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.protocols.xml.internal.unmarshall;
+
+import java.util.Optional;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.core.SdkPojo;
+import software.amazon.awssdk.core.protocol.MarshallLocation;
+import software.amazon.awssdk.http.AbortableInputStream;
+import software.amazon.awssdk.http.SdkHttpFullResponse;
+import software.amazon.awssdk.protocols.query.unmarshall.XmlDomParser;
+import software.amazon.awssdk.protocols.query.unmarshall.XmlElement;
+
+/**
+ * Static methods to assist with parsing the response of AWS XML requests.
+ */
+@SdkInternalApi
+public final class XmlResponseParserUtils {
+    private XmlResponseParserUtils() {
+    }
+
+    /**
+     * Parse an XML response if one is expected and available. If we are not expecting a payload, but the HTTP response
+     * code shows an error then we will parse it anyway, as it should contain a serialized error.
+     * @param sdkPojo the SDK builder object associated with the final response
+     * @param response the HTTP response
+     * @return A parsed XML document or an empty XML document if no payload/contents were found in the response.
+     */
+    public static XmlElement parse(SdkPojo sdkPojo, SdkHttpFullResponse response) {
+
+        try {
+            Optional<AbortableInputStream> responseContent = response.content();
+
+            // In some cases the responseContent is present but empty, so when we are not expecting a body we should
+            // not attempt to parse it even if the body appears to be present.
+            if ((!response.isSuccessful() || hasPayloadMembers(sdkPojo)) && responseContent.isPresent()) {
+                return XmlDomParser.parse(responseContent.get());
+            } else {
+                return XmlElement.empty();
+            }
+        } catch (RuntimeException e) {
+            if (response.isSuccessful()) {
+                throw e;
+            }
+
+            return XmlElement.empty();
+        }
+    }
+
+    private static boolean hasPayloadMembers(SdkPojo sdkPojo) {
+        return sdkPojo.sdkFields().stream()
+                      .anyMatch(f -> f.location() == MarshallLocation.PAYLOAD);
+    }
+}
diff --git a/core/protocols/aws-xml-protocol/src/main/java/software/amazon/awssdk/protocols/xml/internal/unmarshall/XmlUnmarshaller.java b/core/protocols/aws-xml-protocol/src/main/java/software/amazon/awssdk/protocols/xml/internal/unmarshall/XmlUnmarshaller.java
index 2aa1e01c0585..35f4ac37c1a3 100644
--- a/core/protocols/aws-xml-protocol/src/main/java/software/amazon/awssdk/protocols/xml/internal/unmarshall/XmlUnmarshaller.java
+++ b/core/protocols/aws-xml-protocol/src/main/java/software/amazon/awssdk/protocols/xml/internal/unmarshall/XmlUnmarshaller.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/protocols/aws-xml-protocol/src/main/java/software/amazon/awssdk/protocols/xml/internal/unmarshall/XmlUnmarshallerContext.java b/core/protocols/aws-xml-protocol/src/main/java/software/amazon/awssdk/protocols/xml/internal/unmarshall/XmlUnmarshallerContext.java
index cb453781767e..4bf9d4d9ce30 100644
--- a/core/protocols/aws-xml-protocol/src/main/java/software/amazon/awssdk/protocols/xml/internal/unmarshall/XmlUnmarshallerContext.java
+++ b/core/protocols/aws-xml-protocol/src/main/java/software/amazon/awssdk/protocols/xml/internal/unmarshall/XmlUnmarshallerContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/protocols/aws-xml-protocol/src/main/java/software/amazon/awssdk/protocols/xml/internal/unmarshall/XmlUnmarshallerRegistry.java b/core/protocols/aws-xml-protocol/src/main/java/software/amazon/awssdk/protocols/xml/internal/unmarshall/XmlUnmarshallerRegistry.java
index 043bcd9b700c..9b56d67bc4c0 100644
--- a/core/protocols/aws-xml-protocol/src/main/java/software/amazon/awssdk/protocols/xml/internal/unmarshall/XmlUnmarshallerRegistry.java
+++ b/core/protocols/aws-xml-protocol/src/main/java/software/amazon/awssdk/protocols/xml/internal/unmarshall/XmlUnmarshallerRegistry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/protocols/aws-xml-protocol/src/test/java/software/amazon/awssdk/protocols/xml/internal/unmarshall/AwsXmlUnmarshallingContextTest.java b/core/protocols/aws-xml-protocol/src/test/java/software/amazon/awssdk/protocols/xml/internal/unmarshall/AwsXmlUnmarshallingContextTest.java
new file mode 100644
index 000000000000..207ec55788d8
--- /dev/null
+++ b/core/protocols/aws-xml-protocol/src/test/java/software/amazon/awssdk/protocols/xml/internal/unmarshall/AwsXmlUnmarshallingContextTest.java
@@ -0,0 +1,134 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.protocols.xml.internal.unmarshall;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
+
+import software.amazon.awssdk.core.interceptor.ExecutionAttributes;
+import software.amazon.awssdk.core.internal.InternalCoreExecutionAttribute;
+import software.amazon.awssdk.http.SdkHttpFullResponse;
+import software.amazon.awssdk.protocols.query.unmarshall.XmlElement;
+
+@RunWith(MockitoJUnitRunner.class)
+public class AwsXmlUnmarshallingContextTest {
+    private static final XmlElement XML_ELEMENT_1 = XmlElement.builder().elementName("one").build();
+    private static final XmlElement XML_ELEMENT_2 = XmlElement.builder().elementName("two").build();
+    private static final XmlElement XML_ERROR_ELEMENT_1 = XmlElement.builder().elementName("error-one").build();
+    private static final XmlElement XML_ERROR_ELEMENT_2 = XmlElement.builder().elementName("error-two").build();
+    private static final ExecutionAttributes EXECUTION_ATTRIBUTES_1 =
+        new ExecutionAttributes().putAttribute(InternalCoreExecutionAttribute.EXECUTION_ATTEMPT, 1);
+    private static final ExecutionAttributes EXECUTION_ATTRIBUTES_2 =
+        new ExecutionAttributes().putAttribute(InternalCoreExecutionAttribute.EXECUTION_ATTEMPT, 2);
+
+    @Mock
+    private SdkHttpFullResponse mockSdkHttpFullResponse;
+
+    private AwsXmlUnmarshallingContext minimal() {
+        return AwsXmlUnmarshallingContext.builder().build();
+    }
+
+    private AwsXmlUnmarshallingContext maximal() {
+        return AwsXmlUnmarshallingContext.builder()
+                                         .parsedXml(XML_ELEMENT_1)
+                                         .parsedErrorXml(XML_ERROR_ELEMENT_1)
+                                         .isResponseSuccess(true)
+                                         .sdkHttpFullResponse(mockSdkHttpFullResponse)
+                                         .executionAttributes(EXECUTION_ATTRIBUTES_1)
+                                         .build();
+    }
+
+    @Test
+    public void builder_minimal() {
+        AwsXmlUnmarshallingContext result = minimal();
+
+        assertThat(result.isResponseSuccess()).isNull();
+        assertThat(result.sdkHttpFullResponse()).isNull();
+        assertThat(result.parsedRootXml()).isNull();
+        assertThat(result.executionAttributes()).isNull();
+        assertThat(result.parsedErrorXml()).isNull();
+    }
+
+    @Test
+    public void builder_maximal() {
+        AwsXmlUnmarshallingContext result = maximal();
+
+        assertThat(result.isResponseSuccess()).isTrue();
+        assertThat(result.sdkHttpFullResponse()).isEqualTo(mockSdkHttpFullResponse);
+        assertThat(result.parsedRootXml()).isEqualTo(XML_ELEMENT_1);
+        assertThat(result.executionAttributes()).isEqualTo(EXECUTION_ATTRIBUTES_1);
+        assertThat(result.parsedErrorXml()).isEqualTo(XML_ERROR_ELEMENT_1);
+    }
+
+    @Test
+    public void toBuilder_maximal() {
+        assertThat(maximal().toBuilder().build()).isEqualTo(maximal());
+    }
+
+    @Test
+    public void toBuilder_minimal() {
+        assertThat(minimal().toBuilder().build()).isEqualTo(minimal());
+    }
+
+    @Test
+    public void equals_maximal_positive() {
+        assertThat(maximal()).isEqualTo(maximal());
+    }
+
+    @Test
+    public void equals_minimal() {
+        assertThat(minimal()).isEqualTo(minimal());
+    }
+
+    @Test
+    public void equals_maximal_negative() {
+        assertThat(maximal().toBuilder().isResponseSuccess(false).build()).isNotEqualTo(maximal());
+        assertThat(maximal().toBuilder().sdkHttpFullResponse(mock(SdkHttpFullResponse.class)).build()).isNotEqualTo(maximal());
+        assertThat(maximal().toBuilder().parsedXml(XML_ELEMENT_2).build()).isNotEqualTo(maximal());
+        assertThat(maximal().toBuilder().parsedErrorXml(XML_ERROR_ELEMENT_2).build()).isNotEqualTo(maximal());
+        assertThat(maximal().toBuilder().executionAttributes(EXECUTION_ATTRIBUTES_2).build()).isNotEqualTo(maximal());
+    }
+
+    @Test
+    public void hashcode_maximal_positive() {
+        assertThat(maximal().hashCode()).isEqualTo(maximal().hashCode());
+    }
+
+    @Test
+    public void hashcode_minimal_positive() {
+        assertThat(minimal().hashCode()).isEqualTo(minimal().hashCode());
+    }
+
+    @Test
+    public void hashcode_maximal_negative() {
+        assertThat(maximal().toBuilder().isResponseSuccess(false).build().hashCode())
+            .isNotEqualTo(maximal().hashCode());
+        assertThat(maximal().toBuilder().sdkHttpFullResponse(mock(SdkHttpFullResponse.class)).build().hashCode())
+            .isNotEqualTo(maximal().hashCode());
+        assertThat(maximal().toBuilder().parsedXml(XML_ELEMENT_2).build().hashCode())
+            .isNotEqualTo(maximal().hashCode());
+        assertThat(maximal().toBuilder().parsedErrorXml(XML_ERROR_ELEMENT_2).build().hashCode())
+            .isNotEqualTo(maximal().hashCode());
+        assertThat(maximal().toBuilder().executionAttributes(EXECUTION_ATTRIBUTES_2).build().hashCode())
+            .isNotEqualTo(maximal().hashCode());
+    }
+
+}
\ No newline at end of file
diff --git a/core/protocols/aws-xml-protocol/src/test/java/software/amazon/awssdk/protocols/xml/internal/unmarshall/DecorateErrorFromResponseBodyUnmarshallerTest.java b/core/protocols/aws-xml-protocol/src/test/java/software/amazon/awssdk/protocols/xml/internal/unmarshall/DecorateErrorFromResponseBodyUnmarshallerTest.java
new file mode 100644
index 000000000000..e69c1e585e52
--- /dev/null
+++ b/core/protocols/aws-xml-protocol/src/test/java/software/amazon/awssdk/protocols/xml/internal/unmarshall/DecorateErrorFromResponseBodyUnmarshallerTest.java
@@ -0,0 +1,175 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.protocols.xml.internal.unmarshall;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.Optional;
+import java.util.function.Function;
+
+import org.junit.Test;
+
+import software.amazon.awssdk.http.SdkHttpFullResponse;
+import software.amazon.awssdk.protocols.query.unmarshall.XmlElement;
+
+public class DecorateErrorFromResponseBodyUnmarshallerTest {
+    private static final Function<XmlElement, Optional<XmlElement>> FAIL_TEST_ERROR_ROOT_LOCATOR =
+        ignored -> { throw new RuntimeException("This function should not have been called"); };
+
+    @Test
+    public void status200_noBody() {
+        DecorateErrorFromResponseBodyUnmarshaller decorateErrorFromResponseBodyUnmarshaller =
+            DecorateErrorFromResponseBodyUnmarshaller.of(FAIL_TEST_ERROR_ROOT_LOCATOR);
+
+        SdkHttpFullResponse sdkHttpFullResponse = SdkHttpFullResponse.builder()
+                                                                     .statusCode(200)
+                                                                     .build();
+
+        AwsXmlUnmarshallingContext context = AwsXmlUnmarshallingContext.builder()
+                                                                       .sdkHttpFullResponse(sdkHttpFullResponse)
+                                                                       .build();
+
+        AwsXmlUnmarshallingContext result = decorateErrorFromResponseBodyUnmarshaller.apply(context);
+
+        assertThat(result.isResponseSuccess()).isTrue();
+        assertThat(result.parsedErrorXml()).isNull();
+    }
+
+    @Test
+    public void status200_bodyWithNoError() {
+        DecorateErrorFromResponseBodyUnmarshaller decorateErrorFromResponseBodyUnmarshaller =
+            DecorateErrorFromResponseBodyUnmarshaller.of(FAIL_TEST_ERROR_ROOT_LOCATOR);
+
+        SdkHttpFullResponse sdkHttpFullResponse = SdkHttpFullResponse.builder()
+                                                                     .statusCode(200)
+                                                                     .build();
+
+        XmlElement parsedBody = XmlElement.builder()
+                                          .elementName("ValidResponse")
+                                          .build();
+
+        AwsXmlUnmarshallingContext context = AwsXmlUnmarshallingContext.builder()
+                                                                       .sdkHttpFullResponse(sdkHttpFullResponse)
+                                                                       .parsedXml(parsedBody)
+                                                                       .build();
+
+        AwsXmlUnmarshallingContext result = decorateErrorFromResponseBodyUnmarshaller.apply(context);
+
+        assertThat(result.isResponseSuccess()).isTrue();
+        assertThat(result.parsedErrorXml()).isNull();
+    }
+
+    @Test
+    public void status200_bodyWithError() {
+        DecorateErrorFromResponseBodyUnmarshaller decorateErrorFromResponseBodyUnmarshaller =
+            DecorateErrorFromResponseBodyUnmarshaller.of(FAIL_TEST_ERROR_ROOT_LOCATOR);
+
+        SdkHttpFullResponse sdkHttpFullResponse = SdkHttpFullResponse.builder()
+                                                                     .statusCode(200)
+                                                                     .build();
+
+        XmlElement parsedError = XmlElement.builder()
+                                           .elementName("test-error")
+                                           .build();
+
+        XmlElement parsedBody = XmlElement.builder()
+                                          .elementName("Error")
+                                          .addChildElement(parsedError)
+                                          .build();
+
+        AwsXmlUnmarshallingContext context = AwsXmlUnmarshallingContext.builder()
+                                                                       .sdkHttpFullResponse(sdkHttpFullResponse)
+                                                                       .parsedXml(parsedBody)
+                                                                       .build();
+
+        AwsXmlUnmarshallingContext result = decorateErrorFromResponseBodyUnmarshaller.apply(context);
+
+        assertThat(result.isResponseSuccess()).isFalse();
+        assertThat(result.parsedErrorXml()).isSameAs(parsedBody);
+    }
+
+    @Test
+    public void status500_noBody() {
+        DecorateErrorFromResponseBodyUnmarshaller decorateErrorFromResponseBodyUnmarshaller =
+            DecorateErrorFromResponseBodyUnmarshaller.of(xml -> xml.getOptionalElementByName("test-error"));
+
+        SdkHttpFullResponse sdkHttpFullResponse = SdkHttpFullResponse.builder()
+                                                                     .statusCode(500)
+                                                                     .build();
+
+        AwsXmlUnmarshallingContext context = AwsXmlUnmarshallingContext.builder()
+                                                                       .sdkHttpFullResponse(sdkHttpFullResponse)
+                                                                       .build();
+
+        AwsXmlUnmarshallingContext result = decorateErrorFromResponseBodyUnmarshaller.apply(context);
+
+        assertThat(result.isResponseSuccess()).isFalse();
+        assertThat(result.parsedErrorXml()).isNull();
+    }
+
+    @Test
+    public void status500_bodyWithNoError() {
+        DecorateErrorFromResponseBodyUnmarshaller decorateErrorFromResponseBodyUnmarshaller =
+            DecorateErrorFromResponseBodyUnmarshaller.of(xml -> xml.getOptionalElementByName("test-error"));
+
+        SdkHttpFullResponse sdkHttpFullResponse = SdkHttpFullResponse.builder()
+                                                                     .statusCode(500)
+                                                                     .build();
+
+        XmlElement parsedBody = XmlElement.builder()
+                                          .elementName("ValidResponse")
+                                          .build();
+
+        AwsXmlUnmarshallingContext context = AwsXmlUnmarshallingContext.builder()
+                                                                       .sdkHttpFullResponse(sdkHttpFullResponse)
+                                                                       .parsedXml(parsedBody)
+                                                                       .build();
+
+        AwsXmlUnmarshallingContext result = decorateErrorFromResponseBodyUnmarshaller.apply(context);
+
+        assertThat(result.isResponseSuccess()).isFalse();
+        assertThat(result.parsedErrorXml()).isNull();
+    }
+
+    @Test
+    public void status500_bodyWithError() {
+        DecorateErrorFromResponseBodyUnmarshaller decorateErrorFromResponseBodyUnmarshaller =
+            DecorateErrorFromResponseBodyUnmarshaller.of(xml -> xml.getOptionalElementByName("test-error"));
+
+        SdkHttpFullResponse sdkHttpFullResponse = SdkHttpFullResponse.builder()
+                                                                     .statusCode(500)
+                                                                     .build();
+
+        XmlElement parsedError = XmlElement.builder()
+                                           .elementName("test-error")
+                                           .build();
+
+        XmlElement parsedBody = XmlElement.builder()
+                                          .elementName("Error")
+                                          .addChildElement(parsedError)
+                                          .build();
+
+        AwsXmlUnmarshallingContext context = AwsXmlUnmarshallingContext.builder()
+                                                                       .sdkHttpFullResponse(sdkHttpFullResponse)
+                                                                       .parsedXml(parsedBody)
+                                                                       .build();
+
+        AwsXmlUnmarshallingContext result = decorateErrorFromResponseBodyUnmarshaller.apply(context);
+
+        assertThat(result.isResponseSuccess()).isFalse();
+        assertThat(result.parsedErrorXml()).isSameAs(parsedError);
+    }
+}
\ No newline at end of file
diff --git a/core/protocols/pom.xml b/core/protocols/pom.xml
index d959eb6ca21f..32aef73a8d12 100644
--- a/core/protocols/pom.xml
+++ b/core/protocols/pom.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ 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.
+  -->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>core</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/core/protocols/protocol-core/pom.xml b/core/protocols/protocol-core/pom.xml
index e2dc80cb5850..8f5ab21658d2 100644
--- a/core/protocols/protocol-core/pom.xml
+++ b/core/protocols/protocol-core/pom.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ 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.
+  -->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>protocols</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/core/protocols/protocol-core/src/main/java/software/amazon/awssdk/protocols/core/AbstractMarshallingRegistry.java b/core/protocols/protocol-core/src/main/java/software/amazon/awssdk/protocols/core/AbstractMarshallingRegistry.java
index e39367f57efc..6bd09d52a257 100644
--- a/core/protocols/protocol-core/src/main/java/software/amazon/awssdk/protocols/core/AbstractMarshallingRegistry.java
+++ b/core/protocols/protocol-core/src/main/java/software/amazon/awssdk/protocols/core/AbstractMarshallingRegistry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/protocols/protocol-core/src/main/java/software/amazon/awssdk/protocols/core/ExceptionMetadata.java b/core/protocols/protocol-core/src/main/java/software/amazon/awssdk/protocols/core/ExceptionMetadata.java
index 7a3dab6aaa21..de298bc1ee4a 100644
--- a/core/protocols/protocol-core/src/main/java/software/amazon/awssdk/protocols/core/ExceptionMetadata.java
+++ b/core/protocols/protocol-core/src/main/java/software/amazon/awssdk/protocols/core/ExceptionMetadata.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/protocols/protocol-core/src/main/java/software/amazon/awssdk/protocols/core/InstantToString.java b/core/protocols/protocol-core/src/main/java/software/amazon/awssdk/protocols/core/InstantToString.java
index ca71665eab60..96eaa4164932 100644
--- a/core/protocols/protocol-core/src/main/java/software/amazon/awssdk/protocols/core/InstantToString.java
+++ b/core/protocols/protocol-core/src/main/java/software/amazon/awssdk/protocols/core/InstantToString.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/protocols/protocol-core/src/main/java/software/amazon/awssdk/protocols/core/Marshaller.java b/core/protocols/protocol-core/src/main/java/software/amazon/awssdk/protocols/core/Marshaller.java
index 11008876292b..a289dc7d2654 100644
--- a/core/protocols/protocol-core/src/main/java/software/amazon/awssdk/protocols/core/Marshaller.java
+++ b/core/protocols/protocol-core/src/main/java/software/amazon/awssdk/protocols/core/Marshaller.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/protocols/protocol-core/src/main/java/software/amazon/awssdk/protocols/core/OperationInfo.java b/core/protocols/protocol-core/src/main/java/software/amazon/awssdk/protocols/core/OperationInfo.java
index 808894bc6d27..8b4dbf287e49 100644
--- a/core/protocols/protocol-core/src/main/java/software/amazon/awssdk/protocols/core/OperationInfo.java
+++ b/core/protocols/protocol-core/src/main/java/software/amazon/awssdk/protocols/core/OperationInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/protocols/protocol-core/src/main/java/software/amazon/awssdk/protocols/core/OperationMetadataAttribute.java b/core/protocols/protocol-core/src/main/java/software/amazon/awssdk/protocols/core/OperationMetadataAttribute.java
index 76fbe13e9bde..f77f084339b3 100644
--- a/core/protocols/protocol-core/src/main/java/software/amazon/awssdk/protocols/core/OperationMetadataAttribute.java
+++ b/core/protocols/protocol-core/src/main/java/software/amazon/awssdk/protocols/core/OperationMetadataAttribute.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/protocols/protocol-core/src/main/java/software/amazon/awssdk/protocols/core/PathMarshaller.java b/core/protocols/protocol-core/src/main/java/software/amazon/awssdk/protocols/core/PathMarshaller.java
index 3a1ce5e52c5b..ff98704e8c6b 100644
--- a/core/protocols/protocol-core/src/main/java/software/amazon/awssdk/protocols/core/PathMarshaller.java
+++ b/core/protocols/protocol-core/src/main/java/software/amazon/awssdk/protocols/core/PathMarshaller.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/protocols/protocol-core/src/main/java/software/amazon/awssdk/protocols/core/ProtocolMarshaller.java b/core/protocols/protocol-core/src/main/java/software/amazon/awssdk/protocols/core/ProtocolMarshaller.java
index 66333fdfc220..7a769d47363c 100644
--- a/core/protocols/protocol-core/src/main/java/software/amazon/awssdk/protocols/core/ProtocolMarshaller.java
+++ b/core/protocols/protocol-core/src/main/java/software/amazon/awssdk/protocols/core/ProtocolMarshaller.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/protocols/protocol-core/src/main/java/software/amazon/awssdk/protocols/core/ProtocolUtils.java b/core/protocols/protocol-core/src/main/java/software/amazon/awssdk/protocols/core/ProtocolUtils.java
index d28a7251916f..cead56f1cf65 100644
--- a/core/protocols/protocol-core/src/main/java/software/amazon/awssdk/protocols/core/ProtocolUtils.java
+++ b/core/protocols/protocol-core/src/main/java/software/amazon/awssdk/protocols/core/ProtocolUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/protocols/protocol-core/src/main/java/software/amazon/awssdk/protocols/core/StringToInstant.java b/core/protocols/protocol-core/src/main/java/software/amazon/awssdk/protocols/core/StringToInstant.java
index fa41b4f7f3fc..a9888f076c1d 100644
--- a/core/protocols/protocol-core/src/main/java/software/amazon/awssdk/protocols/core/StringToInstant.java
+++ b/core/protocols/protocol-core/src/main/java/software/amazon/awssdk/protocols/core/StringToInstant.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/protocols/protocol-core/src/main/java/software/amazon/awssdk/protocols/core/StringToValueConverter.java b/core/protocols/protocol-core/src/main/java/software/amazon/awssdk/protocols/core/StringToValueConverter.java
index d38e8757f049..e1fe1d2ec73e 100644
--- a/core/protocols/protocol-core/src/main/java/software/amazon/awssdk/protocols/core/StringToValueConverter.java
+++ b/core/protocols/protocol-core/src/main/java/software/amazon/awssdk/protocols/core/StringToValueConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/protocols/protocol-core/src/main/java/software/amazon/awssdk/protocols/core/ValueToStringConverter.java b/core/protocols/protocol-core/src/main/java/software/amazon/awssdk/protocols/core/ValueToStringConverter.java
index ce2192e7f206..8dc35eb35bdd 100644
--- a/core/protocols/protocol-core/src/main/java/software/amazon/awssdk/protocols/core/ValueToStringConverter.java
+++ b/core/protocols/protocol-core/src/main/java/software/amazon/awssdk/protocols/core/ValueToStringConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/protocols/protocol-core/src/test/java/software/amazon/awssdk/protocols/core/GreedyPathMarshallerTest.java b/core/protocols/protocol-core/src/test/java/software/amazon/awssdk/protocols/core/GreedyPathMarshallerTest.java
index f74cb995c8f2..f53932516a5d 100644
--- a/core/protocols/protocol-core/src/test/java/software/amazon/awssdk/protocols/core/GreedyPathMarshallerTest.java
+++ b/core/protocols/protocol-core/src/test/java/software/amazon/awssdk/protocols/core/GreedyPathMarshallerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/protocols/protocol-core/src/test/java/software/amazon/awssdk/protocols/core/NonGreedyPathMarshallerTest.java b/core/protocols/protocol-core/src/test/java/software/amazon/awssdk/protocols/core/NonGreedyPathMarshallerTest.java
index c8de721e923c..0994009bb65d 100644
--- a/core/protocols/protocol-core/src/test/java/software/amazon/awssdk/protocols/core/NonGreedyPathMarshallerTest.java
+++ b/core/protocols/protocol-core/src/test/java/software/amazon/awssdk/protocols/core/NonGreedyPathMarshallerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/protocols/protocol-core/src/test/java/software/amazon/awssdk/protocols/core/ProtocolUtilsTest.java b/core/protocols/protocol-core/src/test/java/software/amazon/awssdk/protocols/core/ProtocolUtilsTest.java
index a29eeef08b78..ffb7c9048f4e 100644
--- a/core/protocols/protocol-core/src/test/java/software/amazon/awssdk/protocols/core/ProtocolUtilsTest.java
+++ b/core/protocols/protocol-core/src/test/java/software/amazon/awssdk/protocols/core/ProtocolUtilsTest.java
@@ -1,3 +1,18 @@
+/*
+ * 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.
+ */
+
 package software.amazon.awssdk.protocols.core;
 
 import static java.util.Collections.singletonList;
diff --git a/core/regions/pom.xml b/core/regions/pom.xml
index 974603742bfe..a3e46e116a6b 100644
--- a/core/regions/pom.xml
+++ b/core/regions/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -22,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>core</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
 
     <artifactId>regions</artifactId>
diff --git a/core/regions/src/it/java/software/amazon/awssdk/regions/util/EC2MetadataUtilsIntegrationTest.java b/core/regions/src/it/java/software/amazon/awssdk/regions/util/EC2MetadataUtilsIntegrationTest.java
index 8f6b05406548..07d94e80bf58 100644
--- a/core/regions/src/it/java/software/amazon/awssdk/regions/util/EC2MetadataUtilsIntegrationTest.java
+++ b/core/regions/src/it/java/software/amazon/awssdk/regions/util/EC2MetadataUtilsIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/regions/src/main/java/software/amazon/awssdk/regions/DefaultServiceMetadata.java b/core/regions/src/main/java/software/amazon/awssdk/regions/DefaultServiceMetadata.java
index f516628be61e..d5a68eb08046 100644
--- a/core/regions/src/main/java/software/amazon/awssdk/regions/DefaultServiceMetadata.java
+++ b/core/regions/src/main/java/software/amazon/awssdk/regions/DefaultServiceMetadata.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -17,6 +17,7 @@
 
 import java.net.URI;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -53,4 +54,9 @@ public Region signingRegion(Region region) {
     public List<Region> regions() {
         return REGIONS;
     }
+
+    @Override
+    public List<ServicePartitionMetadata> servicePartitions() {
+        return Collections.emptyList();
+    }
 }
diff --git a/core/regions/src/main/java/software/amazon/awssdk/regions/MetadataLoader.java b/core/regions/src/main/java/software/amazon/awssdk/regions/MetadataLoader.java
index 29b2649fcb08..cac8ed2cf0e4 100644
--- a/core/regions/src/main/java/software/amazon/awssdk/regions/MetadataLoader.java
+++ b/core/regions/src/main/java/software/amazon/awssdk/regions/MetadataLoader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -30,7 +30,8 @@ final class MetadataLoader {
 
     private static final PartitionMetadataProvider PARTITION_METADATA_PROVIDER = new GeneratedPartitionMetadataProvider();
 
-    private MetadataLoader() {}
+    private MetadataLoader() {
+    }
 
     static PartitionMetadata partitionMetadata(Region region) {
         return PARTITION_METADATA_PROVIDER.partitionMetadata(region);
diff --git a/core/regions/src/main/java/software/amazon/awssdk/regions/PartitionMetadata.java b/core/regions/src/main/java/software/amazon/awssdk/regions/PartitionMetadata.java
index c42cdee41e13..9c94b3dcd561 100644
--- a/core/regions/src/main/java/software/amazon/awssdk/regions/PartitionMetadata.java
+++ b/core/regions/src/main/java/software/amazon/awssdk/regions/PartitionMetadata.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -71,4 +71,15 @@ public interface PartitionMetadata {
     static PartitionMetadata of(String partition) {
         return MetadataLoader.partitionMetadata(partition);
     }
+
+    /**
+     * Retrieves the partition metadata for a given region.
+     *
+     * @param region The region to get the partition metadata for.
+     *
+     * @return {@link PartitionMetadata} for the given region.
+     */
+    static PartitionMetadata of(Region region) {
+        return MetadataLoader.partitionMetadata(region);
+    }
 }
diff --git a/core/regions/src/main/java/software/amazon/awssdk/regions/PartitionMetadataProvider.java b/core/regions/src/main/java/software/amazon/awssdk/regions/PartitionMetadataProvider.java
index ede6e623bf9b..81b6046378f6 100644
--- a/core/regions/src/main/java/software/amazon/awssdk/regions/PartitionMetadataProvider.java
+++ b/core/regions/src/main/java/software/amazon/awssdk/regions/PartitionMetadataProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/regions/src/main/java/software/amazon/awssdk/regions/RegionMetadata.java b/core/regions/src/main/java/software/amazon/awssdk/regions/RegionMetadata.java
index 34fd4b1f73f5..7f8bbce2d887 100644
--- a/core/regions/src/main/java/software/amazon/awssdk/regions/RegionMetadata.java
+++ b/core/regions/src/main/java/software/amazon/awssdk/regions/RegionMetadata.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/regions/src/main/java/software/amazon/awssdk/regions/RegionMetadataProvider.java b/core/regions/src/main/java/software/amazon/awssdk/regions/RegionMetadataProvider.java
index 08a250a4890b..d7f93e9a3d3c 100644
--- a/core/regions/src/main/java/software/amazon/awssdk/regions/RegionMetadataProvider.java
+++ b/core/regions/src/main/java/software/amazon/awssdk/regions/RegionMetadataProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/regions/src/main/java/software/amazon/awssdk/regions/ServiceMetadata.java b/core/regions/src/main/java/software/amazon/awssdk/regions/ServiceMetadata.java
index 791f66b12fc7..b5a552090d37 100644
--- a/core/regions/src/main/java/software/amazon/awssdk/regions/ServiceMetadata.java
+++ b/core/regions/src/main/java/software/amazon/awssdk/regions/ServiceMetadata.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -18,7 +18,9 @@
 import java.net.URI;
 import java.util.List;
 import java.util.Map;
+import java.util.function.Consumer;
 import software.amazon.awssdk.annotations.SdkPublicApi;
+import software.amazon.awssdk.profiles.ProfileFile;
 
 /**
  * Metadata about a service, like S3, DynamoDB, etc.
@@ -56,6 +58,13 @@ public interface ServiceMetadata {
      */
     List<Region> regions();
 
+    /**
+     * Retrieve the service-specific partition configuration of each partition in which this service is currently available.
+     *
+     * @return The list of service-specific service metadata for each partition in which this service is available.
+     */
+    List<ServicePartitionMetadata> servicePartitions();
+
     /**
      * Load the service metadata for the provided service endpoint prefix. This should only be used when you do not wish to have
      * a dependency on the service for which you are retrieving the metadata. When you have a dependency on the service client,
@@ -87,4 +96,25 @@ default String computeEndpoint(String endpointPrefix,
                               .replace("{service}", endpointPrefix)
                               .replace("{dnsSuffix}", partitionMetadata.dnsSuffix());
     }
+
+    /**
+     * Reconfigure this service metadata using the provided {@link ServiceMetadataConfiguration}. This is useful, because some
+     * service metadata instances refer to external configuration that might wish to be modified, like a {@link ProfileFile}.
+     */
+    default ServiceMetadata reconfigure(ServiceMetadataConfiguration configuration) {
+        return this;
+    }
+
+    /**
+     * Reconfigure this service metadata using the provided {@link ServiceMetadataConfiguration}. This is useful, because some
+     * service metadata instances refer to external configuration that might wish to be modified, like a {@link ProfileFile}.
+     *
+     * This is a shorthand form of {@link #reconfigure(ServiceMetadataConfiguration)}, without the need to call
+     * {@code builder()} or {@code build()}.
+     */
+    default ServiceMetadata reconfigure(Consumer<ServiceMetadataConfiguration.Builder> consumer) {
+        ServiceMetadataConfiguration.Builder configuration = ServiceMetadataConfiguration.builder();
+        consumer.accept(configuration);
+        return reconfigure(configuration.build());
+    }
 }
diff --git a/core/regions/src/main/java/software/amazon/awssdk/regions/ServiceMetadataConfiguration.java b/core/regions/src/main/java/software/amazon/awssdk/regions/ServiceMetadataConfiguration.java
new file mode 100644
index 000000000000..7639020c470d
--- /dev/null
+++ b/core/regions/src/main/java/software/amazon/awssdk/regions/ServiceMetadataConfiguration.java
@@ -0,0 +1,95 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.regions;
+
+import java.util.function.Supplier;
+import software.amazon.awssdk.annotations.SdkPublicApi;
+import software.amazon.awssdk.profiles.ProfileFile;
+import software.amazon.awssdk.profiles.ProfileFileSystemSetting;
+
+/**
+ * Configuration for a {@link ServiceMetadata}. This allows modifying the values used by default when a metadata instance is
+ * generating endpoint data.
+ *
+ * Created using a {@link #builder()}.
+ */
+@SdkPublicApi
+public final class ServiceMetadataConfiguration {
+    private final Supplier<ProfileFile> profileFile;
+    private final String profileName;
+
+    private ServiceMetadataConfiguration(Builder builder) {
+        this.profileFile = builder.profileFile;
+        this.profileName = builder.profileName;
+    }
+
+    /**
+     * Create a {@link Builder} that can be used to create {@link ServiceMetadataConfiguration} instances.
+     */
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    /**
+     * Retrieve the profile file configured via {@link Builder#profileFile(Supplier)}.
+     */
+    public Supplier<ProfileFile> profileFile() {
+        return profileFile;
+    }
+
+    /**
+     * Retrieve the profile name configured via {@link Builder#profileName(String)}.
+     */
+    public String profileName() {
+        return profileName;
+    }
+
+    public static final class Builder {
+        private Supplier<ProfileFile> profileFile;
+        private String profileName;
+
+        private Builder() {
+        }
+
+        /**
+         * Configure the profile file used by some services to calculate the endpoint from the region. The supplier is only
+         * invoked zero or one time, and only the first time the value is needed.
+         *
+         * If this is null, the {@link ProfileFile#defaultProfileFile()} is used.
+         */
+        public Builder profileFile(Supplier<ProfileFile> profileFile) {
+            this.profileFile = profileFile;
+            return this;
+        }
+
+        /**
+         * Configure which profile in the {@link #profileFile(Supplier)} should be usedto calculate the endpoint from the region.
+         *
+         * If this is null, the {@link ProfileFileSystemSetting#AWS_PROFILE} is used.
+         */
+        public Builder profileName(String profileName) {
+            this.profileName = profileName;
+            return this;
+        }
+
+        /**
+         * Build the {@link ServiceMetadata} instance with the updated configuration.
+         */
+        public ServiceMetadataConfiguration build() {
+            return new ServiceMetadataConfiguration(this);
+        }
+    }
+}
diff --git a/core/regions/src/main/java/software/amazon/awssdk/regions/ServiceMetadataProvider.java b/core/regions/src/main/java/software/amazon/awssdk/regions/ServiceMetadataProvider.java
index eaccaf698c9f..c879acafd1b5 100644
--- a/core/regions/src/main/java/software/amazon/awssdk/regions/ServiceMetadataProvider.java
+++ b/core/regions/src/main/java/software/amazon/awssdk/regions/ServiceMetadataProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/regions/src/main/java/software/amazon/awssdk/regions/ServicePartitionMetadata.java b/core/regions/src/main/java/software/amazon/awssdk/regions/ServicePartitionMetadata.java
new file mode 100644
index 000000000000..ce4c6d75a6a2
--- /dev/null
+++ b/core/regions/src/main/java/software/amazon/awssdk/regions/ServicePartitionMetadata.java
@@ -0,0 +1,38 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.regions;
+
+import java.util.Optional;
+import software.amazon.awssdk.annotations.SdkPublicApi;
+
+/**
+ * The metadata associated with a specific service, in a specific partition.
+ *
+ * This can be loaded via {@link ServiceMetadata#servicePartitions()}.
+ */
+@SdkPublicApi
+public interface ServicePartitionMetadata {
+    /**
+     * Retrieve the partition to which this service is known to exist.
+     */
+    PartitionMetadata partition();
+
+    /**
+     * Retrieve the global region associated with this service, in this {@link #partition()}. This will return empty if the
+     * service is regionalized in the partition.
+     */
+    Optional<Region> globalRegion();
+}
diff --git a/core/regions/src/main/java/software/amazon/awssdk/regions/internal/DefaultServicePartitionMetadata.java b/core/regions/src/main/java/software/amazon/awssdk/regions/internal/DefaultServicePartitionMetadata.java
new file mode 100644
index 000000000000..8d7dc781f003
--- /dev/null
+++ b/core/regions/src/main/java/software/amazon/awssdk/regions/internal/DefaultServicePartitionMetadata.java
@@ -0,0 +1,44 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.regions.internal;
+
+import java.util.Optional;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.regions.PartitionMetadata;
+import software.amazon.awssdk.regions.Region;
+import software.amazon.awssdk.regions.ServicePartitionMetadata;
+
+@SdkInternalApi
+public class DefaultServicePartitionMetadata implements ServicePartitionMetadata {
+    private final String partition;
+    private final Region globalRegionForPartition;
+
+    public DefaultServicePartitionMetadata(String partition,
+                                           Region globalRegionForPartition) {
+        this.partition = partition;
+        this.globalRegionForPartition = globalRegionForPartition;
+    }
+
+    @Override
+    public PartitionMetadata partition() {
+        return PartitionMetadata.of(partition);
+    }
+
+    @Override
+    public Optional<Region> globalRegion() {
+        return Optional.ofNullable(globalRegionForPartition);
+    }
+}
diff --git a/core/regions/src/main/java/software/amazon/awssdk/regions/internal/util/ConnectionUtils.java b/core/regions/src/main/java/software/amazon/awssdk/regions/internal/util/ConnectionUtils.java
index 7e01a3ff7f9a..7ecfa13c3beb 100644
--- a/core/regions/src/main/java/software/amazon/awssdk/regions/internal/util/ConnectionUtils.java
+++ b/core/regions/src/main/java/software/amazon/awssdk/regions/internal/util/ConnectionUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -31,10 +31,14 @@ public static ConnectionUtils create() {
     }
 
     public HttpURLConnection connectToEndpoint(URI endpoint, Map<String, String> headers) throws IOException {
+        return connectToEndpoint(endpoint, headers, "GET");
+    }
+
+    public HttpURLConnection connectToEndpoint(URI endpoint, Map<String, String> headers, String method) throws IOException {
         HttpURLConnection connection = (HttpURLConnection) endpoint.toURL().openConnection(Proxy.NO_PROXY);
-        connection.setConnectTimeout(1000 * 2);
-        connection.setReadTimeout(1000 * 5);
-        connection.setRequestMethod("GET");
+        connection.setConnectTimeout(1000);
+        connection.setReadTimeout(1000);
+        connection.setRequestMethod(method);
         connection.setDoOutput(true);
         headers.forEach(connection::addRequestProperty);
         connection.setInstanceFollowRedirects(false);
diff --git a/core/regions/src/main/java/software/amazon/awssdk/regions/internal/util/EC2MetadataUtils.java b/core/regions/src/main/java/software/amazon/awssdk/regions/internal/util/EC2MetadataUtils.java
index 65fe7a95cfbc..985eda091c36 100644
--- a/core/regions/src/main/java/software/amazon/awssdk/regions/internal/util/EC2MetadataUtils.java
+++ b/core/regions/src/main/java/software/amazon/awssdk/regions/internal/util/EC2MetadataUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -35,10 +35,14 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.SdkTestInternalApi;
 import software.amazon.awssdk.core.SdkSystemSetting;
 import software.amazon.awssdk.core.exception.SdkClientException;
+import software.amazon.awssdk.core.exception.SdkServiceException;
+import software.amazon.awssdk.core.internal.util.UserAgentUtils;
 import software.amazon.awssdk.core.util.json.JacksonUtils;
 import software.amazon.awssdk.regions.util.HttpResourcesUtils;
+import software.amazon.awssdk.regions.util.ResourcesEndpointProvider;
 
 /**
  * Utility class for retrieving Amazon EC2 instance metadata.<br>
@@ -71,13 +75,20 @@ public final class EC2MetadataUtils {
     private static final String EC2_METADATA_ROOT = "/latest/meta-data";
     private static final String EC2_USERDATA_ROOT = "/latest/user-data/";
     private static final String EC2_DYNAMICDATA_ROOT = "/latest/dynamic/";
+
+    private static final String EC2_METADATA_TOKEN_HEADER = "x-aws-ec2-metadata-token";
+
     private static final int DEFAULT_QUERY_RETRIES = 3;
     private static final int MINIMUM_RETRY_WAIT_TIME_MILLISECONDS = 250;
     private static final ObjectMapper MAPPER = new ObjectMapper();
     private static final Logger log = LoggerFactory.getLogger(EC2MetadataUtils.class);
     private static Map<String, String> cache = new ConcurrentHashMap<>();
 
-    private EC2MetadataUtils() {}
+    private static final InstanceProviderTokenEndpointProvider TOKEN_ENDPOINT_PROVIDER =
+            new InstanceProviderTokenEndpointProvider();
+
+    private EC2MetadataUtils() {
+    }
 
     static {
         MAPPER.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
@@ -379,6 +390,11 @@ public static List<String> getItems(String path, int tries) {
         return getItems(path, tries, false);
     }
 
+    @SdkTestInternalApi
+    static void clearCache() {
+        cache.clear();
+    }
+
     private static List<String> getItems(String path, int tries, boolean slurp) {
         if (tries == 0) {
             throw SdkClientException.builder().message("Unable to contact EC2 metadata service.").build();
@@ -389,9 +405,12 @@ private static List<String> getItems(String path, int tries, boolean slurp) {
         }
 
         List<String> items;
+
+        String token = getToken();
+
         try {
             String hostAddress = SdkSystemSetting.AWS_EC2_METADATA_SERVICE_ENDPOINT.getStringValueOrThrow();
-            String response = HttpResourcesUtils.instance().readResource(new URI(hostAddress + path));
+            String response = doReadResource(new URI(hostAddress + path), token);
             if (slurp) {
                 items = Collections.singletonList(response);
             } else {
@@ -414,6 +433,31 @@ private static List<String> getItems(String path, int tries, boolean slurp) {
         }
     }
 
+    private static String doReadResource(URI resource, String token) throws IOException {
+        return HttpResourcesUtils.instance().readResource(new DefaultEndpointProvider(resource, token), "GET");
+    }
+
+    public static String getToken() {
+        try {
+            return HttpResourcesUtils.instance().readResource(TOKEN_ENDPOINT_PROVIDER, "PUT");
+        } catch (Exception e) {
+
+            boolean is400ServiceException = e instanceof SdkServiceException
+                    && ((SdkServiceException) e).statusCode() == 400;
+
+            // metadata resolution must not continue to the token-less flow for a 400
+            if (is400ServiceException) {
+                throw SdkClientException.builder()
+                        .message("Unable to fetch metadata token")
+                        .cause(e)
+                        .build();
+            }
+
+            return null;
+        }
+    }
+
+
     private static String fetchData(String path) {
         return fetchData(path, false);
     }
@@ -428,6 +472,8 @@ private static String fetchData(String path, boolean force) {
                 cache.put(path, getData(path));
             }
             return cache.get(path);
+        } catch (SdkClientException e) {
+            throw e;
         } catch (RuntimeException e) {
             return null;
         }
@@ -758,4 +804,33 @@ private List<String> getItems(String key) {
             }
         }
     }
+
+    private static final class DefaultEndpointProvider implements ResourcesEndpointProvider {
+        private final URI endpoint;
+        private final String metadataToken;
+
+        private DefaultEndpointProvider(URI endpoint, String metadataToken) {
+            this.endpoint = endpoint;
+            this.metadataToken = metadataToken;
+        }
+
+        @Override
+        public URI endpoint() {
+            return endpoint;
+        }
+
+        @Override
+        public Map<String, String> headers() {
+            Map<String, String> requestHeaders = new HashMap<>();
+            requestHeaders.put("User-Agent", UserAgentUtils.getUserAgent());
+            requestHeaders.put("Accept", "*/*");
+            requestHeaders.put("Connection", "keep-alive");
+
+            if (metadataToken != null) {
+                requestHeaders.put(EC2_METADATA_TOKEN_HEADER, metadataToken);
+            }
+
+            return requestHeaders;
+        }
+    }
 }
diff --git a/core/regions/src/main/java/software/amazon/awssdk/regions/internal/util/InstanceProviderTokenEndpointProvider.java b/core/regions/src/main/java/software/amazon/awssdk/regions/internal/util/InstanceProviderTokenEndpointProvider.java
new file mode 100644
index 000000000000..de6589375e53
--- /dev/null
+++ b/core/regions/src/main/java/software/amazon/awssdk/regions/internal/util/InstanceProviderTokenEndpointProvider.java
@@ -0,0 +1,51 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.regions.internal.util;
+
+import java.net.URI;
+import java.util.HashMap;
+import java.util.Map;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.core.SdkSystemSetting;
+import software.amazon.awssdk.core.internal.util.UserAgentUtils;
+import software.amazon.awssdk.regions.util.ResourcesEndpointProvider;
+
+@SdkInternalApi
+public final class InstanceProviderTokenEndpointProvider implements ResourcesEndpointProvider {
+    private static final String TOKEN_RESOURCE_PATH = "/latest/api/token";
+    private static final String EC2_METADATA_TOKEN_TTL_HEADER = "x-aws-ec2-metadata-token-ttl-seconds";
+    private static final String DEFAULT_TOKEN_TTL = "21600";
+
+    @Override
+    public URI endpoint() {
+        String host = SdkSystemSetting.AWS_EC2_METADATA_SERVICE_ENDPOINT.getStringValueOrThrow();
+        if (host.endsWith("/")) {
+            host = host.substring(0, host.length() - 1);
+        }
+        return URI.create(host + TOKEN_RESOURCE_PATH);
+    }
+
+    @Override
+    public Map<String, String> headers() {
+        Map<String, String> requestHeaders = new HashMap<>();
+        requestHeaders.put("User-Agent", UserAgentUtils.getUserAgent());
+        requestHeaders.put("Accept", "*/*");
+        requestHeaders.put("Connection", "keep-alive");
+        requestHeaders.put(EC2_METADATA_TOKEN_TTL_HEADER, DEFAULT_TOKEN_TTL);
+
+        return requestHeaders;
+    }
+}
\ No newline at end of file
diff --git a/core/regions/src/main/java/software/amazon/awssdk/regions/providers/AwsProfileRegionProvider.java b/core/regions/src/main/java/software/amazon/awssdk/regions/providers/AwsProfileRegionProvider.java
index 6262890bbf01..4623d3029fc5 100644
--- a/core/regions/src/main/java/software/amazon/awssdk/regions/providers/AwsProfileRegionProvider.java
+++ b/core/regions/src/main/java/software/amazon/awssdk/regions/providers/AwsProfileRegionProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -15,6 +15,7 @@
 
 package software.amazon.awssdk.regions.providers;
 
+import java.util.function.Supplier;
 import software.amazon.awssdk.annotations.SdkProtectedApi;
 import software.amazon.awssdk.core.exception.SdkClientException;
 import software.amazon.awssdk.profiles.ProfileFile;
@@ -27,12 +28,21 @@
  */
 @SdkProtectedApi
 public final class AwsProfileRegionProvider implements AwsRegionProvider {
+    private final Supplier<ProfileFile> profileFile;
+    private final String profileName;
 
-    private final String profileName = ProfileFileSystemSetting.AWS_PROFILE.getStringValueOrThrow();
+    public AwsProfileRegionProvider() {
+        this(null, null);
+    }
+
+    public AwsProfileRegionProvider(Supplier<ProfileFile> profileFile, String profileName) {
+        this.profileFile = profileFile != null ? profileFile : ProfileFile::defaultProfileFile;
+        this.profileName = profileName != null ? profileName : ProfileFileSystemSetting.AWS_PROFILE.getStringValueOrThrow();
+    }
 
     @Override
     public Region getRegion() {
-        return ProfileFile.defaultProfileFile()
+        return profileFile.get()
                           .profile(profileName)
                           .map(p -> p.properties().get(ProfileProperty.REGION))
                           .map(Region::of)
diff --git a/core/regions/src/main/java/software/amazon/awssdk/regions/providers/AwsRegionProvider.java b/core/regions/src/main/java/software/amazon/awssdk/regions/providers/AwsRegionProvider.java
index 7aad8aaabbb4..033585d4a5d0 100644
--- a/core/regions/src/main/java/software/amazon/awssdk/regions/providers/AwsRegionProvider.java
+++ b/core/regions/src/main/java/software/amazon/awssdk/regions/providers/AwsRegionProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/regions/src/main/java/software/amazon/awssdk/regions/providers/AwsRegionProviderChain.java b/core/regions/src/main/java/software/amazon/awssdk/regions/providers/AwsRegionProviderChain.java
index 1a82681d1183..4b875d215877 100644
--- a/core/regions/src/main/java/software/amazon/awssdk/regions/providers/AwsRegionProviderChain.java
+++ b/core/regions/src/main/java/software/amazon/awssdk/regions/providers/AwsRegionProviderChain.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/regions/src/main/java/software/amazon/awssdk/regions/providers/DefaultAwsRegionProviderChain.java b/core/regions/src/main/java/software/amazon/awssdk/regions/providers/DefaultAwsRegionProviderChain.java
index d13a18e20542..1da97400980f 100644
--- a/core/regions/src/main/java/software/amazon/awssdk/regions/providers/DefaultAwsRegionProviderChain.java
+++ b/core/regions/src/main/java/software/amazon/awssdk/regions/providers/DefaultAwsRegionProviderChain.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -15,7 +15,9 @@
 
 package software.amazon.awssdk.regions.providers;
 
+import java.util.function.Supplier;
 import software.amazon.awssdk.annotations.SdkProtectedApi;
+import software.amazon.awssdk.profiles.ProfileFile;
 
 /**
  * AWS Region provider that looks for the region in this order:
@@ -29,7 +31,40 @@
 @SdkProtectedApi
 public final class DefaultAwsRegionProviderChain extends AwsRegionProviderChain {
     public DefaultAwsRegionProviderChain() {
-        super(new SystemSettingsRegionProvider(), new AwsProfileRegionProvider(),
+        super(new SystemSettingsRegionProvider(),
+              new AwsProfileRegionProvider(),
               new InstanceProfileRegionProvider());
     }
+
+    private DefaultAwsRegionProviderChain(Builder builder) {
+        super(new SystemSettingsRegionProvider(),
+              new AwsProfileRegionProvider(builder.profileFile, builder.profileName),
+              new InstanceProfileRegionProvider());
+    }
+
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    public static final class Builder {
+        private Supplier<ProfileFile> profileFile;
+        private String profileName;
+
+        private Builder() {
+        }
+
+        public Builder profileFile(Supplier<ProfileFile> profileFile) {
+            this.profileFile = profileFile;
+            return this;
+        }
+
+        public Builder profileName(String profileName) {
+            this.profileName = profileName;
+            return this;
+        }
+
+        public DefaultAwsRegionProviderChain build() {
+            return new DefaultAwsRegionProviderChain(this);
+        }
+    }
 }
diff --git a/core/regions/src/main/java/software/amazon/awssdk/regions/providers/InstanceProfileRegionProvider.java b/core/regions/src/main/java/software/amazon/awssdk/regions/providers/InstanceProfileRegionProvider.java
index a2169ced288b..0d12df38f882 100644
--- a/core/regions/src/main/java/software/amazon/awssdk/regions/providers/InstanceProfileRegionProvider.java
+++ b/core/regions/src/main/java/software/amazon/awssdk/regions/providers/InstanceProfileRegionProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/regions/src/main/java/software/amazon/awssdk/regions/providers/LazyAwsRegionProvider.java b/core/regions/src/main/java/software/amazon/awssdk/regions/providers/LazyAwsRegionProvider.java
index 85c239d559f9..3bfe3e9280c9 100644
--- a/core/regions/src/main/java/software/amazon/awssdk/regions/providers/LazyAwsRegionProvider.java
+++ b/core/regions/src/main/java/software/amazon/awssdk/regions/providers/LazyAwsRegionProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -18,6 +18,7 @@
 import java.util.function.Supplier;
 import software.amazon.awssdk.annotations.SdkProtectedApi;
 import software.amazon.awssdk.regions.Region;
+import software.amazon.awssdk.utils.Lazy;
 import software.amazon.awssdk.utils.ToString;
 
 /**
@@ -26,29 +27,20 @@
  */
 @SdkProtectedApi
 public class LazyAwsRegionProvider implements AwsRegionProvider {
-    private final Supplier<AwsRegionProvider> delegateConstructor;
-    private volatile AwsRegionProvider delegate;
+    private final Lazy<AwsRegionProvider> delegate;
 
     public LazyAwsRegionProvider(Supplier<AwsRegionProvider> delegateConstructor) {
-        this.delegateConstructor = delegateConstructor;
+        this.delegate = new Lazy<>(delegateConstructor);
     }
 
     @Override
     public Region getRegion() {
-        if (delegate == null) {
-            synchronized (this) {
-                if (delegate == null) {
-                    delegate = delegateConstructor.get();
-                }
-            }
-        }
-        return delegate.getRegion();
+        return delegate.getValue().getRegion();
     }
 
     @Override
     public String toString() {
         return ToString.builder("LazyAwsRegionProvider")
-                       .add("delegateConstructor", delegateConstructor)
                        .add("delegate", delegate)
                        .build();
     }
diff --git a/core/regions/src/main/java/software/amazon/awssdk/regions/providers/SystemSettingsRegionProvider.java b/core/regions/src/main/java/software/amazon/awssdk/regions/providers/SystemSettingsRegionProvider.java
index c8434cf00837..8a71fc1d198b 100644
--- a/core/regions/src/main/java/software/amazon/awssdk/regions/providers/SystemSettingsRegionProvider.java
+++ b/core/regions/src/main/java/software/amazon/awssdk/regions/providers/SystemSettingsRegionProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/regions/src/main/java/software/amazon/awssdk/regions/servicemetadata/ElasticacheServiceMetadata.java b/core/regions/src/main/java/software/amazon/awssdk/regions/servicemetadata/ElasticacheServiceMetadata.java
deleted file mode 100644
index 1b8da7b3c9fe..000000000000
--- a/core/regions/src/main/java/software/amazon/awssdk/regions/servicemetadata/ElasticacheServiceMetadata.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.regions.servicemetadata;
-
-import java.net.URI;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import software.amazon.awssdk.annotations.Generated;
-import software.amazon.awssdk.annotations.SdkPublicApi;
-import software.amazon.awssdk.regions.Region;
-import software.amazon.awssdk.regions.ServiceMetadata;
-import software.amazon.awssdk.utils.ImmutableMap;
-
-@Generated("software.amazon.awssdk:codegen")
-@SdkPublicApi
-public final class ElasticacheServiceMetadata implements ServiceMetadata {
-    private static final String ENDPOINT_PREFIX = "elasticache";
-
-    private static final Map<String, String> PARTITION_OVERRIDDEN_ENDPOINTS = ImmutableMap.<String, String>builder().build();
-
-    private static final Map<String, String> REGION_OVERRIDDEN_ENDPOINTS = ImmutableMap.<String, String>builder()
-            .put("fips", "elasticache-fips.us-gov-west-1.amazonaws.com").build();
-
-    private static final List<Region> REGIONS = Collections.unmodifiableList(Arrays.asList(Region.of("ap-northeast-1"),
-            Region.of("ap-northeast-2"), Region.of("ap-south-1"), Region.of("ap-southeast-1"), Region.of("ap-southeast-2"),
-            Region.of("ca-central-1"), Region.of("eu-central-1"), Region.of("eu-north-1"), Region.of("eu-west-1"),
-            Region.of("eu-west-2"), Region.of("eu-west-3"), Region.of("sa-east-1"), Region.of("us-east-1"),
-            Region.of("us-east-2"), Region.of("us-west-1"), Region.of("us-west-2"), Region.of("cn-north-1"),
-            Region.of("cn-northwest-1"), Region.of("fips"), Region.of("us-gov-east-1"), Region.of("us-gov-west-1")));
-
-    private static final Map<String, String> SIGNING_REGION_OVERRIDES = ImmutableMap.<String, String>builder()
-            .put("fips", "us-gov-west-1").build();
-
-    @Override
-    public List<Region> regions() {
-        return REGIONS;
-    }
-
-    @Override
-    public URI endpointFor(Region region) {
-        return URI.create(REGION_OVERRIDDEN_ENDPOINTS.containsKey(region.id()) ? REGION_OVERRIDDEN_ENDPOINTS.get(region.id())
-                : computeEndpoint(ENDPOINT_PREFIX, PARTITION_OVERRIDDEN_ENDPOINTS, region));
-    }
-
-    @Override
-    public Region signingRegion(Region region) {
-        return Region.of(SIGNING_REGION_OVERRIDES.getOrDefault(region.id(), region.id()));
-    }
-}
diff --git a/core/regions/src/main/java/software/amazon/awssdk/regions/servicemetadata/EnhancedS3ServiceMetadata.java b/core/regions/src/main/java/software/amazon/awssdk/regions/servicemetadata/EnhancedS3ServiceMetadata.java
new file mode 100644
index 000000000000..f0c93a9c5ed3
--- /dev/null
+++ b/core/regions/src/main/java/software/amazon/awssdk/regions/servicemetadata/EnhancedS3ServiceMetadata.java
@@ -0,0 +1,119 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.regions.servicemetadata;
+
+import java.net.URI;
+import java.util.List;
+import java.util.function.Supplier;
+import software.amazon.awssdk.annotations.SdkPublicApi;
+import software.amazon.awssdk.core.SdkSystemSetting;
+import software.amazon.awssdk.profiles.ProfileFile;
+import software.amazon.awssdk.profiles.ProfileFileSystemSetting;
+import software.amazon.awssdk.profiles.ProfileProperty;
+import software.amazon.awssdk.regions.Region;
+import software.amazon.awssdk.regions.ServiceMetadata;
+import software.amazon.awssdk.regions.ServiceMetadataConfiguration;
+import software.amazon.awssdk.regions.ServicePartitionMetadata;
+import software.amazon.awssdk.utils.Lazy;
+import software.amazon.awssdk.utils.Logger;
+
+/**
+ * Decorator metadata class for S3 to allow customers to opt in to using the
+ * regional S3 us-east-1 endpoint instead of the legacy
+ * {@code s3.amazonaws.com} when specifying the us-east-1 region.
+ */
+@SdkPublicApi
+public final class EnhancedS3ServiceMetadata implements ServiceMetadata {
+    private static final Logger log = Logger.loggerFor(EnhancedS3ServiceMetadata.class);
+    private static final String REGIONAL_SETTING = "regional";
+
+    private final Lazy<Boolean> useUsEast1RegionalEndpoint;
+    private final ServiceMetadata s3ServiceMetadata;
+
+    public EnhancedS3ServiceMetadata() {
+        this(ServiceMetadataConfiguration.builder().build());
+    }
+
+    private EnhancedS3ServiceMetadata(ServiceMetadataConfiguration config) {
+        Supplier<ProfileFile> profileFile = config.profileFile() != null ? config.profileFile()
+                                                                         : ProfileFile::defaultProfileFile;
+        Supplier<String> profileName = config.profileName() != null ? () -> config.profileName()
+                                                                    : ProfileFileSystemSetting.AWS_PROFILE::getStringValueOrThrow;
+
+        this.useUsEast1RegionalEndpoint = new Lazy<>(() -> useUsEast1RegionalEndpoint(profileFile, profileName));
+        this.s3ServiceMetadata = new S3ServiceMetadata().reconfigure(config);
+    }
+
+    @Override
+    public URI endpointFor(Region region) {
+        if (Region.US_EAST_1.equals(region) && !useUsEast1RegionalEndpoint.getValue()) {
+            return URI.create("s3.amazonaws.com");
+        }
+        return s3ServiceMetadata.endpointFor(region);
+    }
+
+    @Override
+    public Region signingRegion(Region region) {
+        return s3ServiceMetadata.signingRegion(region);
+    }
+
+    @Override
+    public List<Region> regions() {
+        return s3ServiceMetadata.regions();
+    }
+
+    @Override
+    public List<ServicePartitionMetadata> servicePartitions() {
+        return s3ServiceMetadata.servicePartitions();
+    }
+
+    private boolean useUsEast1RegionalEndpoint(Supplier<ProfileFile> profileFile, Supplier<String> profileName) {
+        String env = envVarSetting();
+
+        if (env != null) {
+            return REGIONAL_SETTING.equalsIgnoreCase(env);
+        }
+
+        String profile = profileFileSetting(profileFile, profileName);
+
+        if (profile != null) {
+            return REGIONAL_SETTING.equalsIgnoreCase(profile);
+        }
+
+        return false;
+    }
+
+    private static String envVarSetting() {
+        return SdkSystemSetting.AWS_S3_US_EAST_1_REGIONAL_ENDPOINT.getStringValue().orElse(null);
+    }
+
+    private String profileFileSetting(Supplier<ProfileFile> profileFileSupplier, Supplier<String> profileName) {
+        try {
+            return profileFileSupplier.get()
+                                      .profile(profileName.get())
+                                      .flatMap(p -> p.property(ProfileProperty.S3_US_EAST_1_REGIONAL_ENDPOINT))
+                                      .orElse(null);
+        } catch (Exception t) {
+            log.warn(() -> "Unable to load config file", t);
+            return null;
+        }
+    }
+
+    @Override
+    public ServiceMetadata reconfigure(ServiceMetadataConfiguration configuration) {
+        return new EnhancedS3ServiceMetadata(configuration);
+    }
+}
diff --git a/core/regions/src/main/java/software/amazon/awssdk/regions/util/HttpResourcesUtils.java b/core/regions/src/main/java/software/amazon/awssdk/regions/util/HttpResourcesUtils.java
index c0caa5e95856..d87ed42aa076 100644
--- a/core/regions/src/main/java/software/amazon/awssdk/regions/util/HttpResourcesUtils.java
+++ b/core/regions/src/main/java/software/amazon/awssdk/regions/util/HttpResourcesUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -71,7 +71,7 @@ public static HttpResourcesUtils instance() {
      * @throws SdkClientException If the requested service is not found.
      */
     public String readResource(URI endpoint) throws IOException {
-        return readResource(() -> endpoint);
+        return readResource(() -> endpoint, "GET");
     }
 
     /**
@@ -86,13 +86,30 @@ public String readResource(URI endpoint) throws IOException {
      * @throws SdkClientException If the requested service is not found.
      */
     public String readResource(ResourcesEndpointProvider endpointProvider) throws IOException {
+        return readResource(endpointProvider, "GET");
+    }
+
+    /**
+     * Connects to the given endpoint to read the resource
+     * and returns the text contents.
+     *
+     * @param endpointProvider The endpoint provider.
+     * @param method The HTTP request method to use.
+     * @return The text payload returned from the container metadata endpoint
+     * service for the specified resource path.
+     * @throws IOException If any problems were encountered while connecting to the
+     * service for the requested resource path.
+     * @throws SdkClientException If the requested service is not found.
+     */
+    public String readResource(ResourcesEndpointProvider endpointProvider, String method) throws IOException {
         int retriesAttempted = 0;
         InputStream inputStream = null;
 
         while (true) {
             try {
                 HttpURLConnection connection = connectionUtils.connectToEndpoint(endpointProvider.endpoint(),
-                                                                                 endpointProvider.headers());
+                                                                                 endpointProvider.headers(),
+                                                                                 method);
 
                 int statusCode = connection.getResponseCode();
 
@@ -130,6 +147,7 @@ public String readResource(ResourcesEndpointProvider endpointProvider) throws IO
 
     }
 
+
     private void handleErrorResponse(InputStream errorStream, int statusCode, String responseMessage) throws IOException {
         // Parse the error stream returned from the service.
         if (errorStream != null) {
diff --git a/core/regions/src/main/java/software/amazon/awssdk/regions/util/ResourcesEndpointProvider.java b/core/regions/src/main/java/software/amazon/awssdk/regions/util/ResourcesEndpointProvider.java
index 9c301e1e6e4e..7344595d8c19 100644
--- a/core/regions/src/main/java/software/amazon/awssdk/regions/util/ResourcesEndpointProvider.java
+++ b/core/regions/src/main/java/software/amazon/awssdk/regions/util/ResourcesEndpointProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/regions/src/main/java/software/amazon/awssdk/regions/util/ResourcesEndpointRetryParameters.java b/core/regions/src/main/java/software/amazon/awssdk/regions/util/ResourcesEndpointRetryParameters.java
index 5b8fd67dbad3..7dd35276acb8 100644
--- a/core/regions/src/main/java/software/amazon/awssdk/regions/util/ResourcesEndpointRetryParameters.java
+++ b/core/regions/src/main/java/software/amazon/awssdk/regions/util/ResourcesEndpointRetryParameters.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/regions/src/main/java/software/amazon/awssdk/regions/util/ResourcesEndpointRetryPolicy.java b/core/regions/src/main/java/software/amazon/awssdk/regions/util/ResourcesEndpointRetryPolicy.java
index 02cee9c29975..a586ce0e2c7b 100644
--- a/core/regions/src/main/java/software/amazon/awssdk/regions/util/ResourcesEndpointRetryPolicy.java
+++ b/core/regions/src/main/java/software/amazon/awssdk/regions/util/ResourcesEndpointRetryPolicy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/regions/src/main/resources/software/amazon/awssdk/regions/internal/region/endpoints.json b/core/regions/src/main/resources/software/amazon/awssdk/regions/internal/region/endpoints.json
index 3de9c2421de2..c05987f7da3f 100644
--- a/core/regions/src/main/resources/software/amazon/awssdk/regions/internal/region/endpoints.json
+++ b/core/regions/src/main/resources/software/amazon/awssdk/regions/internal/region/endpoints.json
@@ -8,8 +8,11 @@
     "dnsSuffix" : "amazonaws.com",
     "partition" : "aws",
     "partitionName" : "AWS Standard",
-    "regionRegex" : "^(us|eu|ap|sa|ca)\\-\\w+\\-\\d+$",
+    "regionRegex" : "^(us|eu|ap|sa|ca|me)\\-\\w+\\-\\d+$",
     "regions" : {
+      "ap-east-1" : {
+        "description" : "Asia Pacific (Hong Kong)"
+      },
       "ap-northeast-1" : {
         "description" : "Asia Pacific (Tokyo)"
       },
@@ -43,6 +46,9 @@
       "eu-west-3" : {
         "description" : "EU (Paris)"
       },
+      "me-south-1" : {
+        "description" : "Middle East (Bahrain)"
+      },
       "sa-east-1" : {
         "description" : "South America (Sao Paulo)"
       },
@@ -65,8 +71,9 @@
           "us-east-1" : { }
         }
       },
-      "acm" : {
+      "access-analyzer" : {
         "endpoints" : {
+          "ap-east-1" : { },
           "ap-northeast-1" : { },
           "ap-northeast-2" : { },
           "ap-south-1" : { },
@@ -78,6 +85,7 @@
           "eu-west-1" : { },
           "eu-west-2" : { },
           "eu-west-3" : { },
+          "me-south-1" : { },
           "sa-east-1" : { },
           "us-east-1" : { },
           "us-east-2" : { },
@@ -85,25 +93,121 @@
           "us-west-2" : { }
         }
       },
+      "acm" : {
+        "endpoints" : {
+          "ap-east-1" : { },
+          "ap-northeast-1" : { },
+          "ap-northeast-2" : { },
+          "ap-south-1" : { },
+          "ap-southeast-1" : { },
+          "ap-southeast-2" : { },
+          "ca-central-1" : { },
+          "ca-central-1-fips" : {
+            "credentialScope" : {
+              "region" : "ca-central-1"
+            },
+            "hostname" : "acm-fips.ca-central-1.amazonaws.com"
+          },
+          "eu-central-1" : { },
+          "eu-north-1" : { },
+          "eu-west-1" : { },
+          "eu-west-2" : { },
+          "eu-west-3" : { },
+          "me-south-1" : { },
+          "sa-east-1" : { },
+          "us-east-1" : { },
+          "us-east-1-fips" : {
+            "credentialScope" : {
+              "region" : "us-east-1"
+            },
+            "hostname" : "acm-fips.us-east-1.amazonaws.com"
+          },
+          "us-east-2" : { },
+          "us-east-2-fips" : {
+            "credentialScope" : {
+              "region" : "us-east-2"
+            },
+            "hostname" : "acm-fips.us-east-2.amazonaws.com"
+          },
+          "us-west-1" : { },
+          "us-west-1-fips" : {
+            "credentialScope" : {
+              "region" : "us-west-1"
+            },
+            "hostname" : "acm-fips.us-west-1.amazonaws.com"
+          },
+          "us-west-2" : { },
+          "us-west-2-fips" : {
+            "credentialScope" : {
+              "region" : "us-west-2"
+            },
+            "hostname" : "acm-fips.us-west-2.amazonaws.com"
+          }
+        }
+      },
       "acm-pca" : {
         "defaults" : {
           "protocols" : [ "https" ]
         },
         "endpoints" : {
+          "ap-east-1" : { },
           "ap-northeast-1" : { },
+          "ap-northeast-2" : { },
+          "ap-south-1" : { },
           "ap-southeast-1" : { },
           "ap-southeast-2" : { },
           "ca-central-1" : { },
           "eu-central-1" : { },
+          "eu-north-1" : { },
           "eu-west-1" : { },
           "eu-west-2" : { },
+          "eu-west-3" : { },
+          "fips-ca-central-1" : {
+            "credentialScope" : {
+              "region" : "ca-central-1"
+            },
+            "hostname" : "acm-pca-fips.ca-central-1.amazonaws.com"
+          },
+          "fips-us-east-1" : {
+            "credentialScope" : {
+              "region" : "us-east-1"
+            },
+            "hostname" : "acm-pca-fips.us-east-1.amazonaws.com"
+          },
+          "fips-us-east-2" : {
+            "credentialScope" : {
+              "region" : "us-east-2"
+            },
+            "hostname" : "acm-pca-fips.us-east-2.amazonaws.com"
+          },
+          "fips-us-west-1" : {
+            "credentialScope" : {
+              "region" : "us-west-1"
+            },
+            "hostname" : "acm-pca-fips.us-west-1.amazonaws.com"
+          },
+          "fips-us-west-2" : {
+            "credentialScope" : {
+              "region" : "us-west-2"
+            },
+            "hostname" : "acm-pca-fips.us-west-2.amazonaws.com"
+          },
+          "me-south-1" : { },
+          "sa-east-1" : { },
           "us-east-1" : { },
           "us-east-2" : { },
+          "us-west-1" : { },
           "us-west-2" : { }
         }
       },
       "api.ecr" : {
         "endpoints" : {
+          "ap-east-1" : {
+            "credentialScope" : {
+              "region" : "ap-east-1"
+            },
+            "hostname" : "api.ecr.ap-east-1.amazonaws.com"
+          },
           "ap-northeast-1" : {
             "credentialScope" : {
               "region" : "ap-northeast-1"
@@ -170,6 +274,36 @@
             },
             "hostname" : "api.ecr.eu-west-3.amazonaws.com"
           },
+          "fips-us-east-1" : {
+            "credentialScope" : {
+              "region" : "us-east-1"
+            },
+            "hostname" : "ecr-fips.us-east-1.amazonaws.com"
+          },
+          "fips-us-east-2" : {
+            "credentialScope" : {
+              "region" : "us-east-2"
+            },
+            "hostname" : "ecr-fips.us-east-2.amazonaws.com"
+          },
+          "fips-us-west-1" : {
+            "credentialScope" : {
+              "region" : "us-west-1"
+            },
+            "hostname" : "ecr-fips.us-west-1.amazonaws.com"
+          },
+          "fips-us-west-2" : {
+            "credentialScope" : {
+              "region" : "us-west-2"
+            },
+            "hostname" : "ecr-fips.us-west-2.amazonaws.com"
+          },
+          "me-south-1" : {
+            "credentialScope" : {
+              "region" : "me-south-1"
+            },
+            "hostname" : "api.ecr.me-south-1.amazonaws.com"
+          },
           "sa-east-1" : {
             "credentialScope" : {
               "region" : "sa-east-1"
@@ -207,6 +341,7 @@
           "ap-northeast-1" : { },
           "ap-southeast-1" : { },
           "ap-southeast-2" : { },
+          "eu-central-1" : { },
           "eu-west-1" : { },
           "us-east-1" : { },
           "us-west-2" : { }
@@ -225,6 +360,7 @@
       },
       "api.sagemaker" : {
         "endpoints" : {
+          "ap-east-1" : { },
           "ap-northeast-1" : { },
           "ap-northeast-2" : { },
           "ap-south-1" : { },
@@ -232,8 +368,12 @@
           "ap-southeast-2" : { },
           "ca-central-1" : { },
           "eu-central-1" : { },
+          "eu-north-1" : { },
           "eu-west-1" : { },
           "eu-west-2" : { },
+          "eu-west-3" : { },
+          "me-south-1" : { },
+          "sa-east-1" : { },
           "us-east-1" : { },
           "us-east-1-fips" : {
             "credentialScope" : {
@@ -266,6 +406,7 @@
       },
       "apigateway" : {
         "endpoints" : {
+          "ap-east-1" : { },
           "ap-northeast-1" : { },
           "ap-northeast-2" : { },
           "ap-south-1" : { },
@@ -277,6 +418,7 @@
           "eu-west-1" : { },
           "eu-west-2" : { },
           "eu-west-3" : { },
+          "me-south-1" : { },
           "sa-east-1" : { },
           "us-east-1" : { },
           "us-east-2" : { },
@@ -286,13 +428,32 @@
       },
       "application-autoscaling" : {
         "defaults" : {
-          "credentialScope" : {
-            "service" : "application-autoscaling"
-          },
-          "hostname" : "autoscaling.{region}.amazonaws.com",
           "protocols" : [ "http", "https" ]
         },
         "endpoints" : {
+          "ap-east-1" : { },
+          "ap-northeast-1" : { },
+          "ap-northeast-2" : { },
+          "ap-south-1" : { },
+          "ap-southeast-1" : { },
+          "ap-southeast-2" : { },
+          "ca-central-1" : { },
+          "eu-central-1" : { },
+          "eu-north-1" : { },
+          "eu-west-1" : { },
+          "eu-west-2" : { },
+          "eu-west-3" : { },
+          "me-south-1" : { },
+          "sa-east-1" : { },
+          "us-east-1" : { },
+          "us-east-2" : { },
+          "us-west-1" : { },
+          "us-west-2" : { }
+        }
+      },
+      "appmesh" : {
+        "endpoints" : {
+          "ap-east-1" : { },
           "ap-northeast-1" : { },
           "ap-northeast-2" : { },
           "ap-south-1" : { },
@@ -304,6 +465,7 @@
           "eu-west-1" : { },
           "eu-west-2" : { },
           "eu-west-3" : { },
+          "me-south-1" : { },
           "sa-east-1" : { },
           "us-east-1" : { },
           "us-east-2" : { },
@@ -325,6 +487,12 @@
           "ap-southeast-2" : { },
           "eu-central-1" : { },
           "eu-west-1" : { },
+          "fips" : {
+            "credentialScope" : {
+              "region" : "us-west-2"
+            },
+            "hostname" : "appstream2-fips.us-west-2.amazonaws.com"
+          },
           "us-east-1" : { },
           "us-west-2" : { }
         }
@@ -338,6 +506,7 @@
           "ap-southeast-2" : { },
           "eu-central-1" : { },
           "eu-west-1" : { },
+          "eu-west-2" : { },
           "us-east-1" : { },
           "us-east-2" : { },
           "us-west-2" : { }
@@ -345,16 +514,23 @@
       },
       "athena" : {
         "endpoints" : {
+          "ap-east-1" : { },
           "ap-northeast-1" : { },
           "ap-northeast-2" : { },
           "ap-south-1" : { },
           "ap-southeast-1" : { },
           "ap-southeast-2" : { },
+          "ca-central-1" : { },
           "eu-central-1" : { },
+          "eu-north-1" : { },
           "eu-west-1" : { },
           "eu-west-2" : { },
+          "eu-west-3" : { },
+          "me-south-1" : { },
+          "sa-east-1" : { },
           "us-east-1" : { },
           "us-east-2" : { },
+          "us-west-1" : { },
           "us-west-2" : { }
         }
       },
@@ -363,6 +539,7 @@
           "protocols" : [ "http", "https" ]
         },
         "endpoints" : {
+          "ap-east-1" : { },
           "ap-northeast-1" : { },
           "ap-northeast-2" : { },
           "ap-south-1" : { },
@@ -374,6 +551,7 @@
           "eu-west-1" : { },
           "eu-west-2" : { },
           "eu-west-3" : { },
+          "me-south-1" : { },
           "sa-east-1" : { },
           "us-east-1" : { },
           "us-east-2" : { },
@@ -383,10 +561,6 @@
       },
       "autoscaling-plans" : {
         "defaults" : {
-          "credentialScope" : {
-            "service" : "autoscaling-plans"
-          },
-          "hostname" : "autoscaling.{region}.amazonaws.com",
           "protocols" : [ "http", "https" ]
         },
         "endpoints" : {
@@ -405,8 +579,31 @@
           "us-west-2" : { }
         }
       },
+      "backup" : {
+        "endpoints" : {
+          "ap-east-1" : { },
+          "ap-northeast-1" : { },
+          "ap-northeast-2" : { },
+          "ap-south-1" : { },
+          "ap-southeast-1" : { },
+          "ap-southeast-2" : { },
+          "ca-central-1" : { },
+          "eu-central-1" : { },
+          "eu-north-1" : { },
+          "eu-west-1" : { },
+          "eu-west-2" : { },
+          "eu-west-3" : { },
+          "me-south-1" : { },
+          "sa-east-1" : { },
+          "us-east-1" : { },
+          "us-east-2" : { },
+          "us-west-1" : { },
+          "us-west-2" : { }
+        }
+      },
       "batch" : {
         "endpoints" : {
+          "ap-east-1" : { },
           "ap-northeast-1" : { },
           "ap-northeast-2" : { },
           "ap-south-1" : { },
@@ -418,6 +615,37 @@
           "eu-west-1" : { },
           "eu-west-2" : { },
           "eu-west-3" : { },
+          "fips-ca-central-1" : {
+            "credentialScope" : {
+              "region" : "ca-central-1"
+            },
+            "hostname" : "batch-fips.ca-central-1.amazonaws.com"
+          },
+          "fips-us-east-1" : {
+            "credentialScope" : {
+              "region" : "us-east-1"
+            },
+            "hostname" : "batch-fips.us-east-1.amazonaws.com"
+          },
+          "fips-us-east-2" : {
+            "credentialScope" : {
+              "region" : "us-east-2"
+            },
+            "hostname" : "batch-fips.us-east-2.amazonaws.com"
+          },
+          "fips-us-west-1" : {
+            "credentialScope" : {
+              "region" : "us-west-1"
+            },
+            "hostname" : "batch-fips.us-west-1.amazonaws.com"
+          },
+          "fips-us-west-2" : {
+            "credentialScope" : {
+              "region" : "us-west-2"
+            },
+            "hostname" : "batch-fips.us-west-2.amazonaws.com"
+          },
+          "me-south-1" : { },
           "sa-east-1" : { },
           "us-east-1" : { },
           "us-east-2" : { },
@@ -468,8 +696,16 @@
       },
       "cloud9" : {
         "endpoints" : {
+          "ap-northeast-1" : { },
+          "ap-northeast-2" : { },
+          "ap-south-1" : { },
           "ap-southeast-1" : { },
+          "ap-southeast-2" : { },
+          "ca-central-1" : { },
+          "eu-central-1" : { },
+          "eu-north-1" : { },
           "eu-west-1" : { },
+          "eu-west-2" : { },
           "us-east-1" : { },
           "us-east-2" : { },
           "us-west-2" : { }
@@ -490,6 +726,7 @@
       },
       "cloudformation" : {
         "endpoints" : {
+          "ap-east-1" : { },
           "ap-northeast-1" : { },
           "ap-northeast-2" : { },
           "ap-south-1" : { },
@@ -501,11 +738,36 @@
           "eu-west-1" : { },
           "eu-west-2" : { },
           "eu-west-3" : { },
+          "me-south-1" : { },
           "sa-east-1" : { },
           "us-east-1" : { },
+          "us-east-1-fips" : {
+            "credentialScope" : {
+              "region" : "us-east-1"
+            },
+            "hostname" : "cloudformation-fips.us-east-1.amazonaws.com"
+          },
           "us-east-2" : { },
+          "us-east-2-fips" : {
+            "credentialScope" : {
+              "region" : "us-east-2"
+            },
+            "hostname" : "cloudformation-fips.us-east-2.amazonaws.com"
+          },
           "us-west-1" : { },
-          "us-west-2" : { }
+          "us-west-1-fips" : {
+            "credentialScope" : {
+              "region" : "us-west-1"
+            },
+            "hostname" : "cloudformation-fips.us-west-1.amazonaws.com"
+          },
+          "us-west-2" : { },
+          "us-west-2-fips" : {
+            "credentialScope" : {
+              "region" : "us-west-2"
+            },
+            "hostname" : "cloudformation-fips.us-west-2.amazonaws.com"
+          }
         }
       },
       "cloudfront" : {
@@ -542,6 +804,7 @@
           }
         },
         "endpoints" : {
+          "ap-east-1" : { },
           "ap-northeast-1" : { },
           "ap-northeast-2" : { },
           "ap-south-1" : { },
@@ -553,6 +816,8 @@
           "eu-west-1" : { },
           "eu-west-2" : { },
           "eu-west-3" : { },
+          "me-south-1" : { },
+          "sa-east-1" : { },
           "us-east-1" : { },
           "us-east-2" : { },
           "us-west-1" : { },
@@ -575,6 +840,7 @@
       },
       "cloudtrail" : {
         "endpoints" : {
+          "ap-east-1" : { },
           "ap-northeast-1" : { },
           "ap-northeast-2" : { },
           "ap-south-1" : { },
@@ -586,6 +852,31 @@
           "eu-west-1" : { },
           "eu-west-2" : { },
           "eu-west-3" : { },
+          "fips-us-east-1" : {
+            "credentialScope" : {
+              "region" : "us-east-1"
+            },
+            "hostname" : "cloudtrail-fips.us-east-1.amazonaws.com"
+          },
+          "fips-us-east-2" : {
+            "credentialScope" : {
+              "region" : "us-east-2"
+            },
+            "hostname" : "cloudtrail-fips.us-east-2.amazonaws.com"
+          },
+          "fips-us-west-1" : {
+            "credentialScope" : {
+              "region" : "us-west-1"
+            },
+            "hostname" : "cloudtrail-fips.us-west-1.amazonaws.com"
+          },
+          "fips-us-west-2" : {
+            "credentialScope" : {
+              "region" : "us-west-2"
+            },
+            "hostname" : "cloudtrail-fips.us-west-2.amazonaws.com"
+          },
+          "me-south-1" : { },
           "sa-east-1" : { },
           "us-east-1" : { },
           "us-east-2" : { },
@@ -595,6 +886,7 @@
       },
       "codebuild" : {
         "endpoints" : {
+          "ap-east-1" : { },
           "ap-northeast-1" : { },
           "ap-northeast-2" : { },
           "ap-south-1" : { },
@@ -602,9 +894,11 @@
           "ap-southeast-2" : { },
           "ca-central-1" : { },
           "eu-central-1" : { },
+          "eu-north-1" : { },
           "eu-west-1" : { },
           "eu-west-2" : { },
           "eu-west-3" : { },
+          "me-south-1" : { },
           "sa-east-1" : { },
           "us-east-1" : { },
           "us-east-1-fips" : {
@@ -638,6 +932,7 @@
       },
       "codecommit" : {
         "endpoints" : {
+          "ap-east-1" : { },
           "ap-northeast-1" : { },
           "ap-northeast-2" : { },
           "ap-south-1" : { },
@@ -645,6 +940,7 @@
           "ap-southeast-2" : { },
           "ca-central-1" : { },
           "eu-central-1" : { },
+          "eu-north-1" : { },
           "eu-west-1" : { },
           "eu-west-2" : { },
           "eu-west-3" : { },
@@ -654,6 +950,7 @@
             },
             "hostname" : "codecommit-fips.ca-central-1.amazonaws.com"
           },
+          "me-south-1" : { },
           "sa-east-1" : { },
           "us-east-1" : { },
           "us-east-2" : { },
@@ -663,6 +960,7 @@
       },
       "codedeploy" : {
         "endpoints" : {
+          "ap-east-1" : { },
           "ap-northeast-1" : { },
           "ap-northeast-2" : { },
           "ap-south-1" : { },
@@ -674,6 +972,7 @@
           "eu-west-1" : { },
           "eu-west-2" : { },
           "eu-west-3" : { },
+          "me-south-1" : { },
           "sa-east-1" : { },
           "us-east-1" : { },
           "us-east-1-fips" : {
@@ -714,6 +1013,7 @@
           "ap-southeast-2" : { },
           "ca-central-1" : { },
           "eu-central-1" : { },
+          "eu-north-1" : { },
           "eu-west-1" : { },
           "eu-west-2" : { },
           "eu-west-3" : { },
@@ -732,6 +1032,7 @@
           "ap-southeast-2" : { },
           "ca-central-1" : { },
           "eu-central-1" : { },
+          "eu-north-1" : { },
           "eu-west-1" : { },
           "eu-west-2" : { },
           "us-east-1" : { },
@@ -740,7 +1041,7 @@
           "us-west-2" : { }
         }
       },
-      "cognito-identity" : {
+      "codestar-connections" : {
         "endpoints" : {
           "ap-northeast-1" : { },
           "ap-northeast-2" : { },
@@ -751,12 +1052,15 @@
           "eu-central-1" : { },
           "eu-west-1" : { },
           "eu-west-2" : { },
+          "eu-west-3" : { },
+          "sa-east-1" : { },
           "us-east-1" : { },
           "us-east-2" : { },
+          "us-west-1" : { },
           "us-west-2" : { }
         }
       },
-      "cognito-idp" : {
+      "cognito-identity" : {
         "endpoints" : {
           "ap-northeast-1" : { },
           "ap-northeast-2" : { },
@@ -767,17 +1071,69 @@
           "eu-central-1" : { },
           "eu-west-1" : { },
           "eu-west-2" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-2" : { }
-        }
-      },
-      "cognito-sync" : {
-        "endpoints" : {
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
+          "fips-us-east-1" : {
+            "credentialScope" : {
+              "region" : "us-east-1"
+            },
+            "hostname" : "cognito-identity-fips.us-east-1.amazonaws.com"
+          },
+          "fips-us-east-2" : {
+            "credentialScope" : {
+              "region" : "us-east-2"
+            },
+            "hostname" : "cognito-identity-fips.us-east-2.amazonaws.com"
+          },
+          "fips-us-west-2" : {
+            "credentialScope" : {
+              "region" : "us-west-2"
+            },
+            "hostname" : "cognito-identity-fips.us-west-2.amazonaws.com"
+          },
+          "us-east-1" : { },
+          "us-east-2" : { },
+          "us-west-2" : { }
+        }
+      },
+      "cognito-idp" : {
+        "endpoints" : {
+          "ap-northeast-1" : { },
+          "ap-northeast-2" : { },
+          "ap-south-1" : { },
+          "ap-southeast-1" : { },
+          "ap-southeast-2" : { },
+          "ca-central-1" : { },
+          "eu-central-1" : { },
+          "eu-west-1" : { },
+          "eu-west-2" : { },
+          "fips-us-east-1" : {
+            "credentialScope" : {
+              "region" : "us-east-1"
+            },
+            "hostname" : "cognito-idp-fips.us-east-1.amazonaws.com"
+          },
+          "fips-us-east-2" : {
+            "credentialScope" : {
+              "region" : "us-east-2"
+            },
+            "hostname" : "cognito-idp-fips.us-east-2.amazonaws.com"
+          },
+          "fips-us-west-2" : {
+            "credentialScope" : {
+              "region" : "us-west-2"
+            },
+            "hostname" : "cognito-idp-fips.us-west-2.amazonaws.com"
+          },
+          "us-east-1" : { },
+          "us-east-2" : { },
+          "us-west-2" : { }
+        }
+      },
+      "cognito-sync" : {
+        "endpoints" : {
+          "ap-northeast-1" : { },
+          "ap-northeast-2" : { },
+          "ap-south-1" : { },
+          "ap-southeast-1" : { },
           "ap-southeast-2" : { },
           "eu-central-1" : { },
           "eu-west-1" : { },
@@ -792,11 +1148,44 @@
           "protocols" : [ "https" ]
         },
         "endpoints" : {
+          "ap-northeast-1" : { },
+          "ap-northeast-2" : { },
+          "ap-south-1" : { },
           "ap-southeast-1" : { },
           "ap-southeast-2" : { },
           "ca-central-1" : { },
           "eu-central-1" : { },
           "eu-west-1" : { },
+          "eu-west-2" : { },
+          "fips-us-east-1" : {
+            "credentialScope" : {
+              "region" : "us-east-1"
+            },
+            "hostname" : "comprehend-fips.us-east-1.amazonaws.com"
+          },
+          "fips-us-east-2" : {
+            "credentialScope" : {
+              "region" : "us-east-2"
+            },
+            "hostname" : "comprehend-fips.us-east-2.amazonaws.com"
+          },
+          "fips-us-west-2" : {
+            "credentialScope" : {
+              "region" : "us-west-2"
+            },
+            "hostname" : "comprehend-fips.us-west-2.amazonaws.com"
+          },
+          "us-east-1" : { },
+          "us-east-2" : { },
+          "us-west-2" : { }
+        }
+      },
+      "comprehendmedical" : {
+        "endpoints" : {
+          "ap-southeast-2" : { },
+          "ca-central-1" : { },
+          "eu-west-1" : { },
+          "eu-west-2" : { },
           "us-east-1" : { },
           "us-east-2" : { },
           "us-west-2" : { }
@@ -804,6 +1193,7 @@
       },
       "config" : {
         "endpoints" : {
+          "ap-east-1" : { },
           "ap-northeast-1" : { },
           "ap-northeast-2" : { },
           "ap-south-1" : { },
@@ -815,6 +1205,7 @@
           "eu-west-1" : { },
           "eu-west-2" : { },
           "eu-west-3" : { },
+          "me-south-1" : { },
           "sa-east-1" : { },
           "us-east-1" : { },
           "us-east-2" : { },
@@ -822,6 +1213,17 @@
           "us-west-2" : { }
         }
       },
+      "connect" : {
+        "endpoints" : {
+          "ap-northeast-1" : { },
+          "ap-southeast-1" : { },
+          "ap-southeast-2" : { },
+          "eu-central-1" : { },
+          "eu-west-2" : { },
+          "us-east-1" : { },
+          "us-west-2" : { }
+        }
+      },
       "cur" : {
         "endpoints" : {
           "us-east-1" : { }
@@ -835,16 +1237,50 @@
           "protocols" : [ "https" ]
         },
         "endpoints" : {
+          "ap-east-1" : { },
           "ap-northeast-1" : { },
           "ap-northeast-2" : { },
           "ap-south-1" : { },
           "ap-southeast-1" : { },
           "ap-southeast-2" : { },
+          "ca-central-1" : { },
+          "eu-central-1" : { },
+          "eu-north-1" : { },
+          "eu-west-1" : { },
+          "eu-west-2" : { },
+          "eu-west-3" : { },
+          "me-south-1" : { },
+          "sa-east-1" : { },
+          "us-east-1" : { },
+          "us-east-2" : { },
+          "us-west-1" : { },
+          "us-west-2" : { }
+        }
+      },
+      "data.mediastore" : {
+        "endpoints" : {
+          "ap-northeast-1" : { },
+          "ap-northeast-2" : { },
+          "ap-southeast-2" : { },
+          "eu-central-1" : { },
+          "eu-north-1" : { },
+          "eu-west-1" : { },
+          "us-east-1" : { },
+          "us-west-2" : { }
+        }
+      },
+      "dataexchange" : {
+        "endpoints" : {
+          "ap-northeast-1" : { },
+          "ap-northeast-2" : { },
+          "ap-southeast-1" : { },
+          "ap-southeast-2" : { },
           "eu-central-1" : { },
           "eu-west-1" : { },
           "eu-west-2" : { },
           "us-east-1" : { },
           "us-east-2" : { },
+          "us-west-1" : { },
           "us-west-2" : { }
         }
       },
@@ -859,12 +1295,50 @@
       },
       "datasync" : {
         "endpoints" : {
+          "ap-east-1" : { },
           "ap-northeast-1" : { },
           "ap-northeast-2" : { },
+          "ap-south-1" : { },
           "ap-southeast-1" : { },
           "ap-southeast-2" : { },
+          "ca-central-1" : { },
           "eu-central-1" : { },
+          "eu-north-1" : { },
           "eu-west-1" : { },
+          "eu-west-2" : { },
+          "eu-west-3" : { },
+          "fips-ca-central-1" : {
+            "credentialScope" : {
+              "region" : "ca-central-1"
+            },
+            "hostname" : "datasync-fips.ca-central-1.amazonaws.com"
+          },
+          "fips-us-east-1" : {
+            "credentialScope" : {
+              "region" : "us-east-1"
+            },
+            "hostname" : "datasync-fips.us-east-1.amazonaws.com"
+          },
+          "fips-us-east-2" : {
+            "credentialScope" : {
+              "region" : "us-east-2"
+            },
+            "hostname" : "datasync-fips.us-east-2.amazonaws.com"
+          },
+          "fips-us-west-1" : {
+            "credentialScope" : {
+              "region" : "us-west-1"
+            },
+            "hostname" : "datasync-fips.us-west-1.amazonaws.com"
+          },
+          "fips-us-west-2" : {
+            "credentialScope" : {
+              "region" : "us-west-2"
+            },
+            "hostname" : "datasync-fips.us-west-2.amazonaws.com"
+          },
+          "me-south-1" : { },
+          "sa-east-1" : { },
           "us-east-1" : { },
           "us-east-2" : { },
           "us-west-1" : { },
@@ -877,7 +1351,10 @@
           "ap-south-1" : { },
           "ap-southeast-1" : { },
           "ap-southeast-2" : { },
+          "eu-central-1" : { },
           "eu-west-1" : { },
+          "eu-west-2" : { },
+          "eu-west-3" : { },
           "sa-east-1" : { },
           "us-east-1" : { },
           "us-east-2" : { },
@@ -892,6 +1369,7 @@
       },
       "directconnect" : {
         "endpoints" : {
+          "ap-east-1" : { },
           "ap-northeast-1" : { },
           "ap-northeast-2" : { },
           "ap-south-1" : { },
@@ -903,6 +1381,7 @@
           "eu-west-1" : { },
           "eu-west-2" : { },
           "eu-west-3" : { },
+          "me-south-1" : { },
           "sa-east-1" : { },
           "us-east-1" : { },
           "us-east-2" : { },
@@ -912,22 +1391,32 @@
       },
       "discovery" : {
         "endpoints" : {
+          "ap-southeast-2" : { },
+          "eu-central-1" : { },
           "us-west-2" : { }
         }
       },
       "dms" : {
         "endpoints" : {
+          "ap-east-1" : { },
           "ap-northeast-1" : { },
           "ap-northeast-2" : { },
           "ap-south-1" : { },
           "ap-southeast-1" : { },
           "ap-southeast-2" : { },
           "ca-central-1" : { },
+          "dms-fips" : {
+            "credentialScope" : {
+              "region" : "us-west-1"
+            },
+            "hostname" : "dms-fips.us-west-1.amazonaws.com"
+          },
           "eu-central-1" : { },
           "eu-north-1" : { },
           "eu-west-1" : { },
           "eu-west-2" : { },
           "eu-west-3" : { },
+          "me-south-1" : { },
           "sa-east-1" : { },
           "us-east-1" : { },
           "us-east-2" : { },
@@ -937,12 +1426,66 @@
       },
       "docdb" : {
         "endpoints" : {
+          "ap-northeast-1" : {
+            "credentialScope" : {
+              "region" : "ap-northeast-1"
+            },
+            "hostname" : "rds.ap-northeast-1.amazonaws.com"
+          },
+          "ap-northeast-2" : {
+            "credentialScope" : {
+              "region" : "ap-northeast-2"
+            },
+            "hostname" : "rds.ap-northeast-2.amazonaws.com"
+          },
+          "ap-south-1" : {
+            "credentialScope" : {
+              "region" : "ap-south-1"
+            },
+            "hostname" : "rds.ap-south-1.amazonaws.com"
+          },
+          "ap-southeast-1" : {
+            "credentialScope" : {
+              "region" : "ap-southeast-1"
+            },
+            "hostname" : "rds.ap-southeast-1.amazonaws.com"
+          },
+          "ap-southeast-2" : {
+            "credentialScope" : {
+              "region" : "ap-southeast-2"
+            },
+            "hostname" : "rds.ap-southeast-2.amazonaws.com"
+          },
+          "ca-central-1" : {
+            "credentialScope" : {
+              "region" : "ca-central-1"
+            },
+            "hostname" : "rds.ca-central-1.amazonaws.com"
+          },
+          "eu-central-1" : {
+            "credentialScope" : {
+              "region" : "eu-central-1"
+            },
+            "hostname" : "rds.eu-central-1.amazonaws.com"
+          },
           "eu-west-1" : {
             "credentialScope" : {
               "region" : "eu-west-1"
             },
             "hostname" : "rds.eu-west-1.amazonaws.com"
           },
+          "eu-west-2" : {
+            "credentialScope" : {
+              "region" : "eu-west-2"
+            },
+            "hostname" : "rds.eu-west-2.amazonaws.com"
+          },
+          "eu-west-3" : {
+            "credentialScope" : {
+              "region" : "eu-west-3"
+            },
+            "hostname" : "rds.eu-west-3.amazonaws.com"
+          },
           "us-east-1" : {
             "credentialScope" : {
               "region" : "us-east-1"
@@ -965,6 +1508,7 @@
       },
       "ds" : {
         "endpoints" : {
+          "ap-east-1" : { },
           "ap-northeast-1" : { },
           "ap-northeast-2" : { },
           "ap-south-1" : { },
@@ -972,8 +1516,11 @@
           "ap-southeast-2" : { },
           "ca-central-1" : { },
           "eu-central-1" : { },
+          "eu-north-1" : { },
           "eu-west-1" : { },
           "eu-west-2" : { },
+          "eu-west-3" : { },
+          "me-south-1" : { },
           "sa-east-1" : { },
           "us-east-1" : { },
           "us-east-2" : { },
@@ -986,12 +1533,19 @@
           "protocols" : [ "http", "https" ]
         },
         "endpoints" : {
+          "ap-east-1" : { },
           "ap-northeast-1" : { },
           "ap-northeast-2" : { },
           "ap-south-1" : { },
           "ap-southeast-1" : { },
           "ap-southeast-2" : { },
           "ca-central-1" : { },
+          "ca-central-1-fips" : {
+            "credentialScope" : {
+              "region" : "ca-central-1"
+            },
+            "hostname" : "dynamodb-fips.ca-central-1.amazonaws.com"
+          },
           "eu-central-1" : { },
           "eu-north-1" : { },
           "eu-west-1" : { },
@@ -1004,11 +1558,36 @@
             "hostname" : "localhost:8000",
             "protocols" : [ "http" ]
           },
+          "me-south-1" : { },
           "sa-east-1" : { },
           "us-east-1" : { },
+          "us-east-1-fips" : {
+            "credentialScope" : {
+              "region" : "us-east-1"
+            },
+            "hostname" : "dynamodb-fips.us-east-1.amazonaws.com"
+          },
           "us-east-2" : { },
+          "us-east-2-fips" : {
+            "credentialScope" : {
+              "region" : "us-east-2"
+            },
+            "hostname" : "dynamodb-fips.us-east-2.amazonaws.com"
+          },
           "us-west-1" : { },
-          "us-west-2" : { }
+          "us-west-1-fips" : {
+            "credentialScope" : {
+              "region" : "us-west-1"
+            },
+            "hostname" : "dynamodb-fips.us-west-1.amazonaws.com"
+          },
+          "us-west-2" : { },
+          "us-west-2-fips" : {
+            "credentialScope" : {
+              "region" : "us-west-2"
+            },
+            "hostname" : "dynamodb-fips.us-west-2.amazonaws.com"
+          }
         }
       },
       "ec2" : {
@@ -1016,6 +1595,7 @@
           "protocols" : [ "http", "https" ]
         },
         "endpoints" : {
+          "ap-east-1" : { },
           "ap-northeast-1" : { },
           "ap-northeast-2" : { },
           "ap-south-1" : { },
@@ -1027,6 +1607,7 @@
           "eu-west-1" : { },
           "eu-west-2" : { },
           "eu-west-3" : { },
+          "me-south-1" : { },
           "sa-east-1" : { },
           "us-east-1" : { },
           "us-east-2" : { },
@@ -1036,6 +1617,7 @@
       },
       "ecs" : {
         "endpoints" : {
+          "ap-east-1" : { },
           "ap-northeast-1" : { },
           "ap-northeast-2" : { },
           "ap-south-1" : { },
@@ -1047,6 +1629,7 @@
           "eu-west-1" : { },
           "eu-west-2" : { },
           "eu-west-3" : { },
+          "me-south-1" : { },
           "sa-east-1" : { },
           "us-east-1" : { },
           "us-east-2" : { },
@@ -1054,25 +1637,49 @@
           "us-west-2" : { }
         }
       },
-      "elasticache" : {
+      "elastic-inference" : {
         "endpoints" : {
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "fips" : {
+          "ap-northeast-1" : {
+            "hostname" : "api.elastic-inference.ap-northeast-1.amazonaws.com"
+          },
+          "ap-northeast-2" : {
+            "hostname" : "api.elastic-inference.ap-northeast-2.amazonaws.com"
+          },
+          "eu-west-1" : {
+            "hostname" : "api.elastic-inference.eu-west-1.amazonaws.com"
+          },
+          "us-east-1" : {
+            "hostname" : "api.elastic-inference.us-east-1.amazonaws.com"
+          },
+          "us-east-2" : {
+            "hostname" : "api.elastic-inference.us-east-2.amazonaws.com"
+          },
+          "us-west-2" : {
+            "hostname" : "api.elastic-inference.us-west-2.amazonaws.com"
+          }
+        }
+      },
+      "elasticache" : {
+        "endpoints" : {
+          "ap-east-1" : { },
+          "ap-northeast-1" : { },
+          "ap-northeast-2" : { },
+          "ap-south-1" : { },
+          "ap-southeast-1" : { },
+          "ap-southeast-2" : { },
+          "ca-central-1" : { },
+          "eu-central-1" : { },
+          "eu-north-1" : { },
+          "eu-west-1" : { },
+          "eu-west-2" : { },
+          "eu-west-3" : { },
+          "fips" : {
             "credentialScope" : {
               "region" : "us-west-1"
             },
             "hostname" : "elasticache-fips.us-west-1.amazonaws.com"
           },
+          "me-south-1" : { },
           "sa-east-1" : { },
           "us-east-1" : { },
           "us-east-2" : { },
@@ -1082,6 +1689,7 @@
       },
       "elasticbeanstalk" : {
         "endpoints" : {
+          "ap-east-1" : { },
           "ap-northeast-1" : { },
           "ap-northeast-2" : { },
           "ap-south-1" : { },
@@ -1093,6 +1701,31 @@
           "eu-west-1" : { },
           "eu-west-2" : { },
           "eu-west-3" : { },
+          "fips-us-east-1" : {
+            "credentialScope" : {
+              "region" : "us-east-1"
+            },
+            "hostname" : "elasticbeanstalk-fips.us-east-1.amazonaws.com"
+          },
+          "fips-us-east-2" : {
+            "credentialScope" : {
+              "region" : "us-east-2"
+            },
+            "hostname" : "elasticbeanstalk-fips.us-east-2.amazonaws.com"
+          },
+          "fips-us-west-1" : {
+            "credentialScope" : {
+              "region" : "us-west-1"
+            },
+            "hostname" : "elasticbeanstalk-fips.us-west-1.amazonaws.com"
+          },
+          "fips-us-west-2" : {
+            "credentialScope" : {
+              "region" : "us-west-2"
+            },
+            "hostname" : "elasticbeanstalk-fips.us-west-2.amazonaws.com"
+          },
+          "me-south-1" : { },
           "sa-east-1" : { },
           "us-east-1" : { },
           "us-east-2" : { },
@@ -1102,13 +1735,20 @@
       },
       "elasticfilesystem" : {
         "endpoints" : {
+          "ap-east-1" : { },
           "ap-northeast-1" : { },
           "ap-northeast-2" : { },
+          "ap-south-1" : { },
           "ap-southeast-1" : { },
           "ap-southeast-2" : { },
+          "ca-central-1" : { },
           "eu-central-1" : { },
+          "eu-north-1" : { },
           "eu-west-1" : { },
           "eu-west-2" : { },
+          "eu-west-3" : { },
+          "me-south-1" : { },
+          "sa-east-1" : { },
           "us-east-1" : { },
           "us-east-2" : { },
           "us-west-1" : { },
@@ -1120,6 +1760,7 @@
           "protocols" : [ "https" ]
         },
         "endpoints" : {
+          "ap-east-1" : { },
           "ap-northeast-1" : { },
           "ap-northeast-2" : { },
           "ap-south-1" : { },
@@ -1131,6 +1772,31 @@
           "eu-west-1" : { },
           "eu-west-2" : { },
           "eu-west-3" : { },
+          "fips-us-east-1" : {
+            "credentialScope" : {
+              "region" : "us-east-1"
+            },
+            "hostname" : "elasticloadbalancing-fips.us-east-1.amazonaws.com"
+          },
+          "fips-us-east-2" : {
+            "credentialScope" : {
+              "region" : "us-east-2"
+            },
+            "hostname" : "elasticloadbalancing-fips.us-east-2.amazonaws.com"
+          },
+          "fips-us-west-1" : {
+            "credentialScope" : {
+              "region" : "us-west-1"
+            },
+            "hostname" : "elasticloadbalancing-fips.us-west-1.amazonaws.com"
+          },
+          "fips-us-west-2" : {
+            "credentialScope" : {
+              "region" : "us-west-2"
+            },
+            "hostname" : "elasticloadbalancing-fips.us-west-2.amazonaws.com"
+          },
+          "me-south-1" : { },
           "sa-east-1" : { },
           "us-east-1" : { },
           "us-east-2" : { },
@@ -1144,6 +1810,7 @@
           "sslCommonName" : "{region}.{service}.{dnsSuffix}"
         },
         "endpoints" : {
+          "ap-east-1" : { },
           "ap-northeast-1" : { },
           "ap-northeast-2" : { },
           "ap-south-1" : { },
@@ -1157,6 +1824,37 @@
           "eu-west-1" : { },
           "eu-west-2" : { },
           "eu-west-3" : { },
+          "fips-ca-central-1" : {
+            "credentialScope" : {
+              "region" : "ca-central-1"
+            },
+            "hostname" : "elasticmapreduce-fips.ca-central-1.amazonaws.com"
+          },
+          "fips-us-east-1" : {
+            "credentialScope" : {
+              "region" : "us-east-1"
+            },
+            "hostname" : "elasticmapreduce-fips.us-east-1.amazonaws.com"
+          },
+          "fips-us-east-2" : {
+            "credentialScope" : {
+              "region" : "us-east-2"
+            },
+            "hostname" : "elasticmapreduce-fips.us-east-2.amazonaws.com"
+          },
+          "fips-us-west-1" : {
+            "credentialScope" : {
+              "region" : "us-west-1"
+            },
+            "hostname" : "elasticmapreduce-fips.us-west-1.amazonaws.com"
+          },
+          "fips-us-west-2" : {
+            "credentialScope" : {
+              "region" : "us-west-2"
+            },
+            "hostname" : "elasticmapreduce-fips.us-west-2.amazonaws.com"
+          },
+          "me-south-1" : { },
           "sa-east-1" : { },
           "us-east-1" : {
             "sslCommonName" : "{service}.{region}.{dnsSuffix}"
@@ -1180,6 +1878,9 @@
       },
       "email" : {
         "endpoints" : {
+          "ap-south-1" : { },
+          "ap-southeast-2" : { },
+          "eu-central-1" : { },
           "eu-west-1" : { },
           "us-east-1" : { },
           "us-west-2" : { }
@@ -1197,6 +1898,7 @@
       },
       "es" : {
         "endpoints" : {
+          "ap-east-1" : { },
           "ap-northeast-1" : { },
           "ap-northeast-2" : { },
           "ap-south-1" : { },
@@ -1208,6 +1910,13 @@
           "eu-west-1" : { },
           "eu-west-2" : { },
           "eu-west-3" : { },
+          "fips" : {
+            "credentialScope" : {
+              "region" : "us-west-1"
+            },
+            "hostname" : "es-fips.us-west-1.amazonaws.com"
+          },
+          "me-south-1" : { },
           "sa-east-1" : { },
           "us-east-1" : { },
           "us-east-2" : { },
@@ -1217,6 +1926,7 @@
       },
       "events" : {
         "endpoints" : {
+          "ap-east-1" : { },
           "ap-northeast-1" : { },
           "ap-northeast-2" : { },
           "ap-south-1" : { },
@@ -1228,6 +1938,31 @@
           "eu-west-1" : { },
           "eu-west-2" : { },
           "eu-west-3" : { },
+          "fips-us-east-1" : {
+            "credentialScope" : {
+              "region" : "us-east-1"
+            },
+            "hostname" : "events-fips.us-east-1.amazonaws.com"
+          },
+          "fips-us-east-2" : {
+            "credentialScope" : {
+              "region" : "us-east-2"
+            },
+            "hostname" : "events-fips.us-east-2.amazonaws.com"
+          },
+          "fips-us-west-1" : {
+            "credentialScope" : {
+              "region" : "us-west-1"
+            },
+            "hostname" : "events-fips.us-west-1.amazonaws.com"
+          },
+          "fips-us-west-2" : {
+            "credentialScope" : {
+              "region" : "us-west-2"
+            },
+            "hostname" : "events-fips.us-west-2.amazonaws.com"
+          },
+          "me-south-1" : { },
           "sa-east-1" : { },
           "us-east-1" : { },
           "us-east-2" : { },
@@ -1237,6 +1972,7 @@
       },
       "firehose" : {
         "endpoints" : {
+          "ap-east-1" : { },
           "ap-northeast-1" : { },
           "ap-northeast-2" : { },
           "ap-south-1" : { },
@@ -1244,9 +1980,35 @@
           "ap-southeast-2" : { },
           "ca-central-1" : { },
           "eu-central-1" : { },
+          "eu-north-1" : { },
           "eu-west-1" : { },
           "eu-west-2" : { },
           "eu-west-3" : { },
+          "fips-us-east-1" : {
+            "credentialScope" : {
+              "region" : "us-east-1"
+            },
+            "hostname" : "firehose-fips.us-east-1.amazonaws.com"
+          },
+          "fips-us-east-2" : {
+            "credentialScope" : {
+              "region" : "us-east-2"
+            },
+            "hostname" : "firehose-fips.us-east-2.amazonaws.com"
+          },
+          "fips-us-west-1" : {
+            "credentialScope" : {
+              "region" : "us-west-1"
+            },
+            "hostname" : "firehose-fips.us-west-1.amazonaws.com"
+          },
+          "fips-us-west-2" : {
+            "credentialScope" : {
+              "region" : "us-west-2"
+            },
+            "hostname" : "firehose-fips.us-west-2.amazonaws.com"
+          },
+          "me-south-1" : { },
           "sa-east-1" : { },
           "us-east-1" : { },
           "us-east-2" : { },
@@ -1260,64 +2022,158 @@
         },
         "endpoints" : {
           "ap-northeast-1" : { },
+          "ap-northeast-2" : { },
+          "ap-south-1" : { },
+          "ap-southeast-1" : { },
           "ap-southeast-2" : { },
+          "ca-central-1" : { },
           "eu-central-1" : { },
+          "eu-north-1" : { },
           "eu-west-1" : { },
+          "eu-west-2" : { },
+          "eu-west-3" : { },
+          "fips-ap-northeast-1" : {
+            "credentialScope" : {
+              "region" : "ap-northeast-1"
+            },
+            "hostname" : "fms-fips.ap-northeast-1.amazonaws.com"
+          },
+          "fips-ap-northeast-2" : {
+            "credentialScope" : {
+              "region" : "ap-northeast-2"
+            },
+            "hostname" : "fms-fips.ap-northeast-2.amazonaws.com"
+          },
+          "fips-ap-south-1" : {
+            "credentialScope" : {
+              "region" : "ap-south-1"
+            },
+            "hostname" : "fms-fips.ap-south-1.amazonaws.com"
+          },
+          "fips-ap-southeast-1" : {
+            "credentialScope" : {
+              "region" : "ap-southeast-1"
+            },
+            "hostname" : "fms-fips.ap-southeast-1.amazonaws.com"
+          },
+          "fips-ap-southeast-2" : {
+            "credentialScope" : {
+              "region" : "ap-southeast-2"
+            },
+            "hostname" : "fms-fips.ap-southeast-2.amazonaws.com"
+          },
+          "fips-ca-central-1" : {
+            "credentialScope" : {
+              "region" : "ca-central-1"
+            },
+            "hostname" : "fms-fips.ca-central-1.amazonaws.com"
+          },
+          "fips-eu-central-1" : {
+            "credentialScope" : {
+              "region" : "eu-central-1"
+            },
+            "hostname" : "fms-fips.eu-central-1.amazonaws.com"
+          },
+          "fips-eu-west-1" : {
+            "credentialScope" : {
+              "region" : "eu-west-1"
+            },
+            "hostname" : "fms-fips.eu-west-1.amazonaws.com"
+          },
+          "fips-eu-west-2" : {
+            "credentialScope" : {
+              "region" : "eu-west-2"
+            },
+            "hostname" : "fms-fips.eu-west-2.amazonaws.com"
+          },
+          "fips-eu-west-3" : {
+            "credentialScope" : {
+              "region" : "eu-west-3"
+            },
+            "hostname" : "fms-fips.eu-west-3.amazonaws.com"
+          },
+          "fips-sa-east-1" : {
+            "credentialScope" : {
+              "region" : "sa-east-1"
+            },
+            "hostname" : "fms-fips.sa-east-1.amazonaws.com"
+          },
+          "fips-us-east-1" : {
+            "credentialScope" : {
+              "region" : "us-east-1"
+            },
+            "hostname" : "fms-fips.us-east-1.amazonaws.com"
+          },
+          "fips-us-east-2" : {
+            "credentialScope" : {
+              "region" : "us-east-2"
+            },
+            "hostname" : "fms-fips.us-east-2.amazonaws.com"
+          },
+          "fips-us-west-1" : {
+            "credentialScope" : {
+              "region" : "us-west-1"
+            },
+            "hostname" : "fms-fips.us-west-1.amazonaws.com"
+          },
+          "fips-us-west-2" : {
+            "credentialScope" : {
+              "region" : "us-west-2"
+            },
+            "hostname" : "fms-fips.us-west-2.amazonaws.com"
+          },
+          "sa-east-1" : { },
           "us-east-1" : { },
           "us-east-2" : { },
+          "us-west-1" : { },
           "us-west-2" : { }
         }
       },
-      "fsx" : {
+      "forecast" : {
         "endpoints" : {
+          "ap-northeast-1" : { },
+          "ap-northeast-2" : { },
+          "ap-south-1" : { },
+          "ap-southeast-1" : { },
+          "ap-southeast-2" : { },
+          "eu-central-1" : { },
           "eu-west-1" : { },
           "us-east-1" : { },
           "us-east-2" : { },
           "us-west-2" : { }
         }
       },
-      "gamelift" : {
+      "forecastquery" : {
         "endpoints" : {
           "ap-northeast-1" : { },
           "ap-northeast-2" : { },
           "ap-south-1" : { },
           "ap-southeast-1" : { },
           "ap-southeast-2" : { },
-          "ca-central-1" : { },
           "eu-central-1" : { },
           "eu-west-1" : { },
-          "eu-west-2" : { },
-          "sa-east-1" : { },
           "us-east-1" : { },
           "us-east-2" : { },
-          "us-west-1" : { },
           "us-west-2" : { }
         }
       },
-      "glacier" : {
-        "defaults" : {
-          "protocols" : [ "http", "https" ]
-        },
+      "fsx" : {
         "endpoints" : {
+          "ap-east-1" : { },
           "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-south-1" : { },
           "ap-southeast-1" : { },
           "ap-southeast-2" : { },
-          "ca-central-1" : { },
           "eu-central-1" : { },
           "eu-north-1" : { },
           "eu-west-1" : { },
           "eu-west-2" : { },
-          "eu-west-3" : { },
-          "sa-east-1" : { },
           "us-east-1" : { },
           "us-east-2" : { },
           "us-west-1" : { },
           "us-west-2" : { }
         }
       },
-      "glue" : {
+      "gamelift" : {
         "endpoints" : {
           "ap-northeast-1" : { },
           "ap-northeast-2" : { },
@@ -1328,32 +2184,123 @@
           "eu-central-1" : { },
           "eu-west-1" : { },
           "eu-west-2" : { },
-          "eu-west-3" : { },
+          "sa-east-1" : { },
           "us-east-1" : { },
           "us-east-2" : { },
           "us-west-1" : { },
           "us-west-2" : { }
         }
       },
-      "greengrass" : {
+      "glacier" : {
         "defaults" : {
-          "protocols" : [ "https" ]
+          "protocols" : [ "http", "https" ]
         },
         "endpoints" : {
+          "ap-east-1" : { },
           "ap-northeast-1" : { },
+          "ap-northeast-2" : { },
+          "ap-south-1" : { },
+          "ap-southeast-1" : { },
           "ap-southeast-2" : { },
+          "ca-central-1" : { },
           "eu-central-1" : { },
+          "eu-north-1" : { },
           "eu-west-1" : { },
-          "us-east-1" : { },
-          "us-west-2" : { }
+          "eu-west-2" : { },
+          "eu-west-3" : { },
+          "fips-ca-central-1" : {
+            "credentialScope" : {
+              "region" : "ca-central-1"
+            },
+            "hostname" : "glacier-fips.ca-central-1.amazonaws.com"
+          },
+          "fips-us-east-1" : {
+            "credentialScope" : {
+              "region" : "us-east-1"
+            },
+            "hostname" : "glacier-fips.us-east-1.amazonaws.com"
+          },
+          "fips-us-east-2" : {
+            "credentialScope" : {
+              "region" : "us-east-2"
+            },
+            "hostname" : "glacier-fips.us-east-2.amazonaws.com"
+          },
+          "fips-us-west-1" : {
+            "credentialScope" : {
+              "region" : "us-west-1"
+            },
+            "hostname" : "glacier-fips.us-west-1.amazonaws.com"
+          },
+          "fips-us-west-2" : {
+            "credentialScope" : {
+              "region" : "us-west-2"
+            },
+            "hostname" : "glacier-fips.us-west-2.amazonaws.com"
+          },
+          "me-south-1" : { },
+          "sa-east-1" : { },
+          "us-east-1" : { },
+          "us-east-2" : { },
+          "us-west-1" : { },
+          "us-west-2" : { }
+        }
+      },
+      "glue" : {
+        "endpoints" : {
+          "ap-east-1" : { },
+          "ap-northeast-1" : { },
+          "ap-northeast-2" : { },
+          "ap-south-1" : { },
+          "ap-southeast-1" : { },
+          "ap-southeast-2" : { },
+          "ca-central-1" : { },
+          "eu-central-1" : { },
+          "eu-north-1" : { },
+          "eu-west-1" : { },
+          "eu-west-2" : { },
+          "eu-west-3" : { },
+          "me-south-1" : { },
+          "sa-east-1" : { },
+          "us-east-1" : { },
+          "us-east-2" : { },
+          "us-west-1" : { },
+          "us-west-2" : { }
+        }
+      },
+      "greengrass" : {
+        "defaults" : {
+          "protocols" : [ "https" ]
+        },
+        "endpoints" : {
+          "ap-northeast-1" : { },
+          "ap-northeast-2" : { },
+          "ap-south-1" : { },
+          "ap-southeast-1" : { },
+          "ap-southeast-2" : { },
+          "eu-central-1" : { },
+          "eu-west-1" : { },
+          "eu-west-2" : { },
+          "us-east-1" : { },
+          "us-east-2" : { },
+          "us-west-2" : { }
         },
         "isRegionalized" : true
       },
+      "groundstation" : {
+        "endpoints" : {
+          "eu-north-1" : { },
+          "me-south-1" : { },
+          "us-east-2" : { },
+          "us-west-2" : { }
+        }
+      },
       "guardduty" : {
         "defaults" : {
           "protocols" : [ "https" ]
         },
         "endpoints" : {
+          "ap-east-1" : { },
           "ap-northeast-1" : { },
           "ap-northeast-2" : { },
           "ap-south-1" : { },
@@ -1361,14 +2308,40 @@
           "ap-southeast-2" : { },
           "ca-central-1" : { },
           "eu-central-1" : { },
+          "eu-north-1" : { },
           "eu-west-1" : { },
           "eu-west-2" : { },
           "eu-west-3" : { },
+          "me-south-1" : { },
           "sa-east-1" : { },
           "us-east-1" : { },
+          "us-east-1-fips" : {
+            "credentialScope" : {
+              "region" : "us-east-1"
+            },
+            "hostname" : "guardduty-fips.us-east-1.amazonaws.com"
+          },
           "us-east-2" : { },
+          "us-east-2-fips" : {
+            "credentialScope" : {
+              "region" : "us-east-2"
+            },
+            "hostname" : "guardduty-fips.us-east-2.amazonaws.com"
+          },
           "us-west-1" : { },
-          "us-west-2" : { }
+          "us-west-1-fips" : {
+            "credentialScope" : {
+              "region" : "us-west-1"
+            },
+            "hostname" : "guardduty-fips.us-west-1.amazonaws.com"
+          },
+          "us-west-2" : { },
+          "us-west-2-fips" : {
+            "credentialScope" : {
+              "region" : "us-west-2"
+            },
+            "hostname" : "guardduty-fips.us-west-2.amazonaws.com"
+          }
         },
         "isRegionalized" : true
       },
@@ -1384,6 +2357,12 @@
               "region" : "us-east-1"
             },
             "hostname" : "iam.amazonaws.com"
+          },
+          "iam-fips" : {
+            "credentialScope" : {
+              "region" : "us-east-1"
+            },
+            "hostname" : "iam-fips.amazonaws.com"
           }
         },
         "isRegionalized" : false,
@@ -1410,7 +2389,33 @@
           "ap-south-1" : { },
           "ap-southeast-2" : { },
           "eu-central-1" : { },
+          "eu-north-1" : { },
           "eu-west-1" : { },
+          "eu-west-2" : { },
+          "fips-us-east-1" : {
+            "credentialScope" : {
+              "region" : "us-east-1"
+            },
+            "hostname" : "inspector-fips.us-east-1.amazonaws.com"
+          },
+          "fips-us-east-2" : {
+            "credentialScope" : {
+              "region" : "us-east-2"
+            },
+            "hostname" : "inspector-fips.us-east-2.amazonaws.com"
+          },
+          "fips-us-west-1" : {
+            "credentialScope" : {
+              "region" : "us-west-1"
+            },
+            "hostname" : "inspector-fips.us-west-1.amazonaws.com"
+          },
+          "fips-us-west-2" : {
+            "credentialScope" : {
+              "region" : "us-west-2"
+            },
+            "hostname" : "inspector-fips.us-west-2.amazonaws.com"
+          },
           "us-east-1" : { },
           "us-east-2" : { },
           "us-west-1" : { },
@@ -1424,16 +2429,23 @@
           }
         },
         "endpoints" : {
+          "ap-east-1" : { },
           "ap-northeast-1" : { },
           "ap-northeast-2" : { },
           "ap-south-1" : { },
           "ap-southeast-1" : { },
           "ap-southeast-2" : { },
+          "ca-central-1" : { },
           "eu-central-1" : { },
+          "eu-north-1" : { },
           "eu-west-1" : { },
           "eu-west-2" : { },
+          "eu-west-3" : { },
+          "me-south-1" : { },
+          "sa-east-1" : { },
           "us-east-1" : { },
           "us-east-2" : { },
+          "us-west-1" : { },
           "us-west-2" : { }
         }
       },
@@ -1447,46 +2459,124 @@
           "us-west-2" : { }
         }
       },
-      "kinesis" : {
+      "iotevents" : {
         "endpoints" : {
           "ap-northeast-1" : { },
           "ap-northeast-2" : { },
-          "ap-south-1" : { },
           "ap-southeast-1" : { },
           "ap-southeast-2" : { },
-          "ca-central-1" : { },
           "eu-central-1" : { },
-          "eu-north-1" : { },
           "eu-west-1" : { },
           "eu-west-2" : { },
-          "eu-west-3" : { },
-          "sa-east-1" : { },
           "us-east-1" : { },
           "us-east-2" : { },
-          "us-west-1" : { },
           "us-west-2" : { }
         }
       },
-      "kinesisanalytics" : {
+      "ioteventsdata" : {
+        "endpoints" : {
+          "ap-northeast-1" : {
+            "credentialScope" : {
+              "region" : "ap-northeast-1"
+            },
+            "hostname" : "data.iotevents.ap-northeast-1.amazonaws.com"
+          },
+          "ap-northeast-2" : {
+            "credentialScope" : {
+              "region" : "ap-northeast-2"
+            },
+            "hostname" : "data.iotevents.ap-northeast-2.amazonaws.com"
+          },
+          "ap-southeast-1" : {
+            "credentialScope" : {
+              "region" : "ap-southeast-1"
+            },
+            "hostname" : "data.iotevents.ap-southeast-1.amazonaws.com"
+          },
+          "ap-southeast-2" : {
+            "credentialScope" : {
+              "region" : "ap-southeast-2"
+            },
+            "hostname" : "data.iotevents.ap-southeast-2.amazonaws.com"
+          },
+          "eu-central-1" : {
+            "credentialScope" : {
+              "region" : "eu-central-1"
+            },
+            "hostname" : "data.iotevents.eu-central-1.amazonaws.com"
+          },
+          "eu-west-1" : {
+            "credentialScope" : {
+              "region" : "eu-west-1"
+            },
+            "hostname" : "data.iotevents.eu-west-1.amazonaws.com"
+          },
+          "eu-west-2" : {
+            "credentialScope" : {
+              "region" : "eu-west-2"
+            },
+            "hostname" : "data.iotevents.eu-west-2.amazonaws.com"
+          },
+          "us-east-1" : {
+            "credentialScope" : {
+              "region" : "us-east-1"
+            },
+            "hostname" : "data.iotevents.us-east-1.amazonaws.com"
+          },
+          "us-east-2" : {
+            "credentialScope" : {
+              "region" : "us-east-2"
+            },
+            "hostname" : "data.iotevents.us-east-2.amazonaws.com"
+          },
+          "us-west-2" : {
+            "credentialScope" : {
+              "region" : "us-west-2"
+            },
+            "hostname" : "data.iotevents.us-west-2.amazonaws.com"
+          }
+        }
+      },
+      "iotsecuredtunneling" : {
         "endpoints" : {
+          "ap-east-1" : { },
+          "ap-northeast-1" : { },
+          "ap-northeast-2" : { },
+          "ap-south-1" : { },
+          "ap-southeast-1" : { },
+          "ap-southeast-2" : { },
+          "ca-central-1" : { },
           "eu-central-1" : { },
+          "eu-north-1" : { },
           "eu-west-1" : { },
+          "eu-west-2" : { },
+          "eu-west-3" : { },
+          "me-south-1" : { },
+          "sa-east-1" : { },
           "us-east-1" : { },
           "us-east-2" : { },
+          "us-west-1" : { },
           "us-west-2" : { }
         }
       },
-      "kinesisvideo" : {
+      "iotthingsgraph" : {
+        "defaults" : {
+          "credentialScope" : {
+            "service" : "iotthingsgraph"
+          }
+        },
         "endpoints" : {
           "ap-northeast-1" : { },
-          "eu-central-1" : { },
+          "ap-northeast-2" : { },
+          "ap-southeast-2" : { },
           "eu-west-1" : { },
           "us-east-1" : { },
           "us-west-2" : { }
         }
       },
-      "kms" : {
+      "kafka" : {
         "endpoints" : {
+          "ap-east-1" : { },
           "ap-northeast-1" : { },
           "ap-northeast-2" : { },
           "ap-south-1" : { },
@@ -1498,6 +2588,7 @@
           "eu-west-1" : { },
           "eu-west-2" : { },
           "eu-west-3" : { },
+          "me-south-1" : { },
           "sa-east-1" : { },
           "us-east-1" : { },
           "us-east-2" : { },
@@ -1505,8 +2596,9 @@
           "us-west-2" : { }
         }
       },
-      "lambda" : {
+      "kinesis" : {
         "endpoints" : {
+          "ap-east-1" : { },
           "ap-northeast-1" : { },
           "ap-northeast-2" : { },
           "ap-south-1" : { },
@@ -1518,6 +2610,31 @@
           "eu-west-1" : { },
           "eu-west-2" : { },
           "eu-west-3" : { },
+          "fips-us-east-1" : {
+            "credentialScope" : {
+              "region" : "us-east-1"
+            },
+            "hostname" : "kinesis-fips.us-east-1.amazonaws.com"
+          },
+          "fips-us-east-2" : {
+            "credentialScope" : {
+              "region" : "us-east-2"
+            },
+            "hostname" : "kinesis-fips.us-east-2.amazonaws.com"
+          },
+          "fips-us-west-1" : {
+            "credentialScope" : {
+              "region" : "us-west-1"
+            },
+            "hostname" : "kinesis-fips.us-west-1.amazonaws.com"
+          },
+          "fips-us-west-2" : {
+            "credentialScope" : {
+              "region" : "us-west-2"
+            },
+            "hostname" : "kinesis-fips.us-west-2.amazonaws.com"
+          },
+          "me-south-1" : { },
           "sa-east-1" : { },
           "us-east-1" : { },
           "us-east-2" : { },
@@ -1525,23 +2642,30 @@
           "us-west-2" : { }
         }
       },
-      "license-manager" : {
+      "kinesisanalytics" : {
         "endpoints" : {
+          "ap-east-1" : { },
           "ap-northeast-1" : { },
           "ap-northeast-2" : { },
           "ap-south-1" : { },
           "ap-southeast-1" : { },
           "ap-southeast-2" : { },
+          "ca-central-1" : { },
           "eu-central-1" : { },
+          "eu-north-1" : { },
           "eu-west-1" : { },
           "eu-west-2" : { },
+          "eu-west-3" : { },
+          "me-south-1" : { },
+          "sa-east-1" : { },
           "us-east-1" : { },
           "us-east-2" : { },
           "us-west-2" : { }
         }
       },
-      "lightsail" : {
+      "kinesisvideo" : {
         "endpoints" : {
+          "ap-east-1" : { },
           "ap-northeast-1" : { },
           "ap-northeast-2" : { },
           "ap-south-1" : { },
@@ -1552,13 +2676,15 @@
           "eu-west-1" : { },
           "eu-west-2" : { },
           "eu-west-3" : { },
+          "sa-east-1" : { },
           "us-east-1" : { },
           "us-east-2" : { },
           "us-west-2" : { }
         }
       },
-      "logs" : {
+      "kms" : {
         "endpoints" : {
+          "ap-east-1" : { },
           "ap-northeast-1" : { },
           "ap-northeast-2" : { },
           "ap-south-1" : { },
@@ -1570,6 +2696,7 @@
           "eu-west-1" : { },
           "eu-west-2" : { },
           "eu-west-3" : { },
+          "me-south-1" : { },
           "sa-east-1" : { },
           "us-east-1" : { },
           "us-east-2" : { },
@@ -1577,18 +2704,7 @@
           "us-west-2" : { }
         }
       },
-      "machinelearning" : {
-        "endpoints" : {
-          "eu-west-1" : { },
-          "us-east-1" : { }
-        }
-      },
-      "marketplacecommerceanalytics" : {
-        "endpoints" : {
-          "us-east-1" : { }
-        }
-      },
-      "mediaconvert" : {
+      "lakeformation" : {
         "endpoints" : {
           "ap-northeast-1" : { },
           "ap-northeast-2" : { },
@@ -1599,7 +2715,148 @@
           "eu-central-1" : { },
           "eu-west-1" : { },
           "eu-west-2" : { },
-          "sa-east-1" : { },
+          "us-east-1" : { },
+          "us-east-2" : { },
+          "us-west-1" : { },
+          "us-west-2" : { }
+        }
+      },
+      "lambda" : {
+        "endpoints" : {
+          "ap-east-1" : { },
+          "ap-northeast-1" : { },
+          "ap-northeast-2" : { },
+          "ap-south-1" : { },
+          "ap-southeast-1" : { },
+          "ap-southeast-2" : { },
+          "ca-central-1" : { },
+          "eu-central-1" : { },
+          "eu-north-1" : { },
+          "eu-west-1" : { },
+          "eu-west-2" : { },
+          "eu-west-3" : { },
+          "me-south-1" : { },
+          "sa-east-1" : { },
+          "us-east-1" : { },
+          "us-east-2" : { },
+          "us-west-1" : { },
+          "us-west-2" : { }
+        }
+      },
+      "license-manager" : {
+        "endpoints" : {
+          "ap-east-1" : { },
+          "ap-northeast-1" : { },
+          "ap-northeast-2" : { },
+          "ap-south-1" : { },
+          "ap-southeast-1" : { },
+          "ap-southeast-2" : { },
+          "ca-central-1" : { },
+          "eu-central-1" : { },
+          "eu-north-1" : { },
+          "eu-west-1" : { },
+          "eu-west-2" : { },
+          "eu-west-3" : { },
+          "me-south-1" : { },
+          "sa-east-1" : { },
+          "us-east-1" : { },
+          "us-east-2" : { },
+          "us-west-1" : { },
+          "us-west-2" : { }
+        }
+      },
+      "lightsail" : {
+        "endpoints" : {
+          "ap-northeast-1" : { },
+          "ap-northeast-2" : { },
+          "ap-south-1" : { },
+          "ap-southeast-1" : { },
+          "ap-southeast-2" : { },
+          "ca-central-1" : { },
+          "eu-central-1" : { },
+          "eu-west-1" : { },
+          "eu-west-2" : { },
+          "eu-west-3" : { },
+          "us-east-1" : { },
+          "us-east-2" : { },
+          "us-west-2" : { }
+        }
+      },
+      "logs" : {
+        "endpoints" : {
+          "ap-east-1" : { },
+          "ap-northeast-1" : { },
+          "ap-northeast-2" : { },
+          "ap-south-1" : { },
+          "ap-southeast-1" : { },
+          "ap-southeast-2" : { },
+          "ca-central-1" : { },
+          "eu-central-1" : { },
+          "eu-north-1" : { },
+          "eu-west-1" : { },
+          "eu-west-2" : { },
+          "eu-west-3" : { },
+          "me-south-1" : { },
+          "sa-east-1" : { },
+          "us-east-1" : { },
+          "us-east-2" : { },
+          "us-west-1" : { },
+          "us-west-2" : { }
+        }
+      },
+      "machinelearning" : {
+        "endpoints" : {
+          "eu-west-1" : { },
+          "us-east-1" : { }
+        }
+      },
+      "managedblockchain" : {
+        "endpoints" : {
+          "ap-northeast-1" : { },
+          "ap-northeast-2" : { },
+          "ap-southeast-1" : { },
+          "eu-west-1" : { },
+          "us-east-1" : { }
+        }
+      },
+      "marketplacecommerceanalytics" : {
+        "endpoints" : {
+          "us-east-1" : { }
+        }
+      },
+      "mediaconnect" : {
+        "endpoints" : {
+          "ap-east-1" : { },
+          "ap-northeast-1" : { },
+          "ap-northeast-2" : { },
+          "ap-south-1" : { },
+          "ap-southeast-1" : { },
+          "ap-southeast-2" : { },
+          "eu-central-1" : { },
+          "eu-north-1" : { },
+          "eu-west-1" : { },
+          "eu-west-2" : { },
+          "eu-west-3" : { },
+          "sa-east-1" : { },
+          "us-east-1" : { },
+          "us-east-2" : { },
+          "us-west-1" : { },
+          "us-west-2" : { }
+        }
+      },
+      "mediaconvert" : {
+        "endpoints" : {
+          "ap-northeast-1" : { },
+          "ap-northeast-2" : { },
+          "ap-south-1" : { },
+          "ap-southeast-1" : { },
+          "ap-southeast-2" : { },
+          "ca-central-1" : { },
+          "eu-central-1" : { },
+          "eu-west-1" : { },
+          "eu-west-2" : { },
+          "eu-west-3" : { },
+          "sa-east-1" : { },
           "us-east-1" : { },
           "us-east-2" : { },
           "us-west-1" : { },
@@ -1614,9 +2871,13 @@
           "ap-southeast-1" : { },
           "ap-southeast-2" : { },
           "eu-central-1" : { },
+          "eu-north-1" : { },
           "eu-west-1" : { },
+          "eu-west-2" : { },
+          "eu-west-3" : { },
           "sa-east-1" : { },
           "us-east-1" : { },
+          "us-east-2" : { },
           "us-west-2" : { }
         }
       },
@@ -1629,6 +2890,7 @@
           "ap-southeast-2" : { },
           "eu-central-1" : { },
           "eu-west-1" : { },
+          "eu-west-2" : { },
           "eu-west-3" : { },
           "sa-east-1" : { },
           "us-east-1" : { },
@@ -1642,6 +2904,7 @@
           "ap-northeast-2" : { },
           "ap-southeast-2" : { },
           "eu-central-1" : { },
+          "eu-north-1" : { },
           "eu-west-1" : { },
           "us-east-1" : { },
           "us-west-2" : { }
@@ -1654,6 +2917,7 @@
           }
         },
         "endpoints" : {
+          "ap-east-1" : { },
           "ap-northeast-1" : { },
           "ap-northeast-2" : { },
           "ap-south-1" : { },
@@ -1665,6 +2929,7 @@
           "eu-west-1" : { },
           "eu-west-2" : { },
           "eu-west-3" : { },
+          "me-south-1" : { },
           "sa-east-1" : { },
           "us-east-1" : { },
           "us-east-2" : { },
@@ -1674,6 +2939,8 @@
       },
       "mgh" : {
         "endpoints" : {
+          "ap-southeast-2" : { },
+          "eu-central-1" : { },
           "us-west-2" : { }
         }
       },
@@ -1689,6 +2956,7 @@
           }
         },
         "endpoints" : {
+          "ap-southeast-2" : { },
           "eu-west-1" : { },
           "us-east-1" : { },
           "us-west-2" : { }
@@ -1699,6 +2967,7 @@
           "protocols" : [ "http", "https" ]
         },
         "endpoints" : {
+          "ap-east-1" : { },
           "ap-northeast-1" : { },
           "ap-northeast-2" : { },
           "ap-south-1" : { },
@@ -1710,6 +2979,7 @@
           "eu-west-1" : { },
           "eu-west-2" : { },
           "eu-west-3" : { },
+          "me-south-1" : { },
           "sa-east-1" : { },
           "us-east-1" : { },
           "us-east-2" : { },
@@ -1719,12 +2989,44 @@
       },
       "mq" : {
         "endpoints" : {
+          "ap-east-1" : { },
           "ap-northeast-1" : { },
           "ap-northeast-2" : { },
+          "ap-south-1" : { },
           "ap-southeast-1" : { },
           "ap-southeast-2" : { },
+          "ca-central-1" : { },
           "eu-central-1" : { },
+          "eu-north-1" : { },
           "eu-west-1" : { },
+          "eu-west-2" : { },
+          "eu-west-3" : { },
+          "fips-us-east-1" : {
+            "credentialScope" : {
+              "region" : "us-east-1"
+            },
+            "hostname" : "mq-fips.us-east-1.amazonaws.com"
+          },
+          "fips-us-east-2" : {
+            "credentialScope" : {
+              "region" : "us-east-2"
+            },
+            "hostname" : "mq-fips.us-east-2.amazonaws.com"
+          },
+          "fips-us-west-1" : {
+            "credentialScope" : {
+              "region" : "us-west-1"
+            },
+            "hostname" : "mq-fips.us-west-1.amazonaws.com"
+          },
+          "fips-us-west-2" : {
+            "credentialScope" : {
+              "region" : "us-west-2"
+            },
+            "hostname" : "mq-fips.us-west-2.amazonaws.com"
+          },
+          "me-south-1" : { },
+          "sa-east-1" : { },
           "us-east-1" : { },
           "us-east-2" : { },
           "us-west-1" : { },
@@ -1748,6 +3050,18 @@
             },
             "hostname" : "rds.ap-northeast-1.amazonaws.com"
           },
+          "ap-northeast-2" : {
+            "credentialScope" : {
+              "region" : "ap-northeast-2"
+            },
+            "hostname" : "rds.ap-northeast-2.amazonaws.com"
+          },
+          "ap-south-1" : {
+            "credentialScope" : {
+              "region" : "ap-south-1"
+            },
+            "hostname" : "rds.ap-south-1.amazonaws.com"
+          },
           "ap-southeast-1" : {
             "credentialScope" : {
               "region" : "ap-southeast-1"
@@ -1760,12 +3074,24 @@
             },
             "hostname" : "rds.ap-southeast-2.amazonaws.com"
           },
+          "ca-central-1" : {
+            "credentialScope" : {
+              "region" : "ca-central-1"
+            },
+            "hostname" : "rds.ca-central-1.amazonaws.com"
+          },
           "eu-central-1" : {
             "credentialScope" : {
               "region" : "eu-central-1"
             },
             "hostname" : "rds.eu-central-1.amazonaws.com"
           },
+          "eu-north-1" : {
+            "credentialScope" : {
+              "region" : "eu-north-1"
+            },
+            "hostname" : "rds.eu-north-1.amazonaws.com"
+          },
           "eu-west-1" : {
             "credentialScope" : {
               "region" : "eu-west-1"
@@ -1778,6 +3104,18 @@
             },
             "hostname" : "rds.eu-west-2.amazonaws.com"
           },
+          "eu-west-3" : {
+            "credentialScope" : {
+              "region" : "eu-west-3"
+            },
+            "hostname" : "rds.eu-west-3.amazonaws.com"
+          },
+          "me-south-1" : {
+            "credentialScope" : {
+              "region" : "me-south-1"
+            },
+            "hostname" : "rds.me-south-1.amazonaws.com"
+          },
           "us-east-1" : {
             "credentialScope" : {
               "region" : "us-east-1"
@@ -1798,6 +3136,64 @@
           }
         }
       },
+      "oidc" : {
+        "endpoints" : {
+          "ap-southeast-1" : {
+            "credentialScope" : {
+              "region" : "ap-southeast-1"
+            },
+            "hostname" : "oidc.ap-southeast-1.amazonaws.com"
+          },
+          "ap-southeast-2" : {
+            "credentialScope" : {
+              "region" : "ap-southeast-2"
+            },
+            "hostname" : "oidc.ap-southeast-2.amazonaws.com"
+          },
+          "ca-central-1" : {
+            "credentialScope" : {
+              "region" : "ca-central-1"
+            },
+            "hostname" : "oidc.ca-central-1.amazonaws.com"
+          },
+          "eu-central-1" : {
+            "credentialScope" : {
+              "region" : "eu-central-1"
+            },
+            "hostname" : "oidc.eu-central-1.amazonaws.com"
+          },
+          "eu-west-1" : {
+            "credentialScope" : {
+              "region" : "eu-west-1"
+            },
+            "hostname" : "oidc.eu-west-1.amazonaws.com"
+          },
+          "eu-west-2" : {
+            "credentialScope" : {
+              "region" : "eu-west-2"
+            },
+            "hostname" : "oidc.eu-west-2.amazonaws.com"
+          },
+          "us-east-1" : {
+            "credentialScope" : {
+              "region" : "us-east-1"
+            },
+            "hostname" : "oidc.us-east-1.amazonaws.com"
+          },
+          "us-east-2" : {
+            "credentialScope" : {
+              "region" : "us-east-2"
+            },
+            "hostname" : "oidc.us-east-2.amazonaws.com"
+          },
+          "us-west-2" : {
+            "credentialScope" : {
+              "region" : "us-west-2"
+            },
+            "hostname" : "oidc.us-west-2.amazonaws.com"
+          }
+        }
+      },
       "opsworks" : {
         "endpoints" : {
           "ap-northeast-1" : { },
@@ -1824,24 +3220,68 @@
           "ap-southeast-2" : { },
           "eu-central-1" : { },
           "eu-west-1" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "organizations" : {
-        "endpoints" : {
-          "aws-global" : {
+          "fips-us-east-1" : {
             "credentialScope" : {
               "region" : "us-east-1"
             },
-            "hostname" : "organizations.us-east-1.amazonaws.com"
-          }
+            "hostname" : "opsworks-cm-fips.us-east-1.amazonaws.com"
+          },
+          "fips-us-east-2" : {
+            "credentialScope" : {
+              "region" : "us-east-2"
+            },
+            "hostname" : "opsworks-cm-fips.us-east-2.amazonaws.com"
+          },
+          "fips-us-west-1" : {
+            "credentialScope" : {
+              "region" : "us-west-1"
+            },
+            "hostname" : "opsworks-cm-fips.us-west-1.amazonaws.com"
+          },
+          "fips-us-west-2" : {
+            "credentialScope" : {
+              "region" : "us-west-2"
+            },
+            "hostname" : "opsworks-cm-fips.us-west-2.amazonaws.com"
+          },
+          "us-east-1" : { },
+          "us-east-2" : { },
+          "us-west-1" : { },
+          "us-west-2" : { }
+        }
+      },
+      "organizations" : {
+        "endpoints" : {
+          "aws-global" : {
+            "credentialScope" : {
+              "region" : "us-east-1"
+            },
+            "hostname" : "organizations.us-east-1.amazonaws.com"
+          }
         },
         "isRegionalized" : false,
         "partitionEndpoint" : "aws-global"
       },
+      "outposts" : {
+        "endpoints" : {
+          "ap-east-1" : { },
+          "ap-northeast-1" : { },
+          "ap-northeast-2" : { },
+          "ap-southeast-1" : { },
+          "ap-southeast-2" : { },
+          "ca-central-1" : { },
+          "eu-central-1" : { },
+          "eu-north-1" : { },
+          "eu-west-1" : { },
+          "eu-west-2" : { },
+          "eu-west-3" : { },
+          "me-south-1" : { },
+          "us-east-1" : { },
+          "us-east-2" : { },
+          "us-west-1" : { },
+          "us-west-2" : { }
+        }
+      },
       "pinpoint" : {
         "defaults" : {
           "credentialScope" : {
@@ -1849,14 +3289,167 @@
           }
         },
         "endpoints" : {
+          "ap-south-1" : { },
+          "ap-southeast-2" : { },
+          "eu-central-1" : { },
+          "eu-west-1" : { },
+          "fips-us-east-1" : {
+            "credentialScope" : {
+              "region" : "us-east-1"
+            },
+            "hostname" : "pinpoint-fips.us-east-1.amazonaws.com"
+          },
+          "fips-us-west-2" : {
+            "credentialScope" : {
+              "region" : "us-west-2"
+            },
+            "hostname" : "pinpoint-fips.us-west-2.amazonaws.com"
+          },
+          "us-east-1" : {
+            "credentialScope" : {
+              "region" : "us-east-1"
+            },
+            "hostname" : "pinpoint.us-east-1.amazonaws.com"
+          },
+          "us-west-2" : {
+            "credentialScope" : {
+              "region" : "us-west-2"
+            },
+            "hostname" : "pinpoint.us-west-2.amazonaws.com"
+          }
+        }
+      },
+      "polly" : {
+        "endpoints" : {
+          "ap-east-1" : { },
+          "ap-northeast-1" : { },
+          "ap-northeast-2" : { },
+          "ap-south-1" : { },
+          "ap-southeast-1" : { },
+          "ap-southeast-2" : { },
+          "ca-central-1" : { },
           "eu-central-1" : { },
+          "eu-north-1" : { },
           "eu-west-1" : { },
+          "eu-west-2" : { },
+          "eu-west-3" : { },
+          "fips-us-east-1" : {
+            "credentialScope" : {
+              "region" : "us-east-1"
+            },
+            "hostname" : "polly-fips.us-east-1.amazonaws.com"
+          },
+          "fips-us-east-2" : {
+            "credentialScope" : {
+              "region" : "us-east-2"
+            },
+            "hostname" : "polly-fips.us-east-2.amazonaws.com"
+          },
+          "fips-us-west-1" : {
+            "credentialScope" : {
+              "region" : "us-west-1"
+            },
+            "hostname" : "polly-fips.us-west-1.amazonaws.com"
+          },
+          "fips-us-west-2" : {
+            "credentialScope" : {
+              "region" : "us-west-2"
+            },
+            "hostname" : "polly-fips.us-west-2.amazonaws.com"
+          },
+          "me-south-1" : { },
+          "sa-east-1" : { },
           "us-east-1" : { },
+          "us-east-2" : { },
+          "us-west-1" : { },
           "us-west-2" : { }
         }
       },
-      "polly" : {
+      "portal.sso" : {
+        "endpoints" : {
+          "ap-southeast-1" : {
+            "credentialScope" : {
+              "region" : "ap-southeast-1"
+            },
+            "hostname" : "portal.sso.ap-southeast-1.amazonaws.com"
+          },
+          "ap-southeast-2" : {
+            "credentialScope" : {
+              "region" : "ap-southeast-2"
+            },
+            "hostname" : "portal.sso.ap-southeast-2.amazonaws.com"
+          },
+          "ca-central-1" : {
+            "credentialScope" : {
+              "region" : "ca-central-1"
+            },
+            "hostname" : "portal.sso.ca-central-1.amazonaws.com"
+          },
+          "eu-central-1" : {
+            "credentialScope" : {
+              "region" : "eu-central-1"
+            },
+            "hostname" : "portal.sso.eu-central-1.amazonaws.com"
+          },
+          "eu-west-1" : {
+            "credentialScope" : {
+              "region" : "eu-west-1"
+            },
+            "hostname" : "portal.sso.eu-west-1.amazonaws.com"
+          },
+          "eu-west-2" : {
+            "credentialScope" : {
+              "region" : "eu-west-2"
+            },
+            "hostname" : "portal.sso.eu-west-2.amazonaws.com"
+          },
+          "us-east-1" : {
+            "credentialScope" : {
+              "region" : "us-east-1"
+            },
+            "hostname" : "portal.sso.us-east-1.amazonaws.com"
+          },
+          "us-east-2" : {
+            "credentialScope" : {
+              "region" : "us-east-2"
+            },
+            "hostname" : "portal.sso.us-east-2.amazonaws.com"
+          },
+          "us-west-2" : {
+            "credentialScope" : {
+              "region" : "us-west-2"
+            },
+            "hostname" : "portal.sso.us-west-2.amazonaws.com"
+          }
+        }
+      },
+      "projects.iot1click" : {
+        "endpoints" : {
+          "ap-northeast-1" : { },
+          "eu-central-1" : { },
+          "eu-west-1" : { },
+          "eu-west-2" : { },
+          "us-east-1" : { },
+          "us-east-2" : { },
+          "us-west-2" : { }
+        }
+      },
+      "qldb" : {
+        "endpoints" : {
+          "ap-northeast-1" : { },
+          "ap-northeast-2" : { },
+          "ap-southeast-1" : { },
+          "ap-southeast-2" : { },
+          "eu-central-1" : { },
+          "eu-west-1" : { },
+          "us-east-1" : { },
+          "us-east-2" : { },
+          "us-west-2" : { }
+        }
+      },
+      "ram" : {
         "endpoints" : {
+          "ap-east-1" : { },
           "ap-northeast-1" : { },
           "ap-northeast-2" : { },
           "ap-south-1" : { },
@@ -1864,9 +3457,11 @@
           "ap-southeast-2" : { },
           "ca-central-1" : { },
           "eu-central-1" : { },
+          "eu-north-1" : { },
           "eu-west-1" : { },
           "eu-west-2" : { },
           "eu-west-3" : { },
+          "me-south-1" : { },
           "sa-east-1" : { },
           "us-east-1" : { },
           "us-east-2" : { },
@@ -1876,6 +3471,7 @@
       },
       "rds" : {
         "endpoints" : {
+          "ap-east-1" : { },
           "ap-northeast-1" : { },
           "ap-northeast-2" : { },
           "ap-south-1" : { },
@@ -1887,6 +3483,7 @@
           "eu-west-1" : { },
           "eu-west-2" : { },
           "eu-west-3" : { },
+          "me-south-1" : { },
           "sa-east-1" : { },
           "us-east-1" : {
             "sslCommonName" : "{service}.{dnsSuffix}"
@@ -1898,6 +3495,7 @@
       },
       "redshift" : {
         "endpoints" : {
+          "ap-east-1" : { },
           "ap-northeast-1" : { },
           "ap-northeast-2" : { },
           "ap-south-1" : { },
@@ -1909,6 +3507,37 @@
           "eu-west-1" : { },
           "eu-west-2" : { },
           "eu-west-3" : { },
+          "fips-ca-central-1" : {
+            "credentialScope" : {
+              "region" : "ca-central-1"
+            },
+            "hostname" : "redshift-fips.ca-central-1.amazonaws.com"
+          },
+          "fips-us-east-1" : {
+            "credentialScope" : {
+              "region" : "us-east-1"
+            },
+            "hostname" : "redshift-fips.us-east-1.amazonaws.com"
+          },
+          "fips-us-east-2" : {
+            "credentialScope" : {
+              "region" : "us-east-2"
+            },
+            "hostname" : "redshift-fips.us-east-2.amazonaws.com"
+          },
+          "fips-us-west-1" : {
+            "credentialScope" : {
+              "region" : "us-west-1"
+            },
+            "hostname" : "redshift-fips.us-west-1.amazonaws.com"
+          },
+          "fips-us-west-2" : {
+            "credentialScope" : {
+              "region" : "us-west-2"
+            },
+            "hostname" : "redshift-fips.us-west-2.amazonaws.com"
+          },
+          "me-south-1" : { },
           "sa-east-1" : { },
           "us-east-1" : { },
           "us-east-2" : { },
@@ -1921,15 +3550,20 @@
           "ap-northeast-1" : { },
           "ap-northeast-2" : { },
           "ap-south-1" : { },
+          "ap-southeast-1" : { },
           "ap-southeast-2" : { },
+          "eu-central-1" : { },
           "eu-west-1" : { },
+          "eu-west-2" : { },
           "us-east-1" : { },
           "us-east-2" : { },
+          "us-west-1" : { },
           "us-west-2" : { }
         }
       },
       "resource-groups" : {
         "endpoints" : {
+          "ap-east-1" : { },
           "ap-northeast-1" : { },
           "ap-northeast-2" : { },
           "ap-south-1" : { },
@@ -1941,6 +3575,31 @@
           "eu-west-1" : { },
           "eu-west-2" : { },
           "eu-west-3" : { },
+          "fips-us-east-1" : {
+            "credentialScope" : {
+              "region" : "us-east-1"
+            },
+            "hostname" : "resource-groups-fips.us-east-1.amazonaws.com"
+          },
+          "fips-us-east-2" : {
+            "credentialScope" : {
+              "region" : "us-east-2"
+            },
+            "hostname" : "resource-groups-fips.us-east-2.amazonaws.com"
+          },
+          "fips-us-west-1" : {
+            "credentialScope" : {
+              "region" : "us-west-1"
+            },
+            "hostname" : "resource-groups-fips.us-west-1.amazonaws.com"
+          },
+          "fips-us-west-2" : {
+            "credentialScope" : {
+              "region" : "us-west-2"
+            },
+            "hostname" : "resource-groups-fips.us-west-2.amazonaws.com"
+          },
+          "me-south-1" : { },
           "sa-east-1" : { },
           "us-east-1" : { },
           "us-east-2" : { },
@@ -1950,8 +3609,12 @@
       },
       "robomaker" : {
         "endpoints" : {
+          "ap-northeast-1" : { },
+          "ap-southeast-1" : { },
+          "eu-central-1" : { },
           "eu-west-1" : { },
           "us-east-1" : { },
+          "us-east-2" : { },
           "us-west-2" : { }
         }
       },
@@ -1977,12 +3640,23 @@
           "protocols" : [ "https" ]
         },
         "endpoints" : {
+          "ap-east-1" : { },
           "ap-northeast-1" : { },
+          "ap-northeast-2" : { },
+          "ap-south-1" : { },
           "ap-southeast-1" : { },
           "ap-southeast-2" : { },
+          "ca-central-1" : { },
+          "eu-central-1" : { },
+          "eu-north-1" : { },
           "eu-west-1" : { },
+          "eu-west-2" : { },
+          "eu-west-3" : { },
+          "me-south-1" : { },
+          "sa-east-1" : { },
           "us-east-1" : { },
           "us-east-2" : { },
+          "us-west-1" : { },
           "us-west-2" : { }
         }
       },
@@ -1993,6 +3667,7 @@
           }
         },
         "endpoints" : {
+          "ap-southeast-2" : { },
           "eu-west-1" : { },
           "us-east-1" : { },
           "us-west-2" : { }
@@ -2000,6 +3675,7 @@
       },
       "runtime.sagemaker" : {
         "endpoints" : {
+          "ap-east-1" : { },
           "ap-northeast-1" : { },
           "ap-northeast-2" : { },
           "ap-south-1" : { },
@@ -2007,13 +3683,41 @@
           "ap-southeast-2" : { },
           "ca-central-1" : { },
           "eu-central-1" : { },
+          "eu-north-1" : { },
           "eu-west-1" : { },
           "eu-west-2" : { },
+          "eu-west-3" : { },
+          "me-south-1" : { },
+          "sa-east-1" : { },
           "us-east-1" : { },
+          "us-east-1-fips" : {
+            "credentialScope" : {
+              "region" : "us-east-1"
+            },
+            "hostname" : "runtime-fips.sagemaker.us-east-1.amazonaws.com"
+          },
           "us-east-2" : { },
+          "us-east-2-fips" : {
+            "credentialScope" : {
+              "region" : "us-east-2"
+            },
+            "hostname" : "runtime-fips.sagemaker.us-east-2.amazonaws.com"
+          },
           "us-west-1" : { },
-          "us-west-2" : { }
-        }
+          "us-west-1-fips" : {
+            "credentialScope" : {
+              "region" : "us-west-1"
+            },
+            "hostname" : "runtime-fips.sagemaker.us-west-1.amazonaws.com"
+          },
+          "us-west-2" : { },
+          "us-west-2-fips" : {
+            "credentialScope" : {
+              "region" : "us-west-2"
+            },
+            "hostname" : "runtime-fips.sagemaker.us-west-2.amazonaws.com"
+          }
+        }
       },
       "s3" : {
         "defaults" : {
@@ -2021,6 +3725,7 @@
           "signatureVersions" : [ "s3v4" ]
         },
         "endpoints" : {
+          "ap-east-1" : { },
           "ap-northeast-1" : {
             "hostname" : "s3.ap-northeast-1.amazonaws.com",
             "signatureVersions" : [ "s3", "s3v4" ]
@@ -2035,6 +3740,13 @@
             "hostname" : "s3.ap-southeast-2.amazonaws.com",
             "signatureVersions" : [ "s3", "s3v4" ]
           },
+          "aws-global" : {
+            "credentialScope" : {
+              "region" : "us-east-1"
+            },
+            "hostname" : "s3.amazonaws.com",
+            "signatureVersions" : [ "s3", "s3v4" ]
+          },
           "ca-central-1" : { },
           "eu-central-1" : { },
           "eu-north-1" : { },
@@ -2044,6 +3756,7 @@
           },
           "eu-west-2" : { },
           "eu-west-3" : { },
+          "me-south-1" : { },
           "s3-external-1" : {
             "credentialScope" : {
               "region" : "us-east-1"
@@ -2056,7 +3769,7 @@
             "signatureVersions" : [ "s3", "s3v4" ]
           },
           "us-east-1" : {
-            "hostname" : "s3.amazonaws.com",
+            "hostname" : "s3.us-east-1.amazonaws.com",
             "signatureVersions" : [ "s3", "s3v4" ]
           },
           "us-east-2" : { },
@@ -2070,7 +3783,7 @@
           }
         },
         "isRegionalized" : true,
-        "partitionEndpoint" : "us-east-1"
+        "partitionEndpoint" : "aws-global"
       },
       "s3-control" : {
         "defaults" : {
@@ -2220,6 +3933,27 @@
           }
         }
       },
+      "savingsplans" : {
+        "endpoints" : {
+          "aws-global" : {
+            "credentialScope" : {
+              "region" : "us-east-1"
+            },
+            "hostname" : "savingsplans.amazonaws.com"
+          }
+        },
+        "isRegionalized" : false,
+        "partitionEndpoint" : "aws-global"
+      },
+      "schemas" : {
+        "endpoints" : {
+          "ap-northeast-1" : { },
+          "eu-west-1" : { },
+          "us-east-1" : { },
+          "us-east-2" : { },
+          "us-west-2" : { }
+        }
+      },
       "sdb" : {
         "defaults" : {
           "protocols" : [ "http", "https" ],
@@ -2240,6 +3974,7 @@
       },
       "secretsmanager" : {
         "endpoints" : {
+          "ap-east-1" : { },
           "ap-northeast-1" : { },
           "ap-northeast-2" : { },
           "ap-south-1" : { },
@@ -2247,9 +3982,11 @@
           "ap-southeast-2" : { },
           "ca-central-1" : { },
           "eu-central-1" : { },
+          "eu-north-1" : { },
           "eu-west-1" : { },
           "eu-west-2" : { },
           "eu-west-3" : { },
+          "me-south-1" : { },
           "sa-east-1" : { },
           "us-east-1" : { },
           "us-east-1-fips" : {
@@ -2283,6 +4020,7 @@
       },
       "securityhub" : {
         "endpoints" : {
+          "ap-east-1" : { },
           "ap-northeast-1" : { },
           "ap-northeast-2" : { },
           "ap-south-1" : { },
@@ -2290,9 +4028,11 @@
           "ap-southeast-2" : { },
           "ca-central-1" : { },
           "eu-central-1" : { },
+          "eu-north-1" : { },
           "eu-west-1" : { },
           "eu-west-2" : { },
           "eu-west-3" : { },
+          "me-south-1" : { },
           "sa-east-1" : { },
           "us-east-1" : { },
           "us-east-2" : { },
@@ -2305,6 +4045,9 @@
           "protocols" : [ "https" ]
         },
         "endpoints" : {
+          "ap-east-1" : {
+            "protocols" : [ "https" ]
+          },
           "ap-northeast-1" : {
             "protocols" : [ "https" ]
           },
@@ -2326,12 +4069,21 @@
           "eu-central-1" : {
             "protocols" : [ "https" ]
           },
+          "eu-north-1" : {
+            "protocols" : [ "https" ]
+          },
           "eu-west-1" : {
             "protocols" : [ "https" ]
           },
           "eu-west-2" : {
             "protocols" : [ "https" ]
           },
+          "eu-west-3" : {
+            "protocols" : [ "https" ]
+          },
+          "me-south-1" : {
+            "protocols" : [ "https" ]
+          },
           "sa-east-1" : {
             "protocols" : [ "https" ]
           },
@@ -2351,6 +4103,7 @@
       },
       "servicecatalog" : {
         "endpoints" : {
+          "ap-east-1" : { },
           "ap-northeast-1" : { },
           "ap-northeast-2" : { },
           "ap-south-1" : { },
@@ -2362,6 +4115,7 @@
           "eu-west-1" : { },
           "eu-west-2" : { },
           "eu-west-3" : { },
+          "me-south-1" : { },
           "sa-east-1" : { },
           "us-east-1" : { },
           "us-east-1-fips" : {
@@ -2395,6 +4149,7 @@
       },
       "servicediscovery" : {
         "endpoints" : {
+          "ap-east-1" : { },
           "ap-northeast-1" : { },
           "ap-northeast-2" : { },
           "ap-south-1" : { },
@@ -2402,9 +4157,11 @@
           "ap-southeast-2" : { },
           "ca-central-1" : { },
           "eu-central-1" : { },
+          "eu-north-1" : { },
           "eu-west-1" : { },
           "eu-west-2" : { },
           "eu-west-3" : { },
+          "me-south-1" : { },
           "sa-east-1" : { },
           "us-east-1" : { },
           "us-east-2" : { },
@@ -2412,6 +4169,19 @@
           "us-west-2" : { }
         }
       },
+      "session.qldb" : {
+        "endpoints" : {
+          "ap-northeast-1" : { },
+          "ap-northeast-2" : { },
+          "ap-southeast-1" : { },
+          "ap-southeast-2" : { },
+          "eu-central-1" : { },
+          "eu-west-1" : { },
+          "us-east-1" : { },
+          "us-east-2" : { },
+          "us-west-2" : { }
+        }
+      },
       "shield" : {
         "defaults" : {
           "protocols" : [ "https" ],
@@ -2424,6 +4194,7 @@
       },
       "sms" : {
         "endpoints" : {
+          "ap-east-1" : { },
           "ap-northeast-1" : { },
           "ap-northeast-2" : { },
           "ap-south-1" : { },
@@ -2431,9 +4202,35 @@
           "ap-southeast-2" : { },
           "ca-central-1" : { },
           "eu-central-1" : { },
+          "eu-north-1" : { },
           "eu-west-1" : { },
           "eu-west-2" : { },
           "eu-west-3" : { },
+          "fips-us-east-1" : {
+            "credentialScope" : {
+              "region" : "us-east-1"
+            },
+            "hostname" : "sms-fips.us-east-1.amazonaws.com"
+          },
+          "fips-us-east-2" : {
+            "credentialScope" : {
+              "region" : "us-east-2"
+            },
+            "hostname" : "sms-fips.us-east-2.amazonaws.com"
+          },
+          "fips-us-west-1" : {
+            "credentialScope" : {
+              "region" : "us-west-1"
+            },
+            "hostname" : "sms-fips.us-west-1.amazonaws.com"
+          },
+          "fips-us-west-2" : {
+            "credentialScope" : {
+              "region" : "us-west-2"
+            },
+            "hostname" : "sms-fips.us-west-2.amazonaws.com"
+          },
+          "me-south-1" : { },
           "sa-east-1" : { },
           "us-east-1" : { },
           "us-east-2" : { },
@@ -2444,6 +4241,7 @@
       "snowball" : {
         "endpoints" : {
           "ap-northeast-1" : { },
+          "ap-northeast-2" : { },
           "ap-south-1" : { },
           "ap-southeast-1" : { },
           "ap-southeast-2" : { },
@@ -2452,6 +4250,96 @@
           "eu-west-1" : { },
           "eu-west-2" : { },
           "eu-west-3" : { },
+          "fips-ap-northeast-1" : {
+            "credentialScope" : {
+              "region" : "ap-northeast-1"
+            },
+            "hostname" : "snowball-fips.ap-northeast-1.amazonaws.com"
+          },
+          "fips-ap-northeast-2" : {
+            "credentialScope" : {
+              "region" : "ap-northeast-2"
+            },
+            "hostname" : "snowball-fips.ap-northeast-2.amazonaws.com"
+          },
+          "fips-ap-south-1" : {
+            "credentialScope" : {
+              "region" : "ap-south-1"
+            },
+            "hostname" : "snowball-fips.ap-south-1.amazonaws.com"
+          },
+          "fips-ap-southeast-1" : {
+            "credentialScope" : {
+              "region" : "ap-southeast-1"
+            },
+            "hostname" : "snowball-fips.ap-southeast-1.amazonaws.com"
+          },
+          "fips-ap-southeast-2" : {
+            "credentialScope" : {
+              "region" : "ap-southeast-2"
+            },
+            "hostname" : "snowball-fips.ap-southeast-2.amazonaws.com"
+          },
+          "fips-ca-central-1" : {
+            "credentialScope" : {
+              "region" : "ca-central-1"
+            },
+            "hostname" : "snowball-fips.ca-central-1.amazonaws.com"
+          },
+          "fips-eu-central-1" : {
+            "credentialScope" : {
+              "region" : "eu-central-1"
+            },
+            "hostname" : "snowball-fips.eu-central-1.amazonaws.com"
+          },
+          "fips-eu-west-1" : {
+            "credentialScope" : {
+              "region" : "eu-west-1"
+            },
+            "hostname" : "snowball-fips.eu-west-1.amazonaws.com"
+          },
+          "fips-eu-west-2" : {
+            "credentialScope" : {
+              "region" : "eu-west-2"
+            },
+            "hostname" : "snowball-fips.eu-west-2.amazonaws.com"
+          },
+          "fips-eu-west-3" : {
+            "credentialScope" : {
+              "region" : "eu-west-3"
+            },
+            "hostname" : "snowball-fips.eu-west-3.amazonaws.com"
+          },
+          "fips-sa-east-1" : {
+            "credentialScope" : {
+              "region" : "sa-east-1"
+            },
+            "hostname" : "snowball-fips.sa-east-1.amazonaws.com"
+          },
+          "fips-us-east-1" : {
+            "credentialScope" : {
+              "region" : "us-east-1"
+            },
+            "hostname" : "snowball-fips.us-east-1.amazonaws.com"
+          },
+          "fips-us-east-2" : {
+            "credentialScope" : {
+              "region" : "us-east-2"
+            },
+            "hostname" : "snowball-fips.us-east-2.amazonaws.com"
+          },
+          "fips-us-west-1" : {
+            "credentialScope" : {
+              "region" : "us-west-1"
+            },
+            "hostname" : "snowball-fips.us-west-1.amazonaws.com"
+          },
+          "fips-us-west-2" : {
+            "credentialScope" : {
+              "region" : "us-west-2"
+            },
+            "hostname" : "snowball-fips.us-west-2.amazonaws.com"
+          },
           "sa-east-1" : { },
           "us-east-1" : { },
           "us-east-2" : { },
@@ -2464,6 +4352,7 @@
           "protocols" : [ "http", "https" ]
         },
         "endpoints" : {
+          "ap-east-1" : { },
           "ap-northeast-1" : { },
           "ap-northeast-2" : { },
           "ap-south-1" : { },
@@ -2475,6 +4364,31 @@
           "eu-west-1" : { },
           "eu-west-2" : { },
           "eu-west-3" : { },
+          "fips-us-east-1" : {
+            "credentialScope" : {
+              "region" : "us-east-1"
+            },
+            "hostname" : "sns-fips.us-east-1.amazonaws.com"
+          },
+          "fips-us-east-2" : {
+            "credentialScope" : {
+              "region" : "us-east-2"
+            },
+            "hostname" : "sns-fips.us-east-2.amazonaws.com"
+          },
+          "fips-us-west-1" : {
+            "credentialScope" : {
+              "region" : "us-west-1"
+            },
+            "hostname" : "sns-fips.us-west-1.amazonaws.com"
+          },
+          "fips-us-west-2" : {
+            "credentialScope" : {
+              "region" : "us-west-2"
+            },
+            "hostname" : "sns-fips.us-west-2.amazonaws.com"
+          },
+          "me-south-1" : { },
           "sa-east-1" : { },
           "us-east-1" : { },
           "us-east-2" : { },
@@ -2488,6 +4402,7 @@
           "sslCommonName" : "{region}.queue.{dnsSuffix}"
         },
         "endpoints" : {
+          "ap-east-1" : { },
           "ap-northeast-1" : { },
           "ap-northeast-2" : { },
           "ap-south-1" : { },
@@ -2523,6 +4438,7 @@
             },
             "hostname" : "sqs-fips.us-west-2.amazonaws.com"
           },
+          "me-south-1" : { },
           "sa-east-1" : { },
           "us-east-1" : {
             "sslCommonName" : "queue.{dnsSuffix}"
@@ -2534,6 +4450,7 @@
       },
       "ssm" : {
         "endpoints" : {
+          "ap-east-1" : { },
           "ap-northeast-1" : { },
           "ap-northeast-2" : { },
           "ap-south-1" : { },
@@ -2545,7 +4462,56 @@
           "eu-west-1" : { },
           "eu-west-2" : { },
           "eu-west-3" : { },
+          "fips-us-east-1" : {
+            "credentialScope" : {
+              "region" : "us-east-1"
+            },
+            "hostname" : "ssm-fips.us-east-1.amazonaws.com"
+          },
+          "fips-us-east-2" : {
+            "credentialScope" : {
+              "region" : "us-east-2"
+            },
+            "hostname" : "ssm-fips.us-east-2.amazonaws.com"
+          },
+          "fips-us-west-1" : {
+            "credentialScope" : {
+              "region" : "us-west-1"
+            },
+            "hostname" : "ssm-fips.us-west-1.amazonaws.com"
+          },
+          "fips-us-west-2" : {
+            "credentialScope" : {
+              "region" : "us-west-2"
+            },
+            "hostname" : "ssm-fips.us-west-2.amazonaws.com"
+          },
+          "me-south-1" : { },
           "sa-east-1" : { },
+          "ssm-facade-fips-us-east-1" : {
+            "credentialScope" : {
+              "region" : "us-east-1"
+            },
+            "hostname" : "ssm-facade-fips.us-east-1.amazonaws.com"
+          },
+          "ssm-facade-fips-us-east-2" : {
+            "credentialScope" : {
+              "region" : "us-east-2"
+            },
+            "hostname" : "ssm-facade-fips.us-east-2.amazonaws.com"
+          },
+          "ssm-facade-fips-us-west-1" : {
+            "credentialScope" : {
+              "region" : "us-west-1"
+            },
+            "hostname" : "ssm-facade-fips.us-west-1.amazonaws.com"
+          },
+          "ssm-facade-fips-us-west-2" : {
+            "credentialScope" : {
+              "region" : "us-west-2"
+            },
+            "hostname" : "ssm-facade-fips.us-west-2.amazonaws.com"
+          },
           "us-east-1" : { },
           "us-east-2" : { },
           "us-west-1" : { },
@@ -2554,6 +4520,7 @@
       },
       "states" : {
         "endpoints" : {
+          "ap-east-1" : { },
           "ap-northeast-1" : { },
           "ap-northeast-2" : { },
           "ap-south-1" : { },
@@ -2565,6 +4532,31 @@
           "eu-west-1" : { },
           "eu-west-2" : { },
           "eu-west-3" : { },
+          "fips-us-east-1" : {
+            "credentialScope" : {
+              "region" : "us-east-1"
+            },
+            "hostname" : "states-fips.us-east-1.amazonaws.com"
+          },
+          "fips-us-east-2" : {
+            "credentialScope" : {
+              "region" : "us-east-2"
+            },
+            "hostname" : "states-fips.us-east-2.amazonaws.com"
+          },
+          "fips-us-west-1" : {
+            "credentialScope" : {
+              "region" : "us-west-1"
+            },
+            "hostname" : "states-fips.us-west-1.amazonaws.com"
+          },
+          "fips-us-west-2" : {
+            "credentialScope" : {
+              "region" : "us-west-2"
+            },
+            "hostname" : "states-fips.us-west-2.amazonaws.com"
+          },
+          "me-south-1" : { },
           "sa-east-1" : { },
           "us-east-1" : { },
           "us-east-2" : { },
@@ -2574,6 +4566,7 @@
       },
       "storagegateway" : {
         "endpoints" : {
+          "ap-east-1" : { },
           "ap-northeast-1" : { },
           "ap-northeast-2" : { },
           "ap-south-1" : { },
@@ -2585,6 +4578,7 @@
           "eu-west-1" : { },
           "eu-west-2" : { },
           "eu-west-3" : { },
+          "me-south-1" : { },
           "sa-east-1" : { },
           "us-east-1" : { },
           "us-east-2" : { },
@@ -2606,6 +4600,12 @@
           "ap-southeast-1" : { },
           "ap-southeast-2" : { },
           "ca-central-1" : { },
+          "ca-central-1-fips" : {
+            "credentialScope" : {
+              "region" : "ca-central-1"
+            },
+            "hostname" : "dynamodb-fips.ca-central-1.amazonaws.com"
+          },
           "eu-central-1" : { },
           "eu-north-1" : { },
           "eu-west-1" : { },
@@ -2618,38 +4618,59 @@
             "hostname" : "localhost:8000",
             "protocols" : [ "http" ]
           },
+          "me-south-1" : { },
           "sa-east-1" : { },
           "us-east-1" : { },
+          "us-east-1-fips" : {
+            "credentialScope" : {
+              "region" : "us-east-1"
+            },
+            "hostname" : "dynamodb-fips.us-east-1.amazonaws.com"
+          },
           "us-east-2" : { },
+          "us-east-2-fips" : {
+            "credentialScope" : {
+              "region" : "us-east-2"
+            },
+            "hostname" : "dynamodb-fips.us-east-2.amazonaws.com"
+          },
           "us-west-1" : { },
-          "us-west-2" : { }
+          "us-west-1-fips" : {
+            "credentialScope" : {
+              "region" : "us-west-1"
+            },
+            "hostname" : "dynamodb-fips.us-west-1.amazonaws.com"
+          },
+          "us-west-2" : { },
+          "us-west-2-fips" : {
+            "credentialScope" : {
+              "region" : "us-west-2"
+            },
+            "hostname" : "dynamodb-fips.us-west-2.amazonaws.com"
+          }
         }
       },
       "sts" : {
-        "defaults" : {
-          "credentialScope" : {
-            "region" : "us-east-1"
-          },
-          "hostname" : "sts.amazonaws.com"
-        },
         "endpoints" : {
+          "ap-east-1" : { },
           "ap-northeast-1" : { },
-          "ap-northeast-2" : {
-            "credentialScope" : {
-              "region" : "ap-northeast-2"
-            },
-            "hostname" : "sts.ap-northeast-2.amazonaws.com"
-          },
+          "ap-northeast-2" : { },
           "ap-south-1" : { },
           "ap-southeast-1" : { },
           "ap-southeast-2" : { },
-          "aws-global" : { },
+          "aws-global" : {
+            "credentialScope" : {
+              "region" : "us-east-1"
+            },
+            "hostname" : "sts.amazonaws.com"
+          },
           "ca-central-1" : { },
           "eu-central-1" : { },
           "eu-north-1" : { },
           "eu-west-1" : { },
           "eu-west-2" : { },
           "eu-west-3" : { },
+          "me-south-1" : { },
           "sa-east-1" : { },
           "us-east-1" : { },
           "us-east-1-fips" : {
@@ -2684,11 +4705,18 @@
       },
       "support" : {
         "endpoints" : {
-          "us-east-1" : { }
-        }
+          "aws-global" : {
+            "credentialScope" : {
+              "region" : "us-east-1"
+            },
+            "hostname" : "support.us-east-1.amazonaws.com"
+          }
+        },
+        "partitionEndpoint" : "aws-global"
       },
       "swf" : {
         "endpoints" : {
+          "ap-east-1" : { },
           "ap-northeast-1" : { },
           "ap-northeast-2" : { },
           "ap-south-1" : { },
@@ -2700,6 +4728,31 @@
           "eu-west-1" : { },
           "eu-west-2" : { },
           "eu-west-3" : { },
+          "fips-us-east-1" : {
+            "credentialScope" : {
+              "region" : "us-east-1"
+            },
+            "hostname" : "swf-fips.us-east-1.amazonaws.com"
+          },
+          "fips-us-east-2" : {
+            "credentialScope" : {
+              "region" : "us-east-2"
+            },
+            "hostname" : "swf-fips.us-east-2.amazonaws.com"
+          },
+          "fips-us-west-1" : {
+            "credentialScope" : {
+              "region" : "us-west-1"
+            },
+            "hostname" : "swf-fips.us-west-1.amazonaws.com"
+          },
+          "fips-us-west-2" : {
+            "credentialScope" : {
+              "region" : "us-west-2"
+            },
+            "hostname" : "swf-fips.us-west-2.amazonaws.com"
+          },
+          "me-south-1" : { },
           "sa-east-1" : { },
           "us-east-1" : { },
           "us-east-2" : { },
@@ -2709,6 +4762,7 @@
       },
       "tagging" : {
         "endpoints" : {
+          "ap-east-1" : { },
           "ap-northeast-1" : { },
           "ap-northeast-2" : { },
           "ap-south-1" : { },
@@ -2720,6 +4774,7 @@
           "eu-west-1" : { },
           "eu-west-2" : { },
           "eu-west-3" : { },
+          "me-south-1" : { },
           "sa-east-1" : { },
           "us-east-1" : { },
           "us-east-2" : { },
@@ -2727,8 +4782,12 @@
           "us-west-2" : { }
         }
       },
-      "transfer" : {
+      "transcribe" : {
+        "defaults" : {
+          "protocols" : [ "https" ]
+        },
         "endpoints" : {
+          "ap-east-1" : { },
           "ap-northeast-1" : { },
           "ap-northeast-2" : { },
           "ap-south-1" : { },
@@ -2739,102 +4798,74 @@
           "eu-west-1" : { },
           "eu-west-2" : { },
           "eu-west-3" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "translate" : {
-        "defaults" : {
-          "protocols" : [ "https" ]
-        },
-        "endpoints" : {
-          "eu-west-1" : { },
-          "us-east-1" : { },
-          "us-east-1-fips" : {
+          "fips-us-east-1" : {
             "credentialScope" : {
               "region" : "us-east-1"
             },
-            "hostname" : "translate-fips.us-east-1.amazonaws.com"
+            "hostname" : "fips.transcribe.us-east-1.amazonaws.com"
           },
-          "us-east-2" : { },
-          "us-east-2-fips" : {
+          "fips-us-east-2" : {
             "credentialScope" : {
               "region" : "us-east-2"
             },
-            "hostname" : "translate-fips.us-east-2.amazonaws.com"
+            "hostname" : "fips.transcribe.us-east-2.amazonaws.com"
           },
-          "us-west-2" : { },
-          "us-west-2-fips" : {
+          "fips-us-west-1" : {
             "credentialScope" : {
-              "region" : "us-west-2"
+              "region" : "us-west-1"
             },
-            "hostname" : "translate-fips.us-west-2.amazonaws.com"
-          }
-        }
-      },
-      "waf" : {
-        "endpoints" : {
-          "aws-global" : {
+            "hostname" : "fips.transcribe.us-west-1.amazonaws.com"
+          },
+          "fips-us-west-2" : {
             "credentialScope" : {
-              "region" : "us-east-1"
+              "region" : "us-west-2"
             },
-            "hostname" : "waf.amazonaws.com"
-          }
-        },
-        "isRegionalized" : false,
-        "partitionEndpoint" : "aws-global"
-      },
-      "waf-regional" : {
-        "endpoints" : {
-          "ap-northeast-1" : { },
-          "ap-southeast-2" : { },
-          "eu-central-1" : { },
-          "eu-west-1" : { },
+            "hostname" : "fips.transcribe.us-west-2.amazonaws.com"
+          },
+          "me-south-1" : { },
+          "sa-east-1" : { },
           "us-east-1" : { },
           "us-east-2" : { },
           "us-west-1" : { },
           "us-west-2" : { }
         }
       },
-      "workdocs" : {
+      "transcribestreaming" : {
         "endpoints" : {
-          "ap-northeast-1" : { },
-          "ap-southeast-1" : { },
           "ap-southeast-2" : { },
+          "ca-central-1" : { },
           "eu-west-1" : { },
           "us-east-1" : { },
+          "us-east-2" : { },
           "us-west-2" : { }
         }
       },
-      "workmail" : {
-        "defaults" : {
-          "protocols" : [ "https" ]
-        },
-        "endpoints" : {
-          "eu-west-1" : { },
-          "us-east-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "workspaces" : {
+      "transfer" : {
         "endpoints" : {
           "ap-northeast-1" : { },
           "ap-northeast-2" : { },
+          "ap-south-1" : { },
           "ap-southeast-1" : { },
           "ap-southeast-2" : { },
           "ca-central-1" : { },
           "eu-central-1" : { },
+          "eu-north-1" : { },
           "eu-west-1" : { },
           "eu-west-2" : { },
+          "eu-west-3" : { },
           "sa-east-1" : { },
           "us-east-1" : { },
+          "us-east-2" : { },
+          "us-west-1" : { },
           "us-west-2" : { }
         }
       },
-      "xray" : {
+      "translate" : {
+        "defaults" : {
+          "protocols" : [ "https" ]
+        },
         "endpoints" : {
+          "ap-east-1" : { },
           "ap-northeast-1" : { },
           "ap-northeast-2" : { },
           "ap-south-1" : { },
@@ -2846,910 +4877,2409 @@
           "eu-west-1" : { },
           "eu-west-2" : { },
           "eu-west-3" : { },
-          "sa-east-1" : { },
           "us-east-1" : { },
+          "us-east-1-fips" : {
+            "credentialScope" : {
+              "region" : "us-east-1"
+            },
+            "hostname" : "translate-fips.us-east-1.amazonaws.com"
+          },
           "us-east-2" : { },
-          "us-west-1" : { },
-          "us-west-2" : { }
-        }
-      }
-    }
-  }, {
-    "defaults" : {
-      "hostname" : "{service}.{region}.{dnsSuffix}",
-      "protocols" : [ "https" ],
-      "signatureVersions" : [ "v4" ]
-    },
-    "dnsSuffix" : "amazonaws.com.cn",
-    "partition" : "aws-cn",
-    "partitionName" : "AWS China",
-    "regionRegex" : "^cn\\-\\w+\\-\\d+$",
-    "regions" : {
-      "cn-north-1" : {
-        "description" : "China (Beijing)"
-      },
-      "cn-northwest-1" : {
-        "description" : "China (Ningxia)"
-      }
-    },
-    "services" : {
-      "api.ecr" : {
-        "endpoints" : {
-          "cn-north-1" : {
+          "us-east-2-fips" : {
             "credentialScope" : {
-              "region" : "cn-north-1"
+              "region" : "us-east-2"
             },
-            "hostname" : "api.ecr.cn-north-1.amazonaws.com.cn"
+            "hostname" : "translate-fips.us-east-2.amazonaws.com"
           },
-          "cn-northwest-1" : {
+          "us-west-1" : { },
+          "us-west-2" : { },
+          "us-west-2-fips" : {
             "credentialScope" : {
-              "region" : "cn-northwest-1"
+              "region" : "us-west-2"
             },
-            "hostname" : "api.ecr.cn-northwest-1.amazonaws.com.cn"
+            "hostname" : "translate-fips.us-west-2.amazonaws.com"
           }
         }
       },
-      "apigateway" : {
+      "waf" : {
         "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
-        }
-      },
-      "application-autoscaling" : {
-        "defaults" : {
-          "credentialScope" : {
-            "service" : "application-autoscaling"
+          "aws-fips" : {
+            "credentialScope" : {
+              "region" : "us-east-1"
+            },
+            "hostname" : "waf-fips.amazonaws.com"
           },
-          "hostname" : "autoscaling.{region}.amazonaws.com",
-          "protocols" : [ "http", "https" ]
-        },
-        "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
-        }
-      },
-      "autoscaling" : {
-        "defaults" : {
-          "protocols" : [ "http", "https" ]
+          "aws-global" : {
+            "credentialScope" : {
+              "region" : "us-east-1"
+            },
+            "hostname" : "waf.amazonaws.com"
+          }
         },
-        "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
-        }
-      },
-      "cloudformation" : {
-        "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
-        }
-      },
-      "cloudtrail" : {
-        "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
-        }
-      },
-      "codebuild" : {
-        "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
-        }
-      },
-      "codedeploy" : {
-        "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
-        }
-      },
-      "cognito-identity" : {
-        "endpoints" : {
-          "cn-north-1" : { }
-        }
+        "isRegionalized" : false,
+        "partitionEndpoint" : "aws-global"
       },
-      "config" : {
+      "waf-regional" : {
         "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
-        }
-      },
-      "data.iot" : {
-        "defaults" : {
-          "credentialScope" : {
-            "service" : "iotdata"
+          "ap-northeast-1" : {
+            "credentialScope" : {
+              "region" : "ap-northeast-1"
+            },
+            "hostname" : "waf-regional.ap-northeast-1.amazonaws.com"
           },
-          "protocols" : [ "https" ]
-        },
-        "endpoints" : {
-          "cn-north-1" : { }
-        }
-      },
-      "directconnect" : {
-        "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
-        }
+          "ap-northeast-2" : {
+            "credentialScope" : {
+              "region" : "ap-northeast-2"
+            },
+            "hostname" : "waf-regional.ap-northeast-2.amazonaws.com"
+          },
+          "ap-south-1" : {
+            "credentialScope" : {
+              "region" : "ap-south-1"
+            },
+            "hostname" : "waf-regional.ap-south-1.amazonaws.com"
+          },
+          "ap-southeast-1" : {
+            "credentialScope" : {
+              "region" : "ap-southeast-1"
+            },
+            "hostname" : "waf-regional.ap-southeast-1.amazonaws.com"
+          },
+          "ap-southeast-2" : {
+            "credentialScope" : {
+              "region" : "ap-southeast-2"
+            },
+            "hostname" : "waf-regional.ap-southeast-2.amazonaws.com"
+          },
+          "ca-central-1" : {
+            "credentialScope" : {
+              "region" : "ca-central-1"
+            },
+            "hostname" : "waf-regional.ca-central-1.amazonaws.com"
+          },
+          "eu-central-1" : {
+            "credentialScope" : {
+              "region" : "eu-central-1"
+            },
+            "hostname" : "waf-regional.eu-central-1.amazonaws.com"
+          },
+          "eu-north-1" : {
+            "credentialScope" : {
+              "region" : "eu-north-1"
+            },
+            "hostname" : "waf-regional.eu-north-1.amazonaws.com"
+          },
+          "eu-west-1" : {
+            "credentialScope" : {
+              "region" : "eu-west-1"
+            },
+            "hostname" : "waf-regional.eu-west-1.amazonaws.com"
+          },
+          "eu-west-2" : {
+            "credentialScope" : {
+              "region" : "eu-west-2"
+            },
+            "hostname" : "waf-regional.eu-west-2.amazonaws.com"
+          },
+          "eu-west-3" : {
+            "credentialScope" : {
+              "region" : "eu-west-3"
+            },
+            "hostname" : "waf-regional.eu-west-3.amazonaws.com"
+          },
+          "fips-ap-northeast-1" : {
+            "credentialScope" : {
+              "region" : "ap-northeast-1"
+            },
+            "hostname" : "waf-regional-fips.ap-northeast-1.amazonaws.com"
+          },
+          "fips-ap-northeast-2" : {
+            "credentialScope" : {
+              "region" : "ap-northeast-2"
+            },
+            "hostname" : "waf-regional-fips.ap-northeast-2.amazonaws.com"
+          },
+          "fips-ap-south-1" : {
+            "credentialScope" : {
+              "region" : "ap-south-1"
+            },
+            "hostname" : "waf-regional-fips.ap-south-1.amazonaws.com"
+          },
+          "fips-ap-southeast-1" : {
+            "credentialScope" : {
+              "region" : "ap-southeast-1"
+            },
+            "hostname" : "waf-regional-fips.ap-southeast-1.amazonaws.com"
+          },
+          "fips-ap-southeast-2" : {
+            "credentialScope" : {
+              "region" : "ap-southeast-2"
+            },
+            "hostname" : "waf-regional-fips.ap-southeast-2.amazonaws.com"
+          },
+          "fips-ca-central-1" : {
+            "credentialScope" : {
+              "region" : "ca-central-1"
+            },
+            "hostname" : "waf-regional-fips.ca-central-1.amazonaws.com"
+          },
+          "fips-eu-central-1" : {
+            "credentialScope" : {
+              "region" : "eu-central-1"
+            },
+            "hostname" : "waf-regional-fips.eu-central-1.amazonaws.com"
+          },
+          "fips-eu-north-1" : {
+            "credentialScope" : {
+              "region" : "eu-north-1"
+            },
+            "hostname" : "waf-regional-fips.eu-north-1.amazonaws.com"
+          },
+          "fips-eu-west-1" : {
+            "credentialScope" : {
+              "region" : "eu-west-1"
+            },
+            "hostname" : "waf-regional-fips.eu-west-1.amazonaws.com"
+          },
+          "fips-eu-west-2" : {
+            "credentialScope" : {
+              "region" : "eu-west-2"
+            },
+            "hostname" : "waf-regional-fips.eu-west-2.amazonaws.com"
+          },
+          "fips-eu-west-3" : {
+            "credentialScope" : {
+              "region" : "eu-west-3"
+            },
+            "hostname" : "waf-regional-fips.eu-west-3.amazonaws.com"
+          },
+          "fips-sa-east-1" : {
+            "credentialScope" : {
+              "region" : "sa-east-1"
+            },
+            "hostname" : "waf-regional-fips.sa-east-1.amazonaws.com"
+          },
+          "fips-us-east-1" : {
+            "credentialScope" : {
+              "region" : "us-east-1"
+            },
+            "hostname" : "waf-regional-fips.us-east-1.amazonaws.com"
+          },
+          "fips-us-east-2" : {
+            "credentialScope" : {
+              "region" : "us-east-2"
+            },
+            "hostname" : "waf-regional-fips.us-east-2.amazonaws.com"
+          },
+          "fips-us-west-1" : {
+            "credentialScope" : {
+              "region" : "us-west-1"
+            },
+            "hostname" : "waf-regional-fips.us-west-1.amazonaws.com"
+          },
+          "fips-us-west-2" : {
+            "credentialScope" : {
+              "region" : "us-west-2"
+            },
+            "hostname" : "waf-regional-fips.us-west-2.amazonaws.com"
+          },
+          "sa-east-1" : {
+            "credentialScope" : {
+              "region" : "sa-east-1"
+            },
+            "hostname" : "waf-regional.sa-east-1.amazonaws.com"
+          },
+          "us-east-1" : {
+            "credentialScope" : {
+              "region" : "us-east-1"
+            },
+            "hostname" : "waf-regional.us-east-1.amazonaws.com"
+          },
+          "us-east-2" : {
+            "credentialScope" : {
+              "region" : "us-east-2"
+            },
+            "hostname" : "waf-regional.us-east-2.amazonaws.com"
+          },
+          "us-west-1" : {
+            "credentialScope" : {
+              "region" : "us-west-1"
+            },
+            "hostname" : "waf-regional.us-west-1.amazonaws.com"
+          },
+          "us-west-2" : {
+            "credentialScope" : {
+              "region" : "us-west-2"
+            },
+            "hostname" : "waf-regional.us-west-2.amazonaws.com"
+          }
+        }
+      },
+      "workdocs" : {
+        "endpoints" : {
+          "ap-northeast-1" : { },
+          "ap-southeast-1" : { },
+          "ap-southeast-2" : { },
+          "eu-west-1" : { },
+          "us-east-1" : { },
+          "us-west-2" : { }
+        }
+      },
+      "workmail" : {
+        "defaults" : {
+          "protocols" : [ "https" ]
+        },
+        "endpoints" : {
+          "eu-west-1" : { },
+          "us-east-1" : { },
+          "us-west-2" : { }
+        }
+      },
+      "workspaces" : {
+        "endpoints" : {
+          "ap-northeast-1" : { },
+          "ap-northeast-2" : { },
+          "ap-southeast-1" : { },
+          "ap-southeast-2" : { },
+          "ca-central-1" : { },
+          "eu-central-1" : { },
+          "eu-west-1" : { },
+          "eu-west-2" : { },
+          "sa-east-1" : { },
+          "us-east-1" : { },
+          "us-west-2" : { }
+        }
+      },
+      "xray" : {
+        "endpoints" : {
+          "ap-east-1" : { },
+          "ap-northeast-1" : { },
+          "ap-northeast-2" : { },
+          "ap-south-1" : { },
+          "ap-southeast-1" : { },
+          "ap-southeast-2" : { },
+          "ca-central-1" : { },
+          "eu-central-1" : { },
+          "eu-north-1" : { },
+          "eu-west-1" : { },
+          "eu-west-2" : { },
+          "eu-west-3" : { },
+          "me-south-1" : { },
+          "sa-east-1" : { },
+          "us-east-1" : { },
+          "us-east-2" : { },
+          "us-west-1" : { },
+          "us-west-2" : { }
+        }
+      }
+    }
+  }, {
+    "defaults" : {
+      "hostname" : "{service}.{region}.{dnsSuffix}",
+      "protocols" : [ "https" ],
+      "signatureVersions" : [ "v4" ]
+    },
+    "dnsSuffix" : "amazonaws.com.cn",
+    "partition" : "aws-cn",
+    "partitionName" : "AWS China",
+    "regionRegex" : "^cn\\-\\w+\\-\\d+$",
+    "regions" : {
+      "cn-north-1" : {
+        "description" : "China (Beijing)"
+      },
+      "cn-northwest-1" : {
+        "description" : "China (Ningxia)"
+      }
+    },
+    "services" : {
+      "acm" : {
+        "endpoints" : {
+          "cn-north-1" : { },
+          "cn-northwest-1" : { }
+        }
+      },
+      "api.ecr" : {
+        "endpoints" : {
+          "cn-north-1" : {
+            "credentialScope" : {
+              "region" : "cn-north-1"
+            },
+            "hostname" : "api.ecr.cn-north-1.amazonaws.com.cn"
+          },
+          "cn-northwest-1" : {
+            "credentialScope" : {
+              "region" : "cn-northwest-1"
+            },
+            "hostname" : "api.ecr.cn-northwest-1.amazonaws.com.cn"
+          }
+        }
+      },
+      "apigateway" : {
+        "endpoints" : {
+          "cn-north-1" : { },
+          "cn-northwest-1" : { }
+        }
+      },
+      "application-autoscaling" : {
+        "defaults" : {
+          "protocols" : [ "http", "https" ]
+        },
+        "endpoints" : {
+          "cn-north-1" : { },
+          "cn-northwest-1" : { }
+        }
+      },
+      "appsync" : {
+        "endpoints" : {
+          "cn-north-1" : { }
+        }
+      },
+      "athena" : {
+        "endpoints" : {
+          "cn-northwest-1" : { }
+        }
+      },
+      "autoscaling" : {
+        "defaults" : {
+          "protocols" : [ "http", "https" ]
+        },
+        "endpoints" : {
+          "cn-north-1" : { },
+          "cn-northwest-1" : { }
+        }
+      },
+      "backup" : {
+        "endpoints" : {
+          "cn-north-1" : { },
+          "cn-northwest-1" : { }
+        }
+      },
+      "batch" : {
+        "endpoints" : {
+          "cn-north-1" : { },
+          "cn-northwest-1" : { }
+        }
+      },
+      "cloudformation" : {
+        "endpoints" : {
+          "cn-north-1" : { },
+          "cn-northwest-1" : { }
+        }
+      },
+      "cloudfront" : {
+        "endpoints" : {
+          "aws-cn-global" : {
+            "credentialScope" : {
+              "region" : "cn-northwest-1"
+            },
+            "hostname" : "cloudfront.cn-northwest-1.amazonaws.com.cn",
+            "protocols" : [ "http", "https" ]
+          }
+        },
+        "isRegionalized" : false,
+        "partitionEndpoint" : "aws-cn-global"
+      },
+      "cloudtrail" : {
+        "endpoints" : {
+          "cn-north-1" : { },
+          "cn-northwest-1" : { }
+        }
+      },
+      "codebuild" : {
+        "endpoints" : {
+          "cn-north-1" : { },
+          "cn-northwest-1" : { }
+        }
+      },
+      "codedeploy" : {
+        "endpoints" : {
+          "cn-north-1" : { },
+          "cn-northwest-1" : { }
+        }
+      },
+      "cognito-identity" : {
+        "endpoints" : {
+          "cn-north-1" : { }
+        }
+      },
+      "config" : {
+        "endpoints" : {
+          "cn-north-1" : { },
+          "cn-northwest-1" : { }
+        }
+      },
+      "data.iot" : {
+        "defaults" : {
+          "credentialScope" : {
+            "service" : "iotdata"
+          },
+          "protocols" : [ "https" ]
+        },
+        "endpoints" : {
+          "cn-north-1" : { },
+          "cn-northwest-1" : { }
+        }
+      },
+      "dax" : {
+        "endpoints" : {
+          "cn-northwest-1" : { }
+        }
+      },
+      "directconnect" : {
+        "endpoints" : {
+          "cn-north-1" : { },
+          "cn-northwest-1" : { }
+        }
+      },
+      "dms" : {
+        "endpoints" : {
+          "cn-north-1" : { },
+          "cn-northwest-1" : { }
+        }
+      },
+      "ds" : {
+        "endpoints" : {
+          "cn-north-1" : { },
+          "cn-northwest-1" : { }
+        }
+      },
+      "dynamodb" : {
+        "defaults" : {
+          "protocols" : [ "http", "https" ]
+        },
+        "endpoints" : {
+          "cn-north-1" : { },
+          "cn-northwest-1" : { }
+        }
+      },
+      "ec2" : {
+        "defaults" : {
+          "protocols" : [ "http", "https" ]
+        },
+        "endpoints" : {
+          "cn-north-1" : { },
+          "cn-northwest-1" : { }
+        }
+      },
+      "ecs" : {
+        "endpoints" : {
+          "cn-north-1" : { },
+          "cn-northwest-1" : { }
+        }
+      },
+      "elasticache" : {
+        "endpoints" : {
+          "cn-north-1" : { },
+          "cn-northwest-1" : { }
+        }
+      },
+      "elasticbeanstalk" : {
+        "endpoints" : {
+          "cn-north-1" : { },
+          "cn-northwest-1" : { }
+        }
+      },
+      "elasticfilesystem" : {
+        "endpoints" : {
+          "cn-north-1" : { },
+          "cn-northwest-1" : { }
+        }
+      },
+      "elasticloadbalancing" : {
+        "defaults" : {
+          "protocols" : [ "https" ]
+        },
+        "endpoints" : {
+          "cn-north-1" : { },
+          "cn-northwest-1" : { }
+        }
+      },
+      "elasticmapreduce" : {
+        "defaults" : {
+          "protocols" : [ "https" ]
+        },
+        "endpoints" : {
+          "cn-north-1" : { },
+          "cn-northwest-1" : { }
+        }
+      },
+      "es" : {
+        "endpoints" : {
+          "cn-north-1" : { },
+          "cn-northwest-1" : { }
+        }
+      },
+      "events" : {
+        "endpoints" : {
+          "cn-north-1" : { },
+          "cn-northwest-1" : { }
+        }
+      },
+      "firehose" : {
+        "endpoints" : {
+          "cn-north-1" : { },
+          "cn-northwest-1" : { }
+        }
+      },
+      "gamelift" : {
+        "endpoints" : {
+          "cn-north-1" : { }
+        }
+      },
+      "glacier" : {
+        "defaults" : {
+          "protocols" : [ "http", "https" ]
+        },
+        "endpoints" : {
+          "cn-north-1" : { },
+          "cn-northwest-1" : { }
+        }
+      },
+      "glue" : {
+        "endpoints" : {
+          "cn-northwest-1" : { }
+        }
+      },
+      "greengrass" : {
+        "defaults" : {
+          "protocols" : [ "https" ]
+        },
+        "endpoints" : {
+          "cn-north-1" : { }
+        },
+        "isRegionalized" : true
+      },
+      "health" : {
+        "endpoints" : {
+          "cn-north-1" : { },
+          "cn-northwest-1" : { }
+        }
+      },
+      "iam" : {
+        "endpoints" : {
+          "aws-cn-global" : {
+            "credentialScope" : {
+              "region" : "cn-north-1"
+            },
+            "hostname" : "iam.cn-north-1.amazonaws.com.cn"
+          }
+        },
+        "isRegionalized" : false,
+        "partitionEndpoint" : "aws-cn-global"
+      },
+      "iot" : {
+        "defaults" : {
+          "credentialScope" : {
+            "service" : "execute-api"
+          }
+        },
+        "endpoints" : {
+          "cn-north-1" : { },
+          "cn-northwest-1" : { }
+        }
+      },
+      "iotsecuredtunneling" : {
+        "endpoints" : {
+          "cn-north-1" : { },
+          "cn-northwest-1" : { }
+        }
+      },
+      "kinesis" : {
+        "endpoints" : {
+          "cn-north-1" : { },
+          "cn-northwest-1" : { }
+        }
+      },
+      "kms" : {
+        "endpoints" : {
+          "cn-north-1" : { },
+          "cn-northwest-1" : { }
+        }
+      },
+      "lambda" : {
+        "endpoints" : {
+          "cn-north-1" : { },
+          "cn-northwest-1" : { }
+        }
+      },
+      "license-manager" : {
+        "endpoints" : {
+          "cn-north-1" : { },
+          "cn-northwest-1" : { }
+        }
+      },
+      "logs" : {
+        "endpoints" : {
+          "cn-north-1" : { },
+          "cn-northwest-1" : { }
+        }
+      },
+      "mediaconvert" : {
+        "endpoints" : {
+          "cn-northwest-1" : {
+            "credentialScope" : {
+              "region" : "cn-northwest-1"
+            },
+            "hostname" : "subscribe.mediaconvert.cn-northwest-1.amazonaws.com.cn"
+          }
+        }
+      },
+      "monitoring" : {
+        "defaults" : {
+          "protocols" : [ "http", "https" ]
+        },
+        "endpoints" : {
+          "cn-north-1" : { },
+          "cn-northwest-1" : { }
+        }
+      },
+      "neptune" : {
+        "endpoints" : {
+          "cn-northwest-1" : {
+            "credentialScope" : {
+              "region" : "cn-northwest-1"
+            },
+            "hostname" : "rds.cn-northwest-1.amazonaws.com.cn"
+          }
+        }
+      },
+      "polly" : {
+        "endpoints" : {
+          "cn-northwest-1" : { }
+        }
+      },
+      "rds" : {
+        "endpoints" : {
+          "cn-north-1" : { },
+          "cn-northwest-1" : { }
+        }
+      },
+      "redshift" : {
+        "endpoints" : {
+          "cn-north-1" : { },
+          "cn-northwest-1" : { }
+        }
+      },
+      "s3" : {
+        "defaults" : {
+          "protocols" : [ "http", "https" ],
+          "signatureVersions" : [ "s3v4" ]
+        },
+        "endpoints" : {
+          "cn-north-1" : { },
+          "cn-northwest-1" : { }
+        }
+      },
+      "s3-control" : {
+        "defaults" : {
+          "protocols" : [ "https" ],
+          "signatureVersions" : [ "s3v4" ]
+        },
+        "endpoints" : {
+          "cn-north-1" : {
+            "credentialScope" : {
+              "region" : "cn-north-1"
+            },
+            "hostname" : "s3-control.cn-north-1.amazonaws.com.cn",
+            "signatureVersions" : [ "s3v4" ]
+          },
+          "cn-northwest-1" : {
+            "credentialScope" : {
+              "region" : "cn-northwest-1"
+            },
+            "hostname" : "s3-control.cn-northwest-1.amazonaws.com.cn",
+            "signatureVersions" : [ "s3v4" ]
+          }
+        }
+      },
+      "secretsmanager" : {
+        "endpoints" : {
+          "cn-north-1" : { },
+          "cn-northwest-1" : { }
+        }
+      },
+      "serverlessrepo" : {
+        "defaults" : {
+          "protocols" : [ "https" ]
+        },
+        "endpoints" : {
+          "cn-north-1" : {
+            "protocols" : [ "https" ]
+          },
+          "cn-northwest-1" : {
+            "protocols" : [ "https" ]
+          }
+        }
+      },
+      "sms" : {
+        "endpoints" : {
+          "cn-north-1" : { },
+          "cn-northwest-1" : { }
+        }
+      },
+      "snowball" : {
+        "endpoints" : {
+          "cn-north-1" : { },
+          "fips-cn-north-1" : {
+            "credentialScope" : {
+              "region" : "cn-north-1"
+            },
+            "hostname" : "snowball-fips.cn-north-1.amazonaws.com.cn"
+          }
+        }
+      },
+      "sns" : {
+        "defaults" : {
+          "protocols" : [ "http", "https" ]
+        },
+        "endpoints" : {
+          "cn-north-1" : { },
+          "cn-northwest-1" : { }
+        }
+      },
+      "sqs" : {
+        "defaults" : {
+          "protocols" : [ "http", "https" ],
+          "sslCommonName" : "{region}.queue.{dnsSuffix}"
+        },
+        "endpoints" : {
+          "cn-north-1" : { },
+          "cn-northwest-1" : { }
+        }
+      },
+      "ssm" : {
+        "endpoints" : {
+          "cn-north-1" : { },
+          "cn-northwest-1" : { }
+        }
+      },
+      "states" : {
+        "endpoints" : {
+          "cn-north-1" : { },
+          "cn-northwest-1" : { }
+        }
+      },
+      "storagegateway" : {
+        "endpoints" : {
+          "cn-north-1" : { },
+          "cn-northwest-1" : { }
+        }
+      },
+      "streams.dynamodb" : {
+        "defaults" : {
+          "credentialScope" : {
+            "service" : "dynamodb"
+          },
+          "protocols" : [ "http", "https" ]
+        },
+        "endpoints" : {
+          "cn-north-1" : { },
+          "cn-northwest-1" : { }
+        }
+      },
+      "sts" : {
+        "endpoints" : {
+          "cn-north-1" : { },
+          "cn-northwest-1" : { }
+        }
+      },
+      "support" : {
+        "endpoints" : {
+          "aws-cn-global" : {
+            "credentialScope" : {
+              "region" : "cn-north-1"
+            },
+            "hostname" : "support.cn-north-1.amazonaws.com.cn"
+          }
+        },
+        "partitionEndpoint" : "aws-cn-global"
+      },
+      "swf" : {
+        "endpoints" : {
+          "cn-north-1" : { },
+          "cn-northwest-1" : { }
+        }
+      },
+      "tagging" : {
+        "endpoints" : {
+          "cn-north-1" : { },
+          "cn-northwest-1" : { }
+        }
+      },
+      "transcribe" : {
+        "defaults" : {
+          "protocols" : [ "https" ]
+        },
+        "endpoints" : {
+          "cn-north-1" : {
+            "credentialScope" : {
+              "region" : "cn-north-1"
+            },
+            "hostname" : "cn.transcribe.cn-north-1.amazonaws.com.cn"
+          },
+          "cn-northwest-1" : {
+            "credentialScope" : {
+              "region" : "cn-northwest-1"
+            },
+            "hostname" : "cn.transcribe.cn-northwest-1.amazonaws.com.cn"
+          }
+        }
+      },
+      "workspaces" : {
+        "endpoints" : {
+          "cn-northwest-1" : { }
+        }
+      },
+      "xray" : {
+        "endpoints" : {
+          "cn-north-1" : { },
+          "cn-northwest-1" : { }
+        }
+      }
+    }
+  }, {
+    "defaults" : {
+      "hostname" : "{service}.{region}.{dnsSuffix}",
+      "protocols" : [ "https" ],
+      "signatureVersions" : [ "v4" ]
+    },
+    "dnsSuffix" : "amazonaws.com",
+    "partition" : "aws-us-gov",
+    "partitionName" : "AWS GovCloud (US)",
+    "regionRegex" : "^us\\-gov\\-\\w+\\-\\d+$",
+    "regions" : {
+      "us-gov-east-1" : {
+        "description" : "AWS GovCloud (US-East)"
+      },
+      "us-gov-west-1" : {
+        "description" : "AWS GovCloud (US)"
+      }
+    },
+    "services" : {
+      "access-analyzer" : {
+        "endpoints" : {
+          "us-gov-east-1" : { },
+          "us-gov-west-1" : { }
+        }
+      },
+      "acm" : {
+        "endpoints" : {
+          "us-gov-east-1" : { },
+          "us-gov-west-1" : { }
+        }
+      },
+      "acm-pca" : {
+        "defaults" : {
+          "protocols" : [ "https" ]
+        },
+        "endpoints" : {
+          "us-gov-east-1" : { },
+          "us-gov-west-1" : { }
+        }
+      },
+      "api.ecr" : {
+        "endpoints" : {
+          "fips-us-gov-east-1" : {
+            "credentialScope" : {
+              "region" : "us-gov-east-1"
+            },
+            "hostname" : "ecr-fips.us-gov-east-1.amazonaws.com"
+          },
+          "fips-us-gov-west-1" : {
+            "credentialScope" : {
+              "region" : "us-gov-west-1"
+            },
+            "hostname" : "ecr-fips.us-gov-west-1.amazonaws.com"
+          },
+          "us-gov-east-1" : {
+            "credentialScope" : {
+              "region" : "us-gov-east-1"
+            },
+            "hostname" : "api.ecr.us-gov-east-1.amazonaws.com"
+          },
+          "us-gov-west-1" : {
+            "credentialScope" : {
+              "region" : "us-gov-west-1"
+            },
+            "hostname" : "api.ecr.us-gov-west-1.amazonaws.com"
+          }
+        }
+      },
+      "api.sagemaker" : {
+        "endpoints" : {
+          "us-gov-west-1" : { }
+        }
+      },
+      "apigateway" : {
+        "endpoints" : {
+          "us-gov-east-1" : { },
+          "us-gov-west-1" : { }
+        }
+      },
+      "application-autoscaling" : {
+        "defaults" : {
+          "protocols" : [ "http", "https" ]
+        },
+        "endpoints" : {
+          "us-gov-east-1" : { },
+          "us-gov-west-1" : { }
+        }
+      },
+      "appstream2" : {
+        "defaults" : {
+          "credentialScope" : {
+            "service" : "appstream"
+          },
+          "protocols" : [ "https" ]
+        },
+        "endpoints" : {
+          "fips" : {
+            "credentialScope" : {
+              "region" : "us-gov-west-1"
+            },
+            "hostname" : "appstream2-fips.us-gov-west-1.amazonaws.com"
+          },
+          "us-gov-west-1" : { }
+        }
+      },
+      "athena" : {
+        "endpoints" : {
+          "fips-us-gov-east-1" : {
+            "credentialScope" : {
+              "region" : "us-gov-east-1"
+            },
+            "hostname" : "athena-fips.us-gov-east-1.amazonaws.com"
+          },
+          "fips-us-gov-west-1" : {
+            "credentialScope" : {
+              "region" : "us-gov-west-1"
+            },
+            "hostname" : "athena-fips.us-gov-west-1.amazonaws.com"
+          },
+          "us-gov-east-1" : { },
+          "us-gov-west-1" : { }
+        }
+      },
+      "autoscaling" : {
+        "endpoints" : {
+          "us-gov-east-1" : { },
+          "us-gov-west-1" : {
+            "protocols" : [ "http", "https" ]
+          }
+        }
+      },
+      "autoscaling-plans" : {
+        "defaults" : {
+          "protocols" : [ "http", "https" ]
+        },
+        "endpoints" : {
+          "us-gov-east-1" : { },
+          "us-gov-west-1" : { }
+        }
+      },
+      "batch" : {
+        "endpoints" : {
+          "us-gov-east-1" : {
+            "credentialScope" : {
+              "region" : "us-gov-east-1"
+            },
+            "hostname" : "batch.us-gov-east-1.amazonaws.com"
+          },
+          "us-gov-west-1" : {
+            "credentialScope" : {
+              "region" : "us-gov-west-1"
+            },
+            "hostname" : "batch.us-gov-west-1.amazonaws.com"
+          }
+        }
+      },
+      "clouddirectory" : {
+        "endpoints" : {
+          "us-gov-west-1" : { }
+        }
+      },
+      "cloudformation" : {
+        "endpoints" : {
+          "us-gov-east-1" : { },
+          "us-gov-west-1" : { }
+        }
+      },
+      "cloudhsm" : {
+        "endpoints" : {
+          "us-gov-west-1" : { }
+        }
+      },
+      "cloudhsmv2" : {
+        "defaults" : {
+          "credentialScope" : {
+            "service" : "cloudhsm"
+          }
+        },
+        "endpoints" : {
+          "us-gov-east-1" : { },
+          "us-gov-west-1" : { }
+        }
+      },
+      "cloudtrail" : {
+        "endpoints" : {
+          "us-gov-east-1" : { },
+          "us-gov-west-1" : { }
+        }
+      },
+      "codebuild" : {
+        "endpoints" : {
+          "us-gov-east-1" : { },
+          "us-gov-east-1-fips" : {
+            "credentialScope" : {
+              "region" : "us-gov-east-1"
+            },
+            "hostname" : "codebuild-fips.us-gov-east-1.amazonaws.com"
+          },
+          "us-gov-west-1" : { },
+          "us-gov-west-1-fips" : {
+            "credentialScope" : {
+              "region" : "us-gov-west-1"
+            },
+            "hostname" : "codebuild-fips.us-gov-west-1.amazonaws.com"
+          }
+        }
+      },
+      "codecommit" : {
+        "endpoints" : {
+          "fips" : {
+            "credentialScope" : {
+              "region" : "us-gov-west-1"
+            },
+            "hostname" : "codecommit-fips.us-gov-west-1.amazonaws.com"
+          },
+          "us-gov-east-1" : { },
+          "us-gov-west-1" : { }
+        }
+      },
+      "codedeploy" : {
+        "endpoints" : {
+          "us-gov-east-1" : { },
+          "us-gov-east-1-fips" : {
+            "credentialScope" : {
+              "region" : "us-gov-east-1"
+            },
+            "hostname" : "codedeploy-fips.us-gov-east-1.amazonaws.com"
+          },
+          "us-gov-west-1" : { },
+          "us-gov-west-1-fips" : {
+            "credentialScope" : {
+              "region" : "us-gov-west-1"
+            },
+            "hostname" : "codedeploy-fips.us-gov-west-1.amazonaws.com"
+          }
+        }
+      },
+      "comprehend" : {
+        "defaults" : {
+          "protocols" : [ "https" ]
+        },
+        "endpoints" : {
+          "fips-us-gov-west-1" : {
+            "credentialScope" : {
+              "region" : "us-gov-west-1"
+            },
+            "hostname" : "comprehend-fips.us-gov-west-1.amazonaws.com"
+          },
+          "us-gov-west-1" : { }
+        }
+      },
+      "comprehendmedical" : {
+        "endpoints" : {
+          "us-gov-west-1" : { }
+        }
+      },
+      "config" : {
+        "endpoints" : {
+          "us-gov-east-1" : { },
+          "us-gov-west-1" : { }
+        }
+      },
+      "data.iot" : {
+        "defaults" : {
+          "credentialScope" : {
+            "service" : "iotdata"
+          },
+          "protocols" : [ "https" ]
+        },
+        "endpoints" : {
+          "us-gov-west-1" : { }
+        }
+      },
+      "datasync" : {
+        "endpoints" : {
+          "fips-us-gov-east-1" : {
+            "credentialScope" : {
+              "region" : "us-gov-east-1"
+            },
+            "hostname" : "datasync-fips.us-gov-east-1.amazonaws.com"
+          },
+          "fips-us-gov-west-1" : {
+            "credentialScope" : {
+              "region" : "us-gov-west-1"
+            },
+            "hostname" : "datasync-fips.us-gov-west-1.amazonaws.com"
+          },
+          "us-gov-east-1" : { },
+          "us-gov-west-1" : { }
+        }
+      },
+      "directconnect" : {
+        "endpoints" : {
+          "us-gov-east-1" : { },
+          "us-gov-west-1" : { }
+        }
+      },
+      "dms" : {
+        "endpoints" : {
+          "dms-fips" : {
+            "credentialScope" : {
+              "region" : "us-gov-west-1"
+            },
+            "hostname" : "dms.us-gov-west-1.amazonaws.com"
+          },
+          "us-gov-east-1" : { },
+          "us-gov-west-1" : { }
+        }
+      },
+      "ds" : {
+        "endpoints" : {
+          "us-gov-east-1" : { },
+          "us-gov-west-1" : { }
+        }
+      },
+      "dynamodb" : {
+        "endpoints" : {
+          "us-gov-east-1" : { },
+          "us-gov-east-1-fips" : {
+            "credentialScope" : {
+              "region" : "us-gov-east-1"
+            },
+            "hostname" : "dynamodb.us-gov-east-1.amazonaws.com"
+          },
+          "us-gov-west-1" : { },
+          "us-gov-west-1-fips" : {
+            "credentialScope" : {
+              "region" : "us-gov-west-1"
+            },
+            "hostname" : "dynamodb.us-gov-west-1.amazonaws.com"
+          }
+        }
+      },
+      "ec2" : {
+        "endpoints" : {
+          "us-gov-east-1" : { },
+          "us-gov-west-1" : { }
+        }
+      },
+      "ecs" : {
+        "endpoints" : {
+          "us-gov-east-1" : { },
+          "us-gov-west-1" : { }
+        }
+      },
+      "elasticache" : {
+        "endpoints" : {
+          "fips" : {
+            "credentialScope" : {
+              "region" : "us-gov-west-1"
+            },
+            "hostname" : "elasticache-fips.us-gov-west-1.amazonaws.com"
+          },
+          "us-gov-east-1" : { },
+          "us-gov-west-1" : { }
+        }
+      },
+      "elasticbeanstalk" : {
+        "endpoints" : {
+          "us-gov-east-1" : {
+            "credentialScope" : {
+              "region" : "us-gov-east-1"
+            },
+            "hostname" : "elasticbeanstalk.us-gov-east-1.amazonaws.com"
+          },
+          "us-gov-west-1" : {
+            "credentialScope" : {
+              "region" : "us-gov-west-1"
+            },
+            "hostname" : "elasticbeanstalk.us-gov-west-1.amazonaws.com"
+          }
+        }
+      },
+      "elasticfilesystem" : {
+        "endpoints" : {
+          "us-gov-east-1" : { },
+          "us-gov-west-1" : { }
+        }
+      },
+      "elasticloadbalancing" : {
+        "endpoints" : {
+          "us-gov-east-1" : { },
+          "us-gov-west-1" : {
+            "protocols" : [ "http", "https" ]
+          }
+        }
+      },
+      "elasticmapreduce" : {
+        "endpoints" : {
+          "us-gov-east-1" : { },
+          "us-gov-west-1" : {
+            "protocols" : [ "https" ]
+          }
+        }
+      },
+      "es" : {
+        "endpoints" : {
+          "fips" : {
+            "credentialScope" : {
+              "region" : "us-gov-west-1"
+            },
+            "hostname" : "es-fips.us-gov-west-1.amazonaws.com"
+          },
+          "us-gov-east-1" : { },
+          "us-gov-west-1" : { }
+        }
+      },
+      "events" : {
+        "endpoints" : {
+          "us-gov-east-1" : { },
+          "us-gov-west-1" : { }
+        }
+      },
+      "firehose" : {
+        "endpoints" : {
+          "fips-us-gov-east-1" : {
+            "credentialScope" : {
+              "region" : "us-gov-east-1"
+            },
+            "hostname" : "firehose-fips.us-gov-east-1.amazonaws.com"
+          },
+          "fips-us-gov-west-1" : {
+            "credentialScope" : {
+              "region" : "us-gov-west-1"
+            },
+            "hostname" : "firehose-fips.us-gov-west-1.amazonaws.com"
+          },
+          "us-gov-east-1" : { },
+          "us-gov-west-1" : { }
+        }
+      },
+      "glacier" : {
+        "endpoints" : {
+          "us-gov-east-1" : {
+            "credentialScope" : {
+              "region" : "us-gov-east-1"
+            },
+            "hostname" : "glacier.us-gov-east-1.amazonaws.com"
+          },
+          "us-gov-west-1" : {
+            "credentialScope" : {
+              "region" : "us-gov-west-1"
+            },
+            "hostname" : "glacier.us-gov-west-1.amazonaws.com",
+            "protocols" : [ "http", "https" ]
+          }
+        }
+      },
+      "glue" : {
+        "endpoints" : {
+          "us-gov-east-1" : { },
+          "us-gov-west-1" : { }
+        }
+      },
+      "greengrass" : {
+        "defaults" : {
+          "protocols" : [ "https" ]
+        },
+        "endpoints" : {
+          "us-gov-west-1" : { }
+        },
+        "isRegionalized" : true
+      },
+      "guardduty" : {
+        "defaults" : {
+          "protocols" : [ "https" ]
+        },
+        "endpoints" : {
+          "us-gov-west-1" : { }
+        },
+        "isRegionalized" : true
+      },
+      "health" : {
+        "endpoints" : {
+          "us-gov-west-1" : { }
+        }
+      },
+      "iam" : {
+        "endpoints" : {
+          "aws-us-gov-global" : {
+            "credentialScope" : {
+              "region" : "us-gov-west-1"
+            },
+            "hostname" : "iam.us-gov.amazonaws.com"
+          }
+        },
+        "isRegionalized" : false,
+        "partitionEndpoint" : "aws-us-gov-global"
+      },
+      "inspector" : {
+        "endpoints" : {
+          "fips-us-gov-east-1" : {
+            "credentialScope" : {
+              "region" : "us-gov-east-1"
+            },
+            "hostname" : "inspector-fips.us-gov-east-1.amazonaws.com"
+          },
+          "fips-us-gov-west-1" : {
+            "credentialScope" : {
+              "region" : "us-gov-west-1"
+            },
+            "hostname" : "inspector-fips.us-gov-west-1.amazonaws.com"
+          },
+          "us-gov-east-1" : { },
+          "us-gov-west-1" : { }
+        }
+      },
+      "iot" : {
+        "defaults" : {
+          "credentialScope" : {
+            "service" : "execute-api"
+          }
+        },
+        "endpoints" : {
+          "us-gov-west-1" : { }
+        }
+      },
+      "iotsecuredtunneling" : {
+        "endpoints" : {
+          "us-gov-west-1" : { }
+        }
+      },
+      "kinesis" : {
+        "endpoints" : {
+          "us-gov-east-1" : { },
+          "us-gov-west-1" : { }
+        }
+      },
+      "kms" : {
+        "endpoints" : {
+          "ProdFips" : {
+            "credentialScope" : {
+              "region" : "us-gov-west-1"
+            },
+            "hostname" : "kms-fips.us-gov-west-1.amazonaws.com"
+          },
+          "us-gov-east-1" : { },
+          "us-gov-west-1" : { }
+        }
+      },
+      "lambda" : {
+        "endpoints" : {
+          "us-gov-east-1" : { },
+          "us-gov-west-1" : { }
+        }
+      },
+      "license-manager" : {
+        "endpoints" : {
+          "us-gov-east-1" : { },
+          "us-gov-west-1" : { }
+        }
+      },
+      "logs" : {
+        "endpoints" : {
+          "us-gov-east-1" : { },
+          "us-gov-west-1" : { }
+        }
+      },
+      "mediaconvert" : {
+        "endpoints" : {
+          "us-gov-west-1" : { }
+        }
+      },
+      "metering.marketplace" : {
+        "defaults" : {
+          "credentialScope" : {
+            "service" : "aws-marketplace"
+          }
+        },
+        "endpoints" : {
+          "us-gov-east-1" : { },
+          "us-gov-west-1" : { }
+        }
+      },
+      "monitoring" : {
+        "endpoints" : {
+          "us-gov-east-1" : { },
+          "us-gov-west-1" : { }
+        }
+      },
+      "neptune" : {
+        "endpoints" : {
+          "us-gov-east-1" : {
+            "credentialScope" : {
+              "region" : "us-gov-east-1"
+            },
+            "hostname" : "rds.us-gov-east-1.amazonaws.com"
+          },
+          "us-gov-west-1" : {
+            "credentialScope" : {
+              "region" : "us-gov-west-1"
+            },
+            "hostname" : "rds.us-gov-west-1.amazonaws.com"
+          }
+        }
+      },
+      "organizations" : {
+        "endpoints" : {
+          "aws-us-gov-global" : {
+            "credentialScope" : {
+              "region" : "us-gov-west-1"
+            },
+            "hostname" : "organizations.us-gov-west-1.amazonaws.com"
+          }
+        },
+        "isRegionalized" : false,
+        "partitionEndpoint" : "aws-us-gov-global"
+      },
+      "outposts" : {
+        "endpoints" : {
+          "us-gov-east-1" : { },
+          "us-gov-west-1" : { }
+        }
+      },
+      "polly" : {
+        "endpoints" : {
+          "fips-us-gov-west-1" : {
+            "credentialScope" : {
+              "region" : "us-gov-west-1"
+            },
+            "hostname" : "polly-fips.us-gov-west-1.amazonaws.com"
+          },
+          "us-gov-west-1" : { }
+        }
+      },
+      "ram" : {
+        "endpoints" : {
+          "us-gov-east-1" : { },
+          "us-gov-west-1" : { }
+        }
+      },
+      "rds" : {
+        "endpoints" : {
+          "us-gov-east-1" : { },
+          "us-gov-west-1" : { }
+        }
+      },
+      "redshift" : {
+        "endpoints" : {
+          "us-gov-east-1" : {
+            "credentialScope" : {
+              "region" : "us-gov-east-1"
+            },
+            "hostname" : "redshift.us-gov-east-1.amazonaws.com"
+          },
+          "us-gov-west-1" : {
+            "credentialScope" : {
+              "region" : "us-gov-west-1"
+            },
+            "hostname" : "redshift.us-gov-west-1.amazonaws.com"
+          }
+        }
+      },
+      "rekognition" : {
+        "endpoints" : {
+          "us-gov-west-1" : { }
+        }
+      },
+      "resource-groups" : {
+        "endpoints" : {
+          "fips-us-gov-east-1" : {
+            "credentialScope" : {
+              "region" : "us-gov-east-1"
+            },
+            "hostname" : "resource-groups.us-gov-east-1.amazonaws.com"
+          },
+          "fips-us-gov-west-1" : {
+            "credentialScope" : {
+              "region" : "us-gov-west-1"
+            },
+            "hostname" : "resource-groups.us-gov-west-1.amazonaws.com"
+          },
+          "us-gov-east-1" : { },
+          "us-gov-west-1" : { }
+        }
+      },
+      "route53" : {
+        "endpoints" : {
+          "aws-us-gov-global" : {
+            "credentialScope" : {
+              "region" : "us-gov-west-1"
+            },
+            "hostname" : "route53.us-gov.amazonaws.com"
+          }
+        },
+        "isRegionalized" : false,
+        "partitionEndpoint" : "aws-us-gov-global"
+      },
+      "route53resolver" : {
+        "endpoints" : {
+          "us-gov-east-1" : { },
+          "us-gov-west-1" : { }
+        }
+      },
+      "runtime.sagemaker" : {
+        "endpoints" : {
+          "us-gov-west-1" : { }
+        }
+      },
+      "s3" : {
+        "defaults" : {
+          "signatureVersions" : [ "s3", "s3v4" ]
+        },
+        "endpoints" : {
+          "fips-us-gov-west-1" : {
+            "credentialScope" : {
+              "region" : "us-gov-west-1"
+            },
+            "hostname" : "s3-fips-us-gov-west-1.amazonaws.com"
+          },
+          "us-gov-east-1" : {
+            "hostname" : "s3.us-gov-east-1.amazonaws.com",
+            "protocols" : [ "http", "https" ]
+          },
+          "us-gov-west-1" : {
+            "hostname" : "s3.us-gov-west-1.amazonaws.com",
+            "protocols" : [ "http", "https" ]
+          }
+        }
+      },
+      "s3-control" : {
+        "defaults" : {
+          "protocols" : [ "https" ],
+          "signatureVersions" : [ "s3v4" ]
+        },
+        "endpoints" : {
+          "us-gov-east-1" : {
+            "credentialScope" : {
+              "region" : "us-gov-east-1"
+            },
+            "hostname" : "s3-control.us-gov-east-1.amazonaws.com",
+            "signatureVersions" : [ "s3v4" ]
+          },
+          "us-gov-east-1-fips" : {
+            "credentialScope" : {
+              "region" : "us-gov-east-1"
+            },
+            "hostname" : "s3-control-fips.us-gov-east-1.amazonaws.com",
+            "signatureVersions" : [ "s3v4" ]
+          },
+          "us-gov-west-1" : {
+            "credentialScope" : {
+              "region" : "us-gov-west-1"
+            },
+            "hostname" : "s3-control.us-gov-west-1.amazonaws.com",
+            "signatureVersions" : [ "s3v4" ]
+          },
+          "us-gov-west-1-fips" : {
+            "credentialScope" : {
+              "region" : "us-gov-west-1"
+            },
+            "hostname" : "s3-control-fips.us-gov-west-1.amazonaws.com",
+            "signatureVersions" : [ "s3v4" ]
+          }
+        }
+      },
+      "secretsmanager" : {
+        "endpoints" : {
+          "us-gov-east-1" : { },
+          "us-gov-east-1-fips" : {
+            "credentialScope" : {
+              "region" : "us-gov-east-1"
+            },
+            "hostname" : "secretsmanager-fips.us-gov-east-1.amazonaws.com"
+          },
+          "us-gov-west-1" : { },
+          "us-gov-west-1-fips" : {
+            "credentialScope" : {
+              "region" : "us-gov-west-1"
+            },
+            "hostname" : "secretsmanager-fips.us-gov-west-1.amazonaws.com"
+          }
+        }
+      },
+      "serverlessrepo" : {
+        "defaults" : {
+          "protocols" : [ "https" ]
+        },
+        "endpoints" : {
+          "us-gov-east-1" : {
+            "protocols" : [ "https" ]
+          },
+          "us-gov-west-1" : {
+            "protocols" : [ "https" ]
+          }
+        }
+      },
+      "servicecatalog" : {
+        "endpoints" : {
+          "us-gov-east-1" : { },
+          "us-gov-east-1-fips" : {
+            "credentialScope" : {
+              "region" : "us-gov-east-1"
+            },
+            "hostname" : "servicecatalog-fips.us-gov-east-1.amazonaws.com"
+          },
+          "us-gov-west-1" : { },
+          "us-gov-west-1-fips" : {
+            "credentialScope" : {
+              "region" : "us-gov-west-1"
+            },
+            "hostname" : "servicecatalog-fips.us-gov-west-1.amazonaws.com"
+          }
+        }
+      },
+      "sms" : {
+        "endpoints" : {
+          "fips-us-gov-east-1" : {
+            "credentialScope" : {
+              "region" : "us-gov-east-1"
+            },
+            "hostname" : "sms-fips.us-gov-east-1.amazonaws.com"
+          },
+          "fips-us-gov-west-1" : {
+            "credentialScope" : {
+              "region" : "us-gov-west-1"
+            },
+            "hostname" : "sms-fips.us-gov-west-1.amazonaws.com"
+          },
+          "us-gov-east-1" : { },
+          "us-gov-west-1" : { }
+        }
+      },
+      "snowball" : {
+        "endpoints" : {
+          "fips-us-gov-east-1" : {
+            "credentialScope" : {
+              "region" : "us-gov-east-1"
+            },
+            "hostname" : "snowball-fips.us-gov-east-1.amazonaws.com"
+          },
+          "fips-us-gov-west-1" : {
+            "credentialScope" : {
+              "region" : "us-gov-west-1"
+            },
+            "hostname" : "snowball-fips.us-gov-west-1.amazonaws.com"
+          },
+          "us-gov-east-1" : { },
+          "us-gov-west-1" : { }
+        }
       },
-      "dms" : {
+      "sns" : {
         "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
+          "us-gov-east-1" : { },
+          "us-gov-west-1" : {
+            "protocols" : [ "http", "https" ]
+          }
         }
       },
-      "ds" : {
+      "sqs" : {
         "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
+          "us-gov-east-1" : { },
+          "us-gov-west-1" : {
+            "protocols" : [ "http", "https" ],
+            "sslCommonName" : "{region}.queue.{dnsSuffix}"
+          }
         }
       },
-      "dynamodb" : {
-        "defaults" : {
-          "protocols" : [ "http", "https" ]
-        },
+      "ssm" : {
         "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
+          "us-gov-east-1" : { },
+          "us-gov-west-1" : { }
         }
       },
-      "ec2" : {
+      "states" : {
+        "endpoints" : {
+          "fips-us-gov-east-1" : {
+            "credentialScope" : {
+              "region" : "us-gov-east-1"
+            },
+            "hostname" : "states-fips.us-gov-east-1.amazonaws.com"
+          },
+          "fips-us-gov-west-1" : {
+            "credentialScope" : {
+              "region" : "us-gov-west-1"
+            },
+            "hostname" : "states.us-gov-west-1.amazonaws.com"
+          },
+          "us-gov-east-1" : { },
+          "us-gov-west-1" : { }
+        }
+      },
+      "storagegateway" : {
+        "endpoints" : {
+          "us-gov-east-1" : { },
+          "us-gov-west-1" : { }
+        }
+      },
+      "streams.dynamodb" : {
         "defaults" : {
-          "protocols" : [ "http", "https" ]
+          "credentialScope" : {
+            "service" : "dynamodb"
+          }
         },
         "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
+          "us-gov-east-1" : { },
+          "us-gov-east-1-fips" : {
+            "credentialScope" : {
+              "region" : "us-gov-east-1"
+            },
+            "hostname" : "dynamodb.us-gov-east-1.amazonaws.com"
+          },
+          "us-gov-west-1" : { },
+          "us-gov-west-1-fips" : {
+            "credentialScope" : {
+              "region" : "us-gov-west-1"
+            },
+            "hostname" : "dynamodb.us-gov-west-1.amazonaws.com"
+          }
         }
       },
-      "ecs" : {
+      "sts" : {
         "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
+          "us-gov-east-1" : { },
+          "us-gov-west-1" : { }
         }
       },
-      "elasticache" : {
+      "support" : {
         "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
+          "aws-us-gov-global" : {
+            "credentialScope" : {
+              "region" : "us-gov-west-1"
+            },
+            "hostname" : "support.us-gov-west-1.amazonaws.com"
+          }
+        },
+        "partitionEndpoint" : "aws-us-gov-global"
+      },
+      "swf" : {
+        "endpoints" : {
+          "us-gov-east-1" : {
+            "credentialScope" : {
+              "region" : "us-gov-east-1"
+            },
+            "hostname" : "swf.us-gov-east-1.amazonaws.com"
+          },
+          "us-gov-west-1" : {
+            "credentialScope" : {
+              "region" : "us-gov-west-1"
+            },
+            "hostname" : "swf.us-gov-west-1.amazonaws.com"
+          }
         }
       },
-      "elasticbeanstalk" : {
+      "tagging" : {
         "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
+          "us-gov-east-1" : { },
+          "us-gov-west-1" : { }
         }
       },
-      "elasticloadbalancing" : {
+      "transcribe" : {
         "defaults" : {
           "protocols" : [ "https" ]
         },
         "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
+          "fips-us-gov-east-1" : {
+            "credentialScope" : {
+              "region" : "us-gov-east-1"
+            },
+            "hostname" : "fips.transcribe.us-gov-east-1.amazonaws.com"
+          },
+          "fips-us-gov-west-1" : {
+            "credentialScope" : {
+              "region" : "us-gov-west-1"
+            },
+            "hostname" : "fips.transcribe.us-gov-west-1.amazonaws.com"
+          },
+          "us-gov-east-1" : { },
+          "us-gov-west-1" : { }
         }
       },
-      "elasticmapreduce" : {
+      "translate" : {
         "defaults" : {
           "protocols" : [ "https" ]
         },
         "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
+          "us-gov-west-1" : { },
+          "us-gov-west-1-fips" : {
+            "credentialScope" : {
+              "region" : "us-gov-west-1"
+            },
+            "hostname" : "translate-fips.us-gov-west-1.amazonaws.com"
+          }
         }
       },
-      "es" : {
+      "waf-regional" : {
         "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
+          "fips-us-gov-west-1" : {
+            "credentialScope" : {
+              "region" : "us-gov-west-1"
+            },
+            "hostname" : "waf-regional-fips.us-gov-west-1.amazonaws.com"
+          },
+          "us-gov-west-1" : {
+            "credentialScope" : {
+              "region" : "us-gov-west-1"
+            },
+            "hostname" : "waf-regional.us-gov-west-1.amazonaws.com"
+          }
         }
       },
-      "events" : {
+      "workspaces" : {
         "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
+          "us-gov-west-1" : { }
         }
       },
-      "firehose" : {
+      "xray" : {
         "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
+          "us-gov-east-1" : { },
+          "us-gov-west-1" : { }
         }
-      },
-      "gamelift" : {
+      }
+    }
+  }, {
+    "defaults" : {
+      "hostname" : "{service}.{region}.{dnsSuffix}",
+      "protocols" : [ "https" ],
+      "signatureVersions" : [ "v4" ]
+    },
+    "dnsSuffix" : "c2s.ic.gov",
+    "partition" : "aws-iso",
+    "partitionName" : "AWS ISO (US)",
+    "regionRegex" : "^us\\-iso\\-\\w+\\-\\d+$",
+    "regions" : {
+      "us-iso-east-1" : {
+        "description" : "US ISO East"
+      }
+    },
+    "services" : {
+      "api.ecr" : {
         "endpoints" : {
-          "cn-north-1" : { }
+          "us-iso-east-1" : {
+            "credentialScope" : {
+              "region" : "us-iso-east-1"
+            },
+            "hostname" : "api.ecr.us-iso-east-1.c2s.ic.gov"
+          }
         }
       },
-      "glacier" : {
-        "defaults" : {
-          "protocols" : [ "http", "https" ]
-        },
+      "api.sagemaker" : {
         "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
+          "us-iso-east-1" : { }
         }
       },
-      "iam" : {
+      "apigateway" : {
         "endpoints" : {
-          "aws-cn-global" : {
-            "credentialScope" : {
-              "region" : "cn-north-1"
-            },
-            "hostname" : "iam.cn-north-1.amazonaws.com.cn"
-          }
-        },
-        "isRegionalized" : false,
-        "partitionEndpoint" : "aws-cn-global"
+          "us-iso-east-1" : { }
+        }
       },
-      "iot" : {
+      "application-autoscaling" : {
         "defaults" : {
-          "credentialScope" : {
-            "service" : "execute-api"
-          }
+          "protocols" : [ "http", "https" ]
         },
         "endpoints" : {
-          "cn-north-1" : { }
-        }
-      },
-      "kinesis" : {
-        "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
+          "us-iso-east-1" : { }
         }
       },
-      "lambda" : {
+      "autoscaling" : {
         "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
+          "us-iso-east-1" : {
+            "protocols" : [ "http", "https" ]
+          }
         }
       },
-      "logs" : {
+      "cloudformation" : {
         "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
+          "us-iso-east-1" : { }
         }
       },
-      "monitoring" : {
-        "defaults" : {
-          "protocols" : [ "http", "https" ]
-        },
+      "cloudtrail" : {
         "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
+          "us-iso-east-1" : { }
         }
       },
-      "polly" : {
+      "codedeploy" : {
         "endpoints" : {
-          "cn-northwest-1" : { }
+          "us-iso-east-1" : { }
         }
       },
-      "rds" : {
+      "config" : {
         "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
+          "us-iso-east-1" : { }
         }
       },
-      "redshift" : {
+      "datapipeline" : {
         "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
+          "us-iso-east-1" : { }
         }
       },
-      "s3" : {
-        "defaults" : {
-          "protocols" : [ "http", "https" ],
-          "signatureVersions" : [ "s3v4" ]
-        },
+      "directconnect" : {
         "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
+          "us-iso-east-1" : { }
         }
       },
-      "s3-control" : {
-        "defaults" : {
-          "protocols" : [ "https" ],
-          "signatureVersions" : [ "s3v4" ]
-        },
+      "dms" : {
         "endpoints" : {
-          "cn-north-1" : {
+          "dms-fips" : {
             "credentialScope" : {
-              "region" : "cn-north-1"
+              "region" : "us-iso-east-1"
             },
-            "hostname" : "s3-control.cn-north-1.amazonaws.com.cn",
-            "signatureVersions" : [ "s3v4" ]
+            "hostname" : "dms.us-iso-east-1.c2s.ic.gov"
           },
-          "cn-northwest-1" : {
-            "credentialScope" : {
-              "region" : "cn-northwest-1"
-            },
-            "hostname" : "s3-control.cn-northwest-1.amazonaws.com.cn",
-            "signatureVersions" : [ "s3v4" ]
-          }
+          "us-iso-east-1" : { }
         }
       },
-      "sms" : {
+      "ds" : {
         "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
+          "us-iso-east-1" : { }
         }
       },
-      "snowball" : {
+      "dynamodb" : {
         "endpoints" : {
-          "cn-north-1" : { }
+          "us-iso-east-1" : {
+            "protocols" : [ "http", "https" ]
+          }
         }
       },
-      "sns" : {
-        "defaults" : {
-          "protocols" : [ "http", "https" ]
-        },
+      "ec2" : {
         "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
+          "us-iso-east-1" : { }
         }
       },
-      "sqs" : {
-        "defaults" : {
-          "protocols" : [ "http", "https" ],
-          "sslCommonName" : "{region}.queue.{dnsSuffix}"
-        },
+      "ecs" : {
         "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
+          "us-iso-east-1" : { }
         }
       },
-      "ssm" : {
+      "elasticache" : {
         "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
+          "us-iso-east-1" : { }
         }
       },
-      "states" : {
+      "elasticloadbalancing" : {
         "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
+          "us-iso-east-1" : {
+            "protocols" : [ "http", "https" ]
+          }
         }
       },
-      "storagegateway" : {
+      "elasticmapreduce" : {
         "endpoints" : {
-          "cn-north-1" : { }
+          "us-iso-east-1" : {
+            "protocols" : [ "https" ]
+          }
         }
       },
-      "streams.dynamodb" : {
-        "defaults" : {
-          "credentialScope" : {
-            "service" : "dynamodb"
-          },
-          "protocols" : [ "http", "https" ]
-        },
+      "events" : {
         "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
+          "us-iso-east-1" : { }
         }
       },
-      "sts" : {
+      "glacier" : {
         "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
+          "us-iso-east-1" : {
+            "protocols" : [ "http", "https" ]
+          }
         }
       },
-      "swf" : {
+      "health" : {
         "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
+          "us-iso-east-1" : { }
         }
       },
-      "tagging" : {
+      "iam" : {
         "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
-        }
-      }
-    }
-  }, {
-    "defaults" : {
-      "hostname" : "{service}.{region}.{dnsSuffix}",
-      "protocols" : [ "https" ],
-      "signatureVersions" : [ "v4" ]
-    },
-    "dnsSuffix" : "amazonaws.com",
-    "partition" : "aws-us-gov",
-    "partitionName" : "AWS GovCloud (US)",
-    "regionRegex" : "^us\\-gov\\-\\w+\\-\\d+$",
-    "regions" : {
-      "us-gov-east-1" : {
-        "description" : "AWS GovCloud (US-East)"
+          "aws-iso-global" : {
+            "credentialScope" : {
+              "region" : "us-iso-east-1"
+            },
+            "hostname" : "iam.us-iso-east-1.c2s.ic.gov"
+          }
+        },
+        "isRegionalized" : false,
+        "partitionEndpoint" : "aws-iso-global"
       },
-      "us-gov-west-1" : {
-        "description" : "AWS GovCloud (US)"
-      }
-    },
-    "services" : {
-      "acm" : {
+      "kinesis" : {
         "endpoints" : {
-          "us-gov-east-1" : { },
-          "us-gov-west-1" : { }
+          "us-iso-east-1" : { }
         }
       },
-      "api.ecr" : {
+      "kms" : {
         "endpoints" : {
-          "us-gov-east-1" : {
+          "ProdFips" : {
             "credentialScope" : {
-              "region" : "us-gov-east-1"
+              "region" : "us-iso-east-1"
             },
-            "hostname" : "api.ecr.us-gov-east-1.amazonaws.com"
+            "hostname" : "kms-fips.us-iso-east-1.c2s.ic.gov"
           },
-          "us-gov-west-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "api.ecr.us-gov-west-1.amazonaws.com"
-          }
+          "us-iso-east-1" : { }
         }
       },
-      "api.sagemaker" : {
+      "lambda" : {
         "endpoints" : {
-          "us-gov-west-1" : { }
+          "us-iso-east-1" : { }
         }
       },
-      "apigateway" : {
+      "logs" : {
         "endpoints" : {
-          "us-gov-east-1" : { },
-          "us-gov-west-1" : { }
+          "us-iso-east-1" : { }
         }
       },
-      "application-autoscaling" : {
+      "monitoring" : {
         "endpoints" : {
-          "us-gov-east-1" : { },
-          "us-gov-west-1" : { }
+          "us-iso-east-1" : { }
         }
       },
-      "athena" : {
+      "rds" : {
         "endpoints" : {
-          "us-gov-west-1" : { }
+          "us-iso-east-1" : { }
         }
       },
-      "autoscaling" : {
+      "redshift" : {
         "endpoints" : {
-          "us-gov-east-1" : { },
-          "us-gov-west-1" : {
-            "protocols" : [ "http", "https" ]
+          "us-iso-east-1" : { }
+        }
+      },
+      "route53" : {
+        "endpoints" : {
+          "aws-iso-global" : {
+            "credentialScope" : {
+              "region" : "us-iso-east-1"
+            },
+            "hostname" : "route53.c2s.ic.gov"
           }
+        },
+        "isRegionalized" : false,
+        "partitionEndpoint" : "aws-iso-global"
+      },
+      "runtime.sagemaker" : {
+        "endpoints" : {
+          "us-iso-east-1" : { }
         }
       },
-      "clouddirectory" : {
+      "s3" : {
+        "defaults" : {
+          "signatureVersions" : [ "s3v4" ]
+        },
         "endpoints" : {
-          "us-gov-west-1" : { }
+          "us-iso-east-1" : {
+            "protocols" : [ "http", "https" ],
+            "signatureVersions" : [ "s3v4" ]
+          }
         }
       },
-      "cloudformation" : {
+      "snowball" : {
         "endpoints" : {
-          "us-gov-east-1" : { },
-          "us-gov-west-1" : { }
+          "us-iso-east-1" : { }
         }
       },
-      "cloudhsm" : {
+      "sns" : {
         "endpoints" : {
-          "us-gov-west-1" : { }
+          "us-iso-east-1" : {
+            "protocols" : [ "http", "https" ]
+          }
         }
       },
-      "cloudhsmv2" : {
+      "sqs" : {
+        "endpoints" : {
+          "us-iso-east-1" : {
+            "protocols" : [ "http", "https" ]
+          }
+        }
+      },
+      "states" : {
+        "endpoints" : {
+          "us-iso-east-1" : { }
+        }
+      },
+      "streams.dynamodb" : {
         "defaults" : {
           "credentialScope" : {
-            "service" : "cloudhsm"
-          }
+            "service" : "dynamodb"
+          },
+          "protocols" : [ "http", "https" ]
         },
         "endpoints" : {
-          "us-gov-east-1" : { },
-          "us-gov-west-1" : { }
+          "us-iso-east-1" : {
+            "protocols" : [ "http", "https" ]
+          }
         }
       },
-      "cloudtrail" : {
+      "sts" : {
         "endpoints" : {
-          "us-gov-east-1" : { },
-          "us-gov-west-1" : { }
+          "us-iso-east-1" : { }
         }
       },
-      "codedeploy" : {
+      "support" : {
         "endpoints" : {
-          "us-gov-east-1" : { },
-          "us-gov-east-1-fips" : {
-            "credentialScope" : {
-              "region" : "us-gov-east-1"
-            },
-            "hostname" : "codedeploy-fips.us-gov-east-1.amazonaws.com"
-          },
-          "us-gov-west-1" : { },
-          "us-gov-west-1-fips" : {
+          "aws-iso-global" : {
             "credentialScope" : {
-              "region" : "us-gov-west-1"
+              "region" : "us-iso-east-1"
             },
-            "hostname" : "codedeploy-fips.us-gov-west-1.amazonaws.com"
+            "hostname" : "support.us-iso-east-1.c2s.ic.gov"
           }
-        }
+        },
+        "partitionEndpoint" : "aws-iso-global"
       },
-      "config" : {
+      "swf" : {
         "endpoints" : {
-          "us-gov-east-1" : { },
-          "us-gov-west-1" : { }
+          "us-iso-east-1" : { }
         }
       },
-      "data.iot" : {
-        "defaults" : {
-          "credentialScope" : {
-            "service" : "iotdata"
-          },
-          "protocols" : [ "https" ]
-        },
+      "workspaces" : {
         "endpoints" : {
-          "us-gov-west-1" : { }
+          "us-iso-east-1" : { }
         }
-      },
-      "directconnect" : {
+      }
+    }
+  }, {
+    "defaults" : {
+      "hostname" : "{service}.{region}.{dnsSuffix}",
+      "protocols" : [ "https" ],
+      "signatureVersions" : [ "v4" ]
+    },
+    "dnsSuffix" : "sc2s.sgov.gov",
+    "partition" : "aws-iso-b",
+    "partitionName" : "AWS ISOB (US)",
+    "regionRegex" : "^us\\-isob\\-\\w+\\-\\d+$",
+    "regions" : {
+      "us-isob-east-1" : {
+        "description" : "US ISOB East (Ohio)"
+      }
+    },
+    "services" : {
+      "application-autoscaling" : {
+        "defaults" : {
+          "protocols" : [ "http", "https" ]
+        },
         "endpoints" : {
-          "us-gov-east-1" : { },
-          "us-gov-west-1" : { }
+          "us-isob-east-1" : { }
         }
       },
-      "dms" : {
+      "autoscaling" : {
+        "defaults" : {
+          "protocols" : [ "http", "https" ]
+        },
         "endpoints" : {
-          "us-gov-east-1" : { },
-          "us-gov-west-1" : { }
+          "us-isob-east-1" : { }
         }
       },
-      "ds" : {
+      "cloudformation" : {
         "endpoints" : {
-          "us-gov-west-1" : { }
+          "us-isob-east-1" : { }
         }
       },
-      "dynamodb" : {
+      "cloudtrail" : {
         "endpoints" : {
-          "us-gov-east-1" : { },
-          "us-gov-west-1" : { },
-          "us-gov-west-1-fips" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "dynamodb.us-gov-west-1.amazonaws.com"
-          }
+          "us-isob-east-1" : { }
         }
       },
-      "ec2" : {
+      "config" : {
         "endpoints" : {
-          "us-gov-east-1" : { },
-          "us-gov-west-1" : { }
+          "us-isob-east-1" : { }
         }
       },
-      "ecs" : {
+      "directconnect" : {
         "endpoints" : {
-          "us-gov-east-1" : { },
-          "us-gov-west-1" : { }
+          "us-isob-east-1" : { }
         }
       },
-      "elasticache" : {
+      "dms" : {
         "endpoints" : {
-          "us-gov-east-1" : { },
-          "us-gov-west-1" : { }
+          "dms-fips" : {
+            "credentialScope" : {
+              "region" : "us-isob-east-1"
+            },
+            "hostname" : "dms.us-isob-east-1.sc2s.sgov.gov"
+          },
+          "us-isob-east-1" : { }
         }
       },
-      "elasticbeanstalk" : {
+      "dynamodb" : {
+        "defaults" : {
+          "protocols" : [ "http", "https" ]
+        },
         "endpoints" : {
-          "us-gov-east-1" : { },
-          "us-gov-west-1" : { }
+          "us-isob-east-1" : { }
         }
       },
-      "elasticfilesystem" : {
+      "ec2" : {
+        "defaults" : {
+          "protocols" : [ "http", "https" ]
+        },
         "endpoints" : {
-          "us-gov-west-1" : { }
+          "us-isob-east-1" : { }
         }
       },
-      "elasticloadbalancing" : {
+      "elasticache" : {
         "endpoints" : {
-          "us-gov-east-1" : { },
-          "us-gov-west-1" : {
-            "protocols" : [ "http", "https" ]
-          }
+          "us-isob-east-1" : { }
         }
       },
-      "elasticmapreduce" : {
+      "elasticloadbalancing" : {
         "endpoints" : {
-          "us-gov-east-1" : { },
-          "us-gov-west-1" : {
+          "us-isob-east-1" : {
             "protocols" : [ "https" ]
           }
         }
       },
-      "es" : {
+      "elasticmapreduce" : {
         "endpoints" : {
-          "us-gov-east-1" : { },
-          "us-gov-west-1" : { }
+          "us-isob-east-1" : { }
         }
       },
       "events" : {
         "endpoints" : {
-          "us-gov-east-1" : { },
-          "us-gov-west-1" : { }
-        }
-      },
-      "firehose" : {
-        "endpoints" : {
-          "us-gov-west-1" : { }
+          "us-isob-east-1" : { }
         }
       },
       "glacier" : {
         "endpoints" : {
-          "us-gov-east-1" : { },
-          "us-gov-west-1" : {
-            "protocols" : [ "http", "https" ]
-          }
+          "us-isob-east-1" : { }
         }
       },
-      "glue" : {
+      "health" : {
         "endpoints" : {
-          "us-gov-west-1" : { }
+          "us-isob-east-1" : { }
         }
       },
-      "guardduty" : {
-        "defaults" : {
-          "protocols" : [ "https" ]
-        },
-        "endpoints" : {
-          "us-gov-west-1" : { }
-        },
-        "isRegionalized" : true
-      },
       "iam" : {
         "endpoints" : {
-          "aws-us-gov-global" : {
+          "aws-iso-b-global" : {
             "credentialScope" : {
-              "region" : "us-gov-west-1"
+              "region" : "us-isob-east-1"
             },
-            "hostname" : "iam.us-gov.amazonaws.com"
+            "hostname" : "iam.us-isob-east-1.sc2s.sgov.gov"
           }
         },
         "isRegionalized" : false,
-        "partitionEndpoint" : "aws-us-gov-global"
-      },
-      "inspector" : {
-        "endpoints" : {
-          "us-gov-east-1" : { },
-          "us-gov-west-1" : { }
-        }
-      },
-      "iot" : {
-        "defaults" : {
-          "credentialScope" : {
-            "service" : "execute-api"
-          }
-        },
-        "endpoints" : {
-          "us-gov-west-1" : { }
-        }
+        "partitionEndpoint" : "aws-iso-b-global"
       },
       "kinesis" : {
         "endpoints" : {
-          "us-gov-east-1" : { },
-          "us-gov-west-1" : { }
+          "us-isob-east-1" : { }
         }
       },
       "kms" : {
         "endpoints" : {
-          "us-gov-east-1" : { },
-          "us-gov-west-1" : { }
+          "ProdFips" : {
+            "credentialScope" : {
+              "region" : "us-isob-east-1"
+            },
+            "hostname" : "kms-fips.us-isob-east-1.sc2s.sgov.gov"
+          },
+          "us-isob-east-1" : { }
         }
       },
-      "lambda" : {
+      "license-manager" : {
         "endpoints" : {
-          "us-gov-east-1" : { },
-          "us-gov-west-1" : { }
+          "us-isob-east-1" : { }
         }
       },
       "logs" : {
         "endpoints" : {
-          "us-gov-east-1" : { },
-          "us-gov-west-1" : { }
-        }
-      },
-      "mediaconvert" : {
-        "endpoints" : {
-          "us-gov-west-1" : { }
-        }
-      },
-      "metering.marketplace" : {
-        "defaults" : {
-          "credentialScope" : {
-            "service" : "aws-marketplace"
-          }
-        },
-        "endpoints" : {
-          "us-gov-west-1" : { }
+          "us-isob-east-1" : { }
         }
       },
       "monitoring" : {
         "endpoints" : {
-          "us-gov-east-1" : { },
-          "us-gov-west-1" : { }
-        }
-      },
-      "polly" : {
-        "endpoints" : {
-          "us-gov-west-1" : { }
+          "us-isob-east-1" : { }
         }
       },
       "rds" : {
         "endpoints" : {
-          "us-gov-east-1" : { },
-          "us-gov-west-1" : { }
+          "us-isob-east-1" : { }
         }
       },
       "redshift" : {
         "endpoints" : {
-          "us-gov-east-1" : { },
-          "us-gov-west-1" : { }
-        }
-      },
-      "rekognition" : {
-        "endpoints" : {
-          "us-gov-west-1" : { }
-        }
-      },
-      "runtime.sagemaker" : {
-        "endpoints" : {
-          "us-gov-west-1" : { }
+          "us-isob-east-1" : { }
         }
       },
       "s3" : {
         "defaults" : {
-          "signatureVersions" : [ "s3", "s3v4" ]
-        },
-        "endpoints" : {
-          "fips-us-gov-west-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "s3-fips-us-gov-west-1.amazonaws.com"
-          },
-          "us-gov-east-1" : {
-            "hostname" : "s3.us-gov-east-1.amazonaws.com",
-            "protocols" : [ "http", "https" ]
-          },
-          "us-gov-west-1" : {
-            "hostname" : "s3.us-gov-west-1.amazonaws.com",
-            "protocols" : [ "http", "https" ]
-          }
-        }
-      },
-      "s3-control" : {
-        "defaults" : {
-          "protocols" : [ "https" ],
+          "protocols" : [ "http", "https" ],
           "signatureVersions" : [ "s3v4" ]
         },
         "endpoints" : {
-          "us-gov-east-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-east-1"
-            },
-            "hostname" : "s3-control.us-gov-east-1.amazonaws.com",
-            "signatureVersions" : [ "s3v4" ]
-          },
-          "us-gov-east-1-fips" : {
-            "credentialScope" : {
-              "region" : "us-gov-east-1"
-            },
-            "hostname" : "s3-control-fips.us-gov-east-1.amazonaws.com",
-            "signatureVersions" : [ "s3v4" ]
-          },
-          "us-gov-west-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "s3-control.us-gov-west-1.amazonaws.com",
-            "signatureVersions" : [ "s3v4" ]
-          },
-          "us-gov-west-1-fips" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "s3-control-fips.us-gov-west-1.amazonaws.com",
-            "signatureVersions" : [ "s3v4" ]
-          }
-        }
-      },
-      "sms" : {
-        "endpoints" : {
-          "us-gov-east-1" : { },
-          "us-gov-west-1" : { }
+          "us-isob-east-1" : { }
         }
       },
       "snowball" : {
         "endpoints" : {
-          "us-gov-east-1" : { },
-          "us-gov-west-1" : { }
+          "us-isob-east-1" : { }
         }
       },
       "sns" : {
+        "defaults" : {
+          "protocols" : [ "http", "https" ]
+        },
         "endpoints" : {
-          "us-gov-east-1" : { },
-          "us-gov-west-1" : {
-            "protocols" : [ "http", "https" ]
-          }
+          "us-isob-east-1" : { }
         }
       },
       "sqs" : {
+        "defaults" : {
+          "protocols" : [ "http", "https" ],
+          "sslCommonName" : "{region}.queue.{dnsSuffix}"
+        },
         "endpoints" : {
-          "us-gov-east-1" : { },
-          "us-gov-west-1" : {
-            "protocols" : [ "http", "https" ],
-            "sslCommonName" : "{region}.queue.{dnsSuffix}"
-          }
+          "us-isob-east-1" : { }
         }
       },
       "ssm" : {
         "endpoints" : {
-          "us-gov-east-1" : { },
-          "us-gov-west-1" : { }
+          "us-isob-east-1" : { }
         }
       },
       "states" : {
         "endpoints" : {
-          "us-gov-east-1" : { },
-          "us-gov-west-1" : { }
-        }
-      },
-      "storagegateway" : {
-        "endpoints" : {
-          "us-gov-west-1" : { }
+          "us-isob-east-1" : { }
         }
       },
       "streams.dynamodb" : {
         "defaults" : {
           "credentialScope" : {
             "service" : "dynamodb"
-          }
+          },
+          "protocols" : [ "http", "https" ]
         },
         "endpoints" : {
-          "us-gov-east-1" : { },
-          "us-gov-west-1" : { },
-          "us-gov-west-1-fips" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "dynamodb.us-gov-west-1.amazonaws.com"
-          }
+          "us-isob-east-1" : { }
         }
       },
       "sts" : {
         "endpoints" : {
-          "us-gov-east-1" : { },
-          "us-gov-west-1" : { }
-        }
-      },
-      "swf" : {
-        "endpoints" : {
-          "us-gov-east-1" : { },
-          "us-gov-west-1" : { }
-        }
-      },
-      "tagging" : {
-        "endpoints" : {
-          "us-gov-east-1" : { },
-          "us-gov-west-1" : { }
+          "us-isob-east-1" : { }
         }
       },
-      "translate" : {
-        "defaults" : {
-          "protocols" : [ "https" ]
-        },
+      "support" : {
         "endpoints" : {
-          "us-gov-west-1" : { },
-          "us-gov-west-1-fips" : {
+          "aws-iso-b-global" : {
             "credentialScope" : {
-              "region" : "us-gov-west-1"
+              "region" : "us-isob-east-1"
             },
-            "hostname" : "translate-fips.us-gov-west-1.amazonaws.com"
+            "hostname" : "support.us-isob-east-1.sc2s.sgov.gov"
           }
-        }
+        },
+        "partitionEndpoint" : "aws-iso-b-global"
       },
-      "workspaces" : {
+      "swf" : {
         "endpoints" : {
-          "us-gov-west-1" : { }
+          "us-isob-east-1" : { }
         }
       }
     }
diff --git a/core/regions/src/test/java/software/amazon/awssdk/regions/PartitionServiceMetadataTest.java b/core/regions/src/test/java/software/amazon/awssdk/regions/PartitionServiceMetadataTest.java
index 631025ef828e..e7d7cee6826a 100644
--- a/core/regions/src/test/java/software/amazon/awssdk/regions/PartitionServiceMetadataTest.java
+++ b/core/regions/src/test/java/software/amazon/awssdk/regions/PartitionServiceMetadataTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -18,6 +18,8 @@
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
 import org.junit.Test;
 
 public class PartitionServiceMetadataTest {
@@ -29,7 +31,7 @@ public class PartitionServiceMetadataTest {
             "acm", "apigateway", "application-autoscaling", "appstream2", "autoscaling", "batch",
             "cloudformation", "cloudhsm", "cloudsearch", "cloudtrail", "codebuild", "codecommit", "codedeploy",
             "codepipeline", "cognito-identity", "cognito-idp", "cognito-sync", "config", "cur", "data.iot",
-            "datapipeline", "directconnect", "dms", "ds", "dynamodb", "ec2", "ecr", "ecs", "elasticache",
+            "datapipeline", "directconnect", "dms", "ds", "dynamodb", "ec2", "ecs", "elasticache",
             "elasticbeanstalk", "elasticfilesystem", "elasticloadbalancing", "elasticmapreduce", "elastictranscoder",
             "email", "es", "events", "firehose", "gamelift", "glacier", "health", "inspector",
             "iot", "kinesis", "kinesisanalytics", "kms", "lambda", "lightsail", "logs", "machinelearning",
@@ -88,4 +90,48 @@ public void endpointFor_ReturnsEndpoint_ForAllGlobalServices_When_AwsUsGovGlobal
     public void regions_ReturnsGreaterThan15Regions_ForS3() {
         assertThat(ServiceMetadata.of("s3").regions().size()).isGreaterThan(15);
     }
+
+    @Test
+    public void servicePartitions_ReturnsAllValidPartitions() {
+        validateServicesAreInPartition(AWS_PARTITION_GLOBAL_SERVICES, "aws");
+        validateServicesAreInPartition(AWS_PARTITION_REGIONALIZED_SERVICES, "aws");
+        validateServicesAreInPartition(AWS_CN_PARTITION_GLOBAL_SERVICES, "aws-cn");
+        validateServicesAreInPartition(AWS_CN_PARTITION_REGIONALIZED_SERVICES, "aws-cn");
+        validateServicesAreInPartition(AWS_US_GOV_PARTITION_GLOBAL_SERVICES, "aws-us-gov");
+        validateServicesAreInPartition(AWS_US_GOV_PARTITION_REGIONALIZED_SERVICES, "aws-us-gov");
+    }
+
+    @Test
+    public void servicePartitions_HasGlobalEndpoint_ForGlobalServices() {
+        validateHasGlobalEndpointInPartition(AWS_PARTITION_GLOBAL_SERVICES, "aws", true);
+        validateHasGlobalEndpointInPartition(AWS_CN_PARTITION_GLOBAL_SERVICES, "aws-cn", true);
+        validateHasGlobalEndpointInPartition(AWS_US_GOV_PARTITION_GLOBAL_SERVICES, "aws-us-gov", true);
+    }
+
+    @Test
+    public void servicePartitions_HasNoGlobalEndpoint_ForRegionalServices() {
+        validateHasGlobalEndpointInPartition(AWS_PARTITION_REGIONALIZED_SERVICES, "aws", false);
+        validateHasGlobalEndpointInPartition(AWS_CN_PARTITION_REGIONALIZED_SERVICES, "aws-cn", false);
+        validateHasGlobalEndpointInPartition(AWS_US_GOV_PARTITION_REGIONALIZED_SERVICES, "aws-us-gov", false);
+    }
+
+    private void validateHasGlobalEndpointInPartition(List<String> services, String partition, boolean hasGlobalEndpoint) {
+        services.forEach(s -> assertThat(ServiceMetadata.of(s)
+                                                        .servicePartitions()
+                                                        .stream()
+                                                        .filter(sp -> sp.partition().id().equals(partition))
+                                                        .anyMatch(sp -> sp.globalRegion().isPresent()))
+            .as(s + " is global in " + partition)
+            .isEqualTo(hasGlobalEndpoint));
+    }
+
+    private void validateServicesAreInPartition(List<String> services, String partition) {
+        services.forEach(s -> assertThat(ServiceMetadata.of(s)
+                                                        .servicePartitions()
+                                                        .stream()
+                                                        .map(p -> p.partition().id())
+                                                        .collect(Collectors.toList()))
+            .as(s + " is in " + partition)
+            .contains(partition));
+    }
 }
diff --git a/core/regions/src/test/java/software/amazon/awssdk/regions/RegionTest.java b/core/regions/src/test/java/software/amazon/awssdk/regions/RegionTest.java
index 46880f938ffd..49f057b746c2 100644
--- a/core/regions/src/test/java/software/amazon/awssdk/regions/RegionTest.java
+++ b/core/regions/src/test/java/software/amazon/awssdk/regions/RegionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/regions/src/test/java/software/amazon/awssdk/regions/internal/util/ConnectionUtilsComponentTest.java b/core/regions/src/test/java/software/amazon/awssdk/regions/internal/util/ConnectionUtilsComponentTest.java
index a2fc98c4ad25..04f3579ef809 100644
--- a/core/regions/src/test/java/software/amazon/awssdk/regions/internal/util/ConnectionUtilsComponentTest.java
+++ b/core/regions/src/test/java/software/amazon/awssdk/regions/internal/util/ConnectionUtilsComponentTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/regions/src/test/java/software/amazon/awssdk/regions/internal/util/EC2MetadataUtilsServer.java b/core/regions/src/test/java/software/amazon/awssdk/regions/internal/util/EC2MetadataUtilsServer.java
index 9567eadc1be4..726d9cb9985d 100644
--- a/core/regions/src/test/java/software/amazon/awssdk/regions/internal/util/EC2MetadataUtilsServer.java
+++ b/core/regions/src/test/java/software/amazon/awssdk/regions/internal/util/EC2MetadataUtilsServer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -90,7 +90,7 @@ private void handleConnection(BufferedReader input,
         if (parts.length != 3) {
             throw new RuntimeException("Bogus request: " + line);
         }
-        if (!"GET".equals(parts[0])) {
+        if (!"GET".equals(parts[0]) && !"PUT".equals(parts[0])) {
             throw new RuntimeException("Bogus verb: " + line);
         }
 
@@ -107,13 +107,13 @@ private void handleConnection(BufferedReader input,
             .startsWith("/latest/meta-data/iam/security-credentials/")) {
 
             outputIamCred(output);
-
         } else if (path.equals("/latest/dynamic/instance-identity/document")) {
             outputInstanceInfo(output);
 
         } else if (path.equals("/latest/dynamic/instance-identity/signature")) {
             outputInstanceSignature(output);
-
+        } else if (path.equals("/latest/api/token")) {
+            outputToken(output);
         } else {
             throw new RuntimeException("Unknown path: " + path);
         }
@@ -132,6 +132,18 @@ private void ignoreRequest(BufferedReader input) throws IOException {
         }
     }
 
+    private void outputToken(PrintWriter output) {
+        String payload = "test-token";
+
+        output.println("HTTP/1.1 200 OK");
+        output.println("Connection: close");
+        output.println("Content-Length: " + payload.length());
+        output.println();
+
+        output.print(payload);
+        output.flush();
+    }
+
     private void outputIamInfo(PrintWriter output) throws IOException {
 
         String payload =
diff --git a/core/regions/src/test/java/software/amazon/awssdk/regions/internal/util/EC2MetadataUtilsTest.java b/core/regions/src/test/java/software/amazon/awssdk/regions/internal/util/EC2MetadataUtilsTest.java
new file mode 100644
index 000000000000..e24b403e542c
--- /dev/null
+++ b/core/regions/src/test/java/software/amazon/awssdk/regions/internal/util/EC2MetadataUtilsTest.java
@@ -0,0 +1,134 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.regions.internal.util;
+
+import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
+import static com.github.tomakehurst.wiremock.client.WireMock.equalTo;
+import static com.github.tomakehurst.wiremock.client.WireMock.get;
+import static com.github.tomakehurst.wiremock.client.WireMock.getRequestedFor;
+import static com.github.tomakehurst.wiremock.client.WireMock.put;
+import static com.github.tomakehurst.wiremock.client.WireMock.putRequestedFor;
+import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
+import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo;
+import static org.assertj.core.api.Assertions.assertThat;
+import com.github.tomakehurst.wiremock.client.WireMock;
+import com.github.tomakehurst.wiremock.junit.WireMockRule;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+import software.amazon.awssdk.core.SdkSystemSetting;
+import software.amazon.awssdk.core.exception.SdkClientException;
+
+public class EC2MetadataUtilsTest {
+    private static final String TOKEN_RESOURCE_PATH = "/latest/api/token";
+    private static final String TOKEN_HEADER = "x-aws-ec2-metadata-token";
+    private static final String EC2_METADATA_TOKEN_TTL_HEADER = "x-aws-ec2-metadata-token-ttl-seconds";
+
+    private static final String EC2_METADATA_ROOT = "/latest/meta-data";
+
+    private static final String AMI_ID_RESOURCE = EC2_METADATA_ROOT + "/ami-id";
+
+
+    @Rule
+    public ExpectedException thrown = ExpectedException.none();
+
+    @Rule
+    public WireMockRule mockMetadataEndpoint = new WireMockRule();
+
+    @Before
+    public void methodSetup() {
+        System.setProperty(SdkSystemSetting.AWS_EC2_METADATA_SERVICE_ENDPOINT.property(), "http://localhost:" + mockMetadataEndpoint.port());
+        EC2MetadataUtils.clearCache();
+    }
+
+    @Test
+    public void getToken_queriesCorrectPath() {
+        stubFor(put(urlPathEqualTo(TOKEN_RESOURCE_PATH)).willReturn(aResponse().withBody("some-token")));
+
+        String token = EC2MetadataUtils.getToken();
+        assertThat(token).isEqualTo("some-token");
+
+        WireMock.verify(putRequestedFor(urlPathEqualTo(TOKEN_RESOURCE_PATH)).withHeader(EC2_METADATA_TOKEN_TTL_HEADER, equalTo("21600")));
+    }
+
+    @Test
+    public void getAmiId_queriesAndIncludesToken() {
+        stubFor(put(urlPathEqualTo(TOKEN_RESOURCE_PATH)).willReturn(aResponse().withBody("some-token")));
+        stubFor(get(urlPathEqualTo(AMI_ID_RESOURCE)).willReturn(aResponse().withBody("{}")));
+
+        EC2MetadataUtils.getAmiId();
+
+        WireMock.verify(putRequestedFor(urlPathEqualTo(TOKEN_RESOURCE_PATH)).withHeader(EC2_METADATA_TOKEN_TTL_HEADER, equalTo("21600")));
+        WireMock.verify(getRequestedFor(urlPathEqualTo(AMI_ID_RESOURCE)).withHeader(TOKEN_HEADER, equalTo("some-token")));
+    }
+
+    @Test
+    public void getAmiId_tokenQueryTimeout_fallsBackToInsecure() {
+
+        stubFor(put(urlPathEqualTo(TOKEN_RESOURCE_PATH)).willReturn(aResponse().withFixedDelay(Integer.MAX_VALUE)));
+        stubFor(get(urlPathEqualTo(AMI_ID_RESOURCE)).willReturn(aResponse().withBody("{}")));
+
+        EC2MetadataUtils.getAmiId();
+
+        WireMock.verify(putRequestedFor(urlPathEqualTo(TOKEN_RESOURCE_PATH)).withHeader(EC2_METADATA_TOKEN_TTL_HEADER, equalTo("21600")));
+        WireMock.verify(getRequestedFor(urlPathEqualTo(AMI_ID_RESOURCE)).withoutHeader(TOKEN_HEADER));
+    }
+
+    @Test
+    public void getAmiId_queriesTokenResource_403Error_fallbackToInsecure() {
+        stubFor(put(urlPathEqualTo(TOKEN_RESOURCE_PATH)).willReturn(aResponse().withStatus(403).withBody("oops")));
+        stubFor(get(urlPathEqualTo(AMI_ID_RESOURCE)).willReturn(aResponse().withBody("{}")));
+
+        EC2MetadataUtils.getAmiId();
+
+        WireMock.verify(putRequestedFor(urlPathEqualTo(TOKEN_RESOURCE_PATH)).withHeader(EC2_METADATA_TOKEN_TTL_HEADER, equalTo("21600")));
+        WireMock.verify(getRequestedFor(urlPathEqualTo(AMI_ID_RESOURCE)).withoutHeader(TOKEN_HEADER));
+    }
+
+    @Test
+    public void getAmiId_queriesTokenResource_404Error_fallbackToInsecure() {
+        stubFor(put(urlPathEqualTo(TOKEN_RESOURCE_PATH)).willReturn(aResponse().withStatus(404).withBody("oops")));
+        stubFor(get(urlPathEqualTo(AMI_ID_RESOURCE)).willReturn(aResponse().withBody("{}")));
+
+        EC2MetadataUtils.getAmiId();
+
+        WireMock.verify(putRequestedFor(urlPathEqualTo(TOKEN_RESOURCE_PATH)).withHeader(EC2_METADATA_TOKEN_TTL_HEADER, equalTo("21600")));
+        WireMock.verify(getRequestedFor(urlPathEqualTo(AMI_ID_RESOURCE)).withoutHeader(TOKEN_HEADER));
+    }
+
+    @Test
+    public void getAmiId_queriesTokenResource_405Error_fallbackToInsecure() {
+        stubFor(put(urlPathEqualTo(TOKEN_RESOURCE_PATH)).willReturn(aResponse().withStatus(405).withBody("oops")));
+        stubFor(get(urlPathEqualTo(AMI_ID_RESOURCE)).willReturn(aResponse().withBody("{}")));
+
+        EC2MetadataUtils.getAmiId();
+
+        WireMock.verify(putRequestedFor(urlPathEqualTo(TOKEN_RESOURCE_PATH)).withHeader(EC2_METADATA_TOKEN_TTL_HEADER, equalTo("21600")));
+        WireMock.verify(getRequestedFor(urlPathEqualTo(AMI_ID_RESOURCE)).withoutHeader(TOKEN_HEADER));
+    }
+
+    @Test
+    public void getAmiId_queriesTokenResource_400Error_throws() {
+        thrown.expect(SdkClientException.class);
+        thrown.expectMessage("token");
+
+        stubFor(put(urlPathEqualTo(TOKEN_RESOURCE_PATH)).willReturn(aResponse().withStatus(400).withBody("oops")));
+        stubFor(get(urlPathEqualTo(AMI_ID_RESOURCE)).willReturn(aResponse().withBody("{}")));
+
+        EC2MetadataUtils.getAmiId();
+    }
+}
diff --git a/core/regions/src/test/java/software/amazon/awssdk/regions/internal/util/Ec2MetadataUtilsTt0049160280Test.java b/core/regions/src/test/java/software/amazon/awssdk/regions/internal/util/Ec2MetadataUtilsTt0049160280Test.java
index a9297f47fe57..f58860822c5f 100644
--- a/core/regions/src/test/java/software/amazon/awssdk/regions/internal/util/Ec2MetadataUtilsTt0049160280Test.java
+++ b/core/regions/src/test/java/software/amazon/awssdk/regions/internal/util/Ec2MetadataUtilsTt0049160280Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/regions/src/test/java/software/amazon/awssdk/regions/internal/util/SocketUtils.java b/core/regions/src/test/java/software/amazon/awssdk/regions/internal/util/SocketUtils.java
index 9bfd70df111e..e33a6db05e94 100644
--- a/core/regions/src/test/java/software/amazon/awssdk/regions/internal/util/SocketUtils.java
+++ b/core/regions/src/test/java/software/amazon/awssdk/regions/internal/util/SocketUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/regions/src/test/java/software/amazon/awssdk/regions/providers/AwsProfileRegionProviderTest.java b/core/regions/src/test/java/software/amazon/awssdk/regions/providers/AwsProfileRegionProviderTest.java
index 401171bff3fc..1a73d8025b4e 100644
--- a/core/regions/src/test/java/software/amazon/awssdk/regions/providers/AwsProfileRegionProviderTest.java
+++ b/core/regions/src/test/java/software/amazon/awssdk/regions/providers/AwsProfileRegionProviderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -23,6 +23,7 @@
 import org.junit.Rule;
 import org.junit.Test;
 import software.amazon.awssdk.core.exception.SdkClientException;
+import software.amazon.awssdk.profiles.ProfileFile;
 import software.amazon.awssdk.profiles.ProfileFileSystemSetting;
 import software.amazon.awssdk.regions.Region;
 import software.amazon.awssdk.testutils.EnvironmentVariableHelper;
diff --git a/core/regions/src/test/java/software/amazon/awssdk/regions/providers/AwsRegionProviderChainTest.java b/core/regions/src/test/java/software/amazon/awssdk/regions/providers/AwsRegionProviderChainTest.java
index cb9a3a2f7601..78345cfa0251 100644
--- a/core/regions/src/test/java/software/amazon/awssdk/regions/providers/AwsRegionProviderChainTest.java
+++ b/core/regions/src/test/java/software/amazon/awssdk/regions/providers/AwsRegionProviderChainTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/regions/src/test/java/software/amazon/awssdk/regions/providers/InstanceProfileRegionProviderTest.java b/core/regions/src/test/java/software/amazon/awssdk/regions/providers/InstanceProfileRegionProviderTest.java
index 5c16cdfb3eb7..052f4c009f84 100644
--- a/core/regions/src/test/java/software/amazon/awssdk/regions/providers/InstanceProfileRegionProviderTest.java
+++ b/core/regions/src/test/java/software/amazon/awssdk/regions/providers/InstanceProfileRegionProviderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/regions/src/test/java/software/amazon/awssdk/regions/providers/LazyAwsRegionProviderTest.java b/core/regions/src/test/java/software/amazon/awssdk/regions/providers/LazyAwsRegionProviderTest.java
index e2ff7246878f..83bff94bdbdc 100644
--- a/core/regions/src/test/java/software/amazon/awssdk/regions/providers/LazyAwsRegionProviderTest.java
+++ b/core/regions/src/test/java/software/amazon/awssdk/regions/providers/LazyAwsRegionProviderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/regions/src/test/java/software/amazon/awssdk/regions/servicemetadata/EnhancedS3ServiceMetadataTest.java b/core/regions/src/test/java/software/amazon/awssdk/regions/servicemetadata/EnhancedS3ServiceMetadataTest.java
new file mode 100644
index 000000000000..062592471266
--- /dev/null
+++ b/core/regions/src/test/java/software/amazon/awssdk/regions/servicemetadata/EnhancedS3ServiceMetadataTest.java
@@ -0,0 +1,100 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.regions.servicemetadata;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.nio.file.Paths;
+import org.junit.After;
+import org.junit.Test;
+import software.amazon.awssdk.core.SdkSystemSetting;
+import software.amazon.awssdk.profiles.ProfileFile;
+import software.amazon.awssdk.profiles.ProfileFileSystemSetting;
+import software.amazon.awssdk.regions.Region;
+import software.amazon.awssdk.testutils.EnvironmentVariableHelper;
+
+public class EnhancedS3ServiceMetadataTest {
+    private static final EnvironmentVariableHelper ENVIRONMENT_VARIABLE_HELPER = new EnvironmentVariableHelper();
+    private static final URI S3_GLOBAL_ENDPOINT = URI.create("s3.amazonaws.com");
+    private static final URI S3_IAD_REGIONAL_ENDPOINT = URI.create("s3.us-east-1.amazonaws.com");
+
+    private EnhancedS3ServiceMetadata enhancedMetadata = new EnhancedS3ServiceMetadata();
+
+    @After
+    public void methodSetup() {
+        ENVIRONMENT_VARIABLE_HELPER.reset();
+        System.clearProperty(ProfileFileSystemSetting.AWS_PROFILE.property());
+        System.clearProperty(ProfileFileSystemSetting.AWS_CONFIG_FILE.property());
+
+        enhancedMetadata = new EnhancedS3ServiceMetadata();
+    }
+
+    @Test
+    public void optionNotSet_returnsGlobalEndpoint() {
+        assertThat(enhancedMetadata.endpointFor(Region.US_EAST_1)).isEqualTo(S3_GLOBAL_ENDPOINT);
+    }
+
+    @Test
+    public void regionalSet_profile_returnsRegionalEndpoint() throws URISyntaxException {
+        String testFile = "/profileconfig/s3_regional_config_profile.tst";
+
+        System.setProperty(ProfileFileSystemSetting.AWS_PROFILE.property(), "regional_s3_endpoint");
+        System.setProperty(ProfileFileSystemSetting.AWS_CONFIG_FILE.property(), Paths.get(getClass().getResource(testFile).toURI()).toString());
+
+        assertThat(enhancedMetadata.endpointFor(Region.US_EAST_1)).isEqualTo(S3_IAD_REGIONAL_ENDPOINT);
+    }
+
+    @Test
+    public void reconfiguredProfile_returnsRegionalEndpoint() throws URISyntaxException {
+        String testFile = "/profileconfig/s3_regional_config_profile.tst";
+
+        ProfileFile file = ProfileFile.builder()
+                                      .content(Paths.get(getClass().getResource(testFile).toURI()))
+                                      .type(ProfileFile.Type.CONFIGURATION)
+                                      .build();
+
+        assertThat(enhancedMetadata.reconfigure(c -> c.profileFile(() -> file)
+                                                      .profileName("regional_s3_endpoint"))
+                                   .endpointFor(Region.US_EAST_1))
+            .isEqualTo(S3_IAD_REGIONAL_ENDPOINT);
+    }
+
+    @Test
+    public void regionalSet_env_returnsRegionalEndpoint() {
+        ENVIRONMENT_VARIABLE_HELPER.set(SdkSystemSetting.AWS_S3_US_EAST_1_REGIONAL_ENDPOINT.environmentVariable(), "regional");
+        assertThat(enhancedMetadata.endpointFor(Region.US_EAST_1)).isEqualTo(S3_IAD_REGIONAL_ENDPOINT);
+    }
+
+    @Test
+    public void regionalSet_mixedCase_env_returnsRegionalEndpoint() {
+        ENVIRONMENT_VARIABLE_HELPER.set(SdkSystemSetting.AWS_S3_US_EAST_1_REGIONAL_ENDPOINT.environmentVariable(), "rEgIoNaL");
+        assertThat(enhancedMetadata.endpointFor(Region.US_EAST_1)).isEqualTo(S3_IAD_REGIONAL_ENDPOINT);
+    }
+
+    @Test
+    public void global_env_returnsGlobalEndpoint() {
+        ENVIRONMENT_VARIABLE_HELPER.set(SdkSystemSetting.AWS_S3_US_EAST_1_REGIONAL_ENDPOINT.environmentVariable(), "non_regional");
+        assertThat(enhancedMetadata.endpointFor(Region.US_EAST_1)).isEqualTo(S3_GLOBAL_ENDPOINT);
+    }
+
+    @Test
+    public void valueNotEqualToRegional_env_returnsGlobalEndpoint() {
+        ENVIRONMENT_VARIABLE_HELPER.set(SdkSystemSetting.AWS_S3_US_EAST_1_REGIONAL_ENDPOINT.environmentVariable(), "some-nonsense-value");
+        assertThat(enhancedMetadata.endpointFor(Region.US_EAST_1)).isEqualTo(S3_GLOBAL_ENDPOINT);
+    }
+}
diff --git a/core/regions/src/test/java/software/amazon/awssdk/regions/servicemetadata/GeneratedServiceMetadataProviderTest.java b/core/regions/src/test/java/software/amazon/awssdk/regions/servicemetadata/GeneratedServiceMetadataProviderTest.java
new file mode 100644
index 000000000000..6a99b1e71b7c
--- /dev/null
+++ b/core/regions/src/test/java/software/amazon/awssdk/regions/servicemetadata/GeneratedServiceMetadataProviderTest.java
@@ -0,0 +1,29 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.regions.servicemetadata;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import org.junit.Test;
+import software.amazon.awssdk.regions.GeneratedServiceMetadataProvider;
+
+public class GeneratedServiceMetadataProviderTest {
+    private static final GeneratedServiceMetadataProvider PROVIDER = new GeneratedServiceMetadataProvider();
+
+    @Test
+    public void s3Metadata_isEnhanced() {
+        assertThat(PROVIDER.serviceMetadata("s3")).isInstanceOf(EnhancedS3ServiceMetadata.class);
+    }
+}
diff --git a/core/regions/src/test/java/software/amazon/awssdk/regions/util/HttpCredentialsUtilsTest.java b/core/regions/src/test/java/software/amazon/awssdk/regions/util/HttpCredentialsUtilsTest.java
index 9f89cb24247e..e96d4a9174c0 100644
--- a/core/regions/src/test/java/software/amazon/awssdk/regions/util/HttpCredentialsUtilsTest.java
+++ b/core/regions/src/test/java/software/amazon/awssdk/regions/util/HttpCredentialsUtilsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -153,13 +153,13 @@ public void readResouceNonJsonErrorBody() throws IOException {
      */
     @Test
     public void readResouceWithDefaultRetryPolicy_DoesNotRetry_ForIoException() throws IOException {
-        Mockito.when(mockConnection.connectToEndpoint(endpoint, headers)).thenThrow(new IOException());
+        Mockito.when(mockConnection.connectToEndpoint(endpoint, headers, "GET")).thenThrow(new IOException());
 
         try {
             new HttpResourcesUtils(mockConnection).readResource(endpoint);
             fail("Expected an IOexception");
         } catch (IOException exception) {
-            Mockito.verify(mockConnection, Mockito.times(1)).connectToEndpoint(endpoint, headers);
+            Mockito.verify(mockConnection, Mockito.times(1)).connectToEndpoint(endpoint, headers, "GET");
         }
     }
 
@@ -170,13 +170,13 @@ public void readResouceWithDefaultRetryPolicy_DoesNotRetry_ForIoException() thro
      */
     @Test
     public void readResouceWithCustomRetryPolicy_DoesRetry_ForIoException() throws IOException {
-        Mockito.when(mockConnection.connectToEndpoint(endpoint, headers)).thenThrow(new IOException());
+        Mockito.when(mockConnection.connectToEndpoint(endpoint, headers, "GET")).thenThrow(new IOException());
 
         try {
             new HttpResourcesUtils(mockConnection).readResource(endpointProvider(endpoint, customRetryPolicy));
             fail("Expected an IOexception");
         } catch (IOException exception) {
-            Mockito.verify(mockConnection, Mockito.times(CustomRetryPolicy.MAX_RETRIES + 1)).connectToEndpoint(endpoint, headers);
+            Mockito.verify(mockConnection, Mockito.times(CustomRetryPolicy.MAX_RETRIES + 1)).connectToEndpoint(endpoint, headers, "GET");
         }
     }
 
@@ -188,13 +188,13 @@ public void readResouceWithCustomRetryPolicy_DoesRetry_ForIoException() throws I
     @Test
     public void readResouceWithCustomRetryPolicy_DoesNotRetry_ForNonIoException() throws IOException {
         generateStub(500, "Non Json error body");
-        Mockito.when(mockConnection.connectToEndpoint(endpoint, headers)).thenCallRealMethod();
+        Mockito.when(mockConnection.connectToEndpoint(endpoint, headers, "GET")).thenCallRealMethod();
 
         try {
             new HttpResourcesUtils(mockConnection).readResource(endpointProvider(endpoint, customRetryPolicy));
             fail("Expected an SdkServiceException");
         } catch (SdkServiceException exception) {
-            Mockito.verify(mockConnection, Mockito.times(1)).connectToEndpoint(endpoint, headers);
+            Mockito.verify(mockConnection, Mockito.times(1)).connectToEndpoint(endpoint, headers, "GET");
         }
     }
 
diff --git a/core/regions/src/test/resources/profileconfig/s3_regional_config_profile.tst b/core/regions/src/test/resources/profileconfig/s3_regional_config_profile.tst
new file mode 100644
index 000000000000..63f652f50aa5
--- /dev/null
+++ b/core/regions/src/test/resources/profileconfig/s3_regional_config_profile.tst
@@ -0,0 +1,2 @@
+[profile regional_s3_endpoint]
+s3_us_east_1_regional_endpoint=regional
\ No newline at end of file
diff --git a/core/sdk-core/pom.xml b/core/sdk-core/pom.xml
index d16ad87ba34f..b7aed7ff01f0 100644
--- a/core/sdk-core/pom.xml
+++ b/core/sdk-core/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>core</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>sdk-core</artifactId>
     <name>AWS Java SDK :: SDK Core</name>
diff --git a/core/sdk-core/src/it/java/software/amazon/awssdk/core/http/AmazonHttpClientSslHandshakeTimeoutIntegrationTest.java b/core/sdk-core/src/it/java/software/amazon/awssdk/core/http/AmazonHttpClientSslHandshakeTimeoutIntegrationTest.java
index efeed7ed2d22..fcce71832575 100644
--- a/core/sdk-core/src/it/java/software/amazon/awssdk/core/http/AmazonHttpClientSslHandshakeTimeoutIntegrationTest.java
+++ b/core/sdk-core/src/it/java/software/amazon/awssdk/core/http/AmazonHttpClientSslHandshakeTimeoutIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -17,11 +17,14 @@
 
 import static org.junit.Assert.fail;
 import static software.amazon.awssdk.core.internal.http.timers.ClientExecutionAndRequestTimerTestUtils.executionContext;
+import static software.amazon.awssdk.core.internal.util.ResponseHandlerTestUtils.combinedSyncResponseHandler;
 
 import java.time.Duration;
+
 import org.apache.http.conn.ConnectTimeoutException;
 import org.junit.Assert;
 import org.junit.Test;
+
 import software.amazon.awssdk.core.exception.SdkClientException;
 import software.amazon.awssdk.core.internal.http.AmazonSyncHttpClient;
 import software.amazon.awssdk.core.internal.http.response.NullErrorResponseHandler;
@@ -61,8 +64,7 @@ public void testSslHandshakeTimeout() {
                       .request(request)
                       .originalRequest(NoopTestRequest.builder().build())
                       .executionContext(executionContext(request))
-                      .errorResponseHandler(new NullErrorResponseHandler())
-                      .execute();
+                      .execute(combinedSyncResponseHandler(null, new NullErrorResponseHandler()));
             fail("Client-side socket read timeout is expected!");
 
         } catch (SdkClientException e) {
diff --git a/core/sdk-core/src/it/java/software/amazon/awssdk/core/http/ConnectionPoolMaxConnectionsIntegrationTest.java b/core/sdk-core/src/it/java/software/amazon/awssdk/core/http/ConnectionPoolMaxConnectionsIntegrationTest.java
index 536899224e10..ce2a0c73e410 100644
--- a/core/sdk-core/src/it/java/software/amazon/awssdk/core/http/ConnectionPoolMaxConnectionsIntegrationTest.java
+++ b/core/sdk-core/src/it/java/software/amazon/awssdk/core/http/ConnectionPoolMaxConnectionsIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -16,13 +16,16 @@
 package software.amazon.awssdk.core.http;
 
 import static software.amazon.awssdk.core.internal.http.timers.ClientExecutionAndRequestTimerTestUtils.executionContext;
+import static software.amazon.awssdk.core.internal.util.ResponseHandlerTestUtils.combinedSyncResponseHandler;
 
 import java.time.Duration;
+
 import org.apache.http.conn.ConnectionPoolTimeoutException;
 import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
+
 import software.amazon.awssdk.core.exception.SdkClientException;
 import software.amazon.awssdk.core.http.server.MockServer;
 import software.amazon.awssdk.core.internal.http.AmazonSyncHttpClient;
@@ -70,7 +73,7 @@ public void leasing_a_new_connection_fails_with_connection_pool_timeout() {
                   .request(request)
                   .originalRequest(NoopTestRequest.builder().build())
                   .executionContext(executionContext(request))
-                  .execute(new EmptySdkResponseHandler());
+                  .execute(combinedSyncResponseHandler(new EmptySdkResponseHandler(), null));
 
         try {
             // A new connection will be leased here which would fail in
@@ -79,7 +82,7 @@ public void leasing_a_new_connection_fails_with_connection_pool_timeout() {
                       .request(request)
                       .originalRequest(NoopTestRequest.builder().build())
                       .executionContext(executionContext(request))
-                      .execute();
+                      .execute(combinedSyncResponseHandler(null, null));
             Assert.fail("Connection pool timeout exception is expected!");
         } catch (SdkClientException e) {
             Assert.assertTrue(e.getCause() instanceof ConnectionPoolTimeoutException);
diff --git a/core/sdk-core/src/it/java/software/amazon/awssdk/core/http/timers/client/AbortedExceptionClientExecutionTimerIntegrationTest.java b/core/sdk-core/src/it/java/software/amazon/awssdk/core/http/timers/client/AbortedExceptionClientExecutionTimerIntegrationTest.java
index 837926fa22db..99709f8cb409 100644
--- a/core/sdk-core/src/it/java/software/amazon/awssdk/core/http/timers/client/AbortedExceptionClientExecutionTimerIntegrationTest.java
+++ b/core/sdk-core/src/it/java/software/amazon/awssdk/core/http/timers/client/AbortedExceptionClientExecutionTimerIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/ApiName.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/ApiName.java
index 95d692a4a908..a574f0b306bd 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/ApiName.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/ApiName.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/BytesWrapper.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/BytesWrapper.java
index d02bcb045e07..e2e735b31c09 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/BytesWrapper.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/BytesWrapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/ClientType.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/ClientType.java
index 0b6090184a11..949d9fc99310 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/ClientType.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/ClientType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/Protocol.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/Protocol.java
index 70987838fef2..4fc57c970142 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/Protocol.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/Protocol.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/RequestOption.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/RequestOption.java
index d138c072ee95..5c7446082607 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/RequestOption.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/RequestOption.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -22,5 +22,6 @@
  */
 @SdkProtectedApi
 public final class RequestOption {
-    private RequestOption() {}
+    private RequestOption() {
+    }
 }
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/RequestOverrideConfiguration.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/RequestOverrideConfiguration.java
index 9b51ccdd4c7d..2800ba0ebc91 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/RequestOverrideConfiguration.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/RequestOverrideConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -173,6 +173,10 @@ public interface Builder<B extends Builder> {
 
         /**
          * Add a single header to be set on the HTTP request.
+         * <p>
+         * This overrides any values for the given header set on the request by default by the SDK, as well as header
+         * overrides set at the client level using
+         * {@link software.amazon.awssdk.core.client.config.ClientOverrideConfiguration}.
          *
          * <p>
          * This overrides any values already configured with this header name in the builder.
@@ -188,6 +192,10 @@ default B putHeader(String name, String value) {
 
         /**
          * Add a single header with multiple values to be set on the HTTP request.
+         * <p>
+         * This overrides any values for the given header set on the request by default by the SDK, as well as header
+         * overrides set at the client level using
+         * {@link software.amazon.awssdk.core.client.config.ClientOverrideConfiguration}.
          *
          * <p>
          * This overrides any values already configured with this header name in the builder.
@@ -200,6 +208,10 @@ default B putHeader(String name, String value) {
 
         /**
          * Add additional headers to be set on the HTTP request.
+         * <p>
+         * This overrides any values for the given headers set on the request by default by the SDK, as well as header
+         * overrides set at the client level using
+         * {@link software.amazon.awssdk.core.client.config.ClientOverrideConfiguration}.
          *
          * <p>
          * This completely overrides any values currently configured in the builder.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/Response.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/Response.java
new file mode 100644
index 000000000000..653226112e4a
--- /dev/null
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/Response.java
@@ -0,0 +1,175 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.core;
+
+import software.amazon.awssdk.annotations.SdkProtectedApi;
+import software.amazon.awssdk.core.exception.SdkException;
+import software.amazon.awssdk.http.SdkHttpFullResponse;
+
+/**
+ * Response wrapper that indicates success or failure with the associated unmarshalled response object or exception
+ * object. This object is used by the core request/response pipeline to pass response metadata alongside the actual
+ * deserialized response object through different stages of the pipeline.
+ *
+ * @param <T> the modelled SDK response type.
+ */
+@SdkProtectedApi
+public final class Response<T> {
+    private final Boolean isSuccess;
+    private final T response;
+    private final SdkException exception;
+    private final SdkHttpFullResponse httpResponse;
+
+    private Response(Builder<T> builder) {
+        this.isSuccess = builder.isSuccess;
+        this.response = builder.response;
+        this.exception = builder.exception;
+        this.httpResponse = builder.httpResponse;
+    }
+
+    /**
+     * Returns a newly initialized builder object for a {@link Response}
+     * @param <T> Modelled response type.
+     */
+    public static <T> Builder<T> builder() {
+        return new Builder<>();
+    }
+
+    /**
+     * Creates a new builder with initial values pulled from the current object.
+     */
+    public Builder<T> toBuilder() {
+        return new Builder<T>().isSuccess(this.isSuccess)
+                               .response(this.response)
+                               .exception(this.exception)
+                               .httpResponse(this.httpResponse);
+    }
+
+    /**
+     * The modelled response object returned by the service. If the response was a failure, this value is likely to
+     * be null.
+     */
+    public T response() {
+        return response;
+    }
+
+    /**
+     * The modelled exception returned by the service. If the response was not a failure, this value is likely to
+     * be null.
+     */
+    public SdkException exception() {
+        return exception;
+    }
+
+    /**
+     * The HTTP response that was received by the SDK prior to determining the result.
+     */
+    public SdkHttpFullResponse httpResponse() {
+        return httpResponse;
+    }
+
+    /**
+     * Indicates whether the result indicates success or failure of the original request. A true value indicates
+     * success; a false value indicates failure.
+     */
+    public Boolean isSuccess() {
+        return isSuccess;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        Response<?> response1 = (Response<?>) o;
+
+        if (isSuccess != null ? ! isSuccess.equals(response1.isSuccess) : response1.isSuccess != null) {
+            return false;
+        }
+        if (response != null ? ! response.equals(response1.response) : response1.response != null) {
+            return false;
+        }
+        if (exception != null ? ! exception.equals(response1.exception) : response1.exception != null) {
+            return false;
+        }
+        return httpResponse != null ? httpResponse.equals(response1.httpResponse) : response1.httpResponse == null;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = isSuccess != null ? isSuccess.hashCode() : 0;
+        result = 31 * result + (response != null ? response.hashCode() : 0);
+        result = 31 * result + (exception != null ? exception.hashCode() : 0);
+        result = 31 * result + (httpResponse != null ? httpResponse.hashCode() : 0);
+        return result;
+    }
+
+    public static final class Builder<T> {
+        private Boolean isSuccess;
+        private T response;
+        private SdkException exception;
+        private SdkHttpFullResponse httpResponse;
+
+        private Builder() {
+        }
+
+        /**
+         * Indicates whether the result indicates success or failure of the original request. A true value indicates
+         * success; a false value indicates failure.
+         */
+        public Builder<T> isSuccess(Boolean success) {
+            isSuccess = success;
+            return this;
+        }
+
+        /**
+         * The modelled response object returned by the service. If the response was a failure, this value is likely to
+         * be null.
+         */
+        public Builder<T> response(T response) {
+            this.response = response;
+            return this;
+        }
+
+        /**
+         * The modelled exception returned by the service. If the response was not a failure, this value is likely to
+         * be null.
+         */
+        public Builder<T> exception(SdkException exception) {
+            this.exception = exception;
+            return this;
+        }
+
+        /**
+         * The HTTP response that was received by the SDK prior to determining the result.
+         */
+        public Builder<T> httpResponse(SdkHttpFullResponse httpResponse) {
+            this.httpResponse = httpResponse;
+            return this;
+        }
+
+        /**
+         * Builds a {@link Response} object based on the values held by this builder.
+         */
+        public Response<T> build() {
+            return new Response<>(this);
+        }
+    }
+}
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/ResponseBytes.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/ResponseBytes.java
index a040b9d3bbef..61da73085c1b 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/ResponseBytes.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/ResponseBytes.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/ResponseInputStream.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/ResponseInputStream.java
index b689dc2d961b..36354c106140 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/ResponseInputStream.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/ResponseInputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/SdkBytes.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/SdkBytes.java
index 37b113ed9fa6..065794fc0b4a 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/SdkBytes.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/SdkBytes.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/SdkClient.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/SdkClient.java
index 05e2c9595ad5..09c686a7eb16 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/SdkClient.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/SdkClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/SdkField.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/SdkField.java
index 9ed13120725f..e0e16bf4303e 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/SdkField.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/SdkField.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/SdkGlobalTime.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/SdkGlobalTime.java
index 121bbe1a5da0..2dcfa6e7a064 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/SdkGlobalTime.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/SdkGlobalTime.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/SdkPojo.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/SdkPojo.java
index 5128692f4205..918c6898f1b2 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/SdkPojo.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/SdkPojo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/SdkRequest.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/SdkRequest.java
index d4104d1a8326..c8851be1c8ca 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/SdkRequest.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/SdkRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/SdkRequestOverrideConfiguration.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/SdkRequestOverrideConfiguration.java
index 4d1f2a6f9f31..d53d198afd30 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/SdkRequestOverrideConfiguration.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/SdkRequestOverrideConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/SdkResponse.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/SdkResponse.java
index c845bc561517..02f64020fe04 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/SdkResponse.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/SdkResponse.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/SdkStandardLogger.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/SdkStandardLogger.java
index a52635a6f9ff..06a60c5ba60a 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/SdkStandardLogger.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/SdkStandardLogger.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -36,5 +36,6 @@ public final class SdkStandardLogger {
      */
     public static final Logger REQUEST_ID_LOGGER = Logger.loggerFor("software.amazon.awssdk.requestId");
 
-    private SdkStandardLogger() {}
+    private SdkStandardLogger() {
+    }
 }
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/SdkSystemSetting.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/SdkSystemSetting.java
index 1a603bfa65a3..c46a37e31706 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/SdkSystemSetting.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/SdkSystemSetting.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -16,6 +16,9 @@
 package software.amazon.awssdk.core;
 
 import software.amazon.awssdk.annotations.SdkProtectedApi;
+import software.amazon.awssdk.core.client.config.ClientOverrideConfiguration;
+import software.amazon.awssdk.core.retry.RetryMode;
+import software.amazon.awssdk.core.retry.RetryPolicy;
 import software.amazon.awssdk.utils.SystemSetting;
 
 /**
@@ -142,7 +145,28 @@ public enum SdkSystemSetting implements SystemSetting {
     /**
      * Whether endpoint discovery should be enabled.
      */
-    AWS_ENDPOINT_DISCOVERY_ENABLED("aws.endpointDiscoveryEnabled", "false");
+    AWS_ENDPOINT_DISCOVERY_ENABLED("aws.endpointDiscoveryEnabled", null),
+
+    /**
+     * The S3 regional endpoint setting for the {@code us-east-1} region. Setting the value to {@code regional} causes
+     * the SDK to use the {@code s3.us-east-1.amazonaws.com} endpoint when using the {@code US_EAST_1} region instead of
+     * the global {@code s3.amazonaws.com}. Using the regional endpoint is disabled by default.
+     */
+    AWS_S3_US_EAST_1_REGIONAL_ENDPOINT("aws.s3UseUsEast1RegionalEndpoint", null),
+
+    /**
+     * Which {@link RetryMode} to use for the default {@link RetryPolicy}, when one is not specified at the client level.
+     */
+    AWS_RETRY_MODE("aws.retryMode", null),
+
+    /**
+     * Defines the default value for {@link RetryPolicy.Builder#numRetries(Integer)}, if the retry count is not overridden in the
+     * retry policy configured via {@link ClientOverrideConfiguration.Builder#retryPolicy(RetryPolicy)}. This is one more than
+     * the number of retries, so aws.maxAttempts = 1 is 0 retries.
+     */
+    AWS_MAX_ATTEMPTS("aws.maxAttempts", null),
+
+    ;
 
     private final String systemProperty;
     private final String defaultValue;
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/ServiceConfiguration.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/ServiceConfiguration.java
index 822de4ea3424..50a526e728cc 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/ServiceConfiguration.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/ServiceConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/adapter/StandardMemberCopier.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/adapter/StandardMemberCopier.java
index ad828ebb5501..b745b2ab0923 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/adapter/StandardMemberCopier.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/adapter/StandardMemberCopier.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/adapter/TypeAdapter.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/adapter/TypeAdapter.java
index d93a956a538d..b972b7f508e0 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/adapter/TypeAdapter.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/adapter/TypeAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/async/AsyncRequestBody.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/async/AsyncRequestBody.java
index 61e48c9b692a..0d66d6869113 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/async/AsyncRequestBody.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/async/AsyncRequestBody.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/async/AsyncResponseTransformer.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/async/AsyncResponseTransformer.java
index 381abfef3548..b096143d776b 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/async/AsyncResponseTransformer.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/async/AsyncResponseTransformer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -19,7 +19,6 @@
 import java.nio.ByteBuffer;
 import java.nio.file.Path;
 import java.util.concurrent.CompletableFuture;
-
 import software.amazon.awssdk.annotations.SdkPublicApi;
 import software.amazon.awssdk.core.ResponseBytes;
 import software.amazon.awssdk.core.internal.async.ByteArrayAsyncResponseTransformer;
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/async/DrainingSubscriber.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/async/DrainingSubscriber.java
index be3c1a64ab2f..20de5e7466e7 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/async/DrainingSubscriber.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/async/DrainingSubscriber.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/async/EmptyPublisher.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/async/EmptyPublisher.java
index 437e138c11f0..819e4ed3f9e3 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/async/EmptyPublisher.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/async/EmptyPublisher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/async/SdkPublisher.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/async/SdkPublisher.java
index 9e74c640939c..d69e55ff568d 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/async/SdkPublisher.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/async/SdkPublisher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/checksums/Md5Checksum.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/checksums/Md5Checksum.java
index 72ca08fbd43e..79121df4fe9d 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/checksums/Md5Checksum.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/checksums/Md5Checksum.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/checksums/SdkChecksum.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/checksums/SdkChecksum.java
index 071347c47ca1..2d541f2da633 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/checksums/SdkChecksum.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/checksums/SdkChecksum.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/client/builder/SdkAsyncClientBuilder.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/client/builder/SdkAsyncClientBuilder.java
index 16462315aa5e..cb02b440d49a 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/client/builder/SdkAsyncClientBuilder.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/client/builder/SdkAsyncClientBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/client/builder/SdkClientBuilder.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/client/builder/SdkClientBuilder.java
index bbd218a03b51..1a943364aa83 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/client/builder/SdkClientBuilder.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/client/builder/SdkClientBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/client/builder/SdkDefaultClientBuilder.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/client/builder/SdkDefaultClientBuilder.java
index fbc27745880c..1be24c8bac0c 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/client/builder/SdkDefaultClientBuilder.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/client/builder/SdkDefaultClientBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -28,6 +28,8 @@
 import static software.amazon.awssdk.core.client.config.SdkClientOption.ASYNC_HTTP_CLIENT;
 import static software.amazon.awssdk.core.client.config.SdkClientOption.CRC32_FROM_COMPRESSED_DATA_ENABLED;
 import static software.amazon.awssdk.core.client.config.SdkClientOption.EXECUTION_INTERCEPTORS;
+import static software.amazon.awssdk.core.client.config.SdkClientOption.PROFILE_FILE;
+import static software.amazon.awssdk.core.client.config.SdkClientOption.PROFILE_NAME;
 import static software.amazon.awssdk.core.client.config.SdkClientOption.RETRY_POLICY;
 import static software.amazon.awssdk.core.client.config.SdkClientOption.SCHEDULED_EXECUTOR_SERVICE;
 import static software.amazon.awssdk.utils.CollectionUtils.mergeLists;
@@ -57,12 +59,15 @@
 import software.amazon.awssdk.core.internal.http.loader.DefaultSdkAsyncHttpClientBuilder;
 import software.amazon.awssdk.core.internal.http.loader.DefaultSdkHttpClientBuilder;
 import software.amazon.awssdk.core.internal.util.UserAgentUtils;
+import software.amazon.awssdk.core.retry.RetryMode;
 import software.amazon.awssdk.core.retry.RetryPolicy;
 import software.amazon.awssdk.http.ExecutableHttpRequest;
 import software.amazon.awssdk.http.HttpExecuteRequest;
 import software.amazon.awssdk.http.SdkHttpClient;
 import software.amazon.awssdk.http.async.AsyncExecuteRequest;
 import software.amazon.awssdk.http.async.SdkAsyncHttpClient;
+import software.amazon.awssdk.profiles.ProfileFile;
+import software.amazon.awssdk.profiles.ProfileFileSystemSetting;
 import software.amazon.awssdk.utils.AttributeMap;
 import software.amazon.awssdk.utils.Either;
 import software.amazon.awssdk.utils.ThreadFactoryBuilder;
@@ -186,17 +191,22 @@ protected SdkClientConfiguration mergeChildDefaults(SdkClientConfiguration confi
      * Apply global default configuration
      */
     private SdkClientConfiguration mergeGlobalDefaults(SdkClientConfiguration configuration) {
+        // Don't load the default profile file if the customer already gave us one.
+        ProfileFile configuredProfileFile = configuration.option(PROFILE_FILE);
+        ProfileFile profileFile = configuredProfileFile != null ? configuredProfileFile : ProfileFile.defaultProfileFile();
+
         return configuration.merge(c -> c.option(EXECUTION_INTERCEPTORS, new ArrayList<>())
                                          .option(ADDITIONAL_HTTP_HEADERS, new LinkedHashMap<>())
-                                         .option(RETRY_POLICY, RetryPolicy.defaultRetryPolicy())
+                                         .option(PROFILE_FILE, profileFile)
+                                         .option(PROFILE_NAME, ProfileFileSystemSetting.AWS_PROFILE.getStringValueOrThrow())
                                          .option(USER_AGENT_PREFIX, UserAgentUtils.getUserAgent())
                                          .option(USER_AGENT_SUFFIX, "")
                                          .option(CRC32_FROM_COMPRESSED_DATA_ENABLED, false));
     }
 
     /**
-     * Optionally overidden by child implementations to derive implementation-specific configuration from the default-applied
-     * configuration. (eg. AWS's endpoint, derived from the region).
+     * Optionally overridden by child implementations to derive implementation-specific configuration from the
+     * default-applied configuration. (eg. AWS's endpoint, derived from the region).
      */
     protected SdkClientConfiguration finalizeChildConfiguration(SdkClientConfiguration configuration) {
         return configuration;
@@ -230,9 +240,23 @@ private SdkClientConfiguration finalizeConfiguration(SdkClientConfiguration conf
         return config.toBuilder()
                      .option(SCHEDULED_EXECUTOR_SERVICE, resolveScheduledExecutorService())
                      .option(EXECUTION_INTERCEPTORS, resolveExecutionInterceptors(config))
+                     .option(RETRY_POLICY, resolveRetryPolicy(config))
                      .build();
     }
 
+    private RetryPolicy resolveRetryPolicy(SdkClientConfiguration config) {
+        RetryPolicy policy = config.option(SdkClientOption.RETRY_POLICY);
+        if (policy != null) {
+            return policy;
+        }
+
+        RetryMode retryMode = RetryMode.resolver()
+                                       .profileFile(() -> config.option(SdkClientOption.PROFILE_FILE))
+                                       .profileName(config.option(SdkClientOption.PROFILE_NAME))
+                                       .resolve();
+        return RetryPolicy.forRetryMode(retryMode);
+    }
+
     /**
      * Finalize which sync HTTP client will be used for the created client.
      */
@@ -309,6 +333,7 @@ public final B endpointOverride(URI endpointOverride) {
         Validate.paramNotNull(endpointOverride, "endpointOverride");
         Validate.paramNotNull(endpointOverride.getScheme(), "The URI scheme of endpointOverride");
         clientConfiguration.option(SdkClientOption.ENDPOINT, endpointOverride);
+        clientConfiguration.option(SdkClientOption.ENDPOINT_OVERRIDDEN, true);
         return thisBuilder();
     }
 
@@ -337,6 +362,8 @@ public final B overrideConfiguration(ClientOverrideConfiguration overrideConfig)
         clientConfiguration.option(API_CALL_ATTEMPT_TIMEOUT, overrideConfig.apiCallAttemptTimeout().orElse(null));
         clientConfiguration.option(DISABLE_HOST_PREFIX_INJECTION,
                                    overrideConfig.advancedOption(DISABLE_HOST_PREFIX_INJECTION).orElse(null));
+        clientConfiguration.option(PROFILE_FILE, overrideConfig.defaultProfileFile().orElse(null));
+        clientConfiguration.option(PROFILE_NAME, overrideConfig.defaultProfileName().orElse(null));
         return thisBuilder();
     }
 
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/client/builder/SdkSyncClientBuilder.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/client/builder/SdkSyncClientBuilder.java
index 73f41c24e848..5bf6f8a7b483 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/client/builder/SdkSyncClientBuilder.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/client/builder/SdkSyncClientBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/client/config/ClientAsyncConfiguration.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/client/config/ClientAsyncConfiguration.java
index 3ea9476368a4..636dd70341b5 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/client/config/ClientAsyncConfiguration.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/client/config/ClientAsyncConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/client/config/ClientOption.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/client/config/ClientOption.java
index 28445a2c11a0..87d055d855a9 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/client/config/ClientOption.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/client/config/ClientOption.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/client/config/ClientOverrideConfiguration.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/client/config/ClientOverrideConfiguration.java
index 5a457416c4ce..a9657812d55a 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/client/config/ClientOverrideConfiguration.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/client/config/ClientOverrideConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -26,8 +26,11 @@
 import java.util.function.Consumer;
 import software.amazon.awssdk.annotations.SdkPublicApi;
 import software.amazon.awssdk.core.interceptor.ExecutionInterceptor;
+import software.amazon.awssdk.core.retry.RetryMode;
 import software.amazon.awssdk.core.retry.RetryPolicy;
 import software.amazon.awssdk.core.sync.ResponseTransformer;
+import software.amazon.awssdk.profiles.ProfileFile;
+import software.amazon.awssdk.profiles.ProfileFileSystemSetting;
 import software.amazon.awssdk.utils.AttributeMap;
 import software.amazon.awssdk.utils.CollectionUtils;
 import software.amazon.awssdk.utils.ToString;
@@ -50,6 +53,8 @@ public final class ClientOverrideConfiguration
     private final AttributeMap advancedOptions;
     private final Duration apiCallAttemptTimeout;
     private final Duration apiCallTimeout;
+    private final ProfileFile defaultProfileFile;
+    private final String defaultProfileName;
 
     /**
      * Initialize this configuration. Private to require use of {@link #builder()}.
@@ -61,6 +66,8 @@ private ClientOverrideConfiguration(Builder builder) {
         this.advancedOptions = builder.advancedOptions();
         this.apiCallTimeout = Validate.isPositiveOrNull(builder.apiCallTimeout(), "apiCallTimeout");
         this.apiCallAttemptTimeout = Validate.isPositiveOrNull(builder.apiCallAttemptTimeout(), "apiCallAttemptTimeout");
+        this.defaultProfileFile = builder.defaultProfileFile();
+        this.defaultProfileName = builder.defaultProfileName();
     }
 
     @Override
@@ -70,7 +77,9 @@ public Builder toBuilder() {
                                                               .retryPolicy(retryPolicy)
                                                               .apiCallTimeout(apiCallTimeout)
                                                               .apiCallAttemptTimeout(apiCallAttemptTimeout)
-                                                              .executionInterceptors(executionInterceptors);
+                                                              .executionInterceptors(executionInterceptors)
+                                                              .defaultProfileFile(defaultProfileFile)
+                                                              .defaultProfileName(defaultProfileName);
     }
 
     /**
@@ -157,6 +166,24 @@ public Optional<Duration> apiCallAttemptTimeout() {
         return Optional.ofNullable(apiCallAttemptTimeout);
     }
 
+    /**
+     * The profile file that should be used by default for all profile-based configuration in the SDK client.
+     *
+     * @see Builder#defaultProfileFile(ProfileFile)
+     */
+    public Optional<ProfileFile> defaultProfileFile() {
+        return Optional.ofNullable(defaultProfileFile);
+    }
+
+    /**
+     * The profile name that should be used by default for all profile-based configuration in the SDK client.
+     *
+     * @see Builder#defaultProfileName(String)
+     */
+    public Optional<String> defaultProfileName() {
+        return Optional.ofNullable(defaultProfileName);
+    }
+
     @Override
     public String toString() {
         return ToString.builder("ClientOverrideConfiguration")
@@ -166,6 +193,8 @@ public String toString() {
                        .add("apiCallAttemptTimeout", apiCallAttemptTimeout)
                        .add("executionInterceptors", executionInterceptors)
                        .add("advancedOptions", advancedOptions)
+                       .add("profileFile", defaultProfileFile)
+                       .add("profileName", defaultProfileName)
                        .build();
     }
 
@@ -178,6 +207,8 @@ public interface Builder extends CopyableBuilder<Builder, ClientOverrideConfigur
 
         /**
          * Add a single header to be set on the HTTP request.
+         * <p>
+         * This overrides any values for the given header set on the request by default by the SDK.
          *
          * <p>
          * This overrides any values already configured with this header name in the builder.
@@ -193,6 +224,8 @@ default Builder putHeader(String name, String value) {
 
         /**
          * Add a single header with multiple values to be set on the HTTP request.
+         * <p>
+         * This overrides any values for the given header set on the request by default by the SDK.
          *
          * <p>
          * This overrides any values already configured with this header name in the builder.
@@ -205,6 +238,8 @@ default Builder putHeader(String name, String value) {
 
         /**
          * Configure headers to be set on the HTTP request.
+         * <p>
+         * This overrides any values for the given headers set on the request by default by the SDK.
          *
          * <p>
          * This overrides any values currently configured in the builder.
@@ -223,8 +258,6 @@ default Builder putHeader(String name, String value) {
          */
         Builder retryPolicy(RetryPolicy retryPolicy);
 
-        RetryPolicy retryPolicy();
-
         /**
          * Configure the retry policy the should be used when handling failure cases.
          */
@@ -232,6 +265,17 @@ default Builder retryPolicy(Consumer<RetryPolicy.Builder> retryPolicy) {
             return retryPolicy(RetryPolicy.builder().applyMutation(retryPolicy).build());
         }
 
+        /**
+         * Configure the retry mode used to determine the retry policy that is used when handling failure cases. This is
+         * shorthand for {@code retryPolicy(RetryPolicy.forRetryMode(retryMode))}, and overrides any configured retry policy on
+         * this builder.
+         */
+        default Builder retryPolicy(RetryMode retryMode) {
+            return retryPolicy(RetryPolicy.forRetryMode(retryMode));
+        }
+
+        RetryPolicy retryPolicy();
+
         /**
          * Configure a list of execution interceptors that will have access to read and modify the request and response objcets as
          * they are processed by the SDK. These will replace any interceptors configured previously with this method or
@@ -325,6 +369,45 @@ default Builder retryPolicy(Consumer<RetryPolicy.Builder> retryPolicy) {
         Builder apiCallAttemptTimeout(Duration apiCallAttemptTimeout);
 
         Duration apiCallAttemptTimeout();
+
+        /**
+         * Configure the profile file that should be used by default for all profile-based configuration in the SDK client.
+         *
+         * <p>This is equivalent to setting the {@link ProfileFileSystemSetting#AWS_CONFIG_FILE} and
+         * {@link ProfileFileSystemSetting#AWS_SHARED_CREDENTIALS_FILE} environment variables or system properties.
+         *
+         * <p>Like the system settings, this value is only used when determining default values. For example, directly configuring
+         * the retry policy, credentials provider or region will mean that the configured values will be used instead of those
+         * from the profile file.
+         *
+         * <p>Like the {@code --profile} setting in the CLI, profile-based configuration loaded from this profile file has lower
+         * priority than more specific environment variables, like the {@code AWS_REGION} environment variable.
+         *
+         * <p>If this is not set, the {@link ProfileFile#defaultProfileFile()} is used.
+         *
+         * @see #defaultProfileName(String)
+         */
+        Builder defaultProfileFile(ProfileFile defaultProfileFile);
+
+        ProfileFile defaultProfileFile();
+
+        /**
+         * Configure the profile name that should be used by default for all profile-based configuration in the SDK client.
+         *
+         * <p>This is equivalent to setting the {@link ProfileFileSystemSetting#AWS_PROFILE} environment variable or system
+         * property.
+         *
+         * <p>Like the system setting, this value is only used when determining default values. For example, directly configuring
+         * the retry policy, credentials provider or region will mean that the configured values will be used instead of those
+         * from this profile.
+         *
+         * <p>If this is not set, the {@link ProfileFileSystemSetting#AWS_PROFILE} (or {@code "default"}) is used.
+         *
+         * @see #defaultProfileFile(ProfileFile)
+         */
+        Builder defaultProfileName(String defaultProfileName);
+
+        String defaultProfileName();
     }
 
     /**
@@ -337,6 +420,8 @@ private static final class DefaultClientOverrideConfigurationBuilder implements
         private AttributeMap.Builder advancedOptions = AttributeMap.builder();
         private Duration apiCallTimeout;
         private Duration apiCallAttemptTimeout;
+        private ProfileFile defaultProfileFile;
+        private String defaultProfileName;
 
         @Override
         public Builder headers(Map<String, List<String>> headers) {
@@ -456,6 +541,28 @@ public Duration apiCallAttemptTimeout() {
             return apiCallAttemptTimeout;
         }
 
+        @Override
+        public ProfileFile defaultProfileFile() {
+            return this.defaultProfileFile;
+        }
+
+        @Override
+        public Builder defaultProfileFile(ProfileFile defaultProfileFile) {
+            this.defaultProfileFile = defaultProfileFile;
+            return this;
+        }
+
+        @Override
+        public String defaultProfileName() {
+            return this.defaultProfileName;
+        }
+
+        @Override
+        public Builder defaultProfileName(String defaultProfileName) {
+            this.defaultProfileName = defaultProfileName;
+            return this;
+        }
+
         @Override
         public ClientOverrideConfiguration build() {
             return new ClientOverrideConfiguration(this);
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/client/config/SdkAdvancedAsyncClientOption.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/client/config/SdkAdvancedAsyncClientOption.java
index 10117818aa3a..ebcc42c027be 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/client/config/SdkAdvancedAsyncClientOption.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/client/config/SdkAdvancedAsyncClientOption.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/client/config/SdkAdvancedClientOption.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/client/config/SdkAdvancedClientOption.java
index 94486ef46042..e4b819ddd2a0 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/client/config/SdkAdvancedClientOption.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/client/config/SdkAdvancedClientOption.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/client/config/SdkClientConfiguration.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/client/config/SdkClientConfiguration.java
index 3372007d98aa..c87e7b22f400 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/client/config/SdkClientConfiguration.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/client/config/SdkClientConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/client/config/SdkClientOption.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/client/config/SdkClientOption.java
index 5ce42532e20f..11c26163287d 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/client/config/SdkClientOption.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/client/config/SdkClientOption.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -23,11 +23,11 @@
 import software.amazon.awssdk.annotations.SdkProtectedApi;
 import software.amazon.awssdk.core.ClientType;
 import software.amazon.awssdk.core.ServiceConfiguration;
-import software.amazon.awssdk.core.client.builder.SdkClientBuilder;
 import software.amazon.awssdk.core.interceptor.ExecutionInterceptor;
 import software.amazon.awssdk.core.retry.RetryPolicy;
 import software.amazon.awssdk.http.SdkHttpClient;
 import software.amazon.awssdk.http.async.SdkAsyncHttpClient;
+import software.amazon.awssdk.profiles.ProfileFile;
 
 /**
  * A set of internal options required by the SDK via {@link SdkClientConfiguration}.
@@ -52,10 +52,17 @@ public final class SdkClientOption<T> extends ClientOption<T> {
             new SdkClientOption<>(new UnsafeValueType(List.class));
 
     /**
-     * @see SdkClientBuilder#endpointOverride(URI)
+     * The effective endpoint the client is configured to make requests to. If the client has been configured with
+     * an endpoint override then this value will be the provided endpoint value.
      */
     public static final SdkClientOption<URI> ENDPOINT = new SdkClientOption<>(URI.class);
 
+    /**
+     * A flag that when set to true indicates the endpoint stored in {@link SdkClientOption#ENDPOINT} was a customer
+     * supplied value and not generated by the client based on Region metadata.
+     */
+    public static final SdkClientOption<Boolean> ENDPOINT_OVERRIDDEN = new SdkClientOption<>(Boolean.class);
+
     /**
      * Service-specific configuration used by some services, like S3.
      */
@@ -90,7 +97,7 @@ public final class SdkClientOption<T> extends ClientOption<T> {
     /**
      * The type of client used to make requests.
      */
-    public static final SdkClientOption<ClientType> CLIENT_TYPE = new SdkClientOption<ClientType>(ClientType.class);
+    public static final SdkClientOption<ClientType> CLIENT_TYPE = new SdkClientOption<>(ClientType.class);
 
     /**
      * @see ClientOverrideConfiguration#apiCallAttemptTimeout()
@@ -112,6 +119,16 @@ public final class SdkClientOption<T> extends ClientOption<T> {
      */
     public static final SdkClientOption<Boolean> ENDPOINT_DISCOVERY_ENABLED = new SdkClientOption<>(Boolean.class);
 
+    /**
+     * The profile file to use for this client.
+     */
+    public static final SdkClientOption<ProfileFile> PROFILE_FILE = new SdkClientOption<>(ProfileFile.class);
+
+    /**
+     * The profile name to use for this client.
+     */
+    public static final SdkClientOption<String> PROFILE_NAME = new SdkClientOption<>(String.class);
+
     private SdkClientOption(Class<T> valueClass) {
         super(valueClass);
     }
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/client/config/SdkClientOptionValidation.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/client/config/SdkClientOptionValidation.java
index 756daa49be7c..383637f4cdf3 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/client/config/SdkClientOptionValidation.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/client/config/SdkClientOptionValidation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -24,7 +24,8 @@
  */
 @SdkProtectedApi
 public class SdkClientOptionValidation {
-    protected SdkClientOptionValidation() {}
+    protected SdkClientOptionValidation() {
+    }
 
     public static void validateAsyncClientOptions(SdkClientConfiguration c) {
         require("asyncConfiguration.advancedOption[FUTURE_COMPLETION_EXECUTOR]",
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/client/handler/AsyncClientHandler.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/client/handler/AsyncClientHandler.java
index 4c7de24e7611..432712d769ca 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/client/handler/AsyncClientHandler.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/client/handler/AsyncClientHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/client/handler/AttachHttpMetadataResponseHandler.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/client/handler/AttachHttpMetadataResponseHandler.java
index aa6ece7d5d14..9f6fbbaef1a6 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/client/handler/AttachHttpMetadataResponseHandler.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/client/handler/AttachHttpMetadataResponseHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/client/handler/BaseAsyncClientHandler.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/client/handler/BaseAsyncClientHandler.java
deleted file mode 100644
index 838f64674a89..000000000000
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/client/handler/BaseAsyncClientHandler.java
+++ /dev/null
@@ -1,197 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.core.client.handler;
-
-import static software.amazon.awssdk.core.interceptor.SdkInternalExecutionAttribute.ASYNC_RESPONSE_TRANSFORMER_FUTURE;
-import static software.amazon.awssdk.utils.FunctionalUtils.runAndLogError;
-
-import java.util.concurrent.CompletableFuture;
-import java.util.function.Function;
-import software.amazon.awssdk.annotations.SdkProtectedApi;
-import software.amazon.awssdk.core.SdkRequest;
-import software.amazon.awssdk.core.SdkResponse;
-import software.amazon.awssdk.core.async.AsyncRequestBody;
-import software.amazon.awssdk.core.async.AsyncResponseTransformer;
-import software.amazon.awssdk.core.client.config.SdkClientConfiguration;
-import software.amazon.awssdk.core.exception.SdkException;
-import software.amazon.awssdk.core.http.Crc32Validation;
-import software.amazon.awssdk.core.http.ExecutionContext;
-import software.amazon.awssdk.core.http.HttpResponseHandler;
-import software.amazon.awssdk.core.interceptor.InterceptorContext;
-import software.amazon.awssdk.core.internal.http.AmazonAsyncHttpClient;
-import software.amazon.awssdk.core.internal.http.TransformingAsyncResponseHandler;
-import software.amazon.awssdk.core.internal.http.async.AsyncAfterTransmissionInterceptorCallingResponseHandler;
-import software.amazon.awssdk.core.internal.http.async.AsyncResponseHandler;
-import software.amazon.awssdk.core.internal.http.async.AsyncStreamingResponseHandler;
-import software.amazon.awssdk.core.internal.util.ThrowableUtils;
-import software.amazon.awssdk.http.SdkHttpFullRequest;
-import software.amazon.awssdk.http.SdkHttpFullResponse;
-import software.amazon.awssdk.utils.CompletableFutureUtils;
-import software.amazon.awssdk.utils.Logger;
-
-@SdkProtectedApi
-public abstract class BaseAsyncClientHandler extends BaseClientHandler implements AsyncClientHandler {
-    private static final Logger log = Logger.loggerFor(BaseAsyncClientHandler.class);
-    private final SdkClientConfiguration clientConfiguration;
-    private final AmazonAsyncHttpClient client;
-    private final Function<SdkHttpFullResponse, SdkHttpFullResponse> crc32Validator;
-
-    protected BaseAsyncClientHandler(SdkClientConfiguration clientConfiguration,
-                                     AmazonAsyncHttpClient client) {
-        super(clientConfiguration);
-        this.clientConfiguration = clientConfiguration;
-        this.client = client;
-        this.crc32Validator = response -> Crc32Validation.validate(isCalculateCrc32FromCompressedData(), response);
-    }
-
-    @Override
-    public <InputT extends SdkRequest, OutputT extends SdkResponse> CompletableFuture<OutputT> execute(
-        ClientExecutionParams<InputT, OutputT> executionParams) {
-        ExecutionContext executionContext = createExecutionContext(executionParams);
-
-        HttpResponseHandler<OutputT> decoratedResponseHandlers =
-            decorateResponseHandlers(executionParams.getResponseHandler(), executionContext);
-
-        TransformingAsyncResponseHandler<OutputT> asyncResponseHandler =
-            new AsyncResponseHandler<>(decoratedResponseHandlers,
-                                       crc32Validator,
-                                       executionContext.executionAttributes());
-
-        return doExecute(executionParams, executionContext, asyncResponseHandler);
-    }
-
-    @Override
-    public <InputT extends SdkRequest, OutputT extends SdkResponse, ReturnT> CompletableFuture<ReturnT> execute(
-        ClientExecutionParams<InputT, OutputT> executionParams,
-        AsyncResponseTransformer<OutputT, ReturnT> asyncResponseTransformer) {
-
-        // For streaming requests, prepare() should be called as early as possible to avoid NPE in client
-        // See https://github.com/aws/aws-sdk-java-v2/issues/1268
-        AsyncStreamingResponseHandler<OutputT, ReturnT> asyncStreamingResponseHandler =
-            new AsyncStreamingResponseHandler<>(asyncResponseTransformer);
-        CompletableFuture<ReturnT> asyncTransformerFuture = asyncStreamingResponseHandler.prepare();
-
-        ExecutionContext context = createExecutionContext(executionParams);
-        context.executionAttributes().putAttribute(ASYNC_RESPONSE_TRANSFORMER_FUTURE, asyncTransformerFuture);
-
-        HttpResponseHandler<OutputT> decoratedResponseHandlers =
-            decorateResponseHandlers(executionParams.getResponseHandler(), context);
-        asyncStreamingResponseHandler.responseHandler(decoratedResponseHandlers);
-
-        return doExecute(executionParams, context, asyncStreamingResponseHandler);
-    }
-
-    private <InputT extends SdkRequest, OutputT extends SdkResponse, ReturnT> CompletableFuture<ReturnT> doExecute(
-        ClientExecutionParams<InputT, OutputT> executionParams,
-        ExecutionContext executionContext,
-        TransformingAsyncResponseHandler<ReturnT> asyncResponseHandler) {
-
-        try {
-
-            // Running beforeExecution interceptors and modifyRequest interceptors.
-            InterceptorContext finalizeSdkRequestContext = finalizeSdkRequest(executionContext);
-            InputT inputT = (InputT) finalizeSdkRequestContext.request();
-
-            // Running beforeMarshalling, afterMarshalling and modifyHttpRequest, modifyHttpContent,
-            // modifyAsyncHttpContent interceptors
-            InterceptorContext finalizeSdkHttpRequestContext = finalizeSdkHttpFullRequest(executionParams,
-                                                                                          executionContext,
-                                                                                          inputT,
-                                                                                          clientConfiguration);
-
-            SdkHttpFullRequest marshalled = (SdkHttpFullRequest) finalizeSdkHttpRequestContext.httpRequest();
-
-            // For non-streaming requests, RequestBody can be modified in the interceptors. eg:
-            // CreateMultipartUploadRequestInterceptor
-            if (!finalizeSdkHttpRequestContext.asyncRequestBody().isPresent() &&
-                finalizeSdkHttpRequestContext.requestBody().isPresent()) {
-                marshalled = marshalled.toBuilder()
-                                       .contentStreamProvider(
-                                           finalizeSdkHttpRequestContext.requestBody().get().contentStreamProvider())
-                                       .build();
-            }
-
-            TransformingAsyncResponseHandler<ReturnT> successResponseHandler =
-                new AsyncAfterTransmissionInterceptorCallingResponseHandler<>(asyncResponseHandler, executionContext);
-
-            TransformingAsyncResponseHandler<? extends SdkException> errorHandler =
-                resolveErrorResponseHandler(executionParams, executionContext, crc32Validator);
-
-            CompletableFuture<ReturnT> invokeFuture = invoke(marshalled,
-                                                             finalizeSdkHttpRequestContext.asyncRequestBody().orElse(null),
-                                                             inputT,
-                                                             executionContext,
-                                                             successResponseHandler,
-                                                             errorHandler);
-
-            CompletableFuture<ReturnT> exceptionTranslatedFuture = invokeFuture.handle((resp, err) -> {
-                if (err != null) {
-                    throw ThrowableUtils.failure(err);
-                }
-                return resp;
-            });
-
-            return CompletableFutureUtils.forwardExceptionTo(exceptionTranslatedFuture, invokeFuture);
-        } catch (Throwable t) {
-            runAndLogError(
-                log.logger(),
-                "Error thrown from TransformingAsyncResponseHandler#onError, ignoring.",
-                () -> asyncResponseHandler.onError(t));
-            return CompletableFutureUtils.failedFuture(ThrowableUtils.asSdkException(t));
-        }
-    }
-
-    @Override
-    public void close() {
-        client.close();
-    }
-
-    /**
-     * Error responses are never streaming so we always use {@link AsyncResponseHandler}.
-     *
-     * @return Async handler for error responses.
-     */
-    private TransformingAsyncResponseHandler<? extends SdkException> resolveErrorResponseHandler(
-        ClientExecutionParams<?, ?> executionParams,
-        ExecutionContext executionContext,
-        Function<SdkHttpFullResponse, SdkHttpFullResponse> responseAdapter) {
-        AsyncResponseHandler<? extends SdkException> result =
-            new AsyncResponseHandler<>(executionParams.getErrorResponseHandler(),
-                                       responseAdapter,
-                                       executionContext.executionAttributes());
-        return new AsyncAfterTransmissionInterceptorCallingResponseHandler<>(result, executionContext);
-    }
-
-    /**
-     * Invoke the request using the http client. Assumes credentials (or lack thereof) have been
-     * configured in the ExecutionContext beforehand.
-     **/
-    private <InputT extends SdkRequest, OutputT> CompletableFuture<OutputT> invoke(
-        SdkHttpFullRequest request,
-        AsyncRequestBody requestProvider,
-        InputT originalRequest,
-        ExecutionContext executionContext,
-        TransformingAsyncResponseHandler<OutputT> responseHandler,
-        TransformingAsyncResponseHandler<? extends SdkException> errorResponseHandler) {
-        return client.requestExecutionBuilder()
-                     .requestProvider(requestProvider)
-                     .request(request)
-                     .originalRequest(originalRequest)
-                     .executionContext(executionContext)
-                     .errorResponseHandler(errorResponseHandler)
-                     .execute(responseHandler);
-    }
-}
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/client/handler/BaseClientHandler.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/client/handler/BaseClientHandler.java
deleted file mode 100644
index 298a6aa3d6e7..000000000000
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/client/handler/BaseClientHandler.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.core.client.handler;
-
-import java.net.URI;
-import software.amazon.awssdk.annotations.SdkProtectedApi;
-import software.amazon.awssdk.core.SdkRequest;
-import software.amazon.awssdk.core.SdkResponse;
-import software.amazon.awssdk.core.client.config.SdkAdvancedClientOption;
-import software.amazon.awssdk.core.client.config.SdkClientConfiguration;
-import software.amazon.awssdk.core.client.config.SdkClientOption;
-import software.amazon.awssdk.core.http.ExecutionContext;
-import software.amazon.awssdk.core.http.HttpResponseHandler;
-import software.amazon.awssdk.core.interceptor.ExecutionAttributes;
-import software.amazon.awssdk.core.interceptor.ExecutionInterceptorChain;
-import software.amazon.awssdk.core.interceptor.InterceptorContext;
-import software.amazon.awssdk.core.interceptor.SdkExecutionAttribute;
-import software.amazon.awssdk.http.SdkHttpFullRequest;
-import software.amazon.awssdk.utils.StringUtils;
-
-@SdkProtectedApi
-public abstract class BaseClientHandler {
-    private SdkClientConfiguration clientConfiguration;
-
-    protected BaseClientHandler(SdkClientConfiguration clientConfiguration) {
-        this.clientConfiguration = clientConfiguration;
-    }
-
-    /**
-     * Finalize {@link SdkRequest} by running beforeExecution and modifyRequest interceptors.
-     *
-     * @param executionContext the execution context
-     * @return the {@link InterceptorContext}
-     */
-    static InterceptorContext finalizeSdkRequest(ExecutionContext executionContext) {
-        runBeforeExecutionInterceptors(executionContext);
-        return runModifyRequestInterceptors(executionContext);
-    }
-
-    /**
-     * Finalize {@link SdkHttpFullRequest} by running beforeMarshalling, afterMarshalling,
-     * modifyHttpRequest, modifyHttpContent and modifyAsyncHttpContent interceptors
-     */
-    static <InputT extends SdkRequest, OutputT> InterceptorContext finalizeSdkHttpFullRequest(
-        ClientExecutionParams<InputT, OutputT> executionParams,
-        ExecutionContext executionContext, InputT inputT,
-        SdkClientConfiguration clientConfiguration) {
-
-        runBeforeMarshallingInterceptors(executionContext);
-        SdkHttpFullRequest request = executionParams.getMarshaller().marshall(inputT);
-        request = modifyEndpointHostIfNeeded(request, clientConfiguration, executionParams);
-
-        addHttpRequest(executionContext, request);
-        runAfterMarshallingInterceptors(executionContext);
-        return runModifyHttpRequestAndHttpContentInterceptors(executionContext);
-    }
-
-    private static void runBeforeExecutionInterceptors(ExecutionContext executionContext) {
-        executionContext.interceptorChain().beforeExecution(executionContext.interceptorContext(),
-                                                            executionContext.executionAttributes());
-    }
-
-    private static InterceptorContext runModifyRequestInterceptors(ExecutionContext executionContext) {
-        InterceptorContext interceptorContext =
-            executionContext.interceptorChain().modifyRequest(executionContext.interceptorContext(),
-                                                              executionContext.executionAttributes());
-        executionContext.interceptorContext(interceptorContext);
-        return interceptorContext;
-    }
-
-    private static void runBeforeMarshallingInterceptors(ExecutionContext executionContext) {
-        executionContext.interceptorChain().beforeMarshalling(executionContext.interceptorContext(),
-                                                              executionContext.executionAttributes());
-    }
-
-    /**
-     * Modifies the given {@link SdkHttpFullRequest} with new host if host prefix is enabled and set.
-     */
-    private static SdkHttpFullRequest modifyEndpointHostIfNeeded(SdkHttpFullRequest originalRequest,
-                                                                 SdkClientConfiguration clientConfiguration,
-                                                                 ClientExecutionParams executionParams) {
-        if (executionParams.discoveredEndpoint() != null) {
-            URI discoveredEndpoint = executionParams.discoveredEndpoint();
-            return originalRequest.toBuilder().host(discoveredEndpoint.getHost()).port(discoveredEndpoint.getPort()).build();
-        }
-
-        Boolean disableHostPrefixInjection = clientConfiguration.option(SdkAdvancedClientOption.DISABLE_HOST_PREFIX_INJECTION);
-        if ((disableHostPrefixInjection != null && disableHostPrefixInjection.equals(Boolean.TRUE)) ||
-            StringUtils.isEmpty(executionParams.hostPrefixExpression())) {
-            return originalRequest;
-        }
-
-        return originalRequest.toBuilder()
-                              .host(executionParams.hostPrefixExpression() + originalRequest.host())
-                              .build();
-    }
-
-    private static void addHttpRequest(ExecutionContext executionContext, SdkHttpFullRequest request) {
-        InterceptorContext interceptorContext = executionContext.interceptorContext().copy(b -> b.httpRequest(request));
-        executionContext.interceptorContext(interceptorContext);
-    }
-
-    private static void runAfterMarshallingInterceptors(ExecutionContext executionContext) {
-        executionContext.interceptorChain().afterMarshalling(executionContext.interceptorContext(),
-                                                             executionContext.executionAttributes());
-    }
-
-    private static InterceptorContext runModifyHttpRequestAndHttpContentInterceptors(ExecutionContext executionContext) {
-        InterceptorContext interceptorContext =
-            executionContext.interceptorChain().modifyHttpRequestAndHttpContent(executionContext.interceptorContext(),
-                                                                                executionContext.executionAttributes());
-        executionContext.interceptorContext(interceptorContext);
-        return interceptorContext;
-    }
-
-    /**
-     * Run afterUnmarshalling and modifyResponse interceptors.
-     */
-    private static <OutputT extends SdkResponse> OutputT runAfterUnmarshallingInterceptors(OutputT response,
-                                                                                           ExecutionContext context) {
-        // Update interceptor context to include response
-        InterceptorContext interceptorContext =
-            context.interceptorContext().copy(b -> b.response(response));
-
-        context.interceptorChain().afterUnmarshalling(interceptorContext, context.executionAttributes());
-
-        interceptorContext = context.interceptorChain().modifyResponse(interceptorContext, context.executionAttributes());
-
-        // Store updated context
-        context.interceptorContext(interceptorContext);
-
-        return (OutputT) interceptorContext.response();
-    }
-
-    static <OutputT extends SdkResponse> HttpResponseHandler<OutputT> interceptorCalling(
-        HttpResponseHandler<OutputT> delegate, ExecutionContext context) {
-        return (response, executionAttributes) ->
-            runAfterUnmarshallingInterceptors(delegate.handle(response, executionAttributes), context);
-    }
-
-    protected <InputT extends SdkRequest, OutputT extends SdkResponse> ExecutionContext createExecutionContext(
-        ClientExecutionParams<InputT, OutputT> params) {
-
-        SdkRequest originalRequest = params.getInput();
-        ExecutionAttributes executionAttributes = new ExecutionAttributes()
-            .putAttribute(SdkExecutionAttribute.SERVICE_CONFIG,
-                          clientConfiguration.option(SdkClientOption.SERVICE_CONFIGURATION))
-            .putAttribute(SdkExecutionAttribute.SERVICE_NAME, clientConfiguration.option(SdkClientOption.SERVICE_NAME));
-
-        ExecutionInterceptorChain interceptorChain =
-                new ExecutionInterceptorChain(clientConfiguration.option(SdkClientOption.EXECUTION_INTERCEPTORS));
-
-        return ExecutionContext.builder()
-                               .interceptorChain(interceptorChain)
-                               .interceptorContext(InterceptorContext.builder()
-                                                                     .request(originalRequest)
-                                                                     .build())
-                               .executionAttributes(executionAttributes)
-                               .signer(clientConfiguration.option(SdkAdvancedClientOption.SIGNER))
-                               .build();
-    }
-
-    protected boolean isCalculateCrc32FromCompressedData() {
-        return clientConfiguration.option(SdkClientOption.CRC32_FROM_COMPRESSED_DATA_ENABLED);
-    }
-
-    /**
-     * Decorate response handlers by running after unmarshalling Interceptors and adding http response metadata.
-     */
-    <OutputT extends SdkResponse> HttpResponseHandler<OutputT> decorateResponseHandlers(
-        HttpResponseHandler<OutputT> delegate, ExecutionContext executionContext) {
-        HttpResponseHandler<OutputT> interceptorCallingResponseHandler = interceptorCalling(delegate, executionContext);
-        return new AttachHttpMetadataResponseHandler<>(interceptorCallingResponseHandler);
-    }
-}
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/client/handler/BaseSyncClientHandler.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/client/handler/BaseSyncClientHandler.java
deleted file mode 100644
index 5f1158d33773..000000000000
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/client/handler/BaseSyncClientHandler.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.core.client.handler;
-
-import software.amazon.awssdk.annotations.SdkProtectedApi;
-import software.amazon.awssdk.core.SdkRequest;
-import software.amazon.awssdk.core.SdkResponse;
-import software.amazon.awssdk.core.client.config.SdkClientConfiguration;
-import software.amazon.awssdk.core.exception.AbortedException;
-import software.amazon.awssdk.core.exception.NonRetryableException;
-import software.amazon.awssdk.core.exception.RetryableException;
-import software.amazon.awssdk.core.exception.SdkException;
-import software.amazon.awssdk.core.http.ExecutionContext;
-import software.amazon.awssdk.core.http.HttpResponseHandler;
-import software.amazon.awssdk.core.interceptor.ExecutionAttributes;
-import software.amazon.awssdk.core.interceptor.InterceptorContext;
-import software.amazon.awssdk.core.internal.http.AmazonSyncHttpClient;
-import software.amazon.awssdk.core.internal.http.InterruptMonitor;
-import software.amazon.awssdk.core.sync.ResponseTransformer;
-import software.amazon.awssdk.http.AbortableInputStream;
-import software.amazon.awssdk.http.SdkHttpFullRequest;
-import software.amazon.awssdk.http.SdkHttpFullResponse;
-
-@SdkProtectedApi
-public abstract class BaseSyncClientHandler extends BaseClientHandler implements SyncClientHandler {
-    private final SdkClientConfiguration clientConfiguration;
-    private final AmazonSyncHttpClient client;
-
-    protected BaseSyncClientHandler(SdkClientConfiguration clientConfiguration,
-                                    AmazonSyncHttpClient client) {
-        super(clientConfiguration);
-        this.clientConfiguration = clientConfiguration;
-        this.client = client;
-    }
-
-    @Override
-    public <InputT extends SdkRequest, OutputT extends SdkResponse, ReturnT> ReturnT execute(
-        ClientExecutionParams<InputT, OutputT> executionParams,
-        ResponseTransformer<OutputT, ReturnT> responseTransformer) {
-
-        ExecutionContext executionContext = createExecutionContext(executionParams);
-
-        HttpResponseHandler<OutputT> decoratedResponseHandlers =
-            decorateResponseHandlers(executionParams.getResponseHandler(), executionContext);
-
-        HttpResponseHandler<ReturnT> httpResponseHandler =
-            new HttpResponseHandlerAdapter<>(decoratedResponseHandlers, responseTransformer);
-        return execute(executionParams, executionContext, httpResponseHandler);
-    }
-
-    @Override
-    public <InputT extends SdkRequest, OutputT extends SdkResponse> OutputT execute(
-        ClientExecutionParams<InputT, OutputT> executionParams) {
-
-        ExecutionContext executionContext = createExecutionContext(executionParams);
-
-        HttpResponseHandler<OutputT> decoratedResponseHandlers =
-            decorateResponseHandlers(executionParams.getResponseHandler(), executionContext);
-
-        return execute(executionParams, executionContext, decoratedResponseHandlers);
-    }
-
-
-    @Override
-    public void close() {
-        client.close();
-    }
-
-    /**
-     * Invoke the request using the http client. Assumes credentials (or lack thereof) have been
-     * configured in the OldExecutionContext beforehand.
-     **/
-    protected <OutputT> OutputT invoke(SdkHttpFullRequest request,
-                                       SdkRequest originalRequest,
-                                       ExecutionContext executionContext,
-                                       HttpResponseHandler<OutputT> responseHandler,
-                                       HttpResponseHandler<? extends SdkException> errorResponseHandler) {
-        return client.requestExecutionBuilder()
-                     .request(request)
-                     .originalRequest(originalRequest)
-                     .executionContext(executionContext)
-                     .errorResponseHandler(errorResponseHandler)
-                     .execute(responseHandler);
-    }
-
-    private <InputT extends SdkRequest, OutputT, ReturnT> ReturnT execute(
-        ClientExecutionParams<InputT, OutputT> executionParams,
-        ExecutionContext executionContext,
-        HttpResponseHandler<ReturnT> responseHandler) {
-
-        InputT inputT = (InputT) finalizeSdkRequest(executionContext).request();
-
-        InterceptorContext sdkHttpFullRequestContext = finalizeSdkHttpFullRequest(executionParams,
-                                                                                  executionContext,
-                                                                                  inputT,
-                                                                                  clientConfiguration);
-
-        SdkHttpFullRequest marshalled = (SdkHttpFullRequest) sdkHttpFullRequestContext.httpRequest();
-
-        // TODO Pass requestBody as separate arg to invoke
-        if (sdkHttpFullRequestContext.requestBody().isPresent()) {
-            marshalled = marshalled.toBuilder()
-                                   .contentStreamProvider(sdkHttpFullRequestContext.requestBody().get().contentStreamProvider())
-                                   .build();
-        }
-
-        return invoke(marshalled,
-                      inputT,
-                      executionContext,
-                      responseHandler,
-                      executionParams.getErrorResponseHandler());
-    }
-
-    private static class HttpResponseHandlerAdapter<ReturnT, OutputT extends SdkResponse>
-        implements HttpResponseHandler<ReturnT> {
-
-        private final HttpResponseHandler<OutputT> httpResponseHandler;
-        private final ResponseTransformer<OutputT, ReturnT> responseTransformer;
-
-        private HttpResponseHandlerAdapter(HttpResponseHandler<OutputT> httpResponseHandler,
-                                           ResponseTransformer<OutputT, ReturnT> responseTransformer) {
-            this.httpResponseHandler = httpResponseHandler;
-            this.responseTransformer = responseTransformer;
-        }
-
-        @Override
-        public ReturnT handle(SdkHttpFullResponse response, ExecutionAttributes executionAttributes) throws Exception {
-            OutputT resp = httpResponseHandler.handle(response, executionAttributes);
-            return transformResponse(resp, response.content().get());
-        }
-
-        @Override
-        public boolean needsConnectionLeftOpen() {
-            return responseTransformer.needsConnectionLeftOpen();
-        }
-
-
-        private ReturnT transformResponse(OutputT resp, AbortableInputStream inputStream) throws Exception {
-            try {
-                InterruptMonitor.checkInterrupted();
-                ReturnT result = responseTransformer.transform(resp, inputStream);
-                InterruptMonitor.checkInterrupted();
-                return result;
-            }  catch (RetryableException | InterruptedException | AbortedException e) {
-                throw e;
-            } catch (Exception e) {
-                InterruptMonitor.checkInterrupted();
-                throw NonRetryableException.builder().cause(e).build();
-            }
-        }
-    }
-}
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/client/handler/ClientExecutionParams.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/client/handler/ClientExecutionParams.java
index 751f99b3c9b3..3d4b03dda61f 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/client/handler/ClientExecutionParams.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/client/handler/ClientExecutionParams.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -18,6 +18,7 @@
 import java.net.URI;
 import software.amazon.awssdk.annotations.NotThreadSafe;
 import software.amazon.awssdk.annotations.SdkProtectedApi;
+import software.amazon.awssdk.core.Response;
 import software.amazon.awssdk.core.SdkRequest;
 import software.amazon.awssdk.core.async.AsyncRequestBody;
 import software.amazon.awssdk.core.exception.SdkException;
@@ -41,6 +42,7 @@ public final class ClientExecutionParams<InputT extends SdkRequest, OutputT> {
     private Marshaller<InputT> marshaller;
     private HttpResponseHandler<OutputT> responseHandler;
     private HttpResponseHandler<? extends SdkException> errorResponseHandler;
+    private HttpResponseHandler<Response<OutputT>> combinedResponseHandler;
     private boolean fullDuplex;
     private String hostPrefixExpression;
     private String operationName;
@@ -84,6 +86,23 @@ public ClientExecutionParams<InputT, OutputT> withErrorResponseHandler(
         return this;
     }
 
+    /**
+     * Non-streaming requests can use handlers that handle both error and success as a single handler instead of
+     * submitting individual success and error handlers. This allows the protocol to have more control over how to
+     * determine success and failure from a given HTTP response. This handler is mutually exclusive to
+     * {@link #getResponseHandler()} and {@link #getErrorResponseHandler()} and an exception will be thrown if this
+     * constraint is violated.
+     */
+    public HttpResponseHandler<Response<OutputT>> getCombinedResponseHandler() {
+        return combinedResponseHandler;
+    }
+
+    public ClientExecutionParams<InputT, OutputT> withCombinedResponseHandler(
+            HttpResponseHandler<Response<OutputT>> combinedResponseHandler) {
+        this.combinedResponseHandler = combinedResponseHandler;
+        return this;
+    }
+
     public RequestBody getRequestBody() {
         return requestBody;
     }
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/client/handler/SdkAsyncClientHandler.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/client/handler/SdkAsyncClientHandler.java
index 5a12f6a26b25..dd65b67cce00 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/client/handler/SdkAsyncClientHandler.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/client/handler/SdkAsyncClientHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -20,6 +20,7 @@
 import software.amazon.awssdk.annotations.ThreadSafe;
 import software.amazon.awssdk.core.client.config.SdkClientConfiguration;
 import software.amazon.awssdk.core.client.config.SdkClientOptionValidation;
+import software.amazon.awssdk.core.internal.handler.BaseAsyncClientHandler;
 import software.amazon.awssdk.core.internal.http.AmazonAsyncHttpClient;
 
 /**
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/client/handler/SdkSyncClientHandler.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/client/handler/SdkSyncClientHandler.java
index 42d6f345c6e2..e5d5d83b5623 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/client/handler/SdkSyncClientHandler.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/client/handler/SdkSyncClientHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -22,6 +22,7 @@
 import software.amazon.awssdk.core.SdkResponse;
 import software.amazon.awssdk.core.client.config.SdkClientConfiguration;
 import software.amazon.awssdk.core.client.config.SdkClientOptionValidation;
+import software.amazon.awssdk.core.internal.handler.BaseSyncClientHandler;
 import software.amazon.awssdk.core.internal.http.AmazonSyncHttpClient;
 import software.amazon.awssdk.core.sync.ResponseTransformer;
 
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/client/handler/SyncClientHandler.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/client/handler/SyncClientHandler.java
index e60eb8bcdfd4..447dcd45e17b 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/client/handler/SyncClientHandler.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/client/handler/SyncClientHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/endpointdiscovery/EndpointDiscoveryCacheLoader.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/endpointdiscovery/EndpointDiscoveryCacheLoader.java
index 0350288f4d6b..d740af90701d 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/endpointdiscovery/EndpointDiscoveryCacheLoader.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/endpointdiscovery/EndpointDiscoveryCacheLoader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/endpointdiscovery/EndpointDiscoveryEndpoint.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/endpointdiscovery/EndpointDiscoveryEndpoint.java
index 8ebf33e6a4c6..2da46e3aef7c 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/endpointdiscovery/EndpointDiscoveryEndpoint.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/endpointdiscovery/EndpointDiscoveryEndpoint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -63,7 +63,8 @@ private static final class BuilderImpl implements Builder {
         private URI endpoint;
         private Instant expirationTime;
 
-        private BuilderImpl() {}
+        private BuilderImpl() {
+        }
 
         @Override
         public Builder endpoint(URI endpoint) {
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/endpointdiscovery/EndpointDiscoveryRefreshCache.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/endpointdiscovery/EndpointDiscoveryRefreshCache.java
index fa98cc2b4c7d..3730803d55b1 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/endpointdiscovery/EndpointDiscoveryRefreshCache.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/endpointdiscovery/EndpointDiscoveryRefreshCache.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -20,10 +20,10 @@
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ConcurrentHashMap;
-import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.SdkProtectedApi;
 import software.amazon.awssdk.utils.Logger;
 
-@SdkInternalApi
+@SdkProtectedApi
 public final class EndpointDiscoveryRefreshCache {
 
     private static final Logger log = Logger.loggerFor(EndpointDiscoveryRefreshCache.class);
@@ -49,6 +49,12 @@ public static EndpointDiscoveryRefreshCache create(EndpointDiscoveryCacheLoader
      */
     public URI get(String accessKey, EndpointDiscoveryRequest request) {
         String key = accessKey;
+
+        // Support null (anonymous credentials) by mapping to empty-string. The backing cache does not support null.
+        if (key == null) {
+            key = "";
+        }
+
         if (request.cacheKey().isPresent()) {
             key = key + ":" + request.cacheKey().get();
         }
@@ -63,19 +69,31 @@ public URI get(String accessKey, EndpointDiscoveryRequest request) {
                                                                                   .endpoint(request.defaultEndpoint())
                                                                                   .expirationTime(Instant.now().plusSeconds(60))
                                                                                   .build();
-                return cache.computeIfAbsent(key, k -> tempEndpoint).endpoint();
+
+                EndpointDiscoveryEndpoint previousValue = cache.putIfAbsent(key, tempEndpoint);
+                if (previousValue != null) {
+                    // Someone else primed the cache. Use that endpoint (which may be temporary).
+                    return previousValue.endpoint();
+                } else {
+                    // We primed the cache with the temporary endpoint. Kick off discovery in the background.
+                    refreshCacheAsync(request, key);
+                }
+                return tempEndpoint.endpoint();
             }
         }
 
         if (endpoint.expirationTime().isBefore(Instant.now())) {
             cache.put(key, endpoint.toBuilder().expirationTime(Instant.now().plusSeconds(60)).build());
-            String finalKey = key;
-            discoverEndpoint(request).thenApply(v -> cache.put(finalKey, v));
+            refreshCacheAsync(request, key);
         }
 
         return endpoint.endpoint();
     }
 
+    private void refreshCacheAsync(EndpointDiscoveryRequest request, String key) {
+        discoverEndpoint(request).thenApply(v -> cache.put(key, v));
+    }
+
     public CompletableFuture<EndpointDiscoveryEndpoint> discoverEndpoint(EndpointDiscoveryRequest request) {
         return client.discoverEndpoint(request);
     }
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/endpointdiscovery/EndpointDiscoveryRequest.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/endpointdiscovery/EndpointDiscoveryRequest.java
index 7f125d422dbb..35948408718e 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/endpointdiscovery/EndpointDiscoveryRequest.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/endpointdiscovery/EndpointDiscoveryRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -18,11 +18,11 @@
 import java.net.URI;
 import java.util.Map;
 import java.util.Optional;
-import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.SdkProtectedApi;
 import software.amazon.awssdk.utils.builder.CopyableBuilder;
 import software.amazon.awssdk.utils.builder.ToCopyableBuilder;
 
-@SdkInternalApi
+@SdkProtectedApi
 public final class EndpointDiscoveryRequest
     implements ToCopyableBuilder<EndpointDiscoveryRequest.Builder, EndpointDiscoveryRequest> {
 
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/endpointdiscovery/providers/DefaultEndpointDiscoveryProviderChain.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/endpointdiscovery/providers/DefaultEndpointDiscoveryProviderChain.java
index 49a3b1eaa050..8c814799998d 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/endpointdiscovery/providers/DefaultEndpointDiscoveryProviderChain.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/endpointdiscovery/providers/DefaultEndpointDiscoveryProviderChain.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -15,11 +15,27 @@
 
 package software.amazon.awssdk.core.endpointdiscovery.providers;
 
+import java.util.function.Supplier;
 import software.amazon.awssdk.annotations.SdkProtectedApi;
+import software.amazon.awssdk.core.client.config.SdkClientConfiguration;
+import software.amazon.awssdk.core.client.config.SdkClientOption;
+import software.amazon.awssdk.profiles.ProfileFile;
+import software.amazon.awssdk.profiles.ProfileFileSystemSetting;
 
 @SdkProtectedApi
 public class DefaultEndpointDiscoveryProviderChain extends EndpointDiscoveryProviderChain {
     public DefaultEndpointDiscoveryProviderChain() {
-        super(SystemPropertiesEndpointDiscoveryProvider.create(), ProfileEndpointDiscoveryProvider.create());
+        this(ProfileFile::defaultProfileFile,
+             ProfileFileSystemSetting.AWS_PROFILE.getStringValueOrThrow());
+    }
+
+    public DefaultEndpointDiscoveryProviderChain(SdkClientConfiguration clientConfiguration) {
+        this(() -> clientConfiguration.option(SdkClientOption.PROFILE_FILE),
+              clientConfiguration.option(SdkClientOption.PROFILE_NAME));
+    }
+
+    private DefaultEndpointDiscoveryProviderChain(Supplier<ProfileFile> profileFile, String profileName) {
+        super(SystemPropertiesEndpointDiscoveryProvider.create(),
+              ProfileEndpointDiscoveryProvider.create(profileFile, profileName));
     }
 }
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/endpointdiscovery/providers/EndpointDiscoveryProvider.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/endpointdiscovery/providers/EndpointDiscoveryProvider.java
index da925a538e0b..d6d37cc8cbe8 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/endpointdiscovery/providers/EndpointDiscoveryProvider.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/endpointdiscovery/providers/EndpointDiscoveryProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/endpointdiscovery/providers/EndpointDiscoveryProviderChain.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/endpointdiscovery/providers/EndpointDiscoveryProviderChain.java
index 07db3b9afae5..a2f9175f949f 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/endpointdiscovery/providers/EndpointDiscoveryProviderChain.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/endpointdiscovery/providers/EndpointDiscoveryProviderChain.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/endpointdiscovery/providers/ProfileEndpointDiscoveryProvider.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/endpointdiscovery/providers/ProfileEndpointDiscoveryProvider.java
index c1c1a8d019ea..ca1e742bc982 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/endpointdiscovery/providers/ProfileEndpointDiscoveryProvider.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/endpointdiscovery/providers/ProfileEndpointDiscoveryProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -15,6 +15,7 @@
 
 package software.amazon.awssdk.core.endpointdiscovery.providers;
 
+import java.util.function.Supplier;
 import software.amazon.awssdk.annotations.SdkInternalApi;
 import software.amazon.awssdk.core.exception.SdkClientException;
 import software.amazon.awssdk.profiles.ProfileFile;
@@ -24,18 +25,26 @@
 
 @SdkInternalApi
 public class ProfileEndpointDiscoveryProvider implements EndpointDiscoveryProvider {
+    private final Supplier<ProfileFile> profileFile;
+    private final String profileName;
 
-    private final String profileName = ProfileFileSystemSetting.AWS_PROFILE.getStringValueOrThrow();
-
-    private ProfileEndpointDiscoveryProvider() {}
+    private ProfileEndpointDiscoveryProvider(Supplier<ProfileFile> profileFile, String profileName) {
+        this.profileFile = profileFile;
+        this.profileName = profileName;
+    }
 
     public static ProfileEndpointDiscoveryProvider create() {
-        return new ProfileEndpointDiscoveryProvider();
+        return new ProfileEndpointDiscoveryProvider(ProfileFile::defaultProfileFile,
+                                                    ProfileFileSystemSetting.AWS_PROFILE.getStringValueOrThrow());
+    }
+
+    public static ProfileEndpointDiscoveryProvider create(Supplier<ProfileFile> profileFile, String profileName) {
+        return new ProfileEndpointDiscoveryProvider(profileFile, profileName);
     }
 
     @Override
     public boolean resolveEndpointDiscovery() {
-        return ProfileFile.defaultProfileFile()
+        return profileFile.get()
                           .profile(profileName)
                           .map(p -> p.properties().get(ProfileProperty.ENDPOINT_DISCOVERY_ENABLED))
                           .map(Boolean::parseBoolean)
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/endpointdiscovery/providers/SystemPropertiesEndpointDiscoveryProvider.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/endpointdiscovery/providers/SystemPropertiesEndpointDiscoveryProvider.java
index e72201ae24c0..fab8eea73ab1 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/endpointdiscovery/providers/SystemPropertiesEndpointDiscoveryProvider.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/endpointdiscovery/providers/SystemPropertiesEndpointDiscoveryProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/exception/AbortedException.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/exception/AbortedException.java
index 861b89a4f6cb..5b789d1bd427 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/exception/AbortedException.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/exception/AbortedException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -60,7 +60,8 @@ public interface Builder extends SdkClientException.Builder {
 
     protected static final class BuilderImpl extends SdkClientException.BuilderImpl implements Builder {
 
-        protected BuilderImpl() {}
+        protected BuilderImpl() {
+        }
 
         protected BuilderImpl(AbortedException ex) {
             super(ex);
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/exception/ApiCallAttemptTimeoutException.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/exception/ApiCallAttemptTimeoutException.java
index 141db85dca00..35f203f8c8b0 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/exception/ApiCallAttemptTimeoutException.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/exception/ApiCallAttemptTimeoutException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -64,7 +64,8 @@ public interface Builder extends SdkClientException.Builder {
 
     protected static final class BuilderImpl extends SdkClientException.BuilderImpl implements Builder {
 
-        protected BuilderImpl() {}
+        protected BuilderImpl() {
+        }
 
         protected BuilderImpl(ApiCallAttemptTimeoutException ex) {
             super(ex);
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/exception/ApiCallTimeoutException.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/exception/ApiCallTimeoutException.java
index 6fce36c362c0..32ba14347601 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/exception/ApiCallTimeoutException.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/exception/ApiCallTimeoutException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -64,7 +64,8 @@ public interface Builder extends SdkClientException.Builder {
 
     protected static final class BuilderImpl extends SdkClientException.BuilderImpl implements Builder {
 
-        protected BuilderImpl() {}
+        protected BuilderImpl() {
+        }
 
         protected BuilderImpl(ApiCallTimeoutException ex) {
             super(ex);
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/exception/Crc32MismatchException.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/exception/Crc32MismatchException.java
index 1cf3d9fd131d..afb4e0ec02a0 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/exception/Crc32MismatchException.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/exception/Crc32MismatchException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -64,7 +64,8 @@ public interface Builder extends SdkClientException.Builder {
 
     protected static final class BuilderImpl extends SdkClientException.BuilderImpl implements Builder {
 
-        protected BuilderImpl() {}
+        protected BuilderImpl() {
+        }
 
         protected BuilderImpl(Crc32MismatchException ex) {
             super(ex);
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/exception/NonRetryableException.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/exception/NonRetryableException.java
index f5edfffbcdc5..f97fdafd2743 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/exception/NonRetryableException.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/exception/NonRetryableException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -58,7 +58,8 @@ public interface Builder extends SdkClientException.Builder {
 
     protected static final class BuilderImpl extends SdkClientException.BuilderImpl implements Builder {
 
-        protected BuilderImpl() {}
+        protected BuilderImpl() {
+        }
 
         protected BuilderImpl(NonRetryableException ex) {
             super(ex);
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/exception/RetryableException.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/exception/RetryableException.java
index e528676df090..3a8bf0bfca94 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/exception/RetryableException.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/exception/RetryableException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -66,7 +66,8 @@ public interface Builder extends SdkClientException.Builder {
 
     protected static final class BuilderImpl extends SdkClientException.BuilderImpl implements Builder {
 
-        protected BuilderImpl() {}
+        protected BuilderImpl() {
+        }
 
         protected BuilderImpl(RetryableException ex) {
             super(ex);
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/exception/SdkClientException.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/exception/SdkClientException.java
index 8595401eef3a..d43a8221a5af 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/exception/SdkClientException.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/exception/SdkClientException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -74,7 +74,8 @@ public interface Builder extends SdkException.Builder {
 
     protected static class BuilderImpl extends SdkException.BuilderImpl implements Builder {
 
-        protected BuilderImpl() {}
+        protected BuilderImpl() {
+        }
 
         protected BuilderImpl(SdkClientException ex) {
             super(ex);
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/exception/SdkException.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/exception/SdkException.java
index bd9cc1df6746..7c5c765f8384 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/exception/SdkException.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/exception/SdkException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -30,7 +30,22 @@ public class SdkException extends RuntimeException {
     private static final long serialVersionUID = 1L;
 
     protected SdkException(Builder builder) {
-        super(builder.message(), builder.cause());
+        super(messageFromBuilder(builder), builder.cause());
+    }
+
+    /**
+     * Use the message from the builder, if it's specified, otherwise inherit the message from the "cause" exception.
+     */
+    private static String messageFromBuilder(Builder builder) {
+        if (builder.message() != null) {
+            return builder.message();
+        }
+
+        if (builder.cause() != null) {
+            return builder.cause().getMessage();
+        }
+
+        return null;
     }
 
     public static SdkException create(String message, Throwable cause) {
@@ -105,7 +120,8 @@ protected static class BuilderImpl implements Builder {
         protected Throwable cause;
         protected String message;
 
-        protected BuilderImpl() {}
+        protected BuilderImpl() {
+        }
 
         protected BuilderImpl(SdkException ex) {
             this.cause = ex.getCause();
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/exception/SdkInterruptedException.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/exception/SdkInterruptedException.java
index fd2850031bde..c3e131d5d918 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/exception/SdkInterruptedException.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/exception/SdkInterruptedException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/exception/SdkServiceException.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/exception/SdkServiceException.java
index 47a07b67bce0..ddf13cf5a15f 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/exception/SdkServiceException.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/exception/SdkServiceException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -155,7 +155,8 @@ protected static class BuilderImpl extends SdkException.BuilderImpl implements B
         protected String requestId;
         protected int statusCode;
 
-        protected BuilderImpl() {}
+        protected BuilderImpl() {
+        }
 
         protected BuilderImpl(SdkServiceException ex) {
             super(ex);
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/http/Crc32Validation.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/http/Crc32Validation.java
index 3ac0b87340e5..a42bbbef0959 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/http/Crc32Validation.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/http/Crc32Validation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/http/ExecutionContext.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/http/ExecutionContext.java
index 437671c75da5..e9375a75e14d 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/http/ExecutionContext.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/http/ExecutionContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -21,7 +21,6 @@
 import software.amazon.awssdk.core.interceptor.ExecutionInterceptorChain;
 import software.amazon.awssdk.core.interceptor.InterceptorContext;
 import software.amazon.awssdk.core.signer.Signer;
-import software.amazon.awssdk.utils.Validate;
 import software.amazon.awssdk.utils.builder.CopyableBuilder;
 import software.amazon.awssdk.utils.builder.ToCopyableBuilder;
 
@@ -37,10 +36,10 @@ public final class ExecutionContext implements ToCopyableBuilder<ExecutionContex
     private final ExecutionAttributes executionAttributes;
 
     private ExecutionContext(final Builder builder) {
-        this.signer = Validate.paramNotNull(builder.signer, "signer");
-        this.interceptorContext = Validate.paramNotNull(builder.interceptorContext, "interceptorContext");
-        this.interceptorChain = Validate.paramNotNull(builder.interceptorChain, "interceptorChain");
-        this.executionAttributes = Validate.paramNotNull(builder.executionAttributes, "executionAttributes");
+        this.signer = builder.signer;
+        this.interceptorContext = builder.interceptorContext;
+        this.interceptorChain = builder.interceptorChain;
+        this.executionAttributes = builder.executionAttributes;
     }
 
     public static ExecutionContext.Builder builder() {
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/http/HttpResponseHandler.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/http/HttpResponseHandler.java
index 6badc8955e83..494d261209c8 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/http/HttpResponseHandler.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/http/HttpResponseHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/interceptor/ClasspathInterceptorChainFactory.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/interceptor/ClasspathInterceptorChainFactory.java
index e180b8998481..062564fb6c5d 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/interceptor/ClasspathInterceptorChainFactory.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/interceptor/ClasspathInterceptorChainFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/interceptor/Context.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/interceptor/Context.java
index c99ca70cf1a3..96abd1e61274 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/interceptor/Context.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/interceptor/Context.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -36,7 +36,8 @@
  */
 @SdkProtectedApi
 public final class Context {
-    private Context() {}
+    private Context() {
+    }
 
     /**
      * The state of the execution when the {@link ExecutionInterceptor#beforeExecution} method is invoked.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/interceptor/ExecutionAttribute.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/interceptor/ExecutionAttribute.java
index d77fc2f3c84c..cd5126fd6f31 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/interceptor/ExecutionAttribute.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/interceptor/ExecutionAttribute.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/interceptor/ExecutionAttributes.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/interceptor/ExecutionAttributes.java
index e37ab7f179ce..1bf7fc5093d6 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/interceptor/ExecutionAttributes.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/interceptor/ExecutionAttributes.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/interceptor/ExecutionInterceptor.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/interceptor/ExecutionInterceptor.java
index 4baeb8ed2b16..ef4df9622e3e 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/interceptor/ExecutionInterceptor.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/interceptor/ExecutionInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -211,7 +211,7 @@ default void beforeTransmission(Context.BeforeTransmission context, ExecutionAtt
 
     /**
      * Read the HTTP response as it was returned by the HTTP client, before it is modified by other interceptors.
-     * {@link #beforeTransmission} should be used in most circumstances for reading the HTTP response because it includes
+     * {@link #beforeUnmarshalling} should be used in most circumstances for reading the HTTP response because it includes
      * modifications made by other interceptors.
      *
      * <p>It is possible that the HTTP client could have already modified this response, so debug-level wire logging should be
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/interceptor/ExecutionInterceptorChain.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/interceptor/ExecutionInterceptorChain.java
index 559d32b145ba..11fa74a4ee65 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/interceptor/ExecutionInterceptorChain.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/interceptor/ExecutionInterceptorChain.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -16,10 +16,12 @@
 package software.amazon.awssdk.core.interceptor;
 
 import java.io.InputStream;
+import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 import java.util.function.Consumer;
+import org.reactivestreams.Publisher;
 import software.amazon.awssdk.annotations.SdkProtectedApi;
 import software.amazon.awssdk.core.SdkRequest;
 import software.amazon.awssdk.core.SdkResponse;
@@ -134,10 +136,15 @@ public InterceptorContext modifyHttpResponse(InterceptorContext context,
     public InterceptorContext modifyAsyncHttpResponse(InterceptorContext context,
                                                       ExecutionAttributes executionAttributes) {
         InterceptorContext result = context;
+
         for (int i = interceptors.size() - 1; i >= 0; i--) {
+            ExecutionInterceptor interceptor = interceptors.get(i);
+
+            Publisher<ByteBuffer> newResponsePublisher =
+                interceptor.modifyAsyncHttpResponseContent(result, executionAttributes).orElse(null);
+
             result = result.toBuilder()
-                           .responsePublisher(interceptors.get(i).modifyAsyncHttpResponseContent(result, executionAttributes)
-                                                          .orElse(null))
+                           .responsePublisher(newResponsePublisher)
                            .build();
         }
 
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/interceptor/InterceptorContext.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/interceptor/InterceptorContext.java
index eb8044725638..9e6d347d6e20 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/interceptor/InterceptorContext.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/interceptor/InterceptorContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/interceptor/SdkExecutionAttribute.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/interceptor/SdkExecutionAttribute.java
index 78afb59d87d3..37b83a6a893e 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/interceptor/SdkExecutionAttribute.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/interceptor/SdkExecutionAttribute.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -45,6 +45,12 @@ public class SdkExecutionAttribute {
     public static final ExecutionAttribute<ClientType> CLIENT_TYPE = new ExecutionAttribute<>("ClientType");
 
     public static final ExecutionAttribute<String> OPERATION_NAME = new ExecutionAttribute<>("OperationName");
+
+    /**
+     * If true indicates that the configured endpoint of the client is a value that was supplied as an override and not
+     * generated from regional metadata.
+     */
+    public static final ExecutionAttribute<Boolean> ENDPOINT_OVERRIDDEN = new ExecutionAttribute<>("EndpointOverride");
     
     protected SdkExecutionAttribute() {
     }
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/interceptor/SdkInternalExecutionAttribute.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/interceptor/SdkInternalExecutionAttribute.java
index 795bbab77a7a..69721a1ac4db 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/interceptor/SdkInternalExecutionAttribute.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/interceptor/SdkInternalExecutionAttribute.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -15,13 +15,10 @@
 
 package software.amazon.awssdk.core.interceptor;
 
-import java.util.concurrent.CompletableFuture;
 import software.amazon.awssdk.annotations.SdkProtectedApi;
-import software.amazon.awssdk.core.async.AsyncResponseTransformer;
 
 /**
- * Attributes that can be applied to all sdk requests. Only SDK is allowed to set these values.
- * Customer should not be using this class.
+ * Attributes that can be applied to all sdk requests. Only generated code from the SDK clients should set these values.
  */
 @SdkProtectedApi
 public final class SdkInternalExecutionAttribute extends SdkExecutionAttribute {
@@ -32,13 +29,6 @@ public final class SdkInternalExecutionAttribute extends SdkExecutionAttribute {
      */
     public static final ExecutionAttribute<Boolean> IS_FULL_DUPLEX = new ExecutionAttribute<>("IsFullDuplex");
 
-    /**
-     * The key to store the {@link CompletableFuture} returned by {@link AsyncResponseTransformer#prepare()} method
-     * in the first attempt of a request. This is used only for async streaming requests
-     */
-    public static final ExecutionAttribute<CompletableFuture<?>> ASYNC_RESPONSE_TRANSFORMER_FUTURE =
-        new ExecutionAttribute<>("AsyncResponseTransformerFuture");
-
     private SdkInternalExecutionAttribute() {
     }
 }
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/InternalCoreExecutionAttribute.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/InternalCoreExecutionAttribute.java
new file mode 100644
index 000000000000..8c0748bf20fc
--- /dev/null
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/InternalCoreExecutionAttribute.java
@@ -0,0 +1,37 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.core.internal;
+
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.core.interceptor.ExecutionAttribute;
+import software.amazon.awssdk.core.interceptor.SdkExecutionAttribute;
+
+/**
+ * Attributes that can be applied to all sdk requests. These attributes are only used internally by the core to
+ * handle executions through the pipeline.
+ */
+@SdkInternalApi
+public final class InternalCoreExecutionAttribute extends SdkExecutionAttribute {
+    /**
+     * The key to store the execution attempt number that is used by handlers in the async request pipeline to help
+     * regulate their behavior.
+     */
+    public static final ExecutionAttribute<Integer> EXECUTION_ATTEMPT =
+        new ExecutionAttribute<>("SdkInternalExecutionAttempt");
+
+    private InternalCoreExecutionAttribute() {
+    }
+}
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/Response.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/Response.java
deleted file mode 100644
index 01aa6b3fe70c..000000000000
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/Response.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.core.internal;
-
-import software.amazon.awssdk.annotations.SdkInternalApi;
-import software.amazon.awssdk.core.exception.SdkException;
-import software.amazon.awssdk.http.SdkHttpFullResponse;
-
-/**
- * Response wrapper to provide access to not only the original SDK response
- * but also the associated http response.
- *
- * @param <T> the underlying AWS response type.
- */
-@SdkInternalApi
-public final class Response<T> {
-    private final boolean isSuccess;
-    private final T response;
-    private final SdkException exception;
-    private final SdkHttpFullResponse httpResponse;
-
-    private Response(boolean isSuccess, T response, SdkException exception, SdkHttpFullResponse httpResponse) {
-        this.isSuccess = isSuccess;
-        this.response = response;
-        this.exception = exception;
-        this.httpResponse = httpResponse;
-    }
-
-    public T response() {
-        return response;
-    }
-
-    public SdkException exception() {
-        return exception;
-    }
-
-    public SdkHttpFullResponse httpResponse() {
-        return httpResponse;
-    }
-
-    public boolean isSuccess() {
-        return isSuccess;
-    }
-
-
-    public boolean isFailure() {
-        return !isSuccess;
-    }
-
-    public static <T> Response<T> fromSuccess(T response, SdkHttpFullResponse httpResponse) {
-        return new Response<>(true, response, null, httpResponse);
-    }
-
-    public static <T> Response<T> fromFailure(SdkException exception, SdkHttpFullResponse httpResponse) {
-        return new Response<>(false, null, exception, httpResponse);
-    }
-}
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/async/ByteArrayAsyncRequestBody.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/async/ByteArrayAsyncRequestBody.java
index 6a90fc24ef9e..693cde1ca73c 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/async/ByteArrayAsyncRequestBody.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/async/ByteArrayAsyncRequestBody.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -41,7 +41,7 @@ public ByteArrayAsyncRequestBody(byte[] bytes) {
 
     @Override
     public Optional<Long> contentLength() {
-        return Optional.of(Long.valueOf(bytes.length));
+        return Optional.of((long) bytes.length);
     }
 
     @Override
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/async/ByteArrayAsyncResponseTransformer.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/async/ByteArrayAsyncResponseTransformer.java
index db57495169a2..90d587cd5a36 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/async/ByteArrayAsyncResponseTransformer.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/async/ByteArrayAsyncResponseTransformer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -20,7 +20,6 @@
 import java.io.ByteArrayOutputStream;
 import java.nio.ByteBuffer;
 import java.util.concurrent.CompletableFuture;
-
 import org.reactivestreams.Subscriber;
 import org.reactivestreams.Subscription;
 import software.amazon.awssdk.annotations.SdkInternalApi;
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/async/EnvelopeWrappedSdkPublisher.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/async/EnvelopeWrappedSdkPublisher.java
new file mode 100644
index 000000000000..4225b8b263bb
--- /dev/null
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/async/EnvelopeWrappedSdkPublisher.java
@@ -0,0 +1,152 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.core.internal.async;
+
+import java.util.function.BiFunction;
+import org.reactivestreams.Publisher;
+import org.reactivestreams.Subscriber;
+import org.reactivestreams.Subscription;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.core.async.SdkPublisher;
+
+/**
+ * Publisher implementation that wraps the content of another publisher in an envelope with an optional prefix (or
+ * header) and suffix (or footer). The prefix content will be prepended to the first published object from the
+ * wrapped publisher, and the suffix content will be published when the wrapped publisher signals completion.
+ * <p>
+ * The envelope prefix will not be published until the wrapped publisher publishes something or is completed.
+ * The envelope suffix will not be published until the wrapped publisher is completed.
+ * <p>
+ * This class can be used in an asynchronous interceptor in the AWS SDK to wrap content around the incoming
+ * bytestream from a response.
+ * <p>
+ * A function must be supplied that can be used to concatenate the envelope content with the content being published by
+ * the wrapped publisher. Example usage:
+ * {@code
+ *    Publisher<String> wrappedPublisher = ContentEnvelopeWrappingPublisher.of(publisher, "S", "E", (s1, s2) -> s1 + s2);
+ * }
+ * If publisher publishes a single string "1", wrappedPublisher will publish "S1" (prepending the envelop prefix). If
+ * publisher then publishes a second string "2", wrappedPublisher will then publish "2" (no added content). If
+ * publisher then completes, wrappedPublisher will then publish "E" and then complete.
+ * <p>
+ * WARNING: This publisher implementation does not comply with the complete flow spec (as it inserts data into the
+ * middle of a flow between a third-party publisher and subscriber rather than acting as a fully featured
+ * independent publisher) and therefore should only be used in a limited fashion when we have complete control over
+ * how data is being published to the publisher it wraps.
+ *
+ * @param <T> The type of objects being published
+ */
+
+@SdkInternalApi
+public class EnvelopeWrappedSdkPublisher<T> implements SdkPublisher<T> {
+    private final Publisher<T> wrappedPublisher;
+    private final T contentPrefix;
+    private final T contentSuffix;
+    private final BiFunction<T, T, T> mergeContentFunction;
+
+    private EnvelopeWrappedSdkPublisher(Publisher<T> wrappedPublisher,
+                                        T contentPrefix,
+                                        T contentSuffix,
+                                        BiFunction<T, T, T> mergeContentFunction) {
+        this.wrappedPublisher = wrappedPublisher;
+        this.contentPrefix = contentPrefix;
+        this.contentSuffix = contentSuffix;
+        this.mergeContentFunction = mergeContentFunction;
+    }
+
+    /**
+     * Create a new publisher that wraps the content of an existing publisher.
+     * @param wrappedPublisher The publisher who's content will be wrapped.
+     * @param contentPrefix The content to be inserted in front of the wrapped content.
+     * @param contentSuffix The content to be inserted at the back of the wrapped content.
+     * @param mergeContentFunction A function that will be used to merge the inserted content into the wrapped content.
+     * @param <T> The content type.
+     * @return A newly initialized instance of this class.
+     */
+    public static <T> EnvelopeWrappedSdkPublisher<T> of(Publisher<T> wrappedPublisher,
+                                                        T contentPrefix,
+                                                        T contentSuffix,
+                                                        BiFunction<T, T, T> mergeContentFunction) {
+        return new EnvelopeWrappedSdkPublisher<>(wrappedPublisher, contentPrefix, contentSuffix, mergeContentFunction);
+    }
+
+    /**
+     * See {@link Publisher#subscribe(Subscriber)}
+     */
+    @Override
+    public void subscribe(Subscriber<? super T> subscriber) {
+        if (subscriber == null) {
+            throw new NullPointerException("subscriber must be non-null on call to subscribe()");
+        }
+
+        wrappedPublisher.subscribe(new ContentWrappedSubscriber(subscriber));
+    }
+
+    private class ContentWrappedSubscriber implements Subscriber<T> {
+        private final Subscriber<? super T> wrappedSubscriber;
+        private boolean prefixApplied = false;
+        private boolean suffixApplied = false;
+
+        private ContentWrappedSubscriber(Subscriber<? super T> wrappedSubscriber) {
+            this.wrappedSubscriber = wrappedSubscriber;
+        }
+
+        @Override
+        public void onSubscribe(Subscription subscription) {
+            wrappedSubscriber.onSubscribe(subscription);
+        }
+
+        @Override
+        public void onNext(T t) {
+            T contentToSend = t;
+
+            if (!prefixApplied) {
+                prefixApplied = true;
+
+                if (contentPrefix != null) {
+                    contentToSend = mergeContentFunction.apply(contentPrefix, t);
+                }
+            }
+
+            wrappedSubscriber.onNext(contentToSend);
+        }
+
+        @Override
+        public void onError(Throwable throwable) {
+            wrappedSubscriber.onError(throwable);
+        }
+
+        @Override
+        public void onComplete() {
+            try {
+                // Only transmit the close of the envelope once and only if the prefix has been previously sent.
+                if (!suffixApplied && prefixApplied) {
+                    suffixApplied = true;
+
+                    if (contentSuffix != null) {
+                        // TODO: This should respect the demand from the subscriber as technically an onComplete
+                        //  signal could be received even if there is no demand. We have minimized the impact of this
+                        //  by only making it applicable in situations where there data has already been transmitted
+                        //  over the stream.
+                        wrappedSubscriber.onNext(contentSuffix);
+                    }
+                }
+            } finally {
+                wrappedSubscriber.onComplete();
+            }
+        }
+    }
+}
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/async/FileAsyncRequestBody.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/async/FileAsyncRequestBody.java
index 85fe60bdbeef..10cbb4a9c565 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/async/FileAsyncRequestBody.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/async/FileAsyncRequestBody.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/async/FileAsyncResponseTransformer.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/async/FileAsyncResponseTransformer.java
index 1ce29b31c080..b6843860a056 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/async/FileAsyncResponseTransformer.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/async/FileAsyncResponseTransformer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/async/SdkPublishers.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/async/SdkPublishers.java
new file mode 100644
index 000000000000..d86d80f75b40
--- /dev/null
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/async/SdkPublishers.java
@@ -0,0 +1,65 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.core.internal.async;
+
+import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
+import org.reactivestreams.Publisher;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.core.async.SdkPublisher;
+
+/**
+ * Common implementations of {@link SdkPublisher} that are provided for convenience when building asynchronous
+ * interceptors to be used with specific clients.
+ */
+@SdkInternalApi
+public final class SdkPublishers {
+    private SdkPublishers() {
+    }
+
+    /**
+     * Constructs an {@link SdkPublisher} that wraps a {@link ByteBuffer} publisher and inserts additional content
+     * that wraps the published content like an envelope. This can be used when you want to transform the content of
+     * an asynchronous SDK response by putting it in an envelope. This publisher implementation does not comply with
+     * the complete flow spec (as it inserts data into the middle of a flow between a third-party publisher and
+     * subscriber rather than acting as a fully featured independent publisher) and therefore should only be used in a
+     * limited fashion when we have complete control over how data is being published to the publisher it wraps.
+     * @param publisher The underlying publisher to wrap the content of.
+     * @param envelopePrefix A string representing the content to be inserted as the head of the containing envelope.
+     * @param envelopeSuffix A string representing the content to be inserted as the tail of containing envelope.
+     * @return An {@link SdkPublisher} that wraps the provided publisher.
+     */
+    public static SdkPublisher<ByteBuffer> envelopeWrappedPublisher(Publisher<ByteBuffer> publisher,
+                                                                    String envelopePrefix,
+                                                                    String envelopeSuffix) {
+        return EnvelopeWrappedSdkPublisher.of(publisher,
+                                              wrapUtf8(envelopePrefix),
+                                              wrapUtf8(envelopeSuffix),
+                                              SdkPublishers::concat);
+    }
+
+    private static ByteBuffer wrapUtf8(String s) {
+        return ByteBuffer.wrap(s.getBytes(StandardCharsets.UTF_8));
+    }
+
+    private static ByteBuffer concat(ByteBuffer b1, ByteBuffer b2) {
+        ByteBuffer result = ByteBuffer.allocate(b1.remaining() + b2.remaining());
+        result.put(b1);
+        result.put(b2);
+        result.rewind();
+        return result;
+    }
+}
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/capacity/TokenBucket.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/capacity/TokenBucket.java
new file mode 100644
index 000000000000..e162d68d6b05
--- /dev/null
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/capacity/TokenBucket.java
@@ -0,0 +1,135 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.core.internal.capacity;
+
+import java.util.Optional;
+import java.util.concurrent.atomic.AtomicInteger;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.core.retry.conditions.TokenBucketRetryCondition.Capacity;
+import software.amazon.awssdk.utils.Validate;
+
+/**
+ * A lock-free implementation of a token bucket. Tokens can be acquired from the bucket as long as there is sufficient capacity
+ * in the bucket.
+ */
+@SdkInternalApi
+public class TokenBucket {
+    private final int maxCapacity;
+    private final AtomicInteger capacity;
+
+    /**
+     * Create a bucket containing the specified number of tokens.
+     */
+    public TokenBucket(int maxCapacity) {
+        this.maxCapacity = maxCapacity;
+        this.capacity = new AtomicInteger(maxCapacity);
+    }
+
+    /**
+     * Try to acquire a certain number of tokens from this bucket. If there aren't sufficient tokens in this bucket,
+     * {@link Optional#empty()} is returned.
+     */
+    public Optional<Capacity> tryAcquire(int amountToAcquire) {
+        Validate.isTrue(amountToAcquire >= 0, "Amount must not be negative.");
+
+        if (amountToAcquire == 0) {
+            return Optional.of(Capacity.builder()
+                                       .capacityAcquired(0)
+                                       .capacityRemaining(capacity.get())
+                                       .build());
+        }
+
+        int currentCapacity;
+        int newCapacity;
+        do {
+            currentCapacity = capacity.get();
+            newCapacity = currentCapacity - amountToAcquire;
+
+            if (newCapacity < 0) {
+                return Optional.empty();
+            }
+        } while (!capacity.compareAndSet(currentCapacity, newCapacity));
+
+        return Optional.of(Capacity.builder()
+                                   .capacityAcquired(amountToAcquire)
+                                   .capacityRemaining(newCapacity)
+                                   .build());
+    }
+
+    /**
+     * Release a certain number of tokens back to this bucket. If this number of tokens would exceed the maximum number of tokens
+     * configured for the bucket, the bucket is instead set to the maximum value and the additional tokens are discarded.
+     */
+    public void release(int amountToRelease) {
+        Validate.isTrue(amountToRelease >= 0, "Amount must not be negative.");
+
+        if (amountToRelease == 0) {
+            return;
+        }
+
+        int currentCapacity;
+        int newCapacity;
+        do {
+            currentCapacity = capacity.get();
+
+            if (currentCapacity == maxCapacity) {
+                return;
+            }
+
+            newCapacity = Math.min(currentCapacity + amountToRelease, maxCapacity);
+        } while (!capacity.compareAndSet(currentCapacity, newCapacity));
+    }
+
+    /**
+     * Retrieve a snapshot of the current number of tokens in the bucket. Because this number is constantly changing, it's
+     * recommended to refer to the {@link Capacity#capacityRemaining()} returned by the {@link #tryAcquire(int)} method whenever
+     * possible.
+     */
+    public int currentCapacity() {
+        return capacity.get();
+    }
+
+    /**
+     * Retrieve the maximum capacity of the bucket configured when the bucket was created.
+     */
+    public int maxCapacity() {
+        return maxCapacity;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        TokenBucket that = (TokenBucket) o;
+
+        if (maxCapacity != that.maxCapacity) {
+            return false;
+        }
+        return capacity.get() == that.capacity.get();
+    }
+
+    @Override
+    public int hashCode() {
+        int result = maxCapacity;
+        result = 31 * result + capacity.get();
+        return result;
+    }
+}
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/handler/BaseAsyncClientHandler.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/handler/BaseAsyncClientHandler.java
new file mode 100644
index 000000000000..925d2750a1b4
--- /dev/null
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/handler/BaseAsyncClientHandler.java
@@ -0,0 +1,264 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.core.internal.handler;
+
+import static software.amazon.awssdk.utils.FunctionalUtils.runAndLogError;
+
+import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+import java.util.function.Function;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.core.Response;
+import software.amazon.awssdk.core.SdkRequest;
+import software.amazon.awssdk.core.SdkResponse;
+import software.amazon.awssdk.core.async.AsyncRequestBody;
+import software.amazon.awssdk.core.async.AsyncResponseTransformer;
+import software.amazon.awssdk.core.client.config.SdkClientConfiguration;
+import software.amazon.awssdk.core.client.handler.AsyncClientHandler;
+import software.amazon.awssdk.core.client.handler.ClientExecutionParams;
+import software.amazon.awssdk.core.exception.SdkException;
+import software.amazon.awssdk.core.http.Crc32Validation;
+import software.amazon.awssdk.core.http.ExecutionContext;
+import software.amazon.awssdk.core.http.HttpResponseHandler;
+import software.amazon.awssdk.core.interceptor.ExecutionAttributes;
+import software.amazon.awssdk.core.interceptor.InterceptorContext;
+import software.amazon.awssdk.core.internal.InternalCoreExecutionAttribute;
+import software.amazon.awssdk.core.internal.http.AmazonAsyncHttpClient;
+import software.amazon.awssdk.core.internal.http.IdempotentAsyncResponseHandler;
+import software.amazon.awssdk.core.internal.http.TransformingAsyncResponseHandler;
+import software.amazon.awssdk.core.internal.http.async.AsyncAfterTransmissionInterceptorCallingResponseHandler;
+import software.amazon.awssdk.core.internal.http.async.AsyncResponseHandler;
+import software.amazon.awssdk.core.internal.http.async.AsyncStreamingResponseHandler;
+import software.amazon.awssdk.core.internal.http.async.CombinedResponseAsyncHttpResponseHandler;
+import software.amazon.awssdk.core.internal.util.ThrowableUtils;
+import software.amazon.awssdk.core.sync.RequestBody;
+import software.amazon.awssdk.http.SdkHttpFullRequest;
+import software.amazon.awssdk.http.SdkHttpFullResponse;
+import software.amazon.awssdk.utils.CompletableFutureUtils;
+import software.amazon.awssdk.utils.Logger;
+
+@SdkInternalApi
+public abstract class BaseAsyncClientHandler extends BaseClientHandler implements AsyncClientHandler {
+    private static final Logger log = Logger.loggerFor(BaseAsyncClientHandler.class);
+    private final SdkClientConfiguration clientConfiguration;
+    private final AmazonAsyncHttpClient client;
+    private final Function<SdkHttpFullResponse, SdkHttpFullResponse> crc32Validator;
+
+    protected BaseAsyncClientHandler(SdkClientConfiguration clientConfiguration,
+                                     AmazonAsyncHttpClient client) {
+        super(clientConfiguration);
+        this.clientConfiguration = clientConfiguration;
+        this.client = client;
+        this.crc32Validator = response -> Crc32Validation.validate(isCalculateCrc32FromCompressedData(), response);
+    }
+
+    @Override
+    public <InputT extends SdkRequest, OutputT extends SdkResponse> CompletableFuture<OutputT> execute(
+        ClientExecutionParams<InputT, OutputT> executionParams) {
+
+        validateExecutionParams(executionParams);
+        ExecutionContext executionContext = createExecutionContext(executionParams, createInitialExecutionAttributes());
+        TransformingAsyncResponseHandler<Response<OutputT>> combinedResponseHandler;
+
+        /* Decorate and combine provided response handlers into a single decorated response handler */
+        if (executionParams.getCombinedResponseHandler() == null) {
+            combinedResponseHandler = createDecoratedHandler(executionParams.getResponseHandler(),
+                                                             executionParams.getErrorResponseHandler(),
+                                                             executionContext);
+        } else {
+            combinedResponseHandler = createDecoratedHandler(executionParams.getCombinedResponseHandler(),
+                                                             executionContext);
+        }
+
+        return doExecute(executionParams, executionContext, combinedResponseHandler);
+    }
+
+    @Override
+    public <InputT extends SdkRequest, OutputT extends SdkResponse, ReturnT> CompletableFuture<ReturnT> execute(
+        ClientExecutionParams<InputT, OutputT> executionParams,
+        AsyncResponseTransformer<OutputT, ReturnT> asyncResponseTransformer) {
+
+        validateExecutionParams(executionParams);
+
+        if (executionParams.getCombinedResponseHandler() != null) {
+            // There is no support for catching errors in a body for streaming responses. Our codegen must never
+            // attempt to do this.
+            throw new IllegalArgumentException("A streaming 'asyncResponseTransformer' may not be used when a "
+                                               + "'combinedResponseHandler' has been specified in a "
+                                               + "ClientExecutionParams object.");
+        }
+
+        ExecutionAttributes executionAttributes = createInitialExecutionAttributes();
+
+        AsyncStreamingResponseHandler<OutputT, ReturnT> asyncStreamingResponseHandler =
+            new AsyncStreamingResponseHandler<>(asyncResponseTransformer);
+
+        // For streaming requests, prepare() should be called as early as possible to avoid NPE in client
+        // See https://github.com/aws/aws-sdk-java-v2/issues/1268. We do this with a wrapper that caches the prepare
+        // result until the execution attempt number changes. This guarantees that prepare is only called once per
+        // execution.
+        TransformingAsyncResponseHandler<ReturnT> wrappedAsyncStreamingResponseHandler =
+            IdempotentAsyncResponseHandler.create(
+                asyncStreamingResponseHandler,
+                () -> executionAttributes.getAttribute(InternalCoreExecutionAttribute.EXECUTION_ATTEMPT),
+                Integer::equals);
+        wrappedAsyncStreamingResponseHandler.prepare();
+
+        ExecutionContext context = createExecutionContext(executionParams, executionAttributes);
+
+        HttpResponseHandler<OutputT> decoratedResponseHandlers =
+            decorateResponseHandlers(executionParams.getResponseHandler(), context);
+
+        asyncStreamingResponseHandler.responseHandler(decoratedResponseHandlers);
+
+        TransformingAsyncResponseHandler<? extends SdkException> errorHandler =
+            resolveErrorResponseHandler(executionParams.getErrorResponseHandler(), context, crc32Validator);
+
+        TransformingAsyncResponseHandler<Response<ReturnT>> combinedResponseHandler =
+            new CombinedResponseAsyncHttpResponseHandler<>(wrappedAsyncStreamingResponseHandler, errorHandler);
+
+        return doExecute(executionParams, context, combinedResponseHandler);
+    }
+
+    /**
+     * Combines and decorates separate success and failure response handlers into a single combined response handler
+     * that handles both cases and produces a {@link Response} object that wraps the result. The handlers are
+     * decorated with additional behavior (such as CRC32 validation).
+     */
+    private <OutputT extends SdkResponse> TransformingAsyncResponseHandler<Response<OutputT>> createDecoratedHandler(
+        HttpResponseHandler<OutputT> successHandler,
+        HttpResponseHandler<? extends SdkException> errorHandler,
+        ExecutionContext executionContext) {
+
+        HttpResponseHandler<OutputT> decoratedResponseHandlers =
+            decorateResponseHandlers(successHandler, executionContext);
+
+        TransformingAsyncResponseHandler<OutputT> decoratedSuccessHandler =
+            new AsyncResponseHandler<>(decoratedResponseHandlers,
+                                       crc32Validator,
+                                       executionContext.executionAttributes());
+
+        TransformingAsyncResponseHandler<? extends SdkException> decoratedErrorHandler =
+            resolveErrorResponseHandler(errorHandler, executionContext, crc32Validator);
+        return new CombinedResponseAsyncHttpResponseHandler<>(decoratedSuccessHandler, decoratedErrorHandler);
+    }
+
+    /**
+     * Decorates a combined response handler with additional behavior (such as CRC32 validation).
+     */
+    private <OutputT extends SdkResponse> TransformingAsyncResponseHandler<Response<OutputT>> createDecoratedHandler(
+        HttpResponseHandler<Response<OutputT>> combinedResponseHandler,
+        ExecutionContext executionContext) {
+
+        HttpResponseHandler<Response<OutputT>> decoratedResponseHandlers =
+            decorateSuccessResponseHandlers(combinedResponseHandler, executionContext);
+
+        return new AsyncResponseHandler<>(decoratedResponseHandlers,
+                                          crc32Validator,
+                                          executionContext.executionAttributes());
+    }
+
+    private <InputT extends SdkRequest, OutputT extends SdkResponse, ReturnT> CompletableFuture<ReturnT> doExecute(
+        ClientExecutionParams<InputT, OutputT> executionParams,
+        ExecutionContext executionContext,
+        TransformingAsyncResponseHandler<Response<ReturnT>> asyncResponseHandler) {
+
+        try {
+
+            // Running beforeExecution interceptors and modifyRequest interceptors.
+            InterceptorContext finalizeSdkRequestContext = finalizeSdkRequest(executionContext);
+            InputT inputT = (InputT) finalizeSdkRequestContext.request();
+
+            // Running beforeMarshalling, afterMarshalling and modifyHttpRequest, modifyHttpContent,
+            // modifyAsyncHttpContent interceptors
+            InterceptorContext finalizeSdkHttpRequestContext = finalizeSdkHttpFullRequest(executionParams,
+                                                                                          executionContext,
+                                                                                          inputT,
+                                                                                          clientConfiguration);
+
+            SdkHttpFullRequest marshalled = (SdkHttpFullRequest) finalizeSdkHttpRequestContext.httpRequest();
+            Optional<RequestBody> requestBody = finalizeSdkHttpRequestContext.requestBody();
+
+            // For non-streaming requests, RequestBody can be modified in the interceptors. eg:
+            // CreateMultipartUploadRequestInterceptor
+            if (!finalizeSdkHttpRequestContext.asyncRequestBody().isPresent() && requestBody.isPresent()) {
+                marshalled = marshalled.toBuilder()
+                                       .contentStreamProvider(requestBody.get().contentStreamProvider())
+                                       .build();
+            }
+
+            CompletableFuture<ReturnT> invokeFuture =
+                invoke(marshalled,
+                       finalizeSdkHttpRequestContext.asyncRequestBody().orElse(null),
+                       inputT,
+                       executionContext,
+                       new AsyncAfterTransmissionInterceptorCallingResponseHandler<>(asyncResponseHandler,
+                                                                                     executionContext));
+
+            CompletableFuture<ReturnT> exceptionTranslatedFuture = invokeFuture.handle((resp, err) -> {
+                if (err != null) {
+                    throw ThrowableUtils.failure(err);
+                }
+                return resp;
+            });
+
+            return CompletableFutureUtils.forwardExceptionTo(exceptionTranslatedFuture, invokeFuture);
+        } catch (Throwable t) {
+            runAndLogError(
+                log.logger(),
+                "Error thrown from TransformingAsyncResponseHandler#onError, ignoring.",
+                () -> asyncResponseHandler.onError(t));
+            return CompletableFutureUtils.failedFuture(ThrowableUtils.asSdkException(t));
+        }
+    }
+
+    @Override
+    public void close() {
+        client.close();
+    }
+
+    /**
+     * Error responses are never streaming so we always use {@link AsyncResponseHandler}.
+     *
+     * @return Async handler for error responses.
+     */
+    private TransformingAsyncResponseHandler<? extends SdkException> resolveErrorResponseHandler(
+        HttpResponseHandler<? extends SdkException> errorHandler,
+        ExecutionContext executionContext,
+        Function<SdkHttpFullResponse, SdkHttpFullResponse> responseAdapter) {
+        return new AsyncResponseHandler<>(errorHandler,
+                                          responseAdapter,
+                                          executionContext.executionAttributes());
+    }
+
+    /**
+     * Invoke the request using the http client. Assumes credentials (or lack thereof) have been
+     * configured in the ExecutionContext beforehand.
+     **/
+    private <InputT extends SdkRequest, OutputT> CompletableFuture<OutputT> invoke(
+        SdkHttpFullRequest request,
+        AsyncRequestBody requestProvider,
+        InputT originalRequest,
+        ExecutionContext executionContext,
+        TransformingAsyncResponseHandler<Response<OutputT>> responseHandler) {
+        return client.requestExecutionBuilder()
+                     .requestProvider(requestProvider)
+                     .request(request)
+                     .originalRequest(originalRequest)
+                     .executionContext(executionContext)
+                     .execute(responseHandler);
+    }
+}
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/handler/BaseClientHandler.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/handler/BaseClientHandler.java
new file mode 100644
index 000000000000..2e3e2c773b10
--- /dev/null
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/handler/BaseClientHandler.java
@@ -0,0 +1,274 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.core.internal.handler;
+
+import java.net.URI;
+import java.util.function.BiFunction;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.core.Response;
+import software.amazon.awssdk.core.SdkRequest;
+import software.amazon.awssdk.core.SdkResponse;
+import software.amazon.awssdk.core.client.config.SdkAdvancedClientOption;
+import software.amazon.awssdk.core.client.config.SdkClientConfiguration;
+import software.amazon.awssdk.core.client.config.SdkClientOption;
+import software.amazon.awssdk.core.client.handler.ClientExecutionParams;
+import software.amazon.awssdk.core.http.ExecutionContext;
+import software.amazon.awssdk.core.http.HttpResponseHandler;
+import software.amazon.awssdk.core.interceptor.ExecutionAttributes;
+import software.amazon.awssdk.core.interceptor.ExecutionInterceptorChain;
+import software.amazon.awssdk.core.interceptor.InterceptorContext;
+import software.amazon.awssdk.core.interceptor.SdkExecutionAttribute;
+import software.amazon.awssdk.core.internal.InternalCoreExecutionAttribute;
+import software.amazon.awssdk.http.SdkHttpFullRequest;
+import software.amazon.awssdk.http.SdkHttpFullResponse;
+import software.amazon.awssdk.utils.StringUtils;
+
+@SdkInternalApi
+public abstract class BaseClientHandler {
+    private SdkClientConfiguration clientConfiguration;
+
+    protected BaseClientHandler(SdkClientConfiguration clientConfiguration) {
+        this.clientConfiguration = clientConfiguration;
+    }
+
+    /**
+     * Finalize {@link SdkRequest} by running beforeExecution and modifyRequest interceptors.
+     *
+     * @param executionContext the execution context
+     * @return the {@link InterceptorContext}
+     */
+    static InterceptorContext finalizeSdkRequest(ExecutionContext executionContext) {
+        runBeforeExecutionInterceptors(executionContext);
+        return runModifyRequestInterceptors(executionContext);
+    }
+
+    /**
+     * Finalize {@link SdkHttpFullRequest} by running beforeMarshalling, afterMarshalling,
+     * modifyHttpRequest, modifyHttpContent and modifyAsyncHttpContent interceptors
+     */
+    static <InputT extends SdkRequest, OutputT> InterceptorContext finalizeSdkHttpFullRequest(
+        ClientExecutionParams<InputT, OutputT> executionParams,
+        ExecutionContext executionContext, InputT inputT,
+        SdkClientConfiguration clientConfiguration) {
+
+        runBeforeMarshallingInterceptors(executionContext);
+        SdkHttpFullRequest request = executionParams.getMarshaller().marshall(inputT);
+        request = modifyEndpointHostIfNeeded(request, clientConfiguration, executionParams);
+
+        addHttpRequest(executionContext, request);
+        runAfterMarshallingInterceptors(executionContext);
+        return runModifyHttpRequestAndHttpContentInterceptors(executionContext);
+    }
+
+    private static void runBeforeExecutionInterceptors(ExecutionContext executionContext) {
+        executionContext.interceptorChain().beforeExecution(executionContext.interceptorContext(),
+                                                            executionContext.executionAttributes());
+    }
+
+    private static InterceptorContext runModifyRequestInterceptors(ExecutionContext executionContext) {
+        InterceptorContext interceptorContext =
+            executionContext.interceptorChain().modifyRequest(executionContext.interceptorContext(),
+                                                              executionContext.executionAttributes());
+        executionContext.interceptorContext(interceptorContext);
+        return interceptorContext;
+    }
+
+    private static void runBeforeMarshallingInterceptors(ExecutionContext executionContext) {
+        executionContext.interceptorChain().beforeMarshalling(executionContext.interceptorContext(),
+                                                              executionContext.executionAttributes());
+    }
+
+    /**
+     * Modifies the given {@link SdkHttpFullRequest} with new host if host prefix is enabled and set.
+     */
+    private static SdkHttpFullRequest modifyEndpointHostIfNeeded(SdkHttpFullRequest originalRequest,
+                                                                 SdkClientConfiguration clientConfiguration,
+                                                                 ClientExecutionParams executionParams) {
+        if (executionParams.discoveredEndpoint() != null) {
+            URI discoveredEndpoint = executionParams.discoveredEndpoint();
+            return originalRequest.toBuilder().host(discoveredEndpoint.getHost()).port(discoveredEndpoint.getPort()).build();
+        }
+
+        Boolean disableHostPrefixInjection = clientConfiguration.option(SdkAdvancedClientOption.DISABLE_HOST_PREFIX_INJECTION);
+        if ((disableHostPrefixInjection != null && disableHostPrefixInjection.equals(Boolean.TRUE)) ||
+            StringUtils.isEmpty(executionParams.hostPrefixExpression())) {
+            return originalRequest;
+        }
+
+        return originalRequest.toBuilder()
+                              .host(executionParams.hostPrefixExpression() + originalRequest.host())
+                              .build();
+    }
+
+    private static void addHttpRequest(ExecutionContext executionContext, SdkHttpFullRequest request) {
+        InterceptorContext interceptorContext = executionContext.interceptorContext().copy(b -> b.httpRequest(request));
+        executionContext.interceptorContext(interceptorContext);
+    }
+
+    private static void runAfterMarshallingInterceptors(ExecutionContext executionContext) {
+        executionContext.interceptorChain().afterMarshalling(executionContext.interceptorContext(),
+                                                             executionContext.executionAttributes());
+    }
+
+    private static InterceptorContext runModifyHttpRequestAndHttpContentInterceptors(ExecutionContext executionContext) {
+        InterceptorContext interceptorContext =
+            executionContext.interceptorChain().modifyHttpRequestAndHttpContent(executionContext.interceptorContext(),
+                                                                                executionContext.executionAttributes());
+        executionContext.interceptorContext(interceptorContext);
+        return interceptorContext;
+    }
+
+    /**
+     * Run afterUnmarshalling and modifyResponse interceptors.
+     */
+    private static <OutputT extends SdkResponse> BiFunction<OutputT, SdkHttpFullResponse, OutputT>
+        runAfterUnmarshallingInterceptors(ExecutionContext context) {
+
+        return (input, httpFullResponse) -> {
+            // Update interceptor context to include response
+            InterceptorContext interceptorContext =
+                context.interceptorContext().copy(b -> b.response(input));
+
+            context.interceptorChain().afterUnmarshalling(interceptorContext, context.executionAttributes());
+
+            interceptorContext = context.interceptorChain().modifyResponse(interceptorContext, context.executionAttributes());
+
+            // Store updated context
+            context.interceptorContext(interceptorContext);
+
+            return (OutputT) interceptorContext.response();
+        };
+    }
+
+    private static <OutputT extends SdkResponse> BiFunction<OutputT, SdkHttpFullResponse, OutputT>
+        attachHttpResponseToResult() {
+
+        return ((response, httpFullResponse) ->
+                    (OutputT) response.toBuilder().sdkHttpResponse(httpFullResponse).build());
+    }
+
+    static ExecutionAttributes createInitialExecutionAttributes() {
+        return new ExecutionAttributes().putAttribute(InternalCoreExecutionAttribute.EXECUTION_ATTEMPT, 1);
+    }
+
+    protected <InputT extends SdkRequest, OutputT extends SdkResponse> ExecutionContext createExecutionContext(
+        ClientExecutionParams<InputT, OutputT> params, ExecutionAttributes executionAttributes) {
+
+        SdkRequest originalRequest = params.getInput();
+
+        executionAttributes
+            .putAttribute(SdkExecutionAttribute.SERVICE_CONFIG,
+                          clientConfiguration.option(SdkClientOption.SERVICE_CONFIGURATION))
+            .putAttribute(SdkExecutionAttribute.SERVICE_NAME, clientConfiguration.option(SdkClientOption.SERVICE_NAME));
+
+        ExecutionInterceptorChain interceptorChain =
+                new ExecutionInterceptorChain(clientConfiguration.option(SdkClientOption.EXECUTION_INTERCEPTORS));
+
+        return ExecutionContext.builder()
+                               .interceptorChain(interceptorChain)
+                               .interceptorContext(InterceptorContext.builder()
+                                                                     .request(originalRequest)
+                                                                     .build())
+                               .executionAttributes(executionAttributes)
+                               .signer(clientConfiguration.option(SdkAdvancedClientOption.SIGNER))
+                               .build();
+    }
+
+    protected boolean isCalculateCrc32FromCompressedData() {
+        return clientConfiguration.option(SdkClientOption.CRC32_FROM_COMPRESSED_DATA_ENABLED);
+    }
+
+    /**
+     * Decorate response handlers by running after unmarshalling Interceptors and adding http response metadata.
+     */
+    <OutputT extends SdkResponse> HttpResponseHandler<OutputT> decorateResponseHandlers(
+        HttpResponseHandler<OutputT> delegate, ExecutionContext executionContext) {
+
+        return resultTransformationResponseHandler(delegate, responseTransformations(executionContext));
+    }
+
+    <OutputT extends SdkResponse> HttpResponseHandler<Response<OutputT>> decorateSuccessResponseHandlers(
+        HttpResponseHandler<Response<OutputT>> delegate, ExecutionContext executionContext) {
+
+        return successTransformationResponseHandler(delegate, responseTransformations(executionContext));
+    }
+
+    <OutputT extends SdkResponse> HttpResponseHandler<Response<OutputT>> successTransformationResponseHandler(
+        HttpResponseHandler<Response<OutputT>> responseHandler,
+        BiFunction<OutputT, SdkHttpFullResponse, OutputT> successTransformer) {
+
+        return (response, executionAttributes) -> {
+            Response<OutputT> delegateResponse = responseHandler.handle(response, executionAttributes);
+
+            if (delegateResponse.isSuccess()) {
+                return delegateResponse.toBuilder()
+                                       .response(successTransformer.apply(delegateResponse.response(), response))
+                                       .build();
+            } else {
+                return delegateResponse;
+            }
+        };
+    }
+
+    <OutputT extends SdkResponse> HttpResponseHandler<OutputT> resultTransformationResponseHandler(
+        HttpResponseHandler<OutputT> responseHandler,
+        BiFunction<OutputT, SdkHttpFullResponse, OutputT> successTransformer) {
+
+        return (response, executionAttributes) -> {
+            OutputT delegateResponse = responseHandler.handle(response, executionAttributes);
+            return successTransformer.apply(delegateResponse, response);
+        };
+    }
+
+    static void validateExecutionParams(ClientExecutionParams<?, ?> executionParams) {
+        if (executionParams.getCombinedResponseHandler() != null) {
+            if (executionParams.getResponseHandler() != null) {
+                throw new IllegalArgumentException("Only one of 'combinedResponseHandler' and 'responseHandler' may "
+                                                   + "be specified in a ClientExecutionParams object");
+            }
+
+            if (executionParams.getErrorResponseHandler() != null) {
+                throw new IllegalArgumentException("Only one of 'combinedResponseHandler' and 'errorResponseHandler' "
+                                                   + "may be specified in a ClientExecutionParams object");
+            }
+        }
+    }
+
+    /**
+     * Returns the composition of 'runAfterUnmarshallingInterceptors' and 'attachHttpResponseToResult' response
+     * transformations as a single transformation that should be applied to all responses.
+     */
+    private static <T extends SdkResponse> BiFunction<T, SdkHttpFullResponse, T>
+        responseTransformations(ExecutionContext executionContext) {
+
+        return composeResponseFunctions(runAfterUnmarshallingInterceptors(executionContext),
+                                        attachHttpResponseToResult());
+    }
+
+    /**
+     * Composes two functions passing the result of the first function as the first argument of the second function
+     * and the same second argument to both functions. This is used by response transformers to chain together and
+     * pass through a persistent SdkHttpFullResponse object as a second arg turning them effectively into a single
+     * response transformer.
+     * <p>
+     * So given f1(x, y) and f2(x, y) where x is typically OutputT and y is typically SdkHttpFullResponse the composed
+     * function would be f12(x, y) = f2(f1(x, y), y).
+     */
+    private static <T, R> BiFunction<T, R, T> composeResponseFunctions(BiFunction<T, R, T> function1,
+                                                                       BiFunction<T, R, T> function2) {
+        return (x, y) -> function2.apply(function1.apply(x, y), y);
+    }
+}
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/handler/BaseSyncClientHandler.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/handler/BaseSyncClientHandler.java
new file mode 100644
index 000000000000..33b868042b9d
--- /dev/null
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/handler/BaseSyncClientHandler.java
@@ -0,0 +1,191 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.core.internal.handler;
+
+import java.util.Optional;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.core.Response;
+import software.amazon.awssdk.core.SdkRequest;
+import software.amazon.awssdk.core.SdkResponse;
+import software.amazon.awssdk.core.client.config.SdkClientConfiguration;
+import software.amazon.awssdk.core.client.handler.ClientExecutionParams;
+import software.amazon.awssdk.core.client.handler.SyncClientHandler;
+import software.amazon.awssdk.core.exception.AbortedException;
+import software.amazon.awssdk.core.exception.NonRetryableException;
+import software.amazon.awssdk.core.exception.RetryableException;
+import software.amazon.awssdk.core.http.ExecutionContext;
+import software.amazon.awssdk.core.http.HttpResponseHandler;
+import software.amazon.awssdk.core.interceptor.ExecutionAttributes;
+import software.amazon.awssdk.core.interceptor.InterceptorContext;
+import software.amazon.awssdk.core.internal.http.AmazonSyncHttpClient;
+import software.amazon.awssdk.core.internal.http.CombinedResponseHandler;
+import software.amazon.awssdk.core.internal.http.InterruptMonitor;
+import software.amazon.awssdk.core.sync.RequestBody;
+import software.amazon.awssdk.core.sync.ResponseTransformer;
+import software.amazon.awssdk.http.AbortableInputStream;
+import software.amazon.awssdk.http.SdkHttpFullRequest;
+import software.amazon.awssdk.http.SdkHttpFullResponse;
+
+@SdkInternalApi
+public abstract class BaseSyncClientHandler extends BaseClientHandler implements SyncClientHandler {
+    private final SdkClientConfiguration clientConfiguration;
+    private final AmazonSyncHttpClient client;
+
+    protected BaseSyncClientHandler(SdkClientConfiguration clientConfiguration,
+                                    AmazonSyncHttpClient client) {
+        super(clientConfiguration);
+        this.clientConfiguration = clientConfiguration;
+        this.client = client;
+    }
+
+    @Override
+    public <InputT extends SdkRequest, OutputT extends SdkResponse, ReturnT> ReturnT execute(
+        ClientExecutionParams<InputT, OutputT> executionParams,
+        ResponseTransformer<OutputT, ReturnT> responseTransformer) {
+
+        validateExecutionParams(executionParams);
+
+        if (executionParams.getCombinedResponseHandler() != null) {
+            // There is no support for catching errors in a body for streaming responses
+            throw new IllegalArgumentException("A streaming 'responseTransformer' may not be used when a "
+                                               + "'combinedResponseHandler' has been specified in a "
+                                               + "ClientExecutionParams object.");
+        }
+
+        ExecutionContext executionContext = createExecutionContext(executionParams, createInitialExecutionAttributes());
+
+        HttpResponseHandler<OutputT> decoratedResponseHandlers =
+            decorateResponseHandlers(executionParams.getResponseHandler(), executionContext);
+
+        HttpResponseHandler<ReturnT> httpResponseHandler =
+            new HttpResponseHandlerAdapter<>(decoratedResponseHandlers, responseTransformer);
+
+        return doExecute(
+            executionParams,
+            executionContext,
+            new CombinedResponseHandler<>(httpResponseHandler, executionParams.getErrorResponseHandler()));
+    }
+
+    @Override
+    public <InputT extends SdkRequest, OutputT extends SdkResponse> OutputT execute(
+        ClientExecutionParams<InputT, OutputT> executionParams) {
+
+        validateExecutionParams(executionParams);
+        ExecutionContext executionContext = createExecutionContext(executionParams, createInitialExecutionAttributes());
+        HttpResponseHandler<Response<OutputT>> combinedResponseHandler;
+
+        if (executionParams.getCombinedResponseHandler() != null) {
+            combinedResponseHandler = decorateSuccessResponseHandlers(executionParams.getCombinedResponseHandler(),
+                                                                      executionContext);
+        } else {
+            HttpResponseHandler<OutputT> decoratedResponseHandlers =
+                decorateResponseHandlers(executionParams.getResponseHandler(), executionContext);
+
+            combinedResponseHandler = new CombinedResponseHandler<>(decoratedResponseHandlers,
+                                                                    executionParams.getErrorResponseHandler());
+        }
+
+        return doExecute(executionParams, executionContext, combinedResponseHandler);
+    }
+
+    @Override
+    public void close() {
+        client.close();
+    }
+
+    /**
+     * Invoke the request using the http client. Assumes credentials (or lack thereof) have been
+     * configured in the OldExecutionContext beforehand.
+     **/
+    private <OutputT> OutputT invoke(SdkHttpFullRequest request,
+                                       SdkRequest originalRequest,
+                                       ExecutionContext executionContext,
+                                       HttpResponseHandler<Response<OutputT>> responseHandler) {
+        return client.requestExecutionBuilder()
+                     .request(request)
+                     .originalRequest(originalRequest)
+                     .executionContext(executionContext)
+                     .execute(responseHandler);
+    }
+
+    private <InputT extends SdkRequest, OutputT, ReturnT> ReturnT doExecute(
+        ClientExecutionParams<InputT, OutputT> executionParams,
+        ExecutionContext executionContext,
+        HttpResponseHandler<Response<ReturnT>> responseHandler) {
+
+        InputT inputT = (InputT) finalizeSdkRequest(executionContext).request();
+
+        InterceptorContext sdkHttpFullRequestContext = finalizeSdkHttpFullRequest(executionParams,
+                                                                                  executionContext,
+                                                                                  inputT,
+                                                                                  clientConfiguration);
+
+        SdkHttpFullRequest marshalled = (SdkHttpFullRequest) sdkHttpFullRequestContext.httpRequest();
+
+        // TODO Pass requestBody as separate arg to invoke
+        Optional<RequestBody> requestBody = sdkHttpFullRequestContext.requestBody();
+
+        if (requestBody.isPresent()) {
+            marshalled = marshalled.toBuilder()
+                                   .contentStreamProvider(requestBody.get().contentStreamProvider())
+                                   .build();
+        }
+
+        return invoke(marshalled,
+                      inputT,
+                      executionContext,
+                      responseHandler);
+    }
+
+    private static class HttpResponseHandlerAdapter<ReturnT, OutputT extends SdkResponse>
+        implements HttpResponseHandler<ReturnT> {
+
+        private final HttpResponseHandler<OutputT> httpResponseHandler;
+        private final ResponseTransformer<OutputT, ReturnT> responseTransformer;
+
+        private HttpResponseHandlerAdapter(HttpResponseHandler<OutputT> httpResponseHandler,
+                                           ResponseTransformer<OutputT, ReturnT> responseTransformer) {
+            this.httpResponseHandler = httpResponseHandler;
+            this.responseTransformer = responseTransformer;
+        }
+
+        @Override
+        public ReturnT handle(SdkHttpFullResponse response, ExecutionAttributes executionAttributes) throws Exception {
+            OutputT resp = httpResponseHandler.handle(response, executionAttributes);
+            return transformResponse(resp, response.content().orElse(null));
+        }
+
+        @Override
+        public boolean needsConnectionLeftOpen() {
+            return responseTransformer.needsConnectionLeftOpen();
+        }
+
+
+        private ReturnT transformResponse(OutputT resp, AbortableInputStream inputStream) throws Exception {
+            try {
+                InterruptMonitor.checkInterrupted();
+                ReturnT result = responseTransformer.transform(resp, inputStream);
+                InterruptMonitor.checkInterrupted();
+                return result;
+            }  catch (RetryableException | InterruptedException | AbortedException e) {
+                throw e;
+            } catch (Exception e) {
+                InterruptMonitor.checkInterrupted();
+                throw NonRetryableException.builder().cause(e).build();
+            }
+        }
+    }
+}
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/AmazonAsyncHttpClient.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/AmazonAsyncHttpClient.java
index 8c7915bf4dd5..d1784ebf9058 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/AmazonAsyncHttpClient.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/AmazonAsyncHttpClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -20,11 +20,11 @@
 import java.util.concurrent.CompletableFuture;
 import software.amazon.awssdk.annotations.SdkInternalApi;
 import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.core.Response;
 import software.amazon.awssdk.core.SdkRequest;
 import software.amazon.awssdk.core.async.AsyncRequestBody;
 import software.amazon.awssdk.core.client.config.SdkClientConfiguration;
 import software.amazon.awssdk.core.exception.SdkClientException;
-import software.amazon.awssdk.core.exception.SdkException;
 import software.amazon.awssdk.core.http.ExecutionContext;
 import software.amazon.awssdk.core.internal.http.pipeline.RequestPipelineBuilder;
 import software.amazon.awssdk.core.internal.http.pipeline.stages.AfterExecutionInterceptorsStage;
@@ -39,11 +39,8 @@
 import software.amazon.awssdk.core.internal.http.pipeline.stages.MakeRequestMutableStage;
 import software.amazon.awssdk.core.internal.http.pipeline.stages.MergeCustomHeadersStage;
 import software.amazon.awssdk.core.internal.http.pipeline.stages.MergeCustomQueryParamsStage;
-import software.amazon.awssdk.core.internal.http.pipeline.stages.MoveParametersToBodyStage;
 import software.amazon.awssdk.core.internal.http.pipeline.stages.SigningStage;
 import software.amazon.awssdk.core.internal.http.pipeline.stages.UnwrapResponseContainer;
-import software.amazon.awssdk.core.internal.retry.SdkDefaultRetrySetting;
-import software.amazon.awssdk.core.internal.util.CapacityManager;
 import software.amazon.awssdk.core.internal.util.ThrowableUtils;
 import software.amazon.awssdk.http.SdkHttpFullRequest;
 import software.amazon.awssdk.utils.SdkAutoCloseable;
@@ -57,16 +54,9 @@ public final class AmazonAsyncHttpClient implements SdkAutoCloseable {
     public AmazonAsyncHttpClient(SdkClientConfiguration clientConfiguration) {
         this.httpClientDependencies = HttpClientDependencies.builder()
                                                             .clientConfiguration(clientConfiguration)
-                                                            .capacityManager(createCapacityManager())
                                                             .build();
     }
 
-    private CapacityManager createCapacityManager() {
-        // When enabled, total retry capacity is computed based on retry cost and desired number of retries.
-        // TODO: Allow customers to configure throttled retries (https://github.com/aws/aws-sdk-java-v2/issues/17)
-        return new CapacityManager(SdkDefaultRetrySetting.RETRY_THROTTLING_COST * SdkDefaultRetrySetting.THROTTLED_RETRIES);
-    }
-
     /**
      * Shuts down this HTTP client object, releasing any resources that might be held open. This is
      * an optional method, and callers are not expected to call it, but can if they want to
@@ -106,15 +96,6 @@ public interface RequestExecutionBuilder {
          */
         RequestExecutionBuilder request(SdkHttpFullRequest request);
 
-        /**
-         * Fluent setter for the error response handler
-         *
-         * @param errorResponseHandler Error response handler
-         * @return This builder for method chaining.
-         */
-        RequestExecutionBuilder errorResponseHandler(
-                TransformingAsyncResponseHandler<? extends SdkException> errorResponseHandler);
-
         /**
          * Fluent setter for the execution context
          *
@@ -139,14 +120,13 @@ RequestExecutionBuilder errorResponseHandler(
          * @param <OutputT>       Result type
          * @return Unmarshalled result type.
          */
-        <OutputT> CompletableFuture<OutputT> execute(TransformingAsyncResponseHandler<OutputT> responseHandler);
+        <OutputT> CompletableFuture<OutputT> execute(TransformingAsyncResponseHandler<Response<OutputT>> responseHandler);
     }
 
     private class RequestExecutionBuilderImpl implements RequestExecutionBuilder {
 
         private AsyncRequestBody requestProvider;
         private SdkHttpFullRequest request;
-        private TransformingAsyncResponseHandler<? extends SdkException> errorResponseHandler;
         private SdkRequest originalRequest;
         private ExecutionContext executionContext;
 
@@ -162,13 +142,6 @@ public RequestExecutionBuilder request(SdkHttpFullRequest request) {
             return this;
         }
 
-        @Override
-        public RequestExecutionBuilder errorResponseHandler(
-                TransformingAsyncResponseHandler<? extends SdkException> errorResponseHandler) {
-            this.errorResponseHandler = errorResponseHandler;
-            return this;
-        }
-
         @Override
         public RequestExecutionBuilder executionContext(
                 ExecutionContext executionContext) {
@@ -183,7 +156,9 @@ public RequestExecutionBuilder originalRequest(SdkRequest originalRequest) {
         }
 
         @Override
-        public <OutputT> CompletableFuture<OutputT> execute(TransformingAsyncResponseHandler<OutputT> responseHandler) {
+        public <OutputT> CompletableFuture<OutputT> execute(
+            TransformingAsyncResponseHandler<Response<OutputT>> responseHandler) {
+
             try {
                 return RequestPipelineBuilder
                         .first(RequestPipelineBuilder
@@ -192,12 +167,11 @@ public <OutputT> CompletableFuture<OutputT> execute(TransformingAsyncResponseHan
                                 .then(ApplyUserAgentStage::new)
                                 .then(MergeCustomHeadersStage::new)
                                 .then(MergeCustomQueryParamsStage::new)
-                                .then(MoveParametersToBodyStage::new)
                                 .then(MakeRequestImmutableStage::new)
                                 .then(RequestPipelineBuilder
                                         .first(SigningStage::new)
                                         .then(BeforeTransmissionExecutionInterceptorsStage::new)
-                                        .then(d -> new MakeAsyncHttpRequestStage<>(responseHandler, errorResponseHandler, d))
+                                        .then(d -> new MakeAsyncHttpRequestStage<>(responseHandler, d))
                                         .wrappedWith((deps, wrapped) -> new AsyncRetryableStage<>(responseHandler, deps, wrapped))
                                         .then(async(() -> new UnwrapResponseContainer<>()))
                                         .then(async(() -> new AfterExecutionInterceptorsStage<>()))
@@ -221,5 +195,4 @@ private RequestExecutionContext createRequestExecutionDependencies() {
         }
 
     }
-
 }
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/AmazonSyncHttpClient.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/AmazonSyncHttpClient.java
index 0ce88f1ffc6a..38feba879847 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/AmazonSyncHttpClient.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/AmazonSyncHttpClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -17,10 +17,10 @@
 
 import software.amazon.awssdk.annotations.SdkInternalApi;
 import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.core.Response;
 import software.amazon.awssdk.core.SdkRequest;
 import software.amazon.awssdk.core.client.config.SdkClientConfiguration;
 import software.amazon.awssdk.core.exception.SdkClientException;
-import software.amazon.awssdk.core.exception.SdkException;
 import software.amazon.awssdk.core.http.ExecutionContext;
 import software.amazon.awssdk.core.http.HttpResponseHandler;
 import software.amazon.awssdk.core.interceptor.ExecutionAttributes;
@@ -40,13 +40,10 @@
 import software.amazon.awssdk.core.internal.http.pipeline.stages.MakeRequestMutableStage;
 import software.amazon.awssdk.core.internal.http.pipeline.stages.MergeCustomHeadersStage;
 import software.amazon.awssdk.core.internal.http.pipeline.stages.MergeCustomQueryParamsStage;
-import software.amazon.awssdk.core.internal.http.pipeline.stages.MoveParametersToBodyStage;
 import software.amazon.awssdk.core.internal.http.pipeline.stages.RetryableStage;
 import software.amazon.awssdk.core.internal.http.pipeline.stages.SigningStage;
 import software.amazon.awssdk.core.internal.http.pipeline.stages.TimeoutExceptionHandlingStage;
 import software.amazon.awssdk.core.internal.http.pipeline.stages.UnwrapResponseContainer;
-import software.amazon.awssdk.core.internal.retry.SdkDefaultRetrySetting;
-import software.amazon.awssdk.core.internal.util.CapacityManager;
 import software.amazon.awssdk.http.SdkHttpFullRequest;
 import software.amazon.awssdk.http.SdkHttpFullResponse;
 import software.amazon.awssdk.utils.SdkAutoCloseable;
@@ -60,16 +57,9 @@ public final class AmazonSyncHttpClient implements SdkAutoCloseable {
     public AmazonSyncHttpClient(SdkClientConfiguration clientConfiguration) {
         this.httpClientDependencies = HttpClientDependencies.builder()
                                                             .clientConfiguration(clientConfiguration)
-                                                            .capacityManager(createCapacityManager())
                                                             .build();
     }
 
-    private CapacityManager createCapacityManager() {
-        // When enabled, total retry capacity is computed based on retry cost and desired number of retries.
-        // TODO: Allow customers to configure throttled retries (https://github.com/aws/aws-sdk-java-v2/issues/17)
-        return new CapacityManager(SdkDefaultRetrySetting.RETRY_THROTTLING_COST * SdkDefaultRetrySetting.THROTTLED_RETRIES);
-    }
-
     /**
      * Shuts down this HTTP client object, releasing any resources that might be held open. This is
      * an optional method, and callers are not expected to call it, but can if they want to
@@ -81,21 +71,6 @@ public void close() {
         httpClientDependencies.close();
     }
 
-    /**
-     * Ensures the response handler is not null. If it is this method returns a dummy response
-     * handler.
-     *
-     * @return Either original response handler or dummy response handler.
-     */
-    private <T> HttpResponseHandler<T> getNonNullResponseHandler(
-        HttpResponseHandler<T> responseHandler) {
-        if (responseHandler != null) {
-            return responseHandler;
-        } else {
-            return new NoOpResponseHandler<>();
-        }
-    }
-
     /**
      * @return A builder used to configure and execute a HTTP request.
      */
@@ -118,15 +93,6 @@ public interface RequestExecutionBuilder {
 
         RequestExecutionBuilder originalRequest(SdkRequest originalRequest);
 
-        /**
-         * Fluent setter for the error response handler
-         *
-         * @param errorResponseHandler Error response handler
-         * @return This builder for method chaining.
-         */
-        RequestExecutionBuilder errorResponseHandler(
-            HttpResponseHandler<? extends SdkException> errorResponseHandler);
-
         /**
          * Fluent setter for the execution context
          *
@@ -138,23 +104,17 @@ RequestExecutionBuilder errorResponseHandler(
         /**
          * Executes the request with the given configuration.
          *
-         * @param responseHandler Response handler that outputs the actual result type which is
-         * preferred going forward.
+         * @param combinedResponseHandler response handler: converts an http request into a decorated Response object
+         *                               of the appropriate type.
          * @param <OutputT> Result type
          * @return Unmarshalled result type.
          */
-        <OutputT> OutputT execute(HttpResponseHandler<OutputT> responseHandler);
-
-        /**
-         * Executes the request with the given configuration; not handling response.
-         */
-        void execute();
-
+        <OutputT> OutputT execute(HttpResponseHandler<Response<OutputT>> combinedResponseHandler);
     }
 
     private static class NoOpResponseHandler<T> implements HttpResponseHandler<T> {
         @Override
-        public T handle(SdkHttpFullResponse response, ExecutionAttributes executionAttributes) throws Exception {
+        public T handle(SdkHttpFullResponse response, ExecutionAttributes executionAttributes) {
             return null;
         }
 
@@ -167,7 +127,6 @@ public boolean needsConnectionLeftOpen() {
     private class RequestExecutionBuilderImpl implements RequestExecutionBuilder {
 
         private SdkHttpFullRequest request;
-        private HttpResponseHandler<? extends SdkException> errorResponseHandler;
         private SdkRequest originalRequest;
         private ExecutionContext executionContext;
 
@@ -184,13 +143,6 @@ public RequestExecutionBuilder originalRequest(SdkRequest originalRequest) {
             return this;
         }
 
-        @Override
-        public RequestExecutionBuilder errorResponseHandler(
-            HttpResponseHandler<? extends SdkException> errorResponseHandler) {
-            this.errorResponseHandler = errorResponseHandler;
-            return this;
-        }
-
         @Override
         public RequestExecutionBuilder executionContext(ExecutionContext executionContext) {
             this.executionContext = executionContext;
@@ -198,7 +150,7 @@ public RequestExecutionBuilder executionContext(ExecutionContext executionContex
         }
 
         @Override
-        public <OutputT> OutputT execute(HttpResponseHandler<OutputT> responseHandler) {
+        public <OutputT> OutputT execute(HttpResponseHandler<Response<OutputT>> responseHandler) {
             // TODO: We currently have two ways of passing messages to the HTTP client: through the request or through the
             // execution interceptor context. We should combine these two methods when we refactor the way request execution
             // contexts work.
@@ -216,7 +168,6 @@ public <OutputT> OutputT execute(HttpResponseHandler<OutputT> responseHandler) {
                                .then(ApplyUserAgentStage::new)
                                .then(MergeCustomHeadersStage::new)
                                .then(MergeCustomQueryParamsStage::new)
-                               .then(MoveParametersToBodyStage::new)
                                .then(MakeRequestImmutableStage::new)
                                // End of mutating request
                                .then(RequestPipelineBuilder
@@ -225,9 +176,7 @@ public <OutputT> OutputT execute(HttpResponseHandler<OutputT> responseHandler) {
                                          .then(MakeHttpRequestStage::new)
                                          .then(AfterTransmissionExecutionInterceptorsStage::new)
                                          .then(BeforeUnmarshallingExecutionInterceptorsStage::new)
-                                         .then(() -> new HandleResponseStage<>(
-                                             getNonNullResponseHandler(responseHandler),
-                                             getNonNullResponseHandler(errorResponseHandler)))
+                                         .then(() -> new HandleResponseStage<>(responseHandler))
                                          .wrappedWith(ApiCallAttemptTimeoutTrackingStage::new)
                                          .wrappedWith(TimeoutExceptionHandlingStage::new)
                                          .wrappedWith(RetryableStage::new)::build)
@@ -245,11 +194,6 @@ public <OutputT> OutputT execute(HttpResponseHandler<OutputT> responseHandler) {
             }
         }
 
-        @Override
-        public void execute() {
-            execute(null);
-        }
-
         private RequestExecutionContext createRequestExecutionDependencies() {
             return RequestExecutionContext.builder()
                                           .originalRequest(originalRequest)
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/CombinedResponseHandler.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/CombinedResponseHandler.java
new file mode 100644
index 000000000000..0a6faad9dcfe
--- /dev/null
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/CombinedResponseHandler.java
@@ -0,0 +1,148 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.core.internal.http;
+
+import java.io.IOException;
+import java.util.Optional;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.core.Response;
+import software.amazon.awssdk.core.SdkStandardLogger;
+import software.amazon.awssdk.core.exception.RetryableException;
+import software.amazon.awssdk.core.exception.SdkClientException;
+import software.amazon.awssdk.core.exception.SdkException;
+import software.amazon.awssdk.core.http.HttpResponseHandler;
+import software.amazon.awssdk.core.interceptor.ExecutionAttributes;
+import software.amazon.awssdk.http.SdkHttpFullResponse;
+import software.amazon.awssdk.utils.IoUtils;
+
+/**
+ * Unmarshalls an HTTP response into either a successful response POJO, or into a (possibly modeled) exception based
+ * on the status code of the HTTP response. Returns a wrapper {@link Response} object which may contain either the
+ * unmarshalled success POJO, or the unmarshalled exception. Can be used with streaming or non-streaming requests.
+ *
+ * @param <OutputT> Type of successful unmarshalled POJO.
+ */
+@SdkInternalApi
+public class CombinedResponseHandler<OutputT> implements HttpResponseHandler<Response<OutputT>> {
+    private static final Logger log = LoggerFactory.getLogger(CombinedResponseHandler.class);
+
+    private final HttpResponseHandler<OutputT> successResponseHandler;
+    private final HttpResponseHandler<? extends SdkException> errorResponseHandler;
+
+    public CombinedResponseHandler(HttpResponseHandler<OutputT> successResponseHandler,
+                                   HttpResponseHandler<? extends SdkException> errorResponseHandler) {
+        this.successResponseHandler = successResponseHandler;
+        this.errorResponseHandler = errorResponseHandler;
+    }
+
+    @Override
+    public Response<OutputT> handle(SdkHttpFullResponse httpResponse, ExecutionAttributes executionAttributes)
+            throws Exception {
+
+        boolean didRequestFail = true;
+        try {
+            Response<OutputT> response = handleResponse(httpResponse, executionAttributes);
+            didRequestFail = !response.isSuccess();
+            return response;
+        } finally {
+            closeInputStreamIfNeeded(httpResponse, didRequestFail);
+        }
+    }
+
+    private Response<OutputT> handleResponse(SdkHttpFullResponse httpResponse,
+                                             ExecutionAttributes executionAttributes)
+            throws IOException, InterruptedException {
+
+        if (httpResponse.isSuccessful()) {
+            OutputT response = handleSuccessResponse(httpResponse, executionAttributes);
+            return Response.<OutputT>builder().httpResponse(httpResponse)
+                                              .response(response)
+                                              .isSuccess(true)
+                                              .build();
+        } else {
+            return Response.<OutputT>builder().httpResponse(httpResponse)
+                                              .exception(handleErrorResponse(httpResponse, executionAttributes))
+                                              .isSuccess(false)
+                                              .build();
+        }
+    }
+
+    /**
+     * Handles a successful response from a service call by unmarshalling the results using the
+     * specified response handler.
+     *
+     * @return The contents of the response, unmarshalled using the specified response handler.
+     * @throws IOException If any problems were encountered reading the response contents from
+     *                     the HTTP method object.
+     */
+    private OutputT handleSuccessResponse(SdkHttpFullResponse httpResponse, ExecutionAttributes executionAttributes)
+            throws IOException, InterruptedException {
+        try {
+            SdkStandardLogger.REQUEST_LOGGER.debug(() -> "Received successful response: " + httpResponse.statusCode());
+            return successResponseHandler.handle(httpResponse, executionAttributes);
+        } catch (IOException | InterruptedException | RetryableException e) {
+            throw e;
+        } catch (Exception e) {
+            if (e instanceof SdkException && ((SdkException) e).retryable()) {
+                throw (SdkException) e;
+            }
+
+            String errorMessage =
+                    "Unable to unmarshall response (" + e.getMessage() + "). Response Code: "
+                    + httpResponse.statusCode() + ", Response Text: " + httpResponse.statusText().orElse(null);
+            throw SdkClientException.builder().message(errorMessage).cause(e).build();
+        }
+    }
+
+    /**
+     * Responsible for handling an error response, including unmarshalling the error response
+     * into the most specific exception type possible, and throwing the exception.
+     *
+     * @throws IOException If any problems are encountering reading the error response.
+     */
+    private SdkException handleErrorResponse(SdkHttpFullResponse httpResponse,
+                                             ExecutionAttributes executionAttributes)
+            throws IOException, InterruptedException {
+        try {
+            SdkException exception = errorResponseHandler.handle(httpResponse, executionAttributes);
+            exception.fillInStackTrace();
+            SdkStandardLogger.REQUEST_LOGGER.debug(() -> "Received error response: " + exception);
+            return exception;
+        } catch (InterruptedException | IOException e) {
+            throw e;
+        } catch (Exception e) {
+            String errorMessage = String.format("Unable to unmarshall error response (%s). " +
+                                                "Response Code: %d, Response Text: %s", e.getMessage(),
+                                                httpResponse.statusCode(), httpResponse.statusText().orElse("null"));
+            throw SdkClientException.builder().message(errorMessage).cause(e).build();
+        }
+    }
+
+    /**
+     * Close the input stream if required.
+     */
+    private void closeInputStreamIfNeeded(SdkHttpFullResponse httpResponse,
+                                          boolean didRequestFail) {
+        // Always close on failed requests. Close on successful requests unless it needs connection left open
+        if (didRequestFail || !successResponseHandler.needsConnectionLeftOpen()) {
+            Optional.ofNullable(httpResponse)
+                    .flatMap(SdkHttpFullResponse::content) // If no content, no need to close
+                    .ifPresent(s -> IoUtils.closeQuietly(s, log));
+        }
+    }
+}
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/HttpClientDependencies.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/HttpClientDependencies.java
index 34ca90b194e1..b85218e9ce8e 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/HttpClientDependencies.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/HttpClientDependencies.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -17,13 +17,13 @@
 
 import static software.amazon.awssdk.utils.Validate.paramNotNull;
 
+import java.util.function.Consumer;
 import software.amazon.awssdk.annotations.SdkInternalApi;
 import software.amazon.awssdk.core.SdkGlobalTime;
 import software.amazon.awssdk.core.client.config.SdkClientConfiguration;
 import software.amazon.awssdk.core.internal.http.pipeline.RequestPipeline;
 import software.amazon.awssdk.core.internal.http.pipeline.RequestPipelineBuilder;
 import software.amazon.awssdk.core.internal.retry.ClockSkewAdjuster;
-import software.amazon.awssdk.core.internal.util.CapacityManager;
 import software.amazon.awssdk.utils.SdkAutoCloseable;
 
 /**
@@ -32,9 +32,8 @@
  */
 @SdkInternalApi
 public final class HttpClientDependencies implements SdkAutoCloseable {
-    private final ClockSkewAdjuster clockSkewAdjuster = new ClockSkewAdjuster();
+    private final ClockSkewAdjuster clockSkewAdjuster;
     private final SdkClientConfiguration clientConfiguration;
-    private final CapacityManager capacityManager;
 
     /**
      * Time offset may be mutated by {@link RequestPipeline} implementations if a clock skew is detected.
@@ -42,8 +41,8 @@ public final class HttpClientDependencies implements SdkAutoCloseable {
     private volatile int timeOffset = SdkGlobalTime.getGlobalTimeOffset();
 
     private HttpClientDependencies(Builder builder) {
+        this.clockSkewAdjuster = builder.clockSkewAdjuster != null ? builder.clockSkewAdjuster : new ClockSkewAdjuster();
         this.clientConfiguration = paramNotNull(builder.clientConfiguration, "ClientConfiguration");
-        this.capacityManager = paramNotNull(builder.capacityManager, "CapacityManager");
     }
 
     public static Builder builder() {
@@ -54,13 +53,6 @@ public SdkClientConfiguration clientConfiguration() {
         return clientConfiguration;
     }
 
-    /**
-     * @return CapacityManager object used for retry throttling.
-     */
-    public CapacityManager retryCapacity() {
-        return capacityManager;
-    }
-
     /**
      * @return The adjuster used for adjusting the {@link #timeOffset} for this client.
      */
@@ -92,18 +84,26 @@ public void close() {
      * Builder for {@link HttpClientDependencies}.
      */
     public static class Builder {
+        private ClockSkewAdjuster clockSkewAdjuster;
         private SdkClientConfiguration clientConfiguration;
-        private CapacityManager capacityManager;
 
-        private Builder() {}
+        private Builder() {
+        }
+
+        public Builder clockSkewAdjuster(ClockSkewAdjuster clockSkewAdjuster) {
+            this.clockSkewAdjuster = clockSkewAdjuster;
+            return this;
+        }
 
         public Builder clientConfiguration(SdkClientConfiguration clientConfiguration) {
             this.clientConfiguration = clientConfiguration;
             return this;
         }
 
-        public Builder capacityManager(CapacityManager capacityManager) {
-            this.capacityManager = capacityManager;
+        public Builder clientConfiguration(Consumer<SdkClientConfiguration.Builder> clientConfiguration) {
+            SdkClientConfiguration.Builder c = SdkClientConfiguration.builder();
+            clientConfiguration.accept(c);
+            clientConfiguration(c.build());
             return this;
         }
 
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/IdempotentAsyncResponseHandler.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/IdempotentAsyncResponseHandler.java
new file mode 100644
index 000000000000..2d1961cf2d54
--- /dev/null
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/IdempotentAsyncResponseHandler.java
@@ -0,0 +1,115 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.core.internal.http;
+
+import java.nio.ByteBuffer;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.BiPredicate;
+import java.util.function.Supplier;
+import org.reactivestreams.Publisher;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.http.SdkHttpResponse;
+
+/**
+ * Wrapper for a {@link TransformingAsyncResponseHandler} that allows attachment to an external scope and given a way
+ * of evaluating whether that scope has changed or not will only allow prepare() to be called on its delegate once
+ * per state change and will cache and reserve the future that is returned by the delegate the rest of the time.
+ * <p>
+ * One application of this wrapper is to ensure that prepare() is not called on the underlying response handler more
+ * than once per retry no matter where or how many times its invoked.
+ * <p>
+ * This class is asserted to be thread-safe and it should be fine to have multiple threads call prepare()
+ * simultaneously.
+ *
+ * @param <T> The type of the wrapped {@link TransformingAsyncResponseHandler}
+ * @param <R> The type of the object used to determine scope.
+ */
+@SdkInternalApi
+@ThreadSafe
+public class IdempotentAsyncResponseHandler<T, R> implements TransformingAsyncResponseHandler<T> {
+    private final Supplier<R> newScopeSupplier;
+    private final BiPredicate<R, R> newScopeInRangePredicate;
+    private final TransformingAsyncResponseHandler<T> wrappedHandler;
+
+    // Taking advantage of the volatile properties of AtomicReference
+    private final AtomicReference<R> cachedScope = new AtomicReference<>();
+    private final AtomicReference<CompletableFuture<T>> cachedPreparedFuture = new AtomicReference<>();
+
+    private IdempotentAsyncResponseHandler(TransformingAsyncResponseHandler<T> wrappedHandler,
+                                           Supplier<R> newScopeSupplier,
+                                           BiPredicate<R, R> newScopeInRangePredicate) {
+        this.newScopeSupplier = newScopeSupplier;
+        this.newScopeInRangePredicate = newScopeInRangePredicate;
+        this.wrappedHandler = wrappedHandler;
+    }
+
+    /**
+     * Creates a new wrapped {@link TransformingAsyncResponseHandler}
+     * @param wrappedHandler A different handler to wrap.
+     * @param preparedScopeSupplier A function that retrieves the current scope to determine if a new future can be
+     *                              prepared.
+     * @param scopeInRangePredicate A predicate that can be used to test the cached scope against the newly retrieved
+     *                             scope to determine if a new future can be prepared.
+     * @param <T> The type of the wrapped {@link TransformingAsyncResponseHandler}
+     * @param <R> The type of the object used to determine scope.
+     */
+    public static <T, R> IdempotentAsyncResponseHandler<T, R> create(
+            TransformingAsyncResponseHandler<T> wrappedHandler,
+            Supplier<R> preparedScopeSupplier,
+            BiPredicate<R, R> scopeInRangePredicate) {
+
+        return new IdempotentAsyncResponseHandler<>(wrappedHandler,
+                                                    preparedScopeSupplier,
+                                                    scopeInRangePredicate);
+    }
+
+    @Override
+    public CompletableFuture<T> prepare() {
+        // Test if the new scope is in range of the cached scope; if not delegate and cache result and new scope
+        if (cachedPreparedFuture.get() == null ||
+            !newScopeInRangePredicate.test(newScopeSupplier.get(), cachedScope.get())) {
+
+            synchronized (this) {
+                // The scope needs to be queried and tested again in case it was changed by another thread
+                R newScope = newScopeSupplier.get();
+
+                if (cachedPreparedFuture.get() == null || !newScopeInRangePredicate.test(newScope, cachedScope.get())) {
+                    cachedPreparedFuture.set(this.wrappedHandler.prepare());
+                    cachedScope.set(newScope);
+                }
+            }
+        }
+
+        return cachedPreparedFuture.get();
+    }
+
+    @Override
+    public void onHeaders(SdkHttpResponse headers) {
+        this.wrappedHandler.onHeaders(headers);
+    }
+
+    @Override
+    public void onStream(Publisher<ByteBuffer> stream) {
+        this.wrappedHandler.onStream(stream);
+    }
+
+    @Override
+    public void onError(Throwable error) {
+        this.wrappedHandler.onError(error);
+    }
+}
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/InterruptMonitor.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/InterruptMonitor.java
index 28d3da5befa3..495991d1d320 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/InterruptMonitor.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/InterruptMonitor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -25,7 +25,8 @@
  */
 @SdkInternalApi
 public final class InterruptMonitor {
-    private InterruptMonitor() {}
+    private InterruptMonitor() {
+    }
 
     /**
      * Check if the thread has been interrupted. If so throw an {@link InterruptedException}.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/RequestExecutionContext.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/RequestExecutionContext.java
index 9fa18cf7e792..b84afb9512dc 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/RequestExecutionContext.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/RequestExecutionContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -15,9 +15,6 @@
 
 package software.amazon.awssdk.core.internal.http;
 
-import static software.amazon.awssdk.core.interceptor.SdkInternalExecutionAttribute.ASYNC_RESPONSE_TRANSFORMER_FUTURE;
-
-import java.util.concurrent.CompletableFuture;
 import software.amazon.awssdk.annotations.SdkInternalApi;
 import software.amazon.awssdk.core.RequestOverrideConfiguration;
 import software.amazon.awssdk.core.SdkRequest;
@@ -127,10 +124,6 @@ public void requestProvider(AsyncRequestBody publisher) {
         requestProvider = publisher;
     }
 
-    public CompletableFuture asyncResponseTransformerFuture() {
-        return executionAttributes().getAttribute(ASYNC_RESPONSE_TRANSFORMER_FUTURE);
-    }
-
     /**
      * An SDK-internal implementation of {@link Builder}.
      */
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/StreamManagingStage.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/StreamManagingStage.java
index ef0a27d4fedd..3db493013a0b 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/StreamManagingStage.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/StreamManagingStage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -18,9 +18,8 @@
 import static software.amazon.awssdk.utils.FunctionalUtils.invokeSafely;
 
 import java.io.InputStream;
-
 import software.amazon.awssdk.annotations.SdkInternalApi;
-import software.amazon.awssdk.core.internal.Response;
+import software.amazon.awssdk.core.Response;
 import software.amazon.awssdk.core.internal.http.pipeline.RequestPipeline;
 import software.amazon.awssdk.core.io.ReleasableInputStream;
 import software.amazon.awssdk.http.ContentStreamProvider;
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/TransformingAsyncResponseHandler.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/TransformingAsyncResponseHandler.java
index 87464a504960..03b8ea681fe7 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/TransformingAsyncResponseHandler.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/TransformingAsyncResponseHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/async/AsyncAfterTransmissionInterceptorCallingResponseHandler.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/async/AsyncAfterTransmissionInterceptorCallingResponseHandler.java
index 27aeb21ab2ff..37f78e860479 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/async/AsyncAfterTransmissionInterceptorCallingResponseHandler.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/async/AsyncAfterTransmissionInterceptorCallingResponseHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/async/AsyncResponseHandler.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/async/AsyncResponseHandler.java
index 55e376176227..81400eaefc6d 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/async/AsyncResponseHandler.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/async/AsyncResponseHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -112,7 +112,7 @@ public void onSubscribe(Subscription subscription) {
         public void onNext(ByteBuffer byteBuffer) {
             try {
                 baos.write(BinaryUtils.copyBytesFrom(byteBuffer));
-                this.subscription.request(Long.MAX_VALUE);
+                this.subscription.request(1);
             } catch (IOException e) {
                 // Should never happen
                 streamFuture.completeExceptionally(e);
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/async/AsyncStreamingResponseHandler.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/async/AsyncStreamingResponseHandler.java
index a4c7a8303eaf..c33c48016b56 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/async/AsyncStreamingResponseHandler.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/async/AsyncStreamingResponseHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/async/CombinedResponseAsyncHttpResponseHandler.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/async/CombinedResponseAsyncHttpResponseHandler.java
new file mode 100644
index 000000000000..64d4c8502b72
--- /dev/null
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/async/CombinedResponseAsyncHttpResponseHandler.java
@@ -0,0 +1,122 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.core.internal.http.async;
+
+import java.nio.ByteBuffer;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.atomic.AtomicReference;
+import org.reactivestreams.Publisher;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.core.Response;
+import software.amazon.awssdk.core.SdkStandardLogger;
+import software.amazon.awssdk.core.exception.SdkException;
+import software.amazon.awssdk.core.internal.http.TransformingAsyncResponseHandler;
+import software.amazon.awssdk.http.SdkHttpFullResponse;
+import software.amazon.awssdk.http.SdkHttpResponse;
+
+/**
+ * Detects whether the response succeeded or failed by just checking the HTTP status and delegates to appropriate
+ * async response handler. Can be used with streaming or non-streaming requests.
+ */
+@SdkInternalApi
+public final class CombinedResponseAsyncHttpResponseHandler<OutputT>
+    implements TransformingAsyncResponseHandler<Response<OutputT>> {
+
+    private final TransformingAsyncResponseHandler<OutputT> successResponseHandler;
+    private final TransformingAsyncResponseHandler<? extends SdkException> errorResponseHandler;
+    private CompletableFuture<SdkHttpResponse> headersFuture;
+    private final AtomicReference<SdkHttpFullResponse> response = new AtomicReference<>();
+
+    public CombinedResponseAsyncHttpResponseHandler(
+        TransformingAsyncResponseHandler<OutputT> successResponseHandler,
+        TransformingAsyncResponseHandler<? extends SdkException> errorResponseHandler) {
+
+        this.successResponseHandler = successResponseHandler;
+        this.errorResponseHandler = errorResponseHandler;
+    }
+
+    @Override
+    public void onHeaders(SdkHttpResponse response) {
+        headersFuture.complete(response);
+        if (response.isSuccessful()) {
+            SdkStandardLogger.REQUEST_LOGGER.debug(() -> "Received successful response: " + response.statusCode());
+            successResponseHandler.onHeaders(response);
+        } else {
+            SdkStandardLogger.REQUEST_LOGGER.debug(() -> "Received error response: " + response.statusCode());
+            errorResponseHandler.onHeaders(response);
+        }
+        this.response.set(toFullResponse(response));
+    }
+
+    @Override
+    public void onError(Throwable error) {
+        if (headersFuture != null) {        // Failure in marshalling calls this before prepare() so value is null
+            headersFuture.completeExceptionally(error);
+        }
+
+        successResponseHandler.onError(error);
+    }
+
+    @Override
+    public void onStream(Publisher<ByteBuffer> publisher) {
+        if (this.response.get().isSuccessful()) {
+            successResponseHandler.onStream(publisher);
+        } else {
+            errorResponseHandler.onStream(publisher);
+        }
+    }
+
+    @Override
+    public CompletableFuture<Response<OutputT>> prepare() {
+        this.response.set(null);
+        CompletableFuture<OutputT> preparedTransformFuture = successResponseHandler.prepare();
+
+        CompletableFuture<? extends SdkException> preparedErrorTransformFuture = errorResponseHandler == null ? null :
+            errorResponseHandler.prepare();
+
+        headersFuture = new CompletableFuture<>();
+
+        return headersFuture.thenCompose(headers -> {
+            if (headers.isSuccessful()) {
+                return preparedTransformFuture.thenApply(
+                    r -> Response.<OutputT>builder().response(r)
+                                                    .httpResponse(response.get())
+                                                    .isSuccess(true)
+                                                    .build());
+            }
+
+            if (preparedErrorTransformFuture != null) {
+                return preparedErrorTransformFuture.thenApply(
+                    e -> Response.<OutputT>builder().exception(e)
+                                                    .httpResponse(response.get())
+                                                    .isSuccess(false)
+                                                    .build());
+            }
+            return CompletableFuture.completedFuture(
+                Response.<OutputT>builder().httpResponse(response.get())
+                                           .isSuccess(false)
+                                           .build());
+        });
+    }
+
+    private static SdkHttpFullResponse toFullResponse(SdkHttpResponse response) {
+        SdkHttpFullResponse.Builder builder = SdkHttpFullResponse.builder()
+                                                                 .statusCode(response.statusCode())
+                                                                 .headers(response.headers());
+        response.statusText().ifPresent(builder::statusText);
+        return builder.build();
+    }
+}
\ No newline at end of file
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/async/SimpleHttpContentPublisher.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/async/SimpleHttpContentPublisher.java
index 5069420495df..0471c6199dc1 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/async/SimpleHttpContentPublisher.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/async/SimpleHttpContentPublisher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -44,7 +44,7 @@ public SimpleHttpContentPublisher(SdkHttpFullRequest request) {
 
     @Override
     public Optional<Long> contentLength() {
-        return Optional.of(Long.valueOf(length));
+        return Optional.of((long) length);
     }
 
     @Override
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/loader/CachingSdkHttpServiceProvider.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/loader/CachingSdkHttpServiceProvider.java
index 5bcb719a15ed..c1d8669d1e8a 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/loader/CachingSdkHttpServiceProvider.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/loader/CachingSdkHttpServiceProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/loader/ClasspathSdkHttpServiceProvider.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/loader/ClasspathSdkHttpServiceProvider.java
index 7e25e92a8f8c..320416cd362f 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/loader/ClasspathSdkHttpServiceProvider.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/loader/ClasspathSdkHttpServiceProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/loader/DefaultSdkAsyncHttpClientBuilder.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/loader/DefaultSdkAsyncHttpClientBuilder.java
index 01b9df87a133..f96796277658 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/loader/DefaultSdkAsyncHttpClientBuilder.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/loader/DefaultSdkAsyncHttpClientBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/loader/DefaultSdkHttpClientBuilder.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/loader/DefaultSdkHttpClientBuilder.java
index f4258408b1fb..5fc4b4b45ec7 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/loader/DefaultSdkHttpClientBuilder.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/loader/DefaultSdkHttpClientBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/loader/SdkHttpServiceProvider.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/loader/SdkHttpServiceProvider.java
index 38f512680017..1e1863c5aadc 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/loader/SdkHttpServiceProvider.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/loader/SdkHttpServiceProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/loader/SdkHttpServiceProviderChain.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/loader/SdkHttpServiceProviderChain.java
index a1d363a38ca4..cfc0a689a22d 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/loader/SdkHttpServiceProviderChain.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/loader/SdkHttpServiceProviderChain.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/loader/SdkServiceLoader.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/loader/SdkServiceLoader.java
index 03b9ad532630..0e111d726930 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/loader/SdkServiceLoader.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/loader/SdkServiceLoader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/loader/SystemPropertyHttpServiceProvider.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/loader/SystemPropertyHttpServiceProvider.java
index 0b15daa68785..1f8a7e5aef6e 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/loader/SystemPropertyHttpServiceProvider.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/loader/SystemPropertyHttpServiceProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/MutableRequestToRequestPipeline.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/MutableRequestToRequestPipeline.java
index 58ffc7e19d27..97153190995b 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/MutableRequestToRequestPipeline.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/MutableRequestToRequestPipeline.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/RequestPipeline.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/RequestPipeline.java
index 789f85c6592c..29fcefa5de0a 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/RequestPipeline.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/RequestPipeline.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/RequestPipelineBuilder.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/RequestPipelineBuilder.java
index a0e8b3d7c941..92f761550af9 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/RequestPipelineBuilder.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/RequestPipelineBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/RequestToRequestPipeline.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/RequestToRequestPipeline.java
index 21f449b40603..d8d107e966f6 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/RequestToRequestPipeline.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/RequestToRequestPipeline.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/RequestToResponsePipeline.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/RequestToResponsePipeline.java
index 11f4600036b5..e5bb5c16c4db 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/RequestToResponsePipeline.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/RequestToResponsePipeline.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -16,7 +16,7 @@
 package software.amazon.awssdk.core.internal.http.pipeline;
 
 import software.amazon.awssdk.annotations.SdkInternalApi;
-import software.amazon.awssdk.core.internal.Response;
+import software.amazon.awssdk.core.Response;
 import software.amazon.awssdk.http.SdkHttpFullRequest;
 
 @SdkInternalApi
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/AfterExecutionInterceptorsStage.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/AfterExecutionInterceptorsStage.java
index fe2c14aba44a..cfe90f19b245 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/AfterExecutionInterceptorsStage.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/AfterExecutionInterceptorsStage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/AfterTransmissionExecutionInterceptorsStage.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/AfterTransmissionExecutionInterceptorsStage.java
index ad2d61025f35..7521219a5030 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/AfterTransmissionExecutionInterceptorsStage.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/AfterTransmissionExecutionInterceptorsStage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/ApiCallAttemptTimeoutTrackingStage.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/ApiCallAttemptTimeoutTrackingStage.java
index de05953f2cf3..60264fc85da2 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/ApiCallAttemptTimeoutTrackingStage.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/ApiCallAttemptTimeoutTrackingStage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -22,12 +22,12 @@
 import java.time.Duration;
 import java.util.concurrent.ScheduledExecutorService;
 import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.core.Response;
 import software.amazon.awssdk.core.client.config.SdkClientOption;
 import software.amazon.awssdk.core.exception.AbortedException;
 import software.amazon.awssdk.core.exception.ApiCallAttemptTimeoutException;
 import software.amazon.awssdk.core.exception.ApiCallTimeoutException;
 import software.amazon.awssdk.core.exception.SdkInterruptedException;
-import software.amazon.awssdk.core.internal.Response;
 import software.amazon.awssdk.core.internal.http.HttpClientDependencies;
 import software.amazon.awssdk.core.internal.http.RequestExecutionContext;
 import software.amazon.awssdk.core.internal.http.pipeline.RequestPipeline;
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/ApiCallTimeoutTrackingStage.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/ApiCallTimeoutTrackingStage.java
index 11d1290985f7..35694753eb15 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/ApiCallTimeoutTrackingStage.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/ApiCallTimeoutTrackingStage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -22,12 +22,12 @@
 import java.time.Duration;
 import java.util.concurrent.ScheduledExecutorService;
 import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.core.Response;
 import software.amazon.awssdk.core.client.config.SdkClientConfiguration;
 import software.amazon.awssdk.core.client.config.SdkClientOption;
 import software.amazon.awssdk.core.exception.AbortedException;
 import software.amazon.awssdk.core.exception.ApiCallTimeoutException;
 import software.amazon.awssdk.core.exception.SdkInterruptedException;
-import software.amazon.awssdk.core.internal.Response;
 import software.amazon.awssdk.core.internal.http.HttpClientDependencies;
 import software.amazon.awssdk.core.internal.http.RequestExecutionContext;
 import software.amazon.awssdk.core.internal.http.pipeline.RequestPipeline;
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/ApplyTransactionIdStage.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/ApplyTransactionIdStage.java
index 692e4b3accfa..4c34d543a25c 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/ApplyTransactionIdStage.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/ApplyTransactionIdStage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/ApplyUserAgentStage.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/ApplyUserAgentStage.java
index 5366be07de9b..91e034931ee6 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/ApplyUserAgentStage.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/ApplyUserAgentStage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/AsyncApiCallTimeoutTrackingStage.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/AsyncApiCallTimeoutTrackingStage.java
index d27592e82f34..336b23a0ccfa 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/AsyncApiCallTimeoutTrackingStage.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/AsyncApiCallTimeoutTrackingStage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/AsyncExecutionFailureExceptionReportingStage.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/AsyncExecutionFailureExceptionReportingStage.java
index 5b386095ad6a..4a0cbf3b6dba 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/AsyncExecutionFailureExceptionReportingStage.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/AsyncExecutionFailureExceptionReportingStage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/AsyncRetryableStage.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/AsyncRetryableStage.java
index 5ef7fa821dd7..814bb85917a0 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/AsyncRetryableStage.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/AsyncRetryableStage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -15,202 +15,133 @@
 
 package software.amazon.awssdk.core.internal.http.pipeline.stages;
 
-import static software.amazon.awssdk.core.interceptor.SdkInternalExecutionAttribute.ASYNC_RESPONSE_TRANSFORMER_FUTURE;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
 
+import java.io.IOException;
 import java.time.Duration;
 import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.CompletionException;
 import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import software.amazon.awssdk.annotations.SdkInternalApi;
-import software.amazon.awssdk.core.SdkStandardLogger;
+import software.amazon.awssdk.core.Response;
 import software.amazon.awssdk.core.async.AsyncRequestBody;
 import software.amazon.awssdk.core.client.config.SdkClientOption;
-import software.amazon.awssdk.core.exception.NonRetryableException;
 import software.amazon.awssdk.core.exception.SdkException;
-import software.amazon.awssdk.core.internal.Response;
 import software.amazon.awssdk.core.internal.http.HttpClientDependencies;
 import software.amazon.awssdk.core.internal.http.RequestExecutionContext;
 import software.amazon.awssdk.core.internal.http.TransformingAsyncResponseHandler;
 import software.amazon.awssdk.core.internal.http.pipeline.RequestPipeline;
-import software.amazon.awssdk.core.internal.retry.ClockSkewAdjuster;
-import software.amazon.awssdk.core.internal.retry.RetryHandler;
-import software.amazon.awssdk.core.internal.util.CapacityManager;
-import software.amazon.awssdk.core.internal.util.ThrowableUtils;
-import software.amazon.awssdk.core.retry.RetryPolicy;
+import software.amazon.awssdk.core.internal.http.pipeline.stages.utils.RetryableStageHelper;
 import software.amazon.awssdk.http.SdkHttpFullRequest;
-import software.amazon.awssdk.http.SdkHttpFullResponse;
 import software.amazon.awssdk.utils.CompletableFutureUtils;
 
 /**
- * Wrapper around the pipeline for a single request to provide retry functionality.
+ * Wrapper around the pipeline for a single request to provide retry, clockskew and request throttling functionality.
  */
 @SdkInternalApi
 public final class AsyncRetryableStage<OutputT> implements RequestPipeline<SdkHttpFullRequest,
     CompletableFuture<Response<OutputT>>> {
 
-    private static final Logger log = LoggerFactory.getLogger(AsyncRetryableStage.class);
-
-    private final TransformingAsyncResponseHandler<OutputT> responseHandler;
+    private final TransformingAsyncResponseHandler<Response<OutputT>> responseHandler;
     private final RequestPipeline<SdkHttpFullRequest, CompletableFuture<Response<OutputT>>> requestPipeline;
     private final ScheduledExecutorService scheduledExecutor;
     private final HttpClientDependencies dependencies;
-    private final CapacityManager retryCapacity;
-    private final RetryPolicy retryPolicy;
 
-    public AsyncRetryableStage(TransformingAsyncResponseHandler<OutputT> responseHandler,
+    public AsyncRetryableStage(TransformingAsyncResponseHandler<Response<OutputT>> responseHandler,
                                HttpClientDependencies dependencies,
                                RequestPipeline<SdkHttpFullRequest, CompletableFuture<Response<OutputT>>> requestPipeline) {
         this.responseHandler = responseHandler;
         this.dependencies = dependencies;
         this.scheduledExecutor = dependencies.clientConfiguration().option(SdkClientOption.SCHEDULED_EXECUTOR_SERVICE);
-        this.retryPolicy = dependencies.clientConfiguration().option(SdkClientOption.RETRY_POLICY);
-        this.retryCapacity = dependencies.retryCapacity();
         this.requestPipeline = requestPipeline;
     }
 
     @Override
-    public CompletableFuture<Response<OutputT>> execute(SdkHttpFullRequest request, RequestExecutionContext context) throws
-                                                                                                                     Exception {
-        return new RetryExecutor(request, context).execute();
+    public CompletableFuture<Response<OutputT>> execute(SdkHttpFullRequest request,
+                                                        RequestExecutionContext context) throws Exception {
+        return new RetryingExecutor(request, context).execute();
     }
 
-    /**
-     * Created for every request to encapsulate mutable state between retries.
-     */
-    private class RetryExecutor {
-
-        private final SdkHttpFullRequest request;
-        private final RequestExecutionContext context;
-        private final RetryHandler retryHandler;
+    private class RetryingExecutor {
         private final AsyncRequestBody originalRequestBody;
+        private final RequestExecutionContext context;
+        private final RetryableStageHelper retryableStageHelper;
 
-        private int requestCount = 0;
-
-        private RetryExecutor(SdkHttpFullRequest request, RequestExecutionContext context) {
-            this.request = request;
-            this.context = context;
+        private RetryingExecutor(SdkHttpFullRequest request, RequestExecutionContext context) {
             this.originalRequestBody = context.requestProvider();
-            this.retryHandler = new RetryHandler(retryPolicy, retryCapacity);
+            this.context = context;
+            this.retryableStageHelper = new RetryableStageHelper(request, context, dependencies);
         }
 
         public CompletableFuture<Response<OutputT>> execute() throws Exception {
             CompletableFuture<Response<OutputT>> future = new CompletableFuture<>();
-            return execute(future);
+            maybeAttemptExecute(future);
+            return future;
         }
 
-        public CompletableFuture<Response<OutputT>> execute(CompletableFuture<Response<OutputT>> future) throws Exception {
-            beforeExecute();
-            CompletableFuture<Response<OutputT>> executeFuture = doExecute();
-            executeFuture.whenComplete((resp, err) -> retryIfNeeded(future, resp, err));
-            return CompletableFutureUtils.forwardExceptionTo(future, executeFuture);
-        }
-
-        private void retryIfNeeded(CompletableFuture<Response<OutputT>> future,
-                                   Response<OutputT> resp,
-                                   Throwable err) {
-            if (future.isDone()) {
-                return;
-            }
-
-            try {
-                if (resp != null) {
-                    retryResponseIfNeeded(resp, future);
-                } else {
-                    if (err instanceof CompletionException) {
-                        err = err.getCause();
-                    }
-                    SdkException sdkException = ThrowableUtils.asSdkException(err);
-                    retryErrorIfNeeded(sdkException, future);
-                }
-            } catch (Throwable t) {
-                future.completeExceptionally(t);
-            }
-        }
+        public void maybeAttemptExecute(CompletableFuture<Response<OutputT>> future) {
+            retryableStageHelper.startingAttempt();
 
-        private void retryResponseIfNeeded(Response<OutputT> resp, CompletableFuture<Response<OutputT>> future) {
-            if (resp.isSuccess()) {
-                retryHandler.releaseRetryCapacity();
-                future.complete(resp);
+            if (!retryableStageHelper.retryPolicyAllowsRetry()) {
+                future.completeExceptionally(retryableStageHelper.retryPolicyDisallowedRetryException());
                 return;
             }
 
-            SdkException err = resp.exception();
+            if (retryableStageHelper.getAttemptNumber() > 1) {
+                // We failed the last attempt, but will retry. The response handler wants to know when that happens.
+                responseHandler.onError(retryableStageHelper.getLastException());
 
-            ClockSkewAdjuster clockSkewAdjuster = dependencies.clockSkewAdjuster();
-            if (clockSkewAdjuster.shouldAdjust(err)) {
-                dependencies.updateTimeOffset(clockSkewAdjuster.getAdjustmentInSeconds(resp.httpResponse()));
+                // Reset the request provider to the original one before retries, in case it was modified downstream.
+                context.requestProvider(originalRequestBody);
             }
 
-            if (shouldRetry(resp.httpResponse(), resp.exception())) {
-                // We only notify onError if we are retrying the request.
-                // Otherwise we rely on the generated code in the in the
-                // client class to forward exception to the handler's
-                // exceptionOcurred method.
-                responseHandler.onError(err);
-                retryHandler.setLastRetriedException(err);
-                executeRetry(future);
+            Duration backoffDelay = retryableStageHelper.getBackoffDelay();
+            if (!backoffDelay.isZero()) {
+                retryableStageHelper.logBackingOff(backoffDelay);
+                scheduledExecutor.schedule(() -> attemptExecute(future), backoffDelay.toMillis(), MILLISECONDS);
             } else {
-                future.completeExceptionally(err);
+                attemptExecute(future);
             }
         }
 
-        private void retryErrorIfNeeded(SdkException err, CompletableFuture<Response<OutputT>> future) {
-            if (err instanceof NonRetryableException) {
-                future.completeExceptionally(err);
+        private void attemptExecute(CompletableFuture<Response<OutputT>> future) {
+            CompletableFuture<Response<OutputT>> responseFuture;
+            try {
+                retryableStageHelper.logSendingRequest();
+                responseFuture = requestPipeline.execute(retryableStageHelper.requestToSend(), context);
+
+                // If the result future fails, go ahead and fail the response future.
+                CompletableFutureUtils.forwardExceptionTo(future, responseFuture);
+            } catch (SdkException | IOException e) {
+                maybeRetryExecute(future, e);
+                return;
+            } catch (Throwable e) {
+                future.completeExceptionally(e);
                 return;
             }
 
-            if (shouldRetry(null, err)) {
-                // We only notify onError if we are retrying the request.
-                // Otherwise we rely on the generated code in the in the client
-                // class to forward exception to the handler's exceptionOcurred
-                // method.
-                responseHandler.onError(err);
-                retryHandler.setLastRetriedException(err);
-                executeRetry(future);
-            } else {
-                future.completeExceptionally(err);
-            }
-        }
+            responseFuture.whenComplete((response, exception) -> {
 
-        private boolean shouldRetry(SdkHttpFullResponse httpResponse, SdkException exception) {
-            return retryHandler.shouldRetry(httpResponse, request, context, exception, requestCount);
-        }
+                if (exception != null) {
+                    maybeRetryExecute(future, exception);
+                    return;
+                }
 
-        private void executeRetry(CompletableFuture<Response<OutputT>> future) {
-            Duration delay = retryHandler.computeDelayBeforeNextRetry();
+                retryableStageHelper.setLastResponse(response.httpResponse());
 
-            SdkStandardLogger.REQUEST_LOGGER.debug(() -> "Retryable error detected, will retry in " + delay.toMillis() + "ms,"
-                                                         + " attempt number " + requestCount);
-            scheduledExecutor.schedule(() -> {
-                execute(future);
-                return null;
-            }, delay.toMillis(), TimeUnit.MILLISECONDS);
-        }
+                if (!response.isSuccess()) {
+                    retryableStageHelper.adjustClockIfClockSkew(response);
+                    maybeRetryExecute(future, response.exception());
+                    return;
+                }
 
-        private void beforeExecute() {
-            retryHandler.retryCapacityConsumed(false);
-            ++requestCount;
+                retryableStageHelper.attemptSucceeded();
+                future.complete(response);
+            });
         }
 
-        private CompletableFuture<Response<OutputT>> doExecute() throws Exception {
-            SdkStandardLogger.REQUEST_LOGGER.debug(() -> (retryHandler.isRetry() ? "Retrying " : "Sending ") +
-                                                         "Request: " + request);
-
-            // Before each attempt, Modify the context to use original request body provider
-            context.requestProvider(originalRequestBody);
-
-            // For streaming requests, future from the execution attributes (set in BaseAsyncClientHandler#execute method)
-            // should be used on first attempt. For all retry attempts, clear the value so that prepare() method is
-            // called (in MakeAsyncHttpRequestStage) to get a new future
-            if (requestCount > 1 && context.asyncResponseTransformerFuture() != null) {
-                context.executionAttributes().putAttribute(ASYNC_RESPONSE_TRANSFORMER_FUTURE, null);
-            }
-
-            return requestPipeline.execute(retryHandler.addRetryInfoHeader(request, requestCount), context);
+        private void maybeRetryExecute(CompletableFuture<Response<OutputT>> future, Throwable exception) {
+            retryableStageHelper.setLastException(exception);
+            maybeAttemptExecute(future);
         }
     }
 }
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/BeforeTransmissionExecutionInterceptorsStage.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/BeforeTransmissionExecutionInterceptorsStage.java
index bbd7c6bc7b26..6284c8805b50 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/BeforeTransmissionExecutionInterceptorsStage.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/BeforeTransmissionExecutionInterceptorsStage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/BeforeUnmarshallingExecutionInterceptorsStage.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/BeforeUnmarshallingExecutionInterceptorsStage.java
index 9e1be5db3548..2e6c89a347d9 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/BeforeUnmarshallingExecutionInterceptorsStage.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/BeforeUnmarshallingExecutionInterceptorsStage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/ExecutionFailureExceptionReportingStage.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/ExecutionFailureExceptionReportingStage.java
index bdfa77d06188..322796d331ae 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/ExecutionFailureExceptionReportingStage.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/ExecutionFailureExceptionReportingStage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/HandleResponseStage.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/HandleResponseStage.java
index f5b1a29ddb25..02654ab2dd37 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/HandleResponseStage.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/HandleResponseStage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -15,126 +15,28 @@
 
 package software.amazon.awssdk.core.internal.http.pipeline.stages;
 
-import java.io.IOException;
-import java.util.Optional;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import software.amazon.awssdk.annotations.SdkInternalApi;
-import software.amazon.awssdk.core.SdkStandardLogger;
-import software.amazon.awssdk.core.exception.RetryableException;
-import software.amazon.awssdk.core.exception.SdkClientException;
-import software.amazon.awssdk.core.exception.SdkException;
+import software.amazon.awssdk.core.Response;
 import software.amazon.awssdk.core.http.HttpResponseHandler;
-import software.amazon.awssdk.core.internal.Response;
 import software.amazon.awssdk.core.internal.http.RequestExecutionContext;
 import software.amazon.awssdk.core.internal.http.pipeline.RequestPipeline;
 import software.amazon.awssdk.http.SdkHttpFullResponse;
-import software.amazon.awssdk.utils.IoUtils;
 
 /**
- * Unmarshalls an HTTP response into either a successful response POJO, or into a (possibly modeled) exception. Returns a wrapper
- * {@link Response} object which may contain either the unmarshalled success POJO, or the unmarshalled exception.
- *
- * @param <OutputT> Type of successful unmarshalled POJO.
+ * Pipeline stage that executes an {@link HttpResponseHandler} to transform the response into a {@link Response}
+ * object that contains a flag indicating success of failure and an unmarshalled response object or exception as
+ * appropriate.
  */
-// TODO: Should this be broken up? It's doing quite a lot...
 @SdkInternalApi
 public class HandleResponseStage<OutputT> implements RequestPipeline<SdkHttpFullResponse, Response<OutputT>> {
-    private static final Logger log = LoggerFactory.getLogger(HandleResponseStage.class);
-
-    private final HttpResponseHandler<OutputT> successResponseHandler;
-    private final HttpResponseHandler<? extends SdkException> errorResponseHandler;
+    private final HttpResponseHandler<Response<OutputT>> responseHandler;
 
-    public HandleResponseStage(HttpResponseHandler<OutputT> successResponseHandler,
-                               HttpResponseHandler<? extends SdkException> errorResponseHandler) {
-        this.successResponseHandler = successResponseHandler;
-        this.errorResponseHandler = errorResponseHandler;
+    public HandleResponseStage(HttpResponseHandler<Response<OutputT>> responseHandler) {
+        this.responseHandler = responseHandler;
     }
 
     @Override
     public Response<OutputT> execute(SdkHttpFullResponse httpResponse, RequestExecutionContext context) throws Exception {
-        boolean didRequestFail = true;
-        try {
-            Response<OutputT> response = handleResponse(httpResponse, context);
-            didRequestFail = response.isFailure();
-            return response;
-        } finally {
-            closeInputStreamIfNeeded(httpResponse, didRequestFail);
-        }
-    }
-
-    private Response<OutputT> handleResponse(SdkHttpFullResponse httpResponse,
-                                             RequestExecutionContext context)
-            throws IOException, InterruptedException {
-        if (httpResponse.isSuccessful()) {
-            OutputT response = handleSuccessResponse(httpResponse, context);
-            return Response.fromSuccess(response, httpResponse);
-        } else {
-            return Response.fromFailure(handleErrorResponse(httpResponse, context), httpResponse);
-        }
-    }
-
-    /**
-     * Handles a successful response from a service call by unmarshalling the results using the
-     * specified response handler.
-     *
-     * @return The contents of the response, unmarshalled using the specified response handler.
-     * @throws IOException If any problems were encountered reading the response contents from
-     *                     the HTTP method object.
-     */
-    private OutputT handleSuccessResponse(SdkHttpFullResponse httpResponse, RequestExecutionContext context)
-            throws IOException, InterruptedException {
-        try {
-            SdkStandardLogger.REQUEST_LOGGER.debug(() -> "Received successful response: " + httpResponse.statusCode());
-            return successResponseHandler.handle(httpResponse, context.executionAttributes());
-        } catch (IOException | InterruptedException | RetryableException e) {
-            throw e;
-        } catch (Exception e) {
-            if (e instanceof SdkException && ((SdkException) e).retryable()) {
-                throw (SdkException) e;
-            }
-
-            String errorMessage =
-                    "Unable to unmarshall response (" + e.getMessage() + "). Response Code: "
-                    + httpResponse.statusCode() + ", Response Text: " + httpResponse.statusText().orElse(null);
-            throw SdkClientException.builder().message(errorMessage).cause(e).build();
-        }
-    }
-
-    /**
-     * Responsible for handling an error response, including unmarshalling the error response
-     * into the most specific exception type possible, and throwing the exception.
-     *
-     * @throws IOException If any problems are encountering reading the error response.
-     */
-    private SdkException handleErrorResponse(SdkHttpFullResponse httpResponse,
-                                             RequestExecutionContext context)
-            throws IOException, InterruptedException {
-        try {
-            SdkException exception = errorResponseHandler.handle(httpResponse, context.executionAttributes());
-            exception.fillInStackTrace();
-            SdkStandardLogger.REQUEST_LOGGER.debug(() -> "Received error response: " + exception);
-            return exception;
-        } catch (InterruptedException | IOException e) {
-            throw e;
-        } catch (Exception e) {
-            String errorMessage = String.format("Unable to unmarshall error response (%s). " +
-                                                "Response Code: %d, Response Text: %s", e.getMessage(),
-                                                httpResponse.statusCode(), httpResponse.statusText().orElse("null"));
-            throw SdkClientException.builder().message(errorMessage).cause(e).build();
-        }
-    }
-
-    /**
-     * Close the input stream if required.
-     */
-    private void closeInputStreamIfNeeded(SdkHttpFullResponse httpResponse,
-                                          boolean didRequestFail) {
-        // Always close on failed requests. Close on successful requests unless it needs connection left open
-        if (didRequestFail || !successResponseHandler.needsConnectionLeftOpen()) {
-            Optional.ofNullable(httpResponse)
-                    .flatMap(SdkHttpFullResponse::content) // If no content, no need to close
-                    .ifPresent(s -> IoUtils.closeQuietly(s, log));
-        }
+        return responseHandler.handle(httpResponse, context.executionAttributes());
     }
 }
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/MakeAsyncHttpRequestStage.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/MakeAsyncHttpRequestStage.java
index 09e9ef47d6b2..de964572c3ea 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/MakeAsyncHttpRequestStage.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/MakeAsyncHttpRequestStage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -28,16 +28,14 @@
 import org.reactivestreams.Publisher;
 import org.reactivestreams.Subscriber;
 import software.amazon.awssdk.annotations.SdkInternalApi;
-import software.amazon.awssdk.core.SdkStandardLogger;
+import software.amazon.awssdk.core.Response;
 import software.amazon.awssdk.core.async.AsyncRequestBody;
 import software.amazon.awssdk.core.client.config.SdkAdvancedAsyncClientOption;
 import software.amazon.awssdk.core.client.config.SdkClientOption;
 import software.amazon.awssdk.core.exception.ApiCallAttemptTimeoutException;
 import software.amazon.awssdk.core.exception.SdkClientException;
-import software.amazon.awssdk.core.exception.SdkException;
 import software.amazon.awssdk.core.interceptor.ExecutionAttributes;
 import software.amazon.awssdk.core.interceptor.SdkInternalExecutionAttribute;
-import software.amazon.awssdk.core.internal.Response;
 import software.amazon.awssdk.core.internal.http.HttpClientDependencies;
 import software.amazon.awssdk.core.internal.http.RequestExecutionContext;
 import software.amazon.awssdk.core.internal.http.TransformingAsyncResponseHandler;
@@ -46,7 +44,6 @@
 import software.amazon.awssdk.core.internal.http.timers.TimeoutTracker;
 import software.amazon.awssdk.core.internal.http.timers.TimerUtils;
 import software.amazon.awssdk.http.SdkHttpFullRequest;
-import software.amazon.awssdk.http.SdkHttpFullResponse;
 import software.amazon.awssdk.http.SdkHttpMethod;
 import software.amazon.awssdk.http.SdkHttpResponse;
 import software.amazon.awssdk.http.async.AsyncExecuteRequest;
@@ -64,17 +61,14 @@ public final class MakeAsyncHttpRequestStage<OutputT>
     private static final Logger log = Logger.loggerFor(MakeAsyncHttpRequestStage.class);
 
     private final SdkAsyncHttpClient sdkAsyncHttpClient;
-    private final TransformingAsyncResponseHandler<OutputT> responseHandler;
-    private final TransformingAsyncResponseHandler<? extends SdkException> errorResponseHandler;
+    private final TransformingAsyncResponseHandler<Response<OutputT>> responseHandler;
     private final Executor futureCompletionExecutor;
     private final ScheduledExecutorService timeoutExecutor;
     private final Duration apiCallAttemptTimeout;
 
-    public MakeAsyncHttpRequestStage(TransformingAsyncResponseHandler<OutputT> responseHandler,
-                                     TransformingAsyncResponseHandler<? extends SdkException> errorResponseHandler,
+    public MakeAsyncHttpRequestStage(TransformingAsyncResponseHandler<Response<OutputT>> responseHandler,
                                      HttpClientDependencies dependencies) {
         this.responseHandler = responseHandler;
-        this.errorResponseHandler = errorResponseHandler;
         this.futureCompletionExecutor =
             dependencies.clientConfiguration().option(SdkAdvancedAsyncClientOption.FUTURE_COMPLETION_EXECUTOR);
         this.sdkAsyncHttpClient = dependencies.clientConfiguration().option(SdkClientOption.ASYNC_HTTP_CLIENT);
@@ -88,23 +82,58 @@ public CompletableFuture<Response<OutputT>> execute(SdkHttpFullRequest request,
         return executeHttpRequest(request, context);
     }
 
-    private CompletableFuture<Response<OutputT>> executeHttpRequest(SdkHttpFullRequest request,
-                                                                    RequestExecutionContext context) {
+    private static final class WrappedErrorForwardingResponseHandler<T>
+            implements TransformingAsyncResponseHandler<T> {
+
+        private final TransformingAsyncResponseHandler<T> wrappedHandler;
+        private final CompletableFuture<T> responseFuture;
+
+        private WrappedErrorForwardingResponseHandler(TransformingAsyncResponseHandler<T> wrappedHandler,
+                                                      CompletableFuture<T> responseFuture) {
+            this.wrappedHandler = wrappedHandler;
+            this.responseFuture = responseFuture;
+
+        }
+
+        private static <T> WrappedErrorForwardingResponseHandler<T> of(
+                TransformingAsyncResponseHandler<T> wrappedHandler,
+                CompletableFuture<T> responseFuture) {
+
+            return new WrappedErrorForwardingResponseHandler<>(wrappedHandler, responseFuture);
+        }
+
+        @Override
+        public CompletableFuture<T> prepare() {
+            return wrappedHandler.prepare();
+        }
 
-        CompletableFuture<OutputT> preparedTransformFuture =
-            context.asyncResponseTransformerFuture() != null ? context.asyncResponseTransformerFuture()
-                                                             : responseHandler.prepare();
+        @Override
+        public void onHeaders(SdkHttpResponse headers) {
+            wrappedHandler.onHeaders(headers);
+        }
 
-        CompletableFuture<? extends SdkException> preparedErrorTransformFuture = errorResponseHandler == null ? null :
-                                                                                 errorResponseHandler.prepare();
+        @Override
+        public void onStream(Publisher<ByteBuffer> stream) {
+            wrappedHandler.onStream(stream);
+        }
+
+        @Override
+        public void onError(Throwable error) {
+            responseFuture.completeExceptionally(error);
+            wrappedHandler.onError(error);
+        }
+    }
+
+    private CompletableFuture<Response<OutputT>> executeHttpRequest(SdkHttpFullRequest request,
+                                                                    RequestExecutionContext context) {
         CompletableFuture<Response<OutputT>> responseFuture = new CompletableFuture<>();
 
-        //FIXME(dongie): We need to be careful to only call responseHandler.prepare() exactly once per execute() call
-        //because it calls prepare() under the hood and we guarantee that we call that once per execution. It would be good
-        //to find a way to prevent multiple calls to prepare() within a single execution to only call prepare() once.
-        ResponseHandler handler = new ResponseHandler(responseFuture, preparedTransformFuture, preparedErrorTransformFuture);
+        // Wrap the response handler in a layer that will notify the newly created responseFuture when the onError event
+        // is triggered
+        TransformingAsyncResponseHandler<Response<OutputT>> wrappedResponseHandler =
+            WrappedErrorForwardingResponseHandler.of(responseHandler, responseFuture);
 
-        CompletableFuture<Response<OutputT>> preparedWrapperTransformFuture = handler.prepare();
+        CompletableFuture<Response<OutputT>> responseHandlerFuture = wrappedResponseHandler.prepare();
 
         SdkHttpContentPublisher requestProvider = context.requestProvider() == null
                                                   ? new SimpleHttpContentPublisher(request)
@@ -115,7 +144,7 @@ private CompletableFuture<Response<OutputT>> executeHttpRequest(SdkHttpFullReque
         AsyncExecuteRequest executeRequest = AsyncExecuteRequest.builder()
                                                                 .request(requestWithContentLength)
                                                                 .requestContentPublisher(requestProvider)
-                                                                .responseHandler(handler)
+                                                                .responseHandler(wrappedResponseHandler)
                                                                 .fullDuplex(isFullDuplex(context.executionAttributes()))
                                                                 .build();
 
@@ -133,7 +162,7 @@ private CompletableFuture<Response<OutputT>> executeHttpRequest(SdkHttpFullReque
 
         // Offload the completion of the future returned from this stage onto
         // the future completion executor
-        preparedWrapperTransformFuture.whenCompleteAsync((r, t) -> {
+        responseHandlerFuture.whenCompleteAsync((r, t) -> {
             if (t == null) {
                 responseFuture.complete(r);
             } else {
@@ -201,85 +230,4 @@ public void subscribe(Subscriber<? super ByteBuffer> s) {
             asyncRequestBody.subscribe(s);
         }
     }
-
-    /**
-     * Detects whether the response succeeded or failed and delegates to appropriate response handler.
-     */
-    private class ResponseHandler implements TransformingAsyncResponseHandler<Response<OutputT>> {
-        private final CompletableFuture<Response<OutputT>> responseFuture;
-        private final CompletableFuture<OutputT> transformFuture;
-        private final CompletableFuture<? extends SdkException> errorTransformFuture;
-        private CompletableFuture<SdkHttpResponse> headersFuture;
-        private volatile SdkHttpFullResponse response;
-
-        /**
-         * @param responseFuture the response future to be returned from
-         * {@link MakeAsyncHttpRequestStage#executeHttpRequest(SdkHttpFullRequest, RequestExecutionContext)}
-         * @param transformFuture the transformFuture returned from {@link MakeAsyncHttpRequestStage#responseHandler#prepare()}
-         * @param errorTransformFuture the error transform future returned from
-         * {@link MakeAsyncHttpRequestStage#errorResponseHandler#prepare()}
-         */
-        ResponseHandler(CompletableFuture<Response<OutputT>> responseFuture,
-                        CompletableFuture<OutputT> transformFuture,
-                        CompletableFuture<? extends SdkException> errorTransformFuture) {
-            this.responseFuture = responseFuture;
-            this.transformFuture = transformFuture;
-            this.errorTransformFuture = errorTransformFuture;
-        }
-
-        @Override
-        public void onHeaders(SdkHttpResponse response) {
-            headersFuture.complete(response);
-            if (response.isSuccessful()) {
-                SdkStandardLogger.REQUEST_LOGGER.debug(() -> "Received successful response: " + response.statusCode());
-                responseHandler.onHeaders(response);
-            } else {
-                SdkStandardLogger.REQUEST_LOGGER.debug(() -> "Received error response: " + response.statusCode());
-                errorResponseHandler.onHeaders(response);
-            }
-            this.response = toFullResponse(response);
-        }
-
-        @Override
-        public void onError(Throwable error) {
-            // Note: We don't notify the wrapped handlers' onError here because
-            // we need context about retries; we only want to notify onError if
-            // we know that the request will be retried. Let the
-            // AsyncRetryableStage handle it.
-            responseFuture.completeExceptionally(error);
-            headersFuture.completeExceptionally(error);
-        }
-
-        @Override
-        public void onStream(Publisher<ByteBuffer> publisher) {
-            if (response.isSuccessful()) {
-                responseHandler.onStream(publisher);
-            } else {
-                errorResponseHandler.onStream(publisher);
-            }
-        }
-
-        @Override
-        public CompletableFuture<Response<OutputT>> prepare() {
-            headersFuture = new CompletableFuture<>();
-            return headersFuture.thenCompose(headers -> {
-                if (headers.isSuccessful()) {
-                    return transformFuture.thenApply(r -> Response.fromSuccess(r, response));
-                }
-
-                if (errorTransformFuture != null) {
-                    return errorTransformFuture.thenApply(e -> Response.fromFailure(e, response));
-                }
-                return CompletableFuture.completedFuture(Response.fromFailure(null, response));
-            });
-        }
-    }
-
-    private static SdkHttpFullResponse toFullResponse(SdkHttpResponse response) {
-        SdkHttpFullResponse.Builder builder = SdkHttpFullResponse.builder()
-                                                                 .statusCode(response.statusCode())
-                                                                 .headers(response.headers());
-        response.statusText().ifPresent(builder::statusText);
-        return builder.build();
-    }
 }
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/MakeHttpRequestStage.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/MakeHttpRequestStage.java
index 2b93c449284c..05dbf2026d66 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/MakeHttpRequestStage.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/MakeHttpRequestStage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/MakeRequestImmutableStage.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/MakeRequestImmutableStage.java
index b06f3088c4ab..d7a166a68a8d 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/MakeRequestImmutableStage.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/MakeRequestImmutableStage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/MakeRequestMutableStage.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/MakeRequestMutableStage.java
index dfe6049606d4..62c60db136aa 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/MakeRequestMutableStage.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/MakeRequestMutableStage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/MergeCustomHeadersStage.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/MergeCustomHeadersStage.java
index b9e1b2136613..f9db5404dc13 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/MergeCustomHeadersStage.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/MergeCustomHeadersStage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -27,6 +27,7 @@
 import software.amazon.awssdk.core.internal.http.RequestExecutionContext;
 import software.amazon.awssdk.core.internal.http.pipeline.MutableRequestToRequestPipeline;
 import software.amazon.awssdk.http.SdkHttpFullRequest;
+import software.amazon.awssdk.utils.http.SdkHttpUtils;
 
 /**
  * Merge customer supplied headers into the marshalled request.
@@ -52,7 +53,13 @@ public SdkHttpFullRequest.Builder execute(SdkHttpFullRequest.Builder request, Re
     private final Map<String, List<String>> mergeHeaders(Map<String, List<String>>... headers) {
         Map<String, List<String>> result = new LinkedHashMap<>();
         for (Map<String, List<String>> header : headers) {
-            header.forEach((k, v) -> result.computeIfAbsent(k, ignored -> new ArrayList<>()).addAll(v));
+            header.forEach((headerName, headerValues) -> {
+                List<String> resultHeaderValues = result.computeIfAbsent(headerName, ignored -> new ArrayList<>());
+                if (SdkHttpUtils.isSingleHeader(headerName)) {
+                    resultHeaderValues.clear();
+                }
+                resultHeaderValues.addAll(headerValues);
+            });
         }
         return result;
     }
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/MergeCustomQueryParamsStage.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/MergeCustomQueryParamsStage.java
index 0b5c28159c33..22c9f087a2ad 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/MergeCustomQueryParamsStage.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/MergeCustomQueryParamsStage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/MoveParametersToBodyStage.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/MoveParametersToBodyStage.java
deleted file mode 100644
index e96c645efd11..000000000000
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/MoveParametersToBodyStage.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.core.internal.http.pipeline.stages;
-
-import static java.util.Collections.singletonList;
-import static software.amazon.awssdk.utils.StringUtils.lowerCase;
-
-import java.io.ByteArrayInputStream;
-import java.nio.charset.StandardCharsets;
-import software.amazon.awssdk.annotations.SdkInternalApi;
-import software.amazon.awssdk.core.internal.http.RequestExecutionContext;
-import software.amazon.awssdk.core.internal.http.pipeline.MutableRequestToRequestPipeline;
-import software.amazon.awssdk.http.SdkHttpFullRequest;
-import software.amazon.awssdk.http.SdkHttpMethod;
-import software.amazon.awssdk.utils.CollectionUtils;
-import software.amazon.awssdk.utils.http.SdkHttpUtils;
-
-@SdkInternalApi
-//TODO Might only need to do this for certain protocols - ie query?
-public final class MoveParametersToBodyStage implements MutableRequestToRequestPipeline {
-    @Override
-    public SdkHttpFullRequest.Builder execute(SdkHttpFullRequest.Builder input, RequestExecutionContext context) {
-        if (shouldPutParamsInBody(input)) {
-            return changeQueryParametersToFormData(input);
-        }
-        return input;
-    }
-
-    private boolean shouldPutParamsInBody(SdkHttpFullRequest.Builder input) {
-        return input.method() == SdkHttpMethod.POST &&
-               input.contentStreamProvider() == null &&
-               !CollectionUtils.isNullOrEmpty(input.rawQueryParameters());
-    }
-
-    private static SdkHttpFullRequest.Builder changeQueryParametersToFormData(SdkHttpFullRequest.Builder input) {
-        byte[] params = SdkHttpUtils.encodeAndFlattenFormData(input.rawQueryParameters()).orElse("")
-                                    .getBytes(StandardCharsets.UTF_8);
-
-        return input.clearQueryParameters()
-                    .contentStreamProvider(() -> new ByteArrayInputStream(params))
-                    .putHeader("Content-Length", singletonList(String.valueOf(params.length)))
-                    .putHeader("Content-Type", singletonList("application/x-www-form-urlencoded; charset=" +
-                                                             lowerCase(StandardCharsets.UTF_8.toString())));
-    }
-}
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/RetryableStage.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/RetryableStage.java
index d79be901fa13..3854e42c5dc6 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/RetryableStage.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/RetryableStage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -19,142 +19,64 @@
 import java.time.Duration;
 import java.util.concurrent.TimeUnit;
 import software.amazon.awssdk.annotations.SdkInternalApi;
-import software.amazon.awssdk.core.SdkStandardLogger;
-import software.amazon.awssdk.core.client.config.SdkClientOption;
-import software.amazon.awssdk.core.exception.SdkClientException;
+import software.amazon.awssdk.core.Response;
 import software.amazon.awssdk.core.exception.SdkException;
-import software.amazon.awssdk.core.internal.Response;
 import software.amazon.awssdk.core.internal.http.HttpClientDependencies;
-import software.amazon.awssdk.core.internal.http.InterruptMonitor;
 import software.amazon.awssdk.core.internal.http.RequestExecutionContext;
 import software.amazon.awssdk.core.internal.http.pipeline.RequestPipeline;
 import software.amazon.awssdk.core.internal.http.pipeline.RequestToResponsePipeline;
-import software.amazon.awssdk.core.internal.retry.ClockSkewAdjuster;
-import software.amazon.awssdk.core.internal.retry.RetryHandler;
-import software.amazon.awssdk.core.internal.util.CapacityManager;
-import software.amazon.awssdk.core.retry.RetryPolicy;
+import software.amazon.awssdk.core.internal.http.pipeline.stages.utils.RetryableStageHelper;
 import software.amazon.awssdk.http.SdkHttpFullRequest;
-import software.amazon.awssdk.utils.Logger;
 
 /**
- * Wrapper around the pipeline for a single request to provide retry functionality.
+ * Wrapper around the pipeline for a single request to provide retry, clock-skew and request throttling functionality.
  */
 @SdkInternalApi
 public final class RetryableStage<OutputT> implements RequestToResponsePipeline<OutputT> {
-
-    private static final Logger log = Logger.loggerFor(RetryableStage.class);
-
     private final RequestPipeline<SdkHttpFullRequest, Response<OutputT>> requestPipeline;
-
     private final HttpClientDependencies dependencies;
-    private final CapacityManager retryCapacity;
-    private final RetryPolicy retryPolicy;
 
     public RetryableStage(HttpClientDependencies dependencies,
                           RequestPipeline<SdkHttpFullRequest, Response<OutputT>> requestPipeline) {
         this.dependencies = dependencies;
-        this.retryCapacity = dependencies.retryCapacity();
-        this.retryPolicy = dependencies.clientConfiguration().option(SdkClientOption.RETRY_POLICY);
         this.requestPipeline = requestPipeline;
     }
 
     public Response<OutputT> execute(SdkHttpFullRequest request, RequestExecutionContext context) throws Exception {
-        return new RetryExecutor(request, context).execute();
-    }
-
-    /**
-     * Created for every request to encapsulate mutable state between retries.
-     */
-    private class RetryExecutor {
-
-        private final SdkHttpFullRequest request;
-        private final RequestExecutionContext context;
-        private final RetryHandler retryHandler;
+        RetryableStageHelper retryableStageHelper = new RetryableStageHelper(request, context, dependencies);
 
-        private int requestCount = 0;
+        while (true) {
+            retryableStageHelper.startingAttempt();
 
-        private RetryExecutor(SdkHttpFullRequest request, RequestExecutionContext context) {
-            this.request = request;
-            this.context = context;
-            this.retryHandler = new RetryHandler(retryPolicy, retryCapacity);
-        }
-
-        public Response<OutputT> execute() throws Exception {
-            while (true) {
-                try {
-                    beforeExecute();
-                    Response<OutputT> response = doExecute();
-                    if (response.isSuccess()) {
-                        retryHandler.releaseRetryCapacity();
-                        return response;
-                    } else {
-                        retryHandler.setLastRetriedException(handleUnmarshalledException(response));
-                    }
-                } catch (SdkClientException | IOException e) {
-                    retryHandler.setLastRetriedException(handleThrownException(e));
-                }
+            if (!retryableStageHelper.retryPolicyAllowsRetry()) {
+                throw retryableStageHelper.retryPolicyDisallowedRetryException();
             }
-        }
 
-        private void beforeExecute() throws InterruptedException {
-            retryHandler.retryCapacityConsumed(false);
-            InterruptMonitor.checkInterrupted();
-            ++requestCount;
-        }
-
-        private Response<OutputT> doExecute() throws Exception {
-            if (retryHandler.isRetry()) {
-                doPauseBeforeRetry();
+            Duration backoffDelay = retryableStageHelper.getBackoffDelay();
+            if (!backoffDelay.isZero()) {
+                retryableStageHelper.logBackingOff(backoffDelay);
+                TimeUnit.MILLISECONDS.sleep(backoffDelay.toMillis());
             }
 
-            SdkStandardLogger.REQUEST_LOGGER.debug(() -> (retryHandler.isRetry() ? "Retrying " : "Sending ") + "Request: " +
-                                                         request);
-
-            return requestPipeline.execute(retryHandler.addRetryInfoHeader(request, requestCount), context);
-        }
-
-        private SdkException handleUnmarshalledException(Response<OutputT> response) {
-            SdkException exception = response.exception();
-
-            ClockSkewAdjuster clockSkewAdjuster = dependencies.clockSkewAdjuster();
-            if (clockSkewAdjuster.shouldAdjust(exception)) {
-                dependencies.updateTimeOffset(clockSkewAdjuster.getAdjustmentInSeconds(response.httpResponse()));
+            Response<OutputT> response;
+            try {
+                retryableStageHelper.logSendingRequest();
+                response = requestPipeline.execute(retryableStageHelper.requestToSend(), context);
+            } catch (SdkException | IOException e) {
+                retryableStageHelper.setLastException(e);
+                continue;
             }
 
-            if (!retryHandler.shouldRetry(response.httpResponse(), request, context, exception, requestCount)) {
-                throw exception;
-            }
-
-            return exception;
-        }
+            retryableStageHelper.setLastResponse(response.httpResponse());
 
-        private SdkException handleThrownException(Exception e) {
-            SdkClientException sdkClientException = e instanceof SdkClientException ?
-                    (SdkClientException) e : SdkClientException.builder()
-                                                               .message("Unable to execute HTTP request: " + e.getMessage())
-                                                               .cause(e)
-                                                               .build();
-            boolean willRetry = retryHandler.shouldRetry(null, request, context, sdkClientException, requestCount);
-
-            log.debug(() -> sdkClientException.getMessage() + (willRetry ? " Request will be retried." : ""), e);
-
-            if (!willRetry) {
-                throw sdkClientException;
+            if (!response.isSuccess()) {
+                retryableStageHelper.adjustClockIfClockSkew(response);
+                retryableStageHelper.setLastException(response.exception());
+                continue;
             }
 
-            return sdkClientException;
-        }
-
-        /**
-         * Sleep for a period of time on failed request to avoid flooding a service with retries.
-         */
-        private void doPauseBeforeRetry() throws InterruptedException {
-            int retriesAttempted = requestCount - 2;
-            Duration delay = retryHandler.computeDelayBeforeNextRetry();
-
-            SdkStandardLogger.REQUEST_LOGGER.debug(() -> "Retryable error detected, will retry in " + delay.toMillis() + "ms,"
-                                                         + " attempt number " + retriesAttempted);
-            TimeUnit.MILLISECONDS.sleep(delay.toMillis());
+            retryableStageHelper.attemptSucceeded();
+            return response;
         }
     }
 }
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/SigningStage.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/SigningStage.java
index 04a8cf8011d7..f436cbb91139 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/SigningStage.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/SigningStage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/TimeoutExceptionHandlingStage.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/TimeoutExceptionHandlingStage.java
index 23f0a272ebac..f7325a25873d 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/TimeoutExceptionHandlingStage.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/TimeoutExceptionHandlingStage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -20,12 +20,12 @@
 
 import java.io.IOException;
 import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.core.Response;
 import software.amazon.awssdk.core.client.config.ClientOverrideConfiguration;
 import software.amazon.awssdk.core.client.config.SdkClientOption;
 import software.amazon.awssdk.core.exception.AbortedException;
 import software.amazon.awssdk.core.exception.ApiCallAttemptTimeoutException;
 import software.amazon.awssdk.core.exception.SdkInterruptedException;
-import software.amazon.awssdk.core.internal.Response;
 import software.amazon.awssdk.core.internal.http.HttpClientDependencies;
 import software.amazon.awssdk.core.internal.http.RequestExecutionContext;
 import software.amazon.awssdk.core.internal.http.pipeline.RequestPipeline;
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/UnwrapResponseContainer.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/UnwrapResponseContainer.java
index 3b946595912a..d7290a29c1cb 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/UnwrapResponseContainer.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/UnwrapResponseContainer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -16,7 +16,7 @@
 package software.amazon.awssdk.core.internal.http.pipeline.stages;
 
 import software.amazon.awssdk.annotations.SdkInternalApi;
-import software.amazon.awssdk.core.internal.Response;
+import software.amazon.awssdk.core.Response;
 import software.amazon.awssdk.core.internal.http.RequestExecutionContext;
 import software.amazon.awssdk.core.internal.http.pipeline.RequestPipeline;
 
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/utils/ExceptionReportingUtils.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/utils/ExceptionReportingUtils.java
index ab8b7d77cf3b..06a4b2544fc7 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/utils/ExceptionReportingUtils.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/utils/ExceptionReportingUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/utils/RetryableStageHelper.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/utils/RetryableStageHelper.java
new file mode 100644
index 000000000000..8ad4dc3df0b3
--- /dev/null
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/utils/RetryableStageHelper.java
@@ -0,0 +1,239 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.core.internal.http.pipeline.stages.utils;
+
+import static software.amazon.awssdk.core.internal.retry.SdkDefaultRetrySetting.SDK_RETRY_INFO_HEADER;
+
+import java.time.Duration;
+import java.util.concurrent.CompletionException;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.core.Response;
+import software.amazon.awssdk.core.SdkStandardLogger;
+import software.amazon.awssdk.core.client.config.SdkClientOption;
+import software.amazon.awssdk.core.exception.NonRetryableException;
+import software.amazon.awssdk.core.exception.SdkClientException;
+import software.amazon.awssdk.core.exception.SdkException;
+import software.amazon.awssdk.core.internal.InternalCoreExecutionAttribute;
+import software.amazon.awssdk.core.internal.http.HttpClientDependencies;
+import software.amazon.awssdk.core.internal.http.RequestExecutionContext;
+import software.amazon.awssdk.core.internal.http.pipeline.stages.AsyncRetryableStage;
+import software.amazon.awssdk.core.internal.http.pipeline.stages.RetryableStage;
+import software.amazon.awssdk.core.internal.retry.ClockSkewAdjuster;
+import software.amazon.awssdk.core.retry.RetryPolicy;
+import software.amazon.awssdk.core.retry.RetryPolicyContext;
+import software.amazon.awssdk.core.retry.RetryUtils;
+import software.amazon.awssdk.core.retry.conditions.TokenBucketRetryCondition;
+import software.amazon.awssdk.http.SdkHttpFullRequest;
+import software.amazon.awssdk.http.SdkHttpResponse;
+
+/**
+ * Contains the logic shared by {@link RetryableStage} and {@link AsyncRetryableStage} when querying and interacting with a
+ * {@link RetryPolicy}.
+ */
+@SdkInternalApi
+public class RetryableStageHelper {
+    private final SdkHttpFullRequest request;
+    private final RequestExecutionContext context;
+    private final RetryPolicy retryPolicy;
+    private final HttpClientDependencies dependencies;
+
+    private int attemptNumber = 0;
+    private SdkHttpResponse lastResponse = null;
+    private SdkException lastException = null;
+    private Duration lastBackoffDelay = null;
+
+    public RetryableStageHelper(SdkHttpFullRequest request,
+                                RequestExecutionContext context,
+                                HttpClientDependencies dependencies) {
+        this.request = request;
+        this.context = context;
+        this.retryPolicy = dependencies.clientConfiguration().option(SdkClientOption.RETRY_POLICY);
+        this.dependencies = dependencies;
+    }
+
+    /**
+     * Invoke when starting a request attempt, before querying the retry policy.
+     */
+    public void startingAttempt() {
+        ++attemptNumber;
+        context.executionAttributes().putAttribute(InternalCoreExecutionAttribute.EXECUTION_ATTEMPT, attemptNumber);
+    }
+
+    /**
+     * Returns true if the retry policy allows this attempt. This will always return true if the current attempt is not a retry
+     * (i.e. it's the first request in the execution).
+     */
+    public boolean retryPolicyAllowsRetry() {
+        if (isInitialAttempt()) {
+            return true;
+        }
+
+        if (lastException instanceof NonRetryableException) {
+            return false;
+        }
+
+        RetryPolicyContext context = retryPolicyContext(true);
+
+        boolean willRetry = retryPolicy.aggregateRetryCondition().shouldRetry(context);
+        if (!willRetry) {
+            retryPolicy.aggregateRetryCondition().requestWillNotBeRetried(context);
+        }
+
+        return willRetry;
+    }
+
+    /**
+     * Return the exception that should be thrown, because the retry policy did not allow the request to be retried.
+     */
+    public SdkException retryPolicyDisallowedRetryException() {
+        return lastException;
+    }
+
+    /**
+     * Get the amount of time that the request should be delayed before being sent. This may be {@link Duration#ZERO}, such as
+     * for the first request in the request series.
+     */
+    public Duration getBackoffDelay() {
+        Duration result;
+        if (isInitialAttempt()) {
+            result = Duration.ZERO;
+        } else {
+            RetryPolicyContext context = retryPolicyContext(true);
+            if (RetryUtils.isThrottlingException(lastException)) {
+                result = retryPolicy.throttlingBackoffStrategy().computeDelayBeforeNextRetry(context);
+            } else {
+                result = retryPolicy.backoffStrategy().computeDelayBeforeNextRetry(context);
+            }
+        }
+        lastBackoffDelay = result;
+        return result;
+    }
+
+    /**
+     * Log a message to the user at the debug level to indicate how long we will wait before retrying the request.
+     */
+    public void logBackingOff(Duration backoffDelay) {
+        SdkStandardLogger.REQUEST_LOGGER.debug(() -> "Retryable error detected. Will retry in " +
+                                                     backoffDelay.toMillis() + "ms. Request attempt number " +
+                                                     attemptNumber);
+    }
+
+    /**
+     * Retrieve the request to send to the service, including any detailed retry information headers.
+     */
+    public SdkHttpFullRequest requestToSend() {
+        Integer availableRetryCapacity = TokenBucketRetryCondition.getCapacityForExecution(context.executionAttributes())
+                                                                  .map(TokenBucketRetryCondition.Capacity::capacityRemaining)
+                                                                  .orElse(null);
+
+        return request.toBuilder()
+                      .putHeader(SDK_RETRY_INFO_HEADER,
+                                 String.format("%s/%s/%s",
+                                               attemptNumber - 1,
+                                               lastBackoffDelay.toMillis(),
+                                               availableRetryCapacity != null ? availableRetryCapacity : ""))
+                      .build();
+    }
+
+    /**
+     * Log a message to the user at the debug level to indicate that we are sending the request to the service.
+     */
+    public void logSendingRequest() {
+        SdkStandardLogger.REQUEST_LOGGER.debug(() -> (isInitialAttempt() ? "Sending" : "Retrying") + " Request: " + request);
+    }
+
+    /**
+     * Adjust the client-side clock skew if the provided response indicates that there is a large skew between the client and
+     * service. This will allow a retried request to be signed with what is likely to be a more accurate time.
+     */
+    public void adjustClockIfClockSkew(Response<?> response) {
+        ClockSkewAdjuster clockSkewAdjuster = dependencies.clockSkewAdjuster();
+        if (!response.isSuccess() && clockSkewAdjuster.shouldAdjust(response.exception())) {
+            dependencies.updateTimeOffset(clockSkewAdjuster.getAdjustmentInSeconds(response.httpResponse()));
+        }
+    }
+
+    /**
+     * Notify the retry policy that the request attempt succeeded.
+     */
+    public void attemptSucceeded() {
+        retryPolicy.aggregateRetryCondition().requestSucceeded(retryPolicyContext(false));
+    }
+
+    /**
+     * Retrieve the current attempt number, updated whenever {@link #startingAttempt()} is invoked.
+     */
+    public int getAttemptNumber() {
+        return attemptNumber;
+    }
+
+    /**
+     * Retrieve the last call failure exception encountered by this execution, updated whenever {@link #setLastException} is
+     * invoked.
+     */
+    public SdkException getLastException() {
+        return lastException;
+    }
+
+    /**
+     * Update the {@link #getLastException()} value for this helper. This will be used to determine whether the request should
+     * be retried.
+     */
+    public void setLastException(Throwable lastException) {
+        if (lastException instanceof CompletionException) {
+            setLastException(lastException.getCause());
+        } else if (lastException instanceof SdkException) {
+            this.lastException = (SdkException) lastException;
+        } else {
+            this.lastException = SdkClientException.create("Unable to execute HTTP request: " + lastException.getMessage(),
+                                                           lastException);
+        }
+    }
+
+    /**
+     * Set the last HTTP response returned by the service. This will be used to determine whether the request should be retried.
+     */
+    public void setLastResponse(SdkHttpResponse lastResponse) {
+        this.lastResponse = lastResponse;
+    }
+
+    private boolean isInitialAttempt() {
+        return attemptNumber == 1;
+    }
+
+    private RetryPolicyContext retryPolicyContext(boolean isBeforeAttemptSent) {
+        return RetryPolicyContext.builder()
+                                 .request(request)
+                                 .originalRequest(context.originalRequest())
+                                 .exception(lastException)
+                                 .retriesAttempted(retriesAttemptedSoFar(isBeforeAttemptSent))
+                                 .executionAttributes(context.executionAttributes())
+                                 .httpStatusCode(lastResponse == null ? null : lastResponse.statusCode())
+                                 .build();
+    }
+
+    /**
+     * Retrieve the number of retries sent so far in the request execution. This depends on whether or not we've actually
+     * sent the request yet during this attempt.
+     *
+     * Assuming we're executing attempt 3, the number of retries attempted varies based on whether the request has been sent to
+     * the service yet. Before we send the request, the number of retries is 1 (from attempt 2). After we send the request, the
+     * number of retries is 2 (from attempt 2 and attempt 3).
+     */
+    private int retriesAttemptedSoFar(boolean isBeforeAttemptSent) {
+        return Math.max(0, isBeforeAttemptSent ? attemptNumber - 2 : attemptNumber - 1);
+    }
+}
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/timers/ApiCallTimeoutTracker.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/timers/ApiCallTimeoutTracker.java
index 822198c01b06..612d13d1726c 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/timers/ApiCallTimeoutTracker.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/timers/ApiCallTimeoutTracker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/timers/AsyncTimeoutTask.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/timers/AsyncTimeoutTask.java
index f5a2c4f0a20d..ac07553d3abd 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/timers/AsyncTimeoutTask.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/timers/AsyncTimeoutTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/timers/NoOpTimeoutTracker.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/timers/NoOpTimeoutTracker.java
index 2f54420bdc2b..74db18634c60 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/timers/NoOpTimeoutTracker.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/timers/NoOpTimeoutTracker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/timers/SyncTimeoutTask.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/timers/SyncTimeoutTask.java
index 818ee59c819f..b1a79ec6923a 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/timers/SyncTimeoutTask.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/timers/SyncTimeoutTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/timers/TimeoutTask.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/timers/TimeoutTask.java
index cdbd9808d9f1..73cd81e32bde 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/timers/TimeoutTask.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/timers/TimeoutTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/timers/TimeoutTracker.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/timers/TimeoutTracker.java
index 5e10560a6311..f4621b947d94 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/timers/TimeoutTracker.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/timers/TimeoutTracker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/timers/TimerUtils.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/timers/TimerUtils.java
index 3590091180bf..dc54f469deba 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/timers/TimerUtils.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/timers/TimerUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/interceptor/DefaultFailedExecutionContext.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/interceptor/DefaultFailedExecutionContext.java
index d4a07a3164c7..d2e0817dbbed 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/interceptor/DefaultFailedExecutionContext.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/interceptor/DefaultFailedExecutionContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/io/Releasable.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/io/Releasable.java
index 15d2400bbc83..9be1af9d3390 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/io/Releasable.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/io/Releasable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/pagination/async/ItemsSubscription.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/pagination/async/ItemsSubscription.java
index 8b99fa1a26f0..03ed8a4d1ea1 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/pagination/async/ItemsSubscription.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/pagination/async/ItemsSubscription.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/retry/ClockSkewAdjuster.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/retry/ClockSkewAdjuster.java
index d8a57c4a2747..f3a6bf6a5a2f 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/retry/ClockSkewAdjuster.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/retry/ClockSkewAdjuster.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/retry/DefaultTokenBucketExceptionCostFunction.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/retry/DefaultTokenBucketExceptionCostFunction.java
new file mode 100644
index 000000000000..e9d553e79047
--- /dev/null
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/retry/DefaultTokenBucketExceptionCostFunction.java
@@ -0,0 +1,98 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.core.internal.retry;
+
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.core.exception.SdkException;
+import software.amazon.awssdk.core.retry.RetryUtils;
+import software.amazon.awssdk.core.retry.conditions.TokenBucketExceptionCostFunction;
+import software.amazon.awssdk.utils.ToString;
+import software.amazon.awssdk.utils.Validate;
+
+@SdkInternalApi
+public class DefaultTokenBucketExceptionCostFunction implements TokenBucketExceptionCostFunction {
+    private final Integer throttlingExceptionCost;
+    private final int defaultExceptionCost;
+
+    private DefaultTokenBucketExceptionCostFunction(Builder builder) {
+        this.throttlingExceptionCost = builder.throttlingExceptionCost;
+        this.defaultExceptionCost = Validate.paramNotNull(builder.defaultExceptionCost, "defaultExceptionCost");
+    }
+
+    @Override
+    public Integer apply(SdkException e) {
+        if (throttlingExceptionCost != null && RetryUtils.isThrottlingException(e)) {
+            return throttlingExceptionCost;
+        }
+
+        return defaultExceptionCost;
+    }
+
+    @Override
+    public String toString() {
+        return ToString.builder("TokenBucketExceptionCostCalculator")
+                       .add("throttlingExceptionCost", throttlingExceptionCost)
+                       .add("defaultExceptionCost", defaultExceptionCost)
+                       .build();
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        DefaultTokenBucketExceptionCostFunction that = (DefaultTokenBucketExceptionCostFunction) o;
+
+        if (defaultExceptionCost != that.defaultExceptionCost) {
+            return false;
+        }
+
+        return throttlingExceptionCost != null ?
+               throttlingExceptionCost.equals(that.throttlingExceptionCost) :
+               that.throttlingExceptionCost == null;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = throttlingExceptionCost != null ? throttlingExceptionCost.hashCode() : 0;
+        result = 31 * result + defaultExceptionCost;
+        return result;
+    }
+
+    public static final class Builder implements TokenBucketExceptionCostFunction.Builder {
+        private Integer throttlingExceptionCost;
+        private Integer defaultExceptionCost;
+
+        public TokenBucketExceptionCostFunction.Builder throttlingExceptionCost(int cost) {
+            this.throttlingExceptionCost = cost;
+            return this;
+        }
+
+        public TokenBucketExceptionCostFunction.Builder defaultExceptionCost(int cost) {
+            this.defaultExceptionCost = cost;
+            return this;
+        }
+
+        public TokenBucketExceptionCostFunction build() {
+            return new DefaultTokenBucketExceptionCostFunction(this);
+        }
+
+    }
+}
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/retry/RetryHandler.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/retry/RetryHandler.java
deleted file mode 100644
index 8d7fe2bdce88..000000000000
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/retry/RetryHandler.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.core.internal.retry;
-
-import static java.util.Collections.singletonList;
-
-import java.time.Duration;
-import software.amazon.awssdk.annotations.SdkInternalApi;
-import software.amazon.awssdk.core.exception.SdkException;
-import software.amazon.awssdk.core.internal.http.RequestExecutionContext;
-import software.amazon.awssdk.core.internal.util.CapacityManager;
-import software.amazon.awssdk.core.retry.RetryPolicy;
-import software.amazon.awssdk.core.retry.RetryPolicyContext;
-import software.amazon.awssdk.core.retry.RetryUtils;
-import software.amazon.awssdk.http.SdkHttpFullRequest;
-import software.amazon.awssdk.http.SdkHttpFullResponse;
-
-@SdkInternalApi
-public final class RetryHandler {
-
-    public static final String HEADER_SDK_RETRY_INFO = "amz-sdk-retry";
-
-    private final RetryPolicy retryPolicy;
-    private final CapacityManager retryCapacity;
-
-    private Duration lastBackoffDelay = Duration.ZERO;
-    private boolean retryCapacityConsumed;
-    private RetryPolicyContext retryPolicyContext;
-    private SdkException lastRetriedException;
-
-    public RetryHandler(RetryPolicy retryPolicy,
-                        CapacityManager retryCapacity) {
-        this.retryPolicy = retryPolicy;
-        this.retryCapacity = retryCapacity;
-    }
-
-    public boolean shouldRetry(SdkHttpFullResponse httpResponse,
-                               SdkHttpFullRequest request,
-                               RequestExecutionContext context,
-                               SdkException exception,
-                               int requestCount) {
-
-        int retriesAttempted = requestCount - 1;
-
-        // Do not use retry capacity for throttling exceptions
-        if (!RetryUtils.isThrottlingException(exception)) {
-            // See if we have enough available retry capacity to be able to execute this retry attempt.
-            if (!retryCapacity.acquire(SdkDefaultRetrySetting.RETRY_THROTTLING_COST)) {
-                return false;
-            }
-            this.retryCapacityConsumed = true;
-        }
-
-        this.retryPolicyContext = RetryPolicyContext.builder()
-                                                    .request(request)
-                                                    .originalRequest(context.originalRequest())
-                                                    .exception(exception)
-                                                    .retriesAttempted(retriesAttempted)
-                                                    .executionAttributes(context.executionAttributes())
-                                                    .httpStatusCode(httpResponse == null ? null : httpResponse.statusCode())
-                                                    .build();
-        // Finally, pass all the context information to the RetryCondition and let it decide whether it should be retried.
-        if (!retryPolicy.retryCondition().shouldRetry(retryPolicyContext)) {
-            // If the retry policy fails we immediately return consumed capacity to the pool.
-            if (retryCapacityConsumed) {
-                retryCapacity.release(SdkDefaultRetrySetting.RETRY_THROTTLING_COST);
-            }
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * If this was a successful retry attempt we'll release the full retry capacity that the attempt originally consumed.  If
-     * this was a successful initial request we release a lesser amount.
-     */
-    public void releaseRetryCapacity() {
-        if (isRetry() && retryCapacityConsumed) {
-            retryCapacity.release(SdkDefaultRetrySetting.RETRY_THROTTLING_COST);
-        } else {
-            retryCapacity.release();
-        }
-    }
-
-    /**
-     * Computes the delay before the next retry should be attempted based on the retry policy context.
-     * @return long value of how long to wait
-     */
-    public Duration computeDelayBeforeNextRetry() {
-        if (RetryUtils.isThrottlingException(retryPolicyContext.exception())) {
-            lastBackoffDelay = retryPolicy.throttlingBackoffStrategy().computeDelayBeforeNextRetry(retryPolicyContext);
-        } else {
-            lastBackoffDelay = retryPolicy.backoffStrategy().computeDelayBeforeNextRetry(retryPolicyContext);
-        }
-
-        return lastBackoffDelay;
-    }
-
-    /**
-     * Sets whether retry capacity has been consumed for this request
-     */
-    public void retryCapacityConsumed(boolean retryCapacityConsumed) {
-        this.retryCapacityConsumed = retryCapacityConsumed;
-    }
-
-    /**
-     * Add the {@value HEADER_SDK_RETRY_INFO} header to the request. Contains metadata about request count,
-     * backoff, and retry capacity.
-     *
-     * @return Request with retry info header added.
-     */
-    public SdkHttpFullRequest addRetryInfoHeader(SdkHttpFullRequest request, int requestCount) throws Exception {
-        int availableRetryCapacity = retryCapacity.availableCapacity();
-        return request.toBuilder()
-                      .putHeader(HEADER_SDK_RETRY_INFO,
-                                 singletonList(String.format("%s/%s/%s",
-                                                          requestCount - 1,
-                                                          lastBackoffDelay.toMillis(),
-                                                          availableRetryCapacity >= 0 ? availableRetryCapacity : "")))
-                      .build();
-    }
-
-    /**
-     * Sets the last exception the has been seen by the retry handler.
-     * @param exception - the last exception seen
-     */
-    public void setLastRetriedException(SdkException exception) {
-        this.lastRetriedException = exception;
-    }
-
-    /**
-     * Whether or not the current request is a retry. True if the original request has been retried at least one time.
-     */
-    public boolean isRetry() {
-        return lastRetriedException != null;
-    }
-}
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/retry/SdkDefaultRetrySetting.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/retry/SdkDefaultRetrySetting.java
index 44826119b30a..354b5bb7fd30 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/retry/SdkDefaultRetrySetting.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/retry/SdkDefaultRetrySetting.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -22,26 +22,41 @@
 import java.util.HashSet;
 import java.util.Set;
 import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.core.SdkSystemSetting;
 import software.amazon.awssdk.core.exception.ApiCallAttemptTimeoutException;
 import software.amazon.awssdk.core.exception.RetryableException;
+import software.amazon.awssdk.core.retry.RetryMode;
+import software.amazon.awssdk.core.retry.conditions.TokenBucketExceptionCostFunction;
 import software.amazon.awssdk.http.HttpStatusCode;
+import software.amazon.awssdk.utils.Validate;
 
 @SdkInternalApi
 public final class SdkDefaultRetrySetting {
+    public static final String SDK_RETRY_INFO_HEADER = "amz-sdk-retry";
 
-    /**
-     * When throttled retries are enabled, each retry attempt will consume this much capacity.
-     * Successful retry attempts will release this capacity back to the pool while failed retries
-     * will not.  Successful initial (non-retry) requests will always release 1 capacity unit to the
-     * pool.
-     */
-    public static final int RETRY_THROTTLING_COST = 5;
+    public static final class Legacy {
+        private static final int THROTTLE_EXCEPTION_TOKEN_COST = 0;
+        private static final int DEFAULT_EXCEPTION_TOKEN_COST = 5;
 
-    /**
-     * When throttled retries are enabled, this is the total number of subsequent failed retries
-     * that may be attempted before retry capacity is fully drained.
-     */
-    public static final int THROTTLED_RETRIES = 100;
+        public static final TokenBucketExceptionCostFunction COST_FUNCTION =
+            TokenBucketExceptionCostFunction.builder()
+                                            .throttlingExceptionCost(THROTTLE_EXCEPTION_TOKEN_COST)
+                                            .defaultExceptionCost(DEFAULT_EXCEPTION_TOKEN_COST)
+                                            .build();
+    }
+
+    public static final class Standard {
+        private static final int THROTTLE_EXCEPTION_TOKEN_COST = 5;
+        private static final int DEFAULT_EXCEPTION_TOKEN_COST = 5;
+
+        public static final TokenBucketExceptionCostFunction COST_FUNCTION =
+            TokenBucketExceptionCostFunction.builder()
+                                            .throttlingExceptionCost(THROTTLE_EXCEPTION_TOKEN_COST)
+                                            .defaultExceptionCost(DEFAULT_EXCEPTION_TOKEN_COST)
+                                            .build();
+    }
+
+    public static final int TOKEN_BUCKET_SIZE = 500;
 
     public static final Duration BASE_DELAY = Duration.ofMillis(100);
 
@@ -69,5 +84,39 @@ public final class SdkDefaultRetrySetting {
         RETRYABLE_EXCEPTIONS = unmodifiableSet(retryableExceptions);
     }
 
-    private SdkDefaultRetrySetting() {}
+    private SdkDefaultRetrySetting() {
+    }
+
+    public static Integer maxAttempts(RetryMode retryMode) {
+        Integer maxAttempts = SdkSystemSetting.AWS_MAX_ATTEMPTS.getIntegerValue().orElse(null);
+
+        if (maxAttempts == null) {
+            switch (retryMode) {
+                case LEGACY:
+                    maxAttempts = 4;
+                    break;
+                case STANDARD:
+                    maxAttempts = 3;
+                    break;
+                default:
+                    throw new IllegalArgumentException("Unknown retry mode: " + retryMode);
+            }
+        }
+
+        Validate.isPositive(maxAttempts, "Maximum attempts must be positive, but was " + maxAttempts);
+
+        return maxAttempts;
+    }
+
+    public static TokenBucketExceptionCostFunction tokenCostFunction(RetryMode retryMode) {
+        switch (retryMode) {
+            case LEGACY: return Legacy.COST_FUNCTION;
+            case STANDARD: return Standard.COST_FUNCTION;
+            default: throw new IllegalStateException("Unsupported RetryMode: " + retryMode);
+        }
+    }
+
+    public static Integer defaultMaxAttempts() {
+        return maxAttempts(RetryMode.defaultRetryMode());
+    }
 }
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/sync/FileContentStreamProvider.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/sync/FileContentStreamProvider.java
index a50d82e967ee..69d277960d4c 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/sync/FileContentStreamProvider.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/sync/FileContentStreamProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -20,7 +20,6 @@
 import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
-
 import software.amazon.awssdk.annotations.SdkInternalApi;
 import software.amazon.awssdk.http.ContentStreamProvider;
 
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/transform/AbstractStreamingRequestMarshaller.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/transform/AbstractStreamingRequestMarshaller.java
index 18b6c6216d43..316f5d1c4bfe 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/transform/AbstractStreamingRequestMarshaller.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/transform/AbstractStreamingRequestMarshaller.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/util/CapacityManager.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/util/CapacityManager.java
index d3c3f7877d86..badbf1a8fb9a 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/util/CapacityManager.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/util/CapacityManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/util/ClassLoaderHelper.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/util/ClassLoaderHelper.java
index 91af9ae5fb8e..9c5e3774b30c 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/util/ClassLoaderHelper.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/util/ClassLoaderHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/util/Crc32ChecksumCalculatingInputStream.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/util/Crc32ChecksumCalculatingInputStream.java
index bfadbacbac29..89cc932d943c 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/util/Crc32ChecksumCalculatingInputStream.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/util/Crc32ChecksumCalculatingInputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/util/Crc32ChecksumValidatingInputStream.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/util/Crc32ChecksumValidatingInputStream.java
index ecf5f8098c75..d354bf0e5636 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/util/Crc32ChecksumValidatingInputStream.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/util/Crc32ChecksumValidatingInputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/util/FakeIoException.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/util/FakeIoException.java
index 2506045e6f21..79d10ddf2083 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/util/FakeIoException.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/util/FakeIoException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/util/Mimetype.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/util/Mimetype.java
index fe192d949d98..887e21182aee 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/util/Mimetype.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/util/Mimetype.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/util/NoopSubscription.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/util/NoopSubscription.java
index 860d721db57e..9b378cacda7f 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/util/NoopSubscription.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/util/NoopSubscription.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/util/ThrowableUtils.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/util/ThrowableUtils.java
index dac0d2870a2c..87e7da6672c0 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/util/ThrowableUtils.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/util/ThrowableUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/util/UnreliableFilterInputStream.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/util/UnreliableFilterInputStream.java
index c53e2a65e344..c41876bbfae6 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/util/UnreliableFilterInputStream.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/util/UnreliableFilterInputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/util/UserAgentUtils.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/util/UserAgentUtils.java
index 1eb08e91d49f..30f3e6b7022a 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/util/UserAgentUtils.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/util/UserAgentUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/io/ReleasableInputStream.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/io/ReleasableInputStream.java
index e61acf3efe59..f3967e9f85ad 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/io/ReleasableInputStream.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/io/ReleasableInputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/io/ResettableInputStream.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/io/ResettableInputStream.java
index 83930586786b..eb136b971b16 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/io/ResettableInputStream.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/io/ResettableInputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/io/SdkDigestInputStream.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/io/SdkDigestInputStream.java
index a5bf4d20116e..3347bfab6362 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/io/SdkDigestInputStream.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/io/SdkDigestInputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/io/SdkFilterInputStream.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/io/SdkFilterInputStream.java
index cafb95576954..fa8bec540eb4 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/io/SdkFilterInputStream.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/io/SdkFilterInputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/io/SdkInputStream.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/io/SdkInputStream.java
index f9ea3d8a8f37..0611cc5c6d3d 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/io/SdkInputStream.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/io/SdkInputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/pagination/async/AsyncPageFetcher.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/pagination/async/AsyncPageFetcher.java
index 9d9f92c33327..3f51c7dc9208 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/pagination/async/AsyncPageFetcher.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/pagination/async/AsyncPageFetcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/pagination/async/EmptySubscription.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/pagination/async/EmptySubscription.java
index b97eda9fb6bc..931fa4c6b7c7 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/pagination/async/EmptySubscription.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/pagination/async/EmptySubscription.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/pagination/async/PaginatedItemsPublisher.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/pagination/async/PaginatedItemsPublisher.java
index a3560ef415d8..dea160c65b96 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/pagination/async/PaginatedItemsPublisher.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/pagination/async/PaginatedItemsPublisher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/pagination/async/PaginationSubscription.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/pagination/async/PaginationSubscription.java
index 097eb7be87e1..5e498d2251bf 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/pagination/async/PaginationSubscription.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/pagination/async/PaginationSubscription.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/pagination/async/ResponsesSubscription.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/pagination/async/ResponsesSubscription.java
index ce9742e90a92..329cf949c95a 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/pagination/async/ResponsesSubscription.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/pagination/async/ResponsesSubscription.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/pagination/sync/PaginatedItemsIterable.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/pagination/sync/PaginatedItemsIterable.java
index 0cfbefab524b..49c4928224e0 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/pagination/sync/PaginatedItemsIterable.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/pagination/sync/PaginatedItemsIterable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -34,13 +34,13 @@ public final class PaginatedItemsIterable<ResponseT, ItemT> implements SdkIterab
     private final SdkIterable<ResponseT> pagesIterable;
     private final Function<ResponseT, Iterator<ItemT>> getItemIterator;
 
-    private PaginatedItemsIterable(BuilderImpl builder) {
+    private PaginatedItemsIterable(BuilderImpl<ResponseT, ItemT> builder) {
         this.pagesIterable = builder.pagesIterable;
         this.getItemIterator = builder.itemIteratorFunction;
     }
 
-    public static Builder builder() {
-        return new BuilderImpl();
+    public static <R, T> Builder<R, T> builder() {
+        return new BuilderImpl<>();
     }
 
     @Override
@@ -86,33 +86,36 @@ private boolean hasMoreItems() {
         }
     }
 
-    public interface Builder {
-        Builder pagesIterable(SdkIterable sdkIterable);
+    public interface Builder<ResponseT, ItemT> {
+        Builder<ResponseT, ItemT> pagesIterable(SdkIterable<ResponseT> sdkIterable);
 
-        Builder itemIteratorFunction(Function itemIteratorFunction);
+        Builder<ResponseT, ItemT> itemIteratorFunction(Function<ResponseT, Iterator<ItemT>> itemIteratorFunction);
 
-        PaginatedItemsIterable build();
+        PaginatedItemsIterable<ResponseT, ItemT> build();
     }
 
-    private static final class BuilderImpl implements Builder {
-        private SdkIterable pagesIterable;
-        private Function itemIteratorFunction;
+    private static final class BuilderImpl<ResponseT, ItemT> implements Builder<ResponseT, ItemT> {
+        private SdkIterable<ResponseT> pagesIterable;
+        private Function<ResponseT, Iterator<ItemT>> itemIteratorFunction;
+
+        private BuilderImpl() {
+        }
 
         @Override
-        public Builder pagesIterable(SdkIterable pagesIterable) {
+        public Builder<ResponseT, ItemT> pagesIterable(SdkIterable<ResponseT> pagesIterable) {
             this.pagesIterable = pagesIterable;
             return this;
         }
 
         @Override
-        public Builder itemIteratorFunction(Function itemIteratorFunction) {
+        public Builder<ResponseT, ItemT> itemIteratorFunction(Function<ResponseT, Iterator<ItemT>> itemIteratorFunction) {
             this.itemIteratorFunction = itemIteratorFunction;
             return this;
         }
 
         @Override
-        public PaginatedItemsIterable build() {
-            return new PaginatedItemsIterable(this);
+        public PaginatedItemsIterable<ResponseT, ItemT> build() {
+            return new PaginatedItemsIterable<>(this);
         }
     }
 }
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/pagination/sync/PaginatedResponsesIterator.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/pagination/sync/PaginatedResponsesIterator.java
index 0ced7636d47f..19463ea50037 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/pagination/sync/PaginatedResponsesIterator.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/pagination/sync/PaginatedResponsesIterator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/pagination/sync/SdkIterable.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/pagination/sync/SdkIterable.java
index ad9a481d90fa..2f748a78db6a 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/pagination/sync/SdkIterable.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/pagination/sync/SdkIterable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/pagination/sync/SyncPageFetcher.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/pagination/sync/SyncPageFetcher.java
index b0c3e291dba7..e5bda69227ab 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/pagination/sync/SyncPageFetcher.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/pagination/sync/SyncPageFetcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/protocol/MarshallLocation.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/protocol/MarshallLocation.java
index f992904b8ff2..aa3bbae0b605 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/protocol/MarshallLocation.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/protocol/MarshallLocation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/protocol/MarshallingType.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/protocol/MarshallingType.java
index 727affb4f052..f2bf6a4eabe5 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/protocol/MarshallingType.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/protocol/MarshallingType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/protocol/VoidSdkResponse.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/protocol/VoidSdkResponse.java
index 8d93acf3524c..4773b9443706 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/protocol/VoidSdkResponse.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/protocol/VoidSdkResponse.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/retry/ClockSkew.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/retry/ClockSkew.java
index 889034ebdce4..2c76b5261e78 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/retry/ClockSkew.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/retry/ClockSkew.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -39,7 +39,8 @@ public final class ClockSkew {
      */
     private static final Duration CLOCK_SKEW_ADJUST_THRESHOLD = Duration.ofMinutes(4);
 
-    private ClockSkew() {}
+    private ClockSkew() {
+    }
 
     /**
      * Determine whether the request-level client time was sufficiently skewed from the server time as to possibly cause a
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/retry/RetryMode.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/retry/RetryMode.java
new file mode 100644
index 000000000000..458e777d589c
--- /dev/null
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/retry/RetryMode.java
@@ -0,0 +1,154 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.core.retry;
+
+import java.util.Optional;
+import java.util.function.Supplier;
+import software.amazon.awssdk.annotations.SdkPublicApi;
+import software.amazon.awssdk.core.SdkSystemSetting;
+import software.amazon.awssdk.core.client.config.ClientOverrideConfiguration;
+import software.amazon.awssdk.core.retry.conditions.TokenBucketRetryCondition;
+import software.amazon.awssdk.profiles.ProfileFile;
+import software.amazon.awssdk.profiles.ProfileFileSystemSetting;
+import software.amazon.awssdk.profiles.ProfileProperty;
+import software.amazon.awssdk.utils.OptionalUtils;
+import software.amazon.awssdk.utils.StringUtils;
+
+/**
+ * A retry mode is a collection of retry behaviors encoded under a single value. For example, the {@link #LEGACY} retry mode will
+ * retry up to three times, and the {@link #STANDARD} will retry up to two times.
+ *
+ * <p>
+ * While the {@link #LEGACY} retry mode is specific to Java, the {@link #STANDARD} retry mode is standardized across all of the
+ * AWS SDKs.
+ *
+ * <p>
+ * The retry mode can be configured:
+ * <ol>
+ *     <li>Directly on a client via {@link ClientOverrideConfiguration.Builder#retryPolicy(RetryMode)}.</li>
+ *     <li>Directly on a client via a combination of {@link RetryPolicy#builder(RetryMode)} or
+ *     {@link RetryPolicy#forRetryMode(RetryMode)}, and {@link ClientOverrideConfiguration.Builder#retryPolicy(RetryPolicy)}</li>
+ *     <li>On a configuration profile via the "retry_mode" profile file property.</li>
+ *     <li>Globally via the "aws.retryMode" system property.</li>
+ *     <li>Globally via the "AWS_RETRY_MODE" environment variable.</li>
+ * </ol>
+ */
+@SdkPublicApi
+public enum RetryMode {
+    /**
+     * The LEGACY retry mode, specific to the Java SDK, and characterized by:
+     * <ol>
+     *     <li>Up to 3 retries, or more for services like DynamoDB (which has up to 8).</li>
+     *     <li>Zero token are subtracted from the {@link TokenBucketRetryCondition} when throttling exceptions are encountered.
+     *     </li>
+     * </ol>
+     *
+     * <p>
+     * This is the retry mode that is used when no other mode is configured.
+     */
+    LEGACY,
+
+
+    /**
+     * The STANDARD retry mode, shared by all AWS SDK implementations, and characterized by:
+     * <ol>
+     *     <li>Up to 2 retries, regardless of service.</li>
+     *     <li>Throttling exceptions are treated the same as other exceptions for the purposes of the
+     *     {@link TokenBucketRetryCondition}.</li>
+     * </ol>
+     */
+    STANDARD;
+
+    /**
+     * Retrieve the default retry mode by consulting the locations described in {@link RetryMode}, or LEGACY if no value is
+     * configured.
+     */
+    public static RetryMode defaultRetryMode() {
+        return resolver().resolve();
+    }
+
+    /**
+     * Create a {@link Resolver} that allows customizing the variables used during determination of a {@link RetryMode}.
+     */
+    public static Resolver resolver() {
+        return new Resolver();
+    }
+
+    /**
+     * Allows customizing the variables used during determination of a {@link RetryMode}. Created via {@link #resolver()}.
+     */
+    public static class Resolver {
+        private Supplier<ProfileFile> profileFile;
+        private String profileName;
+
+        private Resolver() {
+        }
+
+        /**
+         * Configure the profile file that should be used when determining the {@link RetryMode}. The supplier is only consulted
+         * if a higher-priority determinant (e.g. environment variables) does not find the setting.
+         */
+        public Resolver profileFile(Supplier<ProfileFile> profileFile) {
+            this.profileFile = profileFile;
+            return this;
+        }
+
+        /**
+         * Configure the profile file name should be used when determining the {@link RetryMode}.
+         */
+        public Resolver profileName(String profileName) {
+            this.profileName = profileName;
+            return this;
+        }
+
+        /**
+         * Resolve which retry mode should be used, based on the configured values.
+         */
+        public RetryMode resolve() {
+            return OptionalUtils.firstPresent(Resolver.fromSystemSettings(), () -> fromProfileFile(profileFile, profileName))
+                                .orElse(RetryMode.LEGACY);
+        }
+
+        private static Optional<RetryMode> fromSystemSettings() {
+            return SdkSystemSetting.AWS_RETRY_MODE.getStringValue()
+                                                  .flatMap(Resolver::fromString);
+        }
+
+        private static Optional<RetryMode> fromProfileFile(Supplier<ProfileFile> profileFile, String profileName) {
+            profileFile = profileFile != null ? profileFile : ProfileFile::defaultProfileFile;
+            profileName = profileName != null ? profileName : ProfileFileSystemSetting.AWS_PROFILE.getStringValueOrThrow();
+            return profileFile.get()
+                              .profile(profileName)
+                              .flatMap(p -> p.property(ProfileProperty.RETRY_MODE))
+                              .flatMap(Resolver::fromString);
+        }
+
+        private static Optional<RetryMode> fromString(String string) {
+            if (string == null || string.isEmpty()) {
+                return Optional.empty();
+            }
+
+            switch (StringUtils.lowerCase(string)) {
+                case "legacy":
+                    return Optional.of(LEGACY);
+                case "standard":
+                    return Optional.of(STANDARD);
+                default:
+                    throw new IllegalStateException("Unsupported retry policy mode configured: " + string);
+            }
+        }
+    }
+}
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/retry/RetryPolicy.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/retry/RetryPolicy.java
index 0f88d4c73fe8..69ec0f783aa7 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/retry/RetryPolicy.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/retry/RetryPolicy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -23,19 +23,19 @@
 import software.amazon.awssdk.core.retry.conditions.AndRetryCondition;
 import software.amazon.awssdk.core.retry.conditions.MaxNumberOfRetriesCondition;
 import software.amazon.awssdk.core.retry.conditions.RetryCondition;
+import software.amazon.awssdk.core.retry.conditions.TokenBucketRetryCondition;
 import software.amazon.awssdk.utils.ToString;
 import software.amazon.awssdk.utils.builder.CopyableBuilder;
 import software.amazon.awssdk.utils.builder.ToCopyableBuilder;
 
 /**
- * Interface for specifying a retry policy to use when evaluating whether or not a request should be retried. An implementation
- * of this interface can be provided to {@link ClientOverrideConfiguration#retryPolicy} or the {@link #builder()}} can be used
- * to construct a retry policy from SDK provided policies or policies that directly implement {@link BackoffStrategy} and/or
- * {@link RetryCondition}.
+ * Interface for specifying a retry policy to use when evaluating whether or not a request should be retried. The
+ * {@link #builder()}} can be used to construct a retry policy from SDK provided policies or policies that directly implement
+ * {@link BackoffStrategy} and/or {@link RetryCondition}. This is configured on a client via
+ * {@link ClientOverrideConfiguration.Builder#retryPolicy}.
  *
  * When using the {@link #builder()} the SDK will use default values for fields that are not provided. The default number of
- * retries that will be used is {@link SdkDefaultRetrySetting#DEFAULT_MAX_RETRIES}. The default retry condition is
- * {@link RetryCondition#defaultRetryCondition()} and the default backoff strategy is {@link BackoffStrategy#defaultStrategy()}.
+ * retries and condition is based on the current {@link RetryMode}.
  *
  * @see RetryCondition for a list of SDK provided retry condition strategies
  * @see BackoffStrategy for a list of SDK provided backoff strategies
@@ -43,50 +43,143 @@
 @Immutable
 @SdkPublicApi
 public final class RetryPolicy implements ToCopyableBuilder<RetryPolicy.Builder, RetryPolicy> {
-
-    private final RetryCondition retryConditionFromBuilder;
-    private final RetryCondition retryCondition;
+    private final boolean additionalRetryConditionsAllowed;
+    private final RetryMode retryMode;
     private final BackoffStrategy backoffStrategy;
     private final BackoffStrategy throttlingBackoffStrategy;
     private final Integer numRetries;
+    private final RetryCondition retryCondition;
+    private final RetryCondition retryCapacityCondition;
+
+    private final RetryCondition aggregateRetryCondition;
 
     private RetryPolicy(BuilderImpl builder) {
+        this.additionalRetryConditionsAllowed = builder.additionalRetryConditionsAllowed;
+        this.retryMode = builder.retryMode;
         this.backoffStrategy = builder.backoffStrategy;
         this.throttlingBackoffStrategy = builder.throttlingBackoffStrategy;
         this.numRetries = builder.numRetries;
-        this.retryConditionFromBuilder = builder.retryCondition;
-        this.retryCondition = AndRetryCondition.create(MaxNumberOfRetriesCondition.create(numRetries),
-                                                       retryConditionFromBuilder);
+        this.retryCondition = builder.retryCondition;
+        this.retryCapacityCondition = builder.retryCapacityCondition;
+
+        this.aggregateRetryCondition = generateAggregateRetryCondition();
+    }
+
+    /**
+     * Create a {@link RetryPolicy} using the {@link RetryMode#defaultRetryMode()} defaults.
+     */
+    public static RetryPolicy defaultRetryPolicy() {
+        return forRetryMode(RetryMode.defaultRetryMode());
+    }
+
+    /**
+     * Create a {@link RetryPolicy} using the provided {@link RetryMode} defaults.
+     */
+    public static RetryPolicy forRetryMode(RetryMode retryMode) {
+        return RetryPolicy.builder(retryMode).build();
+    }
+
+    /**
+     * Create a {@link RetryPolicy} that will NEVER retry.
+     */
+    public static RetryPolicy none() {
+        return RetryPolicy.builder()
+                          .numRetries(0)
+                          .backoffStrategy(BackoffStrategy.none())
+                          .throttlingBackoffStrategy(BackoffStrategy.none())
+                          .retryCondition(RetryCondition.none())
+                          .additionalRetryConditionsAllowed(false)
+                          .build();
     }
 
+    /**
+     * Create a {@link RetryPolicy.Builder} populated with the defaults from the {@link RetryMode#defaultRetryMode()}.
+     */
+    public static Builder builder() {
+        return new BuilderImpl(RetryMode.defaultRetryMode());
+    }
+
+    /**
+     * Create a {@link RetryPolicy.Builder} populated with the defaults from the provided {@link RetryMode}.
+     */
+    public static Builder builder(RetryMode retryMode) {
+        return new BuilderImpl(retryMode);
+    }
+
+    /**
+     * Retrieve the {@link RetryMode} that was used to determine the defaults for this retry policy.
+     */
+    public RetryMode retryMode() {
+        return retryMode;
+    }
+
+    /**
+     * Returns true if service-specific conditions are allowed on this policy (e.g. more conditions may be added by the SDK if
+     * they are recommended).
+     */
+    public boolean additionalRetryConditionsAllowed() {
+        return additionalRetryConditionsAllowed;
+    }
+
+    /**
+     * Retrieve the retry condition that aggregates the {@link Builder#retryCondition(RetryCondition)},
+     * {@link Builder#numRetries(Integer)} and {@link Builder#retryCapacityCondition(RetryCondition)} configured on the builder.
+     */
+    public RetryCondition aggregateRetryCondition() {
+        return aggregateRetryCondition;
+    }
+
+    /**
+     * Retrieve the {@link Builder#retryCondition(RetryCondition)} configured on the builder.
+     */
     public RetryCondition retryCondition() {
         return retryCondition;
     }
 
+    /**
+     * Retrieve the {@link Builder#backoffStrategy(BackoffStrategy)} configured on the builder.
+     */
     public BackoffStrategy backoffStrategy() {
         return backoffStrategy;
     }
 
+    /**
+     * Retrieve the {@link Builder#throttlingBackoffStrategy(BackoffStrategy)} configured on the builder.
+     */
     public BackoffStrategy throttlingBackoffStrategy() {
         return throttlingBackoffStrategy;
     }
 
+    /**
+     * Retrieve the {@link Builder#numRetries(Integer)} configured on the builder.
+     */
     public Integer numRetries() {
         return numRetries;
     }
 
+    private RetryCondition generateAggregateRetryCondition() {
+        RetryCondition aggregate = AndRetryCondition.create(MaxNumberOfRetriesCondition.create(numRetries),
+                                                            retryCondition);
+        if (retryCapacityCondition != null) {
+            return AndRetryCondition.create(aggregate, retryCapacityCondition);
+        }
+        return aggregate;
+    }
+
     public Builder toBuilder() {
-        return builder().numRetries(numRetries)
-                        .retryCondition(retryConditionFromBuilder)
-                        .backoffStrategy(backoffStrategy)
-                        .throttlingBackoffStrategy(throttlingBackoffStrategy);
+        return builder(retryMode).additionalRetryConditionsAllowed(additionalRetryConditionsAllowed)
+                                 .numRetries(numRetries)
+                                 .retryCondition(retryCondition)
+                                 .backoffStrategy(backoffStrategy)
+                                 .throttlingBackoffStrategy(throttlingBackoffStrategy)
+                                 .retryCapacityCondition(retryCapacityCondition);
     }
 
     @Override
     public String toString() {
         return ToString.builder("RetryPolicy")
-                       .add("numRetries", numRetries)
-                       .add("retryCondition", retryCondition)
+                       .add("additionalRetryConditionsAllowed", additionalRetryConditionsAllowed)
+                       .add("aggregateRetryCondition", aggregateRetryCondition)
                        .add("backoffStrategy", backoffStrategy)
                        .add("throttlingBackoffStrategy", throttlingBackoffStrategy)
                        .build();
@@ -103,7 +196,10 @@ public boolean equals(Object o) {
 
         RetryPolicy that = (RetryPolicy) o;
 
-        if (!retryCondition.equals(that.retryCondition)) {
+        if (additionalRetryConditionsAllowed != that.additionalRetryConditionsAllowed) {
+            return false;
+        }
+        if (!aggregateRetryCondition.equals(that.aggregateRetryCondition)) {
             return false;
         }
         if (!backoffStrategy.equals(that.backoffStrategy)) {
@@ -112,57 +208,103 @@ public boolean equals(Object o) {
         if (!throttlingBackoffStrategy.equals(that.throttlingBackoffStrategy)) {
             return false;
         }
-        return numRetries.equals(that.numRetries);
+        return true;
     }
 
     @Override
     public int hashCode() {
-        int result = retryCondition.hashCode();
+        int result = aggregateRetryCondition.hashCode();
+        result = 31 * result + Boolean.hashCode(additionalRetryConditionsAllowed);
         result = 31 * result + backoffStrategy.hashCode();
         result = 31 * result + throttlingBackoffStrategy.hashCode();
-        result = 31 * result + numRetries.hashCode();
         return result;
     }
 
-    public static Builder builder() {
-        return new BuilderImpl();
-    }
-
-    public static RetryPolicy defaultRetryPolicy() {
-        return RetryPolicy.builder()
-                          .backoffStrategy(BackoffStrategy.defaultStrategy())
-                          .throttlingBackoffStrategy(BackoffStrategy.defaultThrottlingStrategy())
-                          .numRetries(SdkDefaultRetrySetting.DEFAULT_MAX_RETRIES)
-                          .retryCondition(RetryCondition.defaultRetryCondition())
-                          .build();
-    }
-
-    public static RetryPolicy none() {
-        return RetryPolicy.builder()
-                          .numRetries(0)
-                          .backoffStrategy(BackoffStrategy.none())
-                          .throttlingBackoffStrategy(BackoffStrategy.none())
-                          .retryCondition(RetryCondition.none())
-                          .build();
-    }
-
     public interface Builder extends CopyableBuilder<Builder, RetryPolicy> {
-        Builder numRetries(Integer numRetries);
-
-        Integer numRetries();
-
+        /**
+         * Configure whether further conditions can be added to this policy after it is created. This may include service-
+         * specific retry conditions that may not otherwise be covered by the {@link RetryCondition#defaultRetryCondition()}.
+         *
+         * <p>
+         * By default, this is true.
+         */
+        Builder additionalRetryConditionsAllowed(boolean additionalRetryConditionsAllowed);
+
+        /**
+         * @see #additionalRetryConditionsAllowed(boolean)
+         */
+        boolean additionalRetryConditionsAllowed();
+
+        /**
+         * Configure the backoff strategy that should be used for waiting in between retry attempts. If the retry is because of
+         * throttling reasons, the {@link #throttlingBackoffStrategy(BackoffStrategy)} is used instead.
+         */
         Builder backoffStrategy(BackoffStrategy backoffStrategy);
 
+        /**
+         * @see #backoffStrategy(BackoffStrategy)
+         */
         BackoffStrategy backoffStrategy();
 
+        /**
+         * Configure the backoff strategy that should be used for waiting in between retry attempts after a throttling error
+         * is encountered. If the retry is not because of throttling reasons, the {@link #backoffStrategy(BackoffStrategy)} is
+         * used instead.
+         */
         Builder throttlingBackoffStrategy(BackoffStrategy backoffStrategy);
 
+        /**
+         * @see #throttlingBackoffStrategy(BackoffStrategy)
+         */
         BackoffStrategy throttlingBackoffStrategy();
 
+        /**
+         * Configure the condition under which the request should be retried.
+         *
+         * <p>
+         * While this can be any interface that implements {@link RetryCondition}, it is encouraged to use
+         * {@link #numRetries(Integer)} when attempting to limit the number of times the SDK will retry an attempt or the
+         * {@link #retryCapacityCondition(RetryCondition)} when attempting to configure the throttling of retries. This guidance
+         * is because the SDK uses the {@link #aggregateRetryCondition()} when determining whether or not to retry a request,
+         * and the {@code aggregateRetryCondition} includes the {@code numRetries} and {@code retryCapacityCondition} in its
+         * determination.
+         */
         Builder retryCondition(RetryCondition retryCondition);
 
+        /**
+         * @see #retryCondition(RetryCondition)
+         */
         RetryCondition retryCondition();
 
+        /**
+         * Configure the {@link RetryCondition} that should be used to throttle the number of retries attempted by the SDK client
+         * as a whole.
+         *
+         * <p>
+         * While any {@link RetryCondition} (or null) can be used, by convention these conditions are usually stateful and work
+         * globally for the whole client to limit the overall capacity of the client to execute retries.
+         *
+         * <p>
+         * By default the {@link TokenBucketRetryCondition} is used. This can be disabled by setting the value to {@code null}
+         * (not {@code RetryPolicy#none()}, which would completely disable retries).
+         */
+        Builder retryCapacityCondition(RetryCondition retryCapacityCondition);
+
+        /**
+         * @see #retryCapacityCondition(RetryCondition)
+         */
+        RetryCondition retryCapacityCondition();
+
+        /**
+         * Configure the maximum number of times that a single request should be retried, assuming it fails for a retryable error.
+         */
+        Builder numRetries(Integer numRetries);
+
+        /**
+         * @see #numRetries(Integer)
+         */
+        Integer numRetries();
+        
         RetryPolicy build();
     }
 
@@ -170,13 +312,38 @@ public interface Builder extends CopyableBuilder<Builder, RetryPolicy> {
      * Builder for a {@link RetryPolicy}.
      */
     private static final class BuilderImpl implements Builder {
+        private final RetryMode retryMode;
+
+        private boolean additionalRetryConditionsAllowed;
+        private Integer numRetries;
+        private BackoffStrategy backoffStrategy;
+        private BackoffStrategy throttlingBackoffStrategy;
+        private RetryCondition retryCondition;
+        private RetryCondition retryCapacityCondition;
+
+        private BuilderImpl(RetryMode retryMode) {
+            this.retryMode = retryMode;
+            this.numRetries = SdkDefaultRetrySetting.maxAttempts(retryMode) - 1;
+            this.additionalRetryConditionsAllowed = true;
+            this.backoffStrategy = BackoffStrategy.defaultStrategy();
+            this.throttlingBackoffStrategy = BackoffStrategy.defaultThrottlingStrategy();
+            this.retryCondition = RetryCondition.defaultRetryCondition();
+            this.retryCapacityCondition = TokenBucketRetryCondition.forRetryMode(retryMode);
+        }
+
+        @Override
+        public Builder additionalRetryConditionsAllowed(boolean additionalRetryConditionsAllowed) {
+            this.additionalRetryConditionsAllowed = additionalRetryConditionsAllowed;
+            return this;
+        }
 
-        private Integer numRetries = SdkDefaultRetrySetting.DEFAULT_MAX_RETRIES;
-        private BackoffStrategy backoffStrategy = BackoffStrategy.defaultStrategy();
-        private BackoffStrategy throttlingBackoffStrategy = BackoffStrategy.defaultThrottlingStrategy();
-        private RetryCondition retryCondition = RetryCondition.defaultRetryCondition();
+        public void setadditionalRetryConditionsAllowed(boolean additionalRetryConditionsAllowed) {
+            additionalRetryConditionsAllowed(additionalRetryConditionsAllowed);
+        }
 
-        private BuilderImpl(){
+        @Override
+        public boolean additionalRetryConditionsAllowed() {
+            return additionalRetryConditionsAllowed;
         }
 
         @Override
@@ -239,6 +406,21 @@ public RetryCondition retryCondition() {
             return retryCondition;
         }
 
+        @Override
+        public Builder retryCapacityCondition(RetryCondition retryCapacityCondition) {
+            this.retryCapacityCondition = retryCapacityCondition;
+            return this;
+        }
+
+        public void setRetryCapacityCondition(RetryCondition retryCapacityCondition) {
+            retryCapacityCondition(retryCapacityCondition);
+        }
+
+        @Override
+        public RetryCondition retryCapacityCondition() {
+            return this.retryCapacityCondition;
+        }
+
         @Override
         public RetryPolicy build() {
             return new RetryPolicy(this);
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/retry/RetryPolicyContext.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/retry/RetryPolicyContext.java
index 2799aaa66889..2d812fa839c1 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/retry/RetryPolicyContext.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/retry/RetryPolicyContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -16,7 +16,6 @@
 package software.amazon.awssdk.core.retry;
 
 import software.amazon.awssdk.annotations.Immutable;
-import software.amazon.awssdk.annotations.SdkInternalApi;
 import software.amazon.awssdk.annotations.SdkPublicApi;
 import software.amazon.awssdk.core.SdkRequest;
 import software.amazon.awssdk.core.exception.SdkException;
@@ -49,7 +48,6 @@ private RetryPolicyContext(Builder builder) {
         this.httpStatusCode = builder.httpStatusCode;
     }
 
-    @SdkInternalApi
     public static Builder builder() {
         return new Builder();
     }
@@ -93,7 +91,7 @@ public int retriesAttempted() {
      * @return The total number of requests made thus far.
      */
     public int totalRequests() {
-        return retriesAttempted() + 1;
+        return this.retriesAttempted + 1;
     }
 
     /**
@@ -108,9 +106,8 @@ public Builder toBuilder() {
         return new Builder(this);
     }
 
-    @SdkInternalApi
+    @SdkPublicApi
     public static final class Builder implements CopyableBuilder<Builder, RetryPolicyContext> {
-
         private SdkRequest originalRequest;
         private SdkHttpFullRequest request;
         private SdkException exception;
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/retry/RetryUtils.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/retry/RetryUtils.java
index e81660169699..8e6d7cf2a422 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/retry/RetryUtils.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/retry/RetryUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/retry/backoff/BackoffStrategy.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/retry/backoff/BackoffStrategy.java
index 0d5bc2ac7475..790a9bfef51a 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/retry/backoff/BackoffStrategy.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/retry/backoff/BackoffStrategy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -24,6 +24,12 @@
 @FunctionalInterface
 public interface BackoffStrategy {
 
+    /**
+     * Max permitted retry times. To prevent exponentialDelay from overflow, there must be 2 ^ retriesAttempted
+     * <= 2 ^ 31 - 1, which means retriesAttempted <= 30, so that is the ceil for retriesAttempted.
+     */
+    int RETRIES_ATTEMPTED_CEILING = (int) Math.floor(Math.log(Integer.MAX_VALUE) / Math.log(2));
+
     /**
      * Compute the delay before the next retry request. This strategy is only consulted when there will be a next retry.
      *
@@ -33,7 +39,8 @@ public interface BackoffStrategy {
     Duration computeDelayBeforeNextRetry(RetryPolicyContext context);
 
     default int calculateExponentialDelay(int retriesAttempted, Duration baseDelay, Duration maxBackoffTime) {
-        return (int) Math.min((1L << retriesAttempted) * baseDelay.toMillis(), maxBackoffTime.toMillis());
+        int cappedRetries = Math.min(retriesAttempted, RETRIES_ATTEMPTED_CEILING);
+        return (int) Math.min(baseDelay.multipliedBy(1L << cappedRetries).toMillis(), maxBackoffTime.toMillis());
     }
 
     static BackoffStrategy defaultStrategy() {
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/retry/backoff/EqualJitterBackoffStrategy.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/retry/backoff/EqualJitterBackoffStrategy.java
index c6ea0468fb98..8da04dd9ec64 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/retry/backoff/EqualJitterBackoffStrategy.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/retry/backoff/EqualJitterBackoffStrategy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -15,6 +15,7 @@
 
 package software.amazon.awssdk.core.retry.backoff;
 
+import static software.amazon.awssdk.utils.NumericUtils.min;
 import static software.amazon.awssdk.utils.Validate.isNotNegative;
 
 import java.time.Duration;
@@ -44,13 +45,21 @@ public final class EqualJitterBackoffStrategy implements BackoffStrategy,
                                                          ToCopyableBuilder<EqualJitterBackoffStrategy.Builder,
                                                              EqualJitterBackoffStrategy> {
 
+    private static final Duration BASE_DELAY_CEILING = Duration.ofMillis(Integer.MAX_VALUE); // Around 24 days
+    private static final Duration MAX_BACKOFF_CEILING = Duration.ofMillis(Integer.MAX_VALUE); // Around 24 days
+
     private final Duration baseDelay;
     private final Duration maxBackoffTime;
-    private final Random random = new Random();
+    private final Random random;
 
     private EqualJitterBackoffStrategy(BuilderImpl builder) {
-        this.baseDelay = isNotNegative(builder.baseDelay, "baseDelay");
-        this.maxBackoffTime = isNotNegative(builder.maxBackoffTime, "maxBackoffTime");
+        this(builder.baseDelay, builder.maxBackoffTime, new Random());
+    }
+
+    EqualJitterBackoffStrategy(final Duration baseDelay, final Duration maxBackoffTime, final Random random) {
+        this.baseDelay = min(isNotNegative(baseDelay, "baseDelay"), BASE_DELAY_CEILING);
+        this.maxBackoffTime = min(isNotNegative(maxBackoffTime, "maxBackoffTime"), MAX_BACKOFF_CEILING);
+        this.random = random;
     }
 
     @Override
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/retry/backoff/FixedDelayBackoffStrategy.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/retry/backoff/FixedDelayBackoffStrategy.java
index 201cac86a70b..24003c5f4bac 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/retry/backoff/FixedDelayBackoffStrategy.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/retry/backoff/FixedDelayBackoffStrategy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/retry/backoff/FullJitterBackoffStrategy.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/retry/backoff/FullJitterBackoffStrategy.java
index 3d7c870d2cc6..0c71534f4aca 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/retry/backoff/FullJitterBackoffStrategy.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/retry/backoff/FullJitterBackoffStrategy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -15,6 +15,7 @@
 
 package software.amazon.awssdk.core.retry.backoff;
 
+import static software.amazon.awssdk.utils.NumericUtils.min;
 import static software.amazon.awssdk.utils.Validate.isNotNegative;
 
 import java.time.Duration;
@@ -40,14 +41,21 @@
 public final class FullJitterBackoffStrategy implements BackoffStrategy,
                                                         ToCopyableBuilder<FullJitterBackoffStrategy.Builder,
                                                             FullJitterBackoffStrategy> {
+    private static final Duration BASE_DELAY_CEILING = Duration.ofMillis(Integer.MAX_VALUE); // Around 24 days
+    private static final Duration MAX_BACKOFF_CEILING = Duration.ofMillis(Integer.MAX_VALUE); // Around 24 days
 
     private final Duration baseDelay;
     private final Duration maxBackoffTime;
-    private final Random random = new Random();
+    private final Random random;
 
     private FullJitterBackoffStrategy(BuilderImpl builder) {
-        this.baseDelay = isNotNegative(builder.baseDelay, "baseDelay");
-        this.maxBackoffTime = isNotNegative(builder.maxBackoffTime, "maxBackoffTime");
+        this(builder.baseDelay, builder.maxBackoffTime, new Random());
+    }
+
+    FullJitterBackoffStrategy(final Duration baseDelay, final Duration maxBackoffTime, final Random random) {
+        this.baseDelay = min(isNotNegative(baseDelay, "baseDelay"), BASE_DELAY_CEILING);
+        this.maxBackoffTime = min(isNotNegative(maxBackoffTime, "maxBackoffTime"), MAX_BACKOFF_CEILING);
+        this.random = random;
     }
 
     @Override
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/retry/conditions/AndRetryCondition.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/retry/conditions/AndRetryCondition.java
index 337e45fcdd13..5ff9a9cad9c0 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/retry/conditions/AndRetryCondition.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/retry/conditions/AndRetryCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -16,7 +16,7 @@
 package software.amazon.awssdk.core.retry.conditions;
 
 import java.util.Collections;
-import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.Set;
 import software.amazon.awssdk.annotations.SdkPublicApi;
 import software.amazon.awssdk.core.retry.RetryPolicyContext;
@@ -29,12 +29,16 @@
 @SdkPublicApi
 public final class AndRetryCondition implements RetryCondition {
 
-    private Set<RetryCondition> conditions = new HashSet<>();
+    private final Set<RetryCondition> conditions = new LinkedHashSet<>();
 
     private AndRetryCondition(RetryCondition... conditions) {
         Collections.addAll(this.conditions, Validate.notEmpty(conditions, "%s cannot be empty.", "conditions"));
     }
 
+    public static AndRetryCondition create(RetryCondition... conditions) {
+        return new AndRetryCondition(conditions);
+    }
+
     /**
      * @return True if all conditions are true, false otherwise.
      */
@@ -43,8 +47,14 @@ public boolean shouldRetry(RetryPolicyContext context) {
         return conditions.stream().allMatch(r -> r.shouldRetry(context));
     }
 
-    public static AndRetryCondition create(RetryCondition... conditions) {
-        return new AndRetryCondition(conditions);
+    @Override
+    public void requestWillNotBeRetried(RetryPolicyContext context) {
+        conditions.forEach(c -> c.requestWillNotBeRetried(context));
+    }
+
+    @Override
+    public void requestSucceeded(RetryPolicyContext context) {
+        conditions.forEach(c -> c.requestSucceeded(context));
     }
 
     @Override
@@ -58,12 +68,12 @@ public boolean equals(Object o) {
 
         AndRetryCondition that = (AndRetryCondition) o;
 
-        return conditions != null ? conditions.equals(that.conditions) : that.conditions == null;
+        return conditions.equals(that.conditions);
     }
 
     @Override
     public int hashCode() {
-        return conditions != null ? conditions.hashCode() : 0;
+        return conditions.hashCode();
     }
 
     @Override
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/retry/conditions/MaxNumberOfRetriesCondition.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/retry/conditions/MaxNumberOfRetriesCondition.java
index 6034e20f846e..3ee23869e32b 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/retry/conditions/MaxNumberOfRetriesCondition.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/retry/conditions/MaxNumberOfRetriesCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -16,6 +16,8 @@
 package software.amazon.awssdk.core.retry.conditions;
 
 import software.amazon.awssdk.annotations.SdkPublicApi;
+import software.amazon.awssdk.core.internal.retry.SdkDefaultRetrySetting;
+import software.amazon.awssdk.core.retry.RetryMode;
 import software.amazon.awssdk.core.retry.RetryPolicyContext;
 import software.amazon.awssdk.utils.ToString;
 import software.amazon.awssdk.utils.Validate;
@@ -32,15 +34,19 @@ private MaxNumberOfRetriesCondition(int maxNumberOfRetries) {
         this.maxNumberOfRetries = Validate.isNotNegative(maxNumberOfRetries, "maxNumberOfRetries");
     }
 
+    public static MaxNumberOfRetriesCondition create(int maxNumberOfRetries) {
+        return new MaxNumberOfRetriesCondition(maxNumberOfRetries);
+    }
+
+    public static MaxNumberOfRetriesCondition forRetryMode(RetryMode retryMode) {
+        return create(SdkDefaultRetrySetting.maxAttempts(retryMode));
+    }
+
     @Override
     public boolean shouldRetry(RetryPolicyContext context) {
         return context.retriesAttempted() < maxNumberOfRetries;
     }
 
-    public static MaxNumberOfRetriesCondition create(int maxNumberOfRetries) {
-        return new MaxNumberOfRetriesCondition(maxNumberOfRetries);
-    }
-
     @Override
     public boolean equals(Object o) {
         if (this == o) {
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/retry/conditions/OrRetryCondition.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/retry/conditions/OrRetryCondition.java
index 01287378b1e9..675ff3e4ab2b 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/retry/conditions/OrRetryCondition.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/retry/conditions/OrRetryCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -16,7 +16,7 @@
 package software.amazon.awssdk.core.retry.conditions;
 
 import java.util.Collections;
-import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.Set;
 import software.amazon.awssdk.annotations.SdkPublicApi;
 import software.amazon.awssdk.core.retry.RetryPolicyContext;
@@ -28,12 +28,16 @@
 @SdkPublicApi
 public final class OrRetryCondition implements RetryCondition {
 
-    private Set<RetryCondition> conditions = new HashSet<>();
+    private final Set<RetryCondition> conditions = new LinkedHashSet<>();
 
     private OrRetryCondition(RetryCondition... conditions) {
         Collections.addAll(this.conditions, conditions);
     }
 
+    public static OrRetryCondition create(RetryCondition... conditions) {
+        return new OrRetryCondition(conditions);
+    }
+
     /**
      * @return True if any condition returns true. False otherwise.
      */
@@ -42,8 +46,14 @@ public boolean shouldRetry(RetryPolicyContext context) {
         return conditions.stream().anyMatch(r -> r.shouldRetry(context));
     }
 
-    public static OrRetryCondition create(RetryCondition... conditions) {
-        return new OrRetryCondition(conditions);
+    @Override
+    public void requestWillNotBeRetried(RetryPolicyContext context) {
+        conditions.forEach(c -> c.requestWillNotBeRetried(context));
+    }
+
+    @Override
+    public void requestSucceeded(RetryPolicyContext context) {
+        conditions.forEach(c -> c.requestSucceeded(context));
     }
 
     @Override
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/retry/conditions/RetryCondition.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/retry/conditions/RetryCondition.java
index d1f19af604ac..3ec8dce22edc 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/retry/conditions/RetryCondition.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/retry/conditions/RetryCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -18,12 +18,10 @@
 import software.amazon.awssdk.annotations.SdkPublicApi;
 import software.amazon.awssdk.core.internal.retry.SdkDefaultRetrySetting;
 import software.amazon.awssdk.core.retry.RetryPolicyContext;
-import software.amazon.awssdk.core.retry.RetryUtils;
 
 @SdkPublicApi
 @FunctionalInterface
 public interface RetryCondition {
-
     /**
      * Determine whether a request should or should not be retried.
      *
@@ -32,14 +30,31 @@ public interface RetryCondition {
      */
     boolean shouldRetry(RetryPolicyContext context);
 
+    /**
+     * Called by the SDK to notify this condition that the provided request will not be retried, because some retry condition
+     * determined that it shouldn't be retried.
+     */
+    default void requestWillNotBeRetried(RetryPolicyContext context) {
+    }
+
+    /**
+     * Called by the SDK to notify this condition that the provided request succeeded. This method is invoked even if the
+     * execution never failed before ({@link RetryPolicyContext#retriesAttempted()} is zero).
+     */
+    default void requestSucceeded(RetryPolicyContext context) {
+    }
+
     static RetryCondition defaultRetryCondition() {
         return OrRetryCondition.create(
             RetryOnStatusCodeCondition.create(SdkDefaultRetrySetting.RETRYABLE_STATUS_CODES),
             RetryOnExceptionsCondition.create(SdkDefaultRetrySetting.RETRYABLE_EXCEPTIONS),
-            c -> RetryUtils.isClockSkewException(c.exception()),
-            c -> RetryUtils.isThrottlingException(c.exception()));
+            RetryOnClockSkewCondition.create(),
+            RetryOnThrottlingCondition.create());
     }
 
+    /**
+     * A retry condition that will NEVER allow retries.
+     */
     static RetryCondition none() {
         return MaxNumberOfRetriesCondition.create(0);
     }
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/retry/conditions/RetryOnClockSkewCondition.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/retry/conditions/RetryOnClockSkewCondition.java
new file mode 100644
index 000000000000..ef9ff902155a
--- /dev/null
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/retry/conditions/RetryOnClockSkewCondition.java
@@ -0,0 +1,59 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.core.retry.conditions;
+
+import software.amazon.awssdk.annotations.SdkPublicApi;
+import software.amazon.awssdk.core.retry.RetryPolicyContext;
+import software.amazon.awssdk.core.retry.RetryUtils;
+import software.amazon.awssdk.utils.ToString;
+
+/**
+ * A {@link RetryCondition} that will return true if the provided exception seems to be due to a clock skew between the
+ * client and service.
+ */
+@SdkPublicApi
+public final class RetryOnClockSkewCondition implements RetryCondition {
+    private RetryOnClockSkewCondition() {
+    }
+
+    public static RetryOnClockSkewCondition create() {
+        return new RetryOnClockSkewCondition();
+    }
+
+    @Override
+    public boolean shouldRetry(RetryPolicyContext context) {
+        return RetryUtils.isClockSkewException(context.exception());
+    }
+
+    @Override
+    public String toString() {
+        return ToString.create("RetryOnClockSkewCondition");
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+
+        return o != null && getClass() == o.getClass();
+    }
+
+    @Override
+    public int hashCode() {
+        return 0;
+    }
+}
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/retry/conditions/RetryOnExceptionsCondition.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/retry/conditions/RetryOnExceptionsCondition.java
index 2cce5ba833c2..ab143731c931 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/retry/conditions/RetryOnExceptionsCondition.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/retry/conditions/RetryOnExceptionsCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/retry/conditions/RetryOnStatusCodeCondition.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/retry/conditions/RetryOnStatusCodeCondition.java
index b96bc8862e32..ee967992feac 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/retry/conditions/RetryOnStatusCodeCondition.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/retry/conditions/RetryOnStatusCodeCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/retry/conditions/RetryOnThrottlingCondition.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/retry/conditions/RetryOnThrottlingCondition.java
new file mode 100644
index 000000000000..ba3ada2d1816
--- /dev/null
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/retry/conditions/RetryOnThrottlingCondition.java
@@ -0,0 +1,59 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.core.retry.conditions;
+
+import software.amazon.awssdk.annotations.SdkPublicApi;
+import software.amazon.awssdk.core.retry.RetryPolicyContext;
+import software.amazon.awssdk.core.retry.RetryUtils;
+import software.amazon.awssdk.utils.ToString;
+
+/**
+ * A {@link RetryCondition} that will return true if the provided exception seems to be due to a throttling error from the
+ * service to the client.
+ */
+@SdkPublicApi
+public final class RetryOnThrottlingCondition implements RetryCondition {
+    private RetryOnThrottlingCondition() {
+    }
+
+    public static RetryOnThrottlingCondition create() {
+        return new RetryOnThrottlingCondition();
+    }
+
+    @Override
+    public boolean shouldRetry(RetryPolicyContext context) {
+        return RetryUtils.isThrottlingException(context.exception());
+    }
+
+    @Override
+    public String toString() {
+        return ToString.create("RetryOnThrottlingCondition");
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+
+        return o != null && getClass() == o.getClass();
+    }
+
+    @Override
+    public int hashCode() {
+        return 0;
+    }
+}
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/retry/conditions/SdkRetryCondition.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/retry/conditions/SdkRetryCondition.java
index 3e3f58e87b78..4efbb0f2326a 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/retry/conditions/SdkRetryCondition.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/retry/conditions/SdkRetryCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/retry/conditions/TokenBucketExceptionCostFunction.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/retry/conditions/TokenBucketExceptionCostFunction.java
new file mode 100644
index 000000000000..5f09f38f42d0
--- /dev/null
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/retry/conditions/TokenBucketExceptionCostFunction.java
@@ -0,0 +1,63 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.core.retry.conditions;
+
+import java.util.function.Function;
+import software.amazon.awssdk.annotations.NotThreadSafe;
+import software.amazon.awssdk.annotations.SdkPublicApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.core.exception.SdkException;
+import software.amazon.awssdk.core.internal.retry.DefaultTokenBucketExceptionCostFunction;
+
+/**
+ * A function used by {@link TokenBucketRetryCondition} to determine how many tokens should be removed from the bucket when an
+ * exception is encountered. This can be implemented directly, or using the helper methods provided by the {@link #builder()}.
+ */
+@SdkPublicApi
+@FunctionalInterface
+@ThreadSafe
+public interface TokenBucketExceptionCostFunction extends Function<SdkException, Integer> {
+    /**
+     * Create an exception cost function using exception type matchers built into the SDK. This interface may be implemented
+     * directly, or created via a builder.
+     */
+    static Builder builder() {
+        return new DefaultTokenBucketExceptionCostFunction.Builder();
+    }
+
+    /**
+     * A helper that can be used to assign exception costs to specific exception types, created via {@link #builder()}.
+     */
+    @NotThreadSafe
+    interface Builder {
+        /**
+         * Specify the number of tokens that should be removed from the token bucket when throttling exceptions (e.g. HTTP status
+         * code 429) are encountered.
+         */
+        Builder throttlingExceptionCost(int cost);
+
+        /**
+         * Specify the number of tokens that should be removed from the token bucket when no other exception type in this
+         * function is matched. This field is required.
+         */
+        Builder defaultExceptionCost(int cost);
+
+        /**
+         * Create a {@link TokenBucketExceptionCostFunction} using the values configured on this builder.
+         */
+        TokenBucketExceptionCostFunction build();
+    }
+}
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/retry/conditions/TokenBucketRetryCondition.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/retry/conditions/TokenBucketRetryCondition.java
new file mode 100644
index 000000000000..7fd84f0672ef
--- /dev/null
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/retry/conditions/TokenBucketRetryCondition.java
@@ -0,0 +1,277 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.core.retry.conditions;
+
+import static software.amazon.awssdk.core.internal.retry.SdkDefaultRetrySetting.TOKEN_BUCKET_SIZE;
+
+import java.util.Optional;
+import software.amazon.awssdk.annotations.SdkPublicApi;
+import software.amazon.awssdk.core.interceptor.ExecutionAttribute;
+import software.amazon.awssdk.core.interceptor.ExecutionAttributes;
+import software.amazon.awssdk.core.internal.capacity.TokenBucket;
+import software.amazon.awssdk.core.internal.retry.SdkDefaultRetrySetting;
+import software.amazon.awssdk.core.retry.RetryMode;
+import software.amazon.awssdk.core.retry.RetryPolicy;
+import software.amazon.awssdk.core.retry.RetryPolicyContext;
+import software.amazon.awssdk.utils.ToString;
+import software.amazon.awssdk.utils.Validate;
+
+/**
+ * A {@link RetryCondition} that limits the number of retries made by the SDK using a token bucket algorithm. "Tokens" are
+ * acquired from the bucket whenever {@link #shouldRetry} returns true, and are released to the bucket whenever
+ * {@link #requestSucceeded} or {@link #requestWillNotBeRetried} are invoked.
+ *
+ * <p>
+ * If "tokens" cannot be acquired from the bucket, it means too many requests have failed and the request will not be allowed
+ * to retry until we start to see initial non-retried requests succeed via {@link #requestSucceeded(RetryPolicyContext)}.
+ *
+ * <p>
+ * This prevents the client from holding the calling thread to retry when it's likely that it will fail anyway.
+ *
+ * <p>
+ * This is currently included in the default {@link RetryPolicy#aggregateRetryCondition()}, but can be disabled by setting the
+ * {@link RetryPolicy.Builder#retryCapacityCondition} to null.
+ */
+@SdkPublicApi
+public class TokenBucketRetryCondition implements RetryCondition {
+    private static final ExecutionAttribute<Capacity> LAST_ACQUIRED_CAPACITY =
+        new ExecutionAttribute<>("TokenBucketRetryCondition.LAST_ACQUIRED_CAPACITY");
+
+    private static final ExecutionAttribute<Integer> RETRY_COUNT_OF_LAST_CAPACITY_ACQUISITION =
+        new ExecutionAttribute<>("TokenBucketRetryCondition.RETRY_COUNT_OF_LAST_CAPACITY_ACQUISITION");
+
+    private final TokenBucket capacity;
+    private final TokenBucketExceptionCostFunction exceptionCostFunction;
+
+    private TokenBucketRetryCondition(Builder builder) {
+        this.capacity = new TokenBucket(Validate.notNull(builder.tokenBucketSize, "tokenBucketSize"));
+        this.exceptionCostFunction = Validate.notNull(builder.exceptionCostFunction, "exceptionCostFunction");
+    }
+
+    /**
+     * Create a condition using the {@link RetryMode#defaultRetryMode()}. This is equivalent to
+     * {@code forRetryMode(RetryMode.defaultRetryMode())}.
+     *
+     * <p>
+     * For more detailed control, see {@link #builder()}.
+     */
+    public static TokenBucketRetryCondition create() {
+        return forRetryMode(RetryMode.defaultRetryMode());
+    }
+
+    /**
+     * Create a condition using the configured {@link RetryMode}. The {@link RetryMode#LEGACY} does not subtract tokens from
+     * the token bucket when throttling exceptions are encountered. The {@link RetryMode#STANDARD} treats throttling and non-
+     * throttling exceptions as the same cost.
+     *
+     * <p>
+     * For more detailed control, see {@link #builder()}.
+     */
+    public static TokenBucketRetryCondition forRetryMode(RetryMode retryMode) {
+        return TokenBucketRetryCondition.builder()
+                                        .tokenBucketSize(TOKEN_BUCKET_SIZE)
+                                        .exceptionCostFunction(SdkDefaultRetrySetting.tokenCostFunction(retryMode))
+                                        .build();
+    }
+
+    /**
+     * Create a builder that allows fine-grained control over the token policy of this condition.
+     */
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    /**
+     * If {@link #shouldRetry(RetryPolicyContext)} returned true for the provided execution, this method returns the
+     * {@link Capacity} consumed by the request.
+     */
+    public static Optional<Capacity> getCapacityForExecution(ExecutionAttributes attributes) {
+        return Optional.ofNullable(attributes.getAttribute(LAST_ACQUIRED_CAPACITY));
+    }
+
+    /**
+     * Retrieve the number of tokens currently available in the token bucket. This is a volatile snapshot of the current value.
+     * See {@link #getCapacityForExecution(ExecutionAttributes)} to see how much capacity was left in the bucket after a specific
+     * execution was considered.
+     */
+    public int tokensAvailable() {
+        return capacity.currentCapacity();
+    }
+
+    @Override
+    public boolean shouldRetry(RetryPolicyContext context) {
+        int costOfFailure = exceptionCostFunction.apply(context.exception());
+        Validate.isTrue(costOfFailure >= 0, "Cost of failure must not be negative, but was " + costOfFailure);
+
+        Optional<Capacity> capacity = this.capacity.tryAcquire(costOfFailure);
+
+        capacity.ifPresent(c -> {
+            context.executionAttributes().putAttribute(LAST_ACQUIRED_CAPACITY, c);
+            context.executionAttributes().putAttribute(RETRY_COUNT_OF_LAST_CAPACITY_ACQUISITION,
+                                                       context.retriesAttempted());
+        });
+
+        return capacity.isPresent();
+    }
+
+    @Override
+    public void requestWillNotBeRetried(RetryPolicyContext context) {
+        Integer lastAcquisitionRetryCount = context.executionAttributes().getAttribute(RETRY_COUNT_OF_LAST_CAPACITY_ACQUISITION);
+
+        if (lastAcquisitionRetryCount != null && context.retriesAttempted() == lastAcquisitionRetryCount) {
+            // We said yes to "should-retry", but something else caused it not to retry
+            Capacity lastAcquiredCapacity = context.executionAttributes().getAttribute(LAST_ACQUIRED_CAPACITY);
+            Validate.validState(lastAcquiredCapacity != null, "Last acquired capacity should not be null.");
+            capacity.release(lastAcquiredCapacity.capacityAcquired());
+        }
+    }
+
+    @Override
+    public void requestSucceeded(RetryPolicyContext context) {
+        Capacity lastAcquiredCapacity = context.executionAttributes().getAttribute(LAST_ACQUIRED_CAPACITY);
+
+        if (lastAcquiredCapacity == null || lastAcquiredCapacity.capacityAcquired() == 0) {
+            capacity.release(1);
+        } else {
+            capacity.release(lastAcquiredCapacity.capacityAcquired());
+        }
+    }
+
+    @Override
+    public String toString() {
+        return ToString.builder("TokenBucketRetryCondition")
+                       .add("capacity", capacity.currentCapacity() + "/" + capacity.maxCapacity())
+                       .add("exceptionCostFunction", exceptionCostFunction)
+                       .build();
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        TokenBucketRetryCondition that = (TokenBucketRetryCondition) o;
+
+        if (!capacity.equals(that.capacity)) {
+            return false;
+        }
+        return exceptionCostFunction.equals(that.exceptionCostFunction);
+    }
+
+    @Override
+    public int hashCode() {
+        int result = capacity.hashCode();
+        result = 31 * result + exceptionCostFunction.hashCode();
+        return result;
+    }
+
+    /**
+     * Configure and create a {@link TokenBucketRetryCondition}.
+     */
+    public static final class Builder {
+        private Integer tokenBucketSize;
+        private TokenBucketExceptionCostFunction exceptionCostFunction;
+
+        /**
+         * Create using {@link TokenBucketRetryCondition#builder()}.
+         */
+        private Builder() {
+        }
+
+        /**
+         * Specify the maximum number of tokens in the token bucket. This is also used as the initial value for the number of
+         * tokens in the bucket.
+         */
+        public Builder tokenBucketSize(int tokenBucketSize) {
+            this.tokenBucketSize = tokenBucketSize;
+            return this;
+        }
+
+        /**
+         * Configure a {@link TokenBucketExceptionCostFunction} that is used to calculate the number of tokens that should be
+         * taken out of the bucket for each specific exception. These tokens will be returned in case of successful retries.
+         */
+        public Builder exceptionCostFunction(TokenBucketExceptionCostFunction exceptionCostFunction) {
+            this.exceptionCostFunction = exceptionCostFunction;
+            return this;
+        }
+
+        /**
+         * Build a {@link TokenBucketRetryCondition} using the provided configuration.
+         */
+        public TokenBucketRetryCondition build() {
+            return new TokenBucketRetryCondition(this);
+        }
+    }
+
+    /**
+     * The number of tokens in the token bucket after a specific token acquisition succeeds. This can be retrieved via
+     * {@link #getCapacityForExecution(ExecutionAttributes)}.
+     */
+    public static final class Capacity {
+        private final int capacityAcquired;
+        private final int capacityRemaining;
+
+        private Capacity(Builder builder) {
+            this.capacityAcquired = Validate.notNull(builder.capacityAcquired, "capacityAcquired");
+            this.capacityRemaining = Validate.notNull(builder.capacityRemaining, "capacityRemaining");
+        }
+
+        public static Builder builder() {
+            return new Builder();
+        }
+
+        /**
+         * The number of tokens acquired by the last token acquisition.
+         */
+        public int capacityAcquired() {
+            return capacityAcquired;
+        }
+
+        /**
+         * The number of tokens in the token bucket.
+         */
+        public int capacityRemaining() {
+            return capacityRemaining;
+        }
+
+        public static class Builder {
+            private Integer capacityAcquired;
+            private Integer capacityRemaining;
+
+            private Builder() {
+            }
+
+            public Builder capacityAcquired(Integer capacityAcquired) {
+                this.capacityAcquired = capacityAcquired;
+                return this;
+            }
+
+            public Builder capacityRemaining(Integer capacityRemaining) {
+                this.capacityRemaining = capacityRemaining;
+                return this;
+            }
+
+            public Capacity build() {
+                return new Capacity(this);
+            }
+        }
+    }
+}
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/runtime/TypeConverter.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/runtime/TypeConverter.java
index 43e3d01b5269..96e2e0f5cc0f 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/runtime/TypeConverter.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/runtime/TypeConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/runtime/transform/AsyncStreamingRequestMarshaller.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/runtime/transform/AsyncStreamingRequestMarshaller.java
index 674c2519ccc8..2356b146a078 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/runtime/transform/AsyncStreamingRequestMarshaller.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/runtime/transform/AsyncStreamingRequestMarshaller.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/runtime/transform/Marshaller.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/runtime/transform/Marshaller.java
index f1b6720d30e5..42e3dd778f36 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/runtime/transform/Marshaller.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/runtime/transform/Marshaller.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/runtime/transform/StreamingRequestMarshaller.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/runtime/transform/StreamingRequestMarshaller.java
index db36a0014e62..d275bab6c7aa 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/runtime/transform/StreamingRequestMarshaller.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/runtime/transform/StreamingRequestMarshaller.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/signer/AsyncRequestBodySigner.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/signer/AsyncRequestBodySigner.java
index 1bd5b69bd6b0..6eec129bd95f 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/signer/AsyncRequestBodySigner.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/signer/AsyncRequestBodySigner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/signer/NoOpSigner.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/signer/NoOpSigner.java
index 122ec6f4e0db..51e597be273e 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/signer/NoOpSigner.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/signer/NoOpSigner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -24,7 +24,7 @@
  * input {@link SdkHttpFullRequest} without modifications.
  */
 @SdkPublicApi
-public final class NoOpSigner implements Signer, Presigner {
+public class NoOpSigner implements Signer, Presigner {
 
     @Override
     public SdkHttpFullRequest presign(SdkHttpFullRequest request, ExecutionAttributes executionAttributes) {
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/signer/Presigner.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/signer/Presigner.java
index 79e639279b56..f3eeda10be93 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/signer/Presigner.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/signer/Presigner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/signer/Signer.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/signer/Signer.java
index 2530a105be18..1c26546a82bc 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/signer/Signer.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/signer/Signer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/sync/RequestBody.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/sync/RequestBody.java
index f736b000c2f6..c5debbae00e3 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/sync/RequestBody.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/sync/RequestBody.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -28,7 +28,6 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Arrays;
-
 import software.amazon.awssdk.annotations.SdkPublicApi;
 import software.amazon.awssdk.core.internal.sync.FileContentStreamProvider;
 import software.amazon.awssdk.core.internal.util.Mimetype;
@@ -119,7 +118,9 @@ public static RequestBody fromInputStream(InputStream inputStream, long contentL
         IoUtils.markStreamWithMaxReadLimit(inputStream);
         InputStream nonCloseable = nonCloseableInputStream(inputStream);
         return fromContentProvider(() -> {
-            invokeSafely(nonCloseable::reset);
+            if (nonCloseable.markSupported()) {
+                invokeSafely(nonCloseable::reset);
+            }
             return nonCloseable;
         }, contentLength, Mimetype.MIMETYPE_OCTET_STREAM);
     }
@@ -159,6 +160,9 @@ public static RequestBody fromBytes(byte[] bytes) {
     /**
      * Creates a {@link RequestBody} from a {@link ByteBuffer}. Buffer contents are copied so any modifications
      * made to the original {@link ByteBuffer} are not reflected in the {@link RequestBody}.
+     * <p>
+     * <b>NOTE:</b> This method always copies the entire contents of the buffer, ignoring the current read position. Use
+     * {@link #fromRemainingByteBuffer(ByteBuffer)} if you need it to copy only the remaining readable bytes.
      *
      * @param byteBuffer ByteBuffer to send to the service.
      * @return RequestBody instance.
@@ -167,6 +171,18 @@ public static RequestBody fromByteBuffer(ByteBuffer byteBuffer) {
         return fromBytesDirect(BinaryUtils.copyAllBytesFrom(byteBuffer));
     }
 
+    /**
+     * Creates a {@link RequestBody} from the remaining readable bytes from a {@link ByteBuffer}. Unlike
+     * {@link #fromByteBuffer(ByteBuffer)}, this method respects the current read position of the buffer and reads only
+     * the remaining bytes. The buffer is copied before reading so no changes are made to original buffer.
+     *
+     * @param byteBuffer ByteBuffer to send to the service.
+     * @return RequestBody instance.
+     */
+    public static RequestBody fromRemainingByteBuffer(ByteBuffer byteBuffer) {
+        return fromBytesDirect(BinaryUtils.copyRemainingBytesFrom(byteBuffer));
+    }
+
     /**
      * Creates a {@link RequestBody} with no content.
      *
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/sync/ResponseTransformer.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/sync/ResponseTransformer.java
index 4e742ab61369..e32695b3b0fb 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/sync/ResponseTransformer.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/sync/ResponseTransformer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/traits/DefaultValueTrait.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/traits/DefaultValueTrait.java
index c39461ae7cd3..ccdbc6a3f76f 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/traits/DefaultValueTrait.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/traits/DefaultValueTrait.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/traits/JsonValueTrait.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/traits/JsonValueTrait.java
index a666a08d5654..d18aadf19b41 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/traits/JsonValueTrait.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/traits/JsonValueTrait.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/traits/ListTrait.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/traits/ListTrait.java
index 7b7d01f78d82..825771f2fbb4 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/traits/ListTrait.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/traits/ListTrait.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/traits/LocationTrait.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/traits/LocationTrait.java
index c41b0eeef1a6..419da0af5849 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/traits/LocationTrait.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/traits/LocationTrait.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/traits/MapTrait.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/traits/MapTrait.java
index 8234925ed4c8..d37855814d72 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/traits/MapTrait.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/traits/MapTrait.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/traits/PayloadTrait.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/traits/PayloadTrait.java
index 222d78133229..4b5725db4f1a 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/traits/PayloadTrait.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/traits/PayloadTrait.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/traits/TimestampFormatTrait.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/traits/TimestampFormatTrait.java
index 343bd4fe5f7e..18fdea2f6cc1 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/traits/TimestampFormatTrait.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/traits/TimestampFormatTrait.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/traits/Trait.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/traits/Trait.java
index 4e7eb21757df..baaee8fabfce 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/traits/Trait.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/traits/Trait.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/traits/XmlAttributeTrait.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/traits/XmlAttributeTrait.java
index 115f2a3ffe80..f0b0ec462f00 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/traits/XmlAttributeTrait.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/traits/XmlAttributeTrait.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/traits/XmlAttributesTrait.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/traits/XmlAttributesTrait.java
index 082b9f288dca..f63f9bf27949 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/traits/XmlAttributesTrait.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/traits/XmlAttributesTrait.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/util/DefaultSdkAutoConstructList.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/util/DefaultSdkAutoConstructList.java
index d070ecc8b7c4..1ec8aa9c3f64 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/util/DefaultSdkAutoConstructList.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/util/DefaultSdkAutoConstructList.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/util/DefaultSdkAutoConstructMap.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/util/DefaultSdkAutoConstructMap.java
index c53d653df740..57cc2e236e79 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/util/DefaultSdkAutoConstructMap.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/util/DefaultSdkAutoConstructMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -19,7 +19,6 @@
 import java.util.Collections;
 import java.util.Map;
 import java.util.Set;
-
 import software.amazon.awssdk.annotations.SdkProtectedApi;
 
 /**
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/util/IdempotentUtils.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/util/IdempotentUtils.java
index d8f259074176..c03de29f0b8c 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/util/IdempotentUtils.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/util/IdempotentUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/util/PaginatorUtils.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/util/PaginatorUtils.java
index 57269071d9bc..26a41760a2ff 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/util/PaginatorUtils.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/util/PaginatorUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/util/SdkAutoConstructList.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/util/SdkAutoConstructList.java
index 7ebee2dddcb5..50457f909c34 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/util/SdkAutoConstructList.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/util/SdkAutoConstructList.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/util/SdkAutoConstructMap.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/util/SdkAutoConstructMap.java
index 7a91b33cdb4a..50d092eff035 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/util/SdkAutoConstructMap.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/util/SdkAutoConstructMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -16,7 +16,6 @@
 package software.amazon.awssdk.core.util;
 
 import java.util.Map;
-
 import software.amazon.awssdk.annotations.SdkProtectedApi;
 
 /**
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/util/json/JacksonUtils.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/util/json/JacksonUtils.java
index 03b42abae972..c379f52a3682 100644
--- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/util/json/JacksonUtils.java
+++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/util/json/JacksonUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -41,7 +41,8 @@ public final class JacksonUtils {
         OBJECT_MAPPER.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
     }
 
-    private JacksonUtils() {}
+    private JacksonUtils() {
+    }
 
     public static String toJsonPrettyString(Object value) {
         try {
diff --git a/core/sdk-core/src/main/resources/software/amazon/awssdk/core/util/VersionInfo.java.vm b/core/sdk-core/src/main/resources/software/amazon/awssdk/core/util/VersionInfo.java.vm
index 91f72999075f..4f3b79b8792f 100644
--- a/core/sdk-core/src/main/resources/software/amazon/awssdk/core/util/VersionInfo.java.vm
+++ b/core/sdk-core/src/main/resources/software/amazon/awssdk/core/util/VersionInfo.java.vm
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/test/java/org/bitpedia/util/Base32.java b/core/sdk-core/src/test/java/org/bitpedia/util/Base32.java
index f82336598c7c..1b715360f92f 100644
--- a/core/sdk-core/src/test/java/org/bitpedia/util/Base32.java
+++ b/core/sdk-core/src/test/java/org/bitpedia/util/Base32.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/RequestOverrideConfigurationTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/RequestOverrideConfigurationTest.java
index 7ec5e10f2b04..4ae3e660a470 100644
--- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/RequestOverrideConfigurationTest.java
+++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/RequestOverrideConfigurationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/async/AsyncRequestBodyTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/async/AsyncRequestBodyTest.java
index 156fac4aacbf..e2da5dc9beaa 100644
--- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/async/AsyncRequestBodyTest.java
+++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/async/AsyncRequestBodyTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/async/FileAsyncRequestPublisherTckTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/async/FileAsyncRequestPublisherTckTest.java
index 6ad6f8f5346b..cb866d3eecf5 100644
--- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/async/FileAsyncRequestPublisherTckTest.java
+++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/async/FileAsyncRequestPublisherTckTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/async/SdkPublishersTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/async/SdkPublishersTest.java
new file mode 100644
index 000000000000..95d4d36bae09
--- /dev/null
+++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/async/SdkPublishersTest.java
@@ -0,0 +1,76 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.core.async;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.junit.Test;
+import org.reactivestreams.Publisher;
+import org.reactivestreams.Subscriber;
+import org.reactivestreams.Subscription;
+
+import software.amazon.awssdk.core.internal.async.SdkPublishers;
+import utils.FakePublisher;
+
+public class SdkPublishersTest {
+    @Test
+    public void envelopeWrappedPublisher() {
+        FakePublisher<ByteBuffer> fakePublisher = new FakePublisher<>();
+        Publisher<ByteBuffer> wrappedPublisher =
+            SdkPublishers.envelopeWrappedPublisher(fakePublisher, "prefix:", ":suffix");
+
+        FakeByteBufferSubscriber fakeSubscriber = new FakeByteBufferSubscriber();
+        wrappedPublisher.subscribe(fakeSubscriber);
+        fakePublisher.publish(ByteBuffer.wrap("content".getBytes(StandardCharsets.UTF_8)));
+        fakePublisher.complete();
+
+        assertThat(fakeSubscriber.recordedEvents()).containsExactly("prefix:content", ":suffix");
+    }
+
+    private final static class FakeByteBufferSubscriber implements Subscriber<ByteBuffer> {
+        private final List<String> recordedEvents = new ArrayList<>();
+
+        @Override
+        public void onSubscribe(Subscription s) {
+
+        }
+
+        @Override
+        public void onNext(ByteBuffer byteBuffer) {
+            String s = StandardCharsets.UTF_8.decode(byteBuffer).toString();
+            recordedEvents.add(s);
+        }
+
+        @Override
+        public void onError(Throwable t) {
+
+        }
+
+        @Override
+        public void onComplete() {
+
+        }
+
+        public List<String> recordedEvents() {
+            return this.recordedEvents;
+        }
+    }
+}
\ No newline at end of file
diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/async/SimpleSubscriberTckTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/async/SimpleSubscriberTckTest.java
index 4600c367093d..18d2cee6bfa4 100644
--- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/async/SimpleSubscriberTckTest.java
+++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/async/SimpleSubscriberTckTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/async/SingleByteArrayAsyncRequestProviderTckTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/async/SingleByteArrayAsyncRequestProviderTckTest.java
index 46b51fccd3ac..ac20bc327757 100644
--- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/async/SingleByteArrayAsyncRequestProviderTckTest.java
+++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/async/SingleByteArrayAsyncRequestProviderTckTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/client/AsyncClientHandlerExceptionTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/client/AsyncClientHandlerExceptionTest.java
index 7931bf8fcb3d..fa1e75bd5b0a 100644
--- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/client/AsyncClientHandlerExceptionTest.java
+++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/client/AsyncClientHandlerExceptionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/client/AsyncClientHandlerInterceptorExceptionTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/client/AsyncClientHandlerInterceptorExceptionTest.java
index 795c0da9f63e..f4404ea1699c 100644
--- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/client/AsyncClientHandlerInterceptorExceptionTest.java
+++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/client/AsyncClientHandlerInterceptorExceptionTest.java
@@ -1,6 +1,6 @@
 
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/client/builder/DefaultClientBuilderTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/client/builder/DefaultClientBuilderTest.java
index b41523ca5cc6..9de9054ef5ce 100644
--- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/client/builder/DefaultClientBuilderTest.java
+++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/client/builder/DefaultClientBuilderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/client/config/ClientOverrideConfigurationTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/client/config/ClientOverrideConfigurationTest.java
index 922264ec564a..a24136c60460 100644
--- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/client/config/ClientOverrideConfigurationTest.java
+++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/client/config/ClientOverrideConfigurationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/client/config/ConfigurationBuilderTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/client/config/ConfigurationBuilderTest.java
index 5a72e4937b9f..b50ac6618a06 100644
--- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/client/config/ConfigurationBuilderTest.java
+++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/client/config/ConfigurationBuilderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/client/handler/AsyncClientHandlerTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/client/handler/AsyncClientHandlerTest.java
index 54806341d21d..56ef4341b6dd 100644
--- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/client/handler/AsyncClientHandlerTest.java
+++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/client/handler/AsyncClientHandlerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/client/handler/AsyncClientHandlerTransformerVerificationTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/client/handler/AsyncClientHandlerTransformerVerificationTest.java
index 904746363b76..3f811641f70f 100644
--- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/client/handler/AsyncClientHandlerTransformerVerificationTest.java
+++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/client/handler/AsyncClientHandlerTransformerVerificationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/client/handler/SyncClientHandlerTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/client/handler/SyncClientHandlerTest.java
index 3d110b11bdc4..678a25230ff6 100644
--- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/client/handler/SyncClientHandlerTest.java
+++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/client/handler/SyncClientHandlerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/exception/SdkExceptionMessageTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/exception/SdkExceptionMessageTest.java
new file mode 100644
index 000000000000..55cccdd40bd7
--- /dev/null
+++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/exception/SdkExceptionMessageTest.java
@@ -0,0 +1,50 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.core.exception;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.junit.Test;
+
+/**
+ * Verifies the ways in which a message in an {@link SdkException} can be populated.
+ */
+public class SdkExceptionMessageTest {
+    @Test
+    public void noMessage_noCause_implies_noMessage() {
+        assertThat(SdkException.builder().build().getMessage()).isEqualTo(null);
+    }
+
+    @Test
+    public void message_noCause_implies_messageFromMessage() {
+        assertThat(SdkException.builder().message("foo").build().getMessage()).isEqualTo("foo");
+    }
+
+    @Test
+    public void message_cause_implies_messageFromMessage() {
+        assertThat(SdkException.builder().message("foo").cause(new Exception("bar")).build().getMessage()).isEqualTo("foo");
+    }
+
+    @Test
+    public void noMessage_causeWithoutMessage_implies_noMessage() {
+        assertThat(SdkException.builder().cause(new Exception()).build().getMessage()).isEqualTo(null);
+    }
+
+    @Test
+    public void noMessage_causeWithMessage_implies_messageFromCause() {
+        assertThat(SdkException.builder().cause(new Exception("bar")).build().getMessage()).isEqualTo("bar");
+    }
+}
\ No newline at end of file
diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/http/AmazonHttpClientTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/http/AmazonHttpClientTest.java
index 3270fcd2b8fd..e2010c3e048d 100644
--- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/http/AmazonHttpClientTest.java
+++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/http/AmazonHttpClientTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -20,10 +20,12 @@
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
+import static software.amazon.awssdk.core.internal.util.ResponseHandlerTestUtils.combinedSyncResponseHandler;
 
 import java.io.IOException;
 import java.net.URI;
 import java.util.concurrent.ExecutorService;
+
 import org.apache.log4j.BasicConfigurator;
 import org.junit.Assert;
 import org.junit.Before;
@@ -32,6 +34,7 @@
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
+
 import software.amazon.awssdk.core.ClientType;
 import software.amazon.awssdk.core.client.config.SdkAdvancedAsyncClientOption;
 import software.amazon.awssdk.core.client.config.SdkAdvancedClientOption;
@@ -84,7 +87,7 @@ public void testRetryIoExceptionFromExecute() throws Exception {
                     .request(ValidSdkObjects.sdkHttpFullRequest().build())
                     .originalRequest(NoopTestRequest.builder().build())
                     .executionContext(context)
-                    .execute();
+                    .execute(combinedSyncResponseHandler(null, null));
             Assert.fail("No exception when request repeatedly fails!");
 
         } catch (SdkClientException e) {
@@ -110,7 +113,7 @@ public void testRetryIoExceptionFromHandler() throws Exception {
                     .request(ValidSdkObjects.sdkHttpFullRequest().build())
                     .originalRequest(NoopTestRequest.builder().build())
                     .executionContext(context)
-                    .execute(mockHandler);
+                    .execute(combinedSyncResponseHandler(mockHandler, null));
             Assert.fail("No exception when request repeatedly fails!");
 
         } catch (SdkClientException e) {
@@ -141,7 +144,7 @@ public void testUserAgentPrefixAndSuffixAreAdded() {
               .request(ValidSdkObjects.sdkHttpFullRequest().build())
               .originalRequest(NoopTestRequest.builder().build())
               .executionContext(ClientExecutionAndRequestTimerTestUtils.executionContext(null))
-              .execute(handler);
+              .execute(combinedSyncResponseHandler(handler, null));
 
         ArgumentCaptor<HttpExecuteRequest> httpRequestCaptor = ArgumentCaptor.forClass(HttpExecuteRequest.class);
         verify(sdkHttpClient).prepareRequest(httpRequestCaptor.capture());
@@ -168,7 +171,7 @@ public void testUserAgentContainsHttpClientInfo() {
               .request(ValidSdkObjects.sdkHttpFullRequest().build())
               .originalRequest(NoopTestRequest.builder().build())
               .executionContext(ClientExecutionAndRequestTimerTestUtils.executionContext(null))
-              .execute(handler);
+              .execute(combinedSyncResponseHandler(handler, null));
 
         ArgumentCaptor<HttpExecuteRequest> httpRequestCaptor = ArgumentCaptor.forClass(HttpExecuteRequest.class);
         verify(sdkHttpClient).prepareRequest(httpRequestCaptor.capture());
diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/http/AmazonHttpClientWireMockTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/http/AmazonHttpClientWireMockTest.java
index c78eecd6714f..963ae396647f 100644
--- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/http/AmazonHttpClientWireMockTest.java
+++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/http/AmazonHttpClientWireMockTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -24,9 +24,11 @@
 import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo;
 import static com.github.tomakehurst.wiremock.client.WireMock.verify;
 import static software.amazon.awssdk.core.internal.http.timers.ClientExecutionAndRequestTimerTestUtils.executionContext;
+import static software.amazon.awssdk.core.internal.util.ResponseHandlerTestUtils.combinedSyncResponseHandler;
 
 import org.junit.Before;
 import org.junit.Test;
+
 import software.amazon.awssdk.core.internal.http.AmazonSyncHttpClient;
 import software.amazon.awssdk.core.internal.http.response.NullErrorResponseHandler;
 import software.amazon.awssdk.http.SdkHttpFullRequest;
@@ -84,8 +86,7 @@ private void sendRequest(SdkHttpFullRequest request, AmazonSyncHttpClient sut) {
            .request(request)
            .originalRequest(NoopTestRequest.builder().build())
            .executionContext(executionContext(request))
-           .errorResponseHandler(new NullErrorResponseHandler())
-           .execute();
+           .execute(combinedSyncResponseHandler(null, new NullErrorResponseHandler()));
     }
 
     private AmazonSyncHttpClient createClient(String headerName, String headerValue) {
diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/http/ContentStreamProviderWireMockTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/http/ContentStreamProviderWireMockTest.java
index f2ca04adeefd..94f9f91c3237 100644
--- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/http/ContentStreamProviderWireMockTest.java
+++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/http/ContentStreamProviderWireMockTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -22,9 +22,18 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.fail;
 import static software.amazon.awssdk.core.internal.http.timers.ClientExecutionAndRequestTimerTestUtils.executionContext;
+import static software.amazon.awssdk.core.internal.util.ResponseHandlerTestUtils.combinedSyncResponseHandler;
 import static software.amazon.awssdk.utils.FunctionalUtils.invokeSafely;
 
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.List;
+
 import org.junit.Test;
+
 import software.amazon.awssdk.core.exception.SdkServiceException;
 import software.amazon.awssdk.core.internal.http.AmazonSyncHttpClient;
 import software.amazon.awssdk.core.internal.http.response.NullErrorResponseHandler;
@@ -35,13 +44,6 @@
 import utils.HttpTestUtils;
 import utils.http.WireMockTestBase;
 
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.List;
-
 /**
  * WireMock tests related to {@link ContentStreamProvider} usage.
  */
@@ -78,8 +80,7 @@ private void sendRequest(SdkHttpFullRequest request, AmazonSyncHttpClient sut) {
                 .request(request)
                 .originalRequest(NoopTestRequest.builder().build())
                 .executionContext(executionContext(request))
-                .errorResponseHandler(new NullErrorResponseHandler())
-                .execute();
+                .execute(combinedSyncResponseHandler(null, new NullErrorResponseHandler()));
     }
 
     private static class TestContentStreamProvider implements ContentStreamProvider {
diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/http/Crc32ValidationTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/http/Crc32ValidationTest.java
index 27070c6b6710..b895b33083bb 100644
--- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/http/Crc32ValidationTest.java
+++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/http/Crc32ValidationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/http/InterruptFlagAlwaysClearsTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/http/InterruptFlagAlwaysClearsTest.java
index 92d701d0f9b1..df6f1dd6a0cb 100644
--- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/http/InterruptFlagAlwaysClearsTest.java
+++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/http/InterruptFlagAlwaysClearsTest.java
@@ -1,3 +1,18 @@
+/*
+ * 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.
+ */
+
 package software.amazon.awssdk.core.http;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/http/MockServerTestBase.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/http/MockServerTestBase.java
index 94308cf2e088..b4b38e646c85 100644
--- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/http/MockServerTestBase.java
+++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/http/MockServerTestBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/http/NoopTestRequest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/http/NoopTestRequest.java
index 585e9e9c06f2..3f2251a2626f 100644
--- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/http/NoopTestRequest.java
+++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/http/NoopTestRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/http/RetryCountInUserAgentTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/http/RetryCountInUserAgentTest.java
index 463f07153295..847a4d5e1a72 100644
--- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/http/RetryCountInUserAgentTest.java
+++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/http/RetryCountInUserAgentTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -17,13 +17,16 @@
 
 import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
 import static com.github.tomakehurst.wiremock.client.WireMock.containing;
+import static com.github.tomakehurst.wiremock.client.WireMock.equalTo;
 import static com.github.tomakehurst.wiremock.client.WireMock.get;
 import static com.github.tomakehurst.wiremock.client.WireMock.getRequestedFor;
+import static com.github.tomakehurst.wiremock.client.WireMock.matching;
 import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
 import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
 import static com.github.tomakehurst.wiremock.client.WireMock.verify;
 import static org.junit.Assert.fail;
-import static software.amazon.awssdk.core.internal.retry.RetryHandler.HEADER_SDK_RETRY_INFO;
+import static software.amazon.awssdk.core.internal.retry.SdkDefaultRetrySetting.SDK_RETRY_INFO_HEADER;
+import static software.amazon.awssdk.core.internal.util.ResponseHandlerTestUtils.combinedSyncResponseHandler;
 
 import org.junit.Test;
 import software.amazon.awssdk.core.client.config.SdkClientConfiguration;
@@ -47,28 +50,35 @@ public class RetryCountInUserAgentTest extends WireMockTestBase {
     public void retriedRequest_AppendsCorrectRetryCountInUserAgent() throws Exception {
         stubFor(get(urlEqualTo(RESOURCE_PATH)).willReturn(aResponse().withStatus(500)));
 
-        executeRequest();
+        executeRequest(false);
 
-        verify(1, getRequestedFor(urlEqualTo(RESOURCE_PATH)).withHeader(HEADER_SDK_RETRY_INFO, containing("0/0/")));
-        verify(1, getRequestedFor(urlEqualTo(RESOURCE_PATH)).withHeader(HEADER_SDK_RETRY_INFO, containing("1/0/")));
-        verify(1, getRequestedFor(urlEqualTo(RESOURCE_PATH)).withHeader(HEADER_SDK_RETRY_INFO, containing("2/10/")));
-        verify(1, getRequestedFor(urlEqualTo(RESOURCE_PATH)).withHeader(HEADER_SDK_RETRY_INFO, containing("3/20/")));
+        verify(1, getRequestedFor(urlEqualTo(RESOURCE_PATH)).withHeader(SDK_RETRY_INFO_HEADER, equalTo("0/0/")));
+        verify(1, getRequestedFor(urlEqualTo(RESOURCE_PATH)).withHeader(SDK_RETRY_INFO_HEADER, equalTo("1/0/")));
+        verify(1, getRequestedFor(urlEqualTo(RESOURCE_PATH)).withHeader(SDK_RETRY_INFO_HEADER, equalTo("2/10/")));
+        verify(1, getRequestedFor(urlEqualTo(RESOURCE_PATH)).withHeader(SDK_RETRY_INFO_HEADER, equalTo("3/20/")));
     }
 
     @Test
     public void retriedRequest_AppendsCorrectRetryCountInUserAgent_throttlingEnabled() throws Exception {
         stubFor(get(urlEqualTo(RESOURCE_PATH)).willReturn(aResponse().withStatus(500)));
 
-        executeRequest();
+        executeRequest(true);
 
-        verify(1, getRequestedFor(urlEqualTo(RESOURCE_PATH)).withHeader(HEADER_SDK_RETRY_INFO, containing("0/0/500")));
-        verify(1, getRequestedFor(urlEqualTo(RESOURCE_PATH)).withHeader(HEADER_SDK_RETRY_INFO, containing("1/0/495")));
-        verify(1, getRequestedFor(urlEqualTo(RESOURCE_PATH)).withHeader(HEADER_SDK_RETRY_INFO, containing("2/10/490")));
-        verify(1, getRequestedFor(urlEqualTo(RESOURCE_PATH)).withHeader(HEADER_SDK_RETRY_INFO, containing("3/20/485")));
+        verify(1, getRequestedFor(urlEqualTo(RESOURCE_PATH)).withHeader(SDK_RETRY_INFO_HEADER, equalTo("0/0/")));
+        verify(1, getRequestedFor(urlEqualTo(RESOURCE_PATH)).withHeader(SDK_RETRY_INFO_HEADER, equalTo("1/0/495")));
+        verify(1, getRequestedFor(urlEqualTo(RESOURCE_PATH)).withHeader(SDK_RETRY_INFO_HEADER, equalTo("2/10/490")));
+        verify(1, getRequestedFor(urlEqualTo(RESOURCE_PATH)).withHeader(SDK_RETRY_INFO_HEADER, equalTo("3/20/485")));
     }
 
-    private void executeRequest() throws Exception {
-        RetryPolicy policy = RetryPolicy.builder().backoffStrategy(new SimpleArrayBackoffStrategy(BACKOFF_VALUES)).build();
+    private void executeRequest(boolean throttlingEnabled) throws Exception {
+        RetryPolicy policy = RetryPolicy.builder()
+                                        .backoffStrategy(new SimpleArrayBackoffStrategy(BACKOFF_VALUES))
+                                        .applyMutation(b -> {
+                                            if (!throttlingEnabled) {
+                                                b.retryCapacityCondition(null);
+                                            }
+                                        })
+                                        .build();
 
         SdkClientConfiguration config = HttpTestUtils.testClientConfiguration().toBuilder()
                                                      .option(SdkClientOption.SYNC_HTTP_CLIENT, HttpTestUtils.testSdkHttpClient())
@@ -82,8 +92,7 @@ private void executeRequest() throws Exception {
                       .request(request)
                       .originalRequest(NoopTestRequest.builder().build())
                       .executionContext(ClientExecutionAndRequestTimerTestUtils.executionContext(request))
-                      .errorResponseHandler(stubErrorHandler())
-                      .execute();
+                      .execute(combinedSyncResponseHandler(null, stubErrorHandler()));
             fail("Expected exception");
         } catch (SdkServiceException expected) {
             // Ignored or expected.
diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/http/SdkTransactionIdInHeaderTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/http/SdkTransactionIdInHeaderTest.java
index 38346cc55766..73dc1f34acfa 100644
--- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/http/SdkTransactionIdInHeaderTest.java
+++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/http/SdkTransactionIdInHeaderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -24,9 +24,12 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.fail;
+import static software.amazon.awssdk.core.internal.util.ResponseHandlerTestUtils.combinedSyncResponseHandler;
 
 import com.github.tomakehurst.wiremock.verification.LoggedRequest;
+
 import org.junit.Test;
+
 import software.amazon.awssdk.core.exception.SdkServiceException;
 import software.amazon.awssdk.core.internal.http.AmazonSyncHttpClient;
 import software.amazon.awssdk.core.internal.http.pipeline.stages.ApplyTransactionIdStage;
@@ -67,9 +70,8 @@ private void executeRequest() throws Exception {
             httpClient.requestExecutionBuilder()
                       .request(request)
                       .originalRequest(NoopTestRequest.builder().build())
-                      .errorResponseHandler(stubErrorHandler())
                       .executionContext(ClientExecutionAndRequestTimerTestUtils.executionContext(request))
-                      .execute();
+                      .execute(combinedSyncResponseHandler(null, stubErrorHandler()));
             fail("Expected exception");
         } catch (SdkServiceException expected) {
             // Ignored or expected.
diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/http/UnresponsiveMockServerTestBase.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/http/UnresponsiveMockServerTestBase.java
index 125239c978a4..5f8451bda352 100644
--- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/http/UnresponsiveMockServerTestBase.java
+++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/http/UnresponsiveMockServerTestBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/http/server/MockServer.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/http/server/MockServer.java
index 70b9d56c65e1..6b9dfe538d52 100644
--- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/http/server/MockServer.java
+++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/http/server/MockServer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/async/BaosSubscriberTckTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/async/BaosSubscriberTckTest.java
index 8b804239eb7d..2152916b1533 100644
--- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/async/BaosSubscriberTckTest.java
+++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/async/BaosSubscriberTckTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/async/ByteArrayAsyncRequestBodyTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/async/ByteArrayAsyncRequestBodyTest.java
index 3884213f6abc..4b1526ce8055 100644
--- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/async/ByteArrayAsyncRequestBodyTest.java
+++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/async/ByteArrayAsyncRequestBodyTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/async/EnvelopeWrappedSdkPublisherTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/async/EnvelopeWrappedSdkPublisherTest.java
new file mode 100644
index 000000000000..a7ee913f5581
--- /dev/null
+++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/async/EnvelopeWrappedSdkPublisherTest.java
@@ -0,0 +1,355 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.core.internal.async;
+
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.verifyZeroInteractions;
+
+import java.util.function.BiFunction;
+import java.util.stream.IntStream;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
+import org.reactivestreams.Subscriber;
+
+import utils.FakePublisher;
+
+@RunWith(MockitoJUnitRunner.class)
+public class EnvelopeWrappedSdkPublisherTest {
+    private static final BiFunction<String, String, String> CONCAT_STRINGS = (s1, s2) -> s1 + s2;
+
+    private final FakePublisher<String> fakePublisher = new FakePublisher<>();
+
+    @Mock
+    private Subscriber<String> mockSubscriber;
+
+    @Test
+    public void noPrefixOrSuffix_noEvent() {
+        EnvelopeWrappedSdkPublisher<String> contentWrappingPublisher =
+            EnvelopeWrappedSdkPublisher.of(fakePublisher, null, null, CONCAT_STRINGS);
+
+        verifyZeroInteractions(mockSubscriber);
+
+        contentWrappingPublisher.subscribe(mockSubscriber);
+        verify(mockSubscriber, never()).onNext(anyString());
+        verify(mockSubscriber).onSubscribe(any());
+        verifyNoMoreInteractions(mockSubscriber);
+        reset(mockSubscriber);
+
+        fakePublisher.complete();
+        verify(mockSubscriber).onComplete();
+        verifyNoMoreInteractions(mockSubscriber);
+    }
+
+    @Test
+    public void noPrefixOrSuffix_singleEvent() {
+        EnvelopeWrappedSdkPublisher<String> contentWrappingPublisher =
+            EnvelopeWrappedSdkPublisher.of(fakePublisher, null, null, CONCAT_STRINGS);
+
+        verifyZeroInteractions(mockSubscriber);
+
+        contentWrappingPublisher.subscribe(mockSubscriber);
+        verify(mockSubscriber, never()).onNext(anyString());
+        verify(mockSubscriber).onSubscribe(any());
+        verifyNoMoreInteractions(mockSubscriber);
+        reset(mockSubscriber);
+
+        fakePublisher.publish("test1");
+        verify(mockSubscriber).onNext("test1");
+        verifyNoMoreInteractions(mockSubscriber);
+        reset(mockSubscriber);
+
+        fakePublisher.complete();
+        verify(mockSubscriber).onComplete();
+        verifyNoMoreInteractions(mockSubscriber);
+    }
+
+    @Test
+    public void noPrefixOrSuffix_multipleEvents() {
+        EnvelopeWrappedSdkPublisher<String> contentWrappingPublisher =
+            EnvelopeWrappedSdkPublisher.of(fakePublisher, null, null, CONCAT_STRINGS);
+
+        verifyZeroInteractions(mockSubscriber);
+
+        contentWrappingPublisher.subscribe(mockSubscriber);
+        verify(mockSubscriber, never()).onNext(anyString());
+        verify(mockSubscriber).onSubscribe(any());
+        verifyNoMoreInteractions(mockSubscriber);
+        reset(mockSubscriber);
+
+        fakePublisher.publish("test1");
+        verify(mockSubscriber).onNext("test1");
+        verifyNoMoreInteractions(mockSubscriber);
+        reset(mockSubscriber);
+
+        fakePublisher.publish("test2");
+        verify(mockSubscriber).onNext("test2");
+        verifyNoMoreInteractions(mockSubscriber);
+        reset(mockSubscriber);
+
+        fakePublisher.complete();
+        verify(mockSubscriber).onComplete();
+        verifyNoMoreInteractions(mockSubscriber);
+    }
+
+    @Test
+    public void prefixOnly_noEvent() {
+        EnvelopeWrappedSdkPublisher<String> contentWrappingPublisher =
+            EnvelopeWrappedSdkPublisher.of(fakePublisher, "test-prefix:", null, CONCAT_STRINGS);
+
+        verifyZeroInteractions(mockSubscriber);
+
+        contentWrappingPublisher.subscribe(mockSubscriber);
+        verify(mockSubscriber, never()).onNext(anyString());
+        verify(mockSubscriber).onSubscribe(any());
+        verifyNoMoreInteractions(mockSubscriber);
+        reset(mockSubscriber);
+
+        fakePublisher.complete();
+        verify(mockSubscriber).onComplete();
+        verifyNoMoreInteractions(mockSubscriber);
+    }
+
+
+    @Test
+    public void prefixOnly_singleEvent() {
+        EnvelopeWrappedSdkPublisher<String> contentWrappingPublisher =
+            EnvelopeWrappedSdkPublisher.of(fakePublisher, "test-prefix:", null, CONCAT_STRINGS);
+
+        verifyZeroInteractions(mockSubscriber);
+
+        contentWrappingPublisher.subscribe(mockSubscriber);
+        verify(mockSubscriber, never()).onNext(anyString());
+        verify(mockSubscriber).onSubscribe(any());
+        verifyNoMoreInteractions(mockSubscriber);
+        reset(mockSubscriber);
+
+        fakePublisher.publish("test1");
+        verify(mockSubscriber).onNext("test-prefix:test1");
+        verifyNoMoreInteractions(mockSubscriber);
+        reset(mockSubscriber);
+
+        fakePublisher.complete();
+        verify(mockSubscriber).onComplete();
+        verifyNoMoreInteractions(mockSubscriber);
+    }
+
+    @Test
+    public void prefixOnly_multipleEvents() {
+        EnvelopeWrappedSdkPublisher<String> contentWrappingPublisher =
+            EnvelopeWrappedSdkPublisher.of(fakePublisher, "test-prefix:", null, CONCAT_STRINGS);
+
+        verifyZeroInteractions(mockSubscriber);
+
+        contentWrappingPublisher.subscribe(mockSubscriber);
+        verify(mockSubscriber, never()).onNext(anyString());
+        verify(mockSubscriber).onSubscribe(any());
+        verifyNoMoreInteractions(mockSubscriber);
+        reset(mockSubscriber);
+
+        fakePublisher.publish("test1");
+        verify(mockSubscriber).onNext("test-prefix:test1");
+        verifyNoMoreInteractions(mockSubscriber);
+        reset(mockSubscriber);
+
+        fakePublisher.publish("test2");
+        verify(mockSubscriber).onNext("test2");
+        verifyNoMoreInteractions(mockSubscriber);
+        reset(mockSubscriber);
+
+        fakePublisher.complete();
+        verify(mockSubscriber).onComplete();
+        verifyNoMoreInteractions(mockSubscriber);
+    }
+
+    @Test
+    public void suffixOnly_noEvent() {
+        EnvelopeWrappedSdkPublisher<String> contentWrappingPublisher =
+            EnvelopeWrappedSdkPublisher.of(fakePublisher, null, ":test-suffix", CONCAT_STRINGS);
+
+        verifyZeroInteractions(mockSubscriber);
+
+        contentWrappingPublisher.subscribe(mockSubscriber);
+        verify(mockSubscriber, never()).onNext(anyString());
+        verify(mockSubscriber).onSubscribe(any());
+        verifyNoMoreInteractions(mockSubscriber);
+        reset(mockSubscriber);
+
+        fakePublisher.complete();
+        verify(mockSubscriber).onComplete();
+        verifyNoMoreInteractions(mockSubscriber);
+    }
+
+    @Test
+    public void suffixOnly_singleEvent() {
+        EnvelopeWrappedSdkPublisher<String> contentWrappingPublisher =
+            EnvelopeWrappedSdkPublisher.of(fakePublisher, null, ":test-suffix", CONCAT_STRINGS);
+
+        verifyZeroInteractions(mockSubscriber);
+
+        contentWrappingPublisher.subscribe(mockSubscriber);
+        verify(mockSubscriber, never()).onNext(anyString());
+        verify(mockSubscriber).onSubscribe(any());
+        verifyNoMoreInteractions(mockSubscriber);
+        reset(mockSubscriber);
+
+        fakePublisher.publish("test");
+        verify(mockSubscriber).onNext("test");
+        verifyNoMoreInteractions(mockSubscriber);
+        reset(mockSubscriber);
+
+        fakePublisher.complete();
+        verify(mockSubscriber).onNext(":test-suffix");
+        verify(mockSubscriber).onComplete();
+        verifyNoMoreInteractions(mockSubscriber);
+    }
+
+    @Test
+    public void suffixOnly_multipleEvent() {
+        EnvelopeWrappedSdkPublisher<String> contentWrappingPublisher =
+            EnvelopeWrappedSdkPublisher.of(fakePublisher, null, ":test-suffix", CONCAT_STRINGS);
+
+        verifyZeroInteractions(mockSubscriber);
+
+        contentWrappingPublisher.subscribe(mockSubscriber);
+        verify(mockSubscriber, never()).onNext(anyString());
+        verify(mockSubscriber).onSubscribe(any());
+        verifyNoMoreInteractions(mockSubscriber);
+        reset(mockSubscriber);
+
+        fakePublisher.publish("test1");
+        verify(mockSubscriber).onNext("test1");
+        verifyNoMoreInteractions(mockSubscriber);
+        reset(mockSubscriber);
+
+        fakePublisher.publish("test2");
+        verify(mockSubscriber).onNext("test2");
+        verifyNoMoreInteractions(mockSubscriber);
+        reset(mockSubscriber);
+
+        fakePublisher.complete();
+        verify(mockSubscriber).onNext(":test-suffix");
+        verify(mockSubscriber).onComplete();
+        verifyNoMoreInteractions(mockSubscriber);
+    }
+
+    @Test
+    public void prefixAndSuffix_noEvent() {
+        EnvelopeWrappedSdkPublisher<String> contentWrappingPublisher =
+            EnvelopeWrappedSdkPublisher.of(fakePublisher, "test-prefix:", ":test-suffix", CONCAT_STRINGS);
+
+        verifyZeroInteractions(mockSubscriber);
+
+        contentWrappingPublisher.subscribe(mockSubscriber);
+        verify(mockSubscriber, never()).onNext(anyString());
+        verify(mockSubscriber).onSubscribe(any());
+        verifyNoMoreInteractions(mockSubscriber);
+        reset(mockSubscriber);
+
+        fakePublisher.complete();
+        verify(mockSubscriber).onComplete();
+        verifyNoMoreInteractions(mockSubscriber);
+    }
+
+    @Test
+    public void prefixAndSuffix_singleEvent() {
+        EnvelopeWrappedSdkPublisher<String> contentWrappingPublisher =
+            EnvelopeWrappedSdkPublisher.of(fakePublisher, "test-prefix:", ":test-suffix", CONCAT_STRINGS);
+
+        verifyZeroInteractions(mockSubscriber);
+
+        contentWrappingPublisher.subscribe(mockSubscriber);
+        verify(mockSubscriber, never()).onNext(anyString());
+        verify(mockSubscriber).onSubscribe(any());
+        verifyNoMoreInteractions(mockSubscriber);
+        reset(mockSubscriber);
+
+        fakePublisher.publish("test");
+        verify(mockSubscriber).onNext("test-prefix:test");
+        verifyNoMoreInteractions(mockSubscriber);
+        reset(mockSubscriber);
+
+        fakePublisher.complete();
+        verify(mockSubscriber).onNext(":test-suffix");
+        verify(mockSubscriber).onComplete();
+        verifyNoMoreInteractions(mockSubscriber);
+    }
+
+    @Test
+    public void prefixAndSuffix_multipleEvent() {
+        EnvelopeWrappedSdkPublisher<String> contentWrappingPublisher =
+            EnvelopeWrappedSdkPublisher.of(fakePublisher, "test-prefix:", ":test-suffix", CONCAT_STRINGS);
+
+        verifyZeroInteractions(mockSubscriber);
+
+        contentWrappingPublisher.subscribe(mockSubscriber);
+        verify(mockSubscriber, never()).onNext(anyString());
+        verify(mockSubscriber).onSubscribe(any());
+        verifyNoMoreInteractions(mockSubscriber);
+        reset(mockSubscriber);
+
+        fakePublisher.publish("test1");
+        verify(mockSubscriber).onNext("test-prefix:test1");
+        verifyNoMoreInteractions(mockSubscriber);
+        reset(mockSubscriber);
+
+        fakePublisher.publish("test2");
+        verify(mockSubscriber).onNext("test2");
+        verifyNoMoreInteractions(mockSubscriber);
+        reset(mockSubscriber);
+
+        fakePublisher.complete();
+        verify(mockSubscriber).onNext(":test-suffix");
+        verify(mockSubscriber).onComplete();
+        verifyNoMoreInteractions(mockSubscriber);
+    }
+
+    @Test
+    public void onError() {
+        EnvelopeWrappedSdkPublisher<String> contentWrappingPublisher =
+            EnvelopeWrappedSdkPublisher.of(fakePublisher, "test-prefix:", ":test-suffix", CONCAT_STRINGS);
+
+        verifyZeroInteractions(mockSubscriber);
+
+        contentWrappingPublisher.subscribe(mockSubscriber);
+        verify(mockSubscriber, never()).onNext(anyString());
+        verify(mockSubscriber).onSubscribe(any());
+        verifyNoMoreInteractions(mockSubscriber);
+        reset(mockSubscriber);
+
+        RuntimeException exception = new RuntimeException("boom");
+        fakePublisher.doThrow(exception);
+        verify(mockSubscriber).onError(exception);
+    }
+
+    @Test
+    public void subscribe_nullSubscriber_throwsNpe() {
+        EnvelopeWrappedSdkPublisher<String> contentWrappingPublisher =
+            EnvelopeWrappedSdkPublisher.of(fakePublisher, "test-prefix:", ":test-suffix", CONCAT_STRINGS);
+
+        assertThatThrownBy(() -> contentWrappingPublisher.subscribe((Subscriber<String>)null))
+            .isInstanceOf(NullPointerException.class);
+    }
+}
\ No newline at end of file
diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/async/FileAsyncResponseTransfomerTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/async/FileAsyncResponseTransfomerTest.java
index e5447dc80dda..e2630b4ed7c5 100644
--- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/async/FileAsyncResponseTransfomerTest.java
+++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/async/FileAsyncResponseTransfomerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/async/FileSubscriberTckTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/async/FileSubscriberTckTest.java
index e77989006839..971a7b6e95e7 100644
--- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/async/FileSubscriberTckTest.java
+++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/async/FileSubscriberTckTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/IdempotentTransformingAsyncResponseHandlerTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/IdempotentTransformingAsyncResponseHandlerTest.java
new file mode 100644
index 000000000000..c9e068856376
--- /dev/null
+++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/IdempotentTransformingAsyncResponseHandlerTest.java
@@ -0,0 +1,148 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.core.internal.http;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.fail;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
+
+import java.nio.ByteBuffer;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.IntStream;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
+import org.reactivestreams.Publisher;
+
+import software.amazon.awssdk.http.SdkHttpResponse;
+
+@RunWith(MockitoJUnitRunner.class)
+public class IdempotentTransformingAsyncResponseHandlerTest {
+    private final AtomicInteger scope = new AtomicInteger(1);
+    private final CompletableFuture<String> fakeFuture1 = CompletableFuture.completedFuture("one");
+    private final CompletableFuture<String> fakeFuture2 = CompletableFuture.completedFuture("two");
+
+    private IdempotentAsyncResponseHandler<String, Integer> handlerUnderTest;
+
+    @Mock
+    private TransformingAsyncResponseHandler<String> mockResponseHandler;
+    @Mock
+    private Publisher<ByteBuffer> mockPublisher;
+    @Mock
+    private SdkHttpResponse mockSdkHttpResponse;
+
+    @Before
+    public void instantiateHandler() {
+        handlerUnderTest = IdempotentAsyncResponseHandler.create(mockResponseHandler,
+                                                                 scope::get,
+                                                                 (x, y) -> x < y + 10);
+    }
+
+    @Before
+    public void stubMocks() {
+        when(mockResponseHandler.prepare()).thenReturn(fakeFuture1).thenReturn(fakeFuture2);
+    }
+
+    @Test
+    public void prepareDelegatesFirstTime() {
+        assertThat(handlerUnderTest.prepare()).isSameAs(fakeFuture1);
+
+        verify(mockResponseHandler).prepare();
+        verifyNoMoreInteractions(mockResponseHandler);
+    }
+
+    @Test
+    public void onErrorDelegates() {
+        RuntimeException e = new RuntimeException("boom");
+        handlerUnderTest.onError(e);
+
+        verify(mockResponseHandler).onError(e);
+        verifyNoMoreInteractions(mockResponseHandler);
+    }
+
+    @Test
+    public void onStreamDelegates() {
+        handlerUnderTest.onStream(mockPublisher);
+
+        verify(mockResponseHandler).onStream(mockPublisher);
+        verifyNoMoreInteractions(mockResponseHandler);
+    }
+
+    @Test
+    public void onHeadersDelegates() {
+        handlerUnderTest.onHeaders(mockSdkHttpResponse);
+
+        verify(mockResponseHandler).onHeaders(mockSdkHttpResponse);
+        verifyNoMoreInteractions(mockResponseHandler);
+    }
+
+    @Test
+    public void prepare_unchangedScope_onlyDelegatesOnce() {
+        assertThat(handlerUnderTest.prepare()).isSameAs(fakeFuture1);
+        assertThat(handlerUnderTest.prepare()).isSameAs(fakeFuture1);
+
+        verify(mockResponseHandler).prepare();
+        verifyNoMoreInteractions(mockResponseHandler);
+    }
+
+    @Test
+    public void prepare_scopeChangedButStillInRange_onlyDelegatesOnce() {
+        assertThat(handlerUnderTest.prepare()).isSameAs(fakeFuture1);
+        scope.set(2);
+        assertThat(handlerUnderTest.prepare()).isSameAs(fakeFuture1);
+
+        verify(mockResponseHandler).prepare();
+        verifyNoMoreInteractions(mockResponseHandler);
+    }
+
+    @Test
+    public void prepare_scopeChangedOutOfRange_delegatesTwice() {
+        assertThat(handlerUnderTest.prepare()).isSameAs(fakeFuture1);
+        scope.set(11);
+        assertThat(handlerUnderTest.prepare()).isSameAs(fakeFuture2);
+
+        verify(mockResponseHandler, times(2)).prepare();
+        verifyNoMoreInteractions(mockResponseHandler);
+    }
+
+    @Test
+    public void prepare_appearsToBeThreadSafe() {
+        handlerUnderTest =
+            IdempotentAsyncResponseHandler.create(
+                mockResponseHandler,
+                () -> {
+                    int result = scope.get();
+                    try {
+                        Thread.sleep(10L);
+                    } catch (InterruptedException e) {
+                        fail();
+                    }
+                    return result;
+                    },
+                Integer::equals);
+
+        IntStream.range(0, 200).parallel().forEach(i -> handlerUnderTest.prepare());
+        verify(mockResponseHandler).prepare();
+        verifyNoMoreInteractions(mockResponseHandler);
+    }
+}
\ No newline at end of file
diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/async/SimpleRequestProviderTckTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/async/SimpleRequestProviderTckTest.java
index 1cf9410e21fd..aad8819b0860 100644
--- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/async/SimpleRequestProviderTckTest.java
+++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/async/SimpleRequestProviderTckTest.java
@@ -1,3 +1,18 @@
+/*
+ * 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.
+ */
+
 package software.amazon.awssdk.core.internal.http.async;
 
 import java.io.ByteArrayInputStream;
diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/loader/CachingSdkHttpServiceProviderTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/loader/CachingSdkHttpServiceProviderTest.java
index 53e0d06a4f6d..b3e4d31d4736 100644
--- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/loader/CachingSdkHttpServiceProviderTest.java
+++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/loader/CachingSdkHttpServiceProviderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/loader/ClasspathSdkHttpServiceProviderTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/loader/ClasspathSdkHttpServiceProviderTest.java
index 6f2b4c950118..0cacc493dc44 100644
--- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/loader/ClasspathSdkHttpServiceProviderTest.java
+++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/loader/ClasspathSdkHttpServiceProviderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/loader/SdkHttpServiceProviderChainTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/loader/SdkHttpServiceProviderChainTest.java
index 622b4804a88f..398652a4eec8 100644
--- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/loader/SdkHttpServiceProviderChainTest.java
+++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/loader/SdkHttpServiceProviderChainTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/loader/SystemPropertyHttpServiceProviderTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/loader/SystemPropertyHttpServiceProviderTest.java
index a26057f00abf..a8d8b2dc0048 100644
--- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/loader/SystemPropertyHttpServiceProviderTest.java
+++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/loader/SystemPropertyHttpServiceProviderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/pipeline/stages/ApiCallAttemptTimeoutTrackingStageTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/pipeline/stages/ApiCallAttemptTimeoutTrackingStageTest.java
index b8ce4e0fe052..7c6974a0d65b 100644
--- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/pipeline/stages/ApiCallAttemptTimeoutTrackingStageTest.java
+++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/pipeline/stages/ApiCallAttemptTimeoutTrackingStageTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -31,18 +31,17 @@
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
+import software.amazon.awssdk.core.Response;
 import software.amazon.awssdk.core.SdkRequest;
 import software.amazon.awssdk.core.SdkRequestOverrideConfiguration;
 import software.amazon.awssdk.core.client.config.SdkClientConfiguration;
 import software.amazon.awssdk.core.http.NoopTestRequest;
-import software.amazon.awssdk.core.internal.Response;
 import software.amazon.awssdk.core.internal.http.HttpClientDependencies;
 import software.amazon.awssdk.core.internal.http.RequestExecutionContext;
 import software.amazon.awssdk.core.internal.http.pipeline.RequestPipeline;
 import software.amazon.awssdk.core.internal.http.timers.ApiCallTimeoutTracker;
 import software.amazon.awssdk.core.internal.http.timers.ClientExecutionAndRequestTimerTestUtils;
 import software.amazon.awssdk.core.internal.http.timers.NoOpTimeoutTracker;
-import software.amazon.awssdk.core.internal.util.CapacityManager;
 import software.amazon.awssdk.http.SdkHttpFullRequest;
 
 @RunWith(MockitoJUnitRunner.class)
@@ -66,7 +65,6 @@ public void setUp() throws Exception {
                                                                                    SdkClientConfiguration.builder()
                                                                                                          .option(SCHEDULED_EXECUTOR_SERVICE, timeoutExecutor)
                                                                                                          .build())
-                                                                               .capacityManager(mock(CapacityManager.class))
                                                                                .build(), wrapped);
     }
 
diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/pipeline/stages/ApiCallTimeoutTrackingStageTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/pipeline/stages/ApiCallTimeoutTrackingStageTest.java
index 952153c8b09a..7a1b9d58f652 100644
--- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/pipeline/stages/ApiCallTimeoutTrackingStageTest.java
+++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/pipeline/stages/ApiCallTimeoutTrackingStageTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -30,6 +30,7 @@
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
+import software.amazon.awssdk.core.Response;
 import software.amazon.awssdk.core.SdkRequest;
 import software.amazon.awssdk.core.SdkRequestOverrideConfiguration;
 import software.amazon.awssdk.core.client.config.SdkClientConfiguration;
@@ -37,12 +38,10 @@
 import software.amazon.awssdk.core.exception.AbortedException;
 import software.amazon.awssdk.core.exception.ApiCallTimeoutException;
 import software.amazon.awssdk.core.http.NoopTestRequest;
-import software.amazon.awssdk.core.internal.Response;
 import software.amazon.awssdk.core.internal.http.HttpClientDependencies;
 import software.amazon.awssdk.core.internal.http.RequestExecutionContext;
 import software.amazon.awssdk.core.internal.http.pipeline.RequestPipeline;
 import software.amazon.awssdk.core.internal.http.timers.ClientExecutionAndRequestTimerTestUtils;
-import software.amazon.awssdk.core.internal.util.CapacityManager;
 import software.amazon.awssdk.http.SdkHttpFullRequest;
 import software.amazon.awssdk.utils.ThreadFactoryBuilder;
 
@@ -64,7 +63,6 @@ public void setUp() throws Exception {
                                                                                                                        (SdkClientOption
                                                                                                                             .SCHEDULED_EXECUTOR_SERVICE, timeoutExecutor)
                                                                                                                    .build())
-                                                                        .capacityManager(mock(CapacityManager.class))
                                                                         .build(),
                                                   wrapped);
     }
diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/pipeline/stages/AsyncApiCallTimeoutTrackingStageTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/pipeline/stages/AsyncApiCallTimeoutTrackingStageTest.java
index 8f1bbc703325..dfecd8482ead 100644
--- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/pipeline/stages/AsyncApiCallTimeoutTrackingStageTest.java
+++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/pipeline/stages/AsyncApiCallTimeoutTrackingStageTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -34,9 +34,9 @@
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 import software.amazon.awssdk.core.SdkRequest;
+import software.amazon.awssdk.core.client.config.SdkClientConfiguration;
 import software.amazon.awssdk.core.client.config.SdkClientOption;
 import software.amazon.awssdk.core.http.NoopTestRequest;
-import software.amazon.awssdk.core.client.config.SdkClientConfiguration;
 import software.amazon.awssdk.core.internal.http.HttpClientDependencies;
 import software.amazon.awssdk.core.internal.http.RequestExecutionContext;
 import software.amazon.awssdk.core.internal.http.pipeline.RequestPipeline;
@@ -82,7 +82,6 @@ public void methodSetup() throws Exception {
 
         dependencies = HttpClientDependencies.builder()
                 .clientConfiguration(configuration)
-                .capacityManager(capacityManager)
                 .build();
 
         httpRequest = SdkHttpFullRequest.builder()
diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/pipeline/stages/ExceptionReportingUtilsTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/pipeline/stages/ExceptionReportingUtilsTest.java
index cd8869a8b171..4742dcfb3a5d 100644
--- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/pipeline/stages/ExceptionReportingUtilsTest.java
+++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/pipeline/stages/ExceptionReportingUtilsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/pipeline/stages/MakeAsyncHttpRequestStageTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/pipeline/stages/MakeAsyncHttpRequestStageTest.java
index 2efa6418e6e1..3e78313a9920 100644
--- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/pipeline/stages/MakeAsyncHttpRequestStageTest.java
+++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/pipeline/stages/MakeAsyncHttpRequestStageTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -24,6 +24,7 @@
 import static software.amazon.awssdk.core.client.config.SdkClientOption.API_CALL_ATTEMPT_TIMEOUT;
 import static software.amazon.awssdk.core.client.config.SdkClientOption.ASYNC_HTTP_CLIENT;
 import static software.amazon.awssdk.core.client.config.SdkClientOption.SCHEDULED_EXECUTOR_SERVICE;
+import static software.amazon.awssdk.core.internal.util.AsyncResponseHandlerTestUtils.combinedAsyncResponseHandler;
 
 import java.time.Duration;
 import java.util.concurrent.CompletableFuture;
@@ -36,14 +37,13 @@
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 import software.amazon.awssdk.core.client.config.SdkAdvancedAsyncClientOption;
+import software.amazon.awssdk.core.client.config.SdkClientConfiguration;
 import software.amazon.awssdk.core.http.ExecutionContext;
 import software.amazon.awssdk.core.http.NoopTestRequest;
-import software.amazon.awssdk.core.client.config.SdkClientConfiguration;
 import software.amazon.awssdk.core.internal.http.HttpClientDependencies;
 import software.amazon.awssdk.core.internal.http.RequestExecutionContext;
 import software.amazon.awssdk.core.internal.http.timers.ClientExecutionAndRequestTimerTestUtils;
 import software.amazon.awssdk.core.internal.util.AsyncResponseHandlerTestUtils;
-import software.amazon.awssdk.core.internal.util.CapacityManager;
 import software.amazon.awssdk.http.async.SdkAsyncHttpClient;
 import utils.ValidSdkObjects;
 
@@ -71,8 +71,10 @@ public void setup() {
 
     @Test
     public void apiCallAttemptTimeoutEnabled_shouldInvokeExecutor() throws Exception {
-        stage = new MakeAsyncHttpRequestStage<>(AsyncResponseHandlerTestUtils.noOpResponseHandler(), AsyncResponseHandlerTestUtils.noOpResponseHandler(),
-                                              clientDependencies(Duration.ofMillis(1000)));
+        stage = new MakeAsyncHttpRequestStage<>(
+            combinedAsyncResponseHandler(AsyncResponseHandlerTestUtils.noOpResponseHandler(),
+                                         AsyncResponseHandlerTestUtils.noOpResponseHandler()),
+            clientDependencies(Duration.ofMillis(1000)));
         stage.execute(ValidSdkObjects.sdkHttpFullRequest().build(), requestContext());
 
         verify(timeoutExecutor, times(1)).schedule(any(Runnable.class), anyLong(), any(TimeUnit.class));
@@ -80,7 +82,10 @@ public void apiCallAttemptTimeoutEnabled_shouldInvokeExecutor() throws Exception
 
     @Test
     public void apiCallAttemptTimeoutNotEnabled_shouldNotInvokeExecutor() throws Exception {
-        stage = new MakeAsyncHttpRequestStage<>(AsyncResponseHandlerTestUtils.noOpResponseHandler(), AsyncResponseHandlerTestUtils.noOpResponseHandler(), clientDependencies(null));
+        stage = new MakeAsyncHttpRequestStage<>(
+            combinedAsyncResponseHandler(AsyncResponseHandlerTestUtils.noOpResponseHandler(),
+                                         AsyncResponseHandlerTestUtils.noOpResponseHandler()),
+            clientDependencies(null));
         stage.execute(ValidSdkObjects.sdkHttpFullRequest().build(), requestContext());
 
         verify(timeoutExecutor, never()).schedule(any(Runnable.class), anyLong(), any(TimeUnit.class));
@@ -97,7 +102,6 @@ private HttpClientDependencies clientDependencies(Duration timeout) {
 
         return HttpClientDependencies.builder()
                                      .clientConfiguration(configuration)
-                                     .capacityManager(new CapacityManager(2))
                                      .build();
     }
 
diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/pipeline/stages/MergeCustomHeadersStageTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/pipeline/stages/MergeCustomHeadersStageTest.java
new file mode 100644
index 000000000000..cdebe9205c3b
--- /dev/null
+++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/pipeline/stages/MergeCustomHeadersStageTest.java
@@ -0,0 +1,185 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.core.internal.http.pipeline.stages;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import software.amazon.awssdk.core.SdkRequest;
+import software.amazon.awssdk.core.SdkRequestOverrideConfiguration;
+import software.amazon.awssdk.core.client.config.SdkClientConfiguration;
+import software.amazon.awssdk.core.client.config.SdkClientOption;
+import software.amazon.awssdk.core.http.ExecutionContext;
+import software.amazon.awssdk.core.http.NoopTestRequest;
+import software.amazon.awssdk.core.internal.http.HttpClientDependencies;
+import software.amazon.awssdk.core.internal.http.RequestExecutionContext;
+import software.amazon.awssdk.core.internal.http.timers.ClientExecutionAndRequestTimerTestUtils;
+import software.amazon.awssdk.http.SdkHttpFullRequest;
+import utils.ValidSdkObjects;
+
+@RunWith(Parameterized.class)
+public class MergeCustomHeadersStageTest {
+    // List of headers that may appear only once in a request; i.e. is not a list of values.
+    // Taken from https://github.com/apache/httpcomponents-client/blob/81c1bc4dc3ca5a3134c5c60e8beff08be2fd8792/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/HttpTestUtils.java#L69-L85 with modifications:
+    // removed: accept-ranges, if-match, if-none-match, vary since it looks like they're defined as lists
+    private static final Set<String> SINGLE_HEADERS = Stream.of("age", "authorization",
+            "content-length", "content-location", "content-md5", "content-range", "content-type",
+            "date", "etag", "expires", "from", "host", "if-modified-since", "if-range",
+            "if-unmodified-since", "last-modified", "location", "max-forwards",
+            "proxy-authorization", "range", "referer", "retry-after", "server", "user-agent")
+            .collect(Collectors.toSet());
+
+    @Parameterized.Parameters(name = "Header = {0}")
+    public static Collection<Object> data() {
+        return Arrays.asList(SINGLE_HEADERS.toArray(new Object[0]));
+    }
+
+    @Parameterized.Parameter
+    public String singleHeaderName;
+
+    @Test
+    public void singleHeader_inMarshalledRequest_overriddenOnClient() throws Exception {
+        SdkHttpFullRequest.Builder requestBuilder = SdkHttpFullRequest.builder();
+
+        RequestExecutionContext ctx = requestContext(NoopTestRequest.builder().build());
+        requestBuilder.putHeader(singleHeaderName, "marshaller");
+
+        Map<String, List<String>> clientHeaders = new HashMap<>();
+        clientHeaders.put(singleHeaderName, Collections.singletonList("client"));
+
+        HttpClientDependencies clientDeps = HttpClientDependencies.builder()
+                .clientConfiguration(SdkClientConfiguration.builder()
+                        .option(SdkClientOption.ADDITIONAL_HTTP_HEADERS, clientHeaders)
+                        .build())
+                .build();
+        MergeCustomHeadersStage stage = new MergeCustomHeadersStage(clientDeps);
+
+        stage.execute(requestBuilder, ctx);
+
+        assertThat(requestBuilder.headers().get(singleHeaderName)).containsExactly("client");
+    }
+
+    @Test
+    public void singleHeader_inMarshalledRequest_overriddenOnRequest() throws Exception {
+        SdkHttpFullRequest.Builder requestBuilder = SdkHttpFullRequest.builder();
+        requestBuilder.putHeader(singleHeaderName, "marshaller");
+
+        RequestExecutionContext ctx = requestContext(NoopTestRequest.builder()
+                .overrideConfiguration(SdkRequestOverrideConfiguration.builder()
+                        .putHeader(singleHeaderName, "request").build())
+                .build());
+
+        HttpClientDependencies clientDeps = HttpClientDependencies.builder()
+                .clientConfiguration(SdkClientConfiguration.builder()
+                        .option(SdkClientOption.ADDITIONAL_HTTP_HEADERS, Collections.emptyMap())
+                        .build())
+                .build();
+        MergeCustomHeadersStage stage = new MergeCustomHeadersStage(clientDeps);
+
+        stage.execute(requestBuilder, ctx);
+
+        assertThat(requestBuilder.headers().get(singleHeaderName)).containsExactly("request");
+    }
+
+    @Test
+    public void singleHeader_inClient_overriddenOnRequest() throws Exception {
+        SdkHttpFullRequest.Builder requestBuilder = SdkHttpFullRequest.builder();
+
+        RequestExecutionContext ctx = requestContext(NoopTestRequest.builder()
+                .overrideConfiguration(SdkRequestOverrideConfiguration.builder()
+                        .putHeader(singleHeaderName, "request").build())
+                .build());
+
+        Map<String, List<String>> clientHeaders = new HashMap<>();
+        clientHeaders.put(singleHeaderName, Collections.singletonList("client"));
+        HttpClientDependencies clientDeps = HttpClientDependencies.builder()
+                .clientConfiguration(SdkClientConfiguration.builder()
+                        .option(SdkClientOption.ADDITIONAL_HTTP_HEADERS, clientHeaders)
+                        .build())
+                .build();
+        MergeCustomHeadersStage stage = new MergeCustomHeadersStage(clientDeps);
+
+        stage.execute(requestBuilder, ctx);
+
+        assertThat(requestBuilder.headers().get(singleHeaderName)).containsExactly("request");
+    }
+
+    @Test
+    public void singleHeader_inMarshalledRequest_inClient_inRequest() throws Exception {
+        SdkHttpFullRequest.Builder requestBuilder = SdkHttpFullRequest.builder();
+        requestBuilder.putHeader(singleHeaderName, "marshaller");
+
+        RequestExecutionContext ctx = requestContext(NoopTestRequest.builder()
+                .overrideConfiguration(SdkRequestOverrideConfiguration.builder()
+                        .putHeader(singleHeaderName, "request").build())
+                .build());
+
+        Map<String, List<String>> clientHeaders = new HashMap<>();
+        clientHeaders.put(singleHeaderName, Collections.singletonList("client"));
+        HttpClientDependencies clientDeps = HttpClientDependencies.builder()
+                .clientConfiguration(SdkClientConfiguration.builder()
+                        .option(SdkClientOption.ADDITIONAL_HTTP_HEADERS, clientHeaders)
+                        .build())
+                .build();
+        MergeCustomHeadersStage stage = new MergeCustomHeadersStage(clientDeps);
+
+        stage.execute(requestBuilder, ctx);
+
+        assertThat(requestBuilder.headers().get(singleHeaderName)).containsExactly("request");
+    }
+
+    @Test
+    public void singleHeader_inRequestAsList_keepsMultipleValues() throws Exception {
+        SdkHttpFullRequest.Builder requestBuilder = SdkHttpFullRequest.builder();
+        requestBuilder.putHeader(singleHeaderName, "marshaller");
+
+        RequestExecutionContext ctx = requestContext(NoopTestRequest.builder()
+                .overrideConfiguration(SdkRequestOverrideConfiguration.builder()
+                        .putHeader(singleHeaderName, Arrays.asList("request", "request2", "request3"))
+                        .build())
+                .build());
+
+        Map<String, List<String>> clientHeaders = new HashMap<>();
+        HttpClientDependencies clientDeps = HttpClientDependencies.builder()
+                .clientConfiguration(SdkClientConfiguration.builder()
+                        .option(SdkClientOption.ADDITIONAL_HTTP_HEADERS, clientHeaders)
+                        .build())
+                .build();
+        MergeCustomHeadersStage stage = new MergeCustomHeadersStage(clientDeps);
+
+        stage.execute(requestBuilder, ctx);
+
+        assertThat(requestBuilder.headers().get(singleHeaderName)).containsExactly("request", "request2", "request3");
+    }
+
+    private RequestExecutionContext requestContext(SdkRequest request) {
+        ExecutionContext executionContext = ClientExecutionAndRequestTimerTestUtils.executionContext(ValidSdkObjects.sdkHttpFullRequest().build());
+        return RequestExecutionContext.builder()
+                .executionContext(executionContext)
+                .originalRequest(request)
+                .build();
+    }
+}
diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/pipeline/stages/MoveParametersToBodyStageTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/pipeline/stages/MoveParametersToBodyStageTest.java
deleted file mode 100644
index b3dfe24a0390..000000000000
--- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/pipeline/stages/MoveParametersToBodyStageTest.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.core.internal.http.pipeline.stages;
-
-import static java.util.Collections.singletonList;
-import static org.assertj.core.api.Assertions.assertThat;
-
-import java.io.ByteArrayInputStream;
-import java.nio.charset.StandardCharsets;
-import java.util.stream.Stream;
-import org.junit.Test;
-import software.amazon.awssdk.core.http.ExecutionContext;
-import software.amazon.awssdk.core.http.NoopTestRequest;
-import software.amazon.awssdk.core.internal.http.RequestExecutionContext;
-import software.amazon.awssdk.core.internal.http.timers.ClientExecutionAndRequestTimerTestUtils;
-import software.amazon.awssdk.http.ContentStreamProvider;
-import software.amazon.awssdk.http.SdkHttpFullRequest;
-import software.amazon.awssdk.http.SdkHttpMethod;
-import software.amazon.awssdk.utils.IoUtils;
-import utils.ValidSdkObjects;
-
-public class MoveParametersToBodyStageTest {
-
-    private final MoveParametersToBodyStage sut = new MoveParametersToBodyStage();
-
-    @Test
-    public void postRequestsWithNoBodyHaveTheirParametersMovedToTheBody() throws Exception {
-        SdkHttpFullRequest.Builder mutableRequest = ValidSdkObjects.sdkHttpFullRequest()
-                                                                   .method(SdkHttpMethod.POST)
-                                                                   .putRawQueryParameter("key", singletonList("value"));
-
-        SdkHttpFullRequest output = sut.execute(mutableRequest, requestContext(mutableRequest)).build();
-
-        assertThat(output.rawQueryParameters()).hasSize(0);
-        assertThat(output.headers())
-                .containsKey("Content-Length")
-                .containsEntry("Content-Type", singletonList("application/x-www-form-urlencoded; charset=utf-8"));
-        assertThat(output.contentStreamProvider()).isNotEmpty();
-    }
-
-    @Test
-    public void nonPostRequestsWithNoBodyAreUnaltered() throws Exception {
-        Stream.of(SdkHttpMethod.values())
-              .filter(m -> !m.equals(SdkHttpMethod.POST))
-              .forEach(this::nonPostRequestsUnaltered);
-    }
-
-    @Test
-    public void postWithContentIsUnaltered() throws Exception {
-        byte[] contentBytes = "hello".getBytes(StandardCharsets.UTF_8);
-        ContentStreamProvider contentProvider = () -> new ByteArrayInputStream(contentBytes);
-        SdkHttpFullRequest.Builder mutableRequest = ValidSdkObjects.sdkHttpFullRequest()
-                                                                   .contentStreamProvider(contentProvider)
-                                                                   .method(SdkHttpMethod.POST)
-                                                                   .clearHeaders()
-                                                                   .putRawQueryParameter("key", singletonList("value"));
-
-        SdkHttpFullRequest output = sut.execute(mutableRequest, requestContext(mutableRequest)).build();
-
-        assertThat(output.rawQueryParameters()).hasSize(1);
-        assertThat(output.headers()).hasSize(0);
-        assertThat(IoUtils.toByteArray(output.contentStreamProvider().get().newStream())).isEqualTo(contentBytes);
-    }
-
-    @Test
-    public void onlyAlterRequestsIfParamsArePresent() throws Exception {
-        SdkHttpFullRequest.Builder mutableRequest = ValidSdkObjects.sdkHttpFullRequest()
-                                                                   .clearHeaders()
-                                                                   .method(SdkHttpMethod.POST);
-
-        SdkHttpFullRequest output = sut.execute(mutableRequest, requestContext(mutableRequest)).build();
-
-        assertThat(output.rawQueryParameters()).hasSize(0);
-        assertThat(output.headers()).hasSize(0);
-        assertThat(output.contentStreamProvider()).isEmpty();
-    }
-
-    private void nonPostRequestsUnaltered(SdkHttpMethod method) {
-        SdkHttpFullRequest.Builder mutableRequest = ValidSdkObjects.sdkHttpFullRequest()
-                                                                   .method(method)
-                                                                   .clearHeaders()
-                                                                   .putRawQueryParameter("key", singletonList("value"));
-
-        SdkHttpFullRequest output = sut.execute(mutableRequest, requestContext(mutableRequest)).build();
-
-        assertThat(output.rawQueryParameters()).hasSize(1);
-        assertThat(output.headers()).hasSize(0);
-        assertThat(output.contentStreamProvider()).isEmpty();
-    }
-
-    private RequestExecutionContext requestContext(SdkHttpFullRequest.Builder mutableRequest) {
-        ExecutionContext executionContext = ClientExecutionAndRequestTimerTestUtils.executionContext(mutableRequest.build());
-        return RequestExecutionContext.builder()
-                                      .executionContext(executionContext)
-                                      .originalRequest(NoopTestRequest.builder().build())
-                                      .build();
-    }
-}
diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/pipeline/stages/TimeoutExceptionHandlingStageTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/pipeline/stages/TimeoutExceptionHandlingStageTest.java
index dea37df21d64..753f1babdb1a 100644
--- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/pipeline/stages/TimeoutExceptionHandlingStageTest.java
+++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/pipeline/stages/TimeoutExceptionHandlingStageTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -28,20 +28,19 @@
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
+import software.amazon.awssdk.core.Response;
 import software.amazon.awssdk.core.SdkRequest;
 import software.amazon.awssdk.core.SdkRequestOverrideConfiguration;
 import software.amazon.awssdk.core.client.config.SdkClientConfiguration;
 import software.amazon.awssdk.core.exception.AbortedException;
 import software.amazon.awssdk.core.exception.ApiCallAttemptTimeoutException;
 import software.amazon.awssdk.core.http.NoopTestRequest;
-import software.amazon.awssdk.core.internal.Response;
 import software.amazon.awssdk.core.internal.http.HttpClientDependencies;
 import software.amazon.awssdk.core.internal.http.RequestExecutionContext;
 import software.amazon.awssdk.core.internal.http.pipeline.RequestPipeline;
 import software.amazon.awssdk.core.internal.http.timers.ApiCallTimeoutTracker;
 import software.amazon.awssdk.core.internal.http.timers.ClientExecutionAndRequestTimerTestUtils;
 import software.amazon.awssdk.core.internal.http.timers.TimeoutTask;
-import software.amazon.awssdk.core.internal.util.CapacityManager;
 import software.amazon.awssdk.http.SdkHttpFullRequest;
 import utils.ValidSdkObjects;
 
@@ -66,7 +65,6 @@ public class TimeoutExceptionHandlingStageTest {
     @Before
     public void setup() {
         stage = new TimeoutExceptionHandlingStage<>(HttpClientDependencies.builder()
-                                                                          .capacityManager(new CapacityManager(1))
                                                                           .clientConfiguration(SdkClientConfiguration.builder().build())
                                                                           .build(), requestPipeline);
     }
diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/request/SlowExecutionInterceptor.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/request/SlowExecutionInterceptor.java
index ffaf877291c1..ee3281476a30 100644
--- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/request/SlowExecutionInterceptor.java
+++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/request/SlowExecutionInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/response/DummyResponseHandler.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/response/DummyResponseHandler.java
index e6c474c957bd..e53e3caa3ff7 100644
--- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/response/DummyResponseHandler.java
+++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/response/DummyResponseHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/response/EmptySdkResponseHandler.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/response/EmptySdkResponseHandler.java
index 33046b4d7ffb..66abc1a3a3b0 100644
--- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/response/EmptySdkResponseHandler.java
+++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/response/EmptySdkResponseHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/response/ErrorDuringUnmarshallingResponseHandler.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/response/ErrorDuringUnmarshallingResponseHandler.java
index 78c62670b925..26bab6063c66 100644
--- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/response/ErrorDuringUnmarshallingResponseHandler.java
+++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/response/ErrorDuringUnmarshallingResponseHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/response/NullErrorResponseHandler.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/response/NullErrorResponseHandler.java
index b9c24f11a7d0..9531fe2ad2d5 100644
--- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/response/NullErrorResponseHandler.java
+++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/response/NullErrorResponseHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/response/NullResponseHandler.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/response/NullResponseHandler.java
index ca165838e7bb..06894d2ebc35 100644
--- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/response/NullResponseHandler.java
+++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/response/NullResponseHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/response/UnresponsiveErrorResponseHandler.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/response/UnresponsiveErrorResponseHandler.java
index b219b98fb49d..e751b1769060 100644
--- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/response/UnresponsiveErrorResponseHandler.java
+++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/response/UnresponsiveErrorResponseHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/response/UnresponsiveResponseHandler.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/response/UnresponsiveResponseHandler.java
index 528cb13be40d..1af415a7f3f4 100644
--- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/response/UnresponsiveResponseHandler.java
+++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/response/UnresponsiveResponseHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/timers/AsyncHttpClientApiCallTimeoutTests.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/timers/AsyncHttpClientApiCallTimeoutTests.java
index facae784d1bd..5528486f3ed7 100644
--- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/timers/AsyncHttpClientApiCallTimeoutTests.java
+++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/timers/AsyncHttpClientApiCallTimeoutTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -22,19 +22,23 @@
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static software.amazon.awssdk.core.internal.http.timers.TimeoutTestConstants.API_CALL_TIMEOUT;
 import static software.amazon.awssdk.core.internal.http.timers.TimeoutTestConstants.SLOW_REQUEST_HANDLER_TIMEOUT;
+import static software.amazon.awssdk.core.internal.util.AsyncResponseHandlerTestUtils.combinedAsyncResponseHandler;
 import static software.amazon.awssdk.core.internal.util.AsyncResponseHandlerTestUtils.noOpResponseHandler;
 import static software.amazon.awssdk.core.internal.util.AsyncResponseHandlerTestUtils.superSlowResponseHandler;
 import static utils.HttpTestUtils.testAsyncClientBuilder;
 
-import com.github.tomakehurst.wiremock.junit.WireMockRule;
 import java.io.ByteArrayInputStream;
 import java.time.Duration;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.concurrent.CompletableFuture;
+
+import com.github.tomakehurst.wiremock.junit.WireMockRule;
+
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
+
 import software.amazon.awssdk.core.exception.ApiCallAttemptTimeoutException;
 import software.amazon.awssdk.core.exception.ApiCallTimeoutException;
 import software.amazon.awssdk.core.exception.SdkServiceException;
@@ -42,10 +46,10 @@
 import software.amazon.awssdk.core.http.NoopTestRequest;
 import software.amazon.awssdk.core.interceptor.ExecutionAttributes;
 import software.amazon.awssdk.core.interceptor.ExecutionInterceptor;
-import software.amazon.awssdk.core.internal.http.AmazonAsyncHttpClient;
-import software.amazon.awssdk.core.internal.http.request.SlowExecutionInterceptor;
 import software.amazon.awssdk.core.interceptor.ExecutionInterceptorChain;
 import software.amazon.awssdk.core.interceptor.InterceptorContext;
+import software.amazon.awssdk.core.internal.http.AmazonAsyncHttpClient;
+import software.amazon.awssdk.core.internal.http.request.SlowExecutionInterceptor;
 import software.amazon.awssdk.core.retry.RetryPolicy;
 import software.amazon.awssdk.core.signer.NoOpSigner;
 import software.amazon.awssdk.http.SdkHttpFullRequest;
@@ -77,8 +81,8 @@ public void errorResponse_SlowErrorResponseHandler_ThrowsApiCallTimeoutException
                                              .originalRequest(NoopTestRequest.builder().build())
                                              .executionContext(executionContext)
                                              .request(generateRequest())
-                                             .errorResponseHandler(superSlowResponseHandler(API_CALL_TIMEOUT.toMillis()))
-                                             .execute(noOpResponseHandler());
+                                             .execute(combinedAsyncResponseHandler(noOpResponseHandler(),
+                                                                                   superSlowResponseHandler(API_CALL_TIMEOUT.toMillis())));
 
         assertThatThrownBy(future::join).hasCauseInstanceOf(ApiCallTimeoutException.class);
     }
@@ -105,12 +109,13 @@ public void errorResponse_SlowAfterErrorRequestHandler_ThrowsApiCallTimeoutExcep
                                                             .interceptorContext(incerceptorContext)
                                                             .build();
 
-        CompletableFuture future = httpClient.requestExecutionBuilder()
-                                             .originalRequest(NoopTestRequest.builder().build())
-                                             .request(request)
-                                             .errorResponseHandler(noOpResponseHandler(SdkServiceException.builder().build()))
-                                             .executionContext(executionContext)
-                                             .execute(noOpResponseHandler());
+        CompletableFuture future =
+            httpClient.requestExecutionBuilder()
+                      .originalRequest(NoopTestRequest.builder().build())
+                      .request(request)
+                      .executionContext(executionContext)
+                      .execute(combinedAsyncResponseHandler(noOpResponseHandler(),
+                                                            noOpResponseHandler(SdkServiceException.builder().build())));
 
         assertThatThrownBy(future::join).hasCauseInstanceOf(ApiCallTimeoutException.class);
     }
diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/timers/ClientExecutionAndRequestTimerTestUtils.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/timers/ClientExecutionAndRequestTimerTestUtils.java
index bbbb13ca0488..5b439a711b03 100644
--- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/timers/ClientExecutionAndRequestTimerTestUtils.java
+++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/timers/ClientExecutionAndRequestTimerTestUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -16,11 +16,13 @@
 package software.amazon.awssdk.core.internal.http.timers;
 
 import static org.junit.Assert.assertEquals;
+import static software.amazon.awssdk.core.internal.util.ResponseHandlerTestUtils.combinedSyncResponseHandler;
 
 import java.net.URI;
 import java.util.Collections;
 import java.util.concurrent.ScheduledThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
+
 import software.amazon.awssdk.core.http.ExecutionContext;
 import software.amazon.awssdk.core.http.NoopTestRequest;
 import software.amazon.awssdk.core.interceptor.ExecutionAttributes;
@@ -99,8 +101,8 @@ public static void execute(AmazonSyncHttpClient httpClient, SdkHttpFullRequest r
                 .request(request)
                 .originalRequest(NoopTestRequest.builder().build())
                   .executionContext(executionContext(request))
-                .errorResponseHandler(new NullErrorResponseHandler())
-                .execute(new ErrorDuringUnmarshallingResponseHandler());
+                .execute(combinedSyncResponseHandler(new ErrorDuringUnmarshallingResponseHandler(),
+                                                     new NullErrorResponseHandler()));
     }
 
     public static ExecutionContext executionContext(SdkHttpFullRequest request) {
diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/timers/HttpClientApiCallAttemptTimeoutTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/timers/HttpClientApiCallAttemptTimeoutTest.java
index 68cf92df337c..b1c6c36642b5 100644
--- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/timers/HttpClientApiCallAttemptTimeoutTest.java
+++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/timers/HttpClientApiCallAttemptTimeoutTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -22,16 +22,20 @@
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static software.amazon.awssdk.core.internal.http.timers.TimeoutTestConstants.API_CALL_TIMEOUT;
 import static software.amazon.awssdk.core.internal.http.timers.TimeoutTestConstants.SLOW_REQUEST_HANDLER_TIMEOUT;
-import static software.amazon.awssdk.core.internal.util.ResponseHandlerTestUtils.noOpResponseHandler;
+import static software.amazon.awssdk.core.internal.util.ResponseHandlerTestUtils.combinedSyncResponseHandler;
+import static software.amazon.awssdk.core.internal.util.ResponseHandlerTestUtils.noOpSyncResponseHandler;
 import static software.amazon.awssdk.core.internal.util.ResponseHandlerTestUtils.superSlowResponseHandler;
 import static utils.HttpTestUtils.testClientBuilder;
 
-import com.github.tomakehurst.wiremock.junit.WireMockRule;
 import java.io.ByteArrayInputStream;
 import java.util.Arrays;
+
+import com.github.tomakehurst.wiremock.junit.WireMockRule;
+
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
+
 import software.amazon.awssdk.core.exception.ApiCallAttemptTimeoutException;
 import software.amazon.awssdk.core.http.ExecutionContext;
 import software.amazon.awssdk.core.http.NoopTestRequest;
@@ -67,7 +71,8 @@ public void successfulResponse_SlowResponseHandler_ThrowsApiCallTimeoutException
         stubFor(get(anyUrl())
                     .willReturn(aResponse().withStatus(200).withBody("{}")));
 
-        assertThatThrownBy(() -> requestBuilder().execute(superSlowResponseHandler(API_CALL_TIMEOUT.toMillis())))
+        assertThatThrownBy(() -> requestBuilder().execute(combinedSyncResponseHandler(
+            superSlowResponseHandler(API_CALL_TIMEOUT.toMillis()), null)))
             .isInstanceOf(ApiCallAttemptTimeoutException.class);
     }
 
@@ -82,8 +87,8 @@ public void errorResponse_SlowErrorResponseHandler_ThrowsApiCallTimeoutException
                                            .originalRequest(NoopTestRequest.builder().build())
                                            .executionContext(executionContext)
                                            .request(generateRequest())
-                                           .errorResponseHandler(superSlowResponseHandler(API_CALL_TIMEOUT.toMillis()))
-                                           .execute(noOpResponseHandler()))
+                                           .execute(combinedSyncResponseHandler(null,
+                                                                                superSlowResponseHandler(API_CALL_TIMEOUT.toMillis()))))
             .isInstanceOf(ApiCallAttemptTimeoutException.class);
     }
 
@@ -95,7 +100,7 @@ public void successfulResponse_SlowBeforeTransmissionExecutionInterceptor_Throws
             new SlowExecutionInterceptor().beforeTransmissionWaitInSeconds(SLOW_REQUEST_HANDLER_TIMEOUT);
 
         assertThatThrownBy(() -> requestBuilder().executionContext(withInterceptors(interceptor))
-                                                 .execute(noOpResponseHandler()))
+                                                 .execute(noOpSyncResponseHandler()))
             .isInstanceOf(ApiCallAttemptTimeoutException.class);
     }
 
@@ -106,7 +111,7 @@ public void successfulResponse_SlowAfterResponseExecutionInterceptor_ThrowsApiCa
         ExecutionInterceptor interceptor =
             new SlowExecutionInterceptor().afterTransmissionWaitInSeconds(SLOW_REQUEST_HANDLER_TIMEOUT);
         assertThatThrownBy(() -> requestBuilder().executionContext(withInterceptors(interceptor))
-                                                 .execute(noOpResponseHandler()))
+                                                 .execute(noOpSyncResponseHandler()))
             .isInstanceOf(ApiCallAttemptTimeoutException.class);
     }
 
diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/timers/HttpClientApiCallTimeoutTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/timers/HttpClientApiCallTimeoutTest.java
index aff1243dbc79..2b58e2a55706 100644
--- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/timers/HttpClientApiCallTimeoutTest.java
+++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/timers/HttpClientApiCallTimeoutTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -22,16 +22,20 @@
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static software.amazon.awssdk.core.internal.http.timers.TimeoutTestConstants.API_CALL_TIMEOUT;
 import static software.amazon.awssdk.core.internal.http.timers.TimeoutTestConstants.SLOW_REQUEST_HANDLER_TIMEOUT;
-import static software.amazon.awssdk.core.internal.util.ResponseHandlerTestUtils.noOpResponseHandler;
+import static software.amazon.awssdk.core.internal.util.ResponseHandlerTestUtils.combinedSyncResponseHandler;
+import static software.amazon.awssdk.core.internal.util.ResponseHandlerTestUtils.noOpSyncResponseHandler;
 import static software.amazon.awssdk.core.internal.util.ResponseHandlerTestUtils.superSlowResponseHandler;
 import static utils.HttpTestUtils.testClientBuilder;
 
-import com.github.tomakehurst.wiremock.junit.WireMockRule;
 import java.io.ByteArrayInputStream;
 import java.util.Arrays;
+
+import com.github.tomakehurst.wiremock.junit.WireMockRule;
+
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
+
 import software.amazon.awssdk.core.exception.ApiCallTimeoutException;
 import software.amazon.awssdk.core.http.ExecutionContext;
 import software.amazon.awssdk.core.http.NoopTestRequest;
@@ -67,7 +71,8 @@ public void successfulResponse_SlowResponseHandler_ThrowsApiCallTimeoutException
         stubFor(get(anyUrl())
                     .willReturn(aResponse().withStatus(200).withBody("{}")));
 
-        assertThatThrownBy(() -> requestBuilder().execute(superSlowResponseHandler(API_CALL_TIMEOUT.toMillis())))
+        assertThatThrownBy(() -> requestBuilder().execute(combinedSyncResponseHandler(
+            superSlowResponseHandler(API_CALL_TIMEOUT.toMillis()), null)))
             .isInstanceOf(ApiCallTimeoutException.class);
     }
 
@@ -82,8 +87,8 @@ public void errorResponse_SlowErrorResponseHandler_ThrowsApiCallTimeoutException
                                            .originalRequest(NoopTestRequest.builder().build())
                                            .executionContext(executionContext)
                                            .request(generateRequest())
-                                           .errorResponseHandler(superSlowResponseHandler(API_CALL_TIMEOUT.toMillis()))
-                                           .execute(noOpResponseHandler()))
+                                           .execute(combinedSyncResponseHandler(noOpSyncResponseHandler(),
+                                                                                superSlowResponseHandler(API_CALL_TIMEOUT.toMillis()))))
             .isInstanceOf(ApiCallTimeoutException.class);
     }
 
@@ -95,7 +100,7 @@ public void successfulResponse_SlowBeforeTransmissionExecutionInterceptor_Throws
             new SlowExecutionInterceptor().beforeTransmissionWaitInSeconds(SLOW_REQUEST_HANDLER_TIMEOUT);
 
         assertThatThrownBy(() -> requestBuilder().executionContext(withInterceptors(interceptor))
-                                                 .execute(noOpResponseHandler()))
+                                                 .execute(noOpSyncResponseHandler()))
             .isInstanceOf(ApiCallTimeoutException.class);
     }
 
@@ -106,7 +111,7 @@ public void successfulResponse_SlowAfterResponseExecutionInterceptor_ThrowsApiCa
         ExecutionInterceptor interceptor =
             new SlowExecutionInterceptor().afterTransmissionWaitInSeconds(SLOW_REQUEST_HANDLER_TIMEOUT);
         assertThatThrownBy(() -> requestBuilder().executionContext(withInterceptors(interceptor))
-                                                 .execute(noOpResponseHandler()))
+                                                 .execute(noOpSyncResponseHandler()))
             .isInstanceOf(ApiCallTimeoutException.class);
     }
 
diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/timers/SyncTimeoutTaskTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/timers/SyncTimeoutTaskTest.java
index 06dc13351261..27a4b027974f 100644
--- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/timers/SyncTimeoutTaskTest.java
+++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/timers/SyncTimeoutTaskTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/timers/TimeoutTestConstants.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/timers/TimeoutTestConstants.java
index 454015ea78d6..d8fe3fb741a8 100644
--- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/timers/TimeoutTestConstants.java
+++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/timers/TimeoutTestConstants.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/io/BufferedInputStreamResetTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/io/BufferedInputStreamResetTest.java
index 5d6a999147d3..9d2a1dd1a760 100644
--- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/io/BufferedInputStreamResetTest.java
+++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/io/BufferedInputStreamResetTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/io/ResettableInputStreamTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/io/ResettableInputStreamTest.java
index 88417e471e6b..a9195d8963a1 100644
--- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/io/ResettableInputStreamTest.java
+++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/io/ResettableInputStreamTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/retry/ClockSkewAdjusterTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/retry/ClockSkewAdjusterTest.java
index b82f605b20d7..ee057515a8d0 100644
--- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/retry/ClockSkewAdjusterTest.java
+++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/retry/ClockSkewAdjusterTest.java
@@ -1,3 +1,18 @@
+/*
+ * 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.
+ */
+
 package software.amazon.awssdk.core.internal.retry;
 
 import static java.time.temporal.ChronoUnit.HOURS;
diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/sync/FileContentStreamProviderTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/sync/FileContentStreamProviderTest.java
index 3589cb3a2232..9b6c9e1c83c1 100644
--- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/sync/FileContentStreamProviderTest.java
+++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/sync/FileContentStreamProviderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/util/AsyncResponseHandlerTestUtils.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/util/AsyncResponseHandlerTestUtils.java
index 2c8d45031387..177c8809cbd0 100644
--- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/util/AsyncResponseHandlerTestUtils.java
+++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/util/AsyncResponseHandlerTestUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -15,14 +15,18 @@
 
 package software.amazon.awssdk.core.internal.util;
 
+import java.nio.ByteBuffer;
+import java.util.concurrent.CompletableFuture;
+
 import org.reactivestreams.Publisher;
+
+import software.amazon.awssdk.core.Response;
 import software.amazon.awssdk.core.async.DrainingSubscriber;
+import software.amazon.awssdk.core.exception.SdkException;
+import software.amazon.awssdk.core.internal.http.async.CombinedResponseAsyncHttpResponseHandler;
 import software.amazon.awssdk.core.internal.http.TransformingAsyncResponseHandler;
 import software.amazon.awssdk.http.SdkHttpResponse;
 
-import java.nio.ByteBuffer;
-import java.util.concurrent.CompletableFuture;
-
 public class AsyncResponseHandlerTestUtils {
     private AsyncResponseHandlerTestUtils() {
     }
@@ -43,6 +47,16 @@ public static <T> TransformingAsyncResponseHandler<T> superSlowResponseHandler(T
         return new SuperSlowResponseHandler<>(result, sleepInMillis);
     }
 
+
+    public static <T> TransformingAsyncResponseHandler<Response<T>> combinedAsyncResponseHandler(
+        TransformingAsyncResponseHandler<T> successResponseHandler,
+        TransformingAsyncResponseHandler<? extends SdkException> failureResponseHandler) {
+
+        return new CombinedResponseAsyncHttpResponseHandler<>(
+            successResponseHandler == null ? noOpResponseHandler() : successResponseHandler,
+            failureResponseHandler == null ? noOpResponseHandler() : failureResponseHandler);
+    }
+
     private static class NoOpResponseHandler<T> implements TransformingAsyncResponseHandler<T> {
         private final CompletableFuture<T> cf = new CompletableFuture<>();
         private final T result;
diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/util/CapacityManagerTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/util/CapacityManagerTest.java
index 9b07263e065c..8e1c66f44522 100644
--- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/util/CapacityManagerTest.java
+++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/util/CapacityManagerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/util/MimetypeTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/util/MimetypeTest.java
index 5fd4d8d2a5ae..9f94d72e0032 100644
--- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/util/MimetypeTest.java
+++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/util/MimetypeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/util/ResponseHandlerTestUtils.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/util/ResponseHandlerTestUtils.java
index 8b79c46ab1c5..d3e2731cba1e 100644
--- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/util/ResponseHandlerTestUtils.java
+++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/util/ResponseHandlerTestUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -15,14 +15,17 @@
 
 package software.amazon.awssdk.core.internal.util;
 
+import software.amazon.awssdk.core.Response;
+import software.amazon.awssdk.core.exception.SdkException;
 import software.amazon.awssdk.core.exception.SdkServiceException;
 import software.amazon.awssdk.core.http.HttpResponseHandler;
+import software.amazon.awssdk.core.internal.http.CombinedResponseHandler;
 
 public final class ResponseHandlerTestUtils {
     private ResponseHandlerTestUtils() {
     }
 
-    public static HttpResponseHandler noOpResponseHandler() {
+    public static <T> HttpResponseHandler<T> noOpSyncResponseHandler() {
         return (response, executionAttributes) -> null;
     }
 
@@ -32,4 +35,13 @@ public static HttpResponseHandler<SdkServiceException> superSlowResponseHandler(
             return null;
         };
     }
+
+    public static <T> HttpResponseHandler<Response<T>> combinedSyncResponseHandler(
+        HttpResponseHandler<T> successResponseHandler,
+        HttpResponseHandler<? extends SdkException> failureResponseHandler) {
+
+        return new CombinedResponseHandler<>(
+            successResponseHandler == null ? noOpSyncResponseHandler() : successResponseHandler,
+            failureResponseHandler == null ? noOpSyncResponseHandler() : failureResponseHandler);
+    }
 }
diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/util/UserAgentUtilsTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/util/UserAgentUtilsTest.java
index 86a72a8945a4..693e4c2168d4 100644
--- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/util/UserAgentUtilsTest.java
+++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/util/UserAgentUtilsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/pagination/PaginatedItemsIterableTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/pagination/PaginatedItemsIterableTest.java
index 7a16c0f6c865..dee5560d383a 100644
--- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/pagination/PaginatedItemsIterableTest.java
+++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/pagination/PaginatedItemsIterableTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/pagination/async/PaginatedItemsPublisherTckTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/pagination/async/PaginatedItemsPublisherTckTest.java
index 7fb671db4864..80df7e5ff018 100644
--- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/pagination/async/PaginatedItemsPublisherTckTest.java
+++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/pagination/async/PaginatedItemsPublisherTckTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/retry/AndRetryConditionTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/retry/AndRetryConditionTest.java
index e15b34e3e909..bacd65595137 100644
--- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/retry/AndRetryConditionTest.java
+++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/retry/AndRetryConditionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -18,12 +18,14 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.when;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
+import org.mockito.Mockito;
 import org.mockito.runners.MockitoJUnitRunner;
 import software.amazon.awssdk.core.retry.conditions.AndRetryCondition;
 import software.amazon.awssdk.core.retry.conditions.RetryCondition;
@@ -95,4 +97,23 @@ public void singleConditionThatReturnsFalse_ReturnsFalse() {
         assertFalse(AndRetryCondition.create(conditionOne).shouldRetry(RetryPolicyContexts.EMPTY));
     }
 
+    @Test
+    public void conditionsAreEvaluatedInOrder() {
+        int numConditions = 1000;
+        int firstFalseCondition = 500;
+
+        RetryCondition[] conditions = new RetryCondition[numConditions];
+        for (int i = 0; i < numConditions; ++i) {
+            RetryCondition mock = Mockito.mock(RetryCondition.class);
+            when(mock.shouldRetry(RetryPolicyContexts.EMPTY)).thenReturn(i != firstFalseCondition);
+            conditions[i] = mock;
+        }
+
+        assertFalse(AndRetryCondition.create(conditions).shouldRetry(RetryPolicyContexts.EMPTY));
+
+        for (int i = 0; i < numConditions; ++i) {
+            int timesExpected = i <= firstFalseCondition ? 1 : 0;
+            Mockito.verify(conditions[i], times(timesExpected)).shouldRetry(RetryPolicyContexts.EMPTY);
+        }
+    }
 }
diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/retry/DefaultRetryConditionTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/retry/DefaultRetryConditionTest.java
index 018f68e145dd..038f1ad53d95 100644
--- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/retry/DefaultRetryConditionTest.java
+++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/retry/DefaultRetryConditionTest.java
@@ -1,14 +1,16 @@
 /*
- * Copyright 2012-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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
+ * 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
+ *  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.
+ * 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.
  */
 package software.amazon.awssdk.core.retry;
 
diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/retry/FixedDelayBackoffStrategyTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/retry/FixedDelayBackoffStrategyTest.java
index 3ad8b6564d0c..9bf82d503f58 100644
--- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/retry/FixedDelayBackoffStrategyTest.java
+++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/retry/FixedDelayBackoffStrategyTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/retry/FixedTimeBackoffStrategy.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/retry/FixedTimeBackoffStrategy.java
index 7857cf93f83a..eccaad72c0d5 100644
--- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/retry/FixedTimeBackoffStrategy.java
+++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/retry/FixedTimeBackoffStrategy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/retry/MaxNumberOfRetriesConditionTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/retry/MaxNumberOfRetriesConditionTest.java
index 13969b598a9c..6034e9e86d04 100644
--- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/retry/MaxNumberOfRetriesConditionTest.java
+++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/retry/MaxNumberOfRetriesConditionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/retry/OrRetryConditionTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/retry/OrRetryConditionTest.java
index 69d787125b3e..d277b32969a4 100644
--- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/retry/OrRetryConditionTest.java
+++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/retry/OrRetryConditionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -18,12 +18,16 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.when;
 
+import java.util.ArrayList;
+import java.util.List;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
+import org.mockito.Mockito;
 import org.mockito.runners.MockitoJUnitRunner;
 import software.amazon.awssdk.core.retry.conditions.OrRetryCondition;
 import software.amazon.awssdk.core.retry.conditions.RetryCondition;
@@ -82,4 +86,24 @@ public void singleConditionThatReturnsFalse_ReturnsFalse() {
         assertFalse(OrRetryCondition.create(conditionOne).shouldRetry(RetryPolicyContexts.EMPTY));
     }
 
+    @Test
+    public void conditionsAreEvaluatedInOrder() {
+        int numConditions = 1000;
+        int firstTrueCondition = 500;
+
+        RetryCondition[] conditions = new RetryCondition[numConditions];
+        for (int i = 0; i < numConditions; ++i) {
+            RetryCondition mock = Mockito.mock(RetryCondition.class);
+            when(mock.shouldRetry(RetryPolicyContexts.EMPTY)).thenReturn(i == firstTrueCondition);
+            conditions[i] = mock;
+        }
+
+        assertTrue(OrRetryCondition.create(conditions).shouldRetry(RetryPolicyContexts.EMPTY));
+
+        for (int i = 0; i < numConditions; ++i) {
+            int timesExpected = i <= firstTrueCondition ? 1 : 0;
+            Mockito.verify(conditions[i], times(timesExpected)).shouldRetry(RetryPolicyContexts.EMPTY);
+        }
+    }
+
 }
diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/retry/RetryModeTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/retry/RetryModeTest.java
new file mode 100644
index 000000000000..4020e955bb21
--- /dev/null
+++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/retry/RetryModeTest.java
@@ -0,0 +1,120 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.core.retry;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.Arrays;
+import java.util.Collection;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import software.amazon.awssdk.core.SdkSystemSetting;
+import software.amazon.awssdk.profiles.ProfileFileSystemSetting;
+import software.amazon.awssdk.testutils.EnvironmentVariableHelper;
+import software.amazon.awssdk.utils.Validate;
+
+@RunWith(Parameterized.class)
+public class RetryModeTest {
+    private static final EnvironmentVariableHelper ENVIRONMENT_VARIABLE_HELPER = new EnvironmentVariableHelper();
+
+    @Parameterized.Parameter
+    public TestData testData;
+
+    @Parameterized.Parameters
+    public static Collection<Object> data() {
+        return Arrays.asList(new Object[] {
+            // Test defaults
+            new TestData(null, null, null, RetryMode.LEGACY),
+            new TestData(null, null, "PropertyNotSet", RetryMode.LEGACY),
+
+            // Test precedence
+            new TestData("standard", "legacy", "PropertySetToLegacy", RetryMode.STANDARD),
+            new TestData("standard", null, null, RetryMode.STANDARD),
+            new TestData(null, "standard", "PropertySetToLegacy", RetryMode.STANDARD),
+            new TestData(null, "standard", null, RetryMode.STANDARD),
+            new TestData(null, null, "PropertySetToStandard", RetryMode.STANDARD),
+
+            // Test invalid values
+            new TestData("wrongValue", null, null, null),
+            new TestData(null, "wrongValue", null, null),
+            new TestData(null, null, "PropertySetToUnsupportedValue", null),
+
+            // Test capitalization standardization
+            new TestData("sTaNdArD", null, null, RetryMode.STANDARD),
+            new TestData(null, "sTaNdArD", null, RetryMode.STANDARD),
+            new TestData(null, null, "PropertyMixedCase", RetryMode.STANDARD),
+            });
+    }
+
+    @Before
+    @After
+    public void methodSetup() {
+        ENVIRONMENT_VARIABLE_HELPER.reset();
+        System.clearProperty(SdkSystemSetting.AWS_RETRY_MODE.property());
+        System.clearProperty(ProfileFileSystemSetting.AWS_PROFILE.property());
+        System.clearProperty(ProfileFileSystemSetting.AWS_CONFIG_FILE.property());
+    }
+
+    @Test
+    public void differentCombinationOfConfigs_shouldResolveCorrectly() {
+        if (testData.envVarValue != null) {
+            ENVIRONMENT_VARIABLE_HELPER.set(SdkSystemSetting.AWS_RETRY_MODE.environmentVariable(), testData.envVarValue);
+        }
+
+        if (testData.systemProperty != null) {
+            System.setProperty(SdkSystemSetting.AWS_RETRY_MODE.property(), testData.systemProperty);
+        }
+
+        if (testData.configFile != null) {
+            String diskLocationForFile = diskLocationForConfig(testData.configFile);
+            Validate.isTrue(Files.isReadable(Paths.get(diskLocationForFile)), diskLocationForFile + " is not readable.");
+            System.setProperty(ProfileFileSystemSetting.AWS_PROFILE.property(), "default");
+            System.setProperty(ProfileFileSystemSetting.AWS_CONFIG_FILE.property(), diskLocationForFile);
+        }
+
+        if (testData.expected == null) {
+            assertThatThrownBy(RetryMode::defaultRetryMode).isInstanceOf(RuntimeException.class);
+        } else {
+            assertThat(RetryMode.defaultRetryMode()).isEqualTo(testData.expected);
+        }
+    }
+
+    private String diskLocationForConfig(String configFileName) {
+        return getClass().getResource(configFileName).getFile();
+    }
+
+
+    private static class TestData {
+        private final String envVarValue;
+        private final String systemProperty;
+        private final String configFile;
+        private final RetryMode expected;
+
+        TestData(String systemProperty, String envVarValue, String configFile, RetryMode expected) {
+            this.envVarValue = envVarValue;
+            this.systemProperty = systemProperty;
+            this.configFile = configFile;
+            this.expected = expected;
+        }
+    }
+}
\ No newline at end of file
diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/retry/RetryOnStatusCodeConditionTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/retry/RetryOnStatusCodeConditionTest.java
index b0d0251b56f1..cb03697ef25b 100644
--- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/retry/RetryOnStatusCodeConditionTest.java
+++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/retry/RetryOnStatusCodeConditionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/retry/RetryPolicyContextTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/retry/RetryPolicyContextTest.java
index c213258456a4..f460c9232de1 100644
--- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/retry/RetryPolicyContextTest.java
+++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/retry/RetryPolicyContextTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/retry/RetryPolicyContexts.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/retry/RetryPolicyContexts.java
index 56089df4b05b..0436977a319d 100644
--- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/retry/RetryPolicyContexts.java
+++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/retry/RetryPolicyContexts.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/retry/RetryPolicyMaxRetriesTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/retry/RetryPolicyMaxRetriesTest.java
new file mode 100644
index 000000000000..84e3d5ac51d7
--- /dev/null
+++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/retry/RetryPolicyMaxRetriesTest.java
@@ -0,0 +1,140 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.core.retry;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.Arrays;
+import java.util.Collection;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import software.amazon.awssdk.core.SdkSystemSetting;
+import software.amazon.awssdk.profiles.ProfileFileSystemSetting;
+import software.amazon.awssdk.testutils.EnvironmentVariableHelper;
+import software.amazon.awssdk.utils.Validate;
+
+@RunWith(Parameterized.class)
+public class RetryPolicyMaxRetriesTest {
+    private static final EnvironmentVariableHelper ENVIRONMENT_VARIABLE_HELPER = new EnvironmentVariableHelper();
+
+    @Parameterized.Parameter
+    public TestData testData;
+
+    @Parameterized.Parameters
+    public static Collection<Object> data() {
+        return Arrays.asList(new Object[] {
+            // Test defaults
+            new TestData(null, null, null, null, null, 3),
+            new TestData(null, null, null, null, "PropertyNotSet", 3),
+
+            // Test precedence
+            new TestData("9", "2", "standard", "standard", "PropertySetToStandard", 8),
+            new TestData(null, "9", "standard", "standard", "PropertySetToStandard", 8),
+            new TestData(null, null, "standard", "standard", "PropertySetToStandard", 2),
+            new TestData(null, null, null, "standard", "PropertySetToStandard", 2),
+            new TestData(null, null, null, null, "PropertySetToStandard", 2),
+
+            // Test invalid values
+            new TestData("wrongValue", null, null, null, null, null),
+            new TestData(null, "wrongValue", null, null, null, null),
+            new TestData(null, null, "wrongValue", null, null, null),
+            new TestData(null, null, null, "wrongValue", null, null),
+            new TestData(null, null, null, null, "PropertySetToUnsupportedValue", null),
+            });
+    }
+
+    @BeforeClass
+    public static void classSetup() {
+        // If this caches any values, make sure it's cached with the default (non-modified) configuration.
+        RetryPolicy.defaultRetryPolicy();
+    }
+
+    @Before
+    @After
+    public void methodSetup() {
+        ENVIRONMENT_VARIABLE_HELPER.reset();
+        System.clearProperty(SdkSystemSetting.AWS_MAX_ATTEMPTS.property());
+        System.clearProperty(SdkSystemSetting.AWS_RETRY_MODE.property());
+        System.clearProperty(ProfileFileSystemSetting.AWS_PROFILE.property());
+        System.clearProperty(ProfileFileSystemSetting.AWS_CONFIG_FILE.property());
+    }
+
+    @Test
+    public void differentCombinationOfConfigs_shouldResolveCorrectly() {
+        if (testData.attemptCountEnvVarValue != null) {
+            ENVIRONMENT_VARIABLE_HELPER.set(SdkSystemSetting.AWS_MAX_ATTEMPTS.environmentVariable(), testData.attemptCountEnvVarValue);
+        }
+
+        if (testData.attemptCountSystemProperty != null) {
+            System.setProperty(SdkSystemSetting.AWS_MAX_ATTEMPTS.property(), testData.attemptCountSystemProperty);
+        }
+
+        if (testData.envVarValue != null) {
+            ENVIRONMENT_VARIABLE_HELPER.set(SdkSystemSetting.AWS_RETRY_MODE.environmentVariable(), testData.envVarValue);
+        }
+
+        if (testData.systemProperty != null) {
+            System.setProperty(SdkSystemSetting.AWS_RETRY_MODE.property(), testData.systemProperty);
+        }
+
+        if (testData.configFile != null) {
+            String diskLocationForFile = diskLocationForConfig(testData.configFile);
+            Validate.isTrue(Files.isReadable(Paths.get(diskLocationForFile)), diskLocationForFile + " is not readable.");
+            System.setProperty(ProfileFileSystemSetting.AWS_PROFILE.property(), "default");
+            System.setProperty(ProfileFileSystemSetting.AWS_CONFIG_FILE.property(), diskLocationForFile);
+        }
+
+        if (testData.expected == null) {
+            assertThatThrownBy(() -> RetryPolicy.forRetryMode(RetryMode.defaultRetryMode())).isInstanceOf(RuntimeException.class);
+        } else {
+            assertThat(RetryPolicy.forRetryMode(RetryMode.defaultRetryMode()).numRetries()).isEqualTo(testData.expected);
+        }
+    }
+
+    private String diskLocationForConfig(String configFileName) {
+        return getClass().getResource(configFileName).getFile();
+    }
+
+    private static class TestData {
+        private final String attemptCountSystemProperty;
+        private final String attemptCountEnvVarValue;
+        private final String envVarValue;
+        private final String systemProperty;
+        private final String configFile;
+        private final Integer expected;
+
+        TestData(String attemptCountSystemProperty,
+                 String attemptCountEnvVarValue,
+                 String retryModeSystemProperty,
+                 String retryModeEnvVarValue,
+                 String configFile,
+                 Integer expected) {
+            this.attemptCountSystemProperty = attemptCountSystemProperty;
+            this.attemptCountEnvVarValue = attemptCountEnvVarValue;
+            this.envVarValue = retryModeEnvVarValue;
+            this.systemProperty = retryModeSystemProperty;
+            this.configFile = configFile;
+            this.expected = expected;
+        }
+    }
+}
\ No newline at end of file
diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/retry/RetryPolicyTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/retry/RetryPolicyTest.java
index bbe8e4aa19db..9dd6925dd899 100644
--- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/retry/RetryPolicyTest.java
+++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/retry/RetryPolicyTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -18,6 +18,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.verify;
 
+import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
@@ -80,4 +81,26 @@ public void nonRetryPolicy_shouldUseNullCondition() {
         assertThat(noneRetry.backoffStrategy()).isEqualTo(BackoffStrategy.none());
         assertThat(noneRetry.throttlingBackoffStrategy()).isEqualTo(BackoffStrategy.none());
     }
+
+    @Test
+    public void maxRetriesFromRetryModeIsCorrect() {
+        assertThat(RetryPolicy.forRetryMode(RetryMode.LEGACY).numRetries()).isEqualTo(3);
+        assertThat(RetryPolicy.forRetryMode(RetryMode.STANDARD).numRetries()).isEqualTo(2);
+    }
+
+    @Test
+    public void maxRetriesFromDefaultRetryModeIsCorrect() {
+        switch (RetryMode.defaultRetryMode()) {
+            case LEGACY:
+                assertThat(RetryPolicy.defaultRetryPolicy().numRetries()).isEqualTo(3);
+                assertThat(RetryPolicy.builder().build().numRetries()).isEqualTo(3);
+                break;
+            case STANDARD:
+                assertThat(RetryPolicy.defaultRetryPolicy().numRetries()).isEqualTo(2);
+                assertThat(RetryPolicy.builder().build().numRetries()).isEqualTo(2);
+                break;
+            default:
+                Assert.fail();
+        }
+    }
 }
diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/retry/backoff/EqualJitterBackoffStrategyTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/retry/backoff/EqualJitterBackoffStrategyTest.java
new file mode 100644
index 000000000000..8e5723e140bb
--- /dev/null
+++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/retry/backoff/EqualJitterBackoffStrategyTest.java
@@ -0,0 +1,116 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.core.retry.backoff;
+
+import org.junit.Test;
+import org.mockito.Mock;
+import software.amazon.awssdk.core.retry.RetryPolicyContext;
+
+import java.time.Duration;
+import java.util.Random;
+
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+import static org.testng.Assert.assertThrows;
+
+public class EqualJitterBackoffStrategyTest {
+
+    private static final int RANDOM_RESULT = 12345;
+    private static final Duration FIVE_DAYS = Duration.ofDays(5);
+    private static final Duration MAX_DURATION = Duration.ofSeconds(Long.MAX_VALUE);
+    private static final Duration ONE_SECOND = Duration.ofSeconds(1);
+    private static final Duration ONE_NANO_SECOND = Duration.ofNanos(1);
+    private static final int NANO_IN_MILLISECONDS = 1_000_000;
+    private static final Duration NEGATIVE_ONE_SECOND = Duration.ofSeconds(-1);
+
+    @Mock
+    private Random mockRandom = mock(Random.class);
+
+    @Test
+    public void exponentialDelayOverflowWithMaxBackoffTest() {
+        test(FIVE_DAYS, MAX_DURATION, 3, Integer.MAX_VALUE);
+    }
+
+    @Test
+    public void exponentialDelayOverflowWithMaxBaseDelayTest() {
+        test(MAX_DURATION, MAX_DURATION, 1, Integer.MAX_VALUE);
+    }
+
+    @Test
+    public void maxBaseDelayShortBackoffTest() {
+        test(MAX_DURATION, ONE_SECOND, 1, (int) ONE_SECOND.toMillis());
+    }
+
+    @Test
+    public void normalConditionTest() {
+        test(ONE_SECOND, MAX_DURATION, 10, (1 << 10) * (int) ONE_SECOND.toMillis());
+    }
+
+    @Test
+    public void tinyBackoffNormalRetriesTest() {
+        test(MAX_DURATION, ONE_NANO_SECOND, 10, 0);
+    }
+
+    @Test
+    public void tinyBaseDelayNormalRetriesTest() {
+        test(ONE_NANO_SECOND, MAX_DURATION, 30,  (int) (1L << 30) / NANO_IN_MILLISECONDS);
+    }
+
+    @Test
+    public void tinyBaseDelayExtraRetriesTest() {
+        test(ONE_NANO_SECOND, MAX_DURATION, 100,
+                (int) (1L << 30) / NANO_IN_MILLISECONDS); // RETRIES_ATTEMPTED_CEILING == 30
+    }
+
+    @Test
+    public void exponentialDelayOverflowWithExtraRetriesTest() {
+        test(MAX_DURATION, MAX_DURATION, 100, Integer.MAX_VALUE);
+    }
+
+    @Test
+    public void tinyBaseDelayUnderflowTest() {
+        test(ONE_NANO_SECOND, MAX_DURATION, 0, 0);
+    }
+
+    @Test
+    public void negativeBaseDelayTest() {
+        assertThrows(IllegalArgumentException.class, () ->
+                test(NEGATIVE_ONE_SECOND, MAX_DURATION, 1, 0));
+    }
+
+    @Test
+    public void negativeBackoffTest() {
+        assertThrows(IllegalArgumentException.class, () ->
+                test(ONE_SECOND, NEGATIVE_ONE_SECOND, 1, 0));
+    }
+
+    private void test(final Duration baseDelay, final Duration maxBackoffTime,
+                      final int retriesAttempted, final int expectedCeilingMillis) {
+        final BackoffStrategy backoffStrategy = new EqualJitterBackoffStrategy(baseDelay, maxBackoffTime, mockRandom);
+
+        when(mockRandom.nextInt(expectedCeilingMillis /2 + 1)).thenReturn(RANDOM_RESULT);
+
+        assertThat(backoffStrategy.computeDelayBeforeNextRetry(toRetryContext(retriesAttempted)),
+                is(Duration.ofMillis(expectedCeilingMillis / 2 + RANDOM_RESULT)));
+    }
+
+    private static RetryPolicyContext toRetryContext(final int retriesAttempted) {
+        return RetryPolicyContext.builder().retriesAttempted(retriesAttempted).build();
+    }
+
+}
\ No newline at end of file
diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/retry/conditions/TokenBucketRetryConditionTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/retry/conditions/TokenBucketRetryConditionTest.java
new file mode 100644
index 000000000000..1c9b6965d861
--- /dev/null
+++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/retry/conditions/TokenBucketRetryConditionTest.java
@@ -0,0 +1,185 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.core.retry.conditions;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
+import org.junit.Assert;
+import org.junit.Test;
+import software.amazon.awssdk.core.exception.SdkClientException;
+import software.amazon.awssdk.core.exception.SdkException;
+import software.amazon.awssdk.core.interceptor.ExecutionAttributes;
+import software.amazon.awssdk.core.retry.RetryPolicyContext;
+
+public class TokenBucketRetryConditionTest {
+    private static final SdkException EXCEPTION = SdkClientException.create("");
+    private static final SdkException EXCEPTION_2 = SdkClientException.create("");
+
+    @Test
+    public void maximumTokensCannotBeExceeded() {
+        TokenBucketRetryCondition condition = create(3, e -> 1);
+        for (int i = 1; i < 10; ++i) {
+            condition.requestSucceeded(context(null));
+            assertThat(condition.tokensAvailable()).isEqualTo(3);
+        }
+    }
+
+    @Test
+    public void releasingMoreCapacityThanAvailableSetsCapacityToMax() {
+        ExecutionAttributes attributes = new ExecutionAttributes();
+
+        TokenBucketRetryCondition condition = create(11, e -> e == EXCEPTION ? 1 : 3);
+        assertThat(condition.shouldRetry(context(EXCEPTION, attributes))).isTrue();
+        assertThat(condition.tokensAvailable()).isEqualTo(10);
+        assertThat(condition.shouldRetry(context(EXCEPTION_2, attributes))).isTrue();
+        assertThat(condition.tokensAvailable()).isEqualTo(7);
+        condition.requestSucceeded(context(EXCEPTION_2, attributes));
+        assertThat(condition.tokensAvailable()).isEqualTo(10);
+        condition.requestSucceeded(context(EXCEPTION_2, attributes));
+        assertThat(condition.tokensAvailable()).isEqualTo(11);
+    }
+
+    @Test
+    public void nonFirstAttemptsAreNotFree() {
+        TokenBucketRetryCondition condition = create(2, e -> 1);
+
+        assertThat(condition.shouldRetry(context(EXCEPTION))).isTrue();
+        assertThat(condition.tokensAvailable()).isEqualTo(1);
+
+        assertThat(condition.shouldRetry(context(EXCEPTION))).isTrue();
+        assertThat(condition.tokensAvailable()).isEqualTo(0);
+
+        assertThat(condition.shouldRetry(context(EXCEPTION))).isFalse();
+        assertThat(condition.tokensAvailable()).isEqualTo(0);
+    }
+
+    @Test
+    public void exceptionCostIsHonored() {
+        // EXCEPTION costs 1, anything else costs 10
+        TokenBucketRetryCondition condition = create(20, e -> e == EXCEPTION ? 1 : 10);
+
+        assertThat(condition.shouldRetry(context(EXCEPTION))).isTrue();
+        assertThat(condition.tokensAvailable()).isEqualTo(19);
+
+        assertThat(condition.shouldRetry(context(EXCEPTION_2))).isTrue();
+        assertThat(condition.tokensAvailable()).isEqualTo(9);
+
+        assertThat(condition.shouldRetry(context(EXCEPTION_2))).isFalse();
+        assertThat(condition.tokensAvailable()).isEqualTo(9);
+
+        assertThat(condition.shouldRetry(context(EXCEPTION))).isTrue();
+        assertThat(condition.tokensAvailable()).isEqualTo(8);
+    }
+
+    @Test
+    public void successReleasesAcquiredCost() {
+        ExecutionAttributes attributes = new ExecutionAttributes();
+
+        TokenBucketRetryCondition condition = create(20, e -> 10);
+
+        assertThat(condition.shouldRetry(context(EXCEPTION, attributes))).isTrue();
+        assertThat(condition.tokensAvailable()).isEqualTo(10);
+
+        condition.requestSucceeded(context(EXCEPTION, attributes));
+        assertThat(condition.tokensAvailable()).isEqualTo(20);
+    }
+
+    @Test
+    public void firstRequestSuccessReleasesOne() {
+        TokenBucketRetryCondition condition = create(20, e -> 10);
+
+        assertThat(condition.shouldRetry(context(null))).isTrue();
+        assertThat(condition.tokensAvailable()).isEqualTo(10);
+
+        condition.requestSucceeded(context(null));
+        assertThat(condition.tokensAvailable()).isEqualTo(11);
+
+        condition.requestSucceeded(context(null));
+        assertThat(condition.tokensAvailable()).isEqualTo(12);
+    }
+
+    @Test
+    public void conditionSeemsToBeThreadSafe() throws InterruptedException {
+        int bucketSize = 5;
+        TokenBucketRetryCondition condition = create(bucketSize, e -> 1);
+
+        AtomicInteger concurrentCalls = new AtomicInteger(0);
+        AtomicBoolean failure = new AtomicBoolean(false);
+        int parallelism = bucketSize * 2;
+        ExecutorService executor = Executors.newFixedThreadPool(parallelism);
+        for (int i = 0; i < parallelism; ++i) {
+            executor.submit(() -> {
+                try {
+                    for (int j = 0; j < 1000; ++j) {
+                        ExecutionAttributes attributes = new ExecutionAttributes();
+                        if (condition.shouldRetry(context(EXCEPTION, attributes))) {
+                            int calls = concurrentCalls.addAndGet(1);
+                            if (calls > bucketSize) {
+                                failure.set(true);
+                            }
+                            Thread.sleep(1);
+                            concurrentCalls.addAndGet(-1);
+                            condition.requestSucceeded(context(EXCEPTION, attributes));
+                        }
+                        else {
+                            Thread.sleep(1);
+                        }
+                    }
+                } catch (Throwable t) {
+                    t.printStackTrace();
+                    failure.set(true);
+                }
+            });
+
+            // Stagger the threads a bit.
+            Thread.sleep(1);
+        }
+
+        executor.shutdown();
+        if (!executor.awaitTermination(1, TimeUnit.MINUTES)) {
+            Assert.fail();
+        }
+
+        assertThat(failure.get()).isFalse();
+    }
+
+    private RetryPolicyContext context(SdkException lastException) {
+        return RetryPolicyContext.builder()
+                                 .executionAttributes(new ExecutionAttributes())
+                                 .exception(lastException)
+                                 .build();
+    }
+
+    private RetryPolicyContext context(SdkException lastException, ExecutionAttributes attributes) {
+        return RetryPolicyContext.builder()
+                                 .executionAttributes(attributes)
+                                 .exception(lastException)
+                                 .build();
+    }
+
+    private TokenBucketRetryCondition create(int size, TokenBucketExceptionCostFunction function) {
+        return TokenBucketRetryCondition.builder()
+                                        .tokenBucketSize(size)
+                                        .exceptionCostFunction(function)
+                                        .build();
+    }
+
+}
\ No newline at end of file
diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/runtime/transform/AsyncStreamingRequestMarshallerTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/runtime/transform/AsyncStreamingRequestMarshallerTest.java
index e83b12a19203..7d0a205841f6 100644
--- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/runtime/transform/AsyncStreamingRequestMarshallerTest.java
+++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/runtime/transform/AsyncStreamingRequestMarshallerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/runtime/transform/SyncStreamingRequestMarshallerTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/runtime/transform/SyncStreamingRequestMarshallerTest.java
index 1710a50e1a73..44aa3fb7f589 100644
--- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/runtime/transform/SyncStreamingRequestMarshallerTest.java
+++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/runtime/transform/SyncStreamingRequestMarshallerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/sync/RequestBodyTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/sync/RequestBodyTest.java
index 0cce6a55c387..c84003651b95 100644
--- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/sync/RequestBodyTest.java
+++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/sync/RequestBodyTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -19,12 +19,17 @@
 
 import com.google.common.jimfs.Configuration;
 import com.google.common.jimfs.Jimfs;
+import java.io.File;
+import java.io.FileWriter;
 import java.io.IOException;
+import java.io.InputStream;
 import java.nio.ByteBuffer;
 import java.nio.file.FileSystem;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
 import software.amazon.awssdk.core.internal.util.Mimetype;
 import software.amazon.awssdk.utils.IoUtils;
 import software.amazon.awssdk.utils.StringInputStream;
@@ -32,6 +37,9 @@
 
 public class RequestBodyTest {
 
+    @Rule
+    public TemporaryFolder folder = new TemporaryFolder();
+
     @Test
     public void stringConstructorUsesUTF8ByteLength() {
         // U+03A9 U+03C9
@@ -63,6 +71,20 @@ public void streamConstructorHasCorrectContentType() {
         IoUtils.closeQuietly(inputStream, null);
     }
 
+
+    @Test
+    public void nonMarkSupportedInputStreamContentType() throws IOException {
+        File file = folder.newFile();
+        try (FileWriter writer = new FileWriter(file)) {
+            writer.write("hello world");
+        }
+        InputStream inputStream = Files.newInputStream(file.toPath());
+        RequestBody requestBody = RequestBody.fromInputStream(inputStream, 11);
+        assertThat(requestBody.contentType()).isEqualTo(Mimetype.MIMETYPE_OCTET_STREAM);
+        assertThat(requestBody.contentStreamProvider().newStream()).isNotNull();
+        IoUtils.closeQuietly(inputStream, null);
+    }
+
     @Test
     public void bytesArrayConstructorHasCorrectContentType() {
         RequestBody requestBody = RequestBody.fromBytes("hello world".getBytes());
@@ -81,4 +103,23 @@ public void emptyBytesConstructorHasCorrectContentType() {
         RequestBody requestBody = RequestBody.empty();
         assertThat(requestBody.contentType()).isEqualTo(Mimetype.MIMETYPE_OCTET_STREAM);
     }
+
+    @Test
+    public void remainingByteBufferConstructorOnlyRemainingBytesCopied() throws IOException {
+        ByteBuffer bb = ByteBuffer.allocate(4);
+        bb.put(new byte[]{1, 2, 3, 4});
+        bb.flip();
+
+        bb.get();
+        bb.get();
+
+        int originalRemaining = bb.remaining();
+
+        RequestBody requestBody = RequestBody.fromRemainingByteBuffer(bb);
+
+        assertThat(requestBody.contentLength()).isEqualTo(originalRemaining);
+
+        byte[] requestBodyBytes = IoUtils.toByteArray(requestBody.contentStreamProvider().newStream());
+        assertThat(ByteBuffer.wrap(requestBodyBytes)).isEqualTo(bb);
+    }
 }
diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/util/Crc32ChecksumInputStreamTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/util/Crc32ChecksumInputStreamTest.java
index c8254b1588a9..c7e31c9ffd24 100644
--- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/util/Crc32ChecksumInputStreamTest.java
+++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/util/Crc32ChecksumInputStreamTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/util/DefaultSdkAutoConstructListTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/util/DefaultSdkAutoConstructListTest.java
index c0674cd11fa0..d831b8bef3ff 100644
--- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/util/DefaultSdkAutoConstructListTest.java
+++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/util/DefaultSdkAutoConstructListTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/util/DefaultSdkAutoConstructMapTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/util/DefaultSdkAutoConstructMapTest.java
index bee99f56b04b..5293670c466b 100644
--- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/util/DefaultSdkAutoConstructMapTest.java
+++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/util/DefaultSdkAutoConstructMapTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/util/FileUtils.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/util/FileUtils.java
index 3bca7e7a3f16..2348e645bedd 100644
--- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/util/FileUtils.java
+++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/util/FileUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/util/IdempotentUtilsTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/util/IdempotentUtilsTest.java
index 798eaa420562..e1ba62ec6a31 100644
--- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/util/IdempotentUtilsTest.java
+++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/util/IdempotentUtilsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/util/PaginatorUtilsTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/util/PaginatorUtilsTest.java
index d700ab5ca8de..a30b176b2118 100644
--- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/util/PaginatorUtilsTest.java
+++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/util/PaginatorUtilsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/util/RetryUtilsTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/util/RetryUtilsTest.java
index 6d6e0af46993..f19b2d7d9252 100644
--- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/util/RetryUtilsTest.java
+++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/util/RetryUtilsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/util/ThrowableUtilsTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/util/ThrowableUtilsTest.java
index 27ed68738b82..44f9cd5dc728 100644
--- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/util/ThrowableUtilsTest.java
+++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/util/ThrowableUtilsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/util/VersionInfoTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/util/VersionInfoTest.java
index 327f57a9931d..2b4accf0dc0b 100644
--- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/util/VersionInfoTest.java
+++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/util/VersionInfoTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/test/java/utils/FakePublisher.java b/core/sdk-core/src/test/java/utils/FakePublisher.java
new file mode 100644
index 000000000000..e5b6486af2ca
--- /dev/null
+++ b/core/sdk-core/src/test/java/utils/FakePublisher.java
@@ -0,0 +1,54 @@
+/*
+ * 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.
+ */
+
+package utils;
+
+import org.reactivestreams.Publisher;
+import org.reactivestreams.Subscriber;
+import org.reactivestreams.Subscription;
+
+public class FakePublisher<T> implements Publisher<T> {
+    private Subscriber<? super T> delegateSubscriber;
+
+    @Override
+    public void subscribe(Subscriber<? super T> subscriber) {
+        this.delegateSubscriber = subscriber;
+        this.delegateSubscriber.onSubscribe(new FakeSubscription());
+    }
+
+    public void publish(T str) {
+        this.delegateSubscriber.onNext(str);
+    }
+
+    public void complete() {
+        this.delegateSubscriber.onComplete();
+    }
+
+    public void doThrow(Throwable t) {
+        this.delegateSubscriber.onError(t);
+    }
+
+    private static final class FakeSubscription implements Subscription {
+        @Override
+        public void request(long n) {
+
+        }
+
+        @Override
+        public void cancel() {
+
+        }
+    }
+}
diff --git a/core/sdk-core/src/test/java/utils/HttpTestUtils.java b/core/sdk-core/src/test/java/utils/HttpTestUtils.java
index 856908295957..ba7929f229bf 100644
--- a/core/sdk-core/src/test/java/utils/HttpTestUtils.java
+++ b/core/sdk-core/src/test/java/utils/HttpTestUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -26,8 +26,8 @@
 import java.util.stream.Collectors;
 import software.amazon.awssdk.core.client.config.SdkAdvancedAsyncClientOption;
 import software.amazon.awssdk.core.client.config.SdkAdvancedClientOption;
-import software.amazon.awssdk.core.client.config.SdkClientOption;
 import software.amazon.awssdk.core.client.config.SdkClientConfiguration;
+import software.amazon.awssdk.core.client.config.SdkClientOption;
 import software.amazon.awssdk.core.internal.http.AmazonAsyncHttpClient;
 import software.amazon.awssdk.core.internal.http.AmazonSyncHttpClient;
 import software.amazon.awssdk.core.internal.http.loader.DefaultSdkAsyncHttpClientBuilder;
diff --git a/core/sdk-core/src/test/java/utils/ValidSdkObjects.java b/core/sdk-core/src/test/java/utils/ValidSdkObjects.java
index 7fd2ff229a69..8bde4dfa4779 100644
--- a/core/sdk-core/src/test/java/utils/ValidSdkObjects.java
+++ b/core/sdk-core/src/test/java/utils/ValidSdkObjects.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/test/java/utils/http/WireMockTestBase.java b/core/sdk-core/src/test/java/utils/http/WireMockTestBase.java
index 837d7322f609..3dcd3254b879 100644
--- a/core/sdk-core/src/test/java/utils/http/WireMockTestBase.java
+++ b/core/sdk-core/src/test/java/utils/http/WireMockTestBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/test/java/utils/retry/SimpleArrayBackoffStrategy.java b/core/sdk-core/src/test/java/utils/retry/SimpleArrayBackoffStrategy.java
index acd8130c6b1f..ed782a2031cc 100644
--- a/core/sdk-core/src/test/java/utils/retry/SimpleArrayBackoffStrategy.java
+++ b/core/sdk-core/src/test/java/utils/retry/SimpleArrayBackoffStrategy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/core/sdk-core/src/test/resources/jetty-logging.properties b/core/sdk-core/src/test/resources/jetty-logging.properties
index 0b7cafa3b426..6d7baed3e770 100644
--- a/core/sdk-core/src/test/resources/jetty-logging.properties
+++ b/core/sdk-core/src/test/resources/jetty-logging.properties
@@ -1,3 +1,18 @@
+#
+# 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.
+#
+
 # Set up logging implementation
 org.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.StdErrLog
 org.eclipse.jetty.LEVEL=INFO
diff --git a/core/sdk-core/src/test/resources/log4j.properties b/core/sdk-core/src/test/resources/log4j.properties
index c2f2c6bdbee2..391579e1fcc1 100644
--- a/core/sdk-core/src/test/resources/log4j.properties
+++ b/core/sdk-core/src/test/resources/log4j.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/core/sdk-core/src/test/resources/software/amazon/awssdk/core/retry/PropertyMixedCase b/core/sdk-core/src/test/resources/software/amazon/awssdk/core/retry/PropertyMixedCase
new file mode 100644
index 000000000000..87f4e3cc86d6
--- /dev/null
+++ b/core/sdk-core/src/test/resources/software/amazon/awssdk/core/retry/PropertyMixedCase
@@ -0,0 +1,2 @@
+[default]
+retry_mode = sTanDard
\ No newline at end of file
diff --git a/core/sdk-core/src/test/resources/software/amazon/awssdk/core/retry/PropertyNotSet b/core/sdk-core/src/test/resources/software/amazon/awssdk/core/retry/PropertyNotSet
new file mode 100644
index 000000000000..399487f9b5e5
--- /dev/null
+++ b/core/sdk-core/src/test/resources/software/amazon/awssdk/core/retry/PropertyNotSet
@@ -0,0 +1 @@
+[default]
\ No newline at end of file
diff --git a/core/sdk-core/src/test/resources/software/amazon/awssdk/core/retry/PropertySetMaxAttempts10 b/core/sdk-core/src/test/resources/software/amazon/awssdk/core/retry/PropertySetMaxAttempts10
new file mode 100644
index 000000000000..563a6a7d6859
--- /dev/null
+++ b/core/sdk-core/src/test/resources/software/amazon/awssdk/core/retry/PropertySetMaxAttempts10
@@ -0,0 +1,2 @@
+[default]
+max_attempts = 10
\ No newline at end of file
diff --git a/core/sdk-core/src/test/resources/software/amazon/awssdk/core/retry/PropertySetToLegacy b/core/sdk-core/src/test/resources/software/amazon/awssdk/core/retry/PropertySetToLegacy
new file mode 100644
index 000000000000..0adbcda85ce5
--- /dev/null
+++ b/core/sdk-core/src/test/resources/software/amazon/awssdk/core/retry/PropertySetToLegacy
@@ -0,0 +1,2 @@
+[default]
+retry_mode = legacy
\ No newline at end of file
diff --git a/core/sdk-core/src/test/resources/software/amazon/awssdk/core/retry/PropertySetToStandard b/core/sdk-core/src/test/resources/software/amazon/awssdk/core/retry/PropertySetToStandard
new file mode 100644
index 000000000000..14dba934fa14
--- /dev/null
+++ b/core/sdk-core/src/test/resources/software/amazon/awssdk/core/retry/PropertySetToStandard
@@ -0,0 +1,2 @@
+[default]
+retry_mode = standard
\ No newline at end of file
diff --git a/core/sdk-core/src/test/resources/software/amazon/awssdk/core/retry/PropertySetToUnsupportedValue b/core/sdk-core/src/test/resources/software/amazon/awssdk/core/retry/PropertySetToUnsupportedValue
new file mode 100644
index 000000000000..e145fd53d204
--- /dev/null
+++ b/core/sdk-core/src/test/resources/software/amazon/awssdk/core/retry/PropertySetToUnsupportedValue
@@ -0,0 +1,3 @@
+[default]
+retry_mode = unsupported-value
+max_attempts = unsupported-value
\ No newline at end of file
diff --git a/docs/design/ClientConfiguration.md b/docs/design/ClientConfiguration.md
index 6823a949aa65..58c1ef036ebe 100644
--- a/docs/design/ClientConfiguration.md
+++ b/docs/design/ClientConfiguration.md
@@ -1,4 +1,4 @@
-**Design:** Convention, **Status:** [Complete](README.md)
+**Design:** Convention, **Status:** [Accepted](README.md)
 
 ## Client Configuration
 
diff --git a/docs/design/FavorStaticFactoryMethods.md b/docs/design/FavorStaticFactoryMethods.md
index be31c0e6b914..b42c246de74f 100644
--- a/docs/design/FavorStaticFactoryMethods.md
+++ b/docs/design/FavorStaticFactoryMethods.md
@@ -1,4 +1,4 @@
-**Design:** Convention, **Status:** [Complete](README.md)
+**Design:** Convention, **Status:** [Accepted](README.md)
 
 ## Favor Static Factory Methods Over Constructors
 
diff --git a/docs/design/NamingConventions.md b/docs/design/NamingConventions.md
index 050db3844041..f03fceca058b 100644
--- a/docs/design/NamingConventions.md
+++ b/docs/design/NamingConventions.md
@@ -1,4 +1,4 @@
-**Design:** Convention, **Status:** [Complete](README.md)
+**Design:** Convention, **Status:** [Accepted](README.md)
 
 ## Naming Conventions
 
diff --git a/docs/design/README.md b/docs/design/README.md
index e3984b232d73..22892165412d 100644
--- a/docs/design/README.md
+++ b/docs/design/README.md
@@ -28,9 +28,15 @@ decided.*
   \- Automatically reconnects to an event streaming session when they are
   interrupted by a network error.
 
-**Completed**
+**Released**
 
-None
+*These features are considered "mostly implemented". Development on new features 
+is never "done". These features are considered "done enough" that any remaining 
+design elements or features can be implemented incrementally based on customer 
+demand.*
+
+* [Request Presigners](core/presigners/README.md) - Makes it possible to sign 
+  requests to be executed at a later time. 
 
 **Rejected**
 
@@ -42,7 +48,7 @@ None
 
 None
  
-**Completed**
+**Accepted**
 
 * [Class Initialization](FavorStaticFactoryMethods.md) - Conventions
   used to initialize a class.
diff --git a/docs/design/UseOfCompletableFuture.md b/docs/design/UseOfCompletableFuture.md
index 588391a468f4..376d2f30b74f 100644
--- a/docs/design/UseOfCompletableFuture.md
+++ b/docs/design/UseOfCompletableFuture.md
@@ -1,4 +1,4 @@
-**Design:** Convention, **Status:** [Complete](README.md)
+**Design:** Convention, **Status:** [Accepted](README.md)
 
 ## Use of CompletableFuture
 
diff --git a/docs/design/UseOfOptional.md b/docs/design/UseOfOptional.md
index b5bba9ad8eab..af552eb1dc80 100644
--- a/docs/design/UseOfOptional.md
+++ b/docs/design/UseOfOptional.md
@@ -1,4 +1,4 @@
-**Design:** Convention, **Status:** [Complete](README.md)
+**Design:** Convention, **Status:** [Accepted](README.md)
 
 ## Use of Optional
 
diff --git a/docs/design/core/event-streaming/reconnect/CurrentState.java b/docs/design/core/event-streaming/reconnect/CurrentState.java
index d17b57e00766..bf5c1bed5d34 100644
--- a/docs/design/core/event-streaming/reconnect/CurrentState.java
+++ b/docs/design/core/event-streaming/reconnect/CurrentState.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/docs/design/core/event-streaming/reconnect/prototype/Option1.java b/docs/design/core/event-streaming/reconnect/prototype/Option1.java
index 10befa055c16..5252207ef81b 100644
--- a/docs/design/core/event-streaming/reconnect/prototype/Option1.java
+++ b/docs/design/core/event-streaming/reconnect/prototype/Option1.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/docs/design/core/event-streaming/reconnect/prototype/Option2.java b/docs/design/core/event-streaming/reconnect/prototype/Option2.java
index 2ccbf6187f93..678e104169ce 100644
--- a/docs/design/core/event-streaming/reconnect/prototype/Option2.java
+++ b/docs/design/core/event-streaming/reconnect/prototype/Option2.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/docs/design/core/metrics/Design.md b/docs/design/core/metrics/Design.md
new file mode 100644
index 000000000000..6220f121d8c6
--- /dev/null
+++ b/docs/design/core/metrics/Design.md
@@ -0,0 +1,280 @@
+## Concepts
+### Metric
+* A representation of data collected
+* Metric can be one of the following types: Counter, Gauge, Timer
+* Metric can be associated to a category. Some of the metric categories are Default, HttpClient, Streaming etc
+
+### MetricRegistry
+
+* A MetricRegistry represent an interface to store the collected metric data. It can hold different types of Metrics
+  described above
+* MetricRegistry is generic and not tied to specific category (ApiCall, HttpClient etc) of metrics.
+* Each API call has it own instance of a MetricRegistry. All metrics collected in the ApiCall lifecycle are stored in
+  that instance.
+* A MetricRegistry can store other instances of same type. This can be used to store metrics for each Attempt in an Api
+  Call.
+* [Interface prototype](prototype/MetricRegistry.java)
+
+### MetricPublisher
+
+* A MetricPublisher represent an interface to publish the collected metrics to a external source.
+* SDK provides implementations to publish metrics to services like [Amazon
+  CloudWatch](https://aws.amazon.com/cloudwatch/), [Client Side
+  Monitoring](https://docs.aws.amazon.com/sdk-for-java/v1/developer-guide/sdk-metrics.html) (also known as AWS SDK
+  Metrics for Enterprise Support)
+* Customers can implement the interface and register the custom implementation to publish metrics to a platform not
+  supported in the SDK.
+* MetricPublishers can have different behaviors in terms of list of metrics to publish, publishing frequency,
+  configuration needed to publish etc.
+* Metrics can be explicitly published to the platform by calling publish() method. This can be useful in scenarios when
+  the application fails and customer wants to flush metrics before exiting the application.
+* [Interface prototype](prototype/MetricPublisher.java)
+
+### Reporting
+
+* Reporting is transferring the collected metrics to Publishers.
+* To report metrics to a publisher, call the registerMetrics(MetricRegistry) method on the MetricPublisher.
+* There is no requirement for Publisher to publish the reported metrics immediately after calling this method.
+
+
+## Enabling Metrics
+
+Metrics feature is disabled by default. Metrics can be enabled at client level in the following ways.
+
+### Feature Flags (Metrics Provider)
+
+* SDK exposes an [interface](prototype/MetricConfigurationProvider.java) to enable the metrics feature and specify
+  options to configure the metrics behavior.
+* SDK provides an implementation of this interface based on system properties.
+* Here are the system properties SDK supports:
+  - **aws.javasdk2x.metrics.enabled** - Metrics feature is enabled if this system property is set
+  - **aws.javasdk2x.metrics.category** - Comma separated set of MetricCategory that are enabled for collection
+* SDK calls the methods in this interface for each request ie, enabled() method is called for every request to determine
+  if the metrics feature is enabled or not (similarly for other configuration options).
+  -  This allows customers to control metrics behavior in a more flexible manner; for example using an external database
+     like DynamoDB to dynamically control metrics collection. This is useful to enable/disable metrics feature and
+     control metrics options at runtime without the need to make code changes or re-deploy the application.
+* As the interface methods are called for each request, it is recommended for the implementations to run expensive tasks
+  asynchronously in the background, cache the results and periodically refresh the results.
+
+```java
+ClientOverrideConfiguration config = ClientOverrideConfiguration
+    .builder()
+    // If this is not set, SDK uses the default chain with system property
+    .metricConfigurationProvider(new SystemSettingsMetricConfigurationProvider())
+    .build();
+
+// Set the ClientOverrideConfiguration instance on the client builder
+CodePipelineAsyncClient asyncClient =
+    CodePipelineAsyncClient
+        .builder()
+        .overrideConfiguration(config)
+        .build();
+```
+
+### Metrics Provider Chain
+
+* Customers might want to have different ways of enabling the metrics feature. For example: use SystemProperties by
+  default. If not use implementation based on Amazon DynamoDB.
+* To support multiple providers, SDK allows setting chain of providers (similar to the CredentialsProviderChain to
+  resolve credentials). As provider has multiple configuration options, a single provider is resolved at chain
+  construction time and it is used throughout the lifecycle of the application to keep the behavior intuitive.
+* If no custom chain is provided, SDK will use a default chain while looks for the System properties defined in above
+  section.  SDK can add more providers in the default chain in the future without breaking customers.
+
+```java
+MetricConfigurationProvider chain = new MetricConfigurationProviderChain(
+    new SystemSettingsMetricConfigurationProvider(),
+    // example custom implementation (not provided by the SDK)
+    DynamoDBMetricConfigurationProvider.builder()
+                          .tableName(TABLE_NAME)
+                          .enabledKey(ENABLE_KEY_NAME)
+                          ...
+                          .build(),
+   );
+
+ClientOverrideConfiguration config = ClientOverrideConfiguration
+    .builder()
+    // If this is not set, SDK uses the default chain with system property
+    .metricConfigurationProvider(chain)
+    .build();
+
+// Set the ClientOverrideConfiguration instance on the client builder
+CodePipelineAsyncClient asyncClient =
+    CodePipelineAsyncClient
+        .builder()
+        .overrideConfiguration(config)
+        .build();
+```
+
+### Metric Publishers Configuration
+
+* If metrics are enabled, SDK by default uses a single publisher that uploads metrics to CloudWatch using default
+  credentials and region.
+* Customers might want to use different configuration for the CloudWatch publisher or even use a different publisher to
+  publish to a different source.  To provide this flexibility, SDK exposes an option to set
+  [MetricPublisherConfiguration](prototype/MetricPublisherConfiguration.java) which can be used to configure custom
+  publishers.
+* SDK publishes the collected metrics to each of the configured publishers in the MetricPublisherConfiguration.
+
+```java
+ClientOverrideConfiguration config = ClientOverrideConfiguration
+    .builder()
+    .metricPublisherConfiguration(MetricPublisherConfiguration
+                                      .builder()
+                                      .addPublisher(
+                                          CloudWatchPublisher.builder()
+                                                             .credentialsProvider(...)
+                                                             .region(Region.AP_SOUTH_1)
+                                                             .publishFrequency(5, TimeUnit.MINUTES)
+                                                             .build(),
+                                          CsmPublisher.create()).bu
+                                      .build())
+    .build();
+
+// Set the ClientOverrideConfiguration instance on the client builder
+CodePipelineAsyncClient asyncClient =
+    CodePipelineAsyncClient
+        .builder()
+        .overrideConfiguration(config)
+        .build();
+```
+
+
+## Modules
+New modules are created to support metrics feature.
+
+### metrics-spi
+* Contains the metrics interfaces and default implementations that don't require other dependencies
+* This is a sub module under `core`
+* `sdk-core` has a dependency on `metrics-spi`, so customers will automatically get a dependency on this module.
+
+### metrics-publishers
+* This is a new module that contains implementations of all SDK supported publishers
+* Under this module, a new sub-module is created for each publisher (`cloudwatch-publisher`, `csm-publisher`)
+* Customers has to **explicitly add dependency** on these modules to use the sdk provided publishers
+
+
+## Sequence Diagram
+
+<b>Metrics Collection</b>
+
+<div style="text-align: center;">
+
+![Metrics Collection](images/MetricCollection.jpg)
+
+</div>
+
+<b>MetricPublisher</b>
+
+<div style="text-align: center;">
+
+![MetricPublisher fig.align="left"](images/MetricPublisher.jpg)
+
+</div>
+
+1. Client enables metrics feature through MetricConfigurationProvider and configure publishers through
+   MetricPublisherConfiguration.
+2. For each API call, a new MetricRegistry object is created and stored in the ExecutionAttributes. If metrics are not
+   enabled, a NoOpMetricRegistry is used.
+3. At each metric collection point, the metric is registered in the MetricRegistry object if its category is enabled in
+   MetricConfigurationProvider.
+4. The metrics that are collected once for a Api Call execution are stored in the METRIC_REGISTRY ExecutionAttribute.
+5. The metrics that are collected per Api Call attempt are stored in new MetricRegistry instances which are part of the
+   ApiCall MetricRegistry.  These MetricRegistry instance for the current attempt is also accessed through
+   ATTEMPT_METRIC_REGISTRY ExecutionAttribute.
+6. At end of API call, report the MetricRegistry object to MetricPublishers by calling registerMetrics(MetricRegistry)
+   method. This is done in an ExecutionInterceptor.
+7. Steps 2 to 6 are repeated for each API call
+8. MetricPublisher calls publish() method to report metrics to external sources. The frequency of publish() method call
+   is unique to Publisher implementation.
+9. Client has access to all registered publishers and it can call publish() method explicitly if desired.
+
+
+<b>CloudWatch MetricPublisher</b>
+
+<div style="text-align: center;">
+
+![CloudWatch MetricPublisher](images/CWMetricPublisher.jpg)
+
+</div>
+
+## Implementation Details
+Few important implementation details are discussed in this section.
+
+SDK modules can be organized as shown in this image.
+
+<div style="text-align: center;">
+
+![Module Hierarchy](images/MetricsModulesHierarchy.png)
+
+</div>
+
+* Core modules - Modules in the core directory while have access to ExecutionContext and ExecutionAttributes
+* Downstream modules - Modules where execution occurs after core modules. For example, http-clients is downstream module
+  as the request is transferred from core to http client for further execution.
+* Upstream modules - Modules that live in layers above core. Examples are High Level libraries (HLL) or Applications
+  that use SDK. Execution goes from Upstream modules to core modules.
+
+### Core Modules
+* SDK will use ExecutionAttributes to pass the MetricConfigurationProvider information through out the core module where
+  core request-response metrics are collected.
+* Instead of checking whether metrics is enabled at each metric collection point, SDK will use the instance of
+  NoOpMetricRegistry (if metrics are disabled) and DefaultMetricRegistry (if metrics are enabled).
+* The NoOpMetricRegistry class does not collect or store any metric data. Instead of creating a new NoOpMetricRegistry
+  instance for each request, use the same instance for every request to avoid additional object creation.
+* The DefaultMetricRegistry class will only collect metrics if they belong to the MetricCategory list provided in the
+  MetricConfigurationProvider. To support this, DefaultMetricRegistry is decorated by another class to filter metric
+  categories that are not set in MetricConfigurationProvider.
+
+### Downstream Modules
+* The MetricRegistry object and other required metric configuration details will be passed to the classes in downstream
+  modules.
+* For example, HttpExecuteRequest for sync http client, AsyncExecuteRequest for async http client.
+* Downstream modules record the metric data directly into the given MetricRegistry object.
+* As we use same MetricRegistry object for core and downstream modules, both metrics will be reported to the Publisher
+  together.
+
+### Upstream Modules
+* As MetricRegistry object is created after the execution is passed from Upstream modules, these modules won't be able
+  to modify/add to the core metrics.
+* If upstream modules want to report additional metrics using the registered publishers, they would need to create
+  MetricRegistry instances and explicitly call the methods on the Publishers.
+* It would be useful to get the low-level API metrics in these modules, so SDK will expose APIs to get an immutable
+  version of the MetricRegistry object so that upstream classes can use that information in  their metric calculation.
+
+### Reporting
+* Collected metrics are reported to the configured publishers at the end of each Api Call by calling
+  `registerMetrics(MetricRegistry)` method on MetricPublisher.
+* The MetricRegistry argument in the registerMetrics method will have data on the entire Api Call including retries.
+* This reporting is done in `MetricsExecutionInterceptor` via `afterExecution()` and `onExecutionFailure()` methods.
+* `MetricsExecutionInterceptor` will always be the last configured ExecutionInterceptor in the interceptor chain
+
+
+## Performance
+One of the main tenet for metrics is “Enabling default metrics should have minimal impact on the application
+performance". The following design choices are made to ensure enabling metrics does not effect performance
+significantly.
+* When collecting metrics, a NoOpRegistry is used if metrics are disabled. All methods in this registry are no-op and
+  return immediately.  This also has the additional benefit of avoid metricsEnabled check at each metric collection
+  point.
+* Metric publisher implementations can involve network calls and impact latency if done in blocking way. So all SDK
+  publisher implementation will process the metrics asynchronously and does not block the actual request.
+
+
+## Testing
+
+To ensure performance is not impacted due to metrics, tests should be written with various scenarios and a baseline for
+overhead should be created.  These tests should be run regularly to catch regressions.
+
+### Test Cases
+
+SDK will be tested under load for each of these test cases using the load testing framework we already have.  Each of
+these test case results should be compared with metrics feature disabled & enabled, and then comparing the results.
+
+1. Enable each metrics publisher (CloudWatch, CSM) individually.
+2. Enable all metrics publishers.
+3. Individually enable each metric category to find overhead for each MetricCategory.
+
+
+
diff --git a/docs/design/core/metrics/MetricsList.md b/docs/design/core/metrics/MetricsList.md
new file mode 100644
index 000000000000..f93c912be42a
--- /dev/null
+++ b/docs/design/core/metrics/MetricsList.md
@@ -0,0 +1,130 @@
+Here is the detailed list of metrics that SDK can collect. Each metric belongs to a category. If a category is enabled,
+then all metrics belonging to that category will be collected by the SDK.
+
+## Category
+
+1) Default - All metrics under this category will be collected when the metrics are enabled
+2) HttpClient - Additional information collected for http client. The metrics collected for each http client can vary
+3) All - All metrics collected by the SDK comes under this category. This can be useful for debugging purposes.
+
+Note: When metrics feature is enabled, only the `Default` category metrics are collected. Other categories should be
+explicitly enabled.
+
+## Information collected at application level (Category: Default)
+
+| Metric Name                    | Meter         | Description      |
+| ------------------             | -----------   | ---------------- |
+| RequestCount                   | Counter       | Total number of requests (successful and failed) made from your code to AWS services
+| SuccessRequestCount            | Counter       | Total number of requests from your code to AWS services that resulted in a successful response
+| FailedRequestCount             | Counter       | Total number of requests from your code to AWS services that resulted in a failure. This can be expanded later to categorize the failures into buckets (like ClientErrorCount, ServiceErrorCount, ConnectionErrorCount etc)
+                  
+## Information collected for each request (ApiCall) (Category: Default)
+
+| Metric Name                    | Meter         | Description      |
+| ------------------             | -----------   | ---------------- |
+| Service                        | ConstantGauge | Service ID of the AWS service that the API request is made against
+| Api                            | ConstantGauge | The name of the AWS API the request is made to
+| StreamingRequest               | ConstantGauge | True if the request has streaming payload
+| StreamingResponse              | ConstantGauge | True if the response has streaming payload
+| ApiCallStartTime               | Timer         | The start time of the request
+| ApiCallEndTime                 | Timer         | The end time of the request
+| ApiCallLatency                 | Timer         | The total time taken to finish a request (inclusive of all retries), ApiCallEndTime - ApiCallStartTime
+| MarshallingLatency             | Timer         | The time taken to marshall the request
+| ApiCallAttemptCount            | Counter       | Total number of attempts that were made by the service client to fulfill this request before succeeding or failing. (Value is 1 if there are no retries)
+
+Each ApiCall can have multiple attempts before the call succeed or fail. The following metrics are collected for each ApiCall Attempt.
+
+| Metric Name                    | Meter         | Description      |
+| ------------------             | -----------   | ---------------- |
+| ApiCallAttemptStartTime        | Timer         | The start time of each Api call attempt
+| SigningLatency                 | Timer         | The time taken to sign the request in an Api Call Attempt
+| HttpRequestRoundTripLatency    | Timer         | The time taken by the underlying http client to start the Api call attempt and return the response
+| UnmarshallingLatency           | Timer         | The time taken to unmarshall the response (same metric for both successful and failed requests)
+| ApiCallAttemptEndTime          | Timer         | The end time of a Api call attempt
+| ApiCallAttemptLatency          | Timer         | The total time taken for an Api call attempt (exclusive of retries), ApiCallAttemptEndTime - ApiCallAttemptStartTime
+| AwsRequestId                   | ConstantGauge      | The request Id for the request. Represented by `x-amz-request-id` header in response
+| ExtendedRequestId              | ConstantGauge      | The extended request Id for the request. Represented by `x-amz-id-2` header in response
+| HttpStatusCode                 | ConstantGauge      | The http status code returned in the response. Null if there is no response
+| AwsException                   | ConstantGauge      | The Aws exception code returned by the service. This is included for each Api call attempt if the call results in a failure and caused by service
+| SdkException                   | ConstantGauge      | The error name for any failure that is due to something other than an Aws exception. This is included for each API call attempt if the call results in a failure and is caused by something other than service
+
+For each attempt, the following http client metrics are collected:
+
+| Metric Name                    | Meter         | Description      |
+| ------------------             | -----------   | ---------------- |
+| HttpClientName                 | ConstantGauge      | Name of the underlying http client (Apache, Netty, UrlConnection)
+| MaxConnections                 | Gauge         | Maximum number of connections allowed in the connection pool
+| AvailableConnections           | Gauge         | The number of idle connections in the connection pool that are ready to serve a request
+| LeasedConnections              | Gauge         | The number of connections in the connection pool that are busy serving requests
+| PendingRequests                | Gauge         | The number of requests awaiting a free connection from the pool
+
+## Additional Information collected for each http client (Category: HttpClient)
+
+### ApacheHttpClient
+HttpClientName - Apache
+
+No additional metrics available for apache client currently
+
+### UrlConnectionHttpClient
+HttpClientName - UrlConnection
+
+No additional metrics available for url connection client currently
+
+### NettyNioAsyncHttpClient
+HttpClientName - Netty
+
+| Metric Name                    |    Meter      |    Description   |
+| ------------------             | -----------   | ---------------- |
+| FailedConnectionClose          | Counter       | Number of times a connection close has failed
+| FailedPoolAcquire              | Counter       | Number of times a request failed to acquire a connection
+
+For Http2 requests,
+
+| Metric Name                    |    Meter      |    Description   |
+| ------------------             | -----------   | ---------------- |
+| ConnectionId                   | ConstantGauge      | The identifier for a connection
+| MaxStreamCount                 | Gauge         | Maximum number of streams allowed on the connection
+| CurrentStreamCount             | Gauge         | Number of active streams on the connection
+
+
+## Information collected for event stream requests (Category: Default)
+
+| Metric Name                    |    Meter      |    Description   |
+| ------------------             | -----------   | ---------------- |
+| RequestEventsReceivedCount     | Counter       | Number of events received from the client
+| RequestEventsSentCount         | Counter       | Number of events sent to the service
+| ResponseEventsReceivedCount    | Counter       | Number of events received from the service
+| ResponseEventsDeliveredCount   | Counter       | Number of events delivered to the client
+| RequestSubscriptionCreated     | Counter       | Number of request subscriptions created to deliver events from client to service (For event stream requests like startStreamTranscription API in Transcribe Streaming service)
+| RequestSubscriptionCompleted   | Counter       | Number of request subscriptions completed 
+| RequestSubscriptionCanceled    | Counter       | Number of request subscriptions canceled 
+| ResponseSubscriptionCreated    | Counter       | Number of response subscriptions created to deliver events from service to client
+| ResponseSubscriptionCompleted  | Counter       | Number of response subscriptions completed 
+| ResponseSubscriptionCanceled   | Counter       | Number of response subscriptions canceled 
+
+
+## FAQ
+1) When is the end time calculated for async requests?  
+   The end time is calculated when the future is completed (either successfully or exceptionally) as opposed to the time when future is returned from API
+   
+2) What errors are considered as throttling errors?
+   The request was considered as throttled if one of the following conditions are met:
+   1) The http status code is equal to: `429` or `503`
+   2) The error code is equal to one of the following values:  
+   SlowDown   
+   SlowDownException  
+   Throttling  
+   ThrottlingException  
+   Throttled  
+   ThrottledException  
+   ServiceUnavailable  
+   ServiceUnavailableException  
+   ServiceUnavailableError  
+   ProvisionedThroughputExceededException  
+   TooManyRequests  
+   TooManyRequestsException  
+   DescribeAttachmentLimitExceeded
+
+           
+## References
+1) [V1 Metrics Description](https://docs.aws.amazon.com/AWSJavaSDK/latest/javadoc/com/amazonaws/metrics/package-summary.html)
diff --git a/docs/design/core/metrics/README.md b/docs/design/core/metrics/README.md
new file mode 100644
index 000000000000..3f94783c8040
--- /dev/null
+++ b/docs/design/core/metrics/README.md
@@ -0,0 +1,69 @@
+**Design:** New Feature, **Status:**
+[In Development](../../../README.md)
+
+# Project Tenets (unless you know better ones)
+
+1. Metrics can be used to provide insights about application behavior to enhance performance and debug operational
+   issues.
+2. Enabling default metrics should have minimal impact on the application performance.
+3. Customers can publish the collected metrics to their choice of platform.
+4. Metrics are divided into different categories for granular control.
+5. Customers can control the cost by having the ability to enable/disable the metrics collection by category.
+6. Metrics collected by SDK are namespaced to avoid collision with other application metrics.
+
+
+# Project Introduction
+
+This project adds a feature to the AWS SDK for Java that can collect and report client side SDK metrics in your
+application.  Metrics helps developers, ops engineers to detect and diagnose issues in their applications.  The metrics
+can also be used to gather insights into the application over time and tune the application for optimal performance.
+
+
+# Project Details
+
+1. Metrics are disabled by default and should be enabled explicitly by customers. Enabling metrics will introduce small
+   overhead.
+2. Metrics can be enabled quickly during large scale events with need for code change or deployments.
+3. Customers may publish metrics using their existing credentials.
+4. Metrics are stored and accessed by AWS only with explicit permissions from the customer.
+5. New Metrics can be added and published by the SDK into existing categories.
+
+
+# Metrics Meters
+Meters define the way a metric is measured. Here are the list of meters:
+
+**Counter :** Number of times a metric is reported. These kind of metrics can be incremented or decremented.  
+For example: number of requests made since the start of application
+
+**Timer :** Records the time between start of an event and end of an event. An example is the time taken (latency) to
+complete a request.
+
+**Gauge :** A value recorded at a point in time. An example is the number of connections in the client pool.
+
+**Constant Gauge :** There are metrics that have a static value which doesn't change after it is set. Some examples are
+service name, API name, status code, request id.  To support this, a constant implementation of gauge is used
+
+Reference: Some Meter names are taken from open source
+[spectator](http://netflix.github.io/spectator/en/latest/intro/counter/) project (Apache 2.0 license).
+
+# Naming
+
+1. Metric names should be in CamelCase format.
+2. Only Alphabets and numbers are allowed in metric names.
+
+## Collected Metrics
+
+The full list of metrics collected by the SDK are documented [here](MetricsList.md) along with their definitions.
+
+
+# Metric Publishers
+
+Metric Publishers are the implementations that are used to publish metrics to different platforms. 
+SDK provides default publishers to publish to following platforms for convenience. 
+Customers can implement custom publishers to publish metrics to platforms not supported by SDK.
+
+## Supported platforms
+1) CloudWatch
+
+2) CSM - Client Side Monitoring (also known as [AWS SDK Metrics for Enterprise
+Support](https://docs.aws.amazon.com/sdk-for-java/v1/developer-guide/sdk-metrics.html))
diff --git a/docs/design/core/metrics/images/CWMetricPublisher.jpg b/docs/design/core/metrics/images/CWMetricPublisher.jpg
new file mode 100644
index 000000000000..f18bfecf1db7
Binary files /dev/null and b/docs/design/core/metrics/images/CWMetricPublisher.jpg differ
diff --git a/docs/design/core/metrics/images/MetricCollection.jpg b/docs/design/core/metrics/images/MetricCollection.jpg
new file mode 100644
index 000000000000..46b72012ff89
Binary files /dev/null and b/docs/design/core/metrics/images/MetricCollection.jpg differ
diff --git a/docs/design/core/metrics/images/MetricPublisher.jpg b/docs/design/core/metrics/images/MetricPublisher.jpg
new file mode 100644
index 000000000000..2b605d1b5388
Binary files /dev/null and b/docs/design/core/metrics/images/MetricPublisher.jpg differ
diff --git a/docs/design/core/metrics/images/MetricsModulesHierarchy.png b/docs/design/core/metrics/images/MetricsModulesHierarchy.png
new file mode 100644
index 000000000000..cb5afcf7a90e
Binary files /dev/null and b/docs/design/core/metrics/images/MetricsModulesHierarchy.png differ
diff --git a/docs/design/core/metrics/prototype/MetricConfigurationProvider.java b/docs/design/core/metrics/prototype/MetricConfigurationProvider.java
new file mode 100644
index 000000000000..603f15e1a09f
--- /dev/null
+++ b/docs/design/core/metrics/prototype/MetricConfigurationProvider.java
@@ -0,0 +1,45 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.metrics.provider;
+
+import java.util.Set;
+import software.amazon.awssdk.annotations.SdkPublicApi;
+import software.amazon.awssdk.metrics.MetricCategory;
+
+/**
+ * Interface to configure the options in metrics feature.
+ *
+ * This interface acts as a feature flag for metrics. The methods in the interface are called for each request.
+ * This gives flexibility for metrics feature to be enabled/disabled at runtime and configuration changes
+ * can be picked up at runtime without need for deploying the application (depending on the implementation).
+ *
+ * @see SystemSettingsMetricConfigurationProvider
+ */
+@SdkPublicApi
+public interface MetricConfigurationProvider {
+
+    /**
+     * @return true if the metrics feature is enabled.
+     *         false if the feature is disabled.
+     */
+    boolean enabled();
+
+    /**
+     * Return the set of {@link MetricCategory} that are enabled for metrics collection.
+     * Only metrics belonging to these categories will be collected.
+     */
+    Set<MetricCategory> metricCategories();
+}
diff --git a/docs/design/core/metrics/prototype/MetricPublisher.java b/docs/design/core/metrics/prototype/MetricPublisher.java
new file mode 100644
index 000000000000..1cb4c5b5a90b
--- /dev/null
+++ b/docs/design/core/metrics/prototype/MetricPublisher.java
@@ -0,0 +1,68 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.metrics.publisher;
+
+import java.util.concurrent.CompletableFuture;
+import software.amazon.awssdk.annotations.SdkPublicApi;
+import software.amazon.awssdk.metrics.registry.MetricRegistry;
+
+/**
+ * Interface to report and publish the collected SDK metrics to external sources.
+ *
+ * Publisher implementations create and maintain resources (like clients, thread pool etc) that are used for publishing.
+ * They should be closed in the close() method to avoid resource leakage.
+ *
+ * <p>
+ *     As metrics are not part of the business logic, failures caused by metrics features should not fail the application.
+ *     So SDK publisher implementations suppress all errors during the metrics publishing and log them.
+ * </p>
+ *
+ * <p>
+ *     In certain situations (high throttling errors, metrics are reported faster than publishing etc), storing all the metrics
+ *     might take up lot of memory and can crash the application. In these cases, it is recommended to have a max limit on
+ *     number of metrics stored or memory used for metrics and drop the metrics when the limit is breached.
+ * </p>
+ */
+@SdkPublicApi
+public interface MetricPublisher extends AutoCloseable {
+
+    /**
+     * Registers the metric information supplied in MetricsRegistry. The reported metrics can be transformed and
+     * stored in a format the publisher uses to publish the metrics.
+     *
+     * This method is called at the end of each request execution to report all the metrics collected
+     * for that request (including retry attempt metrics)
+     */
+    void registerMetrics(MetricRegistry metricsRegistry);
+
+    /**
+     * Publish all metrics stored in the publisher. If all available metrics cannot be published in a single call,
+     * multiple calls will be made to publish the metrics.
+     *
+     * It is recommended to publish the metrics in a non-blocking way. As it is common to publish metrics to an external
+     * source which involves network calls, the method is intended to be implemented in a non-blocking way and thus
+     * returns a {@link CompletableFuture}.
+     *
+     * Depending on the implementation, the metrics are published to the external source periodically like:
+     * a) after a certain time period
+     * b) after n metrics are registered
+     * c) after the buffer is full
+     *
+     * Implementations can also call publish method for every reported metric. But this can be expensive and
+     * is not recommended.
+     */
+    CompletableFuture<Void> publish();
+}
diff --git a/docs/design/core/metrics/prototype/MetricPublisherConfiguration.java b/docs/design/core/metrics/prototype/MetricPublisherConfiguration.java
new file mode 100644
index 000000000000..706c6ee00875
--- /dev/null
+++ b/docs/design/core/metrics/prototype/MetricPublisherConfiguration.java
@@ -0,0 +1,92 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.metrics.publisher;
+
+import java.util.Collections;
+import java.util.List;
+import software.amazon.awssdk.utils.builder.CopyableBuilder;
+import software.amazon.awssdk.utils.builder.ToCopyableBuilder;
+
+/**
+ * Configure the options to publish the metrics.
+ * <p>
+ * By default, SDK creates and uses only CloudWatch publisher with default options (Default credential chain
+ * and region chain).
+ * To use CloudWatch publisher with custom options or any other publishers, create a
+ * #PublisherConfiguration object and set it in the ClientOverrideConfiguration on the client.
+ * </p>
+ *
+ * <p>
+ *     SDK exposes the CloudWatch and CSM publisher implementation, so instances of these classes with
+ *     different configuration can be set in this class.
+ * </p>
+ */
+public final class MetricPublisherConfiguration implements
+                                    ToCopyableBuilder<MetricPublisherConfiguration.Builder, MetricPublisherConfiguration> {
+
+    private final List<MetricPublisher> publishers = Collections.emptyList();
+
+    public MetricPublisherConfiguration(Builder builder) {
+        this.publishers.addAll(builder.publishers);
+    }
+
+    /**
+     * @return the list of #MetricPublisher to be used for publishing the metrics
+     */
+    public List<MetricPublisher> publishers() {
+        return publishers;
+    }
+
+    /**
+     * @return a {@link Builder} object to construct a PublisherConfiguration instance.
+     */
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    @Override
+    public Builder toBuilder() {
+        return new Builder();
+    }
+
+    public static final class Builder implements CopyableBuilder<Builder, MetricPublisherConfiguration> {
+
+        private final List<MetricPublisher> publishers = Collections.emptyList();
+
+        private Builder() {
+        }
+
+        /**
+         * Sets the list of publishers used for publishing the metrics.
+         */
+        public Builder publishers(List<MetricPublisher> publishers) {
+            this.publishers.addAll(publishers);
+            return this;
+        }
+
+        /**
+         * Add a publisher to the list of publishers used for publishing the metrics.
+         */
+        public Builder addPublisher(MetricPublisher publisher) {
+            this.publishers.add(publisher);
+            return this;
+        }
+
+        public MetricPublisherConfiguration build() {
+            return new MetricPublisherConfiguration(this);
+        }
+    }
+}
diff --git a/docs/design/core/metrics/prototype/MetricRegistry.java b/docs/design/core/metrics/prototype/MetricRegistry.java
new file mode 100644
index 000000000000..e24a54620531
--- /dev/null
+++ b/docs/design/core/metrics/prototype/MetricRegistry.java
@@ -0,0 +1,127 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.metrics.registry;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import software.amazon.awssdk.annotations.SdkPublicApi;
+import software.amazon.awssdk.metrics.meter.Counter;
+import software.amazon.awssdk.metrics.meter.Gauge;
+import software.amazon.awssdk.metrics.meter.Metric;
+import software.amazon.awssdk.metrics.meter.Timer;
+
+/**
+ * Registry to store the collected metrics data. The interface can be used to store metrics for ApiCall and ApiCallAttempt.
+ * For a ApiCall, there can be multiple attempts and so a MetricRegistry has the option to store other MetricRegistry instances.
+ */
+@SdkPublicApi
+public interface MetricRegistry {
+
+    /**
+     * Return the ApiCall level metrics registered in this metric registry as a map of metric name to metric instance.
+     * Only metrics that can be recorded once for entire request lifecycle are recorded here.
+     *
+     * The method does not return the Api Call Attempt metrics. For metrics recorded separately for each attempt,
+     * see {@link #apiCallAttemptMetrics()}.
+     */
+    Map<String, Metric> getMetrics();
+
+
+    /**
+     * Return an ordered list of {@link MetricRegistry} instances recorded for each Api Call Attempt in the request execution.
+     * Each Api call attempt metrics are recorded as a separate {@link MetricRegistry} instance in the given list.
+     *
+     * For example,
+     * If the Api finishes (succeed or fail) in the first attempt, the returned list size will be 1.
+     *
+     * If the Api finishes after 4 attempts (1 initial attempt + 3 retries), the returned list size will be 4. In this case,
+     * The 0th entry in the list has the metrics for the initial attempt,
+     * The 1st entry in the list has the metrics for the second attempt (1st retry) and so on.
+     *
+     * @return an ordered list of {@link MetricRegistry} instances, one for each Api Call Attempt in the request execution
+     */
+    List<MetricRegistry> apiCallAttemptMetrics();
+
+    /**
+     * Create and return a new instance of {@link MetricRegistry} for the current ApiCall Attempt.
+     * Records the registry instance within the class. The instance for the current attempt can be accessed by calling
+     * the {@link #apiCallAttemptMetrics()} method and getting the last element in the output list.
+     *
+     * If the Api Call finishes in the first attempt, this method is only called once.
+     * If the Api Call finishes after n retry attmpts, this method is called n + 1 times
+     * (1 time for initial attempt, n times for n retries)
+     *
+     * @return a instance of {@link MetricRegistry} to record metrics for a ApiCall Attempt
+     */
+    MetricRegistry registerApiCallAttemptMetrics();
+
+    /**
+     * Given a {@link Metric}, registers it under the given name.
+     * If a metric with given name is already present, method throws {@link IllegalArgumentException}.
+     *
+     * @param name   the name of the metric
+     * @param metric the metric
+     * @return the given metric
+     */
+    Metric register(String name, Metric metric);
+
+    /**
+     * Returns an optional representing the metric registered with the given name. If no metric is registered
+     * with the given name, an empty optional will be returned.
+     *
+     * @param name the name of the metric
+     * @return an optional representing the metric registered with the given name.
+     */
+    Optional<Metric> metric(String name);
+
+    /**
+     * Removes the metric with the given name.
+     *
+     * @param name the name of the metric
+     * @return True if the metric was removed. False is the metric doesn't exist or cannot be removed
+     */
+    boolean remove(String name);
+
+    /**
+     * Return the {@link Counter} registered under this name.
+     * If there is none registered already, create and register a new {@link Counter}.
+     *
+     * @param name name of the metric
+     * @return a new or pre-existing {@link Counter}
+     */
+    Counter counter(String name);
+
+    /**
+     * Return the {@link Timer} registered under this name.
+     * If there is none registered already, create and register a new {@link Timer}.
+     *
+     * @param name name of the metric
+     * @return a new or pre-existing {@link Timer}
+     */
+    Timer timer(String name);
+
+    /**
+     * Return a {@link Gauge} registered under this name and updates its value with #value.
+     * If there is none registered already, create and register a new {@link Gauge} with the given initial #value.
+     *
+     * @param name name of the metric
+     * @param value initial value of the guage
+     * @param <T> type of the value
+     * @return a new or pre-existing {@link Gauge} with updated value
+     */
+    <T> Gauge<T> gauge(String name, T value);
+}
diff --git a/docs/design/core/presigners/README.md b/docs/design/core/presigners/README.md
index 08a6f545024e..6ff6f8e95d36 100644
--- a/docs/design/core/presigners/README.md
+++ b/docs/design/core/presigners/README.md
@@ -1,4 +1,6 @@
-## Feature Overview
+**Design:** New Feature, **Status:** [Released](../../../README.md)
+
+# Request Presigners
 
 "Presigned URLs" are a generic term usually used for an AWS request that has been signed using
 [SigV4's query parameter signing](https://docs.aws.amazon.com/AmazonS3/latest/API/sigv4-query-string-auth.html) so that it can be
diff --git a/docs/design/services/dynamodb/high-level-library/README.md b/docs/design/services/dynamodb/high-level-library/README.md
index 9e08025c1886..2f21e79bdb63 100644
--- a/docs/design/services/dynamodb/high-level-library/README.md
+++ b/docs/design/services/dynamodb/high-level-library/README.md
@@ -1,5 +1,4 @@
-**Design:** New Feature, **Status:**
-[In Development](../../../README.md)
+**Design:** New Feature, **Status:** [Public Preview](../../../../../services-custom/dynamodb-enhanced/README.md)
 
 ## Tenets (unless you know better ones)
 
@@ -38,182 +37,22 @@ including AWS's own Document and Mapper Clients.
 
 The AWS SDK for Java will add a new "enhanced DynamoDB client" that
 provides an alternative to the data-access portion of the generated
-DynamoDB APIs. Control-plane operations like "create table" will not be
-supported at launch, but may be added at a later time.
+DynamoDB APIs. Only limited control-plane operations will be available,
+specifically 'createTable'.
 
 This enhanced client will make DynamoDB easier to use for Java customers
 by:
 1. Supporting conversions between Java objects and DynamoDB items
-2. Supporting conversions between Java built-in types (eg. `Instant`)
-   and DynamoDB attribute value types
-3. Directly supporting every data-plane operation of DynamoDB
-4. Using the same verbs and nouns of DynamoDB
-
-## Implementation Overview
-
-**New Clients**
-
-Two new client classes will be added:
-`DynamoDbEnhancedClient` and `DynamoDbEnhancedAsyncClient`. These
-classes act as a wrapper around the generated `DynamoDbClient` and
-`DynamoDbAsyncClient` classes, to provide additional functionality on
-top of that which can be provided by the generated clients.
-
-```java
-DynamoDbEnhancedClient enhancedClient = 
-    DynamoDbEnhancedClient.builder()
-                          .dynamoDbClient(DynamoDbClient.create())
-                          .build();
-```
-
-**Table Abstraction**
-
-`DynamoDbEnhancedClient` provides access to `Table` and `MappedTable`,
-and `DynamoDbEnhancedAsyncClient`provides access to `AsyncTable`, and
-`AsyncMappedTable` abstractions.
-
-The operations on these "tables" match the data-plane operations in the
-low-level DynamoDB client. For example, because `DynamoDbClient.putItem`
-exists, `Table.putItem` will also exist.
-
-`Table` and `AsyncTable` work with "items", described below.
-`MappedTable` and `AsyncMappedTable` work with "objects", described
-below. `Table` and `MappedTable` returning results synchronously, and
-`AsyncTable` and `AsyncMappedTable` returning results asynchronously.
-
-```java
-Table booksTable = enhancedClient.table("books");
-booksTable.putItem(...);
-
-MappedTable mappedBooksTable = enhancedClient.mappedTable("books");
-mappedBooksTable.putItem(...);
-```
- 
-**Item Abstraction**
-
-The operations on `Table` and `AsyncTable` work on `Item`s. An `Item` is
-a user-friendly representation of the generated `Map<String,
-AttributeValue>`. `Item`s support automatic type conversion between Java
-built-in types and DynamoDB-specific `AttributeValue` types.
-
-```java
-booksTable.putItem(Item.builder()
-                       .putAttribute("isbn", "0-330-25864-8")
-                       .putAttribute("title", "The Hitchhiker's Guide to the Galaxy")
-                       .putAttribute("creationDate", Instant.now())
-                       .build());
-```
-
-The `Table` and `AsyncTable` abstractions can be seen as a replacement
-for the 1.11.x DynamoDB Document client.
-
-**Object Abstraction**
-
-The operations on `MappedTable` and `AsyncMappedTable` work on Java
-objects (at launch, Java beans). These objects are automatically
-converted by the enhanced client to the generated `Map<String,
-AttributeValue>`. It's likely that the `MappedTable` and
-`AsyncMappedTable` will use the `Table` and `AsyncTable` as an
-implementation detail.
-
-```java
-Book book = new Book();
-book.setIsbn("0-330-25864-8");
-book.setTitle("The Hitchhiker's Guide to the Galaxy");
-book.setCreationDate(Instant.now());
-mappedBooksTable.putItem(book);
-```
-
-The `MappedTable` and `AsyncMappedTable` abstractions can be seen as a
-replacement for the 1.11.x DynamoDB Mapper client.
-
-**Type Conversion**
-
-The core feature of the mapper is the ability to convert common Java
-structures (e.g. Java beans) and types (e.g. `Instant`, `Number`) into
-DynamoDB attribute values. 
-
-These conversions are performed based on the types specified by the
-customer. For example, the SDK will automatically convert any `Number`
-types specified by the customer (as an Item attribute) into a DynamoDB
-number.
-
-The customer has the ability to configure the type converters used at
-the `Item` or `DynamoDbEnhanced[Async]Client`-level. This allows the
-customer to add support for unsupported types, change the DynamoDB type
-associated with a Java type (e.g. storing an `Instant` as a DynamoDB
-string instead of a number), or to add support for custom POJO
-conversion logic (i.e. other than Java beans). This also allows the
-customer to provide a hard-coded converter for a specific object type
-that performs more efficiently than the built-in reflection-based object
-converter.
-
-## Features
-
-**Launch Features**
-
-These features are intended for inclusion at launch of the library.
-
-1. Support for all existing data plane operations: get, put, query,
-   update, scan, delete, batch get, batch put, transaction get, and
-   transaction put.
-2. Support for `[Async]Table` and `[Async]MappedTable`, as described
-   above.
-3. Support for bean-based representations in `[Async]MappedTable`.
-4. Type converters for all Java built-in types that are currently 
-   supported by [Joda Convert](https://www.joda.org/joda-convert/).
-
-| API | Feature | Development | Usability Study |
-| --- | --- | --- | --- |
-| Item | Get | Done | |
-| | Put | Done | |
-| | Query | | |
-| | Update | | |
-| | Scan | | |
-| | Delete | | |
-| | Batch Get | | |
-| | Batch Put | | |
-| | Transaction Get | | |
-| | Transaction Put | | |
-| Object | Get | | |
-| | Put | | |
-| | Query | | |
-| | Update | | |
-| | Scan | | |
-| | Delete | | |
-| | Batch Get | | |
-| | Batch Put | | |
-| | Transaction Get | | |
-| | Transaction Put | | |
-| All | Type Support | In Progress | |
-
-**Post-Launch Features**
-
-1. Support for inheritance in `[Async]MappedTable`.
-2. Support for immutable objects in `[Async]MappedTable`.
-3. Support for projection statements in `[Async]Table` and
-   `[Async]MappedTable`.
-4. Support for DynamoDB-provided API metrics (e.g. consumed capacity).
-5. A `software.amazon.aws:dynamodb-all` module that automatically
-   includes all AWS DynamoDB artifacts, to enhance client
-   discoverability.
-
-**Missing Features**
-
-These features are not intended for inclusion at launch of the library
-(but may be added at a future time).
-
-1. Support for control-plane operations, like create or delete table.
-   *Justification for exclusion:* For testing purposes, this can be done
-   through the AWS console or low-level SDK. For production purposes,
-   this should be done through the AWS CDK or cloud formation.
-2. Versioning and UUID annotations. *Justification for exclusion:* This
-   is a higher-level concern than the "type converter" goal that the
-   enhanced client is attempting to deliver on. This is a piece of
-   functionality that will be built on-top of the enhanced client, not
-   in it.
+2. Directly supporting every data-plane operation of DynamoDB
+3. Using the same verbs and nouns of DynamoDB
+4. Support for tests, such as the ability to create tables using the
+   same models as the data plane operations.
+
+A fully functional public preview is available for this library. See
+[DynamoDb Enhanced Public Preview
+Library](../../../../../services-custom/dynamodb-enhanced/README.md).
    
-**Requested Features**
+## Appendix A: Requested Features
 
 * [Immutable classes](https://github.com/aws/aws-sdk-java-v2/issues/35#issuecomment-315049138)
 * [Getter/setter-less fields](https://github.com/aws/aws-sdk-java/issues/547)
@@ -257,7 +96,7 @@ These features are not intended for inclusion at launch of the library
   runtime (from email)
 * Structure versioning (from email)
 
-## Appendix A: Alternative Solutions
+## Appendix B: Alternative Solutions
 
 ### Alternative Solution 1: Level 3 Storage Library
 
diff --git a/docs/design/services/dynamodb/high-level-library/archive/20200103/README.md b/docs/design/services/dynamodb/high-level-library/archive/20200103/README.md
new file mode 100644
index 000000000000..ce144cfe01c4
--- /dev/null
+++ b/docs/design/services/dynamodb/high-level-library/archive/20200103/README.md
@@ -0,0 +1,368 @@
+**Design:** New Feature, **Status:**
+[In Development](../../../../../README.md)
+
+## Tenets (unless you know better ones)
+
+1. Meeting customers in their problem space allows them to deliver value
+   quickly.
+2. Meeting customer expectations drives usability.
+3. Discoverability drives usage.
+4. Providing a Java-focused experience for DynamoDB reduces the coding
+   effort required to integrate with DynamoDB. 
+5. Reusing the same nouns and verbs as the generated DynamoDB client
+   meets customer expectations. 
+6. Optimizing for cold-start performance allows customers the
+   convenience of using object mapping in a Lambda environment.
+
+## Problem
+
+Customers on the AWS SDK for Java 2.x currently use the `DynamoDbClient`
+to communicate with DynamoDB. This client is generated from the model
+provided by the DynamoDB team.
+
+Because this client is generated, it does not provide an idiomatic Java
+experience. For example: (1) the client represents numbers as `String`
+instead of the more idiomatic `Number`, (2) customers must manually
+convert common Java data types like `Instant` into types supported by
+DynamoDB, (3) customers that represent their DynamoDB objects using Java
+objects must manually convert these objects into the item representation
+supported by DynamoDB.
+
+## Existing Solutions
+
+This problem is not currently addressed directly in the AWS SDK for Java
+2.x by any known third-party tool. In 1.11.x, several solutions exist,
+including AWS's own Document and Mapper Clients.
+
+## Proposed Solution
+
+The AWS SDK for Java will add a new "enhanced DynamoDB client" that
+provides an alternative to the data-access portion of the generated
+DynamoDB APIs. Control-plane operations like "create table" will not be
+supported at launch, but may be added at a later time.
+
+This enhanced client will make DynamoDB easier to use for Java customers
+by:
+1. Supporting conversions between Java objects and DynamoDB items
+2. Supporting conversions between Java built-in types (eg. `Instant`)
+   and DynamoDB attribute value types
+3. Directly supporting every data-plane operation of DynamoDB
+4. Using the same verbs and nouns of DynamoDB
+
+## Implementation Overview
+
+**New Clients**
+
+Two new client classes will be added:
+`DynamoDbEnhancedClient` and `DynamoDbEnhancedAsyncClient`. These
+classes act as a wrapper around the generated `DynamoDbClient` and
+`DynamoDbAsyncClient` classes, to provide additional functionality on
+top of that which can be provided by the generated clients.
+
+```java
+DynamoDbEnhancedClient enhancedClient = 
+    DynamoDbEnhancedClient.builder()
+                          .dynamoDbClient(DynamoDbClient.create())
+                          .build();
+```
+
+**Table Abstraction**
+
+`DynamoDbEnhancedClient` provides access to `Table` and `MappedTable`,
+and `DynamoDbEnhancedAsyncClient`provides access to `AsyncTable`, and
+`AsyncMappedTable` abstractions.
+
+The operations on these "tables" match the data-plane operations in the
+low-level DynamoDB client. For example, because `DynamoDbClient.putItem`
+exists, `Table.putItem` will also exist.
+
+`Table` and `AsyncTable` work with "items", described below.
+`MappedTable` and `AsyncMappedTable` work with "objects", described
+below. `Table` and `MappedTable` returning results synchronously, and
+`AsyncTable` and `AsyncMappedTable` returning results asynchronously.
+
+```java
+Table booksTable = enhancedClient.table("books");
+booksTable.putItem(...);
+
+MappedTable mappedBooksTable = enhancedClient.mappedTable("books");
+mappedBooksTable.putItem(...);
+```
+ 
+**Item Abstraction**
+
+The operations on `Table` and `AsyncTable` work on `Item`s. An `Item` is
+a user-friendly representation of the generated `Map<String,
+AttributeValue>`. `Item`s support automatic type conversion between Java
+built-in types and DynamoDB-specific `AttributeValue` types.
+
+```java
+booksTable.putItem(Item.builder()
+                       .putAttribute("isbn", "0-330-25864-8")
+                       .putAttribute("title", "The Hitchhiker's Guide to the Galaxy")
+                       .putAttribute("creationDate", Instant.now())
+                       .build());
+```
+
+The `Table` and `AsyncTable` abstractions can be seen as a replacement
+for the 1.11.x DynamoDB Document client.
+
+**Object Abstraction**
+
+The operations on `MappedTable` and `AsyncMappedTable` work on Java
+objects (at launch, Java beans). These objects are automatically
+converted by the enhanced client to the generated `Map<String,
+AttributeValue>`. It's likely that the `MappedTable` and
+`AsyncMappedTable` will use the `Table` and `AsyncTable` as an
+implementation detail.
+
+```java
+Book book = new Book();
+book.setIsbn("0-330-25864-8");
+book.setTitle("The Hitchhiker's Guide to the Galaxy");
+book.setCreationDate(Instant.now());
+mappedBooksTable.putItem(book);
+```
+
+The `MappedTable` and `AsyncMappedTable` abstractions can be seen as a
+replacement for the 1.11.x DynamoDB Mapper client.
+
+**Type Conversion**
+
+The core feature of the mapper is the ability to convert common Java
+structures (e.g. Java beans) and types (e.g. `Instant`, `Number`) into
+DynamoDB attribute values. 
+
+These conversions are performed based on the types specified by the
+customer. For example, the SDK will automatically convert any `Number`
+types specified by the customer (as an Item attribute) into a DynamoDB
+number.
+
+The customer has the ability to configure the type converters used at
+the `Item` or `DynamoDbEnhanced[Async]Client`-level. This allows the
+customer to add support for unsupported types, change the DynamoDB type
+associated with a Java type (e.g. storing an `Instant` as a DynamoDB
+string instead of a number), or to add support for custom POJO
+conversion logic (i.e. other than Java beans). This also allows the
+customer to provide a hard-coded converter for a specific object type
+that performs more efficiently than the built-in reflection-based object
+converter.
+
+## Features
+
+**Launch Features**
+
+These features are intended for inclusion at launch of the library.
+
+1. Support for all existing data plane operations: get, put, query,
+   update, scan, delete, batch get, batch put, transaction get, and
+   transaction put.
+2. Support for `[Async]Table` and `[Async]MappedTable`, as described
+   above.
+3. Support for bean-based representations in `[Async]MappedTable`.
+4. Type converters for all Java built-in types that are currently 
+   supported by [Joda Convert](https://www.joda.org/joda-convert/).
+
+| API | Feature | Development | Usability Study |
+| --- | --- | --- | --- |
+| Item | Get | Done | |
+| | Put | Done | |
+| | Query | | |
+| | Update | | |
+| | Scan | | |
+| | Delete | | |
+| | Batch Get | | |
+| | Batch Put | | |
+| | Transaction Get | | |
+| | Transaction Put | | |
+| Object | Get | | |
+| | Put | | |
+| | Query | | |
+| | Update | | |
+| | Scan | | |
+| | Delete | | |
+| | Batch Get | | |
+| | Batch Put | | |
+| | Transaction Get | | |
+| | Transaction Put | | |
+| All | Type Support | In Progress | |
+
+**Post-Launch Features**
+
+1. Support for inheritance in `[Async]MappedTable`.
+2. Support for immutable objects in `[Async]MappedTable`.
+3. Support for projection statements in `[Async]Table` and
+   `[Async]MappedTable`.
+4. Support for DynamoDB-provided API metrics (e.g. consumed capacity).
+5. A `software.amazon.aws:dynamodb-all` module that automatically
+   includes all AWS DynamoDB artifacts, to enhance client
+   discoverability.
+
+**Missing Features**
+
+These features are not intended for inclusion at launch of the library
+(but may be added at a future time).
+
+1. Support for control-plane operations, like create or delete table.
+   *Justification for exclusion:* For testing purposes, this can be done
+   through the AWS console or low-level SDK. For production purposes,
+   this should be done through the AWS CDK or cloud formation.
+2. Versioning and UUID annotations. *Justification for exclusion:* This
+   is a higher-level concern than the "type converter" goal that the
+   enhanced client is attempting to deliver on. This is a piece of
+   functionality that will be built on-top of the enhanced client, not
+   in it.
+   
+**Requested Features**
+
+* [Immutable classes](https://github.com/aws/aws-sdk-java-v2/issues/35#issuecomment-315049138)
+* [Getter/setter-less fields](https://github.com/aws/aws-sdk-java/issues/547)
+* [Replace `PaginatedList` with `Stream`](https://github.com/aws/aws-sdk-java-v2/issues/35#issuecomment-318051305)
+* [Allow 'setters' and 'getters' to support different types](https://github.com/aws/aws-sdk-java-v2/issues/35#issuecomment-318792534)
+* [Have 'scan' respect the table's read throughput](https://github.com/aws/aws-sdk-java-v2/issues/35#issuecomment-329007523)
+* [Allow creating a table with an LSI that projects all attributes](https://github.com/aws/aws-sdk-java/issues/214#issue-31304615)
+* [Projection expressions in 'load' and 'batchLoad'](https://github.com/aws/aws-sdk-java/issues/527)
+* [New condition expressions](https://github.com/aws/aws-sdk-java/issues/534)
+* [Accessing un-modeled/dynamic attributes in a POJO](https://github.com/aws/aws-sdk-java/issues/674)
+* [Inheritance](https://github.com/aws/aws-sdk-java/issues/832)
+* [Service-side metrics](https://github.com/aws/aws-sdk-java/issues/953)
+  ([1](https://github.com/aws/aws-sdk-java/issues/1170),
+  [2](https://github.com/aws/aws-sdk-java-v2/issues/703),
+  [3](https://github.com/aws/aws-sdk-java-v2/issues/35#issuecomment-417656448))
+* [Merging DynamoDB mapper configurations](https://github.com/aws/aws-sdk-java/issues/1201)
+* [Cache merged DynamoDB mapper configurations](https://github.com/aws/aws-sdk-java/issues/1235)
+* [Create one single type converter interface](https://github.com/aws/aws-sdk-java-v2/issues/35#issuecomment-330616648)
+* [Support `@DynamoDBGeneratedUuid` in objects nested within lists](https://github.com/aws/aws-sdk-java-v2/issues/35#issuecomment-332958299)
+* [Allow annotating fields in addition to methods](https://github.com/aws/aws-sdk-java-v2/issues/35#issuecomment-332968651)
+* [Non-string keys in maps](https://github.com/aws/aws-sdk-java-v2/issues/35#issuecomment-332974427)
+* [Multiple conditions on the same attribute, for save/delete](https://github.com/aws/aws-sdk-java-v2/issues/35#issuecomment-342586344)
+* [Persisting public getters from package-private classes](https://github.com/aws/aws-sdk-java-v2/issues/35#issuecomment-343006566)
+* [Return modified attributes when doing a save](https://github.com/aws/aws-sdk-java-v2/issues/35#issuecomment-417656448)
+* [More direct exposure of scan or filter expressions](https://github.com/aws/aws-sdk-java-v2/issues/35#issuecomment-430993224)
+* [Transactions support](https://github.com/aws/aws-sdk-java-v2/issues/35#issuecomment-443308198)
+* [Creating an Item from JSON (and vice-versa)](https://github.com/aws/aws-sdk-java-v2/issues/1240)
+* Straight-forward support for multiple classes in a single table (as
+  per
+  [here](https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/bp-general-nosql-design.html))
+  (from email)
+* Support for `Optional` (from email)
+* Support for `Publisher` for async paginated responses (from email)
+* Create a table with partial projections (from email)
+* Better integration with DynamoDB streams (from email)
+* Configuring table auto-scaling when a table is created (from email)
+* Request-level credentials (from email)
+* Wrappers for transactional isolation (from email)
+* Dynamic attributes - ones with different types depending on the value
+  of other attributes, or attributes with names that are generated at
+  runtime (from email)
+* Structure versioning (from email)
+
+## Appendix A: Alternative Solutions
+
+### Alternative Solution 1: Level 3 Storage Library
+
+A "Level 2" high-level library is a service-specific library built on
+top of the "Level 1" generated client. The solution proposed above is a
+Level 2 high-level library for DynamoDB.
+
+A "Level 3" high-level library focuses on a specific customer problem
+instead of a specific AWS service. For example, customers frequently use
+DynamoDB to store time series data. An alternate to the proposed
+solution above, would be to build multiple Level 3 libraries, each
+focusing on a specific customer problem: a document database library, a
+time series database library, etc. These libraries would support
+DynamoDB as one of many backing data stores.
+
+Instead of using traditional DynamoDB nouns and verbs (e.g. Item), a
+Level 3 library would use words more aligned to the problem domain (e.g.
+Document for document databases or Entry for time-series data). They
+would also expose operations more constrained to the problem domain they
+were trying to solve, instead of trying to expose every piece of
+DynamoDB functionality.
+
+This solution would be better for customers that are more familiar with
+the problem they are trying to solve and less familiar with DynamoDB.
+This solution would be worse for customers that are familiar with
+DynamoDB and want to be "closer" to the service.
+
+**Customer Feedback**
+
+The Java SDK team collected customer feedback internally and
+[externally](https://github.com/aws/aws-sdk-java-v2/issues/35#issuecomment-468435660),
+comparing this alternate solution against the proposed solution.
+Customers were presented with the following option comparison:
+
+> Option 1: A DynamoDB-specific client that combines the functionality
+> of 1.11.x's Documents APIs and DynamoDB Mapper APIs in a
+> straight-forward manner. 
+
+> Option 2: A generic document database client that creates an
+> abstraction over all document databases, like DynamoDB and MongoDB.
+> This would simplify using multiple document databases in the same
+> application, and make it easier to migrate between the two.
+> Unfortunately as a result, it also wouldn't be a direct DynamoDB
+> experience.
+
+We requested that customers review these two options as well as a
+[prototype of option 1](prototype/option-1/sync/Prototype.java) and a
+[prototype of option 2](prototype/option-2/sync/Prototype.java), to let
+us know which they prefer.
+
+The following anecdotes are from this customer feedback:
+
+> If \[Amazon] can make something like https://serverless.com/ or
+> https://onnx.ai/ which free customers from vendor lock-in, that would
+> be a great Think Big & Customer Obsession idea. If \[Amazon] cannot,
+> I feel that somebody who is more vendor-neutral can make a better
+> mapper than \[Amazon].
+
+> Have you thought about contributing to projects which already exist,
+> like Spring Data? https://github.com/derjust/spring-data-dynamodb 
+
+> Both options would work well for us.
+
+> I think \[doing option 1 and then creating a Spring Data plugin] might
+> get adoption from a broader audience than option 2. It could be used
+> as a stepping stone to move to DynamoDB.
+
+> I believe Option 2 does not make much sense. It would make sense to me
+> to go for Option 1 and start a bounty program to implement a module to
+> popular data access abstraction libraries such as spring-data
+> mentioned above or GORM.
+
+> Maybe you could implement/support JNOSQL spec http://www.jnosql.org/
+
+**Decision**
+
+Based on customer feedback, it was decided to temporarily reject
+alternative solution 1, and build the proposed solution. At a later
+time, the SDK may build a Level 3 abstraction for DynamoDB or integrate
+with existing Java Level 3 abstractions like Spring Data, Hibernate OGM,
+and/or JNoSQL. This Level 3 abstraction will possibly leverage the Level
+2 solution "under the hood".
+
+## Links
+
+**[Features](features.md)** - The features intended for inclusion during
+and after the launch of the enhanced DynamoDB client.
+
+**Prototypes**
+
+During the design of the project, two prototype interfaces were created
+to solicit feedback from customers on potential design directions.
+
+* [Prototype 1](prototype/option-1/sync/Prototype.java) - A DynamoDB
+  specific API that focuses on making DynamoDB easy to use from Java.
+* [Prototype 2](prototype/option-2/sync/Prototype.java) - A
+  DynamoDB-agnostic API that focuses on creating a generic document
+  database abstraction, that could be backed by DynamoDB or other
+  document databases.
+  
+**Feedback**
+
+* [DynamoDB Mapper Feature Request](https://github.com/aws/aws-sdk-java-v2/issues/35)
+  \- A github issue for tracking customer feature requests and feedback
+  for DynamoDB mapper-equivalent functionality in 2.x.
+* [DynamoDB Document API Feature Request](https://github.com/aws/aws-sdk-java-v2/issues/36)
+  \- A github issue for tracking customer feature requests and feedback
+  for DynamoDB document API-equivalent functionality in 2.x.
\ No newline at end of file
diff --git a/docs/design/services/dynamodb/high-level-library/features.md b/docs/design/services/dynamodb/high-level-library/archive/20200103/features.md
similarity index 100%
rename from docs/design/services/dynamodb/high-level-library/features.md
rename to docs/design/services/dynamodb/high-level-library/archive/20200103/features.md
diff --git a/docs/design/services/dynamodb/high-level-library/prototype/option-1/sync/Prototype.java b/docs/design/services/dynamodb/high-level-library/archive/20200103/prototype/option-1/sync/Prototype.java
similarity index 100%
rename from docs/design/services/dynamodb/high-level-library/prototype/option-1/sync/Prototype.java
rename to docs/design/services/dynamodb/high-level-library/archive/20200103/prototype/option-1/sync/Prototype.java
diff --git a/docs/design/services/dynamodb/high-level-library/prototype/option-2/sync/Prototype.java b/docs/design/services/dynamodb/high-level-library/archive/20200103/prototype/option-2/sync/Prototype.java
similarity index 100%
rename from docs/design/services/dynamodb/high-level-library/prototype/option-2/sync/Prototype.java
rename to docs/design/services/dynamodb/high-level-library/archive/20200103/prototype/option-2/sync/Prototype.java
diff --git a/http-client-spi/pom.xml b/http-client-spi/pom.xml
index 0b533dd6bba7..8960b256bf26 100644
--- a/http-client-spi/pom.xml
+++ b/http-client-spi/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>aws-sdk-java-pom</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>http-client-spi</artifactId>
     <name>AWS Java SDK :: HTTP Client Interface</name>
diff --git a/http-client-spi/src/main/java/software/amazon/awssdk/http/Abortable.java b/http-client-spi/src/main/java/software/amazon/awssdk/http/Abortable.java
index 028cde37d9c8..90303764518e 100644
--- a/http-client-spi/src/main/java/software/amazon/awssdk/http/Abortable.java
+++ b/http-client-spi/src/main/java/software/amazon/awssdk/http/Abortable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-client-spi/src/main/java/software/amazon/awssdk/http/AbortableInputStream.java b/http-client-spi/src/main/java/software/amazon/awssdk/http/AbortableInputStream.java
index a1d44dfadec1..a6e326dca65f 100644
--- a/http-client-spi/src/main/java/software/amazon/awssdk/http/AbortableInputStream.java
+++ b/http-client-spi/src/main/java/software/amazon/awssdk/http/AbortableInputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-client-spi/src/main/java/software/amazon/awssdk/http/ContentStreamProvider.java b/http-client-spi/src/main/java/software/amazon/awssdk/http/ContentStreamProvider.java
index 38b36608f448..cbb63dc2faf2 100644
--- a/http-client-spi/src/main/java/software/amazon/awssdk/http/ContentStreamProvider.java
+++ b/http-client-spi/src/main/java/software/amazon/awssdk/http/ContentStreamProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-client-spi/src/main/java/software/amazon/awssdk/http/DefaultSdkHttpFullRequest.java b/http-client-spi/src/main/java/software/amazon/awssdk/http/DefaultSdkHttpFullRequest.java
index fe90792399ee..2ac33c614b3c 100644
--- a/http-client-spi/src/main/java/software/amazon/awssdk/http/DefaultSdkHttpFullRequest.java
+++ b/http-client-spi/src/main/java/software/amazon/awssdk/http/DefaultSdkHttpFullRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-client-spi/src/main/java/software/amazon/awssdk/http/DefaultSdkHttpFullResponse.java b/http-client-spi/src/main/java/software/amazon/awssdk/http/DefaultSdkHttpFullResponse.java
index 806c5c18c2bd..2cf8861303fd 100644
--- a/http-client-spi/src/main/java/software/amazon/awssdk/http/DefaultSdkHttpFullResponse.java
+++ b/http-client-spi/src/main/java/software/amazon/awssdk/http/DefaultSdkHttpFullResponse.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-client-spi/src/main/java/software/amazon/awssdk/http/ExecutableHttpRequest.java b/http-client-spi/src/main/java/software/amazon/awssdk/http/ExecutableHttpRequest.java
index 519ab66f3bd3..d97d73528bdd 100644
--- a/http-client-spi/src/main/java/software/amazon/awssdk/http/ExecutableHttpRequest.java
+++ b/http-client-spi/src/main/java/software/amazon/awssdk/http/ExecutableHttpRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-client-spi/src/main/java/software/amazon/awssdk/http/FileStoreTlsKeyManagersProvider.java b/http-client-spi/src/main/java/software/amazon/awssdk/http/FileStoreTlsKeyManagersProvider.java
index 0d0d572e0518..a32da36a213e 100644
--- a/http-client-spi/src/main/java/software/amazon/awssdk/http/FileStoreTlsKeyManagersProvider.java
+++ b/http-client-spi/src/main/java/software/amazon/awssdk/http/FileStoreTlsKeyManagersProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-client-spi/src/main/java/software/amazon/awssdk/http/Header.java b/http-client-spi/src/main/java/software/amazon/awssdk/http/Header.java
index ef08a983318d..10ace60280d5 100644
--- a/http-client-spi/src/main/java/software/amazon/awssdk/http/Header.java
+++ b/http-client-spi/src/main/java/software/amazon/awssdk/http/Header.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-client-spi/src/main/java/software/amazon/awssdk/http/HttpExecuteRequest.java b/http-client-spi/src/main/java/software/amazon/awssdk/http/HttpExecuteRequest.java
index a183dbff3d96..c814a4f5cebd 100644
--- a/http-client-spi/src/main/java/software/amazon/awssdk/http/HttpExecuteRequest.java
+++ b/http-client-spi/src/main/java/software/amazon/awssdk/http/HttpExecuteRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-client-spi/src/main/java/software/amazon/awssdk/http/HttpExecuteResponse.java b/http-client-spi/src/main/java/software/amazon/awssdk/http/HttpExecuteResponse.java
index 72870b9c0ed5..57d11540a30f 100644
--- a/http-client-spi/src/main/java/software/amazon/awssdk/http/HttpExecuteResponse.java
+++ b/http-client-spi/src/main/java/software/amazon/awssdk/http/HttpExecuteResponse.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-client-spi/src/main/java/software/amazon/awssdk/http/HttpStatusCode.java b/http-client-spi/src/main/java/software/amazon/awssdk/http/HttpStatusCode.java
index 1b58ded242b6..13cfd2493339 100644
--- a/http-client-spi/src/main/java/software/amazon/awssdk/http/HttpStatusCode.java
+++ b/http-client-spi/src/main/java/software/amazon/awssdk/http/HttpStatusCode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -62,5 +62,6 @@ public final class HttpStatusCode {
     public static final int SERVICE_UNAVAILABLE = 503;
     public static final int GATEWAY_TIMEOUT = 504;
 
-    private HttpStatusCode() {}
+    private HttpStatusCode() {
+    }
 }
diff --git a/http-client-spi/src/main/java/software/amazon/awssdk/http/HttpStatusFamily.java b/http-client-spi/src/main/java/software/amazon/awssdk/http/HttpStatusFamily.java
index 0fe2a05baaa0..e6ec37aa98cd 100644
--- a/http-client-spi/src/main/java/software/amazon/awssdk/http/HttpStatusFamily.java
+++ b/http-client-spi/src/main/java/software/amazon/awssdk/http/HttpStatusFamily.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-client-spi/src/main/java/software/amazon/awssdk/http/Protocol.java b/http-client-spi/src/main/java/software/amazon/awssdk/http/Protocol.java
index 47742c456eba..01fb01ae12b7 100644
--- a/http-client-spi/src/main/java/software/amazon/awssdk/http/Protocol.java
+++ b/http-client-spi/src/main/java/software/amazon/awssdk/http/Protocol.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-client-spi/src/main/java/software/amazon/awssdk/http/SdkCancellationException.java b/http-client-spi/src/main/java/software/amazon/awssdk/http/SdkCancellationException.java
index 0244d9eb7a97..e5deb717f394 100644
--- a/http-client-spi/src/main/java/software/amazon/awssdk/http/SdkCancellationException.java
+++ b/http-client-spi/src/main/java/software/amazon/awssdk/http/SdkCancellationException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-client-spi/src/main/java/software/amazon/awssdk/http/SdkHttpClient.java b/http-client-spi/src/main/java/software/amazon/awssdk/http/SdkHttpClient.java
index bca1702e12fb..ee9401208190 100644
--- a/http-client-spi/src/main/java/software/amazon/awssdk/http/SdkHttpClient.java
+++ b/http-client-spi/src/main/java/software/amazon/awssdk/http/SdkHttpClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-client-spi/src/main/java/software/amazon/awssdk/http/SdkHttpConfigurationOption.java b/http-client-spi/src/main/java/software/amazon/awssdk/http/SdkHttpConfigurationOption.java
index ac90fd0ba72f..b76fde3e32bd 100644
--- a/http-client-spi/src/main/java/software/amazon/awssdk/http/SdkHttpConfigurationOption.java
+++ b/http-client-spi/src/main/java/software/amazon/awssdk/http/SdkHttpConfigurationOption.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -84,13 +84,6 @@ public final class SdkHttpConfigurationOption<T> extends AttributeMap.Key<T> {
     public static final SdkHttpConfigurationOption<Integer> MAX_PENDING_CONNECTION_ACQUIRES =
             new SdkHttpConfigurationOption<>("MaxConnectionAcquires", Integer.class);
 
-    /**
-     * Option to disable SSL cert validation and SSL host name verification. By default, this option is off.
-     * Only enable this option for testing purposes.
-     */
-    public static final SdkHttpConfigurationOption<Boolean> TRUST_ALL_CERTIFICATES =
-            new SdkHttpConfigurationOption<>("TrustAllCertificates", Boolean.class);
-
     /**
      * Whether idle connection should be removed after the {@link #CONNECTION_MAX_IDLE_TIMEOUT} has passed.
      */
@@ -104,6 +97,20 @@ public final class SdkHttpConfigurationOption<T> extends AttributeMap.Key<T> {
     public static final SdkHttpConfigurationOption<TlsKeyManagersProvider> TLS_KEY_MANAGERS_PROVIDER =
             new SdkHttpConfigurationOption<>("TlsKeyManagersProvider", TlsKeyManagersProvider.class);
 
+    /**
+     * Option to disable SSL cert validation and SSL host name verification. By default, this option is off.
+     * Only enable this option for testing purposes.
+     */
+    public static final SdkHttpConfigurationOption<Boolean> TRUST_ALL_CERTIFICATES =
+        new SdkHttpConfigurationOption<>("TrustAllCertificates", Boolean.class);
+
+    /**
+     * The {@link TlsTrustManagersProvider} that will be used by the HTTP client when authenticating with a
+     * TLS host.
+     */
+    public static final SdkHttpConfigurationOption<TlsTrustManagersProvider> TLS_TRUST_MANAGERS_PROVIDER =
+        new SdkHttpConfigurationOption<>("TlsTrustManagersProvider", TlsTrustManagersProvider.class);
+
     private static final Duration DEFAULT_SOCKET_READ_TIMEOUT = Duration.ofSeconds(30);
     private static final Duration DEFAULT_SOCKET_WRITE_TIMEOUT = Duration.ofSeconds(30);
     private static final Duration DEFAULT_CONNECTION_TIMEOUT = Duration.ofSeconds(2);
@@ -117,6 +124,7 @@ public final class SdkHttpConfigurationOption<T> extends AttributeMap.Key<T> {
 
     private static final Protocol DEFAULT_PROTOCOL = Protocol.HTTP1_1;
 
+    private static final TlsTrustManagersProvider DEFAULT_TLS_TRUST_MANAGERS_PROVIDER = null;
     private static final TlsKeyManagersProvider DEFAULT_TLS_KEY_MANAGERS_PROVIDER = SystemPropertyTlsKeyManagersProvider.create();
 
     public static final AttributeMap GLOBAL_HTTP_DEFAULTS = AttributeMap
@@ -133,6 +141,7 @@ public final class SdkHttpConfigurationOption<T> extends AttributeMap.Key<T> {
             .put(TRUST_ALL_CERTIFICATES, DEFAULT_TRUST_ALL_CERTIFICATES)
             .put(REAP_IDLE_CONNECTIONS, DEFAULT_REAP_IDLE_CONNECTIONS)
             .put(TLS_KEY_MANAGERS_PROVIDER, DEFAULT_TLS_KEY_MANAGERS_PROVIDER)
+            .put(TLS_TRUST_MANAGERS_PROVIDER, DEFAULT_TLS_TRUST_MANAGERS_PROVIDER)
             .build();
 
     private final String name;
diff --git a/http-client-spi/src/main/java/software/amazon/awssdk/http/SdkHttpFullRequest.java b/http-client-spi/src/main/java/software/amazon/awssdk/http/SdkHttpFullRequest.java
index bea3481f80cb..474a6b49a8cf 100644
--- a/http-client-spi/src/main/java/software/amazon/awssdk/http/SdkHttpFullRequest.java
+++ b/http-client-spi/src/main/java/software/amazon/awssdk/http/SdkHttpFullRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-client-spi/src/main/java/software/amazon/awssdk/http/SdkHttpFullResponse.java b/http-client-spi/src/main/java/software/amazon/awssdk/http/SdkHttpFullResponse.java
index 7b9f89cee374..55b94e772920 100644
--- a/http-client-spi/src/main/java/software/amazon/awssdk/http/SdkHttpFullResponse.java
+++ b/http-client-spi/src/main/java/software/amazon/awssdk/http/SdkHttpFullResponse.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-client-spi/src/main/java/software/amazon/awssdk/http/SdkHttpHeaders.java b/http-client-spi/src/main/java/software/amazon/awssdk/http/SdkHttpHeaders.java
index 526c4fa1102b..d520e0baa085 100644
--- a/http-client-spi/src/main/java/software/amazon/awssdk/http/SdkHttpHeaders.java
+++ b/http-client-spi/src/main/java/software/amazon/awssdk/http/SdkHttpHeaders.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-client-spi/src/main/java/software/amazon/awssdk/http/SdkHttpMethod.java b/http-client-spi/src/main/java/software/amazon/awssdk/http/SdkHttpMethod.java
index d72b9c51fc82..b2c987d72fb2 100644
--- a/http-client-spi/src/main/java/software/amazon/awssdk/http/SdkHttpMethod.java
+++ b/http-client-spi/src/main/java/software/amazon/awssdk/http/SdkHttpMethod.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-client-spi/src/main/java/software/amazon/awssdk/http/SdkHttpRequest.java b/http-client-spi/src/main/java/software/amazon/awssdk/http/SdkHttpRequest.java
index f654d37f2afc..d49f824d3a9b 100644
--- a/http-client-spi/src/main/java/software/amazon/awssdk/http/SdkHttpRequest.java
+++ b/http-client-spi/src/main/java/software/amazon/awssdk/http/SdkHttpRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-client-spi/src/main/java/software/amazon/awssdk/http/SdkHttpResponse.java b/http-client-spi/src/main/java/software/amazon/awssdk/http/SdkHttpResponse.java
index 524f3606b376..157c6ff6a03e 100644
--- a/http-client-spi/src/main/java/software/amazon/awssdk/http/SdkHttpResponse.java
+++ b/http-client-spi/src/main/java/software/amazon/awssdk/http/SdkHttpResponse.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-client-spi/src/main/java/software/amazon/awssdk/http/SdkHttpService.java b/http-client-spi/src/main/java/software/amazon/awssdk/http/SdkHttpService.java
index 12c5564577da..8bfd718ac443 100644
--- a/http-client-spi/src/main/java/software/amazon/awssdk/http/SdkHttpService.java
+++ b/http-client-spi/src/main/java/software/amazon/awssdk/http/SdkHttpService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-client-spi/src/main/java/software/amazon/awssdk/http/SdkRequestContext.java b/http-client-spi/src/main/java/software/amazon/awssdk/http/SdkRequestContext.java
index 3d975899149c..229bedc7d5c9 100644
--- a/http-client-spi/src/main/java/software/amazon/awssdk/http/SdkRequestContext.java
+++ b/http-client-spi/src/main/java/software/amazon/awssdk/http/SdkRequestContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-client-spi/src/main/java/software/amazon/awssdk/http/SystemPropertyTlsKeyManagersProvider.java b/http-client-spi/src/main/java/software/amazon/awssdk/http/SystemPropertyTlsKeyManagersProvider.java
index a6364cfdc1c0..f89d2356920d 100644
--- a/http-client-spi/src/main/java/software/amazon/awssdk/http/SystemPropertyTlsKeyManagersProvider.java
+++ b/http-client-spi/src/main/java/software/amazon/awssdk/http/SystemPropertyTlsKeyManagersProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-client-spi/src/main/java/software/amazon/awssdk/http/TlsKeyManagersProvider.java b/http-client-spi/src/main/java/software/amazon/awssdk/http/TlsKeyManagersProvider.java
index 1571814e8c69..08afadc6deb1 100644
--- a/http-client-spi/src/main/java/software/amazon/awssdk/http/TlsKeyManagersProvider.java
+++ b/http-client-spi/src/main/java/software/amazon/awssdk/http/TlsKeyManagersProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-client-spi/src/main/java/software/amazon/awssdk/http/TlsTrustManagersProvider.java b/http-client-spi/src/main/java/software/amazon/awssdk/http/TlsTrustManagersProvider.java
new file mode 100644
index 000000000000..836259829500
--- /dev/null
+++ b/http-client-spi/src/main/java/software/amazon/awssdk/http/TlsTrustManagersProvider.java
@@ -0,0 +1,33 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.http;
+
+import javax.net.ssl.TrustManager;
+import software.amazon.awssdk.annotations.SdkPublicApi;
+
+/**
+ * Provider for the {@link TrustManager trust managers} to be used by the SDK when
+ * creating the SSL context. Trust managers are used when the client is checking
+ * if the remote host can be trusted.
+ */
+@SdkPublicApi
+@FunctionalInterface
+public interface TlsTrustManagersProvider {
+    /**
+     * @return The {@link TrustManager}s, or {@code null}.
+     */
+    TrustManager[] trustManagers();
+}
diff --git a/http-client-spi/src/main/java/software/amazon/awssdk/http/async/AsyncExecuteRequest.java b/http-client-spi/src/main/java/software/amazon/awssdk/http/async/AsyncExecuteRequest.java
index 9e087fface75..d3de2981bbe8 100644
--- a/http-client-spi/src/main/java/software/amazon/awssdk/http/async/AsyncExecuteRequest.java
+++ b/http-client-spi/src/main/java/software/amazon/awssdk/http/async/AsyncExecuteRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-client-spi/src/main/java/software/amazon/awssdk/http/async/SdkAsyncHttpClient.java b/http-client-spi/src/main/java/software/amazon/awssdk/http/async/SdkAsyncHttpClient.java
index 2741e9f4c09b..bcf28e88f396 100644
--- a/http-client-spi/src/main/java/software/amazon/awssdk/http/async/SdkAsyncHttpClient.java
+++ b/http-client-spi/src/main/java/software/amazon/awssdk/http/async/SdkAsyncHttpClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-client-spi/src/main/java/software/amazon/awssdk/http/async/SdkAsyncHttpResponseHandler.java b/http-client-spi/src/main/java/software/amazon/awssdk/http/async/SdkAsyncHttpResponseHandler.java
index a2e296bfdf83..ed1db6118b99 100644
--- a/http-client-spi/src/main/java/software/amazon/awssdk/http/async/SdkAsyncHttpResponseHandler.java
+++ b/http-client-spi/src/main/java/software/amazon/awssdk/http/async/SdkAsyncHttpResponseHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -16,7 +16,6 @@
 package software.amazon.awssdk.http.async;
 
 import java.nio.ByteBuffer;
-
 import org.reactivestreams.Publisher;
 import software.amazon.awssdk.annotations.SdkProtectedApi;
 import software.amazon.awssdk.http.SdkHttpResponse;
diff --git a/http-client-spi/src/main/java/software/amazon/awssdk/http/async/SdkAsyncHttpService.java b/http-client-spi/src/main/java/software/amazon/awssdk/http/async/SdkAsyncHttpService.java
index 603e2bbf92c3..f675439dbac9 100644
--- a/http-client-spi/src/main/java/software/amazon/awssdk/http/async/SdkAsyncHttpService.java
+++ b/http-client-spi/src/main/java/software/amazon/awssdk/http/async/SdkAsyncHttpService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-client-spi/src/main/java/software/amazon/awssdk/http/async/SdkHttpContentPublisher.java b/http-client-spi/src/main/java/software/amazon/awssdk/http/async/SdkHttpContentPublisher.java
index 0a0b0844267a..dd8413b10c83 100644
--- a/http-client-spi/src/main/java/software/amazon/awssdk/http/async/SdkHttpContentPublisher.java
+++ b/http-client-spi/src/main/java/software/amazon/awssdk/http/async/SdkHttpContentPublisher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-client-spi/src/main/java/software/amazon/awssdk/http/async/SdkHttpResponseHandler.java b/http-client-spi/src/main/java/software/amazon/awssdk/http/async/SdkHttpResponseHandler.java
index 19d905e7ffe3..d6748757e7ff 100644
--- a/http-client-spi/src/main/java/software/amazon/awssdk/http/async/SdkHttpResponseHandler.java
+++ b/http-client-spi/src/main/java/software/amazon/awssdk/http/async/SdkHttpResponseHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-client-spi/src/main/java/software/amazon/awssdk/http/async/SimpleSubscriber.java b/http-client-spi/src/main/java/software/amazon/awssdk/http/async/SimpleSubscriber.java
index da9e267aade3..0835e6a5f1c9 100644
--- a/http-client-spi/src/main/java/software/amazon/awssdk/http/async/SimpleSubscriber.java
+++ b/http-client-spi/src/main/java/software/amazon/awssdk/http/async/SimpleSubscriber.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-client-spi/src/main/java/software/amazon/awssdk/internal/http/AbstractFileStoreTlsKeyManagersProvider.java b/http-client-spi/src/main/java/software/amazon/awssdk/internal/http/AbstractFileStoreTlsKeyManagersProvider.java
index a80ba0db52c8..05c1dea371a7 100644
--- a/http-client-spi/src/main/java/software/amazon/awssdk/internal/http/AbstractFileStoreTlsKeyManagersProvider.java
+++ b/http-client-spi/src/main/java/software/amazon/awssdk/internal/http/AbstractFileStoreTlsKeyManagersProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-client-spi/src/main/java/software/amazon/awssdk/internal/http/NoneTlsKeyManagersProvider.java b/http-client-spi/src/main/java/software/amazon/awssdk/internal/http/NoneTlsKeyManagersProvider.java
index 9e5d165ef708..dfd2f8cd4784 100644
--- a/http-client-spi/src/main/java/software/amazon/awssdk/internal/http/NoneTlsKeyManagersProvider.java
+++ b/http-client-spi/src/main/java/software/amazon/awssdk/internal/http/NoneTlsKeyManagersProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-client-spi/src/test/java/software/amazon/awssdk/http/ClientTlsAuthTestBase.java b/http-client-spi/src/test/java/software/amazon/awssdk/http/ClientTlsAuthTestBase.java
index f8574551861b..cdbbee02a96e 100644
--- a/http-client-spi/src/test/java/software/amazon/awssdk/http/ClientTlsAuthTestBase.java
+++ b/http-client-spi/src/test/java/software/amazon/awssdk/http/ClientTlsAuthTestBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-client-spi/src/test/java/software/amazon/awssdk/http/FileStoreTlsKeyManagersProviderTest.java b/http-client-spi/src/test/java/software/amazon/awssdk/http/FileStoreTlsKeyManagersProviderTest.java
index 422eeb0abe29..a056782c9d3b 100644
--- a/http-client-spi/src/test/java/software/amazon/awssdk/http/FileStoreTlsKeyManagersProviderTest.java
+++ b/http-client-spi/src/test/java/software/amazon/awssdk/http/FileStoreTlsKeyManagersProviderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-client-spi/src/test/java/software/amazon/awssdk/http/HttpStatusFamilyTest.java b/http-client-spi/src/test/java/software/amazon/awssdk/http/HttpStatusFamilyTest.java
index cc35c4ba259b..3ddd51b6a8ae 100644
--- a/http-client-spi/src/test/java/software/amazon/awssdk/http/HttpStatusFamilyTest.java
+++ b/http-client-spi/src/test/java/software/amazon/awssdk/http/HttpStatusFamilyTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-client-spi/src/test/java/software/amazon/awssdk/http/SdkHttpRequestResponseTest.java b/http-client-spi/src/test/java/software/amazon/awssdk/http/SdkHttpRequestResponseTest.java
index b85021cbd004..4f9e509c99f5 100644
--- a/http-client-spi/src/test/java/software/amazon/awssdk/http/SdkHttpRequestResponseTest.java
+++ b/http-client-spi/src/test/java/software/amazon/awssdk/http/SdkHttpRequestResponseTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-client-spi/src/test/java/software/amazon/awssdk/http/SystemPropertyTlsKeyManagersProviderTest.java b/http-client-spi/src/test/java/software/amazon/awssdk/http/SystemPropertyTlsKeyManagersProviderTest.java
index 6ebed598e8ed..25f0c1f0b9f2 100644
--- a/http-client-spi/src/test/java/software/amazon/awssdk/http/SystemPropertyTlsKeyManagersProviderTest.java
+++ b/http-client-spi/src/test/java/software/amazon/awssdk/http/SystemPropertyTlsKeyManagersProviderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-client-spi/src/test/java/software/amazon/awssdk/http/TlsKeyManagersProviderTest.java b/http-client-spi/src/test/java/software/amazon/awssdk/http/TlsKeyManagersProviderTest.java
index 79412f79c334..be97ba0ef7a7 100644
--- a/http-client-spi/src/test/java/software/amazon/awssdk/http/TlsKeyManagersProviderTest.java
+++ b/http-client-spi/src/test/java/software/amazon/awssdk/http/TlsKeyManagersProviderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-client-spi/src/test/java/software/amazon/awssdk/http/software/amazon/awssdk/internal/http/NoneTlsKeyManagersProviderTest.java b/http-client-spi/src/test/java/software/amazon/awssdk/http/software/amazon/awssdk/internal/http/NoneTlsKeyManagersProviderTest.java
index 2e3098e62de4..776277e3c56f 100644
--- a/http-client-spi/src/test/java/software/amazon/awssdk/http/software/amazon/awssdk/internal/http/NoneTlsKeyManagersProviderTest.java
+++ b/http-client-spi/src/test/java/software/amazon/awssdk/http/software/amazon/awssdk/internal/http/NoneTlsKeyManagersProviderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-clients/apache-client/pom.xml b/http-clients/apache-client/pom.xml
index ec6cf8be9a42..127b3cfdedf3 100644
--- a/http-clients/apache-client/pom.xml
+++ b/http-clients/apache-client/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>http-clients</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
 
     <artifactId>apache-client</artifactId>
diff --git a/http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/ApacheHttpClient.java b/http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/ApacheHttpClient.java
index b86a74a78604..0367a86c6d80 100644
--- a/http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/ApacheHttpClient.java
+++ b/http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/ApacheHttpClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -18,15 +18,6 @@
 import static java.util.stream.Collectors.groupingBy;
 import static java.util.stream.Collectors.mapping;
 import static java.util.stream.Collectors.toList;
-import static software.amazon.awssdk.http.SdkHttpConfigurationOption.CONNECTION_ACQUIRE_TIMEOUT;
-import static software.amazon.awssdk.http.SdkHttpConfigurationOption.CONNECTION_MAX_IDLE_TIMEOUT;
-import static software.amazon.awssdk.http.SdkHttpConfigurationOption.CONNECTION_TIMEOUT;
-import static software.amazon.awssdk.http.SdkHttpConfigurationOption.CONNECTION_TIME_TO_LIVE;
-import static software.amazon.awssdk.http.SdkHttpConfigurationOption.GLOBAL_HTTP_DEFAULTS;
-import static software.amazon.awssdk.http.SdkHttpConfigurationOption.MAX_CONNECTIONS;
-import static software.amazon.awssdk.http.SdkHttpConfigurationOption.READ_TIMEOUT;
-import static software.amazon.awssdk.http.SdkHttpConfigurationOption.REAP_IDLE_CONNECTIONS;
-import static software.amazon.awssdk.http.SdkHttpConfigurationOption.TLS_KEY_MANAGERS_PROVIDER;
 import static software.amazon.awssdk.utils.NumericUtils.saturatedCast;
 
 import java.io.IOException;
@@ -78,6 +69,7 @@
 import software.amazon.awssdk.http.SdkHttpResponse;
 import software.amazon.awssdk.http.SystemPropertyTlsKeyManagersProvider;
 import software.amazon.awssdk.http.TlsKeyManagersProvider;
+import software.amazon.awssdk.http.TlsTrustManagersProvider;
 import software.amazon.awssdk.http.apache.internal.ApacheHttpRequestConfig;
 import software.amazon.awssdk.http.apache.internal.DefaultConfiguration;
 import software.amazon.awssdk.http.apache.internal.SdkProxyRoutePlanner;
@@ -200,7 +192,7 @@ private ConnectionKeepAliveStrategy buildKeepAliveStrategy(AttributeMap standard
     }
 
     private boolean useIdleConnectionReaper(AttributeMap standardOptions) {
-        return Boolean.TRUE.equals(standardOptions.get(REAP_IDLE_CONNECTIONS));
+        return Boolean.TRUE.equals(standardOptions.get(SdkHttpConfigurationOption.REAP_IDLE_CONNECTIONS));
     }
 
     private boolean isAuthenticatedProxy(ProxyConfiguration proxyConfiguration) {
@@ -280,9 +272,10 @@ private Map<String, List<String>> transformHeaders(HttpResponse apacheHttpRespon
     private ApacheHttpRequestConfig createRequestConfig(DefaultBuilder builder,
                                                         AttributeMap resolvedOptions) {
         return ApacheHttpRequestConfig.builder()
-                                      .socketTimeout(resolvedOptions.get(READ_TIMEOUT))
-                                      .connectionTimeout(resolvedOptions.get(CONNECTION_TIMEOUT))
-                                      .connectionAcquireTimeout(resolvedOptions.get(CONNECTION_ACQUIRE_TIMEOUT))
+                                      .socketTimeout(resolvedOptions.get(SdkHttpConfigurationOption.READ_TIMEOUT))
+                                      .connectionTimeout(resolvedOptions.get(SdkHttpConfigurationOption.CONNECTION_TIMEOUT))
+                                      .connectionAcquireTimeout(
+                                          resolvedOptions.get(SdkHttpConfigurationOption.CONNECTION_ACQUIRE_TIMEOUT))
                                       .proxyConfiguration(builder.proxyConfiguration)
                                       .localAddress(Optional.ofNullable(builder.localAddress).orElse(null))
                                       .expectContinueEnabled(Optional.ofNullable(builder.expectContinueEnabled)
@@ -388,6 +381,12 @@ public interface Builder extends SdkHttpClient.Builder<ApacheHttpClient.Builder>
          * {@link TlsKeyManagersProvider} to override it.
          */
         Builder tlsKeyManagersProvider(TlsKeyManagersProvider tlsKeyManagersProvider);
+
+        /**
+         * Configure the {@link TlsTrustManagersProvider} that will provide the {@link javax.net.ssl.TrustManager}s to use
+         * when constructing the SSL context.
+         */
+        Builder tlsTrustManagersProvider(TlsTrustManagersProvider tlsTrustManagersProvider);
     }
 
     private static final class DefaultBuilder implements Builder {
@@ -403,7 +402,7 @@ private DefaultBuilder() {
 
         @Override
         public Builder socketTimeout(Duration socketTimeout) {
-            standardOptions.put(READ_TIMEOUT, socketTimeout);
+            standardOptions.put(SdkHttpConfigurationOption.READ_TIMEOUT, socketTimeout);
             return this;
         }
 
@@ -413,7 +412,7 @@ public void setSocketTimeout(Duration socketTimeout) {
 
         @Override
         public Builder connectionTimeout(Duration connectionTimeout) {
-            standardOptions.put(CONNECTION_TIMEOUT, connectionTimeout);
+            standardOptions.put(SdkHttpConfigurationOption.CONNECTION_TIMEOUT, connectionTimeout);
             return this;
         }
 
@@ -429,7 +428,7 @@ public void setConnectionTimeout(Duration connectionTimeout) {
         @Override
         public Builder connectionAcquisitionTimeout(Duration connectionAcquisitionTimeout) {
             Validate.isPositive(connectionAcquisitionTimeout, "connectionAcquisitionTimeout");
-            standardOptions.put(CONNECTION_ACQUIRE_TIMEOUT, connectionAcquisitionTimeout);
+            standardOptions.put(SdkHttpConfigurationOption.CONNECTION_ACQUIRE_TIMEOUT, connectionAcquisitionTimeout);
             return this;
         }
 
@@ -439,7 +438,7 @@ public void setConnectionAcquisitionTimeout(Duration connectionAcquisitionTimeou
 
         @Override
         public Builder maxConnections(Integer maxConnections) {
-            standardOptions.put(MAX_CONNECTIONS, maxConnections);
+            standardOptions.put(SdkHttpConfigurationOption.MAX_CONNECTIONS, maxConnections);
             return this;
         }
 
@@ -479,7 +478,7 @@ public void setExpectContinueEnabled(Boolean useExpectContinue) {
 
         @Override
         public Builder connectionTimeToLive(Duration connectionTimeToLive) {
-            standardOptions.put(CONNECTION_TIME_TO_LIVE, connectionTimeToLive);
+            standardOptions.put(SdkHttpConfigurationOption.CONNECTION_TIME_TO_LIVE, connectionTimeToLive);
             return this;
         }
 
@@ -489,7 +488,7 @@ public void setConnectionTimeToLive(Duration connectionTimeToLive) {
 
         @Override
         public Builder connectionMaxIdleTime(Duration maxIdleConnectionTimeout) {
-            standardOptions.put(CONNECTION_MAX_IDLE_TIMEOUT, maxIdleConnectionTimeout);
+            standardOptions.put(SdkHttpConfigurationOption.CONNECTION_MAX_IDLE_TIMEOUT, maxIdleConnectionTimeout);
             return this;
         }
 
@@ -499,7 +498,7 @@ public void setConnectionMaxIdleTime(Duration connectionMaxIdleTime) {
 
         @Override
         public Builder useIdleConnectionReaper(Boolean useIdleConnectionReaper) {
-            standardOptions.put(REAP_IDLE_CONNECTIONS, useIdleConnectionReaper);
+            standardOptions.put(SdkHttpConfigurationOption.REAP_IDLE_CONNECTIONS, useIdleConnectionReaper);
             return this;
         }
 
@@ -523,9 +522,13 @@ public Builder credentialsProvider(CredentialsProvider credentialsProvider) {
             return this;
         }
 
+        public void setCredentialsProvider(CredentialsProvider credentialsProvider) {
+            credentialsProvider(credentialsProvider);
+        }
+
         @Override
         public Builder tlsKeyManagersProvider(TlsKeyManagersProvider tlsKeyManagersProvider) {
-            standardOptions.put(TLS_KEY_MANAGERS_PROVIDER, tlsKeyManagersProvider);
+            standardOptions.put(SdkHttpConfigurationOption.TLS_KEY_MANAGERS_PROVIDER, tlsKeyManagersProvider);
             return this;
         }
 
@@ -533,13 +536,20 @@ public void setTlsKeyManagersProvider(TlsKeyManagersProvider tlsKeyManagersProvi
             tlsKeyManagersProvider(tlsKeyManagersProvider);
         }
 
-        public void setCredentialsProvider(CredentialsProvider credentialsProvider) {
-            credentialsProvider(credentialsProvider);
+        @Override
+        public Builder tlsTrustManagersProvider(TlsTrustManagersProvider tlsTrustManagersProvider) {
+            standardOptions.put(SdkHttpConfigurationOption.TLS_TRUST_MANAGERS_PROVIDER, tlsTrustManagersProvider);
+            return this;
+        }
+
+        public void setTlsTrustManagersProvider(TlsTrustManagersProvider tlsTrustManagersProvider) {
+            tlsTrustManagersProvider(tlsTrustManagersProvider);
         }
 
         @Override
         public SdkHttpClient buildWithDefaults(AttributeMap serviceDefaults) {
-            AttributeMap resolvedOptions = standardOptions.build().merge(serviceDefaults).merge(GLOBAL_HTTP_DEFAULTS);
+            AttributeMap resolvedOptions = standardOptions.build().merge(serviceDefaults).merge(
+                SdkHttpConfigurationOption.GLOBAL_HTTP_DEFAULTS);
             return new ApacheHttpClient(this, resolvedOptions);
         }
     }
@@ -580,14 +590,22 @@ private HostnameVerifier getHostNameVerifier(AttributeMap standardOptions) {
         }
 
         private SSLContext getSslContext(AttributeMap standardOptions) {
+            Validate.isTrue(standardOptions.get(SdkHttpConfigurationOption.TLS_TRUST_MANAGERS_PROVIDER) == null ||
+                            !standardOptions.get(SdkHttpConfigurationOption.TRUST_ALL_CERTIFICATES),
+                            "A TlsTrustManagerProvider can't be provided if TrustAllCertificates is also set");
+
             TrustManager[] trustManagers = null;
+            if (standardOptions.get(SdkHttpConfigurationOption.TLS_TRUST_MANAGERS_PROVIDER) != null) {
+                trustManagers = standardOptions.get(SdkHttpConfigurationOption.TLS_TRUST_MANAGERS_PROVIDER).trustManagers();
+            }
+
             if (standardOptions.get(SdkHttpConfigurationOption.TRUST_ALL_CERTIFICATES)) {
                 log.warn(() -> "SSL Certificate verification is disabled. This is not a safe setting and should only be "
                                + "used for testing.");
                 trustManagers = trustAllTrustManager();
             }
 
-            TlsKeyManagersProvider provider = standardOptions.get(TLS_KEY_MANAGERS_PROVIDER);
+            TlsKeyManagersProvider provider = standardOptions.get(SdkHttpConfigurationOption.TLS_KEY_MANAGERS_PROVIDER);
             KeyManager[] keyManagers = provider.keyManagers();
 
             try {
diff --git a/http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/ApacheSdkHttpService.java b/http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/ApacheSdkHttpService.java
index 1defc7cffd92..8ada6d4fc835 100644
--- a/http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/ApacheSdkHttpService.java
+++ b/http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/ApacheSdkHttpService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/ProxyConfiguration.java b/http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/ProxyConfiguration.java
index e0b41622b655..5e0ef71b7f90 100644
--- a/http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/ProxyConfiguration.java
+++ b/http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/ProxyConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/internal/ApacheHttpRequestConfig.java b/http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/internal/ApacheHttpRequestConfig.java
index 3cfccb1d1eac..0ca234592f86 100644
--- a/http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/internal/ApacheHttpRequestConfig.java
+++ b/http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/internal/ApacheHttpRequestConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/internal/DefaultConfiguration.java b/http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/internal/DefaultConfiguration.java
index d8fed3d42d26..fdcf484af136 100644
--- a/http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/internal/DefaultConfiguration.java
+++ b/http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/internal/DefaultConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/internal/RepeatableInputStreamRequestEntity.java b/http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/internal/RepeatableInputStreamRequestEntity.java
index 4eca92c238f8..77f1e201c7e9 100644
--- a/http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/internal/RepeatableInputStreamRequestEntity.java
+++ b/http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/internal/RepeatableInputStreamRequestEntity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/internal/SdkProxyRoutePlanner.java b/http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/internal/SdkProxyRoutePlanner.java
index d9ffbcd6333e..b814d491216a 100644
--- a/http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/internal/SdkProxyRoutePlanner.java
+++ b/http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/internal/SdkProxyRoutePlanner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/internal/conn/ClientConnectionManagerFactory.java b/http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/internal/conn/ClientConnectionManagerFactory.java
index f1fbe03e3d74..5bf7034fe463 100644
--- a/http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/internal/conn/ClientConnectionManagerFactory.java
+++ b/http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/internal/conn/ClientConnectionManagerFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/internal/conn/ClientConnectionRequestFactory.java b/http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/internal/conn/ClientConnectionRequestFactory.java
index d4366215e057..f6e0c0ff3a9e 100644
--- a/http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/internal/conn/ClientConnectionRequestFactory.java
+++ b/http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/internal/conn/ClientConnectionRequestFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/internal/conn/IdleConnectionReaper.java b/http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/internal/conn/IdleConnectionReaper.java
index a45609101566..c40d7671f86d 100644
--- a/http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/internal/conn/IdleConnectionReaper.java
+++ b/http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/internal/conn/IdleConnectionReaper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/internal/conn/SdkConnectionKeepAliveStrategy.java b/http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/internal/conn/SdkConnectionKeepAliveStrategy.java
index 4088bbe17ad6..e94a6bc68c01 100644
--- a/http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/internal/conn/SdkConnectionKeepAliveStrategy.java
+++ b/http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/internal/conn/SdkConnectionKeepAliveStrategy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/internal/conn/SdkTlsSocketFactory.java b/http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/internal/conn/SdkTlsSocketFactory.java
index b9d114299dbb..036d594bee61 100644
--- a/http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/internal/conn/SdkTlsSocketFactory.java
+++ b/http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/internal/conn/SdkTlsSocketFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -65,8 +65,8 @@ protected final void prepareSocket(final SSLSocket socket) {
             // Append the preferred protocols in descending order of preference
             // but only do so if the protocols are supported
             TlsProtocol[] values = TlsProtocol.values();
-            for (int i = 0; i < values.length; i++) {
-                String pname = values[i].getProtocolName();
+            for (TlsProtocol value : values) {
+                String pname = value.getProtocolName();
                 if (existsIn(pname, supported)) {
                     target.add(pname);
                 }
@@ -82,7 +82,7 @@ protected final void prepareSocket(final SSLSocket socket) {
             }
         }
         if (target.size() > 0) {
-            String[] enabling = target.toArray(new String[target.size()]);
+            String[] enabling = target.toArray(new String[0]);
             socket.setEnabledProtocols(enabling);
             log.debug(() -> "TLS protocol enabled for SSL handshake: " + Arrays.toString(enabling));
         }
diff --git a/http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/internal/conn/TlsProtocol.java b/http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/internal/conn/TlsProtocol.java
index 183a888f8088..8e794dccb6ea 100644
--- a/http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/internal/conn/TlsProtocol.java
+++ b/http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/internal/conn/TlsProtocol.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/internal/conn/Wrapped.java b/http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/internal/conn/Wrapped.java
index 919693569ca4..9d0d71da2e03 100644
--- a/http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/internal/conn/Wrapped.java
+++ b/http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/internal/conn/Wrapped.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/internal/impl/ApacheHttpRequestFactory.java b/http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/internal/impl/ApacheHttpRequestFactory.java
index d2e0d4060510..8b012eb649b2 100644
--- a/http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/internal/impl/ApacheHttpRequestFactory.java
+++ b/http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/internal/impl/ApacheHttpRequestFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/internal/impl/ApacheSdkHttpClient.java b/http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/internal/impl/ApacheSdkHttpClient.java
index 2e9a7fc4fa62..4ad0ba57a82f 100644
--- a/http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/internal/impl/ApacheSdkHttpClient.java
+++ b/http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/internal/impl/ApacheSdkHttpClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/internal/impl/ConnectionManagerAwareHttpClient.java b/http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/internal/impl/ConnectionManagerAwareHttpClient.java
index b96fc0607bee..0431ec91f0e0 100644
--- a/http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/internal/impl/ConnectionManagerAwareHttpClient.java
+++ b/http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/internal/impl/ConnectionManagerAwareHttpClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/internal/net/DelegateSocket.java b/http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/internal/net/DelegateSocket.java
index e9437d3c298e..a7a780f15f1f 100644
--- a/http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/internal/net/DelegateSocket.java
+++ b/http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/internal/net/DelegateSocket.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/internal/net/DelegateSslSocket.java b/http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/internal/net/DelegateSslSocket.java
index 2dfc26a71e90..f36992de7b48 100644
--- a/http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/internal/net/DelegateSslSocket.java
+++ b/http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/internal/net/DelegateSslSocket.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/internal/net/SdkSocket.java b/http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/internal/net/SdkSocket.java
index ebff3c9a7fb8..942584999d2e 100644
--- a/http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/internal/net/SdkSocket.java
+++ b/http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/internal/net/SdkSocket.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/internal/net/SdkSslSocket.java b/http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/internal/net/SdkSslSocket.java
index 75f8e5925a03..edb00339fa27 100644
--- a/http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/internal/net/SdkSslSocket.java
+++ b/http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/internal/net/SdkSslSocket.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/internal/utils/ApacheUtils.java b/http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/internal/utils/ApacheUtils.java
index bfef74f417fc..e35eca470d53 100644
--- a/http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/internal/utils/ApacheUtils.java
+++ b/http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/internal/utils/ApacheUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-clients/apache-client/src/main/resources/META-INF/services/software.amazon.awssdk.http.SdkHttpService b/http-clients/apache-client/src/main/resources/META-INF/services/software.amazon.awssdk.http.SdkHttpService
index a0cf38060f09..ece7128fa8ab 100644
--- a/http-clients/apache-client/src/main/resources/META-INF/services/software.amazon.awssdk.http.SdkHttpService
+++ b/http-clients/apache-client/src/main/resources/META-INF/services/software.amazon.awssdk.http.SdkHttpService
@@ -1,5 +1,35 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
+#
+
+#
+# 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.
+#
+
+#
+# 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.
diff --git a/http-clients/apache-client/src/test/java/software/amazon/awssdk/http/apache/ApacheClientTlsAuthTest.java b/http-clients/apache-client/src/test/java/software/amazon/awssdk/http/apache/ApacheClientTlsAuthTest.java
index 946e59de8344..f6721255ce2b 100644
--- a/http-clients/apache-client/src/test/java/software/amazon/awssdk/http/apache/ApacheClientTlsAuthTest.java
+++ b/http-clients/apache-client/src/test/java/software/amazon/awssdk/http/apache/ApacheClientTlsAuthTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-clients/apache-client/src/test/java/software/amazon/awssdk/http/apache/ApacheHttpClientTest.java b/http-clients/apache-client/src/test/java/software/amazon/awssdk/http/apache/ApacheHttpClientTest.java
index b5587db6332a..16f82fe136f5 100644
--- a/http-clients/apache-client/src/test/java/software/amazon/awssdk/http/apache/ApacheHttpClientTest.java
+++ b/http-clients/apache-client/src/test/java/software/amazon/awssdk/http/apache/ApacheHttpClientTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-clients/apache-client/src/test/java/software/amazon/awssdk/http/apache/ApacheHttpClientWireMockTest.java b/http-clients/apache-client/src/test/java/software/amazon/awssdk/http/apache/ApacheHttpClientWireMockTest.java
index 50a3f8bc53fb..0c43134ce55c 100644
--- a/http-clients/apache-client/src/test/java/software/amazon/awssdk/http/apache/ApacheHttpClientWireMockTest.java
+++ b/http-clients/apache-client/src/test/java/software/amazon/awssdk/http/apache/ApacheHttpClientWireMockTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -57,17 +57,19 @@ public class ApacheHttpClientWireMockTest extends SdkHttpClientTestSuite {
 
     @Override
     protected SdkHttpClient createSdkHttpClient(SdkHttpClientOptions options) {
-        return ApacheHttpClient.builder().build();
-    }
+        ApacheHttpClient.Builder builder = ApacheHttpClient.builder();
 
-    @Test
-    public void noSslException_WhenCertCheckingDisabled() throws Exception {
-        SdkHttpClient client = ApacheHttpClient.builder()
-                                               .buildWithDefaults(AttributeMap.builder()
-                                                                              .put(TRUST_ALL_CERTIFICATES, Boolean.TRUE)
-                                                                              .build());
+        AttributeMap.Builder attributeMap = AttributeMap.builder();
 
-        testForResponseCodeUsingHttps(client, HttpURLConnection.HTTP_OK);
+        if (options.tlsTrustManagersProvider() != null) {
+            builder.tlsTrustManagersProvider(options.tlsTrustManagersProvider());
+        }
+
+        if (options.trustAll()) {
+            attributeMap.put(TRUST_ALL_CERTIFICATES, options.trustAll());
+        }
+
+        return builder.buildWithDefaults(attributeMap.build());
     }
 
     @Test
diff --git a/http-clients/apache-client/src/test/java/software/amazon/awssdk/http/apache/ClientTlsAuthTestBase.java b/http-clients/apache-client/src/test/java/software/amazon/awssdk/http/apache/ClientTlsAuthTestBase.java
index 4b026372fa2b..8f3bdca14428 100644
--- a/http-clients/apache-client/src/test/java/software/amazon/awssdk/http/apache/ClientTlsAuthTestBase.java
+++ b/http-clients/apache-client/src/test/java/software/amazon/awssdk/http/apache/ClientTlsAuthTestBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-clients/apache-client/src/test/java/software/amazon/awssdk/http/apache/ProxyConfigurationTest.java b/http-clients/apache-client/src/test/java/software/amazon/awssdk/http/apache/ProxyConfigurationTest.java
index 129a4a1287a3..e2bb5dd07241 100644
--- a/http-clients/apache-client/src/test/java/software/amazon/awssdk/http/apache/ProxyConfigurationTest.java
+++ b/http-clients/apache-client/src/test/java/software/amazon/awssdk/http/apache/ProxyConfigurationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-clients/apache-client/src/test/java/software/amazon/awssdk/http/apache/internal/SdkProxyRoutePlannerTest.java b/http-clients/apache-client/src/test/java/software/amazon/awssdk/http/apache/internal/SdkProxyRoutePlannerTest.java
index bfa246f6339c..3a81c89dcc1d 100644
--- a/http-clients/apache-client/src/test/java/software/amazon/awssdk/http/apache/internal/SdkProxyRoutePlannerTest.java
+++ b/http-clients/apache-client/src/test/java/software/amazon/awssdk/http/apache/internal/SdkProxyRoutePlannerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-clients/apache-client/src/test/java/software/amazon/awssdk/http/apache/internal/conn/ClientConnectionManagerFactoryTest.java b/http-clients/apache-client/src/test/java/software/amazon/awssdk/http/apache/internal/conn/ClientConnectionManagerFactoryTest.java
index 4e24a94177e5..87e607a029b8 100644
--- a/http-clients/apache-client/src/test/java/software/amazon/awssdk/http/apache/internal/conn/ClientConnectionManagerFactoryTest.java
+++ b/http-clients/apache-client/src/test/java/software/amazon/awssdk/http/apache/internal/conn/ClientConnectionManagerFactoryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-clients/apache-client/src/test/java/software/amazon/awssdk/http/apache/internal/conn/IdleConnectionReaperTest.java b/http-clients/apache-client/src/test/java/software/amazon/awssdk/http/apache/internal/conn/IdleConnectionReaperTest.java
index ccae771785c9..f4a711758c80 100644
--- a/http-clients/apache-client/src/test/java/software/amazon/awssdk/http/apache/internal/conn/IdleConnectionReaperTest.java
+++ b/http-clients/apache-client/src/test/java/software/amazon/awssdk/http/apache/internal/conn/IdleConnectionReaperTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-clients/apache-client/src/test/java/software/amazon/awssdk/http/apache/internal/conn/SdkTlsSocketFactoryTest.java b/http-clients/apache-client/src/test/java/software/amazon/awssdk/http/apache/internal/conn/SdkTlsSocketFactoryTest.java
index 29412f668ec8..0ea8584ce7b7 100644
--- a/http-clients/apache-client/src/test/java/software/amazon/awssdk/http/apache/internal/conn/SdkTlsSocketFactoryTest.java
+++ b/http-clients/apache-client/src/test/java/software/amazon/awssdk/http/apache/internal/conn/SdkTlsSocketFactoryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-clients/apache-client/src/test/java/software/amazon/awssdk/http/apache/internal/conn/TestSSLSocket.java b/http-clients/apache-client/src/test/java/software/amazon/awssdk/http/apache/internal/conn/TestSSLSocket.java
index 7b686c53e54e..8f355dc20fdd 100644
--- a/http-clients/apache-client/src/test/java/software/amazon/awssdk/http/apache/internal/conn/TestSSLSocket.java
+++ b/http-clients/apache-client/src/test/java/software/amazon/awssdk/http/apache/internal/conn/TestSSLSocket.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-clients/apache-client/src/test/java/software/amazon/awssdk/http/apache/internal/impl/ApacheHttpRequestFactoryTest.java b/http-clients/apache-client/src/test/java/software/amazon/awssdk/http/apache/internal/impl/ApacheHttpRequestFactoryTest.java
new file mode 100644
index 000000000000..52ff2588dd70
--- /dev/null
+++ b/http-clients/apache-client/src/test/java/software/amazon/awssdk/http/apache/internal/impl/ApacheHttpRequestFactoryTest.java
@@ -0,0 +1,94 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.http.apache.internal.impl;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import java.net.InetAddress;
+import java.net.URI;
+import java.time.Duration;
+import org.apache.http.client.methods.HttpRequestBase;
+import org.apache.http.Header;
+import org.apache.http.HttpHeaders;
+import org.junit.Before;
+import org.junit.Test;
+import software.amazon.awssdk.http.HttpExecuteRequest;
+import software.amazon.awssdk.http.SdkHttpMethod;
+import software.amazon.awssdk.http.SdkHttpRequest;
+import software.amazon.awssdk.http.apache.internal.ApacheHttpRequestConfig;
+
+public class ApacheHttpRequestFactoryTest {
+
+    private ApacheHttpRequestConfig requestConfig;
+    private ApacheHttpRequestFactory instance;
+
+    @Before
+    public void setup() {
+        instance = new ApacheHttpRequestFactory();
+        requestConfig = ApacheHttpRequestConfig.builder()
+                .connectionAcquireTimeout(Duration.ZERO)
+                .connectionTimeout(Duration.ZERO)
+                .localAddress(InetAddress.getLoopbackAddress())
+                .socketTimeout(Duration.ZERO)
+                .build();
+    }
+
+    @Test
+    public void ceateSetsHostHeaderByDefault() {
+        SdkHttpRequest sdkRequest = SdkHttpRequest.builder()
+                .uri(URI.create("http://localhost:12345/"))
+                .method(SdkHttpMethod.HEAD)
+                .build();
+        HttpExecuteRequest request = HttpExecuteRequest.builder()
+                .request(sdkRequest)
+                .build();
+        HttpRequestBase result = instance.create(request, requestConfig);
+        Header[] hostHeaders = result.getHeaders(HttpHeaders.HOST);
+        assertNotNull(hostHeaders);
+        assertEquals(1, hostHeaders.length);
+        assertEquals("localhost:12345", hostHeaders[0].getValue());
+    }
+
+    @Test
+    public void defaultHttpPortsAreNotInDefaultHostHeader() {
+        SdkHttpRequest sdkRequest = SdkHttpRequest.builder()
+                .uri(URI.create("http://localhost:80/"))
+                .method(SdkHttpMethod.HEAD)
+                .build();
+        HttpExecuteRequest request = HttpExecuteRequest.builder()
+                .request(sdkRequest)
+                .build();
+        HttpRequestBase result = instance.create(request, requestConfig);
+        Header[] hostHeaders = result.getHeaders(HttpHeaders.HOST);
+        assertNotNull(hostHeaders);
+        assertEquals(1, hostHeaders.length);
+        assertEquals("localhost", hostHeaders[0].getValue());
+
+        sdkRequest = SdkHttpRequest.builder()
+                .uri(URI.create("https://localhost:443/"))
+                .method(SdkHttpMethod.HEAD)
+                .build();
+        request = HttpExecuteRequest.builder()
+                .request(sdkRequest)
+                .build();
+        result = instance.create(request, requestConfig);
+        hostHeaders = result.getHeaders(HttpHeaders.HOST);
+        assertNotNull(hostHeaders);
+        assertEquals(1, hostHeaders.length);
+        assertEquals("localhost", hostHeaders[0].getValue());
+    }
+}
diff --git a/http-clients/aws-crt-client/pom.xml b/http-clients/aws-crt-client/pom.xml
index a43c310af6eb..b7dae46cef22 100644
--- a/http-clients/aws-crt-client/pom.xml
+++ b/http-clients/aws-crt-client/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>http-clients</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/http-clients/aws-crt-client/src/main/java/software/amazon/awssdk/http/crt/AwsCrtAsyncHttpClient.java b/http-clients/aws-crt-client/src/main/java/software/amazon/awssdk/http/crt/AwsCrtAsyncHttpClient.java
index abf94201d6ff..b02bb647bcd9 100644
--- a/http-clients/aws-crt-client/src/main/java/software/amazon/awssdk/http/crt/AwsCrtAsyncHttpClient.java
+++ b/http-clients/aws-crt-client/src/main/java/software/amazon/awssdk/http/crt/AwsCrtAsyncHttpClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-clients/aws-crt-client/src/main/java/software/amazon/awssdk/http/crt/internal/AwsCrtAsyncHttpStreamAdapter.java b/http-clients/aws-crt-client/src/main/java/software/amazon/awssdk/http/crt/internal/AwsCrtAsyncHttpStreamAdapter.java
index 7aa25e78e743..b1b4561e100e 100644
--- a/http-clients/aws-crt-client/src/main/java/software/amazon/awssdk/http/crt/internal/AwsCrtAsyncHttpStreamAdapter.java
+++ b/http-clients/aws-crt-client/src/main/java/software/amazon/awssdk/http/crt/internal/AwsCrtAsyncHttpStreamAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-clients/aws-crt-client/src/main/java/software/amazon/awssdk/http/crt/internal/AwsCrtRequestBodySubscriber.java b/http-clients/aws-crt-client/src/main/java/software/amazon/awssdk/http/crt/internal/AwsCrtRequestBodySubscriber.java
index cbe7929fe3bd..b9790dcb1f1d 100644
--- a/http-clients/aws-crt-client/src/main/java/software/amazon/awssdk/http/crt/internal/AwsCrtRequestBodySubscriber.java
+++ b/http-clients/aws-crt-client/src/main/java/software/amazon/awssdk/http/crt/internal/AwsCrtRequestBodySubscriber.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-clients/aws-crt-client/src/main/java/software/amazon/awssdk/http/crt/internal/AwsCrtResponseBodyPublisher.java b/http-clients/aws-crt-client/src/main/java/software/amazon/awssdk/http/crt/internal/AwsCrtResponseBodyPublisher.java
index 5802c885dae8..ce43e584d8de 100644
--- a/http-clients/aws-crt-client/src/main/java/software/amazon/awssdk/http/crt/internal/AwsCrtResponseBodyPublisher.java
+++ b/http-clients/aws-crt-client/src/main/java/software/amazon/awssdk/http/crt/internal/AwsCrtResponseBodyPublisher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-clients/aws-crt-client/src/main/java/software/amazon/awssdk/http/crt/internal/AwsCrtResponseBodySubscription.java b/http-clients/aws-crt-client/src/main/java/software/amazon/awssdk/http/crt/internal/AwsCrtResponseBodySubscription.java
index d89546c89fc8..fe573a901af3 100644
--- a/http-clients/aws-crt-client/src/main/java/software/amazon/awssdk/http/crt/internal/AwsCrtResponseBodySubscription.java
+++ b/http-clients/aws-crt-client/src/main/java/software/amazon/awssdk/http/crt/internal/AwsCrtResponseBodySubscription.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-clients/netty-nio-client/pom.xml b/http-clients/netty-nio-client/pom.xml
index 58b96a1405cd..7dfe6f4049ad 100644
--- a/http-clients/netty-nio-client/pom.xml
+++ b/http-clients/netty-nio-client/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>http-clients</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -97,6 +97,12 @@
         </dependency>
 
         <!--Test Dependencies-->
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>http-client-tests</artifactId>
+            <version>${awsjavasdk.version}</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>com.github.tomakehurst</groupId>
             <artifactId>wiremock</artifactId>
@@ -112,6 +118,11 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.testng</groupId>
+            <artifactId>testng</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
diff --git a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/Http2Configuration.java b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/Http2Configuration.java
new file mode 100644
index 000000000000..93037270e310
--- /dev/null
+++ b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/Http2Configuration.java
@@ -0,0 +1,181 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.http.nio.netty;
+
+import java.time.Duration;
+import software.amazon.awssdk.annotations.SdkPublicApi;
+import software.amazon.awssdk.utils.Validate;
+import software.amazon.awssdk.utils.builder.CopyableBuilder;
+import software.amazon.awssdk.utils.builder.ToCopyableBuilder;
+
+/**
+ * Configuration specific to HTTP/2 connections.
+ */
+@SdkPublicApi
+public final class Http2Configuration implements ToCopyableBuilder<Http2Configuration.Builder, Http2Configuration> {
+    private final Long maxStreams;
+    private final Integer initialWindowSize;
+    private final Duration healthCheckPingPeriod;
+
+    private Http2Configuration(DefaultBuilder builder) {
+        this.maxStreams = builder.maxStreams;
+        this.initialWindowSize = builder.initialWindowSize;
+        this.healthCheckPingPeriod = builder.healthCheckPingPeriod;
+    }
+
+    /**
+     * @return The maximum number of streams to be created per HTTP/2 connection.
+     */
+    public Long maxStreams() {
+        return maxStreams;
+    }
+
+    /**
+     * @return The initial window size for an HTTP/2 stream.
+     */
+    public Integer initialWindowSize() {
+        return initialWindowSize;
+    }
+
+    /**
+     * @return The health check period for an HTTP/2 connection.
+     */
+    public Duration healthCheckPingPeriod() {
+        return healthCheckPingPeriod;
+    }
+
+    @Override
+    public Builder toBuilder() {
+        return new DefaultBuilder(this);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        Http2Configuration that = (Http2Configuration) o;
+
+        if (maxStreams != null ? !maxStreams.equals(that.maxStreams) : that.maxStreams != null) {
+            return false;
+        }
+
+        return initialWindowSize != null ? initialWindowSize.equals(that.initialWindowSize) : that.initialWindowSize == null;
+
+    }
+
+    @Override
+    public int hashCode() {
+        int result = maxStreams != null ? maxStreams.hashCode() : 0;
+        result = 31 * result + (initialWindowSize != null ? initialWindowSize.hashCode() : 0);
+        return result;
+    }
+
+    public static Builder builder() {
+        return new DefaultBuilder();
+    }
+
+    public interface Builder extends CopyableBuilder<Builder, Http2Configuration> {
+
+        /**
+         * Sets the max number of concurrent streams per connection.
+         *
+         * <p>Note that this cannot exceed the value of the MAX_CONCURRENT_STREAMS setting returned by the service. If it
+         * does the service setting is used instead.</p>
+         *
+         * @param maxStreams Max concurrent HTTP/2 streams per connection.
+         * @return This builder for method chaining.
+         */
+        Builder maxStreams(Long maxStreams);
+
+        /**
+         * Sets initial window size of a stream. This setting is only respected when the HTTP/2 protocol is used.
+         *
+         * See <a href="https://tools.ietf.org/html/rfc7540#section-6.5.2">https://tools.ietf.org/html/rfc7540#section-6.5.2</a>
+         * for more information about this parameter.
+         *
+         * @param initialWindowSize The initial window size of a stream.
+         * @return This builder for method chaining.
+         */
+        Builder initialWindowSize(Integer initialWindowSize);
+
+        /**
+         * Sets the period that the Netty client will send {@code PING} frames to the remote endpoint to check the
+         * health of the connection. The default value is {@link
+         * software.amazon.awssdk.http.nio.netty.internal.NettyConfiguration#HTTP2_CONNECTION_PING_TIMEOUT_SECONDS}. To
+         * disable this feature, set a duration of 0.
+         *
+         * @param healthCheckPingPeriod The ping period.
+         * @return This builder for method chaining.
+         */
+        Builder healthCheckPingPeriod(Duration healthCheckPingPeriod);
+    }
+
+    private static final class DefaultBuilder implements Builder {
+        private Long maxStreams;
+        private Integer initialWindowSize;
+        private Duration healthCheckPingPeriod;
+
+        private DefaultBuilder() {
+        }
+
+        private DefaultBuilder(Http2Configuration http2Configuration) {
+            this.maxStreams = http2Configuration.maxStreams;
+            this.initialWindowSize = http2Configuration.initialWindowSize;
+            this.healthCheckPingPeriod = http2Configuration.healthCheckPingPeriod;
+        }
+
+        @Override
+        public Builder maxStreams(Long maxStreams) {
+            this.maxStreams = Validate.isPositiveOrNull(maxStreams, "maxStreams");
+            return this;
+        }
+
+        public void setMaxStreams(Long maxStreams) {
+            maxStreams(maxStreams);
+        }
+
+        @Override
+        public Builder initialWindowSize(Integer initialWindowSize) {
+            this.initialWindowSize = Validate.isPositiveOrNull(initialWindowSize, "initialWindowSize");
+            return this;
+        }
+
+        public void setInitialWindowSize(Integer initialWindowSize) {
+            initialWindowSize(initialWindowSize);
+        }
+
+        @Override
+        public Builder healthCheckPingPeriod(Duration healthCheckPingPeriod) {
+            this.healthCheckPingPeriod = healthCheckPingPeriod;
+            return this;
+        }
+
+        public void setHealthCheckPingPeriod(Duration healthCheckPingPeriod) {
+            healthCheckPingPeriod(healthCheckPingPeriod);
+        }
+
+        @Override
+        public Http2Configuration build() {
+            return new Http2Configuration(this);
+        }
+    }
+}
diff --git a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/NettyNioAsyncHttpClient.java b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/NettyNioAsyncHttpClient.java
index 751c3d77937e..b6f2bbafb098 100644
--- a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/NettyNioAsyncHttpClient.java
+++ b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/NettyNioAsyncHttpClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -15,16 +15,6 @@
 
 package software.amazon.awssdk.http.nio.netty;
 
-import static software.amazon.awssdk.http.SdkHttpConfigurationOption.CONNECTION_ACQUIRE_TIMEOUT;
-import static software.amazon.awssdk.http.SdkHttpConfigurationOption.CONNECTION_MAX_IDLE_TIMEOUT;
-import static software.amazon.awssdk.http.SdkHttpConfigurationOption.CONNECTION_TIMEOUT;
-import static software.amazon.awssdk.http.SdkHttpConfigurationOption.CONNECTION_TIME_TO_LIVE;
-import static software.amazon.awssdk.http.SdkHttpConfigurationOption.MAX_CONNECTIONS;
-import static software.amazon.awssdk.http.SdkHttpConfigurationOption.MAX_PENDING_CONNECTION_ACQUIRES;
-import static software.amazon.awssdk.http.SdkHttpConfigurationOption.READ_TIMEOUT;
-import static software.amazon.awssdk.http.SdkHttpConfigurationOption.REAP_IDLE_CONNECTIONS;
-import static software.amazon.awssdk.http.SdkHttpConfigurationOption.TLS_KEY_MANAGERS_PROVIDER;
-import static software.amazon.awssdk.http.SdkHttpConfigurationOption.WRITE_TIMEOUT;
 import static software.amazon.awssdk.http.nio.netty.internal.NettyConfiguration.EVENTLOOP_SHUTDOWN_FUTURE_TIMEOUT_SECONDS;
 import static software.amazon.awssdk.http.nio.netty.internal.NettyConfiguration.EVENTLOOP_SHUTDOWN_QUIET_PERIOD_SECONDS;
 import static software.amazon.awssdk.http.nio.netty.internal.NettyConfiguration.EVENTLOOP_SHUTDOWN_TIMEOUT_SECONDS;
@@ -42,6 +32,7 @@
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
+import java.util.function.Consumer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import software.amazon.awssdk.annotations.SdkPublicApi;
@@ -51,6 +42,7 @@
 import software.amazon.awssdk.http.SdkHttpRequest;
 import software.amazon.awssdk.http.SystemPropertyTlsKeyManagersProvider;
 import software.amazon.awssdk.http.TlsKeyManagersProvider;
+import software.amazon.awssdk.http.TlsTrustManagersProvider;
 import software.amazon.awssdk.http.async.AsyncExecuteRequest;
 import software.amazon.awssdk.http.async.SdkAsyncHttpClient;
 import software.amazon.awssdk.http.nio.netty.internal.AwaitCloseChannelPoolMap;
@@ -77,6 +69,14 @@ public final class NettyNioAsyncHttpClient implements SdkAsyncHttpClient {
 
     private static final Logger log = LoggerFactory.getLogger(NettyNioAsyncHttpClient.class);
     private static final long MAX_STREAMS_ALLOWED = 4294967295L; // unsigned 32-bit, 2^32 -1
+    private static final int DEFAULT_INITIAL_WINDOW_SIZE = 1_048_576; // 1MiB
+
+    // Override connection idle timeout for Netty http client to reduce the frequency of "server failed to complete the
+    // response error". see https://github.com/aws/aws-sdk-java-v2/issues/1122
+    private static final AttributeMap NETTY_HTTP_DEFAULTS =
+        AttributeMap.builder()
+                    .put(SdkHttpConfigurationOption.CONNECTION_MAX_IDLE_TIMEOUT, Duration.ofSeconds(5))
+                    .build();
 
     private final SdkEventLoopGroup sdkEventLoopGroup;
     private final SdkChannelPoolMap<URI, ? extends ChannelPool> pools;
@@ -85,13 +85,20 @@ public final class NettyNioAsyncHttpClient implements SdkAsyncHttpClient {
     private NettyNioAsyncHttpClient(DefaultBuilder builder, AttributeMap serviceDefaultsMap) {
         this.configuration = new NettyConfiguration(serviceDefaultsMap);
         Protocol protocol = serviceDefaultsMap.get(SdkHttpConfigurationOption.PROTOCOL);
-        long maxStreams = builder.maxHttp2Streams == null ? MAX_STREAMS_ALLOWED : builder.maxHttp2Streams;
         this.sdkEventLoopGroup = eventLoopGroup(builder);
+
+        Http2Configuration http2Configuration = builder.http2Configuration;
+
+        long maxStreams = resolveMaxHttp2Streams(builder.maxHttp2Streams, http2Configuration);
+        int initialWindowSize = resolveInitialWindowSize(http2Configuration);
+
         this.pools = AwaitCloseChannelPoolMap.builder()
                                              .sdkChannelOptions(builder.sdkChannelOptions)
                                              .configuration(configuration)
                                              .protocol(protocol)
                                              .maxStreams(maxStreams)
+                                             .initialWindowSize(initialWindowSize)
+                                             .healthCheckPingPeriod(resolveHealthCheckPingPeriod(http2Configuration))
                                              .sdkEventLoopGroup(sdkEventLoopGroup)
                                              .sslProvider(resolveSslProvider(builder))
                                              .proxyConfiguration(builder.proxyConfiguration)
@@ -143,6 +150,32 @@ private SslProvider resolveSslProvider(DefaultBuilder builder) {
         return SslContext.defaultClientProvider();
     }
 
+    private long resolveMaxHttp2Streams(Integer topLevelValue, Http2Configuration http2Configuration) {
+        if (topLevelValue != null) {
+            return topLevelValue;
+        }
+
+        if (http2Configuration == null || http2Configuration.maxStreams() == null) {
+            return MAX_STREAMS_ALLOWED;
+        }
+
+        return Math.min(http2Configuration.maxStreams(), MAX_STREAMS_ALLOWED);
+    }
+
+    private int resolveInitialWindowSize(Http2Configuration http2Configuration) {
+        if (http2Configuration == null || http2Configuration.initialWindowSize() == null) {
+            return DEFAULT_INITIAL_WINDOW_SIZE;
+        }
+        return http2Configuration.initialWindowSize();
+    }
+
+    private Duration resolveHealthCheckPingPeriod(Http2Configuration http2Configuration) {
+        if (http2Configuration != null) {
+            return http2Configuration.healthCheckPingPeriod();
+        }
+        return null;
+    }
+
     private SdkEventLoopGroup nonManagedEventLoopGroup(SdkEventLoopGroup eventLoopGroup) {
         return SdkEventLoopGroup.create(new NonManagedEventLoopGroup(eventLoopGroup.eventLoopGroup()),
                                         eventLoopGroup.channelFactory());
@@ -175,6 +208,11 @@ public String clientName() {
         return CLIENT_NAME;
     }
 
+    @SdkTestInternalApi
+    NettyConfiguration configuration() {
+        return configuration;
+    }
+
     /**
      * Builder that allows configuration of the Netty NIO HTTP implementation. Use {@link #builder()} to configure and construct
      * a Netty HTTP client.
@@ -332,6 +370,9 @@ public interface Builder extends SdkAsyncHttpClient.Builder<NettyNioAsyncHttpCli
          *
          * @param maxHttp2Streams Max concurrent HTTP/2 streams per connection.
          * @return This builder for method chaining.
+         *
+         * @deprecated Use {@link #http2Configuration(Http2Configuration)} along with
+         * {@link Http2Configuration.Builder#maxStreams(Long)} instead.
          */
         Builder maxHttp2Streams(Integer maxHttp2Streams);
 
@@ -369,6 +410,37 @@ public interface Builder extends SdkAsyncHttpClient.Builder<NettyNioAsyncHttpCli
          * @return The builder for method chaining.
          */
         Builder tlsKeyManagersProvider(TlsKeyManagersProvider keyManagersProvider);
+
+        /**
+         * Configure the {@link TlsTrustManagersProvider} that will provide the {@link javax.net.ssl.TrustManager}s to use
+         * when constructing the SSL context.
+         *
+         * @param trustManagersProvider The {@code TlsKeyManagersProvider}.
+         * @return The builder for method chaining.
+         */
+        Builder tlsTrustManagersProvider(TlsTrustManagersProvider trustManagersProvider);
+
+        /**
+         * Set the HTTP/2 specific configuration for this client.
+         * <p>
+         * <b>Note:</b>If {@link #maxHttp2Streams(Integer)} and {@link Http2Configuration#maxStreams()} are both set,
+         * the value set using {@link #maxHttp2Streams(Integer)} takes precedence.
+         *
+         * @param http2Configuration The HTTP/2 configuration object.
+         * @return the builder for method chaining.
+         */
+        Builder http2Configuration(Http2Configuration http2Configuration);
+
+        /**
+         * Set the HTTP/2 specific configuration for this client.
+         * <p>
+         * <b>Note:</b>If {@link #maxHttp2Streams(Integer)} and {@link Http2Configuration#maxStreams()} are both set,
+         * the value set using {@link #maxHttp2Streams(Integer)} takes precedence.
+         *
+         * @param http2ConfigurationBuilderConsumer The consumer of the HTTP/2 configuration builder object.
+         * @return the builder for method chaining.
+         */
+        Builder http2Configuration(Consumer<Http2Configuration.Builder> http2ConfigurationBuilderConsumer);
     }
 
     /**
@@ -383,6 +455,7 @@ private static final class DefaultBuilder implements Builder {
         private SdkEventLoopGroup eventLoopGroup;
         private SdkEventLoopGroup.Builder eventLoopGroupBuilder;
         private Integer maxHttp2Streams;
+        private Http2Configuration http2Configuration;
         private SslProvider sslProvider;
         private ProxyConfiguration proxyConfiguration;
 
@@ -391,7 +464,7 @@ private DefaultBuilder() {
 
         @Override
         public Builder maxConcurrency(Integer maxConcurrency) {
-            standardOptions.put(MAX_CONNECTIONS, maxConcurrency);
+            standardOptions.put(SdkHttpConfigurationOption.MAX_CONNECTIONS, maxConcurrency);
             return this;
         }
 
@@ -401,7 +474,7 @@ public void setMaxConcurrency(Integer maxConnectionsPerEndpoint) {
 
         @Override
         public Builder maxPendingConnectionAcquires(Integer maxPendingAcquires) {
-            standardOptions.put(MAX_PENDING_CONNECTION_ACQUIRES, maxPendingAcquires);
+            standardOptions.put(SdkHttpConfigurationOption.MAX_PENDING_CONNECTION_ACQUIRES, maxPendingAcquires);
             return this;
         }
 
@@ -412,7 +485,7 @@ public void setMaxPendingConnectionAcquires(Integer maxPendingAcquires) {
         @Override
         public Builder readTimeout(Duration readTimeout) {
             Validate.isNotNegative(readTimeout, "readTimeout");
-            standardOptions.put(READ_TIMEOUT, readTimeout);
+            standardOptions.put(SdkHttpConfigurationOption.READ_TIMEOUT, readTimeout);
             return this;
         }
 
@@ -423,7 +496,7 @@ public void setReadTimeout(Duration readTimeout) {
         @Override
         public Builder writeTimeout(Duration writeTimeout) {
             Validate.isNotNegative(writeTimeout, "writeTimeout");
-            standardOptions.put(WRITE_TIMEOUT, writeTimeout);
+            standardOptions.put(SdkHttpConfigurationOption.WRITE_TIMEOUT, writeTimeout);
             return this;
         }
 
@@ -434,7 +507,7 @@ public void setWriteTimeout(Duration writeTimeout) {
         @Override
         public Builder connectionTimeout(Duration timeout) {
             Validate.isPositive(timeout, "connectionTimeout");
-            standardOptions.put(CONNECTION_TIMEOUT, timeout);
+            standardOptions.put(SdkHttpConfigurationOption.CONNECTION_TIMEOUT, timeout);
             return this;
         }
 
@@ -445,7 +518,7 @@ public void setConnectionTimeout(Duration connectionTimeout) {
         @Override
         public Builder connectionAcquisitionTimeout(Duration connectionAcquisitionTimeout) {
             Validate.isPositive(connectionAcquisitionTimeout, "connectionAcquisitionTimeout");
-            standardOptions.put(CONNECTION_ACQUIRE_TIMEOUT, connectionAcquisitionTimeout);
+            standardOptions.put(SdkHttpConfigurationOption.CONNECTION_ACQUIRE_TIMEOUT, connectionAcquisitionTimeout);
             return this;
         }
 
@@ -456,7 +529,7 @@ public void setConnectionAcquisitionTimeout(Duration connectionAcquisitionTimeou
         @Override
         public Builder connectionTimeToLive(Duration connectionTimeToLive) {
             Validate.isPositive(connectionTimeToLive, "connectionTimeToLive");
-            standardOptions.put(CONNECTION_TIME_TO_LIVE, connectionTimeToLive);
+            standardOptions.put(SdkHttpConfigurationOption.CONNECTION_TIME_TO_LIVE, connectionTimeToLive);
             return this;
         }
 
@@ -467,7 +540,7 @@ public void setConnectionTimeToLive(Duration connectionTimeToLive) {
         @Override
         public Builder connectionMaxIdleTime(Duration connectionMaxIdleTime) {
             Validate.isPositive(connectionMaxIdleTime, "connectionMaxIdleTime");
-            standardOptions.put(CONNECTION_MAX_IDLE_TIMEOUT, connectionMaxIdleTime);
+            standardOptions.put(SdkHttpConfigurationOption.CONNECTION_MAX_IDLE_TIMEOUT, connectionMaxIdleTime);
             return this;
         }
 
@@ -477,7 +550,7 @@ public void setConnectionMaxIdleTime(Duration connectionMaxIdleTime) {
 
         @Override
         public Builder useIdleConnectionReaper(Boolean useIdleConnectionReaper) {
-            standardOptions.put(REAP_IDLE_CONNECTIONS, useIdleConnectionReaper);
+            standardOptions.put(SdkHttpConfigurationOption.REAP_IDLE_CONNECTIONS, useIdleConnectionReaper);
             return this;
         }
 
@@ -553,14 +626,46 @@ public void setProxyConfiguration(ProxyConfiguration proxyConfiguration) {
 
         @Override
         public Builder tlsKeyManagersProvider(TlsKeyManagersProvider tlsKeyManagersProvider) {
-            this.standardOptions.put(TLS_KEY_MANAGERS_PROVIDER, tlsKeyManagersProvider);
+            this.standardOptions.put(SdkHttpConfigurationOption.TLS_KEY_MANAGERS_PROVIDER, tlsKeyManagersProvider);
+            return this;
+        }
+
+        public void setTlsKeyManagersProvider(TlsKeyManagersProvider tlsKeyManagersProvider) {
+            tlsKeyManagersProvider(tlsKeyManagersProvider);
+        }
+
+        @Override
+        public Builder tlsTrustManagersProvider(TlsTrustManagersProvider tlsTrustManagersProvider) {
+            standardOptions.put(SdkHttpConfigurationOption.TLS_TRUST_MANAGERS_PROVIDER, tlsTrustManagersProvider);
             return this;
         }
 
+        public void setTlsTrustManagersProvider(TlsTrustManagersProvider tlsTrustManagersProvider) {
+            tlsTrustManagersProvider(tlsTrustManagersProvider);
+        }
+
+        @Override
+        public Builder http2Configuration(Http2Configuration http2Configuration) {
+            this.http2Configuration = http2Configuration;
+            return this;
+        }
+
+        @Override
+        public Builder http2Configuration(Consumer<Http2Configuration.Builder> http2ConfigurationBuilderConsumer) {
+            Http2Configuration.Builder builder = Http2Configuration.builder();
+            http2ConfigurationBuilderConsumer.accept(builder);
+            return http2Configuration(builder.build());
+        }
+
+        public void setHttp2Configuration(Http2Configuration http2Configuration) {
+            http2Configuration(http2Configuration);
+        }
+
         @Override
         public SdkAsyncHttpClient buildWithDefaults(AttributeMap serviceDefaults) {
             return new NettyNioAsyncHttpClient(this, standardOptions.build()
                                                                     .merge(serviceDefaults)
+                                                                    .merge(NETTY_HTTP_DEFAULTS)
                                                                     .merge(SdkHttpConfigurationOption.GLOBAL_HTTP_DEFAULTS));
 
         }
diff --git a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/NettySdkAsyncHttpService.java b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/NettySdkAsyncHttpService.java
index 82cb745f7c23..3824b34ed024 100644
--- a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/NettySdkAsyncHttpService.java
+++ b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/NettySdkAsyncHttpService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/ProxyConfiguration.java b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/ProxyConfiguration.java
index dac1aa090236..5ee2ac1cf977 100644
--- a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/ProxyConfiguration.java
+++ b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/ProxyConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/SdkEventLoopGroup.java b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/SdkEventLoopGroup.java
index df6bc1fa6db2..870853c4de69 100644
--- a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/SdkEventLoopGroup.java
+++ b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/SdkEventLoopGroup.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/AwaitCloseChannelPoolMap.java b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/AwaitCloseChannelPoolMap.java
index 732ca8c2366b..01a42222c588 100644
--- a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/AwaitCloseChannelPoolMap.java
+++ b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/AwaitCloseChannelPoolMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -19,7 +19,6 @@
 
 import io.netty.bootstrap.Bootstrap;
 import io.netty.channel.Channel;
-import io.netty.channel.ChannelOption;
 import io.netty.channel.pool.ChannelPool;
 import io.netty.channel.pool.ChannelPoolHandler;
 import io.netty.handler.codec.http2.Http2SecurityUtil;
@@ -28,10 +27,9 @@
 import io.netty.handler.ssl.SslProvider;
 import io.netty.handler.ssl.SupportedCipherSuiteFilter;
 import io.netty.handler.ssl.util.InsecureTrustManagerFactory;
-
-import java.net.InetSocketAddress;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.time.Duration;
 import java.util.Collection;
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
@@ -40,6 +38,7 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Function;
 import javax.net.ssl.KeyManager;
 import javax.net.ssl.KeyManagerFactory;
 import javax.net.ssl.SSLException;
@@ -51,6 +50,7 @@
 import software.amazon.awssdk.http.nio.netty.SdkEventLoopGroup;
 import software.amazon.awssdk.http.nio.netty.internal.http2.HttpOrHttp2ChannelPool;
 import software.amazon.awssdk.utils.Logger;
+import software.amazon.awssdk.utils.Validate;
 
 /**
  * Implementation of {@link SdkChannelPoolMap} that awaits channel pools to be closed upon closing.
@@ -74,31 +74,47 @@ public void channelCreated(Channel ch) throws Exception {
         }
     };
 
+    // IMPORTANT: If the default bootstrap provider is changed, ensure that the new implementation is compliant with
+    // DNS resolver testing in BootstrapProviderTest, specifically that no caching of hostname lookups is taking place.
+    private static final Function<Builder, BootstrapProvider> DEFAULT_BOOTSTRAP_PROVIDER =
+        b -> new BootstrapProvider(b.sdkEventLoopGroup, b.configuration, b.sdkChannelOptions);
+
     private final Map<URI, Boolean> shouldProxyForHostCache = new ConcurrentHashMap<>();
 
 
-    private final SdkChannelOptions sdkChannelOptions;
-    private final SdkEventLoopGroup sdkEventLoopGroup;
     private final NettyConfiguration configuration;
     private final Protocol protocol;
     private final long maxStreams;
+    private final Duration healthCheckPingPeriod;
+    private final int initialWindowSize;
     private final SslProvider sslProvider;
     private final ProxyConfiguration proxyConfiguration;
+    private final BootstrapProvider bootstrapProvider;
 
-    private AwaitCloseChannelPoolMap(Builder builder) {
-        this.sdkChannelOptions = builder.sdkChannelOptions;
-        this.sdkEventLoopGroup = builder.sdkEventLoopGroup;
+    private AwaitCloseChannelPoolMap(Builder builder, Function<Builder, BootstrapProvider> createBootStrapProvider) {
         this.configuration = builder.configuration;
         this.protocol = builder.protocol;
         this.maxStreams = builder.maxStreams;
+        this.healthCheckPingPeriod = builder.healthCheckPingPeriod;
+        this.initialWindowSize = builder.initialWindowSize;
         this.sslProvider = builder.sslProvider;
         this.proxyConfiguration = builder.proxyConfiguration;
+        this.bootstrapProvider = createBootStrapProvider.apply(builder);
+    }
+
+    private AwaitCloseChannelPoolMap(Builder builder) {
+        this(builder, DEFAULT_BOOTSTRAP_PROVIDER);
     }
 
     @SdkTestInternalApi
-    AwaitCloseChannelPoolMap(Builder builder, Map<URI, Boolean> shouldProxyForHostCache) {
-        this(builder);
-        this.shouldProxyForHostCache.putAll(shouldProxyForHostCache);
+    AwaitCloseChannelPoolMap(Builder builder,
+                             Map<URI, Boolean> shouldProxyForHostCache,
+                             BootstrapProvider bootstrapProvider) {
+        this(builder, bootstrapProvider == null ? DEFAULT_BOOTSTRAP_PROVIDER : b -> bootstrapProvider);
+
+        if (shouldProxyForHostCache != null) {
+            this.shouldProxyForHostCache.putAll(shouldProxyForHostCache);
+        }
     }
 
     public static Builder builder() {
@@ -113,8 +129,15 @@ protected SimpleChannelPoolAwareChannelPool newPool(URI key) {
 
         AtomicReference<ChannelPool> channelPoolRef = new AtomicReference<>();
 
-        ChannelPipelineInitializer pipelineInitializer =
-            new ChannelPipelineInitializer(protocol, sslContext, maxStreams, channelPoolRef, configuration, key);
+        ChannelPipelineInitializer pipelineInitializer = new ChannelPipelineInitializer(protocol,
+                                                                                        sslContext,
+                                                                                        sslProvider,
+                                                                                        maxStreams,
+                                                                                        initialWindowSize,
+                                                                                        healthCheckPingPeriod,
+                                                                                        channelPoolRef,
+                                                                                        configuration,
+                                                                                        key);
 
         BetterSimpleChannelPool tcpChannelPool;
         ChannelPool baseChannelPool;
@@ -161,17 +184,7 @@ public void close() {
     private Bootstrap createBootstrap(URI poolKey) {
         String host = bootstrapHost(poolKey);
         int port = bootstrapPort(poolKey);
-
-        Bootstrap bootstrap =
-                new Bootstrap()
-                        .group(sdkEventLoopGroup.eventLoopGroup())
-                        .channelFactory(sdkEventLoopGroup.channelFactory())
-                        .option(ChannelOption.CONNECT_TIMEOUT_MILLIS, configuration.connectTimeoutMillis())
-                        // TODO run some performance tests with and without this.
-                        .remoteAddress(new InetSocketAddress(host, port));
-        sdkChannelOptions.channelOptions().forEach(bootstrap::option);
-
-        return bootstrap;
+        return bootstrapProvider.createBootstrap(host, port);
     }
 
 
@@ -270,7 +283,20 @@ private SslContext sslContext(URI targetAddress) {
     }
 
     private TrustManagerFactory getTrustManager() {
-        return configuration.trustAllCertificates() ? InsecureTrustManagerFactory.INSTANCE : null;
+        Validate.isTrue(configuration.tlsTrustManagersProvider() == null || !configuration.trustAllCertificates(),
+                        "A TlsTrustManagerProvider can't be provided if TrustAllCertificates is also set");
+
+        if (configuration.tlsTrustManagersProvider() != null) {
+            return StaticTrustManagerFactory.create(configuration.tlsTrustManagersProvider().trustManagers());
+        }
+
+        if (configuration.trustAllCertificates()) {
+            log.warn(() -> "SSL Certificate verification is disabled. This is not a safe setting and should only be "
+                           + "used for testing.");
+            return InsecureTrustManagerFactory.INSTANCE;
+        }
+
+        return null;
     }
 
     private KeyManagerFactory getKeyManager() {
@@ -290,6 +316,8 @@ public static class Builder {
         private NettyConfiguration configuration;
         private Protocol protocol;
         private long maxStreams;
+        private int initialWindowSize;
+        private Duration healthCheckPingPeriod;
         private SslProvider sslProvider;
         private ProxyConfiguration proxyConfiguration;
 
@@ -321,6 +349,16 @@ public Builder maxStreams(long maxStreams) {
             return this;
         }
 
+        public Builder initialWindowSize(int initialWindowSize) {
+            this.initialWindowSize = initialWindowSize;
+            return this;
+        }
+
+        public Builder healthCheckPingPeriod(Duration healthCheckPingPeriod) {
+            this.healthCheckPingPeriod = healthCheckPingPeriod;
+            return this;
+        }
+
         public Builder sslProvider(SslProvider sslProvider) {
             this.sslProvider = sslProvider;
             return this;
diff --git a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/BetterSimpleChannelPool.java b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/BetterSimpleChannelPool.java
index 2770b3c1de67..3c1ae77d99ca 100644
--- a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/BetterSimpleChannelPool.java
+++ b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/BetterSimpleChannelPool.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/BootstrapProvider.java b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/BootstrapProvider.java
new file mode 100644
index 000000000000..03b18ccd1acb
--- /dev/null
+++ b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/BootstrapProvider.java
@@ -0,0 +1,62 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.http.nio.netty.internal;
+
+import io.netty.bootstrap.Bootstrap;
+import io.netty.channel.ChannelOption;
+import java.net.InetSocketAddress;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.http.nio.netty.SdkEventLoopGroup;
+
+/**
+ * The primary purpose of this Bootstrap provider is to ensure that all Bootstraps created by it are 'unresolved'
+ * InetSocketAddress. This is to prevent Netty from caching the resolved address of a host and then re-using it in
+ * subsequent connection attempts, and instead deferring to the JVM to handle address resolution and caching.
+ */
+@SdkInternalApi
+public class BootstrapProvider {
+    private final SdkEventLoopGroup sdkEventLoopGroup;
+    private final NettyConfiguration nettyConfiguration;
+    private final SdkChannelOptions sdkChannelOptions;
+
+
+    BootstrapProvider(SdkEventLoopGroup sdkEventLoopGroup,
+                      NettyConfiguration nettyConfiguration,
+                      SdkChannelOptions sdkChannelOptions) {
+        this.sdkEventLoopGroup = sdkEventLoopGroup;
+        this.nettyConfiguration = nettyConfiguration;
+        this.sdkChannelOptions = sdkChannelOptions;
+    }
+
+    /**
+     * Creates a Bootstrap for a specific host and port with an unresolved InetSocketAddress as the remoteAddress.
+     * @param host The unresolved remote hostname
+     * @param port The remote port
+     * @return A newly created Bootstrap using the configuration this provider was initialized with, and having an
+     * unresolved remote address.
+     */
+    public Bootstrap createBootstrap(String host, int port) {
+        Bootstrap bootstrap =
+            new Bootstrap()
+                .group(sdkEventLoopGroup.eventLoopGroup())
+                .channelFactory(sdkEventLoopGroup.channelFactory())
+                .option(ChannelOption.CONNECT_TIMEOUT_MILLIS, nettyConfiguration.connectTimeoutMillis())
+                .remoteAddress(InetSocketAddress.createUnresolved(host, port));
+        sdkChannelOptions.channelOptions().forEach(bootstrap::option);
+
+        return bootstrap;
+    }
+}
diff --git a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/CancellableAcquireChannelPool.java b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/CancellableAcquireChannelPool.java
index 2ed939ef7b51..3a972f74fddf 100644
--- a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/CancellableAcquireChannelPool.java
+++ b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/CancellableAcquireChannelPool.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/ChannelAttributeKey.java b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/ChannelAttributeKey.java
index 8fc62b60b5cb..f2feca135ffa 100644
--- a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/ChannelAttributeKey.java
+++ b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/ChannelAttributeKey.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -17,13 +17,15 @@
 
 import io.netty.channel.Channel;
 import io.netty.handler.codec.http.LastHttpContent;
+import io.netty.handler.codec.http2.Http2Connection;
 import io.netty.util.AttributeKey;
 import java.nio.ByteBuffer;
 import java.util.concurrent.CompletableFuture;
 import org.reactivestreams.Subscriber;
 import software.amazon.awssdk.annotations.SdkInternalApi;
 import software.amazon.awssdk.http.Protocol;
-import software.amazon.awssdk.http.nio.netty.internal.http2.MultiplexedChannelRecord;
+import software.amazon.awssdk.http.nio.netty.internal.http2.Http2MultiplexedChannelPool;
+import software.amazon.awssdk.http.nio.netty.internal.http2.PingTracker;
 
 /**
  * Keys for attributes attached via {@link io.netty.channel.Channel#attr(AttributeKey)}.
@@ -38,10 +40,20 @@ public final class ChannelAttributeKey {
         "aws.http.nio.netty.async.protocolFuture");
 
     /**
-     * Reference to {@link MultiplexedChannelRecord} which stores information about leased streams for a multiplexed connection.
+     * Reference to {@link Http2MultiplexedChannelPool} which stores information about leased streams for a multiplexed
+     * connection.
      */
-    public static final AttributeKey<MultiplexedChannelRecord> CHANNEL_POOL_RECORD = AttributeKey.newInstance(
-        "aws.http.nio.netty.async.channelPoolRecord");
+    public static final AttributeKey<Http2MultiplexedChannelPool> HTTP2_MULTIPLEXED_CHANNEL_POOL = AttributeKey.newInstance(
+        "aws.http.nio.netty.async.http2MultiplexedChannelPool");
+
+    public static final AttributeKey<PingTracker> PING_TRACKER =
+        AttributeKey.newInstance("aws.http.nio.netty.async.h2.pingTracker");
+
+    public static final AttributeKey<Http2Connection> HTTP2_CONNECTION =
+        AttributeKey.newInstance("aws.http.nio.netty.async.http2Connection");
+
+    public static final AttributeKey<Integer> HTTP2_INITIAL_WINDOW_SIZE =
+        AttributeKey.newInstance("aws.http.nio.netty.async.http2InitialWindowSize");
 
     /**
      * Value of the MAX_CONCURRENT_STREAMS from the server's SETTING frame.
@@ -49,6 +61,12 @@ public final class ChannelAttributeKey {
     public static final AttributeKey<Long> MAX_CONCURRENT_STREAMS = AttributeKey.newInstance(
         "aws.http.nio.netty.async.maxConcurrentStreams");
 
+    /**
+     * {@link AttributeKey} to keep track of whether we should close the connection after this request
+     * has completed.
+     */
+    static final AttributeKey<Boolean> KEEP_ALIVE = AttributeKey.newInstance("aws.http.nio.netty.async.keepAlive");
+
     /**
      * Attribute key for {@link RequestContext}.
      */
@@ -73,12 +91,6 @@ public final class ChannelAttributeKey {
     static final AttributeKey<Long> EXECUTION_ID_KEY = AttributeKey.newInstance(
             "aws.http.nio.netty.async.executionId");
 
-    /**
-     * {@link AttributeKey} to keep track of whether we should close the connection after this request
-     * has completed.
-     */
-    static final AttributeKey<Boolean> KEEP_ALIVE = AttributeKey.newInstance("aws.http.nio.netty.async.keepAlive");
-
     /**
      * Whether the channel is still in use
      */
diff --git a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/ChannelPipelineInitializer.java b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/ChannelPipelineInitializer.java
index 890594b375ad..ba29a9872e83 100644
--- a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/ChannelPipelineInitializer.java
+++ b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/ChannelPipelineInitializer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -15,15 +15,22 @@
 
 package software.amazon.awssdk.http.nio.netty.internal;
 
+import static software.amazon.awssdk.http.nio.netty.internal.ChannelAttributeKey.HTTP2_CONNECTION;
+import static software.amazon.awssdk.http.nio.netty.internal.ChannelAttributeKey.HTTP2_INITIAL_WINDOW_SIZE;
 import static software.amazon.awssdk.http.nio.netty.internal.ChannelAttributeKey.PROTOCOL_FUTURE;
+import static software.amazon.awssdk.http.nio.netty.internal.NettyConfiguration.HTTP2_CONNECTION_PING_TIMEOUT_SECONDS;
+import static software.amazon.awssdk.utils.NumericUtils.saturatedCast;
 import static software.amazon.awssdk.utils.StringUtils.lowerCase;
 
+import io.netty.buffer.UnpooledByteBufAllocator;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelInitializer;
+import io.netty.channel.ChannelOption;
 import io.netty.channel.ChannelPipeline;
 import io.netty.channel.pool.AbstractChannelPoolHandler;
 import io.netty.channel.pool.ChannelPool;
 import io.netty.handler.codec.http.HttpClientCodec;
+import io.netty.handler.codec.http2.Http2FrameCodec;
 import io.netty.handler.codec.http2.Http2FrameCodecBuilder;
 import io.netty.handler.codec.http2.Http2FrameLogger;
 import io.netty.handler.codec.http2.Http2MultiplexHandler;
@@ -32,14 +39,17 @@
 import io.netty.handler.logging.LoggingHandler;
 import io.netty.handler.ssl.SslContext;
 import io.netty.handler.ssl.SslHandler;
+import io.netty.handler.ssl.SslProvider;
 import java.net.URI;
+import java.time.Duration;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.atomic.AtomicReference;
 import javax.net.ssl.SSLEngine;
 import javax.net.ssl.SSLParameters;
 import software.amazon.awssdk.annotations.SdkInternalApi;
 import software.amazon.awssdk.http.Protocol;
-import software.amazon.awssdk.http.nio.netty.internal.http2.Http2GoAwayFrameHandler;
+import software.amazon.awssdk.http.nio.netty.internal.http2.Http2GoAwayEventListener;
+import software.amazon.awssdk.http.nio.netty.internal.http2.Http2PingHandler;
 import software.amazon.awssdk.http.nio.netty.internal.http2.Http2SettingsFrameHandler;
 
 /**
@@ -49,20 +59,29 @@
 public final class ChannelPipelineInitializer extends AbstractChannelPoolHandler {
     private final Protocol protocol;
     private final SslContext sslCtx;
+    private final SslProvider sslProvider;
     private final long clientMaxStreams;
+    private final int clientInitialWindowSize;
+    private final Duration healthCheckPingPeriod;
     private final AtomicReference<ChannelPool> channelPoolRef;
     private final NettyConfiguration configuration;
     private final URI poolKey;
 
     public ChannelPipelineInitializer(Protocol protocol,
                                       SslContext sslCtx,
+                                      SslProvider sslProvider,
                                       long clientMaxStreams,
+                                      int clientInitialWindowSize,
+                                      Duration healthCheckPingPeriod,
                                       AtomicReference<ChannelPool> channelPoolRef,
                                       NettyConfiguration configuration,
                                       URI poolKey) {
         this.protocol = protocol;
         this.sslCtx = sslCtx;
+        this.sslProvider = sslProvider;
         this.clientMaxStreams = clientMaxStreams;
+        this.clientInitialWindowSize = clientInitialWindowSize;
+        this.healthCheckPingPeriod = healthCheckPingPeriod;
         this.channelPoolRef = channelPoolRef;
         this.configuration = configuration;
         this.poolKey = poolKey;
@@ -81,6 +100,12 @@ public void channelCreated(Channel ch) {
 
             pipeline.addLast(sslHandler);
             pipeline.addLast(SslCloseCompletionEventHandler.getInstance());
+
+            // Use unpooled allocator to avoid increased heap memory usage from Netty 4.1.43.
+            // See https://github.com/netty/netty/issues/9768
+            if (sslProvider == SslProvider.JDK) {
+                ch.config().setOption(ChannelOption.ALLOCATOR, UnpooledByteBufAllocator.DEFAULT);
+            }
         }
 
         if (protocol == Protocol.HTTP2) {
@@ -98,7 +123,14 @@ public void channelCreated(Channel ch) {
         }
 
         pipeline.addLast(FutureCancelHandler.getInstance());
-        pipeline.addLast(UnusedChannelExceptionHandler.getInstance());
+
+        // Only add it for h1 channel because it does not apply to
+        // h2 connection channel. It will be attached
+        // to stream channels when they are created.
+        if (protocol == Protocol.HTTP1_1) {
+            pipeline.addLast(UnusedChannelExceptionHandler.getInstance());
+        }
+
         pipeline.addLast(new LoggingHandler(LogLevel.DEBUG));
     }
 
@@ -119,16 +151,30 @@ private void configureSslEngine(SSLEngine sslEngine) {
     private void configureHttp2(Channel ch, ChannelPipeline pipeline) {
         // Using Http2FrameCodecBuilder and Http2MultiplexHandler based on 4.1.37 release notes
         // https://netty.io/news/2019/06/28/4-1-37-Final.html
-        pipeline.addLast(Http2FrameCodecBuilder.forClient()
-                                               .headerSensitivityDetector((name, value) -> lowerCase(name.toString())
-                                                   .equals("authorization"))
-                                               .initialSettings(Http2Settings.defaultSettings().initialWindowSize(1_048_576))
-                                               .frameLogger(new Http2FrameLogger(LogLevel.DEBUG))
-                                               .build());
-
+        Http2FrameCodec codec =
+            Http2FrameCodecBuilder.forClient()
+                                  .headerSensitivityDetector((name, value) -> lowerCase(name.toString()).equals("authorization"))
+                                  .initialSettings(Http2Settings.defaultSettings().initialWindowSize(clientInitialWindowSize))
+                                  .frameLogger(new Http2FrameLogger(LogLevel.DEBUG))
+                                  .build();
+
+        // Connection listeners have higher priority than handlers, in the eyes of the Http2FrameCodec. The Http2FrameCodec will
+        // close any connections when a GOAWAY is received, but we'd like to send a "GOAWAY happened" exception instead of just
+        // closing the connection. Because of this, we use a go-away listener instead of a handler, so that we can send the
+        // exception before the Http2FrameCodec closes the connection itself.
+        codec.connection().addListener(new Http2GoAwayEventListener(ch));
+
+        pipeline.addLast(codec);
+        ch.attr(HTTP2_CONNECTION).set(codec.connection());
+
+        ch.attr(HTTP2_INITIAL_WINDOW_SIZE).set(clientInitialWindowSize);
         pipeline.addLast(new Http2MultiplexHandler(new NoOpChannelInitializer()));
         pipeline.addLast(new Http2SettingsFrameHandler(ch, clientMaxStreams, channelPoolRef));
-        pipeline.addLast(new Http2GoAwayFrameHandler());
+        if (healthCheckPingPeriod == null) {
+            pipeline.addLast(new Http2PingHandler(HTTP2_CONNECTION_PING_TIMEOUT_SECONDS * 1_000));
+        } else if (healthCheckPingPeriod.toMillis() > 0) {
+            pipeline.addLast(new Http2PingHandler(saturatedCast(healthCheckPingPeriod.toMillis())));
+        }
     }
 
     private void configureHttp11(Channel ch, ChannelPipeline pipeline) {
@@ -141,7 +187,6 @@ private static class NoOpChannelInitializer extends ChannelInitializer<Channel>
         protected void initChannel(Channel ch) {
         }
     }
-
 }
 
 
diff --git a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/DelegatingEventLoopGroup.java b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/DelegatingEventLoopGroup.java
index 314c809d730b..ced76358c740 100644
--- a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/DelegatingEventLoopGroup.java
+++ b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/DelegatingEventLoopGroup.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/FutureCancelHandler.java b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/FutureCancelHandler.java
index 1e89c3a7cb73..3e122537c438 100644
--- a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/FutureCancelHandler.java
+++ b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/FutureCancelHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/FutureCancelledException.java b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/FutureCancelledException.java
index a10643a48b5b..809c8a2fa940 100644
--- a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/FutureCancelledException.java
+++ b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/FutureCancelledException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/HandlerRemovingChannelPool.java b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/HandlerRemovingChannelPool.java
index 23bcf436530f..1ce19749da49 100644
--- a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/HandlerRemovingChannelPool.java
+++ b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/HandlerRemovingChannelPool.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -18,7 +18,6 @@
 import static software.amazon.awssdk.http.nio.netty.internal.ChannelAttributeKey.IN_USE;
 import static software.amazon.awssdk.http.nio.netty.internal.utils.ChannelUtils.removeIfExists;
 
-import com.typesafe.netty.http.HttpStreamsClientHandler;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelHandler;
 import io.netty.channel.pool.ChannelPool;
@@ -27,6 +26,8 @@
 import io.netty.util.concurrent.Future;
 import io.netty.util.concurrent.Promise;
 import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.http.nio.netty.internal.http2.FlushOnReadHandler;
+import software.amazon.awssdk.http.nio.netty.internal.nrs.HttpStreamsClientHandler;
 
 /**
  * Removes any per request {@link ChannelHandler} from the pipeline prior to releasing
@@ -79,6 +80,7 @@ private void removePerRequestHandlers(Channel channel) {
             removeIfExists(channel.pipeline(),
                            HttpStreamsClientHandler.class,
                            LastHttpContentHandler.class,
+                           FlushOnReadHandler.class,
                            ResponseHandler.class,
                            ReadTimeoutHandler.class,
                            WriteTimeoutHandler.class);
diff --git a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/HealthCheckedChannelPool.java b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/HealthCheckedChannelPool.java
index 8172f91a5a5b..038fcc5f83da 100644
--- a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/HealthCheckedChannelPool.java
+++ b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/HealthCheckedChannelPool.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/HonorCloseOnReleaseChannelPool.java b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/HonorCloseOnReleaseChannelPool.java
index 0d7169e8a173..6fea4f0ea068 100644
--- a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/HonorCloseOnReleaseChannelPool.java
+++ b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/HonorCloseOnReleaseChannelPool.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/Http1TunnelConnectionPool.java b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/Http1TunnelConnectionPool.java
index 1c051886090f..b2a416c0cafe 100644
--- a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/Http1TunnelConnectionPool.java
+++ b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/Http1TunnelConnectionPool.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -26,9 +26,7 @@
 import io.netty.util.AttributeKey;
 import io.netty.util.concurrent.Future;
 import io.netty.util.concurrent.Promise;
-
 import java.net.URI;
-
 import software.amazon.awssdk.annotations.SdkInternalApi;
 import software.amazon.awssdk.annotations.SdkTestInternalApi;
 import software.amazon.awssdk.utils.Logger;
diff --git a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/IdleConnectionReaperHandler.java b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/IdleConnectionReaperHandler.java
index 7d9ec1805975..f70fd291740e 100644
--- a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/IdleConnectionReaperHandler.java
+++ b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/IdleConnectionReaperHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/LastHttpContentHandler.java b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/LastHttpContentHandler.java
index 91c00a3f5d65..4dd1cf822c0b 100644
--- a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/LastHttpContentHandler.java
+++ b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/LastHttpContentHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/LastHttpContentSwallower.java b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/LastHttpContentSwallower.java
index e2c777db8616..60c6ab14a419 100644
--- a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/LastHttpContentSwallower.java
+++ b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/LastHttpContentSwallower.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/NettyConfiguration.java b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/NettyConfiguration.java
index f1d85976fef7..f8abcf11329f 100644
--- a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/NettyConfiguration.java
+++ b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/NettyConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -25,6 +25,7 @@
 import software.amazon.awssdk.annotations.SdkInternalApi;
 import software.amazon.awssdk.http.SdkHttpConfigurationOption;
 import software.amazon.awssdk.http.TlsKeyManagersProvider;
+import software.amazon.awssdk.http.TlsTrustManagersProvider;
 import software.amazon.awssdk.utils.AttributeMap;
 
 /**
@@ -37,6 +38,7 @@ public final class NettyConfiguration {
     public static final int EVENTLOOP_SHUTDOWN_QUIET_PERIOD_SECONDS = 2;
     public static final int EVENTLOOP_SHUTDOWN_TIMEOUT_SECONDS = 15;
     public static final int EVENTLOOP_SHUTDOWN_FUTURE_TIMEOUT_SECONDS = 16;
+    public static final int HTTP2_CONNECTION_PING_TIMEOUT_SECONDS = 5;
 
     private final AttributeMap configuration;
 
@@ -64,10 +66,6 @@ public int maxPendingConnectionAcquires() {
         return configuration.get(MAX_PENDING_CONNECTION_ACQUIRES);
     }
 
-    public boolean trustAllCertificates() {
-        return configuration.get(TRUST_ALL_CERTIFICATES);
-    }
-
     public int readTimeoutMillis() {
         return saturatedCast(configuration.get(SdkHttpConfigurationOption.READ_TIMEOUT).toMillis());
     }
@@ -91,4 +89,12 @@ public boolean reapIdleConnections() {
     public TlsKeyManagersProvider tlsKeyManagersProvider() {
         return configuration.get(SdkHttpConfigurationOption.TLS_KEY_MANAGERS_PROVIDER);
     }
+
+    public TlsTrustManagersProvider tlsTrustManagersProvider() {
+        return configuration.get(SdkHttpConfigurationOption.TLS_TRUST_MANAGERS_PROVIDER);
+    }
+
+    public boolean trustAllCertificates() {
+        return configuration.get(TRUST_ALL_CERTIFICATES);
+    }
 }
diff --git a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/NettyRequestExecutor.java b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/NettyRequestExecutor.java
index c0e83302eaab..64d1c152f3a4 100644
--- a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/NettyRequestExecutor.java
+++ b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/NettyRequestExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -15,8 +15,6 @@
 
 package software.amazon.awssdk.http.nio.netty.internal;
 
-import static software.amazon.awssdk.http.Protocol.HTTP1_1;
-import static software.amazon.awssdk.http.Protocol.HTTP2;
 import static software.amazon.awssdk.http.nio.netty.internal.ChannelAttributeKey.EXECUTE_FUTURE_KEY;
 import static software.amazon.awssdk.http.nio.netty.internal.ChannelAttributeKey.EXECUTION_ID_KEY;
 import static software.amazon.awssdk.http.nio.netty.internal.ChannelAttributeKey.IN_USE;
@@ -25,8 +23,6 @@
 import static software.amazon.awssdk.http.nio.netty.internal.ChannelAttributeKey.REQUEST_CONTEXT_KEY;
 import static software.amazon.awssdk.http.nio.netty.internal.ChannelAttributeKey.RESPONSE_COMPLETE_KEY;
 
-import com.typesafe.netty.http.HttpStreamsClientHandler;
-import com.typesafe.netty.http.StreamedHttpRequest;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.channel.Channel;
@@ -57,7 +53,6 @@
 import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.Supplier;
-
 import org.reactivestreams.Publisher;
 import org.reactivestreams.Subscriber;
 import org.reactivestreams.Subscription;
@@ -65,19 +60,25 @@
 import org.slf4j.LoggerFactory;
 import software.amazon.awssdk.annotations.SdkInternalApi;
 import software.amazon.awssdk.http.Protocol;
+import software.amazon.awssdk.http.nio.netty.internal.http2.FlushOnReadHandler;
+import software.amazon.awssdk.http.nio.netty.internal.http2.Http2StreamExceptionHandler;
 import software.amazon.awssdk.http.nio.netty.internal.http2.Http2ToHttpInboundAdapter;
 import software.amazon.awssdk.http.nio.netty.internal.http2.HttpToHttp2OutboundAdapter;
+import software.amazon.awssdk.http.nio.netty.internal.nrs.HttpStreamsClientHandler;
+import software.amazon.awssdk.http.nio.netty.internal.nrs.StreamedHttpRequest;
 import software.amazon.awssdk.http.nio.netty.internal.utils.ChannelUtils;
 
 @SdkInternalApi
 public final class NettyRequestExecutor {
     private static final Logger log = LoggerFactory.getLogger(NettyRequestExecutor.class);
-    private static final RequestAdapter REQUEST_ADAPTER = new RequestAdapter();
+    private static final RequestAdapter REQUEST_ADAPTER_HTTP2 = new RequestAdapter(Protocol.HTTP2);
+    private static final RequestAdapter REQUEST_ADAPTER_HTTP1_1 = new RequestAdapter(Protocol.HTTP1_1);
     private static final AtomicLong EXECUTION_COUNTER = new AtomicLong(0L);
     private final long executionId = EXECUTION_COUNTER.incrementAndGet();
     private final RequestContext context;
     private CompletableFuture<Void> executeFuture;
     private Channel channel;
+    private RequestAdapter requestAdapter;
 
     public NettyRequestExecutor(RequestContext context) {
         this.context = context;
@@ -155,17 +156,28 @@ private void configureChannel() {
     private boolean tryConfigurePipeline() {
         Protocol protocol = ChannelAttributeKey.getProtocolNow(channel);
         ChannelPipeline pipeline = channel.pipeline();
-        if (HTTP2.equals(protocol)) {
-            pipeline.addLast(new Http2ToHttpInboundAdapter());
-            pipeline.addLast(new HttpToHttp2OutboundAdapter());
-        } else if (!HTTP1_1.equals(protocol)) {
-            String errorMsg = "Unknown protocol: " + protocol;
-            closeAndRelease(channel);
-            handleFailure(() -> errorMsg, new RuntimeException(errorMsg));
-            return false;
+
+        switch (protocol) {
+            case HTTP2:
+                pipeline.addLast(new Http2ToHttpInboundAdapter());
+                pipeline.addLast(new HttpToHttp2OutboundAdapter());
+                pipeline.addLast(Http2StreamExceptionHandler.create());
+                requestAdapter = REQUEST_ADAPTER_HTTP2;
+                break;
+            case HTTP1_1:
+                requestAdapter = REQUEST_ADAPTER_HTTP1_1;
+                break;
+            default:
+                String errorMsg = "Unknown protocol: " + protocol;
+                closeAndRelease(channel);
+                handleFailure(() -> errorMsg, new RuntimeException(errorMsg));
+                return false;
         }
 
         pipeline.addLast(LastHttpContentHandler.create());
+        if (Protocol.HTTP2.equals(protocol)) {
+            pipeline.addLast(FlushOnReadHandler.getInstance());
+        }
         pipeline.addLast(new HttpStreamsClientHandler());
         pipeline.addLast(ResponseHandler.getInstance());
 
@@ -183,7 +195,7 @@ private boolean tryConfigurePipeline() {
     }
 
     private void makeRequest() {
-        HttpRequest request = REQUEST_ADAPTER.adapt(context.executeRequest().request());
+        HttpRequest request = requestAdapter.adapt(context.executeRequest().request());
         writeRequest(request);
     }
 
diff --git a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/NonManagedEventLoopGroup.java b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/NonManagedEventLoopGroup.java
index ba9ceb7fd8d7..518e8f7bbbce 100644
--- a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/NonManagedEventLoopGroup.java
+++ b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/NonManagedEventLoopGroup.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/OldConnectionReaperHandler.java b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/OldConnectionReaperHandler.java
index 9457396c75eb..1625a8b1132a 100644
--- a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/OldConnectionReaperHandler.java
+++ b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/OldConnectionReaperHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/OneTimeReadTimeoutHandler.java b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/OneTimeReadTimeoutHandler.java
index caded88dcbd5..1bd9bf970249 100644
--- a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/OneTimeReadTimeoutHandler.java
+++ b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/OneTimeReadTimeoutHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/ProxyTunnelInitHandler.java b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/ProxyTunnelInitHandler.java
index ff82a10ff584..433d1c8a3444 100644
--- a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/ProxyTunnelInitHandler.java
+++ b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/ProxyTunnelInitHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/ReleaseOnceChannelPool.java b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/ReleaseOnceChannelPool.java
index 196329a61929..e0fb07427704 100644
--- a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/ReleaseOnceChannelPool.java
+++ b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/ReleaseOnceChannelPool.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/RequestAdapter.java b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/RequestAdapter.java
index 628184d8921a..c4fc63af918f 100644
--- a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/RequestAdapter.java
+++ b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/RequestAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -21,23 +21,82 @@
 import io.netty.handler.codec.http.HttpMethod;
 import io.netty.handler.codec.http.HttpRequest;
 import io.netty.handler.codec.http.HttpVersion;
+import io.netty.handler.codec.http2.HttpConversionUtil.ExtensionHeaderNames;
+import java.util.Collections;
+import java.util.List;
 import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.http.Protocol;
 import software.amazon.awssdk.http.SdkHttpMethod;
 import software.amazon.awssdk.http.SdkHttpRequest;
+import software.amazon.awssdk.utils.StringUtils;
+import software.amazon.awssdk.utils.Validate;
+import software.amazon.awssdk.utils.http.SdkHttpUtils;
 
 @SdkInternalApi
 public final class RequestAdapter {
 
+    private static final String HOST = "Host";
+    private static final List<String> IGNORE_HEADERS = Collections.singletonList(HOST);
+
+    private final Protocol protocol;
+
+    public RequestAdapter(Protocol protocol) {
+        this.protocol = Validate.paramNotNull(protocol, "protocol");
+    }
+
     public HttpRequest adapt(SdkHttpRequest sdkRequest) {
         HttpMethod method = toNettyHttpMethod(sdkRequest.method());
         HttpHeaders headers = new DefaultHttpHeaders();
-        String uri = sdkRequest.getUri().toString();
+        String uri = encodedPathAndQueryParams(sdkRequest);
+        // All requests start out as HTTP/1.1 objects, even if they will
+        // ultimately be sent over HTTP2. Conversion to H2 is handled at a
+        // later stage if necessary; see HttpToHttp2OutboundAdapter.
         DefaultHttpRequest request = new DefaultHttpRequest(HttpVersion.HTTP_1_1, method, uri, headers);
-        sdkRequest.headers().forEach(request.headers()::add);
+        addHeadersToRequest(request, sdkRequest);
         return request;
     }
 
     private static HttpMethod toNettyHttpMethod(SdkHttpMethod method) {
         return HttpMethod.valueOf(method.name());
     }
+
+    private static String encodedPathAndQueryParams(SdkHttpRequest sdkRequest) {
+        String encodedPath = sdkRequest.encodedPath();
+        if (StringUtils.isBlank(encodedPath)) {
+            encodedPath = "/";
+        }
+
+        String encodedQueryParams = SdkHttpUtils.encodeAndFlattenQueryParameters(sdkRequest.rawQueryParameters())
+                .map(queryParams -> "?" + queryParams)
+                .orElse("");
+
+        return encodedPath + encodedQueryParams;
+    }
+
+    /**
+     * Configures the headers in the specified Netty HTTP request.
+     */
+    private void addHeadersToRequest(DefaultHttpRequest httpRequest, SdkHttpRequest request) {
+        httpRequest.headers().add(HOST, getHostHeaderValue(request));
+
+        String scheme = request.getUri().getScheme();
+        if (Protocol.HTTP2 == protocol && !StringUtils.isBlank(scheme)) {
+            httpRequest.headers().add(ExtensionHeaderNames.SCHEME.text(), scheme);
+        }
+
+        // Copy over any other headers already in our request
+        request.headers().entrySet().stream()
+                /*
+                 * Skip the Host header to avoid sending it twice, which will
+                 * interfere with some signing schemes.
+                 */
+                .filter(e -> !IGNORE_HEADERS.contains(e.getKey()))
+                .forEach(e -> e.getValue().forEach(h -> httpRequest.headers().add(e.getKey(), h)));
+    }
+
+    private String getHostHeaderValue(SdkHttpRequest request) {
+        return SdkHttpUtils.isUsingStandardPort(request.protocol(), request.port())
+                ? request.host()
+                : request.host() + ":" + request.port();
+    }
 }
diff --git a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/RequestContext.java b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/RequestContext.java
index e97bbe7f1728..356703778939 100644
--- a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/RequestContext.java
+++ b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/RequestContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/ResponseHandler.java b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/ResponseHandler.java
index 8fa2933230e6..3c66a69253a2 100644
--- a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/ResponseHandler.java
+++ b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/ResponseHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -25,8 +25,6 @@
 import static software.amazon.awssdk.http.nio.netty.internal.utils.ExceptionHandlingUtils.tryCatch;
 import static software.amazon.awssdk.http.nio.netty.internal.utils.ExceptionHandlingUtils.tryCatchFinally;
 
-import com.typesafe.netty.http.HttpStreamsClientHandler;
-import com.typesafe.netty.http.StreamedHttpResponse;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelHandler.Sharable;
@@ -60,6 +58,8 @@
 import software.amazon.awssdk.http.SdkHttpResponse;
 import software.amazon.awssdk.http.async.SdkAsyncHttpResponseHandler;
 import software.amazon.awssdk.http.nio.netty.internal.http2.Http2ResetSendingSubscription;
+import software.amazon.awssdk.http.nio.netty.internal.nrs.HttpStreamsClientHandler;
+import software.amazon.awssdk.http.nio.netty.internal.nrs.StreamedHttpResponse;
 import software.amazon.awssdk.utils.FunctionalUtils.UnsafeRunnable;
 import software.amazon.awssdk.utils.async.DelegatingSubscription;
 
@@ -382,11 +382,11 @@ private Throwable wrapException(Throwable originalCause) {
 
     private void notifyIfResponseNotCompleted(ChannelHandlerContext handlerCtx) {
         RequestContext requestCtx = handlerCtx.channel().attr(REQUEST_CONTEXT_KEY).get();
-        boolean responseCompleted = handlerCtx.channel().attr(RESPONSE_COMPLETE_KEY).get();
-        boolean lastHttpContentReceived = handlerCtx.channel().attr(LAST_HTTP_CONTENT_RECEIVED_KEY).get();
+        Boolean responseCompleted = handlerCtx.channel().attr(RESPONSE_COMPLETE_KEY).get();
+        Boolean lastHttpContentReceived = handlerCtx.channel().attr(LAST_HTTP_CONTENT_RECEIVED_KEY).get();
         handlerCtx.channel().attr(KEEP_ALIVE).set(false);
 
-        if (!responseCompleted && !lastHttpContentReceived) {
+        if (!Boolean.TRUE.equals(responseCompleted) && !Boolean.TRUE.equals(lastHttpContentReceived)) {
             IOException err = new IOException("Server failed to send complete response");
             runAndLogError("Fail to execute SdkAsyncHttpResponseHandler#onError", () -> requestCtx.handler().onError(err));
             executeFuture(handlerCtx).completeExceptionally(err);
diff --git a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/SdkChannelOptions.java b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/SdkChannelOptions.java
index 9cca922b62bb..5c8f21e19e1b 100644
--- a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/SdkChannelOptions.java
+++ b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/SdkChannelOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/SdkChannelPoolMap.java b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/SdkChannelPoolMap.java
index 102ccc11c685..9d1c0163044e 100644
--- a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/SdkChannelPoolMap.java
+++ b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/SdkChannelPoolMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/SharedSdkEventLoopGroup.java b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/SharedSdkEventLoopGroup.java
index 9259f418f183..f316b77f3d8b 100644
--- a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/SharedSdkEventLoopGroup.java
+++ b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/SharedSdkEventLoopGroup.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/SimpleChannelPoolAwareChannelPool.java b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/SimpleChannelPoolAwareChannelPool.java
index c8a231b07258..dd9778521321 100644
--- a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/SimpleChannelPoolAwareChannelPool.java
+++ b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/SimpleChannelPoolAwareChannelPool.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/SslCloseCompletionEventHandler.java b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/SslCloseCompletionEventHandler.java
index ce59eea73565..2a7f861fb661 100644
--- a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/SslCloseCompletionEventHandler.java
+++ b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/SslCloseCompletionEventHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/StaticKeyManagerFactory.java b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/StaticKeyManagerFactory.java
index b628139b1ec5..2aa2a2da9f71 100644
--- a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/StaticKeyManagerFactory.java
+++ b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/StaticKeyManagerFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/StaticKeyManagerFactorySpi.java b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/StaticKeyManagerFactorySpi.java
index d27fa2dfe35a..19c7b85cde6c 100644
--- a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/StaticKeyManagerFactorySpi.java
+++ b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/StaticKeyManagerFactorySpi.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/StaticTrustManagerFactory.java b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/StaticTrustManagerFactory.java
new file mode 100644
index 000000000000..2da51afcd594
--- /dev/null
+++ b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/StaticTrustManagerFactory.java
@@ -0,0 +1,49 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.http.nio.netty.internal;
+
+import io.netty.handler.ssl.util.SimpleTrustManagerFactory;
+import java.security.KeyStore;
+import javax.net.ssl.ManagerFactoryParameters;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.TrustManagerFactory;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+
+@SdkInternalApi
+public final class StaticTrustManagerFactory extends SimpleTrustManagerFactory {
+    private final TrustManager[] trustManagers;
+
+    private StaticTrustManagerFactory(TrustManager[] trustManagers) {
+        this.trustManagers = trustManagers;
+    }
+
+    @Override
+    protected void engineInit(KeyStore keyStore) {
+    }
+
+    @Override
+    protected void engineInit(ManagerFactoryParameters managerFactoryParameters) {
+    }
+
+    @Override
+    protected TrustManager[] engineGetTrustManagers() {
+        return trustManagers;
+    }
+
+    public static TrustManagerFactory create(TrustManager[] trustManagers) {
+        return new StaticTrustManagerFactory(trustManagers);
+    }
+}
diff --git a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/UnusedChannelExceptionHandler.java b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/UnusedChannelExceptionHandler.java
index 7f122a2bd5d5..b4559880ad0b 100644
--- a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/UnusedChannelExceptionHandler.java
+++ b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/UnusedChannelExceptionHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -18,8 +18,8 @@
 import static software.amazon.awssdk.http.nio.netty.internal.utils.ChannelUtils.getAttribute;
 
 import io.netty.channel.ChannelHandler;
-import io.netty.channel.ChannelHandlerAdapter;
 import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelInboundHandlerAdapter;
 import io.netty.handler.timeout.TimeoutException;
 import java.io.IOException;
 import java.util.Optional;
@@ -36,7 +36,7 @@
  */
 @SdkInternalApi
 @ChannelHandler.Sharable
-public final class UnusedChannelExceptionHandler extends ChannelHandlerAdapter {
+public final class UnusedChannelExceptionHandler extends ChannelInboundHandlerAdapter {
     public static final UnusedChannelExceptionHandler INSTANCE = new UnusedChannelExceptionHandler();
 
     private static final Logger log = Logger.loggerFor(UnusedChannelExceptionHandler.class);
diff --git a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/http2/FlushOnReadHandler.java b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/http2/FlushOnReadHandler.java
new file mode 100644
index 000000000000..3cdd06c0c2a5
--- /dev/null
+++ b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/http2/FlushOnReadHandler.java
@@ -0,0 +1,47 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.http.nio.netty.internal.http2;
+
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelOutboundHandlerAdapter;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+
+/**
+ * This is an HTTP/2 related workaround for an issue where a WINDOW_UPDATE is
+ * queued but not written to the socket, causing a read() on the channel to
+ * hang if the remote endpoint thinks our inbound window is 0.
+ */
+@SdkInternalApi
+@ChannelHandler.Sharable
+public final class FlushOnReadHandler extends ChannelOutboundHandlerAdapter {
+    private static final FlushOnReadHandler INSTANCE = new FlushOnReadHandler();
+
+    private FlushOnReadHandler() {
+    }
+
+    @Override
+    public void read(ChannelHandlerContext ctx) {
+        //Note: order is important, we need to fire the read() event first
+        // since it's what triggers the WINDOW_UPDATE frame write
+        ctx.read();
+        ctx.channel().parent().flush();
+    }
+
+    public static FlushOnReadHandler getInstance() {
+        return INSTANCE;
+    }
+}
diff --git a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/http2/GoAwayException.java b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/http2/GoAwayException.java
index caa03144ec80..bc9719b3ef38 100644
--- a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/http2/GoAwayException.java
+++ b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/http2/GoAwayException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -24,11 +24,12 @@
  * Exception thrown when a GOAWAY frame is sent by the service.
  */
 @SdkInternalApi
-class GoAwayException extends IOException {
+public class GoAwayException extends IOException {
     private final String message;
 
     GoAwayException(long errorCode, ByteBuf debugData) {
-        this.message = String.format("GOAWAY received. Error Code = %d, Debug Data = %s",
+        this.message = String.format("GOAWAY received from service, requesting this stream be closed. "
+                                     + "Error Code = %d, Debug Data = %s",
                                      errorCode, debugData.toString(StandardCharsets.UTF_8));
     }
 
diff --git a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/http2/Http2GoAwayEventListener.java b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/http2/Http2GoAwayEventListener.java
new file mode 100644
index 000000000000..bb67346a25ea
--- /dev/null
+++ b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/http2/Http2GoAwayEventListener.java
@@ -0,0 +1,53 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.http.nio.netty.internal.http2;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.Channel;
+import io.netty.handler.codec.http2.Http2ConnectionAdapter;
+import io.netty.handler.codec.http2.Http2GoAwayFrame;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.http.nio.netty.internal.ChannelAttributeKey;
+import software.amazon.awssdk.utils.Logger;
+
+/**
+ * Handles {@link Http2GoAwayFrame}s sent on a connection. This will pass the frame along to the connection's 
+ * {@link Http2MultiplexedChannelPool#handleGoAway(Channel, int, GoAwayException)}.
+ */
+@SdkInternalApi
+public final class Http2GoAwayEventListener extends Http2ConnectionAdapter {
+    private static final Logger log = Logger.loggerFor(Http2GoAwayEventListener.class);
+
+    private final Channel parentChannel;
+
+    public Http2GoAwayEventListener(Channel parentChannel) {
+        this.parentChannel = parentChannel;
+    }
+
+
+    @Override
+    public void onGoAwayReceived(int lastStreamId, long errorCode, ByteBuf debugData) {
+        Http2MultiplexedChannelPool channelPool = parentChannel.attr(ChannelAttributeKey.HTTP2_MULTIPLEXED_CHANNEL_POOL).get();
+        GoAwayException exception = new GoAwayException(errorCode, debugData.retain());
+        if (channelPool != null) {
+            channelPool.handleGoAway(parentChannel, lastStreamId, exception);
+        } else {
+            log.warn(() -> "GOAWAY received on a connection (" + parentChannel + ") not associated with any multiplexed "
+                           + "channel pool.");
+            parentChannel.pipeline().fireExceptionCaught(exception);
+        }
+    }
+}
diff --git a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/http2/Http2GoAwayFrameHandler.java b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/http2/Http2GoAwayFrameHandler.java
deleted file mode 100644
index 05d7f5e30800..000000000000
--- a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/http2/Http2GoAwayFrameHandler.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.http.nio.netty.internal.http2;
-
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.SimpleChannelInboundHandler;
-import io.netty.handler.codec.http2.Http2GoAwayFrame;
-import software.amazon.awssdk.annotations.SdkInternalApi;
-import software.amazon.awssdk.http.nio.netty.internal.ChannelAttributeKey;
-
-/**
- * Handles {@link Http2GoAwayFrame}s sent on a connection. This will pass the frame along to the connection's 
- * {@link MultiplexedChannelRecord#goAway(Http2GoAwayFrame)} method.
- */
-@SdkInternalApi
-public class Http2GoAwayFrameHandler extends SimpleChannelInboundHandler<Http2GoAwayFrame> {
-    @Override
-    protected void channelRead0(ChannelHandlerContext ctx, Http2GoAwayFrame frame)
-    {
-        MultiplexedChannelRecord parentConnection = ctx.channel().attr(ChannelAttributeKey.CHANNEL_POOL_RECORD).get();
-        if (parentConnection != null) {
-            parentConnection.goAway(frame);
-        }
-    }
-}
diff --git a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/http2/Http2MultiplexedChannelPool.java b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/http2/Http2MultiplexedChannelPool.java
index 49b42087654b..0b720f52170b 100644
--- a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/http2/Http2MultiplexedChannelPool.java
+++ b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/http2/Http2MultiplexedChannelPool.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -15,22 +15,43 @@
 
 package software.amazon.awssdk.http.nio.netty.internal.http2;
 
-import static software.amazon.awssdk.http.nio.netty.internal.ChannelAttributeKey.CHANNEL_POOL_RECORD;
+import static software.amazon.awssdk.http.nio.netty.internal.ChannelAttributeKey.HTTP2_CONNECTION;
+import static software.amazon.awssdk.http.nio.netty.internal.ChannelAttributeKey.HTTP2_INITIAL_WINDOW_SIZE;
+import static software.amazon.awssdk.http.nio.netty.internal.ChannelAttributeKey.MAX_CONCURRENT_STREAMS;
 import static software.amazon.awssdk.http.nio.netty.internal.utils.NettyUtils.doInEventLoop;
 
 import io.netty.channel.Channel;
+import io.netty.channel.ChannelDuplexHandler;
+import io.netty.channel.ChannelHandler.Sharable;
+import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.EventLoop;
+import io.netty.channel.EventLoopGroup;
 import io.netty.channel.pool.ChannelPool;
+import io.netty.handler.codec.http2.Http2Connection;
+import io.netty.handler.codec.http2.Http2Exception;
+import io.netty.handler.codec.http2.Http2LocalFlowController;
+import io.netty.handler.codec.http2.Http2Stream;
 import io.netty.handler.codec.http2.Http2StreamChannelBootstrap;
-import io.netty.util.concurrent.DefaultPromise;
+import io.netty.util.AttributeKey;
 import io.netty.util.concurrent.Future;
 import io.netty.util.concurrent.Promise;
+import io.netty.util.concurrent.PromiseCombiner;
+import java.io.IOException;
+import java.nio.channels.ClosedChannelException;
+import java.time.Duration;
 import java.util.ArrayList;
-import java.util.Collection;
-
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
 import software.amazon.awssdk.annotations.SdkInternalApi;
 import software.amazon.awssdk.annotations.SdkTestInternalApi;
+import software.amazon.awssdk.http.Protocol;
+import software.amazon.awssdk.http.nio.netty.internal.ChannelAttributeKey;
 import software.amazon.awssdk.http.nio.netty.internal.utils.BetterFixedChannelPool;
+import software.amazon.awssdk.utils.Logger;
+import software.amazon.awssdk.utils.Validate;
 
 /**
  * {@link ChannelPool} implementation that handles multiplexed streams. Child channels are created
@@ -46,151 +67,384 @@
  */
 @SdkInternalApi
 public class Http2MultiplexedChannelPool implements ChannelPool {
+    private static final Logger log = Logger.loggerFor(Http2MultiplexedChannelPool.class);
+
+    /**
+     * Reference to the {@link MultiplexedChannelRecord} on a channel.
+     */
+    private static final AttributeKey<MultiplexedChannelRecord> MULTIPLEXED_CHANNEL = AttributeKey.newInstance(
+        "software.amazon.awssdk.http.nio.netty.internal.http2.Http2MultiplexedChannelPool.MULTIPLEXED_CHANNEL");
+
+    /**
+     * Whether a parent channel has been released yet. This guards against double-releasing to the delegate connection pool.
+     */
+    private static final AttributeKey<Boolean> RELEASED = AttributeKey.newInstance(
+        "software.amazon.awssdk.http.nio.netty.internal.http2.Http2MultiplexedChannelPool.RELEASED");
 
-    private final EventLoop eventLoop;
     private final ChannelPool connectionPool;
-    private final long maxConcurrencyPerConnection;
-    private final ArrayList<MultiplexedChannelRecord> connections;
-    private boolean closed = false;
+    private final EventLoopGroup eventLoopGroup;
+    private final Set<MultiplexedChannelRecord> connections;
+    private final Duration idleConnectionTimeout;
+
+    private AtomicBoolean closed = new AtomicBoolean(false);
 
     /**
      * @param connectionPool Connection pool for parent channels (i.e. the socket channel).
-     * @param eventLoop Event loop to run all tasks in.
-     * @param maxConcurrencyPerConnection Max concurrent streams per HTTP/2 connection.
      */
-    Http2MultiplexedChannelPool(ChannelPool connectionPool,
-                                EventLoop eventLoop,
-                                long maxConcurrencyPerConnection) {
+    Http2MultiplexedChannelPool(ChannelPool connectionPool, EventLoopGroup eventLoopGroup, Duration idleConnectionTimeout) {
         this.connectionPool = connectionPool;
-        this.eventLoop = eventLoop;
-        this.maxConcurrencyPerConnection = maxConcurrencyPerConnection;
-        // Customers that want an unbounded connection pool may set max concurrency to something like
-        // Long.MAX_VALUE so we just stick with the initial ArrayList capacity and grow from there.
-        this.connections = new ArrayList<>();
+        this.eventLoopGroup = eventLoopGroup;
+        this.connections = ConcurrentHashMap.newKeySet();
+        this.idleConnectionTimeout = idleConnectionTimeout;
     }
 
     @SdkTestInternalApi
     Http2MultiplexedChannelPool(ChannelPool connectionPool,
-                                EventLoop eventLoop,
-                                long maxConcurrencyPerConnection,
-                                Collection<MultiplexedChannelRecord> connections) {
-        this.connectionPool = connectionPool;
-        this.eventLoop = eventLoop;
-        this.maxConcurrencyPerConnection = maxConcurrencyPerConnection;
-        this.connections = new ArrayList<>(connections);
+                                EventLoopGroup eventLoopGroup,
+                                Set<MultiplexedChannelRecord> connections,
+                                Duration idleConnectionTimeout) {
+        this(connectionPool, eventLoopGroup, idleConnectionTimeout);
+        this.connections.addAll(connections);
     }
 
     @Override
     public Future<Channel> acquire() {
-        return acquire(new DefaultPromise<>(eventLoop));
+        return acquire(eventLoopGroup.next().newPromise());
     }
 
     @Override
     public Future<Channel> acquire(Promise<Channel> promise) {
-        doInEventLoop(eventLoop, () -> acquire0(promise), promise);
-        return promise;
-    }
-
-    private Future<Channel> acquire0(Promise<Channel> promise) {
-        if (closed) {
-            return promise.setFailure(new IllegalStateException("Channel pool is closed!"));
+        if (closed.get()) {
+            return promise.setFailure(new IOException("Channel pool is closed!"));
         }
 
-        for (MultiplexedChannelRecord connection : connections) {
-            if (connection.availableStreams() > 0) {
-                connection.acquire(promise);
+        for (MultiplexedChannelRecord multiplexedChannel : connections) {
+            if (acquireStreamOnInitializedConnection(multiplexedChannel, promise)) {
                 return promise;
             }
         }
-        // No available streams, establish new connection and add it to list
-        connections.add(new MultiplexedChannelRecord(connectionPool.acquire(),
-                                                     maxConcurrencyPerConnection,
-                                                     this::releaseParentChannel)
-                            .acquire(promise));
+
+        // No available streams on existing connections, establish new connection and add it to list
+        acquireStreamOnNewConnection(promise);
         return promise;
     }
 
+    private void acquireStreamOnNewConnection(Promise<Channel> promise) {
+        Future<Channel> newConnectionAcquire = connectionPool.acquire();
+
+        newConnectionAcquire.addListener(f -> {
+            if (!newConnectionAcquire.isSuccess()) {
+                promise.setFailure(newConnectionAcquire.cause());
+                return;
+            }
+
+            Channel parentChannel = newConnectionAcquire.getNow();
+            try {
+                parentChannel.attr(ChannelAttributeKey.HTTP2_MULTIPLEXED_CHANNEL_POOL).set(this);
+
+                // When the protocol future is completed on the new connection, we're ready for new streams to be added to it.
+                parentChannel.attr(ChannelAttributeKey.PROTOCOL_FUTURE).get()
+                             .thenAccept(protocol -> acquireStreamOnFreshConnection(promise, parentChannel, protocol))
+                             .exceptionally(throwable -> failAndCloseParent(promise, parentChannel, throwable));
+            } catch (Throwable e) {
+                failAndCloseParent(promise, parentChannel, e);
+            }
+        });
+    }
+
+    private void acquireStreamOnFreshConnection(Promise<Channel> promise, Channel parentChannel, Protocol protocol) {
+        try {
+            Long maxStreams = parentChannel.attr(MAX_CONCURRENT_STREAMS).get();
+
+            Validate.isTrue(protocol == Protocol.HTTP2,
+                            "Protocol negotiated on connection (%s) was expected to be HTTP/2, but it "
+                            + "was %s.", parentChannel, Protocol.HTTP1_1);
+            Validate.isTrue(maxStreams != null,
+                            "HTTP/2 was negotiated on the connection (%s), but the maximum number of "
+                            + "streams was not initialized.", parentChannel);
+            Validate.isTrue(maxStreams > 0, "Maximum streams were not positive on channel (%s).", parentChannel);
+
+            MultiplexedChannelRecord multiplexedChannel = new MultiplexedChannelRecord(parentChannel, maxStreams,
+                                                                                       idleConnectionTimeout);
+            parentChannel.attr(MULTIPLEXED_CHANNEL).set(multiplexedChannel);
+
+            Promise<Channel> streamPromise = parentChannel.eventLoop().newPromise();
+
+            if (!acquireStreamOnInitializedConnection(multiplexedChannel, streamPromise)) {
+                failAndCloseParent(promise, parentChannel,
+                                   new IOException("Connection was closed while creating a new stream."));
+                return;
+            }
+
+            streamPromise.addListener(f -> {
+                if (!streamPromise.isSuccess()) {
+                    promise.setFailure(streamPromise.cause());
+                    return;
+                }
+
+                Channel stream = streamPromise.getNow();
+                cacheConnectionForFutureStreams(stream, multiplexedChannel, promise);
+            });
+        } catch (Throwable e) {
+            failAndCloseParent(promise, parentChannel, e);
+        }
+    }
+
+    private void cacheConnectionForFutureStreams(Channel stream,
+                                                 MultiplexedChannelRecord multiplexedChannel,
+                                                 Promise<Channel> promise) {
+        Channel parentChannel = stream.parent();
+
+        // Before we cache the connection, make sure that exceptions on the connection will remove it from the cache.
+        parentChannel.pipeline().addLast(ReleaseOnExceptionHandler.INSTANCE);
+        connections.add(multiplexedChannel);
+
+        if (closed.get()) {
+            // Whoops, we were closed while we were setting up. Make sure everything here is cleaned up properly.
+            failAndCloseParent(promise, parentChannel,
+                               new IOException("Connection pool was closed while creating a new stream."));
+            return;
+        }
+
+        promise.setSuccess(stream);
+    }
+
     /**
-     * Releases parent channel on failure and cleans up record from connections list.
-     *
-     * @param parentChannel Channel to release. May be null if no channel is established.
-     * @param record Record to cleanup.
+     * By default, connection window size is a constant value:
+     * connectionWindowSize = 65535 + (configureInitialWindowSize - 65535) * 2.
+     * See https://github.com/netty/netty/blob/5c458c9a98d4d3d0345e58495e017175156d624f/codec-http2/src/main/java/io/netty
+     * /handler/codec/http2/Http2FrameCodec.java#L255
+     * We should expand connection window so that the window size proportional to the number of concurrent streams within the
+     * connection.
+     * Note that when {@code WINDOW_UPDATE} will be sent depends on the processedWindow in DefaultHttp2LocalFlowController.
      */
-    private void releaseParentChannel(Channel parentChannel, MultiplexedChannelRecord record) {
-        doInEventLoop(eventLoop, () -> releaseParentChannel0(parentChannel, record));
-    }
+    private void tryExpandConnectionWindow(Channel parentChannel) {
+        doInEventLoop(parentChannel.eventLoop(), () -> {
+            Http2Connection http2Connection = parentChannel.attr(HTTP2_CONNECTION).get();
+            Integer initialWindowSize = parentChannel.attr(HTTP2_INITIAL_WINDOW_SIZE).get();
+
+            Validate.notNull(http2Connection, "http2Connection should not be null on channel " + parentChannel);
+            Validate.notNull(http2Connection, "initialWindowSize should not be null on channel " + parentChannel);
 
-    private void releaseParentChannel0(Channel parentChannel, MultiplexedChannelRecord record) {
-        if (parentChannel != null) {
+            Http2Stream connectionStream = http2Connection.connectionStream();
+            log.debug(() -> "Expanding connection window size for " + parentChannel + " by " + initialWindowSize);
             try {
-                parentChannel.close();
-            } finally {
-                connectionPool.release(parentChannel);
+                Http2LocalFlowController localFlowController = http2Connection.local().flowController();
+                localFlowController.incrementWindowSize(connectionStream, initialWindowSize);
+
+            } catch (Http2Exception e) {
+                log.warn(() -> "Failed to increment windowSize of connection " + parentChannel, e);
             }
+        });
+    }
+
+    private Void failAndCloseParent(Promise<Channel> promise, Channel parentChannel, Throwable exception) {
+        log.debug(() -> "Channel acquiring failed, closing connection " + parentChannel, exception);
+        promise.setFailure(exception);
+        closeAndReleaseParent(parentChannel);
+        return null;
+    }
+
+    /**
+     * Acquire a stream on a connection that has already been initialized. This will return false if the connection cannot have
+     * any more streams allocated, and true if the stream can be allocated.
+     *
+     * This will NEVER complete the provided future when the return value is false. This will ALWAYS complete the provided
+     * future when the return value is true.
+     */
+    private boolean acquireStreamOnInitializedConnection(MultiplexedChannelRecord channelRecord, Promise<Channel> promise) {
+        Promise<Channel> acquirePromise = channelRecord.getConnection().eventLoop().newPromise();
+
+        if (!channelRecord.acquireStream(acquirePromise)) {
+            return false;
         }
-        connections.remove(record);
+
+        acquirePromise.addListener(f -> {
+            try {
+                if (!acquirePromise.isSuccess()) {
+                    promise.setFailure(acquirePromise.cause());
+                    return;
+                }
+
+                Channel channel = acquirePromise.getNow();
+                channel.attr(ChannelAttributeKey.HTTP2_MULTIPLEXED_CHANNEL_POOL).set(this);
+                channel.attr(MULTIPLEXED_CHANNEL).set(channelRecord);
+                promise.setSuccess(channel);
+
+                tryExpandConnectionWindow(channel.parent());
+            } catch (Exception e) {
+                promise.setFailure(e);
+            }
+        });
+
+        return true;
     }
 
     @Override
     public Future<Void> release(Channel childChannel) {
-        return release(childChannel, new DefaultPromise<>(eventLoop));
+        return release(childChannel, childChannel.eventLoop().newPromise());
     }
 
     @Override
-    public Future<Void> release(Channel channel, Promise<Void> promise) {
-        doInEventLoop(eventLoop, () -> release0(channel, promise), promise);
-        return promise;
+    public Future<Void> release(Channel childChannel, Promise<Void> promise) {
+        if (childChannel.parent() == null) {
+            // This isn't a child channel. Oddly enough, this is "expected" and is handled properly by the
+            // BetterFixedChannelPool AS LONG AS we return an IllegalArgumentException via the promise.
+            closeAndReleaseParent(childChannel);
+            return promise.setFailure(new IllegalArgumentException("Channel (" + childChannel + ") is not a child channel."));
+        }
+
+        Channel parentChannel = childChannel.parent();
+        MultiplexedChannelRecord multiplexedChannel = parentChannel.attr(MULTIPLEXED_CHANNEL).get();
+        if (multiplexedChannel == null) {
+            // This is a child channel, but there is no attached multiplexed channel, which there should be if it was from
+            // this pool. Close it and log an error.
+            Exception exception = new IOException("Channel (" + childChannel + ") is not associated with any channel records. "
+                                                  + "It will be closed, but cannot be released within this pool.");
+            log.error(exception::getMessage);
+            childChannel.close();
+            return promise.setFailure(exception);
+        }
+
+        multiplexedChannel.closeAndReleaseChild(childChannel);
+
+        if (multiplexedChannel.canBeClosedAndReleased()) {
+            // We just closed the last stream in a connection that has reached the end of its life.
+            return closeAndReleaseParent(parentChannel, null, promise);
+        }
+
+        return promise.setSuccess(null);
     }
 
-    private void release0(Channel channel, Promise<Void> promise) {
-        if (channel.parent() == null) {
-            // This is the socket channel, close and release from underlying connection pool
-            try {
-                releaseParentChannel(channel);
-            } finally {
-                // This channel doesn't technically belong to this pool as it was never acquired directly
-                promise.setFailure(new IllegalArgumentException("Channel does not belong to this pool"));
+    private Future<Void> closeAndReleaseParent(Channel parentChannel) {
+        return closeAndReleaseParent(parentChannel, null, parentChannel.eventLoop().newPromise());
+    }
+
+    private Future<Void> closeAndReleaseParent(Channel parentChannel, Throwable cause) {
+        return closeAndReleaseParent(parentChannel, cause, parentChannel.eventLoop().newPromise());
+    }
+
+    private Future<Void> closeAndReleaseParent(Channel parentChannel, Throwable cause, Promise<Void> resultPromise) {
+        if (parentChannel.parent() != null) {
+            // This isn't a parent channel. Notify it that something is wrong.
+            Exception exception = new IOException("Channel (" + parentChannel + ") is not a parent channel. It will be closed, "
+                                                  + "but cannot be released within this pool.");
+            log.error(exception::getMessage);
+            parentChannel.close();
+            return resultPromise.setFailure(exception);
+        }
+
+        MultiplexedChannelRecord multiplexedChannel = parentChannel.attr(MULTIPLEXED_CHANNEL).get();
+
+        // We may not have a multiplexed channel if the parent channel hasn't been fully initialized.
+        if (multiplexedChannel != null) {
+            if (cause == null) {
+                multiplexedChannel.closeChildChannels();
+            } else {
+                multiplexedChannel.closeChildChannels(cause);
             }
-        } else {
-            Channel parentChannel = channel.parent();
-            MultiplexedChannelRecord channelRecord = parentChannel.attr(CHANNEL_POOL_RECORD).get();
-            channelRecord.release(channel);
-            channel.close();
-            promise.setSuccess(null);
+            connections.remove(multiplexedChannel);
         }
-    }
 
-    private void releaseParentChannel(Channel parentChannel) {
-        MultiplexedChannelRecord channelRecord = parentChannel.attr(CHANNEL_POOL_RECORD).get();
-        connections.remove(channelRecord);
         parentChannel.close();
-        connectionPool.release(parentChannel);
+        if (parentChannel.attr(RELEASED).getAndSet(Boolean.TRUE) == null) {
+            return connectionPool.release(parentChannel, resultPromise);
+        }
+
+        return resultPromise.setSuccess(null);
+    }
+
+    void handleGoAway(Channel parentChannel, int lastStreamId, GoAwayException exception) {
+        log.debug(() -> "Received GOAWAY on " + parentChannel + " with lastStreamId of " + lastStreamId);
+        try {
+            MultiplexedChannelRecord multiplexedChannel = parentChannel.attr(MULTIPLEXED_CHANNEL).get();
+
+            if (multiplexedChannel != null) {
+                multiplexedChannel.handleGoAway(lastStreamId, exception);
+            } else {
+                // If we don't have a multiplexed channel, the parent channel hasn't been fully initialized. Close it now.
+                closeAndReleaseParent(parentChannel, exception);
+            }
+        } catch (Exception e) {
+            log.error(() -> "Failed to handle GOAWAY frame on channel " + parentChannel, e);
+        }
     }
 
     @Override
     public void close() {
-        try {
-            setClosedFlag().await();
-            for (MultiplexedChannelRecord c : connections) {
-                Future<Channel> f = c.getConnectionFuture();
-                f.await();
-                if (f.isSuccess()) {
-                    connectionPool.release(f.getNow()).await();
+        if (closed.compareAndSet(false, true)) {
+            Future<?> closeCompleteFuture = doClose();
+
+            try {
+                if (!closeCompleteFuture.await(10, TimeUnit.SECONDS)) {
+                    throw new RuntimeException("Event loop didn't close after 10 seconds.");
                 }
+            } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
+                throw new RuntimeException(e);
+            }
+
+            Throwable exception = closeCompleteFuture.cause();
+            if (exception != null) {
+                throw new RuntimeException("Failed to close channel pool.", exception);
             }
-            connectionPool.close();
-        } catch (InterruptedException ie) {
-            Thread.currentThread().interrupt();
-            throw new RuntimeException(ie);
         }
     }
 
-    private Promise<Void> setClosedFlag() {
-        Promise<Void> closedFuture = eventLoop.newPromise();
-        doInEventLoop(eventLoop, () -> {
-            closed = true;
-            closedFuture.setSuccess(null);
+    private Future<?> doClose() {
+        EventLoop closeEventLoop = eventLoopGroup.next();
+        Promise<?> closeFinishedPromise = closeEventLoop.newPromise();
+
+        doInEventLoop(closeEventLoop, () -> {
+            Promise<Void> releaseAllChannelsPromise = closeEventLoop.newPromise();
+            PromiseCombiner promiseCombiner = new PromiseCombiner(closeEventLoop);
+
+            // Create a copy of the connections to remove while we close them, in case closing updates the original list.
+            List<MultiplexedChannelRecord> channelsToRemove = new ArrayList<>(connections);
+            for (MultiplexedChannelRecord channel : channelsToRemove) {
+                promiseCombiner.add(closeAndReleaseParent(channel.getConnection()));
+            }
+            promiseCombiner.finish(releaseAllChannelsPromise);
+
+            releaseAllChannelsPromise.addListener(f -> {
+                connectionPool.close();
+                closeFinishedPromise.setSuccess(null);
+            });
         });
-        return closedFuture;
+
+        return closeFinishedPromise;
+    }
+
+    @Sharable
+    private static final class ReleaseOnExceptionHandler extends ChannelDuplexHandler {
+        private static final ReleaseOnExceptionHandler INSTANCE = new ReleaseOnExceptionHandler();
+
+        @Override
+        public void channelInactive(ChannelHandlerContext ctx) {
+            closeAndReleaseParent(ctx, new ClosedChannelException());
+        }
+
+        @Override
+        public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) {
+            if (cause instanceof Http2StreamExceptionHandler.Http2StreamIoException) {
+                closeConnectionToNewRequests(ctx, cause);
+            } else {
+                closeAndReleaseParent(ctx, cause);
+            }
+        }
+
+        void closeConnectionToNewRequests(ChannelHandlerContext ctx, Throwable cause) {
+            MultiplexedChannelRecord multiplexedChannel = ctx.channel().attr(MULTIPLEXED_CHANNEL).get();
+            if (multiplexedChannel != null) {
+                multiplexedChannel.closeToNewStreams();
+            } else {
+                closeAndReleaseParent(ctx, cause);
+            }
+        }
+
+        private void closeAndReleaseParent(ChannelHandlerContext ctx, Throwable cause) {
+            Http2MultiplexedChannelPool pool = ctx.channel().attr(ChannelAttributeKey.HTTP2_MULTIPLEXED_CHANNEL_POOL).get();
+            pool.closeAndReleaseParent(ctx.channel(), cause);
+        }
     }
 }
diff --git a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/http2/Http2PingHandler.java b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/http2/Http2PingHandler.java
new file mode 100644
index 000000000000..bb9f760e2681
--- /dev/null
+++ b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/http2/Http2PingHandler.java
@@ -0,0 +1,123 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.http.nio.netty.internal.http2;
+
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.SimpleChannelInboundHandler;
+import io.netty.handler.codec.http2.DefaultHttp2PingFrame;
+import io.netty.handler.codec.http2.Http2PingFrame;
+import io.netty.util.concurrent.ScheduledFuture;
+import java.util.concurrent.CompletableFuture;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.http.Protocol;
+import software.amazon.awssdk.http.nio.netty.internal.ChannelAttributeKey;
+import software.amazon.awssdk.utils.Logger;
+import software.amazon.awssdk.utils.Validate;
+
+/**
+ * Attached to a {@link Channel} to periodically check the health of HTTP2 connections via PING frames.
+ *
+ * If a channel is found to be unhealthy, this will invoke {@link ChannelPipeline#fireExceptionCaught(Throwable)}.
+ */
+@SdkInternalApi
+public class Http2PingHandler extends SimpleChannelInboundHandler<Http2PingFrame> {
+    private static final Logger log = Logger.loggerFor(Http2PingHandler.class);
+    private static final Http2PingFrame DEFAULT_PING_FRAME = new DefaultHttp2PingFrame(0);
+
+    private final long pingTimeoutMillis;
+
+    private ScheduledFuture<?> periodicPing;
+    private long lastPingSendTime = 0;
+    private long lastPingAckTime = 0;
+
+    public Http2PingHandler(int pingTimeoutMillis) {
+        this.pingTimeoutMillis = pingTimeoutMillis;
+    }
+
+    @Override
+    public void handlerAdded(ChannelHandlerContext ctx) {
+        CompletableFuture<Protocol> protocolFuture = ctx.channel().attr(ChannelAttributeKey.PROTOCOL_FUTURE).get();
+        Validate.validState(protocolFuture != null, "Protocol future must be initialized before handler is added.");
+        protocolFuture.thenAccept(p -> start(p, ctx));
+    }
+
+    private void start(Protocol protocol, ChannelHandlerContext ctx) {
+        if (protocol == Protocol.HTTP2 && periodicPing == null) {
+            periodicPing = ctx.channel()
+                              .eventLoop()
+                              .scheduleAtFixedRate(() -> doPeriodicPing(ctx.channel()), 0, pingTimeoutMillis, MILLISECONDS);
+        }
+    }
+
+    @Override
+    public void handlerRemoved(ChannelHandlerContext ctx) {
+        stop();
+    }
+
+    @Override
+    public void channelInactive(ChannelHandlerContext ctx) {
+        stop();
+        ctx.fireChannelInactive();
+    }
+
+    @Override
+    protected void channelRead0(ChannelHandlerContext ctx, Http2PingFrame frame) {
+        if (frame.ack()) {
+            log.debug(() -> "Received PING ACK from channel " + ctx.channel());
+            lastPingAckTime = System.currentTimeMillis();
+        } else {
+            ctx.fireChannelRead(frame);
+        }
+    }
+
+    private void doPeriodicPing(Channel channel) {
+        if (lastPingAckTime <= lastPingSendTime - pingTimeoutMillis) {
+            long timeSinceLastPingSend = System.currentTimeMillis() - lastPingSendTime;
+            channelIsUnhealthy(channel, new PingFailedException("Server did not respond to PING after " +
+                                                                timeSinceLastPingSend + "ms (limit: " +
+                                                                pingTimeoutMillis + "ms)"));
+        } else {
+            sendPing(channel);
+        }
+    }
+
+    private void sendPing(Channel channel) {
+        channel.writeAndFlush(DEFAULT_PING_FRAME).addListener(res -> {
+            if (!res.isSuccess()) {
+                log.debug(() -> "Failed to write and flush PING frame to connection", res.cause());
+                channelIsUnhealthy(channel, new PingFailedException("Failed to send PING to the service", res.cause()));
+            } else {
+                lastPingSendTime = System.currentTimeMillis();
+            }
+        });
+    }
+
+    private void channelIsUnhealthy(Channel channel, PingFailedException exception) {
+        stop();
+        channel.pipeline().fireExceptionCaught(exception);
+    }
+
+    private void stop() {
+        if (periodicPing != null) {
+            periodicPing.cancel(false);
+            periodicPing = null;
+        }
+    }
+}
diff --git a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/http2/Http2ResetSendingSubscription.java b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/http2/Http2ResetSendingSubscription.java
index f50aea83d4d9..534d394373a1 100644
--- a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/http2/Http2ResetSendingSubscription.java
+++ b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/http2/Http2ResetSendingSubscription.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/http2/Http2SettingsFrameHandler.java b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/http2/Http2SettingsFrameHandler.java
index 3d45cae301db..fb243ad79e74 100644
--- a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/http2/Http2SettingsFrameHandler.java
+++ b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/http2/Http2SettingsFrameHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -28,7 +28,6 @@
 import java.util.concurrent.atomic.AtomicReference;
 import software.amazon.awssdk.annotations.SdkInternalApi;
 import software.amazon.awssdk.http.Protocol;
-import software.amazon.awssdk.http.nio.netty.internal.ChannelAttributeKey;
 
 /**
  * Configure channel based on the {@link Http2SettingsFrame} received from server
@@ -56,22 +55,19 @@ protected void channelRead0(ChannelHandlerContext ctx, Http2SettingsFrame msg) {
     @Override
     public void channelUnregistered(ChannelHandlerContext ctx) {
         if (!channel.attr(PROTOCOL_FUTURE).get().isDone()) {
-            channelError(new IOException("The channel was closed before the protocol could be determined."), channel);
+            channelError(new IOException("The channel was closed before the protocol could be determined."), channel, ctx);
         }
     }
 
     @Override
     public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) {
-        channelError(cause, channel);
+        channelError(cause, channel, ctx);
     }
 
-    private void channelError(Throwable cause, Channel ch) {
+    private void channelError(Throwable cause, Channel ch, ChannelHandlerContext ctx) {
         ch.attr(PROTOCOL_FUTURE).get().completeExceptionally(cause);
-        MultiplexedChannelRecord record = ch.attr(ChannelAttributeKey.CHANNEL_POOL_RECORD).get();
-        // Deliver the exception to any child channels registered to this connection.
-        if (record != null) {
-            record.shutdownChildChannels(cause);
-        }
+        ctx.fireExceptionCaught(cause);
+
         // Channel status may still be active at this point even if it's not so queue up the close so that status is
         // accurately updated
         ch.eventLoop().submit(() -> {
diff --git a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/http2/Http2StreamExceptionHandler.java b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/http2/Http2StreamExceptionHandler.java
new file mode 100644
index 000000000000..46b9f9df5fdd
--- /dev/null
+++ b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/http2/Http2StreamExceptionHandler.java
@@ -0,0 +1,65 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.http.nio.netty.internal.http2;
+
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelInboundHandlerAdapter;
+import io.netty.handler.codec.http2.Http2Stream;
+import io.netty.handler.timeout.TimeoutException;
+import java.io.IOException;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.utils.Logger;
+
+/**
+ * Exception Handler for errors on the Http2 streams.
+ */
+@ChannelHandler.Sharable
+@SdkInternalApi
+public final class Http2StreamExceptionHandler extends ChannelInboundHandlerAdapter {
+    private static final Logger log = Logger.loggerFor(Http2Stream.class);
+    private static final Http2StreamExceptionHandler INSTANCE = new Http2StreamExceptionHandler();
+
+    private Http2StreamExceptionHandler() {
+    }
+
+    public static Http2StreamExceptionHandler create() {
+        return INSTANCE;
+    }
+
+    @Override
+    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) {
+        if (isIoError(cause) && ctx.channel().parent() != null) {
+            Channel parent = ctx.channel().parent();
+            log.debug(() -> "An I/O error occurred on an Http2 stream, notifying the connection channel " + parent);
+            parent.pipeline().fireExceptionCaught(new Http2StreamIoException("An I/O error occurred on an associated Http2 "
+                                                                             + "stream"));
+        }
+
+        ctx.fireExceptionCaught(cause);
+    }
+
+    private boolean isIoError(Throwable cause) {
+        return cause instanceof TimeoutException || cause instanceof IOException;
+    }
+
+    static final class Http2StreamIoException extends IOException {
+        Http2StreamIoException(String message) {
+            super(message);
+        }
+    }
+}
diff --git a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/http2/Http2ToHttpInboundAdapter.java b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/http2/Http2ToHttpInboundAdapter.java
index 4a9ec29a76ea..eecb2054b0c6 100644
--- a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/http2/Http2ToHttpInboundAdapter.java
+++ b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/http2/Http2ToHttpInboundAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -38,9 +38,6 @@
 @SdkInternalApi
 public class Http2ToHttpInboundAdapter extends SimpleChannelInboundHandler<Http2Frame> {
 
-    public Http2ToHttpInboundAdapter() {
-    }
-
     @Override
     protected void channelRead0(ChannelHandlerContext ctx, Http2Frame frame) throws Exception {
         if (frame instanceof Http2DataFrame) {
@@ -74,7 +71,7 @@ private void onRstStreamRead(Http2ResetFrame resetFrame, ChannelHandlerContext c
         ctx.fireExceptionCaught(new Http2ResetException(resetFrame.errorCode()));
     }
 
-    public static class Http2ResetException extends IOException {
+    public static final class Http2ResetException extends IOException {
 
         Http2ResetException(long errorCode) {
             super(String.format("Connection reset. Error - %s(%d)", Http2Error.valueOf(errorCode).name(), errorCode));
diff --git a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/http2/HttpOrHttp2ChannelPool.java b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/http2/HttpOrHttp2ChannelPool.java
index b4ae604804d2..4d944d3c4e53 100644
--- a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/http2/HttpOrHttp2ChannelPool.java
+++ b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/http2/HttpOrHttp2ChannelPool.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -15,7 +15,6 @@
 
 package software.amazon.awssdk.http.nio.netty.internal.http2;
 
-import static software.amazon.awssdk.http.nio.netty.internal.ChannelAttributeKey.MAX_CONCURRENT_STREAMS;
 import static software.amazon.awssdk.http.nio.netty.internal.ChannelAttributeKey.PROTOCOL_FUTURE;
 import static software.amazon.awssdk.http.nio.netty.internal.utils.NettyUtils.doInEventLoop;
 
@@ -26,6 +25,7 @@
 import io.netty.util.concurrent.Future;
 import io.netty.util.concurrent.GenericFutureListener;
 import io.netty.util.concurrent.Promise;
+import java.time.Duration;
 import software.amazon.awssdk.annotations.SdkInternalApi;
 import software.amazon.awssdk.http.Protocol;
 import software.amazon.awssdk.http.nio.netty.internal.NettyConfiguration;
@@ -40,6 +40,7 @@
 public class HttpOrHttp2ChannelPool implements ChannelPool {
     private final ChannelPool delegatePool;
     private final int maxConcurrency;
+    private final EventLoopGroup eventLoopGroup;
     private final EventLoop eventLoop;
     private final NettyConfiguration configuration;
 
@@ -53,6 +54,7 @@ public HttpOrHttp2ChannelPool(ChannelPool delegatePool,
                                   NettyConfiguration configuration) {
         this.delegatePool = delegatePool;
         this.maxConcurrency = maxConcurrency;
+        this.eventLoopGroup = group;
         this.eventLoop = group.next();
         this.configuration = configuration;
     }
@@ -125,18 +127,26 @@ private void failProtocolImplPromise(Throwable e) {
         });
     }
 
-    void completeProtocolConfiguration(Channel newChannel, Protocol protocol) {
+    private void completeProtocolConfiguration(Channel newChannel, Protocol protocol) {
         doInEventLoop(eventLoop, () -> {
             if (closed) {
-                newChannel.close();
-                delegatePool.release(newChannel);
-                protocolImplPromise.setFailure(new IllegalStateException("Pool closed"));
+                closeAndRelease(newChannel, new IllegalStateException("Pool closed"));
             } else {
-                protocolImplPromise.setSuccess(configureProtocol(newChannel, protocol));
+                try {
+                    protocolImplPromise.setSuccess(configureProtocol(newChannel, protocol));
+                } catch (Throwable e) {
+                    closeAndRelease(newChannel, e);
+                }
             }
         });
     }
 
+    private void closeAndRelease(Channel newChannel, Throwable e) {
+        newChannel.close();
+        delegatePool.release(newChannel);
+        protocolImplPromise.setFailure(e);
+    }
+
     private ChannelPool configureProtocol(Channel newChannel, Protocol protocol) {
         if (Protocol.HTTP1_1 == protocol) {
             // For HTTP/1.1 we use a traditional channel pool without multiplexing
@@ -149,8 +159,9 @@ private ChannelPool configureProtocol(Channel newChannel, Protocol protocol) {
                                                  .maxPendingAcquires(configuration.maxPendingConnectionAcquires())
                                                  .build();
         } else {
-            ChannelPool h2Pool = new Http2MultiplexedChannelPool(
-                    delegatePool, eventLoop, newChannel.attr(MAX_CONCURRENT_STREAMS).get());
+            Duration idleConnectionTimeout = configuration.reapIdleConnections()
+                                             ? Duration.ofMillis(configuration.idleTimeoutMillis()) : null;
+            ChannelPool h2Pool = new Http2MultiplexedChannelPool(delegatePool, eventLoopGroup, idleConnectionTimeout);
             protocolImpl = BetterFixedChannelPool.builder()
                                                  .channelPool(h2Pool)
                                                  .executor(eventLoop)
diff --git a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/http2/HttpToHttp2OutboundAdapter.java b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/http2/HttpToHttp2OutboundAdapter.java
index 9294ae76d4c5..881f50f64624 100644
--- a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/http2/HttpToHttp2OutboundAdapter.java
+++ b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/http2/HttpToHttp2OutboundAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -71,7 +71,8 @@ public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise)
                 // Convert and write the headers.
                 Http2Headers http2Headers = HttpConversionUtil.toHttp2Headers(httpMsg, false);
                 endStream = msg instanceof FullHttpMessage && !((FullHttpMessage) msg).content().isReadable();
-                ctx.write(new DefaultHttp2HeadersFrame(http2Headers), promiseAggregator);
+                ctx.write(new DefaultHttp2HeadersFrame(http2Headers), promiseAggregator.newPromise());
+
             }
 
             if (!endStream && msg instanceof HttpContent) {
@@ -91,11 +92,13 @@ public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise)
                 ByteBuf content = ((HttpContent) msg).content();
                 endStream = isLastContent && trailers.isEmpty();
                 release = false;
-                ctx.write(new DefaultHttp2DataFrame(content, endStream), promiseAggregator);
+                ctx.write(new DefaultHttp2DataFrame(content, endStream), promiseAggregator.newPromise());
+
 
                 if (!trailers.isEmpty()) {
                     // Write trailing headers.
-                    ctx.write(new DefaultHttp2HeadersFrame(http2Trailers, true), promiseAggregator);
+                    ctx.write(new DefaultHttp2HeadersFrame(http2Trailers, true), promiseAggregator.newPromise());
+
                 }
                 ctx.flush();
             }
diff --git a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/http2/MultiplexedChannelRecord.java b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/http2/MultiplexedChannelRecord.java
index 8943de5caebc..92e2009a7367 100644
--- a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/http2/MultiplexedChannelRecord.java
+++ b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/http2/MultiplexedChannelRecord.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -15,29 +15,31 @@
 
 package software.amazon.awssdk.http.nio.netty.internal.http2;
 
-import static software.amazon.awssdk.http.nio.netty.internal.ChannelAttributeKey.CHANNEL_POOL_RECORD;
-import static software.amazon.awssdk.http.nio.netty.internal.ChannelAttributeKey.PROTOCOL_FUTURE;
-import static software.amazon.awssdk.http.nio.netty.internal.utils.NettyUtils.asyncPromiseNotifyingBiConsumer;
 import static software.amazon.awssdk.http.nio.netty.internal.utils.NettyUtils.doInEventLoop;
-import static software.amazon.awssdk.http.nio.netty.internal.utils.NettyUtils.promiseNotifyingListener;
-import static software.amazon.awssdk.utils.NumericUtils.saturatedCast;
+import static software.amazon.awssdk.http.nio.netty.internal.utils.NettyUtils.warnIfNotInEventLoop;
 
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelId;
+import io.netty.channel.ChannelOutboundInvoker;
 import io.netty.handler.codec.http2.Http2GoAwayFrame;
 import io.netty.handler.codec.http2.Http2StreamChannel;
 import io.netty.handler.codec.http2.Http2StreamChannelBootstrap;
 import io.netty.util.concurrent.Future;
 import io.netty.util.concurrent.GenericFutureListener;
 import io.netty.util.concurrent.Promise;
+import io.netty.util.concurrent.ScheduledFuture;
 import java.io.IOException;
+import java.time.Duration;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicLong;
-import java.util.function.BiConsumer;
+import java.util.function.Consumer;
 import software.amazon.awssdk.annotations.SdkInternalApi;
-import software.amazon.awssdk.annotations.SdkTestInternalApi;
-import software.amazon.awssdk.http.Protocol;
+import software.amazon.awssdk.http.nio.netty.internal.UnusedChannelExceptionHandler;
+import software.amazon.awssdk.utils.Logger;
 
 /**
  * Contains a {@link Future} for the actual socket channel and tracks available
@@ -45,142 +47,270 @@
  */
 @SdkInternalApi
 public class MultiplexedChannelRecord {
-    private final Future<Channel> connectionFuture;
-    private final Map<ChannelId, Http2StreamChannel> childChannels;
-    private final AtomicLong availableStreams;
-    private final BiConsumer<Channel, MultiplexedChannelRecord> channelReleaser;
+    private static final Logger log = Logger.loggerFor(MultiplexedChannelRecord.class);
 
-    private volatile Channel connection;
-    private volatile boolean goAway = false;
+    private final Channel connection;
+    private final long maxConcurrencyPerConnection;
+    private final Long allowedIdleConnectionTimeMillis;
 
-    /**
-     * @param connectionFuture Future for parent socket channel.
-     * @param maxConcurrencyPerConnection Max streams allowed per connection.
-     * @param channelReleaser Method to release a channel and record on failure.
-     */
-    MultiplexedChannelRecord(Future<Channel> connectionFuture,
-                             long maxConcurrencyPerConnection,
-                             BiConsumer<Channel, MultiplexedChannelRecord> channelReleaser) {
-        this.connectionFuture = connectionFuture;
-        this.availableStreams = new AtomicLong(maxConcurrencyPerConnection);
-        this.childChannels = new ConcurrentHashMap<>(saturatedCast(maxConcurrencyPerConnection));
-        this.channelReleaser = channelReleaser;
-    }
-
-    @SdkTestInternalApi
-    MultiplexedChannelRecord(Future<Channel> connectionFuture,
-                             Channel connection,
-                             long maxConcurrencyPerConnection,
-                             BiConsumer<Channel, MultiplexedChannelRecord> channelReleaser) {
-        this.connectionFuture = connectionFuture;
-        this.childChannels = new ConcurrentHashMap<>(saturatedCast(maxConcurrencyPerConnection));
-        this.availableStreams = new AtomicLong(maxConcurrencyPerConnection);
-        this.channelReleaser = channelReleaser;
+    private final AtomicLong availableChildChannels;
+    private volatile long lastReserveAttemptTimeMillis;
+
+    // Only read or write in the connection.eventLoop()
+    private final Map<ChannelId, Http2StreamChannel> childChannels = new HashMap<>();
+    private ScheduledFuture<?> closeIfIdleTask;
+
+    // Only write in the connection.eventLoop()
+    private volatile RecordState state = RecordState.OPEN;
+
+    private volatile int lastStreamId;
+
+    MultiplexedChannelRecord(Channel connection, long maxConcurrencyPerConnection, Duration allowedIdleConnectionTime) {
         this.connection = connection;
+        this.maxConcurrencyPerConnection = maxConcurrencyPerConnection;
+        this.availableChildChannels = new AtomicLong(maxConcurrencyPerConnection);
+        this.allowedIdleConnectionTimeMillis = allowedIdleConnectionTime == null ? null : allowedIdleConnectionTime.toMillis();
     }
 
-    MultiplexedChannelRecord acquire(Promise<Channel> channelPromise) {
-        availableStreams.decrementAndGet();
-        if (connection != null) {
-            createChildChannel(channelPromise);
-        } else {
-            connectionFuture.addListener((GenericFutureListener<Future<Channel>>) future -> {
-                if (future.isSuccess()) {
-                    connection = future.getNow();
-                    connection.attr(CHANNEL_POOL_RECORD).set(this);
-                    createChildChannel(channelPromise);
+    boolean acquireStream(Promise<Channel> promise) {
+        if (claimStream()) {
+            releaseClaimOnFailure(promise);
+            acquireClaimedStream(promise);
+            return true;
+        }
+        return false;
+    }
+
+    void acquireClaimedStream(Promise<Channel> promise) {
+        doInEventLoop(connection.eventLoop(), () -> {
+            if (state != RecordState.OPEN) {
+                String message;
+                // GOAWAY
+                if (state == RecordState.CLOSED_TO_NEW) {
+                    message = String.format("Connection %s received GOAWAY with Last Stream ID %d. Unable to open new "
+                                            + "streams on this connection.", connection, lastStreamId);
                 } else {
-                    channelPromise.setFailure(future.cause());
-                    channelReleaser.accept(connection, this);
+                    message = String.format("Connection %s was closed while acquiring new stream.", connection);
+                }
+                log.warn(() -> message);
+                promise.setFailure(new IOException(message));
+                return;
+            }
+
+            Future<Http2StreamChannel> streamFuture = new Http2StreamChannelBootstrap(connection).open();
+            streamFuture.addListener((GenericFutureListener<Future<Http2StreamChannel>>) future -> {
+                warnIfNotInEventLoop(connection.eventLoop());
+
+                if (!future.isSuccess()) {
+                    promise.setFailure(future.cause());
+                    return;
+                }
+
+                Http2StreamChannel channel = future.getNow();
+                channel.pipeline().addLast(UnusedChannelExceptionHandler.getInstance());
+                childChannels.put(channel.id(), channel);
+                promise.setSuccess(channel);
+
+                if (closeIfIdleTask == null && allowedIdleConnectionTimeMillis != null) {
+                    enableCloseIfIdleTask();
                 }
             });
+        }, promise);
+    }
+
+    private void enableCloseIfIdleTask() {
+        warnIfNotInEventLoop(connection.eventLoop());
+
+        // Don't poll more frequently than 1 second. Being overly-conservative is okay. Blowing up our CPU is not.
+        long taskFrequencyMillis = Math.max(allowedIdleConnectionTimeMillis, 1_000);
+
+        closeIfIdleTask = connection.eventLoop().scheduleAtFixedRate(this::closeIfIdle, taskFrequencyMillis, taskFrequencyMillis,
+                                                                     TimeUnit.MILLISECONDS);
+        connection.closeFuture().addListener(f -> closeIfIdleTask.cancel(false));
+    }
+
+    private void releaseClaimOnFailure(Promise<Channel> promise) {
+        try {
+            promise.addListener(f -> {
+                if (!promise.isSuccess()) {
+                    releaseClaim();
+                }
+            });
+        } catch (Throwable e) {
+            releaseClaim();
+            throw e;
+        }
+    }
+
+    private void releaseClaim() {
+        if (availableChildChannels.incrementAndGet() > maxConcurrencyPerConnection) {
+            assert false;
+            log.warn(() -> "Child channel count was caught attempting to be increased over max concurrency. "
+                           + "Please report this issue to the AWS SDK for Java team.");
+            availableChildChannels.decrementAndGet();
         }
-        return this;
     }
 
     /**
      * Handle a {@link Http2GoAwayFrame} on this connection, preventing new streams from being created on it, and closing any
      * streams newer than the last-stream-id on the go-away frame.
      */
-    public void goAway(Http2GoAwayFrame frame) {
-        this.goAway = true;
-        GoAwayException exception = new GoAwayException(frame.errorCode(), frame.content());
-        childChannels.entrySet().stream()
-                     .map(Map.Entry::getValue)
-                     .filter(cc -> cc.stream().id() > frame.lastStreamId())
-                     .forEach(cc -> cc.eventLoop().execute(() -> shutdownChildChannel(cc, exception)));
+    void handleGoAway(int lastStreamId, GoAwayException exception) {
+        doInEventLoop(connection.eventLoop(), () -> {
+            this.lastStreamId = lastStreamId;
+
+            if (state == RecordState.CLOSED) {
+                return;
+            }
+
+            if (state == RecordState.OPEN) {
+                state = RecordState.CLOSED_TO_NEW;
+            }
+
+            // Create a copy of the children to close, because fireExceptionCaught may remove from the childChannels.
+            List<Http2StreamChannel> childrenToClose = new ArrayList<>(childChannels.values());
+            childrenToClose.stream()
+                           .filter(cc -> cc.stream().id() > lastStreamId)
+                           .forEach(cc -> cc.pipeline().fireExceptionCaught(exception));
+        });
     }
 
     /**
-     * Delivers the exception to all registered child channels, and prohibits new streams being created on this connection.
-     *
-     * @param t Exception to deliver.
+     * Prevent new streams from being acquired from the existing connection.
      */
-    public void shutdownChildChannels(Throwable t) {
-        this.goAway = true;
+    void closeToNewStreams() {
         doInEventLoop(connection.eventLoop(), () -> {
-            for (Channel childChannel : childChannels.values()) {
-                shutdownChildChannel(childChannel, t);
+            if (state == RecordState.OPEN) {
+                state = RecordState.CLOSED_TO_NEW;
             }
         });
     }
 
-    private void shutdownChildChannel(Channel childChannel, Throwable t) {
-        childChannel.pipeline().fireExceptionCaught(t);
+    /**
+     * Close all registered child channels, and prohibit new streams from being created on this connection.
+     */
+    void closeChildChannels() {
+        closeAndExecuteOnChildChannels(ChannelOutboundInvoker::close);
     }
 
     /**
-     * Bootstraps a child stream channel from the parent socket channel. Done in parent channel event loop.
-     *
-     * @param channelPromise Promise to notify when channel is available.
+     * Delivers the exception to all registered child channels, and prohibits new streams being created on this connection.
      */
-    private void createChildChannel(Promise<Channel> channelPromise) {
-        doInEventLoop(connection.eventLoop(), () -> createChildChannel0(channelPromise), channelPromise);
+    void closeChildChannels(Throwable t) {
+        closeAndExecuteOnChildChannels(ch -> ch.pipeline().fireExceptionCaught(decorateConnectionException(t)));
     }
 
-    private void createChildChannel0(Promise<Channel> channelPromise) {
-        if (goAway) {
-            channelPromise.tryFailure(new IOException("No streams are available on this connection."));
-        } else {
-            // Once protocol future is notified then parent pipeline is configured and ready to go
-            connection.attr(PROTOCOL_FUTURE).get()
-                      .whenComplete(asyncPromiseNotifyingBiConsumer(bootstrapChildChannel(), channelPromise));
+    private Throwable decorateConnectionException(Throwable t) {
+        String message = "An error occurred on the connection: " + t.getMessage();
+        if (t instanceof IOException) {
+            return new IOException(message, t);
         }
+
+        return new Throwable(message, t);
     }
 
-    /**
-     * Bootstraps the child stream channel and notifies the Promise on success or failure.
-     *
-     * @return BiConsumer that will bootstrap the child channel.
-     */
-    private BiConsumer<Protocol, Promise<Channel>> bootstrapChildChannel() {
-        return (s, p) -> new Http2StreamChannelBootstrap(connection)
-            .open()
-            .addListener((GenericFutureListener<Future<Http2StreamChannel>>) future -> {
-                if (future.isSuccess()) {
-                    Http2StreamChannel channel = future.getNow();
-                    childChannels.put(channel.id(), channel);
-                } else {
-                    if (!connection.isActive()) {
-                        channelReleaser.accept(connection, this);
-                    }
-                    availableStreams.incrementAndGet();
-                }
-            })
-            .addListener(promiseNotifyingListener(p));
+    private void closeAndExecuteOnChildChannels(Consumer<Channel> childChannelConsumer) {
+        doInEventLoop(connection.eventLoop(), () -> {
+            if (state == RecordState.CLOSED) {
+                return;
+            }
+            state = RecordState.CLOSED;
+
+            // Create a copy of the children, because they may be modified by the consumer.
+            List<Http2StreamChannel> childrenToClose = new ArrayList<>(childChannels.values());
+            for (Channel childChannel : childrenToClose) {
+                childChannelConsumer.accept(childChannel);
+            }
+        });
+    }
+
+    void closeAndReleaseChild(Channel childChannel) {
+        childChannel.close();
+        doInEventLoop(connection.eventLoop(), () -> {
+            childChannels.remove(childChannel.id());
+            releaseClaim();
+        });
+    }
+
+    private void closeIfIdle() {
+        warnIfNotInEventLoop(connection.eventLoop());
+
+        // Don't close if we have child channels.
+        if (!childChannels.isEmpty()) {
+            return;
+        }
+
+        // Don't close if there have been any reserves attempted since the idle connection time.
+        long nonVolatileLastReserveAttemptTimeMillis = lastReserveAttemptTimeMillis;
+        if (nonVolatileLastReserveAttemptTimeMillis > System.currentTimeMillis() - allowedIdleConnectionTimeMillis) {
+            return;
+        }
+
+        // Cut off new streams from being acquired from this connection by setting the number of available channels to 0.
+        // This write may fail if a reservation has happened since we checked the lastReserveAttemptTime.
+        if (!availableChildChannels.compareAndSet(maxConcurrencyPerConnection, 0)) {
+            return;
+        }
+
+        // If we've been closed, no need to shut down.
+        if (state != RecordState.OPEN) {
+            return;
+        }
+
+        log.debug(() -> "Connection " + connection + " has been idle for " +
+                        (System.currentTimeMillis() - nonVolatileLastReserveAttemptTimeMillis) + "ms and will be shut down.");
+
+        // Mark ourselves as closed
+        state = RecordState.CLOSED;
+
+        // Start the shutdown process by closing the connection (which should be noticed by the connection pool)
+        connection.close();
     }
 
-    void release(Channel channel) {
-        availableStreams.incrementAndGet();
-        childChannels.remove(channel.id());
+    public Channel getConnection() {
+        return connection;
     }
 
-    public Future<Channel> getConnectionFuture() {
-        return connectionFuture;
+    private boolean claimStream() {
+        lastReserveAttemptTimeMillis = System.currentTimeMillis();
+        for (int attempt = 0; attempt < 5; ++attempt) {
+
+            if (state != RecordState.OPEN) {
+                return false;
+            }
+
+            long currentlyAvailable = availableChildChannels.get();
+
+            if (currentlyAvailable <= 0) {
+                return false;
+            }
+            if (availableChildChannels.compareAndSet(currentlyAvailable, currentlyAvailable - 1)) {
+                return true;
+            }
+        }
+
+        return false;
     }
 
-    long availableStreams() {
-        return goAway ? 0 : availableStreams.get();
+    boolean canBeClosedAndReleased() {
+        return state != RecordState.OPEN && availableChildChannels.get() == maxConcurrencyPerConnection;
     }
 
+    private enum RecordState {
+        /**
+         * The connection is open and new streams may be acquired from it, if they are available.
+         */
+        OPEN,
+
+        /**
+         * The connection is open, but new streams may not be acquired from it. This occurs when a connection is being
+         * shut down (e.g. after it has received a GOAWAY frame), but all streams haven't been closed yet.
+         */
+        CLOSED_TO_NEW,
+
+        /**
+         * The connection is closed and new streams may not be acquired from it.
+         */
+        CLOSED
+    }
 }
diff --git a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/http2/PingFailedException.java b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/http2/PingFailedException.java
new file mode 100644
index 000000000000..80103860f327
--- /dev/null
+++ b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/http2/PingFailedException.java
@@ -0,0 +1,30 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.http.nio.netty.internal.http2;
+
+import java.io.IOException;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+
+@SdkInternalApi
+public final class PingFailedException extends IOException {
+    PingFailedException(String msg) {
+        super(msg);
+    }
+
+    PingFailedException(String message, Throwable cause) {
+        super(message, cause);
+    }
+}
diff --git a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/http2/PingTracker.java b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/http2/PingTracker.java
new file mode 100644
index 000000000000..414ec20d834f
--- /dev/null
+++ b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/http2/PingTracker.java
@@ -0,0 +1,44 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.http.nio.netty.internal.http2;
+
+import io.netty.util.concurrent.ScheduledFuture;
+import java.util.function.Supplier;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+
+/**
+ * Tracking the status after sending out the PING frame
+ */
+@SdkInternalApi
+public final class PingTracker {
+
+    private final Supplier<ScheduledFuture<?>> timerFutureSupplier;
+    private ScheduledFuture<?> pingTimerFuture;
+
+    PingTracker(Supplier<ScheduledFuture<?>> timerFutureSupplier) {
+        this.timerFutureSupplier = timerFutureSupplier;
+    }
+
+    public void start() {
+        pingTimerFuture = timerFutureSupplier.get();
+    }
+
+    public void cancel() {
+        if (pingTimerFuture != null) {
+            pingTimerFuture.cancel(false);
+        }
+    }
+}
diff --git a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/nrs/CancelledSubscriber.java b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/nrs/CancelledSubscriber.java
new file mode 100644
index 000000000000..b2edb8b60c93
--- /dev/null
+++ b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/nrs/CancelledSubscriber.java
@@ -0,0 +1,58 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.http.nio.netty.internal.nrs;
+
+import org.reactivestreams.Subscriber;
+import org.reactivestreams.Subscription;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+
+/**
+ * A cancelled subscriber.
+ *
+ * This class contains source imported from https://github.com/playframework/netty-reactive-streams,
+ * licensed under the Apache License 2.0, available at the time of the fork (1/31/2020) here:
+ * https://github.com/playframework/netty-reactive-streams/blob/master/LICENSE.txt
+ *
+ * All original source licensed under the Apache License 2.0 by playframework. All modifications are
+ * licensed under the Apache License 2.0 by Amazon Web Services.
+ */
+@SdkInternalApi
+public final class CancelledSubscriber<T> implements Subscriber<T> {
+
+    @Override
+    public void onSubscribe(Subscription subscription) {
+        if (subscription == null) {
+            throw new NullPointerException("Null subscription");
+        } else {
+            subscription.cancel();
+        }
+    }
+
+    @Override
+    public void onNext(T t) {
+    }
+
+    @Override
+    public void onError(Throwable error) {
+        if (error == null) {
+            throw new NullPointerException("Null error published");
+        }
+    }
+
+    @Override
+    public void onComplete() {
+    }
+}
diff --git a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/nrs/DefaultStreamedHttpRequest.java b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/nrs/DefaultStreamedHttpRequest.java
new file mode 100644
index 000000000000..7d9a82c9bed9
--- /dev/null
+++ b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/nrs/DefaultStreamedHttpRequest.java
@@ -0,0 +1,81 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.http.nio.netty.internal.nrs;
+
+import io.netty.handler.codec.http.DefaultHttpRequest;
+import io.netty.handler.codec.http.HttpContent;
+import io.netty.handler.codec.http.HttpMethod;
+import io.netty.handler.codec.http.HttpVersion;
+import java.util.Objects;
+import org.reactivestreams.Publisher;
+import org.reactivestreams.Subscriber;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+
+/**
+ * A default streamed HTTP request.
+ *
+ * This class contains source imported from https://github.com/playframework/netty-reactive-streams,
+ * licensed under the Apache License 2.0, available at the time of the fork (1/31/2020) here:
+ * https://github.com/playframework/netty-reactive-streams/blob/master/LICENSE.txt
+ *
+ * All original source licensed under the Apache License 2.0 by playframework. All modifications are
+ * licensed under the Apache License 2.0 by Amazon Web Services.
+ */
+@SdkInternalApi
+public class DefaultStreamedHttpRequest extends DefaultHttpRequest implements StreamedHttpRequest {
+
+    private final Publisher<HttpContent> stream;
+
+    public DefaultStreamedHttpRequest(HttpVersion httpVersion, HttpMethod method, String uri, Publisher<HttpContent> stream) {
+        super(httpVersion, method, uri);
+        this.stream = stream;
+    }
+
+    public DefaultStreamedHttpRequest(HttpVersion httpVersion, HttpMethod method, String uri, boolean validateHeaders,
+                                      Publisher<HttpContent> stream) {
+        super(httpVersion, method, uri, validateHeaders);
+        this.stream = stream;
+    }
+
+    @Override
+    public void subscribe(Subscriber<? super HttpContent> subscriber) {
+        stream.subscribe(subscriber);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        if (!super.equals(o)) {
+            return false;
+        }
+
+        DefaultStreamedHttpRequest that = (DefaultStreamedHttpRequest) o;
+
+        return Objects.equals(stream, that.stream);
+    }
+
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        result = 31 * result + (stream != null ? stream.hashCode() : 0);
+        return result;
+    }
+}
diff --git a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/nrs/DefaultStreamedHttpResponse.java b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/nrs/DefaultStreamedHttpResponse.java
new file mode 100644
index 000000000000..dc6fc82cb69b
--- /dev/null
+++ b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/nrs/DefaultStreamedHttpResponse.java
@@ -0,0 +1,81 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.http.nio.netty.internal.nrs;
+
+import io.netty.handler.codec.http.DefaultHttpResponse;
+import io.netty.handler.codec.http.HttpContent;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import io.netty.handler.codec.http.HttpVersion;
+import java.util.Objects;
+import org.reactivestreams.Publisher;
+import org.reactivestreams.Subscriber;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+
+/**
+ * A default streamed HTTP response.
+ *
+ * This class contains source imported from https://github.com/playframework/netty-reactive-streams,
+ * licensed under the Apache License 2.0, available at the time of the fork (1/31/2020) here:
+ * https://github.com/playframework/netty-reactive-streams/blob/master/LICENSE.txt
+ *
+ * All original source licensed under the Apache License 2.0 by playframework. All modifications are
+ * licensed under the Apache License 2.0 by Amazon Web Services.
+ */
+@SdkInternalApi
+public class DefaultStreamedHttpResponse extends DefaultHttpResponse implements StreamedHttpResponse {
+
+    private final Publisher<HttpContent> stream;
+
+    public DefaultStreamedHttpResponse(HttpVersion version, HttpResponseStatus status, Publisher<HttpContent> stream) {
+        super(version, status);
+        this.stream = stream;
+    }
+
+    public DefaultStreamedHttpResponse(HttpVersion version, HttpResponseStatus status, boolean validateHeaders,
+                                       Publisher<HttpContent> stream) {
+        super(version, status, validateHeaders);
+        this.stream = stream;
+    }
+
+    @Override
+    public void subscribe(Subscriber<? super HttpContent> subscriber) {
+        stream.subscribe(subscriber);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        if (!super.equals(o)) {
+            return false;
+        }
+
+        DefaultStreamedHttpResponse that = (DefaultStreamedHttpResponse) o;
+
+        return Objects.equals(stream, that.stream);
+    }
+
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        result = 31 * result + (stream != null ? stream.hashCode() : 0);
+        return result;
+    }
+}
diff --git a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/nrs/DelegateHttpMessage.java b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/nrs/DelegateHttpMessage.java
new file mode 100644
index 000000000000..5cd6d3b68687
--- /dev/null
+++ b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/nrs/DelegateHttpMessage.java
@@ -0,0 +1,83 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.http.nio.netty.internal.nrs;
+
+import io.netty.handler.codec.DecoderResult;
+import io.netty.handler.codec.http.HttpHeaders;
+import io.netty.handler.codec.http.HttpMessage;
+import io.netty.handler.codec.http.HttpVersion;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+
+/**
+ * This class contains source imported from https://github.com/playframework/netty-reactive-streams,
+ * licensed under the Apache License 2.0, available at the time of the fork (1/31/2020) here:
+ * https://github.com/playframework/netty-reactive-streams/blob/master/LICENSE.txt
+ *
+ * All original source licensed under the Apache License 2.0 by playframework. All modifications are
+ * licensed under the Apache License 2.0 by Amazon Web Services.
+ */
+@SdkInternalApi
+class DelegateHttpMessage implements HttpMessage {
+    protected final HttpMessage message;
+
+    DelegateHttpMessage(HttpMessage message) {
+        this.message = message;
+    }
+
+    @Override
+    @Deprecated
+    public HttpVersion getProtocolVersion() {
+        return message.protocolVersion();
+    }
+
+    @Override
+    public HttpVersion protocolVersion() {
+        return message.protocolVersion();
+    }
+
+    @Override
+    public HttpMessage setProtocolVersion(HttpVersion version) {
+        message.setProtocolVersion(version);
+        return this;
+    }
+
+    @Override
+    public HttpHeaders headers() {
+        return message.headers();
+    }
+
+    @Override
+    @Deprecated
+    public DecoderResult getDecoderResult() {
+        return message.decoderResult();
+    }
+
+    @Override
+    public DecoderResult decoderResult() {
+        return message.decoderResult();
+    }
+
+    @Override
+    public void setDecoderResult(DecoderResult result) {
+        message.setDecoderResult(result);
+    }
+
+    @Override
+    public String toString() {
+        return this.getClass().getName() + "(" + message.toString() + ")";
+    }
+
+}
diff --git a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/nrs/DelegateHttpRequest.java b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/nrs/DelegateHttpRequest.java
new file mode 100644
index 000000000000..213a68824ff7
--- /dev/null
+++ b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/nrs/DelegateHttpRequest.java
@@ -0,0 +1,80 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.http.nio.netty.internal.nrs;
+
+import io.netty.handler.codec.http.HttpMethod;
+import io.netty.handler.codec.http.HttpRequest;
+import io.netty.handler.codec.http.HttpVersion;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+
+/**
+ * This class contains source imported from https://github.com/playframework/netty-reactive-streams,
+ * licensed under the Apache License 2.0, available at the time of the fork (1/31/2020) here:
+ * https://github.com/playframework/netty-reactive-streams/blob/master/LICENSE.txt
+ *
+ * All original source licensed under the Apache License 2.0 by playframework. All modifications are
+ * licensed under the Apache License 2.0 by Amazon Web Services.
+ */
+@SdkInternalApi
+class DelegateHttpRequest extends DelegateHttpMessage implements HttpRequest {
+
+    protected final HttpRequest request;
+
+    DelegateHttpRequest(HttpRequest request) {
+        super(request);
+        this.request = request;
+    }
+
+    @Override
+    public HttpRequest setMethod(HttpMethod method) {
+        request.setMethod(method);
+        return this;
+    }
+
+    @Override
+    public HttpRequest setUri(String uri) {
+        request.setUri(uri);
+        return this;
+    }
+
+    @Override
+    @Deprecated
+    public HttpMethod getMethod() {
+        return request.method();
+    }
+
+    @Override
+    public HttpMethod method() {
+        return request.method();
+    }
+
+    @Override
+    @Deprecated
+    public String getUri() {
+        return request.uri();
+    }
+
+    @Override
+    public String uri() {
+        return request.uri();
+    }
+
+    @Override
+    public HttpRequest setProtocolVersion(HttpVersion version) {
+        super.setProtocolVersion(version);
+        return this;
+    }
+}
diff --git a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/nrs/DelegateHttpResponse.java b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/nrs/DelegateHttpResponse.java
new file mode 100644
index 000000000000..e446aeb6df52
--- /dev/null
+++ b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/nrs/DelegateHttpResponse.java
@@ -0,0 +1,63 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.http.nio.netty.internal.nrs;
+
+import io.netty.handler.codec.http.HttpResponse;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import io.netty.handler.codec.http.HttpVersion;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+
+/**
+ * This class contains source imported from https://github.com/playframework/netty-reactive-streams,
+ * licensed under the Apache License 2.0, available at the time of the fork (1/31/2020) here:
+ * https://github.com/playframework/netty-reactive-streams/blob/master/LICENSE.txt
+ *
+ * All original source licensed under the Apache License 2.0 by playframework. All modifications are
+ * licensed under the Apache License 2.0 by Amazon Web Services.
+ */
+@SdkInternalApi
+class DelegateHttpResponse extends DelegateHttpMessage implements HttpResponse {
+
+    protected final HttpResponse response;
+
+    DelegateHttpResponse(HttpResponse response) {
+        super(response);
+        this.response = response;
+    }
+
+    @Override
+    public HttpResponse setStatus(HttpResponseStatus status) {
+        response.setStatus(status);
+        return this;
+    }
+
+    @Override
+    @Deprecated
+    public HttpResponseStatus getStatus() {
+        return response.status();
+    }
+
+    @Override
+    public HttpResponseStatus status() {
+        return response.status();
+    }
+
+    @Override
+    public HttpResponse setProtocolVersion(HttpVersion version) {
+        super.setProtocolVersion(version);
+        return this;
+    }
+}
diff --git a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/nrs/DelegateStreamedHttpRequest.java b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/nrs/DelegateStreamedHttpRequest.java
new file mode 100644
index 000000000000..c3c495c2e724
--- /dev/null
+++ b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/nrs/DelegateStreamedHttpRequest.java
@@ -0,0 +1,46 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.http.nio.netty.internal.nrs;
+
+import io.netty.handler.codec.http.HttpContent;
+import io.netty.handler.codec.http.HttpRequest;
+import org.reactivestreams.Publisher;
+import org.reactivestreams.Subscriber;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+
+/**
+ * This class contains source imported from https://github.com/playframework/netty-reactive-streams,
+ * licensed under the Apache License 2.0, available at the time of the fork (1/31/2020) here:
+ * https://github.com/playframework/netty-reactive-streams/blob/master/LICENSE.txt
+ *
+ * All original source licensed under the Apache License 2.0 by playframework. All modifications are
+ * licensed under the Apache License 2.0 by Amazon Web Services.
+ */
+@SdkInternalApi
+final class DelegateStreamedHttpRequest extends DelegateHttpRequest implements StreamedHttpRequest {
+
+    private final Publisher<HttpContent> stream;
+
+    DelegateStreamedHttpRequest(HttpRequest request, Publisher<HttpContent> stream) {
+        super(request);
+        this.stream = stream;
+    }
+
+    @Override
+    public void subscribe(Subscriber<? super HttpContent> subscriber) {
+        stream.subscribe(subscriber);
+    }
+}
diff --git a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/nrs/DelegateStreamedHttpResponse.java b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/nrs/DelegateStreamedHttpResponse.java
new file mode 100644
index 000000000000..5a5612679205
--- /dev/null
+++ b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/nrs/DelegateStreamedHttpResponse.java
@@ -0,0 +1,46 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.http.nio.netty.internal.nrs;
+
+import io.netty.handler.codec.http.HttpContent;
+import io.netty.handler.codec.http.HttpResponse;
+import org.reactivestreams.Publisher;
+import org.reactivestreams.Subscriber;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+
+/**
+ * This class contains source imported from https://github.com/playframework/netty-reactive-streams,
+ * licensed under the Apache License 2.0, available at the time of the fork (1/31/2020) here:
+ * https://github.com/playframework/netty-reactive-streams/blob/master/LICENSE.txt
+ *
+ * All original source licensed under the Apache License 2.0 by playframework. All modifications are
+ * licensed under the Apache License 2.0 by Amazon Web Services.
+ */
+@SdkInternalApi
+final class DelegateStreamedHttpResponse extends DelegateHttpResponse implements StreamedHttpResponse {
+
+    private final Publisher<HttpContent> stream;
+
+    DelegateStreamedHttpResponse(HttpResponse response, Publisher<HttpContent> stream) {
+        super(response);
+        this.stream = stream;
+    }
+
+    @Override
+    public void subscribe(Subscriber<? super HttpContent> subscriber) {
+        stream.subscribe(subscriber);
+    }
+}
diff --git a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/nrs/EmptyHttpRequest.java b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/nrs/EmptyHttpRequest.java
new file mode 100644
index 000000000000..08c1eb9649b7
--- /dev/null
+++ b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/nrs/EmptyHttpRequest.java
@@ -0,0 +1,160 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.http.nio.netty.internal.nrs;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.handler.codec.http.DefaultHttpHeaders;
+import io.netty.handler.codec.http.DefaultHttpRequest;
+import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.handler.codec.http.HttpHeaders;
+import io.netty.handler.codec.http.HttpMethod;
+import io.netty.handler.codec.http.HttpRequest;
+import io.netty.handler.codec.http.HttpVersion;
+import io.netty.util.ReferenceCountUtil;
+import io.netty.util.ReferenceCounted;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+
+/**
+ * This class contains source imported from https://github.com/playframework/netty-reactive-streams,
+ * licensed under the Apache License 2.0, available at the time of the fork (1/31/2020) here:
+ * https://github.com/playframework/netty-reactive-streams/blob/master/LICENSE.txt
+ *
+ * All original source licensed under the Apache License 2.0 by playframework. All modifications are
+ * licensed under the Apache License 2.0 by Amazon Web Services.
+ */
+@SdkInternalApi
+class EmptyHttpRequest extends DelegateHttpRequest implements FullHttpRequest {
+
+    EmptyHttpRequest(HttpRequest request) {
+        super(request);
+    }
+
+    @Override
+    public FullHttpRequest setUri(String uri) {
+        super.setUri(uri);
+        return this;
+    }
+
+    @Override
+    public FullHttpRequest setMethod(HttpMethod method) {
+        super.setMethod(method);
+        return this;
+    }
+
+    @Override
+    public FullHttpRequest setProtocolVersion(HttpVersion version) {
+        super.setProtocolVersion(version);
+        return this;
+    }
+
+    @Override
+    public FullHttpRequest copy() {
+        if (request instanceof FullHttpRequest) {
+            return new EmptyHttpRequest(((FullHttpRequest) request).copy());
+        } else {
+            DefaultHttpRequest copy = new DefaultHttpRequest(protocolVersion(), method(), uri());
+            copy.headers().set(headers());
+            return new EmptyHttpRequest(copy);
+        }
+    }
+
+    @Override
+    public FullHttpRequest retain(int increment) {
+        ReferenceCountUtil.retain(message, increment);
+        return this;
+    }
+
+    @Override
+    public FullHttpRequest retain() {
+        ReferenceCountUtil.retain(message);
+        return this;
+    }
+
+    @Override
+    public FullHttpRequest touch() {
+        if (request instanceof FullHttpRequest) {
+            return ((FullHttpRequest) request).touch();
+        } else {
+            return this;
+        }
+    }
+
+    @Override
+    public FullHttpRequest touch(Object o) {
+        if (request instanceof FullHttpRequest) {
+            return ((FullHttpRequest) request).touch(o);
+        } else {
+            return this;
+        }
+    }
+
+    @Override
+    public HttpHeaders trailingHeaders() {
+        return new DefaultHttpHeaders();
+    }
+
+    @Override
+    public FullHttpRequest duplicate() {
+        if (request instanceof FullHttpRequest) {
+            return ((FullHttpRequest) request).duplicate();
+        } else {
+            return this;
+        }
+    }
+
+    @Override
+    public FullHttpRequest retainedDuplicate() {
+        if (request instanceof FullHttpRequest) {
+            return ((FullHttpRequest) request).retainedDuplicate();
+        } else {
+            return this;
+        }
+    }
+
+    @Override
+    public FullHttpRequest replace(ByteBuf byteBuf) {
+        if (message instanceof FullHttpRequest) {
+            return ((FullHttpRequest) request).replace(byteBuf);
+        } else {
+            return this;
+        }
+    }
+
+    @Override
+    public ByteBuf content() {
+        return Unpooled.EMPTY_BUFFER;
+    }
+
+    @Override
+    public int refCnt() {
+        if (message instanceof ReferenceCounted) {
+            return ((ReferenceCounted) message).refCnt();
+        } else {
+            return 1;
+        }
+    }
+
+    @Override
+    public boolean release() {
+        return ReferenceCountUtil.release(message);
+    }
+
+    @Override
+    public boolean release(int decrement) {
+        return ReferenceCountUtil.release(message, decrement);
+    }
+}
diff --git a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/nrs/EmptyHttpResponse.java b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/nrs/EmptyHttpResponse.java
new file mode 100644
index 000000000000..b514b5639161
--- /dev/null
+++ b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/nrs/EmptyHttpResponse.java
@@ -0,0 +1,154 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.http.nio.netty.internal.nrs;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.handler.codec.http.DefaultHttpHeaders;
+import io.netty.handler.codec.http.DefaultHttpResponse;
+import io.netty.handler.codec.http.FullHttpResponse;
+import io.netty.handler.codec.http.HttpHeaders;
+import io.netty.handler.codec.http.HttpResponse;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import io.netty.handler.codec.http.HttpVersion;
+import io.netty.util.ReferenceCountUtil;
+import io.netty.util.ReferenceCounted;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+
+/**
+ * This class contains source imported from https://github.com/playframework/netty-reactive-streams,
+ * licensed under the Apache License 2.0, available at the time of the fork (1/31/2020) here:
+ * https://github.com/playframework/netty-reactive-streams/blob/master/LICENSE.txt
+ *
+ * All original source licensed under the Apache License 2.0 by playframework. All modifications are
+ * licensed under the Apache License 2.0 by Amazon Web Services.
+ */
+@SdkInternalApi
+class EmptyHttpResponse extends DelegateHttpResponse implements FullHttpResponse {
+
+    EmptyHttpResponse(HttpResponse response) {
+        super(response);
+    }
+
+    @Override
+    public FullHttpResponse setStatus(HttpResponseStatus status) {
+        super.setStatus(status);
+        return this;
+    }
+
+    @Override
+    public FullHttpResponse setProtocolVersion(HttpVersion version) {
+        super.setProtocolVersion(version);
+        return this;
+    }
+
+    @Override
+    public FullHttpResponse copy() {
+        if (response instanceof FullHttpResponse) {
+            return new EmptyHttpResponse(((FullHttpResponse) response).copy());
+        } else {
+            DefaultHttpResponse copy = new DefaultHttpResponse(protocolVersion(), status());
+            copy.headers().set(headers());
+            return new EmptyHttpResponse(copy);
+        }
+    }
+
+    @Override
+    public FullHttpResponse retain(int increment) {
+        ReferenceCountUtil.retain(message, increment);
+        return this;
+    }
+
+    @Override
+    public FullHttpResponse retain() {
+        ReferenceCountUtil.retain(message);
+        return this;
+    }
+
+    @Override
+    public FullHttpResponse touch() {
+        if (response instanceof FullHttpResponse) {
+            return ((FullHttpResponse) response).touch();
+        } else {
+            return this;
+        }
+    }
+
+    @Override
+    public FullHttpResponse touch(Object o) {
+        if (response instanceof FullHttpResponse) {
+            return ((FullHttpResponse) response).touch(o);
+        } else {
+            return this;
+        }
+    }
+
+    @Override
+    public HttpHeaders trailingHeaders() {
+        return new DefaultHttpHeaders();
+    }
+
+    @Override
+    public FullHttpResponse duplicate() {
+        if (response instanceof FullHttpResponse) {
+            return ((FullHttpResponse) response).duplicate();
+        } else {
+            return this;
+        }
+    }
+
+    @Override
+    public FullHttpResponse retainedDuplicate() {
+        if (response instanceof FullHttpResponse) {
+            return ((FullHttpResponse) response).retainedDuplicate();
+        } else {
+            return this;
+        }
+    }
+
+    @Override
+    public FullHttpResponse replace(ByteBuf byteBuf) {
+        if (response instanceof FullHttpResponse) {
+            return ((FullHttpResponse) response).replace(byteBuf);
+        } else {
+            return this;
+        }
+    }
+
+    @Override
+    public ByteBuf content() {
+        return Unpooled.EMPTY_BUFFER;
+    }
+
+    @Override
+    public int refCnt() {
+        if (message instanceof ReferenceCounted) {
+            return ((ReferenceCounted) message).refCnt();
+        } else {
+            return 1;
+        }
+    }
+
+    @Override
+    public boolean release() {
+        return ReferenceCountUtil.release(message);
+    }
+
+    @Override
+    public boolean release(int decrement) {
+        return ReferenceCountUtil.release(message, decrement);
+    }
+}
diff --git a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/nrs/HandlerPublisher.java b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/nrs/HandlerPublisher.java
new file mode 100644
index 000000000000..0a29dab186de
--- /dev/null
+++ b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/nrs/HandlerPublisher.java
@@ -0,0 +1,510 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.http.nio.netty.internal.nrs;
+
+import io.netty.channel.ChannelDuplexHandler;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelInboundHandler;
+import io.netty.channel.ChannelPipeline;
+import io.netty.util.ReferenceCountUtil;
+import io.netty.util.concurrent.EventExecutor;
+import io.netty.util.internal.TypeParameterMatcher;
+import java.util.LinkedList;
+import java.util.Queue;
+import java.util.concurrent.atomic.AtomicBoolean;
+import org.reactivestreams.Publisher;
+import org.reactivestreams.Subscriber;
+import org.reactivestreams.Subscription;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+
+/**
+ * Publisher for a Netty Handler.
+ *
+ * This publisher supports only one subscriber.
+ *
+ * All interactions with the subscriber are done from the handlers executor, hence, they provide the same happens before
+ * semantics that Netty provides.
+ *
+ * The handler publishes all messages that match the type as specified by the passed in class. Any non matching messages
+ * are forwarded to the next handler.
+ *
+ * The publisher will signal complete if it receives a channel inactive event.
+ *
+ * The publisher will release any messages that it drops (for example, messages that are buffered when the subscriber
+ * cancels), but other than that, it does not release any messages.  It is up to the subscriber to release messages.
+ *
+ * If the subscriber cancels, the publisher will send a close event up the channel pipeline.
+ *
+ * All errors will short circuit the buffer, and cause publisher to immediately call the subscribers onError method,
+ * dropping the buffer.
+ *
+ * The publisher can be subscribed to or placed in a handler chain in any order.
+ *
+ * This class contains source imported from https://github.com/playframework/netty-reactive-streams,
+ * licensed under the Apache License 2.0, available at the time of the fork (1/31/2020) here:
+ * https://github.com/playframework/netty-reactive-streams/blob/master/LICENSE.txt
+ */
+@SdkInternalApi
+public class HandlerPublisher<T> extends ChannelDuplexHandler implements Publisher<T> {
+    /**
+     * Used for buffering a completion signal.
+     */
+    private static final Object COMPLETE = new Object() {
+        @Override
+        public String toString() {
+            return "COMPLETE";
+        }
+    };
+
+    private final EventExecutor executor;
+    private final TypeParameterMatcher matcher;
+
+    private final Queue<Object> buffer = new LinkedList<>();
+
+    /**
+     * Whether a subscriber has been provided. This is used to detect whether two subscribers are subscribing
+     * simultaneously.
+     */
+    private final AtomicBoolean hasSubscriber = new AtomicBoolean();
+
+    private State state = HandlerPublisher.State.NO_SUBSCRIBER_OR_CONTEXT;
+
+    private volatile Subscriber<? super T> subscriber;
+    private ChannelHandlerContext ctx;
+    private long outstandingDemand = 0;
+    private Throwable noSubscriberError;
+
+    /**
+     * Create a handler publisher.
+     *
+     * The supplied executor must be the same event loop as the event loop that this handler is eventually registered
+     * with, if not, an exception will be thrown when the handler is registered.
+     *
+     * @param executor The executor to execute asynchronous events from the subscriber on.
+     * @param subscriberMessageType The type of message this publisher accepts.
+     */
+    public HandlerPublisher(EventExecutor executor, Class<? extends T> subscriberMessageType) {
+        this.executor = executor;
+        this.matcher = TypeParameterMatcher.get(subscriberMessageType);
+    }
+
+    /**
+     * Returns {@code true} if the given message should be handled. If {@code false} it will be passed to the next
+     * {@link ChannelInboundHandler} in the {@link ChannelPipeline}.
+     *
+     * @param msg The message to check.
+     * @return True if the message should be accepted.
+     */
+    protected boolean acceptInboundMessage(Object msg) throws Exception {
+        return matcher.match(msg);
+    }
+
+    /**
+     * Override to handle when a subscriber cancels the subscription.
+     *
+     * By default, this method will simply close the channel.
+     */
+    protected void cancelled() {
+        ctx.close();
+    }
+
+    /**
+     * Override to intercept when demand is requested.
+     *
+     * By default, a channel read is invoked.
+     */
+    protected void requestDemand() {
+        ctx.read();
+    }
+
+    enum State {
+        /**
+         * Initial state. There's no subscriber, and no context.
+         */
+        NO_SUBSCRIBER_OR_CONTEXT,
+
+        /**
+         * A subscriber has been provided, but no context has been provided.
+         */
+        NO_CONTEXT,
+
+        /**
+         * A context has been provided, but no subscriber has been provided.
+         */
+        NO_SUBSCRIBER,
+
+        /**
+         * An error has been received, but there's no subscriber to receive it.
+         */
+        NO_SUBSCRIBER_ERROR,
+
+        /**
+         * There is no demand, and we have nothing buffered.
+         */
+        IDLE,
+
+        /**
+         * There is no demand, and we're buffering elements.
+         */
+        BUFFERING,
+
+        /**
+         * We have nothing buffered, but there is demand.
+         */
+        DEMANDING,
+
+        /**
+         * The stream is complete, however there are still elements buffered for which no demand has come from the subscriber.
+         */
+        DRAINING,
+
+        /**
+         * We're done, in the terminal state.
+         */
+        DONE
+    }
+
+    @Override
+    public void subscribe(final Subscriber<? super T> subscriber) {
+        if (subscriber == null) {
+            throw new NullPointerException("Null subscriber");
+        }
+
+        if (!hasSubscriber.compareAndSet(false, true)) {
+            // Must call onSubscribe first.
+            subscriber.onSubscribe(new Subscription() {
+                @Override
+                public void request(long n) {
+                }
+
+                @Override
+                public void cancel() {
+                }
+            });
+            subscriber.onError(new IllegalStateException("This publisher only supports one subscriber"));
+        } else {
+            executor.execute(new Runnable() {
+                @Override
+                public void run() {
+                    provideSubscriber(subscriber);
+                }
+            });
+        }
+    }
+
+    private void provideSubscriber(Subscriber<? super T> subscriber) {
+        this.subscriber = subscriber;
+        switch (state) {
+            case NO_SUBSCRIBER_OR_CONTEXT:
+                state = HandlerPublisher.State.NO_CONTEXT;
+                break;
+            case NO_SUBSCRIBER:
+                if (buffer.isEmpty()) {
+                    state = HandlerPublisher.State.IDLE;
+                } else {
+                    state = HandlerPublisher.State.BUFFERING;
+                }
+                subscriber.onSubscribe(new ChannelSubscription());
+                break;
+            case DRAINING:
+                subscriber.onSubscribe(new ChannelSubscription());
+                break;
+            case NO_SUBSCRIBER_ERROR:
+                cleanup();
+                state = HandlerPublisher.State.DONE;
+                subscriber.onSubscribe(new ChannelSubscription());
+                subscriber.onError(noSubscriberError);
+                break;
+            default:
+                // Do nothing
+        }
+    }
+
+    @Override
+    public void handlerAdded(ChannelHandlerContext ctx) throws Exception {
+        // If the channel is not yet registered, then it's not safe to invoke any methods on it, eg read() or close()
+        // So don't provide the context until it is registered.
+        if (ctx.channel().isRegistered()) {
+            provideChannelContext(ctx);
+        }
+    }
+
+    @Override
+    public void channelRegistered(ChannelHandlerContext ctx) throws Exception {
+        provideChannelContext(ctx);
+        ctx.fireChannelRegistered();
+    }
+
+    private void provideChannelContext(ChannelHandlerContext ctx) {
+        switch (state) {
+            case NO_SUBSCRIBER_OR_CONTEXT:
+                verifyRegisteredWithRightExecutor(ctx);
+                this.ctx = ctx;
+                // It's set, we don't have a subscriber
+                state = HandlerPublisher.State.NO_SUBSCRIBER;
+                break;
+            case NO_CONTEXT:
+                verifyRegisteredWithRightExecutor(ctx);
+                this.ctx = ctx;
+                state = HandlerPublisher.State.IDLE;
+                subscriber.onSubscribe(new ChannelSubscription());
+                break;
+            default:
+                // Ignore, this could be invoked twice by both handlerAdded and channelRegistered.
+        }
+    }
+
+    private void verifyRegisteredWithRightExecutor(ChannelHandlerContext ctx) {
+        if (!executor.inEventLoop()) {
+            throw new IllegalArgumentException("Channel handler MUST be registered with the same EventExecutor that it is "
+                                               + "created with.");
+        }
+    }
+
+    @Override
+    public void channelActive(ChannelHandlerContext ctx) throws Exception {
+        // If we subscribed before the channel was active, then our read would have been ignored.
+        if (state == HandlerPublisher.State.DEMANDING) {
+            requestDemand();
+        }
+        ctx.fireChannelActive();
+    }
+
+    private void receivedDemand(long demand) {
+        switch (state) {
+            case BUFFERING:
+            case DRAINING:
+                if (addDemand(demand)) {
+                    flushBuffer();
+                }
+                break;
+
+            case DEMANDING:
+                addDemand(demand);
+                break;
+
+            case IDLE:
+                if (addDemand(demand)) {
+                    // Important to change state to demanding before doing a read, in case we get a synchronous
+                    // read back.
+                    state = HandlerPublisher.State.DEMANDING;
+                    requestDemand();
+                }
+                break;
+            default:
+
+        }
+    }
+
+    private boolean addDemand(long demand) {
+
+        if (demand <= 0) {
+            illegalDemand();
+            return false;
+        } else {
+            if (outstandingDemand < Long.MAX_VALUE) {
+                outstandingDemand += demand;
+                if (outstandingDemand < 0) {
+                    outstandingDemand = Long.MAX_VALUE;
+                }
+            }
+            return true;
+        }
+    }
+
+    private void illegalDemand() {
+        cleanup();
+        subscriber.onError(new IllegalArgumentException("Request for 0 or negative elements in violation of Section 3.9 "
+                                                        + "of the Reactive Streams specification"));
+        ctx.close();
+        state = HandlerPublisher.State.DONE;
+    }
+
+    private void flushBuffer() {
+        while (!buffer.isEmpty() && (outstandingDemand > 0 || outstandingDemand == Long.MAX_VALUE)) {
+            publishMessage(buffer.remove());
+        }
+        if (buffer.isEmpty()) {
+            if (outstandingDemand > 0) {
+                if (state == HandlerPublisher.State.BUFFERING) {
+                    state = HandlerPublisher.State.DEMANDING;
+                } // otherwise we're draining
+                requestDemand();
+            } else if (state == HandlerPublisher.State.BUFFERING) {
+                state = HandlerPublisher.State.IDLE;
+            }
+        }
+    }
+
+    private void receivedCancel() {
+        switch (state) {
+            case BUFFERING:
+            case DEMANDING:
+            case IDLE:
+                cancelled();
+                state = HandlerPublisher.State.DONE;
+                break;
+            case DRAINING:
+                state = HandlerPublisher.State.DONE;
+                break;
+            default:
+                // ignore
+        }
+        cleanup();
+        subscriber = null;
+    }
+
+    @Override
+    public void channelRead(ChannelHandlerContext ctx, Object message) throws Exception {
+        if (acceptInboundMessage(message)) {
+            switch (state) {
+                case IDLE:
+                    buffer.add(message);
+                    state = HandlerPublisher.State.BUFFERING;
+                    break;
+                case NO_SUBSCRIBER:
+                case BUFFERING:
+                    buffer.add(message);
+                    break;
+                case DEMANDING:
+                    publishMessage(message);
+                    break;
+                case DRAINING:
+                case DONE:
+                    ReferenceCountUtil.release(message);
+                    break;
+                case NO_CONTEXT:
+                case NO_SUBSCRIBER_OR_CONTEXT:
+                    throw new IllegalStateException("Message received before added to the channel context");
+                default:
+                    // Ignore
+            }
+        } else {
+            ctx.fireChannelRead(message);
+        }
+    }
+
+    private void publishMessage(Object message) {
+        if (COMPLETE.equals(message)) {
+            subscriber.onComplete();
+            state = HandlerPublisher.State.DONE;
+        } else {
+            @SuppressWarnings("unchecked")
+            T next = (T) message;
+            subscriber.onNext(next);
+            if (outstandingDemand < Long.MAX_VALUE) {
+                outstandingDemand--;
+                if (outstandingDemand == 0 && state != HandlerPublisher.State.DRAINING) {
+                    if (buffer.isEmpty()) {
+                        state = HandlerPublisher.State.IDLE;
+                    } else {
+                        state = HandlerPublisher.State.BUFFERING;
+                    }
+                }
+            }
+        }
+    }
+
+    @Override
+    public void channelReadComplete(ChannelHandlerContext ctx) throws Exception {
+        if (state == HandlerPublisher.State.DEMANDING) {
+            requestDemand();
+        }
+    }
+
+    @Override
+    public void channelInactive(ChannelHandlerContext ctx) throws Exception {
+        complete();
+    }
+
+    @Override
+    public void handlerRemoved(ChannelHandlerContext ctx) throws Exception {
+        complete();
+    }
+
+    private void complete() {
+        switch (state) {
+            case NO_SUBSCRIBER:
+            case BUFFERING:
+                buffer.add(COMPLETE);
+                state = HandlerPublisher.State.DRAINING;
+                break;
+            case DEMANDING:
+            case IDLE:
+                subscriber.onComplete();
+                state = HandlerPublisher.State.DONE;
+                break;
+            case NO_SUBSCRIBER_ERROR:
+                // Ignore, we're already going to complete the stream with an error
+                // when the subscriber subscribes.
+                break;
+            default:
+                // Ignore
+        }
+    }
+
+    @Override
+    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
+        switch (state) {
+            case NO_SUBSCRIBER:
+                noSubscriberError = cause;
+                state = HandlerPublisher.State.NO_SUBSCRIBER_ERROR;
+                cleanup();
+                break;
+            case BUFFERING:
+            case DEMANDING:
+            case IDLE:
+            case DRAINING:
+                state = HandlerPublisher.State.DONE;
+                cleanup();
+                subscriber.onError(cause);
+                break;
+            default:
+                // Ignore
+        }
+    }
+
+    /**
+     * Release all elements from the buffer.
+     */
+    private void cleanup() {
+        while (!buffer.isEmpty()) {
+            ReferenceCountUtil.release(buffer.remove());
+        }
+    }
+
+    private class ChannelSubscription implements Subscription {
+        @Override
+        public void request(final long demand) {
+            executor.execute(new Runnable() {
+                @Override
+                public void run() {
+                    receivedDemand(demand);
+                }
+            });
+        }
+
+        @Override
+        public void cancel() {
+            executor.execute(new Runnable() {
+                @Override
+                public void run() {
+                    receivedCancel();
+                }
+            });
+        }
+    }
+}
diff --git a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/nrs/HandlerSubscriber.java b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/nrs/HandlerSubscriber.java
new file mode 100644
index 000000000000..81e2a648a145
--- /dev/null
+++ b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/nrs/HandlerSubscriber.java
@@ -0,0 +1,306 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.http.nio.netty.internal.nrs;
+
+import io.netty.channel.ChannelDuplexHandler;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelFutureListener;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.util.concurrent.EventExecutor;
+import java.util.concurrent.atomic.AtomicBoolean;
+import org.reactivestreams.Subscriber;
+import org.reactivestreams.Subscription;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.http.nio.netty.internal.utils.OrderedWriteChannelHandlerContext;
+import software.amazon.awssdk.utils.Validate;
+
+/**
+ * Subscriber that publishes received messages to the handler pipeline.
+ *
+ * This class contains source imported from https://github.com/playframework/netty-reactive-streams,
+ * licensed under the Apache License 2.0, available at the time of the fork (1/31/2020) here:
+ * https://github.com/playframework/netty-reactive-streams/blob/master/LICENSE.txt
+ *
+ * All original source licensed under the Apache License 2.0 by playframework. All modifications are
+ * licensed under the Apache License 2.0 by Amazon Web Services.
+ */
+@SdkInternalApi
+public class HandlerSubscriber<T> extends ChannelDuplexHandler implements Subscriber<T> {
+    static final long DEFAULT_LOW_WATERMARK = 4;
+    static final long DEFAULT_HIGH_WATERMARK = 16;
+
+    private final EventExecutor executor;
+    private final long demandLowWatermark;
+    private final long demandHighWatermark;
+
+    private final AtomicBoolean hasSubscription = new AtomicBoolean();
+
+    private volatile Subscription subscription;
+    private volatile ChannelHandlerContext ctx;
+
+    private State state = HandlerSubscriber.State.NO_SUBSCRIPTION_OR_CONTEXT;
+    private long outstandingDemand = 0;
+    private ChannelFuture lastWriteFuture;
+
+    /**
+     * Create a new handler subscriber.
+     *
+     * The supplied executor must be the same event loop as the event loop that this handler is eventually registered
+     * with, if not, an exception will be thrown when the handler is registered.
+     *
+     * @param executor The executor to execute asynchronous events from the publisher on.
+     * @param demandLowWatermark  The low watermark for demand. When demand drops below this, more will be requested.
+     * @param demandHighWatermark The high watermark for demand. This is the maximum that will be requested.
+     */
+    public HandlerSubscriber(EventExecutor executor, long demandLowWatermark, long demandHighWatermark) {
+        this.executor = executor;
+        this.demandLowWatermark = demandLowWatermark;
+        this.demandHighWatermark = demandHighWatermark;
+    }
+
+    /**
+     * Create a new handler subscriber with the default low and high watermarks.
+     *
+     * The supplied executor must be the same event loop as the event loop that this handler is eventually registered
+     * with, if not, an exception will be thrown when the handler is registered.
+     *
+     * @param executor The executor to execute asynchronous events from the publisher on.
+     * @see #HandlerSubscriber(EventExecutor, long, long)
+     */
+    public HandlerSubscriber(EventExecutor executor) {
+        this(executor, DEFAULT_LOW_WATERMARK, DEFAULT_HIGH_WATERMARK);
+    }
+
+    /**
+     * Override for custom error handling. By default, it closes the channel.
+     *
+     * @param error The error to handle.
+     */
+    protected void error(Throwable error) {
+        doClose();
+    }
+
+    /**
+     * Override for custom completion handling. By default, it closes the channel.
+     */
+    protected void complete() {
+        doClose();
+    }
+
+    enum State {
+        NO_SUBSCRIPTION_OR_CONTEXT,
+        NO_SUBSCRIPTION,
+        NO_CONTEXT,
+        INACTIVE,
+        RUNNING,
+        CANCELLED,
+        COMPLETE
+    }
+
+    @Override
+    public void handlerAdded(ChannelHandlerContext ctx) throws Exception {
+        verifyRegisteredWithRightExecutor(ctx);
+
+        // Ensure that writes to the context happen consecutively, even if they're performed from within the event loop.
+        // See https://github.com/netty/netty/issues/7783
+        ctx = OrderedWriteChannelHandlerContext.wrap(ctx);
+
+        switch (state) {
+            case NO_SUBSCRIPTION_OR_CONTEXT:
+                this.ctx = ctx;
+                // We were in no subscription or context, now we just don't have a subscription.
+                state = HandlerSubscriber.State.NO_SUBSCRIPTION;
+                break;
+            case NO_CONTEXT:
+                this.ctx = ctx;
+                // We were in no context, we're now fully initialised
+                maybeStart();
+                break;
+            case COMPLETE:
+                // We are complete, close
+                state = HandlerSubscriber.State.COMPLETE;
+                ctx.close();
+                break;
+            default:
+                throw new IllegalStateException("This handler must only be added to a pipeline once " + state);
+        }
+    }
+
+    @Override
+    public void channelRegistered(ChannelHandlerContext ctx) throws Exception {
+        verifyRegisteredWithRightExecutor(ctx);
+        ctx.fireChannelRegistered();
+    }
+
+    private void verifyRegisteredWithRightExecutor(ChannelHandlerContext ctx) {
+        if (ctx.channel().isRegistered() && !executor.inEventLoop()) {
+            throw new IllegalArgumentException("Channel handler MUST be registered with the same EventExecutor that "
+                                               + "it is created with.");
+        }
+    }
+
+    @Override
+    public void channelWritabilityChanged(ChannelHandlerContext ctx) throws Exception {
+        maybeRequestMore();
+        ctx.fireChannelWritabilityChanged();
+    }
+
+    @Override
+    public void channelActive(ChannelHandlerContext ctx) throws Exception {
+        if (state == HandlerSubscriber.State.INACTIVE) {
+            state = HandlerSubscriber.State.RUNNING;
+            maybeRequestMore();
+        }
+        ctx.fireChannelActive();
+    }
+
+    @Override
+    public void channelInactive(ChannelHandlerContext ctx) throws Exception {
+        cancel();
+        ctx.fireChannelInactive();
+    }
+
+    @Override
+    public void handlerRemoved(ChannelHandlerContext ctx) throws Exception {
+        cancel();
+    }
+
+    @Override
+    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
+        cancel();
+        ctx.fireExceptionCaught(cause);
+    }
+
+    private void cancel() {
+        switch (state) {
+            case NO_SUBSCRIPTION:
+                state = HandlerSubscriber.State.CANCELLED;
+                break;
+            case RUNNING:
+            case INACTIVE:
+                subscription.cancel();
+                state = HandlerSubscriber.State.CANCELLED;
+                break;
+            default:
+                // ignore
+        }
+    }
+
+    @Override
+    public void onSubscribe(final Subscription subscription) {
+        if (subscription == null) {
+            throw new NullPointerException("Null subscription");
+        } else if (!hasSubscription.compareAndSet(false, true)) {
+            subscription.cancel();
+        } else {
+            this.subscription = subscription;
+            executor.execute(new Runnable() {
+                @Override
+                public void run() {
+                    provideSubscription();
+                }
+            });
+        }
+    }
+
+    private void provideSubscription() {
+        switch (state) {
+            case NO_SUBSCRIPTION_OR_CONTEXT:
+                state = HandlerSubscriber.State.NO_CONTEXT;
+                break;
+            case NO_SUBSCRIPTION:
+                maybeStart();
+                break;
+            case CANCELLED:
+                subscription.cancel();
+                break;
+            default:
+                // ignore
+        }
+    }
+
+    private void maybeStart() {
+        if (ctx.channel().isActive()) {
+            state = HandlerSubscriber.State.RUNNING;
+            maybeRequestMore();
+        } else {
+            state = HandlerSubscriber.State.INACTIVE;
+        }
+    }
+
+    @Override
+    public void onNext(T t) {
+        // Publish straight to the context.
+        Validate.notNull(t, "Event must not be null.");
+        lastWriteFuture = ctx.writeAndFlush(t);
+        lastWriteFuture.addListener(new ChannelFutureListener() {
+            @Override
+            public void operationComplete(ChannelFuture future) throws Exception {
+                outstandingDemand--;
+                maybeRequestMore();
+            }
+        });
+    }
+
+    @Override
+    public void onError(final Throwable error) {
+        if (error == null) {
+            throw new NullPointerException("Null error published");
+        }
+        error(error);
+    }
+
+    @Override
+    public void onComplete() {
+        if (lastWriteFuture == null) {
+            complete();
+        } else {
+            lastWriteFuture.addListener(new ChannelFutureListener() {
+                @Override
+                public void operationComplete(ChannelFuture channelFuture) throws Exception {
+                    complete();
+                }
+            });
+        }
+    }
+
+    private void doClose() {
+        executor.execute(new Runnable() {
+            @Override
+            public void run() {
+                switch (state) {
+                    case NO_SUBSCRIPTION:
+                    case INACTIVE:
+                    case RUNNING:
+                        ctx.close();
+                        state = HandlerSubscriber.State.COMPLETE;
+                        break;
+                    default:
+                        // ignore
+                }
+            }
+        });
+    }
+
+    private void maybeRequestMore() {
+        if (outstandingDemand <= demandLowWatermark && ctx.channel().isWritable()) {
+            long toRequest = demandHighWatermark - outstandingDemand;
+
+            outstandingDemand = demandHighWatermark;
+            subscription.request(toRequest);
+        }
+    }
+}
diff --git a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/nrs/HttpStreamsClientHandler.java b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/nrs/HttpStreamsClientHandler.java
new file mode 100644
index 000000000000..ce24f9c565d9
--- /dev/null
+++ b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/nrs/HttpStreamsClientHandler.java
@@ -0,0 +1,186 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.http.nio.netty.internal.nrs;
+
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPromise;
+import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.handler.codec.http.FullHttpResponse;
+import io.netty.handler.codec.http.HttpContent;
+import io.netty.handler.codec.http.HttpRequest;
+import io.netty.handler.codec.http.HttpResponse;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import io.netty.handler.codec.http.HttpUtil;
+import io.netty.handler.codec.http.LastHttpContent;
+import io.netty.util.ReferenceCountUtil;
+import org.reactivestreams.Publisher;
+import org.reactivestreams.Subscriber;
+import org.reactivestreams.Subscription;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+
+/**
+ * Handler that converts written {@link StreamedHttpRequest} messages into {@link HttpRequest} messages
+ * followed by {@link HttpContent} messages and reads {@link HttpResponse} messages followed by
+ * {@link HttpContent} messages and produces {@link StreamedHttpResponse} messages.
+ *
+ * This allows request and response bodies to be handled using reactive streams.
+ *
+ * There are two types of messages that this handler accepts for writing, {@link StreamedHttpRequest} and
+ * {@link FullHttpRequest}. Writing any other messages may potentially lead to HTTP message mangling.
+ *
+ * There are two types of messages that this handler will send down the chain, {@link StreamedHttpResponse},
+ * and {@link FullHttpResponse}. If {@link io.netty.channel.ChannelOption#AUTO_READ} is false for the channel,
+ * then any {@link StreamedHttpResponse} messages <em>must</em> be subscribed to consume the body, otherwise
+ * it's possible that no read will be done of the messages.
+ *
+ * As long as messages are returned in the order that they arrive, this handler implicitly supports HTTP
+ * pipelining.
+ *
+ * This class contains source imported from https://github.com/playframework/netty-reactive-streams,
+ * licensed under the Apache License 2.0, available at the time of the fork (1/31/2020) here:
+ * https://github.com/playframework/netty-reactive-streams/blob/master/LICENSE.txt
+ *
+ * All original source licensed under the Apache License 2.0 by playframework. All modifications are
+ * licensed under the Apache License 2.0 by Amazon Web Services.
+ */
+@SdkInternalApi
+public class HttpStreamsClientHandler extends HttpStreamsHandler<HttpResponse, HttpRequest> {
+
+    private int inFlight = 0;
+    private int withServer = 0;
+    private ChannelPromise closeOnZeroInFlight = null;
+    private Subscriber<HttpContent> awaiting100Continue;
+    private StreamedHttpMessage awaiting100ContinueMessage;
+    private boolean ignoreResponseBody = false;
+
+    public HttpStreamsClientHandler() {
+        super(HttpResponse.class, HttpRequest.class);
+    }
+
+    @Override
+    protected boolean hasBody(HttpResponse response) {
+        if (response.status().code() >= 100 && response.status().code() < 200) {
+            return false;
+        }
+
+        if (response.status().equals(HttpResponseStatus.NO_CONTENT) ||
+            response.status().equals(HttpResponseStatus.NOT_MODIFIED)) {
+            return false;
+        }
+
+        if (HttpUtil.isTransferEncodingChunked(response)) {
+            return true;
+        }
+
+
+        if (HttpUtil.isContentLengthSet(response)) {
+            return HttpUtil.getContentLength(response) > 0;
+        }
+
+        return true;
+    }
+
+    @Override
+    public void close(ChannelHandlerContext ctx, ChannelPromise future) throws Exception {
+        if (inFlight == 0) {
+            ctx.close(future);
+        } else {
+            closeOnZeroInFlight = future;
+        }
+    }
+
+    @Override
+    protected void consumedInMessage(ChannelHandlerContext ctx) {
+        inFlight--;
+        withServer--;
+        if (inFlight == 0 && closeOnZeroInFlight != null) {
+            ctx.close(closeOnZeroInFlight);
+        }
+    }
+
+    @Override
+    protected void receivedOutMessage(ChannelHandlerContext ctx) {
+        inFlight++;
+    }
+
+    @Override
+    protected void sentOutMessage(ChannelHandlerContext ctx) {
+        withServer++;
+    }
+
+    @Override
+    protected HttpResponse createEmptyMessage(HttpResponse response) {
+        return new EmptyHttpResponse(response);
+    }
+
+    @Override
+    protected HttpResponse createStreamedMessage(HttpResponse response, Publisher<HttpContent> stream) {
+        return new DelegateStreamedHttpResponse(response, stream);
+    }
+
+    @Override
+    protected void subscribeSubscriberToStream(StreamedHttpMessage msg, Subscriber<HttpContent> subscriber) {
+        if (HttpUtil.is100ContinueExpected(msg)) {
+            awaiting100Continue = subscriber;
+            awaiting100ContinueMessage = msg;
+        } else {
+            super.subscribeSubscriberToStream(msg, subscriber);
+        }
+    }
+
+    @Override
+    public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
+
+        if (msg instanceof HttpResponse && awaiting100Continue != null && withServer == 0) {
+            HttpResponse response = (HttpResponse) msg;
+            if (response.status().equals(HttpResponseStatus.CONTINUE)) {
+                super.subscribeSubscriberToStream(awaiting100ContinueMessage, awaiting100Continue);
+                awaiting100Continue = null;
+                awaiting100ContinueMessage = null;
+                if (msg instanceof FullHttpResponse) {
+                    ReferenceCountUtil.release(msg);
+                } else {
+                    ignoreResponseBody = true;
+                }
+            } else {
+                awaiting100ContinueMessage.subscribe(new CancelledSubscriber<HttpContent>());
+                awaiting100ContinueMessage = null;
+                awaiting100Continue.onSubscribe(new NoOpSubscription());
+                awaiting100Continue.onComplete();
+                awaiting100Continue = null;
+                super.channelRead(ctx, msg);
+            }
+        } else if (ignoreResponseBody && msg instanceof HttpContent) {
+
+            ReferenceCountUtil.release(msg);
+            if (msg instanceof LastHttpContent) {
+                ignoreResponseBody = false;
+            }
+        } else {
+            super.channelRead(ctx, msg);
+        }
+    }
+
+    private static class NoOpSubscription implements Subscription {
+        @Override
+        public void request(long n) {
+        }
+
+        @Override
+        public void cancel() {
+        }
+    }
+}
diff --git a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/nrs/HttpStreamsHandler.java b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/nrs/HttpStreamsHandler.java
new file mode 100644
index 000000000000..e2c643093cc2
--- /dev/null
+++ b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/nrs/HttpStreamsHandler.java
@@ -0,0 +1,391 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.http.nio.netty.internal.nrs;
+
+import io.netty.channel.ChannelDuplexHandler;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelFutureListener;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPromise;
+import io.netty.handler.codec.http.FullHttpMessage;
+import io.netty.handler.codec.http.HttpContent;
+import io.netty.handler.codec.http.HttpMessage;
+import io.netty.handler.codec.http.LastHttpContent;
+import io.netty.util.ReferenceCountUtil;
+import java.util.LinkedList;
+import java.util.Queue;
+import org.reactivestreams.Publisher;
+import org.reactivestreams.Subscriber;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+
+/**
+ * This class contains source imported from https://github.com/playframework/netty-reactive-streams,
+ * licensed under the Apache License 2.0, available at the time of the fork (1/31/2020) here:
+ * https://github.com/playframework/netty-reactive-streams/blob/master/LICENSE.txt
+ *
+ * All original source licensed under the Apache License 2.0 by playframework. All modifications are
+ * licensed under the Apache License 2.0 by Amazon Web Services.
+ */
+@SdkInternalApi
+abstract class HttpStreamsHandler<InT extends HttpMessage, OutT extends HttpMessage> extends ChannelDuplexHandler {
+
+    private final Queue<Outgoing> outgoing = new LinkedList<>();
+    private final Class<InT> inClass;
+    private final Class<OutT> outClass;
+
+    /**
+     * The incoming message that is currently being streamed out to a subscriber.
+     *
+     * This is tracked so that if its subscriber cancels, we can go into a mode where we ignore the rest of the body.
+     * Since subscribers may cancel as many times as they like, including well after they've received all their content,
+     * we need to track what the current message that's being streamed out is so that we can ignore it if it's not
+     * currently being streamed out.
+     */
+    private InT currentlyStreamedMessage;
+
+    /**
+     * Ignore the remaining reads for the incoming message.
+     *
+     * This is used in conjunction with currentlyStreamedMessage, as well as in situations where we have received the
+     * full body, but still might be expecting a last http content message.
+     */
+    private boolean ignoreBodyRead;
+
+    /**
+     * Whether a LastHttpContent message needs to be written once the incoming publisher completes.
+     *
+     * Since the publisher may itself publish a LastHttpContent message, we need to track this fact, because if it
+     * doesn't, then we need to write one ourselves.
+     */
+    private boolean sendLastHttpContent;
+
+    HttpStreamsHandler(Class<InT> inClass, Class<OutT> outClass) {
+        this.inClass = inClass;
+        this.outClass = outClass;
+    }
+
+    /**
+     * Whether the given incoming message has a body.
+     */
+    protected abstract boolean hasBody(InT in);
+
+    /**
+     * Create an empty incoming message. This must be of type FullHttpMessage, and is invoked when we've determined
+     * that an incoming message can't have a body, so we send it on as a FullHttpMessage.
+     */
+    protected abstract InT createEmptyMessage(InT in);
+
+    /**
+     * Create a streamed incoming message with the given stream.
+     */
+    protected abstract InT createStreamedMessage(InT in, Publisher<HttpContent> stream);
+
+    /**
+     * Invoked when an incoming message is first received.
+     *
+     * Overridden by sub classes for state tracking.
+     */
+    protected void receivedInMessage(ChannelHandlerContext ctx) {
+    }
+
+    /**
+     * Invoked when an incoming message is fully consumed.
+     *
+     * Overridden by sub classes for state tracking.
+     */
+    protected void consumedInMessage(ChannelHandlerContext ctx) {
+    }
+
+    /**
+     * Invoked when an outgoing message is first received.
+     *
+     * Overridden by sub classes for state tracking.
+     */
+    protected void receivedOutMessage(ChannelHandlerContext ctx) {
+    }
+
+    /**
+     * Invoked when an outgoing message is fully sent.
+     *
+     * Overridden by sub classes for state tracking.
+     */
+    protected void sentOutMessage(ChannelHandlerContext ctx) {
+    }
+
+    /**
+     * Subscribe the given subscriber to the given streamed message.
+     *
+     * Provided so that the client subclass can intercept this to hold off sending the body of an expect 100 continue
+     * request.
+     */
+    protected void subscribeSubscriberToStream(StreamedHttpMessage msg, Subscriber<HttpContent> subscriber) {
+        msg.subscribe(subscriber);
+    }
+
+    /**
+     * Invoked every time a read of the incoming body is requested by the subscriber.
+     *
+     * Provided so that the server subclass can intercept this to send a 100 continue response.
+     */
+    protected void bodyRequested(ChannelHandlerContext ctx) {
+    }
+
+    @Override
+    public void channelRead(final ChannelHandlerContext ctx, Object msg) throws Exception {
+
+        if (inClass.isInstance(msg)) {
+
+            receivedInMessage(ctx);
+            InT inMsg = inClass.cast(msg);
+
+            if (inMsg instanceof FullHttpMessage) {
+
+                // Forward as is
+                ctx.fireChannelRead(inMsg);
+                consumedInMessage(ctx);
+
+            } else if (!hasBody(inMsg)) {
+
+                // Wrap in empty message
+                ctx.fireChannelRead(createEmptyMessage(inMsg));
+                consumedInMessage(ctx);
+
+                // There will be a LastHttpContent message coming after this, ignore it
+                ignoreBodyRead = true;
+
+            } else {
+
+                currentlyStreamedMessage = inMsg;
+                // It has a body, stream it
+                HandlerPublisher<HttpContent> publisher = new HandlerPublisher<HttpContent>(ctx.executor(), HttpContent.class) {
+                    @Override
+                    protected void cancelled() {
+                        if (ctx.executor().inEventLoop()) {
+                            handleCancelled(ctx, inMsg);
+                        } else {
+                            ctx.executor().execute(new Runnable() {
+                                @Override
+                                public void run() {
+                                    handleCancelled(ctx, inMsg);
+                                }
+                            });
+                        }
+                    }
+
+                    @Override
+                    protected void requestDemand() {
+                        bodyRequested(ctx);
+                        super.requestDemand();
+                    }
+                };
+
+                ctx.channel().pipeline().addAfter(ctx.name(), ctx.name() + "-body-publisher", publisher);
+                ctx.fireChannelRead(createStreamedMessage(inMsg, publisher));
+            }
+        } else if (msg instanceof HttpContent) {
+            handleReadHttpContent(ctx, (HttpContent) msg);
+        }
+    }
+
+    private void handleCancelled(ChannelHandlerContext ctx, InT msg) {
+        if (currentlyStreamedMessage == msg) {
+            ignoreBodyRead = true;
+            // Need to do a read in case the subscriber ignored a read completed.
+            ctx.read();
+        }
+    }
+
+    private void handleReadHttpContent(ChannelHandlerContext ctx, HttpContent content) {
+        if (!ignoreBodyRead) {
+            if (content instanceof LastHttpContent) {
+
+                if (content.content().readableBytes() > 0 ||
+                        !((LastHttpContent) content).trailingHeaders().isEmpty()) {
+                    // It has data or trailing headers, send them
+                    ctx.fireChannelRead(content);
+                } else {
+                    ReferenceCountUtil.release(content);
+                }
+
+                removeHandlerIfActive(ctx, ctx.name() + "-body-publisher");
+                currentlyStreamedMessage = null;
+                consumedInMessage(ctx);
+
+            } else {
+                ctx.fireChannelRead(content);
+            }
+
+        } else {
+            ReferenceCountUtil.release(content);
+            if (content instanceof LastHttpContent) {
+                ignoreBodyRead = false;
+                if (currentlyStreamedMessage != null) {
+                    removeHandlerIfActive(ctx, ctx.name() + "-body-publisher");
+                }
+                currentlyStreamedMessage = null;
+            }
+        }
+    }
+
+    @Override
+    public void channelReadComplete(ChannelHandlerContext ctx) throws Exception {
+        if (ignoreBodyRead) {
+            ctx.read();
+        } else {
+            ctx.fireChannelReadComplete();
+        }
+    }
+
+    @Override
+    public void write(final ChannelHandlerContext ctx, Object msg, final ChannelPromise promise) throws Exception {
+        if (outClass.isInstance(msg)) {
+
+            Outgoing out = new Outgoing(outClass.cast(msg), promise);
+            receivedOutMessage(ctx);
+
+            if (outgoing.isEmpty()) {
+                outgoing.add(out);
+                flushNext(ctx);
+            } else {
+                outgoing.add(out);
+            }
+
+        } else if (msg instanceof LastHttpContent) {
+
+            sendLastHttpContent = false;
+            ctx.write(msg, promise);
+        } else {
+
+            ctx.write(msg, promise);
+        }
+    }
+
+    protected void unbufferedWrite(final ChannelHandlerContext ctx, final Outgoing out) {
+
+        if (out.message instanceof FullHttpMessage) {
+            // Forward as is
+            ctx.writeAndFlush(out.message, out.promise);
+            out.promise.addListener(new ChannelFutureListener() {
+                @Override
+                public void operationComplete(ChannelFuture channelFuture) throws Exception {
+                    executeInEventLoop(ctx, new Runnable() {
+                        @Override
+                        public void run() {
+                            sentOutMessage(ctx);
+                            outgoing.remove();
+                            flushNext(ctx);
+                        }
+                    });
+                }
+            });
+
+        } else if (out.message instanceof StreamedHttpMessage) {
+
+            StreamedHttpMessage streamed = (StreamedHttpMessage) out.message;
+            HandlerSubscriber<HttpContent> subscriber = new HandlerSubscriber<HttpContent>(ctx.executor()) {
+                @Override
+                protected void error(Throwable error) {
+                    out.promise.tryFailure(error);
+                    ctx.close();
+                }
+
+                @Override
+                protected void complete() {
+                    executeInEventLoop(ctx, new Runnable() {
+                        @Override
+                        public void run() {
+                            completeBody(ctx);
+                        }
+                    });
+                }
+            };
+
+            sendLastHttpContent = true;
+
+            // DON'T pass the promise through, create a new promise instead.
+            ctx.writeAndFlush(out.message);
+
+            ctx.pipeline().addAfter(ctx.name(), ctx.name() + "-body-subscriber", subscriber);
+            subscribeSubscriberToStream(streamed, subscriber);
+        }
+
+    }
+
+    private void completeBody(final ChannelHandlerContext ctx) {
+        removeHandlerIfActive(ctx, ctx.name() + "-body-subscriber");
+
+        if (sendLastHttpContent) {
+            ChannelPromise promise = outgoing.peek().promise;
+            ctx.writeAndFlush(LastHttpContent.EMPTY_LAST_CONTENT, promise).addListener(
+                    new ChannelFutureListener() {
+                        @Override
+                        public void operationComplete(ChannelFuture channelFuture) throws Exception {
+                            executeInEventLoop(ctx, new Runnable() {
+                                @Override
+                                public void run() {
+                                    outgoing.remove();
+                                    sentOutMessage(ctx);
+                                    flushNext(ctx);
+                                }
+                            });
+                        }
+                    }
+            );
+        } else {
+            outgoing.remove().promise.setSuccess();
+            sentOutMessage(ctx);
+            flushNext(ctx);
+        }
+    }
+
+    /**
+     * Most operations we want to do even if the channel is not active, because if it's not, then we want to encounter
+     * the error that occurs when that operation happens and so that it can be passed up to the user. However, removing
+     * handlers should only be done if the channel is active, because the error that is encountered when they aren't
+     * makes no sense to the user (NoSuchElementException).
+     */
+    private void removeHandlerIfActive(ChannelHandlerContext ctx, String name) {
+        if (ctx.channel().isActive()) {
+            ctx.pipeline().remove(name);
+        }
+    }
+
+    private void flushNext(ChannelHandlerContext ctx) {
+        if (!outgoing.isEmpty()) {
+            unbufferedWrite(ctx, outgoing.element());
+        } else {
+            ctx.fireChannelWritabilityChanged();
+        }
+    }
+
+    private void executeInEventLoop(ChannelHandlerContext ctx, Runnable runnable) {
+        if (ctx.executor().inEventLoop()) {
+            runnable.run();
+        } else {
+            ctx.executor().execute(runnable);
+        }
+    }
+
+    class Outgoing {
+        final OutT message;
+        final ChannelPromise promise;
+
+        Outgoing(OutT message, ChannelPromise promise) {
+            this.message = message;
+            this.promise = promise;
+        }
+    }
+}
diff --git a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/nrs/StreamedHttpMessage.java b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/nrs/StreamedHttpMessage.java
new file mode 100644
index 000000000000..23230e3c67fa
--- /dev/null
+++ b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/nrs/StreamedHttpMessage.java
@@ -0,0 +1,40 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.http.nio.netty.internal.nrs;
+
+import io.netty.handler.codec.http.HttpContent;
+import io.netty.handler.codec.http.HttpMessage;
+import org.reactivestreams.Publisher;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+
+/**
+ * Combines {@link HttpMessage} and {@link Publisher} into one
+ * message. So it represents an http message with a stream of {@link HttpContent}
+ * messages that can be subscribed to.
+ *
+ * Note that receivers of this message <em>must</em> consume the publisher,
+ * since the publisher will exert back pressure up the stream if not consumed.
+ *
+ * This class contains source imported from https://github.com/playframework/netty-reactive-streams,
+ * licensed under the Apache License 2.0, available at the time of the fork (1/31/2020) here:
+ * https://github.com/playframework/netty-reactive-streams/blob/master/LICENSE.txt
+ *
+ * All original source licensed under the Apache License 2.0 by playframework. All modifications are
+ * licensed under the Apache License 2.0 by Amazon Web Services.
+ */
+@SdkInternalApi
+public interface StreamedHttpMessage extends HttpMessage, Publisher<HttpContent> {
+}
diff --git a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/nrs/StreamedHttpRequest.java b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/nrs/StreamedHttpRequest.java
new file mode 100644
index 000000000000..750715ead4ef
--- /dev/null
+++ b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/nrs/StreamedHttpRequest.java
@@ -0,0 +1,35 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.http.nio.netty.internal.nrs;
+
+import io.netty.handler.codec.http.HttpRequest;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+
+/**
+ * Combines {@link HttpRequest} and {@link StreamedHttpMessage} into one
+ * message. So it represents an http request with a stream of
+ * {@link io.netty.handler.codec.http.HttpContent} messages that can be subscribed to.
+ *
+ * This class contains source imported from https://github.com/playframework/netty-reactive-streams,
+ * licensed under the Apache License 2.0, available at the time of the fork (1/31/2020) here:
+ * https://github.com/playframework/netty-reactive-streams/blob/master/LICENSE.txt
+ *
+ * All original source licensed under the Apache License 2.0 by playframework. All modifications are
+ * licensed under the Apache License 2.0 by Amazon Web Services.
+ */
+@SdkInternalApi
+public interface StreamedHttpRequest extends HttpRequest, StreamedHttpMessage {
+}
diff --git a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/nrs/StreamedHttpResponse.java b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/nrs/StreamedHttpResponse.java
new file mode 100644
index 000000000000..6ce4aa900375
--- /dev/null
+++ b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/nrs/StreamedHttpResponse.java
@@ -0,0 +1,35 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.http.nio.netty.internal.nrs;
+
+import io.netty.handler.codec.http.HttpResponse;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+
+/**
+ * Combines {@link HttpResponse} and {@link StreamedHttpMessage} into one
+ * message. So it represents an http response with a stream of
+ * {@link io.netty.handler.codec.http.HttpContent} messages that can be subscribed to.
+ *
+ * This class contains source imported from https://github.com/playframework/netty-reactive-streams,
+ * licensed under the Apache License 2.0, available at the time of the fork (1/31/2020) here:
+ * https://github.com/playframework/netty-reactive-streams/blob/master/LICENSE.txt
+ *
+ * All original source licensed under the Apache License 2.0 by playframework. All modifications are
+ * licensed under the Apache License 2.0 by Amazon Web Services.
+ */
+@SdkInternalApi
+public interface StreamedHttpResponse extends HttpResponse, StreamedHttpMessage {
+}
diff --git a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/nrs/package-info.java b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/nrs/package-info.java
new file mode 100644
index 000000000000..ba9b003b0d3c
--- /dev/null
+++ b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/nrs/package-info.java
@@ -0,0 +1,24 @@
+/*
+ * 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.
+ */
+
+/**
+ * This package contains source imported from https://github.com/playframework/netty-reactive-streams,
+ * licensed under the Apache License 2.0, available at the time of the fork (1/31/2020) here:
+ * https://github.com/playframework/netty-reactive-streams/blob/master/LICENSE.txt
+ *
+ * All original source licensed under the Apache License 2.0 by playframework. All modifications are
+ * licensed under the Apache License 2.0 by Amazon Web Services.
+ */
+package software.amazon.awssdk.http.nio.netty.internal.nrs;
diff --git a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/utils/BetterFixedChannelPool.java b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/utils/BetterFixedChannelPool.java
index 50a0d3c23e82..b22f2353a14e 100644
--- a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/utils/BetterFixedChannelPool.java
+++ b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/utils/BetterFixedChannelPool.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -70,7 +70,7 @@ public enum AcquireTimeoutAction {
 
     // There is no need to worry about synchronization as everything that modified the queue or counts is done
     // by the above EventExecutor.
-    private final Queue<AcquireTask> pendingAcquireQueue = new ArrayDeque<AcquireTask>();
+    private final Queue<AcquireTask> pendingAcquireQueue = new ArrayDeque<>();
     private final int maxConnections;
     private final int maxPendingAcquires;
     private int acquiredChannelCount;
@@ -137,12 +137,7 @@ public Future<Channel> acquire(final Promise<Channel> promise) {
             if (executor.inEventLoop()) {
                 acquire0(promise);
             } else {
-                executor.execute(new Runnable() {
-                    @Override
-                    public void run() {
-                        acquire0(promise);
-                    }
-                });
+                executor.execute(() -> acquire0(promise));
             }
         } catch (Throwable cause) {
             promise.setFailure(cause);
@@ -348,12 +343,7 @@ public void close() {
         if (executor.inEventLoop()) {
             close0();
         } else {
-            executor.submit(new Runnable() {
-                @Override
-                public void run() {
-                    close0();
-                }
-            }).awaitUninterruptibly();
+            executor.submit(() -> close0()).awaitUninterruptibly();
         }
     }
 
@@ -376,12 +366,7 @@ private void close0() {
 
             // Ensure we dispatch this on another Thread as close0 will be called from the EventExecutor and we need
             // to ensure we will not block in a EventExecutor.
-            GlobalEventExecutor.INSTANCE.execute(new Runnable() {
-                @Override
-                public void run() {
-                    delegateChannelPool.close();
-                }
-            });
+            GlobalEventExecutor.INSTANCE.execute(() -> delegateChannelPool.close());
         }
     }
 
diff --git a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/utils/ChannelUtils.java b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/utils/ChannelUtils.java
index 2b437e70630e..0901fa8e0590 100644
--- a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/utils/ChannelUtils.java
+++ b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/utils/ChannelUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -26,7 +26,8 @@
 
 @SdkInternalApi
 public final class ChannelUtils {
-    private ChannelUtils() {}
+    private ChannelUtils() {
+    }
 
     /**
      * Removes handlers of the given class types from the pipeline.
diff --git a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/utils/DelegatingChannelHandlerContext.java b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/utils/DelegatingChannelHandlerContext.java
new file mode 100644
index 000000000000..d1c5f43de607
--- /dev/null
+++ b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/utils/DelegatingChannelHandlerContext.java
@@ -0,0 +1,248 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.http.nio.netty.internal.utils;
+
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelProgressivePromise;
+import io.netty.channel.ChannelPromise;
+import io.netty.util.Attribute;
+import io.netty.util.AttributeKey;
+import io.netty.util.concurrent.EventExecutor;
+import java.net.SocketAddress;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+
+/**
+ * An abstract implementation of {@link ChannelHandlerContext} that delegates to another
+ * context for non-overridden methods.
+ */
+@SdkInternalApi
+public abstract class DelegatingChannelHandlerContext implements ChannelHandlerContext {
+    private final ChannelHandlerContext delegate;
+
+    public DelegatingChannelHandlerContext(ChannelHandlerContext delegate) {
+        this.delegate = delegate;
+    }
+
+    @Override
+    public Channel channel() {
+        return delegate.channel();
+    }
+
+    @Override
+    public EventExecutor executor() {
+        return delegate.executor();
+    }
+
+    @Override
+    public String name() {
+        return delegate.name();
+    }
+
+    @Override
+    public ChannelHandler handler() {
+        return delegate.handler();
+    }
+
+    @Override
+    public boolean isRemoved() {
+        return delegate.isRemoved();
+    }
+
+    @Override
+    public ChannelHandlerContext fireChannelRegistered() {
+        return delegate.fireChannelRegistered();
+    }
+
+    @Override
+    public ChannelHandlerContext fireChannelUnregistered() {
+        return delegate.fireChannelUnregistered();
+    }
+
+    @Override
+    public ChannelHandlerContext fireChannelActive() {
+        return delegate.fireChannelActive();
+    }
+
+    @Override
+    public ChannelHandlerContext fireChannelInactive() {
+        return delegate.fireChannelInactive();
+    }
+
+    @Override
+    public ChannelHandlerContext fireExceptionCaught(Throwable cause) {
+        return delegate.fireExceptionCaught(cause);
+    }
+
+    @Override
+    public ChannelHandlerContext fireUserEventTriggered(Object evt) {
+        return delegate.fireUserEventTriggered(evt);
+    }
+
+    @Override
+    public ChannelHandlerContext fireChannelRead(Object msg) {
+        return delegate.fireChannelRead(msg);
+    }
+
+    @Override
+    public ChannelHandlerContext fireChannelReadComplete() {
+        return delegate.fireChannelReadComplete();
+    }
+
+    @Override
+    public ChannelHandlerContext fireChannelWritabilityChanged() {
+        return delegate.fireChannelWritabilityChanged();
+    }
+
+    @Override
+    public ChannelFuture bind(SocketAddress localAddress) {
+        return delegate.bind(localAddress);
+    }
+
+    @Override
+    public ChannelFuture connect(SocketAddress remoteAddress) {
+        return delegate.connect(remoteAddress);
+    }
+
+    @Override
+    public ChannelFuture connect(SocketAddress remoteAddress, SocketAddress localAddress) {
+        return delegate.connect(remoteAddress, localAddress);
+    }
+
+    @Override
+    public ChannelFuture disconnect() {
+        return delegate.disconnect();
+    }
+
+    @Override
+    public ChannelFuture close() {
+        return delegate.close();
+    }
+
+    @Override
+    public ChannelFuture deregister() {
+        return delegate.deregister();
+    }
+
+    @Override
+    public ChannelFuture bind(SocketAddress localAddress, ChannelPromise promise) {
+        return delegate.bind(localAddress, promise);
+    }
+
+    @Override
+    public ChannelFuture connect(SocketAddress remoteAddress, ChannelPromise promise) {
+        return delegate.connect(remoteAddress, promise);
+    }
+
+    @Override
+    public ChannelFuture connect(SocketAddress remoteAddress, SocketAddress localAddress, ChannelPromise promise) {
+        return delegate.connect(remoteAddress, localAddress, promise);
+    }
+
+    @Override
+    public ChannelFuture disconnect(ChannelPromise promise) {
+        return delegate.disconnect(promise);
+    }
+
+    @Override
+    public ChannelFuture close(ChannelPromise promise) {
+        return delegate.close(promise);
+    }
+
+    @Override
+    public ChannelFuture deregister(ChannelPromise promise) {
+        return delegate.deregister(promise);
+    }
+
+    @Override
+    public ChannelHandlerContext read() {
+        return delegate.read();
+    }
+
+    @Override
+    public ChannelFuture write(Object msg) {
+        return delegate.write(msg);
+    }
+
+    @Override
+    public ChannelFuture write(Object msg, ChannelPromise promise) {
+        return delegate.write(msg, promise);
+    }
+
+    @Override
+    public ChannelHandlerContext flush() {
+        return delegate.flush();
+    }
+
+    @Override
+    public ChannelFuture writeAndFlush(Object msg, ChannelPromise promise) {
+        return delegate.writeAndFlush(msg, promise);
+    }
+
+    @Override
+    public ChannelFuture writeAndFlush(Object msg) {
+        return delegate.writeAndFlush(msg);
+    }
+
+    @Override
+    public ChannelPromise newPromise() {
+        return delegate.newPromise();
+    }
+
+    @Override
+    public ChannelProgressivePromise newProgressivePromise() {
+        return delegate.newProgressivePromise();
+    }
+
+    @Override
+    public ChannelFuture newSucceededFuture() {
+        return delegate.newSucceededFuture();
+    }
+
+    @Override
+    public ChannelFuture newFailedFuture(Throwable cause) {
+        return delegate.newFailedFuture(cause);
+    }
+
+    @Override
+    public ChannelPromise voidPromise() {
+        return delegate.voidPromise();
+    }
+
+    @Override
+    public ChannelPipeline pipeline() {
+        return delegate.pipeline();
+    }
+
+    @Override
+    public ByteBufAllocator alloc() {
+        return delegate.alloc();
+    }
+
+    @Override
+    public <T> Attribute<T> attr(AttributeKey<T> key) {
+        return delegate.attr(key);
+    }
+
+    @Override
+    public <T> boolean hasAttr(AttributeKey<T> key) {
+        return delegate.hasAttr(key);
+    }
+}
diff --git a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/utils/ExceptionHandlingUtils.java b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/utils/ExceptionHandlingUtils.java
index 74d53b02a338..edf117884672 100644
--- a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/utils/ExceptionHandlingUtils.java
+++ b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/utils/ExceptionHandlingUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -22,7 +22,8 @@
 @SdkInternalApi
 public final class ExceptionHandlingUtils {
 
-    private ExceptionHandlingUtils() {}
+    private ExceptionHandlingUtils() {
+    }
 
     /**
      * Runs a task within try-catch block. All exceptions thrown from the execution
diff --git a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/utils/NettyUtils.java b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/utils/NettyUtils.java
index 6fa8842ec503..4d0b20b4a128 100644
--- a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/utils/NettyUtils.java
+++ b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/utils/NettyUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -15,6 +15,7 @@
 
 package software.amazon.awssdk.http.nio.netty.internal.utils;
 
+import io.netty.channel.EventLoop;
 import io.netty.util.concurrent.EventExecutor;
 import io.netty.util.concurrent.Future;
 import io.netty.util.concurrent.GenericFutureListener;
@@ -24,15 +25,17 @@
 import java.util.function.BiConsumer;
 import java.util.function.Function;
 import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.utils.Logger;
 
 @SdkInternalApi
 public final class NettyUtils {
-
     /**
      * Completed succeed future.
      */
     public static final SucceededFuture<?> SUCCEEDED_FUTURE = new SucceededFuture<>(null, null);
 
+    private static final Logger log = Logger.loggerFor(NettyUtils.class);
+
     private NettyUtils() {
     }
 
@@ -55,7 +58,7 @@ private NettyUtils() {
             } else {
                 try {
                     promise.setSuccess(successFunction.apply(success));
-                } catch (Exception e) {
+                } catch (Throwable e) {
                     promise.setFailure(e);
                 }
             }
@@ -82,7 +85,7 @@ private NettyUtils() {
             } else {
                 try {
                     successConsumer.accept(success, promise);
-                } catch (Exception e) {
+                } catch (Throwable e) {
                     // If the successConsumer fails synchronously then we can notify the promise. If it fails asynchronously
                     // it's up to the successConsumer to notify.
                     promise.setFailure(e);
@@ -132,9 +135,29 @@ public static void doInEventLoop(EventExecutor eventExecutor, Runnable runnable)
      */
     public static void doInEventLoop(EventExecutor eventExecutor, Runnable runnable, Promise<?> promise) {
         try {
-            doInEventLoop(eventExecutor, runnable);
-        } catch (Exception e) {
+            if (eventExecutor.inEventLoop()) {
+                runnable.run();
+            } else {
+                eventExecutor.submit(() -> {
+                    try {
+                        runnable.run();
+                    } catch (Throwable e) {
+                        promise.setFailure(e);
+                    }
+                });
+            }
+        } catch (Throwable e) {
             promise.setFailure(e);
         }
     }
+
+    public static void warnIfNotInEventLoop(EventLoop loop) {
+        assert loop.inEventLoop();
+        if (!loop.inEventLoop()) {
+            Exception exception =
+                new IllegalStateException("Execution is not in the expected event loop. Please report this issue to the "
+                                          + "AWS SDK for Java team on GitHub, because it could result in race conditions.");
+            log.warn(() -> "Execution is happening outside of the expected event loop.", exception);
+        }
+    }
 }
diff --git a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/utils/OrderedWriteChannelHandlerContext.java b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/utils/OrderedWriteChannelHandlerContext.java
new file mode 100644
index 000000000000..9e06a565e8e2
--- /dev/null
+++ b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/utils/OrderedWriteChannelHandlerContext.java
@@ -0,0 +1,91 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.http.nio.netty.internal.utils;
+
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPromise;
+import io.netty.util.AttributeKey;
+import java.util.function.Consumer;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+
+/**
+ * An implementation of {@link ChannelHandlerContext} that ensures all writes are performed in the order they are invoked.
+ *
+ * This works around https://github.com/netty/netty/issues/7783 where writes by an event loop 'skip ahead' of writes off of the
+ * event loop.
+ */
+@SdkInternalApi
+public class OrderedWriteChannelHandlerContext extends DelegatingChannelHandlerContext {
+    private static final AttributeKey<Void> ORDERED =
+        AttributeKey.newInstance("aws.http.nio.netty.async.OrderedWriteChannelHandlerContext.ORDERED");
+
+    private OrderedWriteChannelHandlerContext(ChannelHandlerContext delegate) {
+        super(delegate);
+        delegate.channel().attr(ORDERED).set(null);
+    }
+
+    public static ChannelHandlerContext wrap(ChannelHandlerContext ctx) {
+        if (ctx.channel().hasAttr(ORDERED)) {
+            return ctx;
+        }
+        return new OrderedWriteChannelHandlerContext(ctx);
+    }
+
+    @Override
+    public ChannelFuture write(Object msg) {
+        return doInOrder(promise -> super.write(msg, promise));
+    }
+
+    @Override
+    public ChannelFuture write(Object msg, ChannelPromise promise) {
+        doInOrder(() -> super.write(msg, promise));
+        return promise;
+    }
+
+    @Override
+    public ChannelFuture writeAndFlush(Object msg) {
+        return doInOrder(promise -> super.writeAndFlush(msg, promise));
+    }
+
+    @Override
+    public ChannelFuture writeAndFlush(Object msg, ChannelPromise promise) {
+        doInOrder(() -> super.writeAndFlush(msg, promise));
+        return promise;
+    }
+
+    private ChannelFuture doInOrder(Consumer<ChannelPromise> task) {
+        ChannelPromise promise = newPromise();
+        if (!channel().eventLoop().inEventLoop()) {
+            task.accept(promise);
+        } else {
+            // If we're in the event loop, queue a task to perform the write, so that it occurs after writes that were scheduled
+            // off of the event loop.
+            channel().eventLoop().execute(() -> task.accept(promise));
+        }
+        return promise;
+    }
+
+    private void doInOrder(Runnable task) {
+        if (!channel().eventLoop().inEventLoop()) {
+            task.run();
+        } else {
+            // If we're in the event loop, queue a task to perform the write, so that it occurs after writes that were scheduled
+            // off of the event loop.
+            channel().eventLoop().execute(task);
+        }
+    }
+}
diff --git a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/utils/SocketChannelResolver.java b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/utils/SocketChannelResolver.java
index e1302fe2f74e..1d80dad5850f 100644
--- a/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/utils/SocketChannelResolver.java
+++ b/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/utils/SocketChannelResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-clients/netty-nio-client/src/main/resources/META-INF/services/software.amazon.awssdk.http.async.SdkAsyncHttpService b/http-clients/netty-nio-client/src/main/resources/META-INF/services/software.amazon.awssdk.http.async.SdkAsyncHttpService
index 22e47f11f670..c3e05ecd129a 100644
--- a/http-clients/netty-nio-client/src/main/resources/META-INF/services/software.amazon.awssdk.http.async.SdkAsyncHttpService
+++ b/http-clients/netty-nio-client/src/main/resources/META-INF/services/software.amazon.awssdk.http.async.SdkAsyncHttpService
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/ClientTlsAuthTestBase.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/ClientTlsAuthTestBase.java
index eb8946970db4..468aad992e47 100644
--- a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/ClientTlsAuthTestBase.java
+++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/ClientTlsAuthTestBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/EmptyPublisher.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/EmptyPublisher.java
index 78af13d3869b..1f1308a2f07f 100644
--- a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/EmptyPublisher.java
+++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/EmptyPublisher.java
@@ -1,3 +1,18 @@
+/*
+ * 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.
+ */
+
 package software.amazon.awssdk.http.nio.netty;
 
 import java.nio.ByteBuffer;
diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/Http2ConfigurationTest.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/Http2ConfigurationTest.java
new file mode 100644
index 000000000000..ec93d1455fb5
--- /dev/null
+++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/Http2ConfigurationTest.java
@@ -0,0 +1,91 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.http.nio.netty;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+
+public class Http2ConfigurationTest {
+    @Rule
+    public ExpectedException expected = ExpectedException.none();
+
+    @Test
+    public void builder_returnsInstance() {
+        assertThat(Http2Configuration.builder()).isNotNull();
+    }
+
+    @Test
+    public void build_buildsCorrectConfig() {
+        long maxStreams = 1;
+        int initialWindowSize = 2;
+
+        Http2Configuration config = Http2Configuration.builder()
+                .maxStreams(maxStreams)
+                .initialWindowSize(initialWindowSize)
+                .build();
+
+        assertThat(config.maxStreams()).isEqualTo(maxStreams);
+        assertThat(config.initialWindowSize()).isEqualTo(initialWindowSize);
+    }
+
+    @Test
+    public void builder_toBuilder_roundTrip() {
+        Http2Configuration config1 = Http2Configuration.builder()
+                .maxStreams(7L)
+                .initialWindowSize(42)
+                .build();
+
+        Http2Configuration config2 = config1.toBuilder().build();
+
+        assertThat(config1).isEqualTo(config2);
+    }
+
+    @Test
+    public void builder_maxStream_nullValue_doesNotThrow() {
+        Http2Configuration.builder().maxStreams(null);
+    }
+
+    @Test
+    public void builder_maxStream_negative_throws() {
+        expected.expect(IllegalArgumentException.class);
+        Http2Configuration.builder().maxStreams(-1L);
+    }
+
+    @Test
+    public void builder_maxStream_0_throws() {
+        expected.expect(IllegalArgumentException.class);
+        Http2Configuration.builder().maxStreams(0L);
+    }
+
+    @Test
+    public void builder_initialWindowSize_nullValue_doesNotThrow() {
+        Http2Configuration.builder().initialWindowSize(null);
+    }
+
+    @Test
+    public void builder_initialWindowSize_negative_throws() {
+        expected.expect(IllegalArgumentException.class);
+        Http2Configuration.builder().initialWindowSize(-1);
+    }
+
+    @Test
+    public void builder_initialWindowSize_0_throws() {
+        expected.expect(IllegalArgumentException.class);
+        Http2Configuration.builder().initialWindowSize(0);
+    }
+}
diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/NettyClientTlsAuthTest.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/NettyClientTlsAuthTest.java
index aabb31a54dea..b9533c8527cd 100644
--- a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/NettyClientTlsAuthTest.java
+++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/NettyClientTlsAuthTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/NettyNioAsyncHttpClientSpiVerificationTest.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/NettyNioAsyncHttpClientSpiVerificationTest.java
index 870e1b5f1931..9b992cc90918 100644
--- a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/NettyNioAsyncHttpClientSpiVerificationTest.java
+++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/NettyNioAsyncHttpClientSpiVerificationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/NettyNioAsyncHttpClientWireMockTest.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/NettyNioAsyncHttpClientWireMockTest.java
index 07951a02e562..23a887321616 100644
--- a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/NettyNioAsyncHttpClientWireMockTest.java
+++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/NettyNioAsyncHttpClientWireMockTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -41,6 +41,7 @@
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.when;
 
+import com.github.tomakehurst.wiremock.WireMockServer;
 import com.github.tomakehurst.wiremock.http.Fault;
 import com.github.tomakehurst.wiremock.junit.WireMockRule;
 import io.netty.channel.Channel;
@@ -68,6 +69,7 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import java.util.stream.Stream;
+import javax.net.ssl.TrustManagerFactory;
 import org.assertj.core.api.Condition;
 import org.junit.AfterClass;
 import org.junit.Before;
@@ -79,6 +81,7 @@
 import org.mockito.stubbing.Answer;
 import org.reactivestreams.Subscriber;
 import org.reactivestreams.Subscription;
+import software.amazon.awssdk.http.HttpTestUtils;
 import software.amazon.awssdk.http.SdkHttpConfigurationOption;
 import software.amazon.awssdk.http.SdkHttpFullRequest;
 import software.amazon.awssdk.http.SdkHttpMethod;
@@ -113,6 +116,32 @@ public static void tearDown() throws Exception {
         client.close();
     }
 
+    @Test
+    public void defaultConnectionIdleTimeout() {
+        try (NettyNioAsyncHttpClient client = (NettyNioAsyncHttpClient) NettyNioAsyncHttpClient.builder().build()) {
+            assertThat(client.configuration().idleTimeoutMillis()).isEqualTo(5000);
+        }
+    }
+
+    @Test
+    public void overrideConnectionIdleTimeout_shouldHonor() {
+        try (NettyNioAsyncHttpClient client = (NettyNioAsyncHttpClient) NettyNioAsyncHttpClient.builder()
+                                                                                               .connectionMaxIdleTime(Duration.ofMillis(1000))
+                                                                                               .build()) {
+            assertThat(client.configuration().idleTimeoutMillis()).isEqualTo(1000);
+        }
+    }
+
+    @Test
+    public void invalidMaxPendingConnectionAcquireConfig_shouldPropagateException() {
+        try (SdkAsyncHttpClient customClient = NettyNioAsyncHttpClient.builder()
+                                                                 .maxConcurrency(1)
+                                                                 .maxPendingConnectionAcquires(0)
+                                                                 .build()) {
+            assertThatThrownBy(() -> makeSimpleRequest(customClient)).hasMessageContaining("java.lang.IllegalArgumentException: maxPendingAcquires: 0 (expected: >= 1)");
+        }
+    }
+
     @Test
     public void customFactoryIsUsed() throws Exception {
         ThreadFactory threadFactory = spy(new CustomThreadFactory());
@@ -349,6 +378,30 @@ public void responseConnectionClosed_shouldCloseAndReleaseChannel() throws Excep
         eventLoopGroup.eventLoopGroup().shutdownGracefully().awaitUninterruptibly();
     }
 
+    @Test
+    public void builderUsesProvidedTrustManagersProvider() throws Exception {
+        WireMockServer selfSignedServer = HttpTestUtils.createSelfSignedServer();
+
+        TrustManagerFactory managerFactory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
+        managerFactory.init(HttpTestUtils.getSelfSignedKeyStore());
+
+        try (SdkAsyncHttpClient netty = NettyNioAsyncHttpClient.builder()
+                                                               .tlsTrustManagersProvider(managerFactory::getTrustManagers)
+                                                               .build()) {
+            selfSignedServer.start();
+            URI uri = URI.create("https://localhost:" + selfSignedServer.httpsPort());
+
+            SdkHttpRequest request = createRequest(uri);
+            RecordingResponseHandler recorder = new RecordingResponseHandler();
+            client.execute(AsyncExecuteRequest.builder().request(request).requestContentPublisher(createProvider("")).responseHandler(recorder).build());
+
+            recorder.completeFuture.get(5, TimeUnit.SECONDS);
+        } finally {
+            selfSignedServer.stop();
+        }
+    }
+
+
     /**
      * Make a simple async request and wait for it to fiish.
      *
diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/ProxyConfigurationTest.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/ProxyConfigurationTest.java
index 753a2f4b6ac4..239754f22e21 100644
--- a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/ProxyConfigurationTest.java
+++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/ProxyConfigurationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/ProxyWireMockTest.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/ProxyWireMockTest.java
index afab5f09a218..9a0b45094eec 100644
--- a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/ProxyWireMockTest.java
+++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/ProxyWireMockTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/RecordingNetworkTrafficListener.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/RecordingNetworkTrafficListener.java
index a9b3ba99e15c..d9ed5cad9f07 100644
--- a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/RecordingNetworkTrafficListener.java
+++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/RecordingNetworkTrafficListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/RecordingResponseHandler.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/RecordingResponseHandler.java
index 483fce008ecd..52989a2bb966 100644
--- a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/RecordingResponseHandler.java
+++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/RecordingResponseHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/SdkEventLoopGroupTest.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/SdkEventLoopGroupTest.java
index 61ea7420ad38..a3ae76469359 100644
--- a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/SdkEventLoopGroupTest.java
+++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/SdkEventLoopGroupTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/fault/GoAwayTest.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/fault/GoAwayTest.java
new file mode 100644
index 000000000000..f46480dc29a2
--- /dev/null
+++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/fault/GoAwayTest.java
@@ -0,0 +1,450 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.http.nio.netty.fault;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+import io.netty.bootstrap.ServerBootstrap;
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelDuplexHandler;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelInitializer;
+import io.netty.channel.ChannelOption;
+import io.netty.channel.nio.NioEventLoopGroup;
+import io.netty.channel.socket.ServerSocketChannel;
+import io.netty.channel.socket.SocketChannel;
+import io.netty.channel.socket.nio.NioServerSocketChannel;
+import io.netty.handler.codec.http2.DefaultHttp2FrameReader;
+import io.netty.handler.codec.http2.DefaultHttp2FrameWriter;
+import io.netty.handler.codec.http2.DefaultHttp2Headers;
+import io.netty.handler.codec.http2.Http2FrameAdapter;
+import io.netty.handler.codec.http2.Http2FrameListener;
+import io.netty.handler.codec.http2.Http2FrameReader;
+import io.netty.handler.codec.http2.Http2FrameWriter;
+import io.netty.handler.codec.http2.Http2Headers;
+import io.netty.handler.codec.http2.Http2Settings;
+import io.netty.util.AttributeKey;
+import io.reactivex.Flowable;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.Supplier;
+import org.junit.After;
+import org.junit.Test;
+import org.reactivestreams.Publisher;
+import software.amazon.awssdk.http.Protocol;
+import software.amazon.awssdk.http.SdkHttpFullRequest;
+import software.amazon.awssdk.http.SdkHttpMethod;
+import software.amazon.awssdk.http.SdkHttpResponse;
+import software.amazon.awssdk.http.async.AsyncExecuteRequest;
+import software.amazon.awssdk.http.async.SdkAsyncHttpClient;
+import software.amazon.awssdk.http.async.SdkAsyncHttpResponseHandler;
+import software.amazon.awssdk.http.nio.netty.EmptyPublisher;
+import software.amazon.awssdk.http.nio.netty.NettyNioAsyncHttpClient;
+import software.amazon.awssdk.http.nio.netty.SdkEventLoopGroup;
+import software.amazon.awssdk.http.nio.netty.internal.http2.GoAwayException;
+
+/**
+ * Tests to ensure that the client behaves as expected when it receives GOAWAY messages.
+ */
+public class GoAwayTest {
+
+    private SdkAsyncHttpClient netty;
+    private SimpleEndpointDriver endpointDriver;
+
+    @After
+    public void teardown() throws InterruptedException {
+        if (endpointDriver != null) {
+            endpointDriver.shutdown();
+        }
+        endpointDriver = null;
+
+        if (netty != null) {
+            netty.close();
+        }
+        netty = null;
+    }
+
+    @Test
+    public void goAwayCanCloseAllStreams() throws InterruptedException {
+        Set<String> serverChannels = ConcurrentHashMap.newKeySet();
+
+        CountDownLatch allRequestsReceived = new CountDownLatch(2);
+        Supplier<Http2FrameListener> frameListenerSupplier = () -> new TestFrameListener() {
+            @Override
+            public void onHeadersRead(ChannelHandlerContext ctx, int streamId, Http2Headers headers, int padding, boolean endStream) {
+                onHeadersReadDelegator(ctx, streamId);
+            }
+
+            @Override
+            public void onHeadersRead(ChannelHandlerContext ctx, int streamId, Http2Headers headers, int streamDependency, short weight, boolean exclusive, int padding, boolean endStream) {
+                onHeadersReadDelegator(ctx, streamId);
+            }
+
+            private void onHeadersReadDelegator(ChannelHandlerContext ctx, int streamId) {
+                serverChannels.add(ctx.channel().id().asShortText());
+
+                Http2Headers outboundHeaders = new DefaultHttp2Headers()
+                    .status("200")
+                    .add("content-type", "text/plain")
+                    .addInt("content-length", 5);
+
+                frameWriter().writeHeaders(ctx, streamId, outboundHeaders, 0, false, ctx.newPromise());
+                ctx.flush();
+
+                allRequestsReceived.countDown();
+            }
+        };
+
+        endpointDriver = new SimpleEndpointDriver(frameListenerSupplier);
+        endpointDriver.init();
+
+        netty = NettyNioAsyncHttpClient.builder()
+                                       .protocol(Protocol.HTTP2)
+                                       .build();
+
+        CompletableFuture<Void> request1 = sendGetRequest();
+        CompletableFuture<Void> request2 = sendGetRequest();
+
+        allRequestsReceived.await();
+
+        endpointDriver.channels.forEach(ch -> {
+            if (serverChannels.contains(ch.id().asShortText())) {
+                endpointDriver.goAway(ch, 0);
+            }
+        });
+
+        assertThatThrownBy(() -> request1.join())
+            .hasMessageContaining("GOAWAY received from service")
+            .hasCauseInstanceOf(GoAwayException.class);
+
+        assertThatThrownBy(() -> request2.join())
+            .hasMessageContaining("GOAWAY received from service")
+            .hasCauseInstanceOf(GoAwayException.class);
+
+        assertThat(endpointDriver.currentConnectionCount.get()).isEqualTo(0);
+    }
+
+    @Test
+    public void execute_goAwayReceived_existingChannelsNotReused() throws InterruptedException {
+        // Frame listener supplier for each connection
+        Supplier<Http2FrameListener> frameListenerSupplier = () -> new TestFrameListener() {
+            @Override
+            public void onHeadersRead(ChannelHandlerContext ctx, int streamId, Http2Headers headers, int padding, boolean endStream) {
+                onHeadersReadDelegator(ctx, streamId);
+            }
+
+            @Override
+            public void onHeadersRead(ChannelHandlerContext ctx, int streamId, Http2Headers headers, int streamDependency, short weight, boolean exclusive, int padding, boolean endStream) {
+                onHeadersReadDelegator(ctx, streamId);
+            }
+
+            private void onHeadersReadDelegator(ChannelHandlerContext ctx, int streamId) {
+                frameWriter().writeHeaders(ctx, streamId, new DefaultHttp2Headers().add("content-length", "0").status("204"), 0, true, ctx.newPromise());
+                ctx.flush();
+            }
+        };
+
+        endpointDriver = new SimpleEndpointDriver(frameListenerSupplier);
+        endpointDriver.init();
+
+        netty = NettyNioAsyncHttpClient.builder()
+                .eventLoopGroup(SdkEventLoopGroup.builder().numberOfThreads(1).build())
+                .protocol(Protocol.HTTP2)
+                .build();
+
+        sendGetRequest().join();
+
+        // Note: It's possible the initial request can cause the client to allocate more than 1 channel
+        int initialChannelNum = endpointDriver.channels.size();
+
+        // Send GOAWAY to all the currently open channels
+        endpointDriver.channels.forEach(ch -> endpointDriver.goAway(ch, 1));
+
+        // Need to give a chance for the streams to get closed
+        Thread.sleep(1000);
+
+        // Since the existing channels are now invalid, this request should cause a new channel to be opened
+        sendGetRequest().join();
+
+        assertThat(endpointDriver.channels).hasSize(initialChannelNum + 1);
+    }
+
+    // The client should not close streams that are less than the 'last stream
+    // ID' given in the GOAWAY frame since it means they were processed fully
+    @Test
+    public void execute_goAwayReceived_lastStreamId_lowerStreamsNotClosed() throws InterruptedException {
+        ConcurrentHashMap<String, Set<Integer>> channelToStreams = new ConcurrentHashMap<>();
+
+        CompletableFuture<Void> stream3Received = new CompletableFuture<>();
+        CountDownLatch allRequestsReceived = new CountDownLatch(2);
+        byte[] getPayload = "go away!".getBytes(StandardCharsets.UTF_8);
+        Supplier<Http2FrameListener> frameListenerSupplier = () -> new TestFrameListener() {
+            @Override
+            public void onHeadersRead(ChannelHandlerContext ctx, int streamId, Http2Headers headers, int padding, boolean endStream) {
+                onHeadersReadDelegator(ctx, streamId);
+            }
+
+            @Override
+            public void onHeadersRead(ChannelHandlerContext ctx, int streamId, Http2Headers headers, int streamDependency, short weight, boolean exclusive, int padding, boolean endStream) {
+                onHeadersReadDelegator(ctx, streamId);
+            }
+
+            private void onHeadersReadDelegator(ChannelHandlerContext ctx, int streamId) {
+                channelToStreams.computeIfAbsent(ctx.channel().id().asShortText(), (k) -> Collections.newSetFromMap(new ConcurrentHashMap<>())).add(streamId);
+
+                if (streamId == 3) {
+                    stream3Received.complete(null);
+                }
+
+                if (streamId < 5) {
+                    Http2Headers outboundHeaders = new DefaultHttp2Headers()
+                            .status("200")
+                            .add("content-type", "text/plain")
+                            .addInt("content-length", getPayload.length);
+
+                    frameWriter().writeHeaders(ctx, streamId, outboundHeaders, 0, false, ctx.newPromise());
+                    ctx.flush();
+                }
+
+                allRequestsReceived.countDown();
+            }
+        };
+
+        endpointDriver = new SimpleEndpointDriver(frameListenerSupplier);
+        endpointDriver.init();
+
+        netty = NettyNioAsyncHttpClient.builder()
+                .protocol(Protocol.HTTP2)
+                .build();
+
+        CompletableFuture<Void> stream3Cf = sendGetRequest();// stream ID 3
+
+        // Wait for the request to be received just to ensure that it is given ID 3
+        stream3Received.join();
+
+        CompletableFuture<Void> stream5Cf = sendGetRequest();// stream ID 5
+
+        allRequestsReceived.await(10, TimeUnit.SECONDS);
+
+        // send the GOAWAY first, specifying that everything after 3 is not processed
+        endpointDriver.channels.forEach(ch -> {
+            Set<Integer> streams = channelToStreams.getOrDefault(ch.id().asShortText(), Collections.emptySet());
+            if (streams.contains(3)) {
+                endpointDriver.goAway(ch, 3);
+            }
+        });
+
+        // now send the DATA for stream 3, which should still be valid
+        endpointDriver.channels.forEach(ch -> {
+            Set<Integer> streams = channelToStreams.getOrDefault(ch.id().asShortText(), Collections.emptySet());
+            if (streams.contains(3)) {
+                endpointDriver.data(ch, 3, getPayload);
+            }
+        });
+
+        waitForFuture(stream3Cf);
+        waitForFuture(stream5Cf);
+
+        assertThat(stream3Cf.isCompletedExceptionally()).isFalse();
+        assertThat(stream5Cf.isCompletedExceptionally()).isTrue();
+        stream5Cf.exceptionally(e -> {
+            assertThat(e).isInstanceOf(IOException.class);
+            return null;
+        });
+    }
+
+    private CompletableFuture<Void> sendGetRequest() {
+        AsyncExecuteRequest req = AsyncExecuteRequest.builder()
+                .responseHandler(new SdkAsyncHttpResponseHandler() {
+                    private SdkHttpResponse headers;
+
+                    @Override
+                    public void onHeaders(SdkHttpResponse headers) {
+                        this.headers = headers;
+                    }
+
+                    @Override
+                    public void onStream(Publisher<ByteBuffer> stream) {
+                        // Consume the stream in order to complete request
+                        Flowable.fromPublisher(stream).subscribe(b -> {}, t -> {});
+                    }
+
+                    @Override
+                    public void onError(Throwable error) {
+                    }
+                })
+                .request(SdkHttpFullRequest.builder()
+                        .method(SdkHttpMethod.GET)
+                        .protocol("http")
+                        .host("localhost")
+                        .port(endpointDriver.port())
+                        .build())
+                .requestContentPublisher(new EmptyPublisher())
+                .build();
+
+        return netty.execute(req);
+    }
+
+    private static void waitForFuture(CompletableFuture<?> cf) {
+        try {
+            cf.get(2, TimeUnit.SECONDS);
+        } catch (ExecutionException | InterruptedException t) {
+        } catch (TimeoutException t) {
+            throw new RuntimeException("Future did not complete after 2 seconds.", t);
+        }
+    }
+
+    // Minimal class to simulate an H2 endpoint
+    private static class SimpleEndpointDriver extends ChannelInitializer<SocketChannel> {
+        private List<SocketChannel> channels = new ArrayList<>();
+        private final NioEventLoopGroup group = new NioEventLoopGroup();
+        private final Supplier<Http2FrameListener> frameListenerSupplier;
+        private ServerBootstrap bootstrap;
+        private ServerSocketChannel serverSock;
+        private AtomicInteger currentConnectionCount = new AtomicInteger(0);
+
+        public SimpleEndpointDriver(Supplier<Http2FrameListener> frameListenerSupplier) {
+            this.frameListenerSupplier = frameListenerSupplier;
+        }
+
+        public void init() throws InterruptedException {
+            bootstrap = new ServerBootstrap()
+                    .channel(NioServerSocketChannel.class)
+                    .group(new NioEventLoopGroup())
+                    .childHandler(this)
+                    .childOption(ChannelOption.SO_KEEPALIVE, true);
+
+            serverSock = (ServerSocketChannel) bootstrap.bind(0).sync().channel();
+        }
+
+        public void shutdown() throws InterruptedException {
+            group.shutdownGracefully().await();
+        }
+
+        public int port() {
+            return serverSock.localAddress().getPort();
+        }
+
+        public void goAway(SocketChannel ch, int lastStreamId) {
+            ByteBuf b = ch.alloc().buffer(9 + 8);
+
+            // Frame header
+            b.writeMedium(8); // Payload length
+            b.writeByte(0x7); // Type = GOAWAY
+            b.writeByte(0x0); // Flags
+            b.writeInt(0); // 0 = connection frame
+
+            // GOAWAY payload
+            b.writeInt(lastStreamId);
+            b.writeInt(0); // Error code
+
+            ch.writeAndFlush(b);
+        }
+
+        public void data(SocketChannel ch, int streamId, byte[] payload) {
+            ByteBuf b = ch.alloc().buffer(9 + payload.length);
+
+            // Header
+            b.writeMedium(payload.length); // Payload length
+            b.writeByte(0); // Type = DATA
+            b.writeByte(0x1); // 0x1 = EOF
+            b.writeInt(streamId);
+
+            // Payload
+            b.writeBytes(payload);
+
+            ch.writeAndFlush(b);
+        }
+
+        @Override
+        protected void initChannel(SocketChannel ch) throws Exception {
+            channels.add(ch);
+            ch.pipeline().addLast(new Http2ConnHandler(this, frameListenerSupplier.get()));
+        }
+
+        @Override
+        public void channelActive(ChannelHandlerContext ctx) throws Exception {
+            currentConnectionCount.incrementAndGet();
+            super.channelActive(ctx);
+        }
+
+        @Override
+        public void channelInactive(ChannelHandlerContext ctx) throws Exception {
+            currentConnectionCount.decrementAndGet();
+            super.channelInactive(ctx);
+        }
+    }
+
+    private abstract class TestFrameListener extends Http2FrameAdapter {
+        private final Http2FrameWriter frameWriter = new DefaultHttp2FrameWriter();
+
+        protected final Http2FrameWriter frameWriter() {
+            return frameWriter;
+        }
+
+        @Override
+        public void onSettingsRead(ChannelHandlerContext ctx, Http2Settings settings) {
+            frameWriter().writeSettings(ctx, new Http2Settings(), ctx.newPromise());
+            frameWriter().writeSettingsAck(ctx, ctx.newPromise());
+            ctx.flush();
+        }
+    }
+
+    private static class Http2ConnHandler extends ChannelDuplexHandler {
+        // Prior knowledge preface
+        private static final String PREFACE = "PRI * HTTP/2.0\r\n\r\nSM\r\n\r\n";
+        private static final AttributeKey<Boolean> H2_ESTABLISHED = AttributeKey.newInstance("h2-etablished");
+
+        private final Http2FrameReader frameReader = new DefaultHttp2FrameReader();
+        private final SimpleEndpointDriver simpleEndpointDriver;
+        private final Http2FrameListener frameListener;
+
+        public Http2ConnHandler(SimpleEndpointDriver simpleEndpointDriver, Http2FrameListener frameListener) {
+            this.simpleEndpointDriver = simpleEndpointDriver;
+            this.frameListener = frameListener;
+        }
+
+        @Override
+        public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
+            ByteBuf bb = (ByteBuf) msg;
+            if (!isH2Established(ctx.channel())) {
+                String prefaceString = bb.readCharSequence(24, StandardCharsets.UTF_8).toString();
+                if (PREFACE.equals(prefaceString)) {
+                    ctx.channel().attr(H2_ESTABLISHED).set(true);
+                }
+            }
+            frameReader.readFrame(ctx, bb, frameListener);
+        }
+
+        private boolean isH2Established(Channel ch) {
+            return Boolean.TRUE.equals(ch.attr(H2_ESTABLISHED).get());
+        }
+    }
+}
diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/fault/PingTimeoutTest.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/fault/PingTimeoutTest.java
new file mode 100644
index 000000000000..a309addf27ff
--- /dev/null
+++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/fault/PingTimeoutTest.java
@@ -0,0 +1,257 @@
+/*
+ * 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.
+ */
+
+
+package software.amazon.awssdk.http.nio.netty.fault;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+import io.netty.bootstrap.ServerBootstrap;
+import io.netty.buffer.Unpooled;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelInitializer;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.SimpleChannelInboundHandler;
+import io.netty.channel.nio.NioEventLoopGroup;
+import io.netty.channel.socket.ServerSocketChannel;
+import io.netty.channel.socket.nio.NioServerSocketChannel;
+import io.netty.handler.codec.http2.DefaultHttp2DataFrame;
+import io.netty.handler.codec.http2.DefaultHttp2Headers;
+import io.netty.handler.codec.http2.DefaultHttp2HeadersFrame;
+import io.netty.handler.codec.http2.Http2DataFrame;
+import io.netty.handler.codec.http2.Http2Frame;
+import io.netty.handler.codec.http2.Http2FrameCodec;
+import io.netty.handler.codec.http2.Http2FrameCodecBuilder;
+import io.netty.handler.codec.http2.Http2FrameLogger;
+import io.netty.handler.codec.http2.Http2Headers;
+import io.netty.handler.codec.http2.Http2MultiplexHandler;
+import io.netty.handler.codec.http2.Http2Settings;
+import io.netty.handler.logging.LogLevel;
+import io.netty.handler.logging.LoggingHandler;
+import io.netty.handler.ssl.SslContext;
+import io.netty.handler.ssl.util.SelfSignedCertificate;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.time.Duration;
+import java.time.Instant;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import java.util.concurrent.atomic.AtomicInteger;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+import org.reactivestreams.Publisher;
+import org.reactivestreams.Subscriber;
+import org.reactivestreams.Subscription;
+import software.amazon.awssdk.http.Protocol;
+import software.amazon.awssdk.http.SdkHttpFullRequest;
+import software.amazon.awssdk.http.SdkHttpMethod;
+import software.amazon.awssdk.http.SdkHttpResponse;
+import software.amazon.awssdk.http.async.AsyncExecuteRequest;
+import software.amazon.awssdk.http.async.SdkAsyncHttpClient;
+import software.amazon.awssdk.http.async.SdkAsyncHttpResponseHandler;
+import software.amazon.awssdk.http.nio.netty.EmptyPublisher;
+import software.amazon.awssdk.http.nio.netty.Http2Configuration;
+import software.amazon.awssdk.http.nio.netty.NettyNioAsyncHttpClient;
+import software.amazon.awssdk.http.nio.netty.internal.http2.PingFailedException;
+
+/**
+ * Testing the scenario where the server never acks PING
+ */
+public class PingTimeoutTest {
+    @Rule
+    public ExpectedException expected = ExpectedException.none();
+
+    private Server server;
+    private SdkAsyncHttpClient netty;
+
+    @Before
+    public void methodSetup() throws Exception {
+        server = new Server();
+        server.init();
+    }
+
+    @After
+    public void methodTeardown() throws InterruptedException {
+        server.shutdown();
+
+        if (netty != null) {
+            netty.close();
+        }
+
+        netty = null;
+    }
+
+    @Test
+    public void pingHealthCheck_null_shouldThrowExceptionAfter5Sec() {
+        Instant a = Instant.now();
+        assertThatThrownBy(() -> makeRequest(null).join())
+            .hasMessageContaining("An error occurred on the connection")
+            .hasCauseInstanceOf(IOException.class)
+            .hasRootCauseInstanceOf(PingFailedException.class);
+        assertThat(Duration.between(a, Instant.now())).isBetween(Duration.ofSeconds(5), Duration.ofSeconds(7));
+    }
+
+    @Test
+    public void pingHealthCheck_10sec_shouldThrowExceptionAfter10Secs() {
+        Instant a = Instant.now();
+        assertThatThrownBy(() -> makeRequest(Duration.ofSeconds(10)).join()).hasCauseInstanceOf(IOException.class)
+                                                                            .hasMessageContaining("An error occurred on the connection")
+                                                                            .hasRootCauseInstanceOf(PingFailedException.class);
+        assertThat(Duration.between(a, Instant.now())).isBetween(Duration.ofSeconds(10), Duration.ofSeconds(12));
+    }
+
+    @Test
+    public void pingHealthCheck_0_disabled_shouldNotThrowException() throws Exception {
+        expected.expect(TimeoutException.class);
+        CompletableFuture<Void> requestFuture = makeRequest(Duration.ofMillis(0));
+        try {
+            requestFuture.get(8, TimeUnit.SECONDS);
+        } finally {
+            assertThat(requestFuture.isDone()).isFalse();
+        }
+    }
+
+    private CompletableFuture<Void> makeRequest(Duration healthCheckPingPeriod) {
+        netty = NettyNioAsyncHttpClient.builder()
+                .protocol(Protocol.HTTP2)
+                .http2Configuration(Http2Configuration.builder().healthCheckPingPeriod(healthCheckPingPeriod).build())
+                .build();
+
+        SdkHttpFullRequest request = SdkHttpFullRequest.builder()
+                .protocol("http")
+                .host("localhost")
+                .port(server.port())
+                .method(SdkHttpMethod.GET)
+                .build();
+
+        AsyncExecuteRequest executeRequest = AsyncExecuteRequest.builder()
+                .fullDuplex(false)
+                .request(request)
+                .requestContentPublisher(new EmptyPublisher())
+                .responseHandler(new SdkAsyncHttpResponseHandler() {
+                    @Override
+                    public void onHeaders(SdkHttpResponse headers) {
+                    }
+
+                    @Override
+                    public void onStream(Publisher<ByteBuffer> stream) {
+                        stream.subscribe(new Subscriber<ByteBuffer>() {
+                            @Override
+                            public void onSubscribe(Subscription s) {
+                                s.request(Integer.MAX_VALUE);
+                            }
+
+                            @Override
+                            public void onNext(ByteBuffer byteBuffer) {
+                            }
+
+                            @Override
+                            public void onError(Throwable t) {
+                            }
+
+                            @Override
+                            public void onComplete() {
+                            }
+                        });
+                    }
+
+                    @Override
+                    public void onError(Throwable error) {
+                    }
+                })
+                .build();
+
+        return netty.execute(executeRequest);
+    }
+
+    private static class Server extends ChannelInitializer<Channel> {
+        private ServerBootstrap bootstrap;
+        private ServerSocketChannel serverSock;
+        private String[] channelIds = new String[5];
+        private final NioEventLoopGroup group = new NioEventLoopGroup();
+        private SslContext sslCtx;
+        private AtomicInteger h2ConnectionCount = new AtomicInteger(0);
+
+        void init() throws Exception {
+            SelfSignedCertificate ssc = new SelfSignedCertificate();
+            bootstrap = new ServerBootstrap()
+                    .channel(NioServerSocketChannel.class)
+                    .group(group)
+                    .childHandler(this);
+
+            serverSock = (ServerSocketChannel) bootstrap.bind(0).sync().channel();
+        }
+
+        @Override
+        protected void initChannel(Channel ch) {
+            channelIds[h2ConnectionCount.get()] = ch.id().asShortText();
+            ch.pipeline().addFirst(new LoggingHandler(LogLevel.DEBUG));
+            h2ConnectionCount.incrementAndGet();
+
+            ChannelPipeline pipeline = ch.pipeline();
+
+            Http2FrameCodec http2Codec = Http2FrameCodecBuilder.forServer()
+                    // simulate not sending goaway
+                    .decoupleCloseAndGoAway(true)
+                    .autoAckPingFrame(false)
+                    .initialSettings(Http2Settings.defaultSettings().maxConcurrentStreams(2))
+                    .frameLogger(new Http2FrameLogger(LogLevel.DEBUG, "WIRE"))
+                    .build();
+
+            Http2MultiplexHandler http2Handler = new Http2MultiplexHandler(new ChannelInitializer<Channel>() {
+                @Override
+                protected void initChannel(Channel ch) {
+                    ch.pipeline().addLast(new StreamHandler());
+                }
+            });
+
+            pipeline.addLast(http2Codec);
+            pipeline.addLast(http2Handler);
+        }
+
+        public void shutdown() throws InterruptedException {
+            group.shutdownGracefully().await();
+            serverSock.close();
+        }
+
+        public int port() {
+            return serverSock.localAddress().getPort();
+        }
+    }
+
+    private static final class StreamHandler extends SimpleChannelInboundHandler<Http2Frame> {
+
+        @Override
+        protected void channelRead0(ChannelHandlerContext ctx, Http2Frame http2Frame) throws Exception {
+            if (http2Frame instanceof Http2DataFrame) {
+                Http2DataFrame dataFrame = (Http2DataFrame) http2Frame;
+                if (dataFrame.isEndStream()) {
+                    Http2Headers headers = new DefaultHttp2Headers().status("200");
+                    ctx.writeAndFlush(new DefaultHttp2HeadersFrame(headers, false));
+                    ctx.executor().scheduleAtFixedRate(() -> {
+                        DefaultHttp2DataFrame respData = new DefaultHttp2DataFrame(Unpooled.wrappedBuffer("hello".getBytes()), false);
+                        ctx.writeAndFlush(respData);
+                    }, 0, 2, TimeUnit.SECONDS);
+                }
+            }
+        }
+    }
+}
diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/fault/ServerCloseConnectionTest.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/fault/ServerCloseConnectionTest.java
new file mode 100644
index 000000000000..88e0c50ff43a
--- /dev/null
+++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/fault/ServerCloseConnectionTest.java
@@ -0,0 +1,243 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.http.nio.netty.fault;
+
+import static io.netty.handler.codec.http.HttpResponseStatus.OK;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static software.amazon.awssdk.http.SdkHttpConfigurationOption.TRUST_ALL_CERTIFICATES;
+
+import io.netty.bootstrap.ServerBootstrap;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelInitializer;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.SimpleChannelInboundHandler;
+import io.netty.channel.nio.NioEventLoopGroup;
+import io.netty.channel.socket.ServerSocketChannel;
+import io.netty.channel.socket.nio.NioServerSocketChannel;
+import io.netty.handler.codec.http2.DefaultHttp2DataFrame;
+import io.netty.handler.codec.http2.DefaultHttp2Headers;
+import io.netty.handler.codec.http2.DefaultHttp2HeadersFrame;
+import io.netty.handler.codec.http2.Http2DataFrame;
+import io.netty.handler.codec.http2.Http2Frame;
+import io.netty.handler.codec.http2.Http2FrameCodec;
+import io.netty.handler.codec.http2.Http2FrameCodecBuilder;
+import io.netty.handler.codec.http2.Http2FrameLogger;
+import io.netty.handler.codec.http2.Http2Headers;
+import io.netty.handler.codec.http2.Http2MultiplexHandler;
+import io.netty.handler.codec.http2.Http2Settings;
+import io.netty.handler.logging.LogLevel;
+import io.netty.handler.logging.LoggingHandler;
+import io.netty.handler.ssl.SslContext;
+import io.netty.handler.ssl.SslContextBuilder;
+import io.netty.handler.ssl.util.SelfSignedCertificate;
+import io.reactivex.Flowable;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.channels.ClosedChannelException;
+import java.time.Duration;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.atomic.AtomicInteger;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.reactivestreams.Publisher;
+import software.amazon.awssdk.http.Protocol;
+import software.amazon.awssdk.http.SdkHttpFullRequest;
+import software.amazon.awssdk.http.SdkHttpMethod;
+import software.amazon.awssdk.http.SdkHttpResponse;
+import software.amazon.awssdk.http.async.AsyncExecuteRequest;
+import software.amazon.awssdk.http.async.SdkAsyncHttpClient;
+import software.amazon.awssdk.http.async.SdkAsyncHttpResponseHandler;
+import software.amazon.awssdk.http.nio.netty.EmptyPublisher;
+import software.amazon.awssdk.http.nio.netty.NettyNioAsyncHttpClient;
+import software.amazon.awssdk.http.nio.netty.SdkEventLoopGroup;
+import software.amazon.awssdk.utils.AttributeMap;
+import software.amazon.awssdk.utils.Logger;
+
+
+/**
+ * Testing the scenario where the connection gets inactive without GOAWAY frame
+ */
+public class ServerCloseConnectionTest {
+    private static final Logger LOGGER = Logger.loggerFor(ServerCloseConnectionTest.class);
+    private SdkAsyncHttpClient netty;
+    private Server server;
+
+    @Before
+    public void setup() throws Exception {
+        server = new Server();
+        server.init();
+
+        netty = NettyNioAsyncHttpClient.builder()
+                                       .readTimeout(Duration.ofMillis(500))
+                                       .eventLoopGroup(SdkEventLoopGroup.builder().numberOfThreads(3).build())
+                                       .protocol(Protocol.HTTP2)
+                                       .buildWithDefaults(AttributeMap.builder().put(TRUST_ALL_CERTIFICATES, true).build());
+    }
+
+    @After
+    public void teardown() throws InterruptedException {
+        if (server != null) {
+            server.shutdown();
+        }
+        server = null;
+
+        if (netty != null) {
+            netty.close();
+        }
+        netty = null;
+    }
+
+    @Test
+    public void connectionGetsInactive_shouldNotReuse() {
+        server.ackPingOnFirstChannel = true;
+        // The first request picks up a bad channel and should fail. Channel 1
+        CompletableFuture<Void> firstRequest = sendGetRequest();
+        assertThatThrownBy(() -> firstRequest.join())
+            .hasMessageContaining("An error occurred on the connection")
+            .hasCauseInstanceOf(IOException.class)
+            .hasRootCauseInstanceOf(ClosedChannelException.class);
+
+        server.failOnFirstChannel = false;
+
+        // The second request should establish a new connection instead of reusing the bad channel 2
+        LOGGER.info(() -> "sending out the second request");
+        sendGetRequest().join();
+
+        // should be 2 connections
+        assertThat(server.h2ConnectionCount.get()).isEqualTo(2);
+    }
+
+    private CompletableFuture<Void> sendGetRequest() {
+        AsyncExecuteRequest req = AsyncExecuteRequest.builder()
+                                                     .responseHandler(new SdkAsyncHttpResponseHandler() {
+                                                         private SdkHttpResponse headers;
+
+                                                         @Override
+                                                         public void onHeaders(SdkHttpResponse headers) {
+                                                             this.headers = headers;
+                                                         }
+
+                                                         @Override
+                                                         public void onStream(Publisher<ByteBuffer> stream) {
+                                                             Flowable.fromPublisher(stream).forEach(b -> {
+                                                             });
+                                                         }
+
+                                                         @Override
+                                                         public void onError(Throwable error) {
+                                                         }
+                                                     })
+                                                     .request(SdkHttpFullRequest.builder()
+                                                                                .method(SdkHttpMethod.GET)
+                                                                                .protocol("https")
+                                                                                .host("localhost")
+                                                                                .port(server.port())
+                                                                                .build())
+                                                     .requestContentPublisher(new EmptyPublisher())
+                                                     .build();
+
+        return netty.execute(req);
+    }
+
+
+    private static class Server extends ChannelInitializer<Channel> {
+        private ServerBootstrap bootstrap;
+        private ServerSocketChannel serverSock;
+        private String[] channelIds = new String[5];
+        private final NioEventLoopGroup group = new NioEventLoopGroup();
+        private SslContext sslCtx;
+        private AtomicInteger h2ConnectionCount = new AtomicInteger(0);
+        private boolean ackPingOnFirstChannel = false;
+        private boolean failOnFirstChannel = true;
+
+        void init() throws Exception {
+            SelfSignedCertificate ssc = new SelfSignedCertificate();
+            sslCtx = SslContextBuilder.forServer(ssc.certificate(), ssc.privateKey()).build();
+
+            bootstrap = new ServerBootstrap()
+                .channel(NioServerSocketChannel.class)
+                .group(group)
+                .childHandler(this);
+
+            serverSock = (ServerSocketChannel) bootstrap.bind(0).sync().channel();
+        }
+
+        @Override
+        protected void initChannel(Channel ch) {
+            channelIds[h2ConnectionCount.get()] = ch.id().asShortText();
+            ch.pipeline().addFirst(new LoggingHandler(LogLevel.DEBUG));
+            LOGGER.debug(() -> "init channel " + ch);
+            h2ConnectionCount.incrementAndGet();
+
+            ChannelPipeline pipeline = ch.pipeline();
+            pipeline.addLast(sslCtx.newHandler(ch.alloc()));
+
+
+            Http2FrameCodec http2Codec = Http2FrameCodecBuilder.forServer()
+                                                               // simulate not sending goaway
+                                                               .decoupleCloseAndGoAway(true)
+                                                               .initialSettings(Http2Settings.defaultSettings().maxConcurrentStreams(2))
+                                                               .frameLogger(new Http2FrameLogger(LogLevel.DEBUG, "WIRE"))
+                                                               .build();
+
+            Http2MultiplexHandler http2Handler = new Http2MultiplexHandler(new ChannelInitializer<Channel>() {
+                @Override
+                protected void initChannel(Channel ch) {
+                    ch.pipeline().addLast(new MightCloseConnectionStreamFrameHandler());
+                }
+            });
+
+            pipeline.addLast(http2Codec);
+            pipeline.addLast(http2Handler);
+        }
+
+        public void shutdown() throws InterruptedException {
+            group.shutdownGracefully().await();
+            serverSock.close();
+        }
+
+        public int port() {
+            return serverSock.localAddress().getPort();
+        }
+
+        private class MightCloseConnectionStreamFrameHandler extends SimpleChannelInboundHandler<Http2Frame> {
+
+            @Override
+            protected void channelRead0(ChannelHandlerContext ctx, Http2Frame frame) {
+                if (frame instanceof Http2DataFrame) {
+                    // Not respond if this is channel 1
+                    if (channelIds[0].equals(ctx.channel().parent().id().asShortText()) && failOnFirstChannel) {
+                        ctx.channel().parent().close();
+                    } else {
+                        DefaultHttp2DataFrame dataFrame = new DefaultHttp2DataFrame(false);
+                        try {
+                            LOGGER.info(() -> "return empty data "  + ctx.channel() + " frame " + frame.getClass());
+                            Http2Headers headers = new DefaultHttp2Headers().status(OK.codeAsText());
+                            ctx.write(dataFrame);
+                            ctx.write(new DefaultHttp2HeadersFrame(headers, true));
+                            ctx.flush();
+                        } finally {
+                            dataFrame.release();
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/fault/ServerNotRespondingTest.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/fault/ServerNotRespondingTest.java
new file mode 100644
index 000000000000..92d3624febf1
--- /dev/null
+++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/fault/ServerNotRespondingTest.java
@@ -0,0 +1,284 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.http.nio.netty.fault;
+
+import static io.netty.handler.codec.http.HttpResponseStatus.OK;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static software.amazon.awssdk.http.SdkHttpConfigurationOption.TRUST_ALL_CERTIFICATES;
+
+import io.netty.bootstrap.ServerBootstrap;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelInitializer;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.SimpleChannelInboundHandler;
+import io.netty.channel.nio.NioEventLoopGroup;
+import io.netty.channel.socket.ServerSocketChannel;
+import io.netty.channel.socket.nio.NioServerSocketChannel;
+import io.netty.handler.codec.http2.DefaultHttp2DataFrame;
+import io.netty.handler.codec.http2.DefaultHttp2Headers;
+import io.netty.handler.codec.http2.DefaultHttp2HeadersFrame;
+import io.netty.handler.codec.http2.DefaultHttp2PingFrame;
+import io.netty.handler.codec.http2.Http2DataFrame;
+import io.netty.handler.codec.http2.Http2Frame;
+import io.netty.handler.codec.http2.Http2FrameCodec;
+import io.netty.handler.codec.http2.Http2FrameCodecBuilder;
+import io.netty.handler.codec.http2.Http2FrameLogger;
+import io.netty.handler.codec.http2.Http2GoAwayFrame;
+import io.netty.handler.codec.http2.Http2Headers;
+import io.netty.handler.codec.http2.Http2MultiplexHandler;
+import io.netty.handler.codec.http2.Http2PingFrame;
+import io.netty.handler.codec.http2.Http2Settings;
+import io.netty.handler.logging.LogLevel;
+import io.netty.handler.logging.LoggingHandler;
+import io.netty.handler.ssl.SslContext;
+import io.netty.handler.ssl.SslContextBuilder;
+import io.netty.handler.ssl.util.SelfSignedCertificate;
+import io.netty.handler.timeout.ReadTimeoutException;
+import io.reactivex.Flowable;
+import java.nio.ByteBuffer;
+import java.time.Duration;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.atomic.AtomicInteger;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.reactivestreams.Publisher;
+import software.amazon.awssdk.http.Protocol;
+import software.amazon.awssdk.http.SdkHttpFullRequest;
+import software.amazon.awssdk.http.SdkHttpMethod;
+import software.amazon.awssdk.http.SdkHttpResponse;
+import software.amazon.awssdk.http.async.AsyncExecuteRequest;
+import software.amazon.awssdk.http.async.SdkAsyncHttpClient;
+import software.amazon.awssdk.http.async.SdkAsyncHttpResponseHandler;
+import software.amazon.awssdk.http.nio.netty.EmptyPublisher;
+import software.amazon.awssdk.http.nio.netty.NettyNioAsyncHttpClient;
+import software.amazon.awssdk.http.nio.netty.SdkEventLoopGroup;
+import software.amazon.awssdk.utils.AttributeMap;
+import software.amazon.awssdk.utils.Logger;
+
+
+/**
+ * Testing the scenario where the server fails to respond to periodic PING
+ */
+public class ServerNotRespondingTest {
+    private static final Logger LOGGER = Logger.loggerFor(ServerNotRespondingTest.class);
+    private SdkAsyncHttpClient netty;
+    private Server server;
+
+    @Before
+    public void setup() throws Exception {
+        server = new Server();
+        server.init();
+
+        netty = NettyNioAsyncHttpClient.builder()
+                                       .readTimeout(Duration.ofMillis(1000))
+                                       .eventLoopGroup(SdkEventLoopGroup.builder().numberOfThreads(3).build())
+                                       .http2Configuration(h -> h.healthCheckPingPeriod(Duration.ofMillis(200)))
+                                       .protocol(Protocol.HTTP2)
+                                       .buildWithDefaults(AttributeMap.builder().put(TRUST_ALL_CERTIFICATES, true).build());
+    }
+
+    @After
+    public void teardown() throws InterruptedException {
+        if (server != null) {
+            server.shutdown();
+        }
+        server = null;
+
+        if (netty != null) {
+            netty.close();
+        }
+        netty = null;
+    }
+
+    @Test
+    public void connectionNotAckPing_newRequestShouldUseNewConnection() throws InterruptedException {
+        server.ackPingOnFirstChannel = false;
+        server.notRespondOnFirstChannel = false;
+        CompletableFuture<Void> firstRequest = sendGetRequest();
+        // First request should succeed
+        firstRequest.join();
+
+        // Wait for Ping to close the connection
+        Thread.sleep(200);
+        server.notRespondOnFirstChannel = false;
+        sendGetRequest().join();
+        assertThat(server.h2ConnectionCount.get()).isEqualTo(2);
+        assertThat(server.closedByClientH2ConnectionCount.get()).isEqualTo(1);
+    }
+
+    @Test
+    public void connectionNotRespond_newRequestShouldUseNewConnection() throws Exception {
+        server.ackPingOnFirstChannel = true;
+        server.notRespondOnFirstChannel = true;
+
+        // The first request picks up a non-responding channel and should fail. Channel 1
+        CompletableFuture<Void> firstRequest = sendGetRequest();
+
+        assertThatThrownBy(() -> firstRequest.join()).hasRootCauseInstanceOf(ReadTimeoutException.class);
+
+        // The second request should pick up a new healthy channel - Channel 2
+        sendGetRequest().join();
+
+        assertThat(server.h2ConnectionCount.get()).isEqualTo(2);
+        assertThat(server.closedByClientH2ConnectionCount.get()).isEqualTo(1);
+    }
+
+    private CompletableFuture<Void> sendGetRequest() {
+        AsyncExecuteRequest req = AsyncExecuteRequest.builder()
+                                                     .responseHandler(new SdkAsyncHttpResponseHandler() {
+                                                         private SdkHttpResponse headers;
+
+                                                         @Override
+                                                         public void onHeaders(SdkHttpResponse headers) {
+                                                             this.headers = headers;
+                                                         }
+
+                                                         @Override
+                                                         public void onStream(Publisher<ByteBuffer> stream) {
+                                                             Flowable.fromPublisher(stream).forEach(b -> {
+                                                             });
+                                                         }
+
+                                                         @Override
+                                                         public void onError(Throwable error) {
+                                                         }
+                                                     })
+                                                     .request(SdkHttpFullRequest.builder()
+                                                                                .method(SdkHttpMethod.GET)
+                                                                                .protocol("https")
+                                                                                .host("localhost")
+                                                                                .port(server.port())
+                                                                                .build())
+                                                     .requestContentPublisher(new EmptyPublisher())
+                                                     .build();
+
+        return netty.execute(req);
+    }
+
+
+    private static class Server extends ChannelInitializer<Channel> {
+        private ServerBootstrap bootstrap;
+        private ServerSocketChannel serverSock;
+        private String[] channelIds = new String[5];
+        private final NioEventLoopGroup group = new NioEventLoopGroup();
+        private SslContext sslCtx;
+        private AtomicInteger h2ConnectionCount = new AtomicInteger(0);
+        private AtomicInteger closedByClientH2ConnectionCount = new AtomicInteger(0);
+        private volatile boolean ackPingOnFirstChannel = false;
+        private volatile boolean notRespondOnFirstChannel = true;
+
+        void init() throws Exception {
+            SelfSignedCertificate ssc = new SelfSignedCertificate();
+            sslCtx = SslContextBuilder.forServer(ssc.certificate(), ssc.privateKey()).build();
+
+            bootstrap = new ServerBootstrap()
+                .channel(NioServerSocketChannel.class)
+                .group(group)
+                .childHandler(this);
+
+            serverSock = (ServerSocketChannel) bootstrap.bind(0).sync().channel();
+        }
+
+        @Override
+        protected void initChannel(Channel ch) {
+            channelIds[h2ConnectionCount.get()] = ch.id().asShortText();
+            ch.pipeline().addFirst(new LoggingHandler(LogLevel.DEBUG));
+            LOGGER.debug(() -> "init channel " + ch);
+            h2ConnectionCount.incrementAndGet();
+
+            ChannelPipeline pipeline = ch.pipeline();
+            pipeline.addLast(sslCtx.newHandler(ch.alloc()));
+
+
+            Http2FrameCodec http2Codec = Http2FrameCodecBuilder.forServer()
+                                                               //Disable auto ack ping
+                                                               .autoAckPingFrame(false)
+                                                               .initialSettings(Http2Settings.defaultSettings().maxConcurrentStreams(2))
+                                                               .frameLogger(new Http2FrameLogger(LogLevel.DEBUG, "WIRE"))
+                                                               .build();
+
+            Http2MultiplexHandler http2Handler = new Http2MultiplexHandler(new ChannelInitializer<Channel>() {
+                @Override
+                protected void initChannel(Channel ch) throws Exception {
+                    ch.pipeline().addLast(new MightNotRespondStreamFrameHandler());
+                }
+            });
+
+            pipeline.addLast(http2Codec);
+            pipeline.addLast(new MightNotRespondPingFrameHandler());
+            pipeline.addLast(new VerifyGoAwayFrameHandler());
+            pipeline.addLast(http2Handler);
+        }
+
+        public void shutdown() throws InterruptedException {
+            group.shutdownGracefully().await();
+            serverSock.close();
+        }
+
+        public int port() {
+            return serverSock.localAddress().getPort();
+        }
+
+        public final class MightNotRespondPingFrameHandler extends SimpleChannelInboundHandler<Http2PingFrame> {
+            @Override
+            protected void channelRead0(ChannelHandlerContext ctx, Http2PingFrame msg) {
+                if (channelIds[0].equals(ctx.channel().id().asShortText()) && !ackPingOnFirstChannel) {
+                    // Not respond if this is the first request
+                    LOGGER.info(() -> "yolo" + ctx.channel());
+                } else {
+                    ctx.writeAndFlush(new DefaultHttp2PingFrame(msg.content(), true));
+                }
+            }
+        }
+
+
+        public final class VerifyGoAwayFrameHandler extends SimpleChannelInboundHandler<Http2GoAwayFrame> {
+            @Override
+            protected void channelRead0(ChannelHandlerContext ctx, Http2GoAwayFrame msg) {
+                LOGGER.info(() -> "goaway" + ctx.channel());
+                closedByClientH2ConnectionCount.incrementAndGet();
+                msg.release();
+            }
+        }
+
+        private class MightNotRespondStreamFrameHandler extends SimpleChannelInboundHandler<Http2Frame> {
+
+            @Override
+            protected void channelRead0(ChannelHandlerContext ctx, Http2Frame frame) {
+                if (frame instanceof Http2DataFrame) {
+                    // Not respond if this is channel 1
+                    if (channelIds[0].equals(ctx.channel().parent().id().asShortText()) && notRespondOnFirstChannel) {
+                        LOGGER.info(() -> "This is the first request, not responding" + ctx.channel());
+                    } else {
+                        DefaultHttp2DataFrame dataFrame = new DefaultHttp2DataFrame(false);
+                        try {
+                            LOGGER.info(() -> "return empty data "  + ctx.channel() + " frame " + frame.getClass());
+                            Http2Headers headers = new DefaultHttp2Headers().status(OK.codeAsText());
+                            ctx.write(dataFrame);
+                            ctx.write(new DefaultHttp2HeadersFrame(headers, true));
+                            ctx.flush();
+                        } finally {
+                            dataFrame.release();
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/AwaitCloseChannelPoolMapTest.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/AwaitCloseChannelPoolMapTest.java
index 18add028a262..1289e8af0c21 100644
--- a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/AwaitCloseChannelPoolMapTest.java
+++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/AwaitCloseChannelPoolMapTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -23,11 +23,6 @@
 import static software.amazon.awssdk.http.SdkHttpConfigurationOption.GLOBAL_HTTP_DEFAULTS;
 import static software.amazon.awssdk.http.SdkHttpConfigurationOption.TLS_KEY_MANAGERS_PROVIDER;
 
-import com.github.tomakehurst.wiremock.junit.WireMockRule;
-import io.netty.channel.Channel;
-import io.netty.channel.pool.ChannelPool;
-import io.netty.handler.ssl.SslProvider;
-import io.netty.util.concurrent.Future;
 import java.net.URI;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -35,10 +30,19 @@
 import java.util.Map;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
+
+import com.github.tomakehurst.wiremock.junit.WireMockRule;
+
 import org.apache.commons.lang3.RandomStringUtils;
 import org.junit.After;
 import org.junit.Rule;
 import org.junit.Test;
+import org.mockito.Mockito;
+
+import io.netty.channel.Channel;
+import io.netty.channel.pool.ChannelPool;
+import io.netty.handler.ssl.SslProvider;
+import io.netty.util.concurrent.Future;
 import software.amazon.awssdk.http.Protocol;
 import software.amazon.awssdk.http.TlsKeyManagersProvider;
 import software.amazon.awssdk.http.nio.netty.ProxyConfiguration;
@@ -94,6 +98,63 @@ public void close_underlyingPoolsShouldBeClosed() {
         });
     }
 
+    @Test
+    public void get_callsInjectedBootstrapProviderCorrectly() {
+        BootstrapProvider bootstrapProvider = Mockito.spy(
+            new BootstrapProvider(SdkEventLoopGroup.builder().build(),
+                                  new NettyConfiguration(GLOBAL_HTTP_DEFAULTS),
+                                  new SdkChannelOptions()));
+
+        URI targetUri = URI.create("https://some-awesome-service-1234.amazonaws.com:8080");
+
+        AwaitCloseChannelPoolMap.Builder builder =
+            AwaitCloseChannelPoolMap.builder()
+                                    .sdkChannelOptions(new SdkChannelOptions())
+                                    .sdkEventLoopGroup(SdkEventLoopGroup.builder().build())
+                                    .configuration(new NettyConfiguration(GLOBAL_HTTP_DEFAULTS))
+                                    .protocol(Protocol.HTTP1_1)
+                                    .maxStreams(100)
+                                    .sslProvider(SslProvider.OPENSSL);
+
+        channelPoolMap = new AwaitCloseChannelPoolMap(builder, null, bootstrapProvider);
+        channelPoolMap.get(targetUri);
+
+        verify(bootstrapProvider).createBootstrap("some-awesome-service-1234.amazonaws.com", 8080);
+    }
+
+    @Test
+    public void get_usingProxy_callsInjectedBootstrapProviderCorrectly() {
+        BootstrapProvider bootstrapProvider = Mockito.spy(
+            new BootstrapProvider(SdkEventLoopGroup.builder().build(),
+                                  new NettyConfiguration(GLOBAL_HTTP_DEFAULTS),
+                                  new SdkChannelOptions()));
+
+        URI targetUri = URI.create("https://some-awesome-service-1234.amazonaws.com:8080");
+        Map<URI, Boolean> shouldProxyCache =  new HashMap<>();
+        shouldProxyCache.put(targetUri, true);
+
+        ProxyConfiguration proxyConfiguration =
+            ProxyConfiguration.builder()
+                              .host("localhost")
+                              .port(mockProxy.port())
+                              .build();
+
+        AwaitCloseChannelPoolMap.Builder builder =
+            AwaitCloseChannelPoolMap.builder()
+                                    .proxyConfiguration(proxyConfiguration)
+                                    .sdkChannelOptions(new SdkChannelOptions())
+                                    .sdkEventLoopGroup(SdkEventLoopGroup.builder().build())
+                                    .configuration(new NettyConfiguration(GLOBAL_HTTP_DEFAULTS))
+                                    .protocol(Protocol.HTTP1_1)
+                                    .maxStreams(100)
+                                    .sslProvider(SslProvider.OPENSSL);
+
+        channelPoolMap = new AwaitCloseChannelPoolMap(builder, shouldProxyCache, bootstrapProvider);
+        channelPoolMap.get(targetUri);
+
+        verify(bootstrapProvider).createBootstrap("localhost", mockProxy.port());
+    }
+
     @Test
     public void usingProxy_usesCachedValueWhenPresent() {
         URI targetUri = URI.create("https://some-awesome-service-1234.amazonaws.com");
@@ -117,7 +178,7 @@ public void usingProxy_usesCachedValueWhenPresent() {
                 .maxStreams(100)
                 .sslProvider(SslProvider.OPENSSL);
 
-        channelPoolMap = new AwaitCloseChannelPoolMap(builder, shouldProxyCache);
+        channelPoolMap = new AwaitCloseChannelPoolMap(builder, shouldProxyCache, null);
 
         // The target host does not exist so acquiring a channel should fail unless we're configured to connect to
         // the mock proxy host for this URI.
diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/BootstrapProviderTest.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/BootstrapProviderTest.java
new file mode 100644
index 000000000000..dc3789a34aab
--- /dev/null
+++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/BootstrapProviderTest.java
@@ -0,0 +1,56 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.http.nio.netty.internal;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static software.amazon.awssdk.http.SdkHttpConfigurationOption.GLOBAL_HTTP_DEFAULTS;
+
+import java.net.InetSocketAddress;
+import java.net.SocketAddress;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
+
+import io.netty.bootstrap.Bootstrap;
+import io.netty.resolver.AddressResolver;
+import io.netty.resolver.AddressResolverGroup;
+import software.amazon.awssdk.http.nio.netty.SdkEventLoopGroup;
+
+@RunWith(MockitoJUnitRunner.class)
+public class BootstrapProviderTest {
+    private final BootstrapProvider bootstrapProvider =
+        new BootstrapProvider(SdkEventLoopGroup.builder().build(),
+                              new NettyConfiguration(GLOBAL_HTTP_DEFAULTS),
+                              new SdkChannelOptions());
+
+    // IMPORTANT: This unit test asserts that the bootstrap provider creates bootstraps using 'unresolved
+    // InetSocketAddress'. If this test is replaced or removed, perhaps due to a different implementation of
+    // SocketAddress, a different test must be created that ensures that the hostname will be resolved on every
+    // connection attempt and not cached between connection attempts.
+    @Test
+    public void createBootstrap_usesUnresolvedInetSocketAddress() {
+        Bootstrap bootstrap = bootstrapProvider.createBootstrap("some-awesome-service-1234.amazonaws.com", 443);
+
+        SocketAddress socketAddress = bootstrap.config().remoteAddress();
+
+        assertThat(socketAddress).isInstanceOf(InetSocketAddress.class);
+        InetSocketAddress inetSocketAddress = (InetSocketAddress)socketAddress;
+
+        assertThat(inetSocketAddress.isUnresolved()).isTrue();
+    }
+}
\ No newline at end of file
diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/CancellableAcquireChannelPoolTest.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/CancellableAcquireChannelPoolTest.java
index 616a7b416ae1..235223a5d5be 100644
--- a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/CancellableAcquireChannelPoolTest.java
+++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/CancellableAcquireChannelPoolTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/ChannelPipelineInitializerTest.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/ChannelPipelineInitializerTest.java
new file mode 100644
index 000000000000..12e0627bb1e4
--- /dev/null
+++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/ChannelPipelineInitializerTest.java
@@ -0,0 +1,75 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.http.nio.netty.internal;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+import static software.amazon.awssdk.http.SdkHttpConfigurationOption.GLOBAL_HTTP_DEFAULTS;
+
+import io.netty.buffer.UnpooledByteBufAllocator;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelOption;
+import io.netty.channel.embedded.EmbeddedChannel;
+import io.netty.channel.pool.ChannelPool;
+import io.netty.handler.codec.http2.Http2SecurityUtil;
+import io.netty.handler.ssl.SslContext;
+import io.netty.handler.ssl.SslContextBuilder;
+import io.netty.handler.ssl.SslProvider;
+import io.netty.handler.ssl.SupportedCipherSuiteFilter;
+import java.net.URI;
+import java.time.Duration;
+import java.util.concurrent.atomic.AtomicReference;
+import javax.net.ssl.SSLException;
+import org.junit.Test;
+import software.amazon.awssdk.http.Protocol;
+
+public class ChannelPipelineInitializerTest {
+
+    private ChannelPipelineInitializer pipelineInitializer;
+
+    private URI targetUri;
+
+    @Test
+    public void channelConfigOptionCheck() throws SSLException {
+        targetUri = URI.create("https://some-awesome-service-1234.amazonaws.com:8080");
+
+        SslContext sslContext = SslContextBuilder.forClient()
+                                                 .sslProvider(SslProvider.JDK)
+                                                 .ciphers(Http2SecurityUtil.CIPHERS, SupportedCipherSuiteFilter.INSTANCE)
+                                                 .build();
+
+        AtomicReference<ChannelPool> channelPoolRef = new AtomicReference<>();
+
+        NettyConfiguration nettyConfiguration = new NettyConfiguration(GLOBAL_HTTP_DEFAULTS);
+
+        pipelineInitializer = new ChannelPipelineInitializer(Protocol.HTTP1_1,
+                                                             sslContext,
+                                                             SslProvider.JDK,
+                                                             100,
+                                                             1024,
+                                                             Duration.ZERO,
+                                                             channelPoolRef,
+                                                             nettyConfiguration,
+                                                             targetUri);
+
+        Channel channel = new EmbeddedChannel();
+
+        pipelineInitializer.channelCreated(channel);
+
+        assertThat(channel.config().getOption(ChannelOption.ALLOCATOR), is(UnpooledByteBufAllocator.DEFAULT));
+
+    }
+}
\ No newline at end of file
diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/ConnectionReaperTest.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/ConnectionReaperTest.java
index d596f60a9433..33fb9d9b906b 100644
--- a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/ConnectionReaperTest.java
+++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/ConnectionReaperTest.java
@@ -1,3 +1,18 @@
+/*
+ * 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.
+ */
+
 package software.amazon.awssdk.http.nio.netty.internal;
 
 import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/FullResponseContentPublisherTckTest.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/FullResponseContentPublisherTckTest.java
index f8650a4dcab9..962194450366 100644
--- a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/FullResponseContentPublisherTckTest.java
+++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/FullResponseContentPublisherTckTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/FutureCancelHandlerTest.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/FutureCancelHandlerTest.java
index 083a3036dbf2..d28cf1558cd5 100644
--- a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/FutureCancelHandlerTest.java
+++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/FutureCancelHandlerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/GoAwayTest.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/GoAwayTest.java
deleted file mode 100644
index cec6ff8a3c1a..000000000000
--- a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/GoAwayTest.java
+++ /dev/null
@@ -1,331 +0,0 @@
-package software.amazon.awssdk.http.nio.netty.internal;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import io.netty.bootstrap.ServerBootstrap;
-import io.netty.buffer.ByteBuf;
-import io.netty.channel.Channel;
-import io.netty.channel.ChannelDuplexHandler;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.ChannelInitializer;
-import io.netty.channel.ChannelOption;
-import io.netty.channel.nio.NioEventLoopGroup;
-import io.netty.channel.socket.ServerSocketChannel;
-import io.netty.channel.socket.SocketChannel;
-import io.netty.channel.socket.nio.NioServerSocketChannel;
-import io.netty.handler.codec.http2.DefaultHttp2FrameReader;
-import io.netty.handler.codec.http2.DefaultHttp2FrameWriter;
-import io.netty.handler.codec.http2.DefaultHttp2Headers;
-import io.netty.handler.codec.http2.Http2FrameAdapter;
-import io.netty.handler.codec.http2.Http2FrameListener;
-import io.netty.handler.codec.http2.Http2FrameReader;
-import io.netty.handler.codec.http2.Http2FrameWriter;
-import io.netty.handler.codec.http2.Http2Headers;
-import io.netty.handler.codec.http2.Http2Settings;
-import io.netty.util.AttributeKey;
-import io.reactivex.Flowable;
-import java.nio.ByteBuffer;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.CountDownLatch;
-import java.util.function.Supplier;
-import org.junit.After;
-import org.junit.Test;
-import org.reactivestreams.Publisher;
-import software.amazon.awssdk.http.Protocol;
-import software.amazon.awssdk.http.SdkHttpFullRequest;
-import software.amazon.awssdk.http.SdkHttpMethod;
-import software.amazon.awssdk.http.SdkHttpResponse;
-import software.amazon.awssdk.http.async.AsyncExecuteRequest;
-import software.amazon.awssdk.http.async.SdkAsyncHttpClient;
-import software.amazon.awssdk.http.async.SdkAsyncHttpResponseHandler;
-import software.amazon.awssdk.http.nio.netty.EmptyPublisher;
-import software.amazon.awssdk.http.nio.netty.NettyNioAsyncHttpClient;
-import software.amazon.awssdk.http.nio.netty.SdkEventLoopGroup;
-
-/**
- * Tests to ensure that the client behaves as expected when it receives GOAWAY messages.
- */
-public class GoAwayTest {
-
-    private SdkAsyncHttpClient netty;
-    private SimpleEndpointDriver endpointDriver;
-
-    @After
-    public void teardown() throws InterruptedException {
-        if (endpointDriver != null) {
-            endpointDriver.shutdown();
-        }
-        endpointDriver = null;
-
-        if (netty != null) {
-            netty.close();
-        }
-        netty = null;
-    }
-
-    @Test
-    public void execute_goAwayReceived_existingChannelsNotReused() throws InterruptedException {
-        // Frame listener supplier for each connection
-        Supplier<Http2FrameListener> frameListenerSupplier = () -> new TestFrameListener() {
-            @Override
-            public void onHeadersRead(ChannelHandlerContext ctx, int streamId, Http2Headers headers, int streamDependency, short weight, boolean exclusive, int padding, boolean endStream) {
-                frameWriter().writeHeaders(ctx, streamId, new DefaultHttp2Headers().add("content-length", "0").status("204"), 0, true, ctx.newPromise());
-                ctx.flush();
-            }
-        };
-
-        endpointDriver = new SimpleEndpointDriver(frameListenerSupplier);
-        endpointDriver.init();
-
-        netty = NettyNioAsyncHttpClient.builder()
-                .eventLoopGroup(SdkEventLoopGroup.builder().numberOfThreads(1).build())
-                .protocol(Protocol.HTTP2)
-                .build();
-
-        sendGetRequest().join();
-
-        // Note: It's possible the initial request can cause the client to allocate more than 1 channel
-        int initialChannelNum = endpointDriver.channels.size();
-
-        // Send GOAWAY to all the currently open channels
-        endpointDriver.channels.forEach(ch -> endpointDriver.goAway(ch, 1));
-
-        // Need to give a chance for the streams to get closed
-        Thread.sleep(1000);
-
-        // Since the existing channels are now invalid, this request should cause a new channel to be opened
-        sendGetRequest().join();
-
-        assertThat(endpointDriver.channels).hasSize(initialChannelNum + 1);
-    }
-
-    // The client should not close streams that are less than the 'last stream
-    // ID' given in the GOAWAY frame since it means they were processed fully
-    @Test
-    public void execute_goAwayReceived_lastStreamId_lowerStreamsNotClosed() throws InterruptedException {
-        ConcurrentHashMap<String, Set<Integer>> channelToStreams = new ConcurrentHashMap<>();
-
-        CompletableFuture<Void> stream3Received = new CompletableFuture<>();
-        CountDownLatch allRequestsReceived = new CountDownLatch(2);
-        byte[] getPayload = "go away!".getBytes(StandardCharsets.UTF_8);
-        Supplier<Http2FrameListener> frameListenerSupplier = () -> new TestFrameListener() {
-            @Override
-            public void onHeadersRead(ChannelHandlerContext ctx, int streamId, Http2Headers headers, int streamDependency, short weight, boolean exclusive, int padding, boolean endStream) {
-                channelToStreams.computeIfAbsent(ctx.channel().id().asShortText(), (k) -> Collections.newSetFromMap(new ConcurrentHashMap<>())).add(streamId);
-
-                if (streamId == 3) {
-                    stream3Received.complete(null);
-                }
-
-                if (streamId < 5) {
-                    Http2Headers outboundHeaders = new DefaultHttp2Headers()
-                            .status("200")
-                            .add("content-type", "text/plain")
-                            .addInt("content-length", getPayload.length);
-
-                    frameWriter().writeHeaders(ctx, streamId, outboundHeaders, 0, false, ctx.newPromise());
-                    ctx.flush();
-                }
-
-                allRequestsReceived.countDown();
-            }
-        };
-
-        endpointDriver = new SimpleEndpointDriver(frameListenerSupplier);
-        endpointDriver.init();
-
-        netty = NettyNioAsyncHttpClient.builder()
-                .protocol(Protocol.HTTP2)
-                .build();
-
-        CompletableFuture<Void> stream3Cf = sendGetRequest();// stream ID 3
-
-        // Wait for the request to be received just to ensure that it is given ID 3
-        stream3Received.join();
-
-        CompletableFuture<Void> stream5Cf = sendGetRequest();// stream ID 5
-
-        allRequestsReceived.await();
-
-        // send the GOAWAY first, specifying that everything after 3 is not processed
-        endpointDriver.channels.forEach(ch -> {
-            Set<Integer> streams = channelToStreams.getOrDefault(ch.id().asShortText(), Collections.emptySet());
-            if (streams.contains(3)) {
-                endpointDriver.goAway(ch, 3);
-            }
-        });
-
-        // now send the DATA for stream 3, which should still be valid
-        endpointDriver.channels.forEach(ch -> {
-            Set<Integer> streams = channelToStreams.getOrDefault(ch.id().asShortText(), Collections.emptySet());
-            if (streams.contains(3)) {
-                endpointDriver.data(ch, 3, getPayload);
-            }
-        });
-
-        waitForFuture(stream3Cf);
-        waitForFuture(stream5Cf);
-
-        assertThat(stream3Cf.isCompletedExceptionally()).isFalse();
-        assertThat(stream5Cf.isCompletedExceptionally()).isTrue();
-    }
-
-    private CompletableFuture<Void> sendGetRequest() {
-        AsyncExecuteRequest req = AsyncExecuteRequest.builder()
-                .responseHandler(new SdkAsyncHttpResponseHandler() {
-                    private SdkHttpResponse headers;
-
-                    @Override
-                    public void onHeaders(SdkHttpResponse headers) {
-                        this.headers = headers;
-                    }
-
-                    @Override
-                    public void onStream(Publisher<ByteBuffer> stream) {
-                        // Consume the stream in order to complete request
-                        Flowable.fromPublisher(stream).forEach(b -> {});
-                    }
-
-                    @Override
-                    public void onError(Throwable error) {
-                    }
-                })
-                .request(SdkHttpFullRequest.builder()
-                        .method(SdkHttpMethod.GET)
-                        .protocol("http")
-                        .host("localhost")
-                        .port(endpointDriver.port())
-                        .build())
-                .requestContentPublisher(new EmptyPublisher())
-                .build();
-
-        return netty.execute(req);
-    }
-
-    private static void waitForFuture(CompletableFuture<?> cf) {
-        try {
-            cf.join();
-        } catch (Throwable t) {
-            t.printStackTrace();
-        }
-    }
-
-    // Minimal class to simulate an H2 endpoint
-    private static class SimpleEndpointDriver extends ChannelInitializer<SocketChannel> {
-        private List<SocketChannel> channels = new ArrayList<>();
-        private final NioEventLoopGroup group = new NioEventLoopGroup();
-        private final Supplier<Http2FrameListener> frameListenerSupplier;
-        private ServerBootstrap bootstrap;
-        private ServerSocketChannel serverSock;
-
-        public SimpleEndpointDriver(Supplier<Http2FrameListener> frameListenerSupplier) {
-            this.frameListenerSupplier = frameListenerSupplier;
-        }
-
-        public void init() throws InterruptedException {
-            bootstrap = new ServerBootstrap()
-                    .channel(NioServerSocketChannel.class)
-                    .group(new NioEventLoopGroup())
-                    .childHandler(this)
-                    .childOption(ChannelOption.SO_KEEPALIVE, true);
-
-            serverSock = (ServerSocketChannel) bootstrap.bind(0).sync().channel();
-        }
-
-        public void shutdown() throws InterruptedException {
-            group.shutdownGracefully().await();
-        }
-
-        public int port() {
-            return serverSock.localAddress().getPort();
-        }
-
-        public void goAway(SocketChannel ch, int lastStreamId) {
-            ByteBuf b = ch.alloc().buffer(9 + 8);
-
-            // Frame header
-            b.writeMedium(8); // Payload length
-            b.writeByte(0x7); // Type = GOAWAY
-            b.writeByte(0x0); // Flags
-            b.writeInt(0); // 0 = connection frame
-
-            // GOAWAY payload
-            b.writeInt(lastStreamId);
-            b.writeInt(0); // Error code
-
-            ch.writeAndFlush(b);
-        }
-
-        public void data(SocketChannel ch, int streamId, byte[] payload) {
-            ByteBuf b = ch.alloc().buffer(9 + payload.length);
-
-            // Header
-            b.writeMedium(payload.length); // Payload length
-            b.writeByte(0); // Type = DATA
-            b.writeByte(0x1); // 0x1 = EOF
-            b.writeInt(streamId);
-
-            // Payload
-            b.writeBytes(payload);
-
-            ch.writeAndFlush(b);
-        }
-
-        @Override
-        protected void initChannel(SocketChannel ch) throws Exception {
-            channels.add(ch);
-            ch.pipeline().addLast(new Http2ConnHandler(this, frameListenerSupplier.get()));
-        }
-    }
-
-    private abstract class TestFrameListener extends Http2FrameAdapter {
-        private final Http2FrameWriter frameWriter = new DefaultHttp2FrameWriter();
-
-        protected final Http2FrameWriter frameWriter() {
-            return frameWriter;
-        }
-
-        @Override
-        public void onSettingsRead(ChannelHandlerContext ctx, Http2Settings settings) {
-            frameWriter().writeSettings(ctx, new Http2Settings(), ctx.newPromise());
-            frameWriter().writeSettingsAck(ctx, ctx.newPromise());
-            ctx.flush();
-        }
-    }
-
-    private static class Http2ConnHandler extends ChannelDuplexHandler {
-        // Prior knowledge preface
-        private static final String PREFACE = "PRI * HTTP/2.0\r\n\r\nSM\r\n\r\n";
-        private static final AttributeKey<Boolean> H2_ESTABLISHED = AttributeKey.newInstance("h2-etablished");
-
-        private final Http2FrameReader frameReader = new DefaultHttp2FrameReader();
-        private final SimpleEndpointDriver simpleEndpointDriver;
-        private final Http2FrameListener frameListener;
-
-        public Http2ConnHandler(SimpleEndpointDriver simpleEndpointDriver, Http2FrameListener frameListener) {
-            this.simpleEndpointDriver = simpleEndpointDriver;
-            this.frameListener = frameListener;
-        }
-
-        @Override
-        public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
-            ByteBuf bb = (ByteBuf) msg;
-            if (!isH2Established(ctx.channel())) {
-                String prefaceString = bb.readCharSequence(24, StandardCharsets.UTF_8).toString();
-                if (PREFACE.equals(prefaceString)) {
-                    ctx.channel().attr(H2_ESTABLISHED).set(true);
-                }
-            }
-            frameReader.readFrame(ctx, bb, frameListener);
-        }
-
-        private boolean isH2Established(Channel ch) {
-            return Boolean.TRUE.equals(ch.attr(H2_ESTABLISHED).get());
-        }
-    }
-}
diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/HandlerRemovingChannelPoolTest.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/HandlerRemovingChannelPoolTest.java
index f7a1922923ef..5e6213972598 100644
--- a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/HandlerRemovingChannelPoolTest.java
+++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/HandlerRemovingChannelPoolTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -21,7 +21,7 @@
 import static software.amazon.awssdk.http.nio.netty.internal.ChannelAttributeKey.REQUEST_CONTEXT_KEY;
 import static software.amazon.awssdk.http.nio.netty.internal.ChannelAttributeKey.RESPONSE_COMPLETE_KEY;
 
-import com.typesafe.netty.http.HttpStreamsClientHandler;
+import software.amazon.awssdk.http.nio.netty.internal.nrs.HttpStreamsClientHandler;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelPipeline;
 import io.netty.channel.nio.NioEventLoopGroup;
diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/HealthCheckedChannelPoolTest.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/HealthCheckedChannelPoolTest.java
index b3af40680ca6..66a84fafa57e 100644
--- a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/HealthCheckedChannelPoolTest.java
+++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/HealthCheckedChannelPoolTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/HonorCloseOnReleaseChannelPoolTest.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/HonorCloseOnReleaseChannelPoolTest.java
index 9a53858d782a..71a0203794b2 100644
--- a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/HonorCloseOnReleaseChannelPoolTest.java
+++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/HonorCloseOnReleaseChannelPoolTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/Http1TunnelConnectionPoolTest.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/Http1TunnelConnectionPoolTest.java
index 50cc17621c10..3789749730bc 100644
--- a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/Http1TunnelConnectionPoolTest.java
+++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/Http1TunnelConnectionPoolTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/LastHttpContentHandlerTest.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/LastHttpContentHandlerTest.java
index c51929051f1f..33263a5911d8 100644
--- a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/LastHttpContentHandlerTest.java
+++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/LastHttpContentHandlerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/LastHttpContentSwallowerTest.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/LastHttpContentSwallowerTest.java
index c03787e8ebea..75e90ef19f11 100644
--- a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/LastHttpContentSwallowerTest.java
+++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/LastHttpContentSwallowerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/MockChannel.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/MockChannel.java
index 49dc9caa634b..37de10f36294 100644
--- a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/MockChannel.java
+++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/MockChannel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/NettyRequestExecutorTest.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/NettyRequestExecutorTest.java
index 468deb036926..be7093195e55 100644
--- a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/NettyRequestExecutorTest.java
+++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/NettyRequestExecutorTest.java
@@ -1,3 +1,18 @@
+/*
+ * 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.
+ */
+
 package software.amazon.awssdk.http.nio.netty.internal;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/OldConnectionReaperHandlerTest.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/OldConnectionReaperHandlerTest.java
index 90332c9e74fa..e5e3f6f57210 100644
--- a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/OldConnectionReaperHandlerTest.java
+++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/OldConnectionReaperHandlerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/OneTimeReadTimeoutHandlerTest.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/OneTimeReadTimeoutHandlerTest.java
index 469a60d4c9ac..b73355edb68d 100644
--- a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/OneTimeReadTimeoutHandlerTest.java
+++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/OneTimeReadTimeoutHandlerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/ProxyTunnelInitHandlerTest.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/ProxyTunnelInitHandlerTest.java
index 887d1b2fa3f9..d30f9f0252ef 100644
--- a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/ProxyTunnelInitHandlerTest.java
+++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/ProxyTunnelInitHandlerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/PublisherAdapterTest.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/PublisherAdapterTest.java
index 58d9f8f41062..068e870e3209 100644
--- a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/PublisherAdapterTest.java
+++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/PublisherAdapterTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -25,8 +25,8 @@
 import static software.amazon.awssdk.http.nio.netty.internal.ChannelAttributeKey.PROTOCOL_FUTURE;
 import static software.amazon.awssdk.http.nio.netty.internal.ChannelAttributeKey.REQUEST_CONTEXT_KEY;
 
-import com.typesafe.netty.http.DefaultStreamedHttpResponse;
-import com.typesafe.netty.http.StreamedHttpResponse;
+import software.amazon.awssdk.http.nio.netty.internal.nrs.DefaultStreamedHttpResponse;
+import software.amazon.awssdk.http.nio.netty.internal.nrs.StreamedHttpResponse;
 import io.netty.buffer.ByteBufAllocator;
 import io.netty.buffer.EmptyByteBuf;
 import io.netty.channel.ChannelHandlerContext;
diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/RequestAdapterTest.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/RequestAdapterTest.java
new file mode 100644
index 000000000000..31e2aca3c9e7
--- /dev/null
+++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/RequestAdapterTest.java
@@ -0,0 +1,196 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.http.nio.netty.internal;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import io.netty.handler.codec.http.HttpHeaderNames;
+import io.netty.handler.codec.http.HttpMethod;
+import io.netty.handler.codec.http.HttpRequest;
+import io.netty.handler.codec.http.HttpVersion;
+import io.netty.handler.codec.http2.HttpConversionUtil;
+import java.net.URI;
+import java.util.List;
+import org.junit.Test;
+import software.amazon.awssdk.http.Protocol;
+import software.amazon.awssdk.http.SdkHttpMethod;
+import software.amazon.awssdk.http.SdkHttpRequest;
+
+public class RequestAdapterTest {
+
+    private final RequestAdapter h1Adapter = new RequestAdapter(Protocol.HTTP1_1);
+    private final RequestAdapter h2Adapter = new RequestAdapter(Protocol.HTTP2);
+
+    @Test
+    public void adapt_h1Request_requestIsCorrect() {
+        SdkHttpRequest request = SdkHttpRequest.builder()
+                .uri(URI.create("http://localhost:12345/foo/bar/baz"))
+                .putRawQueryParameter("foo", "bar")
+                .putRawQueryParameter("bar", "baz")
+                .putHeader("header1", "header1val")
+                .putHeader("header2", "header2val")
+                .method(SdkHttpMethod.GET)
+                .build();
+
+        HttpRequest adapted = h1Adapter.adapt(request);
+
+        assertThat(adapted.method()).isEqualTo(HttpMethod.valueOf("GET"));
+        assertThat(adapted.uri()).isEqualTo("/foo/bar/baz?foo=bar&bar=baz");
+        assertThat(adapted.protocolVersion()).isEqualTo(HttpVersion.HTTP_1_1);
+        assertThat(adapted.headers().getAll("Host")).containsExactly("localhost:12345");
+        assertThat(adapted.headers().getAll("header1")).containsExactly("header1val");
+        assertThat(adapted.headers().getAll("header2")).containsExactly("header2val");
+    }
+
+    @Test
+    public void adapt_h2Request_addsSchemeExtension() {
+        SdkHttpRequest request = SdkHttpRequest.builder()
+                .uri(URI.create("http://localhost:12345/foo/bar/baz"))
+                .putRawQueryParameter("foo", "bar")
+                .putRawQueryParameter("bar", "baz")
+                .putHeader("header1", "header1val")
+                .putHeader("header2", "header2val")
+                .method(SdkHttpMethod.GET)
+                .build();
+
+        HttpRequest adapted = h2Adapter.adapt(request);
+
+        assertThat(adapted.headers().getAll(HttpConversionUtil.ExtensionHeaderNames.SCHEME.text())).containsExactly("http");
+    }
+
+    @Test
+    public void adapt_noPathContainsQueryParams() {
+        SdkHttpRequest request = SdkHttpRequest.builder()
+                .host("localhost:12345")
+                .protocol("http")
+                .putRawQueryParameter("foo", "bar")
+                .putRawQueryParameter("bar", "baz")
+                .putHeader("header1", "header1val")
+                .putHeader("header2", "header2val")
+                .method(SdkHttpMethod.GET)
+                .build();
+
+        HttpRequest adapted = h1Adapter.adapt(request);
+
+        assertThat(adapted.method()).isEqualTo(HttpMethod.valueOf("GET"));
+        assertThat(adapted.uri()).isEqualTo("/?foo=bar&bar=baz");
+        assertThat(adapted.protocolVersion()).isEqualTo(HttpVersion.HTTP_1_1);
+        assertThat(adapted.headers().getAll("Host")).containsExactly("localhost:12345");
+    }
+
+    @Test
+    public void adapt_hostHeaderSet() {
+        SdkHttpRequest sdkRequest = SdkHttpRequest.builder()
+                .uri(URI.create("http://localhost:12345/"))
+                .method(SdkHttpMethod.HEAD)
+                .build();
+        HttpRequest result = h1Adapter.adapt(sdkRequest);
+        List<String> hostHeaders = result.headers()
+                .getAll(HttpHeaderNames.HOST.toString());
+        assertThat(hostHeaders).containsExactly("localhost:12345");
+    }
+
+    @Test
+    public void adapt_standardHttpsPort_omittedInHeader() {
+        SdkHttpRequest sdkRequest = SdkHttpRequest.builder()
+                .uri(URI.create("https://localhost:443/"))
+                .method(SdkHttpMethod.HEAD)
+                .build();
+        HttpRequest result = h1Adapter.adapt(sdkRequest);
+        List<String> hostHeaders = result.headers()
+                .getAll(HttpHeaderNames.HOST.toString());
+        assertThat(hostHeaders).containsExactly("localhost");
+    }
+
+    @Test
+    public void adapt_containsQueryParamsRequiringEncoding() {
+        SdkHttpRequest request = SdkHttpRequest.builder()
+                .uri(URI.create("http://localhost:12345"))
+                .putRawQueryParameter("java", "☕")
+                .putRawQueryParameter("python", "\uD83D\uDC0D")
+                .method(SdkHttpMethod.GET)
+                .build();
+
+        HttpRequest adapted = h1Adapter.adapt(request);
+
+        assertThat(adapted.uri()).isEqualTo("/?java=%E2%98%95&python=%F0%9F%90%8D");
+    }
+
+    @Test
+    public void adapt_pathEmpty_setToRoot() {
+        SdkHttpRequest request = SdkHttpRequest.builder()
+                .uri(URI.create("http://localhost:12345"))
+                .method(SdkHttpMethod.GET)
+                .build();
+
+        HttpRequest adapted = h1Adapter.adapt(request);
+
+        assertThat(adapted.uri()).isEqualTo("/");
+    }
+
+    @Test
+    public void adapt_defaultPortUsed() {
+        SdkHttpRequest sdkRequest = SdkHttpRequest.builder()
+                .uri(URI.create("http://localhost:80/"))
+                .method(SdkHttpMethod.HEAD)
+                .build();
+        HttpRequest result = h1Adapter.adapt(sdkRequest);
+        List<String> hostHeaders = result.headers()
+                .getAll(HttpHeaderNames.HOST.toString());
+        assertNotNull(hostHeaders);
+        assertEquals(1, hostHeaders.size());
+        assertEquals("localhost", hostHeaders.get(0));
+
+        sdkRequest = SdkHttpRequest.builder()
+                .uri(URI.create("https://localhost:443/"))
+                .method(SdkHttpMethod.HEAD)
+                .build();
+        result = h1Adapter.adapt(sdkRequest);
+        hostHeaders = result.headers()
+                .getAll(HttpHeaderNames.HOST.toString());
+        assertNotNull(hostHeaders);
+        assertEquals(1, hostHeaders.size());
+        assertEquals("localhost", hostHeaders.get(0));
+    }
+
+    @Test
+    public void adapt_nonStandardHttpPort() {
+        SdkHttpRequest sdkRequest = SdkHttpRequest.builder()
+                .uri(URI.create("http://localhost:8080/"))
+                .method(SdkHttpMethod.HEAD)
+                .build();
+        HttpRequest result = h1Adapter.adapt(sdkRequest);
+        List<String> hostHeaders = result.headers()
+                .getAll(HttpHeaderNames.HOST.toString());
+
+        assertThat(hostHeaders).containsExactly("localhost:8080");
+    }
+
+    @Test
+    public void adapt_nonStandardHttpsPort() {
+        SdkHttpRequest sdkRequest = SdkHttpRequest.builder()
+                .uri(URI.create("https://localhost:8443/"))
+                .method(SdkHttpMethod.HEAD)
+                .build();
+        HttpRequest result = h1Adapter.adapt(sdkRequest);
+        List<String> hostHeaders = result.headers()
+                .getAll(HttpHeaderNames.HOST.toString());
+
+        assertThat(hostHeaders).containsExactly("localhost:8443");
+    }
+}
diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/ResponseCompletionTest.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/ResponseCompletionTest.java
index a266e8b5ae88..0f6f786eb9d0 100644
--- a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/ResponseCompletionTest.java
+++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/ResponseCompletionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/SdkChannelOptionsTest.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/SdkChannelOptionsTest.java
index 28f2b8c58d00..49fbf116b674 100644
--- a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/SdkChannelOptionsTest.java
+++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/SdkChannelOptionsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/SharedSdkEventLoopGroupTest.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/SharedSdkEventLoopGroupTest.java
index 62d58084394d..755630f1ee31 100644
--- a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/SharedSdkEventLoopGroupTest.java
+++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/SharedSdkEventLoopGroupTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/SslCloseCompletionEventHandlerTest.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/SslCloseCompletionEventHandlerTest.java
index cb9d27620096..1e1dcea1c6a9 100644
--- a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/SslCloseCompletionEventHandlerTest.java
+++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/SslCloseCompletionEventHandlerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/StaticKeyManagerFactorySpiTest.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/StaticKeyManagerFactorySpiTest.java
index 1703669a6346..58ef2ec6307e 100644
--- a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/StaticKeyManagerFactorySpiTest.java
+++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/StaticKeyManagerFactorySpiTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/StaticKeyManagerFactoryTest.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/StaticKeyManagerFactoryTest.java
index 1f5c8713e769..4e79ad583d5e 100644
--- a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/StaticKeyManagerFactoryTest.java
+++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/StaticKeyManagerFactoryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/UnusedChannelExceptionHandlerTest.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/UnusedChannelExceptionHandlerTest.java
index 1582af54cd97..3b87946e6c22 100644
--- a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/UnusedChannelExceptionHandlerTest.java
+++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/UnusedChannelExceptionHandlerTest.java
@@ -1,3 +1,18 @@
+/*
+ * 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.
+ */
+
 package software.amazon.awssdk.http.nio.netty.internal;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/http2/FlushOnReadTest.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/http2/FlushOnReadTest.java
new file mode 100644
index 000000000000..aa7b2f545cc8
--- /dev/null
+++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/http2/FlushOnReadTest.java
@@ -0,0 +1,60 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.http.nio.netty.internal.http2;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.when;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandlerContext;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InOrder;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.runners.MockitoJUnitRunner;
+
+@RunWith(MockitoJUnitRunner.class)
+public class FlushOnReadTest {
+
+    @Mock
+    private ChannelHandlerContext mockCtx;
+
+    @Mock
+    private Channel mockChannel;
+
+    @Mock
+    private Channel mockParentChannel;
+
+    @Test
+    public void read_forwardsReadBeforeParentFlush() {
+        when(mockCtx.channel()).thenReturn(mockChannel);
+        when(mockChannel.parent()).thenReturn(mockParentChannel);
+
+        FlushOnReadHandler handler = FlushOnReadHandler.getInstance();
+
+        handler.read(mockCtx);
+
+        InOrder inOrder = Mockito.inOrder(mockCtx, mockParentChannel);
+
+        inOrder.verify(mockCtx).read();
+        inOrder.verify(mockParentChannel).flush();
+    }
+
+    @Test
+    public void getInstance_returnsSingleton() {
+        assertThat(FlushOnReadHandler.getInstance() == FlushOnReadHandler.getInstance()).isTrue();
+    }
+}
diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/http2/Http2GoAwayEventListenerTest.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/http2/Http2GoAwayEventListenerTest.java
new file mode 100644
index 000000000000..d642649dbea2
--- /dev/null
+++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/http2/Http2GoAwayEventListenerTest.java
@@ -0,0 +1,68 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.http.nio.netty.internal.http2;
+
+import static org.mockito.Matchers.eq;
+import static org.mockito.Matchers.isA;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
+
+import io.netty.buffer.Unpooled;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPipeline;
+import io.netty.handler.codec.http2.DefaultHttp2GoAwayFrame;
+import io.netty.util.Attribute;
+import org.junit.Before;
+import org.junit.Test;
+import software.amazon.awssdk.http.nio.netty.internal.ChannelAttributeKey;
+
+public class Http2GoAwayEventListenerTest {
+    private ChannelHandlerContext ctx;
+    private Channel channel;
+    private ChannelPipeline channelPipeline;
+    private Attribute<Http2MultiplexedChannelPool> attribute;
+
+    @Before
+    public void setup() {
+        this.ctx = mock(ChannelHandlerContext.class);
+        this.channel = mock(Channel.class);
+        this.channelPipeline = mock(ChannelPipeline.class);
+        this.attribute = mock(Attribute.class);
+
+        when(ctx.channel()).thenReturn(channel);
+        when(channel.pipeline()).thenReturn(channelPipeline);
+        when(channel.attr(ChannelAttributeKey.HTTP2_MULTIPLEXED_CHANNEL_POOL)).thenReturn(attribute);
+    }
+
+    @Test
+    public void goAwayWithNoChannelPoolRecordRaisesNoExceptions() throws Exception {
+        when(attribute.get()).thenReturn(null);
+        new Http2GoAwayEventListener(channel).onGoAwayReceived(0, 0, Unpooled.EMPTY_BUFFER);
+        verify(channelPipeline).fireExceptionCaught(isA(GoAwayException.class));
+    }
+
+    @Test
+    public void goAwayWithChannelPoolRecordPassesAlongTheFrame() throws Exception {
+        Http2MultiplexedChannelPool record = mock(Http2MultiplexedChannelPool.class);
+        when(attribute.get()).thenReturn(record);
+        new Http2GoAwayEventListener(channel).onGoAwayReceived(0, 0, Unpooled.EMPTY_BUFFER);
+        verify(record).handleGoAway(eq(channel), eq(0), isA(GoAwayException.class));
+        verifyNoMoreInteractions(record);
+    }
+}
diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/http2/Http2GoAwayFrameHandlerTest.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/http2/Http2GoAwayFrameHandlerTest.java
deleted file mode 100644
index 2d9ed3ae4975..000000000000
--- a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/http2/Http2GoAwayFrameHandlerTest.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.http.nio.netty.internal.http2;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.when;
-
-import io.netty.buffer.Unpooled;
-import io.netty.channel.Channel;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.handler.codec.http2.DefaultHttp2GoAwayFrame;
-import io.netty.util.Attribute;
-import org.junit.Before;
-import org.junit.Test;
-import software.amazon.awssdk.http.nio.netty.internal.ChannelAttributeKey;
-
-public class Http2GoAwayFrameHandlerTest {
-    private static final DefaultHttp2GoAwayFrame GO_AWAY_FRAME = new DefaultHttp2GoAwayFrame(0, Unpooled.EMPTY_BUFFER);
-    private ChannelHandlerContext ctx;
-    private Channel channel;
-    private Attribute<MultiplexedChannelRecord> attribute;
-
-    @Before
-    public void setup() {
-        this.ctx = mock(ChannelHandlerContext.class);
-        this.channel = mock(Channel.class);
-        this.attribute = mock(Attribute.class);
-
-        when(ctx.channel()).thenReturn(channel);
-        when(channel.attr(ChannelAttributeKey.CHANNEL_POOL_RECORD)).thenReturn(attribute);
-    }
-
-    @Test
-    public void goAwayWithNoChannelPoolRecordRaisesNoExceptions() {
-        when(attribute.get()).thenReturn(null);
-        new Http2GoAwayFrameHandler().channelRead0(ctx, GO_AWAY_FRAME);
-    }
-
-    @Test
-    public void goAwayWithChannelPoolRecordPassesAlongTheFrame() {
-        MultiplexedChannelRecord record = mock(MultiplexedChannelRecord.class);
-        when(attribute.get()).thenReturn(record);
-        new Http2GoAwayFrameHandler().channelRead0(ctx, GO_AWAY_FRAME);
-        verify(record).goAway(GO_AWAY_FRAME);
-        verifyNoMoreInteractions(record);
-    }
-}
diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/http2/Http2MultiplexedChannelPoolTest.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/http2/Http2MultiplexedChannelPoolTest.java
index 753988ad5964..ca40d14cb6e0 100644
--- a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/http2/Http2MultiplexedChannelPoolTest.java
+++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/http2/Http2MultiplexedChannelPoolTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -15,24 +15,40 @@
 
 package software.amazon.awssdk.http.nio.netty.internal.http2;
 
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Matchers.isA;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+import static software.amazon.awssdk.http.nio.netty.internal.ChannelAttributeKey.HTTP2_CONNECTION;
+import static software.amazon.awssdk.http.nio.netty.internal.http2.utils.Http2TestUtils.newHttp2Channel;
+
 import io.netty.channel.Channel;
 import io.netty.channel.EventLoopGroup;
+import io.netty.channel.embedded.EmbeddedChannel;
 import io.netty.channel.nio.NioEventLoopGroup;
 import io.netty.channel.pool.ChannelPool;
 import io.netty.channel.socket.SocketChannel;
 import io.netty.channel.socket.nio.NioSocketChannel;
+import io.netty.handler.codec.http2.Http2Connection;
+import io.netty.handler.codec.http2.Http2FrameCodec;
+import io.netty.handler.codec.http2.Http2LocalFlowController;
+import io.netty.handler.codec.http2.Http2Stream;
 import io.netty.util.concurrent.DefaultPromise;
+import io.netty.util.concurrent.FailedFuture;
+import io.netty.util.concurrent.Future;
 import io.netty.util.concurrent.Promise;
+import java.io.IOException;
+import java.util.Collections;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.mockito.ArgumentCaptor;
 import org.mockito.InOrder;
 import org.mockito.Mockito;
-
-import java.util.Collections;
-import java.util.concurrent.CompletableFuture;
-
-import static org.assertj.core.api.Assertions.assertThat;
+import software.amazon.awssdk.http.nio.netty.internal.ChannelAttributeKey;
 
 /**
  * Tests for {@link Http2MultiplexedChannelPool}.
@@ -51,29 +67,40 @@ public static void teardown() {
     }
 
     @Test
-    public void closeWaitsForConnectionToBeReleasedBeforeClosingConnectionPool() throws InterruptedException {
+    public void failedConnectionAcquireNotifiesPromise() throws InterruptedException {
+        IOException exception = new IOException();
+        ChannelPool connectionPool = mock(ChannelPool.class);
+        when(connectionPool.acquire()).thenReturn(new FailedFuture<>(loopGroup.next(), exception));
+
+        ChannelPool pool = new Http2MultiplexedChannelPool(connectionPool, loopGroup.next(), null);
+
+        Future<Channel> acquirePromise = pool.acquire().await();
+        assertThat(acquirePromise.isSuccess()).isFalse();
+        assertThat(acquirePromise.cause()).isEqualTo(exception);
+    }
+
+    @Test
+    public void releaseParentChannelIfReleasingLastChildChannelOnGoAwayChannel() {
         SocketChannel channel = new NioSocketChannel();
         try {
             loopGroup.register(channel).awaitUninterruptibly();
-            Promise<Channel> channelPromise = new DefaultPromise<>(loopGroup.next());
-            channelPromise.setSuccess(channel);
 
-            ChannelPool connectionPool = Mockito.mock(ChannelPool.class);
-            Promise<Void> releasePromise = Mockito.spy(new DefaultPromise<>(loopGroup.next()));
-            Mockito.doCallRealMethod().when(releasePromise).await();
-            releasePromise.setSuccess(null);
-            Mockito.when(connectionPool.release(Mockito.eq(channel))).thenReturn(releasePromise);
+            ChannelPool connectionPool = mock(ChannelPool.class);
+            ArgumentCaptor<Promise> releasePromise = ArgumentCaptor.forClass(Promise.class);
+            when(connectionPool.release(eq(channel), releasePromise.capture())).thenAnswer(invocation -> {
+                Promise<?> promise = releasePromise.getValue();
+                promise.setSuccess(null);
+                return promise;
+            });
 
-            MultiplexedChannelRecord record = new MultiplexedChannelRecord(channelPromise,
-                                                                           channel,
-                                                                           8,
-                                                                           (ch, rec) -> {});
-            Http2MultiplexedChannelPool h2Pool = new Http2MultiplexedChannelPool(connectionPool, loopGroup.next(), 2, Collections.singletonList(record));
+            MultiplexedChannelRecord record = new MultiplexedChannelRecord(channel, 8, null);
+            Http2MultiplexedChannelPool h2Pool = new Http2MultiplexedChannelPool(connectionPool, loopGroup,
+                                                                                 Collections.singleton(record), null);
 
             h2Pool.close();
 
-            InOrder inOrder = Mockito.inOrder(connectionPool, releasePromise);
-            inOrder.verify(releasePromise).await();
+            InOrder inOrder = Mockito.inOrder(connectionPool);
+            inOrder.verify(connectionPool).release(eq(channel), isA(Promise.class));
             inOrder.verify(connectionPool).close();
         } finally {
             channel.close().awaitUninterruptibly();
@@ -82,13 +109,67 @@ public void closeWaitsForConnectionToBeReleasedBeforeClosingConnectionPool() thr
 
     @Test
     public void acquireAfterCloseFails() throws InterruptedException {
-        ChannelPool connectionPool = Mockito.mock(ChannelPool.class);
-
-        Http2MultiplexedChannelPool h2Pool = new Http2MultiplexedChannelPool(connectionPool, loopGroup.next(), 2, Collections.emptyList());
+        ChannelPool connectionPool = mock(ChannelPool.class);
+        Http2MultiplexedChannelPool h2Pool = new Http2MultiplexedChannelPool(connectionPool, loopGroup.next(), null);
 
         h2Pool.close();
 
-        assertThat(h2Pool.acquire().await().isSuccess()).isFalse();
+        Future<Channel> acquireResult = h2Pool.acquire().await();
+        assertThat(acquireResult.isSuccess()).isFalse();
+        assertThat(acquireResult.cause()).isInstanceOf(IOException.class);
+    }
+
+    @Test
+    public void closeWaitsForConnectionToBeReleasedBeforeClosingConnectionPool() {
+        SocketChannel channel = new NioSocketChannel();
+        try {
+            loopGroup.register(channel).awaitUninterruptibly();
+
+            ChannelPool connectionPool = mock(ChannelPool.class);
+            ArgumentCaptor<Promise> releasePromise = ArgumentCaptor.forClass(Promise.class);
+            when(connectionPool.release(eq(channel), releasePromise.capture())).thenAnswer(invocation -> {
+                Promise<?> promise = releasePromise.getValue();
+                promise.setSuccess(null);
+                return promise;
+            });
+
+            MultiplexedChannelRecord record = new MultiplexedChannelRecord(channel, 8, null);
+            Http2MultiplexedChannelPool h2Pool = new Http2MultiplexedChannelPool(connectionPool, loopGroup,
+                                                                                 Collections.singleton(record), null);
+
+            h2Pool.close();
+
+            InOrder inOrder = Mockito.inOrder(connectionPool);
+            inOrder.verify(connectionPool).release(eq(channel), isA(Promise.class));
+            inOrder.verify(connectionPool).close();
+        } finally {
+            channel.close().awaitUninterruptibly();
+        }
+    }
+
+    @Test
+    public void acquire_shouldAcquireAgainIfExistingNotReusable() throws Exception {
+        Channel channel = new EmbeddedChannel();
+
+        try {
+            ChannelPool connectionPool = Mockito.mock(ChannelPool.class);
+
+            loopGroup.register(channel).awaitUninterruptibly();
+            Promise<Channel> channelPromise = new DefaultPromise<>(loopGroup.next());
+            channelPromise.setSuccess(channel);
+
+            Mockito.when(connectionPool.acquire()).thenReturn(channelPromise);
+
+            Http2MultiplexedChannelPool h2Pool = new Http2MultiplexedChannelPool(connectionPool, loopGroup,
+                                                                                 Collections.emptySet(), null);
+
+            h2Pool.acquire().awaitUninterruptibly();
+            h2Pool.acquire().awaitUninterruptibly();
+
+            Mockito.verify(connectionPool, Mockito.times(2)).acquire();
+        } finally {
+            channel.close();
+        }
     }
 
     @Test(timeout = 5_000)
@@ -99,17 +180,14 @@ public void interruptDuringClosePreservesFlag() throws InterruptedException {
             Promise<Channel> channelPromise = new DefaultPromise<>(loopGroup.next());
             channelPromise.setSuccess(channel);
 
-            ChannelPool connectionPool = Mockito.mock(ChannelPool.class);
+            ChannelPool connectionPool = mock(ChannelPool.class);
             Promise<Void> releasePromise = Mockito.spy(new DefaultPromise<>(loopGroup.next()));
 
-            Mockito.when(connectionPool.release(Mockito.eq(channel))).thenReturn(releasePromise);
+            when(connectionPool.release(eq(channel))).thenReturn(releasePromise);
 
-            MultiplexedChannelRecord record = new MultiplexedChannelRecord(channelPromise,
-                    channel,
-                    8,
-                    (ch, rec) -> {
-                    });
-            Http2MultiplexedChannelPool h2Pool = new Http2MultiplexedChannelPool(connectionPool, loopGroup.next(), 2, Collections.singletonList(record));
+            MultiplexedChannelRecord record = new MultiplexedChannelRecord(channel, 8, null);
+            Http2MultiplexedChannelPool h2Pool = new Http2MultiplexedChannelPool(connectionPool, loopGroup,
+                                                                                 Collections.singleton(record), null);
 
             CompletableFuture<Boolean> interrupteFlagPreserved = new CompletableFuture<>();
 
@@ -131,4 +209,53 @@ public void interruptDuringClosePreservesFlag() throws InterruptedException {
             channel.close().awaitUninterruptibly();
         }
     }
+
+    @Test
+    public void acquire_shouldExpandConnectionWindowSizeProportionally() {
+        int maxConcurrentStream = 3;
+        EmbeddedChannel channel = newHttp2Channel();
+        channel.attr(ChannelAttributeKey.MAX_CONCURRENT_STREAMS).set((long) maxConcurrentStream);
+
+        try {
+            ChannelPool connectionPool = Mockito.mock(ChannelPool.class);
+
+            loopGroup.register(channel).awaitUninterruptibly();
+            Promise<Channel> channelPromise = new DefaultPromise<>(loopGroup.next());
+            channelPromise.setSuccess(channel);
+
+            Mockito.when(connectionPool.acquire()).thenReturn(channelPromise);
+
+            Http2MultiplexedChannelPool h2Pool = new Http2MultiplexedChannelPool(connectionPool, loopGroup,
+                                                                                 Collections.emptySet(), null);
+
+            Future<Channel> acquire = h2Pool.acquire();
+            acquire.awaitUninterruptibly();
+            channel.runPendingTasks();
+
+            Http2Connection http2Connection = channel.attr(HTTP2_CONNECTION).get();
+            Http2LocalFlowController flowController =
+                http2Connection.local().flowController();
+
+            System.out.println(flowController.initialWindowSize());
+            Http2Stream connectionStream = http2Connection.stream(0);
+
+            // 1_048_576 (initial configured window size), 65535 (configured initial window size)
+            // (1048576 - 65535) *2 + 65535 = 2031617
+            assertThat(flowController.windowSize(connectionStream)).isEqualTo(2031617);
+
+            // 2031617 + 1048576 (configured initial window size) = 3080193
+            assertThat(flowController.initialWindowSize(connectionStream)).isEqualTo(3080193);
+
+            // acquire again
+            h2Pool.acquire().awaitUninterruptibly();
+            channel.runPendingTasks();
+
+            // 3080193 + 1048576 (configured initial window size) = 4128769
+            assertThat(flowController.initialWindowSize(connectionStream)).isEqualTo(4128769);
+
+            Mockito.verify(connectionPool, Mockito.times(1)).acquire();
+        } finally {
+            channel.close();
+        }
+    }
 }
diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/http2/Http2PingHandlerTest.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/http2/Http2PingHandlerTest.java
new file mode 100644
index 000000000000..2788337dacba
--- /dev/null
+++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/http2/Http2PingHandlerTest.java
@@ -0,0 +1,242 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.http.nio.netty.internal.http2;
+
+import static java.time.temporal.ChronoUnit.SECONDS;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelInboundHandlerAdapter;
+import io.netty.channel.ChannelOutboundHandlerAdapter;
+import io.netty.channel.ChannelPromise;
+import io.netty.channel.SimpleChannelInboundHandler;
+import io.netty.channel.embedded.EmbeddedChannel;
+import io.netty.handler.codec.http2.DefaultHttp2PingFrame;
+import io.netty.handler.codec.http2.Http2PingFrame;
+import java.io.IOException;
+import java.time.Instant;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.TimeUnit;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mockito;
+import software.amazon.awssdk.http.Protocol;
+import software.amazon.awssdk.http.nio.netty.internal.ChannelAttributeKey;
+
+public class Http2PingHandlerTest {
+    private static final int FAST_CHECKER_DURATION_MILLIS = 100;
+
+    private Http2PingHandler fastChecker;
+    private Http2PingHandler slowChecker;
+
+    @Before
+    public void setup() throws Exception {
+        this.fastChecker = new Http2PingHandler(FAST_CHECKER_DURATION_MILLIS);
+        this.slowChecker = new Http2PingHandler(30 * 1_000);
+    }
+
+    @Test
+    public void register_withoutProtocol_Fails() {
+        EmbeddedChannel channel = new EmbeddedChannel(slowChecker);
+        assertThat(channel.pipeline().get(Http2PingHandler.class)).isNull();
+    }
+
+    @Test
+    public void register_withIncompleteProtocol_doesNotPing() {
+        EmbeddedChannel channel = createChannelWithoutProtocol(fastChecker);
+        channel.runPendingTasks();
+
+        DefaultHttp2PingFrame sentFrame = channel.readOutbound();
+
+        assertThat(sentFrame).isNull();
+    }
+
+    @Test
+    public void register_withHttp1Protocol_doesNotPing() {
+        EmbeddedChannel channel = createHttp1Channel(fastChecker);
+        channel.runPendingTasks();
+
+        DefaultHttp2PingFrame sentFrame = channel.readOutbound();
+
+        assertThat(sentFrame).isNull();
+    }
+
+    @Test
+    public void register_WithHttp2Protocol_pingsImmediately() {
+        EmbeddedChannel channel = createHttp2Channel(slowChecker);
+        channel.runPendingTasks();
+
+        DefaultHttp2PingFrame sentFrame = channel.readOutbound();
+
+        assertThat(sentFrame).isNotNull();
+        assertThat(sentFrame.ack()).isFalse();
+    }
+
+    @Test
+    public void unregister_stopsRunning() throws InterruptedException {
+        EmbeddedChannel channel = createHttp2Channel(fastChecker);
+        channel.pipeline().remove(Http2PingHandler.class);
+
+        // Flush out any tasks that happened before we closed
+        channel.runPendingTasks();
+
+        while (channel.readOutbound() != null) {
+            // Discard
+        }
+
+        Thread.sleep(FAST_CHECKER_DURATION_MILLIS);
+
+        DefaultHttp2PingFrame sentFrame = channel.readOutbound();
+
+        assertThat(sentFrame).isNull();
+    }
+
+    @Test
+    public void ignoredPingsResultInOneChannelException() throws InterruptedException {
+        PipelineExceptionCatcher catcher = new PipelineExceptionCatcher();
+        EmbeddedChannel channel = createHttp2Channel(fastChecker, catcher);
+        
+        Thread.sleep(FAST_CHECKER_DURATION_MILLIS);
+        channel.runPendingTasks();
+
+        assertThat(catcher.caughtExceptions).hasSize(1);
+        assertThat(catcher.caughtExceptions.get(0)).isInstanceOf(IOException.class);
+    }
+
+    @Test
+    public void respondedToPingsResultInNoAction() {
+        PipelineExceptionCatcher catcher = new PipelineExceptionCatcher();
+        EmbeddedChannel channel = createHttp2Channel(fastChecker, catcher);
+
+        channel.eventLoop().scheduleAtFixedRate(() -> channel.writeInbound(new DefaultHttp2PingFrame(0, true)),
+                                                0, FAST_CHECKER_DURATION_MILLIS, TimeUnit.MILLISECONDS);
+
+        Instant runEnd = Instant.now().plus(1, SECONDS);
+        while (Instant.now().isBefore(runEnd)) {
+            channel.runPendingTasks();
+        }
+
+        assertThat(catcher.caughtExceptions).isEmpty();
+    }
+
+    @Test
+    public void nonAckPingsResultInOneChannelException() {
+        PipelineExceptionCatcher catcher = new PipelineExceptionCatcher();
+        EmbeddedChannel channel = createHttp2Channel(fastChecker, catcher);
+
+        channel.eventLoop().scheduleAtFixedRate(() -> channel.writeInbound(new DefaultHttp2PingFrame(0, false)),
+                                                0, FAST_CHECKER_DURATION_MILLIS, TimeUnit.MILLISECONDS);
+
+        Instant runEnd = Instant.now().plus(1, SECONDS);
+        while (Instant.now().isBefore(runEnd)) {
+            channel.runPendingTasks();
+        }
+
+        assertThat(catcher.caughtExceptions).hasSize(1);
+        assertThat(catcher.caughtExceptions.get(0)).isInstanceOf(IOException.class);
+    }
+
+    @Test
+    public void failedWriteResultsInOneChannelException() throws InterruptedException {
+        PipelineExceptionCatcher catcher = new PipelineExceptionCatcher();
+        EmbeddedChannel channel = createHttp2Channel(fastChecker, catcher, new FailingWriter());
+        channel.runPendingTasks();
+        assertThat(catcher.caughtExceptions).hasSize(1);
+        assertThat(catcher.caughtExceptions.get(0)).isInstanceOf(IOException.class);
+    }
+
+    @Test
+    public void ackPingsAreNotForwardedToOtherHandlers() throws InterruptedException {
+        PingReadCatcher catcher = new PingReadCatcher();
+        EmbeddedChannel channel = createHttp2Channel(fastChecker, catcher);
+        channel.writeInbound(new DefaultHttp2PingFrame(0, true));
+
+        channel.runPendingTasks();
+
+        assertThat(catcher.caughtPings).isEmpty();
+    }
+
+    private static EmbeddedChannel createChannelWithoutProtocol(ChannelHandler... handlers) {
+        EmbeddedChannel channel = new EmbeddedChannel();
+        channel.attr(ChannelAttributeKey.PROTOCOL_FUTURE).set(new CompletableFuture<>());
+        channel.pipeline().addLast(handlers);
+        return channel;
+    }
+
+    private static EmbeddedChannel createHttp1Channel(ChannelHandler... handlers) {
+        EmbeddedChannel channel = createChannelWithoutProtocol(handlers);
+        channel.attr(ChannelAttributeKey.PROTOCOL_FUTURE).get().complete(Protocol.HTTP1_1);
+        return channel;
+    }
+
+    private static EmbeddedChannel createHttp2Channel(ChannelHandler... handlers) {
+        EmbeddedChannel channel = createChannelWithoutProtocol(handlers);
+        channel.attr(ChannelAttributeKey.PROTOCOL_FUTURE).get().complete(Protocol.HTTP2);
+        return channel;
+    }
+
+    @Test
+    public void nonAckPingsAreForwardedToOtherHandlers() throws InterruptedException {
+        PingReadCatcher catcher = new PingReadCatcher();
+        EmbeddedChannel channel = createHttp2Channel(fastChecker, catcher);
+        channel.writeInbound(new DefaultHttp2PingFrame(0, false));
+
+        channel.runPendingTasks();
+
+        assertThat(catcher.caughtPings).hasSize(1);
+    }
+
+    @Test
+    public void channelInactive_shouldCancelTaskAndForwardToOtherHandlers() {
+        EmbeddedChannel channel = createHttp2Channel(fastChecker);
+        ChannelHandlerContext context = Mockito.mock(ChannelHandlerContext.class);
+        fastChecker.channelInactive(context);
+        Mockito.verify(context).fireChannelInactive();
+
+        channel.writeInbound(new DefaultHttp2PingFrame(0, false));
+        assertThat(channel.runScheduledPendingTasks()).isEqualTo(-1L);
+    }
+
+    private static final class PingReadCatcher extends SimpleChannelInboundHandler<Http2PingFrame> {
+        private final List<Http2PingFrame> caughtPings = Collections.synchronizedList(new ArrayList<>());
+
+        @Override
+        protected void channelRead0(ChannelHandlerContext ctx, Http2PingFrame msg) {
+            caughtPings.add(msg);
+        }
+    }
+
+    private static final class PipelineExceptionCatcher extends ChannelInboundHandlerAdapter {
+        private final List<Throwable> caughtExceptions = Collections.synchronizedList(new ArrayList<>());
+
+        @Override
+        public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
+            caughtExceptions.add(cause);
+            super.exceptionCaught(ctx, cause);
+        }
+    }
+
+    private static final class FailingWriter extends ChannelOutboundHandlerAdapter {
+        @Override
+        public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) {
+            promise.setFailure(new IOException("Failed!"));
+        }
+    }
+}
\ No newline at end of file
diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/http2/Http2SettingsFrameHandlerTest.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/http2/Http2SettingsFrameHandlerTest.java
index 8db3fa23b7c6..fafdf215685c 100644
--- a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/http2/Http2SettingsFrameHandlerTest.java
+++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/http2/Http2SettingsFrameHandlerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -17,7 +17,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static software.amazon.awssdk.http.nio.netty.internal.ChannelAttributeKey.CHANNEL_POOL_RECORD;
+import static software.amazon.awssdk.http.nio.netty.internal.ChannelAttributeKey.HTTP2_MULTIPLEXED_CHANNEL_POOL;
 import static software.amazon.awssdk.http.nio.netty.internal.ChannelAttributeKey.MAX_CONCURRENT_STREAMS;
 import static software.amazon.awssdk.http.nio.netty.internal.ChannelAttributeKey.PROTOCOL_FUTURE;
 
@@ -92,7 +92,7 @@ public void channelRead_useClientMaxStreams() {
     }
 
     @Test
-    public void exceptionCaught_shouldHandleErrorCloseChannel() throws InterruptedException {
+    public void exceptionCaught_shouldHandleErrorCloseChannel() throws Exception {
         Throwable cause = new Throwable(new RuntimeException("BOOM"));
         handler.exceptionCaught(context, cause);
         verifyChannelError(cause.getClass());
@@ -105,7 +105,7 @@ public void channelUnregistered_ProtocolFutureNotDone_ShouldRaiseError() throws
     }
 
     private void verifyChannelError(Class<? extends Throwable> cause) throws InterruptedException {
-        channel.attr(CHANNEL_POOL_RECORD).set(null);
+        channel.attr(HTTP2_MULTIPLEXED_CHANNEL_POOL).set(null);
 
         channel.runAllPendingTasks();
 
diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/http2/Http2StreamExceptionHandlerTest.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/http2/Http2StreamExceptionHandlerTest.java
new file mode 100644
index 000000000000..6eac08f8269d
--- /dev/null
+++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/http2/Http2StreamExceptionHandlerTest.java
@@ -0,0 +1,122 @@
+
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.http.nio.netty.internal.http2;
+
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import static software.amazon.awssdk.http.nio.netty.internal.ChannelAttributeKey.PING_TRACKER;
+
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelInboundHandlerAdapter;
+import io.netty.channel.nio.NioEventLoopGroup;
+import io.netty.handler.timeout.ReadTimeoutException;
+import java.io.IOException;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.runners.MockitoJUnitRunner;
+import software.amazon.awssdk.http.nio.netty.internal.MockChannel;
+
+@RunWith(MockitoJUnitRunner.class)
+public class Http2StreamExceptionHandlerTest {
+
+    private static final NioEventLoopGroup GROUP = new NioEventLoopGroup(1);
+    private Http2StreamExceptionHandler handler;
+
+    @Mock
+    private ChannelHandlerContext context;
+
+    @Mock
+    private Channel mockParentChannel;
+
+    private MockChannel embeddedParentChannel;
+
+    @Mock
+    private Channel streamChannel;
+
+    private TestVerifyExceptionHandler verifyExceptionHandler;
+
+
+    @Before
+    public void setup() throws Exception {
+        embeddedParentChannel = new MockChannel();
+        verifyExceptionHandler = new TestVerifyExceptionHandler();
+        embeddedParentChannel.pipeline().addLast(verifyExceptionHandler);
+        when(context.channel()).thenReturn(streamChannel);
+        handler = Http2StreamExceptionHandler.create();
+        when(context.executor()).thenReturn(GROUP.next());
+    }
+
+
+    @After
+    public void tearDown() {
+        embeddedParentChannel.close().awaitUninterruptibly();
+        Mockito.reset(streamChannel, context, mockParentChannel);
+    }
+
+    @AfterClass
+    public static void teardown() {
+        GROUP.shutdownGracefully().awaitUninterruptibly();
+    }
+
+    @Test
+    public void timeoutException_shouldFireExceptionAndPropagateException() {
+        when(streamChannel.parent()).thenReturn(embeddedParentChannel);
+        handler.exceptionCaught(context, ReadTimeoutException.INSTANCE);
+
+        assertThat(verifyExceptionHandler.exceptionCaught).isExactlyInstanceOf(Http2StreamExceptionHandler.Http2StreamIoException.class);
+        verify(context).fireExceptionCaught(ReadTimeoutException.INSTANCE);
+    }
+
+    @Test
+    public void ioException_shouldFireExceptionAndPropagateException() {
+        IOException ioException = new IOException("yolo");
+        when(streamChannel.parent()).thenReturn(embeddedParentChannel);
+        handler.exceptionCaught(context, ioException);
+
+        assertThat(verifyExceptionHandler.exceptionCaught).isExactlyInstanceOf(Http2StreamExceptionHandler.Http2StreamIoException.class);
+        verify(context).fireExceptionCaught(ioException);
+    }
+
+    @Test
+    public void otherException_shouldJustPropagateException() {
+        when(streamChannel.parent()).thenReturn(embeddedParentChannel);
+
+        RuntimeException otherException = new RuntimeException("test");
+        handler.exceptionCaught(context, otherException);
+
+        assertThat(embeddedParentChannel.attr(PING_TRACKER).get()).isNull();
+
+        verify(context).fireExceptionCaught(otherException);
+        assertThat(verifyExceptionHandler.exceptionCaught).isNull();
+    }
+
+    private static final class TestVerifyExceptionHandler extends ChannelInboundHandlerAdapter {
+        private Throwable exceptionCaught;
+        @Override
+        public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) {
+            exceptionCaught = cause;
+        }
+    }
+}
\ No newline at end of file
diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/http2/HttpOrHttp2ChannelPoolTest.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/http2/HttpOrHttp2ChannelPoolTest.java
index a52ddb8a1922..bd2728465c76 100644
--- a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/http2/HttpOrHttp2ChannelPoolTest.java
+++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/http2/HttpOrHttp2ChannelPoolTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -15,6 +15,14 @@
 
 package software.amazon.awssdk.http.nio.netty.internal.http2;
 
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import static software.amazon.awssdk.http.SdkHttpConfigurationOption.CONNECTION_ACQUIRE_TIMEOUT;
+import static software.amazon.awssdk.http.SdkHttpConfigurationOption.MAX_PENDING_CONNECTION_ACQUIRES;
+import static software.amazon.awssdk.http.nio.netty.internal.ChannelAttributeKey.PROTOCOL_FUTURE;
+
 import io.netty.channel.Channel;
 import io.netty.channel.EventLoopGroup;
 import io.netty.channel.nio.NioEventLoopGroup;
@@ -22,6 +30,8 @@
 import io.netty.channel.socket.nio.NioSocketChannel;
 import io.netty.util.concurrent.Future;
 import io.netty.util.concurrent.Promise;
+import java.time.Duration;
+import java.util.concurrent.CompletableFuture;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
@@ -30,20 +40,10 @@
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 import software.amazon.awssdk.http.Protocol;
+import software.amazon.awssdk.http.nio.netty.internal.MockChannel;
 import software.amazon.awssdk.http.nio.netty.internal.NettyConfiguration;
 import software.amazon.awssdk.utils.AttributeMap;
 
-import java.time.Duration;
-import java.util.concurrent.CompletableFuture;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-import static software.amazon.awssdk.http.SdkHttpConfigurationOption.CONNECTION_ACQUIRE_TIMEOUT;
-import static software.amazon.awssdk.http.SdkHttpConfigurationOption.MAX_PENDING_CONNECTION_ACQUIRES;
-import static software.amazon.awssdk.http.nio.netty.internal.ChannelAttributeKey.PROTOCOL_FUTURE;
-
 /**
  * Tests for {@link HttpOrHttp2ChannelPool}.
  */
@@ -82,6 +82,34 @@ public void protocolConfigNotStarted_closeSucceeds() {
         httpOrHttp2ChannelPool.close();
     }
 
+    @Test(timeout = 5_000)
+    public void invalidProtocolConfig_shouldFailPromise() throws Exception {
+        HttpOrHttp2ChannelPool invalidChannelPool = new HttpOrHttp2ChannelPool(mockDelegatePool,
+                                                            eventLoopGroup,
+                                                            4,
+                                                            new NettyConfiguration(AttributeMap.builder()
+                                                                                               .put(CONNECTION_ACQUIRE_TIMEOUT, Duration.ofSeconds(1))
+                                                                                               .put(MAX_PENDING_CONNECTION_ACQUIRES, 0)
+                                                                                               .build()));
+
+        Promise<Channel> acquirePromise = eventLoopGroup.next().newPromise();
+        when(mockDelegatePool.acquire()).thenReturn(acquirePromise);
+
+        Thread.sleep(500);
+
+        Channel channel = new MockChannel();
+        eventLoopGroup.register(channel);
+
+        channel.attr(PROTOCOL_FUTURE).set(CompletableFuture.completedFuture(Protocol.HTTP1_1));
+
+        acquirePromise.setSuccess(channel);
+
+        Future<Channel> p = invalidChannelPool.acquire();
+        assertThat(p.await().cause().getMessage()).contains("maxPendingAcquires: 0 (expected: >= 1)");
+        verify(mockDelegatePool).release(channel);
+        assertThat(channel.isOpen()).isFalse();
+    }
+
     @Test
     public void protocolConfigNotStarted_closeClosesDelegatePool() throws InterruptedException {
         httpOrHttp2ChannelPool.close();
diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/http2/HttpToHttp2OutboundAdapterTest.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/http2/HttpToHttp2OutboundAdapterTest.java
new file mode 100644
index 000000000000..7e75717465f4
--- /dev/null
+++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/http2/HttpToHttp2OutboundAdapterTest.java
@@ -0,0 +1,84 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.http.nio.netty.internal.http2;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.atLeastOnce;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import io.netty.buffer.Unpooled;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPromise;
+import io.netty.channel.DefaultChannelPromise;
+import io.netty.channel.nio.NioEventLoopGroup;
+import io.netty.handler.codec.http.DefaultFullHttpRequest;
+import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.handler.codec.http.HttpMethod;
+import io.netty.handler.codec.http.HttpVersion;
+import io.netty.handler.codec.http2.HttpConversionUtil;
+import java.util.List;
+import org.junit.AfterClass;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
+
+@RunWith(MockitoJUnitRunner.class)
+public class HttpToHttp2OutboundAdapterTest {
+    private static final NioEventLoopGroup EVENT_LOOP_GROUP = new NioEventLoopGroup(1);
+
+    @Mock
+    public ChannelHandlerContext ctx;
+
+    @Mock
+    public Channel channel;
+
+    @AfterClass
+    public static void classTeardown() {
+        EVENT_LOOP_GROUP.shutdownGracefully();
+    }
+
+    @Test
+    public void aggregatesWritePromises() {
+        when(ctx.executor()).thenReturn(EVENT_LOOP_GROUP.next());
+        when(ctx.channel()).thenReturn(channel);
+
+        HttpToHttp2OutboundAdapter adapter = new HttpToHttp2OutboundAdapter();
+        ChannelPromise writePromise = new DefaultChannelPromise(channel, EVENT_LOOP_GROUP.next());
+
+        writeRequest(adapter, writePromise);
+
+        ArgumentCaptor<ChannelPromise> writePromiseCaptor = ArgumentCaptor.forClass(ChannelPromise.class);
+        verify(ctx, atLeastOnce()).write(any(Object.class), writePromiseCaptor.capture());
+
+        List<ChannelPromise> writePromises = writePromiseCaptor.getAllValues();
+
+        assertThat(writePromise.isDone()).isFalse();
+
+        writePromises.forEach(ChannelPromise::setSuccess);
+
+        assertThat(writePromise.isDone()).isTrue();
+    }
+
+    private void writeRequest(HttpToHttp2OutboundAdapter adapter, ChannelPromise promise) {
+        FullHttpRequest request = new DefaultFullHttpRequest(HttpVersion.HTTP_1_1, HttpMethod.PUT, "/", Unpooled.wrappedBuffer(new byte[16]));
+        request.headers().add(HttpConversionUtil.ExtensionHeaderNames.SCHEME.text(), "http");
+        adapter.write(ctx, request, promise);
+    }
+}
diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/http2/MultiplexedChannelRecordTest.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/http2/MultiplexedChannelRecordTest.java
new file mode 100644
index 000000000000..28a54eefc024
--- /dev/null
+++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/http2/MultiplexedChannelRecordTest.java
@@ -0,0 +1,259 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.http.nio.netty.internal.http2;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelInboundHandlerAdapter;
+import io.netty.channel.ChannelInitializer;
+import io.netty.channel.EventLoopGroup;
+import io.netty.channel.embedded.EmbeddedChannel;
+import io.netty.channel.nio.NioEventLoopGroup;
+import io.netty.handler.codec.http2.Http2FrameCodecBuilder;
+import io.netty.handler.codec.http2.Http2MultiplexHandler;
+import io.netty.util.concurrent.DefaultPromise;
+import io.netty.util.concurrent.Promise;
+import java.io.IOException;
+import java.time.Duration;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import software.amazon.awssdk.http.Protocol;
+import software.amazon.awssdk.http.nio.netty.internal.ChannelAttributeKey;
+import software.amazon.awssdk.http.nio.netty.internal.MockChannel;
+import software.amazon.awssdk.http.nio.netty.internal.UnusedChannelExceptionHandler;
+
+public class MultiplexedChannelRecordTest {
+    private EventLoopGroup loopGroup;
+    private MockChannel channel;
+
+    @Before
+    public void setup() throws Exception {
+        loopGroup = new NioEventLoopGroup(4);
+        channel = new MockChannel();
+    }
+
+    @After
+    public void teardown() {
+        loopGroup.shutdownGracefully().awaitUninterruptibly();
+        channel.close();
+    }
+
+    @Test
+    public void nullIdleTimeoutSeemsToDisableReaping() throws InterruptedException {
+        EmbeddedChannel channel = newHttp2Channel();
+        MultiplexedChannelRecord record = new MultiplexedChannelRecord(channel, 1, null);
+
+        Promise<Channel> streamPromise = channel.eventLoop().newPromise();
+        record.acquireStream(streamPromise);
+
+        channel.runPendingTasks();
+
+        assertThat(streamPromise.isSuccess()).isTrue();
+        assertThat(channel.isOpen()).isTrue();
+
+        record.closeAndReleaseChild(streamPromise.getNow());
+
+        assertThat(channel.isOpen()).isTrue();
+
+        Thread.sleep(1_000);
+        channel.runPendingTasks();
+
+        assertThat(channel.isOpen()).isTrue();
+    }
+
+    @Test
+    public void recordsWithoutReservedStreamsAreClosedAfterTimeout() throws InterruptedException {
+        int idleTimeoutMillis = 1000;
+        EmbeddedChannel channel = newHttp2Channel();
+        MultiplexedChannelRecord record = new MultiplexedChannelRecord(channel, 1, Duration.ofMillis(idleTimeoutMillis));
+
+        Promise<Channel> streamPromise = channel.eventLoop().newPromise();
+        record.acquireStream(streamPromise);
+
+        channel.runPendingTasks();
+
+        assertThat(streamPromise.isSuccess()).isTrue();
+        assertThat(channel.isOpen()).isTrue();
+
+        record.closeAndReleaseChild(streamPromise.getNow());
+
+        assertThat(channel.isOpen()).isTrue();
+
+        Thread.sleep(idleTimeoutMillis * 2);
+        channel.runPendingTasks();
+
+        assertThat(channel.isOpen()).isFalse();
+    }
+
+    @Test
+    public void recordsWithReservedStreamsAreNotClosedAfterTimeout() throws InterruptedException {
+        int idleTimeoutMillis = 1000;
+        EmbeddedChannel channel = newHttp2Channel();
+        MultiplexedChannelRecord record = new MultiplexedChannelRecord(channel, 2, Duration.ofMillis(idleTimeoutMillis));
+
+        Promise<Channel> streamPromise = channel.eventLoop().newPromise();
+        Promise<Channel> streamPromise2 = channel.eventLoop().newPromise();
+        record.acquireStream(streamPromise);
+        record.acquireStream(streamPromise2);
+
+        channel.runPendingTasks();
+
+        assertThat(streamPromise.isSuccess()).isTrue();
+        assertThat(streamPromise2.isSuccess()).isTrue();
+        assertThat(channel.isOpen()).isTrue();
+
+        record.closeAndReleaseChild(streamPromise.getNow());
+
+        assertThat(channel.isOpen()).isTrue();
+
+        Thread.sleep(idleTimeoutMillis * 2);
+        channel.runPendingTasks();
+
+        assertThat(channel.isOpen()).isTrue();
+    }
+
+    @Test
+    public void acquireRequestResetsCloseTimer() throws InterruptedException {
+        int idleTimeoutMillis = 1000;
+        EmbeddedChannel channel = newHttp2Channel();
+        MultiplexedChannelRecord record = new MultiplexedChannelRecord(channel, 2, Duration.ofMillis(idleTimeoutMillis));
+
+        for (int i = 0; i < 20; ++i) {
+            Thread.sleep(idleTimeoutMillis / 10);
+            channel.runPendingTasks();
+
+            Promise<Channel> streamPromise = channel.eventLoop().newPromise();
+            assertThat(record.acquireStream(streamPromise)).isTrue();
+            channel.runPendingTasks();
+
+            assertThat(streamPromise.isSuccess()).isTrue();
+            assertThat(channel.isOpen()).isTrue();
+
+            record.closeAndReleaseChild(streamPromise.getNow());
+            channel.runPendingTasks();
+        }
+
+        assertThat(channel.isOpen()).isTrue();
+
+        Thread.sleep(idleTimeoutMillis * 2);
+        channel.runPendingTasks();
+
+        assertThat(channel.isOpen()).isFalse();
+    }
+
+    @Test
+    public void idleTimerDoesNotApplyBeforeFirstChannelIsCreated() throws InterruptedException {
+        int idleTimeoutMillis = 1000;
+        EmbeddedChannel channel = newHttp2Channel();
+        MultiplexedChannelRecord record = new MultiplexedChannelRecord(channel, 2, Duration.ofMillis(idleTimeoutMillis));
+
+        Thread.sleep(idleTimeoutMillis * 2);
+        channel.runPendingTasks();
+
+        assertThat(channel.isOpen()).isTrue();
+    }
+
+    @Test
+    public void availableStream0_reusableShouldBeFalse() {
+        loopGroup.register(channel).awaitUninterruptibly();
+        Promise<Channel> channelPromise = new DefaultPromise<>(loopGroup.next());
+        channelPromise.setSuccess(channel);
+
+        MultiplexedChannelRecord record = new MultiplexedChannelRecord(channel, 0, Duration.ofSeconds(10));
+
+        assertThat(record.acquireStream(null)).isFalse();
+    }
+
+    @Test
+    public void acquireClaimedConnection_channelClosed_shouldThrowIOException() {
+        loopGroup.register(channel).awaitUninterruptibly();
+        Promise<Channel> channelPromise = new DefaultPromise<>(loopGroup.next());
+
+        MultiplexedChannelRecord record = new MultiplexedChannelRecord(channel, 1, Duration.ofSeconds(10));
+
+        record.closeChildChannels();
+
+        record.acquireClaimedStream(channelPromise);
+
+        assertThatThrownBy(() -> channelPromise.get()).hasCauseInstanceOf(IOException.class);
+    }
+
+    @Test
+    public void closeChildChannels_shouldDeliverException() throws ExecutionException, InterruptedException {
+        EmbeddedChannel channel = newHttp2Channel();
+        loopGroup.register(channel).awaitUninterruptibly();
+        Promise<Channel> channelPromise = new DefaultPromise<>(loopGroup.next());
+        channelPromise.setSuccess(channel);
+
+        MultiplexedChannelRecord record = new MultiplexedChannelRecord(channel, 2, Duration.ofSeconds(10));
+
+        Promise<Channel> streamPromise = channel.eventLoop().newPromise();
+        record.acquireStream(streamPromise);
+
+        channel.runPendingTasks();
+        Channel childChannel = streamPromise.get();
+        VerifyExceptionHandler verifyExceptionHandler = new VerifyExceptionHandler();
+        childChannel.pipeline().addFirst(verifyExceptionHandler);
+
+        IOException ioException = new IOException("foobar");
+        record.closeChildChannels(ioException);
+
+        assertThat(childChannel.pipeline().get(UnusedChannelExceptionHandler.class)).isNotNull();
+
+        assertThat(verifyExceptionHandler.exceptionCaught).hasStackTraceContaining("foobar")
+                                                          .hasRootCauseInstanceOf(IOException.class);
+
+        // should be closed by UnusedChannelExceptionHandler
+        assertThat(childChannel.isOpen()).isFalse();
+    }
+
+    @Test
+    public void closeToNewStreams_AcquireStreamShouldReturnFalse() {
+        MultiplexedChannelRecord record = new MultiplexedChannelRecord(channel, 2, Duration.ofSeconds(10));
+        Promise<Channel> streamPromise = channel.eventLoop().newPromise();
+        assertThat(record.acquireStream(streamPromise)).isTrue();
+
+        record.closeToNewStreams();
+        assertThat(record.acquireStream(streamPromise)).isFalse();
+    }
+
+    private static final class VerifyExceptionHandler extends ChannelInboundHandlerAdapter {
+        private Throwable exceptionCaught;
+        @Override
+        public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) {
+            exceptionCaught = cause;
+            ctx.fireExceptionCaught(cause);
+        }
+    }
+
+    private EmbeddedChannel newHttp2Channel() {
+        EmbeddedChannel channel = new EmbeddedChannel(Http2FrameCodecBuilder.forClient().build(),
+                                                      new Http2MultiplexHandler(new NoOpHandler()));
+        channel.attr(ChannelAttributeKey.PROTOCOL_FUTURE).set(CompletableFuture.completedFuture(Protocol.HTTP2));
+        return channel;
+    }
+
+    private static class NoOpHandler extends ChannelInitializer<Channel> {
+        @Override
+        protected void initChannel(Channel ch) { }
+    }
+}
diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/http2/ReadTimeoutTest.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/http2/ReadTimeoutTest.java
new file mode 100644
index 000000000000..f1d66aa9f726
--- /dev/null
+++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/http2/ReadTimeoutTest.java
@@ -0,0 +1,214 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.http.nio.netty.internal.http2;
+
+import io.netty.bootstrap.ServerBootstrap;
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelInboundHandlerAdapter;
+import io.netty.channel.ChannelInitializer;
+import io.netty.channel.ChannelOption;
+import io.netty.channel.nio.NioEventLoopGroup;
+import io.netty.channel.socket.ServerSocketChannel;
+import io.netty.channel.socket.SocketChannel;
+import io.netty.channel.socket.nio.NioServerSocketChannel;
+import io.netty.handler.codec.http2.DefaultHttp2Headers;
+import io.netty.handler.codec.http2.DefaultHttp2HeadersFrame;
+import io.netty.handler.codec.http2.DefaultHttp2WindowUpdateFrame;
+import io.netty.handler.codec.http2.Http2DataFrame;
+import io.netty.handler.codec.http2.Http2Frame;
+import io.netty.handler.codec.http2.Http2FrameCodec;
+import io.netty.handler.codec.http2.Http2FrameCodecBuilder;
+import io.netty.handler.codec.http2.Http2HeadersFrame;
+import io.netty.handler.codec.http2.Http2Settings;
+import io.netty.util.ReferenceCountUtil;
+import io.reactivex.Flowable;
+import java.nio.ByteBuffer;
+import java.time.Duration;
+import java.util.Optional;
+import java.util.function.Supplier;
+import org.junit.After;
+import org.junit.Test;
+import org.reactivestreams.Publisher;
+import org.reactivestreams.Subscriber;
+import software.amazon.awssdk.http.Protocol;
+import software.amazon.awssdk.http.SdkHttpFullRequest;
+import software.amazon.awssdk.http.SdkHttpMethod;
+import software.amazon.awssdk.http.SdkHttpResponse;
+import software.amazon.awssdk.http.async.AsyncExecuteRequest;
+import software.amazon.awssdk.http.async.SdkAsyncHttpClient;
+import software.amazon.awssdk.http.async.SdkAsyncHttpResponseHandler;
+import software.amazon.awssdk.http.async.SdkHttpContentPublisher;
+import software.amazon.awssdk.http.nio.netty.NettyNioAsyncHttpClient;
+
+public class ReadTimeoutTest {
+    private static final int N_FRAMES = 10;
+    private TestH2Server testServer;
+    private SdkAsyncHttpClient netty;
+
+    @After
+    public void methodTeardown() throws InterruptedException {
+        if (testServer != null) {
+            testServer.shutdown();
+        }
+        testServer = null;
+
+        if (netty != null) {
+            netty.close();
+        }
+        netty = null;
+    }
+
+    @Test
+    public void readTimeoutActivatedAfterRequestFullyWritten() throws InterruptedException {
+        testServer = new TestH2Server(StreamHandler::new);
+        testServer.init();
+
+        // Set a very short read timeout, shorter than it will take to transfer
+        // the body
+        netty = NettyNioAsyncHttpClient.builder()
+                .protocol(Protocol.HTTP2)
+                .readTimeout(Duration.ofMillis(500))
+                .build();
+
+        SdkHttpFullRequest sdkRequest = SdkHttpFullRequest.builder()
+                .method(SdkHttpMethod.PUT)
+                .protocol("http")
+                .host("localhost")
+                .port(testServer.port())
+                .build();
+
+        // at 10 frames, should take approximately 3-4 seconds for the server
+        // to receive given that it sleeps for 500ms between data frames and
+        // sleeps for most of them
+        byte[] data = new byte[16384 * N_FRAMES];
+
+        Publisher<ByteBuffer> dataPublisher = Flowable.just(ByteBuffer.wrap(data));
+
+        AsyncExecuteRequest executeRequest = AsyncExecuteRequest.builder()
+                .request(sdkRequest)
+                .responseHandler(new SdkAsyncHttpResponseHandler() {
+                    @Override
+                    public void onHeaders(SdkHttpResponse headers) {
+                    }
+
+                    @Override
+                    public void onStream(Publisher<ByteBuffer> stream) {
+                        Flowable.fromPublisher(stream).forEach(s -> {});
+                    }
+
+                    @Override
+                    public void onError(Throwable error) {
+                    }
+                })
+                .requestContentPublisher(new SdkHttpContentPublisher() {
+                    @Override
+                    public Optional<Long> contentLength() {
+                        return Optional.of((long) data.length);
+                    }
+
+                    @Override
+                    public void subscribe(Subscriber<? super ByteBuffer> s) {
+                        dataPublisher.subscribe(s);
+                    }
+                })
+                .build();
+
+        netty.execute(executeRequest).join();
+    }
+
+    private static final class TestH2Server extends ChannelInitializer<SocketChannel> {
+        private final Supplier<ChannelHandler> handlerSupplier;
+
+        private ServerBootstrap bootstrap;
+        private ServerSocketChannel channel;
+
+        private TestH2Server(Supplier<ChannelHandler> handlerSupplier) {
+            this.handlerSupplier = handlerSupplier;
+        }
+
+        public void init() throws InterruptedException {
+            bootstrap = new ServerBootstrap()
+                    .channel(NioServerSocketChannel.class)
+                    .group(new NioEventLoopGroup())
+                    .childHandler(this)
+                    .localAddress(0)
+                    .childOption(ChannelOption.SO_KEEPALIVE, true);
+
+            channel = ((ServerSocketChannel) bootstrap.bind().await().channel());
+        }
+
+        public int port() {
+            return channel.localAddress().getPort();
+        }
+
+        public void shutdown() throws InterruptedException {
+            channel.close().await();
+        }
+
+        @Override
+        protected void initChannel(SocketChannel ch) {
+            Http2FrameCodec codec = Http2FrameCodecBuilder.forServer()
+                    .autoAckPingFrame(true)
+                    .initialSettings(new Http2Settings()
+                        .initialWindowSize(16384)
+                        .maxFrameSize(16384)
+                        .maxConcurrentStreams(5))
+                    .build();
+
+            ch.pipeline().addLast(codec);
+            ch.pipeline().addLast(handlerSupplier.get());
+        }
+    }
+
+    private static class StreamHandler extends ChannelInboundHandlerAdapter {
+        private int sleeps = N_FRAMES - 3;
+
+        @Override
+        public void channelRead(ChannelHandlerContext ctx, Object msg) {
+            if (!(msg instanceof Http2Frame)) {
+                ctx.fireChannelRead(msg);
+                return;
+            }
+
+            Http2Frame frame = (Http2Frame) msg;
+            if (frame instanceof Http2DataFrame) {
+                Http2DataFrame dataFrame = (Http2DataFrame) frame;
+                ReferenceCountUtil.release(frame);
+                if (dataFrame.isEndStream()) {
+                    Http2HeadersFrame respHeaders = new DefaultHttp2HeadersFrame(
+                            new DefaultHttp2Headers().status("204"), true)
+                            .stream(dataFrame.stream());
+                    ctx.writeAndFlush(respHeaders);
+                }
+
+                if (sleeps > 0) {
+                    --sleeps;
+                    // Simulate a server that's slow to read data. Since our
+                    // window size is equal to the max frame size, the client
+                    // shouldn't be able to send more data until we update our
+                    // window
+                    try {
+                        Thread.sleep(500);
+                    } catch (InterruptedException ie) {
+                    }
+                }
+                ctx.writeAndFlush(new DefaultHttp2WindowUpdateFrame(dataFrame.initialFlowControlledBytes())
+                        .stream(dataFrame.stream()));
+            }
+        }
+    }
+}
diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/http2/WindowSizeTest.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/http2/WindowSizeTest.java
new file mode 100644
index 000000000000..7210708d7b59
--- /dev/null
+++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/http2/WindowSizeTest.java
@@ -0,0 +1,286 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.http.nio.netty.internal.http2;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import io.netty.bootstrap.ServerBootstrap;
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelInboundHandlerAdapter;
+import io.netty.channel.ChannelInitializer;
+import io.netty.channel.ChannelOption;
+import io.netty.channel.nio.NioEventLoopGroup;
+import io.netty.channel.socket.ServerSocketChannel;
+import io.netty.channel.socket.SocketChannel;
+import io.netty.channel.socket.nio.NioServerSocketChannel;
+import io.netty.handler.codec.http2.DefaultHttp2Headers;
+import io.netty.handler.codec.http2.DefaultHttp2HeadersFrame;
+import io.netty.handler.codec.http2.Http2DataFrame;
+import io.netty.handler.codec.http2.Http2Frame;
+import io.netty.handler.codec.http2.Http2FrameCodec;
+import io.netty.handler.codec.http2.Http2FrameCodecBuilder;
+import io.netty.handler.codec.http2.Http2HeadersFrame;
+import io.netty.handler.codec.http2.Http2Settings;
+import io.netty.handler.codec.http2.Http2SettingsFrame;
+import io.netty.util.ReferenceCountUtil;
+import java.nio.ByteBuffer;
+import java.util.List;
+import java.util.Queue;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+import org.junit.After;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+import org.reactivestreams.Publisher;
+import software.amazon.awssdk.http.Protocol;
+import software.amazon.awssdk.http.SdkHttpFullRequest;
+import software.amazon.awssdk.http.SdkHttpMethod;
+import software.amazon.awssdk.http.SdkHttpResponse;
+import software.amazon.awssdk.http.async.AsyncExecuteRequest;
+import software.amazon.awssdk.http.async.SdkAsyncHttpClient;
+import software.amazon.awssdk.http.async.SdkAsyncHttpResponseHandler;
+import software.amazon.awssdk.http.nio.netty.EmptyPublisher;
+import software.amazon.awssdk.http.nio.netty.Http2Configuration;
+import software.amazon.awssdk.http.nio.netty.NettyNioAsyncHttpClient;
+
+public class WindowSizeTest {
+    private static final int DEFAULT_INIT_WINDOW_SIZE = 1024 * 1024;
+
+    private TestH2Server server;
+    private SdkAsyncHttpClient netty;
+
+    @Rule
+    public ExpectedException expected = ExpectedException.none();
+
+    @After
+    public void methodTeardown() throws InterruptedException {
+        if (netty != null) {
+            netty.close();
+        }
+        netty = null;
+
+        if (server != null) {
+            server.shutdown();
+        }
+        server = null;
+    }
+
+    @Test
+    public void builderSetter_negativeValue_throws() {
+        expected.expect(IllegalArgumentException.class);
+
+        NettyNioAsyncHttpClient.builder()
+                .http2Configuration(Http2Configuration.builder()
+                        .initialWindowSize(-1)
+                        .build())
+                .build();
+    }
+
+    @Test
+    public void builderSetter_0Value_throws() {
+        expected.expect(IllegalArgumentException.class);
+
+        NettyNioAsyncHttpClient.builder()
+                .http2Configuration(Http2Configuration.builder()
+                        .initialWindowSize(0)
+                        .build())
+                .build();
+    }
+
+    @Test
+    public void builderSetter_explicitNullSet_usesDefaultValue() throws InterruptedException {
+        expectCorrectWindowSizeValueTest(null, DEFAULT_INIT_WINDOW_SIZE);
+    }
+
+    @Test
+    public void execute_customWindowValue_valueSentInSettings() throws InterruptedException {
+        int windowSize = 128 * 1024 * 1024;
+        expectCorrectWindowSizeValueTest(windowSize, windowSize);
+    }
+
+    @Test
+    public void execute_noExplicitValueSet_sendsDefaultValueInSettings() throws InterruptedException {
+        ConcurrentLinkedQueue<Http2Frame> receivedFrames = new ConcurrentLinkedQueue<>();
+
+        server = new TestH2Server(() -> new StreamHandler(receivedFrames));
+
+        server.init();
+
+        netty = NettyNioAsyncHttpClient.builder()
+                .protocol(Protocol.HTTP2)
+                .build();
+
+        AsyncExecuteRequest req = AsyncExecuteRequest.builder()
+                .requestContentPublisher(new EmptyPublisher())
+                .request(SdkHttpFullRequest.builder()
+                        .method(SdkHttpMethod.GET)
+                        .protocol("http")
+                        .host("localhost")
+                        .port(server.port())
+                        .build())
+                .responseHandler(new SdkAsyncHttpResponseHandler() {
+                    @Override
+                    public void onHeaders(SdkHttpResponse headers) {
+                    }
+
+                    @Override
+                    public void onStream(Publisher<ByteBuffer> stream) {
+                    }
+
+                    @Override
+                    public void onError(Throwable error) {
+                    }
+                })
+                .build();
+
+        netty.execute(req).join();
+
+        List<Http2Settings> receivedSettings = receivedFrames.stream()
+                .filter(f -> f instanceof Http2SettingsFrame)
+                .map(f -> (Http2SettingsFrame) f)
+                .map(Http2SettingsFrame::settings)
+                .collect(Collectors.toList());
+
+        assertThat(receivedSettings.size()).isGreaterThan(0);
+        for (Http2Settings s : receivedSettings) {
+            assertThat(s.initialWindowSize()).isEqualTo(DEFAULT_INIT_WINDOW_SIZE);
+        }
+    }
+
+    private void expectCorrectWindowSizeValueTest(Integer builderSetterValue, int settingsFrameValue) throws InterruptedException {
+        ConcurrentLinkedQueue<Http2Frame> receivedFrames = new ConcurrentLinkedQueue<>();
+
+        server = new TestH2Server(() -> new StreamHandler(receivedFrames));
+
+        server.init();
+
+        netty = NettyNioAsyncHttpClient.builder()
+                .protocol(Protocol.HTTP2)
+                .http2Configuration(Http2Configuration.builder()
+                        .initialWindowSize(builderSetterValue)
+                        .build())
+                .build();
+
+        AsyncExecuteRequest req = AsyncExecuteRequest.builder()
+                .requestContentPublisher(new EmptyPublisher())
+                .request(SdkHttpFullRequest.builder()
+                        .method(SdkHttpMethod.GET)
+                        .protocol("http")
+                        .host("localhost")
+                        .port(server.port())
+                        .build())
+                .responseHandler(new SdkAsyncHttpResponseHandler() {
+                    @Override
+                    public void onHeaders(SdkHttpResponse headers) {
+                    }
+
+                    @Override
+                    public void onStream(Publisher<ByteBuffer> stream) {
+                    }
+
+                    @Override
+                    public void onError(Throwable error) {
+                    }
+                })
+                .build();
+
+        netty.execute(req).join();
+
+
+        List<Http2Settings> receivedSettings = receivedFrames.stream()
+                .filter(f -> f instanceof Http2SettingsFrame)
+                .map(f -> (Http2SettingsFrame) f)
+                .map(Http2SettingsFrame::settings)
+                .collect(Collectors.toList());
+
+        assertThat(receivedSettings.size()).isGreaterThan(0);
+        for (Http2Settings s : receivedSettings) {
+            assertThat(s.initialWindowSize()).isEqualTo(settingsFrameValue);
+        }
+    }
+
+    private static final class TestH2Server extends ChannelInitializer<SocketChannel> {
+        private final Supplier<ChannelHandler> handlerSupplier;
+
+        private ServerBootstrap bootstrap;
+        private ServerSocketChannel channel;
+
+        private TestH2Server(Supplier<ChannelHandler> handlerSupplier) {
+            this.handlerSupplier = handlerSupplier;
+        }
+
+        public void init() throws InterruptedException {
+            bootstrap = new ServerBootstrap()
+                    .channel(NioServerSocketChannel.class)
+                    .group(new NioEventLoopGroup())
+                    .childHandler(this)
+                    .localAddress(0)
+                    .childOption(ChannelOption.SO_KEEPALIVE, true);
+
+            channel = ((ServerSocketChannel) bootstrap.bind().await().channel());
+        }
+
+        public int port() {
+            return channel.localAddress().getPort();
+        }
+
+        public void shutdown() throws InterruptedException {
+            channel.close().await();
+        }
+
+        @Override
+        protected void initChannel(SocketChannel ch) {
+            Http2FrameCodec codec = Http2FrameCodecBuilder.forServer()
+                    .initialSettings(new Http2Settings()
+                            .maxConcurrentStreams(5))
+                    .build();
+
+            ch.pipeline().addLast(codec);
+            ch.pipeline().addLast(handlerSupplier.get());
+        }
+    }
+
+    private static class StreamHandler extends ChannelInboundHandlerAdapter {
+        private final Queue<Http2Frame> receivedFrames;
+
+        private StreamHandler(Queue<Http2Frame> receivedFrames) {
+            this.receivedFrames = receivedFrames;
+        }
+
+        @Override
+        public void channelRead(ChannelHandlerContext ctx, Object msg) {
+            if (!(msg instanceof Http2Frame)) {
+                ctx.fireChannelRead(msg);
+                return;
+            }
+
+            Http2Frame frame = (Http2Frame) msg;
+            receivedFrames.add(frame);
+            if (frame instanceof Http2DataFrame) {
+                Http2DataFrame dataFrame = (Http2DataFrame) frame;
+                if (dataFrame.isEndStream()) {
+                    Http2HeadersFrame respHeaders = new DefaultHttp2HeadersFrame(
+                            new DefaultHttp2Headers().status("204"), true)
+                            .stream(dataFrame.stream());
+                    ctx.writeAndFlush(respHeaders);
+                }
+            }
+            ReferenceCountUtil.release(frame);
+        }
+    }
+}
diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/http2/utils/Http2TestUtils.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/http2/utils/Http2TestUtils.java
new file mode 100644
index 000000000000..b91650047453
--- /dev/null
+++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/http2/utils/Http2TestUtils.java
@@ -0,0 +1,58 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.http.nio.netty.internal.http2.utils;
+
+
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.ChannelInitializer;
+import io.netty.channel.embedded.EmbeddedChannel;
+import io.netty.handler.codec.http2.Http2FrameCodec;
+import io.netty.handler.codec.http2.Http2FrameCodecBuilder;
+import io.netty.handler.codec.http2.Http2FrameLogger;
+import io.netty.handler.codec.http2.Http2MultiplexHandler;
+import io.netty.handler.codec.http2.Http2Settings;
+import io.netty.handler.logging.LogLevel;
+import java.util.concurrent.CompletableFuture;
+import software.amazon.awssdk.http.Protocol;
+import software.amazon.awssdk.http.nio.netty.internal.ChannelAttributeKey;
+
+public final class Http2TestUtils {
+    public static final int INITIAL_WINDOW_SIZE = 1_048_576;
+
+    public static EmbeddedChannel newHttp2Channel() {
+        return newHttp2Channel(new NoOpHandler());
+    }
+
+    public static EmbeddedChannel newHttp2Channel(ChannelHandler channelHandler) {
+        Http2FrameCodec http2FrameCodec = Http2FrameCodecBuilder.forClient().initialSettings(
+            Http2Settings.defaultSettings().initialWindowSize(INITIAL_WINDOW_SIZE))
+                                                                .frameLogger(new Http2FrameLogger(LogLevel.DEBUG)).build();
+        EmbeddedChannel channel = new EmbeddedChannel(http2FrameCodec,
+                                                      new Http2MultiplexHandler(channelHandler));
+
+        channel.attr(ChannelAttributeKey.HTTP2_CONNECTION).set(http2FrameCodec.connection());
+        channel.attr(ChannelAttributeKey.HTTP2_INITIAL_WINDOW_SIZE).set(INITIAL_WINDOW_SIZE);
+        channel.attr(ChannelAttributeKey.PROTOCOL_FUTURE).set(CompletableFuture.completedFuture(Protocol.HTTP2));
+        return channel;
+    }
+
+    private static class NoOpHandler extends ChannelInitializer<Channel> {
+        @Override
+        protected void initChannel(Channel ch) {
+        }
+    }
+}
diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/nrs/ChannelPublisherTest.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/nrs/ChannelPublisherTest.java
new file mode 100644
index 000000000000..7f8755545108
--- /dev/null
+++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/nrs/ChannelPublisherTest.java
@@ -0,0 +1,184 @@
+/*
+ * 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.
+ *
+ * Original source licensed under the Apache License 2.0 by playframework.
+ */
+
+package software.amazon.awssdk.http.nio.netty.internal.nrs;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+
+import io.netty.bootstrap.Bootstrap;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelInboundHandlerAdapter;
+import io.netty.channel.ChannelOption;
+import io.netty.channel.EventLoop;
+import io.netty.channel.EventLoopGroup;
+import io.netty.channel.nio.NioEventLoopGroup;
+import io.netty.channel.socket.nio.NioServerSocketChannel;
+import io.netty.util.concurrent.DefaultPromise;
+import io.netty.util.concurrent.Promise;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.InetSocketAddress;
+import java.net.Socket;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.TimeUnit;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.reactivestreams.Publisher;
+import org.reactivestreams.Subscriber;
+import org.reactivestreams.Subscription;
+
+/**
+ * This class contains source imported from https://github.com/playframework/netty-reactive-streams,
+ * licensed under the Apache License 2.0, available at the time of the fork (1/31/2020) here:
+ * https://github.com/playframework/netty-reactive-streams/blob/master/LICENSE.txt
+ *
+ * All original source licensed under the Apache License 2.0 by playframework. All modifications are
+ * licensed under the Apache License 2.0 by Amazon Web Services.
+ */
+public class ChannelPublisherTest {
+
+    private EventLoopGroup group;
+    private Channel channel;
+    private Publisher<Channel> publisher;
+    private SubscriberProbe<Channel> subscriber;
+
+    @Before
+    public void start() throws Exception {
+        group = new NioEventLoopGroup();
+        EventLoop eventLoop = group.next();
+
+        HandlerPublisher<Channel> handlerPublisher = new HandlerPublisher<>(eventLoop, Channel.class);
+        Bootstrap bootstrap = new Bootstrap();
+
+        bootstrap
+                .channel(NioServerSocketChannel.class)
+                .group(eventLoop)
+                .option(ChannelOption.AUTO_READ, false)
+                .handler(handlerPublisher)
+                .localAddress("127.0.0.1", 0);
+
+        channel = bootstrap.bind().await().channel();
+        this.publisher = handlerPublisher;
+
+        subscriber = new SubscriberProbe<>();
+    }
+
+    @After
+    public void stop() throws Exception {
+        channel.unsafe().closeForcibly();
+        group.shutdownGracefully();
+    }
+
+    @Test
+    public void test() throws Exception {
+        publisher.subscribe(subscriber);
+        Subscription sub = subscriber.takeSubscription();
+
+        // Try one cycle
+        sub.request(1);
+        Socket socket1 = connect();
+        receiveConnection();
+        readWriteData(socket1, 1);
+
+        // Check back pressure
+        Socket socket2 = connect();
+        subscriber.expectNoElements();
+
+        // Now request the next connection
+        sub.request(1);
+        receiveConnection();
+        readWriteData(socket2, 2);
+
+        // Close the channel
+        channel.close();
+        subscriber.expectNoElements();
+        subscriber.expectComplete();
+    }
+
+    private Socket connect() throws Exception {
+        InetSocketAddress address = (InetSocketAddress) channel.localAddress();
+        return new Socket(address.getAddress(), address.getPort());
+    }
+
+    private void readWriteData(Socket socket, int data) throws Exception {
+        OutputStream os = socket.getOutputStream();
+        os.write(data);
+        os.flush();
+        InputStream is = socket.getInputStream();
+        int received = is.read();
+        socket.close();
+        assertEquals(received, data);
+    }
+
+    private void receiveConnection() throws Exception {
+        Channel channel = subscriber.take();
+        channel.pipeline().addLast(new ChannelInboundHandlerAdapter() {
+            public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
+                ctx.writeAndFlush(msg);
+            }
+        });
+        group.register(channel);
+    }
+
+    private class SubscriberProbe<T> implements Subscriber<T> {
+        final BlockingQueue<Subscription> subscriptions = new LinkedBlockingQueue<>();
+        final BlockingQueue<T> elements = new LinkedBlockingQueue<>();
+        final Promise<Void> promise = new DefaultPromise<>(group.next());
+
+        public void onSubscribe(Subscription s) {
+            subscriptions.add(s);
+        }
+
+        public void onNext(T t) {
+            elements.add(t);
+        }
+
+        public void onError(Throwable t) {
+            promise.setFailure(t);
+        }
+
+        public void onComplete() {
+            promise.setSuccess(null);
+        }
+
+        Subscription takeSubscription() throws Exception {
+            Subscription sub = subscriptions.poll(100, TimeUnit.MILLISECONDS);
+            assertNotNull(sub);
+            return sub;
+        }
+
+        T take() throws Exception {
+            T t = elements.poll(1000, TimeUnit.MILLISECONDS);
+            assertNotNull(t);
+            return t;
+        }
+
+        void expectNoElements() throws Exception {
+            T t = elements.poll(100, TimeUnit.MILLISECONDS);
+            assertNull(t);
+        }
+
+        void expectComplete() throws Exception {
+            promise.get(100, TimeUnit.MILLISECONDS);
+        }
+    }
+}
diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/nrs/HandlerPublisherVerificationTest.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/nrs/HandlerPublisherVerificationTest.java
new file mode 100644
index 000000000000..06199aaa58ca
--- /dev/null
+++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/nrs/HandlerPublisherVerificationTest.java
@@ -0,0 +1,159 @@
+/*
+ * 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.
+ *
+ * Original source licensed under the Apache License 2.0 by playframework.
+ */
+
+package software.amazon.awssdk.http.nio.netty.internal.nrs;
+
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelFutureListener;
+import io.netty.channel.DefaultEventLoopGroup;
+import io.netty.channel.local.LocalChannel;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import org.reactivestreams.Publisher;
+import org.reactivestreams.tck.PublisherVerification;
+import org.reactivestreams.tck.TestEnvironment;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Factory;
+import software.amazon.awssdk.http.nio.netty.internal.nrs.util.BatchedProducer;
+import software.amazon.awssdk.http.nio.netty.internal.nrs.util.ClosedLoopChannel;
+import software.amazon.awssdk.http.nio.netty.internal.nrs.util.ScheduledBatchedProducer;
+
+/**
+ * This class contains source imported from https://github.com/playframework/netty-reactive-streams,
+ * licensed under the Apache License 2.0, available at the time of the fork (1/31/2020) here:
+ * https://github.com/playframework/netty-reactive-streams/blob/master/LICENSE.txt
+ *
+ * All original source licensed under the Apache License 2.0 by playframework. All modifications are
+ * licensed under the Apache License 2.0 by Amazon Web Services.
+ */
+public class HandlerPublisherVerificationTest extends PublisherVerification<Long> {
+
+    private final int batchSize;
+    // The number of elements to publish initially, before the subscriber is received
+    private final int publishInitial;
+    // Whether we should use scheduled publishing (with a small delay)
+    private final boolean scheduled;
+
+    private ScheduledExecutorService executor;
+    private DefaultEventLoopGroup eventLoop;
+
+    @Factory(dataProvider = "data")
+    public HandlerPublisherVerificationTest(int batchSize, int publishInitial, boolean scheduled) {
+        super(new TestEnvironment(200));
+        this.batchSize = batchSize;
+        this.publishInitial = publishInitial;
+        this.scheduled = scheduled;
+    }
+
+    @DataProvider
+    public static Object[][] data() {
+        final int defaultBatchSize = 3;
+        final int defaultPublishInitial = 3;
+        final boolean defaultScheduled = false;
+
+        return new Object[][] {
+            { defaultBatchSize, defaultPublishInitial, defaultScheduled },
+            { 1, defaultPublishInitial, defaultScheduled },
+            { defaultBatchSize, 0, defaultScheduled },
+            { defaultBatchSize, defaultPublishInitial, true }
+        };
+    }
+
+    // I tried making this before/after class, but encountered a strange error where after 32 publishers were created,
+    // the following tests complained about the executor being shut down when I registered the channel. Though, it
+    // doesn't happen if you create 32 publishers in a single test.
+    @BeforeMethod
+    public void startEventLoop() {
+        eventLoop = new DefaultEventLoopGroup();
+    }
+
+    @AfterMethod
+    public void stopEventLoop() {
+        eventLoop.shutdownGracefully();
+        eventLoop = null;
+    }
+
+    @BeforeClass
+    public void startExecutor() {
+        executor = Executors.newSingleThreadScheduledExecutor();
+    }
+
+    @AfterClass
+    public void stopExecutor() {
+        executor.shutdown();
+    }
+
+    @Override
+    public Publisher<Long> createPublisher(final long elements) {
+        final BatchedProducer out;
+        if (scheduled) {
+            out = new ScheduledBatchedProducer(elements, batchSize, publishInitial, executor, 5);
+        } else {
+            out = new BatchedProducer(elements, batchSize, publishInitial, executor);
+        }
+
+        final ClosedLoopChannel channel = new ClosedLoopChannel();
+        channel.config().setAutoRead(false);
+        ChannelFuture registered = eventLoop.register(channel);
+
+        final HandlerPublisher<Long> publisher = new HandlerPublisher<>(registered.channel().eventLoop(), Long.class);
+
+        registered.addListener(new ChannelFutureListener() {
+            @Override
+            public void operationComplete(ChannelFuture future) throws Exception {
+                channel.pipeline().addLast("out", out);
+                channel.pipeline().addLast("publisher", publisher);
+
+                for (long i = 0; i < publishInitial && i < elements; i++) {
+                    channel.pipeline().fireChannelRead(i);
+                }
+                if (elements <= publishInitial) {
+                    channel.pipeline().fireChannelInactive();
+                }
+            }
+        });
+
+        return publisher;
+    }
+
+    @Override
+    public Publisher<Long> createFailedPublisher() {
+        LocalChannel channel = new LocalChannel();
+        eventLoop.register(channel);
+        HandlerPublisher<Long> publisher = new HandlerPublisher<>(channel.eventLoop(), Long.class);
+        channel.pipeline().addLast("publisher", publisher);
+        channel.pipeline().fireExceptionCaught(new RuntimeException("failed"));
+
+        return publisher;
+    }
+
+    @Override
+    public void stochastic_spec103_mustSignalOnMethodsSequentially() throws Throwable {
+        try {
+            super.stochastic_spec103_mustSignalOnMethodsSequentially();
+        } catch (Throwable t) {
+            // CI is failing here, but maven doesn't tell us which parameters failed
+            System.out.println("Stochastic test failed with parameters batchSize=" + batchSize +
+                               " publishInitial=" + publishInitial + " scheduled=" + scheduled);
+            throw t;
+        }
+    }
+}
diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/nrs/HandlerSubscriberBlackboxVerificationTest.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/nrs/HandlerSubscriberBlackboxVerificationTest.java
new file mode 100644
index 000000000000..69346e06093c
--- /dev/null
+++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/nrs/HandlerSubscriberBlackboxVerificationTest.java
@@ -0,0 +1,98 @@
+/*
+ * 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.
+ *
+ * Original source licensed under the Apache License 2.0 by playframework.
+ */
+
+package software.amazon.awssdk.http.nio.netty.internal.nrs;
+
+import io.netty.channel.ChannelDuplexHandler;
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.embedded.EmbeddedChannel;
+import org.reactivestreams.Subscriber;
+import org.reactivestreams.Subscription;
+import org.reactivestreams.tck.SubscriberBlackboxVerification;
+import org.reactivestreams.tck.TestEnvironment;
+
+/**
+ * This class contains source imported from https://github.com/playframework/netty-reactive-streams,
+ * licensed under the Apache License 2.0, available at the time of the fork (1/31/2020) here:
+ * https://github.com/playframework/netty-reactive-streams/blob/master/LICENSE.txt
+ *
+ * All original source licensed under the Apache License 2.0 by playframework. All modifications are
+ * licensed under the Apache License 2.0 by Amazon Web Services.
+ */
+public class HandlerSubscriberBlackboxVerificationTest extends SubscriberBlackboxVerification<Long> {
+
+    public HandlerSubscriberBlackboxVerificationTest() {
+        super(new TestEnvironment());
+    }
+
+    @Override
+    public Subscriber<Long> createSubscriber() {
+        // Embedded channel requires at least one handler when it's created, but HandlerSubscriber
+        // needs the channels event loop in order to be created, so start with a dummy, then replace.
+        ChannelHandler dummy = new ChannelDuplexHandler();
+        EmbeddedChannel channel = new EmbeddedChannel(dummy);
+        HandlerSubscriber<Long> subscriber = new HandlerSubscriber<>(channel.eventLoop(), 2, 4);
+        channel.pipeline().replace(dummy, "subscriber", subscriber);
+
+        return new SubscriberWithChannel<>(channel, subscriber);
+    }
+
+    @Override
+    public Long createElement(int element) {
+        return (long) element;
+    }
+
+    @Override
+    public void triggerRequest(Subscriber<? super Long> subscriber) {
+        EmbeddedChannel channel = ((SubscriberWithChannel) subscriber).channel;
+
+        channel.runPendingTasks();
+        while (channel.readOutbound() != null) {
+            channel.runPendingTasks();
+        }
+        channel.runPendingTasks();
+    }
+
+    /**
+     * Delegate subscriber that makes the embedded channel available so we can talk to it to trigger a request.
+     */
+    private static class SubscriberWithChannel<T> implements Subscriber<T> {
+        final EmbeddedChannel channel;
+        final HandlerSubscriber<T> subscriber;
+
+        public SubscriberWithChannel(EmbeddedChannel channel, HandlerSubscriber<T> subscriber) {
+            this.channel = channel;
+            this.subscriber = subscriber;
+        }
+
+        public void onSubscribe(Subscription s) {
+            subscriber.onSubscribe(s);
+        }
+
+        public void onNext(T t) {
+            subscriber.onNext(t);
+        }
+
+        public void onError(Throwable t) {
+            subscriber.onError(t);
+        }
+
+        public void onComplete() {
+            subscriber.onComplete();
+        }
+    }
+}
diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/nrs/HandlerSubscriberTest.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/nrs/HandlerSubscriberTest.java
new file mode 100644
index 000000000000..4b47365fce1f
--- /dev/null
+++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/nrs/HandlerSubscriberTest.java
@@ -0,0 +1,220 @@
+/*
+ * 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.
+ *
+ * Original source licensed under the Apache License 2.0 by playframework.
+ */
+
+package software.amazon.awssdk.http.nio.netty.internal.nrs;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelPromise;
+import io.netty.channel.DefaultChannelPromise;
+import io.netty.channel.EventLoop;
+import io.netty.channel.EventLoopGroup;
+import io.netty.channel.embedded.EmbeddedChannel;
+import io.netty.handler.codec.http.DefaultFullHttpRequest;
+import io.netty.handler.codec.http.HttpContent;
+import io.netty.handler.codec.http.HttpMethod;
+import io.netty.handler.codec.http.HttpVersion;
+import io.netty.util.concurrent.AbstractEventExecutor;
+import io.netty.util.concurrent.Future;
+import io.netty.util.internal.ObjectUtil;
+import java.util.ArrayDeque;
+import java.util.Queue;
+import java.util.concurrent.TimeUnit;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.reactivestreams.Subscription;
+
+/**
+ * This class contains source imported from https://github.com/playframework/netty-reactive-streams,
+ * licensed under the Apache License 2.0, available at the time of the fork (1/31/2020) here:
+ * https://github.com/playframework/netty-reactive-streams/blob/master/LICENSE.txt
+ *
+ * All original source licensed under the Apache License 2.0 by playframework. All modifications are
+ * licensed under the Apache License 2.0 by Amazon Web Services.
+ */
+public class HandlerSubscriberTest {
+    private EmbeddedChannel channel;
+    private CustomEmbeddedEventLoop eventLoop;
+    private HandlerSubscriber<HttpContent> handler;
+
+    @Before
+    public void setup() throws Exception {
+        channel = new CustomEmbeddedChannel();
+        eventLoop = new CustomEmbeddedEventLoop();
+        eventLoop.register(channel).syncUninterruptibly();
+
+        handler = new HandlerSubscriber<>(eventLoop);
+        channel.pipeline().addLast(handler);
+    }
+
+    @After
+    public void teardown() {
+        channel.close();
+    }
+
+    /**
+     * Ensures that onNext invocations against the {@link HandlerSubscriber} do not order things based on which thread is calling
+     * onNext.
+     */
+    @Test
+    public void onNextWritesInProperOrderFromAnyThread() {
+        HttpContent front = emptyHttpRequest();
+        HttpContent back = emptyHttpRequest();
+
+        handler.onSubscribe(doNothingSubscription());
+        eventLoop.inEventLoop(false);
+        handler.onNext(front);
+        eventLoop.inEventLoop(true);
+        handler.onNext(back);
+
+        eventLoop.runTasks();
+
+        Queue<Object> outboundMessages = channel.outboundMessages();
+
+        assertThat(outboundMessages).hasSize(2);
+        assertThat(outboundMessages.poll()).isSameAs(front);
+        assertThat(outboundMessages.poll()).isSameAs(back);
+    }
+
+    private DefaultFullHttpRequest emptyHttpRequest() {
+        return new DefaultFullHttpRequest(HttpVersion.HTTP_1_1, HttpMethod.GET, "http://fake.com");
+    }
+
+    private Subscription doNothingSubscription() {
+        return new Subscription() {
+            @Override
+            public void request(long n) { }
+
+            @Override
+            public void cancel() { }
+        };
+    }
+
+    private  static class CustomEmbeddedChannel extends EmbeddedChannel {
+        private CustomEmbeddedChannel() {
+            super(false, false);
+        }
+
+        @Override
+        protected boolean isCompatible(EventLoop loop) {
+            return loop instanceof CustomEmbeddedEventLoop;
+        }
+    }
+
+    private static class CustomEmbeddedEventLoop extends AbstractEventExecutor implements EventLoop {
+        private final Queue<Runnable> tasks = new ArrayDeque<>(2);
+        private volatile boolean inEventLoop = true;
+
+        @Override
+        public EventLoopGroup parent() {
+            return (EventLoopGroup) super.parent();
+        }
+
+        @Override
+        public EventLoop next() {
+            return (EventLoop) super.next();
+        }
+
+        @Override
+        public void execute(Runnable runnable) {
+            tasks.add(runnable);
+        }
+
+        public void runTasks() {
+            for (;;) {
+                Runnable task = tasks.poll();
+                if (task == null) {
+                    break;
+                }
+
+                task.run();
+            }
+        }
+
+        @Override
+        public Future<?> shutdownGracefully(long quietPeriod, long timeout, TimeUnit unit) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public Future<?> terminationFuture() {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        @Deprecated
+        public void shutdown() {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public boolean isShuttingDown() {
+            return false;
+        }
+
+        @Override
+        public boolean isShutdown() {
+            return false;
+        }
+
+        @Override
+        public boolean isTerminated() {
+            return false;
+        }
+
+        @Override
+        public boolean awaitTermination(long timeout, TimeUnit unit) {
+            return false;
+        }
+
+        @Override
+        public ChannelFuture register(Channel channel) {
+            return register(new DefaultChannelPromise(channel, this));
+        }
+
+        @Override
+        public ChannelFuture register(ChannelPromise promise) {
+            ObjectUtil.checkNotNull(promise, "promise");
+            promise.channel().unsafe().register(this, promise);
+            return promise;
+        }
+
+        @Deprecated
+        @Override
+        public ChannelFuture register(Channel channel, ChannelPromise promise) {
+            channel.unsafe().register(this, promise);
+            return promise;
+        }
+
+        public void inEventLoop(boolean inEventLoop) {
+            this.inEventLoop = inEventLoop;
+        }
+
+        @Override
+        public boolean inEventLoop() {
+            return inEventLoop;
+        }
+
+        @Override
+        public boolean inEventLoop(Thread thread) {
+            return inEventLoop;
+        }
+    }
+}
\ No newline at end of file
diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/nrs/HandlerSubscriberWhiteboxVerificationTest.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/nrs/HandlerSubscriberWhiteboxVerificationTest.java
new file mode 100644
index 000000000000..0a9b7d76aa09
--- /dev/null
+++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/nrs/HandlerSubscriberWhiteboxVerificationTest.java
@@ -0,0 +1,118 @@
+/*
+ * 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.
+ *
+ * Original source licensed under the Apache License 2.0 by playframework.
+ */
+
+package software.amazon.awssdk.http.nio.netty.internal.nrs;
+
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelFutureListener;
+import io.netty.channel.DefaultEventLoopGroup;
+import io.netty.util.concurrent.DefaultPromise;
+import io.netty.util.concurrent.Promise;
+import org.reactivestreams.Subscriber;
+import org.reactivestreams.tck.SubscriberWhiteboxVerification;
+import org.reactivestreams.tck.TestEnvironment;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+import software.amazon.awssdk.http.nio.netty.internal.nrs.util.ClosedLoopChannel;
+import software.amazon.awssdk.http.nio.netty.internal.nrs.util.ProbeHandler;
+
+/**
+ * This class contains source imported from https://github.com/playframework/netty-reactive-streams,
+ * licensed under the Apache License 2.0, available at the time of the fork (1/31/2020) here:
+ * https://github.com/playframework/netty-reactive-streams/blob/master/LICENSE.txt
+ *
+ * All original source licensed under the Apache License 2.0 by playframework. All modifications are
+ * licensed under the Apache License 2.0 by Amazon Web Services.
+ */
+public class HandlerSubscriberWhiteboxVerificationTest extends SubscriberWhiteboxVerification<Long> {
+
+    private boolean workAroundIssue277;
+
+    public HandlerSubscriberWhiteboxVerificationTest() {
+        super(new TestEnvironment());
+    }
+
+    private DefaultEventLoopGroup eventLoop;
+
+    // I tried making this before/after class, but encountered a strange error where after 32 publishers were created,
+    // the following tests complained about the executor being shut down when I registered the channel. Though, it
+    // doesn't happen if you create 32 publishers in a single test.
+    @BeforeMethod
+    public void startEventLoop() {
+        workAroundIssue277 = false;
+        eventLoop = new DefaultEventLoopGroup();
+    }
+
+    @AfterMethod
+    public void stopEventLoop() {
+        eventLoop.shutdownGracefully();
+        eventLoop = null;
+    }
+
+    @Override
+    public Subscriber<Long> createSubscriber(WhiteboxSubscriberProbe<Long> probe) {
+        final ClosedLoopChannel channel = new ClosedLoopChannel();
+        channel.config().setAutoRead(false);
+        ChannelFuture registered = eventLoop.register(channel);
+
+        final HandlerSubscriber<Long> subscriber = new HandlerSubscriber<>(registered.channel().eventLoop(), 2, 4);
+        final ProbeHandler<Long> probeHandler = new ProbeHandler<>(probe, Long.class);
+        final Promise<Void> handlersInPlace = new DefaultPromise<>(eventLoop.next());
+
+        registered.addListener(new ChannelFutureListener() {
+            @Override
+            public void operationComplete(ChannelFuture future) throws Exception {
+                channel.pipeline().addLast("probe", probeHandler);
+                channel.pipeline().addLast("subscriber", subscriber);
+                handlersInPlace.setSuccess(null);
+                // Channel needs to be active before the subscriber starts responding to demand
+                channel.pipeline().fireChannelActive();
+            }
+        });
+
+        if (workAroundIssue277) {
+            try {
+                // Wait for the pipeline to be setup, so we're ready to receive elements even if they aren't requested,
+                // because https://github.com/reactive-streams/reactive-streams-jvm/issues/277
+                handlersInPlace.await();
+            } catch (InterruptedException e) {
+                throw new RuntimeException(e);
+            }
+        }
+
+        return probeHandler.wrap(subscriber);
+    }
+
+    @Override
+    public void required_spec208_mustBePreparedToReceiveOnNextSignalsAfterHavingCalledSubscriptionCancel() throws Throwable {
+        // See https://github.com/reactive-streams/reactive-streams-jvm/issues/277
+        workAroundIssue277 = true;
+        super.required_spec208_mustBePreparedToReceiveOnNextSignalsAfterHavingCalledSubscriptionCancel();
+    }
+
+    @Override
+    public void required_spec308_requestMustRegisterGivenNumberElementsToBeProduced() throws Throwable {
+        workAroundIssue277 = true;
+        super.required_spec308_requestMustRegisterGivenNumberElementsToBeProduced();
+    }
+
+    @Override
+    public Long createElement(int element) {
+        return (long) element;
+    }
+
+}
diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/nrs/util/BatchedProducer.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/nrs/util/BatchedProducer.java
new file mode 100644
index 000000000000..d341d8f850ce
--- /dev/null
+++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/nrs/util/BatchedProducer.java
@@ -0,0 +1,79 @@
+/*
+ * 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.
+ *
+ * Original source licensed under the Apache License 2.0 by playframework.
+ */
+
+package software.amazon.awssdk.http.nio.netty.internal.nrs.util;
+
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelOutboundHandlerAdapter;
+import io.netty.channel.ChannelPromise;
+import java.util.concurrent.Executor;
+
+/**
+ * A batched producer.
+ *
+ * Responds to read requests with batches of elements according to batch size. When eofOn is reached, it closes the
+ * channel.
+ *
+ * This class contains source imported from https://github.com/playframework/netty-reactive-streams,
+ * licensed under the Apache License 2.0, available at the time of the fork (1/31/2020) here:
+ * https://github.com/playframework/netty-reactive-streams/blob/master/LICENSE.txt
+ *
+ * All original source licensed under the Apache License 2.0 by playframework. All modifications are
+ * licensed under the Apache License 2.0 by Amazon Web Services.
+ */
+public class BatchedProducer extends ChannelOutboundHandlerAdapter {
+
+    protected final long eofOn;
+    protected final int batchSize;
+    private final Executor executor;
+    protected long sequence;
+
+    public BatchedProducer(long eofOn, int batchSize, long sequence, Executor executor) {
+        this.eofOn = eofOn;
+        this.batchSize = batchSize;
+        this.sequence = sequence;
+        this.executor = executor;
+    }
+
+    private boolean cancelled = false;
+
+
+    @Override
+    public void read(final ChannelHandlerContext ctx) throws Exception {
+        if (cancelled) {
+            throw new IllegalStateException("Received demand after being cancelled");
+        }
+        executor.execute(() -> {
+            for (int i = 0; i < batchSize && sequence != eofOn; i++) {
+                ctx.fireChannelRead(sequence++);
+            }
+            if (eofOn == sequence) {
+                ctx.fireChannelInactive();
+            } else {
+                ctx.fireChannelReadComplete();
+            }
+        });
+    }
+
+    @Override
+    public void disconnect(ChannelHandlerContext ctx, ChannelPromise promise) throws Exception {
+        if (cancelled) {
+            throw new IllegalStateException("Cancelled twice");
+        }
+        cancelled = true;
+    }
+}
diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/nrs/util/ClosedLoopChannel.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/nrs/util/ClosedLoopChannel.java
new file mode 100644
index 000000000000..a687b95e59be
--- /dev/null
+++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/nrs/util/ClosedLoopChannel.java
@@ -0,0 +1,131 @@
+/*
+ * 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.
+ *
+ * Original source licensed under the Apache License 2.0 by playframework.
+ */
+
+package software.amazon.awssdk.http.nio.netty.internal.nrs.util;
+
+import io.netty.channel.AbstractChannel;
+import io.netty.channel.ChannelConfig;
+import io.netty.channel.ChannelMetadata;
+import io.netty.channel.ChannelOutboundBuffer;
+import io.netty.channel.ChannelPromise;
+import io.netty.channel.DefaultChannelConfig;
+import io.netty.channel.EventLoop;
+import java.net.SocketAddress;
+
+/**
+ * A closed loop channel that sends no events and receives no events, for testing purposes.
+ *
+ * Any outgoing events that reach the channel will throw an exception. All events should be caught
+ * be inserting a handler that catches them and responds accordingly.
+ *
+ * This class contains source imported from https://github.com/playframework/netty-reactive-streams,
+ * licensed under the Apache License 2.0, available at the time of the fork (1/31/2020) here:
+ * https://github.com/playframework/netty-reactive-streams/blob/master/LICENSE.txt
+ *
+ * All original source licensed under the Apache License 2.0 by playframework. All modifications are
+ * licensed under the Apache License 2.0 by Amazon Web Services.
+ */
+public class ClosedLoopChannel extends AbstractChannel {
+
+    private final ChannelConfig config = new DefaultChannelConfig(this);
+    private static final ChannelMetadata metadata = new ChannelMetadata(false);
+
+    private volatile boolean open = true;
+    private volatile boolean active = true;
+
+    public ClosedLoopChannel() {
+        super(null);
+    }
+
+    public void setOpen(boolean open) {
+        this.open = open;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+
+    @Override
+    protected AbstractUnsafe newUnsafe() {
+        return new AbstractUnsafe() {
+            @Override
+            public void connect(SocketAddress remoteAddress, SocketAddress localAddress, ChannelPromise promise) {
+                throw new UnsupportedOperationException();
+            }
+        };
+    }
+
+    @Override
+    protected boolean isCompatible(EventLoop loop) {
+        return true;
+    }
+
+    @Override
+    protected SocketAddress localAddress0() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    protected SocketAddress remoteAddress0() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    protected void doBind(SocketAddress localAddress) throws Exception {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    protected void doDisconnect() throws Exception {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    protected void doClose() throws Exception {
+        this.open = false;
+    }
+
+    @Override
+    protected void doBeginRead() throws Exception {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    protected void doWrite(ChannelOutboundBuffer in) throws Exception {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public ChannelConfig config() {
+        return config;
+    }
+
+    @Override
+    public boolean isOpen() {
+        return open;
+    }
+
+    @Override
+    public boolean isActive() {
+        return active;
+    }
+
+    @Override
+    public ChannelMetadata metadata() {
+        return metadata;
+    }
+}
diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/nrs/util/Probe.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/nrs/util/Probe.java
new file mode 100644
index 000000000000..172eef460216
--- /dev/null
+++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/nrs/util/Probe.java
@@ -0,0 +1,55 @@
+/*
+ * 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.
+ *
+ * Original source licensed under the Apache License 2.0 by playframework.
+ */
+
+package software.amazon.awssdk.http.nio.netty.internal.nrs.util;
+
+import java.util.Date;
+
+/**
+ * This class contains source imported from https://github.com/playframework/netty-reactive-streams,
+ * licensed under the Apache License 2.0, available at the time of the fork (1/31/2020) here:
+ * https://github.com/playframework/netty-reactive-streams/blob/master/LICENSE.txt
+ *
+ * All original source licensed under the Apache License 2.0 by playframework. All modifications are
+ * licensed under the Apache License 2.0 by Amazon Web Services.
+ */
+public class Probe {
+
+    protected final String name;
+    protected final Long start;
+
+    /**
+     * Create a new probe and log that it started.
+     */
+    protected Probe(String name) {
+        this.name = name;
+        start = System.nanoTime();
+        log("Probe created at " + new Date());
+    }
+
+    /**
+     * Create a new probe with the start time from another probe.
+     */
+    protected Probe(String name, long start) {
+        this.name = name;
+        this.start = start;
+    }
+
+    protected void log(String message) {
+        System.out.println(String.format("%10d %-5s %-15s %s", (System.nanoTime() - start) / 1000, name, Thread.currentThread().getName(), message));
+    }
+}
diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/nrs/util/ProbeHandler.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/nrs/util/ProbeHandler.java
new file mode 100644
index 000000000000..492aae10bda4
--- /dev/null
+++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/nrs/util/ProbeHandler.java
@@ -0,0 +1,128 @@
+/*
+ * 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.
+ *
+ * Original source licensed under the Apache License 2.0 by playframework.
+ */
+
+package software.amazon.awssdk.http.nio.netty.internal.nrs.util;
+
+import io.netty.channel.ChannelDuplexHandler;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPromise;
+import java.util.LinkedList;
+import java.util.Queue;
+import java.util.concurrent.atomic.AtomicInteger;
+import org.reactivestreams.Subscriber;
+import org.reactivestreams.Subscription;
+import org.reactivestreams.tck.SubscriberWhiteboxVerification;
+
+/**
+ * This class contains source imported from https://github.com/playframework/netty-reactive-streams,
+ * licensed under the Apache License 2.0, available at the time of the fork (1/31/2020) here:
+ * https://github.com/playframework/netty-reactive-streams/blob/master/LICENSE.txt
+ *
+ * All original source licensed under the Apache License 2.0 by playframework. All modifications are
+ * licensed under the Apache License 2.0 by Amazon Web Services.
+ */
+public class ProbeHandler<T> extends ChannelDuplexHandler implements SubscriberWhiteboxVerification.SubscriberPuppet {
+
+    private static final int NO_CONTEXT = 0;
+    private static final int RUN = 1;
+    private static final int CANCEL = 2;
+
+    private final SubscriberWhiteboxVerification.WhiteboxSubscriberProbe<T> probe;
+    private final Class<T> clazz;
+    private final Queue<WriteEvent> queue = new LinkedList<>();
+    private final AtomicInteger state = new AtomicInteger(NO_CONTEXT);
+    private volatile ChannelHandlerContext ctx;
+    // Netty doesn't provide a way to send errors out, so we capture whether it was an error or complete here
+    private volatile Throwable receivedError = null;
+
+    public ProbeHandler(SubscriberWhiteboxVerification.WhiteboxSubscriberProbe<T> probe, Class<T> clazz) {
+        this.probe = probe;
+        this.clazz = clazz;
+    }
+
+    @Override
+    public void handlerAdded(ChannelHandlerContext ctx) throws Exception {
+        this.ctx = ctx;
+        if (!state.compareAndSet(NO_CONTEXT, RUN)) {
+            ctx.fireChannelInactive();
+        }
+    }
+
+    @Override
+    public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception {
+        queue.add(new WriteEvent(clazz.cast(msg), promise));
+    }
+
+    @Override
+    public void close(ChannelHandlerContext ctx, ChannelPromise future) throws Exception {
+        if (receivedError == null) {
+            probe.registerOnComplete();
+        } else {
+            probe.registerOnError(receivedError);
+        }
+    }
+
+    @Override
+    public void flush(ChannelHandlerContext ctx) throws Exception {
+        while (!queue.isEmpty()) {
+            WriteEvent event = queue.remove();
+            probe.registerOnNext(event.msg);
+            event.future.setSuccess();
+        }
+    }
+
+    @Override
+    public void triggerRequest(long elements) {
+        // No need, the channel automatically requests
+    }
+
+    @Override
+    public void signalCancel() {
+        if (!state.compareAndSet(NO_CONTEXT, CANCEL)) {
+            ctx.fireChannelInactive();
+        }
+    }
+
+    private class WriteEvent {
+        final T msg;
+        final ChannelPromise future;
+
+        private WriteEvent(T msg, ChannelPromise future) {
+            this.msg = msg;
+            this.future = future;
+        }
+    }
+
+    public Subscriber<T> wrap(final Subscriber<T> subscriber) {
+        return new Subscriber<T>() {
+            public void onSubscribe(Subscription s) {
+                probe.registerOnSubscribe(ProbeHandler.this);
+                subscriber.onSubscribe(s);
+            }
+            public void onNext(T t) {
+                subscriber.onNext(t);
+            }
+            public void onError(Throwable t) {
+                receivedError = t;
+                subscriber.onError(t);
+            }
+            public void onComplete() {
+                subscriber.onComplete();
+            }
+        };
+    }
+}
diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/nrs/util/PublisherProbe.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/nrs/util/PublisherProbe.java
new file mode 100644
index 000000000000..22a008eb7bfd
--- /dev/null
+++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/nrs/util/PublisherProbe.java
@@ -0,0 +1,47 @@
+/*
+ * 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.
+ *
+ * Original source licensed under the Apache License 2.0 by playframework.
+ */
+
+package software.amazon.awssdk.http.nio.netty.internal.nrs.util;
+
+import org.reactivestreams.Publisher;
+import org.reactivestreams.Subscriber;
+
+/**
+ * This class contains source imported from https://github.com/playframework/netty-reactive-streams,
+ * licensed under the Apache License 2.0, available at the time of the fork (1/31/2020) here:
+ * https://github.com/playframework/netty-reactive-streams/blob/master/LICENSE.txt
+ *
+ * All original source licensed under the Apache License 2.0 by playframework. All modifications are
+ * licensed under the Apache License 2.0 by Amazon Web Services.
+ */
+public class PublisherProbe<T> extends Probe implements Publisher<T> {
+
+    private final Publisher<T> publisher;
+
+    public PublisherProbe(Publisher<T> publisher, String name) {
+        super(name);
+        this.publisher = publisher;
+    }
+
+    @Override
+    public void subscribe(Subscriber<? super T> s) {
+        String sName = s == null ? "null" : s.getClass().getName();
+        log("invoke subscribe with subscriber " + sName);
+        publisher.subscribe(new SubscriberProbe<>(s, name, start));
+        log("finish subscribe");
+    }
+}
diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/nrs/util/ScheduledBatchedProducer.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/nrs/util/ScheduledBatchedProducer.java
new file mode 100644
index 000000000000..f814cfce1e80
--- /dev/null
+++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/nrs/util/ScheduledBatchedProducer.java
@@ -0,0 +1,66 @@
+/*
+ * 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.
+ *
+ * Original source licensed under the Apache License 2.0 by playframework.
+ */
+
+package software.amazon.awssdk.http.nio.netty.internal.nrs.util;
+
+import io.netty.channel.ChannelHandlerContext;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * A batched producer.
+ *
+ * Responds to read requests with batches of elements according to batch size. When eofOn is reached, it closes the
+ * channel.
+ *
+ * This class contains source imported from https://github.com/playframework/netty-reactive-streams,
+ * licensed under the Apache License 2.0, available at the time of the fork (1/31/2020) here:
+ * https://github.com/playframework/netty-reactive-streams/blob/master/LICENSE.txt
+ *
+ * All original source licensed under the Apache License 2.0 by playframework. All modifications are
+ * licensed under the Apache License 2.0 by Amazon Web Services.
+ */
+public class ScheduledBatchedProducer extends BatchedProducer {
+
+    private final ScheduledExecutorService executor;
+    private final long delay;
+
+    public ScheduledBatchedProducer(long eofOn, int batchSize, long sequence, ScheduledExecutorService executor, long delay) {
+        super(eofOn, batchSize, sequence, executor);
+        this.executor = executor;
+        this.delay = delay;
+    }
+
+    protected boolean complete;
+
+    @Override
+    public void read(final ChannelHandlerContext ctx) throws Exception {
+        executor.schedule(() -> {
+            for (int i = 0; i < batchSize && sequence != eofOn; i++) {
+                ctx.fireChannelRead(sequence++);
+            }
+            complete = eofOn == sequence;
+            executor.schedule(() -> {
+                if (complete) {
+                    ctx.fireChannelInactive();
+                } else {
+                    ctx.fireChannelReadComplete();
+                }
+            }, delay, TimeUnit.MILLISECONDS);
+        }, delay, TimeUnit.MILLISECONDS);
+    }
+}
diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/nrs/util/SubscriberProbe.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/nrs/util/SubscriberProbe.java
new file mode 100644
index 000000000000..8003bd9395ba
--- /dev/null
+++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/nrs/util/SubscriberProbe.java
@@ -0,0 +1,88 @@
+/*
+ * 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.
+ *
+ * Original source licensed under the Apache License 2.0 by playframework.
+ */
+
+package software.amazon.awssdk.http.nio.netty.internal.nrs.util;
+
+import org.reactivestreams.Subscriber;
+import org.reactivestreams.Subscription;
+
+/**
+ * This class contains source imported from https://github.com/playframework/netty-reactive-streams,
+ * licensed under the Apache License 2.0, available at the time of the fork (1/31/2020) here:
+ * https://github.com/playframework/netty-reactive-streams/blob/master/LICENSE.txt
+ *
+ * All original source licensed under the Apache License 2.0 by playframework. All modifications are
+ * licensed under the Apache License 2.0 by Amazon Web Services.
+ */
+public class SubscriberProbe<T> extends Probe implements Subscriber<T> {
+
+    private final Subscriber<T> subscriber;
+
+    public SubscriberProbe(Subscriber<T> subscriber, String name) {
+        super(name);
+        this.subscriber = subscriber;
+    }
+
+    SubscriberProbe(Subscriber<T> subscriber, String name, long start) {
+        super(name, start);
+        this.subscriber = subscriber;
+    }
+
+    @Override
+    public void onSubscribe(final Subscription s) {
+        String sName = s == null ? "null" : s.getClass().getName();
+        log("invoke onSubscribe with subscription " + sName);
+        subscriber.onSubscribe(new Subscription() {
+            @Override
+            public void request(long n) {
+                log("invoke request " + n);
+                s.request(n);
+                log("finish request");
+            }
+
+            @Override
+            public void cancel() {
+                log("invoke cancel");
+                s.cancel();
+                log("finish cancel");
+            }
+        });
+        log("finish onSubscribe");
+    }
+
+    @Override
+    public void onNext(T t) {
+        log("invoke onNext with message " + t);
+        subscriber.onNext(t);
+        log("finish onNext");
+    }
+
+    @Override
+    public void onError(Throwable t) {
+        String tName = t == null ? "null" : t.getClass().getName();
+        log("invoke onError with " + tName);
+        subscriber.onError(t);
+        log("finish onError");
+    }
+
+    @Override
+    public void onComplete() {
+        log("invoke onComplete");
+        subscriber.onComplete();
+        log("finish onComplete");
+    }
+}
diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/utils/ChannelUtilsTest.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/utils/ChannelUtilsTest.java
index 42db5c4a7dcb..1bf5c0e509a5 100644
--- a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/utils/ChannelUtilsTest.java
+++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/utils/ChannelUtilsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -16,7 +16,7 @@
 package software.amazon.awssdk.http.nio.netty.internal.utils;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static software.amazon.awssdk.http.nio.netty.internal.ChannelAttributeKey.CHANNEL_POOL_RECORD;
+import static software.amazon.awssdk.http.nio.netty.internal.ChannelAttributeKey.HTTP2_MULTIPLEXED_CHANNEL_POOL;
 import static software.amazon.awssdk.http.nio.netty.internal.ChannelAttributeKey.MAX_CONCURRENT_STREAMS;
 
 import io.netty.channel.Channel;
@@ -37,7 +37,7 @@ public void testGetAttributes() throws Exception {
             channel = new MockChannel();
             channel.attr(MAX_CONCURRENT_STREAMS).set(1L);
             assertThat(ChannelUtils.getAttribute(channel, MAX_CONCURRENT_STREAMS).get()).isEqualTo(1L);
-            assertThat(ChannelUtils.getAttribute(channel, CHANNEL_POOL_RECORD)).isNotPresent();
+            assertThat(ChannelUtils.getAttribute(channel, HTTP2_MULTIPLEXED_CHANNEL_POOL)).isNotPresent();
         } finally {
             Optional.ofNullable(channel).ifPresent(Channel::close);
         }
diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/utils/ExceptionHandlingUtilsTest.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/utils/ExceptionHandlingUtilsTest.java
index dd9ec85a532b..9b94849de556 100644
--- a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/utils/ExceptionHandlingUtilsTest.java
+++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/utils/ExceptionHandlingUtilsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/utils/OrderedWriteChannelHandlerContextTest.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/utils/OrderedWriteChannelHandlerContextTest.java
new file mode 100644
index 000000000000..cb86d2961e57
--- /dev/null
+++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/utils/OrderedWriteChannelHandlerContextTest.java
@@ -0,0 +1,54 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.http.nio.netty.internal.utils;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.embedded.EmbeddedChannel;
+import org.junit.Test;
+
+public class OrderedWriteChannelHandlerContextTest {
+    @Test
+    public void wrapOnlyHappensOnce() {
+        EmbeddedChannel channel = new EmbeddedChannel(new NoOpHandler());
+        ChannelHandlerContext ctx = channel.pipeline().context(NoOpHandler.class);
+        ChannelHandlerContext wrapped = OrderedWriteChannelHandlerContext.wrap(ctx);
+        ChannelHandlerContext wrapped2 = OrderedWriteChannelHandlerContext.wrap(wrapped);
+
+        assertThat(ctx).isNotSameAs(wrapped);
+        assertThat(wrapped).isSameAs(wrapped2);
+    }
+
+    private static class NoOpHandler implements ChannelHandler {
+        @Override
+        public void handlerAdded(ChannelHandlerContext ctx) throws Exception {
+
+        }
+
+        @Override
+        public void handlerRemoved(ChannelHandlerContext ctx) throws Exception {
+
+        }
+
+        @Override
+        public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
+
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/utils/SocketChannelResolverTest.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/utils/SocketChannelResolverTest.java
index 24827ef211e8..2dbfefa4e46d 100644
--- a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/utils/SocketChannelResolverTest.java
+++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/utils/SocketChannelResolverTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-clients/netty-nio-client/src/test/resources/jetty-logging.properties b/http-clients/netty-nio-client/src/test/resources/jetty-logging.properties
index 9cfe41c4144e..4ee410e7fa92 100644
--- a/http-clients/netty-nio-client/src/test/resources/jetty-logging.properties
+++ b/http-clients/netty-nio-client/src/test/resources/jetty-logging.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/http-clients/netty-nio-client/src/test/resources/log4j.properties b/http-clients/netty-nio-client/src/test/resources/log4j.properties
index 0780928c7264..6fa311bc45f9 100644
--- a/http-clients/netty-nio-client/src/test/resources/log4j.properties
+++ b/http-clients/netty-nio-client/src/test/resources/log4j.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
@@ -13,7 +13,7 @@
 # permissions and limitations under the License.
 #
 
-log4j.rootLogger=ERROR, A1
+log4j.rootLogger=INFO, A1
 log4j.appender.A1=org.apache.log4j.ConsoleAppender
 log4j.appender.A1.layout=org.apache.log4j.PatternLayout
 
diff --git a/http-clients/pom.xml b/http-clients/pom.xml
index b8fa161e5837..78083e0101ea 100644
--- a/http-clients/pom.xml
+++ b/http-clients/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>aws-sdk-java-pom</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/http-clients/url-connection-client/pom.xml b/http-clients/url-connection-client/pom.xml
index fbaa6075cf58..a3ec0329a75a 100644
--- a/http-clients/url-connection-client/pom.xml
+++ b/http-clients/url-connection-client/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>http-clients</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/http-clients/url-connection-client/src/it/java/software/amazon/awssdk/http/urlconnection/S3WithUrlHttpClientIntegrationTest.java b/http-clients/url-connection-client/src/it/java/software/amazon/awssdk/http/urlconnection/S3WithUrlHttpClientIntegrationTest.java
index 07f8b1d5ae97..e3e8a7e0160e 100644
--- a/http-clients/url-connection-client/src/it/java/software/amazon/awssdk/http/urlconnection/S3WithUrlHttpClientIntegrationTest.java
+++ b/http-clients/url-connection-client/src/it/java/software/amazon/awssdk/http/urlconnection/S3WithUrlHttpClientIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-clients/url-connection-client/src/main/java/software/amazon/awssdk/http/urlconnection/UrlConnectionFactory.java b/http-clients/url-connection-client/src/main/java/software/amazon/awssdk/http/urlconnection/UrlConnectionFactory.java
index 2df552db7e98..143e7022cd21 100644
--- a/http-clients/url-connection-client/src/main/java/software/amazon/awssdk/http/urlconnection/UrlConnectionFactory.java
+++ b/http-clients/url-connection-client/src/main/java/software/amazon/awssdk/http/urlconnection/UrlConnectionFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-clients/url-connection-client/src/main/java/software/amazon/awssdk/http/urlconnection/UrlConnectionHttpClient.java b/http-clients/url-connection-client/src/main/java/software/amazon/awssdk/http/urlconnection/UrlConnectionHttpClient.java
index b6060d16fba0..34a71855add9 100644
--- a/http-clients/url-connection-client/src/main/java/software/amazon/awssdk/http/urlconnection/UrlConnectionHttpClient.java
+++ b/http-clients/url-connection-client/src/main/java/software/amazon/awssdk/http/urlconnection/UrlConnectionHttpClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -17,8 +17,6 @@
 
 import static software.amazon.awssdk.http.HttpStatusFamily.CLIENT_ERROR;
 import static software.amazon.awssdk.http.HttpStatusFamily.SERVER_ERROR;
-import static software.amazon.awssdk.http.SdkHttpConfigurationOption.CONNECTION_TIMEOUT;
-import static software.amazon.awssdk.http.SdkHttpConfigurationOption.READ_TIMEOUT;
 import static software.amazon.awssdk.utils.FunctionalUtils.invokeSafely;
 import static software.amazon.awssdk.utils.NumericUtils.saturatedCast;
 
@@ -28,7 +26,6 @@
 import java.net.URI;
 import java.security.KeyManagementException;
 import java.security.NoSuchAlgorithmException;
-import java.security.cert.CertificateException;
 import java.security.cert.X509Certificate;
 import java.time.Duration;
 import java.util.List;
@@ -36,6 +33,7 @@
 import java.util.stream.Collectors;
 import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.HttpsURLConnection;
+import javax.net.ssl.KeyManager;
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLSession;
 import javax.net.ssl.TrustManager;
@@ -49,8 +47,12 @@
 import software.amazon.awssdk.http.SdkHttpClient;
 import software.amazon.awssdk.http.SdkHttpConfigurationOption;
 import software.amazon.awssdk.http.SdkHttpResponse;
+import software.amazon.awssdk.http.TlsKeyManagersProvider;
+import software.amazon.awssdk.http.TlsTrustManagersProvider;
 import software.amazon.awssdk.utils.AttributeMap;
 import software.amazon.awssdk.utils.IoUtils;
+import software.amazon.awssdk.utils.Logger;
+import software.amazon.awssdk.utils.Validate;
 
 /**
  * An implementation of {@link SdkHttpClient} that uses {@link HttpURLConnection} to communicate with the service. This is the
@@ -64,16 +66,20 @@
 @SdkPublicApi
 public final class UrlConnectionHttpClient implements SdkHttpClient {
 
+    private static final Logger log = Logger.loggerFor(UrlConnectionHttpClient.class);
     private static final String CLIENT_NAME = "UrlConnection";
 
     private final AttributeMap options;
     private final UrlConnectionFactory connectionFactory;
+    private final SSLContext sslContext;
 
     private UrlConnectionHttpClient(AttributeMap options, UrlConnectionFactory connectionFactory) {
         this.options = options;
         if (connectionFactory != null) {
+            this.sslContext = null;
             this.connectionFactory = connectionFactory;
         } else {
+            this.sslContext = getSslContext(options);
             this.connectionFactory = this::createDefaultConnection;
         }
 
@@ -137,34 +143,51 @@ private HttpURLConnection createAndConfigureConnection(HttpExecuteRequest reques
     }
 
     private HttpURLConnection createDefaultConnection(URI uri) {
+        HttpURLConnection connection = invokeSafely(() -> (HttpURLConnection) uri.toURL().openConnection());
 
-        if (options.get(SdkHttpConfigurationOption.TRUST_ALL_CERTIFICATES)) {
-            trustAllCertificates();
+        if (connection instanceof HttpsURLConnection) {
+            HttpsURLConnection httpsConnection = (HttpsURLConnection) connection;
+
+            if (options.get(SdkHttpConfigurationOption.TRUST_ALL_CERTIFICATES)) {
+                httpsConnection.setHostnameVerifier(NoOpHostNameVerifier.INSTANCE);
+            }
+
+            httpsConnection.setSSLSocketFactory(sslContext.getSocketFactory());
         }
 
-        HttpURLConnection connection = invokeSafely(() -> (HttpURLConnection) uri.toURL().openConnection());
-        connection.setConnectTimeout(saturatedCast(options.get(CONNECTION_TIMEOUT).toMillis()));
-        connection.setReadTimeout(saturatedCast(options.get(READ_TIMEOUT).toMillis()));
+        connection.setConnectTimeout(saturatedCast(options.get(SdkHttpConfigurationOption.CONNECTION_TIMEOUT).toMillis()));
+        connection.setReadTimeout(saturatedCast(options.get(SdkHttpConfigurationOption.READ_TIMEOUT).toMillis()));
+
         return connection;
     }
 
-    /**
-     * Should only be used in testing
-     */
-    private static void trustAllCertificates() {
-        HttpsURLConnection.setDefaultHostnameVerifier(NoOpHostNameVerifier.INSTANCE);
+    private SSLContext getSslContext(AttributeMap options) {
+        Validate.isTrue(options.get(SdkHttpConfigurationOption.TLS_TRUST_MANAGERS_PROVIDER) == null ||
+                        !options.get(SdkHttpConfigurationOption.TRUST_ALL_CERTIFICATES),
+                        "A TlsTrustManagerProvider can't be provided if TrustAllCertificates is also set");
 
-        TrustManager[] trustManagers = new TrustManager[]{TrustAllManager.INSTANCE};
-        SSLContext context;
+        TrustManager[] trustManagers = null;
+        if (options.get(SdkHttpConfigurationOption.TLS_TRUST_MANAGERS_PROVIDER) != null) {
+            trustManagers = options.get(SdkHttpConfigurationOption.TLS_TRUST_MANAGERS_PROVIDER).trustManagers();
+        }
+
+        if (options.get(SdkHttpConfigurationOption.TRUST_ALL_CERTIFICATES)) {
+            log.warn(() -> "SSL Certificate verification is disabled. This is not a safe setting and should only be "
+                           + "used for testing.");
+            trustManagers = new TrustManager[] { TrustAllManager.INSTANCE };
+        }
 
+        TlsKeyManagersProvider provider = this.options.get(SdkHttpConfigurationOption.TLS_KEY_MANAGERS_PROVIDER);
+        KeyManager[] keyManagers = provider.keyManagers();
+
+        SSLContext context;
         try {
             context = SSLContext.getInstance("TLS");
-            context.init(null, trustManagers, null);
+            context.init(keyManagers, trustManagers, null);
+            return context;
         } catch (NoSuchAlgorithmException | KeyManagementException ex) {
             throw new RuntimeException(ex.getMessage(), ex);
         }
-
-        HttpsURLConnection.setDefaultSSLSocketFactory(context.getSocketFactory());
     }
 
     private static class RequestCallable implements ExecutableHttpRequest {
@@ -237,6 +260,18 @@ public interface Builder extends SdkHttpClient.Builder<UrlConnectionHttpClient.B
          * means infinity, and is not recommended.
          */
         Builder connectionTimeout(Duration connectionTimeout);
+
+        /**
+         * Configure the {@link TlsKeyManagersProvider} that will provide the {@link javax.net.ssl.KeyManager}s to use
+         * when constructing the SSL context.
+         */
+        Builder tlsKeyManagersProvider(TlsKeyManagersProvider tlsKeyManagersProvider);
+
+        /**
+         * Configure the {@link TlsTrustManagersProvider} that will provide the {@link javax.net.ssl.TrustManager}s to use
+         * when constructing the SSL context.
+         */
+        Builder tlsTrustManagersProvider(TlsTrustManagersProvider tlsTrustManagersProvider);
     }
 
     private static final class DefaultBuilder implements Builder {
@@ -253,7 +288,7 @@ private DefaultBuilder() {
          */
         @Override
         public Builder socketTimeout(Duration socketTimeout) {
-            standardOptions.put(READ_TIMEOUT, socketTimeout);
+            standardOptions.put(SdkHttpConfigurationOption.READ_TIMEOUT, socketTimeout);
             return this;
         }
 
@@ -269,7 +304,7 @@ public void setSocketTimeout(Duration socketTimeout) {
          */
         @Override
         public Builder connectionTimeout(Duration connectionTimeout) {
-            standardOptions.put(CONNECTION_TIMEOUT, connectionTimeout);
+            standardOptions.put(SdkHttpConfigurationOption.CONNECTION_TIMEOUT, connectionTimeout);
             return this;
         }
 
@@ -277,6 +312,26 @@ public void setConnectionTimeout(Duration connectionTimeout) {
             connectionTimeout(connectionTimeout);
         }
 
+        @Override
+        public Builder tlsKeyManagersProvider(TlsKeyManagersProvider tlsKeyManagersProvider) {
+            standardOptions.put(SdkHttpConfigurationOption.TLS_KEY_MANAGERS_PROVIDER, tlsKeyManagersProvider);
+            return this;
+        }
+
+        public void setTlsKeyManagersProvider(TlsKeyManagersProvider tlsKeyManagersProvider) {
+            tlsKeyManagersProvider(tlsKeyManagersProvider);
+        }
+
+        @Override
+        public Builder tlsTrustManagersProvider(TlsTrustManagersProvider tlsTrustManagersProvider) {
+            standardOptions.put(SdkHttpConfigurationOption.TLS_TRUST_MANAGERS_PROVIDER, tlsTrustManagersProvider);
+            return this;
+        }
+
+        public void setTlsTrustManagersProvider(TlsTrustManagersProvider tlsTrustManagersProvider) {
+            tlsTrustManagersProvider(tlsTrustManagersProvider);
+        }
+
         /**
          * Used by the SDK to create a {@link SdkHttpClient} with service-default values if no other values have been configured
          *
@@ -311,13 +366,13 @@ private static class TrustAllManager implements X509TrustManager {
         private static final TrustAllManager INSTANCE = new TrustAllManager();
 
         @Override
-        public void checkClientTrusted(X509Certificate[] x509Certificates, String s) throws CertificateException {
-            // no op
+        public void checkClientTrusted(X509Certificate[] x509Certificates, String s) {
+            log.debug(() -> "Accepting a client certificate: " + x509Certificates[0].getSubjectDN());
         }
 
         @Override
-        public void checkServerTrusted(X509Certificate[] x509Certificates, String s) throws CertificateException {
-            // no op
+        public void checkServerTrusted(X509Certificate[] x509Certificates, String s) {
+            log.debug(() -> "Accepting a client certificate: " + x509Certificates[0].getSubjectDN());
         }
 
         @Override
diff --git a/http-clients/url-connection-client/src/main/java/software/amazon/awssdk/http/urlconnection/UrlConnectionSdkHttpService.java b/http-clients/url-connection-client/src/main/java/software/amazon/awssdk/http/urlconnection/UrlConnectionSdkHttpService.java
index e89109560408..2e82b1d494ee 100644
--- a/http-clients/url-connection-client/src/main/java/software/amazon/awssdk/http/urlconnection/UrlConnectionSdkHttpService.java
+++ b/http-clients/url-connection-client/src/main/java/software/amazon/awssdk/http/urlconnection/UrlConnectionSdkHttpService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/http-clients/url-connection-client/src/main/resources/META-INF/services/software.amazon.awssdk.http.SdkHttpService b/http-clients/url-connection-client/src/main/resources/META-INF/services/software.amazon.awssdk.http.SdkHttpService
index 6c6b4893194e..574778fc8593 100644
--- a/http-clients/url-connection-client/src/main/resources/META-INF/services/software.amazon.awssdk.http.SdkHttpService
+++ b/http-clients/url-connection-client/src/main/resources/META-INF/services/software.amazon.awssdk.http.SdkHttpService
@@ -1,5 +1,35 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
+#
+
+#
+# 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.
+#
+
+#
+# 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.
diff --git a/http-clients/url-connection-client/src/test/java/software/amazon/awssdk/http/urlconnection/UrlConnectionHttpClientWireMockTest.java b/http-clients/url-connection-client/src/test/java/software/amazon/awssdk/http/urlconnection/UrlConnectionHttpClientWireMockTest.java
index 9c0b0ed2f4e3..24588be760d1 100644
--- a/http-clients/url-connection-client/src/test/java/software/amazon/awssdk/http/urlconnection/UrlConnectionHttpClientWireMockTest.java
+++ b/http-clients/url-connection-client/src/test/java/software/amazon/awssdk/http/urlconnection/UrlConnectionHttpClientWireMockTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -16,11 +16,9 @@
 
 import static software.amazon.awssdk.http.SdkHttpConfigurationOption.TRUST_ALL_CERTIFICATES;
 
-import java.net.HttpURLConnection;
 import javax.net.ssl.HttpsURLConnection;
 import javax.net.ssl.SSLSocketFactory;
 import org.junit.After;
-import org.junit.Test;
 import software.amazon.awssdk.http.SdkHttpClient;
 import software.amazon.awssdk.http.SdkHttpClientTestSuite;
 import software.amazon.awssdk.utils.AttributeMap;
@@ -29,22 +27,22 @@ public final class UrlConnectionHttpClientWireMockTest extends SdkHttpClientTest
 
     @Override
     protected SdkHttpClient createSdkHttpClient(SdkHttpClientOptions options) {
-        return UrlConnectionHttpClient.create();
+        UrlConnectionHttpClient.Builder builder = UrlConnectionHttpClient.builder();
+        AttributeMap.Builder attributeMap = AttributeMap.builder();
+
+        if (options.tlsTrustManagersProvider() != null) {
+            builder.tlsTrustManagersProvider(options.tlsTrustManagersProvider());
+        }
+
+        if (options.trustAll()) {
+            attributeMap.put(TRUST_ALL_CERTIFICATES, options.trustAll());
+        }
+
+        return builder.buildWithDefaults(attributeMap.build());
     }
 
     @After
     public void reset() {
         HttpsURLConnection.setDefaultSSLSocketFactory((SSLSocketFactory) SSLSocketFactory.getDefault());
     }
-
-    @Test
-    public void trustAllCertificates_shouldWork() throws Exception {
-        try (SdkHttpClient client = UrlConnectionHttpClient.builder()
-                                                           .buildWithDefaults(AttributeMap.builder()
-                                                                                          .put(TRUST_ALL_CERTIFICATES,
-                                                                                               Boolean.TRUE)
-                                                                                          .build())) {
-            testForResponseCodeUsingHttps(client, HttpURLConnection.HTTP_OK);
-        }
-    }
 }
diff --git a/http-clients/url-connection-client/src/test/java/software/amazon/awssdk/http/urlconnection/UrlConnectionHttpClientWithCustomCreateWireMockTest.java b/http-clients/url-connection-client/src/test/java/software/amazon/awssdk/http/urlconnection/UrlConnectionHttpClientWithCustomCreateWireMockTest.java
index 37b4fb0a6747..6ce76ee84c70 100644
--- a/http-clients/url-connection-client/src/test/java/software/amazon/awssdk/http/urlconnection/UrlConnectionHttpClientWithCustomCreateWireMockTest.java
+++ b/http-clients/url-connection-client/src/test/java/software/amazon/awssdk/http/urlconnection/UrlConnectionHttpClientWithCustomCreateWireMockTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -17,6 +17,7 @@
 import static software.amazon.awssdk.utils.FunctionalUtils.invokeSafely;
 
 import java.net.HttpURLConnection;
+import org.junit.Ignore;
 import software.amazon.awssdk.http.SdkHttpClient;
 import software.amazon.awssdk.http.SdkHttpClientTestSuite;
 
@@ -25,4 +26,19 @@ public final class UrlConnectionHttpClientWithCustomCreateWireMockTest extends S
     protected SdkHttpClient createSdkHttpClient(SdkHttpClientOptions options) {
         return UrlConnectionHttpClient.create((uri) -> invokeSafely(() -> (HttpURLConnection) uri.toURL().openConnection()));
     }
+
+    @Ignore // Not supported when using custom factory
+    @Override
+    public void testCustomTlsTrustManager() {
+    }
+
+    @Ignore // Not supported when using custom factory
+    @Override
+    public void testTrustAllWorks() {
+    }
+
+    @Ignore // Not supported when using custom factory
+    @Override
+    public void testCustomTlsTrustManagerAndTrustAllFails() {
+    }
 }
diff --git a/pom.xml b/pom.xml
index a6f7df70b99c..73537783d376 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>software.amazon.awssdk</groupId>
     <artifactId>aws-sdk-java-pom</artifactId>
-    <version>2.10.7-SNAPSHOT</version>
+    <version>2.11.8-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>AWS Java SDK :: Parent</name>
     <description>The Amazon Web Services SDK for Java provides Java APIs
@@ -66,8 +66,7 @@
         <module>utils</module>
         <module>codegen-lite</module>
         <module>codegen-lite-maven-plugin</module>
-        <module>test/dynamodbdocument-v1</module>
-        <module>test/dynamodbmapper-v1</module>
+        <module>archetypes</module>
         <module>test/http-client-tests</module>
         <module>test/protocol-tests</module>
         <module>test/protocol-tests-core</module>
@@ -93,15 +92,15 @@
         <slf4j.version>1.7.28</slf4j.version>
         <log4j.version>1.2.17</log4j.version>
         <commons.io.version>2.5</commons.io.version>
-        <equalsverifier.version>2.3.3</equalsverifier.version>
+        <equalsverifier.version>3.1.13</equalsverifier.version>
         <!-- Update netty-open-ssl-version accordingly whenever we update netty version-->
         <!-- https://github.com/netty/netty/blob/4.1/pom.xml#L286 -->
-        <netty.version>4.1.42.Final</netty.version>
+        <netty.version>4.1.46.Final</netty.version>
         <unitils.version>3.3</unitils.version>
         <xmlunit.version>1.3</xmlunit.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <spotbugs.version>3.1.11</spotbugs.version>
-        <netty-reactive-streams-http.version>2.0.3</netty-reactive-streams-http.version>
+        <netty-reactive-streams-http.version>2.0.4</netty-reactive-streams-http.version>
         <freemarker.version>2.3.24-incubating</freemarker.version>
         <javapoet.verion>1.11.1</javapoet.verion>
         <org.eclipse.jdt.version>3.10.0</org.eclipse.jdt.version>
@@ -117,24 +116,25 @@
         <mockito.version>1.10.19</mockito.version>
         <mockito2.version>2.28.2</mockito2.version>
         <assertj.version>3.8.0</assertj.version>
-        <guava.version>26.0-jre</guava.version>
+        <guava.version>28.2-jre</guava.version>
         <jimfs.version>1.1</jimfs.version>
+        <testng.version>7.1.0</testng.version> <!-- TCK Tests -->
         <commons-lang.verson>2.3</commons-lang.verson>
-        <netty-open-ssl-version>2.0.25.Final</netty-open-ssl-version>
+        <netty-open-ssl-version>2.0.29.Final</netty-open-ssl-version>
         <dynamodb-local.version>1.11.477</dynamodb-local.version>
         <sqllite.version>1.0.392</sqllite.version>
 
         <!-- build plugin dependencies-->
-        <maven.surefire.version>2.21.0</maven.surefire.version>
+        <maven.surefire.version>2.22.2</maven.surefire.version>
         <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
-        <maven-checkstyle-plugin.version>2.17</maven-checkstyle-plugin.version>
-        <maven-failsafe-plugin.version>2.22.0</maven-failsafe-plugin.version>
+        <maven-checkstyle-plugin.version>3.1.1</maven-checkstyle-plugin.version>
+        <maven-failsafe-plugin.version>2.22.2</maven-failsafe-plugin.version>
         <maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
         <maven-javadoc-plugin.version>3.0.1</maven-javadoc-plugin.version>
         <maven-dependency-plugin.version>3.1.1</maven-dependency-plugin.version>
         <maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
-        <checkstyle.version>8.18</checkstyle.version>
-        <jacoco-maven-plugin.version>0.8.2</jacoco-maven-plugin.version>
+        <checkstyle.version>8.29</checkstyle.version>
+        <jacoco-maven-plugin.version>0.8.5</jacoco-maven-plugin.version>
         <nexus-staging-maven-plugin.version>1.6.8</nexus-staging-maven-plugin.version>
         <exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
         <maven-deploy-plugin.version>2.8.2</maven-deploy-plugin.version>
@@ -405,6 +405,11 @@
                         <ignoredUsedUndeclaredDependency>com.fasterxml.jackson.core:*</ignoredUsedUndeclaredDependency>
                         <ignoredUsedUndeclaredDependency>org.slf4j:slf4j-api</ignoredUsedUndeclaredDependency>
                     </ignoredUsedUndeclaredDependencies>
+                    <ignoredUnusedDeclaredDependencies>
+                        <!-- TODO: fix this when we've re-merged with netty-reactive-streams -->
+                        <ignoredUnusedDeclaredDependency>com.typesafe.netty:*</ignoredUnusedDeclaredDependency>
+                        <ignoredUnusedDeclaredDependency>software.amazon.awssdk:aws-sdk-java</ignoredUnusedDeclaredDependency>
+                    </ignoredUnusedDeclaredDependencies>
                 </configuration>
             </plugin>
 
@@ -418,9 +423,6 @@
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
                 <version>${jacoco-maven-plugin.version}</version>
-                <configuration>
-                    <destFile>${sonar.jacoco.reportPath}</destFile>
-                </configuration>
                 <executions>
                     <execution>
                         <id>default-prepare-agent</id>
@@ -473,27 +475,6 @@
                 <spotbugs.skip>true</spotbugs.skip>
                 <mdep.analyze.skip>true</mdep.analyze.skip>
             </properties>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.jacoco</groupId>
-                        <artifactId>jacoco-maven-plugin</artifactId>
-                        <version>${jacoco-maven-plugin.version}</version>
-                        <configuration>
-                            <destFile>${sonar.jacoco.reportPath}</destFile>
-                            <append>true</append>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <id>default-prepare-agent</id>
-                                <goals>
-                                    <goal>prepare-agent</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
         </profile>
 
         <profile>
diff --git a/release-scripts/pom.xml b/release-scripts/pom.xml
index f5bb1d026dd8..9ca2b59bd6c7 100644
--- a/release-scripts/pom.xml
+++ b/release-scripts/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -22,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>release-scripts</artifactId>
diff --git a/release-scripts/src/main/java/software/amazon/awssdk/release/Cli.java b/release-scripts/src/main/java/software/amazon/awssdk/release/Cli.java
index de9e214c4a74..e285c1f5628a 100644
--- a/release-scripts/src/main/java/software/amazon/awssdk/release/Cli.java
+++ b/release-scripts/src/main/java/software/amazon/awssdk/release/Cli.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/release-scripts/src/main/java/software/amazon/awssdk/release/NewServiceMain.java b/release-scripts/src/main/java/software/amazon/awssdk/release/NewServiceMain.java
index 73adbfb882a8..cfc6ced3d5cc 100644
--- a/release-scripts/src/main/java/software/amazon/awssdk/release/NewServiceMain.java
+++ b/release-scripts/src/main/java/software/amazon/awssdk/release/NewServiceMain.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -24,12 +24,15 @@
 import java.nio.file.Paths;
 import java.nio.file.SimpleFileVisitor;
 import java.nio.file.attribute.BasicFileAttributes;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import software.amazon.awssdk.utils.Validate;
+import software.amazon.awssdk.utils.internal.CodegenNamingUtils;
 
 /**
  * A command line application to create a new, empty service.
@@ -134,14 +137,20 @@ private String replacePlaceholders(String line) {
                     "{{PROTOCOL}}"
             };
             String[] replaceList = {
-                    serviceModuleName,
-                    serviceId,
-                    mavenProjectVersion,
-                    serviceProtocol
+                serviceModuleName,
+                mavenName(serviceId),
+                mavenProjectVersion,
+                serviceProtocol
             };
             return StringUtils.replaceEach(line, searchList, replaceList);
         }
 
+        private String mavenName(String serviceId) {
+            return Stream.of(CodegenNamingUtils.splitOnWordBoundaries(serviceId))
+                         .map(StringUtils::capitalize)
+                         .collect(Collectors.joining(" "));
+        }
+
         private class AddSubmoduleTransformer extends PomTransformer {
             @Override
             protected void updateDocument(Document doc) {
diff --git a/release-scripts/src/main/java/software/amazon/awssdk/release/PomTransformer.java b/release-scripts/src/main/java/software/amazon/awssdk/release/PomTransformer.java
index 917db8a58578..c33fa5857e83 100644
--- a/release-scripts/src/main/java/software/amazon/awssdk/release/PomTransformer.java
+++ b/release-scripts/src/main/java/software/amazon/awssdk/release/PomTransformer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/release-scripts/src/main/java/software/amazon/awssdk/release/UpdateServiceMain.java b/release-scripts/src/main/java/software/amazon/awssdk/release/UpdateServiceMain.java
index ef0ce37f9e78..9255f9f37d58 100644
--- a/release-scripts/src/main/java/software/amazon/awssdk/release/UpdateServiceMain.java
+++ b/release-scripts/src/main/java/software/amazon/awssdk/release/UpdateServiceMain.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/release-scripts/src/main/resources/log4j.properties b/release-scripts/src/main/resources/log4j.properties
index 5f33396a3492..fb9c49ea13c4 100644
--- a/release-scripts/src/main/resources/log4j.properties
+++ b/release-scripts/src/main/resources/log4j.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services-custom/dynamodb-enhanced/README.md b/services-custom/dynamodb-enhanced/README.md
index 3a7b34e4ff64..b8e9eb0d0417 100644
--- a/services-custom/dynamodb-enhanced/README.md
+++ b/services-custom/dynamodb-enhanced/README.md
@@ -13,130 +13,215 @@ values used are also completely arbitrary.
 
 ### Initialization
 1. Create or use a java class for mapping records to and from the
-   database table. The class does not need to conform to Java bean
-   standards but you will need getters and setters to all the attributes
-   you want to map. Here's an example :-
+   database table. At a minimum you must annotate the class so that
+   it can be used as a DynamoDb bean, and also the property that
+   represents the primary partition key of the table. Here's an example:-
    ```java
+   @DynamoDbBean
    public class Customer {
        private String accountId;
-       private int subId;            // you could also use Integer here
+       private int subId;            // primitive types are supported
        private String name;
-       private String createdDate;
+       private Instant createdDate;
        
+       @DynamoDbPartitionKey
        public String getAccountId() { return this.accountId; }
        public void setAccountId(String accountId) { this.accountId = accountId; }
        
+       @DynamoDbSortKey
        public int getSubId() { return this.subId; }
        public void setSubId(int subId) { this.subId = subId; }
        
+       // Defines a GSI (customers_by_name) with a partition key of 'name'
+       @DynamoDbSecondaryPartitionKey(indexNames = "customers_by_name")
        public String getName() { return this.name; }
        public void setName(String name) { this.name = name; }
        
-       public String getCreatedDate() { return this.createdDate; }
-       public void setCreatedDate() { this.createdDate = createdDate; }
+       // Defines an LSI (customers_by_date) with a sort key of 'createdDate' and also declares the 
+       // same attribute as a sort key for the GSI named 'customers_by_name'
+       @DynamoDbSecondarySortKey(indexNames = {"customers_by_date", "customers_by_name"})
+       public Instant getCreatedDate() { return this.createdDate; }
+       public void setCreatedDate(Instant createdDate) { this.createdDate = createdDate; }
    }
    ```
    
-2. Create a static TableSchema for your class. You could put this in the
-   class itself, or somewhere else :-
+2. Create a TableSchema for your class. For this example we are using the 'bean' TableSchema that will scan your bean
+   class and use the annotations to infer the table structure and attributes :
+   ```java
+   static final TableSchema<Customer> CUSTOMER_TABLE_SCHEMA = TableSchema.fromBean(Customer.class);
+   ```
+   
+   If you would prefer to skip the slightly costly bean inference for a faster solution, you can instead declare your 
+   schema directly and let the compiler do the heavy lifting. If you do it this way, your class does not need to follow
+   bean naming standards nor does it need to be annotated. This example is equivalent to the bean example : 
    ```java
    static final TableSchema<Customer> CUSTOMER_TABLE_SCHEMA =
-     TableSchema.builder()
-       .newItemSupplier(Customer::new)       // Tells the mapper how to make new objects when reading items
-       .attributes(
-         string("account_id", Customer::getAccountId, Customer::setAccountId)
-            .as(primaryPartitionKey()),                                                  // primary partition key         
-         integerNumber("sub_id", Customer::getSubId, Customer::setSubId)
-            .as(primarySortKey()),                                                       // primary sort key
-         string("name", Customer::getName, Customer::setName)
-            .as(secondaryPartitionKey("customers_by_name")),                             // GSI partition key
-         string("created_date", Customer::getCreatedDate, Customer::setCreatedDate)
-            .as(secondarySortKey("customers_by_date"), secondarySortKey("customers_by_name"))    // Sort key for both the LSI and the GSI
-         )
+     TableSchema.builder(Customer.class)
+       .newItemSupplier(Customer::new)
+       .addAttribute(String.class, a -> a.name("account_id")
+                                         .getter(Customer::getAccountId)
+                                         .setter(Customer::setAccountId)
+                                         .tags(primaryPartitionKey()))
+       .addAttribute(Integer.class, a -> a.name("sub_id")
+                                          .getter(Customer::getSubId)
+                                          .setter(Customer::setSubId)
+                                          .tags(primarySortKey()))
+       .addAttribute(String.class, a -> a.name("name")
+                                         .getter(Customer::getName)
+                                         .setter(Customer::setName)
+                                         .tags(secondaryPartitionKey("customers_by_name")))
+       .addAttribute(Instant.class, a -> a.name("created_date")
+                                          .getter(Customer::getCreatedDate)
+                                          .setter(Customer::setCreatedDate)
+                                          .tags(secondarySortKey("customers_by_date"),
+                                                secondarySortKey("customers_by_name")))
        .build();
    ```
    
-3. Create a MappedDatabase object that you will use to repeatedly
+3. Create a DynamoDbEnhancedClient object that you will use to repeatedly
    execute operations against all your tables :- 
    ```java
-   MappedDatabase database = MappedDatabase.builder()
-                                           .dynamoDbClient(dynamoDbClient)
-                                           .build();
+   DynamoDbEnhancedClient enhancedClient = DynamoDbEnhancedClient.builder()
+                                                                 .dynamoDbClient(dynamoDbClient)
+                                                                 .build();
    ```
-4. Create a MappedTable object that you will use to repeatedly execute
+4. Create a DynamoDbTable object that you will use to repeatedly execute
   operations against a specific table :-
    ```java
    // Maps a physical table with the name 'customers_20190205' to the schema
-   MappedTable<Customer> customerTable = database.table("customers_20190205", CUSTOMER_TABLE_SCHEMA);
+   DynamoDbTable<Customer> customerTable = enhancedClient.table("customers_20190205", CUSTOMER_TABLE_SCHEMA);
    ```
  
 ### Common primitive operations
 These all strongly map to the primitive DynamoDB operations they are
-named after. These examples are the most simple variants of each
-operation possible. These commands can be customized by using the
-builders provided for each command and offer most of the features
-available in the low-level DynamoDB SDK client.
+named after. The examples below are the most simple variants of each
+operation possible. Each operation can be further customized by passing 
+in an enhanced request object. These enhanced request objects offer most 
+of the features available in the low-level DynamoDB SDK client and are
+fully documented in the Javadoc of the interfaces referenced in these examples.
 
    ```java
    // CreateTable
-   customerTable.execute(CreateTable.create());
+   customerTable.createTable();
    
    // GetItem
-   Customer customer = customerTable.execute(GetItem.of(Key.of(stringValue("a123"))));
-   
+   Customer customer = customerTable.getItem(Key.builder().partitionValue("a123").build());
+
    // UpdateItem
-   Customer updatedCustomer = customerTable.execute(UpdateItem.of(customer));
+   Customer updatedCustomer = customerTable.updateItem(customer);
    
    // PutItem
-   customerTable.execute(PutItem.of(customer));
+   customerTable.putItem(customer);
    
    // DeleteItem
-   Customer deletedCustomer = customerTable.execute(DeleteItem.of(Key.of(stringValue("a123"), numberValue(456))));
+   Customer deletedCustomer = customerTable.deleteItem(Key.builder().partitionValue("a123").sortValue(456).build());
    
    // Query
-   Iterable<Page<Customer>> customers = customerTable.execute(Query.of(equalTo(Key.of(stringValue("a123")))));
-   
+   PageIterable<Customer> customers = customerTable.query(equalTo(k -> k.partitionValue("a123")));
+
    // Scan
-   Iterable<Page<Customer>> customers = customerTable.execute(Scan.create());
+   PageIterable<Customer> customers = customerTable.scan();
    
    // BatchGetItem
-   batchResults = database.execute(BatchGetItem.of(ReadBatch.of(customerTable, GetItem.of(key1), GetItem.of(key2), GetItem.of(key3)));
+   BatchGetResultPageIterable batchResults = enhancedClient.batchGetItem(r -> r.addReadBatch(ReadBatch.builder(Customer.class)
+                                                                               .mappedTableResource(customerTable)
+                                                                               .addGetItem(key1)
+                                                                               .addGetItem(key2)
+                                                                               .addGetItem(key3)
+                                                                               .build()));
    
    // BatchWriteItem
-   batchResults = database.execute(BatchWriteItem.of(WriteBatch.of(customerTable, PutItem.of(item), DeleteItem.of(key1), DeleteItem.of(key2))));
+   batchResults = enhancedClient.batchWriteItem(r -> r.addWriteBatch(WriteBatch.builder(Customer.class)
+                                                                               .mappedTableResource(customerTable)
+                                                                               .addPutItem(customer)
+                                                                               .addDeleteItem(key1)
+                                                                               .addDeleteItem(key1)
+                                                                               .build()));
    
    // TransactGetItems
-   transactResults = mappedDatabase.execute(TransactGetItems.of(ReadTransaction.of(customerTable, GetItem.of(key1)),
-                                                                ReadTransaction.of(orderTable, GetItem.of(key2)));
+   transactResults = enhancedClient.transactGetItems(r -> r.addGetItem(customerTable, key1)
+                                                           .addGetItem(customerTable, key2));
    
    // TransactWriteItems
-   mappedDatabase.execute(TransactWriteItems.of(WriteTransaction.of(customerTable, UpdateItem.of(customer)),
-                                                WriteTransaction.of(orderTable, ConditionCheck.of(orderKey, conditionExpression)));
+   enhancedClient.transactWriteItems(r -> r.addConditionCheck(customerTable, 
+                                                              i -> i.key(orderKey)
+                                                                    .conditionExpression(conditionExpression))
+                                           .addUpdateItem(customerTable, customer)
+                                           .addDeleteItem(customerTable, key));
 ```
    
 ### Using secondary indices
 Certain operations (Query and Scan) may be executed against a secondary
 index. Here's an example of how to do this:
-   ```
-   MappedIndex<Customer> customersByName = customerTable.index("customers_by_name");
+   ```java
+   DynamoDbIndex<Customer> customersByName = customerTable.index("customers_by_name");
        
-   Iterable<Page<Customer>> customersWithName = customersByName.query(equalTo(Key.of(stringValue("Smith"))));
+   PageIterable<Customer> customersWithName = 
+       customersByName.query(r -> r.queryConditional(equalTo(k -> k.partitionValue("Smith"))));
+   ```
+### Non-blocking asynchronous operations
+If your application requires non-blocking asynchronous calls to
+DynamoDb, then you can use the asynchronous implementation of the
+mapper. It's very similar to the synchronous implementation with a few
+key differences:
+
+1. When instantiating the mapped database, use the asynchronous version
+   of the library instead of the synchronous one (you will need to use
+   an asynchronous DynamoDb client from the SDK as well):
+   ```java
+    DynamoDbEnhancedAsyncClient enhancedClient = DynamoDbEnhancedAsyncClient.builder()
+                                                                            .dynamoDbClient(dynamoDbAsyncClient)
+                                                                            .build();
    ```
 
-### Using extensions
+2. Operations that return a single data item will return a
+   CompletableFuture of the result instead of just the result. Your
+   application can then do other work without having to block on the
+   result:
+   ```java
+   CompletableFuture<Customer> result = mappedTable.getItem(r -> r.key(customerKey));
+   // Perform other work here
+   return result.join();   // now block and wait for the result
+   ```
+
+3. Operations that return paginated lists of results will return an
+   SdkPublisher of the results instead of an SdkIterable. Your
+   application can then subscribe a handler to that publisher and deal
+   with the results asynchronously without having to block:
+   ```java
+   PagePublisher<Customer> results = mappedTable.query(r -> r.queryConditional(equalTo(k -> k.partitionValue("Smith"))));
+   results.subscribe(myCustomerResultsProcessor);
+   // Perform other work and let the processor handle the results asynchronously
+   ```
+
+## Using extensions
 The mapper supports plugin extensions to provide enhanced functionality
-beyond the simple primitive mapped operations. Only one extension can be
-loaded into a MappedDatabase. Any number of extensions can be chained
-together in a specific order into a single extension using a
-ChainExtension. Extensions have two hooks, beforeWrite() and
+beyond the simple primitive mapped operations. Extensions have two hooks, beforeWrite() and
 afterRead(); the former can modify a write operation before it happens,
 and the latter can modify the results of a read operation after it
 happens. Some operations such as UpdateItem perform both a write and
 then a read, so call both hooks.
 
-#### VersionedRecordExtension
+Extensions are loaded in the order they are specified in the enhanced client builder. This load order can be important,
+as one extension can be acting on values that have been transformed by a previous extension. By default, just the
+VersionedRecordExtension will be loaded, however you can override this behavior on the client builder and load any
+extensions you like or specify none if you do not want the default bundled VersionedRecordExtension.
+
+In this example, a custom extension named 'verifyChecksumExtension' is being loaded after the VersionedRecordExtension
+which is usually loaded by default by itself:
+```java
+DynamoDbEnhancedClientExtension versionedRecordExtension = VersionedRecordExtension.builder().build();
+
+DynamoDbEnhancedClient enhancedClient = 
+    DynamoDbEnhancedClient.builder()
+                          .dynamoDbClient(dynamoDbClient)
+                          .extensions(versionedRecordExtension, verifyChecksumExtension)
+                          .build();
+```
+
+### VersionedRecordExtension
 
-This extension will increment and track a record version number as
+This extension is loaded by default and will increment and track a record version number as
 records are written to the database. A condition will be added to every
 write that will cause the write to fail if the record version number of
 the actual persisted record does not match the value that the
@@ -145,31 +230,159 @@ record updates, if another process updates a record between the time the
 first process has read the record and is writing an update to it then
 that write will fail. 
 
-To load the extension:
+To tell the extension which attribute to use to track the record version
+number tag a numeric attribute in the TableSchema:
+```java
+    @DynamoDbVersionAttribute
+    public Integer getVersion() {...};
+    public void setVersion(Integer version) {...};
+```
+Or using a StaticTableSchema:
 ```java
-MappedDatabase database = 
-  MappedDatabase.builder()
-                .dynamoDbClient(dynbamoDbClient)
-                .extendWith(VersionedRecordExtension.builder().build())
-                .build();
+    .addAttribute(Integer.class, a -> a.name("version")
+                                       .getter(Customer::getVersion)
+                                       .setter(Customer::setVersion)
+                                        // Apply the 'version' tag to the attribute
+                                       .tags(versionAttribute())                         
 ```
 
-To tell the extension which attribute to use to track the record version
-number tag a numeric attribute in the TableSchema with the version()
-AttributeTag:
+## Advanced table schema features
+### Explicitly include/exclude attributes in DDB mapping
+#### Excluding attributes
+Ignore attributes that should not participate in mapping to DDB
+Mark the attribute with the @DynamoDbIgnore annotation:
+```java
+private String internalKey;
+
+@DynamoDbIgnore
+public String getInternalKey() { return this.internalKey; }
+public void setInternalKey(String internalKey) { return this.internalKey = internalKey;}
+```
+#### Including attributes
+Change the name used to store an attribute in DBB by explicitly marking it with the
+ @DynamoDbAttribute annotation and supplying a different name:
+```java
+private String internalKey;
+
+@DynamoDbAttribute("renamedInternalKey")
+public String getInternalKey() { return this.internalKey; }
+public void setInternalKey(String internalKey) { return this.internalKey = internalKey;}
+```
+
+### Control attribute conversion
+By default, the table schema provides converters for all primitive and many common Java types
+through a default implementation of the AttributeConverterProvider interface. This behavior
+can be changed both at the attribute converter provider level as well as for a single attribute.
+
+#### Provide custom attribute converter providers
+You can provide a single AttributeConverterProvider or a chain of ordered AttributeConverterProviders
+through the @DynamoDbBean 'converterProviders' annotation. Any custom AttributeConverterProvider must extend the AttributeConverterProvider 
+interface. 
+
+Note that if you supply your own chain of attribute converter providers, you will override
+the default converter provider (DefaultAttributeConverterProvider) and must therefore include it in the chain if you wish to
+use its attribute converters. It's also possible to annotate the bean with an empty array `{}`, thus
+disabling the usage of any attribute converter providers including the default, in which case
+all attributes must have their own attribute converters (see below).
+
+Single converter provider:
 ```java
-    integerNumber("version", Customer::getVersion, Customer::setVersion)
-            .as(version())                               
+@DynamoDbBean(converterProviders = ConverterProvider1.class)
+public class Customer {
+
+}
+```
+
+Chain of converter providers ending with the default (least priority):
+```java
+@DynamoDbBean(converterProviders = {
+   ConverterProvider1.class, 
+   ConverterProvider2.class,
+   DefaultAttributeConverterProvider.class})
+public class Customer {
+
+}
+```
+
+In the same way, adding a chain of attribute converter providers directly to a StaticTableSchema:
+```java
+private static final StaticTableSchema<Customer> CUSTOMER_TABLE_SCHEMA =
+  StaticTableSchema.builder(Customer.class)
+    .newItemSupplier(Customer::new)
+    .addAttribute(String.class, a -> a.name("name")
+                                     a.getter(Customer::getName)
+                                     a.setter(Customer::setName))
+    .attributeConverterProviders(converterProvider1, converterProvider2)
+    .build();
+```
+
+#### Override the mapping of a single attribute
+Supply an AttributeConverter when creating the attribute to directly override any
+converters provided by the table schema AttributeConverterProviders. Note that you will 
+only add a custom converter for that attribute; other attributes, even of the same
+type, will not use that converter unless explicitly specified for those other attributes. 
+
+Example:
+```java
+@DynamoDbBean
+public class Customer {
+    private String name;
+
+    @DynamoDbConvertedBy(CustomAttributeConverter.class)
+    public String getName() { return this.name; }
+    public void setName(String name) { this.name = name;}
+}
+```
+For StaticTableSchema:
+```java
+private static final StaticTableSchema<Customer> CUSTOMER_TABLE_SCHEMA =
+  StaticTableSchema.builder(Customer.class)
+    .newItemSupplier(Customer::new)
+    .addAttribute(String.class, a -> a.name("name")
+                                     a.getter(Customer::getName)
+                                     a.setter(Customer::setName)
+                                     a.attributeConverter(customAttributeConverter))
+    .build();
 ```
 
-## Advanced scenarios
 ### Flat map attributes from another class
 If the attributes for your table record are spread across several
 different Java objects, either through inheritance or composition, the
 static TableSchema implementation gives you a method of flat mapping
 those attributes and rolling them up into a single schema.
 
-To accomplish this using inheritance:-
+#### Using inheritance
+To accomplish flat map using inheritance, the only requirement is that
+both classes are annotated as a DynamoDb bean:
+
+```java
+@DynamoDbBean
+public class Customer extends GenericRecord {
+    private String name;
+    private GenericRecord record;
+
+    public String getName() { return this.name; }
+    public void setName(String name) { this.name = name;}
+
+    public String getRecord() { return this.record; }
+    public void setRecord(String record) { this.record = record;}
+}
+
+@DynamoDbBean
+public abstract class GenericRecord {
+    private String id;
+    private String createdDate;
+
+    public String getId() { return this.id; }
+    public void setId(String id) { this.id = id;}
+
+    public String getCreatedDate() { return this.createdDate; }
+    public void setCreatedDate(String createdDate) { this.createdDate = createdDate;}
+}
+
+```
+
+For StaticTableSchema, use the 'extend' feature to achieve the same effect:
 ```java
 @Data
 public class Customer extends GenericRecord {
@@ -183,54 +396,97 @@ public abstract class GenericRecord {
 }
 
 private static final StaticTableSchema<GenericRecord> GENERIC_RECORD_SCHEMA =
-  TableSchema.builder()
-    .attributes(
-          // The partition key will be inherited by the top level mapper
-      string("id", GenericRecord::getId, GenericRecord::setId).as(primaryPartitionKey()),
-      string("created_date", GenericRecord::getCreatedDate, GenericRecord::setCreatedDate))
-    .build();
+  StaticTableSchema.builder(GenericRecord.class)
+       // The partition key will be inherited by the top level mapper
+      .addAttribute(String.class, a -> a.name("id")
+                                        .getter(GenericRecord::getId)
+                                        .setter(GenericRecord::setId)
+                                        .tags(primaryPartitionKey()))
+      .addAttribute(String.class, a -> a.name("created_date")
+                                        .getter(GenericRecord::getCreatedDate)
+                                        .setter(GenericRecord::setCreatedDate))
+     .build();
     
 private static final StaticTableSchema<Customer> CUSTOMER_TABLE_SCHEMA =
-  TableSchema.builder()
+  StaticTableSchema.builder(Customer.class)
     .newItemSupplier(Customer::new)
-    .attributes(
-      string("name", Customer::getName, Customer::setName))
+    .addAttribute(String.class, a -> a.name("name")
+                                      .getter(Customer::getName)
+                                      .setter(Customer::setName))
     .extend(GENERIC_RECORD_SCHEMA)     // All the attributes of the GenericRecord schema are added to Customer
     .build();
 ```
+#### Using composition
+
+Using composition, the @DynamoDbFlatten annotation flat maps the composite class:
+```java
+@DynamoDbBean
+public class Customer {
+    private String name;
+    private GenericRecord record;
+
+    public String getName() { return this.name; }
+    public void setName(String name) { this.name = name;}
+
+    @DynamoDbFlatten(dynamoDbBeanClass = GenericRecord.class)
+    public String getRecord() { return this.record; }
+    public void setRecord(String record) { this.record = record;}
+}
+
+@DynamoDbBean
+public class GenericRecord {
+    private String id;
+    private String createdDate;
+
+    public String getId() { return this.id; }
+    public void setId(String id) { this.id = id;}
+
+    public String getCreatedDate() { return this.createdDate; }
+    public void setCreatedDate(String createdDate) { this.createdDate = createdDate;}
+}
+```
+You can flatten as many different eligible classes as you like using the flatten annotation.
+The only constraints are that attributes must not have the same name when they are being rolled
+together, and there must never be more than one partition key, sort key or table name.
+
+Flat map composite classes using StaticTableSchema:
 
-Using composition:
 ```java
 @Data
 public class Customer{
   private String name;
   private GenericRecord recordMetadata;
+  //getters and setters for all attributes
 }
 
 @Data
 public class GenericRecord {
   private String id;
   private String createdDate;
+  //getters and setters for all attributes
 }
 
 private static final StaticTableSchema<GenericRecord> GENERIC_RECORD_SCHEMA =
-  TableSchema.builder()
-    .newItemSupplier(GenericRecord::new)
-    .attributes(
-      string("id", GenericRecord::getId, GenericRecord::setId).as(primaryPartitionKey()),
-      string("created_date", GenericRecord::getCreatedDate, GenericRecord::setCreatedDate))
-    .build();
+  StaticTableSchema.builder(GenericRecord.class)
+      .addAttribute(String.class, a -> a.name("id")
+                                        .getter(GenericRecord::getId)
+                                        .setter(GenericRecord::setId)
+                                        .tags(primaryPartitionKey()))
+      .addAttribute(String.class, a -> a.name("created_date")
+                                        .getter(GenericRecord::getCreatedDate)
+                                        .setter(GenericRecord::setCreatedDate))
+     .build();
     
 private static final StaticTableSchema<Customer> CUSTOMER_TABLE_SCHEMA =
-  TableSchema.builder()
+  StaticTableSchema.builder(Customer.class)
     .newItemSupplier(Customer::new)
-    .attributes(string("name", Customer::getName, Customer::setName))
+    .addAttribute(String.class, a -> a.name("name")
+                                      .getter(Customer::getName)
+                                      .setter(Customer::setName))
     // Because we are flattening a component object, we supply a getter and setter so the
     // mapper knows how to access it
-    .flatten(CUSTOMER_TABLE_SCHEMA, Customer::getRecordMetadata, Customer::setRecordMetadata)
+    .flatten(GENERIC_RECORD_SCHEMA, Customer::getRecordMetadata, Customer::setRecordMetadata)
     .build(); 
 ```
-You can flatten as many different eligible classes as you like using the
-builder pattern. The only constraints are that attributes must not have
-the same name when they are being rolled together, and there must never
-be more than one partition key, sort key or table name.
\ No newline at end of file
+Just as for annotations, you can flatten as many different eligible classes as you like using the
+builder pattern. 
\ No newline at end of file
diff --git a/services-custom/dynamodb-enhanced/pom.xml b/services-custom/dynamodb-enhanced/pom.xml
index 2350498312e2..b84f276edaba 100644
--- a/services-custom/dynamodb-enhanced/pom.xml
+++ b/services-custom/dynamodb-enhanced/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services-custom</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>dynamodb-enhanced</artifactId>
     <version>${awsjavasdk.version}-PREVIEW</version>
@@ -68,7 +68,7 @@
                 <configuration>
                     <archive>
                         <manifestEntries>
-                            <Automatic-Module-Name>software.amazon.awssdk.extensions.dynamodb.mappingclient</Automatic-Module-Name>
+                            <Automatic-Module-Name>software.amazon.awssdk.enhanced.dynamodb</Automatic-Module-Name>
                         </manifestEntries>
                     </archive>
                 </configuration>
@@ -90,6 +90,16 @@
     </build>
 
     <dependencies>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>aws-core</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>http-client-spi</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>sdk-core</artifactId>
@@ -115,6 +125,11 @@
             <artifactId>annotations</artifactId>
             <version>${awsjavasdk.version}</version>
         </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>utils</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -125,12 +140,22 @@
             <artifactId>hamcrest-all</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
             <version>${mockito2.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>com.github.tomakehurst</groupId>
+            <artifactId>wiremock</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>com.amazonaws</groupId>
             <artifactId>DynamoDBLocal</artifactId>
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/AttributeConverter.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/AttributeConverter.java
new file mode 100644
index 000000000000..bada6cc68834
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/AttributeConverter.java
@@ -0,0 +1,84 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb;
+
+import java.time.Instant;
+import software.amazon.awssdk.annotations.SdkPublicApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.InstantAsIntegerAttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.InstantAsStringAttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.StringAttributeConverter;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+
+/**
+ * Converts between a specific Java type and an {@link AttributeValue}.
+ *
+ * <p>
+ * Examples:
+ * <ul>
+ *     <li>The {@link StringAttributeConverter} converts a {@link String} into a DynamoDB string
+ *     ({@link software.amazon.awssdk.services.dynamodb.model.AttributeValue#s()}).</li>
+ *     <li>The {@link InstantAsIntegerAttributeConverter} converts an {@link Instant} into a DynamoDB number
+ *     ({@link software.amazon.awssdk.services.dynamodb.model.AttributeValue#n()}).</li>
+ *     <li>The {@link InstantAsStringAttributeConverter} converts an {@link Instant} into a DynamoDB string
+ *     ({@link software.amazon.awssdk.services.dynamodb.model.AttributeValue#s()}).</li>
+ * </ul>
+ */
+@SdkPublicApi
+@ThreadSafe
+public interface AttributeConverter<T> {
+    /**
+     * Convert the provided Java object into an {@link AttributeValue}. This will raise a {@link RuntimeException} if the
+     * conversion fails, or the input is null.
+     *
+     * <p>
+     * Example:
+     * <pre>
+     * {@code
+     * InstantAsStringAttributeConverter converter = InstantAsStringAttributeConverter.create();
+     * assertEquals(converter.transformFrom(Instant.EPOCH),
+     *              EnhancedAttributeValue.fromString("1970-01-01T00:00:00Z").toAttributeValue());
+     * }
+     * </pre>
+     */
+    AttributeValue transformFrom(T input);
+
+    /**
+     * Convert the provided {@link AttributeValue} into a Java object. This will raise a {@link RuntimeException} if the
+     * conversion fails, or the input is null.
+     *
+     * <p>
+     * <pre>
+     * Example:
+     * {@code
+     * InstantAsStringAttributeConverter converter = InstantAsStringAttributeConverter.create();
+     * assertEquals(converter.transformTo(EnhancedAttributeValue.fromString("1970-01-01T00:00:00Z").toAttributeValue()),
+     *              Instant.EPOCH);
+     * <pre>
+     */
+    T transformTo(AttributeValue input);
+
+    /**
+     * The type supported by this converter.
+     */
+    EnhancedType<T> type();
+
+    /**
+     * The {@link AttributeValueType} that a converter stores and reads values
+     * from DynamoDB via the {@link AttributeValue} class.
+     */
+    AttributeValueType attributeValueType();
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/AttributeConverterProvider.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/AttributeConverterProvider.java
new file mode 100644
index 000000000000..a20608535895
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/AttributeConverterProvider.java
@@ -0,0 +1,45 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb;
+
+import software.amazon.awssdk.annotations.SdkPublicApi;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.ConverterProviderResolver;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+
+/**
+ * Interface for determining the {@link AttributeConverter} to use for
+ * converting a given {@link EnhancedType}.
+ */
+@SdkPublicApi
+public interface AttributeConverterProvider {
+
+    /**
+     * Finds a {@link AttributeConverter} for converting an object with a type
+     * specified by a {@link EnhancedType} to a {@link AttributeValue} and back.
+     *
+     * @param enhancedType The type of the object to be converted
+     * @return {@link AttributeConverter} for converting the given type.
+     */
+    <T> AttributeConverter<T> converterFor(EnhancedType<T> enhancedType);
+
+    /**
+     * Returns a default implementation of AttributeConverterProvider with all
+     * standard Java type converters included.
+     */
+    static AttributeConverterProvider defaultProvider() {
+        return ConverterProviderResolver.defaultConverterProvider();
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/core/AttributeValueType.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/AttributeValueType.java
similarity index 83%
rename from services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/core/AttributeValueType.java
rename to services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/AttributeValueType.java
index 953a826ef2ec..13e6bdb4d174 100644
--- a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/core/AttributeValueType.java
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/AttributeValueType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.awssdk.extensions.dynamodb.mappingclient.core;
+package software.amazon.awssdk.enhanced.dynamodb;
 
 import software.amazon.awssdk.annotations.SdkPublicApi;
 import software.amazon.awssdk.services.dynamodb.model.ScalarAttributeType;
@@ -28,7 +28,8 @@ public enum AttributeValueType {
     N(ScalarAttributeType.N),        // number
     NS,                              // number set
     S(ScalarAttributeType.S),        // string
-    SS;                              // string set
+    SS,                              // string set
+    NULL;                            // null
 
     private final ScalarAttributeType scalarAttributeType;
 
@@ -40,7 +41,7 @@ public enum AttributeValueType {
         this.scalarAttributeType = scalarAttributeType;
     }
 
-    public ScalarAttributeType getScalarAttributeType() {
+    public ScalarAttributeType scalarAttributeType() {
         return scalarAttributeType;
     }
 }
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/DefaultAttributeConverterProvider.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/DefaultAttributeConverterProvider.java
new file mode 100644
index 000000000000..1935d159cde9
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/DefaultAttributeConverterProvider.java
@@ -0,0 +1,258 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import software.amazon.awssdk.annotations.Immutable;
+import software.amazon.awssdk.annotations.SdkPublicApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.PrimitiveConverter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.StringConverter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.StringConverterProvider;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.AtomicBooleanAttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.AtomicIntegerAttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.AtomicLongAttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.BigDecimalAttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.BigIntegerAttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.BooleanAttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.ByteArrayAttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.ByteAttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.CharSequenceAttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.CharacterArrayAttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.CharacterAttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.DocumentAttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.DoubleAttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.DurationAttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.EnumAttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.FloatAttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.InstantAsIntegerAttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.IntegerAttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.ListAttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.LocalDateAttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.LocalDateTimeAttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.LocalTimeAttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.LongAttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.MapAttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.MonthDayAttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.OffsetDateTimeAsStringAttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.OptionalDoubleAttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.OptionalIntAttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.OptionalLongAttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.PeriodAttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.SdkBytesAttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.SetAttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.ShortAttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.StringAttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.StringBufferAttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.StringBuilderAttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.UriAttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.UrlAttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.UuidAttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.ZoneIdAttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.ZoneOffsetAttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.ZonedDateTimeAsStringAttributeConverter;
+import software.amazon.awssdk.utils.Logger;
+import software.amazon.awssdk.utils.Validate;
+
+/**
+ * This class is the default attribute converter provider in the DDB Enhanced library. When instantiated
+ * using the constructor {@link #DefaultAttributeConverterProvider()} or the {@link #create()} method, it's loaded
+ * with the currently supported attribute converters in the library.
+ * <p>
+ * Given an input, the method {@link #converterFor(EnhancedType)} will identify a converter that can convert the
+ * specific Java type and invoke it. If a converter cannot be found, it will invoke a "parent" converter,
+ * which would be expected to be able to convert the value (or throw an exception).
+ */
+@SdkPublicApi
+@ThreadSafe
+@Immutable
+public final class DefaultAttributeConverterProvider implements AttributeConverterProvider {
+    private static final Logger log = Logger.loggerFor(DefaultAttributeConverterProvider.class);
+
+    private final ConcurrentHashMap<EnhancedType<?>, AttributeConverter<?>> converterCache =
+        new ConcurrentHashMap<>();
+
+    private DefaultAttributeConverterProvider(Builder builder) {
+        // Converters are used in the REVERSE order of how they were added to the builder.
+        for (int i = builder.converters.size() - 1; i >= 0; i--) {
+            AttributeConverter<?> converter = builder.converters.get(i);
+            converterCache.put(converter.type(), converter);
+
+            if (converter instanceof PrimitiveConverter) {
+                PrimitiveConverter<?> primitiveConverter = (PrimitiveConverter<?>) converter;
+                converterCache.put(primitiveConverter.primitiveType(), converter);
+            }
+        }
+    }
+
+    /**
+     * Returns an attribute converter provider with all default converters set.
+     */
+    public DefaultAttributeConverterProvider() {
+        this(getDefaultBuilder());
+    }
+
+    /**
+     * Returns an attribute converter provider with all default converters set.
+     */
+    public static DefaultAttributeConverterProvider create() {
+        return getDefaultBuilder().build();
+    }
+
+
+    /**
+     * Equivalent to {@code builder(EnhancedType.of(Object.class))}.
+     */
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    /**
+     * Find a converter that matches the provided type. If one cannot be found, throw an exception.
+     */
+    @Override
+    public <T> AttributeConverter<T> converterFor(EnhancedType<T> type) {
+        return findConverter(type).orElseThrow(() -> new IllegalStateException("Converter not found for " + type));
+    }
+
+    /**
+     * Find a converter that matches the provided type. If one cannot be found, return empty.
+     */
+    @SuppressWarnings("unchecked")
+    private <T> Optional<AttributeConverter<T>> findConverter(EnhancedType<T> type) {
+        log.debug(() -> "Loading converter for " + type + ".");
+
+        AttributeConverter<T> converter = (AttributeConverter<T>) converterCache.get(type);
+        if (converter != null) {
+            return Optional.of(converter);
+        }
+
+        if (type.rawClass().isAssignableFrom(Map.class)) {
+            converter = createMapConverter(type);
+        } else if (type.rawClass().isAssignableFrom(Set.class)) {
+            converter = createSetConverter(type);
+        } else if (type.rawClass().isAssignableFrom(List.class)) {
+            EnhancedType<T> innerType = (EnhancedType<T>) type.rawClassParameters().get(0);
+            AttributeConverter<?> innerConverter = findConverter(innerType)
+                .orElseThrow(() -> new IllegalStateException("Converter not found for " + type));
+            return Optional.of((AttributeConverter<T>) ListAttributeConverter.create(innerConverter));
+        } else if (type.rawClass().isEnum()) {
+            return Optional.of(EnumAttributeConverter.create(((EnhancedType<? extends Enum>) type).rawClass()));
+        }
+
+        if (type.tableSchema().isPresent()) {
+            converter = DocumentAttributeConverter.create(type.tableSchema().get(), type);
+        }
+
+        if (converter != null && shouldCache(type.rawClass())) {
+            this.converterCache.put(type, converter);
+        }
+
+        return Optional.ofNullable(converter);
+    }
+
+    private boolean shouldCache(Class<?> type) {
+        // Do not cache anonymous classes, to prevent memory leaks.
+        return !type.isAnonymousClass();
+    }
+
+    @SuppressWarnings("unchecked")
+    private <T> AttributeConverter<T> createMapConverter(EnhancedType<T> type) {
+        EnhancedType<?> keyType = type.rawClassParameters().get(0);
+        EnhancedType<T> valueType = (EnhancedType<T>) type.rawClassParameters().get(1);
+
+        StringConverter<?> keyConverter = StringConverterProvider.defaultProvider().converterFor(keyType);
+        AttributeConverter<?> valueConverter = findConverter(valueType)
+            .orElseThrow(() -> new IllegalStateException("Converter not found for " + type));
+
+        return (AttributeConverter<T>) MapAttributeConverter.mapConverter(keyConverter, valueConverter);
+    }
+
+    @SuppressWarnings("unchecked")
+    private <T> AttributeConverter<T> createSetConverter(EnhancedType<T> type) {
+        EnhancedType<T> innerType = (EnhancedType<T>) type.rawClassParameters().get(0);
+        AttributeConverter<?> innerConverter = findConverter(innerType)
+            .orElseThrow(() -> new IllegalStateException("Converter not found for " + type));
+
+        return (AttributeConverter<T>) SetAttributeConverter.setConverter(innerConverter);
+    }
+
+    private static Builder getDefaultBuilder() {
+        return DefaultAttributeConverterProvider.builder()
+                                                .addConverter(AtomicBooleanAttributeConverter.create())
+                                                .addConverter(AtomicIntegerAttributeConverter.create())
+                                                .addConverter(AtomicLongAttributeConverter.create())
+                                                .addConverter(BigDecimalAttributeConverter.create())
+                                                .addConverter(BigIntegerAttributeConverter.create())
+                                                .addConverter(BooleanAttributeConverter.create())
+                                                .addConverter(ByteArrayAttributeConverter.create())
+                                                .addConverter(ByteAttributeConverter.create())
+                                                .addConverter(CharacterArrayAttributeConverter.create())
+                                                .addConverter(CharacterAttributeConverter.create())
+                                                .addConverter(CharSequenceAttributeConverter.create())
+                                                .addConverter(DoubleAttributeConverter.create())
+                                                .addConverter(DurationAttributeConverter.create())
+                                                .addConverter(FloatAttributeConverter.create())
+                                                .addConverter(InstantAsIntegerAttributeConverter.create())
+                                                .addConverter(IntegerAttributeConverter.create())
+                                                .addConverter(LocalDateAttributeConverter.create())
+                                                .addConverter(LocalDateTimeAttributeConverter.create())
+                                                .addConverter(LocalTimeAttributeConverter.create())
+                                                .addConverter(LongAttributeConverter.create())
+                                                .addConverter(MonthDayAttributeConverter.create())
+                                                .addConverter(OffsetDateTimeAsStringAttributeConverter.create())
+                                                .addConverter(OptionalDoubleAttributeConverter.create())
+                                                .addConverter(OptionalIntAttributeConverter.create())
+                                                .addConverter(OptionalLongAttributeConverter.create())
+                                                .addConverter(PeriodAttributeConverter.create())
+                                                .addConverter(SdkBytesAttributeConverter.create())
+                                                .addConverter(ShortAttributeConverter.create())
+                                                .addConverter(StringAttributeConverter.create())
+                                                .addConverter(StringBufferAttributeConverter.create())
+                                                .addConverter(StringBuilderAttributeConverter.create())
+                                                .addConverter(UriAttributeConverter.create())
+                                                .addConverter(UrlAttributeConverter.create())
+                                                .addConverter(UuidAttributeConverter.create())
+                                                .addConverter(ZonedDateTimeAsStringAttributeConverter.create())
+                                                .addConverter(ZoneIdAttributeConverter.create())
+                                                .addConverter(ZoneOffsetAttributeConverter.create());
+    }
+
+    /**
+     * A builder for configuring and creating {@link DefaultAttributeConverterProvider}s.
+     */
+    public static class Builder {
+        private List<AttributeConverter<?>> converters = new ArrayList<>();
+
+        private Builder() {
+        }
+
+        public Builder addConverter(AttributeConverter<?> converter) {
+            Validate.paramNotNull(converter, "converter");
+            this.converters.add(converter);
+            return this;
+        }
+
+        public DefaultAttributeConverterProvider build() {
+            return new DefaultAttributeConverterProvider(this);
+        }
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/Document.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/Document.java
new file mode 100644
index 000000000000..db7c6493156a
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/Document.java
@@ -0,0 +1,36 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb;
+
+import software.amazon.awssdk.annotations.SdkPublicApi;
+
+/**
+ * A document representing a table item in the form of a map containing attributes and values.
+ * <p>
+ * Use the {@link #getItem(MappedTableResource)} method to transform the collection of attributes into a typed item.
+ */
+@SdkPublicApi
+public interface Document {
+
+    /**
+     * Get the table item associated with the table schema in the mapped table resource.
+     *
+     * @param mappedTableResource the mapped table resource this item was retrieved from
+     * @param <T> the type of items in the mapped table resource
+     * @return the item constructed from the document
+     */
+    <T> T getItem(MappedTableResource<T> mappedTableResource);
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/DynamoDbAsyncIndex.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/DynamoDbAsyncIndex.java
new file mode 100644
index 000000000000..a4c2bce7d9b8
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/DynamoDbAsyncIndex.java
@@ -0,0 +1,241 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb;
+
+import java.util.function.Consumer;
+import software.amazon.awssdk.annotations.SdkPublicApi;
+import software.amazon.awssdk.core.async.SdkPublisher;
+import software.amazon.awssdk.enhanced.dynamodb.model.Page;
+import software.amazon.awssdk.enhanced.dynamodb.model.QueryConditional;
+import software.amazon.awssdk.enhanced.dynamodb.model.QueryEnhancedRequest;
+import software.amazon.awssdk.enhanced.dynamodb.model.ScanEnhancedRequest;
+
+/**
+ * Asynchronous interface for running commands against an object that is linked to a specific DynamoDb secondary index
+ * and knows how to map records from the table that index is linked to into a modelled object.
+ * <p>
+ * By default, all command methods throw an {@link UnsupportedOperationException} to prevent interface extensions from breaking
+ * implementing classes.
+ *
+ * @param <T> The type of the modelled object.
+ */
+@SdkPublicApi
+public interface DynamoDbAsyncIndex<T> {
+
+    /**
+     * Executes a query against a secondary index using a {@link QueryConditional} expression to retrieve a list of
+     * items matching the given conditions.
+     * <p>
+     * The result is accessed through iterable pages (see {@link Page}) in an interactive way; each time a
+     * result page is retrieved, a query call is made to DynamoDb to get those entries. If no matches are found,
+     * the resulting iterator will contain an empty page. Results are sorted by sort key value in
+     * ascending order by default; this behavior can be overridden in the {@link QueryEnhancedRequest}.
+     * <p>
+     * The additional configuration parameters that the enhanced client supports are defined
+     * in the {@link QueryEnhancedRequest}.
+     * <p>
+     * This operation calls the low-level DynamoDB API Query operation. Consult the Query documentation for
+     * further details and constraints.
+     * <p>
+     * Example:
+     * <pre>
+     * {@code
+     *
+     * QueryConditional queryConditional = QueryConditional.keyEqualTo(Key.builder().partitionValue("id-value").build());
+     * SdkPublisher<Page<MyItem>> publisher = mappedIndex.query(QueryEnhancedRequest.builder()
+     *                                                                              .queryConditional(queryConditional)
+     *                                                                              .build());
+     * }
+     * </pre>
+     *
+     * @param request A {@link QueryEnhancedRequest} defining the query conditions and how
+     * to handle the results.
+     * @return a publisher {@link SdkPublisher} with paginated results (see {@link Page}).
+     */
+    default SdkPublisher<Page<T>> query(QueryEnhancedRequest request) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Executes a query against a secondary index using a {@link QueryConditional} expression to retrieve a list of
+     * items matching the given conditions.
+     * <p>
+     * The result is accessed through iterable pages (see {@link Page}) in an interactive way; each time a
+     * result page is retrieved, a query call is made to DynamoDb to get those entries. If no matches are found,
+     * the resulting iterator will contain an empty page. Results are sorted by sort key value in
+     * ascending order by default; this behavior can be overridden in the {@link QueryEnhancedRequest}.
+     * <p>
+     * The additional configuration parameters that the enhanced client supports are defined
+     * in the {@link QueryEnhancedRequest}.
+     * <p>
+     * This operation calls the low-level DynamoDB API Query operation. Consult the Query documentation for
+     * further details and constraints.
+     * <p>
+     * <b>Note:</b> This is a convenience method that creates an instance of the request builder avoiding the need to create one
+     * manually via {@link QueryEnhancedRequest#builder()}.
+     * <p>
+     * Example:
+     * <pre>
+     * {@code
+     *
+     * SdkPublisher<Page<MyItem>> publisher =
+     *     mappedIndex.query(r -> r.queryConditional(QueryConditional.keyEqualTo(k -> k.partitionValue("id-value"))));
+     * }
+     * </pre>
+     *
+     * @param requestConsumer A {@link Consumer} of {@link QueryEnhancedRequest} defining the query conditions and how to
+     * handle the results.
+     * @return a publisher {@link SdkPublisher} with paginated results (see {@link Page}).
+     */
+    default SdkPublisher<Page<T>> query(Consumer<QueryEnhancedRequest.Builder> requestConsumer) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Executes a query against the secondary index of the table using a {@link QueryConditional} expression to retrieve
+     * a list of items matching the given conditions.
+     * <p>
+     * The result is accessed through iterable pages (see {@link Page}) in an interactive way; each time a
+     * result page is retrieved, a query call is made to DynamoDb to get those entries. If no matches are found,
+     * the resulting iterator will contain an empty page. Results are sorted by sort key value in
+     * ascending order.
+     * <p>
+     * This operation calls the low-level DynamoDB API Query operation. Consult the Query documentation for
+     * further details and constraints.
+     * <p>
+     * Example:
+     * <pre>
+     * {@code
+     *
+     * SdkPublisher<Page<MyItem>> results =
+     *     mappedIndex.query(QueryConditional.keyEqualTo(Key.builder().partitionValue("id-value").build()));
+     * }
+     * </pre>
+     *
+     * @param queryConditional A {@link QueryConditional} defining the matching criteria for records to be queried.
+     * @return a publisher {@link SdkPublisher} with paginated results (see {@link Page}).
+     */
+    default SdkPublisher<Page<T>> query(QueryConditional queryConditional) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Scans the table against a secondary index and retrieves all items.
+     * <p>
+     * The result is accessed through iterable pages (see {@link Page}) in an interactive way; each time a
+     * result page is retrieved, a scan call is made to DynamoDb to get those entries. If no matches are found,
+     * the resulting iterator will contain an empty page.
+     * <p>
+     * The additional configuration parameters that the enhanced client supports are defined
+     * in the {@link ScanEnhancedRequest}.
+     * <p>
+     * Example:
+     * <pre>
+     * {@code
+     *
+     * SdkPublisher<Page<MyItem>> publisher = mappedTable.scan(ScanEnhancedRequest.builder().consistentRead(true).build());
+     * }
+     * </pre>
+     *
+     * @param request A {@link ScanEnhancedRequest} defining how to handle the results.
+     * @return a publisher {@link SdkPublisher} with paginated results (see {@link Page}).
+     */
+    default SdkPublisher<Page<T>> scan(ScanEnhancedRequest request) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Scans the table against a secondary index and retrieves all items.
+     * <p>
+     * The result is accessed through iterable pages (see {@link Page}) in an interactive way; each time a
+     * result page is retrieved, a scan call is made to DynamoDb to get those entries. If no matches are found,
+     * the resulting iterator will contain an empty page.
+     * <p>
+     * The additional configuration parameters that the enhanced client supports are defined
+     * in the {@link ScanEnhancedRequest}.
+     * <p>
+     * <b>Note:</b> This is a convenience method that creates an instance of the request builder avoiding the need to create one
+     * manually via {@link ScanEnhancedRequest#builder()}.
+     * <p>
+     * Example:
+     * <pre>
+     * {@code
+     *
+     * SdkPublisher<Page<MyItem>> publisher = mappedTable.scan(r -> r.limit(5));
+     * }
+     * </pre>
+     *
+     * @param requestConsumer A {@link Consumer} of {@link ScanEnhancedRequest} defining the query conditions and how to
+     * handle the results.
+     * @return a publisher {@link SdkPublisher} with paginated results (see {@link Page}).
+     */
+    default SdkPublisher<Page<T>> scan(Consumer<ScanEnhancedRequest.Builder> requestConsumer) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Scans the table against a secondary index and retrieves all items using default settings.
+     * <p>
+     * The result is accessed through iterable pages (see {@link Page}) in an interactive way; each time a
+     * result page is retrieved, a scan call is made to DynamoDb to get those entries. If no matches are found,
+     * the resulting iterator will contain an empty page.
+     * <p>
+     * Example:
+     * <pre>
+     * {@code
+     *
+     * SdkPublisher<Page<MyItem>> publisher = mappedTable.scan();
+     * }
+     * </pre>
+     *
+     * @return a publisher {@link SdkPublisher} with paginated results (see {@link Page}).
+     */
+    default SdkPublisher<Page<T>> scan() {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Gets the {@link DynamoDbEnhancedClientExtension} associated with this mapped resource.
+     * @return The {@link DynamoDbEnhancedClientExtension} associated with this mapped resource.
+     */
+    DynamoDbEnhancedClientExtension mapperExtension();
+
+    /**
+     * Gets the {@link TableSchema} object that this mapped table was built with.
+     * @return The {@link TableSchema} object for this mapped table.
+     */
+    TableSchema<T> tableSchema();
+
+    /**
+     * Gets the physical table name that operations performed by this object will be executed against.
+     * @return The physical table name.
+     */
+    String tableName();
+
+    /**
+     * Gets the physical secondary index name that operations performed by this object will be executed against.
+     * @return The physical secondary index name.
+     */
+    String indexName();
+
+    /**
+     * Creates a {@link Key} object from a modelled item. This key can be used in query conditionals and get
+     * operations to locate a specific record.
+     * @param item The item to extract the key fields from.
+     * @return A key that has been initialized with the index values extracted from the modelled object.
+     */
+    Key keyFrom(T item);
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/DynamoDbAsyncTable.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/DynamoDbAsyncTable.java
new file mode 100644
index 000000000000..885fde63d075
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/DynamoDbAsyncTable.java
@@ -0,0 +1,669 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb;
+
+import java.util.concurrent.CompletableFuture;
+import java.util.function.Consumer;
+import software.amazon.awssdk.annotations.SdkPublicApi;
+import software.amazon.awssdk.enhanced.dynamodb.model.CreateTableEnhancedRequest;
+import software.amazon.awssdk.enhanced.dynamodb.model.DeleteItemEnhancedRequest;
+import software.amazon.awssdk.enhanced.dynamodb.model.GetItemEnhancedRequest;
+import software.amazon.awssdk.enhanced.dynamodb.model.Page;
+import software.amazon.awssdk.enhanced.dynamodb.model.PagePublisher;
+import software.amazon.awssdk.enhanced.dynamodb.model.PutItemEnhancedRequest;
+import software.amazon.awssdk.enhanced.dynamodb.model.QueryConditional;
+import software.amazon.awssdk.enhanced.dynamodb.model.QueryEnhancedRequest;
+import software.amazon.awssdk.enhanced.dynamodb.model.ScanEnhancedRequest;
+import software.amazon.awssdk.enhanced.dynamodb.model.UpdateItemEnhancedRequest;
+import software.amazon.awssdk.services.dynamodb.DynamoDbAsyncClient;
+
+/**
+ * Asynchronous interface for running commands against an object that is linked to a specific DynamoDb table resource
+ * and therefore knows how to map records from that table into a modelled object.
+ * <p>
+ * By default, all command methods throw an {@link UnsupportedOperationException} to prevent interface extensions from breaking
+ * implementing classes.
+ *
+ * @param <T> The type of the modelled object.
+ */
+@SdkPublicApi
+public interface DynamoDbAsyncTable<T> extends MappedTableResource<T> {
+    /**
+     * Returns a mapped index that can be used to execute commands against a secondary index belonging to the table
+     * being mapped by this object. Note that only a subset of the commands that work against a table will work
+     * against a secondary index.
+     *
+     * @param indexName The name of the secondary index to build the command interface for.
+     * @return An {@link DynamoDbAsyncIndex} object that can be used to execute database commands against.
+     */
+    DynamoDbAsyncIndex<T> index(String indexName);
+
+    /**
+     * Creates a new table in DynamoDb with the name and schema already defined for this DynamoDbTable
+     * together with additional parameters specified in the supplied request object, {@link CreateTableEnhancedRequest}.
+     * <p>
+     * Use {@link DynamoDbEnhancedClient#table(String, TableSchema)} to define the mapped table resource.
+     * <p>
+     * This operation calls the low-level DynamoDB API CreateTable operation. Note that this is an asynchronous operation and that
+     * the table may not immediately be available for writes and reads.
+     * Consult the CreateTable documentation for further details and constraints.
+     * <p>
+     * Example:
+     * <pre>
+     * {@code
+     *
+     * ProvisionedThroughput provisionedThroughput = ProvisionedThroughput.builder()
+     *                                                                    .readCapacityUnits(50L)
+     *                                                                    .writeCapacityUnits(50L)
+     *                                                                    .build();
+     * mappedTable.createTable(CreateTableEnhancedRequest.builder()
+     *                                                   .provisionedThroughput(provisionedThroughput)
+     *                                                   .build())
+     *            .join();
+     * }
+     * </pre>
+     *
+     * @param request A {@link CreateTableEnhancedRequest} containing optional parameters for table creation.
+     * @return a {@link CompletableFuture} of {@link Void}.
+     */
+    default CompletableFuture<Void> createTable(CreateTableEnhancedRequest request) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Creates a new table in DynamoDb with the name and schema already defined for this DynamoDbTable
+     * together with additional parameters specified in the supplied request object, {@link CreateTableEnhancedRequest}.
+     * <p>
+     * Use {@link DynamoDbEnhancedClient#table(String, TableSchema)} to define the mapped table resource.
+     * <p>
+     * This operation calls the low-level DynamoDB API CreateTable operation. Note that this is an asynchronous operation and that
+     * the table may not immediately be available for writes and reads.
+     * Consult the CreateTable documentation for further details and constraints.
+     * <p>
+     * <b>Note:</b> This is a convenience method that creates an instance of the request builder avoiding the need to create one
+     * manually via {@link CreateTableEnhancedRequest#builder()}.
+     * <p>
+     * Example:
+     * <pre>
+     * {@code
+     *
+     * ProvisionedThroughput provisionedThroughput = ProvisionedThroughput.builder()
+     *                                                                    .readCapacityUnits(50L)
+     *                                                                    .writeCapacityUnits(50L)
+     *                                                                    .build();
+     * mappedTable.createTable(r -> r.provisionedThroughput(provisionedThroughput)).join();
+     * }
+     * </pre>
+     *
+     * @param requestConsumer A {@link Consumer} of {@link CreateTableEnhancedRequest.Builder} containing optional parameters
+     * for table creation.
+     * @return a {@link CompletableFuture} of {@link Void}.
+     */
+    default CompletableFuture<Void> createTable(Consumer<CreateTableEnhancedRequest.Builder> requestConsumer) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Creates a new table in DynamoDb with the name and schema already defined for this DynamoDbTable.
+     * <p>
+     * Use {@link DynamoDbEnhancedClient#table(String, TableSchema)} to define the mapped table resource.
+     * <p>
+     * This operation calls the low-level DynamoDB API CreateTable operation. Note that this is an asynchronous operation and that
+     * the table may not immediately be available for writes and reads. Currently, there is no mechanism supported within this
+     * library to wait for/check the status of a created table. You must provide this functionality yourself.
+     * Consult the CreateTable documentation for further details and constraints.
+     * <p>
+     * Example:
+     * <pre>
+     * {@code
+     *
+     * mappedTable.createTable().join();
+     * }
+     * </pre>
+     *
+     * @return a {@link CompletableFuture} of {@link Void}.
+     */
+    default CompletableFuture<Void> createTable() {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Deletes a single item from the mapped table using a supplied primary {@link Key}.
+     * <p>
+     * The additional configuration parameters that the enhanced client supports are defined
+     * in the {@link DeleteItemEnhancedRequest}.
+     * <p>
+     * This operation calls the low-level DynamoDB API DeleteItem operation. Consult the DeleteItem documentation for
+     * further details and constraints.
+     * <p>
+     * Example:
+     * <pre>
+     * {@code
+     *
+     * MyItem previouslyPersistedItem = mappedTable.delete(DeleteItemEnhancedRequest.builder().key(key).build()).join();
+     * }
+     * </pre>
+     *
+     * @param request A {@link DeleteItemEnhancedRequest} with key and optional directives for deleting an item from the table.
+     * @return a {@link CompletableFuture} of the item that was persisted in the database before it was deleted.
+     */
+    default CompletableFuture<T> deleteItem(DeleteItemEnhancedRequest request) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Deletes a single item from the mapped table using a supplied primary {@link Key}.
+     * <p>
+     * The additional configuration parameters that the enhanced client supports are defined
+     * in the {@link DeleteItemEnhancedRequest}.
+     * <p>
+     * This operation calls the low-level DynamoDB API DeleteItem operation. Consult the DeleteItem documentation for
+     * further details and constraints.
+     * <p>
+     * <b>Note:</b> This is a convenience method that creates an instance of the request builder avoiding the need to create one
+     * manually via {@link DeleteItemEnhancedRequest#builder()}.
+     * <p>
+     * Example:
+     * <pre>
+     * {@code
+     *
+     * MyItem previouslyPersistedItem = mappedTable.delete(r -> r.key(key)).join();
+     * }
+     * </pre>
+     *
+     * @param requestConsumer A {@link Consumer} of {@link DeleteItemEnhancedRequest} with key and
+     * optional directives for deleting an item from the table.
+     * @return a {@link CompletableFuture} of the item that was persisted in the database before it was deleted.
+     */
+    default CompletableFuture<T> deleteItem(Consumer<DeleteItemEnhancedRequest.Builder> requestConsumer) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Deletes a single item from the mapped table using a supplied primary {@link Key}.
+     * <p>
+     * This operation calls the low-level DynamoDB API DeleteItem operation. Consult the DeleteItem documentation for
+     * further details and constraints.
+     * <p>
+     * Example:
+     * <pre>
+     * {@code
+     *
+     * MyItem previouslyPersistedItem = mappedTable.delete(key).join;
+     * }
+     * </pre>
+     *
+     * @param key A {@link Key} that will be used to match a specific record to delete from the database table.
+     * @return a {@link CompletableFuture} of the item that was persisted in the database before it was deleted.
+     */
+    default CompletableFuture<T> deleteItem(Key key) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Deletes a single item from the mapped table using just the key of a supplied modelled 'key item' object.
+     * <p>
+     * This operation calls the low-level DynamoDB API DeleteItem operation. Consult the DeleteItem documentation for
+     * further details and constraints.
+     * <p>
+     * Example:
+     * <pre>
+     * {@code
+     *
+     * MyItem previouslyPersistedItem = mappedTable.deleteItem(keyItem).join();
+     * }
+     * </pre>
+     *
+     * @param keyItem A modelled item with the primary key fields set that will be used to match a specific record to
+     *                delete from the database table.
+     * @return a {@link CompletableFuture} of the item that was persisted in the database before it was deleted.
+     */
+    default CompletableFuture<T> deleteItem(T keyItem) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Retrieves a single item from the mapped table using a supplied primary {@link Key}.
+     * <p>
+     * The additional configuration parameters that the enhanced client supports are defined
+     * in the {@link GetItemEnhancedRequest}.
+     * <p>
+     * This operation calls the low-level DynamoDB API GetItem operation. Consult the GetItem documentation for
+     * further details and constraints.
+     * <p>
+     * Example:
+     * <pre>
+     * {@code
+     *
+     * MyItem item = mappedTable.getItem(GetItemEnhancedRequest.builder().key(key).build()).join();
+     * }
+     * </pre>
+     *
+     * @param request A {@link GetItemEnhancedRequest} with key and optional directives for retrieving an item from the table.
+     * @return a {@link CompletableFuture} of the item that was persisted in the database before it was deleted.
+     */
+    default CompletableFuture<T> getItem(GetItemEnhancedRequest request) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Retrieves a single item from the mapped table using a supplied primary {@link Key}.
+     * <p>
+     * The additional configuration parameters that the enhanced client supports are defined
+     * in the {@link GetItemEnhancedRequest}.
+     * <p>
+     * This operation calls the low-level DynamoDB API GetItem operation. Consult the GetItem documentation for
+     * further details and constraints.
+     * <p>
+     * <b>Note:</b> This is a convenience method that creates an instance of the request builder avoiding the need to create one
+     * manually via {@link GetItemEnhancedRequest#builder()}.
+     * <p>
+     * Example:
+     * <pre>
+     * {@code
+     *
+     * MyItem item = mappedTable.getItem(r -> r.key(key)).join();
+     * }
+     * </pre>
+     *
+     * @param requestConsumer A {@link Consumer} of {@link GetItemEnhancedRequest.Builder} with key and optional directives
+     * for retrieving an item from the table.
+     * @return a {@link CompletableFuture} of the retrieved item
+     */
+    default CompletableFuture<T> getItem(Consumer<GetItemEnhancedRequest.Builder> requestConsumer) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Retrieves a single item from the mapped table using a supplied primary {@link Key}.
+     * <p>
+     * This operation calls the low-level DynamoDB API GetItem operation. Consult the GetItem documentation for
+     * further details and constraints.
+     * <p>
+     * Example:
+     * <pre>
+     * {@code
+     *
+     * MyItem item = mappedTable.getItem(key).join();
+     * }
+     * </pre>
+     *
+     * @param key A {@link Key} that will be used to match a specific record to retrieve from the database table.
+     * @return a {@link CompletableFuture} of the retrieved item
+     */
+    default CompletableFuture<T> getItem(Key key) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Retrieves a single item from the mapped table using just the key of a supplied modelled 'key item'.
+     * <p>
+     * This operation calls the low-level DynamoDB API GetItem operation. Consult the GetItem documentation for
+     * further details and constraints.
+     * <p>
+     * Example:
+     * <pre>
+     * {@code
+     *
+     * MyItem item = mappedTable.getItem(keyItem).join();
+     * }
+     * </pre>
+     *
+     * @param keyItem A modelled item with the primary key fields set that will be used to match a specific record to
+     *                retrieve from the database table.
+     * @return a {@link CompletableFuture} of the retrieved item
+     */
+    default CompletableFuture<T> getItem(T keyItem) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Executes a query against the primary index of the table using a {@link QueryConditional} expression to retrieve a list of
+     * items matching the given conditions.
+     * <p>
+     * The return type is a custom publisher that can be subscribed to request a stream of {@link Page}s or
+     * a stream of items across all pages. Results are sorted by sort key value in
+     * ascending order by default; this behavior can be overridden in the {@link QueryEnhancedRequest}.
+     * <p>
+     * The additional configuration parameters that the enhanced client supports are defined
+     * in the {@link QueryEnhancedRequest}.
+     * <p>
+     * This operation calls the low-level DynamoDB API Query operation. Consult the Query documentation
+     * {@link DynamoDbAsyncClient#queryPaginator} for further details and constraints.
+     * <p>
+     * Example:
+     * <p>
+     * 1) Subscribing to {@link Page}s
+     * <pre>
+     * {@code
+     *
+     * QueryConditional queryConditional = QueryConditional.keyEqualTo(Key.builder().partitionValue("id-value").build());
+     * PagePublisher<MyItem> publisher = mappedTable.query(QueryEnhancedRequest.builder()
+     *                                                                         .queryConditional(queryConditional)
+     *                                                                         .build());
+     * publisher.subscribe(page -> page.items().forEach(item -> System.out.println(item)));
+     * }
+     * <p>
+     * 2) Subscribing to items across all pages
+     * <pre>
+     * {@code
+     *
+     * QueryConditional queryConditional = QueryConditional.keyEqualTo(Key.builder().partitionValue("id-value").build());
+     * PagePublisher<MyItem> publisher = mappedTable.query(QueryEnhancedRequest.builder()
+     *                                                                         .queryConditional(queryConditional)
+     *                                                                         .build())
+     *                                              .items();
+     * publisher.items().subscribe(item -> System.out.println(item));
+     * }
+     * </pre>
+     *
+     * @see #query(Consumer)
+     * @see #query(QueryConditional)
+     * @see DynamoDbAsyncClient#queryPaginator
+     * @param request A {@link QueryEnhancedRequest} defining the query conditions and how
+     * to handle the results.
+     * @return a publisher {@link PagePublisher} with paginated results (see {@link Page}).
+     */
+    default PagePublisher<T> query(QueryEnhancedRequest request) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Executes a query against the primary index of the table using a {@link QueryConditional} expression to retrieve a list of
+     * items matching the given conditions.
+     * <p>
+     * <b>Note:</b> This is a convenience method that creates an instance of the request builder avoiding the need to create one
+     * manually via {@link QueryEnhancedRequest#builder()}.
+     * <p>
+     * Example:
+     * <pre>
+     * {@code
+     *
+     * PagePublisher<MyItem> publisher =
+     *     mappedTable.query(r -> r.queryConditional(QueryConditional.keyEqualTo(k -> k.partitionValue("id-value"))));
+     * }
+     * </pre>
+     *
+     * @see #query(QueryEnhancedRequest)
+     * @see #query(QueryConditional)
+     * @see DynamoDbAsyncClient#queryPaginator
+     * @param requestConsumer A {@link Consumer} of {@link QueryEnhancedRequest} defining the query conditions and how to
+     * handle the results.
+     * @return a publisher {@link PagePublisher} with paginated results (see {@link Page}).
+     */
+    default PagePublisher<T> query(Consumer<QueryEnhancedRequest.Builder> requestConsumer) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Executes a query against the primary index of the table using a {@link QueryConditional} expression to retrieve a
+     * list of items matching the given conditions.
+     * <p>
+     * The result is accessed through iterable pages (see {@link Page}) in an interactive way; each time a
+     * result page is retrieved, a query call is made to DynamoDb to get those entries. If no matches are found,
+     * the resulting iterator will contain an empty page. Results are sorted by sort key value in
+     * ascending order.
+     * <p>
+     * This operation calls the low-level DynamoDB API Query operation. Consult the Query documentation for
+     * further details and constraints.
+     * <p>
+     * Example:
+     * <pre>
+     * {@code
+     *
+     * PagePublisher<MyItem> results =
+     *     mappedTable.query(QueryConditional.keyEqualTo(Key.builder().partitionValue("id-value").build()));
+     * }
+     * </pre>
+     *
+     * @see #query(QueryEnhancedRequest)
+     * @see #query(Consumer)
+     * @see DynamoDbAsyncClient#queryPaginator
+     * @param queryConditional A {@link QueryConditional} defining the matching criteria for records to be queried.
+     * @return a publisher {@link PagePublisher} with paginated results (see {@link Page}).
+     */
+    default PagePublisher<T> query(QueryConditional queryConditional) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Puts a single item in the mapped table. If the table contains an item with the same primary key, it will be replaced with
+     * this item.
+     * <p>
+     * The additional configuration parameters that the enhanced client supports are defined
+     * in the {@link PutItemEnhancedRequest}.
+     * <p>
+     * This operation calls the low-level DynamoDB API PutItem operation. Consult the PutItem documentation for
+     * further details and constraints.
+     * <p>
+     * Example:
+     * <pre>
+     * {@code
+     *
+     * mappedTable.putItem(PutItemEnhancedRequest.builder(MyItem.class).item(item).build()).join();
+     * }
+     * </pre>
+     *
+     * @param request A {@link PutItemEnhancedRequest} that includes the item to enter into
+     * the table, its class and optional directives.
+     * @return a {@link CompletableFuture} that returns no results which will complete when the operation is done.
+     */
+    default CompletableFuture<Void> putItem(PutItemEnhancedRequest<T> request) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Puts a single item in the mapped table. If the table contains an item with the same primary key, it will be replaced with
+     * this item.
+     * <p>
+     * The additional configuration parameters that the enhanced client supports are defined
+     * in the {@link PutItemEnhancedRequest}.
+     * <p>
+     * This operation calls the low-level DynamoDB API PutItem operation. Consult the PutItem documentation for
+     * further details and constraints.
+     * <p>
+     * Example:
+     * <pre>
+     * {@code
+     *
+     * mappedTable.putItem(r -> r.item(item)).join();
+     * }
+     * </pre>
+     *
+     * @param requestConsumer A {@link Consumer} of {@link PutItemEnhancedRequest.Builder} that includes the item
+     * to enter into the table, its class and optional directives.
+     * @return a {@link CompletableFuture} that returns no results which will complete when the operation is done.
+     */
+    default CompletableFuture<Void> putItem(Consumer<PutItemEnhancedRequest.Builder<T>> requestConsumer) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Puts a single item in the mapped table. If the table contains an item with the same primary key, it will be
+     * replaced with this item.
+     * <p>
+     * This operation calls the low-level DynamoDB API PutItem operation. Consult the PutItem documentation for
+     * further details and constraints.
+     * <p>
+     * Example:
+     * <pre>
+     * {@code
+     *
+     * mappedTable.putItem(item);
+     * }
+     * </pre>
+     *
+     * @param item the modelled item to be inserted into or overwritten in the database table.
+     * @return a {@link CompletableFuture} that returns no results which will complete when the operation is done.
+     */
+    default CompletableFuture<Void> putItem(T item) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Scans the table and retrieves all items.
+     * <p>
+     * The return type is a custom publisher that can be subscribed to request a stream of {@link Page}s or
+     * a stream of flattened items across all pages. Each time a result page is retrieved, a scan call is made
+     * to DynamoDb to get those entries. If no matches are found, the resulting iterator will contain an empty page.
+     *
+     * <p>
+     * The additional configuration parameters that the enhanced client supports are defined
+     * in the {@link ScanEnhancedRequest}.
+     * <p>
+     * Example:
+     * <p>
+     * 1) Subscribing to {@link Page}s
+     * <pre>
+     * {@code
+     *
+     * PagePublisher<MyItem> publisher = mappedTable.scan(ScanEnhancedRequest.builder().consistentRead(true).build());
+     * publisher.subscribe(page -> page.items().forEach(item -> System.out.println(item)));
+     * }
+     * </pre>
+     *
+     * <p>
+     * 2) Subscribing to items across all pages.
+     * <pre>
+     * {@code
+     *
+     * PagePublisher<MyItem> publisher = mappedTable.scan(ScanEnhancedRequest.builder().consistentRead(true).build());
+     * publisher.items().subscribe(item -> System.out.println(item));
+     * }
+     * </pre>
+     *
+     * @see #scan(Consumer)
+     * @see #scan()
+     * @see DynamoDbAsyncClient#scanPaginator
+     * @param request A {@link ScanEnhancedRequest} defining how to handle the results.
+     * @return a publisher {@link PagePublisher} with paginated results (see {@link Page}).
+     */
+    default PagePublisher<T> scan(ScanEnhancedRequest request) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Scans the table and retrieves all items.
+     * <p>
+     * Example:
+     * <pre>
+     * {@code
+     *
+     * PagePublisher<MyItem> publisher = mappedTable.scan(r -> r.limit(5));
+     * }
+     * </pre>
+     * 
+     * @see #scan(ScanEnhancedRequest)
+     * @see #scan()
+     * @see DynamoDbAsyncClient#scanPaginator
+     * @param requestConsumer A {@link Consumer} of {@link ScanEnhancedRequest} defining the query conditions and how to
+     * handle the results.
+     * @return a publisher {@link PagePublisher} with paginated results (see {@link Page}).
+     */
+    default PagePublisher<T> scan(Consumer<ScanEnhancedRequest.Builder> requestConsumer) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Scans the table and retrieves all items using default settings.
+     *
+     * Example:
+     * <pre>
+     * {@code
+     *
+     * PagePublisher<MyItem> publisher = mappedTable.scan();
+     * }
+     * </pre>
+     * @see #scan(ScanEnhancedRequest)
+     * @see #scan(Consumer)
+     * @see DynamoDbAsyncClient#scanPaginator
+     * @return a publisher {@link PagePublisher} with paginated results (see {@link Page}).
+     */
+    default PagePublisher<T> scan() {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Updates an item in the mapped table, or adds it if it doesn't exist.
+     * <p>
+     * The additional configuration parameters that the enhanced client supports are defined
+     * in the {@link UpdateItemEnhancedRequest}.
+     * <p>
+     * This operation calls the low-level DynamoDB API UpdateItem operation. Consult the UpdateItem documentation for
+     * further details and constraints.
+     * <p>
+     * Example:
+     * <pre>
+     * {@code
+     *
+     * MyItem item = mappedTable.updateItem(UpdateItemEnhancedRequest.builder(MyItem.class).item(item).build()).join();
+     * }
+     * </pre>
+     *
+     * @param request A {@link UpdateItemEnhancedRequest} that includes the item to be updated,
+     * its class and optional directives.
+     * @return a {@link CompletableFuture} of the updated item
+     */
+    default CompletableFuture<T> updateItem(UpdateItemEnhancedRequest<T> request) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Updates an item in the mapped table, or adds it if it doesn't exist.
+     * <p>
+     * The additional configuration parameters that the enhanced client supports are defined
+     * in the {@link UpdateItemEnhancedRequest}.
+     * <p>
+     * This operation calls the low-level DynamoDB API UpdateItem operation. Consult the UpdateItem documentation for
+     * further details and constraints.
+     * <p>
+     * Example:
+     * <pre>
+     * {@code
+     *
+     * MyItem item = mappedTable.updateItem(r -> r.item(item)).join();
+     * }
+     * </pre>
+     *
+     * @param requestConsumer A {@link Consumer} of {@link UpdateItemEnhancedRequest.Builder} that includes the item
+     * to be updated, its class and optional directives.
+     * @return a {@link CompletableFuture} of the updated item
+     */
+    default CompletableFuture<T> updateItem(Consumer<UpdateItemEnhancedRequest.Builder<T>> requestConsumer) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Updates an item in the mapped table, or adds it if it doesn't exist.
+     * <p>
+     * This operation calls the low-level DynamoDB API UpdateItem operation. Consult the UpdateItem documentation for
+     * further details and constraints.
+     * <p>
+     * Example:
+     * <pre>
+     * {@code
+     *
+     * MyItem item = mappedTable.updateItem(item).join();
+     * }
+     * </pre>
+     *
+     * @param item the modelled item to be inserted into or updated in the database table.
+     * @return a {@link CompletableFuture} of the updated item
+     */
+    default CompletableFuture<T> updateItem(T item) {
+        throw new UnsupportedOperationException();
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/DynamoDbEnhancedAsyncClient.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/DynamoDbEnhancedAsyncClient.java
new file mode 100644
index 000000000000..e7cb9ff746b7
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/DynamoDbEnhancedAsyncClient.java
@@ -0,0 +1,463 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb;
+
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import java.util.function.Consumer;
+import software.amazon.awssdk.annotations.SdkPublicApi;
+import software.amazon.awssdk.core.async.SdkPublisher;
+import software.amazon.awssdk.enhanced.dynamodb.internal.client.DefaultDynamoDbEnhancedAsyncClient;
+import software.amazon.awssdk.enhanced.dynamodb.model.BatchGetItemEnhancedRequest;
+import software.amazon.awssdk.enhanced.dynamodb.model.BatchGetResultPage;
+import software.amazon.awssdk.enhanced.dynamodb.model.BatchGetResultPagePublisher;
+import software.amazon.awssdk.enhanced.dynamodb.model.BatchWriteItemEnhancedRequest;
+import software.amazon.awssdk.enhanced.dynamodb.model.BatchWriteResult;
+import software.amazon.awssdk.enhanced.dynamodb.model.ConditionCheck;
+import software.amazon.awssdk.enhanced.dynamodb.model.DeleteItemEnhancedRequest;
+import software.amazon.awssdk.enhanced.dynamodb.model.GetItemEnhancedRequest;
+import software.amazon.awssdk.enhanced.dynamodb.model.PutItemEnhancedRequest;
+import software.amazon.awssdk.enhanced.dynamodb.model.TransactGetItemsEnhancedRequest;
+import software.amazon.awssdk.enhanced.dynamodb.model.TransactWriteItemsEnhancedRequest;
+import software.amazon.awssdk.enhanced.dynamodb.model.UpdateItemEnhancedRequest;
+import software.amazon.awssdk.services.dynamodb.DynamoDbAsyncClient;
+
+/**
+ * Asynchronous interface for running commands against a DynamoDb database.
+ * <p>
+ * By default, all command methods throw an {@link UnsupportedOperationException} to prevent interface extensions from breaking
+ * implementing classes.
+ */
+@SdkPublicApi
+public interface DynamoDbEnhancedAsyncClient extends DynamoDbEnhancedResource {
+
+    /**
+     * Returns a mapped table that can be used to execute commands that work with mapped items against that table.
+     *
+     * @param tableName The name of the physical table persisted by DynamoDb.
+     * @param tableSchema A {@link TableSchema} that maps the table to a modelled object.
+     * @return A {@link DynamoDbAsyncTable} object that can be used to execute table operations against.
+     * @param <T> THe modelled object type being mapped to this table.
+     */
+    <T> DynamoDbAsyncTable<T> table(String tableName, TableSchema<T> tableSchema);
+
+    /**
+     * Retrieves items from one or more tables by their primary keys, see {@link Key}. BatchGetItem is a composite operation
+     * where the request contains one batch of {@link GetItemEnhancedRequest} per targeted table.
+     * The operation makes several calls to the database; each time you iterate over the result to retrieve a page,
+     * a call is made for the items on that page.
+     * <p>
+     * The additional configuration parameters that the enhanced client supports are defined
+     * in the {@link BatchGetItemEnhancedRequest}.
+     * <p>
+     * <b>Partial results</b>. A single call to DynamoDb has restraints on how much data can be retrieved.
+     * If those limits are exceeded, the call yields a partial result. This may also be the case if
+     * provisional throughput is exceeded or there is an internal DynamoDb processing failure. The operation automatically
+     * retries any unprocessed keys returned from DynamoDb in subsequent calls for pages.
+     * <p>
+     * This operation calls the low-level {@link DynamoDbAsyncClient#batchGetItemPaginator} operation. Consult the
+     * BatchGetItem documentation for further details and constraints as well as current limits of data retrieval.
+     * <p>
+     * Example:
+     * <pre>
+     * {@code
+     *
+     * BatchGetResultPagePublisher publisher = enhancedClient.batchGetItem(
+     *     BatchGetItemEnhancedRequest.builder()
+     *                                .readBatches(ReadBatch.builder(FirstItem.class)
+     *                                                      .mappedTableResource(firstItemTable)
+     *                                                      .addGetItem(GetItemEnhancedRequest.builder().key(key1).build())
+     *                                                      .addGetItem(GetItemEnhancedRequest.builder().key(key2).build())
+     *                                                      .build(),
+     *                                             ReadBatch.builder(SecondItem.class)
+     *                                                      .mappedTableResource(secondItemTable)
+     *                                                      .addGetItem(GetItemEnhancedRequest.builder().key(key3).build())
+     *                                                      .build())
+     *                                .build());
+     * }
+     * </pre>
+     *
+     * <p>
+     * The returned {@link BatchGetResultPagePublisher} can be subscribed to request a stream of {@link BatchGetResultPage}s
+     * or a stream of flattened results belonging to the supplied table across all pages.
+     *
+     * <p>
+     * 1) Subscribing to {@link BatchGetResultPage}s
+     * <pre>
+     * {@code
+     * publisher.subscribe(page -> {
+     *     page.resultsForTable(firstItemTable).forEach(item -> System.out.println(item));
+     *     page.resultsForTable(secondItemTable).forEach(item -> System.out.println(item));
+     * });
+     * }
+     * </pre>
+     *
+     * <p>
+     * 2) Subscribing to results across all pages
+     * <pre>
+     * {@code
+     * publisher.resultsForTable(firstItemTable).subscribe(item -> System.out.println(item));
+     * publisher.resultsForTable(secondItemTable).subscribe(item -> System.out.println(item));
+     * }
+     * </pre>
+     * @see #batchGetItem(Consumer)
+     * @see DynamoDbAsyncClient#batchGetItemPaginator
+     * @param request A {@link BatchGetItemEnhancedRequest} containing keys grouped by tables.
+     * @return a publisher {@link SdkPublisher} with paginated results of type {@link BatchGetResultPage}.
+     */
+    default BatchGetResultPagePublisher batchGetItem(BatchGetItemEnhancedRequest request) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Retrieves items from one or more tables by their primary keys, see {@link Key}. BatchGetItem is a composite operation
+     * where the request contains one batch of {@link GetItemEnhancedRequest} per targeted table.
+     * The operation makes several calls to the database; each time you iterate over the result to retrieve a page,
+     * a call is made for the items on that page.
+     * <p>
+     * <b>Note:</b> This is a convenience method that creates an instance of the request builder avoiding the need to create one
+     * manually via {@link BatchGetItemEnhancedRequest#builder()}.
+     * <p>
+     * Example:
+     * <pre>
+     * {@code
+     *
+     * BatchGetResultPagePublisher batchResults = enhancedClient.batchGetItem(r -> r.addReadBatches(
+     *     ReadBatch.builder(FirstItem.class)
+     *              .mappedTableResource(firstItemTable)
+     *              .addGetItem(i -> i.key(key1))
+     *              .addGetItem(i -> i.key(key2))
+     *              .build(),
+     *     ReadBatch.builder(SecondItem.class)
+     *              .mappedTableResource(secondItemTable)
+     *              .addGetItem(i -> i.key(key3))
+     *              .build()));
+     * }
+     * </pre>
+     *
+     * @see #batchGetItem(BatchGetItemEnhancedRequest)
+     * @see DynamoDbAsyncClient#batchGetItem
+     * @param requestConsumer a {@link Consumer} of {@link BatchGetItemEnhancedRequest.Builder} containing keys grouped by tables.
+     * @return a publisher {@link SdkPublisher} with paginated results of type {@link BatchGetResultPage}.
+     */
+    default BatchGetResultPagePublisher batchGetItem(Consumer<BatchGetItemEnhancedRequest.Builder> requestConsumer) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Puts and/or deletes multiple items in one or more tables. BatchWriteItem is a composite operation where the request
+     * contains one batch of (a mix of) {@link PutItemEnhancedRequest} and {@link DeleteItemEnhancedRequest} per targeted table.
+     * <p>
+     * The additional configuration parameters that the enhanced client supports are defined
+     * in the {@link BatchWriteItemEnhancedRequest}.
+     * <p>
+     * <b>Note: </b> BatchWriteItem cannot update items. Instead, use the individual updateItem operation
+     * {@link DynamoDbAsyncTable#updateItem(UpdateItemEnhancedRequest)}.
+     * <p>
+     * <b>Partial updates</b><br>Each delete or put call is atomic, but the operation as a whole is not.
+     * If individual operations fail due to exceeded provisional throughput internal DynamoDb processing failures,
+     * the failed requests can be retrieved through the result, see {@link BatchWriteResult}.
+     * <p>
+     * There are some conditions that cause the whole batch operation to fail. These include non-existing tables, erroneously
+     * defined primary key attributes, attempting to put and delete the same item as well as referring more than once to the same
+     * hash and range (sort) key.
+     * <p>
+     * This operation calls the low-level DynamoDB API BatchWriteItem operation. Consult the BatchWriteItem documentation for
+     * further details and constraints, current limits of data to write and/or delete, how to handle partial updates and retries
+     * and under which conditions the operation will fail.
+     * <p>
+     * Example:
+     * <pre>
+     * {@code
+     *
+     * BatchWriteResult batchResult = enhancedClient.batchWriteItem(
+     *     BatchWriteItemEnhancedRequest.builder()
+     *                                  .writeBatches(WriteBatch.builder(FirstItem.class)
+     *                                                          .mappedTableResource(firstItemTable)
+     *                                                          .addPutItem(PutItemEnhancedRequest.builder().item(item1).build())
+     *                                                          .addDeleteItem(DeleteItemEnhancedRequest.builder()
+     *                                                                                                  .key(key2)
+     *                                                                                                  .build())
+     *                                                          .build(),
+     *                                                WriteBatch.builder(SecondItem.class)
+     *                                                          .mappedTableResource(secondItemTable)
+     *                                                          .addPutItem(PutItemEnhancedRequest.builder().item(item3).build())
+     *                                                          .build())
+     *                                  .build()).join();
+     * }
+     * </pre>
+     *
+     * @param request A {@link BatchWriteItemEnhancedRequest} containing keys and items grouped by tables.
+     * @return a {@link CompletableFuture} of {@link BatchWriteResult}, containing any unprocessed requests.
+     */
+    default CompletableFuture<BatchWriteResult> batchWriteItem(BatchWriteItemEnhancedRequest request) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Puts and/or deletes multiple items in one or more tables. BatchWriteItem is a composite operation where the request
+     * contains one batch of (a mix of) {@link PutItemEnhancedRequest} and {@link DeleteItemEnhancedRequest} per targeted table.
+     * <p>
+     * The additional configuration parameters that the enhanced client supports are defined
+     * in the {@link BatchWriteItemEnhancedRequest}.
+     * <p>
+     * <b>Note: </b> BatchWriteItem cannot update items. Instead, use the individual updateItem operation
+     * {@link DynamoDbAsyncTable#updateItem}}.
+     * <p>
+     * <b>Partial updates</b><br>Each delete or put call is atomic, but the operation as a whole is not.
+     * If individual operations fail due to exceeded provisional throughput internal DynamoDb processing failures,
+     * the failed requests can be retrieved through the result, see {@link BatchWriteResult}.
+     * <p>
+     * There are some conditions that cause the whole batch operation to fail. These include non-existing tables, erroneously
+     * defined primary key attributes, attempting to put and delete the same item as well as referring more than once to the same
+     * hash and range (sort) key.
+     * <p>
+     * This operation calls the low-level DynamoDB API BatchWriteItem operation. Consult the BatchWriteItem documentation for
+     * further details and constraints, current limits of data to write and/or delete, how to handle partial updates and retries
+     * and under which conditions the operation will fail.
+     * <p>
+     * <b>Note:</b> This is a convenience method that creates an instance of the request builder avoiding the need to create one
+     * manually via {@link BatchWriteItemEnhancedRequest#builder()}.
+     * <p>
+     * Example:
+     * <pre>
+     * {@code
+     *
+     * BatchWriteResult batchResult = enhancedClient.batchWriteItem(r -> r.writeBatches(
+     *     WriteBatch.builder(FirstItem.class)
+     *               .mappedTableResource(firstItemTable)
+     *               .addPutItem(i -> i.item(item1))
+     *               .addDeleteItem(i -> i.key(key2))
+     *               .build(),
+     *     WriteBatch.builder(SecondItem.class)
+     *               .mappedTableResource(secondItemTable)
+     *               .addPutItem(i -> i.item(item3))
+     *               .build())).join();
+     * }
+     * </pre>
+     *
+     * @param requestConsumer a {@link Consumer} of {@link BatchWriteItemEnhancedRequest} containing keys and items grouped by
+     * tables.
+     * @return a {@link CompletableFuture} of {@link BatchWriteResult}, containing any unprocessed requests.
+     */
+    default CompletableFuture<BatchWriteResult> batchWriteItem(Consumer<BatchWriteItemEnhancedRequest.Builder> requestConsumer) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Retrieves multiple items from one or more tables in a single atomic transaction. TransactGetItem is a composite operation
+     * where the request contains a set of up to 25 get requests, each containing a table reference and a
+     * {@link GetItemEnhancedRequest}.
+     * <p>
+     * The additional configuration parameters that the enhanced client supports are defined
+     * in the {@link TransactGetItemsEnhancedRequest}.
+     * <p>
+     * DynamoDb will reject a call to TransactGetItems if the call exceeds limits such as provisioned throughput or allowed size
+     * of items, if the request contains errors or if there are conflicting operations accessing the same item, for instance
+     * updating and reading at the same time.
+     * <p>
+     * This operation calls the low-level DynamoDB API TransactGetItems operation. Consult the TransactGetItems documentation for
+     * further details and constraints.
+     * <p>
+     * Examples:
+     * <pre>
+     * {@code
+     *
+     * List<TransactGetResultPage> results = enhancedClient.transactGetItems(
+     *            TransactGetItemsEnhancedRequest.builder()
+     *                                           .addGetItem(firstItemTable, GetItemEnhancedRequest.builder().key(key1).build())
+     *                                           .addGetItem(firstItemTable, GetItemEnhancedRequest.builder().key(key2).build())
+     *                                           .addGetItem(firstItemTable, GetItemEnhancedRequest.builder().key(key3).build())
+     *                                           .addGetItem(secondItemTable, GetItemEnhancedRequest.builder().key(key4).build())
+     *                                           .build()).join();
+     * }
+     * </pre>
+     *
+     * @param request A {@link TransactGetItemsEnhancedRequest} containing keys with table references.
+     * @return a {@link CompletableFuture} containing a list of {@link Document} with the results.
+     */
+    default CompletableFuture<List<Document>> transactGetItems(TransactGetItemsEnhancedRequest request) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Retrieves multiple items from one or more tables in a single atomic transaction. TransactGetItem is a composite operation
+     * where the request contains a set of up to 25 get requests, each containing a table reference and a
+     * {@link GetItemEnhancedRequest}.
+     * <p>
+     * The additional configuration parameters that the enhanced client supports are defined
+     * in the {@link TransactGetItemsEnhancedRequest}.
+     * <p>
+     * DynamoDb will reject a call to TransactGetItems if the call exceeds limits such as provisioned throughput or allowed size
+     * of items, if the request contains errors or if there are conflicting operations accessing the same item, for instance
+     * updating and reading at the same time.
+     * <p>
+     * This operation calls the low-level DynamoDB API TransactGetItems operation. Consult the TransactGetItems documentation for
+     * further details and constraints.
+     * <p>
+     * <b>Note:</b> This is a convenience method that creates an instance of the request builder avoiding the need to create one
+     * manually via {@link TransactGetItemsEnhancedRequest#builder()}.
+     * <p>
+     * Examples:
+     * <pre>
+     * {@code
+     *
+     * List<TransactGetResultPage> results =  = enhancedClient.transactGetItems(
+     *     r -> r.addGetItem(firstItemTable, i -> i.key(k -> k.partitionValue(0)))
+     *           .addGetItem(firstItemTable, i -> i.key(k -> k.partitionValue(1)))
+     *           .addGetItem(firstItemTable, i -> i.key(k -> k.partitionValue(2)))
+     *           .addGetItem(secondItemTable, i -> i.key(k -> k.partitionValue(0)))).join();
+     * }
+     * </pre>
+     *
+     * @param requestConsumer a {@link Consumer} of {@link TransactGetItemsEnhancedRequest} containing keys with table references.
+     * @return a {@link CompletableFuture} containing a list of {@link Document} with the results.
+     */
+    default CompletableFuture<List<Document>> transactGetItems(
+        Consumer<TransactGetItemsEnhancedRequest.Builder> requestConsumer) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Writes and/or modifies multiple items from one or more tables in a single atomic transaction. TransactGetItem is a
+     * composite operation where the request contains a set of up to 25 action requests, each containing a table reference and
+     * one of the following requests:
+     * <ul>
+     *     <li>Condition check of item - {@link ConditionCheck}</li>
+     *     <li>Delete item - {@link DeleteItemEnhancedRequest}</li>
+     *     <li>Put item - {@link PutItemEnhancedRequest}</li>
+     *     <li>Update item - {@link UpdateItemEnhancedRequest}</li>
+     * </ul>
+     * <p>
+     * The additional configuration parameters that the enhanced client supports are defined
+     * in the {@link TransactWriteItemsEnhancedRequest}.
+     * <p>
+     * DynamoDb will reject a call to TransactWriteItems if the call exceeds limits such as provisioned throughput or allowed size
+     * of items, if the request contains errors or if there are conflicting operations accessing the same item. If the request
+     * contains condition checks that aren't met, this will also cause rejection.
+     * <p>
+     * This operation calls the low-level DynamoDB API TransactWriteItems operation. Consult the TransactWriteItems documentation
+     * for further details and constraints, current limits of data to write and/or delete and under which conditions the operation
+     * will fail.
+     * <p>
+     * Example:
+     * <pre>
+     * {@code
+     *
+     * enhancedClient.transactWriteItems(
+     *     TransactWriteItemsEnhancedRequest.builder()
+     *                                      .addPutItem(firstItemTable, PutItemEnhancedRequest.builder().item(item1).build())
+     *                                      .addDeleteItem(firstItemTable, DeleteItemEnhancedRequest.builder().key(key2).build())
+     *                                      .addConditionCheck(firstItemTable,
+     *                                                         ConditionCheck.builder()
+     *                                                                       .key(key3)
+     *                                                                       .conditionExpression(conditionExpression)
+     *                                                                       .build())
+     *                                      .addUpdateItem(secondItemTable,
+     *                                                     UpdateItemEnhancedRequest.builder().item(item4).build())
+     *                                      .build()).join();
+     * }
+     * </pre>
+     *
+     * @param request A {@link BatchWriteItemEnhancedRequest} containing keys grouped by tables.
+     * @return a {@link CompletableFuture} of {@link Void}.
+     */
+    default CompletableFuture<Void> transactWriteItems(TransactWriteItemsEnhancedRequest request) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Writes and/or modifies multiple items from one or more tables in a single atomic transaction. TransactGetItem is a
+     * composite operation where the request contains a set of up to 25 action requests, each containing a table reference and
+     * one of the following requests:
+     * <ul>
+     *     <li>Condition check of item - {@link ConditionCheck}</li>
+     *     <li>Delete item - {@link DeleteItemEnhancedRequest}</li>
+     *     <li>Put item - {@link PutItemEnhancedRequest}</li>
+     *     <li>Update item - {@link UpdateItemEnhancedRequest}</li>
+     * </ul>
+     * <p>
+     * The additional configuration parameters that the enhanced client supports are defined
+     * in the {@link TransactWriteItemsEnhancedRequest}.
+     * <p>
+     * DynamoDb will reject a call to TransactWriteItems if the call exceeds limits such as provisioned throughput or allowed size
+     * of items, if the request contains errors or if there are conflicting operations accessing the same item. If the request
+     * contains condition checks that aren't met, this will also cause rejection.
+     * <p>
+     * This operation calls the low-level DynamoDB API TransactWriteItems operation. Consult the TransactWriteItems documentation
+     * for further details and constraints, current limits of data to write and/or delete and under which conditions the operation
+     * will fail.
+     * <p>
+     * <b>Note:</b> This is a convenience method that creates an instance of the request builder avoiding the need to create one
+     * manually via {@link TransactWriteItemsEnhancedRequest#builder()}.
+     * <p>
+     * Example:
+     * <pre>
+     * {@code
+     *
+     * enhancedClient.transactWriteItems(r -> r.addPutItem(firstItemTable, i -> i.item(item1))
+     *                                         .addDeleteItem(firstItemTable, i -> i.key(k -> k.partitionValue(2)))
+     *                                         .addConditionCheck(firstItemTable, i -> i.key(key3)
+     *                                                                                  .conditionExpression(conditionExpression))
+     *                                         .addUpdateItem(secondItemTable, i -> i.item(item4))).join();
+     * }
+     * </pre>
+     *
+     * @param requestConsumer a {@link Consumer} of {@link TransactWriteItemsEnhancedRequest} containing keys and items grouped by
+     * tables.
+     * @return a {@link CompletableFuture} of {@link Void}.
+     */
+    default CompletableFuture<Void> transactWriteItems(Consumer<TransactWriteItemsEnhancedRequest.Builder> requestConsumer) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Creates a default builder for {@link DynamoDbEnhancedAsyncClient}.
+     */
+    static DynamoDbEnhancedAsyncClient.Builder builder() {
+        return DefaultDynamoDbEnhancedAsyncClient.builder();
+    }
+
+    /**
+     * Creates a {@link DynamoDbEnhancedClient} with a default {@link DynamoDbAsyncClient}
+     */
+    static DynamoDbEnhancedAsyncClient create() {
+        return builder().build();
+    }
+
+    /**
+     * The builder definition for a {@link DynamoDbEnhancedAsyncClient}.
+     */
+    interface Builder extends DynamoDbEnhancedResource.Builder {
+        /**
+         * The regular low-level SDK client to use with the enhanced client.
+         * @param dynamoDbClient an initialized {@link DynamoDbAsyncClient}
+         */
+        Builder dynamoDbClient(DynamoDbAsyncClient dynamoDbClient);
+
+        @Override
+        Builder extensions(DynamoDbEnhancedClientExtension... dynamoDbEnhancedClientExtensions);
+
+        @Override
+        Builder extensions(List<DynamoDbEnhancedClientExtension> dynamoDbEnhancedClientExtensions);
+
+        /**
+         * Builds an enhanced client based on the settings supplied to this builder
+         * @return An initialized {@link DynamoDbEnhancedAsyncClient}
+         */
+        DynamoDbEnhancedAsyncClient build();
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/DynamoDbEnhancedClient.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/DynamoDbEnhancedClient.java
new file mode 100644
index 000000000000..fe9dd66d09b4
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/DynamoDbEnhancedClient.java
@@ -0,0 +1,465 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb;
+
+import java.util.List;
+import java.util.function.Consumer;
+import software.amazon.awssdk.annotations.SdkPublicApi;
+import software.amazon.awssdk.core.pagination.sync.SdkIterable;
+import software.amazon.awssdk.enhanced.dynamodb.internal.client.DefaultDynamoDbEnhancedClient;
+import software.amazon.awssdk.enhanced.dynamodb.model.BatchGetItemEnhancedRequest;
+import software.amazon.awssdk.enhanced.dynamodb.model.BatchGetResultPage;
+import software.amazon.awssdk.enhanced.dynamodb.model.BatchGetResultPageIterable;
+import software.amazon.awssdk.enhanced.dynamodb.model.BatchWriteItemEnhancedRequest;
+import software.amazon.awssdk.enhanced.dynamodb.model.BatchWriteResult;
+import software.amazon.awssdk.enhanced.dynamodb.model.ConditionCheck;
+import software.amazon.awssdk.enhanced.dynamodb.model.DeleteItemEnhancedRequest;
+import software.amazon.awssdk.enhanced.dynamodb.model.GetItemEnhancedRequest;
+import software.amazon.awssdk.enhanced.dynamodb.model.PutItemEnhancedRequest;
+import software.amazon.awssdk.enhanced.dynamodb.model.TransactGetItemsEnhancedRequest;
+import software.amazon.awssdk.enhanced.dynamodb.model.TransactWriteItemsEnhancedRequest;
+import software.amazon.awssdk.enhanced.dynamodb.model.UpdateItemEnhancedRequest;
+import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
+import software.amazon.awssdk.services.dynamodb.model.BatchGetItemRequest;
+
+/**
+ * Synchronous interface for running commands against a DynamoDb database.
+ * <p>
+ * By default, all command methods throw an {@link UnsupportedOperationException} to prevent interface extensions from breaking
+ * implementing classes.
+ */
+@SdkPublicApi
+public interface DynamoDbEnhancedClient extends DynamoDbEnhancedResource {
+
+    /**
+     * Returns a mapped table that can be used to execute commands that work with mapped items against that table.
+     *
+     * @param tableName The name of the physical table persisted by DynamoDb.
+     * @param tableSchema A {@link TableSchema} that maps the table to a modelled object.
+     * @return A {@link DynamoDbTable} object that can be used to execute table operations against.
+     * @param <T> The modelled object type being mapped to this table.
+     */
+    <T> DynamoDbTable<T> table(String tableName, TableSchema<T> tableSchema);
+
+    /**
+     * Retrieves items from one or more tables by their primary keys, see {@link Key}. BatchGetItem is a composite operation
+     * where the request contains one batch of {@link GetItemEnhancedRequest} per targeted table.
+     * The operation makes several calls to the database; each time you iterate over the result to retrieve a page,
+     * a call is made for the items on that page.
+     * <p>
+     * The additional configuration parameters that the enhanced client supports are defined
+     * in the {@link BatchGetItemEnhancedRequest}.
+     * <p>
+     * <b>Partial results</b>. A single call to DynamoDb has restraints on how much data can be retrieved.
+     * If those limits are exceeded, the call yields a partial result. This may also be the case if
+     * provisional throughput is exceeded or there is an internal DynamoDb processing failure. The operation automatically
+     * retries any unprocessed keys returned from DynamoDb in subsequent calls for pages.
+     * <p>
+     * This operation calls the low-level {@link DynamoDbClient#batchGetItemPaginator} operation. Consult the BatchGetItem
+     * documentation for further details and constraints as well as current limits of data retrieval.
+     * <p>
+     * Example:
+     * <pre>
+     * {@code
+     *
+     * BatchGetResultPageIterable batchResults = enhancedClient.batchGetItem(
+     *            BatchGetItemEnhancedRequest.builder()
+     *                                       .readBatches(ReadBatch.builder(FirstItem.class)
+     *                                                             .mappedTableResource(firstItemTable)
+     *                                                             .addGetItem(GetItemEnhancedRequest.builder().key(key1).build())
+     *                                                             .addGetItem(GetItemEnhancedRequest.builder().key(key2).build())
+     *                                                             .build(),
+     *                                                    ReadBatch.builder(SecondItem.class)
+     *                                                             .mappedTableResource(secondItemTable)
+     *                                                             .addGetItem(GetItemEnhancedRequest.builder().key(key3).build())
+     *                                                             .build())
+     *                                       .build());
+     * }
+     * </pre>
+     *
+     * <p>
+     * The result can be accessed either through iterable {@link BatchGetResultPage}s or flattened results belonging to the
+     * supplied table across all pages.
+     *
+     * <p>
+     * 1) Iterating through pages
+     * <pre>
+     * {@code
+     * batchResults.forEach(page -> {
+     *     page.resultsForTable(firstItemTable).forEach(item -> System.out.println(item));
+     *     page.resultsForTable(secondItemTable).forEach(item -> System.out.println(item));
+     * });
+     * }
+     * </pre>
+     *
+     * <p>
+     * 2) Iterating through results across all pages
+     * <pre>
+     * {@code
+     * results.resultsForTable(firstItemTable).forEach(item -> System.out.println(item));
+     * results.resultsForTable(secondItemTable).forEach(item -> System.out.println(item));
+     * }
+     * </pre>
+     *
+     * @param request A {@link BatchGetItemEnhancedRequest} containing keys grouped by tables.
+     * @return an iterator of type {@link SdkIterable} with paginated results of type {@link BatchGetResultPage}.
+     * @see #batchGetItem(Consumer)
+     * @see DynamoDbClient#batchGetItemPaginator
+     */
+    default BatchGetResultPageIterable batchGetItem(BatchGetItemEnhancedRequest request) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Retrieves items from one or more tables by their primary keys, see {@link Key}. BatchGetItem is a composite operation
+     * where the request contains one batch of {@link GetItemEnhancedRequest} per targeted table.
+     * The operation makes several calls to the database; each time you iterate over the result to retrieve a page,
+     * a call is made for the items on that page.
+     * <p>
+     * <b>Note:</b> This is a convenience method that creates an instance of the request builder avoiding the need to create one
+     * manually via {@link BatchGetItemEnhancedRequest#builder()}.
+     * <p>
+     * Example:
+     * <pre>
+     * {@code
+     *
+     * BatchGetResultPageIterable batchResults = enhancedClient.batchGetItem(r -> r.addReadBatches(
+     *     ReadBatch.builder(FirstItem.class)
+     *              .mappedTableResource(firstItemTable)
+     *              .addGetItem(i -> i.key(key1))
+     *              .addGetItem(i -> i.key(key2))
+     *              .build(),
+     *     ReadBatch.builder(SecondItem.class)
+     *              .mappedTableResource(secondItemTable)
+     *              .addGetItem(i -> i.key(key3))
+     *              .build()));
+     * }
+     * </pre>
+     *
+     * @param requestConsumer a {@link Consumer} of {@link BatchGetItemEnhancedRequest.Builder} containing keys grouped by tables.
+     * @return an iterator of type {@link SdkIterable} with paginated results of type {@link BatchGetResultPage}.
+     * @see #batchGetItem(BatchGetItemEnhancedRequest)
+     * @see DynamoDbClient#batchGetItemPaginator(BatchGetItemRequest)
+     */
+    default BatchGetResultPageIterable batchGetItem(Consumer<BatchGetItemEnhancedRequest.Builder> requestConsumer) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Puts and/or deletes multiple items in one or more tables. BatchWriteItem is a composite operation where the request
+     * contains one batch of (a mix of) {@link PutItemEnhancedRequest} and {@link DeleteItemEnhancedRequest} per targeted table.
+     * <p>
+     * The additional configuration parameters that the enhanced client supports are defined
+     * in the {@link BatchWriteItemEnhancedRequest}.
+     * <p>
+     * <b>Note: </b> BatchWriteItem cannot update items. Instead, use the individual updateItem operation
+     * {@link DynamoDbTable#updateItem(UpdateItemEnhancedRequest)}.
+     * <p>
+     * <b>Partial updates</b><br>Each delete or put call is atomic, but the operation as a whole is not.
+     * If individual operations fail due to exceeded provisional throughput internal DynamoDb processing failures,
+     * the failed requests can be retrieved through the result, see {@link BatchWriteResult}.
+     * <p>
+     * There are some conditions that cause the whole batch operation to fail. These include non-existing tables, erroneously
+     * defined primary key attributes, attempting to put and delete the same item as well as referring more than once to the same
+     * hash and range (sort) key.
+     * <p>
+     * This operation calls the low-level DynamoDB API BatchWriteItem operation. Consult the BatchWriteItem documentation for
+     * further details and constraints, current limits of data to write and/or delete, how to handle partial updates and retries
+     * and under which conditions the operation will fail.
+     * <p>
+     * Example:
+     * <pre>
+     * {@code
+     *
+     * BatchWriteResult batchResult = enhancedClient.batchWriteItem(
+     *     BatchWriteItemEnhancedRequest.builder()
+     *                                  .writeBatches(WriteBatch.builder(FirstItem.class)
+     *                                                          .mappedTableResource(firstItemTable)
+     *                                                          .addPutItem(PutItemEnhancedRequest.builder().item(item1).build())
+     *                                                          .addDeleteItem(DeleteItemEnhancedRequest.builder()
+     *                                                                                                  .key(key2)
+     *                                                                                                  .build())
+     *                                                          .build(),
+     *                                                WriteBatch.builder(SecondItem.class)
+     *                                                          .mappedTableResource(secondItemTable)
+     *                                                          .addPutItem(PutItemEnhancedRequest.builder().item(item3).build())
+     *                                                          .build())
+     *                                  .build());
+     * }
+     * </pre>
+     *
+     * @param request A {@link BatchWriteItemEnhancedRequest} containing keys and items grouped by tables.
+     * @return a {@link BatchWriteResult} containing any unprocessed requests.
+     */
+    default BatchWriteResult batchWriteItem(BatchWriteItemEnhancedRequest request) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Puts and/or deletes multiple items in one or more tables. BatchWriteItem is a composite operation where the request
+     * contains one batch of (a mix of) {@link PutItemEnhancedRequest} and {@link DeleteItemEnhancedRequest} per targeted table.
+     * <p>
+     * The additional configuration parameters that the enhanced client supports are defined
+     * in the {@link BatchWriteItemEnhancedRequest}.
+     * <p>
+     * <b>Note: </b> BatchWriteItem cannot update items. Instead, use the individual updateItem operation
+     * {@link DynamoDbTable#updateItem(UpdateItemEnhancedRequest)}.
+     * <p>
+     * <b>Partial updates</b><br>Each delete or put call is atomic, but the operation as a whole is not.
+     * If individual operations fail due to exceeded provisional throughput internal DynamoDb processing failures,
+     * the failed requests can be retrieved through the result, see {@link BatchWriteResult}.
+     * <p>
+     * There are some conditions that cause the whole batch operation to fail. These include non-existing tables, erroneously
+     * defined primary key attributes, attempting to put and delete the same item as well as referring more than once to the same
+     * hash and range (sort) key.
+     * <p>
+     * This operation calls the low-level DynamoDB API BatchWriteItem operation. Consult the BatchWriteItem documentation for
+     * further details and constraints, current limits of data to write and/or delete, how to handle partial updates and retries
+     * and under which conditions the operation will fail.
+     * <p>
+     * <b>Note:</b> This is a convenience method that creates an instance of the request builder avoiding the need to create one
+     * manually via {@link BatchWriteItemEnhancedRequest#builder()}.
+     * <p>
+     * Example:
+     * <pre>
+     * {@code
+     *
+     * BatchWriteResult batchResult = enhancedClient.batchWriteItem(r -> r.writeBatches(
+     *     WriteBatch.builder(FirstItem.class)
+     *               .mappedTableResource(firstItemTable)
+     *               .addPutItem(i -> i.item(item1))
+     *               .addDeleteItem(i -> i.key(key2))
+     *               .build(),
+     *     WriteBatch.builder(SecondItem.class)
+     *               .mappedTableResource(secondItemTable)
+     *               .addPutItem(i -> i.item(item3))
+     *               .build()));
+     * }
+     * </pre>
+     *
+     * @param requestConsumer a {@link Consumer} of {@link BatchWriteItemEnhancedRequest} containing keys and items grouped by
+     * tables.
+     * @return a {@link BatchWriteResult} containing any unprocessed requests.
+     */
+    default BatchWriteResult batchWriteItem(Consumer<BatchWriteItemEnhancedRequest.Builder> requestConsumer) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Retrieves multiple items from one or more tables in a single atomic transaction. TransactGetItem is a composite operation
+     * where the request contains a set of up to 25 get requests, each containing a table reference and a
+     * {@link GetItemEnhancedRequest}. The list of results correspond to the ordering of the request definitions; for example
+     * the third addGetItem() call on the request builder will match the third result (index 2) of the result.
+     * <p>
+     * The additional configuration parameters that the enhanced client supports are defined
+     * in the {@link TransactGetItemsEnhancedRequest}.
+     * <p>
+     * DynamoDb will reject a call to TransactGetItems if the call exceeds limits such as provisioned throughput or allowed size
+     * of items, if the request contains errors or if there are conflicting operations accessing the same item, for instance
+     * updating and reading at the same time.
+     * <p>
+     * This operation calls the low-level DynamoDB API TransactGetItems operation. Consult the TransactGetItems documentation for
+     * further details and constraints.
+     * <p>
+     * Examples:
+     * <pre>
+     * {@code
+     *
+     * List<TransactGetResultPage> results = enhancedClient.transactGetItems(
+     *            TransactGetItemsEnhancedRequest.builder()
+     *                                           .addGetItem(firstItemTable, GetItemEnhancedRequest.builder().key(key1).build())
+     *                                           .addGetItem(firstItemTable, GetItemEnhancedRequest.builder().key(key2).build())
+     *                                           .addGetItem(firstItemTable, GetItemEnhancedRequest.builder().key(key3).build())
+     *                                           .addGetItem(secondItemTable, GetItemEnhancedRequest.builder().key(key4).build())
+     *                                           .build());
+     * MyItem item = results.get(3).getItem(secondItemTable);
+     * }
+     * </pre>
+     *
+     * @param request A {@link TransactGetItemsEnhancedRequest} containing keys with table references.
+     * @return a list of {@link Document} with the results.
+     */
+    default List<Document> transactGetItems(TransactGetItemsEnhancedRequest request) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Retrieves multiple items from one or more tables in a single atomic transaction. TransactGetItem is a composite operation
+     * where the request contains a set of up to 25 get requests, each containing a table reference and a
+     * {@link GetItemEnhancedRequest}. The list of results correspond to the ordering of the request definitions; for example
+     * the third addGetItem() call on the request builder will match the third result (index 2) of the result.
+     * <p>
+     * The additional configuration parameters that the enhanced client supports are defined
+     * in the {@link TransactGetItemsEnhancedRequest}.
+     * <p>
+     * DynamoDb will reject a call to TransactGetItems if the call exceeds limits such as provisioned throughput or allowed size
+     * of items, if the request contains errors or if there are conflicting operations accessing the same item, for instance
+     * updating and reading at the same time.
+     * <p>
+     * This operation calls the low-level DynamoDB API TransactGetItems operation. Consult the TransactGetItems documentation for
+     * further details and constraints.
+     * <p>
+     * <b>Note:</b> This is a convenience method that creates an instance of the request builder avoiding the need to create one
+     * manually via {@link TransactGetItemsEnhancedRequest#builder()}.
+     * <p>
+     * Examples:
+     * <pre>
+     * {@code
+     *
+     * List<TransactGetResultPage> results = enhancedClient.transactGetItems(
+     *     r -> r.addGetItem(firstItemTable, i -> i.key(k -> k.partitionValue(0)))
+     *           .addGetItem(firstItemTable, i -> i.key(k -> k.partitionValue(1)))
+     *           .addGetItem(firstItemTable, i -> i.key(k -> k.partitionValue(2)))
+     *           .addGetItem(secondItemTable, i -> i.key(k -> k.partitionValue(0))));
+     * MyItem item = results.get(3).getItem(secondItemTable);
+     * }
+     * </pre>
+     *
+     * @param requestConsumer a {@link Consumer} of {@link TransactGetItemsEnhancedRequest} containing keys with table references.
+     * @return a list of {@link Document} with the results.
+     */
+    default List<Document> transactGetItems(Consumer<TransactGetItemsEnhancedRequest.Builder> requestConsumer) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Writes and/or modifies multiple items from one or more tables in a single atomic transaction. TransactGetItem is a
+     * composite operation where the request contains a set of up to 25 action requests, each containing a table reference and
+     * one of the following requests:
+     * <ul>
+     *     <li>Condition check of item - {@link ConditionCheck}</li>
+     *     <li>Delete item - {@link DeleteItemEnhancedRequest}</li>
+     *     <li>Put item - {@link PutItemEnhancedRequest}</li>
+     *     <li>Update item - {@link UpdateItemEnhancedRequest}</li>
+     * </ul>
+     * <p>
+     * The additional configuration parameters that the enhanced client supports are defined
+     * in the {@link TransactWriteItemsEnhancedRequest}.
+     * <p>
+     * DynamoDb will reject a call to TransactWriteItems if the call exceeds limits such as provisioned throughput or allowed size
+     * of items, if the request contains errors or if there are conflicting operations accessing the same item. If the request
+     * contains condition checks that aren't met, this will also cause rejection.
+     * <p>
+     * This operation calls the low-level DynamoDB API TransactWriteItems operation. Consult the TransactWriteItems documentation
+     * for further details and constraints, current limits of data to write and/or delete and under which conditions the operation
+     * will fail.
+     * <p>
+     * Example:
+     * <pre>
+     * {@code
+     *
+     * result = enhancedClient.transactWriteItems(
+     *     TransactWriteItemsEnhancedRequest.builder()
+     *                                      .addPutItem(firstItemTable, PutItemEnhancedRequest.builder().item(item1).build())
+     *                                      .addDeleteItem(firstItemTable, DeleteItemEnhancedRequest.builder().key(key2).build())
+     *                                      .addConditionCheck(firstItemTable,
+     *                                                         ConditionCheck.builder()
+     *                                                                       .key(key3)
+     *                                                                       .conditionExpression(conditionExpression)
+     *                                                                       .build())
+     *                                      .addUpdateItem(secondItemTable,
+     *                                                     UpdateItemEnhancedRequest.builder().item(item4).build())
+     *                                      .build());
+     * }
+     * </pre>
+     *
+     * @param request A {@link BatchWriteItemEnhancedRequest} containing keys grouped by tables.
+     */
+    default Void transactWriteItems(TransactWriteItemsEnhancedRequest request) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Writes and/or modifies multiple items from one or more tables in a single atomic transaction. TransactGetItem is a
+     * composite operation where the request contains a set of up to 25 action requests, each containing a table reference and
+     * one of the following requests:
+     * <ul>
+     *     <li>Condition check of item - {@link ConditionCheck}</li>
+     *     <li>Delete item - {@link DeleteItemEnhancedRequest}</li>
+     *     <li>Put item - {@link PutItemEnhancedRequest}</li>
+     *     <li>Update item - {@link UpdateItemEnhancedRequest}</li>
+     * </ul>
+     * <p>
+     * The additional configuration parameters that the enhanced client supports are defined
+     * in the {@link TransactWriteItemsEnhancedRequest}.
+     * <p>
+     * DynamoDb will reject a call to TransactWriteItems if the call exceeds limits such as provisioned throughput or allowed size
+     * of items, if the request contains errors or if there are conflicting operations accessing the same item. If the request
+     * contains condition checks that aren't met, this will also cause rejection.
+     * <p>
+     * This operation calls the low-level DynamoDB API TransactWriteItems operation. Consult the TransactWriteItems documentation
+     * for further details and constraints, current limits of data to write and/or delete and under which conditions the operation
+     * will fail.
+     * <p>
+     * <b>Note:</b> This is a convenience method that creates an instance of the request builder avoiding the need to create one
+     * manually via {@link TransactWriteItemsEnhancedRequest#builder()}.
+     * <p>
+     * Example:
+     * <pre>
+     * {@code
+     *
+     * result = enhancedClient.transactWriteItems(r -> r.addPutItem(firstItemTable, i -> i.item(item1))
+     *                                                  .addDeleteItem(firstItemTable, i -> i.key(k -> k.partitionValue(2)))
+     *                                                  .addConditionCheck(firstItemTable,
+     *                                                                 i -> i.key(key3).conditionExpression(conditionExpression))
+     *                                                  .addUpdateItem(secondItemTable, i -> i.item(item4)));
+     * }
+     * </pre>
+     *
+     * @param requestConsumer a {@link Consumer} of {@link TransactWriteItemsEnhancedRequest} containing keys and items grouped
+     * by tables.
+     */
+    default Void transactWriteItems(Consumer<TransactWriteItemsEnhancedRequest.Builder> requestConsumer) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Creates a default builder for {@link DynamoDbEnhancedClient}.
+     */
+    static Builder builder() {
+        return DefaultDynamoDbEnhancedClient.builder();
+    }
+
+    /**
+     * Creates a {@link DynamoDbEnhancedClient} with a default {@link DynamoDbClient}
+     */
+    static DynamoDbEnhancedClient create() {
+        return builder().build();
+    }
+
+    /**
+     * The builder definition for a {@link DynamoDbEnhancedClient}.
+     */
+    interface Builder extends DynamoDbEnhancedResource.Builder {
+        /**
+         * The regular low-level SDK client to use with the enhanced client.
+         * @param dynamoDbClient an initialized {@link DynamoDbClient}
+         */
+        Builder dynamoDbClient(DynamoDbClient dynamoDbClient);
+
+        @Override
+        Builder extensions(DynamoDbEnhancedClientExtension... dynamoDbEnhancedClientExtensions);
+
+        @Override
+        Builder extensions(List<DynamoDbEnhancedClientExtension> dynamoDbEnhancedClientExtensions);
+
+        /**
+         * Builds an enhanced client based on the settings supplied to this builder
+         * @return An initialized {@link DynamoDbEnhancedClient}
+         */
+        DynamoDbEnhancedClient build();
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/DynamoDbEnhancedClientExtension.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/DynamoDbEnhancedClientExtension.java
new file mode 100644
index 000000000000..13fbd52f16a2
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/DynamoDbEnhancedClientExtension.java
@@ -0,0 +1,56 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb;
+
+import software.amazon.awssdk.annotations.SdkPublicApi;
+import software.amazon.awssdk.enhanced.dynamodb.extensions.ReadModification;
+import software.amazon.awssdk.enhanced.dynamodb.extensions.WriteModification;
+
+/**
+ * Interface for extending the DynamoDb Enhanced client. Two hooks are provided, one that is called just before a record
+ * is written to the database, and one called just after a record is read from the database. This gives the extension the
+ * opportunity to act as an invisible layer between the application and the database and transform the data accordingly.
+ * <p>
+ * Multiple extensions can be used with the enhanced client, but the order in which they are loaded is important. For
+ * instance one extension may overwrite the value of an attribute that another extension then includes in a checksum
+ * calculation.
+ */
+@SdkPublicApi
+public interface DynamoDbEnhancedClientExtension {
+    /**
+     * This hook is called just before an operation is going to write data to the database. The extension that
+     * implements this method can choose to transform the item itself, or add a condition to the write operation
+     * or both.
+     *
+     * @param context The {@link DynamoDbExtensionContext.BeforeWrite} context containing the state of the execution.
+     * @return A {@link WriteModification} object that can alter the behavior of the write operation.
+     */
+    default WriteModification beforeWrite(DynamoDbExtensionContext.BeforeWrite context) {
+        return WriteModification.builder().build();
+    }
+
+    /**
+     * This hook is called just after an operation that has read data from the database. The extension that
+     * implements this method can choose to transform the item, and then it is the transformed item that will be
+     * mapped back to the application instead of the item that was actually read from the database.
+     *
+     * @param context The {@link DynamoDbExtensionContext.AfterRead} context containing the state of the execution.
+     * @return A {@link ReadModification} object that can alter the results of a read operation.
+     */
+    default ReadModification afterRead(DynamoDbExtensionContext.AfterRead context) {
+        return ReadModification.builder().build();
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/DynamoDbEnhancedResource.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/DynamoDbEnhancedResource.java
new file mode 100644
index 000000000000..0b63d1172139
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/DynamoDbEnhancedResource.java
@@ -0,0 +1,54 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb;
+
+import java.util.List;
+import software.amazon.awssdk.annotations.SdkPublicApi;
+
+/**
+ * Shared interface components for {@link DynamoDbEnhancedClient} and {@link DynamoDbEnhancedAsyncClient}. Any common
+ * methods implemented by both of those classes or their builders are declared here.
+ */
+@SdkPublicApi
+public interface DynamoDbEnhancedResource {
+    /**
+     * Shared interface components for the builders of {@link DynamoDbEnhancedClient} and
+     * {@link DynamoDbEnhancedAsyncClient}
+     */
+    interface Builder {
+        /**
+         * Specifies the extensions to load with the enhanced client. The extensions will be loaded in the strict order
+         * they are supplied here. Calling this method will override any bundled extensions that are loaded by default,
+         * namely the {@link software.amazon.awssdk.enhanced.dynamodb.extensions.VersionedRecordExtension}, so this
+         * extension must be included in the supplied list otherwise it will not be loaded. Providing an empty list here
+         * will cause no extensions to get loaded, effectively dropping the default ones.
+         *
+         * @param dynamoDbEnhancedClientExtensions a list of extensions to load with the enhanced client
+         */
+        Builder extensions(DynamoDbEnhancedClientExtension... dynamoDbEnhancedClientExtensions);
+
+        /**
+         * Specifies the extensions to load with the enhanced client. The extensions will be loaded in the strict order
+         * they are supplied here. Calling this method will override any bundled extensions that are loaded by default,
+         * namely the {@link software.amazon.awssdk.enhanced.dynamodb.extensions.VersionedRecordExtension}, so this
+         * extension must be included in the supplied list otherwise it will not be loaded. Providing an empty list here
+         * will cause no extensions to get loaded, effectively dropping the default ones.
+         *
+         * @param dynamoDbEnhancedClientExtensions a list of extensions to load with the enhanced client
+         */
+        Builder extensions(List<DynamoDbEnhancedClientExtension> dynamoDbEnhancedClientExtensions);
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/DynamoDbExtensionContext.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/DynamoDbExtensionContext.java
new file mode 100644
index 000000000000..f1b5edb4cdaf
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/DynamoDbExtensionContext.java
@@ -0,0 +1,62 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb;
+
+import java.util.Map;
+import software.amazon.awssdk.annotations.SdkPublicApi;
+import software.amazon.awssdk.enhanced.dynamodb.internal.operations.OperationContext;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+
+/**
+ * A wrapper for the immutable context objects that are visible to the {@link DynamoDbEnhancedClientExtension}s.
+ */
+@SdkPublicApi
+public final class DynamoDbExtensionContext {
+    private DynamoDbExtensionContext() {
+    }
+
+    @SdkPublicApi
+    public interface Context {
+        /**
+         * @return The {@link AttributeValue} map of the items that is about to be written or has just been read.
+         */
+        Map<String, AttributeValue> items();
+
+        /**
+         * @return The context under which the operation to be modified is taking place.
+         */
+        OperationContext operationContext();
+
+        /**
+         * @return A {@link TableMetadata} object describing the structure of the modelled table.
+         */
+        TableMetadata tableMetadata();
+    }
+
+    /**
+     * The state of the execution when the {@link DynamoDbEnhancedClientExtension#beforeWrite} method is invoked.
+     */
+    @SdkPublicApi
+    public interface BeforeWrite extends Context {
+    }
+
+    /**
+     * The state of the execution when the {@link DynamoDbEnhancedClientExtension#afterRead} method is invoked.
+     */
+    @SdkPublicApi
+    public interface AfterRead extends Context {
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/DynamoDbIndex.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/DynamoDbIndex.java
new file mode 100644
index 000000000000..a9725ae1557c
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/DynamoDbIndex.java
@@ -0,0 +1,241 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb;
+
+import java.util.function.Consumer;
+import software.amazon.awssdk.annotations.SdkPublicApi;
+import software.amazon.awssdk.core.pagination.sync.SdkIterable;
+import software.amazon.awssdk.enhanced.dynamodb.model.Page;
+import software.amazon.awssdk.enhanced.dynamodb.model.QueryConditional;
+import software.amazon.awssdk.enhanced.dynamodb.model.QueryEnhancedRequest;
+import software.amazon.awssdk.enhanced.dynamodb.model.ScanEnhancedRequest;
+
+/**
+ * Synchronous interface for running commands against an object that is linked to a specific DynamoDb secondary index
+ * and knows how to map records from the table that index is linked to into a modelled object.
+ * <p>
+ * By default, all command methods throw an {@link UnsupportedOperationException} to prevent interface extensions from breaking
+ * implementing classes.
+ *
+ * @param <T> The type of the modelled object.
+ */
+@SdkPublicApi
+public interface DynamoDbIndex<T> {
+
+    /**
+     * Executes a query against a secondary index using a {@link QueryConditional} expression to retrieve a list of
+     * items matching the given conditions.
+     * <p>
+     * The result is accessed through iterable pages (see {@link Page}) in an interactive way; each time a
+     * result page is retrieved, a query call is made to DynamoDb to get those entries. If no matches are found,
+     * the resulting iterator will contain an empty page. Results are sorted by sort key value in
+     * ascending order by default; this behavior can be overridden in the {@link QueryEnhancedRequest}.
+     * <p>
+     * The additional configuration parameters that the enhanced client supports are defined
+     * in the {@link QueryEnhancedRequest}.
+     * <p>
+     * This operation calls the low-level DynamoDB API Query operation. Consult the Query documentation for
+     * further details and constraints.
+     * <p>
+     * Example:
+     * <pre>
+     * {@code
+     *
+     * QueryConditional queryConditional = QueryConditional.keyEqualTo(Key.builder().partitionValue("id-value").build());
+     * Iterator<Page<MyItem>> results = mappedIndex.query(QueryEnhancedRequest.builder()
+     *                                                                        .queryConditional(queryConditional)
+     *                                                                        .build());
+     * }
+     * </pre>
+     *
+     * @param request A {@link QueryEnhancedRequest} defining the query conditions and how
+     * to handle the results.
+     * @return an iterator of type {@link SdkIterable} with paginated results (see {@link Page}).
+     */
+    default SdkIterable<Page<T>> query(QueryEnhancedRequest request) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Executes a query against a secondary index using a {@link QueryConditional} expression to retrieve a list of
+     * items matching the given conditions.
+     * <p>
+     * The result is accessed through iterable pages (see {@link Page}) in an interactive way; each time a
+     * result page is retrieved, a query call is made to DynamoDb to get those entries. If no matches are found,
+     * the resulting iterator will contain an empty page. Results are sorted by sort key value in
+     * ascending order by default; this behavior can be overridden in the {@link QueryEnhancedRequest}.
+     * <p>
+     * The additional configuration parameters that the enhanced client supports are defined
+     * in the {@link QueryEnhancedRequest}.
+     * <p>
+     * This operation calls the low-level DynamoDB API Query operation. Consult the Query documentation for
+     * further details and constraints.
+     * <p>
+     * <b>Note:</b> This is a convenience method that creates an instance of the request builder avoiding the need to create one
+     * manually via {@link QueryEnhancedRequest#builder()}.
+     * <p>
+     * Example:
+     * <pre>
+     * {@code
+     *
+     * Iterator<Page<MyItem>> results =
+     *     mappedIndex.query(r -> r.queryConditional(QueryConditional.keyEqualTo(k -> k.partitionValue("id-value"))));
+     * }
+     * </pre>
+     *
+     * @param requestConsumer A {@link Consumer} of {@link QueryEnhancedRequest} defining the query conditions and how to
+     * handle the results.
+     * @return an iterator of type {@link SdkIterable} with paginated results (see {@link Page}).
+     */
+    default SdkIterable<Page<T>> query(Consumer<QueryEnhancedRequest.Builder> requestConsumer) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Executes a query against the secondary index of the table using a {@link QueryConditional} expression to retrieve
+     * a list of items matching the given conditions.
+     * <p>
+     * The result is accessed through iterable pages (see {@link Page}) in an interactive way; each time a
+     * result page is retrieved, a query call is made to DynamoDb to get those entries. If no matches are found,
+     * the resulting iterator will contain an empty page. Results are sorted by sort key value in
+     * ascending order.
+     * <p>
+     * This operation calls the low-level DynamoDB API Query operation. Consult the Query documentation for
+     * further details and constraints.
+     * <p>
+     * Example:
+     * <pre>
+     * {@code
+     *
+     * Iterator<Page<MyItem>> results =
+     *     mappedIndex.query(QueryConditional.keyEqualTo(Key.builder().partitionValue("id-value").build()));
+     * }
+     * </pre>
+     *
+     * @param queryConditional A {@link QueryConditional} defining the matching criteria for records to be queried.
+     * @return an iterator of type {@link SdkIterable} with paginated results (see {@link Page}).
+     */
+    default SdkIterable<Page<T>> query(QueryConditional queryConditional) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Scans the table against a secondary index and retrieves all items.
+     * <p>
+     * The result is accessed through iterable pages (see {@link Page}) in an interactive way; each time a
+     * result page is retrieved, a scan call is made to DynamoDb to get those entries. If no matches are found,
+     * the resulting iterator will contain an empty page.
+     * <p>
+     * The additional configuration parameters that the enhanced client supports are defined
+     * in the {@link ScanEnhancedRequest}.
+     * <p>
+     * Example:
+     * <pre>
+     * {@code
+     *
+     * Iterator<Page<MyItem>> results = mappedTable.scan(ScanEnhancedRequest.builder().consistentRead(true).build());
+     * }
+     * </pre>
+     *
+     * @param request A {@link ScanEnhancedRequest} defining how to handle the results.
+     * @return an iterator of type {@link SdkIterable} with paginated results (see {@link Page}).
+     */
+    default SdkIterable<Page<T>> scan(ScanEnhancedRequest request) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Scans the table against a secondary index and retrieves all items.
+     * <p>
+     * The result is accessed through iterable pages (see {@link Page}) in an interactive way; each time a
+     * result page is retrieved, a scan call is made to DynamoDb to get those entries. If no matches are found,
+     * the resulting iterator will contain an empty page.
+     * <p>
+     * The additional configuration parameters that the enhanced client supports are defined
+     * in the {@link ScanEnhancedRequest}.
+     * <p>
+     * <b>Note:</b> This is a convenience method that creates an instance of the request builder avoiding the need to create one
+     * manually via {@link ScanEnhancedRequest#builder()}.
+     * <p>
+     * Example:
+     * <pre>
+     * {@code
+     *
+     * Iterator<Page<MyItem>> results = mappedTable.scan(r -> r.limit(5));
+     * }
+     * </pre>
+     *
+     * @param requestConsumer A {@link Consumer} of {@link ScanEnhancedRequest} defining the query conditions and how to
+     * handle the results.
+     * @return an iterator of type {@link SdkIterable} with paginated results (see {@link Page}).
+     */
+    default SdkIterable<Page<T>> scan(Consumer<ScanEnhancedRequest.Builder> requestConsumer) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Scans the table against a secondary index and retrieves all items using default settings.
+     * <p>
+     * The result is accessed through iterable pages (see {@link Page}) in an interactive way; each time a
+     * result page is retrieved, a scan call is made to DynamoDb to get those entries. If no matches are found,
+     * the resulting iterator will contain an empty page.
+     * <p>
+     * Example:
+     * <pre>
+     * {@code
+     *
+     * Iterator<Page<MyItem>> results = mappedTable.scan();
+     * }
+     * </pre>
+     *
+     * @return an iterator of type {@link SdkIterable} with paginated results (see {@link Page}).
+     */
+    default SdkIterable<Page<T>> scan() {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Gets the {@link DynamoDbEnhancedClientExtension} associated with this mapped resource.
+     * @return The {@link DynamoDbEnhancedClientExtension} associated with this mapped resource.
+     */
+    DynamoDbEnhancedClientExtension mapperExtension();
+
+    /**
+     * Gets the {@link TableSchema} object that this mapped table was built with.
+     * @return The {@link TableSchema} object for this mapped table.
+     */
+    TableSchema<T> tableSchema();
+
+    /**
+     * Gets the physical table name that operations performed by this object will be executed against.
+     * @return The physical table name.
+     */
+    String tableName();
+
+    /**
+     * Gets the physical secondary index name that operations performed by this object will be executed against.
+     * @return The physical secondary index name.
+     */
+    String indexName();
+
+    /**
+     * Creates a {@link Key} object from a modelled item. This key can be used in query conditionals and get
+     * operations to locate a specific record.
+     * @param item The item to extract the key fields from.
+     * @return A key that has been initialized with the index values extracted from the modelled object.
+     */
+    Key keyFrom(T item);
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/DynamoDbTable.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/DynamoDbTable.java
new file mode 100644
index 000000000000..1a1765cbdeba
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/DynamoDbTable.java
@@ -0,0 +1,656 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb;
+
+import java.util.function.Consumer;
+import software.amazon.awssdk.annotations.SdkPublicApi;
+import software.amazon.awssdk.core.pagination.sync.SdkIterable;
+import software.amazon.awssdk.enhanced.dynamodb.model.CreateTableEnhancedRequest;
+import software.amazon.awssdk.enhanced.dynamodb.model.DeleteItemEnhancedRequest;
+import software.amazon.awssdk.enhanced.dynamodb.model.GetItemEnhancedRequest;
+import software.amazon.awssdk.enhanced.dynamodb.model.Page;
+import software.amazon.awssdk.enhanced.dynamodb.model.PageIterable;
+import software.amazon.awssdk.enhanced.dynamodb.model.PutItemEnhancedRequest;
+import software.amazon.awssdk.enhanced.dynamodb.model.QueryConditional;
+import software.amazon.awssdk.enhanced.dynamodb.model.QueryEnhancedRequest;
+import software.amazon.awssdk.enhanced.dynamodb.model.ScanEnhancedRequest;
+import software.amazon.awssdk.enhanced.dynamodb.model.UpdateItemEnhancedRequest;
+import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
+
+/**
+ * Synchronous interface for running commands against an object that is linked to a specific DynamoDb table resource
+ * and therefore knows how to map records from that table into a modelled object.
+ * <p>
+ * By default, all command methods throw an {@link UnsupportedOperationException} to prevent interface extensions from
+ * breaking implementing classes.
+ * <p>
+ * @param <T> The type of the modelled object.
+ */
+@SdkPublicApi
+public interface DynamoDbTable<T> extends MappedTableResource<T> {
+    /**
+     * Returns a mapped index that can be used to execute commands against a secondary index belonging to the table
+     * being mapped by this object. Note that only a subset of the commands that work against a table will work
+     * against a secondary index.
+     *
+     * @param indexName The name of the secondary index to build the command interface for.
+     * @return A {@link DynamoDbIndex} object that can be used to execute database commands against.
+     */
+    DynamoDbIndex<T> index(String indexName);
+
+    /**
+     * Creates a new table in DynamoDb with the name and schema already defined for this DynamoDbTable
+     * together with additional parameters specified in the supplied request object, {@link CreateTableEnhancedRequest}.
+     * <p>
+     * Use {@link DynamoDbEnhancedClient#table(String, TableSchema)} to define the mapped table resource.
+     * <p>
+     * This operation calls the low-level DynamoDB API CreateTable operation. Note that this is an asynchronous
+     * operation and that the table may not immediately be available for writes and reads. Currently, there is no
+     * mechanism supported within this library to wait for/check the status of a created table. You must provide this
+     * functionality yourself. Consult the CreateTable documentation for further details and constraints.
+     * <p>
+     * Example:
+     * <pre>
+     * {@code
+     *
+     * ProvisionedThroughput provisionedThroughput = ProvisionedThroughput.builder()
+     *                                                                    .readCapacityUnits(50L)
+     *                                                                    .writeCapacityUnits(50L)
+     *                                                                    .build();
+     * mappedTable.createTable(CreateTableEnhancedRequest.builder()
+     *                                                   .provisionedThroughput(provisionedThroughput)
+     *                                                   .build());
+     * }
+     * </pre>
+     *
+     * @param request A {@link CreateTableEnhancedRequest} containing optional parameters for table creation.
+     */
+    default void createTable(CreateTableEnhancedRequest request) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Creates a new table in DynamoDb with the name and schema already defined for this DynamoDbTable
+     * together with additional parameters specified in the supplied request object, {@link CreateTableEnhancedRequest}.
+     * <p>
+     * Use {@link DynamoDbEnhancedClient#table(String, TableSchema)} to define the mapped table resource.
+     * <p>
+     * This operation calls the low-level DynamoDB API CreateTable operation. Note that this is an asynchronous
+     * operation and that the table may not immediately be available for writes and reads. Currently, there is no
+     * mechanism supported within this library to wait for/check the status of a created table. You must provide this
+     * functionality yourself. Consult the CreateTable documentation for further details and constraints.
+     * <p>
+     * <b>Note:</b> This is a convenience method that creates an instance of the request builder avoiding the need to
+     * create one manually via {@link CreateTableEnhancedRequest#builder()}.
+     * <p>
+     * Example:
+     * <pre>
+     * {@code
+     *
+     * ProvisionedThroughput provisionedThroughput = ProvisionedThroughput.builder()
+     *                                                                    .readCapacityUnits(50L)
+     *                                                                    .writeCapacityUnits(50L)
+     *                                                                    .build();
+     * mappedTable.createTable(r -> r.provisionedThroughput(provisionedThroughput));
+     * }
+     * </pre>
+     *
+     * @param requestConsumer A {@link Consumer} of {@link CreateTableEnhancedRequest.Builder} containing optional
+     *                        parameters for table creation.
+     */
+    default void createTable(Consumer<CreateTableEnhancedRequest.Builder> requestConsumer) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Creates a new table in DynamoDb with the name and schema already defined for this DynamoDbTable.
+     * <p>
+     * Use {@link DynamoDbEnhancedClient#table(String, TableSchema)} to define the mapped table resource.
+     * <p>
+     * This operation calls the low-level DynamoDB API CreateTable operation. Note that this is an asynchronous
+     * operation and that the table may not immediately be available for writes and reads. Currently, there is no
+     * mechanism supported within this library to wait for/check the status of a created table. You must provide this
+     * functionality yourself. Consult the CreateTable documentation for further details and constraints.
+     * <p>
+     * Example:
+     * <pre>
+     * {@code
+     *
+     * mappedTable.createTable();
+     * }
+     * </pre>
+     *
+     */
+    default void createTable() {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Deletes a single item from the mapped table using a supplied primary {@link Key}.
+     * <p>
+     * The additional configuration parameters that the enhanced client supports are defined
+     * in the {@link DeleteItemEnhancedRequest}.
+     * <p>
+     * This operation calls the low-level DynamoDB API DeleteItem operation. Consult the DeleteItem documentation for
+     * further details and constraints.
+     * <p>
+     * Example:
+     * <pre>
+     * {@code
+     *
+     * MyItem previouslyPersistedItem = mappedTable.delete(DeleteItemEnhancedRequest.builder().key(key).build());
+     * }
+     * </pre>
+     *
+     * @param request A {@link DeleteItemEnhancedRequest} with key and optional directives for deleting an item from the
+     *                table.
+     * @return The item that was persisted in the database before it was deleted.
+     */
+    default T deleteItem(DeleteItemEnhancedRequest request) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Deletes a single item from the mapped table using a supplied primary {@link Key}.
+     * <p>
+     * The additional configuration parameters that the enhanced client supports are defined
+     * in the {@link DeleteItemEnhancedRequest}.
+     * <p>
+     * This operation calls the low-level DynamoDB API DeleteItem operation. Consult the DeleteItem documentation for
+     * further details and constraints.
+     * <p>
+     * <b>Note:</b> This is a convenience method that creates an instance of the request builder avoiding the need to
+     * create one manually via {@link DeleteItemEnhancedRequest#builder()}.
+     * <p>
+     * Example:
+     * <pre>
+     * {@code
+     *
+     * MyItem previouslyPersistedItem = mappedTable.delete(r -> r.key(key));
+     * }
+     * </pre>
+     *
+     * @param requestConsumer A {@link Consumer} of {@link DeleteItemEnhancedRequest} with key and
+     * optional directives for deleting an item from the table.
+     * @return The item that was persisted in the database before it was deleted.
+     */
+    default T deleteItem(Consumer<DeleteItemEnhancedRequest.Builder> requestConsumer) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Deletes a single item from the mapped table using a supplied primary {@link Key}.
+     * <p>
+     * This operation calls the low-level DynamoDB API DeleteItem operation. Consult the DeleteItem documentation for
+     * further details and constraints.
+     * <p>
+     * Example:
+     * <pre>
+     * {@code
+     *
+     * MyItem previouslyPersistedItem = mappedTable.delete(key);
+     * }
+     * </pre>
+     *
+     * @param key A {@link Key} that will be used to match a specific record to delete from the database table.
+     * @return The item that was persisted in the database before it was deleted.
+     */
+    default T deleteItem(Key key) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Deletes a single item from the mapped table using just the key of a supplied modelled 'key item' object.
+     * <p>
+     * This operation calls the low-level DynamoDB API DeleteItem operation. Consult the DeleteItem documentation for
+     * further details and constraints.
+     * <p>
+     * Example:
+     * <pre>
+     * {@code
+     *
+     * MyItem previouslyPersistedItem = mappedTable.deleteItem(keyItem);
+     * }
+     * </pre>
+     *
+     * @param keyItem A modelled item with the primary key fields set that will be used to match a specific record to
+     *                delete from the database table.
+     * @return The item that was persisted in the database before it was deleted.
+     */
+    default T deleteItem(T keyItem) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Retrieves a single item from the mapped table using a supplied primary {@link Key}.
+     * <p>
+     * The additional configuration parameters that the enhanced client supports are defined
+     * in the {@link GetItemEnhancedRequest}.
+     * <p>
+     * This operation calls the low-level DynamoDB API GetItem operation. Consult the GetItem documentation for
+     * further details and constraints.
+     * <p>
+     * Example:
+     * <pre>
+     * {@code
+     *
+     * MyItem item = mappedTable.getItem(GetItemEnhancedRequest.builder().key(key).build());
+     * }
+     * </pre>
+     *
+     * @param request A {@link GetItemEnhancedRequest} with key and optional directives for retrieving an item from the
+     *                table.
+     * @return The retrieved item
+     */
+    default T getItem(GetItemEnhancedRequest request) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Retrieves a single item from the mapped table using a supplied primary {@link Key}.
+     * <p>
+     * The additional configuration parameters that the enhanced client supports are defined
+     * in the {@link GetItemEnhancedRequest}.
+     * <p>
+     * This operation calls the low-level DynamoDB API GetItem operation. Consult the GetItem documentation for
+     * further details and constraints.
+     * <p>
+     * <b>Note:</b> This is a convenience method that creates an instance of the request builder avoiding the need to
+     * create one manually via {@link GetItemEnhancedRequest#builder()}.
+     * <p>
+     * Example:
+     * <pre>
+     * {@code
+     *
+     * MyItem item = mappedTable.getItem(r -> r.key(key));
+     * }
+     * </pre>
+     *
+     * @param requestConsumer A {@link Consumer} of {@link GetItemEnhancedRequest.Builder} with key and optional
+     *                        directives for retrieving an item from the table.
+     * @return The retrieved item
+     */
+    default T getItem(Consumer<GetItemEnhancedRequest.Builder> requestConsumer) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Retrieves a single item from the mapped table using a supplied primary {@link Key}.
+     * <p>
+     * This operation calls the low-level DynamoDB API GetItem operation. Consult the GetItem documentation for
+     * further details and constraints.
+     * <p>
+     * Example:
+     * <pre>
+     * {@code
+     *
+     * MyItem item = mappedTable.getItem(key);
+     * }
+     * </pre>
+     *
+     * @param key A {@link Key} that will be used to match a specific record to retrieve from the database table.
+     * @return The retrieved item
+     */
+    default T getItem(Key key) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Retrieves a single item from the mapped table using just the key of a supplied modelled 'key item'.
+     * <p>
+     * This operation calls the low-level DynamoDB API GetItem operation. Consult the GetItem documentation for
+     * further details and constraints.
+     * <p>
+     * Example:
+     * <pre>
+     * {@code
+     *
+     * MyItem item = mappedTable.getItem(keyItem);
+     * }
+     * </pre>
+     *
+     * @param keyItem A modelled item with the primary key fields set that will be used to match a specific record to
+     *                retrieve from the database table.
+     * @return The retrieved item
+     */
+    default T getItem(T keyItem) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Executes a query against the primary index of the table using a {@link QueryConditional} expression to retrieve a
+     * list of items matching the given conditions.
+     * <p>
+     * The result can be accessed either through iterable {@link Page}s or {@link Page#items()} directly. If you are iterating
+     * the pages, the result is accessed through iterable pages (see {@link Page}) in an interactive way; each time a
+     * result page is retrieved, a query call is made to DynamoDb to get those entries. If no matches are found,
+     * the resulting iterator will contain an empty page. Results are sorted by sort key value in ascending order by default;
+     * this behavior can be overridden in the {@link QueryEnhancedRequest}.
+     * <p>
+     * The additional configuration parameters that the enhanced client supports are defined
+     * in the {@link QueryEnhancedRequest}.
+     * <p>
+     * This operation calls the low-level DynamoDB API Query operation. Consult the Query documentation for
+     * further details and constraints.
+     * <p>
+     * Example:
+     * <p>
+     * 1) Iterating through pages
+     *
+     * <pre>
+     * {@code
+     * QueryConditional queryConditional = QueryConditional.keyEqualTo(Key.builder().partitionValue("id-value").build());
+     * PageIterable<MyItem> results = table.query(QueryEnhancedRequest.builder()
+     *                                                                        .queryConditional(queryConditional)
+     *                                                                        .build());
+     * results.stream().forEach(p -> p.items().forEach(item -> System.out.println(item)))
+     * }
+     * </pre>
+     *
+     * 2) Iterating through items
+     *
+     * <pre>
+     * {@code
+     * results.items().stream().forEach(item -> System.out.println(item));
+     * }
+     * </pre>
+     *
+     * @see #query(QueryConditional)
+     * @see #query(Consumer)
+     * @see DynamoDbClient#queryPaginator
+     * @param request A {@link QueryEnhancedRequest} defining the query conditions and how
+     * to handle the results.
+     * @return an iterator of type {@link SdkIterable} with paginated results (see {@link Page}).
+     */
+    default PageIterable<T> query(QueryEnhancedRequest request) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * This is a convenience method that creates an instance of the request builder avoiding the need to create one
+     * manually via {@link QueryEnhancedRequest#builder()}.
+     * <p>
+     * Example:
+     * <pre>
+     * {@code
+     *
+     * PageIterable<MyItem> results =
+     *     mappedTable.query(r -> r.queryConditional(QueryConditional.keyEqualTo(k -> k.partitionValue("id-value"))));
+     * }
+     * </pre>
+     * @see #query(QueryEnhancedRequest)
+     * @see #query(QueryConditional)
+     * @param requestConsumer A {@link Consumer} of {@link QueryEnhancedRequest} defining the query conditions and how to
+     * handle the results.
+     * @return an iterator of type {@link SdkIterable} with paginated results (see {@link Page}).
+     */
+    default PageIterable<T> query(Consumer<QueryEnhancedRequest.Builder> requestConsumer) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Executes a query against the primary index of the table using a {@link QueryConditional} expression to retrieve a
+     * list of items matching the given conditions.
+     * <p>
+     * Example:
+     * <pre>
+     * {@code
+     *
+     * PageIterable<MyItem> results =
+     *     mappedTable.query(QueryConditional.keyEqualTo(Key.builder().partitionValue("id-value").build()));
+     * }
+     * </pre>
+     *
+     * @see #query(QueryEnhancedRequest)
+     * @see #query(Consumer)
+     * @see DynamoDbClient#queryPaginator
+     * @param queryConditional A {@link QueryConditional} defining the matching criteria for records to be queried.
+     * @return an iterator of type {@link SdkIterable} with paginated results (see {@link Page}).
+     */
+    default PageIterable<T> query(QueryConditional queryConditional) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Puts a single item in the mapped table. If the table contains an item with the same primary key, it will be
+     * replaced with this item.
+     * <p>
+     * The additional configuration parameters that the enhanced client supports are defined
+     * in the {@link PutItemEnhancedRequest}.
+     * <p>
+     * This operation calls the low-level DynamoDB API PutItem operation. Consult the PutItem documentation for
+     * further details and constraints.
+     * <p>
+     * Example:
+     * <pre>
+     * {@code
+     *
+     * mappedTable.putItem(PutItemEnhancedRequest.builder(MyItem.class).item(item).build());
+     * }
+     * </pre>
+     *
+     * @param request A {@link PutItemEnhancedRequest} that includes the item to enter into
+     * the table, its class and optional directives.
+     */
+    default void putItem(PutItemEnhancedRequest<T> request) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Puts a single item in the mapped table. If the table contains an item with the same primary key, it will be
+     * replaced with this item.
+     * <p>
+     * The additional configuration parameters that the enhanced client supports are defined
+     * in the {@link PutItemEnhancedRequest}.
+     * <p>
+     * This operation calls the low-level DynamoDB API PutItem operation. Consult the PutItem documentation for
+     * further details and constraints.
+     * <p>
+     * Example:
+     * <pre>
+     * {@code
+     *
+     * mappedTable.putItem(r -> r.item(item));
+     * }
+     * </pre>
+     *
+     * @param requestConsumer A {@link Consumer} of {@link PutItemEnhancedRequest.Builder} that includes the item
+     * to enter into the table, its class and optional directives.
+     */
+    default void putItem(Consumer<PutItemEnhancedRequest.Builder<T>> requestConsumer) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Puts a single item in the mapped table. If the table contains an item with the same primary key, it will be
+     * replaced with this item.
+     * <p>
+     * This operation calls the low-level DynamoDB API PutItem operation. Consult the PutItem documentation for
+     * further details and constraints.
+     * <p>
+     * Example:
+     * <pre>
+     * {@code
+     *
+     * mappedTable.putItem(item);
+     * }
+     * </pre>
+     *
+     * @param item the modelled item to be inserted into or overwritten in the database table.
+     */
+    default void putItem(T item) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Scans the table and retrieves all items.
+     * <p>
+     * The result can be accessed either through iterable {@link Page}s or items across all pages directly. Each time a
+     * result page is retrieved, a query call is made to DynamoDb to get those entries. If no matches are found,
+     * the resulting iterator will contain an empty page.
+     * <p>
+     * The additional configuration parameters that the enhanced client supports are defined
+     * in the {@link ScanEnhancedRequest}.
+     * <p>
+     * Example:
+     * <p>
+     * 1) Iterating through pages
+     * <pre>
+     * {@code
+     *
+     * PageIterable<MyItem> results = mappedTable.scan(ScanEnhancedRequest.builder().consistentRead(true).build());
+     * results.stream().forEach(p -> p.items().forEach(item -> System.out.println(item)))
+     * }
+     * </pre>
+     *
+     * <p>
+     * 2) Iterating through items
+     * <pre>
+     * {@code
+     *
+     * PageIterable<MyItem> results = mappedTable.scan(ScanEnhancedRequest.builder().consistentRead(true).build());
+     * results.items().stream().forEach(item -> System.out.println(item));
+     * }
+     * </pre>
+     *
+     * @see #scan(Consumer)
+     * @see #scan()
+     * @see DynamoDbClient#scanPaginator
+     * @param request A {@link ScanEnhancedRequest} defining how to handle the results.
+     * @return an iterator of type {@link SdkIterable} with paginated results (see {@link Page}).
+     */
+    default PageIterable<T> scan(ScanEnhancedRequest request) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * This is a convenience method that creates an instance of the request builder avoiding the need to create one
+     * manually via {@link ScanEnhancedRequest#builder()}.
+     *
+     * <p>
+     * Example:
+     * <pre>
+     * {@code
+     *
+     * PageIterable<MyItem> results = mappedTable.scan(r -> r.limit(5));
+     * }
+     * </pre>
+     *
+     * @see #scan(ScanEnhancedRequest)
+     * @see #scan()
+     * @param requestConsumer A {@link Consumer} of {@link ScanEnhancedRequest} defining the query conditions and how to
+     * handle the results.
+     * @return an iterator of type {@link SdkIterable} with paginated results (see {@link Page}).
+     */
+    default PageIterable<T> scan(Consumer<ScanEnhancedRequest.Builder> requestConsumer) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Scans the table and retrieves all items using default settings.
+     * <p>
+     * The result can be accessed either through iterable {@link Page}s or items across all pages directly. Each time a
+     * result page is retrieved, a query call is made to DynamoDb to get those entries. If no matches are found,
+     * the resulting iterator will contain an empty page.
+     * <p>
+     * Example:
+     * <pre>
+     * {@code
+     *
+     * PageIterable<MyItem> results = mappedTable.scan();
+     * }
+     * </pre>
+     *
+     * @see #scan(ScanEnhancedRequest)
+     * @see #scan(Consumer)
+     * @see DynamoDbClient#scanPaginator
+     * @return an iterator of type {@link SdkIterable} with paginated results (see {@link Page}).
+     */
+    default PageIterable<T> scan() {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Updates an item in the mapped table, or adds it if it doesn't exist.
+     * <p>
+     * The additional configuration parameters that the enhanced client supports are defined
+     * in the {@link UpdateItemEnhancedRequest}.
+     * <p>
+     * This operation calls the low-level DynamoDB API UpdateItem operation. Consult the UpdateItem documentation for
+     * further details and constraints.
+     * <p>
+     * Example:
+     * <pre>
+     * {@code
+     *
+     * MyItem item = mappedTable.updateItem(UpdateItemEnhancedRequest.builder(MyItem.class).item(item).build());
+     * }
+     * </pre>
+     *
+     * @param request A {@link UpdateItemEnhancedRequest} that includes the item to be updated,
+     * its class and optional directives.
+     * @return The updated item
+     */
+    default T updateItem(UpdateItemEnhancedRequest<T> request) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Updates an item in the mapped table, or adds it if it doesn't exist.
+     * <p>
+     * The additional configuration parameters that the enhanced client supports are defined
+     * in the {@link UpdateItemEnhancedRequest}.
+     * <p>
+     * This operation calls the low-level DynamoDB API UpdateItem operation. Consult the UpdateItem documentation for
+     * further details and constraints.
+     * <p>
+     * Example:
+     * <pre>
+     * {@code
+     *
+     * MyItem item = mappedTable.updateItem(r -> r.item(item));
+     * }
+     * </pre>
+     *
+     * @param requestConsumer A {@link Consumer} of {@link UpdateItemEnhancedRequest.Builder} that includes the item
+     * to be updated, its class and optional directives.
+     * @return The updated item
+     */
+    default T updateItem(Consumer<UpdateItemEnhancedRequest.Builder<T>> requestConsumer) {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Updates an item in the mapped table, or adds it if it doesn't exist.
+     * <p>
+     * This operation calls the low-level DynamoDB API UpdateItem operation. Consult the UpdateItem documentation for
+     * further details and constraints.
+     * <p>
+     * Example:
+     * <pre>
+     * {@code
+     *
+     * MyItem item = mappedTable.updateItem(item);
+     * }
+     * </pre>
+     *
+     * @param item the modelled item to be inserted into or updated in the database table.
+     * @return The updated item
+     */
+    default T updateItem(T item) {
+        throw new UnsupportedOperationException();
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/EnhancedType.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/EnhancedType.java
new file mode 100644
index 000000000000..62e0446c1148
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/EnhancedType.java
@@ -0,0 +1,558 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb;
+
+import static java.util.stream.Collectors.toList;
+
+import java.lang.reflect.GenericArrayType;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.lang.reflect.TypeVariable;
+import java.lang.reflect.WildcardType;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Deque;
+import java.util.List;
+import java.util.Map;
+import java.util.NavigableMap;
+import java.util.NavigableSet;
+import java.util.Optional;
+import java.util.Set;
+import java.util.SortedMap;
+import java.util.SortedSet;
+import java.util.concurrent.ConcurrentMap;
+import java.util.stream.Collectors;
+import software.amazon.awssdk.annotations.Immutable;
+import software.amazon.awssdk.annotations.SdkPublicApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.enhanced.dynamodb.internal.mapper.DefaultParameterizedType;
+import software.amazon.awssdk.utils.Validate;
+
+/**
+ * Similar to {@link Class}, this represents a specific raw class type. Unlike {@code Class}, this allows representing type
+ * parameters that would usually be erased.
+ *
+ * @see #EnhancedType()
+ * @see #of(Class)
+ * @see #listOf(Class)
+ * @see #mapOf(Class, Class)
+ */
+@SdkPublicApi
+@ThreadSafe
+@Immutable
+public class EnhancedType<T> {
+    private final boolean isWildcard;
+    private final Class<T> rawClass;
+    private final List<EnhancedType<?>> rawClassParameters;
+    private final TableSchema<T> tableSchema;
+
+    /**
+     * Create a type token, capturing the generic type arguments of the token as {@link Class}es.
+     *
+     * <p>
+     * <b>This must be called from an anonymous subclass.</b> For example, </b>
+     * {@code new EnhancedType<Iterable<String>>()&#123;&#125;} (note the extra {}) for a {@code EnhancedType<Iterable<String>>}.
+     */
+    protected EnhancedType() {
+        this(null);
+    }
+
+    private EnhancedType(Type type) {
+        if (type == null) {
+            type = captureGenericTypeArguments();
+        }
+
+
+        if (type instanceof WildcardType) {
+            this.isWildcard = true;
+            this.rawClass = null;
+            this.rawClassParameters = null;
+            this.tableSchema = null;
+        } else {
+            this.isWildcard = false;
+            this.rawClass = validateAndConvert(type);
+            this.rawClassParameters = loadTypeParameters(type);
+            this.tableSchema = null;
+        }
+    }
+
+    private EnhancedType(Class<?> rawClass, List<EnhancedType<?>> rawClassParameters, TableSchema<T> tableSchema) {
+        // This is only used internally, so we can make sure this cast is safe via testing.
+        this.rawClass = (Class<T>) rawClass;
+        this.isWildcard = false;
+        this.rawClassParameters = rawClassParameters;
+        this.tableSchema = tableSchema;
+    }
+
+    /**
+     * Create a type token for the provided non-parameterized class.
+     *
+     * <p>
+     * Reasons this call may fail with a {@link RuntimeException}:
+     * <ol>
+     *     <li>If the provided type is null.</li>
+     * </ol>
+     */
+    public static <T> EnhancedType<T> of(Class<T> type) {
+        return new EnhancedType<>(type);
+    }
+
+    /**
+     * Create a type token for the provided non-parameterized class.
+     *
+     * <p>
+     * Reasons this call may fail with a {@link RuntimeException}:
+     * <ol>
+     *     <li>If the provided type is null.</li>
+     * </ol>
+     */
+    public static EnhancedType<?> of(Type type) {
+        return new EnhancedType<>(type);
+    }
+
+    /**
+     * Create a type token for a optional, with the provided value type class.
+     *
+     * <p>
+     * Reasons this call may fail with a {@link RuntimeException}:
+     * <ol>
+     *     <li>If the provided type is null.</li>
+     * </ol>
+     */
+    public static <T> EnhancedType<Optional<T>> optionalOf(Class<T> valueType) {
+        return new EnhancedType<>(DefaultParameterizedType.parameterizedType(Optional.class, valueType));
+    }
+
+    /**
+     * Create a type token for a list, with the provided value type class.
+     *
+     * <p>
+     * Reasons this call may fail with a {@link RuntimeException}:
+     * <ol>
+     *     <li>If the provided type is null.</li>
+     * </ol>
+     */
+    public static <T> EnhancedType<List<T>> listOf(Class<T> valueType) {
+        return new EnhancedType<>(DefaultParameterizedType.parameterizedType(List.class, valueType));
+    }
+
+    /**
+     * Create a type token for a list, with the provided value type class.
+     *
+     * <p>
+     * Reasons this call may fail with a {@link RuntimeException}:
+     * <ol>
+     *     <li>If the provided type is null.</li>
+     * </ol>
+     */
+    public static <T> EnhancedType<List<T>> listOf(EnhancedType<T> valueType) {
+        return new EnhancedType<>(List.class, Arrays.asList(valueType), null);
+    }
+
+    /**
+     * Create a type token for a set, with the provided value type class.
+     *
+     * <p>
+     * Reasons this call may fail with a {@link RuntimeException}:
+     * <ol>
+     *     <li>If the provided type is null.</li>
+     * </ol>
+     */
+    public static <T> EnhancedType<Set<T>> setOf(Class<T> valueType) {
+        return new EnhancedType<>(DefaultParameterizedType.parameterizedType(Set.class, valueType));
+    }
+
+    /**
+     * Create a type token for a set, with the provided value type class.
+     *
+     * <p>
+     * Reasons this call may fail with a {@link RuntimeException}:
+     * <ol>
+     *     <li>If the provided type is null.</li>
+     * </ol>
+     */
+    public static <T> EnhancedType<Set<T>> setOf(EnhancedType<T> valueType) {
+        return new EnhancedType<>(Set.class, Arrays.asList(valueType), null);
+    }
+
+    /**
+     * Create a type token for a sorted set, with the provided value type class.
+     *
+     * <p>
+     * Reasons this call may fail with a {@link RuntimeException}:
+     * <ol>
+     *     <li>If the provided type is null.</li>
+     * </ol>
+     */
+    public static <T> EnhancedType<SortedSet<T>> sortedSetOf(Class<T> valueType) {
+        return new EnhancedType<>(DefaultParameterizedType.parameterizedType(SortedSet.class, valueType));
+    }
+
+    /**
+     * Create a type token for a sorted set, with the provided value type class.
+     *
+     * <p>
+     * Reasons this call may fail with a {@link RuntimeException}:
+     * <ol>
+     *     <li>If the provided type is null.</li>
+     * </ol>
+     */
+    public static <T> EnhancedType<SortedSet<T>> sortedSetOf(EnhancedType<T> valueType) {
+        return new EnhancedType<>(SortedSet.class, Arrays.asList(valueType), null);
+    }
+
+    /**
+     * Create a type token for a deque, with the provided value type class.
+     *
+     * <p>
+     * Reasons this call may fail with a {@link RuntimeException}:
+     * <ol>
+     *     <li>If the provided type is null.</li>
+     * </ol>
+     */
+    public static <T> EnhancedType<Deque<T>> dequeOf(Class<T> valueType) {
+        return new EnhancedType<>(DefaultParameterizedType.parameterizedType(Deque.class, valueType));
+    }
+
+    /**
+     * Create a type token for a deque, with the provided value type token.
+     *
+     * <p>
+     * Reasons this call may fail with a {@link RuntimeException}:
+     * <ol>
+     *     <li>If the provided type is null.</li>
+     * </ol>
+     */
+    public static <T> EnhancedType<Deque<T>> dequeOf(EnhancedType<T> valueType) {
+        return new EnhancedType<>(Deque.class, Arrays.asList(valueType), null);
+    }
+
+    /**
+     * Create a type token for a navigable set, with the provided value type class.
+     *
+     * <p>
+     * Reasons this call may fail with a {@link RuntimeException}:
+     * <ol>
+     *     <li>If the provided type is null.</li>
+     * </ol>
+     */
+    public static <T> EnhancedType<NavigableSet<T>> navigableSetOf(Class<T> valueType) {
+        return new EnhancedType<>(DefaultParameterizedType.parameterizedType(NavigableSet.class, valueType));
+    }
+
+    /**
+     * Create a type token for a navigable set, with the provided value type token.
+     *
+     * <p>
+     * Reasons this call may fail with a {@link RuntimeException}:
+     * <ol>
+     *     <li>If the provided type is null.</li>
+     * </ol>
+     */
+    public static <T> EnhancedType<NavigableSet<T>> navigableSetOf(EnhancedType<T> valueType) {
+        return new EnhancedType<>(NavigableSet.class, Arrays.asList(valueType), null);
+    }
+
+    /**
+     * Create a type token for a collection, with the provided value type class.
+     *
+     * <p>
+     * Reasons this call may fail with a {@link RuntimeException}:
+     * <ol>
+     *     <li>If the provided type is null.</li>
+     * </ol>
+     */
+    public static <T> EnhancedType<Collection<T>> collectionOf(Class<T> valueType) {
+        return new EnhancedType<>(DefaultParameterizedType.parameterizedType(Collection.class, valueType));
+    }
+
+    /**
+     * Create a type token for a collection, with the provided value type token.
+     *
+     * <p>
+     * Reasons this call may fail with a {@link RuntimeException}:
+     * <ol>
+     *     <li>If the provided type is null.</li>
+     * </ol>
+     */
+    public static <T> EnhancedType<Collection<T>> collectionOf(EnhancedType<T> valueType) {
+        return new EnhancedType<>(Collection.class, Arrays.asList(valueType), null);
+    }
+
+    /**
+     * Create a type token for a map, with the provided key and value type classes.
+     *
+     * <p>
+     * Reasons this call may fail with a {@link RuntimeException}:
+     * <ol>
+     *     <li>If the provided types are null.</li>
+     * </ol>
+     */
+    public static <T, U> EnhancedType<Map<T, U>> mapOf(Class<T> keyType, Class<U> valueType) {
+        return new EnhancedType<>(DefaultParameterizedType.parameterizedType(Map.class, keyType, valueType));
+    }
+
+    /**
+     * Create a type token for a map, with the provided key and value type classes.
+     *
+     * <p>
+     * Reasons this call may fail with a {@link RuntimeException}:
+     * <ol>
+     *     <li>If the provided types are null.</li>
+     * </ol>
+     */
+    public static <T, U> EnhancedType<Map<T, U>> mapOf(EnhancedType<T> keyType, EnhancedType<U> valueType) {
+        return new EnhancedType<>(Map.class, Arrays.asList(keyType, valueType), null);
+    }
+
+    /**
+     * Create a type token for a sorted map, with the provided key and value type classes.
+     *
+     * <p>
+     * Reasons this call may fail with a {@link RuntimeException}:
+     * <ol>
+     *     <li>If the provided types are null.</li>
+     * </ol>
+     */
+    public static <T, U> EnhancedType<SortedMap<T, U>> sortedMapOf(Class<T> keyType, Class<U> valueType) {
+        return new EnhancedType<>(DefaultParameterizedType.parameterizedType(SortedMap.class, keyType, valueType));
+    }
+
+    /**
+     * Create a type token for a sorted map, with the provided key and value type classes.
+     *
+     * <p>
+     * Reasons this call may fail with a {@link RuntimeException}:
+     * <ol>
+     *     <li>If the provided types are null.</li>
+     * </ol>
+     */
+    public static <T, U> EnhancedType<SortedMap<T, U>> sortedMapOf(EnhancedType<T> keyType,
+                                                                   EnhancedType<U> valueType) {
+        return new EnhancedType<>(SortedMap.class, Arrays.asList(keyType, valueType), null);
+    }
+
+    /**
+     * Create a type token for a concurrent map, with the provided key and value type classes.
+     *
+     * <p>
+     * Reasons this call may fail with a {@link RuntimeException}:
+     * <ol>
+     *     <li>If the provided types are null.</li>
+     * </ol>
+     */
+    public static <T, U> EnhancedType<ConcurrentMap<T, U>> concurrentMapOf(Class<T> keyType, Class<U> valueType) {
+        return new EnhancedType<>(DefaultParameterizedType.parameterizedType(ConcurrentMap.class, keyType, valueType));
+    }
+
+    /**
+     * Create a type token for a concurrent map, with the provided key and value type classes.
+     *
+     * <p>
+     * Reasons this call may fail with a {@link RuntimeException}:
+     * <ol>
+     *     <li>If the provided types are null.</li>
+     * </ol>
+     */
+    public static <T, U> EnhancedType<ConcurrentMap<T, U>> concurrentMapOf(EnhancedType<T> keyType,
+                                                                           EnhancedType<U> valueType) {
+        return new EnhancedType<>(ConcurrentMap.class, Arrays.asList(keyType, valueType), null);
+    }
+
+    /**
+     * Create a type token for a navigable map, with the provided key and value type classes.
+     *
+     * <p>
+     * Reasons this call may fail with a {@link RuntimeException}:
+     * <ol>
+     *     <li>If the provided types are null.</li>
+     * </ol>
+     */
+    public static <T, U> EnhancedType<NavigableMap<T, U>> navigableMapOf(Class<T> keyType, Class<U> valueType) {
+        return new EnhancedType<>(DefaultParameterizedType.parameterizedType(NavigableMap.class, keyType, valueType));
+    }
+
+    /**
+     * Create a type token for a navigable map, with the provided key and value type classes.
+     *
+     * <p>
+     * Reasons this call may fail with a {@link RuntimeException}:
+     * <ol>
+     *     <li>If the provided types are null.</li>
+     * </ol>
+     */
+    public static <T, U> EnhancedType<NavigableMap<T, U>> navigableMapOf(EnhancedType<T> keyType,
+                                                                         EnhancedType<U> valueType) {
+        return new EnhancedType<>(NavigableMap.class, Arrays.asList(keyType, valueType), null);
+    }
+
+    /**
+     * Create a type token that represents a document that is specified by the provided {@link TableSchema}.
+     *
+     * @param documentClass The Class representing the modeled document.
+     * @param documentTableSchema A TableSchema that describes the properties of the document.
+     * @return a new {@link EnhancedType} representing the provided document.
+     */
+    public static <T> EnhancedType<T> documentOf(Class<T> documentClass, TableSchema<T> documentTableSchema) {
+        return new EnhancedType<>(documentClass, null, documentTableSchema);
+    }
+
+    private static Type validateIsSupportedType(Type type) {
+        Validate.validState(type != null, "Type must not be null.");
+        Validate.validState(!(type instanceof GenericArrayType),
+                            "Array type %s is not supported. Use java.util.List instead of arrays.", type);
+        Validate.validState(!(type instanceof TypeVariable), "Type variable type %s is not supported.", type);
+
+        if (type instanceof WildcardType) {
+            WildcardType wildcardType = (WildcardType) type;
+            Validate.validState(wildcardType.getUpperBounds().length == 1 && wildcardType.getUpperBounds()[0] == Object.class,
+                                "Non-Object wildcard type upper bounds are not supported.");
+            Validate.validState(wildcardType.getLowerBounds().length == 0,
+                                "Wildcard type lower bounds are not supported.");
+        }
+
+        return type;
+    }
+
+    /**
+     * Returns whether or not the type this {@link EnhancedType} was created with is a wildcard type.
+     */
+    public boolean isWildcard() {
+        return isWildcard;
+    }
+
+    /**
+     * Retrieve the {@link Class} object that this type token represents.
+     *
+     * e.g. For {@code EnhancedType<String>}, this would return {@code String.class}.
+     */
+    public Class<T> rawClass() {
+        Validate.isTrue(!isWildcard, "A wildcard type is not expected here.");
+        return rawClass;
+    }
+
+    /**
+     * Retrieve the {@link TableSchema} for a modeled document. This is used for
+     * converting nested documents within a schema.
+     */
+    public Optional<TableSchema<T>> tableSchema() {
+        return Optional.ofNullable(tableSchema);
+    }
+
+    /**
+     * Retrieve the {@link Class} objects of any type parameters for the class that this type token represents.
+     *
+     * <p>
+     * e.g. For {@code EnhancedType<List<String>>}, this would return {@code String.class}, and {@link #rawClass()} would
+     * return {@code List.class}.
+     *
+     * <p>
+     * If there are no type parameters, this will return an empty list.
+     */
+    public List<EnhancedType<?>> rawClassParameters() {
+        Validate.isTrue(!isWildcard, "A wildcard type is not expected here.");
+        return rawClassParameters;
+    }
+
+    private Type captureGenericTypeArguments() {
+        Type superclass = getClass().getGenericSuperclass();
+
+        ParameterizedType parameterizedSuperclass =
+            Validate.isInstanceOf(ParameterizedType.class, superclass, "%s isn't parameterized", superclass);
+
+        return parameterizedSuperclass.getActualTypeArguments()[0];
+    }
+
+    private Class<T> validateAndConvert(Type type) {
+        validateIsSupportedType(type);
+
+        if (type instanceof Class) {
+            return (Class<T>) type;
+        } else if (type instanceof ParameterizedType) {
+            ParameterizedType parameterizedType = (ParameterizedType) type;
+            return validateAndConvert(parameterizedType.getRawType());
+        } else {
+            throw new IllegalStateException("Unsupported type: " + type);
+        }
+    }
+
+    private List<EnhancedType<?>> loadTypeParameters(Type type) {
+        if (!(type instanceof ParameterizedType)) {
+            return Collections.emptyList();
+        }
+
+        ParameterizedType parameterizedType = (ParameterizedType) type;
+
+        return Collections.unmodifiableList(
+            Arrays.stream(parameterizedType.getActualTypeArguments())
+                  .peek(t -> Validate.validState(t != null, "Invalid type argument."))
+                  .map(EnhancedType::new)
+                  .collect(toList()));
+    }
+
+    private StringBuilder innerToString() {
+        StringBuilder result = new StringBuilder();
+        result.append(rawClass.getTypeName());
+
+        if (!rawClassParameters.isEmpty()) {
+            result.append("<");
+            result.append(rawClassParameters.stream().map(EnhancedType::innerToString).collect(Collectors.joining(", ")));
+            result.append(">");
+        }
+
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (!(o instanceof EnhancedType)) {
+            return false;
+        }
+
+        EnhancedType<?> enhancedType = (EnhancedType<?>) o;
+
+        if (isWildcard != enhancedType.isWildcard) {
+            return false;
+        }
+        if (!rawClass.equals(enhancedType.rawClass)) {
+            return false;
+        }
+        if (rawClassParameters != null ? !rawClassParameters.equals(enhancedType.rawClassParameters) :
+            enhancedType.rawClassParameters != null) {
+            return false;
+        }
+
+        return tableSchema != null ? tableSchema.equals(enhancedType.tableSchema) : enhancedType.tableSchema == null;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = (isWildcard ? 1 : 0);
+        result = 31 * result + rawClass.hashCode();
+        result = 31 * result + (rawClassParameters != null ? rawClassParameters.hashCode() : 0);
+        result = 31 * result + (tableSchema != null ? tableSchema.hashCode() : 0);
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "EnhancedType(" + innerToString() + ")";
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/Expression.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/Expression.java
new file mode 100644
index 000000000000..42f3561744fa
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/Expression.java
@@ -0,0 +1,286 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import software.amazon.awssdk.annotations.SdkPublicApi;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+
+/**
+ * High-level representation of a DynamoDB 'expression' that can be used in various situations where the API requires
+ * or accepts an expression. In addition various convenience methods are provided to help manipulate expressions.
+ * <p>
+ * At a minimum, an expression must contain a string that is the expression itself.
+ * <p>
+ * Optionally, attribute names can be substituted with tokens using the '#name_token' syntax; also attribute values can
+ * be substituted with tokens using the ':value_token' syntax. If tokens are used in the expression then the values or
+ * names associated with those tokens must be explicitly added to the expressionValues and expressionNames maps
+ * respectively that are also stored on this object.
+ * <p>
+ * Example:-
+ * {@code
+ * Expression myExpression = Expression.builder()
+ *                                     .expression("#a = :b")
+ *                                     .putExpressionName("#a", "myAttribute")
+ *                                     .putExpressionValue(":b", myAttributeValue)
+ *                                     .build();
+ * }
+ */
+@SdkPublicApi
+public final class Expression {
+    private final String expression;
+    private final Map<String, AttributeValue> expressionValues;
+    private final Map<String, String> expressionNames;
+
+    private Expression(String expression,
+                       Map<String, AttributeValue> expressionValues,
+                       Map<String, String> expressionNames) {
+        this.expression = expression;
+        this.expressionValues = expressionValues;
+        this.expressionNames = expressionNames;
+    }
+
+    /**
+     * Constructs a new expression builder.
+     * @return a new expression builder.
+     */
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    /**
+     * Coalesces two complete expressions into a single expression. The expression string will be joined using the 
+     * supplied join token, and the ExpressionNames and ExpressionValues maps will be merged.
+     * @param expression1 The first expression to coalesce
+     * @param expression2 The second expression to coalesce
+     * @param joinToken The join token to be used to join the expression strings (e.g.: 'AND', 'OR')
+     * @return The coalesced expression
+     * @throws IllegalArgumentException if a conflict occurs when merging ExpressionNames or ExpressionValues
+     */
+    public static Expression join(Expression expression1, Expression expression2, String joinToken) {
+        if (expression1 == null) {
+            return expression2;
+        }
+
+        if (expression2 == null) {
+            return expression1;
+        }
+
+        return Expression.builder()
+                         .expression(joinExpressions(expression1.expression, expression2.expression, joinToken))
+                         .expressionValues(joinValues(expression1.expressionValues(),
+                                                      expression2.expressionValues()))
+                         .expressionNames(joinNames(expression1.expressionNames(),
+                                                    expression2.expressionNames()))
+                         .build();
+    }
+
+    /**
+     * Coalesces two expression strings into a single expression string. The expression string will be joined using the
+     * supplied join token.
+     * @param expression1 The first expression string to coalesce
+     * @param expression2 The second expression string to coalesce
+     * @param joinToken The join token to be used to join the expression strings (e.g.: 'AND', 'OR)
+     * @return The coalesced expression
+     */
+    public static String joinExpressions(String expression1, String expression2, String joinToken) {
+        if (expression1 == null) {
+            return expression2;
+        }
+
+        if (expression2 == null) {
+            return expression1;
+        }
+
+        return "(" + expression1 + ")" + joinToken + "(" + expression2 + ")";
+    }
+
+    /**
+     * Coalesces two ExpressionValues maps into a single ExpressionValues map. The ExpressionValues map is an optional
+     * component of an expression.
+     * @param expressionValues1 The first ExpressionValues map
+     * @param expressionValues2 The second ExpressionValues map
+     * @return The coalesced ExpressionValues map
+     * @throws IllegalArgumentException if a conflict occurs when merging ExpressionValues
+     */
+    public static Map<String, AttributeValue> joinValues(Map<String, AttributeValue> expressionValues1,
+                                                         Map<String, AttributeValue> expressionValues2) {
+        if (expressionValues1 == null) {
+            return expressionValues2;
+        }
+
+        if (expressionValues2 == null) {
+            return expressionValues1;
+        }
+
+        Map<String, AttributeValue> result = new HashMap<>(expressionValues1);
+        expressionValues2.forEach((key, value) -> {
+            AttributeValue oldValue = result.put(key, value);
+
+            if (oldValue != null && !oldValue.equals(value)) {
+                throw new IllegalArgumentException(
+                    String.format("Attempt to coalesce two expressions with conflicting expression values. "
+                                  + "Expression value key = '%s'", key));
+            }
+        });
+
+        return Collections.unmodifiableMap(result);
+    }
+
+    /**
+     * Coalesces two ExpressionNames maps into a single ExpressionNames map. The ExpressionNames map is an optional
+     * component of an expression.
+     * @param expressionNames1 The first ExpressionNames map
+     * @param expressionNames2 The second ExpressionNames map
+     * @return The coalesced ExpressionNames map
+     * @throws IllegalArgumentException if a conflict occurs when merging ExpressionNames
+     */
+    public static Map<String, String> joinNames(Map<String, String> expressionNames1,
+                                                Map<String, String> expressionNames2) {
+        if (expressionNames1 == null) {
+            return expressionNames2;
+        }
+
+        if (expressionNames2 == null) {
+            return expressionNames1;
+        }
+
+        Map<String, String> result = new HashMap<>(expressionNames1);
+        expressionNames2.forEach((key, value) -> {
+            String oldValue = result.put(key, value);
+
+            if (oldValue != null && !oldValue.equals(value)) {
+                throw new IllegalArgumentException(
+                    String.format("Attempt to coalesce two expressions with conflicting expression names. "
+                                  + "Expression name key = '%s'", key));
+            }
+        });
+
+        return Collections.unmodifiableMap(result);
+    }
+
+    public String expression() {
+        return expression;
+    }
+
+    public Map<String, AttributeValue> expressionValues() {
+        return expressionValues;
+    }
+
+    public Map<String, String> expressionNames() {
+        return expressionNames;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        Expression that = (Expression) o;
+
+        if (expression != null ? ! expression.equals(that.expression) : that.expression != null) {
+            return false;
+        }
+        if (expressionValues != null ? ! expressionValues.equals(that.expressionValues) :
+            that.expressionValues != null) {
+            return false;
+        }
+        return expressionNames != null ? expressionNames.equals(that.expressionNames) : that.expressionNames == null;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = expression != null ? expression.hashCode() : 0;
+        result = 31 * result + (expressionValues != null ? expressionValues.hashCode() : 0);
+        result = 31 * result + (expressionNames != null ? expressionNames.hashCode() : 0);
+        return result;
+    }
+
+    /**
+     * A builder for {@link Expression}
+     */
+    public static final class Builder {
+        private String expression;
+        private Map<String, AttributeValue> expressionValues;
+        private Map<String, String> expressionNames;
+
+        private Builder() {
+        }
+
+        /**
+         * The expression string
+         */
+        public Builder expression(String expression) {
+            this.expression = expression;
+            return this;
+        }
+
+        /**
+         * The optional 'expression values' token map
+         */
+        public Builder expressionValues(Map<String, AttributeValue> expressionValues) {
+            this.expressionValues = expressionValues == null ? null : new HashMap<>(expressionValues);
+            return this;
+        }
+
+        /**
+         * Adds a single element to the optional 'expression values' token map
+         */
+        public Builder putExpressionValue(String key, AttributeValue value) {
+            if (this.expressionValues == null) {
+                this.expressionValues = new HashMap<>();
+            }
+
+            this.expressionValues.put(key, value);
+            return this;
+        }
+
+        /**
+         * The optional 'expression names' token map
+         */
+        public Builder expressionNames(Map<String, String> expressionNames) {
+            this.expressionNames = expressionNames == null ? null : new HashMap<>(expressionNames);
+            return this;
+        }
+
+        /**
+         * Adds a single element to the optional 'expression names' token map
+         */
+        public Builder putExpressionName(String key, String value) {
+            if (this.expressionNames == null) {
+                this.expressionNames = new HashMap<>();
+            }
+
+            this.expressionNames.put(key, value);
+            return this;
+        }
+
+        /**
+         * Builds an {@link Expression} based on the values stored in this builder
+         */
+        public Expression build() {
+            return new Expression(expression,
+                                  expressionValues == null ? null : Collections.unmodifiableMap(expressionValues),
+                                  expressionNames == null ? null : Collections.unmodifiableMap(expressionNames));
+        }
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/Key.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/Key.java
new file mode 100644
index 000000000000..a3406787a42b
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/Key.java
@@ -0,0 +1,225 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb;
+
+import static software.amazon.awssdk.enhanced.dynamodb.internal.AttributeValues.nullAttributeValue;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+import software.amazon.awssdk.annotations.SdkPublicApi;
+import software.amazon.awssdk.core.SdkBytes;
+import software.amazon.awssdk.enhanced.dynamodb.internal.AttributeValues;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+import software.amazon.awssdk.utils.Validate;
+
+/**
+ * An object that represents a key that can be used to either identify a specific record or form part of a query
+ * conditional. Keys are literal and hence not typed, and can be re-used in commands for different modelled types if
+ * the literal values are to be the same.
+ * <p>
+ * A key will always have a single partition key value associated with it, and optionally will have a sort key value.
+ * The names of the keys themselves are not part of this object.
+ */
+@SdkPublicApi
+public final class Key {
+    private final AttributeValue partitionValue;
+    private final AttributeValue sortValue;
+
+    private Key(Builder builder) {
+        Validate.isTrue(builder.partitionValue != null && !builder.partitionValue.equals(nullAttributeValue()),
+                        "partitionValue should not be null");
+        this.partitionValue = builder.partitionValue;
+        this.sortValue = builder.sortValue;
+    }
+
+    /**
+     * Returns a new builder that can be used to construct an instance of this class.
+     * @return A newly initialized {@link Builder} object.
+     */
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    /**
+     * Return a map of the key elements that can be passed directly to DynamoDb.
+     * @param tableSchema A tableschema to determine the key attribute names from.
+     * @param index The name of the index to use when determining the key attribute names.
+     * @return A map of attribute names to {@link AttributeValue}.
+     */
+    public Map<String, AttributeValue> keyMap(TableSchema<?> tableSchema, String index) {
+        Map<String, AttributeValue> keyMap = new HashMap<>();
+        keyMap.put(tableSchema.tableMetadata().indexPartitionKey(index), partitionValue);
+
+        if (sortValue != null) {
+            keyMap.put(tableSchema.tableMetadata().indexSortKey(index).orElseThrow(
+                () -> new IllegalArgumentException("A sort key value was supplied for an index that does not support "
+                                                   + "one. Index: " + index)), sortValue);
+        }
+
+        return Collections.unmodifiableMap(keyMap);
+    }
+
+    /**
+     * Get the literal value of the partition key stored in this object.
+     * @return An {@link AttributeValue} representing the literal value of the partition key.
+     */
+    public AttributeValue partitionKeyValue() {
+        return partitionValue;
+    }
+
+    /**
+     * Get the literal value of the sort key stored in this object if available.
+     * @return An optional {@link AttributeValue} representing the literal value of the sort key, or empty if there
+     * is no sort key value in this Key.
+     */
+    public Optional<AttributeValue> sortKeyValue() {
+        return Optional.ofNullable(sortValue);
+    }
+
+    /**
+     * Return a map of the key elements that form the primary key of a table that can be passed directly to DynamoDb.
+     * @param tableSchema A tableschema to determine the key attribute names from.
+     * @return A map of attribute names to {@link AttributeValue}.
+     */
+    public Map<String, AttributeValue> primaryKeyMap(TableSchema<?> tableSchema) {
+        return keyMap(tableSchema, TableMetadata.primaryIndexName());
+    }
+
+    /**
+     * Converts an existing key into a builder object that can be used to modify its values and then create a new key.
+     * @return A {@link Builder} initialized with the values of this key.
+     */
+    public Builder toBuilder() {
+        return new Builder().partitionValue(this.partitionValue).sortValue(this.sortValue);
+    }
+
+    /**
+     * Builder for {@link Key}
+     */
+    public static final class Builder {
+        private AttributeValue partitionValue;
+        private AttributeValue sortValue;
+
+        private Builder() {
+        }
+
+        /**
+         * Value to be used for the partition key
+         * @param partitionValue partition key value
+         */
+        public Builder partitionValue(AttributeValue partitionValue) {
+            this.partitionValue = partitionValue;
+            return this;
+        }
+
+        /**
+         * String value to be used for the partition key. The string will be converted into an AttributeValue of type S.
+         * @param partitionValue partition key value
+         */
+        public Builder partitionValue(String partitionValue) {
+            this.partitionValue = AttributeValues.stringValue(partitionValue);
+            return this;
+        }
+
+        /**
+         * Numeric value to be used for the partition key. The number will be converted into an AttributeValue of type N.
+         * @param partitionValue partition key value
+         */
+        public Builder partitionValue(Number partitionValue) {
+            this.partitionValue = AttributeValues.numberValue(partitionValue);
+            return this;
+        }
+
+        /**
+         * Binary value to be used for the partition key. The input will be converted into an AttributeValue of type B.
+         * @param partitionValue the bytes to be used for the binary key value.
+         */
+        public Builder partitionValue(SdkBytes partitionValue) {
+            this.partitionValue = AttributeValues.binaryValue(partitionValue);
+            return this;
+        }
+
+        /**
+         * Value to be used for the sort key
+         * @param sortValue sort key value
+         */
+        public Builder sortValue(AttributeValue sortValue) {
+            this.sortValue = sortValue;
+            return this;
+        }
+
+        /**
+         * String value to be used for the sort key. The string will be converted into an AttributeValue of type S.
+         * @param sortValue sort key value
+         */
+        public Builder sortValue(String sortValue) {
+            this.sortValue = AttributeValues.stringValue(sortValue);
+            return this;
+        }
+
+        /**
+         * Numeric value to be used for the sort key. The number will be converted into an AttributeValue of type N.
+         * @param sortValue sort key value
+         */
+        public Builder sortValue(Number sortValue) {
+            this.sortValue = AttributeValues.numberValue(sortValue);
+            return this;
+        }
+
+        /**
+         * Binary value to be used for the sort key. The input will be converted into an AttributeValue of type B.
+         * @param sortValue the bytes to be used for the binary key value.
+         */
+        public Builder sortValue(SdkBytes sortValue) {
+            this.sortValue = AttributeValues.binaryValue(sortValue);
+            return this;
+        }
+
+        /**
+         * Construct a {@link Key} from this builder.
+         */
+        public Key build() {
+            return new Key(this);
+        }
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        Key key = (Key) o;
+
+        if (partitionValue != null ? ! partitionValue.equals(key.partitionValue) :
+            key.partitionValue != null) {
+            return false;
+        }
+        return sortValue != null ? sortValue.equals(key.sortValue) : key.sortValue == null;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = partitionValue != null ? partitionValue.hashCode() : 0;
+        result = 31 * result + (sortValue != null ? sortValue.hashCode() : 0);
+        return result;
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/MappedTableResource.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/MappedTableResource.java
new file mode 100644
index 000000000000..528589e8fa85
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/MappedTableResource.java
@@ -0,0 +1,55 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb;
+
+import software.amazon.awssdk.annotations.SdkPublicApi;
+
+/**
+ * Interface for a resource object that is part of either a {@link DynamoDbTable} or {@link DynamoDbAsyncTable}. This
+ * part of the interface is common between both of those higher order interfaces and has methods to access the
+ * metadata associated with the mapped entity, such as the schema and the table name, but knows nothing about how to
+ * actually execute operations against it.
+ *
+ * @param <T> The type of the modelled object.
+ */
+@SdkPublicApi
+public interface MappedTableResource<T> {
+    /**
+     * Gets the {@link DynamoDbEnhancedClientExtension} associated with this mapped resource.
+     * @return The {@link DynamoDbEnhancedClientExtension} associated with this mapped resource.
+     */
+    DynamoDbEnhancedClientExtension mapperExtension();
+
+    /**
+     * Gets the {@link TableSchema} object that this mapped table was built with.
+     * @return The {@link TableSchema} object for this mapped table.
+     */
+    TableSchema<T> tableSchema();
+
+    /**
+     * Gets the physical table name that operations performed by this object will be executed against.
+     * @return The physical table name.
+     */
+    String tableName();
+
+    /**
+     * Creates a {@link Key} object from a modelled item. This key can be used in query conditionals and get
+     * operations to locate a specific record.
+     * @param item The item to extract the key fields from.
+     * @return A key that has been initialized with the index values extracted from the modelled object.
+     */
+    Key keyFrom(T item);
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/TableMetadata.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/TableMetadata.java
similarity index 83%
rename from services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/TableMetadata.java
rename to services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/TableMetadata.java
index 2604b623f5a4..a6d36c951364 100644
--- a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/TableMetadata.java
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/TableMetadata.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -13,18 +13,17 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.awssdk.extensions.dynamodb.mappingclient;
+package software.amazon.awssdk.enhanced.dynamodb;
 
 import java.util.Collection;
 import java.util.Optional;
-
-import software.amazon.awssdk.annotations.SdkProtectedApi;
+import software.amazon.awssdk.annotations.SdkPublicApi;
 import software.amazon.awssdk.services.dynamodb.model.ScalarAttributeType;
 
 /**
  * Interface for an object the stores structural information about a DynamoDb table.
  */
-@SdkProtectedApi
+@SdkPublicApi
 public interface TableMetadata {
     /**
      * Returns the attribute name of the partition key for an index.
@@ -34,7 +33,7 @@ public interface TableMetadata {
      * @throws IllegalArgumentException if the index does not exist in the metadata or does not have a partition key
      * associated with it..
      */
-    String getIndexPartitionKey(String indexName);
+    String indexPartitionKey(String indexName);
 
     /**
      * Returns the attribute name of the sort key for an index.
@@ -43,7 +42,7 @@ public interface TableMetadata {
      * @return Optional of the attribute name representing the sort key for this index; empty if the index does not
      * have a sort key.
      */
-    Optional<String> getIndexSortKey(String indexName);
+    Optional<String> indexSortKey(String indexName);
 
     /**
      * Returns a custom metadata object. These objects are used by extensions to the library, therefore the type of
@@ -56,7 +55,7 @@ public interface TableMetadata {
      * @param <T> The flexible type for the object being returned. The compiler will typically infer this.
      * @return An optional containing custom metadata object or empty if the object was not found.
      */
-    <T> Optional<T> getCustomMetadataObject(String key, Class<? extends T> objectClass);
+    <T> Optional<T> customMetadataObject(String key, Class<? extends T> objectClass);
 
     /**
      * Returns all the names of attributes associated with the keys of a specified index.
@@ -64,7 +63,7 @@ public interface TableMetadata {
      * @param indexName The name of the index.
      * @return A collection of all key attribute names for that index.
      */
-    Collection<String> getIndexKeys(String indexName);
+    Collection<String> indexKeys(String indexName);
 
     /**
      * Returns all the names of attributes associated with any index (primary or secondary) known for this table.
@@ -74,7 +73,7 @@ public interface TableMetadata {
      *
      * @return A collection of all key attribute names for the table.
      */
-    Collection<String> getAllKeys();
+    Collection<String> allKeys();
 
     /**
      * Returns the DynamoDb scalar attribute type associated with a key attribute if one is applicable.
@@ -82,7 +81,7 @@ public interface TableMetadata {
      * @return Optional {@link ScalarAttributeType} of the attribute, or empty if attribute is a non-scalar type.
      * @throws IllegalArgumentException if the keyAttribute is not found.
      */
-    Optional<ScalarAttributeType> getScalarAttributeType(String keyAttribute);
+    Optional<ScalarAttributeType> scalarAttributeType(String keyAttribute);
 
     /**
      * Returns the attribute name used as the primary partition key for the table.
@@ -90,8 +89,8 @@ public interface TableMetadata {
      * @return The primary partition key attribute name.
      * @throws IllegalArgumentException if the primary partition key is not known.
      */
-    default String getPrimaryPartitionKey() {
-        return getIndexPartitionKey(getPrimaryIndexName());
+    default String primaryPartitionKey() {
+        return indexPartitionKey(primaryIndexName());
     }
 
     /**
@@ -99,8 +98,8 @@ default String getPrimaryPartitionKey() {
      *
      * @return An optional of the primary sort key attribute name; empty if this key is not known.
      */
-    default Optional<String> getPrimarySortKey() {
-        return getIndexSortKey(getPrimaryIndexName());
+    default Optional<String> primarySortKey() {
+        return indexSortKey(primaryIndexName());
     }
 
     /**
@@ -108,8 +107,8 @@ default Optional<String> getPrimarySortKey() {
      *
      * @return A collection of attribute names that make up the primary key for the table.
      */
-    default Collection<String> getPrimaryKeys() {
-        return getIndexKeys(getPrimaryIndexName());
+    default Collection<String> primaryKeys() {
+        return indexKeys(primaryIndexName());
     }
 
     /**
@@ -119,7 +118,7 @@ default Collection<String> getPrimaryKeys() {
      *
      * @return An arbitrary constant that internally represents the primary index name.
      */
-    static String getPrimaryIndexName() {
+    static String primaryIndexName() {
         // Must include illegal symbols that cannot be used by a real index.
         // This value is arbitrary and ephemeral but could end up being serialized with TableMetadata through the
         // actions of a client, so it should not be altered unless absolutely necessary.
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/TableSchema.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/TableSchema.java
new file mode 100644
index 000000000000..82dd03e41ca8
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/TableSchema.java
@@ -0,0 +1,118 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb;
+
+import java.util.Collection;
+import java.util.Map;
+import software.amazon.awssdk.annotations.SdkPublicApi;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.BeanTableSchema;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.StaticTableSchema;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+
+/**
+ * Interface for a mapper that is capable of mapping a modelled Java object into a map of {@link AttributeValue} that is
+ * understood by the DynamoDb low-level SDK and back again. This object is also expected to know about the
+ * structure of the table it is modelling, which is stored in a {@link TableMetadata} object.
+ *
+ * @param <T> The type of model object that is being mapped to records in the DynamoDb table.
+ */
+@SdkPublicApi
+public interface TableSchema<T> {
+
+    /**
+     * Returns a builder for the {@link StaticTableSchema} implementation of this interface which allows all attributes,
+     * tags and table structure to be directly declared in the builder.
+     * @param itemClass The class of the item this {@link TableSchema} will map records to.
+     * @param <T> The type of the item this {@link TableSchema} will map records to.
+     * @return A newly initialized {@link StaticTableSchema.Builder}.
+     */
+    static <T> StaticTableSchema.Builder<T> builder(Class<T> itemClass) {
+        return StaticTableSchema.builder(itemClass);
+    }
+
+    /**
+     * Scans a bean class that has been annotated with DynamoDb bean annotations and then returns a
+     * {@link BeanTableSchema} implementation of this interface that can map records to and from items of that bean
+     * class.
+     * @param beanClass The bean class this {@link TableSchema} will map records to.
+     * @param <T> The type of the item this {@link TableSchema} will map records to.
+     * @return An initialized {@link BeanTableSchema}.
+     */
+    static <T> BeanTableSchema<T> fromBean(Class<T> beanClass) {
+        return BeanTableSchema.create(beanClass);
+    }
+
+    /**
+     * Takes a raw DynamoDb SDK representation of a record in a table and maps it to a Java object. A new object is
+     * created to fulfil this operation.
+     * <p>
+     * If attributes are missing from the map, that will not cause an error, however if attributes are found in the
+     * map which the mapper does not know how to map, an exception will be thrown.
+     *
+     * @param attributeMap A map of String to {@link AttributeValue} that contains all the raw attributes to map.
+     * @return A new instance of a Java object with all the attributes mapped onto it.
+     * @throws IllegalArgumentException if any attributes in the map could not be mapped onto the new model object.
+     */
+    T mapToItem(Map<String, AttributeValue> attributeMap);
+
+    /**
+     * Takes a modelled object and converts it into a raw map of {@link AttributeValue} that the DynamoDb low-level
+     * SDK can work with.
+     *
+     * @param item The modelled Java object to convert into a map of attributes.
+     * @param ignoreNulls If set to true; any null values in the Java object will not be added to the output map.
+     *                    If set to false; null values in the Java object will be added as {@link AttributeValue} of
+     *                    type 'nul' to the output map.
+     * @return A map of String to {@link AttributeValue} representing all the modelled attributes in the model object.
+     */
+    Map<String, AttributeValue> itemToMap(T item, boolean ignoreNulls);
+
+    /**
+     * Takes a modelled object and extracts a specific set of attributes which are then returned as a map of
+     * {@link AttributeValue} that the DynamoDb low-level SDK can work with. This method is typically used to extract
+     * just the key attributes of a modelled item and will not ignore nulls on the modelled object.
+     *
+     * @param item The modelled Java object to extract the map of attributes from.
+     * @param attributes A collection of attribute names to extract into the output map.
+     * @return A map of String to {@link AttributeValue} representing the requested modelled attributes in the model
+     * object.
+     */
+    Map<String, AttributeValue> itemToMap(T item, Collection<String> attributes);
+
+    /**
+     * Returns a single attribute value from the modelled object.
+     *
+     * @param item The modelled Java object to extract the attribute from.
+     * @param key The attribute name describing which attribute to extract.
+     * @return A single {@link AttributeValue} representing the requested modelled attribute in the model object or
+     * null if the attribute has not been set with a value in the modelled object.
+     */
+    AttributeValue attributeValue(T item, String key);
+
+    /**
+     * Returns the object that describes the structure of the table being modelled by the mapper. This includes
+     * information such as the table name, index keys and attribute tags.
+     * @return A {@link TableMetadata} object that contains structural information about the table being modelled.
+     */
+    TableMetadata tableMetadata();
+
+    /**
+     * Returns the {@link EnhancedType} that represents the 'Type' of the Java object this table schema object maps to
+     * and from.
+     * @return The {@link EnhancedType} of the modelled item this TableSchema maps to.
+     */
+    EnhancedType<T> itemType();
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/extensions/ReadModification.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/extensions/ReadModification.java
similarity index 89%
rename from services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/extensions/ReadModification.java
rename to services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/extensions/ReadModification.java
index 1fe36a87fbdb..cc2e1920c559 100644
--- a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/extensions/ReadModification.java
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/extensions/ReadModification.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -13,10 +13,9 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.awssdk.extensions.dynamodb.mappingclient.extensions;
+package software.amazon.awssdk.enhanced.dynamodb.extensions;
 
 import java.util.Map;
-
 import software.amazon.awssdk.annotations.SdkPublicApi;
 import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
 
@@ -25,7 +24,7 @@
  * be completely substituted in place of the item that was actually read.
  */
 @SdkPublicApi
-public class ReadModification {
+public final class ReadModification {
     private final Map<String, AttributeValue> transformedItem;
 
     private ReadModification(Map<String, AttributeValue> transformedItem) {
@@ -36,7 +35,7 @@ public static Builder builder() {
         return new Builder();
     }
 
-    public Map<String, AttributeValue> getTransformedItem() {
+    public Map<String, AttributeValue> transformedItem() {
         return transformedItem;
     }
 
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/extensions/VersionedRecordExtension.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/extensions/VersionedRecordExtension.java
new file mode 100644
index 000000000000..11bdce42beec
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/extensions/VersionedRecordExtension.java
@@ -0,0 +1,146 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.extensions;
+
+import static software.amazon.awssdk.enhanced.dynamodb.internal.EnhancedClientUtils.isNullAttributeValue;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import software.amazon.awssdk.annotations.SdkPublicApi;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeValueType;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClientExtension;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbExtensionContext;
+import software.amazon.awssdk.enhanced.dynamodb.Expression;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.StaticAttributeTag;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.StaticTableMetadata;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+
+/**
+ * This extension implements optimistic locking on record writes by means of a 'record version number' that is used
+ * to automatically track each revision of the record as it is modified.
+ * <p>
+ * This extension is loaded by default when you instantiate a
+ * {@link software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClient} so unless you are using a custom extension
+ * there is no need to specify it.
+ * <p>
+ * To utilize versioned record locking, first create an attribute in your model that will be used to store the record
+ * version number. This attribute must be an 'integer' type numeric (long or integer), and you need to tag it as the
+ * version attribute. If you are using the {@link software.amazon.awssdk.enhanced.dynamodb.mapper.BeanTableSchema} then
+ * you should use the {@link software.amazon.awssdk.enhanced.dynamodb.extensions.annotations.DynamoDbVersionAttribute}
+ * annotation, otherwise if you are using the {@link software.amazon.awssdk.enhanced.dynamodb.mapper.StaticTableSchema}
+ * then you should use the {@link AttributeTags#versionAttribute()} static attribute tag.
+ * <p>
+ * Then, whenever a record is written the write operation will only succeed if the version number of the record has not
+ * been modified since it was last read by the application. Every time a new version of the record is successfully
+ * written to the database, the record version number will be automatically incremented.
+ */
+@SdkPublicApi
+public final class VersionedRecordExtension implements DynamoDbEnhancedClientExtension {
+    private static final Function<String, String> EXPRESSION_KEY_MAPPER = key -> ":old_" + key + "_value";
+    private static final String CUSTOM_METADATA_KEY = "VersionedRecordExtension:VersionAttribute";
+    private static final VersionAttribute VERSION_ATTRIBUTE = new VersionAttribute();
+
+    private VersionedRecordExtension() {
+    }
+
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    public static final class AttributeTags {
+        private AttributeTags() {
+        }
+
+        public static StaticAttributeTag versionAttribute() {
+            return VERSION_ATTRIBUTE;
+        }
+    }
+
+    private static class VersionAttribute implements StaticAttributeTag {
+        @Override
+        public Consumer<StaticTableMetadata.Builder> modifyMetadata(String attributeName,
+                                                                    AttributeValueType attributeValueType) {
+            if (!AttributeValueType.N.equals(attributeValueType)) {
+                throw new IllegalArgumentException(String.format(
+                    "Attribute '%s' of type %s is not a suitable type to be used as a version attribute. Only type 'N' " +
+                        "is supported.", attributeName, attributeValueType.name()));
+            }
+
+            return metadata -> metadata.addCustomMetadataObject(CUSTOM_METADATA_KEY, attributeName)
+                                       .markAttributeAsKey(attributeName, attributeValueType);
+        }
+    }
+
+    @Override
+    public WriteModification beforeWrite(DynamoDbExtensionContext.BeforeWrite context) {
+        Optional<String> versionAttributeKey = context.tableMetadata()
+                                                      .customMetadataObject(CUSTOM_METADATA_KEY, String.class);
+
+        if (!versionAttributeKey.isPresent()) {
+            return WriteModification.builder().build();
+        }
+
+        Map<String, AttributeValue> itemToTransform = new HashMap<>(context.items());
+        AttributeValue newVersionValue;
+        Expression condition;
+        Optional<AttributeValue> existingVersionValue =
+            Optional.ofNullable(itemToTransform.get(versionAttributeKey.get()));
+
+        if (!existingVersionValue.isPresent() || isNullAttributeValue(existingVersionValue.get())) {
+            // First version of the record
+            newVersionValue = AttributeValue.builder().n("1").build();
+            condition = Expression.builder()
+                                  .expression(String.format("attribute_not_exists(%s)", versionAttributeKey.get()))
+                                  .build();
+        } else {
+            // Existing record, increment version
+            if (existingVersionValue.get().n() == null) {
+                // In this case a non-null version attribute is present, but it's not an N
+                throw new IllegalArgumentException("Version attribute appears to be the wrong type. N is required.");
+            }
+
+            int existingVersion = Integer.parseInt(existingVersionValue.get().n());
+            String existingVersionValueKey = EXPRESSION_KEY_MAPPER.apply(versionAttributeKey.get());
+            newVersionValue = AttributeValue.builder().n(Integer.toString(existingVersion + 1)).build();
+            condition = Expression.builder()
+                                  .expression(String.format("%s = %s", versionAttributeKey.get(),
+                                                            existingVersionValueKey))
+                                  .expressionValues(Collections.singletonMap(existingVersionValueKey,
+                                                                             existingVersionValue.get()))
+                                  .build();
+        }
+
+        itemToTransform.put(versionAttributeKey.get(), newVersionValue);
+
+        return WriteModification.builder()
+                                .transformedItem(Collections.unmodifiableMap(itemToTransform))
+                                .additionalConditionalExpression(condition)
+                                .build();
+    }
+
+    public static final class Builder {
+        private Builder() {
+        }
+
+        public VersionedRecordExtension build() {
+            return new VersionedRecordExtension();
+        }
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/extensions/WriteModification.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/extensions/WriteModification.java
similarity index 89%
rename from services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/extensions/WriteModification.java
rename to services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/extensions/WriteModification.java
index 3c448eb91d6c..85297f0352b6 100644
--- a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/extensions/WriteModification.java
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/extensions/WriteModification.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -13,25 +13,24 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.awssdk.extensions.dynamodb.mappingclient.extensions;
+package software.amazon.awssdk.enhanced.dynamodb.extensions;
 
 import java.util.Map;
-
 import software.amazon.awssdk.annotations.SdkPublicApi;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.Expression;
+import software.amazon.awssdk.enhanced.dynamodb.Expression;
 import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
 
 /**
  * Simple object for storing a modification to a write operation.
- *
+ * <p>
  * If a transformedItem is supplied then this item will be completely substituted in place of the item that was
  * previously going to be written.
- *
+ * <p>
  * If an additionalConditionalExpression is supplied then this condition will be coalesced with any other conditions
  * and added as a parameter to the write operation.
  */
 @SdkPublicApi
-public class WriteModification {
+public final class WriteModification {
     private final Map<String, AttributeValue> transformedItem;
     private final Expression additionalConditionalExpression;
 
@@ -44,11 +43,11 @@ public static Builder builder() {
         return new Builder();
     }
 
-    public Map<String, AttributeValue> getTransformedItem() {
+    public Map<String, AttributeValue> transformedItem() {
         return transformedItem;
     }
 
-    public Expression getAdditionalConditionalExpression() {
+    public Expression additionalConditionalExpression() {
         return additionalConditionalExpression;
     }
 
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/extensions/annotations/DynamoDbVersionAttribute.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/extensions/annotations/DynamoDbVersionAttribute.java
new file mode 100644
index 000000000000..21f3beeeb446
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/extensions/annotations/DynamoDbVersionAttribute.java
@@ -0,0 +1,36 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.extensions.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import software.amazon.awssdk.annotations.SdkPublicApi;
+import software.amazon.awssdk.enhanced.dynamodb.internal.extensions.VersionRecordAttributeTags;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.annotations.BeanTableSchemaAttributeTag;
+
+/**
+ * Denotes this attribute as recording the version record number to be used for optimistic locking. Every time a record
+ * with this attribute is written to the database it will be incremented and a condition added to the request to check
+ * for an exact match of the old version.
+ */
+@SdkPublicApi
+@Target({ElementType.METHOD})
+@Retention(RetentionPolicy.RUNTIME)
+@BeanTableSchemaAttributeTag(VersionRecordAttributeTags.class)
+public @interface DynamoDbVersionAttribute {
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/ApplyUserAgentInterceptor.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/ApplyUserAgentInterceptor.java
new file mode 100644
index 000000000000..a0b5183f35f0
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/ApplyUserAgentInterceptor.java
@@ -0,0 +1,56 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal;
+
+import java.util.function.Consumer;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.awscore.AwsRequestOverrideConfiguration;
+import software.amazon.awssdk.core.ApiName;
+import software.amazon.awssdk.core.SdkRequest;
+import software.amazon.awssdk.core.interceptor.Context;
+import software.amazon.awssdk.core.interceptor.ExecutionAttributes;
+import software.amazon.awssdk.core.interceptor.ExecutionInterceptor;
+import software.amazon.awssdk.services.dynamodb.model.DynamoDbRequest;
+
+/**
+ * Apply dynamodb enhanced client specific user agent to the request
+ */
+@SdkInternalApi
+public final class ApplyUserAgentInterceptor implements ExecutionInterceptor {
+    private static final ApiName API_NAME =
+        ApiName.builder().version("ddb-enh").name("hll").build();
+    private static final Consumer<AwsRequestOverrideConfiguration.Builder> USER_AGENT_APPLIER =
+        b -> b.addApiName(API_NAME);
+
+    @Override
+    public SdkRequest modifyRequest(Context.ModifyRequest context, ExecutionAttributes executionAttributes) {
+        if (!(context.request() instanceof DynamoDbRequest)) {
+            // should never happen
+            return context.request();
+        }
+
+        DynamoDbRequest request = (DynamoDbRequest) context.request();
+        AwsRequestOverrideConfiguration overrideConfiguration =
+            request.overrideConfiguration().map(c -> c.toBuilder()
+                                                      .applyMutation(USER_AGENT_APPLIER)
+                                                      .build())
+                   .orElse((AwsRequestOverrideConfiguration.builder()
+                                                           .applyMutation(USER_AGENT_APPLIER)
+                                                           .build()));
+
+        return request.toBuilder().overrideConfiguration(overrideConfiguration).build();
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/AttributeValues.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/AttributeValues.java
new file mode 100644
index 000000000000..7915da9e886f
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/AttributeValues.java
@@ -0,0 +1,70 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal;
+
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.core.SdkBytes;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+
+/**
+ * This static helper class contains some literal {@link AttributeValue} constants and converters. Primarily these
+ * will be used if constructing a literal key object or for use in a custom filter expression. Eg:
+ *
+ * {@code Key<?> myKey = Key.create(stringValue("id123"), numberValue(4.23));
+ * Expression filterExpression = Expression.of("id = :filter_id", singletonMap(":filter_id", stringValue("id123")); }
+ */
+@SdkInternalApi
+public final class AttributeValues {
+    private static final AttributeValue NULL_ATTRIBUTE_VALUE = AttributeValue.builder().nul(true).build();
+
+    private AttributeValues() {
+    }
+
+    /**
+     * The constant that represents a 'null' in a DynamoDb record.
+     * @return An {@link AttributeValue} of type NUL that represents 'null'.
+     */
+    public static AttributeValue nullAttributeValue() {
+        return NULL_ATTRIBUTE_VALUE;
+    }
+
+    /**
+     * Creates a literal string {@link AttributeValue}.
+     * @param value A string to create the literal from.
+     * @return An {@link AttributeValue} of type S that represents the string literal.
+     */
+    public static AttributeValue stringValue(String value) {
+        return AttributeValue.builder().s(value).build();
+    }
+
+    /**
+     * Creates a literal numeric {@link AttributeValue} from any type of Java number.
+     * @param value A number to create the literal from.
+     * @return An {@link AttributeValue} of type n that represents the numeric literal.
+     */
+    public static AttributeValue numberValue(Number value) {
+        return AttributeValue.builder().n(value.toString()).build();
+    }
+
+    /**
+     * Creates a literal binary {@link AttributeValue} from raw bytes.
+     * @param value bytes to create the literal from.
+     * @return An {@link AttributeValue} of type B that represents the binary literal.
+     */
+    public static AttributeValue binaryValue(SdkBytes value) {
+        return AttributeValue.builder().b(value).build();
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/DefaultDocument.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/DefaultDocument.java
new file mode 100644
index 000000000000..3a16dbbf689b
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/DefaultDocument.java
@@ -0,0 +1,64 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal;
+
+import static software.amazon.awssdk.enhanced.dynamodb.internal.EnhancedClientUtils.readAndTransformSingleItem;
+
+import java.util.Map;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.enhanced.dynamodb.Document;
+import software.amazon.awssdk.enhanced.dynamodb.MappedTableResource;
+import software.amazon.awssdk.enhanced.dynamodb.internal.operations.OperationContext;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+
+@SdkInternalApi
+public final class DefaultDocument implements Document {
+    private final Map<String, AttributeValue> itemMap;
+
+    private DefaultDocument(Map<String, AttributeValue> itemMap) {
+        this.itemMap = itemMap;
+    }
+
+    public static DefaultDocument create(Map<String, AttributeValue> itemMap) {
+        return new DefaultDocument(itemMap);
+    }
+
+    public <T> T getItem(MappedTableResource<T> mappedTableResource) {
+        return readAndTransformSingleItem(itemMap,
+                                          mappedTableResource.tableSchema(),
+                                          OperationContext.create(mappedTableResource.tableName()),
+                                          mappedTableResource.mapperExtension());
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        DefaultDocument that = (DefaultDocument) o;
+
+        return itemMap != null ? itemMap.equals(that.itemMap) : that.itemMap == null;
+    }
+
+    @Override
+    public int hashCode() {
+        return itemMap != null ? itemMap.hashCode() : 0;
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/EnhancedClientUtils.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/EnhancedClientUtils.java
new file mode 100644
index 000000000000..1287b638c426
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/EnhancedClientUtils.java
@@ -0,0 +1,167 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.function.Function;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClientExtension;
+import software.amazon.awssdk.enhanced.dynamodb.Key;
+import software.amazon.awssdk.enhanced.dynamodb.TableSchema;
+import software.amazon.awssdk.enhanced.dynamodb.extensions.ReadModification;
+import software.amazon.awssdk.enhanced.dynamodb.internal.extensions.DefaultDynamoDbExtensionContext;
+import software.amazon.awssdk.enhanced.dynamodb.internal.operations.OperationContext;
+import software.amazon.awssdk.enhanced.dynamodb.model.Page;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+
+@SdkInternalApi
+public final class EnhancedClientUtils {
+    private EnhancedClientUtils() {
+
+    }
+
+    /** There is a divergence in what constitutes an acceptable attribute name versus a token used in expression
+     * names or values. Since the mapper translates one to the other, it is necessary to scrub out all these
+     * 'illegal' characters before adding them to expression values or expression names.
+     *
+     * @param key A key that may contain non alpha-numeric characters acceptable to a DynamoDb attribute name.
+     * @return A key that has all these characters scrubbed and overwritten with an underscore.
+     */
+    public static String cleanAttributeName(String key) {
+        boolean somethingChanged = false;
+        char[] chars = key.toCharArray();
+
+        for (int i = 0; i < chars.length; ++i) {
+            if (chars[i] == '*' || chars[i] == '.' || chars[i] == '-') {
+                chars[i] = '_';
+                somethingChanged = true;
+            }
+        }
+
+        return somethingChanged ? new String(chars) : key;
+    }
+
+    public static <T> T readAndTransformSingleItem(Map<String, AttributeValue> itemMap,
+                                            TableSchema<T> tableSchema,
+                                            OperationContext operationContext,
+                                            DynamoDbEnhancedClientExtension dynamoDbEnhancedClientExtension) {
+        if (itemMap == null || itemMap.isEmpty()) {
+            return null;
+        }
+
+        if (dynamoDbEnhancedClientExtension != null) {
+            ReadModification readModification = dynamoDbEnhancedClientExtension.afterRead(
+                DefaultDynamoDbExtensionContext.builder()
+                                               .items(itemMap)
+                                               .operationContext(operationContext)
+                                               .tableMetadata(tableSchema.tableMetadata())
+                                               .build());
+            if (readModification != null && readModification.transformedItem() != null) {
+                return tableSchema.mapToItem(readModification.transformedItem());
+            }
+        }
+
+        return tableSchema.mapToItem(itemMap);
+    }
+
+    public static <ResponseT, ItemT> Page<ItemT> readAndTransformPaginatedItems(
+        ResponseT response,
+        TableSchema<ItemT> tableSchema,
+        OperationContext operationContext,
+        DynamoDbEnhancedClientExtension dynamoDbEnhancedClientExtension,
+        Function<ResponseT, List<Map<String, AttributeValue>>> getItems,
+        Function<ResponseT, Map<String, AttributeValue>> getLastEvaluatedKey) {
+
+        if (getLastEvaluatedKey.apply(response) == null || getLastEvaluatedKey.apply(response).isEmpty()) {
+            // Last page
+            return Page.create(getItems.apply(response)
+                                   .stream()
+                                   .map(itemMap -> readAndTransformSingleItem(itemMap,
+                                                                              tableSchema,
+                                                                              operationContext,
+                                                                              dynamoDbEnhancedClientExtension))
+                                   .collect(Collectors.toList()));
+        } else {
+            // More pages to come; add the lastEvaluatedKey
+            return Page.create(getItems.apply(response)
+                                   .stream()
+                                   .map(itemMap -> readAndTransformSingleItem(itemMap,
+                                                                              tableSchema,
+                                                                              operationContext,
+                                                                              dynamoDbEnhancedClientExtension))
+                                   .collect(Collectors.toList()),
+                           getLastEvaluatedKey.apply(response));
+        }
+    }
+
+    public static <T> Key createKeyFromItem(T item, TableSchema<T> tableSchema, String indexName) {
+        String partitionKeyName = tableSchema.tableMetadata().indexPartitionKey(indexName);
+        Optional<String> sortKeyName = tableSchema.tableMetadata().indexSortKey(indexName);
+        AttributeValue partitionKeyValue = tableSchema.attributeValue(item, partitionKeyName);
+        Optional<AttributeValue> sortKeyValue = sortKeyName.map(key -> tableSchema.attributeValue(item, key));
+
+        return sortKeyValue.map(
+            attributeValue -> Key.builder()
+                                 .partitionValue(partitionKeyValue)
+                                 .sortValue(attributeValue)
+                                 .build())
+                           .orElseGet(
+                               () -> Key.builder()
+                                        .partitionValue(partitionKeyValue).build());
+    }
+
+    public static Key createKeyFromMap(Map<String, AttributeValue> itemMap,
+                                       TableSchema<?> tableSchema,
+                                       String indexName) {
+        String partitionKeyName = tableSchema.tableMetadata().indexPartitionKey(indexName);
+        Optional<String> sortKeyName = tableSchema.tableMetadata().indexSortKey(indexName);
+        AttributeValue partitionKeyValue = itemMap.get(partitionKeyName);
+        Optional<AttributeValue> sortKeyValue = sortKeyName.map(itemMap::get);
+
+        return sortKeyValue.map(
+            attributeValue -> Key.builder()
+                                 .partitionValue(partitionKeyValue)
+                                 .sortValue(attributeValue)
+                                 .build())
+                           .orElseGet(
+                               () -> Key.builder()
+                                        .partitionValue(partitionKeyValue).build());
+    }
+
+    public static <T> List<T> getItemsFromSupplier(List<Supplier<T>> itemSupplierList) {
+        if (itemSupplierList == null || itemSupplierList.isEmpty()) {
+            return null;
+        }
+        return Collections.unmodifiableList(itemSupplierList.stream()
+                                                            .map(Supplier::get)
+                                                            .collect(Collectors.toList()));
+    }
+
+    /**
+     * A helper method to test if an {@link AttributeValue} is a 'null' constant. This will not test if the
+     * AttributeValue object is null itself, and in fact will throw a NullPointerException if you pass in null.
+     * @param attributeValue An {@link AttributeValue} to test for null.
+     * @return true if the supplied AttributeValue represents a null value, or false if it does not.
+     */
+    public static boolean isNullAttributeValue(AttributeValue attributeValue) {
+        return attributeValue.nul() != null && attributeValue.nul();
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/TransformIterable.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/TransformIterable.java
new file mode 100644
index 000000000000..3c58365daf05
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/TransformIterable.java
@@ -0,0 +1,42 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal;
+
+import java.util.Iterator;
+import java.util.function.Function;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.core.pagination.sync.SdkIterable;
+
+// TODO: Consider moving to SDK core
+@SdkInternalApi
+public class TransformIterable<T, R> implements SdkIterable<R> {
+    private final Iterable<T> wrappedIterable;
+    private final Function<T, R> transformFunction;
+
+    private TransformIterable(Iterable<T> wrappedIterable, Function<T, R> transformFunction) {
+        this.wrappedIterable = wrappedIterable;
+        this.transformFunction = transformFunction;
+    }
+
+    public static <T, R> TransformIterable<T, R> of(SdkIterable<T> iterable, Function<T, R> transformFunction) {
+        return new TransformIterable<>(iterable, transformFunction);
+    }
+
+    @Override
+    public Iterator<R> iterator() {
+        return TransformIterator.create(wrappedIterable.iterator(), transformFunction);
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/core/TransformIterator.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/TransformIterator.java
similarity index 82%
rename from services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/core/TransformIterator.java
rename to services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/TransformIterator.java
index 8c2533f92514..ebe726d1bd9e 100644
--- a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/core/TransformIterator.java
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/TransformIterator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -13,13 +13,13 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.awssdk.extensions.dynamodb.mappingclient.core;
+package software.amazon.awssdk.enhanced.dynamodb.internal;
 
 import java.util.Iterator;
 import java.util.function.Function;
-
 import software.amazon.awssdk.annotations.SdkInternalApi;
 
+// TODO: Consider moving to SDK core
 @SdkInternalApi
 public class TransformIterator<T, R> implements Iterator<R> {
     private final Iterator<T> wrappedIterator;
@@ -30,7 +30,7 @@ private TransformIterator(Iterator<T> wrappedIterator, Function<T, R> transformF
         this.transformFunction = transformFunction;
     }
 
-    public static <T, R> TransformIterator<T, R> of(Iterator<T> iterator, Function<T, R> transformFunction) {
+    public static <T, R> TransformIterator<T, R> create(Iterator<T> iterator, Function<T, R> transformFunction) {
         return new TransformIterator<>(iterator, transformFunction);
     }
 
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/client/DefaultDynamoDbAsyncIndex.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/client/DefaultDynamoDbAsyncIndex.java
new file mode 100644
index 000000000000..34fa7a36d83e
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/client/DefaultDynamoDbAsyncIndex.java
@@ -0,0 +1,156 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.client;
+
+import static software.amazon.awssdk.enhanced.dynamodb.internal.EnhancedClientUtils.createKeyFromItem;
+
+import java.util.function.Consumer;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.core.async.SdkPublisher;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbAsyncIndex;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClientExtension;
+import software.amazon.awssdk.enhanced.dynamodb.Key;
+import software.amazon.awssdk.enhanced.dynamodb.TableSchema;
+import software.amazon.awssdk.enhanced.dynamodb.internal.operations.PaginatedIndexOperation;
+import software.amazon.awssdk.enhanced.dynamodb.internal.operations.QueryOperation;
+import software.amazon.awssdk.enhanced.dynamodb.internal.operations.ScanOperation;
+import software.amazon.awssdk.enhanced.dynamodb.model.Page;
+import software.amazon.awssdk.enhanced.dynamodb.model.QueryConditional;
+import software.amazon.awssdk.enhanced.dynamodb.model.QueryEnhancedRequest;
+import software.amazon.awssdk.enhanced.dynamodb.model.ScanEnhancedRequest;
+import software.amazon.awssdk.services.dynamodb.DynamoDbAsyncClient;
+
+@SdkInternalApi
+public final class DefaultDynamoDbAsyncIndex<T> implements DynamoDbAsyncIndex<T> {
+    private final DynamoDbAsyncClient dynamoDbClient;
+    private final DynamoDbEnhancedClientExtension extension;
+    private final TableSchema<T> tableSchema;
+    private final String tableName;
+    private final String indexName;
+
+    DefaultDynamoDbAsyncIndex(DynamoDbAsyncClient dynamoDbClient,
+                              DynamoDbEnhancedClientExtension extension,
+                              TableSchema<T> tableSchema,
+                              String tableName,
+                              String indexName) {
+        this.dynamoDbClient = dynamoDbClient;
+        this.extension = extension;
+        this.tableSchema = tableSchema;
+        this.tableName = tableName;
+        this.indexName = indexName;
+    }
+
+    @Override
+    public SdkPublisher<Page<T>> query(QueryEnhancedRequest request) {
+        PaginatedIndexOperation<T, ?, ?> operation = QueryOperation.create(request);
+        return operation.executeOnSecondaryIndexAsync(tableSchema, tableName, indexName, extension, dynamoDbClient);
+    }
+
+    @Override
+    public SdkPublisher<Page<T>> query(Consumer<QueryEnhancedRequest.Builder> requestConsumer) {
+        QueryEnhancedRequest.Builder builder = QueryEnhancedRequest.builder();
+        requestConsumer.accept(builder);
+        return query(builder.build());
+    }
+
+    @Override
+    public SdkPublisher<Page<T>> query(QueryConditional queryConditional) {
+        return query(r -> r.queryConditional(queryConditional));
+    }
+
+    @Override
+    public SdkPublisher<Page<T>> scan(ScanEnhancedRequest request) {
+        PaginatedIndexOperation<T, ?, ?> operation = ScanOperation.create(request);
+        return operation.executeOnSecondaryIndexAsync(tableSchema, tableName, indexName, extension, dynamoDbClient);
+    }
+
+    @Override
+    public SdkPublisher<Page<T>> scan(Consumer<ScanEnhancedRequest.Builder> requestConsumer) {
+        ScanEnhancedRequest.Builder builder = ScanEnhancedRequest.builder();
+        requestConsumer.accept(builder);
+        return scan(builder.build());
+    }
+
+    @Override
+    public SdkPublisher<Page<T>> scan() {
+        return scan(ScanEnhancedRequest.builder().build());
+    }
+
+    @Override
+    public DynamoDbEnhancedClientExtension mapperExtension() {
+        return this.extension;
+    }
+
+    @Override
+    public TableSchema<T> tableSchema() {
+        return tableSchema;
+    }
+
+    public DynamoDbAsyncClient dynamoDbClient() {
+        return dynamoDbClient;
+    }
+
+    public String tableName() {
+        return tableName;
+    }
+
+    public String indexName() {
+        return indexName;
+    }
+
+    @Override
+    public Key keyFrom(T item) {
+        return createKeyFromItem(item, tableSchema, indexName);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        DefaultDynamoDbAsyncIndex<?> that = (DefaultDynamoDbAsyncIndex<?>) o;
+
+        if (dynamoDbClient != null ? ! dynamoDbClient.equals(that.dynamoDbClient)
+            : that.dynamoDbClient != null) {
+
+            return false;
+        }
+        if (extension != null ? ! extension.equals(that.extension) : that.extension != null) {
+            return false;
+        }
+        if (tableSchema != null ? ! tableSchema.equals(that.tableSchema) : that.tableSchema != null) {
+            return false;
+        }
+        if (tableName != null ? ! tableName.equals(that.tableName) : that.tableName != null) {
+            return false;
+        }
+        return indexName != null ? indexName.equals(that.indexName) : that.indexName == null;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = dynamoDbClient != null ? dynamoDbClient.hashCode() : 0;
+        result = 31 * result + (extension != null ? extension.hashCode() : 0);
+        result = 31 * result + (tableSchema != null ? tableSchema.hashCode() : 0);
+        result = 31 * result + (tableName != null ? tableName.hashCode() : 0);
+        result = 31 * result + (indexName != null ? indexName.hashCode() : 0);
+        return result;
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/client/DefaultDynamoDbAsyncTable.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/client/DefaultDynamoDbAsyncTable.java
new file mode 100644
index 000000000000..b983c3639276
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/client/DefaultDynamoDbAsyncTable.java
@@ -0,0 +1,268 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.client;
+
+import static software.amazon.awssdk.enhanced.dynamodb.internal.EnhancedClientUtils.createKeyFromItem;
+
+import java.util.concurrent.CompletableFuture;
+import java.util.function.Consumer;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbAsyncTable;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClientExtension;
+import software.amazon.awssdk.enhanced.dynamodb.Key;
+import software.amazon.awssdk.enhanced.dynamodb.TableMetadata;
+import software.amazon.awssdk.enhanced.dynamodb.TableSchema;
+import software.amazon.awssdk.enhanced.dynamodb.internal.operations.CreateTableOperation;
+import software.amazon.awssdk.enhanced.dynamodb.internal.operations.DeleteItemOperation;
+import software.amazon.awssdk.enhanced.dynamodb.internal.operations.GetItemOperation;
+import software.amazon.awssdk.enhanced.dynamodb.internal.operations.PaginatedTableOperation;
+import software.amazon.awssdk.enhanced.dynamodb.internal.operations.PutItemOperation;
+import software.amazon.awssdk.enhanced.dynamodb.internal.operations.QueryOperation;
+import software.amazon.awssdk.enhanced.dynamodb.internal.operations.ScanOperation;
+import software.amazon.awssdk.enhanced.dynamodb.internal.operations.TableOperation;
+import software.amazon.awssdk.enhanced.dynamodb.internal.operations.UpdateItemOperation;
+import software.amazon.awssdk.enhanced.dynamodb.model.CreateTableEnhancedRequest;
+import software.amazon.awssdk.enhanced.dynamodb.model.DeleteItemEnhancedRequest;
+import software.amazon.awssdk.enhanced.dynamodb.model.GetItemEnhancedRequest;
+import software.amazon.awssdk.enhanced.dynamodb.model.PagePublisher;
+import software.amazon.awssdk.enhanced.dynamodb.model.PutItemEnhancedRequest;
+import software.amazon.awssdk.enhanced.dynamodb.model.QueryConditional;
+import software.amazon.awssdk.enhanced.dynamodb.model.QueryEnhancedRequest;
+import software.amazon.awssdk.enhanced.dynamodb.model.ScanEnhancedRequest;
+import software.amazon.awssdk.enhanced.dynamodb.model.UpdateItemEnhancedRequest;
+import software.amazon.awssdk.services.dynamodb.DynamoDbAsyncClient;
+
+@SdkInternalApi
+public final class DefaultDynamoDbAsyncTable<T> implements DynamoDbAsyncTable<T> {
+    private final DynamoDbAsyncClient dynamoDbClient;
+    private final DynamoDbEnhancedClientExtension extension;
+    private final TableSchema<T> tableSchema;
+    private final String tableName;
+
+    DefaultDynamoDbAsyncTable(DynamoDbAsyncClient dynamoDbClient,
+                              DynamoDbEnhancedClientExtension extension,
+                              TableSchema<T> tableSchema,
+                              String tableName) {
+        this.dynamoDbClient = dynamoDbClient;
+        this.extension = extension;
+        this.tableSchema = tableSchema;
+        this.tableName = tableName;
+    }
+
+    @Override
+    public DynamoDbEnhancedClientExtension mapperExtension() {
+        return this.extension;
+    }
+
+    @Override
+    public TableSchema<T> tableSchema() {
+        return this.tableSchema;
+    }
+
+    public DynamoDbAsyncClient dynamoDbClient() {
+        return dynamoDbClient;
+    }
+
+    public String tableName() {
+        return tableName;
+    }
+
+    @Override
+    public DefaultDynamoDbAsyncIndex<T> index(String indexName) {
+        // Force a check for the existence of the index
+        tableSchema.tableMetadata().indexPartitionKey(indexName);
+
+        return new DefaultDynamoDbAsyncIndex<>(dynamoDbClient, extension, tableSchema, tableName, indexName);
+    }
+
+    @Override
+    public CompletableFuture<Void> createTable(CreateTableEnhancedRequest request) {
+        TableOperation<T, ?, ?, Void> operation = CreateTableOperation.create(request);
+        return operation.executeOnPrimaryIndexAsync(tableSchema, tableName, extension, dynamoDbClient);
+    }
+
+    @Override
+    public CompletableFuture<Void> createTable(Consumer<CreateTableEnhancedRequest.Builder> requestConsumer) {
+        CreateTableEnhancedRequest.Builder builder = CreateTableEnhancedRequest.builder();
+        requestConsumer.accept(builder);
+        return createTable(builder.build());
+    }
+
+
+    @Override
+    public CompletableFuture<Void> createTable() {
+        return createTable(CreateTableEnhancedRequest.builder().build());
+    }
+
+    @Override
+    public CompletableFuture<T> deleteItem(DeleteItemEnhancedRequest request) {
+        TableOperation<T, ?, ?, T> operation = DeleteItemOperation.create(request);
+        return operation.executeOnPrimaryIndexAsync(tableSchema, tableName, extension, dynamoDbClient);
+    }
+
+    @Override
+    public CompletableFuture<T> deleteItem(Consumer<DeleteItemEnhancedRequest.Builder> requestConsumer) {
+        DeleteItemEnhancedRequest.Builder builder = DeleteItemEnhancedRequest.builder();
+        requestConsumer.accept(builder);
+        return deleteItem(builder.build());
+    }
+
+    @Override
+    public CompletableFuture<T> deleteItem(Key key) {
+        return deleteItem(r -> r.key(key));
+    }
+
+    @Override
+    public CompletableFuture<T> deleteItem(T keyItem) {
+        return deleteItem(keyFrom(keyItem));
+    }
+
+    @Override
+    public CompletableFuture<T> getItem(GetItemEnhancedRequest request) {
+        TableOperation<T, ?, ?, T> operation = GetItemOperation.create(request);
+        return operation.executeOnPrimaryIndexAsync(tableSchema, tableName, extension, dynamoDbClient);
+    }
+
+    @Override
+    public CompletableFuture<T> getItem(Consumer<GetItemEnhancedRequest.Builder> requestConsumer) {
+        GetItemEnhancedRequest.Builder builder = GetItemEnhancedRequest.builder();
+        requestConsumer.accept(builder);
+        return getItem(builder.build());
+    }
+
+    @Override
+    public CompletableFuture<T> getItem(Key key) {
+        return getItem(r -> r.key(key));
+    }
+
+    @Override
+    public CompletableFuture<T> getItem(T keyItem) {
+        return getItem(keyFrom(keyItem));
+    }
+
+    @Override
+    public PagePublisher<T> query(QueryEnhancedRequest request) {
+        PaginatedTableOperation<T, ?, ?> operation = QueryOperation.create(request);
+        return operation.executeOnPrimaryIndexAsync(tableSchema, tableName, extension, dynamoDbClient);
+    }
+
+    @Override
+    public PagePublisher<T> query(Consumer<QueryEnhancedRequest.Builder> requestConsumer) {
+        QueryEnhancedRequest.Builder builder = QueryEnhancedRequest.builder();
+        requestConsumer.accept(builder);
+        return query(builder.build());
+    }
+
+    @Override
+    public PagePublisher<T> query(QueryConditional queryConditional) {
+        return query(r -> r.queryConditional(queryConditional));
+    }
+
+    @Override
+    public CompletableFuture<Void> putItem(PutItemEnhancedRequest<T> request) {
+        TableOperation<T, ?, ?, Void> operation = PutItemOperation.create(request);
+        return operation.executeOnPrimaryIndexAsync(tableSchema, tableName, extension, dynamoDbClient);
+    }
+
+    @Override
+    public CompletableFuture<Void> putItem(Consumer<PutItemEnhancedRequest.Builder<T>> requestConsumer) {
+        PutItemEnhancedRequest.Builder<T> builder =
+            PutItemEnhancedRequest.builder(this.tableSchema.itemType().rawClass());
+        requestConsumer.accept(builder);
+        return putItem(builder.build());
+    }
+
+    @Override
+    public CompletableFuture<Void> putItem(T item) {
+        return putItem(r -> r.item(item));
+    }
+
+    @Override
+    public PagePublisher<T> scan(ScanEnhancedRequest request) {
+        PaginatedTableOperation<T, ?, ?> operation = ScanOperation.create(request);
+        return operation.executeOnPrimaryIndexAsync(tableSchema, tableName, extension, dynamoDbClient);
+    }
+
+    @Override
+    public PagePublisher<T> scan(Consumer<ScanEnhancedRequest.Builder> requestConsumer) {
+        ScanEnhancedRequest.Builder builder = ScanEnhancedRequest.builder();
+        requestConsumer.accept(builder);
+        return scan(builder.build());
+    }
+
+    @Override
+    public PagePublisher<T> scan() {
+        return scan(ScanEnhancedRequest.builder().build());
+    }
+
+    @Override
+    public CompletableFuture<T> updateItem(UpdateItemEnhancedRequest<T> request) {
+        TableOperation<T, ?, ?, T> operation = UpdateItemOperation.create(request);
+        return operation.executeOnPrimaryIndexAsync(tableSchema, tableName, extension, dynamoDbClient);
+    }
+
+    @Override
+    public CompletableFuture<T> updateItem(Consumer<UpdateItemEnhancedRequest.Builder<T>> requestConsumer) {
+        UpdateItemEnhancedRequest.Builder<T> builder =
+            UpdateItemEnhancedRequest.builder(this.tableSchema.itemType().rawClass());
+        requestConsumer.accept(builder);
+        return updateItem(builder.build());
+    }
+
+    @Override
+    public CompletableFuture<T> updateItem(T item) {
+        return updateItem(r -> r.item(item));
+    }
+
+    @Override
+    public Key keyFrom(T item) {
+        return createKeyFromItem(item, tableSchema, TableMetadata.primaryIndexName());
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        DefaultDynamoDbAsyncTable<?> that = (DefaultDynamoDbAsyncTable<?>) o;
+
+        if (dynamoDbClient != null ? ! dynamoDbClient.equals(that.dynamoDbClient)
+            : that.dynamoDbClient != null) {
+
+            return false;
+        }
+        if (extension != null ? ! extension.equals(that.extension) : that.extension != null) {
+            return false;
+        }
+        if (tableSchema != null ? ! tableSchema.equals(that.tableSchema) : that.tableSchema != null) {
+            return false;
+        }
+        return tableName != null ? tableName.equals(that.tableName) : that.tableName == null;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = dynamoDbClient != null ? dynamoDbClient.hashCode() : 0;
+        result = 31 * result + (extension != null ? extension.hashCode() : 0);
+        result = 31 * result + (tableSchema != null ? tableSchema.hashCode() : 0);
+        result = 31 * result + (tableName != null ? tableName.hashCode() : 0);
+        return result;
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/client/DefaultDynamoDbEnhancedAsyncClient.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/client/DefaultDynamoDbEnhancedAsyncClient.java
new file mode 100644
index 000000000000..0e8090718407
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/client/DefaultDynamoDbEnhancedAsyncClient.java
@@ -0,0 +1,184 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.client;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import java.util.function.Consumer;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.enhanced.dynamodb.Document;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedAsyncClient;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClientExtension;
+import software.amazon.awssdk.enhanced.dynamodb.TableSchema;
+import software.amazon.awssdk.enhanced.dynamodb.internal.operations.BatchGetItemOperation;
+import software.amazon.awssdk.enhanced.dynamodb.internal.operations.BatchWriteItemOperation;
+import software.amazon.awssdk.enhanced.dynamodb.internal.operations.TransactGetItemsOperation;
+import software.amazon.awssdk.enhanced.dynamodb.internal.operations.TransactWriteItemsOperation;
+import software.amazon.awssdk.enhanced.dynamodb.model.BatchGetItemEnhancedRequest;
+import software.amazon.awssdk.enhanced.dynamodb.model.BatchGetResultPagePublisher;
+import software.amazon.awssdk.enhanced.dynamodb.model.BatchWriteItemEnhancedRequest;
+import software.amazon.awssdk.enhanced.dynamodb.model.BatchWriteResult;
+import software.amazon.awssdk.enhanced.dynamodb.model.TransactGetItemsEnhancedRequest;
+import software.amazon.awssdk.enhanced.dynamodb.model.TransactWriteItemsEnhancedRequest;
+import software.amazon.awssdk.services.dynamodb.DynamoDbAsyncClient;
+
+@SdkInternalApi
+public final class DefaultDynamoDbEnhancedAsyncClient implements DynamoDbEnhancedAsyncClient {
+    private final DynamoDbAsyncClient dynamoDbClient;
+    private final DynamoDbEnhancedClientExtension extension;
+
+    private DefaultDynamoDbEnhancedAsyncClient(Builder builder) {
+        this.dynamoDbClient = builder.dynamoDbClient == null ? DynamoDbAsyncClient.create() : builder.dynamoDbClient;
+        this.extension = ExtensionResolver.resolveExtensions(builder.dynamoDbEnhancedClientExtensions);
+    }
+
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    @Override
+    public <T> DefaultDynamoDbAsyncTable<T> table(String tableName, TableSchema<T> tableSchema) {
+        return new DefaultDynamoDbAsyncTable<>(dynamoDbClient, extension, tableSchema, tableName);
+    }
+
+    @Override
+    public BatchGetResultPagePublisher batchGetItem(BatchGetItemEnhancedRequest request) {
+        BatchGetItemOperation operation = BatchGetItemOperation.create(request);
+        return BatchGetResultPagePublisher.create(operation.executeAsync(dynamoDbClient, extension));
+    }
+
+    @Override
+    public BatchGetResultPagePublisher batchGetItem(
+        Consumer<BatchGetItemEnhancedRequest.Builder> requestConsumer) {
+
+        BatchGetItemEnhancedRequest.Builder builder = BatchGetItemEnhancedRequest.builder();
+        requestConsumer.accept(builder);
+        return batchGetItem(builder.build());
+    }
+
+    @Override
+    public CompletableFuture<BatchWriteResult> batchWriteItem(BatchWriteItemEnhancedRequest request) {
+        BatchWriteItemOperation operation = BatchWriteItemOperation.create(request);
+        return operation.executeAsync(dynamoDbClient, extension);
+    }
+
+    @Override
+    public CompletableFuture<BatchWriteResult> batchWriteItem(
+        Consumer<BatchWriteItemEnhancedRequest.Builder> requestConsumer) {
+
+        BatchWriteItemEnhancedRequest.Builder builder = BatchWriteItemEnhancedRequest.builder();
+        requestConsumer.accept(builder);
+        return batchWriteItem(builder.build());
+    }
+
+    @Override
+    public CompletableFuture<List<Document>> transactGetItems(TransactGetItemsEnhancedRequest request) {
+        TransactGetItemsOperation operation = TransactGetItemsOperation.create(request);
+        return operation.executeAsync(dynamoDbClient, extension);
+    }
+
+    @Override
+    public CompletableFuture<List<Document>> transactGetItems(
+        Consumer<TransactGetItemsEnhancedRequest.Builder> requestConsumer) {
+        TransactGetItemsEnhancedRequest.Builder builder = TransactGetItemsEnhancedRequest.builder();
+        requestConsumer.accept(builder);
+        return transactGetItems(builder.build());
+    }
+
+    @Override
+    public CompletableFuture<Void> transactWriteItems(TransactWriteItemsEnhancedRequest request) {
+        TransactWriteItemsOperation operation = TransactWriteItemsOperation.create(request);
+        return operation.executeAsync(dynamoDbClient, extension);
+    }
+
+    @Override
+    public CompletableFuture<Void> transactWriteItems(
+        Consumer<TransactWriteItemsEnhancedRequest.Builder> requestConsumer) {
+
+        TransactWriteItemsEnhancedRequest.Builder builder = TransactWriteItemsEnhancedRequest.builder();
+        requestConsumer.accept(builder);
+        return transactWriteItems(builder.build());
+    }
+
+    public DynamoDbAsyncClient dynamoDbAsyncClient() {
+        return dynamoDbClient;
+    }
+
+    public DynamoDbEnhancedClientExtension mapperExtension() {
+        return extension;
+    }
+
+    public Builder toBuilder() {
+        return builder().dynamoDbClient(this.dynamoDbClient).extensions(this.extension);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        DefaultDynamoDbEnhancedAsyncClient that = (DefaultDynamoDbEnhancedAsyncClient) o;
+
+        if (dynamoDbClient != null ? ! dynamoDbClient.equals(that.dynamoDbClient)
+            : that.dynamoDbClient != null) {
+
+            return false;
+        }
+        return extension != null ? extension.equals(that.extension) : that.extension == null;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = dynamoDbClient != null ? dynamoDbClient.hashCode() : 0;
+        result = 31 * result + (extension != null ? extension.hashCode() : 0);
+        return result;
+    }
+
+    public static final class Builder implements DynamoDbEnhancedAsyncClient.Builder {
+        private DynamoDbAsyncClient dynamoDbClient;
+        private List<DynamoDbEnhancedClientExtension> dynamoDbEnhancedClientExtensions =
+            new ArrayList<>(ExtensionResolver.defaultExtensions());
+
+        @Override
+        public DefaultDynamoDbEnhancedAsyncClient build() {
+            return new DefaultDynamoDbEnhancedAsyncClient(this);
+        }
+
+        @Override
+        public Builder dynamoDbClient(DynamoDbAsyncClient dynamoDbClient) {
+            this.dynamoDbClient = dynamoDbClient;
+            return this;
+        }
+
+        @Override
+        public Builder extensions(DynamoDbEnhancedClientExtension... dynamoDbEnhancedClientExtensions) {
+            this.dynamoDbEnhancedClientExtensions = Arrays.asList(dynamoDbEnhancedClientExtensions);
+            return this;
+        }
+
+        @Override
+        public Builder extensions(List<DynamoDbEnhancedClientExtension> dynamoDbEnhancedClientExtensions) {
+            this.dynamoDbEnhancedClientExtensions = new ArrayList<>(dynamoDbEnhancedClientExtensions);
+            return this;
+        }
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/client/DefaultDynamoDbEnhancedClient.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/client/DefaultDynamoDbEnhancedClient.java
new file mode 100644
index 000000000000..c68bccef057f
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/client/DefaultDynamoDbEnhancedClient.java
@@ -0,0 +1,179 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.client;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.function.Consumer;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.enhanced.dynamodb.Document;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClient;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClientExtension;
+import software.amazon.awssdk.enhanced.dynamodb.TableSchema;
+import software.amazon.awssdk.enhanced.dynamodb.internal.operations.BatchGetItemOperation;
+import software.amazon.awssdk.enhanced.dynamodb.internal.operations.BatchWriteItemOperation;
+import software.amazon.awssdk.enhanced.dynamodb.internal.operations.TransactGetItemsOperation;
+import software.amazon.awssdk.enhanced.dynamodb.internal.operations.TransactWriteItemsOperation;
+import software.amazon.awssdk.enhanced.dynamodb.model.BatchGetItemEnhancedRequest;
+import software.amazon.awssdk.enhanced.dynamodb.model.BatchGetResultPageIterable;
+import software.amazon.awssdk.enhanced.dynamodb.model.BatchWriteItemEnhancedRequest;
+import software.amazon.awssdk.enhanced.dynamodb.model.BatchWriteResult;
+import software.amazon.awssdk.enhanced.dynamodb.model.TransactGetItemsEnhancedRequest;
+import software.amazon.awssdk.enhanced.dynamodb.model.TransactWriteItemsEnhancedRequest;
+import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
+
+@SdkInternalApi
+public final class DefaultDynamoDbEnhancedClient implements DynamoDbEnhancedClient {
+    private final DynamoDbClient dynamoDbClient;
+    private final DynamoDbEnhancedClientExtension extension;
+
+    private DefaultDynamoDbEnhancedClient(Builder builder) {
+        this.dynamoDbClient = builder.dynamoDbClient == null ? DynamoDbClient.create() : builder.dynamoDbClient;
+        this.extension = ExtensionResolver.resolveExtensions(builder.dynamoDbEnhancedClientExtensions);
+    }
+
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    @Override
+    public <T> DefaultDynamoDbTable<T> table(String tableName, TableSchema<T> tableSchema) {
+        return new DefaultDynamoDbTable<>(dynamoDbClient, extension, tableSchema, tableName);
+    }
+
+    @Override
+    public BatchGetResultPageIterable batchGetItem(BatchGetItemEnhancedRequest request) {
+        BatchGetItemOperation operation = BatchGetItemOperation.create(request);
+        return BatchGetResultPageIterable.create(operation.execute(dynamoDbClient, extension));
+    }
+
+    @Override
+    public BatchGetResultPageIterable batchGetItem(Consumer<BatchGetItemEnhancedRequest.Builder> requestConsumer) {
+        BatchGetItemEnhancedRequest.Builder builder = BatchGetItemEnhancedRequest.builder();
+        requestConsumer.accept(builder);
+        return batchGetItem(builder.build());
+    }
+
+    @Override
+    public BatchWriteResult batchWriteItem(BatchWriteItemEnhancedRequest request) {
+        BatchWriteItemOperation operation = BatchWriteItemOperation.create(request);
+        return operation.execute(dynamoDbClient, extension);
+    }
+
+    @Override
+    public BatchWriteResult batchWriteItem(Consumer<BatchWriteItemEnhancedRequest.Builder> requestConsumer) {
+        BatchWriteItemEnhancedRequest.Builder builder = BatchWriteItemEnhancedRequest.builder();
+        requestConsumer.accept(builder);
+        return batchWriteItem(builder.build());
+    }
+
+    @Override
+    public List<Document> transactGetItems(TransactGetItemsEnhancedRequest request) {
+        TransactGetItemsOperation operation = TransactGetItemsOperation.create(request);
+        return operation.execute(dynamoDbClient, extension);
+    }
+
+    @Override
+    public List<Document> transactGetItems(
+        Consumer<TransactGetItemsEnhancedRequest.Builder> requestConsumer) {
+
+        TransactGetItemsEnhancedRequest.Builder builder = TransactGetItemsEnhancedRequest.builder();
+        requestConsumer.accept(builder);
+        return transactGetItems(builder.build());
+    }
+
+    @Override
+    public Void transactWriteItems(TransactWriteItemsEnhancedRequest request) {
+        TransactWriteItemsOperation operation = TransactWriteItemsOperation.create(request);
+        return operation.execute(dynamoDbClient, extension);
+    }
+
+    @Override
+    public Void transactWriteItems(Consumer<TransactWriteItemsEnhancedRequest.Builder> requestConsumer) {
+        TransactWriteItemsEnhancedRequest.Builder builder = TransactWriteItemsEnhancedRequest.builder();
+        requestConsumer.accept(builder);
+        return transactWriteItems(builder.build());
+    }
+
+    public DynamoDbClient dynamoDbClient() {
+        return dynamoDbClient;
+    }
+
+    public DynamoDbEnhancedClientExtension mapperExtension() {
+        return extension;
+    }
+
+    public Builder toBuilder() {
+        return builder().dynamoDbClient(this.dynamoDbClient).extensions(this.extension);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        DefaultDynamoDbEnhancedClient that = (DefaultDynamoDbEnhancedClient) o;
+
+        if (dynamoDbClient != null ? ! dynamoDbClient.equals(that.dynamoDbClient) : that.dynamoDbClient != null) {
+            return false;
+        }
+        return extension != null ?
+            extension.equals(that.extension) :
+            that.extension == null;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = dynamoDbClient != null ? dynamoDbClient.hashCode() : 0;
+        result = 31 * result + (extension != null ?
+            extension.hashCode() : 0);
+        return result;
+    }
+
+    public static final class Builder implements DynamoDbEnhancedClient.Builder {
+        private DynamoDbClient dynamoDbClient;
+        private List<DynamoDbEnhancedClientExtension> dynamoDbEnhancedClientExtensions =
+            new ArrayList<>(ExtensionResolver.defaultExtensions());
+
+        @Override
+        public DefaultDynamoDbEnhancedClient build() {
+            return new DefaultDynamoDbEnhancedClient(this);
+        }
+
+        @Override
+        public Builder dynamoDbClient(DynamoDbClient dynamoDbClient) {
+            this.dynamoDbClient = dynamoDbClient;
+            return this;
+        }
+
+        @Override
+        public Builder extensions(DynamoDbEnhancedClientExtension... dynamoDbEnhancedClientExtensions) {
+            this.dynamoDbEnhancedClientExtensions = Arrays.asList(dynamoDbEnhancedClientExtensions);
+            return this;
+        }
+
+        @Override
+        public Builder extensions(List<DynamoDbEnhancedClientExtension> dynamoDbEnhancedClientExtensions) {
+            this.dynamoDbEnhancedClientExtensions = new ArrayList<>(dynamoDbEnhancedClientExtensions);
+            return this;
+        }
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/client/DefaultDynamoDbIndex.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/client/DefaultDynamoDbIndex.java
new file mode 100644
index 000000000000..cb4b7be7619d
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/client/DefaultDynamoDbIndex.java
@@ -0,0 +1,154 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.client;
+
+import static software.amazon.awssdk.enhanced.dynamodb.internal.EnhancedClientUtils.createKeyFromItem;
+
+import java.util.function.Consumer;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.core.pagination.sync.SdkIterable;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClientExtension;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbIndex;
+import software.amazon.awssdk.enhanced.dynamodb.Key;
+import software.amazon.awssdk.enhanced.dynamodb.TableSchema;
+import software.amazon.awssdk.enhanced.dynamodb.internal.operations.PaginatedIndexOperation;
+import software.amazon.awssdk.enhanced.dynamodb.internal.operations.QueryOperation;
+import software.amazon.awssdk.enhanced.dynamodb.internal.operations.ScanOperation;
+import software.amazon.awssdk.enhanced.dynamodb.model.Page;
+import software.amazon.awssdk.enhanced.dynamodb.model.QueryConditional;
+import software.amazon.awssdk.enhanced.dynamodb.model.QueryEnhancedRequest;
+import software.amazon.awssdk.enhanced.dynamodb.model.ScanEnhancedRequest;
+import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
+
+@SdkInternalApi
+public class DefaultDynamoDbIndex<T> implements DynamoDbIndex<T> {
+    private final DynamoDbClient dynamoDbClient;
+    private final DynamoDbEnhancedClientExtension extension;
+    private final TableSchema<T> tableSchema;
+    private final String tableName;
+    private final String indexName;
+
+    DefaultDynamoDbIndex(DynamoDbClient dynamoDbClient,
+                         DynamoDbEnhancedClientExtension extension,
+                         TableSchema<T> tableSchema,
+                         String tableName,
+                         String indexName) {
+        this.dynamoDbClient = dynamoDbClient;
+        this.extension = extension;
+        this.tableSchema = tableSchema;
+        this.tableName = tableName;
+        this.indexName = indexName;
+    }
+
+    @Override
+    public SdkIterable<Page<T>> query(QueryEnhancedRequest request) {
+        PaginatedIndexOperation<T, ?, ?> operation = QueryOperation.create(request);
+        return operation.executeOnSecondaryIndex(tableSchema, tableName, indexName, extension, dynamoDbClient);
+    }
+
+    @Override
+    public SdkIterable<Page<T>> query(Consumer<QueryEnhancedRequest.Builder> requestConsumer) {
+        QueryEnhancedRequest.Builder builder = QueryEnhancedRequest.builder();
+        requestConsumer.accept(builder);
+        return query(builder.build());
+    }
+
+    @Override
+    public SdkIterable<Page<T>> query(QueryConditional queryConditional) {
+        return query(r -> r.queryConditional(queryConditional));
+    }
+
+    @Override
+    public SdkIterable<Page<T>> scan(ScanEnhancedRequest request) {
+        PaginatedIndexOperation<T, ?, ?> operation = ScanOperation.create(request);
+        return operation.executeOnSecondaryIndex(tableSchema, tableName, indexName, extension, dynamoDbClient);
+    }
+
+    @Override
+    public SdkIterable<Page<T>> scan(Consumer<ScanEnhancedRequest.Builder> requestConsumer) {
+        ScanEnhancedRequest.Builder builder = ScanEnhancedRequest.builder();
+        requestConsumer.accept(builder);
+        return scan(builder.build());
+    }
+
+    @Override
+    public SdkIterable<Page<T>> scan() {
+        return scan(ScanEnhancedRequest.builder().build());
+    }
+
+    @Override
+    public DynamoDbEnhancedClientExtension mapperExtension() {
+        return this.extension;
+    }
+
+    @Override
+    public TableSchema<T> tableSchema() {
+        return tableSchema;
+    }
+
+    public DynamoDbClient dynamoDbClient() {
+        return dynamoDbClient;
+    }
+
+    public String tableName() {
+        return tableName;
+    }
+
+    public String indexName() {
+        return indexName;
+    }
+
+    @Override
+    public Key keyFrom(T item) {
+        return createKeyFromItem(item, tableSchema, indexName);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        DefaultDynamoDbIndex<?> that = (DefaultDynamoDbIndex<?>) o;
+
+        if (dynamoDbClient != null ? ! dynamoDbClient.equals(that.dynamoDbClient) : that.dynamoDbClient != null) {
+            return false;
+        }
+        if (extension != null ? ! extension.equals(that.extension) : that.extension != null) {
+            return false;
+        }
+        if (tableSchema != null ? ! tableSchema.equals(that.tableSchema) : that.tableSchema != null) {
+            return false;
+        }
+        if (tableName != null ? ! tableName.equals(that.tableName) : that.tableName != null) {
+            return false;
+        }
+        return indexName != null ? indexName.equals(that.indexName) : that.indexName == null;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = dynamoDbClient != null ? dynamoDbClient.hashCode() : 0;
+        result = 31 * result + (extension != null ? extension.hashCode() : 0);
+        result = 31 * result + (tableSchema != null ? tableSchema.hashCode() : 0);
+        result = 31 * result + (tableName != null ? tableName.hashCode() : 0);
+        result = 31 * result + (indexName != null ? indexName.hashCode() : 0);
+        return result;
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/client/DefaultDynamoDbTable.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/client/DefaultDynamoDbTable.java
new file mode 100644
index 000000000000..d30327b1e8d4
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/client/DefaultDynamoDbTable.java
@@ -0,0 +1,272 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.client;
+
+import static software.amazon.awssdk.enhanced.dynamodb.internal.EnhancedClientUtils.createKeyFromItem;
+
+import java.util.function.Consumer;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClientExtension;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbTable;
+import software.amazon.awssdk.enhanced.dynamodb.Key;
+import software.amazon.awssdk.enhanced.dynamodb.TableMetadata;
+import software.amazon.awssdk.enhanced.dynamodb.TableSchema;
+import software.amazon.awssdk.enhanced.dynamodb.internal.operations.CreateTableOperation;
+import software.amazon.awssdk.enhanced.dynamodb.internal.operations.DeleteItemOperation;
+import software.amazon.awssdk.enhanced.dynamodb.internal.operations.GetItemOperation;
+import software.amazon.awssdk.enhanced.dynamodb.internal.operations.PaginatedTableOperation;
+import software.amazon.awssdk.enhanced.dynamodb.internal.operations.PutItemOperation;
+import software.amazon.awssdk.enhanced.dynamodb.internal.operations.QueryOperation;
+import software.amazon.awssdk.enhanced.dynamodb.internal.operations.ScanOperation;
+import software.amazon.awssdk.enhanced.dynamodb.internal.operations.TableOperation;
+import software.amazon.awssdk.enhanced.dynamodb.internal.operations.UpdateItemOperation;
+import software.amazon.awssdk.enhanced.dynamodb.model.CreateTableEnhancedRequest;
+import software.amazon.awssdk.enhanced.dynamodb.model.DeleteItemEnhancedRequest;
+import software.amazon.awssdk.enhanced.dynamodb.model.GetItemEnhancedRequest;
+import software.amazon.awssdk.enhanced.dynamodb.model.PageIterable;
+import software.amazon.awssdk.enhanced.dynamodb.model.PutItemEnhancedRequest;
+import software.amazon.awssdk.enhanced.dynamodb.model.QueryConditional;
+import software.amazon.awssdk.enhanced.dynamodb.model.QueryEnhancedRequest;
+import software.amazon.awssdk.enhanced.dynamodb.model.ScanEnhancedRequest;
+import software.amazon.awssdk.enhanced.dynamodb.model.UpdateItemEnhancedRequest;
+import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
+
+@SdkInternalApi
+public class DefaultDynamoDbTable<T> implements DynamoDbTable<T> {
+    private final DynamoDbClient dynamoDbClient;
+    private final DynamoDbEnhancedClientExtension extension;
+    private final TableSchema<T> tableSchema;
+    private final String tableName;
+
+    DefaultDynamoDbTable(DynamoDbClient dynamoDbClient,
+                         DynamoDbEnhancedClientExtension extension,
+                         TableSchema<T> tableSchema,
+                         String tableName) {
+        this.dynamoDbClient = dynamoDbClient;
+        this.extension = extension;
+        this.tableSchema = tableSchema;
+        this.tableName = tableName;
+    }
+
+    @Override
+    public DynamoDbEnhancedClientExtension mapperExtension() {
+        return this.extension;
+    }
+
+    @Override
+    public TableSchema<T> tableSchema() {
+        return this.tableSchema;
+    }
+
+    public DynamoDbClient dynamoDbClient() {
+        return dynamoDbClient;
+    }
+
+    public String tableName() {
+        return tableName;
+    }
+
+    @Override
+    public DefaultDynamoDbIndex<T> index(String indexName) {
+        // Force a check for the existence of the index
+        tableSchema.tableMetadata().indexPartitionKey(indexName);
+
+        return new DefaultDynamoDbIndex<>(dynamoDbClient,
+                                          extension,
+                                          tableSchema,
+                                          tableName,
+                                          indexName);
+    }
+
+    @Override
+    public void createTable(CreateTableEnhancedRequest request) {
+        TableOperation<T, ?, ?, Void> operation = CreateTableOperation.create(request);
+        operation.executeOnPrimaryIndex(tableSchema, tableName, extension, dynamoDbClient);
+    }
+
+    @Override
+    public void createTable(Consumer<CreateTableEnhancedRequest.Builder> requestConsumer) {
+        CreateTableEnhancedRequest.Builder builder = CreateTableEnhancedRequest.builder();
+        requestConsumer.accept(builder);
+        createTable(builder.build());
+    }
+
+    @Override
+    public void createTable() {
+        createTable(CreateTableEnhancedRequest.builder().build());
+    }
+
+    @Override
+    public T deleteItem(DeleteItemEnhancedRequest request) {
+        TableOperation<T, ?, ?, T> operation = DeleteItemOperation.create(request);
+        return operation.executeOnPrimaryIndex(tableSchema, tableName, extension, dynamoDbClient);
+    }
+
+    @Override
+    public T deleteItem(Consumer<DeleteItemEnhancedRequest.Builder> requestConsumer) {
+        DeleteItemEnhancedRequest.Builder builder = DeleteItemEnhancedRequest.builder();
+        requestConsumer.accept(builder);
+        return deleteItem(builder.build());
+    }
+
+    @Override
+    public T deleteItem(Key key) {
+        return deleteItem(r -> r.key(key));
+    }
+
+    @Override
+    public T deleteItem(T keyItem) {
+        return deleteItem(keyFrom(keyItem));
+    }
+
+    @Override
+    public T getItem(GetItemEnhancedRequest request) {
+        TableOperation<T, ?, ?, T> operation = GetItemOperation.create(request);
+        return operation.executeOnPrimaryIndex(tableSchema, tableName, extension, dynamoDbClient);
+    }
+
+    @Override
+    public T getItem(Consumer<GetItemEnhancedRequest.Builder> requestConsumer) {
+        GetItemEnhancedRequest.Builder builder = GetItemEnhancedRequest.builder();
+        requestConsumer.accept(builder);
+        return getItem(builder.build());
+    }
+
+    @Override
+    public T getItem(Key key) {
+        return getItem(r -> r.key(key));
+    }
+
+    @Override
+    public T getItem(T keyItem) {
+        return getItem(keyFrom(keyItem));
+    }
+
+    @Override
+    public PageIterable<T> query(QueryEnhancedRequest request) {
+        PaginatedTableOperation<T, ?, ?> operation = QueryOperation.create(request);
+        return operation.executeOnPrimaryIndex(tableSchema, tableName, extension, dynamoDbClient);
+    }
+
+    @Override
+    public PageIterable<T> query(Consumer<QueryEnhancedRequest.Builder> requestConsumer) {
+        QueryEnhancedRequest.Builder builder = QueryEnhancedRequest.builder();
+        requestConsumer.accept(builder);
+        return query(builder.build());
+    }
+
+    @Override
+    public PageIterable<T> query(QueryConditional queryConditional) {
+        return query(r -> r.queryConditional(queryConditional));
+    }
+
+    @Override
+    public void putItem(PutItemEnhancedRequest<T> request) {
+        TableOperation<T, ?, ?, Void> operation = PutItemOperation.create(request);
+        operation.executeOnPrimaryIndex(tableSchema, tableName, extension, dynamoDbClient);
+    }
+
+    @Override
+    public void putItem(Consumer<PutItemEnhancedRequest.Builder<T>> requestConsumer) {
+        PutItemEnhancedRequest.Builder<T> builder =
+            PutItemEnhancedRequest.builder(this.tableSchema.itemType().rawClass());
+        requestConsumer.accept(builder);
+        putItem(builder.build());
+    }
+
+    @Override
+    public void putItem(T item) {
+        putItem(r -> r.item(item));
+    }
+
+    @Override
+    public PageIterable<T> scan(ScanEnhancedRequest request) {
+        PaginatedTableOperation<T, ?, ?> operation = ScanOperation.create(request);
+        return operation.executeOnPrimaryIndex(tableSchema, tableName, extension, dynamoDbClient);
+    }
+
+    @Override
+    public PageIterable<T> scan(Consumer<ScanEnhancedRequest.Builder> requestConsumer) {
+        ScanEnhancedRequest.Builder builder = ScanEnhancedRequest.builder();
+        requestConsumer.accept(builder);
+        return scan(builder.build());
+    }
+
+    @Override
+    public PageIterable<T> scan() {
+        return scan(ScanEnhancedRequest.builder().build());
+    }
+
+    @Override
+    public T updateItem(UpdateItemEnhancedRequest<T> request) {
+        TableOperation<T, ?, ?, T> operation = UpdateItemOperation.create(request);
+        return operation.executeOnPrimaryIndex(tableSchema, tableName, extension, dynamoDbClient);
+    }
+
+    @Override
+    public T updateItem(Consumer<UpdateItemEnhancedRequest.Builder<T>> requestConsumer) {
+        UpdateItemEnhancedRequest.Builder<T> builder =
+            UpdateItemEnhancedRequest.builder(this.tableSchema.itemType().rawClass());
+        requestConsumer.accept(builder);
+        return updateItem(builder.build());
+    }
+
+    @Override
+    public T updateItem(T item) {
+        return updateItem(r -> r.item(item));
+    }
+
+    @Override
+    public Key keyFrom(T item) {
+        return createKeyFromItem(item, tableSchema, TableMetadata.primaryIndexName());
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        DefaultDynamoDbTable<?> that = (DefaultDynamoDbTable<?>) o;
+
+        if (dynamoDbClient != null ? ! dynamoDbClient.equals(that.dynamoDbClient) : that.dynamoDbClient != null) {
+            return false;
+        }
+        if (extension != null ?
+            !extension.equals(that.extension) :
+            that.extension != null) {
+
+            return false;
+        }
+        if (tableSchema != null ? ! tableSchema.equals(that.tableSchema) : that.tableSchema != null) {
+            return false;
+        }
+        return tableName != null ? tableName.equals(that.tableName) : that.tableName == null;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = dynamoDbClient != null ? dynamoDbClient.hashCode() : 0;
+        result = 31 * result + (extension != null ?
+            extension.hashCode() : 0);
+        result = 31 * result + (tableSchema != null ? tableSchema.hashCode() : 0);
+        result = 31 * result + (tableName != null ? tableName.hashCode() : 0);
+        return result;
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/client/ExtensionResolver.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/client/ExtensionResolver.java
new file mode 100644
index 000000000000..4ca2fc5a4884
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/client/ExtensionResolver.java
@@ -0,0 +1,68 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.client;
+
+import java.util.Collections;
+import java.util.List;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClientExtension;
+import software.amazon.awssdk.enhanced.dynamodb.extensions.VersionedRecordExtension;
+import software.amazon.awssdk.enhanced.dynamodb.internal.extensions.ChainExtension;
+
+/**
+ * Static module to assist with the initialization of an extension for a DynamoDB Enhanced Client based on supplied
+ * configuration.
+ */
+@SdkInternalApi
+public final class ExtensionResolver {
+    private static final DynamoDbEnhancedClientExtension DEFAULT_VERSIONED_RECORD_EXTENSION =
+        VersionedRecordExtension.builder().build();
+    private static final List<DynamoDbEnhancedClientExtension> DEFAULT_EXTENSIONS =
+        Collections.singletonList(DEFAULT_VERSIONED_RECORD_EXTENSION);
+
+    private ExtensionResolver() {
+    }
+
+    /**
+     * Static provider for the default extensions that are bundled with the DynamoDB Enhanced Client. Currently this is
+     * just the {@link software.amazon.awssdk.enhanced.dynamodb.extensions.VersionedRecordExtension}.
+     *
+     * These extensions will be used by default unless overridden in the enhanced client builder.
+     */
+    public static List<DynamoDbEnhancedClientExtension> defaultExtensions() {
+        return DEFAULT_EXTENSIONS;
+    }
+
+    /**
+     * Resolves a list of extensions into a single extension. If the list is a singleton, will just return that extension
+     * otherwise it will combine them with the {@link software.amazon.awssdk.enhanced.dynamodb.internal.extensions.ChainExtension}
+     * meta-extension using the order provided in the list.
+     *
+     * @param extensions A list of extensions to be combined in strict order
+     * @return A single extension that combines all the supplied extensions or null if no extensions were provided
+     */
+    public static DynamoDbEnhancedClientExtension resolveExtensions(List<DynamoDbEnhancedClientExtension> extensions) {
+        if (extensions == null || extensions.isEmpty()) {
+            return null;
+        }
+
+        if (extensions.size() == 1) {
+            return extensions.get(0);
+        }
+
+        return ChainExtension.create(extensions);
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/conditional/BeginsWithConditional.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/conditional/BeginsWithConditional.java
new file mode 100644
index 000000000000..3f63556ef4c4
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/conditional/BeginsWithConditional.java
@@ -0,0 +1,101 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.conditional;
+
+import static software.amazon.awssdk.enhanced.dynamodb.internal.AttributeValues.nullAttributeValue;
+import static software.amazon.awssdk.enhanced.dynamodb.internal.EnhancedClientUtils.cleanAttributeName;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.UnaryOperator;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.enhanced.dynamodb.Expression;
+import software.amazon.awssdk.enhanced.dynamodb.Key;
+import software.amazon.awssdk.enhanced.dynamodb.TableSchema;
+import software.amazon.awssdk.enhanced.dynamodb.model.QueryConditional;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+
+@SdkInternalApi
+public class BeginsWithConditional implements QueryConditional {
+    private static final UnaryOperator<String> EXPRESSION_KEY_MAPPER =
+        k -> "#AMZN_MAPPED_" + cleanAttributeName(k);
+    private static final UnaryOperator<String> EXPRESSION_VALUE_KEY_MAPPER =
+        k -> ":AMZN_MAPPED_" + cleanAttributeName(k);
+
+    private final Key key;
+
+    public BeginsWithConditional(Key key) {
+        this.key = key;
+    }
+
+    @Override
+    public Expression expression(TableSchema<?> tableSchema, String indexName) {
+        QueryConditionalKeyValues queryConditionalKeyValues = QueryConditionalKeyValues.from(key, tableSchema, indexName);
+
+        if (queryConditionalKeyValues.sortValue().equals(nullAttributeValue())) {
+            throw new IllegalArgumentException("Attempt to query using a 'beginsWith' condition operator against a "
+                                               + "null sort key.");
+        }
+
+        if (queryConditionalKeyValues.sortValue().n() != null) {
+            throw new IllegalArgumentException("Attempt to query using a 'beginsWith' condition operator against "
+                                               + "a numeric sort key.");
+        }
+
+        String partitionKeyToken = EXPRESSION_KEY_MAPPER.apply(queryConditionalKeyValues.partitionKey());
+        String partitionValueToken = EXPRESSION_VALUE_KEY_MAPPER.apply(queryConditionalKeyValues.partitionKey());
+        String sortKeyToken = EXPRESSION_KEY_MAPPER.apply(queryConditionalKeyValues.sortKey());
+        String sortValueToken = EXPRESSION_VALUE_KEY_MAPPER.apply(queryConditionalKeyValues.sortKey());
+
+        String queryExpression = String.format("%s = %s AND begins_with ( %s, %s )",
+                                               partitionKeyToken,
+                                               partitionValueToken,
+                                               sortKeyToken,
+                                               sortValueToken);
+        Map<String, AttributeValue> expressionAttributeValues = new HashMap<>();
+        expressionAttributeValues.put(partitionValueToken, queryConditionalKeyValues.partitionValue());
+        expressionAttributeValues.put(sortValueToken, queryConditionalKeyValues.sortValue());
+        Map<String, String> expressionAttributeNames = new HashMap<>();
+        expressionAttributeNames.put(partitionKeyToken, queryConditionalKeyValues.partitionKey());
+        expressionAttributeNames.put(sortKeyToken, queryConditionalKeyValues.sortKey());
+
+        return Expression.builder()
+                         .expression(queryExpression)
+                         .expressionValues(Collections.unmodifiableMap(expressionAttributeValues))
+                         .expressionNames(expressionAttributeNames)
+                         .build();
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        BeginsWithConditional that = (BeginsWithConditional) o;
+
+        return key != null ? key.equals(that.key) : that.key == null;
+    }
+
+    @Override
+    public int hashCode() {
+        return key != null ? key.hashCode() : 0;
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/conditional/BetweenConditional.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/conditional/BetweenConditional.java
new file mode 100644
index 000000000000..33d27f69a962
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/conditional/BetweenConditional.java
@@ -0,0 +1,110 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.conditional;
+
+import static software.amazon.awssdk.enhanced.dynamodb.internal.AttributeValues.nullAttributeValue;
+import static software.amazon.awssdk.enhanced.dynamodb.internal.EnhancedClientUtils.cleanAttributeName;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.UnaryOperator;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.enhanced.dynamodb.Expression;
+import software.amazon.awssdk.enhanced.dynamodb.Key;
+import software.amazon.awssdk.enhanced.dynamodb.TableSchema;
+import software.amazon.awssdk.enhanced.dynamodb.model.QueryConditional;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+
+@SdkInternalApi
+public class BetweenConditional implements QueryConditional {
+    private static final UnaryOperator<String> EXPRESSION_KEY_MAPPER =
+        k -> "#AMZN_MAPPED_" + cleanAttributeName(k);
+    private static final UnaryOperator<String> EXPRESSION_VALUE_KEY_MAPPER =
+        k -> ":AMZN_MAPPED_" + cleanAttributeName(k);
+    private static final UnaryOperator<String> EXPRESSION_OTHER_VALUE_KEY_MAPPER =
+        k -> ":AMZN_MAPPED_" + cleanAttributeName(k) + "2";
+
+    private final Key key1;
+    private final Key key2;
+
+    public BetweenConditional(Key key1, Key key2) {
+        this.key1 = key1;
+        this.key2 = key2;
+    }
+
+    @Override
+    public Expression expression(TableSchema<?> tableSchema, String indexName) {
+        QueryConditionalKeyValues queryConditionalKeyValues1 = QueryConditionalKeyValues.from(key1, tableSchema, indexName);
+        QueryConditionalKeyValues queryConditionalKeyValues2 = QueryConditionalKeyValues.from(key2, tableSchema, indexName);
+
+        if (queryConditionalKeyValues1.sortValue().equals(nullAttributeValue()) ||
+            queryConditionalKeyValues2.sortValue().equals(nullAttributeValue())) {
+            throw new IllegalArgumentException("Attempt to query using a 'between' condition operator where one "
+                                               + "of the items has a null sort key.");
+        }
+
+        String partitionKeyToken = EXPRESSION_KEY_MAPPER.apply(queryConditionalKeyValues1.partitionKey());
+        String partitionValueToken = EXPRESSION_VALUE_KEY_MAPPER.apply(queryConditionalKeyValues1.partitionKey());
+        String sortKeyToken = EXPRESSION_KEY_MAPPER.apply(queryConditionalKeyValues1.sortKey());
+        String sortKeyValueToken1 = EXPRESSION_VALUE_KEY_MAPPER.apply(queryConditionalKeyValues1.sortKey());
+        String sortKeyValueToken2 = EXPRESSION_OTHER_VALUE_KEY_MAPPER.apply(queryConditionalKeyValues2.sortKey());
+
+        String queryExpression = String.format("%s = %s AND %s BETWEEN %s AND %s",
+                                               partitionKeyToken,
+                                               partitionValueToken,
+                                               sortKeyToken,
+                                               sortKeyValueToken1,
+                                               sortKeyValueToken2);
+        Map<String, AttributeValue> expressionAttributeValues = new HashMap<>();
+        expressionAttributeValues.put(partitionValueToken, queryConditionalKeyValues1.partitionValue());
+        expressionAttributeValues.put(sortKeyValueToken1, queryConditionalKeyValues1.sortValue());
+        expressionAttributeValues.put(sortKeyValueToken2, queryConditionalKeyValues2.sortValue());
+        Map<String, String> expressionAttributeNames = new HashMap<>();
+        expressionAttributeNames.put(partitionKeyToken, queryConditionalKeyValues1.partitionKey());
+        expressionAttributeNames.put(sortKeyToken, queryConditionalKeyValues1.sortKey());
+
+        return Expression.builder()
+                         .expression(queryExpression)
+                         .expressionValues(Collections.unmodifiableMap(expressionAttributeValues))
+                         .expressionNames(expressionAttributeNames)
+                         .build();
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        BetweenConditional that = (BetweenConditional) o;
+
+        if (key1 != null ? ! key1.equals(that.key1) : that.key1 != null) {
+            return false;
+        }
+        return key2 != null ? key2.equals(that.key2) : that.key2 == null;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = key1 != null ? key1.hashCode() : 0;
+        result = 31 * result + (key2 != null ? key2.hashCode() : 0);
+        return result;
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/conditional/EqualToConditional.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/conditional/EqualToConditional.java
new file mode 100644
index 000000000000..90e9c808b103
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/conditional/EqualToConditional.java
@@ -0,0 +1,144 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.conditional;
+
+import static software.amazon.awssdk.enhanced.dynamodb.internal.AttributeValues.nullAttributeValue;
+import static software.amazon.awssdk.enhanced.dynamodb.internal.EnhancedClientUtils.cleanAttributeName;
+import static software.amazon.awssdk.enhanced.dynamodb.internal.EnhancedClientUtils.isNullAttributeValue;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+import java.util.function.UnaryOperator;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.enhanced.dynamodb.Expression;
+import software.amazon.awssdk.enhanced.dynamodb.Key;
+import software.amazon.awssdk.enhanced.dynamodb.TableSchema;
+import software.amazon.awssdk.enhanced.dynamodb.model.QueryConditional;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+
+@SdkInternalApi
+public class EqualToConditional implements QueryConditional {
+    private static final UnaryOperator<String> EXPRESSION_KEY_MAPPER =
+        k -> "#AMZN_MAPPED_" + cleanAttributeName(k);
+    private static final UnaryOperator<String> EXPRESSION_VALUE_KEY_MAPPER =
+        k -> ":AMZN_MAPPED_" + cleanAttributeName(k);
+
+    private final Key key;
+
+    public EqualToConditional(Key key) {
+        this.key = key;
+    }
+
+    @Override
+    public Expression expression(TableSchema<?> tableSchema, String indexName) {
+        String partitionKey = tableSchema.tableMetadata().indexPartitionKey(indexName);
+        AttributeValue partitionValue = key.partitionKeyValue();
+
+        if (partitionValue == null || partitionValue.equals(nullAttributeValue())) {
+            throw new IllegalArgumentException("Partition key must be a valid scalar value to execute a query "
+                + "against. The provided partition key was set to null.");
+        }
+
+        Optional<AttributeValue> sortKeyValue = key.sortKeyValue();
+
+        if (sortKeyValue.isPresent()) {
+            Optional<String> sortKey = tableSchema.tableMetadata().indexSortKey(indexName);
+
+            if (!sortKey.isPresent()) {
+                throw new IllegalArgumentException("A sort key was supplied as part of a query conditional "
+                                                   + "against an index that does not support a sort key. Index: "
+                                                   + indexName);
+            }
+
+            return partitionAndSortExpression(partitionKey,
+                                              sortKey.get(),
+                                              partitionValue,
+                                              sortKeyValue.get());
+        } else {
+            return partitionOnlyExpression(partitionKey, partitionValue);
+        }
+    }
+
+    private Expression partitionOnlyExpression(String partitionKey,
+                                               AttributeValue partitionValue) {
+
+        String partitionKeyToken = EXPRESSION_KEY_MAPPER.apply(partitionKey);
+        String partitionKeyValueToken = EXPRESSION_VALUE_KEY_MAPPER.apply(partitionKey);
+        String queryExpression = String.format("%s = %s", partitionKeyToken, partitionKeyValueToken);
+
+        return Expression.builder()
+                         .expression(queryExpression)
+                         .expressionNames(Collections.singletonMap(partitionKeyToken, partitionKey))
+                         .expressionValues(Collections.singletonMap(partitionKeyValueToken, partitionValue))
+                         .build();
+    }
+
+    private Expression partitionAndSortExpression(String partitionKey,
+                                                  String sortKey,
+                                                  AttributeValue partitionValue,
+                                                  AttributeValue sortKeyValue) {
+
+
+        // When a sort key is explicitly provided as null treat as partition only expression
+        if (isNullAttributeValue(sortKeyValue)) {
+            return partitionOnlyExpression(partitionKey, partitionValue);
+        }
+
+        String partitionKeyToken = EXPRESSION_KEY_MAPPER.apply(partitionKey);
+        String partitionKeyValueToken = EXPRESSION_VALUE_KEY_MAPPER.apply(partitionKey);
+        String sortKeyToken = EXPRESSION_KEY_MAPPER.apply(sortKey);
+        String sortKeyValueToken = EXPRESSION_VALUE_KEY_MAPPER.apply(sortKey);
+
+        String queryExpression = String.format("%s = %s AND %s = %s",
+                                               partitionKeyToken,
+                                               partitionKeyValueToken,
+                                               sortKeyToken,
+                                               sortKeyValueToken);
+        Map<String, AttributeValue> expressionAttributeValues = new HashMap<>();
+        expressionAttributeValues.put(partitionKeyValueToken, partitionValue);
+        expressionAttributeValues.put(sortKeyValueToken, sortKeyValue);
+        Map<String, String> expressionAttributeNames = new HashMap<>();
+        expressionAttributeNames.put(partitionKeyToken, partitionKey);
+        expressionAttributeNames.put(sortKeyToken, sortKey);
+
+        return Expression.builder()
+                         .expression(queryExpression)
+                         .expressionValues(expressionAttributeValues)
+                         .expressionNames(expressionAttributeNames)
+                         .build();
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        EqualToConditional that = (EqualToConditional) o;
+
+        return key != null ? key.equals(that.key) : that.key == null;
+    }
+
+    @Override
+    public int hashCode() {
+        return key != null ? key.hashCode() : 0;
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/conditional/QueryConditionalKeyValues.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/conditional/QueryConditionalKeyValues.java
new file mode 100644
index 000000000000..342eeaad15e7
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/conditional/QueryConditionalKeyValues.java
@@ -0,0 +1,74 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.conditional;
+
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.enhanced.dynamodb.Key;
+import software.amazon.awssdk.enhanced.dynamodb.TableSchema;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+
+/**
+ * Internal helper class to act as a struct to store specific key values that are used throughout various
+ * {@link software.amazon.awssdk.enhanced.dynamodb.model.QueryConditional} implementations.
+ */
+@SdkInternalApi
+class QueryConditionalKeyValues {
+    private final String partitionKey;
+    private final AttributeValue partitionValue;
+    private final String sortKey;
+    private final AttributeValue sortValue;
+
+    private QueryConditionalKeyValues(String partitionKey,
+                                      AttributeValue partitionValue,
+                                      String sortKey,
+                                      AttributeValue sortValue) {
+        this.partitionKey = partitionKey;
+        this.partitionValue = partitionValue;
+        this.sortKey = sortKey;
+        this.sortValue = sortValue;
+    }
+
+    static QueryConditionalKeyValues from(Key key, TableSchema<?> tableSchema, String indexName) {
+        String partitionKey = tableSchema.tableMetadata().indexPartitionKey(indexName);
+        AttributeValue partitionValue = key.partitionKeyValue();
+        String sortKey = tableSchema.tableMetadata().indexSortKey(indexName).orElseThrow(
+            () -> new IllegalArgumentException("A query conditional requires a sort key to be present on the table "
+                                               + "or index being queried, yet none have been defined in the "
+                                               + "model"));
+        AttributeValue sortValue =
+            key.sortKeyValue().orElseThrow(
+                () -> new IllegalArgumentException("A query conditional requires a sort key to compare with, "
+                                                   + "however one was not provided."));
+
+        return new QueryConditionalKeyValues(partitionKey, partitionValue, sortKey, sortValue);
+    }
+
+    String partitionKey() {
+        return partitionKey;
+    }
+
+    AttributeValue partitionValue() {
+        return partitionValue;
+    }
+
+    String sortKey() {
+        return sortKey;
+    }
+
+    AttributeValue sortValue() {
+        return sortValue;
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/conditional/SingleKeyItemConditional.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/conditional/SingleKeyItemConditional.java
new file mode 100644
index 000000000000..d8d85f73e0d9
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/conditional/SingleKeyItemConditional.java
@@ -0,0 +1,110 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.conditional;
+
+import static software.amazon.awssdk.enhanced.dynamodb.internal.AttributeValues.nullAttributeValue;
+import static software.amazon.awssdk.enhanced.dynamodb.internal.EnhancedClientUtils.cleanAttributeName;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.UnaryOperator;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.enhanced.dynamodb.Expression;
+import software.amazon.awssdk.enhanced.dynamodb.Key;
+import software.amazon.awssdk.enhanced.dynamodb.TableSchema;
+import software.amazon.awssdk.enhanced.dynamodb.model.QueryConditional;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+
+/**
+ * A {@link QueryConditional} implementation that matches values from a specific key using a supplied operator for the
+ * sort key value comparison. The partition key value will always have an equivalence comparison applied.
+ * <p>
+ * This class is used by higher-level (more specific) {@link QueryConditional} implementations such as
+ * {@link QueryConditional#sortGreaterThan(Key)} to reduce code duplication.
+ */
+@SdkInternalApi
+public class SingleKeyItemConditional implements QueryConditional {
+    private static final UnaryOperator<String> EXPRESSION_KEY_MAPPER =
+        k -> "#AMZN_MAPPED_" + cleanAttributeName(k);
+    private static final UnaryOperator<String> EXPRESSION_VALUE_KEY_MAPPER =
+        k -> ":AMZN_MAPPED_" + cleanAttributeName(k);
+
+    private final Key key;
+    private final String operator;
+
+    public SingleKeyItemConditional(Key key, String operator) {
+        this.key = key;
+        this.operator = operator;
+    }
+
+    @Override
+    public Expression expression(TableSchema<?> tableSchema, String indexName) {
+        QueryConditionalKeyValues queryConditionalKeyValues = QueryConditionalKeyValues.from(key, tableSchema, indexName);
+
+        if (queryConditionalKeyValues.sortValue().equals(nullAttributeValue())) {
+            throw new IllegalArgumentException("Attempt to query using a relative condition operator against a "
+                                               + "null sort key.");
+        }
+
+        String partitionKeyToken = EXPRESSION_KEY_MAPPER.apply(queryConditionalKeyValues.partitionKey());
+        String partitionValueToken = EXPRESSION_VALUE_KEY_MAPPER.apply(queryConditionalKeyValues.partitionKey());
+        String sortKeyToken = EXPRESSION_KEY_MAPPER.apply(queryConditionalKeyValues.sortKey());
+        String sortValueToken = EXPRESSION_VALUE_KEY_MAPPER.apply(queryConditionalKeyValues.sortKey());
+
+        String queryExpression = String.format("%s = %s AND %s %s %s",
+                                               partitionKeyToken,
+                                               partitionValueToken,
+                                               sortKeyToken,
+                                               operator,
+                                               sortValueToken);
+        Map<String, AttributeValue> expressionAttributeValues = new HashMap<>();
+        expressionAttributeValues.put(partitionValueToken, queryConditionalKeyValues.partitionValue());
+        expressionAttributeValues.put(sortValueToken, queryConditionalKeyValues.sortValue());
+        Map<String, String> expressionAttributeNames = new HashMap<>();
+        expressionAttributeNames.put(partitionKeyToken, queryConditionalKeyValues.partitionKey());
+        expressionAttributeNames.put(sortKeyToken, queryConditionalKeyValues.sortKey());
+
+        return Expression.builder()
+                         .expression(queryExpression)
+                         .expressionValues(expressionAttributeValues)
+                         .expressionNames(expressionAttributeNames)
+                         .build();
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        SingleKeyItemConditional that = (SingleKeyItemConditional) o;
+
+        if (key != null ? ! key.equals(that.key) : that.key != null) {
+            return false;
+        }
+        return operator != null ? operator.equals(that.operator) : that.operator == null;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = key != null ? key.hashCode() : 0;
+        result = 31 * result + (operator != null ? operator.hashCode() : 0);
+        return result;
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/ChainConverterProvider.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/ChainConverterProvider.java
new file mode 100644
index 000000000000..a455051adb5f
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/ChainConverterProvider.java
@@ -0,0 +1,70 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.converter;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeConverterProvider;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+
+/**
+ * A {@link AttributeConverterProvider} that allows multiple providers to be chained in a specified order
+ * to act as a single composite provider. When searching for an attribute converter for a type,
+ * the providers will be called in forward/ascending order, attempting to find a converter from the
+ * first provider, then the second, and so on, until a match is found or the operation fails.
+ */
+@SdkInternalApi
+public final class ChainConverterProvider implements AttributeConverterProvider {
+    private final List<AttributeConverterProvider> providerChain;
+
+    private ChainConverterProvider(List<AttributeConverterProvider> providers) {
+        this.providerChain = new ArrayList<>(providers);
+    }
+
+    /**
+     * Construct a new instance of {@link ChainConverterProvider}.
+     * @param providers A list of {@link AttributeConverterProvider} to chain together.
+     * @return A constructed {@link ChainConverterProvider} object.
+     */
+    public static ChainConverterProvider create(AttributeConverterProvider... providers) {
+        return new ChainConverterProvider(Arrays.asList(providers));
+    }
+
+    /**
+     * Construct a new instance of {@link ChainConverterProvider}.
+     * @param providers A list of {@link AttributeConverterProvider} to chain together.
+     * @return A constructed {@link ChainConverterProvider} object.
+     */
+    public static ChainConverterProvider create(List<AttributeConverterProvider> providers) {
+        return new ChainConverterProvider(providers);
+    }
+
+    public List<AttributeConverterProvider> chainedProviders() {
+        return Collections.unmodifiableList(this.providerChain);
+    }
+
+    @Override
+    public <T> AttributeConverter<T> converterFor(EnhancedType<T> enhancedType) {
+        return this.providerChain.stream()
+                .filter(provider -> provider.converterFor(enhancedType) != null)
+                .map(p -> p.converterFor(enhancedType))
+                .findFirst().orElse(null);
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/ConverterProviderResolver.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/ConverterProviderResolver.java
new file mode 100644
index 000000000000..7f3cdf99ffe5
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/ConverterProviderResolver.java
@@ -0,0 +1,63 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.converter;
+
+import java.util.List;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeConverterProvider;
+import software.amazon.awssdk.enhanced.dynamodb.DefaultAttributeConverterProvider;
+
+/**
+ * Static module to assist with the initialization of attribute converter providers for a StaticTableSchema.
+ */
+@SdkInternalApi
+public final class ConverterProviderResolver {
+
+    private static final AttributeConverterProvider DEFAULT_ATTRIBUTE_CONVERTER =
+        DefaultAttributeConverterProvider.create();
+
+    private ConverterProviderResolver() {
+    }
+
+    /**
+     * Static provider for the default attribute converters that are bundled with the DynamoDB Enhanced Client.
+     * This provider will be used by default unless overridden in the static table schema builder or using bean
+     * annotations.
+     */
+    public static AttributeConverterProvider defaultConverterProvider() {
+        return DEFAULT_ATTRIBUTE_CONVERTER;
+    }
+
+    /**
+     * Resolves a list of attribute converter providers into a single provider. If the list is a singleton,
+     * it will just return that provider, otherwise it will combine them into a
+     * {@link ChainConverterProvider} using the order provided in the list.
+     *
+     * @param providers A list of providers to be combined in strict order
+     * @return A single provider that combines all the supplied providers or null if no providers were supplied
+     */
+    public static AttributeConverterProvider resolveProviders(List<AttributeConverterProvider> providers) {
+        if (providers == null || providers.isEmpty()) {
+            return null;
+        }
+
+        if (providers.size() == 1) {
+            return providers.get(0);
+        }
+
+        return ChainConverterProvider.create(providers);
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/ConverterUtils.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/ConverterUtils.java
new file mode 100644
index 000000000000..c6645335c7c5
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/ConverterUtils.java
@@ -0,0 +1,182 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.converter;
+
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.DoubleAttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.FloatAttributeConverter;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+import software.amazon.awssdk.utils.Validate;
+
+/**
+ * Internal utilities that are used by some {@link AttributeConverter}s in the aid
+ * of converting to an {@link AttributeValue} and vice-versa.
+ */
+@SdkInternalApi
+public class ConverterUtils {
+    private ConverterUtils() {
+    }
+
+    /**
+     * Validates that a given Double input is a valid double supported by {@link DoubleAttributeConverter}.
+     * @param input
+     */
+    public static void validateDouble(Double input) {
+        Validate.isTrue(!Double.isNaN(input), "NaN is not supported by the default converters.");
+        Validate.isTrue(Double.isFinite(input), "Infinite numbers are not supported by the default converters.");
+    }
+
+    /**
+     * Validates that a given Float input is a valid double supported by {@link FloatAttributeConverter}.
+     * @param input
+     */
+    public static void validateFloat(Float input) {
+        Validate.isTrue(!Float.isNaN(input), "NaN is not supported by the default converters.");
+        Validate.isTrue(Float.isFinite(input), "Infinite numbers are not supported by the default converters.");
+    }
+
+    public static String padLeft2(int valueToPad) {
+        return valueToPad > 10 ? Integer.toString(valueToPad) : "0" + valueToPad;
+    }
+
+    public static String padLeft(int paddingAmount, int valueToPad) {
+        String value = Integer.toString(valueToPad);
+        int padding = paddingAmount - value.length();
+        StringBuilder result = new StringBuilder(paddingAmount);
+        for (int i = 0; i < padding; i++) {
+            result.append('0');
+        }
+        result.append(value);
+        return result.toString();
+    }
+
+    public static String padRight(int paddingAmount, String valueToPad) {
+        StringBuilder result = new StringBuilder(paddingAmount);
+        result.append(valueToPad);
+        for (int i = result.length(); i < paddingAmount; i++) {
+            result.append('0');
+        }
+        return result.toString();
+    }
+
+    public static String trimNumber(String number) {
+        int startInclusive = findTrimInclusiveStart(number, '0', 0);
+
+        if (startInclusive >= number.length()) {
+            return "0";
+        }
+
+        if (!number.contains(".")) {
+            return number.substring(startInclusive);
+        }
+
+        int endExclusive = findTrimExclusiveEnd(number, '0', number.length());
+        endExclusive = findTrimExclusiveEnd(number, '.', endExclusive);
+
+        if (startInclusive >= endExclusive) {
+            return "0";
+        }
+
+        String result = number.substring(startInclusive, endExclusive);
+        if (result.startsWith(".")) {
+            return "0" + result;
+        }
+        return result;
+    }
+
+    private static int findTrimInclusiveStart(String string, char characterToTrim, int startingIndex) {
+        int startInclusive = startingIndex;
+
+        while (startInclusive < string.length() && string.charAt(startInclusive) == characterToTrim) {
+            ++startInclusive;
+        }
+
+        return startInclusive;
+    }
+
+    private static int findTrimExclusiveEnd(String string, char characterToTrim, int startingIndex) {
+        int endExclusive = startingIndex;
+
+        while (endExclusive > 0 && string.charAt(endExclusive - 1) == characterToTrim) {
+            --endExclusive;
+        }
+
+        return endExclusive;
+    }
+
+    public static String[] splitNumberOnDecimal(String valueToSplit) {
+        int i = valueToSplit.indexOf('.');
+        if (i == -1) {
+            return new String[] { valueToSplit, "0" };
+        } else {
+            // Ends with '.' is not supported.
+            return new String[] { valueToSplit.substring(0, i), valueToSplit.substring(i + 1) };
+        }
+    }
+
+    public static String[] chunk(String valueToChunk, int... splitSizes) {
+        String[] result = new String[splitSizes.length + 1];
+        int splitStartInclusive = chunkLeft(valueToChunk, result, splitSizes);
+
+        Validate.isTrue(splitStartInclusive == valueToChunk.length(), "Value size does not match expected chunking scheme.");
+
+        return result;
+    }
+
+    public static String[] chunkWithRightOverflow(String valueToChunk, int... splitSizesFromLeft) {
+        String[] result = new String[splitSizesFromLeft.length + 1];
+        int splitStartInclusive = chunkLeft(valueToChunk, result, splitSizesFromLeft);
+
+        result[splitSizesFromLeft.length] = valueToChunk.substring(splitStartInclusive);
+
+        return result;
+    }
+
+    public static String[] chunkWithLeftOverflow(String valueToChunk, int... splitSizesFromRight) {
+        try {
+            String[] result = new String[splitSizesFromRight.length + 1];
+            int splitEndExclusive = valueToChunk.length();
+
+            for (int i = splitSizesFromRight.length - 1; i >= 0; i--) {
+                int splitStartInclusive = splitEndExclusive - splitSizesFromRight[i];
+                result[i + 1] = valueToChunk.substring(splitStartInclusive, splitEndExclusive);
+                splitEndExclusive = splitStartInclusive;
+            }
+
+            result[0] = valueToChunk.substring(0, splitEndExclusive);
+
+            return result;
+        } catch (StringIndexOutOfBoundsException e) {
+            throw new IllegalArgumentException("Invalid format for value.", e);
+        }
+    }
+
+    private static int chunkLeft(String valueToChunk, String[] result, int[] splitSizes) {
+        try {
+            int splitStartInclusive = 0;
+
+            for (int i = 0; i < splitSizes.length; i++) {
+                int splitEndExclusive = splitStartInclusive + splitSizes[i];
+                result[i] = valueToChunk.substring(splitStartInclusive, splitEndExclusive);
+                splitStartInclusive = splitEndExclusive;
+            }
+            return splitStartInclusive;
+        } catch (StringIndexOutOfBoundsException e) {
+            throw new IllegalArgumentException("Invalid format for value.", e);
+        }
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/PrimitiveConverter.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/PrimitiveConverter.java
new file mode 100644
index 000000000000..3a8d9e623580
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/PrimitiveConverter.java
@@ -0,0 +1,34 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.converter;
+
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+
+/**
+ * Interface for {@link StringConverter} and {@link AttributeConverter} implementations
+ * that support boxed and primitive types.
+ */
+@SdkInternalApi
+@ThreadSafe
+public interface PrimitiveConverter<T> {
+    /**
+     * The type supported by this converter.
+     */
+    EnhancedType<T> primitiveType();
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/StringConverter.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/StringConverter.java
new file mode 100644
index 000000000000..a7e76943adb9
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/StringConverter.java
@@ -0,0 +1,46 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.converter;
+
+import software.amazon.awssdk.annotations.Immutable;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+
+/**
+ * Converts a specific Java type to/from a {@link String}.
+ */
+@SdkInternalApi
+@ThreadSafe
+@Immutable
+public interface StringConverter<T> {
+    /**
+     * Convert the provided object into a string.
+     */
+    default String toString(T object) {
+        return object.toString();
+    }
+
+    /**
+     * Convert the provided string into an object.
+     */
+    T fromString(String string);
+
+    /**
+     * The type supported by this converter.
+     */
+    EnhancedType<T> type();
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/StringConverterProvider.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/StringConverterProvider.java
new file mode 100644
index 000000000000..d3aa6a675b68
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/StringConverterProvider.java
@@ -0,0 +1,32 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.converter;
+
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.string.DefaultStringConverterProvider;
+
+/**
+ * Interface for providing string converters for Java objects.
+ */
+@SdkInternalApi
+public interface StringConverterProvider {
+    <T> StringConverter<T> converterFor(EnhancedType<T> enhancedType);
+
+    static StringConverterProvider defaultProvider() {
+        return DefaultStringConverterProvider.create();
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/TimeConversion.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/TimeConversion.java
new file mode 100644
index 000000000000..c2501ce15fa2
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/TimeConversion.java
@@ -0,0 +1,183 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.converter;
+
+import static software.amazon.awssdk.enhanced.dynamodb.internal.converter.ConverterUtils.padLeft;
+import static software.amazon.awssdk.enhanced.dynamodb.internal.converter.ConverterUtils.padRight;
+import static software.amazon.awssdk.enhanced.dynamodb.internal.converter.ConverterUtils.splitNumberOnDecimal;
+import static software.amazon.awssdk.enhanced.dynamodb.internal.converter.ConverterUtils.trimNumber;
+
+import java.time.DateTimeException;
+import java.time.Instant;
+import java.time.OffsetDateTime;
+import java.time.ZoneOffset;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeParseException;
+import java.time.temporal.TemporalQuery;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.EnhancedAttributeValue;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+import software.amazon.awssdk.utils.Validate;
+
+@SdkInternalApi
+public final class TimeConversion {
+    private static final InstantVisitor INSTANT_VISITOR = new InstantVisitor();
+    private static final OffsetDateTimeVisitor OFFSET_DATE_TIME_VISITOR = new OffsetDateTimeVisitor();
+    private static final ZonedDateTimeVisitor ZONED_DATE_TIME_VISITOR = new ZonedDateTimeVisitor();
+
+    private TimeConversion() {
+    }
+
+    public static AttributeValue toIntegerAttributeValue(Instant instant) {
+        long instantSeconds = instant.getEpochSecond();
+        int nanos = instant.getNano();
+
+        String value;
+        if (nanos == 0) {
+            value = Long.toString(instantSeconds);
+        } else if (instantSeconds >= 0) {
+            value = instantSeconds +
+                    "." + padLeft(9, nanos);
+        } else {
+            instantSeconds++;
+            nanos = 1_000_000_000 - nanos;
+
+            value = "-" +
+                    Math.abs(instantSeconds) +
+                    "." + padLeft(9, nanos);
+        }
+
+        return AttributeValue.builder().n(trimNumber(value)).build();
+    }
+
+    public static AttributeValue toStringAttributeValue(Instant instant) {
+        return AttributeValue.builder().s(DateTimeFormatter.ISO_INSTANT.format(instant)).build();
+    }
+
+    public static AttributeValue toStringAttributeValue(OffsetDateTime accessor) {
+        return AttributeValue.builder().s(DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(accessor)).build();
+    }
+
+    public static AttributeValue toStringAttributeValue(ZonedDateTime accessor) {
+        return AttributeValue.builder().s(DateTimeFormatter.ISO_ZONED_DATE_TIME.format(accessor)).build();
+    }
+
+    public static Instant instantFromAttributeValue(EnhancedAttributeValue itemAttributeValue) {
+        return convert(itemAttributeValue, INSTANT_VISITOR);
+    }
+
+    public static OffsetDateTime offsetDateTimeFromAttributeValue(EnhancedAttributeValue itemAttributeValue) {
+        return convert(itemAttributeValue, OFFSET_DATE_TIME_VISITOR);
+    }
+
+    public static ZonedDateTime zonedDateTimeFromAttributeValue(EnhancedAttributeValue itemAttributeValue) {
+        return convert(itemAttributeValue, ZONED_DATE_TIME_VISITOR);
+    }
+
+    private static <T> T convert(EnhancedAttributeValue itemAttributeValue, TypeConvertingVisitor<T> visitor) {
+        try {
+            return itemAttributeValue.convert(visitor);
+        } catch (DateTimeException e) {
+            throw new IllegalArgumentException(e);
+        }
+    }
+
+    private static final class InstantVisitor extends BaseVisitor<Instant> {
+        protected InstantVisitor() {
+            super(Instant.class, Instant::from);
+        }
+
+        @Override
+        public Instant convertString(String value) {
+            try {
+                return super.convertString(value);
+            } catch (DateTimeParseException e) {
+                // Instant has a larger date range (-1,000,000,000 to 1,000,000,000) than zoned or offset date times
+                // (-999,999,999 to -999,999,999). An Instant was requested, so we try falling back to the ISO_INSTANT
+                // parser that supports Instant.MIN through Instant.MAX.
+                try {
+                    return DateTimeFormatter.ISO_INSTANT.parse(value, Instant::from);
+                } catch (DateTimeParseException e2) {
+                    // Nope, that didn't work either. Report the failures.
+                    throw new IllegalArgumentException("Record could not be parsed with either " +
+                                                       "DateTimeFormatter.ISO_ZONED_DATE_TIME (" + e.getMessage() +
+                                                       ") or DateTimeFormatter.ISO_INSTANT (" + e2.getMessage() +
+                                                       ").");
+                }
+            }
+        }
+
+        @Override
+        protected Instant fromUtcInstant(Instant instant) {
+            return instant;
+        }
+    }
+
+    private static final class OffsetDateTimeVisitor extends BaseVisitor<OffsetDateTime> {
+        protected OffsetDateTimeVisitor() {
+            super(OffsetDateTime.class, OffsetDateTime::from);
+        }
+
+        @Override
+        protected OffsetDateTime fromUtcInstant(Instant instant) {
+            return instant.atOffset(ZoneOffset.UTC);
+        }
+    }
+
+    private static final class ZonedDateTimeVisitor extends BaseVisitor<ZonedDateTime> {
+        protected ZonedDateTimeVisitor() {
+            super(ZonedDateTime.class, ZonedDateTime::from);
+        }
+
+        @Override
+        protected ZonedDateTime fromUtcInstant(Instant instant) {
+            return instant.atZone(ZoneOffset.UTC);
+        }
+    }
+
+    private abstract static class BaseVisitor<T> extends TypeConvertingVisitor<T> {
+        private final TemporalQuery<T> query;
+
+        protected BaseVisitor(Class<T> targetType, TemporalQuery<T> query) {
+            super(targetType);
+            this.query = query;
+        }
+
+        @Override
+        public T convertString(String value) {
+            return DateTimeFormatter.ISO_ZONED_DATE_TIME.parse(value, query);
+        }
+
+        @Override
+        public T convertNumber(String value) {
+            String[] splitOnDecimal = splitNumberOnDecimal(value);
+
+            Validate.isTrue(splitOnDecimal[1].length() <= 9, "Nanoseconds must be expressed in 9 or fewer digits.");
+
+            long epochSecond = splitOnDecimal[0].length() == 0 ? 0 : Long.parseLong(splitOnDecimal[0]);
+            int nanoAdjustment = Integer.parseInt(padRight(9, splitOnDecimal[1]));
+
+            if (value.startsWith("-")) {
+                nanoAdjustment = -nanoAdjustment;
+            }
+
+            return fromUtcInstant(Instant.ofEpochSecond(epochSecond, nanoAdjustment));
+        }
+
+        protected abstract T fromUtcInstant(Instant instant);
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/TypeConvertingVisitor.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/TypeConvertingVisitor.java
new file mode 100644
index 000000000000..7b1fa332b03c
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/TypeConvertingVisitor.java
@@ -0,0 +1,194 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.converter;
+
+import java.util.List;
+import java.util.Map;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.core.SdkBytes;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeValueType;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.EnhancedAttributeValue;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+import software.amazon.awssdk.utils.Validate;
+
+/**
+ * A visitor across all possible types of a {@link EnhancedAttributeValue}.
+ *
+ * <p>
+ * This is useful in {@link AttributeConverter} implementations, without having to write a switch statement on the
+ * {@link EnhancedAttributeValue#type()}.
+ *
+ * @see EnhancedAttributeValue#convert(TypeConvertingVisitor)
+ */
+@SdkInternalApi
+public abstract class TypeConvertingVisitor<T> {
+    protected final Class<?> targetType;
+    private final Class<?> converterClass;
+
+    /**
+     * Called by subclasses to provide enhanced logging when a specific type isn't handled.
+     *
+     * <p>
+     * Reasons this call may fail with a {@link RuntimeException}:
+     * <ol>
+     *     <li>If the provided type is null.</li>
+     * </ol>
+     *
+     * @param targetType The type to which this visitor is converting.
+     */
+    protected TypeConvertingVisitor(Class<?> targetType) {
+        this(targetType, null);
+    }
+
+    /**
+     * Called by subclasses to provide enhanced logging when a specific type isn't handled.
+     *
+     * <p>
+     * Reasons this call may fail with a {@link RuntimeException}:
+     * <ol>
+     *     <li>If the provided type is null.</li>
+     * </ol>
+     *
+     * @param targetType The type to which this visitor is converting.
+     * @param converterClass The converter implementation that is creating this visitor. This may be null.
+     */
+    protected TypeConvertingVisitor(Class<?> targetType,
+                                    Class<?> converterClass) {
+        Validate.paramNotNull(targetType, "targetType");
+        this.targetType = targetType;
+        this.converterClass = converterClass;
+    }
+
+    /**
+     * Convert the provided value into the target type.
+     *
+     * <p>
+     * Reasons this call may fail with a {@link RuntimeException}:
+     * <ol>
+     *     <li>If the value cannot be converted by this visitor.</li>
+     * </ol>
+     */
+    public final T convert(EnhancedAttributeValue value) {
+        switch (value.type()) {
+            case NULL: return convertNull();
+            case M: return convertMap(value.asMap());
+            case S: return convertString(value.asString());
+            case N: return convertNumber(value.asNumber());
+            case B: return convertBytes(value.asBytes());
+            case BOOL: return convertBoolean(value.asBoolean());
+            case SS: return convertSetOfStrings(value.asSetOfStrings());
+            case NS: return convertSetOfNumbers(value.asSetOfNumbers());
+            case BS: return convertSetOfBytes(value.asSetOfBytes());
+            case L: return convertListOfAttributeValues(value.asListOfAttributeValues());
+            default: throw new IllegalStateException("Unsupported type: " + value.type());
+        }
+    }
+
+    /**
+     * Invoked when visiting an attribute in which {@link EnhancedAttributeValue#isNull()} is true.
+     */
+    public T convertNull() {
+        return null;
+    }
+
+    /**
+     * Invoked when visiting an attribute in which {@link EnhancedAttributeValue#isMap()} is true. The provided value is the
+     * underlying value of the {@link EnhancedAttributeValue} being converted.
+     */
+    public T convertMap(Map<String, AttributeValue> value) {
+        return defaultConvert(AttributeValueType.M, value);
+    }
+
+    /**
+     * Invoked when visiting an attribute in which {@link EnhancedAttributeValue#isString()} is true. The provided value is the
+     * underlying value of the {@link EnhancedAttributeValue} being converted.
+     */
+    public T convertString(String value) {
+        return defaultConvert(AttributeValueType.S, value);
+    }
+
+    /**
+     * Invoked when visiting an attribute in which {@link EnhancedAttributeValue#isNumber()} is true. The provided value is the
+     * underlying value of the {@link EnhancedAttributeValue} being converted.
+     */
+    public T convertNumber(String value) {
+        return defaultConvert(AttributeValueType.N, value);
+    }
+
+    /**
+     * Invoked when visiting an attribute in which {@link EnhancedAttributeValue#isBytes()} is true. The provided value is the
+     * underlying value of the {@link EnhancedAttributeValue} being converted.
+     */
+    public T convertBytes(SdkBytes value) {
+        return defaultConvert(AttributeValueType.B, value);
+    }
+
+    /**
+     * Invoked when visiting an attribute in which {@link EnhancedAttributeValue#isBoolean()} is true. The provided value is the
+     * underlying value of the {@link EnhancedAttributeValue} being converted.
+     */
+    public T convertBoolean(Boolean value) {
+        return defaultConvert(AttributeValueType.BOOL, value);
+    }
+
+    /**
+     * Invoked when visiting an attribute in which {@link EnhancedAttributeValue#isSetOfStrings()} is true. The provided value is
+     * the underlying value of the {@link EnhancedAttributeValue} being converted.
+     */
+    public T convertSetOfStrings(List<String> value) {
+        return defaultConvert(AttributeValueType.SS, value);
+    }
+
+    /**
+     * Invoked when visiting an attribute in which {@link EnhancedAttributeValue#isSetOfNumbers()} is true. The provided value is
+     * the underlying value of the {@link EnhancedAttributeValue} being converted.
+     */
+    public T convertSetOfNumbers(List<String> value) {
+        return defaultConvert(AttributeValueType.NS, value);
+    }
+
+    /**
+     * Invoked when visiting an attribute in which {@link EnhancedAttributeValue#isSetOfBytes()} is true. The provided value is
+     * the underlying value of the {@link EnhancedAttributeValue} being converted.
+     */
+    public T convertSetOfBytes(List<SdkBytes> value) {
+        return defaultConvert(AttributeValueType.BS, value);
+    }
+
+    /**
+     * Invoked when visiting an attribute in which {@link EnhancedAttributeValue#isListOfAttributeValues()} is true. The provided
+     * value is the underlying value of the {@link EnhancedAttributeValue} being converted.
+     */
+    public T convertListOfAttributeValues(List<AttributeValue> value) {
+        return defaultConvert(AttributeValueType.L, value);
+    }
+
+    /**
+     * This is invoked by default if a different "convert" method is not overridden. By default, this throws an exception.
+     *
+     * @param type The type that wasn't handled by another "convert" method.
+     * @param value The value that wasn't handled by another "convert" method.
+     */
+    public T defaultConvert(AttributeValueType type, Object value) {
+        if (converterClass != null) {
+            throw new IllegalStateException(converterClass.getTypeName() + " cannot convert an attribute of type " + type +
+                                            " into the requested type " + targetType);
+        }
+
+        throw new IllegalStateException("Cannot convert attribute of type " + type + " into a " + targetType);
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/AtomicBooleanAttributeConverter.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/AtomicBooleanAttributeConverter.java
new file mode 100644
index 000000000000..f17db0852ca3
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/AtomicBooleanAttributeConverter.java
@@ -0,0 +1,95 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute;
+
+import java.util.concurrent.atomic.AtomicBoolean;
+import software.amazon.awssdk.annotations.Immutable;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeValueType;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.TypeConvertingVisitor;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.string.AtomicBooleanStringConverter;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+
+/**
+ * A converter between {@link AtomicBoolean} and {@link AttributeValue}.
+ *
+ * <p>
+ * This stores values in DynamoDB as a boolean.
+ *
+ * <p>
+ * This supports reading every boolean value supported by DynamoDB, making it fully compatible with custom converters as
+ * well as internal converters (e.g. {@link BooleanAttributeConverter}).
+ *
+ * <p>
+ * This can be created via {@link #create()}.
+ */
+@SdkInternalApi
+@ThreadSafe
+@Immutable
+public final class AtomicBooleanAttributeConverter implements AttributeConverter<AtomicBoolean> {
+    private static final Visitor VISITOR = new Visitor();
+    private static final AtomicBooleanStringConverter STRING_CONVERTER = AtomicBooleanStringConverter.create();
+
+    private AtomicBooleanAttributeConverter() {
+    }
+
+    @Override
+    public EnhancedType<AtomicBoolean> type() {
+        return EnhancedType.of(AtomicBoolean.class);
+    }
+
+    @Override
+    public AttributeValueType attributeValueType() {
+        return AttributeValueType.BOOL;
+    }
+
+    public static AtomicBooleanAttributeConverter create() {
+        return new AtomicBooleanAttributeConverter();
+    }
+
+    @Override
+    public AttributeValue transformFrom(AtomicBoolean input) {
+        return AttributeValue.builder().bool(input.get()).build();
+    }
+
+    @Override
+    public AtomicBoolean transformTo(AttributeValue input) {
+        if (input.bool() != null) {
+            return EnhancedAttributeValue.fromBoolean(input.bool()).convert(VISITOR);
+        }
+
+        return EnhancedAttributeValue.fromAttributeValue(input).convert(VISITOR);
+    }
+
+    private static final class Visitor extends TypeConvertingVisitor<AtomicBoolean> {
+        private Visitor() {
+            super(AtomicBoolean.class, AtomicBooleanAttributeConverter.class);
+        }
+
+        @Override
+        public AtomicBoolean convertString(String value) {
+            return STRING_CONVERTER.fromString(value);
+        }
+
+        @Override
+        public AtomicBoolean convertBoolean(Boolean value) {
+            return new AtomicBoolean(value);
+        }
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/AtomicIntegerAttributeConverter.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/AtomicIntegerAttributeConverter.java
new file mode 100644
index 000000000000..c3f4948403ac
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/AtomicIntegerAttributeConverter.java
@@ -0,0 +1,102 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute;
+
+import java.util.concurrent.atomic.AtomicInteger;
+import software.amazon.awssdk.annotations.Immutable;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeValueType;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.TypeConvertingVisitor;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.string.AtomicIntegerStringConverter;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+
+/**
+ * A converter between {@link AtomicInteger} and {@link AttributeValue}.
+ *
+ * <p>
+ * This stores values in DynamoDB as a number.
+ *
+ * <p>
+ * This supports reading numbers between {@link Integer#MIN_VALUE} and {@link Integer#MAX_VALUE} from DynamoDB. For smaller
+ * numbers, consider using {@link ShortAttributeConverter}. For larger numbers, consider using {@link LongAttributeConverter}
+ * or {@link BigIntegerAttributeConverter}. Numbers outside of the supported range will cause a {@link NumberFormatException}
+ * on conversion.
+ *
+ * <p>
+ * This does not support reading decimal numbers. For decimal numbers, consider using {@link FloatAttributeConverter},
+ * {@link DoubleAttributeConverter} or {@link BigDecimalAttributeConverter}. Decimal numbers will cause a
+ * {@link NumberFormatException} on conversion.
+ *
+ * <p>
+ * This can be created via {@link #create()}.
+ */
+@SdkInternalApi
+@ThreadSafe
+@Immutable
+public final class AtomicIntegerAttributeConverter implements AttributeConverter<AtomicInteger> {
+    private static final Visitor VISITOR = new Visitor();
+    private static final AtomicIntegerStringConverter STRING_CONVERTER = AtomicIntegerStringConverter.create();
+
+    private AtomicIntegerAttributeConverter() {
+    }
+
+    @Override
+    public EnhancedType<AtomicInteger> type() {
+        return EnhancedType.of(AtomicInteger.class);
+    }
+
+    @Override
+    public AttributeValueType attributeValueType() {
+        return AttributeValueType.S;
+    }
+
+    public static AtomicIntegerAttributeConverter create() {
+        return new AtomicIntegerAttributeConverter();
+    }
+
+    @Override
+    public AttributeValue transformFrom(AtomicInteger input) {
+        return AttributeValue.builder().n(STRING_CONVERTER.toString(input)).build();
+    }
+
+    @Override
+    public AtomicInteger transformTo(AttributeValue input) {
+        if (input.n() != null) {
+            return EnhancedAttributeValue.fromNumber(input.n()).convert(VISITOR);
+        }
+
+        return EnhancedAttributeValue.fromAttributeValue(input).convert(VISITOR);
+    }
+
+    private static final class Visitor extends TypeConvertingVisitor<AtomicInteger> {
+        private Visitor() {
+            super(AtomicInteger.class, AtomicIntegerAttributeConverter.class);
+        }
+
+        @Override
+        public AtomicInteger convertString(String value) {
+            return STRING_CONVERTER.fromString(value);
+        }
+
+        @Override
+        public AtomicInteger convertNumber(String value) {
+            return STRING_CONVERTER.fromString(value);
+        }
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/AtomicLongAttributeConverter.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/AtomicLongAttributeConverter.java
new file mode 100644
index 000000000000..427a97ca7071
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/AtomicLongAttributeConverter.java
@@ -0,0 +1,102 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute;
+
+import java.util.concurrent.atomic.AtomicLong;
+import software.amazon.awssdk.annotations.Immutable;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeValueType;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.TypeConvertingVisitor;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.string.AtomicLongStringConverter;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+
+/**
+ * A converter between {@link AtomicLong} and {@link AttributeValue}.
+ *
+ * <p>
+ * This stores values in DynamoDB as a number.
+ *
+ * <p>
+ * This supports reading numbers between {@link Long#MIN_VALUE} and {@link Long#MAX_VALUE} from DynamoDB. For smaller
+ * numbers, consider using {@link ShortAttributeConverter} or {@link IntegerAttributeConverter}. For larger numbers, consider
+ * using {@link BigIntegerAttributeConverter}. Numbers outside of the supported range will cause a {@link NumberFormatException}
+ * on conversion.
+ *
+ * <p>
+ * This does not support reading decimal numbers. For decimal numbers, consider using {@link FloatAttributeConverter},
+ * {@link DoubleAttributeConverter} or {@link BigDecimalAttributeConverter}. Decimal numbers will cause a
+ * {@link NumberFormatException} on conversion.
+ *
+ * <p>
+ * This can be created via {@link #create()}.
+ */
+@SdkInternalApi
+@ThreadSafe
+@Immutable
+public final class AtomicLongAttributeConverter implements AttributeConverter<AtomicLong> {
+    private static final Visitor VISITOR = new Visitor();
+    private static final AtomicLongStringConverter STRING_CONVERTER = AtomicLongStringConverter.create();
+
+    private AtomicLongAttributeConverter() {
+    }
+
+    @Override
+    public EnhancedType<AtomicLong> type() {
+        return EnhancedType.of(AtomicLong.class);
+    }
+
+    @Override
+    public AttributeValueType attributeValueType() {
+        return AttributeValueType.N;
+    }
+
+    public static AtomicLongAttributeConverter create() {
+        return new AtomicLongAttributeConverter();
+    }
+
+    @Override
+    public AttributeValue transformFrom(AtomicLong input) {
+        return AttributeValue.builder().n(STRING_CONVERTER.toString(input)).build();
+    }
+
+    @Override
+    public AtomicLong transformTo(AttributeValue input) {
+        if (input.n() != null) {
+            return EnhancedAttributeValue.fromNumber(input.n()).convert(VISITOR);
+        }
+
+        return EnhancedAttributeValue.fromAttributeValue(input).convert(VISITOR);
+    }
+
+    private static final class Visitor extends TypeConvertingVisitor<AtomicLong> {
+        private Visitor() {
+            super(AtomicLong.class, AtomicLongAttributeConverter.class);
+        }
+
+        @Override
+        public AtomicLong convertString(String value) {
+            return STRING_CONVERTER.fromString(value);
+        }
+
+        @Override
+        public AtomicLong convertNumber(String value) {
+            return STRING_CONVERTER.fromString(value);
+        }
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/BigDecimalAttributeConverter.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/BigDecimalAttributeConverter.java
new file mode 100644
index 000000000000..b730c114ae5d
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/BigDecimalAttributeConverter.java
@@ -0,0 +1,98 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute;
+
+import java.math.BigDecimal;
+import software.amazon.awssdk.annotations.Immutable;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeValueType;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.TypeConvertingVisitor;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.string.BigDecimalStringConverter;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+
+/**
+ * A converter between {@link BigDecimal} and {@link AttributeValue}.
+ *
+ * <p>
+ * This stores values in DynamoDB as a number.
+ *
+ * <p>
+ * This supports perfect precision with the full range of numbers that can be stored in DynamoDB. For less precision or
+ * smaller values, consider using {@link FloatAttributeConverter} or {@link DoubleAttributeConverter}.
+ *
+ * <p>
+ * If values are known to be whole numbers, it is recommended to use a perfect-precision whole number representation like those
+ * provided by {@link ShortAttributeConverter}, {@link IntegerAttributeConverter} or {@link BigIntegerAttributeConverter}.
+ *
+ * <p>
+ * This can be created via {@link #create()}.
+ */
+@SdkInternalApi
+@ThreadSafe
+@Immutable
+public final class BigDecimalAttributeConverter implements AttributeConverter<BigDecimal> {
+    private static final Visitor VISITOR = new Visitor();
+    private static final BigDecimalStringConverter STRING_CONVERTER = BigDecimalStringConverter.create();
+
+    private BigDecimalAttributeConverter() {
+    }
+
+    public static BigDecimalAttributeConverter create() {
+        return new BigDecimalAttributeConverter();
+    }
+
+    @Override
+    public EnhancedType<BigDecimal> type() {
+        return EnhancedType.of(BigDecimal.class);
+    }
+
+    @Override
+    public AttributeValueType attributeValueType() {
+        return AttributeValueType.N;
+    }
+
+    @Override
+    public AttributeValue transformFrom(BigDecimal input) {
+        return AttributeValue.builder().n(STRING_CONVERTER.toString(input)).build();
+    }
+
+    @Override
+    public BigDecimal transformTo(AttributeValue input) {
+        if (input.n() != null) {
+            return EnhancedAttributeValue.fromNumber(input.n()).convert(VISITOR);
+        }
+        return EnhancedAttributeValue.fromAttributeValue(input).convert(VISITOR);
+    }
+
+    private static final class Visitor extends TypeConvertingVisitor<BigDecimal> {
+        private Visitor() {
+            super(BigDecimal.class, BigDecimalAttributeConverter.class);
+        }
+
+        @Override
+        public BigDecimal convertString(String value) {
+            return STRING_CONVERTER.fromString(value);
+        }
+
+        @Override
+        public BigDecimal convertNumber(String value) {
+            return STRING_CONVERTER.fromString(value);
+        }
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/BigIntegerAttributeConverter.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/BigIntegerAttributeConverter.java
new file mode 100644
index 000000000000..a5c8c52e0ba2
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/BigIntegerAttributeConverter.java
@@ -0,0 +1,99 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute;
+
+import java.math.BigInteger;
+import software.amazon.awssdk.annotations.Immutable;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeValueType;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.TypeConvertingVisitor;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.string.BigIntegerStringConverter;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+
+/**
+ * A converter between {@link BigInteger} and {@link AttributeValue}.
+ *
+ * <p>
+ * This stores values in DynamoDB as a number.
+ *
+ * <p>
+ * This supports reading the full range of integers supported by DynamoDB. For smaller numbers, consider using
+ * {@link ShortAttributeConverter}, {@link IntegerAttributeConverter} or {@link LongAttributeConverter}.
+ *
+ * <p>
+ * This does not support reading decimal numbers. For decimal numbers, consider using {@link FloatAttributeConverter},
+ * {@link DoubleAttributeConverter} or {@link BigDecimalAttributeConverter}. Decimal numbers will cause a
+ * {@link NumberFormatException} on conversion.
+ *
+ * <p>
+ * This can be created via {@link #create()}.
+ */
+@SdkInternalApi
+@ThreadSafe
+@Immutable
+public final class BigIntegerAttributeConverter implements AttributeConverter<BigInteger> {
+    private static final Visitor VISITOR = new Visitor();
+    private static final BigIntegerStringConverter STRING_CONVERTER = BigIntegerStringConverter.create();
+
+    private BigIntegerAttributeConverter() {
+    }
+
+    public static BigIntegerAttributeConverter create() {
+        return new BigIntegerAttributeConverter();
+    }
+
+    @Override
+    public EnhancedType<BigInteger> type() {
+        return EnhancedType.of(BigInteger.class);
+    }
+
+    @Override
+    public AttributeValueType attributeValueType() {
+        return AttributeValueType.N;
+    }
+
+    @Override
+    public AttributeValue transformFrom(BigInteger input) {
+        return AttributeValue.builder().n(STRING_CONVERTER.toString(input)).build();
+    }
+
+    @Override
+    public BigInteger transformTo(AttributeValue input) {
+        if (input.n() != null) {
+            return EnhancedAttributeValue.fromNumber(input.n()).convert(VISITOR);
+        }
+        return EnhancedAttributeValue.fromAttributeValue(input).convert(VISITOR);
+    }
+
+    private static final class Visitor extends TypeConvertingVisitor<BigInteger> {
+        private Visitor() {
+            super(BigInteger.class, BigIntegerAttributeConverter.class);
+        }
+
+        @Override
+        public BigInteger convertString(String value) {
+            return STRING_CONVERTER.fromString(value);
+        }
+
+        @Override
+        public BigInteger convertNumber(String value) {
+            return STRING_CONVERTER.fromString(value);
+        }
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/BooleanAttributeConverter.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/BooleanAttributeConverter.java
new file mode 100644
index 000000000000..83a2591eb399
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/BooleanAttributeConverter.java
@@ -0,0 +1,100 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute;
+
+import java.util.concurrent.atomic.AtomicBoolean;
+import software.amazon.awssdk.annotations.Immutable;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeValueType;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.PrimitiveConverter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.TypeConvertingVisitor;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.string.BooleanStringConverter;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+
+/**
+ * A converter between {@link AtomicBoolean} and {@link AttributeValue}.
+ *
+ * <p>
+ * This stores values in DynamoDB as a boolean.
+ *
+ * <p>
+ * This supports reading every boolean value supported by DynamoDB, making it fully compatible with custom converters as well
+ * as internal converters (e.g. {@link AtomicBooleanAttributeConverter}).
+ *
+ * <p>
+ * This can be created via {@link #create()}.
+ */
+@SdkInternalApi
+@ThreadSafe
+@Immutable
+public final class BooleanAttributeConverter implements AttributeConverter<Boolean>, PrimitiveConverter<Boolean> {
+    private static final Visitor VISITOR = new Visitor();
+    private static final BooleanStringConverter STRING_CONVERTER = BooleanStringConverter.create();
+
+    private BooleanAttributeConverter() {
+    }
+
+    public static BooleanAttributeConverter create() {
+        return new BooleanAttributeConverter();
+    }
+
+    @Override
+    public EnhancedType<Boolean> type() {
+        return EnhancedType.of(Boolean.class);
+    }
+
+    @Override
+    public AttributeValueType attributeValueType() {
+        return AttributeValueType.BOOL;
+    }
+
+    @Override
+    public AttributeValue transformFrom(Boolean input) {
+        return AttributeValue.builder().bool(input).build();
+    }
+
+    @Override
+    public Boolean transformTo(AttributeValue input) {
+        if (input.bool() != null) {
+            return EnhancedAttributeValue.fromBoolean(input.bool()).convert(VISITOR);
+        }
+        return EnhancedAttributeValue.fromAttributeValue(input).convert(VISITOR);
+    }
+
+    @Override
+    public EnhancedType<Boolean> primitiveType() {
+        return EnhancedType.of(boolean.class);
+    }
+
+    private static final class Visitor extends TypeConvertingVisitor<Boolean> {
+        private Visitor() {
+            super(Boolean.class, BooleanAttributeConverter.class);
+        }
+
+        @Override
+        public Boolean convertString(String value) {
+            return STRING_CONVERTER.fromString(value);
+        }
+
+        @Override
+        public Boolean convertBoolean(Boolean value) {
+            return value;
+        }
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/ByteArrayAttributeConverter.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/ByteArrayAttributeConverter.java
new file mode 100644
index 000000000000..2cf110a6814d
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/ByteArrayAttributeConverter.java
@@ -0,0 +1,88 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute;
+
+import software.amazon.awssdk.annotations.Immutable;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.core.SdkBytes;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeValueType;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.TypeConvertingVisitor;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+
+/**
+ * A converter between {@code byte[]} and {@link AttributeValue}.
+ *
+ * <p>
+ * This stores values in DynamoDB as a binary blob.
+ *
+ * <p>
+ * This supports reading every byte value supported by DynamoDB, making it fully compatible with custom converters as
+ * well as internal converters (e.g. {@link SdkBytesAttributeConverter}).
+ *
+ * <p>
+ * This can be created via {@link #create()}.
+ */
+@SdkInternalApi
+@ThreadSafe
+@Immutable
+public final class ByteArrayAttributeConverter implements AttributeConverter<byte[]> {
+    private static final Visitor VISITOR = new Visitor();
+
+    private ByteArrayAttributeConverter() {
+    }
+
+    public static ByteArrayAttributeConverter create() {
+        return new ByteArrayAttributeConverter();
+    }
+
+    @Override
+    public EnhancedType<byte[]> type() {
+        return EnhancedType.of(byte[].class);
+    }
+
+    @Override
+    public AttributeValueType attributeValueType() {
+        return AttributeValueType.B;
+    }
+
+    @Override
+    public AttributeValue transformFrom(byte[] input) {
+        return AttributeValue.builder().b(SdkBytes.fromByteArray(input)).build();
+    }
+
+    @Override
+    public byte[] transformTo(AttributeValue input) {
+        if (input.b() != null) {
+            return EnhancedAttributeValue.fromBytes(input.b()).convert(VISITOR);
+        }
+
+        return EnhancedAttributeValue.fromAttributeValue(input).convert(VISITOR);
+    }
+
+    private static final class Visitor extends TypeConvertingVisitor<byte[]> {
+        private Visitor() {
+            super(byte[].class, ByteArrayAttributeConverter.class);
+        }
+
+        @Override
+        public byte[] convertBytes(SdkBytes value) {
+            return value.asByteArray();
+        }
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/ByteAttributeConverter.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/ByteAttributeConverter.java
new file mode 100644
index 000000000000..d867b53fd732
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/ByteAttributeConverter.java
@@ -0,0 +1,95 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute;
+
+import software.amazon.awssdk.annotations.Immutable;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeValueType;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.PrimitiveConverter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.TypeConvertingVisitor;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.string.ByteStringConverter;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+
+/**
+ * A converter between {@link Byte} and {@link AttributeValue}.
+ *
+ * <p>
+ * This stores values in DynamoDB as a single byte.
+ *
+ * <p>
+ * This only supports reading a single byte from DynamoDB. Any binary data greater than 1 byte will cause a RuntimeException
+ * during conversion.
+ *
+ * <p>
+ * This can be created via {@link #create()}.
+ */
+@SdkInternalApi
+@ThreadSafe
+@Immutable
+public final class ByteAttributeConverter implements AttributeConverter<Byte>, PrimitiveConverter<Byte> {
+    private static final ByteStringConverter STRING_CONVERTER = ByteStringConverter.create();
+    private static final Visitor VISITOR = new Visitor();
+
+    private ByteAttributeConverter() {
+    }
+
+    public static ByteAttributeConverter create() {
+        return new ByteAttributeConverter();
+    }
+
+    @Override
+    public AttributeValue transformFrom(Byte input) {
+        return AttributeValue.builder().n(STRING_CONVERTER.toString(input)).build();
+    }
+
+    @Override
+    public Byte transformTo(AttributeValue input) {
+        if (input.b() != null) {
+            return EnhancedAttributeValue.fromNumber(input.n()).convert(VISITOR);
+        }
+
+        return EnhancedAttributeValue.fromAttributeValue(input).convert(VISITOR);
+    }
+
+    @Override
+    public EnhancedType<Byte> type() {
+        return EnhancedType.of(Byte.class);
+    }
+
+    @Override
+    public AttributeValueType attributeValueType() {
+        return AttributeValueType.N;
+    }
+
+    @Override
+    public EnhancedType<Byte> primitiveType() {
+        return EnhancedType.of(byte.class);
+    }
+
+    private static final class Visitor extends TypeConvertingVisitor<Byte> {
+        private Visitor() {
+            super(Byte.class, ByteAttributeConverter.class);
+        }
+
+        @Override
+        public Byte convertNumber(String number) {
+            return Byte.parseByte(number);
+        }
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/CharSequenceAttributeConverter.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/CharSequenceAttributeConverter.java
new file mode 100644
index 000000000000..d6016b3c9b57
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/CharSequenceAttributeConverter.java
@@ -0,0 +1,74 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute;
+
+import software.amazon.awssdk.annotations.Immutable;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeValueType;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.string.CharSequenceStringConverter;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+
+/**
+ * A converter between {@link CharSequence} and {@link AttributeValue}.
+ *
+ * <p>
+ * This stores values in DynamoDB as a string.
+ *
+ * <p>
+ * This supports reading every string value supported by DynamoDB, making it fully compatible with custom converters as
+ * well as internal converters (e.g. {@link StringAttributeConverter}).
+ *
+ * <p>
+ * This can be created via {@link #create()}.
+ */
+@SdkInternalApi
+@ThreadSafe
+@Immutable
+public final class CharSequenceAttributeConverter implements AttributeConverter<CharSequence> {
+    private static final CharSequenceStringConverter CHAR_SEQUENCE_STRING_CONVERTER = CharSequenceStringConverter.create();
+    private static final StringAttributeConverter STRING_ATTRIBUTE_CONVERTER = StringAttributeConverter.create();
+
+    private CharSequenceAttributeConverter() {
+    }
+
+    public static CharSequenceAttributeConverter create() {
+        return new CharSequenceAttributeConverter();
+    }
+
+    @Override
+    public EnhancedType<CharSequence> type() {
+        return EnhancedType.of(CharSequence.class);
+    }
+
+    @Override
+    public AttributeValueType attributeValueType() {
+        return AttributeValueType.S;
+    }
+
+    @Override
+    public AttributeValue transformFrom(CharSequence input) {
+        return AttributeValue.builder().s(CHAR_SEQUENCE_STRING_CONVERTER.toString(input)).build();
+    }
+
+    @Override
+    public CharSequence transformTo(AttributeValue input) {
+        String string = STRING_ATTRIBUTE_CONVERTER.transformTo(input);
+        return CHAR_SEQUENCE_STRING_CONVERTER.fromString(string);
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/CharacterArrayAttributeConverter.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/CharacterArrayAttributeConverter.java
new file mode 100644
index 000000000000..a1965d793148
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/CharacterArrayAttributeConverter.java
@@ -0,0 +1,73 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute;
+
+import software.amazon.awssdk.annotations.Immutable;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeValueType;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.string.CharacterArrayStringConverter;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+
+/**
+ * A converter between {@code char[]} and {@link AttributeValue}.
+ *
+ * <p>
+ * This stores values in DynamoDB as a string.
+ *
+ * <p>
+ * This supports reading every string value supported by DynamoDB, making it fully compatible with custom converters as
+ * well as internal converters (e.g. {@link StringAttributeConverter}).
+ *
+ * <p>
+ * This can be created via {@link #create()}.
+ */
+@SdkInternalApi
+@ThreadSafe
+@Immutable
+public final class CharacterArrayAttributeConverter implements AttributeConverter<char[]> {
+    private static final CharacterArrayStringConverter CHAR_ARRAY_STRING_CONVERTER = CharacterArrayStringConverter.create();
+    private static final StringAttributeConverter STRING_ATTRIBUTE_CONVERTER = StringAttributeConverter.create();
+
+    private CharacterArrayAttributeConverter() {
+    }
+
+    public static CharacterArrayAttributeConverter create() {
+        return new CharacterArrayAttributeConverter();
+    }
+
+    @Override
+    public EnhancedType<char[]> type() {
+        return EnhancedType.of(char[].class);
+    }
+
+    @Override
+    public AttributeValueType attributeValueType() {
+        return AttributeValueType.S;
+    }
+
+    @Override
+    public AttributeValue transformFrom(char[] input) {
+        return AttributeValue.builder().s(CHAR_ARRAY_STRING_CONVERTER.toString(input)).build();
+    }
+
+    @Override
+    public char[] transformTo(AttributeValue input) {
+        return CHAR_ARRAY_STRING_CONVERTER.fromString(STRING_ATTRIBUTE_CONVERTER.transformTo(input));
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/CharacterAttributeConverter.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/CharacterAttributeConverter.java
new file mode 100644
index 000000000000..f1d243683d71
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/CharacterAttributeConverter.java
@@ -0,0 +1,95 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute;
+
+import software.amazon.awssdk.annotations.Immutable;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeValueType;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.PrimitiveConverter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.TypeConvertingVisitor;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.string.CharacterStringConverter;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+
+/**
+ * A converter between {@link Character} and {@link AttributeValue}.
+ *
+ * <p>
+ * This stores values in DynamoDB as a single-character string.
+ *
+ * <p>
+ * This only supports reading a single character from DynamoDB. Any string longer than 1 character will cause a RuntimeException
+ * during conversion.
+ *
+ * <p>
+ * This can be created via {@link #create()}.
+ */
+@SdkInternalApi
+@ThreadSafe
+@Immutable
+public final class CharacterAttributeConverter implements AttributeConverter<Character>, PrimitiveConverter<Character> {
+    private static final Visitor VISITOR = new Visitor();
+    private static final CharacterStringConverter STRING_CONVERTER = CharacterStringConverter.create();
+
+    private CharacterAttributeConverter() {
+    }
+
+    public static CharacterAttributeConverter create() {
+        return new CharacterAttributeConverter();
+    }
+
+    @Override
+    public EnhancedType<Character> type() {
+        return EnhancedType.of(Character.class);
+    }
+
+    @Override
+    public AttributeValueType attributeValueType() {
+        return AttributeValueType.S;
+    }
+
+    @Override
+    public AttributeValue transformFrom(Character input) {
+        return AttributeValue.builder().s(STRING_CONVERTER.toString(input)).build();
+    }
+
+    @Override
+    public Character transformTo(AttributeValue input) {
+        if (input.s() != null) {
+            return EnhancedAttributeValue.fromString(input.s()).convert(VISITOR);
+        }
+
+        return EnhancedAttributeValue.fromAttributeValue(input).convert(VISITOR);
+    }
+
+    @Override
+    public EnhancedType<Character> primitiveType() {
+        return EnhancedType.of(char.class);
+    }
+
+    private static final class Visitor extends TypeConvertingVisitor<Character> {
+        private Visitor() {
+            super(Character.class, CharacterAttributeConverter.class);
+        }
+
+        @Override
+        public Character convertString(String value) {
+            return STRING_CONVERTER.fromString(value);
+        }
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/DocumentAttributeConverter.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/DocumentAttributeConverter.java
new file mode 100644
index 000000000000..de7335471efb
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/DocumentAttributeConverter.java
@@ -0,0 +1,64 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute;
+
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeValueType;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.enhanced.dynamodb.TableSchema;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+
+/**
+ * {@link AttributeConverter} for converting nested table schemas
+ */
+@SdkInternalApi
+public class DocumentAttributeConverter<T> implements AttributeConverter<T> {
+
+    private final TableSchema<T> tableSchema;
+    private final EnhancedType<T> enhancedType;
+
+    private DocumentAttributeConverter(TableSchema<T> tableSchema,
+                                       EnhancedType<T> enhancedType) {
+        this.tableSchema = tableSchema;
+        this.enhancedType = enhancedType;
+    }
+
+    public static <T> DocumentAttributeConverter create(TableSchema<T> tableSchema,
+                                                        EnhancedType<T> enhancedType) {
+        return new DocumentAttributeConverter(tableSchema, enhancedType);
+    }
+
+    @Override
+    public AttributeValue transformFrom(T input) {
+        return AttributeValue.builder().m(tableSchema.itemToMap(input, false)).build();
+    }
+
+    @Override
+    public T transformTo(AttributeValue input) {
+        return tableSchema.mapToItem(input.m());
+    }
+
+    @Override
+    public AttributeValueType attributeValueType() {
+        return AttributeValueType.M;
+    }
+
+    @Override
+    public EnhancedType<T> type() {
+        return enhancedType;
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/DoubleAttributeConverter.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/DoubleAttributeConverter.java
new file mode 100644
index 000000000000..4eb2b2d91682
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/DoubleAttributeConverter.java
@@ -0,0 +1,111 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute;
+
+import software.amazon.awssdk.annotations.Immutable;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeValueType;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.ConverterUtils;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.PrimitiveConverter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.TypeConvertingVisitor;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.string.DoubleStringConverter;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+
+/**
+ * A converter between {@link Double} and {@link AttributeValue}.
+ *
+ * <p>
+ * This stores values in DynamoDB as a number.
+ *
+ * <p>
+ * This supports converting numbers stored in DynamoDB into a double-precision floating point number, within the range
+ * {@link Double#MIN_VALUE}, {@link Double#MAX_VALUE}. For less precision or smaller values, consider using
+ * {@link FloatAttributeConverter}. For greater precision or larger values, consider using {@link BigDecimalAttributeConverter}.
+ *
+ * <p>
+ * If values are known to be whole numbers, it is recommended to use a perfect-precision whole number representation like those
+ * provided by {@link ShortAttributeConverter}, {@link IntegerAttributeConverter} or {@link BigIntegerAttributeConverter}.
+ *
+ * <p>
+ * This can be created via {@link #create()}.
+ */
+@SdkInternalApi
+@ThreadSafe
+@Immutable
+public final class DoubleAttributeConverter implements AttributeConverter<Double>, PrimitiveConverter<Double> {
+    private static final Visitor VISITOR = new Visitor();
+    private static final DoubleStringConverter STRING_CONVERTER = DoubleStringConverter.create();
+
+    private DoubleAttributeConverter() {
+    }
+
+    public static DoubleAttributeConverter create() {
+        return new DoubleAttributeConverter();
+    }
+
+    @Override
+    public EnhancedType<Double> type() {
+        return EnhancedType.of(Double.class);
+    }
+
+    @Override
+    public AttributeValueType attributeValueType() {
+        return AttributeValueType.N;
+    }
+
+    @Override
+    public AttributeValue transformFrom(Double input) {
+        ConverterUtils.validateDouble(input);
+        return AttributeValue.builder().n(STRING_CONVERTER.toString(input)).build();
+    }
+
+    @Override
+    public Double transformTo(AttributeValue input) {
+        Double result;
+        if (input.n() != null) {
+            result = EnhancedAttributeValue.fromNumber(input.n()).convert(VISITOR);
+        } else {
+            result = EnhancedAttributeValue.fromAttributeValue(input).convert(VISITOR);
+        }
+
+        ConverterUtils.validateDouble(result);
+        return result;
+    }
+
+    @Override
+    public EnhancedType<Double> primitiveType() {
+        return EnhancedType.of(double.class);
+    }
+
+    private static final class Visitor extends TypeConvertingVisitor<Double> {
+        private Visitor() {
+            super(Double.class, DoubleAttributeConverter.class);
+        }
+
+        @Override
+        public Double convertString(String value) {
+            return STRING_CONVERTER.fromString(value);
+        }
+
+        @Override
+        public Double convertNumber(String value) {
+            return STRING_CONVERTER.fromString(value);
+        }
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/DurationAttributeConverter.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/DurationAttributeConverter.java
new file mode 100644
index 000000000000..f312dc72aacd
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/DurationAttributeConverter.java
@@ -0,0 +1,116 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute;
+
+import static software.amazon.awssdk.enhanced.dynamodb.internal.converter.ConverterUtils.padLeft;
+
+import java.time.Duration;
+import software.amazon.awssdk.annotations.Immutable;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeValueType;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.ConverterUtils;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.TypeConvertingVisitor;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+
+/**
+ * A converter between {@link Duration} and {@link AttributeValue}.
+ *
+ * <p>
+ * This stores and reads values in DynamoDB as a number, so that they can be sorted numerically as part of a sort key.
+ *
+ * <p>
+ * Durations are stored in the format "[-]X[.YYYYYYYYY]", where X is the number of seconds in the duration, and Y is the number of
+ * nanoseconds in the duration, left padded with zeroes to a length of 9. The Y and decimal point may be excluded for durations
+ * that are of whole seconds. The duration may be preceded by a - to indicate a negative duration.
+ *
+ * <p>
+ * Examples:
+ * <ul>
+ *     <li>{@code Duration.ofDays(1)} is stored as {@code ItemAttributeValueMapper.fromNumber("86400")}</li>
+ *     <li>{@code Duration.ofSeconds(9)} is stored as {@code ItemAttributeValueMapper.fromNumber("9")}</li>
+ *     <li>{@code Duration.ofSeconds(-9)} is stored as {@code ItemAttributeValueMapper.fromNumber("-9")}</li>
+ *     <li>{@code Duration.ofNanos(1_234_567_890)} is stored as {@code ItemAttributeValueMapper.fromNumber("1.234567890")}</li>
+ *     <li>{@code Duration.ofMillis(1)} is stored as {@code ItemAttributeValueMapper.fromNumber("0.001000000")}</li>
+ *     <li>{@code Duration.ofNanos(1)} is stored as {@code ItemAttributeValueMapper.fromNumber("0.000000001")}</li>
+ *     <li>{@code Duration.ofNanos(-1)} is stored as {@code ItemAttributeValueMapper.fromNumber("-0.000000001")}</li>
+ * </ul>
+ *
+ * <p>
+ * This can be created via {@link #create()}.
+ */
+@SdkInternalApi
+@ThreadSafe
+@Immutable
+public final class DurationAttributeConverter implements AttributeConverter<Duration> {
+    private static final Visitor VISITOR = new Visitor();
+
+    private DurationAttributeConverter() {
+    }
+
+    public static DurationAttributeConverter create() {
+        return new DurationAttributeConverter();
+    }
+
+    @Override
+    public EnhancedType<Duration> type() {
+        return EnhancedType.of(Duration.class);
+    }
+
+    @Override
+    public AttributeValueType attributeValueType() {
+        return AttributeValueType.N;
+    }
+
+    @Override
+    public AttributeValue transformFrom(Duration input) {
+        return AttributeValue.builder()
+                             .n(input.getSeconds() +
+                                (input.getNano() == 0 ? "" : "." + padLeft(9, input.getNano())))
+                             .build();
+    }
+
+    @Override
+    public Duration transformTo(AttributeValue input) {
+        if (input.n() != null) {
+            return EnhancedAttributeValue.fromNumber(input.n()).convert(VISITOR);
+        }
+
+        return EnhancedAttributeValue.fromAttributeValue(input).convert(VISITOR);
+    }
+
+    private static final class Visitor extends TypeConvertingVisitor<Duration> {
+        private Visitor() {
+            super(Duration.class, DurationAttributeConverter.class);
+        }
+
+        @Override
+        public Duration convertNumber(String value) {
+            String[] splitOnDecimal = ConverterUtils.splitNumberOnDecimal(value);
+
+            long seconds = Long.parseLong(splitOnDecimal[0]);
+            int nanoAdjustment = Integer.parseInt(splitOnDecimal[1]);
+
+            if (seconds < 0) {
+                nanoAdjustment = -nanoAdjustment;
+            }
+
+            return Duration.ofSeconds(seconds, nanoAdjustment);
+        }
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/EnhancedAttributeValue.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/EnhancedAttributeValue.java
new file mode 100644
index 000000000000..4996058a4ef7
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/EnhancedAttributeValue.java
@@ -0,0 +1,845 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import software.amazon.awssdk.annotations.Immutable;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.core.SdkBytes;
+import software.amazon.awssdk.core.util.SdkAutoConstructMap;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeValueType;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.TypeConvertingVisitor;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+import software.amazon.awssdk.utils.ToString;
+import software.amazon.awssdk.utils.Validate;
+
+/**
+ * A simpler, and more user-friendly version of the generated {@link AttributeValue}.
+ *
+ * <p>
+ * This is a union type of the types exposed by DynamoDB, exactly as they're exposed by DynamoDB.
+ *
+ * <p>
+ * An instance of {@link EnhancedAttributeValue} represents exactly one DynamoDB type, like String (s), Number (n) or Bytes (b).
+ * This type can be determined with the {@link #type()} method or the {@code is*} methods like {@link #isString()} or
+ * {@link #isNumber()}. Once the type is known, the value can be extracted with {@code as*} methods like {@link #asString()}
+ * or {@link #asNumber()}.
+ *
+ * <p>
+ * When converting an {@link EnhancedAttributeValue} into a concrete Java type, it can be tedious to use the {@link #type()} or
+ * {@code is*} methods. For this reason, a {@link #convert(TypeConvertingVisitor)} method is provided that exposes a polymorphic
+ * way of converting a value into another type.
+ *
+ * <p>
+ * An instance of {@link EnhancedAttributeValue} is created with the {@code from*} methods, like {@link #fromString(String)} or
+ * {@link #fromNumber(String)}.
+ */
+@SdkInternalApi
+@ThreadSafe
+@Immutable
+public final class EnhancedAttributeValue {
+    private final AttributeValueType type;
+    private final boolean isNull;
+    private final Map<String, AttributeValue> mapValue;
+    private final String stringValue;
+    private final String numberValue;
+    private final SdkBytes bytesValue;
+    private final Boolean booleanValue;
+    private final List<String> setOfStringsValue;
+    private final List<String> setOfNumbersValue;
+    private final List<SdkBytes> setOfBytesValue;
+    private final List<AttributeValue> listOfAttributeValuesValue;
+
+    private EnhancedAttributeValue(InternalBuilder builder) {
+        this.type = builder.type;
+        this.isNull = builder.isNull;
+        this.stringValue = builder.stringValue;
+        this.numberValue = builder.numberValue;
+        this.bytesValue = builder.bytesValue;
+        this.booleanValue = builder.booleanValue;
+        this.mapValue = builder.mapValue == null ? null
+                                                 : Collections.unmodifiableMap(builder.mapValue);
+        this.setOfStringsValue = builder.setOfStringsValue == null
+                                 ? null : Collections.unmodifiableList(builder.setOfStringsValue);
+        this.setOfNumbersValue = builder.setOfNumbersValue == null
+                                 ? null : Collections.unmodifiableList(builder.setOfNumbersValue);
+        this.setOfBytesValue = builder.setOfBytesValue == null
+                               ? null : Collections.unmodifiableList(builder.setOfBytesValue);
+        this.listOfAttributeValuesValue = builder.listOfAttributeValuesValue == null
+                                          ? null : Collections.unmodifiableList(builder.listOfAttributeValuesValue);
+    }
+
+    /**
+     * Create an {@link EnhancedAttributeValue} for the null DynamoDB type.
+     *
+     * <p>
+     * Equivalent to: {@code EnhancedAttributeValue.fromGeneratedAttributeValue(AttributeValue.builder().nul(true).build())}
+     *
+     * <p>
+     * This call should never fail with an {@link Exception}.
+     */
+    public static EnhancedAttributeValue nullValue() {
+        return new InternalBuilder().isNull().build();
+    }
+
+    /**
+     * Create an {@link EnhancedAttributeValue} for a map (m) DynamoDB type.
+     *
+     * <p>
+     * Equivalent to: {@code EnhancedAttributeValue.fromGeneratedAttributeValue(AttributeValue.builder().m(...).build())}
+     *
+     * <p>
+     * This call will fail with a {@link RuntimeException} if the provided map is null or has null keys.
+     */
+    public static EnhancedAttributeValue fromMap(Map<String, AttributeValue> mapValue) {
+        Validate.paramNotNull(mapValue, "mapValue");
+        Validate.noNullElements(mapValue.keySet(), "Map must not have null keys.");
+        return new InternalBuilder().mapValue(mapValue).build();
+    }
+
+    /**
+     * Create an {@link EnhancedAttributeValue} for a string (s) DynamoDB type.
+     *
+     * <p>
+     * Equivalent to: {@code EnhancedAttributeValue.fromGeneratedAttributeValue(AttributeValue.builder().s(...).build())}
+     *
+     * <p>
+     * This call will fail with a {@link RuntimeException} if the provided value is null. Use {@link #nullValue()} for
+     * null values.
+     */
+    public static EnhancedAttributeValue fromString(String stringValue) {
+        Validate.paramNotNull(stringValue, "stringValue");
+        return new InternalBuilder().stringValue(stringValue).build();
+    }
+
+    /**
+     * Create an {@link EnhancedAttributeValue} for a number (n) DynamoDB type.
+     *
+     * <p>
+     * This is a String, because it matches the underlying DynamoDB representation.
+     *
+     * <p>
+     * Equivalent to: {@code EnhancedAttributeValue.fromGeneratedAttributeValue(AttributeValue.builder().n(...).build())}
+     *
+     * <p>
+     * This call will fail with a {@link RuntimeException} if the provided value is null. Use {@link #nullValue()} for
+     * null values.
+     */
+    public static EnhancedAttributeValue fromNumber(String numberValue) {
+        Validate.paramNotNull(numberValue, "numberValue");
+        return new InternalBuilder().numberValue(numberValue).build();
+    }
+
+    /**
+     * Create an {@link EnhancedAttributeValue} for a bytes (b) DynamoDB type.
+     *
+     * <p>
+     * Equivalent to: {@code EnhancedAttributeValue.fromGeneratedAttributeValue(AttributeValue.builder().b(...).build())}
+     *
+     * <p>
+     * This call will fail with a {@link RuntimeException} if the provided value is null. Use {@link #nullValue()} for
+     * null values.
+     */
+    public static EnhancedAttributeValue fromBytes(SdkBytes bytesValue) {
+        Validate.paramNotNull(bytesValue, "bytesValue");
+        return new InternalBuilder().bytesValue(bytesValue).build();
+    }
+
+
+    /**
+     * Create an {@link EnhancedAttributeValue} for a boolean (bool) DynamoDB type.
+     *
+     * <p>
+     * Equivalent to: {@code EnhancedAttributeValue.fromGeneratedAttributeValue(AttributeValue.builder().bool(...).build())}
+     *
+     * <p>
+     * This call will fail with a {@link RuntimeException} if the provided value is null. Use {@link #nullValue()} for
+     * null values.
+     */
+    public static EnhancedAttributeValue fromBoolean(Boolean booleanValue) {
+        Validate.paramNotNull(booleanValue, "booleanValue");
+        return new InternalBuilder().booleanValue(booleanValue).build();
+    }
+
+    /**
+     * Create an {@link EnhancedAttributeValue} for a set-of-strings (ss) DynamoDB type.
+     *
+     * <p>
+     * Equivalent to: {@code EnhancedAttributeValue.fromGeneratedAttributeValue(AttributeValue.builder().ss(...).build())}
+     *
+     * <p>
+     * This call will fail with a {@link RuntimeException} if the provided value is null or contains a null value. Use
+     * {@link #fromListOfAttributeValues(List)} for null values. This <i>will not</i> validate that there are no
+     * duplicate values.
+     */
+    public static EnhancedAttributeValue fromSetOfStrings(String... setOfStringsValue) {
+        Validate.paramNotNull(setOfStringsValue, "setOfStringsValue");
+        return fromSetOfStrings(Arrays.asList(setOfStringsValue));
+    }
+
+    /**
+     * Create an {@link EnhancedAttributeValue} for a set-of-strings (ss) DynamoDB type.
+     *
+     * <p>
+     * Equivalent to: {@code EnhancedAttributeValue.fromGeneratedAttributeValue(AttributeValue.builder().ss(...).build())}
+     *
+     * <p>
+     * This call will fail with a {@link RuntimeException} if the provided value is null or contains a null value. Use
+     * {@link #fromListOfAttributeValues(List)} for null values. This <i>will not</i> validate that there are no
+     * duplicate values.
+     */
+    public static EnhancedAttributeValue fromSetOfStrings(List<String> setOfStringsValue) {
+        Validate.paramNotNull(setOfStringsValue, "setOfStringsValue");
+        Validate.noNullElements(setOfStringsValue, "Set must not have null values.");
+        return new InternalBuilder().setOfStringsValue(setOfStringsValue).build();
+    }
+
+    /**
+     * Create an {@link EnhancedAttributeValue} for a set-of-numbers (ns) DynamoDB type.
+     *
+     * <p>
+     * Equivalent to: {@code EnhancedAttributeValue.fromGeneratedAttributeValue(AttributeValue.builder().ns(...).build())}
+     *
+     * <p>
+     * This call will fail with a {@link RuntimeException} if the provided value is null or contains a null value. Use
+     * {@link #fromListOfAttributeValues(List)} for null values. This <i>will not</i> validate that there are no
+     * duplicate values.
+     */
+    public static EnhancedAttributeValue fromSetOfNumbers(String... setOfNumbersValue) {
+        Validate.paramNotNull(setOfNumbersValue, "setOfNumbersValue");
+        return fromSetOfNumbers(Arrays.asList(setOfNumbersValue));
+    }
+
+    /**
+     * Create an {@link EnhancedAttributeValue} for a set-of-numbers (ns) DynamoDB type.
+     *
+     * <p>
+     * Equivalent to: {@code EnhancedAttributeValue.fromGeneratedAttributeValue(AttributeValue.builder().ns(...).build())}
+     *
+     * <p>
+     * This call will fail with a {@link RuntimeException} if the provided value is null or contains a null value. Use
+     * {@link #fromListOfAttributeValues(List)} for null values. This <i>will not</i> validate that there are no
+     * duplicate values.
+     */
+    public static EnhancedAttributeValue fromSetOfNumbers(List<String> setOfNumbersValue) {
+        Validate.paramNotNull(setOfNumbersValue, "setOfNumbersValue");
+        Validate.noNullElements(setOfNumbersValue, "Set must not have null values.");
+        return new InternalBuilder().setOfNumbersValue(setOfNumbersValue).build();
+    }
+
+    /**
+     * Create an {@link EnhancedAttributeValue} for a set-of-bytes (bs) DynamoDB type.
+     *
+     * <p>
+     * Equivalent to: {@code EnhancedAttributeValue.fromGeneratedAttributeValue(AttributeValue.builder().bs(...).build())}
+     *
+     * <p>
+     * This call will fail with a {@link RuntimeException} if the provided value is null or contains a null value. Use
+     * {@link #fromListOfAttributeValues(List)} for null values. This <i>will not</i> validate that there are no
+     * duplicate values.
+     */
+    public static EnhancedAttributeValue fromSetOfBytes(SdkBytes... setOfBytesValue) {
+        Validate.paramNotNull(setOfBytesValue, "setOfBytesValue");
+        return fromSetOfBytes(Arrays.asList(setOfBytesValue));
+    }
+
+    /**
+     * Create an {@link EnhancedAttributeValue} for a set-of-bytes (bs) DynamoDB type.
+     *
+     * <p>
+     * Equivalent to: {@code EnhancedAttributeValue.fromGeneratedAttributeValue(AttributeValue.builder().bs(...).build())}
+     *
+     * <p>
+     * This call will fail with a {@link RuntimeException} if the provided value is null or contains a null value. Use
+     * {@link #fromListOfAttributeValues(List)} for null values. This <i>will not</i> validate that there are no
+     * duplicate values.
+     */
+    public static EnhancedAttributeValue fromSetOfBytes(List<SdkBytes> setOfBytesValue) {
+        Validate.paramNotNull(setOfBytesValue, "setOfBytesValue");
+        Validate.noNullElements(setOfBytesValue, "Set must not have null values.");
+        return new InternalBuilder().setOfBytesValue(setOfBytesValue).build();
+    }
+
+    /**
+     * Create an {@link EnhancedAttributeValue} for a list-of-attributes (l) DynamoDB type.
+     *
+     * <p>
+     * Equivalent to: {@code EnhancedAttributeValue.fromGeneratedAttributeValue(AttributeValue.builder().l(...).build())}
+     *
+     * <p>
+     * This call will fail with a {@link RuntimeException} if the provided value is null or contains a null value. Use
+     * {@link #nullValue()} for null values.
+     */
+    public static EnhancedAttributeValue fromListOfAttributeValues(AttributeValue... listOfAttributeValuesValue) {
+        Validate.paramNotNull(listOfAttributeValuesValue, "listOfAttributeValuesValue");
+        return fromListOfAttributeValues(Arrays.asList(listOfAttributeValuesValue));
+    }
+
+    /**
+     * Create an {@link EnhancedAttributeValue} for a list-of-attributes (l) DynamoDB type.
+     *
+     * <p>
+     * Equivalent to: {@code EnhancedAttributeValue.fromGeneratedAttributeValue(AttributeValue.builder().l(...).build())}
+     *
+     * <p>
+     * This call will fail with a {@link RuntimeException} if the provided value is null or contains a null value. Use
+     * {@link #nullValue()} for null values.
+     */
+    public static EnhancedAttributeValue fromListOfAttributeValues(List<AttributeValue> listOfAttributeValuesValue) {
+        Validate.paramNotNull(listOfAttributeValuesValue, "listOfAttributeValuesValue");
+        Validate.noNullElements(listOfAttributeValuesValue, "List must not have null values.");
+        return new InternalBuilder().listOfAttributeValuesValue(listOfAttributeValuesValue).build();
+    }
+
+    /**
+     * Create an {@link EnhancedAttributeValue} from a generated {@link AttributeValue}.
+     *
+     * <p>
+     * This call will fail with a {@link RuntimeException} if the provided value is null ({@link AttributeValue#nul()} is okay).
+     */
+    public static EnhancedAttributeValue fromAttributeValue(AttributeValue attributeValue) {
+        Validate.notNull(attributeValue, "Generated attribute value must not contain null values. " +
+                                         "Use AttributeValue#nul() instead.");
+        if (attributeValue.s() != null) {
+            return EnhancedAttributeValue.fromString(attributeValue.s());
+        }
+        if (attributeValue.n() != null) {
+            return EnhancedAttributeValue.fromNumber(attributeValue.n());
+        }
+        if (attributeValue.bool() != null) {
+            return EnhancedAttributeValue.fromBoolean(attributeValue.bool());
+        }
+        if (Boolean.TRUE.equals(attributeValue.nul())) {
+            return EnhancedAttributeValue.nullValue();
+        }
+        if (attributeValue.b() != null) {
+            return EnhancedAttributeValue.fromBytes(attributeValue.b());
+        }
+        if (attributeValue.hasM()) {
+            return EnhancedAttributeValue.fromMap(attributeValue.m());
+        }
+        if (attributeValue.hasL()) {
+            return EnhancedAttributeValue.fromListOfAttributeValues(attributeValue.l());
+        }
+        if (attributeValue.hasBs()) {
+            return EnhancedAttributeValue.fromSetOfBytes(attributeValue.bs());
+        }
+        if (attributeValue.hasSs()) {
+            return EnhancedAttributeValue.fromSetOfStrings(attributeValue.ss());
+        }
+        if (attributeValue.hasNs()) {
+            return EnhancedAttributeValue.fromSetOfNumbers(attributeValue.ns());
+        }
+
+        throw new IllegalStateException("Unable to convert attribute value: " + attributeValue);
+    }
+
+    /**
+     * Retrieve the underlying DynamoDB type of this value, such as String (s) or Number (n).
+     *
+     * <p>
+     * This call should never fail with an {@link Exception}.
+     */
+    public AttributeValueType type() {
+        return type;
+    }
+
+    /**
+     * Apply the provided visitor to this item attribute value, converting it into a specific type. This is useful in
+     * {@link AttributeConverter} implementations, without having to write a switch statement on the {@link #type()}.
+     *
+     * <p>
+     * Reasons this call may fail with a {@link RuntimeException}:
+     * <ol>
+     *     <li>If the provided visitor is null.</li>
+     *     <li>If the value cannot be converted by this visitor.</li>
+     * </ol>
+     */
+    public <T> T convert(TypeConvertingVisitor<T> convertingVisitor) {
+        Validate.paramNotNull(convertingVisitor, "convertingVisitor");
+        return convertingVisitor.convert(this);
+    }
+
+    /**
+     * Returns true if the underlying DynamoDB type of this value is a Map (m).
+     *
+     * <p>
+     * This call should never fail with an {@link Exception}.
+     */
+    public boolean isMap() {
+        return mapValue != null;
+    }
+
+    /**
+     * Returns true if the underlying DynamoDB type of this value is a String (s).
+     *
+     * <p>
+     * This call should never fail with an {@link Exception}.
+     */
+    public boolean isString() {
+        return stringValue != null;
+    }
+
+    /**
+     * Returns true if the underlying DynamoDB type of this value is a Number (n).
+     *
+     * <p>
+     * This call should never fail with an {@link Exception}.
+     */
+    public boolean isNumber() {
+        return numberValue != null;
+    }
+
+    /**
+     * Returns true if the underlying DynamoDB type of this value is Bytes (b).
+     *
+     * <p>
+     * This call should never fail with an {@link Exception}.
+     */
+    public boolean isBytes() {
+        return bytesValue != null;
+    }
+
+    /**
+     * Returns true if the underlying DynamoDB type of this value is a Boolean (bool).
+     *
+     * <p>
+     * This call should never fail with an {@link Exception}.
+     */
+    public boolean isBoolean() {
+        return booleanValue != null;
+    }
+
+    /**
+     * Returns true if the underlying DynamoDB type of this value is a Set of Strings (ss).
+     *
+     * <p>
+     * This call should never fail with an {@link Exception}.
+     */
+    public boolean isSetOfStrings() {
+        return setOfStringsValue != null;
+    }
+
+    /**
+     * Returns true if the underlying DynamoDB type of this value is a Set of Numbers (ns).
+     *
+     * <p>
+     * This call should never fail with an {@link Exception}.
+     */
+    public boolean isSetOfNumbers() {
+        return setOfNumbersValue != null;
+    }
+
+    /**
+     * Returns true if the underlying DynamoDB type of this value is a Set of Bytes (bs).
+     *
+     * <p>
+     * This call should never fail with an {@link Exception}.
+     */
+    public boolean isSetOfBytes() {
+        return setOfBytesValue != null;
+    }
+
+    /**
+     * Returns true if the underlying DynamoDB type of this value is a List of AttributeValues (l).
+     *
+     * <p>
+     * This call should never fail with an {@link Exception}.
+     */
+    public boolean isListOfAttributeValues() {
+        return listOfAttributeValuesValue != null;
+    }
+
+    /**
+     * Returns true if the underlying DynamoDB type of this value is Null (null).
+     *
+     * <p>
+     * This call should never fail with an {@link Exception}.
+     */
+    public boolean isNull() {
+        return isNull;
+    }
+
+    /**
+     * Retrieve this value as a map.
+     *
+     * <p>
+     * This call will fail with a {@link RuntimeException} if {@link #isMap()} is false.
+     */
+    public Map<String, AttributeValue> asMap() {
+        Validate.isTrue(isMap(), "Value is not a map.");
+        return mapValue;
+    }
+
+    /**
+     * Retrieve this value as a string.
+     *
+     * <p>
+     * This call will fail with a {@link RuntimeException} if {@link #isString()} is false.
+     */
+    public String asString() {
+        Validate.isTrue(isString(), "Value is not a string.");
+        return stringValue;
+    }
+
+    /**
+     * Retrieve this value as a number.
+     *
+     * Note: This returns a {@code String} (instead of a {@code Number}), because that's the generated type from
+     * DynamoDB: {@link AttributeValue#n()}.
+     *
+     * <p>
+     * This call will fail with a {@link RuntimeException} if {@link #isNumber()} is false.
+     */
+    public String asNumber() {
+        Validate.isTrue(isNumber(), "Value is not a number.");
+        return numberValue;
+    }
+
+    /**
+     * Retrieve this value as bytes.
+     *
+     * <p>
+     * This call will fail with a {@link RuntimeException} if {@link #isBytes()} is false.
+     */
+    public SdkBytes asBytes() {
+        Validate.isTrue(isBytes(), "Value is not bytes.");
+        return bytesValue;
+    }
+
+    /**
+     * Retrieve this value as a boolean.
+     *
+     * <p>
+     * This call will fail with a {@link RuntimeException} if {@link #isBoolean()} is false.
+     */
+    public Boolean asBoolean() {
+        Validate.isTrue(isBoolean(), "Value is not a boolean.");
+        return booleanValue;
+    }
+
+    /**
+     * Retrieve this value as a set of strings.
+     *
+     * <p>
+     * Note: This returns a {@code List} (instead of a {@code Set}), because that's the generated type from
+     * DynamoDB: {@link AttributeValue#ss()}.
+     *
+     * <p>
+     * This call will fail with a {@link RuntimeException} if {@link #isSetOfStrings()} is false.
+     */
+    public List<String> asSetOfStrings() {
+        Validate.isTrue(isSetOfStrings(), "Value is not a list of strings.");
+        return setOfStringsValue;
+    }
+
+    /**
+     * Retrieve this value as a set of numbers.
+     *
+     * <p>
+     * Note: This returns a {@code List<String>} (instead of a {@code Set<Number>}), because that's the generated type from
+     * DynamoDB: {@link AttributeValue#ns()}.
+     *
+     * <p>
+     * This call will fail with a {@link RuntimeException} if {@link #isSetOfNumbers()} is false.
+     */
+    public List<String> asSetOfNumbers() {
+        Validate.isTrue(isSetOfNumbers(), "Value is not a list of numbers.");
+        return setOfNumbersValue;
+    }
+
+    /**
+     * Retrieve this value as a set of bytes.
+     *
+     * <p>
+     * Note: This returns a {@code List} (instead of a {@code Set}), because that's the generated type from
+     * DynamoDB: {@link AttributeValue#bs()}.
+     *
+     * <p>
+     * This call will fail with a {@link RuntimeException} if {@link #isSetOfBytes()} is false.
+     */
+    public List<SdkBytes> asSetOfBytes() {
+        Validate.isTrue(isSetOfBytes(), "Value is not a list of bytes.");
+        return setOfBytesValue;
+    }
+
+    /**
+     * Retrieve this value as a list of attribute values.
+     *
+     * <p>
+     * This call will fail with a {@link RuntimeException} if {@link #isListOfAttributeValues()} is false.
+     */
+    public List<AttributeValue> asListOfAttributeValues() {
+        Validate.isTrue(isListOfAttributeValues(), "Value is not a list of attribute values.");
+        return listOfAttributeValuesValue;
+    }
+
+    /**
+     * Convert this {@link EnhancedAttributeValue} into a generated {@code Map<String, AttributeValue>}.
+     *
+     * <p>
+     * This call will fail with a {@link RuntimeException} if {@link #isMap()} is false.
+     */
+    public Map<String, AttributeValue> toAttributeValueMap() {
+        Validate.validState(isMap(), "Cannot convert an attribute value of type %s to a generated item. Must be %s.",
+                            type(), AttributeValueType.M);
+
+        AttributeValue generatedAttributeValue = toAttributeValue();
+
+        Validate.validState(generatedAttributeValue.m() != null && !(generatedAttributeValue.m() instanceof SdkAutoConstructMap),
+                            "Map EnhancedAttributeValue was not converted into a Map AttributeValue.");
+        return generatedAttributeValue.m();
+    }
+
+    /**
+     * Convert this {@link EnhancedAttributeValue} into a generated {@link AttributeValue}.
+     *
+     * <p>
+     * This call should never fail with an {@link Exception}.
+     */
+    public AttributeValue toAttributeValue() {
+        return convert(ToGeneratedAttributeValueVisitor.INSTANCE);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        EnhancedAttributeValue that = (EnhancedAttributeValue) o;
+
+        if (isNull != that.isNull) {
+            return false;
+        }
+        if (type != that.type) {
+            return false;
+        }
+        if (mapValue != null ? !mapValue.equals(that.mapValue) : that.mapValue != null) {
+            return false;
+        }
+        if (stringValue != null ? !stringValue.equals(that.stringValue) : that.stringValue != null) {
+            return false;
+        }
+        if (numberValue != null ? !numberValue.equals(that.numberValue) : that.numberValue != null) {
+            return false;
+        }
+        if (bytesValue != null ? !bytesValue.equals(that.bytesValue) : that.bytesValue != null) {
+            return false;
+        }
+        if (booleanValue != null ? !booleanValue.equals(that.booleanValue) : that.booleanValue != null) {
+            return false;
+        }
+        if (setOfStringsValue != null ? !setOfStringsValue.equals(that.setOfStringsValue) : that.setOfStringsValue != null) {
+            return false;
+        }
+        if (setOfNumbersValue != null ? !setOfNumbersValue.equals(that.setOfNumbersValue) : that.setOfNumbersValue != null) {
+            return false;
+        }
+        if (setOfBytesValue != null ? !setOfBytesValue.equals(that.setOfBytesValue) : that.setOfBytesValue != null) {
+            return false;
+        }
+        return listOfAttributeValuesValue != null ? listOfAttributeValuesValue.equals(that.listOfAttributeValuesValue)
+                                                  : that.listOfAttributeValuesValue == null;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = type.hashCode();
+        result = 31 * result + (isNull ? 1 : 0);
+        result = 31 * result + (mapValue != null ? mapValue.hashCode() : 0);
+        result = 31 * result + (stringValue != null ? stringValue.hashCode() : 0);
+        result = 31 * result + (numberValue != null ? numberValue.hashCode() : 0);
+        result = 31 * result + (bytesValue != null ? bytesValue.hashCode() : 0);
+        result = 31 * result + (booleanValue != null ? booleanValue.hashCode() : 0);
+        result = 31 * result + (setOfStringsValue != null ? setOfStringsValue.hashCode() : 0);
+        result = 31 * result + (setOfNumbersValue != null ? setOfNumbersValue.hashCode() : 0);
+        result = 31 * result + (setOfBytesValue != null ? setOfBytesValue.hashCode() : 0);
+        result = 31 * result + (listOfAttributeValuesValue != null ? listOfAttributeValuesValue.hashCode() : 0);
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        Object value = convert(ToStringVisitor.INSTANCE);
+        return ToString.builder("EnhancedAttributeValue")
+                       .add("type", type)
+                       .add("value", value)
+                       .build();
+    }
+
+    private static class ToGeneratedAttributeValueVisitor extends TypeConvertingVisitor<AttributeValue> {
+        private static final ToGeneratedAttributeValueVisitor INSTANCE = new ToGeneratedAttributeValueVisitor();
+
+        private ToGeneratedAttributeValueVisitor() {
+            super(AttributeValue.class);
+        }
+
+        @Override
+        public AttributeValue convertNull() {
+            return AttributeValue.builder().nul(true).build();
+        }
+
+        @Override
+        public AttributeValue convertMap(Map<String, AttributeValue> value) {
+            return AttributeValue.builder().m(value).build();
+        }
+
+        @Override
+        public AttributeValue convertString(String value) {
+            return AttributeValue.builder().s(value).build();
+        }
+
+        @Override
+        public AttributeValue convertNumber(String value) {
+            return AttributeValue.builder().n(value).build();
+        }
+
+        @Override
+        public AttributeValue convertBytes(SdkBytes value) {
+            return AttributeValue.builder().b(value).build();
+        }
+
+        @Override
+        public AttributeValue convertBoolean(Boolean value) {
+            return AttributeValue.builder().bool(value).build();
+        }
+
+        @Override
+        public AttributeValue convertSetOfStrings(List<String> value) {
+            return AttributeValue.builder().ss(value).build();
+        }
+
+        @Override
+        public AttributeValue convertSetOfNumbers(List<String> value) {
+            return AttributeValue.builder().ns(value).build();
+        }
+
+        @Override
+        public AttributeValue convertSetOfBytes(List<SdkBytes> value) {
+            return AttributeValue.builder().bs(value).build();
+        }
+
+        @Override
+        public AttributeValue convertListOfAttributeValues(List<AttributeValue> value) {
+            return AttributeValue.builder().l(value).build();
+        }
+    }
+
+    private static class ToStringVisitor extends TypeConvertingVisitor<Object> {
+        private static final ToStringVisitor INSTANCE = new ToStringVisitor();
+
+        private ToStringVisitor() {
+            super(Object.class);
+        }
+
+        @Override
+        public Object convertNull() {
+            return "null";
+        }
+
+        @Override
+        public Object defaultConvert(AttributeValueType type, Object value) {
+            return value;
+        }
+    }
+
+    private static class InternalBuilder {
+        private AttributeValueType type;
+        private boolean isNull = false;
+        private Map<String, AttributeValue> mapValue;
+        private String stringValue;
+        private String numberValue;
+        private SdkBytes bytesValue;
+        private Boolean booleanValue;
+        private List<String> setOfStringsValue;
+        private List<String> setOfNumbersValue;
+        private List<SdkBytes> setOfBytesValue;
+        private List<AttributeValue> listOfAttributeValuesValue;
+
+        public InternalBuilder isNull() {
+            this.type = AttributeValueType.NULL;
+            this.isNull = true;
+            return this;
+        }
+
+        private InternalBuilder mapValue(Map<String, AttributeValue> mapValue) {
+            this.type = AttributeValueType.M;
+            this.mapValue = mapValue;
+            return this;
+        }
+
+        private InternalBuilder stringValue(String stringValue) {
+            this.type = AttributeValueType.S;
+            this.stringValue = stringValue;
+            return this;
+        }
+
+        private InternalBuilder numberValue(String numberValue) {
+            this.type = AttributeValueType.N;
+            this.numberValue = numberValue;
+            return this;
+        }
+
+        private InternalBuilder bytesValue(SdkBytes bytesValue) {
+            this.type = AttributeValueType.B;
+            this.bytesValue = bytesValue;
+            return this;
+        }
+
+        private InternalBuilder booleanValue(Boolean booleanValue) {
+            this.type = AttributeValueType.BOOL;
+            this.booleanValue = booleanValue;
+            return this;
+        }
+
+        private InternalBuilder setOfStringsValue(List<String> setOfStringsValue) {
+            this.type = AttributeValueType.SS;
+            this.setOfStringsValue = setOfStringsValue;
+            return this;
+        }
+
+        private InternalBuilder setOfNumbersValue(List<String> setOfNumbersValue) {
+            this.type = AttributeValueType.NS;
+            this.setOfNumbersValue = setOfNumbersValue;
+            return this;
+        }
+
+        private InternalBuilder setOfBytesValue(List<SdkBytes> setOfBytesValue) {
+            this.type = AttributeValueType.BS;
+            this.setOfBytesValue = setOfBytesValue;
+            return this;
+        }
+
+        private InternalBuilder listOfAttributeValuesValue(List<AttributeValue> listOfAttributeValuesValue) {
+            this.type = AttributeValueType.L;
+            this.listOfAttributeValuesValue = listOfAttributeValuesValue;
+            return this;
+        }
+
+        private EnhancedAttributeValue build() {
+            return new EnhancedAttributeValue(this);
+        }
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/EnumAttributeConverter.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/EnumAttributeConverter.java
new file mode 100644
index 000000000000..1404a2bffa54
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/EnumAttributeConverter.java
@@ -0,0 +1,85 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeValueType;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+import software.amazon.awssdk.utils.Validate;
+
+/**
+ * A converter between an {@link Enum} and {@link AttributeValue}.
+ *
+ * <p>
+ * This stores values in DynamoDB as a string.
+ *
+ * <p>
+ * This can be created via {@link #create(Class<T>)}.
+ */
+@SdkInternalApi
+public class EnumAttributeConverter<T extends Enum<T>> implements AttributeConverter<T> {
+
+    private final Class<T> enumClass;
+    private final Map<String, T> enumValueMap;
+
+    private EnumAttributeConverter(Class<T> enumClass) {
+        this.enumClass = enumClass;
+
+        Map<String, T> mutableEnumValueMap = new LinkedHashMap<>();
+        Arrays.stream(enumClass.getEnumConstants())
+              .forEach(enumConstant -> mutableEnumValueMap.put(enumConstant.toString(), enumConstant));
+
+        this.enumValueMap = Collections.unmodifiableMap(mutableEnumValueMap);
+    }
+
+    public static <T extends Enum<T>> EnumAttributeConverter<T> create(Class<T> enumClass) {
+        return new EnumAttributeConverter<>(enumClass);
+    }
+
+    @Override
+    public AttributeValue transformFrom(T input) {
+        return AttributeValue.builder().s(input.toString()).build();
+    }
+
+    @Override
+    public T transformTo(AttributeValue input) {
+        Validate.isTrue(input.s() != null, "Cannot convert non-string value to enum.");
+        T returnValue = enumValueMap.get(input.s());
+
+        if (returnValue == null) {
+            throw new IllegalArgumentException(String.format("Unable to convert string value '%s' to enum type '%s'",
+                                                             input.s(), enumClass));
+        }
+
+        return returnValue;
+    }
+
+    @Override
+    public EnhancedType<T> type() {
+        return EnhancedType.of(enumClass);
+    }
+
+    @Override
+    public AttributeValueType attributeValueType() {
+        return AttributeValueType.S;
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/FloatAttributeConverter.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/FloatAttributeConverter.java
new file mode 100644
index 000000000000..ab83f06d2d7f
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/FloatAttributeConverter.java
@@ -0,0 +1,111 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute;
+
+import software.amazon.awssdk.annotations.Immutable;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeValueType;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.ConverterUtils;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.PrimitiveConverter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.TypeConvertingVisitor;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.string.FloatStringConverter;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+
+/**
+ * A converter between {@link Float} and {@link AttributeValue}.
+ *
+ * <p>
+ * This stores values in DynamoDB as a number.
+ *
+ * <p>
+ * This supports converting numbers stored in DynamoDB into a single-precision floating point number, within the range
+ * {@link Float#MIN_VALUE}, {@link Float#MAX_VALUE}. For more precision or larger values, consider using
+ * {@link DoubleAttributeConverter} or {@link BigDecimalAttributeConverter}.
+ *
+ * <p>
+ * If values are known to be whole numbers, it is recommended to use a perfect-precision whole number representation like those
+ * provided by {@link ShortAttributeConverter}, {@link IntegerAttributeConverter} or {@link BigIntegerAttributeConverter}.
+ *
+ * <p>
+ * This can be created via {@link #create()}.
+ */
+@SdkInternalApi
+@ThreadSafe
+@Immutable
+public final class FloatAttributeConverter implements AttributeConverter<Float>, PrimitiveConverter<Float> {
+    private static final Visitor VISITOR = new Visitor();
+    private static final FloatStringConverter STRING_CONVERTER = FloatStringConverter.create();
+
+    private FloatAttributeConverter() {
+    }
+
+    public static FloatAttributeConverter create() {
+        return new FloatAttributeConverter();
+    }
+
+    @Override
+    public EnhancedType<Float> type() {
+        return EnhancedType.of(Float.class);
+    }
+
+    @Override
+    public AttributeValueType attributeValueType() {
+        return AttributeValueType.N;
+    }
+
+    @Override
+    public AttributeValue transformFrom(Float input) {
+        ConverterUtils.validateFloat(input);
+        return AttributeValue.builder().n(STRING_CONVERTER.toString(input)).build();
+    }
+
+    @Override
+    public Float transformTo(AttributeValue input) {
+        Float result;
+        if (input.n() != null) {
+            result = EnhancedAttributeValue.fromNumber(input.n()).convert(VISITOR);
+        } else {
+            result = EnhancedAttributeValue.fromAttributeValue(input).convert(VISITOR);
+        }
+
+        ConverterUtils.validateFloat(result);
+        return result;
+    }
+
+    @Override
+    public EnhancedType<Float> primitiveType() {
+        return EnhancedType.of(float.class);
+    }
+
+    private static final class Visitor extends TypeConvertingVisitor<Float> {
+        private Visitor() {
+            super(Float.class, FloatAttributeConverter.class);
+        }
+
+        @Override
+        public Float convertString(String value) {
+            return STRING_CONVERTER.fromString(value);
+        }
+
+        @Override
+        public Float convertNumber(String value) {
+            return STRING_CONVERTER.fromString(value);
+        }
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/InstantAsIntegerAttributeConverter.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/InstantAsIntegerAttributeConverter.java
new file mode 100644
index 000000000000..8e374ef48b87
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/InstantAsIntegerAttributeConverter.java
@@ -0,0 +1,92 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute;
+
+import java.time.Instant;
+import software.amazon.awssdk.annotations.Immutable;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeValueType;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.TimeConversion;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+
+/**
+ * A converter between {@link Instant} and {@link AttributeValue}.
+ *
+ * <p>
+ * This stores values in DynamoDB as a number, so that they can be sorted numerically as part of a sort key.
+ *
+ * <p>
+ * Instants are stored in the format "[-]X[.Y]", where X is the number of seconds past the epoch of 1970-01-01T00:00:00Z
+ * in this instant, and Y is the fraction of seconds, up to the nanosecond precision (Y is at most 9 characters long).
+ *
+ * <p>
+ * Examples:
+ * <ul>
+ *     <li>{@code Instant.EPOCH.plusSeconds(1)} is stored as {@code ItemAttributeValueMapper.fromNumber("1")}</li>
+ *     <li>{@code Instant.EPOCH.minusSeconds(1)} is stored as {@code ItemAttributeValueMapper.fromNumber("-1")}</li>
+ *     <li>{@code Instant.EPOCH.plusMillis(1)} is stored as {@code ItemAttributeValueMapper.fromNumber("0.001")}</li>
+ *     <li>{@code Instant.EPOCH.minusMillis(1)} is stored as {@code ItemAttributeValueMapper.fromNumber("-0.001")}</li>
+ *     <li>{@code Instant.EPOCH.plusNanos(1)} is stored as {@code ItemAttributeValueMapper.fromNumber("0.000000001")}</li>
+ *     <li>{@code Instant.EPOCH.minusNanos(1)} is stored as {@code ItemAttributeValueMapper.fromNumber("-0.000000001")}</li>
+ * </ul>
+ *
+ * <p>
+ * This converter can read any values written by itself, {@link InstantAsStringAttributeConverter},
+ * {@link OffsetDateTimeAsStringAttributeConverter} or {@link ZonedDateTimeAsStringAttributeConverter}. Offset and zoned times
+ * will be automatically converted to the equivalent {@code Instant} based on the time zone information in the record (e.g.
+ * {@code ItemAttributeValueMapper.fromString("1970-01-01T00:00:00+01:00")} will be converted to
+ * {@code Instant.EPOCH.minus(1, ChronoUnit.HOURS)}).
+ *
+ * <p>
+ * This can be created via {@link #create()}.
+ */
+@SdkInternalApi
+@ThreadSafe
+@Immutable
+public final class InstantAsIntegerAttributeConverter implements AttributeConverter<Instant> {
+    private InstantAsIntegerAttributeConverter() {
+    }
+
+    public static InstantAsIntegerAttributeConverter create() {
+        return new InstantAsIntegerAttributeConverter();
+    }
+
+    @Override
+    public EnhancedType<Instant> type() {
+        return EnhancedType.of(Instant.class);
+    }
+
+    @Override
+    public AttributeValueType attributeValueType() {
+        return AttributeValueType.N;
+    }
+
+    @Override
+    public AttributeValue transformFrom(Instant input) {
+        return TimeConversion.toIntegerAttributeValue(input);
+    }
+
+    @Override
+    public Instant transformTo(AttributeValue input) {
+        if (input.n() != null) {
+            return TimeConversion.instantFromAttributeValue(EnhancedAttributeValue.fromNumber(input.n()));
+        }
+        return TimeConversion.instantFromAttributeValue(EnhancedAttributeValue.fromAttributeValue(input));
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/InstantAsStringAttributeConverter.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/InstantAsStringAttributeConverter.java
new file mode 100644
index 000000000000..74df38a11665
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/InstantAsStringAttributeConverter.java
@@ -0,0 +1,95 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute;
+
+import java.time.Instant;
+import software.amazon.awssdk.annotations.Immutable;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeValueType;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.TimeConversion;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+
+/**
+ * A converter between {@link Instant} and {@link AttributeValue}.
+ *
+ * <p>
+ * This stores values in DynamoDB as a string. If a number is desired (for sorting purposes), use
+ * {@link InstantAsIntegerAttributeConverter} instead.
+ *
+ * <p>
+ * Values are stored in ISO-8601 format, with nanosecond precision and a time zone of UTC.
+ *
+ * <p>
+ * Examples:
+ * <ul>
+ *     <li>{@code Instant.EPOCH.plusSeconds(1)} is stored as
+ *     {@code ItemAttributeValueMapper.fromString("1970-01-01T00:00:01Z")}</li>
+ *     <li>{@code Instant.EPOCH.minusSeconds(1)} is stored as
+ *     {@code ItemAttributeValueMapper.fromString("1969-12-31T23:59:59Z")}</li>
+ *     <li>{@code Instant.EPOCH.plusMillis(1)} is stored as
+ *     {@code ItemAttributeValueMapper.fromString("1970-01-01T00:00:00.001Z")}</li>
+ *     <li>{@code Instant.EPOCH.minusMillis(1)} is stored as
+ *     {@code ItemAttributeValueMapper.fromString("1969-12-31T23:59:59.999Z")}</li>
+ *     <li>{@code Instant.EPOCH.plusNanos(1)} is stored as
+ *     {@code ItemAttributeValueMapper.fromString("1970-01-01T00:00:00.000000001Z")}</li>
+ *     <li>{@code Instant.EPOCH.minusNanos(1)} is stored as
+ *     {@code ItemAttributeValueMapper.fromString("1969-12-31T23:59:59.999999999Z")}</li>
+ * </ul>
+ *
+ * <p>
+ * This converter can read any values written by itself, {@link InstantAsIntegerAttributeConverter},
+ * {@link OffsetDateTimeAsStringAttributeConverter} or {@link ZonedDateTimeAsStringAttributeConverter}. Offset and zoned times
+ * will be automatically converted to the equivalent {@code Instant} based on the time zone information in the record (e.g.
+ * {@code ItemAttributeValueMapper.fromString("1970-01-01T00:00:00+01:00")} will be converted to
+ * {@code Instant.EPOCH.minus(1, ChronoUnit.HOURS)}).
+ *
+ * <p>
+ * This can be created via {@link #create()}.
+ */
+@SdkInternalApi
+@ThreadSafe
+@Immutable
+public final class InstantAsStringAttributeConverter implements AttributeConverter<Instant> {
+    private InstantAsStringAttributeConverter() {
+    }
+
+    public static InstantAsStringAttributeConverter create() {
+        return new InstantAsStringAttributeConverter();
+    }
+
+    @Override
+    public EnhancedType<Instant> type() {
+        return EnhancedType.of(Instant.class);
+    }
+
+    @Override
+    public AttributeValueType attributeValueType() {
+        return AttributeValueType.S;
+    }
+
+    @Override
+    public AttributeValue transformFrom(Instant input) {
+        return TimeConversion.toStringAttributeValue(input);
+    }
+
+    @Override
+    public Instant transformTo(AttributeValue input) {
+        return TimeConversion.instantFromAttributeValue(EnhancedAttributeValue.fromAttributeValue(input));
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/IntegerAttributeConverter.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/IntegerAttributeConverter.java
new file mode 100644
index 000000000000..6b1ffd0247db
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/IntegerAttributeConverter.java
@@ -0,0 +1,106 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute;
+
+import java.time.Instant;
+import software.amazon.awssdk.annotations.Immutable;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeValueType;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.PrimitiveConverter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.TypeConvertingVisitor;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.string.IntegerStringConverter;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+
+/**
+ * A converter between {@link Integer} and {@link AttributeValue}.
+ *
+ * <p>
+ * This stores values in DynamoDB as a number.
+ *
+ * <p>
+ * This supports reading numbers between {@link Integer#MIN_VALUE} and {@link Integer#MAX_VALUE} from DynamoDB. For smaller
+ * numbers, consider using {@link ShortAttributeConverter}. For larger numbers, consider using {@link LongAttributeConverter}
+ * or {@link BigIntegerAttributeConverter}. Numbers outside of the supported range will cause a {@link NumberFormatException}
+ * on conversion.
+ *
+ * <p>
+ * This does not support reading decimal numbers. For decimal numbers, consider using {@link FloatAttributeConverter},
+ * {@link DoubleAttributeConverter} or {@link BigDecimalAttributeConverter}. Decimal numbers will cause a
+ * {@link NumberFormatException} on conversion.
+ */
+@SdkInternalApi
+@ThreadSafe
+@Immutable
+public final class IntegerAttributeConverter implements AttributeConverter<Integer>, PrimitiveConverter<Integer> {
+    public static final IntegerStringConverter INTEGER_STRING_CONVERTER = IntegerStringConverter.create();
+
+    private IntegerAttributeConverter() {
+    }
+
+    public static IntegerAttributeConverter create() {
+        return new IntegerAttributeConverter();
+    }
+
+    @Override
+    public EnhancedType<Integer> type() {
+        return EnhancedType.of(Integer.class);
+    }
+
+    @Override
+    public AttributeValueType attributeValueType() {
+        return AttributeValueType.N;
+    }
+
+    @Override
+    public AttributeValue transformFrom(Integer input) {
+        return AttributeValue.builder().n(INTEGER_STRING_CONVERTER.toString(input)).build();
+    }
+
+    @Override
+    public Integer transformTo(AttributeValue input) {
+        if (input.n() != null) {
+            return EnhancedAttributeValue.fromNumber(input.n()).convert(Visitor.INSTANCE);
+        }
+
+        return EnhancedAttributeValue.fromAttributeValue(input).convert(Visitor.INSTANCE);
+    }
+
+    @Override
+    public EnhancedType<Integer> primitiveType() {
+        return EnhancedType.of(int.class);
+    }
+
+    private static final class Visitor extends TypeConvertingVisitor<Integer> {
+        private static final Visitor INSTANCE = new Visitor();
+
+        private Visitor() {
+            super(Instant.class, IntegerAttributeConverter.class);
+        }
+
+        @Override
+        public Integer convertString(String value) {
+            return INTEGER_STRING_CONVERTER.fromString(value);
+        }
+
+        @Override
+        public Integer convertNumber(String value) {
+            return INTEGER_STRING_CONVERTER.fromString(value);
+        }
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/ListAttributeConverter.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/ListAttributeConverter.java
new file mode 100644
index 000000000000..e0fa10c98b28
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/ListAttributeConverter.java
@@ -0,0 +1,208 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute;
+
+import static java.util.stream.Collectors.toList;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.function.Function;
+import java.util.function.Supplier;
+import software.amazon.awssdk.annotations.Immutable;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.core.SdkBytes;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeValueType;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.TypeConvertingVisitor;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+
+/**
+ * A converter between a specific {@link Collection} type and {@link EnhancedAttributeValue}.
+ *
+ * <p>
+ * This stores values in DynamoDB as a list of attribute values. This uses a configured {@link AttributeConverter} to convert
+ * the collection contents to an attribute value.
+ *
+ * <p>
+ * This supports reading a list of attribute values. This uses a configured {@link AttributeConverter} to convert
+ * the collection contents.
+ *
+ * <p>
+ * A builder is exposed to allow defining how the collection and element types are created and converted:
+ * <code>
+ * AttributeConverter<List<Integer>> listConverter =
+ * CollectionAttributeConverter.builder(EnhancedType.listOf(Integer.class))
+ * .collectionConstructor(ArrayList::new)
+ * .elementConverter(IntegerAttributeConverter.create())
+ * .build()
+ * </code>
+ *
+ * <p>
+ * For frequently-used types, static methods are exposed to reduce the amount of boilerplate involved in creation:
+ * <code>
+ * AttributeConverter<List<Integer>> listConverter =
+ * CollectionAttributeConverter.listConverter(IntegerAttributeConverter.create());
+ * <p>
+ * AttributeConverter<Collection<Integer>> collectionConverer =
+ * CollectionAttributeConverter.collectionConverter(IntegerAttributeConverter.create());
+ * <p>
+ * AttributeConverter<Set<Integer>> setConverter =
+ * CollectionAttributeConverter.setConverter(IntegerAttributeConverter.create());
+ * <p>
+ * AttributeConverter<SortedSet<Integer>> sortedSetConverter =
+ * CollectionAttributeConverter.sortedSetConverter(IntegerAttributeConverter.create());
+ * </code>
+ *
+ * @see MapAttributeConverter
+ */
+@SdkInternalApi
+@ThreadSafe
+@Immutable
+public class ListAttributeConverter<T extends Collection<?>> implements AttributeConverter<T> {
+    private final Delegate<T, ?> delegate;
+
+    private ListAttributeConverter(Delegate<T, ?> delegate) {
+        this.delegate = delegate;
+    }
+
+    public static <U> ListAttributeConverter<List<U>> create(AttributeConverter<U> elementConverter) {
+        return builder(EnhancedType.listOf(elementConverter.type()))
+            .collectionConstructor(ArrayList::new)
+            .elementConverter(elementConverter)
+            .build();
+    }
+
+    public static <T extends Collection<U>, U> ListAttributeConverter.Builder<T, U> builder(EnhancedType<T> collectionType) {
+        return new Builder<>(collectionType);
+    }
+
+    @Override
+    public EnhancedType<T> type() {
+        return delegate.type();
+    }
+
+    @Override
+    public AttributeValueType attributeValueType() {
+        return AttributeValueType.L;
+    }
+
+    @Override
+    public AttributeValue transformFrom(T input) {
+        return delegate.transformFrom(input);
+    }
+
+    @Override
+    public T transformTo(AttributeValue input) {
+        return delegate.transformTo(input);
+    }
+
+    private static final class Delegate<T extends Collection<U>, U> implements AttributeConverter<T> {
+        private final EnhancedType<T> type;
+        private final Supplier<? extends T> collectionConstructor;
+        private final AttributeConverter<U> elementConverter;
+
+        private Delegate(Builder<T, U> builder) {
+            this.type = builder.collectionType;
+            this.collectionConstructor = builder.collectionConstructor;
+            this.elementConverter = builder.elementConverter;
+        }
+
+        @Override
+        public EnhancedType<T> type() {
+            return type;
+        }
+
+        @Override
+        public AttributeValueType attributeValueType() {
+            return AttributeValueType.L;
+        }
+
+        @Override
+        public AttributeValue transformFrom(T input) {
+            return EnhancedAttributeValue.fromListOfAttributeValues(input.stream()
+                                                                         .map(elementConverter::transformFrom)
+                                                                         .collect(toList()))
+                                         .toAttributeValue();
+        }
+
+        @Override
+        public T transformTo(AttributeValue input) {
+            return EnhancedAttributeValue.fromAttributeValue(input)
+                                         .convert(new TypeConvertingVisitor<T>(type.rawClass(), ListAttributeConverter.class) {
+                                             @Override
+                                             public T convertSetOfStrings(List<String> value) {
+                                                 return convertCollection(value, v -> AttributeValue.builder().s(v).build());
+                                             }
+
+                                             @Override
+                                             public T convertSetOfNumbers(List<String> value) {
+                                                 return convertCollection(value, v -> AttributeValue.builder().n(v).build());
+                                             }
+
+                                             @Override
+                                             public T convertSetOfBytes(List<SdkBytes> value) {
+                                                 return convertCollection(value, v -> AttributeValue.builder().b(v).build());
+                                             }
+
+                                             @Override
+                                             public T convertListOfAttributeValues(List<AttributeValue> value) {
+                                                 return convertCollection(value, Function.identity());
+                                             }
+
+                                             private <V> T convertCollection(Collection<V> collection,
+                                                                             Function<V, AttributeValue> transformFrom) {
+                                                 Collection<Object> result = (Collection<Object>) collectionConstructor.get();
+
+                                                 collection.stream()
+                                                           .map(transformFrom)
+                                                           .map(elementConverter::transformTo)
+                                                           .forEach(result::add);
+
+                                                 // This is a safe cast - We know the values we added to the list
+                                                 // match the type that the customer requested.
+                                                 return (T) result;
+                                             }
+                                         });
+        }
+    }
+
+    public static final class Builder<T extends Collection<U>, U> {
+        private final EnhancedType<T> collectionType;
+        private Supplier<? extends T> collectionConstructor;
+        private AttributeConverter<U> elementConverter;
+
+        private Builder(EnhancedType<T> collectionType) {
+            this.collectionType = collectionType;
+        }
+
+        public Builder<T, U> collectionConstructor(Supplier<? extends T> collectionConstructor) {
+            this.collectionConstructor = collectionConstructor;
+            return this;
+        }
+
+        public Builder<T, U> elementConverter(AttributeConverter<U> elementConverter) {
+            this.elementConverter = elementConverter;
+            return this;
+        }
+
+        public ListAttributeConverter<T> build() {
+            return new ListAttributeConverter<>(new Delegate<>(this));
+        }
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/LocalDateAttributeConverter.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/LocalDateAttributeConverter.java
new file mode 100644
index 000000000000..49a5dc37381e
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/LocalDateAttributeConverter.java
@@ -0,0 +1,92 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.Year;
+import software.amazon.awssdk.annotations.Immutable;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeValueType;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+
+/**
+ * A converter between {@link LocalDate} and {@link AttributeValue}.
+ *
+ * <p>
+ * This stores and reads values in DynamoDB as a number, so that they can be sorted numerically as part of a sort key.
+ *
+ * <p>
+ * LocalDateTimes are stored in the format "[-]YYYYMMDD000000", where:
+ * <ol>
+ *     <li>Y is a year between {@link Year#MIN_VALUE} and {@link Year#MAX_VALUE} (prefixed with - if it is negative)</li>
+ *     <li>M is a 2-character, zero-prefixed month between 01 and 12</li>
+ *     <li>D is a 2-character, zero-prefixed day between 01 and 31</li>
+ *     <li>0 is a 6-character padding allowing for support with {@link LocalDateTimeAttributeConverter}.</li>
+ * </ol>
+ *
+ * <p>
+ * This is format-compatible with the {@link LocalDateTimeAttributeConverter}, allowing values stored as {@link LocalDate} to be
+ * retrieved as {@link LocalDateTime}s and vice-versa. The time associated with a value stored as a {@link LocalDate} is the
+ * beginning of the day (midnight).
+ *
+ * <p>
+ * Examples:
+ * <ul>
+ *     <li>{@code LocalDate.of(1988, 5, 21)} is stored as {@code ItemAttributeValueMapper.fromNumber("19880521000000")}</li>
+ *     <li>{@code LocalDateTime.of(-1988, 5, 21)} is stored as {@code ItemAttributeValueMapper.fromNumber("-19880521000000")}</li>
+ * </ul>
+ *
+ * <p>
+ * This can be created via {@link #create()}.
+ */
+@SdkInternalApi
+@ThreadSafe
+@Immutable
+public final class LocalDateAttributeConverter implements AttributeConverter<LocalDate> {
+    private static final LocalDateTimeAttributeConverter LOCAL_DATE_TIME_ATTRIBUTE_CONVERTER =
+        LocalDateTimeAttributeConverter.create();
+
+    private LocalDateAttributeConverter() {
+    }
+
+    public static LocalDateAttributeConverter create() {
+        return new LocalDateAttributeConverter();
+    }
+
+    @Override
+    public EnhancedType<LocalDate> type() {
+        return EnhancedType.of(LocalDate.class);
+    }
+
+    @Override
+    public AttributeValueType attributeValueType() {
+        return AttributeValueType.N;
+    }
+
+    @Override
+    public AttributeValue transformFrom(LocalDate input) {
+        return LOCAL_DATE_TIME_ATTRIBUTE_CONVERTER.transformFrom(input.atStartOfDay());
+    }
+
+    @Override
+    public LocalDate transformTo(AttributeValue input) {
+        return LOCAL_DATE_TIME_ATTRIBUTE_CONVERTER.transformTo(input).toLocalDate();
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/LocalDateTimeAttributeConverter.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/LocalDateTimeAttributeConverter.java
new file mode 100644
index 000000000000..c226d73f1ee4
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/LocalDateTimeAttributeConverter.java
@@ -0,0 +1,140 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute;
+
+import static software.amazon.awssdk.enhanced.dynamodb.internal.converter.ConverterUtils.padLeft;
+import static software.amazon.awssdk.enhanced.dynamodb.internal.converter.ConverterUtils.padLeft2;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.Year;
+import software.amazon.awssdk.annotations.Immutable;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeValueType;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.ConverterUtils;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.TypeConvertingVisitor;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+
+/**
+ * A converter between {@link LocalDateTime} and {@link AttributeValue}.
+ *
+ * <p>
+ * This stores and reads values in DynamoDB as a number, so that they can be sorted numerically as part of a sort key.
+ *
+ * <p>
+ * LocalDateTimes are stored in the format "[-]YYYYMMDDHHIISS[.NNNNNNNNN]", where:
+ * <ol>
+ *     <li>Y is a year between {@link Year#MIN_VALUE} and {@link Year#MAX_VALUE} (prefixed with - if it is negative)</li>
+ *     <li>M is a 2-character, zero-prefixed month between 01 and 12</li>
+ *     <li>D is a 2-character, zero-prefixed day between 01 and 31</li>
+ *     <li>H is a 2-character, zero-prefixed hour between 00 and 23</li>
+ *     <li>I is a 2-character, zero-prefixed minute between 00 and 59</li>
+ *     <li>S is a 2-character, zero-prefixed second between 00 and 59</li>
+ *     <li>N is a 9-character, zero-prefixed nanosecond between 000,000,000 and 999,999,999.
+ *     The . and N may be excluded if N is 0.</li>
+ * </ol>
+ *
+ * <p>
+ * This is format-compatible with the {@link LocalDateAttributeConverter}, allowing values stored as {@link LocalDate} to be
+ * retrieved as {@link LocalDateTime}s and vice-versa. The time associated with a value stored as a {@link LocalDate} is the
+ * beginning of the day (midnight).
+ *
+ * <p>
+ * Examples:
+ * <ul>
+ *     <li>{@code LocalDateTime.of(1988, 5, 21, 0, 0, 0)} is stored as
+ *     {@code ItemAttributeValueMapper.fromNumber("19880521000000")}</li>
+ *     <li>{@code LocalDateTime.of(-1988, 5, 21, 0, 0, 0)} is stored as
+ *     {@code ItemAttributeValueMapper.fromNumber("-19880521000000")}</li>
+ *     <li>{@code LocalDateTime.of(1988, 5, 21, 0, 0, 0).plusSeconds(1)} is stored as
+ *     {@code ItemAttributeValueMapper.fromNumber("19880521000001")}</li>
+ *     <li>{@code LocalDateTime.of(1988, 5, 21, 0, 0, 0).minusSeconds(1)} is stored as
+ *     {@code ItemAttributeValueMapper.fromNumber("19880520235959")}</li>
+ *     <li>{@code LocalDateTime.of(1988, 5, 21, 0, 0, 0).plusNanos(1)} is stored as
+ *     {@code ItemAttributeValueMapper.fromNumber("19880521000000.0000000001")}</li>
+ *     <li>{@code LocalDateTime.of(1988, 5, 21, 0, 0, 0).minusNanos(1)} is stored as
+ *     {@code ItemAttributeValueMapper.fromNumber("19880520235959.999999999")}</li>
+ * </ul>
+ *
+ * <p>
+ * This can be created via {@link #create()}.
+ */
+@SdkInternalApi
+@ThreadSafe
+@Immutable
+public final class LocalDateTimeAttributeConverter implements AttributeConverter<LocalDateTime> {
+    private static final Visitor VISITOR = new Visitor();
+
+    public static LocalDateTimeAttributeConverter create() {
+        return new LocalDateTimeAttributeConverter();
+    }
+
+    @Override
+    public EnhancedType<LocalDateTime> type() {
+        return EnhancedType.of(LocalDateTime.class);
+    }
+
+    @Override
+    public AttributeValueType attributeValueType() {
+        return AttributeValueType.N;
+    }
+
+    @Override
+    public AttributeValue transformFrom(LocalDateTime input) {
+        String value = "" +
+                       input.getYear() +
+                       padLeft2(input.getMonthValue()) +
+                       padLeft2(input.getDayOfMonth()) +
+                       padLeft2(input.getHour()) +
+                       padLeft2(input.getMinute()) +
+                       padLeft2(input.getSecond()) +
+                       (input.getNano() == 0 ? "" : "." + padLeft(9, input.getNano()));
+        return AttributeValue.builder().n(value).build();
+    }
+
+    @Override
+    public LocalDateTime transformTo(AttributeValue input) {
+        if (input.n() != null) {
+            return EnhancedAttributeValue.fromNumber(input.n()).convert(VISITOR);
+        }
+
+        return EnhancedAttributeValue.fromAttributeValue(input).convert(VISITOR);
+    }
+
+    private static final class Visitor extends TypeConvertingVisitor<LocalDateTime> {
+        private Visitor() {
+            super(LocalDateTime.class, InstantAsIntegerAttributeConverter.class);
+        }
+
+        @Override
+        public LocalDateTime convertNumber(String value) {
+            String[] splitOnDecimal = ConverterUtils.splitNumberOnDecimal(value);
+            String[] chunkedDateTime = ConverterUtils.chunkWithLeftOverflow(splitOnDecimal[0], 2, 2, 2, 2, 2);
+
+            int year = Integer.parseInt(chunkedDateTime[0]);
+            return LocalDateTime.of(year,
+                                    Integer.parseInt(chunkedDateTime[1]),
+                                    Integer.parseInt(chunkedDateTime[2]),
+                                    Integer.parseInt(chunkedDateTime[3]),
+                                    Integer.parseInt(chunkedDateTime[4]),
+                                    Integer.parseInt(chunkedDateTime[5]),
+                                    Integer.parseInt(splitOnDecimal[1]));
+        }
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/LocalTimeAttributeConverter.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/LocalTimeAttributeConverter.java
new file mode 100644
index 000000000000..6678e5265160
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/LocalTimeAttributeConverter.java
@@ -0,0 +1,121 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute;
+
+import static software.amazon.awssdk.enhanced.dynamodb.internal.converter.ConverterUtils.padLeft;
+import static software.amazon.awssdk.enhanced.dynamodb.internal.converter.ConverterUtils.padLeft2;
+
+import java.time.DateTimeException;
+import java.time.LocalTime;
+import software.amazon.awssdk.annotations.Immutable;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeValueType;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.ConverterUtils;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.TypeConvertingVisitor;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+
+/**
+ * A converter between {@link LocalTime} and {@link AttributeValue}.
+ *
+ * <p>
+ * This stores and reads values in DynamoDB as a number, so that they can be sorted numerically as part of a sort key.
+ *
+ * <p>
+ * LocalTimes are stored in the format "HHIISS[.NNNNNNNNN]", where:
+ * <ol>
+ *     <li>H is a 2-character, zero-prefixed hour between 00 and 23</li>
+ *     <li>I is a 2-character, zero-prefixed minute between 00 and 59</li>
+ *     <li>S is a 2-character, zero-prefixed second between 00 and 59</li>
+ *     <li>N is a 9-character, zero-prefixed nanosecond between 000,000,000 and 999,999,999.
+ *     The . and N may be excluded if N is 0.</li>
+ * </ol>
+ *
+ * <p>
+ * Examples:
+ * <ul>
+ *     <li>{@code LocalTime.of(5, 30, 0)} is stored as {@code ItemAttributeValueMapper.fromNumber("053000")}</li>
+ *     <li>{@code LocalDateTime.of(5, 30, 0, 1)} is stored as {@code ItemAttributeValueMapper.fromNumber("053000.000000001")}</li>
+ * </ul>
+ *
+ * <p>
+ * This can be created via {@link #create()}.
+ */
+@SdkInternalApi
+@ThreadSafe
+@Immutable
+public final class LocalTimeAttributeConverter implements AttributeConverter<LocalTime> {
+    private static final Visitor VISITOR = new Visitor();
+
+    private LocalTimeAttributeConverter() {
+    }
+
+    public static LocalTimeAttributeConverter create() {
+        return new LocalTimeAttributeConverter();
+    }
+
+    @Override
+    public EnhancedType<LocalTime> type() {
+        return EnhancedType.of(LocalTime.class);
+    }
+
+    @Override
+    public AttributeValueType attributeValueType() {
+        return AttributeValueType.N;
+    }
+
+    @Override
+    public AttributeValue transformFrom(LocalTime input) {
+        String value = "" +
+                       padLeft2(input.getHour()) +
+                       padLeft2(input.getMinute()) +
+                       padLeft2(input.getSecond()) +
+                       (input.getNano() == 0 ? "" : "." + padLeft(9, input.getNano()));
+        return AttributeValue.builder().n(value).build();
+    }
+
+    @Override
+    public LocalTime transformTo(AttributeValue input) {
+        if (input.n() != null) {
+            return EnhancedAttributeValue.fromNumber(input.n()).convert(VISITOR);
+        }
+
+        return EnhancedAttributeValue.fromAttributeValue(input).convert(VISITOR);
+    }
+
+    private static final class Visitor extends TypeConvertingVisitor<LocalTime> {
+        private Visitor() {
+            super(LocalTime.class, InstantAsIntegerAttributeConverter.class);
+        }
+
+        @Override
+        public LocalTime convertNumber(String value) {
+            String[] splitOnDecimal = ConverterUtils.splitNumberOnDecimal(value);
+            String[] chunkedTime = ConverterUtils.chunk(splitOnDecimal[0], 2, 2, 2);
+
+            try {
+                return LocalTime.of(Integer.parseInt(chunkedTime[0]),
+                                    Integer.parseInt(chunkedTime[1]),
+                                    Integer.parseInt(chunkedTime[2]),
+                                    Integer.parseInt(splitOnDecimal[1]));
+            } catch (DateTimeException e) {
+                throw new IllegalArgumentException(e);
+            }
+        }
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/LongAttributeConverter.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/LongAttributeConverter.java
new file mode 100644
index 000000000000..2494e64f9bea
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/LongAttributeConverter.java
@@ -0,0 +1,104 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute;
+
+import software.amazon.awssdk.annotations.Immutable;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeValueType;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.PrimitiveConverter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.TypeConvertingVisitor;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.string.LongStringConverter;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+
+/**
+ * A converter between {@link Long} and {@link AttributeValue}.
+ *
+ * <p>
+ * This stores values in DynamoDB as a number.
+ *
+ * <p>
+ * This supports reading numbers between {@link Long#MIN_VALUE} and {@link Long#MAX_VALUE} from DynamoDB. For smaller
+ * numbers, consider using {@link ShortAttributeConverter} or {@link IntegerAttributeConverter}. For larger numbers, consider
+ * using {@link BigIntegerAttributeConverter}. Numbers outside of the supported range will cause a {@link NumberFormatException}
+ * on conversion.
+ *
+ * <p>
+ * This does not support reading decimal numbers. For decimal numbers, consider using {@link FloatAttributeConverter},
+ * {@link DoubleAttributeConverter} or {@link BigDecimalAttributeConverter}. Decimal numbers will cause a
+ * {@link NumberFormatException} on conversion.
+ */
+@SdkInternalApi
+@ThreadSafe
+@Immutable
+public final class LongAttributeConverter implements AttributeConverter<Long>, PrimitiveConverter<Long> {
+    private static final Visitor VISITOR = new Visitor();
+    private static final LongStringConverter STRING_CONVERTER = LongStringConverter.create();
+
+    private LongAttributeConverter() {
+    }
+
+    @Override
+    public EnhancedType<Long> type() {
+        return EnhancedType.of(Long.class);
+    }
+
+    @Override
+    public AttributeValueType attributeValueType() {
+        return AttributeValueType.N;
+    }
+
+    public static LongAttributeConverter create() {
+        return new LongAttributeConverter();
+    }
+
+    @Override
+    public AttributeValue transformFrom(Long input) {
+        return AttributeValue.builder().n(STRING_CONVERTER.toString(input)).build();
+    }
+
+    @Override
+    public Long transformTo(AttributeValue input) {
+        if (input.n() != null) {
+            return EnhancedAttributeValue.fromNumber(input.n()).convert(VISITOR);
+        }
+
+        return EnhancedAttributeValue.fromAttributeValue(input).convert(VISITOR);
+    }
+
+    @Override
+    public EnhancedType<Long> primitiveType() {
+        return EnhancedType.of(long.class);
+    }
+
+    private static final class Visitor extends TypeConvertingVisitor<Long> {
+        private Visitor() {
+            super(Long.class, LongAttributeConverter.class);
+        }
+
+        @Override
+        public Long convertString(String value) {
+            return STRING_CONVERTER.fromString(value);
+        }
+
+        @Override
+        public Long convertNumber(String value) {
+            return STRING_CONVERTER.fromString(value);
+        }
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/MapAttributeConverter.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/MapAttributeConverter.java
new file mode 100644
index 000000000000..7d9a1b223629
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/MapAttributeConverter.java
@@ -0,0 +1,211 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.NavigableMap;
+import java.util.SortedMap;
+import java.util.TreeMap;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.function.Supplier;
+import software.amazon.awssdk.annotations.Immutable;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeValueType;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.StringConverter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.TypeConvertingVisitor;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+
+/**
+ * A converter between a specific {@link Map} type and {@link AttributeValue}.
+ *
+ * <p>
+ * This stores values in DynamoDB as a map from string to attribute value. This uses a configured {@link StringAttributeConverter}
+ * to convert the map keys to a string, and a configured {@link AttributeConverter} to convert the map values to an attribute
+ * value.
+ *
+ * <p>
+ * This supports reading maps from DynamoDB. This uses a configured {@link StringAttributeConverter} to convert the map keys, and
+ * a configured {@link AttributeConverter} to convert the map values.
+ *
+ * <p>
+ * A builder is exposed to allow defining how the map, key and value types are created and converted:
+ * <code>
+ * AttributeConverter<Map<MonthDay, String>> mapConverter =
+ * MapAttributeConverter.builder(EnhancedType.mapOf(Integer.class, String.class))
+ * .mapConstructor(HashMap::new)
+ * .keyConverter(MonthDayStringConverter.create())
+ * .valueConverter(StringAttributeConverter.create())
+ * .build();
+ * </code>
+ *
+ * <p>
+ * For frequently-used types, static methods are exposed to reduce the amount of boilerplate involved in creation:
+ * <code>
+ * AttributeConverter<Map<MonthDay, String>> mapConverter =
+ * MapAttributeConverter.mapConverter(MonthDayStringConverter.create(),
+ * StringAttributeConverter.create());
+ * <p>
+ * AttributeConverter<SortedMap<MonthDay, String>> sortedMapConverter =
+ * MapAttributeConverter.sortedMapConverter(MonthDayStringConverter.create(),
+ * StringAttributeConverter.create());
+ * </code>
+ *
+ * @see MapAttributeConverter
+ */
+@SdkInternalApi
+@ThreadSafe
+@Immutable
+public class MapAttributeConverter<T extends Map<?, ?>> implements AttributeConverter<T> {
+    private final Delegate<T, ?, ?> delegate;
+
+    private MapAttributeConverter(Delegate<T, ?, ?> delegate) {
+        this.delegate = delegate;
+    }
+
+    public static <K, V> MapAttributeConverter<Map<K, V>> mapConverter(StringConverter<K> keyConverter,
+                                                                       AttributeConverter<V> valueConverter) {
+        return builder(EnhancedType.mapOf(keyConverter.type(), valueConverter.type()))
+            .mapConstructor(LinkedHashMap::new)
+            .keyConverter(keyConverter)
+            .valueConverter(valueConverter)
+            .build();
+    }
+
+    public static <K, V> MapAttributeConverter<ConcurrentMap<K, V>> concurrentMapConverter(StringConverter<K> keyConverter,
+                                                                                           AttributeConverter<V> valueConverter) {
+        return builder(EnhancedType.concurrentMapOf(keyConverter.type(), valueConverter.type()))
+            .mapConstructor(ConcurrentHashMap::new)
+            .keyConverter(keyConverter)
+            .valueConverter(valueConverter)
+            .build();
+    }
+
+    public static <K, V> MapAttributeConverter<SortedMap<K, V>> sortedMapConverter(StringConverter<K> keyConverter,
+                                                                                   AttributeConverter<V> valueConverter) {
+        return builder(EnhancedType.sortedMapOf(keyConverter.type(), valueConverter.type()))
+            .mapConstructor(TreeMap::new)
+            .keyConverter(keyConverter)
+            .valueConverter(valueConverter)
+            .build();
+    }
+
+    public static <K, V> MapAttributeConverter<NavigableMap<K, V>> navigableMapConverter(StringConverter<K> keyConverter,
+                                                                                         AttributeConverter<V> valueConverter) {
+        return builder(EnhancedType.navigableMapOf(keyConverter.type(), valueConverter.type()))
+            .mapConstructor(TreeMap::new)
+            .keyConverter(keyConverter)
+            .valueConverter(valueConverter)
+            .build();
+    }
+
+    public static <T extends Map<K, V>, K, V> Builder<T, K, V> builder(EnhancedType<T> mapType) {
+        return new Builder<>(mapType);
+    }
+
+    @Override
+    public EnhancedType<T> type() {
+        return delegate.type();
+    }
+
+    @Override
+    public AttributeValueType attributeValueType() {
+        return AttributeValueType.M;
+    }
+
+    @Override
+    public AttributeValue transformFrom(T input) {
+        return delegate.toAttributeValue(input).toAttributeValue();
+    }
+
+    @Override
+    public T transformTo(AttributeValue input) {
+        return delegate.fromAttributeValue(input);
+    }
+
+    private static final class Delegate<T extends Map<K, V>, K, V> {
+        private final EnhancedType<T> type;
+        private final Supplier<? extends T> mapConstructor;
+        private final StringConverter<K> keyConverter;
+        private final AttributeConverter<V> valueConverter;
+
+        private Delegate(Builder<T, K, V> builder) {
+            this.type = builder.mapType;
+            this.mapConstructor = builder.mapConstructor;
+            this.keyConverter = builder.keyConverter;
+            this.valueConverter = builder.valueConverter;
+        }
+
+        public EnhancedType<T> type() {
+            return type;
+        }
+
+        public EnhancedAttributeValue toAttributeValue(T input) {
+            Map<String, AttributeValue> result = new LinkedHashMap<>();
+            input.forEach((k, v) -> result.put(keyConverter.toString(k), valueConverter.transformFrom(v)));
+            return EnhancedAttributeValue.fromMap(result);
+        }
+
+        public T fromAttributeValue(AttributeValue input) {
+            return EnhancedAttributeValue.fromAttributeValue(input)
+                                         .convert(new TypeConvertingVisitor<T>(Map.class, MapAttributeConverter.class) {
+                                             @Override
+                                             public T convertMap(Map<String, AttributeValue> value) {
+                                                 T result = mapConstructor.get();
+                                                 value.forEach((k, v) ->
+                                                                   result.put(keyConverter.fromString(k),
+                                                                              valueConverter.transformTo(v)));
+                                                 return result;
+                                             }
+                                         });
+        }
+    }
+
+    public static final class Builder<T extends Map<K, V>, K, V> {
+        private final EnhancedType<T> mapType;
+
+        private StringConverter<K> keyConverter;
+        private AttributeConverter<V> valueConverter;
+        private Supplier<? extends T> mapConstructor;
+
+        private Builder(EnhancedType<T> mapType) {
+            this.mapType = mapType;
+        }
+
+        public Builder<T, K, V> mapConstructor(Supplier<?> mapConstructor) {
+            this.mapConstructor = (Supplier<? extends T>) mapConstructor;
+            return this;
+        }
+
+        public Builder<T, K, V> keyConverter(StringConverter<K> keyConverter) {
+            this.keyConverter = keyConverter;
+            return this;
+        }
+
+        public Builder<T, K, V> valueConverter(AttributeConverter<V> valueConverter) {
+            this.valueConverter = valueConverter;
+            return this;
+        }
+
+        public MapAttributeConverter<T> build() {
+            return new MapAttributeConverter<>(new Delegate<>(this));
+        }
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/MonthDayAttributeConverter.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/MonthDayAttributeConverter.java
new file mode 100644
index 000000000000..4d85db6b6e2c
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/MonthDayAttributeConverter.java
@@ -0,0 +1,113 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute;
+
+import static software.amazon.awssdk.enhanced.dynamodb.internal.converter.ConverterUtils.padLeft2;
+
+import java.time.DateTimeException;
+import java.time.MonthDay;
+import software.amazon.awssdk.annotations.Immutable;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeValueType;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.ConverterUtils;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.TypeConvertingVisitor;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+import software.amazon.awssdk.utils.Validate;
+
+/**
+ * A converter between {@link MonthDay} and {@link AttributeValue}.
+ *
+ * <p>
+ * This stores and reads values in DynamoDB as a number, so that they can be sorted numerically as part of a sort key.
+ *
+ * <p>
+ * LocalTimes are stored in the format "MMDD", where:
+ * <ol>
+ *     <li>M is a 2-character, zero-prefixed month between 01 and 12</li>
+ *     <li>D is a 2-character, zero-prefixed day between 01 and 31</li>
+ * </ol>
+ *
+ * <p>
+ * Examples:
+ * <ul>
+ *     <li>{@code MonthDay.of(5, 21)} is stored as {@code ItemAttributeValueMapper.fromNumber("0521")}</li>
+ *     <li>{@code MonthDay.of(12, 1)} is stored as {@code ItemAttributeValueMapper.fromNumber("1201")}</li>
+ * </ul>
+ *
+ * <p>
+ * This can be created via {@link #create()}.
+ */
+@SdkInternalApi
+@ThreadSafe
+@Immutable
+public final class MonthDayAttributeConverter implements AttributeConverter<MonthDay> {
+    private static final Visitor VISITOR = new Visitor();
+
+    private MonthDayAttributeConverter() {
+    }
+
+    public static MonthDayAttributeConverter create() {
+        return new MonthDayAttributeConverter();
+    }
+
+    @Override
+    public EnhancedType<MonthDay> type() {
+        return EnhancedType.of(MonthDay.class);
+    }
+
+    @Override
+    public AttributeValueType attributeValueType() {
+        return AttributeValueType.N;
+    }
+
+    @Override
+    public AttributeValue transformFrom(MonthDay input) {
+        String value = "" +
+                       padLeft2(input.getMonthValue()) +
+                       padLeft2(input.getDayOfMonth());
+        return AttributeValue.builder().n(value).build();
+    }
+
+    @Override
+    public MonthDay transformTo(AttributeValue input) {
+        if (input.n() != null) {
+            return EnhancedAttributeValue.fromNumber(input.n()).convert(VISITOR);
+        }
+
+        return EnhancedAttributeValue.fromAttributeValue(input).convert(VISITOR);
+    }
+
+    private static final class Visitor extends TypeConvertingVisitor<MonthDay> {
+        private Visitor() {
+            super(MonthDay.class, MonthDayAttributeConverter.class);
+        }
+
+        @Override
+        public MonthDay convertNumber(String value) {
+            Validate.isTrue(value.length() == 4, "Invalid Month/Day length: %s, expected 4 (MMDD)", value.length());
+            String[] chunkedMonthDay = ConverterUtils.chunk(value, 2, 2);
+            try {
+                return MonthDay.of(Integer.parseInt(chunkedMonthDay[0]),
+                                   Integer.parseInt(chunkedMonthDay[1]));
+            } catch (DateTimeException e) {
+                throw new IllegalArgumentException(e);
+            }
+        }
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/OffsetDateTimeAsStringAttributeConverter.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/OffsetDateTimeAsStringAttributeConverter.java
new file mode 100644
index 000000000000..6db1885d27f2
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/OffsetDateTimeAsStringAttributeConverter.java
@@ -0,0 +1,95 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute;
+
+import java.time.OffsetDateTime;
+import software.amazon.awssdk.annotations.Immutable;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeValueType;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.TimeConversion;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+
+/**
+ * A converter between {@link OffsetDateTime} and {@link AttributeValue}.
+ *
+ * <p>
+ * This stores values in DynamoDB as a string.
+ *
+ * <p>
+ * Values are stored in ISO-8601 format, with nanosecond precision. If the offset has seconds then they will also be included,
+ * even though this is not part of the ISO-8601 standard. For full ISO-8601 compliance, ensure your {@code OffsetDateTime}s do
+ * not have offsets at the precision level of seconds.
+ *
+ * <p>
+ * Examples:
+ * <ul>
+ *     <li>{@code OffsetDateTime.MIN} is stored as
+ *     {@code ItemAttributeValueMapper.fromString("-999999999-01-01T00:00:00+18:00")}</li>
+ *     <li>{@code OffsetDateTime.MAX} is stored as
+ *     {@code ItemAttributeValueMapper.fromString("+999999999-12-31T23:59:59.999999999-18:00")}</li>
+ *     <li>{@code Instant.EPOCH.atOffset(ZoneOffset.UTC).plusSeconds(1)} is stored as
+ *     {@code ItemAttributeValueMapper.fromString("1970-01-01T00:00:01Z")}</li>
+ *     <li>{@code Instant.EPOCH.atOffset(ZoneOffset.UTC).minusSeconds(1)} is stored as
+ *     {@code ItemAttributeValueMapper.fromString("1969-12-31T23:59:59Z")}</li>
+ *     <li>{@code Instant.EPOCH.atOffset(ZoneOffset.UTC).plusMillis(1)} is stored as
+ *     {@code ItemAttributeValueMapper.fromString("1970-01-01T00:00:00.001Z")}</li>
+ *     <li>{@code Instant.EPOCH.atOffset(ZoneOffset.UTC).minusMillis(1)} is stored as
+ *     {@code ItemAttributeValueMapper.fromString("1969-12-31T23:59:59.999Z")}</li>
+ *     <li>{@code Instant.EPOCH.atOffset(ZoneOffset.UTC).plusNanos(1)} is stored as
+ *     {@code ItemAttributeValueMapper.fromString("1970-01-01T00:00:00.000000001Z")}</li>
+ *     <li>{@code Instant.EPOCH.atOffset(ZoneOffset.UTC).minusNanos(1)} is stored as
+ *     {@code ItemAttributeValueMapper.fromString("1969-12-31T23:59:59.999999999Z")}</li>
+ * </ul>
+ *
+ * <p>
+ * This converter can read any values written by itself, {@link InstantAsIntegerAttributeConverter},
+ * {@link InstantAsStringAttributeConverter}, or {@link ZonedDateTimeAsStringAttributeConverter}. Values written by
+ * {@code Instant} converters are treated as if they are in the UTC time zone (and an offset of 0 seconds will be returned).
+ *
+ * <p>
+ * This can be created via {@link #create()}.
+ */
+@SdkInternalApi
+@ThreadSafe
+@Immutable
+public final class OffsetDateTimeAsStringAttributeConverter implements AttributeConverter<OffsetDateTime> {
+    public static OffsetDateTimeAsStringAttributeConverter create() {
+        return new OffsetDateTimeAsStringAttributeConverter();
+    }
+
+    @Override
+    public EnhancedType<OffsetDateTime> type() {
+        return EnhancedType.of(OffsetDateTime.class);
+    }
+
+    @Override
+    public AttributeValueType attributeValueType() {
+        return AttributeValueType.S;
+    }
+
+    @Override
+    public AttributeValue transformFrom(OffsetDateTime input) {
+        return TimeConversion.toStringAttributeValue(input);
+    }
+
+    @Override
+    public OffsetDateTime transformTo(AttributeValue input) {
+        return TimeConversion.offsetDateTimeFromAttributeValue(EnhancedAttributeValue.fromAttributeValue(input));
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/OptionalAttributeConverter.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/OptionalAttributeConverter.java
new file mode 100644
index 000000000000..d33a4cfc1acf
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/OptionalAttributeConverter.java
@@ -0,0 +1,78 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute;
+
+import java.util.Optional;
+import software.amazon.awssdk.annotations.Immutable;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeValueType;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.enhanced.dynamodb.internal.AttributeValues;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+
+/**
+ * A converter between {@link Optional} and {@link EnhancedAttributeValue}.
+ */
+@SdkInternalApi
+@ThreadSafe
+@Immutable
+public class OptionalAttributeConverter<T> implements AttributeConverter<Optional<T>> {
+    private final AttributeConverter delegate;
+
+    private OptionalAttributeConverter(AttributeConverter delegate) {
+        this.delegate = delegate;
+
+    }
+
+    public static OptionalAttributeConverter create(AttributeConverter delegate) {
+        return new OptionalAttributeConverter(delegate);
+    }
+
+    @Override
+    public EnhancedType<Optional<T>> type() {
+        return EnhancedType.optionalOf(delegate.type().rawClass());
+    }
+
+    @Override
+    public AttributeValueType attributeValueType() {
+        return AttributeValueType.S;
+    }
+
+    @Override
+    public AttributeValue transformFrom(Optional<T> input) {
+        if (!input.isPresent()) {
+            return AttributeValues.nullAttributeValue();
+        }
+
+        return delegate.transformFrom(input.get());
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public Optional<T> transformTo(AttributeValue input) {
+        Optional<T> result;
+        if (input.nul()) {
+            // This is safe - An Optional.empty() can be used for any Optional<?> subtype.
+            result = Optional.empty();
+        } else {
+            result = (Optional<T>) Optional.ofNullable(delegate.transformTo(input));
+        }
+
+        return result;
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/OptionalDoubleAttributeConverter.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/OptionalDoubleAttributeConverter.java
new file mode 100644
index 000000000000..be0db01b1c7d
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/OptionalDoubleAttributeConverter.java
@@ -0,0 +1,120 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.OptionalDouble;
+import software.amazon.awssdk.annotations.Immutable;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeValueType;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.enhanced.dynamodb.internal.AttributeValues;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.ConverterUtils;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.TypeConvertingVisitor;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.string.OptionalDoubleStringConverter;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+
+/**
+ * A converter between {@link OptionalDouble} and {@link AttributeValue}.
+ *
+ * <p>
+ * This stores values in DynamoDB as a number.
+ *
+ * <p>
+ * This supports converting numbers stored in DynamoDB into a double-precision floating point number, within the range
+ * {@link Double#MIN_VALUE}, {@link Double#MAX_VALUE}. Null values are converted to {@code OptionalDouble.empty()}. For less
+ * precision or smaller values, consider using {@link OptionalAttributeConverter} along with a {@link Float} type.
+ * For greater precision or larger values, consider using {@link OptionalAttributeConverter} along with a
+ * {@link BigDecimal} type.
+ *
+ * <p>
+ * If values are known to be whole numbers, it is recommended to use a perfect-precision whole number representation like those
+ * provided by {@link OptionalIntAttributeConverter}, {@link OptionalLongAttributeConverter}, or a
+ * {@link OptionalAttributeConverter} along with a {@link BigInteger} type.
+ *
+ * <p>
+ * This can be created via {@link #create()}.
+ */
+@SdkInternalApi
+@ThreadSafe
+@Immutable
+public final class OptionalDoubleAttributeConverter implements AttributeConverter<OptionalDouble> {
+    private static final Visitor VISITOR = new Visitor();
+    private static final OptionalDoubleStringConverter STRING_CONVERTER = OptionalDoubleStringConverter.create();
+
+    private OptionalDoubleAttributeConverter() {
+    }
+
+    public static OptionalDoubleAttributeConverter create() {
+        return new OptionalDoubleAttributeConverter();
+    }
+
+    @Override
+    public EnhancedType<OptionalDouble> type() {
+        return EnhancedType.of(OptionalDouble.class);
+    }
+
+    @Override
+    public AttributeValueType attributeValueType() {
+        return AttributeValueType.N;
+    }
+
+    @Override
+    public AttributeValue transformFrom(OptionalDouble input) {
+        if (input.isPresent()) {
+            ConverterUtils.validateDouble(input.getAsDouble());
+            return AttributeValue.builder().n(STRING_CONVERTER.toString(input)).build();
+        } else {
+            return AttributeValues.nullAttributeValue();
+        }
+    }
+
+    @Override
+    public OptionalDouble transformTo(AttributeValue input) {
+        OptionalDouble result;
+        if (input.n() != null) {
+            result = EnhancedAttributeValue.fromNumber(input.n()).convert(VISITOR);
+        } else {
+            result = EnhancedAttributeValue.fromAttributeValue(input).convert(VISITOR);
+        }
+        result.ifPresent(ConverterUtils::validateDouble);
+        return result;
+    }
+
+    private static final class Visitor extends TypeConvertingVisitor<OptionalDouble> {
+        private Visitor() {
+            super(OptionalDouble.class, OptionalDoubleAttributeConverter.class);
+        }
+
+        @Override
+        public OptionalDouble convertNull() {
+            return OptionalDouble.empty();
+        }
+
+        @Override
+        public OptionalDouble convertString(String value) {
+            return STRING_CONVERTER.fromString(value);
+        }
+
+        @Override
+        public OptionalDouble convertNumber(String value) {
+            return STRING_CONVERTER.fromString(value);
+        }
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/OptionalIntAttributeConverter.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/OptionalIntAttributeConverter.java
new file mode 100644
index 000000000000..e433ea106264
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/OptionalIntAttributeConverter.java
@@ -0,0 +1,114 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.OptionalInt;
+import software.amazon.awssdk.annotations.Immutable;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeValueType;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.enhanced.dynamodb.internal.AttributeValues;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.TypeConvertingVisitor;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.string.OptionalIntStringConverter;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+
+/**
+ * A converter between {@link OptionalInt} and {@link AttributeValue}.
+ *
+ * <p>
+ * This stores values in DynamoDB as a number.
+ *
+ * <p>
+ * This supports reading numbers between {@link Integer#MIN_VALUE} and {@link Integer#MAX_VALUE} from DynamoDB. Null values are
+ * converted to {@code OptionalInt.empty()}. For larger numbers, consider using the {@link OptionalLongAttributeConverter} or
+ * the {@link OptionalAttributeConverter} along with a {@link BigInteger}. For shorter numbers, consider using the
+ * {@link OptionalAttributeConverter} along with a {@link Short} type.
+ *
+ * <p>
+ * This does not support reading decimal numbers. For decimal numbers, consider using {@link OptionalDoubleAttributeConverter},
+ * or the {@link OptionalAttributeConverter} with a {@link Float} or {@link BigDecimal}. Decimal numbers will cause a
+ * {@link NumberFormatException} on conversion.
+ *
+ * <p>
+ * This can be created via {@link #create()}.
+ */
+@SdkInternalApi
+@ThreadSafe
+@Immutable
+public final class OptionalIntAttributeConverter implements AttributeConverter<OptionalInt> {
+    private static final Visitor VISITOR = new Visitor();
+    private static final OptionalIntStringConverter STRING_CONVERTER = OptionalIntStringConverter.create();
+
+    private OptionalIntAttributeConverter() {
+    }
+
+    @Override
+    public EnhancedType<OptionalInt> type() {
+        return EnhancedType.of(OptionalInt.class);
+    }
+
+    @Override
+    public AttributeValueType attributeValueType() {
+        return AttributeValueType.N;
+    }
+
+    public static OptionalIntAttributeConverter create() {
+        return new OptionalIntAttributeConverter();
+    }
+
+    @Override
+    public AttributeValue transformFrom(OptionalInt input) {
+        if (input.isPresent()) {
+            return AttributeValue.builder().n(STRING_CONVERTER.toString(input)).build();
+        } else {
+            return AttributeValues.nullAttributeValue();
+        }
+    }
+
+    @Override
+    public OptionalInt transformTo(AttributeValue input) {
+        if (input.n() != null) {
+            return EnhancedAttributeValue.fromNumber(input.n()).convert(VISITOR);
+        }
+
+        return EnhancedAttributeValue.fromAttributeValue(input).convert(VISITOR);
+    }
+
+    private static final class Visitor extends TypeConvertingVisitor<OptionalInt> {
+        private Visitor() {
+            super(OptionalInt.class, OptionalIntAttributeConverter.class);
+        }
+
+        @Override
+        public OptionalInt convertNull() {
+            return OptionalInt.empty();
+        }
+
+        @Override
+        public OptionalInt convertString(String value) {
+            return STRING_CONVERTER.fromString(value);
+        }
+
+        @Override
+        public OptionalInt convertNumber(String value) {
+            return STRING_CONVERTER.fromString(value);
+        }
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/OptionalLongAttributeConverter.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/OptionalLongAttributeConverter.java
new file mode 100644
index 000000000000..c7f3adbbcfd5
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/OptionalLongAttributeConverter.java
@@ -0,0 +1,114 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.OptionalLong;
+import software.amazon.awssdk.annotations.Immutable;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeValueType;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.enhanced.dynamodb.internal.AttributeValues;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.TypeConvertingVisitor;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.string.OptionalLongStringConverter;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+
+/**
+ * A converter between {@link OptionalLong} and {@link AttributeValue}.
+ *
+ * <p>
+ * This stores values in DynamoDB as a number.
+ *
+ * <p>
+ * This supports reading numbers between {@link Long#MIN_VALUE} and {@link Long#MAX_VALUE} from DynamoDB. Null values are
+ * converted to {@code OptionalLong.empty()}. For larger numbers, consider using the {@link OptionalAttributeConverter}
+ * along with a {@link BigInteger}. For shorter numbers, consider using the {@link OptionalIntAttributeConverter} or
+ * {@link OptionalAttributeConverter} along with a {@link Short} type.
+ *
+ * <p>
+ * This does not support reading decimal numbers. For decimal numbers, consider using {@link OptionalDoubleAttributeConverter},
+ * or the {@link OptionalAttributeConverter} with a {@link Float} or {@link BigDecimal}. Decimal numbers will cause a
+ * {@link NumberFormatException} on conversion.
+ *
+ * <p>
+ * This can be created via {@link #create()}.
+ */
+@SdkInternalApi
+@ThreadSafe
+@Immutable
+public final class OptionalLongAttributeConverter implements AttributeConverter<OptionalLong> {
+    private static final Visitor VISITOR = new Visitor();
+    private static final OptionalLongStringConverter STRING_CONVERTER = OptionalLongStringConverter.create();
+
+    private OptionalLongAttributeConverter() {
+    }
+
+    @Override
+    public EnhancedType<OptionalLong> type() {
+        return EnhancedType.of(OptionalLong.class);
+    }
+
+    @Override
+    public AttributeValueType attributeValueType() {
+        return AttributeValueType.N;
+    }
+
+    public static OptionalLongAttributeConverter create() {
+        return new OptionalLongAttributeConverter();
+    }
+
+    @Override
+    public AttributeValue transformFrom(OptionalLong input) {
+        if (input.isPresent()) {
+            return AttributeValue.builder().n(STRING_CONVERTER.toString(input)).build();
+        } else {
+            return AttributeValues.nullAttributeValue();
+        }
+    }
+
+    @Override
+    public OptionalLong transformTo(AttributeValue input) {
+        if (input.n() != null) {
+            return EnhancedAttributeValue.fromNumber(input.n()).convert(VISITOR);
+        }
+
+        return EnhancedAttributeValue.fromAttributeValue(input).convert(VISITOR);
+    }
+
+    private static final class Visitor extends TypeConvertingVisitor<OptionalLong> {
+        private Visitor() {
+            super(OptionalLong.class, OptionalLongAttributeConverter.class);
+        }
+
+        @Override
+        public OptionalLong convertNull() {
+            return OptionalLong.empty();
+        }
+
+        @Override
+        public OptionalLong convertString(String value) {
+            return STRING_CONVERTER.fromString(value);
+        }
+
+        @Override
+        public OptionalLong convertNumber(String value) {
+            return STRING_CONVERTER.fromString(value);
+        }
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/PeriodAttributeConverter.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/PeriodAttributeConverter.java
new file mode 100644
index 000000000000..afdcc14afca0
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/PeriodAttributeConverter.java
@@ -0,0 +1,87 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute;
+
+import java.time.Period;
+import java.time.format.DateTimeParseException;
+import software.amazon.awssdk.annotations.Immutable;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeValueType;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.TypeConvertingVisitor;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.string.PeriodStringConverter;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+
+/**
+ * A converter between {@link Period} and {@link AttributeValue}.
+ *
+ * <p>
+ * This stores and reads values in DynamoDB as a string, according to the format of {@link Period#parse(CharSequence)} and
+ * {@link Period#toString()}.
+ * <p>
+ * This can be created via {@link #create()}.
+ */
+@SdkInternalApi
+@ThreadSafe
+@Immutable
+public final class PeriodAttributeConverter implements AttributeConverter<Period> {
+    private static final Visitor VISITOR = new Visitor();
+    private static final PeriodStringConverter STRING_CONVERTER = PeriodStringConverter.create();
+
+    private PeriodAttributeConverter() {
+    }
+
+    public static PeriodAttributeConverter create() {
+        return new PeriodAttributeConverter();
+    }
+
+    @Override
+    public EnhancedType<Period> type() {
+        return EnhancedType.of(Period.class);
+    }
+
+    @Override
+    public AttributeValueType attributeValueType() {
+        return AttributeValueType.S;
+    }
+
+    @Override
+    public AttributeValue transformFrom(Period input) {
+        return AttributeValue.builder().s(STRING_CONVERTER.toString(input)).build();
+    }
+
+    @Override
+    public Period transformTo(AttributeValue input) {
+        try {
+            return EnhancedAttributeValue.fromAttributeValue(input).convert(VISITOR);
+        } catch (DateTimeParseException e) {
+            throw new IllegalArgumentException(e);
+        }
+    }
+
+    private static final class Visitor extends TypeConvertingVisitor<Period> {
+        private Visitor() {
+            super(Period.class, PeriodAttributeConverter.class);
+        }
+
+        @Override
+        public Period convertString(String value) {
+            return STRING_CONVERTER.fromString(value);
+        }
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/SdkBytesAttributeConverter.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/SdkBytesAttributeConverter.java
new file mode 100644
index 000000000000..dfaad4e9620d
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/SdkBytesAttributeConverter.java
@@ -0,0 +1,84 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute;
+
+import software.amazon.awssdk.annotations.Immutable;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.core.SdkBytes;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeValueType;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.TypeConvertingVisitor;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+
+/**
+ * A converter between {@link SdkBytes} and {@link AttributeValue}.
+ *
+ * <p>
+ * This stores values in DynamoDB as a binary blob.
+ *
+ * <p>
+ * This supports reading every byte value supported by DynamoDB, making it fully compatible with custom converters as
+ * well as internal converters (e.g. {@link ByteArrayAttributeConverter}).
+ *
+ * <p>
+ * This can be created via {@link #create()}.
+ */
+@SdkInternalApi
+@ThreadSafe
+@Immutable
+public final class SdkBytesAttributeConverter implements AttributeConverter<SdkBytes> {
+    private static final Visitor VISITOR = new Visitor();
+
+    private SdkBytesAttributeConverter() {
+    }
+
+    @Override
+    public EnhancedType<SdkBytes> type() {
+        return EnhancedType.of(SdkBytes.class);
+    }
+
+    @Override
+    public AttributeValueType attributeValueType() {
+        return AttributeValueType.B;
+    }
+
+    public static SdkBytesAttributeConverter create() {
+        return new SdkBytesAttributeConverter();
+    }
+
+    @Override
+    public AttributeValue transformFrom(SdkBytes input) {
+        return AttributeValue.builder().b(input).build();
+    }
+
+    @Override
+    public SdkBytes transformTo(AttributeValue input) {
+        return EnhancedAttributeValue.fromBytes(input.b()).convert(VISITOR);
+    }
+
+    private static final class Visitor extends TypeConvertingVisitor<SdkBytes> {
+        private Visitor() {
+            super(SdkBytes.class, SdkBytesAttributeConverter.class);
+        }
+
+        @Override
+        public SdkBytes convertBytes(SdkBytes value) {
+            return value;
+        }
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/SetAttributeConverter.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/SetAttributeConverter.java
new file mode 100644
index 000000000000..7bab93eca971
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/SetAttributeConverter.java
@@ -0,0 +1,267 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute;
+
+import static java.util.stream.Collectors.toList;
+
+import java.util.Collection;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.function.Function;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+import software.amazon.awssdk.annotations.Immutable;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.core.SdkBytes;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeValueType;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.TypeConvertingVisitor;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+import software.amazon.awssdk.utils.Validate;
+
+
+/**
+ * A converter between a specific {@link Collection} type and {@link EnhancedAttributeValue}.
+ *
+ * <p>
+ * This stores values in DynamoDB as a list of attribute values. This uses a configured {@link AttributeConverter} to convert
+ * the collection contents to an attribute value.
+ *
+ * <p>
+ * This supports reading a list of attribute values. This uses a configured {@link AttributeConverter} to convert
+ * the collection contents.
+ *
+ * <p>
+ * A builder is exposed to allow defining how the collection and element types are created and converted:
+ * <code>
+ * AttributeConverter<List<Integer>> listConverter =
+ * CollectionAttributeConverter.builder(EnhancedType.listOf(Integer.class))
+ * .collectionConstructor(ArrayList::new)
+ * .elementConverter(IntegerAttributeConverter.create())
+ * .build()
+ * </code>
+ *
+ * <p>
+ * For frequently-used types, static methods are exposed to reduce the amount of boilerplate involved in creation:
+ * <code>
+ * AttributeConverter<List<Integer>> listConverter =
+ * CollectionAttributeConverter.listConverter(IntegerAttributeConverter.create());
+ * <p>
+ * AttributeConverter<Collection<Integer>> collectionConverer =
+ * CollectionAttributeConverter.collectionConverter(IntegerAttributeConverter.create());
+ * <p>
+ * AttributeConverter<Set<Integer>> setConverter =
+ * CollectionAttributeConverter.setConverter(IntegerAttributeConverter.create());
+ * <p>
+ * AttributeConverter<SortedSet<Integer>> sortedSetConverter =
+ * CollectionAttributeConverter.sortedSetConverter(IntegerAttributeConverter.create());
+ * </code>
+ *
+ * @see MapAttributeConverter
+ */
+@SdkInternalApi
+@ThreadSafe
+@Immutable
+public class SetAttributeConverter<T extends Collection<?>> implements AttributeConverter<T> {
+    private final Delegate<T, ?> delegate;
+
+    private SetAttributeConverter(Delegate<T, ?> delegate) {
+        this.delegate = delegate;
+    }
+
+    public static <U> SetAttributeConverter<Set<U>> setConverter(AttributeConverter<U> elementConverter) {
+        return builder(EnhancedType.setOf(elementConverter.type()))
+            .collectionConstructor(LinkedHashSet::new)
+            .elementConverter(elementConverter)
+            .build();
+    }
+
+    public static <T extends Collection<U>, U> SetAttributeConverter.Builder<T, U> builder(EnhancedType<T> collectionType) {
+        return new Builder<>(collectionType);
+    }
+
+    @Override
+    public EnhancedType<T> type() {
+        return delegate.type();
+    }
+
+    @Override
+    public AttributeValueType attributeValueType() {
+        return delegate.attributeValueType();
+    }
+
+    @Override
+    public AttributeValue transformFrom(T input) {
+        return delegate.transformFrom(input);
+    }
+
+    @Override
+    public T transformTo(AttributeValue input) {
+        return delegate.transformTo(input);
+    }
+
+    private static final class Delegate<T extends Collection<U>, U> implements AttributeConverter<T> {
+        private final EnhancedType<T> type;
+        private final Supplier<? extends T> collectionConstructor;
+        private final AttributeConverter<U> elementConverter;
+        private final AttributeValueType attributeValueType;
+
+        private Delegate(Builder<T, U> builder) {
+            this.type = builder.collectionType;
+            this.collectionConstructor = builder.collectionConstructor;
+            this.elementConverter = builder.elementConverter;
+            this.attributeValueType = attributeValueTypeForSet(this.elementConverter);
+        }
+
+        @Override
+        public EnhancedType<T> type() {
+            return type;
+        }
+
+        @Override
+        public AttributeValueType attributeValueType() {
+            return attributeValueType;
+        }
+
+        @Override
+        public AttributeValue transformFrom(T input) {
+            return flatten(input.stream()
+                                .map(elementConverter::transformFrom)
+                                .collect(toList()));
+        }
+
+        @Override
+        public T transformTo(AttributeValue input) {
+            return EnhancedAttributeValue.fromAttributeValue(input)
+                                         .convert(new TypeConvertingVisitor<T>(type.rawClass(), SetAttributeConverter.class) {
+                                             @Override
+                                             public T convertSetOfStrings(List<String> value) {
+                                                 return convertCollection(value, v -> AttributeValue.builder().s(v).build());
+                                             }
+
+                                             @Override
+                                             public T convertSetOfNumbers(List<String> value) {
+                                                 return convertCollection(value, v -> AttributeValue.builder().n(v).build());
+                                             }
+
+                                             @Override
+                                             public T convertSetOfBytes(List<SdkBytes> value) {
+                                                 return convertCollection(value, v -> AttributeValue.builder().b(v).build());
+                                             }
+
+                                             @Override
+                                             public T convertListOfAttributeValues(List<AttributeValue> value) {
+                                                 return convertCollection(value, Function.identity());
+                                             }
+
+                                             private <V> T convertCollection(Collection<V> collection,
+                                                                             Function<V, AttributeValue> transformFrom) {
+                                                 Collection<Object> result = (Collection<Object>) collectionConstructor.get();
+
+                                                 collection.stream()
+                                                           .map(transformFrom)
+                                                           .map(elementConverter::transformTo)
+                                                           .forEach(result::add);
+
+                                                 // This is a safe cast - We know the values we added to the list
+                                                 // match the type that the customer requested.
+                                                 return (T) result;
+                                             }
+                                         });
+        }
+
+        private AttributeValueType attributeValueTypeForSet(AttributeConverter<U> innerType) {
+            switch (innerType.attributeValueType()) {
+                case N:
+                    return AttributeValueType.NS;
+                case S:
+                    return AttributeValueType.SS;
+                case B:
+                    return AttributeValueType.BS;
+                default:
+                    throw new IllegalArgumentException(
+                        String.format("SetAttributeConverter cannot be created with a parameterized type of '%s'. " +
+                                      "Supported parameterized types must convert to B, S or N DynamoDB " +
+                                      "AttributeValues.", innerType.type().rawClass()));
+            }
+        }
+
+        /**
+         * Takes a list of {@link AttributeValue}s and flattens into a resulting
+         * single {@link AttributeValue} set of the corresponding type.
+         */
+        public AttributeValue flatten(List<AttributeValue> listOfAttributeValues) {
+            Validate.paramNotNull(listOfAttributeValues, "listOfAttributeValues");
+            Validate.noNullElements(listOfAttributeValues, "List must not have null values.");
+
+            switch (attributeValueType) {
+                case NS:
+                    return AttributeValue.builder()
+                                         .ns(listOfAttributeValues.stream()
+                                                                  .peek(av -> Validate.isTrue(av.n() != null,
+                                                                                              "Attribute value must be N."))
+                                                                  .map(AttributeValue::n)
+                                                                  .collect(Collectors.toList()))
+                                         .build();
+                case SS:
+                    return AttributeValue.builder()
+                                         .ss(listOfAttributeValues.stream()
+                                                                  .peek(av -> Validate.isTrue(av.s() != null,
+                                                                                              "Attribute value must be S."))
+                                                                  .map(AttributeValue::s)
+                                                                  .collect(Collectors.toList()))
+                                         .build();
+                case BS:
+                    return AttributeValue.builder()
+                                         .bs(listOfAttributeValues.stream()
+                                                                  .peek(av -> Validate.isTrue(av.b() != null,
+                                                                                              "Attribute value must be B."))
+                                                                  .map(AttributeValue::b)
+                                                                  .collect(Collectors.toList()))
+                                         .build();
+                default:
+                    throw new IllegalStateException("Unsupported set attribute value type: " + attributeValueType);
+            }
+        }
+    }
+
+    public static final class Builder<T extends Collection<U>, U> {
+        private final EnhancedType<T> collectionType;
+        private Supplier<? extends T> collectionConstructor;
+        private AttributeConverter<U> elementConverter;
+
+        private Builder(EnhancedType<T> collectionType) {
+            this.collectionType = collectionType;
+        }
+
+        public Builder<T, U> collectionConstructor(Supplier<? extends T> collectionConstructor) {
+            this.collectionConstructor = collectionConstructor;
+            return this;
+        }
+
+        public Builder<T, U> elementConverter(AttributeConverter<U> elementConverter) {
+            this.elementConverter = elementConverter;
+            return this;
+        }
+
+        public SetAttributeConverter<T> build() {
+            return new SetAttributeConverter<>(new Delegate<>(this));
+        }
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/ShortAttributeConverter.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/ShortAttributeConverter.java
new file mode 100644
index 000000000000..9bb112650d37
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/ShortAttributeConverter.java
@@ -0,0 +1,101 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute;
+
+import software.amazon.awssdk.annotations.Immutable;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeValueType;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.PrimitiveConverter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.TypeConvertingVisitor;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.string.ShortStringConverter;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+
+/**
+ * A converter between {@link Short} and {@link AttributeValue}.
+ *
+ * <p>
+ * This stores values in DynamoDB as a number.
+ *
+ * <p>
+ * This supports reading numbers between {@link Short#MIN_VALUE} and {@link Short#MAX_VALUE} from DynamoDB. For larger numbers,
+ * consider using {@link IntegerAttributeConverter}, {@link LongAttributeConverter} or {@link BigIntegerAttributeConverter}.
+ * Numbers outside of the supported range will cause a {@link NumberFormatException} on conversion.
+ *
+ * <p>
+ * This does not support reading decimal numbers. For decimal numbers, consider using {@link FloatAttributeConverter},
+ * {@link DoubleAttributeConverter} or {@link BigDecimalAttributeConverter}. Decimal numbers will cause a
+ * {@link NumberFormatException} on conversion.
+ */
+@SdkInternalApi
+@ThreadSafe
+@Immutable
+public final class ShortAttributeConverter implements AttributeConverter<Short>, PrimitiveConverter<Short> {
+    public static final ShortStringConverter STRING_CONVERTER = ShortStringConverter.create();
+
+    public static ShortAttributeConverter create() {
+        return new ShortAttributeConverter();
+    }
+
+    @Override
+    public EnhancedType<Short> type() {
+        return EnhancedType.of(Short.class);
+    }
+
+    @Override
+    public AttributeValueType attributeValueType() {
+        return AttributeValueType.N;
+    }
+
+    @Override
+    public AttributeValue transformFrom(Short input) {
+        return AttributeValue.builder().n(STRING_CONVERTER.toString(input)).build();
+    }
+
+    @Override
+    public Short transformTo(AttributeValue input) {
+        if (input.n() != null) {
+            return EnhancedAttributeValue.fromNumber(input.n()).convert(Visitor.INSTANCE);
+        }
+
+        return EnhancedAttributeValue.fromAttributeValue(input).convert(Visitor.INSTANCE);
+    }
+
+    @Override
+    public EnhancedType<Short> primitiveType() {
+        return EnhancedType.of(short.class);
+    }
+
+    private static final class Visitor extends TypeConvertingVisitor<Short> {
+        private static final Visitor INSTANCE = new Visitor();
+
+        private Visitor() {
+            super(Short.class, ShortAttributeConverter.class);
+        }
+
+        @Override
+        public Short convertString(String value) {
+            return STRING_CONVERTER.fromString(value);
+        }
+
+        @Override
+        public Short convertNumber(String value) {
+            return STRING_CONVERTER.fromString(value);
+        }
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/StringAttributeConverter.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/StringAttributeConverter.java
new file mode 100644
index 000000000000..542d8e84ec84
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/StringAttributeConverter.java
@@ -0,0 +1,144 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute;
+
+import static java.util.stream.Collectors.toList;
+
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.BinaryOperator;
+import java.util.stream.Collectors;
+import software.amazon.awssdk.annotations.Immutable;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.core.SdkBytes;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeValueType;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.TypeConvertingVisitor;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.string.BooleanStringConverter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.string.ByteArrayStringConverter;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+
+/**
+ * A converter between {@link String} and {@link AttributeValue}.
+ *
+ * <p>
+ * This stores values in DynamoDB as a string.
+ *
+ * <p>
+ * This supports reading any DynamoDB attribute type into a string type, so it is very useful for logging information stored in
+ * DynamoDB.
+ */
+@SdkInternalApi
+@ThreadSafe
+@Immutable
+public final class StringAttributeConverter implements AttributeConverter<String> {
+    public static StringAttributeConverter create() {
+        return new StringAttributeConverter();
+    }
+
+    @Override
+    public EnhancedType<String> type() {
+        return EnhancedType.of(String.class);
+    }
+
+    @Override
+    public AttributeValueType attributeValueType() {
+        return AttributeValueType.S;
+    }
+
+    @Override
+    public AttributeValue transformFrom(String input) {
+        return AttributeValue.builder().s(input).build();
+    }
+
+    @Override
+    public String transformTo(AttributeValue input) {
+        return Visitor.toString(input);
+    }
+
+    private static final class Visitor extends TypeConvertingVisitor<String> {
+        private static final Visitor INSTANCE = new Visitor();
+
+        private Visitor() {
+            super(String.class, StringAttributeConverter.class);
+        }
+
+        @Override
+        public String convertString(String value) {
+            return value;
+        }
+
+        @Override
+        public String convertNumber(String value) {
+            return value;
+        }
+
+        @Override
+        public String convertBytes(SdkBytes value) {
+            return ByteArrayStringConverter.create().toString(value.asByteArray());
+        }
+
+        @Override
+        public String convertBoolean(Boolean value) {
+            return BooleanStringConverter.create().toString(value);
+        }
+
+        @Override
+        public String convertSetOfStrings(List<String> value) {
+            return value.toString();
+        }
+
+        @Override
+        public String convertSetOfNumbers(List<String> value) {
+            return value.toString();
+        }
+
+        @Override
+        public String convertSetOfBytes(List<SdkBytes> value) {
+            return value.stream()
+                        .map(this::convertBytes)
+                        .collect(Collectors.joining(",", "[", "]"));
+        }
+
+        @Override
+        public String convertMap(Map<String, AttributeValue> value) {
+            BinaryOperator<Object> throwingMerger = (l, r) -> {
+                // Should not happen: we're converting from map.
+                throw new IllegalStateException();
+            };
+
+            return value.entrySet().stream()
+                        .collect(Collectors.toMap(Map.Entry::getKey, i -> toString(i.getValue()),
+                                                  throwingMerger, LinkedHashMap::new))
+                        .toString();
+        }
+
+        @Override
+        public String convertListOfAttributeValues(List<AttributeValue> value) {
+            return value.stream()
+                        .map(Visitor::toString)
+                        .collect(toList())
+                        .toString();
+        }
+
+        public static String toString(AttributeValue attributeValue) {
+            return EnhancedAttributeValue.fromAttributeValue(attributeValue).convert(Visitor.INSTANCE);
+        }
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/StringBufferAttributeConverter.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/StringBufferAttributeConverter.java
new file mode 100644
index 000000000000..8696f2ff0b69
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/StringBufferAttributeConverter.java
@@ -0,0 +1,64 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute;
+
+import software.amazon.awssdk.annotations.Immutable;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeValueType;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+
+/**
+ * A converter between {@link StringBuffer} and {@link AttributeValue}.
+ *
+ * <p>
+ * This stores values in DynamoDB as a string.
+ *
+ * <p>
+ * This supports reading any DynamoDB attribute type into a string buffer.
+ */
+@SdkInternalApi
+@ThreadSafe
+@Immutable
+public final class StringBufferAttributeConverter implements AttributeConverter<StringBuffer> {
+    public static final StringAttributeConverter STRING_CONVERTER = StringAttributeConverter.create();
+
+    public static StringBufferAttributeConverter create() {
+        return new StringBufferAttributeConverter();
+    }
+
+    @Override
+    public EnhancedType<StringBuffer> type() {
+        return EnhancedType.of(StringBuffer.class);
+    }
+
+    @Override
+    public AttributeValueType attributeValueType() {
+        return AttributeValueType.S;
+    }
+
+    @Override
+    public AttributeValue transformFrom(StringBuffer input) {
+        return STRING_CONVERTER.transformFrom(input.toString());
+    }
+
+    @Override
+    public StringBuffer transformTo(AttributeValue input) {
+        return new StringBuffer(STRING_CONVERTER.transformTo(input));
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/StringBuilderAttributeConverter.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/StringBuilderAttributeConverter.java
new file mode 100644
index 000000000000..6ab3ae48fc35
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/StringBuilderAttributeConverter.java
@@ -0,0 +1,65 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute;
+
+import software.amazon.awssdk.annotations.Immutable;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeValueType;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+
+
+/**
+ * A converter between {@link StringBuffer} and {@link AttributeValue}.
+ *
+ * <p>
+ * This stores values in DynamoDB as a string.
+ *
+ * <p>
+ * This supports reading any DynamoDB attribute type into a string builder.
+ */
+@SdkInternalApi
+@ThreadSafe
+@Immutable
+public final class StringBuilderAttributeConverter implements AttributeConverter<StringBuilder> {
+    public static final StringAttributeConverter STRING_CONVERTER = StringAttributeConverter.create();
+
+    public static StringBuilderAttributeConverter create() {
+        return new StringBuilderAttributeConverter();
+    }
+
+    @Override
+    public EnhancedType<StringBuilder> type() {
+        return EnhancedType.of(StringBuilder.class);
+    }
+
+    @Override
+    public AttributeValueType attributeValueType() {
+        return AttributeValueType.S;
+    }
+
+    @Override
+    public AttributeValue transformFrom(StringBuilder input) {
+        return STRING_CONVERTER.transformFrom(input.toString());
+    }
+
+    @Override
+    public StringBuilder transformTo(AttributeValue input) {
+        return new StringBuilder(STRING_CONVERTER.transformTo(input));
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/UriAttributeConverter.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/UriAttributeConverter.java
new file mode 100644
index 000000000000..cefe7bd5af07
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/UriAttributeConverter.java
@@ -0,0 +1,78 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute;
+
+import java.net.URI;
+import software.amazon.awssdk.annotations.Immutable;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeValueType;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.TypeConvertingVisitor;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.string.UriStringConverter;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+
+/**
+ * A converter between {@link URI} and {@link AttributeValue}.
+ *
+ * <p>
+ * This stores and reads values in DynamoDB as a string, according to the format of {@link URI#create(String)} and
+ * {@link URI#toString()}.
+ */
+@SdkInternalApi
+@ThreadSafe
+@Immutable
+public final class UriAttributeConverter implements AttributeConverter<URI> {
+    public static final UriStringConverter STRING_CONVERTER = UriStringConverter.create();
+
+    public static UriAttributeConverter create() {
+        return new UriAttributeConverter();
+    }
+
+    @Override
+    public EnhancedType<URI> type() {
+        return EnhancedType.of(URI.class);
+    }
+
+    @Override
+    public AttributeValueType attributeValueType() {
+        return AttributeValueType.S;
+    }
+
+    @Override
+    public AttributeValue transformFrom(URI input) {
+        return AttributeValue.builder().s(STRING_CONVERTER.toString(input)).build();
+    }
+
+    @Override
+    public URI transformTo(AttributeValue input) {
+        return EnhancedAttributeValue.fromAttributeValue(input).convert(Visitor.INSTANCE);
+    }
+
+    private static final class Visitor extends TypeConvertingVisitor<URI> {
+        private static final Visitor INSTANCE = new Visitor();
+
+        private Visitor() {
+            super(URI.class, UriAttributeConverter.class);
+        }
+
+        @Override
+        public URI convertString(String value) {
+            return STRING_CONVERTER.fromString(value);
+        }
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/UrlAttributeConverter.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/UrlAttributeConverter.java
new file mode 100644
index 000000000000..03f56ce3f94c
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/UrlAttributeConverter.java
@@ -0,0 +1,78 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute;
+
+import java.net.URL;
+import software.amazon.awssdk.annotations.Immutable;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeValueType;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.TypeConvertingVisitor;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.string.UrlStringConverter;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+
+/**
+ * A converter between {@link URL} and {@link AttributeValue}.
+ *
+ * <p>
+ * This stores and reads values in DynamoDB as a string, according to the format of {@link URL#URL(String)} and
+ * {@link URL#toString()}.
+ */
+@SdkInternalApi
+@ThreadSafe
+@Immutable
+public final class UrlAttributeConverter implements AttributeConverter<URL> {
+    public static final UrlStringConverter STRING_CONVERTER = UrlStringConverter.create();
+
+    public static UrlAttributeConverter create() {
+        return new UrlAttributeConverter();
+    }
+
+    @Override
+    public EnhancedType<URL> type() {
+        return EnhancedType.of(URL.class);
+    }
+
+    @Override
+    public AttributeValueType attributeValueType() {
+        return AttributeValueType.S;
+    }
+
+    @Override
+    public AttributeValue transformFrom(URL input) {
+        return AttributeValue.builder().s(STRING_CONVERTER.toString(input)).build();
+    }
+
+    @Override
+    public URL transformTo(AttributeValue input) {
+        return EnhancedAttributeValue.fromAttributeValue(input).convert(Visitor.INSTANCE);
+    }
+
+    private static final class Visitor extends TypeConvertingVisitor<URL> {
+        private static final Visitor INSTANCE = new Visitor();
+
+        private Visitor() {
+            super(URL.class, UrlAttributeConverter.class);
+        }
+
+        @Override
+        public URL convertString(String value) {
+            return STRING_CONVERTER.fromString(value);
+        }
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/UuidAttributeConverter.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/UuidAttributeConverter.java
new file mode 100644
index 000000000000..b35f093510c3
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/UuidAttributeConverter.java
@@ -0,0 +1,77 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute;
+
+import java.util.UUID;
+import software.amazon.awssdk.annotations.Immutable;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeValueType;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.TypeConvertingVisitor;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.string.UuidStringConverter;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+
+/**
+ * A converter between {@link UUID} and {@link AttributeValue}.
+ *
+ * <p>
+ * This supports storing and reading values in DynamoDB as a string.
+ */
+@SdkInternalApi
+@ThreadSafe
+@Immutable
+public final class UuidAttributeConverter implements AttributeConverter<UUID> {
+    public static final UuidStringConverter STRING_CONVERTER = UuidStringConverter.create();
+
+    public static UuidAttributeConverter create() {
+        return new UuidAttributeConverter();
+    }
+
+    @Override
+    public EnhancedType<UUID> type() {
+        return EnhancedType.of(UUID.class);
+    }
+
+    @Override
+    public AttributeValueType attributeValueType() {
+        return AttributeValueType.S;
+    }
+
+    @Override
+    public AttributeValue transformFrom(UUID input) {
+        return AttributeValue.builder().s(STRING_CONVERTER.toString(input)).build();
+    }
+
+    @Override
+    public UUID transformTo(AttributeValue input) {
+        return EnhancedAttributeValue.fromAttributeValue(input).convert(Visitor.INSTANCE);
+    }
+
+    private static final class Visitor extends TypeConvertingVisitor<UUID> {
+        private static final Visitor INSTANCE = new Visitor();
+
+        private Visitor() {
+            super(UUID.class, UuidAttributeConverter.class);
+        }
+
+        @Override
+        public UUID convertString(String value) {
+            return STRING_CONVERTER.fromString(value);
+        }
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/ZoneIdAttributeConverter.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/ZoneIdAttributeConverter.java
new file mode 100644
index 000000000000..604bba52f730
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/ZoneIdAttributeConverter.java
@@ -0,0 +1,71 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute;
+
+import java.time.ZoneId;
+import java.time.zone.ZoneRulesException;
+import software.amazon.awssdk.annotations.Immutable;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeValueType;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.string.ZoneIdStringConverter;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+
+/**
+ * A converter between {@link ZoneId} and {@link AttributeValue}.
+ *
+ * <p>
+ * This stores and reads values in DynamoDB as a string using {@link ZoneId#toString()} and {@link ZoneId#of(String)}.
+ *
+ * <p>
+ * This can be created via {@link #create()}.
+ */
+@SdkInternalApi
+@ThreadSafe
+@Immutable
+public final class ZoneIdAttributeConverter implements AttributeConverter<ZoneId> {
+    public static final ZoneIdStringConverter STRING_CONVERTER = ZoneIdStringConverter.create();
+
+    public static ZoneIdAttributeConverter create() {
+        return new ZoneIdAttributeConverter();
+    }
+
+    @Override
+    public EnhancedType<ZoneId> type() {
+        return EnhancedType.of(ZoneId.class);
+    }
+
+    @Override
+    public AttributeValueType attributeValueType() {
+        return AttributeValueType.S;
+    }
+
+    @Override
+    public AttributeValue transformFrom(ZoneId input) {
+        return AttributeValue.builder().s(STRING_CONVERTER.toString(input)).build();
+    }
+
+    @Override
+    public ZoneId transformTo(AttributeValue input) {
+        try {
+            return STRING_CONVERTER.fromString(input.s());
+        } catch (ZoneRulesException e) {
+            throw new IllegalArgumentException(e);
+        }
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/ZoneOffsetAttributeConverter.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/ZoneOffsetAttributeConverter.java
new file mode 100644
index 000000000000..f03dd698fea8
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/ZoneOffsetAttributeConverter.java
@@ -0,0 +1,85 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute;
+
+import java.time.DateTimeException;
+import java.time.ZoneOffset;
+import software.amazon.awssdk.annotations.Immutable;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeValueType;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.TypeConvertingVisitor;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.string.ZoneOffsetStringConverter;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+
+/**
+ * A converter between {@link ZoneOffset} and {@link AttributeValue}.
+ *
+ * <p>
+ * This stores and reads values in DynamoDB as a string using {@link ZoneOffset#toString()} and {@link ZoneOffset#of(String)}.
+ *
+ * <p>
+ * This can be created via {@link #create()}.
+ */
+@SdkInternalApi
+@ThreadSafe
+@Immutable
+public final class ZoneOffsetAttributeConverter implements AttributeConverter<ZoneOffset> {
+    public static final ZoneOffsetStringConverter STRING_CONVERTER = ZoneOffsetStringConverter.create();
+
+    public static ZoneOffsetAttributeConverter create() {
+        return new ZoneOffsetAttributeConverter();
+    }
+
+    @Override
+    public EnhancedType<ZoneOffset> type() {
+        return EnhancedType.of(ZoneOffset.class);
+    }
+
+    @Override
+    public AttributeValueType attributeValueType() {
+        return AttributeValueType.S;
+    }
+
+    @Override
+    public AttributeValue transformFrom(ZoneOffset input) {
+        return AttributeValue.builder().s(STRING_CONVERTER.toString(input)).build();
+    }
+
+    @Override
+    public ZoneOffset transformTo(AttributeValue input) {
+        try {
+            return EnhancedAttributeValue.fromAttributeValue(input).convert(Visitor.INSTANCE);
+        } catch (DateTimeException e) {
+            throw new IllegalArgumentException(e);
+        }
+    }
+
+    private static final class Visitor extends TypeConvertingVisitor<ZoneOffset> {
+        private static final Visitor INSTANCE = new Visitor();
+
+        private Visitor() {
+            super(ZoneOffset.class, ZoneOffsetAttributeConverter.class);
+        }
+
+        @Override
+        public ZoneOffset convertString(String value) {
+            return STRING_CONVERTER.fromString(value);
+        }
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/ZonedDateTimeAsStringAttributeConverter.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/ZonedDateTimeAsStringAttributeConverter.java
new file mode 100644
index 000000000000..cdbf2e8871e9
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/ZonedDateTimeAsStringAttributeConverter.java
@@ -0,0 +1,90 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute;
+
+import java.time.Instant;
+import java.time.OffsetDateTime;
+import java.time.ZonedDateTime;
+import software.amazon.awssdk.annotations.Immutable;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeValueType;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.TimeConversion;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+
+/**
+ * A converter between {@link ZonedDateTime} and {@link AttributeValue}.
+ *
+ * <p>
+ * This stores values in DynamoDB as a string.
+ *
+ * <p>
+ * Values are stored in a ISO-8601-like format, with the non-offset zone IDs being added at the end of the string in square
+ * brackets. If the zone ID offset has seconds, then they will also be included, even though this is not part of the ISO-8601
+ * standard. For full ISO-8601 compliance, it is better to use {@link OffsetDateTime}s (without second-level precision in its
+ * offset) or {@link Instant}s, assuming the time zone information is not strictly required.
+ *
+ * <p>
+ * Examples:
+ * <ul>
+ *     <li>{@code Instant.EPOCH.atZone(ZoneId.of("Europe/Paris"))} is stored as
+ *     {@code 1970-01-01T01:00:00+01:00[Europe/Paris]}</li>
+ *     <li>{@code OffsetDateTime.MIN.toZonedDateTime()} is stored as
+ *     {@code ItemAttributeValueMapper.fromString("-999999999-01-01T00:00:00+18:00")}</li>
+ *     <li>{@code OffsetDateTime.MAX.toZonedDateTime()} is stored as
+ *     {@code ItemAttributeValueMapper.fromString("+999999999-12-31T23:59:59.999999999-18:00")}</li>
+ *     <li>{@code Instant.EPOCH.atZone(ZoneOffset.UTC)} is stored as
+ *     {@code ItemAttributeValueMapper.fromString("1970-01-01T00:00:00Z")}</li>
+ * </ul>
+ *
+ * <p>
+ * This converter can read any values written by itself, {@link InstantAsIntegerAttributeConverter},
+ * {@link InstantAsStringAttributeConverter}, or {@link OffsetDateTimeAsStringAttributeConverter}. Values written by
+ * {@code Instant} converters are treated as if they are in the UTC time zone.
+ *
+ * <p>
+ * This can be created via {@link #create()}.
+ */
+@SdkInternalApi
+@ThreadSafe
+@Immutable
+public final class ZonedDateTimeAsStringAttributeConverter implements AttributeConverter<ZonedDateTime> {
+    public static ZonedDateTimeAsStringAttributeConverter create() {
+        return new ZonedDateTimeAsStringAttributeConverter();
+    }
+
+    @Override
+    public EnhancedType<ZonedDateTime> type() {
+        return EnhancedType.of(ZonedDateTime.class);
+    }
+
+    @Override
+    public AttributeValueType attributeValueType() {
+        return AttributeValueType.S;
+    }
+
+    @Override
+    public AttributeValue transformFrom(ZonedDateTime input) {
+        return TimeConversion.toStringAttributeValue(input);
+    }
+
+    @Override
+    public ZonedDateTime transformTo(AttributeValue input) {
+        return TimeConversion.zonedDateTimeFromAttributeValue(EnhancedAttributeValue.fromAttributeValue(input));
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/AtomicBooleanStringConverter.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/AtomicBooleanStringConverter.java
new file mode 100644
index 000000000000..bfef11069f7e
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/AtomicBooleanStringConverter.java
@@ -0,0 +1,58 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.converter.string;
+
+import java.util.concurrent.atomic.AtomicBoolean;
+import software.amazon.awssdk.annotations.Immutable;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.StringConverter;
+
+/**
+ * A converter between {@link AtomicBoolean} and {@link String}.
+ *
+ * <p>
+ * This converts values using {@link BooleanStringConverter}.
+ */
+@SdkInternalApi
+@ThreadSafe
+@Immutable
+public class AtomicBooleanStringConverter implements StringConverter<AtomicBoolean> {
+    private static BooleanStringConverter BOOLEAN_CONVERTER = BooleanStringConverter.create();
+
+    private AtomicBooleanStringConverter() {
+    }
+
+    public static AtomicBooleanStringConverter create() {
+        return new AtomicBooleanStringConverter();
+    }
+
+    @Override
+    public EnhancedType<AtomicBoolean> type() {
+        return EnhancedType.of(AtomicBoolean.class);
+    }
+
+    @Override
+    public String toString(AtomicBoolean object) {
+        return BOOLEAN_CONVERTER.toString(object.get());
+    }
+
+    @Override
+    public AtomicBoolean fromString(String string) {
+        return new AtomicBoolean(BOOLEAN_CONVERTER.fromString(string));
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/AtomicIntegerStringConverter.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/AtomicIntegerStringConverter.java
new file mode 100644
index 000000000000..f679f472a3c5
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/AtomicIntegerStringConverter.java
@@ -0,0 +1,58 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.converter.string;
+
+import java.util.concurrent.atomic.AtomicInteger;
+import software.amazon.awssdk.annotations.Immutable;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.StringConverter;
+
+/**
+ * A converter between {@link AtomicInteger} and {@link String}.
+ *
+ * <p>
+ * This converts values using {@link IntegerStringConverter}.
+ */
+@SdkInternalApi
+@ThreadSafe
+@Immutable
+public class AtomicIntegerStringConverter implements StringConverter<AtomicInteger> {
+    private static IntegerStringConverter INTEGER_CONVERTER = IntegerStringConverter.create();
+
+    private AtomicIntegerStringConverter() {
+    }
+
+    public static AtomicIntegerStringConverter create() {
+        return new AtomicIntegerStringConverter();
+    }
+
+    @Override
+    public EnhancedType<AtomicInteger> type() {
+        return EnhancedType.of(AtomicInteger.class);
+    }
+
+    @Override
+    public String toString(AtomicInteger object) {
+        return INTEGER_CONVERTER.toString(object.get());
+    }
+
+    @Override
+    public AtomicInteger fromString(String string) {
+        return new AtomicInteger(INTEGER_CONVERTER.fromString(string));
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/AtomicLongStringConverter.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/AtomicLongStringConverter.java
new file mode 100644
index 000000000000..7d91e86efece
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/AtomicLongStringConverter.java
@@ -0,0 +1,58 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.converter.string;
+
+import java.util.concurrent.atomic.AtomicLong;
+import software.amazon.awssdk.annotations.Immutable;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.StringConverter;
+
+/**
+ * A converter between {@link AtomicLong} and {@link String}.
+ *
+ * <p>
+ * This converts values using {@link LongStringConverter}.
+ */
+@SdkInternalApi
+@ThreadSafe
+@Immutable
+public class AtomicLongStringConverter implements StringConverter<AtomicLong> {
+    private static LongStringConverter LONG_CONVERTER = LongStringConverter.create();
+
+    private AtomicLongStringConverter() {
+    }
+
+    public static AtomicLongStringConverter create() {
+        return new AtomicLongStringConverter();
+    }
+
+    @Override
+    public EnhancedType<AtomicLong> type() {
+        return EnhancedType.of(AtomicLong.class);
+    }
+
+    @Override
+    public String toString(AtomicLong object) {
+        return LONG_CONVERTER.toString(object.get());
+    }
+
+    @Override
+    public AtomicLong fromString(String string) {
+        return new AtomicLong(LONG_CONVERTER.fromString(string));
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/BigDecimalStringConverter.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/BigDecimalStringConverter.java
new file mode 100644
index 000000000000..918867602002
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/BigDecimalStringConverter.java
@@ -0,0 +1,51 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.converter.string;
+
+import java.math.BigDecimal;
+import software.amazon.awssdk.annotations.Immutable;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.StringConverter;
+
+/**
+ * A converter between {@link BigDecimal} and {@link String}.
+ *
+ * <p>
+ * This converts values using {@link BigDecimal#toString()} and {@link BigDecimal#BigDecimal(String)}.
+ */
+@SdkInternalApi
+@ThreadSafe
+@Immutable
+public class BigDecimalStringConverter implements StringConverter<BigDecimal> {
+    private BigDecimalStringConverter() {
+    }
+
+    public static BigDecimalStringConverter create() {
+        return new BigDecimalStringConverter();
+    }
+
+    @Override
+    public EnhancedType<BigDecimal> type() {
+        return EnhancedType.of(BigDecimal.class);
+    }
+
+    @Override
+    public BigDecimal fromString(String string) {
+        return new BigDecimal(string);
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/BigIntegerStringConverter.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/BigIntegerStringConverter.java
new file mode 100644
index 000000000000..ea362c9033cc
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/BigIntegerStringConverter.java
@@ -0,0 +1,51 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.converter.string;
+
+import java.math.BigInteger;
+import software.amazon.awssdk.annotations.Immutable;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.StringConverter;
+
+/**
+ * A converter between {@link BigInteger} and {@link String}.
+ *
+ * <p>
+ * This converts values using {@link BigInteger#toString()} and {@link BigInteger#BigInteger(String)}.
+ */
+@SdkInternalApi
+@ThreadSafe
+@Immutable
+public class BigIntegerStringConverter implements StringConverter<BigInteger> {
+    private BigIntegerStringConverter() {
+    }
+
+    public static BigIntegerStringConverter create() {
+        return new BigIntegerStringConverter();
+    }
+
+    @Override
+    public EnhancedType<BigInteger> type() {
+        return EnhancedType.of(BigInteger.class);
+    }
+
+    @Override
+    public BigInteger fromString(String string) {
+        return new BigInteger(string);
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/BooleanStringConverter.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/BooleanStringConverter.java
new file mode 100644
index 000000000000..f0c555020778
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/BooleanStringConverter.java
@@ -0,0 +1,62 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.converter.string;
+
+import java.math.BigInteger;
+import software.amazon.awssdk.annotations.Immutable;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.PrimitiveConverter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.StringConverter;
+
+/**
+ * A converter between {@link BigInteger} and {@link String}.
+ *
+ * <p>
+ * This converts values to strings using {@link Boolean#toString()}. This converts the literal string values "true" and "false"
+ * to a boolean. Any other string values will result in an exception.
+ */
+@SdkInternalApi
+@ThreadSafe
+@Immutable
+public class BooleanStringConverter implements StringConverter<Boolean>, PrimitiveConverter<Boolean> {
+    private BooleanStringConverter() {
+    }
+
+    public static BooleanStringConverter create() {
+        return new BooleanStringConverter();
+    }
+
+    @Override
+    public EnhancedType<Boolean> type() {
+        return EnhancedType.of(Boolean.class);
+    }
+
+    @Override
+    public EnhancedType<Boolean> primitiveType() {
+        return EnhancedType.of(boolean.class);
+    }
+
+    @Override
+    public Boolean fromString(String string) {
+        switch (string) {
+            case "true": return true;
+            case "false": return false;
+            default: throw new IllegalArgumentException("Boolean string was not 'true' or 'false': " + string);
+        }
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/ByteArrayStringConverter.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/ByteArrayStringConverter.java
new file mode 100644
index 000000000000..1a9ac6bcb287
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/ByteArrayStringConverter.java
@@ -0,0 +1,57 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.converter.string;
+
+import java.math.BigInteger;
+import software.amazon.awssdk.annotations.Immutable;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.StringConverter;
+import software.amazon.awssdk.utils.BinaryUtils;
+
+/**
+ * A converter between {@link BigInteger} and {@link String}.
+ *
+ * <p>
+ * This converts bytes to a base 64 string.
+ */
+@SdkInternalApi
+@ThreadSafe
+@Immutable
+public class ByteArrayStringConverter implements StringConverter<byte[]> {
+    private ByteArrayStringConverter() {
+    }
+
+    public static ByteArrayStringConverter create() {
+        return new ByteArrayStringConverter();
+    }
+
+    @Override
+    public EnhancedType<byte[]> type() {
+        return EnhancedType.of(byte[].class);
+    }
+
+    @Override
+    public String toString(byte[] object) {
+        return BinaryUtils.toBase64(object);
+    }
+
+    @Override
+    public byte[] fromString(String string) {
+        return BinaryUtils.fromBase64(string);
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/ByteStringConverter.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/ByteStringConverter.java
new file mode 100644
index 000000000000..64406ee1dff1
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/ByteStringConverter.java
@@ -0,0 +1,57 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.converter.string;
+
+import java.math.BigInteger;
+import software.amazon.awssdk.annotations.Immutable;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.PrimitiveConverter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.StringConverter;
+
+/**
+ * A converter between {@link BigInteger} and {@link String}.
+ *
+ * <p>
+ * This converts values using {@link Byte#toString()} and {@link Byte#valueOf(String)}.
+ */
+@SdkInternalApi
+@ThreadSafe
+@Immutable
+public class ByteStringConverter implements StringConverter<Byte>, PrimitiveConverter<Byte> {
+    private ByteStringConverter() {
+    }
+
+    public static ByteStringConverter create() {
+        return new ByteStringConverter();
+    }
+
+    @Override
+    public EnhancedType<Byte> type() {
+        return EnhancedType.of(Byte.class);
+    }
+
+    @Override
+    public EnhancedType<Byte> primitiveType() {
+        return EnhancedType.of(byte.class);
+    }
+
+    @Override
+    public Byte fromString(String string) {
+        return Byte.valueOf(string);
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/CharSequenceStringConverter.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/CharSequenceStringConverter.java
new file mode 100644
index 000000000000..d6fb5efa40bd
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/CharSequenceStringConverter.java
@@ -0,0 +1,47 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.converter.string;
+
+import software.amazon.awssdk.annotations.Immutable;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.StringConverter;
+
+/**
+ * A converter between {@link CharSequence} and {@link String}.
+ */
+@SdkInternalApi
+@ThreadSafe
+@Immutable
+public class CharSequenceStringConverter implements StringConverter<CharSequence> {
+    private CharSequenceStringConverter() {
+    }
+
+    public static CharSequenceStringConverter create() {
+        return new CharSequenceStringConverter();
+    }
+
+    @Override
+    public EnhancedType<CharSequence> type() {
+        return EnhancedType.of(CharSequence.class);
+    }
+
+    @Override
+    public CharSequence fromString(String string) {
+        return string;
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/CharacterArrayStringConverter.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/CharacterArrayStringConverter.java
new file mode 100644
index 000000000000..420a346e0cd9
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/CharacterArrayStringConverter.java
@@ -0,0 +1,55 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.converter.string;
+
+import software.amazon.awssdk.annotations.Immutable;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.StringConverter;
+
+/**
+ * A converter between {@code char[]} and {@link String}.
+ *
+ * <p>
+ * This converts values using {@link String#String(char[])} and {@link String#toCharArray()}.
+ */
+@SdkInternalApi
+@ThreadSafe
+@Immutable
+public class CharacterArrayStringConverter implements StringConverter<char[]> {
+    private CharacterArrayStringConverter() {
+    }
+
+    public static CharacterArrayStringConverter create() {
+        return new CharacterArrayStringConverter();
+    }
+
+    @Override
+    public EnhancedType<char[]> type() {
+        return EnhancedType.of(char[].class);
+    }
+
+    @Override
+    public String toString(char[] object) {
+        return new String(object);
+    }
+
+    @Override
+    public char[] fromString(String string) {
+        return string.toCharArray();
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/CharacterStringConverter.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/CharacterStringConverter.java
new file mode 100644
index 000000000000..b7965c522933
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/CharacterStringConverter.java
@@ -0,0 +1,59 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.converter.string;
+
+import software.amazon.awssdk.annotations.Immutable;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.PrimitiveConverter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.StringConverter;
+import software.amazon.awssdk.utils.Validate;
+
+/**
+ * A converter between {@link Character} and {@link String}.
+ *
+ * <p>
+ * This converts values using {@link Character#toString()} and {@link String#charAt(int)}. If the string value is longer
+ * than 1 character, an exception will be raised.
+ */
+@SdkInternalApi
+@ThreadSafe
+@Immutable
+public class CharacterStringConverter implements StringConverter<Character>, PrimitiveConverter<Character> {
+    private CharacterStringConverter() {
+    }
+
+    public static CharacterStringConverter create() {
+        return new CharacterStringConverter();
+    }
+
+    @Override
+    public EnhancedType<Character> type() {
+        return EnhancedType.of(Character.class);
+    }
+
+    @Override
+    public EnhancedType<Character> primitiveType() {
+        return EnhancedType.of(char.class);
+    }
+
+    @Override
+    public Character fromString(String string) {
+        Validate.isTrue(string.length() == 1, "Character string was not of length 1: %s", string);
+        return string.charAt(0);
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/DefaultStringConverterProvider.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/DefaultStringConverterProvider.java
new file mode 100644
index 000000000000..b4303f557c30
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/DefaultStringConverterProvider.java
@@ -0,0 +1,192 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.converter.string;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.concurrent.ConcurrentHashMap;
+import software.amazon.awssdk.annotations.Immutable;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.PrimitiveConverter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.StringConverter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.StringConverterProvider;
+import software.amazon.awssdk.utils.Validate;
+
+/**
+ * <p>
+ * Included converters:
+ * <ul>
+ *     <li>{@link AtomicIntegerStringConverter}</li>
+ *     <li>{@link AtomicLongStringConverter}</li>
+ *     <li>{@link BigDecimalStringConverter}</li>
+ *     <li>{@link BigIntegerStringConverter}</li>
+ *     <li>{@link DoubleStringConverter}</li>
+ *     <li>{@link DurationStringConverter}</li>
+ *     <li>{@link FloatStringConverter}</li>
+ *     <li>{@link InstantStringConverter}</li>
+ *     <li>{@link IntegerStringConverter}</li>
+ *     <li>{@link LocalDateStringConverter}</li>
+ *     <li>{@link LocalDateTimeStringConverter}</li>
+ *     <li>{@link LocalTimeStringConverter}</li>
+ *     <li>{@link LongStringConverter}</li>
+ *     <li>{@link MonthDayStringConverter}</li>
+ *     <li>{@link OptionalDoubleStringConverter}</li>
+ *     <li>{@link OptionalIntStringConverter}</li>
+ *     <li>{@link OptionalLongStringConverter}</li>
+ *     <li>{@link ShortStringConverter}</li>
+ *     <li>{@link CharacterArrayStringConverter}</li>
+ *     <li>{@link CharacterStringConverter}</li>
+ *     <li>{@link CharSequenceStringConverter}</li>
+ *     <li>{@link OffsetDateTimeStringConverter}</li>
+ *     <li>{@link PeriodStringConverter}</li>
+ *     <li>{@link StringStringConverter}</li>
+ *     <li>{@link StringBufferStringConverter}</li>
+ *     <li>{@link StringBuilderStringConverter}</li>
+ *     <li>{@link UriStringConverter}</li>
+ *     <li>{@link UrlStringConverter}</li>
+ *     <li>{@link UuidStringConverter}</li>
+ *     <li>{@link ZonedDateTimeStringConverter}</li>
+ *     <li>{@link ZoneIdStringConverter}</li>
+ *     <li>{@link ZoneOffsetStringConverter}</li>
+ *     <li>{@link ByteArrayStringConverter}</li>
+ *     <li>{@link ByteStringConverter}</li>
+ *     <li>{@link SdkBytesStringConverter}</li>
+ *     <li>{@link AtomicBooleanStringConverter}</li>
+ *     <li>{@link BooleanStringConverter}</li>
+ * </ul>
+ *
+ * <p>
+ * This can be created via {@link #create()}.
+ */
+@SdkInternalApi
+@ThreadSafe
+@Immutable
+public class DefaultStringConverterProvider implements StringConverterProvider {
+
+    private final ConcurrentHashMap<EnhancedType<?>, StringConverter<?>> converterCache =
+        new ConcurrentHashMap<>();
+
+    private DefaultStringConverterProvider(Builder builder) {
+        // Converters are used in the REVERSE order of how they were added to the builder.
+        for (int i = builder.converters.size() - 1; i >= 0; i--) {
+            StringConverter<?> converter = builder.converters.get(i);
+            converterCache.put(converter.type(), converter);
+
+            if (converter instanceof PrimitiveConverter) {
+                PrimitiveConverter primitiveConverter = (PrimitiveConverter) converter;
+                converterCache.put(primitiveConverter.primitiveType(), converter);
+            }
+        }
+    }
+
+    /**
+     * Create a builder for a {@link DefaultStringConverterProvider}.
+     */
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    public static DefaultStringConverterProvider create() {
+        return DefaultStringConverterProvider.builder()
+                                             .addConverter(ByteArrayStringConverter.create())
+                                             .addConverter(CharacterArrayStringConverter.create())
+                                             .addConverter(BooleanStringConverter.create())
+                                             .addConverter(ShortStringConverter.create())
+                                             .addConverter(IntegerStringConverter.create())
+                                             .addConverter(LongStringConverter.create())
+                                             .addConverter(FloatStringConverter.create())
+                                             .addConverter(DoubleStringConverter.create())
+                                             .addConverter(CharacterStringConverter.create())
+                                             .addConverter(ByteStringConverter.create())
+                                             .addConverter(StringStringConverter.create())
+                                             .addConverter(CharSequenceStringConverter.create())
+                                             .addConverter(StringBufferStringConverter.create())
+                                             .addConverter(StringBuilderStringConverter.create())
+                                             .addConverter(BigIntegerStringConverter.create())
+                                             .addConverter(BigDecimalStringConverter.create())
+                                             .addConverter(AtomicLongStringConverter.create())
+                                             .addConverter(AtomicIntegerStringConverter.create())
+                                             .addConverter(AtomicBooleanStringConverter.create())
+                                             .addConverter(OptionalIntStringConverter.create())
+                                             .addConverter(OptionalLongStringConverter.create())
+                                             .addConverter(OptionalDoubleStringConverter.create())
+                                             .addConverter(InstantStringConverter.create())
+                                             .addConverter(DurationStringConverter.create())
+                                             .addConverter(LocalDateStringConverter.create())
+                                             .addConverter(LocalTimeStringConverter.create())
+                                             .addConverter(LocalDateTimeStringConverter.create())
+                                             .addConverter(OffsetTimeStringConverter.create())
+                                             .addConverter(OffsetDateTimeStringConverter.create())
+                                             .addConverter(ZonedDateTimeStringConverter.create())
+                                             .addConverter(YearStringConverter.create())
+                                             .addConverter(YearMonthStringConverter.create())
+                                             .addConverter(MonthDayStringConverter.create())
+                                             .addConverter(PeriodStringConverter.create())
+                                             .addConverter(ZoneOffsetStringConverter.create())
+                                             .addConverter(ZoneIdStringConverter.create())
+                                             .addConverter(UuidStringConverter.create())
+                                             .addConverter(UrlStringConverter.create())
+                                             .addConverter(UriStringConverter.create())
+                                             .build();
+    }
+
+    @Override
+    public <T> StringConverter converterFor(EnhancedType<T> enhancedType) {
+        @SuppressWarnings("unchecked") // We initialized correctly, so this is safe.
+        StringConverter<T> converter = (StringConverter<T>) converterCache.get(enhancedType);
+
+        if (converter == null) {
+            throw new IllegalArgumentException("No string converter exists for " + enhancedType.rawClass());
+        }
+
+        return converter;
+    }
+
+    /**
+     * A builder for configuring and creating {@link DefaultStringConverterProvider}s.
+     */
+    public static class Builder {
+        private List<StringConverter<?>> converters = new ArrayList<>();
+
+        private Builder() {
+        }
+
+        public Builder addConverters(Collection<? extends StringConverter<?>> converters) {
+            Validate.paramNotNull(converters, "converters");
+            Validate.noNullElements(converters, "Converters must not contain null members.");
+            this.converters.addAll(converters);
+            return this;
+        }
+
+        public Builder addConverter(StringConverter<?> converter) {
+            Validate.paramNotNull(converter, "converter");
+            this.converters.add(converter);
+            return this;
+        }
+
+        public Builder clearConverters() {
+            this.converters.clear();
+            return this;
+        }
+
+        public DefaultStringConverterProvider build() {
+            return new DefaultStringConverterProvider(this);
+        }
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/DoubleStringConverter.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/DoubleStringConverter.java
new file mode 100644
index 000000000000..f6be14dd54aa
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/DoubleStringConverter.java
@@ -0,0 +1,53 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.converter.string;
+
+import software.amazon.awssdk.annotations.Immutable;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.PrimitiveConverter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.StringConverter;
+
+/**
+ * A converter between {@link Double} and {@link String}.
+ */
+@SdkInternalApi
+@ThreadSafe
+@Immutable
+public class DoubleStringConverter implements StringConverter<Double>, PrimitiveConverter<Double> {
+    private DoubleStringConverter() {
+    }
+
+    public static DoubleStringConverter create() {
+        return new DoubleStringConverter();
+    }
+
+    @Override
+    public EnhancedType<Double> type() {
+        return EnhancedType.of(Double.class);
+    }
+
+    @Override
+    public EnhancedType<Double> primitiveType() {
+        return EnhancedType.of(double.class);
+    }
+
+    @Override
+    public Double fromString(String string) {
+        return Double.valueOf(string);
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/DurationStringConverter.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/DurationStringConverter.java
new file mode 100644
index 000000000000..4e1ff544e91b
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/DurationStringConverter.java
@@ -0,0 +1,48 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.converter.string;
+
+import java.time.Duration;
+import software.amazon.awssdk.annotations.Immutable;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.StringConverter;
+
+/**
+ * A converter between {@link Duration} and {@link String}.
+ */
+@SdkInternalApi
+@ThreadSafe
+@Immutable
+public class DurationStringConverter implements StringConverter<Duration> {
+    private DurationStringConverter() {
+    }
+
+    public static DurationStringConverter create() {
+        return new DurationStringConverter();
+    }
+
+    @Override
+    public EnhancedType<Duration> type() {
+        return EnhancedType.of(Duration.class);
+    }
+
+    @Override
+    public Duration fromString(String string) {
+        return Duration.parse(string);
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/FloatStringConverter.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/FloatStringConverter.java
new file mode 100644
index 000000000000..9f2582729f4c
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/FloatStringConverter.java
@@ -0,0 +1,53 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.converter.string;
+
+import software.amazon.awssdk.annotations.Immutable;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.PrimitiveConverter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.StringConverter;
+
+/**
+ * A converter between {@link Float} and {@link String}.
+ */
+@SdkInternalApi
+@ThreadSafe
+@Immutable
+public class FloatStringConverter implements StringConverter<Float>, PrimitiveConverter<Float> {
+    private FloatStringConverter() {
+    }
+
+    public static FloatStringConverter create() {
+        return new FloatStringConverter();
+    }
+
+    @Override
+    public EnhancedType<Float> type() {
+        return EnhancedType.of(Float.class);
+    }
+
+    @Override
+    public EnhancedType<Float> primitiveType() {
+        return EnhancedType.of(float.class);
+    }
+
+    @Override
+    public Float fromString(String string) {
+        return Float.valueOf(string);
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/InstantStringConverter.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/InstantStringConverter.java
new file mode 100644
index 000000000000..7d039e223c9c
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/InstantStringConverter.java
@@ -0,0 +1,48 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.converter.string;
+
+import java.time.Instant;
+import software.amazon.awssdk.annotations.Immutable;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.StringConverter;
+
+/**
+ * A converter between {@link Instant} and {@link String}.
+ */
+@SdkInternalApi
+@ThreadSafe
+@Immutable
+public class InstantStringConverter implements StringConverter<Instant> {
+    private InstantStringConverter() {
+    }
+
+    public static InstantStringConverter create() {
+        return new InstantStringConverter();
+    }
+
+    @Override
+    public EnhancedType<Instant> type() {
+        return EnhancedType.of(Instant.class);
+    }
+
+    @Override
+    public Instant fromString(String string) {
+        return Instant.parse(string);
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/IntegerStringConverter.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/IntegerStringConverter.java
new file mode 100644
index 000000000000..9c5b6cd8327f
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/IntegerStringConverter.java
@@ -0,0 +1,53 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.converter.string;
+
+import software.amazon.awssdk.annotations.Immutable;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.PrimitiveConverter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.StringConverter;
+
+/**
+ * A converter between {@link Integer} and {@link String}.
+ */
+@SdkInternalApi
+@ThreadSafe
+@Immutable
+public class IntegerStringConverter implements StringConverter<Integer>, PrimitiveConverter<Integer> {
+    private IntegerStringConverter() {
+    }
+
+    public static IntegerStringConverter create() {
+        return new IntegerStringConverter();
+    }
+
+    @Override
+    public EnhancedType<Integer> type() {
+        return EnhancedType.of(Integer.class);
+    }
+
+    @Override
+    public EnhancedType<Integer> primitiveType() {
+        return EnhancedType.of(int.class);
+    }
+
+    @Override
+    public Integer fromString(String string) {
+        return Integer.valueOf(string);
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/LocalDateStringConverter.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/LocalDateStringConverter.java
new file mode 100644
index 000000000000..11153080d796
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/LocalDateStringConverter.java
@@ -0,0 +1,48 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.converter.string;
+
+import java.time.LocalDate;
+import software.amazon.awssdk.annotations.Immutable;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.StringConverter;
+
+/**
+ * A converter between {@link LocalDate} and {@link String}.
+ */
+@SdkInternalApi
+@ThreadSafe
+@Immutable
+public class LocalDateStringConverter implements StringConverter<LocalDate> {
+    private LocalDateStringConverter() {
+    }
+
+    public static LocalDateStringConverter create() {
+        return new LocalDateStringConverter();
+    }
+
+    @Override
+    public EnhancedType<LocalDate> type() {
+        return EnhancedType.of(LocalDate.class);
+    }
+
+    @Override
+    public LocalDate fromString(String string) {
+        return LocalDate.parse(string);
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/LocalDateTimeStringConverter.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/LocalDateTimeStringConverter.java
new file mode 100644
index 000000000000..f1272e52b086
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/LocalDateTimeStringConverter.java
@@ -0,0 +1,48 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.converter.string;
+
+import java.time.LocalDateTime;
+import software.amazon.awssdk.annotations.Immutable;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.StringConverter;
+
+/**
+ * A converter between {@link LocalDateTime} and {@link String}.
+ */
+@SdkInternalApi
+@ThreadSafe
+@Immutable
+public class LocalDateTimeStringConverter implements StringConverter<LocalDateTime> {
+    private LocalDateTimeStringConverter() {
+    }
+
+    public static LocalDateTimeStringConverter create() {
+        return new LocalDateTimeStringConverter();
+    }
+
+    @Override
+    public EnhancedType<LocalDateTime> type() {
+        return EnhancedType.of(LocalDateTime.class);
+    }
+
+    @Override
+    public LocalDateTime fromString(String string) {
+        return LocalDateTime.parse(string);
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/LocalTimeStringConverter.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/LocalTimeStringConverter.java
new file mode 100644
index 000000000000..08d93ae04aaf
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/LocalTimeStringConverter.java
@@ -0,0 +1,48 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.converter.string;
+
+import java.time.LocalTime;
+import software.amazon.awssdk.annotations.Immutable;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.StringConverter;
+
+/**
+ * A converter between {@link LocalTime} and {@link String}.
+ */
+@SdkInternalApi
+@ThreadSafe
+@Immutable
+public class LocalTimeStringConverter implements StringConverter<LocalTime> {
+    private LocalTimeStringConverter() {
+    }
+
+    public static LocalTimeStringConverter create() {
+        return new LocalTimeStringConverter();
+    }
+
+    @Override
+    public EnhancedType<LocalTime> type() {
+        return EnhancedType.of(LocalTime.class);
+    }
+
+    @Override
+    public LocalTime fromString(String string) {
+        return LocalTime.parse(string);
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/LongStringConverter.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/LongStringConverter.java
new file mode 100644
index 000000000000..e7c70c4fcb10
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/LongStringConverter.java
@@ -0,0 +1,53 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.converter.string;
+
+import software.amazon.awssdk.annotations.Immutable;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.PrimitiveConverter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.StringConverter;
+
+/**
+ * A converter between {@link Long} and {@link String}.
+ */
+@SdkInternalApi
+@ThreadSafe
+@Immutable
+public class LongStringConverter implements StringConverter<Long>, PrimitiveConverter<Long> {
+    private LongStringConverter() {
+    }
+
+    public static LongStringConverter create() {
+        return new LongStringConverter();
+    }
+
+    @Override
+    public EnhancedType<Long> type() {
+        return EnhancedType.of(Long.class);
+    }
+
+    @Override
+    public EnhancedType<Long> primitiveType() {
+        return EnhancedType.of(long.class);
+    }
+
+    @Override
+    public Long fromString(String string) {
+        return Long.valueOf(string);
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/MonthDayStringConverter.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/MonthDayStringConverter.java
new file mode 100644
index 000000000000..a7a3c4f00eff
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/MonthDayStringConverter.java
@@ -0,0 +1,48 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.converter.string;
+
+import java.time.MonthDay;
+import software.amazon.awssdk.annotations.Immutable;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.StringConverter;
+
+/**
+ * A converter between {@link MonthDay} and {@link String}.
+ */
+@SdkInternalApi
+@ThreadSafe
+@Immutable
+public class MonthDayStringConverter implements StringConverter<MonthDay> {
+    private MonthDayStringConverter() {
+    }
+
+    public static MonthDayStringConverter create() {
+        return new MonthDayStringConverter();
+    }
+
+    @Override
+    public EnhancedType<MonthDay> type() {
+        return EnhancedType.of(MonthDay.class);
+    }
+
+    @Override
+    public MonthDay fromString(String string) {
+        return MonthDay.parse(string);
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/OffsetDateTimeStringConverter.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/OffsetDateTimeStringConverter.java
new file mode 100644
index 000000000000..7863a9d454dc
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/OffsetDateTimeStringConverter.java
@@ -0,0 +1,48 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.converter.string;
+
+import java.time.OffsetDateTime;
+import software.amazon.awssdk.annotations.Immutable;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.StringConverter;
+
+/**
+ * A converter between {@link OffsetDateTime} and {@link String}.
+ */
+@SdkInternalApi
+@ThreadSafe
+@Immutable
+public class OffsetDateTimeStringConverter implements StringConverter<OffsetDateTime> {
+    private OffsetDateTimeStringConverter() {
+    }
+
+    public static OffsetDateTimeStringConverter create() {
+        return new OffsetDateTimeStringConverter();
+    }
+
+    @Override
+    public EnhancedType<OffsetDateTime> type() {
+        return EnhancedType.of(OffsetDateTime.class);
+    }
+
+    @Override
+    public OffsetDateTime fromString(String string) {
+        return OffsetDateTime.parse(string);
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/OffsetTimeStringConverter.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/OffsetTimeStringConverter.java
new file mode 100644
index 000000000000..f40ca19f9d1c
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/OffsetTimeStringConverter.java
@@ -0,0 +1,48 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.converter.string;
+
+import java.time.OffsetTime;
+import software.amazon.awssdk.annotations.Immutable;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.StringConverter;
+
+/**
+ * A converter between {@link OffsetTime} and {@link String}.
+ */
+@SdkInternalApi
+@ThreadSafe
+@Immutable
+public class OffsetTimeStringConverter implements StringConverter<OffsetTime> {
+    private OffsetTimeStringConverter() {
+    }
+
+    public static OffsetTimeStringConverter create() {
+        return new OffsetTimeStringConverter();
+    }
+
+    @Override
+    public EnhancedType<OffsetTime> type() {
+        return EnhancedType.of(OffsetTime.class);
+    }
+
+    @Override
+    public OffsetTime fromString(String string) {
+        return OffsetTime.parse(string);
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/OptionalDoubleStringConverter.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/OptionalDoubleStringConverter.java
new file mode 100644
index 000000000000..d3443f76ce09
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/OptionalDoubleStringConverter.java
@@ -0,0 +1,61 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.converter.string;
+
+import java.util.OptionalDouble;
+import software.amazon.awssdk.annotations.Immutable;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.StringConverter;
+
+/**
+ * A converter between {@link OptionalDouble} and {@link String}.
+ */
+@SdkInternalApi
+@ThreadSafe
+@Immutable
+public class OptionalDoubleStringConverter implements StringConverter<OptionalDouble> {
+    private static DoubleStringConverter DOUBLE_CONVERTER = DoubleStringConverter.create();
+
+    private OptionalDoubleStringConverter() {
+    }
+
+    public static OptionalDoubleStringConverter create() {
+        return new OptionalDoubleStringConverter();
+    }
+
+    @Override
+    public EnhancedType<OptionalDouble> type() {
+        return EnhancedType.of(OptionalDouble.class);
+    }
+
+    @Override
+    public String toString(OptionalDouble object) {
+        if (!object.isPresent()) {
+            return null;
+        }
+        return DOUBLE_CONVERTER.toString(object.getAsDouble());
+    }
+
+    @Override
+    public OptionalDouble fromString(String string) {
+        if (string == null) {
+            return OptionalDouble.empty();
+        }
+        return OptionalDouble.of(DOUBLE_CONVERTER.fromString(string));
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/OptionalIntStringConverter.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/OptionalIntStringConverter.java
new file mode 100644
index 000000000000..024560daf6f9
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/OptionalIntStringConverter.java
@@ -0,0 +1,61 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.converter.string;
+
+import java.util.OptionalInt;
+import software.amazon.awssdk.annotations.Immutable;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.StringConverter;
+
+/**
+ * A converter between {@link OptionalInt} and {@link String}.
+ */
+@SdkInternalApi
+@ThreadSafe
+@Immutable
+public class OptionalIntStringConverter implements StringConverter<OptionalInt> {
+    private static IntegerStringConverter INTEGER_CONVERTER = IntegerStringConverter.create();
+
+    private OptionalIntStringConverter() {
+    }
+
+    public static OptionalIntStringConverter create() {
+        return new OptionalIntStringConverter();
+    }
+
+    @Override
+    public EnhancedType<OptionalInt> type() {
+        return EnhancedType.of(OptionalInt.class);
+    }
+
+    @Override
+    public String toString(OptionalInt object) {
+        if (!object.isPresent()) {
+            return null;
+        }
+        return INTEGER_CONVERTER.toString(object.getAsInt());
+    }
+
+    @Override
+    public OptionalInt fromString(String string) {
+        if (string == null) {
+            return OptionalInt.empty();
+        }
+        return OptionalInt.of(INTEGER_CONVERTER.fromString(string));
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/OptionalLongStringConverter.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/OptionalLongStringConverter.java
new file mode 100644
index 000000000000..0c396c042d3c
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/OptionalLongStringConverter.java
@@ -0,0 +1,61 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.converter.string;
+
+import java.util.OptionalLong;
+import software.amazon.awssdk.annotations.Immutable;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.StringConverter;
+
+/**
+ * A converter between {@link OptionalLong} and {@link String}.
+ */
+@SdkInternalApi
+@ThreadSafe
+@Immutable
+public class OptionalLongStringConverter implements StringConverter<OptionalLong> {
+    private static LongStringConverter LONG_CONVERTER = LongStringConverter.create();
+
+    private OptionalLongStringConverter() {
+    }
+
+    public static OptionalLongStringConverter create() {
+        return new OptionalLongStringConverter();
+    }
+
+    @Override
+    public EnhancedType<OptionalLong> type() {
+        return EnhancedType.of(OptionalLong.class);
+    }
+
+    @Override
+    public String toString(OptionalLong object) {
+        if (!object.isPresent()) {
+            return null;
+        }
+        return LONG_CONVERTER.toString(object.getAsLong());
+    }
+
+    @Override
+    public OptionalLong fromString(String string) {
+        if (string == null) {
+            return OptionalLong.empty();
+        }
+        return OptionalLong.of(LONG_CONVERTER.fromString(string));
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/PeriodStringConverter.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/PeriodStringConverter.java
new file mode 100644
index 000000000000..3c5f1cf7ec5b
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/PeriodStringConverter.java
@@ -0,0 +1,48 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.converter.string;
+
+import java.time.Period;
+import software.amazon.awssdk.annotations.Immutable;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.StringConverter;
+
+/**
+ * A converter between {@link Period} and {@link String}.
+ */
+@SdkInternalApi
+@ThreadSafe
+@Immutable
+public class PeriodStringConverter implements StringConverter<Period> {
+    private PeriodStringConverter() {
+    }
+
+    public static PeriodStringConverter create() {
+        return new PeriodStringConverter();
+    }
+
+    @Override
+    public EnhancedType<Period> type() {
+        return EnhancedType.of(Period.class);
+    }
+
+    @Override
+    public Period fromString(String string) {
+        return Period.parse(string);
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/SdkBytesStringConverter.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/SdkBytesStringConverter.java
new file mode 100644
index 000000000000..e4261242ac86
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/SdkBytesStringConverter.java
@@ -0,0 +1,54 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.converter.string;
+
+import software.amazon.awssdk.annotations.Immutable;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.core.SdkBytes;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.StringConverter;
+import software.amazon.awssdk.utils.BinaryUtils;
+
+/**
+ * A converter between {@link SdkBytes} and {@link String}.
+ */
+@SdkInternalApi
+@ThreadSafe
+@Immutable
+public class SdkBytesStringConverter implements StringConverter<SdkBytes> {
+    private SdkBytesStringConverter() {
+    }
+
+    public static SdkBytesStringConverter create() {
+        return new SdkBytesStringConverter();
+    }
+
+    @Override
+    public EnhancedType<SdkBytes> type() {
+        return EnhancedType.of(SdkBytes.class);
+    }
+
+    @Override
+    public String toString(SdkBytes object) {
+        return BinaryUtils.toBase64(object.asByteArray());
+    }
+
+    @Override
+    public SdkBytes fromString(String string) {
+        return SdkBytes.fromByteArray(BinaryUtils.fromBase64(string));
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/ShortStringConverter.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/ShortStringConverter.java
new file mode 100644
index 000000000000..8f77c394a67a
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/ShortStringConverter.java
@@ -0,0 +1,53 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.converter.string;
+
+import software.amazon.awssdk.annotations.Immutable;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.PrimitiveConverter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.StringConverter;
+
+/**
+ * A converter between {@link Short} and {@link String}.
+ */
+@SdkInternalApi
+@ThreadSafe
+@Immutable
+public class ShortStringConverter implements StringConverter<Short>, PrimitiveConverter<Short> {
+    private ShortStringConverter() {
+    }
+
+    public static ShortStringConverter create() {
+        return new ShortStringConverter();
+    }
+
+    @Override
+    public EnhancedType<Short> type() {
+        return EnhancedType.of(Short.class);
+    }
+
+    @Override
+    public EnhancedType<Short> primitiveType() {
+        return EnhancedType.of(short.class);
+    }
+
+    @Override
+    public Short fromString(String string) {
+        return Short.valueOf(string);
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/StringBufferStringConverter.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/StringBufferStringConverter.java
new file mode 100644
index 000000000000..2cdb6208b7a3
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/StringBufferStringConverter.java
@@ -0,0 +1,47 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.converter.string;
+
+import software.amazon.awssdk.annotations.Immutable;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.StringConverter;
+
+/**
+ * A converter between {@link StringBuffer} and {@link String}.
+ */
+@SdkInternalApi
+@ThreadSafe
+@Immutable
+public class StringBufferStringConverter implements StringConverter<StringBuffer> {
+    private StringBufferStringConverter() {
+    }
+
+    public static StringBufferStringConverter create() {
+        return new StringBufferStringConverter();
+    }
+
+    @Override
+    public EnhancedType<StringBuffer> type() {
+        return EnhancedType.of(StringBuffer.class);
+    }
+
+    @Override
+    public StringBuffer fromString(String string) {
+        return new StringBuffer(string);
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/StringBuilderStringConverter.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/StringBuilderStringConverter.java
new file mode 100644
index 000000000000..22f4f962830d
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/StringBuilderStringConverter.java
@@ -0,0 +1,47 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.converter.string;
+
+import software.amazon.awssdk.annotations.Immutable;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.StringConverter;
+
+/**
+ * A converter between {@link StringBuilder} and {@link String}.
+ */
+@SdkInternalApi
+@ThreadSafe
+@Immutable
+public class StringBuilderStringConverter implements StringConverter<StringBuilder> {
+    private StringBuilderStringConverter() {
+    }
+
+    public static StringBuilderStringConverter create() {
+        return new StringBuilderStringConverter();
+    }
+
+    @Override
+    public EnhancedType<StringBuilder> type() {
+        return EnhancedType.of(StringBuilder.class);
+    }
+
+    @Override
+    public StringBuilder fromString(String string) {
+        return new StringBuilder(string);
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/StringStringConverter.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/StringStringConverter.java
new file mode 100644
index 000000000000..9b054aed332b
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/StringStringConverter.java
@@ -0,0 +1,52 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.converter.string;
+
+import software.amazon.awssdk.annotations.Immutable;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.StringConverter;
+
+/**
+ * A converter between {@link String} and {@link String}.
+ */
+@SdkInternalApi
+@ThreadSafe
+@Immutable
+public class StringStringConverter implements StringConverter<String> {
+    private StringStringConverter() {
+    }
+
+    public static StringStringConverter create() {
+        return new StringStringConverter();
+    }
+
+    @Override
+    public EnhancedType<String> type() {
+        return EnhancedType.of(String.class);
+    }
+
+    @Override
+    public String toString(String object) {
+        return object;
+    }
+
+    @Override
+    public String fromString(String string) {
+        return string;
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/UriStringConverter.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/UriStringConverter.java
new file mode 100644
index 000000000000..e54751d56274
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/UriStringConverter.java
@@ -0,0 +1,48 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.converter.string;
+
+import java.net.URI;
+import software.amazon.awssdk.annotations.Immutable;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.StringConverter;
+
+/**
+ * A converter between {@link URI} and {@link String}.
+ */
+@SdkInternalApi
+@ThreadSafe
+@Immutable
+public class UriStringConverter implements StringConverter<URI> {
+    private UriStringConverter() {
+    }
+
+    public static UriStringConverter create() {
+        return new UriStringConverter();
+    }
+
+    @Override
+    public EnhancedType<URI> type() {
+        return EnhancedType.of(URI.class);
+    }
+
+    @Override
+    public URI fromString(String string) {
+        return URI.create(string);
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/UrlStringConverter.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/UrlStringConverter.java
new file mode 100644
index 000000000000..cbfd3c61e726
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/UrlStringConverter.java
@@ -0,0 +1,53 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.converter.string;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+import software.amazon.awssdk.annotations.Immutable;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.StringConverter;
+
+/**
+ * A converter between {@link URL} and {@link String}.
+ */
+@SdkInternalApi
+@ThreadSafe
+@Immutable
+public class UrlStringConverter implements StringConverter<URL> {
+    private UrlStringConverter() {
+    }
+
+    public static UrlStringConverter create() {
+        return new UrlStringConverter();
+    }
+
+    @Override
+    public EnhancedType<URL> type() {
+        return EnhancedType.of(URL.class);
+    }
+
+    @Override
+    public URL fromString(String string) {
+        try {
+            return new URL(string);
+        } catch (MalformedURLException e) {
+            throw new IllegalArgumentException("URL format was incorrect: " + string, e);
+        }
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/UuidStringConverter.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/UuidStringConverter.java
new file mode 100644
index 000000000000..6161bae316b4
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/UuidStringConverter.java
@@ -0,0 +1,48 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.converter.string;
+
+import java.util.UUID;
+import software.amazon.awssdk.annotations.Immutable;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.StringConverter;
+
+/**
+ * A converter between {@link UUID} and {@link String}.
+ */
+@SdkInternalApi
+@ThreadSafe
+@Immutable
+public class UuidStringConverter implements StringConverter<UUID> {
+    private UuidStringConverter() {
+    }
+
+    public static UuidStringConverter create() {
+        return new UuidStringConverter();
+    }
+
+    @Override
+    public EnhancedType<UUID> type() {
+        return EnhancedType.of(UUID.class);
+    }
+
+    @Override
+    public UUID fromString(String string) {
+        return UUID.fromString(string);
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/YearMonthStringConverter.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/YearMonthStringConverter.java
new file mode 100644
index 000000000000..c74272868c8d
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/YearMonthStringConverter.java
@@ -0,0 +1,48 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.converter.string;
+
+import java.time.YearMonth;
+import software.amazon.awssdk.annotations.Immutable;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.StringConverter;
+
+/**
+ * A converter between {@link YearMonth} and {@link String}.
+ */
+@SdkInternalApi
+@ThreadSafe
+@Immutable
+public class YearMonthStringConverter implements StringConverter<YearMonth> {
+    private YearMonthStringConverter() {
+    }
+
+    public static YearMonthStringConverter create() {
+        return new YearMonthStringConverter();
+    }
+
+    @Override
+    public EnhancedType<YearMonth> type() {
+        return EnhancedType.of(YearMonth.class);
+    }
+
+    @Override
+    public YearMonth fromString(String string) {
+        return YearMonth.parse(string);
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/YearStringConverter.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/YearStringConverter.java
new file mode 100644
index 000000000000..4c1e462bce2f
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/YearStringConverter.java
@@ -0,0 +1,48 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.converter.string;
+
+import java.time.Year;
+import software.amazon.awssdk.annotations.Immutable;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.StringConverter;
+
+/**
+ * A converter between {@link Year} and {@link String}.
+ */
+@SdkInternalApi
+@ThreadSafe
+@Immutable
+public class YearStringConverter implements StringConverter<Year> {
+    private YearStringConverter() {
+    }
+
+    public static YearStringConverter create() {
+        return new YearStringConverter();
+    }
+
+    @Override
+    public EnhancedType<Year> type() {
+        return EnhancedType.of(Year.class);
+    }
+
+    @Override
+    public Year fromString(String string) {
+        return Year.parse(string);
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/ZoneIdStringConverter.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/ZoneIdStringConverter.java
new file mode 100644
index 000000000000..15ea887334b3
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/ZoneIdStringConverter.java
@@ -0,0 +1,48 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.converter.string;
+
+import java.time.ZoneId;
+import software.amazon.awssdk.annotations.Immutable;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.StringConverter;
+
+/**
+ * A converter between {@link ZoneId} and {@link String}.
+ */
+@SdkInternalApi
+@ThreadSafe
+@Immutable
+public class ZoneIdStringConverter implements StringConverter<ZoneId> {
+    private ZoneIdStringConverter() {
+    }
+
+    public static ZoneIdStringConverter create() {
+        return new ZoneIdStringConverter();
+    }
+
+    @Override
+    public EnhancedType<ZoneId> type() {
+        return EnhancedType.of(ZoneId.class);
+    }
+
+    @Override
+    public ZoneId fromString(String string) {
+        return ZoneId.of(string);
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/ZoneOffsetStringConverter.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/ZoneOffsetStringConverter.java
new file mode 100644
index 000000000000..f098283ab7d3
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/ZoneOffsetStringConverter.java
@@ -0,0 +1,48 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.converter.string;
+
+import java.time.ZoneOffset;
+import software.amazon.awssdk.annotations.Immutable;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.StringConverter;
+
+/**
+ * A converter between {@link ZoneOffset} and {@link String}.
+ */
+@SdkInternalApi
+@ThreadSafe
+@Immutable
+public class ZoneOffsetStringConverter implements StringConverter<ZoneOffset> {
+    private ZoneOffsetStringConverter() {
+    }
+
+    public static ZoneOffsetStringConverter create() {
+        return new ZoneOffsetStringConverter();
+    }
+
+    @Override
+    public EnhancedType<ZoneOffset> type() {
+        return EnhancedType.of(ZoneOffset.class);
+    }
+
+    @Override
+    public ZoneOffset fromString(String string) {
+        return ZoneOffset.of(string);
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/ZonedDateTimeStringConverter.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/ZonedDateTimeStringConverter.java
new file mode 100644
index 000000000000..3874402b5d0b
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/string/ZonedDateTimeStringConverter.java
@@ -0,0 +1,48 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.converter.string;
+
+import java.time.ZonedDateTime;
+import software.amazon.awssdk.annotations.Immutable;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.StringConverter;
+
+/**
+ * A converter between {@link ZonedDateTime} and {@link String}.
+ */
+@SdkInternalApi
+@ThreadSafe
+@Immutable
+public class ZonedDateTimeStringConverter implements StringConverter<ZonedDateTime> {
+    private ZonedDateTimeStringConverter() {
+    }
+
+    public static ZonedDateTimeStringConverter create() {
+        return new ZonedDateTimeStringConverter();
+    }
+
+    @Override
+    public EnhancedType<ZonedDateTime> type() {
+        return EnhancedType.of(ZonedDateTime.class);
+    }
+
+    @Override
+    public ZonedDateTime fromString(String string) {
+        return ZonedDateTime.parse(string);
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/extensions/ChainExtension.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/extensions/ChainExtension.java
new file mode 100644
index 000000000000..0dcc81dd5fb9
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/extensions/ChainExtension.java
@@ -0,0 +1,166 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.extensions;
+
+import java.util.ArrayDeque;
+import java.util.Arrays;
+import java.util.Deque;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClientExtension;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbExtensionContext;
+import software.amazon.awssdk.enhanced.dynamodb.Expression;
+import software.amazon.awssdk.enhanced.dynamodb.extensions.ReadModification;
+import software.amazon.awssdk.enhanced.dynamodb.extensions.WriteModification;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+
+/**
+ * A meta-extension that allows multiple extensions to be chained in a specified order to act as a single composite
+ * extension. The order in which extensions will be used depends on the operation, for write operations they will be
+ * called in forward order, for read operations they will be called in reverse order. For example :-
+ *
+ * <p>
+ * If you create a chain of three extensions:
+ * ChainMapperExtension.create(extension1, extension2, extension3);
+ *
+ * <p>
+ * When performing any kind of write operation (eg: PutItem, UpdateItem) the beforeWrite() method will be called in
+ * forward order:
+ *
+ * {@literal extension1 -> extension2 -> extension3}
+ *
+ * <p>
+ * So the output of extension1 will be passed into extension2, and then the output of extension2 into extension3 and
+ * so on. For operations that read (eg: GetItem, UpdateItem) the afterRead() method will be called in reverse order:
+ *
+ * {@literal extension3 -> extension2 -> extension1}
+ *
+ * <p>
+ * This is designed to create a layered pattern when dealing with multiple extensions. One thing to note is that
+ * UpdateItem acts as both a write operation and a read operation so the chain will be called both ways within a
+ * single operation.
+ */
+@SdkInternalApi
+public final class ChainExtension implements DynamoDbEnhancedClientExtension {
+    private final Deque<DynamoDbEnhancedClientExtension> extensionChain;
+
+    private ChainExtension(List<DynamoDbEnhancedClientExtension> extensions) {
+        this.extensionChain = new ArrayDeque<>(extensions);
+    }
+
+    /**
+     * Construct a new instance of {@link ChainExtension}.
+     * @param extensions A list of {@link DynamoDbEnhancedClientExtension} to chain together.
+     * @return A constructed {@link ChainExtension} object.
+     */
+    public static ChainExtension create(DynamoDbEnhancedClientExtension... extensions) {
+        return new ChainExtension(Arrays.asList(extensions));
+    }
+
+    /**
+     * Construct a new instance of {@link ChainExtension}.
+     * @param extensions A list of {@link DynamoDbEnhancedClientExtension} to chain together.
+     * @return A constructed {@link ChainExtension} object.
+     */
+    public static ChainExtension create(List<DynamoDbEnhancedClientExtension> extensions) {
+        return new ChainExtension(extensions);
+    }
+
+    /**
+     * Implementation of the {@link DynamoDbEnhancedClientExtension} interface that will call all the chained extensions
+     * in forward order, passing the results of each one to the next and coalescing the results into a single modification.
+     * Multiple conditional statements will be separated by the string " AND ". Expression values will be coalesced
+     * unless they conflict in which case an exception will be thrown.
+     *
+     * @param context A {@link DynamoDbExtensionContext.BeforeWrite} context
+     * @return A single {@link WriteModification} representing the coalesced results of all the chained extensions.
+     */
+    @Override
+    public WriteModification beforeWrite(DynamoDbExtensionContext.BeforeWrite context) {
+        Map<String, AttributeValue> transformedItem = null;
+        Expression conditionalExpression = null;
+
+        for (DynamoDbEnhancedClientExtension extension : this.extensionChain) {
+            Map<String, AttributeValue> itemToTransform = transformedItem == null ? context.items() : transformedItem;
+
+            DynamoDbExtensionContext.BeforeWrite beforeWrite =
+                DefaultDynamoDbExtensionContext.builder()
+                                               .items(itemToTransform)
+                                               .operationContext(context.operationContext())
+                                               .tableMetadata(context.tableMetadata())
+                                               .build();
+
+            WriteModification writeModification = extension.beforeWrite(beforeWrite);
+
+            if (writeModification.transformedItem() != null) {
+                transformedItem = writeModification.transformedItem();
+            }
+
+            if (writeModification.additionalConditionalExpression() != null) {
+                if (conditionalExpression == null) {
+                    conditionalExpression = writeModification.additionalConditionalExpression();
+                } else {
+                    conditionalExpression =
+                        Expression.join(conditionalExpression,
+                                        writeModification.additionalConditionalExpression(),
+                                        " AND ");
+                }
+            }
+        }
+
+        return WriteModification.builder()
+                                .transformedItem(transformedItem)
+                                .additionalConditionalExpression(conditionalExpression)
+                                .build();
+    }
+
+    /**
+     * Implementation of the {@link DynamoDbEnhancedClientExtension} interface that will call all the chained extensions
+     * in reverse order, passing the results of each one to the next and coalescing the results into a single modification.
+     *
+     * @param context A {@link DynamoDbExtensionContext.AfterRead} context
+     * @return A single {@link ReadModification} representing the final transformation of all the chained extensions.
+     */
+    @Override
+    public ReadModification afterRead(DynamoDbExtensionContext.AfterRead context) {
+        Map<String, AttributeValue> transformedItem = null;
+
+        Iterator<DynamoDbEnhancedClientExtension> iterator = extensionChain.descendingIterator();
+
+        while (iterator.hasNext()) {
+            Map<String, AttributeValue> itemToTransform =
+                transformedItem == null ? context.items() : transformedItem;
+
+            DynamoDbExtensionContext.AfterRead afterRead =
+                DefaultDynamoDbExtensionContext.builder().items(itemToTransform)
+                                               .operationContext(context.operationContext())
+                                               .tableMetadata(context.tableMetadata())
+                                               .build();
+
+            ReadModification readModification = iterator.next().afterRead(afterRead);
+
+            if (readModification.transformedItem() != null) {
+                transformedItem = readModification.transformedItem();
+            }
+        }
+
+        return ReadModification.builder()
+                               .transformedItem(transformedItem)
+                               .build();
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/extensions/DefaultDynamoDbExtensionContext.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/extensions/DefaultDynamoDbExtensionContext.java
new file mode 100644
index 000000000000..a181161c8c4b
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/extensions/DefaultDynamoDbExtensionContext.java
@@ -0,0 +1,113 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.extensions;
+
+import java.util.Map;
+import java.util.Objects;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbExtensionContext;
+import software.amazon.awssdk.enhanced.dynamodb.TableMetadata;
+import software.amazon.awssdk.enhanced.dynamodb.internal.operations.OperationContext;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+
+/**
+ * An SDK-internal implementation of {@link DynamoDbExtensionContext.BeforeWrite} and {@link DynamoDbExtensionContext.AfterRead}.
+ */
+@SdkInternalApi
+public final class DefaultDynamoDbExtensionContext implements DynamoDbExtensionContext.BeforeWrite,
+                                                              DynamoDbExtensionContext.AfterRead {
+    private Map<String, AttributeValue> items;
+    private OperationContext operationContext;
+    private TableMetadata tableMetadata;
+
+    private DefaultDynamoDbExtensionContext(Builder builder) {
+        this.items = builder.items;
+        this.operationContext = builder.operationContext;
+        this.tableMetadata = builder.tableMetadata;
+    }
+
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    @Override
+    public Map<String, AttributeValue> items() {
+        return items;
+    }
+
+    @Override
+    public OperationContext operationContext() {
+        return operationContext;
+    }
+
+    @Override
+    public TableMetadata tableMetadata() {
+        return tableMetadata;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        DefaultDynamoDbExtensionContext that = (DefaultDynamoDbExtensionContext) o;
+
+        if (!Objects.equals(items, that.items)) {
+            return false;
+        }
+        if (!Objects.equals(operationContext, that.operationContext)) {
+            return false;
+        }
+        return Objects.equals(tableMetadata, that.tableMetadata);
+    }
+
+    @Override
+    public int hashCode() {
+        int result = items != null ? items.hashCode() : 0;
+        result = 31 * result + (operationContext != null ? operationContext.hashCode() : 0);
+        result = 31 * result + (tableMetadata != null ? tableMetadata.hashCode() : 0);
+        return result;
+    }
+
+    public static final class Builder {
+        private Map<String, AttributeValue> items;
+        private OperationContext operationContext;
+        private TableMetadata tableMetadata;
+
+        public Builder items(Map<String, AttributeValue> item) {
+            this.items = item;
+            return this;
+        }
+
+        public Builder operationContext(OperationContext operationContext) {
+            this.operationContext = operationContext;
+            return this;
+        }
+
+        public Builder tableMetadata(TableMetadata tableMetadata) {
+            this.tableMetadata = tableMetadata;
+            return this;
+        }
+
+        public DefaultDynamoDbExtensionContext build() {
+            return new DefaultDynamoDbExtensionContext(this);
+        }
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/extensions/VersionRecordAttributeTags.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/extensions/VersionRecordAttributeTags.java
new file mode 100644
index 000000000000..e1c2d527866b
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/extensions/VersionRecordAttributeTags.java
@@ -0,0 +1,31 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.extensions;
+
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.enhanced.dynamodb.extensions.VersionedRecordExtension;
+import software.amazon.awssdk.enhanced.dynamodb.extensions.annotations.DynamoDbVersionAttribute;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.StaticAttributeTag;
+
+@SdkInternalApi
+public final class VersionRecordAttributeTags {
+    private VersionRecordAttributeTags() {
+    }
+
+    public static StaticAttributeTag attributeTagFor(DynamoDbVersionAttribute annotation) {
+        return VersionedRecordExtension.AttributeTags.versionAttribute();
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/mapper/AttributeType.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/mapper/AttributeType.java
new file mode 100644
index 000000000000..3ffdd3c669f8
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/mapper/AttributeType.java
@@ -0,0 +1,29 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.mapper;
+
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeValueType;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+
+@SdkInternalApi
+public interface AttributeType<T> {
+    AttributeValue objectToAttributeValue(T object);
+
+    T attributeValueToObject(AttributeValue attributeValue);
+
+    AttributeValueType attributeValueType();
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/mapper/BeanAttributeGetter.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/mapper/BeanAttributeGetter.java
new file mode 100644
index 000000000000..a4df014a64a8
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/mapper/BeanAttributeGetter.java
@@ -0,0 +1,40 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.mapper;
+
+import java.lang.reflect.Method;
+import java.util.function.Function;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.utils.Validate;
+
+@FunctionalInterface
+@SdkInternalApi
+@SuppressWarnings("unchecked")
+public interface BeanAttributeGetter<BeanT, GetterT> extends Function<BeanT, GetterT> {
+    static <BeanT, GetterT> BeanAttributeGetter<BeanT, GetterT> create(Class<BeanT> beanClass, Method getter) {
+        Validate.isTrue(getter.getParameterCount() == 0,
+                        "%s.%s has parameters, despite being named like a getter.",
+                        beanClass, getter.getName());
+
+        return LambdaToMethodBridgeBuilder.create(BeanAttributeGetter.class)
+                                          .lambdaMethodName("apply")
+                                          .runtimeLambdaSignature(Object.class, Object.class)
+                                          .compileTimeLambdaSignature(getter.getReturnType(), beanClass)
+                                          .targetMethod(getter)
+                                          .build();
+
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/mapper/BeanAttributeSetter.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/mapper/BeanAttributeSetter.java
new file mode 100644
index 000000000000..fe0de2744fe1
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/mapper/BeanAttributeSetter.java
@@ -0,0 +1,43 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.mapper;
+
+import java.lang.reflect.Method;
+import java.util.function.BiConsumer;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.utils.Validate;
+import software.amazon.awssdk.utils.internal.ReflectionUtils;
+
+@FunctionalInterface
+@SdkInternalApi
+public interface BeanAttributeSetter<BeanT, GetterT> extends BiConsumer<BeanT, GetterT> {
+    @SuppressWarnings("unchecked")
+    static <BeanT, SetterT> BeanAttributeSetter<BeanT, SetterT> create(Class<BeanT> beanClass, Method setter) {
+        Validate.isTrue(setter.getParameterCount() == 1,
+                        "%s.%s doesn't have just 1 parameter, despite being named like a setter.",
+                        beanClass, setter.getName());
+
+        Class<?> setterInputClass = setter.getParameters()[0].getType();
+        Class<?> boxedInputClass = ReflectionUtils.getWrappedClass(setterInputClass);
+
+        return LambdaToMethodBridgeBuilder.create(BeanAttributeSetter.class)
+                                          .lambdaMethodName("accept")
+                                          .runtimeLambdaSignature(void.class, Object.class, Object.class)
+                                          .compileTimeLambdaSignature(void.class, beanClass, boxedInputClass)
+                                          .targetMethod(setter)
+                                          .build();
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/mapper/BeanConstructor.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/mapper/BeanConstructor.java
new file mode 100644
index 000000000000..e2b5c802af08
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/mapper/BeanConstructor.java
@@ -0,0 +1,39 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.mapper;
+
+import java.lang.reflect.Constructor;
+import java.util.function.Supplier;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.utils.Validate;
+
+@FunctionalInterface
+@SdkInternalApi
+@SuppressWarnings("unchecked")
+public interface BeanConstructor<BeanT> extends Supplier<BeanT> {
+    static <BeanT> BeanConstructor<BeanT> create(Class<BeanT> beanClass, Constructor<BeanT> noArgsConstructor) {
+        Validate.isTrue(noArgsConstructor.getParameterCount() == 0,
+                        "%s has no default constructor.",
+                        beanClass);
+
+        return LambdaToMethodBridgeBuilder.create(BeanConstructor.class)
+                                          .lambdaMethodName("get")
+                                          .runtimeLambdaSignature(Object.class)
+                                          .compileTimeLambdaSignature(beanClass)
+                                          .targetMethod(noArgsConstructor)
+                                          .build();
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/mapper/BeanTableSchemaAttributeTags.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/mapper/BeanTableSchemaAttributeTags.java
new file mode 100644
index 000000000000..883529615a7a
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/mapper/BeanTableSchemaAttributeTags.java
@@ -0,0 +1,55 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.mapper;
+
+import java.util.Arrays;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.BeanTableSchema;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.StaticAttributeTag;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.StaticAttributeTags;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.annotations.BeanTableSchemaAttributeTag;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.annotations.DynamoDbPartitionKey;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.annotations.DynamoDbSecondaryPartitionKey;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.annotations.DynamoDbSecondarySortKey;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.annotations.DynamoDbSortKey;
+
+/**
+ * Static provider class for core {@link BeanTableSchema} attribute tags. Each of the implemented annotations has a
+ * corresponding reference to this class in a
+ * {@link BeanTableSchemaAttributeTag}
+ * meta-annotation.
+ */
+@SdkInternalApi
+public final class BeanTableSchemaAttributeTags {
+    private BeanTableSchemaAttributeTags() {
+    }
+
+    public static StaticAttributeTag attributeTagFor(DynamoDbPartitionKey annotation) {
+        return StaticAttributeTags.primaryPartitionKey();
+    }
+
+    public static StaticAttributeTag attributeTagFor(DynamoDbSortKey annotation) {
+        return StaticAttributeTags.primarySortKey();
+    }
+
+    public static StaticAttributeTag attributeTagFor(DynamoDbSecondaryPartitionKey annotation) {
+        return StaticAttributeTags.secondaryPartitionKey(Arrays.asList(annotation.indexNames()));
+    }
+
+    public static StaticAttributeTag attributeTagFor(DynamoDbSecondarySortKey annotation) {
+        return StaticAttributeTags.secondarySortKey(Arrays.asList(annotation.indexNames()));
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/mapper/DefaultParameterizedType.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/mapper/DefaultParameterizedType.java
new file mode 100644
index 000000000000..ba0a1c74d7e4
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/mapper/DefaultParameterizedType.java
@@ -0,0 +1,59 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.mapper;
+
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.utils.Validate;
+
+/**
+ * An implementation of {@link ParameterizedType} that guarantees its raw type is always a {@link Class}.
+ */
+@SdkInternalApi
+@ThreadSafe
+public final class DefaultParameterizedType implements ParameterizedType {
+    private final Class<?> rawType;
+    private final Type[] arguments;
+
+    private DefaultParameterizedType(Class<?> rawType, Type... arguments) {
+        Validate.notEmpty(arguments, "Arguments must not be empty.");
+        Validate.noNullElements(arguments, "Arguments cannot contain null values.");
+        this.rawType = Validate.paramNotNull(rawType, "rawType");
+        this.arguments = arguments;
+
+    }
+
+    public static ParameterizedType parameterizedType(Class<?> rawType, Type... arguments) {
+        return new DefaultParameterizedType(rawType, arguments);
+    }
+
+    @Override
+    public Class<?> getRawType() {
+        return rawType;
+    }
+
+    @Override
+    public Type[] getActualTypeArguments() {
+        return arguments.clone();
+    }
+
+    @Override
+    public Type getOwnerType() {
+        return null;
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/mapper/LambdaToMethodBridgeBuilder.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/mapper/LambdaToMethodBridgeBuilder.java
new file mode 100644
index 000000000000..9c48447ebf95
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/mapper/LambdaToMethodBridgeBuilder.java
@@ -0,0 +1,95 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.mapper;
+
+import static software.amazon.awssdk.utils.FunctionalUtils.invokeSafely;
+
+import java.lang.invoke.LambdaMetafactory;
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodType;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.utils.Either;
+
+@SdkInternalApi
+public class LambdaToMethodBridgeBuilder<T> {
+    private static final MethodHandles.Lookup LOOKUP = MethodHandles.lookup();
+
+    private final Class<T> lambdaType;
+    private String lambdaMethodName;
+    private Class<?> postEraseLambdaReturnType;
+    private Class<?>[] postEraseLambdaParameters;
+    private Class<?> preEraseLambdaReturnType;
+    private Class<?>[] preEraseLambdaParameters;
+    private Either<Method, Constructor<?>> targetMethod;
+
+    private LambdaToMethodBridgeBuilder(Class<T> lambdaType) {
+        this.lambdaType = lambdaType;
+    }
+
+    public static <T> LambdaToMethodBridgeBuilder<T> create(Class<T> lambdaType) {
+        return new LambdaToMethodBridgeBuilder<>(lambdaType);
+    }
+
+    public LambdaToMethodBridgeBuilder<T> lambdaMethodName(String lambdaMethodName) {
+        this.lambdaMethodName = lambdaMethodName;
+        return this;
+    }
+
+    public LambdaToMethodBridgeBuilder<T> runtimeLambdaSignature(Class<?> returnType, Class<?>... parameters) {
+        this.postEraseLambdaReturnType = returnType;
+        this.postEraseLambdaParameters = parameters.clone();
+        return this;
+    }
+
+    public LambdaToMethodBridgeBuilder<T> compileTimeLambdaSignature(Class<?> returnType, Class<?>... parameters) {
+        this.preEraseLambdaReturnType = returnType;
+        this.preEraseLambdaParameters = parameters.clone();
+        return this;
+    }
+
+    public LambdaToMethodBridgeBuilder<T> targetMethod(Method method) {
+        this.targetMethod = Either.left(method);
+        return this;
+    }
+
+    public LambdaToMethodBridgeBuilder<T> targetMethod(Constructor<?> method) {
+        this.targetMethod = Either.right(method);
+        return this;
+    }
+
+    public T build() {
+        try {
+            MethodHandle targetMethodHandle = targetMethod.map(
+                m -> invokeSafely(() -> LOOKUP.unreflect(m)),
+                c -> invokeSafely(() -> LOOKUP.unreflectConstructor(c)));
+
+            return lambdaType.cast(
+                LambdaMetafactory.metafactory(LOOKUP,
+                                              lambdaMethodName,
+                                              MethodType.methodType(lambdaType),
+                                              MethodType.methodType(postEraseLambdaReturnType, postEraseLambdaParameters),
+                                              targetMethodHandle,
+                                              MethodType.methodType(preEraseLambdaReturnType, preEraseLambdaParameters))
+                                 .getTarget()
+                                 .invoke());
+        } catch (Throwable e) {
+            throw new IllegalArgumentException("Failed to generate method handle.", e);
+        }
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/mapper/ResolvedStaticAttribute.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/mapper/ResolvedStaticAttribute.java
new file mode 100644
index 000000000000..064fafe06c93
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/mapper/ResolvedStaticAttribute.java
@@ -0,0 +1,131 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.mapper;
+
+import static software.amazon.awssdk.enhanced.dynamodb.internal.AttributeValues.nullAttributeValue;
+import static software.amazon.awssdk.enhanced.dynamodb.internal.EnhancedClientUtils.isNullAttributeValue;
+
+import java.util.function.BiConsumer;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeValueType;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.StaticAttribute;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.StaticTableMetadata;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+
+@SdkInternalApi
+public final class ResolvedStaticAttribute<T> {
+    private final String attributeName;
+    private final Function<T, AttributeValue> getAttributeMethod;
+    private final BiConsumer<T, AttributeValue> updateItemMethod;
+    private final StaticTableMetadata tableMetadata;
+    private final AttributeValueType attributeValueType;
+
+    private ResolvedStaticAttribute(String attributeName,
+                                    Function<T, AttributeValue> getAttributeMethod,
+                                    BiConsumer<T, AttributeValue> updateItemMethod,
+                                    StaticTableMetadata tableMetadata,
+                                    AttributeValueType attributeValueType) {
+        this.attributeName = attributeName;
+        this.getAttributeMethod = getAttributeMethod;
+        this.updateItemMethod = updateItemMethod;
+        this.tableMetadata = tableMetadata;
+        this.attributeValueType = attributeValueType;
+    }
+
+    public static <T, R> ResolvedStaticAttribute<T> create(StaticAttribute<T, R> staticAttribute,
+                                                           AttributeType<R> attributeType) {
+        Function<T, AttributeValue> getAttributeValueWithTransform = item -> {
+            R value = staticAttribute.getter().apply(item);
+            return value == null ? nullAttributeValue() : attributeType.objectToAttributeValue(value);
+        };
+
+        // When setting a value on the java object, do not explicitly set nulls as this can cause an NPE to be thrown
+        // if the target attribute type is a primitive.
+        BiConsumer<T, AttributeValue> updateItemWithTransform = (item, attributeValue) -> {
+            // If the attributeValue is nul, do not attempt to marshal
+            if (isNullAttributeValue(attributeValue)) {
+                return;
+            }
+
+            R value = attributeType.attributeValueToObject(attributeValue);
+
+            if (value != null) {
+                staticAttribute.setter().accept(item, value);
+            }
+        };
+
+        StaticTableMetadata.Builder tableMetadataBuilder = StaticTableMetadata.builder();
+        staticAttribute.tags().forEach(
+            tag -> tag.modifyMetadata(staticAttribute.name(), attributeType.attributeValueType())
+                      .accept(tableMetadataBuilder));
+
+        return new ResolvedStaticAttribute<>(staticAttribute.name(),
+                                             getAttributeValueWithTransform,
+                                             updateItemWithTransform,
+                                             tableMetadataBuilder.build(),
+                                             attributeType.attributeValueType());
+    }
+
+    /**
+     * Return a transformed copy of this attribute that knows how to get/set from a different type of object given a
+     * function that can convert the containing object itself. It does this by modifying the get/set functions of
+     * type T to type R given a transformation function F(T) = R.
+     * @param transform A function that converts the object storing the attribute from the source type to the
+     *                  destination type.
+     * @param createComponent A consumer to create a new instance of the component object when required. A null value
+     *                       will bypass this logic.
+     * @param <R> The type being transformed to.
+     * @return A new Attribute that be contained by an object of type R.
+     */
+    public <R> ResolvedStaticAttribute<R> transform(Function<R, T> transform, Consumer<R> createComponent) {
+        return new ResolvedStaticAttribute<>(
+            attributeName,
+            item -> {
+                T otherItem = transform.apply(item);
+
+                // If the containing object is null don't attempt to read attributes from it
+                return otherItem == null ?
+                    nullAttributeValue() : getAttributeMethod.apply(otherItem);
+            },
+            (item, value) -> {
+                if (createComponent != null) {
+                    // Lazily instantiate the component object once there is a value to write into it
+                    createComponent.accept(item);
+                }
+                updateItemMethod.accept(transform.apply(item), value);
+            },
+            tableMetadata,
+            attributeValueType);
+    }
+
+    public String attributeName() {
+        return attributeName;
+    }
+
+    public Function<T, AttributeValue> attributeGetterMethod() {
+        return getAttributeMethod;
+    }
+
+    public BiConsumer<T, AttributeValue> updateItemMethod() {
+        return updateItemMethod;
+    }
+
+    public StaticTableMetadata tableMetadata() {
+        return tableMetadata;
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/mapper/StaticAttributeType.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/mapper/StaticAttributeType.java
new file mode 100644
index 000000000000..c3b7ae5be3bb
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/mapper/StaticAttributeType.java
@@ -0,0 +1,50 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.mapper;
+
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeValueType;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+
+@SdkInternalApi
+public final class StaticAttributeType<T> implements AttributeType<T> {
+    private final AttributeConverter<T> attributeConverter;
+    private final AttributeValueType attributeValueType;
+
+    private StaticAttributeType(AttributeConverter<T> attributeConverter) {
+        this.attributeConverter = attributeConverter;
+        this.attributeValueType = attributeConverter.attributeValueType();
+    }
+
+    public static <T> AttributeType<T> create(
+        AttributeConverter<T> attributeConverter) {
+
+        return new StaticAttributeType<>(attributeConverter);
+    }
+
+    public AttributeValue objectToAttributeValue(T object) {
+        return this.attributeConverter.transformFrom(object);
+    }
+
+    public T attributeValueToObject(AttributeValue attributeValue) {
+        return this.attributeConverter.transformTo(attributeValue);
+    }
+
+    public AttributeValueType attributeValueType() {
+        return attributeValueType;
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/BatchGetItemOperation.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/BatchGetItemOperation.java
new file mode 100644
index 000000000000..620e529ffd64
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/BatchGetItemOperation.java
@@ -0,0 +1,124 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.operations;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.core.async.SdkPublisher;
+import software.amazon.awssdk.core.pagination.sync.SdkIterable;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClientExtension;
+import software.amazon.awssdk.enhanced.dynamodb.model.BatchGetItemEnhancedRequest;
+import software.amazon.awssdk.enhanced.dynamodb.model.BatchGetResultPage;
+import software.amazon.awssdk.enhanced.dynamodb.model.ReadBatch;
+import software.amazon.awssdk.services.dynamodb.DynamoDbAsyncClient;
+import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+import software.amazon.awssdk.services.dynamodb.model.BatchGetItemRequest;
+import software.amazon.awssdk.services.dynamodb.model.BatchGetItemResponse;
+import software.amazon.awssdk.services.dynamodb.model.KeysAndAttributes;
+
+@SdkInternalApi
+public class BatchGetItemOperation
+    implements PaginatedDatabaseOperation<BatchGetItemRequest, BatchGetItemResponse, BatchGetResultPage> {
+
+    private final BatchGetItemEnhancedRequest request;
+
+    private BatchGetItemOperation(BatchGetItemEnhancedRequest request) {
+        this.request = request;
+    }
+
+    public static BatchGetItemOperation create(BatchGetItemEnhancedRequest request) {
+        return new BatchGetItemOperation(request);
+    }
+
+    @Override
+    public BatchGetItemRequest generateRequest(DynamoDbEnhancedClientExtension extension) {
+        Map<String, KeysAndAttributes> requestItems = new HashMap<>();
+        request.readBatches().forEach(readBatch -> addReadRequestsToMap(readBatch, requestItems));
+
+        return BatchGetItemRequest.builder()
+                                  .requestItems(Collections.unmodifiableMap(requestItems))
+                                  .build();
+    }
+
+    @Override
+    public BatchGetResultPage transformResponse(BatchGetItemResponse response,
+                                                DynamoDbEnhancedClientExtension extension) {
+        return BatchGetResultPage.builder().batchGetItemResponse(response).mapperExtension(extension).build();
+    }
+
+    @Override
+    public Function<BatchGetItemRequest, SdkIterable<BatchGetItemResponse>> serviceCall(DynamoDbClient dynamoDbClient) {
+        return dynamoDbClient::batchGetItemPaginator;
+    }
+
+    @Override
+    public Function<BatchGetItemRequest, SdkPublisher<BatchGetItemResponse>> asyncServiceCall(
+        DynamoDbAsyncClient dynamoDbAsyncClient) {
+
+        return dynamoDbAsyncClient::batchGetItemPaginator;
+    }
+
+    private void addReadRequestsToMap(ReadBatch readBatch, Map<String, KeysAndAttributes> readRequestMap) {
+
+        KeysAndAttributes newKeysAndAttributes = readBatch.keysAndAttributes();
+        KeysAndAttributes existingKeysAndAttributes = readRequestMap.get(readBatch.tableName());
+
+        if (existingKeysAndAttributes == null) {
+            readRequestMap.put(readBatch.tableName(), newKeysAndAttributes);
+            return;
+        }
+
+        KeysAndAttributes mergedKeysAndAttributes =
+            mergeKeysAndAttributes(existingKeysAndAttributes, newKeysAndAttributes);
+        readRequestMap.put(readBatch.tableName(), mergedKeysAndAttributes);
+    }
+
+    private static KeysAndAttributes mergeKeysAndAttributes(KeysAndAttributes first, KeysAndAttributes second) {
+        if (!compareNullableBooleans(first.consistentRead(), second.consistentRead())) {
+            throw new IllegalArgumentException("All batchable read requests for the same table must have the "
+                                               + "same 'consistentRead' setting.");
+        }
+
+        Boolean consistentRead = first.consistentRead() == null ? second.consistentRead() : first.consistentRead();
+        List<Map<String, AttributeValue>> keys =
+            Stream.concat(first.keys().stream(), second.keys().stream()).collect(Collectors.toList());
+
+        return KeysAndAttributes.builder()
+                                .keys(keys)
+                                .consistentRead(consistentRead)
+                                .build();
+    }
+
+    private static boolean compareNullableBooleans(Boolean one, Boolean two) {
+        if (one == null && two == null) {
+            return true;
+        }
+
+        if (one != null) {
+            return one.equals(two);
+        } else {
+            return false;
+        }
+    }
+
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/BatchWriteItemOperation.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/BatchWriteItemOperation.java
new file mode 100644
index 000000000000..6b8e0b4ed12a
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/BatchWriteItemOperation.java
@@ -0,0 +1,86 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.operations;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.CompletableFuture;
+import java.util.function.Function;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClientExtension;
+import software.amazon.awssdk.enhanced.dynamodb.model.BatchWriteItemEnhancedRequest;
+import software.amazon.awssdk.enhanced.dynamodb.model.BatchWriteResult;
+import software.amazon.awssdk.services.dynamodb.DynamoDbAsyncClient;
+import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
+import software.amazon.awssdk.services.dynamodb.model.BatchWriteItemRequest;
+import software.amazon.awssdk.services.dynamodb.model.BatchWriteItemResponse;
+import software.amazon.awssdk.services.dynamodb.model.WriteRequest;
+import software.amazon.awssdk.utils.CollectionUtils;
+
+@SdkInternalApi
+public class BatchWriteItemOperation
+    implements DatabaseOperation<BatchWriteItemRequest, BatchWriteItemResponse, BatchWriteResult> {
+
+    private final BatchWriteItemEnhancedRequest request;
+
+    private BatchWriteItemOperation(BatchWriteItemEnhancedRequest request) {
+        this.request = request;
+    }
+
+    public static BatchWriteItemOperation create(BatchWriteItemEnhancedRequest request) {
+        return new BatchWriteItemOperation(request);
+    }
+
+    @Override
+    public BatchWriteItemRequest generateRequest(DynamoDbEnhancedClientExtension extension) {
+        Map<String, List<WriteRequest>> allRequestItems = new HashMap<>();
+
+        request.writeBatches().forEach(writeBatch -> {
+            Collection<WriteRequest> writeRequestsForTable = allRequestItems.computeIfAbsent(
+                writeBatch.tableName(),
+                ignored -> new ArrayList<>());
+            writeRequestsForTable.addAll(writeBatch.writeRequests());
+        });
+
+        return BatchWriteItemRequest.builder()
+                                    .requestItems(
+                                        Collections.unmodifiableMap(CollectionUtils.deepCopyMap(allRequestItems)))
+                                    .build();
+    }
+
+    @Override
+    public BatchWriteResult transformResponse(BatchWriteItemResponse response,
+                                              DynamoDbEnhancedClientExtension extension) {
+        return BatchWriteResult.builder().unprocessedRequests(response.unprocessedItems()).build();
+    }
+
+    @Override
+    public Function<BatchWriteItemRequest, BatchWriteItemResponse> serviceCall(DynamoDbClient dynamoDbClient) {
+        return dynamoDbClient::batchWriteItem;
+    }
+
+    @Override
+    public Function<BatchWriteItemRequest, CompletableFuture<BatchWriteItemResponse>> asyncServiceCall(
+        DynamoDbAsyncClient dynamoDbAsyncClient) {
+
+        return dynamoDbAsyncClient::batchWriteItem;
+    }
+
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/BatchableReadOperation.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/BatchableReadOperation.java
new file mode 100644
index 000000000000..f523157f4404
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/BatchableReadOperation.java
@@ -0,0 +1,26 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.operations;
+
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.enhanced.dynamodb.Key;
+
+@SdkInternalApi
+public interface BatchableReadOperation {
+    Boolean consistentRead();
+
+    Key key();
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/BatchableWriteOperation.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/BatchableWriteOperation.java
new file mode 100644
index 000000000000..65f70d769494
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/BatchableWriteOperation.java
@@ -0,0 +1,28 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.operations;
+
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClientExtension;
+import software.amazon.awssdk.enhanced.dynamodb.TableSchema;
+import software.amazon.awssdk.services.dynamodb.model.WriteRequest;
+
+@SdkInternalApi
+public interface BatchableWriteOperation<T> {
+    WriteRequest generateWriteRequest(TableSchema<T> tableSchema,
+                                      OperationContext context,
+                                      DynamoDbEnhancedClientExtension extension);
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/CommonOperation.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/CommonOperation.java
new file mode 100644
index 000000000000..97e03583d600
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/CommonOperation.java
@@ -0,0 +1,141 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.operations;
+
+import java.util.concurrent.CompletableFuture;
+import java.util.function.Function;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbAsyncIndex;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbAsyncTable;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClientExtension;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbIndex;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbTable;
+import software.amazon.awssdk.enhanced.dynamodb.TableSchema;
+import software.amazon.awssdk.services.dynamodb.DynamoDbAsyncClient;
+import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
+
+/**
+ * Common interface for a single operation that can be executed in a synchronous or non-blocking asynchronous fashion
+ * against a mapped database table. These operations can be made against either the primary index of a table or a
+ * secondary index, although some implementations of this interface do not support secondary indices and will throw
+ * an exception when executed against one. Conceptually an operation maps 1:1 with an actual DynamoDb call.
+ * <p>
+ * This interface is extended by {@link TableOperation} and {@link IndexOperation} which contain implementations of
+ * the behavior to actually execute the operation in the context of a table or secondary index and are used by
+ * {@link DynamoDbTable} or {@link DynamoDbAsyncTable} and {@link DynamoDbIndex} or {@link DynamoDbAsyncIndex}
+ * respectively. By sharing this common interface operations are able to re-use code regardless of whether they are
+ * executed in the context of a primary or secondary index or whether they are being executed in a synchronous or
+ * non-blocking asynchronous fashion.
+ *
+ * @param <ItemT> The modelled object that this table maps records to.
+ * @param <RequestT>  The type of the request object for the DynamoDb call in the low level {@link DynamoDbClient} or
+ *                  {@link DynamoDbAsyncClient}.
+ * @param <ResponseT> The type of the response object for the DynamoDb call in the low level {@link DynamoDbClient}
+ *                  or {@link DynamoDbAsyncClient}.
+ * @param <ResultT> The type of the mapped result object that will be returned by the execution of this operation.
+ */
+@SdkInternalApi
+public interface CommonOperation<ItemT, RequestT, ResponseT, ResultT> {
+    /**
+     * This method generates the request that needs to be sent to a low level {@link DynamoDbClient}.
+     * @param tableSchema A {@link TableSchema} that maps the table to a modelled object.
+     * @param context An object containing the context, or target, of the command execution.
+     * @param extension A {@link DynamoDbEnhancedClientExtension} that may modify the request of this operation. A null
+     *                  value here will result in no modifications.
+     * @return A request that can be used as an argument to a {@link DynamoDbClient} call to perform the operation.
+     */
+    RequestT generateRequest(TableSchema<ItemT> tableSchema, OperationContext context,
+                             DynamoDbEnhancedClientExtension extension);
+
+    /**
+     * Provides a function for making the low level synchronous SDK call to DynamoDb.
+     * @param dynamoDbClient A low level {@link DynamoDbClient} to make the call against.
+     * @return A function that calls DynamoDb with a provided request object and returns the response object.
+     */
+    Function<RequestT, ResponseT> serviceCall(DynamoDbClient dynamoDbClient);
+
+    /**
+     * Provides a function for making the low level non-blocking asynchronous SDK call to DynamoDb.
+     * @param dynamoDbAsyncClient A low level {@link DynamoDbAsyncClient} to make the call against.
+     * @return A function that calls DynamoDb with a provided request object and returns the response object.
+     */
+    Function<RequestT, CompletableFuture<ResponseT>> asyncServiceCall(DynamoDbAsyncClient dynamoDbAsyncClient);
+
+    /**
+     * Takes the response object returned by the actual DynamoDb call and maps it into a higher level abstracted
+     * result object.
+     * @param response The response object returned by the DynamoDb call for this operation.
+     * @param tableSchema A {@link TableSchema} that maps the table to a modelled object.
+     * @param context An object containing the context, or target, of the command execution.
+     * @param extension A {@link DynamoDbEnhancedClientExtension} that may modify the result of this operation. A null
+     *                  value here will result in no modifications.
+     * @return A high level result object as specified by the implementation of this operation.
+     */
+    ResultT transformResponse(ResponseT response,
+                              TableSchema<ItemT> tableSchema,
+                              OperationContext context,
+                              DynamoDbEnhancedClientExtension extension);
+
+    /**
+     * Default implementation of a complete synchronous execution of this operation against either the primary or a
+     * secondary index.
+     * It performs three steps:
+     * 1) Call generateRequest() to get the request object.
+     * 2) Call getServiceCall() and call it using the request object generated in the previous step.
+     * 3) Call transformResponse() to convert the response object returned in the previous step to a high level result.
+     *
+     * @param tableSchema A {@link TableSchema} that maps the table to a modelled object.
+     * @param context An object containing the context, or target, of the command execution.
+     * @param dynamoDbClient A {@link DynamoDbClient} to make the call against.
+     * @param extension A {@link DynamoDbEnhancedClientExtension} that may modify the request or result of this
+     *                  operation. A null value here will result in no modifications.
+     * @return A high level result object as specified by the implementation of this operation.
+     */
+    default ResultT execute(TableSchema<ItemT> tableSchema,
+                            OperationContext context,
+                            DynamoDbEnhancedClientExtension extension,
+                            DynamoDbClient dynamoDbClient) {
+        RequestT request = generateRequest(tableSchema, context, extension);
+        ResponseT response = serviceCall(dynamoDbClient).apply(request);
+        return transformResponse(response, tableSchema, context, extension);
+    }
+
+    /**
+     * Default implementation of a complete non-blocking asynchronous execution of this operation against either the
+     * primary or a secondary index.
+     * It performs three steps:
+     * 1) Call generateRequest() to get the request object.
+     * 2) Call getServiceCall() and call it using the request object generated in the previous step.
+     * 3) Wraps the {@link CompletableFuture} returned by the SDK in a new one that calls transformResponse() to
+     * convert the response object returned in the previous step to a high level result.
+     *
+     * @param tableSchema A {@link TableSchema} that maps the table to a modelled object.
+     * @param context An object containing the context, or target, of the command execution.
+     * @param dynamoDbAsyncClient A {@link DynamoDbAsyncClient} to make the call against.
+     * @param extension A {@link DynamoDbEnhancedClientExtension} that may modify the request or result of this
+     *                  operation. A null value here will result in no modifications.
+     * @return A {@link CompletableFuture} of the high level result object as specified by the implementation of this
+     * operation.
+     */
+    default CompletableFuture<ResultT> executeAsync(TableSchema<ItemT> tableSchema,
+                                                    OperationContext context,
+                                                    DynamoDbEnhancedClientExtension extension,
+                                                    DynamoDbAsyncClient dynamoDbAsyncClient) {
+        RequestT request = generateRequest(tableSchema, context, extension);
+        CompletableFuture<ResponseT> response = asyncServiceCall(dynamoDbAsyncClient).apply(request);
+        return response.thenApply(r -> transformResponse(r, tableSchema, context, extension));
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/CreateTableOperation.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/CreateTableOperation.java
new file mode 100644
index 000000000000..e694531ce44b
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/CreateTableOperation.java
@@ -0,0 +1,182 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.operations;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.CompletableFuture;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClientExtension;
+import software.amazon.awssdk.enhanced.dynamodb.TableMetadata;
+import software.amazon.awssdk.enhanced.dynamodb.TableSchema;
+import software.amazon.awssdk.enhanced.dynamodb.model.CreateTableEnhancedRequest;
+import software.amazon.awssdk.services.dynamodb.DynamoDbAsyncClient;
+import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
+import software.amazon.awssdk.services.dynamodb.model.AttributeDefinition;
+import software.amazon.awssdk.services.dynamodb.model.BillingMode;
+import software.amazon.awssdk.services.dynamodb.model.CreateTableRequest;
+import software.amazon.awssdk.services.dynamodb.model.CreateTableResponse;
+import software.amazon.awssdk.services.dynamodb.model.KeySchemaElement;
+import software.amazon.awssdk.services.dynamodb.model.KeyType;
+
+@SdkInternalApi
+public class CreateTableOperation<T> implements TableOperation<T, CreateTableRequest, CreateTableResponse, Void> {
+
+    private final CreateTableEnhancedRequest request;
+
+    private CreateTableOperation(CreateTableEnhancedRequest request) {
+        this.request = request;
+    }
+
+    public static <T> CreateTableOperation<T> create(CreateTableEnhancedRequest request) {
+        return new CreateTableOperation<>(request);
+    }
+
+    @Override
+    public CreateTableRequest generateRequest(TableSchema<T> tableSchema,
+                                              OperationContext operationContext,
+                                              DynamoDbEnhancedClientExtension extension) {
+        if (!TableMetadata.primaryIndexName().equals(operationContext.indexName())) {
+            throw new IllegalArgumentException("PutItem cannot be executed against a secondary index.");
+        }
+
+        String primaryPartitionKey = tableSchema.tableMetadata().primaryPartitionKey();
+        Optional<String> primarySortKey = tableSchema.tableMetadata().primarySortKey();
+        Set<String> dedupedIndexKeys = new HashSet<>();
+        dedupedIndexKeys.add(primaryPartitionKey);
+        primarySortKey.ifPresent(dedupedIndexKeys::add);
+        List<software.amazon.awssdk.services.dynamodb.model.GlobalSecondaryIndex> sdkGlobalSecondaryIndices = null;
+        List<software.amazon.awssdk.services.dynamodb.model.LocalSecondaryIndex> sdkLocalSecondaryIndices = null;
+
+        if (this.request.globalSecondaryIndices() != null) {
+            sdkGlobalSecondaryIndices =
+                this.request.globalSecondaryIndices().stream().map(gsi -> {
+                    String indexPartitionKey = tableSchema.tableMetadata().indexPartitionKey(gsi.indexName());
+                    Optional<String> indexSortKey = tableSchema.tableMetadata().indexSortKey(gsi.indexName());
+                    dedupedIndexKeys.add(indexPartitionKey);
+                    indexSortKey.ifPresent(dedupedIndexKeys::add);
+
+                    return software.amazon.awssdk.services.dynamodb.model.GlobalSecondaryIndex
+                        .builder()
+                        .indexName(gsi.indexName())
+                        .keySchema(generateKeySchema(indexPartitionKey, indexSortKey.orElse(null)))
+                        .projection(gsi.projection())
+                        .provisionedThroughput(gsi.provisionedThroughput())
+                        .build();
+                }).collect(Collectors.toList());
+        }
+
+        if (this.request.localSecondaryIndices() != null) {
+            sdkLocalSecondaryIndices =
+                this.request.localSecondaryIndices().stream().map(lsi -> {
+                    Optional<String> indexSortKey = tableSchema.tableMetadata().indexSortKey(lsi.indexName());
+                    indexSortKey.ifPresent(dedupedIndexKeys::add);
+
+                    if (!primaryPartitionKey.equals(
+                        tableSchema.tableMetadata().indexPartitionKey(lsi.indexName()))) {
+                        throw new IllegalArgumentException("Attempt to create a local secondary index with a partition "
+                                                           + "key that is not the primary partition key. Index name: "
+                                                           + lsi.indexName());
+                    }
+
+                    return software.amazon.awssdk.services.dynamodb.model.LocalSecondaryIndex
+                        .builder()
+                        .indexName(lsi.indexName())
+                        .keySchema(generateKeySchema(primaryPartitionKey, indexSortKey.orElse(null)))
+                        .projection(lsi.projection())
+                        .build();
+                }).collect(Collectors.toList());
+        }
+
+        List<AttributeDefinition> attributeDefinitions =
+            dedupedIndexKeys.stream()
+                            .map(attribute ->
+                                     AttributeDefinition.builder()
+                                                        .attributeName(attribute)
+                                                        .attributeType(tableSchema.tableMetadata()
+                                                                                  .scalarAttributeType(attribute)
+                                                                                  .orElseThrow(() ->
+                                        new IllegalArgumentException("Could not map the key attribute '" + attribute +
+                                                                     "' to a valid scalar type.")))
+                                                        .build())
+                            .collect(Collectors.toList());
+
+        BillingMode billingMode = this.request.provisionedThroughput() == null ?
+                                  BillingMode.PAY_PER_REQUEST :
+                                  BillingMode.PROVISIONED;
+
+        return CreateTableRequest.builder()
+                                 .tableName(operationContext.tableName())
+                                 .keySchema(generateKeySchema(primaryPartitionKey, primarySortKey.orElse(null)))
+                                 .globalSecondaryIndexes(sdkGlobalSecondaryIndices)
+                                 .localSecondaryIndexes(sdkLocalSecondaryIndices)
+                                 .attributeDefinitions(attributeDefinitions)
+                                 .billingMode(billingMode)
+                                 .provisionedThroughput(this.request.provisionedThroughput())
+                                 .build();
+    }
+
+    @Override
+    public Function<CreateTableRequest, CreateTableResponse> serviceCall(DynamoDbClient dynamoDbClient) {
+        return dynamoDbClient::createTable;
+    }
+
+    @Override
+    public Function<CreateTableRequest, CompletableFuture<CreateTableResponse>> asyncServiceCall(
+        DynamoDbAsyncClient dynamoDbAsyncClient) {
+
+        return dynamoDbAsyncClient::createTable;
+    }
+
+    @Override
+    public Void transformResponse(CreateTableResponse response,
+                                  TableSchema<T> tableSchema,
+                                  OperationContext operationContext,
+                                  DynamoDbEnhancedClientExtension extension) {
+        // This operation does not return results
+        return null;
+    }
+
+    private static Collection<KeySchemaElement> generateKeySchema(String partitionKey, String sortKey) {
+        if (sortKey == null) {
+            return generateKeySchema(partitionKey);
+        }
+
+        return Collections.unmodifiableList(Arrays.asList(KeySchemaElement.builder()
+                                                                          .attributeName(partitionKey)
+                                                                          .keyType(KeyType.HASH)
+                                                                          .build(),
+                                                          KeySchemaElement.builder()
+                                                                          .attributeName(sortKey)
+                                                                          .keyType(KeyType.RANGE)
+                                                                          .build()));
+    }
+
+    private static Collection<KeySchemaElement> generateKeySchema(String partitionKey) {
+        return Collections.singletonList(KeySchemaElement.builder()
+                                                         .attributeName(partitionKey)
+                                                         .keyType(KeyType.HASH)
+                                                         .build());
+    }
+
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/DatabaseOperation.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/DatabaseOperation.java
new file mode 100644
index 000000000000..be6616efe577
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/DatabaseOperation.java
@@ -0,0 +1,106 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.operations;
+
+import java.util.concurrent.CompletableFuture;
+import java.util.function.Function;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClientExtension;
+import software.amazon.awssdk.services.dynamodb.DynamoDbAsyncClient;
+import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
+
+/**
+ * Interface for a single operation that can be executed against a mapped database. These operations do not operate
+ * on a specific table or index, and may reference multiple tables and indexes (eg: batch operations). Conceptually an
+ * operation maps 1:1 with an actual DynamoDb call.
+ *
+ * @param <RequestT>  The type of the request object for the DynamoDb call in the low level {@link DynamoDbClient}.
+ * @param <ResponseT> The type of the response object for the DynamoDb call in the low level {@link DynamoDbClient}.
+ * @param <ResultT> The type of the mapped result object that will be returned by the execution of this operation.
+ */
+@SdkInternalApi
+public interface DatabaseOperation<RequestT, ResponseT, ResultT> {
+    /**
+     * This method generates the request that needs to be sent to a low level {@link DynamoDbClient}.
+     * @param extension A {@link DynamoDbEnhancedClientExtension} that may modify the request of this operation. A null
+     *                  value here will result in no modifications.
+     * @return A request that can be used as an argument to a {@link DynamoDbClient} call to perform the operation.
+     */
+    RequestT generateRequest(DynamoDbEnhancedClientExtension extension);
+
+    /**
+     * Provides a function for making the low level synchronous SDK call to DynamoDb.
+     * @param dynamoDbClient A low level {@link DynamoDbClient} to make the call against.
+     * @return A function that calls DynamoDb with a provided request object and returns the response object.
+     */
+    Function<RequestT, ResponseT> serviceCall(DynamoDbClient dynamoDbClient);
+
+    /**
+     * Provides a function for making the low level non-blocking asynchronous SDK call to DynamoDb.
+     * @param dynamoDbAsyncClient A low level {@link DynamoDbAsyncClient} to make the call against.
+     * @return A function that calls DynamoDb with a provided request object and returns a {@link CompletableFuture}
+     * for the response object.
+     */
+    Function<RequestT, CompletableFuture<ResponseT>> asyncServiceCall(DynamoDbAsyncClient dynamoDbAsyncClient);
+
+    /**
+     * Takes the response object returned by the actual DynamoDb call and maps it into a higher level abstracted
+     * result object.
+     * @param response The response object returned by the DynamoDb call for this operation.
+     * @param extension A {@link DynamoDbEnhancedClientExtension} that may modify the result of this operation. A null
+     *                  value here will result in no modifications.
+     * @return A high level result object as specified by the implementation of this operation.
+     */
+    ResultT transformResponse(ResponseT response, DynamoDbEnhancedClientExtension extension);
+
+    /**
+     * Default implementation of a complete synchronous execution of this operation. It performs three steps:
+     * 1) Call generateRequest() to get the request object.
+     * 2) Call getServiceCall() and call it using the request object generated in the previous step.
+     * 3) Call transformResponse() to convert the response object returned in the previous step to a high level result.
+     *
+     * @param dynamoDbClient A {@link DynamoDbClient} to make the call against.
+     * @param extension A {@link DynamoDbEnhancedClientExtension} that may modify the request or result of this
+     *                  operation. A null value here will result in no modifications.
+     * @return A high level result object as specified by the implementation of this operation.
+     */
+    default ResultT execute(DynamoDbClient dynamoDbClient, DynamoDbEnhancedClientExtension extension) {
+        RequestT request = generateRequest(extension);
+        ResponseT response = serviceCall(dynamoDbClient).apply(request);
+        return transformResponse(response, extension);
+    }
+
+    /**
+     * Default implementation of a complete non-blocking asynchronous execution of this operation. It performs three
+     * steps:
+     * 1) Call generateRequest() to get the request object.
+     * 2) Call getServiceCall() and call it using the request object generated in the previous step.
+     * 3) Wraps the {@link CompletableFuture} returned by the SDK in a new one that calls transformResponse() to
+     * convert the response object returned in the previous step to a high level result.
+     *
+     * @param dynamoDbAsyncClient A {@link DynamoDbAsyncClient} to make the call against.
+     * @param extension A {@link DynamoDbEnhancedClientExtension} that may modify the request or result of this
+     *                  operation. A null value here will result in no modifications.
+     * @return A high level result object as specified by the implementation of this operation.
+     */
+    default CompletableFuture<ResultT> executeAsync(DynamoDbAsyncClient dynamoDbAsyncClient,
+                                                    DynamoDbEnhancedClientExtension extension) {
+
+        RequestT request = generateRequest(extension);
+        CompletableFuture<ResponseT> response = asyncServiceCall(dynamoDbAsyncClient).apply(request);
+        return response.thenApply(r -> transformResponse(r, extension));
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/DeleteItemOperation.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/DeleteItemOperation.java
new file mode 100644
index 000000000000..4603e9c4c96e
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/DeleteItemOperation.java
@@ -0,0 +1,138 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.operations;
+
+import java.util.concurrent.CompletableFuture;
+import java.util.function.Function;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClientExtension;
+import software.amazon.awssdk.enhanced.dynamodb.TableMetadata;
+import software.amazon.awssdk.enhanced.dynamodb.TableSchema;
+import software.amazon.awssdk.enhanced.dynamodb.internal.EnhancedClientUtils;
+import software.amazon.awssdk.enhanced.dynamodb.model.DeleteItemEnhancedRequest;
+import software.amazon.awssdk.services.dynamodb.DynamoDbAsyncClient;
+import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
+import software.amazon.awssdk.services.dynamodb.model.Delete;
+import software.amazon.awssdk.services.dynamodb.model.DeleteItemRequest;
+import software.amazon.awssdk.services.dynamodb.model.DeleteItemResponse;
+import software.amazon.awssdk.services.dynamodb.model.DeleteRequest;
+import software.amazon.awssdk.services.dynamodb.model.ReturnValue;
+import software.amazon.awssdk.services.dynamodb.model.TransactWriteItem;
+import software.amazon.awssdk.services.dynamodb.model.WriteRequest;
+
+@SdkInternalApi
+public class DeleteItemOperation<T>
+    implements TableOperation<T, DeleteItemRequest, DeleteItemResponse, T>,
+               TransactableWriteOperation<T>,
+               BatchableWriteOperation<T> {
+
+    private final DeleteItemEnhancedRequest request;
+
+    private DeleteItemOperation(DeleteItemEnhancedRequest request) {
+        this.request = request;
+    }
+
+    public static <T> DeleteItemOperation<T> create(DeleteItemEnhancedRequest request) {
+        return new DeleteItemOperation<>(request);
+    }
+
+    @Override
+    public DeleteItemRequest generateRequest(TableSchema<T> tableSchema,
+                                             OperationContext operationContext,
+                                             DynamoDbEnhancedClientExtension extension) {
+
+        if (!TableMetadata.primaryIndexName().equals(operationContext.indexName())) {
+            throw new IllegalArgumentException("DeleteItem cannot be executed against a secondary index.");
+        }
+
+        DeleteItemRequest.Builder requestBuilder =
+            DeleteItemRequest.builder()
+                             .tableName(operationContext.tableName())
+                             .key(this.request.key().keyMap(tableSchema, operationContext.indexName()))
+                             .returnValues(ReturnValue.ALL_OLD);
+
+        requestBuilder = addExpressionsIfExist(requestBuilder);
+
+        return requestBuilder.build();
+    }
+
+    @Override
+    public T transformResponse(DeleteItemResponse response,
+                               TableSchema<T> tableSchema,
+                               OperationContext operationContext,
+                               DynamoDbEnhancedClientExtension extension) {
+        return EnhancedClientUtils.readAndTransformSingleItem(response.attributes(), tableSchema, operationContext, extension);
+    }
+
+    @Override
+    public Function<DeleteItemRequest, DeleteItemResponse> serviceCall(DynamoDbClient dynamoDbClient) {
+        return dynamoDbClient::deleteItem;
+    }
+
+    @Override
+    public Function<DeleteItemRequest, CompletableFuture<DeleteItemResponse>> asyncServiceCall(
+        DynamoDbAsyncClient dynamoDbAsyncClient) {
+
+        return dynamoDbAsyncClient::deleteItem;
+    }
+
+    @Override
+    public WriteRequest generateWriteRequest(TableSchema<T> tableSchema,
+                                             OperationContext operationContext,
+                                             DynamoDbEnhancedClientExtension extension) {
+        DeleteItemRequest deleteItemRequest = generateRequest(tableSchema, operationContext, extension);
+
+        return WriteRequest.builder()
+                           .deleteRequest(DeleteRequest.builder().key(deleteItemRequest.key()).build())
+                           .build();
+    }
+
+    @Override
+    public TransactWriteItem generateTransactWriteItem(TableSchema<T> tableSchema,
+                                                       OperationContext operationContext,
+                                                       DynamoDbEnhancedClientExtension dynamoDbEnhancedClientExtension) {
+        DeleteItemRequest deleteItemRequest = generateRequest(tableSchema, operationContext, dynamoDbEnhancedClientExtension);
+
+        Delete delete = Delete.builder()
+                              .key(deleteItemRequest.key())
+                              .tableName(deleteItemRequest.tableName())
+                              .conditionExpression(deleteItemRequest.conditionExpression())
+                              .expressionAttributeValues(deleteItemRequest.expressionAttributeValues())
+                              .expressionAttributeNames(deleteItemRequest.expressionAttributeNames())
+                              .build();
+
+        return TransactWriteItem.builder()
+                                .delete(delete)
+                                .build();
+    }
+
+    private DeleteItemRequest.Builder addExpressionsIfExist(DeleteItemRequest.Builder requestBuilder) {
+        if (this.request.conditionExpression() != null) {
+            requestBuilder = requestBuilder.conditionExpression(this.request.conditionExpression().expression());
+
+            // Avoiding adding empty collections that the low level SDK will propagate to DynamoDb where it causes error.
+            if (!this.request.conditionExpression().expressionNames().isEmpty()) {
+                requestBuilder = requestBuilder.expressionAttributeNames(this.request.conditionExpression().expressionNames());
+            }
+
+            if (!this.request.conditionExpression().expressionValues().isEmpty()) {
+                requestBuilder = requestBuilder.expressionAttributeValues(this.request.conditionExpression().expressionValues());
+            }
+        }
+        return requestBuilder;
+    }
+
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/GetItemOperation.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/GetItemOperation.java
new file mode 100644
index 000000000000..1779197b14de
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/GetItemOperation.java
@@ -0,0 +1,106 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.operations;
+
+import java.util.concurrent.CompletableFuture;
+import java.util.function.Function;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClientExtension;
+import software.amazon.awssdk.enhanced.dynamodb.Key;
+import software.amazon.awssdk.enhanced.dynamodb.TableMetadata;
+import software.amazon.awssdk.enhanced.dynamodb.TableSchema;
+import software.amazon.awssdk.enhanced.dynamodb.internal.EnhancedClientUtils;
+import software.amazon.awssdk.enhanced.dynamodb.model.GetItemEnhancedRequest;
+import software.amazon.awssdk.services.dynamodb.DynamoDbAsyncClient;
+import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
+import software.amazon.awssdk.services.dynamodb.model.Get;
+import software.amazon.awssdk.services.dynamodb.model.GetItemRequest;
+import software.amazon.awssdk.services.dynamodb.model.GetItemResponse;
+import software.amazon.awssdk.services.dynamodb.model.TransactGetItem;
+
+@SdkInternalApi
+public class GetItemOperation<T> implements TableOperation<T, GetItemRequest, GetItemResponse, T>,
+                                            BatchableReadOperation,
+                                            TransactableReadOperation<T> {
+
+    private final GetItemEnhancedRequest request;
+
+    private GetItemOperation(GetItemEnhancedRequest request) {
+        this.request = request;
+    }
+
+    public static <T> GetItemOperation<T> create(GetItemEnhancedRequest request) {
+        return new GetItemOperation<>(request);
+    }
+
+    @Override
+    public Boolean consistentRead() {
+        return this.request.consistentRead();
+    }
+
+    @Override
+    public Key key() {
+        return this.request.key();
+    }
+
+    @Override
+    public GetItemRequest generateRequest(TableSchema<T> tableSchema,
+                                          OperationContext context,
+                                          DynamoDbEnhancedClientExtension extension) {
+        if (!TableMetadata.primaryIndexName().equals(context.indexName())) {
+            throw new IllegalArgumentException("GetItem cannot be executed against a secondary index.");
+        }
+
+        return GetItemRequest.builder()
+                             .tableName(context.tableName())
+                             .key(this.request.key().keyMap(tableSchema, context.indexName()))
+                             .consistentRead(this.request.consistentRead())
+                             .build();
+    }
+
+    @Override
+    public T transformResponse(GetItemResponse response,
+                               TableSchema<T> tableSchema,
+                               OperationContext context,
+                               DynamoDbEnhancedClientExtension extension) {
+        return EnhancedClientUtils.readAndTransformSingleItem(response.item(), tableSchema, context, extension);
+    }
+
+    @Override
+    public Function<GetItemRequest, GetItemResponse> serviceCall(DynamoDbClient dynamoDbClient) {
+        return dynamoDbClient::getItem;
+    }
+
+    @Override
+    public Function<GetItemRequest, CompletableFuture<GetItemResponse>> asyncServiceCall(
+        DynamoDbAsyncClient dynamoDbAsyncClient) {
+
+        return dynamoDbAsyncClient::getItem;
+    }
+
+    @Override
+    public TransactGetItem generateTransactGetItem(TableSchema<T> tableSchema,
+                                                   OperationContext operationContext,
+                                                   DynamoDbEnhancedClientExtension dynamoDbEnhancedClientExtension) {
+        return TransactGetItem.builder()
+                              .get(Get.builder()
+                                      .tableName(operationContext.tableName())
+                                      .key(this.request.key().keyMap(tableSchema, operationContext.indexName()))
+                                      .build())
+                              .build();
+    }
+
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/IndexOperation.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/IndexOperation.java
new file mode 100644
index 000000000000..781d621d1598
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/IndexOperation.java
@@ -0,0 +1,85 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.operations;
+
+import java.util.concurrent.CompletableFuture;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClientExtension;
+import software.amazon.awssdk.enhanced.dynamodb.TableSchema;
+import software.amazon.awssdk.services.dynamodb.DynamoDbAsyncClient;
+import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
+
+/**
+ * Interface for a single operation that can be executed against a secondary index of a mapped database table.
+ * Conceptually an operation maps 1:1 with an actual DynamoDb call.
+ * <p>
+ * A concrete implementation of this interface should also implement {@link TableOperation} with the same types if
+ * the operation supports being executed against both the primary index and secondary indices.
+ *
+ * @param <ItemT> The modelled object that this table maps records to.
+ * @param <RequestT>  The type of the request object for the DynamoDb call in the low level {@link DynamoDbClient}.
+ * @param <ResponseT> The type of the response object for the DynamoDb call in the low level {@link DynamoDbClient}.
+ * @param <ResultT> The type of the mapped result object that will be returned by the execution of this operation.
+ */
+@SdkInternalApi
+public interface IndexOperation<ItemT, RequestT, ResponseT, ResultT>
+    extends CommonOperation<ItemT, RequestT, ResponseT, ResultT> {
+    /**
+     * Default implementation of a complete synchronous execution of this operation against a secondary index. It will
+     * construct a context based on the given table name and secondary index name and then call execute() on the
+     * {@link CommonOperation} interface to perform the operation.
+     *
+     * @param tableSchema A {@link TableSchema} that maps the table to a modelled object.
+     * @param tableName The physical name of the table that contains the secondary index to execute the operation
+     *                  against.
+     * @param indexName The physical name of the secondary index to execute the operation against.
+     * @param dynamoDbClient A {@link DynamoDbClient} to make the call against.
+     * @param extension A {@link DynamoDbEnhancedClientExtension} that may modify the request or result of this
+     *                  operation. A null value here will result in no modifications.
+     * @return A high level result object as specified by the implementation of this operation.
+     */
+    default ResultT executeOnSecondaryIndex(TableSchema<ItemT> tableSchema,
+                                            String tableName,
+                                            String indexName,
+                                            DynamoDbEnhancedClientExtension extension,
+                                            DynamoDbClient dynamoDbClient) {
+        OperationContext context = OperationContext.create(tableName, indexName);
+        return execute(tableSchema, context, extension, dynamoDbClient);
+    }
+
+    /**
+     * Default implementation of a complete non-blocking asynchronous execution of this operation against a secondary
+     * index. It will construct a context based on the given table name and secondary index name and then call
+     * executeAsync() on the {@link CommonOperation} interface to perform the operation.
+     *
+     * @param tableSchema A {@link TableSchema} that maps the table to a modelled object.
+     * @param tableName The physical name of the table that contains the secondary index to execute the operation
+     *                  against.
+     * @param indexName The physical name of the secondary index to execute the operation against.
+     * @param dynamoDbAsyncClient A {@link DynamoDbAsyncClient} to make the call against.
+     * @param extension A {@link DynamoDbEnhancedClientExtension} that may modify the request or result of this
+     *                  operation. A null value here will result in no modifications.
+     * @return A high level result object as specified by the implementation of this operation.
+     */
+    default CompletableFuture<ResultT> executeOnSecondaryIndexAsync(TableSchema<ItemT> tableSchema,
+                                                                    String tableName,
+                                                                    String indexName,
+                                                                    DynamoDbEnhancedClientExtension extension,
+                                                                    DynamoDbAsyncClient dynamoDbAsyncClient) {
+        OperationContext context = OperationContext.create(tableName, indexName);
+        return executeAsync(tableSchema, context, extension, dynamoDbAsyncClient);
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/OperationContext.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/OperationContext.java
new file mode 100644
index 000000000000..dfca2dbef33b
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/OperationContext.java
@@ -0,0 +1,70 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.operations;
+
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.enhanced.dynamodb.TableMetadata;
+
+@SdkInternalApi
+public class OperationContext {
+    private final String tableName;
+    private final String indexName;
+
+    private OperationContext(String tableName, String indexName) {
+        this.tableName = tableName;
+        this.indexName = indexName;
+    }
+
+    public static OperationContext create(String tableName, String indexName) {
+        return new OperationContext(tableName, indexName);
+    }
+
+    public static OperationContext create(String tableName) {
+        return new OperationContext(tableName, TableMetadata.primaryIndexName());
+    }
+
+    public String tableName() {
+        return tableName;
+    }
+
+    public String indexName() {
+        return indexName;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        OperationContext that = (OperationContext) o;
+
+        if (tableName != null ? ! tableName.equals(that.tableName) : that.tableName != null) {
+            return false;
+        }
+        return indexName != null ? indexName.equals(that.indexName) : that.indexName == null;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = tableName != null ? tableName.hashCode() : 0;
+        result = 31 * result + (indexName != null ? indexName.hashCode() : 0);
+        return result;
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/PaginatedDatabaseOperation.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/PaginatedDatabaseOperation.java
new file mode 100644
index 000000000000..36bf8dbd80f3
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/PaginatedDatabaseOperation.java
@@ -0,0 +1,113 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.operations;
+
+import java.util.concurrent.CompletableFuture;
+import java.util.function.Function;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.core.async.SdkPublisher;
+import software.amazon.awssdk.core.pagination.sync.SdkIterable;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClientExtension;
+import software.amazon.awssdk.enhanced.dynamodb.internal.TransformIterable;
+import software.amazon.awssdk.services.dynamodb.DynamoDbAsyncClient;
+import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
+
+/**
+ * Interface for an operation that can be executed against a mapped database and is expected to return a paginated
+ * list of results. These operations do not operate on a specific table or index, and may reference multiple tables
+ * and indexes (eg: batch operations). Typically, each page of results that is served will automatically perform an
+ * additional service call to DynamoDb to retrieve the next set of results.
+ *
+ * @param <RequestT>  The type of the request object for the DynamoDb call in the low level {@link DynamoDbClient}.
+ * @param <ResponseT> The type of the response object for the DynamoDb call in the low level {@link DynamoDbClient}.
+ * @param <ResultT> The type of the mapped result object that will be returned by the execution of this operation.
+ */
+@SdkInternalApi
+public interface PaginatedDatabaseOperation<RequestT, ResponseT, ResultT> {
+    /**
+     * This method generates the request that needs to be sent to a low level {@link DynamoDbClient}.
+     * @param extension A {@link DynamoDbEnhancedClientExtension} that may modify the request of this operation. A null value
+     *                        here will result in no modifications.
+     * @return A request that can be used as an argument to a {@link DynamoDbClient} call to perform the operation.
+     */
+    RequestT generateRequest(DynamoDbEnhancedClientExtension extension);
+
+    /**
+     * Provides a function for making the low level synchronous paginated SDK call to DynamoDb.
+     * @param dynamoDbClient A low level {@link DynamoDbClient} to make the call against.
+     * @return A function that calls DynamoDb with a provided request object and returns the response object.
+     */
+    Function<RequestT, SdkIterable<ResponseT>> serviceCall(DynamoDbClient dynamoDbClient);
+
+    /**
+     * Provides a function for making the low level non-blocking asynchronous paginated SDK call to DynamoDb.
+     * @param dynamoDbAsyncClient A low level {@link DynamoDbAsyncClient} to make the call against.
+     * @return A function that calls DynamoDb with a provided request object and returns the response object.
+     */
+    Function<RequestT, SdkPublisher<ResponseT>> asyncServiceCall(DynamoDbAsyncClient dynamoDbAsyncClient);
+
+    /**
+     * Takes the response object returned by the actual DynamoDb call and maps it into a higher level abstracted
+     * result object.
+     * @param response The response object returned by the DynamoDb call for this operation.
+     * @param extension A {@link DynamoDbEnhancedClientExtension} that may modify the result of this operation. A null value
+     *                        here will result in no modifications.
+     * @return A high level result object as specified by the implementation of this operation.
+     */
+    ResultT transformResponse(ResponseT response, DynamoDbEnhancedClientExtension extension);
+
+    /**
+     * Default implementation of a complete synchronous execution of this operation against a database.
+     * It performs three steps:
+     * 1) Call generateRequest() to get the request object.
+     * 2) Call getServiceCall() and call it using the request object generated in the previous step.
+     * 3) Wraps the {@link SdkIterable} that was returned by the previous step with a transformation that turns each
+     * object returned to a high level result.
+     *
+     * @param dynamoDbClient A {@link DynamoDbClient} to make the call against.
+     * @param extension A {@link DynamoDbEnhancedClientExtension} that may modify the request or result of this operation. A
+     *                        null value here will result in no modifications.
+     * @return An {@link SdkIterable} that will iteratively return pages of high level result objects as specified by
+     * the implementation of this operation.
+     */
+    default SdkIterable<ResultT> execute(DynamoDbClient dynamoDbClient, DynamoDbEnhancedClientExtension extension) {
+        RequestT request = generateRequest(extension);
+        SdkIterable<ResponseT> response = serviceCall(dynamoDbClient).apply(request);
+        return TransformIterable.of(response, r -> transformResponse(r, extension));
+    }
+
+    /**
+     * Default implementation of a complete non-blocking asynchronous execution of this operation against a database.
+     * It performs three steps:
+     * 1) Call generateRequest() to get the request object.
+     * 2) Call getServiceCall() and call it using the request object generated in the previous step.
+     * 3) Wraps the {@link CompletableFuture} returned by the SDK in a new one that calls transformResponse() to
+     * convert the response object returned in the previous step to a high level result.
+     *
+     * @param dynamoDbAsyncClient A {@link DynamoDbAsyncClient} to make the call against.
+     * @param extension A {@link DynamoDbEnhancedClientExtension} that may modify the request or result of this operation. A
+     *                        null value here will result in no modifications.
+     * @return An {@link SdkPublisher} that will publish pages of the high level result object as specified by the
+     * implementation of this operation.
+     */
+    default SdkPublisher<ResultT> executeAsync(DynamoDbAsyncClient dynamoDbAsyncClient,
+                                                    DynamoDbEnhancedClientExtension extension) {
+
+        RequestT request = generateRequest(extension);
+        SdkPublisher<ResponseT> response = asyncServiceCall(dynamoDbAsyncClient).apply(request);
+        return response.map(r -> transformResponse(r, extension));
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/PaginatedIndexOperation.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/PaginatedIndexOperation.java
new file mode 100644
index 000000000000..01dd430d92d6
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/PaginatedIndexOperation.java
@@ -0,0 +1,87 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.operations;
+
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.core.async.SdkPublisher;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClientExtension;
+import software.amazon.awssdk.enhanced.dynamodb.TableSchema;
+import software.amazon.awssdk.enhanced.dynamodb.model.Page;
+import software.amazon.awssdk.enhanced.dynamodb.model.PageIterable;
+import software.amazon.awssdk.services.dynamodb.DynamoDbAsyncClient;
+import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
+
+/**
+ * Interface for an operation that can be executed against a secondary index of a mapped database table and is
+ * expected to return a paginated list of results. Typically, each page of results that is served will automatically
+ * perform an additional service call to DynamoDb to retrieve the next set of results.
+ * <p></p>
+ * A concrete implementation of this interface should also implement {@link PaginatedTableOperation} with the same
+ * types if the operation supports being executed against both the primary index and secondary indices.
+ *
+ * @param <ItemT> The modelled object that this table maps records to.
+ * @param <RequestT>  The type of the request object for the DynamoDb call in the low level {@link DynamoDbClient}.
+ * @param <ResponseT> The type of the response object for the DynamoDb call in the low level {@link DynamoDbClient}.
+ */
+@SdkInternalApi
+public interface PaginatedIndexOperation<ItemT, RequestT, ResponseT>
+    extends PaginatedOperation<ItemT, RequestT, ResponseT> {
+    /**
+     * Default implementation of a complete synchronous execution of this operation against a secondary index. It will
+     * construct a context based on the given table name and secondary index name and then call execute() on the
+     * {@link PaginatedOperation} interface to perform the operation.
+     *
+     * @param tableSchema A {@link TableSchema} that maps the table to a modelled object.
+     * @param tableName The physical name of the table that contains the secondary index to execute the operation
+     *                  against.
+     * @param indexName The physical name of the secondary index to execute the operation against.
+     * @param dynamoDbClient A {@link DynamoDbClient} to make the call against.
+     * @param extension A {@link DynamoDbEnhancedClientExtension} that may modify the request or result of this
+     *                  operation. A null value here will result in no modifications.
+     * @return A high level result object as specified by the implementation of this operation.
+     */
+    default PageIterable<ItemT> executeOnSecondaryIndex(TableSchema<ItemT> tableSchema,
+                                                        String tableName,
+                                                        String indexName,
+                                                        DynamoDbEnhancedClientExtension extension,
+                                                        DynamoDbClient dynamoDbClient) {
+        OperationContext context = OperationContext.create(tableName, indexName);
+        return execute(tableSchema, context, extension, dynamoDbClient);
+    }
+
+    /**
+     * Default implementation of a complete non-blocking asynchronous execution of this operation against a secondary
+     * index. It will construct a context based on the given table name and secondary index name and then call
+     * executeAsync() on the {@link PaginatedOperation} interface to perform the operation.
+     *
+     * @param tableSchema A {@link TableSchema} that maps the table to a modelled object.
+     * @param tableName The physical name of the table that contains the secondary index to execute the operation
+     *                  against.
+     * @param indexName The physical name of the secondary index to execute the operation against.
+     * @param dynamoDbAsyncClient A {@link DynamoDbAsyncClient} to make the call against.
+     * @param extension A {@link DynamoDbEnhancedClientExtension} that may modify the request or result of this
+     *                  operation. A null value here will result in no modifications.
+     * @return A high level result object as specified by the implementation of this operation.
+     */
+    default SdkPublisher<Page<ItemT>> executeOnSecondaryIndexAsync(TableSchema<ItemT> tableSchema,
+                                                                   String tableName,
+                                                                   String indexName,
+                                                                   DynamoDbEnhancedClientExtension extension,
+                                                                   DynamoDbAsyncClient dynamoDbAsyncClient) {
+        OperationContext context = OperationContext.create(tableName, indexName);
+        return executeAsync(tableSchema, context, extension, dynamoDbAsyncClient);
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/PaginatedOperation.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/PaginatedOperation.java
new file mode 100644
index 000000000000..9cddd96b8c82
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/PaginatedOperation.java
@@ -0,0 +1,159 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.operations;
+
+import java.util.function.Function;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.core.async.SdkPublisher;
+import software.amazon.awssdk.core.pagination.sync.SdkIterable;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbAsyncIndex;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbAsyncTable;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClientExtension;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbIndex;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbTable;
+import software.amazon.awssdk.enhanced.dynamodb.TableSchema;
+import software.amazon.awssdk.enhanced.dynamodb.internal.TransformIterable;
+import software.amazon.awssdk.enhanced.dynamodb.model.Page;
+import software.amazon.awssdk.enhanced.dynamodb.model.PageIterable;
+import software.amazon.awssdk.enhanced.dynamodb.model.PagePublisher;
+import software.amazon.awssdk.services.dynamodb.DynamoDbAsyncClient;
+import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
+
+/**
+ * Common interface for an operation that can be executed in a synchronous or non-blocking asynchronous fashion
+ * against a mapped database table and is expected to return a paginated list of results. These operations can be made
+ * against either the primary index of a table or a secondary index, although some implementations of this interface
+ * do not support secondary indices and will throw an exception when executed against one. Typically, each page of
+ * results that is served will automatically perform an additional service call to DynamoDb to retrieve the next set
+ * of results.
+ * <p>
+ * This interface is extended by {@link PaginatedTableOperation} and {@link PaginatedIndexOperation} which contain
+ * implementations of the behavior to actually execute the operation in the context of a table or secondary index and
+ * are used by {@link DynamoDbTable} or {@link DynamoDbAsyncTable} and {@link DynamoDbIndex} or {@link DynamoDbAsyncIndex}
+ * respectively. By sharing this common interface operations are able to re-use code regardless of whether they are
+ * executed in the context of a primary or secondary index or whether they are being executed in a synchronous or
+ * non-blocking asynchronous fashion.
+ *
+ * @param <ItemT> The modelled object that this table maps records to.
+ * @param <RequestT>  The type of the request object for the DynamoDb call in the low level {@link DynamoDbClient} or
+ *                  {@link DynamoDbAsyncClient}.
+ * @param <ResponseT> The type of the response object for the DynamoDb call in the low level {@link DynamoDbClient}
+ *                  or {@link DynamoDbAsyncClient}.
+ */
+@SdkInternalApi
+public interface PaginatedOperation<ItemT, RequestT, ResponseT> {
+    /**
+     * This method generates the request that needs to be sent to a low level {@link DynamoDbClient}.
+     * @param tableSchema A {@link TableSchema} that maps the table to a modelled object.
+     * @param context An object containing the context, or target, of the command execution.
+     * @param extension A {@link DynamoDbEnhancedClientExtension} that may modify the request of this operation. A null
+     *                  value here will result in no modifications.
+     * @return A request that can be used as an argument to a {@link DynamoDbClient} call to perform the operation.
+     */
+    RequestT generateRequest(TableSchema<ItemT> tableSchema, OperationContext context,
+                             DynamoDbEnhancedClientExtension extension);
+
+    /**
+     * Provides a function for making the low level synchronous SDK call to DynamoDb.
+     * @param dynamoDbClient A low level {@link DynamoDbClient} to make the call against.
+     * @return A function that calls a paginated DynamoDb operation with a provided request object and returns the
+     * response object.
+     */
+    Function<RequestT, SdkIterable<ResponseT>> serviceCall(DynamoDbClient dynamoDbClient);
+
+    /**
+     * Provides a function for making the low level non-blocking asynchronous SDK call to DynamoDb.
+     * @param dynamoDbAsyncClient A low level {@link DynamoDbAsyncClient} to make the call against.
+     * @return A function that calls a paginated DynamoDb operation with a provided request object and returns the
+     * response object.
+     */
+    Function<RequestT, SdkPublisher<ResponseT>> asyncServiceCall(DynamoDbAsyncClient dynamoDbAsyncClient);
+
+    /**
+     * Takes the response object returned by the actual DynamoDb call and maps it into a higher level abstracted
+     * result object.
+     * @param response The response object returned by the DynamoDb call for this operation.
+     * @param tableSchema A {@link TableSchema} that maps the table to a modelled object.
+     * @param context An object containing the context, or target, of the command execution.
+     * @param dynamoDbEnhancedClientExtension A {@link DynamoDbEnhancedClientExtension} that may modify the result of
+     *                                        this operation. A null value here will result in no modifications.
+     * @return A high level result object as specified by the implementation of this operation.
+     */
+    Page<ItemT> transformResponse(ResponseT response,
+                                  TableSchema<ItemT> tableSchema,
+                                  OperationContext context,
+                                  DynamoDbEnhancedClientExtension dynamoDbEnhancedClientExtension);
+
+    /**
+     * Default implementation of a complete synchronous execution of this operation against either the primary or a
+     * secondary index.
+     * <p>
+     * It performs three steps:
+     * <ol>
+     * <li> Call {@link #generateRequest} to get the request object.</li>
+     * <li> Call {@link #asyncServiceCall} and call it using the request object generated in the previous step.</li>
+     * <li> Wraps the {@link SdkIterable} that was returned by the previous step with a transformation that turns each
+     * object returned to a high level result.</li>
+     * </ol>
+     *
+     * @param tableSchema A {@link TableSchema} that maps the table to a modelled object.
+     * @param context An object containing the context, or target, of the command execution.
+     * @param dynamoDbClient A {@link DynamoDbClient} to make the call against.
+     * @param extension A {@link DynamoDbEnhancedClientExtension} that may modify the request or result of this
+     *                  operation. A null value here will result in no modifications.
+     * @return A high level result object as specified by the implementation of this operation.
+     */
+    default PageIterable<ItemT> execute(TableSchema<ItemT> tableSchema,
+                                        OperationContext context,
+                                        DynamoDbEnhancedClientExtension extension,
+                                        DynamoDbClient dynamoDbClient) {
+        RequestT request = generateRequest(tableSchema, context, extension);
+        SdkIterable<ResponseT> response = serviceCall(dynamoDbClient).apply(request);
+
+        SdkIterable<Page<ItemT>> pageIterables =
+            TransformIterable.of(response, r -> transformResponse(r, tableSchema, context, extension));
+        return PageIterable.create(pageIterables);
+    }
+
+    /**
+     * Default implementation of a complete non-blocking asynchronous execution of this operation against either the
+     * primary or a secondary index.
+     * <p>
+     * It performs three steps:
+     * <ol>
+     * <li> Call {@link #generateRequest} to get the request object.
+     * <li> Call {@link #asyncServiceCall} and call it using the request object generated in the previous step.
+     * <li> Wraps the {@link SdkPublisher} returned by the SDK in a new one that calls transformResponse() to
+     * convert the response objects published to a high level result.
+     * </ol>
+     *
+     * @param tableSchema A {@link TableSchema} that maps the table to a modelled object.
+     * @param context An object containing the context, or target, of the command execution.
+     * @param dynamoDbAsyncClient A {@link DynamoDbAsyncClient} to make the call against.
+     * @param extension A {@link DynamoDbEnhancedClientExtension} that may modify the request or result of this
+     *                 operation. A null value here will result in no modifications.
+     * @return An {@link SdkPublisher} that will publish pages of the high level result object as specified by the
+     * implementation of this operation.
+     */
+    default PagePublisher<ItemT> executeAsync(TableSchema<ItemT> tableSchema,
+                                               OperationContext context,
+                                               DynamoDbEnhancedClientExtension extension,
+                                               DynamoDbAsyncClient dynamoDbAsyncClient) {
+        RequestT request = generateRequest(tableSchema, context, extension);
+        SdkPublisher<ResponseT> response = asyncServiceCall(dynamoDbAsyncClient).apply(request);
+        return PagePublisher.create(response.map(r -> transformResponse(r, tableSchema, context, extension)));
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/PaginatedTableOperation.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/PaginatedTableOperation.java
new file mode 100644
index 000000000000..69d1434912d3
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/PaginatedTableOperation.java
@@ -0,0 +1,84 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.operations;
+
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClientExtension;
+import software.amazon.awssdk.enhanced.dynamodb.TableMetadata;
+import software.amazon.awssdk.enhanced.dynamodb.TableSchema;
+import software.amazon.awssdk.enhanced.dynamodb.model.PageIterable;
+import software.amazon.awssdk.enhanced.dynamodb.model.PagePublisher;
+import software.amazon.awssdk.services.dynamodb.DynamoDbAsyncClient;
+import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
+
+/**
+ * Interface for an operation that can be executed against a mapped database table and is expected to return a
+ * paginated list of results. These operations will be executed against the primary index of the table. Typically,
+ * each page of results that is served will automatically perform an additional service call to DynamoDb to retrieve
+ * the next set of results.
+ * <p>
+ * A concrete implementation of this interface should also implement {@link PaginatedIndexOperation} with the same
+ * types if the operation supports being executed against both the primary index and secondary indices.
+ *
+ * @param <ItemT> The modelled object that this table maps records to.
+ * @param <RequestT>  The type of the request object for the DynamoDb call in the low level {@link DynamoDbClient}.
+ * @param <ResponseT> The type of the response object for the DynamoDb call in the low level {@link DynamoDbClient}.
+ */
+@SdkInternalApi
+public interface PaginatedTableOperation<ItemT, RequestT, ResponseT>
+    extends PaginatedOperation<ItemT, RequestT, ResponseT> {
+    /**
+     * Default implementation of a complete synchronous execution of this operation against the primary index. It will
+     * construct a context based on the given table name and then call execute() on the {@link PaginatedOperation}
+     * interface to perform the operation.
+     *
+     * @param tableSchema A {@link TableSchema} that maps the table to a modelled object.
+     * @param tableName The physical name of the table to execute the operation against.
+     * @param dynamoDbClient A {@link DynamoDbClient} to make the call against.
+     * @param extension A {@link DynamoDbEnhancedClientExtension} that may modify the request or result of this operation. A
+     *                        null value here will result in no modifications.
+     * @return A high level result object as specified by the implementation of this operation.
+     */
+    default PageIterable<ItemT> executeOnPrimaryIndex(TableSchema<ItemT> tableSchema,
+                                                      String tableName,
+                                                      DynamoDbEnhancedClientExtension extension,
+                                                      DynamoDbClient dynamoDbClient) {
+
+        OperationContext context = OperationContext.create(tableName, TableMetadata.primaryIndexName());
+        return execute(tableSchema, context, extension, dynamoDbClient);
+    }
+
+    /**
+     * Default implementation of a complete non-blocking asynchronous execution of this operation against the primary
+     * index. It will construct a context based on the given table name and then call executeAsync() on the
+     * {@link PaginatedOperation} interface to perform the operation.
+     *
+     * @param tableSchema A {@link TableSchema} that maps the table to a modelled object.
+     * @param tableName The physical name of the table to execute the operation against.
+     * @param dynamoDbAsyncClient A {@link DynamoDbAsyncClient} to make the call against.
+     * @param extension A {@link DynamoDbEnhancedClientExtension} that may modify the request or result of this operation. A
+     *                        null value here will result in no modifications.
+     * @return A high level result object as specified by the implementation of this operation.
+     */
+    default PagePublisher<ItemT> executeOnPrimaryIndexAsync(TableSchema<ItemT> tableSchema,
+                                                        String tableName,
+                                                        DynamoDbEnhancedClientExtension extension,
+                                                        DynamoDbAsyncClient dynamoDbAsyncClient) {
+
+        OperationContext context = OperationContext.create(tableName, TableMetadata.primaryIndexName());
+        return executeAsync(tableSchema, context, extension, dynamoDbAsyncClient);
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/PutItemOperation.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/PutItemOperation.java
new file mode 100644
index 000000000000..bfe5ae189bc3
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/PutItemOperation.java
@@ -0,0 +1,180 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.operations;
+
+import java.util.Map;
+import java.util.concurrent.CompletableFuture;
+import java.util.function.Function;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClientExtension;
+import software.amazon.awssdk.enhanced.dynamodb.Expression;
+import software.amazon.awssdk.enhanced.dynamodb.TableMetadata;
+import software.amazon.awssdk.enhanced.dynamodb.TableSchema;
+import software.amazon.awssdk.enhanced.dynamodb.extensions.WriteModification;
+import software.amazon.awssdk.enhanced.dynamodb.internal.extensions.DefaultDynamoDbExtensionContext;
+import software.amazon.awssdk.enhanced.dynamodb.model.PutItemEnhancedRequest;
+import software.amazon.awssdk.services.dynamodb.DynamoDbAsyncClient;
+import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+import software.amazon.awssdk.services.dynamodb.model.Put;
+import software.amazon.awssdk.services.dynamodb.model.PutItemRequest;
+import software.amazon.awssdk.services.dynamodb.model.PutItemResponse;
+import software.amazon.awssdk.services.dynamodb.model.PutRequest;
+import software.amazon.awssdk.services.dynamodb.model.TransactWriteItem;
+import software.amazon.awssdk.services.dynamodb.model.WriteRequest;
+
+@SdkInternalApi
+public class PutItemOperation<T>
+    implements BatchableWriteOperation<T>,
+               TransactableWriteOperation<T>,
+               TableOperation<T, PutItemRequest, PutItemResponse, Void> {
+
+    private final PutItemEnhancedRequest<T> request;
+
+    private PutItemOperation(PutItemEnhancedRequest<T> request) {
+        this.request = request;
+    }
+
+    public static <T> PutItemOperation<T> create(PutItemEnhancedRequest<T> request) {
+        return new PutItemOperation<>(request);
+    }
+
+    @Override
+    public PutItemRequest generateRequest(TableSchema<T> tableSchema,
+                                          OperationContext operationContext,
+                                          DynamoDbEnhancedClientExtension extension) {
+
+        if (!TableMetadata.primaryIndexName().equals(operationContext.indexName())) {
+            throw new IllegalArgumentException("PutItem cannot be executed against a secondary index.");
+        }
+
+        TableMetadata tableMetadata = tableSchema.tableMetadata();
+
+        // Fail fast if required primary partition key does not exist and avoid the call to DynamoDb
+        tableMetadata.primaryPartitionKey();
+
+        boolean alwaysIgnoreNulls = true;
+        Map<String, AttributeValue> itemMap = tableSchema.itemToMap(this.request.item(), alwaysIgnoreNulls);
+
+        WriteModification transformation =
+            extension != null ? extension.beforeWrite(
+                DefaultDynamoDbExtensionContext.builder()
+                                               .items(itemMap)
+                                               .operationContext(operationContext)
+                                               .tableMetadata(tableMetadata)
+                                               .build())
+                : null;
+
+        if (transformation != null && transformation.transformedItem() != null) {
+            itemMap = transformation.transformedItem();
+        }
+
+        PutItemRequest.Builder requestBuilder = PutItemRequest.builder()
+                                                              .tableName(operationContext.tableName())
+                                                              .item(itemMap);
+
+        requestBuilder = addExpressionsIfExist(requestBuilder, transformation);
+
+        return requestBuilder.build();
+    }
+
+    @Override
+    public Void transformResponse(PutItemResponse response,
+                                  TableSchema<T> tableSchema,
+                                  OperationContext operationContext,
+                                  DynamoDbEnhancedClientExtension extension) {
+        // No results are returned by this operation
+        return null;
+    }
+
+    @Override
+    public Function<PutItemRequest, PutItemResponse> serviceCall(DynamoDbClient dynamoDbClient) {
+        return dynamoDbClient::putItem;
+    }
+
+    @Override
+    public Function<PutItemRequest, CompletableFuture<PutItemResponse>> asyncServiceCall(
+        DynamoDbAsyncClient dynamoDbAsyncClient) {
+
+        return dynamoDbAsyncClient::putItem;
+    }
+
+    @Override
+    public WriteRequest generateWriteRequest(TableSchema<T> tableSchema,
+                                             OperationContext operationContext,
+                                             DynamoDbEnhancedClientExtension extension) {
+
+        PutItemRequest putItemRequest = generateRequest(tableSchema, operationContext, extension);
+
+        if (putItemRequest.conditionExpression() != null) {
+            throw new IllegalArgumentException("A mapper extension inserted a conditionExpression in a PutItem "
+                                               + "request as part of a BatchWriteItemRequest. This is not supported by "
+                                               + "DynamoDb. An extension known to do this is the "
+                                               + "VersionedRecordExtension which is loaded by default unless overridden. "
+                                               + "To fix this use a table schema that does not "
+                                               + "have a versioned attribute in it or do not load the offending extension.");
+        }
+
+        return WriteRequest.builder().putRequest(PutRequest.builder().item(putItemRequest.item()).build()).build();
+    }
+
+    @Override
+    public TransactWriteItem generateTransactWriteItem(TableSchema<T> tableSchema,
+                                                       OperationContext operationContext,
+                                                       DynamoDbEnhancedClientExtension dynamoDbEnhancedClientExtension) {
+        PutItemRequest putItemRequest = generateRequest(tableSchema, operationContext, dynamoDbEnhancedClientExtension);
+
+        Put put = Put.builder()
+                     .item(putItemRequest.item())
+                     .tableName(putItemRequest.tableName())
+                     .conditionExpression(putItemRequest.conditionExpression())
+                     .expressionAttributeValues(putItemRequest.expressionAttributeValues())
+                     .expressionAttributeNames(putItemRequest.expressionAttributeNames())
+                     .build();
+
+        return TransactWriteItem.builder()
+                                .put(put)
+                                .build();
+    }
+
+    private PutItemRequest.Builder addExpressionsIfExist(PutItemRequest.Builder requestBuilder,
+                                                         WriteModification transformation) {
+        Expression mergedConditionExpression;
+
+        if (transformation != null && transformation.additionalConditionalExpression() != null) {
+            mergedConditionExpression = Expression.join(this.request.conditionExpression(),
+                                                        transformation.additionalConditionalExpression(), " AND ");
+        } else {
+            mergedConditionExpression = this.request.conditionExpression();
+        }
+
+        if (mergedConditionExpression != null) {
+            requestBuilder = requestBuilder.conditionExpression(mergedConditionExpression.expression());
+
+            // Avoiding adding empty collections that the low level SDK will propagate to DynamoDb where it causes error.
+            if (mergedConditionExpression.expressionValues() != null && !mergedConditionExpression.expressionValues().isEmpty()) {
+                requestBuilder = requestBuilder.expressionAttributeValues(mergedConditionExpression.expressionValues());
+
+            }
+
+            if (mergedConditionExpression.expressionNames() != null && !mergedConditionExpression.expressionNames().isEmpty()) {
+                requestBuilder = requestBuilder.expressionAttributeNames(mergedConditionExpression.expressionNames());
+            }
+        }
+        return requestBuilder;
+    }
+
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/QueryOperation.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/QueryOperation.java
new file mode 100644
index 000000000000..bd02191e02a0
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/QueryOperation.java
@@ -0,0 +1,108 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.operations;
+
+import java.util.Map;
+import java.util.function.Function;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.core.async.SdkPublisher;
+import software.amazon.awssdk.core.pagination.sync.SdkIterable;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClientExtension;
+import software.amazon.awssdk.enhanced.dynamodb.Expression;
+import software.amazon.awssdk.enhanced.dynamodb.TableMetadata;
+import software.amazon.awssdk.enhanced.dynamodb.TableSchema;
+import software.amazon.awssdk.enhanced.dynamodb.internal.EnhancedClientUtils;
+import software.amazon.awssdk.enhanced.dynamodb.model.Page;
+import software.amazon.awssdk.enhanced.dynamodb.model.QueryEnhancedRequest;
+import software.amazon.awssdk.services.dynamodb.DynamoDbAsyncClient;
+import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+import software.amazon.awssdk.services.dynamodb.model.QueryRequest;
+import software.amazon.awssdk.services.dynamodb.model.QueryResponse;
+
+@SdkInternalApi
+public class QueryOperation<T> implements PaginatedTableOperation<T, QueryRequest, QueryResponse>,
+                                          PaginatedIndexOperation<T, QueryRequest, QueryResponse> {
+
+    private final QueryEnhancedRequest request;
+
+    private QueryOperation(QueryEnhancedRequest request) {
+        this.request = request;
+    }
+
+    public static <T> QueryOperation<T> create(QueryEnhancedRequest request) {
+        return new QueryOperation<>(request);
+    }
+
+    @Override
+    public QueryRequest generateRequest(TableSchema<T> tableSchema,
+                                        OperationContext operationContext,
+                                        DynamoDbEnhancedClientExtension extension) {
+        Expression queryExpression = this.request.queryConditional().expression(tableSchema, operationContext.indexName());
+        Map<String, AttributeValue> expressionValues = queryExpression.expressionValues();
+        Map<String, String> expressionNames = queryExpression.expressionNames();
+
+        if (this.request.filterExpression() != null) {
+            expressionValues = Expression.joinValues(expressionValues, this.request.filterExpression().expressionValues());
+            expressionNames = Expression.joinNames(expressionNames, this.request.filterExpression().expressionNames());
+        }
+
+        QueryRequest.Builder queryRequest = QueryRequest.builder()
+                                                        .tableName(operationContext.tableName())
+                                                        .keyConditionExpression(queryExpression.expression())
+                                                        .expressionAttributeValues(expressionValues)
+                                                        .expressionAttributeNames(expressionNames)
+                                                        .scanIndexForward(this.request.scanIndexForward())
+                                                        .limit(this.request.limit())
+                                                        .exclusiveStartKey(this.request.exclusiveStartKey())
+                                                        .consistentRead(this.request.consistentRead());
+
+        if (!TableMetadata.primaryIndexName().equals(operationContext.indexName())) {
+            queryRequest = queryRequest.indexName(operationContext.indexName());
+        }
+
+        if (this.request.filterExpression() != null) {
+            queryRequest = queryRequest.filterExpression(this.request.filterExpression().expression());
+        }
+
+        return queryRequest.build();
+    }
+
+    @Override
+    public Function<QueryRequest, SdkIterable<QueryResponse>> serviceCall(DynamoDbClient dynamoDbClient) {
+        return dynamoDbClient::queryPaginator;
+    }
+
+    @Override
+    public Function<QueryRequest, SdkPublisher<QueryResponse>> asyncServiceCall(DynamoDbAsyncClient dynamoDbAsyncClient) {
+        return dynamoDbAsyncClient::queryPaginator;
+    }
+
+    @Override
+    public Page<T> transformResponse(QueryResponse response,
+                                     TableSchema<T> tableSchema,
+                                     OperationContext context,
+                                     DynamoDbEnhancedClientExtension dynamoDbEnhancedClientExtension) {
+
+        return EnhancedClientUtils.readAndTransformPaginatedItems(response,
+                                                                  tableSchema,
+                                                                  context,
+                                                                  dynamoDbEnhancedClientExtension,
+                                                                  QueryResponse::items,
+                                                                  QueryResponse::lastEvaluatedKey);
+    }
+
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/ScanOperation.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/ScanOperation.java
new file mode 100644
index 000000000000..daa0901f646b
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/ScanOperation.java
@@ -0,0 +1,94 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.operations;
+
+import java.util.function.Function;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.core.async.SdkPublisher;
+import software.amazon.awssdk.core.pagination.sync.SdkIterable;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClientExtension;
+import software.amazon.awssdk.enhanced.dynamodb.TableMetadata;
+import software.amazon.awssdk.enhanced.dynamodb.TableSchema;
+import software.amazon.awssdk.enhanced.dynamodb.internal.EnhancedClientUtils;
+import software.amazon.awssdk.enhanced.dynamodb.model.Page;
+import software.amazon.awssdk.enhanced.dynamodb.model.ScanEnhancedRequest;
+import software.amazon.awssdk.services.dynamodb.DynamoDbAsyncClient;
+import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
+import software.amazon.awssdk.services.dynamodb.model.ScanRequest;
+import software.amazon.awssdk.services.dynamodb.model.ScanResponse;
+
+@SdkInternalApi
+public class ScanOperation<T> implements PaginatedTableOperation<T, ScanRequest, ScanResponse>,
+                                         PaginatedIndexOperation<T, ScanRequest, ScanResponse> {
+
+    private final ScanEnhancedRequest request;
+
+    private ScanOperation(ScanEnhancedRequest request) {
+        this.request = request;
+    }
+
+    public static <T> ScanOperation<T> create(ScanEnhancedRequest request) {
+        return new ScanOperation<>(request);
+    }
+
+    @Override
+    public ScanRequest generateRequest(TableSchema<T> tableSchema,
+                                       OperationContext operationContext,
+                                       DynamoDbEnhancedClientExtension extension) {
+        ScanRequest.Builder scanRequest = ScanRequest.builder()
+            .tableName(operationContext.tableName())
+            .limit(this.request.limit())
+            .exclusiveStartKey(this.request.exclusiveStartKey())
+            .consistentRead(this.request.consistentRead());
+
+        if (!TableMetadata.primaryIndexName().equals(operationContext.indexName())) {
+            scanRequest = scanRequest.indexName(operationContext.indexName());
+        }
+
+        if (this.request.filterExpression() != null) {
+            scanRequest = scanRequest.filterExpression(this.request.filterExpression().expression())
+                                     .expressionAttributeValues(this.request.filterExpression().expressionValues())
+                                     .expressionAttributeNames(this.request.filterExpression().expressionNames());
+        }
+
+        return scanRequest.build();
+    }
+
+    @Override
+    public Page<T> transformResponse(ScanResponse response,
+                                     TableSchema<T> tableSchema,
+                                     OperationContext context,
+                                     DynamoDbEnhancedClientExtension dynamoDbEnhancedClientExtension) {
+
+        return EnhancedClientUtils.readAndTransformPaginatedItems(response,
+                                                                  tableSchema,
+                                                                  context,
+                                                                  dynamoDbEnhancedClientExtension,
+                                                                  ScanResponse::items,
+                                                                  ScanResponse::lastEvaluatedKey);
+    }
+
+    @Override
+    public Function<ScanRequest, SdkIterable<ScanResponse>> serviceCall(DynamoDbClient dynamoDbClient) {
+        return dynamoDbClient::scanPaginator;
+    }
+
+    @Override
+    public Function<ScanRequest, SdkPublisher<ScanResponse>> asyncServiceCall(DynamoDbAsyncClient dynamoDbAsyncClient) {
+        return dynamoDbAsyncClient::scanPaginator;
+    }
+
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/TableOperation.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/TableOperation.java
new file mode 100644
index 000000000000..77bb6fec382c
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/TableOperation.java
@@ -0,0 +1,82 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.operations;
+
+import java.util.concurrent.CompletableFuture;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClientExtension;
+import software.amazon.awssdk.enhanced.dynamodb.TableMetadata;
+import software.amazon.awssdk.enhanced.dynamodb.TableSchema;
+import software.amazon.awssdk.services.dynamodb.DynamoDbAsyncClient;
+import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
+
+/**
+ * Interface for a single operation that can be executed against a mapped database table. These operations will be
+ * executed against the primary index of the table. Conceptually an operation maps 1:1 with an actual DynamoDb call.
+ * <p>
+ * A concrete implementation of this interface should also implement {@link IndexOperation} with the same types if
+ * the operation supports being executed against both the primary index and secondary indices.
+ *
+ * @param <ItemT> The modelled object that this table maps records to.
+ * @param <RequestT>  The type of the request object for the DynamoDb call in the low level {@link DynamoDbClient}.
+ * @param <ResponseT> The type of the response object for the DynamoDb call in the low level {@link DynamoDbClient}.
+ * @param <ResultT> The type of the mapped result object that will be returned by the execution of this operation.
+ */
+@SdkInternalApi
+public interface TableOperation<ItemT, RequestT, ResponseT, ResultT>
+    extends CommonOperation<ItemT, RequestT, ResponseT, ResultT> {
+    /**
+     * Default implementation of a complete synchronous execution of this operation against the primary index. It will
+     * construct a context based on the given table name and then call execute() on the {@link CommonOperation} interface to
+     * perform the operation.
+     *
+     * @param tableSchema A {@link TableSchema} that maps the table to a modelled object.
+     * @param tableName The physical name of the table to execute the operation against.
+     * @param dynamoDbClient A {@link DynamoDbClient} to make the call against.
+     * @param extension A {@link DynamoDbEnhancedClientExtension} that may modify the request or result of this
+     *                  operation. A null value here will result in no modifications.
+     * @return A high level result object as specified by the implementation of this operation.
+     */
+    default ResultT executeOnPrimaryIndex(TableSchema<ItemT> tableSchema,
+                                          String tableName,
+                                          DynamoDbEnhancedClientExtension extension,
+                                          DynamoDbClient dynamoDbClient) {
+        OperationContext context = OperationContext.create(tableName, TableMetadata.primaryIndexName());
+        return execute(tableSchema, context, extension, dynamoDbClient);
+    }
+
+    /**
+     * Default implementation of a complete non-blocking asynchronous execution of this operation against the primary
+     * index. It will construct a context based on the given table name and then call executeAsync() on the
+     * {@link CommonOperation} interface to perform the operation.
+     *
+     * @param tableSchema A {@link TableSchema} that maps the table to a modelled object.
+     * @param tableName The physical name of the table to execute the operation against.
+     * @param dynamoDbAsyncClient A {@link DynamoDbAsyncClient} to make the call against.
+     * @param extension A {@link DynamoDbEnhancedClientExtension} that may modify the request or result of this
+     *                  operation. A null value here will result in no modifications.
+     * @return A {@link CompletableFuture} of the high level result object as specified by the implementation of this
+     * operation.
+     */
+    default CompletableFuture<ResultT> executeOnPrimaryIndexAsync(TableSchema<ItemT> tableSchema,
+                                                                  String tableName,
+                                                                  DynamoDbEnhancedClientExtension extension,
+                                                                  DynamoDbAsyncClient dynamoDbAsyncClient) {
+
+        OperationContext context = OperationContext.create(tableName, TableMetadata.primaryIndexName());
+        return executeAsync(tableSchema, context, extension, dynamoDbAsyncClient);
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/TransactGetItemsOperation.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/TransactGetItemsOperation.java
new file mode 100644
index 000000000000..a1d1caf424b7
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/TransactGetItemsOperation.java
@@ -0,0 +1,74 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.operations;
+
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.enhanced.dynamodb.Document;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClientExtension;
+import software.amazon.awssdk.enhanced.dynamodb.internal.DefaultDocument;
+import software.amazon.awssdk.enhanced.dynamodb.model.TransactGetItemsEnhancedRequest;
+import software.amazon.awssdk.services.dynamodb.DynamoDbAsyncClient;
+import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
+import software.amazon.awssdk.services.dynamodb.model.TransactGetItemsRequest;
+import software.amazon.awssdk.services.dynamodb.model.TransactGetItemsResponse;
+
+@SdkInternalApi
+public class TransactGetItemsOperation
+    implements DatabaseOperation<TransactGetItemsRequest, TransactGetItemsResponse, List<Document>> {
+
+    private TransactGetItemsEnhancedRequest request;
+
+    private TransactGetItemsOperation(TransactGetItemsEnhancedRequest request) {
+        this.request = request;
+    }
+
+    public static TransactGetItemsOperation create(TransactGetItemsEnhancedRequest request) {
+        return new TransactGetItemsOperation(request);
+    }
+
+    @Override
+    public TransactGetItemsRequest generateRequest(DynamoDbEnhancedClientExtension extension) {
+        return TransactGetItemsRequest.builder()
+                                      .transactItems(this.request.transactGetItems())
+                                      .build();
+    }
+
+    @Override
+    public Function<TransactGetItemsRequest, TransactGetItemsResponse> serviceCall(DynamoDbClient dynamoDbClient) {
+        return dynamoDbClient::transactGetItems;
+    }
+
+    @Override
+    public Function<TransactGetItemsRequest, CompletableFuture<TransactGetItemsResponse>> asyncServiceCall(
+        DynamoDbAsyncClient dynamoDbAsyncClient) {
+
+        return dynamoDbAsyncClient::transactGetItems;
+    }
+
+    @Override
+    public List<Document> transformResponse(TransactGetItemsResponse response,
+                                            DynamoDbEnhancedClientExtension extension) {
+        return response.responses()
+                       .stream()
+                       .map(r -> r == null ? null : DefaultDocument.create(r.item()))
+                       .collect(Collectors.toList());
+    }
+
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/TransactWriteItemsOperation.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/TransactWriteItemsOperation.java
new file mode 100644
index 000000000000..9f75de00552f
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/TransactWriteItemsOperation.java
@@ -0,0 +1,68 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.operations;
+
+import java.util.concurrent.CompletableFuture;
+import java.util.function.Function;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClientExtension;
+import software.amazon.awssdk.enhanced.dynamodb.model.TransactWriteItemsEnhancedRequest;
+import software.amazon.awssdk.services.dynamodb.DynamoDbAsyncClient;
+import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
+import software.amazon.awssdk.services.dynamodb.model.TransactWriteItemsRequest;
+import software.amazon.awssdk.services.dynamodb.model.TransactWriteItemsResponse;
+
+@SdkInternalApi
+public class TransactWriteItemsOperation
+    implements DatabaseOperation<TransactWriteItemsRequest, TransactWriteItemsResponse, Void> {
+
+    private TransactWriteItemsEnhancedRequest request;
+
+    private TransactWriteItemsOperation(TransactWriteItemsEnhancedRequest request) {
+        this.request = request;
+    }
+
+    public static TransactWriteItemsOperation create(TransactWriteItemsEnhancedRequest request) {
+        return new TransactWriteItemsOperation(request);
+    }
+
+    @Override
+    public TransactWriteItemsRequest generateRequest(DynamoDbEnhancedClientExtension extension) {
+        return TransactWriteItemsRequest.builder()
+                                        .transactItems(this.request.transactWriteItems())
+                                        .build();
+    }
+
+    @Override
+    public Void transformResponse(TransactWriteItemsResponse response, DynamoDbEnhancedClientExtension extension) {
+        return null;        // this operation does not return results
+    }
+
+    @Override
+    public Function<TransactWriteItemsRequest, TransactWriteItemsResponse> serviceCall(
+        DynamoDbClient dynamoDbClient) {
+
+        return dynamoDbClient::transactWriteItems;
+    }
+
+    @Override
+    public Function<TransactWriteItemsRequest, CompletableFuture<TransactWriteItemsResponse>> asyncServiceCall(
+        DynamoDbAsyncClient dynamoDbAsyncClient) {
+
+        return dynamoDbAsyncClient::transactWriteItems;
+    }
+
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/TransactableReadOperation.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/TransactableReadOperation.java
new file mode 100644
index 000000000000..87393ae6eb25
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/TransactableReadOperation.java
@@ -0,0 +1,28 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.operations;
+
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClientExtension;
+import software.amazon.awssdk.enhanced.dynamodb.TableSchema;
+import software.amazon.awssdk.services.dynamodb.model.TransactGetItem;
+
+@SdkInternalApi
+public interface TransactableReadOperation<T> {
+    TransactGetItem generateTransactGetItem(TableSchema<T> tableSchema,
+                                            OperationContext operationContext,
+                                            DynamoDbEnhancedClientExtension dynamoDbEnhancedClientExtension);
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/TransactableWriteOperation.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/TransactableWriteOperation.java
new file mode 100644
index 000000000000..e117e929e01b
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/TransactableWriteOperation.java
@@ -0,0 +1,28 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.operations;
+
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClientExtension;
+import software.amazon.awssdk.enhanced.dynamodb.TableSchema;
+import software.amazon.awssdk.services.dynamodb.model.TransactWriteItem;
+
+@SdkInternalApi
+public interface TransactableWriteOperation<T> {
+    TransactWriteItem generateTransactWriteItem(TableSchema<T> tableSchema,
+                                                OperationContext operationContext,
+                                                DynamoDbEnhancedClientExtension dynamoDbEnhancedClientExtension);
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/UpdateItemOperation.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/UpdateItemOperation.java
new file mode 100644
index 000000000000..cc3ed8000379
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/UpdateItemOperation.java
@@ -0,0 +1,251 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.operations;
+
+import static software.amazon.awssdk.enhanced.dynamodb.internal.EnhancedClientUtils.isNullAttributeValue;
+import static software.amazon.awssdk.enhanced.dynamodb.internal.EnhancedClientUtils.readAndTransformSingleItem;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.CompletableFuture;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClientExtension;
+import software.amazon.awssdk.enhanced.dynamodb.Expression;
+import software.amazon.awssdk.enhanced.dynamodb.TableMetadata;
+import software.amazon.awssdk.enhanced.dynamodb.TableSchema;
+import software.amazon.awssdk.enhanced.dynamodb.extensions.WriteModification;
+import software.amazon.awssdk.enhanced.dynamodb.internal.EnhancedClientUtils;
+import software.amazon.awssdk.enhanced.dynamodb.internal.extensions.DefaultDynamoDbExtensionContext;
+import software.amazon.awssdk.enhanced.dynamodb.model.UpdateItemEnhancedRequest;
+import software.amazon.awssdk.services.dynamodb.DynamoDbAsyncClient;
+import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+import software.amazon.awssdk.services.dynamodb.model.ReturnValue;
+import software.amazon.awssdk.services.dynamodb.model.TransactWriteItem;
+import software.amazon.awssdk.services.dynamodb.model.Update;
+import software.amazon.awssdk.services.dynamodb.model.UpdateItemRequest;
+import software.amazon.awssdk.services.dynamodb.model.UpdateItemResponse;
+
+@SdkInternalApi
+public class UpdateItemOperation<T>
+    implements TableOperation<T, UpdateItemRequest, UpdateItemResponse, T>,
+               TransactableWriteOperation<T> {
+
+    private static final Function<String, String> EXPRESSION_VALUE_KEY_MAPPER =
+        key -> ":AMZN_MAPPED_" + EnhancedClientUtils.cleanAttributeName(key);
+
+    private static final Function<String, String> EXPRESSION_KEY_MAPPER =
+        key -> "#AMZN_MAPPED_" + EnhancedClientUtils.cleanAttributeName(key);
+
+    private final UpdateItemEnhancedRequest<T> request;
+
+    private UpdateItemOperation(UpdateItemEnhancedRequest<T> request) {
+        this.request = request;
+    }
+
+    public static <T> UpdateItemOperation<T> create(UpdateItemEnhancedRequest<T> request) {
+        return new UpdateItemOperation<>(request);
+    }
+
+    @Override
+    public UpdateItemRequest generateRequest(TableSchema<T> tableSchema,
+                                             OperationContext operationContext,
+                                             DynamoDbEnhancedClientExtension extension) {
+        if (!TableMetadata.primaryIndexName().equals(operationContext.indexName())) {
+            throw new IllegalArgumentException("UpdateItem cannot be executed against a secondary index.");
+        }
+
+        Map<String, AttributeValue> itemMap = tableSchema.itemToMap(this.request.item(),
+                                                                    Boolean.TRUE.equals(this.request.ignoreNulls()));
+        TableMetadata tableMetadata = tableSchema.tableMetadata();
+
+        WriteModification transformation =
+            extension != null ? extension.beforeWrite(DefaultDynamoDbExtensionContext.builder()
+                                                                                     .items(itemMap)
+                                                                                     .operationContext(operationContext)
+                                                                                     .tableMetadata(tableMetadata)
+                                                                                     .build()) : null;
+
+        if (transformation != null && transformation.transformedItem() != null) {
+            itemMap = transformation.transformedItem();
+        }
+
+        Collection<String> primaryKeys = tableSchema.tableMetadata().primaryKeys();
+
+        Map<String, AttributeValue> keyAttributeValues = itemMap.entrySet().stream()
+            .filter(entry -> primaryKeys.contains(entry.getKey()))
+            .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
+
+        UpdateItemRequest.Builder requestBuilder = UpdateItemRequest.builder()
+            .tableName(operationContext.tableName())
+            .key(keyAttributeValues)
+            .returnValues(ReturnValue.ALL_NEW);
+
+        Map<String, AttributeValue> filteredAttributeValues = itemMap.entrySet().stream()
+            .filter(entry -> !primaryKeys.contains(entry.getKey()))
+            .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
+
+        requestBuilder = addExpressionsIfExist(transformation, filteredAttributeValues, requestBuilder);
+
+        return requestBuilder.build();
+    }
+
+    @Override
+    public T transformResponse(UpdateItemResponse response,
+                               TableSchema<T> tableSchema,
+                               OperationContext operationContext,
+                               DynamoDbEnhancedClientExtension extension) {
+        try {
+            return readAndTransformSingleItem(response.attributes(), tableSchema, operationContext, extension);
+        } catch (RuntimeException e) {
+            // With a partial update it's possible to update the record into a state that the mapper can no longer
+            // read or validate. This is more likely to happen with signed and encrypted records that undergo partial
+            // updates (that practice is discouraged for this reason).
+            throw new IllegalStateException("Unable to read the new item returned by UpdateItem after the update "
+                                            + "occurred. Rollbacks are not supported by this operation, therefore the "
+                                            + "record may no longer be readable using this model.", e);
+        }
+    }
+
+    @Override
+    public Function<UpdateItemRequest, UpdateItemResponse> serviceCall(DynamoDbClient dynamoDbClient) {
+        return dynamoDbClient::updateItem;
+    }
+
+    @Override
+    public Function<UpdateItemRequest, CompletableFuture<UpdateItemResponse>> asyncServiceCall(
+        DynamoDbAsyncClient dynamoDbAsyncClient) {
+
+        return dynamoDbAsyncClient::updateItem;
+    }
+
+    @Override
+    public TransactWriteItem generateTransactWriteItem(TableSchema<T> tableSchema, OperationContext operationContext,
+                                                       DynamoDbEnhancedClientExtension dynamoDbEnhancedClientExtension) {
+        UpdateItemRequest updateItemRequest = generateRequest(tableSchema, operationContext, dynamoDbEnhancedClientExtension);
+
+        Update update = Update.builder()
+                              .key(updateItemRequest.key())
+                              .tableName(updateItemRequest.tableName())
+                              .updateExpression(updateItemRequest.updateExpression())
+                              .conditionExpression(updateItemRequest.conditionExpression())
+                              .expressionAttributeValues(updateItemRequest.expressionAttributeValues())
+                              .expressionAttributeNames(updateItemRequest.expressionAttributeNames())
+                              .build();
+
+        return TransactWriteItem.builder()
+                                .update(update)
+                                .build();
+    }
+
+    private static Expression generateUpdateExpression(Map<String, AttributeValue> attributeValuesToUpdate) {
+        // Sort the updates into 'SET' or 'REMOVE' based on null value
+        List<String> updateSetActions = new ArrayList<>();
+        List<String> updateRemoveActions = new ArrayList<>();
+
+        attributeValuesToUpdate.forEach((key, value) -> {
+            if (!isNullAttributeValue(value)) {
+                updateSetActions.add(EXPRESSION_KEY_MAPPER.apply(key) + " = " + EXPRESSION_VALUE_KEY_MAPPER.apply(key));
+            } else {
+                updateRemoveActions.add(EXPRESSION_KEY_MAPPER.apply(key));
+            }
+        });
+
+        // Combine the expressions
+        List<String> updateActions = new ArrayList<>();
+
+        if (!updateSetActions.isEmpty()) {
+            updateActions.add("SET " + String.join(", ", updateSetActions));
+        }
+
+        if (!updateRemoveActions.isEmpty()) {
+            updateActions.add("REMOVE " + String.join(", ", updateRemoveActions));
+        }
+
+        String updateExpression = String.join(" ", updateActions);
+
+        Map<String, AttributeValue> expressionAttributeValues =
+            attributeValuesToUpdate.entrySet()
+                                   .stream()
+                                   .filter(entry -> !isNullAttributeValue(entry.getValue()))
+                                   .collect(Collectors.toMap(
+                                       entry -> EXPRESSION_VALUE_KEY_MAPPER.apply(entry.getKey()),
+                                       Map.Entry::getValue));
+
+        Map<String, String> expressionAttributeNames =
+            attributeValuesToUpdate.keySet()
+                                   .stream()
+                                   .collect(Collectors.toMap(EXPRESSION_KEY_MAPPER, key -> key));
+
+        return Expression.builder()
+                         .expression(updateExpression)
+                         .expressionValues(Collections.unmodifiableMap(expressionAttributeValues))
+                         .expressionNames(expressionAttributeNames)
+                         .build();
+    }
+
+    private UpdateItemRequest.Builder addExpressionsIfExist(WriteModification transformation,
+                                                            Map<String, AttributeValue> filteredAttributeValues,
+                                                            UpdateItemRequest.Builder requestBuilder) {
+        Map<String, String> expressionNames = null;
+        Map<String, AttributeValue> expressionValues = null;
+        String conditionExpressionString = null;
+
+        /* Add update expression for transformed non-key attributes if applicable */
+        if (!filteredAttributeValues.isEmpty()) {
+            Expression fullUpdateExpression = generateUpdateExpression(filteredAttributeValues);
+            expressionNames = fullUpdateExpression.expressionNames();
+            expressionValues = fullUpdateExpression.expressionValues();
+            requestBuilder = requestBuilder.updateExpression(fullUpdateExpression.expression());
+        }
+
+        /* Merge in conditional expression from extension WriteModification if applicable */
+        if (transformation != null && transformation.additionalConditionalExpression() != null) {
+            expressionNames =
+                Expression.joinNames(expressionNames,
+                                     transformation.additionalConditionalExpression().expressionNames());
+            expressionValues =
+                Expression.joinValues(expressionValues,
+                                      transformation.additionalConditionalExpression().expressionValues());
+            conditionExpressionString = transformation.additionalConditionalExpression().expression();
+        }
+
+        /* Merge in conditional expression from specified 'conditionExpression' if applicable */
+        if (this.request.conditionExpression() != null) {
+            expressionNames = Expression.joinNames(expressionNames, this.request.conditionExpression().expressionNames());
+            expressionValues = Expression.joinValues(expressionValues, this.request.conditionExpression().expressionValues());
+            conditionExpressionString = Expression.joinExpressions(conditionExpressionString,
+                                                                   this.request.conditionExpression().expression(), " AND ");
+        }
+
+        // Avoiding adding empty collections that the low level SDK will propagate to DynamoDb where it causes error.
+        if (expressionNames != null && !expressionNames.isEmpty()) {
+            requestBuilder = requestBuilder.expressionAttributeNames(expressionNames);
+        }
+
+        if (expressionValues != null && !expressionValues.isEmpty()) {
+            requestBuilder = requestBuilder.expressionAttributeValues(expressionValues);
+        }
+
+        return requestBuilder.conditionExpression(conditionExpressionString);
+    }
+
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/mapper/BeanTableSchema.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/mapper/BeanTableSchema.java
new file mode 100644
index 000000000000..4e1ca9c7d10e
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/mapper/BeanTableSchema.java
@@ -0,0 +1,397 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.mapper;
+
+import java.beans.BeanInfo;
+import java.beans.IntrospectionException;
+import java.beans.Introspector;
+import java.beans.PropertyDescriptor;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.function.BiConsumer;
+import java.util.function.Function;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import software.amazon.awssdk.annotations.SdkPublicApi;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeConverterProvider;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClient;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.enhanced.dynamodb.TableMetadata;
+import software.amazon.awssdk.enhanced.dynamodb.TableSchema;
+import software.amazon.awssdk.enhanced.dynamodb.internal.mapper.BeanAttributeGetter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.mapper.BeanAttributeSetter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.mapper.BeanConstructor;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.annotations.BeanTableSchemaAttributeTag;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.annotations.DynamoDbAttribute;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.annotations.DynamoDbBean;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.annotations.DynamoDbConvertedBy;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.annotations.DynamoDbFlatten;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.annotations.DynamoDbIgnore;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+
+/**
+ * Implementation of {@link TableSchema} that builds a table schema based on properties and annotations of a bean
+ * class. Example:
+ * {@code
+ * @literal @DynamoDbBean
+ * public class CustomerAccount {
+ *     private String unencryptedBillingKey;
+ *
+ *     @literal @DynamoDbPartitionKey
+ *     @literal @DynamoDbSecondarySortKey(indexName = "accounts_by_customer")
+ *     public String accountId;
+ *
+ *     @literal @DynamoDbSortKey
+ *     @literal @DynamoDbSecondaryPartitionKey(indexName = "accounts_by_customer")
+ *     public String customerId;
+ *
+ *     @literal @DynamoDbAttribute("account_status")
+ *     public CustomerAccountStatus status;
+ *
+ *     @literal @DynamoDbFlatten(dynamoDbBeanClass = Customer.class)
+ *     public Customer customer;
+ *
+ *     public Instant createdOn;
+ *
+ *     // All public fields must be opted out to not participate in mapping
+ *     @literal @DynamoDbIgnore
+ *     public String internalKey;
+ *
+ *     public enum CustomerAccountStatus {
+ *         ACTIVE,
+ *         CLOSED
+ *     }
+ * }
+ *
+ * @literal @DynamoDbBean
+ * public class Customer {
+ *     public String name;
+ *
+ *     public List<String> address;
+ * }
+ * }
+ * @param <T> The type of object that this {@link TableSchema} maps to.
+ */
+@SdkPublicApi
+public final class BeanTableSchema<T> implements TableSchema<T> {
+    private static final String ATTRIBUTE_TAG_STATIC_SUPPLIER_NAME = "attributeTagFor";
+
+    private final StaticTableSchema<T> wrappedTableSchema;
+
+    private BeanTableSchema(StaticTableSchema<T> staticTableSchema) {
+        this.wrappedTableSchema = staticTableSchema;
+    }
+
+    /**
+     * Scans a bean class and builds a {@link BeanTableSchema} from it that can be used with the
+     * {@link DynamoDbEnhancedClient}.
+     * @param beanClass The bean class to build the table schema from.
+     * @param <T> The bean class type.
+     * @return An initialized {@link BeanTableSchema}
+     */
+    public static <T> BeanTableSchema<T> create(Class<T> beanClass) {
+        return new BeanTableSchema<>(createStaticTableSchema(beanClass));
+    }
+
+    /**
+     * {@inheritDoc}
+     * @param attributeMap A map of String to {@link AttributeValue} that contains all the raw attributes to map.
+     */
+    @Override
+    public T mapToItem(Map<String, AttributeValue> attributeMap) {
+        return wrappedTableSchema.mapToItem(attributeMap);
+    }
+
+    /**
+     * {@inheritDoc}
+     * @param item The modelled Java object to convert into a map of attributes.
+     * @param ignoreNulls If set to true; any null values in the Java object will not be added to the output map.
+     *                    If set to false; null values in the Java object will be added as {@link AttributeValue} of
+     *                    type 'nul' to the output map.
+     */
+    @Override
+    public Map<String, AttributeValue> itemToMap(T item, boolean ignoreNulls) {
+        return wrappedTableSchema.itemToMap(item, ignoreNulls);
+    }
+
+    /**
+     * {@inheritDoc}
+     * @param item The modelled Java object to extract the map of attributes from.
+     * @param attributes A collection of attribute names to extract into the output map.
+     */
+    @Override
+    public Map<String, AttributeValue> itemToMap(T item, Collection<String> attributes) {
+        return wrappedTableSchema.itemToMap(item, attributes);
+    }
+
+    /**
+     * {@inheritDoc}
+     * @param item The modelled Java object to extract the attribute from.
+     * @param key The attribute name describing which attribute to extract.
+     */
+    @Override
+    public AttributeValue attributeValue(T item, String key) {
+        return wrappedTableSchema.attributeValue(item, key);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public TableMetadata tableMetadata() {
+        return wrappedTableSchema.tableMetadata();
+    }
+
+    @Override
+    public EnhancedType<T> itemType() {
+        return wrappedTableSchema.itemType();
+    }
+
+    private static <T> StaticTableSchema<T> createStaticTableSchema(Class<T> beanClass) {
+        DynamoDbBean dynamoDbBean = beanClass.getAnnotation(DynamoDbBean.class);
+
+        if (dynamoDbBean == null) {
+            throw new IllegalArgumentException("A DynamoDb bean class must be annotated with @DynamoDbBean");
+        }
+
+        BeanInfo beanInfo;
+
+        try {
+            beanInfo = Introspector.getBeanInfo(beanClass);
+        } catch (IntrospectionException e) {
+            throw new IllegalArgumentException(e);
+        }
+
+        Supplier<T> newObjectSupplier = newObjectSupplierForClass(beanClass);
+
+        StaticTableSchema.Builder<T> builder = StaticTableSchema.builder(beanClass)
+                                                                .newItemSupplier(newObjectSupplier);
+
+        builder.attributeConverterProviders(createConverterProvidersFromAnnotation(dynamoDbBean));
+
+        List<StaticAttribute<T, ?>> attributes = new ArrayList<>();
+
+        Arrays.stream(beanInfo.getPropertyDescriptors())
+              .filter(BeanTableSchema::isMappableProperty)
+              .forEach(propertyDescriptor -> {
+                  DynamoDbFlatten dynamoDbFlatten = getPropertyAnnotation(propertyDescriptor, DynamoDbFlatten.class);
+
+                  if (dynamoDbFlatten != null) {
+                      builder.flatten(createStaticTableSchema(dynamoDbFlatten.dynamoDbBeanClass()),
+                                      getterForProperty(propertyDescriptor, beanClass),
+                                      setterForProperty(propertyDescriptor, beanClass));
+                  } else {
+                      StaticAttribute.Builder<T, ?> attributeBuilder =
+                          staticAttributeBuilder(propertyDescriptor, beanClass);
+
+                      Optional<AttributeConverter> attributeConverter =
+                              createAttributeConverterFromAnnotation(propertyDescriptor);
+                      attributeConverter.ifPresent(attributeBuilder::attributeConverter);
+
+                      addTagsToAttribute(attributeBuilder, propertyDescriptor);
+                      attributes.add(attributeBuilder.build());
+                  }
+              });
+
+        builder.attributes(attributes);
+
+        return builder.build();
+    }
+
+    private static List<AttributeConverterProvider> createConverterProvidersFromAnnotation(DynamoDbBean dynamoDbBean) {
+        Class<? extends AttributeConverterProvider>[] providerClasses = dynamoDbBean.converterProviders();
+
+        return Arrays.stream(providerClasses)
+                .map(c -> (AttributeConverterProvider) newObjectSupplierForClass(c).get())
+                .collect(Collectors.toList());
+    }
+
+    private static <T> StaticAttribute.Builder<T, ?> staticAttributeBuilder(PropertyDescriptor propertyDescriptor,
+                                                                            Class<T> beanClass) {
+
+        Type propertyType = propertyDescriptor.getReadMethod().getGenericReturnType();
+        EnhancedType<?> propertyTypeToken = convertTypeToEnhancedType(propertyType);
+        return StaticAttribute.builder(beanClass, propertyTypeToken)
+                              .name(attributeNameForProperty(propertyDescriptor))
+                              .getter(getterForProperty(propertyDescriptor, beanClass))
+                              .setter(setterForProperty(propertyDescriptor, beanClass));
+    }
+
+    /**
+     * Converts a {@link Type} to an {@link EnhancedType}. Usually {@link EnhancedType#of} is capable of doing this all
+     * by itself, but for the BeanTableSchema we want to detect if a parameterized class is being passed without a
+     * converter that is actually a {@link DynamoDbBean} in which case we want to capture its schema and add it to the
+     * EnhancedType. Unfortunately this means we have to duplicate some of the recursive Type parsing that
+     * EnhancedClient otherwise does all by itself.
+     */
+    @SuppressWarnings("unchecked")
+    private static EnhancedType<?> convertTypeToEnhancedType(Type type) {
+        Class<?> clazz = null;
+
+        if (type instanceof ParameterizedType) {
+            ParameterizedType parameterizedType = (ParameterizedType) type;
+            Type rawType = parameterizedType.getRawType();
+
+            if (List.class.equals(rawType)) {
+                return EnhancedType.listOf(convertTypeToEnhancedType(parameterizedType.getActualTypeArguments()[0]));
+            }
+
+            if (Map.class.equals(rawType)) {
+                return EnhancedType.mapOf(EnhancedType.of(parameterizedType.getActualTypeArguments()[0]),
+                                          convertTypeToEnhancedType(parameterizedType.getActualTypeArguments()[1]));
+            }
+
+            if (rawType instanceof Class) {
+                clazz = (Class<?>) rawType;
+            }
+        } else if (type instanceof Class) {
+            clazz = (Class<?>) type;
+        }
+
+        if (clazz != null) {
+            if (clazz.getAnnotation(DynamoDbBean.class) != null) {
+                return EnhancedType.documentOf((Class<Object>) clazz,
+                                               (TableSchema<Object>) createStaticTableSchema(clazz));
+            }
+        }
+
+        return EnhancedType.of(type);
+    }
+
+    private static Optional<AttributeConverter> createAttributeConverterFromAnnotation(
+            PropertyDescriptor propertyDescriptor) {
+        DynamoDbConvertedBy attributeConverterBean =
+                getPropertyAnnotation(propertyDescriptor, DynamoDbConvertedBy.class);
+        Optional<Class<?>> optionalClass = Optional.ofNullable(attributeConverterBean)
+                                                   .map(DynamoDbConvertedBy::value);
+        return optionalClass.map(clazz -> (AttributeConverter) newObjectSupplierForClass(clazz).get());
+    }
+
+    /**
+     * This method scans all the annotations on a property and looks for a meta-annotation of
+     * {@link BeanTableSchemaAttributeTag}. If the meta-annotation is found, it attempts to create
+     * an annotation tag based on a standard named static method
+     * of the class that tag has been annotated with passing in the original property annotation as an argument.
+     */
+    private static void addTagsToAttribute(StaticAttribute.Builder<?, ?> attributeBuilder,
+                                           PropertyDescriptor propertyDescriptor) {
+
+        propertyAnnotations(propertyDescriptor).forEach(annotation -> {
+            BeanTableSchemaAttributeTag beanTableSchemaAttributeTag =
+                annotation.annotationType().getAnnotation(BeanTableSchemaAttributeTag.class);
+
+            if (beanTableSchemaAttributeTag != null) {
+                Class<?> tagClass = beanTableSchemaAttributeTag.value();
+
+                Method tagMethod;
+                try {
+                    tagMethod = tagClass.getDeclaredMethod(ATTRIBUTE_TAG_STATIC_SUPPLIER_NAME,
+                                                           annotation.annotationType());
+                } catch (NoSuchMethodException e) {
+                    throw new RuntimeException(
+                        String.format("Could not find a static method named '%s' on class '%s' that returns " +
+                                          "an AttributeTag for annotation '%s'", ATTRIBUTE_TAG_STATIC_SUPPLIER_NAME,
+                                      tagClass, annotation.annotationType()), e);
+                }
+
+                if (!Modifier.isStatic(tagMethod.getModifiers())) {
+                    throw new RuntimeException(
+                        String.format("Could not find a static method named '%s' on class '%s' that returns " +
+                                          "an AttributeTag for annotation '%s'", ATTRIBUTE_TAG_STATIC_SUPPLIER_NAME,
+                                      tagClass, annotation.annotationType()));
+                }
+
+                StaticAttributeTag staticAttributeTag;
+                try {
+                    staticAttributeTag = (StaticAttributeTag) tagMethod.invoke(null, annotation);
+                } catch (IllegalAccessException | InvocationTargetException e) {
+                    throw new RuntimeException(
+                        String.format("Could not invoke method to create AttributeTag for annotation '%s' on class " +
+                                          "'%s'.", annotation.annotationType(), tagClass), e);
+                }
+
+                attributeBuilder.addTag(staticAttributeTag);
+            }
+        });
+    }
+
+    private static <R> Supplier<R> newObjectSupplierForClass(Class<R> clazz) {
+        try {
+            return BeanConstructor.create(clazz, clazz.getConstructor());
+        } catch (NoSuchMethodException e) {
+            throw new IllegalArgumentException(
+                String.format("Class '%s' appears to have no default constructor thus cannot be used with the " +
+                                  "BeanTableSchema", clazz), e);
+        }
+    }
+
+    private static <T, R> Function<T, R> getterForProperty(PropertyDescriptor propertyDescriptor, Class<T> beanClass) {
+        Method readMethod = propertyDescriptor.getReadMethod();
+        return BeanAttributeGetter.create(beanClass, readMethod);
+    }
+
+    private static <T, R> BiConsumer<T, R> setterForProperty(PropertyDescriptor propertyDescriptor,
+                                                             Class<T> beanClass) {
+        Method writeMethod = propertyDescriptor.getWriteMethod();
+        return BeanAttributeSetter.create(beanClass, writeMethod);
+    }
+
+    private static String attributeNameForProperty(PropertyDescriptor propertyDescriptor) {
+        DynamoDbAttribute dynamoDbAttribute = getPropertyAnnotation(propertyDescriptor, DynamoDbAttribute.class);
+        if (dynamoDbAttribute != null) {
+            return dynamoDbAttribute.value();
+        }
+
+        return propertyDescriptor.getName();
+    }
+
+    private static boolean isMappableProperty(PropertyDescriptor propertyDescriptor) {
+        return propertyDescriptor.getReadMethod() != null
+            && propertyDescriptor.getWriteMethod() != null
+            && getPropertyAnnotation(propertyDescriptor, DynamoDbIgnore.class) == null;
+    }
+
+    private static <R extends Annotation> R getPropertyAnnotation(PropertyDescriptor propertyDescriptor,
+                                                                  Class<R> annotationType) {
+        R getterAnnotation = propertyDescriptor.getReadMethod().getAnnotation(annotationType);
+        R setterAnnotation = propertyDescriptor.getWriteMethod().getAnnotation(annotationType);
+
+        if (getterAnnotation != null) {
+            return getterAnnotation;
+        }
+
+        return setterAnnotation;
+    }
+
+    private static List<? extends Annotation> propertyAnnotations(PropertyDescriptor propertyDescriptor) {
+        return Stream.concat(Arrays.stream(propertyDescriptor.getReadMethod().getAnnotations()),
+                             Arrays.stream(propertyDescriptor.getWriteMethod().getAnnotations()))
+                     .collect(Collectors.toList());
+    }
+}
+
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/mapper/StaticAttribute.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/mapper/StaticAttribute.java
new file mode 100644
index 000000000000..c9608dd881ba
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/mapper/StaticAttribute.java
@@ -0,0 +1,248 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.mapper;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.function.BiConsumer;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import software.amazon.awssdk.annotations.SdkPublicApi;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeConverterProvider;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.enhanced.dynamodb.internal.mapper.ResolvedStaticAttribute;
+import software.amazon.awssdk.enhanced.dynamodb.internal.mapper.StaticAttributeType;
+import software.amazon.awssdk.utils.Validate;
+
+/**
+ * A class that represents an attribute that can be read from and written to an mapped item. A {@link StaticTableSchema}
+ * composes multiple attributes that map to a common item class.
+ * <p>
+ * The recommended way to use this class is by calling {@link StaticTableSchema.Builder#addAttribute(Class, Consumer)}.
+ * Example:
+ * {@code
+ * StaticTableSchema.builder()
+ *                  .addAttribute(String.class,
+ *                                a -> a.name("customer_name").getter(Customer::getName).setter(Customer::setName))
+ *                  // ...
+ *                  .build();
+ * }
+ * <p>
+ * It's also possible to construct this class on its own using the static builder. Example:
+ * {@code
+ * StaticAttribute<Customer, ?> customerNameAttribute =
+ *     StaticAttribute.builder(Customer.class, String.class)
+ *                    .name("customer_name")
+ *                    .getter(Customer::getName)
+ *                    .setter(Customer::setName)
+ *                    .build();
+ * }
+ * @param <T> the class of the item this attribute maps into.
+ * @param <R> the class that the value of this attribute converts to.
+ */
+@SdkPublicApi
+public final class StaticAttribute<T, R> {
+    private final String name;
+    private final Function<T, R> getter;
+    private final BiConsumer<T, R> setter;
+    private final Collection<StaticAttributeTag> tags;
+    private final EnhancedType<R> type;
+    private final AttributeConverter<R> attributeConverter;
+
+    private StaticAttribute(Builder<T, R> builder) {
+        this.name = Validate.paramNotNull(builder.name, "name");
+        this.getter = Validate.paramNotNull(builder.getter, "getter");
+        this.setter = Validate.paramNotNull(builder.setter, "setter");
+        this.tags = builder.tags == null ? Collections.emptyList() : Collections.unmodifiableCollection(builder.tags);
+        this.type = Validate.paramNotNull(builder.type, "type");
+        this.attributeConverter = builder.attributeConverter;
+    }
+
+    /**
+     * Constructs a new builder for this class using supplied types.
+     * @param itemClass The class of the item that this attribute composes.
+     * @param attributeType A {@link EnhancedType} that represents the type of the value this attribute stores.
+     * @return A new typed builder for an attribute.
+     */
+    public static <T, R> Builder<T, R> builder(Class<T> itemClass, EnhancedType<R> attributeType) {
+        return new Builder<>(attributeType);
+    }
+
+    /**
+     * Constructs a new builder for this class using supplied types.
+     * @param itemClass The class of the item that this attribute composes.
+     * @param attributeClass A class that represents the type of the value this attribute stores.
+     * @return A new typed builder for an attribute.
+     */
+    public static <T, R> Builder<T, R> builder(Class<T> itemClass, Class<R> attributeClass) {
+        return new Builder<>(EnhancedType.of(attributeClass));
+    }
+
+    /**
+     * The name of this attribute
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * A function that can get the value of this attribute from a modelled item it composes.
+     */
+    public Function<T, R> getter() {
+        return this.getter;
+    }
+
+    /**
+     * A function that can set the value of this attribute on a modelled item it composes.
+     */
+    public BiConsumer<T, R> setter() {
+        return this.setter;
+    }
+
+    /**
+     * A collection of {@link StaticAttributeTag} associated with this attribute.
+     */
+    public Collection<StaticAttributeTag> tags() {
+        return this.tags;
+    }
+
+    /**
+     * A {@link EnhancedType} that represents the type of the value this attribute stores.
+     */
+    public EnhancedType<R> type() {
+        return this.type;
+    }
+
+    /**
+     * A custom {@link AttributeConverter} that will be used to convert this attribute.
+     * If no custom converter was provided, the value will be null.
+     * @see Builder#attributeConverter
+     */
+    public AttributeConverter<R> attributeConverter() {
+        return this.attributeConverter;
+    }
+
+    /**
+     * Converts an instance of this class to a {@link Builder} that can be used to modify and reconstruct it.
+     */
+    public Builder<T, R> toBuilder() {
+        return new Builder<T, R>(this.type).name(this.name)
+                                           .getter(this.getter)
+                                           .setter(this.setter)
+                                           .tags(this.tags);
+    }
+
+
+    ResolvedStaticAttribute<T> resolve(AttributeConverterProvider attributeConverterProvider) {
+        return ResolvedStaticAttribute.create(this,
+                                              StaticAttributeType.create(converterFrom(attributeConverterProvider)));
+    }
+
+    private AttributeConverter<R> converterFrom(AttributeConverterProvider attributeConverterProvider) {
+        return (attributeConverter != null) ? attributeConverter : attributeConverterProvider.converterFor(type);
+    }
+
+    /**
+     * A typed builder for {@link StaticAttribute}.
+     * @param <T> the class of the item this attribute maps into.
+     * @param <R> the class that the value of this attribute converts to.
+     */
+    public static final class Builder<T, R> {
+        private final EnhancedType<R> type;
+        private String name;
+        private Function<T, R> getter;
+        private BiConsumer<T, R> setter;
+        private List<StaticAttributeTag> tags;
+        private AttributeConverter<R> attributeConverter;
+
+        private Builder(EnhancedType<R> type) {
+            this.type = type;
+        }
+
+        /**
+         * The name of this attribute
+         */
+        public Builder<T, R> name(String name) {
+            this.name = name;
+            return this;
+        }
+
+        /**
+         * A function that can get the value of this attribute from a modelled item it composes.
+         */
+        public Builder<T, R> getter(Function<T, R> getter) {
+            this.getter = getter;
+            return this;
+        }
+
+        /**
+         * A function that can set the value of this attribute on a modelled item it composes.
+         */
+        public Builder<T, R> setter(BiConsumer<T, R> setter) {
+            this.setter = setter;
+            return this;
+        }
+
+        /**
+         * A collection of {@link StaticAttributeTag} associated with this attribute. Overwrites any existing tags.
+         */
+        public Builder<T, R> tags(Collection<StaticAttributeTag> tags) {
+            this.tags = new ArrayList<>(tags);
+            return this;
+        }
+
+        /**
+         * A collection of {@link StaticAttributeTag} associated with this attribute. Overwrites any existing tags.
+         */
+        public Builder<T, R> tags(StaticAttributeTag... tags) {
+            this.tags = Arrays.asList(tags);
+            return this;
+        }
+
+        /**
+         * Associates a single {@link StaticAttributeTag} with this attribute. Adds to any existing tags.
+         */
+        public Builder<T, R> addTag(StaticAttributeTag tag) {
+            if (this.tags == null) {
+                this.tags = new ArrayList<>();
+            }
+
+            this.tags.add(tag);
+            return this;
+        }
+
+        /**
+         * An {@link AttributeConverter} for the attribute type ({@link EnhancedType}), that can convert this attribute.
+         * It takes precedence over any converter for this type provided by the table schema
+         * {@link AttributeConverterProvider}.
+         */
+        public Builder<T, R> attributeConverter(AttributeConverter<R> attributeConverter) {
+            this.attributeConverter = attributeConverter;
+            return this;
+        }
+
+        /**
+         * Builds a {@link StaticAttributeTag} from the values stored in this builder.
+         */
+        public StaticAttribute<T, R> build() {
+            return new StaticAttribute<>(this);
+        }
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/mapper/StaticAttributeTag.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/mapper/StaticAttributeTag.java
new file mode 100644
index 000000000000..d4a3ec9a922c
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/mapper/StaticAttributeTag.java
@@ -0,0 +1,46 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.mapper;
+
+import java.util.function.Consumer;
+import software.amazon.awssdk.annotations.SdkPublicApi;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeValueType;
+
+/**
+ * Interface for a tag that can be applied to any {@link StaticAttribute}. When a tagged attribute is added to a
+ * {@link software.amazon.awssdk.enhanced.dynamodb.TableSchema}, the table metadata stored on the schema will be updated
+ * by calling the {@link #modifyMetadata(String, AttributeValueType)} method for every tag associated with the
+ * attribute.
+ * <p>
+ * Common implementations of this interface that can be used to declare indices in your schema can be found in
+ * {@link StaticAttributeTags}.
+ */
+@SdkPublicApi
+public interface StaticAttributeTag {
+    /**
+     * A function that modifies an existing {@link StaticTableSchema.Builder} when this tag is applied to a specific
+     * attribute. This will be used by the {@link StaticTableSchema} to capture all the metadata associated with
+     * tagged attributes when constructing the table schema.
+     *
+     * @param attributeName The name of the attribute this tag has been applied to.
+     * @param attributeValueType The type of the attribute this tag has been applied to. This can be used for
+     *                           validation, for instance if you have an attribute tag that should only be associated
+     *                           with a string.
+     * @return a consumer that modifies an existing {@link StaticTableSchema.Builder}.
+     */
+    Consumer<StaticTableMetadata.Builder> modifyMetadata(String attributeName,
+                                                         AttributeValueType attributeValueType);
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/mapper/StaticAttributeTags.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/mapper/StaticAttributeTags.java
new file mode 100644
index 000000000000..e19645769bd8
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/mapper/StaticAttributeTags.java
@@ -0,0 +1,148 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.mapper;
+
+import java.util.Collection;
+import java.util.function.BiConsumer;
+import java.util.function.Consumer;
+import software.amazon.awssdk.annotations.SdkPublicApi;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeValueType;
+import software.amazon.awssdk.enhanced.dynamodb.TableMetadata;
+
+/**
+ * Common implementations of {@link StaticAttributeTag}. These tags can be used to mark your attributes as primary or
+ * secondary keys in your {@link StaticTableSchema} definitions.
+ */
+@SdkPublicApi
+public final class StaticAttributeTags {
+    private static final StaticAttributeTag PRIMARY_PARTITION_KEY_SINGLETON =
+        new KeyAttributeTag((tableMetadataBuilder, attribute) ->
+            tableMetadataBuilder.addIndexPartitionKey(TableMetadata.primaryIndexName(),
+                                                      attribute.getAttributeName(),
+                                                      attribute.getAttributeValueType()));
+    private static final StaticAttributeTag PRIMARY_SORT_KEY_SINGLETON =
+        new KeyAttributeTag((tableMetadataBuilder, attribute) ->
+            tableMetadataBuilder.addIndexSortKey(TableMetadata.primaryIndexName(),
+                                                 attribute.getAttributeName(),
+                                                 attribute.getAttributeValueType()));
+
+    private StaticAttributeTags() {
+    }
+
+    /**
+     * Marks an attribute as being the primary partition key of the table it participates in. Only one attribute can
+     * be marked this way in a given table schema.
+     */
+    public static StaticAttributeTag primaryPartitionKey() {
+        return PRIMARY_PARTITION_KEY_SINGLETON;
+    }
+
+    /**
+     * Marks an attribute as being the primary sort key of the table it participates in. Only one attribute can be
+     * marked this way in a given table schema.
+     */
+    public static StaticAttributeTag primarySortKey() {
+        return PRIMARY_SORT_KEY_SINGLETON;
+    }
+
+    /**
+     * Marks an attribute as being a partition key for a secondary index.
+     * @param indexName The name of the index this key participates in.
+     */
+    public static StaticAttributeTag secondaryPartitionKey(String indexName) {
+        return new KeyAttributeTag((tableMetadataBuilder, attribute) ->
+                                    tableMetadataBuilder.addIndexPartitionKey(indexName,
+                                                                              attribute.getAttributeName(),
+                                                                              attribute.getAttributeValueType()));
+    }
+
+    /**
+     * Marks an attribute as being a partition key for multiple secondary indices.
+     * @param indexNames The names of the indices this key participates in.
+     */
+    public static StaticAttributeTag secondaryPartitionKey(Collection<String> indexNames) {
+        return new KeyAttributeTag(
+            (tableMetadataBuilder, attribute) ->
+                indexNames.forEach(
+                    indexName -> tableMetadataBuilder.addIndexPartitionKey(indexName,
+                                                                           attribute.getAttributeName(),
+                                                                           attribute.getAttributeValueType())));
+    }
+
+    /**
+     * Marks an attribute as being a sort key for a secondary index.
+     * @param indexName The name of the index this key participates in.
+     */
+    public static StaticAttributeTag secondarySortKey(String indexName) {
+        return new KeyAttributeTag((tableMetadataBuilder, attribute) ->
+                                    tableMetadataBuilder.addIndexSortKey(indexName,
+                                                                         attribute.getAttributeName(),
+                                                                         attribute.getAttributeValueType()));
+    }
+
+    /**
+     * Marks an attribute as being a sort key for multiple secondary indices.
+     * @param indexNames The names of the indices this key participates in.
+     */
+    public static StaticAttributeTag secondarySortKey(Collection<String> indexNames) {
+        return new KeyAttributeTag(
+            (tableMetadataBuilder, attribute) ->
+                indexNames.forEach(
+                    indexName -> tableMetadataBuilder.addIndexSortKey(indexName,
+                                                                      attribute.getAttributeName(),
+                                                                      attribute.getAttributeValueType())));
+    }
+
+    private static class KeyAttributeTag implements StaticAttributeTag {
+        private final BiConsumer<StaticTableMetadata.Builder, AttributeAndType> tableMetadataKeySetter;
+
+        private KeyAttributeTag(BiConsumer<StaticTableMetadata.Builder, AttributeAndType> tableMetadataKeySetter) {
+            this.tableMetadataKeySetter = tableMetadataKeySetter;
+        }
+
+        @Override
+        public Consumer<StaticTableMetadata.Builder> modifyMetadata(String attributeName,
+                                                                    AttributeValueType attributeValueType) {
+            return metadata -> {
+                if (attributeValueType.scalarAttributeType() == null) {
+                    throw new IllegalArgumentException(
+                        String.format("Attribute '%s' of type %s is not a suitable type to be used as a key.",
+                                      attributeName, attributeValueType.name()));
+                }
+
+                tableMetadataKeySetter.accept(metadata, new AttributeAndType(attributeName, attributeValueType));
+            };
+        }
+    }
+
+    private static class AttributeAndType {
+        private final String attributeName;
+        private final AttributeValueType attributeValueType;
+
+        private AttributeAndType(String attributeName, AttributeValueType attributeValueType) {
+            this.attributeName = attributeName;
+            this.attributeValueType = attributeValueType;
+        }
+
+        private String getAttributeName() {
+            return attributeName;
+        }
+
+        private AttributeValueType getAttributeValueType() {
+            return attributeValueType;
+        }
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/mapper/StaticTableMetadata.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/mapper/StaticTableMetadata.java
new file mode 100644
index 000000000000..1abda2bd94f2
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/mapper/StaticTableMetadata.java
@@ -0,0 +1,382 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.mapper;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+import software.amazon.awssdk.annotations.SdkPublicApi;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeValueType;
+import software.amazon.awssdk.enhanced.dynamodb.TableMetadata;
+import software.amazon.awssdk.services.dynamodb.model.ScalarAttributeType;
+
+/**
+ * Implementation of {@link TableMetadata} that can be constructed directly using literal values for metadata objects.
+ * This implementation is used by {@link StaticTableSchema} and associated interfaces such as {@link StaticAttributeTag}
+ * and {@link StaticTableTag} which permit manipulation of the table metadata.
+ */
+@SdkPublicApi
+public final class StaticTableMetadata implements TableMetadata {
+    private final Map<String, Object> customMetadata;
+    private final Map<String, Index> indexByNameMap;
+    private final Map<String, AttributeValueType> keyAttributes;
+
+    private StaticTableMetadata(Builder builder) {
+        this.customMetadata = Collections.unmodifiableMap(builder.customMetadata);
+        this.indexByNameMap = Collections.unmodifiableMap(builder.indexByNameMap);
+        this.keyAttributes = Collections.unmodifiableMap(builder.keyAttributes);
+    }
+
+    /**
+     * Create a new builder for this class
+     * @return A newly initialized {@link Builder} for building a {@link StaticTableMetadata} object.
+     */
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    @Override
+    public <T> Optional<T> customMetadataObject(String key, Class<? extends T> objectClass) {
+        Object genericObject = customMetadata.get(key);
+
+        if (genericObject == null) {
+            return Optional.empty();
+        }
+
+        if (!objectClass.isAssignableFrom(genericObject.getClass())) {
+            throw new IllegalArgumentException("Attempt to retrieve a custom metadata object as a type that is not "
+                                               + "assignable for that object. Custom metadata key: " + key + "; "
+                                               + "requested object class: " + objectClass.getCanonicalName() + "; "
+                                               + "found object class: " + genericObject.getClass().getCanonicalName());
+        }
+
+        return Optional.of(objectClass.cast(genericObject));
+    }
+
+    @Override
+    public String indexPartitionKey(String indexName) {
+        Index index = getIndex(indexName);
+
+        if (index.getIndexPartitionKey() == null) {
+            if (!TableMetadata.primaryIndexName().equals(indexName) && index.getIndexSortKey() != null) {
+                // Local secondary index, use primary partition key
+                return primaryPartitionKey();
+            }
+
+            throw new IllegalArgumentException("Attempt to execute an operation against an index that requires a "
+                                               + "partition key without assigning a partition key to that index. "
+                                               + "Index name: " + indexName);
+        }
+
+        return index.getIndexPartitionKey();
+    }
+
+    @Override
+    public Optional<String> indexSortKey(String indexName) {
+        Index index = getIndex(indexName);
+
+        return Optional.ofNullable(index.getIndexSortKey());
+    }
+
+    @Override
+    public Collection<String> indexKeys(String indexName) {
+        Index index = getIndex(indexName);
+
+        if (index.getIndexSortKey() != null) {
+            if (!TableMetadata.primaryIndexName().equals(indexName) && index.getIndexPartitionKey() == null) {
+                // Local secondary index, use primary index for partition key
+                return Collections.unmodifiableList(Arrays.asList(primaryPartitionKey(), index.getIndexSortKey()));
+            }
+            return Collections.unmodifiableList(Arrays.asList(index.getIndexPartitionKey(), index.getIndexSortKey()));
+        } else {
+            return Collections.singletonList(index.getIndexPartitionKey());
+        }
+    }
+
+    @Override
+    public Collection<String> allKeys() {
+        return this.keyAttributes.keySet();
+    }
+
+    private Index getIndex(String indexName) {
+        Index index = indexByNameMap.get(indexName);
+
+        if (index == null) {
+            if (TableMetadata.primaryIndexName().equals(indexName)) {
+                throw new IllegalArgumentException("Attempt to execute an operation that requires a primary index "
+                                                   + "without defining any primary key attributes in the table "
+                                                   + "metadata.");
+            } else {
+                throw new IllegalArgumentException("Attempt to execute an operation that requires a secondary index "
+                                                   + "without defining the index attributes in the table metadata. "
+                                                   + "Index name: " + indexName);
+            }
+        }
+
+        return index;
+    }
+
+    @Override
+    public Optional<ScalarAttributeType> scalarAttributeType(String keyAttribute) {
+        AttributeValueType attributeValueType = this.keyAttributes.get(keyAttribute);
+
+        if (attributeValueType == null) {
+            throw new IllegalArgumentException("Key attribute '" + keyAttribute + "' not found in table metadata.");
+        }
+
+        return Optional.ofNullable(attributeValueType.scalarAttributeType());
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        StaticTableMetadata that = (StaticTableMetadata) o;
+
+        if (customMetadata != null ? ! customMetadata.equals(that.customMetadata) : that.customMetadata != null) {
+            return false;
+        }
+        if (indexByNameMap != null ? ! indexByNameMap.equals(that.indexByNameMap) : that.indexByNameMap != null) {
+            return false;
+        }
+        return keyAttributes != null ? keyAttributes.equals(that.keyAttributes) : that.keyAttributes == null;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = customMetadata != null ? customMetadata.hashCode() : 0;
+        result = 31 * result + (indexByNameMap != null ? indexByNameMap.hashCode() : 0);
+        result = 31 * result + (keyAttributes != null ? keyAttributes.hashCode() : 0);
+        return result;
+    }
+
+    /**
+     * Builder for {@link StaticTableMetadata}
+     */
+    public static class Builder {
+        private final Map<String, Object> customMetadata = new HashMap<>();
+        private final Map<String, Index> indexByNameMap = new HashMap<>();
+        private final Map<String, AttributeValueType> keyAttributes = new HashMap<>();
+
+        private Builder() {
+        }
+
+        /**
+         * Builds an immutable instance of {@link StaticTableMetadata} from the values supplied to the builder.
+         */
+        public StaticTableMetadata build() {
+            return new StaticTableMetadata(this);
+        }
+
+        /**
+         * Adds a single custom object to the metadata, keyed by a string. Attempting to add a metadata object with a
+         * key that matches one that has already been added will cause an exception to be thrown.
+         * @param key a string key that will be used to retrieve the custom metadata
+         * @param object an object that will be stored in the custom metadata map
+         * @throws  IllegalArgumentException if the custom metadata map already contains an entry with the same key
+         */
+        public Builder addCustomMetadataObject(String key, Object object) {
+            if (customMetadata.containsKey(key)) {
+                throw new IllegalArgumentException("Attempt to set a custom metadata object that has already been set. "
+                                                   + "Custom metadata object key: " + key);
+            }
+
+            customMetadata.put(key, object);
+            return this;
+        }
+
+        /**
+         * Adds information about a partition key associated with a specific index.
+         * @param indexName the name of the index to associate the partition key with
+         * @param attributeName the name of the attribute that represents the partition key
+         * @param attributeValueType the {@link AttributeValueType} of the partition key
+         * @throws IllegalArgumentException if a partition key has already been defined for this index
+         */
+        public Builder addIndexPartitionKey(String indexName, String attributeName, AttributeValueType attributeValueType) {
+            Index index = indexByNameMap.computeIfAbsent(indexName, $ -> new Index(indexName));
+
+            if (index.getIndexPartitionKey() != null) {
+                throw new IllegalArgumentException("Attempt to set an index partition key that conflicts with an "
+                                                   + "existing index partition key of the same name and index. Index "
+                                                   + "name: " + indexName + "; attribute name: " + attributeName);
+            }
+
+            index.setIndexPartitionKey(attributeName);
+            index.setIndexPartitionType(attributeValueType);
+            markAttributeAsKey(attributeName, attributeValueType);
+            return this;
+        }
+
+        /**
+         * Adds information about a sort key associated with a specific index.
+         * @param indexName the name of the index to associate the sort key with
+         * @param attributeName the name of the attribute that represents the sort key
+         * @param attributeValueType the {@link AttributeValueType} of the sort key
+         * @throws IllegalArgumentException if a sort key has already been defined for this index
+         */
+        public Builder addIndexSortKey(String indexName, String attributeName, AttributeValueType attributeValueType) {
+            Index index = indexByNameMap.computeIfAbsent(indexName, $ -> new Index(indexName));
+
+            if (index.getIndexSortKey() != null) {
+                throw new IllegalArgumentException("Attempt to set an index sort key that conflicts with an existing"
+                                                   + " index sort key of the same name and index. Index name: "
+                                                   + indexName + "; attribute name: " + attributeName);
+            }
+
+            index.setIndexSortKey(attributeName);
+            index.setIndexSortType(attributeValueType);
+            markAttributeAsKey(attributeName, attributeValueType);
+            return this;
+        }
+
+        /**
+         * Declares a 'key-like' attribute that is not an actual DynamoDB key. These pseudo-keys can then be recognized
+         * by extensions and treated appropriately, often being protected from manipulations as those would alter the
+         * meaning of the record. One example usage of this is a 'versioned record attribute': although the version is
+         * not part of the primary key of the record, it effectively serves as such.
+         * @param attributeName the name of the attribute to mark as a pseudo-key
+         * @param attributeValueType the {@link AttributeValueType} of the pseudo-key
+         */
+        public Builder markAttributeAsKey(String attributeName, AttributeValueType attributeValueType) {
+            AttributeValueType existing = keyAttributes.get(attributeName);
+
+            if (existing != null && !existing.equals(attributeValueType)) {
+                throw new IllegalArgumentException("Attempt to mark an attribute as a key with a different "
+                                                   + "AttributeValueType than one that has already been recorded.");
+            }
+
+            if (existing == null) {
+                keyAttributes.put(attributeName, attributeValueType);
+            }
+
+            return this;
+        }
+
+        /**
+         * Package-private method to merge the contents of a constructed {@link TableMetadata} into this builder.
+         */
+        Builder mergeWith(StaticTableMetadata other) {
+            other.indexByNameMap.forEach((key, index) -> {
+                if (index.getIndexPartitionKey() != null) {
+                    addIndexPartitionKey(index.getIndexName(),
+                                         index.getIndexPartitionKey(),
+                                         index.getIndexPartitionType());
+                }
+
+                if (index.getIndexSortKey() != null) {
+                    addIndexSortKey(index.getIndexName(), index.getIndexSortKey(), index.getIndexSortType());
+                }
+            });
+
+            other.customMetadata.forEach(this::addCustomMetadataObject);
+            other.keyAttributes.forEach(this::markAttributeAsKey);
+            return this;
+        }
+    }
+
+    private static class Index {
+        private final String indexName;
+        private String indexPartitionKey;
+        private String indexSortKey;
+        private AttributeValueType indexPartitionType;
+        private AttributeValueType indexSortType;
+
+        private Index(String indexName) {
+            this.indexName = indexName;
+        }
+
+        private String getIndexName() {
+            return indexName;
+        }
+
+        private String getIndexPartitionKey() {
+            return indexPartitionKey;
+        }
+
+        private String getIndexSortKey() {
+            return indexSortKey;
+        }
+
+        private AttributeValueType getIndexPartitionType() {
+            return indexPartitionType;
+        }
+
+        private AttributeValueType getIndexSortType() {
+            return indexSortType;
+        }
+
+        private void setIndexPartitionKey(String indexPartitionKey) {
+            this.indexPartitionKey = indexPartitionKey;
+        }
+
+        private void setIndexSortKey(String indexSortKey) {
+            this.indexSortKey = indexSortKey;
+        }
+
+        private void setIndexPartitionType(AttributeValueType indexPartitionType) {
+            this.indexPartitionType = indexPartitionType;
+        }
+
+        private void setIndexSortType(AttributeValueType indexSortType) {
+            this.indexSortType = indexSortType;
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) {
+                return true;
+            }
+            if (o == null || getClass() != o.getClass()) {
+                return false;
+            }
+
+            Index index = (Index) o;
+
+            if (indexName != null ? ! indexName.equals(index.indexName) : index.indexName != null) {
+                return false;
+            }
+            if (indexPartitionKey != null ? ! indexPartitionKey.equals(index.indexPartitionKey) :
+                index.indexPartitionKey != null) {
+                return false;
+            }
+            if (indexSortKey != null ? ! indexSortKey.equals(index.indexSortKey) : index.indexSortKey != null) {
+                return false;
+            }
+            if (indexPartitionType != index.indexPartitionType) {
+                return false;
+            }
+            return indexSortType == index.indexSortType;
+        }
+
+        @Override
+        public int hashCode() {
+            int result = indexName != null ? indexName.hashCode() : 0;
+            result = 31 * result + (indexPartitionKey != null ? indexPartitionKey.hashCode() : 0);
+            result = 31 * result + (indexSortKey != null ? indexSortKey.hashCode() : 0);
+            result = 31 * result + (indexPartitionType != null ? indexPartitionType.hashCode() : 0);
+            result = 31 * result + (indexSortType != null ? indexSortType.hashCode() : 0);
+            return result;
+        }
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/mapper/StaticTableSchema.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/mapper/StaticTableSchema.java
new file mode 100644
index 000000000000..497fa6441108
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/mapper/StaticTableSchema.java
@@ -0,0 +1,440 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.mapper;
+
+import static java.util.Collections.unmodifiableMap;
+import static software.amazon.awssdk.enhanced.dynamodb.internal.EnhancedClientUtils.isNullAttributeValue;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.BiConsumer;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import java.util.function.Supplier;
+import java.util.stream.Stream;
+import software.amazon.awssdk.annotations.SdkPublicApi;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeConverterProvider;
+import software.amazon.awssdk.enhanced.dynamodb.DefaultAttributeConverterProvider;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.enhanced.dynamodb.TableSchema;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.ConverterProviderResolver;
+import software.amazon.awssdk.enhanced.dynamodb.internal.mapper.ResolvedStaticAttribute;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+
+/**
+ * Implementation of {@link TableSchema} that builds a schema based on directly declared attributes and methods to
+ * get and set those attributes. This is the most direct, and thus fastest, implementation of {@link TableSchema}.
+ * <p>
+ * Example using a fictional 'Customer' data item class:-
+ * {@code
+ * static final TableSchema<Customer> CUSTOMER_TABLE_SCHEMA =
+ *      StaticTableSchema.builder(Customer.class)
+ *        .newItemSupplier(Customer::new)
+ *        .addAttribute(String.class, a -> a.name("account_id")
+ *                                          .getter(Customer::getAccountId)
+ *                                          .setter(Customer::setAccountId)
+ *                                          .tags(primaryPartitionKey()))
+ *        .addAttribute(Integer.class, a -> a.name("sub_id")
+ *                                           .getter(Customer::getSubId)
+ *                                           .setter(Customer::setSubId)
+ *                                           .tags(primarySortKey()))
+ *        .addAttribute(String.class, a -> a.name("name")
+ *                                          .getter(Customer::getName)
+ *                                          .setter(Customer::setName)
+ *                                          .tags(secondaryPartitionKey("customers_by_name")))
+ *        .addAttribute(Instant.class, a -> a.name("created_date")
+ *                                           .getter(Customer::getCreatedDate)
+ *                                           .setter(Customer::setCreatedDate)
+ *                                           .tags(secondarySortKey("customers_by_date"),
+ *                                                 secondarySortKey("customers_by_name")))
+ *        .build();
+ * }
+ */
+@SdkPublicApi
+public final class StaticTableSchema<T> implements TableSchema<T> {
+    private final List<ResolvedStaticAttribute<T>> attributeMappers;
+    private final Supplier<T> newItemSupplier;
+    private final Map<String, ResolvedStaticAttribute<T>> indexedMappers;
+    private final StaticTableMetadata tableMetadata;
+    private final EnhancedType<T> itemType;
+    private final AttributeConverterProvider attributeConverterProvider;
+
+    private StaticTableSchema(Builder<T> builder) {
+        StaticTableMetadata.Builder tableMetadataBuilder = StaticTableMetadata.builder();
+
+        this.attributeConverterProvider =
+                ConverterProviderResolver.resolveProviders(builder.attributeConverterProviders);
+
+        // Resolve declared attributes and find converters for them
+        Stream<ResolvedStaticAttribute<T>> attributesStream = builder.attributes == null ?
+            Stream.empty() : builder.attributes.stream().map(a -> a.resolve(this.attributeConverterProvider));
+
+        // Merge resolved declared attributes and additional attributes that were added by extend or flatten
+        List<ResolvedStaticAttribute<T>> mutableAttributeMappers = new ArrayList<>();
+        Map<String, ResolvedStaticAttribute<T>>  mutableIndexedMappers = new HashMap<>();
+        Stream.concat(attributesStream, builder.additionalAttributes.stream()).forEach(
+            resolvedAttribute -> {
+                String attributeName = resolvedAttribute.attributeName();
+
+                if (mutableIndexedMappers.containsKey(attributeName)) {
+                    throw new IllegalArgumentException(
+                        "Attempt to add an attribute to a mapper that already has one with the same name. " +
+                            "[Attribute name: " + attributeName + "]");
+                }
+
+                mutableAttributeMappers.add(resolvedAttribute);
+                mutableIndexedMappers.put(attributeName, resolvedAttribute);
+
+                // Merge in metadata associated with attribute
+                tableMetadataBuilder.mergeWith(resolvedAttribute.tableMetadata());
+            }
+        );
+
+        // Apply table-tags to table metadata
+        if (builder.tags != null) {
+            builder.tags.forEach(staticTableTag -> staticTableTag.modifyMetadata().accept(tableMetadataBuilder));
+        }
+
+        this.attributeMappers = Collections.unmodifiableList(mutableAttributeMappers);
+        this.indexedMappers = Collections.unmodifiableMap(mutableIndexedMappers);
+        this.newItemSupplier = builder.newItemSupplier;
+        this.tableMetadata = tableMetadataBuilder.build();
+        this.itemType = EnhancedType.of(builder.itemClass);
+    }
+
+    /**
+     * Creates a builder for a {@link StaticTableSchema} typed to specific data item class.
+     * @param itemClass The data item class object that the {@link StaticTableSchema} is to map to.
+     * @return A newly initialized builder
+     */
+    public static <T> Builder<T> builder(Class<T> itemClass) {
+        return new Builder<>(itemClass);
+    }
+
+    /**
+     * Builder for a {@link StaticTableSchema}
+     * @param <T> The data item type that the {@link StaticTableSchema} this builder will build is to map to.
+     */
+    public static final class Builder<T> {
+        private final Class<T> itemClass;
+        private final List<ResolvedStaticAttribute<T>> additionalAttributes = new ArrayList<>();
+
+        private List<StaticAttribute<T, ?>> attributes;
+        private Supplier<T> newItemSupplier;
+        private List<StaticTableTag> tags;
+        private List<AttributeConverterProvider> attributeConverterProviders =
+            Collections.singletonList(ConverterProviderResolver.defaultConverterProvider());
+
+        private Builder(Class<T> itemClass) {
+            this.itemClass = itemClass;
+        }
+
+        /**
+         * A function that can be used to create new instances of the data item class.
+         */
+        public Builder<T> newItemSupplier(Supplier<T> newItemSupplier) {
+            this.newItemSupplier = newItemSupplier;
+            return this;
+        }
+
+        /**
+         * A list of attributes that can be mapped between the data item object and the database record that are to
+         * be associated with the schema. Will overwrite any existing attributes.
+         */
+        @SafeVarargs
+        public final Builder<T> attributes(StaticAttribute<T, ?>... staticAttributes) {
+            this.attributes = Arrays.asList(staticAttributes);
+            return this;
+        }
+
+        /**
+         * A list of attributes that can be mapped between the data item object and the database record that are to
+         * be associated with the schema. Will overwrite any existing attributes.
+         */
+        public Builder<T> attributes(Collection<StaticAttribute<T, ?>> staticAttributes) {
+            this.attributes = new ArrayList<>(staticAttributes);
+            return this;
+        }
+
+        /**
+         * Adds a single attribute to the table schema that can be mapped between the data item object and the database
+         * record.
+         */
+        public <R> Builder<T> addAttribute(EnhancedType<R> attributeType,
+                                           Consumer<StaticAttribute.Builder<T, R>> staticAttribute) {
+
+            StaticAttribute.Builder<T, R> builder = StaticAttribute.builder(itemClass, attributeType);
+            staticAttribute.accept(builder);
+            return addAttribute(builder.build());
+        }
+
+        /**
+         * Adds a single attribute to the table schema that can be mapped between the data item object and the database
+         * record.
+         */
+        public <R> Builder<T> addAttribute(Class<R> attributeClass,
+                                           Consumer<StaticAttribute.Builder<T, R>> staticAttribute) {
+            return addAttribute(EnhancedType.of(attributeClass), staticAttribute);
+        }
+
+        /**
+         * Adds a single attribute to the table schema that can be mapped between the data item object and the database
+         * record.
+         */
+        public Builder<T> addAttribute(StaticAttribute<T, ?> staticAttribute) {
+            if (this.attributes == null) {
+                this.attributes = new ArrayList<>();
+            }
+
+            this.attributes.add(staticAttribute);
+            return this;
+        }
+
+        /**
+         * Flattens all the attributes defined in another {@link StaticTableSchema} into the database record this schema
+         * maps to. Functions to get and set an object that the flattened schema maps to is required.
+         */
+        public <R> Builder<T> flatten(StaticTableSchema<R> otherTableSchema,
+                                      Function<T, R> otherItemGetter,
+                                      BiConsumer<T, R> otherItemSetter) {
+            if (otherTableSchema.newItemSupplier == null) {
+                throw new IllegalArgumentException("Cannot flatten an abstract StaticTableSchema. Add a "
+                                                   + "'newItemSupplier' to the other StaticTableSchema to make it "
+                                                   + "concrete.");
+            }
+
+            // Creates a consumer that given a parent object will instantiate the composed object if its value is
+            // currently null and call the setter to store it on the parent object.
+            Consumer<T> composedObjectConstructor = parentObject -> {
+                if (otherItemGetter.apply(parentObject) == null) {
+                    R compositeItem = otherTableSchema.newItemSupplier.get();
+                    otherItemSetter.accept(parentObject, compositeItem);
+                }
+            };
+
+            otherTableSchema.attributeMappers.stream()
+                                             .map(attribute -> attribute.transform(otherItemGetter,
+                                                                                   composedObjectConstructor))
+                                             .forEach(this.additionalAttributes::add);
+            return this;
+        }
+
+        /**
+         * Extends the {@link StaticTableSchema} of a super-class, effectively rolling all the attributes modelled by
+         * the super-class into the {@link StaticTableSchema} of the sub-class.
+         */
+        public Builder<T> extend(StaticTableSchema<? super T> superTableSchema) {
+            Stream<ResolvedStaticAttribute<T>> attributeStream =
+                upcastingTransformForAttributes(superTableSchema.attributeMappers);
+            attributeStream.forEach(this.additionalAttributes::add);
+            return this;
+        }
+
+        /**
+         * Associate one or more {@link StaticTableTag} with this schema. See documentation on the tags themselves to
+         * understand what each one does. This method will overwrite any existing table tags.
+         */
+        public Builder<T> tags(StaticTableTag... staticTableTags) {
+            this.tags = Arrays.asList(staticTableTags);
+            return this;
+        }
+
+        /**
+         * Associate one or more {@link StaticTableTag} with this schema. See documentation on the tags themselves to
+         * understand what each one does. This method will overwrite any existing table tags.
+         */
+        public Builder<T> tags(Collection<StaticTableTag> staticTableTags) {
+            this.tags = new ArrayList<>(staticTableTags);
+            return this;
+        }
+
+        /**
+         * Associates a {@link StaticTableTag} with this schema. See documentation on the tags themselves to understand
+         * what each one does. This method will add the tag to the list of existing table tags.
+         */
+        public Builder<T> addTag(StaticTableTag staticTableTag) {
+            if (this.tags == null) {
+                this.tags = new ArrayList<>();
+            }
+
+            this.tags.add(staticTableTag);
+            return this;
+        }
+
+        /**
+         * Specifies the {@link AttributeConverterProvider}s to use with the table schema.
+         * The list of attribute converter providers must provide {@link AttributeConverter}s for all types used
+         * in the schema. The attribute converter providers will be loaded in the strict order they are supplied here.
+         * <p>
+         * Calling this method will override the default attribute converter provider
+         * {@link DefaultAttributeConverterProvider}, which provides standard converters for most primitive
+         * and common Java types, so that provider must included in the supplied list if it is to be
+         * used. Providing an empty list here will cause no providers to get loaded.
+         * <p>
+         * Adding one custom attribute converter provider and using the default as fallback:
+         * {@code
+         * builder.attributeConverterProviders(customAttributeConverter, AttributeConverterProvider.defaultProvider())
+         * }
+         *
+         * @param attributeConverterProviders a list of attribute converter providers to use with the table schema
+         */
+        public Builder<T> attributeConverterProviders(AttributeConverterProvider... attributeConverterProviders) {
+            this.attributeConverterProviders = Arrays.asList(attributeConverterProviders);
+            return this;
+        }
+
+        /**
+         * Specifies the {@link AttributeConverterProvider}s to use with the table schema.
+         * The list of attribute converter providers must provide {@link AttributeConverter}s for all types used
+         * in the schema. The attribute converter providers will be loaded in the strict order they are supplied here.
+         * <p>
+         * Calling this method will override the default attribute converter provider
+         * {@link DefaultAttributeConverterProvider}, which provides standard converters
+         * for most primitive and common Java types, so that provider must included in the supplied list if it is to be
+         * used. Providing an empty list here will cause no providers to get loaded.
+         * <p>
+         * Adding one custom attribute converter provider and using the default as fallback:
+         * {@code
+         * List<AttributeConverterProvider> providers = new ArrayList<>(
+         *     customAttributeConverter,
+         *     AttributeConverterProvider.defaultProvider());
+         * builder.attributeConverterProviders(providers);
+         * }
+         *
+         * @param attributeConverterProviders a list of attribute converter providers to use with the table schema
+         */
+        public Builder<T> attributeConverterProviders(List<AttributeConverterProvider> attributeConverterProviders) {
+            this.attributeConverterProviders = new ArrayList<>(attributeConverterProviders);
+            return this;
+        }
+
+
+        /**
+         * Builds a {@link StaticTableSchema} based on the values this builder has been configured with
+         */
+        public StaticTableSchema<T> build() {
+            return new StaticTableSchema<>(this);
+        }
+
+        private static <T extends R, R> Stream<ResolvedStaticAttribute<T>> upcastingTransformForAttributes(
+            Collection<ResolvedStaticAttribute<R>> superAttributes) {
+            return superAttributes.stream().map(attribute -> attribute.transform(x -> x, null));
+        }
+    }
+
+    @Override
+    public StaticTableMetadata tableMetadata() {
+        return tableMetadata;
+    }
+
+    @Override
+    public T mapToItem(Map<String, AttributeValue> attributeMap) {
+        // Lazily instantiate the item once we have an attribute to write
+        T item = null;
+
+        for (Map.Entry<String, AttributeValue> entry : attributeMap.entrySet()) {
+            String key = entry.getKey();
+            AttributeValue value = entry.getValue();
+            if (!isNullAttributeValue(value)) {
+                ResolvedStaticAttribute<T> attributeMapper = indexedMappers.get(key);
+
+                if (attributeMapper != null) {
+                    if (item == null) {
+                        item = constructNewItem();
+                    }
+
+                    attributeMapper.updateItemMethod().accept(item, value);
+                }
+            }
+        }
+
+        return item;
+    }
+
+    @Override
+    public Map<String, AttributeValue> itemToMap(T item, boolean ignoreNulls) {
+        Map<String, AttributeValue> attributeValueMap = new HashMap<>();
+
+        attributeMappers.forEach(attributeMapper -> {
+            String attributeKey = attributeMapper.attributeName();
+            AttributeValue attributeValue = attributeMapper.attributeGetterMethod().apply(item);
+
+            if (!ignoreNulls || !isNullAttributeValue(attributeValue)) {
+                attributeValueMap.put(attributeKey, attributeValue);
+            }
+        });
+
+        return unmodifiableMap(attributeValueMap);
+    }
+
+    @Override
+    public Map<String, AttributeValue> itemToMap(T item, Collection<String> attributes) {
+        Map<String, AttributeValue> attributeValueMap = new HashMap<>();
+
+        attributes.forEach(key -> {
+            AttributeValue attributeValue = attributeValue(item, key);
+
+            if (attributeValue == null || !isNullAttributeValue(attributeValue)) {
+                attributeValueMap.put(key, attributeValue);
+            }
+        });
+
+        return unmodifiableMap(attributeValueMap);
+    }
+
+    @Override
+    public AttributeValue attributeValue(T item, String key) {
+        ResolvedStaticAttribute<T> attributeMapper = indexedMappers.get(key);
+
+        if (attributeMapper == null) {
+            throw new IllegalArgumentException(String.format("TableSchema does not know how to retrieve requested "
+                                                             + "attribute '%s' from mapped object.", key));
+        }
+
+        AttributeValue attributeValue = attributeMapper.attributeGetterMethod().apply(item);
+
+        return isNullAttributeValue(attributeValue) ? null : attributeValue;
+    }
+
+    @Override
+    public EnhancedType<T> itemType() {
+        return this.itemType;
+    }
+
+    /**
+     * The table schema {@link AttributeConverterProvider}.
+     * @see Builder#attributeConverterProvider
+     */
+    public AttributeConverterProvider attributeConverterProvider() {
+        return this.attributeConverterProvider;
+    }
+
+    private T constructNewItem() {
+        if (newItemSupplier == null) {
+            throw new UnsupportedOperationException("An abstract TableSchema cannot be used to map a database record "
+                                                    + "to a concrete object. Add a 'newItemSupplier' to the "
+                                                    + "TableSchema to give it the ability to create mapped objects.");
+        }
+
+        return newItemSupplier.get();
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/mapper/StaticTableTag.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/mapper/StaticTableTag.java
new file mode 100644
index 000000000000..f8657e0649d8
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/mapper/StaticTableTag.java
@@ -0,0 +1,36 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.mapper;
+
+import java.util.function.Consumer;
+import software.amazon.awssdk.annotations.SdkPublicApi;
+
+/**
+ * Interface for a tag that can be applied to any {@link StaticTableSchema}. When the table schema is instantiated,
+ * the table metadata stored on the schema will be updated by calling the {@link #modifyMetadata()} method for every tag
+ * associated with the table.
+ */
+@SdkPublicApi
+public interface StaticTableTag {
+    /**
+     * A function that modifies an existing {@link StaticTableSchema.Builder} when this tag is applied to a table. This
+     * will be used by the {@link StaticTableSchema} to capture all the metadata associated with tags that have been
+     * applied to the table.
+     *
+     * @return a consumer that modifies an existing {@link StaticTableSchema.Builder}.
+     */
+    Consumer<StaticTableMetadata.Builder> modifyMetadata();
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/mapper/annotations/BeanTableSchemaAttributeTag.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/mapper/annotations/BeanTableSchemaAttributeTag.java
new file mode 100644
index 000000000000..ed09ae10e6ba
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/mapper/annotations/BeanTableSchemaAttributeTag.java
@@ -0,0 +1,45 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.mapper.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import software.amazon.awssdk.annotations.SdkPublicApi;
+import software.amazon.awssdk.enhanced.dynamodb.internal.mapper.BeanTableSchemaAttributeTags;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.BeanTableSchema;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.StaticAttributeTag;
+
+/**
+ * This meta-annotation is not used directly in DynamoDb beans, it is used to annotate other annotations that are
+ * used with DynamoDb beans. You should use this meta-annotation if you are creating new annotations for the
+ * BeanTableSchema.
+ *
+ * Meta-annotation for BeanTableSchema annotations that are used to assign an {@link StaticAttributeTag} to a property on the
+ * bean. When an annotation that is annotated with this meta-annotation is found on a property being scanned by the
+ * {@link BeanTableSchema} then a static method
+ * named 'attributeTagFor' will be invoked passing in a single argument which is the property annotation itself.
+ *
+ * See {@link BeanTableSchemaAttributeTags} for an example of how to implement the {@link StaticAttributeTag} suppliers for
+ * bean mapper annotations.
+ */
+@Target({ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@SdkPublicApi
+public @interface BeanTableSchemaAttributeTag {
+    Class<?> value();
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/mapper/annotations/DynamoDbAttribute.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/mapper/annotations/DynamoDbAttribute.java
new file mode 100644
index 000000000000..50d78b3f962f
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/mapper/annotations/DynamoDbAttribute.java
@@ -0,0 +1,37 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.mapper.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import software.amazon.awssdk.annotations.SdkPublicApi;
+
+/**
+ * Used to explicitly designate a field or getter or setter to participate as an attribute in the mapped database
+ * object with a custom name. A string value must be specified to specify a different name for the attribute than the
+ * mapper would automatically infer using a naming strategy.
+ */
+@Target({ElementType.METHOD})
+@Retention(RetentionPolicy.RUNTIME)
+@SdkPublicApi
+public @interface DynamoDbAttribute {
+    /**
+     * The attribute name that this property should map to in the DynamoDb record. The value is case sensitive.
+     */
+    String value();
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/mapper/annotations/DynamoDbBean.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/mapper/annotations/DynamoDbBean.java
new file mode 100644
index 000000000000..5a5a28294938
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/mapper/annotations/DynamoDbBean.java
@@ -0,0 +1,59 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.mapper.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import software.amazon.awssdk.annotations.SdkPublicApi;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeConverterProvider;
+import software.amazon.awssdk.enhanced.dynamodb.DefaultAttributeConverterProvider;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.BeanTableSchema;
+
+/**
+ * Class level annotation that identifies this class as being a DynamoDb mappable entity. Any class used to initialize
+ * a {@link BeanTableSchema} must have this annotation. If a class is used as a document within another DynamoDbBean,
+ * it will also require this annotation.
+ * <p>
+ * <b>Attribute Converter Providers</b><br>
+ * Using {@link AttributeConverterProvider}s is optional and, if used, the supplied provider supersedes the default
+ * converter provided by the table schema.
+ * <p>
+ * Note:
+ * <ul>
+ *     <li>The converter(s) must provide {@link AttributeConverter}s for all types used in the schema. </li>
+ *     <li>The table schema DefaultAttributeConverterProvider provides standard converters for most primitive
+ *     and common Java types. Use custom AttributeConverterProviders when you have specific needs for type conversion
+ *     that the defaults do not cover.</li>
+ *     <li>If you provide a list of attribute converter providers, you can add DefaultAttributeConverterProvider
+ *     to the end of the list to fall back on the defaults.</li>
+ *     <li>Providing an empty list {} will cause no providers to get loaded.</li>
+ * </ul>
+ *
+ * Example using attribute converter providers with one custom provider and the default provider:
+ * {@code
+ * (converterProviders = {CustomAttributeConverter.class, DefaultAttributeConverterProvider.class});
+ * }
+ */
+@Target({ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@SdkPublicApi
+public @interface DynamoDbBean {
+    Class<? extends AttributeConverterProvider>[] converterProviders()
+            default { DefaultAttributeConverterProvider.class };
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/mapper/annotations/DynamoDbConvertedBy.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/mapper/annotations/DynamoDbConvertedBy.java
new file mode 100644
index 000000000000..8c4d15e739b3
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/mapper/annotations/DynamoDbConvertedBy.java
@@ -0,0 +1,37 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.mapper.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import software.amazon.awssdk.annotations.SdkPublicApi;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeConverterProvider;
+
+/**
+ * Associates a custom {@link AttributeConverter} with this attribute. This annotation is optional and takes
+ * precedence over any converter for this type provided by the table schema {@link AttributeConverterProvider}
+ * if it exists. Use custom AttributeConverterProvider when you have specific needs for type conversion
+ * that the defaults do not cover.
+ */
+@Target({ElementType.METHOD})
+@Retention(RetentionPolicy.RUNTIME)
+@SdkPublicApi
+public @interface DynamoDbConvertedBy {
+    Class<? extends AttributeConverter> value();
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/mapper/annotations/DynamoDbFlatten.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/mapper/annotations/DynamoDbFlatten.java
new file mode 100644
index 000000000000..891bce60874e
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/mapper/annotations/DynamoDbFlatten.java
@@ -0,0 +1,34 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.mapper.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import software.amazon.awssdk.annotations.SdkPublicApi;
+
+/**
+ * This annotation is used to flatten all the attributes of a separate DynamoDb bean that is stored in the current bean
+ * object and add them as top level attributes to the record that is read and written to the database. The target bean
+ * to flatten must be specified as part of this annotation.
+ */
+@Target({ElementType.METHOD})
+@Retention(RetentionPolicy.RUNTIME)
+@SdkPublicApi
+public @interface DynamoDbFlatten {
+    Class<?> dynamoDbBeanClass();
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/mapper/annotations/DynamoDbIgnore.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/mapper/annotations/DynamoDbIgnore.java
new file mode 100644
index 000000000000..79c34616cce2
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/mapper/annotations/DynamoDbIgnore.java
@@ -0,0 +1,31 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.mapper.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import software.amazon.awssdk.annotations.SdkPublicApi;
+
+/**
+ * Opts this attribute out of participating in the table schema. It will be completely ignored by the mapper.
+ */
+@Target({ElementType.METHOD})
+@Retention(RetentionPolicy.RUNTIME)
+@SdkPublicApi
+public @interface DynamoDbIgnore {
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/mapper/annotations/DynamoDbPartitionKey.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/mapper/annotations/DynamoDbPartitionKey.java
new file mode 100644
index 000000000000..a9c1e59c5561
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/mapper/annotations/DynamoDbPartitionKey.java
@@ -0,0 +1,34 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.mapper.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import software.amazon.awssdk.annotations.SdkPublicApi;
+import software.amazon.awssdk.enhanced.dynamodb.internal.mapper.BeanTableSchemaAttributeTags;
+
+/**
+ * Denotes this attribute as being the primary partition key of the DynamoDb table. This attribute must map to a
+ * DynamoDb scalar type (string, number or binary) to be valid. Every mapped table schema must have exactly one of these.
+ */
+@SdkPublicApi
+@Target({ElementType.METHOD})
+@Retention(RetentionPolicy.RUNTIME)
+@BeanTableSchemaAttributeTag(BeanTableSchemaAttributeTags.class)
+public @interface DynamoDbPartitionKey {
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/mapper/annotations/DynamoDbSecondaryPartitionKey.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/mapper/annotations/DynamoDbSecondaryPartitionKey.java
new file mode 100644
index 000000000000..01f285f4d47d
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/mapper/annotations/DynamoDbSecondaryPartitionKey.java
@@ -0,0 +1,39 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.mapper.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import software.amazon.awssdk.annotations.SdkPublicApi;
+import software.amazon.awssdk.enhanced.dynamodb.internal.mapper.BeanTableSchemaAttributeTags;
+
+/**
+ * Denotes a partition key for a global secondary index. You must also specify at least one index name, although this
+ * name is only referenced internally by the enhanced client to disambiguate the index and does not actually need to
+ * match the real name of the index.
+ */
+@SdkPublicApi
+@Target({ElementType.METHOD})
+@Retention(RetentionPolicy.RUNTIME)
+@BeanTableSchemaAttributeTag(BeanTableSchemaAttributeTags.class)
+public @interface DynamoDbSecondaryPartitionKey {
+    /**
+     * The names of one or more global secondary indices that this partition key should participate in.
+     */
+    String[] indexNames();
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/mapper/annotations/DynamoDbSecondarySortKey.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/mapper/annotations/DynamoDbSecondarySortKey.java
new file mode 100644
index 000000000000..a39b982b4980
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/mapper/annotations/DynamoDbSecondarySortKey.java
@@ -0,0 +1,40 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.mapper.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import software.amazon.awssdk.annotations.SdkPublicApi;
+import software.amazon.awssdk.enhanced.dynamodb.internal.mapper.BeanTableSchemaAttributeTags;
+
+/**
+ * Denotes an optional sort key for a global or local secondary index. You must also specify the index name which in the
+ * case of a global secondary index must match the index name supplied with the secondary partition key for the same
+ * index. This name is only referenced internally by the enhanced client to disambiguate the index and does not actually
+ * need to match the real name of the index.
+ */
+@SdkPublicApi
+@Target({ElementType.METHOD})
+@Retention(RetentionPolicy.RUNTIME)
+@BeanTableSchemaAttributeTag(BeanTableSchemaAttributeTags.class)
+public @interface DynamoDbSecondarySortKey {
+    /**
+     * The names of one or more local or global secondary indices that this sort key should participate in.
+     */
+    String[] indexNames();
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/mapper/annotations/DynamoDbSortKey.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/mapper/annotations/DynamoDbSortKey.java
new file mode 100644
index 000000000000..de64ab181deb
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/mapper/annotations/DynamoDbSortKey.java
@@ -0,0 +1,34 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.mapper.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import software.amazon.awssdk.annotations.SdkPublicApi;
+import software.amazon.awssdk.enhanced.dynamodb.internal.mapper.BeanTableSchemaAttributeTags;
+
+/**
+ * Denotes this attribute as being the optional primary sort key of the DynamoDb table. This attribute must map to a
+ * DynamoDb scalar type (string, number or binary) to be valid.
+ */
+@SdkPublicApi
+@Target({ElementType.METHOD})
+@Retention(RetentionPolicy.RUNTIME)
+@BeanTableSchemaAttributeTag(BeanTableSchemaAttributeTags.class)
+public @interface DynamoDbSortKey {
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/model/BatchGetItemEnhancedRequest.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/model/BatchGetItemEnhancedRequest.java
new file mode 100644
index 000000000000..0ae91348ef90
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/model/BatchGetItemEnhancedRequest.java
@@ -0,0 +1,136 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.model;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import software.amazon.awssdk.annotations.SdkPublicApi;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClient;
+
+/**
+ * Defines parameters used for the batchGetItem() operation (such as
+ * {@link DynamoDbEnhancedClient#batchGetItem(BatchGetItemEnhancedRequest)}).
+ * <p>
+ * A request contains references to keys and tables organized into one {@link ReadBatch} object per queried table.
+ */
+@SdkPublicApi
+public final class BatchGetItemEnhancedRequest {
+
+    private final List<ReadBatch> readBatches;
+
+    private BatchGetItemEnhancedRequest(Builder builder) {
+        this.readBatches = getListIfExist(builder.readBatches);
+    }
+
+    /**
+     * Creates a newly initialized builder for a request object.
+     */
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    /**
+     * Returns a builder initialized with all existing values on the request object.
+     */
+    public Builder toBuilder() {
+        return new Builder().readBatches(readBatches);
+    }
+
+    /**
+     * Returns the collection of {@link ReadBatch} in this request object.
+     */
+    public Collection<ReadBatch> readBatches() {
+        return readBatches;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        BatchGetItemEnhancedRequest that = (BatchGetItemEnhancedRequest) o;
+
+        return readBatches != null ? readBatches.equals(that.readBatches) : that.readBatches == null;
+    }
+
+    @Override
+    public int hashCode() {
+        return readBatches != null ? readBatches.hashCode() : 0;
+    }
+
+    private static List<ReadBatch> getListIfExist(List<ReadBatch> readBatches) {
+        return readBatches != null ? Collections.unmodifiableList(readBatches) : null;
+    }
+
+    /**
+     * A builder that is used to create a request with the desired parameters.
+     */
+    public static final class Builder {
+        private List<ReadBatch> readBatches;
+
+        private Builder() {
+        }
+
+        /**
+         * Sets a collection of read batches to use in the batchGetItem operation.
+         *
+         * @param readBatches the collection of read batches
+         * @return a builder of this type
+         */
+        public Builder readBatches(Collection<ReadBatch> readBatches) {
+            this.readBatches = readBatches != null ? new ArrayList<>(readBatches) : null;
+            return this;
+        }
+
+        /**
+         * Sets one or more read batches to use in the batchGetItem operation.
+         *
+         * @param readBatches one or more {@link ReadBatch}, separated by comma.
+         * @return a builder of this type
+         */
+        public Builder readBatches(ReadBatch... readBatches) {
+            this.readBatches = Arrays.asList(readBatches);
+            return this;
+        }
+
+        /**
+         * Adds a read batch to the collection of batches on this builder.
+         * If this is the first batch, the method creates a new list.
+         *
+         * @param readBatch a single read batch
+         * @return a builder of this type
+         */
+        public Builder addReadBatch(ReadBatch readBatch) {
+            if (readBatches == null) {
+                readBatches = new ArrayList<>();
+            }
+            readBatches.add(readBatch);
+            return this;
+        }
+
+        public BatchGetItemEnhancedRequest build() {
+            return new BatchGetItemEnhancedRequest(this);
+        }
+    }
+
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/model/BatchGetResultPage.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/model/BatchGetResultPage.java
new file mode 100644
index 000000000000..6bc5877fb2dd
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/model/BatchGetResultPage.java
@@ -0,0 +1,115 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.model;
+
+import static java.util.Collections.emptyList;
+import static software.amazon.awssdk.enhanced.dynamodb.internal.EnhancedClientUtils.readAndTransformSingleItem;
+
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import software.amazon.awssdk.annotations.SdkPublicApi;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClient;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClientExtension;
+import software.amazon.awssdk.enhanced.dynamodb.MappedTableResource;
+import software.amazon.awssdk.enhanced.dynamodb.internal.operations.OperationContext;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+import software.amazon.awssdk.services.dynamodb.model.BatchGetItemResponse;
+
+/**
+ * Defines one result page with retrieved items in the result of a batchGetItem() operation, such as
+ * {@link DynamoDbEnhancedClient#batchGetItem(BatchGetItemEnhancedRequest)}.
+ * <p>
+ * Use the {@link #resultsForTable(MappedTableResource)} method once for each table present in the request
+ * to retrieve items from that table in the page.
+ */
+@SdkPublicApi
+public final class BatchGetResultPage {
+    private final BatchGetItemResponse batchGetItemResponse;
+    private final DynamoDbEnhancedClientExtension dynamoDbEnhancedClientExtension;
+
+    private BatchGetResultPage(Builder builder) {
+        this.batchGetItemResponse = builder.batchGetItemResponse;
+        this.dynamoDbEnhancedClientExtension = builder.dynamoDbEnhancedClientExtension;
+    }
+
+    /**
+     * Creates a newly initialized builder for a result object.
+     */
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    /**
+     * Retrieve all items on this result page belonging to the supplied table. Call this method once for each table present in the
+     * batch request.
+     *
+     * @param mappedTable the table to retrieve items for
+     * @param <T> the type of the table items
+     * @return a list of items
+     */
+    public <T> List<T> resultsForTable(MappedTableResource<T> mappedTable) {
+        List<Map<String, AttributeValue>> results =
+            batchGetItemResponse.responses()
+                                .getOrDefault(mappedTable.tableName(), emptyList());
+
+        return results.stream()
+                      .map(itemMap -> readAndTransformSingleItem(itemMap,
+                                                                 mappedTable.tableSchema(),
+                                                                 OperationContext.create(mappedTable.tableName()),
+                                                                 dynamoDbEnhancedClientExtension))
+                      .collect(Collectors.toList());
+    }
+
+    /**
+     * A builder that is used to create a result object with the desired parameters.
+     */
+    public static final class Builder {
+
+        private BatchGetItemResponse batchGetItemResponse;
+        private DynamoDbEnhancedClientExtension dynamoDbEnhancedClientExtension;
+
+        private Builder() {
+        }
+
+        /**
+         * Adds a response to the result object. Required.
+         *
+         * @param batchGetItemResponse
+         * @return a builder of this type
+         */
+        public Builder batchGetItemResponse(BatchGetItemResponse batchGetItemResponse) {
+            this.batchGetItemResponse = batchGetItemResponse;
+            return this;
+        }
+
+        /**
+         * Adds a mapper extension that can be used to modify the values read from the database.
+         * @see DynamoDbEnhancedClientExtension
+         *
+         * @param dynamoDbEnhancedClientExtension the supplied mapper extension
+         * @return a builder of this type
+         */
+        public Builder mapperExtension(DynamoDbEnhancedClientExtension dynamoDbEnhancedClientExtension) {
+            this.dynamoDbEnhancedClientExtension = dynamoDbEnhancedClientExtension;
+            return this;
+        }
+
+        public BatchGetResultPage build() {
+            return new BatchGetResultPage(this);
+        }
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/model/BatchGetResultPageIterable.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/model/BatchGetResultPageIterable.java
new file mode 100644
index 000000000000..5a68e3fba8b5
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/model/BatchGetResultPageIterable.java
@@ -0,0 +1,74 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.model;
+
+import software.amazon.awssdk.annotations.SdkPublicApi;
+import software.amazon.awssdk.core.pagination.sync.PaginatedItemsIterable;
+import software.amazon.awssdk.core.pagination.sync.SdkIterable;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClient;
+import software.amazon.awssdk.enhanced.dynamodb.MappedTableResource;
+
+/**
+ * Defines the result of {@link DynamoDbEnhancedClient#batchGetItem} operation.
+ *
+ * <p>
+ * The result can be accessed either through iterable {@link BatchGetResultPage}s or flattened items
+ * across <b>all</b>  pages via {@link #resultsForTable}
+ *
+ * <p>
+ * Example:
+ * <p>
+ * 1) Iterating through pages
+ *
+ * <pre>
+ * {@code
+ * batchResults.forEach(page -> {
+ *     page.resultsForTable(firstItemTable).forEach(item -> System.out.println(item));
+ *     page.resultsForTable(secondItemTable).forEach(item -> System.out.println(item));
+ * });
+ * }
+ * </pre>
+ *
+ * 2) Iterating through items across all pages
+ *
+ * <pre>
+ * {@code
+ * results.resultsForTable(firstItemTable).forEach(item -> System.out.println(item));
+ * results.resultsForTable(secondItemTable).forEach(item -> System.out.println(item));
+ * }
+ * </pre>
+ */
+@SdkPublicApi
+public interface BatchGetResultPageIterable extends SdkIterable<BatchGetResultPage> {
+
+    static BatchGetResultPageIterable create(SdkIterable<BatchGetResultPage> pageIterable) {
+        return pageIterable::iterator;
+    }
+
+    /**
+     * Retrieve all items belonging to the supplied table across <b>all</b> pages.
+     *
+     * @param mappedTable the table to retrieve items for
+     * @param <T> the type of the table items
+     * @return iterable items
+     */
+    default <T> SdkIterable<T> resultsForTable(MappedTableResource<T> mappedTable) {
+        return PaginatedItemsIterable.<BatchGetResultPage, T>builder()
+            .pagesIterable(this)
+            .itemIteratorFunction(page -> page.resultsForTable(mappedTable).iterator())
+            .build();
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/model/BatchGetResultPagePublisher.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/model/BatchGetResultPagePublisher.java
new file mode 100644
index 000000000000..9ce93dbe4118
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/model/BatchGetResultPagePublisher.java
@@ -0,0 +1,75 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.model;
+
+import software.amazon.awssdk.annotations.SdkPublicApi;
+import software.amazon.awssdk.core.async.SdkPublisher;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedAsyncClient;
+import software.amazon.awssdk.enhanced.dynamodb.MappedTableResource;
+
+/**
+ * Defines the result of {@link DynamoDbEnhancedAsyncClient#batchGetItem} operation.
+ *
+ * <p>
+ * You can either subscribe to the {@link BatchGetResultPage}s or flattened items across <b>all</b> pages via
+ * {@link #resultsForTable(MappedTableResource)}.
+ *
+ * Example:
+ * <p>
+ * 1) Subscribing to {@link BatchGetResultPage}s
+ * <pre>
+ * {@code
+ * batchGetResultPagePublisher.subscribe(page -> {
+ *     page.resultsForTable(firstItemTable).forEach(item -> System.out.println(item));
+ *     page.resultsForTable(secondItemTable).forEach(item -> System.out.println(item));
+ * });
+ * }
+ * </pre>
+ *
+ * <p>
+ * 2) Subscribing to results across all pages.
+ * <pre>
+ * {@code
+ * batchGetResultPagePublisher.resultsForTable(firstItemTable).subscribe(item -> System.out.println(item));
+ * batchGetResultPagePublisher.resultsForTable(secondItemTable).subscribe(item -> System.out.println(item));
+ * }
+ * </pre>
+ */
+@SdkPublicApi
+public interface BatchGetResultPagePublisher extends SdkPublisher<BatchGetResultPage> {
+
+    /**
+     * Creates a flattened items publisher with the underlying page publisher.
+     */
+    static BatchGetResultPagePublisher create(SdkPublisher<BatchGetResultPage> publisher) {
+        return publisher::subscribe;
+    }
+
+    /**
+     * Returns a publisher that can be used to request a stream of results belonging to the supplied table across all pages.
+     *
+     * <p>
+     * This method is useful if you are interested in subscribing to the items in all response pages
+     * instead of the top level pages.
+     *
+     * @param mappedTable the table to retrieve items for
+     * @param <T> the type of the table items
+     * @return a {@link SdkPublisher}
+     */
+    default <T> SdkPublisher<T> resultsForTable(MappedTableResource<T> mappedTable) {
+        return this.flatMapIterable(p -> p.resultsForTable(mappedTable));
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/model/BatchWriteItemEnhancedRequest.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/model/BatchWriteItemEnhancedRequest.java
new file mode 100644
index 000000000000..9f882d87e771
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/model/BatchWriteItemEnhancedRequest.java
@@ -0,0 +1,137 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.model;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import software.amazon.awssdk.annotations.SdkPublicApi;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClient;
+
+/**
+ * Defines parameters used for the batchWriteItem() operation (such as
+ * {@link DynamoDbEnhancedClient#batchWriteItem(BatchWriteItemEnhancedRequest)}).
+ * <p>
+ * A request contains references to keys for delete actions and items for put actions,
+ * organized into one {@link WriteBatch} object per accessed table.
+ */
+@SdkPublicApi
+public final class BatchWriteItemEnhancedRequest {
+
+    private final List<WriteBatch> writeBatches;
+
+    private BatchWriteItemEnhancedRequest(Builder builder) {
+        this.writeBatches = getListIfExist(builder.writeBatches);
+    }
+
+    /**
+     * Creates a newly initialized builder for a request object.
+     */
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    /**
+     * Returns a builder initialized with all existing values on the request object.
+     */
+    public Builder toBuilder() {
+        return new Builder().writeBatches(writeBatches);
+    }
+
+    /**
+     * Returns the collection of {@link WriteBatch} in this request object.
+     */
+    public Collection<WriteBatch> writeBatches() {
+        return writeBatches;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        BatchWriteItemEnhancedRequest that = (BatchWriteItemEnhancedRequest) o;
+
+        return writeBatches != null ? writeBatches.equals(that.writeBatches) : that.writeBatches == null;
+    }
+
+    @Override
+    public int hashCode() {
+        return writeBatches != null ? writeBatches.hashCode() : 0;
+    }
+
+    private static List<WriteBatch> getListIfExist(List<WriteBatch> writeBatches) {
+        return writeBatches != null ? Collections.unmodifiableList(writeBatches) : null;
+    }
+
+    /**
+     * A builder that is used to create a request with the desired parameters.
+     */
+    public static final class Builder {
+        private List<WriteBatch> writeBatches;
+
+        private Builder() {
+        }
+
+        /**
+         * Sets a collection of write batches to use in the batchWriteItem operation.
+         *
+         * @param writeBatches the collection of write batches
+         * @return a builder of this type
+         */
+        public Builder writeBatches(Collection<WriteBatch> writeBatches) {
+            this.writeBatches = writeBatches != null ? new ArrayList<>(writeBatches) : null;
+            return this;
+        }
+
+        /**
+         * Sets one or more write batches to use in the batchWriteItem operation.
+         *
+         * @param writeBatches one or more {@link WriteBatch}, separated by comma.
+         * @return a builder of this type
+         */
+        public Builder writeBatches(WriteBatch... writeBatches) {
+            this.writeBatches = Arrays.asList(writeBatches);
+            return this;
+        }
+
+        /**
+         * Adds a write batch to the collection of batches on this builder.
+         * If this is the first batch, the method creates a new list.
+         *
+         * @param writeBatch a single write batch
+         * @return a builder of this type
+         */
+        public Builder addWriteBatch(WriteBatch writeBatch) {
+            if (writeBatches == null) {
+                writeBatches = new ArrayList<>();
+            }
+            writeBatches.add(writeBatch);
+            return this;
+        }
+
+        public BatchWriteItemEnhancedRequest build() {
+            return new BatchWriteItemEnhancedRequest(this);
+        }
+    }
+
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/model/BatchWriteResult.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/model/BatchWriteResult.java
new file mode 100644
index 000000000000..68278707b69d
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/model/BatchWriteResult.java
@@ -0,0 +1,137 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.model;
+
+import static software.amazon.awssdk.enhanced.dynamodb.internal.EnhancedClientUtils.createKeyFromMap;
+import static software.amazon.awssdk.enhanced.dynamodb.internal.EnhancedClientUtils.readAndTransformSingleItem;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import software.amazon.awssdk.annotations.SdkPublicApi;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClient;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbTable;
+import software.amazon.awssdk.enhanced.dynamodb.Key;
+import software.amazon.awssdk.enhanced.dynamodb.TableMetadata;
+import software.amazon.awssdk.enhanced.dynamodb.internal.operations.OperationContext;
+import software.amazon.awssdk.services.dynamodb.model.DeleteRequest;
+import software.amazon.awssdk.services.dynamodb.model.PutRequest;
+import software.amazon.awssdk.services.dynamodb.model.WriteRequest;
+
+/**
+ * Defines the result of the batchWriteItem() operation, such as
+ * {@link DynamoDbEnhancedClient#batchWriteItem(BatchWriteItemEnhancedRequest)}. The result describes any unprocessed items
+ * after the operation completes.
+ * <ul>
+ *     <li>Use the {@link #unprocessedPutItemsForTable(DynamoDbTable)} method once for each table present in the request
+ *  to get any unprocessed items from a put action on that table.</li>
+ *     <li>Use the {@link #unprocessedDeleteItemsForTable(DynamoDbTable)} method once for each table present in the request
+ *  to get any unprocessed items from a delete action on that table.</li>
+ * </ul>
+ *
+ */
+@SdkPublicApi
+public final class BatchWriteResult {
+    private final Map<String, List<WriteRequest>> unprocessedRequests;
+
+    private BatchWriteResult(Builder builder) {
+        this.unprocessedRequests = Collections.unmodifiableMap(builder.unprocessedRequests);
+    }
+
+    /**
+     * Creates a newly initialized builder for a request object.
+     */
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    /**
+     * Retrieve any unprocessed put action items belonging to the supplied table from the result .
+     * Call this method once for each table present in the batch request.
+     *
+     * @param mappedTable the table to retrieve unprocessed items for
+     * @param <T> the type of the table items
+     * @return a list of items
+     */
+    public <T> List<T> unprocessedPutItemsForTable(DynamoDbTable<T> mappedTable) {
+        List<WriteRequest> writeRequests =
+            unprocessedRequests.getOrDefault(mappedTable.tableName(),
+                                             Collections.emptyList());
+
+        return writeRequests.stream()
+                            .filter(writeRequest -> writeRequest.putRequest() != null)
+                            .map(WriteRequest::putRequest)
+                            .map(PutRequest::item)
+                            .map(item -> readAndTransformSingleItem(item,
+                                                                    mappedTable.tableSchema(),
+                                                                    OperationContext.create(mappedTable.tableName()),
+                                                                    mappedTable.mapperExtension()))
+                            .collect(Collectors.toList());
+    }
+
+    /**
+     * Retrieve any unprocessed delete action keys belonging to the supplied table from the result.
+     * Call this method once for each table present in the batch request.
+     *
+     * @param mappedTable the table to retrieve unprocessed items for.
+     * @return a list of keys that were not processed as part of the batch request.
+     */
+    public List<Key> unprocessedDeleteItemsForTable(DynamoDbTable<?> mappedTable) {
+        List<WriteRequest> writeRequests =
+            unprocessedRequests.getOrDefault(mappedTable.tableName(),
+                                             Collections.emptyList());
+
+        return writeRequests.stream()
+                            .filter(writeRequest -> writeRequest.deleteRequest() != null)
+                            .map(WriteRequest::deleteRequest)
+                            .map(DeleteRequest::key)
+                            .map(itemMap -> createKeyFromMap(itemMap,
+                                                             mappedTable.tableSchema(),
+                                                             TableMetadata.primaryIndexName()))
+                            .collect(Collectors.toList());
+    }
+
+    /**
+     * A builder that is used to create a result with the desired parameters.
+     */
+    public static final class Builder {
+        private Map<String, List<WriteRequest>> unprocessedRequests;
+
+        private Builder() {
+        }
+
+        /**
+         * Add a map of unprocessed requests to this result object.
+         *
+         * @param unprocessedRequests the map of table to write request representing the unprocessed requests
+         * @return a builder of this type
+         */
+        public Builder unprocessedRequests(Map<String, List<WriteRequest>> unprocessedRequests) {
+            this.unprocessedRequests =
+                unprocessedRequests.entrySet()
+                                   .stream()
+                                   .collect(Collectors.toMap(
+                                       Map.Entry::getKey,
+                                       entry -> Collections.unmodifiableList(entry.getValue())));
+            return this;
+        }
+
+        public BatchWriteResult build() {
+            return new BatchWriteResult(this);
+        }
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/model/ConditionCheck.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/model/ConditionCheck.java
new file mode 100644
index 000000000000..25d50c572644
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/model/ConditionCheck.java
@@ -0,0 +1,176 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.model;
+
+import java.util.function.Consumer;
+import software.amazon.awssdk.annotations.SdkPublicApi;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClient;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClientExtension;
+import software.amazon.awssdk.enhanced.dynamodb.Expression;
+import software.amazon.awssdk.enhanced.dynamodb.Key;
+import software.amazon.awssdk.enhanced.dynamodb.TableSchema;
+import software.amazon.awssdk.enhanced.dynamodb.internal.operations.OperationContext;
+import software.amazon.awssdk.enhanced.dynamodb.internal.operations.TransactableWriteOperation;
+import software.amazon.awssdk.services.dynamodb.model.TransactWriteItem;
+
+/**
+ * Use ConditionCheck as a part of the composite operation transactGetItems (for example
+ * {@link DynamoDbEnhancedClient#transactGetItems(TransactGetItemsEnhancedRequest)}) to determine
+ * if the other actions that are part of the same transaction should take effect.
+ * <p>
+ * A valid ConditionCheck object should contain a reference to the primary key of the table that finds items with a matching key,
+ * together with a condition (of type {@link Expression}) to evaluate the primary key.
+ *
+ * @param <T> The type of the modelled object.
+ */
+@SdkPublicApi
+public final class ConditionCheck<T> implements TransactableWriteOperation<T> {
+    private final Key key;
+    private final Expression conditionExpression;
+
+    private ConditionCheck(Key key, Expression conditionExpression) {
+        this.key = key;
+        this.conditionExpression = conditionExpression;
+    }
+
+    /**
+     * Creates a newly initialized builder for this object.
+     */
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    /**
+     * Returns a builder initialized with all existing values on the object.
+     */
+    public Builder toBuilder() {
+        return new Builder().key(key).conditionExpression(conditionExpression);
+    }
+
+    @Override
+    public TransactWriteItem generateTransactWriteItem(TableSchema<T> tableSchema,
+                                                       OperationContext operationContext,
+                                                       DynamoDbEnhancedClientExtension dynamoDbEnhancedClientExtension) {
+        software.amazon.awssdk.services.dynamodb.model.ConditionCheck conditionCheck =
+            software.amazon.awssdk.services.dynamodb.model.ConditionCheck
+                .builder()
+                .tableName(operationContext.tableName())
+                .key(key.keyMap(tableSchema, operationContext.indexName()))
+                .conditionExpression(conditionExpression.expression())
+                .expressionAttributeNames(conditionExpression.expressionNames())
+                .expressionAttributeValues(conditionExpression.expressionValues())
+                .build();
+
+        return TransactWriteItem.builder()
+                                .conditionCheck(conditionCheck)
+                                .build();
+    }
+
+    /**
+     * Returns the primary {@link Key} that the condition is valid for, or null if it doesn't exist.
+     */
+    public Key key() {
+        return key;
+    }
+
+    /**
+     * Returns the condition {@link Expression} set on this object, or null if it doesn't exist.
+     */
+    public Expression conditionExpression() {
+        return conditionExpression;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        ConditionCheck<?> that = (ConditionCheck<?>) o;
+
+        if (key != null ? ! key.equals(that.key) : that.key != null) {
+            return false;
+        }
+        return conditionExpression != null ? conditionExpression.equals(that.conditionExpression) :
+            that.conditionExpression == null;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = key != null ? key.hashCode() : 0;
+        result = 31 * result + (conditionExpression != null ? conditionExpression.hashCode() : 0);
+        return result;
+    }
+
+    /**
+     * A builder that is used to create a condition check with the desired parameters.
+     * <p>
+     * A valid builder must define both a {@link Key} and an {@link Expression}.
+     */
+    public static final class Builder  {
+        private Key key;
+        private Expression conditionExpression;
+
+        private Builder() {
+        }
+
+        /**
+         * Sets the primary {@link Key} that will be used together with the condition expression.
+         *
+         * @param key the primary key to use in the operation.
+         * @return a builder of this type
+         */
+        public Builder key(Key key) {
+            this.key = key;
+            return this;
+        }
+
+        /**
+         * Sets the primary {@link Key} that will be used together with the condition expression
+         * on the builder by accepting a consumer of {@link Key.Builder}.
+         *
+         * @param keyConsumer a {@link Consumer} of {@link Key}
+         * @return a builder of this type
+         */
+        public Builder key(Consumer<Key.Builder> keyConsumer) {
+            Key.Builder builder = Key.builder();
+            keyConsumer.accept(builder);
+            return key(builder.build());
+        }
+
+        /**
+         * Defines a logical expression on the attributes of table items that match the supplied primary key value(s).
+         * If the expression evaluates to true, the transaction operation succeeds. If the expression evaluates to false,
+         * the transaction will not succeed.
+         * <p>
+         * See {@link Expression} for condition syntax and examples.
+         *
+         * @param conditionExpression a condition written as an {@link Expression}
+         * @return a builder of this type
+         */
+        public Builder conditionExpression(Expression conditionExpression) {
+            this.conditionExpression = conditionExpression;
+            return this;
+        }
+
+        public <T> ConditionCheck<T> build() {
+            return new ConditionCheck<>(key, conditionExpression);
+        }
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/model/CreateTableEnhancedRequest.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/model/CreateTableEnhancedRequest.java
new file mode 100644
index 000000000000..dec594772557
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/model/CreateTableEnhancedRequest.java
@@ -0,0 +1,179 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.model;
+
+import java.util.Arrays;
+import java.util.Collection;
+import software.amazon.awssdk.annotations.SdkPublicApi;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbAsyncTable;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbTable;
+import software.amazon.awssdk.services.dynamodb.model.ProvisionedThroughput;
+
+/**
+ * Defines parameters used to create a DynamoDb table using the createTable() operation (such as
+ * {@link DynamoDbTable#createTable(CreateTableEnhancedRequest)} or
+ * {@link DynamoDbAsyncTable#createTable(CreateTableEnhancedRequest)}).
+ * <p>
+ * All parameters are optional.
+ */
+@SdkPublicApi
+public final class CreateTableEnhancedRequest {
+    private final ProvisionedThroughput provisionedThroughput;
+    private final Collection<EnhancedLocalSecondaryIndex> localSecondaryIndices;
+    private final Collection<EnhancedGlobalSecondaryIndex> globalSecondaryIndices;
+
+    private CreateTableEnhancedRequest(Builder builder) {
+        this.provisionedThroughput = builder.provisionedThroughput;
+        this.localSecondaryIndices = builder.localSecondaryIndices;
+        this.globalSecondaryIndices = builder.globalSecondaryIndices;
+    }
+
+    /**
+     * Creates a newly initialized builder for a request object.
+     */
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    /**
+     * Returns a builder initialized with all existing values on the request object.
+     */
+    public Builder toBuilder() {
+        return builder().provisionedThroughput(provisionedThroughput)
+                        .localSecondaryIndices(localSecondaryIndices)
+                        .globalSecondaryIndices(globalSecondaryIndices);
+    }
+
+    /**
+     * Returns the provisioned throughput value set on this request object, or null if it has not been set.
+     */
+    public ProvisionedThroughput provisionedThroughput() {
+        return provisionedThroughput;
+    }
+
+    /**
+     * Returns the local secondary index set on this request object, or null if it has not been set.
+     */
+    public Collection<EnhancedLocalSecondaryIndex> localSecondaryIndices() {
+        return localSecondaryIndices;
+    }
+
+    /**
+     * Returns the global secondary index set on this request object, or null if it has not been set.
+     */
+    public Collection<EnhancedGlobalSecondaryIndex> globalSecondaryIndices() {
+        return globalSecondaryIndices;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        CreateTableEnhancedRequest that = (CreateTableEnhancedRequest) o;
+
+        if (provisionedThroughput != null ? ! provisionedThroughput.equals(that.provisionedThroughput) :
+            that.provisionedThroughput != null) {
+            return false;
+        }
+        if (localSecondaryIndices != null ? ! localSecondaryIndices.equals(that.localSecondaryIndices) :
+            that.localSecondaryIndices != null) {
+            return false;
+        }
+        return globalSecondaryIndices != null ? globalSecondaryIndices.equals(that.globalSecondaryIndices) :
+            that.globalSecondaryIndices == null;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = provisionedThroughput != null ? provisionedThroughput.hashCode() : 0;
+        result = 31 * result + (localSecondaryIndices != null ? localSecondaryIndices.hashCode() : 0);
+        result = 31 * result + (globalSecondaryIndices != null ? globalSecondaryIndices.hashCode() : 0);
+        return result;
+    }
+
+    /**
+     * A builder that is used to create a request with the desired parameters.
+     */
+    public static final class Builder {
+        private ProvisionedThroughput provisionedThroughput;
+        private Collection<EnhancedLocalSecondaryIndex> localSecondaryIndices;
+        private Collection<EnhancedGlobalSecondaryIndex> globalSecondaryIndices;
+
+        private Builder() {
+        }
+
+        /**
+         * Sets the provisioned throughput for this table. Use this parameter to set the table's
+         * read and write capacity units.
+         * <p>
+         * See the DynamoDb documentation for more information on default throughput values.
+         */
+        public Builder provisionedThroughput(ProvisionedThroughput provisionedThroughput) {
+            this.provisionedThroughput = provisionedThroughput;
+            return this;
+        }
+
+        /**
+         * Defines a local secondary index for this table.
+         * <p>
+         * See {@link EnhancedLocalSecondaryIndex} for more information on creating and using a local secondary index.
+         */
+        public Builder localSecondaryIndices(Collection<EnhancedLocalSecondaryIndex> localSecondaryIndices) {
+            this.localSecondaryIndices = localSecondaryIndices;
+            return this;
+        }
+
+        /**
+         * Defines a local secondary index for this table.
+         * <p>
+         * See {@link EnhancedLocalSecondaryIndex} for more information on creating and using a local secondary index.
+         */
+        public Builder localSecondaryIndices(EnhancedLocalSecondaryIndex... localSecondaryIndices) {
+            this.localSecondaryIndices = Arrays.asList(localSecondaryIndices);
+            return this;
+        }
+
+        /**
+         * Defines a global secondary index for this table.
+         * <p>
+         * See {@link EnhancedGlobalSecondaryIndex} for more information on creating and using a global secondary index.
+         */
+        public Builder globalSecondaryIndices(Collection<EnhancedGlobalSecondaryIndex> globalSecondaryIndices) {
+            this.globalSecondaryIndices = globalSecondaryIndices;
+            return this;
+        }
+
+        /**
+         * Defines a global secondary index for this table.
+         * <p>
+         * See {@link EnhancedGlobalSecondaryIndex} for more information on creating and using a global secondary index.
+         */
+        public Builder globalSecondaryIndices(EnhancedGlobalSecondaryIndex... globalSecondaryIndices) {
+            this.globalSecondaryIndices = Arrays.asList(globalSecondaryIndices);
+            return this;
+        }
+
+        public CreateTableEnhancedRequest build() {
+            return new CreateTableEnhancedRequest(this);
+        }
+    }
+
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/model/DeleteItemEnhancedRequest.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/model/DeleteItemEnhancedRequest.java
new file mode 100644
index 000000000000..ae9f873cda3e
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/model/DeleteItemEnhancedRequest.java
@@ -0,0 +1,144 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.model;
+
+import java.util.function.Consumer;
+import software.amazon.awssdk.annotations.SdkPublicApi;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbAsyncTable;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbTable;
+import software.amazon.awssdk.enhanced.dynamodb.Expression;
+import software.amazon.awssdk.enhanced.dynamodb.Key;
+
+/**
+ * Defines parameters used to remove an item from a DynamoDb table using the deleteItem() operation (such as
+ * {@link DynamoDbTable#deleteItem(DeleteItemEnhancedRequest)} or
+ * {@link DynamoDbAsyncTable#deleteItem(DeleteItemEnhancedRequest)}).
+ * <p>
+ * A valid request object must contain a primary {@link Key} to reference the item to delete.
+ */
+@SdkPublicApi
+public final class DeleteItemEnhancedRequest {
+
+    private final Key key;
+    private final Expression conditionExpression;
+
+    private DeleteItemEnhancedRequest(Builder builder) {
+        this.key = builder.key;
+        this.conditionExpression = builder.conditionExpression;
+    }
+
+    /**
+     * Creates a newly initialized builder for a request object.
+     */
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    /**
+     * Returns a builder initialized with all existing values on the request object.
+     */
+    public Builder toBuilder() {
+        return builder().key(key).conditionExpression(conditionExpression);
+    }
+
+    /**
+     * Returns the primary {@link Key} for the item to delete.
+     */
+    public Key key() {
+        return key;
+    }
+
+    /**
+     * Returns the condition {@link Expression} set on this request object, or null if it doesn't exist.
+     */
+    public Expression conditionExpression() {
+        return conditionExpression;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        DeleteItemEnhancedRequest that = (DeleteItemEnhancedRequest) o;
+
+        return key != null ? key.equals(that.key) : that.key == null;
+    }
+
+    @Override
+    public int hashCode() {
+        return key != null ? key.hashCode() : 0;
+    }
+
+    /**
+     * A builder that is used to create a request with the desired parameters.
+     * <p>
+     * <b>Note</b>: A valid request builder must define a {@link Key}.
+     */
+    public static final class Builder {
+        private Key key;
+        private Expression conditionExpression;
+
+        private Builder() {
+        }
+
+        /**
+         * Sets the primary {@link Key} that will be used to match the item to delete.
+         *
+         * @param key the primary key to use in the request.
+         * @return a builder of this type
+         */
+        public Builder key(Key key) {
+            this.key = key;
+            return this;
+        }
+
+        /**
+         * Sets the primary {@link Key} that will be used to match the item to delete
+         * on the builder by accepting a consumer of {@link Key.Builder}.
+         *
+         * @param keyConsumer a {@link Consumer} of {@link Key}
+         * @return a builder of this type
+         */
+        public Builder key(Consumer<Key.Builder> keyConsumer) {
+            Key.Builder builder = Key.builder();
+            keyConsumer.accept(builder);
+            return key(builder.build());
+        }
+
+        /**
+         * Defines a logical expression on an item's attribute values which, if evaluating to true,
+         * will allow the delete operation to succeed. If evaluating to false, the operation will not succeed.
+         * <p>
+         * See {@link Expression} for condition syntax and examples.
+         *
+         * @param conditionExpression a condition written as an {@link Expression}
+         * @return a builder of this type
+         */
+        public Builder conditionExpression(Expression conditionExpression) {
+            this.conditionExpression = conditionExpression;
+            return this;
+        }
+
+        public DeleteItemEnhancedRequest build() {
+            return new DeleteItemEnhancedRequest(this);
+        }
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/model/EnhancedGlobalSecondaryIndex.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/model/EnhancedGlobalSecondaryIndex.java
new file mode 100644
index 000000000000..869c223ef252
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/model/EnhancedGlobalSecondaryIndex.java
@@ -0,0 +1,168 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.model;
+
+import java.util.function.Consumer;
+import software.amazon.awssdk.annotations.SdkPublicApi;
+import software.amazon.awssdk.services.dynamodb.model.Projection;
+import software.amazon.awssdk.services.dynamodb.model.ProvisionedThroughput;
+import software.amazon.awssdk.utils.Validate;
+
+/**
+ * Enhanced model representation of a 'global secondary index' of a DynamoDb table. This is optionally used with the
+ * 'createTable' operation in the enhanced client.
+ */
+@SdkPublicApi
+public final class EnhancedGlobalSecondaryIndex {
+    private final String indexName;
+    private final Projection projection;
+    private final ProvisionedThroughput provisionedThroughput;
+
+    private EnhancedGlobalSecondaryIndex(Builder builder) {
+        this.indexName = Validate.paramNotBlank(builder.indexName, "indexName");
+        this.projection = builder.projection;
+        this.provisionedThroughput = builder.provisionedThroughput;
+    }
+
+    /**
+     * Creates a newly initialized builder for an {@link EnhancedLocalSecondaryIndex}
+     * @return A new builder
+     */
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    /**
+     * Creates a builder initialized with the attributes of an existing {@link EnhancedLocalSecondaryIndex}
+     * @return A new builder
+     */
+    public Builder toBuilder() {
+        return builder().indexName(indexName)
+                        .projection(projection)
+                        .provisionedThroughput(provisionedThroughput);
+    }
+
+    /**
+     * The name of the global secondary index
+     */
+    public String indexName() {
+        return indexName;
+    }
+
+    /**
+     * The attribute projection setting for this global secondary index.
+     */
+    public Projection projection() {
+        return projection;
+    }
+
+    /**
+     * The provisioned throughput setting for this global secondary index.
+     */
+    public ProvisionedThroughput provisionedThroughput() {
+        return provisionedThroughput;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        EnhancedGlobalSecondaryIndex that = (EnhancedGlobalSecondaryIndex) o;
+
+        if (indexName != null ? ! indexName.equals(that.indexName) : that.indexName != null) {
+            return false;
+        }
+        if (projection != null ? ! projection.equals(that.projection) : that.projection != null) {
+            return false;
+        }
+        return provisionedThroughput != null ? provisionedThroughput.equals(that.provisionedThroughput) :
+            that.provisionedThroughput == null;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = indexName != null ? indexName.hashCode() : 0;
+        result = 31 * result + (projection != null ? projection.hashCode() : 0);
+        result = 31 * result + (provisionedThroughput != null ? provisionedThroughput.hashCode() : 0);
+        return result;
+    }
+
+    /**
+     * A builder for {@link EnhancedGlobalSecondaryIndex}
+     */
+    public static final class Builder {
+        private String indexName;
+        private Projection projection;
+        private ProvisionedThroughput provisionedThroughput;
+
+        private Builder() {
+        }
+
+        /**
+         * The name of the global secondary index
+         */
+        public Builder indexName(String indexName) {
+            this.indexName = indexName;
+            return this;
+        }
+
+        /**
+         * The attribute projection setting for this global secondary index.
+         */
+        public Builder projection(Projection projection) {
+            this.projection = projection;
+            return this;
+        }
+
+        /**
+         * The attribute projection setting for this global secondary index.
+         */
+        public Builder projection(Consumer<Projection.Builder> projection) {
+            Projection.Builder builder = Projection.builder();
+            projection.accept(builder);
+            return projection(builder.build());
+        }
+
+        /**
+         * The provisioned throughput setting for this global secondary index.
+         */
+        public Builder provisionedThroughput(ProvisionedThroughput provisionedThroughput) {
+            this.provisionedThroughput = provisionedThroughput;
+            return this;
+        }
+
+        /**
+         * The provisioned throughput setting for this global secondary index.
+         */
+        public Builder provisionedThroughput(Consumer<ProvisionedThroughput.Builder> provisionedThroughput) {
+            ProvisionedThroughput.Builder builder = ProvisionedThroughput.builder();
+            provisionedThroughput.accept(builder);
+            return provisionedThroughput(builder.build());
+        }
+
+        /**
+         * Builds a {@link EnhancedGlobalSecondaryIndex} based on the values stored in this builder
+         */
+        public EnhancedGlobalSecondaryIndex build() {
+            return new EnhancedGlobalSecondaryIndex(this);
+        }
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/model/EnhancedLocalSecondaryIndex.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/model/EnhancedLocalSecondaryIndex.java
new file mode 100644
index 000000000000..7512ac9c4300
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/model/EnhancedLocalSecondaryIndex.java
@@ -0,0 +1,128 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.model;
+
+import java.util.function.Consumer;
+import software.amazon.awssdk.annotations.SdkPublicApi;
+import software.amazon.awssdk.services.dynamodb.model.Projection;
+import software.amazon.awssdk.utils.Validate;
+
+/**
+ * Enhanced model representation of a 'local secondary index' of a DynamoDb table. This is optionally used with the
+ * 'createTable' operation in the enhanced client.
+ */
+@SdkPublicApi
+public final class EnhancedLocalSecondaryIndex {
+    private final String indexName;
+    private final Projection projection;
+
+    private EnhancedLocalSecondaryIndex(Builder builder) {
+        this.indexName = Validate.paramNotBlank(builder.indexName, "indexName");
+        this.projection = builder.projection;
+    }
+
+    public static EnhancedLocalSecondaryIndex create(String indexName,
+                                                     Projection projection) {
+
+        return builder().indexName(indexName).projection(projection).build();
+    }
+
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    public Builder toBuilder() {
+        return builder().indexName(indexName).projection(projection);
+    }
+
+    /**
+     * The name of this local secondary index
+     */
+    public String indexName() {
+        return indexName;
+    }
+
+    /**
+     * The attribute projection setting for this local secondary index.
+     */
+    public Projection projection() {
+        return projection;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        EnhancedLocalSecondaryIndex that = (EnhancedLocalSecondaryIndex) o;
+
+        if (indexName != null ? ! indexName.equals(that.indexName) : that.indexName != null) {
+            return false;
+        }
+        return projection != null ? projection.equals(that.projection) : that.projection == null;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = indexName != null ? indexName.hashCode() : 0;
+        result = 31 * result + (projection != null ? projection.hashCode() : 0);
+        return result;
+    }
+
+    /**
+     * A builder for {@link EnhancedLocalSecondaryIndex}
+     */
+    public static final class Builder {
+        private String indexName;
+        private Projection projection;
+
+        private Builder() {
+        }
+
+        /**
+         * The name of this local secondary index
+         */
+        public Builder indexName(String indexName) {
+            this.indexName = indexName;
+            return this;
+        }
+
+        /**
+         * The attribute projection setting for this local secondary index.
+         */
+        public Builder projection(Projection projection) {
+            this.projection = projection;
+            return this;
+        }
+
+        /**
+         * The attribute projection setting for this local secondary index.
+         */
+        public Builder projection(Consumer<Projection.Builder> projection) {
+            Projection.Builder builder = Projection.builder();
+            projection.accept(builder);
+            return projection(builder.build());
+        }
+
+        public EnhancedLocalSecondaryIndex build() {
+            return new EnhancedLocalSecondaryIndex(this);
+        }
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/model/GetItemEnhancedRequest.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/model/GetItemEnhancedRequest.java
new file mode 100644
index 000000000000..7025bb35eb3a
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/model/GetItemEnhancedRequest.java
@@ -0,0 +1,148 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.model;
+
+import java.util.function.Consumer;
+import software.amazon.awssdk.annotations.SdkPublicApi;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbAsyncTable;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbTable;
+import software.amazon.awssdk.enhanced.dynamodb.Key;
+
+/**
+ * Defines parameters used to retrieve an item from a DynamoDb table using the getItem() operation (such as
+ * {@link DynamoDbTable#getItem(GetItemEnhancedRequest)} or {@link DynamoDbAsyncTable#getItem(GetItemEnhancedRequest)}).
+ * <p>
+ * A valid request object must contain a primary {@link Key} to reference the item to get.
+ */
+@SdkPublicApi
+public final class GetItemEnhancedRequest {
+
+    private final Key key;
+    private final Boolean consistentRead;
+
+    private GetItemEnhancedRequest(Builder builder) {
+        this.key = builder.key;
+        this.consistentRead = builder.consistentRead;
+    }
+
+    /**
+     * All requests must be constructed using a Builder.
+     * @return a builder of this type
+     */
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    /**
+     * @return a builder with all existing values set
+     */
+    public Builder toBuilder() {
+        return builder().key(key).consistentRead(consistentRead);
+    }
+
+    /**
+     * @return whether or not this request will use consistent read
+     */
+    public Boolean consistentRead() {
+        return this.consistentRead;
+    }
+
+    /**
+     * Returns the primary {@link Key} for the item to get.
+     */
+    public Key key() {
+        return this.key;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        GetItemEnhancedRequest getItem = (GetItemEnhancedRequest) o;
+
+        if (key != null ? ! key.equals(getItem.key) : getItem.key != null) {
+            return false;
+        }
+        return consistentRead != null ? consistentRead.equals(getItem.consistentRead) : getItem.consistentRead == null;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = key != null ? key.hashCode() : 0;
+        result = 31 * result + (consistentRead != null ? consistentRead.hashCode() : 0);
+        return result;
+    }
+
+    /**
+     * A builder that is used to create a request with the desired parameters.
+     * <p>
+     * <b>Note</b>: A valid request builder must define a {@link Key}.
+     */
+    public static final class Builder {
+        private Key key;
+        private Boolean consistentRead;
+
+        private Builder() {
+        }
+
+        /**
+         * Determines the read consistency model: If set to true, the operation uses strongly consistent reads; otherwise,
+         * the operation uses eventually consistent reads.
+         * <p>
+         * By default, the value of this property is set to <em>false</em>.
+         *
+         * @param consistentRead sets consistency model of the operation to use strong consistency
+         * @return a builder of this type
+         */
+        public Builder consistentRead(Boolean consistentRead) {
+            this.consistentRead = consistentRead;
+            return this;
+        }
+
+        /**
+         * Sets the primary {@link Key} that will be used to match the item to retrieve.
+         *
+         * @param key the primary key to use in the request.
+         * @return a builder of this type
+         */
+        public Builder key(Key key) {
+            this.key = key;
+            return this;
+        }
+
+        /**
+         * Sets the primary {@link Key} that will be used to match the item to retrieve
+         * by accepting a consumer of {@link Key.Builder}.
+         *
+         * @param keyConsumer a {@link Consumer} of {@link Key}
+         * @return a builder of this type
+         */
+        public Builder key(Consumer<Key.Builder> keyConsumer) {
+            Key.Builder builder = Key.builder();
+            keyConsumer.accept(builder);
+            return key(builder.build());
+        }
+
+        public GetItemEnhancedRequest build() {
+            return new GetItemEnhancedRequest(this);
+        }
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/model/Page.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/model/Page.java
new file mode 100644
index 000000000000..d5248cfdd903
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/model/Page.java
@@ -0,0 +1,101 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.model;
+
+import java.util.List;
+import java.util.Map;
+import software.amazon.awssdk.annotations.SdkPublicApi;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+
+/**
+ * An immutable object that holds a page of queried or scanned results from DynamoDb.
+ * <p>
+ * Contains a reference to the last evaluated key for the current page; see {@link #lastEvaluatedKey()} for more information.
+ * @param <T> The modelled type of the object that has been read.
+ */
+@SdkPublicApi
+public final class Page<T> {
+    private final List<T> items;
+    private final Map<String, AttributeValue> lastEvaluatedKey;
+
+    private Page(List<T> items, Map<String, AttributeValue> lastEvaluatedKey) {
+        this.items = items;
+        this.lastEvaluatedKey = lastEvaluatedKey;
+    }
+
+    /**
+     * Static constructor for this object.
+     * @param items A list of items to store for the page.
+     * @param lastEvaluatedKey A 'lastEvaluatedKey' to store for the page.
+     * @param <T> The modelled type of the object that has been read.
+     * @return A newly constructed {@link Page} object.
+     */
+    public static <T> Page<T> create(List<T> items, Map<String, AttributeValue> lastEvaluatedKey) {
+        return new Page<>(items, lastEvaluatedKey);
+    }
+
+    /**
+     * Static constructor for this object that sets a null 'lastEvaluatedKey' which indicates this is the final page
+     * of results.
+     * @param items A list of items to store for the page.
+     * @param <T> The modelled type of the object that has been read.
+     * @return A newly constructed {@link Page} object.
+     */
+    public static <T> Page<T> create(List<T> items) {
+        return new Page<>(items, null);
+    }
+
+    /**
+     * Returns a page of mapped objects that represent records from a database query or scan.
+     * @return A list of mapped objects.
+     */
+    public List<T> items() {
+        return items;
+    }
+
+    /**
+     * Returns the 'lastEvaluatedKey' that DynamoDb returned from the last page query or scan. This key can be used
+     * to continue the query or scan if passed into a request.
+     * @return The 'lastEvaluatedKey' from the last query or scan operation or null if the no more pages are available.
+     */
+    public Map<String, AttributeValue> lastEvaluatedKey() {
+        return lastEvaluatedKey;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        Page<?> page = (Page<?>) o;
+
+        if (items != null ? ! items.equals(page.items) : page.items != null) {
+            return false;
+        }
+        return lastEvaluatedKey != null ? lastEvaluatedKey.equals(page.lastEvaluatedKey) : page.lastEvaluatedKey == null;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = items != null ? items.hashCode() : 0;
+        result = 31 * result + (lastEvaluatedKey != null ? lastEvaluatedKey.hashCode() : 0);
+        return result;
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/model/PageIterable.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/model/PageIterable.java
new file mode 100644
index 000000000000..297caba8c736
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/model/PageIterable.java
@@ -0,0 +1,71 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.model;
+
+import software.amazon.awssdk.annotations.SdkPublicApi;
+import software.amazon.awssdk.core.pagination.sync.PaginatedItemsIterable;
+import software.amazon.awssdk.core.pagination.sync.SdkIterable;
+
+/**
+ * Page iterable represents the result from paginated operations such as scan and query.
+ *
+ * <p>
+ * The result can be accessed either through iterable {@link Page}s or flattened items across <b>all</b>  pages via
+ * {@link #items()}
+ *
+ * <p>
+ * Example:
+ * <p>
+ * 1) Iterating through pages
+ *
+ * <pre>
+ * {@code
+ * PageIterable<MyItem> results = table.scan();
+ * results.stream().forEach(p -> p.items().forEach(item -> System.out.println(item)))
+ * }
+ * </pre>
+ *
+ * 2) Iterating through items
+ *
+ * <pre>
+ * {@code
+ * PageIterable<MyItem> results = table.scan();
+ * results.items().stream().forEach(item -> System.out.println(item));
+ * }
+ *
+ * @param <T> The modelled type of the object in a page.
+ */
+@SdkPublicApi
+public interface PageIterable<T> extends SdkIterable<Page<T>> {
+
+    static <T> PageIterable<T> create(SdkIterable<Page<T>> pageIterable) {
+        return pageIterable::iterator;
+    }
+
+    /**
+     * Returns an iterable to iterate through the paginated {@link Page#items()} across <b>all</b> response pages.
+     *
+     * <p>
+     * This method is useful if you are interested in iterating over the items in the response pages
+     * instead of the top level pages.
+     */
+    default SdkIterable<T> items() {
+        return PaginatedItemsIterable.<Page<T>, T>builder()
+            .pagesIterable(this)
+            .itemIteratorFunction(page -> page.items().iterator())
+            .build();
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/model/PagePublisher.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/model/PagePublisher.java
new file mode 100644
index 000000000000..f4f5f85fbf2c
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/model/PagePublisher.java
@@ -0,0 +1,69 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.model;
+
+import software.amazon.awssdk.annotations.SdkPublicApi;
+import software.amazon.awssdk.core.async.SdkPublisher;
+
+/**
+ * Represents the result from paginated operations such as scan and query.
+ * <p>
+ * You can either subscribe to the {@link Page}s or flattened items across <b>all</b> pages via {@link #items()}.
+ *
+ * Example:
+ * <p>
+ * 1) Subscribing to {@link Page}s
+ * <pre>
+ * {@code
+ *
+ * PagePublisher<MyItem> publisher = mappedTable.scan();
+ * publisher.subscribe(page -> page.items().forEach(item -> System.out.println(item)));
+ * }
+ * </pre>
+ *
+ * <p>
+ * 2) Subscribing to items across all pages.
+ * <pre>
+ * {@code
+ *
+ * PagePublisher<<MyItem> publisher = mappedTable.scan();
+ * publisher.items().subscribe(item -> System.out.println(item));
+ * }
+ * </pre>
+ *
+ * @param <T> The modelled type of the object in a page.
+ */
+@SdkPublicApi
+public interface PagePublisher<T> extends SdkPublisher<Page<T>> {
+
+    /**
+     * Creates a flattened items publisher with the underlying page publisher.
+     */
+    static <T> PagePublisher<T> create(SdkPublisher<Page<T>> publisher) {
+        return publisher::subscribe;
+    }
+
+    /**
+     * Returns a publisher that can be used to request a stream of items across all pages.
+     *
+     * <p>
+     * This method is useful if you are interested in subscribing the items in the response pages
+     * instead of the top level pages.
+     */
+    default SdkPublisher<T> items() {
+        return this.flatMapIterable(Page::items);
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/model/PutItemEnhancedRequest.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/model/PutItemEnhancedRequest.java
new file mode 100644
index 000000000000..0135cd1bcf87
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/model/PutItemEnhancedRequest.java
@@ -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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.model;
+
+import software.amazon.awssdk.annotations.SdkPublicApi;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbAsyncTable;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbTable;
+import software.amazon.awssdk.enhanced.dynamodb.Expression;
+
+/**
+ * Defines parameters used to write an item to a DynamoDb table using the putItem() operation (such as
+ * {@link DynamoDbTable#putItem(PutItemEnhancedRequest)} or {@link DynamoDbAsyncTable#putItem(PutItemEnhancedRequest)}).
+ * <p>
+ * A valid request object must contain the item that should be written to the table.
+ * @param <T> The type of the modelled object.
+ */
+@SdkPublicApi
+public final class PutItemEnhancedRequest<T> {
+
+    private final T item;
+    private final Expression conditionExpression;
+
+    private PutItemEnhancedRequest(Builder<T> builder) {
+        this.item = builder.item;
+        this.conditionExpression = builder.conditionExpression;
+    }
+
+    /**
+     * Creates a newly initialized builder for the request object.
+     *
+     * @param itemClass the class that items in this table map to
+     * @param <T> The type of the modelled object, corresponding to itemClass
+     * @return a PutItemEnhancedRequest builder
+     */
+    public static <T> Builder<T> builder(Class<? extends T> itemClass) {
+        return new Builder<>();
+    }
+
+    /**
+     * Returns a builder initialized with all existing values on the request object.
+     */
+    public Builder<T> toBuilder() {
+        return new Builder<T>().item(item).conditionExpression(conditionExpression);
+    }
+
+    /**
+     * Returns the item for this put operation request.
+     */
+    public T item() {
+        return item;
+    }
+
+    /**
+     * Returns the condition {@link Expression} set on this request object, or null if it doesn't exist.
+     */
+    public Expression conditionExpression() {
+        return conditionExpression;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        PutItemEnhancedRequest<?> putItem = (PutItemEnhancedRequest<?>) o;
+
+        return item != null ? item.equals(putItem.item) : putItem.item == null;
+    }
+
+    @Override
+    public int hashCode() {
+        return item != null ? item.hashCode() : 0;
+    }
+
+    /**
+     * A builder that is used to create a request with the desired parameters.
+     * <p>
+     * <b>Note</b>: A valid request builder must define an item.
+     */
+    public static final class Builder<T> {
+        private T item;
+        private Expression conditionExpression;
+
+        private Builder() {
+        }
+
+        /**
+         * Sets the item to write to DynamoDb. Required.
+         *
+         * @param item the item to write
+         * @return a builder of this type
+         */
+        public Builder<T> item(T item) {
+            this.item = item;
+            return this;
+        }
+
+        /**
+         * Defines a logical expression on an item's attribute values which, if evaluating to true,
+         * will allow the delete operation to succeed. If evaluating to false, the operation will not succeed.
+         * <p>
+         * See {@link Expression} for condition syntax and examples.
+         *
+         * @param conditionExpression a condition written as an {@link Expression}
+         * @return a builder of this type
+         */
+        public Builder<T> conditionExpression(Expression conditionExpression) {
+            this.conditionExpression = conditionExpression;
+            return this;
+        }
+
+        public PutItemEnhancedRequest<T> build() {
+            return new PutItemEnhancedRequest<>(this);
+        }
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/model/QueryConditional.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/model/QueryConditional.java
new file mode 100644
index 000000000000..ac774c88acfe
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/model/QueryConditional.java
@@ -0,0 +1,186 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.model;
+
+import java.util.function.Consumer;
+import software.amazon.awssdk.annotations.SdkPublicApi;
+import software.amazon.awssdk.enhanced.dynamodb.Expression;
+import software.amazon.awssdk.enhanced.dynamodb.Key;
+import software.amazon.awssdk.enhanced.dynamodb.TableSchema;
+import software.amazon.awssdk.enhanced.dynamodb.internal.conditional.BeginsWithConditional;
+import software.amazon.awssdk.enhanced.dynamodb.internal.conditional.BetweenConditional;
+import software.amazon.awssdk.enhanced.dynamodb.internal.conditional.EqualToConditional;
+import software.amazon.awssdk.enhanced.dynamodb.internal.conditional.SingleKeyItemConditional;
+
+/**
+ * An interface for a literal conditional that can be used in an enhanced DynamoDB query. Contains convenient static
+ * methods that can be used to construct the most common conditional statements. Query conditionals are not linked to
+ * any specific table or schema and can be re-used in different contexts.
+ * <p>
+ * Example:
+ * <pr>
+ * {@code
+ * QueryConditional sortValueGreaterThanFour = QueryConditional.sortGreaterThan(k -> k.partitionValue(10).sortValue(4));
+ * }
+ * </pr>
+ */
+@SdkPublicApi
+public interface QueryConditional {
+    /**
+     * Creates a {@link QueryConditional} that matches when the key of an index is equal to a specific value.
+     * @param key the literal key used to compare the value of the index against
+     */
+    static QueryConditional keyEqualTo(Key key) {
+        return new EqualToConditional(key);
+    }
+
+    /**
+     * Creates a {@link QueryConditional} that matches when the key of an index is equal to a specific value.
+     * @param keyConsumer 'builder consumer' for the literal key used to compare the value of the index against
+     */
+    static QueryConditional keyEqualTo(Consumer<Key.Builder> keyConsumer) {
+        Key.Builder builder = Key.builder();
+        keyConsumer.accept(builder);
+        return keyEqualTo(builder.build());
+    }
+
+    /**
+     * Creates a {@link QueryConditional} that matches when the key of an index is greater than a specific value.
+     * @param key the literal key used to compare the value of the index against
+     */
+    static QueryConditional sortGreaterThan(Key key) {
+        return new SingleKeyItemConditional(key, ">");
+    }
+
+    /**
+     * Creates a {@link QueryConditional} that matches when the key of an index is greater than a specific value.
+     * @param keyConsumer 'builder consumer' for the literal key used to compare the value of the index against
+     */
+    static QueryConditional sortGreaterThan(Consumer<Key.Builder> keyConsumer) {
+        Key.Builder builder = Key.builder();
+        keyConsumer.accept(builder);
+        return sortGreaterThan(builder.build());
+    }
+
+    /**
+     * Creates a {@link QueryConditional} that matches when the key of an index is greater than or equal to a specific
+     * value.
+     * @param key the literal key used to compare the value of the index against
+     */
+    static QueryConditional sortGreaterThanOrEqualTo(Key key) {
+        return new SingleKeyItemConditional(key, ">=");
+    }
+
+    /**
+     * Creates a {@link QueryConditional} that matches when the key of an index is greater than or equal to a specific
+     * value.
+     * @param keyConsumer 'builder consumer' for the literal key used to compare the value of the index against
+     */
+    static QueryConditional sortGreaterThanOrEqualTo(Consumer<Key.Builder> keyConsumer) {
+        Key.Builder builder = Key.builder();
+        keyConsumer.accept(builder);
+        return sortGreaterThanOrEqualTo(builder.build());
+    }
+
+    /**
+     * Creates a {@link QueryConditional} that matches when the key of an index is less than a specific value.
+     * @param key the literal key used to compare the value of the index against
+     */
+    static QueryConditional sortLessThan(Key key) {
+        return new SingleKeyItemConditional(key, "<");
+    }
+
+    /**
+     * Creates a {@link QueryConditional} that matches when the key of an index is less than a specific value.
+     * @param keyConsumer 'builder consumer' for the literal key used to compare the value of the index against
+     */
+    static QueryConditional sortLessThan(Consumer<Key.Builder> keyConsumer) {
+        Key.Builder builder = Key.builder();
+        keyConsumer.accept(builder);
+        return sortLessThan(builder.build());
+    }
+
+    /**
+     * Creates a {@link QueryConditional} that matches when the key of an index is less than or equal to a specific
+     * value.
+     * @param key the literal key used to compare the value of the index against
+     */
+    static QueryConditional sortLessThanOrEqualTo(Key key) {
+        return new SingleKeyItemConditional(key, "<=");
+    }
+
+    /**
+     * Creates a {@link QueryConditional} that matches when the key of an index is less than or equal to a specific
+     * value.
+     * @param keyConsumer 'builder consumer' for the literal key used to compare the value of the index against
+     */
+    static QueryConditional sortLessThanOrEqualTo(Consumer<Key.Builder> keyConsumer) {
+        Key.Builder builder = Key.builder();
+        keyConsumer.accept(builder);
+        return sortLessThanOrEqualTo(builder.build());
+    }
+
+    /**
+     * Creates a {@link QueryConditional} that matches when the key of an index is between two specific values.
+     * @param keyFrom the literal key used to compare the start of the range to compare the value of the index against
+     * @param keyTo the literal key used to compare the end of the range to compare the value of the index against
+     */
+    static QueryConditional sortBetween(Key keyFrom, Key keyTo) {
+        return new BetweenConditional(keyFrom, keyTo);
+    }
+
+    /**
+     * Creates a {@link QueryConditional} that matches when the key of an index is between two specific values.
+     * @param keyFromConsumer 'builder consumer' for the literal key used to compare the start of the range to compare
+     *                        the value of the index against
+     * @param keyToConsumer 'builder consumer' for the literal key used to compare the end of the range to compare the
+     *                      value of the index against
+     */
+    static QueryConditional sortBetween(Consumer<Key.Builder> keyFromConsumer, Consumer<Key.Builder> keyToConsumer) {
+        Key.Builder builderFrom = Key.builder();
+        Key.Builder builderTo = Key.builder();
+        keyFromConsumer.accept(builderFrom);
+        keyToConsumer.accept(builderTo);
+        return sortBetween(builderFrom.build(), builderTo.build());
+    }
+
+    /**
+     * Creates a {@link QueryConditional} that matches when the key of an index begins with a specific value.
+     * @param key the literal key used to compare the start of the value of the index against
+     */
+    static QueryConditional sortBeginsWith(Key key) {
+        return new BeginsWithConditional(key);
+    }
+
+    /**
+     * Creates a {@link QueryConditional} that matches when the key of an index begins with a specific value.
+     * @param keyConsumer 'builder consumer'  the literal key used to compare the start of the value of the index
+     *                    against
+     */
+    static QueryConditional sortBeginsWith(Consumer<Key.Builder> keyConsumer) {
+        Key.Builder builder = Key.builder();
+        keyConsumer.accept(builder);
+        return sortBeginsWith(builder.build());
+    }
+
+    /**
+     * Generates a conditional {@link Expression} based on specific context that is supplied as arguments.
+     * @param tableSchema A {@link TableSchema} that this expression will be used with
+     * @param indexName The specific index name of the index this expression will be used with
+     * @return A specific {@link Expression} that can be used as part of a query request
+     */
+    Expression expression(TableSchema<?> tableSchema, String indexName);
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/model/QueryEnhancedRequest.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/model/QueryEnhancedRequest.java
new file mode 100644
index 000000000000..b90745a69eba
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/model/QueryEnhancedRequest.java
@@ -0,0 +1,262 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.model;
+
+import java.util.HashMap;
+import java.util.Map;
+import software.amazon.awssdk.annotations.SdkPublicApi;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbAsyncIndex;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbTable;
+import software.amazon.awssdk.enhanced.dynamodb.Expression;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+
+/**
+ * Defines parameters used to when querying a DynamoDb table or index using the query() operation (such as
+ * {@link DynamoDbTable#query(QueryEnhancedRequest)} or {@link DynamoDbAsyncIndex#query(QueryEnhancedRequest)}).
+ * <p>
+ * A valid request object must contain a {@link QueryConditional} condition specifying how DynamoDb
+ * should match items in the table.
+ * <p>
+ * All other parameters are optional.
+ */
+@SdkPublicApi
+public final class QueryEnhancedRequest {
+
+    private final QueryConditional queryConditional;
+    private final Map<String, AttributeValue> exclusiveStartKey;
+    private final Boolean scanIndexForward;
+    private final Integer limit;
+    private final Boolean consistentRead;
+    private final Expression filterExpression;
+
+    private QueryEnhancedRequest(Builder builder) {
+        this.queryConditional = builder.queryConditional;
+        this.exclusiveStartKey = builder.exclusiveStartKey;
+        this.scanIndexForward = builder.scanIndexForward;
+        this.limit = builder.limit;
+        this.consistentRead = builder.consistentRead;
+        this.filterExpression = builder.filterExpression;
+    }
+
+    /**
+     * Creates a newly initialized builder for a request object.
+     */
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    /**
+     * Returns a builder initialized with all existing values on the request object.
+     */
+    public Builder toBuilder() {
+        return builder().queryConditional(queryConditional)
+                        .exclusiveStartKey(exclusiveStartKey)
+                        .scanIndexForward(scanIndexForward)
+                        .limit(limit)
+                        .consistentRead(consistentRead)
+                        .filterExpression(filterExpression);
+    }
+
+    /**
+     * Returns the matching condition of the query.
+     */
+    public QueryConditional queryConditional() {
+        return queryConditional;
+    }
+
+    /**
+     * Returns the value of the exclusive start key set on this request object, or null if it doesn't exist.
+     */
+    public Map<String, AttributeValue> exclusiveStartKey() {
+        return exclusiveStartKey;
+    }
+
+    /**
+     * Returns the value of scan index forward, meaning an ascending result sort order, or true if it
+     * has not been set.
+     */
+    public Boolean scanIndexForward() {
+        return scanIndexForward;
+    }
+
+    /**
+     * Returns the value of limit set on this request object, or null if it doesn't exist.
+     */
+    public Integer limit() {
+        return limit;
+    }
+
+    /**
+     * Returns the value of consistent read, or false if it has not been set.
+     */
+    public Boolean consistentRead() {
+        return consistentRead;
+    }
+
+    /**
+     * Returns the return result filter {@link Expression} set on this request object, or null if it doesn't exist.
+     */
+    public Expression filterExpression() {
+        return filterExpression;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        QueryEnhancedRequest query = (QueryEnhancedRequest) o;
+
+        if (queryConditional != null ? ! queryConditional.equals(query.queryConditional) :
+            query.queryConditional != null) {
+            return false;
+        }
+        if (exclusiveStartKey != null ? ! exclusiveStartKey.equals(query.exclusiveStartKey) :
+            query.exclusiveStartKey != null) {
+            return false;
+        }
+        if (scanIndexForward != null ? ! scanIndexForward.equals(query.scanIndexForward) :
+            query.scanIndexForward != null) {
+            return false;
+        }
+        if (limit != null ? ! limit.equals(query.limit) : query.limit != null) {
+            return false;
+        }
+        if (consistentRead != null ? ! consistentRead.equals(query.consistentRead) : query.consistentRead != null) {
+            return false;
+        }
+        return filterExpression != null ? filterExpression.equals(query.filterExpression) : query.filterExpression == null;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = queryConditional != null ? queryConditional.hashCode() : 0;
+        result = 31 * result + (exclusiveStartKey != null ? exclusiveStartKey.hashCode() : 0);
+        result = 31 * result + (scanIndexForward != null ? scanIndexForward.hashCode() : 0);
+        result = 31 * result + (limit != null ? limit.hashCode() : 0);
+        result = 31 * result + (consistentRead != null ? consistentRead.hashCode() : 0);
+        result = 31 * result + (filterExpression != null ? filterExpression.hashCode() : 0);
+        return result;
+    }
+
+    /**
+     * A builder that is used to create a request with the desired parameters.
+     * <p>
+     * A valid builder must set the {@link #queryConditional} parameter. Other parameters are optional.
+     */
+    public static final class Builder {
+        private QueryConditional queryConditional;
+        private Map<String, AttributeValue> exclusiveStartKey;
+        private Boolean scanIndexForward;
+        private Integer limit;
+        private Boolean consistentRead;
+        private Expression filterExpression;
+
+        private Builder() {
+        }
+
+        /**
+         * Determines the matching conditions for this query request. See {@link QueryConditional} for examples
+         * and constraints. <b>Required</b>.
+         *
+         * @param queryConditional the query conditions
+         * @return a builder of this type
+         */
+        public Builder queryConditional(QueryConditional queryConditional) {
+            this.queryConditional = queryConditional;
+            return this;
+        }
+
+        /**
+         * Results are sorted by sort key in ascending order if {@link #scanIndexForward} is true. If its false, the
+         * order is descending. The default value is true.
+         *
+         * @param scanIndexForward the sort order
+         * @return a builder of this type
+         */
+        public Builder scanIndexForward(Boolean scanIndexForward) {
+            this.scanIndexForward = scanIndexForward;
+            return this;
+        }
+
+        /**
+         * The primary key of the first item that this operation will evaluate. By default, the operation will evaluate
+         * the whole dataset. If used, normally this parameter is populated with the value that was returned for
+         * {@link Page#lastEvaluatedKey()} in the previous operation.
+         *
+         * @param exclusiveStartKey the primary key value where DynamoDb should start to evaluate items
+         * @return a builder of this type
+         */
+        public Builder exclusiveStartKey(Map<String, AttributeValue> exclusiveStartKey) {
+            this.exclusiveStartKey = exclusiveStartKey != null ? new HashMap<>(exclusiveStartKey) : null;
+            return this;
+        }
+
+        /**
+         * Sets a limit on how many items to evaluate in the query. If not set, the operation uses
+         * the maximum values allowed.
+         * <p>
+         * <b>Note:</b>The limit does not refer to the number of items to return, but how many items
+         * the database should evaluate while executing the query. Use limit together with {@link Page#lastEvaluatedKey()}
+         * and {@link #exclusiveStartKey} in subsequent query calls to evaluate <em>limit</em> items per call.
+         *
+         * @param limit the maximum number of items to evalute
+         * @return a builder of this type
+         */
+        public Builder limit(Integer limit) {
+            this.limit = limit;
+            return this;
+        }
+
+        /**
+         * Determines the read consistency model: If set to true, the operation uses strongly consistent reads; otherwise,
+         * the operation uses eventually consistent reads.
+         * <p>
+         * By default, the value of this property is set to <em>false</em>.
+         *
+         * @param consistentRead sets consistency model of the operation to use strong consistency
+         * @return a builder of this type
+         */
+        public Builder consistentRead(Boolean consistentRead) {
+            this.consistentRead = consistentRead;
+            return this;
+        }
+
+        /**
+         * Refines the query results by applying the filter expression on the results returned
+         * from the query and discards items that do not match. See {@link Expression} for examples
+         * and constraints.
+         * <p>
+         * <b>Note:</b> Using the filter expression does not reduce the cost of the query, since it is applied
+         * <em>after</em> the database has found matching items.
+         *
+         * @param filterExpression an expression that filters results of evaluating the query
+         * @return a builder of this type
+         */
+        public Builder filterExpression(Expression filterExpression) {
+            this.filterExpression = filterExpression;
+            return this;
+        }
+
+        public QueryEnhancedRequest build() {
+            return new QueryEnhancedRequest(this);
+        }
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/model/ReadBatch.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/model/ReadBatch.java
new file mode 100644
index 000000000000..172af1548913
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/model/ReadBatch.java
@@ -0,0 +1,250 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.model;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+import software.amazon.awssdk.annotations.SdkPublicApi;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClient;
+import software.amazon.awssdk.enhanced.dynamodb.Key;
+import software.amazon.awssdk.enhanced.dynamodb.MappedTableResource;
+import software.amazon.awssdk.enhanced.dynamodb.TableMetadata;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+import software.amazon.awssdk.services.dynamodb.model.KeysAndAttributes;
+
+/**
+ * Defines a collection of primary keys for items in a table, stored as {@link KeysAndAttributes}, and
+ * used for the batchGetItem() operation (such as
+ * {@link DynamoDbEnhancedClient#batchGetItem(BatchGetItemEnhancedRequest)}) as part of a
+ * {@link BatchGetItemEnhancedRequest}.
+ * <p>
+ * A valid request object should contain one or more primary keys.
+ */
+@SdkPublicApi
+public final class ReadBatch {
+    private final String tableName;
+    private final KeysAndAttributes keysAndAttributes;
+
+    private ReadBatch(BuilderImpl<?> builder) {
+        this.tableName = builder.mappedTableResource != null ? builder.mappedTableResource.tableName() : null;
+        this.keysAndAttributes = generateKeysAndAttributes(builder.requests, builder.mappedTableResource);
+    }
+
+    /**
+     * Creates a newly initialized builder for a read batch.
+     *
+     * @param itemClass the class that items in this table map to
+     * @param <T> The type of the modelled object, corresponding to itemClass
+     * @return a ReadBatch builder
+     */
+    public static <T> Builder<T> builder(Class<? extends T> itemClass) {
+        return new BuilderImpl<>();
+    }
+
+    /**
+     * Returns the table name associated with this batch.
+     */
+    public String tableName() {
+        return tableName;
+    }
+
+    /**
+     * Returns the collection of keys and attributes, see {@link KeysAndAttributes}, in this read batch.
+     */
+    public KeysAndAttributes keysAndAttributes() {
+        return keysAndAttributes;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        ReadBatch readBatch = (ReadBatch) o;
+
+        if (tableName != null ? !tableName.equals(readBatch.tableName) :
+            readBatch.tableName != null) {
+
+            return false;
+        }
+        return keysAndAttributes != null ?
+               keysAndAttributes.equals(readBatch.keysAndAttributes) :
+               readBatch.keysAndAttributes == null;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = tableName != null ? tableName.hashCode() : 0;
+        result = 31 * result + (keysAndAttributes != null ? keysAndAttributes.hashCode() : 0);
+        return result;
+    }
+
+    /**
+     * A builder that is used to create a request with the desired parameters.
+     * <p>
+     * A valid builder must define a {@link MappedTableResource} and add at least one
+     * {@link GetItemEnhancedRequest}.
+     *
+     * @param <T> the type that items in this table map to
+     */
+    public interface Builder<T> {
+
+        /**
+         * Sets the mapped table resource (table) that the items in this read batch should come from.
+         *
+         * @param mappedTableResource the table reference
+         * @return a builder of this type
+         */
+        Builder<T> mappedTableResource(MappedTableResource<T> mappedTableResource);
+
+        /**
+         * Adds a {@link GetItemEnhancedRequest} with a primary {@link Key} to the builder.
+         *
+         * @param request A {@link GetItemEnhancedRequest}
+         * @return a builder of this type
+         */
+        Builder<T> addGetItem(GetItemEnhancedRequest request);
+
+        /**
+         * Adds a {@link GetItemEnhancedRequest} with a primary {@link Key} to the builder by accepting a consumer of
+         * {@link GetItemEnhancedRequest.Builder}.
+         *
+         * @param requestConsumer a {@link Consumer} of {@link GetItemEnhancedRequest}
+         * @return a builder of this type
+         */
+        Builder<T> addGetItem(Consumer<GetItemEnhancedRequest.Builder> requestConsumer);
+
+        /**
+         * Adds a GetItem request with a primary {@link Key} to the builder.
+         *
+         * @param key A {@link Key} to match the record retrieved from the database.
+         * @return a builder of this type
+         */
+        Builder<T> addGetItem(Key key);
+
+        /**
+         * Adds a GetItem request to the builder.
+         *
+         * @param keyItem an item that will have its key fields used to match a record to retrieve from the database.
+         * @return a builder of this type
+         */
+        Builder<T> addGetItem(T keyItem);
+
+        ReadBatch build();
+    }
+
+    private static <T> KeysAndAttributes generateKeysAndAttributes(List<GetItemEnhancedRequest> readRequests,
+                                                                   MappedTableResource<T> mappedTableResource) {
+        if (readRequests == null || readRequests.isEmpty()) {
+            return null;
+        }
+
+        Boolean firstRecordConsistentRead = validateAndGetConsistentRead(readRequests);
+
+        List<Map<String, AttributeValue>> keys =
+            readRequests.stream()
+                        .map(GetItemEnhancedRequest::key)
+                        .map(key -> key.keyMap(mappedTableResource.tableSchema(), TableMetadata.primaryIndexName()))
+                        .collect(Collectors.toList());
+
+        return KeysAndAttributes.builder()
+                                .keys(keys)
+                                .consistentRead(firstRecordConsistentRead)
+                                .build();
+
+    }
+
+    private static Boolean validateAndGetConsistentRead(List<GetItemEnhancedRequest> readRequests) {
+        Boolean firstRecordConsistentRead = null;
+        boolean isFirstRecord = true;
+
+        for (GetItemEnhancedRequest request : readRequests) {
+            if (isFirstRecord) {
+                isFirstRecord = false;
+                firstRecordConsistentRead = request.consistentRead();
+            } else {
+                if (!compareNullableBooleans(firstRecordConsistentRead, request.consistentRead())) {
+                    throw new IllegalArgumentException("All batchable read requests for the same "
+                                                       + "table must have the same 'consistentRead' "
+                                                       + "setting.");
+                }
+            }
+        }
+        return firstRecordConsistentRead;
+    }
+
+    private static boolean compareNullableBooleans(Boolean one, Boolean two) {
+        if (one == null && two == null) {
+            return true;
+        }
+
+        if (one != null) {
+            return one.equals(two);
+        } else {
+            return false;
+        }
+    }
+
+    private static final class BuilderImpl<T> implements Builder<T> {
+        private MappedTableResource<T> mappedTableResource;
+        private List<GetItemEnhancedRequest> requests = new ArrayList<>();
+
+        private BuilderImpl() {
+        }
+
+        @Override
+        public Builder<T> mappedTableResource(MappedTableResource<T> mappedTableResource) {
+            this.mappedTableResource = mappedTableResource;
+            return this;
+        }
+
+        @Override
+        public Builder<T> addGetItem(GetItemEnhancedRequest request) {
+            requests.add(request);
+            return this;
+        }
+
+        @Override
+        public Builder<T> addGetItem(Consumer<GetItemEnhancedRequest.Builder> requestConsumer) {
+            GetItemEnhancedRequest.Builder builder = GetItemEnhancedRequest.builder();
+            requestConsumer.accept(builder);
+            return addGetItem(builder.build());
+        }
+
+        @Override
+        public Builder<T> addGetItem(Key key) {
+            return addGetItem(r -> r.key(key));
+        }
+
+        @Override
+        public Builder<T> addGetItem(T keyItem) {
+            return addGetItem(this.mappedTableResource.keyFrom(keyItem));
+        }
+
+        @Override
+        public ReadBatch build() {
+            return new ReadBatch(this);
+        }
+
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/model/ScanEnhancedRequest.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/model/ScanEnhancedRequest.java
new file mode 100644
index 000000000000..02e91c7728c9
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/model/ScanEnhancedRequest.java
@@ -0,0 +1,199 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.model;
+
+import java.util.HashMap;
+import java.util.Map;
+import software.amazon.awssdk.annotations.SdkPublicApi;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbTable;
+import software.amazon.awssdk.enhanced.dynamodb.Expression;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+
+/**
+ * Defines parameters used to when scanning a DynamoDb table or index using the scan() operation (such as
+ * {@link DynamoDbTable#scan(ScanEnhancedRequest)}).
+ * <p>
+ * All parameters are optional.
+ */
+@SdkPublicApi
+public final class ScanEnhancedRequest {
+
+    private final Map<String, AttributeValue> exclusiveStartKey;
+    private final Integer limit;
+    private final Boolean consistentRead;
+    private final Expression filterExpression;
+
+    private ScanEnhancedRequest(Builder builder) {
+        this.exclusiveStartKey = builder.exclusiveStartKey;
+        this.limit = builder.limit;
+        this.consistentRead = builder.consistentRead;
+        this.filterExpression = builder.filterExpression;
+    }
+
+    /**
+     * Creates a newly initialized builder for a request object.
+     */
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    /**
+     * Returns a builder initialized with all existing values on the request object.
+     */
+    public Builder toBuilder() {
+        return builder().exclusiveStartKey(exclusiveStartKey)
+                        .limit(limit)
+                        .consistentRead(consistentRead)
+                        .filterExpression(filterExpression);
+    }
+
+    /**
+     * Returns the value of the exclusive start key set on this request object, or null if it doesn't exist.
+     */
+    public Map<String, AttributeValue> exclusiveStartKey() {
+        return exclusiveStartKey;
+    }
+
+    /**
+     * Returns the value of limit set on this request object, or null if it doesn't exist.
+     */
+    public Integer limit() {
+        return limit;
+    }
+
+    /**
+     * Returns the value of consistent read, or false if it has not been set.
+     */
+    public Boolean consistentRead() {
+        return consistentRead;
+    }
+
+    /**
+     * Returns the return result filter {@link Expression} set on this request object, or null if it doesn't exist.
+     */
+    public Expression filterExpression() {
+        return filterExpression;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        ScanEnhancedRequest scan = (ScanEnhancedRequest) o;
+
+        if (exclusiveStartKey != null ? ! exclusiveStartKey.equals(scan.exclusiveStartKey) :
+            scan.exclusiveStartKey != null) {
+            return false;
+        }
+        if (limit != null ? ! limit.equals(scan.limit) : scan.limit != null) {
+            return false;
+        }
+        if (consistentRead != null ? ! consistentRead.equals(scan.consistentRead) : scan.consistentRead != null) {
+            return false;
+        }
+        return filterExpression != null ? filterExpression.equals(scan.filterExpression) : scan.filterExpression == null;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = exclusiveStartKey != null ? exclusiveStartKey.hashCode() : 0;
+        result = 31 * result + (limit != null ? limit.hashCode() : 0);
+        result = 31 * result + (consistentRead != null ? consistentRead.hashCode() : 0);
+        result = 31 * result + (filterExpression != null ? filterExpression.hashCode() : 0);
+        return result;
+    }
+
+    /**
+     * A builder that is used to create a request with the desired parameters.
+     */
+    public static final class Builder {
+        private Map<String, AttributeValue> exclusiveStartKey;
+        private Integer limit;
+        private Boolean consistentRead;
+        private Expression filterExpression;
+
+        private Builder() {
+        }
+
+        /**
+         * The primary key of the first item that this operation will evaluate. By default, the operation will evaluate
+         * the whole dataset. If used, normally this parameter is populated with the value that was returned for
+         * {@link Page#lastEvaluatedKey()} in the previous operation.
+         *
+         * @param exclusiveStartKey the primary key value where DynamoDb should start to evaluate items
+         * @return a builder of this type
+         */
+        public Builder exclusiveStartKey(Map<String, AttributeValue> exclusiveStartKey) {
+            this.exclusiveStartKey = exclusiveStartKey != null ? new HashMap<>(exclusiveStartKey) : null;
+            return this;
+        }
+
+        /**
+         * Sets a limit on how many items to evaluate in the scan. If not set, the operation uses
+         * the maximum values allowed.
+         * <p>
+         * <b>Note:</b>The limit does not refer to the number of items to return, but how many items
+         * the database should evaluate while executing the scan. Use limit together with {@link Page#lastEvaluatedKey()}
+         * and {@link #exclusiveStartKey} in subsequent scan calls to evaluate <em>limit</em> items per call.
+         *
+         * @param limit the maximum number of items to evalute
+         * @return a builder of this type
+         */
+        public Builder limit(Integer limit) {
+            this.limit = limit;
+            return this;
+        }
+
+        /**
+         * Determines the read consistency model: If set to true, the operation uses strongly consistent reads; otherwise,
+         * the operation uses eventually consistent reads.
+         * <p>
+         * By default, the value of this property is set to <em>false</em>.
+         *
+         * @param consistentRead sets consistency model of the operation to use strong consistency if true
+         * @return a builder of this type
+         */
+        public Builder consistentRead(Boolean consistentRead) {
+            this.consistentRead = consistentRead;
+            return this;
+        }
+
+        /**
+         * Refines the scan results by applying the filter expression on the results returned
+         * from the scan and discards items that do not match. See {@link Expression} for examples
+         * and constraints.
+         * <p>
+         * <b>Note:</b> Using the filter expression does not reduce the cost of the scan, since it is applied
+         * <em>after</em> the database has found matching items.
+         *
+         * @param filterExpression an expression that filters results of evaluating the scan
+         * @return a builder of this type
+         */
+        public Builder filterExpression(Expression filterExpression) {
+            this.filterExpression = filterExpression;
+            return this;
+        }
+
+        public ScanEnhancedRequest build() {
+            return new ScanEnhancedRequest(this);
+        }
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/model/TransactGetItemsEnhancedRequest.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/model/TransactGetItemsEnhancedRequest.java
new file mode 100644
index 000000000000..b26ce89b5eea
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/model/TransactGetItemsEnhancedRequest.java
@@ -0,0 +1,144 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.model;
+
+import static software.amazon.awssdk.enhanced.dynamodb.internal.EnhancedClientUtils.getItemsFromSupplier;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.Supplier;
+import software.amazon.awssdk.annotations.SdkPublicApi;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClient;
+import software.amazon.awssdk.enhanced.dynamodb.Key;
+import software.amazon.awssdk.enhanced.dynamodb.MappedTableResource;
+import software.amazon.awssdk.enhanced.dynamodb.internal.operations.GetItemOperation;
+import software.amazon.awssdk.enhanced.dynamodb.internal.operations.OperationContext;
+import software.amazon.awssdk.enhanced.dynamodb.internal.operations.TransactableReadOperation;
+import software.amazon.awssdk.services.dynamodb.model.TransactGetItem;
+
+/**
+ * Defines parameters used for the transaction operation transactGetItems() (such as
+ * {@link DynamoDbEnhancedClient#transactGetItems(TransactGetItemsEnhancedRequest)}).
+ * <p>
+ * A request contains references to the primary keys for the items this operation will search for.
+ * It's populated with one or more {@link GetItemEnhancedRequest}, each associated with with the table where the item is located.
+ * On initialization, these requests are transformed into {@link TransactGetItem} and stored in the request.
+ * .
+ */
+@SdkPublicApi
+public final class TransactGetItemsEnhancedRequest {
+
+    private final List<TransactGetItem> transactGetItems;
+
+    private TransactGetItemsEnhancedRequest(Builder builder) {
+        this.transactGetItems = getItemsFromSupplier(builder.itemSupplierList);
+    }
+
+    /**
+     * Creates a newly initialized builder for a request object.
+     */
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    /**
+     * Returns the list of {@link TransactGetItem} that represents all lookup keys in the request.
+     */
+    public List<TransactGetItem> transactGetItems() {
+        return transactGetItems;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        TransactGetItemsEnhancedRequest that = (TransactGetItemsEnhancedRequest) o;
+
+        return transactGetItems != null ? transactGetItems.equals(that.transactGetItems) : that.transactGetItems == null;
+    }
+
+    @Override
+    public int hashCode() {
+        return transactGetItems != null ? transactGetItems.hashCode() : 0;
+    }
+
+    /**
+     * A builder that is used to create a transaction object with the desired parameters.
+     * <p>
+     * A valid builder should contain at least one {@link GetItemEnhancedRequest} added through addGetItem().
+     */
+    public static final class Builder {
+        private List<Supplier<TransactGetItem>> itemSupplierList = new ArrayList<>();
+
+        private Builder() {
+        }
+
+        /**
+         * Adds a primary lookup key and it's associated table to the transaction.
+         *
+         * @param mappedTableResource the table where the key is located
+         * @param request A {@link GetItemEnhancedRequest}
+         * @return a builder of this type
+         */
+        public Builder addGetItem(MappedTableResource<?> mappedTableResource, GetItemEnhancedRequest request) {
+            itemSupplierList.add(() -> generateTransactWriteItem(mappedTableResource, GetItemOperation.create(request)));
+            return this;
+        }
+
+        /**
+         * Adds a primary lookup key and it's associated table to the transaction.
+         *
+         * @param mappedTableResource the table where the key is located
+         * @param key the primary key of an item to retrieve as part of the transaction
+         * @return a builder of this type
+         */
+        public Builder addGetItem(MappedTableResource<?> mappedTableResource, Key key) {
+            return addGetItem(mappedTableResource, GetItemEnhancedRequest.builder().key(key).build());
+        }
+
+        /**
+         * Adds a primary lookup key and it's associated table to the transaction.
+         *
+         * @param mappedTableResource the table where the key is located
+         * @param keyItem an item that will have its key fields used to match a record to retrieve from the database
+         * @param <T> the type of modelled objects in the table
+         * @return a builder of this type
+         */
+        public <T> Builder addGetItem(MappedTableResource<T> mappedTableResource,
+                                      T keyItem) {
+            return addGetItem(mappedTableResource, mappedTableResource.keyFrom(keyItem));
+        }
+
+        /**
+         * Builds a {@link TransactGetItemsEnhancedRequest} from the values stored in this builder.
+         */
+        public TransactGetItemsEnhancedRequest build() {
+            return new TransactGetItemsEnhancedRequest(this);
+        }
+
+        private <T> TransactGetItem generateTransactWriteItem(MappedTableResource<T> mappedTableResource,
+                                                              TransactableReadOperation<T> generator) {
+            return generator.generateTransactGetItem(mappedTableResource.tableSchema(),
+                                                     OperationContext.create(mappedTableResource.tableName()),
+                                                     mappedTableResource.mapperExtension());
+        }
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/model/TransactWriteItemsEnhancedRequest.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/model/TransactWriteItemsEnhancedRequest.java
new file mode 100644
index 000000000000..327bf17cd18e
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/model/TransactWriteItemsEnhancedRequest.java
@@ -0,0 +1,267 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.model;
+
+import static software.amazon.awssdk.enhanced.dynamodb.internal.EnhancedClientUtils.getItemsFromSupplier;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.Consumer;
+import java.util.function.Supplier;
+import software.amazon.awssdk.annotations.SdkPublicApi;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClient;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbTable;
+import software.amazon.awssdk.enhanced.dynamodb.Key;
+import software.amazon.awssdk.enhanced.dynamodb.MappedTableResource;
+import software.amazon.awssdk.enhanced.dynamodb.internal.operations.DeleteItemOperation;
+import software.amazon.awssdk.enhanced.dynamodb.internal.operations.OperationContext;
+import software.amazon.awssdk.enhanced.dynamodb.internal.operations.PutItemOperation;
+import software.amazon.awssdk.enhanced.dynamodb.internal.operations.TransactableWriteOperation;
+import software.amazon.awssdk.enhanced.dynamodb.internal.operations.UpdateItemOperation;
+import software.amazon.awssdk.services.dynamodb.model.TransactWriteItem;
+
+/**
+ * Defines parameters used for the transaction operation transactWriteItems() (such as
+ * {@link DynamoDbEnhancedClient#transactWriteItems(TransactWriteItemsEnhancedRequest)}).
+ * <p>
+ * A request contains parameters for the different actions available in the operation:
+ * <ul>
+ *     <li>Write/Update items through put and update actions</li>
+ *     <li>Delete items</li>
+ *     <li>Use a condition check</li>
+ * </ul>
+ * It's populated with one or more low-level requests, such as {@link PutItemEnhancedRequest} and each low-level action request
+ * is associated with with the table where the action should be applied.
+ * On initialization, these requests are transformed into {@link TransactWriteItem} and stored in the request.
+ */
+@SdkPublicApi
+public final class TransactWriteItemsEnhancedRequest {
+
+    private final List<TransactWriteItem> transactWriteItems;
+
+    private TransactWriteItemsEnhancedRequest(Builder builder) {
+        this.transactWriteItems = getItemsFromSupplier(builder.itemSupplierList);
+    }
+
+    /**
+     * Creates a newly initialized builder for a request object.
+     */
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    /**
+     * Returns the list of {@link TransactWriteItem} that represents all actions in the request.
+     */
+    public List<TransactWriteItem> transactWriteItems() {
+        return transactWriteItems;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        TransactWriteItemsEnhancedRequest that = (TransactWriteItemsEnhancedRequest) o;
+
+        return transactWriteItems != null ? transactWriteItems.equals(that.transactWriteItems) : that.transactWriteItems == null;
+    }
+
+    @Override
+    public int hashCode() {
+        return transactWriteItems != null ? transactWriteItems.hashCode() : 0;
+    }
+
+    /**
+     * A builder that is used to create a transaction object with the desired parameters.
+     * <p>
+     * A valid builder should contain at least one low-level request such as {@link DeleteItemEnhancedRequest}.
+     */
+    public static final class Builder {
+        private List<Supplier<TransactWriteItem>> itemSupplierList = new ArrayList<>();
+
+        private Builder() {
+        }
+
+        /**
+         * Adds a condition check for a primary key in the associated table to the transaction.
+         * <p>
+         * <b>Note:</b> The condition check should be applied to an item that is not modified by another action in the
+         * same transaction. See {@link ConditionCheck} for more information on how to build a condition check, and the
+         * DynamoDb TransactWriteItems documentation for more information on how a condition check affects the transaction.
+         *
+         * @param mappedTableResource the table on which to apply the condition check
+         * @param request A {@link ConditionCheck} definition
+         * @param <T> the type of modelled objects in the table
+         * @return a builder of this type
+         */
+        public <T> Builder addConditionCheck(MappedTableResource<T> mappedTableResource, ConditionCheck<T> request) {
+            itemSupplierList.add(() -> generateTransactWriteItem(mappedTableResource, request));
+            return this;
+        }
+
+        /**
+         * Adds a condition check for a primary key in the associated table to the transaction by accepting a consumer
+         * of {@link ConditionCheck.Builder}.
+         * <p>
+         * <b>Note:</b> The condition check should be applied to an item that is not modified by another action in the
+         * same transaction. See {@link ConditionCheck} for more information on how to build a condition check, and the
+         * DynamoDb TransactWriteItems documentation for more information on how a condition check affects the transaction.
+         *
+         * @param mappedTableResource the table on which to apply the condition check
+         * @param requestConsumer a {@link Consumer} of {@link DeleteItemEnhancedRequest}
+         * @param <T> the type of modelled objects in the table
+         * @return a builder of this type
+         */
+        public <T> Builder addConditionCheck(MappedTableResource<T> mappedTableResource,
+                                             Consumer<ConditionCheck.Builder> requestConsumer) {
+            ConditionCheck.Builder builder = ConditionCheck.builder();
+            requestConsumer.accept(builder);
+            return addConditionCheck(mappedTableResource, builder.build());
+        }
+
+        /**
+         * Adds a primary lookup key for the item to delete, and it's associated table, to the transaction. For more information
+         * on the delete action, see the low-level operation description in for instance
+         * {@link DynamoDbTable#deleteItem(DeleteItemEnhancedRequest)} and how to construct the low-level request in
+         * {@link DeleteItemEnhancedRequest}.
+         *
+         * @param mappedTableResource the table where the key is located
+         * @param request A {@link DeleteItemEnhancedRequest}
+         * @param <T> the type of modelled objects in the table
+         * @return a builder of this type
+         */
+        public <T> Builder addDeleteItem(MappedTableResource<T> mappedTableResource, DeleteItemEnhancedRequest request) {
+            itemSupplierList.add(() -> generateTransactWriteItem(mappedTableResource, DeleteItemOperation.create(request)));
+            return this;
+        }
+
+        /**
+         * Adds a primary lookup key for the item to delete, and it's associated table, to the transaction. For more
+         * information on the delete action, see the low-level operation description in for instance
+         * {@link DynamoDbTable#deleteItem(DeleteItemEnhancedRequest)}.
+         *
+         * @param mappedTableResource the table where the key is located
+         * @param key a {@link Key} that identifies the record to be deleted as part of the transaction.
+         * @param <T> the type of modelled objects in the table
+         * @return a builder of this type
+         */
+        public <T> Builder addDeleteItem(MappedTableResource<T> mappedTableResource, Key key) {
+            return addDeleteItem(mappedTableResource, DeleteItemEnhancedRequest.builder().key(key).build());
+        }
+
+        /**
+         * Adds a primary lookup key for the item to delete, and it's associated table, to the transaction. For more
+         * information on the delete action, see the low-level operation description in for instance
+         * {@link DynamoDbTable#deleteItem(DeleteItemEnhancedRequest)}.
+         *
+         * @param mappedTableResource the table where the key is located
+         * @param keyItem an item that will have its key fields used to match a record to retrieve from the database
+         * @param <T> the type of modelled objects in the table
+         * @return a builder of this type
+         */
+        public <T> Builder addDeleteItem(MappedTableResource<T> mappedTableResource, T keyItem) {
+            return addDeleteItem(mappedTableResource, mappedTableResource.keyFrom(keyItem));
+        }
+
+        /**
+         * Adds an item to be written, and it's associated table, to the transaction. For more information on the put action,
+         * see the low-level operation description in for instance {@link DynamoDbTable#putItem(PutItemEnhancedRequest)}
+         * and how to construct the low-level request in {@link PutItemEnhancedRequest}.
+         *
+         * @param mappedTableResource the table to write the item to
+         * @param request A {@link PutItemEnhancedRequest}
+         * @param <T> the type of modelled objects in the table
+         * @return a builder of this type
+         */
+        public <T> Builder addPutItem(MappedTableResource<T> mappedTableResource, PutItemEnhancedRequest<T> request) {
+            itemSupplierList.add(() -> generateTransactWriteItem(mappedTableResource, PutItemOperation.create(request)));
+            return this;
+        }
+
+        /**
+         * Adds an item to be written, and it's associated table, to the transaction. For more information on the put
+         * action, see the low-level operation description in for instance
+         * {@link DynamoDbTable#putItem(PutItemEnhancedRequest)}.
+         *
+         * @param mappedTableResource the table to write the item to
+         * @param item the item to be inserted or overwritten in the database
+         * @param <T> the type of modelled objects in the table
+         * @return a builder of this type
+         */
+        public <T> Builder addPutItem(MappedTableResource<T> mappedTableResource, T item) {
+            return addPutItem(
+                mappedTableResource,
+                PutItemEnhancedRequest.builder(mappedTableResource.tableSchema().itemType().rawClass())
+                                      .item(item)
+                                      .build());
+        }
+
+        /**
+         * Adds an item to be updated, and it's associated table, to the transaction. For more information on the update
+         * action, see the low-level operation description in for instance
+         * {@link DynamoDbTable#updateItem(UpdateItemEnhancedRequest)} and how to construct the low-level request in
+         * {@link UpdateItemEnhancedRequest}.
+         *
+         * @param mappedTableResource the table to write the item to
+         * @param request A {@link UpdateItemEnhancedRequest}
+         * @param <T> the type of modelled objects in the table
+         * @return a builder of this type
+         */
+        public <T> Builder addUpdateItem(MappedTableResource<T> mappedTableResource,
+                                         UpdateItemEnhancedRequest<T> request) {
+            itemSupplierList.add(() -> generateTransactWriteItem(mappedTableResource,
+                                                                 UpdateItemOperation.create(request)));
+            return this;
+        }
+
+        /**
+         * Adds an item to be updated, and it's associated table, to the transaction. For more information on the update
+         * action, see the low-level operation description in for instance
+         * {@link DynamoDbTable#updateItem(UpdateItemEnhancedRequest)}.
+         *
+         * @param mappedTableResource the table to write the item to
+         * @param item an item to update or insert into the database as part of this transaction
+         * @param <T> the type of modelled objects in the table
+         * @return a builder of this type
+         */
+        public <T> Builder addUpdateItem(MappedTableResource<T> mappedTableResource, T item) {
+            return addUpdateItem(
+                mappedTableResource,
+                UpdateItemEnhancedRequest.builder(mappedTableResource.tableSchema().itemType().rawClass())
+                                         .item(item)
+                                         .build());
+        }
+
+        /**
+         * Builds a {@link TransactWriteItemsEnhancedRequest} from the values stored in this builder.
+         */
+        public TransactWriteItemsEnhancedRequest build() {
+            return new TransactWriteItemsEnhancedRequest(this);
+        }
+
+        private <T> TransactWriteItem generateTransactWriteItem(MappedTableResource<T> mappedTableResource,
+                                                                TransactableWriteOperation<T> generator) {
+            return generator.generateTransactWriteItem(mappedTableResource.tableSchema(),
+                                                       OperationContext.create(mappedTableResource.tableName()),
+                                                       mappedTableResource.mapperExtension());
+        }
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/model/UpdateItemEnhancedRequest.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/model/UpdateItemEnhancedRequest.java
new file mode 100644
index 000000000000..64a380033c30
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/model/UpdateItemEnhancedRequest.java
@@ -0,0 +1,166 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.model;
+
+import software.amazon.awssdk.annotations.SdkPublicApi;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbAsyncTable;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbTable;
+import software.amazon.awssdk.enhanced.dynamodb.Expression;
+import software.amazon.awssdk.enhanced.dynamodb.TableSchema;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+
+/**
+ * Defines parameters used to update an item to a DynamoDb table using the updateItem() operation (such as
+ * {@link DynamoDbTable#updateItem(UpdateItemEnhancedRequest)} or
+ * {@link DynamoDbAsyncTable#updateItem(UpdateItemEnhancedRequest)}).
+ * <p>
+ * A valid request object must contain the item that should be written to the table.
+ *
+ * @param <T> The type of the modelled object.
+ */
+@SdkPublicApi
+public final class UpdateItemEnhancedRequest<T> {
+
+    private final T item;
+    private final Boolean ignoreNulls;
+    private final Expression conditionExpression;
+
+    private UpdateItemEnhancedRequest(Builder<T> builder) {
+        this.item = builder.item;
+        this.ignoreNulls = builder.ignoreNulls;
+        this.conditionExpression = builder.conditionExpression;
+    }
+
+    /**
+     * Creates a newly initialized builder for the request object.
+     *
+     * @param itemClass the class that items in this table map to
+     * @param <T> The type of the modelled object, corresponding to itemClass
+     * @return a UpdateItemEnhancedRequest builder
+     */
+    public static <T> Builder<T> builder(Class<? extends T> itemClass) {
+        return new Builder<>();
+    }
+
+    /**
+     * Returns a builder initialized with all existing values on the request object.
+     */
+    public Builder<T> toBuilder() {
+        return new Builder<T>().item(item).ignoreNulls(ignoreNulls);
+    }
+
+    /**
+     * Returns the item for this update operation request.
+     */
+    public T item() {
+        return item;
+    }
+
+    /**
+     * Returns if the update operation should ignore attributes with null values, or false if it has not been set.
+     */
+    public Boolean ignoreNulls() {
+        return ignoreNulls;
+    }
+
+    /**
+     * Returns the condition {@link Expression} set on this request object, or null if it doesn't exist.
+     */
+    public Expression conditionExpression() {
+        return conditionExpression;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        UpdateItemEnhancedRequest<?> that = (UpdateItemEnhancedRequest<?>) o;
+
+        if (item != null ? ! item.equals(that.item) : that.item != null) {
+            return false;
+        }
+        return ignoreNulls != null ? ignoreNulls.equals(that.ignoreNulls) : that.ignoreNulls == null;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = item != null ? item.hashCode() : 0;
+        result = 31 * result + (ignoreNulls != null ? ignoreNulls.hashCode() : 0);
+        return result;
+    }
+
+    /**
+     * A builder that is used to create a request with the desired parameters.
+     * <p>
+     * <b>Note</b>: A valid request builder must define an item.
+     */
+    public static final class Builder<T> {
+        private T item;
+        private Boolean ignoreNulls;
+        private Expression conditionExpression;
+
+        private Builder() {
+        }
+
+        /**
+         *  Sets if the update operation should ignore attributes with null values. By default, the value is false.
+         *  <p>
+         *  If set to true, any null values in the Java object will not be written to the table.
+         *  If set to false, null values in the Java object will be written to the table (as an {@link AttributeValue} of type
+         *  'nul' in the output map, see {@link TableSchema#itemToMap(Object, boolean)}).
+         * @param ignoreNulls the boolean value
+         * @return a builder of this type
+         */
+        public Builder<T> ignoreNulls(Boolean ignoreNulls) {
+            this.ignoreNulls = ignoreNulls;
+            return this;
+        }
+
+        /**
+         * Defines a logical expression on an item's attribute values which, if evaluating to true,
+         * will allow the delete operation to succeed. If evaluating to false, the operation will not succeed.
+         * <p>
+         * See {@link Expression} for condition syntax and examples.
+         *
+         * @param conditionExpression a condition written as an {@link Expression}
+         * @return a builder of this type
+         */
+        public Builder<T> conditionExpression(Expression conditionExpression) {
+            this.conditionExpression = conditionExpression;
+            return this;
+        }
+
+        /**
+         * Sets the item to write to DynamoDb. Required.
+         *
+         * @param item the item to write
+         * @return a builder of this type
+         */
+        public Builder<T> item(T item) {
+            this.item = item;
+            return this;
+        }
+
+        public UpdateItemEnhancedRequest<T> build() {
+            return new UpdateItemEnhancedRequest<>(this);
+        }
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/model/WriteBatch.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/model/WriteBatch.java
new file mode 100644
index 000000000000..7c747d040c80
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/model/WriteBatch.java
@@ -0,0 +1,249 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.model;
+
+import static software.amazon.awssdk.enhanced.dynamodb.internal.EnhancedClientUtils.getItemsFromSupplier;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.function.Consumer;
+import java.util.function.Supplier;
+import software.amazon.awssdk.annotations.SdkPublicApi;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClient;
+import software.amazon.awssdk.enhanced.dynamodb.Key;
+import software.amazon.awssdk.enhanced.dynamodb.MappedTableResource;
+import software.amazon.awssdk.enhanced.dynamodb.internal.operations.BatchableWriteOperation;
+import software.amazon.awssdk.enhanced.dynamodb.internal.operations.DeleteItemOperation;
+import software.amazon.awssdk.enhanced.dynamodb.internal.operations.OperationContext;
+import software.amazon.awssdk.enhanced.dynamodb.internal.operations.PutItemOperation;
+import software.amazon.awssdk.services.dynamodb.model.WriteRequest;
+
+/**
+ * Defines a collection of references to keys for delete actions and items for put actions
+ * for one specific table. A WriteBatch is part of a {@link BatchWriteItemEnhancedRequest}
+ * and used in a batchWriteItem() operation (such as
+ * {@link DynamoDbEnhancedClient#batchWriteItem(BatchWriteItemEnhancedRequest)}).
+ * <p>
+ * A valid write batch should contain one or more delete or put action reference.
+ */
+@SdkPublicApi
+public final class WriteBatch {
+    private final String tableName;
+    private final List<WriteRequest> writeRequests;
+
+    private WriteBatch(BuilderImpl<?> builder) {
+        this.tableName = builder.mappedTableResource != null ? builder.mappedTableResource.tableName() : null;
+        this.writeRequests = getItemsFromSupplier(builder.itemSupplierList);
+    }
+
+    /**
+     * Creates a newly initialized builder for a write batch.
+     *
+     * @param itemClass the class that items in this table map to
+     * @param <T> The type of the modelled object, corresponding to itemClass
+     * @return a WriteBatch builder
+     */
+    public static <T> Builder<T> builder(Class<? extends T> itemClass) {
+        return new BuilderImpl<>(itemClass);
+    }
+
+    /**
+     * Returns the table name associated with this batch.
+     */
+    public String tableName() {
+        return tableName;
+    }
+
+    /**
+     * Returns the collection of write requests in this writek batch.
+     */
+    public Collection<WriteRequest> writeRequests() {
+        return writeRequests;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        WriteBatch that = (WriteBatch) o;
+
+        if (tableName != null ? !tableName.equals(that.tableName)
+                              : that.tableName != null) {
+
+            return false;
+        }
+        return writeRequests != null ? writeRequests.equals(that.writeRequests) : that.writeRequests == null;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = tableName != null ? tableName.hashCode() : 0;
+        result = 31 * result + (writeRequests != null ? writeRequests.hashCode() : 0);
+        return result;
+    }
+
+    /**
+     * A builder that is used to create a request with the desired parameters.
+     * <p>
+     * A valid builder must define a {@link MappedTableResource} and add at least one
+     * {@link DeleteItemEnhancedRequest} or {@link PutItemEnhancedRequest}.
+     *
+     * @param <T> the type that items in this table map to
+     */
+    public interface Builder<T> {
+
+        /**
+         * Sets the mapped table resource (table) that the items in this write batch should come from.
+         *
+         * @param mappedTableResource the table reference
+         * @return a builder of this type
+         */
+        Builder<T> mappedTableResource(MappedTableResource<T> mappedTableResource);
+
+        /**
+         * Adds a {@link DeleteItemEnhancedRequest} to the builder, this request should contain
+         * the primary {@link Key} to an item to be deleted.
+         *
+         * @param request A {@link DeleteItemEnhancedRequest}
+         * @return a builder of this type
+         */
+        Builder<T> addDeleteItem(DeleteItemEnhancedRequest request);
+
+        /**
+         * Adds a {@link DeleteItemEnhancedRequest} to the builder, this request should contain
+         * the primary {@link Key} to an item to be deleted.
+         *
+         * @param requestConsumer a {@link Consumer} of {@link DeleteItemEnhancedRequest}
+         * @return a builder of this type
+         */
+        Builder<T> addDeleteItem(Consumer<DeleteItemEnhancedRequest.Builder> requestConsumer);
+
+        /**
+         * Adds a DeleteItem request to the builder.
+         *
+         * @param key a {@link Key} to match the item to be deleted from the database.
+         * @return a builder of this type
+         */
+        Builder<T> addDeleteItem(Key key);
+
+        /**
+         * Adds a DeleteItem request to the builder.
+         *
+         * @param keyItem an item that will have its key fields used to match a record to delete from the database.
+         * @return a builder of this type
+         */
+        Builder<T> addDeleteItem(T keyItem);
+
+        /**
+         * Adds a {@link PutItemEnhancedRequest} to the builder, this request should contain the item
+         * to be written.
+         *
+         * @param request A {@link PutItemEnhancedRequest}
+         * @return a builder of this type
+         */
+        Builder<T> addPutItem(PutItemEnhancedRequest<T> request);
+
+        /**
+         * Adds a {@link PutItemEnhancedRequest} to the builder, this request should contain the item
+         * to be written.
+         *
+         * @param requestConsumer a {@link Consumer} of {@link PutItemEnhancedRequest}
+         * @return a builder of this type
+         */
+        Builder<T> addPutItem(Consumer<PutItemEnhancedRequest.Builder<T>> requestConsumer);
+
+        /**
+         * Adds a PutItem request to the builder.
+         *
+         * @param item the item to insert or overwrite in the database.
+         * @return a builder of this type
+         */
+        Builder<T> addPutItem(T item);
+
+        WriteBatch build();
+    }
+
+    private static final class BuilderImpl<T> implements Builder<T> {
+
+        private Class<? extends T> itemClass;
+        private List<Supplier<WriteRequest>> itemSupplierList = new ArrayList<>();
+        private MappedTableResource<T> mappedTableResource;
+
+        private BuilderImpl(Class<? extends T> itemClass) {
+            this.itemClass = itemClass;
+        }
+
+        public Builder<T> mappedTableResource(MappedTableResource<T> mappedTableResource) {
+            this.mappedTableResource = mappedTableResource;
+            return this;
+        }
+
+        public Builder<T> addDeleteItem(DeleteItemEnhancedRequest request) {
+            itemSupplierList.add(() -> generateWriteRequest(() -> mappedTableResource, DeleteItemOperation.create(request)));
+            return this;
+        }
+
+        public Builder<T> addDeleteItem(Consumer<DeleteItemEnhancedRequest.Builder> requestConsumer) {
+            DeleteItemEnhancedRequest.Builder builder = DeleteItemEnhancedRequest.builder();
+            requestConsumer.accept(builder);
+            return addDeleteItem(builder.build());
+        }
+
+        @Override
+        public Builder<T> addDeleteItem(Key key) {
+            return addDeleteItem(r -> r.key(key));
+        }
+
+        @Override
+        public Builder<T> addDeleteItem(T keyItem) {
+            return addDeleteItem(this.mappedTableResource.keyFrom(keyItem));
+        }
+
+        public Builder<T> addPutItem(PutItemEnhancedRequest<T> request) {
+            itemSupplierList.add(() -> generateWriteRequest(() -> mappedTableResource, PutItemOperation.create(request)));
+            return this;
+        }
+
+        public Builder<T> addPutItem(Consumer<PutItemEnhancedRequest.Builder<T>> requestConsumer) {
+            PutItemEnhancedRequest.Builder<T> builder = PutItemEnhancedRequest.builder(this.itemClass);
+            requestConsumer.accept(builder);
+            return addPutItem(builder.build());
+        }
+
+        @Override
+        public Builder<T> addPutItem(T item) {
+            return addPutItem(r -> r.item(item));
+        }
+
+        public WriteBatch build() {
+            return new WriteBatch(this);
+        }
+
+        private WriteRequest generateWriteRequest(Supplier<MappedTableResource<T>> mappedTableResourceSupplier,
+                                                  BatchableWriteOperation<T> operation) {
+            return operation.generateWriteRequest(mappedTableResourceSupplier.get().tableSchema(),
+                                                  OperationContext.create(mappedTableResourceSupplier.get().tableName()),
+                                                  mappedTableResourceSupplier.get().mapperExtension());
+        }
+    }
+
+}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/AttributeValues.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/AttributeValues.java
deleted file mode 100644
index dde935be13b1..000000000000
--- a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/AttributeValues.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.extensions.dynamodb.mappingclient;
-
-import java.nio.ByteBuffer;
-
-import software.amazon.awssdk.annotations.SdkPublicApi;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.staticmapper.AttributeTypes;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-
-/**
- * This static helper class contains some literal {@link AttributeValue} constants and converters. Primarily these
- * will be used if constructing a literal key object or for use in a custom filter expression. Eg:
- *
- * {@code Key<?> myKey = Key.of(stringValue("id123"), numberValue(4.23));
- * Expression filterExpression = Expression.of("id = :filter_id", singletonMap(":filter_id", stringValue("id123")); }
- */
-@SdkPublicApi
-public final class AttributeValues {
-    private static final AttributeValue NULL_ATTRIBUTE_VALUE = AttributeValue.builder().nul(true).build();
-
-    private AttributeValues() {
-    }
-
-    /**
-     * The constant that represents a 'null' in a DynamoDb record.
-     * @return An {@link AttributeValue} of type NUL that represents 'null'.
-     */
-    public static AttributeValue nullAttributeValue() {
-        return NULL_ATTRIBUTE_VALUE;
-    }
-
-    /**
-     * Creates a literal string {@link AttributeValue}.
-     * @param value A string to create the literal from.
-     * @return An {@link AttributeValue} of type S that represents the string literal.
-     */
-    public static AttributeValue stringValue(String value) {
-        return AttributeTypes.stringType().objectToAttributeValue(value);
-    }
-
-    /**
-     * Creates a literal numeric {@link AttributeValue} from any type of Java number.
-     * @param value A number to create the literal from.
-     * @return An {@link AttributeValue} of type n that represents the numeric literal.
-     */
-    public static AttributeValue numberValue(Number value) {
-        return AttributeTypes.numberType(null).objectToAttributeValue(value);
-    }
-
-    /**
-     * Creates a literal binary {@link AttributeValue} from a Java {@link ByteBuffer}.
-     * @param value A {@link ByteBuffer} to create the literal from.
-     * @return An {@link AttributeValue} of type B that represents the binary literal.
-     */
-    public static AttributeValue binaryValue(ByteBuffer value) {
-        return AttributeTypes.binaryType().objectToAttributeValue(value);
-    }
-
-    /**
-     * A helper method to test if an {@link AttributeValue} is a 'null' constant. This will not test if the
-     * AttributeValue object is null itself, and in fact will throw a NullPointerException if you pass in null.
-     * @param attributeValue An {@link AttributeValue} to test for null.
-     * @return true if the supplied AttributeValue represents a null value, or false if it does not.
-     */
-    public static boolean isNullAttributeValue(AttributeValue attributeValue) {
-        return attributeValue.nul() != null && attributeValue.nul();
-    }
-}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/BatchableReadOperation.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/BatchableReadOperation.java
deleted file mode 100644
index 875b4c920df2..000000000000
--- a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/BatchableReadOperation.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.extensions.dynamodb.mappingclient;
-
-import software.amazon.awssdk.annotations.SdkProtectedApi;
-
-@SdkProtectedApi
-public interface BatchableReadOperation {
-    Boolean getConsistentRead();
-
-    Key getKey();
-}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/BatchableWriteOperation.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/BatchableWriteOperation.java
deleted file mode 100644
index ffc6fad67044..000000000000
--- a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/BatchableWriteOperation.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.extensions.dynamodb.mappingclient;
-
-import software.amazon.awssdk.annotations.SdkProtectedApi;
-import software.amazon.awssdk.services.dynamodb.model.WriteRequest;
-
-@SdkProtectedApi
-public interface BatchableWriteOperation<T> {
-    WriteRequest generateWriteRequest(TableSchema<T> tableSchema,
-                                      OperationContext context,
-                                      MapperExtension mapperExtension);
-}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/CommonOperation.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/CommonOperation.java
deleted file mode 100644
index 3b94b8fd6018..000000000000
--- a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/CommonOperation.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.extensions.dynamodb.mappingclient;
-
-import java.util.function.Function;
-
-import software.amazon.awssdk.annotations.SdkPublicApi;
-import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
-
-/**
- * Common interface for a single operation that can be executed against a mapped database table. These operations can be
- * made against either the primary index of a table or a secondary index, although some implementations of this
- * interface do not support secondary indices and will throw an exception when executed against one. Conceptually an
- * operation maps 1:1 with an actual DynamoDb call.
- *
- * This interface is extended by {@link TableOperation} and {@link IndexOperation} which contain implementations of
- * the behavior to actually execute the operation in the context of a table or secondary index and are used by
- * {@link MappedTable} and {@link MappedIndex} respectively. By sharing this common interface operations are able to
- * re-use code regardless of whether they are executed in the context of a primary or secondary index.
- *
- * @param <ItemT> The modelled object that this table maps records to.
- * @param <RequestT>  The type of the request object for the DynamoDb call in the low level {@link DynamoDbClient}.
- * @param <ResponseT> The type of the response object for the DynamoDb call in the low level {@link DynamoDbClient}.
- * @param <ResultT> The type of the mapped result object that will be returned by the execution of this operation.
- */
-@SdkPublicApi
-public interface CommonOperation<ItemT, RequestT, ResponseT, ResultT> {
-    /**
-     * This method generates the request that needs to be sent to a low level {@link DynamoDbClient}.
-     * @param tableSchema A {@link TableSchema} that maps the table to a modelled object.
-     * @param context An object containing the context, or target, of the command execution.
-     * @param mapperExtension A {@link MapperExtension} that may modify the request of this operation. A null value
-     *                        here will result in no modifications.
-     * @return A request that can be used as an argument to a {@link DynamoDbClient} call to perform the operation.
-     */
-    RequestT generateRequest(TableSchema<ItemT> tableSchema, OperationContext context, MapperExtension mapperExtension);
-
-    /**
-     * Provides a function for making the low level SDK call to DynamoDb.
-     * @param dynamoDbClient A low level {@link DynamoDbClient} to make the call against.
-     * @return A function that calls DynamoDb with a provided request object and returns the response object.
-     */
-    Function<RequestT, ResponseT> getServiceCall(DynamoDbClient dynamoDbClient);
-
-    /**
-     * Takes the response object returned by the actual DynamoDb call and maps it into a higher level abstracted
-     * result object.
-     * @param response The response object returned by the DynamoDb call for this operation.
-     * @param tableSchema A {@link TableSchema} that maps the table to a modelled object.
-     * @param context An object containing the context, or target, of the command execution.
-     * @param mapperExtension A {@link MapperExtension} that may modify the result of this operation. A null value
-     *                        here will result in no modifications.
-     * @return A high level result object as specified by the implementation of this operation.
-     */
-    ResultT transformResponse(ResponseT response,
-                              TableSchema<ItemT> tableSchema,
-                              OperationContext context,
-                              MapperExtension mapperExtension);
-
-    /**
-     * Default implementation of a complete execution of this operation against either the primary or a secondary index.
-     * It performs three steps:
-     * 1) Call generateRequest() to get the request object.
-     * 2) Call getServiceCall() and call it using the request object generated in the previous step.
-     * 3) Call transformResponse() to convert the response object returned in the previous step to a high level result.
-     *
-     * @param tableSchema A {@link TableSchema} that maps the table to a modelled object.
-     * @param context An object containing the context, or target, of the command execution.
-     * @param dynamoDbClient A {@link DynamoDbClient} to make the call against.
-     * @param mapperExtension A {@link MapperExtension} that may modify the request or result of this operation. A
-     *                        null value here will result in no modifications.
-     * @return A high level result object as specified by the implementation of this operation.
-     */
-    default ResultT execute(TableSchema<ItemT> tableSchema,
-                            OperationContext context,
-                            MapperExtension mapperExtension,
-                            DynamoDbClient dynamoDbClient) {
-        RequestT request = generateRequest(tableSchema, context, mapperExtension);
-        ResponseT response = getServiceCall(dynamoDbClient).apply(request);
-        return transformResponse(response, tableSchema, context, mapperExtension);
-    }
-}
\ No newline at end of file
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/DatabaseOperation.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/DatabaseOperation.java
deleted file mode 100644
index 3569ca4043d8..000000000000
--- a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/DatabaseOperation.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.extensions.dynamodb.mappingclient;
-
-import java.util.function.Function;
-
-import software.amazon.awssdk.annotations.SdkPublicApi;
-import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
-
-/**
- * Interface for a single operation that can be executed against a mapped database. These operations do not operate
- * on a specific table or index, and may reference multiple tables and indexes (eg: batch operations). Conceptually an
- * operation maps 1:1 with an actual DynamoDb call.
- *
- * Typically a database operation will be executed by a {@link MappedDatabase} which expects a supplier:
- *
- * {@code mappedDatabase.execute(() -> databaseOperation);}
- **
- * @param <RequestT>  The type of the request object for the DynamoDb call in the low level {@link DynamoDbClient}.
- * @param <ResponseT> The type of the response object for the DynamoDb call in the low level {@link DynamoDbClient}.
- * @param <ResultT> The type of the mapped result object that will be returned by the execution of this operation.
- */
-@SdkPublicApi
-public interface DatabaseOperation<RequestT, ResponseT, ResultT> {
-    /**
-     * This method generates the request that needs to be sent to a low level {@link DynamoDbClient}.
-     * @param mapperExtension A {@link MapperExtension} that may modify the request of this operation. A null value
-     *                        here will result in no modifications.
-     * @return A request that can be used as an argument to a {@link DynamoDbClient} call to perform the operation.
-     */
-    RequestT generateRequest(MapperExtension mapperExtension);
-
-    /**
-     * Provides a function for making the low level SDK call to DynamoDb.
-     * @param dynamoDbClient A low level {@link DynamoDbClient} to make the call against.
-     * @return A function that calls DynamoDb with a provided request object and returns the response object.
-     */
-    Function<RequestT, ResponseT> getServiceCall(DynamoDbClient dynamoDbClient);
-
-    /**
-     * Takes the response object returned by the actual DynamoDb call and maps it into a higher level abstracted
-     * result object.
-     * @param response The response object returned by the DynamoDb call for this operation.
-     * @param mapperExtension A {@link MapperExtension} that may modify the result of this operation. A null value
-     *                        here will result in no modifications.
-     * @return A high level result object as specified by the implementation of this operation.
-     */
-    ResultT transformResponse(ResponseT response, MapperExtension mapperExtension);
-
-    /**
-     * Default implementation of a complete execution of this operation. It performs three steps:
-     * 1) Call generateRequest() to get the request object.
-     * 2) Call getServiceCall() and call it using the request object generated in the previous step.
-     * 3) Call transformResponse() to convert the response object returned in the previous step to a high level result.
-     *
-     * @param dynamoDbClient A {@link DynamoDbClient} to make the call against.
-     * @param mapperExtension A {@link MapperExtension} that may modify the request or result of this operation. A
-     *                        null value here will result in no modifications.
-     * @return A high level result object as specified by the implementation of this operation.
-     */
-    default ResultT execute(DynamoDbClient dynamoDbClient, MapperExtension mapperExtension) {
-        RequestT request = generateRequest(mapperExtension);
-        ResponseT response = getServiceCall(dynamoDbClient).apply(request);
-        return transformResponse(response, mapperExtension);
-    }
-}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/Expression.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/Expression.java
deleted file mode 100644
index a177dc30c622..000000000000
--- a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/Expression.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.extensions.dynamodb.mappingclient;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
-import software.amazon.awssdk.annotations.SdkPublicApi;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-
-@SdkPublicApi
-public final class Expression {
-    private final String expression;
-    private final Map<String, AttributeValue> expressionValues;
-    private final Map<String, String> expressionNames;
-
-    private Expression(String expression,
-                       Map<String, AttributeValue> expressionValues,
-                       Map<String, String> expressionNames) {
-        this.expression = expression;
-        this.expressionValues = expressionValues;
-        this.expressionNames = expressionNames;
-    }
-
-    public static Builder builder() {
-        return new Builder();
-    }
-
-    public static Expression coalesce(Expression condition1, Expression condition2, String joinToken) {
-        if (condition1 == null) {
-            return condition2;
-        }
-
-        if (condition2 == null) {
-            return condition1;
-        }
-
-        return Expression.builder()
-                         .expression(coalesceExpressions(condition1.expression, condition2.expression, joinToken))
-                         .expressionValues(coalesceValues(condition1.getExpressionValues(),
-                                                          condition2.getExpressionValues()))
-                         .expressionNames(coalesceNames(condition1.getExpressionNames(),
-                                                        condition2.getExpressionNames()))
-                         .build();
-    }
-
-    private static String coalesceExpressions(String expression1, String expression2, String joinToken) {
-        if (expression1 == null) {
-            return expression2;
-        }
-
-        if (expression2 == null) {
-            return expression1;
-        }
-
-        return expression1 + joinToken + expression2;
-    }
-
-    public static Map<String, AttributeValue> coalesceValues(Map<String, AttributeValue> expressionValues1,
-                                                             Map<String, AttributeValue> expressionValues2) {
-        if (expressionValues1 == null) {
-            return expressionValues2;
-        }
-
-        if (expressionValues2 == null) {
-            return expressionValues1;
-        }
-
-        Map<String, AttributeValue> result = new HashMap<>(expressionValues1);
-        expressionValues2.forEach((key, value) -> {
-            AttributeValue oldValue = result.put(key, value);
-
-            if (oldValue != null && !oldValue.equals(value)) {
-                throw new IllegalArgumentException(
-                    String.format("Attempt to coalesce two expressions with conflicting expression values. "
-                                  + "Expression value key = '%s'", key));
-            }
-        });
-
-        return Collections.unmodifiableMap(result);
-    }
-
-    public static Map<String, String> coalesceNames(Map<String, String> expressionValues1,
-                                                    Map<String, String> expressionValues2) {
-        if (expressionValues1 == null) {
-            return expressionValues2;
-        }
-
-        if (expressionValues2 == null) {
-            return expressionValues1;
-        }
-
-        Map<String, String> result = new HashMap<>(expressionValues1);
-        expressionValues2.forEach((key, value) -> {
-            String oldValue = result.put(key, value);
-
-            if (oldValue != null && !oldValue.equals(value)) {
-                throw new IllegalArgumentException(
-                    String.format("Attempt to coalesce two expressions with conflicting expression names. "
-                                  + "Expression name key = '%s'", key));
-            }
-        });
-
-        return Collections.unmodifiableMap(result);
-    }
-
-    public String getExpression() {
-        return expression;
-    }
-
-    public Map<String, AttributeValue> getExpressionValues() {
-        return expressionValues;
-    }
-
-    public Map<String, String> getExpressionNames() {
-        return expressionNames;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-
-        Expression that = (Expression) o;
-
-        if (expression != null ? ! expression.equals(that.expression) : that.expression != null) {
-            return false;
-        }
-        if (expressionValues != null ? ! expressionValues.equals(that.expressionValues) :
-            that.expressionValues != null) {
-            return false;
-        }
-        return expressionNames != null ? expressionNames.equals(that.expressionNames) : that.expressionNames == null;
-    }
-
-    @Override
-    public int hashCode() {
-        int result = expression != null ? expression.hashCode() : 0;
-        result = 31 * result + (expressionValues != null ? expressionValues.hashCode() : 0);
-        result = 31 * result + (expressionNames != null ? expressionNames.hashCode() : 0);
-        return result;
-    }
-
-    public static final class Builder {
-        private String expression;
-        private Map<String, AttributeValue> expressionValues;
-        private Map<String, String> expressionNames;
-
-        private Builder() {
-        }
-
-        public Builder expression(String expression) {
-            this.expression = expression;
-            return this;
-        }
-
-        public Builder expressionValues(Map<String, AttributeValue> expressionValues) {
-            this.expressionValues = expressionValues;
-            return this;
-        }
-
-        public Builder expressionNames(Map<String, String> expressionNames) {
-            this.expressionNames = expressionNames;
-            return this;
-        }
-
-        public Expression build() {
-            return new Expression(expression,
-                                  expressionValues == null ? null : Collections.unmodifiableMap(expressionValues),
-                                  expressionNames == null ? null : Collections.unmodifiableMap(expressionNames));
-        }
-    }
-}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/IndexOperation.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/IndexOperation.java
deleted file mode 100644
index 80c9b93f6072..000000000000
--- a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/IndexOperation.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.extensions.dynamodb.mappingclient;
-
-import software.amazon.awssdk.annotations.SdkPublicApi;
-import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
-
-/**
- * Interface for a single operation that can be executed against a secondary index of a mapped database table.
- * Conceptually an operation maps 1:1 with an actual DynamoDb call.
- *
- * Typically a table operation will be executed by a {@link MappedIndex}:
- *
- * {@code
- * mappedDatabase.table(tableSchema).index("an_index_name").execute(indexOperation);      // For secondary index
- * }
- *
- * A concrete implementation of this interface should also implement {@link TableOperation} with the same types if
- * the operation supports being executed against both the primary index and secondary indices.
- *
- * @param <ItemT> The modelled object that this table maps records to.
- * @param <RequestT>  The type of the request object for the DynamoDb call in the low level {@link DynamoDbClient}.
- * @param <ResponseT> The type of the response object for the DynamoDb call in the low level {@link DynamoDbClient}.
- * @param <ResultT> The type of the mapped result object that will be returned by the execution of this operation.
- */
-@SdkPublicApi
-public interface IndexOperation<ItemT, RequestT, ResponseT, ResultT>
-    extends CommonOperation<ItemT, RequestT, ResponseT, ResultT> {
-    /**
-     * Default implementation of a complete execution of this operation against a secondary index. It will construct
-     * a context based on the given table name and secondary index name and then call execute() on the
-     * {@link CommonOperation} interface to perform the operation.
-     *
-     * @param tableSchema A {@link TableSchema} that maps the table to a modelled object.
-     * @param tableName The physical name of the table that contains the secondary index to execute the operation
-     *                  against.
-     * @param indexName The physical name of the secondary index to execute the operation against.
-     * @param dynamoDbClient A {@link DynamoDbClient} to make the call against.
-     * @param mapperExtension A {@link MapperExtension} that may modify the request or result of this operation. A
-     *                        null value here will result in no modifications.
-     * @return A high level result object as specified by the implementation of this operation.
-     */
-    default ResultT executeOnSecondaryIndex(TableSchema<ItemT> tableSchema,
-                                            String tableName,
-                                            String indexName,
-                                            MapperExtension mapperExtension,
-                                            DynamoDbClient dynamoDbClient) {
-        OperationContext context = OperationContext.of(tableName, indexName);
-        return execute(tableSchema, context, mapperExtension, dynamoDbClient);
-    }
-}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/Key.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/Key.java
deleted file mode 100644
index 7df9f93ad986..000000000000
--- a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/Key.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.extensions.dynamodb.mappingclient;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Optional;
-
-import software.amazon.awssdk.annotations.SdkPublicApi;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-
-/**
- * An object that represents a key that can be used to either identify a specific record or form part of a query
- * conditional. Keys are literal and hence not typed, and can be re-used in commands for different modelled types if
- * the literal values are to be the same.
- *
- * A key will always have a single partition key value associated with it, and optionally will have a sort key value.
- * The names of the keys themselves are not part of this object.
- */
-@SdkPublicApi
-public class Key {
-    private final AttributeValue partitionKeyValue;
-    private final AttributeValue sortKeyValue;
-
-    private Key(AttributeValue partitionKeyValue, AttributeValue sortKeyValue) {
-        this.partitionKeyValue = partitionKeyValue;
-        this.sortKeyValue = sortKeyValue;
-    }
-
-    /**
-     * Construct a literal key with just a partition key value.
-     * @param partitionKeyValue A DynamoDb {@link AttributeValue} that is the literal value of the partition key.
-     * @return A key.
-     */
-    public static Key of(AttributeValue partitionKeyValue) {
-        return new Key(partitionKeyValue, null);
-    }
-
-    /**
-     * Construct a literal key with both a partition key value and a sort key value.
-     * @param partitionKeyValue A DynamoDb {@link AttributeValue} that is the literal value of the partition key.
-     * @param sortKeyValue A DynamoDb {@link AttributeValue} that is the literal value of the sort key.
-     * @return A key.
-     */
-    public static Key of(AttributeValue partitionKeyValue, AttributeValue sortKeyValue) {
-        return new Key(partitionKeyValue, sortKeyValue);
-    }
-
-    /**
-     * Return a map of the key elements that can be passed directly to DynamoDb.
-     * @param tableSchema A tableschema to determine the key attribute names from.
-     * @param index The name of the index to use when determining the key attribute names.
-     * @return A map of attribute names to {@link AttributeValue}.
-     */
-    public Map<String, AttributeValue> getKeyMap(TableSchema<?> tableSchema, String index) {
-        Map<String, AttributeValue> keyMap = new HashMap<>();
-        keyMap.put(tableSchema.getTableMetadata().getIndexPartitionKey(index), partitionKeyValue);
-
-        if (sortKeyValue != null) {
-            keyMap.put(tableSchema.getTableMetadata().getIndexSortKey(index).orElseThrow(
-                () -> new IllegalArgumentException("A sort key value was supplied for an index that does not support "
-                                                   + "one. Index: " + index)), sortKeyValue);
-        }
-
-        return Collections.unmodifiableMap(keyMap);
-    }
-
-    /**
-     * Get the literal value of the partition key stored in this object.
-     * @return An {@link AttributeValue} representing the literal value of the partition key.
-     */
-    public AttributeValue getPartitionKeyValue() {
-        return partitionKeyValue;
-    }
-
-    /**
-     * Get the literal value of the sort key stored in this object if available.
-     * @return An optional {@link AttributeValue} representing the literal value of the sort key, or empty if there
-     * is no sort key value in this Key.
-     */
-    public Optional<AttributeValue> getSortKeyValue() {
-        return Optional.ofNullable(sortKeyValue);
-    }
-
-    /**
-     * Return a map of the key elements that form the primary key of a table that can be passed directly to DynamoDb.
-     * @param tableSchema A tableschema to determine the key attribute names from.
-     * @return A map of attribute names to {@link AttributeValue}.
-     */
-    public Map<String, AttributeValue> getPrimaryKeyMap(TableSchema<?> tableSchema) {
-        return getKeyMap(tableSchema, TableMetadata.getPrimaryIndexName());
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-
-        Key key = (Key) o;
-
-        if (partitionKeyValue != null ? ! partitionKeyValue.equals(key.partitionKeyValue) :
-            key.partitionKeyValue != null) {
-            return false;
-        }
-        return sortKeyValue != null ? sortKeyValue.equals(key.sortKeyValue) : key.sortKeyValue == null;
-    }
-
-    @Override
-    public int hashCode() {
-        int result = partitionKeyValue != null ? partitionKeyValue.hashCode() : 0;
-        result = 31 * result + (sortKeyValue != null ? sortKeyValue.hashCode() : 0);
-        return result;
-    }
-}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/MappedDatabase.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/MappedDatabase.java
deleted file mode 100644
index b18afb4c6fcb..000000000000
--- a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/MappedDatabase.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.extensions.dynamodb.mappingclient;
-
-import software.amazon.awssdk.annotations.SdkPublicApi;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.core.DynamoDbMappedDatabase;
-
-/**
- * Interface for running commands against a DynamoDb database.
- *
- * An implementation for this interface can be instantiated by using the default builder:
- *
- * MappedDatabase.builder()
- *               .dynamoDbClient(dynamoDbClient)
- *               .extendWith(mapperExtension)       // Optional. See 'extensions' package.
- *               .build();
- */
-@SdkPublicApi
-public interface MappedDatabase {
-    /**
-     * Executes a command against the database.
-     *
-     * Example: mappedDatabase.execute(BatchGetItem.of(...));
-     *
-     * @param operation The operation to be performed in the context of the database.
-     * @param <T> The expected return type from the operation. This is typically inferred by the compiler.
-     * @return The result of the operation being executed. The documentation on the operation itself should have more
-     * information.
-     */
-    <T> T execute(DatabaseOperation<?, ?, T> operation);
-
-    /**
-     * Returns a mapped table that can be used to execute commands that work with mapped items against that table.
-     *
-     * @param tableName The name of the physical table persisted by DynamoDb.
-     * @param tableSchema A {@link TableSchema} that maps the table to a modelled object.
-     * @return A {@link MappedTable} object that can be used to execute table operations against.
-     * @param <T> THe modelled object type being mapped to this table.
-     */
-    <T> MappedTable<T> table(String tableName, TableSchema<T> tableSchema);
-
-    /**
-     * Constructs a builder for the default approved implementation of this interface.
-     * @return A builder for a {@link DynamoDbMappedDatabase}.
-     */
-    static DynamoDbMappedDatabase.Builder builder() {
-        return DynamoDbMappedDatabase.builder();
-    }
-}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/MappedIndex.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/MappedIndex.java
deleted file mode 100644
index 84dab84858c1..000000000000
--- a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/MappedIndex.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.extensions.dynamodb.mappingclient;
-
-import software.amazon.awssdk.annotations.SdkPublicApi;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.core.DynamoDbMappedTable;
-
-/**
- * Interface for running commands against an object that is linked to a specific DynamoDb secondary index and knows
- * how to map records from the table that index is linked to into a modelled object. This interface is extended by the
- * {@link DynamoDbMappedTable} interface as all commands that can be made against a secondary index can also be made
- * against the primary index.
- *
- * Typically an implementation for this interface can be obtained from a {@link MappedTable} which in turn can be
- * obtained from a {@link MappedDatabase}:
- *
- * mappedIndex = mappedDatabase.table(tableSchema).index("gsi_1");
- *
- * @param <T> The type of the modelled object.
- */
-@SdkPublicApi
-public interface MappedIndex<T> {
-    /**
-     * Executes a command against the database with the context of the specific table and secondary index this object
-     * is linked to.
-     *
-     * Example: mappedIndex.execute(Scan.create());
-     *
-     * @param operationToPerform The operation to be performed in the context of the secondary index.
-     * @param <R> The expected return type from the operation. This is typically inferred by the compiler.
-     * @return The result of the operation being executed. The documentation on the operation itself should have more
-     * information.
-     */
-    <R> R execute(IndexOperation<T, ?, ?, R> operationToPerform);
-
-    /**
-     * Gets the {@link MapperExtension} associated with this mapped resource.
-     * @return The {@link MapperExtension} associated with this mapped resource.
-     */
-    MapperExtension getMapperExtension();
-
-    /**
-     * Gets the {@link TableSchema} object that this mapped table was built with.
-     * @return The {@link TableSchema} object for this mapped table.
-     */
-    TableSchema<T> getTableSchema();
-
-    /**
-     * Gets the physical table name that operations performed by this object will be executed against.
-     * @return The physical table name.
-     */
-    String getTableName();
-
-    /**
-     * Gets the physical secondary index name that operations performed by this object will be executed against.
-     * @return The physical secondary index name.
-     */
-    String getIndexName();
-
-    /**
-     * Creates a {@link Key} object from a modelled item. This key can be used in query conditionals and get
-     * operations to locate a specific record.
-     * @param item The item to extract the key fields from.
-     * @return A key that has been initialized with the index values extracted from the modelled object.
-     */
-    Key keyFrom(T item);
-}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/MappedTable.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/MappedTable.java
deleted file mode 100644
index 8f8503563bed..000000000000
--- a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/MappedTable.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.extensions.dynamodb.mappingclient;
-
-import software.amazon.awssdk.annotations.SdkPublicApi;
-
-/**
- * Interface for running commands against an object that is linked to a specific DynamoDb table and knows how to map
- * records from that table into a modelled object.
- *
- * Typically an implementation for this interface can be obtained from a {@link MappedDatabase}:
- *
- * mappedTable = mappedDatabase.table(tableSchema);
- *
- * @param <T> The type of the modelled object.
- */
-@SdkPublicApi
-public interface MappedTable<T> {
-    /**
-     * Returns a mapped index that can be used to execute commands against a secondary index belonging to the table
-     * being mapped by this object. Note that only a subset of the commands that work against a table will work
-     * against a secondary index.
-     *
-     * @param indexName The name of the secondary index to build the command interface for.
-     * @return A {@link MappedIndex} object that can be used to execute database commands against.
-     */
-    MappedIndex<T> index(String indexName);
-
-    /**
-     * Executes a command against the database with the context of the primary index of the specific table this object
-     * is linked to.
-     *
-     * Example: mappedTable.execute(PutItem.of(myItem));
-     *
-     * @param operationToPerform The operation to be performed in the context of the primary index of the table.
-     * @param <R> The expected return type from the operation. This is typically inferred by the compiler.
-     * @return The result of the operation being executed. The documentation on the operation itself should have more
-     * information.
-     */
-    <R> R execute(TableOperation<T, ?, ?, R> operationToPerform);
-
-    /**
-     * Gets the {@link MapperExtension} associated with this mapped resource.
-     * @return The {@link MapperExtension} associated with this mapped resource.
-     */
-    MapperExtension getMapperExtension();
-
-    /**
-     * Gets the {@link TableSchema} object that this mapped table was built with.
-     * @return The {@link TableSchema} object for this mapped table.
-     */
-    TableSchema<T> getTableSchema();
-
-    /**
-     * Gets the physical table name that operations performed by this object will be executed against.
-     * @return The physical table name.
-     */
-    String getTableName();
-
-    /**
-     * Creates a {@link Key} object from a modelled item. This key can be used in query conditionals and get
-     * operations to locate a specific record.
-     * @param item The item to extract the key fields from.
-     * @return A key that has been initialized with the index values extracted from the modelled object.
-     */
-    Key keyFrom(T item);
-}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/MapperExtension.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/MapperExtension.java
deleted file mode 100644
index 3e1f202a2c49..000000000000
--- a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/MapperExtension.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.extensions.dynamodb.mappingclient;
-
-import java.util.Map;
-
-import software.amazon.awssdk.annotations.SdkPublicApi;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.extensions.ChainMapperExtension;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.extensions.ReadModification;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.extensions.WriteModification;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-
-/**
- * Interface for extending the mapper. Two hooks are provided, one that is called just before a record is written to
- * the database, and one called just after a record is read from the database. This gives the extension the
- * opportunity to act as an invisible layer between the application and the database and transform the data accordingly.
- *
- * Only one extension can be loaded with a mapped table. In order to combine multiple extensions, the
- * {@link ChainMapperExtension} should be used and initialized with all the component extensions to combine together
- * into a chain.
- */
-@SdkPublicApi
-public interface MapperExtension {
-    /**
-     * This hook is called just before an operation is going to write data to the database. The extension that
-     * implements this method can choose to transform the item itself, or add a condition to the write operation
-     * or both.
-     * @param item The item that is about to be written.
-     * @param operationContext The context under which the operation to be modified is taking place.
-     * @param tableMetadata The structure of the table.
-     * @return A {@link WriteModification} object that can alter the behavior of the write operation.
-     */
-    default WriteModification beforeWrite(Map<String, AttributeValue> item,
-                                          OperationContext operationContext,
-                                          TableMetadata tableMetadata) {
-        return WriteModification.builder().build();
-    }
-
-    /**
-     * This hook is called just after an operation that has read data from the database. The extension that
-     * implements this method can choose to transform the item, and then it is the transformed item that will be
-     * mapped back to the application instead of the item that was actually read from the database.
-     * @param item The item that has just been read.
-     * @param operationContext The context under which the operation to be modified is taking place.
-     * @param tableMetadata The structure of the table.
-     * @return A {@link ReadModification} object that can alter the results of a read operation.
-     */
-    default ReadModification afterRead(Map<String, AttributeValue> item,
-                                       OperationContext operationContext,
-                                       TableMetadata tableMetadata) {
-        return ReadModification.builder().build();
-    }
-}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/OperationContext.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/OperationContext.java
deleted file mode 100644
index bc02af7dd828..000000000000
--- a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/OperationContext.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.extensions.dynamodb.mappingclient;
-
-import software.amazon.awssdk.annotations.SdkProtectedApi;
-
-@SdkProtectedApi
-public class OperationContext {
-    private final String tableName;
-    private final String indexName;
-
-    private OperationContext(String tableName, String indexName) {
-        this.tableName = tableName;
-        this.indexName = indexName;
-    }
-
-    public static OperationContext of(String tableName, String indexName) {
-        return new OperationContext(tableName, indexName);
-    }
-
-    public static OperationContext of(String tableName) {
-        return new OperationContext(tableName, TableMetadata.getPrimaryIndexName());
-    }
-
-    public String getTableName() {
-        return tableName;
-    }
-
-    public String getIndexName() {
-        return indexName;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-
-        OperationContext that = (OperationContext) o;
-
-        if (tableName != null ? ! tableName.equals(that.tableName) : that.tableName != null) {
-            return false;
-        }
-        return indexName != null ? indexName.equals(that.indexName) : that.indexName == null;
-    }
-
-    @Override
-    public int hashCode() {
-        int result = tableName != null ? tableName.hashCode() : 0;
-        result = 31 * result + (indexName != null ? indexName.hashCode() : 0);
-        return result;
-    }
-}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/Page.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/Page.java
deleted file mode 100644
index 8446bfd2d30f..000000000000
--- a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/Page.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.extensions.dynamodb.mappingclient;
-
-import java.util.List;
-import java.util.Map;
-
-import software.amazon.awssdk.annotations.SdkPublicApi;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-
-/**
- * An immutable object that holds a page of queried or scanned results from DynamoDb.
- * @param <T> The modelled type of the object that has been read.
- */
-@SdkPublicApi
-public class Page<T> {
-    private final List<T> items;
-    private final Map<String, AttributeValue> lastEvaluatedKey;
-
-    private Page(List<T> items, Map<String, AttributeValue> lastEvaluatedKey) {
-        this.items = items;
-        this.lastEvaluatedKey = lastEvaluatedKey;
-    }
-
-    /**
-     * Static constructor for this object.
-     * @param items A list of items to store for the page.
-     * @param lastEvaluatedKey A 'lastEvaluatedKey' to store for the page.
-     * @param <T> The modelled type of the object that has been read.
-     * @return A newly constructed {@link Page} object.
-     */
-    public static <T> Page<T> of(List<T> items, Map<String, AttributeValue> lastEvaluatedKey) {
-        return new Page<>(items, lastEvaluatedKey);
-    }
-
-    /**
-     * Static constructor for this object that sets a null 'lastEvaluatedKey' which indicates this is the final page
-     * of results.
-     * @param items A list of items to store for the page.
-     * @param <T> The modelled type of the object that has been read.
-     * @return A newly constructed {@link Page} object.
-     */
-    public static <T> Page<T> of(List<T> items) {
-        return new Page<>(items, null);
-    }
-
-    /**
-     * Returns a page of mapped objects that represent records from a database query or scan.
-     * @return A list of mapped objects.
-     */
-    public List<T> getItems() {
-        return items;
-    }
-
-    /**
-     * Returns the 'lastEvaluatedKey' that DynamoDB returned from the last page query or scan. This key can be used
-     * to continue the query or scan if passed into a request.
-     * @return The 'lastEvaluatedKey' from the last query or scan operation or null if the no more pages are available.
-     */
-    public Map<String, AttributeValue> getLastEvaluatedKey() {
-        return lastEvaluatedKey;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-
-        Page<?> page = (Page<?>) o;
-
-        if (items != null ? ! items.equals(page.items) : page.items != null) {
-            return false;
-        }
-        return lastEvaluatedKey != null ? lastEvaluatedKey.equals(page.lastEvaluatedKey) : page.lastEvaluatedKey == null;
-    }
-
-    @Override
-    public int hashCode() {
-        int result = items != null ? items.hashCode() : 0;
-        result = 31 * result + (lastEvaluatedKey != null ? lastEvaluatedKey.hashCode() : 0);
-        return result;
-    }
-}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/TableOperation.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/TableOperation.java
deleted file mode 100644
index f38f88bf3cdf..000000000000
--- a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/TableOperation.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.extensions.dynamodb.mappingclient;
-
-import software.amazon.awssdk.annotations.SdkPublicApi;
-import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
-
-/**
- * Interface for a single operation that can be executed against a mapped database table. These operations will be
- * executed against the primary index of the table. Conceptually an operation maps 1:1 with an actual DynamoDb call.
- *
- * Typically a table operation will be executed by a {@link MappedTable}:
- *
- * {@code
- * mappedDatabase.table(tableSchema).execute(tableOperation);                             // For primary index
- * }
- *
- * A concrete implementation of this interface should also implement {@link IndexOperation} with the same types if
- * the operation supports being executed against both the primary index and secondary indices.
- *
- * @param <ItemT> The modelled object that this table maps records to.
- * @param <RequestT>  The type of the request object for the DynamoDb call in the low level {@link DynamoDbClient}.
- * @param <ResponseT> The type of the response object for the DynamoDb call in the low level {@link DynamoDbClient}.
- * @param <ResultT> The type of the mapped result object that will be returned by the execution of this operation.
- */
-@SdkPublicApi
-public interface TableOperation<ItemT, RequestT, ResponseT, ResultT>
-    extends CommonOperation<ItemT, RequestT, ResponseT, ResultT> {
-    /**
-     * Default implementation of a complete execution of this operation against the primary index. It will construct
-     * a context based on the given table name and then call execute() on the {@link CommonOperation} interface to
-     * perform the operation.
-     *
-     * @param tableSchema A {@link TableSchema} that maps the table to a modelled object.
-     * @param tableName The physical name of the table to execute the operation against.
-     * @param dynamoDbClient A {@link DynamoDbClient} to make the call against.
-     * @param mapperExtension A {@link MapperExtension} that may modify the request or result of this operation. A
-     *                        null value here will result in no modifications.
-     * @return A high level result object as specified by the implementation of this operation.
-     */
-    default ResultT executeOnPrimaryIndex(TableSchema<ItemT> tableSchema,
-                                          String tableName,
-                                          MapperExtension mapperExtension,
-                                          DynamoDbClient dynamoDbClient) {
-        OperationContext context = OperationContext.of(tableName, TableMetadata.getPrimaryIndexName());
-        return execute(tableSchema, context, mapperExtension, dynamoDbClient);
-    }
-}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/TableSchema.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/TableSchema.java
deleted file mode 100644
index 2c09b9527f17..000000000000
--- a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/TableSchema.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.extensions.dynamodb.mappingclient;
-
-import java.util.Collection;
-import java.util.Map;
-
-import software.amazon.awssdk.annotations.SdkPublicApi;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.staticmapper.StaticTableSchema;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-
-/**
- * Interface for a mapper that is capable of mapping a modelled Java object into a map of {@link AttributeValue} that is
- * understood by the DynamoDb low-level SDK and back again. This object is also expected to know about the
- * structure of the table it is modelling, which is stored in a {@link TableMetadata} object.
- *
- * @param <T> The type of model object that is being mapped to records in the DynamoDb table.
- */
-@SdkPublicApi
-public interface TableSchema<T> {
-    /**
-     * Takes a raw DynamoDb SDK representation of a record in a table and maps it to a Java object. A new object is
-     * created to fulfil this operation.
-     *
-     * If attributes are missing from the map, that will not cause an error, however if attributes are found in the
-     * map which the mapper does not know how to map, an exception will be thrown.
-     *
-     * @param attributeMap A map of String to {@link AttributeValue} that contains all the raw attributes to map.
-     * @return A new instance of a Java object with all the attributes mapped onto it.
-     * @throws IllegalArgumentException if any attributes in the map could not be mapped onto the new model object.
-     */
-    T mapToItem(Map<String, AttributeValue> attributeMap);
-
-    /**
-     * Takes a modelled object and converts it into a raw map of {@link AttributeValue} that the DynamoDb low-level
-     * SDK can work with.
-     *
-     * @param item The modelled Java object to convert into a map of attributes.
-     * @param ignoreNulls If set to true; any null values in the Java object will not be added to the output map.
-     *                    If set to false; null values in the Java object will be added as {@link AttributeValue} of
-     *                    type 'nul' to the output map.
-     * @return A map of String to {@link AttributeValue} representing all the modelled attributes in the model object.
-     */
-    Map<String, AttributeValue> itemToMap(T item, boolean ignoreNulls);
-
-    /**
-     * Takes a modelled object and extracts a specific set of attributes which are then returned as a map of
-     * {@link AttributeValue} that the DynamoDb low-level SDK can work with. This method is typically used to extract
-     * just the key attributes of a modelled item and will not ignore nulls on the modelled object.
-     *
-     * @param item The modelled Java object to extract the map of attributes from.
-     * @param attributes A collection of attribute names to extract into the output map.
-     * @return A map of String to {@link AttributeValue} representing the requested modelled attributes in the model
-     * object.
-     */
-    Map<String, AttributeValue> itemToMap(T item, Collection<String> attributes);
-
-    /**
-     * Returns a single attribute value from the modelled object.
-     *
-     * @param item The modelled Java object to extract the attribute from.
-     * @param key The attribute name describing which attribute to extract.
-     * @return A single {@link AttributeValue} representing the requested modelled attribute in the model object or
-     * null if the attribute has not been set with a value in the modelled object.
-     */
-    AttributeValue getAttributeValue(T item, String key);
-
-    /**
-     * Returns the object that describes the structure of the table being modelled by the mapper. This includes
-     * information such as the table name, index keys and attribute tags.
-     * @return A {@link TableMetadata} object that contains structural information about the table being modelled.
-     */
-    TableMetadata getTableMetadata();
-
-    /**
-     * Returns a builder for the default implementation of this interface which is an immutable, declarative, type-safe
-     * mapper.
-     * See {@link StaticTableSchema} for more information.
-     * @return A default builder for a {@link StaticTableSchema}.
-     */
-    static StaticTableSchema.GenericBuilder builder() {
-        return StaticTableSchema.builder();
-    }
-}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/TransactableReadOperation.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/TransactableReadOperation.java
deleted file mode 100644
index 3b9b42a0e58f..000000000000
--- a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/TransactableReadOperation.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.extensions.dynamodb.mappingclient;
-
-import software.amazon.awssdk.annotations.SdkProtectedApi;
-import software.amazon.awssdk.services.dynamodb.model.TransactGetItem;
-
-@SdkProtectedApi
-public interface TransactableReadOperation<T> {
-    TransactGetItem generateTransactGetItem(TableSchema<T> tableSchema,
-                                            OperationContext operationContext,
-                                            MapperExtension mapperExtension);
-}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/TransactableWriteOperation.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/TransactableWriteOperation.java
deleted file mode 100644
index 1343161f3ebf..000000000000
--- a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/TransactableWriteOperation.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.extensions.dynamodb.mappingclient;
-
-import software.amazon.awssdk.annotations.SdkProtectedApi;
-import software.amazon.awssdk.services.dynamodb.model.TransactWriteItem;
-
-@SdkProtectedApi
-public interface TransactableWriteOperation<T> {
-    TransactWriteItem generateTransactWriteItem(TableSchema<T> tableSchema,
-                                                OperationContext operationContext,
-                                                MapperExtension mapperExtension);
-}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/core/DynamoDbMappedDatabase.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/core/DynamoDbMappedDatabase.java
deleted file mode 100644
index 67a910d98cf4..000000000000
--- a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/core/DynamoDbMappedDatabase.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.extensions.dynamodb.mappingclient.core;
-
-import software.amazon.awssdk.annotations.SdkPublicApi;
-import software.amazon.awssdk.annotations.ThreadSafe;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.DatabaseOperation;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.MappedDatabase;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.MapperExtension;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.TableSchema;
-import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
-
-@SdkPublicApi
-@ThreadSafe
-public class DynamoDbMappedDatabase implements MappedDatabase {
-    private final DynamoDbClient dynamoDbClient;
-    private final MapperExtension mapperExtension;
-
-    private DynamoDbMappedDatabase(DynamoDbClient dynamoDbClient, MapperExtension mapperExtension) {
-        this.dynamoDbClient = dynamoDbClient;
-        this.mapperExtension = mapperExtension;
-    }
-
-    public static Builder builder() {
-        return new Builder();
-    }
-
-    @Override
-    public <T> T execute(DatabaseOperation<?, ?, T> operation) {
-        return operation.execute(dynamoDbClient, mapperExtension);
-    }
-
-    @Override
-    public <T> DynamoDbMappedTable<T> table(String tableName, TableSchema<T> tableSchema) {
-        return new DynamoDbMappedTable<>(dynamoDbClient, mapperExtension, tableSchema, tableName);
-    }
-
-    public DynamoDbClient getDynamoDbClient() {
-        return dynamoDbClient;
-    }
-
-    public MapperExtension getMapperExtension() {
-        return mapperExtension;
-    }
-
-    public Builder toBuilder() {
-        return builder().dynamoDbClient(this.dynamoDbClient).extendWith(this.mapperExtension);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-
-        DynamoDbMappedDatabase that = (DynamoDbMappedDatabase) o;
-
-        if (dynamoDbClient != null ? ! dynamoDbClient.equals(that.dynamoDbClient) : that.dynamoDbClient != null) {
-            return false;
-        }
-        return mapperExtension != null ? mapperExtension.equals(that.mapperExtension) : that.mapperExtension == null;
-    }
-
-    @Override
-    public int hashCode() {
-        int result = dynamoDbClient != null ? dynamoDbClient.hashCode() : 0;
-        result = 31 * result + (mapperExtension != null ? mapperExtension.hashCode() : 0);
-        return result;
-    }
-
-    public static final class Builder {
-        private DynamoDbClient dynamoDbClient;
-        private MapperExtension mapperExtension;
-
-        public DynamoDbMappedDatabase build() {
-            if (dynamoDbClient == null) {
-                throw new IllegalArgumentException("You must provide a DynamoDbClient to build a "
-                                                   + "DynamoDbMappedDatabase.");
-            }
-
-            return new DynamoDbMappedDatabase(dynamoDbClient, mapperExtension);
-        }
-
-        public Builder dynamoDbClient(DynamoDbClient dynamoDbClient) {
-            this.dynamoDbClient = dynamoDbClient;
-            return this;
-        }
-
-        public Builder extendWith(MapperExtension mapperExtension) {
-            if (mapperExtension != null && this.mapperExtension != null) {
-                throw new IllegalArgumentException("You may only extend a DynamoDbMappedDatabase with a single "
-                                                   + "extension. To combine multiple extensions, use the "
-                                                   + "ChainMapperExtension.");
-            }
-
-            this.mapperExtension = mapperExtension;
-            return this;
-        }
-    }
-}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/core/DynamoDbMappedIndex.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/core/DynamoDbMappedIndex.java
deleted file mode 100644
index a64983fe9cf3..000000000000
--- a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/core/DynamoDbMappedIndex.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.extensions.dynamodb.mappingclient.core;
-
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.core.Utils.createKeyFromItem;
-
-import software.amazon.awssdk.annotations.SdkPublicApi;
-import software.amazon.awssdk.annotations.ThreadSafe;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.IndexOperation;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.Key;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.MappedIndex;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.MapperExtension;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.TableSchema;
-import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
-
-@SdkPublicApi
-@ThreadSafe
-public class DynamoDbMappedIndex<T> implements MappedIndex<T> {
-    private final DynamoDbClient dynamoDbClient;
-    private final MapperExtension mapperExtension;
-    private final TableSchema<T> tableSchema;
-    private final String tableName;
-    private final String indexName;
-
-    DynamoDbMappedIndex(DynamoDbClient dynamoDbClient,
-                        MapperExtension mapperExtension,
-                        TableSchema<T> tableSchema,
-                        String tableName,
-                        String indexName) {
-        this.dynamoDbClient = dynamoDbClient;
-        this.mapperExtension = mapperExtension;
-        this.tableSchema = tableSchema;
-        this.tableName = tableName;
-        this.indexName = indexName;
-    }
-
-    @Override
-    public <R> R execute(IndexOperation<T, ?, ?, R> operationToPerform) {
-        return operationToPerform.executeOnSecondaryIndex(tableSchema,
-                                                          tableName,
-                                                          indexName,
-                                                          mapperExtension,
-                                                          dynamoDbClient);
-    }
-
-    @Override
-    public MapperExtension getMapperExtension() {
-        return this.mapperExtension;
-    }
-
-    @Override
-    public TableSchema<T> getTableSchema() {
-        return tableSchema;
-    }
-
-    public DynamoDbClient getDynamoDbClient() {
-        return dynamoDbClient;
-    }
-
-    public String getTableName() {
-        return tableName;
-    }
-
-    public String getIndexName() {
-        return indexName;
-    }
-
-    @Override
-    public Key keyFrom(T item) {
-        return createKeyFromItem(item, tableSchema, indexName);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-
-        DynamoDbMappedIndex<?> that = (DynamoDbMappedIndex<?>) o;
-
-        if (dynamoDbClient != null ? ! dynamoDbClient.equals(that.dynamoDbClient) : that.dynamoDbClient != null) {
-            return false;
-        }
-        if (mapperExtension != null ? ! mapperExtension.equals(that.mapperExtension) : that.mapperExtension != null) {
-            return false;
-        }
-        if (tableSchema != null ? ! tableSchema.equals(that.tableSchema) : that.tableSchema != null) {
-            return false;
-        }
-        if (tableName != null ? ! tableName.equals(that.tableName) : that.tableName != null) {
-            return false;
-        }
-        return indexName != null ? indexName.equals(that.indexName) : that.indexName == null;
-    }
-
-    @Override
-    public int hashCode() {
-        int result = dynamoDbClient != null ? dynamoDbClient.hashCode() : 0;
-        result = 31 * result + (mapperExtension != null ? mapperExtension.hashCode() : 0);
-        result = 31 * result + (tableSchema != null ? tableSchema.hashCode() : 0);
-        result = 31 * result + (tableName != null ? tableName.hashCode() : 0);
-        result = 31 * result + (indexName != null ? indexName.hashCode() : 0);
-        return result;
-    }
-}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/core/DynamoDbMappedTable.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/core/DynamoDbMappedTable.java
deleted file mode 100644
index 81bcedb6ebb0..000000000000
--- a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/core/DynamoDbMappedTable.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.extensions.dynamodb.mappingclient.core;
-
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.core.Utils.createKeyFromItem;
-
-import software.amazon.awssdk.annotations.SdkPublicApi;
-import software.amazon.awssdk.annotations.ThreadSafe;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.Key;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.MappedTable;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.MapperExtension;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.TableMetadata;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.TableOperation;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.TableSchema;
-import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
-
-@SdkPublicApi
-@ThreadSafe
-public class DynamoDbMappedTable<T> implements MappedTable<T> {
-    private final DynamoDbClient dynamoDbClient;
-    private final MapperExtension mapperExtension;
-    private final TableSchema<T> tableSchema;
-    private final String tableName;
-
-    DynamoDbMappedTable(DynamoDbClient dynamoDbClient,
-                        MapperExtension mapperExtension,
-                        TableSchema<T> tableSchema,
-                        String tableName) {
-        this.dynamoDbClient = dynamoDbClient;
-        this.mapperExtension = mapperExtension;
-        this.tableSchema = tableSchema;
-        this.tableName = tableName;
-    }
-
-    @Override
-    public <R> R execute(TableOperation<T, ?, ?, R> operationToPerform) {
-        return operationToPerform.executeOnPrimaryIndex(tableSchema, tableName, mapperExtension, dynamoDbClient);
-    }
-
-    @Override
-    public MapperExtension getMapperExtension() {
-        return this.mapperExtension;
-    }
-
-    @Override
-    public TableSchema<T> getTableSchema() {
-        return this.tableSchema;
-    }
-
-    public DynamoDbClient getDynamoDbClient() {
-        return dynamoDbClient;
-    }
-
-    public String getTableName() {
-        return tableName;
-    }
-
-    @Override
-    public DynamoDbMappedIndex<T> index(String indexName) {
-        // Force a check for the existence of the index
-        tableSchema.getTableMetadata().getIndexPartitionKey(indexName);
-
-        return new DynamoDbMappedIndex<>(dynamoDbClient, mapperExtension, tableSchema, tableName, indexName);
-    }
-
-    @Override
-    public Key keyFrom(T item) {
-        return createKeyFromItem(item, tableSchema, TableMetadata.getPrimaryIndexName());
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-
-        DynamoDbMappedTable<?> that = (DynamoDbMappedTable<?>) o;
-
-        if (dynamoDbClient != null ? ! dynamoDbClient.equals(that.dynamoDbClient) : that.dynamoDbClient != null) {
-            return false;
-        }
-        if (mapperExtension != null ? ! mapperExtension.equals(that.mapperExtension) : that.mapperExtension != null) {
-            return false;
-        }
-        if (tableSchema != null ? ! tableSchema.equals(that.tableSchema) : that.tableSchema != null) {
-            return false;
-        }
-        return tableName != null ? tableName.equals(that.tableName) : that.tableName == null;
-    }
-
-    @Override
-    public int hashCode() {
-        int result = dynamoDbClient != null ? dynamoDbClient.hashCode() : 0;
-        result = 31 * result + (mapperExtension != null ? mapperExtension.hashCode() : 0);
-        result = 31 * result + (tableSchema != null ? tableSchema.hashCode() : 0);
-        result = 31 * result + (tableName != null ? tableName.hashCode() : 0);
-        return result;
-    }
-}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/core/TransformIterable.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/core/TransformIterable.java
deleted file mode 100644
index e7c0ced2c8f9..000000000000
--- a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/core/TransformIterable.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.extensions.dynamodb.mappingclient.core;
-
-import java.util.Iterator;
-import java.util.function.Function;
-
-import software.amazon.awssdk.annotations.SdkInternalApi;
-
-@SdkInternalApi
-public class TransformIterable<T, R> implements Iterable<R> {
-    private final Iterable<T> wrappedIterable;
-    private final Function<T, R> transformFunction;
-
-    private TransformIterable(Iterable<T> wrappedIterable, Function<T, R> transformFunction) {
-        this.wrappedIterable = wrappedIterable;
-        this.transformFunction = transformFunction;
-    }
-
-    public static <T, R> TransformIterable<T, R> of(Iterable<T> iterable, Function<T, R> transformFunction) {
-        return new TransformIterable<>(iterable, transformFunction);
-    }
-
-    @Override
-    public Iterator<R> iterator() {
-        return TransformIterator.of(wrappedIterable.iterator(), transformFunction);
-    }
-}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/core/Utils.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/core/Utils.java
deleted file mode 100644
index b743a3f77337..000000000000
--- a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/core/Utils.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.extensions.dynamodb.mappingclient.core;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
-import software.amazon.awssdk.annotations.SdkInternalApi;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.Key;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.MapperExtension;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.OperationContext;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.Page;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.TableSchema;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.extensions.ReadModification;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-
-@SdkInternalApi
-public final class Utils {
-    private Utils() {
-
-    }
-
-    /** There is a divergence in what constitutes an acceptable attribute name versus a token used in expression
-     * names or values. Since the mapper translates one to the other, it is necessary to scrub out all these
-     * 'illegal' characters before adding them to expression values or expression names.
-     *
-     * @param key A key that may contain non alpha-numeric characters acceptable to a DynamoDb attribute name.
-     * @return A key that has all these characters scrubbed and overwritten with an underscore.
-     */
-    public static String cleanAttributeName(String key) {
-        boolean somethingChanged = false;
-        char[] chars = key.toCharArray();
-
-        for (int i = 0; i < chars.length; ++i) {
-            if (chars[i] == '*' || chars[i] == '.' || chars[i] == '-') {
-                chars[i] = '_';
-                somethingChanged = true;
-            }
-        }
-
-        return somethingChanged ? new String(chars) : key;
-    }
-
-    public static <T> T readAndTransformSingleItem(Map<String, AttributeValue> itemMap,
-                                            TableSchema<T> tableSchema,
-                                            OperationContext operationContext,
-                                            MapperExtension mapperExtension) {
-        if (itemMap == null || itemMap.isEmpty()) {
-            return null;
-        }
-
-        if (mapperExtension != null) {
-            ReadModification readModification = mapperExtension.afterRead(itemMap,
-                                                                          operationContext,
-                                                                          tableSchema.getTableMetadata());
-
-            if (readModification != null && readModification.getTransformedItem() != null) {
-                return tableSchema.mapToItem(readModification.getTransformedItem());
-            }
-        }
-
-        return tableSchema.mapToItem(itemMap);
-    }
-
-    public static <ResponseT, ItemT> Function<ResponseT, Page<ItemT>> readAndTransformPaginatedItems(
-        TableSchema<ItemT> tableSchema,
-        OperationContext operationContext,
-        MapperExtension mapperExtension,
-        Function<ResponseT, List<Map<String, AttributeValue>>> getItems,
-        Function<ResponseT, Map<String, AttributeValue>> getLastEvaluatedKey) {
-
-        return response -> {
-            if (getLastEvaluatedKey.apply(response) == null || getLastEvaluatedKey.apply(response).isEmpty()) {
-                // Last page
-                return Page.of(getItems.apply(response)
-                                       .stream()
-                                       .map(itemMap -> readAndTransformSingleItem(itemMap,
-                                                                                  tableSchema,
-                                                                                  operationContext,
-                                                                                  mapperExtension))
-                                       .collect(Collectors.toList()));
-            } else {
-                // More pages to come; add the lastEvaluatedKey
-                return Page.of(getItems.apply(response)
-                                       .stream()
-                                       .map(itemMap -> readAndTransformSingleItem(itemMap,
-                                                                                  tableSchema,
-                                                                                  operationContext,
-                                                                                  mapperExtension))
-                                       .collect(Collectors.toList()),
-                               getLastEvaluatedKey.apply(response));
-            }
-        };
-    }
-
-    public static <T> Key createKeyFromItem(T item, TableSchema<T> tableSchema, String indexName) {
-        String partitionKeyName = tableSchema.getTableMetadata().getIndexPartitionKey(indexName);
-        Optional<String> sortKeyName = tableSchema.getTableMetadata().getIndexSortKey(indexName);
-        AttributeValue partitionKeyValue = tableSchema.getAttributeValue(item, partitionKeyName);
-        Optional<AttributeValue> sortKeyValue = sortKeyName.map(key -> tableSchema.getAttributeValue(item, key));
-
-        return sortKeyValue.map(attributeValue -> Key.of(partitionKeyValue, attributeValue))
-                           .orElseGet(() -> Key.of(partitionKeyValue));
-    }
-}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/extensions/ChainMapperExtension.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/extensions/ChainMapperExtension.java
deleted file mode 100644
index 234552fdb131..000000000000
--- a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/extensions/ChainMapperExtension.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.extensions.dynamodb.mappingclient.extensions;
-
-import java.util.ArrayDeque;
-import java.util.Arrays;
-import java.util.Deque;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.atomic.AtomicReference;
-
-import software.amazon.awssdk.annotations.SdkPublicApi;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.Expression;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.MapperExtension;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.OperationContext;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.TableMetadata;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-
-/**
- * A meta-extension that allows multiple extensions to be chained in a specified order to act as a single composite
- * extension. The order in which extensions will be used depends on the operation, for write operations they will be
- * called in forward order, for read operations they will be called in reverse order. For example :-
- *
- * If you create a chain of three extensions:
- * ChainMapperExtension.of(extension1, extension2, extension3);
- *
- * When performing any kind of write operation (eg: PutItem, UpdateItem) the beforeWrite() method will be called in
- * forward order:
- *
- * {@literal extension1 -> extension2 -> extension3}
- *
- * So the output of extension1 will be passed into extension2, and then the output of extension2 into extension3 and
- * so on. For operations that read (eg: GetItem, UpdateItem) the afterRead() method will be called in reverse order:
- *
- * {@literal extension3 -> extension2 -> extension1}
- *
- * This is designed to create a layered pattern when dealing with multiple extensions. One thing to note is that
- * UpdateItem acts as both a write operation and a read operation so the chain will be called both ways within a
- * single operation.
- */
-@SdkPublicApi
-public class ChainMapperExtension implements MapperExtension {
-    private final Deque<MapperExtension> extensionChain;
-
-    private ChainMapperExtension(List<MapperExtension> mapperExtensions) {
-        this.extensionChain = new ArrayDeque<>(mapperExtensions);
-    }
-
-    /**
-     * Construct a new instance of {@link ChainMapperExtension}.
-     * @param mapperExtensions A list of {@link MapperExtension} to chain together.
-     * @return A constructed {@link ChainMapperExtension} object.
-     */
-    public static ChainMapperExtension of(MapperExtension... mapperExtensions) {
-        return new ChainMapperExtension(Arrays.asList(mapperExtensions));
-    }
-
-    /**
-     * Implementation of the {@link MapperExtension} interface that will call all the chained extensions in forward
-     * order, passing the results of each one to the next and coalescing the results into a single modification.
-     * Multiple conditional statements will be separated by the string " AND ". Expression values will be coalesced
-     * unless they conflict in which case an exception will be thrown.
-     *
-     * @param item The {@link AttributeValue} map of the item to be written.
-     * @param tableMetadata A {@link TableMetadata} object describing the structure of the modelled table.
-     * @return A single {@link WriteModification} representing the coalesced results of all the chained extensions.
-     */
-    @Override
-    public WriteModification beforeWrite(Map<String, AttributeValue> item,
-                                         OperationContext operationContext,
-                                         TableMetadata tableMetadata) {
-        AtomicReference<Map<String, AttributeValue>> transformedItem = new AtomicReference<>();
-        AtomicReference<Expression> conditionalExpression = new AtomicReference<>();
-
-        this.extensionChain.forEach(extension -> {
-            Map<String, AttributeValue> itemToTransform = transformedItem.get() == null ? item : transformedItem.get();
-            WriteModification writeModification = extension.beforeWrite(itemToTransform,
-                                                                        operationContext,
-                                                                        tableMetadata);
-
-            if (writeModification.getTransformedItem() != null) {
-                transformedItem.set(writeModification.getTransformedItem());
-            }
-
-            if (writeModification.getAdditionalConditionalExpression() != null) {
-                if (conditionalExpression.get() == null) {
-                    conditionalExpression.set(writeModification.getAdditionalConditionalExpression());
-                } else {
-                    conditionalExpression.set(
-                        Expression.coalesce(conditionalExpression.get(),
-                                            writeModification.getAdditionalConditionalExpression(),
-                                            " AND "));
-                }
-            }
-        });
-
-        return WriteModification.builder()
-                                .transformedItem(transformedItem.get())
-                                .additionalConditionalExpression(conditionalExpression.get())
-                                .build();
-    }
-
-    /**
-     * Implementation of the {@link MapperExtension} interface that will call all the chained extensions in reverse
-     * order, passing the results of each one to the next and coalescing the results into a single modification.
-     *
-     * @param item The {@link AttributeValue} map of the item that is being read.
-     * @param tableMetadata A {@link TableMetadata} object describing the structure of the modelled table.
-     * @return A single {@link ReadModification} representing the final transformation of all the chained extensions.
-     */
-    @Override
-    public ReadModification afterRead(Map<String, AttributeValue> item,
-                                      OperationContext operationContext,
-                                      TableMetadata tableMetadata) {
-        AtomicReference<Map<String, AttributeValue>> transformedItem = new AtomicReference<>();
-
-        this.extensionChain.descendingIterator().forEachRemaining(extension -> {
-            Map<String, AttributeValue> itemToTransform = transformedItem.get() == null ? item : transformedItem.get();
-            ReadModification readModification = extension.afterRead(itemToTransform, operationContext, tableMetadata);
-
-            if (readModification.getTransformedItem() != null) {
-                transformedItem.set(readModification.getTransformedItem());
-            }
-        });
-
-        return ReadModification.builder()
-                               .transformedItem(transformedItem.get())
-                               .build();
-    }
-}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/extensions/VersionedRecordExtension.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/extensions/VersionedRecordExtension.java
deleted file mode 100644
index 46cda490c653..000000000000
--- a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/extensions/VersionedRecordExtension.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.extensions.dynamodb.mappingclient.extensions;
-
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.AttributeValues.isNullAttributeValue;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Optional;
-import java.util.function.Function;
-
-import software.amazon.awssdk.annotations.SdkPublicApi;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.Expression;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.MapperExtension;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.OperationContext;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.TableMetadata;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.core.AttributeValueType;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.staticmapper.AttributeTag;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-
-/**
- * This extension implements optimistic locking on record writes by means of a 'record version number' that is used
- * to automatically track each revision of the record as it is modified. To use this extension, first load it as part
- * of your MappedTable instantiation:
- *
- * MappedTable.builder()
- *            .extendWith(VersionedRecordExtension.builder().build())
- *            .build();
- *
- * Then create an attribute in your model that will be used to store the record version number. This attribute must
- * be an 'integer' type numeric (long or integer), and you need to tag it as the version attribute:
- *
- * ..., integerNumber("version", Customer::getVersion, Customer::setVersion).as(version()), ...
- *
- * Then, whenever a record is written the write operation will only succeed if the version number of the record has not
- * been modified since it was last read by the application. Every time a new version of the record is successfully
- * written to the database, the record version number will be automatically incremented.
- */
-@SdkPublicApi
-public class VersionedRecordExtension implements MapperExtension {
-    private static final Function<String, String> EXPRESSION_KEY_MAPPER = key -> ":old_" + key + "_value";
-    private static final String CUSTOM_METADATA_KEY = "VersionedRecordExtension:VersionAttribute";
-    private static final VersionAttribute VERSION_ATTRIBUTE = new VersionAttribute();
-
-    private VersionedRecordExtension() {
-    }
-
-    public static Builder builder() {
-        return new Builder();
-    }
-
-    public static final class AttributeTags {
-        private AttributeTags() {
-        }
-
-        public static AttributeTag version() {
-            return VERSION_ATTRIBUTE;
-        }
-    }
-
-    private static class VersionAttribute extends AttributeTag {
-        @Override
-        protected boolean isKeyAttribute() {
-            return true;
-        }
-
-        @Override
-        public Map<String, Object> getCustomMetadataForAttribute(String attributeName,
-                                                                 AttributeValueType attributeValueType) {
-            if (!AttributeValueType.N.equals(attributeValueType)) {
-                throw new IllegalArgumentException(String.format("Attribute '%s' of type %s is not a suitable type to"
-                    + " be used as a version attribute. Only type 'N' is supported.", attributeName,
-                                                                 attributeValueType.name()));
-            }
-
-            return Collections.singletonMap(CUSTOM_METADATA_KEY, attributeName);
-        }
-    }
-
-    @Override
-    public WriteModification beforeWrite(Map<String, AttributeValue> item,
-                                         OperationContext operationContext,
-                                         TableMetadata tableMetadata) {
-        Optional<String> versionAttributeKey = tableMetadata.getCustomMetadataObject(CUSTOM_METADATA_KEY, String.class);
-
-        if (!versionAttributeKey.isPresent()) {
-            return WriteModification.builder().build();
-        }
-
-        Map<String, AttributeValue> itemToTransform = new HashMap<>(item);
-        AttributeValue newVersionValue;
-        Expression condition;
-        Optional<AttributeValue> existingVersionValue =
-            Optional.ofNullable(itemToTransform.get(versionAttributeKey.get()));
-
-        if (!existingVersionValue.isPresent() || isNullAttributeValue(existingVersionValue.get())) {
-            // First version of the record
-            newVersionValue = AttributeValue.builder().n("1").build();
-            condition = Expression.builder()
-                                  .expression(String.format("attribute_not_exists(%s)", versionAttributeKey.get()))
-                                  .build();
-        } else {
-            // Existing record, increment version
-            if (existingVersionValue.get().n() == null) {
-                // In this case a non-null version attribute is present, but it's not an N
-                throw new IllegalArgumentException("Version attribute appears to be the wrong type. N is required.");
-            }
-
-            int existingVersion = Integer.parseInt(existingVersionValue.get().n());
-            String existingVersionValueKey = EXPRESSION_KEY_MAPPER.apply(versionAttributeKey.get());
-            newVersionValue = AttributeValue.builder().n(Integer.toString(existingVersion + 1)).build();
-            condition = Expression.builder()
-                                  .expression(String.format("%s = %s", versionAttributeKey.get(),
-                                                            existingVersionValueKey))
-                                  .expressionValues(Collections.singletonMap(existingVersionValueKey,
-                                                                             existingVersionValue.get()))
-                                  .build();
-        }
-
-        itemToTransform.put(versionAttributeKey.get(), newVersionValue);
-
-        return WriteModification.builder()
-                                .transformedItem(Collections.unmodifiableMap(itemToTransform))
-                                .additionalConditionalExpression(condition)
-                                .build();
-    }
-
-    public static final class Builder {
-        private Builder() {
-        }
-
-        public VersionedRecordExtension build() {
-            return new VersionedRecordExtension();
-        }
-    }
-}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/operations/BatchGetItem.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/operations/BatchGetItem.java
deleted file mode 100644
index 8aa773eacf78..000000000000
--- a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/operations/BatchGetItem.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.extensions.dynamodb.mappingclient.operations;
-
-import static java.util.Collections.emptyList;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.core.Utils.readAndTransformSingleItem;
-
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
-import software.amazon.awssdk.annotations.SdkPublicApi;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.DatabaseOperation;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.MappedTable;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.MapperExtension;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.OperationContext;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.core.TransformIterable;
-import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-import software.amazon.awssdk.services.dynamodb.model.BatchGetItemRequest;
-import software.amazon.awssdk.services.dynamodb.model.BatchGetItemResponse;
-import software.amazon.awssdk.services.dynamodb.model.KeysAndAttributes;
-import software.amazon.awssdk.services.dynamodb.paginators.BatchGetItemIterable;
-
-@SdkPublicApi
-public class BatchGetItem
-    implements DatabaseOperation<BatchGetItemRequest,
-                                 BatchGetItemIterable,
-                                 Iterable<BatchGetItem.ResultsPage>> {
-    private final Collection<ReadBatch> readBatches;
-
-    private BatchGetItem(Collection<ReadBatch> readBatches) {
-        this.readBatches = readBatches;
-    }
-
-    public static BatchGetItem of(Collection<ReadBatch> readBatches) {
-        return new BatchGetItem(readBatches);
-    }
-
-    public static BatchGetItem of(ReadBatch... readBatches) {
-        return new BatchGetItem(Arrays.asList(readBatches));
-    }
-
-    public static Builder builder() {
-        return new Builder();
-    }
-
-    public Builder toBuilder() {
-        return new Builder().readBatches(readBatches);
-    }
-
-    @Override
-    public BatchGetItemRequest generateRequest(MapperExtension mapperExtension) {
-        Map<String, KeysAndAttributes> requestItems = new HashMap<>();
-        readBatches.forEach(readBatch -> readBatch.addReadRequestsToMap(requestItems));
-
-        return BatchGetItemRequest.builder()
-                                  .requestItems(Collections.unmodifiableMap(requestItems))
-                                  .build();
-    }
-
-    @Override
-    public Iterable<ResultsPage> transformResponse(BatchGetItemIterable response,
-                                                   MapperExtension mapperExtension) {
-        return TransformIterable.of(response,
-            batchGetItemResponse -> new ResultsPage(batchGetItemResponse, mapperExtension));
-    }
-
-    @Override
-    public Function<BatchGetItemRequest, BatchGetItemIterable> getServiceCall(DynamoDbClient dynamoDbClient) {
-        return dynamoDbClient::batchGetItemPaginator;
-    }
-
-    public Collection<ReadBatch> getReadBatches() {
-        return readBatches;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-
-        BatchGetItem that = (BatchGetItem) o;
-
-        return readBatches != null ? readBatches.equals(that.readBatches) : that.readBatches == null;
-    }
-
-    @Override
-    public int hashCode() {
-        return readBatches != null ? readBatches.hashCode() : 0;
-    }
-
-    public static final class Builder {
-        private Collection<ReadBatch> readBatches;
-
-        private Builder() {
-        }
-
-        public Builder readBatches(Collection<ReadBatch> readBatches) {
-            this.readBatches = readBatches;
-            return this;
-        }
-
-        public BatchGetItem build() {
-            return new BatchGetItem(this.readBatches);
-        }
-    }
-
-    public static class ResultsPage {
-        private final BatchGetItemResponse batchGetItemResponse;
-        private final MapperExtension mapperExtension;
-
-        private ResultsPage(BatchGetItemResponse batchGetItemResponse, MapperExtension mapperExtension) {
-            this.batchGetItemResponse = batchGetItemResponse;
-            this.mapperExtension = mapperExtension;
-        }
-
-        public <T> List<T> getResultsForTable(MappedTable<T> mappedTable) {
-            List<Map<String, AttributeValue>> results =
-                batchGetItemResponse.responses()
-                                    .getOrDefault(mappedTable.getTableName(), emptyList());
-
-            return results.stream()
-                          .map(itemMap -> readAndTransformSingleItem(itemMap,
-                                                                     mappedTable.getTableSchema(),
-                                                                     OperationContext.of(mappedTable.getTableName()),
-                                                                     mapperExtension))
-                          .collect(Collectors.toList());
-        }
-    }
-}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/operations/BatchWriteItem.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/operations/BatchWriteItem.java
deleted file mode 100644
index 95aa475b97b1..000000000000
--- a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/operations/BatchWriteItem.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.extensions.dynamodb.mappingclient.operations;
-
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.core.Utils.readAndTransformSingleItem;
-
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
-import software.amazon.awssdk.annotations.SdkPublicApi;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.DatabaseOperation;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.MappedTable;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.MapperExtension;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.OperationContext;
-import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
-import software.amazon.awssdk.services.dynamodb.model.BatchWriteItemRequest;
-import software.amazon.awssdk.services.dynamodb.model.BatchWriteItemResponse;
-import software.amazon.awssdk.services.dynamodb.model.DeleteRequest;
-import software.amazon.awssdk.services.dynamodb.model.PutRequest;
-import software.amazon.awssdk.services.dynamodb.model.WriteRequest;
-
-@SdkPublicApi
-public class BatchWriteItem
-    implements DatabaseOperation<BatchWriteItemRequest,
-                                 BatchWriteItemResponse,
-                                 BatchWriteItem.BatchWriteItemResults> {
-
-    private final Collection<WriteBatch> writeBatches;
-
-    private BatchWriteItem(Collection<WriteBatch> writeBatches) {
-        this.writeBatches = writeBatches;
-    }
-
-    public static BatchWriteItem of(Collection<WriteBatch> writeBatches) {
-        return new BatchWriteItem(writeBatches);
-    }
-
-    public static BatchWriteItem of(WriteBatch... writeBatches) {
-        return new BatchWriteItem(Arrays.asList(writeBatches));
-    }
-
-    public static Builder builder() {
-        return new Builder();
-    }
-
-    public Builder toBuilder() {
-        return new Builder().writeBatches(writeBatches);
-    }
-
-    @Override
-    public BatchWriteItemRequest generateRequest(MapperExtension mapperExtension) {
-        Map<String, Collection<WriteRequest>> requestItems = new HashMap<>();
-        writeBatches.forEach(writeBatch -> writeBatch.addWriteRequestsToMap(requestItems));
-        return BatchWriteItemRequest.builder()
-                                    .requestItems(Collections.unmodifiableMap(requestItems))
-                                    .build();
-    }
-
-    @Override
-    public BatchWriteItemResults transformResponse(BatchWriteItemResponse response, MapperExtension mapperExtension) {
-        return new BatchWriteItemResults(response.unprocessedItems());
-    }
-
-    @Override
-    public Function<BatchWriteItemRequest, BatchWriteItemResponse> getServiceCall(DynamoDbClient dynamoDbClient) {
-        return dynamoDbClient::batchWriteItem;
-    }
-
-    public Collection<WriteBatch> getWriteBatches() {
-        return writeBatches;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-
-        BatchWriteItem that = (BatchWriteItem) o;
-
-        return writeBatches != null ? writeBatches.equals(that.writeBatches) : that.writeBatches == null;
-    }
-
-    @Override
-    public int hashCode() {
-        return writeBatches != null ? writeBatches.hashCode() : 0;
-    }
-
-    public static final class Builder {
-        private Collection<WriteBatch> writeBatches;
-
-        private Builder() {
-        }
-
-        public Builder writeBatches(Collection<WriteBatch> writeBatches) {
-            this.writeBatches = writeBatches;
-            return this;
-        }
-
-        public BatchWriteItem build() {
-            return new BatchWriteItem(writeBatches);
-        }
-    }
-
-    public static class BatchWriteItemResults {
-        private final Map<String, List<WriteRequest>> unprocessedRequests;
-
-        private BatchWriteItemResults(Map<String, List<WriteRequest>> unprocessedRequests) {
-            this.unprocessedRequests = unprocessedRequests;
-        }
-
-        public <T> List<T> unprocessedPutItemsForTable(MappedTable<T> mappedTable) {
-            List<WriteRequest> writeRequests =
-                unprocessedRequests.getOrDefault(mappedTable.getTableName(),
-                                                 Collections.emptyList());
-
-            return writeRequests.stream()
-                                .filter(writeRequest -> writeRequest.putRequest() != null)
-                                .map(WriteRequest::putRequest)
-                                .map(PutRequest::item)
-                                .map(item -> readAndTransformSingleItem(item,
-                                                                        mappedTable.getTableSchema(),
-                                                                        OperationContext.of(mappedTable.getTableName()),
-                                                                        mappedTable.getMapperExtension()))
-                                .collect(Collectors.toList());
-        }
-
-        public <T> List<T> unprocessedDeleteItemsForTable(MappedTable<T> mappedTable) {
-            List<WriteRequest> writeRequests =
-                unprocessedRequests.getOrDefault(mappedTable.getTableName(),
-                                                 Collections.emptyList());
-
-            return writeRequests.stream()
-                                .filter(writeRequest -> writeRequest.deleteRequest() != null)
-                                .map(WriteRequest::deleteRequest)
-                                .map(DeleteRequest::key)
-                                .map(itemMap -> mappedTable.getTableSchema().mapToItem(itemMap))
-                                .collect(Collectors.toList());
-        }
-    }
-}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/operations/ConditionCheck.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/operations/ConditionCheck.java
deleted file mode 100644
index 86180738bb5e..000000000000
--- a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/operations/ConditionCheck.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.extensions.dynamodb.mappingclient.operations;
-
-import software.amazon.awssdk.annotations.SdkPublicApi;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.Expression;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.Key;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.MapperExtension;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.OperationContext;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.TableSchema;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.TransactableWriteOperation;
-import software.amazon.awssdk.services.dynamodb.model.TransactWriteItem;
-
-@SdkPublicApi
-public class ConditionCheck<T> implements TransactableWriteOperation<T> {
-    private final Key key;
-    private final Expression conditionExpression;
-
-    private ConditionCheck(Key key, Expression conditionExpression) {
-        this.key = key;
-        this.conditionExpression = conditionExpression;
-    }
-
-    public static <T> ConditionCheck<T> of(Key key, Expression conditionExpression) {
-        return new ConditionCheck<>(key, conditionExpression);
-    }
-
-    public static Builder builder() {
-        return new Builder();
-    }
-
-    public Builder toBuilder() {
-        return new Builder().key(key).conditionExpression(conditionExpression);
-    }
-
-    @Override
-    public TransactWriteItem generateTransactWriteItem(TableSchema<T> tableSchema,
-                                                       OperationContext operationContext,
-                                                       MapperExtension mapperExtension) {
-        software.amazon.awssdk.services.dynamodb.model.ConditionCheck conditionCheck =
-            software.amazon.awssdk.services.dynamodb.model.ConditionCheck
-                .builder()
-                .tableName(operationContext.getTableName())
-                .key(key.getKeyMap(tableSchema, operationContext.getIndexName()))
-                .conditionExpression(conditionExpression.getExpression())
-                .expressionAttributeNames(conditionExpression.getExpressionNames())
-                .expressionAttributeValues(conditionExpression.getExpressionValues())
-                .build();
-
-        return TransactWriteItem.builder()
-                                .conditionCheck(conditionCheck)
-                                .build();
-    }
-
-    public Key getKey() {
-        return key;
-    }
-
-    public Expression getConditionExpression() {
-        return conditionExpression;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-
-        ConditionCheck<?> that = (ConditionCheck<?>) o;
-
-        if (key != null ? ! key.equals(that.key) : that.key != null) {
-            return false;
-        }
-        return conditionExpression != null ? conditionExpression.equals(that.conditionExpression) :
-            that.conditionExpression == null;
-    }
-
-    @Override
-    public int hashCode() {
-        int result = key != null ? key.hashCode() : 0;
-        result = 31 * result + (conditionExpression != null ? conditionExpression.hashCode() : 0);
-        return result;
-    }
-
-    public static final class Builder  {
-        private Key key;
-        private Expression conditionExpression;
-
-        private Builder() {
-        }
-
-        public Builder key(Key key) {
-            this.key = key;
-            return this;
-        }
-
-        public Builder conditionExpression(Expression conditionExpression) {
-            this.conditionExpression = conditionExpression;
-            return this;
-        }
-
-        public <T> ConditionCheck<T> build() {
-            return new ConditionCheck<>(key, conditionExpression);
-        }
-    }
-}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/operations/CreateTable.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/operations/CreateTable.java
deleted file mode 100644
index 49382adeff09..000000000000
--- a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/operations/CreateTable.java
+++ /dev/null
@@ -1,273 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.extensions.dynamodb.mappingclient.operations;
-
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Optional;
-import java.util.Set;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
-import software.amazon.awssdk.annotations.SdkPublicApi;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.MapperExtension;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.OperationContext;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.TableMetadata;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.TableOperation;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.TableSchema;
-import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
-import software.amazon.awssdk.services.dynamodb.model.AttributeDefinition;
-import software.amazon.awssdk.services.dynamodb.model.BillingMode;
-import software.amazon.awssdk.services.dynamodb.model.CreateTableRequest;
-import software.amazon.awssdk.services.dynamodb.model.CreateTableResponse;
-import software.amazon.awssdk.services.dynamodb.model.KeySchemaElement;
-import software.amazon.awssdk.services.dynamodb.model.KeyType;
-import software.amazon.awssdk.services.dynamodb.model.ProvisionedThroughput;
-
-@SdkPublicApi
-public class CreateTable<T> implements TableOperation<T, CreateTableRequest, CreateTableResponse, Void> {
-    private final ProvisionedThroughput provisionedThroughput;
-    private final Collection<LocalSecondaryIndex> localSecondaryIndices;
-    private final Collection<GlobalSecondaryIndex> globalSecondaryIndices;
-
-    private CreateTable(ProvisionedThroughput provisionedThroughput,
-                        Collection<LocalSecondaryIndex> localSecondaryIndices,
-                        Collection<GlobalSecondaryIndex> globalSecondaryIndices) {
-        this.provisionedThroughput = provisionedThroughput;
-        this.localSecondaryIndices = localSecondaryIndices;
-        this.globalSecondaryIndices = globalSecondaryIndices;
-    }
-
-    public static <T> CreateTable<T> of(ProvisionedThroughput provisionedThroughput) {
-        return new CreateTable<>(provisionedThroughput, null, null);
-    }
-
-    public static <T> CreateTable<T> create() {
-        return new CreateTable<>(null, null, null);
-    }
-
-    public static Builder builder() {
-        return new Builder();
-    }
-
-    public Builder toBuilder() {
-        return new Builder().provisionedThroughput(provisionedThroughput)
-                            .localSecondaryIndices(localSecondaryIndices)
-                            .globalSecondaryIndices(globalSecondaryIndices);
-    }
-
-    @Override
-    public CreateTableRequest generateRequest(TableSchema<T> tableSchema,
-                                              OperationContext operationContext,
-                                              MapperExtension mapperExtension) {
-        if (!TableMetadata.getPrimaryIndexName().equals(operationContext.getIndexName())) {
-            throw new IllegalArgumentException("PutItem cannot be executed against a secondary index.");
-        }
-
-        String primaryPartitionKey = tableSchema.getTableMetadata().getPrimaryPartitionKey();
-        Optional<String> primarySortKey = tableSchema.getTableMetadata().getPrimarySortKey();
-        Set<String> dedupedIndexKeys = new HashSet<>();
-        dedupedIndexKeys.add(primaryPartitionKey);
-        primarySortKey.ifPresent(dedupedIndexKeys::add);
-        List<software.amazon.awssdk.services.dynamodb.model.GlobalSecondaryIndex> sdkGlobalSecondaryIndices = null;
-        List<software.amazon.awssdk.services.dynamodb.model.LocalSecondaryIndex> sdkLocalSecondaryIndices = null;
-
-        if (globalSecondaryIndices != null) {
-            sdkGlobalSecondaryIndices =
-                this.globalSecondaryIndices.stream().map(gsi -> {
-                    String indexPartitionKey = tableSchema.getTableMetadata().getIndexPartitionKey(gsi.getIndexName());
-                    Optional<String> indexSortKey = tableSchema.getTableMetadata().getIndexSortKey(gsi.getIndexName());
-                    dedupedIndexKeys.add(indexPartitionKey);
-                    indexSortKey.ifPresent(dedupedIndexKeys::add);
-
-                    return software.amazon.awssdk.services.dynamodb.model.GlobalSecondaryIndex
-                        .builder()
-                        .indexName(gsi.getIndexName())
-                        .keySchema(generateKeySchema(indexPartitionKey, indexSortKey.orElse(null)))
-                        .projection(gsi.getProjection())
-                        .provisionedThroughput(gsi.getProvisionedThroughput())
-                        .build();
-                }).collect(Collectors.toList());
-        }
-
-        if (localSecondaryIndices != null) {
-            sdkLocalSecondaryIndices =
-                this.localSecondaryIndices.stream().map(lsi -> {
-                    Optional<String> indexSortKey = tableSchema.getTableMetadata().getIndexSortKey(lsi.getIndexName());
-                    indexSortKey.ifPresent(dedupedIndexKeys::add);
-
-                    if (!primaryPartitionKey.equals(
-                        tableSchema.getTableMetadata().getIndexPartitionKey(lsi.getIndexName()))) {
-                        throw new IllegalArgumentException("Attempt to create a local secondary index with a partition "
-                                                           + "key that is not the primary partition key. Index name: "
-                                                           + lsi.getIndexName());
-                    }
-
-                    return software.amazon.awssdk.services.dynamodb.model.LocalSecondaryIndex
-                        .builder()
-                        .indexName(lsi.getIndexName())
-                        .keySchema(generateKeySchema(primaryPartitionKey, indexSortKey.orElse(null)))
-                        .projection(lsi.getProjection())
-                        .build();
-                }).collect(Collectors.toList());
-        }
-
-        List<AttributeDefinition> attributeDefinitions =
-            dedupedIndexKeys.stream()
-                            .map(attribute ->
-                                     AttributeDefinition.builder()
-                                                        .attributeName(attribute)
-                                                        .attributeType(tableSchema.getTableMetadata()
-                                                                                  .getScalarAttributeType(attribute)
-                                                                                  .orElseThrow(() ->
-                                        new IllegalArgumentException("Could not map the key attribute '" + attribute +
-                                                                     "' to a valid scalar type.")))
-                                                        .build())
-                            .collect(Collectors.toList());
-
-        BillingMode billingMode = provisionedThroughput == null ? BillingMode.PAY_PER_REQUEST : BillingMode.PROVISIONED;
-
-        return CreateTableRequest.builder()
-                                 .tableName(operationContext.getTableName())
-                                 .keySchema(generateKeySchema(primaryPartitionKey, primarySortKey.orElse(null)))
-                                 .globalSecondaryIndexes(sdkGlobalSecondaryIndices)
-                                 .localSecondaryIndexes(sdkLocalSecondaryIndices)
-                                 .attributeDefinitions(attributeDefinitions)
-                                 .billingMode(billingMode)
-                                 .provisionedThroughput(provisionedThroughput)
-                                 .build();
-    }
-
-    @Override
-    public Function<CreateTableRequest, CreateTableResponse> getServiceCall(DynamoDbClient dynamoDbClient) {
-        return dynamoDbClient::createTable;
-    }
-
-    @Override
-    public Void transformResponse(CreateTableResponse response,
-                                  TableSchema<T> tableSchema,
-                                  OperationContext operationContext,
-                                  MapperExtension mapperExtension) {
-        // This operation does not return results
-        return null;
-    }
-
-    public ProvisionedThroughput getProvisionedThroughput() {
-        return provisionedThroughput;
-    }
-
-    public Collection<LocalSecondaryIndex> getLocalSecondaryIndices() {
-        return localSecondaryIndices;
-    }
-
-    public Collection<GlobalSecondaryIndex> getGlobalSecondaryIndices() {
-        return globalSecondaryIndices;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-
-        CreateTable<?> that = (CreateTable<?>) o;
-
-        if (provisionedThroughput != null ? ! provisionedThroughput.equals(that.provisionedThroughput) :
-            that.provisionedThroughput != null) {
-            return false;
-        }
-        if (localSecondaryIndices != null ? ! localSecondaryIndices.equals(that.localSecondaryIndices) :
-            that.localSecondaryIndices != null) {
-            return false;
-        }
-        return globalSecondaryIndices != null ? globalSecondaryIndices.equals(that.globalSecondaryIndices) :
-            that.globalSecondaryIndices == null;
-    }
-
-    @Override
-    public int hashCode() {
-        int result = provisionedThroughput != null ? provisionedThroughput.hashCode() : 0;
-        result = 31 * result + (localSecondaryIndices != null ? localSecondaryIndices.hashCode() : 0);
-        result = 31 * result + (globalSecondaryIndices != null ? globalSecondaryIndices.hashCode() : 0);
-        return result;
-    }
-
-    public static final class Builder {
-        private ProvisionedThroughput provisionedThroughput;
-        private Collection<LocalSecondaryIndex> localSecondaryIndices;
-        private Collection<GlobalSecondaryIndex> globalSecondaryIndices;
-
-        private Builder() {
-        }
-
-        public Builder provisionedThroughput(ProvisionedThroughput provisionedThroughput) {
-            this.provisionedThroughput = provisionedThroughput;
-            return this;
-        }
-
-        public Builder localSecondaryIndices(Collection<LocalSecondaryIndex> localSecondaryIndices) {
-            this.localSecondaryIndices = localSecondaryIndices;
-            return this;
-        }
-
-        public Builder localSecondaryIndices(LocalSecondaryIndex... localSecondaryIndices) {
-            this.localSecondaryIndices = Arrays.asList(localSecondaryIndices);
-            return this;
-        }
-
-        public Builder globalSecondaryIndices(Collection<GlobalSecondaryIndex> globalSecondaryIndices) {
-            this.globalSecondaryIndices = globalSecondaryIndices;
-            return this;
-        }
-
-        public Builder globalSecondaryIndices(GlobalSecondaryIndex... globalSecondaryIndices) {
-            this.globalSecondaryIndices = Arrays.asList(globalSecondaryIndices);
-            return this;
-        }
-
-        public <T> CreateTable<T> build() {
-            return new CreateTable<>(provisionedThroughput, localSecondaryIndices, globalSecondaryIndices);
-        }
-    }
-
-    private static Collection<KeySchemaElement> generateKeySchema(String partitionKey, String sortKey) {
-        if (sortKey == null) {
-            return generateKeySchema(partitionKey);
-        }
-
-        return Collections.unmodifiableList(Arrays.asList(KeySchemaElement.builder()
-                                                                          .attributeName(partitionKey)
-                                                                          .keyType(KeyType.HASH)
-                                                                          .build(),
-                                                          KeySchemaElement.builder()
-                                                                          .attributeName(sortKey)
-                                                                          .keyType(KeyType.RANGE)
-                                                                          .build()));
-    }
-
-    private static Collection<KeySchemaElement> generateKeySchema(String partitionKey) {
-        return Collections.singletonList(KeySchemaElement.builder()
-                                                         .attributeName(partitionKey)
-                                                         .keyType(KeyType.HASH)
-                                                         .build());
-    }
-}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/operations/DeleteItem.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/operations/DeleteItem.java
deleted file mode 100644
index fc9c9bb04337..000000000000
--- a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/operations/DeleteItem.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.extensions.dynamodb.mappingclient.operations;
-
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.core.Utils.readAndTransformSingleItem;
-
-import java.util.function.Function;
-
-import software.amazon.awssdk.annotations.SdkPublicApi;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.BatchableWriteOperation;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.Key;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.MapperExtension;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.OperationContext;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.TableMetadata;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.TableOperation;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.TableSchema;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.TransactableWriteOperation;
-import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
-import software.amazon.awssdk.services.dynamodb.model.Delete;
-import software.amazon.awssdk.services.dynamodb.model.DeleteItemRequest;
-import software.amazon.awssdk.services.dynamodb.model.DeleteItemResponse;
-import software.amazon.awssdk.services.dynamodb.model.DeleteRequest;
-import software.amazon.awssdk.services.dynamodb.model.ReturnValue;
-import software.amazon.awssdk.services.dynamodb.model.TransactWriteItem;
-import software.amazon.awssdk.services.dynamodb.model.WriteRequest;
-
-@SdkPublicApi
-public class DeleteItem<T>
-    implements TableOperation<T, DeleteItemRequest, DeleteItemResponse, T>,
-               TransactableWriteOperation<T>,
-               BatchableWriteOperation<T> {
-
-    private final Key key;
-
-    private DeleteItem(Key key) {
-        this.key = key;
-    }
-
-    public static <T> DeleteItem<T> of(Key key) {
-        return new DeleteItem<>(key);
-    }
-
-    public static Builder builder() {
-        return new Builder();
-    }
-
-    public Builder toBuilder() {
-        return new Builder().key(key);
-    }
-
-    @Override
-    public DeleteItemRequest generateRequest(TableSchema<T> tableSchema,
-                                             OperationContext operationContext,
-                                             MapperExtension mapperExtension) {
-
-        if (!TableMetadata.getPrimaryIndexName().equals(operationContext.getIndexName())) {
-            throw new IllegalArgumentException("DeleteItem cannot be executed against a secondary index.");
-        }
-
-        return DeleteItemRequest.builder()
-                                .tableName(operationContext.getTableName())
-                                .key(key.getKeyMap(tableSchema, operationContext.getIndexName()))
-                                .returnValues(ReturnValue.ALL_OLD)
-                                .build();
-    }
-
-    @Override
-    public T transformResponse(DeleteItemResponse response,
-                               TableSchema<T> tableSchema,
-                               OperationContext operationContext,
-                               MapperExtension mapperExtension) {
-        return readAndTransformSingleItem(response.attributes(), tableSchema, operationContext, mapperExtension);
-    }
-
-    @Override
-    public Function<DeleteItemRequest, DeleteItemResponse> getServiceCall(DynamoDbClient dynamoDbClient) {
-        return dynamoDbClient::deleteItem;
-    }
-
-    @Override
-    public WriteRequest generateWriteRequest(TableSchema<T> tableSchema,
-                                             OperationContext operationContext,
-                                             MapperExtension mapperExtension) {
-        DeleteItemRequest deleteItemRequest = generateRequest(tableSchema, operationContext, mapperExtension);
-
-        return WriteRequest.builder()
-                           .deleteRequest(DeleteRequest.builder().key(deleteItemRequest.key()).build())
-                           .build();
-    }
-
-    @Override
-    public TransactWriteItem generateTransactWriteItem(TableSchema<T> tableSchema,
-                                                       OperationContext operationContext,
-                                                       MapperExtension mapperExtension) {
-        DeleteItemRequest deleteItemRequest = generateRequest(tableSchema, operationContext, mapperExtension);
-
-        Delete delete = Delete.builder()
-                              .key(deleteItemRequest.key())
-                              .tableName(deleteItemRequest.tableName())
-                              .conditionExpression(deleteItemRequest.conditionExpression())
-                              .expressionAttributeValues(deleteItemRequest.expressionAttributeValues())
-                              .expressionAttributeNames(deleteItemRequest.expressionAttributeNames())
-                              .build();
-
-        return TransactWriteItem.builder()
-                                .delete(delete)
-                                .build();
-    }
-
-    public Key getKey() {
-        return key;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-
-        DeleteItem<?> that = (DeleteItem<?>) o;
-
-        return key != null ? key.equals(that.key) : that.key == null;
-    }
-
-    @Override
-    public int hashCode() {
-        return key != null ? key.hashCode() : 0;
-    }
-
-    public static final class Builder {
-        private Key key;
-
-        private Builder() {
-        }
-
-        public Builder key(Key key) {
-            this.key = key;
-            return this;
-        }
-
-        public <T> DeleteItem<T> build() {
-            return new DeleteItem<>(key);
-        }
-    }
-}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/operations/GetItem.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/operations/GetItem.java
deleted file mode 100644
index 4ad9fa4bc401..000000000000
--- a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/operations/GetItem.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.extensions.dynamodb.mappingclient.operations;
-
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.core.Utils.readAndTransformSingleItem;
-
-import java.util.function.Function;
-
-import software.amazon.awssdk.annotations.SdkPublicApi;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.BatchableReadOperation;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.Key;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.MapperExtension;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.OperationContext;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.TableMetadata;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.TableOperation;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.TableSchema;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.TransactableReadOperation;
-import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
-import software.amazon.awssdk.services.dynamodb.model.Get;
-import software.amazon.awssdk.services.dynamodb.model.GetItemRequest;
-import software.amazon.awssdk.services.dynamodb.model.GetItemResponse;
-import software.amazon.awssdk.services.dynamodb.model.TransactGetItem;
-
-@SdkPublicApi
-public class GetItem<T> implements TableOperation<T, GetItemRequest, GetItemResponse, T>,
-                                   BatchableReadOperation,
-                                   TransactableReadOperation<T> {
-
-    private final Key key;
-    private final Boolean consistentRead;
-
-    private GetItem(Key key, Boolean consistentRead) {
-        this.key = key;
-        this.consistentRead = consistentRead;
-    }
-
-    public static <T> GetItem<T> of(Key key) {
-        return new GetItem<>(key, null);
-    }
-
-    public static Builder builder() {
-        return new Builder();
-    }
-
-    public Builder toBuilder() {
-        return new Builder().key(key).consistentRead(consistentRead);
-    }
-
-    @Override
-    public Boolean getConsistentRead() {
-        return this.consistentRead;
-    }
-
-    @Override
-    public Key getKey() {
-        return this.key;
-    }
-
-    @Override
-    public GetItemRequest generateRequest(TableSchema<T> tableSchema,
-                                          OperationContext context,
-                                          MapperExtension mapperExtension) {
-        if (!TableMetadata.getPrimaryIndexName().equals(context.getIndexName())) {
-            throw new IllegalArgumentException("GetItem cannot be executed against a secondary index.");
-        }
-
-        return GetItemRequest.builder()
-                             .tableName(context.getTableName())
-                             .key(key.getKeyMap(tableSchema, context.getIndexName()))
-                             .consistentRead(consistentRead)
-                             .build();
-    }
-
-    @Override
-    public T transformResponse(GetItemResponse response,
-                               TableSchema<T> tableSchema,
-                               OperationContext context,
-                               MapperExtension mapperExtension) {
-        return readAndTransformSingleItem(response.item(), tableSchema, context, mapperExtension);
-    }
-
-    @Override
-    public Function<GetItemRequest, GetItemResponse> getServiceCall(DynamoDbClient dynamoDbClient) {
-        return dynamoDbClient::getItem;
-    }
-
-    @Override
-    public TransactGetItem generateTransactGetItem(TableSchema<T> tableSchema,
-                                                   OperationContext operationContext,
-                                                   MapperExtension mapperExtension) {
-        return TransactGetItem.builder()
-                              .get(Get.builder()
-                                      .tableName(operationContext.getTableName())
-                                      .key(key.getKeyMap(tableSchema, operationContext.getIndexName()))
-                                      .build())
-                              .build();
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-
-        GetItem<?> getItem = (GetItem<?>) o;
-
-        if (key != null ? ! key.equals(getItem.key) : getItem.key != null) {
-            return false;
-        }
-        return consistentRead != null ? consistentRead.equals(getItem.consistentRead) : getItem.consistentRead == null;
-    }
-
-    @Override
-    public int hashCode() {
-        int result = key != null ? key.hashCode() : 0;
-        result = 31 * result + (consistentRead != null ? consistentRead.hashCode() : 0);
-        return result;
-    }
-
-    public static final class Builder {
-        private Key key;
-        private Boolean consistentRead;
-
-        private Builder() {
-        }
-
-        public Builder consistentRead(Boolean consistentRead) {
-            this.consistentRead = consistentRead;
-            return this;
-        }
-
-        public Builder key(Key key) {
-            this.key = key;
-            return this;
-        }
-
-        public <T> GetItem<T> build() {
-            return new GetItem<>(this.key, this.consistentRead);
-        }
-    }
-}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/operations/GlobalSecondaryIndex.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/operations/GlobalSecondaryIndex.java
deleted file mode 100644
index 8fa3bc6b3366..000000000000
--- a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/operations/GlobalSecondaryIndex.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.extensions.dynamodb.mappingclient.operations;
-
-import software.amazon.awssdk.annotations.SdkPublicApi;
-import software.amazon.awssdk.services.dynamodb.model.Projection;
-import software.amazon.awssdk.services.dynamodb.model.ProvisionedThroughput;
-
-@SdkPublicApi
-public class GlobalSecondaryIndex {
-    private final String indexName;
-    private final Projection projection;
-    private final ProvisionedThroughput provisionedThroughput;
-
-    private GlobalSecondaryIndex(String indexName, Projection projection, ProvisionedThroughput provisionedThroughput) {
-        this.indexName = indexName;
-        this.projection = projection;
-        this.provisionedThroughput = provisionedThroughput;
-    }
-
-    public static GlobalSecondaryIndex of(String indexName,
-                                          Projection projection,
-                                          ProvisionedThroughput provisionedThroughput) {
-
-        return new GlobalSecondaryIndex(indexName, projection, provisionedThroughput);
-    }
-
-    public String getIndexName() {
-        return indexName;
-    }
-
-    public Projection getProjection() {
-        return projection;
-    }
-
-    public ProvisionedThroughput getProvisionedThroughput() {
-        return provisionedThroughput;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-
-        GlobalSecondaryIndex that = (GlobalSecondaryIndex) o;
-
-        if (indexName != null ? ! indexName.equals(that.indexName) : that.indexName != null) {
-            return false;
-        }
-        if (projection != null ? ! projection.equals(that.projection) : that.projection != null) {
-            return false;
-        }
-        return provisionedThroughput != null ? provisionedThroughput.equals(that.provisionedThroughput) :
-            that.provisionedThroughput == null;
-    }
-
-    @Override
-    public int hashCode() {
-        int result = indexName != null ? indexName.hashCode() : 0;
-        result = 31 * result + (projection != null ? projection.hashCode() : 0);
-        result = 31 * result + (provisionedThroughput != null ? provisionedThroughput.hashCode() : 0);
-        return result;
-    }
-
-    public static final class Builder {
-        private String indexName;
-        private Projection projection;
-        private ProvisionedThroughput provisionedThroughput;
-
-        private Builder() {
-        }
-
-        public Builder indexName(String indexName) {
-            this.indexName = indexName;
-            return this;
-        }
-
-        public Builder projection(Projection projection) {
-            this.projection = projection;
-            return this;
-        }
-
-        public Builder provisionedThroughput(ProvisionedThroughput provisionedThroughput) {
-            this.provisionedThroughput = provisionedThroughput;
-            return this;
-        }
-
-        public GlobalSecondaryIndex build() {
-            return new GlobalSecondaryIndex(indexName, projection, provisionedThroughput);
-        }
-    }
-}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/operations/LocalSecondaryIndex.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/operations/LocalSecondaryIndex.java
deleted file mode 100644
index 09b993212b54..000000000000
--- a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/operations/LocalSecondaryIndex.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.extensions.dynamodb.mappingclient.operations;
-
-import software.amazon.awssdk.annotations.SdkPublicApi;
-import software.amazon.awssdk.services.dynamodb.model.Projection;
-
-@SdkPublicApi
-public class LocalSecondaryIndex {
-    private final String indexName;
-    private final Projection projection;
-
-    private LocalSecondaryIndex(String indexName, Projection projection) {
-        this.indexName = indexName;
-        this.projection = projection;
-    }
-
-    public static LocalSecondaryIndex of(String indexName,
-                                         Projection projection) {
-
-        return new LocalSecondaryIndex(indexName, projection);
-    }
-
-    public String getIndexName() {
-        return indexName;
-    }
-
-    public Projection getProjection() {
-        return projection;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-
-        LocalSecondaryIndex that = (LocalSecondaryIndex) o;
-
-        if (indexName != null ? ! indexName.equals(that.indexName) : that.indexName != null) {
-            return false;
-        }
-        return projection != null ? projection.equals(that.projection) : that.projection == null;
-    }
-
-    @Override
-    public int hashCode() {
-        int result = indexName != null ? indexName.hashCode() : 0;
-        result = 31 * result + (projection != null ? projection.hashCode() : 0);
-        return result;
-    }
-
-    public static final class Builder {
-        private String indexName;
-        private Projection projection;
-
-        private Builder() {
-        }
-
-        public Builder indexName(String indexName) {
-            this.indexName = indexName;
-            return this;
-        }
-
-        public Builder projection(Projection projection) {
-            this.projection = projection;
-            return this;
-        }
-
-        public LocalSecondaryIndex build() {
-            return new LocalSecondaryIndex(indexName, projection);
-        }
-    }
-}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/operations/PutItem.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/operations/PutItem.java
deleted file mode 100644
index 41fbf9a4468e..000000000000
--- a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/operations/PutItem.java
+++ /dev/null
@@ -1,205 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.extensions.dynamodb.mappingclient.operations;
-
-import java.util.Map;
-import java.util.function.Function;
-
-import software.amazon.awssdk.annotations.SdkPublicApi;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.BatchableWriteOperation;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.MapperExtension;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.OperationContext;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.TableMetadata;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.TableOperation;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.TableSchema;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.TransactableWriteOperation;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.extensions.WriteModification;
-import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-import software.amazon.awssdk.services.dynamodb.model.Put;
-import software.amazon.awssdk.services.dynamodb.model.PutItemRequest;
-import software.amazon.awssdk.services.dynamodb.model.PutItemResponse;
-import software.amazon.awssdk.services.dynamodb.model.PutRequest;
-import software.amazon.awssdk.services.dynamodb.model.TransactWriteItem;
-import software.amazon.awssdk.services.dynamodb.model.WriteRequest;
-
-@SdkPublicApi
-public class PutItem<T>
-    implements BatchableWriteOperation<T>,
-               TransactableWriteOperation<T>,
-               TableOperation<T, PutItemRequest, PutItemResponse, Void> {
-
-    private final T item;
-
-    private PutItem(T item) {
-        this.item = item;
-    }
-
-    public static <T> PutItem<T> of(T item) {
-        return new PutItem<>(item);
-    }
-
-    public static GenericBuilder builder() {
-        return new GenericBuilder();
-    }
-
-    public Builder<T> toBuilder() {
-        return new Builder<T>().item(item);
-    }
-
-    @Override
-    public PutItemRequest generateRequest(TableSchema<T> tableSchema,
-                                          OperationContext operationContext,
-                                          MapperExtension mapperExtension) {
-        if (!TableMetadata.getPrimaryIndexName().equals(operationContext.getIndexName())) {
-            throw new IllegalArgumentException("PutItem cannot be executed against a secondary index.");
-        }
-
-        // Redundant check for the existence of a partition key to avoid the call to DynamoDb and having it complain
-        // instead
-        tableSchema.getTableMetadata().getPrimaryPartitionKey();
-
-        Map<String, AttributeValue> itemMap = tableSchema.itemToMap(item, true);     // always ignore nulls for putItem
-        TableMetadata tableMetadata = tableSchema.getTableMetadata();
-
-        // Allow a command mapperExtension to modify the attribute values of the item in the PutItemRequest and
-        // add a conditional statement
-        WriteModification transformation =
-            mapperExtension != null ? mapperExtension.beforeWrite(itemMap, operationContext, tableMetadata) : null;
-
-        if (transformation != null && transformation.getTransformedItem() != null) {
-            itemMap = transformation.getTransformedItem();
-        }
-
-        PutItemRequest.Builder baseRequest = PutItemRequest.builder()
-                             .tableName(operationContext.getTableName())
-                             .item(itemMap);
-
-        if (transformation != null && transformation.getAdditionalConditionalExpression() != null) {
-            baseRequest = baseRequest.conditionExpression(
-                transformation.getAdditionalConditionalExpression().getExpression())
-                                     .expressionAttributeValues(
-                    transformation.getAdditionalConditionalExpression().getExpressionValues())
-                                     .expressionAttributeNames(
-                    transformation.getAdditionalConditionalExpression().getExpressionNames());
-        }
-
-        return baseRequest.build();
-    }
-
-    @Override
-    public Void transformResponse(PutItemResponse response,
-                                  TableSchema<T> tableSchema,
-                                  OperationContext operationContext,
-                                  MapperExtension mapperExtension) {
-        // No results are returned by this operation
-        return null;
-    }
-
-    @Override
-    public Function<PutItemRequest, PutItemResponse> getServiceCall(DynamoDbClient dynamoDbClient) {
-        return dynamoDbClient::putItem;
-    }
-
-    @Override
-    public WriteRequest generateWriteRequest(TableSchema<T> tableSchema,
-                                             OperationContext operationContext,
-                                             MapperExtension mapperExtension) {
-        PutItemRequest putItemRequest = generateRequest(tableSchema,
-                                                        operationContext,
-                                                        mapperExtension);
-
-        if (putItemRequest.conditionExpression() != null) {
-            throw new IllegalArgumentException("A mapper extension inserted a conditionExpression in a PutItem "
-                                               + "request as part of a BatchWriteItemRequest. This is not supported by "
-                                               + "DynamoDb. An extension known to do this is the "
-                                               + "VersionedRecordExtension.");
-        }
-
-        return WriteRequest.builder().putRequest(PutRequest.builder().item(putItemRequest.item()).build()).build();
-    }
-
-    @Override
-    public TransactWriteItem generateTransactWriteItem(TableSchema<T> tableSchema,
-                                                       OperationContext operationContext,
-                                                       MapperExtension mapperExtension) {
-        PutItemRequest putItemRequest = generateRequest(tableSchema, operationContext, mapperExtension);
-
-        Put put = Put.builder()
-                     .item(putItemRequest.item())
-                     .tableName(putItemRequest.tableName())
-                     .conditionExpression(putItemRequest.conditionExpression())
-                     .expressionAttributeValues(putItemRequest.expressionAttributeValues())
-                     .expressionAttributeNames(putItemRequest.expressionAttributeNames())
-                     .build();
-
-        return TransactWriteItem.builder()
-                                .put(put)
-                                .build();
-    }
-
-    public T getItem() {
-        return item;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-
-        PutItem<?> putItem = (PutItem<?>) o;
-
-        return item != null ? item.equals(putItem.item) : putItem.item == null;
-    }
-
-    @Override
-    public int hashCode() {
-        return item != null ? item.hashCode() : 0;
-    }
-
-    public static class GenericBuilder {
-        private GenericBuilder() {
-        }
-
-        public <T> Builder<T> item(T item) {
-            return new Builder<T>().item(item);
-        }
-
-        public PutItem<?> build() {
-            throw new UnsupportedOperationException("Cannot construct a PutItem operation without an item to put.");
-        }
-    }
-
-    public static final class Builder<T> {
-        private T item;
-
-        private Builder() {
-        }
-
-        public Builder<T> item(T item) {
-            this.item = item;
-            return this;
-        }
-
-        public PutItem<T> build() {
-            return new PutItem<>(item);
-        }
-    }
-}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/operations/Query.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/operations/Query.java
deleted file mode 100644
index 46722989e189..000000000000
--- a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/operations/Query.java
+++ /dev/null
@@ -1,253 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.extensions.dynamodb.mappingclient.operations;
-
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.core.Utils.readAndTransformPaginatedItems;
-
-import java.util.Map;
-import java.util.function.Function;
-
-import software.amazon.awssdk.annotations.SdkPublicApi;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.Expression;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.IndexOperation;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.MapperExtension;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.OperationContext;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.Page;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.TableMetadata;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.TableOperation;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.TableSchema;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.core.TransformIterable;
-import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-import software.amazon.awssdk.services.dynamodb.model.QueryRequest;
-import software.amazon.awssdk.services.dynamodb.model.QueryResponse;
-import software.amazon.awssdk.services.dynamodb.paginators.QueryIterable;
-
-@SdkPublicApi
-public class Query<T> implements TableOperation<T, QueryRequest, QueryIterable, Iterable<Page<T>>>,
-                                 IndexOperation<T, QueryRequest, QueryIterable, Iterable<Page<T>>> {
-
-    private final QueryConditional queryConditional;
-    private final Map<String, AttributeValue> exclusiveStartKey;
-    private final Boolean scanIndexForward;
-    private final Integer limit;
-    private final Boolean consistentRead;
-    private final Expression filterExpression;
-
-
-    private Query(QueryConditional queryConditional,
-                  Map<String, AttributeValue> exclusiveStartKey,
-                  Boolean scanIndexForward,
-                  Integer limit,
-                  Boolean consistentRead,
-                  Expression filterExpression) {
-        this.queryConditional = queryConditional;
-        this.exclusiveStartKey = exclusiveStartKey;
-        this.scanIndexForward = scanIndexForward;
-        this.limit = limit;
-        this.consistentRead = consistentRead;
-        this.filterExpression = filterExpression;
-    }
-
-    public static <T> Query<T> of(QueryConditional queryConditional) {
-        return new Query<>(queryConditional, null, null, null, null, null);
-    }
-
-    public static Builder builder() {
-        return new Builder();
-    }
-
-    public Builder toBuilder() {
-        return new Builder().queryConditional(queryConditional)
-                            .exclusiveStartKey(exclusiveStartKey)
-                            .scanIndexForward(scanIndexForward)
-                            .limit(limit)
-                            .consistentRead(consistentRead)
-                            .filterExpression(filterExpression);
-    }
-
-    @Override
-    public QueryRequest generateRequest(TableSchema<T> tableSchema,
-                                        OperationContext operationContext,
-                                        MapperExtension mapperExtension) {
-        Expression queryExpression = queryConditional.getExpression(tableSchema, operationContext.getIndexName());
-        Map<String, AttributeValue> expressionValues = queryExpression.getExpressionValues();
-        Map<String, String> expressionNames = queryExpression.getExpressionNames();
-
-        if (filterExpression != null) {
-            expressionValues = Expression.coalesceValues(expressionValues, filterExpression.getExpressionValues());
-            expressionNames = Expression.coalesceNames(expressionNames, filterExpression.getExpressionNames());
-        }
-
-        QueryRequest.Builder queryRequest = QueryRequest.builder()
-                                                        .tableName(operationContext.getTableName())
-                                                        .keyConditionExpression(queryExpression.getExpression())
-                                                        .expressionAttributeValues(expressionValues)
-                                                        .expressionAttributeNames(expressionNames)
-                                                        .scanIndexForward(scanIndexForward)
-                                                        .limit(limit)
-                                                        .exclusiveStartKey(exclusiveStartKey)
-                                                        .consistentRead(consistentRead);
-
-        if (!TableMetadata.getPrimaryIndexName().equals(operationContext.getIndexName())) {
-            queryRequest = queryRequest.indexName(operationContext.getIndexName());
-        }
-
-        if (filterExpression != null) {
-            queryRequest = queryRequest.filterExpression(filterExpression.getExpression());
-        }
-
-        return queryRequest.build();
-    }
-
-    @Override
-    public Iterable<Page<T>> transformResponse(QueryIterable response,
-                                               TableSchema<T> tableSchema,
-                                               OperationContext operationContext,
-                                               MapperExtension mapperExtension) {
-        return TransformIterable.of(response, getQueryResponseMapper(tableSchema, operationContext, mapperExtension));
-    }
-
-    @Override
-    public Function<QueryRequest, QueryIterable> getServiceCall(DynamoDbClient dynamoDbClient) {
-        return dynamoDbClient::queryPaginator;
-    }
-
-    private Function<QueryResponse, Page<T>> getQueryResponseMapper(TableSchema<T> tableSchema,
-                                                                    OperationContext operationContext,
-                                                                    MapperExtension mapperExtension) {
-        return readAndTransformPaginatedItems(tableSchema, operationContext, mapperExtension, QueryResponse::items,
-                                              QueryResponse::lastEvaluatedKey);
-    }
-
-    public QueryConditional getQueryConditional() {
-        return queryConditional;
-    }
-
-    public Map<String, AttributeValue> getExclusiveStartKey() {
-        return exclusiveStartKey;
-    }
-
-    public Boolean getScanIndexForward() {
-        return scanIndexForward;
-    }
-
-    public Integer getLimit() {
-        return limit;
-    }
-
-    public Boolean getConsistentRead() {
-        return consistentRead;
-    }
-
-    public Expression getFilterExpression() {
-        return filterExpression;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-
-        Query<?> query = (Query<?>) o;
-
-        if (queryConditional != null ? ! queryConditional.equals(query.queryConditional) :
-            query.queryConditional != null) {
-            return false;
-        }
-        if (exclusiveStartKey != null ? ! exclusiveStartKey.equals(query.exclusiveStartKey) :
-            query.exclusiveStartKey != null) {
-            return false;
-        }
-        if (scanIndexForward != null ? ! scanIndexForward.equals(query.scanIndexForward) :
-            query.scanIndexForward != null) {
-            return false;
-        }
-        if (limit != null ? ! limit.equals(query.limit) : query.limit != null) {
-            return false;
-        }
-        if (consistentRead != null ? ! consistentRead.equals(query.consistentRead) : query.consistentRead != null) {
-            return false;
-        }
-        return filterExpression != null ? filterExpression.equals(query.filterExpression) : query.filterExpression == null;
-    }
-
-    @Override
-    public int hashCode() {
-        int result = queryConditional != null ? queryConditional.hashCode() : 0;
-        result = 31 * result + (exclusiveStartKey != null ? exclusiveStartKey.hashCode() : 0);
-        result = 31 * result + (scanIndexForward != null ? scanIndexForward.hashCode() : 0);
-        result = 31 * result + (limit != null ? limit.hashCode() : 0);
-        result = 31 * result + (consistentRead != null ? consistentRead.hashCode() : 0);
-        result = 31 * result + (filterExpression != null ? filterExpression.hashCode() : 0);
-        return result;
-    }
-
-    public static final class Builder {
-        private QueryConditional queryConditional;
-        private Map<String, AttributeValue> exclusiveStartKey;
-        private Boolean scanIndexForward;
-        private Integer limit;
-        private Boolean consistentRead;
-        private Expression filterExpression;
-
-        private Builder() {
-        }
-
-        public <T> Query<T> build() {
-            return new Query<>(queryConditional,
-                               exclusiveStartKey,
-                               scanIndexForward,
-                               limit,
-                               consistentRead,
-                               filterExpression);
-        }
-
-        public Builder queryConditional(QueryConditional queryConditional) {
-            this.queryConditional = queryConditional;
-            return this;
-        }
-
-        public Builder scanIndexForward(Boolean scanIndexForward) {
-            this.scanIndexForward = scanIndexForward;
-            return this;
-        }
-
-        public Builder exclusiveStartKey(Map<String, AttributeValue> exclusiveStartKey) {
-            this.exclusiveStartKey = exclusiveStartKey;
-            return this;
-        }
-
-        public Builder limit(Integer limit) {
-            this.limit = limit;
-            return this;
-        }
-
-        public Builder consistentRead(Boolean consistentRead) {
-            this.consistentRead = consistentRead;
-            return this;
-        }
-
-        public Builder filterExpression(Expression filterExpression) {
-            this.filterExpression = filterExpression;
-            return this;
-        }
-    }
-}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/operations/QueryConditional.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/operations/QueryConditional.java
deleted file mode 100644
index d9936f2a7b69..000000000000
--- a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/operations/QueryConditional.java
+++ /dev/null
@@ -1,411 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.extensions.dynamodb.mappingclient.operations;
-
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.AttributeValues.nullAttributeValue;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.core.Utils.cleanAttributeName;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Optional;
-import java.util.function.Function;
-
-import software.amazon.awssdk.annotations.SdkPublicApi;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.Expression;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.Key;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.TableSchema;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-
-@SdkPublicApi
-public abstract class QueryConditional {
-    private static final Function<String, String> EXPRESSION_KEY_MAPPER =
-        key -> "#AMZN_MAPPED_" + cleanAttributeName(key);
-    private static final Function<String, String> EXPRESSION_VALUE_KEY_MAPPER =
-        key -> ":AMZN_MAPPED_" + cleanAttributeName(key);
-    private static final Function<String, String> EXPRESSION_OTHER_VALUE_KEY_MAPPER =
-        key -> ":AMZN_MAPPED_" + cleanAttributeName(key) + "2";
-
-    public static QueryConditional equalTo(Key key) {
-        return new EqualToConditional(key);
-    }
-
-    public static QueryConditional greaterThan(Key key) {
-        return new SingleKeyItemConditional(key, ">");
-    }
-
-    public static QueryConditional greaterThanOrEqualTo(Key key) {
-        return new SingleKeyItemConditional(key, ">=");
-    }
-
-    public static QueryConditional lessThan(Key key) {
-        return new SingleKeyItemConditional(key, "<");
-    }
-
-    public static QueryConditional lessThanOrEqualTo(Key key) {
-        return new SingleKeyItemConditional(key, "<=");
-    }
-
-    public static QueryConditional between(Key key1, Key key2) {
-        return new BetweenConditional(key1, key2);
-    }
-
-    public static QueryConditional beginsWith(Key key) {
-        return new BeginsWithConditional(key);
-    }
-
-    public abstract Expression getExpression(TableSchema<?> tableSchema, String indexName);
-
-    private static class EqualToConditional extends QueryConditional {
-        private final Key key;
-
-        private EqualToConditional(Key key) {
-            this.key = key;
-        }
-
-        @Override
-        public Expression getExpression(TableSchema<?> tableSchema, String indexName) {
-            String partitionKey = tableSchema.getTableMetadata().getIndexPartitionKey(indexName);
-            AttributeValue partitionValue = key.getPartitionKeyValue();
-
-            if (partitionValue == null || partitionValue.equals(nullAttributeValue())) {
-                throw new IllegalArgumentException("Partition key must be a valid scalar value to execute a query "
-                    + "against. The provided partition key was set to null.");
-            }
-
-            Optional<AttributeValue> sortKeyValue = key.getSortKeyValue();
-
-            if (sortKeyValue.isPresent()) {
-                Optional<String> sortKey = tableSchema.getTableMetadata().getIndexSortKey(indexName);
-
-                if (!sortKey.isPresent()) {
-                    throw new IllegalArgumentException("A sort key was supplied as part of a query conditional "
-                                                       + "against an index that does not support a sort key. Index: "
-                                                       + indexName);
-                }
-
-                return getPartitionAndSortExpression(partitionKey,
-                                                     sortKey.get(),
-                                                     partitionValue,
-                                                     sortKeyValue.get());
-            } else {
-                return getPartitionOnlyExpression(partitionKey, partitionValue);
-            }
-        }
-
-        private Expression getPartitionOnlyExpression(String partitionKey,
-                                                      AttributeValue partitionValue) {
-
-            String partitionKeyToken = EXPRESSION_KEY_MAPPER.apply(partitionKey);
-            String partitionKeyValueToken = EXPRESSION_VALUE_KEY_MAPPER.apply(partitionKey);
-            String queryExpression = String.format("%s = %s", partitionKeyToken, partitionKeyValueToken);
-
-            return Expression.builder()
-                             .expression(queryExpression)
-                             .expressionNames(Collections.singletonMap(partitionKeyToken, partitionKey))
-                             .expressionValues(Collections.singletonMap(partitionKeyValueToken, partitionValue))
-                             .build();
-        }
-
-        private Expression getPartitionAndSortExpression(String partitionKey,
-                                                         String sortKey,
-                                                         AttributeValue partitionValue,
-                                                         AttributeValue sortKeyValue) {
-
-
-            // When a sort key is explicitly provided as null treat as partition only expression
-            if (sortKeyValue.equals(nullAttributeValue())) {
-                return getPartitionOnlyExpression(partitionKey, partitionValue);
-            }
-
-            String partitionKeyToken = EXPRESSION_KEY_MAPPER.apply(partitionKey);
-            String partitionKeyValueToken = EXPRESSION_VALUE_KEY_MAPPER.apply(partitionKey);
-            String sortKeyToken = EXPRESSION_KEY_MAPPER.apply(sortKey);
-            String sortKeyValueToken = EXPRESSION_VALUE_KEY_MAPPER.apply(sortKey);
-
-            String queryExpression = String.format("%s = %s AND %s = %s",
-                                                   partitionKeyToken,
-                                                   partitionKeyValueToken,
-                                                   sortKeyToken,
-                                                   sortKeyValueToken);
-            Map<String, AttributeValue> expressionAttributeValues = new HashMap<>();
-            expressionAttributeValues.put(partitionKeyValueToken, partitionValue);
-            expressionAttributeValues.put(sortKeyValueToken, sortKeyValue);
-            Map<String, String> expressionAttributeNames = new HashMap<>();
-            expressionAttributeNames.put(partitionKeyToken, partitionKey);
-            expressionAttributeNames.put(sortKeyToken, sortKey);
-
-            return Expression.builder()
-                             .expression(queryExpression)
-                             .expressionValues(expressionAttributeValues)
-                             .expressionNames(expressionAttributeNames)
-                             .build();
-        }
-    }
-
-    private static class ExpressionParameters {
-        private final String partitionKey;
-        private final AttributeValue partitionValue;
-        private final String sortKey;
-        private final AttributeValue sortValue;
-
-        private ExpressionParameters(String partitionKey,
-                                     AttributeValue partitionValue,
-                                     String sortKey,
-                                     AttributeValue sortValue) {
-            this.partitionKey = partitionKey;
-            this.partitionValue = partitionValue;
-            this.sortKey = sortKey;
-            this.sortValue = sortValue;
-        }
-
-        private static ExpressionParameters from(Key key, TableSchema tableSchema, String indexName) {
-            String partitionKey = tableSchema.getTableMetadata().getIndexPartitionKey(indexName);
-            AttributeValue partitionValue = key.getPartitionKeyValue();
-            String sortKey = tableSchema.getTableMetadata().getIndexSortKey(indexName).orElseThrow(
-                () -> new IllegalArgumentException("A query conditional requires a sort key to be present on the table "
-                                                   + "or index being queried, yet none have been defined in the "
-                                                   + "model"));
-            AttributeValue sortValue =
-                key.getSortKeyValue().orElseThrow(
-                    () -> new IllegalArgumentException("A query conditional requires a sort key to compare with, "
-                                                       + "however one was not provided."));
-
-            return new ExpressionParameters(partitionKey, partitionValue, sortKey, sortValue);
-        }
-
-        String getPartitionKey() {
-            return partitionKey;
-        }
-
-        AttributeValue getPartitionValue() {
-            return partitionValue;
-        }
-
-        String getSortKey() {
-            return sortKey;
-        }
-
-        AttributeValue getSortValue() {
-            return sortValue;
-        }
-    }
-
-    private static class SingleKeyItemConditional extends QueryConditional {
-        private final Key key;
-        private final String operator;
-
-        private SingleKeyItemConditional(Key key, String operator) {
-            this.key = key;
-            this.operator = operator;
-        }
-
-        @Override
-        public Expression getExpression(TableSchema<?> tableSchema, String indexName) {
-            ExpressionParameters expressionParameters = ExpressionParameters.from(key, tableSchema, indexName);
-
-            if (expressionParameters.getSortValue().equals(nullAttributeValue())) {
-                throw new IllegalArgumentException("Attempt to query using a relative condition operator against a "
-                                                   + "null sort key.");
-            }
-
-            String partitionKeyToken = EXPRESSION_KEY_MAPPER.apply(expressionParameters.getPartitionKey());
-            String partitionValueToken = EXPRESSION_VALUE_KEY_MAPPER.apply(expressionParameters.getPartitionKey());
-            String sortKeyToken = EXPRESSION_KEY_MAPPER.apply(expressionParameters.getSortKey());
-            String sortValueToken = EXPRESSION_VALUE_KEY_MAPPER.apply(expressionParameters.getSortKey());
-
-            String queryExpression = String.format("%s = %s AND %s %s %s",
-                                                   partitionKeyToken,
-                                                   partitionValueToken,
-                                                   sortKeyToken,
-                                                   operator,
-                                                   sortValueToken);
-            Map<String, AttributeValue> expressionAttributeValues = new HashMap<>();
-            expressionAttributeValues.put(partitionValueToken, expressionParameters.getPartitionValue());
-            expressionAttributeValues.put(sortValueToken, expressionParameters.getSortValue());
-            Map<String, String> expressionAttributeNames = new HashMap<>();
-            expressionAttributeNames.put(partitionKeyToken, expressionParameters.getPartitionKey());
-            expressionAttributeNames.put(sortKeyToken, expressionParameters.getSortKey());
-
-            return Expression.builder()
-                             .expression(queryExpression)
-                             .expressionValues(expressionAttributeValues)
-                             .expressionNames(expressionAttributeNames)
-                             .build();
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            if (this == o) {
-                return true;
-            }
-            if (o == null || getClass() != o.getClass()) {
-                return false;
-            }
-
-            SingleKeyItemConditional that = (SingleKeyItemConditional) o;
-
-            if (key != null ? ! key.equals(that.key) : that.key != null) {
-                return false;
-            }
-            return operator != null ? operator.equals(that.operator) : that.operator == null;
-        }
-
-        @Override
-        public int hashCode() {
-            int result = key != null ? key.hashCode() : 0;
-            result = 31 * result + (operator != null ? operator.hashCode() : 0);
-            return result;
-        }
-    }
-
-    private static class BeginsWithConditional extends QueryConditional {
-        private final Key key;
-
-        private BeginsWithConditional(Key key) {
-            this.key = key;
-        }
-
-        @Override
-        public Expression getExpression(TableSchema<?> tableSchema, String indexName) {
-            ExpressionParameters expressionParameters = ExpressionParameters.from(key, tableSchema, indexName);
-
-            if (expressionParameters.getSortValue().equals(nullAttributeValue())) {
-                throw new IllegalArgumentException("Attempt to query using a 'beginsWith' condition operator against a "
-                                                   + "null sort key.");
-            }
-
-            if (expressionParameters.getSortValue().n() != null) {
-                throw new IllegalArgumentException("Attempt to query using a 'beginsWith' condition operator against "
-                                                   + "a numeric sort key.");
-            }
-
-            String partitionKeyToken = EXPRESSION_KEY_MAPPER.apply(expressionParameters.getPartitionKey());
-            String partitionValueToken = EXPRESSION_VALUE_KEY_MAPPER.apply(expressionParameters.getPartitionKey());
-            String sortKeyToken = EXPRESSION_KEY_MAPPER.apply(expressionParameters.getSortKey());
-            String sortValueToken = EXPRESSION_VALUE_KEY_MAPPER.apply(expressionParameters.getSortKey());
-
-            String queryExpression = String.format("%s = %s AND begins_with ( %s, %s )",
-                                                   partitionKeyToken,
-                                                   partitionValueToken,
-                                                   sortKeyToken,
-                                                   sortValueToken);
-            Map<String, AttributeValue> expressionAttributeValues = new HashMap<>();
-            expressionAttributeValues.put(partitionValueToken, expressionParameters.getPartitionValue());
-            expressionAttributeValues.put(sortValueToken, expressionParameters.getSortValue());
-            Map<String, String> expressionAttributeNames = new HashMap<>();
-            expressionAttributeNames.put(partitionKeyToken, expressionParameters.getPartitionKey());
-            expressionAttributeNames.put(sortKeyToken, expressionParameters.getSortKey());
-
-            return Expression.builder()
-                             .expression(queryExpression)
-                             .expressionValues(Collections.unmodifiableMap(expressionAttributeValues))
-                             .expressionNames(expressionAttributeNames)
-                             .build();
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            if (this == o) {
-                return true;
-            }
-            if (o == null || getClass() != o.getClass()) {
-                return false;
-            }
-
-            BeginsWithConditional that = (BeginsWithConditional) o;
-
-            return key != null ? key.equals(that.key) : that.key == null;
-        }
-
-        @Override
-        public int hashCode() {
-            return key != null ? key.hashCode() : 0;
-        }
-    }
-
-    private static class BetweenConditional extends QueryConditional {
-        private final Key key1;
-        private final Key key2;
-
-        private BetweenConditional(Key key1, Key key2) {
-            this.key1 = key1;
-            this.key2 = key2;
-        }
-
-        @Override
-        public Expression getExpression(TableSchema<?> tableSchema, String indexName) {
-            ExpressionParameters expressionParameters1 = ExpressionParameters.from(key1, tableSchema, indexName);
-            ExpressionParameters expressionParameters2 = ExpressionParameters.from(key2, tableSchema, indexName);
-
-            if (expressionParameters1.getSortValue().equals(nullAttributeValue()) ||
-                expressionParameters2.getSortValue().equals(nullAttributeValue())) {
-                throw new IllegalArgumentException("Attempt to query using a 'between' condition operator where one "
-                                                   + "of the items has a null sort key.");
-            }
-
-            String partitionKeyToken = EXPRESSION_KEY_MAPPER.apply(expressionParameters1.getPartitionKey());
-            String partitionValueToken = EXPRESSION_VALUE_KEY_MAPPER.apply(expressionParameters1.getPartitionKey());
-            String sortKeyToken = EXPRESSION_KEY_MAPPER.apply(expressionParameters1.getSortKey());
-            String sortKeyValueToken1 = EXPRESSION_VALUE_KEY_MAPPER.apply(expressionParameters1.getSortKey());
-            String sortKeyValueToken2 = EXPRESSION_OTHER_VALUE_KEY_MAPPER.apply(expressionParameters2.getSortKey());
-
-            String queryExpression = String.format("%s = %s AND %s BETWEEN %s AND %s",
-                                                   partitionKeyToken,
-                                                   partitionValueToken,
-                                                   sortKeyToken,
-                                                   sortKeyValueToken1,
-                                                   sortKeyValueToken2);
-            Map<String, AttributeValue> expressionAttributeValues = new HashMap<>();
-            expressionAttributeValues.put(partitionValueToken, expressionParameters1.getPartitionValue());
-            expressionAttributeValues.put(sortKeyValueToken1, expressionParameters1.getSortValue());
-            expressionAttributeValues.put(sortKeyValueToken2, expressionParameters2.getSortValue());
-            Map<String, String> expressionAttributeNames = new HashMap<>();
-            expressionAttributeNames.put(partitionKeyToken, expressionParameters1.getPartitionKey());
-            expressionAttributeNames.put(sortKeyToken, expressionParameters1.getSortKey());
-
-            return Expression.builder()
-                             .expression(queryExpression)
-                             .expressionValues(Collections.unmodifiableMap(expressionAttributeValues))
-                             .expressionNames(expressionAttributeNames)
-                             .build();
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            if (this == o) {
-                return true;
-            }
-            if (o == null || getClass() != o.getClass()) {
-                return false;
-            }
-
-            BetweenConditional that = (BetweenConditional) o;
-
-            if (key1 != null ? ! key1.equals(that.key1) : that.key1 != null) {
-                return false;
-            }
-            return key2 != null ? key2.equals(that.key2) : that.key2 == null;
-        }
-
-        @Override
-        public int hashCode() {
-            int result = key1 != null ? key1.hashCode() : 0;
-            result = 31 * result + (key2 != null ? key2.hashCode() : 0);
-            return result;
-        }
-    }
-}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/operations/ReadBatch.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/operations/ReadBatch.java
deleted file mode 100644
index 076db1c834fa..000000000000
--- a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/operations/ReadBatch.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.extensions.dynamodb.mappingclient.operations;
-
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import software.amazon.awssdk.annotations.SdkPublicApi;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.BatchableReadOperation;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.MappedTable;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.TableMetadata;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-import software.amazon.awssdk.services.dynamodb.model.KeysAndAttributes;
-
-@SdkPublicApi
-public class ReadBatch<T> {
-    private final MappedTable<T> mappedTable;
-    private final Collection<BatchableReadOperation> readOperations;
-
-    private ReadBatch(MappedTable<T> mappedTable, Collection<BatchableReadOperation> readOperations) {
-        this.mappedTable = mappedTable;
-        this.readOperations = readOperations;
-    }
-
-    public static <T> ReadBatch<T> of(MappedTable<T> mappedTable,
-                                      Collection<BatchableReadOperation> readOperations) {
-        return new ReadBatch<>(mappedTable, readOperations);
-    }
-
-    public static <T> ReadBatch<T> of(MappedTable<T> mappedTable,
-                                      BatchableReadOperation... readOperations) {
-        return new ReadBatch<>(mappedTable, Arrays.asList(readOperations));
-    }
-
-    void addReadRequestsToMap(Map<String, KeysAndAttributes> readRequestMap) {
-        KeysAndAttributes newKeysAndAttributes = generateKeysAndAttributes();
-        KeysAndAttributes existingKeysAndAttributes = readRequestMap.get(getTableName());
-
-        if (existingKeysAndAttributes == null) {
-            readRequestMap.put(getTableName(), newKeysAndAttributes);
-            return;
-        }
-
-        KeysAndAttributes mergedKeysAndAttributes = mergeKeysAndAttributes(existingKeysAndAttributes,
-                                                                           newKeysAndAttributes);
-
-        readRequestMap.put(getTableName(), mergedKeysAndAttributes);
-    }
-
-    String getTableName() {
-        return mappedTable.getTableName();
-    }
-
-    private KeysAndAttributes generateKeysAndAttributes() {
-        // DynamoDB requires all component GetItem requests in a BatchGetItem to have the same consistentRead setting
-        // for any given table. The logic here uses the setting of the first getItem in a table batch and then checks
-        // the rest are identical or throws an exception.
-        AtomicReference<Boolean> consistentRead = new AtomicReference<>();
-        AtomicBoolean firstRecord = new AtomicBoolean(true);
-
-        List<Map<String, AttributeValue>> keys =
-            readOperations.stream()
-                          .peek(operation -> {
-                              if (firstRecord.getAndSet(false)) {
-                                  consistentRead.set(operation.getConsistentRead());
-                              } else {
-                                  if (!compareNullableBooleans(consistentRead.get(), operation.getConsistentRead())) {
-                                      throw new IllegalArgumentException("All batchable read requests for the same "
-                                                                         + "table must have the same 'consistentRead' "
-                                                                         + "setting.");
-                                  }
-                              }
-                          })
-                          .map(BatchableReadOperation::getKey)
-                          .map(key -> key.getKeyMap(mappedTable.getTableSchema(),
-                                                    TableMetadata.getPrimaryIndexName()))
-                          .collect(Collectors.toList());
-
-        return KeysAndAttributes.builder()
-                                .keys(keys)
-                                .consistentRead(consistentRead.get())
-                                .build();
-    }
-
-    public MappedTable<T> getMappedTable() {
-        return mappedTable;
-    }
-
-    public Collection<BatchableReadOperation> getReadOperations() {
-        return readOperations;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-
-        ReadBatch<?> readBatch = (ReadBatch<?>) o;
-
-        if (mappedTable != null ? ! mappedTable.equals(readBatch.mappedTable) : readBatch.mappedTable != null) {
-            return false;
-        }
-        return readOperations != null ? readOperations.equals(readBatch.readOperations) : readBatch.readOperations == null;
-    }
-
-    @Override
-    public int hashCode() {
-        int result = mappedTable != null ? mappedTable.hashCode() : 0;
-        result = 31 * result + (readOperations != null ? readOperations.hashCode() : 0);
-        return result;
-    }
-
-    private static boolean compareNullableBooleans(Boolean one, Boolean two) {
-        if (one == null && two == null) {
-            return true;
-        }
-
-        if (one != null) {
-            return one.equals(two);
-        } else {
-            return false;
-        }
-    }
-
-    private static KeysAndAttributes mergeKeysAndAttributes(KeysAndAttributes first, KeysAndAttributes second) {
-        if (!compareNullableBooleans(first.consistentRead(), second.consistentRead())) {
-            throw new IllegalArgumentException("All batchable read requests for the same table must have the "
-                                               + "same 'consistentRead' setting.");
-        }
-
-        Boolean consistentRead = first.consistentRead() == null ? second.consistentRead() : first.consistentRead();
-        List<Map<String, AttributeValue>> keys =
-            Stream.concat(first.keys().stream(), second.keys().stream()).collect(Collectors.toList());
-
-        return KeysAndAttributes.builder()
-                                .keys(keys)
-                                .consistentRead(consistentRead)
-                                .build();
-    }
-}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/operations/ReadTransaction.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/operations/ReadTransaction.java
deleted file mode 100644
index 458247f243ea..000000000000
--- a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/operations/ReadTransaction.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.extensions.dynamodb.mappingclient.operations;
-
-import software.amazon.awssdk.annotations.SdkPublicApi;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.MappedTable;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.OperationContext;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.TransactableReadOperation;
-import software.amazon.awssdk.services.dynamodb.model.TransactGetItem;
-
-@SdkPublicApi
-public class ReadTransaction<T> {
-    private final MappedTable<T> mappedTable;
-    private final TransactableReadOperation<T> readOperation;
-
-    private ReadTransaction(MappedTable<T> mappedTable, TransactableReadOperation<T> readOperation) {
-        this.mappedTable = mappedTable;
-        this.readOperation = readOperation;
-    }
-
-    public static <T> ReadTransaction<T> of(MappedTable<T> mappedTable, TransactableReadOperation<T> readOperation) {
-        return new ReadTransaction<>(mappedTable, readOperation);
-    }
-
-    public MappedTable<T> getMappedTable() {
-        return mappedTable;
-    }
-
-    public TransactableReadOperation<T> getReadOperation() {
-        return readOperation;
-    }
-
-    TransactGetItem generateTransactGetItem() {
-        return readOperation.generateTransactGetItem(mappedTable.getTableSchema(),
-                                                     OperationContext.of(mappedTable.getTableName()),
-                                                     mappedTable.getMapperExtension());
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-
-        ReadTransaction<?> that = (ReadTransaction<?>) o;
-
-        if (mappedTable != null ? ! mappedTable.equals(that.mappedTable) : that.mappedTable != null) {
-            return false;
-        }
-        return readOperation != null ? readOperation.equals(that.readOperation) : that.readOperation == null;
-    }
-
-    @Override
-    public int hashCode() {
-        int result = mappedTable != null ? mappedTable.hashCode() : 0;
-        result = 31 * result + (readOperation != null ? readOperation.hashCode() : 0);
-        return result;
-    }
-}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/operations/Scan.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/operations/Scan.java
deleted file mode 100644
index 7fb695f037bf..000000000000
--- a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/operations/Scan.java
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.extensions.dynamodb.mappingclient.operations;
-
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.core.Utils.readAndTransformPaginatedItems;
-
-import java.util.Map;
-import java.util.function.Function;
-
-import software.amazon.awssdk.annotations.SdkPublicApi;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.Expression;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.IndexOperation;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.MapperExtension;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.OperationContext;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.Page;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.TableMetadata;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.TableOperation;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.TableSchema;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.core.TransformIterable;
-import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-import software.amazon.awssdk.services.dynamodb.model.ScanRequest;
-import software.amazon.awssdk.services.dynamodb.model.ScanResponse;
-import software.amazon.awssdk.services.dynamodb.paginators.ScanIterable;
-
-@SdkPublicApi
-public class Scan<T> implements TableOperation<T, ScanRequest, ScanIterable, Iterable<Page<T>>>,
-                                IndexOperation<T, ScanRequest, ScanIterable, Iterable<Page<T>>> {
-    private final Map<String, AttributeValue> exclusiveStartKey;
-    private final Integer limit;
-    private final Boolean consistentRead;
-    private final Expression filterExpression;
-
-    private Scan(Map<String, AttributeValue> exclusiveStartKey,
-                 Integer limit, Boolean consistentRead,
-                 Expression filterExpression) {
-        this.exclusiveStartKey = exclusiveStartKey;
-        this.limit = limit;
-        this.consistentRead = consistentRead;
-        this.filterExpression = filterExpression;
-    }
-
-    public static <T> Scan<T> create() {
-        return new Scan<>(null, null, null, null);
-    }
-
-    public static Builder builder() {
-        return new Builder();
-    }
-
-    public Builder toBuilder() {
-        return new Builder().exclusiveStartKey(exclusiveStartKey)
-                            .limit(limit)
-                            .consistentRead(consistentRead)
-                            .filterExpression(filterExpression);
-    }
-
-    @Override
-    public ScanRequest generateRequest(TableSchema<T> tableSchema,
-                                       OperationContext operationContext,
-                                       MapperExtension mapperExtension) {
-        ScanRequest.Builder scanRequest = ScanRequest.builder()
-            .tableName(operationContext.getTableName())
-            .limit(limit)
-            .exclusiveStartKey(exclusiveStartKey)
-            .consistentRead(consistentRead);
-
-        if (!TableMetadata.getPrimaryIndexName().equals(operationContext.getIndexName())) {
-            scanRequest = scanRequest.indexName(operationContext.getIndexName());
-        }
-
-        if (filterExpression != null) {
-            scanRequest = scanRequest.filterExpression(filterExpression.getExpression())
-                                     .expressionAttributeValues(filterExpression.getExpressionValues())
-                                     .expressionAttributeNames(filterExpression.getExpressionNames());
-        }
-
-        return scanRequest.build();
-    }
-
-    @Override
-    public Iterable<Page<T>> transformResponse(ScanIterable response,
-                                               TableSchema<T> tableSchema,
-                                               OperationContext operationContext,
-                                               MapperExtension mapperExtension) {
-        return TransformIterable.of(response, getScanResponseIterator(tableSchema, operationContext, mapperExtension));
-    }
-
-    @Override
-    public Function<ScanRequest, ScanIterable> getServiceCall(DynamoDbClient dynamoDbClient) {
-        return dynamoDbClient::scanPaginator;
-    }
-
-    public Map<String, AttributeValue> getExclusiveStartKey() {
-        return exclusiveStartKey;
-    }
-
-    public Integer getLimit() {
-        return limit;
-    }
-
-    public Boolean getConsistentRead() {
-        return consistentRead;
-    }
-
-    public Expression getFilterExpression() {
-        return filterExpression;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-
-        Scan<?> scan = (Scan<?>) o;
-
-        if (exclusiveStartKey != null ? ! exclusiveStartKey.equals(scan.exclusiveStartKey) :
-            scan.exclusiveStartKey != null) {
-            return false;
-        }
-        if (limit != null ? ! limit.equals(scan.limit) : scan.limit != null) {
-            return false;
-        }
-        if (consistentRead != null ? ! consistentRead.equals(scan.consistentRead) : scan.consistentRead != null) {
-            return false;
-        }
-        return filterExpression != null ? filterExpression.equals(scan.filterExpression) : scan.filterExpression == null;
-    }
-
-    @Override
-    public int hashCode() {
-        int result = exclusiveStartKey != null ? exclusiveStartKey.hashCode() : 0;
-        result = 31 * result + (limit != null ? limit.hashCode() : 0);
-        result = 31 * result + (consistentRead != null ? consistentRead.hashCode() : 0);
-        result = 31 * result + (filterExpression != null ? filterExpression.hashCode() : 0);
-        return result;
-    }
-
-    private Function<ScanResponse, Page<T>> getScanResponseIterator(TableSchema<T> tableSchema,
-                                                                    OperationContext operationContext,
-                                                                    MapperExtension mapperExtension) {
-        return readAndTransformPaginatedItems(tableSchema,
-                                              operationContext,
-                                              mapperExtension,
-                                              ScanResponse::items,
-                                              ScanResponse::lastEvaluatedKey);
-    }
-
-    public static final class Builder {
-        private Map<String, AttributeValue> exclusiveStartKey;
-        private Integer limit;
-        private Boolean consistentRead;
-        private Expression filterExpression;
-
-        private Builder() {
-        }
-
-        public <T> Scan<T> build() {
-            return new Scan<>(exclusiveStartKey, limit, consistentRead, filterExpression);
-        }
-
-        public Builder exclusiveStartKey(Map<String, AttributeValue> exclusiveStartKey) {
-            this.exclusiveStartKey = exclusiveStartKey;
-            return this;
-        }
-
-        public Builder limit(Integer limit) {
-            this.limit = limit;
-            return this;
-        }
-
-        public Builder consistentRead(Boolean consistentRead) {
-            this.consistentRead = consistentRead;
-            return this;
-        }
-
-        public Builder filterExpression(Expression filterExpression) {
-            this.filterExpression = filterExpression;
-            return this;
-        }
-    }
-}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/operations/TransactGetItems.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/operations/TransactGetItems.java
deleted file mode 100644
index 379ac6caefc4..000000000000
--- a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/operations/TransactGetItems.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.extensions.dynamodb.mappingclient.operations;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
-import software.amazon.awssdk.annotations.SdkPublicApi;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.DatabaseOperation;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.MapperExtension;
-import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
-import software.amazon.awssdk.services.dynamodb.model.TransactGetItemsRequest;
-import software.amazon.awssdk.services.dynamodb.model.TransactGetItemsResponse;
-
-@SdkPublicApi
-public class TransactGetItems
-    implements DatabaseOperation<TransactGetItemsRequest, TransactGetItemsResponse, List<UnmappedItem>> {
-
-    private final List<ReadTransaction> readTransactions;
-
-    private TransactGetItems(List<ReadTransaction> readTransactions) {
-        this.readTransactions = readTransactions;
-    }
-
-    public static TransactGetItems of(List<ReadTransaction> transactGetRequests) {
-        return new TransactGetItems(transactGetRequests);
-    }
-
-    public static TransactGetItems of(ReadTransaction... readTransactions) {
-        return new TransactGetItems(Arrays.asList(readTransactions));
-    }
-
-    public static Builder builder() {
-        return new Builder();
-    }
-
-    public Builder toBuilder() {
-        return new Builder().readTransactions(readTransactions);
-    }
-
-    @Override
-    public TransactGetItemsRequest generateRequest(MapperExtension mapperExtension) {
-        return TransactGetItemsRequest.builder()
-                                      .transactItems(readTransactions.stream()
-                                                                     .map(ReadTransaction::generateTransactGetItem)
-                                                                     .collect(Collectors.toList()))
-                                      .build();
-    }
-
-    @Override
-    public Function<TransactGetItemsRequest, TransactGetItemsResponse> getServiceCall(DynamoDbClient dynamoDbClient) {
-        return dynamoDbClient::transactGetItems;
-    }
-
-    @Override
-    public List<UnmappedItem> transformResponse(TransactGetItemsResponse response, MapperExtension mapperExtension) {
-        return response.responses()
-                       .stream()
-                       .map(r -> r == null ? null : UnmappedItem.of(r.item()))
-                       .collect(Collectors.toList());
-    }
-
-    public List<ReadTransaction> getReadTransactions() {
-        return readTransactions;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-
-        TransactGetItems that = (TransactGetItems) o;
-
-        return readTransactions != null ? readTransactions.equals(that.readTransactions) : that.readTransactions == null;
-    }
-
-    @Override
-    public int hashCode() {
-        return readTransactions != null ? readTransactions.hashCode() : 0;
-    }
-
-    public static final class Builder {
-        private List<ReadTransaction> readTransactions;
-
-        private Builder() {
-        }
-
-        public Builder readTransactions(List<ReadTransaction> readTransactions) {
-            this.readTransactions = readTransactions;
-            return this;
-        }
-
-        public TransactGetItems build() {
-            return new TransactGetItems(readTransactions);
-        }
-    }
-}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/operations/TransactWriteItems.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/operations/TransactWriteItems.java
deleted file mode 100644
index f0407c23ae0b..000000000000
--- a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/operations/TransactWriteItems.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.extensions.dynamodb.mappingclient.operations;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
-import software.amazon.awssdk.annotations.SdkPublicApi;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.DatabaseOperation;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.MapperExtension;
-import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
-import software.amazon.awssdk.services.dynamodb.model.TransactWriteItem;
-import software.amazon.awssdk.services.dynamodb.model.TransactWriteItemsRequest;
-import software.amazon.awssdk.services.dynamodb.model.TransactWriteItemsResponse;
-
-@SdkPublicApi
-public class TransactWriteItems
-    implements DatabaseOperation<TransactWriteItemsRequest, TransactWriteItemsResponse, Void> {
-
-    private final List<WriteTransaction> writeTransactions;
-
-    private TransactWriteItems(List<WriteTransaction> writeTransactions) {
-        this.writeTransactions = writeTransactions;
-    }
-
-    public static TransactWriteItems of(List<WriteTransaction> writeTransactions) {
-        return new TransactWriteItems(writeTransactions);
-    }
-
-    public static TransactWriteItems of(WriteTransaction... writeTransactions) {
-        return new TransactWriteItems(Arrays.asList(writeTransactions));
-    }
-
-    public static Builder builder() {
-        return new Builder();
-    }
-
-    public Builder toBuilder() {
-        return new Builder().writeTransactions(this.writeTransactions);
-    }
-
-    @Override
-    public TransactWriteItemsRequest generateRequest(MapperExtension mapperExtension) {
-        List<TransactWriteItem> requestItems = writeTransactions.stream()
-                                                                .map(WriteTransaction::generateRequest)
-                                                                .collect(Collectors.toList());
-
-        return TransactWriteItemsRequest.builder()
-                                        .transactItems(requestItems)
-                                        .build();
-    }
-
-    @Override
-    public Void transformResponse(TransactWriteItemsResponse response, MapperExtension mapperExtension) {
-        return null;        // this operation does not return results
-    }
-
-    @Override
-    public Function<TransactWriteItemsRequest, TransactWriteItemsResponse> getServiceCall(
-        DynamoDbClient dynamoDbClient) {
-
-        return dynamoDbClient::transactWriteItems;
-    }
-
-    public List<WriteTransaction> getWriteTransactions() {
-        return writeTransactions;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-
-        TransactWriteItems that = (TransactWriteItems) o;
-
-        return writeTransactions != null ? writeTransactions.equals(that.writeTransactions) : that.writeTransactions == null;
-    }
-
-    @Override
-    public int hashCode() {
-        return writeTransactions != null ? writeTransactions.hashCode() : 0;
-    }
-
-    public static final class Builder {
-        private List<WriteTransaction> writeTransactions;
-
-        private Builder() {
-        }
-
-        public Builder writeTransactions(List<WriteTransaction> writeTransactions) {
-            this.writeTransactions = writeTransactions;
-            return this;
-        }
-
-        public TransactWriteItems build() {
-            return new TransactWriteItems(this.writeTransactions);
-        }
-    }
-}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/operations/UnmappedItem.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/operations/UnmappedItem.java
deleted file mode 100644
index b3c13e504fc4..000000000000
--- a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/operations/UnmappedItem.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.extensions.dynamodb.mappingclient.operations;
-
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.core.Utils.readAndTransformSingleItem;
-
-import java.util.Map;
-
-import software.amazon.awssdk.annotations.SdkPublicApi;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.MappedTable;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.OperationContext;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-
-@SdkPublicApi
-public class UnmappedItem {
-    private final Map<String, AttributeValue> itemMap;
-
-    private UnmappedItem(Map<String, AttributeValue> itemMap) {
-        this.itemMap = itemMap;
-    }
-
-    public static UnmappedItem of(Map<String, AttributeValue> itemMap) {
-        return new UnmappedItem(itemMap);
-    }
-
-    public <T> T getItem(MappedTable<T> mappedTable) {
-        return readAndTransformSingleItem(itemMap,
-                                          mappedTable.getTableSchema(),
-                                          OperationContext.of(mappedTable.getTableName()),
-                                          mappedTable.getMapperExtension());
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-
-        UnmappedItem that = (UnmappedItem) o;
-
-        return itemMap != null ? itemMap.equals(that.itemMap) : that.itemMap == null;
-    }
-
-    @Override
-    public int hashCode() {
-        return itemMap != null ? itemMap.hashCode() : 0;
-    }
-}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/operations/UpdateItem.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/operations/UpdateItem.java
deleted file mode 100644
index c7c1cab78f0e..000000000000
--- a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/operations/UpdateItem.java
+++ /dev/null
@@ -1,319 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.extensions.dynamodb.mappingclient.operations;
-
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.AttributeValues.isNullAttributeValue;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.core.Utils.cleanAttributeName;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.core.Utils.readAndTransformSingleItem;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
-import software.amazon.awssdk.annotations.SdkPublicApi;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.Expression;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.MapperExtension;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.OperationContext;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.TableMetadata;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.TableOperation;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.TableSchema;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.TransactableWriteOperation;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.extensions.WriteModification;
-import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-import software.amazon.awssdk.services.dynamodb.model.ReturnValue;
-import software.amazon.awssdk.services.dynamodb.model.TransactWriteItem;
-import software.amazon.awssdk.services.dynamodb.model.Update;
-import software.amazon.awssdk.services.dynamodb.model.UpdateItemRequest;
-import software.amazon.awssdk.services.dynamodb.model.UpdateItemResponse;
-
-@SdkPublicApi
-public class UpdateItem<T>
-    implements TableOperation<T, UpdateItemRequest, UpdateItemResponse, T>,
-               TransactableWriteOperation<T> {
-
-    private static final Function<String, String> EXPRESSION_VALUE_KEY_MAPPER =
-        key -> ":AMZN_MAPPED_" + cleanAttributeName(key);
-
-    private static final Function<String, String> EXPRESSION_KEY_MAPPER =
-        key -> "#AMZN_MAPPED_" + cleanAttributeName(key);
-
-    private final T item;
-    private final Boolean ignoreNulls;
-
-    private UpdateItem(T item, Boolean ignoreNulls) {
-        this.item = item;
-        this.ignoreNulls = ignoreNulls;
-    }
-
-    public static <T> UpdateItem<T> of(T item) {
-        return new UpdateItem<>(item, false);
-    }
-
-    public static GenericBuilder builder() {
-        return new GenericBuilder();
-    }
-
-    public Builder<T> toBuilder() {
-        return new Builder<T>().item(item).ignoreNulls(ignoreNulls);
-    }
-
-    @Override
-    public UpdateItemRequest generateRequest(TableSchema<T> tableSchema,
-                                             OperationContext operationContext,
-                                             MapperExtension mapperExtension) {
-        if (!TableMetadata.getPrimaryIndexName().equals(operationContext.getIndexName())) {
-            throw new IllegalArgumentException("UpdateItem cannot be executed against a secondary index.");
-        }
-
-        Map<String, AttributeValue> itemMap = tableSchema.itemToMap(item,  Boolean.TRUE.equals(ignoreNulls));
-        TableMetadata tableMetadata = tableSchema.getTableMetadata();
-
-        // Allow a command mapperExtension to modify the attribute values of the item in the PutItemRequest and add
-        // a conditional statement
-        WriteModification transformation =
-            mapperExtension != null ? mapperExtension.beforeWrite(itemMap, operationContext, tableMetadata) : null;
-
-        if (transformation != null && transformation.getTransformedItem() != null) {
-            itemMap = transformation.getTransformedItem();
-        }
-
-        Collection<String> primaryKeys = tableSchema.getTableMetadata().getPrimaryKeys();
-        Map<String, AttributeValue> filteredAttributeValues = itemMap.entrySet().stream()
-            .filter(entry -> !primaryKeys.contains(entry.getKey()))
-            .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
-        Map<String, AttributeValue> keyAttributeValues = itemMap.entrySet().stream()
-            .filter(entry -> primaryKeys.contains(entry.getKey()))
-            .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
-
-        UpdateItemRequest.Builder baseUpdateItemRequest = UpdateItemRequest.builder()
-            .tableName(operationContext.getTableName())
-            .key(keyAttributeValues)
-            .returnValues(ReturnValue.ALL_NEW);
-
-        Map<String, String> expressionNames = null;
-        Map<String, AttributeValue> expressionValues = null;
-        String conditionExpression = null;
-
-        if (filteredAttributeValues.isEmpty()) {
-            // Nothing to update (key only item)
-            if (transformation != null && transformation.getAdditionalConditionalExpression() != null) {
-                // If a condition has been generated by the mapperExtension add it to the request
-                conditionExpression = transformation.getAdditionalConditionalExpression().getExpression();
-                expressionNames = transformation.getAdditionalConditionalExpression().getExpressionNames();
-                expressionValues = transformation.getAdditionalConditionalExpression().getExpressionValues();
-            }
-        } else {
-            // An update expression is required
-            Expression updateExpression = generateUpdateExpression(filteredAttributeValues);
-
-            if (transformation != null && transformation.getAdditionalConditionalExpression() != null) {
-                // If a condition has been generated by extensions the attributeValues and attributeNames need to be
-                // merged with the update expression and the expression added to the request
-                expressionNames = Expression.coalesceNames(updateExpression.getExpressionNames(),
-                                                           transformation.getAdditionalConditionalExpression()
-                                                                         .getExpressionNames());
-                expressionValues = Expression.coalesceValues(updateExpression.getExpressionValues(),
-                                                             transformation.getAdditionalConditionalExpression()
-                                                                           .getExpressionValues());
-                conditionExpression = transformation.getAdditionalConditionalExpression().getExpression();
-            } else {
-                // No condition expression, just add the update expression attribute values and names to the request
-                expressionValues = updateExpression.getExpressionValues();
-                expressionNames = updateExpression.getExpressionNames();
-            }
-
-            baseUpdateItemRequest = baseUpdateItemRequest.updateExpression(updateExpression.getExpression());
-        }
-
-        // The SDK handles collections a little weirdly. Avoiding adding empty collections
-        if (expressionNames != null && !expressionNames.isEmpty()) {
-            baseUpdateItemRequest = baseUpdateItemRequest.expressionAttributeNames(expressionNames);
-        }
-
-        if (expressionValues != null && !expressionValues.isEmpty()) {
-            baseUpdateItemRequest = baseUpdateItemRequest.expressionAttributeValues(expressionValues);
-        }
-
-        return baseUpdateItemRequest.conditionExpression(conditionExpression)
-                                    .build();
-    }
-
-    @Override
-    public T transformResponse(UpdateItemResponse response,
-                               TableSchema<T> tableSchema,
-                               OperationContext operationContext,
-                               MapperExtension mapperExtension) {
-        try {
-            return readAndTransformSingleItem(response.attributes(), tableSchema, operationContext, mapperExtension);
-        } catch (RuntimeException e) {
-            // With a partial update it's possible to update the record into a state that the mapper can no longer
-            // read or validate. This is more likely to happen with signed and encrypted records that undergo partial
-            // updates (that practice is discouraged for this reason).
-            throw new IllegalStateException("Unable to read the new item returned by UpdateItem after the update "
-                                            + "occurred. Rollbacks are not supported by this operation, therefore the "
-                                            + "record may no longer be readable using this model.", e);
-        }
-    }
-
-    @Override
-    public Function<UpdateItemRequest, UpdateItemResponse> getServiceCall(DynamoDbClient dynamoDbClient) {
-        return dynamoDbClient::updateItem;
-    }
-
-    @Override
-    public TransactWriteItem generateTransactWriteItem(TableSchema<T> tableSchema, OperationContext operationContext,
-                                                       MapperExtension mapperExtension) {
-        UpdateItemRequest updateItemRequest = generateRequest(tableSchema, operationContext, mapperExtension);
-
-        Update update = Update.builder()
-                              .key(updateItemRequest.key())
-                              .tableName(updateItemRequest.tableName())
-                              .updateExpression(updateItemRequest.updateExpression())
-                              .conditionExpression(updateItemRequest.conditionExpression())
-                              .expressionAttributeValues(updateItemRequest.expressionAttributeValues())
-                              .expressionAttributeNames(updateItemRequest.expressionAttributeNames())
-                              .build();
-
-        return TransactWriteItem.builder()
-                                .update(update)
-                                .build();
-    }
-
-    public T getItem() {
-        return item;
-    }
-
-    public Boolean getIgnoreNulls() {
-        return ignoreNulls;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-
-        UpdateItem<?> that = (UpdateItem<?>) o;
-
-        if (item != null ? ! item.equals(that.item) : that.item != null) {
-            return false;
-        }
-        return ignoreNulls != null ? ignoreNulls.equals(that.ignoreNulls) : that.ignoreNulls == null;
-    }
-
-    @Override
-    public int hashCode() {
-        int result = item != null ? item.hashCode() : 0;
-        result = 31 * result + (ignoreNulls != null ? ignoreNulls.hashCode() : 0);
-        return result;
-    }
-
-    private static Expression generateUpdateExpression(Map<String, AttributeValue> attributeValuesToUpdate) {
-        // Sort the updates into 'SET' or 'REMOVE' based on null value
-        List<String> updateSetActions = new ArrayList<>();
-        List<String> updateRemoveActions = new ArrayList<>();
-
-        attributeValuesToUpdate.forEach((key, value) -> {
-            if (!isNullAttributeValue(value)) {
-                updateSetActions.add(EXPRESSION_KEY_MAPPER.apply(key) + " = " + EXPRESSION_VALUE_KEY_MAPPER.apply(key));
-            } else {
-                updateRemoveActions.add(EXPRESSION_KEY_MAPPER.apply(key));
-            }
-        });
-
-        // Combine the expressions
-        List<String> updateActions = new ArrayList<>();
-
-        if (!updateSetActions.isEmpty()) {
-            updateActions.add("SET " + String.join(", ", updateSetActions));
-        }
-
-        if (!updateRemoveActions.isEmpty()) {
-            updateActions.add("REMOVE " + String.join(", ", updateRemoveActions));
-        }
-
-        String updateExpression = String.join(" ", updateActions);
-
-        Map<String, AttributeValue> expressionAttributeValues =
-            attributeValuesToUpdate.entrySet()
-                                   .stream()
-                                   .filter(entry -> !isNullAttributeValue(entry.getValue()))
-                                   .collect(Collectors.toMap(
-                                       entry -> EXPRESSION_VALUE_KEY_MAPPER.apply(entry.getKey()),
-                                       Map.Entry::getValue));
-
-        Map<String, String> expressionAttributeNames =
-            attributeValuesToUpdate.keySet()
-                                   .stream()
-                                   .collect(Collectors.toMap(EXPRESSION_KEY_MAPPER, key -> key));
-
-        return Expression.builder()
-                         .expression(updateExpression)
-                         .expressionValues(Collections.unmodifiableMap(expressionAttributeValues))
-                         .expressionNames(expressionAttributeNames)
-                         .build();
-    }
-
-    public static class GenericBuilder {
-        private Boolean ignoreNulls;
-
-        private GenericBuilder() {
-        }
-
-        public GenericBuilder ignoreNulls(Boolean ignoreNulls) {
-            this.ignoreNulls = ignoreNulls;
-            return this;
-        }
-
-        public <T> Builder<T> item(T item) {
-            return new Builder<T>().item(item).ignoreNulls(ignoreNulls);
-        }
-
-        public UpdateItem<?> build() {
-            throw new UnsupportedOperationException("Cannot construct a UpdateItem operation without an item to put.");
-        }
-    }
-
-    public static final class Builder<T> {
-        private T item;
-        private Boolean ignoreNulls;
-
-        private Builder() {
-        }
-
-        public Builder<T> ignoreNulls(Boolean ignoreNulls) {
-            this.ignoreNulls = ignoreNulls;
-            return this;
-        }
-
-        public Builder<T> item(T item) {
-            this.item = item;
-            return this;
-        }
-
-        public UpdateItem<T> build() {
-            return new UpdateItem<>(item, ignoreNulls);
-        }
-    }
-}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/operations/WriteBatch.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/operations/WriteBatch.java
deleted file mode 100644
index 7c8b16eb601a..000000000000
--- a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/operations/WriteBatch.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.extensions.dynamodb.mappingclient.operations;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import software.amazon.awssdk.annotations.SdkPublicApi;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.BatchableWriteOperation;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.MappedTable;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.OperationContext;
-import software.amazon.awssdk.services.dynamodb.model.WriteRequest;
-
-@SdkPublicApi
-public class WriteBatch<T> {
-    private final MappedTable<T> mappedTable;
-    private final Collection<BatchableWriteOperation<T>> writeOperations;
-
-    private WriteBatch(MappedTable<T> mappedTable, Collection<BatchableWriteOperation<T>> writeOperations) {
-        this.mappedTable = mappedTable;
-        this.writeOperations = writeOperations;
-    }
-
-    public static <T> WriteBatch<T> of(MappedTable<T> mappedTable,
-                                       Collection<BatchableWriteOperation<T>> writeOperations) {
-        return new WriteBatch<>(mappedTable, writeOperations);
-    }
-
-    @SafeVarargs
-    public static <T> WriteBatch<T> of(MappedTable<T> mappedTable,
-                                       BatchableWriteOperation<T>... writeOperations) {
-        return new WriteBatch<>(mappedTable, Arrays.asList(writeOperations));
-    }
-
-    public MappedTable<T> getMappedTable() {
-        return mappedTable;
-    }
-
-    public Collection<BatchableWriteOperation<T>> getWriteOperations() {
-        return writeOperations;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-
-        WriteBatch<?> that = (WriteBatch<?>) o;
-
-        if (mappedTable != null ? ! mappedTable.equals(that.mappedTable) : that.mappedTable != null) {
-            return false;
-        }
-        return writeOperations != null ? writeOperations.equals(that.writeOperations) : that.writeOperations == null;
-    }
-
-    @Override
-    public int hashCode() {
-        int result = mappedTable != null ? mappedTable.hashCode() : 0;
-        result = 31 * result + (writeOperations != null ? writeOperations.hashCode() : 0);
-        return result;
-    }
-
-    // Due to raw-type erasure, it's necessary to pass a map in to be mutated rather than try and extract the write
-    // requests which would be more straight forward but Collection<WriteRequest> becomes Collection when you try and
-    // exfiltrate the objects from a raw-typed WriteBatch.
-    void addWriteRequestsToMap(Map<String, Collection<WriteRequest>> writeRequestMap) {
-        Collection<WriteRequest> writeRequestsForTable = writeRequestMap.computeIfAbsent(getTableName(),
-            ignored -> new ArrayList<>());
-
-        writeRequestsForTable.addAll(
-            writeOperations.stream()
-                           .map(writeOperation ->
-                                    writeOperation.generateWriteRequest(mappedTable.getTableSchema(),
-                                                                        OperationContext.of(mappedTable.getTableName()),
-                                                                        mappedTable.getMapperExtension()))
-                           .collect(Collectors.toList()));
-    }
-
-    String getTableName() {
-        return mappedTable.getTableName();
-    }
-}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/operations/WriteTransaction.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/operations/WriteTransaction.java
deleted file mode 100644
index 6ff574392741..000000000000
--- a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/operations/WriteTransaction.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.extensions.dynamodb.mappingclient.operations;
-
-import software.amazon.awssdk.annotations.SdkPublicApi;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.MappedTable;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.OperationContext;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.TransactableWriteOperation;
-import software.amazon.awssdk.services.dynamodb.model.TransactWriteItem;
-
-/**
- * Encapsulates a single write transaction that can form a list of transactions that go into a TransactWriteItems
- * operation. Example:
- *
- * {@code
- * WriteTransaction.of(myTable, putItem(myItem));
- * WriteTransaction.of(myTable, deleteItem(Key.of(stringValue("id123"))));
- * }
- *
- * @param <T> The type of object this transaction applies to. Can be safely erased as it's not needed outside the
- *            class itself.
- */
-@SdkPublicApi
-public class WriteTransaction<T> {
-    private final MappedTable<T> mappedTable;
-    private final TransactableWriteOperation<T> writeOperation;
-
-    private WriteTransaction(MappedTable<T> mappedTable, TransactableWriteOperation<T> writeOperation) {
-        this.mappedTable = mappedTable;
-        this.writeOperation = writeOperation;
-    }
-
-    public static <T> WriteTransaction<T> of(MappedTable<T> mappedTable,
-                                             TransactableWriteOperation<T> writeOperation) {
-        return new WriteTransaction<>(mappedTable, writeOperation);
-    }
-
-    public MappedTable<T> getMappedTable() {
-        return mappedTable;
-    }
-
-    public TransactableWriteOperation<T> getWriteOperation() {
-        return writeOperation;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-
-        WriteTransaction<?> that = (WriteTransaction<?>) o;
-
-        if (mappedTable != null ? ! mappedTable.equals(that.mappedTable) : that.mappedTable != null) {
-            return false;
-        }
-        return writeOperation != null ? writeOperation.equals(that.writeOperation) : that.writeOperation == null;
-    }
-
-    @Override
-    public int hashCode() {
-        int result = mappedTable != null ? mappedTable.hashCode() : 0;
-        result = 31 * result + (writeOperation != null ? writeOperation.hashCode() : 0);
-        return result;
-    }
-
-    TransactWriteItem generateRequest() {
-        return writeOperation.generateTransactWriteItem(mappedTable.getTableSchema(),
-                                                        OperationContext.of(mappedTable.getTableName()),
-                                                        mappedTable.getMapperExtension());
-    }
-}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/staticmapper/Attribute.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/staticmapper/Attribute.java
deleted file mode 100644
index f674a1fb815b..000000000000
--- a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/staticmapper/Attribute.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.extensions.dynamodb.mappingclient.staticmapper;
-
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.AttributeValues.isNullAttributeValue;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.AttributeValues.nullAttributeValue;
-
-import java.util.Arrays;
-import java.util.function.BiConsumer;
-import java.util.function.Consumer;
-import java.util.function.Function;
-import java.util.function.Supplier;
-
-import software.amazon.awssdk.annotations.SdkPublicApi;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.core.AttributeValueType;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-
-@SdkPublicApi
-@SuppressWarnings("WeakerAccess")
-public class Attribute<T> {
-    private final String attributeName;
-    private final Function<T, AttributeValue> getAttributeMethod;
-    private final BiConsumer<T, AttributeValue> updateItemMethod;
-    private final StaticTableMetadata tableMetadata;
-    private final AttributeValueType attributeValueType;
-
-    private Attribute(String attributeName,
-                      Function<T, AttributeValue> getAttributeMethod,
-                      BiConsumer<T, AttributeValue> updateItemMethod,
-                      StaticTableMetadata tableMetadata,
-                      AttributeValueType attributeValueType) {
-        this.attributeName = attributeName;
-        this.getAttributeMethod = getAttributeMethod;
-        this.updateItemMethod = updateItemMethod;
-        this.tableMetadata = tableMetadata;
-        this.attributeValueType = attributeValueType;
-    }
-
-    public static <T, R> AttributeSupplier<T> of(
-        String attributeName,
-        Function<T, R> getAttributeMethod,
-        BiConsumer<T, R> updateItemMethod,
-        AttributeType<R> attributeType) {
-
-        Function<T, AttributeValue> getAttributeValueWithTransform = item -> {
-            R value = getAttributeMethod.apply(item);
-            return value == null ? nullAttributeValue() : attributeType.objectToAttributeValue(value);
-        };
-
-        // When setting a value on the java object, do not explicitly set nulls as this can cause an NPE to be thrown
-        // if the target attribute type is a primitive.
-        BiConsumer<T, AttributeValue> updateItemWithTransform = (item, attributeValue) -> {
-            // If the attributeValue is nul, do not attempt to marshal
-            if (isNullAttributeValue(attributeValue)) {
-                return;
-            }
-
-            R value = attributeType.attributeValueToObject(attributeValue);
-
-            if (value != null) {
-                updateItemMethod.accept(item, value);
-            }
-        };
-
-        return new AttributeSupplier<>(attributeName,
-                                       getAttributeValueWithTransform,
-                                       updateItemWithTransform,
-                                       attributeType.getAttributeValueType());
-    }
-
-    /**
-     * Return a transformed copy of this attribute that knows how to get/set from a different type of object given a
-     * function that can convert the containing object itself. It does this by modifying the get/set functions of
-     * type T to type R given a transformation function F(T) = R.
-     * @param transform A function that converts the object storing the attribute from the source type to the
-     *                  destination type.
-     * @param createComponent A consumer to create a new instance of the component object when required. A null value
-     *                       will bypass this logic.
-     * @param <R> The type being transformed to.
-     * @return A new Attribute that be contained by an object of type R.
-     */
-    public <R> Attribute<R> transform(Function<R, T> transform, Consumer<R> createComponent) {
-        return new Attribute<>(attributeName,
-            item -> {
-                T otherItem = transform.apply(item);
-
-                // If the containing object is null don't attempt to read attributes from it
-                return otherItem == null ?
-                    nullAttributeValue() : getAttributeMethod.apply(otherItem);
-            },
-            (item, value) -> {
-                if (createComponent != null) {
-                    // Lazily instantiate the component object once there is a value to write into it
-                    createComponent.accept(item);
-                }
-                updateItemMethod.accept(transform.apply(item), value);
-            },
-            tableMetadata,
-            attributeValueType);
-    }
-
-    String getAttributeName() {
-        return attributeName;
-    }
-
-    Function<T, AttributeValue> getGetAttributeMethod() {
-        return getAttributeMethod;
-    }
-
-    BiConsumer<T, AttributeValue> getUpdateItemMethod() {
-        return updateItemMethod;
-    }
-
-    StaticTableMetadata getTableMetadata() {
-        return tableMetadata;
-    }
-
-    public static class AttributeSupplier<T> implements Supplier<Attribute<T>> {
-        private final String attributeName;
-        private final Function<T, AttributeValue> getAttributeValue;
-        private final BiConsumer<T, AttributeValue> updateItem;
-        private final StaticTableMetadata.Builder tableMetadataBuilder = StaticTableMetadata.builder();
-        private final AttributeValueType attributeValueType;
-
-        private AttributeSupplier(String attributeName,
-                                  Function<T, AttributeValue> getAttributeValue,
-                                  BiConsumer<T, AttributeValue> updateItem,
-                                  AttributeValueType attributeValueType) {
-            this.attributeName = attributeName;
-            this.getAttributeValue = getAttributeValue;
-            this.updateItem = updateItem;
-            this.attributeValueType = attributeValueType;
-        }
-
-        @Override
-        public Attribute<T> get() {
-            return new Attribute<>(attributeName,
-                                   getAttributeValue,
-                                   updateItem,
-                                   tableMetadataBuilder.build(),
-                                   attributeValueType);
-        }
-
-        public AttributeSupplier<T> as(AttributeTag... attributeTags) {
-            Arrays.stream(attributeTags).forEach(attributeTag ->
-                attributeTag.setTableMetadataForAttribute(attributeName, attributeValueType, tableMetadataBuilder));
-            return this;
-        }
-    }
-}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/staticmapper/AttributeTag.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/staticmapper/AttributeTag.java
deleted file mode 100644
index fe41982abde2..000000000000
--- a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/staticmapper/AttributeTag.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.extensions.dynamodb.mappingclient.staticmapper;
-
-import java.util.Map;
-
-import software.amazon.awssdk.annotations.SdkPublicApi;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.core.AttributeValueType;
-
-/**
- * Extend this class to create your own attribute tag that can be used with extensions.
- */
-@SdkPublicApi
-public abstract class AttributeTag {
-    /**
-     * Attribute tags are recorded in the {@link software.amazon.awssdk.extensions.dynamodb.mappingclient.TableMetadata}
-     * object as custom metadata objects with a string key and a flexible value type. This method will be called
-     * whenever this object is used to tag an attribute in a {@link StaticTableSchema}.
-     *
-     * @param attributeName The name of the attribute this tag has been applied to.
-     * @param attributeValueType The type of the attribute this tag has been applied to. This can be used for
-     *                           validation, for instance if you have an attribute tag that should only be associated
-     *                           with a string.
-     * @return A map of custom metadata map entries that will be added to the custom metadata stored in the
-     * {@link software.amazon.awssdk.extensions.dynamodb.mappingclient.TableMetadata} object for the table being mapped.
-     * Your extension should know what to do with these custom metadata entries.
-     */
-    protected abstract Map<String, Object> getCustomMetadataForAttribute(String attributeName,
-                                                                         AttributeValueType attributeValueType);
-
-    /**
-     * Returns a boolean that indicates whether this attribute tag qualifies the attribute that has been tagged with
-     * it as a 'key attribute'. This is used by other extensions to determine how the attribute should be treated,
-     * for instance the encryption extension will not encrypt any attributes marked as 'key attributes' by default.
-     * @return true if this attribute should be considered a 'key attribute'; false if not.
-     */
-    protected abstract boolean isKeyAttribute();
-
-    void setTableMetadataForAttribute(String attributeName,
-                                      AttributeValueType attributeValueType,
-                                      StaticTableMetadata.Builder tableMetadataBuilder) {
-        if (isKeyAttribute()) {
-            tableMetadataBuilder.markAttributeAsKey(attributeName, attributeValueType);
-        }
-
-        getCustomMetadataForAttribute(attributeName, attributeValueType)
-            .forEach(tableMetadataBuilder::addCustomMetadataObject);
-    }
-}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/staticmapper/AttributeTags.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/staticmapper/AttributeTags.java
deleted file mode 100644
index 9fac06d7c048..000000000000
--- a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/staticmapper/AttributeTags.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.extensions.dynamodb.mappingclient.staticmapper;
-
-import java.util.Collections;
-import java.util.Map;
-import java.util.function.BiConsumer;
-
-import software.amazon.awssdk.annotations.SdkPublicApi;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.TableMetadata;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.core.AttributeValueType;
-
-@SdkPublicApi
-public final class AttributeTags {
-    private static final AttributeTag PRIMARY_PARTITION_KEY_SINGLETON =
-        new KeyAttribute((tableMetadataBuilder, attribute) ->
-            tableMetadataBuilder.addIndexPartitionKey(TableMetadata.getPrimaryIndexName(),
-                                                      attribute.getAttributeName(),
-                                                      attribute.getAttributeValueType()));
-    private static final AttributeTag PRIMARY_SORT_KEY_SINGLETON =
-        new KeyAttribute((tableMetadataBuilder, attribute) ->
-            tableMetadataBuilder.addIndexSortKey(TableMetadata.getPrimaryIndexName(),
-                                                 attribute.getAttributeName(),
-                                                 attribute.getAttributeValueType()));
-
-    private AttributeTags() {
-    }
-
-    public static AttributeTag primaryPartitionKey() {
-        return PRIMARY_PARTITION_KEY_SINGLETON;
-    }
-
-    public static AttributeTag primarySortKey() {
-        return PRIMARY_SORT_KEY_SINGLETON;
-    }
-
-    public static AttributeTag secondaryPartitionKey(String indexName) {
-        return new KeyAttribute((tableMetadataBuilder, attribute) ->
-                                    tableMetadataBuilder.addIndexPartitionKey(indexName,
-                                                                              attribute.getAttributeName(),
-                                                                              attribute.getAttributeValueType()));
-    }
-
-    public static AttributeTag secondarySortKey(String indexName) {
-        return new KeyAttribute((tableMetadataBuilder, attribute) ->
-                                    tableMetadataBuilder.addIndexSortKey(indexName,
-                                                                         attribute.getAttributeName(),
-                                                                         attribute.getAttributeValueType()));
-    }
-
-    private static class KeyAttribute extends AttributeTag {
-        private final BiConsumer<StaticTableMetadata.Builder, AttributeAndType> tableMetadataKeySetter;
-
-        private KeyAttribute(BiConsumer<StaticTableMetadata.Builder, AttributeAndType> tableMetadataKeySetter) {
-            this.tableMetadataKeySetter = tableMetadataKeySetter;
-        }
-
-        @Override
-        protected boolean isKeyAttribute() {
-            return true;
-        }
-
-        @Override
-        public Map<String, Object> getCustomMetadataForAttribute(String attributeName,
-                                                                 AttributeValueType attributeValueType) {
-            return Collections.emptyMap();
-        }
-
-        @Override
-        public void setTableMetadataForAttribute(String attributeName,
-                                                 AttributeValueType attributeValueType,
-                                                 StaticTableMetadata.Builder tableMetadataBuilder) {
-
-            if (attributeValueType.getScalarAttributeType() == null) {
-                throw new IllegalArgumentException(String.format("Attribute '%s' of type %s is not a suitable type to "
-                    + "be used as a key.", attributeName, attributeValueType.name()));
-            }
-
-            tableMetadataKeySetter.accept(tableMetadataBuilder,
-                                          new AttributeAndType(attributeName, attributeValueType));
-        }
-    }
-
-    private static class AttributeAndType {
-        private final String attributeName;
-        private final AttributeValueType attributeValueType;
-
-        private AttributeAndType(String attributeName, AttributeValueType attributeValueType) {
-            this.attributeName = attributeName;
-            this.attributeValueType = attributeValueType;
-        }
-
-        private String getAttributeName() {
-            return attributeName;
-        }
-
-        private AttributeValueType getAttributeValueType() {
-            return attributeValueType;
-        }
-    }
-}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/staticmapper/AttributeType.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/staticmapper/AttributeType.java
deleted file mode 100644
index 7e11f957ef4d..000000000000
--- a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/staticmapper/AttributeType.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.extensions.dynamodb.mappingclient.staticmapper;
-
-import java.util.function.Function;
-
-import software.amazon.awssdk.annotations.SdkPublicApi;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.core.AttributeValueType;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-
-@SdkPublicApi
-public class AttributeType<T> {
-    private final Function<T, AttributeValue> objectTransformer;
-    private final Function<AttributeValue, T> attributeValueTransformer;
-    private final AttributeValueType attributeValueType;
-
-    private AttributeType(Function<T, AttributeValue> objectTransformer,
-                          Function<AttributeValue, T> attributeValueTransformer, AttributeValueType attributeValueType) {
-        this.objectTransformer = objectTransformer;
-        this.attributeValueTransformer = attributeValueTransformer;
-        this.attributeValueType = attributeValueType;
-    }
-
-    public static <T> AttributeType<T> of(
-        Function<T, AttributeValue> objectTransformer,
-        Function<AttributeValue, T> attributeValueTransformer,
-        AttributeValueType attributeValueType) {
-
-        return new AttributeType<>(objectTransformer, attributeValueTransformer, attributeValueType);
-    }
-
-    public AttributeValue objectToAttributeValue(T object) {
-        return this.objectTransformer.apply(object);
-    }
-
-    public T attributeValueToObject(AttributeValue attributeValue) {
-        return this.attributeValueTransformer.apply(attributeValue);
-    }
-
-    AttributeValueType getAttributeValueType() {
-        return attributeValueType;
-    }
-}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/staticmapper/AttributeTypes.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/staticmapper/AttributeTypes.java
deleted file mode 100644
index ea8bfacee273..000000000000
--- a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/staticmapper/AttributeTypes.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.extensions.dynamodb.mappingclient.staticmapper;
-
-import java.nio.ByteBuffer;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
-import software.amazon.awssdk.annotations.SdkPublicApi;
-import software.amazon.awssdk.core.SdkBytes;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.TableSchema;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.core.AttributeValueType;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-
-@SdkPublicApi
-public final class AttributeTypes {
-    private AttributeTypes() {
-
-    }
-
-    public static AttributeType<Boolean> booleanType() {
-        return AttributeType.of(obj -> AttributeValue.builder().bool(obj).build(),
-                                AttributeValue::bool,
-                                AttributeValueType.BOOL);
-    }
-
-    public static AttributeType<String> stringType() {
-        return AttributeType.of(obj -> AttributeValue.builder().s(obj).build(),
-                                AttributeValue::s,
-                                AttributeValueType.S);
-    }
-
-    public static AttributeType<Integer> integerNumberType() {
-        return numberType(Integer::parseInt);
-    }
-
-    public static AttributeType<Long> longNumberType() {
-        return numberType(Long::parseLong);
-    }
-
-    public static AttributeType<Short> shortNumberType() {
-        return numberType(Short::parseShort);
-    }
-
-    public static AttributeType<Byte> byteNumberType() {
-        return numberType(Byte::parseByte);
-    }
-
-    public static AttributeType<Double> doubleNumberType() {
-        return numberType(Double::parseDouble);
-    }
-
-    public static AttributeType<Float> floatNumberType() {
-        return numberType(Float::parseFloat);
-    }
-
-    public static AttributeType<Set<Integer>> integerNumberSetType() {
-        return numberSetType(Integer::parseInt);
-    }
-
-    public static AttributeType<Set<Long>> longNumberSetType() {
-        return numberSetType(Long::parseLong);
-    }
-
-    public static AttributeType<Set<Short>> shortNumberSetType() {
-        return numberSetType(Short::parseShort);
-    }
-
-    public static AttributeType<Set<Byte>> byteNumberSetType() {
-        return numberSetType(Byte::parseByte);
-    }
-
-    public static AttributeType<Set<Double>> doubleNumberSetType() {
-        return numberSetType(Double::parseDouble);
-    }
-
-    public static AttributeType<Set<Float>> floatNumberSetType() {
-        return numberSetType(Float::parseFloat);
-    }
-
-    public static AttributeType<ByteBuffer> binaryType() {
-        return AttributeType.of(byteBuffer -> AttributeValue.builder().b(SdkBytes.fromByteBuffer(byteBuffer)).build(),
-            attributeValue -> attributeValue.b().asByteBuffer(),
-            AttributeValueType.B);
-    }
-
-    public static AttributeType<Set<ByteBuffer>> binarySetType() {
-        return AttributeType.of(
-            bbSet -> AttributeValue.builder()
-                                   .bs(bbSet.stream().map(SdkBytes::fromByteBuffer).collect(Collectors.toList()))
-                                   .build(),
-            attributeValue -> attributeValue.bs().stream().map(SdkBytes::asByteBuffer).collect(Collectors.toSet()),
-            AttributeValueType.BS);
-    }
-
-    public static AttributeType<Set<String>> stringSetType() {
-        return AttributeType.of(stringSet -> AttributeValue.builder().ss(stringSet).build(),
-            attributeValue -> Collections.unmodifiableSet(new HashSet<>(attributeValue.ss())),
-            AttributeValueType.SS);
-    }
-
-    public static <T> AttributeType<List<T>> listType(AttributeType<T> elementType) {
-        return AttributeType.of(
-            list -> AttributeValue.builder()
-                                  .l(list.stream()
-                                         .map(elementType::objectToAttributeValue)
-                                         .collect(Collectors.toList()))
-                                  .build(),
-            attributeValue -> attributeValue.l()
-                                            .stream()
-                                            .map(elementType::attributeValueToObject)
-                                            .collect(Collectors.toList()),
-            AttributeValueType.L);
-    }
-
-    public static <T> AttributeType<Map<String, T>> mapType(AttributeType<T> mappedValueType) {
-        return AttributeType.of(
-            map -> AttributeValue.builder()
-                                 .m(map.entrySet()
-                                       .stream()
-                                       .collect(Collectors.toMap(
-                                           Map.Entry::getKey,
-                                           entry -> mappedValueType.objectToAttributeValue(entry.getValue()))))
-                                 .build(),
-            attributeValue -> attributeValue.m()
-                                            .entrySet()
-                                            .stream()
-                                            .collect(Collectors.toMap(
-                                                Map.Entry::getKey,
-                                                entry -> mappedValueType.attributeValueToObject(entry.getValue()))),
-            AttributeValueType.M);
-    }
-
-    public static <T> AttributeType<T> documentMapType(TableSchema<T> documentSchema) {
-        return AttributeType.of(
-            document -> AttributeValue.builder().m(documentSchema.itemToMap(document, false)).build(),
-            attributeValue -> documentSchema.mapToItem(attributeValue.m()),
-            AttributeValueType.M);
-    }
-
-    public static <T extends Number> AttributeType<T> numberType(Function<String, T> stringToNumber) {
-        return AttributeType.of(obj -> AttributeValue.builder().n(obj.toString()).build(),
-            attributeValue -> stringToNumber.apply(attributeValue.n()),
-            AttributeValueType.N);
-    }
-
-    private static <T extends Number> AttributeType<Set<T>> numberSetType(Function<String, T> stringToNumber) {
-        return AttributeType.of(
-            nSet -> AttributeValue.builder()
-                                  .ns(nSet.stream().map(Number::toString).collect(Collectors.toList()))
-                                  .build(),
-            attributeValue -> attributeValue.ns().stream().map(stringToNumber).collect(Collectors.toSet()),
-            AttributeValueType.NS);
-    }
-}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/staticmapper/Attributes.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/staticmapper/Attributes.java
deleted file mode 100644
index b59239ec4081..000000000000
--- a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/staticmapper/Attributes.java
+++ /dev/null
@@ -1,237 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.extensions.dynamodb.mappingclient.staticmapper;
-
-import java.nio.ByteBuffer;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.function.BiConsumer;
-import java.util.function.Function;
-
-import software.amazon.awssdk.annotations.SdkPublicApi;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.TableSchema;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.staticmapper.Attribute.AttributeSupplier;
-
-@SdkPublicApi
-@SuppressWarnings("WeakerAccess")
-public final class Attributes {
-    private Attributes() {
-    }
-
-    public static <T> AttributeSupplier<T> binary(String attributeName,
-                                                  Function<T, ByteBuffer> getAttributeMethod,
-                                                  BiConsumer<T, ByteBuffer> updateItemMethod) {
-        return Attribute.of(
-            attributeName,
-            getAttributeMethod,
-            updateItemMethod,
-            AttributeTypes.binaryType());
-    }
-
-    public static <T> AttributeSupplier<T> binarySet(String attributeName,
-                                                     Function<T, Set<ByteBuffer>> getAttributeMethod,
-                                                     BiConsumer<T, Set<ByteBuffer>> updateItemMethod) {
-        return Attribute.of(
-            attributeName,
-            getAttributeMethod,
-            updateItemMethod,
-            AttributeTypes.binarySetType());
-    }
-
-    public static <T> AttributeSupplier<T> bool(String attributeName,
-                                                Function<T, Boolean> getAttributeMethod,
-                                                BiConsumer<T, Boolean> updateItemMethod) {
-        return Attribute.of(
-            attributeName,
-            getAttributeMethod,
-            updateItemMethod,
-            AttributeTypes.booleanType());
-    }
-
-    public static <T> AttributeSupplier<T> string(String attributeName,
-                                                  Function<T, String> getAttributeMethod,
-                                                  BiConsumer<T, String> updateItemMethod) {
-        return Attribute.of(
-            attributeName,
-            getAttributeMethod,
-            updateItemMethod,
-            AttributeTypes.stringType());
-    }
-
-    public static <T> AttributeSupplier<T> stringSet(String attributeName,
-                                                     Function<T, Set<String>> getAttributeMethod,
-                                                     BiConsumer<T, Set<String>> updateItemMethod) {
-        return Attribute.of(
-            attributeName,
-            getAttributeMethod,
-            updateItemMethod,
-            AttributeTypes.stringSetType());
-    }
-
-    public static <T> AttributeSupplier<T> integerNumber(String attributeName,
-                                                         Function<T, Integer> getAttributeMethod,
-                                                         BiConsumer<T, Integer> updateItemMethod) {
-        return Attribute.of(
-            attributeName,
-            getAttributeMethod,
-            updateItemMethod,
-            AttributeTypes.integerNumberType());
-    }
-
-    public static <T> AttributeSupplier<T> longNumber(String attributeName,
-                                                      Function<T, Long> getAttributeMethod,
-                                                      BiConsumer<T, Long> updateItemMethod) {
-        return Attribute.of(
-            attributeName,
-            getAttributeMethod,
-            updateItemMethod,
-            AttributeTypes.longNumberType());
-    }
-
-    public static <T> AttributeSupplier<T> shortNumber(String attributeName,
-                                                       Function<T, Short> getAttributeMethod,
-                                                       BiConsumer<T, Short> updateItemMethod) {
-        return Attribute.of(
-            attributeName,
-            getAttributeMethod,
-            updateItemMethod,
-            AttributeTypes.shortNumberType());
-    }
-
-    public static <T> AttributeSupplier<T> doubleNumber(String attributeName,
-                                                        Function<T, Double> getAttributeMethod,
-                                                        BiConsumer<T, Double> updateItemMethod) {
-        return Attribute.of(
-            attributeName,
-            getAttributeMethod,
-            updateItemMethod,
-            AttributeTypes.doubleNumberType());
-    }
-
-    public static <T> AttributeSupplier<T> floatNumber(String attributeName,
-                                                       Function<T, Float> getAttributeMethod,
-                                                       BiConsumer<T, Float> updateItemMethod) {
-        return Attribute.of(
-            attributeName,
-            getAttributeMethod,
-            updateItemMethod,
-            AttributeTypes.floatNumberType());
-    }
-
-    public static <T> AttributeSupplier<T> byteNumber(String attributeName,
-                                                      Function<T, Byte> getAttributeMethod,
-                                                      BiConsumer<T, Byte> updateItemMethod) {
-        return Attribute.of(
-            attributeName,
-            getAttributeMethod,
-            updateItemMethod,
-            AttributeTypes.byteNumberType());
-    }
-
-    public static <T> AttributeSupplier<T> integerSet(String attributeName,
-                                                      Function<T, Set<Integer>> getAttributeMethod,
-                                                      BiConsumer<T, Set<Integer>> updateItemMethod) {
-        return Attribute.of(
-            attributeName,
-            getAttributeMethod,
-            updateItemMethod,
-            AttributeTypes.integerNumberSetType());
-    }
-
-    public static <T> AttributeSupplier<T> longSet(String attributeName,
-                                                   Function<T, Set<Long>> getAttributeMethod,
-                                                   BiConsumer<T, Set<Long>> updateItemMethod) {
-        return Attribute.of(
-            attributeName,
-            getAttributeMethod,
-            updateItemMethod,
-            AttributeTypes.longNumberSetType());
-    }
-
-    public static <T> AttributeSupplier<T> shortSet(String attributeName,
-                                                    Function<T, Set<Short>> getAttributeMethod,
-                                                    BiConsumer<T, Set<Short>> updateItemMethod) {
-        return Attribute.of(
-            attributeName,
-            getAttributeMethod,
-            updateItemMethod,
-            AttributeTypes.shortNumberSetType());
-    }
-
-    public static <T> AttributeSupplier<T> doubleSet(String attributeName,
-                                                     Function<T, Set<Double>> getAttributeMethod,
-                                                     BiConsumer<T, Set<Double>> updateItemMethod) {
-        return Attribute.of(
-            attributeName,
-            getAttributeMethod,
-            updateItemMethod,
-            AttributeTypes.doubleNumberSetType());
-    }
-
-    public static <T> AttributeSupplier<T> floatSet(String attributeName,
-                                                    Function<T, Set<Float>> getAttributeMethod,
-                                                    BiConsumer<T, Set<Float>> updateItemMethod) {
-        return Attribute.of(
-            attributeName,
-            getAttributeMethod,
-            updateItemMethod,
-            AttributeTypes.floatNumberSetType());
-    }
-
-    public static <T> AttributeSupplier<T> byteSet(String attributeName,
-                                                   Function<T, Set<Byte>> getAttributeMethod,
-                                                   BiConsumer<T, Set<Byte>> updateItemMethod) {
-        return Attribute.of(
-            attributeName,
-            getAttributeMethod,
-            updateItemMethod,
-            AttributeTypes.byteNumberSetType());
-    }
-
-    public static <T, K> AttributeSupplier<T> documentMap(String attributeName,
-                                                          Function<T, K> getAttributeMethod,
-                                                          BiConsumer<T, K> updateItemMethod,
-                                                          TableSchema<K> documentSchema) {
-        return Attribute.of(
-            attributeName,
-            getAttributeMethod,
-            updateItemMethod,
-            AttributeTypes.documentMapType(documentSchema));
-    }
-
-    public static <T, K> AttributeSupplier<T> map(String attributeName,
-                                                  Function<T, Map<String, K>> getAttributeMethod,
-                                                  BiConsumer<T, Map<String, K>> updateItemMethod,
-                                                  AttributeType<K> mappedValueType) {
-        return Attribute.of(
-            attributeName,
-            getAttributeMethod,
-            updateItemMethod,
-            AttributeTypes.mapType(mappedValueType));
-    }
-
-    public static <T, K> AttributeSupplier<T> list(String attributeName,
-                                                   Function<T, List<K>> getAttributeMethod,
-                                                   BiConsumer<T, List<K>> updateItemMethod,
-                                                   AttributeType<K> listElementsType) {
-        return Attribute.of(
-            attributeName,
-            getAttributeMethod,
-            updateItemMethod,
-            AttributeTypes.listType(listElementsType));
-    }
-}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/staticmapper/StaticTableMetadata.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/staticmapper/StaticTableMetadata.java
deleted file mode 100644
index d1235f2eb1ca..000000000000
--- a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/staticmapper/StaticTableMetadata.java
+++ /dev/null
@@ -1,341 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.extensions.dynamodb.mappingclient.staticmapper;
-
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Map;
-import java.util.Optional;
-import java.util.concurrent.ConcurrentHashMap;
-
-import software.amazon.awssdk.annotations.SdkInternalApi;
-import software.amazon.awssdk.annotations.ThreadSafe;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.TableMetadata;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.core.AttributeValueType;
-import software.amazon.awssdk.services.dynamodb.model.ScalarAttributeType;
-
-@SdkInternalApi
-@ThreadSafe
-@SuppressWarnings({"checkstyle:FinalClass"})
-public class StaticTableMetadata implements TableMetadata {
-    // The following indexed collections are only built once and are immutable, therefore the class is threadsafe
-    private final Map<String, Object> customMetadata;
-    private final Map<String, Index> indexByNameMap;
-    private final Map<String, AttributeValueType> keyAttributes;
-
-    private StaticTableMetadata(Builder builder) {
-        this.customMetadata = Collections.unmodifiableMap(builder.customMetadata);
-        this.indexByNameMap = Collections.unmodifiableMap(builder.indexByNameMap);
-        this.keyAttributes = Collections.unmodifiableMap(builder.keyAttributes);
-    }
-
-    static Builder builder() {
-        return new Builder();
-    }
-
-    @Override
-    public <T> Optional<T> getCustomMetadataObject(String key, Class<? extends T> objectClass) {
-        Object genericObject = customMetadata.get(key);
-
-        if (genericObject == null) {
-            return Optional.empty();
-        }
-
-        if (!objectClass.isAssignableFrom(genericObject.getClass())) {
-            throw new IllegalArgumentException("Attempt to retrieve a custom metadata object as a type that is not "
-                                               + "assignable for that object. Custom metadata key: " + key + "; "
-                                               + "requested object class: " + objectClass.getCanonicalName() + "; "
-                                               + "found object class: " + genericObject.getClass().getCanonicalName());
-        }
-
-        return Optional.of(objectClass.cast(genericObject));
-    }
-
-    @Override
-    public String getIndexPartitionKey(String indexName) {
-        Index index = getIndex(indexName);
-
-        if (index.getIndexPartitionKey() == null) {
-            if (!TableMetadata.getPrimaryIndexName().equals(indexName) && index.getIndexSortKey() != null) {
-                // Local secondary index, use primary partition key
-                return getPrimaryPartitionKey();
-            }
-
-            throw new IllegalArgumentException("Attempt to execute an operation against an index that requires a "
-                                               + "partition key without assigning a partition key to that index. "
-                                               + "Index name: " + indexName);
-        }
-
-        return index.getIndexPartitionKey();
-    }
-
-    @Override
-    public Optional<String> getIndexSortKey(String indexName) {
-        Index index = getIndex(indexName);
-
-        return Optional.ofNullable(index.getIndexSortKey());
-    }
-
-    @Override
-    public Collection<String> getIndexKeys(String indexName) {
-        Index index = getIndex(indexName);
-
-        if (index.getIndexSortKey() != null) {
-            if (!TableMetadata.getPrimaryIndexName().equals(indexName) && index.getIndexPartitionKey() == null) {
-                // Local secondary index, use primary index for partition key
-                return Collections.unmodifiableList(Arrays.asList(getPrimaryPartitionKey(), index.getIndexSortKey()));
-            }
-            return Collections.unmodifiableList(Arrays.asList(index.getIndexPartitionKey(), index.getIndexSortKey()));
-        } else {
-            return Collections.singletonList(index.getIndexPartitionKey());
-        }
-    }
-
-    @Override
-    public Collection<String> getAllKeys() {
-        return this.keyAttributes.keySet();
-    }
-
-    private Index getIndex(String indexName) {
-        Index index = indexByNameMap.get(indexName);
-
-        if (index == null) {
-            if (TableMetadata.getPrimaryIndexName().equals(indexName)) {
-                throw new IllegalArgumentException("Attempt to execute an operation that requires a primary index "
-                                                   + "without defining any primary key attributes in the table "
-                                                   + "metadata.");
-            } else {
-                throw new IllegalArgumentException("Attempt to execute an operation that requires a secondary index "
-                                                   + "without defining the index attributes in the table metadata. "
-                                                   + "Index name: " + indexName);
-            }
-        }
-
-        return index;
-    }
-
-    @Override
-    public Optional<ScalarAttributeType> getScalarAttributeType(String keyAttribute) {
-        AttributeValueType attributeValueType = this.keyAttributes.get(keyAttribute);
-
-        if (attributeValueType == null) {
-            throw new IllegalArgumentException("Key attribute '" + keyAttribute + "' not found in table metadata.");
-        }
-
-        return Optional.ofNullable(attributeValueType.getScalarAttributeType());
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-
-        StaticTableMetadata that = (StaticTableMetadata) o;
-
-        if (customMetadata != null ? ! customMetadata.equals(that.customMetadata) : that.customMetadata != null) {
-            return false;
-        }
-        if (indexByNameMap != null ? ! indexByNameMap.equals(that.indexByNameMap) : that.indexByNameMap != null) {
-            return false;
-        }
-        return keyAttributes != null ? keyAttributes.equals(that.keyAttributes) : that.keyAttributes == null;
-    }
-
-    @Override
-    public int hashCode() {
-        int result = customMetadata != null ? customMetadata.hashCode() : 0;
-        result = 31 * result + (indexByNameMap != null ? indexByNameMap.hashCode() : 0);
-        result = 31 * result + (keyAttributes != null ? keyAttributes.hashCode() : 0);
-        return result;
-    }
-
-    @ThreadSafe
-    static class Builder {
-        private final Map<String, Object> customMetadata = new ConcurrentHashMap<>();
-        private final Map<String, Index> indexByNameMap = new ConcurrentHashMap<>();
-        private final Map<String, AttributeValueType> keyAttributes = new ConcurrentHashMap<>();
-
-        private Builder() {
-        }
-
-        StaticTableMetadata build() {
-            return new StaticTableMetadata(this);
-        }
-
-        Builder mergeWith(StaticTableMetadata other) {
-            other.indexByNameMap.forEach((key, index) -> {
-                if (index.getIndexPartitionKey() != null) {
-                    addIndexPartitionKey(index.getIndexName(),
-                                         index.getIndexPartitionKey(),
-                                         index.getIndexPartitionType());
-                }
-
-                if (index.getIndexSortKey() != null) {
-                    addIndexSortKey(index.getIndexName(), index.getIndexSortKey(), index.getIndexSortType());
-                }
-            });
-
-            other.customMetadata.forEach(this::addCustomMetadataObject);
-            other.keyAttributes.forEach(this::markAttributeAsKey);
-            return this;
-        }
-
-        Builder addCustomMetadataObject(String key, Object object) {
-            if (customMetadata.containsKey(key)) {
-                throw new IllegalArgumentException("Attempt to set a custom metadata object that has already been set. "
-                                                   + "Custom metadata object key: " + key);
-            }
-
-            customMetadata.put(key, object);
-            return this;
-        }
-
-        Builder addIndexPartitionKey(String indexName, String attributeName, AttributeValueType attributeValueType) {
-            Index index = indexByNameMap.computeIfAbsent(indexName, $ -> new Index(indexName));
-
-            if (index.getIndexPartitionKey() != null) {
-                throw new IllegalArgumentException("Attempt to set an index partition key that conflicts with an "
-                                                   + "existing index partition key of the same name and index. Index "
-                                                   + "name: " + indexName + "; attribute name: " + attributeName);
-            }
-
-            index.setIndexPartitionKey(attributeName);
-            index.setIndexPartitionType(attributeValueType);
-            markAttributeAsKey(attributeName, attributeValueType);
-            return this;
-        }
-
-        Builder addIndexSortKey(String indexName, String attributeName, AttributeValueType attributeValueType) {
-            Index index = indexByNameMap.computeIfAbsent(indexName, $ -> new Index(indexName));
-
-            if (index.getIndexSortKey() != null) {
-                throw new IllegalArgumentException("Attempt to set an index sort key that conflicts with an existing"
-                                                   + " index sort key of the same name and index. Index name: "
-                                                   + indexName + "; attribute name: " + attributeName);
-            }
-
-            index.setIndexSortKey(attributeName);
-            index.setIndexSortType(attributeValueType);
-            markAttributeAsKey(attributeName, attributeValueType);
-            return this;
-        }
-
-        Builder markAttributeAsKey(String attributeName, AttributeValueType attributeValueType) {
-            AttributeValueType existing = keyAttributes.get(attributeName);
-
-            if (existing != null && !existing.equals(attributeValueType)) {
-                throw new IllegalArgumentException("Attempt to mark an attribute as a key with a different "
-                                                   + "AttributeValueType than one that has already been recorded.");
-            }
-
-            if (existing == null) {
-                keyAttributes.put(attributeName, attributeValueType);
-            }
-
-            return this;
-        }
-    }
-
-    private static class Index {
-        private final String indexName;
-        private String indexPartitionKey;
-        private String indexSortKey;
-        private AttributeValueType indexPartitionType;
-        private AttributeValueType indexSortType;
-
-        private Index(String indexName) {
-            this.indexName = indexName;
-        }
-
-        private String getIndexName() {
-            return indexName;
-        }
-
-        private String getIndexPartitionKey() {
-            return indexPartitionKey;
-        }
-
-        private String getIndexSortKey() {
-            return indexSortKey;
-        }
-
-        private AttributeValueType getIndexPartitionType() {
-            return indexPartitionType;
-        }
-
-        private AttributeValueType getIndexSortType() {
-            return indexSortType;
-        }
-
-        private void setIndexPartitionKey(String indexPartitionKey) {
-            this.indexPartitionKey = indexPartitionKey;
-        }
-
-        private void setIndexSortKey(String indexSortKey) {
-            this.indexSortKey = indexSortKey;
-        }
-
-        private void setIndexPartitionType(AttributeValueType indexPartitionType) {
-            this.indexPartitionType = indexPartitionType;
-        }
-
-        private void setIndexSortType(AttributeValueType indexSortType) {
-            this.indexSortType = indexSortType;
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            if (this == o) {
-                return true;
-            }
-            if (o == null || getClass() != o.getClass()) {
-                return false;
-            }
-
-            Index index = (Index) o;
-
-            if (indexName != null ? ! indexName.equals(index.indexName) : index.indexName != null) {
-                return false;
-            }
-            if (indexPartitionKey != null ? ! indexPartitionKey.equals(index.indexPartitionKey) :
-                index.indexPartitionKey != null) {
-                return false;
-            }
-            if (indexSortKey != null ? ! indexSortKey.equals(index.indexSortKey) : index.indexSortKey != null) {
-                return false;
-            }
-            if (indexPartitionType != index.indexPartitionType) {
-                return false;
-            }
-            return indexSortType == index.indexSortType;
-        }
-
-        @Override
-        public int hashCode() {
-            int result = indexName != null ? indexName.hashCode() : 0;
-            result = 31 * result + (indexPartitionKey != null ? indexPartitionKey.hashCode() : 0);
-            result = 31 * result + (indexSortKey != null ? indexSortKey.hashCode() : 0);
-            result = 31 * result + (indexPartitionType != null ? indexPartitionType.hashCode() : 0);
-            result = 31 * result + (indexSortType != null ? indexSortType.hashCode() : 0);
-            return result;
-        }
-    }
-}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/staticmapper/StaticTableSchema.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/staticmapper/StaticTableSchema.java
deleted file mode 100644
index 324de2c629a7..000000000000
--- a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/staticmapper/StaticTableSchema.java
+++ /dev/null
@@ -1,293 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.extensions.dynamodb.mappingclient.staticmapper;
-
-import static java.util.Arrays.stream;
-import static java.util.Collections.unmodifiableMap;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.AttributeValues.isNullAttributeValue;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.function.BiConsumer;
-import java.util.function.Consumer;
-import java.util.function.Function;
-import java.util.function.Supplier;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import software.amazon.awssdk.annotations.SdkPublicApi;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.AttributeValues;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.TableSchema;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.staticmapper.Attribute.AttributeSupplier;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-
-@SdkPublicApi
-@SuppressWarnings({"checkstyle:FinalClass"})
-public class StaticTableSchema<T> implements TableSchema<T> {
-    private final List<Attribute<T>> attributeMappers;
-    private final Supplier<T> newItemSupplier;
-    private final Map<String, Attribute<T>> indexedMappers;
-    private final StaticTableMetadata tableMetadata;
-
-    private StaticTableSchema(List<Attribute<T>> attributeMappers,
-                              Supplier<T> newItemSupplier,
-                              StaticTableMetadata tableMetadata) {
-        this.attributeMappers = attributeMappers;
-        this.newItemSupplier = newItemSupplier;
-        this.tableMetadata = tableMetadata;
-
-        indexedMappers =
-            unmodifiableMap(
-                attributeMappers.stream()
-                                .collect(Collectors.toMap(Attribute::getAttributeName, Function.identity())));
-    }
-
-    public static GenericBuilder builder() {
-        return new GenericBuilder();
-    }
-
-    public static class GenericBuilder {
-        private final StaticTableMetadata.Builder tableMetadataBuilder = StaticTableMetadata.builder();
-
-        public <T> StaticTableSchema<T> build() {
-            Builder<T> newBuilder = new Builder<>(tableMetadataBuilder);
-            return newBuilder.build();
-        }
-
-        public <T> Builder<T> newItemSupplier(Supplier<T> newItemSupplier) {
-            Builder<T> newBuilder = new Builder<>(tableMetadataBuilder);
-            return newBuilder.newItemSupplier(newItemSupplier);
-        }
-
-        public <T, R> Builder<T> flatten(StaticTableSchema<R> otherTableSchema,
-                                         Function<T, R> otherItemGetter,
-                                         BiConsumer<T, R> otherItemSetter) {
-            Builder<T> newBuilder = new Builder<>(tableMetadataBuilder);
-            return newBuilder.flatten(otherTableSchema, otherItemGetter, otherItemSetter);
-        }
-
-        /**
-         * Extends the {@link StaticTableSchema} of a super-class, effectively rolling all the attributes modelled by
-         * the super-class into the {@link StaticTableSchema} of the sub-class. If you are extending an abstract
-         * table schema that has no inferred type (due to having no attributes or a newItemSupplier) the compiler
-         * will not be able to correctly infer the type of the sub-class. To overcome this, specify the type
-         * explicitly as this example illustrates:
-         *
-         * {@code StaticTableSchema.builder().<Subclass>extend(superclassTableSchema).build(); }
-         *
-         * @param superTableSchema The {@link StaticTableSchema} of the super-class object.
-         * @param <T> The sub-class type of the {@link StaticTableSchema} being built.
-         * @return A strongly typed builder for the {@link StaticTableSchema} under construction.
-         */
-        public <T> Builder<T> extend(StaticTableSchema<? super T> superTableSchema) {
-            Builder<T> newBuilder = new Builder<>(tableMetadataBuilder);
-            return newBuilder.extend(superTableSchema);
-        }
-
-        @SafeVarargs
-        public final <T> Builder<T> attributes(AttributeSupplier<T>... mappedAttributes) {
-            Builder<T> newBuilder = new Builder<>(tableMetadataBuilder);
-            return newBuilder.attributes(mappedAttributes);
-        }
-
-        public final <T> Builder<T> attributes(Collection<AttributeSupplier<T>> mappedAttributes) {
-            Builder<T> newBuilder = new Builder<>(tableMetadataBuilder);
-            return newBuilder.attributes(mappedAttributes);
-        }
-
-        public GenericBuilder tagWith(TableTag... tableTags) {
-            Arrays.stream(tableTags).forEach(tableTag -> tableTag.setTableMetadata(tableMetadataBuilder));
-            return this;
-        }
-    }
-
-    public static final class Builder<T> {
-        private Supplier<T> newItemSupplier;
-        private final StaticTableMetadata.Builder tableMetadataBuilder;
-        private final List<Attribute<T>> mappedAttributes = new ArrayList<>();
-        private final Map<String, Attribute<T>> indexedMappers = new HashMap<>();
-
-        private Builder(StaticTableMetadata.Builder tableMetadataBuilder) {
-            this.tableMetadataBuilder = tableMetadataBuilder;
-        }
-
-        public Builder<T> newItemSupplier(Supplier<T> newItemSupplier) {
-            this.newItemSupplier = newItemSupplier;
-            return this;
-        }
-
-        @SafeVarargs
-        public final Builder<T> attributes(AttributeSupplier<T>... mappedAttributes) {
-            stream(mappedAttributes).map(Supplier::get).forEach(this::mergeAttribute);
-            return this;
-        }
-
-        public Builder<T> attributes(Collection<AttributeSupplier<T>> mappedAttributes) {
-            mappedAttributes.stream().map(Supplier::get).forEach(this::mergeAttribute);
-            return this;
-        }
-
-        public <R> Builder<T> flatten(StaticTableSchema<R> otherTableSchema,
-                                      Function<T, R> otherItemGetter,
-                                      BiConsumer<T, R> otherItemSetter) {
-            if (otherTableSchema.newItemSupplier == null) {
-                throw new IllegalArgumentException("Cannot flatten an abstract StaticTableSchema. Add a "
-                                                   + "'newItemSupplier' to the other StaticTableSchema to make it "
-                                                   + "concrete.");
-            }
-
-            // Creates a consumer that given a parent object will instantiate the composed object if its value is
-            // currently null and call the setter to store it on the parent object.
-            Consumer<T> composedObjectConstructor = parentObject -> {
-                if (otherItemGetter.apply(parentObject) == null) {
-                    R compositeItem = otherTableSchema.newItemSupplier.get();
-                    otherItemSetter.accept(parentObject, compositeItem);
-                }
-            };
-
-            otherTableSchema.attributeMappers.stream()
-                                             .map(attribute -> attribute.transform(otherItemGetter,
-                                                                                   composedObjectConstructor))
-                                             .forEach(this::mergeAttribute);
-            return this;
-        }
-
-        public Builder<T> extend(StaticTableSchema<? super T> superTableSchema) {
-            // Upcast transform and merge attributes
-            Stream<Attribute<T>> transformedAttributes =
-                upcastingTransformForAttributes(superTableSchema.attributeMappers);
-            transformedAttributes.forEach(this::mergeAttribute);
-
-            return this;
-        }
-
-        public Builder<T> tagWith(TableTag... tableTags) {
-            Arrays.stream(tableTags).forEach(tableTag -> tableTag.setTableMetadata(tableMetadataBuilder));
-            return this;
-        }
-
-        public StaticTableSchema<T> build() {
-            return new StaticTableSchema<>(mappedAttributes,
-                                           newItemSupplier,
-                                           tableMetadataBuilder.build());
-        }
-
-        private void mergeAttribute(Attribute<T> attributeToMerge) {
-            String attributeName = attributeToMerge.getAttributeName();
-
-            if (this.indexedMappers.containsKey(attributeName)) {
-                throw new IllegalArgumentException("Attempt to add an attribute to a mapper that already has one "
-                                                   + "with the same name. [Attribute name: " + attributeName + "]");
-            }
-
-            this.mappedAttributes.add(attributeToMerge);
-            this.indexedMappers.put(attributeName, attributeToMerge);
-            this.tableMetadataBuilder.mergeWith(attributeToMerge.getTableMetadata());
-        }
-
-        private static <T extends R, R> Stream<Attribute<T>> upcastingTransformForAttributes(
-            Collection<Attribute<R>> superAttributes) {
-            return superAttributes.stream().map(attribute -> attribute.transform(x -> x, null));
-        }
-    }
-
-    @Override
-    public StaticTableMetadata getTableMetadata() {
-        return tableMetadata;
-    }
-
-    @Override
-    public T mapToItem(Map<String, AttributeValue> attributeMap) {
-        // Lazily instantiate the item once we have an attribute to write
-        AtomicReference<T> item = new AtomicReference<>();
-
-        attributeMap.forEach((key, value) -> {
-            if (!AttributeValues.isNullAttributeValue(value)) {
-                Attribute<T> attributeMapper = indexedMappers.get(key);
-
-                if (attributeMapper != null) {
-                    if (item.get() == null) {
-                        item.set(constructNewItem());
-                    }
-
-                    attributeMapper.getUpdateItemMethod().accept(item.get(), value);
-                }
-            }
-        });
-
-        return item.get();
-    }
-
-    @Override
-    public Map<String, AttributeValue> itemToMap(T item, boolean ignoreNulls) {
-        Map<String, AttributeValue> attributeValueMap = new HashMap<>();
-
-        attributeMappers.forEach(attributeMapper -> {
-            String attributeKey = attributeMapper.getAttributeName();
-            AttributeValue attributeValue = attributeMapper.getGetAttributeMethod().apply(item);
-
-            if (!ignoreNulls || !isNullAttributeValue(attributeValue)) {
-                attributeValueMap.put(attributeKey, attributeValue);
-            }
-        });
-
-        return unmodifiableMap(attributeValueMap);
-    }
-
-    @Override
-    public Map<String, AttributeValue> itemToMap(T item, Collection<String> attributes) {
-        Map<String, AttributeValue> attributeValueMap = new HashMap<>();
-
-        attributes.forEach(key -> {
-            AttributeValue attributeValue = getAttributeValue(item, key);
-
-            if (attributeValue == null || !isNullAttributeValue(attributeValue)) {
-                attributeValueMap.put(key, attributeValue);
-            }
-        });
-
-        return unmodifiableMap(attributeValueMap);
-    }
-
-    @Override
-    public AttributeValue getAttributeValue(T item, String key) {
-        Attribute<T> attributeMapper = indexedMappers.get(key);
-
-        if (attributeMapper == null) {
-            throw new IllegalArgumentException(String.format("TableSchema does not know how to retrieve requested "
-                                                             + "attribute '%s' from mapped object.", key));
-        }
-
-        AttributeValue attributeValue = attributeMapper.getGetAttributeMethod().apply(item);
-
-        return isNullAttributeValue(attributeValue) ? null : attributeValue;
-    }
-
-    private T constructNewItem() {
-        if (newItemSupplier == null) {
-            throw new UnsupportedOperationException("An abstract TableSchema cannot be used to map a database record "
-                                                    + "to a concrete object. Add a 'newItemSupplier' to the "
-                                                    + "TableSchema to give it the ability to create mapped objects.");
-        }
-
-        return newItemSupplier.get();
-    }
-}
diff --git a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/staticmapper/TableTag.java b/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/staticmapper/TableTag.java
deleted file mode 100644
index f414c3fa213e..000000000000
--- a/services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/staticmapper/TableTag.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.extensions.dynamodb.mappingclient.staticmapper;
-
-import java.util.Map;
-
-import software.amazon.awssdk.annotations.SdkPublicApi;
-
-/**
- * Extend this class to create your own table tag that can be used with extensions.
- */
-@SdkPublicApi
-public abstract class TableTag {
-    /**
-     * Table tags are recorded in the {@link software.amazon.awssdk.extensions.dynamodb.mappingclient.TableMetadata}
-     * object as custom metadata objects with a string key and a flexible value type. This method will be called
-     * whenever this object is used to tag a table in a {@link StaticTableSchema}.
-     *
-     * @return A map of custom metadata map entries that will be added to the custom metadata stored in the
-     * {@link software.amazon.awssdk.extensions.dynamodb.mappingclient.TableMetadata} object for the table being mapped.
-     * Your extension should know what to do with these custom metadata entries.
-     */
-    protected abstract Map<String, Object> getCustomMetadata();
-
-    void setTableMetadata(StaticTableMetadata.Builder tableMetadataBuilder) {
-        getCustomMetadata().forEach(tableMetadataBuilder::addCustomMetadataObject);
-    }
-}
diff --git a/services-custom/dynamodb-enhanced/src/main/resources/software/amazon/awssdk/services/dynamodb/execution.interceptors b/services-custom/dynamodb-enhanced/src/main/resources/software/amazon/awssdk/services/dynamodb/execution.interceptors
new file mode 100644
index 000000000000..748c9df85e52
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/main/resources/software/amazon/awssdk/services/dynamodb/execution.interceptors
@@ -0,0 +1 @@
+software.amazon.awssdk.enhanced.dynamodb.internal.ApplyUserAgentInterceptor
\ No newline at end of file
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/EnhancedTypeTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/EnhancedTypeTest.java
new file mode 100644
index 000000000000..ddfb891df106
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/EnhancedTypeTest.java
@@ -0,0 +1,216 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+import java.util.Collection;
+import java.util.Deque;
+import java.util.List;
+import java.util.Map;
+import java.util.NavigableMap;
+import java.util.NavigableSet;
+import java.util.SortedMap;
+import java.util.SortedSet;
+import java.util.concurrent.ConcurrentMap;
+
+import org.junit.Test;
+
+public class EnhancedTypeTest {
+    @Test
+    public void anonymousCreationCapturesComplexTypeArguments() {
+        EnhancedType<Map<String, List<List<String>>>> enhancedType = new EnhancedType<Map<String, List<List<String>>>>(){};
+        assertThat(enhancedType.rawClass()).isEqualTo(Map.class);
+        assertThat(enhancedType.rawClassParameters().get(0).rawClass()).isEqualTo(String.class);
+        assertThat(enhancedType.rawClassParameters().get(1).rawClass()).isEqualTo(List.class);
+        assertThat(enhancedType.rawClassParameters().get(1).rawClassParameters().get(0).rawClass()).isEqualTo(List.class);
+        assertThat(enhancedType.rawClassParameters().get(1).rawClassParameters().get(0).rawClassParameters().get(0).rawClass())
+            .isEqualTo(String.class);
+    }
+
+    @Test
+    public void customTypesWork() {
+        EnhancedType<EnhancedTypeTest> enhancedType = new EnhancedType<EnhancedTypeTest>(){};
+        assertThat(enhancedType.rawClass()).isEqualTo(EnhancedTypeTest.class);
+    }
+
+    @Test
+    public void nonStaticInnerTypesWork() {
+        EnhancedType<InnerType> enhancedType = new EnhancedType<InnerType>(){};
+        assertThat(enhancedType.rawClass()).isEqualTo(InnerType.class);
+    }
+
+    @Test
+    public void staticInnerTypesWork() {
+        EnhancedType<InnerStaticType> enhancedType = new EnhancedType<InnerStaticType>(){};
+        assertThat(enhancedType.rawClass()).isEqualTo(InnerStaticType.class);
+    }
+
+    @Test
+    public <T> void genericParameterTypesDontWork() {
+        assertThatThrownBy(() -> new EnhancedType<List<T>>(){}).isInstanceOf(IllegalStateException.class);
+    }
+
+    @Test
+    public void helperCreationMethodsWork() {
+        assertThat(EnhancedType.of(String.class).rawClass()).isEqualTo(String.class);
+
+        assertThat(EnhancedType.listOf(String.class)).satisfies(v -> {
+            assertThat(v.rawClass()).isEqualTo(List.class);
+            assertThat(v.rawClassParameters()).hasSize(1);
+            assertThat(v.rawClassParameters().get(0).rawClass()).isEqualTo(String.class);
+        });
+
+        assertThat(EnhancedType.mapOf(String.class, Integer.class)).satisfies(v -> {
+            assertThat(v.rawClass()).isEqualTo(Map.class);
+            assertThat(v.rawClassParameters()).hasSize(2);
+            assertThat(v.rawClassParameters().get(0).rawClass()).isEqualTo(String.class);
+            assertThat(v.rawClassParameters().get(1).rawClass()).isEqualTo(Integer.class);
+        });
+    }
+
+    @Test
+    public void equalityIsBasedOnInnerEquality() {
+        assertThat(EnhancedType.of(String.class)).isEqualTo(EnhancedType.of(String.class));
+        assertThat(EnhancedType.of(String.class)).isNotEqualTo(EnhancedType.of(Integer.class));
+
+        assertThat(new EnhancedType<Map<String, List<String>>>(){}).isEqualTo(new EnhancedType<Map<String, List<String>>>(){});
+        assertThat(new EnhancedType<Map<String, List<String>>>(){}).isNotEqualTo(new EnhancedType<Map<String, List<Integer>>>(){});
+    }
+
+    @Test
+    public void dequeOf_ReturnsRawClassOfDeque_WhenSpecifyingClass() {
+        EnhancedType<Deque<String>> type = EnhancedType.dequeOf(String.class);
+
+        assertThat(type.rawClass()).isEqualTo(Deque.class);
+        assertThat(type.rawClassParameters()).containsExactly(EnhancedType.of(String.class));
+    }
+
+    @Test
+    public void dequeOf_ReturnsRawClassOfDeque_WhenSpecifyingEnhancedType() {
+        EnhancedType<Deque<String>> type = EnhancedType.dequeOf(EnhancedType.of(String.class));
+
+        assertThat(type.rawClass()).isEqualTo(Deque.class);
+        assertThat(type.rawClassParameters()).containsExactly(EnhancedType.of(String.class));
+    }
+
+    @Test
+    public void sortedSetOf_ReturnsRawClassOfDeque_WhenSpecifyingClass() {
+        EnhancedType<SortedSet<String>> type = EnhancedType.sortedSetOf(String.class);
+
+        assertThat(type.rawClass()).isEqualTo(SortedSet.class);
+        assertThat(type.rawClassParameters()).containsExactly(EnhancedType.of(String.class));
+    }
+
+    @Test
+    public void sortedSetOf_ReturnsRawClassOfDeque_WhenSpecifyingEnhancedType() {
+        EnhancedType<SortedSet<String>> type = EnhancedType.sortedSetOf(EnhancedType.of(String.class));
+
+        assertThat(type.rawClass()).isEqualTo(SortedSet.class);
+        assertThat(type.rawClassParameters()).containsExactly(EnhancedType.of(String.class));
+    }
+
+    @Test
+    public void navigableSetOf_ReturnsRawClassOfNavigableSet_WhenSpecifyingClass() {
+        EnhancedType<NavigableSet<String>> type = EnhancedType.navigableSetOf(String.class);
+
+        assertThat(type.rawClass()).isEqualTo(NavigableSet.class);
+        assertThat(type.rawClassParameters()).containsExactly(EnhancedType.of(String.class));
+    }
+
+    @Test
+    public void navigableSetOf_ReturnsRawClassOfNavigableSet_WhenSpecifyingEnhancedType() {
+        EnhancedType<NavigableSet<String>> type = EnhancedType.navigableSetOf(EnhancedType.of(String.class));
+
+        assertThat(type.rawClass()).isEqualTo(NavigableSet.class);
+        assertThat(type.rawClassParameters()).containsExactly(EnhancedType.of(String.class));
+    }
+
+
+    @Test
+    public void collectionOf_ReturnsRawClassOfCollection_WhenSpecifyingClass() {
+        EnhancedType<Collection<String>> type = EnhancedType.collectionOf(String.class);
+
+        assertThat(type.rawClass()).isEqualTo(Collection.class);
+        assertThat(type.rawClassParameters()).containsExactly(EnhancedType.of(String.class));
+    }
+
+    @Test
+    public void collectionOf_ReturnsRawClassOfCollection_WhenSpecifyingEnhancedType() {
+        EnhancedType<Collection<String>> type = EnhancedType.collectionOf(EnhancedType.of(String.class));
+
+        assertThat(type.rawClass()).isEqualTo(Collection.class);
+        assertThat(type.rawClassParameters()).containsExactly(EnhancedType.of(String.class));
+    }
+
+    @Test
+    public void sortedMapOf_ReturnsRawClassOfSortedMap_WhenSpecifyingClass() {
+        EnhancedType<SortedMap<String, Integer>> type = EnhancedType.sortedMapOf(String.class, Integer.class);
+
+        assertThat(type.rawClass()).isEqualTo(SortedMap.class);
+        assertThat(type.rawClassParameters()).containsExactly(EnhancedType.of(String.class), EnhancedType.of(Integer.class));
+    }
+
+    @Test
+    public void sortedMapOf_ReturnsRawClassOfSortedMap_WhenSpecifyingEnhancedType() {
+        EnhancedType<SortedMap<String, Integer>> type =
+            EnhancedType.sortedMapOf(EnhancedType.of(String.class), EnhancedType.of(Integer.class));
+
+        assertThat(type.rawClass()).isEqualTo(SortedMap.class);
+        assertThat(type.rawClassParameters()).containsExactly(EnhancedType.of(String.class), EnhancedType.of(Integer.class));
+    }
+
+    @Test
+    public void concurrentMapOf_ReturnsRawClassOfConcurrentMap_WhenSpecifyingClass() {
+        EnhancedType<ConcurrentMap<String, Integer>> type = EnhancedType.concurrentMapOf(String.class, Integer.class);
+
+        assertThat(type.rawClass()).isEqualTo(ConcurrentMap.class);
+        assertThat(type.rawClassParameters()).containsExactly(EnhancedType.of(String.class), EnhancedType.of(Integer.class));
+    }
+
+    @Test
+    public void concurrentMapOf_ReturnsRawClassOfConcurrentMap_WhenSpecifyingEnhancedType() {
+        EnhancedType<ConcurrentMap<String, Integer>> type =
+            EnhancedType.concurrentMapOf(EnhancedType.of(String.class), EnhancedType.of(Integer.class));
+
+        assertThat(type.rawClass()).isEqualTo(ConcurrentMap.class);
+        assertThat(type.rawClassParameters()).containsExactly(EnhancedType.of(String.class), EnhancedType.of(Integer.class));
+    }
+
+    @Test
+    public void navigableMapOf_ReturnsRawClassOfNavigableMap_WhenSpecifyingClass() {
+        EnhancedType<NavigableMap<String, Integer>> type = EnhancedType.navigableMapOf(String.class, Integer.class);
+
+        assertThat(type.rawClass()).isEqualTo(NavigableMap.class);
+        assertThat(type.rawClassParameters()).containsExactly(EnhancedType.of(String.class), EnhancedType.of(Integer.class));
+    }
+
+    @Test
+    public void navigableMapOf_ReturnsRawClassOfNavigableMap_WhenSpecifyingEnhancedType() {
+        EnhancedType<NavigableMap<String, Integer>> type =
+            EnhancedType.navigableMapOf(EnhancedType.of(String.class), EnhancedType.of(Integer.class));
+
+        assertThat(type.rawClass()).isEqualTo(NavigableMap.class);
+        assertThat(type.rawClassParameters()).containsExactly(EnhancedType.of(String.class), EnhancedType.of(Integer.class));
+    }
+
+    public class InnerType {
+    }
+
+    public static class InnerStaticType {
+    }
+}
\ No newline at end of file
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/ExpressionTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/ExpressionTest.java
new file mode 100644
index 000000000000..66efd6d08f78
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/ExpressionTest.java
@@ -0,0 +1,116 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb;
+
+import static org.hamcrest.Matchers.hasEntry;
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertThat;
+
+import java.util.HashMap;
+import java.util.Map;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.EnhancedAttributeValue;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+
+public class ExpressionTest {
+    @Rule
+    public ExpectedException exception = ExpectedException.none();
+
+    @Test
+    public void join_correctlyWrapsExpressions() {
+        Expression expression1 = Expression.builder().expression("one").build();
+        Expression expression2 = Expression.builder().expression("two").build();
+        Expression expression3 = Expression.builder().expression("three").build();
+
+        Expression coalescedExpression = Expression.join(Expression.join(expression1, expression2, " AND "),
+                                                         expression3, " AND ");
+
+        String expectedExpression = "((one) AND (two)) AND (three)";
+        assertThat(coalescedExpression.expression(), is(expectedExpression));
+    }
+
+    @Test
+    public void joinExpressions_correctlyJoins() {
+        String result = Expression.joinExpressions("one", "two", " AND ");
+        assertThat(result, is("(one) AND (two)"));
+    }
+
+    @Test
+    public void joinNames_correctlyJoins() {
+        Map<String, String> names1 = new HashMap<>();
+        names1.put("one", "1");
+        names1.put("two", "2");
+        Map<String, String> names2 = new HashMap<>();
+        names2.put("three", "3");
+        names2.put("four", "4");
+
+        Map<String, String> result = Expression.joinNames(names1, names2);
+
+        assertThat(result.size(), is(4));
+        assertThat(result, hasEntry("one", "1"));
+        assertThat(result, hasEntry("two", "2"));
+        assertThat(result, hasEntry("three", "3"));
+        assertThat(result, hasEntry("four", "4"));
+    }
+
+    @Test
+    public void joinNames_conflictingKey() {
+        Map<String, String> names1 = new HashMap<>();
+        names1.put("one", "1");
+        names1.put("two", "2");
+        Map<String, String> names2 = new HashMap<>();
+        names2.put("three", "3");
+        names2.put("two", "4");
+
+        exception.expect(IllegalArgumentException.class);
+        exception.expectMessage("two");
+        Expression.joinNames(names1, names2);
+    }
+
+    @Test
+    public void joinValues_correctlyJoins() {
+        Map<String, AttributeValue> values1 = new HashMap<>();
+        values1.put("one", EnhancedAttributeValue.fromString("1").toAttributeValue());
+        values1.put("two", EnhancedAttributeValue.fromString("2").toAttributeValue());
+        Map<String, AttributeValue> values2 = new HashMap<>();
+        values2.put("three", EnhancedAttributeValue.fromString("3").toAttributeValue());
+        values2.put("four", EnhancedAttributeValue.fromString("4").toAttributeValue());
+
+        Map<String, AttributeValue> result = Expression.joinValues(values1, values2);
+
+        assertThat(result.size(), is(4));
+        assertThat(result, hasEntry("one", EnhancedAttributeValue.fromString("1").toAttributeValue()));
+        assertThat(result, hasEntry("two", EnhancedAttributeValue.fromString("2").toAttributeValue()));
+        assertThat(result, hasEntry("three", EnhancedAttributeValue.fromString("3").toAttributeValue()));
+        assertThat(result, hasEntry("four", EnhancedAttributeValue.fromString("4").toAttributeValue()));
+    }
+
+    @Test
+    public void joinValues_conflictingKey() {
+        Map<String, AttributeValue> values1 = new HashMap<>();
+        values1.put("one", EnhancedAttributeValue.fromString("1").toAttributeValue());
+        values1.put("two", EnhancedAttributeValue.fromString("2").toAttributeValue());
+        Map<String, AttributeValue> values2 = new HashMap<>();
+        values2.put("three", EnhancedAttributeValue.fromString("3").toAttributeValue());
+        values2.put("two", EnhancedAttributeValue.fromString("4").toAttributeValue());
+
+        exception.expect(IllegalArgumentException.class);
+        exception.expectMessage("two");
+        Expression.joinValues(values1, values2);
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/KeyTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/KeyTest.java
new file mode 100644
index 000000000000..885302926417
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/KeyTest.java
@@ -0,0 +1,131 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb;
+
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.is;
+
+import java.nio.charset.StandardCharsets;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+import org.junit.Test;
+import software.amazon.awssdk.core.SdkBytes;
+import software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.FakeItemWithIndices;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+
+public class KeyTest {
+    private final Key key = Key.builder().partitionValue("id123").sortValue("id456").build();
+    private final Key partitionOnlyKey = Key.builder().partitionValue("id123").build();
+
+    @Test
+    public void getKeyMap() {
+        Map<String, AttributeValue> expectedResult = new HashMap<>();
+        expectedResult.put("gsi_id", AttributeValue.builder().s("id123").build());
+        expectedResult.put("gsi_sort", AttributeValue.builder().s("id456").build());
+        assertThat(key.keyMap(FakeItemWithIndices.getTableSchema(), "gsi_1"), is(expectedResult));
+    }
+
+    @Test
+    public void getPrimaryKeyMap() {
+        Map<String, AttributeValue> expectedResult = new HashMap<>();
+        expectedResult.put("id", AttributeValue.builder().s("id123").build());
+        expectedResult.put("sort", AttributeValue.builder().s("id456").build());
+        assertThat(key.primaryKeyMap(FakeItemWithIndices.getTableSchema()), is(expectedResult));
+    }
+
+    @Test
+    public void getPartitionKeyValue() {
+        assertThat(key.partitionKeyValue(),
+                   is(AttributeValue.builder().s("id123").build()));
+    }
+
+    @Test
+    public void getSortKeyValue() {
+        assertThat(key.sortKeyValue(), is(Optional.of(AttributeValue.builder().s("id456").build())));
+    }
+
+    @Test
+    public void getKeyMap_partitionOnly() {
+        Map<String, AttributeValue> expectedResult = new HashMap<>();
+        expectedResult.put("gsi_id", AttributeValue.builder().s("id123").build());
+        assertThat(partitionOnlyKey.keyMap(FakeItemWithIndices.getTableSchema(), "gsi_1"), is(expectedResult));
+    }
+
+    @Test
+    public void getPrimaryKeyMap_partitionOnly() {
+        Map<String, AttributeValue> expectedResult = new HashMap<>();
+        expectedResult.put("id", AttributeValue.builder().s("id123").build());
+        assertThat(partitionOnlyKey.primaryKeyMap(FakeItemWithIndices.getTableSchema()), is(expectedResult));
+    }
+
+    @Test
+    public void getPartitionKeyValue_partitionOnly() {
+        assertThat(partitionOnlyKey.partitionKeyValue(),
+                   is(AttributeValue.builder().s("id123").build()));
+    }
+
+    @Test
+    public void getSortKeyValue_partitionOnly() {
+        assertThat(partitionOnlyKey.sortKeyValue(), is(Optional.empty()));
+    }
+
+    @Test
+    public void numericKeys_convertsToCorrectAttributeValue() {
+        Key key = Key.builder().partitionValue(123).sortValue(45.6).build();
+
+        assertThat(key.partitionKeyValue(), is(AttributeValue.builder().n("123").build()));
+        assertThat(key.sortKeyValue(), is(Optional.of(AttributeValue.builder().n("45.6").build())));
+    }
+
+    @Test
+    public void stringKeys_convertsToCorrectAttributeValue() {
+        Key key = Key.builder().partitionValue("one").sortValue("two").build();
+
+        assertThat(key.partitionKeyValue(), is(AttributeValue.builder().s("one").build()));
+        assertThat(key.sortKeyValue(), is(Optional.of(AttributeValue.builder().s("two").build())));
+    }
+
+    @Test
+    public void binaryKeys_convertsToCorrectAttributeValue() {
+        SdkBytes partition = SdkBytes.fromString("one", StandardCharsets.UTF_8);
+        SdkBytes sort = SdkBytes.fromString("two", StandardCharsets.UTF_8);
+
+        Key key = Key.builder().partitionValue(partition).sortValue(sort).build();
+
+        assertThat(key.partitionKeyValue(), is(AttributeValue.builder().b(partition).build()));
+        assertThat(key.sortKeyValue(), is(Optional.of(AttributeValue.builder().b(sort).build())));
+    }
+
+    @Test
+    public void toBuilder() {
+        Key keyClone = key.toBuilder().build();
+
+        assertThat(key, is(equalTo(keyClone)));
+    }
+
+    @Test
+    public void nullPartitionKey_shouldThrowException() {
+        AttributeValue attributeValue = null;
+        assertThatThrownBy(() ->  Key.builder().partitionValue(attributeValue).build())
+         .isInstanceOf(IllegalArgumentException.class).hasMessageContaining("partitionValue should not be null");
+
+        assertThatThrownBy(() ->  Key.builder().partitionValue(AttributeValue.builder().nul(true).build()).build())
+            .isInstanceOf(IllegalArgumentException.class).hasMessageContaining("partitionValue should not be null");
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/TableSchemaTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/TableSchemaTest.java
new file mode 100644
index 000000000000..51de1003ad0f
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/TableSchemaTest.java
@@ -0,0 +1,39 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.junit.Test;
+import software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.FakeItem;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.BeanTableSchema;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.StaticTableSchema;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.testbeans.SimpleBean;
+
+public class TableSchemaTest {
+
+    @Test
+    public void builder_constructsStaticTableSchemaBuilder() {
+        StaticTableSchema.Builder<FakeItem> builder = TableSchema.builder(FakeItem.class);
+        assertThat(builder).isNotNull();
+    }
+
+    @Test
+    public void fromBean_constructsBeanTableSchema() {
+        BeanTableSchema<SimpleBean> beanBeanTableSchema = TableSchema.fromBean(SimpleBean.class);
+        assertThat(beanBeanTableSchema).isNotNull();
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/converters/TypeConvertingVisitorTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/converters/TypeConvertingVisitorTest.java
new file mode 100644
index 000000000000..b0aae190a287
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/converters/TypeConvertingVisitorTest.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2010-2019 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.converters;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+import java.util.Collections;
+import org.junit.Test;
+import software.amazon.awssdk.core.SdkBytes;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.TypeConvertingVisitor;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.EnhancedAttributeValue;
+
+public class TypeConvertingVisitorTest {
+    @Test
+    public void defaultConvertersThrowExceptions() {
+        assertThat(DefaultVisitor.INSTANCE.convert(EnhancedAttributeValue.nullValue())).isEqualTo(null);
+
+        assertDefaultConversionFails(EnhancedAttributeValue.fromString("foo"));
+        assertDefaultConversionFails(EnhancedAttributeValue.fromNumber("1"));
+        assertDefaultConversionFails(EnhancedAttributeValue.fromBoolean(true));
+        assertDefaultConversionFails(EnhancedAttributeValue.fromBytes(SdkBytes.fromUtf8String("")));
+        assertDefaultConversionFails(EnhancedAttributeValue.fromSetOfStrings(Collections.emptyList()));
+        assertDefaultConversionFails(EnhancedAttributeValue.fromSetOfNumbers(Collections.emptyList()));
+        assertDefaultConversionFails(EnhancedAttributeValue.fromSetOfBytes(Collections.emptyList()));
+        assertDefaultConversionFails(EnhancedAttributeValue.fromListOfAttributeValues(Collections.emptyList()));
+        assertDefaultConversionFails(EnhancedAttributeValue.fromMap(Collections.emptyMap()));
+    }
+
+    private void assertDefaultConversionFails(EnhancedAttributeValue attributeValue) {
+        assertThatThrownBy(() -> DefaultVisitor.INSTANCE.convert(attributeValue)).isInstanceOf(IllegalStateException.class);
+    }
+
+
+    private static class DefaultVisitor extends TypeConvertingVisitor<Void> {
+        private static final DefaultVisitor INSTANCE = new DefaultVisitor();
+
+        protected DefaultVisitor() {
+            super(Void.class);
+        }
+    }
+
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/converters/attribute/BinaryAttributeConvertersTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/converters/attribute/BinaryAttributeConvertersTest.java
new file mode 100644
index 000000000000..82cf07310e0d
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/converters/attribute/BinaryAttributeConvertersTest.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2010-2019 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.converters.attribute;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static software.amazon.awssdk.enhanced.dynamodb.converters.attribute.ConverterTestUtils.transformFrom;
+import static software.amazon.awssdk.enhanced.dynamodb.converters.attribute.ConverterTestUtils.transformTo;
+
+import java.util.Set;
+import org.junit.Test;
+import software.amazon.awssdk.core.SdkBytes;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeValueType;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.ByteArrayAttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.EnhancedAttributeValue;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.SdkBytesAttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.SetAttributeConverter;
+
+public class BinaryAttributeConvertersTest {
+    @Test
+    public void byteArrayAttributeConverterBehaves() {
+        ByteArrayAttributeConverter converter = ByteArrayAttributeConverter.create();
+
+        byte[] emptyBytes = new byte[0];
+        byte[] bytes = "foo".getBytes();
+
+        assertThat(transformFrom(converter, bytes).b().asByteArray()).isEqualTo(bytes);
+        assertThat(transformFrom(converter, emptyBytes).b().asByteArray()).isEqualTo(emptyBytes);
+
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromBytes(SdkBytes.fromUtf8String("foo")).toAttributeValue())).isEqualTo(bytes);
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromBytes(SdkBytes.fromUtf8String("")).toAttributeValue())).isEqualTo(emptyBytes);
+    }
+
+    @Test
+    public void sdkBytesAttributeConverterBehaves() {
+        SdkBytesAttributeConverter converter = SdkBytesAttributeConverter.create();
+        SdkBytes bytes = SdkBytes.fromUtf8String("");
+        assertThat(transformFrom(converter, bytes).b()).isSameAs(bytes);
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromBytes(bytes).toAttributeValue())).isSameAs(bytes);
+    }
+
+    @Test
+    public void sdkBytesSetAttributeConverter_ReturnsBSType() {
+        SetAttributeConverter<Set<SdkBytes>> bytesSet = SetAttributeConverter.setConverter(SdkBytesAttributeConverter.create());
+        assertThat(bytesSet.attributeValueType()).isEqualTo(AttributeValueType.BS);
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/converters/attribute/BooleanAttributeConvertersTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/converters/attribute/BooleanAttributeConvertersTest.java
new file mode 100644
index 000000000000..4582f1454bc4
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/converters/attribute/BooleanAttributeConvertersTest.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2010-2019 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.converters.attribute;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static software.amazon.awssdk.enhanced.dynamodb.converters.attribute.ConverterTestUtils.assertFails;
+import static software.amazon.awssdk.enhanced.dynamodb.converters.attribute.ConverterTestUtils.transformFrom;
+import static software.amazon.awssdk.enhanced.dynamodb.converters.attribute.ConverterTestUtils.transformTo;
+
+import java.util.concurrent.atomic.AtomicBoolean;
+import org.junit.Test;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.AtomicBooleanAttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.BooleanAttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.EnhancedAttributeValue;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.SetAttributeConverter;
+
+public class BooleanAttributeConvertersTest {
+    @Test
+    public void atomicBooleanAttributeConverterBehaves() {
+        AtomicBooleanAttributeConverter converter = AtomicBooleanAttributeConverter.create();
+        assertThat(transformFrom(converter, new AtomicBoolean(true)).bool()).isEqualTo(true);
+        assertThat(transformFrom(converter, new AtomicBoolean(false)).bool()).isEqualTo(false);
+
+        assertFails(() -> transformTo(converter, EnhancedAttributeValue.fromString("FALSE").toAttributeValue()));
+        assertFails(() -> transformTo(converter, EnhancedAttributeValue.fromString("TRUE").toAttributeValue()));
+        assertFails(() -> transformTo(converter, EnhancedAttributeValue.fromString("0").toAttributeValue()));
+        assertFails(() -> transformTo(converter, EnhancedAttributeValue.fromString("1").toAttributeValue()));
+        assertFails(() -> transformTo(converter, EnhancedAttributeValue.fromString("").toAttributeValue()));
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromString("true").toAttributeValue())).isTrue();
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromString("false").toAttributeValue())).isFalse();
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromBoolean(true).toAttributeValue())).isTrue();
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromBoolean(false).toAttributeValue())).isFalse();
+    }
+
+    @Test
+    public void booleanAttributeConverterBehaves() {
+        BooleanAttributeConverter converter = BooleanAttributeConverter.create();
+
+        assertThat(transformFrom(converter, true).bool()).isEqualTo(true);
+        assertThat(transformFrom(converter, false).bool()).isEqualTo(false);
+
+        assertFails(() -> transformTo(converter, EnhancedAttributeValue.fromString("FALSE").toAttributeValue()));
+        assertFails(() -> transformTo(converter, EnhancedAttributeValue.fromString("TRUE").toAttributeValue()));
+        assertFails(() -> transformTo(converter, EnhancedAttributeValue.fromString("0").toAttributeValue()));
+        assertFails(() -> transformTo(converter, EnhancedAttributeValue.fromString("1").toAttributeValue()));
+        assertFails(() -> transformTo(converter, EnhancedAttributeValue.fromString("").toAttributeValue()));
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromString("true").toAttributeValue())).isTrue();
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromString("false").toAttributeValue())).isFalse();
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromBoolean(true).toAttributeValue())).isTrue();
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromBoolean(false).toAttributeValue())).isFalse();
+    }
+
+    @Test
+    public void setOfBooleanAttributeConverter_ThrowsIllegalArgumentException() {
+        assertThatThrownBy(() -> SetAttributeConverter.setConverter(BooleanAttributeConverter.create()))
+            .isInstanceOf(IllegalArgumentException.class)
+            .hasMessageContaining("SetAttributeConverter cannot be created")
+            .hasMessageContaining("Boolean");
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/converters/attribute/ConverterTestUtils.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/converters/attribute/ConverterTestUtils.java
new file mode 100644
index 000000000000..73aa03deb99e
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/converters/attribute/ConverterTestUtils.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2010-2019 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.converters.attribute;
+
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+import org.assertj.core.api.ThrowableAssert;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.EnhancedAttributeValue;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+
+
+public final class ConverterTestUtils {
+    private ConverterTestUtils() {}
+
+    public static <T> AttributeValue transformFrom(AttributeConverter<T> converter, T value) {
+        return converter.transformFrom(value);
+    }
+
+    public static <T> T transformTo(AttributeConverter<T> converter, AttributeValue value) {
+        return converter.transformTo(value);
+    }
+
+    public static <T> T transformTo(AttributeConverter<T> converter, EnhancedAttributeValue value) {
+        return converter.transformTo(value.toAttributeValue());
+    }
+
+    public static void assertFails(ThrowableAssert.ThrowingCallable shouldRaiseThrowable) {
+        assertThatThrownBy(shouldRaiseThrowable).isInstanceOf(IllegalArgumentException.class);
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/converters/attribute/EnhancedAttributeValueTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/converters/attribute/EnhancedAttributeValueTest.java
new file mode 100644
index 000000000000..07f669b96a8c
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/converters/attribute/EnhancedAttributeValueTest.java
@@ -0,0 +1,174 @@
+/*
+ * Copyright 2010-2019 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.converters.attribute;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+import java.util.Arrays;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import org.junit.Test;
+import software.amazon.awssdk.core.SdkBytes;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeValueType;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.EnhancedAttributeValue;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+
+public class EnhancedAttributeValueTest {
+    @Test
+    public void simpleFromMethodsCreateCorrectTypes() {
+        assertThat(EnhancedAttributeValue.nullValue()).satisfies(v -> {
+            assertThat(v.isNull()).isTrue();
+            assertThat(v.type()).isEqualTo(AttributeValueType.NULL);
+        });
+
+        assertThat(EnhancedAttributeValue.fromString("foo")).satisfies(v -> {
+            assertThat(v.isString()).isTrue();
+            assertThat(v.asString()).isEqualTo("foo");
+            assertThat(v.type()).isEqualTo(AttributeValueType.S);
+        });
+
+        assertThat(EnhancedAttributeValue.fromNumber("1")).satisfies(v -> {
+            assertThat(v.isNumber()).isTrue();
+            assertThat(v.asNumber()).isEqualTo("1");
+            assertThat(v.type()).isEqualTo(AttributeValueType.N);
+        });
+
+        assertThat(EnhancedAttributeValue.fromBoolean(true)).satisfies(v -> {
+            assertThat(v.isBoolean()).isTrue();
+            assertThat(v.asBoolean()).isEqualTo(true);
+            assertThat(v.type()).isEqualTo(AttributeValueType.BOOL);
+        });
+
+        assertThat(EnhancedAttributeValue.fromBytes(SdkBytes.fromUtf8String("foo"))).satisfies(v -> {
+            assertThat(v.isBytes()).isTrue();
+            assertThat(v.asBytes().asUtf8String()).isEqualTo("foo");
+            assertThat(v.type()).isEqualTo(AttributeValueType.B);
+        });
+
+        assertThat(EnhancedAttributeValue.fromSetOfStrings(Arrays.asList("a", "b"))).satisfies(v -> {
+            assertThat(v.isSetOfStrings()).isTrue();
+            assertThat(v.asSetOfStrings()).containsExactly("a", "b");
+            assertThat(v.type()).isEqualTo(AttributeValueType.SS);
+        });
+
+        assertThat(EnhancedAttributeValue.fromSetOfNumbers(Arrays.asList("1", "2"))).satisfies(v -> {
+            assertThat(v.isSetOfNumbers()).isTrue();
+            assertThat(v.asSetOfNumbers()).containsExactly("1", "2");
+            assertThat(v.type()).isEqualTo(AttributeValueType.NS);
+        });
+
+        assertThat(EnhancedAttributeValue.fromSetOfBytes(Arrays.asList(SdkBytes.fromUtf8String("foo"),
+                                                                   SdkBytes.fromUtf8String("foo2")))).satisfies(v -> {
+            assertThat(v.isSetOfBytes()).isTrue();
+            assertThat(v.asSetOfBytes().get(0).asUtf8String()).isEqualTo("foo");
+            assertThat(v.asSetOfBytes().get(1).asUtf8String()).isEqualTo("foo2");
+            assertThat(v.type()).isEqualTo(AttributeValueType.BS);
+        });
+
+        assertThat(EnhancedAttributeValue.fromListOfAttributeValues(Arrays.asList(AttributeValue.builder().s("foo").build(),
+                                                                                  AttributeValue.builder().bool(true).build()))).satisfies(v -> {
+            assertThat(v.isListOfAttributeValues()).isTrue();
+            assertThat(v.asListOfAttributeValues().get(0).s()).isEqualTo("foo");
+            assertThat(v.asListOfAttributeValues().get(1).bool()).isEqualTo(true);
+            assertThat(v.type()).isEqualTo(AttributeValueType.L);
+        });
+
+        Map<String, AttributeValue> map = new LinkedHashMap<>();
+        map.put("a", AttributeValue.builder().s("foo").build());
+        map.put("b", AttributeValue.builder().bool(true).build());
+        assertThat(EnhancedAttributeValue.fromMap(map)).satisfies(v -> {
+            assertThat(v.isMap()).isTrue();
+            assertThat(v.asMap().get("a").s()).isEqualTo("foo");
+            assertThat(v.asMap().get("b").bool()).isEqualTo(true);
+            assertThat(v.type()).isEqualTo(AttributeValueType.M);
+        });
+    }
+
+    @Test
+    public void fromGeneratedTypeMethodsCreateCorrectType() {
+        assertThat(EnhancedAttributeValue.fromAttributeValue(AttributeValue.builder().nul(true).build()))
+                .isEqualTo(EnhancedAttributeValue.nullValue());
+
+        assertThat(EnhancedAttributeValue.fromAttributeValue(AttributeValue.builder().s("foo").build()))
+                .isEqualTo(EnhancedAttributeValue.fromString("foo"));
+
+        assertThat(EnhancedAttributeValue.fromAttributeValue(AttributeValue.builder().n("1").build()))
+                .isEqualTo(EnhancedAttributeValue.fromNumber("1"));
+
+        assertThat(EnhancedAttributeValue.fromAttributeValue(AttributeValue.builder().bool(true).build()))
+                .isEqualTo(EnhancedAttributeValue.fromBoolean(true));
+
+        assertThat(EnhancedAttributeValue.fromAttributeValue(AttributeValue.builder().b(SdkBytes.fromUtf8String("foo")).build()))
+                .isEqualTo(EnhancedAttributeValue.fromBytes(SdkBytes.fromUtf8String("foo")));
+
+        assertThat(EnhancedAttributeValue.fromAttributeValue(AttributeValue.builder().ss(Arrays.asList("foo", "bar")).build()))
+                .isEqualTo(EnhancedAttributeValue.fromSetOfStrings(Arrays.asList("foo", "bar")));
+
+        assertThat(EnhancedAttributeValue.fromAttributeValue(AttributeValue.builder().ns(Arrays.asList("1", "2")).build()))
+                .isEqualTo(EnhancedAttributeValue.fromSetOfNumbers(Arrays.asList("1", "2")));
+
+        assertThat(EnhancedAttributeValue.fromAttributeValue(AttributeValue.builder()
+                                                                           .bs(Arrays.asList(SdkBytes.fromUtf8String("foo"),
+                                                                                             SdkBytes.fromUtf8String("foo2")))
+                                                                           .build()))
+                .isEqualTo(EnhancedAttributeValue.fromSetOfBytes(Arrays.asList(SdkBytes.fromUtf8String("foo"),
+                                                                           SdkBytes.fromUtf8String("foo2"))));
+
+        List<AttributeValue> list = Arrays.asList(AttributeValue.builder().s("foo").build(),
+                                                  AttributeValue.builder().n("1").build());
+        assertThat(EnhancedAttributeValue.fromAttributeValue(AttributeValue.builder().l(list).build()))
+                .isEqualTo(EnhancedAttributeValue.fromListOfAttributeValues(list));
+
+        Map<String, AttributeValue> map = new LinkedHashMap<>();
+        map.put("foo", AttributeValue.builder().s("foo").build());
+        map.put("bar", AttributeValue.builder().n("1").build());
+
+        assertThat(EnhancedAttributeValue.fromAttributeValue(AttributeValue.builder().m(map).build()))
+                .isEqualTo(EnhancedAttributeValue.fromMap(map));
+    }
+
+    @Test
+    public void emptyAttributeValuesCannotBeConverted() {
+        assertThatThrownBy(() -> EnhancedAttributeValue.fromAttributeValue(AttributeValue.builder().build()))
+                .isInstanceOf(IllegalStateException.class);
+    }
+
+    @Test
+    public void conversionToGeneratedIsCorrect() {
+        List<String> strings = Arrays.asList("foo", "bar");
+        List<SdkBytes> bytes = Arrays.asList(SdkBytes.fromUtf8String("foo"), SdkBytes.fromUtf8String("bar"));
+
+        List<AttributeValue> attributes = Arrays.asList(AttributeValue.builder().s("foo").build(), AttributeValue.builder().n("1").build());
+
+        Map<String, AttributeValue> attributeMap = new LinkedHashMap<>();
+        attributeMap.put("foo", AttributeValue.builder().s("foo").build());
+        attributeMap.put("bar", AttributeValue.builder().n("1").build());
+
+        assertThat(EnhancedAttributeValue.nullValue().toAttributeValue().nul()).isEqualTo(true);
+        assertThat(EnhancedAttributeValue.fromString("foo").toAttributeValue().s()).isEqualTo("foo");
+        assertThat(EnhancedAttributeValue.fromNumber("1").toAttributeValue().n()).isEqualTo("1");
+        assertThat(EnhancedAttributeValue.fromBoolean(false).toAttributeValue().bool()).isEqualTo(false);
+        assertThat(EnhancedAttributeValue.fromBytes(SdkBytes.fromUtf8String("foo")).toAttributeValue().b().asUtf8String()).isEqualTo("foo");
+        assertThat(EnhancedAttributeValue.fromSetOfStrings(strings).toAttributeValue().ss()).isEqualTo(strings);
+        assertThat(EnhancedAttributeValue.fromSetOfNumbers(strings).toAttributeValue().ns()).isEqualTo(strings);
+        assertThat(EnhancedAttributeValue.fromSetOfBytes(bytes).toAttributeValue().bs()).isEqualTo(bytes);
+        assertThat(EnhancedAttributeValue.fromListOfAttributeValues(attributes).toAttributeValue().l()).isEqualTo(attributes);
+        assertThat(EnhancedAttributeValue.fromMap(attributeMap).toAttributeValue().m()).isEqualTo(attributeMap);
+        assertThat(EnhancedAttributeValue.fromMap(attributeMap).toAttributeValueMap()).isEqualTo(attributeMap);
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/converters/attribute/GlobalDateTimeAttributeConvertersTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/converters/attribute/GlobalDateTimeAttributeConvertersTest.java
new file mode 100644
index 000000000000..da0eee8e512c
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/converters/attribute/GlobalDateTimeAttributeConvertersTest.java
@@ -0,0 +1,186 @@
+/*
+ * Copyright 2010-2019 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.converters.attribute;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static software.amazon.awssdk.enhanced.dynamodb.converters.attribute.ConverterTestUtils.assertFails;
+import static software.amazon.awssdk.enhanced.dynamodb.converters.attribute.ConverterTestUtils.transformFrom;
+import static software.amazon.awssdk.enhanced.dynamodb.converters.attribute.ConverterTestUtils.transformTo;
+
+import java.time.Instant;
+import java.time.OffsetDateTime;
+import java.time.ZoneId;
+import java.time.ZoneOffset;
+import java.time.ZonedDateTime;
+import java.time.temporal.ChronoUnit;
+import org.junit.Test;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.EnhancedAttributeValue;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.InstantAsIntegerAttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.InstantAsStringAttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.OffsetDateTimeAsStringAttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.ZonedDateTimeAsStringAttributeConverter;
+
+public class GlobalDateTimeAttributeConvertersTest {
+    @Test
+    public void instantAsIntegerAttributeConverterBehaves() {
+        InstantAsIntegerAttributeConverter converter = InstantAsIntegerAttributeConverter.create();
+
+        assertThat(transformFrom(converter, Instant.MIN).n()).isEqualTo("-31557014167219200");
+        assertThat(transformFrom(converter, Instant.EPOCH.minusMillis(1)).n()).isEqualTo("-0.001");
+        assertThat(transformFrom(converter, Instant.EPOCH).n()).isEqualTo("0");
+        assertThat(transformFrom(converter, Instant.EPOCH.plusMillis(1)).n()).isEqualTo("0.001");
+        assertThat(transformFrom(converter, Instant.MAX).n()).isEqualTo("31556889864403199.999999999");
+
+        assertFails(() -> transformTo(converter, EnhancedAttributeValue.fromNumber("-31557014167219201")));
+        assertFails(() -> transformTo(converter, EnhancedAttributeValue.fromNumber("0.0000000000")));
+        assertFails(() -> transformTo(converter, EnhancedAttributeValue.fromNumber("31556889864403200")));
+
+        // InstantAsIntegerAttributeConverter format
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromNumber("-31557014167219200"))).isEqualTo(Instant.MIN);
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromNumber("-0.001"))).isEqualTo(Instant.EPOCH.minusMillis(1));
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromNumber(".0"))).isEqualTo(Instant.EPOCH);
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromNumber("0."))).isEqualTo(Instant.EPOCH);
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromNumber("0"))).isEqualTo(Instant.EPOCH);
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromNumber("0.000"))).isEqualTo(Instant.EPOCH);
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromNumber("0.001"))).isEqualTo(Instant.EPOCH.plusMillis(1));
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromNumber("31556889864403199.999999999"))).isEqualTo(Instant.MAX);
+
+        // InstantAsStringAttributeConverter format
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromString("1970-01-01T00:00:00Z"))).isEqualTo(Instant.EPOCH);
+
+        // OffsetDateTimeAsStringAttributeConverter format
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromString("1970-01-01T00:00:00+01:00")))
+                .isEqualTo(Instant.EPOCH.minus(1, ChronoUnit.HOURS));
+
+        // ZonedDateTimeAsStringAttributeConverter format
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromString("1970-01-01T01:00:00+01:00[Europe/Paris]")))
+                .isEqualTo(Instant.EPOCH);
+    }
+
+    @Test
+    public void instantAsStringAttributeConverterBehaves() {
+        InstantAsStringAttributeConverter converter = InstantAsStringAttributeConverter.create();
+
+        assertThat(transformFrom(converter, Instant.MIN).s()).isEqualTo("-1000000000-01-01T00:00:00Z");
+        assertThat(transformFrom(converter, Instant.EPOCH.minusMillis(1)).s()).isEqualTo("1969-12-31T23:59:59.999Z");
+        assertThat(transformFrom(converter, Instant.EPOCH).s()).isEqualTo("1970-01-01T00:00:00Z");
+        assertThat(transformFrom(converter, Instant.EPOCH.plusMillis(1)).s()).isEqualTo("1970-01-01T00:00:00.001Z");
+        assertThat(transformFrom(converter, Instant.MAX).s()).isEqualTo("+1000000000-12-31T23:59:59.999999999Z");
+
+        assertFails(() -> transformTo(converter, EnhancedAttributeValue.fromString("-1000000001-12-31T23:59:59.999999999Z")));
+        assertFails(() -> transformTo(converter, EnhancedAttributeValue.fromString("X")));
+        assertFails(() -> transformTo(converter, EnhancedAttributeValue.fromString("+1000000001-01-01T00:00:00Z")));
+
+        // InstantAsIntegerAttributeConverter format
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromNumber("0"))).isEqualTo(Instant.EPOCH);
+
+        // InstantAsStringAttributeConverter format
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromString("-1000000000-01-01T00:00:00Z"))).isEqualTo(Instant.MIN);
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromString("1969-12-31T23:59:59.999Z"))).isEqualTo(Instant.EPOCH.minusMillis(1));
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromString("1970-01-01T00:00:00Z"))).isEqualTo(Instant.EPOCH);
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromString("1970-01-01T00:00:00.001Z"))).isEqualTo(Instant.EPOCH.plusMillis(1));
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromString("+1000000000-12-31T23:59:59.999999999Z"))).isEqualTo(Instant.MAX);
+
+        // OffsetDateTimeAsStringAttributeConverter format
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromString("1970-01-01T00:00:00+01:00")))
+                .isEqualTo(Instant.EPOCH.minus(1, ChronoUnit.HOURS));
+
+        // ZonedDateTimeAsStringAttributeConverter format
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromString("1970-01-01T01:00:00+01:00[Europe/Paris]")))
+                .isEqualTo(Instant.EPOCH);
+    }
+
+    @Test
+    public void offsetDateTimeAsStringAttributeConverterBehaves() {
+        OffsetDateTimeAsStringAttributeConverter converter = OffsetDateTimeAsStringAttributeConverter.create();
+
+        OffsetDateTime epochUtc = Instant.EPOCH.atOffset(ZoneOffset.UTC);
+
+        assertThat(transformFrom(converter, OffsetDateTime.MIN).s()).isEqualTo("-999999999-01-01T00:00:00+18:00");
+        assertThat(transformFrom(converter, epochUtc.minusNanos(1)).s()).isEqualTo("1969-12-31T23:59:59.999999999Z");
+        assertThat(transformFrom(converter, epochUtc).s()).isEqualTo("1970-01-01T00:00:00Z");
+        assertThat(transformFrom(converter, epochUtc.plusNanos(1)).s()).isEqualTo("1970-01-01T00:00:00.000000001Z");
+        assertThat(transformFrom(converter, OffsetDateTime.MAX).s()).isEqualTo("+999999999-12-31T23:59:59.999999999-18:00");
+
+        assertFails(() -> transformTo(converter, EnhancedAttributeValue.fromString("-1000000001-12-31T23:59:59.999999999Z")));
+        assertFails(() -> transformTo(converter, EnhancedAttributeValue.fromString("X")));
+        assertFails(() -> transformTo(converter, EnhancedAttributeValue.fromString("+1000000001-01-01T00:00:00Z")));
+
+        // InstantAsIntegerAttributeConverter format
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromNumber("0"))).isEqualTo(epochUtc);
+
+        // InstantAsStringAttributeConverter format
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromString("1970-01-01T00:00:00Z"))).isEqualTo(epochUtc);
+
+        // OffsetDateTimeAsStringAttributeConverter format
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromString("1970-01-01T00:00:00+01:00")))
+                .isEqualTo(OffsetDateTime.of(1970, 1, 1, 0, 0, 0, 0, ZoneOffset.ofHours(1)));
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromString("-999999999-01-01T00:00:00+18:00")))
+                .isEqualTo(OffsetDateTime.MIN);
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromString("1969-12-31T23:59:59.999999999Z")))
+                .isEqualTo(epochUtc.minusNanos(1));
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromString("1970-01-01T00:00:00Z")))
+                .isEqualTo(epochUtc);
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromString("1970-01-01T00:00:00.000000001Z")))
+                .isEqualTo(epochUtc.plusNanos(1));
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromString("+999999999-12-31T23:59:59.999999999-18:00")))
+                .isEqualTo(OffsetDateTime.MAX);
+
+        // ZonedDateTimeAsStringAttributeConverter format
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromString("1970-01-01T01:00:00+01:00[Europe/Paris]")))
+                .isEqualTo(Instant.EPOCH.atOffset(ZoneOffset.ofHours(1)));
+    }
+
+    @Test
+    public void zonedDateTimeAsStringAttributeConverterBehaves() {
+        ZonedDateTimeAsStringAttributeConverter converter = ZonedDateTimeAsStringAttributeConverter.create();
+
+        ZonedDateTime epochUtc = Instant.EPOCH.atZone(ZoneOffset.UTC);
+        ZonedDateTime min = OffsetDateTime.MIN.toZonedDateTime();
+        ZonedDateTime max = OffsetDateTime.MAX.toZonedDateTime();
+
+        assertThat(transformFrom(converter, min).s()).isEqualTo("-999999999-01-01T00:00:00+18:00");
+        assertThat(transformFrom(converter, epochUtc.minusNanos(1)).s()).isEqualTo("1969-12-31T23:59:59.999999999Z");
+        assertThat(transformFrom(converter, epochUtc).s()).isEqualTo("1970-01-01T00:00:00Z");
+        assertThat(transformFrom(converter, Instant.EPOCH.atZone(ZoneId.of("Europe/Paris"))).s())
+                .isEqualTo("1970-01-01T01:00:00+01:00[Europe/Paris]");
+        assertThat(transformFrom(converter, epochUtc.plusNanos(1)).s()).isEqualTo("1970-01-01T00:00:00.000000001Z");
+        assertThat(transformFrom(converter, max).s()).isEqualTo("+999999999-12-31T23:59:59.999999999-18:00");
+
+        assertFails(() -> transformTo(converter, EnhancedAttributeValue.fromString("-1000000001-12-31T23:59:59.999999999Z")));
+        assertFails(() -> transformTo(converter, EnhancedAttributeValue.fromString("X")));
+        assertFails(() -> transformTo(converter, EnhancedAttributeValue.fromString("+1000000001-01-01T00:00:00Z")));
+        assertFails(() -> transformTo(converter, EnhancedAttributeValue.fromString("1970-01-01T00:00:00+01:00[FakeZone]")));
+
+        // InstantAsIntegerAttributeConverter format
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromNumber("0"))).isEqualTo(epochUtc);
+
+        // InstantAsStringAttributeConverter format
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromString("1970-01-01T00:00:00Z"))).isEqualTo(epochUtc);
+
+        // OffsetDateTimeAsStringAttributeConverter format
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromString("1970-01-01T00:00:00+01:00")))
+                .isEqualTo(epochUtc.minus(1, ChronoUnit.HOURS));
+
+        // ZonedDateTimeAsStringAttributeConverter format
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromString("-999999999-01-01T00:00:00+18:00")))
+                .isEqualTo(min);
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromString("1970-01-01T01:00:00+01:00[Europe/Paris]")))
+                .isEqualTo(Instant.EPOCH.atZone(ZoneId.of("Europe/Paris")));
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromString("+999999999-12-31T23:59:59.999999999-18:00")))
+                .isEqualTo(max);
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/converters/attribute/LocalDateTimeAttributeConvertersTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/converters/attribute/LocalDateTimeAttributeConvertersTest.java
new file mode 100644
index 000000000000..32d4c1230d06
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/converters/attribute/LocalDateTimeAttributeConvertersTest.java
@@ -0,0 +1,109 @@
+/*
+ * Copyright 2010-2019 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.converters.attribute;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static software.amazon.awssdk.enhanced.dynamodb.converters.attribute.ConverterTestUtils.assertFails;
+import static software.amazon.awssdk.enhanced.dynamodb.converters.attribute.ConverterTestUtils.transformFrom;
+import static software.amazon.awssdk.enhanced.dynamodb.converters.attribute.ConverterTestUtils.transformTo;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.MonthDay;
+import org.junit.Test;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.EnhancedAttributeValue;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.LocalDateAttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.LocalDateTimeAttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.LocalTimeAttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.MonthDayAttributeConverter;
+
+public class LocalDateTimeAttributeConvertersTest {
+    @Test
+    public void localDateAttributeConverterBehaves() {
+        LocalDateAttributeConverter converter = LocalDateAttributeConverter.create();
+
+        assertThat(transformFrom(converter, LocalDate.MIN).n()).isEqualTo("-9999999990101000000");
+        assertThat(transformFrom(converter, LocalDate.of(0, 1, 1)).n()).isEqualTo("00101000000");
+        assertThat(transformFrom(converter, LocalDate.MAX).n()).isEqualTo("9999999991231000000");
+
+        assertFails(() -> transformTo(converter, EnhancedAttributeValue.fromNumber("-99999999990101000000").toAttributeValue()));
+        assertFails(() -> transformTo(converter, EnhancedAttributeValue.fromNumber("99999999991231000000").toAttributeValue()));
+
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromNumber("-9999999990101000000").toAttributeValue()))
+                .isEqualTo(LocalDate.MIN);
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromNumber("00101000000").toAttributeValue())).isEqualTo(LocalDate.of(0, 1, 1));
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromNumber("9999999991231000000").toAttributeValue()))
+                .isEqualTo(LocalDate.MAX);
+    }
+
+    @Test
+    public void localDateTimeAttributeConverterBehaves() {
+        LocalDateTimeAttributeConverter converter = LocalDateTimeAttributeConverter.create();
+
+        assertThat(transformFrom(converter, LocalDateTime.MIN).n()).isEqualTo("-9999999990101000000");
+        assertThat(transformFrom(converter, LocalDateTime.of(0, 1, 1, 0, 0, 0, 0)).n()).isEqualTo("00101000000");
+        assertThat(transformFrom(converter, LocalDateTime.MAX).n()).isEqualTo("9999999991231235959.999999999");
+
+        assertFails(() -> transformTo(converter, EnhancedAttributeValue.fromNumber("-99999999990101000000").toAttributeValue()));
+        assertFails(() -> transformTo(converter, EnhancedAttributeValue.fromNumber("99999999991231000000").toAttributeValue()));
+        assertFails(() -> transformTo(converter, EnhancedAttributeValue.fromNumber("99999999991232000000").toAttributeValue()));
+        assertFails(() -> transformTo(converter, EnhancedAttributeValue.fromNumber("00101000000.9999999999").toAttributeValue()));
+
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromNumber("-9999999990101000000").toAttributeValue()))
+                .isEqualTo(LocalDateTime.MIN);
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromNumber("00101000000").toAttributeValue()))
+                .isEqualTo(LocalDateTime.of(0, 1, 1, 0, 0, 0, 0));
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromNumber("9999999991231235959.999999999").toAttributeValue()))
+                .isEqualTo(LocalDateTime.MAX);
+    }
+
+    @Test
+    public void localTimeAttributeConverterBehaves() {
+        LocalTimeAttributeConverter converter = LocalTimeAttributeConverter.create();
+
+        assertThat(transformFrom(converter, LocalTime.MIN).n()).isEqualTo("000000");
+        assertThat(transformFrom(converter, LocalTime.of(1, 2, 3, 4)).n()).isEqualTo("010203.000000004");
+        assertThat(transformFrom(converter, LocalTime.MAX).n()).isEqualTo("235959.999999999");
+
+        assertFails(() -> transformTo(converter, EnhancedAttributeValue.fromNumber("-1").toAttributeValue()));
+        assertFails(() -> transformTo(converter, EnhancedAttributeValue.fromNumber("240000").toAttributeValue()));
+        assertFails(() -> transformTo(converter, EnhancedAttributeValue.fromNumber("000000.9999999999").toAttributeValue()));
+
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromNumber("000000").toAttributeValue()))
+                .isEqualTo(LocalTime.MIN);
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromNumber("010203.000000004").toAttributeValue()))
+                .isEqualTo(LocalTime.of(1, 2, 3, 4));
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromNumber("235959.999999999").toAttributeValue()))
+                .isEqualTo(LocalTime.MAX);
+    }
+
+    @Test
+    public void monthDayAttributeConverterBehaves() {
+        MonthDayAttributeConverter converter = MonthDayAttributeConverter.create();
+
+        assertThat(transformFrom(converter, MonthDay.of(1, 1)).n()).isEqualTo("0101");
+        assertThat(transformFrom(converter, MonthDay.of(5, 21)).n()).isEqualTo("0521");
+        assertThat(transformFrom(converter, MonthDay.of(12, 31)).n()).isEqualTo("1231");
+
+        assertFails(() -> transformTo(converter, EnhancedAttributeValue.fromNumber("X").toAttributeValue()));
+        assertFails(() -> transformTo(converter, EnhancedAttributeValue.fromNumber("0230").toAttributeValue()));
+
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromNumber("0101").toAttributeValue())).isEqualTo(MonthDay.of(1, 1));
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromNumber("0521").toAttributeValue())).isEqualTo(MonthDay.of(5, 21));
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromNumber("1231").toAttributeValue())).isEqualTo(MonthDay.of(12, 31));
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/converters/attribute/NumberAttributeConvertersTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/converters/attribute/NumberAttributeConvertersTest.java
new file mode 100644
index 000000000000..d9ba57f5e15c
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/converters/attribute/NumberAttributeConvertersTest.java
@@ -0,0 +1,285 @@
+/*
+ * Copyright 2010-2019 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.converters.attribute;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.data.Offset.offset;
+import static software.amazon.awssdk.enhanced.dynamodb.converters.attribute.ConverterTestUtils.assertFails;
+import static software.amazon.awssdk.enhanced.dynamodb.converters.attribute.ConverterTestUtils.transformFrom;
+import static software.amazon.awssdk.enhanced.dynamodb.converters.attribute.ConverterTestUtils.transformTo;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicLong;
+import org.junit.Test;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeValueType;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.AtomicIntegerAttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.AtomicLongAttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.BigDecimalAttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.BigIntegerAttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.DoubleAttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.EnhancedAttributeValue;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.FloatAttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.IntegerAttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.LongAttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.SetAttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.ShortAttributeConverter;
+
+public class NumberAttributeConvertersTest {
+    private static String TIIIINY_NUMBER = tiiiinyNumber();
+    private static String HUUUUGE_NUMBER = huuuugeNumber();
+
+    @Test
+    public void atomicIntegerAttributeConverterBehaves() {
+        AtomicIntegerAttributeConverter converter = AtomicIntegerAttributeConverter.create();
+
+        assertThat(transformFrom(converter, new AtomicInteger(Integer.MIN_VALUE)).n())
+                .isEqualTo(Integer.toString(Integer.MIN_VALUE));
+        assertThat(transformFrom(converter, new AtomicInteger(-42)).n()).isEqualTo("-42");
+        assertThat(transformFrom(converter, new AtomicInteger(0)).n()).isEqualTo("0");
+        assertThat(transformFrom(converter, new AtomicInteger(42)).n()).isEqualTo("42");
+        assertThat(transformFrom(converter, new AtomicInteger(Integer.MAX_VALUE)).n())
+                .isEqualTo(Integer.toString(Integer.MAX_VALUE));
+
+        assertFails(() -> transformTo(converter, EnhancedAttributeValue.fromString("1.0")));
+        assertFails(() -> transformTo(converter, EnhancedAttributeValue.fromNumber("1.0")));
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromNumber(Integer.toString(Integer.MIN_VALUE))))
+                .hasValue(Integer.MIN_VALUE);
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromString("-42"))).hasValue(-42);
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromNumber("-42"))).hasValue(-42);
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromNumber("0"))).hasValue(0);
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromNumber("42"))).hasValue(42);
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromString("42"))).hasValue(42);
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromNumber(Integer.toString(Integer.MAX_VALUE))))
+                .hasValue(Integer.MAX_VALUE);
+    }
+
+    @Test
+    public void atomicLongAttributeConverterBehaves() {
+        AtomicLongAttributeConverter converter = AtomicLongAttributeConverter.create();
+
+        assertThat(transformFrom(converter, new AtomicLong(Long.MIN_VALUE)).n())
+                .isEqualTo(Long.toString(Long.MIN_VALUE));
+        assertThat(transformFrom(converter, new AtomicLong(-42)).n()).isEqualTo("-42");
+        assertThat(transformFrom(converter, new AtomicLong(0)).n()).isEqualTo("0");
+        assertThat(transformFrom(converter, new AtomicLong(42)).n()).isEqualTo("42");
+        assertThat(transformFrom(converter, new AtomicLong(Long.MAX_VALUE)).n())
+                .isEqualTo(Long.toString(Long.MAX_VALUE));
+
+        assertFails(() -> transformTo(converter, EnhancedAttributeValue.fromString("1.0")));
+        assertFails(() -> transformTo(converter, EnhancedAttributeValue.fromNumber("1.0")));
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromNumber(Long.toString(Long.MIN_VALUE))))
+                .hasValue(Long.MIN_VALUE);
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromString("-42"))).hasValue(-42);
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromNumber("-42"))).hasValue(-42);
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromNumber("0"))).hasValue(0);
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromNumber("42"))).hasValue(42);
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromString("42"))).hasValue(42);
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromNumber(Long.toString(Long.MAX_VALUE))))
+                .hasValue(Long.MAX_VALUE);
+    }
+
+    @Test
+    public void bigDecimalAttributeConverterBehaves() {
+        BigDecimalAttributeConverter converter = BigDecimalAttributeConverter.create();
+
+        assertThat(transformFrom(converter, new BigDecimal(TIIIINY_NUMBER)).n()).isEqualTo(TIIIINY_NUMBER);
+        assertThat(transformFrom(converter, new BigDecimal("43.0")).n()).isEqualTo("43.0");
+        assertThat(transformFrom(converter, new BigDecimal("-42.42")).n()).isEqualTo("-42.42");
+        assertThat(transformFrom(converter, new BigDecimal("-42")).n()).isEqualTo("-42");
+        assertThat(transformFrom(converter, new BigDecimal("0")).n()).isEqualTo("0");
+        assertThat(transformFrom(converter, new BigDecimal("42")).n()).isEqualTo("42");
+        assertThat(transformFrom(converter, new BigDecimal("42.42")).n()).isEqualTo("42.42");
+        assertThat(transformFrom(converter, new BigDecimal("43.0")).n()).isEqualTo("43.0");
+        assertThat(transformFrom(converter, new BigDecimal(HUUUUGE_NUMBER)).n()).isEqualTo(HUUUUGE_NUMBER);
+
+        assertFails(() -> transformTo(converter, EnhancedAttributeValue.fromString("X")));
+
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromNumber(TIIIINY_NUMBER)).toString()).isEqualTo(TIIIINY_NUMBER);
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromNumber("-43.0")).toString()).isEqualTo("-43.0");
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromString("-42.42")).toString()).isEqualTo("-42.42");
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromNumber("-42")).toString()).isEqualTo("-42");
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromNumber("0")).toString()).isEqualTo("0");
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromNumber("42")).toString()).isEqualTo("42");
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromString("42.42")).toString()).isEqualTo("42.42");
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromNumber("43.0")).toString()).isEqualTo("43.0");
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromNumber(HUUUUGE_NUMBER)).toString()).isEqualTo(HUUUUGE_NUMBER);
+    }
+
+    @Test
+    public void bigIntegerAttributeConverterBehaves() {
+        BigIntegerAttributeConverter converter = BigIntegerAttributeConverter.create();
+
+        assertThat(transformFrom(converter, new BigInteger(TIIIINY_NUMBER)).n()).isEqualTo(TIIIINY_NUMBER);
+        assertThat(transformFrom(converter, new BigInteger("-42")).n()).isEqualTo("-42");
+        assertThat(transformFrom(converter, new BigInteger("0")).n()).isEqualTo("0");
+        assertThat(transformFrom(converter, new BigInteger("42")).n()).isEqualTo("42");
+        assertThat(transformFrom(converter, new BigInteger(HUUUUGE_NUMBER)).n()).isEqualTo(HUUUUGE_NUMBER);
+
+        assertFails(() -> transformTo(converter, EnhancedAttributeValue.fromString("X")));
+        assertFails(() -> transformTo(converter, EnhancedAttributeValue.fromNumber("1.0")));
+
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromNumber(TIIIINY_NUMBER)).toString()).isEqualTo(TIIIINY_NUMBER);
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromString("-42")).toString()).isEqualTo("-42");
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromNumber("-42")).toString()).isEqualTo("-42");
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromNumber("0")).toString()).isEqualTo("0");
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromNumber("42")).toString()).isEqualTo("42");
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromString("42")).toString()).isEqualTo("42");
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromNumber(HUUUUGE_NUMBER)).toString()).isEqualTo(HUUUUGE_NUMBER);
+    }
+
+    @Test
+    public void floatAttributeConverterBehaves() {
+        FloatAttributeConverter converter = FloatAttributeConverter.create();
+
+        assertFails(() -> transformFrom(converter, Float.NEGATIVE_INFINITY));
+        assertFails(() -> transformFrom(converter, Float.POSITIVE_INFINITY));
+        assertFails(() -> transformFrom(converter, Float.NaN));
+
+        assertThat(transformFrom(converter, -Float.MAX_VALUE).n()).isEqualTo("-3.4028235E38");
+        assertThat(Float.parseFloat(transformFrom(converter, -42.42f).n())).isCloseTo(-42.42f, offset(1E-10f));
+        assertThat(transformFrom(converter, -Float.MIN_VALUE).n()).isEqualTo("-1.4E-45");
+        assertThat(transformFrom(converter, 0f).n()).isEqualTo("0.0");
+        assertThat(transformFrom(converter, Float.MIN_VALUE).n()).isEqualTo("1.4E-45");
+        assertThat(Float.parseFloat(transformFrom(converter, 42.42f).n())).isCloseTo(42.42f, offset(1E-10f));
+        assertThat(transformFrom(converter, Float.MAX_VALUE).n()).isEqualTo("3.4028235E38");
+
+        assertFails(() -> transformTo(converter, EnhancedAttributeValue.fromNumber("2E308")));
+        assertFails(() -> transformTo(converter, EnhancedAttributeValue.fromNumber("-2E308")));
+        assertFails(() -> transformTo(converter, EnhancedAttributeValue.fromNumber("NaN")));
+
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromNumber("1.4E-45")))
+                .isCloseTo(Float.MIN_VALUE, offset(1E-10f));
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromNumber("-42.42"))).isCloseTo(-42.42f, offset(1E-10f));
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromNumber("0"))).isEqualTo(0f);
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromNumber("42.42"))).isCloseTo(42.42f, offset(1E-10f));
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromNumber("3.4028235E38")))
+                .isCloseTo(Float.MAX_VALUE, offset(1E-10f));
+    }
+
+    @Test
+    public void doubleAttributeConverterBehaves() {
+        DoubleAttributeConverter converter = DoubleAttributeConverter.create();
+
+        assertFails(() -> transformFrom(converter, Double.NEGATIVE_INFINITY));
+        assertFails(() -> transformFrom(converter, Double.POSITIVE_INFINITY));
+        assertFails(() -> transformFrom(converter, Double.NaN));
+
+        assertThat(transformFrom(converter, -Double.MAX_VALUE).n()).isEqualTo("-1.7976931348623157E308");
+        assertThat(Double.parseDouble(transformFrom(converter, -42.42d).n())).isCloseTo(-42.42d, offset(1E-10));
+        assertThat(transformFrom(converter, -Double.MIN_VALUE).n()).isEqualTo("-4.9E-324");
+        assertThat(transformFrom(converter, 0d).n()).isEqualTo("0.0");
+        assertThat(transformFrom(converter, Double.MIN_VALUE).n()).isEqualTo("4.9E-324");
+        assertThat(Double.parseDouble(transformFrom(converter, 42.42).n())).isCloseTo(42.42d, offset(1E-10));
+        assertThat(transformFrom(converter, Double.MAX_VALUE).n()).isEqualTo("1.7976931348623157E308");
+
+        assertFails(() -> transformTo(converter, EnhancedAttributeValue.fromNumber("2E308")));
+        assertFails(() -> transformTo(converter, EnhancedAttributeValue.fromNumber("-2E308")));
+        assertFails(() -> transformTo(converter, EnhancedAttributeValue.fromNumber("NaN")));
+
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromNumber("4.9E-324")))
+                .isCloseTo(Double.MIN_VALUE, offset(1E-10));
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromNumber("-42.42"))).isCloseTo(-42.42d, offset(1E-10));
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromNumber("0"))).isEqualTo(0d);
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromNumber("42.42"))).isCloseTo(42.42d, offset(1E-10));
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromNumber("1.7976931348623157E308")))
+                .isCloseTo(Double.MAX_VALUE, offset(1E-10));
+    }
+
+    @Test
+    public void shortAttributeConverterBehaves() {
+        ShortAttributeConverter converter = ShortAttributeConverter.create();
+
+        assertThat(transformFrom(converter, Short.MIN_VALUE).n()).isEqualTo("-32768");
+        assertThat(transformFrom(converter, (short) 0).n()).isEqualTo("0");
+        assertThat(transformFrom(converter, Short.MAX_VALUE).n()).isEqualTo("32767");
+
+        assertFails(() -> transformTo(converter, EnhancedAttributeValue.fromString("1.0")));
+        assertFails(() -> transformTo(converter, EnhancedAttributeValue.fromNumber("1.0")));
+
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromNumber("-32768"))).isEqualTo(Short.MIN_VALUE);
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromNumber("0"))).isEqualTo((short) 0);
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromNumber("32767"))).isEqualTo(Short.MAX_VALUE);
+    }
+
+    @Test
+    public void integerAttributeConverterBehaves() {
+        IntegerAttributeConverter converter = IntegerAttributeConverter.create();
+
+        assertThat(transformFrom(converter, Integer.MIN_VALUE).n()).isEqualTo(Integer.toString(Integer.MIN_VALUE));
+        assertThat(transformFrom(converter, -42).n()).isEqualTo("-42");
+        assertThat(transformFrom(converter, 0).n()).isEqualTo("0");
+        assertThat(transformFrom(converter, 42).n()).isEqualTo("42");
+        assertThat(transformFrom(converter, Integer.MAX_VALUE).n()).isEqualTo(Integer.toString(Integer.MAX_VALUE));
+
+        assertFails(() -> transformTo(converter, EnhancedAttributeValue.fromString("1.0")));
+        assertFails(() -> transformTo(converter, EnhancedAttributeValue.fromNumber("1.0")));
+
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromNumber(Integer.toString(Integer.MIN_VALUE))))
+                .isEqualTo(Integer.MIN_VALUE);
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromString("-42"))).isEqualTo(-42);
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromNumber("-42"))).isEqualTo(-42);
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromNumber("0"))).isEqualTo(0);
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromNumber("42"))).isEqualTo(42);
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromString("42"))).isEqualTo(42);
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromNumber(Integer.toString(Integer.MAX_VALUE))))
+                .isEqualTo(Integer.MAX_VALUE);
+    }
+
+    @Test
+    public void longAttributeConverterBehaves() {
+        LongAttributeConverter converter = LongAttributeConverter.create();
+
+        assertThat(transformFrom(converter, Long.MIN_VALUE).n()).isEqualTo(Long.toString(Long.MIN_VALUE));
+        assertThat(transformFrom(converter, -42L).n()).isEqualTo("-42");
+        assertThat(transformFrom(converter, 0L).n()).isEqualTo("0");
+        assertThat(transformFrom(converter, 42L).n()).isEqualTo("42");
+        assertThat(transformFrom(converter, Long.MAX_VALUE).n()).isEqualTo(Long.toString(Long.MAX_VALUE));
+
+        assertFails(() -> transformTo(converter, EnhancedAttributeValue.fromString("1.0")));
+        assertFails(() -> transformTo(converter, EnhancedAttributeValue.fromNumber("1.0")));
+
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromNumber(Long.toString(Long.MIN_VALUE))))
+                .isEqualTo(Long.MIN_VALUE);
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromString("-42"))).isEqualTo(-42L);
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromNumber("-42"))).isEqualTo(-42L);
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromNumber("0"))).isEqualTo(0L);
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromNumber("42"))).isEqualTo(42L);
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromString("42"))).isEqualTo(42L);
+        assertThat(transformTo(converter, EnhancedAttributeValue.fromNumber(Long.toString(Long.MAX_VALUE))))
+                .isEqualTo(Long.MAX_VALUE);
+    }
+
+    @Test
+    public void setOfLongsAttributeConverter_ReturnsNSType() {
+        SetAttributeConverter<Set<Long>> longSet = SetAttributeConverter.setConverter(LongAttributeConverter.create());
+        assertThat(longSet.attributeValueType()).isEqualTo(AttributeValueType.NS);
+    }
+
+    private static String tiiiinyNumber() {
+        return "-" + huuuugeNumber();
+    }
+
+    private static String huuuugeNumber() {
+        StringBuilder result = new StringBuilder();
+        for (int i = 0; i < 1_000; ++i) {
+            result.append("9");
+        }
+        return result.toString();
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/converters/attribute/OptionalAttributeConvertersTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/converters/attribute/OptionalAttributeConvertersTest.java
new file mode 100644
index 000000000000..31d1b2fb95d5
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/converters/attribute/OptionalAttributeConvertersTest.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright 2010-2019 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.converters.attribute;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static software.amazon.awssdk.enhanced.dynamodb.converters.attribute.ConverterTestUtils.transformFrom;
+import static software.amazon.awssdk.enhanced.dynamodb.converters.attribute.ConverterTestUtils.transformTo;
+import static software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.EnhancedAttributeValue.fromNumber;
+import static software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.EnhancedAttributeValue.nullValue;
+
+import java.util.OptionalDouble;
+import java.util.OptionalInt;
+import java.util.OptionalLong;
+import org.junit.Test;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.OptionalDoubleAttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.OptionalIntAttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.OptionalLongAttributeConverter;
+
+public class OptionalAttributeConvertersTest {
+
+    @Test
+    public void optionalDoubleConverterWorksCorrectly() {
+        OptionalDoubleAttributeConverter converter = OptionalDoubleAttributeConverter.create();
+
+        assertThat(transformFrom(converter, OptionalDouble.empty())).isEqualTo(nullValue().toAttributeValue());
+        assertThat(transformFrom(converter, OptionalDouble.of(-Double.MAX_VALUE))).isEqualTo(fromNumber("-1.7976931348623157E308").toAttributeValue());
+        assertThat(transformFrom(converter, OptionalDouble.of(-Double.MIN_VALUE))).isEqualTo(fromNumber("-4.9E-324").toAttributeValue());
+        assertThat(transformFrom(converter, OptionalDouble.of(0.0))).isEqualTo(fromNumber("0.0").toAttributeValue());
+        assertThat(transformFrom(converter, OptionalDouble.of(Double.MIN_VALUE))).isEqualTo(fromNumber("4.9E-324").toAttributeValue());
+        assertThat(transformFrom(converter, OptionalDouble.of(Double.MAX_VALUE))).isEqualTo(fromNumber("1.7976931348623157E308").toAttributeValue());
+
+        assertThat(transformTo(converter, nullValue().toAttributeValue())).isEmpty();
+        assertThat(transformTo(converter, fromNumber("-1.7976931348623157E308"))).hasValue(-Double.MAX_VALUE);
+        assertThat(transformTo(converter, fromNumber("-4.9E-324"))).hasValue(-Double.MIN_VALUE);
+        assertThat(transformTo(converter, fromNumber("0.0"))).hasValue(0.0);
+        assertThat(transformTo(converter, fromNumber("4.9E-324"))).hasValue(Double.MIN_VALUE);
+        assertThat(transformTo(converter, fromNumber("1.7976931348623157E308"))).hasValue(Double.MAX_VALUE);
+    }
+
+    @Test
+    public void optionalIntConverterWorksCorrectly() {
+        OptionalIntAttributeConverter converter = OptionalIntAttributeConverter.create();
+
+        assertThat(transformFrom(converter, OptionalInt.empty())).isEqualTo(nullValue().toAttributeValue());
+        assertThat(transformFrom(converter, OptionalInt.of(Integer.MIN_VALUE))).isEqualTo(fromNumber("-2147483648").toAttributeValue());
+        assertThat(transformFrom(converter, OptionalInt.of(0))).isEqualTo(fromNumber("0").toAttributeValue());
+        assertThat(transformFrom(converter, OptionalInt.of(Integer.MAX_VALUE))).isEqualTo(fromNumber("2147483647").toAttributeValue());
+
+        assertThat(transformTo(converter, nullValue().toAttributeValue())).isEmpty();
+        assertThat(transformTo(converter, fromNumber("-2147483648"))).hasValue(Integer.MIN_VALUE);
+        assertThat(transformTo(converter, fromNumber("0"))).hasValue(0);
+        assertThat(transformTo(converter, fromNumber("2147483647"))).hasValue(Integer.MAX_VALUE);
+    }
+
+    @Test
+    public void optionalLongConverterWorksCorrectly() {
+        OptionalLongAttributeConverter converter = OptionalLongAttributeConverter.create();
+
+        assertThat(transformFrom(converter, OptionalLong.empty())).isEqualTo(nullValue().toAttributeValue());
+        assertThat(transformFrom(converter, OptionalLong.of(Long.MIN_VALUE))).isEqualTo(fromNumber("-9223372036854775808").toAttributeValue());
+        assertThat(transformFrom(converter, OptionalLong.of(0))).isEqualTo(fromNumber("0").toAttributeValue());
+        assertThat(transformFrom(converter, OptionalLong.of(Long.MAX_VALUE))).isEqualTo(fromNumber("9223372036854775807").toAttributeValue());
+
+        assertThat(transformTo(converter, nullValue().toAttributeValue())).isEmpty();
+        assertThat(transformTo(converter, fromNumber("-9223372036854775808"))).hasValue(Long.MIN_VALUE);
+        assertThat(transformTo(converter, fromNumber("0"))).hasValue(0);
+        assertThat(transformTo(converter, fromNumber("9223372036854775807"))).hasValue(Long.MAX_VALUE);
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/converters/attribute/StringAttributeConvertersTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/converters/attribute/StringAttributeConvertersTest.java
new file mode 100644
index 000000000000..75c121bd0198
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/converters/attribute/StringAttributeConvertersTest.java
@@ -0,0 +1,244 @@
+/*
+ * Copyright 2010-2019 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.converters.attribute;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static software.amazon.awssdk.enhanced.dynamodb.converters.attribute.ConverterTestUtils.assertFails;
+import static software.amazon.awssdk.enhanced.dynamodb.converters.attribute.ConverterTestUtils.transformFrom;
+import static software.amazon.awssdk.enhanced.dynamodb.converters.attribute.ConverterTestUtils.transformTo;
+import static software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.EnhancedAttributeValue.fromBoolean;
+import static software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.EnhancedAttributeValue.fromBytes;
+import static software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.EnhancedAttributeValue.fromListOfAttributeValues;
+import static software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.EnhancedAttributeValue.fromMap;
+import static software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.EnhancedAttributeValue.fromNumber;
+import static software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.EnhancedAttributeValue.fromSetOfBytes;
+import static software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.EnhancedAttributeValue.fromSetOfNumbers;
+import static software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.EnhancedAttributeValue.fromSetOfStrings;
+import static software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.EnhancedAttributeValue.fromString;
+
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URL;
+import java.time.Period;
+import java.time.ZoneId;
+import java.time.ZoneOffset;
+import java.util.Set;
+import java.util.UUID;
+import org.junit.Test;
+import software.amazon.awssdk.core.SdkBytes;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeValueType;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.CharSequenceAttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.CharacterArrayAttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.CharacterAttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.PeriodAttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.SetAttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.StringAttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.StringBufferAttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.StringBuilderAttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.UriAttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.UrlAttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.UuidAttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.ZoneIdAttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.ZoneOffsetAttributeConverter;
+import software.amazon.awssdk.utils.ImmutableMap;
+
+public class StringAttributeConvertersTest {
+    @Test
+    public void charArrayAttributeConverterBehaves() {
+        CharacterArrayAttributeConverter converter = CharacterArrayAttributeConverter.create();
+
+        char[] emptyChars = {};
+        char[] chars = {'f', 'o', 'o'};
+        char[] numChars = {'4', '2'};
+
+        assertThat(transformFrom(converter, chars).s()).isEqualTo("foo");
+        assertThat(transformFrom(converter, emptyChars).s()).isEqualTo("");
+
+        assertThat(transformTo(converter, fromString(""))).isEqualTo(emptyChars);
+        assertThat(transformTo(converter, fromString("foo"))).isEqualTo(chars);
+        assertThat(transformTo(converter, fromNumber("42"))).isEqualTo(numChars);
+    }
+
+    @Test
+    public void characterAttributeConverterBehaves() {
+        CharacterAttributeConverter converter = CharacterAttributeConverter.create();
+
+        assertThat(transformFrom(converter, 'a').s()).isEqualTo("a");
+
+        assertFails(() -> transformTo(converter, fromString("")));
+        assertFails(() -> transformTo(converter, fromString("ab")));
+
+        assertThat(transformTo(converter, fromString("a"))).isEqualTo('a');
+    }
+
+    @Test
+    public void charSequenceAttributeConverterBehaves() {
+        CharSequenceAttributeConverter converter = CharSequenceAttributeConverter.create();
+
+        CharSequence emptyChars = "";
+        CharSequence chars = "foo";
+        CharSequence numChars = "42";
+
+        assertThat(transformFrom(converter, chars).s()).isEqualTo("foo");
+        assertThat(transformFrom(converter, emptyChars).s()).isEqualTo("");
+
+        assertThat(transformTo(converter, fromString(""))).isEqualTo(emptyChars);
+        assertThat(transformTo(converter, fromString("foo"))).isEqualTo(chars);
+        assertThat(transformTo(converter, fromNumber("42"))).isEqualTo(numChars);
+    }
+
+    @Test
+    public void periodAttributeConverterBehaves() {
+        PeriodAttributeConverter converter = PeriodAttributeConverter.create();
+
+        assertThat(transformFrom(converter, Period.ofYears(-5)).s()).isEqualTo("P-5Y");
+        assertThat(transformFrom(converter, Period.ofDays(-1)).s()).isEqualTo("P-1D");
+        assertThat(transformFrom(converter, Period.ZERO).s()).isEqualTo("P0D");
+        assertThat(transformFrom(converter, Period.ofDays(1)).s()).isEqualTo("P1D");
+        assertThat(transformFrom(converter, Period.ofYears(5)).s()).isEqualTo("P5Y");
+
+        assertFails(() -> transformTo(converter, fromString("")));
+        assertFails(() -> transformTo(converter, fromString("P")));
+
+        assertThat(transformTo(converter, fromString("P-5Y"))).isEqualTo(Period.ofYears(-5));
+        assertThat(transformTo(converter, fromString("P-1D"))).isEqualTo(Period.ofDays(-1));
+        assertThat(transformTo(converter, fromString("P0D"))).isEqualTo(Period.ZERO);
+        assertThat(transformTo(converter, fromString("P1D"))).isEqualTo(Period.ofDays(1));
+        assertThat(transformTo(converter, fromString("P5Y"))).isEqualTo(Period.ofYears(5));
+    }
+
+    @Test
+    public void stringAttributeConverterBehaves() {
+        StringAttributeConverter converter = StringAttributeConverter.create();
+
+        String emptyChars = "";
+        String chars = "foo";
+        String numChars = "42";
+
+        assertThat(transformFrom(converter, chars).s()).isSameAs(chars);
+        assertThat(transformFrom(converter, emptyChars).s()).isSameAs(emptyChars);
+
+        assertThat(transformTo(converter, fromString(emptyChars))).isSameAs(emptyChars);
+        assertThat(transformTo(converter, fromString(chars))).isSameAs(chars);
+        assertThat(transformTo(converter, fromNumber(emptyChars))).isSameAs(emptyChars);
+        assertThat(transformTo(converter, fromNumber(numChars))).isSameAs(numChars);
+        assertThat(transformTo(converter, fromBytes(SdkBytes.fromUtf8String("foo")))).isEqualTo("Zm9v");
+        assertThat(transformTo(converter, fromBoolean(true))).isEqualTo("true");
+        assertThat(transformTo(converter, fromBoolean(false))).isEqualTo("false");
+        assertThat(transformTo(converter, fromMap(ImmutableMap.of("a", fromString("b").toAttributeValue(),
+                                                                  "c", fromBytes(SdkBytes.fromUtf8String("d")).toAttributeValue()))))
+                .isEqualTo("{a=b, c=ZA==}");
+        assertThat(transformTo(converter, fromListOfAttributeValues(fromString("a").toAttributeValue(),
+                                                                    fromBytes(SdkBytes.fromUtf8String("d")).toAttributeValue())))
+                .isEqualTo("[a, ZA==]");
+        assertThat(transformTo(converter, fromSetOfStrings("a", "b"))).isEqualTo("[a, b]");
+        assertThat(transformTo(converter, fromSetOfBytes(SdkBytes.fromUtf8String("a"), SdkBytes.fromUtf8String("b"))))
+                .isEqualTo("[YQ==,Yg==]");
+        assertThat(transformTo(converter, fromSetOfNumbers("1", "2"))).isEqualTo("[1, 2]");
+    }
+
+    @Test
+    public void stringBuilderAttributeConverterBehaves() {
+        StringBuilderAttributeConverter converter = StringBuilderAttributeConverter.create();
+
+        assertThat(transformFrom(converter, new StringBuilder()).s()).isEqualTo("");
+        assertThat(transformFrom(converter, new StringBuilder("foo")).s()).isEqualTo("foo");
+        assertThat(transformFrom(converter, new StringBuilder("42")).s()).isEqualTo("42");
+
+        assertThat(transformTo(converter, fromString("")).toString()).isEqualTo("");
+        assertThat(transformTo(converter, fromString("foo")).toString()).isEqualTo("foo");
+        assertThat(transformTo(converter, fromNumber("42")).toString()).isEqualTo("42");
+    }
+
+    @Test
+    public void stringBufferAttributeConverterBehaves() {
+        StringBufferAttributeConverter converter = StringBufferAttributeConverter.create();
+
+        assertThat(transformFrom(converter, new StringBuffer()).s()).isEqualTo("");
+        assertThat(transformFrom(converter, new StringBuffer("foo")).s()).isEqualTo("foo");
+        assertThat(transformFrom(converter, new StringBuffer("42")).s()).isEqualTo("42");
+
+        assertThat(transformTo(converter, fromString("")).toString()).isEqualTo("");
+        assertThat(transformTo(converter, fromString("foo")).toString()).isEqualTo("foo");
+        assertThat(transformTo(converter, fromNumber("42")).toString()).isEqualTo("42");
+    }
+
+    @Test
+    public void uriAttributeConverterBehaves() {
+        UriAttributeConverter converter = UriAttributeConverter.create();
+
+        assertThat(transformFrom(converter, URI.create("http://example.com/languages/java/")).s())
+                .isEqualTo("http://example.com/languages/java/");
+        assertThat(transformFrom(converter, URI.create("sample/a/index.html#28")).s())
+                .isEqualTo("sample/a/index.html#28");
+        assertThat(transformFrom(converter, URI.create("../../demo/b/index.html")).s())
+                .isEqualTo("../../demo/b/index.html");
+        assertThat(transformFrom(converter, URI.create("file:///~/calendar")).s()).isEqualTo("file:///~/calendar");
+
+        assertThat(transformTo(converter, fromString("http://example.com/languages/java/")))
+                .isEqualTo(URI.create("http://example.com/languages/java/"));
+        assertThat(transformTo(converter, fromString("sample/a/index.html#28")))
+                .isEqualTo(URI.create("sample/a/index.html#28"));
+        assertThat(transformTo(converter, fromString("../../demo/b/index.html")))
+                .isEqualTo(URI.create("../../demo/b/index.html"));
+        assertThat(transformTo(converter, fromString("file:///~/calendar")))
+                .isEqualTo(URI.create("file:///~/calendar"));
+    }
+
+    @Test
+    public void urlAttributeConverterBehaves() throws MalformedURLException {
+        UrlAttributeConverter converter = UrlAttributeConverter.create();
+
+        assertThat(transformFrom(converter, new URL("http://example.com/languages/java/")).s())
+                .isEqualTo("http://example.com/languages/java/");
+        assertThat(transformTo(converter, fromString("http://example.com/languages/java/")))
+                .isEqualTo(new URL("http://example.com/languages/java/"));
+    }
+
+    @Test
+    public void uuidAttributeConverterBehaves() {
+        UuidAttributeConverter converter = UuidAttributeConverter.create();
+        UUID uuid = UUID.randomUUID();
+        assertThat(transformFrom(converter, uuid).s()).isEqualTo(uuid.toString());
+        assertThat(transformTo(converter, fromString(uuid.toString()))).isEqualTo(uuid);
+    }
+
+    @Test
+    public void zoneIdAttributeConverterBehaves() {
+        ZoneIdAttributeConverter converter = ZoneIdAttributeConverter.create();
+        assertThat(transformFrom(converter, ZoneId.of("UTC")).s()).isEqualTo("UTC");
+        assertFails(() -> transformTo(converter, fromString("XXXXXX")));
+        assertThat(transformTo(converter, fromString("UTC"))).isEqualTo(ZoneId.of("UTC"));
+    }
+
+    @Test
+    public void zoneOffsetAttributeConverterBehaves() {
+        ZoneOffsetAttributeConverter converter = ZoneOffsetAttributeConverter.create();
+        assertThat(transformFrom(converter, ZoneOffset.ofHoursMinutesSeconds(0, -1, -2)).s()).isEqualTo("-00:01:02");
+        assertThat(transformFrom(converter, ZoneOffset.ofHoursMinutesSeconds(0, 1, 2)).s()).isEqualTo("+00:01:02");
+        assertFails(() -> transformTo(converter, fromString("+99999:00:00")));
+        assertThat(transformTo(converter, fromString("-00:01:02")))
+                .isEqualTo(ZoneOffset.ofHoursMinutesSeconds(0, -1, -2));
+        assertThat(transformTo(converter, fromString("+00:01:02")))
+                .isEqualTo(ZoneOffset.ofHoursMinutesSeconds(0, 1, 2));
+    }
+
+    @Test
+    public void stringSetAttributeConverter_ReturnsSSType() {
+        SetAttributeConverter<Set<String>> converter = SetAttributeConverter.setConverter(StringAttributeConverter.create());
+        assertThat(converter.attributeValueType()).isEqualTo(AttributeValueType.SS);
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/extensions/ChainExtensionTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/extensions/ChainExtensionTest.java
new file mode 100644
index 000000000000..6a37e88164ba
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/extensions/ChainExtensionTest.java
@@ -0,0 +1,274 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.extensions;
+
+import static java.util.stream.Collectors.toList;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.nullValue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.when;
+import static software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.FakeItem.createUniqueFakeItem;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.IntStream;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InOrder;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.junit.MockitoJUnitRunner;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClientExtension;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbExtensionContext;
+import software.amazon.awssdk.enhanced.dynamodb.Expression;
+import software.amazon.awssdk.enhanced.dynamodb.TableMetadata;
+import software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.FakeItem;
+import software.amazon.awssdk.enhanced.dynamodb.internal.extensions.ChainExtension;
+import software.amazon.awssdk.enhanced.dynamodb.internal.extensions.DefaultDynamoDbExtensionContext;
+import software.amazon.awssdk.enhanced.dynamodb.internal.operations.OperationContext;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+
+@RunWith(MockitoJUnitRunner.class)
+public class ChainExtensionTest {
+    private static final String TABLE_NAME = "concrete-table-name";
+    private static final OperationContext PRIMARY_CONTEXT =
+        OperationContext.create(TABLE_NAME, TableMetadata.primaryIndexName());
+
+    private static final Map<String, AttributeValue> ATTRIBUTE_VALUES_1 =
+        Collections.unmodifiableMap(Collections.singletonMap("key1", AttributeValue.builder().s("1").build()));
+    private static final Map<String, AttributeValue> ATTRIBUTE_VALUES_2 =
+        Collections.unmodifiableMap(Collections.singletonMap("key2", AttributeValue.builder().s("2").build()));
+    private static final Map<String, AttributeValue> ATTRIBUTE_VALUES_3 =
+        Collections.unmodifiableMap(Collections.singletonMap("key3", AttributeValue.builder().s("3").build()));
+
+    @Mock
+    private DynamoDbEnhancedClientExtension mockExtension1;
+    @Mock
+    private DynamoDbEnhancedClientExtension mockExtension2;
+    @Mock
+    private DynamoDbEnhancedClientExtension mockExtension3;
+
+    private final List<Map<String, AttributeValue>> fakeItems =
+        IntStream.range(0, 4)
+                 .mapToObj($ -> createUniqueFakeItem())
+                 .map(fakeItem -> FakeItem.getTableSchema().itemToMap(fakeItem, true))
+                 .collect(toList());
+
+    @Test
+    public void beforeWrite_multipleExtensions_multipleConditions_multipleTransformations() {
+        Expression expression1 = Expression.builder().expression("one").expressionValues(ATTRIBUTE_VALUES_1).build();
+        Expression expression2 = Expression.builder().expression("two").expressionValues(ATTRIBUTE_VALUES_2).build();
+        Expression expression3 = Expression.builder().expression("three").expressionValues(ATTRIBUTE_VALUES_3).build();
+        ChainExtension extension = ChainExtension.create(mockExtension1, mockExtension2, mockExtension3);
+        WriteModification writeModification1 = WriteModification.builder()
+                                                                .additionalConditionalExpression(expression1)
+                                                                .transformedItem(fakeItems.get(1))
+                                                                .build();
+        WriteModification writeModification2 = WriteModification.builder()
+                                                                .additionalConditionalExpression(expression2)
+                                                                .transformedItem(fakeItems.get(2))
+                                                                .build();
+        WriteModification writeModification3 = WriteModification.builder()
+                                                                .additionalConditionalExpression(expression3)
+                                                                .transformedItem(fakeItems.get(3))
+                                                                .build();
+        when(mockExtension1.beforeWrite(any(DynamoDbExtensionContext.BeforeWrite.class))).thenReturn(writeModification1);
+        when(mockExtension2.beforeWrite(any(DynamoDbExtensionContext.BeforeWrite.class))).thenReturn(writeModification2);
+        when(mockExtension3.beforeWrite(any(DynamoDbExtensionContext.BeforeWrite.class))).thenReturn(writeModification3);
+
+        WriteModification result = extension.beforeWrite(getExtensionContext(0));
+
+        Map<String, AttributeValue> combinedMap = new HashMap<>(ATTRIBUTE_VALUES_1);
+        combinedMap.putAll(ATTRIBUTE_VALUES_2);
+        combinedMap.putAll(ATTRIBUTE_VALUES_3);
+        Expression expectedExpression =
+            Expression.builder().expression("((one) AND (two)) AND (three)").expressionValues(combinedMap).build();
+        assertThat(result.transformedItem(), is(fakeItems.get(3)));
+        assertThat(result.additionalConditionalExpression(), is(expectedExpression));
+
+        InOrder inOrder = Mockito.inOrder(mockExtension1, mockExtension2, mockExtension3);
+        inOrder.verify(mockExtension1).beforeWrite(
+            getExtensionContext(0));
+        inOrder.verify(mockExtension2).beforeWrite(getExtensionContext(1));
+        inOrder.verify(mockExtension3).beforeWrite(getExtensionContext(2));
+        inOrder.verifyNoMoreInteractions();
+    }
+
+    @Test
+    public void beforeWrite_multipleExtensions_doingNothing() {
+        ChainExtension extension = ChainExtension.create(mockExtension1, mockExtension2, mockExtension3);
+        when(mockExtension1.beforeWrite(any(DynamoDbExtensionContext.BeforeWrite.class))).thenReturn(WriteModification.builder().build());
+        when(mockExtension2.beforeWrite(any(DynamoDbExtensionContext.BeforeWrite.class))).thenReturn(WriteModification.builder().build());
+        when(mockExtension3.beforeWrite(any(DynamoDbExtensionContext.BeforeWrite.class))).thenReturn(WriteModification.builder().build());
+
+        WriteModification result = extension.beforeWrite(getExtensionContext(0));
+
+        assertThat(result.additionalConditionalExpression(), is(nullValue()));
+        assertThat(result.transformedItem(), is(nullValue()));
+
+        InOrder inOrder = Mockito.inOrder(mockExtension1, mockExtension2, mockExtension3);
+        inOrder.verify(mockExtension1).beforeWrite(
+            getExtensionContext(0));
+        inOrder.verify(mockExtension2).beforeWrite(getExtensionContext(0));
+        inOrder.verify(mockExtension3).beforeWrite(getExtensionContext(0));
+        inOrder.verifyNoMoreInteractions();
+    }
+
+    private DefaultDynamoDbExtensionContext getExtensionContext(int i) {
+        return DefaultDynamoDbExtensionContext.builder()
+                                              .tableMetadata(FakeItem.getTableMetadata())
+                                              .operationContext(PRIMARY_CONTEXT)
+                                              .items(fakeItems.get(i)).build();
+    }
+
+    @Test
+    public void beforeWrite_multipleExtensions_singleCondition_noTransformations() {
+        Expression expression = Expression.builder().expression("one").expressionValues(ATTRIBUTE_VALUES_1).build();
+        ChainExtension extension = ChainExtension.create(mockExtension1, mockExtension2, mockExtension3);
+        WriteModification writeModification1 = WriteModification.builder().build();
+        WriteModification writeModification2 = WriteModification.builder()
+                                                                .additionalConditionalExpression(expression)
+                                                                .build();
+        WriteModification writeModification3 = WriteModification.builder().build();
+        when(mockExtension1.beforeWrite(any(DynamoDbExtensionContext.BeforeWrite.class))).thenReturn(writeModification1);
+        when(mockExtension2.beforeWrite(any(DynamoDbExtensionContext.BeforeWrite.class))).thenReturn(writeModification2);
+        when(mockExtension3.beforeWrite(any(DynamoDbExtensionContext.BeforeWrite.class))).thenReturn(writeModification3);
+
+        WriteModification result = extension.beforeWrite(getExtensionContext(0));
+
+        Expression expectedExpression = Expression.builder()
+                                                  .expression("one")
+                                                  .expressionValues(ATTRIBUTE_VALUES_1)
+                                                  .build();
+        assertThat(result.transformedItem(), is(nullValue()));
+        assertThat(result.additionalConditionalExpression(), is(expectedExpression));
+
+        InOrder inOrder = Mockito.inOrder(mockExtension1, mockExtension2, mockExtension3);
+        inOrder.verify(mockExtension1).beforeWrite(
+            getExtensionContext(0));
+        inOrder.verify(mockExtension2).beforeWrite(getExtensionContext(0));
+        inOrder.verify(mockExtension3).beforeWrite(getExtensionContext(0));
+        inOrder.verifyNoMoreInteractions();
+    }
+
+    @Test
+    public void beforeWrite_multipleExtensions_noConditions_singleTransformation() {
+        ChainExtension extension = ChainExtension.create(mockExtension1, mockExtension2, mockExtension3);
+        WriteModification writeModification1 = WriteModification.builder().build();
+        WriteModification writeModification2 = WriteModification.builder()
+                                                                .transformedItem(fakeItems.get(1))
+                                                                .build();
+        WriteModification writeModification3 = WriteModification.builder().build();
+        when(mockExtension1.beforeWrite(any(DynamoDbExtensionContext.BeforeWrite.class))).thenReturn(writeModification1);
+        when(mockExtension2.beforeWrite(any(DynamoDbExtensionContext.BeforeWrite.class))).thenReturn(writeModification2);
+        when(mockExtension3.beforeWrite(any(DynamoDbExtensionContext.BeforeWrite.class))).thenReturn(writeModification3);
+
+        WriteModification result = extension.beforeWrite(getExtensionContext(0));
+
+        assertThat(result.transformedItem(), is(fakeItems.get(1)));
+        assertThat(result.additionalConditionalExpression(), is(nullValue()));
+
+        InOrder inOrder = Mockito.inOrder(mockExtension1, mockExtension2, mockExtension3);
+        inOrder.verify(mockExtension1).beforeWrite(
+            getExtensionContext(0));
+        inOrder.verify(mockExtension2).beforeWrite(getExtensionContext(0));
+        inOrder.verify(mockExtension3).beforeWrite(getExtensionContext(1));
+        inOrder.verifyNoMoreInteractions();
+    }
+
+    @Test
+    public void beforeWrite_noExtensions() {
+        ChainExtension extension = ChainExtension.create();
+
+        WriteModification result = extension.beforeWrite(getExtensionContext(0));
+
+        assertThat(result.transformedItem(), is(nullValue()));
+        assertThat(result.additionalConditionalExpression(), is(nullValue()));
+    }
+
+    @Test
+    public void afterRead_multipleExtensions_multipleTransformations() {
+        ChainExtension extension = ChainExtension.create(mockExtension1, mockExtension2, mockExtension3);
+        ReadModification readModification1 = ReadModification.builder().transformedItem(fakeItems.get(1)).build();
+        ReadModification readModification2 = ReadModification.builder().transformedItem(fakeItems.get(2)).build();
+        ReadModification readModification3 = ReadModification.builder().transformedItem(fakeItems.get(3)).build();
+        when(mockExtension1.afterRead(any(DynamoDbExtensionContext.AfterRead.class))).thenReturn(readModification1);
+        when(mockExtension2.afterRead(any(DynamoDbExtensionContext.AfterRead.class))).thenReturn(readModification2);
+        when(mockExtension3.afterRead(any(DynamoDbExtensionContext.AfterRead.class))).thenReturn(readModification3);
+
+        ReadModification result = extension.afterRead(getExtensionContext(0));
+
+        assertThat(result.transformedItem(), is(fakeItems.get(1)));
+
+        InOrder inOrder = Mockito.inOrder(mockExtension1, mockExtension2, mockExtension3);
+        inOrder.verify(mockExtension3).afterRead(getExtensionContext(0));
+        inOrder.verify(mockExtension2).afterRead(getExtensionContext(3));
+        inOrder.verify(mockExtension1).afterRead(getExtensionContext(2));
+        inOrder.verifyNoMoreInteractions();
+    }
+
+    @Test
+    public void afterRead_multipleExtensions_singleTransformation() {
+        ChainExtension extension = ChainExtension.create(mockExtension1, mockExtension2, mockExtension3);
+        ReadModification readModification1 = ReadModification.builder().build();
+        ReadModification readModification2 = ReadModification.builder().transformedItem(fakeItems.get(1)).build();
+        ReadModification readModification3 = ReadModification.builder().build();
+        when(mockExtension1.afterRead(any(DynamoDbExtensionContext.AfterRead.class))).thenReturn(readModification1);
+        when(mockExtension2.afterRead(any(DynamoDbExtensionContext.AfterRead.class))).thenReturn(readModification2);
+        when(mockExtension3.afterRead(any(DynamoDbExtensionContext.AfterRead.class))).thenReturn(readModification3);
+
+        ReadModification result = extension.afterRead(getExtensionContext(0));
+
+        assertThat(result.transformedItem(), is(fakeItems.get(1)));
+        InOrder inOrder = Mockito.inOrder(mockExtension1, mockExtension2, mockExtension3);
+        inOrder.verify(mockExtension3).afterRead(getExtensionContext(0));
+        inOrder.verify(mockExtension2).afterRead(getExtensionContext(0));
+        inOrder.verify(mockExtension1).afterRead(getExtensionContext(1));
+        inOrder.verifyNoMoreInteractions();
+    }
+
+    @Test
+    public void afterRead_multipleExtensions_noTransformations() {
+        ChainExtension extension = ChainExtension.create(mockExtension1, mockExtension2, mockExtension3);
+        ReadModification readModification1 = ReadModification.builder().build();
+        ReadModification readModification2 = ReadModification.builder().build();
+        ReadModification readModification3 = ReadModification.builder().build();
+        when(mockExtension1.afterRead(any(DynamoDbExtensionContext.AfterRead.class))).thenReturn(readModification1);
+        when(mockExtension2.afterRead(any(DynamoDbExtensionContext.AfterRead.class))).thenReturn(readModification2);
+        when(mockExtension3.afterRead(any(DynamoDbExtensionContext.AfterRead.class))).thenReturn(readModification3);
+
+        ReadModification result = extension.afterRead(getExtensionContext(0));
+
+        assertThat(result.transformedItem(), is(nullValue()));
+        InOrder inOrder = Mockito.inOrder(mockExtension1, mockExtension2, mockExtension3);
+        inOrder.verify(mockExtension3).afterRead(getExtensionContext(0));
+        inOrder.verify(mockExtension2).afterRead(getExtensionContext(0));
+        inOrder.verify(mockExtension1).afterRead(getExtensionContext(0));
+        inOrder.verifyNoMoreInteractions();
+    }
+
+    @Test
+    public void afterRead_noExtensions() {
+        ChainExtension extension = ChainExtension.create();
+
+        ReadModification result = extension.afterRead(getExtensionContext(0));
+
+        assertThat(result.transformedItem(), is(nullValue()));
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/extensions/VersionedRecordExtensionTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/extensions/VersionedRecordExtensionTest.java
new file mode 100644
index 000000000000..ea03d46a8b4b
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/extensions/VersionedRecordExtensionTest.java
@@ -0,0 +1,179 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.extensions;
+
+import static java.util.Collections.singletonMap;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+import static software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.FakeItem.createUniqueFakeItem;
+import static software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.FakeItemWithSort.createUniqueFakeItemWithSort;
+
+import java.util.HashMap;
+import java.util.Map;
+import org.junit.Test;
+import software.amazon.awssdk.enhanced.dynamodb.Expression;
+import software.amazon.awssdk.enhanced.dynamodb.TableMetadata;
+import software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.FakeItem;
+import software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.FakeItemWithSort;
+import software.amazon.awssdk.enhanced.dynamodb.internal.extensions.DefaultDynamoDbExtensionContext;
+import software.amazon.awssdk.enhanced.dynamodb.internal.operations.OperationContext;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+
+public class VersionedRecordExtensionTest {
+    private static final String TABLE_NAME = "table-name";
+    private static final OperationContext PRIMARY_CONTEXT =
+        OperationContext.create(TABLE_NAME, TableMetadata.primaryIndexName());
+
+    private final VersionedRecordExtension versionedRecordExtension = VersionedRecordExtension.builder().build();
+
+    @Test
+    public void beforeRead_doesNotTransformObject() {
+        FakeItem fakeItem = createUniqueFakeItem();
+        Map<String, AttributeValue> fakeItemMap = FakeItem.getTableSchema().itemToMap(fakeItem, true);
+
+        ReadModification result =
+            versionedRecordExtension.afterRead(DefaultDynamoDbExtensionContext
+                                               .builder()
+                                               .items(fakeItemMap)
+                                               .tableMetadata(FakeItem.getTableMetadata())
+                                               .operationContext(PRIMARY_CONTEXT).build());
+
+        assertThat(result, is(ReadModification.builder().build()));
+    }
+
+    @Test
+    public void beforeWrite_initialVersion_expressionIsCorrect() {
+        FakeItem fakeItem = createUniqueFakeItem();
+
+        WriteModification result =
+            versionedRecordExtension.beforeWrite(
+                DefaultDynamoDbExtensionContext
+                    .builder()
+                    .items(FakeItem.getTableSchema().itemToMap(fakeItem, true))
+                    .tableMetadata(FakeItem.getTableMetadata())
+                    .operationContext(PRIMARY_CONTEXT).build());
+
+        assertThat(result.additionalConditionalExpression(),
+                   is(Expression.builder().expression("attribute_not_exists(version)").build()));
+    }
+
+    @Test
+    public void beforeWrite_initialVersion_transformedItemIsCorrect() {
+        FakeItem fakeItem = createUniqueFakeItem();
+        Map<String, AttributeValue> fakeItemWithInitialVersion =
+            new HashMap<>(FakeItem.getTableSchema().itemToMap(fakeItem, true));
+        fakeItemWithInitialVersion.put("version", AttributeValue.builder().n("1").build());
+
+        WriteModification result =
+            versionedRecordExtension.beforeWrite(DefaultDynamoDbExtensionContext
+                                                     .builder()
+                                                     .items(FakeItem.getTableSchema().itemToMap(fakeItem, true))
+                                                     .tableMetadata(FakeItem.getTableMetadata())
+                                                     .operationContext(PRIMARY_CONTEXT).build());
+
+
+        assertThat(result.transformedItem(), is(fakeItemWithInitialVersion));
+    }
+
+    @Test
+    public void beforeWrite_initialVersionDueToExplicitNull_transformedItemIsCorrect() {
+        FakeItem fakeItem = createUniqueFakeItem();
+        Map<String, AttributeValue> inputMap =
+            new HashMap<>(FakeItem.getTableSchema().itemToMap(fakeItem, true));
+        inputMap.put("version", AttributeValue.builder().nul(true).build());
+        Map<String, AttributeValue> fakeItemWithInitialVersion =
+            new HashMap<>(FakeItem.getTableSchema().itemToMap(fakeItem, true));
+        fakeItemWithInitialVersion.put("version", AttributeValue.builder().n("1").build());
+
+        WriteModification result =
+            versionedRecordExtension.beforeWrite(DefaultDynamoDbExtensionContext
+                                                     .builder()
+                                                     .items(inputMap)
+                                                     .tableMetadata(FakeItem.getTableMetadata())
+                                                     .operationContext(PRIMARY_CONTEXT).build());
+
+        assertThat(result.transformedItem(), is(fakeItemWithInitialVersion));
+    }
+
+    @Test
+    public void beforeWrite_existingVersion_expressionIsCorrect() {
+        FakeItem fakeItem = createUniqueFakeItem();
+        fakeItem.setVersion(13);
+
+        WriteModification result =
+            versionedRecordExtension.beforeWrite(DefaultDynamoDbExtensionContext
+                                                     .builder()
+                                                     .items(FakeItem.getTableSchema().itemToMap(fakeItem, true))
+                                                     .tableMetadata(FakeItem.getTableMetadata())
+                                                     .operationContext(PRIMARY_CONTEXT).build());
+
+        assertThat(result.additionalConditionalExpression(),
+                   is(Expression.builder()
+                                .expression("version = :old_version_value")
+                                .expressionValues(singletonMap(":old_version_value",
+                                                               AttributeValue.builder().n("13").build()))
+                                .build()));
+    }
+
+    @Test
+    public void beforeWrite_existingVersion_transformedItemIsCorrect() {
+        FakeItem fakeItem = createUniqueFakeItem();
+        fakeItem.setVersion(13);
+        Map<String, AttributeValue> fakeItemWithInitialVersion =
+            new HashMap<>(FakeItem.getTableSchema().itemToMap(fakeItem, true));
+        fakeItemWithInitialVersion.put("version", AttributeValue.builder().n("14").build());
+
+        WriteModification result =
+            versionedRecordExtension.beforeWrite(DefaultDynamoDbExtensionContext
+                                                     .builder()
+                                                     .items(FakeItem.getTableSchema().itemToMap(fakeItem, true))
+                                                     .tableMetadata(FakeItem.getTableMetadata())
+                                                     .operationContext(PRIMARY_CONTEXT).build());
+
+
+        assertThat(result.transformedItem(), is(fakeItemWithInitialVersion));
+    }
+
+    @Test
+    public void beforeWrite_returnsNoOpModification_ifVersionAttributeNotDefined() {
+        FakeItemWithSort fakeItemWithSort = createUniqueFakeItemWithSort();
+        Map<String, AttributeValue> itemMap =
+            new HashMap<>(FakeItemWithSort.getTableSchema().itemToMap(fakeItemWithSort, true));
+
+        WriteModification writeModification = versionedRecordExtension.beforeWrite( DefaultDynamoDbExtensionContext.builder()
+                                                                                                                   .items(itemMap)
+                                                                                                                   .operationContext(PRIMARY_CONTEXT)
+                                                                                                                   .tableMetadata(FakeItemWithSort.getTableMetadata())
+                                                                                                                   .build());
+
+        assertThat(writeModification, is(WriteModification.builder().build()));
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void beforeWrite_throwsIllegalArgumentException_ifVersionAttributeIsWrongType() {
+        FakeItem fakeItem = createUniqueFakeItem();
+        Map<String, AttributeValue> fakeItemWIthBadVersion =
+            new HashMap<>(FakeItem.getTableSchema().itemToMap(fakeItem, true));
+        fakeItemWIthBadVersion.put("version", AttributeValue.builder().s("14").build());
+
+        versionedRecordExtension.beforeWrite(
+            DefaultDynamoDbExtensionContext.builder()
+                                           .items(fakeItemWIthBadVersion)
+                                           .operationContext(PRIMARY_CONTEXT)
+                                           .tableMetadata(FakeItem.getTableMetadata())
+                                           .build());
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/AsyncBasicCrudTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/AsyncBasicCrudTest.java
new file mode 100644
index 000000000000..7901f42fe594
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/AsyncBasicCrudTest.java
@@ -0,0 +1,680 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.functionaltests;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.instanceOf;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.nullValue;
+import static software.amazon.awssdk.enhanced.dynamodb.internal.AttributeValues.stringValue;
+import static software.amazon.awssdk.enhanced.dynamodb.mapper.StaticAttributeTags.primaryPartitionKey;
+import static software.amazon.awssdk.enhanced.dynamodb.mapper.StaticAttributeTags.primarySortKey;
+import static software.amazon.awssdk.enhanced.dynamodb.mapper.StaticAttributeTags.secondaryPartitionKey;
+import static software.amazon.awssdk.enhanced.dynamodb.mapper.StaticAttributeTags.secondarySortKey;
+
+import java.util.Objects;
+import java.util.concurrent.CompletionException;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbAsyncTable;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedAsyncClient;
+import software.amazon.awssdk.enhanced.dynamodb.Expression;
+import software.amazon.awssdk.enhanced.dynamodb.Key;
+import software.amazon.awssdk.enhanced.dynamodb.TableSchema;
+import software.amazon.awssdk.enhanced.dynamodb.internal.client.DefaultDynamoDbEnhancedAsyncClient;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.StaticTableSchema;
+import software.amazon.awssdk.enhanced.dynamodb.model.DeleteItemEnhancedRequest;
+import software.amazon.awssdk.enhanced.dynamodb.model.EnhancedGlobalSecondaryIndex;
+import software.amazon.awssdk.enhanced.dynamodb.model.PutItemEnhancedRequest;
+import software.amazon.awssdk.enhanced.dynamodb.model.UpdateItemEnhancedRequest;
+import software.amazon.awssdk.services.dynamodb.model.ConditionalCheckFailedException;
+import software.amazon.awssdk.services.dynamodb.model.DeleteTableRequest;
+import software.amazon.awssdk.services.dynamodb.model.ProjectionType;
+
+public class AsyncBasicCrudTest extends LocalDynamoDbAsyncTestBase {
+    private static class Record {
+        private String id;
+        private String sort;
+        private String attribute;
+        private String attribute2;
+        private String attribute3;
+
+        private String getId() {
+            return id;
+        }
+
+        private Record setId(String id) {
+            this.id = id;
+            return this;
+        }
+
+        private String getSort() {
+            return sort;
+        }
+
+        private Record setSort(String sort) {
+            this.sort = sort;
+            return this;
+        }
+
+        private String getAttribute() {
+            return attribute;
+        }
+
+        private Record setAttribute(String attribute) {
+            this.attribute = attribute;
+            return this;
+        }
+
+        private String getAttribute2() {
+            return attribute2;
+        }
+
+        private Record setAttribute2(String attribute2) {
+            this.attribute2 = attribute2;
+            return this;
+        }
+
+        private String getAttribute3() {
+            return attribute3;
+        }
+
+        private Record setAttribute3(String attribute3) {
+            this.attribute3 = attribute3;
+            return this;
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) return true;
+            if (o == null || getClass() != o.getClass()) return false;
+            Record record = (Record) o;
+            return Objects.equals(id, record.id) &&
+                   Objects.equals(sort, record.sort) &&
+                   Objects.equals(attribute, record.attribute) &&
+                   Objects.equals(attribute2, record.attribute2) &&
+                   Objects.equals(attribute3, record.attribute3);
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(id, sort, attribute, attribute2, attribute3);
+        }
+    }
+    
+    private static class ShortRecord {
+        private String id;
+        private String sort;
+        private String attribute;
+
+        private String getId() {
+            return id;
+        }
+
+        private ShortRecord setId(String id) {
+            this.id = id;
+            return this;
+        }
+
+        private String getSort() {
+            return sort;
+        }
+
+        private ShortRecord setSort(String sort) {
+            this.sort = sort;
+            return this;
+        }
+
+        private String getAttribute() {
+            return attribute;
+        }
+
+        private ShortRecord setAttribute(String attribute) {
+            this.attribute = attribute;
+            return this;
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) return true;
+            if (o == null || getClass() != o.getClass()) return false;
+            ShortRecord that = (ShortRecord) o;
+            return Objects.equals(id, that.id) &&
+                   Objects.equals(sort, that.sort) &&
+                   Objects.equals(attribute, that.attribute);
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(id, sort, attribute);
+        }
+    }
+
+    private static final TableSchema<Record> TABLE_SCHEMA =
+        StaticTableSchema.builder(Record.class)
+                         .newItemSupplier(Record::new)
+                         .addAttribute(String.class, a -> a.name("id")
+                                                           .getter(Record::getId)
+                                                           .setter(Record::setId)
+                                                           .tags(primaryPartitionKey()))
+                         .addAttribute(String.class, a -> a.name("sort")
+                                                           .getter(Record::getSort)
+                                                           .setter(Record::setSort)
+                                                           .tags(primarySortKey()))
+                         .addAttribute(String.class, a -> a.name("attribute")
+                                                           .getter(Record::getAttribute)
+                                                           .setter(Record::setAttribute))
+                         .addAttribute(String.class, a -> a.name("attribute2*")
+                                                           .getter(Record::getAttribute2)
+                                                           .setter(Record::setAttribute2)
+                                                           .tags(secondaryPartitionKey("gsi_1")))
+                         .addAttribute(String.class, a -> a.name("attribute3")
+                                                           .getter(Record::getAttribute3)
+                                                           .setter(Record::setAttribute3)
+                                                           .tags(secondarySortKey("gsi_1")))
+                         .build();
+
+    private static final TableSchema<ShortRecord> SHORT_TABLE_SCHEMA =
+        StaticTableSchema.builder(ShortRecord.class)
+                         .newItemSupplier(ShortRecord::new)
+                         .addAttribute(String.class, a -> a.name("id")
+                                                           .getter(ShortRecord::getId)
+                                                           .setter(ShortRecord::setId)
+                                                           .tags(primaryPartitionKey()))
+                         .addAttribute(String.class, a -> a.name("sort")
+                                                           .getter(ShortRecord::getSort)
+                                                           .setter(ShortRecord::setSort)
+                                                           .tags(primarySortKey()))
+                         .addAttribute(String.class, a -> a.name("attribute")
+                                                           .getter(ShortRecord::getAttribute)
+                                                           .setter(ShortRecord::setAttribute))
+                         .build();
+
+    private DynamoDbEnhancedAsyncClient enhancedAsyncClient =
+        DefaultDynamoDbEnhancedAsyncClient.builder()
+                                          .dynamoDbClient(getDynamoDbAsyncClient())
+                                          .build();
+
+    private DynamoDbAsyncTable<Record> mappedTable = enhancedAsyncClient.table(getConcreteTableName("table-name"),
+                                                                               TABLE_SCHEMA);
+    private DynamoDbAsyncTable<ShortRecord> mappedShortTable = enhancedAsyncClient.table(getConcreteTableName("table-name"),
+                                                                                         SHORT_TABLE_SCHEMA);
+
+    @Rule
+    public ExpectedException exception = ExpectedException.none();
+
+    @Before
+    public void createTable() {
+
+        mappedTable.createTable(
+                r -> r.provisionedThroughput(getDefaultProvisionedThroughput())
+                        .globalSecondaryIndices(
+                                EnhancedGlobalSecondaryIndex.builder()
+                                        .indexName("gsi_1")
+                                        .projection(p -> p.projectionType(ProjectionType.ALL))
+                                        .provisionedThroughput(getDefaultProvisionedThroughput())
+                                        .build()))
+                .join();
+    }
+
+    @After
+    public void deleteTable() {
+        getDynamoDbAsyncClient().deleteTable(DeleteTableRequest.builder()
+                                                               .tableName(getConcreteTableName("table-name"))
+                                                               .build())
+                                .join();
+    }
+
+    @Test
+    public void putThenGetItemUsingKey() {
+        Record record = new Record()
+                              .setId("id-value")
+                              .setSort("sort-value")
+                              .setAttribute("one")
+                              .setAttribute2("two")
+                              .setAttribute3("three");
+
+        mappedTable.putItem(r -> r.item(record)).join();
+        Record result = mappedTable.getItem(r -> r.key(k -> k.partitionValue("id-value").sortValue("sort-value"))).join();
+
+        assertThat(result, is(record));
+    }
+
+    @Test
+    public void putThenGetItemUsingKeyItem() {
+        Record record = new Record()
+                              .setId("id-value")
+                              .setSort("sort-value")
+                              .setAttribute("one")
+                              .setAttribute2("two")
+                              .setAttribute3("three");
+
+        mappedTable.putItem(r -> r.item(record)).join();
+
+        Record keyItem = new Record();
+        keyItem.setId("id-value");
+        keyItem.setSort("sort-value");
+
+        Record result = mappedTable.getItem(keyItem).join();
+
+        assertThat(result, is(record));
+    }
+
+    @Test
+    public void getNonExistentItem() {
+        Record result = mappedTable.getItem(r -> r.key(k -> k.partitionValue("id-value").sortValue("sort-value"))).join();
+        assertThat(result, is(nullValue()));
+    }
+
+    @Test
+    public void putTwiceThenGetItem() {
+        Record record = new Record()
+                              .setId("id-value")
+                              .setSort("sort-value")
+                              .setAttribute("one")
+                              .setAttribute2("two")
+                              .setAttribute3("three");
+
+        mappedTable.putItem(r -> r.item(record)).join();
+        Record record2 = new Record()
+                               .setId("id-value")
+                               .setSort("sort-value")
+                               .setAttribute("four")
+                               .setAttribute2("five")
+                               .setAttribute3("six");
+
+        mappedTable.putItem(r -> r.item(record2)).join();
+        Record result = mappedTable.getItem(r -> r.key(k -> k.partitionValue("id-value").sortValue("sort-value"))).join();
+
+        assertThat(result, is(record2));
+    }
+
+    @Test
+    public void putThenDeleteItem_usingShortcutForm() {
+        Record record = new Record()
+                              .setId("id-value")
+                              .setSort("sort-value")
+                              .setAttribute("one")
+                              .setAttribute2("two")
+                              .setAttribute3("three");
+
+        mappedTable.putItem(record).join();
+        Record beforeDeleteResult =
+            mappedTable.deleteItem(Key.builder().partitionValue("id-value").sortValue("sort-value").build()).join();
+        Record afterDeleteResult =
+            mappedTable.getItem(Key.builder().partitionValue("id-value").sortValue("sort-value").build()).join();
+
+        assertThat(beforeDeleteResult, is(record));
+        assertThat(afterDeleteResult, is(nullValue()));
+    }
+
+    @Test
+    public void putThenDeleteItem_usingKeyItemForm() {
+        Record record = new Record()
+            .setId("id-value")
+            .setSort("sort-value")
+            .setAttribute("one")
+            .setAttribute2("two")
+            .setAttribute3("three");
+
+        mappedTable.putItem(record).join();
+        Record beforeDeleteResult =
+            mappedTable.deleteItem(record).join();
+        Record afterDeleteResult =
+            mappedTable.getItem(Key.builder().partitionValue("id-value").sortValue("sort-value").build()).join();
+
+        assertThat(beforeDeleteResult, is(record));
+        assertThat(afterDeleteResult, is(nullValue()));
+    }
+
+    @Test
+    public void putWithConditionThatSucceeds() {
+        Record record = new Record()
+            .setId("id-value")
+            .setSort("sort-value")
+            .setAttribute("one")
+            .setAttribute2("two")
+            .setAttribute3("three");
+
+        mappedTable.putItem(r -> r.item(record)).join();
+        record.setAttribute("four");
+
+        Expression conditionExpression = Expression.builder()
+                                                   .expression("#key = :value OR #key1 = :value1")
+                                                   .putExpressionName("#key", "attribute")
+                                                   .putExpressionName("#key1", "attribute3")
+                                                   .putExpressionValue(":value", stringValue("wrong"))
+                                                   .putExpressionValue(":value1", stringValue("three"))
+                                                   .build();
+
+        mappedTable.putItem(PutItemEnhancedRequest.builder(Record.class)
+                                                  .item(record)
+                                                  .conditionExpression(conditionExpression)
+                                                  .build()).join();
+
+        Record result = mappedTable.getItem(r -> r.key(k -> k.partitionValue("id-value").sortValue("sort-value"))).join();
+        assertThat(result, is(record));
+    }
+
+    @Test
+    public void putWithConditionThatFails() {
+        Record record = new Record()
+            .setId("id-value")
+            .setSort("sort-value")
+            .setAttribute("one")
+            .setAttribute2("two")
+            .setAttribute3("three");
+
+        mappedTable.putItem(r -> r.item(record)).join();
+        record.setAttribute("four");
+
+        Expression conditionExpression = Expression.builder()
+                                                   .expression("#key = :value OR #key1 = :value1")
+                                                   .putExpressionName("#key", "attribute")
+                                                   .putExpressionName("#key1", "attribute3")
+                                                   .putExpressionValue(":value", stringValue("wrong"))
+                                                   .putExpressionValue(":value1", stringValue("wrong"))
+                                                   .build();
+
+        exception.expect(CompletionException.class);
+        exception.expectCause(instanceOf(ConditionalCheckFailedException.class));
+        mappedTable.putItem(PutItemEnhancedRequest.builder(Record.class)
+                                                  .item(record)
+                                                  .conditionExpression(conditionExpression)
+                                                  .build())
+                   .join();
+    }
+
+    @Test
+    public void deleteNonExistentItem() {
+        Record result = mappedTable.deleteItem(r -> r.key(k -> k.partitionValue("id-value").sortValue("sort-value"))).join();
+        assertThat(result, is(nullValue()));
+    }
+
+    @Test
+    public void deleteWithConditionThatSucceeds() {
+        Record record = new Record()
+            .setId("id-value")
+            .setSort("sort-value")
+            .setAttribute("one")
+            .setAttribute2("two")
+            .setAttribute3("three");
+
+        mappedTable.putItem(r -> r.item(record)).join();
+
+        Expression conditionExpression = Expression.builder()
+                                                   .expression("#key = :value OR #key1 = :value1")
+                                                   .putExpressionName("#key", "attribute")
+                                                   .putExpressionName("#key1", "attribute3")
+                                                   .putExpressionValue(":value", stringValue("wrong"))
+                                                   .putExpressionValue(":value1", stringValue("three"))
+                                                   .build();
+
+        Key key = mappedTable.keyFrom(record);
+        mappedTable.deleteItem(DeleteItemEnhancedRequest.builder()
+                                                        .key(key)
+                                                        .conditionExpression(conditionExpression)
+                                                        .build())
+                   .join();
+
+        Record result = mappedTable.getItem(r -> r.key(key)).join();
+        assertThat(result, is(nullValue()));
+    }
+
+    @Test
+    public void deleteWithConditionThatFails() {
+        Record record = new Record()
+            .setId("id-value")
+            .setSort("sort-value")
+            .setAttribute("one")
+            .setAttribute2("two")
+            .setAttribute3("three");
+
+        mappedTable.putItem(r -> r.item(record)).join();
+
+        Expression conditionExpression = Expression.builder()
+                                                   .expression("#key = :value OR #key1 = :value1")
+                                                   .putExpressionName("#key", "attribute")
+                                                   .putExpressionName("#key1", "attribute3")
+                                                   .putExpressionValue(":value", stringValue("wrong"))
+                                                   .putExpressionValue(":value1", stringValue("wrong"))
+                                                   .build();
+
+        exception.expect(CompletionException.class);
+        exception.expectCause(instanceOf(ConditionalCheckFailedException.class));
+        mappedTable.deleteItem(DeleteItemEnhancedRequest.builder().key(mappedTable.keyFrom(record))
+                                                        .conditionExpression(conditionExpression)
+                                                        .build()).join();
+    }
+
+    @Test
+    public void updateOverwriteCompleteRecord_usingShortcutForm() {
+        Record record = new Record()
+                              .setId("id-value")
+                              .setSort("sort-value")
+                              .setAttribute("one")
+                              .setAttribute2("two")
+                              .setAttribute3("three");
+
+        mappedTable.putItem(record).join();
+        Record record2 = new Record()
+                               .setId("id-value")
+                               .setSort("sort-value")
+                               .setAttribute("four")
+                               .setAttribute2("five")
+                               .setAttribute3("six");
+        Record result = mappedTable.updateItem(record2).join();
+
+        assertThat(result, is(record2));
+    }
+
+    @Test
+    public void updateCreatePartialRecord() {
+        Record record = new Record()
+                              .setId("id-value")
+                              .setSort("sort-value")
+                              .setAttribute("one");
+
+        Record result = mappedTable.updateItem(r -> r.item(record)).join();
+
+        assertThat(result, is(record));
+    }
+
+    @Test
+    public void updateCreateKeyOnlyRecord() {
+        Record record = new Record()
+                              .setId("id-value")
+                              .setSort("sort-value");
+
+        Record result = mappedTable.updateItem(r -> r.item(record)).join();
+        assertThat(result, is(record));
+    }
+
+    @Test
+    public void updateOverwriteModelledNulls() {
+        Record record = new Record()
+                              .setId("id-value")
+                              .setSort("sort-value")
+                              .setAttribute("one")
+                              .setAttribute2("two")
+                              .setAttribute3("three");
+
+        mappedTable.putItem(r -> r.item(record)).join();
+        Record record2 = new Record()
+                               .setId("id-value")
+                               .setSort("sort-value")
+                               .setAttribute("four");
+        Record result = mappedTable.updateItem(r -> r.item(record2)).join();
+
+        assertThat(result, is(record2));
+    }
+
+    @Test
+    public void updateCanIgnoreNullsAndDoPartialUpdate() {
+        Record record = new Record()
+                              .setId("id-value")
+                              .setSort("sort-value")
+                              .setAttribute("one")
+                              .setAttribute2("two")
+                              .setAttribute3("three");
+
+        mappedTable.putItem(r -> r.item(record)).join();
+        Record record2 = new Record()
+                               .setId("id-value")
+                               .setSort("sort-value")
+                               .setAttribute("four");
+        Record result = mappedTable.updateItem(UpdateItemEnhancedRequest.builder(Record.class)
+                                                                        .item(record2)
+                                                                        .ignoreNulls(true)
+                                                                        .build())
+                                   .join();
+
+        Record expectedResult = new Record()
+                               .setId("id-value")
+                               .setSort("sort-value")
+                               .setAttribute("four")
+                               .setAttribute2("two")
+                               .setAttribute3("three");
+        assertThat(result, is(expectedResult));
+    }
+
+    @Test
+    public void updateShortRecordDoesPartialUpdate() {
+        Record record = new Record()
+                              .setId("id-value")
+                              .setSort("sort-value")
+                              .setAttribute("one")
+                              .setAttribute2("two")
+                              .setAttribute3("three");
+
+        mappedTable.putItem(r -> r.item(record)).join();
+        ShortRecord record2 = new ShortRecord()
+                                         .setId("id-value")
+                                         .setSort("sort-value")
+                                         .setAttribute("four");
+        ShortRecord shortResult = mappedShortTable.updateItem(r -> r.item(record2)).join();
+        Record result = mappedTable.getItem(r -> r.key(k -> k.partitionValue(record.getId())
+                                                             .sortValue(record.getSort()))).join();
+
+        Record expectedResult = new Record()
+                                      .setId("id-value")
+                                      .setSort("sort-value")
+                                      .setAttribute("four")
+                                      .setAttribute2("two")
+                                      .setAttribute3("three");
+        assertThat(result, is(expectedResult));
+        assertThat(shortResult, is(record2));
+    }
+
+    @Test
+    public void updateKeyOnlyExistingRecordDoesNothing() {
+        Record record = new Record()
+                              .setId("id-value")
+                              .setSort("sort-value")
+                              .setAttribute("one")
+                              .setAttribute2("two")
+                              .setAttribute3("three");
+
+        mappedTable.putItem(r -> r.item(record)).join();
+        Record updateRecord = new Record().setId("id-value").setSort("sort-value");
+
+        Record result = mappedTable.updateItem(UpdateItemEnhancedRequest.builder(Record.class)
+                                                                        .item(updateRecord)
+                                                                        .ignoreNulls(true)
+                                                                        .build())
+                                   .join();
+
+        assertThat(result, is(record));
+    }
+
+    @Test
+    public void updateWithConditionThatSucceeds() {
+        Record record = new Record()
+            .setId("id-value")
+            .setSort("sort-value")
+            .setAttribute("one")
+            .setAttribute2("two")
+            .setAttribute3("three");
+
+        mappedTable.putItem(r -> r.item(record)).join();
+        record.setAttribute("four");
+
+        Expression conditionExpression = Expression.builder()
+                                                   .expression("#key = :value OR #key1 = :value1")
+                                                   .putExpressionName("#key", "attribute")
+                                                   .putExpressionName("#key1", "attribute3")
+                                                   .putExpressionValue(":value", stringValue("wrong"))
+                                                   .putExpressionValue(":value1", stringValue("three"))
+                                                   .build();
+
+        mappedTable.updateItem(UpdateItemEnhancedRequest.builder(Record.class)
+                                                        .item(record)
+                                                        .conditionExpression(conditionExpression)
+                                                        .build())
+                   .join();
+
+        Record result = mappedTable.getItem(r -> r.key(k -> k.partitionValue("id-value").sortValue("sort-value"))).join();
+        assertThat(result, is(record));
+    }
+
+    @Test
+    public void updateWithConditionThatFails() {
+        Record record = new Record()
+            .setId("id-value")
+            .setSort("sort-value")
+            .setAttribute("one")
+            .setAttribute2("two")
+            .setAttribute3("three");
+
+        mappedTable.putItem(r -> r.item(record)).join();
+        record.setAttribute("four");
+
+        Expression conditionExpression = Expression.builder()
+                                                   .expression("#key = :value OR #key1 = :value1")
+                                                   .putExpressionName("#key", "attribute")
+                                                   .putExpressionName("#key1", "attribute3")
+                                                   .putExpressionValue(":value", stringValue("wrong"))
+                                                   .putExpressionValue(":value1", stringValue("wrong"))
+                                                   .build();
+
+        exception.expect(CompletionException.class);
+        exception.expectCause(instanceOf(ConditionalCheckFailedException.class));
+        mappedTable.updateItem(UpdateItemEnhancedRequest.builder(Record.class)
+                                                        .item(record)
+                                                        .conditionExpression(conditionExpression)
+                                                        .build())
+                   .join();
+    }
+
+    @Test
+    public void getAShortRecordWithNewModelledFields() {
+        ShortRecord shortRecord = new ShortRecord()
+                                         .setId("id-value")
+                                         .setSort("sort-value")
+                                         .setAttribute("one");
+        mappedShortTable.putItem(r -> r.item(shortRecord)).join();
+        Record expectedRecord = new Record()
+                                      .setId("id-value")
+                                      .setSort("sort-value")
+                                      .setAttribute("one");
+
+        Record result = mappedTable.getItem(r -> r.key(k -> k.partitionValue("id-value").sortValue("sort-value"))).join();
+        assertThat(result, is(expectedRecord));
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/AsyncBasicQueryTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/AsyncBasicQueryTest.java
new file mode 100644
index 000000000000..b7fe4c041801
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/AsyncBasicQueryTest.java
@@ -0,0 +1,317 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.functionaltests;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.empty;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.nullValue;
+import static software.amazon.awssdk.enhanced.dynamodb.internal.AttributeValues.numberValue;
+import static software.amazon.awssdk.enhanced.dynamodb.internal.AttributeValues.stringValue;
+import static software.amazon.awssdk.enhanced.dynamodb.mapper.StaticAttributeTags.primaryPartitionKey;
+import static software.amazon.awssdk.enhanced.dynamodb.mapper.StaticAttributeTags.primarySortKey;
+import static software.amazon.awssdk.enhanced.dynamodb.model.QueryConditional.keyEqualTo;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import software.amazon.awssdk.core.async.SdkPublisher;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbAsyncTable;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedAsyncClient;
+import software.amazon.awssdk.enhanced.dynamodb.Expression;
+import software.amazon.awssdk.enhanced.dynamodb.Key;
+import software.amazon.awssdk.enhanced.dynamodb.TableSchema;
+import software.amazon.awssdk.enhanced.dynamodb.internal.client.DefaultDynamoDbEnhancedAsyncClient;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.StaticTableSchema;
+import software.amazon.awssdk.enhanced.dynamodb.model.Page;
+import software.amazon.awssdk.enhanced.dynamodb.model.QueryConditional;
+import software.amazon.awssdk.enhanced.dynamodb.model.QueryEnhancedRequest;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+import software.amazon.awssdk.services.dynamodb.model.DeleteTableRequest;
+
+public class AsyncBasicQueryTest extends LocalDynamoDbAsyncTestBase {
+    private static class Record {
+        private String id;
+        private Integer sort;
+        private Integer value;
+
+        public String getId() {
+            return id;
+        }
+
+        public Record setId(String id) {
+            this.id = id;
+            return this;
+        }
+
+        public Integer getSort() {
+            return sort;
+        }
+
+        public Record setSort(Integer sort) {
+            this.sort = sort;
+            return this;
+        }
+
+        public Integer getValue() {
+            return value;
+        }
+
+        public Record setValue(Integer value) {
+            this.value = value;
+            return this;
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) return true;
+            if (o == null || getClass() != o.getClass()) return false;
+            Record record = (Record) o;
+            return Objects.equals(id, record.id) &&
+                   Objects.equals(sort, record.sort) &&
+                   Objects.equals(value, record.value);
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(id, sort, value);
+        }
+    }
+
+    private static final TableSchema<Record> TABLE_SCHEMA =
+        StaticTableSchema.builder(Record.class)
+                         .newItemSupplier(Record::new)
+                         .addAttribute(String.class, a -> a.name("id")
+                                                           .getter(Record::getId)
+                                                           .setter(Record::setId)
+                                                           .tags(primaryPartitionKey()))
+                         .addAttribute(Integer.class, a -> a.name("sort")
+                                                            .getter(Record::getSort)
+                                                            .setter(Record::setSort)
+                                                            .tags(primarySortKey()))
+                         .addAttribute(Integer.class, a -> a.name("value")
+                                                            .getter(Record::getValue)
+                                                            .setter(Record::setValue))
+                         .build();
+
+    private static final List<Record> RECORDS =
+        IntStream.range(0, 10)
+                 .mapToObj(i -> new Record().setId("id-value").setSort(i).setValue(i))
+                 .collect(Collectors.toList());
+
+    private DynamoDbEnhancedAsyncClient enhancedAsyncClient = DefaultDynamoDbEnhancedAsyncClient.builder()
+                                                                                                .dynamoDbClient(getDynamoDbAsyncClient())
+                                                                                                .build();
+
+    private DynamoDbAsyncTable<Record> mappedTable = enhancedAsyncClient.table(getConcreteTableName("table-name"), TABLE_SCHEMA);
+
+    private void insertRecords() {
+        RECORDS.forEach(record -> mappedTable.putItem(r -> r.item(record)).join());
+    }
+    
+    @Before
+    public void createTable() {
+        mappedTable.createTable(r -> r.provisionedThroughput(getDefaultProvisionedThroughput())).join();
+    }
+
+    @After
+    public void deleteTable() {
+        getDynamoDbAsyncClient().deleteTable(DeleteTableRequest.builder()
+                                                               .tableName(getConcreteTableName("table-name"))
+                                                               .build())
+                                .join();
+    }
+
+    @Test
+    public void queryAllRecordsDefaultSettings_usingShortcutForm() {
+        insertRecords();
+
+        SdkPublisher<Page<Record>> publisher =
+            mappedTable.query(keyEqualTo(k -> k.partitionValue("id-value")));
+        
+        List<Page<Record>> results = drainPublisher(publisher, 1);
+        Page<Record> page = results.get(0);
+        
+        assertThat(page.items(), is(RECORDS));
+        assertThat(page.lastEvaluatedKey(), is(nullValue()));
+    }
+
+    @Test
+    public void queryAllRecordsWithFilter() {
+        insertRecords();
+        Map<String, AttributeValue> expressionValues = new HashMap<>();
+        expressionValues.put(":min_value", numberValue(3));
+        expressionValues.put(":max_value", numberValue(5));
+        Expression expression = Expression.builder()
+                                          .expression("#value >= :min_value AND #value <= :max_value")
+                                          .expressionValues(expressionValues)
+                                          .expressionNames(Collections.singletonMap("#value", "value"))
+                                          .build();
+
+        SdkPublisher<Page<Record>> publisher =
+            mappedTable.query(QueryEnhancedRequest.builder()
+                                                  .queryConditional(keyEqualTo(k -> k.partitionValue("id-value")))
+                                                  .filterExpression(expression)
+                                                  .build());
+
+        List<Page<Record>> results = drainPublisher(publisher, 1);
+        Page<Record> page = results.get(0);
+
+        assertThat(page.items(),
+                   is(RECORDS.stream().filter(r -> r.sort >= 3 && r.sort <= 5).collect(Collectors.toList())));
+        assertThat(page.lastEvaluatedKey(), is(nullValue()));
+    }
+
+    @Test
+    public void queryAllRecordsWithFilter_viaItems() {
+        insertRecords();
+        Map<String, AttributeValue> expressionValues = new HashMap<>();
+        expressionValues.put(":min_value", numberValue(3));
+        expressionValues.put(":max_value", numberValue(5));
+        Expression expression = Expression.builder()
+                                          .expression("#value >= :min_value AND #value <= :max_value")
+                                          .expressionValues(expressionValues)
+                                          .expressionNames(Collections.singletonMap("#value", "value"))
+                                          .build();
+
+        SdkPublisher<Record> publisher =
+            mappedTable.query(QueryEnhancedRequest.builder()
+                                                  .queryConditional(keyEqualTo(k -> k.partitionValue("id-value")))
+                                                  .filterExpression(expression)
+                                                  .build()).items();
+
+        List<Record> results = drainPublisher(publisher, 3);
+
+        assertThat(results,
+                   is(RECORDS.stream().filter(r -> r.sort >= 3 && r.sort <= 5).collect(Collectors.toList())));
+    }
+
+    @Test
+    public void queryBetween() {
+        insertRecords();
+        Key fromKey = Key.builder().partitionValue("id-value").sortValue(3).build();
+        Key toKey = Key.builder().partitionValue("id-value").sortValue(5).build();
+        SdkPublisher<Page<Record>> publisher = mappedTable.query(r -> r.queryConditional(QueryConditional.sortBetween(fromKey, toKey)));
+
+        List<Page<Record>> results = drainPublisher(publisher, 1);
+        Page<Record> page = results.get(0);
+
+        assertThat(page.items(),
+                   is(RECORDS.stream().filter(r -> r.sort >= 3 && r.sort <= 5).collect(Collectors.toList())));
+        assertThat(page.lastEvaluatedKey(), is(nullValue()));
+    }
+
+    @Test
+    public void queryBetween_viaItems() {
+        insertRecords();
+        Key fromKey = Key.builder().partitionValue("id-value").sortValue(3).build();
+        Key toKey = Key.builder().partitionValue("id-value").sortValue(5).build();
+        SdkPublisher<Record> publisher = mappedTable.query(r -> r.queryConditional(QueryConditional.sortBetween(fromKey, toKey))).items();
+
+        List<Record> results = drainPublisher(publisher, 3);
+
+        assertThat(results,
+                   is(RECORDS.stream().filter(r -> r.sort >= 3 && r.sort <= 5).collect(Collectors.toList())));
+    }
+
+    @Test
+    public void queryLimit() {
+        insertRecords();
+        SdkPublisher<Page<Record>> publisher =
+            mappedTable.query(QueryEnhancedRequest.builder()
+                                                  .queryConditional(keyEqualTo(k -> k.partitionValue("id-value")))
+                                                  .limit(5)
+                                                  .build());
+
+        List<Page<Record>> results = drainPublisher(publisher, 3);
+        Page<Record> page1 = results.get(0);
+        Page<Record> page2 = results.get(1);
+        Page<Record> page3 = results.get(2);
+
+        Map<String, AttributeValue> expectedLastEvaluatedKey1 = new HashMap<>();
+        expectedLastEvaluatedKey1.put("id", stringValue("id-value"));
+        expectedLastEvaluatedKey1.put("sort", numberValue(4));
+        Map<String, AttributeValue> expectedLastEvaluatedKey2 = new HashMap<>();
+        expectedLastEvaluatedKey2.put("id", stringValue("id-value"));
+        expectedLastEvaluatedKey2.put("sort", numberValue(9));
+        assertThat(page1.items(), is(RECORDS.subList(0, 5)));
+        assertThat(page1.lastEvaluatedKey(), is(expectedLastEvaluatedKey1));
+        assertThat(page2.items(), is(RECORDS.subList(5, 10)));
+        assertThat(page2.lastEvaluatedKey(), is(expectedLastEvaluatedKey2));
+        assertThat(page3.items(), is(empty()));
+        assertThat(page3.lastEvaluatedKey(), is(nullValue()));
+    }
+
+    @Test
+    public void queryLimit_viaItems() {
+        insertRecords();
+        SdkPublisher<Record> publisher =
+            mappedTable.query(QueryEnhancedRequest.builder()
+                                                  .queryConditional(keyEqualTo(k -> k.partitionValue("id-value")))
+                                                  .limit(5)
+                                                  .build())
+                       .items();
+
+        List<Record> results = drainPublisher(publisher, 10);
+        assertThat(results, is(RECORDS));
+    }
+
+    @Test
+    public void queryEmpty() {
+        SdkPublisher<Page<Record>> publisher =
+            mappedTable.query(r -> r.queryConditional(keyEqualTo(k -> k.partitionValue("id-value"))));
+
+        List<Page<Record>> results = drainPublisher(publisher, 1);
+        Page<Record> page = results.get(0);
+
+        assertThat(page.items(), is(empty()));
+        assertThat(page.lastEvaluatedKey(), is(nullValue()));
+    }
+
+    @Test
+    public void queryEmpty_viaItems() {
+        SdkPublisher<Record> publisher =
+            mappedTable.query(r -> r.queryConditional(keyEqualTo(k -> k.partitionValue("id-value")))).items();
+
+        List<Record> results = drainPublisher(publisher, 0);
+        assertThat(results, is(empty()));
+    }
+
+    @Test
+    public void queryExclusiveStartKey() {
+        Map<String, AttributeValue> exclusiveStartKey = new HashMap<>();
+        exclusiveStartKey.put("id", stringValue("id-value"));
+        exclusiveStartKey.put("sort", numberValue(7));
+        insertRecords();
+        SdkPublisher<Page<Record>> publisher =
+            mappedTable.query(QueryEnhancedRequest.builder()
+                                                  .queryConditional(keyEqualTo(k -> k.partitionValue("id-value")))
+                                                  .exclusiveStartKey(exclusiveStartKey)
+                                                  .build());
+
+        List<Page<Record>> results = drainPublisher(publisher, 1);
+        Page<Record> page = results.get(0);
+        assertThat(page.items(), is(RECORDS.subList(8, 10)));
+        assertThat(page.lastEvaluatedKey(), is(nullValue()));
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/AsyncBasicScanTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/AsyncBasicScanTest.java
new file mode 100644
index 000000000000..e69ff876e4ad
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/AsyncBasicScanTest.java
@@ -0,0 +1,270 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.functionaltests;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.empty;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.nullValue;
+import static software.amazon.awssdk.enhanced.dynamodb.internal.AttributeValues.numberValue;
+import static software.amazon.awssdk.enhanced.dynamodb.internal.AttributeValues.stringValue;
+import static software.amazon.awssdk.enhanced.dynamodb.mapper.StaticAttributeTags.primaryPartitionKey;
+import static software.amazon.awssdk.enhanced.dynamodb.mapper.StaticAttributeTags.primarySortKey;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import software.amazon.awssdk.core.async.SdkPublisher;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbAsyncTable;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedAsyncClient;
+import software.amazon.awssdk.enhanced.dynamodb.Expression;
+import software.amazon.awssdk.enhanced.dynamodb.TableSchema;
+import software.amazon.awssdk.enhanced.dynamodb.internal.client.DefaultDynamoDbEnhancedAsyncClient;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.StaticTableSchema;
+import software.amazon.awssdk.enhanced.dynamodb.model.Page;
+import software.amazon.awssdk.enhanced.dynamodb.model.ScanEnhancedRequest;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+import software.amazon.awssdk.services.dynamodb.model.DeleteTableRequest;
+
+public class AsyncBasicScanTest extends LocalDynamoDbAsyncTestBase {
+    private static class Record {
+        private String id;
+        private Integer sort;
+
+        private String getId() {
+            return id;
+        }
+
+        private Record setId(String id) {
+            this.id = id;
+            return this;
+        }
+
+        private Integer getSort() {
+            return sort;
+        }
+
+        private Record setSort(Integer sort) {
+            this.sort = sort;
+            return this;
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) return true;
+            if (o == null || getClass() != o.getClass()) return false;
+            Record record = (Record) o;
+            return Objects.equals(id, record.id) &&
+                   Objects.equals(sort, record.sort);
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(id, sort);
+        }
+    }
+
+    private static final TableSchema<Record> TABLE_SCHEMA =
+        StaticTableSchema.builder(Record.class)
+                         .newItemSupplier(Record::new)
+                         .addAttribute(String.class, a -> a.name("id")
+                                                           .getter(Record::getId)
+                                                           .setter(Record::setId)
+                                                           .tags(primaryPartitionKey()))
+                         .addAttribute(Integer.class, a -> a.name("sort")
+                                                            .getter(Record::getSort)
+                                                            .setter(Record::setSort)
+                                                            .tags(primarySortKey()))
+                         .build();
+
+    private static final List<Record> RECORDS =
+        IntStream.range(0, 10)
+                 .mapToObj(i -> new Record().setId("id-value").setSort(i))
+                 .collect(Collectors.toList());
+
+    private DynamoDbEnhancedAsyncClient enhancedAsyncClient =
+        DefaultDynamoDbEnhancedAsyncClient.builder()
+                                          .dynamoDbClient(getDynamoDbAsyncClient())
+                                          .build();
+
+    private DynamoDbAsyncTable<Record> mappedTable = enhancedAsyncClient.table(getConcreteTableName("table-name"), TABLE_SCHEMA);
+
+    private void insertRecords() {
+        RECORDS.forEach(record -> mappedTable.putItem(r -> r.item(record)).join());
+    }
+
+    @Before
+    public void createTable() {
+        mappedTable.createTable(r -> r.provisionedThroughput(getDefaultProvisionedThroughput())).join();
+    }
+
+    @After
+    public void deleteTable() {
+        getDynamoDbAsyncClient().deleteTable(DeleteTableRequest.builder()
+                                                               .tableName(getConcreteTableName("table-name"))
+                                                               .build()).join();
+    }
+
+    @Test
+    public void scanAllRecordsDefaultSettings() {
+        insertRecords();
+
+        SdkPublisher<Page<Record>> publisher = mappedTable.scan(ScanEnhancedRequest.builder().build());
+        List<Page<Record>> results = drainPublisher(publisher, 1);
+        Page<Record> page = results.get(0);
+
+        assertThat(page.items(), is(RECORDS));
+        assertThat(page.lastEvaluatedKey(), is(nullValue()));
+    }
+
+    @Test
+    public void scanAllRecordsDefaultSettings_viaItems() {
+        insertRecords();
+
+        SdkPublisher<Record> publisher = mappedTable.scan(ScanEnhancedRequest.builder().build()).items();
+        List<Record> results = drainPublisher(publisher, 10);
+
+        assertThat(results, is(RECORDS));
+    }
+
+    @Test
+    public void scanAllRecordsWithFilter() {
+        insertRecords();
+        Map<String, AttributeValue> expressionValues = new HashMap<>();
+        expressionValues.put(":min_value", numberValue(3));
+        expressionValues.put(":max_value", numberValue(5));
+        Expression expression = Expression.builder()
+                                          .expression("sort >= :min_value AND sort <= :max_value")
+                                          .expressionValues(expressionValues)
+                                          .build();
+
+        SdkPublisher<Page<Record>> publisher =
+            mappedTable.scan(ScanEnhancedRequest.builder().filterExpression(expression).build());
+
+        List<Page<Record>> results = drainPublisher(publisher, 1);
+        Page<Record> page = results.get(0);
+
+        assertThat(page.items(),
+                   is(RECORDS.stream().filter(r -> r.sort >= 3 && r.sort <= 5).collect(Collectors.toList())));
+        assertThat(page.lastEvaluatedKey(), is(nullValue()));
+    }
+
+    @Test
+    public void scanAllRecordsWithFilter_viaItems() {
+        insertRecords();
+        Map<String, AttributeValue> expressionValues = new HashMap<>();
+        expressionValues.put(":min_value", numberValue(3));
+        expressionValues.put(":max_value", numberValue(5));
+        Expression expression = Expression.builder()
+                                          .expression("sort >= :min_value AND sort <= :max_value")
+                                          .expressionValues(expressionValues)
+                                          .build();
+
+        SdkPublisher<Record> publisher =
+            mappedTable.scan(ScanEnhancedRequest.builder().filterExpression(expression).build()).items();
+
+        List<Record> results = drainPublisher(publisher, 3);
+
+        assertThat(results,
+                   is(RECORDS.stream().filter(r -> r.sort >= 3 && r.sort <= 5).collect(Collectors.toList())));
+    }
+
+    @Test
+    public void scanLimit() {
+        insertRecords();
+
+        SdkPublisher<Page<Record>> publisher = mappedTable.scan(r -> r.limit(5));
+        publisher.subscribe(page -> page.items().forEach(item -> System.out.println(item)));
+
+        List<Page<Record>> results = drainPublisher(publisher, 3);
+
+        Page<Record> page1 = results.get(0);
+        Page<Record> page2 = results.get(1);
+        Page<Record> page3 = results.get(2);
+
+        assertThat(page1.items(), is(RECORDS.subList(0, 5)));
+        assertThat(page1.lastEvaluatedKey(), is(getKeyMap(4)));
+        assertThat(page2.items(), is(RECORDS.subList(5, 10)));
+        assertThat(page2.lastEvaluatedKey(), is(getKeyMap(9)));
+        assertThat(page3.items(), is(empty()));
+        assertThat(page3.lastEvaluatedKey(), is(nullValue()));
+    }
+
+    @Test
+    public void scanLimit_viaItems() {
+        insertRecords();
+
+        SdkPublisher<Record> publisher = mappedTable.scan(r -> r.limit(5)).items();
+        List<Record> results = drainPublisher(publisher, 10);
+        assertThat(results, is(RECORDS));
+    }
+
+    @Test
+    public void scanEmpty() {
+        SdkPublisher<Page<Record>> publisher = mappedTable.scan();
+        List<Page<Record>> results = drainPublisher(publisher, 1);
+        Page<Record> page = results.get(0);
+
+        assertThat(page.items(), is(empty()));
+        assertThat(page.lastEvaluatedKey(), is(nullValue()));
+    }
+
+    @Test
+    public void scanEmpty_viaItems() {
+        SdkPublisher<Record> publisher = mappedTable.scan().items();
+        List<Record> results = drainPublisher(publisher, 0);
+
+        assertThat(results, is(empty()));
+    }
+
+    @Test
+    public void scanExclusiveStartKey() {
+        insertRecords();
+        SdkPublisher<Page<Record>> publisher =
+            mappedTable.scan(ScanEnhancedRequest.builder().exclusiveStartKey(getKeyMap(7)).build());
+
+        List<Page<Record>> results = drainPublisher(publisher, 1);
+        Page<Record> page = results.get(0);
+
+        assertThat(page.items(), is(RECORDS.subList(8, 10)));
+        assertThat(page.lastEvaluatedKey(), is(nullValue()));
+    }
+
+    @Test
+    public void scanExclusiveStartKey_viaItems() {
+        insertRecords();
+        SdkPublisher<Record> publisher =
+            mappedTable.scan(ScanEnhancedRequest.builder().exclusiveStartKey(getKeyMap(7)).build()).items();
+
+        List<Record> results = drainPublisher(publisher, 2);
+
+        assertThat(results, is(RECORDS.subList(8, 10)));
+    }
+
+    private Map<String, AttributeValue> getKeyMap(int sort) {
+        Map<String, AttributeValue> result = new HashMap<>();
+        result.put("id", stringValue("id-value"));
+        result.put("sort", numberValue(sort));
+        return Collections.unmodifiableMap(result);
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/AsyncBatchGetItemTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/AsyncBatchGetItemTest.java
new file mode 100644
index 000000000000..3c90d04562da
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/AsyncBatchGetItemTest.java
@@ -0,0 +1,267 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.functionaltests;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsInAnyOrder;
+import static org.hamcrest.Matchers.is;
+import static software.amazon.awssdk.enhanced.dynamodb.mapper.StaticAttributeTags.primaryPartitionKey;
+
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import software.amazon.awssdk.core.async.SdkPublisher;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbAsyncTable;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedAsyncClient;
+import software.amazon.awssdk.enhanced.dynamodb.TableSchema;
+import software.amazon.awssdk.enhanced.dynamodb.internal.client.DefaultDynamoDbEnhancedAsyncClient;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.StaticTableSchema;
+import software.amazon.awssdk.enhanced.dynamodb.model.BatchGetItemEnhancedRequest;
+import software.amazon.awssdk.enhanced.dynamodb.model.BatchGetResultPage;
+import software.amazon.awssdk.enhanced.dynamodb.model.BatchGetResultPagePublisher;
+import software.amazon.awssdk.enhanced.dynamodb.model.ReadBatch;
+import software.amazon.awssdk.services.dynamodb.model.DeleteTableRequest;
+
+public class AsyncBatchGetItemTest extends LocalDynamoDbAsyncTestBase {
+    private static class Record1 {
+        private Integer id;
+
+        private Integer getId() {
+            return id;
+        }
+
+        private Record1 setId(Integer id) {
+            this.id = id;
+            return this;
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) return true;
+            if (o == null || getClass() != o.getClass()) return false;
+            Record1 record1 = (Record1) o;
+            return Objects.equals(id, record1.id);
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(id);
+        }
+    }
+
+    private static class Record2 {
+        private Integer id;
+
+        private Integer getId() {
+            return id;
+        }
+
+        private Record2 setId(Integer id) {
+            this.id = id;
+            return this;
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) return true;
+            if (o == null || getClass() != o.getClass()) return false;
+            Record2 record2 = (Record2) o;
+            return Objects.equals(id, record2.id);
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(id);
+        }
+    }
+
+    private static final TableSchema<Record1> TABLE_SCHEMA_1 =
+        StaticTableSchema.builder(Record1.class)
+                         .newItemSupplier(Record1::new)
+                         .addAttribute(Integer.class, a -> a.name("id_1")
+                                                            .getter(Record1::getId)
+                                                            .setter(Record1::setId)
+                                                            .tags(primaryPartitionKey()))
+                         .build();
+
+    private static final TableSchema<Record2> TABLE_SCHEMA_2 =
+        StaticTableSchema.builder(Record2.class)
+                         .newItemSupplier(Record2::new)
+                         .addAttribute(Integer.class, a -> a.name("id_2")
+                                                            .getter(Record2::getId)
+                                                            .setter(Record2::setId)
+                                                            .tags(primaryPartitionKey()))
+                         .build();
+
+    private DynamoDbEnhancedAsyncClient enhancedAsyncClient =
+        DefaultDynamoDbEnhancedAsyncClient.builder()
+                                          .dynamoDbClient(getDynamoDbAsyncClient())
+                                          .build();
+
+    private DynamoDbAsyncTable<Record1> mappedTable1 = enhancedAsyncClient.table(getConcreteTableName("table-name-1"),
+                                                                                 TABLE_SCHEMA_1);
+    private DynamoDbAsyncTable<Record2> mappedTable2 = enhancedAsyncClient.table(getConcreteTableName("table-name-2"),
+                                                                                 TABLE_SCHEMA_2);
+
+    private static final List<Record1> RECORDS_1 =
+        IntStream.range(0, 2)
+                 .mapToObj(i -> new Record1().setId(i))
+                 .collect(Collectors.toList());
+
+    private static final List<Record2> RECORDS_2 =
+        IntStream.range(0, 2)
+                 .mapToObj(i -> new Record2().setId(i))
+                 .collect(Collectors.toList());
+
+    @Before
+    public void createTable() {
+        mappedTable1.createTable(r -> r.provisionedThroughput(getDefaultProvisionedThroughput())).join();
+        mappedTable2.createTable(r -> r.provisionedThroughput(getDefaultProvisionedThroughput())).join();
+    }
+
+    @After
+    public void deleteTable() {
+        getDynamoDbAsyncClient().deleteTable(DeleteTableRequest.builder()
+                                                               .tableName(getConcreteTableName("table-name-1"))
+                                                               .build()).join();
+        getDynamoDbAsyncClient().deleteTable(DeleteTableRequest.builder()
+                                                               .tableName(getConcreteTableName("table-name-2"))
+                                                               .build()).join();
+    }
+
+    private void insertRecords() {
+        RECORDS_1.forEach(record -> mappedTable1.putItem(r -> r.item(record)).join());
+        RECORDS_2.forEach(record -> mappedTable2.putItem(r -> r.item(record)).join());
+    }
+
+    @Test
+    public void getRecordsFromMultipleTables() {
+        insertRecords();
+
+        SdkPublisher<BatchGetResultPage> publisher = batchGetResultPageSdkPublisherForBothTables();
+
+        List<BatchGetResultPage> results = drainPublisher(publisher, 1);
+        assertThat(results.size(), is(1));
+        BatchGetResultPage page = results.get(0);
+        List<Record1> record1List = page.resultsForTable(mappedTable1);
+        assertThat(record1List.size(), is(2));
+        assertThat(record1List, containsInAnyOrder(RECORDS_1.get(0), RECORDS_1.get(1)));
+
+        List<Record2> record2List = page.resultsForTable(mappedTable2);
+        assertThat(record2List.size(), is(2));
+        assertThat(record2List, containsInAnyOrder(RECORDS_2.get(0), RECORDS_2.get(1)));
+    }
+
+    @Test
+    public void getRecordsFromMultipleTables_viaFlattenedItems() {
+        insertRecords();
+
+        BatchGetResultPagePublisher publisher = batchGetResultPageSdkPublisherForBothTables();
+
+        List<Record1> table1Results = drainPublisher(publisher.resultsForTable(mappedTable1), 2);
+        assertThat(table1Results.size(), is(2));
+        assertThat(table1Results, containsInAnyOrder(RECORDS_1.toArray()));
+
+        List<Record2> table2Results = drainPublisher(publisher.resultsForTable(mappedTable2), 2);
+        assertThat(table1Results.size(), is(2));
+        assertThat(table2Results, containsInAnyOrder(RECORDS_2.toArray()));
+    }
+
+    @Test
+    public void notFoundRecordReturnsNull() {
+        insertRecords();
+
+        BatchGetItemEnhancedRequest batchGetItemEnhancedRequest = requestWithNotFoundRecord();
+
+        SdkPublisher<BatchGetResultPage> publisher = enhancedAsyncClient.batchGetItem(batchGetItemEnhancedRequest);
+
+        List<BatchGetResultPage> results = drainPublisher(publisher, 1);
+        assertThat(results.size(), is(1));
+
+        BatchGetResultPage page = results.get(0);
+        List<Record1> record1List = page.resultsForTable(mappedTable1);
+        assertThat(record1List.size(), is(1));
+        assertThat(record1List.get(0).getId(), is(0));
+
+        List<Record2> record2List = page.resultsForTable(mappedTable2);
+        assertThat(record2List.size(), is(2));
+        assertThat(record2List, containsInAnyOrder(RECORDS_2.get(0), RECORDS_2.get(1)));
+    }
+
+    @Test
+    public void notFoundRecordReturnsNull_viaFlattenedItems() {
+        insertRecords();
+
+        BatchGetItemEnhancedRequest batchGetItemEnhancedRequest = requestWithNotFoundRecord();
+
+        BatchGetResultPagePublisher publisher = enhancedAsyncClient.batchGetItem(batchGetItemEnhancedRequest);
+
+        List<Record1> resultsForTable1 = drainPublisher(publisher.resultsForTable(mappedTable1), 1);
+        assertThat(resultsForTable1.size(), is(1));
+        assertThat(resultsForTable1.get(0).getId(), is(0));
+
+        List<Record2> record2List = drainPublisher(publisher.resultsForTable(mappedTable2), 2);
+        assertThat(record2List.size(), is(2));
+        assertThat(record2List, containsInAnyOrder(RECORDS_2.toArray()));
+    }
+
+    private BatchGetItemEnhancedRequest requestWithNotFoundRecord() {
+        return BatchGetItemEnhancedRequest.builder()
+                                          .readBatches(
+                                              ReadBatch.builder(Record1.class)
+                                                       .mappedTableResource(mappedTable1)
+                                                       .addGetItem(r -> r.key(k -> k.partitionValue(0)))
+                                                       .build(),
+                                              ReadBatch.builder(Record2.class)
+                                                       .mappedTableResource(mappedTable2)
+                                                       .addGetItem(r -> r.key(k -> k.partitionValue(0)))
+                                                       .build(),
+                                              ReadBatch.builder(Record2.class)
+                                                       .mappedTableResource(mappedTable2)
+                                                       .addGetItem(r -> r.key(k -> k.partitionValue(1)))
+                                                       .build(),
+                                              ReadBatch.builder(Record1.class)
+                                                       .mappedTableResource(mappedTable1)
+                                                       .addGetItem(r -> r.key(k -> k.partitionValue(5)))
+                                                       .build())
+                                          .build();
+    }
+
+    private BatchGetResultPagePublisher batchGetResultPageSdkPublisherForBothTables() {
+        return enhancedAsyncClient.batchGetItem(r -> r.readBatches(
+            ReadBatch.builder(Record1.class)
+                     .mappedTableResource(mappedTable1)
+                     .addGetItem(i -> i.key(k -> k.partitionValue(0)))
+                     .build(),
+            ReadBatch.builder(Record2.class)
+                     .mappedTableResource(mappedTable2)
+                     .addGetItem(i -> i.key(k -> k.partitionValue(0)))
+                     .build(),
+            ReadBatch.builder(Record2.class)
+                     .mappedTableResource(mappedTable2)
+                     .addGetItem(i -> i.key(k -> k.partitionValue(1)))
+                     .build(),
+            ReadBatch.builder(Record1.class)
+                     .mappedTableResource(mappedTable1)
+                     .addGetItem(i -> i.key(k -> k.partitionValue(1)))
+                     .build()));
+    }
+}
+
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/AsyncBatchWriteItemTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/AsyncBatchWriteItemTest.java
new file mode 100644
index 000000000000..bcc703e803c7
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/AsyncBatchWriteItemTest.java
@@ -0,0 +1,270 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.functionaltests;
+
+import static java.util.Arrays.asList;
+import static java.util.Collections.singletonList;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.nullValue;
+import static software.amazon.awssdk.enhanced.dynamodb.mapper.StaticAttributeTags.primaryPartitionKey;
+
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbAsyncTable;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedAsyncClient;
+import software.amazon.awssdk.enhanced.dynamodb.TableSchema;
+import software.amazon.awssdk.enhanced.dynamodb.internal.client.DefaultDynamoDbEnhancedAsyncClient;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.StaticTableSchema;
+import software.amazon.awssdk.enhanced.dynamodb.model.BatchWriteItemEnhancedRequest;
+import software.amazon.awssdk.enhanced.dynamodb.model.DeleteItemEnhancedRequest;
+import software.amazon.awssdk.enhanced.dynamodb.model.WriteBatch;
+import software.amazon.awssdk.services.dynamodb.model.DeleteTableRequest;
+
+public class AsyncBatchWriteItemTest extends LocalDynamoDbAsyncTestBase {
+    private static class Record1 {
+        private Integer id;
+        private String attribute;
+
+        private Integer getId() {
+            return id;
+        }
+
+        private Record1 setId(Integer id) {
+            this.id = id;
+            return this;
+        }
+
+        private String getAttribute() {
+            return attribute;
+        }
+
+        private Record1 setAttribute(String attribute) {
+            this.attribute = attribute;
+            return this;
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) return true;
+            if (o == null || getClass() != o.getClass()) return false;
+            Record1 record1 = (Record1) o;
+            return Objects.equals(id, record1.id) &&
+                   Objects.equals(attribute, record1.attribute);
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(id, attribute);
+        }
+    }
+
+    private static class Record2 {
+        private Integer id;
+        private String attribute;
+
+        private Integer getId() {
+            return id;
+        }
+
+        private Record2 setId(Integer id) {
+            this.id = id;
+            return this;
+        }
+
+        private String getAttribute() {
+            return attribute;
+        }
+
+        private Record2 setAttribute(String attribute) {
+            this.attribute = attribute;
+            return this;
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) return true;
+            if (o == null || getClass() != o.getClass()) return false;
+            Record2 record2 = (Record2) o;
+            return Objects.equals(id, record2.id) &&
+                   Objects.equals(attribute, record2.attribute);
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(id, attribute);
+        }
+    }
+
+    private static final TableSchema<Record1> TABLE_SCHEMA_1 =
+        StaticTableSchema.builder(Record1.class)
+                         .newItemSupplier(Record1::new)
+                         .addAttribute(Integer.class, a -> a.name("id_1")
+                                                            .getter(Record1::getId)
+                                                            .setter(Record1::setId)
+                                                            .tags(primaryPartitionKey()))
+                         .addAttribute(String.class, a -> a.name("attribute")
+                                                           .getter(Record1::getAttribute)
+                                                           .setter(Record1::setAttribute))
+                         .build();
+
+    private static final TableSchema<Record2> TABLE_SCHEMA_2 =
+        StaticTableSchema.builder(Record2.class)
+                   .newItemSupplier(Record2::new)
+                         .addAttribute(Integer.class, a -> a.name("id_2")
+                                                            .getter(Record2::getId)
+                                                            .setter(Record2::setId)
+                                                            .tags(primaryPartitionKey()))
+                         .addAttribute(String.class, a -> a.name("attribute")
+                                                           .getter(Record2::getAttribute)
+                                                           .setter(Record2::setAttribute))
+                         .build();
+
+    private DynamoDbEnhancedAsyncClient enhancedAsyncClient =
+        DefaultDynamoDbEnhancedAsyncClient.builder()
+                                          .dynamoDbClient(getDynamoDbAsyncClient())
+                                          .build();
+
+    private DynamoDbAsyncTable<Record1> mappedTable1 = enhancedAsyncClient.table(getConcreteTableName("table-name-1"),
+                                                                                 TABLE_SCHEMA_1);
+    private DynamoDbAsyncTable<Record2> mappedTable2 = enhancedAsyncClient.table(getConcreteTableName("table-name-2"),
+                                                                                 TABLE_SCHEMA_2);
+
+    private static final List<Record1> RECORDS_1 =
+        IntStream.range(0, 2)
+                 .mapToObj(i -> new Record1().setId(i).setAttribute(Integer.toString(i)))
+                 .collect(Collectors.toList());
+
+    private static final List<Record2> RECORDS_2 =
+        IntStream.range(0, 2)
+                 .mapToObj(i -> new Record2().setId(i).setAttribute(Integer.toString(i)))
+                 .collect(Collectors.toList());
+
+    @Before
+    public void createTable() {
+        mappedTable1.createTable(r -> r.provisionedThroughput(getDefaultProvisionedThroughput())).join();
+        mappedTable2.createTable(r -> r.provisionedThroughput(getDefaultProvisionedThroughput())).join();
+    }
+
+    @After
+    public void deleteTable() {
+        getDynamoDbAsyncClient().deleteTable(DeleteTableRequest.builder()
+                                                               .tableName(getConcreteTableName("table-name-1"))
+                                                               .build()).join();
+        getDynamoDbAsyncClient().deleteTable(DeleteTableRequest.builder()
+                                                               .tableName(getConcreteTableName("table-name-2"))
+                                                               .build()).join();
+    }
+
+    @Test
+    public void singlePut() {
+        List<WriteBatch> writeBatches =
+            singletonList(WriteBatch.builder(Record1.class)
+                                    .mappedTableResource(mappedTable1)
+                                    .addPutItem(r -> r.item(RECORDS_1.get(0)))
+                                    .build());
+
+        enhancedAsyncClient.batchWriteItem(BatchWriteItemEnhancedRequest.builder().writeBatches(writeBatches).build()).join();
+
+        Record1 record = mappedTable1.getItem(r -> r.key(k -> k.partitionValue(0))).join();
+        assertThat(record, is(RECORDS_1.get(0)));
+    }
+
+    @Test
+    public void multiplePut() {
+        List<WriteBatch> writeBatches =
+            asList(WriteBatch.builder(Record1.class)
+                             .mappedTableResource(mappedTable1)
+                             .addPutItem(r -> r.item(RECORDS_1.get(0)))
+                             .build(),
+                   WriteBatch.builder(Record2.class)
+                             .mappedTableResource(mappedTable2)
+                             .addPutItem(r -> r.item(RECORDS_2.get(0)))
+                             .build());
+
+        enhancedAsyncClient.batchWriteItem(BatchWriteItemEnhancedRequest.builder().writeBatches(writeBatches).build()).join();
+
+        Record1 record1 = mappedTable1.getItem(r -> r.key(k -> k.partitionValue(0))).join();
+        Record2 record2 = mappedTable2.getItem(r -> r.key(k -> k.partitionValue(0))).join();
+        assertThat(record1, is(RECORDS_1.get(0)));
+        assertThat(record2, is(RECORDS_2.get(0)));
+    }
+
+    @Test
+    public void singleDelete() {
+        mappedTable1.putItem(r -> r.item(RECORDS_1.get(0))).join();
+
+        List<WriteBatch> writeBatches =
+            singletonList(WriteBatch.builder(Record1.class)
+                                    .mappedTableResource(mappedTable1)
+                                    .addDeleteItem(r -> r.key(k -> k.partitionValue(0)))
+                                    .build());
+
+        enhancedAsyncClient.batchWriteItem(BatchWriteItemEnhancedRequest.builder().writeBatches(writeBatches).build()).join();
+
+        Record1 record = mappedTable1.getItem(r -> r.key(k -> k.partitionValue(0))).join();
+        assertThat(record, is(nullValue()));
+    }
+
+    @Test
+    public void multipleDelete() {
+        mappedTable1.putItem(r -> r.item(RECORDS_1.get(0))).join();
+        mappedTable2.putItem(r -> r.item(RECORDS_2.get(0))).join();
+
+        List<WriteBatch> writeBatches =
+            asList(WriteBatch.builder(Record1.class)
+                             .mappedTableResource(mappedTable1)
+                             .addDeleteItem(DeleteItemEnhancedRequest.builder().key(k -> k.partitionValue(0)).build())
+                             .build(),
+                   WriteBatch.builder(Record2.class)
+                             .mappedTableResource(mappedTable2)
+                             .addDeleteItem(DeleteItemEnhancedRequest.builder().key(k -> k.partitionValue(0)).build())
+                             .build());
+
+        enhancedAsyncClient.batchWriteItem(BatchWriteItemEnhancedRequest.builder().writeBatches(writeBatches).build()).join();
+
+        Record1 record1 = mappedTable1.getItem(r -> r.key(k -> k.partitionValue(0))).join();
+        Record2 record2 = mappedTable2.getItem(r -> r.key(k -> k.partitionValue(0))).join();
+        assertThat(record1, is(nullValue()));
+        assertThat(record2, is(nullValue()));
+    }
+
+    @Test
+    public void mixedCommands() {
+        mappedTable1.putItem(r -> r.item(RECORDS_1.get(0))).join();
+        mappedTable2.putItem(r -> r.item(RECORDS_2.get(0))).join();
+
+        enhancedAsyncClient.batchWriteItem(r -> r.writeBatches(
+            WriteBatch.builder(Record1.class)
+                      .mappedTableResource(mappedTable1)
+                      .addPutItem(i -> i.item(RECORDS_1.get(1)))
+                      .build(),
+            WriteBatch.builder(Record2.class)
+                      .mappedTableResource(mappedTable2)
+                      .addDeleteItem(i -> i.key(k -> k.partitionValue(0)))
+                      .build())).join();
+
+        assertThat(mappedTable1.getItem(r -> r.key(k -> k.partitionValue(0))).join(), is(RECORDS_1.get(0)));
+        assertThat(mappedTable1.getItem(r -> r.key(k -> k.partitionValue(1))).join(), is(RECORDS_1.get(1)));
+        assertThat(mappedTable2.getItem(r -> r.key(k -> k.partitionValue(0))).join(), is(nullValue()));
+    }
+
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/AsyncIndexQueryTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/AsyncIndexQueryTest.java
new file mode 100644
index 000000000000..0a53549e6f62
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/AsyncIndexQueryTest.java
@@ -0,0 +1,298 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.functionaltests;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.empty;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.nullValue;
+import static software.amazon.awssdk.enhanced.dynamodb.internal.AttributeValues.numberValue;
+import static software.amazon.awssdk.enhanced.dynamodb.internal.AttributeValues.stringValue;
+import static software.amazon.awssdk.enhanced.dynamodb.mapper.StaticAttributeTags.primaryPartitionKey;
+import static software.amazon.awssdk.enhanced.dynamodb.mapper.StaticAttributeTags.primarySortKey;
+import static software.amazon.awssdk.enhanced.dynamodb.mapper.StaticAttributeTags.secondaryPartitionKey;
+import static software.amazon.awssdk.enhanced.dynamodb.mapper.StaticAttributeTags.secondarySortKey;
+import static software.amazon.awssdk.enhanced.dynamodb.model.QueryConditional.keyEqualTo;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import software.amazon.awssdk.core.async.SdkPublisher;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbAsyncIndex;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbAsyncTable;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedAsyncClient;
+import software.amazon.awssdk.enhanced.dynamodb.Key;
+import software.amazon.awssdk.enhanced.dynamodb.TableSchema;
+import software.amazon.awssdk.enhanced.dynamodb.internal.client.DefaultDynamoDbEnhancedAsyncClient;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.StaticTableSchema;
+import software.amazon.awssdk.enhanced.dynamodb.model.CreateTableEnhancedRequest;
+import software.amazon.awssdk.enhanced.dynamodb.model.EnhancedGlobalSecondaryIndex;
+import software.amazon.awssdk.enhanced.dynamodb.model.Page;
+import software.amazon.awssdk.enhanced.dynamodb.model.QueryConditional;
+import software.amazon.awssdk.enhanced.dynamodb.model.QueryEnhancedRequest;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+import software.amazon.awssdk.services.dynamodb.model.DeleteTableRequest;
+import software.amazon.awssdk.services.dynamodb.model.ProjectionType;
+
+public class AsyncIndexQueryTest extends LocalDynamoDbAsyncTestBase {
+    private static class Record {
+        private String id;
+        private Integer sort;
+        private Integer value;
+        private String gsiId;
+        private Integer gsiSort;
+
+        private String getId() {
+            return id;
+        }
+
+        private Record setId(String id) {
+            this.id = id;
+            return this;
+        }
+
+        private Integer getSort() {
+            return sort;
+        }
+
+        private Record setSort(Integer sort) {
+            this.sort = sort;
+            return this;
+        }
+
+        private Integer getValue() {
+            return value;
+        }
+
+        private Record setValue(Integer value) {
+            this.value = value;
+            return this;
+        }
+
+        private String getGsiId() {
+            return gsiId;
+        }
+
+        private Record setGsiId(String gsiId) {
+            this.gsiId = gsiId;
+            return this;
+        }
+
+        private Integer getGsiSort() {
+            return gsiSort;
+        }
+
+        private Record setGsiSort(Integer gsiSort) {
+            this.gsiSort = gsiSort;
+            return this;
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) return true;
+            if (o == null || getClass() != o.getClass()) return false;
+            Record record = (Record) o;
+            return Objects.equals(id, record.id) &&
+                   Objects.equals(sort, record.sort) &&
+                   Objects.equals(value, record.value) &&
+                   Objects.equals(gsiId, record.gsiId) &&
+                   Objects.equals(gsiSort, record.gsiSort);
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(id, sort, value, gsiId, gsiSort);
+        }
+    }
+
+    private static final TableSchema<Record> TABLE_SCHEMA =
+        StaticTableSchema.builder(Record.class)
+                         .newItemSupplier(Record::new)
+                         .addAttribute(String.class, a -> a.name("id")
+                                                           .getter(Record::getId)
+                                                           .setter(Record::setId)
+                                                           .tags(primaryPartitionKey()))
+                         .addAttribute(Integer.class, a -> a.name("sort")
+                                                            .getter(Record::getSort)
+                                                            .setter(Record::setSort)
+                                                            .tags(primarySortKey()))
+                         .addAttribute(Integer.class, a -> a.name("value")
+                                                            .getter(Record::getValue)
+                                                            .setter(Record::setValue))
+                         .addAttribute(String.class, a -> a.name("gsi_id")
+                                                           .getter(Record::getGsiId)
+                                                           .setter(Record::setGsiId)
+                                                           .tags(secondaryPartitionKey("gsi_keys_only")))
+                         .addAttribute(Integer.class, a -> a.name("gsi_sort")
+                                                            .getter(Record::getGsiSort)
+                                                            .setter(Record::setGsiSort)
+                                                            .tags(secondarySortKey("gsi_keys_only")))
+                         .build();
+
+    private static final List<Record> RECORDS =
+        IntStream.range(0, 10)
+                 .mapToObj(i -> new Record()
+                                      .setId("id-value")
+                                      .setSort(i)
+                                      .setValue(i)
+                                      .setGsiId("gsi-id-value")
+                                      .setGsiSort(i))
+                 .collect(Collectors.toList());
+
+    private static final List<Record> KEYS_ONLY_RECORDS =
+        RECORDS.stream()
+               .map(record -> new Record()
+                                    .setId(record.id)
+                                    .setSort(record.sort)
+                                    .setGsiId(record.gsiId)
+                                    .setGsiSort(record.gsiSort))
+               .collect(Collectors.toList());
+
+    private DynamoDbEnhancedAsyncClient enhancedAsyncClient = DefaultDynamoDbEnhancedAsyncClient.builder()
+                                                                                                .dynamoDbClient(getDynamoDbAsyncClient())
+                                                                                                .build();
+
+    private DynamoDbAsyncTable<Record> mappedTable = enhancedAsyncClient.table(getConcreteTableName("table-name"), TABLE_SCHEMA);
+    private DynamoDbAsyncIndex<Record> keysOnlyMappedIndex = mappedTable.index("gsi_keys_only");
+
+    private void insertRecords() {
+        RECORDS.forEach(record -> mappedTable.putItem(r -> r.item(record)).join());
+    }
+
+    @Before
+    public void createTable() {
+        mappedTable.createTable(
+                CreateTableEnhancedRequest.builder()
+                        .provisionedThroughput(getDefaultProvisionedThroughput())
+                        .globalSecondaryIndices(EnhancedGlobalSecondaryIndex.builder()
+                                .indexName("gsi_keys_only")
+                                .projection(p -> p.projectionType(ProjectionType.KEYS_ONLY))
+                                .provisionedThroughput(getDefaultProvisionedThroughput())
+                                .build())
+                        .build())
+                .join();
+    }
+
+    @After
+    public void deleteTable() {
+        getDynamoDbAsyncClient().deleteTable(DeleteTableRequest.builder()
+                                                               .tableName(getConcreteTableName("table-name"))
+                                                               .build())
+                                .join();
+    }
+
+    @Test
+    public void queryAllRecordsDefaultSettings_usingShortcutForm() {
+        insertRecords();
+
+        SdkPublisher<Page<Record>> publisher =
+            keysOnlyMappedIndex.query(keyEqualTo(k -> k.partitionValue("gsi-id-value")));
+
+        List<Page<Record>> results = drainPublisher(publisher, 1);
+        Page<Record> page = results.get(0);
+
+        assertThat(page.items(), is(KEYS_ONLY_RECORDS));
+        assertThat(page.lastEvaluatedKey(), is(nullValue()));
+    }
+
+    @Test
+    public void queryBetween() {
+        insertRecords();
+        Key fromKey = Key.builder().partitionValue("gsi-id-value").sortValue(3).build();
+        Key toKey = Key.builder().partitionValue("gsi-id-value").sortValue(5).build();
+
+        SdkPublisher<Page<Record>> publisher = keysOnlyMappedIndex.query(r -> r.queryConditional(QueryConditional.sortBetween(fromKey, toKey)));
+
+        List<Page<Record>> results = drainPublisher(publisher, 1);
+        Page<Record> page = results.get(0);
+
+        assertThat(page.items(),
+                   is(KEYS_ONLY_RECORDS.stream().filter(r -> r.sort >= 3 && r.sort <= 5).collect(Collectors.toList())));
+        assertThat(page.lastEvaluatedKey(), is(nullValue()));
+    }
+
+    @Test
+    public void queryLimit() {
+        insertRecords();
+        SdkPublisher<Page<Record>> publisher =
+            keysOnlyMappedIndex.query(QueryEnhancedRequest.builder()
+                                                          .queryConditional(keyEqualTo(k -> k.partitionValue("gsi-id-value")))
+                                                          .limit(5)
+                                                          .build());
+
+        List<Page<Record>> results = drainPublisher(publisher, 3);
+        Page<Record> page1 = results.get(0);
+        Page<Record> page2 = results.get(1);
+        Page<Record> page3 = results.get(2);
+
+        Map<String, AttributeValue> expectedLastEvaluatedKey1 = new HashMap<>();
+        expectedLastEvaluatedKey1.put("id", stringValue(KEYS_ONLY_RECORDS.get(4).getId()));
+        expectedLastEvaluatedKey1.put("sort", numberValue(KEYS_ONLY_RECORDS.get(4).getSort()));
+        expectedLastEvaluatedKey1.put("gsi_id", stringValue(KEYS_ONLY_RECORDS.get(4).getGsiId()));
+        expectedLastEvaluatedKey1.put("gsi_sort", numberValue(KEYS_ONLY_RECORDS.get(4).getGsiSort()));
+        Map<String, AttributeValue> expectedLastEvaluatedKey2 = new HashMap<>();
+        expectedLastEvaluatedKey2.put("id", stringValue(KEYS_ONLY_RECORDS.get(9).getId()));
+        expectedLastEvaluatedKey2.put("sort", numberValue(KEYS_ONLY_RECORDS.get(9).getSort()));
+        expectedLastEvaluatedKey2.put("gsi_id", stringValue(KEYS_ONLY_RECORDS.get(9).getGsiId()));
+        expectedLastEvaluatedKey2.put("gsi_sort", numberValue(KEYS_ONLY_RECORDS.get(9).getGsiSort()));
+
+        assertThat(page1.items(), is(KEYS_ONLY_RECORDS.subList(0, 5)));
+        assertThat(page1.lastEvaluatedKey(), is(expectedLastEvaluatedKey1));
+        assertThat(page2.items(), is(KEYS_ONLY_RECORDS.subList(5, 10)));
+        assertThat(page2.lastEvaluatedKey(), is(expectedLastEvaluatedKey2));
+        assertThat(page3.items(), is(empty()));
+        assertThat(page3.lastEvaluatedKey(), is(nullValue()));
+    }
+
+    @Test
+    public void queryEmpty() {
+        SdkPublisher<Page<Record>> publisher =
+            keysOnlyMappedIndex.query(r -> r.queryConditional(keyEqualTo(k -> k.partitionValue("gsi-id-value"))));
+
+        List<Page<Record>> results = drainPublisher(publisher, 1);
+        Page<Record> page = results.get(0);
+
+        assertThat(page.items(), is(empty()));
+        assertThat(page.lastEvaluatedKey(), is(nullValue()));
+    }
+
+    @Test
+    public void queryExclusiveStartKey() {
+        insertRecords();
+        Map<String, AttributeValue> expectedLastEvaluatedKey = new HashMap<>();
+        expectedLastEvaluatedKey.put("id", stringValue(KEYS_ONLY_RECORDS.get(7).getId()));
+        expectedLastEvaluatedKey.put("sort", numberValue(KEYS_ONLY_RECORDS.get(7).getSort()));
+        expectedLastEvaluatedKey.put("gsi_id", stringValue(KEYS_ONLY_RECORDS.get(7).getGsiId()));
+        expectedLastEvaluatedKey.put("gsi_sort", numberValue(KEYS_ONLY_RECORDS.get(7).getGsiSort()));
+
+        SdkPublisher<Page<Record>> publisher =
+            keysOnlyMappedIndex.query(QueryEnhancedRequest.builder()
+                                                          .queryConditional(keyEqualTo(k -> k.partitionValue("gsi-id-value")))
+                                                          .exclusiveStartKey(expectedLastEvaluatedKey)
+                                                          .build());
+
+        List<Page<Record>> results = drainPublisher(publisher, 1);
+        Page<Record> page = results.get(0);
+        assertThat(page.items(), is(KEYS_ONLY_RECORDS.subList(8, 10)));
+        assertThat(page.lastEvaluatedKey(), is(nullValue()));
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/AsyncIndexScanTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/AsyncIndexScanTest.java
new file mode 100644
index 000000000000..9de11ea5c0fd
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/AsyncIndexScanTest.java
@@ -0,0 +1,285 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.functionaltests;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.empty;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.nullValue;
+import static software.amazon.awssdk.enhanced.dynamodb.internal.AttributeValues.numberValue;
+import static software.amazon.awssdk.enhanced.dynamodb.internal.AttributeValues.stringValue;
+import static software.amazon.awssdk.enhanced.dynamodb.mapper.StaticAttributeTags.primaryPartitionKey;
+import static software.amazon.awssdk.enhanced.dynamodb.mapper.StaticAttributeTags.primarySortKey;
+import static software.amazon.awssdk.enhanced.dynamodb.mapper.StaticAttributeTags.secondaryPartitionKey;
+import static software.amazon.awssdk.enhanced.dynamodb.mapper.StaticAttributeTags.secondarySortKey;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import software.amazon.awssdk.core.async.SdkPublisher;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbAsyncIndex;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbAsyncTable;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedAsyncClient;
+import software.amazon.awssdk.enhanced.dynamodb.Expression;
+import software.amazon.awssdk.enhanced.dynamodb.TableSchema;
+import software.amazon.awssdk.enhanced.dynamodb.internal.client.DefaultDynamoDbEnhancedAsyncClient;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.StaticTableSchema;
+import software.amazon.awssdk.enhanced.dynamodb.model.EnhancedGlobalSecondaryIndex;
+import software.amazon.awssdk.enhanced.dynamodb.model.Page;
+import software.amazon.awssdk.enhanced.dynamodb.model.ScanEnhancedRequest;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+import software.amazon.awssdk.services.dynamodb.model.DeleteTableRequest;
+import software.amazon.awssdk.services.dynamodb.model.ProjectionType;
+
+public class AsyncIndexScanTest extends LocalDynamoDbAsyncTestBase {
+    private static class Record {
+        private String id;
+        private Integer sort;
+        private Integer value;
+        private String gsiId;
+        private Integer gsiSort;
+
+        private String getId() {
+            return id;
+        }
+
+        private Record setId(String id) {
+            this.id = id;
+            return this;
+        }
+
+        private Integer getSort() {
+            return sort;
+        }
+
+        private Record setSort(Integer sort) {
+            this.sort = sort;
+            return this;
+        }
+
+        private Integer getValue() {
+            return value;
+        }
+
+        private Record setValue(Integer value) {
+            this.value = value;
+            return this;
+        }
+
+        private String getGsiId() {
+            return gsiId;
+        }
+
+        private Record setGsiId(String gsiId) {
+            this.gsiId = gsiId;
+            return this;
+        }
+
+        private Integer getGsiSort() {
+            return gsiSort;
+        }
+
+        private Record setGsiSort(Integer gsiSort) {
+            this.gsiSort = gsiSort;
+            return this;
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) return true;
+            if (o == null || getClass() != o.getClass()) return false;
+            Record record = (Record) o;
+            return Objects.equals(id, record.id) &&
+                   Objects.equals(sort, record.sort) &&
+                   Objects.equals(value, record.value) &&
+                   Objects.equals(gsiId, record.gsiId) &&
+                   Objects.equals(gsiSort, record.gsiSort);
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(id, sort, value, gsiId, gsiSort);
+        }
+    }
+
+    private static final TableSchema<Record> TABLE_SCHEMA =
+        StaticTableSchema.builder(Record.class)
+                         .newItemSupplier(Record::new)
+                         .addAttribute(String.class, a -> a.name("id")
+                                                           .getter(Record::getId)
+                                                           .setter(Record::setId)
+                                                           .tags(primaryPartitionKey()))
+                         .addAttribute(Integer.class, a -> a.name("sort")
+                                                            .getter(Record::getSort)
+                                                            .setter(Record::setSort)
+                                                            .tags(primarySortKey()))
+                         .addAttribute(Integer.class, a -> a.name("value")
+                                                            .getter(Record::getValue)
+                                                            .setter(Record::setValue))
+                         .addAttribute(String.class, a -> a.name("gsi_id")
+                                                           .getter(Record::getGsiId)
+                                                           .setter(Record::setGsiId)
+                                                           .tags(secondaryPartitionKey("gsi_keys_only")))
+                         .addAttribute(Integer.class, a -> a.name("gsi_sort")
+                                                            .getter(Record::getGsiSort)
+                                                            .setter(Record::setGsiSort)
+                                                            .tags(secondarySortKey("gsi_keys_only")))
+                         .build();
+
+    private static final List<Record> RECORDS =
+        IntStream.range(0, 10)
+                 .mapToObj(i -> new Record()
+                     .setId("id-value")
+                     .setSort(i)
+                     .setValue(i)
+                     .setGsiId("gsi-id-value")
+                     .setGsiSort(i))
+                 .collect(Collectors.toList());
+
+    private static final List<Record> KEYS_ONLY_RECORDS =
+        RECORDS.stream()
+               .map(record -> new Record()
+                   .setId(record.id)
+                   .setSort(record.sort)
+                   .setGsiId(record.gsiId)
+                   .setGsiSort(record.gsiSort))
+               .collect(Collectors.toList());
+
+    private DynamoDbEnhancedAsyncClient enhancedAsyncClient =
+        DefaultDynamoDbEnhancedAsyncClient.builder()
+                                          .dynamoDbClient(getDynamoDbAsyncClient())
+                                          .build();
+
+    private DynamoDbAsyncTable<Record> mappedTable = enhancedAsyncClient.table(getConcreteTableName("table-name"), TABLE_SCHEMA);
+    private DynamoDbAsyncIndex<Record> keysOnlyMappedIndex = mappedTable.index("gsi_keys_only");
+
+    private void insertRecords() {
+        RECORDS.forEach(record -> mappedTable.putItem(r -> r.item(record)).join());
+    }
+
+    @Before
+    public void createTable() {
+        mappedTable.createTable(
+                r -> r.provisionedThroughput(getDefaultProvisionedThroughput())
+                        .globalSecondaryIndices(
+                                EnhancedGlobalSecondaryIndex.builder()
+                                        .indexName("gsi_keys_only")
+                                        .projection(p -> p.projectionType(ProjectionType.KEYS_ONLY))
+                                        .provisionedThroughput(getDefaultProvisionedThroughput()).build()))
+                .join();
+    }
+
+    @After
+    public void deleteTable() {
+        getDynamoDbAsyncClient().deleteTable(DeleteTableRequest.builder()
+                                                               .tableName(getConcreteTableName("table-name"))
+                                                               .build()).join();
+    }
+
+    @Test
+    public void scanAllRecordsDefaultSettings() {
+        insertRecords();
+
+        SdkPublisher<Page<Record>> publisher = keysOnlyMappedIndex.scan(ScanEnhancedRequest.builder().build());
+        List<Page<Record>> results = drainPublisher(publisher, 1);
+        Page<Record> page = results.get(0);
+
+        assertThat(page.items(), is(KEYS_ONLY_RECORDS));
+        assertThat(page.lastEvaluatedKey(), is(nullValue()));
+    }
+
+    @Test
+    public void scanAllRecordsWithFilter() {
+        insertRecords();
+        Map<String, AttributeValue> expressionValues = new HashMap<>();
+        expressionValues.put(":min_value", numberValue(3));
+        expressionValues.put(":max_value", numberValue(5));
+        Expression expression = Expression.builder()
+                                          .expression("sort >= :min_value AND sort <= :max_value")
+                                          .expressionValues(expressionValues)
+                                          .build();
+
+        SdkPublisher<Page<Record>> publisher = keysOnlyMappedIndex.scan(ScanEnhancedRequest.builder()
+                                                                                           .filterExpression(expression)
+                                                                                           .build());
+
+        List<Page<Record>> results = drainPublisher(publisher, 1);
+        Page<Record> page = results.get(0);
+
+        assertThat(page.items(),
+                   is(KEYS_ONLY_RECORDS.stream().filter(r -> r.sort >= 3 && r.sort <= 5).collect(Collectors.toList())));
+        assertThat(page.lastEvaluatedKey(), is(nullValue()));
+    }
+
+    @Test
+    public void scanLimit() {
+        insertRecords();
+
+        SdkPublisher<Page<Record>> publisher = keysOnlyMappedIndex.scan(r -> r.limit(5));
+
+        List<Page<Record>> results = drainPublisher(publisher, 3);
+
+        Page<Record> page1 = results.get(0);
+        Page<Record> page2 = results.get(1);
+        Page<Record> page3 = results.get(2);
+
+        assertThat(page1.items(), is(KEYS_ONLY_RECORDS.subList(0, 5)));
+        assertThat(page1.lastEvaluatedKey(), is(getKeyMap(4)));
+        assertThat(page2.items(), is(KEYS_ONLY_RECORDS.subList(5, 10)));
+        assertThat(page2.lastEvaluatedKey(), is(getKeyMap(9)));
+        assertThat(page3.items(), is(empty()));
+        assertThat(page3.lastEvaluatedKey(), is(nullValue()));
+    }
+
+    @Test
+    public void scanEmpty() {
+        SdkPublisher<Page<Record>> publisher = keysOnlyMappedIndex.scan();
+        List<Page<Record>> results = drainPublisher(publisher, 1);
+        Page<Record> page = results.get(0);
+
+        assertThat(page.items(), is(empty()));
+        assertThat(page.lastEvaluatedKey(), is(nullValue()));
+    }
+
+    @Test
+    public void scanExclusiveStartKey() {
+        insertRecords();
+        SdkPublisher<Page<Record>> publisher =
+            keysOnlyMappedIndex.scan(ScanEnhancedRequest.builder().exclusiveStartKey(getKeyMap(7)).build());
+
+        List<Page<Record>> results = drainPublisher(publisher, 1);
+        Page<Record> page = results.get(0);
+
+        assertThat(page.items(), is(KEYS_ONLY_RECORDS.subList(8, 10)));
+        assertThat(page.lastEvaluatedKey(), is(nullValue()));
+    }
+
+    private Map<String, AttributeValue> getKeyMap(int sort) {
+        Map<String, AttributeValue> result = new HashMap<>();
+        result.put("id", stringValue(KEYS_ONLY_RECORDS.get(sort).getId()));
+        result.put("sort", numberValue(KEYS_ONLY_RECORDS.get(sort).getSort()));
+        result.put("gsi_id", stringValue(KEYS_ONLY_RECORDS.get(sort).getGsiId()));
+        result.put("gsi_sort", numberValue(KEYS_ONLY_RECORDS.get(sort).getGsiSort()));
+        return Collections.unmodifiableMap(result);
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/AsyncTransactGetItemsTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/AsyncTransactGetItemsTest.java
new file mode 100644
index 000000000000..18c2466cddab
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/AsyncTransactGetItemsTest.java
@@ -0,0 +1,194 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.functionaltests;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.nullValue;
+import static software.amazon.awssdk.enhanced.dynamodb.mapper.StaticAttributeTags.primaryPartitionKey;
+
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import software.amazon.awssdk.enhanced.dynamodb.Document;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbAsyncTable;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedAsyncClient;
+import software.amazon.awssdk.enhanced.dynamodb.Key;
+import software.amazon.awssdk.enhanced.dynamodb.TableSchema;
+import software.amazon.awssdk.enhanced.dynamodb.internal.client.DefaultDynamoDbEnhancedAsyncClient;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.StaticTableSchema;
+import software.amazon.awssdk.enhanced.dynamodb.model.TransactGetItemsEnhancedRequest;
+import software.amazon.awssdk.services.dynamodb.model.DeleteTableRequest;
+
+public class AsyncTransactGetItemsTest extends LocalDynamoDbAsyncTestBase {
+    private static class Record1 {
+        private Integer id;
+
+        private Integer getId() {
+            return id;
+        }
+
+        private Record1 setId(Integer id) {
+            this.id = id;
+            return this;
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) return true;
+            if (o == null || getClass() != o.getClass()) return false;
+            Record1 record1 = (Record1) o;
+            return Objects.equals(id, record1.id);
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(id);
+        }
+    }
+
+    private static class Record2 {
+        private Integer id;
+
+        private Integer getId() {
+            return id;
+        }
+
+        private Record2 setId(Integer id) {
+            this.id = id;
+            return this;
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) return true;
+            if (o == null || getClass() != o.getClass()) return false;
+            Record2 record2 = (Record2) o;
+            return Objects.equals(id, record2.id);
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(id);
+        }
+    }
+
+    private static final TableSchema<Record1> TABLE_SCHEMA_1 =
+        StaticTableSchema.builder(Record1.class)
+                         .newItemSupplier(Record1::new)
+                         .addAttribute(Integer.class, a -> a.name("id_1")
+                                                            .getter(Record1::getId)
+                                                            .setter(Record1::setId)
+                                                            .tags(primaryPartitionKey()))
+                         .build();
+
+    private static final TableSchema<Record2> TABLE_SCHEMA_2 =
+        StaticTableSchema.builder(Record2.class)
+                         .newItemSupplier(Record2::new)
+                         .addAttribute(Integer.class, a -> a.name("id_2")
+                                                            .getter(Record2::getId)
+                                                            .setter(Record2::setId)
+                                                            .tags(primaryPartitionKey()))
+                         .build();
+
+    private DynamoDbEnhancedAsyncClient enhancedAsyncClient =
+        DefaultDynamoDbEnhancedAsyncClient.builder()
+                                          .dynamoDbClient(getDynamoDbAsyncClient())
+                                          .build();
+
+    private DynamoDbAsyncTable<Record1> mappedTable1 = enhancedAsyncClient.table(getConcreteTableName("table-name-1"),
+                                                                                 TABLE_SCHEMA_1);
+    private DynamoDbAsyncTable<Record2> mappedTable2 = enhancedAsyncClient.table(getConcreteTableName("table-name-2"),
+                                                                                 TABLE_SCHEMA_2);
+
+    private static final List<Record1> RECORDS_1 =
+        IntStream.range(0, 2)
+                 .mapToObj(i -> new Record1().setId(i))
+                 .collect(Collectors.toList());
+
+    private static final List<Record2> RECORDS_2 =
+        IntStream.range(0, 2)
+                 .mapToObj(i -> new Record2().setId(i))
+                 .collect(Collectors.toList());
+
+    @Before
+    public void createTable() {
+        mappedTable1.createTable(r -> r.provisionedThroughput(getDefaultProvisionedThroughput())).join();
+        mappedTable2.createTable(r -> r.provisionedThroughput(getDefaultProvisionedThroughput())).join();
+    }
+
+    @After
+    public void deleteTable() {
+        getDynamoDbAsyncClient().deleteTable(DeleteTableRequest.builder()
+                                                               .tableName(getConcreteTableName("table-name-1"))
+                                                               .build()).join();
+        getDynamoDbAsyncClient().deleteTable(DeleteTableRequest.builder()
+                                                               .tableName(getConcreteTableName("table-name-2"))
+                                                               .build()).join();
+    }
+
+    private void insertRecords() {
+        RECORDS_1.forEach(record -> mappedTable1.putItem(r -> r.item(record)).join());
+        RECORDS_2.forEach(record -> mappedTable2.putItem(r -> r.item(record)).join());
+    }
+
+    @Test
+    public void getRecordsFromMultipleTables() {
+        insertRecords();
+
+        TransactGetItemsEnhancedRequest transactGetItemsEnhancedRequest =
+            TransactGetItemsEnhancedRequest.builder()
+                                           .addGetItem(mappedTable1, Key.builder().partitionValue(0).build())
+                                           .addGetItem(mappedTable2, Key.builder().partitionValue(0).build())
+                                           .addGetItem(mappedTable2, Key.builder().partitionValue(1).build())
+                                           .addGetItem(mappedTable1, Key.builder().partitionValue(1).build())
+                                           .build();
+
+        List<Document> results = enhancedAsyncClient.transactGetItems(transactGetItemsEnhancedRequest).join();
+
+        assertThat(results.size(), is(4));
+        assertThat(results.get(0).getItem(mappedTable1), is(RECORDS_1.get(0)));
+        assertThat(results.get(1).getItem(mappedTable2), is(RECORDS_2.get(0)));
+        assertThat(results.get(2).getItem(mappedTable2), is(RECORDS_2.get(1)));
+        assertThat(results.get(3).getItem(mappedTable1), is(RECORDS_1.get(1)));
+    }
+
+    @Test
+    public void notFoundRecordReturnsNull() {
+        insertRecords();
+
+        TransactGetItemsEnhancedRequest transactGetItemsEnhancedRequest =
+            TransactGetItemsEnhancedRequest.builder()
+                                           .addGetItem(mappedTable1, Key.builder().partitionValue(0).build())
+                                           .addGetItem(mappedTable2, Key.builder().partitionValue(0).build())
+                                           .addGetItem(mappedTable2, Key.builder().partitionValue(5).build())
+                                           .addGetItem(mappedTable1, Key.builder().partitionValue(1).build())
+                                           .build();
+
+        List<Document> results = enhancedAsyncClient.transactGetItems(transactGetItemsEnhancedRequest).join();
+
+        assertThat(results.size(), is(4));
+        assertThat(results.get(0).getItem(mappedTable1), is(RECORDS_1.get(0)));
+        assertThat(results.get(1).getItem(mappedTable2), is(RECORDS_2.get(0)));
+        assertThat(results.get(2).getItem(mappedTable2), is(nullValue()));
+        assertThat(results.get(3).getItem(mappedTable1), is(RECORDS_1.get(1)));
+    }
+}
+
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/AsyncTransactWriteItemsTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/AsyncTransactWriteItemsTest.java
new file mode 100644
index 000000000000..6a1348fd1cf2
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/AsyncTransactWriteItemsTest.java
@@ -0,0 +1,376 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.functionaltests;
+
+import static java.util.Collections.singletonMap;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.instanceOf;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.nullValue;
+import static org.junit.Assert.fail;
+import static software.amazon.awssdk.enhanced.dynamodb.internal.AttributeValues.stringValue;
+import static software.amazon.awssdk.enhanced.dynamodb.mapper.StaticAttributeTags.primaryPartitionKey;
+
+import java.util.List;
+import java.util.Objects;
+import java.util.concurrent.CompletionException;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbAsyncTable;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedAsyncClient;
+import software.amazon.awssdk.enhanced.dynamodb.Expression;
+import software.amazon.awssdk.enhanced.dynamodb.Key;
+import software.amazon.awssdk.enhanced.dynamodb.TableSchema;
+import software.amazon.awssdk.enhanced.dynamodb.internal.client.DefaultDynamoDbEnhancedAsyncClient;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.StaticTableSchema;
+import software.amazon.awssdk.enhanced.dynamodb.model.ConditionCheck;
+import software.amazon.awssdk.enhanced.dynamodb.model.TransactWriteItemsEnhancedRequest;
+import software.amazon.awssdk.services.dynamodb.model.DeleteTableRequest;
+import software.amazon.awssdk.services.dynamodb.model.TransactionCanceledException;
+
+public class AsyncTransactWriteItemsTest extends LocalDynamoDbAsyncTestBase {
+    private static class Record1 {
+        private Integer id;
+        private String attribute;
+
+        private Integer getId() {
+            return id;
+        }
+
+        private Record1 setId(Integer id) {
+            this.id = id;
+            return this;
+        }
+
+        private String getAttribute() {
+            return attribute;
+        }
+
+        private Record1 setAttribute(String attribute) {
+            this.attribute = attribute;
+            return this;
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) return true;
+            if (o == null || getClass() != o.getClass()) return false;
+            Record1 record1 = (Record1) o;
+            return Objects.equals(id, record1.id) &&
+                   Objects.equals(attribute, record1.attribute);
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(id, attribute);
+        }
+    }
+
+    private static class Record2 {
+        private Integer id;
+        private String attribute;
+
+        private Integer getId() {
+            return id;
+        }
+
+        private Record2 setId(Integer id) {
+            this.id = id;
+            return this;
+        }
+
+        private String getAttribute() {
+            return attribute;
+        }
+
+        private Record2 setAttribute(String attribute) {
+            this.attribute = attribute;
+            return this;
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) return true;
+            if (o == null || getClass() != o.getClass()) return false;
+            Record2 record2 = (Record2) o;
+            return Objects.equals(id, record2.id) &&
+                   Objects.equals(attribute, record2.attribute);
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(id, attribute);
+        }
+    }
+
+    private static final TableSchema<Record1> TABLE_SCHEMA_1 =
+        StaticTableSchema.builder(Record1.class)
+                         .newItemSupplier(Record1::new)
+                         .addAttribute(Integer.class, a -> a.name("id_1")
+                                                            .getter(Record1::getId)
+                                                            .setter(Record1::setId)
+                                                            .tags(primaryPartitionKey()))
+                         .addAttribute(String.class, a -> a.name("attribute")
+                                                           .getter(Record1::getAttribute)
+                                                           .setter(Record1::setAttribute))
+                         .build();
+
+    private static final TableSchema<Record2> TABLE_SCHEMA_2 =
+        StaticTableSchema.builder(Record2.class)
+                         .newItemSupplier(Record2::new)
+                         .addAttribute(Integer.class, a -> a.name("id_2")
+                                                            .getter(Record2::getId)
+                                                            .setter(Record2::setId)
+                                                            .tags(primaryPartitionKey()))
+                         .addAttribute(String.class, a -> a.name("attribute")
+                                                           .getter(Record2::getAttribute)
+                                                           .setter(Record2::setAttribute))
+                         .build();
+
+    private DynamoDbEnhancedAsyncClient enhancedAsyncClient =
+        DefaultDynamoDbEnhancedAsyncClient.builder()
+                                          .dynamoDbClient(getDynamoDbAsyncClient())
+                                          .build();
+
+    private DynamoDbAsyncTable<Record1> mappedTable1 = enhancedAsyncClient.table(getConcreteTableName("table-name-1"),
+                                                                                 TABLE_SCHEMA_1);
+    private DynamoDbAsyncTable<Record2> mappedTable2 = enhancedAsyncClient.table(getConcreteTableName("table-name-2"),
+                                                                                 TABLE_SCHEMA_2);
+
+    private static final List<Record1> RECORDS_1 =
+        IntStream.range(0, 2)
+                 .mapToObj(i -> new Record1().setId(i).setAttribute(Integer.toString(i)))
+                 .collect(Collectors.toList());
+
+    private static final List<Record2> RECORDS_2 =
+        IntStream.range(0, 2)
+                 .mapToObj(i -> new Record2().setId(i).setAttribute(Integer.toString(i)))
+                 .collect(Collectors.toList());
+
+    @Before
+    public void createTable() {
+        mappedTable1.createTable(r -> r.provisionedThroughput(getDefaultProvisionedThroughput())).join();
+        mappedTable2.createTable(r -> r.provisionedThroughput(getDefaultProvisionedThroughput())).join();
+    }
+
+    @After
+    public void deleteTable() {
+        getDynamoDbAsyncClient().deleteTable(DeleteTableRequest.builder()
+                                                               .tableName(getConcreteTableName("table-name-1"))
+                                                               .build()).join();
+        getDynamoDbAsyncClient().deleteTable(DeleteTableRequest.builder()
+                                                               .tableName(getConcreteTableName("table-name-2"))
+                                                               .build()).join();
+    }
+
+    @Test
+    public void singlePut() {
+        enhancedAsyncClient.transactWriteItems(
+            TransactWriteItemsEnhancedRequest.builder()
+                                             .addPutItem(mappedTable1, RECORDS_1.get(0))
+                                             .build()).join();
+
+        Record1 record = mappedTable1.getItem(r -> r.key(k -> k.partitionValue(0))).join();
+        assertThat(record, is(RECORDS_1.get(0)));
+    }
+
+    @Test
+    public void multiplePut() {
+        enhancedAsyncClient.transactWriteItems(
+            TransactWriteItemsEnhancedRequest.builder()
+                                             .addPutItem(mappedTable1, RECORDS_1.get(0))
+                                             .addPutItem(mappedTable2, RECORDS_2.get(0))
+                                             .build()).join();
+
+        Record1 record1 = mappedTable1.getItem(r -> r.key(k -> k.partitionValue(0))).join();
+        Record2 record2 = mappedTable2.getItem(r -> r.key(k -> k.partitionValue(0))).join();
+        assertThat(record1, is(RECORDS_1.get(0)));
+        assertThat(record2, is(RECORDS_2.get(0)));
+    }
+
+    @Test
+    public void singleUpdate() {
+        enhancedAsyncClient.transactWriteItems(
+            TransactWriteItemsEnhancedRequest.builder()
+                                             .addUpdateItem(mappedTable1, RECORDS_1.get(0))
+                                             .build()).join();
+
+        Record1 record = mappedTable1.getItem(r -> r.key(k -> k.partitionValue(0))).join();
+        assertThat(record, is(RECORDS_1.get(0)));
+    }
+
+    @Test
+    public void multipleUpdate() {
+        enhancedAsyncClient.transactWriteItems(
+            TransactWriteItemsEnhancedRequest.builder()
+                                             .addUpdateItem(mappedTable1, RECORDS_1.get(0))
+                                             .addUpdateItem(mappedTable2, RECORDS_2.get(0))
+                                             .build()).join();
+
+        Record1 record1 = mappedTable1.getItem(r -> r.key(k -> k.partitionValue(0))).join();
+        Record2 record2 = mappedTable2.getItem(r -> r.key(k -> k.partitionValue(0))).join();
+        assertThat(record1, is(RECORDS_1.get(0)));
+        assertThat(record2, is(RECORDS_2.get(0)));
+    }
+
+    @Test
+    public void singleDelete() {
+        mappedTable1.putItem(r -> r.item(RECORDS_1.get(0))).join();
+
+        enhancedAsyncClient.transactWriteItems(
+            TransactWriteItemsEnhancedRequest.builder()
+                                             .addDeleteItem(mappedTable1, RECORDS_1.get(0))
+                                             .build()).join();
+
+        Record1 record = mappedTable1.getItem(r -> r.key(k -> k.partitionValue(0))).join();
+        assertThat(record, is(nullValue()));
+    }
+
+    @Test
+    public void multipleDelete() {
+        mappedTable1.putItem(r -> r.item(RECORDS_1.get(0))).join();
+        mappedTable2.putItem(r -> r.item(RECORDS_2.get(0))).join();
+
+        enhancedAsyncClient.transactWriteItems(
+            TransactWriteItemsEnhancedRequest.builder()
+                                             .addDeleteItem(mappedTable1, RECORDS_1.get(0))
+                                             .addDeleteItem(mappedTable2, RECORDS_2.get(0))
+                                             .build()).join();
+
+        Record1 record1 = mappedTable1.getItem(r -> r.key(k -> k.partitionValue(0))).join();
+        Record2 record2 = mappedTable2.getItem(r -> r.key(k -> k.partitionValue(0))).join();
+        assertThat(record1, is(nullValue()));
+        assertThat(record2, is(nullValue()));
+    }
+
+    @Test
+    public void singleConditionCheck() {
+        mappedTable1.putItem(r -> r.item(RECORDS_1.get(0))).join();
+
+        Expression conditionExpression = Expression.builder()
+                                                   .expression("#attribute = :attribute")
+                                                   .expressionValues(singletonMap(":attribute", stringValue("0")))
+                                                   .expressionNames(singletonMap("#attribute", "attribute"))
+                                                   .build();
+
+        Key key = Key.builder().partitionValue(0).build();
+
+        enhancedAsyncClient.transactWriteItems(
+            TransactWriteItemsEnhancedRequest.builder()
+                                             .addConditionCheck(mappedTable1, ConditionCheck.builder()
+                                                                                            .key(key)
+                                                                                            .conditionExpression(conditionExpression)
+                                                                                            .build())
+                                             .build()).join();
+    }
+
+    @Test
+    public void multiConditionCheck() {
+        mappedTable1.putItem(r -> r.item(RECORDS_1.get(0))).join();
+        mappedTable2.putItem(r -> r.item(RECORDS_2.get(0))).join();
+
+        Expression conditionExpression = Expression.builder()
+                                                   .expression("#attribute = :attribute")
+                                                   .expressionValues(singletonMap(":attribute", stringValue("0")))
+                                                   .expressionNames(singletonMap("#attribute", "attribute"))
+                                                   .build();
+
+        Key key1 = Key.builder().partitionValue(0).build();
+        Key key2 = Key.builder().partitionValue(0).build();
+
+        enhancedAsyncClient.transactWriteItems(
+            TransactWriteItemsEnhancedRequest.builder()
+                                             .addConditionCheck(mappedTable1, ConditionCheck.builder()
+                                                                                            .key(key1)
+                                                                                            .conditionExpression(conditionExpression)
+                                                                                            .build())
+                                             .addConditionCheck(mappedTable2, ConditionCheck.builder()
+                                                                                            .key(key2)
+                                                                                            .conditionExpression(conditionExpression)
+                                                                                            .build())
+                                             .build()).join();
+    }
+
+    @Test
+    public void mixedCommands() {
+        mappedTable1.putItem(r -> r.item(RECORDS_1.get(0))).join();
+        mappedTable2.putItem(r -> r.item(RECORDS_2.get(0))).join();
+
+        Expression conditionExpression = Expression.builder()
+                                                   .expression("#attribute = :attribute")
+                                                   .expressionValues(singletonMap(":attribute", stringValue("0")))
+                                                   .expressionNames(singletonMap("#attribute", "attribute"))
+                                                   .build();
+
+        Key key = Key.builder().partitionValue(0).build();
+
+        TransactWriteItemsEnhancedRequest transactWriteItemsEnhancedRequest =
+            TransactWriteItemsEnhancedRequest.builder()
+                                             .addConditionCheck(mappedTable1, ConditionCheck.builder()
+                                                                                            .key(key)
+                                                                                            .conditionExpression(conditionExpression)
+                                                                                            .build())
+                                             .addPutItem(mappedTable2, RECORDS_2.get(1))
+                                             .addUpdateItem(mappedTable1, RECORDS_1.get(1))
+                                             .addDeleteItem(mappedTable2, RECORDS_2.get(0))
+                                             .build();
+        enhancedAsyncClient.transactWriteItems(transactWriteItemsEnhancedRequest).join();
+
+        assertThat(mappedTable1.getItem(r -> r.key(k -> k.partitionValue(1))).join(), is(RECORDS_1.get(1)));
+        assertThat(mappedTable2.getItem(r -> r.key(k -> k.partitionValue(0))).join(), is(nullValue()));
+        assertThat(mappedTable2.getItem(r -> r.key(k -> k.partitionValue(1))).join(), is(RECORDS_2.get(1)));
+    }
+
+    @Test
+    public void mixedCommands_conditionCheckFailsTransaction() {
+        mappedTable1.putItem(r -> r.item(RECORDS_1.get(0))).join();
+        mappedTable2.putItem(r -> r.item(RECORDS_2.get(0))).join();
+
+        Expression conditionExpression = Expression.builder()
+                                                   .expression("#attribute = :attribute")
+                                                   .expressionValues(singletonMap(":attribute", stringValue("1")))
+                                                   .expressionNames(singletonMap("#attribute", "attribute"))
+                                                   .build();
+
+        Key key = Key.builder().partitionValue(0).build();
+
+        TransactWriteItemsEnhancedRequest transactWriteItemsEnhancedRequest =
+            TransactWriteItemsEnhancedRequest.builder()
+                                             .addPutItem(mappedTable2, RECORDS_2.get(1))
+                                             .addUpdateItem(mappedTable1, RECORDS_1.get(1))
+                                             .addConditionCheck(mappedTable1, ConditionCheck.builder()
+                                                                                            .key(key)
+                                                                                            .conditionExpression(conditionExpression)
+                                                                                            .build())
+                                             .addDeleteItem(mappedTable2, RECORDS_2.get(0))
+                                             .build();
+
+        try {
+            enhancedAsyncClient.transactWriteItems(transactWriteItemsEnhancedRequest).join();
+            fail("Expected CompletionException to be thrown");
+        } catch (CompletionException e) {
+            assertThat(e.getCause(), instanceOf(TransactionCanceledException.class));
+        }
+
+        assertThat(mappedTable1.getItem(r -> r.key(k -> k.partitionValue(1))).join(), is(nullValue()));
+        assertThat(mappedTable2.getItem(r -> r.key(k -> k.partitionValue(0))).join(), is(RECORDS_2.get(0)));
+        assertThat(mappedTable2.getItem(r -> r.key(k -> k.partitionValue(1))).join(), is(nullValue()));
+    }
+}
+
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/BasicCrudTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/BasicCrudTest.java
new file mode 100644
index 000000000000..29c808ba0a37
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/BasicCrudTest.java
@@ -0,0 +1,657 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.functionaltests;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.nullValue;
+import static software.amazon.awssdk.enhanced.dynamodb.internal.AttributeValues.stringValue;
+import static software.amazon.awssdk.enhanced.dynamodb.mapper.StaticAttributeTags.primaryPartitionKey;
+import static software.amazon.awssdk.enhanced.dynamodb.mapper.StaticAttributeTags.primarySortKey;
+import static software.amazon.awssdk.enhanced.dynamodb.mapper.StaticAttributeTags.secondaryPartitionKey;
+import static software.amazon.awssdk.enhanced.dynamodb.mapper.StaticAttributeTags.secondarySortKey;
+
+import java.util.Objects;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClient;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbTable;
+import software.amazon.awssdk.enhanced.dynamodb.Expression;
+import software.amazon.awssdk.enhanced.dynamodb.Key;
+import software.amazon.awssdk.enhanced.dynamodb.TableSchema;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.StaticTableSchema;
+import software.amazon.awssdk.enhanced.dynamodb.model.DeleteItemEnhancedRequest;
+import software.amazon.awssdk.enhanced.dynamodb.model.EnhancedGlobalSecondaryIndex;
+import software.amazon.awssdk.enhanced.dynamodb.model.PutItemEnhancedRequest;
+import software.amazon.awssdk.enhanced.dynamodb.model.UpdateItemEnhancedRequest;
+import software.amazon.awssdk.services.dynamodb.model.ConditionalCheckFailedException;
+import software.amazon.awssdk.services.dynamodb.model.DeleteTableRequest;
+import software.amazon.awssdk.services.dynamodb.model.ProjectionType;
+
+public class BasicCrudTest extends LocalDynamoDbSyncTestBase {
+    private static class Record {
+        private String id;
+        private String sort;
+        private String attribute;
+        private String attribute2;
+        private String attribute3;
+
+        private String getId() {
+            return id;
+        }
+
+        private Record setId(String id) {
+            this.id = id;
+            return this;
+        }
+
+        private String getSort() {
+            return sort;
+        }
+
+        private Record setSort(String sort) {
+            this.sort = sort;
+            return this;
+        }
+
+        private String getAttribute() {
+            return attribute;
+        }
+
+        private Record setAttribute(String attribute) {
+            this.attribute = attribute;
+            return this;
+        }
+
+        private String getAttribute2() {
+            return attribute2;
+        }
+
+        private Record setAttribute2(String attribute2) {
+            this.attribute2 = attribute2;
+            return this;
+        }
+
+        private String getAttribute3() {
+            return attribute3;
+        }
+
+        private Record setAttribute3(String attribute3) {
+            this.attribute3 = attribute3;
+            return this;
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) return true;
+            if (o == null || getClass() != o.getClass()) return false;
+            Record record = (Record) o;
+            return Objects.equals(id, record.id) &&
+                   Objects.equals(sort, record.sort) &&
+                   Objects.equals(attribute, record.attribute) &&
+                   Objects.equals(attribute2, record.attribute2) &&
+                   Objects.equals(attribute3, record.attribute3);
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(id, sort, attribute, attribute2, attribute3);
+        }
+    }
+    
+    private static class ShortRecord {
+        private String id;
+        private String sort;
+        private String attribute;
+
+        private String getId() {
+            return id;
+        }
+
+        private ShortRecord setId(String id) {
+            this.id = id;
+            return this;
+        }
+
+        private String getSort() {
+            return sort;
+        }
+
+        private ShortRecord setSort(String sort) {
+            this.sort = sort;
+            return this;
+        }
+
+        private String getAttribute() {
+            return attribute;
+        }
+
+        private ShortRecord setAttribute(String attribute) {
+            this.attribute = attribute;
+            return this;
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) return true;
+            if (o == null || getClass() != o.getClass()) return false;
+            ShortRecord that = (ShortRecord) o;
+            return Objects.equals(id, that.id) &&
+                   Objects.equals(sort, that.sort) &&
+                   Objects.equals(attribute, that.attribute);
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(id, sort, attribute);
+        }
+    }
+
+    private static final TableSchema<Record> TABLE_SCHEMA =
+        StaticTableSchema.builder(Record.class)
+                         .newItemSupplier(Record::new)
+                         .addAttribute(String.class, a -> a.name("id")
+                                                           .getter(Record::getId)
+                                                           .setter(Record::setId)
+                                                           .tags(primaryPartitionKey()))
+                         .addAttribute(String.class, a -> a.name("sort")
+                                                           .getter(Record::getSort)
+                                                           .setter(Record::setSort)
+                                                           .tags(primarySortKey()))
+                         .addAttribute(String.class, a -> a.name("attribute")
+                                                           .getter(Record::getAttribute)
+                                                           .setter(Record::setAttribute))
+                         .addAttribute(String.class, a -> a.name("attribute2*")
+                                                           .getter(Record::getAttribute2)
+                                                           .setter(Record::setAttribute2)
+                                                           .tags(secondaryPartitionKey("gsi_1")))
+                         .addAttribute(String.class, a -> a.name("attribute3")
+                                                           .getter(Record::getAttribute3)
+                                                           .setter(Record::setAttribute3)
+                                                           .tags(secondarySortKey("gsi_1")))
+                         .build();
+
+    private static final TableSchema<ShortRecord> SHORT_TABLE_SCHEMA =
+        StaticTableSchema.builder(ShortRecord.class)
+                         .newItemSupplier(ShortRecord::new)
+                         .addAttribute(String.class, a -> a.name("id")
+                                                           .getter(ShortRecord::getId)
+                                                           .setter(ShortRecord::setId)
+                                                           .tags(primaryPartitionKey()))
+                         .addAttribute(String.class, a -> a.name("sort")
+                                                           .getter(ShortRecord::getSort)
+                                                           .setter(ShortRecord::setSort)
+                                                           .tags(primarySortKey()))
+                         .addAttribute(String.class, a -> a.name("attribute")
+                                                           .getter(ShortRecord::getAttribute)
+                                                           .setter(ShortRecord::setAttribute))
+                         .build();
+
+    private DynamoDbEnhancedClient enhancedClient = DynamoDbEnhancedClient.builder()
+                                                                          .dynamoDbClient(getDynamoDbClient())
+                                                                          .build();
+
+    private DynamoDbTable<Record> mappedTable = enhancedClient.table(getConcreteTableName("table-name"), TABLE_SCHEMA);
+    private DynamoDbTable<ShortRecord> mappedShortTable = enhancedClient.table(getConcreteTableName("table-name"),
+                                                                               SHORT_TABLE_SCHEMA);
+
+    @Rule
+    public ExpectedException exception = ExpectedException.none();
+
+    @Before
+    public void createTable() {
+        mappedTable.createTable(r -> r.provisionedThroughput(getDefaultProvisionedThroughput())
+                .globalSecondaryIndices(
+                        EnhancedGlobalSecondaryIndex.builder()
+                                .indexName("gsi_1")
+                                .projection(p -> p.projectionType(ProjectionType.ALL))
+                                .provisionedThroughput(getDefaultProvisionedThroughput())
+                                .build()));
+    }
+
+    @After
+    public void deleteTable() {
+        getDynamoDbClient().deleteTable(DeleteTableRequest.builder()
+                                                          .tableName(getConcreteTableName("table-name"))
+                                                          .build());
+    }
+
+    @Test
+    public void putThenGetItemUsingKey() {
+        Record record = new Record()
+                              .setId("id-value")
+                              .setSort("sort-value")
+                              .setAttribute("one")
+                              .setAttribute2("two")
+                              .setAttribute3("three");
+
+        mappedTable.putItem(r -> r.item(record));
+        
+        Record result = mappedTable.getItem(r -> r.key(k -> k.partitionValue("id-value").sortValue("sort-value")));
+
+        assertThat(result, is(record));
+    }
+
+    @Test
+    public void putThenGetItemUsingKeyItem() {
+        Record record = new Record()
+                              .setId("id-value")
+                              .setSort("sort-value")
+                              .setAttribute("one")
+                              .setAttribute2("two")
+                              .setAttribute3("three");
+
+        mappedTable.putItem(r -> r.item(record));
+
+        Record keyItem = new Record();
+        keyItem.setId("id-value");
+        keyItem.setSort("sort-value");
+
+        Record result = mappedTable.getItem(keyItem);
+
+        assertThat(result, is(record));
+    }
+
+    @Test
+    public void getNonExistentItem() {
+        Record result = mappedTable.getItem(r -> r.key(k -> k.partitionValue("id-value").sortValue("sort-value")));
+        assertThat(result, is(nullValue()));
+    }
+
+    @Test
+    public void putTwiceThenGetItem() {
+        Record record = new Record()
+                              .setId("id-value")
+                              .setSort("sort-value")
+                              .setAttribute("one")
+                              .setAttribute2("two")
+                              .setAttribute3("three");
+
+        mappedTable.putItem(r -> r.item(record));
+        Record record2 = new Record()
+                               .setId("id-value")
+                               .setSort("sort-value")
+                               .setAttribute("four")
+                               .setAttribute2("five")
+                               .setAttribute3("six");
+
+        mappedTable.putItem(r -> r.item(record2));
+        Record result = mappedTable.getItem(r -> r.key(k -> k.partitionValue("id-value").sortValue("sort-value")));
+
+        assertThat(result, is(record2));
+    }
+
+    @Test
+    public void putThenDeleteItem_usingShortcutForm() {
+        Record record = new Record()
+                              .setId("id-value")
+                              .setSort("sort-value")
+                              .setAttribute("one")
+                              .setAttribute2("two")
+                              .setAttribute3("three");
+
+        mappedTable.putItem(record);
+        Record beforeDeleteResult =
+            mappedTable.deleteItem(Key.builder().partitionValue("id-value").sortValue("sort-value").build());
+        Record afterDeleteResult =
+            mappedTable.getItem(Key.builder().partitionValue("id-value").sortValue("sort-value").build());
+
+        assertThat(beforeDeleteResult, is(record));
+        assertThat(afterDeleteResult, is(nullValue()));
+    }
+
+    @Test
+    public void putThenDeleteItem_usingKeyItemForm() {
+        Record record = new Record()
+            .setId("id-value")
+            .setSort("sort-value")
+            .setAttribute("one")
+            .setAttribute2("two")
+            .setAttribute3("three");
+
+        mappedTable.putItem(record);
+        Record beforeDeleteResult =
+            mappedTable.deleteItem(record);
+        Record afterDeleteResult =
+            mappedTable.getItem(Key.builder().partitionValue("id-value").sortValue("sort-value").build());
+
+        assertThat(beforeDeleteResult, is(record));
+        assertThat(afterDeleteResult, is(nullValue()));
+    }
+
+    @Test
+    public void putWithConditionThatSucceeds() {
+        Record record = new Record()
+            .setId("id-value")
+            .setSort("sort-value")
+            .setAttribute("one")
+            .setAttribute2("two")
+            .setAttribute3("three");
+
+        mappedTable.putItem(r -> r.item(record));
+        record.setAttribute("four");
+
+        Expression conditionExpression = Expression.builder()
+                                                   .expression("#key = :value OR #key1 = :value1")
+                                                   .putExpressionName("#key", "attribute")
+                                                   .putExpressionName("#key1", "attribute3")
+                                                   .putExpressionValue(":value", stringValue("wrong"))
+                                                   .putExpressionValue(":value1", stringValue("three"))
+                                                   .build();
+
+        mappedTable.putItem(PutItemEnhancedRequest.builder(Record.class)
+                                                  .item(record)
+                                                  .conditionExpression(conditionExpression).build());
+
+        Record result = mappedTable.getItem(r -> r.key(k -> k.partitionValue("id-value").sortValue("sort-value")));
+        assertThat(result, is(record));
+    }
+
+    @Test
+    public void putWithConditionThatFails() {
+        Record record = new Record()
+            .setId("id-value")
+            .setSort("sort-value")
+            .setAttribute("one")
+            .setAttribute2("two")
+            .setAttribute3("three");
+
+        mappedTable.putItem(r -> r.item(record));
+        record.setAttribute("four");
+
+        Expression conditionExpression = Expression.builder()
+                                                   .expression("#key = :value OR #key1 = :value1")
+                                                   .putExpressionName("#key", "attribute")
+                                                   .putExpressionName("#key1", "attribute3")
+                                                   .putExpressionValue(":value", stringValue("wrong"))
+                                                   .putExpressionValue(":value1", stringValue("wrong"))
+                                                   .build();
+
+        exception.expect(ConditionalCheckFailedException.class);
+        mappedTable.putItem(PutItemEnhancedRequest.builder(Record.class)
+                                                  .item(record)
+                                                  .conditionExpression(conditionExpression).build());
+    }
+
+    @Test
+    public void deleteNonExistentItem() {
+        Record result = mappedTable.deleteItem(r -> r.key(k -> k.partitionValue("id-value").sortValue("sort-value")));
+        assertThat(result, is(nullValue()));
+    }
+
+    @Test
+    public void deleteWithConditionThatSucceeds() {
+        Record record = new Record()
+            .setId("id-value")
+            .setSort("sort-value")
+            .setAttribute("one")
+            .setAttribute2("two")
+            .setAttribute3("three");
+
+        mappedTable.putItem(r -> r.item(record));
+
+        Expression conditionExpression = Expression.builder()
+                                                   .expression("#key = :value OR #key1 = :value1")
+                                                   .putExpressionName("#key", "attribute")
+                                                   .putExpressionName("#key1", "attribute3")
+                                                   .putExpressionValue(":value", stringValue("wrong"))
+                                                   .putExpressionValue(":value1", stringValue("three"))
+                                                   .build();
+
+        Key key = mappedTable.keyFrom(record);
+        mappedTable.deleteItem(DeleteItemEnhancedRequest.builder().key(key).conditionExpression(conditionExpression).build());
+
+        Record result = mappedTable.getItem(r -> r.key(key));
+        assertThat(result, is(nullValue()));
+    }
+
+    @Test
+    public void deleteWithConditionThatFails() {
+        Record record = new Record()
+            .setId("id-value")
+            .setSort("sort-value")
+            .setAttribute("one")
+            .setAttribute2("two")
+            .setAttribute3("three");
+
+        mappedTable.putItem(r -> r.item(record));
+
+        Expression conditionExpression = Expression.builder()
+                                                   .expression("#key = :value OR #key1 = :value1")
+                                                   .putExpressionName("#key", "attribute")
+                                                   .putExpressionName("#key1", "attribute3")
+                                                   .putExpressionValue(":value", stringValue("wrong"))
+                                                   .putExpressionValue(":value1", stringValue("wrong"))
+                                                   .build();
+
+        exception.expect(ConditionalCheckFailedException.class);
+        mappedTable.deleteItem(DeleteItemEnhancedRequest.builder().key(mappedTable.keyFrom(record))
+                                                        .conditionExpression(conditionExpression)
+                                                        .build());
+    }
+
+    @Test
+    public void updateOverwriteCompleteRecord_usingShortcutForm() {
+        Record record = new Record()
+                              .setId("id-value")
+                              .setSort("sort-value")
+                              .setAttribute("one")
+                              .setAttribute2("two")
+                              .setAttribute3("three");
+
+        mappedTable.putItem(record);
+        Record record2 = new Record()
+                               .setId("id-value")
+                               .setSort("sort-value")
+                               .setAttribute("four")
+                               .setAttribute2("five")
+                               .setAttribute3("six");
+        Record result = mappedTable.updateItem(record2);
+
+        assertThat(result, is(record2));
+    }
+
+    @Test
+    public void updateCreatePartialRecord() {
+        Record record = new Record()
+                              .setId("id-value")
+                              .setSort("sort-value")
+                              .setAttribute("one");
+
+        Record result = mappedTable.updateItem(r -> r.item(record));
+
+        assertThat(result, is(record));
+    }
+
+    @Test
+    public void updateCreateKeyOnlyRecord() {
+        Record record = new Record()
+                              .setId("id-value")
+                              .setSort("sort-value");
+
+        Record result = mappedTable.updateItem(r -> r.item(record));
+        assertThat(result, is(record));
+    }
+
+    @Test
+    public void updateOverwriteModelledNulls() {
+        Record record = new Record()
+                              .setId("id-value")
+                              .setSort("sort-value")
+                              .setAttribute("one")
+                              .setAttribute2("two")
+                              .setAttribute3("three");
+
+        mappedTable.putItem(r -> r.item(record));
+        Record record2 = new Record()
+                               .setId("id-value")
+                               .setSort("sort-value")
+                               .setAttribute("four");
+        Record result = mappedTable.updateItem(r -> r.item(record2));
+
+        assertThat(result, is(record2));
+    }
+
+    @Test
+    public void updateCanIgnoreNullsAndDoPartialUpdate() {
+        Record record = new Record()
+                              .setId("id-value")
+                              .setSort("sort-value")
+                              .setAttribute("one")
+                              .setAttribute2("two")
+                              .setAttribute3("three");
+
+        mappedTable.putItem(r -> r.item(record));
+        Record record2 = new Record()
+                               .setId("id-value")
+                               .setSort("sort-value")
+                               .setAttribute("four");
+        Record result = mappedTable.updateItem(UpdateItemEnhancedRequest.builder(Record.class)
+                                                                        .item(record2)
+                                                                        .ignoreNulls(true)
+                                                                        .build());
+
+        Record expectedResult = new Record()
+                               .setId("id-value")
+                               .setSort("sort-value")
+                               .setAttribute("four")
+                               .setAttribute2("two")
+                               .setAttribute3("three");
+        assertThat(result, is(expectedResult));
+    }
+
+    @Test
+    public void updateShortRecordDoesPartialUpdate() {
+        Record record = new Record()
+                              .setId("id-value")
+                              .setSort("sort-value")
+                              .setAttribute("one")
+                              .setAttribute2("two")
+                              .setAttribute3("three");
+
+        mappedTable.putItem(r -> r.item(record));
+        ShortRecord record2 = new ShortRecord()
+                                         .setId("id-value")
+                                         .setSort("sort-value")
+                                         .setAttribute("four");
+        ShortRecord shortResult = mappedShortTable.updateItem(r -> r.item(record2));
+        Record result = mappedTable.getItem(r -> r.key(k -> k.partitionValue(record.getId()).sortValue(record.getSort())));
+
+        Record expectedResult = new Record()
+                                      .setId("id-value")
+                                      .setSort("sort-value")
+                                      .setAttribute("four")
+                                      .setAttribute2("two")
+                                      .setAttribute3("three");
+        assertThat(result, is(expectedResult));
+        assertThat(shortResult, is(record2));
+    }
+
+    @Test
+    public void updateKeyOnlyExistingRecordDoesNothing() {
+        Record record = new Record()
+                              .setId("id-value")
+                              .setSort("sort-value")
+                              .setAttribute("one")
+                              .setAttribute2("two")
+                              .setAttribute3("three");
+
+        mappedTable.putItem(r -> r.item(record));
+        Record updateRecord = new Record().setId("id-value").setSort("sort-value");
+
+        Record result = mappedTable.updateItem(UpdateItemEnhancedRequest.builder(Record.class)
+                                                                        .item(updateRecord)
+                                                                        .ignoreNulls(true)
+                                                                        .build());
+
+        assertThat(result, is(record));
+    }
+
+    @Test
+    public void updateWithConditionThatSucceeds() {
+        Record record = new Record()
+            .setId("id-value")
+            .setSort("sort-value")
+            .setAttribute("one")
+            .setAttribute2("two")
+            .setAttribute3("three");
+
+        mappedTable.putItem(r -> r.item(record));
+        record.setAttribute("four");
+
+        Expression conditionExpression = Expression.builder()
+                                                   .expression("#key = :value OR #key1 = :value1")
+                                                   .putExpressionName("#key", "attribute")
+                                                   .putExpressionName("#key1", "attribute3")
+                                                   .putExpressionValue(":value", stringValue("wrong"))
+                                                   .putExpressionValue(":value1", stringValue("three"))
+                                                   .build();
+
+        mappedTable.updateItem(UpdateItemEnhancedRequest.builder(Record.class)
+                                                        .item(record)
+                                                        .conditionExpression(conditionExpression)
+                                                        .build());
+
+        Record result = mappedTable.getItem(r -> r.key(k -> k.partitionValue("id-value").sortValue("sort-value")));
+        assertThat(result, is(record));
+    }
+
+    @Test
+    public void updateWithConditionThatFails() {
+        Record record = new Record()
+            .setId("id-value")
+            .setSort("sort-value")
+            .setAttribute("one")
+            .setAttribute2("two")
+            .setAttribute3("three");
+
+        mappedTable.putItem(r -> r.item(record));
+        record.setAttribute("four");
+
+        Expression conditionExpression = Expression.builder()
+                                                   .expression("#key = :value OR #key1 = :value1")
+                                                   .putExpressionName("#key", "attribute")
+                                                   .putExpressionName("#key1", "attribute3")
+                                                   .putExpressionValue(":value", stringValue("wrong"))
+                                                   .putExpressionValue(":value1", stringValue("wrong"))
+                                                   .build();
+
+        exception.expect(ConditionalCheckFailedException.class);
+        mappedTable.updateItem(UpdateItemEnhancedRequest.builder(Record.class)
+                                                        .item(record)
+                                                        .conditionExpression(conditionExpression)
+                                                        .build());
+    }
+
+    @Test
+    public void getAShortRecordWithNewModelledFields() {
+        ShortRecord shortRecord = new ShortRecord()
+                                         .setId("id-value")
+                                         .setSort("sort-value")
+                                         .setAttribute("one");
+        mappedShortTable.putItem(r -> r.item(shortRecord));
+        Record expectedRecord = new Record()
+                                      .setId("id-value")
+                                      .setSort("sort-value")
+                                      .setAttribute("one");
+
+        Record result = mappedTable.getItem(r -> r.key(k -> k.partitionValue("id-value").sortValue("sort-value")));
+        assertThat(result, is(expectedRecord));
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/BasicQueryTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/BasicQueryTest.java
new file mode 100644
index 000000000000..96f87123a89c
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/BasicQueryTest.java
@@ -0,0 +1,299 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.functionaltests;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.empty;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.nullValue;
+import static software.amazon.awssdk.enhanced.dynamodb.internal.AttributeValues.numberValue;
+import static software.amazon.awssdk.enhanced.dynamodb.internal.AttributeValues.stringValue;
+import static software.amazon.awssdk.enhanced.dynamodb.mapper.StaticAttributeTags.primaryPartitionKey;
+import static software.amazon.awssdk.enhanced.dynamodb.mapper.StaticAttributeTags.primarySortKey;
+import static software.amazon.awssdk.enhanced.dynamodb.model.QueryConditional.keyEqualTo;
+import static software.amazon.awssdk.enhanced.dynamodb.model.QueryConditional.sortBetween;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import software.amazon.awssdk.core.pagination.sync.SdkIterable;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClient;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbTable;
+import software.amazon.awssdk.enhanced.dynamodb.Expression;
+import software.amazon.awssdk.enhanced.dynamodb.Key;
+import software.amazon.awssdk.enhanced.dynamodb.TableSchema;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.StaticTableSchema;
+import software.amazon.awssdk.enhanced.dynamodb.model.PageIterable;
+import software.amazon.awssdk.enhanced.dynamodb.model.Page;
+import software.amazon.awssdk.enhanced.dynamodb.model.QueryEnhancedRequest;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+import software.amazon.awssdk.services.dynamodb.model.DeleteTableRequest;
+
+public class BasicQueryTest extends LocalDynamoDbSyncTestBase {
+    private static class Record {
+        private String id;
+        private Integer sort;
+        private Integer value;
+
+        public String getId() {
+            return id;
+        }
+
+        public Record setId(String id) {
+            this.id = id;
+            return this;
+        }
+
+        public Integer getSort() {
+            return sort;
+        }
+
+        public Record setSort(Integer sort) {
+            this.sort = sort;
+            return this;
+        }
+
+        public Integer getValue() {
+            return value;
+        }
+
+        public Record setValue(Integer value) {
+            this.value = value;
+            return this;
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) return true;
+            if (o == null || getClass() != o.getClass()) return false;
+            Record record = (Record) o;
+            return Objects.equals(id, record.id) &&
+                   Objects.equals(sort, record.sort) &&
+                   Objects.equals(value, record.value);
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(id, sort, value);
+        }
+    }
+
+    private static final TableSchema<Record> TABLE_SCHEMA =
+        StaticTableSchema.builder(Record.class)
+                         .newItemSupplier(Record::new)
+                         .addAttribute(String.class, a -> a.name("id")
+                                                           .getter(Record::getId)
+                                                           .setter(Record::setId)
+                                                           .tags(primaryPartitionKey()))
+                         .addAttribute(Integer.class, a -> a.name("sort")
+                                                            .getter(Record::getSort)
+                                                            .setter(Record::setSort)
+                                                            .tags(primarySortKey()))
+                         .addAttribute(Integer.class, a -> a.name("value")
+                                                            .getter(Record::getValue)
+                                                            .setter(Record::setValue))
+                         .build();
+
+    private static final List<Record> RECORDS =
+        IntStream.range(0, 10)
+                 .mapToObj(i -> new Record().setId("id-value").setSort(i).setValue(i))
+                 .collect(Collectors.toList());
+
+    private DynamoDbEnhancedClient enhancedClient = DynamoDbEnhancedClient.builder()
+                                                                          .dynamoDbClient(getDynamoDbClient())
+                                                                          .build();
+
+    private DynamoDbTable<Record> mappedTable = enhancedClient.table(getConcreteTableName("table-name"), TABLE_SCHEMA);
+
+    private void insertRecords() {
+        RECORDS.forEach(record -> mappedTable.putItem(r -> r.item(record)));
+    }
+
+    @Before
+    public void createTable() {
+        mappedTable.createTable(r -> r.provisionedThroughput(getDefaultProvisionedThroughput()));
+    }
+
+    @After
+    public void deleteTable() {
+        getDynamoDbClient().deleteTable(DeleteTableRequest.builder()
+                                                          .tableName(getConcreteTableName("table-name"))
+                                                          .build());
+    }
+
+    @Test
+    public void queryAllRecordsDefaultSettings_shortcutForm() {
+        insertRecords();
+
+        Iterator<Page<Record>> results =
+            mappedTable.query(keyEqualTo(k -> k.partitionValue("id-value"))).iterator();
+
+        assertThat(results.hasNext(), is(true));
+        Page<Record> page = results.next();
+        assertThat(results.hasNext(), is(false));
+
+        assertThat(page.items(), is(RECORDS));
+        assertThat(page.lastEvaluatedKey(), is(nullValue()));
+    }
+
+    @Test
+    public void queryAllRecordsDefaultSettings_shortcutForm_viaItems() {
+        insertRecords();
+
+        PageIterable<Record> query = mappedTable.query(keyEqualTo(k -> k.partitionValue("id-value")));
+        SdkIterable<Record> results = query.items();
+
+        assertThat(results.stream().collect(Collectors.toList()), is(RECORDS));
+    }
+
+    @Test
+    public void queryAllRecordsWithFilter() {
+        insertRecords();
+        Map<String, AttributeValue> expressionValues = new HashMap<>();
+        expressionValues.put(":min_value", numberValue(3));
+        expressionValues.put(":max_value", numberValue(5));
+        Expression expression = Expression.builder()
+                                          .expression("#value >= :min_value AND #value <= :max_value")
+                                          .expressionValues(expressionValues)
+                                          .expressionNames(Collections.singletonMap("#value", "value"))
+                                          .build();
+
+        Iterator<Page<Record>> results =
+            mappedTable.query(QueryEnhancedRequest.builder()
+                                                  .queryConditional(keyEqualTo(k -> k.partitionValue("id-value")))
+                                                  .filterExpression(expression)
+                                                  .build())
+                       .iterator();
+
+        assertThat(results.hasNext(), is(true));
+        Page<Record> page = results.next();
+        assertThat(results.hasNext(), is(false));
+
+        assertThat(page.items(),
+                   is(RECORDS.stream().filter(r -> r.sort >= 3 && r.sort <= 5).collect(Collectors.toList())));
+        assertThat(page.lastEvaluatedKey(), is(nullValue()));
+    }
+
+    @Test
+    public void queryBetween() {
+        insertRecords();
+        Key fromKey = Key.builder().partitionValue("id-value").sortValue(3).build();
+        Key toKey = Key.builder().partitionValue("id-value").sortValue(5).build();
+        Iterator<Page<Record>> results = mappedTable.query(r -> r.queryConditional(sortBetween(fromKey, toKey))).iterator();
+
+        assertThat(results.hasNext(), is(true));
+        Page<Record> page = results.next();
+        assertThat(results.hasNext(), is(false));
+
+        assertThat(page.items(),
+                   is(RECORDS.stream().filter(r -> r.sort >= 3 && r.sort <= 5).collect(Collectors.toList())));
+        assertThat(page.lastEvaluatedKey(), is(nullValue()));
+    }
+
+    @Test
+    public void queryLimit() {
+        insertRecords();
+        Iterator<Page<Record>> results =
+            mappedTable.query(QueryEnhancedRequest.builder()
+                                                  .queryConditional(keyEqualTo(k -> k.partitionValue("id-value")))
+                                                  .limit(5)
+                                                  .build())
+                       .iterator();
+        assertThat(results.hasNext(), is(true));
+        Page<Record> page1 = results.next();
+        assertThat(results.hasNext(), is(true));
+        Page<Record> page2 = results.next();
+        assertThat(results.hasNext(), is(true));
+        Page<Record> page3 = results.next();
+        assertThat(results.hasNext(), is(false));
+
+        Map<String, AttributeValue> expectedLastEvaluatedKey1 = new HashMap<>();
+        expectedLastEvaluatedKey1.put("id", stringValue("id-value"));
+        expectedLastEvaluatedKey1.put("sort", numberValue(4));
+        Map<String, AttributeValue> expectedLastEvaluatedKey2 = new HashMap<>();
+        expectedLastEvaluatedKey2.put("id", stringValue("id-value"));
+        expectedLastEvaluatedKey2.put("sort", numberValue(9));
+        assertThat(page1.items(), is(RECORDS.subList(0, 5)));
+        assertThat(page1.lastEvaluatedKey(), is(expectedLastEvaluatedKey1));
+        assertThat(page2.items(), is(RECORDS.subList(5, 10)));
+        assertThat(page2.lastEvaluatedKey(), is(expectedLastEvaluatedKey2));
+        assertThat(page3.items(), is(empty()));
+        assertThat(page3.lastEvaluatedKey(), is(nullValue()));
+    }
+
+    @Test
+    public void queryEmpty() {
+        Iterator<Page<Record>> results =
+            mappedTable.query(r -> r.queryConditional(keyEqualTo(k -> k.partitionValue("id-value")))).iterator();
+        assertThat(results.hasNext(), is(true));
+        Page<Record> page = results.next();
+        assertThat(results.hasNext(), is(false));
+        assertThat(page.items(), is(empty()));
+        assertThat(page.lastEvaluatedKey(), is(nullValue()));
+    }
+
+    @Test
+    public void queryEmpty_viaItems() {
+        PageIterable<Record> query = mappedTable.query(keyEqualTo(k -> k.partitionValue("id-value")));
+        SdkIterable<Record> results = query.items();
+
+        assertThat(results.stream().collect(Collectors.toList()), is(empty()));
+    }
+
+    @Test
+    public void queryExclusiveStartKey() {
+        Map<String, AttributeValue> exclusiveStartKey = new HashMap<>();
+        exclusiveStartKey.put("id", stringValue("id-value"));
+        exclusiveStartKey.put("sort", numberValue(7));
+        insertRecords();
+        Iterator<Page<Record>> results =
+            mappedTable.query(QueryEnhancedRequest.builder()
+                                                  .queryConditional(keyEqualTo(k -> k.partitionValue("id-value")))
+                                                  .exclusiveStartKey(exclusiveStartKey)
+                                                  .build())
+                       .iterator();
+
+        assertThat(results.hasNext(), is(true));
+        Page<Record> page = results.next();
+        assertThat(results.hasNext(), is(false));
+        assertThat(page.items(), is(RECORDS.subList(8, 10)));
+        assertThat(page.lastEvaluatedKey(), is(nullValue()));
+    }
+
+    @Test
+    public void queryExclusiveStartKey_viaItems() {
+        Map<String, AttributeValue> exclusiveStartKey = new HashMap<>();
+        exclusiveStartKey.put("id", stringValue("id-value"));
+        exclusiveStartKey.put("sort", numberValue(7));
+        insertRecords();
+        SdkIterable<Record> results =
+            mappedTable.query(QueryEnhancedRequest.builder()
+                                                  .queryConditional(keyEqualTo(k -> k.partitionValue("id-value")))
+                                                  .exclusiveStartKey(exclusiveStartKey)
+                                                  .build())
+                       .items();
+
+        assertThat(results.stream().collect(Collectors.toList()), is(RECORDS.subList(8, 10)));
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/BasicScanTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/BasicScanTest.java
new file mode 100644
index 000000000000..e4a88653aea1
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/BasicScanTest.java
@@ -0,0 +1,244 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.functionaltests;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.empty;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.nullValue;
+import static software.amazon.awssdk.enhanced.dynamodb.internal.AttributeValues.numberValue;
+import static software.amazon.awssdk.enhanced.dynamodb.internal.AttributeValues.stringValue;
+import static software.amazon.awssdk.enhanced.dynamodb.mapper.StaticAttributeTags.primaryPartitionKey;
+import static software.amazon.awssdk.enhanced.dynamodb.mapper.StaticAttributeTags.primarySortKey;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import software.amazon.awssdk.core.pagination.sync.SdkIterable;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClient;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbTable;
+import software.amazon.awssdk.enhanced.dynamodb.Expression;
+import software.amazon.awssdk.enhanced.dynamodb.TableSchema;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.StaticTableSchema;
+import software.amazon.awssdk.enhanced.dynamodb.model.Page;
+import software.amazon.awssdk.enhanced.dynamodb.model.ScanEnhancedRequest;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+import software.amazon.awssdk.services.dynamodb.model.DeleteTableRequest;
+
+public class BasicScanTest extends LocalDynamoDbSyncTestBase {
+    private static class Record {
+        private String id;
+        private Integer sort;
+
+        private String getId() {
+            return id;
+        }
+
+        private Record setId(String id) {
+            this.id = id;
+            return this;
+        }
+
+        private Integer getSort() {
+            return sort;
+        }
+
+        private Record setSort(Integer sort) {
+            this.sort = sort;
+            return this;
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) return true;
+            if (o == null || getClass() != o.getClass()) return false;
+            Record record = (Record) o;
+            return Objects.equals(id, record.id) &&
+                   Objects.equals(sort, record.sort);
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(id, sort);
+        }
+    }
+
+    private static final TableSchema<Record> TABLE_SCHEMA =
+        StaticTableSchema.builder(Record.class)
+                         .newItemSupplier(Record::new)
+                         .addAttribute(String.class, a -> a.name("id")
+                                                           .getter(Record::getId)
+                                                           .setter(Record::setId)
+                                                           .tags(primaryPartitionKey()))
+                         .addAttribute(Integer.class, a -> a.name("sort")
+                                                            .getter(Record::getSort)
+                                                            .setter(Record::setSort)
+                                                            .tags(primarySortKey()))
+                         .build();
+
+    private static final List<Record> RECORDS =
+        IntStream.range(0, 10)
+                 .mapToObj(i -> new Record().setId("id-value").setSort(i))
+                 .collect(Collectors.toList());
+
+    private DynamoDbEnhancedClient enhancedClient = DynamoDbEnhancedClient.builder()
+                                                                          .dynamoDbClient(getDynamoDbClient())
+                                                                          .build();
+
+    private DynamoDbTable<Record> mappedTable = enhancedClient.table(getConcreteTableName("table-name"), TABLE_SCHEMA);
+
+    private void insertRecords() {
+        RECORDS.forEach(record -> mappedTable.putItem(r -> r.item(record)));
+    }
+
+    @Before
+    public void createTable() {
+        mappedTable.createTable(r -> r.provisionedThroughput(getDefaultProvisionedThroughput()));
+    }
+
+    @After
+    public void deleteTable() {
+        getDynamoDbClient().deleteTable(DeleteTableRequest.builder()
+                                                          .tableName(getConcreteTableName("table-name"))
+                                                          .build());
+    }
+
+    @Test
+    public void scanAllRecordsDefaultSettings() {
+        insertRecords();
+
+        mappedTable.scan(ScanEnhancedRequest.builder().build())
+                   .forEach(p -> p.items().forEach(item -> System.out.println(item)));
+        Iterator<Page<Record>> results = mappedTable.scan(ScanEnhancedRequest.builder().build()).iterator();
+
+        assertThat(results.hasNext(), is(true));
+        Page<Record> page = results.next();
+        assertThat(results.hasNext(), is(false));
+
+        assertThat(page.items(), is(RECORDS));
+        assertThat(page.lastEvaluatedKey(), is(nullValue()));
+    }
+
+    @Test
+    public void scanAllRecordsDefaultSettings_viaItems() {
+        insertRecords();
+
+        SdkIterable<Record> items = mappedTable.scan(ScanEnhancedRequest.builder().limit(2).build()).items();
+        assertThat(items.stream().collect(Collectors.toList()), is(RECORDS));
+    }
+
+    @Test
+    public void scanAllRecordsWithFilter() {
+        insertRecords();
+        Map<String, AttributeValue> expressionValues = new HashMap<>();
+        expressionValues.put(":min_value", numberValue(3));
+        expressionValues.put(":max_value", numberValue(5));
+        Expression expression = Expression.builder()
+                                          .expression("sort >= :min_value AND sort <= :max_value")
+                                          .expressionValues(expressionValues)
+                                          .build();
+
+        Iterator<Page<Record>> results =
+            mappedTable.scan(ScanEnhancedRequest.builder().filterExpression(expression).build()).iterator();
+
+        assertThat(results.hasNext(), is(true));
+        Page<Record> page = results.next();
+        assertThat(results.hasNext(), is(false));
+
+        assertThat(page.items(),
+                   is(RECORDS.stream().filter(r -> r.sort >= 3 && r.sort <= 5).collect(Collectors.toList())));
+        assertThat(page.lastEvaluatedKey(), is(nullValue()));
+    }
+
+    @Test
+    public void scanLimit() {
+        insertRecords();
+        Iterator<Page<Record>> results = mappedTable.scan(r -> r.limit(5)).iterator();
+        assertThat(results.hasNext(), is(true));
+        Page<Record> page1 = results.next();
+        assertThat(results.hasNext(), is(true));
+        Page<Record> page2 = results.next();
+        assertThat(results.hasNext(), is(true));
+        Page<Record> page3 = results.next();
+        assertThat(results.hasNext(), is(false));
+
+        assertThat(page1.items(), is(RECORDS.subList(0, 5)));
+        assertThat(page1.lastEvaluatedKey(), is(getKeyMap(4)));
+        assertThat(page2.items(), is(RECORDS.subList(5, 10)));
+        assertThat(page2.lastEvaluatedKey(), is(getKeyMap(9)));
+        assertThat(page3.items(), is(empty()));
+        assertThat(page3.lastEvaluatedKey(), is(nullValue()));
+    }
+
+    @Test
+    public void scanLimit_viaItems() {
+        insertRecords();
+        SdkIterable<Record> results = mappedTable.scan(r -> r.limit(5)).items();
+        assertThat(results.stream().collect(Collectors.toList()), is(RECORDS));
+    }
+
+    @Test
+    public void scanEmpty() {
+        Iterator<Page<Record>> results = mappedTable.scan().iterator();
+        assertThat(results.hasNext(), is(true));
+        Page<Record> page = results.next();
+        assertThat(results.hasNext(), is(false));
+        assertThat(page.items(), is(empty()));
+        assertThat(page.lastEvaluatedKey(), is(nullValue()));
+    }
+
+    @Test
+    public void scanEmpty_viaItems() {
+        Iterator<Record> results = mappedTable.scan().items().iterator();
+        assertThat(results.hasNext(), is(false));
+    }
+
+    @Test
+    public void scanExclusiveStartKey() {
+        insertRecords();
+        Iterator<Page<Record>> results =
+            mappedTable.scan(r -> r.exclusiveStartKey(getKeyMap(7))).iterator();
+
+        assertThat(results.hasNext(), is(true));
+        Page<Record> page = results.next();
+        assertThat(results.hasNext(), is(false));
+        assertThat(page.items(), is(RECORDS.subList(8, 10)));
+        assertThat(page.lastEvaluatedKey(), is(nullValue()));
+    }
+
+    @Test
+    public void scanExclusiveStartKey_viaItems() {
+        insertRecords();
+        SdkIterable<Record> results =
+            mappedTable.scan(r -> r.exclusiveStartKey(getKeyMap(7))).items();
+        assertThat(results.stream().collect(Collectors.toList()), is(RECORDS.subList(8, 10)));
+    }
+
+    private Map<String, AttributeValue> getKeyMap(int sort) {
+        Map<String, AttributeValue> result = new HashMap<>();
+        result.put("id", stringValue("id-value"));
+        result.put("sort", numberValue(sort));
+        return Collections.unmodifiableMap(result);
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/BatchGetItemTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/BatchGetItemTest.java
new file mode 100644
index 000000000000..721739157e32
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/BatchGetItemTest.java
@@ -0,0 +1,255 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.functionaltests;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsInAnyOrder;
+import static org.hamcrest.Matchers.is;
+import static software.amazon.awssdk.enhanced.dynamodb.mapper.StaticAttributeTags.primaryPartitionKey;
+
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import software.amazon.awssdk.core.pagination.sync.SdkIterable;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClient;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbTable;
+import software.amazon.awssdk.enhanced.dynamodb.TableSchema;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.StaticTableSchema;
+import software.amazon.awssdk.enhanced.dynamodb.model.BatchGetItemEnhancedRequest;
+import software.amazon.awssdk.enhanced.dynamodb.model.BatchGetResultPage;
+import software.amazon.awssdk.enhanced.dynamodb.model.BatchGetResultPageIterable;
+import software.amazon.awssdk.enhanced.dynamodb.model.ReadBatch;
+import software.amazon.awssdk.services.dynamodb.model.DeleteTableRequest;
+
+public class BatchGetItemTest extends LocalDynamoDbSyncTestBase {
+    private static class Record1 {
+        private Integer id;
+
+        private Integer getId() {
+            return id;
+        }
+
+        private Record1 setId(Integer id) {
+            this.id = id;
+            return this;
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) return true;
+            if (o == null || getClass() != o.getClass()) return false;
+            Record1 record1 = (Record1) o;
+            return Objects.equals(id, record1.id);
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(id);
+        }
+    }
+
+    private static class Record2 {
+        private Integer id;
+
+        private Integer getId() {
+            return id;
+        }
+
+        private Record2 setId(Integer id) {
+            this.id = id;
+            return this;
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) return true;
+            if (o == null || getClass() != o.getClass()) return false;
+            Record2 record2 = (Record2) o;
+            return Objects.equals(id, record2.id);
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(id);
+        }
+    }
+
+    private static final TableSchema<Record1> TABLE_SCHEMA_1 =
+        StaticTableSchema.builder(Record1.class)
+                         .newItemSupplier(Record1::new)
+                         .addAttribute(Integer.class, a -> a.name("id_1")
+                                                            .getter(Record1::getId)
+                                                            .setter(Record1::setId)
+                                                            .tags(primaryPartitionKey()))
+                         .build();
+
+    private static final TableSchema<Record2> TABLE_SCHEMA_2 =
+        StaticTableSchema.builder(Record2.class)
+                         .newItemSupplier(Record2::new)
+                         .addAttribute(Integer.class, a -> a.name("id_2")
+                                                            .getter(Record2::getId)
+                                                            .setter(Record2::setId)
+                                                            .tags(primaryPartitionKey()))
+                         .build();
+
+    private DynamoDbEnhancedClient enhancedClient = DynamoDbEnhancedClient.builder()
+                                                                          .dynamoDbClient(getDynamoDbClient())
+                                                                          .build();
+
+    private DynamoDbTable<Record1> mappedTable1 = enhancedClient.table(getConcreteTableName("table-name-1"), TABLE_SCHEMA_1);
+    private DynamoDbTable<Record2> mappedTable2 = enhancedClient.table(getConcreteTableName("table-name-2"), TABLE_SCHEMA_2);
+
+    private static final List<Record1> RECORDS_1 =
+        IntStream.range(0, 2)
+                 .mapToObj(i -> new Record1().setId(i))
+                 .collect(Collectors.toList());
+
+    private static final List<Record2> RECORDS_2 =
+        IntStream.range(0, 2)
+                 .mapToObj(i -> new Record2().setId(i))
+                 .collect(Collectors.toList());
+
+    @Before
+    public void createTable() {
+        mappedTable1.createTable(r -> r.provisionedThroughput(getDefaultProvisionedThroughput()));
+        mappedTable2.createTable(r -> r.provisionedThroughput(getDefaultProvisionedThroughput()));
+    }
+
+    @After
+    public void deleteTable() {
+        getDynamoDbClient().deleteTable(DeleteTableRequest.builder()
+                                                          .tableName(getConcreteTableName("table-name-1"))
+                                                          .build());
+        getDynamoDbClient().deleteTable(DeleteTableRequest.builder()
+                                                          .tableName(getConcreteTableName("table-name-2"))
+                                                          .build());
+    }
+
+    private void insertRecords() {
+        RECORDS_1.forEach(record -> mappedTable1.putItem(r -> r.item(record)));
+        RECORDS_2.forEach(record -> mappedTable2.putItem(r -> r.item(record)));
+    }
+
+    @Test
+    public void getRecordsFromMultipleTables() {
+        insertRecords();
+        SdkIterable<BatchGetResultPage> results = getBatchGetResultPagesForBothTables();
+        assertThat(results.stream().count(), is(1L));
+
+        results.iterator().forEachRemaining((page) -> {
+            List<Record1> table1Results = page.resultsForTable(mappedTable1);
+            assertThat(table1Results.size(), is(2));
+            assertThat(table1Results.get(0).id, is(0));
+            assertThat(table1Results.get(1).id, is(1));
+            assertThat(page.resultsForTable(mappedTable2).size(), is(2));
+        });
+    }
+
+    @Test
+    public void getRecordsFromMultipleTables_viaFlattenedItems() {
+        insertRecords();
+
+        BatchGetResultPageIterable results = getBatchGetResultPagesForBothTables();
+
+        SdkIterable<Record1> recordsList1 = results.resultsForTable(mappedTable1);
+        assertThat(recordsList1, containsInAnyOrder(RECORDS_1.toArray()));
+
+        SdkIterable<Record2> recordsList2 = results.resultsForTable(mappedTable2);
+        assertThat(recordsList2, containsInAnyOrder(RECORDS_2.toArray()));
+    }
+
+    @Test
+    public void notFoundRecordIgnored() {
+        insertRecords();
+
+        BatchGetItemEnhancedRequest batchGetItemEnhancedRequest = batchGetItemEnhancedRequestWithNotFoundRecord();
+
+        SdkIterable<BatchGetResultPage> results = enhancedClient.batchGetItem(batchGetItemEnhancedRequest);
+
+        assertThat(results.stream().count(), is(1L));
+
+        results.iterator().forEachRemaining((page) -> {
+            List<Record1> mappedTable1Results = page.resultsForTable(mappedTable1);
+            assertThat(mappedTable1Results.size(), is(1));
+            assertThat(mappedTable1Results.get(0).id, is(0));
+            assertThat(page.resultsForTable(mappedTable2).size(), is(2));
+        });
+    }
+
+    @Test
+    public void notFoundRecordIgnored_viaFlattenedItems() {
+        insertRecords();
+
+        BatchGetItemEnhancedRequest batchGetItemEnhancedRequest = batchGetItemEnhancedRequestWithNotFoundRecord();
+
+        BatchGetResultPageIterable pageIterable = enhancedClient.batchGetItem(batchGetItemEnhancedRequest);
+
+        assertThat(pageIterable.stream().count(), is(1L));
+
+        List<Record1> recordsList1 = pageIterable.resultsForTable(mappedTable1).stream().collect(Collectors.toList());
+        assertThat(recordsList1, is(RECORDS_1.subList(0, 1)));
+
+        SdkIterable<Record2> recordsList2 = pageIterable.resultsForTable(mappedTable2);
+        assertThat(recordsList2, containsInAnyOrder(RECORDS_2.toArray()));
+    }
+
+    private BatchGetItemEnhancedRequest batchGetItemEnhancedRequestWithNotFoundRecord() {
+        return BatchGetItemEnhancedRequest.builder()
+                                          .readBatches(
+                                              ReadBatch.builder(Record1.class)
+                                                       .mappedTableResource(mappedTable1)
+                                                       .addGetItem(r -> r.key(k -> k.partitionValue(0)))
+                                                       .build(),
+                                              ReadBatch.builder(Record2.class)
+                                                       .mappedTableResource(mappedTable2)
+                                                       .addGetItem(r -> r.key(k -> k.partitionValue(0)))
+                                                       .build(),
+                                              ReadBatch.builder(Record2.class)
+                                                       .mappedTableResource(mappedTable2)
+                                                       .addGetItem(r -> r.key(k -> k.partitionValue(1)))
+                                                       .build(),
+                                              ReadBatch.builder(Record1.class)
+                                                       .mappedTableResource(mappedTable1)
+                                                       .addGetItem(r -> r.key(k -> k.partitionValue(5)))
+                                                       .build())
+                                          .build();
+    }
+
+    private BatchGetResultPageIterable getBatchGetResultPagesForBothTables() {
+        return enhancedClient.batchGetItem(r -> r.readBatches(
+            ReadBatch.builder(Record1.class)
+                     .mappedTableResource(mappedTable1)
+                     .addGetItem(i -> i.key(k -> k.partitionValue(0)))
+                     .build(),
+            ReadBatch.builder(Record2.class)
+                     .mappedTableResource(mappedTable2)
+                     .addGetItem(i -> i.key(k -> k.partitionValue(0)))
+                     .build(),
+            ReadBatch.builder(Record2.class)
+                     .mappedTableResource(mappedTable2)
+                     .addGetItem(i -> i.key(k -> k.partitionValue(1)))
+                     .build(),
+            ReadBatch.builder(Record1.class)
+                     .mappedTableResource(mappedTable1)
+                     .addGetItem(i -> i.key(k -> k.partitionValue(1)))
+                     .build()));
+    }
+}
+
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/BatchWriteItemTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/BatchWriteItemTest.java
new file mode 100644
index 000000000000..536c34fe8da1
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/BatchWriteItemTest.java
@@ -0,0 +1,277 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.functionaltests;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.nullValue;
+import static software.amazon.awssdk.enhanced.dynamodb.mapper.StaticAttributeTags.primaryPartitionKey;
+
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClient;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbTable;
+import software.amazon.awssdk.enhanced.dynamodb.TableSchema;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.StaticTableSchema;
+import software.amazon.awssdk.enhanced.dynamodb.model.BatchWriteItemEnhancedRequest;
+import software.amazon.awssdk.enhanced.dynamodb.model.WriteBatch;
+import software.amazon.awssdk.services.dynamodb.model.DeleteTableRequest;
+
+public class BatchWriteItemTest extends LocalDynamoDbSyncTestBase {
+    private static class Record1 {
+        private Integer id;
+        private String attribute;
+
+        private Integer getId() {
+            return id;
+        }
+
+        private Record1 setId(Integer id) {
+            this.id = id;
+            return this;
+        }
+
+        private String getAttribute() {
+            return attribute;
+        }
+
+        private Record1 setAttribute(String attribute) {
+            this.attribute = attribute;
+            return this;
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) return true;
+            if (o == null || getClass() != o.getClass()) return false;
+            Record1 record1 = (Record1) o;
+            return Objects.equals(id, record1.id) &&
+                   Objects.equals(attribute, record1.attribute);
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(id, attribute);
+        }
+    }
+
+    private static class Record2 {
+        private Integer id;
+        private String attribute;
+
+        private Integer getId() {
+            return id;
+        }
+
+        private Record2 setId(Integer id) {
+            this.id = id;
+            return this;
+        }
+
+        private String getAttribute() {
+            return attribute;
+        }
+
+        private Record2 setAttribute(String attribute) {
+            this.attribute = attribute;
+            return this;
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) return true;
+            if (o == null || getClass() != o.getClass()) return false;
+            Record2 record2 = (Record2) o;
+            return Objects.equals(id, record2.id) &&
+                   Objects.equals(attribute, record2.attribute);
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(id, attribute);
+        }
+    }
+
+    private static final TableSchema<Record1> TABLE_SCHEMA_1 =
+        StaticTableSchema.builder(Record1.class)
+                         .newItemSupplier(Record1::new)
+                         .addAttribute(Integer.class, a -> a.name("id_1")
+                                                            .getter(Record1::getId)
+                                                            .setter(Record1::setId)
+                                                            .tags(primaryPartitionKey()))
+                         .addAttribute(String.class, a -> a.name("attribute")
+                                                           .getter(Record1::getAttribute)
+                                                           .setter(Record1::setAttribute))
+                         .build();
+
+    private static final TableSchema<Record2> TABLE_SCHEMA_2 =
+        StaticTableSchema.builder(Record2.class)
+                         .newItemSupplier(Record2::new)
+                         .addAttribute(Integer.class, a -> a.name("id_2")
+                                                            .getter(Record2::getId)
+                                                            .setter(Record2::setId)
+                                                            .tags(primaryPartitionKey()))
+                         .addAttribute(String.class, a -> a.name("attribute")
+                                                           .getter(Record2::getAttribute)
+                                                           .setter(Record2::setAttribute))
+                         .build();
+
+    private DynamoDbEnhancedClient enhancedClient = DynamoDbEnhancedClient.builder()
+                                                                          .dynamoDbClient(getDynamoDbClient())
+                                                                          .build();
+
+    private DynamoDbTable<Record1> mappedTable1 = enhancedClient.table(getConcreteTableName("table-name-1"), TABLE_SCHEMA_1);
+    private DynamoDbTable<Record2> mappedTable2 = enhancedClient.table(getConcreteTableName("table-name-2"), TABLE_SCHEMA_2);
+
+    private static final List<Record1> RECORDS_1 =
+        IntStream.range(0, 2)
+                 .mapToObj(i -> new Record1().setId(i).setAttribute(Integer.toString(i)))
+                 .collect(Collectors.toList());
+
+    private static final List<Record2> RECORDS_2 =
+        IntStream.range(0, 2)
+                 .mapToObj(i -> new Record2().setId(i).setAttribute(Integer.toString(i)))
+                 .collect(Collectors.toList());
+
+    @Before
+    public void createTable() {
+        mappedTable1.createTable(r -> r.provisionedThroughput(getDefaultProvisionedThroughput()));
+        mappedTable2.createTable(r -> r.provisionedThroughput(getDefaultProvisionedThroughput()));
+    }
+
+    @After
+    public void deleteTable() {
+        getDynamoDbClient().deleteTable(DeleteTableRequest.builder()
+                                                          .tableName(getConcreteTableName("table-name-1"))
+                                                          .build());
+        getDynamoDbClient().deleteTable(DeleteTableRequest.builder()
+                                                          .tableName(getConcreteTableName("table-name-2"))
+                                                          .build());
+    }
+
+    @Test
+    public void singlePut() {
+        BatchWriteItemEnhancedRequest batchWriteItemEnhancedRequest =
+            BatchWriteItemEnhancedRequest.builder()
+                                         .addWriteBatch(
+                                             WriteBatch.builder(Record1.class)
+                                                       .mappedTableResource(mappedTable1)
+                                                       .addPutItem(r -> r.item(RECORDS_1.get(0)))
+                                                       .build())
+                                         .build();
+
+        enhancedClient.batchWriteItem(batchWriteItemEnhancedRequest);
+
+        Record1 record = mappedTable1.getItem(r -> r.key(k -> k.partitionValue(0)));
+        assertThat(record, is(RECORDS_1.get(0)));
+    }
+
+    @Test
+    public void multiplePut() {
+        BatchWriteItemEnhancedRequest batchWriteItemEnhancedRequest =
+            BatchWriteItemEnhancedRequest.builder()
+                                         .writeBatches(
+                                             WriteBatch.builder(Record1.class)
+                                                       .mappedTableResource(mappedTable1)
+                                                       .addPutItem(r -> r.item(RECORDS_1.get(0)))
+                                                       .build(),
+                                             WriteBatch.builder(Record2.class)
+                                                       .mappedTableResource(mappedTable2)
+                                                       .addPutItem(r -> r.item(RECORDS_2.get(0)))
+                                                       .build())
+                                         .build();
+
+        enhancedClient.batchWriteItem(batchWriteItemEnhancedRequest);
+
+        Record1 record1 = mappedTable1.getItem(r -> r.key(k -> k.partitionValue(0)));
+        Record2 record2 = mappedTable2.getItem(r -> r.key(k -> k.partitionValue(0)));
+        assertThat(record1, is(RECORDS_1.get(0)));
+        assertThat(record2, is(RECORDS_2.get(0)));
+    }
+
+    @Test
+    public void singleDelete() {
+        mappedTable1.putItem(r -> r.item(RECORDS_1.get(0)));
+
+        WriteBatch singleDeleteBatch = WriteBatch.builder(Record1.class)
+                                                 .mappedTableResource(mappedTable1)
+                                                 .addDeleteItem(r -> r.key(k -> k.partitionValue(0)))
+                                                 .build();
+
+        BatchWriteItemEnhancedRequest batchWriteItemEnhancedRequest =
+            BatchWriteItemEnhancedRequest.builder()
+                                         .addWriteBatch(singleDeleteBatch)
+                                         .build();
+
+        enhancedClient.batchWriteItem(batchWriteItemEnhancedRequest);
+
+        Record1 record = mappedTable1.getItem(r -> r.key(k -> k.partitionValue(0)));
+        assertThat(record, is(nullValue()));
+    }
+
+    @Test
+    public void multipleDelete() {
+        mappedTable1.putItem(r -> r.item(RECORDS_1.get(0)));
+        mappedTable2.putItem(r -> r.item(RECORDS_2.get(0)));
+
+        BatchWriteItemEnhancedRequest batchWriteItemEnhancedRequest =
+            BatchWriteItemEnhancedRequest.builder()
+                                         .writeBatches(
+                                             WriteBatch.builder(Record1.class)
+                                                       .mappedTableResource(mappedTable1)
+                                                       .addDeleteItem(r -> r.key(k -> k.partitionValue(0)))
+                                                       .build(),
+                                             WriteBatch.builder(Record2.class)
+                                                       .mappedTableResource(mappedTable2)
+                                                       .addDeleteItem(r -> r.key(k -> k.partitionValue(0)))
+                                                       .build())
+                                         .build();
+
+        enhancedClient.batchWriteItem(batchWriteItemEnhancedRequest);
+
+        Record1 record1 = mappedTable1.getItem(r -> r.key(k -> k.partitionValue(0)));
+        Record2 record2 = mappedTable2.getItem(r -> r.key(k -> k.partitionValue(0)));
+        assertThat(record1, is(nullValue()));
+        assertThat(record2, is(nullValue()));
+    }
+
+    @Test
+    public void mixedCommands() {
+        mappedTable1.putItem(r -> r.item(RECORDS_1.get(0)));
+        mappedTable2.putItem(r -> r.item(RECORDS_2.get(0)));
+
+        enhancedClient.batchWriteItem(r -> r.writeBatches(
+            WriteBatch.builder(Record1.class)
+                      .mappedTableResource(mappedTable1)
+                      .addPutItem(i -> i.item(RECORDS_1.get(1)))
+                      .build(),
+            WriteBatch.builder(Record2.class)
+                      .mappedTableResource(mappedTable2)
+                      .addDeleteItem(i -> i.key(k -> k.partitionValue(0)))
+                      .build()));
+
+        assertThat(mappedTable1.getItem(r -> r.key(k -> k.partitionValue(0))), is(RECORDS_1.get(0)));
+        assertThat(mappedTable1.getItem(r -> r.key(k -> k.partitionValue(1))), is(RECORDS_1.get(1)));
+        assertThat(mappedTable2.getItem(r -> r.key(k -> k.partitionValue(0))), is(nullValue()));
+    }
+
+}
+
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/BufferingSubscriber.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/BufferingSubscriber.java
new file mode 100644
index 000000000000..006005f438a8
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/BufferingSubscriber.java
@@ -0,0 +1,72 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.functionaltests;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import org.reactivestreams.Subscriber;
+import org.reactivestreams.Subscription;
+
+public class BufferingSubscriber<T> implements Subscriber<T> {
+    private final CountDownLatch latch = new CountDownLatch(1);
+    private final List<T> bufferedItems = new ArrayList<>();
+    private Throwable bufferedError = null;
+    private boolean isCompleted = false;
+
+    @Override
+    public void onSubscribe(Subscription subscription) {
+        subscription.request(Long.MAX_VALUE);
+    }
+
+    @Override
+    public void onNext(T t) {
+        bufferedItems.add(t);
+    }
+
+    @Override
+    public void onError(Throwable throwable) {
+        this.bufferedError = throwable;
+        this.latch.countDown();
+    }
+
+    @Override
+    public void onComplete() {
+        this.isCompleted = true;
+        this.latch.countDown();
+    }
+
+    public void waitForCompletion(long timeoutInMillis) {
+        try {
+            this.latch.await(timeoutInMillis, TimeUnit.MILLISECONDS);
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public List<T> bufferedItems() {
+        return bufferedItems;
+    }
+
+    public Throwable bufferedError() {
+        return bufferedError;
+    }
+
+    public boolean isCompleted() {
+        return isCompleted;
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/FlattenTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/FlattenTest.java
new file mode 100644
index 000000000000..69e410ac08df
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/FlattenTest.java
@@ -0,0 +1,206 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.functionaltests;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+import static software.amazon.awssdk.enhanced.dynamodb.mapper.StaticAttributeTags.primaryPartitionKey;
+
+import java.util.Objects;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClient;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbTable;
+import software.amazon.awssdk.enhanced.dynamodb.TableSchema;
+
+import software.amazon.awssdk.enhanced.dynamodb.mapper.StaticTableSchema;
+import software.amazon.awssdk.services.dynamodb.model.DeleteTableRequest;
+
+public class FlattenTest extends LocalDynamoDbSyncTestBase {
+    private static class Record {
+        private String id;
+        private Document document;
+
+        private String getId() {
+            return id;
+        }
+
+        private Record setId(String id) {
+            this.id = id;
+            return this;
+        }
+
+        private Document getDocument() {
+            return document;
+        }
+
+        private Record setDocument(Document document) {
+            this.document = document;
+            return this;
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) return true;
+            if (o == null || getClass() != o.getClass()) return false;
+            Record record = (Record) o;
+            return Objects.equals(id, record.id) &&
+                   Objects.equals(document, record.document);
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(id, document);
+        }
+    }
+    
+    private static class Document {
+        private String documentAttribute1;
+        private String documentAttribute2;
+        private String documentAttribute3;
+
+        private String getDocumentAttribute1() {
+            return documentAttribute1;
+        }
+
+        private Document setDocumentAttribute1(String documentAttribute1) {
+            this.documentAttribute1 = documentAttribute1;
+            return this;
+        }
+
+        private String getDocumentAttribute2() {
+            return documentAttribute2;
+        }
+
+        private Document setDocumentAttribute2(String documentAttribute2) {
+            this.documentAttribute2 = documentAttribute2;
+            return this;
+        }
+
+        private String getDocumentAttribute3() {
+            return documentAttribute3;
+        }
+
+        private Document setDocumentAttribute3(String documentAttribute3) {
+            this.documentAttribute3 = documentAttribute3;
+            return this;
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) return true;
+            if (o == null || getClass() != o.getClass()) return false;
+            Document document = (Document) o;
+            return Objects.equals(documentAttribute1, document.documentAttribute1) &&
+                   Objects.equals(documentAttribute2, document.documentAttribute2) &&
+                   Objects.equals(documentAttribute3, document.documentAttribute3);
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(documentAttribute1, documentAttribute2, documentAttribute3);
+        }
+    }
+
+    private static final StaticTableSchema<Document> DOCUMENT_SCHEMA =
+        StaticTableSchema.builder(Document.class)
+                         .newItemSupplier(Document::new)
+                         .addAttribute(String.class, a -> a.name("documentAttribute1")
+                                                           .getter(Document::getDocumentAttribute1)
+                                                           .setter(Document::setDocumentAttribute1))
+                         .addAttribute(String.class, a -> a.name("documentAttribute2")
+                                                           .getter(Document::getDocumentAttribute2)
+                                                           .setter(Document::setDocumentAttribute2))
+                         .addAttribute(String.class, a -> a.name("documentAttribute3")
+                                                           .getter(Document::getDocumentAttribute3)
+                                                           .setter(Document::setDocumentAttribute3))
+                         .build();
+
+    private static final TableSchema<Record> TABLE_SCHEMA =
+        StaticTableSchema.builder(Record.class)
+                         .newItemSupplier(Record::new)
+                         .addAttribute(String.class, a -> a.name("id")
+                                                           .getter(Record::getId)
+                                                           .setter(Record::setId)
+                                                           .tags(primaryPartitionKey()))
+                         .flatten(DOCUMENT_SCHEMA, Record::getDocument, Record::setDocument)
+                         .build();
+
+
+    private DynamoDbEnhancedClient enhancedClient = DynamoDbEnhancedClient.builder()
+                                                                          .dynamoDbClient(getDynamoDbClient())
+                                                                          .build();
+
+    private DynamoDbTable<Record> mappedTable = enhancedClient.table(getConcreteTableName("table-name"), TABLE_SCHEMA);
+
+    @Before
+    public void createTable() {
+        mappedTable.createTable(r -> r.provisionedThroughput(getDefaultProvisionedThroughput()));
+    }
+
+    @After
+    public void deleteTable() {
+        getDynamoDbClient().deleteTable(DeleteTableRequest.builder()
+                                                          .tableName(getConcreteTableName("table-name"))
+                                                          .build());
+    }
+
+    @Test
+    public void update_allValues() {
+        Document document = new Document()
+                                    .setDocumentAttribute1("one")
+                                    .setDocumentAttribute2("two")
+                                    .setDocumentAttribute3("three");
+        Record record = new Record()
+                              .setId("id-value")
+                              .setDocument(document);
+
+        Record updatedRecord = mappedTable.updateItem(r -> r.item(record));
+        Record fetchedRecord = mappedTable.getItem(r -> r.key(k -> k.partitionValue("id-value")));
+
+        assertThat(updatedRecord, is(record));
+        assertThat(fetchedRecord, is(record));
+    }
+
+    @Test
+    public void update_someValues() {
+        Document document = new Document()
+                                    .setDocumentAttribute1("one")
+                                    .setDocumentAttribute2("two");
+        Record record = new Record()
+                              .setId("id-value")
+                              .setDocument(document);
+
+        Record updatedRecord = mappedTable.updateItem(r -> r.item(record));
+        Record fetchedRecord = mappedTable.getItem(r -> r.key(k -> k.partitionValue("id-value")));
+
+        assertThat(updatedRecord, is(record));
+        assertThat(fetchedRecord, is(record));
+    }
+
+    @Test
+    public void update_nullDocument() {
+        Record record = new Record()
+                              .setId("id-value");
+
+        Record updatedRecord = mappedTable.updateItem(r -> r.item(record));
+        Record fetchedRecord = mappedTable.getItem(r -> r.key(k -> k.partitionValue("id-value")));
+
+        assertThat(updatedRecord, is(record));
+        assertThat(fetchedRecord, is(record));
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/IndexQueryTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/IndexQueryTest.java
new file mode 100644
index 000000000000..e82e340e90ac
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/IndexQueryTest.java
@@ -0,0 +1,301 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.functionaltests;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.empty;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.nullValue;
+import static software.amazon.awssdk.enhanced.dynamodb.internal.AttributeValues.numberValue;
+import static software.amazon.awssdk.enhanced.dynamodb.internal.AttributeValues.stringValue;
+import static software.amazon.awssdk.enhanced.dynamodb.mapper.StaticAttributeTags.primaryPartitionKey;
+import static software.amazon.awssdk.enhanced.dynamodb.mapper.StaticAttributeTags.primarySortKey;
+import static software.amazon.awssdk.enhanced.dynamodb.mapper.StaticAttributeTags.secondaryPartitionKey;
+import static software.amazon.awssdk.enhanced.dynamodb.mapper.StaticAttributeTags.secondarySortKey;
+import static software.amazon.awssdk.enhanced.dynamodb.model.QueryConditional.keyEqualTo;
+
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClient;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbIndex;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbTable;
+import software.amazon.awssdk.enhanced.dynamodb.Key;
+import software.amazon.awssdk.enhanced.dynamodb.TableSchema;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.StaticTableSchema;
+import software.amazon.awssdk.enhanced.dynamodb.model.CreateTableEnhancedRequest;
+import software.amazon.awssdk.enhanced.dynamodb.model.EnhancedGlobalSecondaryIndex;
+import software.amazon.awssdk.enhanced.dynamodb.model.Page;
+import software.amazon.awssdk.enhanced.dynamodb.model.QueryConditional;
+import software.amazon.awssdk.enhanced.dynamodb.model.QueryEnhancedRequest;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+import software.amazon.awssdk.services.dynamodb.model.DeleteTableRequest;
+import software.amazon.awssdk.services.dynamodb.model.ProjectionType;
+
+public class IndexQueryTest extends LocalDynamoDbSyncTestBase {
+    private static class Record {
+        private String id;
+        private Integer sort;
+        private Integer value;
+        private String gsiId;
+        private Integer gsiSort;
+
+        private String getId() {
+            return id;
+        }
+
+        private Record setId(String id) {
+            this.id = id;
+            return this;
+        }
+
+        private Integer getSort() {
+            return sort;
+        }
+
+        private Record setSort(Integer sort) {
+            this.sort = sort;
+            return this;
+        }
+
+        private Integer getValue() {
+            return value;
+        }
+
+        private Record setValue(Integer value) {
+            this.value = value;
+            return this;
+        }
+
+        private String getGsiId() {
+            return gsiId;
+        }
+
+        private Record setGsiId(String gsiId) {
+            this.gsiId = gsiId;
+            return this;
+        }
+
+        private Integer getGsiSort() {
+            return gsiSort;
+        }
+
+        private Record setGsiSort(Integer gsiSort) {
+            this.gsiSort = gsiSort;
+            return this;
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) return true;
+            if (o == null || getClass() != o.getClass()) return false;
+            Record record = (Record) o;
+            return Objects.equals(id, record.id) &&
+                   Objects.equals(sort, record.sort) &&
+                   Objects.equals(value, record.value) &&
+                   Objects.equals(gsiId, record.gsiId) &&
+                   Objects.equals(gsiSort, record.gsiSort);
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(id, sort, value, gsiId, gsiSort);
+        }
+    }
+
+    private static final TableSchema<Record> TABLE_SCHEMA =
+        StaticTableSchema.builder(Record.class)
+                         .newItemSupplier(Record::new)
+                         .addAttribute(String.class, a -> a.name("id")
+                                                           .getter(Record::getId)
+                                                           .setter(Record::setId)
+                                                           .tags(primaryPartitionKey()))
+                         .addAttribute(Integer.class, a -> a.name("sort")
+                                                            .getter(Record::getSort)
+                                                            .setter(Record::setSort)
+                                                            .tags(primarySortKey()))
+                         .addAttribute(Integer.class, a -> a.name("value")
+                                                            .getter(Record::getValue)
+                                                            .setter(Record::setValue))
+                         .addAttribute(String.class, a -> a.name("gsi_id")
+                                                           .getter(Record::getGsiId)
+                                                           .setter(Record::setGsiId)
+                                                           .tags(secondaryPartitionKey("gsi_keys_only")))
+                         .addAttribute(Integer.class, a -> a.name("gsi_sort")
+                                                            .getter(Record::getGsiSort)
+                                                            .setter(Record::setGsiSort)
+                                                            .tags(secondarySortKey("gsi_keys_only")))
+                         .build();
+
+    private static final List<Record> RECORDS =
+        IntStream.range(0, 10)
+                 .mapToObj(i -> new Record()
+                                      .setId("id-value")
+                                      .setSort(i)
+                                      .setValue(i)
+                                      .setGsiId("gsi-id-value")
+                                      .setGsiSort(i))
+                 .collect(Collectors.toList());
+
+    private static final List<Record> KEYS_ONLY_RECORDS =
+        RECORDS.stream()
+               .map(record -> new Record()
+                                    .setId(record.id)
+                                    .setSort(record.sort)
+                                    .setGsiId(record.gsiId)
+                                    .setGsiSort(record.gsiSort))
+               .collect(Collectors.toList());
+
+    private DynamoDbEnhancedClient enhancedClient = DynamoDbEnhancedClient.builder()
+                                                                          .dynamoDbClient(getDynamoDbClient())
+                                                                          .build();
+
+    private DynamoDbTable<Record> mappedTable = enhancedClient.table(getConcreteTableName("table-name"), TABLE_SCHEMA);
+    private DynamoDbIndex<Record> keysOnlyMappedIndex = mappedTable.index("gsi_keys_only");
+
+    private void insertRecords() {
+        RECORDS.forEach(record -> mappedTable.putItem(r -> r.item(record)));
+    }
+
+    @Before
+    public void createTable() {
+        mappedTable.createTable(
+                CreateTableEnhancedRequest.builder()
+                        .provisionedThroughput(getDefaultProvisionedThroughput())
+                        .globalSecondaryIndices(
+                                EnhancedGlobalSecondaryIndex.builder()
+                                        .indexName("gsi_keys_only")
+                                        .projection(p -> p.projectionType(ProjectionType.KEYS_ONLY))
+                                        .provisionedThroughput(getDefaultProvisionedThroughput())
+                                        .build())
+                        .build());
+    }
+
+    @After
+    public void deleteTable() {
+        getDynamoDbClient().deleteTable(DeleteTableRequest.builder()
+                                                          .tableName(getConcreteTableName("table-name"))
+                                                          .build());
+    }
+
+    @Test
+    public void queryAllRecordsDefaultSettings_usingShortcutForm() {
+        insertRecords();
+
+        Iterator<Page<Record>> results =
+            keysOnlyMappedIndex.query(keyEqualTo(k -> k.partitionValue("gsi-id-value"))).iterator();
+
+        assertThat(results.hasNext(), is(true));
+        Page<Record> page = results.next();
+        assertThat(results.hasNext(), is(false));
+
+        assertThat(page.items(), is(KEYS_ONLY_RECORDS));
+        assertThat(page.lastEvaluatedKey(), is(nullValue()));
+    }
+
+    @Test
+    public void queryBetween() {
+        insertRecords();
+        Key fromKey = Key.builder().partitionValue("gsi-id-value").sortValue(3).build();
+        Key toKey = Key.builder().partitionValue("gsi-id-value").sortValue(5).build();
+        Iterator<Page<Record>> results =
+            keysOnlyMappedIndex.query(r -> r.queryConditional(QueryConditional.sortBetween(fromKey, toKey))).iterator();
+
+        assertThat(results.hasNext(), is(true));
+        Page<Record> page = results.next();
+        assertThat(results.hasNext(), is(false));
+
+        assertThat(page.items(),
+                   is(KEYS_ONLY_RECORDS.stream().filter(r -> r.sort >= 3 && r.sort <= 5).collect(Collectors.toList())));
+        assertThat(page.lastEvaluatedKey(), is(nullValue()));
+    }
+
+    @Test
+    public void queryLimit() {
+        insertRecords();
+        Iterator<Page<Record>> results =
+            keysOnlyMappedIndex.query(QueryEnhancedRequest.builder()
+                                                          .queryConditional(keyEqualTo(k -> k.partitionValue("gsi-id-value")))
+                                                          .limit(5)
+                                                          .build())
+                               .iterator();
+
+        assertThat(results.hasNext(), is(true));
+        Page<Record> page1 = results.next();
+        assertThat(results.hasNext(), is(true));
+        Page<Record> page2 = results.next();
+        assertThat(results.hasNext(), is(true));
+        Page<Record> page3 = results.next();
+        assertThat(results.hasNext(), is(false));
+
+        Map<String, AttributeValue> expectedLastEvaluatedKey1 = new HashMap<>();
+        expectedLastEvaluatedKey1.put("id", stringValue(KEYS_ONLY_RECORDS.get(4).getId()));
+        expectedLastEvaluatedKey1.put("sort", numberValue(KEYS_ONLY_RECORDS.get(4).getSort()));
+        expectedLastEvaluatedKey1.put("gsi_id", stringValue(KEYS_ONLY_RECORDS.get(4).getGsiId()));
+        expectedLastEvaluatedKey1.put("gsi_sort", numberValue(KEYS_ONLY_RECORDS.get(4).getGsiSort()));
+        Map<String, AttributeValue> expectedLastEvaluatedKey2 = new HashMap<>();
+        expectedLastEvaluatedKey2.put("id", stringValue(KEYS_ONLY_RECORDS.get(9).getId()));
+        expectedLastEvaluatedKey2.put("sort", numberValue(KEYS_ONLY_RECORDS.get(9).getSort()));
+        expectedLastEvaluatedKey2.put("gsi_id", stringValue(KEYS_ONLY_RECORDS.get(9).getGsiId()));
+        expectedLastEvaluatedKey2.put("gsi_sort", numberValue(KEYS_ONLY_RECORDS.get(9).getGsiSort()));
+
+        assertThat(page1.items(), is(KEYS_ONLY_RECORDS.subList(0, 5)));
+        assertThat(page1.lastEvaluatedKey(), is(expectedLastEvaluatedKey1));
+        assertThat(page2.items(), is(KEYS_ONLY_RECORDS.subList(5, 10)));
+        assertThat(page2.lastEvaluatedKey(), is(expectedLastEvaluatedKey2));
+        assertThat(page3.items(), is(empty()));
+        assertThat(page3.lastEvaluatedKey(), is(nullValue()));
+    }
+
+    @Test
+    public void queryEmpty() {
+        Iterator<Page<Record>> results =
+            keysOnlyMappedIndex.query(r -> r.queryConditional(keyEqualTo(k -> k.partitionValue("gsi-id-value")))).iterator();
+        assertThat(results.hasNext(), is(true));
+        Page<Record> page = results.next();
+        assertThat(results.hasNext(), is(false));
+        assertThat(page.items(), is(empty()));
+        assertThat(page.lastEvaluatedKey(), is(nullValue()));
+    }
+
+    @Test
+    public void queryExclusiveStartKey() {
+        insertRecords();
+        Map<String, AttributeValue> expectedLastEvaluatedKey = new HashMap<>();
+        expectedLastEvaluatedKey.put("id", stringValue(KEYS_ONLY_RECORDS.get(7).getId()));
+        expectedLastEvaluatedKey.put("sort", numberValue(KEYS_ONLY_RECORDS.get(7).getSort()));
+        expectedLastEvaluatedKey.put("gsi_id", stringValue(KEYS_ONLY_RECORDS.get(7).getGsiId()));
+        expectedLastEvaluatedKey.put("gsi_sort", numberValue(KEYS_ONLY_RECORDS.get(7).getGsiSort()));
+        Iterator<Page<Record>> results =
+            keysOnlyMappedIndex.query(QueryEnhancedRequest.builder()
+                                                          .queryConditional(keyEqualTo(k -> k.partitionValue("gsi-id-value")))
+                                                          .exclusiveStartKey(expectedLastEvaluatedKey).build())
+                               .iterator();
+
+        assertThat(results.hasNext(), is(true));
+        Page<Record> page = results.next();
+        assertThat(results.hasNext(), is(false));
+        assertThat(page.items(), is(KEYS_ONLY_RECORDS.subList(8, 10)));
+        assertThat(page.lastEvaluatedKey(), is(nullValue()));
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/IndexScanTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/IndexScanTest.java
new file mode 100644
index 000000000000..9cc674ed489a
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/IndexScanTest.java
@@ -0,0 +1,285 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.functionaltests;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.empty;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.nullValue;
+import static software.amazon.awssdk.enhanced.dynamodb.internal.AttributeValues.numberValue;
+import static software.amazon.awssdk.enhanced.dynamodb.internal.AttributeValues.stringValue;
+import static software.amazon.awssdk.enhanced.dynamodb.mapper.StaticAttributeTags.primaryPartitionKey;
+import static software.amazon.awssdk.enhanced.dynamodb.mapper.StaticAttributeTags.primarySortKey;
+import static software.amazon.awssdk.enhanced.dynamodb.mapper.StaticAttributeTags.secondaryPartitionKey;
+import static software.amazon.awssdk.enhanced.dynamodb.mapper.StaticAttributeTags.secondarySortKey;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClient;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbIndex;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbTable;
+import software.amazon.awssdk.enhanced.dynamodb.Expression;
+import software.amazon.awssdk.enhanced.dynamodb.TableSchema;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.StaticTableSchema;
+import software.amazon.awssdk.enhanced.dynamodb.model.EnhancedGlobalSecondaryIndex;
+import software.amazon.awssdk.enhanced.dynamodb.model.Page;
+import software.amazon.awssdk.enhanced.dynamodb.model.ScanEnhancedRequest;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+import software.amazon.awssdk.services.dynamodb.model.DeleteTableRequest;
+import software.amazon.awssdk.services.dynamodb.model.ProjectionType;
+
+public class IndexScanTest extends LocalDynamoDbSyncTestBase {
+    private static class Record {
+        private String id;
+        private Integer sort;
+        private Integer value;
+        private String gsiId;
+        private Integer gsiSort;
+
+        private String getId() {
+            return id;
+        }
+
+        private Record setId(String id) {
+            this.id = id;
+            return this;
+        }
+
+        private Integer getSort() {
+            return sort;
+        }
+
+        private Record setSort(Integer sort) {
+            this.sort = sort;
+            return this;
+        }
+
+        private Integer getValue() {
+            return value;
+        }
+
+        private Record setValue(Integer value) {
+            this.value = value;
+            return this;
+        }
+
+        private String getGsiId() {
+            return gsiId;
+        }
+
+        private Record setGsiId(String gsiId) {
+            this.gsiId = gsiId;
+            return this;
+        }
+
+        private Integer getGsiSort() {
+            return gsiSort;
+        }
+
+        private Record setGsiSort(Integer gsiSort) {
+            this.gsiSort = gsiSort;
+            return this;
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) return true;
+            if (o == null || getClass() != o.getClass()) return false;
+            Record record = (Record) o;
+            return Objects.equals(id, record.id) &&
+                   Objects.equals(sort, record.sort) &&
+                   Objects.equals(value, record.value) &&
+                   Objects.equals(gsiId, record.gsiId) &&
+                   Objects.equals(gsiSort, record.gsiSort);
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(id, sort, value, gsiId, gsiSort);
+        }
+    }
+
+    private static final TableSchema<Record> TABLE_SCHEMA =
+        StaticTableSchema.builder(Record.class)
+                         .newItemSupplier(Record::new)
+                         .addAttribute(String.class, a -> a.name("id")
+                                                           .getter(Record::getId)
+                                                           .setter(Record::setId)
+                                                           .tags(primaryPartitionKey()))
+                         .addAttribute(Integer.class, a -> a.name("sort")
+                                                            .getter(Record::getSort)
+                                                            .setter(Record::setSort)
+                                                            .tags(primarySortKey()))
+                         .addAttribute(Integer.class, a -> a.name("value")
+                                                            .getter(Record::getValue)
+                                                            .setter(Record::setValue))
+                         .addAttribute(String.class, a -> a.name("gsi_id")
+                                                           .getter(Record::getGsiId)
+                                                           .setter(Record::setGsiId)
+                                                           .tags(secondaryPartitionKey("gsi_keys_only")))
+                         .addAttribute(Integer.class, a -> a.name("gsi_sort")
+                                                            .getter(Record::getGsiSort)
+                                                            .setter(Record::setGsiSort)
+                                                            .tags(secondarySortKey("gsi_keys_only")))
+                         .build();
+
+    private static final List<Record> RECORDS =
+        IntStream.range(0, 10)
+                 .mapToObj(i -> new Record()
+                     .setId("id-value")
+                     .setSort(i)
+                     .setValue(i)
+                     .setGsiId("gsi-id-value")
+                     .setGsiSort(i))
+                 .collect(Collectors.toList());
+
+    private static final List<Record> KEYS_ONLY_RECORDS =
+        RECORDS.stream()
+               .map(record -> new Record()
+                   .setId(record.id)
+                   .setSort(record.sort)
+                   .setGsiId(record.gsiId)
+                   .setGsiSort(record.gsiSort))
+               .collect(Collectors.toList());
+
+    private DynamoDbEnhancedClient enhancedClient = DynamoDbEnhancedClient.builder()
+                                                                          .dynamoDbClient(getDynamoDbClient())
+                                                                          .build();
+
+    private DynamoDbTable<Record> mappedTable = enhancedClient.table(getConcreteTableName("table-name"), TABLE_SCHEMA);
+    private DynamoDbIndex<Record> keysOnlyMappedIndex = mappedTable.index("gsi_keys_only");
+
+    private void insertRecords() {
+        RECORDS.forEach(record -> mappedTable.putItem(r -> r.item(record)));
+    }
+
+    @Before
+    public void createTable() {
+        mappedTable.createTable(
+                r -> r.provisionedThroughput(getDefaultProvisionedThroughput())
+                        .globalSecondaryIndices(
+                                EnhancedGlobalSecondaryIndex.builder()
+                                        .indexName("gsi_keys_only")
+                                        .projection(p -> p.projectionType(ProjectionType.KEYS_ONLY))
+                                        .provisionedThroughput(getDefaultProvisionedThroughput())
+                                        .build()));
+    }
+
+    @After
+    public void deleteTable() {
+        getDynamoDbClient().deleteTable(DeleteTableRequest.builder()
+                                                          .tableName(getConcreteTableName("table-name"))
+                                                          .build());
+    }
+
+    @Test
+    public void scanAllRecordsDefaultSettings() {
+        insertRecords();
+
+        Iterator<Page<Record>> results = keysOnlyMappedIndex.scan(ScanEnhancedRequest.builder().build()).iterator();
+
+        assertThat(results.hasNext(), is(true));
+        Page<Record> page = results.next();
+        assertThat(results.hasNext(), is(false));
+
+        assertThat(page.items(), is(KEYS_ONLY_RECORDS));
+        assertThat(page.lastEvaluatedKey(), is(nullValue()));
+    }
+
+    @Test
+    public void scanAllRecordsWithFilter() {
+        insertRecords();
+        Map<String, AttributeValue> expressionValues = new HashMap<>();
+        expressionValues.put(":min_value", numberValue(3));
+        expressionValues.put(":max_value", numberValue(5));
+        Expression expression = Expression.builder()
+                                          .expression("sort >= :min_value AND sort <= :max_value")
+                                          .expressionValues(expressionValues)
+                                          .build();
+
+        Iterator<Page<Record>> results =
+            keysOnlyMappedIndex.scan(ScanEnhancedRequest.builder().filterExpression(expression).build()).iterator();
+
+        assertThat(results.hasNext(), is(true));
+        Page<Record> page = results.next();
+        assertThat(results.hasNext(), is(false));
+
+        assertThat(page.items(),
+                   is(KEYS_ONLY_RECORDS.stream().filter(r -> r.sort >= 3 && r.sort <= 5).collect(Collectors.toList())));
+        assertThat(page.lastEvaluatedKey(), is(nullValue()));
+    }
+
+    @Test
+    public void scanLimit() {
+        insertRecords();
+        Iterator<Page<Record>> results = keysOnlyMappedIndex.scan(r -> r.limit(5)).iterator();
+        assertThat(results.hasNext(), is(true));
+        Page<Record> page1 = results.next();
+        assertThat(results.hasNext(), is(true));
+        Page<Record> page2 = results.next();
+        assertThat(results.hasNext(), is(true));
+        Page<Record> page3 = results.next();
+        assertThat(results.hasNext(), is(false));
+
+        assertThat(page1.items(), is(KEYS_ONLY_RECORDS.subList(0, 5)));
+        assertThat(page1.lastEvaluatedKey(), is(getKeyMap(4)));
+        assertThat(page2.items(), is(KEYS_ONLY_RECORDS.subList(5, 10)));
+        assertThat(page2.lastEvaluatedKey(), is(getKeyMap(9)));
+        assertThat(page3.items(), is(empty()));
+        assertThat(page3.lastEvaluatedKey(), is(nullValue()));
+    }
+
+    @Test
+    public void scanEmpty() {
+        Iterator<Page<Record>> results = keysOnlyMappedIndex.scan().iterator();
+        assertThat(results.hasNext(), is(true));
+        Page<Record> page = results.next();
+        assertThat(results.hasNext(), is(false));
+        assertThat(page.items(), is(empty()));
+        assertThat(page.lastEvaluatedKey(), is(nullValue()));
+    }
+
+    @Test
+    public void scanExclusiveStartKey() {
+        insertRecords();
+        Iterator<Page<Record>> results =
+            keysOnlyMappedIndex.scan(r -> r.exclusiveStartKey(getKeyMap(7))).iterator();
+
+        assertThat(results.hasNext(), is(true));
+        Page<Record> page = results.next();
+        assertThat(results.hasNext(), is(false));
+        assertThat(page.items(), is(KEYS_ONLY_RECORDS.subList(8, 10)));
+        assertThat(page.lastEvaluatedKey(), is(nullValue()));
+    }
+
+    private Map<String, AttributeValue> getKeyMap(int sort) {
+        Map<String, AttributeValue> result = new HashMap<>();
+        result.put("id", stringValue(KEYS_ONLY_RECORDS.get(sort).getId()));
+        result.put("sort", numberValue(KEYS_ONLY_RECORDS.get(sort).getSort()));
+        result.put("gsi_id", stringValue(KEYS_ONLY_RECORDS.get(sort).getGsiId()));
+        result.put("gsi_sort", numberValue(KEYS_ONLY_RECORDS.get(sort).getGsiSort()));
+        return Collections.unmodifiableMap(result);
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/LocalDynamoDb.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/LocalDynamoDb.java
new file mode 100644
index 000000000000..7a6bdb5fce6a
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/LocalDynamoDb.java
@@ -0,0 +1,142 @@
+/*
+ * 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.
+ */
+package software.amazon.awssdk.enhanced.dynamodb.functionaltests;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.IOException;
+import java.net.ServerSocket;
+import java.net.URI;
+import java.util.Optional;
+import com.amazonaws.services.dynamodbv2.local.main.ServerRunner;
+import com.amazonaws.services.dynamodbv2.local.server.DynamoDBProxyServer;
+import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
+import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
+import software.amazon.awssdk.core.interceptor.Context;
+import software.amazon.awssdk.core.interceptor.ExecutionAttributes;
+import software.amazon.awssdk.core.interceptor.ExecutionInterceptor;
+import software.amazon.awssdk.regions.Region;
+import software.amazon.awssdk.services.dynamodb.DynamoDbAsyncClient;
+import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
+
+/**
+ * Wrapper for a local DynamoDb server used in testing. Each instance of this class will find a new port to run on,
+ * so multiple instances can be safely run simultaneously. Each instance of this service uses memory as a storage medium
+ * and is thus completely ephemeral; no data will be persisted between stops and starts.
+ *
+ * LocalDynamoDb localDynamoDb = new LocalDynamoDb();
+ * localDynamoDb.start();       // Start the service running locally on host
+ * DynamoDbClient dynamoDbClient = localDynamoDb.createClient();
+ * ...      // Do your testing with the client
+ * localDynamoDb.stop();        // Stop the service and free up resources
+ *
+ * If possible it's recommended to keep a single running instance for all your tests, as it can be slow to teardown
+ * and create new servers for every test, but there have been observed problems when dropping tables between tests for
+ * this scenario, so it's best to write your tests to be resilient to tables that already have data in them.
+ */
+class LocalDynamoDb {
+    private DynamoDBProxyServer server;
+    private int port;
+
+    /**
+     * Start the local DynamoDb service and run in background
+     */
+    void start() {
+        port = getFreePort();
+        String portString = Integer.toString(port);
+
+        try {
+            server = createServer(portString);
+            server.start();
+        } catch (Exception e) {
+            throw propagate(e);
+        }
+    }
+
+    /**
+     * Create a standard AWS v2 SDK client pointing to the local DynamoDb instance
+     * @return A DynamoDbClient pointing to the local DynamoDb instance
+     */
+    DynamoDbClient createClient() {
+        String endpoint = String.format("http://localhost:%d", port);
+        return DynamoDbClient.builder()
+                             .endpointOverride(URI.create(endpoint))
+                             // The region is meaningless for local DynamoDb but required for client builder validation
+                             .region(Region.US_EAST_1)
+                             .credentialsProvider(StaticCredentialsProvider.create(
+                                 AwsBasicCredentials.create("dummy-key", "dummy-secret")))
+                             .overrideConfiguration(o -> o.addExecutionInterceptor(new VerifyUserAgentInterceptor()))
+                             .build();
+    }
+
+    DynamoDbAsyncClient createAsyncClient() {
+        String endpoint = String.format("http://localhost:%d", port);
+        return DynamoDbAsyncClient.builder()
+                                  .endpointOverride(URI.create(endpoint))
+                                  .region(Region.US_EAST_1)
+                                  .credentialsProvider(StaticCredentialsProvider.create(
+                                      AwsBasicCredentials.create("dummy-key", "dummy-secret")))
+                                  .overrideConfiguration(o -> o.addExecutionInterceptor(new VerifyUserAgentInterceptor()))
+                                  .build();
+    }
+
+    /**
+     * Stops the local DynamoDb service and frees up resources it is using.
+     */
+    void stop() {
+        try {
+            server.stop();
+        } catch (Exception e) {
+            throw propagate(e);
+        }
+    }
+
+    private DynamoDBProxyServer createServer(String portString) throws Exception {
+        return ServerRunner.createServerFromCommandLineArgs(
+            new String[]{
+                "-inMemory",
+                "-port", portString
+            });
+    }
+
+    private int getFreePort() {
+        try {
+            ServerSocket socket = new ServerSocket(0);
+            int port = socket.getLocalPort();
+            socket.close();
+            return port;
+        } catch (IOException ioe) {
+            throw propagate(ioe);
+        }
+    }
+
+    private static RuntimeException propagate(Exception e) {
+        if (e instanceof RuntimeException) {
+            throw (RuntimeException)e;
+        }
+        throw new RuntimeException(e);
+    }
+
+    private static class VerifyUserAgentInterceptor implements ExecutionInterceptor {
+
+        @Override
+        public void beforeTransmission(Context.BeforeTransmission context, ExecutionAttributes executionAttributes) {
+            Optional<String> headers = context.httpRequest().firstMatchingHeader("User-agent");
+            assertThat(headers).isPresent();
+            assertThat(headers.get()).contains("hll/ddb-enh");
+        }
+    }
+
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/LocalDynamoDbAsyncTestBase.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/LocalDynamoDbAsyncTestBase.java
new file mode 100644
index 000000000000..1c3135352520
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/LocalDynamoDbAsyncTestBase.java
@@ -0,0 +1,44 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.functionaltests;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.nullValue;
+
+import java.util.List;
+import software.amazon.awssdk.core.async.SdkPublisher;
+import software.amazon.awssdk.services.dynamodb.DynamoDbAsyncClient;
+
+public class LocalDynamoDbAsyncTestBase extends LocalDynamoDbTestBase {
+    private DynamoDbAsyncClient dynamoDbAsyncClient = localDynamoDb().createAsyncClient();
+
+    protected DynamoDbAsyncClient getDynamoDbAsyncClient() {
+        return dynamoDbAsyncClient;
+    }
+
+    public static <T> List<T> drainPublisher(SdkPublisher<T> publisher, int expectedNumberOfResults) {
+        BufferingSubscriber<T> subscriber = new BufferingSubscriber<>();
+        publisher.subscribe(subscriber);
+        subscriber.waitForCompletion(1000L);
+
+        assertThat(subscriber.isCompleted(), is(true));
+        assertThat(subscriber.bufferedError(), is(nullValue()));
+        assertThat(subscriber.bufferedItems().size(), is(expectedNumberOfResults));
+
+        return subscriber.bufferedItems();
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/LocalDynamoDbSyncTestBase.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/LocalDynamoDbSyncTestBase.java
new file mode 100644
index 000000000000..294ea13f5788
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/LocalDynamoDbSyncTestBase.java
@@ -0,0 +1,26 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.functionaltests;
+
+import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
+
+public class LocalDynamoDbSyncTestBase extends LocalDynamoDbTestBase {
+    private DynamoDbClient dynamoDbClient = localDynamoDb().createClient();
+
+    protected DynamoDbClient getDynamoDbClient() {
+        return dynamoDbClient;
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/functionaltests/LocalDynamoDbTestBase.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/LocalDynamoDbTestBase.java
similarity index 80%
rename from services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/functionaltests/LocalDynamoDbTestBase.java
rename to services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/LocalDynamoDbTestBase.java
index 7bd38235ef8f..edce69d31825 100644
--- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/functionaltests/LocalDynamoDbTestBase.java
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/LocalDynamoDbTestBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -13,14 +13,11 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.awssdk.extensions.dynamodb.mappingclient.functionaltests;
+package software.amazon.awssdk.enhanced.dynamodb.functionaltests;
 
 import java.util.UUID;
-
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
-
-import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
 import software.amazon.awssdk.services.dynamodb.model.ProvisionedThroughput;
 
 public class LocalDynamoDbTestBase {
@@ -32,7 +29,6 @@ public class LocalDynamoDbTestBase {
                              .build();
 
     private String uniqueTableSuffix = UUID.randomUUID().toString();
-    private DynamoDbClient dynamoDbClient = localDynamoDb.createClient();
 
     @BeforeClass
     public static void initializeLocalDynamoDb() {
@@ -43,16 +39,16 @@ public static void initializeLocalDynamoDb() {
     public static void stopLocalDynamoDb() {
         localDynamoDb.stop();
     }
+
+    protected static LocalDynamoDb localDynamoDb() {
+        return localDynamoDb;
+    }
     
     protected String getConcreteTableName(String logicalTableName) {
         return logicalTableName + "_" + uniqueTableSuffix;
 
     }
 
-    protected DynamoDbClient getDynamoDbClient() {
-        return dynamoDbClient;
-    }
-
     protected ProvisionedThroughput getDefaultProvisionedThroughput() {
         return DEFAULT_PROVISIONED_THROUGHPUT;
     }
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/TransactGetItemsTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/TransactGetItemsTest.java
new file mode 100644
index 000000000000..d5a12246dde2
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/TransactGetItemsTest.java
@@ -0,0 +1,190 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.functionaltests;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.nullValue;
+import static software.amazon.awssdk.enhanced.dynamodb.mapper.StaticAttributeTags.primaryPartitionKey;
+
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import software.amazon.awssdk.enhanced.dynamodb.Document;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClient;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbTable;
+import software.amazon.awssdk.enhanced.dynamodb.Key;
+import software.amazon.awssdk.enhanced.dynamodb.TableSchema;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.StaticTableSchema;
+import software.amazon.awssdk.enhanced.dynamodb.model.TransactGetItemsEnhancedRequest;
+import software.amazon.awssdk.services.dynamodb.model.DeleteTableRequest;
+
+public class TransactGetItemsTest extends LocalDynamoDbSyncTestBase {
+    private static class Record1 {
+        private Integer id;
+
+        private Integer getId() {
+            return id;
+        }
+
+        private Record1 setId(Integer id) {
+            this.id = id;
+            return this;
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) return true;
+            if (o == null || getClass() != o.getClass()) return false;
+            Record1 record1 = (Record1) o;
+            return Objects.equals(id, record1.id);
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(id);
+        }
+    }
+
+    private static class Record2 {
+        private Integer id;
+
+        private Integer getId() {
+            return id;
+        }
+
+        private Record2 setId(Integer id) {
+            this.id = id;
+            return this;
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) return true;
+            if (o == null || getClass() != o.getClass()) return false;
+            Record2 record2 = (Record2) o;
+            return Objects.equals(id, record2.id);
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(id);
+        }
+    }
+
+    private static final TableSchema<Record1> TABLE_SCHEMA_1 =
+        StaticTableSchema.builder(Record1.class)
+                         .newItemSupplier(Record1::new)
+                         .addAttribute(Integer.class, a -> a.name("id_1")
+                                                            .getter(Record1::getId)
+                                                            .setter(Record1::setId)
+                                                            .tags(primaryPartitionKey()))
+                         .build();
+
+    private static final TableSchema<Record2> TABLE_SCHEMA_2 =
+        StaticTableSchema.builder(Record2.class)
+                         .newItemSupplier(Record2::new)
+                         .addAttribute(Integer.class, a -> a.name("id_2")
+                                                            .getter(Record2::getId)
+                                                            .setter(Record2::setId)
+                                                            .tags(primaryPartitionKey()))
+                         .build();
+
+    private DynamoDbEnhancedClient enhancedClient = DynamoDbEnhancedClient.builder()
+                                                                          .dynamoDbClient(getDynamoDbClient())
+                                                                          .build();
+
+    private DynamoDbTable<Record1> mappedTable1 = enhancedClient.table(getConcreteTableName("table-name-1"), TABLE_SCHEMA_1);
+    private DynamoDbTable<Record2> mappedTable2 = enhancedClient.table(getConcreteTableName("table-name-2"), TABLE_SCHEMA_2);
+
+    private static final List<Record1> RECORDS_1 =
+        IntStream.range(0, 2)
+                 .mapToObj(i -> new Record1().setId(i))
+                 .collect(Collectors.toList());
+
+    private static final List<Record2> RECORDS_2 =
+        IntStream.range(0, 2)
+                 .mapToObj(i -> new Record2().setId(i))
+                 .collect(Collectors.toList());
+
+    @Before
+    public void createTable() {
+        mappedTable1.createTable(r -> r.provisionedThroughput(getDefaultProvisionedThroughput()));
+        mappedTable2.createTable(r -> r.provisionedThroughput(getDefaultProvisionedThroughput()));
+    }
+
+    @After
+    public void deleteTable() {
+        getDynamoDbClient().deleteTable(DeleteTableRequest.builder()
+                                                          .tableName(getConcreteTableName("table-name-1"))
+                                                          .build());
+        getDynamoDbClient().deleteTable(DeleteTableRequest.builder()
+                                                          .tableName(getConcreteTableName("table-name-2"))
+                                                          .build());
+    }
+
+    private void insertRecords() {
+        RECORDS_1.forEach(record -> mappedTable1.putItem(r -> r.item(record)));
+        RECORDS_2.forEach(record -> mappedTable2.putItem(r -> r.item(record)));
+    }
+
+    @Test
+    public void getRecordsFromMultipleTables() {
+        insertRecords();
+
+        TransactGetItemsEnhancedRequest transactGetItemsEnhancedRequest =
+            TransactGetItemsEnhancedRequest.builder()
+                                           .addGetItem(mappedTable1, Key.builder().partitionValue(0).build())
+                                           .addGetItem(mappedTable2, Key.builder().partitionValue(0).build())
+                                           .addGetItem(mappedTable2, Key.builder().partitionValue(1).build())
+                                           .addGetItem(mappedTable1, Key.builder().partitionValue(1).build())
+                                           .build();
+
+        List<Document> results = enhancedClient.transactGetItems(transactGetItemsEnhancedRequest);
+
+        assertThat(results.size(), is(4));
+        assertThat(results.get(0).getItem(mappedTable1), is(RECORDS_1.get(0)));
+        assertThat(results.get(1).getItem(mappedTable2), is(RECORDS_2.get(0)));
+        assertThat(results.get(2).getItem(mappedTable2), is(RECORDS_2.get(1)));
+        assertThat(results.get(3).getItem(mappedTable1), is(RECORDS_1.get(1)));
+    }
+
+    @Test
+    public void notFoundRecordReturnsNull() {
+        insertRecords();
+
+        TransactGetItemsEnhancedRequest transactGetItemsEnhancedRequest =
+            TransactGetItemsEnhancedRequest.builder()
+                                           .addGetItem(mappedTable1, Key.builder().partitionValue(0).build())
+                                           .addGetItem(mappedTable2, Key.builder().partitionValue(0).build())
+                                           .addGetItem(mappedTable2, Key.builder().partitionValue(5).build())
+                                           .addGetItem(mappedTable1, Key.builder().partitionValue(1).build())
+                                           .build();
+
+        List<Document> results = enhancedClient.transactGetItems(transactGetItemsEnhancedRequest);
+
+        assertThat(results.size(), is(4));
+        assertThat(results.get(0).getItem(mappedTable1), is(RECORDS_1.get(0)));
+        assertThat(results.get(1).getItem(mappedTable2), is(RECORDS_2.get(0)));
+        assertThat(results.get(2).getItem(mappedTable2), is(nullValue()));
+        assertThat(results.get(3).getItem(mappedTable1), is(RECORDS_1.get(1)));
+    }
+}
+
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/TransactWriteItemsTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/TransactWriteItemsTest.java
new file mode 100644
index 000000000000..b4eeec90efb1
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/TransactWriteItemsTest.java
@@ -0,0 +1,369 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.functionaltests;
+
+import static java.util.Collections.singletonMap;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.nullValue;
+import static org.junit.Assert.fail;
+import static software.amazon.awssdk.enhanced.dynamodb.internal.AttributeValues.stringValue;
+import static software.amazon.awssdk.enhanced.dynamodb.mapper.StaticAttributeTags.primaryPartitionKey;
+
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClient;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbTable;
+import software.amazon.awssdk.enhanced.dynamodb.Expression;
+import software.amazon.awssdk.enhanced.dynamodb.Key;
+import software.amazon.awssdk.enhanced.dynamodb.TableSchema;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.StaticTableSchema;
+import software.amazon.awssdk.enhanced.dynamodb.model.ConditionCheck;
+import software.amazon.awssdk.enhanced.dynamodb.model.TransactWriteItemsEnhancedRequest;
+import software.amazon.awssdk.services.dynamodb.model.DeleteTableRequest;
+import software.amazon.awssdk.services.dynamodb.model.TransactionCanceledException;
+
+public class TransactWriteItemsTest extends LocalDynamoDbSyncTestBase {
+    private static class Record1 {
+        private Integer id;
+        private String attribute;
+
+        private Integer getId() {
+            return id;
+        }
+
+        private Record1 setId(Integer id) {
+            this.id = id;
+            return this;
+        }
+
+        private String getAttribute() {
+            return attribute;
+        }
+
+        private Record1 setAttribute(String attribute) {
+            this.attribute = attribute;
+            return this;
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) return true;
+            if (o == null || getClass() != o.getClass()) return false;
+            Record1 record1 = (Record1) o;
+            return Objects.equals(id, record1.id) &&
+                   Objects.equals(attribute, record1.attribute);
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(id, attribute);
+        }
+    }
+
+    private static class Record2 {
+        private Integer id;
+        private String attribute;
+
+        private Integer getId() {
+            return id;
+        }
+
+        private Record2 setId(Integer id) {
+            this.id = id;
+            return this;
+        }
+
+        private String getAttribute() {
+            return attribute;
+        }
+
+        private Record2 setAttribute(String attribute) {
+            this.attribute = attribute;
+            return this;
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) return true;
+            if (o == null || getClass() != o.getClass()) return false;
+            Record2 record2 = (Record2) o;
+            return Objects.equals(id, record2.id) &&
+                   Objects.equals(attribute, record2.attribute);
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(id, attribute);
+        }
+    }
+
+    private static final TableSchema<Record1> TABLE_SCHEMA_1 =
+        StaticTableSchema.builder(Record1.class)
+                         .newItemSupplier(Record1::new)
+                         .addAttribute(Integer.class, a -> a.name("id_1")
+                                                            .getter(Record1::getId)
+                                                            .setter(Record1::setId)
+                                                            .tags(primaryPartitionKey()))
+                         .addAttribute(String.class, a -> a.name("attribute")
+                                                           .getter(Record1::getAttribute)
+                                                           .setter(Record1::setAttribute))
+                         .build();
+
+    private static final TableSchema<Record2> TABLE_SCHEMA_2 =
+        StaticTableSchema.builder(Record2.class)
+                         .newItemSupplier(Record2::new)
+                         .addAttribute(Integer.class, a -> a.name("id_2")
+                                                            .getter(Record2::getId)
+                                                            .setter(Record2::setId)
+                                                            .tags(primaryPartitionKey()))
+                         .addAttribute(String.class, a -> a.name("attribute")
+                                                           .getter(Record2::getAttribute)
+                                                           .setter(Record2::setAttribute))
+                         .build();
+
+    private DynamoDbEnhancedClient enhancedClient = DynamoDbEnhancedClient.builder()
+                                                                          .dynamoDbClient(getDynamoDbClient())
+                                                                          .build();
+
+    private DynamoDbTable<Record1> mappedTable1 = enhancedClient.table(getConcreteTableName("table-name-1"), TABLE_SCHEMA_1);
+    private DynamoDbTable<Record2> mappedTable2 = enhancedClient.table(getConcreteTableName("table-name-2"), TABLE_SCHEMA_2);
+
+    private static final List<Record1> RECORDS_1 =
+        IntStream.range(0, 2)
+                 .mapToObj(i -> new Record1().setId(i).setAttribute(Integer.toString(i)))
+                 .collect(Collectors.toList());
+
+    private static final List<Record2> RECORDS_2 =
+        IntStream.range(0, 2)
+                 .mapToObj(i -> new Record2().setId(i).setAttribute(Integer.toString(i)))
+                 .collect(Collectors.toList());
+
+    @Before
+    public void createTable() {
+        mappedTable1.createTable(r -> r.provisionedThroughput(getDefaultProvisionedThroughput()));
+        mappedTable2.createTable(r -> r.provisionedThroughput(getDefaultProvisionedThroughput()));
+    }
+
+    @After
+    public void deleteTable() {
+        getDynamoDbClient().deleteTable(DeleteTableRequest.builder()
+                                                          .tableName(getConcreteTableName("table-name-1"))
+                                                          .build());
+        getDynamoDbClient().deleteTable(DeleteTableRequest.builder()
+                                                          .tableName(getConcreteTableName("table-name-2"))
+                                                          .build());
+    }
+
+    @Test
+    public void singlePut() {
+        enhancedClient.transactWriteItems(
+            TransactWriteItemsEnhancedRequest.builder()
+                                             .addPutItem(mappedTable1, RECORDS_1.get(0))
+                                             .build());
+
+        Record1 record = mappedTable1.getItem(r -> r.key(k -> k.partitionValue(0)));
+        assertThat(record, is(RECORDS_1.get(0)));
+    }
+
+    @Test
+    public void multiplePut() {
+        enhancedClient.transactWriteItems(
+            TransactWriteItemsEnhancedRequest.builder()
+                                             .addPutItem(mappedTable1, RECORDS_1.get(0))
+                                             .addPutItem(mappedTable2, RECORDS_2.get(0))
+                                             .build());
+
+        Record1 record1 = mappedTable1.getItem(r -> r.key(k -> k.partitionValue(0)));
+        Record2 record2 = mappedTable2.getItem(r -> r.key(k -> k.partitionValue(0)));
+        assertThat(record1, is(RECORDS_1.get(0)));
+        assertThat(record2, is(RECORDS_2.get(0)));
+    }
+
+    @Test
+    public void singleUpdate() {
+        enhancedClient.transactWriteItems(
+            TransactWriteItemsEnhancedRequest.builder()
+                                             .addUpdateItem(mappedTable1, RECORDS_1.get(0))
+                                             .build());
+
+        Record1 record = mappedTable1.getItem(r -> r.key(k -> k.partitionValue(0)));
+        assertThat(record, is(RECORDS_1.get(0)));
+    }
+
+    @Test
+    public void multipleUpdate() {
+        enhancedClient.transactWriteItems(
+            TransactWriteItemsEnhancedRequest.builder()
+                                             .addUpdateItem(mappedTable1, RECORDS_1.get(0))
+                                             .addUpdateItem(mappedTable2, RECORDS_2.get(0))
+                                             .build());
+
+        Record1 record1 = mappedTable1.getItem(r -> r.key(k -> k.partitionValue(0)));
+        Record2 record2 = mappedTable2.getItem(r -> r.key(k -> k.partitionValue(0)));
+        assertThat(record1, is(RECORDS_1.get(0)));
+        assertThat(record2, is(RECORDS_2.get(0)));
+    }
+
+    @Test
+    public void singleDelete() {
+        mappedTable1.putItem(r -> r.item(RECORDS_1.get(0)));
+
+        enhancedClient.transactWriteItems(
+            TransactWriteItemsEnhancedRequest.builder()
+                                             .addDeleteItem(mappedTable1, RECORDS_1.get(0))
+                                             .build());
+
+        Record1 record = mappedTable1.getItem(r -> r.key(k -> k.partitionValue(0)));
+        assertThat(record, is(nullValue()));
+    }
+
+    @Test
+    public void multipleDelete() {
+        mappedTable1.putItem(r -> r.item(RECORDS_1.get(0)));
+        mappedTable2.putItem(r -> r.item(RECORDS_2.get(0)));
+
+        enhancedClient.transactWriteItems(
+            TransactWriteItemsEnhancedRequest.builder()
+                                             .addDeleteItem(mappedTable1, RECORDS_1.get(0))
+                                             .addDeleteItem(mappedTable2, RECORDS_2.get(0))
+                                             .build());
+
+        Record1 record1 = mappedTable1.getItem(r -> r.key(k -> k.partitionValue(0)));
+        Record2 record2 = mappedTable2.getItem(r -> r.key(k -> k.partitionValue(0)));
+        assertThat(record1, is(nullValue()));
+        assertThat(record2, is(nullValue()));
+    }
+
+    @Test
+    public void singleConditionCheck() {
+        mappedTable1.putItem(r -> r.item(RECORDS_1.get(0)));
+
+        Expression conditionExpression = Expression.builder()
+                                                    .expression("#attribute = :attribute")
+                                                    .expressionValues(singletonMap(":attribute", stringValue("0")))
+                                                    .expressionNames(singletonMap("#attribute", "attribute"))
+                                                    .build();
+        Key key = Key.builder().partitionValue(0).build();
+
+        enhancedClient.transactWriteItems(
+            TransactWriteItemsEnhancedRequest.builder()
+                                             .addConditionCheck(mappedTable1, ConditionCheck.builder()
+                                                                                            .key(key)
+                                                                                            .conditionExpression(conditionExpression)
+                                                                                            .build())
+                                             .build());
+    }
+
+    @Test
+    public void multiConditionCheck() {
+        mappedTable1.putItem(r -> r.item(RECORDS_1.get(0)));
+        mappedTable2.putItem(r -> r.item(RECORDS_2.get(0)));
+
+        Expression conditionExpression = Expression.builder()
+                                                   .expression("#attribute = :attribute")
+                                                   .expressionValues(singletonMap(":attribute", stringValue("0")))
+                                                   .expressionNames(singletonMap("#attribute", "attribute"))
+                                                   .build();
+
+        Key key1 = Key.builder().partitionValue(0).build();
+        Key key2 = Key.builder().partitionValue(0).build();
+
+        enhancedClient.transactWriteItems(
+            TransactWriteItemsEnhancedRequest.builder()
+                                             .addConditionCheck(mappedTable1, ConditionCheck.builder()
+                                                                                            .key(key1)
+                                                                                            .conditionExpression(conditionExpression)
+                                                                                            .build())
+                                             .addConditionCheck(mappedTable2, ConditionCheck.builder()
+                                                                                            .key(key2)
+                                                                                            .conditionExpression(conditionExpression)
+                                                                                            .build())
+                                             .build());
+    }
+
+    @Test
+    public void mixedCommands() {
+        mappedTable1.putItem(r -> r.item(RECORDS_1.get(0)));
+        mappedTable2.putItem(r -> r.item(RECORDS_2.get(0)));
+
+        Expression conditionExpression = Expression.builder()
+                                                   .expression("#attribute = :attribute")
+                                                   .expressionValues(singletonMap(":attribute", stringValue("0")))
+                                                   .expressionNames(singletonMap("#attribute", "attribute"))
+                                                   .build();
+
+        Key key = Key.builder().partitionValue(0).build();
+
+        TransactWriteItemsEnhancedRequest transactWriteItemsEnhancedRequest =
+            TransactWriteItemsEnhancedRequest.builder()
+                                             .addConditionCheck(mappedTable1, ConditionCheck.builder()
+                                                                                            .key(key)
+                                                                                            .conditionExpression(conditionExpression)
+                                                                                            .build())
+                                             .addPutItem(mappedTable2, RECORDS_2.get(1))
+                                             .addUpdateItem(mappedTable1,RECORDS_1.get(1))
+                                             .addDeleteItem(mappedTable2, RECORDS_2.get(0))
+                                             .build();
+
+        enhancedClient.transactWriteItems(transactWriteItemsEnhancedRequest);
+
+        assertThat(mappedTable1.getItem(r -> r.key(k -> k.partitionValue(1))), is(RECORDS_1.get(1)));
+        assertThat(mappedTable2.getItem(r -> r.key(k -> k.partitionValue(0))), is(nullValue()));
+        assertThat(mappedTable2.getItem(r -> r.key(k -> k.partitionValue(1))), is(RECORDS_2.get(1)));
+    }
+
+    @Test
+    public void mixedCommands_conditionCheckFailsTransaction() {
+        mappedTable1.putItem(r -> r.item(RECORDS_1.get(0)));
+        mappedTable2.putItem(r -> r.item(RECORDS_2.get(0)));
+
+        Expression conditionExpression = Expression.builder()
+                                                   .expression("#attribute = :attribute")
+                                                   .expressionValues(singletonMap(":attribute", stringValue("1")))
+                                                   .expressionNames(singletonMap("#attribute", "attribute"))
+                                                   .build();
+
+        Key key = Key.builder().partitionValue(0).build();
+
+        TransactWriteItemsEnhancedRequest transactWriteItemsEnhancedRequest =
+            TransactWriteItemsEnhancedRequest.builder()
+                                             .addPutItem(mappedTable2, RECORDS_2.get(1))
+                                             .addUpdateItem(mappedTable1, RECORDS_1.get(1))
+                                             .addConditionCheck(mappedTable1, ConditionCheck.builder()
+                                                                                            .key(key)
+                                                                                            .conditionExpression(conditionExpression)
+                                                                                            .build())
+                                             .addDeleteItem(mappedTable2, RECORDS_2.get(0))
+                                             .build();
+
+        try {
+            enhancedClient.transactWriteItems(transactWriteItemsEnhancedRequest);
+            fail("Expected TransactionCanceledException to be thrown");
+        } catch(TransactionCanceledException ignored) {
+        }
+
+        assertThat(mappedTable1.getItem(r -> r.key(k -> k.partitionValue(1))), is(nullValue()));
+        assertThat(mappedTable2.getItem(r -> r.key(k -> k.partitionValue(0))), is(RECORDS_2.get(0)));
+        assertThat(mappedTable2.getItem(r -> r.key(k -> k.partitionValue(1))), is(nullValue()));
+    }
+}
+
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/VersionedRecordTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/VersionedRecordTest.java
new file mode 100644
index 000000000000..198bb1c20fe0
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/VersionedRecordTest.java
@@ -0,0 +1,294 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.functionaltests;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+import static software.amazon.awssdk.enhanced.dynamodb.extensions.VersionedRecordExtension.AttributeTags.versionAttribute;
+import static software.amazon.awssdk.enhanced.dynamodb.internal.AttributeValues.stringValue;
+import static software.amazon.awssdk.enhanced.dynamodb.mapper.StaticAttributeTags.primaryPartitionKey;
+
+import java.util.Objects;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClient;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbTable;
+import software.amazon.awssdk.enhanced.dynamodb.Expression;
+import software.amazon.awssdk.enhanced.dynamodb.TableSchema;
+import software.amazon.awssdk.enhanced.dynamodb.extensions.VersionedRecordExtension;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.StaticTableSchema;
+import software.amazon.awssdk.enhanced.dynamodb.model.PutItemEnhancedRequest;
+import software.amazon.awssdk.enhanced.dynamodb.model.UpdateItemEnhancedRequest;
+import software.amazon.awssdk.services.dynamodb.model.ConditionalCheckFailedException;
+import software.amazon.awssdk.services.dynamodb.model.DeleteTableRequest;
+
+public class VersionedRecordTest extends LocalDynamoDbSyncTestBase {
+    private static class Record {
+        private String id;
+        private String attribute;
+        private Integer version;
+
+        private String getId() {
+            return id;
+        }
+
+        private Record setId(String id) {
+            this.id = id;
+            return this;
+        }
+
+        private String getAttribute() {
+            return attribute;
+        }
+
+        private Record setAttribute(String attribute) {
+            this.attribute = attribute;
+            return this;
+        }
+
+        private Integer getVersion() {
+            return version;
+        }
+
+        private Record setVersion(Integer version) {
+            this.version = version;
+            return this;
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) return true;
+            if (o == null || getClass() != o.getClass()) return false;
+            Record record = (Record) o;
+            return Objects.equals(id, record.id) &&
+                   Objects.equals(attribute, record.attribute) &&
+                   Objects.equals(version, record.version);
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(id, attribute, version);
+        }
+    }
+
+    private static final TableSchema<Record> TABLE_SCHEMA =
+        StaticTableSchema.builder(Record.class)
+                         .newItemSupplier(Record::new)
+                         .addAttribute(String.class, a -> a.name("id")
+                                                           .getter(Record::getId)
+                                                           .setter(Record::setId)
+                                                           .tags(primaryPartitionKey()))
+                         .addAttribute(String.class, a -> a.name("attribute")
+                                                           .getter(Record::getAttribute)
+                                                           .setter(Record::setAttribute))
+                         .addAttribute(Integer.class, a -> a.name("version")
+                                                            .getter(Record::getVersion)
+                                                            .setter(Record::setVersion)
+                                                            .tags(versionAttribute()))
+                         .build();
+
+    private DynamoDbEnhancedClient enhancedClient = DynamoDbEnhancedClient.builder()
+                                                                          .dynamoDbClient(getDynamoDbClient())
+                                                                          .extensions(VersionedRecordExtension.builder().build())
+                                                                          .build();
+
+    private DynamoDbTable<Record> mappedTable = enhancedClient.table(getConcreteTableName("table-name"), TABLE_SCHEMA);
+
+    @Rule
+    public ExpectedException exception = ExpectedException.none();
+
+    @Before
+    public void createTable() {
+        mappedTable.createTable(r -> r.provisionedThroughput(getDefaultProvisionedThroughput()));
+    }
+
+    @After
+    public void deleteTable() {
+        getDynamoDbClient().deleteTable(DeleteTableRequest.builder()
+                                                          .tableName(getConcreteTableName("table-name"))
+                                                          .build());
+    }
+
+    @Test
+    public void putNewRecordSetsInitialVersion() {
+        mappedTable.putItem(r -> r.item(new Record().setId("id").setAttribute("one")));
+
+        Record result = mappedTable.getItem(r -> r.key(k -> k.partitionValue("id")));
+        Record expectedResult = new Record().setId("id").setAttribute("one").setVersion(1);
+
+        assertThat(result, is(expectedResult));
+    }
+
+    @Test
+    public void updateNewRecordSetsInitialVersion() {
+        Record result = mappedTable.updateItem(r -> r.item(new Record().setId("id").setAttribute("one")));
+
+        Record expectedResult = new Record().setId("id").setAttribute("one").setVersion(1);
+
+        assertThat(result, is(expectedResult));
+    }
+
+    @Test
+    public void putExistingRecordVersionMatches() {
+        mappedTable.putItem(r -> r.item(new Record().setId("id").setAttribute("one")));
+
+        mappedTable.putItem(r -> r.item(new Record().setId("id").setAttribute("one").setVersion(1)));
+
+        Record result = mappedTable.getItem(r -> r.key(k -> k.partitionValue("id")));
+        Record expectedResult = new Record().setId("id").setAttribute("one").setVersion(2);
+        assertThat(result, is(expectedResult));
+    }
+
+    @Test
+    public void putExistingRecordVersionMatchesConditionExpressionMatches() {
+        mappedTable.putItem(r -> r.item(new Record().setId("id").setAttribute("one")));
+        Expression conditionExpression = Expression.builder()
+                                                   .expression("#k = :v OR #k = :v1")
+                                                   .putExpressionName("#k", "attribute")
+                                                   .putExpressionValue(":v", stringValue("wrong"))
+                                                   .putExpressionValue(":v1", stringValue("one"))
+                                                   .build();
+
+        mappedTable.putItem(PutItemEnhancedRequest.builder(Record.class)
+                                                  .item(new Record().setId("id").setAttribute("one").setVersion(1))
+                                                  .conditionExpression(conditionExpression)
+                                                  .build());
+
+        Record result = mappedTable.getItem(r -> r.key(k -> k.partitionValue("id")));
+        Record expectedResult = new Record().setId("id").setAttribute("one").setVersion(2);
+        assertThat(result, is(expectedResult));
+    }
+
+    @Test
+    public void putExistingRecordVersionDoesNotMatchConditionExpressionMatches() {
+        mappedTable.putItem(r -> r.item(new Record().setId("id").setAttribute("one")));
+        Expression conditionExpression = Expression.builder()
+                                                   .expression("#k = :v OR #k = :v1")
+                                                   .putExpressionName("#k", "attribute")
+                                                   .putExpressionValue(":v", stringValue("wrong"))
+                                                   .putExpressionValue(":v1", stringValue("one"))
+                                                   .build();
+
+        exception.expect(ConditionalCheckFailedException.class);
+        mappedTable.putItem(PutItemEnhancedRequest.builder(Record.class)
+                                                  .item(new Record().setId("id").setAttribute("one").setVersion(2))
+                                                  .conditionExpression(conditionExpression)
+                                                  .build());
+    }
+
+    @Test
+    public void putExistingRecordVersionMatchesConditionExpressionDoesNotMatch() {
+        mappedTable.putItem(r -> r.item(new Record().setId("id").setAttribute("one")));
+        Expression conditionExpression = Expression.builder()
+                                                   .expression("#k = :v OR #k = :v1")
+                                                   .putExpressionName("#k", "attribute")
+                                                   .putExpressionValue(":v", stringValue("wrong"))
+                                                   .putExpressionValue(":v1", stringValue("wrong2"))
+                                                   .build();
+
+        exception.expect(ConditionalCheckFailedException.class);
+        mappedTable.putItem(PutItemEnhancedRequest.builder(Record.class)
+                                                  .item(new Record().setId("id").setAttribute("one").setVersion(1))
+                                                  .conditionExpression(conditionExpression)
+                                                  .build());
+    }
+
+    @Test
+    public void updateExistingRecordVersionMatchesConditionExpressionMatches() {
+        mappedTable.putItem(r -> r.item(new Record().setId("id").setAttribute("one")));
+        Expression conditionExpression = Expression.builder()
+                                                   .expression("#k = :v OR #k = :v1")
+                                                   .putExpressionName("#k", "attribute")
+                                                   .putExpressionValue(":v", stringValue("wrong"))
+                                                   .putExpressionValue(":v1", stringValue("one"))
+                                                   .build();
+
+        mappedTable.updateItem(UpdateItemEnhancedRequest.builder(Record.class)
+                                                        .item(new Record().setId("id").setAttribute("one").setVersion(1))
+                                                        .conditionExpression(conditionExpression)
+                                                        .build());
+
+        Record result = mappedTable.getItem(r -> r.key(k -> k.partitionValue("id")));
+        Record expectedResult = new Record().setId("id").setAttribute("one").setVersion(2);
+        assertThat(result, is(expectedResult));
+    }
+
+    @Test
+    public void updateExistingRecordVersionDoesNotMatchConditionExpressionMatches() {
+        mappedTable.putItem(r -> r.item(new Record().setId("id").setAttribute("one")));
+        Expression conditionExpression = Expression.builder()
+                                                   .expression("#k = :v OR #k = :v1")
+                                                   .putExpressionName("#k", "attribute")
+                                                   .putExpressionValue(":v", stringValue("wrong"))
+                                                   .putExpressionValue(":v1", stringValue("one"))
+                                                   .build();
+
+        exception.expect(ConditionalCheckFailedException.class);
+        mappedTable.updateItem(UpdateItemEnhancedRequest.builder(Record.class)
+                                                        .item(new Record().setId("id").setAttribute("one").setVersion(2))
+                                                        .conditionExpression(conditionExpression)
+                                                        .build());
+    }
+
+    @Test
+    public void updateExistingRecordVersionMatchesConditionExpressionDoesNotMatch() {
+        mappedTable.putItem(r -> r.item(new Record().setId("id").setAttribute("one")));
+        Expression conditionExpression = Expression.builder()
+                                                   .expression("#k = :v OR #k = :v1")
+                                                   .putExpressionName("#k", "attribute")
+                                                   .putExpressionValue(":v", stringValue("wrong"))
+                                                   .putExpressionValue(":v1", stringValue("wrong2"))
+                                                   .build();
+
+        exception.expect(ConditionalCheckFailedException.class);
+        mappedTable.updateItem(UpdateItemEnhancedRequest.builder(Record.class)
+                                                        .item(new Record().setId("id").setAttribute("one").setVersion(1))
+                                                        .conditionExpression(conditionExpression)
+                                                        .build());
+    }
+
+    @Test
+    public void updateExistingRecordVersionMatches() {
+        mappedTable.putItem(r -> r.item(new Record().setId("id").setAttribute("one")));
+
+        Record result =
+            mappedTable.updateItem(r -> r.item(new Record().setId("id").setAttribute("one").setVersion(1)));
+
+        Record expectedResult = new Record().setId("id").setAttribute("one").setVersion(2);
+        assertThat(result, is(expectedResult));
+    }
+
+    @Test(expected = ConditionalCheckFailedException.class)
+    public void putNewRecordTwice() {
+        mappedTable.putItem(r -> r.item(new Record().setId("id").setAttribute("one")));
+        mappedTable.putItem(r -> r.item(new Record().setId("id").setAttribute("one")));
+    }
+
+    @Test(expected = ConditionalCheckFailedException.class)
+    public void updateNewRecordTwice() {
+        mappedTable.updateItem(r -> r.item(new Record().setId("id").setAttribute("one")));
+        mappedTable.updateItem(r -> r.item(new Record().setId("id").setAttribute("one")));
+    }
+
+    @Test(expected = ConditionalCheckFailedException.class)
+    public void putRecordWithWrongVersionNumber() {
+        mappedTable.putItem(r -> r.item(new Record().setId("id").setAttribute("one")));
+        mappedTable.putItem(r -> r.item(new Record().setId("id").setAttribute("one").setVersion(2)));
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/models/FakeItem.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/models/FakeItem.java
new file mode 100644
index 000000000000..246c0fd2a5e7
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/models/FakeItem.java
@@ -0,0 +1,140 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.functionaltests.models;
+
+import static software.amazon.awssdk.enhanced.dynamodb.extensions.VersionedRecordExtension.AttributeTags.versionAttribute;
+import static software.amazon.awssdk.enhanced.dynamodb.mapper.StaticAttributeTags.primaryPartitionKey;
+
+import java.util.Objects;
+import java.util.UUID;
+import software.amazon.awssdk.enhanced.dynamodb.TableMetadata;
+import software.amazon.awssdk.enhanced.dynamodb.TableSchema;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.StaticTableSchema;
+
+public class FakeItem extends FakeItemAbstractSubclass {
+    private static final StaticTableSchema<FakeItem> FAKE_ITEM_MAPPER =
+        StaticTableSchema.builder(FakeItem.class)
+                         .newItemSupplier(FakeItem::new)
+                         .flatten(FakeItemComposedClass.getTableSchema(),
+                                  FakeItem::getComposedObject,
+                                  FakeItem::setComposedObject)
+                         .extend(getSubclassTableSchema())
+                         .addAttribute(String.class, a -> a.name("id")
+                                                           .getter(FakeItem::getId)
+                                                           .setter(FakeItem::setId)
+                                                           .addTag(primaryPartitionKey()))
+                         .addAttribute(Integer.class, a -> a.name("version")
+                                                            .getter(FakeItem::getVersion)
+                                                            .setter(FakeItem::setVersion)
+                                                            .addTag(versionAttribute()))
+                         .build();
+
+    private String id;
+    private Integer version;
+    private FakeItemComposedClass composedObject;
+
+    public FakeItem() {
+    }
+
+    public FakeItem(String id, Integer version, FakeItemComposedClass composedObject) {
+        this.id = id;
+        this.version = version;
+        this.composedObject = composedObject;
+    }
+
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    public static TableSchema<FakeItem> getTableSchema() {
+        return FAKE_ITEM_MAPPER;
+    }
+
+    public static TableMetadata getTableMetadata() {
+        return FAKE_ITEM_MAPPER.tableMetadata();
+    }
+
+    public static FakeItem createUniqueFakeItem() {
+        return FakeItem.builder()
+                       .id(UUID.randomUUID().toString())
+                       .build();
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public Integer getVersion() {
+        return version;
+    }
+
+    public void setVersion(Integer version) {
+        this.version = version;
+    }
+
+    public FakeItemComposedClass getComposedObject() {
+        return composedObject;
+    }
+
+    public void setComposedObject(FakeItemComposedClass composedObject) {
+        this.composedObject = composedObject;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        if (! super.equals(o)) return false;
+        FakeItem fakeItem = (FakeItem) o;
+        return Objects.equals(id, fakeItem.id) &&
+               Objects.equals(version, fakeItem.version) &&
+               Objects.equals(composedObject, fakeItem.composedObject);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(super.hashCode(), id, version, composedObject);
+    }
+
+    public static class Builder {
+        private String id;
+        private Integer version;
+        private FakeItemComposedClass composedObject;
+
+        public Builder id(String id) {
+            this.id = id;
+            return this;
+        }
+
+        public Builder version(Integer version) {
+            this.version = version;
+            return this;
+        }
+
+        public Builder composedObject(FakeItemComposedClass composedObject) {
+            this.composedObject = composedObject;
+            return this;
+        }
+
+        public FakeItem build() {
+            return new FakeItem(id, version, composedObject);
+        }
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/functionaltests/models/FakeItemAbstractSubclass.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/models/FakeItemAbstractSubclass.java
similarity index 78%
rename from services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/functionaltests/models/FakeItemAbstractSubclass.java
rename to services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/models/FakeItemAbstractSubclass.java
index 240f73230b66..90d54b91a604 100644
--- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/functionaltests/models/FakeItemAbstractSubclass.java
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/models/FakeItemAbstractSubclass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -13,20 +13,18 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.awssdk.extensions.dynamodb.mappingclient.functionaltests.models;
-
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.staticmapper.Attributes.string;
+package software.amazon.awssdk.enhanced.dynamodb.functionaltests.models;
 
 import java.util.Objects;
-
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.staticmapper.StaticTableSchema;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.StaticTableSchema;
 
 abstract class FakeItemAbstractSubclass extends FakeItemAbstractSubclass2 {
     private static final StaticTableSchema<FakeItemAbstractSubclass> FAKE_ITEM_MAPPER =
-        StaticTableSchema.builder()
-                         .attributes(string("subclass_attribute",
-                                            FakeItemAbstractSubclass::getSubclassAttribute,
-                                            FakeItemAbstractSubclass::setSubclassAttribute))
+        StaticTableSchema.builder(FakeItemAbstractSubclass.class)
+                         .addAttribute(String.class,
+                                       a -> a.name("subclass_attribute")
+                                             .getter(FakeItemAbstractSubclass::getSubclassAttribute)
+                                             .setter(FakeItemAbstractSubclass::setSubclassAttribute))
                          .flatten(FakeItemComposedSubclass.getTableSchema(),
                                   FakeItemAbstractSubclass::getComposedAttribute,
                                   FakeItemAbstractSubclass::setComposedAttribute)
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/functionaltests/models/FakeItemAbstractSubclass2.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/models/FakeItemAbstractSubclass2.java
similarity index 77%
rename from services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/functionaltests/models/FakeItemAbstractSubclass2.java
rename to services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/models/FakeItemAbstractSubclass2.java
index a05502c6f126..fcca0b922738 100644
--- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/functionaltests/models/FakeItemAbstractSubclass2.java
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/models/FakeItemAbstractSubclass2.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -13,20 +13,18 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.awssdk.extensions.dynamodb.mappingclient.functionaltests.models;
-
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.staticmapper.Attributes.string;
+package software.amazon.awssdk.enhanced.dynamodb.functionaltests.models;
 
 import java.util.Objects;
-
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.staticmapper.StaticTableSchema;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.StaticTableSchema;
 
 abstract class FakeItemAbstractSubclass2 {
     private static final StaticTableSchema<FakeItemAbstractSubclass2> FAKE_ITEM_MAPPER =
-        StaticTableSchema.builder()
-                         .attributes(string("abstract_subclass_2",
-                                            FakeItemAbstractSubclass2::getSubclassAttribute2,
-                                            FakeItemAbstractSubclass2::setSubclassAttribute2))
+        StaticTableSchema.builder(FakeItemAbstractSubclass2.class)
+                         .addAttribute(String.class,
+                                       a -> a.name("abstract_subclass_2")
+                                             .getter(FakeItemAbstractSubclass2::getSubclassAttribute2)
+                                             .setter(FakeItemAbstractSubclass2::setSubclassAttribute2))
                          .flatten(FakeItemComposedSubclass2.getTableSchema(),
                                   FakeItemAbstractSubclass2::getComposedAttribute2,
                                   FakeItemAbstractSubclass2::setComposedAttribute2)
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/models/FakeItemComposedAbstractSubclass.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/models/FakeItemComposedAbstractSubclass.java
new file mode 100644
index 000000000000..0510501b2df6
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/models/FakeItemComposedAbstractSubclass.java
@@ -0,0 +1,56 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.functionaltests.models;
+
+import java.util.Objects;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.StaticTableSchema;
+
+abstract class FakeItemComposedAbstractSubclass {
+    private static final StaticTableSchema<FakeItemComposedAbstractSubclass> FAKE_ITEM_MAPPER =
+        StaticTableSchema.builder(FakeItemComposedAbstractSubclass.class)
+                         .addAttribute(String.class,
+                                       a -> a.name("composed_abstract_subclass")
+                                             .getter(FakeItemComposedAbstractSubclass::getComposedSubclassAttribute)
+                                             .setter(FakeItemComposedAbstractSubclass::setComposedSubclassAttribute))
+                                             .build();
+
+    private String composedSubclassAttribute;
+
+    static StaticTableSchema<FakeItemComposedAbstractSubclass> getSubclassTableSchema() {
+        return FAKE_ITEM_MAPPER;
+    }
+
+    public String getComposedSubclassAttribute() {
+        return composedSubclassAttribute;
+    }
+
+    public void setComposedSubclassAttribute(String composedSubclassAttribute) {
+        this.composedSubclassAttribute = composedSubclassAttribute;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        FakeItemComposedAbstractSubclass that = (FakeItemComposedAbstractSubclass) o;
+        return Objects.equals(composedSubclassAttribute, that.composedSubclassAttribute);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(composedSubclassAttribute);
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/models/FakeItemComposedAbstractSubclass2.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/models/FakeItemComposedAbstractSubclass2.java
new file mode 100644
index 000000000000..9b231839ff38
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/models/FakeItemComposedAbstractSubclass2.java
@@ -0,0 +1,56 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.functionaltests.models;
+
+import java.util.Objects;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.StaticTableSchema;
+
+abstract class FakeItemComposedAbstractSubclass2 {
+    private static final StaticTableSchema<FakeItemComposedAbstractSubclass2> FAKE_ITEM_MAPPER =
+        StaticTableSchema.builder(FakeItemComposedAbstractSubclass2.class)
+                         .addAttribute(String.class,
+                                       a -> a.name("composed_abstract_subclass_2")
+                                             .getter(FakeItemComposedAbstractSubclass2::getComposedSubclassAttribute2)
+                                             .setter(FakeItemComposedAbstractSubclass2::setComposedSubclassAttribute2))
+                         .build();
+
+    private String composedSubclassAttribute2;
+
+    static StaticTableSchema<FakeItemComposedAbstractSubclass2> getSubclassTableSchema() {
+        return FAKE_ITEM_MAPPER;
+    }
+
+    public String getComposedSubclassAttribute2() {
+        return composedSubclassAttribute2;
+    }
+
+    public void setComposedSubclassAttribute2(String composedSubclassAttribute2) {
+        this.composedSubclassAttribute2 = composedSubclassAttribute2;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        FakeItemComposedAbstractSubclass2 that = (FakeItemComposedAbstractSubclass2) o;
+        return Objects.equals(composedSubclassAttribute2, that.composedSubclassAttribute2);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(composedSubclassAttribute2);
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/functionaltests/models/FakeItemComposedClass.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/models/FakeItemComposedClass.java
similarity index 76%
rename from services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/functionaltests/models/FakeItemComposedClass.java
rename to services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/models/FakeItemComposedClass.java
index 49970c8f1f38..789d78ba95b8 100644
--- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/functionaltests/models/FakeItemComposedClass.java
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/models/FakeItemComposedClass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -13,20 +13,18 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.awssdk.extensions.dynamodb.mappingclient.functionaltests.models;
-
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.staticmapper.Attributes.string;
+package software.amazon.awssdk.enhanced.dynamodb.functionaltests.models;
 
 import java.util.Objects;
-
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.staticmapper.StaticTableSchema;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.StaticTableSchema;
 
 public class FakeItemComposedClass {
     private static final StaticTableSchema<FakeItemComposedClass> ITEM_MAPPER =
-        StaticTableSchema.builder()
-                         .attributes(string("composed_attribute",
-                                           FakeItemComposedClass::getComposedAttribute,
-                                           FakeItemComposedClass::setComposedAttribute))
+        StaticTableSchema.builder(FakeItemComposedClass.class)
+                         .addAttribute(String.class,
+                                       a -> a.name("composed_attribute")
+                                             .getter(FakeItemComposedClass::getComposedAttribute)
+                                             .setter(FakeItemComposedClass::setComposedAttribute))
                          .newItemSupplier(FakeItemComposedClass::new)
                          .build();
 
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/models/FakeItemComposedSubclass.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/models/FakeItemComposedSubclass.java
new file mode 100644
index 000000000000..5792c8cb8cd7
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/models/FakeItemComposedSubclass.java
@@ -0,0 +1,59 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.functionaltests.models;
+
+import java.util.Objects;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.StaticTableSchema;
+
+public class FakeItemComposedSubclass extends FakeItemComposedAbstractSubclass {
+    private static final StaticTableSchema<FakeItemComposedSubclass> ITEM_MAPPER =
+        StaticTableSchema.builder(FakeItemComposedSubclass.class)
+                         .newItemSupplier(FakeItemComposedSubclass::new)
+                         .addAttribute(String.class,
+                                       a -> a.name("composed_subclass")
+                                             .getter(FakeItemComposedSubclass::getComposedAttribute)
+                                             .setter(FakeItemComposedSubclass::setComposedAttribute))
+                         .extend(FakeItemComposedAbstractSubclass.getSubclassTableSchema())
+                         .build();
+
+    private String composedAttribute;
+
+    public static StaticTableSchema<FakeItemComposedSubclass> getTableSchema() {
+        return ITEM_MAPPER;
+    }
+
+    public String getComposedAttribute() {
+        return composedAttribute;
+    }
+
+    public void setComposedAttribute(String composedAttribute) {
+        this.composedAttribute = composedAttribute;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        if (! super.equals(o)) return false;
+        FakeItemComposedSubclass that = (FakeItemComposedSubclass) o;
+        return Objects.equals(composedAttribute, that.composedAttribute);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(super.hashCode(), composedAttribute);
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/models/FakeItemComposedSubclass2.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/models/FakeItemComposedSubclass2.java
new file mode 100644
index 000000000000..22fc8a70705f
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/models/FakeItemComposedSubclass2.java
@@ -0,0 +1,60 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.functionaltests.models;
+
+
+import java.util.Objects;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.StaticTableSchema;
+
+public class FakeItemComposedSubclass2 extends FakeItemComposedAbstractSubclass2 {
+    private static final StaticTableSchema<FakeItemComposedSubclass2> ITEM_MAPPER =
+        StaticTableSchema.builder(FakeItemComposedSubclass2.class)
+                         .newItemSupplier(FakeItemComposedSubclass2::new)
+                         .extend(getSubclassTableSchema())
+                         .addAttribute(String.class,
+                                       a -> a.name("composed_subclass_2")
+                                             .getter(FakeItemComposedSubclass2::getComposedAttribute2)
+                                             .setter(FakeItemComposedSubclass2::setComposedAttribute2))
+                         .build();
+
+    private String composedAttribute2;
+
+    public static StaticTableSchema<FakeItemComposedSubclass2> getTableSchema() {
+        return ITEM_MAPPER;
+    }
+
+    public String getComposedAttribute2() {
+        return composedAttribute2;
+    }
+
+    public void setComposedAttribute2(String composedAttribute2) {
+        this.composedAttribute2 = composedAttribute2;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        if (! super.equals(o)) return false;
+        FakeItemComposedSubclass2 that = (FakeItemComposedSubclass2) o;
+        return Objects.equals(composedAttribute2, that.composedAttribute2);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(super.hashCode(), composedAttribute2);
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/models/FakeItemWithBinaryKey.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/models/FakeItemWithBinaryKey.java
new file mode 100644
index 000000000000..00ea82cee32a
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/models/FakeItemWithBinaryKey.java
@@ -0,0 +1,60 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.functionaltests.models;
+
+import static software.amazon.awssdk.enhanced.dynamodb.mapper.StaticAttributeTags.primaryPartitionKey;
+
+import java.util.Objects;
+import software.amazon.awssdk.core.SdkBytes;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.StaticTableSchema;
+
+public class FakeItemWithBinaryKey {
+    private static final StaticTableSchema<FakeItemWithBinaryKey> FAKE_ITEM_WITH_BINARY_KEY_SCHEMA =
+        StaticTableSchema.builder(FakeItemWithBinaryKey.class)
+                         .newItemSupplier(FakeItemWithBinaryKey::new)
+                         .addAttribute(SdkBytes.class, a -> a.name("id")
+                                                             .getter(FakeItemWithBinaryKey::getId)
+                                                             .setter(FakeItemWithBinaryKey::setId)
+                                                             .tags(primaryPartitionKey()))
+                         .build();
+
+    private SdkBytes id;
+
+    public static StaticTableSchema<FakeItemWithBinaryKey> getTableSchema() {
+        return FAKE_ITEM_WITH_BINARY_KEY_SCHEMA;
+    }
+
+    public SdkBytes getId() {
+        return id;
+    }
+
+    public void setId(SdkBytes id) {
+        this.id = id;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        FakeItemWithBinaryKey that = (FakeItemWithBinaryKey) o;
+        return Objects.equals(id, that.id);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(id);
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/models/FakeItemWithIndices.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/models/FakeItemWithIndices.java
new file mode 100644
index 000000000000..cda40aa312ec
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/models/FakeItemWithIndices.java
@@ -0,0 +1,163 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.functionaltests.models;
+
+import static software.amazon.awssdk.enhanced.dynamodb.mapper.StaticAttributeTags.primaryPartitionKey;
+import static software.amazon.awssdk.enhanced.dynamodb.mapper.StaticAttributeTags.primarySortKey;
+import static software.amazon.awssdk.enhanced.dynamodb.mapper.StaticAttributeTags.secondaryPartitionKey;
+import static software.amazon.awssdk.enhanced.dynamodb.mapper.StaticAttributeTags.secondarySortKey;
+
+import java.util.UUID;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.StaticTableSchema;
+
+public class FakeItemWithIndices {
+    private static final StaticTableSchema<FakeItemWithIndices> FAKE_ITEM_MAPPER =
+        StaticTableSchema.builder(FakeItemWithIndices.class)
+                         .newItemSupplier(FakeItemWithIndices::new)
+                         .addAttribute(String.class, a -> a.name("id")
+                                                           .getter(FakeItemWithIndices::getId)
+                                                           .setter(FakeItemWithIndices::setId)
+                                                           .tags(primaryPartitionKey()))
+                         .addAttribute(String.class, a -> a.name("sort")
+                                                           .getter(FakeItemWithIndices::getSort)
+                                                           .setter(FakeItemWithIndices::setSort)
+                                                           .tags(primarySortKey()))
+                         .addAttribute(String.class, a -> a.name("gsi_id")
+                                                           .getter(FakeItemWithIndices::getGsiId)
+                                                           .setter(FakeItemWithIndices::setGsiId)
+                                                           .tags(secondaryPartitionKey("gsi_1"), secondaryPartitionKey("gsi_2")))
+                         .addAttribute(String.class, a -> a.name("gsi_sort")
+                                                           .getter(FakeItemWithIndices::getGsiSort)
+                                                           .setter(FakeItemWithIndices::setGsiSort)
+                                                           .tags(secondarySortKey("gsi_1")))
+                         .addAttribute(String.class, a -> a.name("lsi_sort")
+                                                           .getter(FakeItemWithIndices::getLsiSort)
+                                                           .setter(FakeItemWithIndices::setLsiSort)
+                                                           .tags(secondarySortKey("lsi_1")))
+                         .build();
+
+    private String id;
+    private String sort;
+    private String gsiId;
+    private String gsiSort;
+    private String lsiSort;
+
+    public FakeItemWithIndices() {
+    }
+
+    public FakeItemWithIndices(String id, String sort, String gsiId, String gsiSort, String lsiSort) {
+        this.id = id;
+        this.sort = sort;
+        this.gsiId = gsiId;
+        this.gsiSort = gsiSort;
+        this.lsiSort = lsiSort;
+    }
+
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    public static StaticTableSchema<FakeItemWithIndices> getTableSchema() {
+        return FAKE_ITEM_MAPPER;
+    }
+
+    public static FakeItemWithIndices createUniqueFakeItemWithIndices() {
+        return FakeItemWithIndices.builder()
+                                  .id(UUID.randomUUID().toString())
+                                  .sort(UUID.randomUUID().toString())
+                                  .gsiId(UUID.randomUUID().toString())
+                                  .gsiSort(UUID.randomUUID().toString())
+                                  .lsiSort(UUID.randomUUID().toString())
+                                  .build();
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getSort() {
+        return sort;
+    }
+
+    public void setSort(String sort) {
+        this.sort = sort;
+    }
+
+    public String getGsiId() {
+        return gsiId;
+    }
+
+    public void setGsiId(String gsiId) {
+        this.gsiId = gsiId;
+    }
+
+    public String getGsiSort() {
+        return gsiSort;
+    }
+
+    public void setGsiSort(String gsiSort) {
+        this.gsiSort = gsiSort;
+    }
+
+    public String getLsiSort() {
+        return lsiSort;
+    }
+
+    public void setLsiSort(String lsiSort) {
+        this.lsiSort = lsiSort;
+    }
+
+    public static class Builder {
+        private String id;
+        private String sort;
+        private String gsiId;
+        private String gsiSort;
+        private String lsiSort;
+
+        public Builder id(String id) {
+            this.id = id;
+            return this;
+        }
+
+        public Builder sort(String sort) {
+            this.sort = sort;
+            return this;
+        }
+
+        public Builder gsiId(String gsiId) {
+            this.gsiId = gsiId;
+            return this;
+        }
+
+        public Builder gsiSort(String gsiSort) {
+            this.gsiSort = gsiSort;
+            return this;
+        }
+
+        public Builder lsiSort(String lsiSort) {
+            this.lsiSort = lsiSort;
+            return this;
+        }
+
+        public FakeItemWithIndices build() {
+            return new FakeItemWithIndices(id, sort, gsiId, gsiSort, lsiSort);
+        }
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/models/FakeItemWithNumericSort.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/models/FakeItemWithNumericSort.java
new file mode 100644
index 000000000000..5a51ac1b921b
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/models/FakeItemWithNumericSort.java
@@ -0,0 +1,101 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.functionaltests.models;
+
+import static software.amazon.awssdk.enhanced.dynamodb.mapper.StaticAttributeTags.primaryPartitionKey;
+import static software.amazon.awssdk.enhanced.dynamodb.mapper.StaticAttributeTags.primarySortKey;
+
+import java.util.Random;
+import java.util.UUID;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.StaticTableSchema;
+
+public class FakeItemWithNumericSort {
+    private static final Random RANDOM = new Random();
+
+    private static final StaticTableSchema<FakeItemWithNumericSort> FAKE_ITEM_MAPPER =
+        StaticTableSchema.builder(FakeItemWithNumericSort.class)
+                         .newItemSupplier(FakeItemWithNumericSort::new)
+                         .addAttribute(String.class, a -> a.name("id")
+                                                           .getter(FakeItemWithNumericSort::getId)
+                                                           .setter(FakeItemWithNumericSort::setId)
+                                                           .addTag(primaryPartitionKey()))
+                         .addAttribute(Integer.class, a -> a.name("sort")
+                                                            .getter(FakeItemWithNumericSort::getSort)
+                                                            .setter(FakeItemWithNumericSort::setSort)
+                                                            .addTag(primarySortKey()))
+                         .build();
+
+    private String id;
+    private Integer sort;
+
+    public FakeItemWithNumericSort() {
+    }
+
+    public FakeItemWithNumericSort(String id, Integer sort) {
+        this.id = id;
+        this.sort = sort;
+    }
+
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    public static StaticTableSchema<FakeItemWithNumericSort> getTableSchema() {
+        return FAKE_ITEM_MAPPER;
+    }
+
+    public static FakeItemWithNumericSort createUniqueFakeItemWithSort() {
+        return FakeItemWithNumericSort.builder()
+                                      .id(UUID.randomUUID().toString())
+                                      .sort(RANDOM.nextInt())
+                                      .build();
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public Integer getSort() {
+        return sort;
+    }
+
+    public void setSort(Integer sort) {
+        this.sort = sort;
+    }
+
+    public static class Builder {
+        private String id;
+        private Integer sort;
+
+        public Builder id(String id) {
+            this.id = id;
+            return this;
+        }
+
+        public Builder sort(Integer sort) {
+            this.sort = sort;
+            return this;
+        }
+
+        public FakeItemWithNumericSort build() {
+            return new FakeItemWithNumericSort(id, sort);
+        }
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/models/FakeItemWithSort.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/models/FakeItemWithSort.java
new file mode 100644
index 000000000000..caccc95aa715
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/models/FakeItemWithSort.java
@@ -0,0 +1,168 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.functionaltests.models;
+
+import static software.amazon.awssdk.enhanced.dynamodb.mapper.StaticAttributeTags.primaryPartitionKey;
+import static software.amazon.awssdk.enhanced.dynamodb.mapper.StaticAttributeTags.primarySortKey;
+
+import java.util.Objects;
+import java.util.UUID;
+import software.amazon.awssdk.enhanced.dynamodb.TableMetadata;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.StaticTableSchema;
+
+public class FakeItemWithSort {
+    private static final StaticTableSchema<FakeItemWithSort> FAKE_ITEM_MAPPER =
+        StaticTableSchema.builder(FakeItemWithSort.class)
+                         .newItemSupplier(FakeItemWithSort::new)
+                         .addAttribute(String.class, a -> a.name("id")
+                                                           .getter(FakeItemWithSort::getId)
+                                                           .setter(FakeItemWithSort::setId)
+                                                           .tags(primaryPartitionKey()))
+                         .addAttribute(String.class, a -> a.name("sort")
+                                                           .getter(FakeItemWithSort::getSort)
+                                                           .setter(FakeItemWithSort::setSort)
+                                                           .tags(primarySortKey()))
+                         .addAttribute(String.class, a -> a.name("other_attribute_1")
+                                                           .getter(FakeItemWithSort::getOtherAttribute1)
+                                                           .setter(FakeItemWithSort::setOtherAttribute1))
+                         .addAttribute(String.class, a -> a.name("other_attribute_2")
+                                                           .getter(FakeItemWithSort::getOtherAttribute2)
+                                                           .setter(FakeItemWithSort::setOtherAttribute2))
+                         .build();
+
+    private String id;
+    private String sort;
+    private String otherAttribute1;
+    private String otherAttribute2;
+
+    public FakeItemWithSort() {
+    }
+
+    public FakeItemWithSort(String id, String sort, String otherAttribute1, String otherAttribute2) {
+        this.id = id;
+        this.sort = sort;
+        this.otherAttribute1 = otherAttribute1;
+        this.otherAttribute2 = otherAttribute2;
+    }
+
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    public static StaticTableSchema<FakeItemWithSort> getTableSchema() {
+        return FAKE_ITEM_MAPPER;
+    }
+
+    public static TableMetadata getTableMetadata() {
+        return FAKE_ITEM_MAPPER.tableMetadata();
+    }
+
+    public static FakeItemWithSort createUniqueFakeItemWithSort() {
+        return FakeItemWithSort.builder()
+                               .id(UUID.randomUUID().toString())
+                               .sort(UUID.randomUUID().toString())
+                               .build();
+    }
+
+    public static FakeItemWithSort createUniqueFakeItemWithoutSort() {
+        return FakeItemWithSort.builder()
+                               .id(UUID.randomUUID().toString())
+                               .build();
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getSort() {
+        return sort;
+    }
+
+    public void setSort(String sort) {
+        this.sort = sort;
+    }
+
+    public String getOtherAttribute1() {
+        return otherAttribute1;
+    }
+
+    public void setOtherAttribute1(String otherAttribute1) {
+        this.otherAttribute1 = otherAttribute1;
+    }
+
+    public String getOtherAttribute2() {
+        return otherAttribute2;
+    }
+
+    public void setOtherAttribute2(String otherAttribute2) {
+        this.otherAttribute2 = otherAttribute2;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        FakeItemWithSort that = (FakeItemWithSort) o;
+        return Objects.equals(id, that.id) &&
+               Objects.equals(sort, that.sort) &&
+               Objects.equals(otherAttribute1, that.otherAttribute1) &&
+               Objects.equals(otherAttribute2, that.otherAttribute2);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(id, sort, otherAttribute1, otherAttribute2);
+    }
+
+    public static class Builder {
+        private String id;
+        private String sort;
+        private String otherAttribute1;
+        private String otherAttribute2;
+
+        public Builder id(String id) {
+            this.id = id;
+            return this;
+        }
+
+        public Builder sort(String sort) {
+            this.sort = sort;
+            return this;
+        }
+
+        public Builder otherAttribute1(String otherAttribute1) {
+            this.otherAttribute1 = otherAttribute1;
+            return this;
+        }
+
+        public Builder otherAttribute2(String otherAttribute2) {
+            this.otherAttribute2 = otherAttribute2;
+            return this;
+        }
+
+        public FakeItemWithSort build() {
+            return new FakeItemWithSort(id, sort, otherAttribute1, otherAttribute2);
+        }
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/ApplyUserAgentInterceptorTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/ApplyUserAgentInterceptorTest.java
new file mode 100644
index 000000000000..087171a8d6ea
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/ApplyUserAgentInterceptorTest.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2010-2020 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.List;
+import java.util.Optional;
+import org.junit.Test;
+import software.amazon.awssdk.core.RequestOverrideConfiguration;
+import software.amazon.awssdk.core.SdkField;
+import software.amazon.awssdk.core.SdkRequest;
+import software.amazon.awssdk.core.interceptor.ExecutionAttributes;
+import software.amazon.awssdk.core.util.VersionInfo;
+import software.amazon.awssdk.services.dynamodb.model.GetItemRequest;
+
+public class ApplyUserAgentInterceptorTest {
+
+    private ApplyUserAgentInterceptor interceptor = new ApplyUserAgentInterceptor();
+
+    @Test
+    public void ddbRequest_shouldModifyRequest() {
+        GetItemRequest getItemRequest = GetItemRequest.builder().build();
+        SdkRequest sdkRequest = interceptor.modifyRequest(() -> getItemRequest, new ExecutionAttributes());
+
+        RequestOverrideConfiguration requestOverrideConfiguration = sdkRequest.overrideConfiguration().get();
+        assertThat(requestOverrideConfiguration.apiNames()
+                                               .stream()
+                                               .filter(a -> a.name()
+                                                             .equals("hll") &&
+                                                            a.version().equals("ddb-enh")).findAny())
+            .isPresent();
+    }
+
+    @Test
+    public void otherRequest_shouldNotModifyRequest() {
+        SdkRequest someOtherRequest = new SdkRequest() {
+            @Override
+            public List<SdkField<?>> sdkFields() {
+                return null;
+            }
+
+            @Override
+            public Optional<? extends RequestOverrideConfiguration> overrideConfiguration() {
+                return Optional.empty();
+            }
+
+            @Override
+            public Builder toBuilder() {
+                return null;
+            }
+        };
+        SdkRequest sdkRequest = interceptor.modifyRequest(() -> someOtherRequest, new ExecutionAttributes());
+
+        assertThat(sdkRequest).isEqualTo(someOtherRequest);
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/DefaultDocumentTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/DefaultDocumentTest.java
new file mode 100644
index 000000000000..2191e04f6782
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/DefaultDocumentTest.java
@@ -0,0 +1,105 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal;
+
+import static java.util.Collections.emptyMap;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.nullValue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyMap;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import java.util.Map;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+import software.amazon.awssdk.enhanced.dynamodb.Document;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClient;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClientExtension;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbExtensionContext;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbTable;
+import software.amazon.awssdk.enhanced.dynamodb.extensions.ReadModification;
+import software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.FakeItem;
+import software.amazon.awssdk.enhanced.dynamodb.internal.extensions.DefaultDynamoDbExtensionContext;
+import software.amazon.awssdk.enhanced.dynamodb.internal.operations.OperationContext;
+import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+
+@RunWith(MockitoJUnitRunner.class)
+public class DefaultDocumentTest {
+    private static final String TABLE_NAME = "table-name";
+
+    @Mock
+    private DynamoDbClient mockDynamoDbClient;
+
+    @Mock
+    private DynamoDbEnhancedClientExtension mockDynamoDbEnhancedClientExtension;
+
+    private DynamoDbTable<FakeItem> createMappedTable(DynamoDbEnhancedClientExtension dynamoDbEnhancedClientExtension) {
+        return DynamoDbEnhancedClient.builder()
+                                     .dynamoDbClient(mockDynamoDbClient)
+                                     .extensions(dynamoDbEnhancedClientExtension)
+                                     .build()
+                                     .table(TABLE_NAME, FakeItem.getTableSchema());
+    }
+
+    @Test
+    public void noExtension_mapsToItem() {
+        FakeItem fakeItem = FakeItem.createUniqueFakeItem();
+        Map<String, AttributeValue> fakeItemMap = FakeItem.getTableSchema().itemToMap(fakeItem, true);
+        Document defaultDocument = DefaultDocument.create(fakeItemMap);
+
+        assertThat(defaultDocument.getItem(createMappedTable(null)), is(fakeItem));
+    }
+
+    @Test
+    public void extension_mapsToItem() {
+        FakeItem fakeItem = FakeItem.createUniqueFakeItem();
+        FakeItem fakeItem2 = FakeItem.createUniqueFakeItem();
+        Map<String, AttributeValue> fakeItemMap = FakeItem.getTableSchema().itemToMap(fakeItem, true);
+        Map<String, AttributeValue> fakeItemMap2 = FakeItem.getTableSchema().itemToMap(fakeItem2, true);
+        when(mockDynamoDbEnhancedClientExtension.afterRead(any(DynamoDbExtensionContext.AfterRead.class)))
+            .thenReturn(ReadModification.builder().transformedItem(fakeItemMap2).build());
+
+        Document defaultDocument = DefaultDocument.create(fakeItemMap);
+
+        DynamoDbTable<FakeItem> mappedTable = createMappedTable(mockDynamoDbEnhancedClientExtension);
+        assertThat(defaultDocument.getItem(mappedTable), is(fakeItem2));
+        verify(mockDynamoDbEnhancedClientExtension).afterRead(DefaultDynamoDbExtensionContext.builder()
+                                                                                             .tableMetadata(FakeItem.getTableMetadata())
+                                                                                             .operationContext(OperationContext.create(mappedTable.tableName()))
+                                                                                             .items(fakeItemMap).build()
+        );
+    }
+
+    @Test
+    public void nullMapReturnsNullItem() {
+        Document defaultDocument = DefaultDocument.create(null);
+
+        assertThat(defaultDocument.getItem(createMappedTable(null)), is(nullValue()));
+    }
+
+    @Test
+    public void emptyMapReturnsNullItem() {
+        Document defaultDocument = DefaultDocument.create(emptyMap());
+
+        assertThat(defaultDocument.getItem(createMappedTable(null)), is(nullValue()));
+    }
+
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/EnhancedClientUtilsTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/EnhancedClientUtilsTest.java
new file mode 100644
index 000000000000..9ebe94cb28ec
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/EnhancedClientUtilsTest.java
@@ -0,0 +1,60 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+import org.junit.Test;
+import software.amazon.awssdk.enhanced.dynamodb.Key;
+import software.amazon.awssdk.enhanced.dynamodb.TableMetadata;
+import software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.FakeItem;
+import software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.FakeItemWithSort;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+
+public class EnhancedClientUtilsTest {
+    private static final AttributeValue PARTITION_VALUE = AttributeValue.builder().s("id123").build();
+    private static final AttributeValue SORT_VALUE = AttributeValue.builder().s("sort123").build();
+
+    @Test
+    public void createKeyFromMap_partitionOnly() {
+        Map<String, AttributeValue> itemMap = new HashMap<>();
+        itemMap.put("id", PARTITION_VALUE);
+
+        Key key = EnhancedClientUtils.createKeyFromMap(itemMap,
+                                                       FakeItem.getTableSchema(),
+                                                       TableMetadata.primaryIndexName());
+
+        assertThat(key.partitionKeyValue()).isEqualTo(PARTITION_VALUE);
+        assertThat(key.sortKeyValue()).isEmpty();
+    }
+
+    @Test
+    public void createKeyFromMap_partitionAndSort() {
+        Map<String, AttributeValue> itemMap = new HashMap<>();
+        itemMap.put("id", PARTITION_VALUE);
+        itemMap.put("sort", SORT_VALUE);
+
+        Key key = EnhancedClientUtils.createKeyFromMap(itemMap,
+                                                       FakeItemWithSort.getTableSchema(),
+                                                       TableMetadata.primaryIndexName());
+
+        assertThat(key.partitionKeyValue()).isEqualTo(PARTITION_VALUE);
+        assertThat(key.sortKeyValue()).isEqualTo(Optional.of(SORT_VALUE));
+    }
+}
\ No newline at end of file
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/client/DefaultDynamoDbAsyncIndexTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/client/DefaultDynamoDbAsyncIndexTest.java
new file mode 100644
index 000000000000..127f6f4a774d
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/client/DefaultDynamoDbAsyncIndexTest.java
@@ -0,0 +1,71 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.client;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+import static software.amazon.awssdk.enhanced.dynamodb.internal.AttributeValues.stringValue;
+
+import java.util.Optional;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClientExtension;
+import software.amazon.awssdk.enhanced.dynamodb.Key;
+import software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.FakeItemWithIndices;
+import software.amazon.awssdk.services.dynamodb.DynamoDbAsyncClient;
+
+@RunWith(MockitoJUnitRunner.class)
+public class DefaultDynamoDbAsyncIndexTest {
+    @Mock
+    private DynamoDbAsyncClient mockDynamoDbAsyncClient;
+
+    @Mock
+    private DynamoDbEnhancedClientExtension mockDynamoDbEnhancedClientExtension;
+
+    @Test
+    public void keyFrom_secondaryIndex_partitionAndSort() {
+        FakeItemWithIndices item = FakeItemWithIndices.createUniqueFakeItemWithIndices();
+        DefaultDynamoDbAsyncIndex<FakeItemWithIndices> dynamoDbMappedIndex =
+            new DefaultDynamoDbAsyncIndex<>(mockDynamoDbAsyncClient,
+                                            mockDynamoDbEnhancedClientExtension,
+                                            FakeItemWithIndices.getTableSchema(),
+                                            "test_table",
+                                            "gsi_1");
+
+        Key key = dynamoDbMappedIndex.keyFrom(item);
+
+        assertThat(key.partitionKeyValue(), is(stringValue(item.getGsiId())));
+        assertThat(key.sortKeyValue(), is(Optional.of(stringValue(item.getGsiSort()))));
+    }
+
+    @Test
+    public void keyFrom_secondaryIndex_partitionOnly() {
+        FakeItemWithIndices item = FakeItemWithIndices.createUniqueFakeItemWithIndices();
+        DefaultDynamoDbAsyncIndex<FakeItemWithIndices> dynamoDbMappedIndex =
+            new DefaultDynamoDbAsyncIndex<>(mockDynamoDbAsyncClient,
+                                            mockDynamoDbEnhancedClientExtension,
+                                            FakeItemWithIndices.getTableSchema(),
+                                            "test_table",
+                                            "gsi_2");
+
+        Key key = dynamoDbMappedIndex.keyFrom(item);
+
+        assertThat(key.partitionKeyValue(), is(stringValue(item.getGsiId())));
+        assertThat(key.sortKeyValue(), is(Optional.empty()));
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/client/DefaultDynamoDbAsyncTableTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/client/DefaultDynamoDbAsyncTableTest.java
new file mode 100644
index 000000000000..cbf1b7acba56
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/client/DefaultDynamoDbAsyncTableTest.java
@@ -0,0 +1,116 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.client;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.sameInstance;
+import static software.amazon.awssdk.enhanced.dynamodb.internal.AttributeValues.stringValue;
+
+import java.util.Optional;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClientExtension;
+import software.amazon.awssdk.enhanced.dynamodb.Key;
+import software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.FakeItem;
+import software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.FakeItemWithIndices;
+import software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.FakeItemWithSort;
+import software.amazon.awssdk.services.dynamodb.DynamoDbAsyncClient;
+
+@RunWith(MockitoJUnitRunner.class)
+public class DefaultDynamoDbAsyncTableTest {
+    private static final String TABLE_NAME = "table-name";
+
+    @Mock
+    private DynamoDbAsyncClient mockDynamoDbAsyncClient;
+
+    @Mock
+    private DynamoDbEnhancedClientExtension mockDynamoDbEnhancedClientExtension;
+
+    @Test
+    public void index_constructsCorrectMappedIndex() {
+        DefaultDynamoDbAsyncTable<FakeItemWithIndices> dynamoDbMappedTable =
+            new DefaultDynamoDbAsyncTable<>(mockDynamoDbAsyncClient,
+                                            mockDynamoDbEnhancedClientExtension,
+                                            FakeItemWithIndices.getTableSchema(),
+                                            TABLE_NAME);
+
+        DefaultDynamoDbAsyncIndex<FakeItemWithIndices> dynamoDbMappedIndex = dynamoDbMappedTable.index("gsi_1");
+
+        assertThat(dynamoDbMappedIndex.dynamoDbClient(), is(sameInstance(mockDynamoDbAsyncClient)));
+        assertThat(dynamoDbMappedIndex.mapperExtension(), is(sameInstance(mockDynamoDbEnhancedClientExtension)));
+        assertThat(dynamoDbMappedIndex.tableSchema(), is(sameInstance(FakeItemWithIndices.getTableSchema())));
+        assertThat(dynamoDbMappedIndex.indexName(), is("gsi_1"));
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void index_invalidIndex_throwsIllegalArgumentException() {
+        DefaultDynamoDbAsyncTable<FakeItemWithIndices> dynamoDbMappedTable =
+            new DefaultDynamoDbAsyncTable<>(mockDynamoDbAsyncClient,
+                                            mockDynamoDbEnhancedClientExtension,
+                                            FakeItemWithIndices.getTableSchema(),
+                                            TABLE_NAME);
+
+        dynamoDbMappedTable.index("invalid");
+    }
+
+    @Test
+    public void keyFrom_primaryIndex_partitionAndSort() {
+        FakeItemWithSort item = FakeItemWithSort.createUniqueFakeItemWithSort();
+        DefaultDynamoDbAsyncTable<FakeItemWithSort> dynamoDbMappedIndex =
+            new DefaultDynamoDbAsyncTable<>(mockDynamoDbAsyncClient,
+                                            mockDynamoDbEnhancedClientExtension,
+                                            FakeItemWithSort.getTableSchema(),
+                                            "test_table");
+
+        Key key = dynamoDbMappedIndex.keyFrom(item);
+
+        assertThat(key.partitionKeyValue(), is(stringValue(item.getId())));
+        assertThat(key.sortKeyValue(), is(Optional.of(stringValue(item.getSort()))));
+    }
+
+    @Test
+    public void keyFrom_primaryIndex_partitionOnly() {
+        FakeItem item = FakeItem.createUniqueFakeItem();
+        DefaultDynamoDbAsyncTable<FakeItem> dynamoDbMappedIndex =
+            new DefaultDynamoDbAsyncTable<>(mockDynamoDbAsyncClient,
+                                            mockDynamoDbEnhancedClientExtension,
+                                            FakeItem.getTableSchema(),
+                                            "test_table");
+
+        Key key = dynamoDbMappedIndex.keyFrom(item);
+
+        assertThat(key.partitionKeyValue(), is(stringValue(item.getId())));
+        assertThat(key.sortKeyValue(), is(Optional.empty()));
+    }
+
+    @Test
+    public void keyFrom_primaryIndex_partitionAndNullSort() {
+        FakeItemWithSort item = FakeItemWithSort.createUniqueFakeItemWithoutSort();
+        DefaultDynamoDbAsyncTable<FakeItemWithSort> dynamoDbMappedIndex =
+            new DefaultDynamoDbAsyncTable<>(mockDynamoDbAsyncClient,
+                                            mockDynamoDbEnhancedClientExtension,
+                                            FakeItemWithSort.getTableSchema(),
+                                            "test_table");
+
+        Key key = dynamoDbMappedIndex.keyFrom(item);
+
+        assertThat(key.partitionKeyValue(), is(stringValue(item.getId())));
+        assertThat(key.sortKeyValue(), is(Optional.empty()));
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/client/DefaultDynamoDbEnhancedAsyncClientTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/client/DefaultDynamoDbEnhancedAsyncClientTest.java
new file mode 100644
index 000000000000..c187247af768
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/client/DefaultDynamoDbEnhancedAsyncClientTest.java
@@ -0,0 +1,120 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.client;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.instanceOf;
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertNotNull;
+
+import java.util.Arrays;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClientExtension;
+import software.amazon.awssdk.enhanced.dynamodb.TableSchema;
+import software.amazon.awssdk.enhanced.dynamodb.extensions.VersionedRecordExtension;
+import software.amazon.awssdk.enhanced.dynamodb.internal.extensions.ChainExtension;
+import software.amazon.awssdk.services.dynamodb.DynamoDbAsyncClient;
+
+@RunWith(MockitoJUnitRunner.class)
+public class DefaultDynamoDbEnhancedAsyncClientTest {
+    @Mock
+    private DynamoDbAsyncClient mockDynamoDbAsyncClient;
+    @Mock
+    private DynamoDbEnhancedClientExtension mockDynamoDbEnhancedClientExtension;
+    @Mock
+    private DynamoDbEnhancedClientExtension mockDynamoDbEnhancedClientExtension2;
+    @Mock
+    private TableSchema<Object> mockTableSchema;
+
+    private DefaultDynamoDbEnhancedAsyncClient dynamoDbEnhancedAsyncClient;
+
+    @Before
+    public void initializeClient() {
+        this.dynamoDbEnhancedAsyncClient =
+            DefaultDynamoDbEnhancedAsyncClient.builder()
+                                              .dynamoDbClient(mockDynamoDbAsyncClient)
+                                              .extensions(mockDynamoDbEnhancedClientExtension)
+                                              .build();
+    }
+
+    @Test
+    public void table() {
+        DefaultDynamoDbAsyncTable<Object> mappedTable = dynamoDbEnhancedAsyncClient.table("table-name", mockTableSchema);
+
+        assertThat(mappedTable.dynamoDbClient(), is(mockDynamoDbAsyncClient));
+        assertThat(mappedTable.mapperExtension(), is(mockDynamoDbEnhancedClientExtension));
+        assertThat(mappedTable.tableSchema(), is(mockTableSchema));
+        assertThat(mappedTable.tableName(), is("table-name"));
+    }
+
+    @Test
+    public void builder_minimal() {
+        DefaultDynamoDbEnhancedAsyncClient builtObject =
+            DefaultDynamoDbEnhancedAsyncClient.builder()
+                                              .dynamoDbClient(mockDynamoDbAsyncClient)
+                                              .build();
+
+        assertThat(builtObject.dynamoDbAsyncClient(), is(mockDynamoDbAsyncClient));
+        assertThat(builtObject.mapperExtension(), instanceOf(VersionedRecordExtension.class));
+    }
+
+    @Test
+    public void builder_maximal() {
+        DefaultDynamoDbEnhancedAsyncClient builtObject =
+            DefaultDynamoDbEnhancedAsyncClient.builder()
+                                              .dynamoDbClient(mockDynamoDbAsyncClient)
+                                              .extensions(mockDynamoDbEnhancedClientExtension)
+                                              .build();
+
+        assertThat(builtObject.dynamoDbAsyncClient(), is(mockDynamoDbAsyncClient));
+        assertThat(builtObject.mapperExtension(), is(mockDynamoDbEnhancedClientExtension));
+    }
+
+    @Test
+    public void builder_multipleExtensions_varargs() {
+        DefaultDynamoDbEnhancedAsyncClient builtObject =
+            DefaultDynamoDbEnhancedAsyncClient.builder()
+                                         .dynamoDbClient(mockDynamoDbAsyncClient)
+                                         .extensions(mockDynamoDbEnhancedClientExtension, mockDynamoDbEnhancedClientExtension2)
+                                         .build();
+
+        assertThat(builtObject.dynamoDbAsyncClient(), is(mockDynamoDbAsyncClient));
+        assertThat(builtObject.mapperExtension(), instanceOf(ChainExtension.class));
+    }
+
+    @Test
+    public void builder_multipleExtensions_list() {
+        DefaultDynamoDbEnhancedAsyncClient builtObject =
+            DefaultDynamoDbEnhancedAsyncClient.builder()
+                                         .dynamoDbClient(mockDynamoDbAsyncClient)
+                                         .extensions(Arrays.asList(mockDynamoDbEnhancedClientExtension, mockDynamoDbEnhancedClientExtension2))
+                                         .build();
+
+        assertThat(builtObject.dynamoDbAsyncClient(), is(mockDynamoDbAsyncClient));
+        assertThat(builtObject.mapperExtension(), instanceOf(ChainExtension.class));
+    }
+
+    @Test
+    public void toBuilder() {
+        DefaultDynamoDbEnhancedAsyncClient copiedObject = dynamoDbEnhancedAsyncClient.toBuilder().build();
+
+        assertThat(copiedObject, is(dynamoDbEnhancedAsyncClient));
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/client/DefaultDynamoDbEnhancedClientTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/client/DefaultDynamoDbEnhancedClientTest.java
new file mode 100644
index 000000000000..645148334674
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/client/DefaultDynamoDbEnhancedClientTest.java
@@ -0,0 +1,119 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.client;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.instanceOf;
+import static org.hamcrest.Matchers.is;
+
+import java.util.Arrays;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClientExtension;
+import software.amazon.awssdk.enhanced.dynamodb.TableSchema;
+import software.amazon.awssdk.enhanced.dynamodb.extensions.VersionedRecordExtension;
+import software.amazon.awssdk.enhanced.dynamodb.internal.extensions.ChainExtension;
+import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
+
+@RunWith(MockitoJUnitRunner.class)
+public class DefaultDynamoDbEnhancedClientTest {
+    @Mock
+    private DynamoDbClient mockDynamoDbClient;
+
+    @Mock
+    private DynamoDbEnhancedClientExtension mockDynamoDbEnhancedClientExtension;
+
+    @Mock
+    private DynamoDbEnhancedClientExtension mockDynamoDbEnhancedClientExtension2;
+
+    @Mock
+    private TableSchema<Object> mockTableSchema;
+
+    private DefaultDynamoDbEnhancedClient dynamoDbEnhancedClient;
+
+    @Before
+    public void initializeClient() {
+        this.dynamoDbEnhancedClient = DefaultDynamoDbEnhancedClient.builder()
+                                                                   .dynamoDbClient(mockDynamoDbClient)
+                                                                   .extensions(mockDynamoDbEnhancedClientExtension)
+                                                                   .build();
+    }
+
+    @Test
+    public void table() {
+        DefaultDynamoDbTable<Object> mappedTable = dynamoDbEnhancedClient.table("table-name", mockTableSchema);
+
+        assertThat(mappedTable.dynamoDbClient(), is(mockDynamoDbClient));
+        assertThat(mappedTable.mapperExtension(), is(mockDynamoDbEnhancedClientExtension));
+        assertThat(mappedTable.tableSchema(), is(mockTableSchema));
+        assertThat(mappedTable.tableName(), is("table-name"));
+    }
+
+    @Test
+    public void builder_minimal() {
+        DefaultDynamoDbEnhancedClient builtObject = DefaultDynamoDbEnhancedClient.builder()
+                                                                                 .dynamoDbClient(mockDynamoDbClient)
+                                                                                 .build();
+
+        assertThat(builtObject.dynamoDbClient(), is(mockDynamoDbClient));
+        assertThat(builtObject.mapperExtension(), instanceOf(VersionedRecordExtension.class));
+    }
+
+    @Test
+    public void builder_maximal() {
+        DefaultDynamoDbEnhancedClient builtObject = DefaultDynamoDbEnhancedClient.builder()
+                                                                                 .dynamoDbClient(mockDynamoDbClient)
+                                                                                 .extensions(mockDynamoDbEnhancedClientExtension)
+                                                                                 .build();
+
+        assertThat(builtObject.dynamoDbClient(), is(mockDynamoDbClient));
+        assertThat(builtObject.mapperExtension(), is(mockDynamoDbEnhancedClientExtension));
+    }
+
+    @Test
+    public void builder_multipleExtensions_varargs() {
+        DefaultDynamoDbEnhancedClient builtObject =
+            DefaultDynamoDbEnhancedClient.builder()
+                                         .dynamoDbClient(mockDynamoDbClient)
+                                         .extensions(mockDynamoDbEnhancedClientExtension, mockDynamoDbEnhancedClientExtension2)
+                                         .build();
+
+        assertThat(builtObject.dynamoDbClient(), is(mockDynamoDbClient));
+        assertThat(builtObject.mapperExtension(), instanceOf(ChainExtension.class));
+    }
+
+    @Test
+    public void builder_multipleExtensions_list() {
+        DefaultDynamoDbEnhancedClient builtObject =
+            DefaultDynamoDbEnhancedClient.builder()
+                                         .dynamoDbClient(mockDynamoDbClient)
+                                         .extensions(Arrays.asList(mockDynamoDbEnhancedClientExtension, mockDynamoDbEnhancedClientExtension2))
+                                         .build();
+
+        assertThat(builtObject.dynamoDbClient(), is(mockDynamoDbClient));
+        assertThat(builtObject.mapperExtension(), instanceOf(ChainExtension.class));
+    }
+
+    @Test
+    public void toBuilder() {
+        DefaultDynamoDbEnhancedClient copiedObject = dynamoDbEnhancedClient.toBuilder().build();
+
+        assertThat(copiedObject, is(dynamoDbEnhancedClient));
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/client/DefaultDynamoDbIndexTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/client/DefaultDynamoDbIndexTest.java
new file mode 100644
index 000000000000..30ee03983858
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/client/DefaultDynamoDbIndexTest.java
@@ -0,0 +1,71 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.client;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+import static software.amazon.awssdk.enhanced.dynamodb.internal.AttributeValues.stringValue;
+
+import java.util.Optional;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClientExtension;
+import software.amazon.awssdk.enhanced.dynamodb.Key;
+import software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.FakeItemWithIndices;
+import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
+
+@RunWith(MockitoJUnitRunner.class)
+public class DefaultDynamoDbIndexTest {
+    @Mock
+    private DynamoDbClient mockDynamoDbClient;
+
+    @Mock
+    private DynamoDbEnhancedClientExtension mockDynamoDbEnhancedClientExtension;
+
+    @Test
+    public void keyFrom_secondaryIndex_partitionAndSort() {
+        FakeItemWithIndices item = FakeItemWithIndices.createUniqueFakeItemWithIndices();
+        DefaultDynamoDbIndex<FakeItemWithIndices> dynamoDbMappedIndex =
+            new DefaultDynamoDbIndex<>(mockDynamoDbClient,
+                                       mockDynamoDbEnhancedClientExtension,
+                                       FakeItemWithIndices.getTableSchema(),
+                                       "test_table",
+                                       "gsi_1");
+
+        Key key = dynamoDbMappedIndex.keyFrom(item);
+
+        assertThat(key.partitionKeyValue(), is(stringValue(item.getGsiId())));
+        assertThat(key.sortKeyValue(), is(Optional.of(stringValue(item.getGsiSort()))));
+    }
+
+    @Test
+    public void keyFrom_secondaryIndex_partitionOnly() {
+        FakeItemWithIndices item = FakeItemWithIndices.createUniqueFakeItemWithIndices();
+        DefaultDynamoDbIndex<FakeItemWithIndices> dynamoDbMappedIndex =
+            new DefaultDynamoDbIndex<>(mockDynamoDbClient,
+                                       mockDynamoDbEnhancedClientExtension,
+                                       FakeItemWithIndices.getTableSchema(),
+                                       "test_table",
+                                       "gsi_2");
+
+        Key key = dynamoDbMappedIndex.keyFrom(item);
+
+        assertThat(key.partitionKeyValue(), is(stringValue(item.getGsiId())));
+        assertThat(key.sortKeyValue(), is(Optional.empty()));
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/client/DefaultDynamoDbTableTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/client/DefaultDynamoDbTableTest.java
new file mode 100644
index 000000000000..b268f2928855
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/client/DefaultDynamoDbTableTest.java
@@ -0,0 +1,116 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.client;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.sameInstance;
+import static software.amazon.awssdk.enhanced.dynamodb.internal.AttributeValues.stringValue;
+
+import java.util.Optional;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClientExtension;
+import software.amazon.awssdk.enhanced.dynamodb.Key;
+import software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.FakeItem;
+import software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.FakeItemWithIndices;
+import software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.FakeItemWithSort;
+import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
+
+@RunWith(MockitoJUnitRunner.class)
+public class DefaultDynamoDbTableTest {
+    private static final String TABLE_NAME = "table-name";
+
+    @Mock
+    private DynamoDbClient mockDynamoDbClient;
+
+    @Mock
+    private DynamoDbEnhancedClientExtension mockDynamoDbEnhancedClientExtension;
+
+    @Test
+    public void index_constructsCorrectMappedIndex() {
+        DefaultDynamoDbTable<FakeItemWithIndices> dynamoDbMappedTable =
+            new DefaultDynamoDbTable<>(mockDynamoDbClient,
+                                       mockDynamoDbEnhancedClientExtension,
+                                       FakeItemWithIndices.getTableSchema(),
+                                       TABLE_NAME);
+
+        DefaultDynamoDbIndex<FakeItemWithIndices> dynamoDbMappedIndex = dynamoDbMappedTable.index("gsi_1");
+
+        assertThat(dynamoDbMappedIndex.dynamoDbClient(), is(sameInstance(mockDynamoDbClient)));
+        assertThat(dynamoDbMappedIndex.mapperExtension(), is(sameInstance(mockDynamoDbEnhancedClientExtension)));
+        assertThat(dynamoDbMappedIndex.tableSchema(), is(sameInstance(FakeItemWithIndices.getTableSchema())));
+        assertThat(dynamoDbMappedIndex.indexName(), is("gsi_1"));
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void index_invalidIndex_throwsIllegalArgumentException() {
+        DefaultDynamoDbTable<FakeItemWithIndices> dynamoDbMappedTable =
+            new DefaultDynamoDbTable<>(mockDynamoDbClient,
+                                       mockDynamoDbEnhancedClientExtension,
+                                       FakeItemWithIndices.getTableSchema(),
+                                       TABLE_NAME);
+
+        dynamoDbMappedTable.index("invalid");
+    }
+
+    @Test
+    public void keyFrom_primaryIndex_partitionAndSort() {
+        FakeItemWithSort item = FakeItemWithSort.createUniqueFakeItemWithSort();
+        DefaultDynamoDbTable<FakeItemWithSort> dynamoDbMappedIndex =
+            new DefaultDynamoDbTable<>(mockDynamoDbClient,
+                                       mockDynamoDbEnhancedClientExtension,
+                                       FakeItemWithSort.getTableSchema(),
+                                       "test_table");
+
+        Key key = dynamoDbMappedIndex.keyFrom(item);
+
+        assertThat(key.partitionKeyValue(), is(stringValue(item.getId())));
+        assertThat(key.sortKeyValue(), is(Optional.of(stringValue(item.getSort()))));
+    }
+
+    @Test
+    public void keyFrom_primaryIndex_partitionOnly() {
+        FakeItem item = FakeItem.createUniqueFakeItem();
+        DefaultDynamoDbTable<FakeItem> dynamoDbMappedIndex =
+            new DefaultDynamoDbTable<>(mockDynamoDbClient,
+                                       mockDynamoDbEnhancedClientExtension,
+                                       FakeItem.getTableSchema(),
+                                       "test_table");
+
+        Key key = dynamoDbMappedIndex.keyFrom(item);
+
+        assertThat(key.partitionKeyValue(), is(stringValue(item.getId())));
+        assertThat(key.sortKeyValue(), is(Optional.empty()));
+    }
+
+    @Test
+    public void keyFrom_primaryIndex_partitionAndNullSort() {
+        FakeItemWithSort item = FakeItemWithSort.createUniqueFakeItemWithoutSort();
+        DefaultDynamoDbTable<FakeItemWithSort> dynamoDbMappedIndex =
+            new DefaultDynamoDbTable<>(mockDynamoDbClient,
+                                       mockDynamoDbEnhancedClientExtension,
+                                       FakeItemWithSort.getTableSchema(),
+                                       "test_table");
+
+        Key key = dynamoDbMappedIndex.keyFrom(item);
+
+        assertThat(key.partitionKeyValue(), is(stringValue(item.getId())));
+        assertThat(key.sortKeyValue(), is(Optional.empty()));
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/client/ExtensionResolverTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/client/ExtensionResolverTest.java
new file mode 100644
index 000000000000..71f79b12d097
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/client/ExtensionResolverTest.java
@@ -0,0 +1,99 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.client;
+
+import static java.util.Collections.emptyList;
+import static java.util.Collections.singletonList;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.util.Arrays;
+import java.util.List;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InOrder;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.junit.MockitoJUnitRunner;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClientExtension;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbExtensionContext;
+import software.amazon.awssdk.enhanced.dynamodb.extensions.ReadModification;
+import software.amazon.awssdk.enhanced.dynamodb.extensions.WriteModification;
+
+@RunWith(MockitoJUnitRunner.class)
+public class ExtensionResolverTest {
+    @Mock
+    private DynamoDbEnhancedClientExtension mockExtension1;
+    @Mock
+    private DynamoDbEnhancedClientExtension mockExtension2;
+
+    @Before
+    public void stubMocks() {
+        when(mockExtension1.beforeWrite(any(DynamoDbExtensionContext.BeforeWrite.class))).thenReturn(WriteModification.builder().build());
+        when(mockExtension2.beforeWrite(any(DynamoDbExtensionContext.BeforeWrite.class))).thenReturn(WriteModification.builder().build());
+        when(mockExtension1.afterRead(any(DynamoDbExtensionContext.AfterRead.class))).thenReturn(ReadModification.builder().build());
+        when(mockExtension2.afterRead(any(DynamoDbExtensionContext.AfterRead.class))).thenReturn(ReadModification.builder().build());
+    }
+
+    @Test
+    public void resolveExtensions_null() {
+        assertThat(ExtensionResolver.resolveExtensions(null)).isNull();
+    }
+
+    @Test
+    public void resolveExtensions_empty() {
+        assertThat(ExtensionResolver.resolveExtensions(emptyList())).isNull();
+    }
+
+    @Test
+    public void resolveExtensions_singleton() {
+        assertThat(ExtensionResolver.resolveExtensions(singletonList(mockExtension1))).isSameAs(mockExtension1);
+    }
+
+    @Test
+    public void resolveExtensions_multiple_beforeWrite_correctCallingOrder() {
+        DynamoDbEnhancedClientExtension extension =
+            ExtensionResolver.resolveExtensions(Arrays.asList(mockExtension1, mockExtension2));
+
+        extension.beforeWrite(mock(DynamoDbExtensionContext.BeforeWrite.class));
+        InOrder inOrder = Mockito.inOrder(mockExtension1, mockExtension2);
+        inOrder.verify(mockExtension1).beforeWrite(any(DynamoDbExtensionContext.BeforeWrite.class));
+        inOrder.verify(mockExtension2).beforeWrite(any(DynamoDbExtensionContext.BeforeWrite.class));
+        inOrder.verifyNoMoreInteractions();
+    }
+
+    @Test
+    public void resolveExtensions_multiple_afterRead_correctCallingOrder() {
+        DynamoDbEnhancedClientExtension extension =
+            ExtensionResolver.resolveExtensions(Arrays.asList(mockExtension1, mockExtension2));
+
+        extension.afterRead(mock(DynamoDbExtensionContext.AfterRead.class));
+        InOrder inOrder = Mockito.inOrder(mockExtension1, mockExtension2);
+        inOrder.verify(mockExtension2).afterRead(any(DynamoDbExtensionContext.AfterRead.class));
+        inOrder.verify(mockExtension1).afterRead(any(DynamoDbExtensionContext.AfterRead.class));
+        inOrder.verifyNoMoreInteractions();
+    }
+
+    @Test
+    public void defaultExtensions_isImmutable() {
+        List<DynamoDbEnhancedClientExtension> defaultExtensions = ExtensionResolver.defaultExtensions();
+        assertThatThrownBy(() -> defaultExtensions.add(mockExtension1)).isInstanceOf(UnsupportedOperationException.class);
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/ChainConverterProviderTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/ChainConverterProviderTest.java
new file mode 100644
index 000000000000..069ae50a2d4b
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/ChainConverterProviderTest.java
@@ -0,0 +1,75 @@
+package software.amazon.awssdk.enhanced.dynamodb.internal.converter;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.when;
+
+import java.util.List;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeConverterProvider;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+
+@RunWith(MockitoJUnitRunner.class)
+public class ChainConverterProviderTest {
+
+    @Mock
+    private AttributeConverterProvider mockConverterProvider1;
+
+    @Mock
+    private AttributeConverterProvider mockConverterProvider2;
+
+    @Mock
+    private AttributeConverter mockAttributeConverter1;
+
+    @Mock
+    private AttributeConverter mockAttributeConverter2;
+
+    @Test
+    public void checkSingleProviderChain() {
+        ChainConverterProvider chain = ChainConverterProvider.create(mockConverterProvider1);
+        List providerQueue = chain.chainedProviders();
+        assertThat(providerQueue.size()).isEqualTo(1);
+        assertThat(providerQueue.get(0)).isEqualTo(mockConverterProvider1);
+    }
+
+    @Test
+    public void checkMultipleProviderChain() {
+        ChainConverterProvider chain = ChainConverterProvider.create(mockConverterProvider1, mockConverterProvider2);
+        List providerQueue = chain.chainedProviders();
+        assertThat(providerQueue.size()).isEqualTo(2);
+        assertThat(providerQueue.get(0)).isEqualTo(mockConverterProvider1);
+        assertThat(providerQueue.get(1)).isEqualTo(mockConverterProvider2);
+    }
+
+    @Test
+    public void resolveSingleProviderChain() {
+        when(mockConverterProvider1.converterFor(any())).thenReturn(mockAttributeConverter1);
+        ChainConverterProvider chain = ChainConverterProvider.create(mockConverterProvider1);
+        assertThat(chain.converterFor(EnhancedType.of(String.class))).isSameAs(mockAttributeConverter1);
+    }
+
+    @Test
+    public void resolveMultipleProviderChain_noMatch() {
+        ChainConverterProvider chain = ChainConverterProvider.create(mockConverterProvider1, mockConverterProvider2);
+        assertThat(chain.converterFor(EnhancedType.of(String.class))).isNull();
+    }
+
+    @Test
+    public void resolveMultipleProviderChain_matchSecond() {
+        when(mockConverterProvider2.converterFor(any())).thenReturn(mockAttributeConverter2);
+        ChainConverterProvider chain = ChainConverterProvider.create(mockConverterProvider1, mockConverterProvider2);
+        assertThat(chain.converterFor(EnhancedType.of(String.class))).isSameAs(mockAttributeConverter2);
+    }
+
+    @Test
+    public void resolveMultipleProviderChain_matchFirst() {
+        when(mockConverterProvider1.converterFor(any())).thenReturn(mockAttributeConverter1);
+        ChainConverterProvider chain = ChainConverterProvider.create(mockConverterProvider1, mockConverterProvider2);
+        assertThat(chain.converterFor(EnhancedType.of(String.class))).isSameAs(mockAttributeConverter1);
+    }
+
+}
\ No newline at end of file
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/ConverterProviderResolverTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/ConverterProviderResolverTest.java
new file mode 100644
index 000000000000..0cd3294c085a
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/ConverterProviderResolverTest.java
@@ -0,0 +1,55 @@
+package software.amazon.awssdk.enhanced.dynamodb.internal.converter;
+
+import static java.util.Collections.emptyList;
+import static java.util.Collections.singletonList;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.Arrays;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeConverterProvider;
+import software.amazon.awssdk.enhanced.dynamodb.DefaultAttributeConverterProvider;
+
+@RunWith(MockitoJUnitRunner.class)
+public class ConverterProviderResolverTest {
+
+    @Mock
+    private AttributeConverterProvider mockConverterProvider1;
+
+    @Mock
+    private AttributeConverterProvider mockConverterProvider2;
+
+    @Test
+    public void resolveProviders_null() {
+        assertThat(ConverterProviderResolver.resolveProviders(null)).isNull();
+    }
+
+    @Test
+    public void resolveProviders_empty() {
+        assertThat(ConverterProviderResolver.resolveProviders(emptyList())).isNull();
+    }
+
+    @Test
+    public void resolveProviders_singleton() {
+        assertThat(ConverterProviderResolver.resolveProviders(singletonList(mockConverterProvider1)))
+            .isSameAs(mockConverterProvider1);
+    }
+
+    @Test
+    public void resolveProviders_multiple() {
+        AttributeConverterProvider result = ConverterProviderResolver.resolveProviders(
+            Arrays.asList(mockConverterProvider1, mockConverterProvider2));
+        assertThat(result).isNotNull();
+        assertThat(result).isInstanceOf(ChainConverterProvider.class);
+    }
+
+    @Test
+    public void defaultProvider_returnsInstance() {
+        AttributeConverterProvider defaultProvider = ConverterProviderResolver.defaultConverterProvider();
+        assertThat(defaultProvider).isNotNull();
+        assertThat(defaultProvider).isInstanceOf(DefaultAttributeConverterProvider.class);
+    }
+
+}
\ No newline at end of file
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/BatchGetItemOperationTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/BatchGetItemOperationTest.java
new file mode 100644
index 000000000000..866a237e5784
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/BatchGetItemOperationTest.java
@@ -0,0 +1,357 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.operations;
+
+import static java.util.Collections.emptyList;
+import static java.util.Collections.emptyMap;
+import static java.util.Collections.singletonList;
+import static java.util.Collections.singletonMap;
+import static java.util.stream.Collectors.toList;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsInAnyOrder;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.nullValue;
+import static org.hamcrest.Matchers.sameInstance;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.argThat;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
+import static software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.FakeItem.createUniqueFakeItem;
+import static software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.FakeItemWithSort.createUniqueFakeItemWithSort;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.IntStream;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+import software.amazon.awssdk.core.pagination.sync.SdkIterable;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClient;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClientExtension;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbTable;
+import software.amazon.awssdk.enhanced.dynamodb.Key;
+import software.amazon.awssdk.enhanced.dynamodb.extensions.ReadModification;
+import software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.FakeItem;
+import software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.FakeItemWithSort;
+import software.amazon.awssdk.enhanced.dynamodb.model.BatchGetItemEnhancedRequest;
+import software.amazon.awssdk.enhanced.dynamodb.model.BatchGetResultPage;
+import software.amazon.awssdk.enhanced.dynamodb.model.GetItemEnhancedRequest;
+import software.amazon.awssdk.enhanced.dynamodb.model.ReadBatch;
+import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+import software.amazon.awssdk.services.dynamodb.model.BatchGetItemRequest;
+import software.amazon.awssdk.services.dynamodb.model.BatchGetItemResponse;
+import software.amazon.awssdk.services.dynamodb.model.KeysAndAttributes;
+import software.amazon.awssdk.services.dynamodb.paginators.BatchGetItemIterable;
+
+@RunWith(MockitoJUnitRunner.class)
+public class BatchGetItemOperationTest {
+    private static final String TABLE_NAME = "table-name";
+    private static final String TABLE_NAME_2 = "table-name-2";
+
+    private static final List<FakeItem> FAKE_ITEMS =
+        IntStream.range(0, 6).mapToObj($ -> createUniqueFakeItem()).collect(toList());
+    private static final List<Map<String, AttributeValue>> FAKE_ITEM_MAPS = FAKE_ITEMS.stream().map(item ->
+        FakeItem.getTableSchema().itemToMap(item, FakeItem.getTableMetadata().primaryKeys())).collect(toList());
+    private static final List<FakeItemWithSort> FAKESORT_ITEMS =
+        IntStream.range(0, 6).mapToObj($ -> createUniqueFakeItemWithSort()).collect(toList());
+    private static final List<Map<String, AttributeValue>> FAKESORT_ITEM_MAPS = FAKESORT_ITEMS.stream().map(item ->
+        FakeItemWithSort.getTableSchema().itemToMap(item, FakeItemWithSort.getTableMetadata().primaryKeys()))
+          .collect(toList());
+    private static final List<Key> FAKE_ITEM_KEYS =
+        FAKE_ITEMS.stream().map(fakeItem -> Key.builder().partitionValue(fakeItem.getId()).build()).collect(toList());
+    private static final List<Key> FAKESORT_ITEM_KEYS =
+        FAKESORT_ITEMS.stream()
+                      .map(fakeItemWithSort -> Key.builder()
+                                                  .partitionValue(fakeItemWithSort.getId())
+                                                  .sortValue(fakeItemWithSort.getSort())
+                                                  .build())
+                      .collect(toList());
+
+    @Mock
+    private DynamoDbClient mockDynamoDbClient;
+
+    @Mock
+    private DynamoDbEnhancedClientExtension mockExtension;
+
+    private DynamoDbEnhancedClient enhancedClient;
+    private DynamoDbTable<FakeItem> fakeItemMappedTable;
+    private DynamoDbTable<FakeItemWithSort> fakeItemWithSortMappedTable;
+
+    @Before
+    public void setupMappedTables() {
+        enhancedClient = DynamoDbEnhancedClient.builder().dynamoDbClient(mockDynamoDbClient).extensions().build();
+        fakeItemMappedTable = enhancedClient.table(TABLE_NAME, FakeItem.getTableSchema());
+        fakeItemWithSortMappedTable = enhancedClient.table(TABLE_NAME_2, FakeItemWithSort.getTableSchema());
+    }
+
+    @Test
+    public void getServiceCall_usingShortcutForm_makesTheRightCallAndReturnsResponse() {
+        BatchGetItemEnhancedRequest batchGetItemEnhancedRequest =
+            BatchGetItemEnhancedRequest.builder()
+                                       .readBatches(ReadBatch.builder(FakeItem.class)
+                                                             .mappedTableResource(fakeItemMappedTable)
+                                                             .addGetItem(FAKE_ITEM_KEYS.get(0))
+                                                             .build())
+                                       .build();
+
+        BatchGetItemOperation operation = BatchGetItemOperation.create(batchGetItemEnhancedRequest);
+
+        BatchGetItemRequest batchGetItemRequest =
+            BatchGetItemRequest.builder()
+                               .requestItems(singletonMap("test-table",
+                                                          KeysAndAttributes.builder()
+                                                                           .keys(singletonList(FAKE_ITEM_MAPS.get(0)))
+                                                                           .build()))
+                               .build();
+
+        BatchGetItemIterable expectedResponse = mock(BatchGetItemIterable.class);
+        when(mockDynamoDbClient.batchGetItemPaginator(any(BatchGetItemRequest.class))).thenReturn(expectedResponse);
+
+        SdkIterable<BatchGetItemResponse> response =
+            operation.serviceCall(mockDynamoDbClient).apply(batchGetItemRequest);
+
+        assertThat(response, sameInstance(expectedResponse));
+        verify(mockDynamoDbClient).batchGetItemPaginator(batchGetItemRequest);
+    }
+
+    @Test
+    public void getServiceCall_usingKeyItemForm_makesTheRightCallAndReturnsResponse() {
+        BatchGetItemEnhancedRequest batchGetItemEnhancedRequest =
+            BatchGetItemEnhancedRequest.builder()
+                                       .readBatches(ReadBatch.builder(FakeItem.class)
+                                                             .mappedTableResource(fakeItemMappedTable)
+                                                             .addGetItem(FAKE_ITEMS.get(0))
+                                                             .build())
+                                       .build();
+
+        BatchGetItemOperation operation = BatchGetItemOperation.create(batchGetItemEnhancedRequest);
+
+        BatchGetItemRequest batchGetItemRequest =
+            BatchGetItemRequest.builder()
+                               .requestItems(singletonMap("test-table",
+                                                          KeysAndAttributes.builder()
+                                                                           .keys(singletonList(FAKE_ITEM_MAPS.get(0)))
+                                                                           .build()))
+                               .build();
+
+        BatchGetItemIterable expectedResponse = mock(BatchGetItemIterable.class);
+        when(mockDynamoDbClient.batchGetItemPaginator(any(BatchGetItemRequest.class))).thenReturn(expectedResponse);
+
+        SdkIterable<BatchGetItemResponse> response =
+            operation.serviceCall(mockDynamoDbClient).apply(batchGetItemRequest);
+
+        assertThat(response, sameInstance(expectedResponse));
+        verify(mockDynamoDbClient).batchGetItemPaginator(batchGetItemRequest);
+    }
+
+    @Test
+    public void generateRequest_multipleBatches_multipleTableSchemas() {
+        BatchGetItemEnhancedRequest batchGetItemEnhancedRequest =
+            BatchGetItemEnhancedRequest.builder()
+                                       .readBatches(
+                                           ReadBatch.builder(FakeItem.class)
+                                                     .mappedTableResource(fakeItemMappedTable)
+                                                     .addGetItem(r -> r.key(FAKE_ITEM_KEYS.get(0)))
+                                                     .addGetItem(r -> r.key(FAKE_ITEM_KEYS.get(1)))
+                                                     .addGetItem(r -> r.key(FAKE_ITEM_KEYS.get(2)))
+                                                     .build(),
+                                           ReadBatch.builder(FakeItemWithSort.class)
+                                                     .mappedTableResource(fakeItemWithSortMappedTable)
+                                                     .addGetItem(r -> r.key(FAKESORT_ITEM_KEYS.get(0)))
+                                                     .addGetItem(r -> r.key(FAKESORT_ITEM_KEYS.get(1)))
+                                                     .addGetItem(r -> r.key(FAKESORT_ITEM_KEYS.get(2)))
+                                                     .build())
+                                       .build();
+
+        BatchGetItemOperation operation = BatchGetItemOperation.create(batchGetItemEnhancedRequest);
+
+        BatchGetItemRequest batchGetItemRequest = operation.generateRequest(mockExtension);
+
+        KeysAndAttributes keysAndAttributes1 = batchGetItemRequest.requestItems().get(TABLE_NAME);
+        KeysAndAttributes keysAndAttributes2 = batchGetItemRequest.requestItems().get(TABLE_NAME_2);
+        assertThat(keysAndAttributes1.keys(), containsInAnyOrder(FAKE_ITEM_MAPS.subList(0, 3).toArray()));
+        assertThat(keysAndAttributes2.keys(), containsInAnyOrder(FAKESORT_ITEM_MAPS.subList(0, 3).toArray()));
+        assertThat(keysAndAttributes1.consistentRead(), is(nullValue()));
+        assertThat(keysAndAttributes2.consistentRead(), is(nullValue()));
+        verifyNoMoreInteractions(mockExtension);
+    }
+
+    @Test
+    public void generateRequest_multipleBatches_multipleTableSchemas_nonConflictingConsistentRead() {
+        BatchGetItemEnhancedRequest batchGetItemEnhancedRequest = BatchGetItemEnhancedRequest
+            .builder()
+            .readBatches(
+                ReadBatch.builder(FakeItem.class)
+                         .mappedTableResource(fakeItemMappedTable)
+                         .addGetItem(GetItemEnhancedRequest.builder().key(FAKE_ITEM_KEYS.get(0)).consistentRead(true).build())
+                         .addGetItem(GetItemEnhancedRequest.builder().key(FAKE_ITEM_KEYS.get(1)).consistentRead(true).build())
+                         .addGetItem(GetItemEnhancedRequest.builder().key(FAKE_ITEM_KEYS.get(2)).consistentRead(true).build())
+                         .build(),
+                ReadBatch.builder(FakeItemWithSort.class)
+                         .mappedTableResource(fakeItemWithSortMappedTable)
+                         .addGetItem(GetItemEnhancedRequest.builder().key(FAKESORT_ITEM_KEYS.get(0)).consistentRead(false).build())
+                         .addGetItem(GetItemEnhancedRequest.builder().key(FAKESORT_ITEM_KEYS.get(1)).consistentRead(false).build())
+                         .addGetItem(GetItemEnhancedRequest.builder().key(FAKESORT_ITEM_KEYS.get(2)).consistentRead(false).build())
+                         .build())
+            .build();
+
+        BatchGetItemOperation operation = BatchGetItemOperation.create(batchGetItemEnhancedRequest);
+
+        BatchGetItemRequest batchGetItemRequest = operation.generateRequest(mockExtension);
+
+        KeysAndAttributes keysAndAttributes1 = batchGetItemRequest.requestItems().get(TABLE_NAME);
+        KeysAndAttributes keysAndAttributes2 = batchGetItemRequest.requestItems().get(TABLE_NAME_2);
+        assertThat(keysAndAttributes1.keys(), containsInAnyOrder(FAKE_ITEM_MAPS.subList(0, 3).toArray()));
+        assertThat(keysAndAttributes2.keys(), containsInAnyOrder(FAKESORT_ITEM_MAPS.subList(0, 3).toArray()));
+        assertThat(keysAndAttributes1.consistentRead(), is(true));
+        assertThat(keysAndAttributes2.consistentRead(), is(false));
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void generateRequest_multipleBatches_multipleTableSchemas_ConflictingConsistentReadStartingWithNull() {
+        BatchGetItemEnhancedRequest batchGetItemEnhancedRequest = BatchGetItemEnhancedRequest
+            .builder()
+            .readBatches(
+                ReadBatch.builder(FakeItem.class)
+                         .mappedTableResource(fakeItemMappedTable)
+                         .addGetItem(GetItemEnhancedRequest.builder().key(FAKE_ITEM_KEYS.get(0)).consistentRead(true).build())
+                         .addGetItem(GetItemEnhancedRequest.builder().key(FAKE_ITEM_KEYS.get(1)).consistentRead(true).build())
+                         .addGetItem(GetItemEnhancedRequest.builder().key(FAKE_ITEM_KEYS.get(2)).consistentRead(true).build())
+                         .build(),
+                ReadBatch.builder(FakeItemWithSort.class)
+                         .mappedTableResource(fakeItemWithSortMappedTable)
+                         .addGetItem(GetItemEnhancedRequest.builder().key(FAKESORT_ITEM_KEYS.get(0)).build())
+                         .addGetItem(GetItemEnhancedRequest.builder().key(FAKESORT_ITEM_KEYS.get(1)).consistentRead(true).build())
+                         .addGetItem(GetItemEnhancedRequest.builder().key(FAKESORT_ITEM_KEYS.get(2)).consistentRead(true).build())
+                         .build())
+            .build();
+
+        BatchGetItemOperation operation = BatchGetItemOperation.create(batchGetItemEnhancedRequest);
+
+        operation.generateRequest(mockExtension);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void generateRequest_multipleBatches_multipleTableSchemas_ConflictingConsistentReadStartingWithFalse() {
+        BatchGetItemEnhancedRequest batchGetItemEnhancedRequest = BatchGetItemEnhancedRequest
+            .builder()
+            .readBatches(
+                ReadBatch.builder(FakeItem.class)
+                         .mappedTableResource(fakeItemMappedTable)
+                         .addGetItem(GetItemEnhancedRequest.builder().key(FAKE_ITEM_KEYS.get(0)).consistentRead(true).build())
+                         .addGetItem(GetItemEnhancedRequest.builder().key(FAKE_ITEM_KEYS.get(1)).consistentRead(true).build())
+                         .addGetItem(GetItemEnhancedRequest.builder().key(FAKE_ITEM_KEYS.get(2)).consistentRead(true).build())
+                         .build(),
+                ReadBatch.builder(FakeItemWithSort.class)
+                         .mappedTableResource(fakeItemWithSortMappedTable)
+                         .addGetItem(GetItemEnhancedRequest.builder().key(FAKESORT_ITEM_KEYS.get(0)).consistentRead(false).build())
+                         .addGetItem(GetItemEnhancedRequest.builder().key(FAKESORT_ITEM_KEYS.get(1)).consistentRead(true).build())
+                         .addGetItem(GetItemEnhancedRequest.builder().key(FAKESORT_ITEM_KEYS.get(2)).consistentRead(true).build())
+                         .build())
+            .build();
+
+        BatchGetItemOperation operation =
+            BatchGetItemOperation.create(batchGetItemEnhancedRequest);
+
+        operation.generateRequest(mockExtension);
+    }
+
+    @Test
+    public void transformResponse_multipleTables_multipleItems_noExtension() {
+        Map<String, List<Map<String, AttributeValue>>> page = new HashMap<>();
+        page.put(TABLE_NAME, Arrays.asList(FAKE_ITEM_MAPS.get(0), FAKE_ITEM_MAPS.get(1)));
+        page.put(TABLE_NAME_2, singletonList(FAKESORT_ITEM_MAPS.get(0)));
+
+        BatchGetItemResponse fakeResults = generateFakeResults(page);
+        BatchGetItemOperation operation = BatchGetItemOperation.create(emptyRequest());
+
+        BatchGetResultPage resultsPage = operation.transformResponse(fakeResults, null);
+
+        List<FakeItem> fakeItemResultsPage = resultsPage.resultsForTable(fakeItemMappedTable);
+        List<FakeItemWithSort> fakeItemWithSortResultsPage =
+            resultsPage.resultsForTable(fakeItemWithSortMappedTable);
+
+        assertThat(fakeItemResultsPage, containsInAnyOrder(FAKE_ITEMS.get(0), FAKE_ITEMS.get(1)));
+        assertThat(fakeItemWithSortResultsPage, containsInAnyOrder(FAKESORT_ITEMS.get(0)));
+    }
+
+    @Test
+    public void transformResponse_multipleTables_multipleItems_extensionWithTransformation() {
+        Map<String, List<Map<String, AttributeValue>>> page = new HashMap<>();
+        page.put(TABLE_NAME, Arrays.asList(FAKE_ITEM_MAPS.get(0), FAKE_ITEM_MAPS.get(1)));
+        page.put(TABLE_NAME_2, singletonList(FAKESORT_ITEM_MAPS.get(0)));
+        BatchGetItemResponse fakeResults = generateFakeResults(page);
+        BatchGetItemOperation operation = BatchGetItemOperation.create(emptyRequest());
+
+        // Use the mock extension to transform every item based on table name
+        IntStream.range(0, 3).forEach(i -> {
+            doReturn(ReadModification.builder().transformedItem(FAKE_ITEM_MAPS.get(i + 3)).build())
+                .when(mockExtension)
+                .afterRead(
+                    argThat(extensionContext ->
+                                extensionContext.operationContext().tableName().equals(TABLE_NAME) &&
+                                extensionContext.items().equals(FAKE_ITEM_MAPS.get(i))
+                    ));
+            doReturn(ReadModification.builder().transformedItem(FAKESORT_ITEM_MAPS.get(i + 3)).build())
+                .when(mockExtension)
+                .afterRead(argThat(extensionContext ->
+                                       extensionContext.operationContext().tableName().equals(TABLE_NAME_2) &&
+                                       extensionContext.items().equals(FAKESORT_ITEM_MAPS.get(i))
+                ));
+        });
+
+        BatchGetResultPage resultsPage = operation.transformResponse(fakeResults, mockExtension);
+
+        List<FakeItem> fakeItemResultsPage = resultsPage.resultsForTable(fakeItemMappedTable);
+        List<FakeItemWithSort> fakeItemWithSortResultsPage =
+            resultsPage.resultsForTable(fakeItemWithSortMappedTable);
+
+
+        assertThat(fakeItemResultsPage, containsInAnyOrder(FAKE_ITEMS.get(3), FAKE_ITEMS.get(4)));
+        assertThat(fakeItemWithSortResultsPage, containsInAnyOrder(FAKESORT_ITEMS.get(3)));
+    }
+
+    @Test
+    public void transformResponse_queryingEmptyResults() {
+        BatchGetItemResponse fakeResults = generateFakeResults(emptyMap());
+        BatchGetItemOperation operation = BatchGetItemOperation.create(emptyRequest());
+
+        BatchGetResultPage resultsPage = operation.transformResponse(fakeResults, null);
+
+        assertThat(resultsPage.resultsForTable(fakeItemMappedTable), is(emptyList()));
+    }
+
+    private static BatchGetItemEnhancedRequest emptyRequest() {
+        return BatchGetItemEnhancedRequest.builder().readBatches().build();
+    }
+
+    private static BatchGetItemResponse generateFakeResults(
+        Map<String, List<Map<String, AttributeValue>>> itemMapsPage) {
+
+        return BatchGetItemResponse.builder()
+                                   .responses(itemMapsPage)
+                                   .build();
+    }
+
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/BatchWriteItemOperationTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/BatchWriteItemOperationTest.java
new file mode 100644
index 000000000000..42558ce659af
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/BatchWriteItemOperationTest.java
@@ -0,0 +1,403 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.operations;
+
+import static java.util.Collections.emptyList;
+import static java.util.Collections.emptyMap;
+import static java.util.Collections.singletonList;
+import static java.util.Collections.singletonMap;
+import static java.util.stream.Collectors.toList;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsInAnyOrder;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.sameInstance;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.argThat;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.lenient;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import static software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.FakeItem.createUniqueFakeItem;
+import static software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.FakeItemWithSort.createUniqueFakeItemWithSort;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.IntStream;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClient;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClientExtension;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbExtensionContext;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbTable;
+import software.amazon.awssdk.enhanced.dynamodb.Expression;
+import software.amazon.awssdk.enhanced.dynamodb.Key;
+import software.amazon.awssdk.enhanced.dynamodb.extensions.ReadModification;
+import software.amazon.awssdk.enhanced.dynamodb.extensions.WriteModification;
+import software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.FakeItem;
+import software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.FakeItemWithSort;
+import software.amazon.awssdk.enhanced.dynamodb.model.BatchWriteItemEnhancedRequest;
+import software.amazon.awssdk.enhanced.dynamodb.model.BatchWriteResult;
+import software.amazon.awssdk.enhanced.dynamodb.model.WriteBatch;
+import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+import software.amazon.awssdk.services.dynamodb.model.BatchWriteItemRequest;
+import software.amazon.awssdk.services.dynamodb.model.BatchWriteItemResponse;
+import software.amazon.awssdk.services.dynamodb.model.DeleteRequest;
+import software.amazon.awssdk.services.dynamodb.model.PutRequest;
+import software.amazon.awssdk.services.dynamodb.model.WriteRequest;
+
+@RunWith(MockitoJUnitRunner.class)
+public class BatchWriteItemOperationTest {
+    private static final String TABLE_NAME = "table-name";
+    private static final String TABLE_NAME_2 = "table-name-2";
+
+    private static final List<FakeItem> FAKE_ITEMS =
+        IntStream.range(0, 6).mapToObj($ -> createUniqueFakeItem()).collect(toList());
+    private static final List<Map<String, AttributeValue>> FAKE_ITEM_MAPS = FAKE_ITEMS.stream().map(item ->
+        FakeItem.getTableSchema().itemToMap(item, FakeItem.getTableMetadata().primaryKeys())).collect(toList());
+    private static final List<FakeItemWithSort> FAKESORT_ITEMS =
+        IntStream.range(0, 6).mapToObj($ -> createUniqueFakeItemWithSort()).collect(toList());
+    private static final List<Map<String, AttributeValue>> FAKESORT_ITEM_MAPS = FAKESORT_ITEMS.stream().map(item ->
+        FakeItemWithSort.getTableSchema().itemToMap(item, FakeItemWithSort.getTableMetadata().primaryKeys()))
+                                                                                              .collect(toList());
+    private static final List<Key> FAKE_ITEM_KEYS =
+        FAKE_ITEMS.stream().map(fakeItem -> Key.builder().partitionValue(fakeItem.getId()).build()).collect(toList());
+    private static final List<Key> FAKESORT_ITEM_KEYS =
+        FAKESORT_ITEMS.stream()
+                      .map(fakeItemWithSort -> Key.builder()
+                                                  .partitionValue(fakeItemWithSort.getId())
+                                                  .sortValue(fakeItemWithSort.getSort())
+                                                  .build())
+                      .collect(toList());
+
+    @Mock
+    private DynamoDbClient mockDynamoDbClient;
+
+    @Mock
+    private DynamoDbEnhancedClientExtension mockExtension;
+
+    private DynamoDbEnhancedClient enhancedClient;
+    private DynamoDbTable<FakeItem> fakeItemMappedTable;
+    private DynamoDbTable<FakeItem> fakeItemMappedTableWithExtension;
+    private DynamoDbTable<FakeItemWithSort> fakeItemWithSortMappedTable;
+    private DynamoDbTable<FakeItemWithSort> fakeItemWithSortMappedTableWithExtension;
+
+    @Before
+    public void setupMappedTables() {
+        enhancedClient = DynamoDbEnhancedClient.builder().dynamoDbClient(mockDynamoDbClient).extensions().build();
+        fakeItemMappedTable = enhancedClient.table(TABLE_NAME, FakeItem.getTableSchema());
+        fakeItemWithSortMappedTable = enhancedClient.table(TABLE_NAME_2, FakeItemWithSort.getTableSchema());
+        DynamoDbEnhancedClient dynamoDbEnhancedClientWithExtension =
+            DynamoDbEnhancedClient.builder().dynamoDbClient(mockDynamoDbClient).extensions(mockExtension).build();
+        fakeItemMappedTableWithExtension = dynamoDbEnhancedClientWithExtension.table(TABLE_NAME, FakeItem.getTableSchema());
+        fakeItemWithSortMappedTableWithExtension = dynamoDbEnhancedClientWithExtension.table(TABLE_NAME_2,
+                                                                                             FakeItemWithSort.getTableSchema());
+    }
+
+    @Test
+    public void getServiceCall_makesTheRightCallAndReturnsResponse() {
+
+        WriteBatch batch = WriteBatch.builder(FakeItem.class)
+                                     .mappedTableResource(fakeItemMappedTable)
+                                     .addPutItem(r -> r.item(FAKE_ITEMS.get(0)))
+                                     .build();
+
+        BatchWriteItemEnhancedRequest batchWriteItemEnhancedRequest =
+            BatchWriteItemEnhancedRequest.builder()
+                                         .writeBatches(batch)
+                                         .build();
+
+        BatchWriteItemOperation operation = BatchWriteItemOperation.create(batchWriteItemEnhancedRequest);
+
+        WriteRequest writeRequest =
+            WriteRequest.builder()
+                        .putRequest(PutRequest.builder().item(FAKE_ITEM_MAPS.get(0)).build())
+                        .build();
+
+        BatchWriteItemRequest request =
+            BatchWriteItemRequest.builder()
+                                 .requestItems(singletonMap("table", singletonList(writeRequest)))
+                                 .build();
+
+        BatchWriteItemResponse expectedResponse = BatchWriteItemResponse.builder().build();
+        when(mockDynamoDbClient.batchWriteItem(any(BatchWriteItemRequest.class))).thenReturn(expectedResponse);
+
+        BatchWriteItemResponse response = operation.serviceCall(mockDynamoDbClient).apply(request);
+
+        assertThat(response, sameInstance(expectedResponse));
+        verify(mockDynamoDbClient).batchWriteItem(request);
+    }
+
+    @Test
+    public void generateRequest_multipleTables_mixedCommands_usingShortcutForm() {
+        BatchWriteItemEnhancedRequest batchWriteItemEnhancedRequest =
+            BatchWriteItemEnhancedRequest.builder()
+                                         .writeBatches(
+                                             WriteBatch.builder(FakeItem.class)
+                                                       .mappedTableResource(fakeItemMappedTable)
+                                                       .addPutItem(FAKE_ITEMS.get(0))
+                                                       .addDeleteItem(FAKE_ITEM_KEYS.get(1))
+                                                       .addPutItem(FAKE_ITEMS.get(2))
+                                                       .build(),
+                                             WriteBatch.builder(FakeItemWithSort.class)
+                                                       .mappedTableResource(fakeItemWithSortMappedTable)
+                                                       .addDeleteItem(FAKESORT_ITEM_KEYS.get(0))
+                                                       .addPutItem(FAKESORT_ITEMS.get(1))
+                                                       .addDeleteItem(FAKESORT_ITEM_KEYS.get(2))
+                                                       .build())
+                                         .build();
+
+        BatchWriteItemOperation operation = BatchWriteItemOperation.create(batchWriteItemEnhancedRequest);
+
+        BatchWriteItemRequest request = operation.generateRequest(mockExtension);
+
+        List<WriteRequest> writeRequests1 = request.requestItems().get(TABLE_NAME);
+        List<WriteRequest> writeRequests2 = request.requestItems().get(TABLE_NAME_2);
+        assertThat(writeRequests1, containsInAnyOrder(putRequest(FAKE_ITEM_MAPS.get(0)),
+                                                      deleteRequest(FAKE_ITEM_MAPS.get(1)),
+                                                      putRequest(FAKE_ITEM_MAPS.get(2))));
+        assertThat(writeRequests2, containsInAnyOrder(deleteRequest(FAKESORT_ITEM_MAPS.get(0)),
+                                                      putRequest(FAKESORT_ITEM_MAPS.get(1)),
+                                                      deleteRequest(FAKESORT_ITEM_MAPS.get(2))));
+    }
+
+    @Test
+    public void generateRequest_multipleTables_mixedCommands_usingKeyItemForm() {
+        BatchWriteItemEnhancedRequest batchWriteItemEnhancedRequest =
+            BatchWriteItemEnhancedRequest.builder()
+                                         .writeBatches(
+                                             WriteBatch.builder(FakeItem.class)
+                                                       .mappedTableResource(fakeItemMappedTable)
+                                                       .addPutItem(FAKE_ITEMS.get(0))
+                                                       .addDeleteItem(FAKE_ITEMS.get(1))
+                                                       .addPutItem(FAKE_ITEMS.get(2))
+                                                       .build(),
+                                             WriteBatch.builder(FakeItemWithSort.class)
+                                                       .mappedTableResource(fakeItemWithSortMappedTable)
+                                                       .addDeleteItem(FAKESORT_ITEMS.get(0))
+                                                       .addPutItem(FAKESORT_ITEMS.get(1))
+                                                       .addDeleteItem(FAKESORT_ITEMS.get(2))
+                                                       .build())
+                                         .build();
+
+        BatchWriteItemOperation operation = BatchWriteItemOperation.create(batchWriteItemEnhancedRequest);
+
+        BatchWriteItemRequest request = operation.generateRequest(mockExtension);
+
+        List<WriteRequest> writeRequests1 = request.requestItems().get(TABLE_NAME);
+        List<WriteRequest> writeRequests2 = request.requestItems().get(TABLE_NAME_2);
+        assertThat(writeRequests1, containsInAnyOrder(putRequest(FAKE_ITEM_MAPS.get(0)),
+                                                      deleteRequest(FAKE_ITEM_MAPS.get(1)),
+                                                      putRequest(FAKE_ITEM_MAPS.get(2))));
+        assertThat(writeRequests2, containsInAnyOrder(deleteRequest(FAKESORT_ITEM_MAPS.get(0)),
+                                                      putRequest(FAKESORT_ITEM_MAPS.get(1)),
+                                                      deleteRequest(FAKESORT_ITEM_MAPS.get(2))));
+    }
+
+    @Test
+    public void generateRequest_multipleTables_extensionOnlyTransformsPutsAndNotDeletes() {
+
+        // Use the mock extension to transform every item based on table name
+        IntStream.range(0, 3).forEach(i -> {
+            lenient().doReturn(WriteModification.builder().transformedItem(FAKE_ITEM_MAPS.get(i + 3)).build())
+                .when(mockExtension)
+                .beforeWrite(
+                         argThat(extensionContext ->
+                                     extensionContext.operationContext().tableName().equals(TABLE_NAME) &&
+                                     extensionContext.items().equals(FAKE_ITEM_MAPS.get(i))
+                         ));
+            lenient().doReturn(WriteModification.builder().transformedItem(FAKESORT_ITEM_MAPS.get(i + 3)).build())
+                .when(mockExtension)
+                .beforeWrite(
+                    argThat(extensionContext ->
+                                extensionContext.operationContext().tableName().equals(TABLE_NAME_2) &&
+                                extensionContext.items().equals(FAKESORT_ITEM_MAPS.get(i))
+                    ));
+        });
+
+        BatchWriteItemEnhancedRequest batchWriteItemEnhancedRequest =
+            BatchWriteItemEnhancedRequest.builder()
+                                         .writeBatches(
+                                             WriteBatch.builder(FakeItem.class)
+                                                       .mappedTableResource(fakeItemMappedTableWithExtension)
+                                                       .addPutItem(r -> r.item(FAKE_ITEMS.get(0)))
+                                                       .addDeleteItem(r -> r.key(FAKE_ITEM_KEYS.get(1)))
+                                                       .addPutItem(r -> r.item(FAKE_ITEMS.get(2)))
+                                                       .build(),
+                                             WriteBatch.builder(FakeItemWithSort.class)
+                                                       .mappedTableResource(fakeItemWithSortMappedTableWithExtension)
+                                                       .addDeleteItem(r -> r.key(FAKESORT_ITEM_KEYS.get(0)))
+                                                       .addPutItem(r -> r.item(FAKESORT_ITEMS.get(1)))
+                                                       .addDeleteItem(r -> r.key(FAKESORT_ITEM_KEYS.get(2)))
+                                                       .build())
+                                         .build();
+
+        BatchWriteItemOperation operation = BatchWriteItemOperation.create(batchWriteItemEnhancedRequest);
+
+        BatchWriteItemRequest request = operation.generateRequest(mockExtension);
+
+        List<WriteRequest> writeRequests1 = request.requestItems().get(TABLE_NAME);
+        List<WriteRequest> writeRequests2 = request.requestItems().get(TABLE_NAME_2);
+
+        // Only PutItem requests should have their attributes transformed
+        assertThat(writeRequests1, containsInAnyOrder(putRequest(FAKE_ITEM_MAPS.get(3)),
+                                                      deleteRequest(FAKE_ITEM_MAPS.get(1)),
+                                                      putRequest(FAKE_ITEM_MAPS.get(5))));
+        assertThat(writeRequests2, containsInAnyOrder(deleteRequest(FAKESORT_ITEM_MAPS.get(0)),
+                                                      putRequest(FAKESORT_ITEM_MAPS.get(4)),
+                                                      deleteRequest(FAKESORT_ITEM_MAPS.get(2))));
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void generateRequest_extensionTriesToAddConditionalToPutItem() {
+        Expression expression = Expression.builder().expression("test-expression").build();
+
+        doReturn(WriteModification.builder().additionalConditionalExpression(expression).build())
+            .when(mockExtension)
+            .beforeWrite(any(DynamoDbExtensionContext.BeforeWrite.class));
+
+        BatchWriteItemEnhancedRequest batchWriteItemEnhancedRequest =
+            BatchWriteItemEnhancedRequest.builder()
+                                         .writeBatches(
+                                             WriteBatch.builder(FakeItem.class)
+                                                       .mappedTableResource(fakeItemMappedTableWithExtension)
+                                                       .addPutItem(r -> r.item(FAKE_ITEMS.get(0)))
+                                                       .addDeleteItem(r -> r.key(FAKE_ITEM_KEYS.get(1)))
+                                                       .addPutItem(r -> r.item(FAKE_ITEMS.get(2)))
+                                                       .build(),
+                                             WriteBatch.builder(FakeItemWithSort.class)
+                                                       .mappedTableResource(fakeItemWithSortMappedTableWithExtension)
+                                                       .addDeleteItem(r -> r.key(FAKESORT_ITEM_KEYS.get(0)))
+                                                       .addPutItem(r -> r.item(FAKESORT_ITEMS.get(1)))
+                                                       .addDeleteItem(r -> r.key(FAKESORT_ITEM_KEYS.get(2)))
+                                                       .build())
+                                         .build();
+
+        BatchWriteItemOperation operation = BatchWriteItemOperation.create(batchWriteItemEnhancedRequest);
+
+        operation.generateRequest(mockExtension);
+    }
+
+    @Test
+    public void transformResults_multipleUnprocessedOperations() {
+        BatchWriteItemOperation operation = BatchWriteItemOperation.create(emptyRequest());
+
+        List<WriteRequest> writeRequests1 = Arrays.asList(putRequest(FAKE_ITEM_MAPS.get(0)),
+                                                          deleteRequest(FAKE_ITEM_MAPS.get(1)),
+                                                          deleteRequest(FAKE_ITEM_MAPS.get(2)));
+        List<WriteRequest> writeRequests2 = Arrays.asList(deleteRequest(FAKESORT_ITEM_MAPS.get(0)),
+                                                          putRequest(FAKESORT_ITEM_MAPS.get(1)),
+                                                          putRequest(FAKESORT_ITEM_MAPS.get(2)));
+        Map<String, List<WriteRequest>> writeRequests = new HashMap<>();
+        writeRequests.put(TABLE_NAME, writeRequests1);
+        writeRequests.put(TABLE_NAME_2, writeRequests2);
+        BatchWriteItemResponse response =
+            BatchWriteItemResponse.builder()
+                                  .unprocessedItems(writeRequests)
+                                  .build();
+
+        BatchWriteResult results = operation.transformResponse(response, mockExtension);
+
+        assertThat(results.unprocessedDeleteItemsForTable(fakeItemMappedTableWithExtension),
+                   containsInAnyOrder(FAKE_ITEM_KEYS.get(1), FAKE_ITEM_KEYS.get(2)));
+        assertThat(results.unprocessedPutItemsForTable(fakeItemMappedTableWithExtension),
+                   containsInAnyOrder(FAKE_ITEMS.get(0)));
+        assertThat(results.unprocessedDeleteItemsForTable(fakeItemWithSortMappedTableWithExtension),
+                   containsInAnyOrder(FAKESORT_ITEM_KEYS.get(0)));
+        assertThat(results.unprocessedPutItemsForTable(fakeItemWithSortMappedTableWithExtension),
+                   containsInAnyOrder(FAKESORT_ITEMS.get(1), FAKESORT_ITEMS.get(2)));
+    }
+
+    @Test
+    public void transformResults_multipleUnprocessedOperations_extensionTransformsPutsNotDeletes() {
+        BatchWriteItemOperation operation = BatchWriteItemOperation.create(emptyRequest());
+
+        List<WriteRequest> writeRequests1 = Arrays.asList(putRequest(FAKE_ITEM_MAPS.get(0)),
+                                                          deleteRequest(FAKE_ITEM_MAPS.get(1)),
+                                                          deleteRequest(FAKE_ITEM_MAPS.get(2)));
+        List<WriteRequest> writeRequests2 = Arrays.asList(deleteRequest(FAKESORT_ITEM_MAPS.get(0)),
+                                                          putRequest(FAKESORT_ITEM_MAPS.get(1)),
+                                                          putRequest(FAKESORT_ITEM_MAPS.get(2)));
+        Map<String, List<WriteRequest>> writeRequests = new HashMap<>();
+        writeRequests.put(TABLE_NAME, writeRequests1);
+        writeRequests.put(TABLE_NAME_2, writeRequests2);
+        BatchWriteItemResponse response =
+            BatchWriteItemResponse.builder()
+                                  .unprocessedItems(writeRequests)
+                                  .build();
+
+        // Use the mock extension to transform every item based on table name
+        IntStream.range(0, 3).forEach(i -> {
+            doReturn(ReadModification.builder().transformedItem(FAKE_ITEM_MAPS.get(i + 3)).build())
+                .when(mockExtension)
+                .afterRead(
+                    argThat(extensionContext ->
+                                extensionContext.operationContext().tableName().equals(TABLE_NAME) &&
+                                extensionContext.items().equals(FAKE_ITEM_MAPS.get(i))
+                    ));
+            doReturn(ReadModification.builder().transformedItem(FAKESORT_ITEM_MAPS.get(i + 3)).build())
+                .when(mockExtension)
+                .afterRead(argThat(extensionContext ->
+                                       extensionContext.operationContext().tableName().equals(TABLE_NAME_2) &&
+                                       extensionContext.items().equals(FAKESORT_ITEM_MAPS.get(i))
+                ));
+        });
+
+        BatchWriteResult results = operation.transformResponse(response, mockExtension);
+
+        assertThat(results.unprocessedDeleteItemsForTable(fakeItemMappedTableWithExtension),
+                   containsInAnyOrder(FAKE_ITEM_KEYS.get(1), FAKE_ITEM_KEYS.get(2)));
+        assertThat(results.unprocessedPutItemsForTable(fakeItemMappedTableWithExtension),
+                   containsInAnyOrder(FAKE_ITEMS.get(3)));
+        assertThat(results.unprocessedDeleteItemsForTable(fakeItemWithSortMappedTableWithExtension),
+                   containsInAnyOrder(FAKESORT_ITEM_KEYS.get(0)));
+        assertThat(results.unprocessedPutItemsForTable(fakeItemWithSortMappedTableWithExtension),
+                   containsInAnyOrder(FAKESORT_ITEMS.get(4), FAKESORT_ITEMS.get(5)));
+    }
+
+    @Test
+    public void transformResults_noUnprocessedOperations() {
+        BatchWriteItemOperation operation = BatchWriteItemOperation.create(emptyRequest());
+
+        BatchWriteItemResponse response =
+            BatchWriteItemResponse.builder()
+                                  .unprocessedItems(emptyMap())
+                                  .build();
+
+        BatchWriteResult results = operation.transformResponse(response, mockExtension);
+
+        assertThat(results.unprocessedDeleteItemsForTable(fakeItemMappedTable), is(emptyList()));
+        assertThat(results.unprocessedPutItemsForTable(fakeItemMappedTable), is(emptyList()));
+    }
+
+
+    private static BatchWriteItemEnhancedRequest emptyRequest() {
+        return BatchWriteItemEnhancedRequest.builder().writeBatches().build();
+    }
+
+    private static WriteRequest putRequest(Map<String, AttributeValue> itemMap) {
+        return WriteRequest.builder().putRequest(PutRequest.builder().item(itemMap).build()).build();
+    }
+
+    private static WriteRequest deleteRequest(Map<String, AttributeValue> itemMap) {
+        return WriteRequest.builder().deleteRequest(DeleteRequest.builder().key(itemMap).build()).build();
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/CommonOperationTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/CommonOperationTest.java
new file mode 100644
index 000000000000..c1f2664f7919
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/CommonOperationTest.java
@@ -0,0 +1,79 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.operations;
+
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.Spy;
+import org.mockito.junit.MockitoJUnitRunner;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClientExtension;
+import software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.FakeItem;
+import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
+
+@RunWith(MockitoJUnitRunner.class)
+public class CommonOperationTest {
+
+    private static final String FAKE_REQUEST = "fake-request";
+    private static final String FAKE_RESPONSE = "fake-response";
+    private static final String FAKE_RESULT = "fake-result";
+    private static final String FAKE_TABLE_NAME = "fake-table-name";
+    private static final String FAKE_INDEX_NAME = "fake-index-name";
+
+    @Mock
+    private DynamoDbEnhancedClientExtension mockDynamoDbEnhancedClientExtension;
+
+    @Mock
+    private DynamoDbClient mockDynamoDbClient;
+
+    @Spy
+    private CommonOperation<FakeItem, String, String, String> spyCommonOperation;
+
+    @Before
+    public void stubSpy() {
+        when(spyCommonOperation.generateRequest(any(), any(), any())).thenReturn(FAKE_REQUEST);
+        when(spyCommonOperation.serviceCall(any())).thenReturn(s -> {
+            if (!FAKE_REQUEST.equals(s)) {
+                throw new RuntimeException("Did not receive expected request");
+            }
+
+            return FAKE_RESPONSE;
+        });
+        when(spyCommonOperation.transformResponse(any(), any(), any(), any())).thenReturn(FAKE_RESULT);
+    }
+
+    @Test
+    public void execute_defaultImplementation_behavesCorrectlyAndReturnsCorrectResult() {
+        OperationContext operationContext = OperationContext.create(FAKE_TABLE_NAME, FAKE_INDEX_NAME);
+        String result = spyCommonOperation.execute(FakeItem.getTableSchema(),
+                                                   operationContext,
+                                                   mockDynamoDbEnhancedClientExtension,
+                                                   mockDynamoDbClient);
+
+        assertThat(result, is(FAKE_RESULT));
+        verify(spyCommonOperation).generateRequest(FakeItem.getTableSchema(), operationContext, mockDynamoDbEnhancedClientExtension);
+        verify(spyCommonOperation).serviceCall(mockDynamoDbClient);
+        verify(spyCommonOperation).transformResponse(FAKE_RESPONSE, FakeItem.getTableSchema(), operationContext,
+                                                     mockDynamoDbEnhancedClientExtension);
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/ConditionCheckTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/ConditionCheckTest.java
new file mode 100644
index 000000000000..c8eb0a48dc04
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/ConditionCheckTest.java
@@ -0,0 +1,76 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.operations;
+
+import static java.util.Collections.singletonMap;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+import static org.mockito.Mockito.verifyZeroInteractions;
+import static software.amazon.awssdk.enhanced.dynamodb.internal.AttributeValues.stringValue;
+
+import java.util.Map;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClientExtension;
+import software.amazon.awssdk.enhanced.dynamodb.Expression;
+import software.amazon.awssdk.enhanced.dynamodb.TableMetadata;
+import software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.FakeItem;
+import software.amazon.awssdk.enhanced.dynamodb.model.ConditionCheck;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+import software.amazon.awssdk.services.dynamodb.model.TransactWriteItem;
+
+@RunWith(MockitoJUnitRunner.class)
+public class ConditionCheckTest {
+    @Mock
+    private DynamoDbEnhancedClientExtension mockDynamoDbEnhancedClientExtension;
+
+    @Test
+    public void generateTransactWriteItem() {
+        FakeItem fakeItem = FakeItem.createUniqueFakeItem();
+        Map<String, AttributeValue> keyMap = singletonMap("id", stringValue(fakeItem.getId()));
+        Expression conditionExpression = Expression.builder()
+                                                   .expression("expression")
+                                                   .expressionNames(singletonMap("key1", "value1"))
+                                                   .expressionValues(singletonMap("key2", stringValue("value2")))
+                                                   .build();
+        ConditionCheck<FakeItem> operation =
+            ConditionCheck.builder()
+                          .key(k -> k.partitionValue(fakeItem.getId()))
+                          .conditionExpression(conditionExpression)
+                          .build();
+        OperationContext context = OperationContext.create("table-name", TableMetadata.primaryIndexName());
+
+        TransactWriteItem result = operation.generateTransactWriteItem(FakeItem.getTableSchema(), context,
+                                                                       mockDynamoDbEnhancedClientExtension);
+
+        TransactWriteItem expectedResult =
+            TransactWriteItem.builder()
+                             .conditionCheck(
+                                 software.amazon.awssdk.services.dynamodb.model.ConditionCheck
+                                     .builder()
+                                     .tableName("table-name")
+                                     .key(keyMap)
+                                     .conditionExpression(conditionExpression.expression())
+                                     .expressionAttributeValues(conditionExpression.expressionValues())
+                                     .expressionAttributeNames(conditionExpression.expressionNames())
+                                     .build())
+                             .build();
+        assertThat(result, is(expectedResult));
+        verifyZeroInteractions(mockDynamoDbEnhancedClientExtension);
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/CreateTableOperationTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/CreateTableOperationTest.java
new file mode 100644
index 000000000000..9f744244d186
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/CreateTableOperationTest.java
@@ -0,0 +1,417 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.operations;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsInAnyOrder;
+import static org.hamcrest.Matchers.empty;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.sameInstance;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.same;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import static software.amazon.awssdk.services.dynamodb.model.KeyType.HASH;
+import static software.amazon.awssdk.services.dynamodb.model.KeyType.RANGE;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import org.hamcrest.Description;
+import org.hamcrest.TypeSafeMatcher;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+import software.amazon.awssdk.core.util.DefaultSdkAutoConstructList;
+import software.amazon.awssdk.enhanced.dynamodb.TableMetadata;
+import software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.FakeItem;
+import software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.FakeItemWithBinaryKey;
+import software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.FakeItemWithIndices;
+import software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.FakeItemWithNumericSort;
+import software.amazon.awssdk.enhanced.dynamodb.model.CreateTableEnhancedRequest;
+import software.amazon.awssdk.enhanced.dynamodb.model.EnhancedGlobalSecondaryIndex;
+import software.amazon.awssdk.enhanced.dynamodb.model.EnhancedLocalSecondaryIndex;
+import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
+import software.amazon.awssdk.services.dynamodb.model.AttributeDefinition;
+import software.amazon.awssdk.services.dynamodb.model.BillingMode;
+import software.amazon.awssdk.services.dynamodb.model.CreateTableRequest;
+import software.amazon.awssdk.services.dynamodb.model.CreateTableResponse;
+import software.amazon.awssdk.services.dynamodb.model.KeySchemaElement;
+import software.amazon.awssdk.services.dynamodb.model.Projection;
+import software.amazon.awssdk.services.dynamodb.model.ProjectionType;
+import software.amazon.awssdk.services.dynamodb.model.ProvisionedThroughput;
+import software.amazon.awssdk.services.dynamodb.model.ScalarAttributeType;
+
+@RunWith(MockitoJUnitRunner.class)
+public class CreateTableOperationTest {
+    private static final String TABLE_NAME = "table-name";
+    private static final OperationContext PRIMARY_CONTEXT =
+        OperationContext.create(TABLE_NAME, TableMetadata.primaryIndexName());
+    private static final OperationContext GSI_1_CONTEXT =
+        OperationContext.create(TABLE_NAME, "gsi_1");
+
+    private static MatchedGsi matchesGsi(software.amazon.awssdk.services.dynamodb.model.GlobalSecondaryIndex other) {
+        return new MatchedGsi(other);
+    }
+
+    @Mock
+    private DynamoDbClient mockDynamoDbClient;
+
+    private static class MatchedGsi
+        extends TypeSafeMatcher<software.amazon.awssdk.services.dynamodb.model.GlobalSecondaryIndex> {
+
+        private final software.amazon.awssdk.services.dynamodb.model.GlobalSecondaryIndex other;
+
+        private MatchedGsi(software.amazon.awssdk.services.dynamodb.model.GlobalSecondaryIndex other) {
+            this.other = other;
+        }
+
+        @Override
+        protected boolean matchesSafely(software.amazon.awssdk.services.dynamodb.model.GlobalSecondaryIndex globalSecondaryIndex) {
+            if (!other.indexName().equals(globalSecondaryIndex.indexName())) {
+                return false;
+            }
+
+            if ((other.projection() != null && !other.projection().equals(globalSecondaryIndex.projection())) ||
+                (other.projection() == null && globalSecondaryIndex.projection() != null)) {
+                return false;
+            }
+
+            return containsInAnyOrder(other.keySchema().toArray(new KeySchemaElement[]{}))
+                .matches(globalSecondaryIndex.keySchema());
+        }
+
+        @Override
+        public void describeTo(Description description) {
+            description.appendText("a GlobalSecondaryIndex equivalent to [" + other.toString() + "]");
+        }
+    }
+
+    @Test
+    public void generateRequest_withLsiAndGsi() {
+        Projection projection1 = Projection.builder().projectionType(ProjectionType.ALL).build();
+        Projection projection2 = Projection.builder().projectionType(ProjectionType.KEYS_ONLY).build();
+        Projection projection3 = Projection.builder()
+                                           .projectionType(ProjectionType.INCLUDE)
+                                           .nonKeyAttributes("key1", "key2")
+                                           .build();
+        ProvisionedThroughput provisionedThroughput1 = ProvisionedThroughput.builder()
+                                                                            .readCapacityUnits(1L)
+                                                                            .writeCapacityUnits(2L)
+                                                                            .build();
+        ProvisionedThroughput provisionedThroughput2 = ProvisionedThroughput.builder()
+                                                                            .readCapacityUnits(3L)
+                                                                            .writeCapacityUnits(4L)
+                                                                            .build();
+
+
+        List<EnhancedGlobalSecondaryIndex> globalSecondaryIndexList = Arrays.asList(
+                EnhancedGlobalSecondaryIndex.builder()
+                        .indexName("gsi_1")
+                        .projection(projection1)
+                        .provisionedThroughput(provisionedThroughput1)
+                        .build(),
+                EnhancedGlobalSecondaryIndex.builder()
+                        .indexName("gsi_2")
+                        .projection(projection2)
+                        .provisionedThroughput(provisionedThroughput2)
+                        .build());
+
+        CreateTableOperation<FakeItemWithIndices> operation =
+            CreateTableOperation.create(CreateTableEnhancedRequest.builder()
+                                                                  .globalSecondaryIndices(globalSecondaryIndexList)
+                                                                  .localSecondaryIndices(Collections.singletonList(
+                                                                      EnhancedLocalSecondaryIndex.create("lsi_1", projection3)))
+                                                                  .build());
+
+        CreateTableRequest request = operation.generateRequest(FakeItemWithIndices.getTableSchema(),
+                                                               PRIMARY_CONTEXT,
+                                                               null);
+
+
+
+        assertThat(request.tableName(), is(TABLE_NAME));
+        assertThat(request.keySchema(), containsInAnyOrder(KeySchemaElement.builder()
+                                                                           .attributeName("id")
+                                                                           .keyType(HASH)
+                                                                           .build(),
+                                                           KeySchemaElement.builder()
+                                                                           .attributeName("sort")
+                                                                           .keyType(RANGE)
+                                                                           .build()));
+        software.amazon.awssdk.services.dynamodb.model.GlobalSecondaryIndex expectedGsi1 =
+            software.amazon.awssdk.services.dynamodb.model.GlobalSecondaryIndex.builder()
+                                                                .indexName("gsi_1")
+                                                                .keySchema(KeySchemaElement.builder()
+                                                                                           .attributeName("gsi_id")
+                                                                                           .keyType(HASH)
+                                                                                           .build(),
+                                                                           KeySchemaElement.builder()
+                                                                                           .attributeName("gsi_sort")
+                                                                                           .keyType(RANGE)
+                                                                                           .build())
+                                                                .projection(projection1)
+                                                                .provisionedThroughput(provisionedThroughput1)
+                                                                .build();
+        software.amazon.awssdk.services.dynamodb.model.GlobalSecondaryIndex expectedGsi2 =
+            software.amazon.awssdk.services.dynamodb.model.GlobalSecondaryIndex.builder()
+                                                                .indexName("gsi_2")
+                                                                .keySchema(KeySchemaElement.builder()
+                                                                                           .attributeName("gsi_id")
+                                                                                           .keyType(HASH)
+                                                                                           .build())
+                                                                .projection(projection2)
+                                                                .provisionedThroughput(provisionedThroughput2)
+                                                                .build();
+        assertThat(request.globalSecondaryIndexes(), containsInAnyOrder(matchesGsi(expectedGsi1),
+                                                                        matchesGsi(expectedGsi2)));
+        software.amazon.awssdk.services.dynamodb.model.LocalSecondaryIndex expectedLsi =
+            software.amazon.awssdk.services.dynamodb.model.LocalSecondaryIndex.builder()
+                                                             .indexName("lsi_1")
+                                                             .keySchema(KeySchemaElement.builder()
+                                                                                        .attributeName("id")
+                                                                                        .keyType(HASH)
+                                                                                        .build(),
+                                                                        KeySchemaElement.builder()
+                                                                                        .attributeName("lsi_sort")
+                                                                                        .keyType(RANGE)
+                                                                                        .build())
+                                                             .projection(projection3)
+                                                             .build();
+        assertThat(request.localSecondaryIndexes(), containsInAnyOrder(expectedLsi));
+        assertThat(request.attributeDefinitions(), containsInAnyOrder(
+            AttributeDefinition.builder()
+                               .attributeName("id")
+                               .attributeType(ScalarAttributeType.S)
+                               .build(),
+            AttributeDefinition.builder()
+                               .attributeName("sort")
+                               .attributeType(ScalarAttributeType.S)
+                               .build(),
+            AttributeDefinition.builder()
+                               .attributeName("lsi_sort")
+                               .attributeType(ScalarAttributeType.S)
+                               .build(),
+            AttributeDefinition.builder()
+                               .attributeName("gsi_id")
+                               .attributeType(ScalarAttributeType.S)
+                               .build(),
+            AttributeDefinition.builder()
+                               .attributeName("gsi_sort")
+                               .attributeType(ScalarAttributeType.S)
+                               .build()));
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void generateRequest_invalidGsi() {
+        ProvisionedThroughput provisionedThroughput = ProvisionedThroughput.builder()
+                                                                           .readCapacityUnits(1L)
+                                                                           .writeCapacityUnits(1L)
+                                                                           .build();
+
+        List<EnhancedGlobalSecondaryIndex> invalidGsiList = Collections.singletonList(
+                EnhancedGlobalSecondaryIndex.builder()
+                        .indexName("invalid")
+                        .projection(p -> p.projectionType(ProjectionType.ALL))
+                        .provisionedThroughput(provisionedThroughput)
+                        .build());
+
+        CreateTableOperation<FakeItem> operation =
+            CreateTableOperation.create(CreateTableEnhancedRequest.builder().globalSecondaryIndices(invalidGsiList).build());
+
+        operation.generateRequest(FakeItem.getTableSchema(), PRIMARY_CONTEXT, null);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void generateRequest_invalidGsiAsLsiReference() {
+        List<EnhancedLocalSecondaryIndex> invalidGsiList = Collections.singletonList(
+            EnhancedLocalSecondaryIndex.create("gsi_1", Projection.builder().projectionType(ProjectionType.ALL).build()));
+
+        CreateTableOperation<FakeItemWithIndices> operation =
+            CreateTableOperation.create(CreateTableEnhancedRequest.builder().localSecondaryIndices(invalidGsiList).build());
+
+        operation.generateRequest(FakeItemWithIndices.getTableSchema(), PRIMARY_CONTEXT, null);
+    }
+
+    @Test
+    public void generateRequest_validLsiAsGsiReference() {
+        List<EnhancedGlobalSecondaryIndex> validLsiList = Collections.singletonList(
+                EnhancedGlobalSecondaryIndex.builder()
+                        .indexName("lsi_1")
+                        .projection(p -> p.projectionType(ProjectionType.ALL))
+                        .provisionedThroughput(p -> p.readCapacityUnits(1L).writeCapacityUnits(1L))
+                        .build());
+
+        CreateTableOperation<FakeItemWithIndices> operation =
+            CreateTableOperation.create(CreateTableEnhancedRequest.builder().globalSecondaryIndices(validLsiList).build());
+
+        CreateTableRequest request = operation.generateRequest(FakeItemWithIndices.getTableSchema(), PRIMARY_CONTEXT, null);
+
+        assertThat(request.globalSecondaryIndexes().size(), is(1));
+        software.amazon.awssdk.services.dynamodb.model.GlobalSecondaryIndex globalSecondaryIndex =
+            request.globalSecondaryIndexes().get(0);
+
+        assertThat(globalSecondaryIndex.indexName(), is("lsi_1"));
+    }
+
+    @Test
+    public void generateRequest_nonReferencedIndicesDoNotCreateExtraAttributeDefinitions() {
+        CreateTableOperation<FakeItemWithIndices> operation = CreateTableOperation.create(CreateTableEnhancedRequest.builder().build());
+
+        CreateTableRequest request = operation.generateRequest(FakeItemWithIndices.getTableSchema(),
+                                                               PRIMARY_CONTEXT, null);
+
+        AttributeDefinition attributeDefinition1 = AttributeDefinition.builder()
+                                                                      .attributeName("id")
+                                                                      .attributeType(ScalarAttributeType.S)
+                                                                      .build();
+        AttributeDefinition attributeDefinition2 = AttributeDefinition.builder()
+                                                                      .attributeName("sort")
+                                                                      .attributeType(ScalarAttributeType.S)
+                                                                      .build();
+
+        assertThat(request.attributeDefinitions(), containsInAnyOrder(attributeDefinition1, attributeDefinition2));
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void generateRequest_invalidLsi() {
+        List<EnhancedLocalSecondaryIndex> invalidLsiList = Collections.singletonList(
+            EnhancedLocalSecondaryIndex.create("invalid", Projection.builder().projectionType(ProjectionType.ALL).build()));
+
+        CreateTableOperation<FakeItem> operation =
+            CreateTableOperation.create(CreateTableEnhancedRequest.builder().localSecondaryIndices(invalidLsiList).build());
+
+        operation.generateRequest(FakeItem.getTableSchema(), PRIMARY_CONTEXT, null);
+    }
+
+    @Test
+    public void generateRequest_withProvisionedThroughput() {
+       ProvisionedThroughput provisionedThroughput = ProvisionedThroughput.builder()
+                                                                          .writeCapacityUnits(1L)
+                                                                          .readCapacityUnits(2L)
+                                                                          .build();
+
+        CreateTableOperation<FakeItem> operation = CreateTableOperation.create(
+            CreateTableEnhancedRequest.builder().provisionedThroughput(provisionedThroughput).build());
+
+        CreateTableRequest request = operation.generateRequest(FakeItem.getTableSchema(),
+                                                               PRIMARY_CONTEXT,
+                                                               null);
+
+        assertThat(request.billingMode(), is(BillingMode.PROVISIONED));
+        assertThat(request.provisionedThroughput(), is(provisionedThroughput));
+    }
+
+    @Test
+    public void generateRequest_withNoProvisionedThroughput() {
+        CreateTableOperation<FakeItem> operation = CreateTableOperation.create(CreateTableEnhancedRequest.builder().build());
+
+        CreateTableRequest request = operation.generateRequest(FakeItem.getTableSchema(),
+                                                               PRIMARY_CONTEXT,
+                                                               null);
+
+        assertThat(request.billingMode(), is(BillingMode.PAY_PER_REQUEST));
+    }
+
+
+    @Test
+    public void generateRequest_withNumericKey() {
+        CreateTableOperation<FakeItemWithNumericSort> operation = CreateTableOperation.create(CreateTableEnhancedRequest.builder()
+                                                                                                                        .build());
+
+        CreateTableRequest request = operation.generateRequest(FakeItemWithNumericSort.getTableSchema(),
+                                                               PRIMARY_CONTEXT,
+                                                               null);
+
+        assertThat(request.tableName(), is(TABLE_NAME));
+        assertThat(request.keySchema(), containsInAnyOrder(KeySchemaElement.builder()
+                                                                           .attributeName("id")
+                                                                           .keyType(HASH)
+                                                                           .build(),
+                                                           KeySchemaElement.builder()
+                                                                           .attributeName("sort")
+                                                                           .keyType(RANGE)
+                                                                           .build()));
+
+        assertThat(request.globalSecondaryIndexes(), is(DefaultSdkAutoConstructList.getInstance()));
+        assertThat(request.localSecondaryIndexes(), is(DefaultSdkAutoConstructList.getInstance()));
+
+        assertThat(request.attributeDefinitions(), containsInAnyOrder(
+            AttributeDefinition.builder()
+                               .attributeName("id")
+                               .attributeType(ScalarAttributeType.S)
+                               .build(),
+            AttributeDefinition.builder()
+                               .attributeName("sort")
+                               .attributeType(ScalarAttributeType.N)
+                               .build()));
+    }
+
+    @Test
+    public void generateRequest_withBinaryKey() {
+        CreateTableOperation<FakeItemWithBinaryKey> operation = CreateTableOperation.create(CreateTableEnhancedRequest.builder()
+                                                                                                                      .build());
+
+        CreateTableRequest request = operation.generateRequest(FakeItemWithBinaryKey.getTableSchema(),
+                                                               PRIMARY_CONTEXT,
+                                                               null);
+
+        assertThat(request.tableName(), is(TABLE_NAME));
+        assertThat(request.keySchema(), containsInAnyOrder(KeySchemaElement.builder()
+                                                                           .attributeName("id")
+                                                                           .keyType(HASH)
+                                                                           .build()));
+
+        assertThat(request.globalSecondaryIndexes(), is(empty()));
+        assertThat(request.localSecondaryIndexes(), is(empty()));
+
+        assertThat(request.attributeDefinitions(), containsInAnyOrder(
+            AttributeDefinition.builder()
+                               .attributeName("id")
+                               .attributeType(ScalarAttributeType.B)
+                               .build()));
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void generateRequest_doesNotWorkForIndex() {
+        CreateTableOperation<FakeItemWithIndices> operation = CreateTableOperation.create(CreateTableEnhancedRequest.builder()
+                                                                                                                    .build());
+
+        operation.generateRequest(FakeItemWithIndices.getTableSchema(), GSI_1_CONTEXT, null);
+    }
+
+    @Test
+    public void getServiceCall_makesTheRightCallAndReturnsResponse() {
+        CreateTableOperation<FakeItem> operation = CreateTableOperation.create(CreateTableEnhancedRequest.builder().build());
+        CreateTableRequest createTableRequest = CreateTableRequest.builder().build();
+        CreateTableResponse expectedResponse = CreateTableResponse.builder().build();
+        when(mockDynamoDbClient.createTable(any(CreateTableRequest.class))).thenReturn(expectedResponse);
+
+        CreateTableResponse actualResponse = operation.serviceCall(mockDynamoDbClient).apply(createTableRequest);
+
+        assertThat(actualResponse, sameInstance(expectedResponse));
+        verify(mockDynamoDbClient).createTable(same(createTableRequest));
+    }
+
+    @Test
+    public void transformResults_doesNothing() {
+        CreateTableOperation<FakeItem> operation = CreateTableOperation.create(CreateTableEnhancedRequest.builder().build());
+        CreateTableResponse response = CreateTableResponse.builder().build();
+
+        operation.transformResponse(response, FakeItem.getTableSchema(), PRIMARY_CONTEXT, null);
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/DeleteItemOperationTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/DeleteItemOperationTest.java
new file mode 100644
index 000000000000..e108eb7acf0e
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/DeleteItemOperationTest.java
@@ -0,0 +1,334 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.operations;
+
+import static java.util.Collections.singletonList;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.nullValue;
+import static org.hamcrest.Matchers.sameInstance;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyMap;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import static software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.FakeItem.createUniqueFakeItem;
+import static software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.FakeItemWithSort.createUniqueFakeItemWithSort;
+import static software.amazon.awssdk.enhanced.dynamodb.internal.AttributeValues.numberValue;
+import static software.amazon.awssdk.enhanced.dynamodb.internal.AttributeValues.stringValue;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClientExtension;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbExtensionContext;
+import software.amazon.awssdk.enhanced.dynamodb.Expression;
+import software.amazon.awssdk.enhanced.dynamodb.TableMetadata;
+import software.amazon.awssdk.enhanced.dynamodb.extensions.ReadModification;
+import software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.FakeItem;
+import software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.FakeItemComposedClass;
+import software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.FakeItemWithSort;
+import software.amazon.awssdk.enhanced.dynamodb.internal.extensions.DefaultDynamoDbExtensionContext;
+import software.amazon.awssdk.enhanced.dynamodb.model.DeleteItemEnhancedRequest;
+import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+import software.amazon.awssdk.services.dynamodb.model.Delete;
+import software.amazon.awssdk.services.dynamodb.model.DeleteItemRequest;
+import software.amazon.awssdk.services.dynamodb.model.DeleteItemResponse;
+import software.amazon.awssdk.services.dynamodb.model.ReturnValue;
+import software.amazon.awssdk.services.dynamodb.model.TransactWriteItem;
+
+@RunWith(MockitoJUnitRunner.class)
+public class DeleteItemOperationTest {
+    private static final String TABLE_NAME = "table-name";
+    private static final OperationContext PRIMARY_CONTEXT =
+        OperationContext.create(TABLE_NAME, TableMetadata.primaryIndexName());
+    private static final OperationContext GSI_1_CONTEXT =
+        OperationContext.create(TABLE_NAME, "gsi_1");
+    private static final Expression CONDITION_EXPRESSION;
+
+    static {
+        Map<String, String> expressionNames = new HashMap<>();
+        expressionNames.put("#test_field_1", "test_field_1");
+        expressionNames.put("#test_field_2", "test_field_2");
+        Map<String, AttributeValue> expressionValues = new HashMap<>();
+        expressionValues.put(":test_value_1", numberValue(1));
+        expressionValues.put(":test_value_2", numberValue(2));
+        CONDITION_EXPRESSION = Expression.builder()
+                                         .expression("#test_field_1 = :test_value_1 OR #test_field_2 = :test_value_2")
+                                         .expressionNames(Collections.unmodifiableMap(expressionNames))
+                                         .expressionValues(Collections.unmodifiableMap(expressionValues))
+                                         .build();
+    }
+
+    @Mock
+    private DynamoDbClient mockDynamoDbClient;
+
+    @Mock
+    private DynamoDbEnhancedClientExtension mockDynamoDbEnhancedClientExtension;
+
+    @Test
+    public void getServiceCall_makesTheRightCallAndReturnsResponse() {
+        FakeItem keyItem = createUniqueFakeItem();
+        DeleteItemOperation<FakeItem> deleteItemOperation =
+            DeleteItemOperation.create(DeleteItemEnhancedRequest.builder().key(k -> k.partitionValue(keyItem.getId())).build());
+        DeleteItemRequest deleteItemRequest = DeleteItemRequest.builder().tableName(TABLE_NAME).build();
+        DeleteItemResponse expectedResponse = DeleteItemResponse.builder().build();
+        when(mockDynamoDbClient.deleteItem(any(DeleteItemRequest.class))).thenReturn(expectedResponse);
+
+        DeleteItemResponse response = deleteItemOperation.serviceCall(mockDynamoDbClient).apply(deleteItemRequest);
+
+        assertThat(response, sameInstance(expectedResponse));
+        verify(mockDynamoDbClient).deleteItem(deleteItemRequest);
+    }
+
+    @Test
+    public void generateRequest_partitionKeyOnly() {
+        FakeItem keyItem = createUniqueFakeItem();
+        DeleteItemOperation<FakeItem> deleteItemOperation =
+            DeleteItemOperation.create(DeleteItemEnhancedRequest.builder().key(k -> k.partitionValue(keyItem.getId())).build());
+
+        DeleteItemRequest request = deleteItemOperation.generateRequest(FakeItem.getTableSchema(),
+                                                                        PRIMARY_CONTEXT,
+                                                                        null);
+
+        Map<String, AttributeValue> expectedKeyMap = new HashMap<>();
+        expectedKeyMap.put("id", AttributeValue.builder().s(keyItem.getId()).build());
+        DeleteItemRequest expectedRequest = DeleteItemRequest.builder()
+            .tableName(TABLE_NAME)
+            .key(expectedKeyMap)
+            .returnValues(ReturnValue.ALL_OLD)
+            .build();
+        assertThat(request, is(expectedRequest));
+    }
+
+    @Test
+    public void generateRequest_partitionAndSortKey() {
+        FakeItemWithSort keyItem = createUniqueFakeItemWithSort();
+        DeleteItemOperation<FakeItemWithSort> deleteItemOperation = DeleteItemOperation.create(
+            DeleteItemEnhancedRequest.builder()
+                                     .key(k -> k.partitionValue(keyItem.getId()).sortValue(keyItem.getSort()))
+                                     .build());
+
+        DeleteItemRequest request = deleteItemOperation.generateRequest(FakeItemWithSort.getTableSchema(),
+                                                                       PRIMARY_CONTEXT,
+                                                                        null);
+
+        Map<String, AttributeValue> expectedKeyMap = new HashMap<>();
+        expectedKeyMap.put("id", AttributeValue.builder().s(keyItem.getId()).build());
+        expectedKeyMap.put("sort", AttributeValue.builder().s(keyItem.getSort()).build());
+        DeleteItemRequest expectedRequest = DeleteItemRequest.builder()
+                                                       .tableName(TABLE_NAME)
+                                                       .key(expectedKeyMap)
+                                                       .returnValues(ReturnValue.ALL_OLD)
+                                                       .build();
+        assertThat(request, is(expectedRequest));
+    }
+
+    @Test
+    public void generateRequest_withConditionExpression() {
+        FakeItem keyItem = createUniqueFakeItem();
+        DeleteItemOperation<FakeItem> deleteItemOperation =
+            DeleteItemOperation.create(DeleteItemEnhancedRequest.builder()
+                                                                .key(k -> k.partitionValue(keyItem.getId()))
+                                                                .conditionExpression(CONDITION_EXPRESSION)
+                                                                .build());
+
+        DeleteItemRequest request = deleteItemOperation.generateRequest(FakeItem.getTableSchema(),
+                                                                        PRIMARY_CONTEXT,
+                                                                        null);
+
+        assertThat(request.conditionExpression(), is(CONDITION_EXPRESSION.expression()));
+        assertThat(request.expressionAttributeNames(), is(CONDITION_EXPRESSION.expressionNames()));
+        assertThat(request.expressionAttributeValues(), is(CONDITION_EXPRESSION.expressionValues()));
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void generateRequest_noPartitionKey_throwsIllegalArgumentException() {
+        DeleteItemOperation<FakeItemComposedClass> deleteItemOperation =
+            DeleteItemOperation.create(DeleteItemEnhancedRequest.builder().key(k -> k.partitionValue("whatever")).build());
+
+        deleteItemOperation.generateRequest(FakeItemComposedClass.getTableSchema(), PRIMARY_CONTEXT, null);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void generateRequest_withIndex_throwsIllegalArgumentException() {
+        DeleteItemOperation<FakeItem> deleteItemOperation =
+            DeleteItemOperation.create(DeleteItemEnhancedRequest.builder().key(k -> k.partitionValue("whatever")).build());
+
+        deleteItemOperation.generateRequest(FakeItem.getTableSchema(), GSI_1_CONTEXT, null);
+    }
+
+    @Test
+    public void transformResponse_correctlyTransformsIntoAnItem() {
+        FakeItem keyItem = createUniqueFakeItem();
+        DeleteItemOperation<FakeItem> deleteItemOperation =
+            DeleteItemOperation.create(DeleteItemEnhancedRequest.builder().key(k -> k.partitionValue(keyItem.getId())).build());
+        Map<String, AttributeValue> responseMap = new HashMap<>();
+        responseMap.put("id", AttributeValue.builder().s(keyItem.getId()).build());
+        responseMap.put("subclass_attribute", AttributeValue.builder().s("test-value").build());
+        DeleteItemResponse response = DeleteItemResponse.builder()
+                                                        .attributes(responseMap)
+                                                        .build();
+
+        FakeItem result = deleteItemOperation.transformResponse(response,
+                                                                FakeItem.getTableSchema(),
+                                                                PRIMARY_CONTEXT,
+                                                                null);
+
+        assertThat(result.getId(), is(keyItem.getId()));
+        assertThat(result.getSubclassAttribute(), is("test-value"));
+    }
+
+    @Test
+    public void transformResponse_noResults_returnsNull() {
+        FakeItem keyItem = createUniqueFakeItem();
+        DeleteItemOperation<FakeItem> deleteItemOperation =
+            DeleteItemOperation.create(DeleteItemEnhancedRequest.builder().key(k -> k.partitionValue(keyItem.getId())).build());
+        DeleteItemResponse response = DeleteItemResponse.builder()
+                                                        .build();
+
+        FakeItem result = deleteItemOperation.transformResponse(response,
+                                                                FakeItem.getTableSchema(),
+                                                                PRIMARY_CONTEXT,
+                                                                null);
+
+        assertThat(result, is(nullValue()));
+    }
+
+    @Test
+    public void generateRequest_withExtension_doesNotModifyKey() {
+        FakeItem baseFakeItem = createUniqueFakeItem();
+        Map<String, AttributeValue> keyMap = FakeItem.getTableSchema().itemToMap(baseFakeItem, singletonList("id"));
+        DeleteItemOperation<FakeItem> deleteItemOperation =
+            DeleteItemOperation.create(DeleteItemEnhancedRequest.builder()
+                                                                .key(k -> k.partitionValue(baseFakeItem.getId()))
+                                                                .build());
+
+
+        DeleteItemRequest request = deleteItemOperation.generateRequest(FakeItem.getTableSchema(),
+                                                                        PRIMARY_CONTEXT,
+                                                                        mockDynamoDbEnhancedClientExtension);
+
+        assertThat(request.key(), is(keyMap));
+        verify(mockDynamoDbEnhancedClientExtension, never()).beforeWrite(any(DynamoDbExtensionContext.BeforeWrite.class));
+    }
+
+    @Test
+    public void transformResponse_withExtension_appliesItemModification() {
+        FakeItem baseFakeItem = createUniqueFakeItem();
+        FakeItem fakeItem = createUniqueFakeItem();
+        Map<String, AttributeValue> baseFakeItemMap = FakeItem.getTableSchema().itemToMap(baseFakeItem, false);
+        Map<String, AttributeValue> fakeItemMap = FakeItem.getTableSchema().itemToMap(fakeItem, false);
+        DeleteItemOperation<FakeItem> deleteItemOperation =
+            DeleteItemOperation.create(DeleteItemEnhancedRequest.builder()
+                                                                .key(k -> k.partitionValue(baseFakeItem.getId()))
+                                                                .build());
+
+        DeleteItemResponse response = DeleteItemResponse.builder()
+                                                        .attributes(baseFakeItemMap)
+                                                        .build();
+        when(mockDynamoDbEnhancedClientExtension.afterRead(any(DynamoDbExtensionContext.AfterRead.class)))
+            .thenReturn(ReadModification.builder().transformedItem(fakeItemMap).build());
+
+        FakeItem resultItem = deleteItemOperation.transformResponse(response,
+                                                                    FakeItem.getTableSchema(),
+                                                                    PRIMARY_CONTEXT,
+                                                                    mockDynamoDbEnhancedClientExtension);
+
+        assertThat(resultItem, is(fakeItem));
+        verify(mockDynamoDbEnhancedClientExtension).afterRead(DefaultDynamoDbExtensionContext.builder()
+                                                                                             .tableMetadata(FakeItem.getTableMetadata())
+                                                                                             .operationContext(PRIMARY_CONTEXT)
+                                                                                             .items(baseFakeItemMap).build());
+    }
+
+    @Test
+    public void generateTransactWriteItem_basicRequest() {
+        FakeItem fakeItem = createUniqueFakeItem();
+        Map<String, AttributeValue> fakeItemMap = FakeItem.getTableSchema().itemToMap(fakeItem, true);
+        DeleteItemOperation<FakeItem> deleteItemOperation =
+            spy(DeleteItemOperation.create(DeleteItemEnhancedRequest.builder()
+                                                                    .key(k -> k.partitionValue(fakeItem.getId()))
+                                                                    .build()));
+        OperationContext context = OperationContext.create(TABLE_NAME, TableMetadata.primaryIndexName());
+
+        DeleteItemRequest deleteItemRequest = DeleteItemRequest.builder()
+                                                               .tableName(TABLE_NAME)
+                                                               .key(fakeItemMap)
+                                                               .build();
+        doReturn(deleteItemRequest).when(deleteItemOperation).generateRequest(any(), any(), any());
+
+        TransactWriteItem actualResult = deleteItemOperation.generateTransactWriteItem(FakeItem.getTableSchema(),
+                                                                                       context,
+                                                                                       mockDynamoDbEnhancedClientExtension);
+
+        TransactWriteItem expectedResult = TransactWriteItem.builder()
+                                                            .delete(Delete.builder()
+                                                                          .key(fakeItemMap)
+                                                                          .tableName(TABLE_NAME)
+                                                                          .build())
+                                                            .build();
+        assertThat(actualResult, is(expectedResult));
+        verify(deleteItemOperation).generateRequest(FakeItem.getTableSchema(), context, mockDynamoDbEnhancedClientExtension);
+    }
+
+    @Test
+    public void generateTransactWriteItem_conditionalRequest() {
+        FakeItem fakeItem = createUniqueFakeItem();
+        Map<String, AttributeValue> fakeItemMap = FakeItem.getTableSchema().itemToMap(fakeItem, true);
+        DeleteItemOperation<FakeItem> deleteItemOperation =
+            spy(DeleteItemOperation.create(DeleteItemEnhancedRequest.builder()
+                                                                    .key(k -> k.partitionValue(fakeItem.getId()))
+                                                                    .build()));
+        OperationContext context = OperationContext.create(TABLE_NAME, TableMetadata.primaryIndexName());
+
+        String conditionExpression = "condition-expression";
+        Map<String, AttributeValue> attributeValues = Collections.singletonMap("key", stringValue("value1"));
+        Map<String, String> attributeNames = Collections.singletonMap("key", "value2");
+
+        DeleteItemRequest deleteItemRequest = DeleteItemRequest.builder()
+                                                               .tableName(TABLE_NAME)
+                                                               .key(fakeItemMap)
+                                                               .conditionExpression(conditionExpression)
+                                                               .expressionAttributeValues(attributeValues)
+                                                               .expressionAttributeNames(attributeNames)
+                                                               .build();
+        doReturn(deleteItemRequest).when(deleteItemOperation).generateRequest(any(), any(), any());
+
+        TransactWriteItem actualResult = deleteItemOperation.generateTransactWriteItem(FakeItem.getTableSchema(),
+                                                                                       context,
+                                                                                       mockDynamoDbEnhancedClientExtension);
+
+        TransactWriteItem expectedResult = TransactWriteItem.builder()
+                                                            .delete(Delete.builder()
+                                                                          .key(fakeItemMap)
+                                                                          .tableName(TABLE_NAME)
+                                                                          .conditionExpression(conditionExpression)
+                                                                          .expressionAttributeNames(attributeNames)
+                                                                          .expressionAttributeValues(attributeValues)
+                                                                          .build())
+                                                            .build();
+        assertThat(actualResult, is(expectedResult));
+        verify(deleteItemOperation).generateRequest(FakeItem.getTableSchema(), context, mockDynamoDbEnhancedClientExtension);
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/GetItemOperationTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/GetItemOperationTest.java
new file mode 100644
index 000000000000..ac386af59d34
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/GetItemOperationTest.java
@@ -0,0 +1,230 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.operations;
+
+import static java.util.Collections.singletonList;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.nullValue;
+import static org.hamcrest.Matchers.sameInstance;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import static software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.FakeItem.createUniqueFakeItem;
+import static software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.FakeItemWithSort.createUniqueFakeItemWithSort;
+
+import java.util.HashMap;
+import java.util.Map;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClientExtension;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbExtensionContext;
+import software.amazon.awssdk.enhanced.dynamodb.TableMetadata;
+import software.amazon.awssdk.enhanced.dynamodb.extensions.ReadModification;
+import software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.FakeItem;
+import software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.FakeItemComposedClass;
+import software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.FakeItemWithSort;
+import software.amazon.awssdk.enhanced.dynamodb.internal.extensions.DefaultDynamoDbExtensionContext;
+import software.amazon.awssdk.enhanced.dynamodb.model.GetItemEnhancedRequest;
+import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+import software.amazon.awssdk.services.dynamodb.model.GetItemRequest;
+import software.amazon.awssdk.services.dynamodb.model.GetItemResponse;
+
+@RunWith(MockitoJUnitRunner.class)
+public class GetItemOperationTest {
+    private static final String TABLE_NAME = "table-name";
+    private static final OperationContext PRIMARY_CONTEXT =
+        OperationContext.create(TABLE_NAME, TableMetadata.primaryIndexName());
+    private static final OperationContext GSI_1_CONTEXT =
+        OperationContext.create(TABLE_NAME, "gsi_1");
+
+    @Mock
+    private DynamoDbClient mockDynamoDbClient;
+
+    @Mock
+    private DynamoDbEnhancedClientExtension mockDynamoDbEnhancedClientExtension;
+
+    @Test
+    public void getServiceCall_makesTheRightCallAndReturnsResponse() {
+        FakeItem keyItem = createUniqueFakeItem();
+        GetItemOperation<FakeItem> getItemOperation =
+            GetItemOperation.create(GetItemEnhancedRequest.builder().key(k -> k.partitionValue(keyItem.getId())).build());
+        GetItemRequest getItemRequest = GetItemRequest.builder().tableName(TABLE_NAME).build();
+        GetItemResponse expectedResponse = GetItemResponse.builder().build();
+        when(mockDynamoDbClient.getItem(any(GetItemRequest.class))).thenReturn(expectedResponse);
+
+        GetItemResponse response = getItemOperation.serviceCall(mockDynamoDbClient).apply(getItemRequest);
+
+        assertThat(response, sameInstance(expectedResponse));
+        verify(mockDynamoDbClient).getItem(getItemRequest);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void generateRequest_withIndex_throwsIllegalArgumentException() {
+        FakeItem keyItem = createUniqueFakeItem();
+        GetItemOperation<FakeItem> getItemOperation =
+            GetItemOperation.create(GetItemEnhancedRequest.builder().key(k -> k.partitionValue(keyItem.getId())).build());
+
+        getItemOperation.generateRequest(FakeItem.getTableSchema(), GSI_1_CONTEXT, null);
+    }
+
+    @Test
+    public void generateRequest_consistentRead() {
+        FakeItem keyItem = createUniqueFakeItem();
+        GetItemOperation<FakeItem> getItemOperation =
+            GetItemOperation.create(GetItemEnhancedRequest.builder()
+                                                          .key(k -> k.partitionValue(keyItem.getId()))
+                                                          .consistentRead(true).build());
+
+        GetItemRequest request = getItemOperation.generateRequest(FakeItem.getTableSchema(),
+                                                                  PRIMARY_CONTEXT,
+                                                                  null);
+
+        Map<String, AttributeValue> expectedKeyMap = new HashMap<>();
+        expectedKeyMap.put("id", AttributeValue.builder().s(keyItem.getId()).build());
+        GetItemRequest expectedRequest = GetItemRequest.builder()
+                                                       .tableName(TABLE_NAME)
+                                                       .key(expectedKeyMap)
+                                                       .consistentRead(true)
+                                                       .build();
+        assertThat(request, is(expectedRequest));
+    }
+
+    @Test
+    public void generateRequest_partitionKeyOnly() {
+        FakeItem keyItem = createUniqueFakeItem();
+        GetItemOperation<FakeItem> getItemOperation =
+            GetItemOperation.create(GetItemEnhancedRequest.builder().key(k -> k.partitionValue(keyItem.getId())).build());
+
+        GetItemRequest request = getItemOperation.generateRequest(FakeItem.getTableSchema(),
+                                                                  PRIMARY_CONTEXT,
+                                                                  null);
+
+        Map<String, AttributeValue> expectedKeyMap = new HashMap<>();
+        expectedKeyMap.put("id", AttributeValue.builder().s(keyItem.getId()).build());
+        GetItemRequest expectedRequest = GetItemRequest.builder()
+            .tableName(TABLE_NAME)
+            .key(expectedKeyMap)
+            .build();
+        assertThat(request, is(expectedRequest));
+    }
+
+    @Test
+    public void generateRequest_partitionAndSortKey() {
+        FakeItemWithSort keyItem = createUniqueFakeItemWithSort();
+        GetItemOperation<FakeItemWithSort> getItemOperation =
+            GetItemOperation.create(GetItemEnhancedRequest.builder()
+                                                          .key(k -> k.partitionValue(keyItem.getId())
+                                                                     .sortValue(keyItem.getSort()))
+                                                          .build());
+
+        GetItemRequest request = getItemOperation.generateRequest(FakeItemWithSort.getTableSchema(),
+                                                                  PRIMARY_CONTEXT,
+                                                                  null);
+
+        Map<String, AttributeValue> expectedKeyMap = new HashMap<>();
+        expectedKeyMap.put("id", AttributeValue.builder().s(keyItem.getId()).build());
+        expectedKeyMap.put("sort", AttributeValue.builder().s(keyItem.getSort()).build());
+        GetItemRequest expectedRequest = GetItemRequest.builder()
+                                                       .tableName(TABLE_NAME)
+                                                       .key(expectedKeyMap)
+                                                       .build();
+        assertThat(request, is(expectedRequest));
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void generateRequest_noPartitionKey_throwsIllegalArgumentException() {
+        GetItemOperation<FakeItemComposedClass> getItemOperation =
+            GetItemOperation.create(GetItemEnhancedRequest.builder().key(k -> k.partitionValue("whatever")).build());
+
+        getItemOperation.generateRequest(FakeItemComposedClass.getTableSchema(), PRIMARY_CONTEXT, null);
+    }
+
+    @Test
+    public void transformResponse_noItem() {
+        FakeItem keyItem = createUniqueFakeItem();
+        GetItemOperation<FakeItem> getItemOperation =
+            GetItemOperation.create(GetItemEnhancedRequest.builder().key(k -> k.partitionValue(keyItem.getId())).build());
+        GetItemResponse response = GetItemResponse.builder().build();
+
+        FakeItem result = getItemOperation.transformResponse(response, FakeItem.getTableSchema(), PRIMARY_CONTEXT,
+                                                             null);
+
+        assertThat(result, is(nullValue()));
+    }
+
+    @Test
+    public void transformResponse_correctlyTransformsIntoAnItem() {
+        FakeItem keyItem = createUniqueFakeItem();
+        GetItemOperation<FakeItem> getItemOperation =
+            GetItemOperation.create(GetItemEnhancedRequest.builder().key(k -> k.partitionValue(keyItem.getId())).build());
+        Map<String, AttributeValue> responseMap = new HashMap<>();
+        responseMap.put("id", AttributeValue.builder().s(keyItem.getId()).build());
+        responseMap.put("subclass_attribute", AttributeValue.builder().s("test-value").build());
+        GetItemResponse response = GetItemResponse.builder()
+                                                  .item(responseMap)
+                                                  .build();
+
+        FakeItem result = getItemOperation.transformResponse(response, FakeItem.getTableSchema(), PRIMARY_CONTEXT,
+                                                             null);
+
+        assertThat(result.getId(), is(keyItem.getId()));
+        assertThat(result.getSubclassAttribute(), is("test-value"));
+    }
+
+    @Test
+    public void generateRequest_withExtension_doesNotModifyKey() {
+        FakeItem baseFakeItem = createUniqueFakeItem();
+        Map<String, AttributeValue> keyMap = FakeItem.getTableSchema().itemToMap(baseFakeItem, singletonList("id"));
+        GetItemOperation<FakeItem> getItemOperation =
+            GetItemOperation.create(GetItemEnhancedRequest.builder().key(k -> k.partitionValue(baseFakeItem.getId())).build());
+
+        GetItemRequest request = getItemOperation.generateRequest(FakeItem.getTableSchema(),
+                                                                  PRIMARY_CONTEXT,
+                                                                  mockDynamoDbEnhancedClientExtension);
+
+        assertThat(request.key(), is(keyMap));
+        verify(mockDynamoDbEnhancedClientExtension, never()).beforeWrite(any(DynamoDbExtensionContext.BeforeWrite.class));
+    }
+
+    @Test
+    public void transformResponse_withExtension_appliesItemModification() {
+        FakeItem baseFakeItem = createUniqueFakeItem();
+        FakeItem fakeItem = createUniqueFakeItem();
+        Map<String, AttributeValue> baseFakeItemMap = FakeItem.getTableSchema().itemToMap(baseFakeItem, false);
+        Map<String, AttributeValue> fakeItemMap = FakeItem.getTableSchema().itemToMap(fakeItem, false);
+        GetItemOperation<FakeItem> getItemOperation =
+            GetItemOperation.create(GetItemEnhancedRequest.builder().key(k -> k.partitionValue(baseFakeItem.getId())).build());
+        GetItemResponse response = GetItemResponse.builder()
+                                                  .item(baseFakeItemMap)
+                                                  .build();
+        when(mockDynamoDbEnhancedClientExtension.afterRead(any(DynamoDbExtensionContext.AfterRead.class)))
+            .thenReturn(ReadModification.builder().transformedItem(fakeItemMap).build());
+
+        FakeItem resultItem = getItemOperation.transformResponse(response, FakeItem.getTableSchema(),
+                                                                 PRIMARY_CONTEXT, mockDynamoDbEnhancedClientExtension);
+
+        assertThat(resultItem, is(fakeItem));
+        verify(mockDynamoDbEnhancedClientExtension).afterRead(DefaultDynamoDbExtensionContext.builder()
+                                                              .tableMetadata(FakeItem.getTableMetadata())
+                                                              .operationContext(PRIMARY_CONTEXT)
+                                                              .items(baseFakeItemMap).build());
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/IndexOperationTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/IndexOperationTest.java
new file mode 100644
index 000000000000..21c32a1c3732
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/IndexOperationTest.java
@@ -0,0 +1,103 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.operations;
+
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.sameInstance;
+import static org.junit.Assert.assertThat;
+
+import java.util.concurrent.CompletableFuture;
+import java.util.function.Function;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClientExtension;
+import software.amazon.awssdk.enhanced.dynamodb.TableSchema;
+import software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.FakeItem;
+import software.amazon.awssdk.services.dynamodb.DynamoDbAsyncClient;
+import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
+
+@RunWith(MockitoJUnitRunner.class)
+public class IndexOperationTest {
+
+    private static final String FAKE_RESULT = "fake-result";
+    private static final String FAKE_TABLE_NAME = "fake-table-name";
+    private static final String FAKE_INDEX_NAME = "fake-index-name";
+
+    private final FakeIndexOperation fakeIndexOperation = new FakeIndexOperation();
+
+    @Mock
+    private DynamoDbEnhancedClientExtension mockDynamoDbEnhancedClientExtension;
+
+    @Mock
+    private DynamoDbClient mockDynamoDbClient;
+
+    @Test
+    public void executeOnSecondaryIndex_defaultImplementation_callsExecuteCorrectly() {
+        fakeIndexOperation.executeOnSecondaryIndex(FakeItem.getTableSchema(),
+                                                   FAKE_TABLE_NAME,
+                                                   FAKE_INDEX_NAME,
+                                                   mockDynamoDbEnhancedClientExtension,
+                                                   mockDynamoDbClient);
+
+        assertThat(fakeIndexOperation.lastDynamoDbClient, sameInstance(mockDynamoDbClient));
+        assertThat(fakeIndexOperation.lastDynamoDbEnhancedClientExtension, sameInstance(mockDynamoDbEnhancedClientExtension));
+        assertThat(fakeIndexOperation.lastTableSchema, sameInstance(FakeItem.getTableSchema()));
+        assertThat(fakeIndexOperation.lastOperationContext, is(OperationContext.create(FAKE_TABLE_NAME, FAKE_INDEX_NAME)));
+    }
+
+    private static class FakeIndexOperation implements IndexOperation<FakeItem, String, String, String> {
+        private TableSchema<FakeItem> lastTableSchema = null;
+        private OperationContext lastOperationContext = null;
+        private DynamoDbEnhancedClientExtension lastDynamoDbEnhancedClientExtension = null;
+        private DynamoDbClient lastDynamoDbClient = null;
+
+        @Override
+        public String generateRequest(TableSchema<FakeItem> tableSchema, OperationContext context,
+                                      DynamoDbEnhancedClientExtension extension) {
+            return null;
+        }
+
+        @Override
+        public Function<String, String> serviceCall(DynamoDbClient dynamoDbClient) {
+            return null;
+        }
+
+        @Override
+        public Function<String, CompletableFuture<String>> asyncServiceCall(DynamoDbAsyncClient dynamoDbAsyncClient) {
+            return null;
+        }
+
+        @Override
+        public String transformResponse(String response, TableSchema<FakeItem> tableSchema, OperationContext context,
+                                        DynamoDbEnhancedClientExtension extension) {
+            return null;
+        }
+
+        @Override
+        public String execute(TableSchema<FakeItem> tableSchema,
+                              OperationContext context,
+                              DynamoDbEnhancedClientExtension extension,
+                              DynamoDbClient dynamoDbClient) {
+            lastTableSchema = tableSchema;
+            lastOperationContext = context;
+            lastDynamoDbEnhancedClientExtension = extension;
+            lastDynamoDbClient = dynamoDbClient;
+            return FAKE_RESULT;
+        }
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/OperationContextTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/OperationContextTest.java
new file mode 100644
index 000000000000..e2dadb6199fe
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/OperationContextTest.java
@@ -0,0 +1,42 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.operations;
+
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertThat;
+
+import org.hamcrest.Matchers;
+import org.junit.Test;
+import software.amazon.awssdk.enhanced.dynamodb.TableMetadata;
+
+public class OperationContextTest {
+    @Test
+    public void createWithTableNameAndIndexName() {
+        OperationContext context = OperationContext.create("table_name", "index_name");
+
+        assertThat(context.tableName(), is("table_name"));
+        assertThat(context.indexName(), is("index_name"));
+    }
+
+    @Test
+    public void createWithTableName() {
+        OperationContext context = OperationContext.create("table_name");
+
+        assertThat(context.tableName(), is("table_name"));
+        assertThat(context.indexName(), Matchers.is(TableMetadata.primaryIndexName()));
+    }
+
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/PutItemOperationTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/PutItemOperationTest.java
new file mode 100644
index 000000000000..eaec39926a08
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/PutItemOperationTest.java
@@ -0,0 +1,337 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.operations;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.nullValue;
+import static org.hamcrest.Matchers.sameInstance;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyMap;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import static software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.FakeItem.createUniqueFakeItem;
+import static software.amazon.awssdk.enhanced.dynamodb.internal.AttributeValues.numberValue;
+import static software.amazon.awssdk.enhanced.dynamodb.internal.AttributeValues.stringValue;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClientExtension;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbExtensionContext;
+import software.amazon.awssdk.enhanced.dynamodb.Expression;
+import software.amazon.awssdk.enhanced.dynamodb.TableMetadata;
+import software.amazon.awssdk.enhanced.dynamodb.extensions.WriteModification;
+import software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.FakeItem;
+import software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.FakeItemComposedClass;
+import software.amazon.awssdk.enhanced.dynamodb.internal.extensions.DefaultDynamoDbExtensionContext;
+import software.amazon.awssdk.enhanced.dynamodb.model.PutItemEnhancedRequest;
+import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+import software.amazon.awssdk.services.dynamodb.model.Put;
+import software.amazon.awssdk.services.dynamodb.model.PutItemRequest;
+import software.amazon.awssdk.services.dynamodb.model.PutItemResponse;
+import software.amazon.awssdk.services.dynamodb.model.TransactWriteItem;
+
+@RunWith(MockitoJUnitRunner.class)
+public class PutItemOperationTest {
+    private static final String TABLE_NAME = "table-name";
+    private static final OperationContext PRIMARY_CONTEXT =
+        OperationContext.create(TABLE_NAME, TableMetadata.primaryIndexName());
+    private static final OperationContext GSI_1_CONTEXT =
+        OperationContext.create(TABLE_NAME, "gsi_1");
+    private static final Expression CONDITION_EXPRESSION;
+    private static final Expression CONDITION_EXPRESSION_2;
+
+    static {
+        Map<String, String> expressionNames = new HashMap<>();
+        expressionNames.put("#test_field_1", "test_field_1");
+        expressionNames.put("#test_field_2", "test_field_2");
+        Map<String, AttributeValue> expressionValues = new HashMap<>();
+        expressionValues.put(":test_value_1", numberValue(1));
+        expressionValues.put(":test_value_2", numberValue(2));
+        CONDITION_EXPRESSION = Expression.builder()
+                                         .expression("#test_field_1 = :test_value_1 OR #test_field_2 = :test_value_2")
+                                         .expressionNames(Collections.unmodifiableMap(expressionNames))
+                                         .expressionValues(Collections.unmodifiableMap(expressionValues))
+                                         .build();
+    }
+
+    static {
+        Map<String, String> expressionNames = new HashMap<>();
+        expressionNames.put("#test_field_3", "test_field_3");
+        expressionNames.put("#test_field_4", "test_field_4");
+        Map<String, AttributeValue> expressionValues = new HashMap<>();
+        expressionValues.put(":test_value_3", numberValue(3));
+        expressionValues.put(":test_value_4", numberValue(4));
+        CONDITION_EXPRESSION_2 = Expression.builder()
+                                         .expression("#test_field_3 = :test_value_3 OR #test_field_4 = :test_value_4")
+                                         .expressionNames(Collections.unmodifiableMap(expressionNames))
+                                         .expressionValues(Collections.unmodifiableMap(expressionValues))
+                                         .build();
+    }
+
+    @Mock
+    private DynamoDbClient mockDynamoDbClient;
+    @Mock
+    private DynamoDbEnhancedClientExtension mockDynamoDbEnhancedClientExtension;
+
+    @Test
+    public void getServiceCall_makesTheRightCallAndReturnsResponse() {
+        FakeItem fakeItem = createUniqueFakeItem();
+        PutItemOperation<FakeItem> putItemOperation = PutItemOperation.create(PutItemEnhancedRequest.builder(FakeItem.class).item(fakeItem).build());
+        PutItemRequest getItemRequest = PutItemRequest.builder().tableName(TABLE_NAME).build();
+        PutItemResponse expectedResponse = PutItemResponse.builder().build();
+        when(mockDynamoDbClient.putItem(any(PutItemRequest.class))).thenReturn(expectedResponse);
+
+        PutItemResponse response = putItemOperation.serviceCall(mockDynamoDbClient).apply(getItemRequest);
+
+        assertThat(response, sameInstance(expectedResponse));
+        verify(mockDynamoDbClient).putItem(getItemRequest);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void generateRequest_withIndex_throwsIllegalArgumentException() {
+        FakeItem fakeItem = createUniqueFakeItem();
+        PutItemOperation<FakeItem> putItemOperation = PutItemOperation.create(PutItemEnhancedRequest.builder(FakeItem.class).item(fakeItem).build());
+
+        putItemOperation.generateRequest(FakeItem.getTableSchema(), GSI_1_CONTEXT, null);
+    }
+
+    @Test
+    public void generateRequest_generatesCorrectRequest() {
+        FakeItem fakeItem = createUniqueFakeItem();
+        fakeItem.setSubclassAttribute("subclass-value");
+        PutItemOperation<FakeItem> putItemOperation = PutItemOperation.create(PutItemEnhancedRequest.builder(FakeItem.class).item(fakeItem).build());
+
+        PutItemRequest request = putItemOperation.generateRequest(FakeItem.getTableSchema(),
+                                                                  PRIMARY_CONTEXT,
+                                                                  null);
+
+        Map<String, AttributeValue> expectedItemMap = new HashMap<>();
+        expectedItemMap.put("id", AttributeValue.builder().s(fakeItem.getId()).build());
+        expectedItemMap.put("subclass_attribute", AttributeValue.builder().s("subclass-value").build());
+        PutItemRequest expectedRequest = PutItemRequest.builder()
+            .tableName(TABLE_NAME)
+            .item(expectedItemMap)
+            .build();
+        assertThat(request, is(expectedRequest));
+    }
+
+    @Test
+    public void generateRequest_withConditionExpression_generatesCorrectRequest() {
+        FakeItem fakeItem = createUniqueFakeItem();
+        fakeItem.setSubclassAttribute("subclass-value");
+
+        PutItemOperation<FakeItem> putItemOperation =
+            PutItemOperation.create(PutItemEnhancedRequest.builder(FakeItem.class)
+                                                          .conditionExpression(CONDITION_EXPRESSION)
+                                                          .item(fakeItem)
+                                                          .build());
+
+        PutItemRequest request = putItemOperation.generateRequest(FakeItem.getTableSchema(),
+                                                                  PRIMARY_CONTEXT,
+                                                                  null);
+
+        Map<String, AttributeValue> expectedItemMap = new HashMap<>();
+        expectedItemMap.put("id", AttributeValue.builder().s(fakeItem.getId()).build());
+        expectedItemMap.put("subclass_attribute", AttributeValue.builder().s("subclass-value").build());
+        PutItemRequest expectedRequest =
+            PutItemRequest.builder()
+                          .tableName(TABLE_NAME)
+                          .item(expectedItemMap)
+                          .conditionExpression(CONDITION_EXPRESSION.expression())
+                          .expressionAttributeNames(CONDITION_EXPRESSION.expressionNames())
+                          .expressionAttributeValues(CONDITION_EXPRESSION.expressionValues())
+                          .build();
+        assertThat(request, is(expectedRequest));
+    }
+
+    @Test
+    public void generateRequest_withConditionExpression_andExtensionWithSingleCondition() {
+        FakeItem baseFakeItem = createUniqueFakeItem();
+        when(mockDynamoDbEnhancedClientExtension.beforeWrite(any(DynamoDbExtensionContext.BeforeWrite.class)))
+            .thenReturn(WriteModification.builder().additionalConditionalExpression(CONDITION_EXPRESSION_2).build());
+        PutItemOperation<FakeItem> putItemOperation =
+            PutItemOperation.create(PutItemEnhancedRequest.builder(FakeItem.class)
+                                                          .conditionExpression(CONDITION_EXPRESSION)
+                                                          .item(baseFakeItem)
+                                                          .build());
+
+        PutItemRequest request = putItemOperation.generateRequest(FakeItem.getTableSchema(),
+                                                                  PRIMARY_CONTEXT,
+                                                                  mockDynamoDbEnhancedClientExtension);
+
+        Expression expectedCondition = Expression.join(CONDITION_EXPRESSION, CONDITION_EXPRESSION_2, " AND ");
+        assertThat(request.conditionExpression(), is(expectedCondition.expression()));
+        assertThat(request.expressionAttributeNames(), is(expectedCondition.expressionNames()));
+        assertThat(request.expressionAttributeValues(), is(expectedCondition.expressionValues()));
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void generateRequest_noPartitionKey_throwsIllegalArgumentException() {
+        FakeItemComposedClass fakeItem = FakeItemComposedClass.builder().composedAttribute("whatever").build();
+        PutItemOperation<FakeItemComposedClass> putItemOperation =
+            PutItemOperation.create(PutItemEnhancedRequest.builder(FakeItemComposedClass.class).item(fakeItem).build());
+
+        putItemOperation.generateRequest(FakeItemComposedClass.getTableSchema(), PRIMARY_CONTEXT, null);
+    }
+
+    @Test
+    public void transformResponse_doesNotBlowUp() {
+        FakeItem fakeItem = createUniqueFakeItem();
+        PutItemOperation<FakeItem> putItemOperation = PutItemOperation.create(PutItemEnhancedRequest.builder(FakeItem.class)
+                                                                                                    .item(fakeItem)
+                                                                                                    .build());
+        PutItemResponse response = PutItemResponse.builder().build();
+
+        putItemOperation.transformResponse(response, FakeItem.getTableSchema(), PRIMARY_CONTEXT, null);
+    }
+
+    @Test
+    public void generateRequest_withExtension_modifiesItemToPut() {
+        FakeItem baseFakeItem = createUniqueFakeItem();
+        FakeItem fakeItem = createUniqueFakeItem();
+        Map<String, AttributeValue> baseMap = FakeItem.getTableSchema().itemToMap(baseFakeItem, true);
+        Map<String, AttributeValue> fakeMap = FakeItem.getTableSchema().itemToMap(fakeItem, true);
+        when(mockDynamoDbEnhancedClientExtension.beforeWrite(any(DynamoDbExtensionContext.BeforeWrite.class)))
+            .thenReturn(WriteModification.builder().transformedItem(fakeMap).build());
+        PutItemOperation<FakeItem> putItemOperation = PutItemOperation.create(PutItemEnhancedRequest.builder(FakeItem.class)
+                                                                                                    .item(baseFakeItem)
+                                                                                                    .build());
+
+        PutItemRequest request = putItemOperation.generateRequest(FakeItem.getTableSchema(),
+                                                                  PRIMARY_CONTEXT,
+                                                                  mockDynamoDbEnhancedClientExtension);
+
+        assertThat(request.item(), is(fakeMap));
+        verify(mockDynamoDbEnhancedClientExtension).beforeWrite(
+            DefaultDynamoDbExtensionContext.builder()
+            .items(baseMap)
+            .operationContext(PRIMARY_CONTEXT)
+            .tableMetadata(FakeItem.getTableMetadata()).build());
+    }
+
+    @Test
+    public void generateRequest_withExtension_singleCondition() {
+        FakeItem baseFakeItem = createUniqueFakeItem();
+        FakeItem fakeItem = createUniqueFakeItem();
+        Map<String, AttributeValue> fakeMap = FakeItem.getTableSchema().itemToMap(fakeItem, true);
+        Expression condition = Expression.builder().expression("condition").expressionValues(fakeMap).build();
+        when(mockDynamoDbEnhancedClientExtension.beforeWrite(any(DynamoDbExtensionContext.BeforeWrite.class)))
+            .thenReturn(WriteModification.builder().additionalConditionalExpression(condition).build());
+        PutItemOperation<FakeItem> putItemOperation = PutItemOperation.create(PutItemEnhancedRequest.builder(FakeItem.class)
+                                                                                                    .item(baseFakeItem)
+                                                                                                    .build());
+
+        PutItemRequest request = putItemOperation.generateRequest(FakeItem.getTableSchema(),
+                                                                  PRIMARY_CONTEXT,
+                                                                  mockDynamoDbEnhancedClientExtension);
+
+        assertThat(request.conditionExpression(), is("condition"));
+        assertThat(request.expressionAttributeValues(), is(fakeMap));
+    }
+
+    @Test
+    public void generateRequest_withExtension_noModifications() {
+        FakeItem baseFakeItem = createUniqueFakeItem();
+        when(mockDynamoDbEnhancedClientExtension.beforeWrite(any(DynamoDbExtensionContext.BeforeWrite.class)))
+            .thenReturn(WriteModification.builder().build());
+        PutItemOperation<FakeItem> putItemOperation = PutItemOperation.create(PutItemEnhancedRequest.builder(FakeItem.class)
+                                                                                                    .item(baseFakeItem)
+                                                                                                    .build());
+
+        PutItemRequest request = putItemOperation.generateRequest(FakeItem.getTableSchema(),
+                                                                  PRIMARY_CONTEXT,
+                                                                  mockDynamoDbEnhancedClientExtension);
+        assertThat(request.conditionExpression(), is(nullValue()));
+        assertThat(request.expressionAttributeValues().size(), is(0));
+    }
+
+    @Test
+    public void generateTransactWriteItem_basicRequest() {
+        FakeItem fakeItem = createUniqueFakeItem();
+        Map<String, AttributeValue> fakeItemMap = FakeItem.getTableSchema().itemToMap(fakeItem, true);
+        PutItemOperation<FakeItem> putItemOperation = spy(PutItemOperation.create(PutItemEnhancedRequest.builder(FakeItem.class)
+                                                                                                        .item(fakeItem)
+                                                                                                        .build()));
+        OperationContext context = OperationContext.create(TABLE_NAME, TableMetadata.primaryIndexName());
+
+        PutItemRequest putItemRequest = PutItemRequest.builder()
+                                                      .tableName(TABLE_NAME)
+                                                      .item(fakeItemMap)
+                                                      .build();
+        doReturn(putItemRequest).when(putItemOperation).generateRequest(any(), any(), any());
+
+        TransactWriteItem actualResult = putItemOperation.generateTransactWriteItem(FakeItem.getTableSchema(),
+                                                                                    context,
+                                                                                    mockDynamoDbEnhancedClientExtension);
+
+        TransactWriteItem expectedResult = TransactWriteItem.builder()
+                                                            .put(Put.builder()
+                                                                    .item(fakeItemMap)
+                                                                    .tableName(TABLE_NAME)
+                                                                    .build())
+                                                            .build();
+        assertThat(actualResult, is(expectedResult));
+        verify(putItemOperation).generateRequest(FakeItem.getTableSchema(), context, mockDynamoDbEnhancedClientExtension);
+    }
+
+    @Test
+    public void generateTransactWriteItem_conditionalRequest() {
+        FakeItem fakeItem = createUniqueFakeItem();
+        Map<String, AttributeValue> fakeItemMap = FakeItem.getTableSchema().itemToMap(fakeItem, true);
+        PutItemOperation<FakeItem> putItemOperation = spy(PutItemOperation.create(PutItemEnhancedRequest.builder(FakeItem.class)
+                                                                                                        .item(fakeItem)
+                                                                                                        .build()));
+        OperationContext context = OperationContext.create(TABLE_NAME, TableMetadata.primaryIndexName());
+
+        String conditionExpression = "condition-expression";
+        Map<String, AttributeValue> attributeValues = Collections.singletonMap("key", stringValue("value1"));
+        Map<String, String> attributeNames = Collections.singletonMap("key", "value2");
+
+        PutItemRequest putItemRequest = PutItemRequest.builder()
+                                                      .tableName(TABLE_NAME)
+                                                      .item(fakeItemMap)
+                                                      .conditionExpression(conditionExpression)
+                                                      .expressionAttributeValues(attributeValues)
+                                                      .expressionAttributeNames(attributeNames)
+                                                      .build();
+        doReturn(putItemRequest).when(putItemOperation).generateRequest(any(), any(), any());
+
+        TransactWriteItem actualResult = putItemOperation.generateTransactWriteItem(FakeItem.getTableSchema(),
+                                                                                    context,
+                                                                                    mockDynamoDbEnhancedClientExtension);
+
+        TransactWriteItem expectedResult = TransactWriteItem.builder()
+                                                            .put(Put.builder()
+                                                                    .item(fakeItemMap)
+                                                                    .tableName(TABLE_NAME)
+                                                                    .conditionExpression(conditionExpression)
+                                                                    .expressionAttributeNames(attributeNames)
+                                                                    .expressionAttributeValues(attributeValues)
+                                                                    .build())
+                                                            .build();
+        assertThat(actualResult, is(expectedResult));
+        verify(putItemOperation).generateRequest(FakeItem.getTableSchema(), context, mockDynamoDbEnhancedClientExtension);
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/QueryOperationConditionalTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/QueryOperationConditionalTest.java
new file mode 100644
index 000000000000..9e2483ae65d9
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/QueryOperationConditionalTest.java
@@ -0,0 +1,270 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.operations;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.hasEntry;
+import static org.hamcrest.Matchers.is;
+import static software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.FakeItem.createUniqueFakeItem;
+import static software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.FakeItemWithSort.createUniqueFakeItemWithSort;
+import static software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.FakeItemWithSort.createUniqueFakeItemWithoutSort;
+
+import java.util.UUID;
+import org.junit.Test;
+import software.amazon.awssdk.enhanced.dynamodb.Expression;
+import software.amazon.awssdk.enhanced.dynamodb.Key;
+import software.amazon.awssdk.enhanced.dynamodb.TableMetadata;
+import software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.FakeItem;
+import software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.FakeItemWithNumericSort;
+import software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.FakeItemWithSort;
+import software.amazon.awssdk.enhanced.dynamodb.internal.EnhancedClientUtils;
+import software.amazon.awssdk.enhanced.dynamodb.model.QueryConditional;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+
+public class QueryOperationConditionalTest {
+    private static final String ID_KEY = "#AMZN_MAPPED_id";
+    private static final String ID_VALUE = ":AMZN_MAPPED_id";
+    private static final String SORT_KEY = "#AMZN_MAPPED_sort";
+    private static final String SORT_VALUE = ":AMZN_MAPPED_sort";
+    private static final String SORT_OTHER_VALUE = ":AMZN_MAPPED_sort2";
+
+    private final FakeItem fakeItem = createUniqueFakeItem();
+    private final AttributeValue fakeItemHashValue = AttributeValue.builder().s(fakeItem.getId()).build();
+    private final FakeItemWithSort fakeItemWithSort = createUniqueFakeItemWithSort();
+    private final AttributeValue fakeItemWithSortHashValue =
+        AttributeValue.builder().s(fakeItemWithSort.getId()).build();
+    private final AttributeValue fakeItemWithSortSortValue =
+        AttributeValue.builder().s(fakeItemWithSort.getSort()).build();
+    private final FakeItemWithSort fakeItemWithoutSort = createUniqueFakeItemWithoutSort();
+    private final AttributeValue fakeItemWithoutSortHashValue =
+        AttributeValue.builder().s(fakeItemWithoutSort.getId()).build();
+
+    @Test
+    public void equalTo_hashOnly() {
+        Expression expression = QueryConditional.keyEqualTo(getKey(fakeItem)).expression(FakeItem.getTableSchema(),
+                                                                                         TableMetadata.primaryIndexName());
+
+        assertThat(expression.expression(), is(ID_KEY + " = " + ID_VALUE));
+        assertThat(expression.expressionNames(), hasEntry(ID_KEY, "id"));
+        assertThat(expression.expressionValues(), hasEntry(ID_VALUE, fakeItemHashValue));
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void equalTo_hashOnly_notSet_throwsIllegalArgumentException() {
+        fakeItem.setId(null);
+        QueryConditional.keyEqualTo(getKey(fakeItem))
+                        .expression(FakeItem.getTableSchema(), TableMetadata.primaryIndexName());
+    }
+
+    @Test
+    public void equalTo_hashAndRangeKey_bothSet() {
+        Expression expression = QueryConditional.keyEqualTo(getKey(fakeItemWithSort))
+                                                .expression(FakeItemWithSort.getTableSchema(), TableMetadata.primaryIndexName());
+
+        verifyExpression(expression, "=");
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void equalTo_hashAndRangeKey_hashNotSet_throwsIllegalArgumentException() {
+        fakeItemWithSort.setId(null);
+        QueryConditional.keyEqualTo(getKey(fakeItemWithSort))
+                        .expression(FakeItemWithSort.getTableSchema(), TableMetadata.primaryIndexName());
+    }
+
+    @Test
+    public void equalTo_hashAndRangeKey_hashOnlySet() {
+        Expression expression = QueryConditional.keyEqualTo(getKey(fakeItemWithoutSort))
+                                                .expression(FakeItemWithSort.getTableSchema(), TableMetadata.primaryIndexName());
+
+        assertThat(expression.expression(), is(ID_KEY + " = " + ID_VALUE));
+        assertThat(expression.expressionNames(), hasEntry(ID_KEY, "id"));
+        assertThat(expression.expressionValues(), hasEntry(ID_VALUE, fakeItemWithoutSortHashValue));
+    }
+
+    @Test
+    public void greaterThan_hashAndRangeKey_bothSet() {
+        Expression expression = QueryConditional.sortGreaterThan(getKey(fakeItemWithSort))
+                                                .expression(FakeItemWithSort.getTableSchema(), TableMetadata.primaryIndexName());
+
+        verifyExpression(expression, ">");
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void greaterThan_hashOnly_throwsIllegalArgumentException() {
+        QueryConditional.sortGreaterThan(getKey(fakeItem))
+                        .expression(FakeItem.getTableSchema(), TableMetadata.primaryIndexName());
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void greaterThan_hashAndSort_onlyHashSet_throwsIllegalArgumentException() {
+        QueryConditional.sortGreaterThan(getKey(fakeItemWithoutSort))
+                        .expression(FakeItemWithSort.getTableSchema(), TableMetadata.primaryIndexName());
+    }
+
+    @Test
+    public void greaterThanOrEqualTo_hashAndRangeKey_bothSet() {
+        Expression expression = QueryConditional.sortGreaterThanOrEqualTo(getKey(fakeItemWithSort))
+                                                .expression(FakeItemWithSort.getTableSchema(), TableMetadata.primaryIndexName());
+
+        verifyExpression(expression, ">=");
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void greaterThanOrEqualTo_hashOnly_throwsIllegalArgumentException() {
+        QueryConditional.sortGreaterThanOrEqualTo(getKey(fakeItem))
+                        .expression(FakeItem.getTableSchema(), TableMetadata.primaryIndexName());
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void greaterThanOrEqualTo_hashAndSort_onlyHashSet_throwsIllegalArgumentException() {
+        QueryConditional.sortGreaterThanOrEqualTo(getKey(fakeItemWithoutSort))
+                        .expression(FakeItemWithSort.getTableSchema(), TableMetadata.primaryIndexName());
+    }
+
+    @Test
+    public void lessThan_hashAndRangeKey_bothSet() {
+        Expression expression = QueryConditional.sortLessThan(getKey(fakeItemWithSort))
+                                                .expression(FakeItemWithSort.getTableSchema(), TableMetadata.primaryIndexName());
+
+        verifyExpression(expression, "<");
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void lessThan_hashOnly_throwsIllegalArgumentException() {
+        QueryConditional.sortLessThan(getKey(fakeItem))
+                        .expression(FakeItem.getTableSchema(), TableMetadata.primaryIndexName());
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void lessThan_hashAndSort_onlyHashSet_throwsIllegalArgumentException() {
+        QueryConditional.sortLessThan(getKey(fakeItemWithoutSort))
+                        .expression(FakeItemWithSort.getTableSchema(), TableMetadata.primaryIndexName());
+    }
+
+    @Test
+    public void lessThanOrEqualTo_hashAndRangeKey_bothSet() {
+        Expression expression = QueryConditional.sortLessThanOrEqualTo(getKey(fakeItemWithSort))
+                                                .expression(FakeItemWithSort.getTableSchema(), TableMetadata.primaryIndexName());
+
+        verifyExpression(expression, "<=");
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void lessThanOrEqualTo_hashOnly_throwsIllegalArgumentException() {
+        QueryConditional.sortLessThanOrEqualTo(getKey(fakeItem))
+                        .expression(FakeItem.getTableSchema(), TableMetadata.primaryIndexName());
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void lessThanOrEqualTo_hashAndSort_onlyHashSet_throwsIllegalArgumentException() {
+        QueryConditional.sortLessThanOrEqualTo(getKey(fakeItemWithoutSort))
+                        .expression(FakeItemWithSort.getTableSchema(), TableMetadata.primaryIndexName());
+    }
+
+    @Test
+    public void beginsWith_hashAndRangeKey_bothSet() {
+        Expression expression = QueryConditional.sortBeginsWith(getKey(fakeItemWithSort))
+                                                .expression(FakeItemWithSort.getTableSchema(), TableMetadata.primaryIndexName());
+
+        String expectedExpression = String.format("%s = %s AND begins_with ( %s, %s )", ID_KEY, ID_VALUE, SORT_KEY,
+                                                  SORT_VALUE);
+        assertThat(expression.expression(), is(expectedExpression));
+        assertThat(expression.expressionValues(), hasEntry(ID_VALUE, fakeItemWithSortHashValue));
+        assertThat(expression.expressionValues(), hasEntry(SORT_VALUE, fakeItemWithSortSortValue));
+        assertThat(expression.expressionNames(), hasEntry(ID_KEY, "id"));
+        assertThat(expression.expressionNames(), hasEntry(SORT_KEY, "sort"));
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void beginsWith_hashOnly_throwsIllegalArgumentException() {
+        QueryConditional.sortBeginsWith(getKey(fakeItem))
+                        .expression(FakeItem.getTableSchema(), TableMetadata.primaryIndexName());
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void beginsWith_hashAndSort_onlyHashSet_throwsIllegalArgumentException() {
+        QueryConditional.sortBeginsWith(getKey(fakeItemWithoutSort))
+                        .expression(FakeItemWithSort.getTableSchema(), TableMetadata.primaryIndexName());
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void beginsWith_numericRange_throwsIllegalArgumentException() {
+        FakeItemWithNumericSort fakeItemWithNumericSort = FakeItemWithNumericSort.createUniqueFakeItemWithSort();
+        QueryConditional.sortBeginsWith(getKey(fakeItemWithNumericSort)).expression(FakeItemWithNumericSort.getTableSchema(), TableMetadata.primaryIndexName());
+    }
+
+    @Test
+    public void between_allKeysSet_stringSort() {
+        FakeItemWithSort otherFakeItemWithSort =
+            FakeItemWithSort.builder().id(fakeItemWithSort.getId()).sort(UUID.randomUUID().toString()).build();
+        AttributeValue otherFakeItemWithSortSortValue =
+            AttributeValue.builder().s(otherFakeItemWithSort.getSort()).build();
+
+        Expression expression = QueryConditional.sortBetween(getKey(fakeItemWithSort), getKey(otherFakeItemWithSort))
+            .expression(FakeItemWithSort.getTableSchema(), TableMetadata.primaryIndexName());
+
+        String expectedExpression = String.format("%s = %s AND %s BETWEEN %s AND %s", ID_KEY, ID_VALUE, SORT_KEY,
+                                                  SORT_VALUE, SORT_OTHER_VALUE);
+        assertThat(expression.expression(), is(expectedExpression));
+        assertThat(expression.expressionValues(), hasEntry(ID_VALUE, fakeItemWithSortHashValue));
+        assertThat(expression.expressionValues(), hasEntry(SORT_VALUE, fakeItemWithSortSortValue));
+        assertThat(expression.expressionValues(), hasEntry(SORT_OTHER_VALUE, otherFakeItemWithSortSortValue));
+        assertThat(expression.expressionNames(), hasEntry(ID_KEY, "id"));
+        assertThat(expression.expressionNames(), hasEntry(SORT_KEY, "sort"));
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void between_hashOnly_throwsIllegalArgumentException() {
+        FakeItem otherFakeItem = createUniqueFakeItem();
+        QueryConditional.sortBetween(getKey(fakeItem), getKey(otherFakeItem))
+                        .expression(FakeItem.getTableSchema(), TableMetadata.primaryIndexName());
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void between_hashAndSort_onlyFirstSortSet_throwsIllegalArgumentException() {
+        QueryConditional.sortBetween(getKey(fakeItemWithSort), getKey(fakeItemWithoutSort))
+                        .expression(FakeItemWithSort.getTableSchema(), TableMetadata.primaryIndexName());
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void between_hashAndSort_onlySecondSortSet_throwsIllegalArgumentException() {
+        QueryConditional.sortBetween(getKey(fakeItemWithoutSort), getKey(fakeItemWithSort))
+                        .expression(FakeItemWithSort.getTableSchema(), TableMetadata.primaryIndexName());
+    }
+
+    private void verifyExpression(Expression expression, String condition) {
+        assertThat(expression.expression(), is(ID_KEY + " = " + ID_VALUE + " AND " + SORT_KEY + " " + condition +
+                                               " " + SORT_VALUE));
+        assertThat(expression.expressionNames(), hasEntry(ID_KEY, "id"));
+        assertThat(expression.expressionNames(), hasEntry(SORT_KEY, "sort"));
+        assertThat(expression.expressionValues(), hasEntry(ID_VALUE, fakeItemWithSortHashValue));
+        assertThat(expression.expressionValues(), hasEntry(SORT_VALUE, fakeItemWithSortSortValue));
+    }
+    
+    private Key getKey(FakeItem item) {
+        return EnhancedClientUtils.createKeyFromItem(item, FakeItem.getTableSchema(), TableMetadata.primaryIndexName());
+    }
+
+    private Key getKey(FakeItemWithSort item) {
+        return EnhancedClientUtils.createKeyFromItem(item, FakeItemWithSort.getTableSchema(), TableMetadata.primaryIndexName());
+    }
+
+    private Key getKey(FakeItemWithNumericSort item) {
+        return EnhancedClientUtils.createKeyFromItem(item,
+                                                     FakeItemWithNumericSort.getTableSchema(),
+                                                     TableMetadata.primaryIndexName());
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/QueryOperationTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/QueryOperationTest.java
new file mode 100644
index 000000000000..020e41c83a84
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/QueryOperationTest.java
@@ -0,0 +1,435 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.operations;
+
+import static java.util.Collections.singletonMap;
+import static java.util.stream.Collectors.toList;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.hasEntry;
+import static org.hamcrest.Matchers.is;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import static software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.FakeItem.createUniqueFakeItem;
+import static software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.FakeItemWithIndices.createUniqueFakeItemWithIndices;
+import static software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.FakeItemWithSort.createUniqueFakeItemWithSort;
+import static software.amazon.awssdk.enhanced.dynamodb.internal.AttributeValues.stringValue;
+import static software.amazon.awssdk.enhanced.dynamodb.model.QueryConditional.keyEqualTo;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InOrder;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.junit.MockitoJUnitRunner;
+import software.amazon.awssdk.core.async.SdkPublisher;
+import software.amazon.awssdk.core.pagination.sync.SdkIterable;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClientExtension;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbExtensionContext;
+import software.amazon.awssdk.enhanced.dynamodb.Expression;
+import software.amazon.awssdk.enhanced.dynamodb.TableMetadata;
+import software.amazon.awssdk.enhanced.dynamodb.extensions.ReadModification;
+import software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.FakeItem;
+import software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.FakeItemWithIndices;
+import software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.FakeItemWithSort;
+import software.amazon.awssdk.enhanced.dynamodb.internal.extensions.DefaultDynamoDbExtensionContext;
+import software.amazon.awssdk.enhanced.dynamodb.model.Page;
+import software.amazon.awssdk.enhanced.dynamodb.model.QueryConditional;
+import software.amazon.awssdk.enhanced.dynamodb.model.QueryEnhancedRequest;
+import software.amazon.awssdk.services.dynamodb.DynamoDbAsyncClient;
+import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+import software.amazon.awssdk.services.dynamodb.model.QueryRequest;
+import software.amazon.awssdk.services.dynamodb.model.QueryResponse;
+import software.amazon.awssdk.services.dynamodb.paginators.QueryIterable;
+import software.amazon.awssdk.services.dynamodb.paginators.QueryPublisher;
+
+@RunWith(MockitoJUnitRunner.class)
+public class QueryOperationTest {
+    private static final String TABLE_NAME = "table-name";
+    private static final OperationContext PRIMARY_CONTEXT =
+        OperationContext.create(TABLE_NAME, TableMetadata.primaryIndexName());
+    private static final OperationContext GSI_1_CONTEXT =
+        OperationContext.create(TABLE_NAME, "gsi_1");
+
+    private final FakeItem keyItem = createUniqueFakeItem();
+    private final QueryOperation<FakeItem> queryOperation =
+        QueryOperation.create(QueryEnhancedRequest.builder()
+                                                  .queryConditional(keyEqualTo(k -> k.partitionValue(keyItem.getId())))
+                                                  .build());
+
+    @Mock
+    private DynamoDbClient mockDynamoDbClient;
+    @Mock
+    private DynamoDbAsyncClient mockDynamoDbAsyncClient;
+    @Mock
+    private QueryConditional mockQueryConditional;
+    @Mock
+    private DynamoDbEnhancedClientExtension mockDynamoDbEnhancedClientExtension;
+
+    @Test
+    public void getServiceCall_makesTheRightCallAndReturnsResponse() {
+        QueryRequest queryRequest = QueryRequest.builder().build();
+        QueryIterable mockQueryIterable = mock(QueryIterable.class);
+        when(mockDynamoDbClient.queryPaginator(any(QueryRequest.class))).thenReturn(mockQueryIterable);
+
+        SdkIterable<QueryResponse> response = queryOperation.serviceCall(mockDynamoDbClient).apply(queryRequest);
+
+        assertThat(response, is(mockQueryIterable));
+        verify(mockDynamoDbClient).queryPaginator(queryRequest);
+    }
+
+    @Test
+    public void getAsyncServiceCall_makesTheRightCallAndReturnsResponse() {
+        QueryRequest queryRequest = QueryRequest.builder().build();
+        QueryPublisher mockQueryPublisher = mock(QueryPublisher.class);
+        when(mockDynamoDbAsyncClient.queryPaginator(any(QueryRequest.class))).thenReturn(mockQueryPublisher);
+
+        SdkPublisher<QueryResponse> response =
+            queryOperation.asyncServiceCall(mockDynamoDbAsyncClient).apply(queryRequest);
+
+        assertThat(response, is(mockQueryPublisher));
+        verify(mockDynamoDbAsyncClient).queryPaginator(queryRequest);
+    }
+
+    @Test
+    public void generateRequest_nonDefault_usesQueryConditional() {
+        Map<String, AttributeValue> keyItemMap = getAttributeValueMap(keyItem);
+        Expression expression = Expression.builder().expression("test-expression").expressionValues(keyItemMap).build();
+        when(mockQueryConditional.expression(any(), anyString())).thenReturn(expression);
+
+        QueryOperation<FakeItem> query = QueryOperation.create(QueryEnhancedRequest.builder()
+                                                                                   .queryConditional(mockQueryConditional)
+                                                                                   .build());
+        QueryRequest queryRequest = query.generateRequest(FakeItem.getTableSchema(), PRIMARY_CONTEXT, null);
+
+        QueryRequest expectedQueryRequest = QueryRequest.builder()
+                                                        .tableName(TABLE_NAME)
+                                                        .keyConditionExpression("test-expression")
+                                                        .expressionAttributeValues(keyItemMap)
+                                                        .build();
+        assertThat(queryRequest, is(expectedQueryRequest));
+        verify(mockQueryConditional).expression(FakeItem.getTableSchema(), TableMetadata.primaryIndexName());
+    }
+
+    @Test
+    public void generateRequest_defaultQuery_usesEqualTo() {
+        QueryRequest queryRequest = queryOperation.generateRequest(FakeItem.getTableSchema(),
+                                                                   PRIMARY_CONTEXT,
+                                                                   null);
+
+        QueryRequest expectedQueryRequest = QueryRequest.builder()
+            .tableName(TABLE_NAME)
+            .keyConditionExpression("#AMZN_MAPPED_id = :AMZN_MAPPED_id")
+            .expressionAttributeValues(singletonMap(":AMZN_MAPPED_id",
+                                                    AttributeValue.builder().s(keyItem.getId()).build()))
+            .expressionAttributeNames(singletonMap("#AMZN_MAPPED_id", "id"))
+            .build();
+        assertThat(queryRequest, is(expectedQueryRequest));
+    }
+
+    @Test
+    public void generateRequest_knowsHowToUseAnIndex() {
+        FakeItemWithIndices fakeItem = createUniqueFakeItemWithIndices();
+        QueryOperation<FakeItemWithIndices> queryToTest =
+            QueryOperation.create(QueryEnhancedRequest.builder()
+                                                      .queryConditional(keyEqualTo(k -> k.partitionValue(fakeItem.getGsiId())))
+                                                      .build());
+        QueryRequest queryRequest = queryToTest.generateRequest(FakeItemWithIndices.getTableSchema(), GSI_1_CONTEXT, null);
+
+        assertThat(queryRequest.indexName(), is("gsi_1"));
+    }
+
+    @Test
+    public void generateRequest_ascending() {
+        QueryOperation<FakeItem> queryToTest =
+            QueryOperation.create(QueryEnhancedRequest.builder()
+                                                      .queryConditional(keyEqualTo(k -> k.partitionValue(keyItem.getId())))
+                                                      .scanIndexForward(true)
+                                                      .build());
+        QueryRequest queryRequest = queryToTest.generateRequest(FakeItem.getTableSchema(),
+                                                                PRIMARY_CONTEXT,
+                                                                null);
+
+        assertThat(queryRequest.scanIndexForward(), is(true));
+    }
+
+    @Test
+    public void generateRequest_descending() {
+        QueryOperation<FakeItem> queryToTest =
+            QueryOperation.create(QueryEnhancedRequest.builder()
+                                                      .queryConditional(keyEqualTo(k -> k.partitionValue(keyItem.getId())))
+                                                      .scanIndexForward(false)
+                                                      .build());
+        QueryRequest queryRequest = queryToTest.generateRequest(FakeItem.getTableSchema(),
+                                                                PRIMARY_CONTEXT,
+                                                                null);
+
+        assertThat(queryRequest.scanIndexForward(), is(false));
+    }
+
+    @Test
+    public void generateRequest_limit() {
+        QueryOperation<FakeItem> queryToTest =
+            QueryOperation.create(QueryEnhancedRequest.builder()
+                                                      .queryConditional(keyEqualTo(k -> k.partitionValue(keyItem.getId())))
+                                                      .limit(123)
+                                                      .build());
+        QueryRequest queryRequest = queryToTest.generateRequest(FakeItem.getTableSchema(),
+                                                                PRIMARY_CONTEXT,
+                                                                null);
+
+        assertThat(queryRequest.limit(), is(123));
+    }
+
+    @Test
+    public void generateRequest_filterExpression_withValues() {
+        Map<String, AttributeValue> expressionValues = singletonMap(":test-key", stringValue("test-value"));
+        Expression filterExpression = Expression.builder()
+                                                .expression("test-expression")
+                                                .expressionValues(expressionValues)
+                                                .build();
+
+        QueryOperation<FakeItem> queryToTest =
+            QueryOperation.create(QueryEnhancedRequest.builder()
+                                                      .queryConditional(keyEqualTo(k -> k.partitionValue(keyItem.getId())))
+                                                      .filterExpression(filterExpression)
+                                                      .build());
+        QueryRequest queryRequest = queryToTest.generateRequest(FakeItem.getTableSchema(),
+                                                                PRIMARY_CONTEXT,
+                                                                null);
+
+        assertThat(queryRequest.filterExpression(), is("test-expression"));
+        assertThat(queryRequest.expressionAttributeValues(), hasEntry(":test-key", stringValue("test-value")));
+    }
+
+    @Test
+    public void generateRequest_filterExpression_withoutValues() {
+        Expression filterExpression = Expression.builder().expression("test-expression").build();
+
+        QueryOperation<FakeItem> queryToTest =
+            QueryOperation.create(QueryEnhancedRequest.builder()
+                                                      .queryConditional(keyEqualTo(k -> k.partitionValue(keyItem.getId())))
+                                                      .filterExpression(filterExpression)
+                                                      .build());
+        QueryRequest queryRequest = queryToTest.generateRequest(FakeItem.getTableSchema(),
+                                                                PRIMARY_CONTEXT,
+                                                                null);
+
+        assertThat(queryRequest.filterExpression(), is("test-expression"));
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void generateRequest_filterExpression_withConflictingValues() {
+        Map<String, AttributeValue> expressionValues = singletonMap(":AMZN_MAPPED_id", stringValue("test-value"));
+        Map<String, String> expressionNames = singletonMap("#AMZN_MAPPED_id", "id");
+        Expression filterExpression = Expression.builder()
+                                                .expression("test-expression")
+                                                .expressionNames(expressionNames)
+                                                .expressionValues(expressionValues)
+                                                .build();
+        QueryOperation<FakeItem> queryToTest =
+            QueryOperation.create(QueryEnhancedRequest.builder()
+                                                      .queryConditional(keyEqualTo(k -> k.partitionValue(keyItem.getId())))
+                                                      .filterExpression(filterExpression)
+                                                      .build());
+        queryToTest.generateRequest(FakeItem.getTableSchema(), PRIMARY_CONTEXT, null);
+    }
+
+    @Test
+    public void generateRequest_consistentRead() {
+        QueryOperation<FakeItem> queryToTest =
+            QueryOperation.create(QueryEnhancedRequest.builder()
+                                                      .queryConditional(keyEqualTo(k -> k.partitionValue(keyItem.getId())))
+                                                      .consistentRead(true)
+                                                      .build());
+        QueryRequest queryRequest = queryToTest.generateRequest(FakeItem.getTableSchema(),
+                                                                PRIMARY_CONTEXT,
+                                                                null);
+
+        assertThat(queryRequest.consistentRead(), is(true));
+    }
+
+    @Test
+    public void generateRequest_hashKeyOnly_withExclusiveStartKey() {
+        FakeItem exclusiveStartKey = createUniqueFakeItem();
+        QueryOperation<FakeItem> queryToTest =
+            QueryOperation.create(QueryEnhancedRequest.builder()
+                                                      .queryConditional(keyEqualTo(k -> k.partitionValue(keyItem.getId())))
+                                                      .exclusiveStartKey(FakeItem.getTableSchema()
+                                                                                 .itemToMap(exclusiveStartKey,
+                                                                                            FakeItem.getTableMetadata()
+                                                                                                    .primaryKeys()))
+                                                      .build());
+
+        QueryRequest queryRequest = queryToTest.generateRequest(FakeItem.getTableSchema(),
+                                                                PRIMARY_CONTEXT,
+                                                                null);
+
+        assertThat(queryRequest.exclusiveStartKey(),
+                   hasEntry("id", AttributeValue.builder().s(exclusiveStartKey.getId()).build()));
+    }
+
+    @Test
+    public void generateRequest_secondaryIndex_exclusiveStartKeyUsesPrimaryAndSecondaryIndex() {
+        FakeItemWithIndices exclusiveStartKey = createUniqueFakeItemWithIndices();
+        Set<String> keyFields = new HashSet<>(FakeItemWithIndices.getTableSchema().tableMetadata().primaryKeys());
+        keyFields.addAll(FakeItemWithIndices.getTableSchema().tableMetadata().indexKeys("gsi_1"));
+
+        QueryOperation<FakeItemWithIndices> queryToTest =
+            QueryOperation.create(QueryEnhancedRequest.builder()
+                                                      .queryConditional(keyEqualTo(k -> k.partitionValue(keyItem.getId())))
+                                                      .exclusiveStartKey(FakeItemWithIndices.getTableSchema()
+                                                                                            .itemToMap(exclusiveStartKey,
+                                                                                                       keyFields))
+                                                      .build());
+
+        QueryRequest queryRequest = queryToTest.generateRequest(FakeItemWithIndices.getTableSchema(),
+                                                                GSI_1_CONTEXT,
+                                                                null);
+
+        assertThat(queryRequest.exclusiveStartKey(),
+                   hasEntry("id", AttributeValue.builder().s(exclusiveStartKey.getId()).build()));
+        assertThat(queryRequest.exclusiveStartKey(),
+                   hasEntry("sort", AttributeValue.builder().s(exclusiveStartKey.getSort()).build()));
+        assertThat(queryRequest.exclusiveStartKey(),
+                   hasEntry("gsi_id", AttributeValue.builder().s(exclusiveStartKey.getGsiId()).build()));
+        assertThat(queryRequest.exclusiveStartKey(),
+                   hasEntry("gsi_sort", AttributeValue.builder().s(exclusiveStartKey.getGsiSort()).build()));
+    }
+
+    @Test
+    public void generateRequest_hashAndSortKey_withExclusiveStartKey() {
+        FakeItemWithSort exclusiveStartKey = createUniqueFakeItemWithSort();
+        QueryOperation<FakeItemWithSort> queryToTest =
+            QueryOperation.create(QueryEnhancedRequest.builder()
+                                                      .queryConditional(keyEqualTo(k -> k.partitionValue(keyItem.getId())))
+                                                      .exclusiveStartKey(
+                                                          FakeItemWithSort.getTableSchema()
+                                                                          .itemToMap(
+                                                                              exclusiveStartKey,
+                                                                              FakeItemWithSort.getTableSchema()
+                                                                                              .tableMetadata()
+                                                                                              .primaryKeys()))
+                          .build());
+
+        QueryRequest queryRequest = queryToTest.generateRequest(FakeItemWithSort.getTableSchema(),
+                                                                PRIMARY_CONTEXT,
+                                                                null);
+
+        assertThat(queryRequest.exclusiveStartKey(),
+                   hasEntry("id", AttributeValue.builder().s(exclusiveStartKey.getId()).build()));
+        assertThat(queryRequest.exclusiveStartKey(),
+                   hasEntry("sort", AttributeValue.builder().s(exclusiveStartKey.getSort()).build()));
+    }
+
+    @Test
+    public void transformResults_multipleItems_returnsCorrectItems() {
+        List<FakeItem> queryResultItems = generateFakeItemList();
+        List<Map<String, AttributeValue>> queryResultMaps =
+            queryResultItems.stream().map(QueryOperationTest::getAttributeValueMap).collect(toList());
+
+        QueryResponse queryResponse = generateFakeQueryResults(queryResultMaps);
+
+        Page<FakeItem> queryResultPage = queryOperation.transformResponse(queryResponse,
+                                                                          FakeItem.getTableSchema(),
+                                                                          PRIMARY_CONTEXT,
+                                                                          null);
+
+        assertThat(queryResultPage.items(), is(queryResultItems));
+    }
+
+    @Test
+    public void transformResults_multipleItems_setsLastEvaluatedKey() {
+        List<FakeItem> queryResultItems = generateFakeItemList();
+        FakeItem lastEvaluatedKey = createUniqueFakeItem();
+        List<Map<String, AttributeValue>> queryResultMaps =
+            queryResultItems.stream().map(QueryOperationTest::getAttributeValueMap).collect(toList());
+
+        QueryResponse queryResponse = generateFakeQueryResults(queryResultMaps,
+                                                               getAttributeValueMap(lastEvaluatedKey));
+
+        Page<FakeItem> queryResultPage = queryOperation.transformResponse(queryResponse,
+                                                                          FakeItem.getTableSchema(),
+                                                                          PRIMARY_CONTEXT,
+                                                                          null);
+
+        assertThat(queryResultPage.lastEvaluatedKey(), is(getAttributeValueMap(lastEvaluatedKey)));
+    }
+
+    @Test
+    public void queryItem_withExtension_correctlyTransformsItem() {
+        List<FakeItem> queryResultItems = generateFakeItemList();
+        List<FakeItem> modifiedResultItems = generateFakeItemList();
+
+        List<Map<String, AttributeValue>> queryResultMap =
+            queryResultItems.stream().map(QueryOperationTest::getAttributeValueMap).collect(toList());
+
+        ReadModification[] readModifications =
+            modifiedResultItems.stream()
+                              .map(QueryOperationTest::getAttributeValueMap)
+                              .map(attributeMap -> ReadModification.builder().transformedItem(attributeMap).build())
+                              .collect(Collectors.toList())
+                              .toArray(new ReadModification[]{});
+
+        when(mockDynamoDbEnhancedClientExtension.afterRead(any(DynamoDbExtensionContext.AfterRead.class)))
+            .thenReturn(readModifications[0], Arrays.copyOfRange(readModifications, 1, readModifications.length));
+
+        QueryResponse queryResponse = generateFakeQueryResults(queryResultMap);
+
+        Page<FakeItem> queryResultPage = queryOperation.transformResponse(queryResponse,
+                                                                          FakeItem.getTableSchema(),
+                                                                          PRIMARY_CONTEXT,
+                                                                          mockDynamoDbEnhancedClientExtension);
+
+        assertThat(queryResultPage.items(), is(modifiedResultItems));
+        InOrder inOrder = Mockito.inOrder(mockDynamoDbEnhancedClientExtension);
+        queryResultMap.forEach(
+            attributeMap -> inOrder.verify(mockDynamoDbEnhancedClientExtension)
+                                   .afterRead(
+            DefaultDynamoDbExtensionContext.builder()
+                                           .tableMetadata(FakeItem.getTableMetadata())
+                                           .operationContext(PRIMARY_CONTEXT)
+                                           .items(attributeMap).build()));
+    }
+
+    private static QueryResponse generateFakeQueryResults(List<Map<String, AttributeValue>> queryItemMapsPage) {
+        return QueryResponse.builder().items(queryItemMapsPage).build();
+    }
+
+    private static QueryResponse generateFakeQueryResults(List<Map<String, AttributeValue>> queryItemMapsPage,
+                                                          Map<String, AttributeValue> lastEvaluatedKey) {
+        return QueryResponse.builder().items(queryItemMapsPage).lastEvaluatedKey(lastEvaluatedKey).build();
+
+    }
+
+    private static List<FakeItem> generateFakeItemList() {
+        return IntStream.range(0, 3).mapToObj(ignored -> FakeItem.createUniqueFakeItem()).collect(toList());
+    }
+
+    private static Map<String, AttributeValue> getAttributeValueMap(FakeItem fakeItem) {
+        return singletonMap("id", AttributeValue.builder().s(fakeItem.getId()).build());
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/ScanOperationTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/ScanOperationTest.java
new file mode 100644
index 000000000000..176ce174adba
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/ScanOperationTest.java
@@ -0,0 +1,312 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.operations;
+
+import static java.util.Collections.singletonList;
+import static java.util.Collections.singletonMap;
+import static java.util.stream.Collectors.toList;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.hasEntry;
+import static org.hamcrest.Matchers.is;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import static software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.FakeItem.createUniqueFakeItem;
+import static software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.FakeItemWithSort.createUniqueFakeItemWithSort;
+import static software.amazon.awssdk.enhanced.dynamodb.internal.AttributeValues.stringValue;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InOrder;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.junit.MockitoJUnitRunner;
+import software.amazon.awssdk.core.async.SdkPublisher;
+import software.amazon.awssdk.core.pagination.sync.SdkIterable;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClientExtension;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbExtensionContext;
+import software.amazon.awssdk.enhanced.dynamodb.Expression;
+import software.amazon.awssdk.enhanced.dynamodb.TableMetadata;
+import software.amazon.awssdk.enhanced.dynamodb.extensions.ReadModification;
+import software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.FakeItem;
+import software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.FakeItemWithIndices;
+import software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.FakeItemWithSort;
+import software.amazon.awssdk.enhanced.dynamodb.internal.extensions.DefaultDynamoDbExtensionContext;
+import software.amazon.awssdk.enhanced.dynamodb.model.Page;
+import software.amazon.awssdk.enhanced.dynamodb.model.ScanEnhancedRequest;
+import software.amazon.awssdk.services.dynamodb.DynamoDbAsyncClient;
+import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+import software.amazon.awssdk.services.dynamodb.model.ScanRequest;
+import software.amazon.awssdk.services.dynamodb.model.ScanResponse;
+import software.amazon.awssdk.services.dynamodb.paginators.ScanIterable;
+import software.amazon.awssdk.services.dynamodb.paginators.ScanPublisher;
+
+@RunWith(MockitoJUnitRunner.class)
+public class ScanOperationTest {
+    private static final String TABLE_NAME = "table-name";
+    private static final OperationContext PRIMARY_CONTEXT =
+        OperationContext.create(TABLE_NAME, TableMetadata.primaryIndexName());
+    private static final OperationContext GSI_1_CONTEXT =
+        OperationContext.create(TABLE_NAME, "gsi_1");
+
+    private final ScanOperation<FakeItem> scanOperation = ScanOperation.create(ScanEnhancedRequest.builder().build());
+
+    @Mock
+    private DynamoDbClient mockDynamoDbClient;
+
+    @Mock
+    private DynamoDbAsyncClient mockDynamoDbAsyncClient;
+
+    @Mock
+    private DynamoDbEnhancedClientExtension mockDynamoDbEnhancedClientExtension;
+
+    @Test
+    public void getServiceCall_makesTheRightCallAndReturnsResponse() {
+        ScanRequest scanRequest = ScanRequest.builder().build();
+        ScanIterable mockScanIterable = mock(ScanIterable.class);
+        when(mockDynamoDbClient.scanPaginator(any(ScanRequest.class))).thenReturn(mockScanIterable);
+
+        SdkIterable<ScanResponse> response = scanOperation.serviceCall(mockDynamoDbClient).apply(scanRequest);
+
+        assertThat(response, is(mockScanIterable));
+        verify(mockDynamoDbClient).scanPaginator(scanRequest);
+    }
+
+    @Test
+    public void getAsyncServiceCall_makesTheRightCallAndReturnsResponse() {
+        ScanRequest scanRequest = ScanRequest.builder().build();
+        ScanPublisher mockScanPublisher = mock(ScanPublisher.class);
+        when(mockDynamoDbAsyncClient.scanPaginator(any(ScanRequest.class))).thenReturn(mockScanPublisher);
+
+        SdkPublisher<ScanResponse> response = scanOperation.asyncServiceCall(mockDynamoDbAsyncClient)
+                                                           .apply(scanRequest);
+
+        assertThat(response, is(mockScanPublisher));
+        verify(mockDynamoDbAsyncClient).scanPaginator(scanRequest);
+    }
+
+    @Test
+    public void generateRequest_defaultScan() {
+        ScanRequest request = scanOperation.generateRequest(FakeItem.getTableSchema(),
+                                                            PRIMARY_CONTEXT,
+                                                            null);
+
+        ScanRequest expectedRequest = ScanRequest.builder()
+            .tableName(TABLE_NAME)
+            .build();
+        assertThat(request, is(expectedRequest));
+    }
+
+    @Test
+    public void generateRequest_knowsHowToUseAnIndex() {
+        ScanOperation<FakeItemWithIndices> operation = ScanOperation.create(ScanEnhancedRequest.builder().build());
+        ScanRequest scanRequest = operation.generateRequest(FakeItemWithIndices.getTableSchema(), GSI_1_CONTEXT, null);
+        assertThat(scanRequest.indexName(), is("gsi_1"));
+    }
+
+
+    @Test
+    public void generateRequest_limit() {
+        ScanOperation<FakeItem> operation = ScanOperation.create(ScanEnhancedRequest.builder().limit(10).build());
+        ScanRequest request = operation.generateRequest(FakeItem.getTableSchema(),
+                                                              PRIMARY_CONTEXT,
+                                                              null);
+
+        ScanRequest expectedRequest = ScanRequest.builder()
+            .tableName(TABLE_NAME)
+            .limit(10)
+            .build();
+        assertThat(request, is(expectedRequest));
+    }
+
+    @Test
+    public void generateRequest_filterCondition_expressionAndValues() {
+        Map<String, AttributeValue> expressionValues = singletonMap(":test-key", stringValue("test-value"));
+        Expression filterExpression =
+            Expression.builder().expression("test-expression").expressionValues(expressionValues).build();
+        ScanOperation<FakeItem> operation =
+            ScanOperation.create(ScanEnhancedRequest.builder().filterExpression(filterExpression).build());
+
+        ScanRequest request = operation.generateRequest(FakeItem.getTableSchema(),
+                                                              PRIMARY_CONTEXT,
+                                                              null);
+        ScanRequest expectedRequest = ScanRequest.builder()
+                                                 .tableName(TABLE_NAME)
+                                                 .filterExpression("test-expression")
+                                                 .expressionAttributeValues(expressionValues)
+                                                 .build();
+        assertThat(request, is(expectedRequest));
+    }
+
+    @Test
+    public void generateRequest_filterCondition_expressionOnly() {
+        Expression filterExpression = Expression.builder().expression("test-expression").build();
+        ScanOperation<FakeItem> operation =
+            ScanOperation.create(ScanEnhancedRequest.builder().filterExpression(filterExpression).build());
+
+        ScanRequest request = operation.generateRequest(FakeItem.getTableSchema(),
+                                                              PRIMARY_CONTEXT,
+                                                              null);
+        ScanRequest expectedRequest = ScanRequest.builder()
+                                                 .tableName(TABLE_NAME)
+                                                 .filterExpression("test-expression")
+                                                 .build();
+        assertThat(request, is(expectedRequest));
+    }
+
+    @Test
+    public void generateRequest_consistentRead() {
+        ScanOperation<FakeItem> operation = ScanOperation.create(ScanEnhancedRequest.builder().consistentRead(true).build());
+        ScanRequest request = operation.generateRequest(FakeItem.getTableSchema(),
+                                                              PRIMARY_CONTEXT,
+                                                              null);
+
+        ScanRequest expectedRequest = ScanRequest.builder()
+                                                 .tableName(TABLE_NAME)
+                                                 .consistentRead(true)
+                                                 .build();
+        assertThat(request, is(expectedRequest));
+    }
+
+    @Test
+    public void generateRequest_hashKeyOnly_exclusiveStartKey() {
+        FakeItem exclusiveStartKey = createUniqueFakeItem();
+        Map<String, AttributeValue> keyMap = FakeItem.getTableSchema().itemToMap(exclusiveStartKey, singletonList("id"));
+        ScanOperation<FakeItem> operation =
+            ScanOperation.create(ScanEnhancedRequest.builder().exclusiveStartKey(keyMap).build());
+
+        ScanRequest scanRequest = operation.generateRequest(FakeItem.getTableSchema(),
+                                                             PRIMARY_CONTEXT,
+                                                             null);
+
+        assertThat(scanRequest.exclusiveStartKey(),
+                   hasEntry("id", AttributeValue.builder().s(exclusiveStartKey.getId()).build()));
+    }
+
+    @Test
+    public void generateRequest_hashAndRangeKey_exclusiveStartKey() {
+        FakeItemWithSort exclusiveStartKey = createUniqueFakeItemWithSort();
+        Map<String, AttributeValue> keyMap =
+            FakeItemWithSort.getTableSchema().itemToMap(exclusiveStartKey,
+                                                        FakeItemWithSort.getTableMetadata().primaryKeys());
+
+        ScanOperation<FakeItemWithSort> operation =
+            ScanOperation.create(ScanEnhancedRequest.builder().exclusiveStartKey(keyMap).build());
+
+        ScanRequest scanRequest = operation.generateRequest(FakeItemWithSort.getTableSchema(),
+                                                             PRIMARY_CONTEXT,
+                                                             null);
+
+        assertThat(scanRequest.exclusiveStartKey(),
+                   hasEntry("id", AttributeValue.builder().s(exclusiveStartKey.getId()).build()));
+        assertThat(scanRequest.exclusiveStartKey(),
+                   hasEntry("sort", AttributeValue.builder().s(exclusiveStartKey.getSort()).build()));
+    }
+
+    @Test
+    public void transformResults_multipleItems_returnsCorrectItems() {
+        List<FakeItem> scanResultItems = generateFakeItemList();
+        List<Map<String, AttributeValue>> scanResultMaps =
+            scanResultItems.stream().map(ScanOperationTest::getAttributeValueMap).collect(toList());
+
+        ScanResponse scanResponse = generateFakeScanResults(scanResultMaps);
+
+        Page<FakeItem> scanResultPage = scanOperation.transformResponse(scanResponse,
+                                                                        FakeItem.getTableSchema(),
+                                                                        PRIMARY_CONTEXT,
+                                                                        null);
+        assertThat(scanResultPage.items(), is(scanResultItems));
+    }
+
+    @Test
+    public void transformResults_multipleItems_setsLastEvaluatedKey() {
+        List<FakeItem> scanResultItems = generateFakeItemList();
+        FakeItem lastEvaluatedKey = createUniqueFakeItem();
+        List<Map<String, AttributeValue>> scanResultMaps =
+            scanResultItems.stream().map(ScanOperationTest::getAttributeValueMap).collect(toList());
+
+        ScanResponse scanResponse = generateFakeScanResults(scanResultMaps, getAttributeValueMap(lastEvaluatedKey));
+
+        Page<FakeItem> scanResultPage = scanOperation.transformResponse(scanResponse,
+                                                                        FakeItem.getTableSchema(),
+                                                                        PRIMARY_CONTEXT,
+                                                                        null);
+
+        assertThat(scanResultPage.lastEvaluatedKey(), is(getAttributeValueMap(lastEvaluatedKey)));
+    }
+
+    @Test
+    public void scanItem_withExtension_correctlyTransformsItems() {
+        List<FakeItem> scanResultItems = generateFakeItemList();
+        List<FakeItem> modifiedResultItems = generateFakeItemList();
+
+        List<Map<String, AttributeValue>> scanResultMaps =
+            scanResultItems.stream().map(ScanOperationTest::getAttributeValueMap).collect(toList());
+
+        ReadModification[] readModifications =
+            modifiedResultItems.stream()
+                  .map(ScanOperationTest::getAttributeValueMap)
+                  .map(attributeMap -> ReadModification.builder().transformedItem(attributeMap).build())
+                  .collect(Collectors.toList())
+                  .toArray(new ReadModification[]{});
+        when(mockDynamoDbEnhancedClientExtension.afterRead(any(DynamoDbExtensionContext.AfterRead.class)))
+            .thenReturn(readModifications[0], Arrays.copyOfRange(readModifications, 1, readModifications.length));
+
+        ScanResponse scanResponse = generateFakeScanResults(scanResultMaps);
+
+        Page<FakeItem> scanResultPage = scanOperation.transformResponse(scanResponse,
+                                                                        FakeItem.getTableSchema(),
+                                                                        PRIMARY_CONTEXT,
+                                                                        mockDynamoDbEnhancedClientExtension);
+
+        assertThat(scanResultPage.items(), is(modifiedResultItems));
+
+        InOrder inOrder = Mockito.inOrder(mockDynamoDbEnhancedClientExtension);
+        scanResultMaps.forEach(
+            attributeMap -> inOrder.verify(mockDynamoDbEnhancedClientExtension).afterRead(
+                DefaultDynamoDbExtensionContext.builder()
+                                               .tableMetadata(FakeItem.getTableMetadata())
+                                               .operationContext(PRIMARY_CONTEXT)
+                                               .items(attributeMap).build()));
+    }
+
+    private static ScanResponse generateFakeScanResults(List<Map<String, AttributeValue>> scanItemMapsPage) {
+        return ScanResponse.builder().items(scanItemMapsPage).build();
+    }
+
+    private static ScanResponse generateFakeScanResults(List<Map<String, AttributeValue>> scanItemMapsPage,
+                                                        Map<String, AttributeValue> lastEvaluatedKey) {
+        return ScanResponse.builder()
+                           .items(scanItemMapsPage)
+                           .lastEvaluatedKey(lastEvaluatedKey)
+                           .build();
+    }
+
+    private static List<FakeItem> generateFakeItemList() {
+        return IntStream.range(0, 3).mapToObj(ignored -> FakeItem.createUniqueFakeItem()).collect(toList());
+    }
+
+    private static Map<String, AttributeValue> getAttributeValueMap(FakeItem fakeItem) {
+        return singletonMap("id", AttributeValue.builder().s(fakeItem.getId()).build());
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/TableOperationTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/TableOperationTest.java
new file mode 100644
index 000000000000..e1dc40ac5170
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/TableOperationTest.java
@@ -0,0 +1,103 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.operations;
+
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.sameInstance;
+import static org.junit.Assert.assertThat;
+
+import java.util.concurrent.CompletableFuture;
+import java.util.function.Function;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClientExtension;
+import software.amazon.awssdk.enhanced.dynamodb.TableMetadata;
+import software.amazon.awssdk.enhanced.dynamodb.TableSchema;
+import software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.FakeItem;
+import software.amazon.awssdk.services.dynamodb.DynamoDbAsyncClient;
+import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
+
+@RunWith(MockitoJUnitRunner.class)
+public class TableOperationTest {
+
+    private static final String FAKE_RESULT = "fake-result";
+    private static final String FAKE_TABLE_NAME = "fake-table-name";
+
+    private final FakeTableOperation fakeTableOperation = new FakeTableOperation();
+
+    @Mock
+    private DynamoDbEnhancedClientExtension mockDynamoDbEnhancedClientExtension;
+
+    @Mock
+    private DynamoDbClient mockDynamoDbClient;
+
+    @Test
+    public void executeOnPrimaryIndex_defaultImplementation_callsExecuteCorrectly() {
+        fakeTableOperation.executeOnPrimaryIndex(FakeItem.getTableSchema(),
+                                                 FAKE_TABLE_NAME,
+                                                 mockDynamoDbEnhancedClientExtension,
+                                                 mockDynamoDbClient);
+
+        assertThat(fakeTableOperation.lastDynamoDbClient, sameInstance(mockDynamoDbClient));
+        assertThat(fakeTableOperation.lastDynamoDbEnhancedClientExtension, sameInstance(mockDynamoDbEnhancedClientExtension));
+        assertThat(fakeTableOperation.lastTableSchema, sameInstance(FakeItem.getTableSchema()));
+        assertThat(fakeTableOperation.lastOperationContext, is(
+            OperationContext.create(FAKE_TABLE_NAME, TableMetadata.primaryIndexName())));
+    }
+
+    private static class FakeTableOperation implements TableOperation<FakeItem, String, String, String> {
+        private TableSchema<FakeItem> lastTableSchema = null;
+        private OperationContext lastOperationContext = null;
+        private DynamoDbEnhancedClientExtension lastDynamoDbEnhancedClientExtension = null;
+        private DynamoDbClient lastDynamoDbClient = null;
+
+        @Override
+        public String generateRequest(TableSchema<FakeItem> tableSchema, OperationContext context,
+                                      DynamoDbEnhancedClientExtension extension) {
+            return null;
+        }
+
+        @Override
+        public Function<String, String> serviceCall(DynamoDbClient dynamoDbClient) {
+            return null;
+        }
+
+        @Override
+        public Function<String, CompletableFuture<String>> asyncServiceCall(DynamoDbAsyncClient dynamoDbAsyncClient) {
+            return null;
+        }
+
+        @Override
+        public String transformResponse(String response, TableSchema<FakeItem> tableSchema, OperationContext context,
+                                        DynamoDbEnhancedClientExtension extension) {
+            return null;
+        }
+
+        @Override
+        public String execute(TableSchema<FakeItem> tableSchema,
+                              OperationContext context,
+                              DynamoDbEnhancedClientExtension extension,
+                              DynamoDbClient dynamoDbClient) {
+            lastTableSchema = tableSchema;
+            lastOperationContext = context;
+            lastDynamoDbEnhancedClientExtension = extension;
+            lastDynamoDbClient = dynamoDbClient;
+            return FAKE_RESULT;
+        }
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/TransactGetItemsOperationTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/TransactGetItemsOperationTest.java
new file mode 100644
index 000000000000..1f487b595684
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/TransactGetItemsOperationTest.java
@@ -0,0 +1,238 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.operations;
+
+import static java.util.Collections.emptyMap;
+import static java.util.Collections.singletonList;
+import static java.util.stream.Collectors.toList;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.contains;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.sameInstance;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.when;
+import static software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.FakeItem.createUniqueFakeItem;
+import static software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.FakeItemWithSort.createUniqueFakeItemWithSort;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.IntStream;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+import software.amazon.awssdk.enhanced.dynamodb.Document;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClient;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClientExtension;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbTable;
+import software.amazon.awssdk.enhanced.dynamodb.Key;
+import software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.FakeItem;
+import software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.FakeItemWithSort;
+import software.amazon.awssdk.enhanced.dynamodb.internal.DefaultDocument;
+import software.amazon.awssdk.enhanced.dynamodb.model.TransactGetItemsEnhancedRequest;
+import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+import software.amazon.awssdk.services.dynamodb.model.Get;
+import software.amazon.awssdk.services.dynamodb.model.ItemResponse;
+import software.amazon.awssdk.services.dynamodb.model.TransactGetItem;
+import software.amazon.awssdk.services.dynamodb.model.TransactGetItemsRequest;
+import software.amazon.awssdk.services.dynamodb.model.TransactGetItemsResponse;
+
+@RunWith(MockitoJUnitRunner.class)
+public class TransactGetItemsOperationTest {
+    private static final String TABLE_NAME = "table-name";
+    private static final String TABLE_NAME_2 = "table-name-2";
+
+    private static final List<FakeItem> FAKE_ITEMS =
+        IntStream.range(0, 6).mapToObj($ -> createUniqueFakeItem()).collect(toList());
+    private static final List<Map<String, AttributeValue>> FAKE_ITEM_MAPS =
+        FAKE_ITEMS.stream()
+                  .map(item -> FakeItem.getTableSchema().itemToMap(item, FakeItem.getTableMetadata().primaryKeys()))
+                  .collect(toList());
+    private static final List<Key> FAKE_ITEM_KEYS =
+        FAKE_ITEMS.stream().map(fakeItem -> Key.builder().partitionValue(fakeItem.getId()).build()).collect(toList());
+
+    private static final List<FakeItemWithSort> FAKESORT_ITEMS =
+        IntStream.range(0, 6)
+                 .mapToObj($ -> createUniqueFakeItemWithSort()).collect(toList());
+
+    private static final List<Map<String, AttributeValue>> FAKESORT_ITEM_MAPS =
+        FAKESORT_ITEMS.stream()
+                      .map(item -> FakeItemWithSort.getTableSchema()
+                                                   .itemToMap(item, FakeItemWithSort.getTableMetadata().primaryKeys()))
+                      .collect(toList());
+    private static final List<Key> FAKESORT_ITEM_KEYS =
+        FAKESORT_ITEMS.stream()
+                      .map(fakeItemWithSort -> Key.builder()
+                                                  .partitionValue(fakeItemWithSort.getId())
+                                                  .sortValue(fakeItemWithSort.getSort())
+                                                  .build())
+                      .collect(toList());
+
+    @Mock
+    private DynamoDbClient mockDynamoDbClient;
+
+    @Mock
+    private DynamoDbEnhancedClientExtension mockExtension;
+
+    private DynamoDbEnhancedClient enhancedClient;
+    private DynamoDbTable<FakeItem> fakeItemMappedTable;
+    private DynamoDbTable<FakeItemWithSort> fakeItemWithSortMappedTable;
+
+    @Before
+    public void setupMappedTables() {
+        enhancedClient = DynamoDbEnhancedClient.builder().dynamoDbClient(mockDynamoDbClient).extensions().build();
+        fakeItemMappedTable = enhancedClient.table(TABLE_NAME, FakeItem.getTableSchema());
+        fakeItemWithSortMappedTable = enhancedClient.table(TABLE_NAME_2, FakeItemWithSort.getTableSchema());
+    }
+
+    @Test
+    public void generateRequest_getsFromMultipleTables_usingShortcutForm() {
+        TransactGetItemsEnhancedRequest transactGetItemsEnhancedRequest =
+            TransactGetItemsEnhancedRequest.builder()
+                                           .addGetItem(fakeItemMappedTable, FAKE_ITEM_KEYS.get(0))
+                                           .addGetItem(fakeItemWithSortMappedTable, FAKESORT_ITEM_KEYS.get(0))
+                                           .addGetItem(fakeItemWithSortMappedTable, FAKESORT_ITEM_KEYS.get(1))
+                                           .addGetItem(fakeItemMappedTable, FAKE_ITEM_KEYS.get(1))
+                                           .build();
+
+        TransactGetItemsOperation operation = TransactGetItemsOperation.create(transactGetItemsEnhancedRequest);
+
+        List<TransactGetItem> transactGetItems = Arrays.asList(
+            TransactGetItem.builder().get(Get.builder().tableName(TABLE_NAME).key(FAKE_ITEM_MAPS.get(0)).build()).build(),
+            TransactGetItem.builder().get(Get.builder().tableName(TABLE_NAME_2).key(FAKESORT_ITEM_MAPS.get(0)).build()).build(),
+            TransactGetItem.builder().get(Get.builder().tableName(TABLE_NAME_2).key(FAKESORT_ITEM_MAPS.get(1)).build()).build(),
+            TransactGetItem.builder().get(Get.builder().tableName(TABLE_NAME).key(FAKE_ITEM_MAPS.get(1)).build()).build());
+
+        TransactGetItemsRequest expectedRequest = TransactGetItemsRequest.builder()
+                                                                         .transactItems(transactGetItems)
+                                                                         .build();
+
+        TransactGetItemsRequest actualRequest = operation.generateRequest(null);
+
+        assertThat(actualRequest, is(expectedRequest));
+    }
+
+    @Test
+    public void getServiceCall_makesTheRightCallAndReturnsResponse_usingKeyItemForm() {
+        TransactGetItemsEnhancedRequest transactGetItemsEnhancedRequest =
+            TransactGetItemsEnhancedRequest.builder()
+                                           .addGetItem(fakeItemMappedTable, FAKE_ITEMS.get(0))
+                                           .build();
+
+        TransactGetItemsOperation operation = TransactGetItemsOperation.create(transactGetItemsEnhancedRequest);
+
+        TransactGetItem transactGetItem =
+            TransactGetItem.builder().get(Get.builder().tableName(TABLE_NAME).key(FAKE_ITEM_MAPS.get(0)).build()).build();
+
+        TransactGetItemsRequest transactGetItemsRequest = TransactGetItemsRequest.builder()
+                                                                                 .transactItems(singletonList(transactGetItem))
+                                                                                 .build();
+
+        TransactGetItemsResponse expectedResponse = TransactGetItemsResponse.builder().build();
+        when(mockDynamoDbClient.transactGetItems(any(TransactGetItemsRequest.class))).thenReturn(expectedResponse);
+
+        TransactGetItemsResponse response = operation.serviceCall(mockDynamoDbClient).apply(transactGetItemsRequest);
+
+        assertThat(response, sameInstance(expectedResponse));
+        verify(mockDynamoDbClient).transactGetItems(transactGetItemsRequest);
+    }
+
+    @Test
+    public void transformResponse_noExtension_returnsItemsFromDifferentTables() {
+        TransactGetItemsOperation operation = TransactGetItemsOperation.create(emptyRequest());
+
+        List<ItemResponse> itemResponses = Arrays.asList(
+            ItemResponse.builder().item(FAKE_ITEM_MAPS.get(0)).build(),
+            ItemResponse.builder().item(FAKESORT_ITEM_MAPS.get(0)).build(),
+            ItemResponse.builder().item(FAKESORT_ITEM_MAPS.get(1)).build(),
+            ItemResponse.builder().item(FAKE_ITEM_MAPS.get(1)).build());
+        TransactGetItemsResponse response = TransactGetItemsResponse.builder()
+                                                                    .responses(itemResponses)
+                                                                    .build();
+
+        List<Document> result = operation.transformResponse(response, null);
+
+        assertThat(result, contains(DefaultDocument.create(FAKE_ITEM_MAPS.get(0)),
+                                    DefaultDocument.create(FAKESORT_ITEM_MAPS.get(0)),
+                                    DefaultDocument.create(FAKESORT_ITEM_MAPS.get(1)),
+                                    DefaultDocument.create(FAKE_ITEM_MAPS.get(1))));
+    }
+
+    @Test
+    public void transformResponse_doesNotInteractWithExtension() {
+        TransactGetItemsOperation operation = TransactGetItemsOperation.create(emptyRequest());
+
+        List<ItemResponse> itemResponses = Arrays.asList(
+            ItemResponse.builder().item(FAKE_ITEM_MAPS.get(0)).build(),
+            ItemResponse.builder().item(FAKESORT_ITEM_MAPS.get(0)).build(),
+            ItemResponse.builder().item(FAKESORT_ITEM_MAPS.get(1)).build(),
+            ItemResponse.builder().item(FAKE_ITEM_MAPS.get(1)).build());
+        TransactGetItemsResponse response = TransactGetItemsResponse.builder()
+                                                                    .responses(itemResponses)
+                                                                    .build();
+
+        operation.transformResponse(response, mockExtension);
+
+        verifyZeroInteractions(mockExtension);
+    }
+
+    @Test
+    public void transformResponse_noExtension_returnsNullsAsNulls() {
+        TransactGetItemsOperation operation = TransactGetItemsOperation.create(emptyRequest());
+
+        List<ItemResponse> itemResponses = Arrays.asList(
+            ItemResponse.builder().item(FAKE_ITEM_MAPS.get(0)).build(),
+            ItemResponse.builder().item(FAKESORT_ITEM_MAPS.get(0)).build(),
+            null);
+        TransactGetItemsResponse response = TransactGetItemsResponse.builder()
+                                                                    .responses(itemResponses)
+                                                                    .build();
+
+        List<Document> result = operation.transformResponse(response, null);
+
+        assertThat(result, contains(DefaultDocument.create(FAKE_ITEM_MAPS.get(0)),
+                                    DefaultDocument.create(FAKESORT_ITEM_MAPS.get(0)),
+                                    null));
+    }
+
+    @Test
+    public void transformResponse_noExtension_returnsEmptyAsNull() {
+        TransactGetItemsOperation operation = TransactGetItemsOperation.create(emptyRequest());
+
+        List<ItemResponse> itemResponses = Arrays.asList(
+            ItemResponse.builder().item(FAKE_ITEM_MAPS.get(0)).build(),
+            ItemResponse.builder().item(FAKESORT_ITEM_MAPS.get(0)).build(),
+            ItemResponse.builder().item(emptyMap()).build());
+        TransactGetItemsResponse response = TransactGetItemsResponse.builder()
+                                                                    .responses(itemResponses)
+                                                                    .build();
+
+        List<Document> result = operation.transformResponse(response, null);
+
+        assertThat(result, contains(DefaultDocument.create(FAKE_ITEM_MAPS.get(0)),
+                                    DefaultDocument.create(FAKESORT_ITEM_MAPS.get(0)),
+                                    DefaultDocument.create(emptyMap())));
+    }
+
+    private static TransactGetItemsEnhancedRequest emptyRequest() {
+        return TransactGetItemsEnhancedRequest.builder().build();
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/TransactWriteItemsOperationTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/TransactWriteItemsOperationTest.java
new file mode 100644
index 000000000000..9696e01954ac
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/TransactWriteItemsOperationTest.java
@@ -0,0 +1,160 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.operations;
+
+import static java.util.Collections.singletonList;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.sameInstance;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.when;
+
+import java.util.Map;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClient;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClientExtension;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbTable;
+import software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.FakeItem;
+import software.amazon.awssdk.enhanced.dynamodb.model.TransactWriteItemsEnhancedRequest;
+import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+import software.amazon.awssdk.services.dynamodb.model.Put;
+import software.amazon.awssdk.services.dynamodb.model.TransactWriteItem;
+import software.amazon.awssdk.services.dynamodb.model.TransactWriteItemsRequest;
+import software.amazon.awssdk.services.dynamodb.model.TransactWriteItemsResponse;
+
+@RunWith(MockitoJUnitRunner.class)
+public class TransactWriteItemsOperationTest {
+    private static final String TABLE_NAME = "table-name";
+
+    private final FakeItem fakeItem1 = FakeItem.createUniqueFakeItem();
+    private final FakeItem fakeItem2 = FakeItem.createUniqueFakeItem();
+    private final Map<String, AttributeValue> fakeItemMap1 = FakeItem.getTableSchema().itemToMap(fakeItem1, true);
+    private final Map<String, AttributeValue> fakeItemMap2 = FakeItem.getTableSchema().itemToMap(fakeItem2, true);
+
+    @Mock
+    private DynamoDbEnhancedClientExtension mockDynamoDbEnhancedClientExtension;
+    @Mock
+    private DynamoDbClient mockDynamoDbClient;
+
+    private TransactWriteItem fakeTransactWriteItem1 = TransactWriteItem.builder()
+                                                                        .put(Put.builder()
+                                                                                .item(fakeItemMap1)
+                                                                                .tableName(TABLE_NAME)
+                                                                                .build())
+                                                                        .build();
+
+    private TransactWriteItem fakeTransactWriteItem2 = TransactWriteItem.builder()
+                                                                        .put(Put.builder()
+                                                                                .item(fakeItemMap2)
+                                                                                .tableName(TABLE_NAME)
+                                                                                .build())
+                                                                        .build();
+
+    private DynamoDbEnhancedClient enhancedClient;
+    private DynamoDbTable<FakeItem> fakeItemMappedTable;
+
+    @Before
+    public void setupMappedTables() {
+        enhancedClient = DynamoDbEnhancedClient.builder().dynamoDbClient(mockDynamoDbClient).extensions().build();
+        fakeItemMappedTable = enhancedClient.table(TABLE_NAME, FakeItem.getTableSchema());
+    }
+
+    @Test
+    public void generateRequest_singleTransaction() {
+        TransactWriteItemsEnhancedRequest transactGetItemsEnhancedRequest =
+            TransactWriteItemsEnhancedRequest.builder()
+                                             .addPutItem(fakeItemMappedTable, fakeItem1)
+                                             .build();
+
+        TransactWriteItemsOperation operation = TransactWriteItemsOperation.create(transactGetItemsEnhancedRequest);
+        TransactWriteItemsRequest actualRequest = operation.generateRequest(mockDynamoDbEnhancedClientExtension);
+        TransactWriteItemsRequest expectedRequest = TransactWriteItemsRequest.builder()
+                                                                             .transactItems(fakeTransactWriteItem1)
+                                                                             .build();
+
+        assertThat(actualRequest, is(expectedRequest));
+        verifyZeroInteractions(mockDynamoDbEnhancedClientExtension);
+    }
+
+    @Test
+    public void generateRequest_multipleTransactions() {
+        TransactWriteItemsEnhancedRequest transactGetItemsEnhancedRequest =
+            TransactWriteItemsEnhancedRequest.builder()
+                                             .addPutItem(fakeItemMappedTable, fakeItem1)
+                                             .addPutItem(fakeItemMappedTable, fakeItem2)
+                                             .build();
+
+        TransactWriteItemsOperation operation = TransactWriteItemsOperation.create(transactGetItemsEnhancedRequest);
+        TransactWriteItemsRequest actualRequest = operation.generateRequest(mockDynamoDbEnhancedClientExtension);
+        TransactWriteItemsRequest expectedRequest =
+            TransactWriteItemsRequest.builder()
+                                     .transactItems(fakeTransactWriteItem1, fakeTransactWriteItem2)
+                                     .build();
+
+        assertThat(actualRequest, is(expectedRequest));
+        verifyZeroInteractions(mockDynamoDbEnhancedClientExtension);
+    }
+
+    @Test
+    public void generateRequest_noTransactions() {
+        TransactWriteItemsOperation operation = TransactWriteItemsOperation.create(emptyRequest());
+
+        TransactWriteItemsRequest actualRequest = operation.generateRequest(mockDynamoDbEnhancedClientExtension);
+
+        TransactWriteItemsRequest expectedRequest = TransactWriteItemsRequest.builder().build();
+        assertThat(actualRequest, is(expectedRequest));
+        verifyZeroInteractions(mockDynamoDbEnhancedClientExtension);
+    }
+
+    @Test
+    public void getServiceCall_callsServiceAndReturnsResult() {
+        TransactWriteItemsOperation operation = TransactWriteItemsOperation.create(emptyRequest());
+        TransactWriteItemsRequest request =
+            TransactWriteItemsRequest.builder()
+                                     .transactItems(singletonList(fakeTransactWriteItem1))
+                                     .build();
+        TransactWriteItemsResponse expectedResponse = TransactWriteItemsResponse.builder()
+                                                                                .build();
+        when(mockDynamoDbClient.transactWriteItems(any(TransactWriteItemsRequest.class))).thenReturn(expectedResponse);
+
+        TransactWriteItemsResponse actualResponse = operation.serviceCall(mockDynamoDbClient).apply(request);
+
+        assertThat(actualResponse, is(sameInstance(expectedResponse)));
+        verify(mockDynamoDbClient).transactWriteItems(request);
+        verifyZeroInteractions(mockDynamoDbEnhancedClientExtension);
+    }
+
+    @Test
+    public void transformResponse_doesNothing() {
+        TransactWriteItemsOperation operation = TransactWriteItemsOperation.create(emptyRequest());
+        TransactWriteItemsResponse response = TransactWriteItemsResponse.builder().build();
+
+        operation.transformResponse(response, mockDynamoDbEnhancedClientExtension);
+
+        verifyZeroInteractions(mockDynamoDbEnhancedClientExtension);
+    }
+
+    private TransactWriteItemsEnhancedRequest emptyRequest() {
+        return TransactWriteItemsEnhancedRequest.builder().build();
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/UpdateItemOperationTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/UpdateItemOperationTest.java
new file mode 100644
index 000000000000..4f3738576264
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/UpdateItemOperationTest.java
@@ -0,0 +1,766 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.internal.operations;
+
+import static java.util.Collections.singletonList;
+import static java.util.Collections.singletonMap;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.either;
+import static org.hamcrest.Matchers.hasEntry;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.nullValue;
+import static org.hamcrest.Matchers.sameInstance;
+import static org.junit.Assert.fail;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyMap;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import static software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.FakeItem.createUniqueFakeItem;
+import static software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.FakeItemWithSort.createUniqueFakeItemWithSort;
+import static software.amazon.awssdk.enhanced.dynamodb.internal.AttributeValues.numberValue;
+import static software.amazon.awssdk.enhanced.dynamodb.internal.AttributeValues.stringValue;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClientExtension;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbExtensionContext;
+import software.amazon.awssdk.enhanced.dynamodb.Expression;
+import software.amazon.awssdk.enhanced.dynamodb.TableMetadata;
+import software.amazon.awssdk.enhanced.dynamodb.extensions.ReadModification;
+import software.amazon.awssdk.enhanced.dynamodb.extensions.WriteModification;
+import software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.FakeItem;
+import software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.FakeItemWithSort;
+import software.amazon.awssdk.enhanced.dynamodb.internal.extensions.DefaultDynamoDbExtensionContext;
+import software.amazon.awssdk.enhanced.dynamodb.model.UpdateItemEnhancedRequest;
+import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+import software.amazon.awssdk.services.dynamodb.model.ReturnValue;
+import software.amazon.awssdk.services.dynamodb.model.TransactWriteItem;
+import software.amazon.awssdk.services.dynamodb.model.Update;
+import software.amazon.awssdk.services.dynamodb.model.UpdateItemRequest;
+import software.amazon.awssdk.services.dynamodb.model.UpdateItemResponse;
+
+@RunWith(MockitoJUnitRunner.class)
+public class UpdateItemOperationTest {
+    private static final String TABLE_NAME = "table-name";
+    private static final String OTHER_ATTRIBUTE_1_NAME = "#AMZN_MAPPED_other_attribute_1";
+    private static final String OTHER_ATTRIBUTE_2_NAME = "#AMZN_MAPPED_other_attribute_2";
+    private static final String SUBCLASS_ATTRIBUTE_NAME = "#AMZN_MAPPED_subclass_attribute";
+    private static final String OTHER_ATTRIBUTE_1_VALUE = ":AMZN_MAPPED_other_attribute_1";
+    private static final String OTHER_ATTRIBUTE_2_VALUE = ":AMZN_MAPPED_other_attribute_2";
+    private static final String SUBCLASS_ATTRIBUTE_VALUE = ":AMZN_MAPPED_subclass_attribute";
+
+    private static final OperationContext PRIMARY_CONTEXT =
+        OperationContext.create(TABLE_NAME, TableMetadata.primaryIndexName());
+    private static final OperationContext GSI_1_CONTEXT =
+        OperationContext.create(TABLE_NAME, "gsi_1");
+    private static final Expression CONDITION_EXPRESSION;
+    private static final Expression CONDITION_EXPRESSION_2;
+
+    static {
+        Map<String, String> expressionNames = new HashMap<>();
+        expressionNames.put("#test_field_1", "test_field_1");
+        expressionNames.put("#test_field_2", "test_field_2");
+        Map<String, AttributeValue> expressionValues = new HashMap<>();
+        expressionValues.put(":test_value_1", numberValue(1));
+        expressionValues.put(":test_value_2", numberValue(2));
+        CONDITION_EXPRESSION = Expression.builder()
+                                         .expression("#test_field_1 = :test_value_1 OR #test_field_2 = :test_value_2")
+                                         .expressionNames(Collections.unmodifiableMap(expressionNames))
+                                         .expressionValues(Collections.unmodifiableMap(expressionValues))
+                                         .build();
+    }
+
+    static {
+        Map<String, String> expressionNames = new HashMap<>();
+        expressionNames.put("#test_field_3", "test_field_3");
+        expressionNames.put("#test_field_4", "test_field_4");
+        Map<String, AttributeValue> expressionValues = new HashMap<>();
+        expressionValues.put(":test_value_3", numberValue(3));
+        expressionValues.put(":test_value_4", numberValue(4));
+        CONDITION_EXPRESSION_2 = Expression.builder()
+                                           .expression("#test_field_3 = :test_value_3 OR #test_field_4 = :test_value_4")
+                                           .expressionNames(Collections.unmodifiableMap(expressionNames))
+                                           .expressionValues(Collections.unmodifiableMap(expressionValues))
+                                           .build();
+    }
+
+    @Mock
+    private DynamoDbClient mockDynamoDbClient;
+
+    @Mock
+    private DynamoDbEnhancedClientExtension mockDynamoDbEnhancedClientExtension;
+
+    @Test
+    public void getServiceCall_makesTheRightCallAndReturnsResponse() {
+        FakeItem item = createUniqueFakeItem();
+        UpdateItemOperation<FakeItem> updateItemOperation = UpdateItemOperation.create(
+            UpdateItemEnhancedRequest.builder(FakeItem.class).item(item).build());
+        UpdateItemRequest updateItemRequest = UpdateItemRequest.builder().tableName(TABLE_NAME).build();
+        UpdateItemResponse expectedResponse = UpdateItemResponse.builder().build();
+        when(mockDynamoDbClient.updateItem(any(UpdateItemRequest.class))).thenReturn(expectedResponse);
+
+        UpdateItemResponse response = updateItemOperation.serviceCall(mockDynamoDbClient).apply(updateItemRequest);
+
+        assertThat(response, sameInstance(expectedResponse));
+        verify(mockDynamoDbClient).updateItem(updateItemRequest);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void generateRequest_withIndex_throwsIllegalArgumentException() {
+        FakeItem item = createUniqueFakeItem();
+        UpdateItemOperation<FakeItem> updateItemOperation = UpdateItemOperation.create(
+            UpdateItemEnhancedRequest.builder(FakeItem.class).item(item).build());
+
+        updateItemOperation.generateRequest(FakeItem.getTableSchema(), GSI_1_CONTEXT, null);
+    }
+
+    @Test
+    public void generateRequest_nullValuesNotIgnoredByDefault() {
+        FakeItemWithSort item = createUniqueFakeItemWithSort();
+        item.setOtherAttribute1("value-1");
+        UpdateItemOperation<FakeItemWithSort> updateItemOperation = UpdateItemOperation.create(
+            UpdateItemEnhancedRequest.builder(FakeItemWithSort.class).item(item).build());
+        Map<String, AttributeValue> expectedKey = new HashMap<>();
+        expectedKey.put("id", AttributeValue.builder().s(item.getId()).build());
+        expectedKey.put("sort", AttributeValue.builder().s(item.getSort()).build());
+        Map<String, AttributeValue> expectedValues = new HashMap<>();
+        expectedValues.put(OTHER_ATTRIBUTE_1_VALUE, AttributeValue.builder().s("value-1").build());
+        Map<String, String> expectedNames = new HashMap<>();
+        expectedNames.put(OTHER_ATTRIBUTE_1_NAME, "other_attribute_1");
+        expectedNames.put(OTHER_ATTRIBUTE_2_NAME, "other_attribute_2");
+        UpdateItemRequest.Builder baseExpectedRequest = UpdateItemRequest.builder()
+                                                                         .tableName(TABLE_NAME)
+                                                                         .expressionAttributeValues(expectedValues)
+                                                                         .expressionAttributeNames(expectedNames)
+                                                                         .key(expectedKey)
+                                                                         .returnValues(ReturnValue.ALL_NEW);
+        UpdateItemRequest expectedRequest =
+            baseExpectedRequest.updateExpression("SET " + OTHER_ATTRIBUTE_1_NAME + " = " + OTHER_ATTRIBUTE_1_VALUE +
+                                                 " REMOVE " + OTHER_ATTRIBUTE_2_NAME)
+                               .build();
+
+        UpdateItemRequest request = updateItemOperation.generateRequest(FakeItemWithSort.getTableSchema(),
+                                                                        PRIMARY_CONTEXT,
+                                                                        null);
+
+        assertThat(request, is(expectedRequest));
+    }
+
+    @Test
+    public void generateRequest_withConditionExpression() {
+        FakeItemWithSort item = createUniqueFakeItemWithSort();
+        item.setOtherAttribute1("value-1");
+        UpdateItemOperation<FakeItemWithSort> updateItemOperation =
+            UpdateItemOperation.create(UpdateItemEnhancedRequest.builder(FakeItemWithSort.class)
+                                                                .item(item)
+                                                                .conditionExpression(CONDITION_EXPRESSION)
+                                                                .build());
+        Map<String, AttributeValue> expectedKey = new HashMap<>();
+        expectedKey.put("id", AttributeValue.builder().s(item.getId()).build());
+        expectedKey.put("sort", AttributeValue.builder().s(item.getSort()).build());
+        Map<String, AttributeValue> expectedValues = new HashMap<>(CONDITION_EXPRESSION.expressionValues());
+        expectedValues.put(OTHER_ATTRIBUTE_1_VALUE, AttributeValue.builder().s("value-1").build());
+        Map<String, String> expectedNames = new HashMap<>(CONDITION_EXPRESSION.expressionNames());
+        expectedNames.put(OTHER_ATTRIBUTE_1_NAME, "other_attribute_1");
+        expectedNames.put(OTHER_ATTRIBUTE_2_NAME, "other_attribute_2");
+        UpdateItemRequest.Builder baseExpectedRequest =
+            UpdateItemRequest.builder()
+                             .tableName(TABLE_NAME)
+                             .expressionAttributeValues(expectedValues)
+                             .expressionAttributeNames(expectedNames)
+                             .conditionExpression(CONDITION_EXPRESSION.expression())
+                             .key(expectedKey)
+                             .returnValues(ReturnValue.ALL_NEW);
+        UpdateItemRequest expectedRequest =
+            baseExpectedRequest.updateExpression("SET " + OTHER_ATTRIBUTE_1_NAME + " = " + OTHER_ATTRIBUTE_1_VALUE +
+                                                 " REMOVE " + OTHER_ATTRIBUTE_2_NAME)
+                               .build();
+
+        UpdateItemRequest request = updateItemOperation.generateRequest(FakeItemWithSort.getTableSchema(),
+                                                                        PRIMARY_CONTEXT,
+                                                                        null);
+
+        assertThat(request, is(expectedRequest));
+    }
+
+    @Test
+    public void generateRequest_explicitlyUnsetIgnoreNulls() {
+        FakeItemWithSort item = createUniqueFakeItemWithSort();
+        item.setOtherAttribute1("value-1");
+        UpdateItemOperation<FakeItemWithSort> updateItemOperation =
+            UpdateItemOperation.create(UpdateItemEnhancedRequest.builder(FakeItemWithSort.class)
+                                                                .item(item)
+                                                                .ignoreNulls(false)
+                                                                .build());
+        Map<String, AttributeValue> expectedKey = new HashMap<>();
+        expectedKey.put("id", AttributeValue.builder().s(item.getId()).build());
+        expectedKey.put("sort", AttributeValue.builder().s(item.getSort()).build());
+        Map<String, AttributeValue> expectedValues = new HashMap<>();
+        expectedValues.put(OTHER_ATTRIBUTE_1_VALUE, AttributeValue.builder().s("value-1").build());
+        Map<String, String> expectedNames = new HashMap<>();
+        expectedNames.put(OTHER_ATTRIBUTE_1_NAME, "other_attribute_1");
+        expectedNames.put(OTHER_ATTRIBUTE_2_NAME, "other_attribute_2");
+        UpdateItemRequest.Builder baseExpectedRequest = UpdateItemRequest.builder()
+                                                                         .tableName(TABLE_NAME)
+                                                                         .expressionAttributeValues(expectedValues)
+                                                                         .expressionAttributeNames(expectedNames)
+                                                                         .key(expectedKey)
+                                                                         .returnValues(ReturnValue.ALL_NEW);
+        UpdateItemRequest expectedRequest =
+            baseExpectedRequest.updateExpression("SET " + OTHER_ATTRIBUTE_1_NAME + " = " + OTHER_ATTRIBUTE_1_VALUE +
+                                                 " REMOVE " + OTHER_ATTRIBUTE_2_NAME)
+                               .build();
+
+        UpdateItemRequest request = updateItemOperation.generateRequest(FakeItemWithSort.getTableSchema(),
+                                                                        PRIMARY_CONTEXT,
+                                                                        null);
+
+        assertThat(request, is(expectedRequest));
+    }
+
+    @Test
+    public void generateRequest_multipleSetters() {
+        FakeItemWithSort item = createUniqueFakeItemWithSort();
+        item.setOtherAttribute1("value-1");
+        item.setOtherAttribute2("value-2");
+        UpdateItemOperation<FakeItemWithSort> updateItemOperation =
+            UpdateItemOperation.create(UpdateItemEnhancedRequest.builder(FakeItemWithSort.class)
+                                                                .item(item)
+                                                                .ignoreNulls(false)
+                                                                .build());
+        Map<String, AttributeValue> expectedKey = new HashMap<>();
+        expectedKey.put("id", AttributeValue.builder().s(item.getId()).build());
+        expectedKey.put("sort", AttributeValue.builder().s(item.getSort()).build());
+        Map<String, AttributeValue> expectedValues = new HashMap<>();
+        expectedValues.put(OTHER_ATTRIBUTE_1_VALUE, AttributeValue.builder().s("value-1").build());
+        expectedValues.put(OTHER_ATTRIBUTE_2_VALUE, AttributeValue.builder().s("value-2").build());
+        Map<String, String> expectedNames = new HashMap<>();
+        expectedNames.put(OTHER_ATTRIBUTE_1_NAME, "other_attribute_1");
+        expectedNames.put(OTHER_ATTRIBUTE_2_NAME, "other_attribute_2");
+        UpdateItemRequest.Builder baseExpectedRequest = UpdateItemRequest.builder()
+                                                                         .tableName(TABLE_NAME)
+                                                                         .expressionAttributeValues(expectedValues)
+                                                                         .expressionAttributeNames(expectedNames)
+                                                                         .key(expectedKey)
+                                                                         .returnValues(ReturnValue.ALL_NEW);
+        UpdateItemRequest expectedRequest1 =
+            baseExpectedRequest.updateExpression("SET " + OTHER_ATTRIBUTE_1_NAME + " = " + OTHER_ATTRIBUTE_1_VALUE +
+                                                 ", " + OTHER_ATTRIBUTE_2_NAME + " = " + OTHER_ATTRIBUTE_2_VALUE)
+                               .build();
+        UpdateItemRequest expectedRequest2 =
+            baseExpectedRequest.updateExpression("SET " + OTHER_ATTRIBUTE_2_NAME + " = " + OTHER_ATTRIBUTE_2_VALUE +
+                                                 ", " + OTHER_ATTRIBUTE_1_NAME + " = " + OTHER_ATTRIBUTE_1_VALUE)
+                               .build();
+
+        UpdateItemRequest request = updateItemOperation.generateRequest(FakeItemWithSort.getTableSchema(),
+                                                                        PRIMARY_CONTEXT,
+                                                                        null);
+
+        assertThat(request, either(is(expectedRequest1)).or(is(expectedRequest2)));
+    }
+
+    @Test
+    public void generateRequest_multipleDeletes() {
+        FakeItemWithSort item = createUniqueFakeItemWithSort();
+        UpdateItemOperation<FakeItemWithSort> updateItemOperation =
+            UpdateItemOperation.create(UpdateItemEnhancedRequest.builder(FakeItemWithSort.class)
+                                                                .item(item)
+                                                                .ignoreNulls(false)
+                                                                .build());
+        Map<String, AttributeValue> expectedKey = new HashMap<>();
+        expectedKey.put("id", AttributeValue.builder().s(item.getId()).build());
+        expectedKey.put("sort", AttributeValue.builder().s(item.getSort()).build());
+        Map<String, String> expectedNames = new HashMap<>();
+        expectedNames.put(OTHER_ATTRIBUTE_1_NAME, "other_attribute_1");
+        expectedNames.put(OTHER_ATTRIBUTE_2_NAME, "other_attribute_2");
+        UpdateItemRequest.Builder baseExpectedRequest = UpdateItemRequest.builder()
+                                                                         .tableName(TABLE_NAME)
+                                                                         .expressionAttributeNames(expectedNames)
+                                                                         .key(expectedKey)
+                                                                         .returnValues(ReturnValue.ALL_NEW);
+        UpdateItemRequest expectedRequest1 =
+            baseExpectedRequest.updateExpression("REMOVE " + OTHER_ATTRIBUTE_1_NAME + ", " + OTHER_ATTRIBUTE_2_NAME)
+                               .build();
+        UpdateItemRequest expectedRequest2 =
+            baseExpectedRequest.updateExpression("REMOVE " + OTHER_ATTRIBUTE_2_NAME + ", " + OTHER_ATTRIBUTE_1_NAME)
+                               .build();
+
+        UpdateItemRequest request = updateItemOperation.generateRequest(FakeItemWithSort.getTableSchema(),
+                                                                        PRIMARY_CONTEXT,
+                                                                        null);
+
+        assertThat(request,either(is(expectedRequest1)).or(is(expectedRequest2)));
+    }
+
+    @Test
+    public void generateRequest_canIgnoreNullValues() {
+        FakeItemWithSort item = createUniqueFakeItemWithSort();
+        item.setOtherAttribute1("value-1");
+        UpdateItemOperation<FakeItemWithSort> updateItemOperation =
+            UpdateItemOperation.create(UpdateItemEnhancedRequest.builder(FakeItemWithSort.class)
+                                                                .item(item)
+                                                                .ignoreNulls(true)
+                                                                .build());
+        Map<String, AttributeValue> expectedKey = new HashMap<>();
+        expectedKey.put("id", AttributeValue.builder().s(item.getId()).build());
+        expectedKey.put("sort", AttributeValue.builder().s(item.getSort()).build());
+        Map<String, AttributeValue> expectedValues =
+            singletonMap(OTHER_ATTRIBUTE_1_VALUE, AttributeValue.builder().s("value-1").build());
+        Map<String, String> expectedNames = singletonMap(OTHER_ATTRIBUTE_1_NAME, "other_attribute_1");
+        UpdateItemRequest expectedRequest = UpdateItemRequest.builder()
+            .tableName(TABLE_NAME)
+            .updateExpression("SET " + OTHER_ATTRIBUTE_1_NAME + " = " + OTHER_ATTRIBUTE_1_VALUE)
+            .expressionAttributeValues(expectedValues)
+            .expressionAttributeNames(expectedNames)
+            .key(expectedKey)
+            .returnValues(ReturnValue.ALL_NEW)
+            .build();
+
+
+        UpdateItemRequest request = updateItemOperation.generateRequest(FakeItemWithSort.getTableSchema(),
+                                                                        PRIMARY_CONTEXT,
+                                                                        null);
+
+        assertThat(request, is(expectedRequest));
+    }
+
+    @Test
+    public void generateRequest_keyOnlyItem() {
+        FakeItemWithSort item = createUniqueFakeItemWithSort();
+        UpdateItemOperation<FakeItemWithSort> updateItemOperation =
+            UpdateItemOperation.create(UpdateItemEnhancedRequest.builder(FakeItemWithSort.class)
+                                                                .item(item)
+                                                                .ignoreNulls(true)
+                                                                .build());
+        Map<String, AttributeValue> expectedKey = new HashMap<>();
+        expectedKey.put("id", AttributeValue.builder().s(item.getId()).build());
+        expectedKey.put("sort", AttributeValue.builder().s(item.getSort()).build());
+        UpdateItemRequest expectedRequest = UpdateItemRequest.builder()
+                                                             .tableName(TABLE_NAME)
+                                                             .key(expectedKey)
+                                                             .returnValues(ReturnValue.ALL_NEW)
+                                                             .build();
+
+
+        UpdateItemRequest request = updateItemOperation.generateRequest(FakeItemWithSort.getTableSchema(),
+                                                                        PRIMARY_CONTEXT,
+                                                                        null);
+
+        assertThat(request, is(expectedRequest));
+    }
+
+    @Test
+    public void generateRequest_withExtension_modifiesKeyPortionOfItem() {
+        FakeItem baseFakeItem = createUniqueFakeItem();
+        FakeItem fakeItem = createUniqueFakeItem();
+
+        Map<String, AttributeValue> baseMap = FakeItem.getTableSchema().itemToMap(baseFakeItem, false);
+        Map<String, AttributeValue> fakeMap = FakeItem.getTableSchema().itemToMap(fakeItem, false);
+        Map<String, AttributeValue> keyMap = FakeItem.getTableSchema().itemToMap(fakeItem, singletonList("id"));
+
+        when(mockDynamoDbEnhancedClientExtension.beforeWrite(any(DynamoDbExtensionContext.BeforeWrite.class)))
+            .thenReturn(WriteModification.builder().transformedItem(fakeMap).build());
+
+        UpdateItemOperation<FakeItem> updateItemOperation =
+            UpdateItemOperation.create(UpdateItemEnhancedRequest.builder(FakeItem.class).item(baseFakeItem).build());
+
+        UpdateItemRequest request = updateItemOperation.generateRequest(FakeItem.getTableSchema(),
+                                                                        PRIMARY_CONTEXT,
+                                                                        mockDynamoDbEnhancedClientExtension);
+
+        assertThat(request.key(), is(keyMap));
+        verify(mockDynamoDbEnhancedClientExtension).beforeWrite(DefaultDynamoDbExtensionContext.builder()
+                                                                                               .tableMetadata(FakeItem.getTableMetadata())
+                                                                                               .operationContext(PRIMARY_CONTEXT)
+                                                                                               .items(baseMap).build());
+    }
+
+    @Test
+    public void generateRequest_withExtension_modifiesUpdateExpression() {
+        FakeItem fakeItem = createUniqueFakeItem();
+        Map<String, AttributeValue> baseMap = new HashMap<>(FakeItem.getTableSchema().itemToMap(fakeItem, true));
+
+        Map<String, AttributeValue> fakeMap = new HashMap<>(baseMap);
+        fakeMap.put("subclass_attribute", AttributeValue.builder().s("1").build());
+
+        when(mockDynamoDbEnhancedClientExtension.beforeWrite(any(DynamoDbExtensionContext.BeforeWrite.class)))
+            .thenReturn(WriteModification.builder().transformedItem(fakeMap).build());
+
+
+        UpdateItemOperation<FakeItem> updateItemOperation =
+            UpdateItemOperation.create(UpdateItemEnhancedRequest.builder(FakeItem.class)
+                                                                .item(fakeItem)
+                                                                .ignoreNulls(true)
+                                                                .build());
+
+        UpdateItemRequest request = updateItemOperation.generateRequest(FakeItem.getTableSchema(),
+                                                                        PRIMARY_CONTEXT,
+                                                                        mockDynamoDbEnhancedClientExtension);
+
+        assertThat(request.updateExpression(), is("SET " + SUBCLASS_ATTRIBUTE_NAME + " = " + SUBCLASS_ATTRIBUTE_VALUE));
+        assertThat(request.expressionAttributeValues(), hasEntry(SUBCLASS_ATTRIBUTE_VALUE,
+            AttributeValue.builder().s("1").build()));
+        assertThat(request.expressionAttributeNames(), hasEntry(SUBCLASS_ATTRIBUTE_NAME, "subclass_attribute"));
+    }
+
+    @Test
+    public void transformResponse_mapsAttributesReturnedInResponse() {
+        FakeItem fakeItem1 = FakeItem.createUniqueFakeItem();
+        FakeItem fakeItem2 = FakeItem.createUniqueFakeItem();
+        Map<String, AttributeValue> fakeItem2Attributes = FakeItem.getTableSchema().itemToMap(fakeItem2, true);
+
+        UpdateItemOperation<FakeItem> updateItemOperation =
+            UpdateItemOperation.create(UpdateItemEnhancedRequest.builder(FakeItem.class).item(fakeItem1).build());
+
+        FakeItem result = updateItemOperation.transformResponse(
+            UpdateItemResponse.builder().attributes(fakeItem2Attributes).build(),
+            FakeItem.getTableSchema(),
+            PRIMARY_CONTEXT,
+            null);
+
+        assertThat(result, is(fakeItem2));
+    }
+
+    @Test
+    public void generateRequest_withExtensions_singleCondition() {
+        FakeItem baseFakeItem = createUniqueFakeItem();
+        FakeItem fakeItem = createUniqueFakeItem();
+        Map<String, AttributeValue> fakeMap = FakeItem.getTableSchema().itemToMap(fakeItem, true);
+        Expression condition = Expression.builder().expression("condition").expressionValues(fakeMap).build();
+        when(mockDynamoDbEnhancedClientExtension.beforeWrite(any(DynamoDbExtensionContext.BeforeWrite.class)))
+            .thenReturn(WriteModification.builder().additionalConditionalExpression(condition).build());
+        UpdateItemOperation<FakeItem> updateItemOperation =
+            UpdateItemOperation.create(UpdateItemEnhancedRequest.builder(FakeItem.class)
+                                                                .item(baseFakeItem)
+                                                                .ignoreNulls(true)
+                                                                .build());
+
+        UpdateItemRequest request = updateItemOperation.generateRequest(FakeItem.getTableSchema(),
+                                                                        PRIMARY_CONTEXT,
+                                                                        mockDynamoDbEnhancedClientExtension);
+
+        assertThat(request.conditionExpression(), is("condition"));
+        assertThat(request.expressionAttributeValues(), is(fakeMap));
+    }
+
+    @Test
+    public void generateRequest_withExtensions_conflictingExpressionValue_throwsRuntimeException() {
+        FakeItem baseFakeItem = createUniqueFakeItem();
+        baseFakeItem.setSubclassAttribute("something");
+        Map<String, AttributeValue> values = singletonMap(SUBCLASS_ATTRIBUTE_VALUE,
+                                                          AttributeValue.builder().s("1").build());
+        Expression condition1 = Expression.builder().expression("condition1").expressionValues(values).build();
+        when(mockDynamoDbEnhancedClientExtension.beforeWrite(any(DynamoDbExtensionContext.BeforeWrite.class)))
+            .thenReturn(WriteModification.builder().additionalConditionalExpression(condition1).build());
+
+        UpdateItemOperation<FakeItem> updateItemOperation =
+            UpdateItemOperation.create(UpdateItemEnhancedRequest.builder(FakeItem.class)
+                                                                .item(baseFakeItem)
+                                                                .ignoreNulls(true)
+                                                                .build());
+
+        try {
+            updateItemOperation.generateRequest(FakeItem.getTableSchema(), PRIMARY_CONTEXT, mockDynamoDbEnhancedClientExtension);
+
+            fail("Exception should be thrown");
+        } catch (RuntimeException e) {
+            assertThat(e.getMessage(), containsString("subclass_attribute"));
+        }
+    }
+
+    @Test
+    public void generateRequest_withExtensions_conflictingExpressionName_throwsRuntimeException() {
+        FakeItem baseFakeItem = createUniqueFakeItem();
+        baseFakeItem.setSubclassAttribute("something");
+        Map<String, String> names = singletonMap(SUBCLASS_ATTRIBUTE_NAME, "conflict");
+        Expression condition1 = Expression.builder().expression("condition1").expressionNames(names).build();
+        when(mockDynamoDbEnhancedClientExtension.beforeWrite(any(DynamoDbExtensionContext.BeforeWrite.class)))
+            .thenReturn(WriteModification.builder().additionalConditionalExpression(condition1).build());
+
+        UpdateItemOperation<FakeItem> updateItemOperation =
+            UpdateItemOperation.create(UpdateItemEnhancedRequest.builder(FakeItem.class)
+                                                                .item(baseFakeItem)
+                                                                .ignoreNulls(true)
+                                                                .build());
+
+        try {
+            updateItemOperation.generateRequest(FakeItem.getTableSchema(), PRIMARY_CONTEXT, mockDynamoDbEnhancedClientExtension);
+
+            fail("Exception should be thrown");
+        } catch (RuntimeException e) {
+            assertThat(e.getMessage(), containsString("subclass_attribute"));
+        }
+    }
+
+    @Test
+    public void generateRequest_withExtension_correctlyCoalescesIdenticalExpressionValues() {
+        FakeItem baseFakeItem = createUniqueFakeItem();
+        baseFakeItem.setSubclassAttribute("something");
+        Map<String, AttributeValue> values = singletonMap(SUBCLASS_ATTRIBUTE_VALUE,
+                                                           AttributeValue.builder().s("something").build());
+        Expression condition = Expression.builder().expression("condition").expressionValues(values).build();
+        when(mockDynamoDbEnhancedClientExtension.beforeWrite(any(DynamoDbExtensionContext.BeforeWrite.class)))
+            .thenReturn(WriteModification.builder().additionalConditionalExpression(condition).build());
+
+        UpdateItemOperation<FakeItem> updateItemOperation =
+            UpdateItemOperation.create(UpdateItemEnhancedRequest.builder(FakeItem.class)
+                                                                .item(baseFakeItem)
+                                                                .ignoreNulls(true)
+                                                                .build());
+
+        UpdateItemRequest request = updateItemOperation.generateRequest(FakeItem.getTableSchema(),
+                                                                        PRIMARY_CONTEXT,
+                                                                        mockDynamoDbEnhancedClientExtension);
+
+        assertThat(request.expressionAttributeValues(), is(values));
+    }
+
+    @Test
+    public void generateRequest_withExtension_correctlyCoalescesIdenticalExpressionNames() {
+        FakeItem baseFakeItem = createUniqueFakeItem();
+        baseFakeItem.setSubclassAttribute("something");
+        Map<String, String> names = singletonMap(SUBCLASS_ATTRIBUTE_NAME, "subclass_attribute");
+        Expression condition = Expression.builder().expression("condition").expressionNames(names).build();
+        when(mockDynamoDbEnhancedClientExtension.beforeWrite(any(DynamoDbExtensionContext.BeforeWrite.class)))
+            .thenReturn(WriteModification.builder().additionalConditionalExpression(condition).build());
+
+        UpdateItemOperation<FakeItem> updateItemOperation =
+            UpdateItemOperation.create(UpdateItemEnhancedRequest.builder(FakeItem.class)
+                                                                .item(baseFakeItem)
+                                                                .ignoreNulls(true)
+                                                                .build());
+
+        UpdateItemRequest request = updateItemOperation.generateRequest(FakeItem.getTableSchema(),
+                                                                        PRIMARY_CONTEXT,
+                                                                        mockDynamoDbEnhancedClientExtension);
+
+        assertThat(request.expressionAttributeNames(), is(names));
+    }
+
+    @Test
+    public void generateRequest_withExtension_noModifications() {
+        FakeItem baseFakeItem = createUniqueFakeItem();
+        when(mockDynamoDbEnhancedClientExtension.beforeWrite(any(DynamoDbExtensionContext.BeforeWrite.class)))
+            .thenReturn(WriteModification.builder().build());
+
+        UpdateItemOperation<FakeItem> updateItemOperation =
+            UpdateItemOperation.create(UpdateItemEnhancedRequest.builder(FakeItem.class)
+                                                                .item(baseFakeItem)
+                                                                .ignoreNulls(true)
+                                                                .build());
+
+        UpdateItemRequest request = updateItemOperation.generateRequest(FakeItem.getTableSchema(),
+                                                                        PRIMARY_CONTEXT,
+                                                                        mockDynamoDbEnhancedClientExtension);
+        assertThat(request.conditionExpression(), is(nullValue()));
+        assertThat(request.expressionAttributeValues().size(), is(0));
+    }
+
+    @Test
+    public void generateRequest_withExtension_conditionAndModification() {
+        FakeItem baseFakeItem = createUniqueFakeItem();
+        Map<String, AttributeValue> baseMap = new HashMap<>(FakeItem.getTableSchema().itemToMap(baseFakeItem, true));
+
+        Map<String, AttributeValue> fakeMap = new HashMap<>(baseMap);
+        fakeMap.put("subclass_attribute", AttributeValue.builder().s("1").build());
+
+        Map<String, AttributeValue> conditionValues = new HashMap<>();
+        conditionValues.put(":condition_value", AttributeValue.builder().s("2").build());
+
+        when(mockDynamoDbEnhancedClientExtension.beforeWrite(any(DynamoDbExtensionContext.BeforeWrite.class)))
+            .thenReturn(WriteModification.builder()
+                                         .transformedItem(fakeMap)
+                                         .additionalConditionalExpression(Expression.builder()
+                                                                                    .expression("condition")
+                                                                                    .expressionValues(conditionValues)
+                                                                                    .build())
+                                         .build());
+
+        UpdateItemOperation<FakeItem> updateItemOperation =
+            UpdateItemOperation.create(UpdateItemEnhancedRequest.builder(FakeItem.class)
+                                                                .item(baseFakeItem)
+                                                                .ignoreNulls(true)
+                                                                .build());
+
+        UpdateItemRequest request = updateItemOperation.generateRequest(FakeItem.getTableSchema(),
+                                                                        PRIMARY_CONTEXT,
+                                                                        mockDynamoDbEnhancedClientExtension);
+
+        assertThat(request.updateExpression(), is("SET " + SUBCLASS_ATTRIBUTE_NAME + " = " + SUBCLASS_ATTRIBUTE_VALUE));
+        assertThat(request.expressionAttributeValues(), hasEntry(SUBCLASS_ATTRIBUTE_VALUE,
+                                                                 AttributeValue.builder().s("1").build()));
+        assertThat(request.expressionAttributeValues(), hasEntry(":condition_value",
+                                                                 AttributeValue.builder().s("2").build()));
+        assertThat(request.expressionAttributeNames(), hasEntry(SUBCLASS_ATTRIBUTE_NAME, "subclass_attribute"));
+    }
+
+    @Test
+    public void transformResponse_withExtension_returnsCorrectTransformedItem() {
+        FakeItem baseFakeItem = createUniqueFakeItem();
+        FakeItem fakeItem = createUniqueFakeItem();
+        Map<String, AttributeValue> baseFakeMap = FakeItem.getTableSchema().itemToMap(baseFakeItem, true);
+        Map<String, AttributeValue> fakeMap = FakeItem.getTableSchema().itemToMap(fakeItem, true);
+
+        UpdateItemOperation<FakeItem> updateItemOperation =
+            UpdateItemOperation.create(UpdateItemEnhancedRequest.builder(FakeItem.class)
+                                                                .item(baseFakeItem)
+                                                                .ignoreNulls(true)
+                                                                .build());
+
+        when(mockDynamoDbEnhancedClientExtension.afterRead(any(DynamoDbExtensionContext.AfterRead.class))).thenReturn(
+            ReadModification.builder().transformedItem(fakeMap).build());
+        UpdateItemResponse response = UpdateItemResponse.builder()
+                                                        .attributes(baseFakeMap)
+                                                        .build();
+
+        FakeItem resultItem = updateItemOperation.transformResponse(response, FakeItem.getTableSchema(),
+                                                                    PRIMARY_CONTEXT,
+                                                                    mockDynamoDbEnhancedClientExtension);
+
+        assertThat(resultItem, is(fakeItem));
+        verify(mockDynamoDbEnhancedClientExtension).afterRead(DefaultDynamoDbExtensionContext.builder()
+                                                                                             .tableMetadata(FakeItem.getTableMetadata())
+                                                                                             .operationContext(PRIMARY_CONTEXT)
+                                                                                             .items(baseFakeMap).build());
+    }
+
+    @Test
+    public void transformResponse_withNoOpExtension_returnsCorrectItem() {
+        FakeItem baseFakeItem = createUniqueFakeItem();
+        Map<String, AttributeValue> baseFakeMap = FakeItem.getTableSchema().itemToMap(baseFakeItem, true);
+
+        UpdateItemOperation<FakeItem> updateItemOperation =
+            UpdateItemOperation.create(UpdateItemEnhancedRequest.builder(FakeItem.class)
+                                                                .item(baseFakeItem)
+                                                                .ignoreNulls(true)
+                                                                .build());
+
+        when(mockDynamoDbEnhancedClientExtension.afterRead(any(DynamoDbExtensionContext.AfterRead.class))).thenReturn(
+            ReadModification.builder().build());
+        UpdateItemResponse response = UpdateItemResponse.builder()
+                                                        .attributes(baseFakeMap)
+                                                        .build();
+
+        FakeItem resultItem = updateItemOperation.transformResponse(response, FakeItem.getTableSchema(),
+                                                                    PRIMARY_CONTEXT, mockDynamoDbEnhancedClientExtension);
+
+        assertThat(resultItem, is(baseFakeItem));
+        verify(mockDynamoDbEnhancedClientExtension).afterRead(DefaultDynamoDbExtensionContext.builder()
+                                                                                             .tableMetadata(FakeItem.getTableMetadata())
+                                                                                             .operationContext(PRIMARY_CONTEXT)
+                                                                                             .items(baseFakeMap).build());
+    }
+
+    @Test(expected = IllegalStateException.class)
+    public void transformResponse_afterReadThrowsException_throwsIllegalStateException() {
+        when(mockDynamoDbEnhancedClientExtension.afterRead(any(DynamoDbExtensionContext.AfterRead.class))).thenThrow(RuntimeException.class);
+        UpdateItemOperation<FakeItem> updateItemOperation =
+            UpdateItemOperation.create(UpdateItemEnhancedRequest.builder(FakeItem.class).item(createUniqueFakeItem()).build());
+
+        UpdateItemResponse response =
+            UpdateItemResponse.builder()
+                              .attributes(FakeItem.getTableSchema().itemToMap(FakeItem.createUniqueFakeItem(), true))
+                              .build();
+
+        updateItemOperation.transformResponse(response, FakeItem.getTableSchema(), PRIMARY_CONTEXT, mockDynamoDbEnhancedClientExtension);
+    }
+
+    @Test
+    public void generateTransactWriteItem_basicRequest() {
+        FakeItem fakeItem = createUniqueFakeItem();
+        Map<String, AttributeValue> fakeItemMap = FakeItem.getTableSchema().itemToMap(fakeItem, true);
+        UpdateItemOperation<FakeItem> updateItemOperation =
+            spy(UpdateItemOperation.create(UpdateItemEnhancedRequest.builder(FakeItem.class).item(fakeItem).build()));
+        OperationContext context = OperationContext.create(TABLE_NAME, TableMetadata.primaryIndexName());
+        String updateExpression = "update-expression";
+        Map<String, AttributeValue> attributeValues = Collections.singletonMap("key", stringValue("value1"));
+        Map<String, String> attributeNames = Collections.singletonMap("key", "value2");
+
+        UpdateItemRequest updateItemRequest = UpdateItemRequest.builder()
+                                                               .tableName(TABLE_NAME)
+                                                               .key(fakeItemMap)
+                                                               .updateExpression(updateExpression)
+                                                               .expressionAttributeValues(attributeValues)
+                                                               .expressionAttributeNames(attributeNames)
+                                                               .build();
+        doReturn(updateItemRequest).when(updateItemOperation).generateRequest(any(), any(), any());
+
+        TransactWriteItem actualResult = updateItemOperation.generateTransactWriteItem(FakeItem.getTableSchema(),
+                                                                                       context,
+                                                                                       mockDynamoDbEnhancedClientExtension);
+
+        TransactWriteItem expectedResult = TransactWriteItem.builder()
+                                                            .update(Update.builder()
+                                                                          .key(fakeItemMap)
+                                                                          .tableName(TABLE_NAME)
+                                                                          .updateExpression(updateExpression)
+                                                                          .expressionAttributeNames(attributeNames)
+                                                                          .expressionAttributeValues(attributeValues)
+                                                                          .build())
+                                                            .build();
+        assertThat(actualResult, is(expectedResult));
+        verify(updateItemOperation).generateRequest(FakeItem.getTableSchema(), context, mockDynamoDbEnhancedClientExtension);
+    }
+
+    @Test
+    public void generateTransactWriteItem_conditionalRequest() {
+        FakeItem fakeItem = createUniqueFakeItem();
+        Map<String, AttributeValue> fakeItemMap = FakeItem.getTableSchema().itemToMap(fakeItem, true);
+        UpdateItemOperation<FakeItem> updateItemOperation =
+            spy(UpdateItemOperation.create(UpdateItemEnhancedRequest.builder(FakeItem.class).item(fakeItem).build()));
+        OperationContext context = OperationContext.create(TABLE_NAME, TableMetadata.primaryIndexName());
+        String updateExpression = "update-expression";
+        String conditionExpression = "condition-expression";
+        Map<String, AttributeValue> attributeValues = Collections.singletonMap("key", stringValue("value1"));
+        Map<String, String> attributeNames = Collections.singletonMap("key", "value2");
+
+        UpdateItemRequest updateItemRequest = UpdateItemRequest.builder()
+                                                               .tableName(TABLE_NAME)
+                                                               .key(fakeItemMap)
+                                                               .updateExpression(updateExpression)
+                                                               .conditionExpression(conditionExpression)
+                                                               .expressionAttributeValues(attributeValues)
+                                                               .expressionAttributeNames(attributeNames)
+                                                               .build();
+        doReturn(updateItemRequest).when(updateItemOperation).generateRequest(any(), any(), any());
+
+        TransactWriteItem actualResult = updateItemOperation.generateTransactWriteItem(FakeItem.getTableSchema(),
+                                                                                       context,
+                                                                                       mockDynamoDbEnhancedClientExtension);
+
+        TransactWriteItem expectedResult = TransactWriteItem.builder()
+                                                            .update(Update.builder()
+                                                                          .key(fakeItemMap)
+                                                                          .tableName(TABLE_NAME)
+                                                                          .updateExpression(updateExpression)
+                                                                          .conditionExpression(conditionExpression)
+                                                                          .expressionAttributeNames(attributeNames)
+                                                                          .expressionAttributeValues(attributeValues)
+                                                                          .build())
+                                                            .build();
+        assertThat(actualResult, is(expectedResult));
+        verify(updateItemOperation).generateRequest(FakeItem.getTableSchema(), context, mockDynamoDbEnhancedClientExtension);
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/BeanTableSchemaTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/BeanTableSchemaTest.java
new file mode 100644
index 000000000000..0dd88c8eabea
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/BeanTableSchemaTest.java
@@ -0,0 +1,972 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.mapper;
+
+import static java.util.Collections.singletonMap;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.contains;
+import static org.hamcrest.Matchers.containsInAnyOrder;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.hasEntry;
+import static org.hamcrest.Matchers.is;
+import static software.amazon.awssdk.enhanced.dynamodb.internal.AttributeValues.binaryValue;
+import static software.amazon.awssdk.enhanced.dynamodb.internal.AttributeValues.numberValue;
+import static software.amazon.awssdk.enhanced.dynamodb.internal.AttributeValues.stringValue;
+
+import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.LinkedHashSet;
+import java.util.Map;
+import java.util.Optional;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+import org.junit.runner.RunWith;
+import org.mockito.junit.MockitoJUnitRunner;
+import software.amazon.awssdk.core.SdkBytes;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.enhanced.dynamodb.internal.AttributeValues;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.testbeans.AbstractBean;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.testbeans.AttributeConverterBean;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.testbeans.AttributeConverterNoConstructorBean;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.testbeans.CommonTypesBean;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.testbeans.DocumentBean;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.testbeans.EmptyConverterProvidersInvalidBean;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.testbeans.EmptyConverterProvidersValidBean;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.testbeans.EnumBean;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.testbeans.ExtendedBean;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.testbeans.FlattenedBean;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.testbeans.IgnoredAttributeBean;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.testbeans.InvalidBean;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.testbeans.ListBean;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.testbeans.MapBean;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.testbeans.MultipleConverterProvidersBean;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.testbeans.NoConstructorConverterProvidersBean;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.testbeans.ParameterizedAbstractBean;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.testbeans.ParameterizedDocumentBean;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.testbeans.PrimitiveTypesBean;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.testbeans.RemappedAttributeBean;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.testbeans.SecondaryIndexBean;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.testbeans.SetBean;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.testbeans.SetterAnnotatedBean;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.testbeans.SimpleBean;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.testbeans.SingleConverterProvidersBean;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.testbeans.SortKeyBean;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+
+@RunWith(MockitoJUnitRunner.class)
+public class BeanTableSchemaTest {
+
+    @Rule
+    public ExpectedException exception = ExpectedException.none();
+
+    @Test
+    public void simpleBean_correctlyAssignsPrimaryPartitionKey() {
+        BeanTableSchema<SimpleBean> beanTableSchema = BeanTableSchema.create(SimpleBean.class);
+        assertThat(beanTableSchema.tableMetadata().primaryPartitionKey(), is("id"));
+    }
+
+    @Test
+    public void sortKeyBean_correctlyAssignsSortKey() {
+        BeanTableSchema<SortKeyBean> beanTableSchema = BeanTableSchema.create(SortKeyBean.class);
+        assertThat(beanTableSchema.tableMetadata().primarySortKey(), is(Optional.of("sort")));
+    }
+
+    @Test
+    public void simpleBean_hasNoSortKey() {
+        BeanTableSchema<SimpleBean> beanTableSchema = BeanTableSchema.create(SimpleBean.class);
+        assertThat(beanTableSchema.tableMetadata().primarySortKey(), is(Optional.empty()));
+    }
+
+    @Test
+    public void simpleBean_hasNoAdditionalKeys() {
+        BeanTableSchema<SimpleBean> beanTableSchema = BeanTableSchema.create(SimpleBean.class);
+        assertThat(beanTableSchema.tableMetadata().allKeys(), contains("id"));
+    }
+
+    @Test
+    public void sortKeyBean_hasNoAdditionalKeys() {
+        BeanTableSchema<SortKeyBean> beanTableSchema = BeanTableSchema.create(SortKeyBean.class);
+        assertThat(beanTableSchema.tableMetadata().allKeys(), containsInAnyOrder("id", "sort"));
+    }
+
+    @Test
+    public void secondaryIndexBean_definesGsiCorrectly() {
+        BeanTableSchema<SecondaryIndexBean> beanTableSchema = BeanTableSchema.create(SecondaryIndexBean.class);
+
+        assertThat(beanTableSchema.tableMetadata().indexPartitionKey("gsi"), is("sort"));
+        assertThat(beanTableSchema.tableMetadata().indexSortKey("gsi"), is(Optional.of("attribute")));
+    }
+
+    @Test
+    public void secondaryIndexBean_definesLsiCorrectly() {
+        BeanTableSchema<SecondaryIndexBean> beanTableSchema = BeanTableSchema.create(SecondaryIndexBean.class);
+
+        assertThat(beanTableSchema.tableMetadata().indexPartitionKey("lsi"), is("id"));
+        assertThat(beanTableSchema.tableMetadata().indexSortKey("lsi"), is(Optional.of("attribute")));
+    }
+
+    @Test
+    public void dynamoDbIgnore_propertyIsIgnored() {
+        BeanTableSchema<IgnoredAttributeBean> beanTableSchema = BeanTableSchema.create(IgnoredAttributeBean.class);
+        IgnoredAttributeBean ignoredAttributeBean = new IgnoredAttributeBean();
+        ignoredAttributeBean.setId("id-value");
+        ignoredAttributeBean.setIntegerAttribute(123);
+
+        Map<String, AttributeValue> itemMap = beanTableSchema.itemToMap(ignoredAttributeBean, false);
+
+        assertThat(itemMap.size(), is(1));
+        assertThat(itemMap, hasEntry("id", stringValue("id-value")));
+    }
+
+    @Test
+    public void setterAnnotations_alsoWork() {
+        BeanTableSchema<SetterAnnotatedBean> beanTableSchema = BeanTableSchema.create(SetterAnnotatedBean.class);
+        SetterAnnotatedBean setterAnnotatedBean = new SetterAnnotatedBean();
+        setterAnnotatedBean.setId("id-value");
+        setterAnnotatedBean.setIntegerAttribute(123);
+
+        assertThat(beanTableSchema.tableMetadata().primaryPartitionKey(), is("id"));
+
+        Map<String, AttributeValue> itemMap = beanTableSchema.itemToMap(setterAnnotatedBean, false);
+        assertThat(itemMap.size(), is(1));
+        assertThat(itemMap, hasEntry("id", stringValue("id-value")));
+    }
+
+    @Test
+    public void dynamoDbAttribute_remapsAttributeName() {
+        BeanTableSchema<RemappedAttributeBean> beanTableSchema = BeanTableSchema.create(RemappedAttributeBean.class);
+
+        assertThat(beanTableSchema.tableMetadata().primaryPartitionKey(), is("remappedAttribute"));
+    }
+
+    @Test
+    public void dynamoDbFlatten_correctlyFlattensAttributes() {
+        BeanTableSchema<FlattenedBean> beanTableSchema = BeanTableSchema.create(FlattenedBean.class);
+        AbstractBean abstractBean = new AbstractBean();
+        abstractBean.setAttribute2("two");
+        FlattenedBean flattenedBean = new FlattenedBean();
+        flattenedBean.setId("id-value");
+        flattenedBean.setAttribute1("one");
+        flattenedBean.setAbstractBean(abstractBean);
+
+        Map<String, AttributeValue> itemMap = beanTableSchema.itemToMap(flattenedBean, false);
+        assertThat(itemMap.size(), is(3));
+        assertThat(itemMap, hasEntry("id", stringValue("id-value")));
+        assertThat(itemMap, hasEntry("attribute1", stringValue("one")));
+        assertThat(itemMap, hasEntry("attribute2", stringValue("two")));
+    }
+
+    @Test
+    public void documentBean_correctlyMapsAttributes() {
+        BeanTableSchema<DocumentBean> beanTableSchema = BeanTableSchema.create(DocumentBean.class);
+        AbstractBean abstractBean = new AbstractBean();
+        abstractBean.setAttribute2("two");
+        DocumentBean documentBean = new DocumentBean();
+        documentBean.setId("id-value");
+        documentBean.setAttribute1("one");
+        documentBean.setAbstractBean(abstractBean);
+
+        AttributeValue expectedDocument = AttributeValue.builder()
+                                                        .m(singletonMap("attribute2", stringValue("two")))
+                                                        .build();
+
+        Map<String, AttributeValue> itemMap = beanTableSchema.itemToMap(documentBean, true);
+        assertThat(itemMap.size(), is(3));
+        assertThat(itemMap, hasEntry("id", stringValue("id-value")));
+        assertThat(itemMap, hasEntry("attribute1", stringValue("one")));
+        assertThat(itemMap, hasEntry("abstractBean", expectedDocument));
+    }
+
+    @Test
+    public void documentBean_list_correctlyMapsAttributes() {
+        BeanTableSchema<DocumentBean> beanTableSchema = BeanTableSchema.create(DocumentBean.class);
+        AbstractBean abstractBean1 = new AbstractBean();
+        abstractBean1.setAttribute2("two");
+        AbstractBean abstractBean2 = new AbstractBean();
+        abstractBean2.setAttribute2("three");
+        DocumentBean documentBean = new DocumentBean();
+        documentBean.setId("id-value");
+        documentBean.setAttribute1("one");
+        documentBean.setAbstractBeanList(Arrays.asList(abstractBean1, abstractBean2));
+
+        AttributeValue expectedDocument1 = AttributeValue.builder()
+                                                        .m(singletonMap("attribute2", stringValue("two")))
+                                                        .build();
+        AttributeValue expectedDocument2 = AttributeValue.builder()
+                                                         .m(singletonMap("attribute2", stringValue("three")))
+                                                         .build();
+        AttributeValue expectedList = AttributeValue.builder().l(expectedDocument1, expectedDocument2).build();
+
+        Map<String, AttributeValue> itemMap = beanTableSchema.itemToMap(documentBean, true);
+        assertThat(itemMap.size(), is(3));
+        assertThat(itemMap, hasEntry("id", stringValue("id-value")));
+        assertThat(itemMap, hasEntry("attribute1", stringValue("one")));
+        assertThat(itemMap, hasEntry("abstractBeanList", expectedList));
+    }
+
+    @Test
+    public void documentBean_map_correctlyMapsAttributes() {
+        BeanTableSchema<DocumentBean> beanTableSchema = BeanTableSchema.create(DocumentBean.class);
+        AbstractBean abstractBean1 = new AbstractBean();
+        abstractBean1.setAttribute2("two");
+        AbstractBean abstractBean2 = new AbstractBean();
+        abstractBean2.setAttribute2("three");
+        DocumentBean documentBean = new DocumentBean();
+        documentBean.setId("id-value");
+        documentBean.setAttribute1("one");
+
+        Map<String, AbstractBean> abstractBeanMap = new HashMap<>();
+        abstractBeanMap.put("key1", abstractBean1);
+        abstractBeanMap.put("key2", abstractBean2);
+        documentBean.setAbstractBeanMap(abstractBeanMap);
+
+        AttributeValue expectedDocument1 = AttributeValue.builder()
+                                                         .m(singletonMap("attribute2", stringValue("two")))
+                                                         .build();
+        AttributeValue expectedDocument2 = AttributeValue.builder()
+                                                         .m(singletonMap("attribute2", stringValue("three")))
+                                                         .build();
+        Map<String, AttributeValue> expectedAttributeValueMap = new HashMap<>();
+        expectedAttributeValueMap.put("key1", expectedDocument1);
+        expectedAttributeValueMap.put("key2", expectedDocument2);
+        AttributeValue expectedMap = AttributeValue.builder().m(expectedAttributeValueMap).build();
+
+        Map<String, AttributeValue> itemMap = beanTableSchema.itemToMap(documentBean, true);
+        assertThat(itemMap.size(), is(3));
+        assertThat(itemMap, hasEntry("id", stringValue("id-value")));
+        assertThat(itemMap, hasEntry("attribute1", stringValue("one")));
+        assertThat(itemMap, hasEntry("abstractBeanMap", expectedMap));
+    }
+
+    @Test
+    public void parameterizedDocumentBean_correctlyMapsAttributes() {
+        BeanTableSchema<ParameterizedDocumentBean> beanTableSchema = BeanTableSchema.create(ParameterizedDocumentBean.class);
+        ParameterizedAbstractBean<String> abstractBean = new ParameterizedAbstractBean<>();
+        abstractBean.setAttribute2("two");
+        ParameterizedDocumentBean documentBean = new ParameterizedDocumentBean();
+        documentBean.setId("id-value");
+        documentBean.setAttribute1("one");
+        documentBean.setAbstractBean(abstractBean);
+
+        AttributeValue expectedDocument = AttributeValue.builder()
+                                                        .m(singletonMap("attribute2", stringValue("two")))
+                                                        .build();
+
+        Map<String, AttributeValue> itemMap = beanTableSchema.itemToMap(documentBean, true);
+        assertThat(itemMap.size(), is(3));
+        assertThat(itemMap, hasEntry("id", stringValue("id-value")));
+        assertThat(itemMap, hasEntry("attribute1", stringValue("one")));
+        assertThat(itemMap, hasEntry("abstractBean", expectedDocument));
+    }
+
+    @Test
+    public void parameterizedDocumentBean_list_correctlyMapsAttributes() {
+        BeanTableSchema<ParameterizedDocumentBean> beanTableSchema = BeanTableSchema.create(ParameterizedDocumentBean.class);
+        ParameterizedAbstractBean<String> abstractBean1 = new ParameterizedAbstractBean<>();
+        abstractBean1.setAttribute2("two");
+        ParameterizedAbstractBean<String> abstractBean2 = new ParameterizedAbstractBean<>();
+        abstractBean2.setAttribute2("three");
+        ParameterizedDocumentBean documentBean = new ParameterizedDocumentBean();
+        documentBean.setId("id-value");
+        documentBean.setAttribute1("one");
+        documentBean.setAbstractBeanList(Arrays.asList(abstractBean1, abstractBean2));
+
+        AttributeValue expectedDocument1 = AttributeValue.builder()
+                                                         .m(singletonMap("attribute2", stringValue("two")))
+                                                         .build();
+        AttributeValue expectedDocument2 = AttributeValue.builder()
+                                                         .m(singletonMap("attribute2", stringValue("three")))
+                                                         .build();
+        AttributeValue expectedList = AttributeValue.builder().l(expectedDocument1, expectedDocument2).build();
+
+        Map<String, AttributeValue> itemMap = beanTableSchema.itemToMap(documentBean, true);
+        assertThat(itemMap.size(), is(3));
+        assertThat(itemMap, hasEntry("id", stringValue("id-value")));
+        assertThat(itemMap, hasEntry("attribute1", stringValue("one")));
+        assertThat(itemMap, hasEntry("abstractBeanList", expectedList));
+    }
+
+    @Test
+    public void parameterizedDocumentBean_map_correctlyMapsAttributes() {
+        BeanTableSchema<ParameterizedDocumentBean> beanTableSchema = BeanTableSchema.create(ParameterizedDocumentBean.class);
+        ParameterizedAbstractBean<String> abstractBean1 = new ParameterizedAbstractBean<>();
+        abstractBean1.setAttribute2("two");
+        ParameterizedAbstractBean<String> abstractBean2 = new ParameterizedAbstractBean<>();
+        abstractBean2.setAttribute2("three");
+        ParameterizedDocumentBean documentBean = new ParameterizedDocumentBean();
+        documentBean.setId("id-value");
+        documentBean.setAttribute1("one");
+
+        Map<String, ParameterizedAbstractBean<String>> abstractBeanMap = new HashMap<>();
+        abstractBeanMap.put("key1", abstractBean1);
+        abstractBeanMap.put("key2", abstractBean2);
+        documentBean.setAbstractBeanMap(abstractBeanMap);
+
+        AttributeValue expectedDocument1 = AttributeValue.builder()
+                                                         .m(singletonMap("attribute2", stringValue("two")))
+                                                         .build();
+        AttributeValue expectedDocument2 = AttributeValue.builder()
+                                                         .m(singletonMap("attribute2", stringValue("three")))
+                                                         .build();
+        Map<String, AttributeValue> expectedAttributeValueMap = new HashMap<>();
+        expectedAttributeValueMap.put("key1", expectedDocument1);
+        expectedAttributeValueMap.put("key2", expectedDocument2);
+        AttributeValue expectedMap = AttributeValue.builder().m(expectedAttributeValueMap).build();
+
+        Map<String, AttributeValue> itemMap = beanTableSchema.itemToMap(documentBean, true);
+        assertThat(itemMap.size(), is(3));
+        assertThat(itemMap, hasEntry("id", stringValue("id-value")));
+        assertThat(itemMap, hasEntry("attribute1", stringValue("one")));
+        assertThat(itemMap, hasEntry("abstractBeanMap", expectedMap));
+    }
+
+    @Test
+    public void extendedBean_correctlyExtendsAttributes() {
+        BeanTableSchema<ExtendedBean> beanTableSchema = BeanTableSchema.create(ExtendedBean.class);
+        ExtendedBean extendedBean = new ExtendedBean();
+        extendedBean.setId("id-value");
+        extendedBean.setAttribute1("one");
+        extendedBean.setAttribute2("two");
+
+        Map<String, AttributeValue> itemMap = beanTableSchema.itemToMap(extendedBean, false);
+        assertThat(itemMap.size(), is(3));
+        assertThat(itemMap, hasEntry("id", stringValue("id-value")));
+        assertThat(itemMap, hasEntry("attribute1", stringValue("one")));
+        assertThat(itemMap, hasEntry("attribute2", stringValue("two")));
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void invalidBean_throwsIllegalArgumentException() {
+        BeanTableSchema.create(InvalidBean.class);
+    }
+
+    @Test
+    public void itemToMap_nullAttribute_ignoreNullsTrue() {
+        BeanTableSchema<SimpleBean> beanTableSchema = BeanTableSchema.create(SimpleBean.class);
+        SimpleBean simpleBean = new SimpleBean();
+        simpleBean.setId("id-value");
+
+        Map<String, AttributeValue> itemMap = beanTableSchema.itemToMap(simpleBean, true);
+
+        assertThat(itemMap.size(), is(1));
+        assertThat(itemMap, hasEntry("id", stringValue("id-value")));
+    }
+
+    @Test
+    public void itemToMap_nullAttribute_ignoreNullsFalse() {
+        BeanTableSchema<SimpleBean> beanTableSchema = BeanTableSchema.create(SimpleBean.class);
+        SimpleBean simpleBean = new SimpleBean();
+        simpleBean.setId("id-value");
+
+        Map<String, AttributeValue> itemMap = beanTableSchema.itemToMap(simpleBean, false);
+
+        assertThat(itemMap.size(), is(2));
+        assertThat(itemMap, hasEntry("id", stringValue("id-value")));
+        assertThat(itemMap, hasEntry("integerAttribute", AttributeValues.nullAttributeValue()));
+    }
+
+    @Test
+    public void itemToMap_nonNullAttribute() {
+        BeanTableSchema<SimpleBean> beanTableSchema = BeanTableSchema.create(SimpleBean.class);
+        SimpleBean simpleBean = new SimpleBean();
+        simpleBean.setId("id-value");
+        simpleBean.setIntegerAttribute(123);
+
+        Map<String, AttributeValue> itemMap = beanTableSchema.itemToMap(simpleBean, false);
+
+        assertThat(itemMap.size(), is(2));
+        assertThat(itemMap, hasEntry("id", stringValue("id-value")));
+        assertThat(itemMap, hasEntry("integerAttribute", numberValue(123)));
+    }
+
+    @Test
+    public void mapToItem_createsItem() {
+        BeanTableSchema<SimpleBean> beanTableSchema = BeanTableSchema.create(SimpleBean.class);
+        Map<String, AttributeValue> itemMap = new HashMap<>();
+        itemMap.put("id", stringValue("id-value"));
+        itemMap.put("integerAttribute", numberValue(123));
+        SimpleBean expectedBean = new SimpleBean();
+        expectedBean.setId("id-value");
+        expectedBean.setIntegerAttribute(123);
+
+        SimpleBean result = beanTableSchema.mapToItem(itemMap);
+
+        assertThat(result, is(expectedBean));
+    }
+
+    @Test
+    public void attributeValue_returnsValue() {
+        BeanTableSchema<SimpleBean> beanTableSchema = BeanTableSchema.create(SimpleBean.class);
+        SimpleBean simpleBean = new SimpleBean();
+        simpleBean.setId("id-value");
+        simpleBean.setIntegerAttribute(123);
+
+        assertThat(beanTableSchema.attributeValue(simpleBean, "integerAttribute"), is(numberValue(123)));
+    }
+
+    @Test
+    public void enumBean_invalidEnum() {
+        BeanTableSchema<EnumBean> beanTableSchema = BeanTableSchema.create(EnumBean.class);
+
+        Map<String, AttributeValue> itemMap = new HashMap<>();
+        itemMap.put("id", stringValue("id-value"));
+        itemMap.put("testEnum", stringValue("invalid-value"));
+
+        exception.expect(IllegalArgumentException.class);
+        exception.expectMessage("invalid-value");
+        exception.expectMessage("TestEnum");
+        beanTableSchema.mapToItem(itemMap);
+    }
+
+    @Test
+    public void enumBean_singleEnum() {
+        BeanTableSchema<EnumBean> beanTableSchema = BeanTableSchema.create(EnumBean.class);
+        EnumBean enumBean = new EnumBean();
+        enumBean.setId("id-value");
+        enumBean.setTestEnum(EnumBean.TestEnum.ONE);
+
+        Map<String, AttributeValue> itemMap = beanTableSchema.itemToMap(enumBean, true);
+
+        assertThat(itemMap.size(), is(2));
+        assertThat(itemMap, hasEntry("id", stringValue("id-value")));
+        assertThat(itemMap, hasEntry("testEnum", stringValue("ONE")));
+
+        EnumBean reverse = beanTableSchema.mapToItem(itemMap);
+        assertThat(reverse, is(equalTo(enumBean)));
+    }
+
+    @Test
+    public void enumBean_listEnum() {
+        BeanTableSchema<EnumBean> beanTableSchema = BeanTableSchema.create(EnumBean.class);
+        EnumBean enumBean = new EnumBean();
+        enumBean.setId("id-value");
+        enumBean.setTestEnumList(Arrays.asList(EnumBean.TestEnum.ONE, EnumBean.TestEnum.TWO));
+
+        Map<String, AttributeValue> itemMap = beanTableSchema.itemToMap(enumBean, true);
+
+        AttributeValue expectedAttributeValue = AttributeValue.builder()
+                                                              .l(stringValue("ONE"),
+                                                                 stringValue("TWO"))
+                                                              .build();
+        assertThat(itemMap.size(), is(2));
+        assertThat(itemMap, hasEntry("id", stringValue("id-value")));
+        assertThat(itemMap, hasEntry("testEnumList", expectedAttributeValue));
+
+        EnumBean reverse = beanTableSchema.mapToItem(itemMap);
+        assertThat(reverse, is(equalTo(enumBean)));
+    }
+
+    @Test
+    public void listBean_stringList() {
+        BeanTableSchema<ListBean> beanTableSchema = BeanTableSchema.create(ListBean.class);
+        ListBean listBean = new ListBean();
+        listBean.setId("id-value");
+        listBean.setStringList(Arrays.asList("one", "two", "three"));
+
+        Map<String, AttributeValue> itemMap = beanTableSchema.itemToMap(listBean, true);
+
+        AttributeValue expectedAttributeValue = AttributeValue.builder()
+                                                              .l(stringValue("one"),
+                                                                 stringValue("two"),
+                                                                 stringValue("three"))
+                                                              .build();
+
+        assertThat(itemMap.size(), is(2));
+        assertThat(itemMap, hasEntry("id", stringValue("id-value")));
+        assertThat(itemMap, hasEntry("stringList", expectedAttributeValue));
+
+        ListBean reverse = beanTableSchema.mapToItem(itemMap);
+        assertThat(reverse, is(equalTo(listBean)));
+    }
+
+    @Test
+    public void listBean_stringListList() {
+        BeanTableSchema<ListBean> beanTableSchema = BeanTableSchema.create(ListBean.class);
+        ListBean listBean = new ListBean();
+        listBean.setId("id-value");
+        listBean.setStringListList(Arrays.asList(Arrays.asList("one", "two"), Arrays.asList("three", "four")));
+
+        Map<String, AttributeValue> itemMap = beanTableSchema.itemToMap(listBean, true);
+
+        AttributeValue list1 = AttributeValue.builder().l(stringValue("one"), stringValue("two")).build();
+        AttributeValue list2 = AttributeValue.builder().l(stringValue("three"), stringValue("four")).build();
+        AttributeValue expectedAttributeValue = AttributeValue.builder()
+                                                              .l(list1, list2)
+                                                              .build();
+
+        assertThat(itemMap.size(), is(2));
+        assertThat(itemMap, hasEntry("id", stringValue("id-value")));
+        assertThat(itemMap, hasEntry("stringListList", expectedAttributeValue));
+
+        ListBean reverse = beanTableSchema.mapToItem(itemMap);
+        assertThat(reverse, is(equalTo(listBean)));
+    }
+
+    @Test
+    public void setBean_stringSet() {
+        BeanTableSchema<SetBean> beanTableSchema = BeanTableSchema.create(SetBean.class);
+        SetBean setBean = new SetBean();
+        setBean.setId("id-value");
+        LinkedHashSet<String> stringSet = new LinkedHashSet<>();
+        stringSet.add("one");
+        stringSet.add("two");
+        stringSet.add("three");
+        setBean.setStringSet(stringSet);
+
+        Map<String, AttributeValue> itemMap = beanTableSchema.itemToMap(setBean, true);
+
+        AttributeValue expectedAttributeValue = AttributeValue.builder()
+                                                              .ss("one", "two", "three")
+                                                              .build();
+
+        assertThat(itemMap.size(), is(2));
+        assertThat(itemMap, hasEntry("id", stringValue("id-value")));
+        assertThat(itemMap, hasEntry("stringSet", expectedAttributeValue));
+
+        SetBean reverse = beanTableSchema.mapToItem(itemMap);
+        assertThat(reverse, is(equalTo(setBean)));
+    }
+
+    @Test
+    public void setBean_integerSet() {
+        BeanTableSchema<SetBean> beanTableSchema = BeanTableSchema.create(SetBean.class);
+        SetBean setBean = new SetBean();
+        setBean.setId("id-value");
+        LinkedHashSet<Integer> integerSet = new LinkedHashSet<>();
+        integerSet.add(1);
+        integerSet.add(2);
+        integerSet.add(3);
+        setBean.setIntegerSet(integerSet);
+
+        Map<String, AttributeValue> itemMap = beanTableSchema.itemToMap(setBean, true);
+
+        AttributeValue expectedAttributeValue = AttributeValue.builder()
+                                                              .ns("1", "2", "3")
+                                                              .build();
+
+        assertThat(itemMap.size(), is(2));
+        assertThat(itemMap, hasEntry("id", stringValue("id-value")));
+        assertThat(itemMap, hasEntry("integerSet", expectedAttributeValue));
+
+        SetBean reverse = beanTableSchema.mapToItem(itemMap);
+        assertThat(reverse, is(equalTo(setBean)));
+    }
+
+    @Test
+    public void setBean_longSet() {
+        BeanTableSchema<SetBean> beanTableSchema = BeanTableSchema.create(SetBean.class);
+        SetBean setBean = new SetBean();
+        setBean.setId("id-value");
+        LinkedHashSet<Long> longSet = new LinkedHashSet<>();
+        longSet.add(1L);
+        longSet.add(2L);
+        longSet.add(3L);
+        setBean.setLongSet(longSet);
+
+        Map<String, AttributeValue> itemMap = beanTableSchema.itemToMap(setBean, true);
+
+        AttributeValue expectedAttributeValue = AttributeValue.builder()
+                                                              .ns("1", "2", "3")
+                                                              .build();
+
+        assertThat(itemMap.size(), is(2));
+        assertThat(itemMap, hasEntry("id", stringValue("id-value")));
+        assertThat(itemMap, hasEntry("longSet", expectedAttributeValue));
+
+        SetBean reverse = beanTableSchema.mapToItem(itemMap);
+        assertThat(reverse, is(equalTo(setBean)));
+    }
+
+    @Test
+    public void setBean_shortSet() {
+        BeanTableSchema<SetBean> beanTableSchema = BeanTableSchema.create(SetBean.class);
+        SetBean setBean = new SetBean();
+        setBean.setId("id-value");
+        LinkedHashSet<Short> shortSet = new LinkedHashSet<>();
+        shortSet.add((short)1);
+        shortSet.add((short)2);
+        shortSet.add((short)3);
+        setBean.setShortSet(shortSet);
+
+        Map<String, AttributeValue> itemMap = beanTableSchema.itemToMap(setBean, true);
+
+        AttributeValue expectedAttributeValue = AttributeValue.builder()
+                                                              .ns("1", "2", "3")
+                                                              .build();
+
+        assertThat(itemMap.size(), is(2));
+        assertThat(itemMap, hasEntry("id", stringValue("id-value")));
+        assertThat(itemMap, hasEntry("shortSet", expectedAttributeValue));
+
+        SetBean reverse = beanTableSchema.mapToItem(itemMap);
+        assertThat(reverse, is(equalTo(setBean)));
+    }
+
+    @Test
+    public void setBean_byteSet() {
+        BeanTableSchema<SetBean> beanTableSchema = BeanTableSchema.create(SetBean.class);
+        SetBean setBean = new SetBean();
+        setBean.setId("id-value");
+        LinkedHashSet<Byte> byteSet = new LinkedHashSet<>();
+        byteSet.add((byte)1);
+        byteSet.add((byte)2);
+        byteSet.add((byte)3);
+        setBean.setByteSet(byteSet);
+
+        Map<String, AttributeValue> itemMap = beanTableSchema.itemToMap(setBean, true);
+
+        AttributeValue expectedAttributeValue = AttributeValue.builder()
+                                                              .ns("1", "2", "3")
+                                                              .build();
+
+        assertThat(itemMap.size(), is(2));
+        assertThat(itemMap, hasEntry("id", stringValue("id-value")));
+        assertThat(itemMap, hasEntry("byteSet", expectedAttributeValue));
+
+        SetBean reverse = beanTableSchema.mapToItem(itemMap);
+        assertThat(reverse, is(equalTo(setBean)));
+    }
+
+    @Test
+    public void setBean_doubleSet() {
+        BeanTableSchema<SetBean> beanTableSchema = BeanTableSchema.create(SetBean.class);
+        SetBean setBean = new SetBean();
+        setBean.setId("id-value");
+        LinkedHashSet<Double> doubleSet = new LinkedHashSet<>();
+        doubleSet.add(1.1);
+        doubleSet.add(2.2);
+        doubleSet.add(3.3);
+        setBean.setDoubleSet(doubleSet);
+
+        Map<String, AttributeValue> itemMap = beanTableSchema.itemToMap(setBean, true);
+
+        AttributeValue expectedAttributeValue = AttributeValue.builder()
+                                                              .ns("1.1", "2.2", "3.3")
+                                                              .build();
+
+        assertThat(itemMap.size(), is(2));
+        assertThat(itemMap, hasEntry("id", stringValue("id-value")));
+        assertThat(itemMap, hasEntry("doubleSet", expectedAttributeValue));
+
+        SetBean reverse = beanTableSchema.mapToItem(itemMap);
+        assertThat(reverse, is(equalTo(setBean)));
+    }
+
+    @Test
+    public void setBean_floatSet() {
+        BeanTableSchema<SetBean> beanTableSchema = BeanTableSchema.create(SetBean.class);
+        SetBean setBean = new SetBean();
+        setBean.setId("id-value");
+        LinkedHashSet<Float> floatSet = new LinkedHashSet<>();
+        floatSet.add(1.1f);
+        floatSet.add(2.2f);
+        floatSet.add(3.3f);
+        setBean.setFloatSet(floatSet);
+
+        Map<String, AttributeValue> itemMap = beanTableSchema.itemToMap(setBean, true);
+
+        AttributeValue expectedAttributeValue = AttributeValue.builder()
+                                                              .ns("1.1", "2.2", "3.3")
+                                                              .build();
+
+        assertThat(itemMap.size(), is(2));
+        assertThat(itemMap, hasEntry("id", stringValue("id-value")));
+        assertThat(itemMap, hasEntry("floatSet", expectedAttributeValue));
+
+        SetBean reverse = beanTableSchema.mapToItem(itemMap);
+        assertThat(reverse, is(equalTo(setBean)));
+    }
+
+    @Test
+    public void setBean_binarySet() {
+        SdkBytes buffer1 = SdkBytes.fromString("one", StandardCharsets.UTF_8);
+        SdkBytes buffer2 = SdkBytes.fromString("two", StandardCharsets.UTF_8);
+        SdkBytes buffer3 = SdkBytes.fromString("three", StandardCharsets.UTF_8);
+
+        BeanTableSchema<SetBean> beanTableSchema = BeanTableSchema.create(SetBean.class);
+        SetBean setBean = new SetBean();
+        setBean.setId("id-value");
+        LinkedHashSet<SdkBytes> binarySet = new LinkedHashSet<>();
+        binarySet.add(buffer1);
+        binarySet.add(buffer2);
+        binarySet.add(buffer3);
+        setBean.setBinarySet(binarySet);
+
+        Map<String, AttributeValue> itemMap = beanTableSchema.itemToMap(setBean, true);
+
+        AttributeValue expectedAttributeValue = AttributeValue.builder()
+                                                              .bs(buffer1, buffer2, buffer3)
+                                                              .build();
+
+        assertThat(itemMap.size(), is(2));
+        assertThat(itemMap, hasEntry("id", stringValue("id-value")));
+        assertThat(itemMap, hasEntry("binarySet", expectedAttributeValue));
+
+        SetBean reverse = beanTableSchema.mapToItem(itemMap);
+        assertThat(reverse, is(equalTo(setBean)));
+    }
+
+    @Test
+    public void mapBean_stringStringMap() {
+        BeanTableSchema<MapBean> beanTableSchema = BeanTableSchema.create(MapBean.class);
+        MapBean mapBean = new MapBean();
+        mapBean.setId("id-value");
+
+        Map<String, String> testMap = new HashMap<>();
+        testMap.put("one", "two");
+        testMap.put("three", "four");
+
+        mapBean.setStringMap(testMap);
+
+        Map<String, AttributeValue> itemMap = beanTableSchema.itemToMap(mapBean, true);
+
+        Map<String, AttributeValue> expectedMap = new HashMap<>();
+        expectedMap.put("one", stringValue("two"));
+        expectedMap.put("three", stringValue("four"));
+        AttributeValue expectedMapValue = AttributeValue.builder()
+                                                        .m(expectedMap)
+                                                        .build();
+
+        assertThat(itemMap.size(), is(2));
+        assertThat(itemMap, hasEntry("id", stringValue("id-value")));
+        assertThat(itemMap, hasEntry("stringMap", expectedMapValue));
+
+        MapBean reverse = beanTableSchema.mapToItem(itemMap);
+        assertThat(reverse, is(equalTo(mapBean)));
+    }
+
+    @Test
+    public void mapBean_nestedStringMap() {
+        BeanTableSchema<MapBean> beanTableSchema = BeanTableSchema.create(MapBean.class);
+        MapBean mapBean = new MapBean();
+        mapBean.setId("id-value");
+
+        Map<String, Map<String, String>> testMap = new HashMap<>();
+        testMap.put("five", singletonMap("one", "two"));
+        testMap.put("six", singletonMap("three", "four"));
+
+        mapBean.setNestedStringMap(testMap);
+
+        Map<String, AttributeValue> itemMap = beanTableSchema.itemToMap(mapBean, true);
+
+        Map<String, AttributeValue> expectedMap = new HashMap<>();
+        expectedMap.put("five", AttributeValue.builder().m(singletonMap("one", stringValue("two"))).build());
+        expectedMap.put("six", AttributeValue.builder().m(singletonMap("three", stringValue("four"))).build());
+
+        AttributeValue expectedMapValue = AttributeValue.builder()
+                                                        .m(expectedMap)
+                                                        .build();
+
+        assertThat(itemMap.size(), is(2));
+        assertThat(itemMap, hasEntry("id", stringValue("id-value")));
+        assertThat(itemMap, hasEntry("nestedStringMap", expectedMapValue));
+
+        MapBean reverse = beanTableSchema.mapToItem(itemMap);
+        assertThat(reverse, is(equalTo(mapBean)));
+    }
+
+    @Test
+    public void commonTypesBean() {
+        BeanTableSchema<CommonTypesBean> beanTableSchema = BeanTableSchema.create(CommonTypesBean.class);
+        CommonTypesBean commonTypesBean = new CommonTypesBean();
+        SdkBytes binaryLiteral = SdkBytes.fromString("test-string", StandardCharsets.UTF_8);
+
+        commonTypesBean.setId("id-value");
+        commonTypesBean.setBooleanAttribute(true);
+        commonTypesBean.setIntegerAttribute(123);
+        commonTypesBean.setLongAttribute(234L);
+        commonTypesBean.setShortAttribute((short) 345);
+        commonTypesBean.setByteAttribute((byte) 45);
+        commonTypesBean.setDoubleAttribute(56.7);
+        commonTypesBean.setFloatAttribute((float) 67.8);
+        commonTypesBean.setBinaryAttribute(binaryLiteral);
+
+        Map<String, AttributeValue> itemMap = beanTableSchema.itemToMap(commonTypesBean, true);
+
+        assertThat(itemMap.size(), is(9));
+        assertThat(itemMap, hasEntry("id", stringValue("id-value")));
+        assertThat(itemMap, hasEntry("booleanAttribute", AttributeValue.builder().bool(true).build()));
+        assertThat(itemMap, hasEntry("integerAttribute", numberValue(123)));
+        assertThat(itemMap, hasEntry("longAttribute", numberValue(234)));
+        assertThat(itemMap, hasEntry("shortAttribute", numberValue(345)));
+        assertThat(itemMap, hasEntry("byteAttribute", numberValue(45)));
+        assertThat(itemMap, hasEntry("doubleAttribute", numberValue(56.7)));
+        assertThat(itemMap, hasEntry("floatAttribute", numberValue(67.8)));
+        assertThat(itemMap, hasEntry("binaryAttribute", binaryValue(binaryLiteral)));
+
+        CommonTypesBean reverse = beanTableSchema.mapToItem(itemMap);
+        assertThat(reverse, is(equalTo(commonTypesBean)));
+    }
+
+    @Test
+    public void primitiveTypesBean() {
+        BeanTableSchema<PrimitiveTypesBean> beanTableSchema = BeanTableSchema.create(PrimitiveTypesBean.class);
+        PrimitiveTypesBean primitiveTypesBean = new PrimitiveTypesBean();
+
+        primitiveTypesBean.setId("id-value");
+        primitiveTypesBean.setBooleanAttribute(true);
+        primitiveTypesBean.setIntegerAttribute(123);
+        primitiveTypesBean.setLongAttribute(234L);
+        primitiveTypesBean.setShortAttribute((short) 345);
+        primitiveTypesBean.setByteAttribute((byte) 45);
+        primitiveTypesBean.setDoubleAttribute(56.7);
+        primitiveTypesBean.setFloatAttribute((float) 67.8);
+
+        Map<String, AttributeValue> itemMap = beanTableSchema.itemToMap(primitiveTypesBean, true);
+
+        assertThat(itemMap.size(), is(8));
+        assertThat(itemMap, hasEntry("id", stringValue("id-value")));
+        assertThat(itemMap, hasEntry("booleanAttribute", AttributeValue.builder().bool(true).build()));
+        assertThat(itemMap, hasEntry("integerAttribute", numberValue(123)));
+        assertThat(itemMap, hasEntry("longAttribute", numberValue(234)));
+        assertThat(itemMap, hasEntry("shortAttribute", numberValue(345)));
+        assertThat(itemMap, hasEntry("byteAttribute", numberValue(45)));
+        assertThat(itemMap, hasEntry("doubleAttribute", numberValue(56.7)));
+        assertThat(itemMap, hasEntry("floatAttribute", numberValue(67.8)));
+
+        PrimitiveTypesBean reverse = beanTableSchema.mapToItem(itemMap);
+        assertThat(reverse, is(equalTo(primitiveTypesBean)));
+    }
+
+    @Test
+    public void itemToMap_specificAttributes() {
+        BeanTableSchema<CommonTypesBean> beanTableSchema = BeanTableSchema.create(CommonTypesBean.class);
+        CommonTypesBean commonTypesBean = new CommonTypesBean();
+
+        commonTypesBean.setId("id-value");
+        commonTypesBean.setIntegerAttribute(123);
+        commonTypesBean.setLongAttribute(234L);
+        commonTypesBean.setFloatAttribute((float) 67.8);
+
+        Map<String, AttributeValue> itemMap =
+            beanTableSchema.itemToMap(commonTypesBean, Arrays.asList("longAttribute", "floatAttribute"));
+
+        assertThat(itemMap.size(), is(2));
+        assertThat(itemMap, hasEntry("longAttribute", numberValue(234)));
+        assertThat(itemMap, hasEntry("floatAttribute", numberValue(67.8)));
+    }
+
+    @Test
+    public void itemType_returnsCorrectClass() {
+        BeanTableSchema<SimpleBean> beanTableSchema = BeanTableSchema.create(SimpleBean.class);
+
+        assertThat(beanTableSchema.itemType(), is(equalTo(EnhancedType.of(SimpleBean.class))));
+    }
+
+    @Test
+    public void attributeConverterWithoutConstructor_throwsIllegalArgumentException() {
+        exception.expect(IllegalArgumentException.class);
+        exception.expectMessage("default constructor");
+        BeanTableSchema.create(AttributeConverterNoConstructorBean.class);
+    }
+
+    @Test
+    public void usesCustomAttributeConverter() {
+        BeanTableSchema<AttributeConverterBean> beanTableSchema = BeanTableSchema.create(AttributeConverterBean.class);
+
+        AttributeConverterBean.AttributeItem attributeItem = new AttributeConverterBean.AttributeItem();
+        attributeItem.setInnerValue("inner-value");
+
+        AttributeConverterBean converterBean = new AttributeConverterBean();
+        converterBean.setId("id-value");
+        converterBean.setIntegerAttribute(123);
+        converterBean.setAttributeItem(attributeItem);
+
+        Map<String, AttributeValue> itemMap = beanTableSchema.itemToMap(converterBean, false);
+
+        assertThat(itemMap.size(), is(3));
+        assertThat(itemMap, hasEntry("id", stringValue("id-value")));
+        assertThat(itemMap, hasEntry("integerAttribute", numberValue(123)));
+        assertThat(itemMap, hasEntry("attributeItem", stringValue("inner-value")));
+
+        AttributeConverterBean reverse = beanTableSchema.mapToItem(itemMap);
+        assertThat(reverse, is(equalTo(converterBean)));
+    }
+
+    @Test
+    public void converterProviderWithoutConstructor_throwsIllegalArgumentException() {
+        exception.expect(IllegalArgumentException.class);
+        exception.expectMessage("default constructor");
+        BeanTableSchema.create(NoConstructorConverterProvidersBean.class);
+    }
+
+    @Test
+    public void usesCustomAttributeConverterProvider() {
+        BeanTableSchema<SingleConverterProvidersBean> beanTableSchema = BeanTableSchema.create(SingleConverterProvidersBean.class);
+
+        SingleConverterProvidersBean converterBean = new SingleConverterProvidersBean();
+        converterBean.setId("id-value");
+        converterBean.setIntegerAttribute(123);
+
+        Map<String, AttributeValue> itemMap = beanTableSchema.itemToMap(converterBean, false);
+
+        assertThat(itemMap.size(), is(2));
+        assertThat(itemMap, hasEntry("id", stringValue("id-value-custom")));
+        assertThat(itemMap, hasEntry("integerAttribute", numberValue(133)));
+
+        SingleConverterProvidersBean reverse = beanTableSchema.mapToItem(itemMap);
+        assertThat(reverse.getId(), is(equalTo("id-value-custom")));
+        assertThat(reverse.getIntegerAttribute(), is(equalTo(133)));
+    }
+
+    @Test
+    public void usesCustomAttributeConverterProviders() {
+        BeanTableSchema<MultipleConverterProvidersBean> beanTableSchema =
+                BeanTableSchema.create(MultipleConverterProvidersBean.class);
+
+        MultipleConverterProvidersBean converterBean = new MultipleConverterProvidersBean();
+        converterBean.setId("id-value");
+        converterBean.setIntegerAttribute(123);
+
+        Map<String, AttributeValue> itemMap = beanTableSchema.itemToMap(converterBean, false);
+
+        assertThat(itemMap.size(), is(2));
+        assertThat(itemMap, hasEntry("id", stringValue("id-value-custom")));
+        assertThat(itemMap, hasEntry("integerAttribute", numberValue(133)));
+
+        MultipleConverterProvidersBean reverse = beanTableSchema.mapToItem(itemMap);
+        assertThat(reverse.getId(), is(equalTo("id-value-custom")));
+        assertThat(reverse.getIntegerAttribute(), is(equalTo(133)));
+    }
+
+    @Test
+    public void emptyConverterProviderList_fails_whenAttributeConvertersAreMissing() {
+        exception.expect(NullPointerException.class);
+        BeanTableSchema.create(EmptyConverterProvidersInvalidBean.class);
+    }
+
+    @Test
+    public void emptyConverterProviderList_correct_whenAttributeConvertersAreSupplied() {
+        BeanTableSchema<EmptyConverterProvidersValidBean> beanTableSchema =
+                BeanTableSchema.create(EmptyConverterProvidersValidBean.class);
+
+        EmptyConverterProvidersValidBean converterBean = new EmptyConverterProvidersValidBean();
+        converterBean.setId("id-value");
+        converterBean.setIntegerAttribute(123);
+
+        Map<String, AttributeValue> itemMap = beanTableSchema.itemToMap(converterBean, false);
+
+        assertThat(itemMap.size(), is(2));
+        assertThat(itemMap, hasEntry("id", stringValue("id-value-custom")));
+        assertThat(itemMap, hasEntry("integerAttribute", numberValue(133)));
+
+        EmptyConverterProvidersValidBean reverse = beanTableSchema.mapToItem(itemMap);
+        assertThat(reverse.getId(), is(equalTo("id-value-custom")));
+        assertThat(reverse.getIntegerAttribute(), is(equalTo(133)));
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/StaticAttributeTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/StaticAttributeTest.java
new file mode 100644
index 000000000000..7eb8cea289d6
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/StaticAttributeTest.java
@@ -0,0 +1,225 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.mapper;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.when;
+
+import java.util.Objects;
+import java.util.function.BiConsumer;
+import java.util.function.Function;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeConverterProvider;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.enhanced.dynamodb.internal.mapper.ResolvedStaticAttribute;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+
+@RunWith(MockitoJUnitRunner.class)
+public class StaticAttributeTest {
+    private static final Function<Object, String> TEST_GETTER = x -> "test-getter";
+    private static final BiConsumer<Object, String> TEST_SETTER = (x, y) -> {};
+
+    private static class SimpleItem {
+        private String aString;
+
+        SimpleItem() {
+        }
+
+        SimpleItem(String aString) {
+            this.aString = aString;
+        }
+
+        String getAString() {
+            return this.aString;
+        }
+
+        void setAString(String aString) {
+            this.aString = aString;
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) {
+                return true;
+            }
+            if (o == null || getClass() != o.getClass()) {
+                return false;
+            }
+            SimpleItem that = (SimpleItem) o;
+            return aString == that.aString;
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(aString);
+        }
+    }
+
+    @Mock
+    private StaticAttributeTag mockTag;
+
+    @Mock
+    private StaticAttributeTag mockTag2;
+
+    @Mock
+    private AttributeConverter<String> attributeConverter;
+
+    @Test
+    public void build_maximal() {
+        StaticAttribute<Object, String> staticAttribute = StaticAttribute.builder(Object.class, String.class)
+                                                                         .name("test-attribute")
+                                                                         .getter(TEST_GETTER)
+                                                                         .setter(TEST_SETTER)
+                                                                         .tags(mockTag)
+                                                                         .build();
+
+        assertThat(staticAttribute.name()).isEqualTo("test-attribute");
+        assertThat(staticAttribute.getter()).isSameAs(TEST_GETTER);
+        assertThat(staticAttribute.setter()).isSameAs(TEST_SETTER);
+        assertThat(staticAttribute.tags()).containsExactly(mockTag);
+        assertThat(staticAttribute.type()).isEqualTo(EnhancedType.of(String.class));
+    }
+
+    @Test
+    public void build_minimal() {
+        StaticAttribute<Object, String> staticAttribute = StaticAttribute.builder(Object.class, String.class)
+                                                                         .name("test-attribute")
+                                                                         .getter(TEST_GETTER)
+                                                                         .setter(TEST_SETTER)
+                                                                         .build();
+
+        assertThat(staticAttribute.name()).isEqualTo("test-attribute");
+        assertThat(staticAttribute.getter()).isSameAs(TEST_GETTER);
+        assertThat(staticAttribute.setter()).isSameAs(TEST_SETTER);
+        assertThat(staticAttribute.tags()).isEmpty();
+        assertThat(staticAttribute.type()).isEqualTo(EnhancedType.of(String.class));
+    }
+
+    @Test
+    public void build_missing_name() {
+        assertThatThrownBy(() -> StaticAttribute.builder(Object.class, String.class)
+                                                .getter(TEST_GETTER)
+                                                .setter(TEST_SETTER)
+                                                .build())
+            .isInstanceOf(NullPointerException.class)
+            .hasMessageContaining("name");
+    }
+
+    @Test
+    public void build_missing_getter() {
+        assertThatThrownBy(() -> StaticAttribute.builder(Object.class, String.class)
+                                                .name("test-attribute")
+                                                .setter(TEST_SETTER)
+                                                .build())
+            .isInstanceOf(NullPointerException.class)
+            .hasMessageContaining("getter");
+    }
+
+    @Test
+    public void build_missing_setter() {
+        assertThatThrownBy(() -> StaticAttribute.builder(Object.class, String.class)
+                                                .name("test-attribute")
+                                                .getter(TEST_GETTER)
+                                                .build())
+            .isInstanceOf(NullPointerException.class)
+            .hasMessageContaining("setter");
+    }
+
+    @Test
+    public void toBuilder() {
+        StaticAttribute<Object, String> staticAttribute = StaticAttribute.builder(Object.class, String.class)
+                                                                         .name("test-attribute")
+                                                                         .getter(TEST_GETTER)
+                                                                         .setter(TEST_SETTER)
+                                                                         .tags(mockTag, mockTag2)
+                                                                         .build();
+
+        StaticAttribute<Object, String> clonedAttribute = staticAttribute.toBuilder().build();
+
+        assertThat(clonedAttribute.name()).isEqualTo("test-attribute");
+        assertThat(clonedAttribute.getter()).isSameAs(TEST_GETTER);
+        assertThat(clonedAttribute.setter()).isSameAs(TEST_SETTER);
+        assertThat(clonedAttribute.tags()).containsExactly(mockTag, mockTag2);
+        assertThat(clonedAttribute.type()).isEqualTo(EnhancedType.of(String.class));
+    }
+
+    @Test
+    public void build_addTag_single() {
+        StaticAttribute<Object, String> staticAttribute = StaticAttribute.builder(Object.class, String.class)
+                                                                         .name("test-attribute")
+                                                                         .getter(TEST_GETTER)
+                                                                         .setter(TEST_SETTER)
+                                                                         .addTag(mockTag)
+                                                                         .build();
+
+        assertThat(staticAttribute.tags()).containsExactly(mockTag);
+    }
+
+    @Test
+    public void build_addTag_multiple() {
+        StaticAttribute<Object, String> staticAttribute = StaticAttribute.builder(Object.class, String.class)
+                                                                         .name("test-attribute")
+                                                                         .getter(TEST_GETTER)
+                                                                         .setter(TEST_SETTER)
+                                                                         .addTag(mockTag)
+                                                                         .addTag(mockTag2)
+                                                                         .build();
+
+        assertThat(staticAttribute.tags()).containsExactly(mockTag, mockTag2);
+    }
+
+    @Test
+    public void build_addAttributeConverter() {
+        StaticAttribute<Object, String> staticAttribute = StaticAttribute.builder(Object.class, String.class)
+                                                                         .name("test-attribute")
+                                                                         .getter(TEST_GETTER)
+                                                                         .setter(TEST_SETTER)
+                                                                         .attributeConverter(attributeConverter)
+                                                                         .build();
+
+        AttributeConverter<String> attributeConverterR = staticAttribute.attributeConverter();
+        assertThat(attributeConverterR).isEqualTo(attributeConverter);
+    }
+
+    @Test
+    public void resolve_uses_customConverter() {
+        when(attributeConverter.transformFrom(any())).thenReturn(AttributeValue.builder().s("test-string-custom").build());
+
+        StaticAttribute<SimpleItem, String> staticAttribute = StaticAttribute.builder(SimpleItem.class, String.class)
+                                                                         .name("test-attribute")
+                                                                         .getter(SimpleItem::getAString)
+                                                                         .setter(SimpleItem::setAString)
+                                                                         .attributeConverter(attributeConverter)
+                                                                         .build();
+
+        ResolvedStaticAttribute<SimpleItem> resolvedAttribute =
+            staticAttribute.resolve(AttributeConverterProvider.defaultProvider());
+
+        Function<SimpleItem, AttributeValue> attributeValueFunction = resolvedAttribute.attributeGetterMethod();
+
+        SimpleItem item = new SimpleItem("test-string");
+        AttributeValue resultAttributeValue = attributeValueFunction.apply(item);
+
+        assertThat(resultAttributeValue.s()).isEqualTo("test-string-custom");
+    }
+
+}
\ No newline at end of file
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/staticmapper/StaticTableMetadataTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/StaticTableMetadataTest.java
similarity index 76%
rename from services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/staticmapper/StaticTableMetadataTest.java
rename to services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/StaticTableMetadataTest.java
index 1f54f80812ee..6548e8ae905f 100644
--- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/staticmapper/StaticTableMetadataTest.java
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/StaticTableMetadataTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -13,22 +13,20 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.awssdk.extensions.dynamodb.mappingclient.staticmapper;
+package software.amazon.awssdk.enhanced.dynamodb.mapper;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.contains;
 import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.hamcrest.Matchers.is;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.TableMetadata.getPrimaryIndexName;
+import static software.amazon.awssdk.enhanced.dynamodb.TableMetadata.primaryIndexName;
 
 import java.util.Optional;
-
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
-
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.TableMetadata;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.core.AttributeValueType;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeValueType;
+import software.amazon.awssdk.enhanced.dynamodb.TableMetadata;
 import software.amazon.awssdk.services.dynamodb.model.ScalarAttributeType;
 
 public class StaticTableMetadataTest {
@@ -42,48 +40,48 @@ public class StaticTableMetadataTest {
     @Test
     public void setAndRetrievePrimaryPartitionKey() {
         TableMetadata tableMetadata = StaticTableMetadata.builder()
-            .addIndexPartitionKey(getPrimaryIndexName(), ATTRIBUTE_NAME, AttributeValueType.S)
-            .build();
+                                                         .addIndexPartitionKey(primaryIndexName(), ATTRIBUTE_NAME, AttributeValueType.S)
+                                                         .build();
 
-        assertThat(tableMetadata.getPrimaryPartitionKey(), is(ATTRIBUTE_NAME));
+        assertThat(tableMetadata.primaryPartitionKey(), is(ATTRIBUTE_NAME));
     }
 
     @Test
     public void setAndRetrievePrimarySortKey() {
         TableMetadata tableMetadata = StaticTableMetadata.builder()
-            .addIndexSortKey(getPrimaryIndexName(), ATTRIBUTE_NAME, AttributeValueType.S)
+            .addIndexSortKey(primaryIndexName(), ATTRIBUTE_NAME, AttributeValueType.S)
             .build();
 
-        assertThat(tableMetadata.getPrimarySortKey(), is(Optional.of(ATTRIBUTE_NAME)));
+        assertThat(tableMetadata.primarySortKey(), is(Optional.of(ATTRIBUTE_NAME)));
     }
 
     @Test(expected = IllegalArgumentException.class)
     public void retrieveUnsetPrimaryPartitionKey() {
         TableMetadata tableMetadata = StaticTableMetadata.builder().build();
 
-        tableMetadata.getPrimaryPartitionKey();
+        tableMetadata.primaryPartitionKey();
     }
 
     @Test(expected = IllegalArgumentException.class)
     public void retrieveUnsetPrimaryPartitionKey_withSortKeySet() {
         TableMetadata tableMetadata = StaticTableMetadata.builder()
-                                                         .addIndexSortKey(getPrimaryIndexName(),
+                                                         .addIndexSortKey(primaryIndexName(),
                                                                           ATTRIBUTE_NAME,
                                                                           AttributeValueType.S)
                                                          .build();
 
-        tableMetadata.getPrimaryPartitionKey();
+        tableMetadata.primaryPartitionKey();
     }
 
     @Test
     public void retrieveUnsetPrimarySortKey() {
         TableMetadata tableMetadata = StaticTableMetadata.builder()
-                                                         .addIndexPartitionKey(getPrimaryIndexName(),
+                                                         .addIndexPartitionKey(primaryIndexName(),
                                                                                ATTRIBUTE_NAME,
                                                                                AttributeValueType.S)
                                                          .build();
 
-        assertThat(tableMetadata.getPrimarySortKey(), is(Optional.empty()));
+        assertThat(tableMetadata.primarySortKey(), is(Optional.empty()));
     }
 
     @Test
@@ -94,7 +92,7 @@ public void setAndRetrieveSecondaryPartitionKey() {
                                                                                AttributeValueType.S)
                                                          .build();
 
-        assertThat(tableMetadata.getIndexPartitionKey(INDEX_NAME), is(ATTRIBUTE_NAME));
+        assertThat(tableMetadata.indexPartitionKey(INDEX_NAME), is(ATTRIBUTE_NAME));
     }
 
     @Test
@@ -105,20 +103,20 @@ public void setAndRetrieveSecondarySortKey() {
                                                                           AttributeValueType.S)
                                                          .build();
 
-        assertThat(tableMetadata.getIndexSortKey(INDEX_NAME), is(Optional.of(ATTRIBUTE_NAME)));
+        assertThat(tableMetadata.indexSortKey(INDEX_NAME), is(Optional.of(ATTRIBUTE_NAME)));
     }
 
     @Test(expected = IllegalArgumentException.class)
     public void retrieveUnsetSecondaryPartitionKey() {
         TableMetadata tableMetadata = StaticTableMetadata.builder().build();
 
-        tableMetadata.getIndexPartitionKey(INDEX_NAME);
+        tableMetadata.indexPartitionKey(INDEX_NAME);
     }
 
     @Test
     public void retrieveSecondaryPartitionKeyForLocalIndex() {
         TableMetadata tableMetadata = StaticTableMetadata.builder()
-                                                         .addIndexPartitionKey(getPrimaryIndexName(),
+                                                         .addIndexPartitionKey(primaryIndexName(),
                                                                                ATTRIBUTE_NAME,
                                                                                AttributeValueType.S)
                                                          .addIndexSortKey(INDEX_NAME,
@@ -126,7 +124,7 @@ public void retrieveSecondaryPartitionKeyForLocalIndex() {
                                                                           AttributeValueType.S)
                                                          .build();
 
-        assertThat(tableMetadata.getIndexPartitionKey(INDEX_NAME), is(ATTRIBUTE_NAME));
+        assertThat(tableMetadata.indexPartitionKey(INDEX_NAME), is(ATTRIBUTE_NAME));
     }
 
     @Test
@@ -137,7 +135,7 @@ public void retrieveUnsetSecondarySortKey() {
                                                                                AttributeValueType.S)
                                                          .build();
 
-        assertThat(tableMetadata.getIndexSortKey(INDEX_NAME), is(Optional.empty()));
+        assertThat(tableMetadata.indexSortKey(INDEX_NAME), is(Optional.empty()));
     }
 
     @Test(expected = IllegalArgumentException.class)
@@ -159,24 +157,24 @@ public void setSameSortKeyTwice() {
     @Test
     public void getPrimaryKeys_partitionAndSort() {
         TableMetadata tableMetadata = StaticTableMetadata.builder()
-            .addIndexPartitionKey(getPrimaryIndexName(), "primary_id", AttributeValueType.S)
-            .addIndexSortKey(getPrimaryIndexName(), "primary_sort", AttributeValueType.S)
+            .addIndexPartitionKey(primaryIndexName(), "primary_id", AttributeValueType.S)
+            .addIndexSortKey(primaryIndexName(), "primary_sort", AttributeValueType.S)
             .addIndexPartitionKey(INDEX_NAME, "dummy", AttributeValueType.S)
             .addIndexSortKey(INDEX_NAME, "dummy2", AttributeValueType.S)
             .build();
 
-        assertThat(tableMetadata.getPrimaryKeys(), containsInAnyOrder("primary_id", "primary_sort"));
+        assertThat(tableMetadata.primaryKeys(), containsInAnyOrder("primary_id", "primary_sort"));
     }
 
     @Test
     public void getPrimaryKeys_partition() {
         TableMetadata tableMetadata = StaticTableMetadata.builder()
-                                                         .addIndexPartitionKey(getPrimaryIndexName(), "primary_id", AttributeValueType.S)
+                                                         .addIndexPartitionKey(primaryIndexName(), "primary_id", AttributeValueType.S)
                                                          .addIndexPartitionKey(INDEX_NAME, "dummy", AttributeValueType.S)
                                                          .addIndexSortKey(INDEX_NAME, "dummy2", AttributeValueType.S)
                                                          .build();
 
-        assertThat(tableMetadata.getPrimaryKeys(), contains("primary_id"));
+        assertThat(tableMetadata.primaryKeys(), contains("primary_id"));
     }
 
     @Test(expected = IllegalArgumentException.class)
@@ -186,81 +184,81 @@ public void getPrimaryKeys_unset() {
                                                          .addIndexSortKey(INDEX_NAME, "dummy2", AttributeValueType.S)
                                                          .build();
 
-        tableMetadata.getPrimaryKeys();
+        tableMetadata.primaryKeys();
     }
 
     @Test
     public void getIndexKeys_partitionAndSort() {
         TableMetadata tableMetadata = StaticTableMetadata.builder()
-                                                         .addIndexPartitionKey(getPrimaryIndexName(), "primary_id", AttributeValueType.S)
-                                                         .addIndexSortKey(getPrimaryIndexName(), "primary_sort", AttributeValueType.S)
+                                                         .addIndexPartitionKey(primaryIndexName(), "primary_id", AttributeValueType.S)
+                                                         .addIndexSortKey(primaryIndexName(), "primary_sort", AttributeValueType.S)
                                                          .addIndexPartitionKey(INDEX_NAME, "dummy", AttributeValueType.S)
                                                          .addIndexSortKey(INDEX_NAME, "dummy2", AttributeValueType.S)
                                                          .build();
 
-        assertThat(tableMetadata.getIndexKeys(INDEX_NAME), containsInAnyOrder("dummy", "dummy2"));
+        assertThat(tableMetadata.indexKeys(INDEX_NAME), containsInAnyOrder("dummy", "dummy2"));
     }
 
     @Test
     public void getIndexKeys_partition() {
         TableMetadata tableMetadata = StaticTableMetadata.builder()
-                                                         .addIndexPartitionKey(getPrimaryIndexName(), "primary_id", AttributeValueType.S)
-                                                         .addIndexSortKey(getPrimaryIndexName(), "primary_sort", AttributeValueType.S)
+                                                         .addIndexPartitionKey(primaryIndexName(), "primary_id", AttributeValueType.S)
+                                                         .addIndexSortKey(primaryIndexName(), "primary_sort", AttributeValueType.S)
                                                          .addIndexPartitionKey(INDEX_NAME, "dummy", AttributeValueType.S)
                                                          .build();
 
-        assertThat(tableMetadata.getIndexKeys(INDEX_NAME), contains("dummy"));
+        assertThat(tableMetadata.indexKeys(INDEX_NAME), contains("dummy"));
     }
 
     @Test(expected = IllegalArgumentException.class)
     public void getIndexKeys_unset() {
         TableMetadata tableMetadata = StaticTableMetadata.builder()
-                                                         .addIndexPartitionKey(getPrimaryIndexName(), "primary_id", AttributeValueType.S)
-                                                         .addIndexSortKey(getPrimaryIndexName(), "primary_sort", AttributeValueType.S)
+                                                         .addIndexPartitionKey(primaryIndexName(), "primary_id", AttributeValueType.S)
+                                                         .addIndexSortKey(primaryIndexName(), "primary_sort", AttributeValueType.S)
                                                          .build();
 
-        tableMetadata.getIndexKeys(INDEX_NAME);
+        tableMetadata.indexKeys(INDEX_NAME);
     }
 
     @Test
     public void getIndexKeys_sortOnly() {
         TableMetadata tableMetadata = StaticTableMetadata.builder()
-                                                         .addIndexPartitionKey(getPrimaryIndexName(), "primary_id", AttributeValueType.S)
-                                                         .addIndexSortKey(getPrimaryIndexName(), "primary_sort", AttributeValueType.S)
+                                                         .addIndexPartitionKey(primaryIndexName(), "primary_id", AttributeValueType.S)
+                                                         .addIndexSortKey(primaryIndexName(), "primary_sort", AttributeValueType.S)
                                                          .addIndexSortKey(INDEX_NAME, "dummy", AttributeValueType.S)
                                                          .build();
 
-        assertThat(tableMetadata.getIndexKeys(INDEX_NAME), containsInAnyOrder("primary_id", "dummy"));
+        assertThat(tableMetadata.indexKeys(INDEX_NAME), containsInAnyOrder("primary_id", "dummy"));
     }
 
     @Test
     public void getAllKeys() {
         TableMetadata tableMetadata = StaticTableMetadata.builder()
-                                                         .addIndexPartitionKey(getPrimaryIndexName(), "primary_id", AttributeValueType.S)
-                                                         .addIndexSortKey(getPrimaryIndexName(), "primary_sort", AttributeValueType.S)
+                                                         .addIndexPartitionKey(primaryIndexName(), "primary_id", AttributeValueType.S)
+                                                         .addIndexSortKey(primaryIndexName(), "primary_sort", AttributeValueType.S)
                                                          .addIndexPartitionKey(INDEX_NAME, "dummy", AttributeValueType.S)
                                                          .addIndexSortKey(INDEX_NAME, "dummy2", AttributeValueType.S)
                                                          .build();
 
-        assertThat(tableMetadata.getAllKeys(), containsInAnyOrder("primary_id", "primary_sort", "dummy", "dummy2"));
+        assertThat(tableMetadata.allKeys(), containsInAnyOrder("primary_id", "primary_sort", "dummy", "dummy2"));
     }
 
     @Test
     public void getScalarAttributeValueType() {
         TableMetadata tableMetadata = StaticTableMetadata.builder()
-                                                         .addIndexPartitionKey(getPrimaryIndexName(), "primary_id",
+                                                         .addIndexPartitionKey(primaryIndexName(), "primary_id",
                                                                                AttributeValueType.S)
-                                                         .addIndexSortKey(getPrimaryIndexName(), "primary_sort",
+                                                         .addIndexSortKey(primaryIndexName(), "primary_sort",
                                                                           AttributeValueType.N)
                                                          .addIndexPartitionKey(INDEX_NAME, "dummy",
                                                                                AttributeValueType.B)
                                                          .addIndexSortKey(INDEX_NAME, "dummy2", AttributeValueType.BOOL)
                                                          .build();
 
-        assertThat(tableMetadata.getScalarAttributeType("primary_id"), is(Optional.of(ScalarAttributeType.S)));
-        assertThat(tableMetadata.getScalarAttributeType("primary_sort"), is(Optional.of(ScalarAttributeType.N)));
-        assertThat(tableMetadata.getScalarAttributeType("dummy"), is(Optional.of(ScalarAttributeType.B)));
-        assertThat(tableMetadata.getScalarAttributeType("dummy2"), is(Optional.empty()));
+        assertThat(tableMetadata.scalarAttributeType("primary_id"), is(Optional.of(ScalarAttributeType.S)));
+        assertThat(tableMetadata.scalarAttributeType("primary_sort"), is(Optional.of(ScalarAttributeType.N)));
+        assertThat(tableMetadata.scalarAttributeType("dummy"), is(Optional.of(ScalarAttributeType.B)));
+        assertThat(tableMetadata.scalarAttributeType("dummy2"), is(Optional.empty()));
     }
 
     @Test
@@ -269,14 +267,14 @@ public void setAndRetrieveSimpleCustomMetadata() {
             .addCustomMetadataObject("custom-key", 123)
             .build();
 
-        assertThat(tableMetadata.getCustomMetadataObject("custom-key", Integer.class), is(Optional.of(123)));
+        assertThat(tableMetadata.customMetadataObject("custom-key", Integer.class), is(Optional.of(123)));
     }
 
     @Test
     public void retrieveUnsetCustomMetadata() {
         TableMetadata tableMetadata = StaticTableMetadata.builder().build();
 
-        assertThat(tableMetadata.getCustomMetadataObject("custom-key", Integer.class), is(Optional.empty()));
+        assertThat(tableMetadata.customMetadataObject("custom-key", Integer.class), is(Optional.empty()));
     }
 
     @Test(expected = IllegalArgumentException.class)
@@ -285,7 +283,7 @@ public void setAndRetrieveCustomMetadataOfUnassignableType() {
                                                          .addCustomMetadataObject("custom-key", 123.45)
                                                          .build();
 
-        tableMetadata.getCustomMetadataObject("custom-key", Integer.class);
+        tableMetadata.customMetadataObject("custom-key", Integer.class);
     }
 
     @Test
@@ -294,14 +292,14 @@ public void setAndRetrieveCustomMetadataOfDifferentButAssignableType() {
                                                          .addCustomMetadataObject("custom-key", 123.45f)
                                                          .build();
 
-        assertThat(tableMetadata.getCustomMetadataObject("custom-key", Number.class), is(Optional.of(123.45f)));
+        assertThat(tableMetadata.customMetadataObject("custom-key", Number.class), is(Optional.of(123.45f)));
     }
 
     @Test
     public void mergeFullIntoEmpty() {
         StaticTableMetadata tableMetadata = StaticTableMetadata.builder()
-            .addIndexPartitionKey(getPrimaryIndexName(), "primary_id", AttributeValueType.S)
-            .addIndexSortKey(getPrimaryIndexName(), "primary_sort", AttributeValueType.S)
+            .addIndexPartitionKey(primaryIndexName(), "primary_id", AttributeValueType.S)
+            .addIndexSortKey(primaryIndexName(), "primary_sort", AttributeValueType.S)
             .addIndexPartitionKey(INDEX_NAME, "dummy", AttributeValueType.S)
             .addIndexSortKey(INDEX_NAME, "dummy2", AttributeValueType.S)
             .addCustomMetadataObject("custom1", "value1")
@@ -318,8 +316,8 @@ public void mergeEmptyIntoFull() {
         StaticTableMetadata emptyTableMetadata = StaticTableMetadata.builder().build();
 
         StaticTableMetadata.Builder tableMetadataBuilder = StaticTableMetadata.builder()
-                                                               .addIndexPartitionKey(getPrimaryIndexName(), "primary_id", AttributeValueType.S)
-                                                               .addIndexSortKey(getPrimaryIndexName(), "primary_sort", AttributeValueType.S)
+                                                               .addIndexPartitionKey(primaryIndexName(), "primary_id", AttributeValueType.S)
+                                                               .addIndexSortKey(primaryIndexName(), "primary_sort", AttributeValueType.S)
                                                                .addIndexPartitionKey(INDEX_NAME, "dummy", AttributeValueType.S)
                                                                .addIndexSortKey(INDEX_NAME, "dummy2", AttributeValueType.S)
                                                                .addCustomMetadataObject("custom1", "value1")
@@ -363,4 +361,4 @@ public void mergeWithDuplicateCustomMetadata() {
 
         builder.mergeWith(builder.build());
     }
-}
\ No newline at end of file
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/StaticTableSchemaTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/StaticTableSchemaTest.java
new file mode 100644
index 000000000000..7ef020a15d52
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/StaticTableSchemaTest.java
@@ -0,0 +1,1514 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.mapper;
+
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static java.util.Arrays.asList;
+import static java.util.Collections.singletonList;
+import static java.util.Collections.singletonMap;
+import static java.util.stream.Collectors.toList;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.hasEntry;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.nullValue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.when;
+import static software.amazon.awssdk.enhanced.dynamodb.internal.AttributeValues.nullAttributeValue;
+import static software.amazon.awssdk.enhanced.dynamodb.internal.AttributeValues.stringValue;
+
+import java.math.BigDecimal;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Consumer;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+import software.amazon.awssdk.core.SdkBytes;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeConverterProvider;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.enhanced.dynamodb.TableMetadata;
+import software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.FakeItem;
+import software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.FakeItemComposedClass;
+import software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.FakeItemWithSort;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+
+@RunWith(MockitoJUnitRunner.class)
+public class StaticTableSchemaTest {
+    private static final String TABLE_TAG_KEY = "table-tag-key";
+    private static final String TABLE_TAG_VALUE = "table-tag-value";
+    private static final AttributeValue ATTRIBUTE_VALUE_B = AttributeValue.builder().bool(true).build();
+    private static final AttributeValue ATTRIBUTE_VALUE_S = AttributeValue.builder().s("test-string").build();
+
+    private static final StaticTableSchema<FakeDocument> FAKE_DOCUMENT_TABLE_SCHEMA =
+        StaticTableSchema.builder(FakeDocument.class)
+                         .newItemSupplier(FakeDocument::new)
+                         .addAttribute(String.class, a -> a.name("documentString")
+                                                           .getter(FakeDocument::getDocumentString)
+                                                           .setter(FakeDocument::setDocumentString))
+                         .addAttribute(Integer.class, a -> a.name("documentInteger")
+                                                            .getter(FakeDocument::getDocumentInteger)
+                                                            .setter(FakeDocument::setDocumentInteger))
+                         .build();
+
+    private static final FakeMappedItem FAKE_ITEM = FakeMappedItem.builder()
+                                                                  .aPrimitiveBoolean(true)
+                                                                  .aBoolean(true)
+                                                                  .aString("test-string")
+                                                                  .build();
+
+    private static class FakeMappedItem {
+        private boolean aPrimitiveBoolean;
+        private Boolean aBoolean;
+        private String aString;
+        private Integer anInteger;
+        private int aPrimitiveInteger;
+        private Byte aByte;
+        private byte aPrimitiveByte;
+        private Long aLong;
+        private long aPrimitiveLong;
+        private Short aShort;
+        private short aPrimitiveShort;
+        private Double aDouble;
+        private double aPrimitiveDouble;
+        private Float aFloat;
+        private float aPrimitiveFloat;
+        private BigDecimal aBigDecimal;
+        private SdkBytes aBinaryValue;
+        private FakeDocument aFakeDocument;
+        private Set<String> aStringSet;
+        private Set<Integer> anIntegerSet;
+        private Set<Byte> aByteSet;
+        private Set<Long> aLongSet;
+        private Set<Short> aShortSet;
+        private Set<Double> aDoubleSet;
+        private Set<Float> aFloatSet;
+        private Set<SdkBytes> aBinarySet;
+        private List<Integer> anIntegerList;
+        private List<List<FakeDocument>> aNestedStructure;
+        private Map<String, String> aStringMap;
+        private Map<Integer, Double> aIntDoubleMap;
+        private TestEnum testEnum;
+
+        FakeMappedItem() {
+        }
+
+        FakeMappedItem(boolean aPrimitiveBoolean, Boolean aBoolean, String aString, Integer anInteger,
+                       int aPrimitiveInteger, Byte aByte, byte aPrimitiveByte, Long aLong, long aPrimitiveLong,
+                       Short aShort, short aPrimitiveShort, Double aDouble, double aPrimitiveDouble, Float aFloat,
+                       float aPrimitiveFloat, BigDecimal aBigDecimal, SdkBytes aBinaryValue, FakeDocument aFakeDocument,
+                       Set<String> aStringSet, Set<Integer> anIntegerSet, Set<Byte> aByteSet,
+                       Set<Long> aLongSet, Set<Short> aShortSet, Set<Double> aDoubleSet, Set<Float> aFloatSet,
+                       Set<SdkBytes> aBinarySet, List<Integer> anIntegerList,
+                       List<List<FakeDocument>> aNestedStructure, Map<String, String> aStringMap,
+                       Map<Integer, Double> aIntDoubleMap, TestEnum testEnum) {
+            this.aPrimitiveBoolean = aPrimitiveBoolean;
+            this.aBoolean = aBoolean;
+            this.aString = aString;
+            this.anInteger = anInteger;
+            this.aPrimitiveInteger = aPrimitiveInteger;
+            this.aByte = aByte;
+            this.aPrimitiveByte = aPrimitiveByte;
+            this.aLong = aLong;
+            this.aPrimitiveLong = aPrimitiveLong;
+            this.aShort = aShort;
+            this.aPrimitiveShort = aPrimitiveShort;
+            this.aDouble = aDouble;
+            this.aPrimitiveDouble = aPrimitiveDouble;
+            this.aFloat = aFloat;
+            this.aPrimitiveFloat = aPrimitiveFloat;
+            this.aBigDecimal = aBigDecimal;
+            this.aBinaryValue = aBinaryValue;
+            this.aFakeDocument = aFakeDocument;
+            this.aStringSet = aStringSet;
+            this.anIntegerSet = anIntegerSet;
+            this.aByteSet = aByteSet;
+            this.aLongSet = aLongSet;
+            this.aShortSet = aShortSet;
+            this.aDoubleSet = aDoubleSet;
+            this.aFloatSet = aFloatSet;
+            this.aBinarySet = aBinarySet;
+            this.anIntegerList = anIntegerList;
+            this.aNestedStructure = aNestedStructure;
+            this.aStringMap = aStringMap;
+            this.aIntDoubleMap = aIntDoubleMap;
+            this.testEnum = testEnum;
+        }
+
+        public static Builder builder() {
+            return new Builder();
+        }
+
+        boolean isAPrimitiveBoolean() {
+            return aPrimitiveBoolean;
+        }
+
+        void setAPrimitiveBoolean(boolean aPrimitiveBoolean) {
+            this.aPrimitiveBoolean = aPrimitiveBoolean;
+        }
+
+        Boolean getABoolean() {
+            return aBoolean;
+        }
+
+        void setABoolean(Boolean aBoolean) {
+            this.aBoolean = aBoolean;
+        }
+
+        String getAString() {
+            return aString;
+        }
+
+        void setAString(String aString) {
+            this.aString = aString;
+        }
+
+        Integer getAnInteger() {
+            return anInteger;
+        }
+
+        void setAnInteger(Integer anInteger) {
+            this.anInteger = anInteger;
+        }
+
+        int getAPrimitiveInteger() {
+            return aPrimitiveInteger;
+        }
+
+        void setAPrimitiveInteger(int aPrimitiveInteger) {
+            this.aPrimitiveInteger = aPrimitiveInteger;
+        }
+
+        Byte getAByte() {
+            return aByte;
+        }
+
+        void setAByte(Byte aByte) {
+            this.aByte = aByte;
+        }
+
+        byte getAPrimitiveByte() {
+            return aPrimitiveByte;
+        }
+
+        void setAPrimitiveByte(byte aPrimitiveByte) {
+            this.aPrimitiveByte = aPrimitiveByte;
+        }
+
+        Long getALong() {
+            return aLong;
+        }
+
+        void setALong(Long aLong) {
+            this.aLong = aLong;
+        }
+
+        long getAPrimitiveLong() {
+            return aPrimitiveLong;
+        }
+
+        void setAPrimitiveLong(long aPrimitiveLong) {
+            this.aPrimitiveLong = aPrimitiveLong;
+        }
+
+        Short getAShort() {
+            return aShort;
+        }
+
+        void setAShort(Short aShort) {
+            this.aShort = aShort;
+        }
+
+        short getAPrimitiveShort() {
+            return aPrimitiveShort;
+        }
+
+        void setAPrimitiveShort(short aPrimitiveShort) {
+            this.aPrimitiveShort = aPrimitiveShort;
+        }
+
+        Double getADouble() {
+            return aDouble;
+        }
+
+        void setADouble(Double aDouble) {
+            this.aDouble = aDouble;
+        }
+
+        double getAPrimitiveDouble() {
+            return aPrimitiveDouble;
+        }
+
+        void setAPrimitiveDouble(double aPrimitiveDouble) {
+            this.aPrimitiveDouble = aPrimitiveDouble;
+        }
+
+        Float getAFloat() {
+            return aFloat;
+        }
+
+        void setAFloat(Float aFloat) {
+            this.aFloat = aFloat;
+        }
+
+        BigDecimal aBigDecimal() {
+            return aBigDecimal;
+        }
+
+        void setABigDecimal(BigDecimal aBigDecimal) {
+            this.aBigDecimal = aBigDecimal;
+        }
+
+        float getAPrimitiveFloat() {
+            return aPrimitiveFloat;
+        }
+
+        void setAPrimitiveFloat(float aPrimitiveFloat) {
+            this.aPrimitiveFloat = aPrimitiveFloat;
+        }
+
+        SdkBytes getABinaryValue() {
+            return aBinaryValue;
+        }
+
+        void setABinaryValue(SdkBytes aBinaryValue) {
+            this.aBinaryValue = aBinaryValue;
+        }
+
+        FakeDocument getAFakeDocument() {
+            return aFakeDocument;
+        }
+
+        void setAFakeDocument(FakeDocument aFakeDocument) {
+            this.aFakeDocument = aFakeDocument;
+        }
+
+        Set<String> getAStringSet() {
+            return aStringSet;
+        }
+
+        void setAStringSet(Set<String> aStringSet) {
+            this.aStringSet = aStringSet;
+        }
+
+        Set<Integer> getAnIntegerSet() {
+            return anIntegerSet;
+        }
+
+        void setAnIntegerSet(Set<Integer> anIntegerSet) {
+            this.anIntegerSet = anIntegerSet;
+        }
+
+        Set<Byte> getAByteSet() {
+            return aByteSet;
+        }
+
+        void setAByteSet(Set<Byte> aByteSet) {
+            this.aByteSet = aByteSet;
+        }
+
+        Set<Long> getALongSet() {
+            return aLongSet;
+        }
+
+        void setALongSet(Set<Long> aLongSet) {
+            this.aLongSet = aLongSet;
+        }
+
+        Set<Short> getAShortSet() {
+            return aShortSet;
+        }
+
+        void setAShortSet(Set<Short> aShortSet) {
+            this.aShortSet = aShortSet;
+        }
+
+        Set<Double> getADoubleSet() {
+            return aDoubleSet;
+        }
+
+        void setADoubleSet(Set<Double> aDoubleSet) {
+            this.aDoubleSet = aDoubleSet;
+        }
+
+        Set<Float> getAFloatSet() {
+            return aFloatSet;
+        }
+
+        void setAFloatSet(Set<Float> aFloatSet) {
+            this.aFloatSet = aFloatSet;
+        }
+
+        Set<SdkBytes> getABinarySet() {
+            return aBinarySet;
+        }
+
+        void setABinarySet(Set<SdkBytes> aBinarySet) {
+            this.aBinarySet = aBinarySet;
+        }
+
+        List<Integer> getAnIntegerList() {
+            return anIntegerList;
+        }
+
+        void setAnIntegerList(List<Integer> anIntegerList) {
+            this.anIntegerList = anIntegerList;
+        }
+
+        List<List<FakeDocument>> getANestedStructure() {
+            return aNestedStructure;
+        }
+
+        void setANestedStructure(List<List<FakeDocument>> aNestedStructure) {
+            this.aNestedStructure = aNestedStructure;
+        }
+
+        Map<String, String> getAStringMap() {
+            return aStringMap;
+        }
+
+        void setAStringMap(Map<String, String> aStringMap) {
+            this.aStringMap = aStringMap;
+        }
+
+        Map<Integer, Double> getAIntDoubleMap() {
+            return aIntDoubleMap;
+        }
+
+        void setAIntDoubleMap(Map<Integer, Double> aIntDoubleMap) {
+            this.aIntDoubleMap = aIntDoubleMap;
+        }
+
+        TestEnum getTestEnum() {
+            return testEnum;
+        }
+
+        void setTestEnum(TestEnum testEnum) {
+            this.testEnum = testEnum;
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) {
+                return true;
+            }
+            if (o == null || getClass() != o.getClass()) {
+                return false;
+            }
+            FakeMappedItem that = (FakeMappedItem) o;
+            return aPrimitiveBoolean == that.aPrimitiveBoolean &&
+                   aPrimitiveInteger == that.aPrimitiveInteger &&
+                   aPrimitiveByte == that.aPrimitiveByte &&
+                   aPrimitiveLong == that.aPrimitiveLong &&
+                   aPrimitiveShort == that.aPrimitiveShort &&
+                   Double.compare(that.aPrimitiveDouble, aPrimitiveDouble) == 0 &&
+                   Float.compare(that.aPrimitiveFloat, aPrimitiveFloat) == 0 &&
+                   Objects.equals(aBoolean, that.aBoolean) &&
+                   Objects.equals(aString, that.aString) &&
+                   Objects.equals(anInteger, that.anInteger) &&
+                   Objects.equals(aByte, that.aByte) &&
+                   Objects.equals(aLong, that.aLong) &&
+                   Objects.equals(aShort, that.aShort) &&
+                   Objects.equals(aDouble, that.aDouble) &&
+                   Objects.equals(aFloat, that.aFloat) &&
+                   Objects.equals(aBinaryValue, that.aBinaryValue) &&
+                   Objects.equals(aFakeDocument, that.aFakeDocument) &&
+                   Objects.equals(aStringSet, that.aStringSet) &&
+                   Objects.equals(anIntegerSet, that.anIntegerSet) &&
+                   Objects.equals(aByteSet, that.aByteSet) &&
+                   Objects.equals(aLongSet, that.aLongSet) &&
+                   Objects.equals(aShortSet, that.aShortSet) &&
+                   Objects.equals(aDoubleSet, that.aDoubleSet) &&
+                   Objects.equals(aFloatSet, that.aFloatSet) &&
+                   Objects.equals(aBinarySet, that.aBinarySet) &&
+                   Objects.equals(anIntegerList, that.anIntegerList) &&
+                   Objects.equals(aNestedStructure, that.aNestedStructure) &&
+                   Objects.equals(aStringMap, that.aStringMap) &&
+                   Objects.equals(aIntDoubleMap, that.aIntDoubleMap) &&
+                   Objects.equals(testEnum, that.testEnum);
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(aPrimitiveBoolean, aBoolean, aString, anInteger, aPrimitiveInteger, aByte,
+                                aPrimitiveByte, aLong, aPrimitiveLong, aShort, aPrimitiveShort, aDouble,
+                                aPrimitiveDouble, aFloat, aPrimitiveFloat, aBinaryValue, aFakeDocument, aStringSet,
+                                anIntegerSet, aByteSet, aLongSet, aShortSet, aDoubleSet, aFloatSet, aBinarySet,
+                                anIntegerList, aNestedStructure, aStringMap, aIntDoubleMap, testEnum);
+        }
+
+        public enum TestEnum {
+            ONE,
+            TWO,
+            THREE;
+        }
+
+        private static class Builder {
+            private boolean aPrimitiveBoolean;
+            private Boolean aBoolean;
+            private String aString;
+            private Integer anInteger;
+            private int aPrimitiveInteger;
+            private Byte aByte;
+            private byte aPrimitiveByte;
+            private Long aLong;
+            private long aPrimitiveLong;
+            private Short aShort;
+            private short aPrimitiveShort;
+            private Double aDouble;
+            private double aPrimitiveDouble;
+            private Float aFloat;
+            private float aPrimitiveFloat;
+            private BigDecimal aBigDecimal;
+            private SdkBytes aBinaryValue;
+            private FakeDocument aFakeDocument;
+            private Set<String> aStringSet;
+            private Set<Integer> anIntegerSet;
+            private Set<Byte> aByteSet;
+            private Set<Long> aLongSet;
+            private Set<Short> aShortSet;
+            private Set<Double> aDoubleSet;
+            private Set<Float> aFloatSet;
+            private Set<SdkBytes> aBinarySet;
+            private List<Integer> anIntegerList;
+            private List<List<FakeDocument>> aNestedStructure;
+            private Map<String, String> aStringMap;
+            private Map<Integer, Double> aIntDoubleMap;
+            private TestEnum testEnum;
+
+            Builder aPrimitiveBoolean(boolean aPrimitiveBoolean) {
+                this.aPrimitiveBoolean = aPrimitiveBoolean;
+                return this;
+            }
+
+            Builder aBoolean(Boolean aBoolean) {
+                this.aBoolean = aBoolean;
+                return this;
+            }
+
+            Builder aString(String aString) {
+                this.aString = aString;
+                return this;
+            }
+
+            Builder anInteger(Integer anInteger) {
+                this.anInteger = anInteger;
+                return this;
+            }
+
+            Builder aPrimitiveInteger(int aPrimitiveInteger) {
+                this.aPrimitiveInteger = aPrimitiveInteger;
+                return this;
+            }
+
+            Builder aByte(Byte aByte) {
+                this.aByte = aByte;
+                return this;
+            }
+
+            Builder aPrimitiveByte(byte aPrimitiveByte) {
+                this.aPrimitiveByte = aPrimitiveByte;
+                return this;
+            }
+
+            Builder aLong(Long aLong) {
+                this.aLong = aLong;
+                return this;
+            }
+
+            Builder aPrimitiveLong(long aPrimitiveLong) {
+                this.aPrimitiveLong = aPrimitiveLong;
+                return this;
+            }
+
+            Builder aShort(Short aShort) {
+                this.aShort = aShort;
+                return this;
+            }
+
+            Builder aPrimitiveShort(short aPrimitiveShort) {
+                this.aPrimitiveShort = aPrimitiveShort;
+                return this;
+            }
+
+            Builder aDouble(Double aDouble) {
+                this.aDouble = aDouble;
+                return this;
+            }
+
+            Builder aPrimitiveDouble(double aPrimitiveDouble) {
+                this.aPrimitiveDouble = aPrimitiveDouble;
+                return this;
+            }
+
+            Builder aFloat(Float aFloat) {
+                this.aFloat = aFloat;
+                return this;
+            }
+
+            Builder aPrimitiveFloat(float aPrimitiveFloat) {
+                this.aPrimitiveFloat = aPrimitiveFloat;
+                return this;
+            }
+
+            Builder aBigDecimal(BigDecimal aBigDecimal) {
+                this.aBigDecimal = aBigDecimal;
+                return this;
+            }
+
+            Builder aBinaryValue(SdkBytes aBinaryValue) {
+                this.aBinaryValue = aBinaryValue;
+                return this;
+            }
+
+            Builder aFakeDocument(FakeDocument aFakeDocument) {
+                this.aFakeDocument = aFakeDocument;
+                return this;
+            }
+
+            Builder aStringSet(Set<String> aStringSet) {
+                this.aStringSet = aStringSet;
+                return this;
+            }
+
+            Builder anIntegerSet(Set<Integer> anIntegerSet) {
+                this.anIntegerSet = anIntegerSet;
+                return this;
+            }
+
+            Builder aByteSet(Set<Byte> aByteSet) {
+                this.aByteSet = aByteSet;
+                return this;
+            }
+
+            Builder aLongSet(Set<Long> aLongSet) {
+                this.aLongSet = aLongSet;
+                return this;
+            }
+
+            Builder aShortSet(Set<Short> aShortSet) {
+                this.aShortSet = aShortSet;
+                return this;
+            }
+
+            Builder aDoubleSet(Set<Double> aDoubleSet) {
+                this.aDoubleSet = aDoubleSet;
+                return this;
+            }
+
+            Builder aFloatSet(Set<Float> aFloatSet) {
+                this.aFloatSet = aFloatSet;
+                return this;
+            }
+
+            Builder aBinarySet(Set<SdkBytes> aBinarySet) {
+                this.aBinarySet = aBinarySet;
+                return this;
+            }
+
+            Builder anIntegerList(List<Integer> anIntegerList) {
+                this.anIntegerList = anIntegerList;
+                return this;
+            }
+
+            Builder aNestedStructure(List<List<FakeDocument>> aNestedStructure) {
+                this.aNestedStructure = aNestedStructure;
+                return this;
+            }
+
+            Builder aStringMap(Map<String, String> aStringMap) {
+                this.aStringMap = aStringMap;
+                return this;
+            }
+
+            Builder aIntDoubleMap(Map<Integer, Double> aIntDoubleMap) {
+                this.aIntDoubleMap = aIntDoubleMap;
+                return this;
+            }
+
+            Builder testEnum(TestEnum testEnum) {
+                this.testEnum = testEnum;
+                return this;
+            }
+
+            public FakeMappedItem build() {
+                return new FakeMappedItem(aPrimitiveBoolean, aBoolean, aString, anInteger, aPrimitiveInteger, aByte,
+                                          aPrimitiveByte, aLong, aPrimitiveLong, aShort, aPrimitiveShort, aDouble,
+                                          aPrimitiveDouble, aFloat, aPrimitiveFloat, aBigDecimal, aBinaryValue, aFakeDocument,
+                                          aStringSet, anIntegerSet, aByteSet, aLongSet, aShortSet, aDoubleSet,
+                                          aFloatSet, aBinarySet, anIntegerList, aNestedStructure, aStringMap, aIntDoubleMap,
+                                          testEnum);
+            }
+        }
+    }
+
+    private static class FakeDocument {
+        private String documentString;
+        private Integer documentInteger;
+
+        FakeDocument() {
+        }
+
+        private FakeDocument(String documentString, Integer documentInteger) {
+            this.documentString = documentString;
+            this.documentInteger = documentInteger;
+        }
+
+        private static FakeDocument of(String documentString, Integer documentInteger) {
+            return new FakeDocument(documentString, documentInteger);
+        }
+
+        String getDocumentString() {
+            return documentString;
+        }
+
+        void setDocumentString(String documentString) {
+            this.documentString = documentString;
+        }
+
+        Integer getDocumentInteger() {
+            return documentInteger;
+        }
+
+        void setDocumentInteger(Integer documentInteger) {
+            this.documentInteger = documentInteger;
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) {
+                return true;
+            }
+            if (o == null || getClass() != o.getClass()) {
+                return false;
+            }
+            FakeDocument that = (FakeDocument) o;
+            return Objects.equals(documentString, that.documentString) &&
+                   Objects.equals(documentInteger, that.documentInteger);
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(documentString, documentInteger);
+        }
+    }
+
+    private static class FakeAbstractSubclass extends FakeAbstractSuperclass {
+
+    }
+
+    private static class FakeBrokenClass {
+        FakeAbstractSuperclass abstractObject;
+
+        FakeAbstractSuperclass getAbstractObject() {
+            return abstractObject;
+        }
+
+        void setAbstractObject(FakeAbstractSuperclass abstractObject) {
+            this.abstractObject = abstractObject;
+        }
+    }
+
+    private static abstract class FakeAbstractSuperclass {
+        private String aString;
+
+        String getAString() {
+            return aString;
+        }
+
+        void setAString(String aString) {
+            this.aString = aString;
+        }
+    }
+    
+    private static final Collection<StaticAttribute<FakeMappedItem, ?>> ATTRIBUTES = Arrays.asList(
+        StaticAttribute.builder(FakeMappedItem.class, Boolean.class)
+                       .name("a_primitive_boolean")
+                       .getter(FakeMappedItem::isAPrimitiveBoolean)
+                       .setter(FakeMappedItem::setAPrimitiveBoolean)
+                       .build(),
+        StaticAttribute.builder(FakeMappedItem.class, Boolean.class)
+                       .name("a_boolean")
+                       .getter(FakeMappedItem::getABoolean)
+                       .setter(FakeMappedItem::setABoolean)
+                       .build(),
+        StaticAttribute.builder(FakeMappedItem.class, String.class)
+                       .name("a_string")
+                       .getter(FakeMappedItem::getAString)
+                       .setter(FakeMappedItem::setAString)
+                       .build()
+    );
+
+    private StaticTableSchema<FakeMappedItem> createSimpleTableSchema() {
+        return StaticTableSchema.builder(FakeMappedItem.class)
+                                .newItemSupplier(FakeMappedItem::new)
+                                .attributes(ATTRIBUTES)
+                                .build();
+    }
+
+    private static class TestStaticTableTag implements StaticTableTag {
+        @Override
+        public Consumer<StaticTableMetadata.Builder> modifyMetadata() {
+            return metadata -> metadata.addCustomMetadataObject(TABLE_TAG_KEY, TABLE_TAG_VALUE);
+        }
+    }
+
+    @Mock
+    private AttributeConverterProvider provider1;
+
+    @Mock
+    private AttributeConverterProvider provider2;
+
+    @Mock
+    private AttributeConverter<String> attributeConverter1;
+
+    @Mock
+    private AttributeConverter<String> attributeConverter2;
+
+    @Rule
+    public ExpectedException exception = ExpectedException.none();
+
+    @Test
+    public void itemType_returnsCorrectClass() {
+        assertThat(FakeItem.getTableSchema().itemType(), is(equalTo(EnhancedType.of(FakeItem.class))));
+    }
+
+    @Test
+    public void getTableMetadata_hasCorrectFields() {
+        TableMetadata tableMetadata = FakeItemWithSort.getTableSchema().tableMetadata();
+
+        assertThat(tableMetadata.primaryPartitionKey(), is("id"));
+        assertThat(tableMetadata.primarySortKey(), is(Optional.of("sort")));
+    }
+
+    @Test
+    public void itemToMap_returnsCorrectMapWithMultipleAttributes() {
+        Map<String, AttributeValue> attributeMap = createSimpleTableSchema().itemToMap(FAKE_ITEM, false);
+
+        assertThat(attributeMap.size(), is(3));
+        assertThat(attributeMap, hasEntry("a_boolean", ATTRIBUTE_VALUE_B));
+        assertThat(attributeMap, hasEntry("a_primitive_boolean", ATTRIBUTE_VALUE_B));
+        assertThat(attributeMap, hasEntry("a_string", ATTRIBUTE_VALUE_S));
+    }
+
+    @Test
+    public void itemToMap_omitsNullAttributes() {
+        FakeMappedItem fakeMappedItemWithNulls = FakeMappedItem.builder().aPrimitiveBoolean(true).build();
+        Map<String, AttributeValue> attributeMap = createSimpleTableSchema().itemToMap(fakeMappedItemWithNulls, true);
+
+        assertThat(attributeMap.size(), is(1));
+        assertThat(attributeMap, hasEntry("a_primitive_boolean", ATTRIBUTE_VALUE_B));
+    }
+
+    @Test
+    public void itemToMap_filtersAttributes() {
+        Map<String, AttributeValue> attributeMap = createSimpleTableSchema()
+            .itemToMap(FAKE_ITEM, asList("a_boolean", "a_string"));
+
+        assertThat(attributeMap.size(), is(2));
+        assertThat(attributeMap, hasEntry("a_boolean", ATTRIBUTE_VALUE_B));
+        assertThat(attributeMap, hasEntry("a_string", ATTRIBUTE_VALUE_S));
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void itemToMap_attributeNotFound_throwsIllegalArgumentException() {
+        createSimpleTableSchema().itemToMap(FAKE_ITEM, singletonList("unknown_key"));
+    }
+
+    @Test
+    public void mapToItem_returnsCorrectItemWithMultipleAttributes() {
+        Map<String, AttributeValue> attributeValueMap = new HashMap<>();
+        attributeValueMap.put("a_boolean", ATTRIBUTE_VALUE_B);
+        attributeValueMap.put("a_primitive_boolean", ATTRIBUTE_VALUE_B);
+        attributeValueMap.put("a_string", ATTRIBUTE_VALUE_S);
+
+        FakeMappedItem fakeMappedItem =
+            createSimpleTableSchema().mapToItem(Collections.unmodifiableMap(attributeValueMap));
+
+        assertThat(fakeMappedItem, is(FAKE_ITEM));
+    }
+
+    @Test
+    public void mapToItem_unknownAttributes_doNotCauseErrors() {
+        Map<String, AttributeValue> attributeValueMap = new HashMap<>();
+        attributeValueMap.put("unknown_attribute", ATTRIBUTE_VALUE_S);
+
+        createSimpleTableSchema().mapToItem(Collections.unmodifiableMap(attributeValueMap));
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void mapToItem_attributesWrongType_throwsException() {
+        Map<String, AttributeValue> attributeValueMap = new HashMap<>();
+        attributeValueMap.put("a_boolean", ATTRIBUTE_VALUE_S);
+        attributeValueMap.put("a_primitive_boolean", ATTRIBUTE_VALUE_S);
+        attributeValueMap.put("a_string", ATTRIBUTE_VALUE_B);
+
+        createSimpleTableSchema().mapToItem(Collections.unmodifiableMap(attributeValueMap));
+    }
+
+    @Test
+    public void mapperCanHandleEnum() {
+        verifyNullableAttribute(EnhancedType.of(FakeMappedItem.TestEnum.class),
+                                a -> a.name("value")
+                                      .getter(FakeMappedItem::getTestEnum)
+                                      .setter(FakeMappedItem::setTestEnum),
+                                FakeMappedItem.builder().testEnum(FakeMappedItem.TestEnum.ONE).build(),
+                                AttributeValue.builder().s("ONE").build());
+    }
+
+    @Test
+    public void mapperCanHandleDocument() {
+        FakeDocument fakeDocument = FakeDocument.of("test-123", 123);
+
+        Map<String, AttributeValue> expectedMap = new HashMap<>();
+        expectedMap.put("documentInteger", AttributeValue.builder().n("123").build());
+        expectedMap.put("documentString", AttributeValue.builder().s("test-123").build());
+        
+        verifyNullableAttribute(EnhancedType.documentOf(FakeDocument.class, FAKE_DOCUMENT_TABLE_SCHEMA),
+                                a -> a.name("value")
+                                      .getter(FakeMappedItem::getAFakeDocument)
+                                      .setter(FakeMappedItem::setAFakeDocument),
+                                FakeMappedItem.builder().aFakeDocument(fakeDocument).build(),
+                                AttributeValue.builder().m(expectedMap).build());
+    }
+
+    @Test
+    public void mapperCanHandleDocumentWithNullValues() {
+        verifyNullAttribute(EnhancedType.documentOf(FakeDocument.class, FAKE_DOCUMENT_TABLE_SCHEMA),
+                            a -> a.name("value")
+                                  .getter(FakeMappedItem::getAFakeDocument)
+                                  .setter(FakeMappedItem::setAFakeDocument),
+                            FakeMappedItem.builder().build());
+    }
+
+    @Test
+    public void mapperCanHandleInteger() {
+        verifyNullableAttribute(EnhancedType.of(Integer.class), a -> a.name("value")
+                                                                   .getter(FakeMappedItem::getAnInteger)
+                                                                   .setter(FakeMappedItem::setAnInteger),
+                                FakeMappedItem.builder().anInteger(123).build(),
+                                AttributeValue.builder().n("123").build());
+    }
+
+    @Test
+    public void mapperCanHandlePrimitiveInteger() {
+        verifyAttribute(EnhancedType.of(int.class),
+                        a -> a.name("value")
+                              .getter(FakeMappedItem::getAPrimitiveInteger)
+                              .setter(FakeMappedItem::setAPrimitiveInteger),
+                        FakeMappedItem.builder().aPrimitiveInteger(123).build(),
+                        AttributeValue.builder().n("123").build());
+    }
+
+    @Test
+    public void mapperCanHandleBoolean() {
+        verifyNullableAttribute(EnhancedType.of(Boolean.class),
+                                a -> a.name("value")
+                                      .getter(FakeMappedItem::getABoolean)
+                                      .setter(FakeMappedItem::setABoolean),
+                                FakeMappedItem.builder().aBoolean(true).build(),
+                                AttributeValue.builder().bool(true).build());
+    }
+
+    @Test
+    public void mapperCanHandlePrimitiveBoolean() {
+        verifyAttribute(EnhancedType.of(boolean.class),
+                        a -> a.name("value")
+                              .getter(FakeMappedItem::isAPrimitiveBoolean)
+                              .setter(FakeMappedItem::setAPrimitiveBoolean),
+                        FakeMappedItem.builder().aPrimitiveBoolean(true).build(),
+                        AttributeValue.builder().bool(true).build());
+    }
+
+    @Test
+    public void mapperCanHandleString() {
+        verifyNullableAttribute(EnhancedType.of(String.class),
+                                a -> a.name("value")
+                                      .getter(FakeMappedItem::getAString)
+                                      .setter(FakeMappedItem::setAString),
+                                FakeMappedItem.builder().aString("onetwothree").build(),
+                                AttributeValue.builder().s("onetwothree").build());
+    }
+
+    @Test
+    public void mapperCanHandleLong() {
+        verifyNullableAttribute(EnhancedType.of(Long.class),
+                                a -> a.name("value")
+                                      .getter(FakeMappedItem::getALong)
+                                      .setter(FakeMappedItem::setALong),
+                                FakeMappedItem.builder().aLong(123L).build(),
+                                AttributeValue.builder().n("123").build());
+    }
+
+    @Test
+    public void mapperCanHandlePrimitiveLong() {
+        verifyAttribute(EnhancedType.of(long.class),
+                        a -> a.name("value")
+                              .getter(FakeMappedItem::getAPrimitiveLong)
+                              .setter(FakeMappedItem::setAPrimitiveLong),
+                        FakeMappedItem.builder().aPrimitiveLong(123L).build(),
+                        AttributeValue.builder().n("123").build());
+    }
+
+    @Test
+    public void mapperCanHandleShort() {
+        verifyNullableAttribute(EnhancedType.of(Short.class),
+                                a -> a.name("value")
+                                      .getter(FakeMappedItem::getAShort)
+                                      .setter(FakeMappedItem::setAShort),
+                                FakeMappedItem.builder().aShort((short)123).build(),
+                                AttributeValue.builder().n("123").build());
+    }
+
+    @Test
+    public void mapperCanHandlePrimitiveShort() {
+        verifyAttribute(EnhancedType.of(short.class),
+                        a -> a.name("value")
+                              .getter(FakeMappedItem::getAPrimitiveShort)
+                              .setter(FakeMappedItem::setAPrimitiveShort),
+                        FakeMappedItem.builder().aPrimitiveShort((short)123).build(),
+                        AttributeValue.builder().n("123").build());
+    }
+
+    @Test
+    public void mapperCanHandleByte() {
+        verifyNullableAttribute(EnhancedType.of(Byte.class),
+                                a -> a.name("value")
+                                      .getter(FakeMappedItem::getAByte)
+                                      .setter(FakeMappedItem::setAByte),
+                                FakeMappedItem.builder().aByte((byte)123).build(),
+                                AttributeValue.builder().n("123").build());
+    }
+
+    @Test
+    public void mapperCanHandlePrimitiveByte() {
+        verifyAttribute(EnhancedType.of(byte.class),
+                        a -> a.name("value")
+                              .getter(FakeMappedItem::getAPrimitiveByte)
+                              .setter(FakeMappedItem::setAPrimitiveByte),
+                        FakeMappedItem.builder().aPrimitiveByte((byte)123).build(),
+                        AttributeValue.builder().n("123").build());
+    }
+
+    @Test
+    public void mapperCanHandleDouble() {
+        verifyNullableAttribute(EnhancedType.of(Double.class),
+                                a -> a.name("value")
+                                      .getter(FakeMappedItem::getADouble)
+                                      .setter(FakeMappedItem::setADouble),
+                                FakeMappedItem.builder().aDouble(1.23).build(),
+                                AttributeValue.builder().n("1.23").build());
+    }
+
+    @Test
+    public void mapperCanHandlePrimitiveDouble() {
+        verifyAttribute(EnhancedType.of(double.class),
+                        a -> a.name("value")
+                              .getter(FakeMappedItem::getAPrimitiveDouble)
+                              .setter(FakeMappedItem::setAPrimitiveDouble),
+                        FakeMappedItem.builder().aPrimitiveDouble(1.23).build(),
+                        AttributeValue.builder().n("1.23").build());
+    }
+
+    @Test
+    public void mapperCanHandleFloat() {
+        verifyNullableAttribute(EnhancedType.of(Float.class),
+                                a -> a.name("value")
+                                      .getter(FakeMappedItem::getAFloat)
+                                      .setter(FakeMappedItem::setAFloat),
+                                FakeMappedItem.builder().aFloat(1.23f).build(),
+                                AttributeValue.builder().n("1.23").build());
+    }
+
+    @Test
+    public void mapperCanHandlePrimitiveFloat() {
+        verifyAttribute(EnhancedType.of(float.class),
+                        a -> a.name("value")
+                              .getter(FakeMappedItem::getAPrimitiveFloat)
+                              .setter(FakeMappedItem::setAPrimitiveFloat),
+                        FakeMappedItem.builder().aPrimitiveFloat(1.23f).build(),
+                        AttributeValue.builder().n("1.23").build());
+    }
+
+
+    @Test
+    public void mapperCanHandleBinary() {
+        SdkBytes sdkBytes = SdkBytes.fromString("test", UTF_8);
+        verifyNullableAttribute(EnhancedType.of(SdkBytes.class),
+                                a -> a.name("value")
+                                      .getter(FakeMappedItem::getABinaryValue)
+                                      .setter(FakeMappedItem::setABinaryValue),
+                                FakeMappedItem.builder().aBinaryValue(sdkBytes).build(),
+                                AttributeValue.builder().b(sdkBytes).build());
+    }
+
+    @Test
+    public void mapperCanHandleSimpleList() {
+        verifyNullableAttribute(EnhancedType.listOf(Integer.class),
+                                a -> a.name("value")
+                                      .getter(FakeMappedItem::getAnIntegerList)
+                                      .setter(FakeMappedItem::setAnIntegerList),
+                                FakeMappedItem.builder().anIntegerList(asList(1, 2, 3)).build(),
+                                AttributeValue.builder().l(asList(AttributeValue.builder().n("1").build(),
+                                                                  AttributeValue.builder().n("2").build(),
+                                                                  AttributeValue.builder().n("3").build())).build());
+    }
+
+    @Test
+    public void mapperCanHandleNestedLists() {
+        FakeMappedItem fakeMappedItem =
+            FakeMappedItem.builder()
+                          .aNestedStructure(singletonList(singletonList(FakeDocument.of("nested", null))))
+                          .build();
+
+        Map<String, AttributeValue> documentMap = new HashMap<>();
+        documentMap.put("documentString", AttributeValue.builder().s("nested").build());
+        documentMap.put("documentInteger", AttributeValue.builder().nul(true).build());
+
+        AttributeValue attributeValue =
+            AttributeValue.builder()
+                          .l(singletonList(AttributeValue.builder()
+                                                         .l(AttributeValue.builder().m(documentMap).build())
+                                                         .build()))
+                          .build();
+
+        verifyNullableAttribute(
+            EnhancedType.listOf(EnhancedType.listOf(EnhancedType.documentOf(FakeDocument.class, FAKE_DOCUMENT_TABLE_SCHEMA))),
+            a -> a.name("value")
+                  .getter(FakeMappedItem::getANestedStructure)
+                  .setter(FakeMappedItem::setANestedStructure),
+            fakeMappedItem,
+            attributeValue);
+    }
+
+    @Test
+    public void mapperCanHandleIntegerSet() {
+        Set<Integer> valueSet = new HashSet<>(asList(1, 2, 3));
+        List<String> expectedList = valueSet.stream().map(Objects::toString).collect(toList());
+        
+        verifyNullableAttribute(EnhancedType.setOf(Integer.class),
+                                a -> a.name("value")
+                                      .getter(FakeMappedItem::getAnIntegerSet)
+                                      .setter(FakeMappedItem::setAnIntegerSet),
+                                FakeMappedItem.builder().anIntegerSet(valueSet).build(),
+                                AttributeValue.builder().ns(expectedList).build());
+    }
+
+    @Test
+    public void mapperCanHandleStringSet() {
+        Set<String> valueSet = new HashSet<>(asList("one", "two", "three"));
+        List<String> expectedList = valueSet.stream().map(Objects::toString).collect(toList());
+        
+        verifyNullableAttribute(EnhancedType.setOf(String.class),
+                                a -> a.name("value")
+                                      .getter(FakeMappedItem::getAStringSet)
+                                      .setter(FakeMappedItem::setAStringSet),
+                                FakeMappedItem.builder().aStringSet(valueSet).build(),
+                                AttributeValue.builder().ss(expectedList).build());
+    }
+
+    @Test
+    public void mapperCanHandleLongSet() {
+        Set<Long> valueSet = new HashSet<>(asList(1L, 2L, 3L));
+        List<String> expectedList = valueSet.stream().map(Objects::toString).collect(toList());
+        
+        verifyNullableAttribute(EnhancedType.setOf(Long.class),
+                                a -> a.name("value")
+                                      .getter(FakeMappedItem::getALongSet)
+                                      .setter(FakeMappedItem::setALongSet),
+                                FakeMappedItem.builder().aLongSet(valueSet).build(),
+                                AttributeValue.builder().ns(expectedList).build());
+    }
+
+    @Test
+    public void mapperCanHandleShortSet() {
+        Set<Short> valueSet = new HashSet<>(asList((short) 1, (short) 2, (short) 3));
+        List<String> expectedList = valueSet.stream().map(Objects::toString).collect(toList());
+        
+        verifyNullableAttribute(EnhancedType.setOf(Short.class),
+                                a -> a.name("value")
+                                      .getter(FakeMappedItem::getAShortSet)
+                                      .setter(FakeMappedItem::setAShortSet),
+                                FakeMappedItem.builder().aShortSet(valueSet).build(),
+                                AttributeValue.builder().ns(expectedList).build());
+    }
+
+    @Test
+    public void mapperCanHandleByteSet() {
+        Set<Byte> valueSet = new HashSet<>(asList((byte) 1, (byte) 2, (byte) 3));
+        List<String> expectedList = valueSet.stream().map(Objects::toString).collect(toList());
+        
+        verifyNullableAttribute(EnhancedType.setOf(Byte.class),
+                                a -> a.name("value")
+                                      .getter(FakeMappedItem::getAByteSet)
+                                      .setter(FakeMappedItem::setAByteSet),
+                                FakeMappedItem.builder().aByteSet(valueSet).build(),
+                                AttributeValue.builder().ns(expectedList).build());
+    }
+
+    @Test
+    public void mapperCanHandleDoubleSet() {
+        Set<Double> valueSet = new HashSet<>(asList(1.2, 3.4, 5.6));
+        List<String> expectedList = valueSet.stream().map(Object::toString).collect(toList());
+        
+        verifyNullableAttribute(EnhancedType.setOf(Double.class),
+                                a -> a.name("value")
+                                      .getter(FakeMappedItem::getADoubleSet)
+                                      .setter(FakeMappedItem::setADoubleSet),
+                                FakeMappedItem.builder().aDoubleSet(valueSet).build(),
+                                AttributeValue.builder().ns(expectedList).build());
+    }
+
+    @Test
+    public void mapperCanHandleFloatSet() {
+        Set<Float> valueSet = new HashSet<>(asList(1.2f, 3.4f, 5.6f));
+        List<String> expectedList = valueSet.stream().map(Object::toString).collect(toList());
+        
+        verifyNullableAttribute(EnhancedType.setOf(Float.class),
+                                a -> a.name("value")
+                                      .getter(FakeMappedItem::getAFloatSet)
+                                      .setter(FakeMappedItem::setAFloatSet),
+                                FakeMappedItem.builder().aFloatSet(valueSet).build(),
+                                AttributeValue.builder().ns(expectedList).build());
+    }
+
+    @Test
+    public void mapperCanHandleGenericMap() {
+        Map<String, String> stringMap = new ConcurrentHashMap<>();
+        stringMap.put("one", "two");
+        stringMap.put("three", "four");
+
+        Map<String, AttributeValue> attributeValueMap = new HashMap<>();
+        attributeValueMap.put("one", AttributeValue.builder().s("two").build());
+        attributeValueMap.put("three", AttributeValue.builder().s("four").build());
+        
+        verifyNullableAttribute(EnhancedType.mapOf(String.class, String.class),
+                                a -> a.name("value")
+                                      .getter(FakeMappedItem::getAStringMap)
+                                      .setter(FakeMappedItem::setAStringMap),
+                                FakeMappedItem.builder().aStringMap(stringMap).build(),
+                                AttributeValue.builder().m(attributeValueMap).build());
+    }
+
+    @Test
+    public void mapperCanHandleIntDoubleMap() {
+        Map<Integer, Double> intDoubleMap = new ConcurrentHashMap<>();
+        intDoubleMap.put(1, 1.0);
+        intDoubleMap.put(2, 3.0);
+
+        Map<String, AttributeValue> attributeValueMap = new HashMap<>();
+        attributeValueMap.put("1", AttributeValue.builder().n("1.0").build());
+        attributeValueMap.put("2", AttributeValue.builder().n("3.0").build());
+        
+        verifyNullableAttribute(EnhancedType.mapOf(Integer.class, Double.class),
+                                a -> a.name("value")
+                                      .getter(FakeMappedItem::getAIntDoubleMap)
+                                      .setter(FakeMappedItem::setAIntDoubleMap),
+                                FakeMappedItem.builder().aIntDoubleMap(intDoubleMap).build(),
+                                AttributeValue.builder().m(attributeValueMap).build());
+    }
+
+
+    @Test
+    public void getAttributeValue_correctlyMapsSuperclassAttributes() {
+        FakeItem fakeItem = FakeItem.builder().id("id-value").build();
+        fakeItem.setSubclassAttribute("subclass-value");
+
+        AttributeValue attributeValue = FakeItem.getTableSchema().attributeValue(fakeItem, "subclass_attribute");
+
+        assertThat(attributeValue, is(AttributeValue.builder().s("subclass-value").build()));
+    }
+
+    @Test
+    public void getAttributeValue_correctlyMapsComposedClassAttributes() {
+        FakeItem fakeItem = FakeItem.builder().id("id-value")
+                                    .composedObject(FakeItemComposedClass.builder().composedAttribute("composed-value").build())
+                                    .build();
+
+        AttributeValue attributeValue = FakeItem.getTableSchema().attributeValue(fakeItem, "composed_attribute");
+
+        assertThat(attributeValue, is(AttributeValue.builder().s("composed-value").build()));
+    }
+
+    @Test
+    public void mapToItem_correctlyConstructsComposedClass() {
+        Map<String, AttributeValue> itemMap = new HashMap<>();
+        itemMap.put("id", AttributeValue.builder().s("id-value").build());
+        itemMap.put("composed_attribute", AttributeValue.builder().s("composed-value").build());
+
+        FakeItem fakeItem = FakeItem.getTableSchema().mapToItem(itemMap);
+
+        assertThat(fakeItem,
+                   is(FakeItem.builder()
+                              .id("id-value")
+                              .composedObject(FakeItemComposedClass.builder()
+                                                                   .composedAttribute("composed-value")
+                                                                   .build())
+                              .build()));
+    }
+
+    @Test
+    public void buildAbstractTableSchema() {
+        StaticTableSchema<FakeMappedItem> tableSchema =
+            StaticTableSchema.builder(FakeMappedItem.class)
+                             .addAttribute(String.class, a -> a.name("aString")
+                                                               .getter(FakeMappedItem::getAString)
+                                                               .setter(FakeMappedItem::setAString))
+                             .build();
+
+        assertThat(tableSchema.itemToMap(FAKE_ITEM, false), is(singletonMap("aString", stringValue("test-string"))));
+
+        exception.expect(UnsupportedOperationException.class);
+        exception.expectMessage("abstract");
+        tableSchema.mapToItem(singletonMap("aString", stringValue("test-string")));
+    }
+
+    @Test
+    public void buildAbstractWithFlatten() {
+        StaticTableSchema<FakeMappedItem> tableSchema =
+            StaticTableSchema.builder(FakeMappedItem.class)
+                             .flatten(FAKE_DOCUMENT_TABLE_SCHEMA,
+                                      FakeMappedItem::getAFakeDocument,
+                                      FakeMappedItem::setAFakeDocument)
+                             .build();
+
+        FakeDocument document = FakeDocument.of("test-string", null);
+        FakeMappedItem item = FakeMappedItem.builder().aFakeDocument(document).build();
+
+        assertThat(tableSchema.itemToMap(item, true),
+                   is(singletonMap("documentString", AttributeValue.builder().s("test-string").build())));
+    }
+
+    @Test
+    public void buildAbstractExtends() {
+        StaticTableSchema<FakeAbstractSuperclass> superclassTableSchema =
+            StaticTableSchema.builder(FakeAbstractSuperclass.class)
+                             .addAttribute(String.class, a -> a.name("aString")
+                                                               .getter(FakeAbstractSuperclass::getAString)
+                                                               .setter(FakeAbstractSuperclass::setAString))
+                             .build();
+
+        StaticTableSchema<FakeAbstractSubclass> subclassTableSchema =
+            StaticTableSchema.builder(FakeAbstractSubclass.class)
+                             .extend(superclassTableSchema)
+                             .build();
+
+        FakeAbstractSubclass item = new FakeAbstractSubclass();
+        item.setAString("test-string");
+
+        assertThat(subclassTableSchema.itemToMap(item, true),
+                   is(singletonMap("aString", AttributeValue.builder().s("test-string").build())));
+    }
+
+    @Test
+    public void buildAbstractTagWith() {
+
+        StaticTableSchema<FakeDocument> abstractTableSchema =
+            StaticTableSchema
+                .builder(FakeDocument.class)
+                .tags(new TestStaticTableTag())
+                .build();
+
+        assertThat(abstractTableSchema.tableMetadata().customMetadataObject(TABLE_TAG_KEY, String.class),
+                   is(Optional.of(TABLE_TAG_VALUE)));
+    }
+
+    @Test
+    public void buildConcreteTagWith() {
+
+        StaticTableSchema<FakeDocument> concreteTableSchema =
+            StaticTableSchema
+                .builder(FakeDocument.class)
+                .newItemSupplier(FakeDocument::new)
+                .tags(new TestStaticTableTag())
+                .build();
+
+        assertThat(concreteTableSchema.tableMetadata().customMetadataObject(TABLE_TAG_KEY, String.class),
+                   is(Optional.of(TABLE_TAG_VALUE)));
+    }
+
+    @Test
+    public void instantiateFlattenedAbstractClassShouldThrowException() {
+        StaticTableSchema<FakeAbstractSuperclass> superclassTableSchema =
+            StaticTableSchema.builder(FakeAbstractSuperclass.class)
+                             .addAttribute(String.class, a -> a.name("aString")
+                                                               .getter(FakeAbstractSuperclass::getAString)
+                                                               .setter(FakeAbstractSuperclass::setAString))
+                             .build();
+
+        exception.expect(IllegalArgumentException.class);
+        exception.expectMessage("abstract");
+        StaticTableSchema.builder(FakeBrokenClass.class)
+                         .newItemSupplier(FakeBrokenClass::new)
+                         .flatten(superclassTableSchema,
+                                  FakeBrokenClass::getAbstractObject,
+                                  FakeBrokenClass::setAbstractObject);
+    }
+
+    @Test
+    public void addSingleAttributeConverterProvider() {
+        when(provider1.converterFor(EnhancedType.of(String.class))).thenReturn(attributeConverter1);
+
+        StaticTableSchema<FakeMappedItem> tableSchema =
+            StaticTableSchema.builder(FakeMappedItem.class)
+                             .newItemSupplier(FakeMappedItem::new)
+                             .addAttribute(String.class, a -> a.name("aString")
+                                                               .getter(FakeMappedItem::getAString)
+                                                               .setter(FakeMappedItem::setAString))
+                             .attributeConverterProviders(provider1)
+                             .build();
+
+        assertThat(tableSchema.attributeConverterProvider(), is(provider1));
+    }
+
+    @Test
+    public void usesCustomAttributeConverterProvider() {
+        String originalString = "test-string";
+        String expectedString = "test-string-custom";
+
+        when(provider1.converterFor(EnhancedType.of(String.class))).thenReturn(attributeConverter1);
+        when(attributeConverter1.transformFrom(any())).thenReturn(AttributeValue.builder().s(expectedString).build());
+
+        StaticTableSchema<FakeMappedItem> tableSchema =
+            StaticTableSchema.builder(FakeMappedItem.class)
+                             .newItemSupplier(FakeMappedItem::new)
+                             .addAttribute(String.class, a -> a.name("aString")
+                                                               .getter(FakeMappedItem::getAString)
+                                                               .setter(FakeMappedItem::setAString))
+                             .attributeConverterProviders(provider1)
+                             .build();
+
+        Map<String, AttributeValue> resultMap =
+                tableSchema.itemToMap(FakeMappedItem.builder().aString(originalString).build(), false);
+        assertThat(resultMap.get("aString").s(), is(expectedString));
+    }
+
+    @Test
+    public void usesCustomAttributeConverterProviders() {
+        String originalString = "test-string";
+        String expectedString = "test-string-custom";
+
+        when(provider2.converterFor(EnhancedType.of(String.class))).thenReturn(attributeConverter2);
+        when(attributeConverter2.transformFrom(any())).thenReturn(AttributeValue.builder().s(expectedString).build());
+
+        StaticTableSchema<FakeMappedItem> tableSchema =
+            StaticTableSchema.builder(FakeMappedItem.class)
+                             .newItemSupplier(FakeMappedItem::new)
+                             .addAttribute(String.class, a -> a.name("aString")
+                                                               .getter(FakeMappedItem::getAString)
+                                                               .setter(FakeMappedItem::setAString))
+                             .attributeConverterProviders(provider1, provider2)
+                             .build();
+
+        Map<String, AttributeValue> resultMap =
+                tableSchema.itemToMap(FakeMappedItem.builder().aString(originalString).build(), false);
+        assertThat(resultMap.get("aString").s(), is(expectedString));
+    }
+
+    @Test
+    public void noConverterProvider_throwsException_whenMissingAttributeConverters() {
+        exception.expect(NullPointerException.class);
+
+        StaticTableSchema<FakeMappedItem> tableSchema =
+                StaticTableSchema.builder(FakeMappedItem.class)
+                        .newItemSupplier(FakeMappedItem::new)
+                        .addAttribute(String.class, a -> a.name("aString")
+                                .getter(FakeMappedItem::getAString)
+                                .setter(FakeMappedItem::setAString))
+                        .attributeConverterProviders(Collections.emptyList())
+                        .build();
+    }
+
+    @Test
+    public void noConverterProvider_handlesCorrectly_whenAttributeConvertersAreSupplied() {
+        String originalString = "test-string";
+        String expectedString = "test-string-custom";
+
+        when(attributeConverter1.transformFrom(any())).thenReturn(AttributeValue.builder().s(expectedString).build());
+
+        StaticTableSchema<FakeMappedItem> tableSchema =
+                StaticTableSchema.builder(FakeMappedItem.class)
+                        .newItemSupplier(FakeMappedItem::new)
+                        .addAttribute(String.class, a -> a.name("aString")
+                                .getter(FakeMappedItem::getAString)
+                                .setter(FakeMappedItem::setAString)
+                                .attributeConverter(attributeConverter1))
+                        .attributeConverterProviders(Collections.emptyList())
+                        .build();
+
+        Map<String, AttributeValue> resultMap = tableSchema.itemToMap(FakeMappedItem.builder().aString(originalString).build(),
+                false);
+        assertThat(resultMap.get("aString").s(), is(expectedString));
+    }
+
+    private <R> void verifyAttribute(EnhancedType<R> attributeType,
+                                     Consumer<StaticAttribute.Builder<FakeMappedItem, R>> staticAttribute,
+                                     FakeMappedItem fakeMappedItem,
+                                     AttributeValue attributeValue) {
+
+        StaticTableSchema<FakeMappedItem> tableSchema = StaticTableSchema.builder(FakeMappedItem.class)
+                                                                         .newItemSupplier(FakeMappedItem::new)
+                                                                         .addAttribute(attributeType, staticAttribute)
+                                                                         .build();
+        Map<String, AttributeValue> expectedMap = singletonMap("value", attributeValue);
+
+        Map<String, AttributeValue> resultMap = tableSchema.itemToMap(fakeMappedItem, false);
+        assertThat(resultMap, is(expectedMap));
+
+        FakeMappedItem resultItem = tableSchema.mapToItem(expectedMap);
+        assertThat(resultItem, is(fakeMappedItem));
+    }
+
+    private <R> void verifyNullAttribute(EnhancedType<R> attributeType,
+                                         Consumer<StaticAttribute.Builder<FakeMappedItem, R>> staticAttribute,
+                                         FakeMappedItem fakeMappedItem) {
+
+        StaticTableSchema<FakeMappedItem> tableSchema = StaticTableSchema.builder(FakeMappedItem.class)
+                                                                         .newItemSupplier(FakeMappedItem::new)
+                                                                         .addAttribute(attributeType, staticAttribute)
+                                                                         .build();
+        Map<String, AttributeValue> expectedMap = singletonMap("value", nullAttributeValue());
+
+        Map<String, AttributeValue> resultMap = tableSchema.itemToMap(fakeMappedItem, false);
+        assertThat(resultMap, is(expectedMap));
+
+        FakeMappedItem resultItem = tableSchema.mapToItem(expectedMap);
+        assertThat(resultItem, is(nullValue()));
+    }
+
+    private <R> void verifyNullableAttribute(EnhancedType<R> attributeType,
+                                             Consumer<StaticAttribute.Builder<FakeMappedItem, R>> staticAttribute,
+                                             FakeMappedItem fakeMappedItem,
+                                             AttributeValue attributeValue) {
+
+        verifyAttribute(attributeType, staticAttribute, fakeMappedItem, attributeValue);
+        verifyNullAttribute(attributeType, staticAttribute, FakeMappedItem.builder().build());
+    }
+}
+
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/testbeans/AbstractBean.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/testbeans/AbstractBean.java
new file mode 100644
index 000000000000..e22a846f3ce8
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/testbeans/AbstractBean.java
@@ -0,0 +1,30 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.mapper.testbeans;
+
+import software.amazon.awssdk.enhanced.dynamodb.mapper.annotations.DynamoDbBean;
+
+@DynamoDbBean
+public class AbstractBean {
+    private String attribute2;
+
+    public String getAttribute2() {
+        return attribute2;
+    }
+    public void setAttribute2(String attribute2) {
+        this.attribute2 = attribute2;
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/testbeans/AttributeConverterBean.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/testbeans/AttributeConverterBean.java
new file mode 100644
index 000000000000..3f27afd6173f
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/testbeans/AttributeConverterBean.java
@@ -0,0 +1,130 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.mapper.testbeans;
+
+import java.util.Objects;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeValueType;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.EnhancedAttributeValue;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.annotations.DynamoDbBean;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.annotations.DynamoDbConvertedBy;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.annotations.DynamoDbPartitionKey;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+
+@DynamoDbBean
+public class AttributeConverterBean {
+    private String id;
+
+    @DynamoDbPartitionKey
+    public String getId() {
+        return this.id;
+    }
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    private AttributeItem attributeItem;
+
+    @DynamoDbConvertedBy(CustomAttributeConverter.class)
+    public AttributeItem getAttributeItem() {
+        return attributeItem;
+    }
+    public void setAttributeItem(AttributeItem attributeItem) {
+        this.attributeItem = attributeItem;
+    }
+
+    private Integer integerAttribute;
+    public Integer getIntegerAttribute() {
+        return integerAttribute;
+    }
+    public void setIntegerAttribute(Integer integerAttribute) {
+        this.integerAttribute = integerAttribute;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        AttributeConverterBean that = (AttributeConverterBean) o;
+        return Objects.equals(id, that.id) &&
+                Objects.equals(integerAttribute, that.integerAttribute) &&
+                Objects.equals(attributeItem, that.attributeItem);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(id, integerAttribute, attributeItem);
+    }
+
+    public static class CustomAttributeConverter implements AttributeConverter<AttributeItem> {
+
+        public CustomAttributeConverter() {
+        }
+
+        @Override
+        public AttributeValue transformFrom(AttributeItem input) {
+            return EnhancedAttributeValue.fromString(input.getInnerValue()).toAttributeValue();
+        }
+
+        @Override
+        public AttributeItem transformTo(AttributeValue input) {
+            return new AttributeItem(input.s());
+        }
+
+        @Override
+        public EnhancedType<AttributeItem> type() {
+            return EnhancedType.of(AttributeItem.class);
+        }
+
+        @Override
+        public AttributeValueType attributeValueType() {
+            return AttributeValueType.S;
+        }
+    }
+
+    public static class AttributeItem {
+        private String innerValue;
+
+        public AttributeItem() {
+        }
+
+        AttributeItem(String value) {
+            innerValue = value;
+        }
+
+        public String getInnerValue() {
+            return innerValue;
+        }
+
+        public void setInnerValue(String innerValue) {
+            this.innerValue = innerValue;
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) return true;
+            if (o == null || getClass() != o.getClass()) return false;
+            AttributeItem that = (AttributeItem) o;
+            return Objects.equals(innerValue, that.innerValue);
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(innerValue);
+        }
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/testbeans/AttributeConverterNoConstructorBean.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/testbeans/AttributeConverterNoConstructorBean.java
new file mode 100644
index 000000000000..5881fbfaf3b3
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/testbeans/AttributeConverterNoConstructorBean.java
@@ -0,0 +1,63 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.mapper.testbeans;
+
+import software.amazon.awssdk.enhanced.dynamodb.AttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeValueType;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.annotations.DynamoDbBean;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.annotations.DynamoDbConvertedBy;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+
+@DynamoDbBean
+public class AttributeConverterNoConstructorBean extends AbstractBean {
+
+    private String id;
+
+    @DynamoDbConvertedBy(AttributeConverterNoConstructorBean.CustomAttributeConverter.class)
+    public String getId() {
+        return this.id;
+    }
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public static class CustomAttributeConverter implements AttributeConverter {
+
+        private CustomAttributeConverter() {
+        }
+
+        @Override
+        public AttributeValue transformFrom(Object input) {
+            return null;
+        }
+
+        @Override
+        public Object transformTo(AttributeValue input) {
+            return null;
+        }
+
+        @Override
+        public EnhancedType type() {
+            return null;
+        }
+
+        @Override
+        public AttributeValueType attributeValueType() {
+            return null;
+        }
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/testbeans/CommonTypesBean.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/testbeans/CommonTypesBean.java
new file mode 100644
index 000000000000..d9d1010b656b
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/testbeans/CommonTypesBean.java
@@ -0,0 +1,128 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.mapper.testbeans;
+
+import java.util.Objects;
+import software.amazon.awssdk.core.SdkBytes;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.annotations.DynamoDbBean;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.annotations.DynamoDbPartitionKey;
+
+@DynamoDbBean
+public class CommonTypesBean {
+    private String id;
+    private Boolean booleanAttribute;
+    private Integer integerAttribute;
+    private Long longAttribute;
+    private Short shortAttribute;
+    private Byte byteAttribute;
+    private Double doubleAttribute;
+    private Float floatAttribute;
+    private SdkBytes binaryAttribute;
+
+    @DynamoDbPartitionKey
+    public String getId() {
+        return this.id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public Boolean getBooleanAttribute() {
+        return booleanAttribute;
+    }
+
+    public void setBooleanAttribute(Boolean booleanAttribute) {
+        this.booleanAttribute = booleanAttribute;
+    }
+
+    public Integer getIntegerAttribute() {
+        return integerAttribute;
+    }
+
+    public void setIntegerAttribute(Integer integerAttribute) {
+        this.integerAttribute = integerAttribute;
+    }
+
+    public Long getLongAttribute() {
+        return longAttribute;
+    }
+
+    public void setLongAttribute(Long longAttribute) {
+        this.longAttribute = longAttribute;
+    }
+
+    public Short getShortAttribute() {
+        return shortAttribute;
+    }
+
+    public void setShortAttribute(Short shortAttribute) {
+        this.shortAttribute = shortAttribute;
+    }
+
+    public Byte getByteAttribute() {
+        return byteAttribute;
+    }
+
+    public void setByteAttribute(Byte byteAttribute) {
+        this.byteAttribute = byteAttribute;
+    }
+
+    public Double getDoubleAttribute() {
+        return doubleAttribute;
+    }
+
+    public void setDoubleAttribute(Double doubleAttribute) {
+        this.doubleAttribute = doubleAttribute;
+    }
+
+    public Float getFloatAttribute() {
+        return floatAttribute;
+    }
+
+    public void setFloatAttribute(Float floatAttribute) {
+        this.floatAttribute = floatAttribute;
+    }
+
+    public SdkBytes getBinaryAttribute() {
+        return binaryAttribute;
+    }
+
+    public void setBinaryAttribute(SdkBytes binaryAttribute) {
+        this.binaryAttribute = binaryAttribute;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        CommonTypesBean that = (CommonTypesBean) o;
+        return Objects.equals(id, that.id) &&
+            Objects.equals(booleanAttribute, that.booleanAttribute) &&
+            Objects.equals(integerAttribute, that.integerAttribute) &&
+            Objects.equals(longAttribute, that.longAttribute) &&
+            Objects.equals(shortAttribute, that.shortAttribute) &&
+            Objects.equals(byteAttribute, that.byteAttribute) &&
+            Objects.equals(doubleAttribute, that.doubleAttribute) &&
+            Objects.equals(floatAttribute, that.floatAttribute) &&
+            Objects.equals(binaryAttribute, that.binaryAttribute);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(id, booleanAttribute, integerAttribute, longAttribute, shortAttribute, byteAttribute, doubleAttribute, floatAttribute, binaryAttribute);
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/testbeans/DocumentBean.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/testbeans/DocumentBean.java
new file mode 100644
index 000000000000..344323435b7f
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/testbeans/DocumentBean.java
@@ -0,0 +1,68 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.mapper.testbeans;
+
+import java.util.List;
+import java.util.Map;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.annotations.DynamoDbBean;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.annotations.DynamoDbPartitionKey;
+
+@DynamoDbBean
+public class DocumentBean {
+    private String id;
+    private String attribute1;
+    private AbstractBean abstractBean;
+    private List<AbstractBean> abstractBeanList;
+    private Map<String, AbstractBean> abstractBeanMap;
+
+    @DynamoDbPartitionKey
+    public String getId() {
+        return this.id;
+    }
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getAttribute1() {
+        return attribute1;
+    }
+    public void setAttribute1(String attribute1) {
+        this.attribute1 = attribute1;
+    }
+
+    public AbstractBean getAbstractBean() {
+        return abstractBean;
+    }
+    public void setAbstractBean(AbstractBean abstractBean) {
+        this.abstractBean = abstractBean;
+    }
+
+    public List<AbstractBean> getAbstractBeanList() {
+        return abstractBeanList;
+    }
+
+    public void setAbstractBeanList(List<AbstractBean> abstractBeanList) {
+        this.abstractBeanList = abstractBeanList;
+    }
+
+    public Map<String, AbstractBean> getAbstractBeanMap() {
+        return abstractBeanMap;
+    }
+
+    public void setAbstractBeanMap(Map<String, AbstractBean> abstractBeanMap) {
+        this.abstractBeanMap = abstractBeanMap;
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/testbeans/EmptyConverterProvidersInvalidBean.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/testbeans/EmptyConverterProvidersInvalidBean.java
new file mode 100644
index 000000000000..60c2d2d9fc9c
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/testbeans/EmptyConverterProvidersInvalidBean.java
@@ -0,0 +1,90 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.mapper.testbeans;
+
+import java.util.Objects;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeValueType;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.EnhancedAttributeValue;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.annotations.DynamoDbBean;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.annotations.DynamoDbConvertedBy;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.annotations.DynamoDbPartitionKey;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+
+@DynamoDbBean(converterProviders = {})
+public class EmptyConverterProvidersInvalidBean {
+    private String id;
+    private Integer integerAttribute;
+
+    @DynamoDbPartitionKey
+    @DynamoDbConvertedBy(CustomStringAttributeConverter.class)
+    public String getId() {
+        return this.id;
+    }
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public Integer getIntegerAttribute() {
+        return integerAttribute;
+    }
+    public void setIntegerAttribute(Integer integerAttribute) {
+        this.integerAttribute = integerAttribute;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        EmptyConverterProvidersInvalidBean that = (EmptyConverterProvidersInvalidBean) o;
+        return Objects.equals(id, that.id) &&
+            Objects.equals(integerAttribute, that.integerAttribute);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(id, integerAttribute);
+    }
+
+    public static class CustomStringAttributeConverter implements AttributeConverter<String> {
+        final static String DEFAULT_SUFFIX = "-custom";
+
+        public CustomStringAttributeConverter() {
+        }
+
+        @Override
+        public AttributeValue transformFrom(String input) {
+            return EnhancedAttributeValue.fromString(input + DEFAULT_SUFFIX).toAttributeValue();
+        }
+
+        @Override
+        public String transformTo(AttributeValue input) {
+            return input.s();
+        }
+
+        @Override
+        public EnhancedType<String> type() {
+            return EnhancedType.of(String.class);
+        }
+
+        @Override
+        public AttributeValueType attributeValueType() {
+            return AttributeValueType.S;
+        }
+    }
+
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/testbeans/EmptyConverterProvidersValidBean.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/testbeans/EmptyConverterProvidersValidBean.java
new file mode 100644
index 000000000000..ceee30289a91
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/testbeans/EmptyConverterProvidersValidBean.java
@@ -0,0 +1,119 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.mapper.testbeans;
+
+import java.util.Objects;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeValueType;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.EnhancedAttributeValue;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.string.IntegerStringConverter;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.annotations.DynamoDbBean;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.annotations.DynamoDbConvertedBy;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.annotations.DynamoDbPartitionKey;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+
+@DynamoDbBean(converterProviders = {})
+public class EmptyConverterProvidersValidBean {
+    private String id;
+    private Integer integerAttribute;
+
+    @DynamoDbPartitionKey
+    @DynamoDbConvertedBy(CustomStringAttributeConverter.class)
+    public String getId() {
+        return this.id;
+    }
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    @DynamoDbConvertedBy(CustomIntegerAttributeConverter.class)
+    public Integer getIntegerAttribute() {
+        return integerAttribute;
+    }
+    public void setIntegerAttribute(Integer integerAttribute) {
+        this.integerAttribute = integerAttribute;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        EmptyConverterProvidersValidBean that = (EmptyConverterProvidersValidBean) o;
+        return Objects.equals(id, that.id) &&
+            Objects.equals(integerAttribute, that.integerAttribute);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(id, integerAttribute);
+    }
+
+    public static class CustomStringAttributeConverter implements AttributeConverter<String> {
+        final static String DEFAULT_SUFFIX = "-custom";
+
+        public CustomStringAttributeConverter() {
+        }
+
+        @Override
+        public AttributeValue transformFrom(String input) {
+            return EnhancedAttributeValue.fromString(input + DEFAULT_SUFFIX).toAttributeValue();
+        }
+
+        @Override
+        public String transformTo(AttributeValue input) {
+            return input.s();
+        }
+
+        @Override
+        public EnhancedType<String> type() {
+            return EnhancedType.of(String.class);
+        }
+
+        @Override
+        public AttributeValueType attributeValueType() {
+            return AttributeValueType.S;
+        }
+    }
+
+    public static class CustomIntegerAttributeConverter implements AttributeConverter<Integer> {
+        final static Integer DEFAULT_INCREMENT = 10;
+
+        public CustomIntegerAttributeConverter() {
+        }
+
+        @Override
+        public AttributeValue transformFrom(Integer input) {
+            return EnhancedAttributeValue.fromNumber(IntegerStringConverter.create().toString(input + DEFAULT_INCREMENT))
+                    .toAttributeValue();
+        }
+
+        @Override
+        public Integer transformTo(AttributeValue input) {
+            return Integer.valueOf(input.n());
+        }
+
+        @Override
+        public EnhancedType<Integer> type() {
+            return EnhancedType.of(Integer.class);
+        }
+
+        @Override
+        public AttributeValueType attributeValueType() {
+            return AttributeValueType.N;
+        }
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/testbeans/EnumBean.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/testbeans/EnumBean.java
new file mode 100644
index 000000000000..a9684141751c
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/testbeans/EnumBean.java
@@ -0,0 +1,78 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.mapper.testbeans;
+
+import java.util.List;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.annotations.DynamoDbBean;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.annotations.DynamoDbPartitionKey;
+
+@DynamoDbBean
+public class EnumBean {
+    private String id;
+    private TestEnum testEnum;
+    private List<TestEnum> testEnumList;
+
+    @DynamoDbPartitionKey
+    public String getId() {
+        return this.id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public TestEnum getTestEnum() {
+        return testEnum;
+    }
+
+    public void setTestEnum(TestEnum testEnum) {
+        this.testEnum = testEnum;
+    }
+
+    public List<TestEnum> getTestEnumList() {
+        return testEnumList;
+    }
+
+    public void setTestEnumList(List<TestEnum> testEnumList) {
+        this.testEnumList = testEnumList;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        EnumBean enumBean = (EnumBean) o;
+
+        if (id != null ? !id.equals(enumBean.id) : enumBean.id != null) return false;
+        if (testEnum != enumBean.testEnum) return false;
+        return testEnumList != null ? testEnumList.equals(enumBean.testEnumList) : enumBean.testEnumList == null;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = id != null ? id.hashCode() : 0;
+        result = 31 * result + (testEnum != null ? testEnum.hashCode() : 0);
+        result = 31 * result + (testEnumList != null ? testEnumList.hashCode() : 0);
+        return result;
+    }
+
+    public enum TestEnum {
+        ONE,
+        TWO,
+        THREE;
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/testbeans/ExtendedBean.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/testbeans/ExtendedBean.java
new file mode 100644
index 000000000000..246a35c3852f
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/testbeans/ExtendedBean.java
@@ -0,0 +1,40 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.mapper.testbeans;
+
+import software.amazon.awssdk.enhanced.dynamodb.mapper.annotations.DynamoDbBean;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.annotations.DynamoDbPartitionKey;
+
+@DynamoDbBean
+public class ExtendedBean extends AbstractBean {
+    private String id;
+    private String attribute1;
+
+    @DynamoDbPartitionKey
+    public String getId() {
+        return this.id;
+    }
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getAttribute1() {
+        return attribute1;
+    }
+    public void setAttribute1(String attribute1) {
+        this.attribute1 = attribute1;
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/testbeans/FlattenedBean.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/testbeans/FlattenedBean.java
new file mode 100644
index 000000000000..2452677e263d
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/testbeans/FlattenedBean.java
@@ -0,0 +1,50 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.mapper.testbeans;
+
+import software.amazon.awssdk.enhanced.dynamodb.mapper.annotations.DynamoDbBean;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.annotations.DynamoDbFlatten;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.annotations.DynamoDbPartitionKey;
+
+@DynamoDbBean
+public class FlattenedBean {
+    private String id;
+    private String attribute1;
+    private AbstractBean abstractBean;
+
+    @DynamoDbPartitionKey
+    public String getId() {
+        return this.id;
+    }
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getAttribute1() {
+        return attribute1;
+    }
+    public void setAttribute1(String attribute1) {
+        this.attribute1 = attribute1;
+    }
+
+    @DynamoDbFlatten(dynamoDbBeanClass = AbstractBean.class)
+    public AbstractBean getAbstractBean() {
+        return abstractBean;
+    }
+    public void setAbstractBean(AbstractBean abstractBean) {
+        this.abstractBean = abstractBean;
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/testbeans/IgnoredAttributeBean.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/testbeans/IgnoredAttributeBean.java
new file mode 100644
index 000000000000..bae02ad276f8
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/testbeans/IgnoredAttributeBean.java
@@ -0,0 +1,44 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.mapper.testbeans;
+
+import software.amazon.awssdk.enhanced.dynamodb.mapper.annotations.DynamoDbBean;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.annotations.DynamoDbIgnore;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.annotations.DynamoDbPartitionKey;
+
+@DynamoDbBean
+public class IgnoredAttributeBean {
+    private String id;
+    private Integer integerAttribute;
+
+    @DynamoDbPartitionKey
+    public String getId() {
+        return this.id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    @DynamoDbIgnore
+    public Integer getIntegerAttribute() {
+        return integerAttribute;
+    }
+
+    public void setIntegerAttribute(Integer integerAttribute) {
+        this.integerAttribute = integerAttribute;
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/testbeans/InvalidBean.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/testbeans/InvalidBean.java
new file mode 100644
index 000000000000..495b9dc45437
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/testbeans/InvalidBean.java
@@ -0,0 +1,30 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.mapper.testbeans;
+
+import software.amazon.awssdk.enhanced.dynamodb.mapper.annotations.DynamoDbPartitionKey;
+
+public class InvalidBean {
+    private String id;
+
+    @DynamoDbPartitionKey
+    public String getId() {
+        return this.id;
+    }
+    public void setId(String id) {
+        this.id = id;
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/testbeans/ListBean.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/testbeans/ListBean.java
new file mode 100644
index 000000000000..044a95a970e4
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/testbeans/ListBean.java
@@ -0,0 +1,68 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.mapper.testbeans;
+
+import java.util.List;
+import java.util.Objects;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.annotations.DynamoDbBean;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.annotations.DynamoDbPartitionKey;
+
+@DynamoDbBean
+public class ListBean {
+    private String id;
+    private List<String> stringList;
+    private List<List<String>> stringListList;
+
+    @DynamoDbPartitionKey
+    public String getId() {
+        return this.id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public List<String> getStringList() {
+        return stringList;
+    }
+
+    public void setStringList(List<String> stringList) {
+        this.stringList = stringList;
+    }
+
+    public List<List<String>> getStringListList() {
+        return stringListList;
+    }
+
+    public void setStringListList(List<List<String>> stringListList) {
+        this.stringListList = stringListList;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        ListBean listBean = (ListBean) o;
+        return Objects.equals(id, listBean.id) &&
+            Objects.equals(stringList, listBean.stringList) &&
+            Objects.equals(stringListList, listBean.stringListList);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(id, stringList, stringListList);
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/testbeans/MapBean.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/testbeans/MapBean.java
new file mode 100644
index 000000000000..6dfa67792d19
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/testbeans/MapBean.java
@@ -0,0 +1,68 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.mapper.testbeans;
+
+import java.util.Map;
+import java.util.Objects;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.annotations.DynamoDbBean;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.annotations.DynamoDbPartitionKey;
+
+@DynamoDbBean
+public class MapBean {
+    private String id;
+    private Map<String, String> stringMap;
+    private Map<String, Map<String, String>> nestedStringMap;
+
+    @DynamoDbPartitionKey
+    public String getId() {
+        return this.id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public Map<String, String> getStringMap() {
+        return stringMap;
+    }
+
+    public void setStringMap(Map<String, String> stringMap) {
+        this.stringMap = stringMap;
+    }
+
+    public Map<String, Map<String, String>> getNestedStringMap() {
+        return nestedStringMap;
+    }
+
+    public void setNestedStringMap(Map<String, Map<String, String>> nestedStringMap) {
+        this.nestedStringMap = nestedStringMap;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        MapBean mapBean = (MapBean) o;
+        return Objects.equals(id, mapBean.id) &&
+            Objects.equals(stringMap, mapBean.stringMap) &&
+            Objects.equals(nestedStringMap, mapBean.nestedStringMap);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(id, stringMap, nestedStringMap);
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/testbeans/MultipleConverterProvidersBean.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/testbeans/MultipleConverterProvidersBean.java
new file mode 100644
index 000000000000..b3a3578c299f
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/testbeans/MultipleConverterProvidersBean.java
@@ -0,0 +1,139 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.mapper.testbeans;
+
+import java.util.Map;
+import java.util.Objects;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeConverterProvider;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeValueType;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.EnhancedAttributeValue;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.string.IntegerStringConverter;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.annotations.DynamoDbBean;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.annotations.DynamoDbPartitionKey;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+import software.amazon.awssdk.utils.ImmutableMap;
+
+@DynamoDbBean(converterProviders = {
+        MultipleConverterProvidersBean.FirstAttributeConverterProvider.class,
+        MultipleConverterProvidersBean.SecondAttributeConverterProvider.class})
+public class MultipleConverterProvidersBean {
+    private String id;
+    private Integer integerAttribute;
+
+    @DynamoDbPartitionKey
+    public String getId() {
+        return this.id;
+    }
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public Integer getIntegerAttribute() {
+        return integerAttribute;
+    }
+    public void setIntegerAttribute(Integer integerAttribute) {
+        this.integerAttribute = integerAttribute;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        MultipleConverterProvidersBean that = (MultipleConverterProvidersBean) o;
+        return Objects.equals(id, that.id) &&
+            Objects.equals(integerAttribute, that.integerAttribute);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(id, integerAttribute);
+    }
+
+    public static class FirstAttributeConverterProvider implements AttributeConverterProvider {
+        @SuppressWarnings("unchecked")
+        @Override
+        public <T> AttributeConverter<T> converterFor(EnhancedType<T> enhancedType) {
+            return null;
+        }
+    }
+
+    public static class SecondAttributeConverterProvider implements AttributeConverterProvider {
+
+        private final Map<EnhancedType<?>, AttributeConverter<?>> converterCache = ImmutableMap.of(
+                EnhancedType.of(String.class), new CustomStringAttributeConverter(),
+                EnhancedType.of(Integer.class), new CustomIntegerAttributeConverter()
+        );
+
+        @SuppressWarnings("unchecked")
+        @Override
+        public <T> AttributeConverter<T> converterFor(EnhancedType<T> enhancedType) {
+            return (AttributeConverter<T>) converterCache.get(enhancedType);
+        }
+    }
+
+    private static class CustomStringAttributeConverter implements AttributeConverter<String> {
+
+        final static String DEFAULT_SUFFIX = "-custom";
+
+        @Override
+        public AttributeValue transformFrom(String input) {
+            return EnhancedAttributeValue.fromString(input + DEFAULT_SUFFIX).toAttributeValue();
+        }
+
+        @Override
+        public String transformTo(AttributeValue input) {
+            return input.s();
+        }
+
+        @Override
+        public EnhancedType<String> type() {
+            return EnhancedType.of(String.class);
+        }
+
+        @Override
+        public AttributeValueType attributeValueType() {
+            return AttributeValueType.S;
+        }
+    }
+
+    private static class CustomIntegerAttributeConverter implements AttributeConverter<Integer> {
+
+        final static Integer DEFAULT_INCREMENT = 10;
+
+        @Override
+        public AttributeValue transformFrom(Integer input) {
+            return EnhancedAttributeValue.fromNumber(IntegerStringConverter.create().toString(input + DEFAULT_INCREMENT))
+                                         .toAttributeValue();
+        }
+
+        @Override
+        public Integer transformTo(AttributeValue input) {
+            return Integer.valueOf(input.n());
+        }
+
+        @Override
+        public EnhancedType<Integer> type() {
+            return EnhancedType.of(Integer.class);
+        }
+
+        @Override
+        public AttributeValueType attributeValueType() {
+            return AttributeValueType.N;
+        }
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/testbeans/NoConstructorConverterProvidersBean.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/testbeans/NoConstructorConverterProvidersBean.java
new file mode 100644
index 000000000000..72212fe4a2d5
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/testbeans/NoConstructorConverterProvidersBean.java
@@ -0,0 +1,37 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.mapper.testbeans;
+
+import software.amazon.awssdk.enhanced.dynamodb.AttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeConverterProvider;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.annotations.DynamoDbBean;
+
+@DynamoDbBean(converterProviders = NoConstructorConverterProvidersBean.CustomAttributeConverterProvider.class)
+public class NoConstructorConverterProvidersBean extends AbstractBean {
+
+    public static class CustomAttributeConverterProvider implements AttributeConverterProvider {
+
+        private CustomAttributeConverterProvider() {
+        }
+
+        @SuppressWarnings("unchecked")
+        @Override
+        public <T> AttributeConverter<T> converterFor(EnhancedType<T> enhancedType) {
+            return null;
+        }
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/testbeans/ParameterizedAbstractBean.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/testbeans/ParameterizedAbstractBean.java
new file mode 100644
index 000000000000..7fc7b22fa0b3
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/testbeans/ParameterizedAbstractBean.java
@@ -0,0 +1,30 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.mapper.testbeans;
+
+import software.amazon.awssdk.enhanced.dynamodb.mapper.annotations.DynamoDbBean;
+
+@DynamoDbBean
+public class ParameterizedAbstractBean<T> {
+    private String attribute2;
+
+    public String getAttribute2() {
+        return attribute2;
+    }
+    public void setAttribute2(String attribute2) {
+        this.attribute2 = attribute2;
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/testbeans/ParameterizedDocumentBean.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/testbeans/ParameterizedDocumentBean.java
new file mode 100644
index 000000000000..70ee1f915ae2
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/testbeans/ParameterizedDocumentBean.java
@@ -0,0 +1,68 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.mapper.testbeans;
+
+import java.util.List;
+import java.util.Map;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.annotations.DynamoDbBean;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.annotations.DynamoDbPartitionKey;
+
+@DynamoDbBean
+public class ParameterizedDocumentBean {
+    private String id;
+    private String attribute1;
+    private ParameterizedAbstractBean<String> abstractBean;
+    private List<ParameterizedAbstractBean<String>> abstractBeanList;
+    private Map<String, ParameterizedAbstractBean<String>> abstractBeanMap;
+
+    @DynamoDbPartitionKey
+    public String getId() {
+        return this.id;
+    }
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getAttribute1() {
+        return attribute1;
+    }
+    public void setAttribute1(String attribute1) {
+        this.attribute1 = attribute1;
+    }
+
+    public ParameterizedAbstractBean<String> getAbstractBean() {
+        return abstractBean;
+    }
+    public void setAbstractBean(ParameterizedAbstractBean<String> abstractBean) {
+        this.abstractBean = abstractBean;
+    }
+
+    public List<ParameterizedAbstractBean<String>> getAbstractBeanList() {
+        return abstractBeanList;
+    }
+
+    public void setAbstractBeanList(List<ParameterizedAbstractBean<String>> abstractBeanList) {
+        this.abstractBeanList = abstractBeanList;
+    }
+
+    public Map<String, ParameterizedAbstractBean<String>> getAbstractBeanMap() {
+        return abstractBeanMap;
+    }
+
+    public void setAbstractBeanMap(Map<String, ParameterizedAbstractBean<String>> abstractBeanMap) {
+        this.abstractBeanMap = abstractBeanMap;
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/testbeans/PrimitiveTypesBean.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/testbeans/PrimitiveTypesBean.java
new file mode 100644
index 000000000000..cdb2279fe448
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/testbeans/PrimitiveTypesBean.java
@@ -0,0 +1,116 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.mapper.testbeans;
+
+import java.util.Objects;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.annotations.DynamoDbBean;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.annotations.DynamoDbPartitionKey;
+
+@DynamoDbBean
+public class PrimitiveTypesBean {
+    private String id;
+    private boolean booleanAttribute;
+    private int integerAttribute;
+    private long longAttribute;
+    private short shortAttribute;
+    private byte byteAttribute;
+    private double doubleAttribute;
+    private float floatAttribute;
+
+    @DynamoDbPartitionKey
+    public String getId() {
+        return this.id;
+    }
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public boolean isBooleanAttribute() {
+        return booleanAttribute;
+    }
+
+    public void setBooleanAttribute(boolean booleanAttribute) {
+        this.booleanAttribute = booleanAttribute;
+    }
+
+    public int getIntegerAttribute() {
+        return integerAttribute;
+    }
+
+    public void setIntegerAttribute(int integerAttribute) {
+        this.integerAttribute = integerAttribute;
+    }
+
+    public long getLongAttribute() {
+        return longAttribute;
+    }
+
+    public void setLongAttribute(long longAttribute) {
+        this.longAttribute = longAttribute;
+    }
+
+    public short getShortAttribute() {
+        return shortAttribute;
+    }
+
+    public void setShortAttribute(short shortAttribute) {
+        this.shortAttribute = shortAttribute;
+    }
+
+    public byte getByteAttribute() {
+        return byteAttribute;
+    }
+
+    public void setByteAttribute(byte byteAttribute) {
+        this.byteAttribute = byteAttribute;
+    }
+
+    public double getDoubleAttribute() {
+        return doubleAttribute;
+    }
+
+    public void setDoubleAttribute(double doubleAttribute) {
+        this.doubleAttribute = doubleAttribute;
+    }
+
+    public float getFloatAttribute() {
+        return floatAttribute;
+    }
+
+    public void setFloatAttribute(float floatAttribute) {
+        this.floatAttribute = floatAttribute;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        PrimitiveTypesBean that = (PrimitiveTypesBean) o;
+        return booleanAttribute == that.booleanAttribute &&
+            integerAttribute == that.integerAttribute &&
+            longAttribute == that.longAttribute &&
+            shortAttribute == that.shortAttribute &&
+            byteAttribute == that.byteAttribute &&
+            Double.compare(that.doubleAttribute, doubleAttribute) == 0 &&
+            Float.compare(that.floatAttribute, floatAttribute) == 0 &&
+            Objects.equals(id, that.id);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(id, booleanAttribute, integerAttribute, longAttribute, shortAttribute, byteAttribute, doubleAttribute, floatAttribute);
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/testbeans/RemappedAttributeBean.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/testbeans/RemappedAttributeBean.java
new file mode 100644
index 000000000000..d1a019f79c3d
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/testbeans/RemappedAttributeBean.java
@@ -0,0 +1,34 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.mapper.testbeans;
+
+import software.amazon.awssdk.enhanced.dynamodb.mapper.annotations.DynamoDbAttribute;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.annotations.DynamoDbBean;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.annotations.DynamoDbPartitionKey;
+
+@DynamoDbBean
+public class RemappedAttributeBean {
+    private String id;
+
+    @DynamoDbPartitionKey
+    @DynamoDbAttribute("remappedAttribute")
+    public String getId() {
+        return this.id;
+    }
+    public void setId(String id) {
+        this.id = id;
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/testbeans/SecondaryIndexBean.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/testbeans/SecondaryIndexBean.java
new file mode 100644
index 000000000000..dc7cee1f0a9e
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/testbeans/SecondaryIndexBean.java
@@ -0,0 +1,57 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.mapper.testbeans;
+
+import software.amazon.awssdk.enhanced.dynamodb.mapper.annotations.DynamoDbBean;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.annotations.DynamoDbPartitionKey;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.annotations.DynamoDbSecondaryPartitionKey;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.annotations.DynamoDbSecondarySortKey;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.annotations.DynamoDbSortKey;
+
+@DynamoDbBean
+public class SecondaryIndexBean {
+    private String id;
+    private Integer sort;
+    private String attribute;
+
+    @DynamoDbPartitionKey
+    public String getId() {
+        return this.id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    @DynamoDbSortKey
+    @DynamoDbSecondaryPartitionKey(indexNames = "gsi")
+    public Integer getSort() {
+        return sort;
+    }
+
+    public void setSort(Integer sort) {
+        this.sort = sort;
+    }
+
+    @DynamoDbSecondarySortKey(indexNames = {"lsi", "gsi"})
+    public String getAttribute() {
+        return attribute;
+    }
+
+    public void setAttribute(String attribute) {
+        this.attribute = attribute;
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/testbeans/SetBean.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/testbeans/SetBean.java
new file mode 100644
index 000000000000..488cd45869fd
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/testbeans/SetBean.java
@@ -0,0 +1,127 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.mapper.testbeans;
+
+import java.util.Objects;
+import java.util.Set;
+import software.amazon.awssdk.core.SdkBytes;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.annotations.DynamoDbBean;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.annotations.DynamoDbPartitionKey;
+
+@DynamoDbBean
+public class SetBean {
+    private String id;
+    private Set<String> stringSet;
+    private Set<Integer> integerSet;
+    private Set<Long> longSet;
+    private Set<Short> shortSet;
+    private Set<Byte> byteSet;
+    private Set<Double> doubleSet;
+    private Set<Float> floatSet;
+    private Set<SdkBytes> binarySet;
+
+    @DynamoDbPartitionKey
+    public String getId() {
+        return this.id;
+    }
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public Set<String> getStringSet() {
+        return stringSet;
+    }
+    public void setStringSet(Set<String> stringSet) {
+        this.stringSet = stringSet;
+    }
+
+    public Set<Integer> getIntegerSet() {
+        return integerSet;
+    }
+
+    public void setIntegerSet(Set<Integer> integerSet) {
+        this.integerSet = integerSet;
+    }
+
+    public Set<Long> getLongSet() {
+        return longSet;
+    }
+
+    public void setLongSet(Set<Long> longSet) {
+        this.longSet = longSet;
+    }
+
+    public Set<Short> getShortSet() {
+        return shortSet;
+    }
+
+    public void setShortSet(Set<Short> shortSet) {
+        this.shortSet = shortSet;
+    }
+
+    public Set<Byte> getByteSet() {
+        return byteSet;
+    }
+
+    public void setByteSet(Set<Byte> byteSet) {
+        this.byteSet = byteSet;
+    }
+
+    public Set<Double> getDoubleSet() {
+        return doubleSet;
+    }
+
+    public void setDoubleSet(Set<Double> doubleSet) {
+        this.doubleSet = doubleSet;
+    }
+
+    public Set<Float> getFloatSet() {
+        return floatSet;
+    }
+
+    public void setFloatSet(Set<Float> floatSet) {
+        this.floatSet = floatSet;
+    }
+
+    public Set<SdkBytes> getBinarySet() {
+        return binarySet;
+    }
+
+    public void setBinarySet(Set<SdkBytes> binarySet) {
+        this.binarySet = binarySet;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        SetBean setBean = (SetBean) o;
+        return Objects.equals(id, setBean.id) &&
+            Objects.equals(stringSet, setBean.stringSet) &&
+            Objects.equals(integerSet, setBean.integerSet) &&
+            Objects.equals(longSet, setBean.longSet) &&
+            Objects.equals(shortSet, setBean.shortSet) &&
+            Objects.equals(byteSet, setBean.byteSet) &&
+            Objects.equals(doubleSet, setBean.doubleSet) &&
+            Objects.equals(floatSet, setBean.floatSet) &&
+            Objects.equals(binarySet, setBean.binarySet);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(id, stringSet, integerSet, longSet, shortSet, byteSet, doubleSet, floatSet, binarySet);
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/testbeans/SetterAnnotatedBean.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/testbeans/SetterAnnotatedBean.java
new file mode 100644
index 000000000000..985082eb40c7
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/testbeans/SetterAnnotatedBean.java
@@ -0,0 +1,44 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.mapper.testbeans;
+
+import software.amazon.awssdk.enhanced.dynamodb.mapper.annotations.DynamoDbBean;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.annotations.DynamoDbIgnore;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.annotations.DynamoDbPartitionKey;
+
+@DynamoDbBean
+public class SetterAnnotatedBean {
+    private String id;
+    private Integer integerAttribute;
+
+    public String getId() {
+        return this.id;
+    }
+
+    @DynamoDbPartitionKey
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public Integer getIntegerAttribute() {
+        return integerAttribute;
+    }
+
+    @DynamoDbIgnore
+    public void setIntegerAttribute(Integer integerAttribute) {
+        this.integerAttribute = integerAttribute;
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/testbeans/SimpleBean.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/testbeans/SimpleBean.java
new file mode 100644
index 000000000000..18942c1740a8
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/testbeans/SimpleBean.java
@@ -0,0 +1,55 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.mapper.testbeans;
+
+import java.util.Objects;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.annotations.DynamoDbBean;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.annotations.DynamoDbPartitionKey;
+
+@DynamoDbBean
+public class SimpleBean {
+    private String id;
+    private Integer integerAttribute;
+
+    @DynamoDbPartitionKey
+    public String getId() {
+        return this.id;
+    }
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public Integer getIntegerAttribute() {
+        return integerAttribute;
+    }
+    public void setIntegerAttribute(Integer integerAttribute) {
+        this.integerAttribute = integerAttribute;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        SimpleBean that = (SimpleBean) o;
+        return Objects.equals(id, that.id) &&
+            Objects.equals(integerAttribute, that.integerAttribute);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(id, integerAttribute);
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/testbeans/SingleConverterProvidersBean.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/testbeans/SingleConverterProvidersBean.java
new file mode 100644
index 000000000000..5e715b297e63
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/testbeans/SingleConverterProvidersBean.java
@@ -0,0 +1,129 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.mapper.testbeans;
+
+import java.util.Map;
+import java.util.Objects;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeConverterProvider;
+import software.amazon.awssdk.enhanced.dynamodb.AttributeValueType;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.EnhancedAttributeValue;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.string.IntegerStringConverter;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.annotations.DynamoDbBean;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.annotations.DynamoDbPartitionKey;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+import software.amazon.awssdk.utils.ImmutableMap;
+
+@DynamoDbBean(converterProviders = SingleConverterProvidersBean.CustomAttributeConverterProvider.class)
+public class SingleConverterProvidersBean {
+    private String id;
+    private Integer integerAttribute;
+
+    @DynamoDbPartitionKey
+    public String getId() {
+        return this.id;
+    }
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public Integer getIntegerAttribute() {
+        return integerAttribute;
+    }
+    public void setIntegerAttribute(Integer integerAttribute) {
+        this.integerAttribute = integerAttribute;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        SingleConverterProvidersBean that = (SingleConverterProvidersBean) o;
+        return Objects.equals(id, that.id) &&
+            Objects.equals(integerAttribute, that.integerAttribute);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(id, integerAttribute);
+    }
+
+    public static class CustomAttributeConverterProvider implements AttributeConverterProvider {
+
+        private final Map<EnhancedType<?>, AttributeConverter<?>> converterCache = ImmutableMap.of(
+            EnhancedType.of(String.class), new CustomStringAttributeConverter(),
+            EnhancedType.of(Integer.class), new CustomIntegerAttributeConverter()
+        );
+
+        @SuppressWarnings("unchecked")
+        @Override
+        public <T> AttributeConverter<T> converterFor(EnhancedType<T> enhancedType) {
+            return (AttributeConverter<T>) converterCache.get(enhancedType);
+        }
+    }
+
+    private static class CustomStringAttributeConverter implements AttributeConverter<String> {
+
+        final static String DEFAULT_SUFFIX = "-custom";
+
+        @Override
+        public AttributeValue transformFrom(String input) {
+            return EnhancedAttributeValue.fromString(input + DEFAULT_SUFFIX).toAttributeValue();
+        }
+
+        @Override
+        public String transformTo(AttributeValue input) {
+            return input.s();
+        }
+
+        @Override
+        public EnhancedType<String> type() {
+            return EnhancedType.of(String.class);
+        }
+
+        @Override
+        public AttributeValueType attributeValueType() {
+            return AttributeValueType.S;
+        }
+    }
+
+    private static class CustomIntegerAttributeConverter implements AttributeConverter<Integer> {
+
+        final static Integer DEFAULT_INCREMENT = 10;
+
+        @Override
+        public AttributeValue transformFrom(Integer input) {
+            return EnhancedAttributeValue.fromNumber(IntegerStringConverter.create().toString(input + DEFAULT_INCREMENT))
+                                         .toAttributeValue();
+        }
+
+        @Override
+        public Integer transformTo(AttributeValue input) {
+            return Integer.valueOf(input.n());
+        }
+
+        @Override
+        public EnhancedType<Integer> type() {
+            return EnhancedType.of(Integer.class);
+        }
+
+        @Override
+        public AttributeValueType attributeValueType() {
+            return AttributeValueType.N;
+        }
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/testbeans/SortKeyBean.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/testbeans/SortKeyBean.java
new file mode 100644
index 000000000000..80042fd74cae
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/testbeans/SortKeyBean.java
@@ -0,0 +1,44 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.mapper.testbeans;
+
+import software.amazon.awssdk.enhanced.dynamodb.mapper.annotations.DynamoDbBean;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.annotations.DynamoDbPartitionKey;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.annotations.DynamoDbSortKey;
+
+@DynamoDbBean
+public class SortKeyBean {
+    private String id;
+    private Integer sort;
+
+    @DynamoDbPartitionKey
+    public String getId() {
+        return this.id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    @DynamoDbSortKey
+    public Integer getSort() {
+        return sort;
+    }
+
+    public void setSort(Integer sort) {
+        this.sort = sort;
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mocktests/AsyncBatchGetItemTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mocktests/AsyncBatchGetItemTest.java
new file mode 100644
index 000000000000..b61b94c604bb
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mocktests/AsyncBatchGetItemTest.java
@@ -0,0 +1,125 @@
+/*
+ * Copyright 2010-2020 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.mocktests;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static software.amazon.awssdk.enhanced.dynamodb.functionaltests.LocalDynamoDbAsyncTestBase.drainPublisher;
+import static software.amazon.awssdk.enhanced.dynamodb.mapper.StaticAttributeTags.primaryPartitionKey;
+import static software.amazon.awssdk.enhanced.dynamodb.mocktests.BatchGetTestUtils.stubResponseWithUnprocessedKeys;
+import static software.amazon.awssdk.enhanced.dynamodb.mocktests.BatchGetTestUtils.stubSuccessfulResponse;
+
+import com.github.tomakehurst.wiremock.junit.WireMockRule;
+import java.net.URI;
+import java.util.List;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
+import software.amazon.awssdk.core.async.SdkPublisher;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbAsyncTable;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedAsyncClient;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.StaticTableSchema;
+import software.amazon.awssdk.enhanced.dynamodb.mocktests.BatchGetTestUtils.Record;
+import software.amazon.awssdk.enhanced.dynamodb.model.BatchGetResultPage;
+import software.amazon.awssdk.enhanced.dynamodb.model.BatchGetResultPagePublisher;
+import software.amazon.awssdk.enhanced.dynamodb.model.ReadBatch;
+import software.amazon.awssdk.regions.Region;
+import software.amazon.awssdk.services.dynamodb.DynamoDbAsyncClient;
+
+public class AsyncBatchGetItemTest {
+
+    private DynamoDbEnhancedAsyncClient enhancedClient;
+    private DynamoDbAsyncTable<Record> table;
+
+    @Rule
+    public WireMockRule wireMock = new WireMockRule(0);
+
+    @Before
+    public void setup() {
+
+        DynamoDbAsyncClient dynamoDbClient =
+            DynamoDbAsyncClient.builder()
+                               .region(Region.US_WEST_2)
+                               .credentialsProvider(() -> AwsBasicCredentials.create("foo", "bar"))
+                               .endpointOverride(URI.create("http://localhost:" + wireMock.port()))
+                               .build();
+        enhancedClient = DynamoDbEnhancedAsyncClient.builder()
+                                                    .dynamoDbClient(dynamoDbClient)
+                                                    .build();
+        StaticTableSchema<Record> tableSchema = StaticTableSchema.builder(Record.class)
+                                                                 .newItemSupplier(Record::new)
+                                                                 .addAttribute(Integer.class,
+                                                                               a -> a.name("id")
+                                                                                     .getter(Record::getId)
+                                                                                     .setter(Record::setId)
+                                                                                     .tags(primaryPartitionKey()))
+                                                                 .build();
+        table = enhancedClient.table("table", tableSchema);
+    }
+
+    @Test
+    public void successfulResponseWithoutUnprocessedKeys_NoNextPage() {
+        stubSuccessfulResponse();
+        SdkPublisher<BatchGetResultPage> publisher = enhancedClient.batchGetItem(r -> r.readBatches(
+            ReadBatch.builder(Record.class)
+                     .mappedTableResource(table)
+                     .build()));
+
+        List<BatchGetResultPage> batchGetResultPages = drainPublisher(publisher, 1);
+
+        assertThat(batchGetResultPages.size()).isEqualTo(1);
+        assertThat(batchGetResultPages.get(0).resultsForTable(table).size()).isEqualTo(3);
+    }
+
+    @Test
+    public void successfulResponseWithoutUnprocessedKeys_viaFlattenedItems_NoNextPage() {
+        stubSuccessfulResponse();
+        BatchGetResultPagePublisher publisher = enhancedClient.batchGetItem(r -> r.readBatches(
+            ReadBatch.builder(Record.class)
+                     .mappedTableResource(table)
+                     .build()));
+
+        List<Record> records = drainPublisher(publisher.resultsForTable(table), 3);
+        assertThat(records.size()).isEqualTo(3);
+    }
+
+    @Test
+    public void responseWithUnprocessedKeys_iteratePage_shouldFetchUnprocessedKeys() throws InterruptedException {
+        stubResponseWithUnprocessedKeys();
+        SdkPublisher<BatchGetResultPage> publisher = enhancedClient.batchGetItem(r -> r.readBatches(
+            ReadBatch.builder(Record.class)
+                     .mappedTableResource(table)
+                     .build()));
+
+        List<BatchGetResultPage> batchGetResultPages = drainPublisher(publisher, 2);
+        assertThat(batchGetResultPages.size()).isEqualTo(2);
+        assertThat(batchGetResultPages.get(0).resultsForTable(table).size()).isEqualTo(2);
+        assertThat(batchGetResultPages.get(1).resultsForTable(table).size()).isEqualTo(1);
+        assertThat(batchGetResultPages.size()).isEqualTo(2);
+    }
+
+    @Test
+    public void responseWithUnprocessedKeys_iterateItems_shouldFetchUnprocessedKeys() throws InterruptedException {
+        stubResponseWithUnprocessedKeys();
+        BatchGetResultPagePublisher publisher = enhancedClient.batchGetItem(r -> r.readBatches(
+            ReadBatch.builder(Record.class)
+                     .mappedTableResource(table)
+                     .build()));
+
+        List<Record> records = drainPublisher(publisher.resultsForTable(table), 3);
+        assertThat(records.size()).isEqualTo(3);
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mocktests/BatchGetItemTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mocktests/BatchGetItemTest.java
new file mode 100644
index 000000000000..2c4c120dbbe6
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mocktests/BatchGetItemTest.java
@@ -0,0 +1,131 @@
+/*
+ * Copyright 2010-2020 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.mocktests;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static software.amazon.awssdk.enhanced.dynamodb.mapper.StaticAttributeTags.primaryPartitionKey;
+import static software.amazon.awssdk.enhanced.dynamodb.mocktests.BatchGetTestUtils.stubResponseWithUnprocessedKeys;
+import static software.amazon.awssdk.enhanced.dynamodb.mocktests.BatchGetTestUtils.stubSuccessfulResponse;
+
+import java.net.URI;
+import java.util.Iterator;
+import java.util.List;
+import com.github.tomakehurst.wiremock.junit.WireMockRule;
+import java.util.stream.Collectors;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
+import software.amazon.awssdk.core.pagination.sync.SdkIterable;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClient;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbTable;
+import software.amazon.awssdk.enhanced.dynamodb.mapper.StaticTableSchema;
+import software.amazon.awssdk.enhanced.dynamodb.mocktests.BatchGetTestUtils.Record;
+import software.amazon.awssdk.enhanced.dynamodb.model.BatchGetResultPage;
+import software.amazon.awssdk.enhanced.dynamodb.model.BatchGetResultPageIterable;
+import software.amazon.awssdk.enhanced.dynamodb.model.ReadBatch;
+import software.amazon.awssdk.regions.Region;
+import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
+
+public class BatchGetItemTest {
+
+    private DynamoDbEnhancedClient enhancedClient;
+    private DynamoDbTable<Record> table;
+
+    @Rule
+    public WireMockRule wireMock = new WireMockRule(0);
+
+    @Before
+    public void setup() {
+
+        DynamoDbClient dynamoDbClient =
+            DynamoDbClient.builder()
+                          .region(Region.US_WEST_2)
+                          .credentialsProvider(() -> AwsBasicCredentials.create("foo", "bar"))
+                          .endpointOverride(URI.create("http://localhost:" + wireMock.port()))
+                          .build();
+        enhancedClient = DynamoDbEnhancedClient.builder()
+                                               .dynamoDbClient(dynamoDbClient)
+                                               .build();
+
+        StaticTableSchema<Record> tableSchema =
+            StaticTableSchema.builder(Record.class)
+                             .newItemSupplier(Record::new)
+                             .addAttribute(Integer.class, a -> a.name("id")
+                                                                .getter(Record::getId)
+                                                                .setter(Record::setId)
+                                                                .tags(primaryPartitionKey()))
+                             .build();
+        table = enhancedClient.table("table", tableSchema);
+    }
+
+    @Test
+    public void successfulResponseWithoutUnprocessedKeys_NoNextPage() {
+        stubSuccessfulResponse();
+        SdkIterable<BatchGetResultPage> batchGetResultPages = enhancedClient.batchGetItem(r -> r.readBatches(
+            ReadBatch.builder(Record.class)
+                     .mappedTableResource(table)
+                     .addGetItem(i -> i.key(k -> k.partitionValue(0)))
+                     .build()));
+
+        List<BatchGetResultPage> pages = batchGetResultPages.stream().collect(Collectors.toList());
+        assertThat(pages.size()).isEqualTo(1);
+    }
+
+    @Test
+    public void successfulResponseWithoutUnprocessedKeys_NoNextPage_viaFlattenedItems() {
+        stubSuccessfulResponse();
+        BatchGetResultPageIterable batchGetResultPages = enhancedClient.batchGetItem(r -> r.readBatches(
+            ReadBatch.builder(Record.class)
+                     .mappedTableResource(table)
+                     .addGetItem(i -> i.key(k -> k.partitionValue(0)))
+                     .build()));
+
+        assertThat(batchGetResultPages.resultsForTable(table)).hasSize(3);
+    }
+
+    @Test
+    public void responseWithUnprocessedKeys_iteratePage_shouldFetchUnprocessedKeys() {
+        stubResponseWithUnprocessedKeys();
+        SdkIterable<BatchGetResultPage> batchGetResultPages = enhancedClient.batchGetItem(r -> r.readBatches(
+            ReadBatch.builder(Record.class)
+                     .mappedTableResource(table)
+                     .addGetItem(i -> i.key(k -> k.partitionValue("1")))
+                     .build()));
+
+        Iterator<BatchGetResultPage> iterator = batchGetResultPages.iterator();
+        BatchGetResultPage firstPage = iterator.next();
+        List<Record> resultsForTable = firstPage.resultsForTable(table);
+        assertThat(resultsForTable.size()).isEqualTo(2);
+
+        BatchGetResultPage secondPage = iterator.next();
+        assertThat(secondPage.resultsForTable(table).size()).isEqualTo(1);
+        assertThat(iterator).isEmpty();
+    }
+
+    @Test
+    public void responseWithUnprocessedKeys_iterateItems_shouldFetchUnprocessedKeys() {
+        stubResponseWithUnprocessedKeys();
+        BatchGetResultPageIterable batchGetResultPages = enhancedClient.batchGetItem(r -> r.readBatches(
+            ReadBatch.builder(Record.class)
+                     .mappedTableResource(table)
+                     .addGetItem(i -> i.key(k -> k.partitionValue("1")))
+                     .build()));
+
+        SdkIterable<Record> results = batchGetResultPages.resultsForTable(table);
+        assertThat(results.stream().count()).isEqualTo(3);
+    }
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mocktests/BatchGetTestUtils.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mocktests/BatchGetTestUtils.java
new file mode 100644
index 000000000000..40eeede1ceeb
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mocktests/BatchGetTestUtils.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2010-2020 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.mocktests;
+
+import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
+import static com.github.tomakehurst.wiremock.client.WireMock.anyUrl;
+import static com.github.tomakehurst.wiremock.client.WireMock.post;
+import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
+
+import com.github.tomakehurst.wiremock.stubbing.Scenario;
+
+public class BatchGetTestUtils {
+
+    private BatchGetTestUtils() {
+    }
+
+    static final String RESPONSE_WITHOUT_UNPROCESSED_KEYS = "{\"Responses\":{\"table\":[{\"id\":{\"N\":\"1\"},"
+                                                            + "\"value\":{\"N\":\"2\"}},{\"id\":{\"N\":\"2\"},"
+                                                            + "\"value\":{\"N\":\"0\"}},{\"id\":{\"N\":\"0\"},"
+                                                            + "\"value\":{\"N\":\"0\"}}]},\"UnprocessedKeys\":{}}";
+
+    static final String RESPONSE_WITH_UNPROCESSED_KEYS = "{\"Responses\":{\"table\":[{\"id\":{\"N\":\"1\"},"
+                                                         + "\"value\":{\"N\":\"2\"}},{\"id\":{\"N\":\"0\"},"
+                                                         + "\"value\":{\"N\":\"0\"}}]},\"UnprocessedKeys\":{\"table"
+                                                         + "\": {\"Keys\": [{\"id\": {\"N\": \"2\"}}]}}}";
+
+    static final String RESPONSE_WITH_UNPROCESSED_KEYS_PROCESSED = "{\"Responses\":{\"table\":[{\"id\":{\"N\":\"2\"},"
+                                                                   + "\"value\":{\"N\":\"0\"}}]},\"UnprocessedKeys\":{}}";
+
+    static void stubSuccessfulResponse() {
+        stubFor(post(anyUrl())
+                    .willReturn(aResponse().withStatus(200).withBody(RESPONSE_WITHOUT_UNPROCESSED_KEYS)));
+    }
+
+    static void stubResponseWithUnprocessedKeys() {
+        stubFor(post(anyUrl())
+                    .inScenario("unprocessed keys")
+                    .whenScenarioStateIs(Scenario.STARTED)
+                    .willSetStateTo("first attempt")
+                    .willReturn(aResponse().withStatus(200)
+                                           .withBody(RESPONSE_WITH_UNPROCESSED_KEYS)));
+
+        stubFor(post(anyUrl())
+                    .inScenario("unprocessed keys")
+                    .whenScenarioStateIs("first attempt")
+                    .willSetStateTo("second attempt")
+                    .willReturn(aResponse().withStatus(200)
+                                           .withBody(RESPONSE_WITH_UNPROCESSED_KEYS_PROCESSED)));
+    }
+
+
+    static final class Record {
+        private int id;
+
+        Integer getId() {
+            return id;
+        }
+
+        Record setId(Integer id) {
+            this.id = id;
+            return this;
+        }
+    }
+
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/model/BatchGetItemEnhancedRequestTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/model/BatchGetItemEnhancedRequestTest.java
new file mode 100644
index 000000000000..4fdbc413d7c4
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/model/BatchGetItemEnhancedRequestTest.java
@@ -0,0 +1,95 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.model;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.nullValue;
+
+import java.util.Collections;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClient;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbTable;
+import software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.FakeItem;
+import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
+
+@RunWith(MockitoJUnitRunner.class)
+public class BatchGetItemEnhancedRequestTest {
+
+    private static final String TABLE_NAME = "table-name";
+
+    @Mock
+    private DynamoDbClient mockDynamoDbClient;
+
+    private DynamoDbEnhancedClient enhancedClient;
+    private DynamoDbTable<FakeItem> fakeItemMappedTable;
+
+
+    @Before
+    public void setupMappedTables() {
+        enhancedClient = DynamoDbEnhancedClient.builder().dynamoDbClient(mockDynamoDbClient).build();
+        fakeItemMappedTable = enhancedClient.table(TABLE_NAME, FakeItem.getTableSchema());
+    }
+
+    @Test
+    public void builder_minimal() {
+        BatchGetItemEnhancedRequest builtObject = BatchGetItemEnhancedRequest.builder().build();
+
+        assertThat(builtObject.readBatches(), is(nullValue()));
+    }
+
+    @Test
+    public void builder_maximal() {
+        ReadBatch readBatch = ReadBatch.builder(FakeItem.class)
+                                       .mappedTableResource(fakeItemMappedTable)
+                                       .addGetItem(r -> r.key(k -> k.partitionValue("key")))
+                                       .build();
+
+        BatchGetItemEnhancedRequest builtObject = BatchGetItemEnhancedRequest.builder()
+                                                                             .readBatches(readBatch)
+                                                                             .build();
+
+        assertThat(builtObject.readBatches(), is(Collections.singletonList(readBatch)));
+    }
+
+    @Test
+    public void builder_add_single() {
+        ReadBatch readBatch = ReadBatch.builder(FakeItem.class)
+                                       .mappedTableResource(fakeItemMappedTable)
+                                       .addGetItem(r -> r.key(k -> k.partitionValue("key")))
+                                       .build();
+
+        BatchGetItemEnhancedRequest builtObject = BatchGetItemEnhancedRequest.builder()
+                                                                             .addReadBatch(readBatch)
+                                                                             .build();
+
+        assertThat(builtObject.readBatches(), is(Collections.singletonList(readBatch)));
+    }
+
+    @Test
+    public void toBuilder() {
+        BatchGetItemEnhancedRequest builtObject = BatchGetItemEnhancedRequest.builder().build();
+
+        BatchGetItemEnhancedRequest copiedObject = builtObject.toBuilder().build();
+
+        assertThat(copiedObject, is(builtObject));
+    }
+
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/model/BatchWriteItemEnhancedRequestTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/model/BatchWriteItemEnhancedRequestTest.java
new file mode 100644
index 000000000000..63f96287becf
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/model/BatchWriteItemEnhancedRequestTest.java
@@ -0,0 +1,96 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.model;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.nullValue;
+
+import java.util.Collections;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClient;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbTable;
+import software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.FakeItem;
+import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
+
+@RunWith(MockitoJUnitRunner.class)
+public class BatchWriteItemEnhancedRequestTest {
+
+    private static final String TABLE_NAME = "table-name";
+
+    @Mock
+    private DynamoDbClient mockDynamoDbClient;
+
+    private DynamoDbEnhancedClient enhancedClient;
+    private DynamoDbTable<FakeItem> fakeItemMappedTable;
+
+
+    @Before
+    public void setupMappedTables() {
+        enhancedClient = DynamoDbEnhancedClient.builder().dynamoDbClient(mockDynamoDbClient).build();
+        fakeItemMappedTable = enhancedClient.table(TABLE_NAME, FakeItem.getTableSchema());
+    }
+
+
+    @Test
+    public void builder_minimal() {
+        BatchWriteItemEnhancedRequest builtObject = BatchWriteItemEnhancedRequest.builder().build();
+
+        assertThat(builtObject.writeBatches(), is(nullValue()));
+    }
+
+    @Test
+    public void builder_maximal() {
+        WriteBatch writeBatch = WriteBatch.builder(FakeItem.class)
+                                         .mappedTableResource(fakeItemMappedTable)
+                                         .addDeleteItem(r -> r.key(k -> k.partitionValue("key")))
+                                         .build();
+
+        BatchWriteItemEnhancedRequest builtObject = BatchWriteItemEnhancedRequest.builder()
+                                                                                 .writeBatches(writeBatch)
+                                                                                 .build();
+
+        assertThat(builtObject.writeBatches(), is(Collections.singletonList(writeBatch)));
+    }
+
+    @Test
+    public void builder_add_single() {
+        WriteBatch writeBatch = WriteBatch.builder(FakeItem.class)
+                                          .mappedTableResource(fakeItemMappedTable)
+                                          .addDeleteItem(r -> r.key(k -> k.partitionValue("key")))
+                                          .build();
+
+        BatchWriteItemEnhancedRequest builtObject = BatchWriteItemEnhancedRequest.builder()
+                                                                                 .addWriteBatch(writeBatch)
+                                                                                 .build();
+
+        assertThat(builtObject.writeBatches(), is(Collections.singletonList(writeBatch)));
+    }
+
+    @Test
+    public void toBuilder() {
+        BatchWriteItemEnhancedRequest builtObject = BatchWriteItemEnhancedRequest.builder().build();
+
+        BatchWriteItemEnhancedRequest copiedObject = builtObject.toBuilder().build();
+
+        assertThat(copiedObject, is(builtObject));
+    }
+
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/model/CreateTableEnhancedRequestTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/model/CreateTableEnhancedRequestTest.java
new file mode 100644
index 000000000000..6a2fc6b09f63
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/model/CreateTableEnhancedRequestTest.java
@@ -0,0 +1,83 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.model;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.nullValue;
+
+import java.util.Collections;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.junit.MockitoJUnitRunner;
+import software.amazon.awssdk.services.dynamodb.model.Projection;
+import software.amazon.awssdk.services.dynamodb.model.ProjectionType;
+import software.amazon.awssdk.services.dynamodb.model.ProvisionedThroughput;
+
+@RunWith(MockitoJUnitRunner.class)
+public class CreateTableEnhancedRequestTest {
+
+    @Test
+    public void builder_minimal() {
+        CreateTableEnhancedRequest builtObject = CreateTableEnhancedRequest.builder().build();
+
+        assertThat(builtObject.globalSecondaryIndices(), is(nullValue()));
+        assertThat(builtObject.localSecondaryIndices(), is(nullValue()));
+        assertThat(builtObject.provisionedThroughput(), is(nullValue()));
+    }
+
+    @Test
+    public void builder_maximal() {
+        EnhancedGlobalSecondaryIndex globalSecondaryIndex =
+                EnhancedGlobalSecondaryIndex.builder()
+                        .indexName("gsi_1")
+                        .projection(p -> p.projectionType(ProjectionType.ALL))
+                        .provisionedThroughput(getDefaultProvisionedThroughput())
+                        .build();
+
+        EnhancedLocalSecondaryIndex localSecondaryIndex = EnhancedLocalSecondaryIndex.create(
+            "lsi", Projection.builder().projectionType(ProjectionType.ALL).build());
+
+        CreateTableEnhancedRequest builtObject = CreateTableEnhancedRequest.builder()
+                                                                           .globalSecondaryIndices(globalSecondaryIndex)
+                                                                           .localSecondaryIndices(localSecondaryIndex)
+                                                                           .provisionedThroughput(getDefaultProvisionedThroughput())
+                                                                           .build();
+
+        assertThat(builtObject.globalSecondaryIndices(), is(Collections.singletonList(globalSecondaryIndex)));
+        assertThat(builtObject.localSecondaryIndices(), is(Collections.singletonList(localSecondaryIndex)));
+        assertThat(builtObject.provisionedThroughput(), is(getDefaultProvisionedThroughput()));
+    }
+
+    @Test
+    public void toBuilder() {
+        CreateTableEnhancedRequest builtObject = CreateTableEnhancedRequest.builder()
+                                                                   .provisionedThroughput(getDefaultProvisionedThroughput())
+                                                                   .build();
+
+        CreateTableEnhancedRequest copiedObject = builtObject.toBuilder().build();
+
+        assertThat(copiedObject, is(builtObject));
+    }
+
+    private ProvisionedThroughput getDefaultProvisionedThroughput() {
+        return ProvisionedThroughput.builder()
+                                    .writeCapacityUnits(1L)
+                                    .readCapacityUnits(2L)
+                                    .build();
+    }
+
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/model/DeleteItemEnhancedRequestTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/model/DeleteItemEnhancedRequestTest.java
new file mode 100644
index 000000000000..9d8f4b2a6c72
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/model/DeleteItemEnhancedRequestTest.java
@@ -0,0 +1,72 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.model;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.nullValue;
+import static software.amazon.awssdk.enhanced.dynamodb.internal.AttributeValues.stringValue;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.junit.MockitoJUnitRunner;
+import software.amazon.awssdk.enhanced.dynamodb.Expression;
+import software.amazon.awssdk.enhanced.dynamodb.Key;
+
+@RunWith(MockitoJUnitRunner.class)
+public class DeleteItemEnhancedRequestTest {
+
+    @Test
+    public void builder_minimal() {
+        DeleteItemEnhancedRequest builtObject = DeleteItemEnhancedRequest.builder().build();
+
+        assertThat(builtObject.key(), is(nullValue()));
+        assertThat(builtObject.conditionExpression(), is(nullValue()));
+    }
+
+    @Test
+    public void builder_maximal() {
+        Key key = Key.builder().partitionValue("key").build();
+
+        Expression conditionExpression = Expression.builder()
+                                                   .expression("#key = :value OR #key1 = :value1")
+                                                   .putExpressionName("#key", "attribute")
+                                                   .putExpressionName("#key1", "attribute3")
+                                                   .putExpressionValue(":value", stringValue("wrong"))
+                                                   .putExpressionValue(":value1", stringValue("three"))
+                                                   .build();
+
+        DeleteItemEnhancedRequest builtObject = DeleteItemEnhancedRequest.builder()
+                                                                         .key(key)
+                                                                         .conditionExpression(conditionExpression)
+                                                                         .build();
+
+        assertThat(builtObject.key(), is(key));
+        assertThat(builtObject.conditionExpression(), is(conditionExpression));
+    }
+
+    @Test
+    public void toBuilder() {
+        Key key = Key.builder().partitionValue("key").build();
+
+        DeleteItemEnhancedRequest builtObject = DeleteItemEnhancedRequest.builder().key(key).build();
+
+        DeleteItemEnhancedRequest copiedObject = builtObject.toBuilder().build();
+
+        assertThat(copiedObject, is(builtObject));
+    }
+
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/model/GetItemEnhancedRequestTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/model/GetItemEnhancedRequestTest.java
new file mode 100644
index 000000000000..d952e1219418
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/model/GetItemEnhancedRequestTest.java
@@ -0,0 +1,64 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.model;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.nullValue;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.junit.MockitoJUnitRunner;
+import software.amazon.awssdk.enhanced.dynamodb.Key;
+
+@RunWith(MockitoJUnitRunner.class)
+public class GetItemEnhancedRequestTest {
+
+    @Test
+    public void builder_minimal() {
+        GetItemEnhancedRequest builtObject = GetItemEnhancedRequest.builder().build();
+
+        assertThat(builtObject.key(), is(nullValue()));
+        assertThat(builtObject.consistentRead(), is(nullValue()));
+    }
+
+    @Test
+    public void builder_maximal() {
+        Key key = Key.builder().partitionValue("key").build();
+
+        GetItemEnhancedRequest builtObject = GetItemEnhancedRequest.builder()
+                                                                   .key(key)
+                                                                   .consistentRead(true)
+                                                                   .build();
+
+        assertThat(builtObject.key(), is(key));
+        assertThat(builtObject.consistentRead(), is(true));
+    }
+
+    @Test
+    public void toBuilder() {
+        Key key = Key.builder().partitionValue("key").build();
+
+        GetItemEnhancedRequest builtObject = GetItemEnhancedRequest.builder()
+                                                                   .key(key)
+                                                                   .build();
+
+        GetItemEnhancedRequest copiedObject = builtObject.toBuilder().build();
+
+        assertThat(copiedObject, is(builtObject));
+    }
+
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/model/PutItemEnhancedRequestTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/model/PutItemEnhancedRequestTest.java
new file mode 100644
index 000000000000..40d203b165b5
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/model/PutItemEnhancedRequestTest.java
@@ -0,0 +1,71 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.model;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.nullValue;
+import static software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.FakeItem.createUniqueFakeItem;
+import static software.amazon.awssdk.enhanced.dynamodb.internal.AttributeValues.stringValue;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.junit.MockitoJUnitRunner;
+import software.amazon.awssdk.enhanced.dynamodb.Expression;
+import software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.FakeItem;
+
+@RunWith(MockitoJUnitRunner.class)
+public class PutItemEnhancedRequestTest {
+
+    @Test
+    public void builder_minimal() {
+        PutItemEnhancedRequest<FakeItem> builtObject = PutItemEnhancedRequest.builder(FakeItem.class).build();
+
+        assertThat(builtObject.item(), is(nullValue()));
+        assertThat(builtObject.conditionExpression(), is(nullValue()));
+    }
+
+    @Test
+    public void builder_maximal() {
+        FakeItem fakeItem = createUniqueFakeItem();
+
+        Expression conditionExpression = Expression.builder()
+                                                   .expression("#key = :value OR #key1 = :value1")
+                                                   .putExpressionName("#key", "attribute")
+                                                   .putExpressionName("#key1", "attribute3")
+                                                   .putExpressionValue(":value", stringValue("wrong"))
+                                                   .putExpressionValue(":value1", stringValue("three"))
+                                                   .build();
+
+        PutItemEnhancedRequest<FakeItem> builtObject = PutItemEnhancedRequest.builder(FakeItem.class)
+                                                                             .item(fakeItem)
+                                                                             .conditionExpression(conditionExpression)
+                                                                             .build();
+
+        assertThat(builtObject.item(), is(fakeItem));
+        assertThat(builtObject.conditionExpression(), is(conditionExpression));
+    }
+
+    @Test
+    public void toBuilder() {
+        PutItemEnhancedRequest<FakeItem> builtObject = PutItemEnhancedRequest.builder(FakeItem.class).build();
+
+        PutItemEnhancedRequest copiedObject = builtObject.toBuilder().build();
+
+        assertThat(copiedObject, is(builtObject));
+    }
+
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/model/QueryEnhancedRequestTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/model/QueryEnhancedRequestTest.java
new file mode 100644
index 000000000000..24b1bc710e16
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/model/QueryEnhancedRequestTest.java
@@ -0,0 +1,89 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.model;
+
+import static java.util.Collections.singletonMap;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.nullValue;
+import static software.amazon.awssdk.enhanced.dynamodb.internal.AttributeValues.numberValue;
+import static software.amazon.awssdk.enhanced.dynamodb.internal.AttributeValues.stringValue;
+import static software.amazon.awssdk.enhanced.dynamodb.model.QueryConditional.keyEqualTo;
+
+import java.util.HashMap;
+import java.util.Map;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.junit.MockitoJUnitRunner;
+import software.amazon.awssdk.enhanced.dynamodb.Expression;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+
+@RunWith(MockitoJUnitRunner.class)
+public class QueryEnhancedRequestTest {
+
+    @Test
+    public void builder_minimal() {
+        QueryEnhancedRequest builtObject = QueryEnhancedRequest.builder().build();
+
+        assertThat(builtObject.exclusiveStartKey(), is(nullValue()));
+        assertThat(builtObject.consistentRead(), is(nullValue()));
+        assertThat(builtObject.filterExpression(), is(nullValue()));
+        assertThat(builtObject.limit(), is(nullValue()));
+        assertThat(builtObject.queryConditional(), is(nullValue()));
+        assertThat(builtObject.scanIndexForward(), is(nullValue()));
+    }
+
+    @Test
+    public void builder_maximal() {
+        Map<String, AttributeValue> exclusiveStartKey = new HashMap<>();
+        exclusiveStartKey.put("id", stringValue("id-value"));
+        exclusiveStartKey.put("sort", numberValue(7));
+
+        Map<String, AttributeValue> expressionValues = singletonMap(":test-key", stringValue("test-value"));
+        Expression filterExpression = Expression.builder()
+                                                .expression("test-expression")
+                                                .expressionValues(expressionValues)
+                                                .build();
+
+        QueryConditional queryConditional = keyEqualTo(k -> k.partitionValue("id-value"));
+
+        QueryEnhancedRequest builtObject = QueryEnhancedRequest.builder()
+                                                               .exclusiveStartKey(exclusiveStartKey)
+                                                               .consistentRead(false)
+                                                               .filterExpression(filterExpression)
+                                                               .limit(3)
+                                                               .queryConditional(queryConditional)
+                                                               .scanIndexForward(true)
+                                                               .build();
+
+        assertThat(builtObject.exclusiveStartKey(), is(exclusiveStartKey));
+        assertThat(builtObject.consistentRead(), is(false));
+        assertThat(builtObject.filterExpression(), is(filterExpression));
+        assertThat(builtObject.limit(), is(3));
+        assertThat(builtObject.queryConditional(), is(queryConditional));
+        assertThat(builtObject.scanIndexForward(), is(true));
+    }
+
+    @Test
+    public void toBuilder() {
+        QueryEnhancedRequest builtObject = QueryEnhancedRequest.builder().build();
+
+        QueryEnhancedRequest copiedObject = builtObject.toBuilder().build();
+
+        assertThat(copiedObject, is(builtObject));
+    }
+
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/model/ReadBatchTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/model/ReadBatchTest.java
new file mode 100644
index 000000000000..b5c2c8265d19
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/model/ReadBatchTest.java
@@ -0,0 +1,98 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.model;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsInAnyOrder;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.nullValue;
+import static software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.FakeItem.createUniqueFakeItem;
+
+import java.util.Collections;
+import java.util.Map;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClient;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbTable;
+import software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.FakeItem;
+import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+
+@RunWith(MockitoJUnitRunner.class)
+public class ReadBatchTest {
+
+    private static final String TABLE_NAME = "table-name";
+
+    @Mock
+    private DynamoDbClient mockDynamoDbClient;
+
+    private DynamoDbEnhancedClient enhancedClient;
+    private DynamoDbTable<FakeItem> fakeItemMappedTable;
+
+    @Before
+    public void setupMappedTables() {
+        enhancedClient = DynamoDbEnhancedClient.builder().dynamoDbClient(mockDynamoDbClient).build();
+        fakeItemMappedTable = enhancedClient.table(TABLE_NAME, FakeItem.getTableSchema());
+    }
+
+    @Test
+    public void builder_minimal() {
+        ReadBatch builtObject = ReadBatch.builder(FakeItem.class).build();
+
+        assertThat(builtObject.tableName(), is(nullValue()));
+        assertThat(builtObject.keysAndAttributes(), is(nullValue()));
+    }
+
+    @Test
+    public void builder_maximal_consumer_style() {
+        FakeItem fakeItem = createUniqueFakeItem();
+
+        ReadBatch builtObject = ReadBatch.builder(FakeItem.class)
+                                         .mappedTableResource(fakeItemMappedTable)
+                                         .addGetItem(r -> r.key(k -> k.partitionValue(fakeItem.getId())))
+                                         .build();
+
+        Map<String, AttributeValue> fakeItemMap = FakeItem.getTableSchema().itemToMap(fakeItem,
+                                                                                      FakeItem.getTableMetadata().primaryKeys());
+
+        assertThat(builtObject.tableName(), is(TABLE_NAME));
+        assertThat(builtObject.keysAndAttributes().keys(), containsInAnyOrder(Collections.singletonList(fakeItemMap).toArray()));
+    }
+
+    @Test
+    public void builder_maximal_builder_style() {
+        FakeItem fakeItem = createUniqueFakeItem();
+
+        GetItemEnhancedRequest getItem = GetItemEnhancedRequest.builder()
+                                                               .key(k -> k.partitionValue(fakeItem.getId()))
+                                                               .build();
+
+        ReadBatch builtObject = ReadBatch.builder(FakeItem.class)
+                                         .mappedTableResource(fakeItemMappedTable)
+                                         .addGetItem(getItem)
+                                         .build();
+
+        Map<String, AttributeValue> fakeItemMap = FakeItem.getTableSchema().itemToMap(fakeItem,
+                                                                                      FakeItem.getTableMetadata().primaryKeys());
+
+        assertThat(builtObject.tableName(), is(TABLE_NAME));
+        assertThat(builtObject.keysAndAttributes().keys(), containsInAnyOrder(Collections.singletonList(fakeItemMap).toArray()));
+    }
+
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/model/ScanEnhancedRequestTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/model/ScanEnhancedRequestTest.java
new file mode 100644
index 000000000000..862e5f7ec8e5
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/model/ScanEnhancedRequestTest.java
@@ -0,0 +1,80 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.model;
+
+import static java.util.Collections.singletonMap;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.nullValue;
+import static software.amazon.awssdk.enhanced.dynamodb.internal.AttributeValues.numberValue;
+import static software.amazon.awssdk.enhanced.dynamodb.internal.AttributeValues.stringValue;
+
+import java.util.HashMap;
+import java.util.Map;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.junit.MockitoJUnitRunner;
+import software.amazon.awssdk.enhanced.dynamodb.Expression;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+
+@RunWith(MockitoJUnitRunner.class)
+public class ScanEnhancedRequestTest {
+
+    @Test
+    public void builder_minimal() {
+        ScanEnhancedRequest builtObject = ScanEnhancedRequest.builder().build();
+
+        assertThat(builtObject.exclusiveStartKey(), is(nullValue()));
+        assertThat(builtObject.consistentRead(), is(nullValue()));
+        assertThat(builtObject.filterExpression(), is(nullValue()));
+        assertThat(builtObject.limit(), is(nullValue()));
+    }
+
+    @Test
+    public void builder_maximal() {
+        Map<String, AttributeValue> exclusiveStartKey = new HashMap<>();
+        exclusiveStartKey.put("id", stringValue("id-value"));
+        exclusiveStartKey.put("sort", numberValue(7));
+
+        Map<String, AttributeValue> expressionValues = singletonMap(":test-key", stringValue("test-value"));
+        Expression filterExpression = Expression.builder()
+                                                .expression("test-expression")
+                                                .expressionValues(expressionValues)
+                                                .build();
+
+        ScanEnhancedRequest builtObject = ScanEnhancedRequest.builder()
+                                                             .exclusiveStartKey(exclusiveStartKey)
+                                                             .consistentRead(false)
+                                                             .filterExpression(filterExpression)
+                                                             .limit(3)
+                                                             .build();
+
+        assertThat(builtObject.exclusiveStartKey(), is(exclusiveStartKey));
+        assertThat(builtObject.consistentRead(), is(false));
+        assertThat(builtObject.filterExpression(), is(filterExpression));
+        assertThat(builtObject.limit(), is(3));
+    }
+
+    @Test
+    public void toBuilder() {
+        ScanEnhancedRequest builtObject = ScanEnhancedRequest.builder().exclusiveStartKey(null).build();
+
+        ScanEnhancedRequest copiedObject = builtObject.toBuilder().build();
+
+        assertThat(copiedObject, is(builtObject));
+    }
+
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/model/TransactGetItemsEnhancedRequestTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/model/TransactGetItemsEnhancedRequestTest.java
new file mode 100644
index 000000000000..d3ad194e64ae
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/model/TransactGetItemsEnhancedRequestTest.java
@@ -0,0 +1,109 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.model;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.nullValue;
+import static software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.FakeItem.createUniqueFakeItem;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClient;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbTable;
+import software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.FakeItem;
+import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+import software.amazon.awssdk.services.dynamodb.model.Get;
+import software.amazon.awssdk.services.dynamodb.model.TransactGetItem;
+
+@RunWith(MockitoJUnitRunner.class)
+public class TransactGetItemsEnhancedRequestTest {
+
+    private static final String TABLE_NAME = "table-name";
+
+    @Mock
+    private DynamoDbClient mockDynamoDbClient;
+
+    private DynamoDbEnhancedClient enhancedClient;
+    private DynamoDbTable<FakeItem> fakeItemMappedTable;
+
+
+    @Before
+    public void setupMappedTables() {
+        enhancedClient = DynamoDbEnhancedClient.builder().dynamoDbClient(mockDynamoDbClient).build();
+        fakeItemMappedTable = enhancedClient.table(TABLE_NAME, FakeItem.getTableSchema());
+    }
+
+
+    @Test
+    public void builder_minimal() {
+        TransactGetItemsEnhancedRequest builtObject = TransactGetItemsEnhancedRequest.builder().build();
+
+        assertThat(builtObject.transactGetItems(), is(nullValue()));
+    }
+
+    @Test
+    public void builder_maximal_consumer_style() {
+        FakeItem fakeItem = createUniqueFakeItem();
+
+        TransactGetItemsEnhancedRequest builtObject =
+            TransactGetItemsEnhancedRequest.builder()
+                                           .addGetItem(fakeItemMappedTable, fakeItem)
+                                           .addGetItem(fakeItemMappedTable, fakeItem)
+                                           .build();
+
+        assertThat(builtObject.transactGetItems(), is(getTransactGetItems(fakeItem)));
+    }
+
+    @Test
+    public void builder_maximal_builder_style() {
+        FakeItem fakeItem = createUniqueFakeItem();
+
+        GetItemEnhancedRequest getItem = GetItemEnhancedRequest.builder()
+                                                               .key(k -> k.partitionValue(fakeItem.getId()))
+                                                               .build();
+
+        TransactGetItemsEnhancedRequest builtObject =
+            TransactGetItemsEnhancedRequest.builder()
+                                           .addGetItem(fakeItemMappedTable, getItem)
+                                           .addGetItem(fakeItemMappedTable, getItem)
+                                           .build();
+
+        assertThat(builtObject.transactGetItems(), is(getTransactGetItems(fakeItem)));
+    }
+
+    
+    private List<TransactGetItem> getTransactGetItems(FakeItem fakeItem) {
+        final Map<String, AttributeValue> fakeItemMap = FakeItem.getTableSchema().itemToMap(fakeItem, true);
+
+        TransactGetItem getItem = TransactGetItem.builder()
+                                                      .get(Get.builder()
+                                                              .key(fakeItemMap)
+                                                              .tableName(TABLE_NAME)
+                                                              .build())
+                                                      .build();
+
+        return Arrays.asList(getItem, getItem);
+    }
+
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/model/TransactWriteItemsEnhancedRequestTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/model/TransactWriteItemsEnhancedRequestTest.java
new file mode 100644
index 000000000000..158d3b879b6c
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/model/TransactWriteItemsEnhancedRequestTest.java
@@ -0,0 +1,189 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.model;
+
+import static java.util.Collections.singletonMap;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.notNullValue;
+import static org.hamcrest.Matchers.nullValue;
+import static software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.FakeItem.createUniqueFakeItem;
+import static software.amazon.awssdk.enhanced.dynamodb.internal.AttributeValues.stringValue;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClient;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbTable;
+import software.amazon.awssdk.enhanced.dynamodb.Expression;
+import software.amazon.awssdk.enhanced.dynamodb.Key;
+import software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.FakeItem;
+import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+import software.amazon.awssdk.services.dynamodb.model.Delete;
+import software.amazon.awssdk.services.dynamodb.model.Put;
+import software.amazon.awssdk.services.dynamodb.model.TransactWriteItem;
+
+@RunWith(MockitoJUnitRunner.class)
+public class TransactWriteItemsEnhancedRequestTest {
+
+    private static final String TABLE_NAME = "table-name";
+
+    @Mock
+    private DynamoDbClient mockDynamoDbClient;
+
+    private DynamoDbEnhancedClient enhancedClient;
+    private DynamoDbTable<FakeItem> fakeItemMappedTable;
+
+
+    @Before
+    public void setupMappedTables() {
+        enhancedClient = DynamoDbEnhancedClient.builder().dynamoDbClient(mockDynamoDbClient).extensions().build();
+        fakeItemMappedTable = enhancedClient.table(TABLE_NAME, FakeItem.getTableSchema());
+    }
+
+
+    @Test
+    public void builder_minimal() {
+        TransactWriteItemsEnhancedRequest builtObject = TransactWriteItemsEnhancedRequest.builder().build();
+
+        assertThat(builtObject.transactWriteItems(), is(nullValue()));
+    }
+
+    @Test
+    public void builder_maximal_consumer_style() {
+        FakeItem fakeItem = createUniqueFakeItem();
+
+        Expression conditionExpression = Expression.builder()
+                                                   .expression("#attribute = :attribute")
+                                                   .expressionValues(singletonMap(":attribute", stringValue("0")))
+                                                   .expressionNames(singletonMap("#attribute", "attribute"))
+                                                   .build();
+
+        TransactWriteItemsEnhancedRequest builtObject =
+            TransactWriteItemsEnhancedRequest.builder()
+                                             .addPutItem(fakeItemMappedTable, fakeItem)
+                                             .addDeleteItem(fakeItemMappedTable, fakeItem)
+                                             .addUpdateItem(fakeItemMappedTable, fakeItem)
+                                             .addConditionCheck(fakeItemMappedTable, r -> r.key(k -> k.partitionValue(fakeItem.getId()))
+                                                                                           .conditionExpression(conditionExpression))
+                                             .build();
+
+        assertThat(builtObject.transactWriteItems().size(), is(4));
+        assertThat(builtObject.transactWriteItems().get(0), is(getTransactWriteItems(fakeItem).get(0)));
+        assertThat(builtObject.transactWriteItems().get(1), is(getTransactWriteItems(fakeItem).get(1)));
+
+        assertThat(builtObject.transactWriteItems().get(2).update(), is(notNullValue()));
+        assertThat(builtObject.transactWriteItems().get(2).update().key().get("id").s(), is(fakeItem.getId()));
+
+        assertThat(builtObject.transactWriteItems().get(3).conditionCheck(), is(notNullValue()));
+        assertThat(builtObject.transactWriteItems().get(3).conditionCheck().key().get("id").s(), is(fakeItem.getId()));
+    }
+
+    @Test
+    public void builder_maximal_shortcut_style() {
+        FakeItem fakeItem = createUniqueFakeItem();
+
+        Expression conditionExpression = Expression.builder()
+                                                   .expression("#attribute = :attribute")
+                                                   .expressionValues(singletonMap(":attribute", stringValue("0")))
+                                                   .expressionNames(singletonMap("#attribute", "attribute"))
+                                                   .build();
+
+        TransactWriteItemsEnhancedRequest builtObject =
+            TransactWriteItemsEnhancedRequest.builder()
+                                             .addPutItem(fakeItemMappedTable, fakeItem)
+                                             .addDeleteItem(fakeItemMappedTable, Key.builder().partitionValue(fakeItem.getId()).build())
+                                             .addUpdateItem(fakeItemMappedTable, fakeItem)
+                                             .addConditionCheck(fakeItemMappedTable, r -> r.key(k -> k.partitionValue(fakeItem.getId()))
+                                                                                           .conditionExpression(conditionExpression))
+                                             .build();
+
+        assertThat(builtObject.transactWriteItems().size(), is(4));
+        assertThat(builtObject.transactWriteItems().get(0), is(getTransactWriteItems(fakeItem).get(0)));
+        assertThat(builtObject.transactWriteItems().get(1), is(getTransactWriteItems(fakeItem).get(1)));
+
+        assertThat(builtObject.transactWriteItems().get(2).update(), is(notNullValue()));
+        assertThat(builtObject.transactWriteItems().get(2).update().key().get("id").s(), is(fakeItem.getId()));
+
+        assertThat(builtObject.transactWriteItems().get(3).conditionCheck(), is(notNullValue()));
+        assertThat(builtObject.transactWriteItems().get(3).conditionCheck().key().get("id").s(), is(fakeItem.getId()));
+    }
+
+    @Test
+    public void builder_maximal_builder_style() {
+        FakeItem fakeItem = createUniqueFakeItem();
+
+        PutItemEnhancedRequest<FakeItem> putItem = PutItemEnhancedRequest.builder(FakeItem.class).item(fakeItem).build();
+        DeleteItemEnhancedRequest deleteItem = DeleteItemEnhancedRequest.builder()
+                                                                        .key(k -> k.partitionValue(fakeItem.getId()))
+                                                                        .build();
+        UpdateItemEnhancedRequest<FakeItem> updateItem = UpdateItemEnhancedRequest.builder(FakeItem.class)
+                                                                        .item(fakeItem).build();
+        Expression conditionExpression = Expression.builder()
+                                                   .expression("#attribute = :attribute")
+                                                   .expressionValues(singletonMap(":attribute", stringValue("0")))
+                                                   .expressionNames(singletonMap("#attribute", "attribute"))
+                                                   .build();
+        ConditionCheck<FakeItem> conditionCheck = ConditionCheck.builder()
+                                                      .key(k -> k.partitionValue(fakeItem.getId()))
+                                                      .conditionExpression(conditionExpression)
+                                                      .build();
+
+        TransactWriteItemsEnhancedRequest builtObject =
+            TransactWriteItemsEnhancedRequest.builder()
+                                             .addPutItem(fakeItemMappedTable, putItem)
+                                             .addDeleteItem(fakeItemMappedTable, deleteItem)
+                                             .addUpdateItem(fakeItemMappedTable, updateItem)
+                                             .addConditionCheck(fakeItemMappedTable, conditionCheck)
+                                             .build();
+
+        assertThat(builtObject.transactWriteItems().size(), is(4));
+        assertThat(builtObject.transactWriteItems().get(0), is(getTransactWriteItems(fakeItem).get(0)));
+        assertThat(builtObject.transactWriteItems().get(1), is(getTransactWriteItems(fakeItem).get(1)));
+
+        assertThat(builtObject.transactWriteItems().get(2).update(), is(notNullValue()));
+        assertThat(builtObject.transactWriteItems().get(2).update().key().get("id").s(), is(fakeItem.getId()));
+
+        assertThat(builtObject.transactWriteItems().get(3).conditionCheck(), is(notNullValue()));
+        assertThat(builtObject.transactWriteItems().get(3).conditionCheck().key().get("id").s(), is(fakeItem.getId()));
+    }
+
+    private List<TransactWriteItem> getTransactWriteItems(FakeItem fakeItem) {
+        final Map<String, AttributeValue> fakeItemMap = FakeItem.getTableSchema().itemToMap(fakeItem, true);
+
+        TransactWriteItem putWriteItem = TransactWriteItem.builder()
+                                                          .put(Put.builder()
+                                                                  .item(fakeItemMap)
+                                                                  .tableName(TABLE_NAME)
+                                                                  .build())
+                                                          .build();
+        TransactWriteItem deleteWriteItem = TransactWriteItem.builder()
+                                                             .delete(Delete.builder()
+                                                                           .key(fakeItemMap)
+                                                                           .tableName(TABLE_NAME)
+                                                                           .build())
+                                                             .build();
+
+        return Arrays.asList(putWriteItem, deleteWriteItem);
+    }
+
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/model/UpdateItemEnhancedRequestTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/model/UpdateItemEnhancedRequestTest.java
new file mode 100644
index 000000000000..6931b8ed1364
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/model/UpdateItemEnhancedRequestTest.java
@@ -0,0 +1,74 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.model;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.nullValue;
+import static software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.FakeItem.createUniqueFakeItem;
+import static software.amazon.awssdk.enhanced.dynamodb.internal.AttributeValues.stringValue;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.junit.MockitoJUnitRunner;
+import software.amazon.awssdk.enhanced.dynamodb.Expression;
+import software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.FakeItem;
+
+@RunWith(MockitoJUnitRunner.class)
+public class UpdateItemEnhancedRequestTest {
+
+    @Test
+    public void builder_minimal() {
+        UpdateItemEnhancedRequest<FakeItem> builtObject = UpdateItemEnhancedRequest.builder(FakeItem.class).build();
+
+        assertThat(builtObject.item(), is(nullValue()));
+        assertThat(builtObject.ignoreNulls(), is(nullValue()));
+        assertThat(builtObject.conditionExpression(), is(nullValue()));
+    }
+
+    @Test
+    public void builder_maximal() {
+        FakeItem fakeItem = createUniqueFakeItem();
+
+        Expression conditionExpression = Expression.builder()
+                                                   .expression("#key = :value OR #key1 = :value1")
+                                                   .putExpressionName("#key", "attribute")
+                                                   .putExpressionName("#key1", "attribute3")
+                                                   .putExpressionValue(":value", stringValue("wrong"))
+                                                   .putExpressionValue(":value1", stringValue("three"))
+                                                   .build();
+
+        UpdateItemEnhancedRequest<FakeItem> builtObject = UpdateItemEnhancedRequest.builder(FakeItem.class)
+                                                                                   .item(fakeItem)
+                                                                                   .ignoreNulls(true)
+                                                                                   .conditionExpression(conditionExpression)
+                                                                                   .build();
+
+        assertThat(builtObject.item(), is(fakeItem));
+        assertThat(builtObject.ignoreNulls(), is(true));
+        assertThat(builtObject.conditionExpression(), is(conditionExpression));
+    }
+
+    @Test
+    public void toBuilder() {
+        UpdateItemEnhancedRequest<FakeItem> builtObject = UpdateItemEnhancedRequest.builder(FakeItem.class).build();
+
+        UpdateItemEnhancedRequest copiedObject = builtObject.toBuilder().build();
+
+        assertThat(copiedObject, is(builtObject));
+    }
+
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/model/WriteBatchTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/model/WriteBatchTest.java
new file mode 100644
index 000000000000..793d83eacddf
--- /dev/null
+++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/model/WriteBatchTest.java
@@ -0,0 +1,111 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.enhanced.dynamodb.model;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsInAnyOrder;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.nullValue;
+import static software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.FakeItem.createUniqueFakeItem;
+
+import java.util.Map;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClient;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbTable;
+import software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.FakeItem;
+import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+import software.amazon.awssdk.services.dynamodb.model.DeleteRequest;
+import software.amazon.awssdk.services.dynamodb.model.PutRequest;
+import software.amazon.awssdk.services.dynamodb.model.WriteRequest;
+
+@RunWith(MockitoJUnitRunner.class)
+public class WriteBatchTest {
+
+    private static final String TABLE_NAME = "table-name";
+
+    @Mock
+    private DynamoDbClient mockDynamoDbClient;
+
+    private DynamoDbEnhancedClient enhancedClient;
+    private DynamoDbTable<FakeItem> fakeItemMappedTable;
+
+    @Before
+    public void setupMappedTables() {
+        enhancedClient = DynamoDbEnhancedClient.builder().dynamoDbClient(mockDynamoDbClient).extensions().build();
+        fakeItemMappedTable = enhancedClient.table(TABLE_NAME, FakeItem.getTableSchema());
+    }
+
+    @Test
+    public void builder_minimal() {
+        WriteBatch builtObject = WriteBatch.builder(FakeItem.class).build();
+
+        assertThat(builtObject.tableName(), is(nullValue()));
+        assertThat(builtObject.writeRequests(), is(nullValue()));
+    }
+
+    @Test
+    public void builder_maximal_consumer_style() {
+        FakeItem fakeItem = createUniqueFakeItem();
+
+        WriteBatch builtObject = WriteBatch.builder(FakeItem.class)
+                                           .mappedTableResource(fakeItemMappedTable)
+                                           .addPutItem(r -> r.item(fakeItem))
+                                           .addDeleteItem(r -> r.key(k -> k.partitionValue(fakeItem.getId())))
+                                           .build();
+
+        Map<String, AttributeValue> fakeItemMap = FakeItem.getTableSchema().itemToMap(fakeItem,
+                                                                                      FakeItem.getTableMetadata().primaryKeys());
+
+        assertThat(builtObject.tableName(), is(TABLE_NAME));
+        assertThat(builtObject.writeRequests(), containsInAnyOrder(putRequest(fakeItemMap), deleteRequest(fakeItemMap)));
+    }
+
+    @Test
+    public void builder_maximal_builder_style() {
+        FakeItem fakeItem = createUniqueFakeItem();
+
+        PutItemEnhancedRequest<FakeItem> putItem = PutItemEnhancedRequest.builder(FakeItem.class).item(fakeItem).build();
+        DeleteItemEnhancedRequest deleteItem = DeleteItemEnhancedRequest.builder()
+                                                                        .key(k -> k.partitionValue(fakeItem.getId()))
+                                                                        .build();
+
+        WriteBatch builtObject = WriteBatch.builder(FakeItem.class)
+                                           .mappedTableResource(fakeItemMappedTable)
+                                           .addPutItem(putItem)
+                                           .addDeleteItem(deleteItem)
+                                           .build();
+
+        Map<String, AttributeValue> fakeItemMap = FakeItem.getTableSchema().itemToMap(fakeItem,
+                                                                                      FakeItem.getTableMetadata().primaryKeys());
+
+        assertThat(builtObject.tableName(), is(TABLE_NAME));
+        assertThat(builtObject.writeRequests(), containsInAnyOrder(putRequest(fakeItemMap), deleteRequest(fakeItemMap)));
+    }
+
+    private static WriteRequest putRequest(Map<String, AttributeValue> itemMap) {
+        return WriteRequest.builder().putRequest(PutRequest.builder().item(itemMap).build()).build();
+    }
+
+    private static WriteRequest deleteRequest(Map<String, AttributeValue> itemMap) {
+        return WriteRequest.builder().deleteRequest(DeleteRequest.builder().key(itemMap).build()).build();
+    }
+
+}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/CommonOperationTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/CommonOperationTest.java
deleted file mode 100644
index 6ba156bafc3d..000000000000
--- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/CommonOperationTest.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.extensions.dynamodb.mappingclient;
-
-import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertThat;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.Spy;
-import org.mockito.junit.MockitoJUnitRunner;
-
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.functionaltests.models.FakeItem;
-import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
-
-@RunWith(MockitoJUnitRunner.class)
-public class CommonOperationTest {
-
-    private static final String FAKE_REQUEST = "fake-request";
-    private static final String FAKE_RESPONSE = "fake-response";
-    private static final String FAKE_RESULT = "fake-result";
-    private static final String FAKE_TABLE_NAME = "fake-table-name";
-    private static final String FAKE_INDEX_NAME = "fake-index-name";
-
-    @Mock
-    private MapperExtension mockMapperExtension;
-
-    @Mock
-    private DynamoDbClient mockDynamoDbClient;
-
-    @Spy
-    private CommonOperation<FakeItem, String, String, String> spyCommonOperation;
-
-    @Before
-    public void stubSpy() {
-        when(spyCommonOperation.generateRequest(any(), any(), any())).thenReturn(FAKE_REQUEST);
-        when(spyCommonOperation.getServiceCall(any())).thenReturn(s -> {
-            if (!FAKE_REQUEST.equals(s)) {
-                throw new RuntimeException("Did not receive expected request");
-            }
-
-            return FAKE_RESPONSE;
-        });
-        when(spyCommonOperation.transformResponse(any(), any(), any(), any())).thenReturn(FAKE_RESULT);
-    }
-
-    @Test
-    public void execute_defaultImplementation_behavesCorrectlyAndReturnsCorrectResult() {
-        OperationContext operationContext = OperationContext.of(FAKE_TABLE_NAME, FAKE_INDEX_NAME);
-        String result = spyCommonOperation.execute(FakeItem.getTableSchema(),
-                                                   operationContext,
-                                                   mockMapperExtension,
-                                                   mockDynamoDbClient);
-
-        assertThat(result, is(FAKE_RESULT));
-        verify(spyCommonOperation).generateRequest(FakeItem.getTableSchema(), operationContext, mockMapperExtension);
-        verify(spyCommonOperation).getServiceCall(mockDynamoDbClient);
-        verify(spyCommonOperation).transformResponse(FAKE_RESPONSE, FakeItem.getTableSchema(), operationContext,
-                                                     mockMapperExtension);
-    }
-}
\ No newline at end of file
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/IndexOperationTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/IndexOperationTest.java
deleted file mode 100644
index 961dfeaf5ebf..000000000000
--- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/IndexOperationTest.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.extensions.dynamodb.mappingclient;
-
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.sameInstance;
-import static org.junit.Assert.assertThat;
-
-import java.util.function.Function;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
-
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.functionaltests.models.FakeItem;
-import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
-
-@RunWith(MockitoJUnitRunner.class)
-public class IndexOperationTest {
-
-    private static final String FAKE_RESULT = "fake-result";
-    private static final String FAKE_TABLE_NAME = "fake-table-name";
-    private static final String FAKE_INDEX_NAME = "fake-index-name";
-
-    private final FakeIndexOperation fakeIndexOperation = new FakeIndexOperation();
-
-    @Mock
-    private MapperExtension mockMapperExtension;
-
-    @Mock
-    private DynamoDbClient mockDynamoDbClient;
-
-    @Test
-    public void executeOnSecondaryIndex_defaultImplementation_callsExecuteCorrectly() {
-        fakeIndexOperation.executeOnSecondaryIndex(FakeItem.getTableSchema(),
-                                                   FAKE_TABLE_NAME,
-                                                   FAKE_INDEX_NAME,
-                                                   mockMapperExtension,
-                                                   mockDynamoDbClient);
-
-        assertThat(fakeIndexOperation.lastDynamoDbClient, sameInstance(mockDynamoDbClient));
-        assertThat(fakeIndexOperation.lastMapperExtension, sameInstance(mockMapperExtension));
-        assertThat(fakeIndexOperation.lastTableSchema, sameInstance(FakeItem.getTableSchema()));
-        assertThat(fakeIndexOperation.lastOperationContext, is(OperationContext.of(FAKE_TABLE_NAME, FAKE_INDEX_NAME)));
-    }
-
-    private static class FakeIndexOperation implements IndexOperation<FakeItem, String, String, String> {
-        private TableSchema<FakeItem> lastTableSchema = null;
-        private OperationContext lastOperationContext = null;
-        private MapperExtension lastMapperExtension = null;
-        private DynamoDbClient lastDynamoDbClient = null;
-
-        @Override
-        public String generateRequest(TableSchema<FakeItem> tableSchema, OperationContext context,
-                                      MapperExtension mapperExtension) {
-            return null;
-        }
-
-        @Override
-        public Function<String, String> getServiceCall(DynamoDbClient dynamoDbClient) {
-            return null;
-        }
-
-        @Override
-        public String transformResponse(String response, TableSchema<FakeItem> tableSchema, OperationContext context,
-                                        MapperExtension mapperExtension) {
-            return null;
-        }
-
-        @Override
-        public String execute(TableSchema<FakeItem> tableSchema,
-                              OperationContext context,
-                              MapperExtension mapperExtension,
-                              DynamoDbClient dynamoDbClient) {
-            lastTableSchema = tableSchema;
-            lastOperationContext = context;
-            lastMapperExtension = mapperExtension;
-            lastDynamoDbClient = dynamoDbClient;
-            return FAKE_RESULT;
-        }
-    }
-}
\ No newline at end of file
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/OperationContextTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/OperationContextTest.java
deleted file mode 100644
index 17b383b2c3ad..000000000000
--- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/OperationContextTest.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.extensions.dynamodb.mappingclient;
-
-import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertThat;
-
-import org.junit.Test;
-
-public class OperationContextTest {
-    @Test
-    public void createWithTableNameAndIndexName() {
-        OperationContext context = OperationContext.of("table_name", "index_name");
-
-        assertThat(context.getTableName(), is("table_name"));
-        assertThat(context.getIndexName(), is("index_name"));
-    }
-
-    @Test
-    public void createWithTableName() {
-        OperationContext context = OperationContext.of("table_name");
-
-        assertThat(context.getTableName(), is("table_name"));
-        assertThat(context.getIndexName(), is(TableMetadata.getPrimaryIndexName()));
-    }
-
-}
\ No newline at end of file
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/TableOperationTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/TableOperationTest.java
deleted file mode 100644
index f860b83a4640..000000000000
--- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/TableOperationTest.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.extensions.dynamodb.mappingclient;
-
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.sameInstance;
-import static org.junit.Assert.assertThat;
-
-import java.util.function.Function;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
-
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.functionaltests.models.FakeItem;
-import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
-
-@RunWith(MockitoJUnitRunner.class)
-public class TableOperationTest {
-
-    private static final String FAKE_RESULT = "fake-result";
-    private static final String FAKE_TABLE_NAME = "fake-table-name";
-
-    private final FakeTableOperation fakeTableOperation = new FakeTableOperation();
-
-    @Mock
-    private MapperExtension mockMapperExtension;
-
-    @Mock
-    private DynamoDbClient mockDynamoDbClient;
-
-    @Test
-    public void executeOnPrimaryIndex_defaultImplementation_callsExecuteCorrectly() {
-        fakeTableOperation.executeOnPrimaryIndex(FakeItem.getTableSchema(),
-                                                 FAKE_TABLE_NAME,
-                                                 mockMapperExtension,
-                                                 mockDynamoDbClient);
-
-        assertThat(fakeTableOperation.lastDynamoDbClient, sameInstance(mockDynamoDbClient));
-        assertThat(fakeTableOperation.lastMapperExtension, sameInstance(mockMapperExtension));
-        assertThat(fakeTableOperation.lastTableSchema, sameInstance(FakeItem.getTableSchema()));
-        assertThat(fakeTableOperation.lastOperationContext, is(
-            OperationContext.of(FAKE_TABLE_NAME, TableMetadata.getPrimaryIndexName())));
-    }
-
-    private static class FakeTableOperation implements TableOperation<FakeItem, String, String, String> {
-        private TableSchema<FakeItem> lastTableSchema = null;
-        private OperationContext lastOperationContext = null;
-        private MapperExtension lastMapperExtension = null;
-        private DynamoDbClient lastDynamoDbClient = null;
-
-        @Override
-        public String generateRequest(TableSchema<FakeItem> tableSchema, OperationContext context,
-                                      MapperExtension mapperExtension) {
-            return null;
-        }
-
-        @Override
-        public Function<String, String> getServiceCall(DynamoDbClient dynamoDbClient) {
-            return null;
-        }
-
-        @Override
-        public String transformResponse(String response, TableSchema<FakeItem> tableSchema, OperationContext context,
-                                        MapperExtension mapperExtension) {
-            return null;
-        }
-
-        @Override
-        public String execute(TableSchema<FakeItem> tableSchema,
-                              OperationContext context,
-                              MapperExtension mapperExtension,
-                              DynamoDbClient dynamoDbClient) {
-            lastTableSchema = tableSchema;
-            lastOperationContext = context;
-            lastMapperExtension = mapperExtension;
-            lastDynamoDbClient = dynamoDbClient;
-            return FAKE_RESULT;
-        }
-    }
-}
\ No newline at end of file
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/core/DynamoDbMappedDatabaseTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/core/DynamoDbMappedDatabaseTest.java
deleted file mode 100644
index 4df19c14d73c..000000000000
--- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/core/DynamoDbMappedDatabaseTest.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.extensions.dynamodb.mappingclient.core;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.nullValue;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
-
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.DatabaseOperation;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.MapperExtension;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.TableSchema;
-import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
-
-@RunWith(MockitoJUnitRunner.class)
-public class DynamoDbMappedDatabaseTest {
-    @Mock
-    private DynamoDbClient mockDynamoDbClient;
-    @Mock
-    private MapperExtension mockMapperExtension;
-    @Mock
-    private DatabaseOperation<?, ?, String> mockDatabaseOperation;
-    @Mock
-    private TableSchema<Object> mockTableSchema;
-
-    @InjectMocks
-    private DynamoDbMappedDatabase dynamoDbMappedDatabase;
-
-    @Test
-    public void execute() {
-        when(mockDatabaseOperation.execute(any(), any())).thenReturn("test");
-
-        String result = dynamoDbMappedDatabase.execute(mockDatabaseOperation);
-
-        assertThat(result, is("test"));
-        verify(mockDatabaseOperation).execute(mockDynamoDbClient, mockMapperExtension);
-    }
-
-    @Test
-    public void table() {
-        DynamoDbMappedTable<Object> mappedTable = dynamoDbMappedDatabase.table("table-name", mockTableSchema);
-
-        assertThat(mappedTable.getDynamoDbClient(), is(mockDynamoDbClient));
-        assertThat(mappedTable.getMapperExtension(), is(mockMapperExtension));
-        assertThat(mappedTable.getTableSchema(), is(mockTableSchema));
-        assertThat(mappedTable.getTableName(), is("table-name"));
-    }
-
-    @Test
-    public void builder_minimal() {
-        DynamoDbMappedDatabase builtObject = DynamoDbMappedDatabase.builder()
-                                                                   .dynamoDbClient(mockDynamoDbClient)
-                                                                   .build();
-
-        assertThat(builtObject.getDynamoDbClient(), is(mockDynamoDbClient));
-        assertThat(builtObject.getMapperExtension(), is(nullValue()));
-    }
-
-    @Test
-    public void builder_maximal() {
-        DynamoDbMappedDatabase builtObject = DynamoDbMappedDatabase.builder()
-                                                                   .dynamoDbClient(mockDynamoDbClient)
-                                                                   .extendWith(mockMapperExtension)
-                                                                   .build();
-
-        assertThat(builtObject.getDynamoDbClient(), is(mockDynamoDbClient));
-        assertThat(builtObject.getMapperExtension(), is(mockMapperExtension));
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void builder_missingDynamoDbClient() {
-        DynamoDbMappedDatabase.builder().extendWith(mockMapperExtension).build();
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void builder_extraExtension() {
-        DynamoDbMappedDatabase.builder()
-                              .dynamoDbClient(mockDynamoDbClient)
-                              .extendWith(mockMapperExtension)
-                              .extendWith(mock(MapperExtension.class))
-                              .build();
-    }
-
-    @Test
-    public void toBuilder() {
-        DynamoDbMappedDatabase copiedObject = dynamoDbMappedDatabase.toBuilder().build();
-
-        assertThat(copiedObject, is(dynamoDbMappedDatabase));
-    }
-}
\ No newline at end of file
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/core/DynamoDbMappedIndexTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/core/DynamoDbMappedIndexTest.java
deleted file mode 100644
index 0dd4cc020c09..000000000000
--- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/core/DynamoDbMappedIndexTest.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.extensions.dynamodb.mappingclient.core;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.is;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.AttributeValues.stringValue;
-
-import java.util.Optional;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
-
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.IndexOperation;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.Key;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.MapperExtension;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.OperationContext;
-import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.functionaltests.models.FakeItem;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.functionaltests.models.FakeItemWithIndices;
-
-@RunWith(MockitoJUnitRunner.class)
-public class DynamoDbMappedIndexTest {
-    @Mock
-    private DynamoDbClient mockDynamoDbClient;
-
-    @Mock
-    private IndexOperation<FakeItem, Object, Object, FakeItem> mockIndexOperation;
-
-    @Mock
-    private MapperExtension mockMapperExtension;
-
-    @Test
-    public void execute() {
-        FakeItem expectedOutput = FakeItem.createUniqueFakeItem();
-        DynamoDbMappedIndex<FakeItem> dynamoDbMappedIndex = new DynamoDbMappedIndex<>(mockDynamoDbClient,
-                                                                                      mockMapperExtension,
-                                                                                      FakeItem.getTableSchema(),
-                                                                                      "test_table",
-                                                                                      "test_index");
-        when(mockIndexOperation.executeOnSecondaryIndex(any(), any(), any(), any(), any())).thenReturn(expectedOutput);
-
-        FakeItem actualOutput = dynamoDbMappedIndex.execute(mockIndexOperation);
-
-        assertThat(actualOutput, is(expectedOutput));
-        verify(mockIndexOperation).executeOnSecondaryIndex(FakeItem.getTableSchema(),
-                                                           "test_table",
-                                                           "test_index",
-                                                           mockMapperExtension,
-                                                           mockDynamoDbClient);
-    }
-
-    @Test
-    public void keyFrom_secondaryIndex_partitionAndSort() {
-        FakeItemWithIndices item = FakeItemWithIndices.createUniqueFakeItemWithIndices();
-        DynamoDbMappedIndex<FakeItemWithIndices> dynamoDbMappedIndex =
-            new DynamoDbMappedIndex<>(mockDynamoDbClient,
-                                      mockMapperExtension,
-                                      FakeItemWithIndices.getTableSchema(),
-                                      "test_table",
-                                      "gsi_1");
-
-        Key key = dynamoDbMappedIndex.keyFrom(item);
-
-        assertThat(key.getPartitionKeyValue(), is(stringValue(item.getGsiId())));
-        assertThat(key.getSortKeyValue(), is(Optional.of(stringValue(item.getGsiSort()))));
-    }
-
-    @Test
-    public void keyFrom_secondaryIndex_partitionOnly() {
-        FakeItemWithIndices item = FakeItemWithIndices.createUniqueFakeItemWithIndices();
-        DynamoDbMappedIndex<FakeItemWithIndices> dynamoDbMappedIndex =
-            new DynamoDbMappedIndex<>(mockDynamoDbClient,
-                                      mockMapperExtension,
-                                      FakeItemWithIndices.getTableSchema(),
-                                      "test_table",
-                                      "gsi_2");
-
-        Key key = dynamoDbMappedIndex.keyFrom(item);
-
-        assertThat(key.getPartitionKeyValue(), is(stringValue(item.getGsiId())));
-        assertThat(key.getSortKeyValue(), is(Optional.empty()));
-    }
-}
\ No newline at end of file
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/core/DynamoDbMappedTableTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/core/DynamoDbMappedTableTest.java
deleted file mode 100644
index 7ec3fdf48064..000000000000
--- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/core/DynamoDbMappedTableTest.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.extensions.dynamodb.mappingclient.core;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.sameInstance;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.AttributeValues.stringValue;
-
-import java.util.Optional;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
-
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.Key;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.MapperExtension;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.OperationContext;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.TableOperation;
-import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.functionaltests.models.FakeItem;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.functionaltests.models.FakeItemWithIndices;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.functionaltests.models.FakeItemWithSort;
-
-@RunWith(MockitoJUnitRunner.class)
-public class DynamoDbMappedTableTest {
-    private static final String TABLE_NAME = "table-name";
-
-    @Mock
-    private DynamoDbClient mockDynamoDbClient;
-
-    @Mock
-    private MapperExtension mockMapperExtension;
-
-    @Mock
-    private TableOperation<FakeItem, Object, Object, FakeItem> mockTableOperation;
-
-    @Test
-    public void execute_callsOperationCorrectly() {
-        FakeItem expectedOutput = FakeItem.createUniqueFakeItem();
-        when(mockTableOperation.executeOnPrimaryIndex(any(), any(), any(), any())).thenReturn(expectedOutput);
-        DynamoDbMappedTable<FakeItem> dynamoDbMappedTable = new DynamoDbMappedTable<>(mockDynamoDbClient,
-                                                                                      mockMapperExtension,
-                                                                                      FakeItem.getTableSchema(),
-                                                                                      TABLE_NAME);
-
-        FakeItem actualOutput = dynamoDbMappedTable.execute(mockTableOperation);
-
-        assertThat(actualOutput, is(expectedOutput));
-        verify(mockTableOperation).executeOnPrimaryIndex(FakeItem.getTableSchema(),
-                                           dynamoDbMappedTable.getTableName(),
-                                           mockMapperExtension,
-                                           mockDynamoDbClient);
-    }
-
-    @Test
-    public void index_constructsCorrectMappedIndex() {
-        DynamoDbMappedTable<FakeItemWithIndices> dynamoDbMappedTable =
-            new DynamoDbMappedTable<>(mockDynamoDbClient,
-                                      mockMapperExtension,
-                                      FakeItemWithIndices.getTableSchema(),
-                                      TABLE_NAME);
-
-        DynamoDbMappedIndex<FakeItemWithIndices> dynamoDbMappedIndex = dynamoDbMappedTable.index("gsi_1");
-
-        assertThat(dynamoDbMappedIndex.getDynamoDbClient(), is(sameInstance(mockDynamoDbClient)));
-        assertThat(dynamoDbMappedIndex.getMapperExtension(), is(sameInstance(mockMapperExtension)));
-        assertThat(dynamoDbMappedIndex.getTableSchema(), is(sameInstance(FakeItemWithIndices.getTableSchema())));
-        assertThat(dynamoDbMappedIndex.getIndexName(), is("gsi_1"));
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void index_invalidIndex_throwsIllegalArgumentException() {
-        DynamoDbMappedTable<FakeItemWithIndices> dynamoDbMappedTable =
-            new DynamoDbMappedTable<>(mockDynamoDbClient,
-                                      mockMapperExtension,
-                                      FakeItemWithIndices.getTableSchema(),
-                                      TABLE_NAME);
-
-        dynamoDbMappedTable.index("invalid");
-    }
-
-    @Test
-    public void keyFrom_primaryIndex_partitionAndSort() {
-        FakeItemWithSort item = FakeItemWithSort.createUniqueFakeItemWithSort();
-        DynamoDbMappedTable<FakeItemWithSort> dynamoDbMappedIndex =
-            new DynamoDbMappedTable<>(mockDynamoDbClient,
-                                      mockMapperExtension,
-                                      FakeItemWithSort.getTableSchema(),
-                                      "test_table");
-
-        Key key = dynamoDbMappedIndex.keyFrom(item);
-
-        assertThat(key.getPartitionKeyValue(), is(stringValue(item.getId())));
-        assertThat(key.getSortKeyValue(), is(Optional.of(stringValue(item.getSort()))));
-    }
-
-    @Test
-    public void keyFrom_primaryIndex_partitionOnly() {
-        FakeItem item = FakeItem.createUniqueFakeItem();
-        DynamoDbMappedTable<FakeItem> dynamoDbMappedIndex =
-            new DynamoDbMappedTable<>(mockDynamoDbClient,
-                                      mockMapperExtension,
-                                      FakeItem.getTableSchema(),
-                                      "test_table");
-
-        Key key = dynamoDbMappedIndex.keyFrom(item);
-
-        assertThat(key.getPartitionKeyValue(), is(stringValue(item.getId())));
-        assertThat(key.getSortKeyValue(), is(Optional.empty()));
-    }
-
-    @Test
-    public void keyFrom_primaryIndex_partitionAndNullSort() {
-        FakeItemWithSort item = FakeItemWithSort.createUniqueFakeItemWithoutSort();
-        DynamoDbMappedTable<FakeItemWithSort> dynamoDbMappedIndex =
-            new DynamoDbMappedTable<>(mockDynamoDbClient,
-                                      mockMapperExtension,
-                                      FakeItemWithSort.getTableSchema(),
-                                      "test_table");
-
-        Key key = dynamoDbMappedIndex.keyFrom(item);
-
-        assertThat(key.getPartitionKeyValue(), is(stringValue(item.getId())));
-        assertThat(key.getSortKeyValue(), is(Optional.empty()));
-    }
-}
\ No newline at end of file
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/core/KeyTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/core/KeyTest.java
deleted file mode 100644
index e14dc76f0d4a..000000000000
--- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/core/KeyTest.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.extensions.dynamodb.mappingclient.core;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.is;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.AttributeValues.stringValue;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Optional;
-
-import org.junit.Test;
-
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.Key;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.functionaltests.models.FakeItemWithIndices;
-
-public class KeyTest {
-    private final Key key = Key.of(stringValue("id123"), stringValue("id456"));
-    private final Key partitionOnlyKey = Key.of(stringValue("id123"));
-
-    @Test
-    public void getKeyMap() {
-        Map<String, AttributeValue> expectedResult = new HashMap<>();
-        expectedResult.put("gsi_id", AttributeValue.builder().s("id123").build());
-        expectedResult.put("gsi_sort", AttributeValue.builder().s("id456").build());
-        assertThat(key.getKeyMap(FakeItemWithIndices.getTableSchema(), "gsi_1"), is(expectedResult));
-    }
-
-    @Test
-    public void getPrimaryKeyMap() {
-        Map<String, AttributeValue> expectedResult = new HashMap<>();
-        expectedResult.put("id", AttributeValue.builder().s("id123").build());
-        expectedResult.put("sort", AttributeValue.builder().s("id456").build());
-        assertThat(key.getPrimaryKeyMap(FakeItemWithIndices.getTableSchema()), is(expectedResult));
-    }
-
-    @Test
-    public void getPartitionKeyValue() {
-        assertThat(key.getPartitionKeyValue(),
-                   is(AttributeValue.builder().s("id123").build()));
-    }
-
-    @Test
-    public void getSortKeyValue() {
-        assertThat(key.getSortKeyValue(), is(Optional.of(AttributeValue.builder().s("id456").build())));
-    }
-
-    @Test
-    public void getKeyMap_partitionOnly() {
-        Map<String, AttributeValue> expectedResult = new HashMap<>();
-        expectedResult.put("gsi_id", AttributeValue.builder().s("id123").build());
-        assertThat(partitionOnlyKey.getKeyMap(FakeItemWithIndices.getTableSchema(), "gsi_1"), is(expectedResult));
-    }
-
-    @Test
-    public void getPrimaryKeyMap_partitionOnly() {
-        Map<String, AttributeValue> expectedResult = new HashMap<>();
-        expectedResult.put("id", AttributeValue.builder().s("id123").build());
-        assertThat(partitionOnlyKey.getPrimaryKeyMap(FakeItemWithIndices.getTableSchema()), is(expectedResult));
-    }
-
-    @Test
-    public void getPartitionKeyValue_partitionOnly() {
-        assertThat(partitionOnlyKey.getPartitionKeyValue(),
-                   is(AttributeValue.builder().s("id123").build()));
-    }
-
-    @Test
-    public void getSortKeyValue_partitionOnly() {
-        assertThat(partitionOnlyKey.getSortKeyValue(), is(Optional.empty()));
-    }
-}
\ No newline at end of file
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/extensions/ChainMapperExtensionTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/extensions/ChainMapperExtensionTest.java
deleted file mode 100644
index b6c7554728f1..000000000000
--- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/extensions/ChainMapperExtensionTest.java
+++ /dev/null
@@ -1,275 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.extensions.dynamodb.mappingclient.extensions;
-
-import static java.util.stream.Collectors.toList;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.nullValue;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyMap;
-import static org.mockito.Mockito.when;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.functionaltests.models.FakeItem.createUniqueFakeItem;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.IntStream;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.InOrder;
-import org.mockito.Mock;
-import org.mockito.Mockito;
-import org.mockito.junit.MockitoJUnitRunner;
-
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.Expression;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.MapperExtension;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.OperationContext;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.TableMetadata;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.functionaltests.models.FakeItem;
-
-@RunWith(MockitoJUnitRunner.class)
-public class ChainMapperExtensionTest {
-    private static final String TABLE_NAME = "concrete-table-name";
-    private static final OperationContext PRIMARY_CONTEXT =
-        OperationContext.of(TABLE_NAME, TableMetadata.getPrimaryIndexName());
-
-    private static final Map<String, AttributeValue> ATTRIBUTE_VALUES_1 =
-        Collections.unmodifiableMap(Collections.singletonMap("key1", AttributeValue.builder().s("1").build()));
-    private static final Map<String, AttributeValue> ATTRIBUTE_VALUES_2 =
-        Collections.unmodifiableMap(Collections.singletonMap("key2", AttributeValue.builder().s("2").build()));
-    private static final Map<String, AttributeValue> ATTRIBUTE_VALUES_3 =
-        Collections.unmodifiableMap(Collections.singletonMap("key3", AttributeValue.builder().s("3").build()));
-
-    @Mock
-    private MapperExtension mockExtension1;
-    @Mock
-    private MapperExtension mockExtension2;
-    @Mock
-    private MapperExtension mockExtension3;
-
-    private final List<Map<String, AttributeValue>> fakeItems =
-        IntStream.range(0, 4)
-                 .mapToObj($ -> createUniqueFakeItem())
-                 .map(fakeItem -> FakeItem.getTableSchema().itemToMap(fakeItem, true))
-                 .collect(toList());
-
-    @Test
-    public void beforeWrite_multipleExtensions_multipleConditions_multipleTransformations() {
-        Expression expression1 = Expression.builder().expression("one").expressionValues(ATTRIBUTE_VALUES_1).build();
-        Expression expression2 = Expression.builder().expression("two").expressionValues(ATTRIBUTE_VALUES_2).build();
-        Expression expression3 = Expression.builder().expression("three").expressionValues(ATTRIBUTE_VALUES_3).build();
-        ChainMapperExtension extension = ChainMapperExtension.of(mockExtension1, mockExtension2, mockExtension3);
-        WriteModification writeModification1 = WriteModification.builder()
-                                                                .additionalConditionalExpression(expression1)
-                                                                .transformedItem(fakeItems.get(1))
-                                                                .build();
-        WriteModification writeModification2 = WriteModification.builder()
-                                                                .additionalConditionalExpression(expression2)
-                                                                .transformedItem(fakeItems.get(2))
-                                                                .build();
-        WriteModification writeModification3 = WriteModification.builder()
-                                                                .additionalConditionalExpression(expression3)
-                                                                .transformedItem(fakeItems.get(3))
-                                                                .build();
-        when(mockExtension1.beforeWrite(anyMap(), any(), any())).thenReturn(writeModification1);
-        when(mockExtension2.beforeWrite(anyMap(), any(), any())).thenReturn(writeModification2);
-        when(mockExtension3.beforeWrite(anyMap(), any(), any())).thenReturn(writeModification3);
-
-        WriteModification result = extension.beforeWrite(fakeItems.get(0), 
-                                                         PRIMARY_CONTEXT,
-                                                         FakeItem.getTableMetadata());
-
-        Map<String, AttributeValue> combinedMap = new HashMap<>(ATTRIBUTE_VALUES_1);
-        combinedMap.putAll(ATTRIBUTE_VALUES_2);
-        combinedMap.putAll(ATTRIBUTE_VALUES_3);
-        Expression expectedExpression =
-            Expression.builder().expression("one AND two AND three").expressionValues(combinedMap).build();
-        assertThat(result.getTransformedItem(), is(fakeItems.get(3)));
-        assertThat(result.getAdditionalConditionalExpression(), is(expectedExpression));
-
-        InOrder inOrder = Mockito.inOrder(mockExtension1, mockExtension2, mockExtension3);
-        inOrder.verify(mockExtension1).beforeWrite(fakeItems.get(0), PRIMARY_CONTEXT, FakeItem.getTableMetadata());
-        inOrder.verify(mockExtension2).beforeWrite(fakeItems.get(1), PRIMARY_CONTEXT, FakeItem.getTableMetadata());
-        inOrder.verify(mockExtension3).beforeWrite(fakeItems.get(2), PRIMARY_CONTEXT, FakeItem.getTableMetadata());
-        inOrder.verifyNoMoreInteractions();
-    }
-
-    @Test
-    public void beforeWrite_multipleExtensions_doingNothing() {
-        ChainMapperExtension extension = ChainMapperExtension.of(mockExtension1, mockExtension2, mockExtension3);
-        when(mockExtension1.beforeWrite(anyMap(), any(), any())).thenReturn(WriteModification.builder().build());
-        when(mockExtension2.beforeWrite(anyMap(), any(), any())).thenReturn(WriteModification.builder().build());
-        when(mockExtension3.beforeWrite(anyMap(), any(), any())).thenReturn(WriteModification.builder().build());
-
-        WriteModification result = extension.beforeWrite(fakeItems.get(0), 
-                                                         PRIMARY_CONTEXT,
-                                                         FakeItem.getTableMetadata());
-
-        assertThat(result.getAdditionalConditionalExpression(), is(nullValue()));
-        assertThat(result.getTransformedItem(), is(nullValue()));
-
-        InOrder inOrder = Mockito.inOrder(mockExtension1, mockExtension2, mockExtension3);
-        inOrder.verify(mockExtension1).beforeWrite(fakeItems.get(0), PRIMARY_CONTEXT, FakeItem.getTableMetadata());
-        inOrder.verify(mockExtension2).beforeWrite(fakeItems.get(0), PRIMARY_CONTEXT, FakeItem.getTableMetadata());
-        inOrder.verify(mockExtension3).beforeWrite(fakeItems.get(0), PRIMARY_CONTEXT, FakeItem.getTableMetadata());
-        inOrder.verifyNoMoreInteractions();
-    }
-
-    @Test
-    public void beforeWrite_multipleExtensions_singleCondition_noTransformations() {
-        Expression expression = Expression.builder().expression("one").expressionValues(ATTRIBUTE_VALUES_1).build();
-        ChainMapperExtension extension = ChainMapperExtension.of(mockExtension1, mockExtension2, mockExtension3);
-        WriteModification writeModification1 = WriteModification.builder().build();
-        WriteModification writeModification2 = WriteModification.builder()
-                                                                .additionalConditionalExpression(expression)
-                                                                .build();
-        WriteModification writeModification3 = WriteModification.builder().build();
-        when(mockExtension1.beforeWrite(anyMap(), any(), any())).thenReturn(writeModification1);
-        when(mockExtension2.beforeWrite(anyMap(), any(), any())).thenReturn(writeModification2);
-        when(mockExtension3.beforeWrite(anyMap(), any(), any())).thenReturn(writeModification3);
-
-        WriteModification result = extension.beforeWrite(fakeItems.get(0), 
-                                                         PRIMARY_CONTEXT,
-                                                         FakeItem.getTableMetadata());
-
-        Expression expectedExpression = Expression.builder()
-                                                  .expression("one")
-                                                  .expressionValues(ATTRIBUTE_VALUES_1)
-                                                  .build();
-        assertThat(result.getTransformedItem(), is(nullValue()));
-        assertThat(result.getAdditionalConditionalExpression(), is(expectedExpression));
-
-        InOrder inOrder = Mockito.inOrder(mockExtension1, mockExtension2, mockExtension3);
-        inOrder.verify(mockExtension1).beforeWrite(fakeItems.get(0), PRIMARY_CONTEXT, FakeItem.getTableMetadata());
-        inOrder.verify(mockExtension2).beforeWrite(fakeItems.get(0), PRIMARY_CONTEXT, FakeItem.getTableMetadata());
-        inOrder.verify(mockExtension3).beforeWrite(fakeItems.get(0), PRIMARY_CONTEXT, FakeItem.getTableMetadata());
-        inOrder.verifyNoMoreInteractions();
-    }
-
-    @Test
-    public void beforeWrite_multipleExtensions_noConditions_singleTransformation() {
-        ChainMapperExtension extension = ChainMapperExtension.of(mockExtension1, mockExtension2, mockExtension3);
-        WriteModification writeModification1 = WriteModification.builder().build();
-        WriteModification writeModification2 = WriteModification.builder()
-                                                                .transformedItem(fakeItems.get(1))
-                                                                .build();
-        WriteModification writeModification3 = WriteModification.builder().build();
-        when(mockExtension1.beforeWrite(anyMap(), any(), any())).thenReturn(writeModification1);
-        when(mockExtension2.beforeWrite(anyMap(), any(), any())).thenReturn(writeModification2);
-        when(mockExtension3.beforeWrite(anyMap(), any(), any())).thenReturn(writeModification3);
-
-        WriteModification result = extension.beforeWrite(fakeItems.get(0), 
-                                                         PRIMARY_CONTEXT,
-                                                         FakeItem.getTableMetadata());
-
-        assertThat(result.getTransformedItem(), is(fakeItems.get(1)));
-        assertThat(result.getAdditionalConditionalExpression(), is(nullValue()));
-
-        InOrder inOrder = Mockito.inOrder(mockExtension1, mockExtension2, mockExtension3);
-        inOrder.verify(mockExtension1).beforeWrite(fakeItems.get(0), PRIMARY_CONTEXT, FakeItem.getTableMetadata());
-        inOrder.verify(mockExtension2).beforeWrite(fakeItems.get(0), PRIMARY_CONTEXT, FakeItem.getTableMetadata());
-        inOrder.verify(mockExtension3).beforeWrite(fakeItems.get(1), PRIMARY_CONTEXT, FakeItem.getTableMetadata());
-        inOrder.verifyNoMoreInteractions();
-    }
-
-    @Test
-    public void beforeWrite_noExtensions() {
-        ChainMapperExtension extension = ChainMapperExtension.of();
-
-        WriteModification result = extension.beforeWrite(fakeItems.get(0),
-                                                         PRIMARY_CONTEXT,
-                                                         FakeItem.getTableMetadata());
-
-        assertThat(result.getTransformedItem(), is(nullValue()));
-        assertThat(result.getAdditionalConditionalExpression(), is(nullValue()));
-    }
-
-    @Test
-    public void afterRead_multipleExtensions_multipleTransformations() {
-        ChainMapperExtension extension = ChainMapperExtension.of(mockExtension1, mockExtension2, mockExtension3);
-        ReadModification readModification1 = ReadModification.builder().transformedItem(fakeItems.get(1)).build();
-        ReadModification readModification2 = ReadModification.builder().transformedItem(fakeItems.get(2)).build();
-        ReadModification readModification3 = ReadModification.builder().transformedItem(fakeItems.get(3)).build();
-        when(mockExtension1.afterRead(anyMap(), any(), any())).thenReturn(readModification1);
-        when(mockExtension2.afterRead(anyMap(), any(), any())).thenReturn(readModification2);
-        when(mockExtension3.afterRead(anyMap(), any(), any())).thenReturn(readModification3);
-
-        ReadModification result = extension.afterRead(fakeItems.get(0), PRIMARY_CONTEXT,  FakeItem.getTableMetadata());
-
-        assertThat(result.getTransformedItem(), is(fakeItems.get(1)));
-
-        InOrder inOrder = Mockito.inOrder(mockExtension1, mockExtension2, mockExtension3);
-        inOrder.verify(mockExtension3).afterRead(fakeItems.get(0), PRIMARY_CONTEXT, FakeItem.getTableMetadata());
-        inOrder.verify(mockExtension2).afterRead(fakeItems.get(3), PRIMARY_CONTEXT, FakeItem.getTableMetadata());
-        inOrder.verify(mockExtension1).afterRead(fakeItems.get(2), PRIMARY_CONTEXT, FakeItem.getTableMetadata());
-        inOrder.verifyNoMoreInteractions();
-    }
-
-    @Test
-    public void afterRead_multipleExtensions_singleTransformation() {
-        ChainMapperExtension extension = ChainMapperExtension.of(mockExtension1, mockExtension2, mockExtension3);
-        ReadModification readModification1 = ReadModification.builder().build();
-        ReadModification readModification2 = ReadModification.builder().transformedItem(fakeItems.get(1)).build();
-        ReadModification readModification3 = ReadModification.builder().build();
-        when(mockExtension1.afterRead(anyMap(), any(), any())).thenReturn(readModification1);
-        when(mockExtension2.afterRead(anyMap(), any(), any())).thenReturn(readModification2);
-        when(mockExtension3.afterRead(anyMap(), any(), any())).thenReturn(readModification3);
-
-        ReadModification result = extension.afterRead(fakeItems.get(0), PRIMARY_CONTEXT, FakeItem.getTableMetadata());
-
-        assertThat(result.getTransformedItem(), is(fakeItems.get(1)));
-
-        InOrder inOrder = Mockito.inOrder(mockExtension1, mockExtension2, mockExtension3);
-        inOrder.verify(mockExtension3).afterRead(fakeItems.get(0), PRIMARY_CONTEXT, FakeItem.getTableMetadata());
-        inOrder.verify(mockExtension2).afterRead(fakeItems.get(0), PRIMARY_CONTEXT, FakeItem.getTableMetadata());
-        inOrder.verify(mockExtension1).afterRead(fakeItems.get(1), PRIMARY_CONTEXT, FakeItem.getTableMetadata());
-        inOrder.verifyNoMoreInteractions();
-    }
-
-    @Test
-    public void afterRead_multipleExtensions_noTransformations() {
-        ChainMapperExtension extension = ChainMapperExtension.of(mockExtension1, mockExtension2, mockExtension3);
-        ReadModification readModification1 = ReadModification.builder().build();
-        ReadModification readModification2 = ReadModification.builder().build();
-        ReadModification readModification3 = ReadModification.builder().build();
-        when(mockExtension1.afterRead(anyMap(), any(), any())).thenReturn(readModification1);
-        when(mockExtension2.afterRead(anyMap(), any(), any())).thenReturn(readModification2);
-        when(mockExtension3.afterRead(anyMap(), any(), any())).thenReturn(readModification3);
-
-        ReadModification result = extension.afterRead(fakeItems.get(0), PRIMARY_CONTEXT, FakeItem.getTableMetadata());
-
-        assertThat(result.getTransformedItem(), is(nullValue()));
-
-        InOrder inOrder = Mockito.inOrder(mockExtension1, mockExtension2, mockExtension3);
-        inOrder.verify(mockExtension3).afterRead(fakeItems.get(0), PRIMARY_CONTEXT, FakeItem.getTableMetadata());
-        inOrder.verify(mockExtension2).afterRead(fakeItems.get(0), PRIMARY_CONTEXT, FakeItem.getTableMetadata());
-        inOrder.verify(mockExtension1).afterRead(fakeItems.get(0), PRIMARY_CONTEXT, FakeItem.getTableMetadata());
-        inOrder.verifyNoMoreInteractions();
-    }
-
-    @Test
-    public void afterRead_noExtensions() {
-        ChainMapperExtension extension = ChainMapperExtension.of();
-
-        ReadModification result = extension.afterRead(fakeItems.get(0), PRIMARY_CONTEXT, FakeItem.getTableMetadata());
-
-        assertThat(result.getTransformedItem(), is(nullValue()));
-    }
-}
\ No newline at end of file
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/extensions/VersionedRecordExtensionTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/extensions/VersionedRecordExtensionTest.java
deleted file mode 100644
index e41aa21736fd..000000000000
--- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/extensions/VersionedRecordExtensionTest.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.extensions.dynamodb.mappingclient.extensions;
-
-import static java.util.Collections.singletonMap;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.is;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.functionaltests.models.FakeItem.createUniqueFakeItem;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.functionaltests.models.FakeItemWithSort.createUniqueFakeItemWithSort;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.junit.Test;
-
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.Expression;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.OperationContext;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.TableMetadata;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.functionaltests.models.FakeItem;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.functionaltests.models.FakeItemWithSort;
-
-public class VersionedRecordExtensionTest {
-    private static final String TABLE_NAME = "table-name";
-    private static final OperationContext PRIMARY_CONTEXT =
-        OperationContext.of(TABLE_NAME, TableMetadata.getPrimaryIndexName());
-
-    private final VersionedRecordExtension versionedRecordExtension = VersionedRecordExtension.builder().build();
-
-    @Test
-    public void beforeRead_doesNotTransformObject() {
-        FakeItem fakeItem = createUniqueFakeItem();
-        Map<String, AttributeValue> fakeItemMap = FakeItem.getTableSchema().itemToMap(fakeItem, true);
-
-        ReadModification result =
-            versionedRecordExtension.afterRead(fakeItemMap, PRIMARY_CONTEXT, FakeItem.getTableMetadata());
-
-        assertThat(result, is(ReadModification.builder().build()));
-    }
-
-    @Test
-    public void beforeWrite_initialVersion_expressionIsCorrect() {
-        FakeItem fakeItem = createUniqueFakeItem();
-
-        WriteModification result =
-            versionedRecordExtension.beforeWrite(FakeItem.getTableSchema().itemToMap(fakeItem, true),
-                                                 PRIMARY_CONTEXT,
-                                                 FakeItem.getTableMetadata());
-
-        assertThat(result.getAdditionalConditionalExpression(),
-                   is(Expression.builder().expression("attribute_not_exists(version)").build()));
-    }
-
-    @Test
-    public void beforeWrite_initialVersion_transformedItemIsCorrect() {
-        FakeItem fakeItem = createUniqueFakeItem();
-        Map<String, AttributeValue> fakeItemWithInitialVersion =
-            new HashMap<>(FakeItem.getTableSchema().itemToMap(fakeItem, true));
-        fakeItemWithInitialVersion.put("version", AttributeValue.builder().n("1").build());
-
-        WriteModification result =
-            versionedRecordExtension.beforeWrite(FakeItem.getTableSchema().itemToMap(fakeItem, true),
-                                                 PRIMARY_CONTEXT,
-                                                 FakeItem.getTableMetadata());
-
-
-        assertThat(result.getTransformedItem(), is(fakeItemWithInitialVersion));
-    }
-
-    @Test
-    public void beforeWrite_initialVersionDueToExplicitNull_transformedItemIsCorrect() {
-        FakeItem fakeItem = createUniqueFakeItem();
-        Map<String, AttributeValue> inputMap =
-            new HashMap<>(FakeItem.getTableSchema().itemToMap(fakeItem, true));
-        inputMap.put("version", AttributeValue.builder().nul(true).build());
-        Map<String, AttributeValue> fakeItemWithInitialVersion =
-            new HashMap<>(FakeItem.getTableSchema().itemToMap(fakeItem, true));
-        fakeItemWithInitialVersion.put("version", AttributeValue.builder().n("1").build());
-
-        WriteModification result =
-            versionedRecordExtension.beforeWrite(inputMap, PRIMARY_CONTEXT, FakeItem.getTableMetadata());
-
-        assertThat(result.getTransformedItem(), is(fakeItemWithInitialVersion));
-    }
-
-    @Test
-    public void beforeWrite_existingVersion_expressionIsCorrect() {
-        FakeItem fakeItem = createUniqueFakeItem();
-        fakeItem.setVersion(13);
-
-        WriteModification result =
-            versionedRecordExtension.beforeWrite(FakeItem.getTableSchema().itemToMap(fakeItem, true),
-                                                 PRIMARY_CONTEXT,
-                                                 FakeItem.getTableMetadata());
-
-        assertThat(result.getAdditionalConditionalExpression(),
-                   is(Expression.builder()
-                                .expression("version = :old_version_value")
-                                .expressionValues(singletonMap(":old_version_value",
-                                                               AttributeValue.builder().n("13").build()))
-                                .build()));
-    }
-
-    @Test
-    public void beforeWrite_existingVersion_transformedItemIsCorrect() {
-        FakeItem fakeItem = createUniqueFakeItem();
-        fakeItem.setVersion(13);
-        Map<String, AttributeValue> fakeItemWithInitialVersion =
-            new HashMap<>(FakeItem.getTableSchema().itemToMap(fakeItem, true));
-        fakeItemWithInitialVersion.put("version", AttributeValue.builder().n("14").build());
-
-        WriteModification result =
-            versionedRecordExtension.beforeWrite(FakeItem.getTableSchema().itemToMap(fakeItem, true),
-                                                 PRIMARY_CONTEXT,
-                                                 FakeItem.getTableMetadata());
-
-
-        assertThat(result.getTransformedItem(), is(fakeItemWithInitialVersion));
-    }
-
-    @Test
-    public void beforeWrite_returnsNoOpModification_ifVersionAttributeNotDefined() {
-        FakeItemWithSort fakeItemWithSort = createUniqueFakeItemWithSort();
-        Map<String, AttributeValue> itemMap =
-            new HashMap<>(FakeItemWithSort.getTableSchema().itemToMap(fakeItemWithSort, true));
-
-        WriteModification writeModification = versionedRecordExtension.beforeWrite(itemMap,
-                                                                                   PRIMARY_CONTEXT,
-                                                                                   FakeItemWithSort.getTableSchema().getTableMetadata());
-
-        assertThat(writeModification, is(WriteModification.builder().build()));
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void beforeWrite_throwsIllegalArgumentException_ifVersionAttributeIsWrongType() {
-        FakeItem fakeItem = createUniqueFakeItem();
-        Map<String, AttributeValue> fakeItemWIthBadVersion =
-            new HashMap<>(FakeItem.getTableSchema().itemToMap(fakeItem, true));
-        fakeItemWIthBadVersion.put("version", AttributeValue.builder().s("14").build());
-
-        versionedRecordExtension.beforeWrite(fakeItemWIthBadVersion, PRIMARY_CONTEXT, FakeItem.getTableMetadata());
-    }
-}
\ No newline at end of file
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/functionaltests/BasicCrudTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/functionaltests/BasicCrudTest.java
deleted file mode 100644
index b53b96704df5..000000000000
--- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/functionaltests/BasicCrudTest.java
+++ /dev/null
@@ -1,453 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.extensions.dynamodb.mappingclient.functionaltests;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.nullValue;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.AttributeValues.stringValue;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.staticmapper.AttributeTags.primaryPartitionKey;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.staticmapper.AttributeTags.primarySortKey;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.staticmapper.AttributeTags.secondaryPartitionKey;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.staticmapper.AttributeTags.secondarySortKey;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.staticmapper.Attributes.string;
-
-import java.util.Objects;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.Key;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.MappedDatabase;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.MappedTable;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.TableSchema;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.operations.CreateTable;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.operations.DeleteItem;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.operations.GetItem;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.operations.GlobalSecondaryIndex;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.operations.PutItem;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.operations.UpdateItem;
-import software.amazon.awssdk.services.dynamodb.model.DeleteTableRequest;
-import software.amazon.awssdk.services.dynamodb.model.Projection;
-import software.amazon.awssdk.services.dynamodb.model.ProjectionType;
-
-public class BasicCrudTest extends LocalDynamoDbTestBase {
-    private static class Record {
-        private String id;
-        private String sort;
-        private String attribute;
-        private String attribute2;
-        private String attribute3;
-
-        private String getId() {
-            return id;
-        }
-
-        private Record setId(String id) {
-            this.id = id;
-            return this;
-        }
-
-        private String getSort() {
-            return sort;
-        }
-
-        private Record setSort(String sort) {
-            this.sort = sort;
-            return this;
-        }
-
-        private String getAttribute() {
-            return attribute;
-        }
-
-        private Record setAttribute(String attribute) {
-            this.attribute = attribute;
-            return this;
-        }
-
-        private String getAttribute2() {
-            return attribute2;
-        }
-
-        private Record setAttribute2(String attribute2) {
-            this.attribute2 = attribute2;
-            return this;
-        }
-
-        private String getAttribute3() {
-            return attribute3;
-        }
-
-        private Record setAttribute3(String attribute3) {
-            this.attribute3 = attribute3;
-            return this;
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            if (this == o) return true;
-            if (o == null || getClass() != o.getClass()) return false;
-            Record record = (Record) o;
-            return Objects.equals(id, record.id) &&
-                   Objects.equals(sort, record.sort) &&
-                   Objects.equals(attribute, record.attribute) &&
-                   Objects.equals(attribute2, record.attribute2) &&
-                   Objects.equals(attribute3, record.attribute3);
-        }
-
-        @Override
-        public int hashCode() {
-            return Objects.hash(id, sort, attribute, attribute2, attribute3);
-        }
-    }
-    
-    private static class ShortRecord {
-        private String id;
-        private String sort;
-        private String attribute;
-
-        private String getId() {
-            return id;
-        }
-
-        private ShortRecord setId(String id) {
-            this.id = id;
-            return this;
-        }
-
-        private String getSort() {
-            return sort;
-        }
-
-        private ShortRecord setSort(String sort) {
-            this.sort = sort;
-            return this;
-        }
-
-        private String getAttribute() {
-            return attribute;
-        }
-
-        private ShortRecord setAttribute(String attribute) {
-            this.attribute = attribute;
-            return this;
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            if (this == o) return true;
-            if (o == null || getClass() != o.getClass()) return false;
-            ShortRecord that = (ShortRecord) o;
-            return Objects.equals(id, that.id) &&
-                   Objects.equals(sort, that.sort) &&
-                   Objects.equals(attribute, that.attribute);
-        }
-
-        @Override
-        public int hashCode() {
-            return Objects.hash(id, sort, attribute);
-        }
-    }
-
-    private static final TableSchema<Record> TABLE_SCHEMA =
-        TableSchema.builder()
-                   .newItemSupplier(Record::new)
-                   .attributes(
-                       string("id", Record::getId, Record::setId).as(primaryPartitionKey()),
-                       string("sort", Record::getSort, Record::setSort).as(primarySortKey()),
-                       // This is a DynamoDb reserved word, forces testing of AttributeNames
-                       string("attribute", Record::getAttribute, Record::setAttribute),
-                       // Using tricky characters to force scrubbing of attributeName tokens
-                       string("*attribute2*", Record::getAttribute2, Record::setAttribute2)
-                           .as(secondaryPartitionKey("gsi_1")),
-                       string("attribute3", Record::getAttribute3, Record::setAttribute3)
-                           .as(secondarySortKey("gsi_1")))
-                   .build();
-
-    private static final TableSchema<ShortRecord> SHORT_TABLE_SCHEMA =
-        TableSchema.builder()
-                   .newItemSupplier(ShortRecord::new)
-                   .attributes(
-                       string("id", ShortRecord::getId, ShortRecord::setId).as(primaryPartitionKey()),
-                       string("sort", ShortRecord::getSort, ShortRecord::setSort).as(primarySortKey()),
-                       string("attribute", ShortRecord::getAttribute, ShortRecord::setAttribute))
-                   .build();
-
-
-    private MappedDatabase mappedDatabase = MappedDatabase.builder()
-                                                          .dynamoDbClient(getDynamoDbClient())
-                                                          .build();
-
-    private MappedTable<Record> mappedTable = mappedDatabase.table(getConcreteTableName("table-name"), TABLE_SCHEMA);
-    private MappedTable<ShortRecord> mappedShortTable = mappedDatabase.table(getConcreteTableName("table-name"),
-                                                                             SHORT_TABLE_SCHEMA);
-
-
-    @Before
-    public void createTable() {
-        mappedTable.execute(CreateTable.builder()
-                                           .provisionedThroughput(getDefaultProvisionedThroughput())
-                                           .globalSecondaryIndices(
-                                               GlobalSecondaryIndex.of("gsi_1",
-                                                                       Projection.builder()
-                                                                                 .projectionType(ProjectionType.ALL)
-                                                                                 .build(),
-                                                                       getDefaultProvisionedThroughput()))
-                                           .build());
-    }
-
-    @After
-    public void deleteTable() {
-        getDynamoDbClient().deleteTable(DeleteTableRequest.builder()
-                                                          .tableName(getConcreteTableName("table-name"))
-                                                          .build());
-    }
-
-    @Test
-    public void putThenGetItemUsingKey() {
-        Record record = new Record()
-                              .setId("id-value")
-                              .setSort("sort-value")
-                              .setAttribute("one")
-                              .setAttribute2("two")
-                              .setAttribute3("three");
-
-        mappedTable.execute(PutItem.of(record));
-        Record result = mappedTable.execute(GetItem.of(Key.of(stringValue("id-value"), stringValue("sort-value"))));
-
-        assertThat(result, is(record));
-    }
-
-    @Test
-    public void putThenGetItemUsingKeyItem() {
-        Record record = new Record()
-                              .setId("id-value")
-                              .setSort("sort-value")
-                              .setAttribute("one")
-                              .setAttribute2("two")
-                              .setAttribute3("three");
-
-        mappedTable.execute(PutItem.of(record));
-        Record result =
-            mappedTable.execute(GetItem.of(Key.of(stringValue("id-value"), stringValue("sort-value"))));
-
-        assertThat(result, is(record));
-    }
-
-    @Test
-    public void getNonExistentItem() {
-        Record result = mappedTable.execute(GetItem.of(Key.of(stringValue("id-value"), stringValue("sort-value"))));
-        assertThat(result, is(nullValue()));
-    }
-
-    @Test
-    public void putTwiceThenGetItem() {
-        Record record = new Record()
-                              .setId("id-value")
-                              .setSort("sort-value")
-                              .setAttribute("one")
-                              .setAttribute2("two")
-                              .setAttribute3("three");
-
-        mappedTable.execute(PutItem.of(record));
-        Record record2 = new Record()
-                               .setId("id-value")
-                               .setSort("sort-value")
-                               .setAttribute("four")
-                               .setAttribute2("five")
-                               .setAttribute3("six");
-
-        mappedTable.execute(PutItem.of(record2));
-        Record result = mappedTable.execute(GetItem.of(Key.of(stringValue("id-value"), stringValue("sort-value"))));
-
-        assertThat(result, is(record2));
-    }
-
-    @Test
-    public void putThenDeleteItem() {
-        Record record = new Record()
-                              .setId("id-value")
-                              .setSort("sort-value")
-                              .setAttribute("one")
-                              .setAttribute2("two")
-                              .setAttribute3("three");
-
-        mappedTable.execute(PutItem.of(record));
-        Record beforeDeleteResult =
-            mappedTable.execute(DeleteItem.of(Key.of(stringValue("id-value"), stringValue("sort-value"))));
-        Record afterDeleteResult =
-            mappedTable.execute(GetItem.of(Key.of(stringValue("id-value"), stringValue("sort-value"))));
-
-        assertThat(beforeDeleteResult, is(record));
-        assertThat(afterDeleteResult, is(nullValue()));
-    }
-
-    @Test
-    public void deleteNonExistentItem() {
-        Record result = mappedTable.execute(DeleteItem.of(Key.of(stringValue("id-value"), stringValue("sort-value"))));
-        assertThat(result, is(nullValue()));
-    }
-
-    @Test
-    public void updateOverwriteCompleteRecord() {
-        Record record = new Record()
-                              .setId("id-value")
-                              .setSort("sort-value")
-                              .setAttribute("one")
-                              .setAttribute2("two")
-                              .setAttribute3("three");
-
-        mappedTable.execute(PutItem.of(record));
-        Record record2 = new Record()
-                               .setId("id-value")
-                               .setSort("sort-value")
-                               .setAttribute("four")
-                               .setAttribute2("five")
-                               .setAttribute3("six");
-        Record result = mappedTable.execute(UpdateItem.of(record2));
-
-        assertThat(result, is(record2));
-    }
-
-    @Test
-    public void updateCreatePartialRecord() {
-        Record record = new Record()
-                              .setId("id-value")
-                              .setSort("sort-value")
-                              .setAttribute("one");
-
-        Record result = mappedTable.execute(UpdateItem.of(record));
-
-        assertThat(result, is(record));
-    }
-
-    @Test
-    public void updateCreateKeyOnlyRecord() {
-        Record record = new Record()
-                              .setId("id-value")
-                              .setSort("sort-value");
-
-        Record result = mappedTable.execute(UpdateItem.of(record));
-        assertThat(result, is(record));
-    }
-
-    @Test
-    public void updateOverwriteModelledNulls() {
-        Record record = new Record()
-                              .setId("id-value")
-                              .setSort("sort-value")
-                              .setAttribute("one")
-                              .setAttribute2("two")
-                              .setAttribute3("three");
-
-        mappedTable.execute(PutItem.of(record));
-        Record record2 = new Record()
-                               .setId("id-value")
-                               .setSort("sort-value")
-                               .setAttribute("four");
-        Record result = mappedTable.execute(UpdateItem.of(record2));
-
-        assertThat(result, is(record2));
-    }
-
-    @Test
-    public void updateCanIgnoreNullsAndDoPartialUpdate() {
-        Record record = new Record()
-                              .setId("id-value")
-                              .setSort("sort-value")
-                              .setAttribute("one")
-                              .setAttribute2("two")
-                              .setAttribute3("three");
-
-        mappedTable.execute(PutItem.of(record));
-        Record record2 = new Record()
-                               .setId("id-value")
-                               .setSort("sort-value")
-                               .setAttribute("four");
-        Record result = mappedTable.execute(UpdateItem.builder().item(record2).ignoreNulls(true).build());
-
-        Record expectedResult = new Record()
-                               .setId("id-value")
-                               .setSort("sort-value")
-                               .setAttribute("four")
-                               .setAttribute2("two")
-                               .setAttribute3("three");
-        assertThat(result, is(expectedResult));
-    }
-
-    @Test
-    public void updateShortRecordDoesPartialUpdate() {
-        Record record = new Record()
-                              .setId("id-value")
-                              .setSort("sort-value")
-                              .setAttribute("one")
-                              .setAttribute2("two")
-                              .setAttribute3("three");
-
-        mappedTable.execute(PutItem.of(record));
-        ShortRecord record2 = new ShortRecord()
-                                         .setId("id-value")
-                                         .setSort("sort-value")
-                                         .setAttribute("four");
-        ShortRecord shortResult = mappedShortTable.execute(UpdateItem.of(record2));
-        Record result = mappedTable.execute(GetItem.of(Key.of(stringValue(record.getId()),
-                                                              stringValue(record.getSort()))));
-
-        Record expectedResult = new Record()
-                                      .setId("id-value")
-                                      .setSort("sort-value")
-                                      .setAttribute("four")
-                                      .setAttribute2("two")
-                                      .setAttribute3("three");
-        assertThat(result, is(expectedResult));
-        assertThat(shortResult, is(record2));
-    }
-
-    @Test
-    public void updateKeyOnlyExistingRecordDoesNothing() {
-        Record record = new Record()
-                              .setId("id-value")
-                              .setSort("sort-value")
-                              .setAttribute("one")
-                              .setAttribute2("two")
-                              .setAttribute3("three");
-
-        mappedTable.execute(PutItem.of(record));
-        Record updateRecord = new Record().setId("id-value").setSort("sort-value");
-
-        Record result = mappedTable.execute(UpdateItem.builder().item(updateRecord).ignoreNulls(true).build());
-
-        assertThat(result, is(record));
-    }
-
-    @Test
-    public void getAShortRecordWithNewModelledFields() {
-        ShortRecord shortRecord = new ShortRecord()
-                                         .setId("id-value")
-                                         .setSort("sort-value")
-                                         .setAttribute("one");
-        mappedShortTable.execute(PutItem.of(shortRecord));
-        Record expectedRecord = new Record()
-                                      .setId("id-value")
-                                      .setSort("sort-value")
-                                      .setAttribute("one");
-
-        Record result = mappedTable.execute(GetItem.of(Key.of(stringValue("id-value"), stringValue("sort-value"))));
-        assertThat(result, is(expectedRecord));
-    }
-}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/functionaltests/BasicQueryTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/functionaltests/BasicQueryTest.java
deleted file mode 100644
index 4e7d51dd61a3..000000000000
--- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/functionaltests/BasicQueryTest.java
+++ /dev/null
@@ -1,261 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.extensions.dynamodb.mappingclient.functionaltests;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.empty;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.nullValue;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.AttributeValues.numberValue;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.AttributeValues.stringValue;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.operations.QueryConditional.between;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.operations.QueryConditional.equalTo;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.staticmapper.AttributeTags.primaryPartitionKey;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.staticmapper.AttributeTags.primarySortKey;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.staticmapper.Attributes.integerNumber;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.staticmapper.Attributes.string;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.Expression;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.Key;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.MappedDatabase;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.MappedTable;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.Page;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.TableSchema;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.operations.CreateTable;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.operations.PutItem;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.operations.Query;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-import software.amazon.awssdk.services.dynamodb.model.DeleteTableRequest;
-
-public class BasicQueryTest extends LocalDynamoDbTestBase {
-    private static class Record {
-        private String id;
-        private Integer sort;
-        private Integer value;
-
-        public String getId() {
-            return id;
-        }
-
-        public Record setId(String id) {
-            this.id = id;
-            return this;
-        }
-
-        public Integer getSort() {
-            return sort;
-        }
-
-        public Record setSort(Integer sort) {
-            this.sort = sort;
-            return this;
-        }
-
-        public Integer getValue() {
-            return value;
-        }
-
-        public Record setValue(Integer value) {
-            this.value = value;
-            return this;
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            if (this == o) return true;
-            if (o == null || getClass() != o.getClass()) return false;
-            Record record = (Record) o;
-            return Objects.equals(id, record.id) &&
-                   Objects.equals(sort, record.sort) &&
-                   Objects.equals(value, record.value);
-        }
-
-        @Override
-        public int hashCode() {
-            return Objects.hash(id, sort, value);
-        }
-    }
-
-    private static final TableSchema<Record> TABLE_SCHEMA =
-        TableSchema.builder()
-                   .newItemSupplier(Record::new)
-                   .attributes(
-                       string("id", Record::getId, Record::setId).as(primaryPartitionKey()),
-                       integerNumber("sort", Record::getSort, Record::setSort).as(primarySortKey()),
-                       integerNumber("value", Record::getValue, Record::setValue))
-        .build();
-
-    private static final List<Record> RECORDS =
-        IntStream.range(0, 10)
-                 .mapToObj(i -> new Record().setId("id-value").setSort(i).setValue(i))
-                 .collect(Collectors.toList());
-
-    private MappedDatabase mappedDatabase = MappedDatabase.builder()
-                                                          .dynamoDbClient(getDynamoDbClient())
-                                                          .build();
-
-    private MappedTable<Record> mappedTable = mappedDatabase.table(getConcreteTableName("table-name"), TABLE_SCHEMA);
-
-    private void insertRecords() {
-        RECORDS.forEach(record -> mappedTable.execute(PutItem.of(record)));
-    }
-
-    @Before
-    public void createTable() {
-        mappedTable.execute(CreateTable.of(getDefaultProvisionedThroughput()));
-    }
-
-    @After
-    public void deleteTable() {
-        getDynamoDbClient().deleteTable(DeleteTableRequest.builder()
-                                                          .tableName(getConcreteTableName("table-name"))
-                                                          .build());
-    }
-
-    @Test
-    public void queryAllRecordsDefaultSettings() {
-        insertRecords();
-
-        Iterator<Page<Record>> results =
-            mappedTable.execute(Query.of(equalTo(Key.of(stringValue("id-value"))))).iterator();
-
-        assertThat(results.hasNext(), is(true));
-        Page<Record> page = results.next();
-        assertThat(results.hasNext(), is(false));
-
-        assertThat(page.getItems(), is(RECORDS));
-        assertThat(page.getLastEvaluatedKey(), is(nullValue()));
-    }
-
-    @Test
-    public void queryAllRecordsWithFilter() {
-        insertRecords();
-        Map<String, AttributeValue> expressionValues = new HashMap<>();
-        expressionValues.put(":min_value", numberValue(3));
-        expressionValues.put(":max_value", numberValue(5));
-        Expression expression = Expression.builder()
-                                          .expression("#value >= :min_value AND #value <= :max_value")
-                                          .expressionValues(expressionValues)
-                                          .expressionNames(Collections.singletonMap("#value", "value"))
-                                          .build();
-
-        Iterator<Page<Record>> results =
-            mappedTable.execute(Query.builder()
-                                     .queryConditional(equalTo(Key.of(stringValue("id-value"))))
-                                     .filterExpression(expression)
-                                     .build())
-                       .iterator();
-
-        assertThat(results.hasNext(), is(true));
-        Page<Record> page = results.next();
-        assertThat(results.hasNext(), is(false));
-
-        assertThat(page.getItems(),
-                   is(RECORDS.stream().filter(r -> r.sort >= 3 && r.sort <= 5).collect(Collectors.toList())));
-        assertThat(page.getLastEvaluatedKey(), is(nullValue()));
-    }
-
-    @Test
-    public void queryBetween() {
-        insertRecords();
-        Key fromKey = Key.of(stringValue("id-value"), numberValue(3));
-        Key toKey = Key.of(stringValue("id-value"), numberValue(5));
-        Iterator<Page<Record>> results = mappedTable.execute(Query.of(between(fromKey, toKey))).iterator();
-
-        assertThat(results.hasNext(), is(true));
-        Page<Record> page = results.next();
-        assertThat(results.hasNext(), is(false));
-
-        assertThat(page.getItems(),
-                   is(RECORDS.stream().filter(r -> r.sort >= 3 && r.sort <= 5).collect(Collectors.toList())));
-        assertThat(page.getLastEvaluatedKey(), is(nullValue()));
-    }
-
-    @Test
-    public void queryLimit() {
-        insertRecords();
-        Iterator<Page<Record>> results =
-            mappedTable.execute(Query.builder()
-                                     .queryConditional(equalTo(Key.of(stringValue("id-value"))))
-                                     .limit(5)
-                                     .build())
-                       .iterator();
-        assertThat(results.hasNext(), is(true));
-        Page<Record> page1 = results.next();
-        assertThat(results.hasNext(), is(true));
-        Page<Record> page2 = results.next();
-        assertThat(results.hasNext(), is(true));
-        Page<Record> page3 = results.next();
-        assertThat(results.hasNext(), is(false));
-
-        Map<String, AttributeValue> expectedLastEvaluatedKey1 = new HashMap<>();
-        expectedLastEvaluatedKey1.put("id", stringValue("id-value"));
-        expectedLastEvaluatedKey1.put("sort", numberValue(4));
-        Map<String, AttributeValue> expectedLastEvaluatedKey2 = new HashMap<>();
-        expectedLastEvaluatedKey2.put("id", stringValue("id-value"));
-        expectedLastEvaluatedKey2.put("sort", numberValue(9));
-        assertThat(page1.getItems(), is(RECORDS.subList(0, 5)));
-        assertThat(page1.getLastEvaluatedKey(), is(expectedLastEvaluatedKey1));
-        assertThat(page2.getItems(), is(RECORDS.subList(5, 10)));
-        assertThat(page2.getLastEvaluatedKey(), is(expectedLastEvaluatedKey2));
-        assertThat(page3.getItems(), is(empty()));
-        assertThat(page3.getLastEvaluatedKey(), is(nullValue()));
-    }
-
-    @Test
-    public void queryEmpty() {
-        Iterator<Page<Record>> results =
-            mappedTable.execute(Query.of(equalTo(Key.of(stringValue("id-value"))))).iterator();
-        assertThat(results.hasNext(), is(true));
-        Page<Record> page = results.next();
-        assertThat(results.hasNext(), is(false));
-        assertThat(page.getItems(), is(empty()));
-        assertThat(page.getLastEvaluatedKey(), is(nullValue()));
-    }
-
-    @Test
-    public void queryExclusiveStartKey() {
-        Map<String, AttributeValue> exclusiveStartKey = new HashMap<>();
-        exclusiveStartKey.put("id", stringValue("id-value"));
-        exclusiveStartKey.put("sort", numberValue(7));
-        insertRecords();
-        Iterator<Page<Record>> results =
-            mappedTable.execute(Query.builder()
-                                     .queryConditional(equalTo(Key.of(stringValue("id-value"))))
-                                     .exclusiveStartKey(exclusiveStartKey)
-                                     .build())
-                       .iterator();
-
-        assertThat(results.hasNext(), is(true));
-        Page<Record> page = results.next();
-        assertThat(results.hasNext(), is(false));
-        assertThat(page.getItems(), is(RECORDS.subList(8, 10)));
-        assertThat(page.getLastEvaluatedKey(), is(nullValue()));
-    }
-}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/functionaltests/BasicScanTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/functionaltests/BasicScanTest.java
deleted file mode 100644
index 094822529f88..000000000000
--- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/functionaltests/BasicScanTest.java
+++ /dev/null
@@ -1,212 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.extensions.dynamodb.mappingclient.functionaltests;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.empty;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.nullValue;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.AttributeValues.numberValue;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.AttributeValues.stringValue;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.staticmapper.AttributeTags.primaryPartitionKey;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.staticmapper.AttributeTags.primarySortKey;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.staticmapper.Attributes.integerNumber;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.staticmapper.Attributes.string;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.Expression;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.MappedDatabase;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.MappedTable;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.Page;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.TableSchema;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.operations.CreateTable;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.operations.PutItem;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.operations.Scan;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-import software.amazon.awssdk.services.dynamodb.model.DeleteTableRequest;
-
-public class BasicScanTest extends LocalDynamoDbTestBase {
-    private static class Record {
-        private String id;
-        private Integer sort;
-
-        private String getId() {
-            return id;
-        }
-
-        private Record setId(String id) {
-            this.id = id;
-            return this;
-        }
-
-        private Integer getSort() {
-            return sort;
-        }
-
-        private Record setSort(Integer sort) {
-            this.sort = sort;
-            return this;
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            if (this == o) return true;
-            if (o == null || getClass() != o.getClass()) return false;
-            Record record = (Record) o;
-            return Objects.equals(id, record.id) &&
-                   Objects.equals(sort, record.sort);
-        }
-
-        @Override
-        public int hashCode() {
-            return Objects.hash(id, sort);
-        }
-    }
-
-    private static final TableSchema<Record> TABLE_SCHEMA =
-        TableSchema.builder()
-                   .newItemSupplier(Record::new)
-                   .attributes(
-                       string("id", Record::getId, Record::setId).as(primaryPartitionKey()),
-                       integerNumber("sort", Record::getSort, Record::setSort).as(primarySortKey()))
-        .build();
-
-    private static final List<Record> RECORDS =
-        IntStream.range(0, 10)
-                 .mapToObj(i -> new Record().setId("id-value").setSort(i))
-                 .collect(Collectors.toList());
-
-    private MappedDatabase mappedDatabase = MappedDatabase.builder()
-                                                          .dynamoDbClient(getDynamoDbClient())
-                                                          .build();
-
-    private MappedTable<Record> mappedTable = mappedDatabase.table(getConcreteTableName("table-name"), TABLE_SCHEMA);
-
-    private void insertRecords() {
-        RECORDS.forEach(record -> mappedTable.execute(PutItem.of(record)));
-    }
-
-    @Before
-    public void createTable() {
-        mappedTable.execute(CreateTable.of(getDefaultProvisionedThroughput()));
-    }
-
-    @After
-    public void deleteTable() {
-        getDynamoDbClient().deleteTable(DeleteTableRequest.builder()
-                                                          .tableName(getConcreteTableName("table-name"))
-                                                          .build());
-    }
-
-    @Test
-    public void scanAllRecordsDefaultSettings() {
-        insertRecords();
-
-        Iterator<Page<Record>> results = mappedTable.execute(Scan.create()).iterator();
-
-        assertThat(results.hasNext(), is(true));
-        Page<Record> page = results.next();
-        assertThat(results.hasNext(), is(false));
-
-        assertThat(page.getItems(), is(RECORDS));
-        assertThat(page.getLastEvaluatedKey(), is(nullValue()));
-    }
-
-    @Test
-    public void scanAllRecordsWithFilter() {
-        insertRecords();
-        Map<String, AttributeValue> expressionValues = new HashMap<>();
-        expressionValues.put(":min_value", numberValue(3));
-        expressionValues.put(":max_value", numberValue(5));
-        Expression expression = Expression.builder()
-                                          .expression("sort >= :min_value AND sort <= :max_value")
-                                          .expressionValues(expressionValues)
-                                          .build();
-
-        Iterator<Page<Record>> results =
-            mappedTable.execute(Scan.builder().filterExpression(expression).build()).iterator();
-
-        assertThat(results.hasNext(), is(true));
-        Page<Record> page = results.next();
-        assertThat(results.hasNext(), is(false));
-
-        assertThat(page.getItems(),
-                   is(RECORDS.stream().filter(r -> r.sort >= 3 && r.sort <= 5).collect(Collectors.toList())));
-        assertThat(page.getLastEvaluatedKey(), is(nullValue()));
-    }
-
-    @Test
-    public void scanLimit() {
-        insertRecords();
-        Iterator<Page<Record>> results = mappedTable.execute(Scan.builder().limit(5).build()).iterator();
-        assertThat(results.hasNext(), is(true));
-        Page<Record> page1 = results.next();
-        assertThat(results.hasNext(), is(true));
-        Page<Record> page2 = results.next();
-        assertThat(results.hasNext(), is(true));
-        Page<Record> page3 = results.next();
-        assertThat(results.hasNext(), is(false));
-
-        assertThat(page1.getItems(), is(RECORDS.subList(0, 5)));
-        assertThat(page1.getLastEvaluatedKey(), is(getKeyMap(4)));
-        assertThat(page2.getItems(), is(RECORDS.subList(5, 10)));
-        assertThat(page2.getLastEvaluatedKey(), is(getKeyMap(9)));
-        assertThat(page3.getItems(), is(empty()));
-        assertThat(page3.getLastEvaluatedKey(), is(nullValue()));
-    }
-
-    @Test
-    public void scanEmpty() {
-        Iterator<Page<Record>> results = mappedTable.execute(Scan.create()).iterator();
-        assertThat(results.hasNext(), is(true));
-        Page<Record> page = results.next();
-        assertThat(results.hasNext(), is(false));
-        assertThat(page.getItems(), is(empty()));
-        assertThat(page.getLastEvaluatedKey(), is(nullValue()));
-    }
-
-    @Test
-    public void scanExclusiveStartKey() {
-        insertRecords();
-        Iterator<Page<Record>> results =
-            mappedTable.execute(Scan.builder().exclusiveStartKey(getKeyMap(7)).build()).iterator();
-
-        assertThat(results.hasNext(), is(true));
-        Page<Record> page = results.next();
-        assertThat(results.hasNext(), is(false));
-        assertThat(page.getItems(), is(RECORDS.subList(8, 10)));
-        assertThat(page.getLastEvaluatedKey(), is(nullValue()));
-    }
-
-    private Map<String, AttributeValue> getKeyMap(int sort) {
-        Map<String, AttributeValue> result = new HashMap<>();
-        result.put("id", stringValue("id-value"));
-        result.put("sort", numberValue(sort));
-        return Collections.unmodifiableMap(result);
-    }
-}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/functionaltests/FlattenTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/functionaltests/FlattenTest.java
deleted file mode 100644
index f996c8ed7efa..000000000000
--- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/functionaltests/FlattenTest.java
+++ /dev/null
@@ -1,211 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.extensions.dynamodb.mappingclient.functionaltests;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.is;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.AttributeValues.stringValue;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.staticmapper.AttributeTags.primaryPartitionKey;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.staticmapper.Attributes.string;
-
-import java.util.Objects;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.Key;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.MappedDatabase;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.MappedTable;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.TableSchema;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.operations.CreateTable;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.operations.GetItem;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.operations.UpdateItem;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.staticmapper.StaticTableSchema;
-import software.amazon.awssdk.services.dynamodb.model.DeleteTableRequest;
-
-public class FlattenTest extends LocalDynamoDbTestBase {
-    private static class Record {
-        private String id;
-        private Document document;
-
-        private String getId() {
-            return id;
-        }
-
-        private Record setId(String id) {
-            this.id = id;
-            return this;
-        }
-
-        private Document getDocument() {
-            return document;
-        }
-
-        private Record setDocument(Document document) {
-            this.document = document;
-            return this;
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            if (this == o) return true;
-            if (o == null || getClass() != o.getClass()) return false;
-            Record record = (Record) o;
-            return Objects.equals(id, record.id) &&
-                   Objects.equals(document, record.document);
-        }
-
-        @Override
-        public int hashCode() {
-            return Objects.hash(id, document);
-        }
-    }
-    
-    private static class Document {
-        private String documentAttribute1;
-        private String documentAttribute2;
-        private String documentAttribute3;
-
-        private String getDocumentAttribute1() {
-            return documentAttribute1;
-        }
-
-        private Document setDocumentAttribute1(String documentAttribute1) {
-            this.documentAttribute1 = documentAttribute1;
-            return this;
-        }
-
-        private String getDocumentAttribute2() {
-            return documentAttribute2;
-        }
-
-        private Document setDocumentAttribute2(String documentAttribute2) {
-            this.documentAttribute2 = documentAttribute2;
-            return this;
-        }
-
-        private String getDocumentAttribute3() {
-            return documentAttribute3;
-        }
-
-        private Document setDocumentAttribute3(String documentAttribute3) {
-            this.documentAttribute3 = documentAttribute3;
-            return this;
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            if (this == o) return true;
-            if (o == null || getClass() != o.getClass()) return false;
-            Document document = (Document) o;
-            return Objects.equals(documentAttribute1, document.documentAttribute1) &&
-                   Objects.equals(documentAttribute2, document.documentAttribute2) &&
-                   Objects.equals(documentAttribute3, document.documentAttribute3);
-        }
-
-        @Override
-        public int hashCode() {
-            return Objects.hash(documentAttribute1, documentAttribute2, documentAttribute3);
-        }
-    }
-
-    private static final StaticTableSchema<Document> DOCUMENT_SCHEMA =
-        StaticTableSchema.builder()
-                         .newItemSupplier(Document::new)
-                         .attributes(
-                             string("documentAttribute1",
-                                    Document::getDocumentAttribute1,
-                                    Document::setDocumentAttribute1),
-                             string("documentAttribute2",
-                                    Document::getDocumentAttribute2,
-                                    Document::setDocumentAttribute2),
-                             string("documentAttribute3",
-                                    Document::getDocumentAttribute3,
-                                    Document::setDocumentAttribute3))
-                         .build();
-
-    private static final TableSchema<Record> TABLE_SCHEMA =
-        TableSchema.builder()
-                   .newItemSupplier(Record::new)
-                   .attributes(string("id", Record::getId, Record::setId).as(primaryPartitionKey()))
-                   .flatten(DOCUMENT_SCHEMA, Record::getDocument, Record::setDocument)
-                   .build();
-
-
-    private MappedDatabase mappedDatabase = MappedDatabase.builder()
-                                                          .dynamoDbClient(getDynamoDbClient())
-                                                          .build();
-
-    private MappedTable<Record> mappedTable = mappedDatabase.table(getConcreteTableName("table-name"), TABLE_SCHEMA);
-
-    @Before
-    public void createTable() {
-        mappedTable.execute(CreateTable.of(getDefaultProvisionedThroughput()));
-    }
-
-    @After
-    public void deleteTable() {
-        getDynamoDbClient().deleteTable(DeleteTableRequest.builder()
-                                                          .tableName(getConcreteTableName("table-name"))
-                                                          .build());
-    }
-
-    @Test
-    public void update_allValues() {
-        Document document = new Document()
-                                    .setDocumentAttribute1("one")
-                                    .setDocumentAttribute2("two")
-                                    .setDocumentAttribute3("three");
-        Record record = new Record()
-                              .setId("id-value")
-                              .setDocument(document);
-
-        Record updatedRecord = mappedTable.execute(UpdateItem.of(record));
-        Record fetchedRecord = mappedTable.execute(GetItem.of(Key.of(stringValue("id-value"))));
-
-        assertThat(updatedRecord, is(record));
-        assertThat(fetchedRecord, is(record));
-    }
-
-    @Test
-    public void update_someValues() {
-        Document document = new Document()
-                                    .setDocumentAttribute1("one")
-                                    .setDocumentAttribute2("two");
-        Record record = new Record()
-                              .setId("id-value")
-                              .setDocument(document);
-
-        Record updatedRecord = mappedTable.execute(UpdateItem.of(record));
-        Record fetchedRecord = mappedTable.execute(GetItem.of(Key.of(stringValue("id-value"))));
-
-        assertThat(updatedRecord, is(record));
-        assertThat(fetchedRecord, is(record));
-    }
-
-    @Test
-    public void update_nullDocument() {
-        Record record = new Record()
-                              .setId("id-value");
-
-        Record updatedRecord = mappedTable.execute(UpdateItem.of(record));
-        Record fetchedRecord = mappedTable.execute(GetItem.of(Key.of(stringValue("id-value"))));
-
-        assertThat(updatedRecord, is(record));
-        assertThat(fetchedRecord, is(record));
-    }
-}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/functionaltests/IndexQueryTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/functionaltests/IndexQueryTest.java
deleted file mode 100644
index 2d77c72bbc01..000000000000
--- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/functionaltests/IndexQueryTest.java
+++ /dev/null
@@ -1,292 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.extensions.dynamodb.mappingclient.functionaltests;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.empty;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.nullValue;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.AttributeValues.numberValue;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.AttributeValues.stringValue;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.operations.QueryConditional.between;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.operations.QueryConditional.equalTo;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.staticmapper.AttributeTags.primaryPartitionKey;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.staticmapper.AttributeTags.primarySortKey;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.staticmapper.AttributeTags.secondaryPartitionKey;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.staticmapper.AttributeTags.secondarySortKey;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.staticmapper.Attributes.integerNumber;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.staticmapper.Attributes.string;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.Key;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.MappedDatabase;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.MappedIndex;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.MappedTable;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.Page;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.TableSchema;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.operations.CreateTable;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.operations.GlobalSecondaryIndex;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.operations.PutItem;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.operations.Query;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-import software.amazon.awssdk.services.dynamodb.model.DeleteTableRequest;
-import software.amazon.awssdk.services.dynamodb.model.Projection;
-import software.amazon.awssdk.services.dynamodb.model.ProjectionType;
-
-public class IndexQueryTest extends LocalDynamoDbTestBase {
-    private static class Record {
-        private String id;
-        private Integer sort;
-        private Integer value;
-        private String gsiId;
-        private Integer gsiSort;
-
-        private String getId() {
-            return id;
-        }
-
-        private Record setId(String id) {
-            this.id = id;
-            return this;
-        }
-
-        private Integer getSort() {
-            return sort;
-        }
-
-        private Record setSort(Integer sort) {
-            this.sort = sort;
-            return this;
-        }
-
-        private Integer getValue() {
-            return value;
-        }
-
-        private Record setValue(Integer value) {
-            this.value = value;
-            return this;
-        }
-
-        private String getGsiId() {
-            return gsiId;
-        }
-
-        private Record setGsiId(String gsiId) {
-            this.gsiId = gsiId;
-            return this;
-        }
-
-        private Integer getGsiSort() {
-            return gsiSort;
-        }
-
-        private Record setGsiSort(Integer gsiSort) {
-            this.gsiSort = gsiSort;
-            return this;
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            if (this == o) return true;
-            if (o == null || getClass() != o.getClass()) return false;
-            Record record = (Record) o;
-            return Objects.equals(id, record.id) &&
-                   Objects.equals(sort, record.sort) &&
-                   Objects.equals(value, record.value) &&
-                   Objects.equals(gsiId, record.gsiId) &&
-                   Objects.equals(gsiSort, record.gsiSort);
-        }
-
-        @Override
-        public int hashCode() {
-            return Objects.hash(id, sort, value, gsiId, gsiSort);
-        }
-    }
-
-    private static final TableSchema<Record> TABLE_SCHEMA =
-        TableSchema.builder()
-                   .newItemSupplier(Record::new)
-                   .attributes(
-                       string("id", Record::getId, Record::setId).as(primaryPartitionKey()),
-                       integerNumber("sort", Record::getSort, Record::setSort).as(primarySortKey()),
-                       integerNumber("value", Record::getValue, Record::setValue),
-                       string("gsi_id", Record::getGsiId, Record::setGsiId)
-                           .as(secondaryPartitionKey("gsi_keys_only")),
-                       integerNumber("gsi_sort", Record::getGsiSort, Record::setGsiSort)
-                           .as(secondarySortKey("gsi_keys_only")))
-        .build();
-
-    private static final List<Record> RECORDS =
-        IntStream.range(0, 10)
-                 .mapToObj(i -> new Record()
-                                      .setId("id-value")
-                                      .setSort(i)
-                                      .setValue(i)
-                                      .setGsiId("gsi-id-value")
-                                      .setGsiSort(i))
-                 .collect(Collectors.toList());
-
-    private static final List<Record> KEYS_ONLY_RECORDS =
-        RECORDS.stream()
-               .map(record -> new Record()
-                                    .setId(record.id)
-                                    .setSort(record.sort)
-                                    .setGsiId(record.gsiId)
-                                    .setGsiSort(record.gsiSort))
-               .collect(Collectors.toList());
-
-    private MappedDatabase mappedDatabase = MappedDatabase.builder()
-                                                          .dynamoDbClient(getDynamoDbClient())
-                                                          .build();
-
-    private MappedTable<Record> mappedTable = mappedDatabase.table(getConcreteTableName("table-name"), TABLE_SCHEMA);
-    private MappedIndex<Record> keysOnlyMappedIndex = mappedTable.index("gsi_keys_only");
-
-    private void insertRecords() {
-        RECORDS.forEach(record -> mappedTable.execute(PutItem.of(record)));
-    }
-
-    @Before
-    public void createTable() {
-        mappedTable.execute(CreateTable.builder()
-                                       .provisionedThroughput(getDefaultProvisionedThroughput())
-                                       .globalSecondaryIndices(
-                                           GlobalSecondaryIndex.of("gsi_keys_only",
-                                                                   Projection.builder()
-                                                                             .projectionType(ProjectionType.KEYS_ONLY)
-                                                                             .build(),
-                                                                   getDefaultProvisionedThroughput()))
-                           .build());
-    }
-
-    @After
-    public void deleteTable() {
-        getDynamoDbClient().deleteTable(DeleteTableRequest.builder()
-                                                          .tableName(getConcreteTableName("table-name"))
-                                                          .build());
-    }
-
-    @Test
-    public void queryAllRecordsDefaultSettings() {
-        insertRecords();
-
-        Iterator<Page<Record>> results =
-            keysOnlyMappedIndex.execute(Query.of(equalTo(Key.of(stringValue("gsi-id-value"))))).iterator();
-
-        assertThat(results.hasNext(), is(true));
-        Page<Record> page = results.next();
-        assertThat(results.hasNext(), is(false));
-
-        assertThat(page.getItems(), is(KEYS_ONLY_RECORDS));
-        assertThat(page.getLastEvaluatedKey(), is(nullValue()));
-    }
-
-    @Test
-    public void queryBetween() {
-        insertRecords();
-        Key fromKey = Key.of(stringValue("gsi-id-value"), numberValue(3));
-        Key toKey = Key.of(stringValue("gsi-id-value"), numberValue(5));
-        Iterator<Page<Record>> results = keysOnlyMappedIndex.execute(Query.of(between(fromKey, toKey))).iterator();
-
-        assertThat(results.hasNext(), is(true));
-        Page<Record> page = results.next();
-        assertThat(results.hasNext(), is(false));
-
-        assertThat(page.getItems(),
-                   is(KEYS_ONLY_RECORDS.stream().filter(r -> r.sort >= 3 && r.sort <= 5).collect(Collectors.toList())));
-        assertThat(page.getLastEvaluatedKey(), is(nullValue()));
-    }
-
-    @Test
-    public void queryLimit() {
-        insertRecords();
-        Iterator<Page<Record>> results =
-            keysOnlyMappedIndex.execute(Query.builder()
-                                             .queryConditional(equalTo(Key.of(stringValue("gsi-id-value"))))
-                                             .limit(5)
-                                             .build())
-                               .iterator();
-        assertThat(results.hasNext(), is(true));
-        Page<Record> page1 = results.next();
-        assertThat(results.hasNext(), is(true));
-        Page<Record> page2 = results.next();
-        assertThat(results.hasNext(), is(true));
-        Page<Record> page3 = results.next();
-        assertThat(results.hasNext(), is(false));
-
-        Map<String, AttributeValue> expectedLastEvaluatedKey1 = new HashMap<>();
-        expectedLastEvaluatedKey1.put("id", stringValue(KEYS_ONLY_RECORDS.get(4).getId()));
-        expectedLastEvaluatedKey1.put("sort", numberValue(KEYS_ONLY_RECORDS.get(4).getSort()));
-        expectedLastEvaluatedKey1.put("gsi_id", stringValue(KEYS_ONLY_RECORDS.get(4).getGsiId()));
-        expectedLastEvaluatedKey1.put("gsi_sort", numberValue(KEYS_ONLY_RECORDS.get(4).getGsiSort()));
-        Map<String, AttributeValue> expectedLastEvaluatedKey2 = new HashMap<>();
-        expectedLastEvaluatedKey2.put("id", stringValue(KEYS_ONLY_RECORDS.get(9).getId()));
-        expectedLastEvaluatedKey2.put("sort", numberValue(KEYS_ONLY_RECORDS.get(9).getSort()));
-        expectedLastEvaluatedKey2.put("gsi_id", stringValue(KEYS_ONLY_RECORDS.get(9).getGsiId()));
-        expectedLastEvaluatedKey2.put("gsi_sort", numberValue(KEYS_ONLY_RECORDS.get(9).getGsiSort()));
-
-        assertThat(page1.getItems(), is(KEYS_ONLY_RECORDS.subList(0, 5)));
-        assertThat(page1.getLastEvaluatedKey(), is(expectedLastEvaluatedKey1));
-        assertThat(page2.getItems(), is(KEYS_ONLY_RECORDS.subList(5, 10)));
-        assertThat(page2.getLastEvaluatedKey(), is(expectedLastEvaluatedKey2));
-        assertThat(page3.getItems(), is(empty()));
-        assertThat(page3.getLastEvaluatedKey(), is(nullValue()));
-    }
-
-    @Test
-    public void queryEmpty() {
-        Iterator<Page<Record>> results =
-            keysOnlyMappedIndex.execute(Query.of(equalTo(Key.of(stringValue("gsi-id-value"))))).iterator();
-        assertThat(results.hasNext(), is(true));
-        Page<Record> page = results.next();
-        assertThat(results.hasNext(), is(false));
-        assertThat(page.getItems(), is(empty()));
-        assertThat(page.getLastEvaluatedKey(), is(nullValue()));
-    }
-
-    @Test
-    public void queryExclusiveStartKey() {
-        insertRecords();
-        Map<String, AttributeValue> expectedLastEvaluatedKey = new HashMap<>();
-        expectedLastEvaluatedKey.put("id", stringValue(KEYS_ONLY_RECORDS.get(7).getId()));
-        expectedLastEvaluatedKey.put("sort", numberValue(KEYS_ONLY_RECORDS.get(7).getSort()));
-        expectedLastEvaluatedKey.put("gsi_id", stringValue(KEYS_ONLY_RECORDS.get(7).getGsiId()));
-        expectedLastEvaluatedKey.put("gsi_sort", numberValue(KEYS_ONLY_RECORDS.get(7).getGsiSort()));
-        Iterator<Page<Record>> results =
-            keysOnlyMappedIndex.execute(Query.builder()
-                                             .queryConditional(equalTo(Key.of(stringValue("gsi-id-value"))))
-                                             .exclusiveStartKey(expectedLastEvaluatedKey).build())
-                               .iterator();
-
-        assertThat(results.hasNext(), is(true));
-        Page<Record> page = results.next();
-        assertThat(results.hasNext(), is(false));
-        assertThat(page.getItems(), is(KEYS_ONLY_RECORDS.subList(8, 10)));
-        assertThat(page.getLastEvaluatedKey(), is(nullValue()));
-    }
-}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/functionaltests/LocalDynamoDb.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/functionaltests/LocalDynamoDb.java
deleted file mode 100644
index 63643fc48828..000000000000
--- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/functionaltests/LocalDynamoDb.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-package software.amazon.awssdk.extensions.dynamodb.mappingclient.functionaltests;
-
-import java.io.IOException;
-import java.net.ServerSocket;
-import java.net.URI;
-
-import com.amazonaws.services.dynamodbv2.local.main.ServerRunner;
-import com.amazonaws.services.dynamodbv2.local.server.DynamoDBProxyServer;
-
-import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
-import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
-import software.amazon.awssdk.regions.Region;
-import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
-
-/**
- * Wrapper for a local DynamoDb server used in testing. Each instance of this class will find a new port to run on,
- * so multiple instances can be safely run simultaneously. Each instance of this service uses memory as a storage medium
- * and is thus completely ephemeral; no data will be persisted between stops and starts.
- *
- * LocalDynamoDb localDynamoDb = new LocalDynamoDb();
- * localDynamoDb.start();       // Start the service running locally on host
- * DynamoDbClient dynamoDbClient = localDynamoDb.createClient();
- * ...      // Do your testing with the client
- * localDynamoDb.stop();        // Stop the service and free up resources
- *
- * If possible it's recommended to keep a single running instance for all your tests, as it can be slow to teardown
- * and create new servers for every test, but there have been observed problems when dropping tables between tests for
- * this scenario, so it's best to write your tests to be resilient to tables that already have data in them.
- */
-class LocalDynamoDb {
-    private DynamoDBProxyServer server;
-    private int port;
-
-    /**
-     * Start the local DynamoDb service and run in background
-     */
-    void start() {
-        port = getFreePort();
-        String portString = Integer.toString(port);
-
-        try {
-            server = createServer(portString);
-            server.start();
-        } catch (Exception e) {
-            throw propagate(e);
-        }
-    }
-
-    /**
-     * Create a standard AWS v2 SDK client pointing to the local DynamoDb instance
-     * @return A DynamoDbClient pointing to the local DynamoDb instance
-     */
-    DynamoDbClient createClient() {
-        String endpoint = String.format("http://localhost:%d", port);
-        return DynamoDbClient.builder()
-                             .endpointOverride(URI.create(endpoint))
-                             // The region is meaningless for local DynamoDb but required for client builder validation
-                             .region(Region.US_EAST_1)
-                             .credentialsProvider(StaticCredentialsProvider.create(
-                                 AwsBasicCredentials.create("dummy-key", "dummy-secret")))
-                             .build();
-    }
-
-    /**
-     * Stops the local DynamoDb service and frees up resources it is using.
-     */
-    void stop() {
-        try {
-            server.stop();
-        } catch (Exception e) {
-            throw propagate(e);
-        }
-    }
-
-    private DynamoDBProxyServer createServer(String portString) throws Exception {
-        return ServerRunner.createServerFromCommandLineArgs(
-            new String[]{
-                "-inMemory",
-                "-port", portString
-            });
-    }
-
-    private int getFreePort() {
-        try {
-            ServerSocket socket = new ServerSocket(0);
-            int port = socket.getLocalPort();
-            socket.close();
-            return port;
-        } catch (IOException ioe) {
-            throw propagate(ioe);
-        }
-    }
-
-    private static RuntimeException propagate(Exception e) {
-        if (e instanceof RuntimeException) {
-            throw (RuntimeException)e;
-        }
-        throw new RuntimeException(e);
-    }
-}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/functionaltests/TransactGetItemsTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/functionaltests/TransactGetItemsTest.java
deleted file mode 100644
index f79bcf38e61b..000000000000
--- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/functionaltests/TransactGetItemsTest.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.extensions.dynamodb.mappingclient.functionaltests;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.nullValue;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.AttributeValues.numberValue;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.staticmapper.AttributeTags.primaryPartitionKey;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.staticmapper.Attributes.integerNumber;
-
-import java.util.List;
-import java.util.Objects;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.Key;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.MappedDatabase;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.MappedTable;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.TableSchema;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.operations.CreateTable;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.operations.GetItem;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.operations.PutItem;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.operations.ReadTransaction;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.operations.TransactGetItems;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.operations.UnmappedItem;
-import software.amazon.awssdk.services.dynamodb.model.DeleteTableRequest;
-
-public class TransactGetItemsTest extends LocalDynamoDbTestBase {
-    private static class Record1 {
-        private Integer id;
-
-        private Integer getId() {
-            return id;
-        }
-
-        private Record1 setId(Integer id) {
-            this.id = id;
-            return this;
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            if (this == o) return true;
-            if (o == null || getClass() != o.getClass()) return false;
-            Record1 record1 = (Record1) o;
-            return Objects.equals(id, record1.id);
-        }
-
-        @Override
-        public int hashCode() {
-            return Objects.hash(id);
-        }
-    }
-
-    private static class Record2 {
-        private Integer id;
-
-        private Integer getId() {
-            return id;
-        }
-
-        private Record2 setId(Integer id) {
-            this.id = id;
-            return this;
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            if (this == o) return true;
-            if (o == null || getClass() != o.getClass()) return false;
-            Record2 record2 = (Record2) o;
-            return Objects.equals(id, record2.id);
-        }
-
-        @Override
-        public int hashCode() {
-            return Objects.hash(id);
-        }
-    }
-
-    private static final TableSchema<Record1> TABLE_SCHEMA_1 =
-        TableSchema.builder()
-                   .newItemSupplier(Record1::new)
-                   .attributes(
-                       integerNumber("id_1", Record1::getId, Record1::setId).as(primaryPartitionKey()))
-                   .build();
-
-    private static final TableSchema<Record2> TABLE_SCHEMA_2 =
-        TableSchema.builder()
-                   .newItemSupplier(Record2::new)
-                   .attributes(
-                       integerNumber("id_2", Record2::getId, Record2::setId).as(primaryPartitionKey()))
-                   .build();
-
-    private MappedDatabase mappedDatabase = MappedDatabase.builder()
-                                                          .dynamoDbClient(getDynamoDbClient())
-                                                          .build();
-
-    private MappedTable<Record1> mappedTable1 = mappedDatabase.table(getConcreteTableName("table-name-1"),
-                                                                     TABLE_SCHEMA_1);
-    private MappedTable<Record2> mappedTable2 = mappedDatabase.table(getConcreteTableName("table-name-2"),
-                                                                     TABLE_SCHEMA_2);
-
-    private static final List<Record1> RECORDS_1 =
-        IntStream.range(0, 2)
-                 .mapToObj(i -> new Record1().setId(i))
-                 .collect(Collectors.toList());
-
-    private static final List<Record2> RECORDS_2 =
-        IntStream.range(0, 2)
-                 .mapToObj(i -> new Record2().setId(i))
-                 .collect(Collectors.toList());
-
-    @Before
-    public void createTable() {
-        mappedTable1.execute(CreateTable.of(getDefaultProvisionedThroughput()));
-        mappedTable2.execute(CreateTable.of(getDefaultProvisionedThroughput()));
-    }
-
-    @After
-    public void deleteTable() {
-        getDynamoDbClient().deleteTable(DeleteTableRequest.builder()
-                                                          .tableName(getConcreteTableName("table-name-1"))
-                                                          .build());
-        getDynamoDbClient().deleteTable(DeleteTableRequest.builder()
-                                                          .tableName(getConcreteTableName("table-name-2"))
-                                                          .build());
-    }
-
-    private void insertRecords() {
-        RECORDS_1.forEach(record -> mappedTable1.execute(PutItem.of(record)));
-        RECORDS_2.forEach(record -> mappedTable2.execute(PutItem.of(record)));
-    }
-
-    @Test
-    public void getRecordsFromMultipleTables() {
-        insertRecords();
-
-        List<UnmappedItem> results =
-            mappedDatabase.execute(TransactGetItems.of(
-                ReadTransaction.of(mappedTable1, GetItem.of(Key.of(numberValue(0)))),                  
-                ReadTransaction.of(mappedTable2, GetItem.of(Key.of(numberValue(0)))),
-                ReadTransaction.of(mappedTable2, GetItem.of(Key.of(numberValue(1)))),
-                ReadTransaction.of(mappedTable1, GetItem.of(Key.of(numberValue(1))))));
-
-        assertThat(results.size(), is(4));
-        assertThat(results.get(0).getItem(mappedTable1), is(RECORDS_1.get(0)));
-        assertThat(results.get(1).getItem(mappedTable2), is(RECORDS_2.get(0)));
-        assertThat(results.get(2).getItem(mappedTable2), is(RECORDS_2.get(1)));
-        assertThat(results.get(3).getItem(mappedTable1), is(RECORDS_1.get(1)));
-    }
-
-    @Test
-    public void notFoundRecordReturnsNull() {
-        insertRecords();
-
-        List<UnmappedItem> results =
-            mappedDatabase.execute(TransactGetItems.of(
-                ReadTransaction.of(mappedTable1, GetItem.of(Key.of(numberValue(0)))),
-                ReadTransaction.of(mappedTable2, GetItem.of(Key.of(numberValue(0)))),
-                ReadTransaction.of(mappedTable2, GetItem.of(Key.of(numberValue(5)))),
-                ReadTransaction.of(mappedTable1, GetItem.of(Key.of(numberValue(1))))));
-
-        assertThat(results.size(), is(4));
-        assertThat(results.get(0).getItem(mappedTable1), is(RECORDS_1.get(0)));
-        assertThat(results.get(1).getItem(mappedTable2), is(RECORDS_2.get(0)));
-        assertThat(results.get(2).getItem(mappedTable2), is(nullValue()));
-        assertThat(results.get(3).getItem(mappedTable1), is(RECORDS_1.get(1)));
-    }
-}
-
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/functionaltests/TransactWriteItemsTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/functionaltests/TransactWriteItemsTest.java
deleted file mode 100644
index 440c22c96ab1..000000000000
--- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/functionaltests/TransactWriteItemsTest.java
+++ /dev/null
@@ -1,356 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.extensions.dynamodb.mappingclient.functionaltests;
-
-import static java.util.Arrays.asList;
-import static java.util.Collections.singletonList;
-import static java.util.Collections.singletonMap;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.nullValue;
-import static org.junit.Assert.fail;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.AttributeValues.numberValue;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.AttributeValues.stringValue;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.staticmapper.AttributeTags.primaryPartitionKey;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.staticmapper.Attributes.integerNumber;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.staticmapper.Attributes.string;
-
-import java.util.List;
-import java.util.Objects;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.Expression;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.Key;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.MappedDatabase;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.MappedTable;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.TableSchema;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.operations.ConditionCheck;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.operations.CreateTable;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.operations.DeleteItem;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.operations.GetItem;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.operations.PutItem;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.operations.TransactWriteItems;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.operations.UpdateItem;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.operations.WriteTransaction;
-import software.amazon.awssdk.services.dynamodb.model.DeleteTableRequest;
-import software.amazon.awssdk.services.dynamodb.model.TransactionCanceledException;
-
-public class TransactWriteItemsTest extends LocalDynamoDbTestBase {
-    private static class Record1 {
-        private Integer id;
-        private String attribute;
-
-        private Integer getId() {
-            return id;
-        }
-
-        private Record1 setId(Integer id) {
-            this.id = id;
-            return this;
-        }
-
-        private String getAttribute() {
-            return attribute;
-        }
-
-        private Record1 setAttribute(String attribute) {
-            this.attribute = attribute;
-            return this;
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            if (this == o) return true;
-            if (o == null || getClass() != o.getClass()) return false;
-            Record1 record1 = (Record1) o;
-            return Objects.equals(id, record1.id) &&
-                   Objects.equals(attribute, record1.attribute);
-        }
-
-        @Override
-        public int hashCode() {
-            return Objects.hash(id, attribute);
-        }
-    }
-
-    private static class Record2 {
-        private Integer id;
-        private String attribute;
-
-        private Integer getId() {
-            return id;
-        }
-
-        private Record2 setId(Integer id) {
-            this.id = id;
-            return this;
-        }
-
-        private String getAttribute() {
-            return attribute;
-        }
-
-        private Record2 setAttribute(String attribute) {
-            this.attribute = attribute;
-            return this;
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            if (this == o) return true;
-            if (o == null || getClass() != o.getClass()) return false;
-            Record2 record2 = (Record2) o;
-            return Objects.equals(id, record2.id) &&
-                   Objects.equals(attribute, record2.attribute);
-        }
-
-        @Override
-        public int hashCode() {
-            return Objects.hash(id, attribute);
-        }
-    }
-
-    private static final TableSchema<Record1> TABLE_SCHEMA_1 =
-        TableSchema.builder()
-                   .newItemSupplier(Record1::new)
-                   .attributes(
-                       integerNumber("id_1", Record1::getId, Record1::setId).as(primaryPartitionKey()),
-                       string("attribute", Record1::getAttribute, Record1::setAttribute))
-                   .build();
-
-    private static final TableSchema<Record2> TABLE_SCHEMA_2 =
-        TableSchema.builder()
-                   .newItemSupplier(Record2::new)
-                   .attributes(
-                       integerNumber("id_2", Record2::getId, Record2::setId).as(primaryPartitionKey()),
-                       string("attribute", Record2::getAttribute, Record2::setAttribute))
-                   .build();
-
-    private MappedDatabase mappedDatabase = MappedDatabase.builder()
-                                                          .dynamoDbClient(getDynamoDbClient())
-                                                          .build();
-
-    private MappedTable<Record1> mappedTable1 = mappedDatabase.table(getConcreteTableName("table-name-1"),
-                                                                     TABLE_SCHEMA_1);
-    private MappedTable<Record2> mappedTable2 = mappedDatabase.table(getConcreteTableName("table-name-2"),
-                                                                     TABLE_SCHEMA_2);
-
-    private static final List<Record1> RECORDS_1 =
-        IntStream.range(0, 2)
-                 .mapToObj(i -> new Record1().setId(i).setAttribute(Integer.toString(i)))
-                 .collect(Collectors.toList());
-
-    private static final List<Record2> RECORDS_2 =
-        IntStream.range(0, 2)
-                 .mapToObj(i -> new Record2().setId(i).setAttribute(Integer.toString(i)))
-                 .collect(Collectors.toList());
-
-    @Before
-    public void createTable() {
-        mappedTable1.execute(CreateTable.of(getDefaultProvisionedThroughput()));
-        mappedTable2.execute(CreateTable.of(getDefaultProvisionedThroughput()));
-    }
-
-    @After
-    public void deleteTable() {
-        getDynamoDbClient().deleteTable(DeleteTableRequest.builder()
-                                                          .tableName(getConcreteTableName("table-name-1"))
-                                                          .build());
-        getDynamoDbClient().deleteTable(DeleteTableRequest.builder()
-                                                          .tableName(getConcreteTableName("table-name-2"))
-                                                          .build());
-    }
-
-    @Test
-    public void singlePut() {
-        List<WriteTransaction> writeTransactions =
-            singletonList(WriteTransaction.of(mappedTable1, PutItem.of(RECORDS_1.get(0))));
-
-        mappedDatabase.execute(TransactWriteItems.of(writeTransactions));
-
-        Record1 record = mappedTable1.execute(GetItem.of(Key.of(numberValue(0))));
-        assertThat(record, is(RECORDS_1.get(0)));
-    }
-
-    @Test
-    public void multiplePut() {
-        List<WriteTransaction> writeTransactions =
-            asList(WriteTransaction.of(mappedTable1, PutItem.of(RECORDS_1.get(0))),
-                   WriteTransaction.of(mappedTable2, PutItem.of(RECORDS_2.get(0))));
-
-        mappedDatabase.execute(TransactWriteItems.of(writeTransactions));
-
-        Record1 record1 = mappedTable1.execute(GetItem.of(Key.of(numberValue(0))));
-        Record2 record2 = mappedTable2.execute(GetItem.of(Key.of(numberValue(0))));
-        assertThat(record1, is(RECORDS_1.get(0)));
-        assertThat(record2, is(RECORDS_2.get(0)));
-    }
-
-    @Test
-    public void singleUpdate() {
-        List<WriteTransaction> writeTransactions =
-            singletonList(WriteTransaction.of(mappedTable1, UpdateItem.of(RECORDS_1.get(0))));
-
-        mappedDatabase.execute(TransactWriteItems.of(writeTransactions));
-
-        Record1 record = mappedTable1.execute(GetItem.of(Key.of(numberValue(0))));
-        assertThat(record, is(RECORDS_1.get(0)));
-    }
-
-    @Test
-    public void multipleUpdate() {
-        List<WriteTransaction> writeTransactions =
-            asList(WriteTransaction.of(mappedTable1, UpdateItem.of(RECORDS_1.get(0))),
-                   WriteTransaction.of(mappedTable2, UpdateItem.of(RECORDS_2.get(0))));
-
-        mappedDatabase.execute(TransactWriteItems.of(writeTransactions));
-
-        Record1 record1 = mappedTable1.execute(GetItem.of(Key.of(numberValue(0))));
-        Record2 record2 = mappedTable2.execute(GetItem.of(Key.of(numberValue(0))));
-        assertThat(record1, is(RECORDS_1.get(0)));
-        assertThat(record2, is(RECORDS_2.get(0)));
-    }
-
-    @Test
-    public void singleDelete() {
-        mappedTable1.execute(PutItem.of(RECORDS_1.get(0)));
-
-        List<WriteTransaction> writeTransactions =
-            singletonList(WriteTransaction.of(mappedTable1, DeleteItem.of(Key.of(numberValue(0)))));
-
-        mappedDatabase.execute(TransactWriteItems.of(writeTransactions));
-
-        Record1 record = mappedTable1.execute(GetItem.of(Key.of(numberValue(0))));
-        assertThat(record, is(nullValue()));
-    }
-
-    @Test
-    public void multipleDelete() {
-        mappedTable1.execute(PutItem.of(RECORDS_1.get(0)));
-        mappedTable2.execute(PutItem.of(RECORDS_2.get(0)));
-
-        List<WriteTransaction> writeTransactions =
-            asList(WriteTransaction.of(mappedTable1, DeleteItem.of(Key.of(numberValue(0)))),
-                   WriteTransaction.of(mappedTable2, DeleteItem.of(Key.of(numberValue(0)))));
-
-        mappedDatabase.execute(TransactWriteItems.of(writeTransactions));
-
-        Record1 record1 = mappedTable1.execute(GetItem.of(Key.of(numberValue(0))));
-        Record2 record2 = mappedTable2.execute(GetItem.of(Key.of(numberValue(0))));
-        assertThat(record1, is(nullValue()));
-        assertThat(record2, is(nullValue()));
-    }
-
-    @Test
-    public void singleConditionCheck() {
-        mappedTable1.execute(PutItem.of(RECORDS_1.get(0)));
-
-        Expression conditionExpression1 = Expression.builder()
-                                                    .expression("#attribute = :attribute")
-                                                    .expressionValues(singletonMap(":attribute", stringValue("0")))
-                                                    .expressionNames(singletonMap("#attribute", "attribute"))
-                                                    .build();
-
-        Key key1 = Key.of(numberValue(0));
-        List<WriteTransaction> writeTransactions =
-            singletonList(WriteTransaction.of(mappedTable1, ConditionCheck.of(key1, conditionExpression1)));
-
-        mappedDatabase.execute(TransactWriteItems.of(writeTransactions));
-    }
-
-    @Test
-    public void multiConditionCheck() {
-        mappedTable1.execute(PutItem.of(RECORDS_1.get(0)));
-        mappedTable2.execute(PutItem.of(RECORDS_2.get(0)));
-
-        Expression conditionExpression1 = Expression.builder()
-                                                    .expression("#attribute = :attribute")
-                                                    .expressionValues(singletonMap(":attribute", stringValue("0")))
-                                                    .expressionNames(singletonMap("#attribute", "attribute"))
-                                                    .build();
-
-        Key key1 = Key.of(numberValue(0));
-        Key key2 = Key.of(numberValue(0));
-
-        List<WriteTransaction> writeTransactions =
-            asList(WriteTransaction.of(mappedTable1, ConditionCheck.of(key1, conditionExpression1)),
-                   WriteTransaction.of(mappedTable2, ConditionCheck.of(key2, conditionExpression1)));
-
-        mappedDatabase.execute(TransactWriteItems.of(writeTransactions));
-    }
-
-    @Test
-    public void mixedCommands() {
-        mappedTable1.execute(PutItem.of(RECORDS_1.get(0)));
-        mappedTable2.execute(PutItem.of(RECORDS_2.get(0)));
-
-        Expression conditionExpression1 = Expression.builder()
-                                                    .expression("#attribute = :attribute")
-                                                    .expressionValues(singletonMap(":attribute", stringValue("0")))
-                                                    .expressionNames(singletonMap("#attribute", "attribute"))
-                                                    .build();
-
-        Key key1 = Key.of(numberValue(0));
-
-        List<WriteTransaction> writeTransactions =
-            asList(WriteTransaction.of(mappedTable1, ConditionCheck.of(key1, conditionExpression1)),
-                   WriteTransaction.of(mappedTable2, PutItem.of(RECORDS_2.get(1))),
-                   WriteTransaction.of(mappedTable1, UpdateItem.of(RECORDS_1.get(1))),
-                   WriteTransaction.of(mappedTable2, DeleteItem.of(Key.of(numberValue(0)))));
-
-        mappedDatabase.execute(TransactWriteItems.of(writeTransactions));
-
-        assertThat(mappedTable1.execute(GetItem.of(Key.of(numberValue(1)))), is(RECORDS_1.get(1)));
-        assertThat(mappedTable2.execute(GetItem.of(Key.of(numberValue(0)))), is(nullValue()));
-        assertThat(mappedTable2.execute(GetItem.of(Key.of(numberValue(1)))), is(RECORDS_2.get(1)));
-    }
-
-    @Test
-    public void mixedCommands_conditionCheckFailsTransaction() {
-        mappedTable1.execute(PutItem.of(RECORDS_1.get(0)));
-        mappedTable2.execute(PutItem.of(RECORDS_2.get(0)));
-
-        Expression conditionExpression1 = Expression.builder()
-                                                    .expression("#attribute = :attribute")
-                                                    .expressionValues(singletonMap(":attribute", stringValue("1")))
-                                                    .expressionNames(singletonMap("#attribute", "attribute"))
-                                                    .build();
-
-        Key key1 = Key.of(numberValue(0));
-
-        List<WriteTransaction> writeTransactions =
-            asList(WriteTransaction.of(mappedTable2, PutItem.of(RECORDS_2.get(1))),
-                   WriteTransaction.of(mappedTable1, UpdateItem.of(RECORDS_1.get(1))),
-                   WriteTransaction.of(mappedTable1, ConditionCheck.of(key1, conditionExpression1)),
-                   WriteTransaction.of(mappedTable2, DeleteItem.of(Key.of(numberValue(0)))));
-
-        try {
-            mappedDatabase.execute(TransactWriteItems.of(writeTransactions));
-            fail("Expected TransactionCanceledException to be thrown");
-        } catch(TransactionCanceledException ignored) {
-        }
-
-        assertThat(mappedTable1.execute(GetItem.of(Key.of(numberValue(1)))), is(nullValue()));
-        assertThat(mappedTable2.execute(GetItem.of(Key.of(numberValue(0)))), is(RECORDS_2.get(0)));
-        assertThat(mappedTable2.execute(GetItem.of(Key.of(numberValue(1)))), is(nullValue()));
-    }
-}
-
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/functionaltests/VersionedRecordTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/functionaltests/VersionedRecordTest.java
deleted file mode 100644
index aa6a12c29ca7..000000000000
--- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/functionaltests/VersionedRecordTest.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.extensions.dynamodb.mappingclient.functionaltests;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.is;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.AttributeValues.stringValue;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.extensions.VersionedRecordExtension.AttributeTags.version;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.staticmapper.AttributeTags.primaryPartitionKey;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.staticmapper.Attributes.integerNumber;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.staticmapper.Attributes.string;
-
-import java.util.Objects;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.Key;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.MappedDatabase;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.MappedTable;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.TableSchema;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.extensions.VersionedRecordExtension;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.operations.CreateTable;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.operations.GetItem;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.operations.PutItem;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.operations.UpdateItem;
-import software.amazon.awssdk.services.dynamodb.model.ConditionalCheckFailedException;
-import software.amazon.awssdk.services.dynamodb.model.DeleteTableRequest;
-
-public class VersionedRecordTest extends LocalDynamoDbTestBase {
-    private static class Record {
-        private String id;
-        private String attribute;
-        private Integer version;
-
-        private String getId() {
-            return id;
-        }
-
-        private Record setId(String id) {
-            this.id = id;
-            return this;
-        }
-
-        private String getAttribute() {
-            return attribute;
-        }
-
-        private Record setAttribute(String attribute) {
-            this.attribute = attribute;
-            return this;
-        }
-
-        private Integer getVersion() {
-            return version;
-        }
-
-        private Record setVersion(Integer version) {
-            this.version = version;
-            return this;
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            if (this == o) return true;
-            if (o == null || getClass() != o.getClass()) return false;
-            Record record = (Record) o;
-            return Objects.equals(id, record.id) &&
-                   Objects.equals(attribute, record.attribute) &&
-                   Objects.equals(version, record.version);
-        }
-
-        @Override
-        public int hashCode() {
-            return Objects.hash(id, attribute, version);
-        }
-    }
-
-    private static final TableSchema<Record> TABLE_SCHEMA =
-        TableSchema.builder()
-                   .newItemSupplier(Record::new)
-                   .attributes(
-                       string("id", Record::getId, Record::setId).as(primaryPartitionKey()),
-                       string("attribute", Record::getAttribute, Record::setAttribute),
-                       integerNumber("version", Record::getVersion, Record::setVersion).as(version()))
-                   .build();
-
-    private MappedDatabase mappedDatabase = MappedDatabase.builder()
-                                                          .dynamoDbClient(getDynamoDbClient())
-                                                          .extendWith(VersionedRecordExtension.builder().build())
-                                                          .build();
-
-    private MappedTable<Record> mappedTable = mappedDatabase.table(getConcreteTableName("table-name"), TABLE_SCHEMA);
-
-    @Before
-    public void createTable() {
-        mappedTable.execute(CreateTable.of(getDefaultProvisionedThroughput()));
-    }
-
-    @After
-    public void deleteTable() {
-        getDynamoDbClient().deleteTable(DeleteTableRequest.builder()
-                                                          .tableName(getConcreteTableName("table-name"))
-                                                          .build());
-    }
-
-    @Test
-    public void putNewRecordSetsInitialVersion() {
-        mappedTable.execute(PutItem.of(new Record().setId("id").setAttribute("one")));
-
-        Record result = mappedTable.execute(GetItem.of(Key.of(stringValue("id"))));
-        Record expectedResult = new Record().setId("id").setAttribute("one").setVersion(1);
-
-        assertThat(result, is(expectedResult));
-    }
-
-    @Test
-    public void updateNewRecordSetsInitialVersion() {
-        Record result = mappedTable.execute(UpdateItem.of(new Record().setId("id").setAttribute("one")));
-
-        Record expectedResult = new Record().setId("id").setAttribute("one").setVersion(1);
-
-        assertThat(result, is(expectedResult));
-    }
-
-    @Test
-    public void putExistingRecordVersionMatches() {
-        mappedTable.execute(PutItem.of(new Record().setId("id").setAttribute("one")));
-
-        mappedTable.execute(PutItem.of(new Record().setId("id").setAttribute("one").setVersion(1)));
-
-        Record result = mappedTable.execute(GetItem.of(Key.of(stringValue("id"))));
-        Record expectedResult = new Record().setId("id").setAttribute("one").setVersion(2);
-        assertThat(result, is(expectedResult));
-    }
-
-    @Test
-    public void updateExistingRecordVersionMatches() {
-        mappedTable.execute(PutItem.of(new Record().setId("id").setAttribute("one")));
-
-        Record result =
-            mappedTable.execute(UpdateItem.of(new Record().setId("id").setAttribute("one").setVersion(1)));
-
-        Record expectedResult = new Record().setId("id").setAttribute("one").setVersion(2);
-        assertThat(result, is(expectedResult));
-    }
-
-    @Test(expected = ConditionalCheckFailedException.class)
-    public void putNewRecordTwice() {
-        mappedTable.execute(PutItem.of(new Record().setId("id").setAttribute("one")));
-        mappedTable.execute(PutItem.of(new Record().setId("id").setAttribute("one")));
-    }
-
-    @Test(expected = ConditionalCheckFailedException.class)
-    public void updateNewRecordTwice() {
-        mappedTable.execute(UpdateItem.of(new Record().setId("id").setAttribute("one")));
-        mappedTable.execute(UpdateItem.of(new Record().setId("id").setAttribute("one")));
-    }
-
-    @Test(expected = ConditionalCheckFailedException.class)
-    public void putRecordWithWrongVersionNumber() {
-        mappedTable.execute(PutItem.of(new Record().setId("id").setAttribute("one")));
-        mappedTable.execute(PutItem.of(new Record().setId("id").setAttribute("one").setVersion(2)));
-    }
-}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/functionaltests/models/FakeItem.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/functionaltests/models/FakeItem.java
deleted file mode 100644
index b0b230fc999e..000000000000
--- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/functionaltests/models/FakeItem.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.extensions.dynamodb.mappingclient.functionaltests.models;
-
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.extensions.VersionedRecordExtension.AttributeTags.version;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.staticmapper.AttributeTags.primaryPartitionKey;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.staticmapper.Attributes.integerNumber;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.staticmapper.Attributes.string;
-
-import java.util.Objects;
-import java.util.UUID;
-
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.TableMetadata;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.TableSchema;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.staticmapper.StaticTableSchema;
-
-public class FakeItem extends FakeItemAbstractSubclass {
-    private static final StaticTableSchema<FakeItem> FAKE_ITEM_MAPPER =
-        StaticTableSchema.builder()
-                         .newItemSupplier(FakeItem::new)
-                         .flatten(FakeItemComposedClass.getTableSchema(),
-                                  FakeItem::getComposedObject,
-                                  FakeItem::setComposedObject)
-                         .extend(FakeItemAbstractSubclass.getSubclassTableSchema())
-                         .attributes(string("id", FakeItem::getId, FakeItem::setId).as(primaryPartitionKey()),
-                                     integerNumber("version", FakeItem::getVersion, FakeItem::setVersion).as(version()))
-                         .build();
-
-    private String id;
-    private Integer version;
-    private FakeItemComposedClass composedObject;
-
-    public FakeItem() {
-    }
-
-    public FakeItem(String id, Integer version, FakeItemComposedClass composedObject) {
-        this.id = id;
-        this.version = version;
-        this.composedObject = composedObject;
-    }
-
-    public static Builder builder() {
-        return new Builder();
-    }
-
-    public static TableSchema<FakeItem> getTableSchema() {
-        return FAKE_ITEM_MAPPER;
-    }
-
-    public static TableMetadata getTableMetadata() {
-        return FAKE_ITEM_MAPPER.getTableMetadata();
-    }
-
-    public static FakeItem createUniqueFakeItem() {
-        return FakeItem.builder()
-                       .id(UUID.randomUUID().toString())
-                       .build();
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public Integer getVersion() {
-        return version;
-    }
-
-    public void setVersion(Integer version) {
-        this.version = version;
-    }
-
-    public FakeItemComposedClass getComposedObject() {
-        return composedObject;
-    }
-
-    public void setComposedObject(FakeItemComposedClass composedObject) {
-        this.composedObject = composedObject;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        if (! super.equals(o)) return false;
-        FakeItem fakeItem = (FakeItem) o;
-        return Objects.equals(id, fakeItem.id) &&
-               Objects.equals(version, fakeItem.version) &&
-               Objects.equals(composedObject, fakeItem.composedObject);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(super.hashCode(), id, version, composedObject);
-    }
-
-    public static class Builder {
-        private String id;
-        private Integer version;
-        private FakeItemComposedClass composedObject;
-
-        public Builder id(String id) {
-            this.id = id;
-            return this;
-        }
-
-        public Builder version(Integer version) {
-            this.version = version;
-            return this;
-        }
-
-        public Builder composedObject(FakeItemComposedClass composedObject) {
-            this.composedObject = composedObject;
-            return this;
-        }
-
-        public FakeItem build() {
-            return new FakeItem(id, version, composedObject);
-        }
-    }
-}
\ No newline at end of file
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/functionaltests/models/FakeItemComposedAbstractSubclass.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/functionaltests/models/FakeItemComposedAbstractSubclass.java
deleted file mode 100644
index e7ea1f04cec0..000000000000
--- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/functionaltests/models/FakeItemComposedAbstractSubclass.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.extensions.dynamodb.mappingclient.functionaltests.models;
-
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.staticmapper.Attributes.string;
-
-import java.util.Objects;
-
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.staticmapper.StaticTableSchema;
-
-abstract class FakeItemComposedAbstractSubclass {
-    private static final StaticTableSchema<FakeItemComposedAbstractSubclass> FAKE_ITEM_MAPPER =
-        StaticTableSchema.builder()
-                         .attributes(string("composed_abstract_subclass",
-                                            FakeItemComposedAbstractSubclass::getComposedSubclassAttribute,
-                                            FakeItemComposedAbstractSubclass::setComposedSubclassAttribute))
-                         .build();
-
-    private String composedSubclassAttribute;
-
-    static StaticTableSchema<FakeItemComposedAbstractSubclass> getSubclassTableSchema() {
-        return FAKE_ITEM_MAPPER;
-    }
-
-    public String getComposedSubclassAttribute() {
-        return composedSubclassAttribute;
-    }
-
-    public void setComposedSubclassAttribute(String composedSubclassAttribute) {
-        this.composedSubclassAttribute = composedSubclassAttribute;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        FakeItemComposedAbstractSubclass that = (FakeItemComposedAbstractSubclass) o;
-        return Objects.equals(composedSubclassAttribute, that.composedSubclassAttribute);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(composedSubclassAttribute);
-    }
-}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/functionaltests/models/FakeItemComposedAbstractSubclass2.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/functionaltests/models/FakeItemComposedAbstractSubclass2.java
deleted file mode 100644
index 7a60c76a8553..000000000000
--- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/functionaltests/models/FakeItemComposedAbstractSubclass2.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.extensions.dynamodb.mappingclient.functionaltests.models;
-
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.staticmapper.Attributes.string;
-
-import java.util.Objects;
-
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.staticmapper.StaticTableSchema;
-
-abstract class FakeItemComposedAbstractSubclass2 {
-    private static final StaticTableSchema<FakeItemComposedAbstractSubclass2> FAKE_ITEM_MAPPER =
-        StaticTableSchema.builder()
-                         .attributes(string("composed_abstract_subclass_2",
-                                            FakeItemComposedAbstractSubclass2::getComposedSubclassAttribute2,
-                                            FakeItemComposedAbstractSubclass2::setComposedSubclassAttribute2))
-                         .build();
-
-    private String composedSubclassAttribute2;
-
-    static StaticTableSchema<FakeItemComposedAbstractSubclass2> getSubclassTableSchema() {
-        return FAKE_ITEM_MAPPER;
-    }
-
-    public String getComposedSubclassAttribute2() {
-        return composedSubclassAttribute2;
-    }
-
-    public void setComposedSubclassAttribute2(String composedSubclassAttribute2) {
-        this.composedSubclassAttribute2 = composedSubclassAttribute2;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        FakeItemComposedAbstractSubclass2 that = (FakeItemComposedAbstractSubclass2) o;
-        return Objects.equals(composedSubclassAttribute2, that.composedSubclassAttribute2);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(composedSubclassAttribute2);
-    }
-}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/functionaltests/models/FakeItemComposedSubclass.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/functionaltests/models/FakeItemComposedSubclass.java
deleted file mode 100644
index d8725dcb592f..000000000000
--- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/functionaltests/models/FakeItemComposedSubclass.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.extensions.dynamodb.mappingclient.functionaltests.models;
-
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.staticmapper.Attributes.string;
-
-import java.util.Objects;
-
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.staticmapper.StaticTableSchema;
-
-public class FakeItemComposedSubclass extends FakeItemComposedAbstractSubclass {
-    private static final StaticTableSchema<FakeItemComposedSubclass> ITEM_MAPPER =
-        StaticTableSchema.builder()
-                         .newItemSupplier(FakeItemComposedSubclass::new)
-                         .attributes(string("composed_subclass",
-                                            FakeItemComposedSubclass::getComposedAttribute,
-                                            FakeItemComposedSubclass::setComposedAttribute))
-                         .extend(FakeItemComposedAbstractSubclass.getSubclassTableSchema())
-                         .build();
-
-    private String composedAttribute;
-
-    public static StaticTableSchema<FakeItemComposedSubclass> getTableSchema() {
-        return ITEM_MAPPER;
-    }
-
-    public String getComposedAttribute() {
-        return composedAttribute;
-    }
-
-    public void setComposedAttribute(String composedAttribute) {
-        this.composedAttribute = composedAttribute;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        if (! super.equals(o)) return false;
-        FakeItemComposedSubclass that = (FakeItemComposedSubclass) o;
-        return Objects.equals(composedAttribute, that.composedAttribute);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(super.hashCode(), composedAttribute);
-    }
-}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/functionaltests/models/FakeItemComposedSubclass2.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/functionaltests/models/FakeItemComposedSubclass2.java
deleted file mode 100644
index 2adfb693704a..000000000000
--- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/functionaltests/models/FakeItemComposedSubclass2.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.extensions.dynamodb.mappingclient.functionaltests.models;
-
-
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.staticmapper.Attributes.string;
-
-import java.util.Objects;
-
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.staticmapper.StaticTableSchema;
-
-public class FakeItemComposedSubclass2 extends FakeItemComposedAbstractSubclass2 {
-    private static final StaticTableSchema<FakeItemComposedSubclass2> ITEM_MAPPER =
-        StaticTableSchema.builder()
-                         .newItemSupplier(FakeItemComposedSubclass2::new)
-                         .extend(FakeItemComposedAbstractSubclass2.getSubclassTableSchema())
-                         .attributes(string("composed_subclass_2",
-                                            FakeItemComposedSubclass2::getComposedAttribute2,
-                                            FakeItemComposedSubclass2::setComposedAttribute2))
-                         .build();
-
-    private String composedAttribute2;
-
-    public static StaticTableSchema<FakeItemComposedSubclass2> getTableSchema() {
-        return ITEM_MAPPER;
-    }
-
-    public String getComposedAttribute2() {
-        return composedAttribute2;
-    }
-
-    public void setComposedAttribute2(String composedAttribute2) {
-        this.composedAttribute2 = composedAttribute2;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        if (! super.equals(o)) return false;
-        FakeItemComposedSubclass2 that = (FakeItemComposedSubclass2) o;
-        return Objects.equals(composedAttribute2, that.composedAttribute2);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(super.hashCode(), composedAttribute2);
-    }
-}
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/functionaltests/models/FakeItemWithBinaryKey.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/functionaltests/models/FakeItemWithBinaryKey.java
deleted file mode 100644
index faeab1c2e3d6..000000000000
--- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/functionaltests/models/FakeItemWithBinaryKey.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.extensions.dynamodb.mappingclient.functionaltests.models;
-
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.staticmapper.AttributeTags.primaryPartitionKey;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.staticmapper.Attributes.binary;
-
-import java.nio.ByteBuffer;
-import java.util.Objects;
-
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.staticmapper.StaticTableSchema;
-
-public class FakeItemWithBinaryKey {
-    private static final StaticTableSchema<FakeItemWithBinaryKey> FAKE_ITEM_WITH_BINARY_KEY_SCHEMA =
-        StaticTableSchema.builder()
-                         .newItemSupplier(FakeItemWithBinaryKey::new)
-                         .attributes(
-                            binary("id", FakeItemWithBinaryKey::getId, FakeItemWithBinaryKey::setId)
-                                .as(primaryPartitionKey()))
-                         .build();
-
-    private ByteBuffer id;
-
-    public static StaticTableSchema<FakeItemWithBinaryKey> getTableSchema() {
-        return FAKE_ITEM_WITH_BINARY_KEY_SCHEMA;
-    }
-
-    public ByteBuffer getId() {
-        return id;
-    }
-
-    public void setId(ByteBuffer id) {
-        this.id = id;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        FakeItemWithBinaryKey that = (FakeItemWithBinaryKey) o;
-        return Objects.equals(id, that.id);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(id);
-    }
-}
\ No newline at end of file
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/functionaltests/models/FakeItemWithIndices.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/functionaltests/models/FakeItemWithIndices.java
deleted file mode 100644
index c014ddd879d7..000000000000
--- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/functionaltests/models/FakeItemWithIndices.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.extensions.dynamodb.mappingclient.functionaltests.models;
-
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.staticmapper.AttributeTags.primaryPartitionKey;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.staticmapper.AttributeTags.primarySortKey;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.staticmapper.AttributeTags.secondaryPartitionKey;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.staticmapper.AttributeTags.secondarySortKey;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.staticmapper.Attributes.string;
-
-import java.util.UUID;
-
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.staticmapper.StaticTableSchema;
-
-public class FakeItemWithIndices {
-    private static final StaticTableSchema<FakeItemWithIndices> FAKE_ITEM_MAPPER =
-        StaticTableSchema.builder()
-                         .newItemSupplier(FakeItemWithIndices::new)
-                         .attributes(
-                string("id", FakeItemWithIndices::getId, FakeItemWithIndices::setId).as(primaryPartitionKey()),
-                string("sort", FakeItemWithIndices::getSort, FakeItemWithIndices::setSort).as(primarySortKey()),
-                string("gsi_id", FakeItemWithIndices::getGsiId, FakeItemWithIndices::setGsiId)
-                    .as(secondaryPartitionKey("gsi_1"), secondaryPartitionKey("gsi_2")),
-                string("gsi_sort", FakeItemWithIndices::getGsiSort, FakeItemWithIndices::setGsiSort)
-                    .as(secondarySortKey("gsi_1")),
-                string("lsi_sort", FakeItemWithIndices::getLsiSort, FakeItemWithIndices::setLsiSort)
-                    .as(secondarySortKey("lsi_1")))
-                         .build();
-
-    private String id;
-    private String sort;
-    private String gsiId;
-    private String gsiSort;
-    private String lsiSort;
-
-    public FakeItemWithIndices() {
-    }
-
-    public FakeItemWithIndices(String id, String sort, String gsiId, String gsiSort, String lsiSort) {
-        this.id = id;
-        this.sort = sort;
-        this.gsiId = gsiId;
-        this.gsiSort = gsiSort;
-        this.lsiSort = lsiSort;
-    }
-
-    public static Builder builder() {
-        return new Builder();
-    }
-
-    public static StaticTableSchema<FakeItemWithIndices> getTableSchema() {
-        return FAKE_ITEM_MAPPER;
-    }
-
-    public static FakeItemWithIndices createUniqueFakeItemWithIndices() {
-        return FakeItemWithIndices.builder()
-                                  .id(UUID.randomUUID().toString())
-                                  .sort(UUID.randomUUID().toString())
-                                  .gsiId(UUID.randomUUID().toString())
-                                  .gsiSort(UUID.randomUUID().toString())
-                                  .lsiSort(UUID.randomUUID().toString())
-                                  .build();
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getSort() {
-        return sort;
-    }
-
-    public void setSort(String sort) {
-        this.sort = sort;
-    }
-
-    public String getGsiId() {
-        return gsiId;
-    }
-
-    public void setGsiId(String gsiId) {
-        this.gsiId = gsiId;
-    }
-
-    public String getGsiSort() {
-        return gsiSort;
-    }
-
-    public void setGsiSort(String gsiSort) {
-        this.gsiSort = gsiSort;
-    }
-
-    public String getLsiSort() {
-        return lsiSort;
-    }
-
-    public void setLsiSort(String lsiSort) {
-        this.lsiSort = lsiSort;
-    }
-
-    public static class Builder {
-        private String id;
-        private String sort;
-        private String gsiId;
-        private String gsiSort;
-        private String lsiSort;
-
-        public Builder id(String id) {
-            this.id = id;
-            return this;
-        }
-
-        public Builder sort(String sort) {
-            this.sort = sort;
-            return this;
-        }
-
-        public Builder gsiId(String gsiId) {
-            this.gsiId = gsiId;
-            return this;
-        }
-
-        public Builder gsiSort(String gsiSort) {
-            this.gsiSort = gsiSort;
-            return this;
-        }
-
-        public Builder lsiSort(String lsiSort) {
-            this.lsiSort = lsiSort;
-            return this;
-        }
-
-        public FakeItemWithIndices build() {
-            return new FakeItemWithIndices(id, sort, gsiId, gsiSort, lsiSort);
-        }
-    }
-}
\ No newline at end of file
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/functionaltests/models/FakeItemWithNumericSort.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/functionaltests/models/FakeItemWithNumericSort.java
deleted file mode 100644
index 2cd3383d98e7..000000000000
--- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/functionaltests/models/FakeItemWithNumericSort.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.extensions.dynamodb.mappingclient.functionaltests.models;
-
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.staticmapper.AttributeTags.primaryPartitionKey;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.staticmapper.AttributeTags.primarySortKey;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.staticmapper.Attributes.integerNumber;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.staticmapper.Attributes.string;
-
-import java.util.Random;
-import java.util.UUID;
-
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.staticmapper.StaticTableSchema;
-
-public class FakeItemWithNumericSort {
-    private static final Random RANDOM = new Random();
-
-    private static final StaticTableSchema<FakeItemWithNumericSort> FAKE_ITEM_MAPPER =
-        StaticTableSchema.builder()
-                         .newItemSupplier(FakeItemWithNumericSort::new)
-                         .attributes(
-                            string("id", FakeItemWithNumericSort::getId, FakeItemWithNumericSort::setId)
-                                .as(primaryPartitionKey()),
-                            integerNumber("sort", FakeItemWithNumericSort::getSort, FakeItemWithNumericSort::setSort)
-                                .as(primarySortKey()))
-                         .build();
-
-    private String id;
-    private Integer sort;
-
-    public FakeItemWithNumericSort() {
-    }
-
-    public FakeItemWithNumericSort(String id, Integer sort) {
-        this.id = id;
-        this.sort = sort;
-    }
-
-    public static Builder builder() {
-        return new Builder();
-    }
-
-    public static StaticTableSchema<FakeItemWithNumericSort> getTableSchema() {
-        return FAKE_ITEM_MAPPER;
-    }
-
-    public static FakeItemWithNumericSort createUniqueFakeItemWithSort() {
-        return FakeItemWithNumericSort.builder()
-                                      .id(UUID.randomUUID().toString())
-                                      .sort(RANDOM.nextInt())
-                                      .build();
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public Integer getSort() {
-        return sort;
-    }
-
-    public void setSort(Integer sort) {
-        this.sort = sort;
-    }
-
-    public static class Builder {
-        private String id;
-        private Integer sort;
-
-        public Builder id(String id) {
-            this.id = id;
-            return this;
-        }
-
-        public Builder sort(Integer sort) {
-            this.sort = sort;
-            return this;
-        }
-
-        public FakeItemWithNumericSort build() {
-            return new FakeItemWithNumericSort(id, sort);
-        }
-    }
-}
\ No newline at end of file
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/functionaltests/models/FakeItemWithSort.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/functionaltests/models/FakeItemWithSort.java
deleted file mode 100644
index 3e016bcf83f3..000000000000
--- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/functionaltests/models/FakeItemWithSort.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.extensions.dynamodb.mappingclient.functionaltests.models;
-
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.staticmapper.AttributeTags.primaryPartitionKey;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.staticmapper.AttributeTags.primarySortKey;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.staticmapper.Attributes.string;
-
-import java.util.Objects;
-import java.util.UUID;
-
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.TableMetadata;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.staticmapper.StaticTableSchema;
-
-public class FakeItemWithSort {
-    private static final StaticTableSchema<FakeItemWithSort> FAKE_ITEM_MAPPER =
-        StaticTableSchema.builder()
-                         .newItemSupplier(FakeItemWithSort::new)
-                         .attributes(
-                string("id", FakeItemWithSort::getId, FakeItemWithSort::setId).as(primaryPartitionKey()),
-                string("sort", FakeItemWithSort::getSort, FakeItemWithSort::setSort).as(primarySortKey()),
-                string("other_attribute_1", FakeItemWithSort::getOtherAttribute1, FakeItemWithSort::setOtherAttribute1),
-                string("other_attribute_2", FakeItemWithSort::getOtherAttribute2, FakeItemWithSort::setOtherAttribute2))
-                         .build();
-
-    private String id;
-    private String sort;
-    private String otherAttribute1;
-    private String otherAttribute2;
-
-    public FakeItemWithSort() {
-    }
-
-    public FakeItemWithSort(String id, String sort, String otherAttribute1, String otherAttribute2) {
-        this.id = id;
-        this.sort = sort;
-        this.otherAttribute1 = otherAttribute1;
-        this.otherAttribute2 = otherAttribute2;
-    }
-
-    public static Builder builder() {
-        return new Builder();
-    }
-
-    public static StaticTableSchema<FakeItemWithSort> getTableSchema() {
-        return FAKE_ITEM_MAPPER;
-    }
-
-    public static TableMetadata getTableMetadata() {
-        return FAKE_ITEM_MAPPER.getTableMetadata();
-    }
-
-    public static FakeItemWithSort createUniqueFakeItemWithSort() {
-        return FakeItemWithSort.builder()
-            .id(UUID.randomUUID().toString())
-            .sort(UUID.randomUUID().toString())
-            .build();
-    }
-
-    public static FakeItemWithSort createUniqueFakeItemWithoutSort() {
-        return FakeItemWithSort.builder()
-            .id(UUID.randomUUID().toString())
-            .build();
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getSort() {
-        return sort;
-    }
-
-    public void setSort(String sort) {
-        this.sort = sort;
-    }
-
-    public String getOtherAttribute1() {
-        return otherAttribute1;
-    }
-
-    public void setOtherAttribute1(String otherAttribute1) {
-        this.otherAttribute1 = otherAttribute1;
-    }
-
-    public String getOtherAttribute2() {
-        return otherAttribute2;
-    }
-
-    public void setOtherAttribute2(String otherAttribute2) {
-        this.otherAttribute2 = otherAttribute2;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        FakeItemWithSort that = (FakeItemWithSort) o;
-        return Objects.equals(id, that.id) &&
-               Objects.equals(sort, that.sort) &&
-               Objects.equals(otherAttribute1, that.otherAttribute1) &&
-               Objects.equals(otherAttribute2, that.otherAttribute2);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(id, sort, otherAttribute1, otherAttribute2);
-    }
-
-    public static class Builder {
-        private String id;
-        private String sort;
-        private String otherAttribute1;
-        private String otherAttribute2;
-
-        public Builder id(String id) {
-            this.id = id;
-            return this;
-        }
-
-        public Builder sort(String sort) {
-            this.sort = sort;
-            return this;
-        }
-
-        public Builder otherAttribute1(String otherAttribute1) {
-            this.otherAttribute1 = otherAttribute1;
-            return this;
-        }
-
-        public Builder otherAttribute2(String otherAttribute2) {
-            this.otherAttribute2 = otherAttribute2;
-            return this;
-        }
-
-        public FakeItemWithSort build() {
-            return new FakeItemWithSort(id, sort, otherAttribute1, otherAttribute2);
-        }
-    }
-}
\ No newline at end of file
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/operations/BatchGetItemTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/operations/BatchGetItemTest.java
deleted file mode 100644
index f5e0c7af4ad4..000000000000
--- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/operations/BatchGetItemTest.java
+++ /dev/null
@@ -1,310 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.extensions.dynamodb.mappingclient.operations;
-
-import static java.util.Collections.emptyList;
-import static java.util.Collections.emptyMap;
-import static java.util.Collections.singletonList;
-import static java.util.Collections.singletonMap;
-import static java.util.stream.Collectors.toList;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.containsInAnyOrder;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.nullValue;
-import static org.hamcrest.Matchers.sameInstance;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.argThat;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.when;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.AttributeValues.stringValue;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.functionaltests.models.FakeItem.createUniqueFakeItem;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.functionaltests.models.FakeItemWithSort.createUniqueFakeItemWithSort;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.IntStream;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
-
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.Key;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.MappedDatabase;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.MappedTable;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.MapperExtension;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.TableMetadata;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.extensions.ReadModification;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.operations.BatchGetItem.ResultsPage;
-import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-import software.amazon.awssdk.services.dynamodb.model.BatchGetItemRequest;
-import software.amazon.awssdk.services.dynamodb.model.BatchGetItemResponse;
-import software.amazon.awssdk.services.dynamodb.model.KeysAndAttributes;
-import software.amazon.awssdk.services.dynamodb.paginators.BatchGetItemIterable;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.functionaltests.models.FakeItem;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.functionaltests.models.FakeItemWithSort;
-
-@RunWith(MockitoJUnitRunner.class)
-public class BatchGetItemTest {
-    private static final String TABLE_NAME = "table-name";
-    private static final String TABLE_NAME_2 = "table-name-2";
-
-    private static final List<FakeItem> FAKE_ITEMS =
-        IntStream.range(0, 6).mapToObj($ -> createUniqueFakeItem()).collect(toList());
-    private static final List<Map<String, AttributeValue>> FAKE_ITEM_MAPS = FAKE_ITEMS.stream().map(item ->
-        FakeItem.getTableSchema().itemToMap(item, FakeItem.getTableMetadata().getPrimaryKeys())).collect(toList());
-    private static final List<FakeItemWithSort> FAKESORT_ITEMS =
-        IntStream.range(0, 6).mapToObj($ -> createUniqueFakeItemWithSort()).collect(toList());
-    private static final List<Map<String, AttributeValue>> FAKESORT_ITEM_MAPS = FAKESORT_ITEMS.stream().map(item ->
-        FakeItemWithSort.getTableSchema().itemToMap(item, FakeItemWithSort.getTableMetadata().getPrimaryKeys()))
-          .collect(toList());
-    private static final List<Key> FAKE_ITEM_KEYS =
-        FAKE_ITEMS.stream().map(fakeItem -> Key.of(stringValue(fakeItem.getId()))).collect(toList());
-    private static final List<Key> FAKESORT_ITEM_KEYS =
-        FAKESORT_ITEMS.stream().map(fakeItemWithSort -> Key.of(stringValue(fakeItemWithSort.getId()),
-                                                               stringValue(fakeItemWithSort.getSort()))).collect(toList());
-
-    @Mock
-    private DynamoDbClient mockDynamoDbClient;
-
-    @Mock
-    private MapperExtension mockExtension;
-
-    private MappedDatabase mappedDatabase;
-    private MappedTable<FakeItem> fakeItemMappedTable;
-    private MappedTable<FakeItemWithSort> fakeItemWithSortMappedTable;
-
-    @Before
-    public void setupMappedTables() {
-        mappedDatabase = MappedDatabase.builder().dynamoDbClient(mockDynamoDbClient).build();
-        fakeItemMappedTable = mappedDatabase.table(TABLE_NAME, FakeItem.getTableSchema());
-        fakeItemWithSortMappedTable = mappedDatabase.table(TABLE_NAME_2, FakeItemWithSort.getTableSchema());
-    }
-
-    @Test
-    public void getServiceCall_makesTheRightCallAndReturnsResponse() {
-        BatchGetItem operation =
-            BatchGetItem.of(ReadBatch.of(fakeItemMappedTable, GetItem.of(FAKE_ITEM_KEYS.get(0))));
-
-        BatchGetItemRequest batchGetItemRequest =
-            BatchGetItemRequest.builder()
-                               .requestItems(singletonMap("test-table",
-                                                          KeysAndAttributes.builder()
-                                                                           .keys(singletonList(FAKE_ITEM_MAPS.get(0)))
-                                                                           .build()))
-                               .build();
-
-        BatchGetItemIterable expectedResponse = mock(BatchGetItemIterable.class);
-        when(mockDynamoDbClient.batchGetItemPaginator(any(BatchGetItemRequest.class))).thenReturn(expectedResponse);
-
-        BatchGetItemIterable response = operation.getServiceCall(mockDynamoDbClient).apply(batchGetItemRequest);
-
-        assertThat(response, sameInstance(expectedResponse));
-        verify(mockDynamoDbClient).batchGetItemPaginator(batchGetItemRequest);
-    }
-
-    @Test
-    public void generateRequest_multipleBatches_multipleTableSchemas() {
-        BatchGetItem operation =
-            BatchGetItem.of(ReadBatch.of(fakeItemMappedTable,
-                                         GetItem.of(FAKE_ITEM_KEYS.get(0)),
-                                         GetItem.of(FAKE_ITEM_KEYS.get(1)),
-                                         GetItem.of(FAKE_ITEM_KEYS.get(2))),
-                            ReadBatch.of(fakeItemWithSortMappedTable,
-                                         GetItem.of(FAKESORT_ITEM_KEYS.get(0)),
-                                         GetItem.of(FAKESORT_ITEM_KEYS.get(1)),
-                                         GetItem.of(FAKESORT_ITEM_KEYS.get(2))));
-
-        BatchGetItemRequest batchGetItemRequest = operation.generateRequest(mockExtension);
-
-        KeysAndAttributes keysAndAttributes1 = batchGetItemRequest.requestItems().get(TABLE_NAME);
-        KeysAndAttributes keysAndAttributes2 = batchGetItemRequest.requestItems().get(TABLE_NAME_2);
-        assertThat(keysAndAttributes1.keys(), containsInAnyOrder(FAKE_ITEM_MAPS.subList(0, 3).toArray()));
-        assertThat(keysAndAttributes2.keys(), containsInAnyOrder(FAKESORT_ITEM_MAPS.subList(0, 3).toArray()));
-        assertThat(keysAndAttributes1.consistentRead(), is(nullValue()));
-        assertThat(keysAndAttributes2.consistentRead(), is(nullValue()));
-        verifyNoMoreInteractions(mockExtension);
-    }
-
-    @Test
-    public void generateRequest_multipleBatches_multipleTableSchemas_nonConflictingConsistentRead() {
-        BatchGetItem operation =
-            BatchGetItem.of(
-                ReadBatch.of(fakeItemMappedTable,
-                             GetItem.builder().key(FAKE_ITEM_KEYS.get(0)).consistentRead(true).build(),
-                             GetItem.builder().key(FAKE_ITEM_KEYS.get(1)).consistentRead(true).build(),
-                             GetItem.builder().key(FAKE_ITEM_KEYS.get(2)).consistentRead(true).build()),
-                ReadBatch.of(fakeItemWithSortMappedTable,
-                             GetItem.builder().key(FAKESORT_ITEM_KEYS.get(0)).consistentRead(false).build(),
-                             GetItem.builder().key(FAKESORT_ITEM_KEYS.get(1)).consistentRead(false).build(),
-                             GetItem.builder().key(FAKESORT_ITEM_KEYS.get(2)).consistentRead(false).build()));
-
-        BatchGetItemRequest batchGetItemRequest = operation.generateRequest(mockExtension);
-
-        KeysAndAttributes keysAndAttributes1 = batchGetItemRequest.requestItems().get(TABLE_NAME);
-        KeysAndAttributes keysAndAttributes2 = batchGetItemRequest.requestItems().get(TABLE_NAME_2);
-        assertThat(keysAndAttributes1.keys(), containsInAnyOrder(FAKE_ITEM_MAPS.subList(0, 3).toArray()));
-        assertThat(keysAndAttributes2.keys(), containsInAnyOrder(FAKESORT_ITEM_MAPS.subList(0, 3).toArray()));
-        assertThat(keysAndAttributes1.consistentRead(), is(true));
-        assertThat(keysAndAttributes2.consistentRead(), is(false));
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void generateRequest_multipleBatches_multipleTableSchemas_ConflictingConsistentReadStartingWithNull() {
-        BatchGetItem operation =
-            BatchGetItem.of(
-                ReadBatch.of(fakeItemMappedTable,
-                             GetItem.builder().key(FAKE_ITEM_KEYS.get(0)).consistentRead(true).build(),
-                             GetItem.builder().key(FAKE_ITEM_KEYS.get(1)).consistentRead(true).build(),
-                             GetItem.builder().key(FAKE_ITEM_KEYS.get(2)).consistentRead(true).build()),
-                ReadBatch.of(fakeItemWithSortMappedTable,
-                             GetItem.builder().key(FAKESORT_ITEM_KEYS.get(0)).build(),
-                             GetItem.builder().key(FAKESORT_ITEM_KEYS.get(1)).consistentRead(true).build(),
-                             GetItem.builder().key(FAKESORT_ITEM_KEYS.get(2)).consistentRead(true).build()));
-
-        operation.generateRequest(mockExtension);
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void generateRequest_multipleBatches_multipleTableSchemas_ConflictingConsistentReadStartingWithFalse() {
-        BatchGetItem operation =
-            BatchGetItem.of(
-                ReadBatch.of(fakeItemMappedTable,
-                             GetItem.builder().key(FAKE_ITEM_KEYS.get(0)).consistentRead(true).build(),
-                             GetItem.builder().key(FAKE_ITEM_KEYS.get(1)).consistentRead(true).build(),
-                             GetItem.builder().key(FAKE_ITEM_KEYS.get(2)).consistentRead(true).build()),
-                ReadBatch.of(fakeItemWithSortMappedTable,
-                             GetItem.builder().key(FAKESORT_ITEM_KEYS.get(0)).consistentRead(false).build(),
-                             GetItem.builder().key(FAKESORT_ITEM_KEYS.get(1)).consistentRead(true).build(),
-                             GetItem.builder().key(FAKESORT_ITEM_KEYS.get(2)).consistentRead(true).build()));
-
-        operation.generateRequest(mockExtension);
-    }
-
-    @Test
-    public void transformResponse_multiplePages_multipleTables_multipleItems_noExtension() {
-        Map<String, List<Map<String, AttributeValue>>> page1 = new HashMap<>();
-        page1.put(TABLE_NAME, Arrays.asList(FAKE_ITEM_MAPS.get(0), FAKE_ITEM_MAPS.get(1)));
-        page1.put(TABLE_NAME_2, singletonList(FAKESORT_ITEM_MAPS.get(0)));
-        Map<String, List<Map<String, AttributeValue>>> page2 = new HashMap<>();
-        page2.put(TABLE_NAME_2, Arrays.asList(FAKESORT_ITEM_MAPS.get(1), FAKESORT_ITEM_MAPS.get(2)));
-        page2.put(TABLE_NAME, singletonList(FAKE_ITEM_MAPS.get(2)));
-        BatchGetItemIterable fakeResults = generateFakeResults(Arrays.asList(page1, page2));
-        BatchGetItem operation = BatchGetItem.of();
-
-        Iterator<ResultsPage> results = operation.transformResponse(fakeResults, null).iterator();
-
-        assertThat(results.hasNext(), is(true));
-        ResultsPage resultsPage1 = results.next();
-        assertThat(results.hasNext(), is(true));
-        ResultsPage resultsPage2 = results.next();
-        assertThat(results.hasNext(), is(false));
-
-        List<FakeItem> fakeItemResultsPage1 = resultsPage1.getResultsForTable(fakeItemMappedTable);
-        List<FakeItemWithSort> fakeItemWithSortResultsPage1 =
-            resultsPage1.getResultsForTable(fakeItemWithSortMappedTable);
-        List<FakeItem> fakeItemResultsPage2 = resultsPage2.getResultsForTable(fakeItemMappedTable);
-        List<FakeItemWithSort> fakeItemWithSortResultsPage2 =
-            resultsPage2.getResultsForTable(fakeItemWithSortMappedTable);
-
-        assertThat(fakeItemResultsPage1, containsInAnyOrder(FAKE_ITEMS.get(0), FAKE_ITEMS.get(1)));
-        assertThat(fakeItemResultsPage2, containsInAnyOrder(FAKE_ITEMS.get(2)));
-        assertThat(fakeItemWithSortResultsPage1, containsInAnyOrder(FAKESORT_ITEMS.get(0)));
-        assertThat(fakeItemWithSortResultsPage2, containsInAnyOrder(FAKESORT_ITEMS.get(1), FAKESORT_ITEMS.get(2)));
-    }
-
-    @Test
-    public void transformResponse_multiplePages_multipleTables_multipleItems_extensionWithTransformation() {
-        Map<String, List<Map<String, AttributeValue>>> page1 = new HashMap<>();
-        page1.put(TABLE_NAME, Arrays.asList(FAKE_ITEM_MAPS.get(0), FAKE_ITEM_MAPS.get(1)));
-        page1.put(TABLE_NAME_2, singletonList(FAKESORT_ITEM_MAPS.get(0)));
-        Map<String, List<Map<String, AttributeValue>>> page2 = new HashMap<>();
-        page2.put(TABLE_NAME_2, Arrays.asList(FAKESORT_ITEM_MAPS.get(1), FAKESORT_ITEM_MAPS.get(2)));
-        page2.put(TABLE_NAME, singletonList(FAKE_ITEM_MAPS.get(2)));
-        BatchGetItemIterable fakeResults = generateFakeResults(Arrays.asList(page1, page2));
-        BatchGetItem operation = BatchGetItem.of();
-
-        // Use the mock extension to transform every item based on table name
-        IntStream.range(0, 3).forEach(i -> {
-            doReturn(ReadModification.builder().transformedItem(FAKE_ITEM_MAPS.get(i + 3)).build())
-                .when(mockExtension)
-                .afterRead(eq(FAKE_ITEM_MAPS.get(i)),
-                           argThat(operationContext -> operationContext.getTableName().equals(TABLE_NAME)),
-                           any(TableMetadata.class));
-            doReturn(ReadModification.builder().transformedItem(FAKESORT_ITEM_MAPS.get(i + 3)).build())
-                .when(mockExtension)
-                .afterRead(eq(FAKESORT_ITEM_MAPS.get(i)),
-                           argThat(operationContext ->
-                                       operationContext.getTableName().equals(TABLE_NAME_2)),
-                           any(TableMetadata.class));
-        });
-
-        Iterator<ResultsPage> results = operation.transformResponse(fakeResults, mockExtension).iterator();
-
-        assertThat(results.hasNext(), is(true));
-        ResultsPage resultsPage1 = results.next();
-        assertThat(results.hasNext(), is(true));
-        ResultsPage resultsPage2 = results.next();
-        assertThat(results.hasNext(), is(false));
-
-        List<FakeItem> fakeItemResultsPage1 = resultsPage1.getResultsForTable(fakeItemMappedTable);
-        List<FakeItemWithSort> fakeItemWithSortResultsPage1 =
-            resultsPage1.getResultsForTable(fakeItemWithSortMappedTable);
-        List<FakeItem> fakeItemResultsPage2 = resultsPage2.getResultsForTable(fakeItemMappedTable);
-        List<FakeItemWithSort> fakeItemWithSortResultsPage2 =
-            resultsPage2.getResultsForTable(fakeItemWithSortMappedTable);
-
-        assertThat(fakeItemResultsPage1, containsInAnyOrder(FAKE_ITEMS.get(3), FAKE_ITEMS.get(4)));
-        assertThat(fakeItemResultsPage2, containsInAnyOrder(FAKE_ITEMS.get(5)));
-        assertThat(fakeItemWithSortResultsPage1, containsInAnyOrder(FAKESORT_ITEMS.get(3)));
-        assertThat(fakeItemWithSortResultsPage2, containsInAnyOrder(FAKESORT_ITEMS.get(4), FAKESORT_ITEMS.get(5)));
-    }
-
-    @Test
-    public void transformResponse_queryingEmptyResults() {
-        BatchGetItemIterable fakeResults = generateFakeResults(singletonList(emptyMap()));
-        BatchGetItem operation = BatchGetItem.of();
-
-        Iterator<ResultsPage> results = operation.transformResponse(fakeResults, null).iterator();
-
-        assertThat(results.hasNext(), is(true));
-        ResultsPage resultsPage = results.next();
-        assertThat(results.hasNext(), is(false));
-        assertThat(resultsPage.getResultsForTable(fakeItemMappedTable), is(emptyList()));
-    }
-
-    private static BatchGetItemIterable generateFakeResults(
-        List<Map<String, List<Map<String, AttributeValue>>>> itemMapsPages) {
-
-        List<BatchGetItemResponse> responses =
-            itemMapsPages.stream()
-                         .map(page -> BatchGetItemResponse.builder().responses(page).build())
-                         .collect(toList());
-
-        BatchGetItemIterable mockIterable = mock(BatchGetItemIterable.class);
-        when(mockIterable.iterator()).thenReturn(responses.iterator());
-        return mockIterable;
-    }
-}
\ No newline at end of file
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/operations/BatchWriteItemTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/operations/BatchWriteItemTest.java
deleted file mode 100644
index 432debc80198..000000000000
--- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/operations/BatchWriteItemTest.java
+++ /dev/null
@@ -1,319 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.extensions.dynamodb.mappingclient.operations;
-
-import static java.util.Collections.emptyList;
-import static java.util.Collections.emptyMap;
-import static java.util.Collections.singletonList;
-import static java.util.Collections.singletonMap;
-import static java.util.stream.Collectors.toList;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.containsInAnyOrder;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.sameInstance;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyMap;
-import static org.mockito.ArgumentMatchers.argThat;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.lenient;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.AttributeValues.stringValue;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.functionaltests.models.FakeItem.createUniqueFakeItem;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.functionaltests.models.FakeItemWithSort.createUniqueFakeItemWithSort;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.IntStream;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
-
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.Expression;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.Key;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.MappedDatabase;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.MappedTable;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.MapperExtension;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.TableMetadata;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.extensions.ReadModification;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.extensions.WriteModification;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.operations.BatchWriteItem.BatchWriteItemResults;
-import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-import software.amazon.awssdk.services.dynamodb.model.BatchWriteItemRequest;
-import software.amazon.awssdk.services.dynamodb.model.BatchWriteItemResponse;
-import software.amazon.awssdk.services.dynamodb.model.DeleteRequest;
-import software.amazon.awssdk.services.dynamodb.model.PutRequest;
-import software.amazon.awssdk.services.dynamodb.model.WriteRequest;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.functionaltests.models.FakeItem;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.functionaltests.models.FakeItemWithSort;
-
-@RunWith(MockitoJUnitRunner.class)
-public class BatchWriteItemTest {
-    private static final String TABLE_NAME = "table-name";
-    private static final String TABLE_NAME_2 = "table-name-2";
-
-    private static final List<FakeItem> FAKE_ITEMS =
-        IntStream.range(0, 6).mapToObj($ -> createUniqueFakeItem()).collect(toList());
-    private static final List<Map<String, AttributeValue>> FAKE_ITEM_MAPS = FAKE_ITEMS.stream().map(item ->
-        FakeItem.getTableSchema().itemToMap(item, FakeItem.getTableMetadata().getPrimaryKeys())).collect(toList());
-    private static final List<FakeItemWithSort> FAKESORT_ITEMS =
-        IntStream.range(0, 6).mapToObj($ -> createUniqueFakeItemWithSort()).collect(toList());
-    private static final List<Map<String, AttributeValue>> FAKESORT_ITEM_MAPS = FAKESORT_ITEMS.stream().map(item ->
-        FakeItemWithSort.getTableSchema().itemToMap(item, FakeItemWithSort.getTableMetadata().getPrimaryKeys()))
-                                                                                              .collect(toList());
-    private static final List<Key> FAKE_ITEM_KEYS =
-        FAKE_ITEMS.stream().map(fakeItem -> Key.of(stringValue(fakeItem.getId()))).collect(toList());
-    private static final List<Key> FAKESORT_ITEM_KEYS =
-        FAKESORT_ITEMS.stream().map(fakeItemWithSort -> Key.of(stringValue(fakeItemWithSort.getId()),
-                                                               stringValue(fakeItemWithSort.getSort()))).collect(toList());
-
-    @Mock
-    private DynamoDbClient mockDynamoDbClient;
-
-    @Mock
-    private MapperExtension mockExtension;
-
-    private MappedDatabase mappedDatabase;
-    private MappedTable<FakeItem> fakeItemMappedTable;
-    private MappedTable<FakeItem> fakeItemMappedTableWithExtension;
-    private MappedTable<FakeItemWithSort> fakeItemWithSortMappedTable;
-    private MappedTable<FakeItemWithSort> fakeItemWithSortMappedTableWithExtension;
-
-    @Before
-    public void setupMappedTables() {
-        mappedDatabase = MappedDatabase.builder().dynamoDbClient(mockDynamoDbClient).build();
-        fakeItemMappedTable = mappedDatabase.table(TABLE_NAME, FakeItem.getTableSchema());
-        fakeItemWithSortMappedTable = mappedDatabase.table(TABLE_NAME_2, FakeItemWithSort.getTableSchema());
-        MappedDatabase mappedDatabaseWithExtension =
-            MappedDatabase.builder().dynamoDbClient(mockDynamoDbClient).extendWith(mockExtension).build();
-        fakeItemMappedTableWithExtension = mappedDatabaseWithExtension.table(TABLE_NAME, FakeItem.getTableSchema());
-        fakeItemWithSortMappedTableWithExtension = mappedDatabaseWithExtension.table(TABLE_NAME_2,
-                                                                                     FakeItemWithSort.getTableSchema());
-    }
-
-    @Test
-    public void getServiceCall_makesTheRightCallAndReturnsResponse() {
-        BatchWriteItem operation =
-            BatchWriteItem.of(WriteBatch.of(fakeItemMappedTable, PutItem.of(FAKE_ITEMS.get(0))));
-
-        WriteRequest writeRequest =
-            WriteRequest.builder()
-                        .putRequest(PutRequest.builder().item(FAKE_ITEM_MAPS.get(0)).build())
-                        .build();
-
-        BatchWriteItemRequest request =
-            BatchWriteItemRequest.builder()
-                                 .requestItems(singletonMap("table", singletonList(writeRequest)))
-                                 .build();
-
-        BatchWriteItemResponse expectedResponse = BatchWriteItemResponse.builder().build();
-        when(mockDynamoDbClient.batchWriteItem(any(BatchWriteItemRequest.class))).thenReturn(expectedResponse);
-
-        BatchWriteItemResponse response = operation.getServiceCall(mockDynamoDbClient).apply(request);
-
-        assertThat(response, sameInstance(expectedResponse));
-        verify(mockDynamoDbClient).batchWriteItem(request);
-    }
-
-    @Test
-    public void generateRequest_multipleTables_mixedCommands() {
-        BatchWriteItem operation =
-            BatchWriteItem.of(WriteBatch.of(fakeItemMappedTable,
-                                            PutItem.of(FAKE_ITEMS.get(0)),
-                                            DeleteItem.of(FAKE_ITEM_KEYS.get(1)),
-                                            PutItem.of(FAKE_ITEMS.get(2))),
-                              WriteBatch.of(fakeItemWithSortMappedTable,
-                                            DeleteItem.of(FAKESORT_ITEM_KEYS.get(0)),
-                                            PutItem.of(FAKESORT_ITEMS.get(1)),
-                                            DeleteItem.of(FAKESORT_ITEM_KEYS.get(2))));
-
-        BatchWriteItemRequest request = operation.generateRequest(mockExtension);
-
-        List<WriteRequest> writeRequests1 = request.requestItems().get(TABLE_NAME);
-        List<WriteRequest> writeRequests2 = request.requestItems().get(TABLE_NAME_2);
-        assertThat(writeRequests1, containsInAnyOrder(putRequest(FAKE_ITEM_MAPS.get(0)),
-                                                      deleteRequest(FAKE_ITEM_MAPS.get(1)),
-                                                      putRequest(FAKE_ITEM_MAPS.get(2))));
-        assertThat(writeRequests2, containsInAnyOrder(deleteRequest(FAKESORT_ITEM_MAPS.get(0)),
-                                                      putRequest(FAKESORT_ITEM_MAPS.get(1)),
-                                                      deleteRequest(FAKESORT_ITEM_MAPS.get(2))));
-    }
-
-    @Test
-    public void generateRequest_multipleTables_extensionOnlyTransformsPutsAndNotDeletes() {
-        BatchWriteItem operation =
-            BatchWriteItem.of(WriteBatch.of(fakeItemMappedTableWithExtension,
-                                            PutItem.of(FAKE_ITEMS.get(0)),
-                                            DeleteItem.of(FAKE_ITEM_KEYS.get(1)),
-                                            PutItem.of(FAKE_ITEMS.get(2))),
-                              WriteBatch.of(fakeItemWithSortMappedTableWithExtension,
-                                            DeleteItem.of(FAKESORT_ITEM_KEYS.get(0)),
-                                            PutItem.of(FAKESORT_ITEMS.get(1)),
-                                            DeleteItem.of(FAKESORT_ITEM_KEYS.get(2))));
-
-        // Use the mock extension to transform every item based on table name
-        IntStream.range(0, 3).forEach(i -> {
-            lenient().doReturn(WriteModification.builder().transformedItem(FAKE_ITEM_MAPS.get(i + 3)).build())
-                .when(mockExtension)
-                .beforeWrite(eq(FAKE_ITEM_MAPS.get(i)),
-                             argThat(operationContext -> operationContext.getTableName().equals(TABLE_NAME)),
-                             any());
-            lenient().doReturn(WriteModification.builder().transformedItem(FAKESORT_ITEM_MAPS.get(i + 3)).build())
-                .when(mockExtension)
-                .beforeWrite(eq(FAKESORT_ITEM_MAPS.get(i)),
-                             argThat(operationContext -> operationContext.getTableName().equals(TABLE_NAME_2)),
-                             any());
-        });
-
-        BatchWriteItemRequest request = operation.generateRequest(mockExtension);
-
-        List<WriteRequest> writeRequests1 = request.requestItems().get(TABLE_NAME);
-        List<WriteRequest> writeRequests2 = request.requestItems().get(TABLE_NAME_2);
-
-        // Only PutItem requests should have their attributes transformed
-        assertThat(writeRequests1, containsInAnyOrder(putRequest(FAKE_ITEM_MAPS.get(3)),
-                                                      deleteRequest(FAKE_ITEM_MAPS.get(1)),
-                                                      putRequest(FAKE_ITEM_MAPS.get(5))));
-        assertThat(writeRequests2, containsInAnyOrder(deleteRequest(FAKESORT_ITEM_MAPS.get(0)),
-                                                      putRequest(FAKESORT_ITEM_MAPS.get(4)),
-                                                      deleteRequest(FAKESORT_ITEM_MAPS.get(2))));
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void generateRequest_extensionTriesToAddConditionalToPutItem() {
-        BatchWriteItem operation =
-            BatchWriteItem.of(WriteBatch.of(fakeItemMappedTableWithExtension,
-                                            PutItem.of(FAKE_ITEMS.get(0)),
-                                            DeleteItem.of(FAKE_ITEM_KEYS.get(1)),
-                                            PutItem.of(FAKE_ITEMS.get(2))),
-                              WriteBatch.of(fakeItemWithSortMappedTableWithExtension,
-                                            DeleteItem.of(FAKESORT_ITEM_KEYS.get(0)),
-                                            PutItem.of(FAKESORT_ITEMS.get(1)),
-                                            DeleteItem.of(FAKESORT_ITEM_KEYS.get(2))));
-
-        Expression expression = Expression.builder().expression("test-expression").build();
-
-        doReturn(WriteModification.builder().additionalConditionalExpression(expression).build())
-            .when(mockExtension)
-            .beforeWrite(anyMap(), any(), any(TableMetadata.class));
-
-        operation.generateRequest(mockExtension);
-    }
-
-    @Test
-    public void transformResults_multipleUnprocessedOperations() {
-        BatchWriteItem operation = BatchWriteItem.of();
-
-        List<WriteRequest> writeRequests1 = Arrays.asList(putRequest(FAKE_ITEM_MAPS.get(0)),
-                                                          deleteRequest(FAKE_ITEM_MAPS.get(1)),
-                                                          deleteRequest(FAKE_ITEM_MAPS.get(2)));
-        List<WriteRequest> writeRequests2 = Arrays.asList(deleteRequest(FAKESORT_ITEM_MAPS.get(0)),
-                                                          putRequest(FAKESORT_ITEM_MAPS.get(1)),
-                                                          putRequest(FAKESORT_ITEM_MAPS.get(2)));
-        Map<String, List<WriteRequest>> writeRequests = new HashMap<>();
-        writeRequests.put(TABLE_NAME, writeRequests1);
-        writeRequests.put(TABLE_NAME_2, writeRequests2);
-        BatchWriteItemResponse response =
-            BatchWriteItemResponse.builder()
-                                  .unprocessedItems(writeRequests)
-                                  .build();
-
-        BatchWriteItemResults results = operation.transformResponse(response, mockExtension);
-
-        assertThat(results.unprocessedDeleteItemsForTable(fakeItemMappedTableWithExtension),
-                   containsInAnyOrder(FAKE_ITEMS.get(1), FAKE_ITEMS.get(2)));
-        assertThat(results.unprocessedPutItemsForTable(fakeItemMappedTableWithExtension),
-                   containsInAnyOrder(FAKE_ITEMS.get(0)));
-        assertThat(results.unprocessedDeleteItemsForTable(fakeItemWithSortMappedTableWithExtension),
-                   containsInAnyOrder(FAKESORT_ITEMS.get(0)));
-        assertThat(results.unprocessedPutItemsForTable(fakeItemWithSortMappedTableWithExtension),
-                   containsInAnyOrder(FAKESORT_ITEMS.get(1), FAKESORT_ITEMS.get(2)));
-    }
-
-    @Test
-    public void transformResults_multipleUnprocessedOperations_extensionTransformsPutsNotDeletes() {
-        BatchWriteItem operation = BatchWriteItem.of();
-
-        List<WriteRequest> writeRequests1 = Arrays.asList(putRequest(FAKE_ITEM_MAPS.get(0)),
-                                                          deleteRequest(FAKE_ITEM_MAPS.get(1)),
-                                                          deleteRequest(FAKE_ITEM_MAPS.get(2)));
-        List<WriteRequest> writeRequests2 = Arrays.asList(deleteRequest(FAKESORT_ITEM_MAPS.get(0)),
-                                                          putRequest(FAKESORT_ITEM_MAPS.get(1)),
-                                                          putRequest(FAKESORT_ITEM_MAPS.get(2)));
-        Map<String, List<WriteRequest>> writeRequests = new HashMap<>();
-        writeRequests.put(TABLE_NAME, writeRequests1);
-        writeRequests.put(TABLE_NAME_2, writeRequests2);
-        BatchWriteItemResponse response =
-            BatchWriteItemResponse.builder()
-                                  .unprocessedItems(writeRequests)
-                                  .build();
-
-        // Use the mock extension to transform every item based on table name
-        IntStream.range(0, 3).forEach(i -> {
-            lenient().doReturn(ReadModification.builder().transformedItem(FAKE_ITEM_MAPS.get(i + 3)).build())
-                     .when(mockExtension)
-                     .afterRead(eq(FAKE_ITEM_MAPS.get(i)),
-                                argThat(operationContext -> operationContext.getTableName().equals(TABLE_NAME)),
-                                any());
-            lenient().doReturn(ReadModification.builder().transformedItem(FAKESORT_ITEM_MAPS.get(i + 3)).build())
-                     .when(mockExtension)
-                     .afterRead(eq(FAKESORT_ITEM_MAPS.get(i)),
-                                argThat(operationContext -> operationContext.getTableName().equals(TABLE_NAME_2)),
-                                any());
-        });
-
-        BatchWriteItemResults results = operation.transformResponse(response, mockExtension);
-
-        assertThat(results.unprocessedDeleteItemsForTable(fakeItemMappedTableWithExtension),
-                   containsInAnyOrder(FAKE_ITEMS.get(1), FAKE_ITEMS.get(2)));
-        assertThat(results.unprocessedPutItemsForTable(fakeItemMappedTableWithExtension),
-                   containsInAnyOrder(FAKE_ITEMS.get(3)));
-        assertThat(results.unprocessedDeleteItemsForTable(fakeItemWithSortMappedTableWithExtension),
-                   containsInAnyOrder(FAKESORT_ITEMS.get(0)));
-        assertThat(results.unprocessedPutItemsForTable(fakeItemWithSortMappedTableWithExtension),
-                   containsInAnyOrder(FAKESORT_ITEMS.get(4), FAKESORT_ITEMS.get(5)));
-    }
-
-    @Test
-    public void transformResults_noUnprocessedOperations() {
-        BatchWriteItem operation = BatchWriteItem.of();
-
-        BatchWriteItemResponse response =
-            BatchWriteItemResponse.builder()
-                                  .unprocessedItems(emptyMap())
-                                  .build();
-
-        BatchWriteItemResults results = operation.transformResponse(response, mockExtension);
-
-        assertThat(results.unprocessedDeleteItemsForTable(fakeItemMappedTable), is(emptyList()));
-        assertThat(results.unprocessedPutItemsForTable(fakeItemMappedTable), is(emptyList()));
-    }
-
-    private static WriteRequest putRequest(Map<String, AttributeValue> itemMap) {
-        return WriteRequest.builder().putRequest(PutRequest.builder().item(itemMap).build()).build();
-    }
-
-    private static WriteRequest deleteRequest(Map<String, AttributeValue> itemMap) {
-        return WriteRequest.builder().deleteRequest(DeleteRequest.builder().key(itemMap).build()).build();
-    }
-}
\ No newline at end of file
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/operations/ConditionCheckTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/operations/ConditionCheckTest.java
deleted file mode 100644
index aec8ceda6563..000000000000
--- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/operations/ConditionCheckTest.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.extensions.dynamodb.mappingclient.operations;
-
-import static java.util.Collections.singletonMap;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.is;
-import static org.mockito.Mockito.verifyZeroInteractions;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.AttributeValues.stringValue;
-
-import java.util.Map;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
-
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.Expression;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.Key;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.MapperExtension;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.OperationContext;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.TableMetadata;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-import software.amazon.awssdk.services.dynamodb.model.TransactWriteItem;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.functionaltests.models.FakeItem;
-
-@RunWith(MockitoJUnitRunner.class)
-public class ConditionCheckTest {
-    @Mock
-    private MapperExtension mockMapperExtension;
-
-    @Test
-    public void generateTransactWriteItem() {
-        FakeItem fakeItem = FakeItem.createUniqueFakeItem();
-        Map<String, AttributeValue> keyMap = singletonMap("id", stringValue(fakeItem.getId()));
-        Expression conditionExpression = Expression.builder()
-                                                   .expression("expression")
-                                                   .expressionNames(singletonMap("key1", "value1"))
-                                                   .expressionValues(singletonMap("key2", stringValue("value2")))
-                                                   .build();
-        ConditionCheck<FakeItem> operation =
-            ConditionCheck.of(Key.of(stringValue(fakeItem.getId())), conditionExpression);
-        OperationContext context = OperationContext.of("table-name", TableMetadata.getPrimaryIndexName());
-
-        TransactWriteItem result = operation.generateTransactWriteItem(FakeItem.getTableSchema(), context,
-                                                                                  mockMapperExtension);
-
-        TransactWriteItem expectedResult =
-            TransactWriteItem.builder()
-                             .conditionCheck(
-                                 software.amazon.awssdk.services.dynamodb.model.ConditionCheck
-                                     .builder()
-                                     .tableName("table-name")
-                                     .key(keyMap)
-                                     .conditionExpression(conditionExpression.getExpression())
-                                     .expressionAttributeValues(conditionExpression.getExpressionValues())
-                                     .expressionAttributeNames(conditionExpression.getExpressionNames())
-                                     .build())
-                             .build();
-        assertThat(result, is(expectedResult));
-        verifyZeroInteractions(mockMapperExtension);
-    }
-}
\ No newline at end of file
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/operations/CreateTableTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/operations/CreateTableTest.java
deleted file mode 100644
index 65d45deb85a1..000000000000
--- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/operations/CreateTableTest.java
+++ /dev/null
@@ -1,397 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.extensions.dynamodb.mappingclient.operations;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.containsInAnyOrder;
-import static org.hamcrest.Matchers.empty;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.sameInstance;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.same;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-import static software.amazon.awssdk.services.dynamodb.model.KeyType.HASH;
-import static software.amazon.awssdk.services.dynamodb.model.KeyType.RANGE;
-
-import java.util.Arrays;
-import java.util.Collections;
-
-import org.hamcrest.Description;
-import org.hamcrest.TypeSafeMatcher;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
-
-import software.amazon.awssdk.core.util.DefaultSdkAutoConstructList;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.OperationContext;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.TableMetadata;
-import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
-import software.amazon.awssdk.services.dynamodb.model.AttributeDefinition;
-import software.amazon.awssdk.services.dynamodb.model.BillingMode;
-import software.amazon.awssdk.services.dynamodb.model.CreateTableRequest;
-import software.amazon.awssdk.services.dynamodb.model.CreateTableResponse;
-import software.amazon.awssdk.services.dynamodb.model.KeySchemaElement;
-import software.amazon.awssdk.services.dynamodb.model.Projection;
-import software.amazon.awssdk.services.dynamodb.model.ProjectionType;
-import software.amazon.awssdk.services.dynamodb.model.ProvisionedThroughput;
-import software.amazon.awssdk.services.dynamodb.model.ScalarAttributeType;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.functionaltests.models.FakeItem;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.functionaltests.models.FakeItemWithBinaryKey;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.functionaltests.models.FakeItemWithIndices;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.functionaltests.models.FakeItemWithNumericSort;
-
-@RunWith(MockitoJUnitRunner.class)
-public class CreateTableTest {
-    private static final String TABLE_NAME = "table-name";
-    private static final OperationContext PRIMARY_CONTEXT =
-        OperationContext.of(TABLE_NAME, TableMetadata.getPrimaryIndexName());
-    private static final OperationContext GSI_1_CONTEXT =
-        OperationContext.of(TABLE_NAME, "gsi_1");
-
-    private static MatchedGsi matchesGsi(software.amazon.awssdk.services.dynamodb.model.GlobalSecondaryIndex other) {
-        return new MatchedGsi(other);
-    }
-
-    @Mock
-    private DynamoDbClient mockDynamoDbClient;
-
-    private static class MatchedGsi
-        extends TypeSafeMatcher<software.amazon.awssdk.services.dynamodb.model.GlobalSecondaryIndex> {
-
-        private final software.amazon.awssdk.services.dynamodb.model.GlobalSecondaryIndex other;
-
-        private MatchedGsi(software.amazon.awssdk.services.dynamodb.model.GlobalSecondaryIndex other) {
-            this.other = other;
-        }
-
-        @Override
-        protected boolean matchesSafely(software.amazon.awssdk.services.dynamodb.model.GlobalSecondaryIndex globalSecondaryIndex) {
-            if (!other.indexName().equals(globalSecondaryIndex.indexName())) {
-                return false;
-            }
-
-            if ((other.projection() != null && !other.projection().equals(globalSecondaryIndex.projection())) ||
-                (other.projection() == null && globalSecondaryIndex.projection() != null)) {
-                return false;
-            }
-
-            return containsInAnyOrder(other.keySchema().toArray(new KeySchemaElement[]{}))
-                .matches(globalSecondaryIndex.keySchema());
-        }
-
-        @Override
-        public void describeTo(Description description) {
-            description.appendText("a GlobalSecondaryIndex equivalent to [" + other.toString() + "]");
-        }
-    }
-
-    @Test
-    public void generateRequest_withLsiAndGsi() {
-        Projection projection1 = Projection.builder()
-                                           .projectionType(ProjectionType.ALL)
-                                           .build();
-        Projection projection2 = Projection.builder()
-                                           .projectionType(ProjectionType.KEYS_ONLY)
-                                           .build();
-        Projection projection3 = Projection.builder()
-                                           .projectionType(ProjectionType.INCLUDE)
-                                           .nonKeyAttributes("key1", "key2")
-                                           .build();
-        ProvisionedThroughput provisionedThroughput1 = ProvisionedThroughput.builder()
-                                                                            .readCapacityUnits(1L)
-                                                                            .writeCapacityUnits(2L)
-                                                                            .build();
-        ProvisionedThroughput provisionedThroughput2 = ProvisionedThroughput.builder()
-                                                                            .readCapacityUnits(3L)
-                                                                            .writeCapacityUnits(4L)
-                                                                            .build();
-
-        CreateTable<FakeItemWithIndices> operation =
-            CreateTable.builder()
-                       .globalSecondaryIndices(Arrays.asList(GlobalSecondaryIndex.of("gsi_1", projection1,
-                                                                                     provisionedThroughput1),
-                                                             GlobalSecondaryIndex.of("gsi_2", projection2,
-                                                                                     provisionedThroughput2)))
-                       .localSecondaryIndices(Collections.singletonList(LocalSecondaryIndex.of("lsi_1", projection3)))
-                       .build();
-
-        CreateTableRequest request = operation.generateRequest(FakeItemWithIndices.getTableSchema(),
-                                                               PRIMARY_CONTEXT,
-                                                               null);
-
-
-
-        assertThat(request.tableName(), is(TABLE_NAME));
-        assertThat(request.keySchema(), containsInAnyOrder(KeySchemaElement.builder()
-                                                                           .attributeName("id")
-                                                                           .keyType(HASH)
-                                                                           .build(),
-                                                           KeySchemaElement.builder()
-                                                                           .attributeName("sort")
-                                                                           .keyType(RANGE)
-                                                                           .build()));
-        software.amazon.awssdk.services.dynamodb.model.GlobalSecondaryIndex expectedGsi1 =
-            software.amazon.awssdk.services.dynamodb.model.GlobalSecondaryIndex.builder()
-                                                                .indexName("gsi_1")
-                                                                .keySchema(KeySchemaElement.builder()
-                                                                                           .attributeName("gsi_id")
-                                                                                           .keyType(HASH)
-                                                                                           .build(),
-                                                                           KeySchemaElement.builder()
-                                                                                           .attributeName("gsi_sort")
-                                                                                           .keyType(RANGE)
-                                                                                           .build())
-                                                                .projection(projection1)
-                                                                .provisionedThroughput(provisionedThroughput1)
-                                                                .build();
-        software.amazon.awssdk.services.dynamodb.model.GlobalSecondaryIndex expectedGsi2 =
-            software.amazon.awssdk.services.dynamodb.model.GlobalSecondaryIndex.builder()
-                                                                .indexName("gsi_2")
-                                                                .keySchema(KeySchemaElement.builder()
-                                                                                           .attributeName("gsi_id")
-                                                                                           .keyType(HASH)
-                                                                                           .build())
-                                                                .projection(projection2)
-                                                                .provisionedThroughput(provisionedThroughput2)
-                                                                .build();
-        assertThat(request.globalSecondaryIndexes(), containsInAnyOrder(matchesGsi(expectedGsi1),
-                                                                        matchesGsi(expectedGsi2)));
-        software.amazon.awssdk.services.dynamodb.model.LocalSecondaryIndex expectedLsi =
-            software.amazon.awssdk.services.dynamodb.model.LocalSecondaryIndex.builder()
-                                                             .indexName("lsi_1")
-                                                             .keySchema(KeySchemaElement.builder()
-                                                                                        .attributeName("id")
-                                                                                        .keyType(HASH)
-                                                                                        .build(),
-                                                                        KeySchemaElement.builder()
-                                                                                        .attributeName("lsi_sort")
-                                                                                        .keyType(RANGE)
-                                                                                        .build())
-                                                             .projection(projection3)
-                                                             .build();
-        assertThat(request.localSecondaryIndexes(), containsInAnyOrder(expectedLsi));
-        assertThat(request.attributeDefinitions(), containsInAnyOrder(
-            AttributeDefinition.builder()
-                               .attributeName("id")
-                               .attributeType(ScalarAttributeType.S)
-                               .build(),
-            AttributeDefinition.builder()
-                               .attributeName("sort")
-                               .attributeType(ScalarAttributeType.S)
-                               .build(),
-            AttributeDefinition.builder()
-                               .attributeName("lsi_sort")
-                               .attributeType(ScalarAttributeType.S)
-                               .build(),
-            AttributeDefinition.builder()
-                               .attributeName("gsi_id")
-                               .attributeType(ScalarAttributeType.S)
-                               .build(),
-            AttributeDefinition.builder()
-                               .attributeName("gsi_sort")
-                               .attributeType(ScalarAttributeType.S)
-                               .build()));
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void generateRequest_invalidGsi() {
-        CreateTable<FakeItem> operation =
-            CreateTable.builder()
-                       .globalSecondaryIndices(Collections.singletonList(
-                           GlobalSecondaryIndex.of("invalid",
-                                                   Projection.builder().projectionType(ProjectionType.ALL).build(),
-                                                   ProvisionedThroughput.builder().readCapacityUnits(1L).writeCapacityUnits(1L).build())))
-                       .build();
-
-        operation.generateRequest(FakeItem.getTableSchema(), PRIMARY_CONTEXT, null);
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void generateRequest_invalidGsiAsLsiReference() {
-        CreateTable<FakeItemWithIndices> operation =
-            CreateTable.builder()
-                       .localSecondaryIndices(Collections.singletonList(
-                           LocalSecondaryIndex.of("gsi_1", Projection.builder().projectionType(ProjectionType.ALL).build())))
-                       .build();
-
-        operation.generateRequest(FakeItemWithIndices.getTableSchema(), PRIMARY_CONTEXT, null);
-    }
-
-    @Test
-    public void generateRequest_validLsiAsGsiReference() {
-        CreateTable<FakeItemWithIndices> operation =
-            CreateTable.builder()
-                       .globalSecondaryIndices(Collections.singletonList(
-                           GlobalSecondaryIndex.of("lsi_1",
-                                                   Projection.builder().projectionType(ProjectionType.ALL).build(),
-                                                   ProvisionedThroughput.builder().readCapacityUnits(1L).writeCapacityUnits(1L).build())))
-                       .build();
-        CreateTableRequest request = operation.generateRequest(FakeItemWithIndices.getTableSchema(),
-                                                               PRIMARY_CONTEXT, null);
-
-        assertThat(request.globalSecondaryIndexes().size(), is(1));
-        software.amazon.awssdk.services.dynamodb.model.GlobalSecondaryIndex globalSecondaryIndex =
-            request.globalSecondaryIndexes().get(0);
-
-        assertThat(globalSecondaryIndex.indexName(), is("lsi_1"));
-    }
-
-    @Test
-    public void generateRequest_nonReferencedIndicesDoNotCreateExtraAttributeDefinitions() {
-        CreateTable<FakeItemWithIndices> operation = CreateTable.create();
-
-        CreateTableRequest request = operation.generateRequest(FakeItemWithIndices.getTableSchema(),
-                                                               PRIMARY_CONTEXT, null);
-
-        AttributeDefinition attributeDefinition1 = AttributeDefinition.builder()
-                                                                      .attributeName("id")
-                                                                      .attributeType(ScalarAttributeType.S)
-                                                                      .build();
-        AttributeDefinition attributeDefinition2 = AttributeDefinition.builder()
-                                                                      .attributeName("sort")
-                                                                      .attributeType(ScalarAttributeType.S)
-                                                                      .build();
-
-        assertThat(request.attributeDefinitions(), containsInAnyOrder(attributeDefinition1, attributeDefinition2));
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void generateRequest_invalidLsi() {
-        CreateTable<FakeItem> operation =
-            CreateTable.builder()
-                       .localSecondaryIndices(Collections.singletonList(
-                           LocalSecondaryIndex.of("invalid",
-                                                   Projection.builder().projectionType(ProjectionType.ALL).build())))
-                       .build();
-
-        operation.generateRequest(FakeItem.getTableSchema(), PRIMARY_CONTEXT, null);
-    }
-
-    @Test
-    public void generateRequest_withProvisionedThroughput() {
-       ProvisionedThroughput provisionedThroughput = ProvisionedThroughput.builder()
-                                                                          .writeCapacityUnits(1L)
-                                                                          .readCapacityUnits(2L)
-                                                                          .build();
-
-        CreateTable<FakeItem> operation = CreateTable.of(provisionedThroughput);
-
-        CreateTableRequest request = operation.generateRequest(FakeItem.getTableSchema(),
-                                                               PRIMARY_CONTEXT,
-                                                               null);
-
-        assertThat(request.billingMode(), is(BillingMode.PROVISIONED));
-        assertThat(request.provisionedThroughput(), is(provisionedThroughput));
-    }
-
-    @Test
-    public void generateRequest_withNoProvisionedThroughput() {
-        CreateTable<FakeItem> operation = CreateTable.create();
-
-        CreateTableRequest request = operation.generateRequest(FakeItem.getTableSchema(),
-                                                               PRIMARY_CONTEXT,
-                                                               null);
-
-        assertThat(request.billingMode(), is(BillingMode.PAY_PER_REQUEST));
-    }
-
-
-    @Test
-    public void generateRequest_withNumericKey() {
-        CreateTable<FakeItemWithNumericSort> operation = CreateTable.create();
-
-        CreateTableRequest request = operation.generateRequest(FakeItemWithNumericSort.getTableSchema(),
-                                                               PRIMARY_CONTEXT,
-                                                               null);
-
-        assertThat(request.tableName(), is(TABLE_NAME));
-        assertThat(request.keySchema(), containsInAnyOrder(KeySchemaElement.builder()
-                                                                           .attributeName("id")
-                                                                           .keyType(HASH)
-                                                                           .build(),
-                                                           KeySchemaElement.builder()
-                                                                           .attributeName("sort")
-                                                                           .keyType(RANGE)
-                                                                           .build()));
-
-        assertThat(request.globalSecondaryIndexes(), is(DefaultSdkAutoConstructList.getInstance()));
-        assertThat(request.localSecondaryIndexes(), is(DefaultSdkAutoConstructList.getInstance()));
-
-        assertThat(request.attributeDefinitions(), containsInAnyOrder(
-            AttributeDefinition.builder()
-                               .attributeName("id")
-                               .attributeType(ScalarAttributeType.S)
-                               .build(),
-            AttributeDefinition.builder()
-                               .attributeName("sort")
-                               .attributeType(ScalarAttributeType.N)
-                               .build()));
-    }
-
-    @Test
-    public void generateRequest_withBinaryKey() {
-        CreateTable<FakeItemWithBinaryKey> operation = CreateTable.create();
-
-        CreateTableRequest request = operation.generateRequest(FakeItemWithBinaryKey.getTableSchema(),
-                                                               PRIMARY_CONTEXT,
-                                                               null);
-
-        assertThat(request.tableName(), is(TABLE_NAME));
-        assertThat(request.keySchema(), containsInAnyOrder(KeySchemaElement.builder()
-                                                                           .attributeName("id")
-                                                                           .keyType(HASH)
-                                                                           .build()));
-
-        assertThat(request.globalSecondaryIndexes(), is(empty()));
-        assertThat(request.localSecondaryIndexes(), is(empty()));
-
-        assertThat(request.attributeDefinitions(), containsInAnyOrder(
-            AttributeDefinition.builder()
-                               .attributeName("id")
-                               .attributeType(ScalarAttributeType.B)
-                               .build()));
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void generateRequest_doesNotWorkForIndex() {
-        CreateTable<FakeItemWithIndices> operation = CreateTable.create();
-
-        operation.generateRequest(FakeItemWithIndices.getTableSchema(), GSI_1_CONTEXT, null);
-    }
-
-    @Test
-    public void getServiceCall_makesTheRightCallAndReturnsResponse() {
-        CreateTable<FakeItem> operation = CreateTable.create();
-        CreateTableRequest createTableRequest = CreateTableRequest.builder().build();
-        CreateTableResponse expectedResponse = CreateTableResponse.builder().build();
-        when(mockDynamoDbClient.createTable(any(CreateTableRequest.class))).thenReturn(expectedResponse);
-
-        CreateTableResponse actualResponse = operation.getServiceCall(mockDynamoDbClient).apply(createTableRequest);
-
-        assertThat(actualResponse, sameInstance(expectedResponse));
-        verify(mockDynamoDbClient).createTable(same(createTableRequest));
-    }
-
-    @Test
-    public void transformResults_doesNothing() {
-        CreateTable<FakeItem> operation = CreateTable.create();
-        CreateTableResponse response = CreateTableResponse.builder().build();
-
-        operation.transformResponse(response, FakeItem.getTableSchema(), PRIMARY_CONTEXT, null);
-    }
-}
\ No newline at end of file
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/operations/DeleteItemTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/operations/DeleteItemTest.java
deleted file mode 100644
index 58a3fcb90230..000000000000
--- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/operations/DeleteItemTest.java
+++ /dev/null
@@ -1,277 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.extensions.dynamodb.mappingclient.operations;
-
-import static java.util.Collections.singletonList;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.nullValue;
-import static org.hamcrest.Matchers.sameInstance;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyMap;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.AttributeValues.stringValue;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.functionaltests.models.FakeItem.createUniqueFakeItem;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.functionaltests.models.FakeItemWithSort.createUniqueFakeItemWithSort;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
-
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.Key;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.MapperExtension;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.OperationContext;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.TableMetadata;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.extensions.ReadModification;
-import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-import software.amazon.awssdk.services.dynamodb.model.Delete;
-import software.amazon.awssdk.services.dynamodb.model.DeleteItemRequest;
-import software.amazon.awssdk.services.dynamodb.model.DeleteItemResponse;
-import software.amazon.awssdk.services.dynamodb.model.ReturnValue;
-import software.amazon.awssdk.services.dynamodb.model.TransactWriteItem;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.functionaltests.models.FakeItem;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.functionaltests.models.FakeItemComposedClass;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.functionaltests.models.FakeItemWithSort;
-
-@RunWith(MockitoJUnitRunner.class)
-public class DeleteItemTest {
-    private static final String TABLE_NAME = "table-name";
-    private static final OperationContext PRIMARY_CONTEXT =
-        OperationContext.of(TABLE_NAME, TableMetadata.getPrimaryIndexName());
-    private static final OperationContext GSI_1_CONTEXT =
-        OperationContext.of(TABLE_NAME, "gsi_1");
-
-    @Mock
-    private DynamoDbClient mockDynamoDbClient;
-
-    @Mock
-    private MapperExtension mockMapperExtension;
-
-    @Test
-    public void getServiceCall_makesTheRightCallAndReturnsResponse() {
-        FakeItem keyItem = createUniqueFakeItem();
-        DeleteItem<FakeItem> deleteItemOperation = DeleteItem.of(Key.of(stringValue(keyItem.getId())));
-        DeleteItemRequest deleteItemRequest = DeleteItemRequest.builder().tableName(TABLE_NAME).build();
-        DeleteItemResponse expectedResponse = DeleteItemResponse.builder().build();
-        when(mockDynamoDbClient.deleteItem(any(DeleteItemRequest.class))).thenReturn(expectedResponse);
-
-        DeleteItemResponse response = deleteItemOperation.getServiceCall(mockDynamoDbClient).apply(deleteItemRequest);
-
-        assertThat(response, sameInstance(expectedResponse));
-        verify(mockDynamoDbClient).deleteItem(deleteItemRequest);
-    }
-
-    @Test
-    public void generateRequest_partitionKeyOnly() {
-        FakeItem keyItem = createUniqueFakeItem();
-        DeleteItem<FakeItem> deleteItemOperation = DeleteItem.of(Key.of(stringValue(keyItem.getId())));
-
-        DeleteItemRequest request = deleteItemOperation.generateRequest(FakeItem.getTableSchema(),
-                                                                        PRIMARY_CONTEXT,
-                                                                        null);
-
-        Map<String, AttributeValue> expectedKeyMap = new HashMap<>();
-        expectedKeyMap.put("id", AttributeValue.builder().s(keyItem.getId()).build());
-        DeleteItemRequest expectedRequest = DeleteItemRequest.builder()
-            .tableName(TABLE_NAME)
-            .key(expectedKeyMap)
-            .returnValues(ReturnValue.ALL_OLD)
-            .build();
-        assertThat(request, is(expectedRequest));
-    }
-
-    @Test
-    public void generateRequest_partitionAndSortKey() {
-        FakeItemWithSort keyItem = createUniqueFakeItemWithSort();
-        DeleteItem<FakeItemWithSort> deleteItemOperation = DeleteItem.of(Key.of(stringValue(keyItem.getId()),
-                                                                                stringValue(keyItem.getSort())));
-
-        DeleteItemRequest request = deleteItemOperation.generateRequest(FakeItemWithSort.getTableSchema(),
-                                                                       PRIMARY_CONTEXT,
-                                                                        null);
-
-        Map<String, AttributeValue> expectedKeyMap = new HashMap<>();
-        expectedKeyMap.put("id", AttributeValue.builder().s(keyItem.getId()).build());
-        expectedKeyMap.put("sort", AttributeValue.builder().s(keyItem.getSort()).build());
-        DeleteItemRequest expectedRequest = DeleteItemRequest.builder()
-                                                       .tableName(TABLE_NAME)
-                                                       .key(expectedKeyMap)
-                                                       .returnValues(ReturnValue.ALL_OLD)
-                                                       .build();
-        assertThat(request, is(expectedRequest));
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void generateRequest_noPartitionKey_throwsIllegalArgumentException() {
-        DeleteItem<FakeItemComposedClass> deleteItemOperation = DeleteItem.of(Key.of(stringValue("whatever")));
-
-        deleteItemOperation.generateRequest(FakeItemComposedClass.getTableSchema(), PRIMARY_CONTEXT, null);
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void generateRequest_withIndex_throwsIllegalArgumentException() {
-        DeleteItem<FakeItem> deleteItemOperation = DeleteItem.of(Key.of(stringValue("whatever")));
-
-        deleteItemOperation.generateRequest(FakeItem.getTableSchema(), GSI_1_CONTEXT, null);
-    }
-
-    @Test
-    public void transformResponse_correctlyTransformsIntoAnItem() {
-        FakeItem keyItem = createUniqueFakeItem();
-        DeleteItem<FakeItem> deleteItemOperation = DeleteItem.of(Key.of(stringValue(keyItem.getId())));
-        Map<String, AttributeValue> responseMap = new HashMap<>();
-        responseMap.put("id", AttributeValue.builder().s(keyItem.getId()).build());
-        responseMap.put("subclass_attribute", AttributeValue.builder().s("test-value").build());
-        DeleteItemResponse response = DeleteItemResponse.builder()
-                                                        .attributes(responseMap)
-                                                        .build();
-
-        FakeItem result = deleteItemOperation.transformResponse(response,
-                                                                FakeItem.getTableSchema(),
-                                                                PRIMARY_CONTEXT,
-                                                                null);
-
-        assertThat(result.getId(), is(keyItem.getId()));
-        assertThat(result.getSubclassAttribute(), is("test-value"));
-    }
-
-    @Test
-    public void transformResponse_noResults_returnsNull() {
-        FakeItem keyItem = createUniqueFakeItem();
-        DeleteItem<FakeItem> deleteItemOperation = DeleteItem.of(Key.of(stringValue(keyItem.getId())));
-        DeleteItemResponse response = DeleteItemResponse.builder()
-                                                        .build();
-
-        FakeItem result = deleteItemOperation.transformResponse(response,
-                                                                FakeItem.getTableSchema(),
-                                                                PRIMARY_CONTEXT,
-                                                                null);
-
-        assertThat(result, is(nullValue()));
-    }
-
-    @Test
-    public void generateRequest_withExtension_doesNotModifyKey() {
-        FakeItem baseFakeItem = createUniqueFakeItem();
-        Map<String, AttributeValue> keyMap = FakeItem.getTableSchema().itemToMap(baseFakeItem, singletonList("id"));
-        DeleteItem<FakeItem> deleteItemOperation = DeleteItem.of(Key.of(stringValue(baseFakeItem.getId())));
-
-
-        DeleteItemRequest request = deleteItemOperation.generateRequest(FakeItem.getTableSchema(),
-                                                                        PRIMARY_CONTEXT,
-                                                                        mockMapperExtension);
-
-        assertThat(request.key(), is(keyMap));
-        verify(mockMapperExtension, never()).beforeWrite(anyMap(), any(), any());
-    }
-
-    @Test
-    public void transformResponse_withExtension_appliesItemModification() {
-        FakeItem baseFakeItem = createUniqueFakeItem();
-        FakeItem fakeItem = createUniqueFakeItem();
-        Map<String, AttributeValue> baseFakeItemMap = FakeItem.getTableSchema().itemToMap(baseFakeItem, false);
-        Map<String, AttributeValue> fakeItemMap = FakeItem.getTableSchema().itemToMap(fakeItem, false);
-        DeleteItem<FakeItem> deleteItemOperation = DeleteItem.of(Key.of(stringValue(baseFakeItem.getId())));
-
-        DeleteItemResponse response = DeleteItemResponse.builder()
-                                                        .attributes(baseFakeItemMap)
-                                                        .build();
-        when(mockMapperExtension.afterRead(anyMap(), any(), any()))
-            .thenReturn(ReadModification.builder().transformedItem(fakeItemMap).build());
-
-        FakeItem resultItem = deleteItemOperation.transformResponse(response,
-                                                                    FakeItem.getTableSchema(),
-                                                                    PRIMARY_CONTEXT,
-                                                                    mockMapperExtension);
-
-        assertThat(resultItem, is(fakeItem));
-        verify(mockMapperExtension).afterRead(baseFakeItemMap, PRIMARY_CONTEXT, FakeItem.getTableMetadata());
-    }
-
-    @Test
-    public void generateTransactWriteItem_basicRequest() {
-        FakeItem fakeItem = createUniqueFakeItem();
-        Map<String, AttributeValue> fakeItemMap = FakeItem.getTableSchema().itemToMap(fakeItem, true);
-        DeleteItem<FakeItem> deleteItemOperation = spy(DeleteItem.of(Key.of(stringValue(fakeItem.getId()))));
-        OperationContext context = OperationContext.of(TABLE_NAME, TableMetadata.getPrimaryIndexName());
-
-        DeleteItemRequest deleteItemRequest = DeleteItemRequest.builder()
-                                                               .tableName(TABLE_NAME)
-                                                               .key(fakeItemMap)
-                                                               .build();
-        doReturn(deleteItemRequest).when(deleteItemOperation).generateRequest(any(), any(), any());
-
-        TransactWriteItem actualResult = deleteItemOperation.generateTransactWriteItem(FakeItem.getTableSchema(),
-                                                                                       context,
-                                                                                       mockMapperExtension);
-
-        TransactWriteItem expectedResult = TransactWriteItem.builder()
-                                                            .delete(Delete.builder()
-                                                                          .key(fakeItemMap)
-                                                                          .tableName(TABLE_NAME)
-                                                                          .build())
-                                                            .build();
-        assertThat(actualResult, is(expectedResult));
-        verify(deleteItemOperation).generateRequest(FakeItem.getTableSchema(), context, mockMapperExtension);
-    }
-
-    @Test
-    public void generateTransactWriteItem_conditionalRequest() {
-        FakeItem fakeItem = createUniqueFakeItem();
-        Map<String, AttributeValue> fakeItemMap = FakeItem.getTableSchema().itemToMap(fakeItem, true);
-        DeleteItem<FakeItem> deleteItemOperation = spy(DeleteItem.of(Key.of(stringValue(fakeItem.getId()))));
-        OperationContext context = OperationContext.of(TABLE_NAME, TableMetadata.getPrimaryIndexName());
-
-        String conditionExpression = "condition-expression";
-        Map<String, AttributeValue> attributeValues = Collections.singletonMap("key", stringValue("value1"));
-        Map<String, String> attributeNames = Collections.singletonMap("key", "value2");
-
-        DeleteItemRequest deleteItemRequest = DeleteItemRequest.builder()
-                                                               .tableName(TABLE_NAME)
-                                                               .key(fakeItemMap)
-                                                               .conditionExpression(conditionExpression)
-                                                               .expressionAttributeValues(attributeValues)
-                                                               .expressionAttributeNames(attributeNames)
-                                                               .build();
-        doReturn(deleteItemRequest).when(deleteItemOperation).generateRequest(any(), any(), any());
-
-        TransactWriteItem actualResult = deleteItemOperation.generateTransactWriteItem(FakeItem.getTableSchema(),
-                                                                                       context,
-                                                                                       mockMapperExtension);
-
-        TransactWriteItem expectedResult = TransactWriteItem.builder()
-                                                            .delete(Delete.builder()
-                                                                          .key(fakeItemMap)
-                                                                          .tableName(TABLE_NAME)
-                                                                          .conditionExpression(conditionExpression)
-                                                                          .expressionAttributeNames(attributeNames)
-                                                                          .expressionAttributeValues(attributeValues)
-                                                                          .build())
-                                                            .build();
-        assertThat(actualResult, is(expectedResult));
-        verify(deleteItemOperation).generateRequest(FakeItem.getTableSchema(), context, mockMapperExtension);
-    }
-}
\ No newline at end of file
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/operations/GetItemTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/operations/GetItemTest.java
deleted file mode 100644
index 260d5c5fc7c0..000000000000
--- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/operations/GetItemTest.java
+++ /dev/null
@@ -1,217 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.extensions.dynamodb.mappingclient.operations;
-
-import static java.util.Collections.singletonList;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.nullValue;
-import static org.hamcrest.Matchers.sameInstance;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyMap;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.AttributeValues.stringValue;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.functionaltests.models.FakeItem.createUniqueFakeItem;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.functionaltests.models.FakeItemWithSort.createUniqueFakeItemWithSort;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
-
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.Key;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.MapperExtension;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.OperationContext;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.TableMetadata;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.extensions.ReadModification;
-import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-import software.amazon.awssdk.services.dynamodb.model.GetItemRequest;
-import software.amazon.awssdk.services.dynamodb.model.GetItemResponse;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.functionaltests.models.FakeItem;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.functionaltests.models.FakeItemComposedClass;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.functionaltests.models.FakeItemWithSort;
-
-@RunWith(MockitoJUnitRunner.class)
-public class GetItemTest {
-    private static final String TABLE_NAME = "table-name";
-    private static final OperationContext PRIMARY_CONTEXT =
-        OperationContext.of(TABLE_NAME, TableMetadata.getPrimaryIndexName());
-    private static final OperationContext GSI_1_CONTEXT =
-        OperationContext.of(TABLE_NAME, "gsi_1");
-
-    @Mock
-    private DynamoDbClient mockDynamoDbClient;
-
-    @Mock
-    private MapperExtension mockMapperExtension;
-
-    @Test
-    public void getServiceCall_makesTheRightCallAndReturnsResponse() {
-        FakeItem keyItem = createUniqueFakeItem();
-        GetItem<FakeItem> getItemOperation = GetItem.of(Key.of(stringValue(keyItem.getId())));
-        GetItemRequest getItemRequest = GetItemRequest.builder().tableName(TABLE_NAME).build();
-        GetItemResponse expectedResponse = GetItemResponse.builder().build();
-        when(mockDynamoDbClient.getItem(any(GetItemRequest.class))).thenReturn(expectedResponse);
-
-        GetItemResponse response = getItemOperation.getServiceCall(mockDynamoDbClient).apply(getItemRequest);
-
-        assertThat(response, sameInstance(expectedResponse));
-        verify(mockDynamoDbClient).getItem(getItemRequest);
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void generateRequest_withIndex_throwsIllegalArgumentException() {
-        FakeItem keyItem = createUniqueFakeItem();
-        GetItem<FakeItem> getItemOperation = GetItem.of(Key.of(stringValue(keyItem.getId())));
-
-        getItemOperation.generateRequest(FakeItem.getTableSchema(), GSI_1_CONTEXT, null);
-    }
-
-    @Test
-    public void generateRequest_consistentRead() {
-        FakeItem keyItem = createUniqueFakeItem();
-        GetItem<FakeItem> getItemOperation =
-            GetItem.builder().key(Key.of(stringValue(keyItem.getId()))).consistentRead(true).build();
-
-        GetItemRequest request = getItemOperation.generateRequest(FakeItem.getTableSchema(),
-                                                                  PRIMARY_CONTEXT,
-                                                                  null);
-
-        Map<String, AttributeValue> expectedKeyMap = new HashMap<>();
-        expectedKeyMap.put("id", AttributeValue.builder().s(keyItem.getId()).build());
-        GetItemRequest expectedRequest = GetItemRequest.builder()
-                                                       .tableName(TABLE_NAME)
-                                                       .key(expectedKeyMap)
-                                                       .consistentRead(true)
-                                                       .build();
-        assertThat(request, is(expectedRequest));
-    }
-
-    @Test
-    public void generateRequest_partitionKeyOnly() {
-        FakeItem keyItem = createUniqueFakeItem();
-        GetItem<FakeItem> getItemOperation = GetItem.of(Key.of(stringValue(keyItem.getId())));
-
-        GetItemRequest request = getItemOperation.generateRequest(FakeItem.getTableSchema(),
-                                                                  PRIMARY_CONTEXT,
-                                                                  null);
-
-        Map<String, AttributeValue> expectedKeyMap = new HashMap<>();
-        expectedKeyMap.put("id", AttributeValue.builder().s(keyItem.getId()).build());
-        GetItemRequest expectedRequest = GetItemRequest.builder()
-            .tableName(TABLE_NAME)
-            .key(expectedKeyMap)
-            .build();
-        assertThat(request, is(expectedRequest));
-    }
-
-    @Test
-    public void generateRequest_partitionAndSortKey() {
-        FakeItemWithSort keyItem = createUniqueFakeItemWithSort();
-        GetItem<FakeItemWithSort> getItemOperation = GetItem.of(Key.of(stringValue(keyItem.getId()),
-                                                                       stringValue(keyItem.getSort())));
-
-        GetItemRequest request = getItemOperation.generateRequest(FakeItemWithSort.getTableSchema(),
-                                                                  PRIMARY_CONTEXT,
-                                                                  null);
-
-        Map<String, AttributeValue> expectedKeyMap = new HashMap<>();
-        expectedKeyMap.put("id", AttributeValue.builder().s(keyItem.getId()).build());
-        expectedKeyMap.put("sort", AttributeValue.builder().s(keyItem.getSort()).build());
-        GetItemRequest expectedRequest = GetItemRequest.builder()
-                                                       .tableName(TABLE_NAME)
-                                                       .key(expectedKeyMap)
-                                                       .build();
-        assertThat(request, is(expectedRequest));
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void generateRequest_noPartitionKey_throwsIllegalArgumentException() {
-        GetItem<FakeItemComposedClass> getItemOperation = GetItem.of(Key.of(stringValue("whatever")));
-
-        getItemOperation.generateRequest(FakeItemComposedClass.getTableSchema(), PRIMARY_CONTEXT, null);
-    }
-
-    @Test
-    public void transformResponse_noItem() {
-        FakeItem keyItem = createUniqueFakeItem();
-        GetItem<FakeItem> getItemOperation = GetItem.of(Key.of(stringValue(keyItem.getId())));
-        GetItemResponse response = GetItemResponse.builder().build();
-
-        FakeItem result = getItemOperation.transformResponse(response, FakeItem.getTableSchema(), PRIMARY_CONTEXT,
-                                                             null);
-
-        assertThat(result, is(nullValue()));
-    }
-
-    @Test
-    public void transformResponse_correctlyTransformsIntoAnItem() {
-        FakeItem keyItem = createUniqueFakeItem();
-        GetItem<FakeItem> getItemOperation = GetItem.of(Key.of(stringValue(keyItem.getId())));
-        Map<String, AttributeValue> responseMap = new HashMap<>();
-        responseMap.put("id", AttributeValue.builder().s(keyItem.getId()).build());
-        responseMap.put("subclass_attribute", AttributeValue.builder().s("test-value").build());
-        GetItemResponse response = GetItemResponse.builder()
-                                                  .item(responseMap)
-                                                  .build();
-
-        FakeItem result = getItemOperation.transformResponse(response, FakeItem.getTableSchema(), PRIMARY_CONTEXT,
-                                                             null);
-
-        assertThat(result.getId(), is(keyItem.getId()));
-        assertThat(result.getSubclassAttribute(), is("test-value"));
-    }
-
-    @Test
-    public void generateRequest_withExtension_doesNotModifyKey() {
-        FakeItem baseFakeItem = createUniqueFakeItem();
-        Map<String, AttributeValue> keyMap = FakeItem.getTableSchema().itemToMap(baseFakeItem, singletonList("id"));
-        GetItem<FakeItem> getItemOperation = GetItem.of(Key.of(stringValue(baseFakeItem.getId())));
-
-        GetItemRequest request = getItemOperation.generateRequest(FakeItem.getTableSchema(),
-                                                                  PRIMARY_CONTEXT,
-                                                                  mockMapperExtension);
-
-        assertThat(request.key(), is(keyMap));
-        verify(mockMapperExtension, never()).beforeWrite(anyMap(), any(), any());
-    }
-
-    @Test
-    public void transformResponse_withExtension_appliesItemModification() {
-        FakeItem baseFakeItem = createUniqueFakeItem();
-        FakeItem fakeItem = createUniqueFakeItem();
-        Map<String, AttributeValue> baseFakeItemMap = FakeItem.getTableSchema().itemToMap(baseFakeItem, false);
-        Map<String, AttributeValue> fakeItemMap = FakeItem.getTableSchema().itemToMap(fakeItem, false);
-        GetItem<FakeItem> getItemOperation = GetItem.of(Key.of(stringValue(baseFakeItem.getId())));
-        GetItemResponse response = GetItemResponse.builder()
-                                                  .item(baseFakeItemMap)
-                                                  .build();
-        when(mockMapperExtension.afterRead(anyMap(), any(), any()))
-            .thenReturn(ReadModification.builder().transformedItem(fakeItemMap).build());
-
-        FakeItem resultItem = getItemOperation.transformResponse(response, FakeItem.getTableSchema(),
-                                                                 PRIMARY_CONTEXT, mockMapperExtension);
-
-        assertThat(resultItem, is(fakeItem));
-        verify(mockMapperExtension).afterRead(baseFakeItemMap, PRIMARY_CONTEXT, FakeItem.getTableMetadata());
-    }
-}
\ No newline at end of file
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/operations/PutItemTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/operations/PutItemTest.java
deleted file mode 100644
index 2861f52a3c22..000000000000
--- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/operations/PutItemTest.java
+++ /dev/null
@@ -1,240 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.extensions.dynamodb.mappingclient.operations;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.nullValue;
-import static org.hamcrest.Matchers.sameInstance;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyMap;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.AttributeValues.stringValue;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.functionaltests.models.FakeItem.createUniqueFakeItem;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
-
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.Expression;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.MapperExtension;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.OperationContext;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.TableMetadata;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.extensions.WriteModification;
-import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-import software.amazon.awssdk.services.dynamodb.model.Put;
-import software.amazon.awssdk.services.dynamodb.model.PutItemRequest;
-import software.amazon.awssdk.services.dynamodb.model.PutItemResponse;
-import software.amazon.awssdk.services.dynamodb.model.TransactWriteItem;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.functionaltests.models.FakeItem;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.functionaltests.models.FakeItemComposedClass;
-
-@RunWith(MockitoJUnitRunner.class)
-public class PutItemTest {
-    private static final String TABLE_NAME = "table-name";
-    private static final OperationContext PRIMARY_CONTEXT =
-        OperationContext.of(TABLE_NAME, TableMetadata.getPrimaryIndexName());
-    private static final OperationContext GSI_1_CONTEXT =
-        OperationContext.of(TABLE_NAME, "gsi_1");
-
-    @Mock
-    private DynamoDbClient mockDynamoDbClient;
-    @Mock
-    private MapperExtension mockMapperExtension;
-
-    @Test
-    public void getServiceCall_makesTheRightCallAndReturnsResponse() {
-        FakeItem keyItem = createUniqueFakeItem();
-        PutItem<FakeItem> putItemOperation = PutItem.of(keyItem);
-        PutItemRequest getItemRequest = PutItemRequest.builder().tableName(TABLE_NAME).build();
-        PutItemResponse expectedResponse = PutItemResponse.builder().build();
-        when(mockDynamoDbClient.putItem(any(PutItemRequest.class))).thenReturn(expectedResponse);
-
-        PutItemResponse response = putItemOperation.getServiceCall(mockDynamoDbClient).apply(getItemRequest);
-
-        assertThat(response, sameInstance(expectedResponse));
-        verify(mockDynamoDbClient).putItem(getItemRequest);
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void generateRequest_withIndex_throwsIllegalArgumentException() {
-        FakeItem item = createUniqueFakeItem();
-        PutItem<FakeItem> putItemOperation = PutItem.of(item);
-
-        putItemOperation.generateRequest(FakeItem.getTableSchema(), GSI_1_CONTEXT, null);
-    }
-
-    @Test
-    public void generateRequest_generatesCorrectRequest() {
-        FakeItem fakeItem = createUniqueFakeItem();
-        fakeItem.setSubclassAttribute("subclass-value");
-        PutItem<FakeItem> putItemOperation = PutItem.of(fakeItem);
-
-        PutItemRequest request = putItemOperation.generateRequest(FakeItem.getTableSchema(),
-                                                                  PRIMARY_CONTEXT,
-                                                                  null);
-
-        Map<String, AttributeValue> expectedItemMap = new HashMap<>();
-        expectedItemMap.put("id", AttributeValue.builder().s(fakeItem.getId()).build());
-        expectedItemMap.put("subclass_attribute", AttributeValue.builder().s("subclass-value").build());
-        PutItemRequest expectedRequest = PutItemRequest.builder()
-            .tableName(TABLE_NAME)
-            .item(expectedItemMap)
-            .build();
-        assertThat(request, is(expectedRequest));
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void generateRequest_noPartitionKey_throwsIllegalArgumentException() {
-        FakeItemComposedClass keyItem = FakeItemComposedClass.builder().composedAttribute("whatever").build();
-        PutItem<FakeItemComposedClass> putItemOperation = PutItem.of(keyItem);
-
-        putItemOperation.generateRequest(FakeItemComposedClass.getTableSchema(), PRIMARY_CONTEXT, null);
-    }
-
-    @Test
-    public void transformResponse_doesNotBlowUp() {
-        FakeItem fakeItem = createUniqueFakeItem();
-        PutItem<FakeItem> putItemOperation = PutItem.of(fakeItem);
-        PutItemResponse response = PutItemResponse.builder()
-                                                  .build();
-
-        putItemOperation.transformResponse(response, FakeItem.getTableSchema(), PRIMARY_CONTEXT, null);
-    }
-
-    @Test
-    public void generateRequest_withExtension_modifiesItemToPut() {
-        FakeItem baseFakeItem = createUniqueFakeItem();
-        FakeItem fakeItem = createUniqueFakeItem();
-        Map<String, AttributeValue> baseMap = FakeItem.getTableSchema().itemToMap(baseFakeItem, true);
-        Map<String, AttributeValue> fakeMap = FakeItem.getTableSchema().itemToMap(fakeItem, true);
-        when(mockMapperExtension.beforeWrite(anyMap(), any(), any()))
-            .thenReturn(WriteModification.builder().transformedItem(fakeMap).build());
-        PutItem<FakeItem> putItemOperation = PutItem.of(baseFakeItem);
-
-        PutItemRequest request = putItemOperation.generateRequest(FakeItem.getTableSchema(),
-                                                                  PRIMARY_CONTEXT,
-                                                                  mockMapperExtension);
-
-        assertThat(request.item(), is(fakeMap));
-        verify(mockMapperExtension).beforeWrite(baseMap, PRIMARY_CONTEXT, FakeItem.getTableMetadata());
-    }
-
-    @Test
-    public void generateRequest_withExtension_singleCondition() {
-        FakeItem baseFakeItem = createUniqueFakeItem();
-        FakeItem fakeItem = createUniqueFakeItem();
-        Map<String, AttributeValue> fakeMap = FakeItem.getTableSchema().itemToMap(fakeItem, true);
-        Expression condition = Expression.builder().expression("condition").expressionValues(fakeMap).build();
-        when(mockMapperExtension.beforeWrite(anyMap(), any(), any()))
-            .thenReturn(WriteModification.builder().additionalConditionalExpression(condition).build());
-        PutItem<FakeItem> putItemOperation = PutItem.of(baseFakeItem);
-
-        PutItemRequest request = putItemOperation.generateRequest(FakeItem.getTableSchema(),
-                                                                  PRIMARY_CONTEXT,
-                                                                  mockMapperExtension);
-
-        assertThat(request.conditionExpression(), is("condition"));
-        assertThat(request.expressionAttributeValues(), is(fakeMap));
-    }
-
-    @Test
-    public void generateRequest_withExtension_noModifications() {
-        FakeItem baseFakeItem = createUniqueFakeItem();
-        when(mockMapperExtension.beforeWrite(anyMap(), any(), any()))
-            .thenReturn(WriteModification.builder().build());
-        PutItem<FakeItem> putItemOperation = PutItem.of(baseFakeItem);
-
-        PutItemRequest request = putItemOperation.generateRequest(FakeItem.getTableSchema(),
-                                                                  PRIMARY_CONTEXT,
-                                                                  mockMapperExtension);
-        assertThat(request.conditionExpression(), is(nullValue()));
-        assertThat(request.expressionAttributeValues().size(), is(0));
-    }
-
-    @Test
-    public void generateTransactWriteItem_basicRequest() {
-        FakeItem fakeItem = createUniqueFakeItem();
-        Map<String, AttributeValue> fakeItemMap = FakeItem.getTableSchema().itemToMap(fakeItem, true);
-        PutItem<FakeItem> putItemOperation = spy(PutItem.of(fakeItem));
-        OperationContext context = OperationContext.of(TABLE_NAME, TableMetadata.getPrimaryIndexName());
-
-        PutItemRequest putItemRequest = PutItemRequest.builder()
-                                                      .tableName(TABLE_NAME)
-                                                      .item(fakeItemMap)
-                                                      .build();
-        doReturn(putItemRequest).when(putItemOperation).generateRequest(any(), any(), any());
-
-        TransactWriteItem actualResult = putItemOperation.generateTransactWriteItem(FakeItem.getTableSchema(),
-                                                                                    context,
-                                                                                    mockMapperExtension);
-
-        TransactWriteItem expectedResult = TransactWriteItem.builder()
-                                                            .put(Put.builder()
-                                                                    .item(fakeItemMap)
-                                                                    .tableName(TABLE_NAME)
-                                                                    .build())
-                                                            .build();
-        assertThat(actualResult, is(expectedResult));
-        verify(putItemOperation).generateRequest(FakeItem.getTableSchema(), context, mockMapperExtension);
-    }
-
-    @Test
-    public void generateTransactWriteItem_conditionalRequest() {
-        FakeItem fakeItem = createUniqueFakeItem();
-        Map<String, AttributeValue> fakeItemMap = FakeItem.getTableSchema().itemToMap(fakeItem, true);
-        PutItem<FakeItem> putItemOperation = spy(PutItem.of(fakeItem));
-        OperationContext context = OperationContext.of(TABLE_NAME, TableMetadata.getPrimaryIndexName());
-
-        String conditionExpression = "condition-expression";
-        Map<String, AttributeValue> attributeValues = Collections.singletonMap("key", stringValue("value1"));
-        Map<String, String> attributeNames = Collections.singletonMap("key", "value2");
-
-        PutItemRequest putItemRequest = PutItemRequest.builder()
-                                                      .tableName(TABLE_NAME)
-                                                      .item(fakeItemMap)
-                                                      .conditionExpression(conditionExpression)
-                                                      .expressionAttributeValues(attributeValues)
-                                                      .expressionAttributeNames(attributeNames)
-                                                      .build();
-        doReturn(putItemRequest).when(putItemOperation).generateRequest(any(), any(), any());
-
-        TransactWriteItem actualResult = putItemOperation.generateTransactWriteItem(FakeItem.getTableSchema(),
-                                                                                    context,
-                                                                                    mockMapperExtension);
-
-        TransactWriteItem expectedResult = TransactWriteItem.builder()
-                                                            .put(Put.builder()
-                                                                    .item(fakeItemMap)
-                                                                    .tableName(TABLE_NAME)
-                                                                    .conditionExpression(conditionExpression)
-                                                                    .expressionAttributeNames(attributeNames)
-                                                                    .expressionAttributeValues(attributeValues)
-                                                                    .build())
-                                                            .build();
-        assertThat(actualResult, is(expectedResult));
-        verify(putItemOperation).generateRequest(FakeItem.getTableSchema(), context, mockMapperExtension);
-    }
-}
\ No newline at end of file
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/operations/QueryConditionalTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/operations/QueryConditionalTest.java
deleted file mode 100644
index 6bbc195683f9..000000000000
--- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/operations/QueryConditionalTest.java
+++ /dev/null
@@ -1,271 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.extensions.dynamodb.mappingclient.operations;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.hasEntry;
-import static org.hamcrest.Matchers.is;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.functionaltests.models.FakeItem.createUniqueFakeItem;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.functionaltests.models.FakeItemWithSort.createUniqueFakeItemWithSort;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.functionaltests.models.FakeItemWithSort.createUniqueFakeItemWithoutSort;
-
-import java.util.UUID;
-
-import org.junit.Test;
-
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.Expression;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.Key;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.TableMetadata;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.core.Utils;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.functionaltests.models.FakeItem;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.functionaltests.models.FakeItemWithNumericSort;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.functionaltests.models.FakeItemWithSort;
-
-public class QueryConditionalTest {
-    private static final String ID_KEY = "#AMZN_MAPPED_id";
-    private static final String ID_VALUE = ":AMZN_MAPPED_id";
-    private static final String SORT_KEY = "#AMZN_MAPPED_sort";
-    private static final String SORT_VALUE = ":AMZN_MAPPED_sort";
-    private static final String SORT_OTHER_VALUE = ":AMZN_MAPPED_sort2";
-
-    private final FakeItem fakeItem = createUniqueFakeItem();
-    private final AttributeValue fakeItemHashValue = AttributeValue.builder().s(fakeItem.getId()).build();
-    private final FakeItemWithSort fakeItemWithSort = createUniqueFakeItemWithSort();
-    private final AttributeValue fakeItemWithSortHashValue =
-        AttributeValue.builder().s(fakeItemWithSort.getId()).build();
-    private final AttributeValue fakeItemWithSortSortValue =
-        AttributeValue.builder().s(fakeItemWithSort.getSort()).build();
-    private final FakeItemWithSort fakeItemWithoutSort = createUniqueFakeItemWithoutSort();
-    private final AttributeValue fakeItemWithoutSortHashValue =
-        AttributeValue.builder().s(fakeItemWithoutSort.getId()).build();
-
-    @Test
-    public void equalTo_hashOnly() {
-        Expression expression = QueryConditional.equalTo(getKey(fakeItem)).getExpression(FakeItem.getTableSchema(),
-                                                                                         TableMetadata.getPrimaryIndexName());
-
-        assertThat(expression.getExpression(), is(ID_KEY + " = " + ID_VALUE));
-        assertThat(expression.getExpressionNames(), hasEntry(ID_KEY, "id"));
-        assertThat(expression.getExpressionValues(), hasEntry(ID_VALUE, fakeItemHashValue));
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void equalTo_hashOnly_notSet_throwsIllegalArgumentException() {
-        fakeItem.setId(null);
-        QueryConditional.equalTo(getKey(fakeItem))
-                        .getExpression(FakeItem.getTableSchema(), TableMetadata.getPrimaryIndexName());
-    }
-
-    @Test
-    public void equalTo_hashAndRangeKey_bothSet() {
-        Expression expression = QueryConditional.equalTo(getKey(fakeItemWithSort))
-                                                .getExpression(FakeItemWithSort.getTableSchema(), TableMetadata.getPrimaryIndexName());
-
-        verifyExpression(expression, "=");
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void equalTo_hashAndRangeKey_hashNotSet_throwsIllegalArgumentException() {
-        fakeItemWithSort.setId(null);
-        QueryConditional.equalTo(getKey(fakeItemWithSort))
-                        .getExpression(FakeItemWithSort.getTableSchema(), TableMetadata.getPrimaryIndexName());
-    }
-
-    @Test
-    public void equalTo_hashAndRangeKey_hashOnlySet() {
-        Expression expression = QueryConditional.equalTo(getKey(fakeItemWithoutSort))
-                                                .getExpression(FakeItemWithSort.getTableSchema(), TableMetadata.getPrimaryIndexName());
-
-        assertThat(expression.getExpression(), is(ID_KEY + " = " + ID_VALUE));
-        assertThat(expression.getExpressionNames(), hasEntry(ID_KEY, "id"));
-        assertThat(expression.getExpressionValues(), hasEntry(ID_VALUE, fakeItemWithoutSortHashValue));
-    }
-
-    @Test
-    public void greaterThan_hashAndRangeKey_bothSet() {
-        Expression expression = QueryConditional.greaterThan(getKey(fakeItemWithSort))
-                                                .getExpression(FakeItemWithSort.getTableSchema(), TableMetadata.getPrimaryIndexName());
-
-        verifyExpression(expression, ">");
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void greaterThan_hashOnly_throwsIllegalArgumentException() {
-        QueryConditional.greaterThan(getKey(fakeItem))
-                        .getExpression(FakeItem.getTableSchema(), TableMetadata.getPrimaryIndexName());
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void greaterThan_hashAndSort_onlyHashSet_throwsIllegalArgumentException() {
-        QueryConditional.greaterThan(getKey(fakeItemWithoutSort))
-                        .getExpression(FakeItemWithSort.getTableSchema(), TableMetadata.getPrimaryIndexName());
-    }
-
-    @Test
-    public void greaterThanOrEqualTo_hashAndRangeKey_bothSet() {
-        Expression expression = QueryConditional.greaterThanOrEqualTo(getKey(fakeItemWithSort))
-                                                .getExpression(FakeItemWithSort.getTableSchema(), TableMetadata.getPrimaryIndexName());
-
-        verifyExpression(expression, ">=");
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void greaterThanOrEqualTo_hashOnly_throwsIllegalArgumentException() {
-        QueryConditional.greaterThanOrEqualTo(getKey(fakeItem))
-                        .getExpression(FakeItem.getTableSchema(), TableMetadata.getPrimaryIndexName());
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void greaterThanOrEqualTo_hashAndSort_onlyHashSet_throwsIllegalArgumentException() {
-        QueryConditional.greaterThanOrEqualTo(getKey(fakeItemWithoutSort))
-                        .getExpression(FakeItemWithSort.getTableSchema(), TableMetadata.getPrimaryIndexName());
-    }
-
-    @Test
-    public void lessThan_hashAndRangeKey_bothSet() {
-        Expression expression = QueryConditional.lessThan(getKey(fakeItemWithSort))
-                                                .getExpression(FakeItemWithSort.getTableSchema(), TableMetadata.getPrimaryIndexName());
-
-        verifyExpression(expression, "<");
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void lessThan_hashOnly_throwsIllegalArgumentException() {
-        QueryConditional.lessThan(getKey(fakeItem))
-                        .getExpression(FakeItem.getTableSchema(), TableMetadata.getPrimaryIndexName());
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void lessThan_hashAndSort_onlyHashSet_throwsIllegalArgumentException() {
-        QueryConditional.lessThan(getKey(fakeItemWithoutSort))
-                        .getExpression(FakeItemWithSort.getTableSchema(), TableMetadata.getPrimaryIndexName());
-    }
-
-    @Test
-    public void lessThanOrEqualTo_hashAndRangeKey_bothSet() {
-        Expression expression = QueryConditional.lessThanOrEqualTo(getKey(fakeItemWithSort))
-                                                .getExpression(FakeItemWithSort.getTableSchema(), TableMetadata.getPrimaryIndexName());
-
-        verifyExpression(expression, "<=");
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void lessThanOrEqualTo_hashOnly_throwsIllegalArgumentException() {
-        QueryConditional.lessThanOrEqualTo(getKey(fakeItem))
-                        .getExpression(FakeItem.getTableSchema(), TableMetadata.getPrimaryIndexName());
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void lessThanOrEqualTo_hashAndSort_onlyHashSet_throwsIllegalArgumentException() {
-        QueryConditional.lessThanOrEqualTo(getKey(fakeItemWithoutSort))
-                        .getExpression(FakeItemWithSort.getTableSchema(), TableMetadata.getPrimaryIndexName());
-    }
-
-    @Test
-    public void beginsWith_hashAndRangeKey_bothSet() {
-        Expression expression = QueryConditional.beginsWith(getKey(fakeItemWithSort))
-                                                .getExpression(FakeItemWithSort.getTableSchema(), TableMetadata.getPrimaryIndexName());
-
-        String expectedExpression = String.format("%s = %s AND begins_with ( %s, %s )", ID_KEY, ID_VALUE, SORT_KEY,
-                                                  SORT_VALUE);
-        assertThat(expression.getExpression(), is(expectedExpression));
-        assertThat(expression.getExpressionValues(), hasEntry(ID_VALUE, fakeItemWithSortHashValue));
-        assertThat(expression.getExpressionValues(), hasEntry(SORT_VALUE, fakeItemWithSortSortValue));
-        assertThat(expression.getExpressionNames(), hasEntry(ID_KEY, "id"));
-        assertThat(expression.getExpressionNames(), hasEntry(SORT_KEY, "sort"));
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void beginsWith_hashOnly_throwsIllegalArgumentException() {
-        QueryConditional.beginsWith(getKey(fakeItem))
-                        .getExpression(FakeItem.getTableSchema(), TableMetadata.getPrimaryIndexName());
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void beginsWith_hashAndSort_onlyHashSet_throwsIllegalArgumentException() {
-        QueryConditional.beginsWith(getKey(fakeItemWithoutSort))
-                        .getExpression(FakeItemWithSort.getTableSchema(), TableMetadata.getPrimaryIndexName());
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void beginsWith_numericRange_throwsIllegalArgumentException() {
-        FakeItemWithNumericSort fakeItemWithNumericSort = FakeItemWithNumericSort.createUniqueFakeItemWithSort();
-        QueryConditional.beginsWith(getKey(fakeItemWithNumericSort)).getExpression(FakeItemWithNumericSort.getTableSchema(), TableMetadata.getPrimaryIndexName());
-    }
-
-    @Test
-    public void between_allKeysSet_stringSort() {
-        FakeItemWithSort otherFakeItemWithSort =
-            FakeItemWithSort.builder().id(fakeItemWithSort.getId()).sort(UUID.randomUUID().toString()).build();
-        AttributeValue otherFakeItemWithSortSortValue =
-            AttributeValue.builder().s(otherFakeItemWithSort.getSort()).build();
-
-        Expression expression = QueryConditional.between(getKey(fakeItemWithSort), getKey(otherFakeItemWithSort))
-            .getExpression(FakeItemWithSort.getTableSchema(), TableMetadata.getPrimaryIndexName());
-
-        String expectedExpression = String.format("%s = %s AND %s BETWEEN %s AND %s", ID_KEY, ID_VALUE, SORT_KEY,
-                                                  SORT_VALUE, SORT_OTHER_VALUE);
-        assertThat(expression.getExpression(), is(expectedExpression));
-        assertThat(expression.getExpressionValues(), hasEntry(ID_VALUE, fakeItemWithSortHashValue));
-        assertThat(expression.getExpressionValues(), hasEntry(SORT_VALUE, fakeItemWithSortSortValue));
-        assertThat(expression.getExpressionValues(), hasEntry(SORT_OTHER_VALUE, otherFakeItemWithSortSortValue));
-        assertThat(expression.getExpressionNames(), hasEntry(ID_KEY, "id"));
-        assertThat(expression.getExpressionNames(), hasEntry(SORT_KEY, "sort"));
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void between_hashOnly_throwsIllegalArgumentException() {
-        FakeItem otherFakeItem = createUniqueFakeItem();
-        QueryConditional.between(getKey(fakeItem), getKey(otherFakeItem))
-                        .getExpression(FakeItem.getTableSchema(), TableMetadata.getPrimaryIndexName());
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void between_hashAndSort_onlyFirstSortSet_throwsIllegalArgumentException() {
-        QueryConditional.between(getKey(fakeItemWithSort), getKey(fakeItemWithoutSort))
-                        .getExpression(FakeItemWithSort.getTableSchema(), TableMetadata.getPrimaryIndexName());
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void between_hashAndSort_onlySecondSortSet_throwsIllegalArgumentException() {
-        QueryConditional.between(getKey(fakeItemWithoutSort), getKey(fakeItemWithSort))
-                        .getExpression(FakeItemWithSort.getTableSchema(), TableMetadata.getPrimaryIndexName());
-    }
-
-    private void verifyExpression(Expression expression, String condition) {
-        assertThat(expression.getExpression(), is(ID_KEY + " = " + ID_VALUE + " AND " + SORT_KEY + " " + condition +
-                                                  " " + SORT_VALUE));
-        assertThat(expression.getExpressionNames(), hasEntry(ID_KEY, "id"));
-        assertThat(expression.getExpressionNames(), hasEntry(SORT_KEY, "sort"));
-        assertThat(expression.getExpressionValues(), hasEntry(ID_VALUE, fakeItemWithSortHashValue));
-        assertThat(expression.getExpressionValues(), hasEntry(SORT_VALUE, fakeItemWithSortSortValue));
-    }
-    
-    private Key getKey(FakeItem item) {
-        return Utils.createKeyFromItem(item, FakeItem.getTableSchema(), TableMetadata.getPrimaryIndexName());
-    }
-
-    private Key getKey(FakeItemWithSort item) {
-        return Utils.createKeyFromItem(item, FakeItemWithSort.getTableSchema(), TableMetadata.getPrimaryIndexName());
-    }
-
-    private Key getKey(FakeItemWithNumericSort item) {
-        return Utils.createKeyFromItem(item,
-                                       FakeItemWithNumericSort.getTableSchema(),
-                                       TableMetadata.getPrimaryIndexName());
-    }
-}
\ No newline at end of file
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/operations/QueryTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/operations/QueryTest.java
deleted file mode 100644
index 7702b5e8e399..000000000000
--- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/operations/QueryTest.java
+++ /dev/null
@@ -1,464 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.extensions.dynamodb.mappingclient.operations;
-
-import static java.util.Arrays.asList;
-import static java.util.Collections.singletonList;
-import static java.util.Collections.singletonMap;
-import static java.util.stream.Collectors.toList;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.hasEntry;
-import static org.hamcrest.Matchers.is;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyMap;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.AttributeValues.stringValue;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.functionaltests.models.FakeItem.createUniqueFakeItem;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.functionaltests.models.FakeItemWithIndices.createUniqueFakeItemWithIndices;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.functionaltests.models.FakeItemWithSort.createUniqueFakeItemWithSort;
-
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
-import java.util.stream.Stream;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.InOrder;
-import org.mockito.Mock;
-import org.mockito.Mockito;
-import org.mockito.junit.MockitoJUnitRunner;
-
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.Expression;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.Key;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.MapperExtension;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.OperationContext;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.Page;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.TableMetadata;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.extensions.ReadModification;
-import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-import software.amazon.awssdk.services.dynamodb.model.QueryRequest;
-import software.amazon.awssdk.services.dynamodb.model.QueryResponse;
-import software.amazon.awssdk.services.dynamodb.paginators.QueryIterable;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.functionaltests.models.FakeItem;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.functionaltests.models.FakeItemWithIndices;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.functionaltests.models.FakeItemWithSort;
-
-@RunWith(MockitoJUnitRunner.class)
-public class QueryTest {
-    private static final String TABLE_NAME = "table-name";
-    private static final OperationContext PRIMARY_CONTEXT =
-        OperationContext.of(TABLE_NAME, TableMetadata.getPrimaryIndexName());
-    private static final OperationContext GSI_1_CONTEXT =
-        OperationContext.of(TABLE_NAME, "gsi_1");
-
-    private final FakeItem keyItem = createUniqueFakeItem();
-    private final Query<FakeItem> queryOperation =
-        Query.of(QueryConditional.equalTo(Key.of(stringValue(keyItem.getId()))));
-
-    @Mock
-    private DynamoDbClient mockDynamoDbClient;
-    @Mock
-    private QueryConditional mockQueryConditional;
-    @Mock
-    private MapperExtension mockMapperExtension;
-
-    @Test
-    public void getServiceCall_makesTheRightCallAndReturnsResponse() {
-        QueryRequest queryRequest = QueryRequest.builder().build();
-        QueryIterable mockQueryIterable = mock(QueryIterable.class);
-        when(mockDynamoDbClient.queryPaginator(any(QueryRequest.class))).thenReturn(mockQueryIterable);
-
-        QueryIterable response = queryOperation.getServiceCall(mockDynamoDbClient).apply(queryRequest);
-
-        assertThat(response, is(mockQueryIterable));
-        verify(mockDynamoDbClient).queryPaginator(queryRequest);
-    }
-
-    @Test
-    public void generateRequest_nonDefault_usesQueryConditional() {
-        Map<String, AttributeValue> keyItemMap = getAttributeValueMap(keyItem);
-        Expression expression = Expression.builder().expression("test-expression").expressionValues(keyItemMap).build();
-        when(mockQueryConditional.getExpression(any(), anyString())).thenReturn(expression);
-
-        Query<FakeItem> query = Query.of(mockQueryConditional);
-        QueryRequest queryRequest = query.generateRequest(FakeItem.getTableSchema(), PRIMARY_CONTEXT, null);
-
-        QueryRequest expectedQueryRequest = QueryRequest.builder()
-                                                        .tableName(TABLE_NAME)
-                                                        .keyConditionExpression("test-expression")
-                                                        .expressionAttributeValues(keyItemMap)
-                                                        .build();
-        assertThat(queryRequest, is(expectedQueryRequest));
-        verify(mockQueryConditional).getExpression(FakeItem.getTableSchema(), TableMetadata.getPrimaryIndexName());
-    }
-
-    @Test
-    public void generateRequest_defaultQuery_usesEqualTo() {
-        QueryRequest queryRequest = queryOperation.generateRequest(FakeItem.getTableSchema(),
-                                                                   PRIMARY_CONTEXT,
-                                                                   null);
-
-        QueryRequest expectedQueryRequest = QueryRequest.builder()
-            .tableName(TABLE_NAME)
-            .keyConditionExpression("#AMZN_MAPPED_id = :AMZN_MAPPED_id")
-            .expressionAttributeValues(singletonMap(":AMZN_MAPPED_id",
-                                                    AttributeValue.builder().s(keyItem.getId()).build()))
-            .expressionAttributeNames(singletonMap("#AMZN_MAPPED_id", "id"))
-            .build();
-        assertThat(queryRequest, is(expectedQueryRequest));
-    }
-
-    @Test
-    public void generateRequest_knowsHowToUseAnIndex() {
-        FakeItemWithIndices fakeItem = createUniqueFakeItemWithIndices();
-        Query<FakeItemWithIndices> queryToTest =
-            Query.of(QueryConditional.equalTo(Key.of(stringValue(fakeItem.getGsiId()))));
-        QueryRequest queryRequest = queryToTest.generateRequest(FakeItemWithIndices.getTableSchema(), GSI_1_CONTEXT, null);
-
-        assertThat(queryRequest.indexName(), is("gsi_1"));
-    }
-
-    @Test
-    public void generateRequest_ascending() {
-        Query<FakeItem> queryToTest =
-            Query.builder()
-                 .queryConditional(QueryConditional.equalTo(Key.of(stringValue(keyItem.getId()))))
-                 .scanIndexForward(true)
-                 .build();
-        QueryRequest queryRequest = queryToTest.generateRequest(FakeItem.getTableSchema(),
-                                                                PRIMARY_CONTEXT,
-                                                                null);
-
-        assertThat(queryRequest.scanIndexForward(), is(true));
-    }
-
-    @Test
-    public void generateRequest_descending() {
-        Query<FakeItem> queryToTest =
-            Query.builder()
-                 .queryConditional(QueryConditional.equalTo(Key.of(stringValue(keyItem.getId()))))
-                 .scanIndexForward(false)
-                 .build();
-        QueryRequest queryRequest = queryToTest.generateRequest(FakeItem.getTableSchema(),
-                                                                PRIMARY_CONTEXT,
-                                                                null);
-
-        assertThat(queryRequest.scanIndexForward(), is(false));
-    }
-
-    @Test
-    public void generateRequest_limit() {
-        Query<FakeItem> queryToTest =
-            Query.builder()
-                 .queryConditional(QueryConditional.equalTo(Key.of(stringValue(keyItem.getId()))))
-                 .limit(123)
-                 .build();
-        QueryRequest queryRequest = queryToTest.generateRequest(FakeItem.getTableSchema(),
-                                                                PRIMARY_CONTEXT,
-                                                                null);
-
-        assertThat(queryRequest.limit(), is(123));
-    }
-
-    @Test
-    public void generateRequest_filterExpression_withValues() {
-        Map<String, AttributeValue> expressionValues = singletonMap(":test-key", stringValue("test-value"));
-        Expression filterExpression = Expression.builder()
-                                                .expression("test-expression")
-                                                .expressionValues(expressionValues)
-                                                .build();
-
-        Query<FakeItem> queryToTest =
-            Query.builder()
-                 .queryConditional(QueryConditional.equalTo(Key.of(stringValue(keyItem.getId()))))
-                 .filterExpression(filterExpression)
-                 .build();
-        QueryRequest queryRequest = queryToTest.generateRequest(FakeItem.getTableSchema(),
-                                                                PRIMARY_CONTEXT,
-                                                                null);
-
-        assertThat(queryRequest.filterExpression(), is("test-expression"));
-        assertThat(queryRequest.expressionAttributeValues(), hasEntry(":test-key", stringValue("test-value")));
-    }
-
-    @Test
-    public void generateRequest_filterExpression_withoutValues() {
-        Expression filterExpression = Expression.builder().expression("test-expression").build();
-
-        Query<FakeItem> queryToTest =
-            Query.builder()
-                 .queryConditional(QueryConditional.equalTo(Key.of(stringValue(keyItem.getId()))))
-                 .filterExpression(filterExpression)
-                 .build();
-        QueryRequest queryRequest = queryToTest.generateRequest(FakeItem.getTableSchema(),
-                                                                PRIMARY_CONTEXT,
-                                                                null);
-
-        assertThat(queryRequest.filterExpression(), is("test-expression"));
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void generateRequest_filterExpression_withConflictingValues() {
-        Map<String, AttributeValue> expressionValues = singletonMap(":AMZN_MAPPED_id", stringValue("test-value"));
-        Map<String, String> expressionNames = singletonMap("#AMZN_MAPPED_id", "id");
-        Expression filterExpression = Expression.builder()
-                                                .expression("test-expression")
-                                                .expressionNames(expressionNames)
-                                                .expressionValues(expressionValues)
-                                                .build();
-        Query<FakeItem> queryToTest =
-            Query.builder()
-                 .queryConditional(QueryConditional.equalTo(Key.of(stringValue(keyItem.getId()))))
-                 .filterExpression(filterExpression)
-                 .build();
-        queryToTest.generateRequest(FakeItem.getTableSchema(), PRIMARY_CONTEXT, null);
-    }
-
-    @Test
-    public void generateRequest_consistentRead() {
-        Query<FakeItem> queryToTest =
-            Query.builder()
-                 .queryConditional(QueryConditional.equalTo(Key.of(stringValue(keyItem.getId()))))
-                 .consistentRead(true)
-                 .build();
-        QueryRequest queryRequest = queryToTest.generateRequest(FakeItem.getTableSchema(),
-                                                                PRIMARY_CONTEXT,
-                                                                null);
-
-        assertThat(queryRequest.consistentRead(), is(true));
-    }
-
-    @Test
-    public void generateRequest_hashKeyOnly_withExclusiveStartKey() {
-        FakeItem exclusiveStartKey = createUniqueFakeItem();
-        Query<FakeItem> queryToTest =
-            Query.builder()
-                 .queryConditional(QueryConditional.equalTo(Key.of(stringValue(keyItem.getId()))))
-                 .exclusiveStartKey(FakeItem.getTableSchema().itemToMap(exclusiveStartKey,
-                                                                        FakeItem.getTableMetadata().getPrimaryKeys()))
-                 .build();
-
-        QueryRequest queryRequest = queryToTest.generateRequest(FakeItem.getTableSchema(),
-                                                                PRIMARY_CONTEXT,
-                                                                null);
-
-        assertThat(queryRequest.exclusiveStartKey(),
-                   hasEntry("id", AttributeValue.builder().s(exclusiveStartKey.getId()).build()));
-    }
-
-    @Test
-    public void generateRequest_secondaryIndex_exclusiveStartKeyUsesPrimaryAndSecondaryIndex() {
-        FakeItemWithIndices exclusiveStartKey = createUniqueFakeItemWithIndices();
-        Set<String> keyFields = new HashSet<>(FakeItemWithIndices.getTableSchema().getTableMetadata().getPrimaryKeys());
-        keyFields.addAll(FakeItemWithIndices.getTableSchema().getTableMetadata().getIndexKeys("gsi_1"));
-
-        Query<FakeItemWithIndices> queryToTest =
-            Query.builder()
-                 .queryConditional(QueryConditional.equalTo(Key.of(stringValue(keyItem.getId()))))
-                 .exclusiveStartKey(FakeItemWithIndices.getTableSchema().itemToMap(exclusiveStartKey, keyFields))
-                 .build();
-
-        QueryRequest queryRequest = queryToTest.generateRequest(FakeItemWithIndices.getTableSchema(),
-                                                                GSI_1_CONTEXT,
-                                                                null);
-
-        assertThat(queryRequest.exclusiveStartKey(),
-                   hasEntry("id", AttributeValue.builder().s(exclusiveStartKey.getId()).build()));
-        assertThat(queryRequest.exclusiveStartKey(),
-                   hasEntry("sort", AttributeValue.builder().s(exclusiveStartKey.getSort()).build()));
-        assertThat(queryRequest.exclusiveStartKey(),
-                   hasEntry("gsi_id", AttributeValue.builder().s(exclusiveStartKey.getGsiId()).build()));
-        assertThat(queryRequest.exclusiveStartKey(),
-                   hasEntry("gsi_sort", AttributeValue.builder().s(exclusiveStartKey.getGsiSort()).build()));
-    }
-
-    @Test
-    public void generateRequest_hashAndSortKey_withExclusiveStartKey() {
-        FakeItemWithSort exclusiveStartKey = createUniqueFakeItemWithSort();
-        Query<FakeItemWithSort> queryToTest =
-            Query.builder()
-                 .queryConditional(QueryConditional.equalTo(Key.of(stringValue(keyItem.getId()))))
-                 .exclusiveStartKey(
-                     FakeItemWithSort.getTableSchema()
-                                        .itemToMap(
-                                            exclusiveStartKey,
-                                            FakeItemWithSort.getTableSchema().getTableMetadata().getPrimaryKeys()))
-                 .build();
-
-        QueryRequest queryRequest = queryToTest.generateRequest(FakeItemWithSort.getTableSchema(),
-                                                                PRIMARY_CONTEXT,
-                                                                null);
-
-        assertThat(queryRequest.exclusiveStartKey(),
-                   hasEntry("id", AttributeValue.builder().s(exclusiveStartKey.getId()).build()));
-        assertThat(queryRequest.exclusiveStartKey(),
-                   hasEntry("sort", AttributeValue.builder().s(exclusiveStartKey.getSort()).build()));
-    }
-
-    @Test
-    public void transformResults_firstPageMultipleItems_iteratesAndReturnsCorrectItems() {
-        List<FakeItem> queryResultItems = generateFakeItemList();
-        List<Map<String, AttributeValue>> queryResultMaps =
-            queryResultItems.stream().map(QueryTest::getAttributeValueMap).collect(toList());
-
-        QueryIterable queryIterable = generateFakeQueryResults(singletonList(queryResultMaps));
-
-        Iterable<Page<FakeItem>> queryResultPages = queryOperation.transformResponse(queryIterable,
-                                                                                     FakeItem.getTableSchema(),
-                                                                                     PRIMARY_CONTEXT, null);
-        Iterator<Page<FakeItem>> queryResultPageIterator = queryResultPages.iterator();
-
-        assertThat(queryResultPageIterator.hasNext(), is(true));
-        Page<FakeItem> page = queryResultPageIterator.next();
-        assertThat(queryResultPageIterator.hasNext(), is(false));
-        assertThat(page.getItems(), is(queryResultItems));
-    }
-
-    @Test
-    public void transformResults_firstPageMultipleItems_setsLastEvaluatedKey() {
-        List<FakeItem> queryResultItems = generateFakeItemList();
-        FakeItem lastEvaluatedKey = createUniqueFakeItem();
-        List<Map<String, AttributeValue>> queryResultMaps =
-            queryResultItems.stream().map(QueryTest::getAttributeValueMap).collect(toList());
-
-        QueryIterable queryIterable = generateFakeQueryResults(singletonList(queryResultMaps),
-                                                               getAttributeValueMap(lastEvaluatedKey));
-
-        Iterable<Page<FakeItem>> queryResultPages = queryOperation.transformResponse(queryIterable,
-                                                                                     FakeItem.getTableSchema(),
-                                                                                     PRIMARY_CONTEXT, null);
-        Iterator<Page<FakeItem>> queryResultPageIterator = queryResultPages.iterator();
-
-        assertThat(queryResultPageIterator.hasNext(), is(true));
-        Page<FakeItem> page = queryResultPageIterator.next();
-        assertThat(queryResultPageIterator.hasNext(), is(false));
-        assertThat(page.getItems(), is(queryResultItems));
-        assertThat(page.getLastEvaluatedKey(), is(getAttributeValueMap(lastEvaluatedKey)));
-    }
-
-    @Test
-    public void queryItem_twoPagesMultipleItems_iteratesAndReturnsCorrectItems() {
-        List<FakeItem> queryResultItems1 = generateFakeItemList();
-        List<FakeItem> queryResultItems2 = generateFakeItemList();
-
-        List<Map<String, AttributeValue>> queryResultMaps1 =
-            queryResultItems1.stream().map(QueryTest::getAttributeValueMap).collect(toList());
-        List<Map<String, AttributeValue>> queryResultMaps2 =
-            queryResultItems2.stream().map(QueryTest::getAttributeValueMap).collect(toList());
-
-        QueryIterable queryIterable = generateFakeQueryResults(asList(queryResultMaps1, queryResultMaps2));
-
-        Iterable<Page<FakeItem>> queryResultPages = queryOperation.transformResponse(queryIterable,
-                                                                                     FakeItem.getTableSchema(),
-                                                                                     PRIMARY_CONTEXT,  null);
-        Iterator<Page<FakeItem>> queryResultPageIterator = queryResultPages.iterator();
-
-        assertThat(queryResultPageIterator.hasNext(), is(true));
-        Page<FakeItem> page1 = queryResultPageIterator.next();
-        assertThat(queryResultPageIterator.hasNext(), is(true));
-        Page<FakeItem> page2 = queryResultPageIterator.next();
-        assertThat(queryResultPageIterator.hasNext(), is(false));
-        assertThat(page1.getItems(), is(queryResultItems1));
-        assertThat(page2.getItems(), is(queryResultItems2));
-    }
-
-    @Test
-    public void queryItem_withExtension_correctlyTransformsItems() {
-        List<FakeItem> queryResultItems1 = generateFakeItemList();
-        List<FakeItem> queryResultItems2 = generateFakeItemList();
-        List<FakeItem> modifiedResultItems1 = generateFakeItemList();
-        List<FakeItem> modifiedResultItems2 = generateFakeItemList();
-
-        List<Map<String, AttributeValue>> queryResultMaps1 =
-            queryResultItems1.stream().map(QueryTest::getAttributeValueMap).collect(toList());
-        List<Map<String, AttributeValue>> queryResultMaps2 =
-            queryResultItems2.stream().map(QueryTest::getAttributeValueMap).collect(toList());
-
-        ReadModification[] readModifications =
-            Stream.concat(modifiedResultItems1.stream(), modifiedResultItems2.stream())
-                  .map(QueryTest::getAttributeValueMap)
-                  .map(attributeMap -> ReadModification.builder().transformedItem(attributeMap).build())
-                  .collect(Collectors.toList())
-                  .toArray(new ReadModification[]{});
-        when(mockMapperExtension.afterRead(anyMap(), any(), any()))
-            .thenReturn(readModifications[0], Arrays.copyOfRange(readModifications, 1, readModifications.length));
-
-        QueryIterable queryIterable = generateFakeQueryResults(asList(queryResultMaps1, queryResultMaps2));
-
-        Iterable<Page<FakeItem>> queryResultPages = queryOperation.transformResponse(queryIterable,
-                                                                                     FakeItem.getTableSchema(),
-                                                                                     PRIMARY_CONTEXT,
-                                                                                     mockMapperExtension);
-        Iterator<Page<FakeItem>> queryResultPageIterator = queryResultPages.iterator();
-
-        assertThat(queryResultPageIterator.hasNext(), is(true));
-        Page<FakeItem> page1 = queryResultPageIterator.next();
-        assertThat(queryResultPageIterator.hasNext(), is(true));
-        Page<FakeItem> page2 = queryResultPageIterator.next();
-        assertThat(queryResultPageIterator.hasNext(), is(false));
-        assertThat(page1.getItems(), is(modifiedResultItems1));
-        assertThat(page2.getItems(), is(modifiedResultItems2));
-
-        InOrder inOrder = Mockito.inOrder(mockMapperExtension);
-        Stream.concat(queryResultMaps1.stream(), queryResultMaps2.stream())
-              .forEach(attributeMap ->
-                   inOrder.verify(mockMapperExtension).afterRead(attributeMap,
-                                                                 PRIMARY_CONTEXT,
-                                                                 FakeItem.getTableMetadata()));
-    }
-
-    private static QueryIterable generateFakeQueryResults(List<List<Map<String, AttributeValue>>> queryItemMapsPages) {
-        List<QueryResponse> queryResponses =
-            queryItemMapsPages.stream().map(page -> QueryResponse.builder().items(page).build()).collect(toList());
-
-        QueryIterable mockQueryIterable = mock(QueryIterable.class);
-        when(mockQueryIterable.iterator()).thenReturn(queryResponses.iterator());
-        return mockQueryIterable;
-    }
-
-    private static QueryIterable generateFakeQueryResults(List<List<Map<String, AttributeValue>>> queryItemMapsPages,
-                                                   Map<String, AttributeValue> lastEvaluatedKey) {
-        List<QueryResponse> queryResponses =
-            queryItemMapsPages.stream()
-                              .map(page -> QueryResponse.builder()
-                                                        .items(page)
-                                                        .lastEvaluatedKey(lastEvaluatedKey)
-                                                        .build())
-                              .collect(toList());
-
-        QueryIterable mockQueryIterable = mock(QueryIterable.class);
-        when(mockQueryIterable.iterator()).thenReturn(queryResponses.iterator());
-        return mockQueryIterable;
-    }
-
-    private static List<FakeItem> generateFakeItemList() {
-        return IntStream.range(0, 3).mapToObj(ignored -> FakeItem.createUniqueFakeItem()).collect(toList());
-    }
-
-    private static Map<String, AttributeValue> getAttributeValueMap(FakeItem fakeItem) {
-        return singletonMap("id", AttributeValue.builder().s(fakeItem.getId()).build());
-    }
-}
\ No newline at end of file
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/operations/ScanTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/operations/ScanTest.java
deleted file mode 100644
index 3c78ddade5fe..000000000000
--- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/operations/ScanTest.java
+++ /dev/null
@@ -1,354 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.extensions.dynamodb.mappingclient.operations;
-
-import static java.util.Arrays.asList;
-import static java.util.Collections.singletonList;
-import static java.util.Collections.singletonMap;
-import static java.util.stream.Collectors.toList;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.hasEntry;
-import static org.hamcrest.Matchers.is;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyMap;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.AttributeValues.stringValue;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.functionaltests.models.FakeItem.createUniqueFakeItem;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.functionaltests.models.FakeItemWithSort.createUniqueFakeItemWithSort;
-
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
-import java.util.stream.Stream;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.InOrder;
-import org.mockito.Mock;
-import org.mockito.Mockito;
-import org.mockito.junit.MockitoJUnitRunner;
-
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.Expression;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.MapperExtension;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.OperationContext;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.Page;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.TableMetadata;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.extensions.ReadModification;
-import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-import software.amazon.awssdk.services.dynamodb.model.ScanRequest;
-import software.amazon.awssdk.services.dynamodb.model.ScanResponse;
-import software.amazon.awssdk.services.dynamodb.paginators.ScanIterable;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.functionaltests.models.FakeItem;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.functionaltests.models.FakeItemWithIndices;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.functionaltests.models.FakeItemWithSort;
-
-@RunWith(MockitoJUnitRunner.class)
-public class ScanTest {
-    private static final String TABLE_NAME = "table-name";
-    private static final OperationContext PRIMARY_CONTEXT =
-        OperationContext.of(TABLE_NAME, TableMetadata.getPrimaryIndexName());
-    private static final OperationContext GSI_1_CONTEXT =
-        OperationContext.of(TABLE_NAME, "gsi_1");
-
-    private final Scan<FakeItem> scanOperation = Scan.create();
-
-    @Mock
-    private DynamoDbClient mockDynamoDbClient;
-
-    @Mock
-    private MapperExtension mockMapperExtension;
-
-    @Test
-    public void getServiceCall_makesTheRightCallAndReturnsResponse() {
-        ScanRequest scanRequest = ScanRequest.builder().build();
-        ScanIterable mockScanIterable = mock(ScanIterable.class);
-        when(mockDynamoDbClient.scanPaginator(any(ScanRequest.class))).thenReturn(mockScanIterable);
-
-        ScanIterable response = scanOperation.getServiceCall(mockDynamoDbClient).apply(scanRequest);
-
-        assertThat(response, is(mockScanIterable));
-        verify(mockDynamoDbClient).scanPaginator(scanRequest);
-    }
-
-    @Test
-    public void generateRequest_defaultScan() {
-        ScanRequest request = scanOperation.generateRequest(FakeItem.getTableSchema(),
-                                                            PRIMARY_CONTEXT,
-                                                            null);
-
-        ScanRequest expectedRequest = ScanRequest.builder()
-            .tableName(TABLE_NAME)
-            .build();
-        assertThat(request, is(expectedRequest));
-    }
-
-    @Test
-    public void generateRequest_knowsHowToUseAnIndex() {
-        Scan<FakeItemWithIndices> scanToTest = Scan.create();
-        ScanRequest scanRequest = scanToTest.generateRequest(FakeItemWithIndices.getTableSchema(), GSI_1_CONTEXT, null);
-        assertThat(scanRequest.indexName(), is("gsi_1"));
-    }
-
-
-    @Test
-    public void generateRequest_limit() {
-        Scan<FakeItem> operationToTest = Scan.builder().limit(10).build();
-        ScanRequest request = operationToTest.generateRequest(FakeItem.getTableSchema(),
-                                                              PRIMARY_CONTEXT,
-                                                              null);
-
-        ScanRequest expectedRequest = ScanRequest.builder()
-            .tableName(TABLE_NAME)
-            .limit(10)
-            .build();
-        assertThat(request, is(expectedRequest));
-    }
-
-    @Test
-    public void generateRequest_filterCondition_expressionAndValues() {
-        Map<String, AttributeValue> expressionValues = singletonMap(":test-key", stringValue("test-value"));
-        Expression filterExpression =
-            Expression.builder().expression("test-expression").expressionValues(expressionValues).build();
-        Scan<FakeItem> operationToTest =
-            Scan.builder().filterExpression(filterExpression).build();
-
-        ScanRequest request = operationToTest.generateRequest(FakeItem.getTableSchema(),
-                                                              PRIMARY_CONTEXT,
-                                                              null);
-        ScanRequest expectedRequest = ScanRequest.builder()
-                                                 .tableName(TABLE_NAME)
-                                                 .filterExpression("test-expression")
-                                                 .expressionAttributeValues(expressionValues)
-                                                 .build();
-        assertThat(request, is(expectedRequest));
-    }
-
-    @Test
-    public void generateRequest_filterCondition_expressionOnly() {
-        Expression filterExpression = Expression.builder().expression("test-expression").build();
-        Scan<FakeItem> operationToTest =
-            Scan.builder().filterExpression(filterExpression).build();
-
-        ScanRequest request = operationToTest.generateRequest(FakeItem.getTableSchema(),
-                                                              PRIMARY_CONTEXT,
-                                                              null);
-        ScanRequest expectedRequest = ScanRequest.builder()
-                                                 .tableName(TABLE_NAME)
-                                                 .filterExpression("test-expression")
-                                                 .build();
-        assertThat(request, is(expectedRequest));
-    }
-
-    @Test
-    public void generateRequest_consistentRead() {
-        Scan<FakeItem> operationToTest = Scan.builder().consistentRead(true).build();
-        ScanRequest request = operationToTest.generateRequest(FakeItem.getTableSchema(),
-                                                              PRIMARY_CONTEXT,
-                                                              null);
-
-        ScanRequest expectedRequest = ScanRequest.builder()
-                                                 .tableName(TABLE_NAME)
-                                                 .consistentRead(true)
-                                                 .build();
-        assertThat(request, is(expectedRequest));
-    }
-
-    @Test
-    public void generateRequest_hashKeyOnly_exclusiveStartKey() {
-        FakeItem exclusiveStartKey = createUniqueFakeItem();
-        Map<String, AttributeValue> keyMap = FakeItem.getTableSchema().itemToMap(exclusiveStartKey, singletonList("id"));
-        Scan<FakeItem> scanToTest = Scan.builder().exclusiveStartKey(keyMap).build();
-
-        ScanRequest scanRequest = scanToTest.generateRequest(FakeItem.getTableSchema(),
-                                                             PRIMARY_CONTEXT,
-                                                             null);
-
-        assertThat(scanRequest.exclusiveStartKey(),
-                   hasEntry("id", AttributeValue.builder().s(exclusiveStartKey.getId()).build()));
-    }
-
-    @Test
-    public void generateRequest_hashAndRangeKey_exclusiveStartKey() {
-        FakeItemWithSort exclusiveStartKey = createUniqueFakeItemWithSort();
-        Map<String, AttributeValue> keyMap =
-            FakeItemWithSort.getTableSchema().itemToMap(exclusiveStartKey,
-                                                        FakeItemWithSort.getTableMetadata().getPrimaryKeys());
-
-        Scan<FakeItemWithSort> scanToTest = Scan.builder().exclusiveStartKey(keyMap).build();
-
-        ScanRequest scanRequest = scanToTest.generateRequest(FakeItemWithSort.getTableSchema(),
-                                                             PRIMARY_CONTEXT,
-                                                             null);
-
-        assertThat(scanRequest.exclusiveStartKey(),
-                   hasEntry("id", AttributeValue.builder().s(exclusiveStartKey.getId()).build()));
-        assertThat(scanRequest.exclusiveStartKey(),
-                   hasEntry("sort", AttributeValue.builder().s(exclusiveStartKey.getSort()).build()));
-    }
-
-    @Test
-    public void transformResults_firstPageMultipleItems_iteratesAndReturnsCorrectItems() {
-        List<FakeItem> scanResultItems = generateFakeItemList();
-        List<Map<String, AttributeValue>> scanResultMaps =
-            scanResultItems.stream().map(ScanTest::getAttributeValueMap).collect(toList());
-
-        ScanIterable scanIterable = generateFakeScanResults(singletonList(scanResultMaps));
-
-        Iterable<Page<FakeItem>> scanResultPages = scanOperation.transformResponse(scanIterable,
-                                                                                   FakeItem.getTableSchema(),
-                                                                                   PRIMARY_CONTEXT,
-                                                                                   null);
-        Iterator<Page<FakeItem>> scanResultPageIterator = scanResultPages.iterator();
-
-        assertThat(scanResultPageIterator.hasNext(), is(true));
-        Page<FakeItem> page = scanResultPageIterator.next();
-        assertThat(scanResultPageIterator.hasNext(), is(false));
-        assertThat(page.getItems(), is(scanResultItems));
-    }
-
-    @Test
-    public void transformResults_firstPageMultipleItems_setsLastEvaluatedKey() {
-        List<FakeItem> scanResultItems = generateFakeItemList();
-        FakeItem lastEvaluatedKey = createUniqueFakeItem();
-        List<Map<String, AttributeValue>> scanResultMaps =
-            scanResultItems.stream().map(ScanTest::getAttributeValueMap).collect(toList());
-
-        ScanIterable scanIterable = generateFakeScanResults(singletonList(scanResultMaps),
-                                                               getAttributeValueMap(lastEvaluatedKey));
-
-        Iterable<Page<FakeItem>> scanResultPages = scanOperation.transformResponse(scanIterable,
-                                                                                   FakeItem.getTableSchema(),
-                                                                                   PRIMARY_CONTEXT,
-                                                                                   null);
-        Iterator<Page<FakeItem>> scanResultPageIterator = scanResultPages.iterator();
-
-        assertThat(scanResultPageIterator.hasNext(), is(true));
-        Page<FakeItem> page = scanResultPageIterator.next();
-        assertThat(scanResultPageIterator.hasNext(), is(false));
-        assertThat(page.getItems(), is(scanResultItems));
-        assertThat(page.getLastEvaluatedKey(), is(getAttributeValueMap(lastEvaluatedKey)));
-    }
-
-    @Test
-    public void scanItem_twoPagesMultipleItems_iteratesAndReturnsCorrectItems() {
-        List<FakeItem> scanResultItems1 = generateFakeItemList();
-        List<FakeItem> scanResultItems2 = generateFakeItemList();
-
-        List<Map<String, AttributeValue>> scanResultMaps1 =
-            scanResultItems1.stream().map(ScanTest::getAttributeValueMap).collect(toList());
-        List<Map<String, AttributeValue>> scanResultMaps2 =
-            scanResultItems2.stream().map(ScanTest::getAttributeValueMap).collect(toList());
-
-        ScanIterable scanIterable = generateFakeScanResults(asList(scanResultMaps1, scanResultMaps2));
-
-        Iterable<Page<FakeItem>> scanResultPages = scanOperation.transformResponse(scanIterable,
-                                                                                   FakeItem.getTableSchema(),
-                                                                                   PRIMARY_CONTEXT,
-                                                                                   null);
-        Iterator<Page<FakeItem>> scanResultPageIterator = scanResultPages.iterator();
-
-        assertThat(scanResultPageIterator.hasNext(), is(true));
-        Page<FakeItem> page1 = scanResultPageIterator.next();
-        assertThat(scanResultPageIterator.hasNext(), is(true));
-        Page<FakeItem> page2 = scanResultPageIterator.next();
-        assertThat(scanResultPageIterator.hasNext(), is(false));
-        assertThat(page1.getItems(), is(scanResultItems1));
-        assertThat(page2.getItems(), is(scanResultItems2));
-    }
-
-    @Test
-    public void scanItem_withExtension_correctlyTransformsItems() {
-        List<FakeItem> scanResultItems1 = generateFakeItemList();
-        List<FakeItem> scanResultItems2 = generateFakeItemList();
-        List<FakeItem> modifiedResultItems1 = generateFakeItemList();
-        List<FakeItem> modifiedResultItems2 = generateFakeItemList();
-
-        List<Map<String, AttributeValue>> scanResultMaps1 =
-            scanResultItems1.stream().map(ScanTest::getAttributeValueMap).collect(toList());
-        List<Map<String, AttributeValue>> scanResultMaps2 =
-            scanResultItems2.stream().map(ScanTest::getAttributeValueMap).collect(toList());
-
-        ReadModification[] readModifications =
-            Stream.concat(modifiedResultItems1.stream(), modifiedResultItems2.stream())
-                  .map(ScanTest::getAttributeValueMap)
-                  .map(attributeMap -> ReadModification.builder().transformedItem(attributeMap).build())
-                  .collect(Collectors.toList())
-                  .toArray(new ReadModification[]{});
-        when(mockMapperExtension.afterRead(anyMap(), any(), any()))
-            .thenReturn(readModifications[0], Arrays.copyOfRange(readModifications, 1, readModifications.length));
-
-        ScanIterable scanIterable = generateFakeScanResults(asList(scanResultMaps1, scanResultMaps2));
-
-        Iterable<Page<FakeItem>> scanResultPages = scanOperation.transformResponse(scanIterable,
-                                                                                   FakeItem.getTableSchema(),
-                                                                                   PRIMARY_CONTEXT,
-                                                                                   mockMapperExtension);
-        Iterator<Page<FakeItem>> scanResultPageIterator = scanResultPages.iterator();
-
-        assertThat(scanResultPageIterator.hasNext(), is(true));
-        Page<FakeItem> page1 = scanResultPageIterator.next();
-        assertThat(scanResultPageIterator.hasNext(), is(true));
-        Page<FakeItem> page2 = scanResultPageIterator.next();
-        assertThat(scanResultPageIterator.hasNext(), is(false));
-        assertThat(page1.getItems(), is(modifiedResultItems1));
-        assertThat(page2.getItems(), is(modifiedResultItems2));
-
-        InOrder inOrder = Mockito.inOrder(mockMapperExtension);
-        Stream.concat(scanResultMaps1.stream(), scanResultMaps2.stream())
-              .forEach(attributeMap ->
-                    inOrder.verify(mockMapperExtension).afterRead(attributeMap,
-                                                                  PRIMARY_CONTEXT,
-                                                                  FakeItem.getTableMetadata()));
-    }
-
-    private static ScanIterable generateFakeScanResults(List<List<Map<String, AttributeValue>>> scanItemMapsPages) {
-        List<ScanResponse> scanResponses =
-            scanItemMapsPages.stream().map(page -> ScanResponse.builder().items(page).build()).collect(toList());
-
-        ScanIterable mockScanIterable = mock(ScanIterable.class);
-        when(mockScanIterable.iterator()).thenReturn(scanResponses.iterator());
-        return mockScanIterable;
-    }
-
-    private static ScanIterable generateFakeScanResults(List<List<Map<String, AttributeValue>>> scanItemMapsPages,
-                                                          Map<String, AttributeValue> lastEvaluatedKey) {
-        List<ScanResponse> scanResponses =
-            scanItemMapsPages.stream()
-                              .map(page -> ScanResponse.builder()
-                                                        .items(page)
-                                                        .lastEvaluatedKey(lastEvaluatedKey)
-                                                        .build())
-                              .collect(toList());
-
-        ScanIterable mockScanIterable = mock(ScanIterable.class);
-        when(mockScanIterable.iterator()).thenReturn(scanResponses.iterator());
-        return mockScanIterable;
-    }
-
-    private static List<FakeItem> generateFakeItemList() {
-        return IntStream.range(0, 3).mapToObj(ignored -> FakeItem.createUniqueFakeItem()).collect(toList());
-    }
-
-    private static Map<String, AttributeValue> getAttributeValueMap(FakeItem fakeItem) {
-        return singletonMap("id", AttributeValue.builder().s(fakeItem.getId()).build());
-    }
-}
\ No newline at end of file
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/operations/TransactGetItemsTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/operations/TransactGetItemsTest.java
deleted file mode 100644
index d6abef97bcf3..000000000000
--- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/operations/TransactGetItemsTest.java
+++ /dev/null
@@ -1,233 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.extensions.dynamodb.mappingclient.operations;
-
-import static java.util.Collections.emptyMap;
-import static java.util.Collections.singletonList;
-import static java.util.stream.Collectors.toList;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.contains;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.sameInstance;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyZeroInteractions;
-import static org.mockito.Mockito.when;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.AttributeValues.stringValue;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.functionaltests.models.FakeItem.createUniqueFakeItem;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.functionaltests.models.FakeItemWithSort.createUniqueFakeItemWithSort;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.IntStream;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
-
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.Key;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.MappedDatabase;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.MappedTable;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.MapperExtension;
-import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-import software.amazon.awssdk.services.dynamodb.model.Get;
-import software.amazon.awssdk.services.dynamodb.model.ItemResponse;
-import software.amazon.awssdk.services.dynamodb.model.TransactGetItem;
-import software.amazon.awssdk.services.dynamodb.model.TransactGetItemsRequest;
-import software.amazon.awssdk.services.dynamodb.model.TransactGetItemsResponse;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.functionaltests.models.FakeItem;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.functionaltests.models.FakeItemWithSort;
-
-@RunWith(MockitoJUnitRunner.class)
-public class TransactGetItemsTest {
-    private static final String TABLE_NAME = "table-name";
-    private static final String TABLE_NAME_2 = "table-name-2";
-
-    private static final List<FakeItem> FAKE_ITEMS =
-        IntStream.range(0, 6).mapToObj($ -> createUniqueFakeItem()).collect(toList());
-    private static final List<Map<String, AttributeValue>> FAKE_ITEM_MAPS =
-        FAKE_ITEMS.stream()
-                  .map(item -> FakeItem.getTableSchema().itemToMap(item, FakeItem.getTableMetadata().getPrimaryKeys()))
-                  .collect(toList());
-    private static final List<Key> FAKE_ITEM_KEYS =
-        FAKE_ITEMS.stream().map(fakeItem -> Key.of(stringValue(fakeItem.getId()))).collect(toList());
-
-    private static final List<FakeItemWithSort> FAKESORT_ITEMS =
-        IntStream.range(0, 6)
-                 .mapToObj($ -> createUniqueFakeItemWithSort()).collect(toList());
-
-    private static final List<Map<String, AttributeValue>> FAKESORT_ITEM_MAPS =
-        FAKESORT_ITEMS.stream()
-                      .map(item -> FakeItemWithSort.getTableSchema()
-                                                   .itemToMap(item, FakeItemWithSort.getTableMetadata().getPrimaryKeys()))
-                      .collect(toList());
-    private static final List<Key> FAKESORT_ITEM_KEYS =
-        FAKESORT_ITEMS.stream().map(fakeItemWithSort -> Key.of(stringValue(fakeItemWithSort.getId()),
-                                                               stringValue(fakeItemWithSort.getSort()))).collect(toList());
-
-    @Mock
-    private DynamoDbClient mockDynamoDbClient;
-
-    @Mock
-    private MapperExtension mockExtension;
-
-    private MappedDatabase mappedDatabase;
-    private MappedTable<FakeItem> fakeItemMappedTable;
-    private MappedTable<FakeItemWithSort> fakeItemWithSortMappedTable;
-
-    @Before
-    public void setupMappedTables() {
-        mappedDatabase = MappedDatabase.builder().dynamoDbClient(mockDynamoDbClient).build();
-        fakeItemMappedTable = mappedDatabase.table(TABLE_NAME, FakeItem.getTableSchema());
-        fakeItemWithSortMappedTable = mappedDatabase.table(TABLE_NAME_2, FakeItemWithSort.getTableSchema());
-    }
-
-    @Test
-    public void generateRequest_getsFromMultipleTables() {
-        TransactGetItems operation =
-            TransactGetItems.of(ReadTransaction.of(fakeItemMappedTable, GetItem.of(FAKE_ITEM_KEYS.get(0))),
-                                ReadTransaction.of(fakeItemWithSortMappedTable, GetItem.of(FAKESORT_ITEM_KEYS.get(0))),
-                                ReadTransaction.of(fakeItemWithSortMappedTable, GetItem.of(FAKESORT_ITEM_KEYS.get(1))),
-                                ReadTransaction.of(fakeItemMappedTable, GetItem.of(FAKE_ITEM_KEYS.get(1))));
-
-        List<TransactGetItem> transactGetItems = Arrays.asList(
-            TransactGetItem.builder()
-                           .get(Get.builder().tableName(TABLE_NAME).key(FAKE_ITEM_MAPS.get(0)).build())
-                           .build(),
-            TransactGetItem.builder()
-                           .get(Get.builder().tableName(TABLE_NAME_2).key(FAKESORT_ITEM_MAPS.get(0)).build())
-                           .build(),
-            TransactGetItem.builder()
-                           .get(Get.builder().tableName(TABLE_NAME_2).key(FAKESORT_ITEM_MAPS.get(1)).build())
-                           .build(),
-            TransactGetItem.builder()
-                           .get(Get.builder().tableName(TABLE_NAME).key(FAKE_ITEM_MAPS.get(1)).build())
-                           .build());
-        TransactGetItemsRequest expectedRequest =
-            TransactGetItemsRequest.builder()
-                                   .transactItems(transactGetItems)
-                                   .build();
-
-        TransactGetItemsRequest actualRequest = operation.generateRequest(null);
-
-        assertThat(actualRequest, is(expectedRequest));
-    }
-
-    @Test
-    public void getServiceCall_makesTheRightCallAndReturnsResponse() {
-        TransactGetItems operation =
-            TransactGetItems.of(ReadTransaction.of(fakeItemMappedTable, GetItem.of(FAKE_ITEM_KEYS.get(0))));
-
-        TransactGetItem transactGetItem =
-            TransactGetItem.builder()
-                           .get(Get.builder().tableName(TABLE_NAME).key(FAKE_ITEM_MAPS.get(0)).build())
-                           .build();
-
-        TransactGetItemsRequest transactGetItemsRequest =
-            TransactGetItemsRequest.builder()
-                                   .transactItems(singletonList(transactGetItem))
-                                   .build();
-
-        TransactGetItemsResponse expectedResponse = TransactGetItemsResponse.builder().build();
-        when(mockDynamoDbClient.transactGetItems(any(TransactGetItemsRequest.class))).thenReturn(expectedResponse);
-
-        TransactGetItemsResponse response = operation.getServiceCall(mockDynamoDbClient).apply(transactGetItemsRequest);
-
-        assertThat(response, sameInstance(expectedResponse));
-        verify(mockDynamoDbClient).transactGetItems(transactGetItemsRequest);
-    }
-
-    @Test
-    public void transformResponse_noExtension_returnsItemsFromDifferentTables() {
-        TransactGetItems operation = TransactGetItems.of();
-
-        List<ItemResponse> itemResponses = Arrays.asList(
-            ItemResponse.builder().item(FAKE_ITEM_MAPS.get(0)).build(),
-            ItemResponse.builder().item(FAKESORT_ITEM_MAPS.get(0)).build(),
-            ItemResponse.builder().item(FAKESORT_ITEM_MAPS.get(1)).build(),
-            ItemResponse.builder().item(FAKE_ITEM_MAPS.get(1)).build());
-        TransactGetItemsResponse response = TransactGetItemsResponse.builder()
-                                                                    .responses(itemResponses)
-                                                                    .build();
-
-        List<UnmappedItem> result = operation.transformResponse(response, null);
-
-        assertThat(result, contains(UnmappedItem.of(FAKE_ITEM_MAPS.get(0)),
-                                    UnmappedItem.of(FAKESORT_ITEM_MAPS.get(0)),
-                                    UnmappedItem.of(FAKESORT_ITEM_MAPS.get(1)),
-                                    UnmappedItem.of(FAKE_ITEM_MAPS.get(1))));
-    }
-
-    @Test
-    public void transformResponse_doesNotInteractWithExtension() {
-        TransactGetItems operation = TransactGetItems.of();
-
-        List<ItemResponse> itemResponses = Arrays.asList(
-            ItemResponse.builder().item(FAKE_ITEM_MAPS.get(0)).build(),
-            ItemResponse.builder().item(FAKESORT_ITEM_MAPS.get(0)).build(),
-            ItemResponse.builder().item(FAKESORT_ITEM_MAPS.get(1)).build(),
-            ItemResponse.builder().item(FAKE_ITEM_MAPS.get(1)).build());
-        TransactGetItemsResponse response = TransactGetItemsResponse.builder()
-                                                                    .responses(itemResponses)
-                                                                    .build();
-
-        operation.transformResponse(response, mockExtension);
-
-        verifyZeroInteractions(mockExtension);
-    }
-
-    @Test
-    public void transformResponse_noExtension_returnsNullsAsNulls() {
-        TransactGetItems operation = TransactGetItems.of();
-
-        List<ItemResponse> itemResponses = Arrays.asList(
-            ItemResponse.builder().item(FAKE_ITEM_MAPS.get(0)).build(),
-            ItemResponse.builder().item(FAKESORT_ITEM_MAPS.get(0)).build(),
-            null);
-        TransactGetItemsResponse response = TransactGetItemsResponse.builder()
-                                                                    .responses(itemResponses)
-                                                                    .build();
-
-        List<UnmappedItem> result = operation.transformResponse(response, null);
-
-        assertThat(result, contains(UnmappedItem.of(FAKE_ITEM_MAPS.get(0)),
-                                    UnmappedItem.of(FAKESORT_ITEM_MAPS.get(0)),
-                                    null));
-    }
-
-    @Test
-    public void transformResponse_noExtension_returnsEmptyAsNull() {
-        TransactGetItems operation = TransactGetItems.of();
-
-        List<ItemResponse> itemResponses = Arrays.asList(
-            ItemResponse.builder().item(FAKE_ITEM_MAPS.get(0)).build(),
-            ItemResponse.builder().item(FAKESORT_ITEM_MAPS.get(0)).build(),
-            ItemResponse.builder().item(emptyMap()).build());
-        TransactGetItemsResponse response = TransactGetItemsResponse.builder()
-                                                                    .responses(itemResponses)
-                                                                    .build();
-
-        List<UnmappedItem> result = operation.transformResponse(response, null);
-
-        assertThat(result, contains(UnmappedItem.of(FAKE_ITEM_MAPS.get(0)),
-                                    UnmappedItem.of(FAKESORT_ITEM_MAPS.get(0)),
-                                    UnmappedItem.of(emptyMap())));
-    }
-}
\ No newline at end of file
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/operations/TransactWriteItemsTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/operations/TransactWriteItemsTest.java
deleted file mode 100644
index 0d5ec34fd13c..000000000000
--- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/operations/TransactWriteItemsTest.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.extensions.dynamodb.mappingclient.operations;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.sameInstance;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.lenient;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyZeroInteractions;
-import static org.mockito.Mockito.when;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Map;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
-
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.MapperExtension;
-import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-import software.amazon.awssdk.services.dynamodb.model.Delete;
-import software.amazon.awssdk.services.dynamodb.model.Put;
-import software.amazon.awssdk.services.dynamodb.model.TransactWriteItem;
-import software.amazon.awssdk.services.dynamodb.model.TransactWriteItemsRequest;
-import software.amazon.awssdk.services.dynamodb.model.TransactWriteItemsResponse;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.functionaltests.models.FakeItem;
-
-@RunWith(MockitoJUnitRunner.class)
-public class TransactWriteItemsTest {
-    private final FakeItem fakeItem1 = FakeItem.createUniqueFakeItem();
-    private final FakeItem fakeItem2 = FakeItem.createUniqueFakeItem();
-    private final Map<String, AttributeValue> fakeItemMap1 = FakeItem.getTableSchema().itemToMap(fakeItem1, true);
-    private final Map<String, AttributeValue> fakeItemMap2 = FakeItem.getTableSchema().itemToMap(fakeItem2, true);
-
-    @Mock
-    private WriteTransaction mockWriteTransaction1;
-    @Mock
-    private WriteTransaction mockWriteTransaction2;
-    @Mock
-    private MapperExtension mockMapperExtension;
-    @Mock
-    private DynamoDbClient mockDynamoDbClient;
-
-    private TransactWriteItem fakeTransactWriteItem1 = TransactWriteItem.builder()
-                                                                        .put(Put.builder()
-                                                                                .item(fakeItemMap1)
-                                                                                .build())
-                                                                        .build();
-
-    private TransactWriteItem fakeTransactWriteItem2 = TransactWriteItem.builder()
-                                                                        .delete(Delete.builder()
-                                                                                      .key(fakeItemMap2)
-                                                                                      .build())
-                                                                        .build();
-
-    @Before
-    public void stubMocks() {
-        lenient().when(mockWriteTransaction1.generateRequest()).thenReturn(fakeTransactWriteItem1);
-        lenient().when(mockWriteTransaction2.generateRequest()).thenReturn(fakeTransactWriteItem2);
-    }
-
-    @Test
-    public void generateRequest_multipleTransactions() {
-        TransactWriteItems operation = TransactWriteItems.of(Arrays.asList(mockWriteTransaction1,
-                                                                           mockWriteTransaction2));
-
-        TransactWriteItemsRequest actualRequest = operation.generateRequest(mockMapperExtension);
-
-        TransactWriteItemsRequest expectedRequest =
-            TransactWriteItemsRequest.builder()
-                                     .transactItems(Arrays.asList(fakeTransactWriteItem1, fakeTransactWriteItem2))
-                                     .build();
-        assertThat(actualRequest, is(expectedRequest));
-        verifyZeroInteractions(mockMapperExtension);
-    }
-
-    @Test
-    public void generateRequest_singleTransaction() {
-        TransactWriteItems operation = TransactWriteItems.of(mockWriteTransaction1);
-
-        TransactWriteItemsRequest actualRequest = operation.generateRequest(mockMapperExtension);
-
-        TransactWriteItemsRequest expectedRequest =
-            TransactWriteItemsRequest.builder()
-                                     .transactItems(Collections.singletonList(fakeTransactWriteItem1))
-                                     .build();
-        assertThat(actualRequest, is(expectedRequest));
-        verifyZeroInteractions(mockMapperExtension);
-    }
-
-    @Test
-    public void generateRequest_noTransactions() {
-        TransactWriteItems operation = TransactWriteItems.of();
-
-        TransactWriteItemsRequest actualRequest = operation.generateRequest(mockMapperExtension);
-
-        TransactWriteItemsRequest expectedRequest =
-            TransactWriteItemsRequest.builder()
-                                     .build();
-        assertThat(actualRequest, is(expectedRequest));
-        verifyZeroInteractions(mockMapperExtension);
-    }
-
-    @Test
-    public void getServiceCall_callsServiceAndReturnsResult() {
-        TransactWriteItems operation = TransactWriteItems.of();
-        TransactWriteItemsRequest request =
-            TransactWriteItemsRequest.builder()
-                                     .transactItems(Collections.singletonList(fakeTransactWriteItem1))
-                                     .build();
-        TransactWriteItemsResponse expectedResponse = TransactWriteItemsResponse.builder()
-                                                                                .build();
-        when(mockDynamoDbClient.transactWriteItems(any(TransactWriteItemsRequest.class))).thenReturn(expectedResponse);
-
-        TransactWriteItemsResponse actualResponse = operation.getServiceCall(mockDynamoDbClient).apply(request);
-
-        assertThat(actualResponse, is(sameInstance(expectedResponse)));
-        verify(mockDynamoDbClient).transactWriteItems(request);
-        verifyZeroInteractions(mockMapperExtension);
-    }
-
-    @Test
-    public void transformResponse_doesNothing() {
-        TransactWriteItems operation = TransactWriteItems.of();
-        TransactWriteItemsResponse response = TransactWriteItemsResponse.builder().build();
-
-        operation.transformResponse(response, mockMapperExtension);
-
-        verifyZeroInteractions(mockMapperExtension);
-    }
-}
\ No newline at end of file
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/operations/UnmappedItemTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/operations/UnmappedItemTest.java
deleted file mode 100644
index 648a93582f5f..000000000000
--- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/operations/UnmappedItemTest.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.extensions.dynamodb.mappingclient.operations;
-
-import static java.util.Collections.emptyMap;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.nullValue;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyMap;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import java.util.Map;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
-
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.MappedDatabase;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.MappedTable;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.MapperExtension;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.OperationContext;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.extensions.ReadModification;
-import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.functionaltests.models.FakeItem;
-
-@RunWith(MockitoJUnitRunner.class)
-public class UnmappedItemTest {
-    private static final String TABLE_NAME = "table-name";
-
-    @Mock
-    DynamoDbClient mockDynamoDbClient;
-
-    @Mock
-    MapperExtension mockMapperExtension;
-
-    private MappedTable<FakeItem> createMappedTable(MapperExtension mapperExtension) {
-        return MappedDatabase.builder()
-                             .dynamoDbClient(mockDynamoDbClient)
-                             .extendWith(mapperExtension)
-                             .build()
-                             .table(TABLE_NAME, FakeItem.getTableSchema());
-    }
-
-    @Test
-    public void noExtension_mapsToItem() {
-        FakeItem fakeItem = FakeItem.createUniqueFakeItem();
-        Map<String, AttributeValue> fakeItemMap = FakeItem.getTableSchema().itemToMap(fakeItem, true);
-        UnmappedItem unmappedItem = UnmappedItem.of(fakeItemMap);
-
-        assertThat(unmappedItem.getItem(createMappedTable(null)), is(fakeItem));
-    }
-
-    @Test
-    public void extension_mapsToItem() {
-        FakeItem fakeItem = FakeItem.createUniqueFakeItem();
-        FakeItem fakeItem2 = FakeItem.createUniqueFakeItem();
-        Map<String, AttributeValue> fakeItemMap = FakeItem.getTableSchema().itemToMap(fakeItem, true);
-        Map<String, AttributeValue> fakeItemMap2 = FakeItem.getTableSchema().itemToMap(fakeItem2, true);
-        when(mockMapperExtension.afterRead(anyMap(), any(), any()))
-            .thenReturn(ReadModification.builder().transformedItem(fakeItemMap2).build());
-
-        UnmappedItem unmappedItem = UnmappedItem.of(fakeItemMap);
-
-        MappedTable<FakeItem> mappedTable = createMappedTable(mockMapperExtension);
-        assertThat(unmappedItem.getItem(mappedTable), is(fakeItem2));
-        verify(mockMapperExtension).afterRead(fakeItemMap,
-                                              OperationContext.of(mappedTable.getTableName()),
-                                              FakeItem.getTableMetadata());
-    }
-
-    @Test
-    public void nullMapReturnsNullItem() {
-        UnmappedItem unmappedItem = UnmappedItem.of(null);
-
-        assertThat(unmappedItem.getItem(createMappedTable(null)), is(nullValue()));
-    }
-
-    @Test
-    public void emptyMapReturnsNullItem() {
-        UnmappedItem unmappedItem = UnmappedItem.of(emptyMap());
-
-        assertThat(unmappedItem.getItem(createMappedTable(null)), is(nullValue()));
-    }
-
-}
\ No newline at end of file
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/operations/UpdateItemTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/operations/UpdateItemTest.java
deleted file mode 100644
index a3e8e33a9643..000000000000
--- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/operations/UpdateItemTest.java
+++ /dev/null
@@ -1,650 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.extensions.dynamodb.mappingclient.operations;
-
-import static java.util.Collections.singletonList;
-import static java.util.Collections.singletonMap;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.containsString;
-import static org.hamcrest.Matchers.either;
-import static org.hamcrest.Matchers.hasEntry;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.nullValue;
-import static org.hamcrest.Matchers.sameInstance;
-import static org.junit.Assert.fail;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyMap;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.AttributeValues.stringValue;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.functionaltests.models.FakeItem.createUniqueFakeItem;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.functionaltests.models.FakeItemWithSort.createUniqueFakeItemWithSort;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
-
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.Expression;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.MapperExtension;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.OperationContext;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.TableMetadata;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.extensions.ReadModification;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.extensions.WriteModification;
-import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-import software.amazon.awssdk.services.dynamodb.model.ReturnValue;
-import software.amazon.awssdk.services.dynamodb.model.TransactWriteItem;
-import software.amazon.awssdk.services.dynamodb.model.Update;
-import software.amazon.awssdk.services.dynamodb.model.UpdateItemRequest;
-import software.amazon.awssdk.services.dynamodb.model.UpdateItemResponse;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.functionaltests.models.FakeItem;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.functionaltests.models.FakeItemWithSort;
-
-@RunWith(MockitoJUnitRunner.class)
-public class UpdateItemTest {
-    private static final String TABLE_NAME = "table-name";
-    private static final String OTHER_ATTRIBUTE_1_NAME = "#AMZN_MAPPED_other_attribute_1";
-    private static final String OTHER_ATTRIBUTE_2_NAME = "#AMZN_MAPPED_other_attribute_2";
-    private static final String SUBCLASS_ATTRIBUTE_NAME = "#AMZN_MAPPED_subclass_attribute";
-    private static final String OTHER_ATTRIBUTE_1_VALUE = ":AMZN_MAPPED_other_attribute_1";
-    private static final String OTHER_ATTRIBUTE_2_VALUE = ":AMZN_MAPPED_other_attribute_2";
-    private static final String SUBCLASS_ATTRIBUTE_VALUE = ":AMZN_MAPPED_subclass_attribute";
-
-    private static final OperationContext PRIMARY_CONTEXT =
-        OperationContext.of(TABLE_NAME, TableMetadata.getPrimaryIndexName());
-    private static final OperationContext GSI_1_CONTEXT =
-        OperationContext.of(TABLE_NAME, "gsi_1");
-
-    @Mock
-    private DynamoDbClient mockDynamoDbClient;
-
-    @Mock
-    private MapperExtension mockMapperExtension;
-
-    @Test
-    public void getServiceCall_makesTheRightCallAndReturnsResponse() {
-        FakeItem item = createUniqueFakeItem();
-        UpdateItem<FakeItem> updateItemOperation = UpdateItem.of(item);
-        UpdateItemRequest updateItemRequest = UpdateItemRequest.builder().tableName(TABLE_NAME).build();
-        UpdateItemResponse expectedResponse = UpdateItemResponse.builder().build();
-        when(mockDynamoDbClient.updateItem(any(UpdateItemRequest.class))).thenReturn(expectedResponse);
-
-        UpdateItemResponse response = updateItemOperation.getServiceCall(mockDynamoDbClient).apply(updateItemRequest);
-
-        assertThat(response, sameInstance(expectedResponse));
-        verify(mockDynamoDbClient).updateItem(updateItemRequest);
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void generateRequest_withIndex_throwsIllegalArgumentException() {
-        FakeItem item = createUniqueFakeItem();
-        UpdateItem<FakeItem> updateItemOperation = UpdateItem.of(item);
-
-        updateItemOperation.generateRequest(FakeItem.getTableSchema(), GSI_1_CONTEXT, null);
-    }
-
-    @Test
-    public void generateRequest_nullValuesNotIgnoredByDefault() {
-        FakeItemWithSort item = createUniqueFakeItemWithSort();
-        item.setOtherAttribute1("value-1");
-        UpdateItem<FakeItemWithSort> updateItemOperation = UpdateItem.of(item);
-        Map<String, AttributeValue> expectedKey = new HashMap<>();
-        expectedKey.put("id", AttributeValue.builder().s(item.getId()).build());
-        expectedKey.put("sort", AttributeValue.builder().s(item.getSort()).build());
-        Map<String, AttributeValue> expectedValues = new HashMap<>();
-        expectedValues.put(OTHER_ATTRIBUTE_1_VALUE, AttributeValue.builder().s("value-1").build());
-        Map<String, String> expectedNames = new HashMap<>();
-        expectedNames.put(OTHER_ATTRIBUTE_1_NAME, "other_attribute_1");
-        expectedNames.put(OTHER_ATTRIBUTE_2_NAME, "other_attribute_2");
-        UpdateItemRequest.Builder baseExpectedRequest = UpdateItemRequest.builder()
-                                                                         .tableName(TABLE_NAME)
-                                                                         .expressionAttributeValues(expectedValues)
-                                                                         .expressionAttributeNames(expectedNames)
-                                                                         .key(expectedKey)
-                                                                         .returnValues(ReturnValue.ALL_NEW);
-        UpdateItemRequest expectedRequest =
-            baseExpectedRequest.updateExpression("SET " + OTHER_ATTRIBUTE_1_NAME + " = " + OTHER_ATTRIBUTE_1_VALUE +
-                                                 " REMOVE " + OTHER_ATTRIBUTE_2_NAME)
-                               .build();
-
-        UpdateItemRequest request = updateItemOperation.generateRequest(FakeItemWithSort.getTableSchema(),
-                                                                        PRIMARY_CONTEXT,
-                                                                        null);
-
-        assertThat(request, is(expectedRequest));
-    }
-
-    @Test
-    public void generateRequest_explicitlyUnsetIgnoreNulls() {
-        FakeItemWithSort item = createUniqueFakeItemWithSort();
-        item.setOtherAttribute1("value-1");
-        UpdateItem<FakeItemWithSort> updateItemOperation = UpdateItem.builder().item(item).ignoreNulls(false).build();
-        Map<String, AttributeValue> expectedKey = new HashMap<>();
-        expectedKey.put("id", AttributeValue.builder().s(item.getId()).build());
-        expectedKey.put("sort", AttributeValue.builder().s(item.getSort()).build());
-        Map<String, AttributeValue> expectedValues = new HashMap<>();
-        expectedValues.put(OTHER_ATTRIBUTE_1_VALUE, AttributeValue.builder().s("value-1").build());
-        Map<String, String> expectedNames = new HashMap<>();
-        expectedNames.put(OTHER_ATTRIBUTE_1_NAME, "other_attribute_1");
-        expectedNames.put(OTHER_ATTRIBUTE_2_NAME, "other_attribute_2");
-        UpdateItemRequest.Builder baseExpectedRequest = UpdateItemRequest.builder()
-                                                                         .tableName(TABLE_NAME)
-                                                                         .expressionAttributeValues(expectedValues)
-                                                                         .expressionAttributeNames(expectedNames)
-                                                                         .key(expectedKey)
-                                                                         .returnValues(ReturnValue.ALL_NEW);
-        UpdateItemRequest expectedRequest =
-            baseExpectedRequest.updateExpression("SET " + OTHER_ATTRIBUTE_1_NAME + " = " + OTHER_ATTRIBUTE_1_VALUE +
-                                                 " REMOVE " + OTHER_ATTRIBUTE_2_NAME)
-                               .build();
-
-        UpdateItemRequest request = updateItemOperation.generateRequest(FakeItemWithSort.getTableSchema(),
-                                                                        PRIMARY_CONTEXT,
-                                                                        null);
-
-        assertThat(request, is(expectedRequest));
-    }
-
-    @Test
-    public void generateRequest_multipleSetters() {
-        FakeItemWithSort item = createUniqueFakeItemWithSort();
-        item.setOtherAttribute1("value-1");
-        item.setOtherAttribute2("value-2");
-        UpdateItem<FakeItemWithSort> updateItemOperation = UpdateItem.builder().item(item).ignoreNulls(false).build();
-        Map<String, AttributeValue> expectedKey = new HashMap<>();
-        expectedKey.put("id", AttributeValue.builder().s(item.getId()).build());
-        expectedKey.put("sort", AttributeValue.builder().s(item.getSort()).build());
-        Map<String, AttributeValue> expectedValues = new HashMap<>();
-        expectedValues.put(OTHER_ATTRIBUTE_1_VALUE, AttributeValue.builder().s("value-1").build());
-        expectedValues.put(OTHER_ATTRIBUTE_2_VALUE, AttributeValue.builder().s("value-2").build());
-        Map<String, String> expectedNames = new HashMap<>();
-        expectedNames.put(OTHER_ATTRIBUTE_1_NAME, "other_attribute_1");
-        expectedNames.put(OTHER_ATTRIBUTE_2_NAME, "other_attribute_2");
-        UpdateItemRequest.Builder baseExpectedRequest = UpdateItemRequest.builder()
-                                                                         .tableName(TABLE_NAME)
-                                                                         .expressionAttributeValues(expectedValues)
-                                                                         .expressionAttributeNames(expectedNames)
-                                                                         .key(expectedKey)
-                                                                         .returnValues(ReturnValue.ALL_NEW);
-        UpdateItemRequest expectedRequest1 =
-            baseExpectedRequest.updateExpression("SET " + OTHER_ATTRIBUTE_1_NAME + " = " + OTHER_ATTRIBUTE_1_VALUE +
-                                                 ", " + OTHER_ATTRIBUTE_2_NAME + " = " + OTHER_ATTRIBUTE_2_VALUE)
-                               .build();
-        UpdateItemRequest expectedRequest2 =
-            baseExpectedRequest.updateExpression("SET " + OTHER_ATTRIBUTE_2_NAME + " = " + OTHER_ATTRIBUTE_2_VALUE +
-                                                 ", " + OTHER_ATTRIBUTE_1_NAME + " = " + OTHER_ATTRIBUTE_1_VALUE)
-                               .build();
-
-        UpdateItemRequest request = updateItemOperation.generateRequest(FakeItemWithSort.getTableSchema(),
-                                                                        PRIMARY_CONTEXT,
-                                                                        null);
-
-        assertThat(request, either(is(expectedRequest1)).or(is(expectedRequest2)));
-    }
-
-    @Test
-    public void generateRequest_multipleDeletes() {
-        FakeItemWithSort item = createUniqueFakeItemWithSort();
-        UpdateItem<FakeItemWithSort> updateItemOperation = UpdateItem.builder().item(item).ignoreNulls(false).build();
-        Map<String, AttributeValue> expectedKey = new HashMap<>();
-        expectedKey.put("id", AttributeValue.builder().s(item.getId()).build());
-        expectedKey.put("sort", AttributeValue.builder().s(item.getSort()).build());
-        Map<String, String> expectedNames = new HashMap<>();
-        expectedNames.put(OTHER_ATTRIBUTE_1_NAME, "other_attribute_1");
-        expectedNames.put(OTHER_ATTRIBUTE_2_NAME, "other_attribute_2");
-        UpdateItemRequest.Builder baseExpectedRequest = UpdateItemRequest.builder()
-                                                                         .tableName(TABLE_NAME)
-                                                                         .expressionAttributeNames(expectedNames)
-                                                                         .key(expectedKey)
-                                                                         .returnValues(ReturnValue.ALL_NEW);
-        UpdateItemRequest expectedRequest1 =
-            baseExpectedRequest.updateExpression("REMOVE " + OTHER_ATTRIBUTE_1_NAME + ", " + OTHER_ATTRIBUTE_2_NAME)
-                               .build();
-        UpdateItemRequest expectedRequest2 =
-            baseExpectedRequest.updateExpression("REMOVE " + OTHER_ATTRIBUTE_2_NAME + ", " + OTHER_ATTRIBUTE_1_NAME)
-                               .build();
-
-        UpdateItemRequest request = updateItemOperation.generateRequest(FakeItemWithSort.getTableSchema(),
-                                                                        PRIMARY_CONTEXT,
-                                                                        null);
-
-        assertThat(request,either(is(expectedRequest1)).or(is(expectedRequest2)));
-    }
-
-    @Test
-    public void generateRequest_canIgnoreNullValues() {
-        FakeItemWithSort item = createUniqueFakeItemWithSort();
-        item.setOtherAttribute1("value-1");
-        UpdateItem<FakeItemWithSort> updateItemOperation = UpdateItem.builder().item(item).ignoreNulls(true).build();
-        Map<String, AttributeValue> expectedKey = new HashMap<>();
-        expectedKey.put("id", AttributeValue.builder().s(item.getId()).build());
-        expectedKey.put("sort", AttributeValue.builder().s(item.getSort()).build());
-        Map<String, AttributeValue> expectedValues =
-            singletonMap(OTHER_ATTRIBUTE_1_VALUE, AttributeValue.builder().s("value-1").build());
-        Map<String, String> expectedNames = singletonMap(OTHER_ATTRIBUTE_1_NAME, "other_attribute_1");
-        UpdateItemRequest expectedRequest = UpdateItemRequest.builder()
-            .tableName(TABLE_NAME)
-            .updateExpression("SET " + OTHER_ATTRIBUTE_1_NAME + " = " + OTHER_ATTRIBUTE_1_VALUE)
-            .expressionAttributeValues(expectedValues)
-            .expressionAttributeNames(expectedNames)
-            .key(expectedKey)
-            .returnValues(ReturnValue.ALL_NEW)
-            .build();
-
-
-        UpdateItemRequest request = updateItemOperation.generateRequest(FakeItemWithSort.getTableSchema(),
-                                                                        PRIMARY_CONTEXT,
-                                                                        null);
-
-        assertThat(request, is(expectedRequest));
-    }
-
-    @Test
-    public void generateRequest_keyOnlyItem() {
-        FakeItemWithSort item = createUniqueFakeItemWithSort();
-        UpdateItem<FakeItemWithSort> updateItemOperation = UpdateItem.builder().item(item).ignoreNulls(true).build();
-        Map<String, AttributeValue> expectedKey = new HashMap<>();
-        expectedKey.put("id", AttributeValue.builder().s(item.getId()).build());
-        expectedKey.put("sort", AttributeValue.builder().s(item.getSort()).build());
-        UpdateItemRequest expectedRequest = UpdateItemRequest.builder()
-                                                             .tableName(TABLE_NAME)
-                                                             .key(expectedKey)
-                                                             .returnValues(ReturnValue.ALL_NEW)
-                                                             .build();
-
-
-        UpdateItemRequest request = updateItemOperation.generateRequest(FakeItemWithSort.getTableSchema(),
-                                                                        PRIMARY_CONTEXT,
-                                                                        null);
-
-        assertThat(request, is(expectedRequest));
-    }
-
-    @Test
-    public void generateRequest_withExtension_modifiesKeyPortionOfItem() {
-        FakeItem baseFakeItem = createUniqueFakeItem();
-        FakeItem fakeItem = createUniqueFakeItem();
-
-        Map<String, AttributeValue> baseMap = FakeItem.getTableSchema().itemToMap(baseFakeItem, false);
-        Map<String, AttributeValue> fakeMap = FakeItem.getTableSchema().itemToMap(fakeItem, false);
-        Map<String, AttributeValue> keyMap = FakeItem.getTableSchema().itemToMap(fakeItem, singletonList("id"));
-
-        when(mockMapperExtension.beforeWrite(anyMap(), any(), any()))
-            .thenReturn(WriteModification.builder().transformedItem(fakeMap).build());
-
-        UpdateItem<FakeItem> updateItemOperation = UpdateItem.of(baseFakeItem);
-
-        UpdateItemRequest request = updateItemOperation.generateRequest(FakeItem.getTableSchema(),
-                                                                        PRIMARY_CONTEXT,
-                                                                        mockMapperExtension);
-
-        assertThat(request.key(), is(keyMap));
-        verify(mockMapperExtension).beforeWrite(baseMap, PRIMARY_CONTEXT, FakeItem.getTableMetadata());
-    }
-
-    @Test
-    public void generateRequest_withExtension_modifiesUpdateExpression() {
-        FakeItem baseFakeItem = createUniqueFakeItem();
-        Map<String, AttributeValue> baseMap = new HashMap<>(FakeItem.getTableSchema().itemToMap(baseFakeItem, true));
-
-        Map<String, AttributeValue> fakeMap = new HashMap<>(baseMap);
-        fakeMap.put("subclass_attribute", AttributeValue.builder().s("1").build());
-
-        when(mockMapperExtension.beforeWrite(anyMap(), any(), any()))
-            .thenReturn(WriteModification.builder().transformedItem(fakeMap).build());
-
-
-        UpdateItem<FakeItem> updateItemOperation = UpdateItem.builder()
-                                                             .item(baseFakeItem)
-                                                             .ignoreNulls(true)
-                                                             .build();
-
-        UpdateItemRequest request = updateItemOperation.generateRequest(FakeItem.getTableSchema(),
-                                                                        PRIMARY_CONTEXT,
-                                                                        mockMapperExtension);
-
-        assertThat(request.updateExpression(), is("SET " + SUBCLASS_ATTRIBUTE_NAME + " = " + SUBCLASS_ATTRIBUTE_VALUE));
-        assertThat(request.expressionAttributeValues(), hasEntry(SUBCLASS_ATTRIBUTE_VALUE,
-            AttributeValue.builder().s("1").build()));
-        assertThat(request.expressionAttributeNames(), hasEntry(SUBCLASS_ATTRIBUTE_NAME, "subclass_attribute"));
-    }
-
-    @Test
-    public void transformResponse_mapsAttributesReturnedInResponse() {
-        FakeItem fakeItem1 = FakeItem.createUniqueFakeItem();
-        FakeItem fakeItem2 = FakeItem.createUniqueFakeItem();
-        Map<String, AttributeValue> fakeItem2Attributes = FakeItem.getTableSchema().itemToMap(fakeItem2, true);
-
-        UpdateItem<FakeItem> updateItemOperation = UpdateItem.of(fakeItem1);
-
-        FakeItem result = updateItemOperation.transformResponse(
-            UpdateItemResponse.builder().attributes(fakeItem2Attributes).build(),
-            FakeItem.getTableSchema(),
-            PRIMARY_CONTEXT,
-            null);
-
-        assertThat(result, is(fakeItem2));
-    }
-
-    @Test
-    public void generateRequest_withExtensions_singleCondition() {
-        FakeItem baseFakeItem = createUniqueFakeItem();
-        FakeItem fakeItem = createUniqueFakeItem();
-        Map<String, AttributeValue> fakeMap = FakeItem.getTableSchema().itemToMap(fakeItem, true);
-        Expression condition = Expression.builder().expression("condition").expressionValues(fakeMap).build();
-        when(mockMapperExtension.beforeWrite(anyMap(), any(), any()))
-            .thenReturn(WriteModification.builder().additionalConditionalExpression(condition).build());
-        UpdateItem<FakeItem> updateItemOperation = UpdateItem.builder()
-                                                             .item(baseFakeItem)
-                                                             .ignoreNulls(true)
-                                                             .build();
-
-        UpdateItemRequest request = updateItemOperation.generateRequest(FakeItem.getTableSchema(),
-                                                                        PRIMARY_CONTEXT,
-                                                                        mockMapperExtension);
-
-        assertThat(request.conditionExpression(), is("condition"));
-        assertThat(request.expressionAttributeValues(), is(fakeMap));
-    }
-
-    @Test
-    public void generateRequest_withExtensions_conflictingExpressionValue_throwsRuntimeException() {
-        FakeItem baseFakeItem = createUniqueFakeItem();
-        baseFakeItem.setSubclassAttribute("something");
-        Map<String, AttributeValue> values = singletonMap(SUBCLASS_ATTRIBUTE_VALUE,
-                                                          AttributeValue.builder().s("1").build());
-        Expression condition1 = Expression.builder().expression("condition1").expressionValues(values).build();
-        when(mockMapperExtension.beforeWrite(anyMap(), any(), any()))
-            .thenReturn(WriteModification.builder().additionalConditionalExpression(condition1).build());
-
-
-        UpdateItem<FakeItem> updateItemOperation = UpdateItem.builder()
-                                                             .item(baseFakeItem)
-                                                             .ignoreNulls(true)
-                                                             .build();
-
-        try {
-            updateItemOperation.generateRequest(FakeItem.getTableSchema(), PRIMARY_CONTEXT, mockMapperExtension);
-
-            fail("Exception should be thrown");
-        } catch (RuntimeException e) {
-            assertThat(e.getMessage(), containsString("subclass_attribute"));
-        }
-    }
-
-    @Test
-    public void generateRequest_withExtensions_conflictingExpressionName_throwsRuntimeException() {
-        FakeItem baseFakeItem = createUniqueFakeItem();
-        baseFakeItem.setSubclassAttribute("something");
-        Map<String, String> names = singletonMap(SUBCLASS_ATTRIBUTE_NAME, "conflict");
-        Expression condition1 = Expression.builder().expression("condition1").expressionNames(names).build();
-        when(mockMapperExtension.beforeWrite(anyMap(), any(), any()))
-            .thenReturn(WriteModification.builder().additionalConditionalExpression(condition1).build());
-
-
-        UpdateItem<FakeItem> updateItemOperation = UpdateItem.builder()
-                                                             .item(baseFakeItem)
-                                                             .ignoreNulls(true)
-                                                             .build();
-
-        try {
-            updateItemOperation.generateRequest(FakeItem.getTableSchema(), PRIMARY_CONTEXT, mockMapperExtension);
-
-            fail("Exception should be thrown");
-        } catch (RuntimeException e) {
-            assertThat(e.getMessage(), containsString("subclass_attribute"));
-        }
-    }
-
-    @Test
-    public void generateRequest_withExtension_correctlyCoalescesIdenticalExpressionValues() {
-        FakeItem baseFakeItem = createUniqueFakeItem();
-        baseFakeItem.setSubclassAttribute("something");
-        Map<String, AttributeValue> values = singletonMap(SUBCLASS_ATTRIBUTE_VALUE,
-                                                           AttributeValue.builder().s("something").build());
-        Expression condition = Expression.builder().expression("condition").expressionValues(values).build();
-        when(mockMapperExtension.beforeWrite(anyMap(), any(), any()))
-            .thenReturn(WriteModification.builder().additionalConditionalExpression(condition).build());
-
-
-        UpdateItem<FakeItem> updateItemOperation = UpdateItem.builder()
-                                                             .item(baseFakeItem)
-                                                             .ignoreNulls(true)
-                                                             .build();
-
-        UpdateItemRequest request = updateItemOperation.generateRequest(FakeItem.getTableSchema(),
-                                                                        PRIMARY_CONTEXT,
-                                                                        mockMapperExtension);
-
-        assertThat(request.expressionAttributeValues(), is(values));
-    }
-
-    @Test
-    public void generateRequest_withExtension_correctlyCoalescesIdenticalExpressionNames() {
-        FakeItem baseFakeItem = createUniqueFakeItem();
-        baseFakeItem.setSubclassAttribute("something");
-        Map<String, String> names = singletonMap(SUBCLASS_ATTRIBUTE_NAME, "subclass_attribute");
-        Expression condition = Expression.builder().expression("condition").expressionNames(names).build();
-        when(mockMapperExtension.beforeWrite(anyMap(), any(), any()))
-            .thenReturn(WriteModification.builder().additionalConditionalExpression(condition).build());
-
-
-        UpdateItem<FakeItem> updateItemOperation = UpdateItem.builder()
-                                                             .item(baseFakeItem)
-                                                             .ignoreNulls(true)
-                                                             .build();
-
-        UpdateItemRequest request = updateItemOperation.generateRequest(FakeItem.getTableSchema(),
-                                                                        PRIMARY_CONTEXT,
-                                                                        mockMapperExtension);
-
-        assertThat(request.expressionAttributeNames(), is(names));
-    }
-
-    @Test
-    public void generateRequest_withExtension_noModifications() {
-        FakeItem baseFakeItem = createUniqueFakeItem();
-        when(mockMapperExtension.beforeWrite(anyMap(), any(), any()))
-            .thenReturn(WriteModification.builder().build());
-        UpdateItem<FakeItem> updateItemOperation = UpdateItem.builder()
-                                                             .item(baseFakeItem)
-                                                             .ignoreNulls(true)
-                                                             .build();
-
-        UpdateItemRequest request = updateItemOperation.generateRequest(FakeItem.getTableSchema(),
-                                                                        PRIMARY_CONTEXT,
-                                                                        mockMapperExtension);
-        assertThat(request.conditionExpression(), is(nullValue()));
-        assertThat(request.expressionAttributeValues().size(), is(0));
-    }
-
-    @Test
-    public void generateRequest_withExtension_conditionAndModification() {
-        FakeItem baseFakeItem = createUniqueFakeItem();
-        Map<String, AttributeValue> baseMap = new HashMap<>(FakeItem.getTableSchema().itemToMap(baseFakeItem, true));
-
-        Map<String, AttributeValue> fakeMap = new HashMap<>(baseMap);
-        fakeMap.put("subclass_attribute", AttributeValue.builder().s("1").build());
-
-        Map<String, AttributeValue> conditionValues = new HashMap<>();
-        conditionValues.put(":condition_value", AttributeValue.builder().s("2").build());
-
-        when(mockMapperExtension.beforeWrite(anyMap(), any(), any()))
-            .thenReturn(WriteModification.builder()
-                                         .transformedItem(fakeMap)
-                                         .additionalConditionalExpression(Expression.builder()
-                                                                                    .expression("condition")
-                                                                                    .expressionValues(conditionValues)
-                                                                                    .build())
-                                         .build());
-
-        UpdateItem<FakeItem> updateItemOperation = UpdateItem.builder()
-                                                             .item(baseFakeItem)
-                                                             .ignoreNulls(true)
-                                                             .build();
-
-        UpdateItemRequest request = updateItemOperation.generateRequest(FakeItem.getTableSchema(),
-                                                                        PRIMARY_CONTEXT,
-                                                                        mockMapperExtension);
-
-        assertThat(request.updateExpression(), is("SET " + SUBCLASS_ATTRIBUTE_NAME + " = " + SUBCLASS_ATTRIBUTE_VALUE));
-        assertThat(request.expressionAttributeValues(), hasEntry(SUBCLASS_ATTRIBUTE_VALUE,
-                                                                 AttributeValue.builder().s("1").build()));
-        assertThat(request.expressionAttributeValues(), hasEntry(":condition_value",
-                                                                 AttributeValue.builder().s("2").build()));
-        assertThat(request.expressionAttributeNames(), hasEntry(SUBCLASS_ATTRIBUTE_NAME, "subclass_attribute"));
-    }
-
-    @Test
-    public void transformResponse_withExtension_returnsCorrectTransformedItem() {
-        FakeItem baseFakeItem = createUniqueFakeItem();
-        FakeItem fakeItem = createUniqueFakeItem();
-        Map<String, AttributeValue> baseFakeMap = FakeItem.getTableSchema().itemToMap(baseFakeItem, true);
-        Map<String, AttributeValue> fakeMap = FakeItem.getTableSchema().itemToMap(fakeItem, true);
-        UpdateItem<FakeItem> updateItemOperation = UpdateItem.builder()
-                                                             .item(baseFakeItem)
-                                                             .ignoreNulls(true)
-                                                             .build();
-        when(mockMapperExtension.afterRead(anyMap(), any(), any())).thenReturn(
-            ReadModification.builder().transformedItem(fakeMap).build());
-        UpdateItemResponse response = UpdateItemResponse.builder()
-                                                        .attributes(baseFakeMap)
-                                                        .build();
-
-        FakeItem resultItem = updateItemOperation.transformResponse(response, FakeItem.getTableSchema(),
-                                                                    PRIMARY_CONTEXT,
-                                                                    mockMapperExtension);
-
-        assertThat(resultItem, is(fakeItem));
-        verify(mockMapperExtension).afterRead(baseFakeMap, PRIMARY_CONTEXT, FakeItem.getTableMetadata());
-    }
-
-    @Test
-    public void transformResponse_withNoOpExtension_returnsCorrectItem() {
-        FakeItem baseFakeItem = createUniqueFakeItem();
-        Map<String, AttributeValue> baseFakeMap = FakeItem.getTableSchema().itemToMap(baseFakeItem, true);
-        UpdateItem<FakeItem> updateItemOperation = UpdateItem.builder()
-                                                             .item(baseFakeItem)
-                                                             .ignoreNulls(true)
-                                                             .build();
-        when(mockMapperExtension.afterRead(anyMap(), any(), any())).thenReturn(
-            ReadModification.builder().build());
-        UpdateItemResponse response = UpdateItemResponse.builder()
-                                                        .attributes(baseFakeMap)
-                                                        .build();
-
-        FakeItem resultItem = updateItemOperation.transformResponse(response, FakeItem.getTableSchema(),
-                                                                    PRIMARY_CONTEXT, mockMapperExtension);
-
-        assertThat(resultItem, is(baseFakeItem));
-        verify(mockMapperExtension).afterRead(baseFakeMap, PRIMARY_CONTEXT, FakeItem.getTableMetadata());
-    }
-
-    @Test(expected = IllegalStateException.class)
-    public void transformResponse_afterReadThrowsException_throwsIllegalStateException() {
-        when(mockMapperExtension.afterRead(anyMap(), any(), any())).thenThrow(RuntimeException.class);
-        UpdateItem<FakeItem> updateItemOperation = UpdateItem.of(createUniqueFakeItem());
-
-        UpdateItemResponse response =
-            UpdateItemResponse.builder()
-                              .attributes(FakeItem.getTableSchema().itemToMap(FakeItem.createUniqueFakeItem(), true))
-                              .build();
-
-        updateItemOperation.transformResponse(response, FakeItem.getTableSchema(), PRIMARY_CONTEXT, mockMapperExtension);
-    }
-
-    @Test
-    public void generateTransactWriteItem_basicRequest() {
-        FakeItem fakeItem = createUniqueFakeItem();
-        Map<String, AttributeValue> fakeItemMap = FakeItem.getTableSchema().itemToMap(fakeItem, true);
-        UpdateItem<FakeItem> updateItemOperation = spy(UpdateItem.of(fakeItem));
-        OperationContext context = OperationContext.of(TABLE_NAME, TableMetadata.getPrimaryIndexName());
-        String updateExpression = "update-expression";
-        Map<String, AttributeValue> attributeValues = Collections.singletonMap("key", stringValue("value1"));
-        Map<String, String> attributeNames = Collections.singletonMap("key", "value2");
-
-        UpdateItemRequest updateItemRequest = UpdateItemRequest.builder()
-                                                               .tableName(TABLE_NAME)
-                                                               .key(fakeItemMap)
-                                                               .updateExpression(updateExpression)
-                                                               .expressionAttributeValues(attributeValues)
-                                                               .expressionAttributeNames(attributeNames)
-                                                               .build();
-        doReturn(updateItemRequest).when(updateItemOperation).generateRequest(any(), any(), any());
-
-        TransactWriteItem actualResult = updateItemOperation.generateTransactWriteItem(FakeItem.getTableSchema(),
-                                                                                       context,
-                                                                                       mockMapperExtension);
-
-        TransactWriteItem expectedResult = TransactWriteItem.builder()
-                                                            .update(Update.builder()
-                                                                          .key(fakeItemMap)
-                                                                          .tableName(TABLE_NAME)
-                                                                          .updateExpression(updateExpression)
-                                                                          .expressionAttributeNames(attributeNames)
-                                                                          .expressionAttributeValues(attributeValues)
-                                                                          .build())
-                                                            .build();
-        assertThat(actualResult, is(expectedResult));
-        verify(updateItemOperation).generateRequest(FakeItem.getTableSchema(), context, mockMapperExtension);
-    }
-
-    @Test
-    public void generateTransactWriteItem_conditionalRequest() {
-        FakeItem fakeItem = createUniqueFakeItem();
-        Map<String, AttributeValue> fakeItemMap = FakeItem.getTableSchema().itemToMap(fakeItem, true);
-        UpdateItem<FakeItem> updateItemOperation = spy(UpdateItem.of(fakeItem));
-        OperationContext context = OperationContext.of(TABLE_NAME, TableMetadata.getPrimaryIndexName());
-        String updateExpression = "update-expression";
-        String conditionExpression = "condition-expression";
-        Map<String, AttributeValue> attributeValues = Collections.singletonMap("key", stringValue("value1"));
-        Map<String, String> attributeNames = Collections.singletonMap("key", "value2");
-
-        UpdateItemRequest updateItemRequest = UpdateItemRequest.builder()
-                                                               .tableName(TABLE_NAME)
-                                                               .key(fakeItemMap)
-                                                               .updateExpression(updateExpression)
-                                                               .conditionExpression(conditionExpression)
-                                                               .expressionAttributeValues(attributeValues)
-                                                               .expressionAttributeNames(attributeNames)
-                                                               .build();
-        doReturn(updateItemRequest).when(updateItemOperation).generateRequest(any(), any(), any());
-
-        TransactWriteItem actualResult = updateItemOperation.generateTransactWriteItem(FakeItem.getTableSchema(),
-                                                                                       context,
-                                                                                       mockMapperExtension);
-
-        TransactWriteItem expectedResult = TransactWriteItem.builder()
-                                                            .update(Update.builder()
-                                                                          .key(fakeItemMap)
-                                                                          .tableName(TABLE_NAME)
-                                                                          .updateExpression(updateExpression)
-                                                                          .conditionExpression(conditionExpression)
-                                                                          .expressionAttributeNames(attributeNames)
-                                                                          .expressionAttributeValues(attributeValues)
-                                                                          .build())
-                                                            .build();
-        assertThat(actualResult, is(expectedResult));
-        verify(updateItemOperation).generateRequest(FakeItem.getTableSchema(), context, mockMapperExtension);
-    }
-}
\ No newline at end of file
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/staticmapper/AttributeTagTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/staticmapper/AttributeTagTest.java
deleted file mode 100644
index fd29573e5220..000000000000
--- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/staticmapper/AttributeTagTest.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.extensions.dynamodb.mappingclient.staticmapper;
-
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
-
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
-
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.core.AttributeValueType;
-
-@RunWith(MockitoJUnitRunner.class)
-public class AttributeTagTest {
-    private static final Map<String, Object> CUSTOM_METADATA = IntStream.range(0, 2).mapToObj(Integer::toString)
-        .collect(Collectors.toMap(Function.identity(), Function.identity()));
-    private static final String ATTRIBUTE_NAME = "test-attribute";
-
-    @Mock
-    private StaticTableMetadata.Builder mockTableMetadata;
-
-    private static class KeyAttributeTag extends AttributeTag {
-        @Override
-        protected Map<String, Object> getCustomMetadataForAttribute(String attributeName,
-                                                                    AttributeValueType attributeValueType) {
-            return CUSTOM_METADATA;
-        }
-
-        @Override
-        protected boolean isKeyAttribute() {
-            return true;
-        }
-    }
-
-    private static class NonKeyAttributeTag extends AttributeTag {
-
-        @Override
-        protected Map<String, Object> getCustomMetadataForAttribute(String attributeName,
-                                                                    AttributeValueType attributeValueType) {
-            return CUSTOM_METADATA;
-        }
-
-        @Override
-        protected boolean isKeyAttribute() {
-            return false;
-        }
-    }
-
-    @Test
-    public void keyAttribute_setsTableMetadataCorrectly() {
-        AttributeTag attributeTag = new KeyAttributeTag();
-        attributeTag.setTableMetadataForAttribute(ATTRIBUTE_NAME, AttributeValueType.S, mockTableMetadata);
-        verify(mockTableMetadata).markAttributeAsKey(ATTRIBUTE_NAME, AttributeValueType.S);
-        verify(mockTableMetadata).addCustomMetadataObject("0", "0");
-        verify(mockTableMetadata).addCustomMetadataObject("1", "1");
-    }
-
-    @Test
-    public void nonKeyAttribute_setsTableMetadataCorrectly() {
-        AttributeTag attributeTag = new NonKeyAttributeTag();
-        attributeTag.setTableMetadataForAttribute(ATTRIBUTE_NAME, AttributeValueType.S, mockTableMetadata);
-        verify(mockTableMetadata, never()).markAttributeAsKey(ATTRIBUTE_NAME, AttributeValueType.S);
-        verify(mockTableMetadata).addCustomMetadataObject("0", "0");
-        verify(mockTableMetadata).addCustomMetadataObject("1", "1");
-    }
-
-}
\ No newline at end of file
diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/staticmapper/StaticTableSchemaTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/staticmapper/StaticTableSchemaTest.java
deleted file mode 100644
index be59df5e0a6f..000000000000
--- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/extensions/dynamodb/mappingclient/staticmapper/StaticTableSchemaTest.java
+++ /dev/null
@@ -1,1250 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.extensions.dynamodb.mappingclient.staticmapper;
-
-import static java.nio.charset.StandardCharsets.UTF_8;
-import static java.util.Arrays.asList;
-import static java.util.Collections.singletonList;
-import static java.util.Collections.singletonMap;
-import static java.util.stream.Collectors.toList;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.hasEntry;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.nullValue;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.AttributeValues.nullAttributeValue;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.AttributeValues.stringValue;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.staticmapper.Attributes.bool;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.staticmapper.Attributes.integerNumber;
-import static software.amazon.awssdk.extensions.dynamodb.mappingclient.staticmapper.Attributes.string;
-
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.Set;
-
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-
-import software.amazon.awssdk.core.SdkBytes;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.TableMetadata;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.TableSchema;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.staticmapper.Attribute.AttributeSupplier;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.functionaltests.models.FakeItem;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.functionaltests.models.FakeItemComposedClass;
-import software.amazon.awssdk.extensions.dynamodb.mappingclient.functionaltests.models.FakeItemWithSort;
-
-public class StaticTableSchemaTest {
-    private static final String TABLE_TAG_KEY = "table-tag-key";
-    private static final String TABLE_TAG_VALUE = "table-tag-value";
-    private static final AttributeValue ATTRIBUTE_VALUE_B = AttributeValue.builder().bool(true).build();
-    private static final AttributeValue ATTRIBUTE_VALUE_S = AttributeValue.builder().s("test-string").build();
-
-    private static final StaticTableSchema<FakeDocument> FAKE_DOCUMENT_TABLE_SCHEMA =
-        TableSchema.builder()
-                   .newItemSupplier(FakeDocument::new)
-                   .attributes(
-                       string("documentString", FakeDocument::getDocumentString, FakeDocument::setDocumentString),
-                       integerNumber("documentInteger", FakeDocument::getDocumentInteger, FakeDocument::setDocumentInteger))
-                   .build();
-
-    private static final FakeMappedItem FAKE_ITEM = FakeMappedItem.builder()
-                                                                  .aPrimitiveBoolean(true)
-                                                                  .aBoolean(true)
-                                                                  .aString("test-string")
-                                                                  .build();
-
-    private static class FakeMappedItem {
-        private boolean aPrimitiveBoolean;
-        private Boolean aBoolean;
-        private String aString;
-        private Integer anInteger;
-        private int aPrimitiveInteger;
-        private Byte aByte;
-        private byte aPrimitiveByte;
-        private Long aLong;
-        private long aPrimitiveLong;
-        private Short aShort;
-        private short aPrimitiveShort;
-        private Double aDouble;
-        private double aPrimitiveDouble;
-        private Float aFloat;
-        private float aPrimitiveFloat;
-        private ByteBuffer aBytebuffer;
-        private FakeDocument aFakeDocument;
-        private Set<String> aStringSet;
-        private Set<Integer> anIntegerSet;
-        private Set<Byte> aByteSet;
-        private Set<Long> aLongSet;
-        private Set<Short> aShortSet;
-        private Set<Double> aDoubleSet;
-        private Set<Float> aFloatSet;
-        private Set<ByteBuffer> aByteBufferSet;
-        private List<Integer> anIntegerList;
-        private List<List<FakeDocument>> aNestedStructure;
-        private Map<String, String> aStringMap;
-
-        FakeMappedItem() {
-        }
-
-        FakeMappedItem(boolean aPrimitiveBoolean, Boolean aBoolean, String aString, Integer anInteger,
-                       int aPrimitiveInteger, Byte aByte, byte aPrimitiveByte, Long aLong, long aPrimitiveLong,
-                       Short aShort, short aPrimitiveShort, Double aDouble, double aPrimitiveDouble, Float aFloat,
-                       float aPrimitiveFloat, ByteBuffer aBytebuffer, FakeDocument aFakeDocument,
-                       Set<String> aStringSet, Set<Integer> anIntegerSet, Set<Byte> aByteSet,
-                       Set<Long> aLongSet, Set<Short> aShortSet, Set<Double> aDoubleSet, Set<Float> aFloatSet,
-                       Set<ByteBuffer> aByteBufferSet, List<Integer> anIntegerList,
-                       List<List<FakeDocument>> aNestedStructure, Map<String, String> aStringMap) {
-            this.aPrimitiveBoolean = aPrimitiveBoolean;
-            this.aBoolean = aBoolean;
-            this.aString = aString;
-            this.anInteger = anInteger;
-            this.aPrimitiveInteger = aPrimitiveInteger;
-            this.aByte = aByte;
-            this.aPrimitiveByte = aPrimitiveByte;
-            this.aLong = aLong;
-            this.aPrimitiveLong = aPrimitiveLong;
-            this.aShort = aShort;
-            this.aPrimitiveShort = aPrimitiveShort;
-            this.aDouble = aDouble;
-            this.aPrimitiveDouble = aPrimitiveDouble;
-            this.aFloat = aFloat;
-            this.aPrimitiveFloat = aPrimitiveFloat;
-            this.aBytebuffer = aBytebuffer;
-            this.aFakeDocument = aFakeDocument;
-            this.aStringSet = aStringSet;
-            this.anIntegerSet = anIntegerSet;
-            this.aByteSet = aByteSet;
-            this.aLongSet = aLongSet;
-            this.aShortSet = aShortSet;
-            this.aDoubleSet = aDoubleSet;
-            this.aFloatSet = aFloatSet;
-            this.aByteBufferSet = aByteBufferSet;
-            this.anIntegerList = anIntegerList;
-            this.aNestedStructure = aNestedStructure;
-            this.aStringMap = aStringMap;
-        }
-        
-        public static Builder builder() {
-            return new Builder();
-        }
-
-        boolean isAPrimitiveBoolean() {
-            return aPrimitiveBoolean;
-        }
-
-        void setAPrimitiveBoolean(boolean aPrimitiveBoolean) {
-            this.aPrimitiveBoolean = aPrimitiveBoolean;
-        }
-
-        Boolean getABoolean() {
-            return aBoolean;
-        }
-
-        void setABoolean(Boolean aBoolean) {
-            this.aBoolean = aBoolean;
-        }
-
-        String getAString() {
-            return aString;
-        }
-
-        void setAString(String aString) {
-            this.aString = aString;
-        }
-
-        Integer getAnInteger() {
-            return anInteger;
-        }
-
-        void setAnInteger(Integer anInteger) {
-            this.anInteger = anInteger;
-        }
-
-        int getAPrimitiveInteger() {
-            return aPrimitiveInteger;
-        }
-
-        void setAPrimitiveInteger(int aPrimitiveInteger) {
-            this.aPrimitiveInteger = aPrimitiveInteger;
-        }
-
-        Byte getAByte() {
-            return aByte;
-        }
-
-        void setAByte(Byte aByte) {
-            this.aByte = aByte;
-        }
-
-        byte getAPrimitiveByte() {
-            return aPrimitiveByte;
-        }
-
-        void setAPrimitiveByte(byte aPrimitiveByte) {
-            this.aPrimitiveByte = aPrimitiveByte;
-        }
-
-        Long getALong() {
-            return aLong;
-        }
-
-        void setALong(Long aLong) {
-            this.aLong = aLong;
-        }
-
-        long getAPrimitiveLong() {
-            return aPrimitiveLong;
-        }
-
-        void setAPrimitiveLong(long aPrimitiveLong) {
-            this.aPrimitiveLong = aPrimitiveLong;
-        }
-
-        Short getAShort() {
-            return aShort;
-        }
-
-        void setAShort(Short aShort) {
-            this.aShort = aShort;
-        }
-
-        short getAPrimitiveShort() {
-            return aPrimitiveShort;
-        }
-
-        void setAPrimitiveShort(short aPrimitiveShort) {
-            this.aPrimitiveShort = aPrimitiveShort;
-        }
-
-        Double getADouble() {
-            return aDouble;
-        }
-
-        void setADouble(Double aDouble) {
-            this.aDouble = aDouble;
-        }
-
-        double getAPrimitiveDouble() {
-            return aPrimitiveDouble;
-        }
-
-        void setAPrimitiveDouble(double aPrimitiveDouble) {
-            this.aPrimitiveDouble = aPrimitiveDouble;
-        }
-
-        Float getAFloat() {
-            return aFloat;
-        }
-
-        void setAFloat(Float aFloat) {
-            this.aFloat = aFloat;
-        }
-
-        float getAPrimitiveFloat() {
-            return aPrimitiveFloat;
-        }
-
-        void setAPrimitiveFloat(float aPrimitiveFloat) {
-            this.aPrimitiveFloat = aPrimitiveFloat;
-        }
-
-        ByteBuffer getABytebuffer() {
-            return aBytebuffer;
-        }
-
-        void setABytebuffer(ByteBuffer aBytebuffer) {
-            this.aBytebuffer = aBytebuffer;
-        }
-
-        FakeDocument getAFakeDocument() {
-            return aFakeDocument;
-        }
-
-        void setAFakeDocument(FakeDocument aFakeDocument) {
-            this.aFakeDocument = aFakeDocument;
-        }
-
-        Set<String> getAStringSet() {
-            return aStringSet;
-        }
-
-        void setAStringSet(Set<String> aStringSet) {
-            this.aStringSet = aStringSet;
-        }
-
-        Set<Integer> getAnIntegerSet() {
-            return anIntegerSet;
-        }
-
-        void setAnIntegerSet(Set<Integer> anIntegerSet) {
-            this.anIntegerSet = anIntegerSet;
-        }
-
-        Set<Byte> getAByteSet() {
-            return aByteSet;
-        }
-
-        void setAByteSet(Set<Byte> aByteSet) {
-            this.aByteSet = aByteSet;
-        }
-
-        Set<Long> getALongSet() {
-            return aLongSet;
-        }
-
-        void setALongSet(Set<Long> aLongSet) {
-            this.aLongSet = aLongSet;
-        }
-
-        Set<Short> getAShortSet() {
-            return aShortSet;
-        }
-
-        void setAShortSet(Set<Short> aShortSet) {
-            this.aShortSet = aShortSet;
-        }
-
-        Set<Double> getADoubleSet() {
-            return aDoubleSet;
-        }
-
-        void setADoubleSet(Set<Double> aDoubleSet) {
-            this.aDoubleSet = aDoubleSet;
-        }
-
-        Set<Float> getAFloatSet() {
-            return aFloatSet;
-        }
-
-        void setAFloatSet(Set<Float> aFloatSet) {
-            this.aFloatSet = aFloatSet;
-        }
-
-        Set<ByteBuffer> getAByteBufferSet() {
-            return aByteBufferSet;
-        }
-
-        void setAByteBufferSet(Set<ByteBuffer> aByteBufferSet) {
-            this.aByteBufferSet = aByteBufferSet;
-        }
-
-        List<Integer> getAnIntegerList() {
-            return anIntegerList;
-        }
-
-        void setAnIntegerList(List<Integer> anIntegerList) {
-            this.anIntegerList = anIntegerList;
-        }
-
-        List<List<FakeDocument>> getANestedStructure() {
-            return aNestedStructure;
-        }
-
-        void setANestedStructure(List<List<FakeDocument>> aNestedStructure) {
-            this.aNestedStructure = aNestedStructure;
-        }
-
-        Map<String, String> getAStringMap() {
-            return aStringMap;
-        }
-
-        void setAStringMap(Map<String, String> aStringMap) {
-            this.aStringMap = aStringMap;
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            if (this == o) return true;
-            if (o == null || getClass() != o.getClass()) return false;
-            FakeMappedItem that = (FakeMappedItem) o;
-            return aPrimitiveBoolean == that.aPrimitiveBoolean &&
-                   aPrimitiveInteger == that.aPrimitiveInteger &&
-                   aPrimitiveByte == that.aPrimitiveByte &&
-                   aPrimitiveLong == that.aPrimitiveLong &&
-                   aPrimitiveShort == that.aPrimitiveShort &&
-                   Double.compare(that.aPrimitiveDouble, aPrimitiveDouble) == 0 &&
-                   Float.compare(that.aPrimitiveFloat, aPrimitiveFloat) == 0 &&
-                   Objects.equals(aBoolean, that.aBoolean) &&
-                   Objects.equals(aString, that.aString) &&
-                   Objects.equals(anInteger, that.anInteger) &&
-                   Objects.equals(aByte, that.aByte) &&
-                   Objects.equals(aLong, that.aLong) &&
-                   Objects.equals(aShort, that.aShort) &&
-                   Objects.equals(aDouble, that.aDouble) &&
-                   Objects.equals(aFloat, that.aFloat) &&
-                   Objects.equals(aBytebuffer, that.aBytebuffer) &&
-                   Objects.equals(aFakeDocument, that.aFakeDocument) &&
-                   Objects.equals(aStringSet, that.aStringSet) &&
-                   Objects.equals(anIntegerSet, that.anIntegerSet) &&
-                   Objects.equals(aByteSet, that.aByteSet) &&
-                   Objects.equals(aLongSet, that.aLongSet) &&
-                   Objects.equals(aShortSet, that.aShortSet) &&
-                   Objects.equals(aDoubleSet, that.aDoubleSet) &&
-                   Objects.equals(aFloatSet, that.aFloatSet) &&
-                   Objects.equals(aByteBufferSet, that.aByteBufferSet) &&
-                   Objects.equals(anIntegerList, that.anIntegerList) &&
-                   Objects.equals(aNestedStructure, that.aNestedStructure) &&
-                   Objects.equals(aStringMap, that.aStringMap);
-        }
-
-        @Override
-        public int hashCode() {
-            return Objects.hash(aPrimitiveBoolean, aBoolean, aString, anInteger, aPrimitiveInteger, aByte,
-                                aPrimitiveByte, aLong, aPrimitiveLong, aShort, aPrimitiveShort, aDouble,
-                                aPrimitiveDouble, aFloat, aPrimitiveFloat, aBytebuffer, aFakeDocument, aStringSet,
-                                anIntegerSet, aByteSet, aLongSet, aShortSet, aDoubleSet, aFloatSet, aByteBufferSet,
-                                anIntegerList, aNestedStructure, aStringMap);
-        }
-
-        private static class Builder {
-            private boolean aPrimitiveBoolean;
-            private Boolean aBoolean;
-            private String aString;
-            private Integer anInteger;
-            private int aPrimitiveInteger;
-            private Byte aByte;
-            private byte aPrimitiveByte;
-            private Long aLong;
-            private long aPrimitiveLong;
-            private Short aShort;
-            private short aPrimitiveShort;
-            private Double aDouble;
-            private double aPrimitiveDouble;
-            private Float aFloat;
-            private float aPrimitiveFloat;
-            private ByteBuffer aBytebuffer;
-            private FakeDocument aFakeDocument;
-            private Set<String> aStringSet;
-            private Set<Integer> anIntegerSet;
-            private Set<Byte> aByteSet;
-            private Set<Long> aLongSet;
-            private Set<Short> aShortSet;
-            private Set<Double> aDoubleSet;
-            private Set<Float> aFloatSet;
-            private Set<ByteBuffer> aByteBufferSet;
-            private List<Integer> anIntegerList;
-            private List<List<FakeDocument>> aNestedStructure;
-            private Map<String, String> aStringMap;
-
-            Builder aPrimitiveBoolean(boolean aPrimitiveBoolean) {
-                this.aPrimitiveBoolean = aPrimitiveBoolean;
-                return this;
-            }
-
-            Builder aBoolean(Boolean aBoolean) {
-                this.aBoolean = aBoolean;
-                return this;
-            }
-
-            Builder aString(String aString) {
-                this.aString = aString;
-                return this;
-            }
-
-            Builder anInteger(Integer anInteger) {
-                this.anInteger = anInteger;
-                return this;
-            }
-
-            Builder aPrimitiveInteger(int aPrimitiveInteger) {
-                this.aPrimitiveInteger = aPrimitiveInteger;
-                return this;
-            }
-
-            Builder aByte(Byte aByte) {
-                this.aByte = aByte;
-                return this;
-            }
-
-            Builder aPrimitiveByte(byte aPrimitiveByte) {
-                this.aPrimitiveByte = aPrimitiveByte;
-                return this;
-            }
-
-            Builder aLong(Long aLong) {
-                this.aLong = aLong;
-                return this;
-            }
-
-            Builder aPrimitiveLong(long aPrimitiveLong) {
-                this.aPrimitiveLong = aPrimitiveLong;
-                return this;
-            }
-
-            Builder aShort(Short aShort) {
-                this.aShort = aShort;
-                return this;
-            }
-
-            Builder aPrimitiveShort(short aPrimitiveShort) {
-                this.aPrimitiveShort = aPrimitiveShort;
-                return this;
-            }
-
-            Builder aDouble(Double aDouble) {
-                this.aDouble = aDouble;
-                return this;
-            }
-
-            Builder aPrimitiveDouble(double aPrimitiveDouble) {
-                this.aPrimitiveDouble = aPrimitiveDouble;
-                return this;
-            }
-
-            Builder aFloat(Float aFloat) {
-                this.aFloat = aFloat;
-                return this;
-            }
-
-            Builder aPrimitiveFloat(float aPrimitiveFloat) {
-                this.aPrimitiveFloat = aPrimitiveFloat;
-                return this;
-            }
-
-            Builder aBytebuffer(ByteBuffer aBytebuffer) {
-                this.aBytebuffer = aBytebuffer;
-                return this;
-            }
-
-            Builder aFakeDocument(FakeDocument aFakeDocument) {
-                this.aFakeDocument = aFakeDocument;
-                return this;
-            }
-
-            Builder aStringSet(Set<String> aStringSet) {
-                this.aStringSet = aStringSet;
-                return this;
-            }
-
-            Builder anIntegerSet(Set<Integer> anIntegerSet) {
-                this.anIntegerSet = anIntegerSet;
-                return this;
-            }
-
-            Builder aByteSet(Set<Byte> aByteSet) {
-                this.aByteSet = aByteSet;
-                return this;
-            }
-
-            Builder aLongSet(Set<Long> aLongSet) {
-                this.aLongSet = aLongSet;
-                return this;
-            }
-
-            Builder aShortSet(Set<Short> aShortSet) {
-                this.aShortSet = aShortSet;
-                return this;
-            }
-
-            Builder aDoubleSet(Set<Double> aDoubleSet) {
-                this.aDoubleSet = aDoubleSet;
-                return this;
-            }
-
-            Builder aFloatSet(Set<Float> aFloatSet) {
-                this.aFloatSet = aFloatSet;
-                return this;
-            }
-
-            Builder aByteBufferSet(Set<ByteBuffer> aByteBufferSet) {
-                this.aByteBufferSet = aByteBufferSet;
-                return this;
-            }
-
-            Builder anIntegerList(List<Integer> anIntegerList) {
-                this.anIntegerList = anIntegerList;
-                return this;
-            }
-
-            Builder aNestedStructure(List<List<FakeDocument>> aNestedStructure) {
-                this.aNestedStructure = aNestedStructure;
-                return this;
-            }
-
-            Builder aStringMap(Map<String, String> aStringMap) {
-                this.aStringMap = aStringMap;
-                return this;
-            }
-            
-            public FakeMappedItem build() {
-                return new FakeMappedItem(aPrimitiveBoolean, aBoolean, aString, anInteger, aPrimitiveInteger, aByte,
-                                          aPrimitiveByte, aLong, aPrimitiveLong, aShort, aPrimitiveShort, aDouble,
-                                          aPrimitiveDouble, aFloat, aPrimitiveFloat, aBytebuffer, aFakeDocument,
-                                          aStringSet, anIntegerSet, aByteSet, aLongSet, aShortSet, aDoubleSet,
-                                          aFloatSet, aByteBufferSet, anIntegerList, aNestedStructure, aStringMap);
-            }
-        }
-    }
-    
-    private static class FakeDocument {
-        private String documentString;
-        private Integer documentInteger;
-
-        FakeDocument() {
-        }
-
-        private FakeDocument(String documentString, Integer documentInteger) {
-            this.documentString = documentString;
-            this.documentInteger = documentInteger;
-        }
-        
-        private static FakeDocument of(String documentString, Integer documentInteger) {
-            return new FakeDocument(documentString, documentInteger);
-        }
-
-        String getDocumentString() {
-            return documentString;
-        }
-
-        void setDocumentString(String documentString) {
-            this.documentString = documentString;
-        }
-
-        Integer getDocumentInteger() {
-            return documentInteger;
-        }
-
-        void setDocumentInteger(Integer documentInteger) {
-            this.documentInteger = documentInteger;
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            if (this == o) return true;
-            if (o == null || getClass() != o.getClass()) return false;
-            FakeDocument that = (FakeDocument) o;
-            return Objects.equals(documentString, that.documentString) &&
-                   Objects.equals(documentInteger, that.documentInteger);
-        }
-
-        @Override
-        public int hashCode() {
-            return Objects.hash(documentString, documentInteger);
-        }
-    }
-    
-    private static class FakeAbstractSubclass extends FakeAbstractSuperclass {
-
-    }
-
-    private static class FakeBrokenClass {
-        FakeAbstractSuperclass abstractObject;
-
-        FakeAbstractSuperclass getAbstractObject() {
-            return abstractObject;
-        }
-
-        void setAbstractObject(FakeAbstractSuperclass abstractObject) {
-            this.abstractObject = abstractObject;
-        }
-    }
-
-    private static abstract class FakeAbstractSuperclass {
-        private String aString;
-
-        String getAString() {
-            return aString;
-        }
-
-        void setAString(String aString) {
-            this.aString = aString;
-        }
-    }
-
-    private static final Collection<AttributeSupplier<FakeMappedItem>> ATTRIBUTES = Arrays.asList(
-        bool("a_primitive_boolean", FakeMappedItem::isAPrimitiveBoolean,
-             FakeMappedItem::setAPrimitiveBoolean),
-        bool("a_boolean", FakeMappedItem::getABoolean,
-             FakeMappedItem::setABoolean),
-        string("a_string", FakeMappedItem::getAString, FakeMappedItem::setAString));
-
-    private StaticTableSchema<FakeMappedItem> createSimpleTableSchema() {
-        return StaticTableSchema.builder()
-                                .newItemSupplier(FakeMappedItem::new)
-                                .attributes(ATTRIBUTES)
-                                .build();
-    }
-
-    private static class TestTableTag extends TableTag {
-        @Override
-        protected Map<String, Object> getCustomMetadata() {
-            return singletonMap(TABLE_TAG_KEY, TABLE_TAG_VALUE);
-        }
-    }
-
-    @Rule
-    public ExpectedException exception = ExpectedException.none();
-
-    @Test
-    public void getTableMetadata_hasCorrectFields() {
-        TableMetadata tableMetadata = FakeItemWithSort.getTableSchema().getTableMetadata();
-
-        assertThat(tableMetadata.getPrimaryPartitionKey(), is("id"));
-        assertThat(tableMetadata.getPrimarySortKey(), is(Optional.of("sort")));
-    }
-
-    @Test
-    public void itemToMap_returnsCorrectMapWithMultipleAttributes() {
-        Map<String, AttributeValue> attributeMap = createSimpleTableSchema().itemToMap(FAKE_ITEM, false);
-
-        assertThat(attributeMap.size(), is(3));
-        assertThat(attributeMap, hasEntry("a_boolean", ATTRIBUTE_VALUE_B));
-        assertThat(attributeMap, hasEntry("a_primitive_boolean", ATTRIBUTE_VALUE_B));
-        assertThat(attributeMap, hasEntry("a_string", ATTRIBUTE_VALUE_S));
-    }
-
-    @Test
-    public void itemToMap_omitsNullAttributes() {
-        FakeMappedItem fakeMappedItemWithNulls = FakeMappedItem.builder().aPrimitiveBoolean(true).build();
-        Map<String, AttributeValue> attributeMap = createSimpleTableSchema().itemToMap(fakeMappedItemWithNulls, true);
-
-        assertThat(attributeMap.size(), is(1));
-        assertThat(attributeMap, hasEntry("a_primitive_boolean", ATTRIBUTE_VALUE_B));
-    }
-
-    @Test
-    public void itemToMap_filtersAttributes() {
-        Map<String, AttributeValue> attributeMap = createSimpleTableSchema()
-            .itemToMap(FAKE_ITEM, asList("a_boolean", "a_string"));
-
-        assertThat(attributeMap.size(), is(2));
-        assertThat(attributeMap, hasEntry("a_boolean", ATTRIBUTE_VALUE_B));
-        assertThat(attributeMap, hasEntry("a_string", ATTRIBUTE_VALUE_S));
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void itemToMap_attributeNotFound_throwsIllegalArgumentException() {
-        createSimpleTableSchema().itemToMap(FAKE_ITEM, singletonList("unknown_key"));
-    }
-
-    @Test
-    public void mapToItem_returnsCorrectItemWithMultipleAttributes() {
-        Map<String, AttributeValue> attributeValueMap = new HashMap<>();
-        attributeValueMap.put("a_boolean", ATTRIBUTE_VALUE_B);
-        attributeValueMap.put("a_primitive_boolean", ATTRIBUTE_VALUE_B);
-        attributeValueMap.put("a_string", ATTRIBUTE_VALUE_S);
-
-        FakeMappedItem fakeMappedItem =
-            createSimpleTableSchema().mapToItem(Collections.unmodifiableMap(attributeValueMap));
-
-        assertThat(fakeMappedItem, is(FAKE_ITEM));
-    }
-
-    @Test
-    public void mapToItem_unknownAttributes_doNotCauseErrors() {
-        Map<String, AttributeValue> attributeValueMap = new HashMap<>();
-        attributeValueMap.put("unknown_attribute", ATTRIBUTE_VALUE_S);
-
-        createSimpleTableSchema().mapToItem(Collections.unmodifiableMap(attributeValueMap));
-    }
-
-    @Test
-    public void mapToItem_attributesWrongType_doesNotAttemptToWriteValue() {
-        Map<String, AttributeValue> attributeValueMap = new HashMap<>();
-        attributeValueMap.put("a_boolean", ATTRIBUTE_VALUE_S);
-        attributeValueMap.put("a_primitive_boolean", ATTRIBUTE_VALUE_S);
-        attributeValueMap.put("a_string", ATTRIBUTE_VALUE_B);
-
-        FakeMappedItem fakeMappedItem =
-            createSimpleTableSchema().mapToItem(Collections.unmodifiableMap(attributeValueMap));
-
-        FakeMappedItem expectedFakeMappedItem = FakeMappedItem.builder().build();
-        assertThat(fakeMappedItem, is(expectedFakeMappedItem));
-    }
-
-    @Test
-    public void mapperCanHandleDocument() {
-        FakeDocument fakeDocument = FakeDocument.of("test-123", 123);
-
-        Map<String, AttributeValue> expectedMap = new HashMap<>();
-        expectedMap.put("documentInteger", AttributeValue.builder().n("123").build());
-        expectedMap.put("documentString", AttributeValue.builder().s("test-123").build());
-
-        verifyNullableAttribute(Attributes.documentMap("value",
-                                                      FakeMappedItem::getAFakeDocument,
-                                                      FakeMappedItem::setAFakeDocument,
-                                                      FAKE_DOCUMENT_TABLE_SCHEMA),
-                                FakeMappedItem.builder().aFakeDocument(fakeDocument).build(),
-                                AttributeValue.builder().m(expectedMap).build());
-    }
-
-    @Test
-    public void mapperCanHandleDocumentWithNullValues() {
-        verifyNullAttribute(Attributes.documentMap("value",
-                                                   FakeMappedItem::getAFakeDocument,
-                                                   FakeMappedItem::setAFakeDocument,
-                                                   FAKE_DOCUMENT_TABLE_SCHEMA),
-                            FakeMappedItem.builder().build());
-    }
-
-    @Test
-    public void mapperCanHandleInteger() {
-        verifyNullableAttribute(Attributes.integerNumber("value", FakeMappedItem::getAnInteger,
-                                                         FakeMappedItem::setAnInteger),
-                                FakeMappedItem.builder().anInteger(123).build(),
-                                AttributeValue.builder().n("123").build());
-    }
-
-    @Test
-    public void mapperCanHandlePrimitiveInteger() {
-        verifyAttribute(Attributes.integerNumber("value", FakeMappedItem::getAPrimitiveInteger,
-                                                 FakeMappedItem::setAPrimitiveInteger),
-                        FakeMappedItem.builder().aPrimitiveInteger(123).build(),
-                        AttributeValue.builder().n("123").build());
-    }
-
-    @Test
-    public void mapperCanHandleBoolean() {
-        verifyNullableAttribute(Attributes.bool("value", FakeMappedItem::getABoolean, FakeMappedItem::setABoolean),
-                                FakeMappedItem.builder().aBoolean(true).build(),
-                                AttributeValue.builder().bool(true).build());
-    }
-
-    @Test
-    public void mapperCanHandlePrimitiveBoolean() {
-        verifyAttribute(Attributes.bool("value", FakeMappedItem::isAPrimitiveBoolean,
-                                        FakeMappedItem::setAPrimitiveBoolean),
-                        FakeMappedItem.builder().aPrimitiveBoolean(true).build(),
-                        AttributeValue.builder().bool(true).build());
-    }
-
-    @Test
-    public void mapperCanHandleString() {
-        verifyNullableAttribute(string("value", FakeMappedItem::getAString, FakeMappedItem::setAString),
-                                FakeMappedItem.builder().aString("onetwothree").build(),
-                                AttributeValue.builder().s("onetwothree").build());
-    }
-
-    @Test
-    public void mapperCanHandleLong() {
-        verifyNullableAttribute(Attributes.longNumber("value", FakeMappedItem::getALong, FakeMappedItem::setALong),
-                                FakeMappedItem.builder().aLong(123L).build(),
-                                AttributeValue.builder().n("123").build());
-    }
-
-    @Test
-    public void mapperCanHandlePrimitiveLong() {
-        verifyAttribute(Attributes.longNumber("value", FakeMappedItem::getAPrimitiveLong,
-                                              FakeMappedItem::setAPrimitiveLong),
-                        FakeMappedItem.builder().aPrimitiveLong(123L).build(),
-                        AttributeValue.builder().n("123").build());
-    }
-
-    @Test
-    public void mapperCanHandleShort() {
-        verifyNullableAttribute(Attributes.shortNumber("value", FakeMappedItem::getAShort, FakeMappedItem::setAShort),
-                                FakeMappedItem.builder().aShort((short)123).build(),
-                                AttributeValue.builder().n("123").build());
-    }
-
-    @Test
-    public void mapperCanHandlePrimitiveShort() {
-        verifyAttribute(Attributes.shortNumber("value", FakeMappedItem::getAPrimitiveShort,
-                                               FakeMappedItem::setAPrimitiveShort),
-                        FakeMappedItem.builder().aPrimitiveShort((short)123).build(),
-                        AttributeValue.builder().n("123").build());
-    }
-
-    @Test
-    public void mapperCanHandleByte() {
-        verifyNullableAttribute(Attributes.byteNumber("value", FakeMappedItem::getAByte, FakeMappedItem::setAByte),
-                                FakeMappedItem.builder().aByte((byte)123).build(),
-                                AttributeValue.builder().n("123").build());
-    }
-
-    @Test
-    public void mapperCanHandlePrimitiveByte() {
-        verifyAttribute(Attributes.byteNumber("value", FakeMappedItem::getAPrimitiveByte,
-                                              FakeMappedItem::setAPrimitiveByte),
-                        FakeMappedItem.builder().aPrimitiveByte((byte)123).build(),
-                        AttributeValue.builder().n("123").build());
-    }
-
-    @Test
-    public void mapperCanHandleDouble() {
-        verifyNullableAttribute(Attributes.doubleNumber("value", FakeMappedItem::getADouble,
-                                                        FakeMappedItem::setADouble),
-                                FakeMappedItem.builder().aDouble(1.23).build(),
-                                AttributeValue.builder().n("1.23").build());
-    }
-
-    @Test
-    public void mapperCanHandlePrimitiveDouble() {
-        verifyAttribute(Attributes.doubleNumber("value", FakeMappedItem::getAPrimitiveDouble,
-                                                FakeMappedItem::setAPrimitiveDouble),
-                        FakeMappedItem.builder().aPrimitiveDouble(1.23).build(),
-                        AttributeValue.builder().n("1.23").build());
-    }
-
-    @Test
-    public void mapperCanHandleFloat() {
-        verifyNullableAttribute(Attributes.floatNumber("value", FakeMappedItem::getAFloat, FakeMappedItem::setAFloat),
-                                FakeMappedItem.builder().aFloat(1.23f).build(),
-                                AttributeValue.builder().n("1.23").build());
-    }
-
-    @Test
-    public void mapperCanHandlePrimitiveFloat() {
-        verifyAttribute(Attributes.floatNumber("value", FakeMappedItem::getAPrimitiveFloat,
-                                               FakeMappedItem::setAPrimitiveFloat),
-                        FakeMappedItem.builder().aPrimitiveFloat(1.23f).build(),
-                        AttributeValue.builder().n("1.23").build());
-    }
-
-
-    @Test
-    public void mapperCanHandleByteBuffer() {
-        ByteBuffer byteBuffer = ByteBuffer.wrap("test".getBytes(UTF_8));
-        verifyNullableAttribute(Attributes.binary("value",
-                                                 FakeMappedItem::getABytebuffer,
-                                                 FakeMappedItem::setABytebuffer),
-                                FakeMappedItem.builder().aBytebuffer(byteBuffer).build(),
-                                AttributeValue.builder().b(SdkBytes.fromByteBuffer(byteBuffer)).build());
-    }
-
-    @Test
-    public void mapperCanHandleSimpleList() {
-        verifyNullableAttribute(Attributes.list("value",
-                                                FakeMappedItem::getAnIntegerList,
-                                                FakeMappedItem::setAnIntegerList,
-                                                AttributeTypes.integerNumberType()),
-                                FakeMappedItem.builder().anIntegerList(asList(1, 2, 3)).build(),
-                                AttributeValue.builder().l(asList(AttributeValue.builder().n("1").build(),
-                                                                  AttributeValue.builder().n("2").build(),
-                                                                  AttributeValue.builder().n("3").build())).build());
-    }
-
-    @Test
-    public void mapperCanHandleNestedLists() {
-        FakeMappedItem fakeMappedItem =
-            FakeMappedItem.builder()
-                          .aNestedStructure(singletonList(singletonList(FakeDocument.of("nested", null))))
-                          .build();
-
-        Map<String, AttributeValue> documentMap = new HashMap<>();
-        documentMap.put("documentString", AttributeValue.builder().s("nested").build());
-        documentMap.put("documentInteger", AttributeValue.builder().nul(true).build());
-
-        AttributeValue attributeValue =
-            AttributeValue.builder()
-                          .l(singletonList(AttributeValue.builder()
-                                                         .l(AttributeValue.builder().m(documentMap).build())
-                                                         .build()))
-                          .build();
-
-        verifyNullableAttribute(Attributes.list("value",
-                                                FakeMappedItem::getANestedStructure,
-                                                FakeMappedItem::setANestedStructure,
-                                                AttributeTypes.listType(
-                                                    AttributeTypes.documentMapType(FAKE_DOCUMENT_TABLE_SCHEMA))),
-                                fakeMappedItem,
-                                attributeValue);
-    }
-
-    @Test
-    public void mapperCanHandleIntegerSet() {
-        Set<Integer> valueSet = new HashSet<>(asList(1, 2, 3));
-        List<String> expectedList = valueSet.stream().map(Objects::toString).collect(toList());
-
-        verifyNullableAttribute(Attributes.integerSet("value",
-                                                      FakeMappedItem::getAnIntegerSet,
-                                                      FakeMappedItem::setAnIntegerSet),
-                                FakeMappedItem.builder().anIntegerSet(valueSet).build(),
-                                AttributeValue.builder().ns(expectedList).build());
-    }
-
-    @Test
-    public void mapperCanHandleStringSet() {
-        Set<String> valueSet = new HashSet<>(asList("one", "two", "three"));
-        List<String> expectedList = valueSet.stream().map(Objects::toString).collect(toList());
-
-        verifyNullableAttribute(Attributes.stringSet("value", FakeMappedItem::getAStringSet,
-                                                     FakeMappedItem::setAStringSet),
-                                FakeMappedItem.builder().aStringSet(valueSet).build(),
-                                AttributeValue.builder().ss(expectedList).build());
-    }
-
-    @Test
-    public void mapperCanHandleLongSet() {
-        Set<Long> valueSet = new HashSet<>(asList(1L, 2L, 3L));
-        List<String> expectedList = valueSet.stream().map(Objects::toString).collect(toList());
-
-        verifyNullableAttribute(Attributes.longSet("value", FakeMappedItem::getALongSet, FakeMappedItem::setALongSet),
-                                FakeMappedItem.builder().aLongSet(valueSet).build(),
-                                AttributeValue.builder().ns(expectedList).build());
-    }
-
-    @Test
-    public void mapperCanHandleShortSet() {
-        Set<Short> valueSet = new HashSet<>(asList((short)1, (short)2, (short)3));
-        List<String> expectedList = valueSet.stream().map(Objects::toString).collect(toList());
-
-        verifyNullableAttribute(Attributes.shortSet("value", FakeMappedItem::getAShortSet,
-                                                    FakeMappedItem::setAShortSet),
-                                FakeMappedItem.builder().aShortSet(valueSet).build(),
-                                AttributeValue.builder().ns(expectedList).build());
-    }
-
-    @Test
-    public void mapperCanHandleByteSet() {
-        Set<Byte> valueSet = new HashSet<>(asList((byte)1, (byte)2, (byte)3));
-        List<String> expectedList = valueSet.stream().map(Objects::toString).collect(toList());
-
-        verifyNullableAttribute(Attributes.byteSet("value", FakeMappedItem::getAByteSet, FakeMappedItem::setAByteSet),
-                                FakeMappedItem.builder().aByteSet(valueSet).build(),
-                                AttributeValue.builder().ns(expectedList).build());
-    }
-
-    @Test
-    public void mapperCanHandleDoubleSet() {
-        Set<Double> valueSet = new HashSet<>(asList(1.2, 3.4, 5.6));
-        List<String> expectedList = valueSet.stream().map(Object::toString).collect(toList());
-
-        verifyNullableAttribute(Attributes.doubleSet("value", FakeMappedItem::getADoubleSet,
-                                                     FakeMappedItem::setADoubleSet),
-                                FakeMappedItem.builder().aDoubleSet(valueSet).build(),
-                                AttributeValue.builder().ns(expectedList).build());
-    }
-
-    @Test
-    public void mapperCanHandleFloatSet() {
-        Set<Float> valueSet = new HashSet<>(asList(1.2f, 3.4f, 5.6f));
-        List<String> expectedList = valueSet.stream().map(Object::toString).collect(toList());
-
-        verifyNullableAttribute(Attributes.floatSet("value", FakeMappedItem::getAFloatSet,
-                                                    FakeMappedItem::setAFloatSet),
-                                FakeMappedItem.builder().aFloatSet(valueSet).build(),
-                                AttributeValue.builder().ns(expectedList).build());
-    }
-
-    @Test
-    public void mapperCanHandleByteBufferSet() {
-        ByteBuffer byteBuffer1 = ByteBuffer.wrap("one".getBytes(UTF_8));
-        ByteBuffer byteBuffer2 = ByteBuffer.wrap("two".getBytes(UTF_8));
-        ByteBuffer byteBuffer3 = ByteBuffer.wrap("three".getBytes(UTF_8));
-        Set<ByteBuffer> byteBuffer = new HashSet<>(asList(byteBuffer1, byteBuffer2, byteBuffer3));
-        List<SdkBytes> sdkBytes = byteBuffer.stream().map(SdkBytes::fromByteBuffer).collect(toList());
-
-        verifyNullableAttribute(Attributes.binarySet("value",
-                                                    FakeMappedItem::getAByteBufferSet,
-                                                    FakeMappedItem::setAByteBufferSet),
-                                FakeMappedItem.builder().aByteBufferSet(byteBuffer).build(),
-                                AttributeValue.builder().bs(sdkBytes).build());
-    }
-
-    @Test
-    public void mapperCanHandleGenericMap() {
-        Map<String, String> stringMap = new HashMap<>();
-        stringMap.put("one", "two");
-        stringMap.put("three", "four");
-
-        Map<String, AttributeValue> attributeValueMap = new HashMap<>();
-        attributeValueMap.put("one", AttributeValue.builder().s("two").build());
-        attributeValueMap.put("three", AttributeValue.builder().s("four").build());
-
-        verifyNullableAttribute(Attributes.map("value",
-                                               FakeMappedItem::getAStringMap,
-                                               FakeMappedItem::setAStringMap,
-                                               AttributeTypes.stringType()),
-                                FakeMappedItem.builder().aStringMap(stringMap).build(),
-                                AttributeValue.builder().m(attributeValueMap).build());
-    }
-
-    @Test
-    public void getAttributeValue_correctlyMapsSuperclassAttributes() {
-        FakeItem fakeItem = FakeItem.builder().id("id-value").build();
-        fakeItem.setSubclassAttribute("subclass-value");
-
-        AttributeValue attributeValue = FakeItem.getTableSchema().getAttributeValue(fakeItem, "subclass_attribute");
-
-        assertThat(attributeValue, is(AttributeValue.builder().s("subclass-value").build()));
-    }
-
-    @Test
-    public void getAttributeValue_correctlyMapsComposedClassAttributes() {
-        FakeItem fakeItem = FakeItem.builder().id("id-value")
-            .composedObject(FakeItemComposedClass.builder().composedAttribute("composed-value").build())
-            .build();
-
-        AttributeValue attributeValue = FakeItem.getTableSchema().getAttributeValue(fakeItem, "composed_attribute");
-
-        assertThat(attributeValue, is(AttributeValue.builder().s("composed-value").build()));
-    }
-
-    @Test
-    public void mapToItem_correctlyConstructsComposedClass() {
-        Map<String, AttributeValue> itemMap = new HashMap<>();
-        itemMap.put("id", AttributeValue.builder().s("id-value").build());
-        itemMap.put("composed_attribute", AttributeValue.builder().s("composed-value").build());
-
-        FakeItem fakeItem = FakeItem.getTableSchema().mapToItem(itemMap);
-
-        assertThat(fakeItem,
-                   is(FakeItem.builder()
-                              .id("id-value")
-                              .composedObject(FakeItemComposedClass.builder()
-                                                                   .composedAttribute("composed-value")
-                                                                   .build())
-                              .build()));
-    }
-
-    @Test
-    public void buildAbstractTableSchema() {
-        StaticTableSchema<FakeMappedItem> tableSchema = StaticTableSchema.builder()
-                                                                         .attributes(string("aString",
-                                                                                     FakeMappedItem::getAString,
-                                                                                     FakeMappedItem::setAString))
-                                                                         .build();
-
-        assertThat(tableSchema.itemToMap(FAKE_ITEM, false), is(singletonMap("aString", stringValue("test-string"))));
-
-        exception.expect(UnsupportedOperationException.class);
-        exception.expectMessage("abstract");
-        tableSchema.mapToItem(singletonMap("aString", stringValue("test-string")));
-    }
-
-    @Test
-    public void buildAbstractWithFlatten() {
-        StaticTableSchema<FakeMappedItem> tableSchema =
-            StaticTableSchema.builder()
-                             .flatten(FAKE_DOCUMENT_TABLE_SCHEMA,
-                                      FakeMappedItem::getAFakeDocument,
-                                      FakeMappedItem::setAFakeDocument)
-                             .build();
-
-        FakeDocument document = FakeDocument.of("test-string", null);
-        FakeMappedItem item = FakeMappedItem.builder().aFakeDocument(document).build();
-
-        assertThat(tableSchema.itemToMap(item, true),
-                   is(singletonMap("documentString", AttributeValue.builder().s("test-string").build())));
-    }
-
-    @Test
-    public void buildAbstractExtends() {
-        StaticTableSchema<FakeAbstractSuperclass> superclassTableSchema =
-            StaticTableSchema.builder()
-                             .attributes(Attributes.string("aString",
-                                                           FakeAbstractSuperclass::getAString,
-                                                           FakeAbstractSuperclass::setAString))
-                             .build();
-
-        StaticTableSchema<FakeAbstractSubclass> subclassTableSchema =
-            StaticTableSchema.builder()
-                             .<FakeAbstractSubclass>extend(superclassTableSchema)
-                             .build();
-
-        FakeAbstractSubclass item = new FakeAbstractSubclass();
-        item.setAString("test-string");
-
-        assertThat(subclassTableSchema.itemToMap(item, true),
-                   is(singletonMap("aString", AttributeValue.builder().s("test-string").build())));
-    }
-
-    @Test
-    public void buildAbstractTagWith() {
-
-        StaticTableSchema<FakeDocument> abstractTableSchema =
-            StaticTableSchema
-                .builder()
-                .tagWith(new TestTableTag())
-                .build();
-
-        assertThat(abstractTableSchema.getTableMetadata().getCustomMetadataObject(TABLE_TAG_KEY, String.class),
-                   is(Optional.of(TABLE_TAG_VALUE)));
-    }
-
-    @Test
-    public void buildConcreteTagWith() {
-
-        StaticTableSchema<FakeDocument> concreteTableSchema =
-            StaticTableSchema
-                .builder()
-                .newItemSupplier(FakeDocument::new)
-                .tagWith(new TestTableTag())
-                .build();
-
-        assertThat(concreteTableSchema.getTableMetadata().getCustomMetadataObject(TABLE_TAG_KEY, String.class),
-                   is(Optional.of(TABLE_TAG_VALUE)));
-    }
-
-    @Test
-    public void instantiateFlattenedAbstractClassShouldThrowException() {
-        StaticTableSchema<FakeAbstractSuperclass> superclassTableSchema =
-            StaticTableSchema.builder()
-                             .attributes(Attributes.string("aString",
-                                                           FakeAbstractSuperclass::getAString,
-                                                           FakeAbstractSuperclass::setAString))
-                             .build();
-
-        exception.expect(IllegalArgumentException.class);
-        exception.expectMessage("abstract");
-        StaticTableSchema.builder()
-                         .newItemSupplier(FakeBrokenClass::new)
-                         .flatten(superclassTableSchema,
-                                  FakeBrokenClass::getAbstractObject,
-                                  FakeBrokenClass::setAbstractObject);
-    }
-
-    private void verifyAttribute(AttributeSupplier<FakeMappedItem> mappedAttribute,
-                                 FakeMappedItem fakeMappedItem,
-                                 AttributeValue attributeValue) {
-
-        StaticTableSchema<FakeMappedItem> tableSchema = StaticTableSchema.builder()
-                                                                         .newItemSupplier(FakeMappedItem::new)
-                                                                         .attributes(mappedAttribute)
-                                                                         .build();
-        Map<String, AttributeValue> expectedMap = singletonMap("value", attributeValue);
-
-        Map<String, AttributeValue> resultMap = tableSchema.itemToMap(fakeMappedItem, false);
-        assertThat(resultMap, is(expectedMap));
-
-        FakeMappedItem resultItem = tableSchema.mapToItem(expectedMap);
-        assertThat(resultItem, is(fakeMappedItem));
-    }
-
-    private void verifyNullAttribute(AttributeSupplier<FakeMappedItem> mappedAttribute,
-                                     FakeMappedItem fakeMappedItem) {
-
-        StaticTableSchema<FakeMappedItem> tableSchema = StaticTableSchema.builder()
-                                                                         .newItemSupplier(FakeMappedItem::new)
-                                                                         .attributes(mappedAttribute)
-                                                                         .build();
-        Map<String, AttributeValue> expectedMap = singletonMap("value", nullAttributeValue());
-
-        Map<String, AttributeValue> resultMap = tableSchema.itemToMap(fakeMappedItem, false);
-        assertThat(resultMap, is(expectedMap));
-
-        FakeMappedItem resultItem = tableSchema.mapToItem(expectedMap);
-        assertThat(resultItem, is(nullValue()));
-    }
-
-    private void verifyNullableAttribute(AttributeSupplier<FakeMappedItem> mappedAttribute,
-                                         FakeMappedItem fakeMappedItem,
-                                         AttributeValue attributeValue) {
-
-        verifyAttribute(mappedAttribute, fakeMappedItem, attributeValue);
-        verifyNullAttribute(mappedAttribute, FakeMappedItem.builder().build());
-    }
-}
\ No newline at end of file
diff --git a/services-custom/pom.xml b/services-custom/pom.xml
index 41af9dc0209c..695a0425204a 100644
--- a/services-custom/pom.xml
+++ b/services-custom/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -19,7 +19,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>services-custom</artifactId>
     <name>AWS Java SDK :: Custom Services</name>
diff --git a/services/accessanalyzer/pom.xml b/services/accessanalyzer/pom.xml
new file mode 100644
index 000000000000..1fea08d600de
--- /dev/null
+++ b/services/accessanalyzer/pom.xml
@@ -0,0 +1,60 @@
+<?xml version="1.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.
+  -->
+
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>software.amazon.awssdk</groupId>
+        <artifactId>services</artifactId>
+        <version>2.11.8-SNAPSHOT</version>
+    </parent>
+    <artifactId>accessanalyzer</artifactId>
+    <name>AWS Java SDK :: Services :: AccessAnalyzer</name>
+    <description>The AWS Java SDK for AccessAnalyzer module holds the client classes that are used for
+        communicating with AccessAnalyzer.
+    </description>
+    <url>https://aws.amazon.com/sdkforjava</url>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifestEntries>
+                            <Automatic-Module-Name>software.amazon.awssdk.services.accessanalyzer</Automatic-Module-Name>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>protocol-core</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>aws-json-protocol</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/services/accessanalyzer/src/main/resources/codegen-resources/paginators-1.json b/services/accessanalyzer/src/main/resources/codegen-resources/paginators-1.json
new file mode 100644
index 000000000000..64553f7bdf1c
--- /dev/null
+++ b/services/accessanalyzer/src/main/resources/codegen-resources/paginators-1.json
@@ -0,0 +1,28 @@
+{
+  "pagination": {
+    "ListAnalyzedResources": {
+      "input_token": "nextToken",
+      "output_token": "nextToken",
+      "limit_key": "maxResults",
+      "result_key": "analyzedResources"
+    },
+    "ListAnalyzers": {
+      "input_token": "nextToken",
+      "output_token": "nextToken",
+      "limit_key": "maxResults",
+      "result_key": "analyzers"
+    },
+    "ListArchiveRules": {
+      "input_token": "nextToken",
+      "output_token": "nextToken",
+      "limit_key": "maxResults",
+      "result_key": "archiveRules"
+    },
+    "ListFindings": {
+      "input_token": "nextToken",
+      "output_token": "nextToken",
+      "limit_key": "maxResults",
+      "result_key": "findings"
+    }
+  }
+}
diff --git a/services/accessanalyzer/src/main/resources/codegen-resources/service-2.json b/services/accessanalyzer/src/main/resources/codegen-resources/service-2.json
new file mode 100644
index 000000000000..cd8928f5cf38
--- /dev/null
+++ b/services/accessanalyzer/src/main/resources/codegen-resources/service-2.json
@@ -0,0 +1,1589 @@
+{
+  "version":"2.0",
+  "metadata":{
+    "apiVersion":"2019-11-01",
+    "endpointPrefix":"access-analyzer",
+    "jsonVersion":"1.1",
+    "protocol":"rest-json",
+    "serviceFullName":"Access Analyzer",
+    "serviceId":"AccessAnalyzer",
+    "signatureVersion":"v4",
+    "signingName":"access-analyzer",
+    "uid":"accessanalyzer-2019-11-01"
+  },
+  "operations":{
+    "CreateAnalyzer":{
+      "name":"CreateAnalyzer",
+      "http":{
+        "method":"PUT",
+        "requestUri":"/analyzer",
+        "responseCode":200
+      },
+      "input":{"shape":"CreateAnalyzerRequest"},
+      "output":{"shape":"CreateAnalyzerResponse"},
+      "errors":[
+        {"shape":"ConflictException"},
+        {"shape":"ValidationException"},
+        {"shape":"InternalServerException"},
+        {"shape":"ServiceQuotaExceededException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"AccessDeniedException"}
+      ],
+      "documentation":"<p>Creates an analyzer for your account.</p>",
+      "idempotent":true
+    },
+    "CreateArchiveRule":{
+      "name":"CreateArchiveRule",
+      "http":{
+        "method":"PUT",
+        "requestUri":"/analyzer/{analyzerName}/archive-rule",
+        "responseCode":200
+      },
+      "input":{"shape":"CreateArchiveRuleRequest"},
+      "errors":[
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ConflictException"},
+        {"shape":"ValidationException"},
+        {"shape":"InternalServerException"},
+        {"shape":"ServiceQuotaExceededException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"AccessDeniedException"}
+      ],
+      "documentation":"<p>Creates an archive rule for the specified analyzer. Archive rules automatically archive findings that meet the criteria you define when you create the rule.</p>",
+      "idempotent":true
+    },
+    "DeleteAnalyzer":{
+      "name":"DeleteAnalyzer",
+      "http":{
+        "method":"DELETE",
+        "requestUri":"/analyzer/{analyzerName}",
+        "responseCode":200
+      },
+      "input":{"shape":"DeleteAnalyzerRequest"},
+      "errors":[
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ValidationException"},
+        {"shape":"InternalServerException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"AccessDeniedException"}
+      ],
+      "documentation":"<p>Deletes the specified analyzer. When you delete an analyzer, Access Analyzer is disabled for the account in the current or specific Region. All findings that were generated by the analyzer are deleted. You cannot undo this action.</p>",
+      "idempotent":true
+    },
+    "DeleteArchiveRule":{
+      "name":"DeleteArchiveRule",
+      "http":{
+        "method":"DELETE",
+        "requestUri":"/analyzer/{analyzerName}/archive-rule/{ruleName}",
+        "responseCode":200
+      },
+      "input":{"shape":"DeleteArchiveRuleRequest"},
+      "errors":[
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ValidationException"},
+        {"shape":"InternalServerException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"AccessDeniedException"}
+      ],
+      "documentation":"<p>Deletes the specified archive rule.</p>",
+      "idempotent":true
+    },
+    "GetAnalyzedResource":{
+      "name":"GetAnalyzedResource",
+      "http":{
+        "method":"GET",
+        "requestUri":"/analyzed-resource",
+        "responseCode":200
+      },
+      "input":{"shape":"GetAnalyzedResourceRequest"},
+      "output":{"shape":"GetAnalyzedResourceResponse"},
+      "errors":[
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ValidationException"},
+        {"shape":"InternalServerException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"AccessDeniedException"}
+      ],
+      "documentation":"<p>Retrieves information about a resource that was analyzed.</p>"
+    },
+    "GetAnalyzer":{
+      "name":"GetAnalyzer",
+      "http":{
+        "method":"GET",
+        "requestUri":"/analyzer/{analyzerName}",
+        "responseCode":200
+      },
+      "input":{"shape":"GetAnalyzerRequest"},
+      "output":{"shape":"GetAnalyzerResponse"},
+      "errors":[
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ValidationException"},
+        {"shape":"InternalServerException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"AccessDeniedException"}
+      ],
+      "documentation":"<p>Retrieves information about the specified analyzer.</p>"
+    },
+    "GetArchiveRule":{
+      "name":"GetArchiveRule",
+      "http":{
+        "method":"GET",
+        "requestUri":"/analyzer/{analyzerName}/archive-rule/{ruleName}",
+        "responseCode":200
+      },
+      "input":{"shape":"GetArchiveRuleRequest"},
+      "output":{"shape":"GetArchiveRuleResponse"},
+      "errors":[
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ValidationException"},
+        {"shape":"InternalServerException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"AccessDeniedException"}
+      ],
+      "documentation":"<p>Retrieves information about an archive rule.</p>"
+    },
+    "GetFinding":{
+      "name":"GetFinding",
+      "http":{
+        "method":"GET",
+        "requestUri":"/finding/{id}",
+        "responseCode":200
+      },
+      "input":{"shape":"GetFindingRequest"},
+      "output":{"shape":"GetFindingResponse"},
+      "errors":[
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ValidationException"},
+        {"shape":"InternalServerException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"AccessDeniedException"}
+      ],
+      "documentation":"<p>Retrieves information about the specified finding.</p>"
+    },
+    "ListAnalyzedResources":{
+      "name":"ListAnalyzedResources",
+      "http":{
+        "method":"POST",
+        "requestUri":"/analyzed-resource",
+        "responseCode":200
+      },
+      "input":{"shape":"ListAnalyzedResourcesRequest"},
+      "output":{"shape":"ListAnalyzedResourcesResponse"},
+      "errors":[
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ValidationException"},
+        {"shape":"InternalServerException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"AccessDeniedException"}
+      ],
+      "documentation":"<p>Retrieves a list of resources of the specified type that have been analyzed by the specified analyzer..</p>"
+    },
+    "ListAnalyzers":{
+      "name":"ListAnalyzers",
+      "http":{
+        "method":"GET",
+        "requestUri":"/analyzer",
+        "responseCode":200
+      },
+      "input":{"shape":"ListAnalyzersRequest"},
+      "output":{"shape":"ListAnalyzersResponse"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"InternalServerException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"AccessDeniedException"}
+      ],
+      "documentation":"<p>Retrieves a list of analyzers.</p>"
+    },
+    "ListArchiveRules":{
+      "name":"ListArchiveRules",
+      "http":{
+        "method":"GET",
+        "requestUri":"/analyzer/{analyzerName}/archive-rule",
+        "responseCode":200
+      },
+      "input":{"shape":"ListArchiveRulesRequest"},
+      "output":{"shape":"ListArchiveRulesResponse"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"InternalServerException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"AccessDeniedException"}
+      ],
+      "documentation":"<p>Retrieves a list of archive rules created for the specified analyzer.</p>"
+    },
+    "ListFindings":{
+      "name":"ListFindings",
+      "http":{
+        "method":"POST",
+        "requestUri":"/finding",
+        "responseCode":200
+      },
+      "input":{"shape":"ListFindingsRequest"},
+      "output":{"shape":"ListFindingsResponse"},
+      "errors":[
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ValidationException"},
+        {"shape":"InternalServerException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"AccessDeniedException"}
+      ],
+      "documentation":"<p>Retrieves a list of findings generated by the specified analyzer.</p>"
+    },
+    "ListTagsForResource":{
+      "name":"ListTagsForResource",
+      "http":{
+        "method":"GET",
+        "requestUri":"/tags/{resourceArn}",
+        "responseCode":200
+      },
+      "input":{"shape":"ListTagsForResourceRequest"},
+      "output":{"shape":"ListTagsForResourceResponse"},
+      "errors":[
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ValidationException"},
+        {"shape":"InternalServerException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"AccessDeniedException"}
+      ],
+      "documentation":"<p>Retrieves a list of tags applied to the specified resource.</p>"
+    },
+    "StartResourceScan":{
+      "name":"StartResourceScan",
+      "http":{
+        "method":"POST",
+        "requestUri":"/resource/scan",
+        "responseCode":200
+      },
+      "input":{"shape":"StartResourceScanRequest"},
+      "errors":[
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ValidationException"},
+        {"shape":"InternalServerException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"AccessDeniedException"}
+      ],
+      "documentation":"<p>Immediately starts a scan of the policies applied to the specified resource.</p>"
+    },
+    "TagResource":{
+      "name":"TagResource",
+      "http":{
+        "method":"POST",
+        "requestUri":"/tags/{resourceArn}",
+        "responseCode":200
+      },
+      "input":{"shape":"TagResourceRequest"},
+      "output":{"shape":"TagResourceResponse"},
+      "errors":[
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ValidationException"},
+        {"shape":"InternalServerException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"AccessDeniedException"}
+      ],
+      "documentation":"<p>Adds a tag to the specified resource.</p>",
+      "idempotent":true
+    },
+    "UntagResource":{
+      "name":"UntagResource",
+      "http":{
+        "method":"DELETE",
+        "requestUri":"/tags/{resourceArn}",
+        "responseCode":200
+      },
+      "input":{"shape":"UntagResourceRequest"},
+      "output":{"shape":"UntagResourceResponse"},
+      "errors":[
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ValidationException"},
+        {"shape":"InternalServerException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"AccessDeniedException"}
+      ],
+      "documentation":"<p>Removes a tag from the specified resource.</p>",
+      "idempotent":true
+    },
+    "UpdateArchiveRule":{
+      "name":"UpdateArchiveRule",
+      "http":{
+        "method":"PUT",
+        "requestUri":"/analyzer/{analyzerName}/archive-rule/{ruleName}",
+        "responseCode":200
+      },
+      "input":{"shape":"UpdateArchiveRuleRequest"},
+      "errors":[
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ValidationException"},
+        {"shape":"InternalServerException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"AccessDeniedException"}
+      ],
+      "documentation":"<p>Updates the criteria and values for the specified archive rule.</p>",
+      "idempotent":true
+    },
+    "UpdateFindings":{
+      "name":"UpdateFindings",
+      "http":{
+        "method":"PUT",
+        "requestUri":"/finding",
+        "responseCode":200
+      },
+      "input":{"shape":"UpdateFindingsRequest"},
+      "errors":[
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ValidationException"},
+        {"shape":"InternalServerException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"AccessDeniedException"}
+      ],
+      "documentation":"<p>Updates the status for the specified findings.</p>",
+      "idempotent":true
+    }
+  },
+  "shapes":{
+    "AccessDeniedException":{
+      "type":"structure",
+      "required":["message"],
+      "members":{
+        "message":{"shape":"String"}
+      },
+      "documentation":"<p>You do not have sufficient access to perform this action.</p>",
+      "error":{
+        "httpStatusCode":403,
+        "senderFault":true
+      },
+      "exception":true
+    },
+    "ActionList":{
+      "type":"list",
+      "member":{"shape":"String"}
+    },
+    "AnalyzedResource":{
+      "type":"structure",
+      "required":[
+        "analyzedAt",
+        "createdAt",
+        "isPublic",
+        "resourceArn",
+        "resourceOwnerAccount",
+        "resourceType",
+        "updatedAt"
+      ],
+      "members":{
+        "actions":{
+          "shape":"ActionList",
+          "documentation":"<p>The actions that an external principal is granted permission to use by the policy that generated the finding.</p>"
+        },
+        "analyzedAt":{
+          "shape":"Timestamp",
+          "documentation":"<p>The time at which the resource was analyzed.</p>"
+        },
+        "createdAt":{
+          "shape":"Timestamp",
+          "documentation":"<p>The time at which the finding was created.</p>"
+        },
+        "error":{
+          "shape":"String",
+          "documentation":"<p>An error message.</p>"
+        },
+        "isPublic":{
+          "shape":"Boolean",
+          "documentation":"<p>Indicates whether the policy that generated the finding grants public access to the resource.</p>"
+        },
+        "resourceArn":{
+          "shape":"ResourceArn",
+          "documentation":"<p>The ARN of the resource that was analyzed.</p>"
+        },
+        "resourceOwnerAccount":{
+          "shape":"String",
+          "documentation":"<p>The AWS account ID that owns the resource.</p>"
+        },
+        "resourceType":{
+          "shape":"ResourceType",
+          "documentation":"<p>The type of the resource that was analyzed.</p>"
+        },
+        "sharedVia":{
+          "shape":"SharedViaList",
+          "documentation":"<p>Indicates how the access that generated the finding is granted.</p>"
+        },
+        "status":{
+          "shape":"FindingStatus",
+          "documentation":"<p>The current status of the finding generated from the analyzed resource.</p>"
+        },
+        "updatedAt":{
+          "shape":"Timestamp",
+          "documentation":"<p>The time at which the finding was updated.</p>"
+        }
+      },
+      "documentation":"<p>Contains details about the analyzed resource.</p>"
+    },
+    "AnalyzedResourceSummary":{
+      "type":"structure",
+      "required":[
+        "resourceArn",
+        "resourceOwnerAccount",
+        "resourceType"
+      ],
+      "members":{
+        "resourceArn":{
+          "shape":"ResourceArn",
+          "documentation":"<p>The ARN of the analyzed resource.</p>"
+        },
+        "resourceOwnerAccount":{
+          "shape":"String",
+          "documentation":"<p>The AWS account ID that owns the resource.</p>"
+        },
+        "resourceType":{
+          "shape":"ResourceType",
+          "documentation":"<p>The type of resource that was analyzed.</p>"
+        }
+      },
+      "documentation":"<p>Contains the ARN of the analyzed resource.</p>"
+    },
+    "AnalyzedResourcesList":{
+      "type":"list",
+      "member":{"shape":"AnalyzedResourceSummary"}
+    },
+    "AnalyzerArn":{
+      "type":"string",
+      "pattern":"^[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:analyzer/.{1,255}$"
+    },
+    "AnalyzerStatus":{
+      "type":"string",
+      "enum":[
+        "ACTIVE",
+        "CREATING",
+        "DISABLED",
+        "FAILED"
+      ]
+    },
+    "AnalyzerSummary":{
+      "type":"structure",
+      "required":[
+        "arn",
+        "createdAt",
+        "name",
+        "status",
+        "type"
+      ],
+      "members":{
+        "arn":{
+          "shape":"AnalyzerArn",
+          "documentation":"<p>The ARN of the analyzer.</p>"
+        },
+        "createdAt":{
+          "shape":"Timestamp",
+          "documentation":"<p>A timestamp for the time at which the analyzer was created.</p>"
+        },
+        "lastResourceAnalyzed":{
+          "shape":"String",
+          "documentation":"<p>The resource that was most recently analyzed by the analyzer.</p>"
+        },
+        "lastResourceAnalyzedAt":{
+          "shape":"Timestamp",
+          "documentation":"<p>The time at which the most recently analyzed resource was analyzed.</p>"
+        },
+        "name":{
+          "shape":"Name",
+          "documentation":"<p>The name of the analyzer.</p>"
+        },
+        "status":{
+          "shape":"AnalyzerStatus",
+          "documentation":"<p>The status of the analyzer. An <code>Active</code> analyzer successfully monitors supported resources and generates new findings. The analyzer is <code>Disabled</code> when a user action, such as removing trusted access for IAM Access Analyzer from AWS Organizations, causes the analyzer to stop generating new findings. The status is <code>Creating</code> when the analyzer creation is in progress and <code>Failed</code> when the analyzer creation has failed. </p>"
+        },
+        "statusReason":{
+          "shape":"StatusReason",
+          "documentation":"<p>The <code>statusReason</code> provides more details about the current status of the analyzer. For example, if the creation for the analyzer fails, a <code>Failed</code> status is displayed. For an analyzer with organization as the type, this failure can be due to an issue with creating the service-linked roles required in the member accounts of the AWS organization.</p>"
+        },
+        "tags":{
+          "shape":"TagsMap",
+          "documentation":"<p>The tags added to the analyzer.</p>"
+        },
+        "type":{
+          "shape":"Type",
+          "documentation":"<p>The type of analyzer, which corresponds to the zone of trust chosen for the analyzer.</p>"
+        }
+      },
+      "documentation":"<p>Contains information about the analyzer.</p>"
+    },
+    "AnalyzersList":{
+      "type":"list",
+      "member":{"shape":"AnalyzerSummary"}
+    },
+    "ArchiveRuleSummary":{
+      "type":"structure",
+      "required":[
+        "createdAt",
+        "filter",
+        "ruleName",
+        "updatedAt"
+      ],
+      "members":{
+        "createdAt":{
+          "shape":"Timestamp",
+          "documentation":"<p>The time at which the archive rule was created.</p>"
+        },
+        "filter":{
+          "shape":"FilterCriteriaMap",
+          "documentation":"<p>A filter used to define the archive rule.</p>"
+        },
+        "ruleName":{
+          "shape":"Name",
+          "documentation":"<p>The name of the archive rule.</p>"
+        },
+        "updatedAt":{
+          "shape":"Timestamp",
+          "documentation":"<p>The time at which the archive rule was last updated.</p>"
+        }
+      },
+      "documentation":"<p>Contains information about an archive rule.</p>"
+    },
+    "ArchiveRulesList":{
+      "type":"list",
+      "member":{"shape":"ArchiveRuleSummary"}
+    },
+    "Boolean":{
+      "type":"boolean",
+      "box":true
+    },
+    "ConditionKeyMap":{
+      "type":"map",
+      "key":{"shape":"String"},
+      "value":{"shape":"String"}
+    },
+    "ConflictException":{
+      "type":"structure",
+      "required":[
+        "message",
+        "resourceId",
+        "resourceType"
+      ],
+      "members":{
+        "message":{"shape":"String"},
+        "resourceId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the resource.</p>"
+        },
+        "resourceType":{
+          "shape":"String",
+          "documentation":"<p>The resource type.</p>"
+        }
+      },
+      "documentation":"<p>A conflict exception error.</p>",
+      "error":{
+        "httpStatusCode":409,
+        "senderFault":true
+      },
+      "exception":true
+    },
+    "CreateAnalyzerRequest":{
+      "type":"structure",
+      "required":[
+        "analyzerName",
+        "type"
+      ],
+      "members":{
+        "analyzerName":{
+          "shape":"Name",
+          "documentation":"<p>The name of the analyzer to create.</p>"
+        },
+        "archiveRules":{
+          "shape":"InlineArchiveRulesList",
+          "documentation":"<p>Specifies the archive rules to add for the analyzer. Archive rules automatically archive findings that meet the criteria you define for the rule.</p>"
+        },
+        "clientToken":{
+          "shape":"String",
+          "documentation":"<p>A client token.</p>",
+          "idempotencyToken":true
+        },
+        "tags":{
+          "shape":"TagsMap",
+          "documentation":"<p>The tags to apply to the analyzer.</p>"
+        },
+        "type":{
+          "shape":"Type",
+          "documentation":"<p>The type of analyzer to create. Only ACCOUNT analyzers are supported. You can create only one analyzer per account per Region.</p>"
+        }
+      },
+      "documentation":"<p>Creates an analyzer.</p>"
+    },
+    "CreateAnalyzerResponse":{
+      "type":"structure",
+      "members":{
+        "arn":{
+          "shape":"AnalyzerArn",
+          "documentation":"<p>The ARN of the analyzer that was created by the request.</p>"
+        }
+      },
+      "documentation":"<p>The response to the request to create an analyzer.</p>"
+    },
+    "CreateArchiveRuleRequest":{
+      "type":"structure",
+      "required":[
+        "analyzerName",
+        "filter",
+        "ruleName"
+      ],
+      "members":{
+        "analyzerName":{
+          "shape":"Name",
+          "documentation":"<p>The name of the created analyzer.</p>",
+          "location":"uri",
+          "locationName":"analyzerName"
+        },
+        "clientToken":{
+          "shape":"String",
+          "documentation":"<p>A client token.</p>",
+          "idempotencyToken":true
+        },
+        "filter":{
+          "shape":"FilterCriteriaMap",
+          "documentation":"<p>The criteria for the rule.</p>"
+        },
+        "ruleName":{
+          "shape":"Name",
+          "documentation":"<p>The name of the rule to create.</p>"
+        }
+      },
+      "documentation":"<p>Creates an archive rule.</p>"
+    },
+    "Criterion":{
+      "type":"structure",
+      "members":{
+        "contains":{
+          "shape":"ValueList",
+          "documentation":"<p>A \"contains\" operator to match for the filter used to create the rule.</p>"
+        },
+        "eq":{
+          "shape":"ValueList",
+          "documentation":"<p>An \"equals\" operator to match for the filter used to create the rule.</p>"
+        },
+        "exists":{
+          "shape":"Boolean",
+          "documentation":"<p>An \"exists\" operator to match for the filter used to create the rule. </p>"
+        },
+        "neq":{
+          "shape":"ValueList",
+          "documentation":"<p>A \"not equals\" operator to match for the filter used to create the rule.</p>"
+        }
+      },
+      "documentation":"<p>The criteria to use in the filter that defines the archive rule.</p>"
+    },
+    "DeleteAnalyzerRequest":{
+      "type":"structure",
+      "required":["analyzerName"],
+      "members":{
+        "analyzerName":{
+          "shape":"Name",
+          "documentation":"<p>The name of the analyzer to delete.</p>",
+          "location":"uri",
+          "locationName":"analyzerName"
+        },
+        "clientToken":{
+          "shape":"String",
+          "documentation":"<p>A client token.</p>",
+          "idempotencyToken":true,
+          "location":"querystring",
+          "locationName":"clientToken"
+        }
+      },
+      "documentation":"<p>Deletes an analyzer.</p>"
+    },
+    "DeleteArchiveRuleRequest":{
+      "type":"structure",
+      "required":[
+        "analyzerName",
+        "ruleName"
+      ],
+      "members":{
+        "analyzerName":{
+          "shape":"Name",
+          "documentation":"<p>The name of the analyzer that associated with the archive rule to delete.</p>",
+          "location":"uri",
+          "locationName":"analyzerName"
+        },
+        "clientToken":{
+          "shape":"String",
+          "documentation":"<p>A client token.</p>",
+          "idempotencyToken":true,
+          "location":"querystring",
+          "locationName":"clientToken"
+        },
+        "ruleName":{
+          "shape":"Name",
+          "documentation":"<p>The name of the rule to delete.</p>",
+          "location":"uri",
+          "locationName":"ruleName"
+        }
+      },
+      "documentation":"<p>Deletes an archive rule.</p>"
+    },
+    "FilterCriteriaMap":{
+      "type":"map",
+      "key":{"shape":"String"},
+      "value":{"shape":"Criterion"}
+    },
+    "Finding":{
+      "type":"structure",
+      "required":[
+        "analyzedAt",
+        "condition",
+        "createdAt",
+        "id",
+        "resourceOwnerAccount",
+        "resourceType",
+        "status",
+        "updatedAt"
+      ],
+      "members":{
+        "action":{
+          "shape":"ActionList",
+          "documentation":"<p>The action in the analyzed policy statement that an external principal has permission to use.</p>"
+        },
+        "analyzedAt":{
+          "shape":"Timestamp",
+          "documentation":"<p>The time at which the resource was analyzed.</p>"
+        },
+        "condition":{
+          "shape":"ConditionKeyMap",
+          "documentation":"<p>The condition in the analyzed policy statement that resulted in a finding.</p>"
+        },
+        "createdAt":{
+          "shape":"Timestamp",
+          "documentation":"<p>The time at which the finding was generated.</p>"
+        },
+        "error":{
+          "shape":"String",
+          "documentation":"<p>An error.</p>"
+        },
+        "id":{
+          "shape":"FindingId",
+          "documentation":"<p>The ID of the finding.</p>"
+        },
+        "isPublic":{
+          "shape":"Boolean",
+          "documentation":"<p>Indicates whether the policy that generated the finding allows public access to the resource.</p>"
+        },
+        "principal":{
+          "shape":"PrincipalMap",
+          "documentation":"<p>The external principal that access to a resource within the zone of trust.</p>"
+        },
+        "resource":{
+          "shape":"String",
+          "documentation":"<p>The resource that an external principal has access to.</p>"
+        },
+        "resourceOwnerAccount":{
+          "shape":"String",
+          "documentation":"<p>The AWS account ID that owns the resource.</p>"
+        },
+        "resourceType":{
+          "shape":"ResourceType",
+          "documentation":"<p>The type of the resource reported in the finding.</p>"
+        },
+        "status":{
+          "shape":"FindingStatus",
+          "documentation":"<p>The current status of the finding.</p>"
+        },
+        "updatedAt":{
+          "shape":"Timestamp",
+          "documentation":"<p>The time at which the finding was updated.</p>"
+        }
+      },
+      "documentation":"<p>Contains information about a finding.</p>"
+    },
+    "FindingId":{"type":"string"},
+    "FindingIdList":{
+      "type":"list",
+      "member":{"shape":"FindingId"}
+    },
+    "FindingStatus":{
+      "type":"string",
+      "enum":[
+        "ACTIVE",
+        "ARCHIVED",
+        "RESOLVED"
+      ]
+    },
+    "FindingStatusUpdate":{
+      "type":"string",
+      "enum":[
+        "ACTIVE",
+        "ARCHIVED"
+      ]
+    },
+    "FindingSummary":{
+      "type":"structure",
+      "required":[
+        "analyzedAt",
+        "condition",
+        "createdAt",
+        "id",
+        "resourceOwnerAccount",
+        "resourceType",
+        "status",
+        "updatedAt"
+      ],
+      "members":{
+        "action":{
+          "shape":"ActionList",
+          "documentation":"<p>The action in the analyzed policy statement that an external principal has permission to use.</p>"
+        },
+        "analyzedAt":{
+          "shape":"Timestamp",
+          "documentation":"<p>The time at which the resource-based policy that generated the finding was analyzed.</p>"
+        },
+        "condition":{
+          "shape":"ConditionKeyMap",
+          "documentation":"<p>The condition in the analyzed policy statement that resulted in a finding.</p>"
+        },
+        "createdAt":{
+          "shape":"Timestamp",
+          "documentation":"<p>The time at which the finding was created.</p>"
+        },
+        "error":{
+          "shape":"String",
+          "documentation":"<p>The error that resulted in an Error finding.</p>"
+        },
+        "id":{
+          "shape":"FindingId",
+          "documentation":"<p>The ID of the finding.</p>"
+        },
+        "isPublic":{
+          "shape":"Boolean",
+          "documentation":"<p>Indicates whether the finding reports a resource that has a policy that allows public access.</p>"
+        },
+        "principal":{
+          "shape":"PrincipalMap",
+          "documentation":"<p>The external principal that has access to a resource within the zone of trust.</p>"
+        },
+        "resource":{
+          "shape":"String",
+          "documentation":"<p>The resource that the external principal has access to.</p>"
+        },
+        "resourceOwnerAccount":{
+          "shape":"String",
+          "documentation":"<p>The AWS account ID that owns the resource.</p>"
+        },
+        "resourceType":{
+          "shape":"ResourceType",
+          "documentation":"<p>The type of the resource that the external principal has access to.</p>"
+        },
+        "status":{
+          "shape":"FindingStatus",
+          "documentation":"<p>The status of the finding.</p>"
+        },
+        "updatedAt":{
+          "shape":"Timestamp",
+          "documentation":"<p>The time at which the finding was most recently updated.</p>"
+        }
+      },
+      "documentation":"<p>Contains information about a finding.</p>"
+    },
+    "FindingsList":{
+      "type":"list",
+      "member":{"shape":"FindingSummary"}
+    },
+    "GetAnalyzedResourceRequest":{
+      "type":"structure",
+      "required":[
+        "analyzerArn",
+        "resourceArn"
+      ],
+      "members":{
+        "analyzerArn":{
+          "shape":"AnalyzerArn",
+          "documentation":"<p>The ARN of the analyzer to retrieve information from.</p>",
+          "location":"querystring",
+          "locationName":"analyzerArn"
+        },
+        "resourceArn":{
+          "shape":"ResourceArn",
+          "documentation":"<p>The ARN of the resource to retrieve information about.</p>",
+          "location":"querystring",
+          "locationName":"resourceArn"
+        }
+      },
+      "documentation":"<p>Retrieves an analyzed resource.</p>"
+    },
+    "GetAnalyzedResourceResponse":{
+      "type":"structure",
+      "members":{
+        "resource":{
+          "shape":"AnalyzedResource",
+          "documentation":"<p>An <code>AnalyedResource</code> object that contains information that Access Analyzer found when it analyzed the resource.</p>"
+        }
+      },
+      "documentation":"<p>The response to the request.</p>"
+    },
+    "GetAnalyzerRequest":{
+      "type":"structure",
+      "required":["analyzerName"],
+      "members":{
+        "analyzerName":{
+          "shape":"Name",
+          "documentation":"<p>The name of the analyzer retrieved.</p>",
+          "location":"uri",
+          "locationName":"analyzerName"
+        }
+      },
+      "documentation":"<p>Retrieves an analyzer.</p>"
+    },
+    "GetAnalyzerResponse":{
+      "type":"structure",
+      "required":["analyzer"],
+      "members":{
+        "analyzer":{
+          "shape":"AnalyzerSummary",
+          "documentation":"<p>An <code>AnalyzerSummary</code> object that contains information about the analyzer.</p>"
+        }
+      },
+      "documentation":"<p>The response to the request.</p>"
+    },
+    "GetArchiveRuleRequest":{
+      "type":"structure",
+      "required":[
+        "analyzerName",
+        "ruleName"
+      ],
+      "members":{
+        "analyzerName":{
+          "shape":"Name",
+          "documentation":"<p>The name of the analyzer to retrieve rules from.</p>",
+          "location":"uri",
+          "locationName":"analyzerName"
+        },
+        "ruleName":{
+          "shape":"Name",
+          "documentation":"<p>The name of the rule to retrieve.</p>",
+          "location":"uri",
+          "locationName":"ruleName"
+        }
+      },
+      "documentation":"<p>Retrieves an archive rule.</p>"
+    },
+    "GetArchiveRuleResponse":{
+      "type":"structure",
+      "required":["archiveRule"],
+      "members":{
+        "archiveRule":{"shape":"ArchiveRuleSummary"}
+      },
+      "documentation":"<p>The response to the request.</p>"
+    },
+    "GetFindingRequest":{
+      "type":"structure",
+      "required":[
+        "analyzerArn",
+        "id"
+      ],
+      "members":{
+        "analyzerArn":{
+          "shape":"AnalyzerArn",
+          "documentation":"<p>The ARN of the analyzer that generated the finding.</p>",
+          "location":"querystring",
+          "locationName":"analyzerArn"
+        },
+        "id":{
+          "shape":"FindingId",
+          "documentation":"<p>The ID of the finding to retrieve.</p>",
+          "location":"uri",
+          "locationName":"id"
+        }
+      },
+      "documentation":"<p>Retrieves a finding.</p>"
+    },
+    "GetFindingResponse":{
+      "type":"structure",
+      "members":{
+        "finding":{
+          "shape":"Finding",
+          "documentation":"<p>A <code>finding</code> object that contains finding details.</p>"
+        }
+      },
+      "documentation":"<p>The response to the request.</p>"
+    },
+    "InlineArchiveRule":{
+      "type":"structure",
+      "required":[
+        "filter",
+        "ruleName"
+      ],
+      "members":{
+        "filter":{
+          "shape":"FilterCriteriaMap",
+          "documentation":"<p>The condition and values for a criterion.</p>"
+        },
+        "ruleName":{
+          "shape":"Name",
+          "documentation":"<p>The name of the rule.</p>"
+        }
+      },
+      "documentation":"<p>An criterion statement in an archive rule. Each archive rule may have multiple criteria.</p>"
+    },
+    "InlineArchiveRulesList":{
+      "type":"list",
+      "member":{"shape":"InlineArchiveRule"}
+    },
+    "Integer":{
+      "type":"integer",
+      "box":true
+    },
+    "InternalServerException":{
+      "type":"structure",
+      "required":["message"],
+      "members":{
+        "message":{"shape":"String"},
+        "retryAfterSeconds":{
+          "shape":"Integer",
+          "documentation":"<p>The seconds to wait to retry.</p>",
+          "location":"header",
+          "locationName":"Retry-After"
+        }
+      },
+      "documentation":"<p>Internal server error.</p>",
+      "error":{"httpStatusCode":500},
+      "exception":true,
+      "fault":true
+    },
+    "ListAnalyzedResourcesRequest":{
+      "type":"structure",
+      "required":["analyzerArn"],
+      "members":{
+        "analyzerArn":{
+          "shape":"AnalyzerArn",
+          "documentation":"<p>The ARN of the analyzer to retrieve a list of analyzed resources from.</p>"
+        },
+        "maxResults":{
+          "shape":"Integer",
+          "documentation":"<p>The maximum number of results to return in the response.</p>"
+        },
+        "nextToken":{
+          "shape":"Token",
+          "documentation":"<p>A token used for pagination of results returned.</p>"
+        },
+        "resourceType":{
+          "shape":"ResourceType",
+          "documentation":"<p>The type of resource.</p>"
+        }
+      },
+      "documentation":"<p>Retrieves a list of resources that have been analyzed.</p>"
+    },
+    "ListAnalyzedResourcesResponse":{
+      "type":"structure",
+      "required":["analyzedResources"],
+      "members":{
+        "analyzedResources":{
+          "shape":"AnalyzedResourcesList",
+          "documentation":"<p>A list of resources that were analyzed.</p>"
+        },
+        "nextToken":{
+          "shape":"Token",
+          "documentation":"<p>A token used for pagination of results returned.</p>"
+        }
+      },
+      "documentation":"<p>The response to the request.</p>"
+    },
+    "ListAnalyzersRequest":{
+      "type":"structure",
+      "members":{
+        "maxResults":{
+          "shape":"Integer",
+          "documentation":"<p>The maximum number of results to return in the response.</p>",
+          "location":"querystring",
+          "locationName":"maxResults"
+        },
+        "nextToken":{
+          "shape":"Token",
+          "documentation":"<p>A token used for pagination of results returned.</p>",
+          "location":"querystring",
+          "locationName":"nextToken"
+        },
+        "type":{
+          "shape":"Type",
+          "documentation":"<p>The type of analyzer.</p>",
+          "location":"querystring",
+          "locationName":"type"
+        }
+      },
+      "documentation":"<p>Retrieves a list of analyzers.</p>"
+    },
+    "ListAnalyzersResponse":{
+      "type":"structure",
+      "required":["analyzers"],
+      "members":{
+        "analyzers":{
+          "shape":"AnalyzersList",
+          "documentation":"<p>The analyzers retrieved.</p>"
+        },
+        "nextToken":{
+          "shape":"Token",
+          "documentation":"<p>A token used for pagination of results returned.</p>"
+        }
+      },
+      "documentation":"<p>The response to the request.</p>"
+    },
+    "ListArchiveRulesRequest":{
+      "type":"structure",
+      "required":["analyzerName"],
+      "members":{
+        "analyzerName":{
+          "shape":"Name",
+          "documentation":"<p>The name of the analyzer to retrieve rules from.</p>",
+          "location":"uri",
+          "locationName":"analyzerName"
+        },
+        "maxResults":{
+          "shape":"Integer",
+          "documentation":"<p>The maximum number of results to return in the request.</p>",
+          "location":"querystring",
+          "locationName":"maxResults"
+        },
+        "nextToken":{
+          "shape":"Token",
+          "documentation":"<p>A token used for pagination of results returned.</p>",
+          "location":"querystring",
+          "locationName":"nextToken"
+        }
+      },
+      "documentation":"<p>Retrieves a list of archive rules created for the specified analyzer.</p>"
+    },
+    "ListArchiveRulesResponse":{
+      "type":"structure",
+      "required":["archiveRules"],
+      "members":{
+        "archiveRules":{
+          "shape":"ArchiveRulesList",
+          "documentation":"<p>A list of archive rules created for the specified analyzer.</p>"
+        },
+        "nextToken":{
+          "shape":"Token",
+          "documentation":"<p>A token used for pagination of results returned.</p>"
+        }
+      },
+      "documentation":"<p>The response to the request.</p>"
+    },
+    "ListFindingsRequest":{
+      "type":"structure",
+      "required":["analyzerArn"],
+      "members":{
+        "analyzerArn":{
+          "shape":"AnalyzerArn",
+          "documentation":"<p>The ARN of the analyzer to retrieve findings from.</p>"
+        },
+        "filter":{
+          "shape":"FilterCriteriaMap",
+          "documentation":"<p>A filter to match for the findings to return.</p>"
+        },
+        "maxResults":{
+          "shape":"Integer",
+          "documentation":"<p>The maximum number of results to return in the response.</p>"
+        },
+        "nextToken":{
+          "shape":"Token",
+          "documentation":"<p>A token used for pagination of results returned.</p>"
+        },
+        "sort":{
+          "shape":"SortCriteria",
+          "documentation":"<p>The sort order for the findings returned.</p>"
+        }
+      },
+      "documentation":"<p>Retrieves a list of findings generated by the specified analyzer.</p>"
+    },
+    "ListFindingsResponse":{
+      "type":"structure",
+      "required":["findings"],
+      "members":{
+        "findings":{
+          "shape":"FindingsList",
+          "documentation":"<p>A list of findings retrieved from the analyzer that match the filter criteria specified, if any.</p>"
+        },
+        "nextToken":{
+          "shape":"Token",
+          "documentation":"<p>A token used for pagination of results returned.</p>"
+        }
+      },
+      "documentation":"<p>The response to the request.</p>"
+    },
+    "ListTagsForResourceRequest":{
+      "type":"structure",
+      "required":["resourceArn"],
+      "members":{
+        "resourceArn":{
+          "shape":"String",
+          "documentation":"<p>The ARN of the resource to retrieve tags from.</p>",
+          "location":"uri",
+          "locationName":"resourceArn"
+        }
+      },
+      "documentation":"<p>Retrieves a list of tags applied to the specified resource.</p>"
+    },
+    "ListTagsForResourceResponse":{
+      "type":"structure",
+      "members":{
+        "tags":{
+          "shape":"TagsMap",
+          "documentation":"<p>The tags that are applied to the specified resource.</p>"
+        }
+      },
+      "documentation":"<p>The response to the request.</p>"
+    },
+    "Name":{
+      "type":"string",
+      "max":255,
+      "min":1,
+      "pattern":"^[A-Za-z][A-Za-z0-9_.-]*$"
+    },
+    "OrderBy":{
+      "type":"string",
+      "enum":[
+        "ASC",
+        "DESC"
+      ]
+    },
+    "PrincipalMap":{
+      "type":"map",
+      "key":{"shape":"String"},
+      "value":{"shape":"String"}
+    },
+    "ReasonCode":{
+      "type":"string",
+      "enum":[
+        "AWS_SERVICE_ACCESS_DISABLED",
+        "DELEGATED_ADMINISTRATOR_DEREGISTERED",
+        "ORGANIZATION_DELETED",
+        "SERVICE_LINKED_ROLE_CREATION_FAILED"
+      ]
+    },
+    "ResourceArn":{
+      "type":"string",
+      "pattern":"arn:[^:]*:[^:]*:[^:]*:[^:]*:.*$"
+    },
+    "ResourceNotFoundException":{
+      "type":"structure",
+      "required":[
+        "message",
+        "resourceId",
+        "resourceType"
+      ],
+      "members":{
+        "message":{"shape":"String"},
+        "resourceId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the resource.</p>"
+        },
+        "resourceType":{
+          "shape":"String",
+          "documentation":"<p>The type of the resource.</p>"
+        }
+      },
+      "documentation":"<p>The specified resource could not be found.</p>",
+      "error":{
+        "httpStatusCode":404,
+        "senderFault":true
+      },
+      "exception":true
+    },
+    "ResourceType":{
+      "type":"string",
+      "enum":[
+        "AWS::IAM::Role",
+        "AWS::KMS::Key",
+        "AWS::Lambda::Function",
+        "AWS::Lambda::LayerVersion",
+        "AWS::S3::Bucket",
+        "AWS::SQS::Queue"
+      ]
+    },
+    "ServiceQuotaExceededException":{
+      "type":"structure",
+      "required":[
+        "message",
+        "resourceId",
+        "resourceType"
+      ],
+      "members":{
+        "message":{"shape":"String"},
+        "resourceId":{
+          "shape":"String",
+          "documentation":"<p>The resource ID.</p>"
+        },
+        "resourceType":{
+          "shape":"String",
+          "documentation":"<p>The resource type.</p>"
+        }
+      },
+      "documentation":"<p>Service quote met error.</p>",
+      "error":{
+        "httpStatusCode":402,
+        "senderFault":true
+      },
+      "exception":true
+    },
+    "SharedViaList":{
+      "type":"list",
+      "member":{"shape":"String"}
+    },
+    "SortCriteria":{
+      "type":"structure",
+      "members":{
+        "attributeName":{
+          "shape":"String",
+          "documentation":"<p>The name of the attribute to sort on.</p>"
+        },
+        "orderBy":{
+          "shape":"OrderBy",
+          "documentation":"<p>The sort order, ascending or descending.</p>"
+        }
+      },
+      "documentation":"<p>The criteria used to sort.</p>"
+    },
+    "StartResourceScanRequest":{
+      "type":"structure",
+      "required":[
+        "analyzerArn",
+        "resourceArn"
+      ],
+      "members":{
+        "analyzerArn":{
+          "shape":"AnalyzerArn",
+          "documentation":"<p>The ARN of the analyzer to use to scan the policies applied to the specified resource.</p>"
+        },
+        "resourceArn":{
+          "shape":"ResourceArn",
+          "documentation":"<p>The ARN of the resource to scan.</p>"
+        }
+      },
+      "documentation":"<p>Starts a scan of the policies applied to the specified resource.</p>"
+    },
+    "StatusReason":{
+      "type":"structure",
+      "required":["code"],
+      "members":{
+        "code":{
+          "shape":"ReasonCode",
+          "documentation":"<p>The reason code for the current status of the analyzer.</p>"
+        }
+      },
+      "documentation":"<p>Provides more details about the current status of the analyzer. For example, if the creation for the analyzer fails, a <code>Failed</code> status is displayed. For an analyzer with organization as the type, this failure can be due to an issue with creating the service-linked roles required in the member accounts of the AWS organization.</p>"
+    },
+    "String":{"type":"string"},
+    "TagKeys":{
+      "type":"list",
+      "member":{"shape":"String"}
+    },
+    "TagResourceRequest":{
+      "type":"structure",
+      "required":[
+        "resourceArn",
+        "tags"
+      ],
+      "members":{
+        "resourceArn":{
+          "shape":"String",
+          "documentation":"<p>The ARN of the resource to add the tag to.</p>",
+          "location":"uri",
+          "locationName":"resourceArn"
+        },
+        "tags":{
+          "shape":"TagsMap",
+          "documentation":"<p>The tags to add to the resource.</p>"
+        }
+      },
+      "documentation":"<p>Adds a tag to the specified resource.</p>"
+    },
+    "TagResourceResponse":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>The response to the request.</p>"
+    },
+    "TagsMap":{
+      "type":"map",
+      "key":{"shape":"String"},
+      "value":{"shape":"String"}
+    },
+    "ThrottlingException":{
+      "type":"structure",
+      "required":["message"],
+      "members":{
+        "message":{"shape":"String"},
+        "retryAfterSeconds":{
+          "shape":"Integer",
+          "documentation":"<p>The seconds to wait to retry.</p>",
+          "location":"header",
+          "locationName":"Retry-After"
+        }
+      },
+      "documentation":"<p>Throttling limit exceeded error.</p>",
+      "error":{
+        "httpStatusCode":429,
+        "senderFault":true
+      },
+      "exception":true
+    },
+    "Timestamp":{
+      "type":"timestamp",
+      "timestampFormat":"iso8601"
+    },
+    "Token":{"type":"string"},
+    "Type":{
+      "type":"string",
+      "enum":[
+        "ACCOUNT",
+        "ORGANIZATION"
+      ]
+    },
+    "UntagResourceRequest":{
+      "type":"structure",
+      "required":[
+        "resourceArn",
+        "tagKeys"
+      ],
+      "members":{
+        "resourceArn":{
+          "shape":"String",
+          "documentation":"<p>The ARN of the resource to remove the tag from.</p>",
+          "location":"uri",
+          "locationName":"resourceArn"
+        },
+        "tagKeys":{
+          "shape":"TagKeys",
+          "documentation":"<p>The key for the tag to add.</p>",
+          "location":"querystring",
+          "locationName":"tagKeys"
+        }
+      },
+      "documentation":"<p>Removes a tag from the specified resource.</p>"
+    },
+    "UntagResourceResponse":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>The response to the request.</p>"
+    },
+    "UpdateArchiveRuleRequest":{
+      "type":"structure",
+      "required":[
+        "analyzerName",
+        "filter",
+        "ruleName"
+      ],
+      "members":{
+        "analyzerName":{
+          "shape":"Name",
+          "documentation":"<p>The name of the analyzer to update the archive rules for.</p>",
+          "location":"uri",
+          "locationName":"analyzerName"
+        },
+        "clientToken":{
+          "shape":"String",
+          "documentation":"<p>A client token.</p>",
+          "idempotencyToken":true
+        },
+        "filter":{
+          "shape":"FilterCriteriaMap",
+          "documentation":"<p>A filter to match for the rules to update. Only rules that match the filter are updated.</p>"
+        },
+        "ruleName":{
+          "shape":"Name",
+          "documentation":"<p>The name of the rule to update.</p>",
+          "location":"uri",
+          "locationName":"ruleName"
+        }
+      },
+      "documentation":"<p>Updates the specified archive rule.</p>"
+    },
+    "UpdateFindingsRequest":{
+      "type":"structure",
+      "required":[
+        "analyzerArn",
+        "status"
+      ],
+      "members":{
+        "analyzerArn":{
+          "shape":"AnalyzerArn",
+          "documentation":"<p>The ARN of the analyzer that generated the findings to update.</p>"
+        },
+        "clientToken":{
+          "shape":"String",
+          "documentation":"<p>A client token.</p>",
+          "idempotencyToken":true
+        },
+        "ids":{
+          "shape":"FindingIdList",
+          "documentation":"<p>The IDs of the findings to update.</p>"
+        },
+        "resourceArn":{
+          "shape":"ResourceArn",
+          "documentation":"<p>The ARN of the resource identified in the finding.</p>"
+        },
+        "status":{
+          "shape":"FindingStatusUpdate",
+          "documentation":"<p>The state represents the action to take to update the finding Status. Use <code>ARCHIVE</code> to change an Active finding to an Archived finding. Use <code>ACTIVE</code> to change an Archived finding to an Active finding.</p>"
+        }
+      },
+      "documentation":"<p>Updates findings with the new values provided in the request.</p>"
+    },
+    "ValidationException":{
+      "type":"structure",
+      "required":[
+        "message",
+        "reason"
+      ],
+      "members":{
+        "fieldList":{
+          "shape":"ValidationExceptionFieldList",
+          "documentation":"<p>A list of fields that didn't validate.</p>"
+        },
+        "message":{"shape":"String"},
+        "reason":{
+          "shape":"ValidationExceptionReason",
+          "documentation":"<p>The reason for the exception.</p>"
+        }
+      },
+      "documentation":"<p>Validation exception error.</p>",
+      "error":{
+        "httpStatusCode":400,
+        "senderFault":true
+      },
+      "exception":true
+    },
+    "ValidationExceptionField":{
+      "type":"structure",
+      "required":[
+        "message",
+        "name"
+      ],
+      "members":{
+        "message":{
+          "shape":"String",
+          "documentation":"<p>A message about the validation exception.</p>"
+        },
+        "name":{
+          "shape":"String",
+          "documentation":"<p>The name of the validation exception.</p>"
+        }
+      },
+      "documentation":"<p>Contains information about a validation exception.</p>"
+    },
+    "ValidationExceptionFieldList":{
+      "type":"list",
+      "member":{"shape":"ValidationExceptionField"}
+    },
+    "ValidationExceptionReason":{
+      "type":"string",
+      "enum":[
+        "cannotParse",
+        "fieldValidationFailed",
+        "other",
+        "unknownOperation"
+      ]
+    },
+    "ValueList":{
+      "type":"list",
+      "member":{"shape":"String"},
+      "max":20,
+      "min":1
+    }
+  },
+  "documentation":"<p>AWS IAM Access Analyzer helps identify potential resource-access risks by enabling you to identify any policies that grant access to an external principal. It does this by using logic-based reasoning to analyze resource-based policies in your AWS environment. An external principal can be another AWS account, a root user, an IAM user or role, a federated user, an AWS service, or an anonymous user. This guide describes the AWS IAM Access Analyzer operations that you can call programmatically. For general information about Access Analyzer, see the <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/what-is-access-analyzer.html\">AWS IAM Access Analyzer section of the IAM User Guide</a>.</p> <p>To start using Access Analyzer, you first need to create an analyzer.</p>"
+}
diff --git a/services/acm/build.properties b/services/acm/build.properties
index ecf2dae6fcb1..15ec2da1fc71 100644
--- a/services/acm/build.properties
+++ b/services/acm/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/acm/pom.xml b/services/acm/pom.xml
index bff0104e62c5..3430494dfa61 100644
--- a/services/acm/pom.xml
+++ b/services/acm/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>acm</artifactId>
     <name>AWS Java SDK :: Services :: AWS Certificate Manager</name>
diff --git a/services/acm/src/it/java/software/amazon/awssdk/services/acm/AwsCertficateManagerIntegrationTest.java b/services/acm/src/it/java/software/amazon/awssdk/services/acm/AwsCertficateManagerIntegrationTest.java
index c52b257e3217..253b8d348e9b 100644
--- a/services/acm/src/it/java/software/amazon/awssdk/services/acm/AwsCertficateManagerIntegrationTest.java
+++ b/services/acm/src/it/java/software/amazon/awssdk/services/acm/AwsCertficateManagerIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/acm/src/main/resources/codegen-resources/service-2.json b/services/acm/src/main/resources/codegen-resources/service-2.json
index daf9bca9facf..103600b74ed6 100644
--- a/services/acm/src/main/resources/codegen-resources/service-2.json
+++ b/services/acm/src/main/resources/codegen-resources/service-2.json
@@ -24,7 +24,9 @@
         {"shape":"ResourceNotFoundException"},
         {"shape":"InvalidArnException"},
         {"shape":"InvalidTagException"},
-        {"shape":"TooManyTagsException"}
+        {"shape":"TooManyTagsException"},
+        {"shape":"TagPolicyException"},
+        {"shape":"InvalidParameterException"}
       ],
       "documentation":"<p>Adds one or more tags to an ACM certificate. Tags are labels that you can use to identify and organize your AWS resources. Each tag consists of a <code>key</code> and an optional <code>value</code>. You specify the certificate on input by its Amazon Resource Name (ARN). You specify the tag by using a key-value pair. </p> <p>You can apply a tag to just one certificate if you want to identify a specific characteristic of that certificate, or you can apply the same tag to multiple certificates if you want to filter for a common relationship among those certificates. Similarly, you can apply the same tag to multiple resources if you want to specify a relationship among those resources. For example, you can add the same tag to an ACM certificate and an Elastic Load Balancing load balancer to indicate that they are both used by the same website. For more information, see <a href=\"https://docs.aws.amazon.com/acm/latest/userguide/tags.html\">Tagging ACM certificates</a>. </p> <p>To remove one or more tags, use the <a>RemoveTagsFromCertificate</a> action. To view all of the tags that have been applied to the certificate, use the <a>ListTagsForCertificate</a> action. </p>"
     },
@@ -69,7 +71,7 @@
         {"shape":"RequestInProgressException"},
         {"shape":"InvalidArnException"}
       ],
-      "documentation":"<p>Exports a private certificate issued by a private certificate authority (CA) for use anywhere. You can export the certificate, the certificate chain, and the encrypted private key associated with the public key embedded in the certificate. You must store the private key securely. The private key is a 2048 bit RSA key. You must provide a passphrase for the private key when exporting it. You can use the following OpenSSL command to decrypt it later. Provide the passphrase when prompted. </p> <p> <code>openssl rsa -in encrypted_key.pem -out decrypted_key.pem</code> </p>"
+      "documentation":"<p>Exports a private certificate issued by a private certificate authority (CA) for use anywhere. The exported file contains the certificate, the certificate chain, and the encrypted private 2048-bit RSA key associated with the public key that is embedded in the certificate. For security, you must assign a passphrase for the private key when exporting it. </p> <p>For information about exporting and formatting a certificate using the ACM console or CLI, see <a href=\"https://docs.aws.amazon.com/acm/latest/userguide/gs-acm-export-private.html\">Export a Private Certificate</a>.</p>"
     },
     "GetCertificate":{
       "name":"GetCertificate",
@@ -84,7 +86,7 @@
         {"shape":"RequestInProgressException"},
         {"shape":"InvalidArnException"}
       ],
-      "documentation":"<p>Retrieves a certificate specified by an ARN and its certificate chain . The chain is an ordered list of certificates that contains the end entity certificate, intermediate certificates of subordinate CAs, and the root certificate in that order. The certificate and certificate chain are base64 encoded. If you want to decode the certificate to see the individual fields, you can use OpenSSL.</p>"
+      "documentation":"<p>Retrieves an Amazon-issued certificate and its certificate chain. The chain consists of the certificate of the issuing CA and the intermediate certificates of any other subordinate CAs. All of the certificates are base64 encoded. You can use <a href=\"https://wiki.openssl.org/index.php/Command_Line_Utilities\">OpenSSL</a> to decode the certificates and inspect individual fields.</p>"
     },
     "ImportCertificate":{
       "name":"ImportCertificate",
@@ -96,9 +98,13 @@
       "output":{"shape":"ImportCertificateResponse"},
       "errors":[
         {"shape":"ResourceNotFoundException"},
-        {"shape":"LimitExceededException"}
+        {"shape":"LimitExceededException"},
+        {"shape":"InvalidTagException"},
+        {"shape":"TooManyTagsException"},
+        {"shape":"TagPolicyException"},
+        {"shape":"InvalidParameterException"}
       ],
-      "documentation":"<p>Imports a certificate into AWS Certificate Manager (ACM) to use with services that are integrated with ACM. Note that <a href=\"https://docs.aws.amazon.com/acm/latest/userguide/acm-services.html\">integrated services</a> allow only certificate types and keys they support to be associated with their resources. Further, their support differs depending on whether the certificate is imported into IAM or into ACM. For more information, see the documentation for each service. For more information about importing certificates into ACM, see <a href=\"https://docs.aws.amazon.com/acm/latest/userguide/import-certificate.html\">Importing Certificates</a> in the <i>AWS Certificate Manager User Guide</i>. </p> <note> <p>ACM does not provide <a href=\"https://docs.aws.amazon.com/acm/latest/userguide/acm-renewal.html\">managed renewal</a> for certificates that you import.</p> </note> <p>Note the following guidelines when importing third party certificates:</p> <ul> <li> <p>You must enter the private key that matches the certificate you are importing.</p> </li> <li> <p>The private key must be unencrypted. You cannot import a private key that is protected by a password or a passphrase.</p> </li> <li> <p>If the certificate you are importing is not self-signed, you must enter its certificate chain.</p> </li> <li> <p>If a certificate chain is included, the issuer must be the subject of one of the certificates in the chain.</p> </li> <li> <p>The certificate, private key, and certificate chain must be PEM-encoded.</p> </li> <li> <p>The current time must be between the <code>Not Before</code> and <code>Not After</code> certificate fields.</p> </li> <li> <p>The <code>Issuer</code> field must not be empty.</p> </li> <li> <p>The OCSP authority URL, if present, must not exceed 1000 characters.</p> </li> <li> <p>To import a new certificate, omit the <code>CertificateArn</code> argument. Include this argument only when you want to replace a previously imported certificate.</p> </li> <li> <p>When you import a certificate by using the CLI, you must specify the certificate, the certificate chain, and the private key by their file names preceded by <code>file://</code>. For example, you can specify a certificate saved in the <code>C:\\temp</code> folder as <code>file://C:\\temp\\certificate_to_import.pem</code>. If you are making an HTTP or HTTPS Query request, include these arguments as BLOBs. </p> </li> <li> <p>When you import a certificate by using an SDK, you must specify the certificate, the certificate chain, and the private key files in the manner required by the programming language you're using. </p> </li> </ul> <p>This operation returns the <a href=\"https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html\">Amazon Resource Name (ARN)</a> of the imported certificate.</p>"
+      "documentation":"<p>Imports a certificate into AWS Certificate Manager (ACM) to use with services that are integrated with ACM. Note that <a href=\"https://docs.aws.amazon.com/acm/latest/userguide/acm-services.html\">integrated services</a> allow only certificate types and keys they support to be associated with their resources. Further, their support differs depending on whether the certificate is imported into IAM or into ACM. For more information, see the documentation for each service. For more information about importing certificates into ACM, see <a href=\"https://docs.aws.amazon.com/acm/latest/userguide/import-certificate.html\">Importing Certificates</a> in the <i>AWS Certificate Manager User Guide</i>. </p> <note> <p>ACM does not provide <a href=\"https://docs.aws.amazon.com/acm/latest/userguide/acm-renewal.html\">managed renewal</a> for certificates that you import.</p> </note> <p>Note the following guidelines when importing third party certificates:</p> <ul> <li> <p>You must enter the private key that matches the certificate you are importing.</p> </li> <li> <p>The private key must be unencrypted. You cannot import a private key that is protected by a password or a passphrase.</p> </li> <li> <p>If the certificate you are importing is not self-signed, you must enter its certificate chain.</p> </li> <li> <p>If a certificate chain is included, the issuer must be the subject of one of the certificates in the chain.</p> </li> <li> <p>The certificate, private key, and certificate chain must be PEM-encoded.</p> </li> <li> <p>The current time must be between the <code>Not Before</code> and <code>Not After</code> certificate fields.</p> </li> <li> <p>The <code>Issuer</code> field must not be empty.</p> </li> <li> <p>The OCSP authority URL, if present, must not exceed 1000 characters.</p> </li> <li> <p>To import a new certificate, omit the <code>CertificateArn</code> argument. Include this argument only when you want to replace a previously imported certifica</p> </li> <li> <p>When you import a certificate by using the CLI, you must specify the certificate, the certificate chain, and the private key by their file names preceded by <code>file://</code>. For example, you can specify a certificate saved in the <code>C:\\temp</code> folder as <code>file://C:\\temp\\certificate_to_import.pem</code>. If you are making an HTTP or HTTPS Query request, include these arguments as BLOBs. </p> </li> <li> <p>When you import a certificate by using an SDK, you must specify the certificate, the certificate chain, and the private key files in the manner required by the programming language you're using. </p> </li> <li> <p>The cryptographic algorithm of an imported certificate must match the algorithm of the signing CA. For example, if the signing CA key type is RSA, then the certificate key type must also be RSA.</p> </li> </ul> <p>This operation returns the <a href=\"https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html\">Amazon Resource Name (ARN)</a> of the imported certificate.</p>"
     },
     "ListCertificates":{
       "name":"ListCertificates",
@@ -111,7 +117,7 @@
       "errors":[
         {"shape":"InvalidArgsException"}
       ],
-      "documentation":"<p>Retrieves a list of certificate ARNs and domain names. You can request that only certificates that match a specific status be listed. You can also filter by specific attributes of the certificate. </p>"
+      "documentation":"<p>Retrieves a list of certificate ARNs and domain names. You can request that only certificates that match a specific status be listed. You can also filter by specific attributes of the certificate. Default filtering returns only <code>RSA_2048</code> certificates. For more information, see <a>Filters</a>.</p>"
     },
     "ListTagsForCertificate":{
       "name":"ListTagsForCertificate",
@@ -137,7 +143,9 @@
       "errors":[
         {"shape":"ResourceNotFoundException"},
         {"shape":"InvalidArnException"},
-        {"shape":"InvalidTagException"}
+        {"shape":"InvalidTagException"},
+        {"shape":"TagPolicyException"},
+        {"shape":"InvalidParameterException"}
       ],
       "documentation":"<p>Remove one or more tags from an ACM certificate. A tag consists of a key-value pair. If you do not specify the value portion of the tag when calling this function, the tag will be removed regardless of value. If you specify a value, the tag is removed only if it is associated with the specified value. </p> <p>To add tags to a certificate, use the <a>AddTagsToCertificate</a> action. To view all of the tags that have been applied to a specific ACM certificate, use the <a>ListTagsForCertificate</a> action. </p>"
     },
@@ -165,7 +173,11 @@
       "errors":[
         {"shape":"LimitExceededException"},
         {"shape":"InvalidDomainValidationOptionsException"},
-        {"shape":"InvalidArnException"}
+        {"shape":"InvalidArnException"},
+        {"shape":"InvalidTagException"},
+        {"shape":"TooManyTagsException"},
+        {"shape":"TagPolicyException"},
+        {"shape":"InvalidParameterException"}
       ],
       "documentation":"<p>Requests an ACM certificate for use with other AWS services. To request an ACM certificate, you must specify a fully qualified domain name (FQDN) in the <code>DomainName</code> parameter. You can also specify additional FQDNs in the <code>SubjectAlternativeNames</code> parameter. </p> <p>If you are requesting a private certificate, domain validation is not required. If you are requesting a public certificate, each domain name that you specify must be validated to verify that you own or control the domain. You can use <a href=\"https://docs.aws.amazon.com/acm/latest/userguide/gs-acm-validate-dns.html\">DNS validation</a> or <a href=\"https://docs.aws.amazon.com/acm/latest/userguide/gs-acm-validate-email.html\">email validation</a>. We recommend that you use DNS validation. ACM issues public certificates after receiving approval from the domain owner. </p>"
     },
@@ -486,7 +498,7 @@
         },
         "ResourceRecord":{
           "shape":"ResourceRecord",
-          "documentation":"<p>Contains the CNAME record that you add to your DNS database for domain validation. For more information, see <a href=\"https://docs.aws.amazon.com/acm/latest/userguide/gs-acm-validate-dns.html\">Use DNS to Validate Domain Ownership</a>.</p>"
+          "documentation":"<p>Contains the CNAME record that you add to your DNS database for domain validation. For more information, see <a href=\"https://docs.aws.amazon.com/acm/latest/userguide/gs-acm-validate-dns.html\">Use DNS to Validate Domain Ownership</a>.</p> <p>Note: The CNAME information that you need does not include the name of your domain. If you include&#x2028; your domain name in the DNS database CNAME record, validation fails.&#x2028; For example, if the name is \"_a79865eb4cd1a6ab990a45779b4e0b96.yourdomain.com\", only \"_a79865eb4cd1a6ab990a45779b4e0b96\" must be used.</p>"
         },
         "ValidationMethod":{
           "shape":"ValidationMethod",
@@ -611,6 +623,7 @@
         "PCA_INVALID_ARN",
         "PCA_INVALID_STATE",
         "PCA_REQUEST_FAILED",
+        "PCA_NAME_CONSTRAINTS_VALIDATION",
         "PCA_RESOURCE_NOT_FOUND",
         "PCA_INVALID_ARGS",
         "PCA_INVALID_DURATION",
@@ -631,7 +644,7 @@
         },
         "keyTypes":{
           "shape":"KeyAlgorithmList",
-          "documentation":"<p>Specify one or more algorithms that can be used to generate key pairs.</p>"
+          "documentation":"<p>Specify one or more algorithms that can be used to generate key pairs.</p> <p>Default filtering returns only <code>RSA_2048</code> certificates. To return other certificate types, provide the desired type signatures in a comma-separated list. For example, <code>\"keyTypes\": [\"RSA_2048,RSA_4096\"]</code> returns both <code>RSA_2048</code> and <code>RSA_4096</code> certificates.</p>"
         }
       },
       "documentation":"<p>This structure can be used in the <a>ListCertificates</a> action to filter the output of the certificate list. </p>"
@@ -651,11 +664,11 @@
       "members":{
         "Certificate":{
           "shape":"CertificateBody",
-          "documentation":"<p>String that contains the ACM certificate represented by the ARN specified at input.</p>"
+          "documentation":"<p>The ACM-issued certificate corresponding to the ARN specified as input.</p>"
         },
         "CertificateChain":{
           "shape":"CertificateChain",
-          "documentation":"<p>The certificate chain that contains the root certificate issued by the certificate authority (CA).</p>"
+          "documentation":"<p>Certificates forming the requested certificate's chain of trust. The chain consists of the certificate of the issuing CA and the intermediate certificates of any other subordinate CAs. </p>"
         }
       }
     },
@@ -687,6 +700,10 @@
         "CertificateChain":{
           "shape":"CertificateChainBlob",
           "documentation":"<p>The PEM encoded certificate chain.</p>"
+        },
+        "Tags":{
+          "shape":"TagList",
+          "documentation":"<p>One or more resource tags to associate with the imported certificate. </p> <p>Note: You cannot apply tags when reimporting a certificate.</p>"
         }
       }
     },
@@ -727,6 +744,14 @@
       "documentation":"<p>One or more values in the <a>DomainValidationOption</a> structure is incorrect.</p>",
       "exception":true
     },
+    "InvalidParameterException":{
+      "type":"structure",
+      "members":{
+        "message":{"shape":"String"}
+      },
+      "documentation":"<p>An input parameter was invalid.</p>",
+      "exception":true
+    },
     "InvalidStateException":{
       "type":"structure",
       "members":{
@@ -797,7 +822,7 @@
       "members":{
         "message":{"shape":"String"}
       },
-      "documentation":"<p>An ACM limit has been exceeded.</p>",
+      "documentation":"<p>An ACM quota has been exceeded.</p>",
       "exception":true
     },
     "ListCertificatesRequest":{
@@ -860,7 +885,7 @@
     },
     "NextToken":{
       "type":"string",
-      "max":320,
+      "max":10000,
       "min":1,
       "pattern":"[\\u0009\\u000A\\u000D\\u0020-\\u00FF]*"
     },
@@ -879,7 +904,7 @@
     },
     "PrivateKeyBlob":{
       "type":"blob",
-      "max":524288,
+      "max":5120,
       "min":1,
       "sensitive":true
     },
@@ -963,7 +988,7 @@
       "members":{
         "DomainName":{
           "shape":"DomainNameString",
-          "documentation":"<p> Fully qualified domain name (FQDN), such as www.example.com, that you want to secure with an ACM certificate. Use an asterisk (*) to create a wildcard certificate that protects several sites in the same domain. For example, *.example.com protects www.example.com, site.example.com, and images.example.com. </p> <p> The first domain name you enter cannot exceed 63 octets, including periods. Each subsequent Subject Alternative Name (SAN), however, can be up to 253 octets in length. </p>"
+          "documentation":"<p> Fully qualified domain name (FQDN), such as www.example.com, that you want to secure with an ACM certificate. Use an asterisk (*) to create a wildcard certificate that protects several sites in the same domain. For example, *.example.com protects www.example.com, site.example.com, and images.example.com. </p> <p> The first domain name you enter cannot exceed 64 octets, including periods. Each subsequent Subject Alternative Name (SAN), however, can be up to 253 octets in length. </p>"
         },
         "ValidationMethod":{
           "shape":"ValidationMethod",
@@ -971,7 +996,7 @@
         },
         "SubjectAlternativeNames":{
           "shape":"DomainList",
-          "documentation":"<p>Additional FQDNs to be included in the Subject Alternative Name extension of the ACM certificate. For example, add the name www.example.net to a certificate for which the <code>DomainName</code> field is www.example.com if users can reach your site by using either name. The maximum number of domain names that you can add to an ACM certificate is 100. However, the initial limit is 10 domain names. If you need more than 10 names, you must request a limit increase. For more information, see <a href=\"https://docs.aws.amazon.com/acm/latest/userguide/acm-limits.html\">Limits</a>.</p> <p> The maximum length of a SAN DNS name is 253 octets. The name is made up of multiple labels separated by periods. No label can be longer than 63 octets. Consider the following examples: </p> <ul> <li> <p> <code>(63 octets).(63 octets).(63 octets).(61 octets)</code> is legal because the total length is 253 octets (63+1+63+1+63+1+61) and no label exceeds 63 octets.</p> </li> <li> <p> <code>(64 octets).(63 octets).(63 octets).(61 octets)</code> is not legal because the total length exceeds 253 octets (64+1+63+1+63+1+61) and the first label exceeds 63 octets.</p> </li> <li> <p> <code>(63 octets).(63 octets).(63 octets).(62 octets)</code> is not legal because the total length of the DNS name (63+1+63+1+63+1+62) exceeds 253 octets.</p> </li> </ul>"
+          "documentation":"<p>Additional FQDNs to be included in the Subject Alternative Name extension of the ACM certificate. For example, add the name www.example.net to a certificate for which the <code>DomainName</code> field is www.example.com if users can reach your site by using either name. The maximum number of domain names that you can add to an ACM certificate is 100. However, the initial quota is 10 domain names. If you need more than 10 names, you must request a quota increase. For more information, see <a href=\"https://docs.aws.amazon.com/acm/latest/userguide/acm-limits.html\">Quotas</a>.</p> <p> The maximum length of a SAN DNS name is 253 octets. The name is made up of multiple labels separated by periods. No label can be longer than 63 octets. Consider the following examples: </p> <ul> <li> <p> <code>(63 octets).(63 octets).(63 octets).(61 octets)</code> is legal because the total length is 253 octets (63+1+63+1+63+1+61) and no label exceeds 63 octets.</p> </li> <li> <p> <code>(64 octets).(63 octets).(63 octets).(61 octets)</code> is not legal because the total length exceeds 253 octets (64+1+63+1+63+1+61) and the first label exceeds 63 octets.</p> </li> <li> <p> <code>(63 octets).(63 octets).(63 octets).(62 octets)</code> is not legal because the total length of the DNS name (63+1+63+1+63+1+62) exceeds 253 octets.</p> </li> </ul>"
         },
         "IdempotencyToken":{
           "shape":"IdempotencyToken",
@@ -988,6 +1013,10 @@
         "CertificateAuthorityArn":{
           "shape":"Arn",
           "documentation":"<p>The Amazon Resource Name (ARN) of the private certificate authority (CA) that will be used to issue the certificate. If you do not provide an ARN and you are trying to request a private certificate, ACM will attempt to issue a public certificate. For more information about private CAs, see the <a href=\"https://docs.aws.amazon.com/acm-pca/latest/userguide/PcaWelcome.html\">AWS Certificate Manager Private Certificate Authority (PCA)</a> user guide. The ARN must have the following form: </p> <p> <code>arn:aws:acm-pca:region:account:certificate-authority/12345678-1234-1234-1234-123456789012</code> </p>"
+        },
+        "Tags":{
+          "shape":"TagList",
+          "documentation":"<p>One or more resource tags to associate with the certificate.</p>"
         }
       }
     },
@@ -1113,6 +1142,14 @@
       "max":50,
       "min":1
     },
+    "TagPolicyException":{
+      "type":"structure",
+      "members":{
+        "message":{"shape":"String"}
+      },
+      "documentation":"<p>A specified tag did not comply with an existing tag policy and was rejected.</p>",
+      "exception":true
+    },
     "TagValue":{
       "type":"string",
       "max":256,
diff --git a/services/acm/src/test/resources/cucumber.properties b/services/acm/src/test/resources/cucumber.properties
index 0b630fb0f3f6..d87fea49f6f1 100644
--- a/services/acm/src/test/resources/cucumber.properties
+++ b/services/acm/src/test/resources/cucumber.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/acmpca/pom.xml b/services/acmpca/pom.xml
index c07061ca3e21..d364e0ea274e 100644
--- a/services/acmpca/pom.xml
+++ b/services/acmpca/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>acmpca</artifactId>
     <name>AWS Java SDK :: Services :: ACM PCA</name>
diff --git a/services/alexaforbusiness/pom.xml b/services/alexaforbusiness/pom.xml
index 7fb1d049a341..2c31428dec03 100644
--- a/services/alexaforbusiness/pom.xml
+++ b/services/alexaforbusiness/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>services</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>alexaforbusiness</artifactId>
diff --git a/services/alexaforbusiness/src/main/resources/codegen-resources/service-2.json b/services/alexaforbusiness/src/main/resources/codegen-resources/service-2.json
index 375690ff6304..868cf9aa6799 100644
--- a/services/alexaforbusiness/src/main/resources/codegen-resources/service-2.json
+++ b/services/alexaforbusiness/src/main/resources/codegen-resources/service-2.json
@@ -708,7 +708,7 @@
       },
       "input":{"shape":"ListBusinessReportSchedulesRequest"},
       "output":{"shape":"ListBusinessReportSchedulesResponse"},
-      "documentation":"<p>Lists the details of the schedules that a user configured.</p>"
+      "documentation":"<p>Lists the details of the schedules that a user configured. A download URL of the report associated with each schedule is returned every time this action is called. A new download URL is returned each time, and is valid for 24 hours.</p>"
     },
     "ListConferenceProviders":{
       "name":"ListConferenceProviders",
@@ -1545,7 +1545,8 @@
       "type":"string",
       "enum":[
         "ONE_DAY",
-        "ONE_WEEK"
+        "ONE_WEEK",
+        "THIRTY_DAYS"
       ]
     },
     "BusinessReportRecurrence":{
@@ -1752,6 +1753,7 @@
         "OFFLINE"
       ]
     },
+    "ConnectionStatusUpdatedTime":{"type":"timestamp"},
     "Contact":{
       "type":"structure",
       "members":{
@@ -2015,6 +2017,29 @@
         }
       }
     },
+    "CreateEndOfMeetingReminder":{
+      "type":"structure",
+      "required":[
+        "ReminderAtMinutes",
+        "ReminderType",
+        "Enabled"
+      ],
+      "members":{
+        "ReminderAtMinutes":{
+          "shape":"EndOfMeetingReminderMinutesList",
+          "documentation":"<p> A range of 3 to 15 minutes that determines when the reminder begins.</p>"
+        },
+        "ReminderType":{
+          "shape":"EndOfMeetingReminderType",
+          "documentation":"<p>The type of sound that users hear during the end of meeting reminder. </p>"
+        },
+        "Enabled":{
+          "shape":"Boolean",
+          "documentation":"<p>Whether an end of meeting reminder is enabled or not.</p>"
+        }
+      },
+      "documentation":"<p>Creates settings for the end of meeting reminder feature that are applied to a room profile. The end of meeting reminder enables Alexa to remind users when a meeting is ending.</p>"
+    },
     "CreateGatewayGroupRequest":{
       "type":"structure",
       "required":[
@@ -2046,6 +2071,43 @@
         }
       }
     },
+    "CreateInstantBooking":{
+      "type":"structure",
+      "required":[
+        "DurationInMinutes",
+        "Enabled"
+      ],
+      "members":{
+        "DurationInMinutes":{
+          "shape":"Minutes",
+          "documentation":"<p>Duration between 15 and 240 minutes at increments of 15 that determines how long to book an available room when a meeting is started with Alexa.</p>"
+        },
+        "Enabled":{
+          "shape":"Boolean",
+          "documentation":"<p>Whether instant booking is enabled or not.</p>"
+        }
+      },
+      "documentation":"<p>Creates settings for the instant booking feature that are applied to a room profile. When users start their meeting with Alexa, Alexa automatically books the room for the configured duration if the room is available.</p>"
+    },
+    "CreateMeetingRoomConfiguration":{
+      "type":"structure",
+      "members":{
+        "RoomUtilizationMetricsEnabled":{
+          "shape":"Boolean",
+          "documentation":"<p>Whether room utilization metrics are enabled or not.</p>"
+        },
+        "EndOfMeetingReminder":{"shape":"CreateEndOfMeetingReminder"},
+        "InstantBooking":{
+          "shape":"CreateInstantBooking",
+          "documentation":"<p>Settings to automatically book a room for a configured duration if it's free when joining a meeting with Alexa.</p>"
+        },
+        "RequireCheckIn":{
+          "shape":"CreateRequireCheckIn",
+          "documentation":"<p>Settings for requiring a check in when a room is reserved. Alexa can cancel a room reservation if it's not checked into to make the room available for others. Users can check in by joining the meeting with Alexa or an AVS device, or by saying “Alexa, check in.”</p>"
+        }
+      },
+      "documentation":"<p>Creates meeting room settings of a room profile.</p>"
+    },
     "CreateNetworkProfileRequest":{
       "type":"structure",
       "required":[
@@ -2143,7 +2205,7 @@
         },
         "Locale":{
           "shape":"DeviceLocale",
-          "documentation":"<p>The locale of the room profile.</p>"
+          "documentation":"<p>The locale of the room profile. (This is currently only available to a limited preview audience.)</p>"
         },
         "ClientRequestToken":{
           "shape":"ClientRequestToken",
@@ -2161,6 +2223,10 @@
         "PSTNEnabled":{
           "shape":"Boolean",
           "documentation":"<p>Whether PSTN calling is enabled.</p>"
+        },
+        "MeetingRoomConfiguration":{
+          "shape":"CreateMeetingRoomConfiguration",
+          "documentation":"<p>The meeting room settings of a room profile.</p>"
         }
       }
     },
@@ -2173,6 +2239,24 @@
         }
       }
     },
+    "CreateRequireCheckIn":{
+      "type":"structure",
+      "required":[
+        "ReleaseAfterMinutes",
+        "Enabled"
+      ],
+      "members":{
+        "ReleaseAfterMinutes":{
+          "shape":"Minutes",
+          "documentation":"<p>Duration between 5 and 20 minutes to determine when to release the room if it's not checked into.</p>"
+        },
+        "Enabled":{
+          "shape":"Boolean",
+          "documentation":"<p>Whether require check in is enabled or not.</p>"
+        }
+      },
+      "documentation":"<p>Creates settings for the require check in feature that are applied to a room profile. Require check in allows a meeting room’s Alexa or AVS device to prompt the user to check in; otherwise, the room will be released.</p>"
+    },
     "CreateRoomRequest":{
       "type":"structure",
       "required":["RoomName"],
@@ -2648,10 +2732,15 @@
         "DeviceStatusInfo":{
           "shape":"DeviceStatusInfo",
           "documentation":"<p>Detailed information about a device's status.</p>"
+        },
+        "CreatedTime":{
+          "shape":"DeviceDataCreatedTime",
+          "documentation":"<p>The time (in epoch) when the device data was created.</p>"
         }
       },
       "documentation":"<p>Device attributes.</p>"
     },
+    "DeviceDataCreatedTime":{"type":"timestamp"},
     "DeviceDataList":{
       "type":"list",
       "member":{"shape":"DeviceData"}
@@ -2790,6 +2879,10 @@
         "ConnectionStatus":{
           "shape":"ConnectionStatus",
           "documentation":"<p>The latest available information about the connection status of a device. </p>"
+        },
+        "ConnectionStatusUpdatedTime":{
+          "shape":"ConnectionStatusUpdatedTime",
+          "documentation":"<p>The time (in epoch) when the device connection status changed.</p>"
         }
       },
       "documentation":"<p>Detailed information about a device's status.</p>"
@@ -2917,6 +3010,39 @@
         "PENDING"
       ]
     },
+    "EndOfMeetingReminder":{
+      "type":"structure",
+      "members":{
+        "ReminderAtMinutes":{
+          "shape":"EndOfMeetingReminderMinutesList",
+          "documentation":"<p>A range of 3 to 15 minutes that determines when the reminder begins.</p>"
+        },
+        "ReminderType":{
+          "shape":"EndOfMeetingReminderType",
+          "documentation":"<p>The type of sound that users hear during the end of meeting reminder. </p>"
+        },
+        "Enabled":{
+          "shape":"Boolean",
+          "documentation":"<p>Whether an end of meeting reminder is enabled or not.</p>"
+        }
+      },
+      "documentation":"<p>Settings for the end of meeting reminder feature that are applied to a room profile. The end of meeting reminder enables Alexa to remind users when a meeting is ending. </p>"
+    },
+    "EndOfMeetingReminderMinutesList":{
+      "type":"list",
+      "member":{"shape":"Minutes"},
+      "max":1,
+      "min":1
+    },
+    "EndOfMeetingReminderType":{
+      "type":"string",
+      "enum":[
+        "ANNOUNCEMENT_TIME_CHECK",
+        "ANNOUNCEMENT_VARIABLE_TIME_LEFT",
+        "CHIME",
+        "KNOCK"
+      ]
+    },
     "EndUserLicenseAgreement":{"type":"string"},
     "Endpoint":{
       "type":"string",
@@ -3406,6 +3532,20 @@
       "documentation":"<p>The IP endpoint and protocol for calling.</p>"
     },
     "IconUrl":{"type":"string"},
+    "InstantBooking":{
+      "type":"structure",
+      "members":{
+        "DurationInMinutes":{
+          "shape":"Minutes",
+          "documentation":"<p>Duration between 15 and 240 minutes at increments of 15 that determines how long to book an available room when a meeting is started with Alexa. </p>"
+        },
+        "Enabled":{
+          "shape":"Boolean",
+          "documentation":"<p>Whether instant booking is enabled or not.</p>"
+        }
+      },
+      "documentation":"<p>Settings for the instant booking feature that are applied to a room profile. When users start their meeting with Alexa, Alexa automatically books the room for the configured duration if the room is available.</p>"
+    },
     "InvalidCertificateAuthorityException":{
       "type":"structure",
       "members":{
@@ -3607,11 +3747,11 @@
       "members":{
         "SkillGroupArn":{
           "shape":"Arn",
-          "documentation":"<p>The ARN of the skill group for which to list enabled skills. Required.</p>"
+          "documentation":"<p>The ARN of the skill group for which to list enabled skills.</p>"
         },
         "EnablementType":{
           "shape":"EnablementTypeFilter",
-          "documentation":"<p>Whether the skill is enabled under the user's account, or if it requires linking to be used.</p>"
+          "documentation":"<p>Whether the skill is enabled under the user's account.</p>"
         },
         "SkillType":{
           "shape":"SkillTypeFilter",
@@ -3619,11 +3759,11 @@
         },
         "NextToken":{
           "shape":"NextToken",
-          "documentation":"<p>An optional token returned from a prior request. Use this token for pagination of results from this action. If this parameter is specified, the response includes only results beyond the token, up to the value specified by <code>MaxResults</code>. Required.</p>"
+          "documentation":"<p>An optional token returned from a prior request. Use this token for pagination of results from this action. If this parameter is specified, the response includes only results beyond the token, up to the value specified by <code>MaxResults</code>.</p>"
         },
         "MaxResults":{
           "shape":"SkillListMaxResults",
-          "documentation":"<p>The maximum number of results to include in the response. If more results exist than the specified <code>MaxResults</code> value, a token is included in the response so that the remaining results can be retrieved. Required.</p>"
+          "documentation":"<p>The maximum number of results to include in the response. If more results exist than the specified <code>MaxResults</code> value, a token is included in the response so that the remaining results can be retrieved.</p>"
         }
       }
     },
@@ -3770,6 +3910,28 @@
       "min":1
     },
     "MaxVolumeLimit":{"type":"integer"},
+    "MeetingRoomConfiguration":{
+      "type":"structure",
+      "members":{
+        "RoomUtilizationMetricsEnabled":{
+          "shape":"Boolean",
+          "documentation":"<p>Whether room utilization metrics are enabled or not.</p>"
+        },
+        "EndOfMeetingReminder":{
+          "shape":"EndOfMeetingReminder",
+          "documentation":"<p>Settings for the end of meeting reminder feature that are applied to a room profile. The end of meeting reminder enables Alexa to remind users when a meeting is ending. </p>"
+        },
+        "InstantBooking":{
+          "shape":"InstantBooking",
+          "documentation":"<p>Settings to automatically book the room if available for a configured duration when joining a meeting with Alexa. </p>"
+        },
+        "RequireCheckIn":{
+          "shape":"RequireCheckIn",
+          "documentation":"<p>Settings for requiring a check in when a room is reserved. Alexa can cancel a room reservation if it's not checked into. This makes the room available for others. Users can check in by joining the meeting with Alexa or an AVS device, or by saying “Alexa, check in.” </p>"
+        }
+      },
+      "documentation":"<p>Meeting room settings of a room profile.</p>"
+    },
     "MeetingSetting":{
       "type":"structure",
       "required":["RequirePin"],
@@ -3781,6 +3943,7 @@
       },
       "documentation":"<p>The values that indicate whether a pin is always required (YES), never required (NO), or OPTIONAL.</p> <ul> <li> <p>If YES, Alexa will always ask for a meeting pin.</p> </li> <li> <p>If NO, Alexa will never ask for a meeting pin.</p> </li> <li> <p>If OPTIONAL, Alexa will ask if you have a meeting pin and if the customer responds with yes, it will ask for the meeting pin.</p> </li> </ul>"
     },
+    "Minutes":{"type":"integer"},
     "NameInUseException":{
       "type":"structure",
       "members":{
@@ -4053,7 +4216,7 @@
         },
         "Locale":{
           "shape":"DeviceLocale",
-          "documentation":"<p>The locale of a room profile.</p>"
+          "documentation":"<p>The locale of a room profile. (This is currently available only to a limited preview audience.)</p>"
         },
         "SetupModeDisabled":{
           "shape":"Boolean",
@@ -4070,6 +4233,10 @@
         "AddressBookArn":{
           "shape":"Arn",
           "documentation":"<p>The ARN of the address book.</p>"
+        },
+        "MeetingRoomConfiguration":{
+          "shape":"MeetingRoomConfiguration",
+          "documentation":"<p>Meeting room settings of a room profile.</p>"
         }
       },
       "documentation":"<p>A room profile with attributes.</p>"
@@ -4095,7 +4262,7 @@
         },
         "Timezone":{
           "shape":"Timezone",
-          "documentation":"<p>The timezone of a room profile.</p>"
+          "documentation":"<p>The time zone of a room profile.</p>"
         },
         "DistanceUnit":{
           "shape":"DistanceUnit",
@@ -4111,7 +4278,7 @@
         },
         "Locale":{
           "shape":"DeviceLocale",
-          "documentation":"<p>The locale of a room profile.</p>"
+          "documentation":"<p>The locale of a room profile. (This is currently available only to a limited preview audience.)</p>"
         }
       },
       "documentation":"<p>The data of a room profile.</p>"
@@ -4285,6 +4452,20 @@
       }
     },
     "ReleaseDate":{"type":"string"},
+    "RequireCheckIn":{
+      "type":"structure",
+      "members":{
+        "ReleaseAfterMinutes":{
+          "shape":"Minutes",
+          "documentation":"<p>Duration between 5 and 20 minutes to determine when to release the room if it's not checked into. </p>"
+        },
+        "Enabled":{
+          "shape":"Boolean",
+          "documentation":"<p>Whether require check in is enabled or not.</p>"
+        }
+      },
+      "documentation":"<p>Settings for the require check in feature that are applied to a room profile. Require check in allows a meeting room’s Alexa or AVS device to prompt the user to check in; otherwise, the room will be released. </p>"
+    },
     "RequirePin":{
       "type":"string",
       "enum":[
@@ -5230,7 +5411,7 @@
         },
         "Value":{
           "shape":"TagValue",
-          "documentation":"<p>The value of a tag. Tag values are case-sensitive and can be null.</p>"
+          "documentation":"<p>The value of a tag. Tag values are case sensitive and can be null.</p>"
         }
       },
       "documentation":"<p>A key-value pair that can be associated with a resource. </p>"
@@ -5514,6 +5695,24 @@
       "members":{
       }
     },
+    "UpdateEndOfMeetingReminder":{
+      "type":"structure",
+      "members":{
+        "ReminderAtMinutes":{
+          "shape":"EndOfMeetingReminderMinutesList",
+          "documentation":"<p>Updates settings for the end of meeting reminder feature that are applied to a room profile. The end of meeting reminder enables Alexa to remind users when a meeting is ending. </p>"
+        },
+        "ReminderType":{
+          "shape":"EndOfMeetingReminderType",
+          "documentation":"<p>The type of sound that users hear during the end of meeting reminder. </p>"
+        },
+        "Enabled":{
+          "shape":"Boolean",
+          "documentation":"<p>Whether an end of meeting reminder is enabled or not.</p>"
+        }
+      },
+      "documentation":"<p>Settings for the end of meeting reminder feature that are applied to a room profile. The end of meeting reminder enables Alexa to remind users when a meeting is ending. </p>"
+    },
     "UpdateGatewayGroupRequest":{
       "type":"structure",
       "required":["GatewayGroupArn"],
@@ -5564,6 +5763,42 @@
       "members":{
       }
     },
+    "UpdateInstantBooking":{
+      "type":"structure",
+      "members":{
+        "DurationInMinutes":{
+          "shape":"Minutes",
+          "documentation":"<p>Duration between 15 and 240 minutes at increments of 15 that determines how long to book an available room when a meeting is started with Alexa.</p>"
+        },
+        "Enabled":{
+          "shape":"Boolean",
+          "documentation":"<p>Whether instant booking is enabled or not.</p>"
+        }
+      },
+      "documentation":"<p>Updates settings for the instant booking feature that are applied to a room profile. If instant booking is enabled, Alexa automatically reserves a room if it is free when a user joins a meeting with Alexa.</p>"
+    },
+    "UpdateMeetingRoomConfiguration":{
+      "type":"structure",
+      "members":{
+        "RoomUtilizationMetricsEnabled":{
+          "shape":"Boolean",
+          "documentation":"<p>Whether room utilization metrics are enabled or not.</p>"
+        },
+        "EndOfMeetingReminder":{
+          "shape":"UpdateEndOfMeetingReminder",
+          "documentation":"<p>Settings for the end of meeting reminder feature that are applied to a room profile. The end of meeting reminder enables Alexa to remind users when a meeting is ending. </p>"
+        },
+        "InstantBooking":{
+          "shape":"UpdateInstantBooking",
+          "documentation":"<p>Settings to automatically book an available room available for a configured duration when joining a meeting with Alexa.</p>"
+        },
+        "RequireCheckIn":{
+          "shape":"UpdateRequireCheckIn",
+          "documentation":"<p>Settings for requiring a check in when a room is reserved. Alexa can cancel a room reservation if it's not checked into to make the room available for others. Users can check in by joining the meeting with Alexa or an AVS device, or by saying “Alexa, check in.” </p>"
+        }
+      },
+      "documentation":"<p>Updates meeting room settings of a room profile.</p>"
+    },
     "UpdateNetworkProfileRequest":{
       "type":"structure",
       "required":["NetworkProfileArn"],
@@ -5640,7 +5875,7 @@
         },
         "Locale":{
           "shape":"DeviceLocale",
-          "documentation":"<p>The updated locale for the room profile.</p>"
+          "documentation":"<p>The updated locale for the room profile. (This is currently only available to a limited preview audience.)</p>"
         },
         "SetupModeDisabled":{
           "shape":"Boolean",
@@ -5653,6 +5888,10 @@
         "PSTNEnabled":{
           "shape":"Boolean",
           "documentation":"<p>Whether the PSTN setting of the room profile is enabled.</p>"
+        },
+        "MeetingRoomConfiguration":{
+          "shape":"UpdateMeetingRoomConfiguration",
+          "documentation":"<p>The updated meeting room settings of a room profile.</p>"
         }
       }
     },
@@ -5661,6 +5900,20 @@
       "members":{
       }
     },
+    "UpdateRequireCheckIn":{
+      "type":"structure",
+      "members":{
+        "ReleaseAfterMinutes":{
+          "shape":"Minutes",
+          "documentation":"<p>Duration between 5 and 20 minutes to determine when to release the room if it's not checked into. </p>"
+        },
+        "Enabled":{
+          "shape":"Boolean",
+          "documentation":"<p>Whether require check in is enabled or not.</p>"
+        }
+      },
+      "documentation":"<p>Updates settings for the require check in feature that are applied to a room profile. Require check in allows a meeting room’s Alexa or AVS device to prompt the user to check in; otherwise, the room will be released. </p>"
+    },
     "UpdateRoomRequest":{
       "type":"structure",
       "members":{
diff --git a/services/amplify/pom.xml b/services/amplify/pom.xml
index 035a7ea76d9d..adf9cb4fe41b 100644
--- a/services/amplify/pom.xml
+++ b/services/amplify/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>amplify</artifactId>
     <name>AWS Java SDK :: Services :: Amplify</name>
diff --git a/services/amplify/src/main/resources/codegen-resources/service-2.json b/services/amplify/src/main/resources/codegen-resources/service-2.json
index 35ea5265fd20..076a7dd80c20 100644
--- a/services/amplify/src/main/resources/codegen-resources/service-2.json
+++ b/services/amplify/src/main/resources/codegen-resources/service-2.json
@@ -30,6 +30,23 @@
       ],
       "documentation":"<p> Creates a new Amplify App. </p>"
     },
+    "CreateBackendEnvironment":{
+      "name":"CreateBackendEnvironment",
+      "http":{
+        "method":"POST",
+        "requestUri":"/apps/{appId}/backendenvironments"
+      },
+      "input":{"shape":"CreateBackendEnvironmentRequest"},
+      "output":{"shape":"CreateBackendEnvironmentResult"},
+      "errors":[
+        {"shape":"BadRequestException"},
+        {"shape":"UnauthorizedException"},
+        {"shape":"NotFoundException"},
+        {"shape":"InternalFailureException"},
+        {"shape":"LimitExceededException"}
+      ],
+      "documentation":"<p> Creates a new backend environment for an Amplify App. </p>"
+    },
     "CreateBranch":{
       "name":"CreateBranch",
       "http":{
@@ -117,6 +134,23 @@
       ],
       "documentation":"<p> Delete an existing Amplify App by appId. </p>"
     },
+    "DeleteBackendEnvironment":{
+      "name":"DeleteBackendEnvironment",
+      "http":{
+        "method":"DELETE",
+        "requestUri":"/apps/{appId}/backendenvironments/{environmentName}"
+      },
+      "input":{"shape":"DeleteBackendEnvironmentRequest"},
+      "output":{"shape":"DeleteBackendEnvironmentResult"},
+      "errors":[
+        {"shape":"BadRequestException"},
+        {"shape":"UnauthorizedException"},
+        {"shape":"NotFoundException"},
+        {"shape":"InternalFailureException"},
+        {"shape":"DependentServiceFailureException"}
+      ],
+      "documentation":"<p> Delete backend environment for an Amplify App. </p>"
+    },
     "DeleteBranch":{
       "name":"DeleteBranch",
       "http":{
@@ -234,6 +268,22 @@
       ],
       "documentation":"<p> Retrieves artifact info that corresponds to a artifactId. </p>"
     },
+    "GetBackendEnvironment":{
+      "name":"GetBackendEnvironment",
+      "http":{
+        "method":"GET",
+        "requestUri":"/apps/{appId}/backendenvironments/{environmentName}"
+      },
+      "input":{"shape":"GetBackendEnvironmentRequest"},
+      "output":{"shape":"GetBackendEnvironmentResult"},
+      "errors":[
+        {"shape":"BadRequestException"},
+        {"shape":"UnauthorizedException"},
+        {"shape":"NotFoundException"},
+        {"shape":"InternalFailureException"}
+      ],
+      "documentation":"<p> Retrieves a backend environment for an Amplify App. </p>"
+    },
     "GetBranch":{
       "name":"GetBranch",
       "http":{
@@ -331,6 +381,21 @@
       ],
       "documentation":"<p> List artifacts with an app, a branch, a job and an artifact type. </p>"
     },
+    "ListBackendEnvironments":{
+      "name":"ListBackendEnvironments",
+      "http":{
+        "method":"GET",
+        "requestUri":"/apps/{appId}/backendenvironments"
+      },
+      "input":{"shape":"ListBackendEnvironmentsRequest"},
+      "output":{"shape":"ListBackendEnvironmentsResult"},
+      "errors":[
+        {"shape":"BadRequestException"},
+        {"shape":"UnauthorizedException"},
+        {"shape":"InternalFailureException"}
+      ],
+      "documentation":"<p> Lists backend environments for an Amplify App. </p>"
+    },
     "ListBranches":{
       "name":"ListBranches",
       "http":{
@@ -782,11 +847,51 @@
       "type":"list",
       "member":{"shape":"AutoBranchCreationPattern"}
     },
+    "BackendEnvironment":{
+      "type":"structure",
+      "required":[
+        "backendEnvironmentArn",
+        "environmentName",
+        "createTime",
+        "updateTime"
+      ],
+      "members":{
+        "backendEnvironmentArn":{
+          "shape":"BackendEnvironmentArn",
+          "documentation":"<p> Arn for a backend environment, part of an Amplify App. </p>"
+        },
+        "environmentName":{
+          "shape":"EnvironmentName",
+          "documentation":"<p> Name for a backend environment, part of an Amplify App. </p>"
+        },
+        "stackName":{
+          "shape":"StackName",
+          "documentation":"<p> CloudFormation stack name of backend environment. </p>"
+        },
+        "deploymentArtifacts":{
+          "shape":"DeploymentArtifacts",
+          "documentation":"<p> Name of deployment artifacts. </p>"
+        },
+        "createTime":{
+          "shape":"CreateTime",
+          "documentation":"<p> Creation date and time for a backend environment, part of an Amplify App. </p>"
+        },
+        "updateTime":{
+          "shape":"UpdateTime",
+          "documentation":"<p> Last updated date and time for a backend environment, part of an Amplify App. </p>"
+        }
+      },
+      "documentation":"<p> Backend environment for an Amplify App. </p>"
+    },
     "BackendEnvironmentArn":{
       "type":"string",
       "max":1000,
       "min":1
     },
+    "BackendEnvironments":{
+      "type":"list",
+      "member":{"shape":"BackendEnvironment"}
+    },
     "BadRequestException":{
       "type":"structure",
       "members":{
@@ -1051,6 +1156,45 @@
         "app":{"shape":"App"}
       }
     },
+    "CreateBackendEnvironmentRequest":{
+      "type":"structure",
+      "required":[
+        "appId",
+        "environmentName"
+      ],
+      "members":{
+        "appId":{
+          "shape":"AppId",
+          "documentation":"<p> Unique Id for an Amplify App. </p>",
+          "location":"uri",
+          "locationName":"appId"
+        },
+        "environmentName":{
+          "shape":"EnvironmentName",
+          "documentation":"<p> Name for the backend environment. </p>"
+        },
+        "stackName":{
+          "shape":"StackName",
+          "documentation":"<p> CloudFormation stack name of backend environment. </p>"
+        },
+        "deploymentArtifacts":{
+          "shape":"DeploymentArtifacts",
+          "documentation":"<p> Name of deployment artifacts. </p>"
+        }
+      },
+      "documentation":"<p> Request structure for a backend environment create request. </p>"
+    },
+    "CreateBackendEnvironmentResult":{
+      "type":"structure",
+      "required":["backendEnvironment"],
+      "members":{
+        "backendEnvironment":{
+          "shape":"BackendEnvironment",
+          "documentation":"<p> Backend environment structure for an amplify App. </p>"
+        }
+      },
+      "documentation":"<p> Result structure for create backend environment. </p>"
+    },
     "CreateBranchRequest":{
       "type":"structure",
       "required":[
@@ -1335,6 +1479,39 @@
       },
       "documentation":"<p> Result structure for an Amplify App delete request. </p>"
     },
+    "DeleteBackendEnvironmentRequest":{
+      "type":"structure",
+      "required":[
+        "appId",
+        "environmentName"
+      ],
+      "members":{
+        "appId":{
+          "shape":"AppId",
+          "documentation":"<p> Unique Id of an Amplify App. </p>",
+          "location":"uri",
+          "locationName":"appId"
+        },
+        "environmentName":{
+          "shape":"EnvironmentName",
+          "documentation":"<p> Name of a backend environment of an Amplify App. </p>",
+          "location":"uri",
+          "locationName":"environmentName"
+        }
+      },
+      "documentation":"<p> Request structure for delete backend environment request. </p>"
+    },
+    "DeleteBackendEnvironmentResult":{
+      "type":"structure",
+      "required":["backendEnvironment"],
+      "members":{
+        "backendEnvironment":{
+          "shape":"BackendEnvironment",
+          "documentation":"<p> Backend environment structure for an Amplify App. </p>"
+        }
+      },
+      "documentation":"<p> Result structure of a delete backend environment result. </p>"
+    },
     "DeleteBranchRequest":{
       "type":"structure",
       "required":[
@@ -1467,6 +1644,11 @@
       "error":{"httpStatusCode":503},
       "exception":true
     },
+    "DeploymentArtifacts":{
+      "type":"string",
+      "max":1000,
+      "min":1
+    },
     "Description":{
       "type":"string",
       "max":1000
@@ -1563,6 +1745,11 @@
       "type":"string",
       "max":1000
     },
+    "EnvironmentName":{
+      "type":"string",
+      "max":255,
+      "min":1
+    },
     "EnvironmentVariables":{
       "type":"map",
       "key":{"shape":"EnvKey"},
@@ -1679,6 +1866,39 @@
       },
       "documentation":"<p> Result structure for the get artifact request. </p>"
     },
+    "GetBackendEnvironmentRequest":{
+      "type":"structure",
+      "required":[
+        "appId",
+        "environmentName"
+      ],
+      "members":{
+        "appId":{
+          "shape":"AppId",
+          "documentation":"<p> Unique Id for an Amplify App. </p>",
+          "location":"uri",
+          "locationName":"appId"
+        },
+        "environmentName":{
+          "shape":"EnvironmentName",
+          "documentation":"<p> Name for the backend environment. </p>",
+          "location":"uri",
+          "locationName":"environmentName"
+        }
+      },
+      "documentation":"<p> Request structure for get backend environment request. </p>"
+    },
+    "GetBackendEnvironmentResult":{
+      "type":"structure",
+      "required":["backendEnvironment"],
+      "members":{
+        "backendEnvironment":{
+          "shape":"BackendEnvironment",
+          "documentation":"<p> Backend environment structure for an an Amplify App. </p>"
+        }
+      },
+      "documentation":"<p> Result structure for get backend environment result. </p>"
+    },
     "GetBranchRequest":{
       "type":"structure",
       "required":[
@@ -2018,6 +2238,50 @@
       },
       "documentation":"<p> Result structure for the list artifacts request. </p>"
     },
+    "ListBackendEnvironmentsRequest":{
+      "type":"structure",
+      "required":["appId"],
+      "members":{
+        "appId":{
+          "shape":"AppId",
+          "documentation":"<p> Unique Id for an amplify App. </p>",
+          "location":"uri",
+          "locationName":"appId"
+        },
+        "environmentName":{
+          "shape":"EnvironmentName",
+          "documentation":"<p> Name of the backend environment </p>"
+        },
+        "nextToken":{
+          "shape":"NextToken",
+          "documentation":"<p> Pagination token. Set to null to start listing backen environments from start. If a non-null pagination token is returned in a result, then pass its value in here to list more backend environments. </p>",
+          "location":"querystring",
+          "locationName":"nextToken"
+        },
+        "maxResults":{
+          "shape":"MaxResults",
+          "documentation":"<p> Maximum number of records to list in a single response. </p>",
+          "location":"querystring",
+          "locationName":"maxResults"
+        }
+      },
+      "documentation":"<p> Request structure for list backend environments request. </p>"
+    },
+    "ListBackendEnvironmentsResult":{
+      "type":"structure",
+      "required":["backendEnvironments"],
+      "members":{
+        "backendEnvironments":{
+          "shape":"BackendEnvironments",
+          "documentation":"<p> List of backend environments for an Amplify App. </p>"
+        },
+        "nextToken":{
+          "shape":"NextToken",
+          "documentation":"<p> Pagination token. If non-null pagination token is returned in a result, then pass its value in another request to fetch more entries. </p>"
+        }
+      },
+      "documentation":"<p> Result structure for list backend environments result. </p>"
+    },
     "ListBranchesRequest":{
       "type":"structure",
       "required":["appId"],
@@ -2316,6 +2580,11 @@
       "type":"string",
       "max":1000
     },
+    "StackName":{
+      "type":"string",
+      "max":255,
+      "min":1
+    },
     "Stage":{
       "type":"string",
       "enum":[
diff --git a/services/apigateway/build.properties b/services/apigateway/build.properties
index ecf2dae6fcb1..15ec2da1fc71 100644
--- a/services/apigateway/build.properties
+++ b/services/apigateway/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/apigateway/pom.xml b/services/apigateway/pom.xml
index 71059313bda3..036e8087959f 100644
--- a/services/apigateway/pom.xml
+++ b/services/apigateway/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>apigateway</artifactId>
     <name>AWS Java SDK :: Services :: Amazon API Gateway</name>
diff --git a/services/apigateway/src/it/java/software/amazon/awssdk/services/apigateway/GetExportIntegrationTest.java b/services/apigateway/src/it/java/software/amazon/awssdk/services/apigateway/GetExportIntegrationTest.java
index bee7bad55272..c228bc589d0a 100644
--- a/services/apigateway/src/it/java/software/amazon/awssdk/services/apigateway/GetExportIntegrationTest.java
+++ b/services/apigateway/src/it/java/software/amazon/awssdk/services/apigateway/GetExportIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/apigateway/src/it/java/software/amazon/awssdk/services/apigateway/IntegrationTestBase.java b/services/apigateway/src/it/java/software/amazon/awssdk/services/apigateway/IntegrationTestBase.java
index 42138926d39a..d9e3d0803a40 100644
--- a/services/apigateway/src/it/java/software/amazon/awssdk/services/apigateway/IntegrationTestBase.java
+++ b/services/apigateway/src/it/java/software/amazon/awssdk/services/apigateway/IntegrationTestBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/apigateway/src/it/java/software/amazon/awssdk/services/apigateway/ServiceIntegrationTest.java b/services/apigateway/src/it/java/software/amazon/awssdk/services/apigateway/ServiceIntegrationTest.java
index bfa13a41a1f0..3c1ae4ace1fe 100644
--- a/services/apigateway/src/it/java/software/amazon/awssdk/services/apigateway/ServiceIntegrationTest.java
+++ b/services/apigateway/src/it/java/software/amazon/awssdk/services/apigateway/ServiceIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/apigateway/src/main/java/software/amazon/awssdk/services/apigateway/internal/AcceptJsonInterceptor.java b/services/apigateway/src/main/java/software/amazon/awssdk/services/apigateway/internal/AcceptJsonInterceptor.java
index ffe23d5f63e2..0db3c3cac316 100644
--- a/services/apigateway/src/main/java/software/amazon/awssdk/services/apigateway/internal/AcceptJsonInterceptor.java
+++ b/services/apigateway/src/main/java/software/amazon/awssdk/services/apigateway/internal/AcceptJsonInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/apigateway/src/test/java/software/amazon/awssdk/services/apigateway/internal/AcceptJsonInterceptorTest.java b/services/apigateway/src/test/java/software/amazon/awssdk/services/apigateway/internal/AcceptJsonInterceptorTest.java
index 924c8e0bebe9..325722fcb239 100644
--- a/services/apigateway/src/test/java/software/amazon/awssdk/services/apigateway/internal/AcceptJsonInterceptorTest.java
+++ b/services/apigateway/src/test/java/software/amazon/awssdk/services/apigateway/internal/AcceptJsonInterceptorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/apigateway/src/test/resources/cucumber.properties b/services/apigateway/src/test/resources/cucumber.properties
index 86daa54c8a5a..1a8a1a5bebab 100644
--- a/services/apigateway/src/test/resources/cucumber.properties
+++ b/services/apigateway/src/test/resources/cucumber.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/apigatewaymanagementapi/pom.xml b/services/apigatewaymanagementapi/pom.xml
index caa75b563358..0db976a526b3 100644
--- a/services/apigatewaymanagementapi/pom.xml
+++ b/services/apigatewaymanagementapi/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>apigatewaymanagementapi</artifactId>
     <name>AWS Java SDK :: Services :: ApiGatewayManagementApi</name>
diff --git a/services/apigatewayv2/pom.xml b/services/apigatewayv2/pom.xml
index 101eb0adbfc8..a2052262e07d 100644
--- a/services/apigatewayv2/pom.xml
+++ b/services/apigatewayv2/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>apigatewayv2</artifactId>
     <name>AWS Java SDK :: Services :: ApiGatewayV2</name>
diff --git a/services/apigatewayv2/src/main/resources/codegen-resources/service-2.json b/services/apigatewayv2/src/main/resources/codegen-resources/service-2.json
index 5a287aabbe6d..82402aa956df 100644
--- a/services/apigatewayv2/src/main/resources/codegen-resources/service-2.json
+++ b/services/apigatewayv2/src/main/resources/codegen-resources/service-2.json
@@ -30,7 +30,7 @@
         "documentation" : "<p>The resource specified in the request was not found.</p>"
       }, {
         "shape" : "TooManyRequestsException",
-        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of\n time.</p>"
+        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of time.</p>"
       }, {
         "shape" : "BadRequestException",
         "documentation" : "<p>One of the parameters in the request is invalid.</p>"
@@ -59,7 +59,7 @@
         "documentation" : "<p>The resource specified in the request was not found.</p>"
       }, {
         "shape" : "TooManyRequestsException",
-        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of\n time.</p>"
+        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of time.</p>"
       }, {
         "shape" : "BadRequestException",
         "documentation" : "<p>One of the parameters in the request is invalid.</p>"
@@ -88,7 +88,7 @@
         "documentation" : "<p>The resource specified in the request was not found.</p>"
       }, {
         "shape" : "TooManyRequestsException",
-        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of\n time.</p>"
+        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of time.</p>"
       }, {
         "shape" : "BadRequestException",
         "documentation" : "<p>One of the parameters in the request is invalid.</p>"
@@ -117,7 +117,7 @@
         "documentation" : "<p>The resource specified in the request was not found.</p>"
       }, {
         "shape" : "TooManyRequestsException",
-        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of\n time.</p>"
+        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of time.</p>"
       }, {
         "shape" : "BadRequestException",
         "documentation" : "<p>One of the parameters in the request is invalid.</p>"
@@ -146,13 +146,16 @@
         "documentation" : "<p>The resource specified in the request was not found.</p>"
       }, {
         "shape" : "TooManyRequestsException",
-        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of\n time.</p>"
+        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of time.</p>"
       }, {
         "shape" : "BadRequestException",
         "documentation" : "<p>One of the parameters in the request is invalid.</p>"
       }, {
         "shape" : "ConflictException",
         "documentation" : "<p>The resource already exists.</p>"
+      }, {
+        "shape" : "AccessDeniedException",
+        "documentation" : "<p>403 response</p>"
       } ],
       "documentation" : "<p>Creates a domain name.</p>"
     },
@@ -167,7 +170,7 @@
         "shape" : "CreateIntegrationRequest"
       },
       "output" : {
-        "shape" : "CreateIntegrationResponse",
+        "shape" : "CreateIntegrationResult",
         "documentation" : "<p>The request has succeeded and has resulted in the creation of a resource.</p>"
       },
       "errors" : [ {
@@ -175,7 +178,7 @@
         "documentation" : "<p>The resource specified in the request was not found.</p>"
       }, {
         "shape" : "TooManyRequestsException",
-        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of\n time.</p>"
+        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of time.</p>"
       }, {
         "shape" : "BadRequestException",
         "documentation" : "<p>One of the parameters in the request is invalid.</p>"
@@ -204,7 +207,7 @@
         "documentation" : "<p>The resource specified in the request was not found.</p>"
       }, {
         "shape" : "TooManyRequestsException",
-        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of\n time.</p>"
+        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of time.</p>"
       }, {
         "shape" : "BadRequestException",
         "documentation" : "<p>One of the parameters in the request is invalid.</p>"
@@ -233,7 +236,7 @@
         "documentation" : "<p>The resource specified in the request was not found.</p>"
       }, {
         "shape" : "TooManyRequestsException",
-        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of\n time.</p>"
+        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of time.</p>"
       }, {
         "shape" : "BadRequestException",
         "documentation" : "<p>One of the parameters in the request is invalid.</p>"
@@ -254,7 +257,7 @@
         "shape" : "CreateRouteRequest"
       },
       "output" : {
-        "shape" : "CreateRouteResponse",
+        "shape" : "CreateRouteResult",
         "documentation" : "<p>The request has succeeded and has resulted in the creation of a resource.</p>"
       },
       "errors" : [ {
@@ -262,7 +265,7 @@
         "documentation" : "<p>The resource specified in the request was not found.</p>"
       }, {
         "shape" : "TooManyRequestsException",
-        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of\n time.</p>"
+        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of time.</p>"
       }, {
         "shape" : "BadRequestException",
         "documentation" : "<p>One of the parameters in the request is invalid.</p>"
@@ -291,7 +294,7 @@
         "documentation" : "<p>The resource specified in the request was not found.</p>"
       }, {
         "shape" : "TooManyRequestsException",
-        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of\n time.</p>"
+        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of time.</p>"
       }, {
         "shape" : "BadRequestException",
         "documentation" : "<p>One of the parameters in the request is invalid.</p>"
@@ -320,7 +323,7 @@
         "documentation" : "<p>The resource specified in the request was not found.</p>"
       }, {
         "shape" : "TooManyRequestsException",
-        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of\n time.</p>"
+        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of time.</p>"
       }, {
         "shape" : "BadRequestException",
         "documentation" : "<p>One of the parameters in the request is invalid.</p>"
@@ -330,6 +333,48 @@
       } ],
       "documentation" : "<p>Creates a Stage for an API.</p>"
     },
+    "CreateVpcLink" : {
+      "name" : "CreateVpcLink",
+      "http" : {
+        "method" : "POST",
+        "requestUri" : "/v2/vpclinks",
+        "responseCode" : 201
+      },
+      "input" : {
+        "shape" : "CreateVpcLinkRequest"
+      },
+      "output" : {
+        "shape" : "CreateVpcLinkResponse",
+        "documentation" : "<p>The request has succeeded and has resulted in the creation of a resource.</p>"
+      },
+      "errors" : [ {
+        "shape" : "BadRequestException",
+        "documentation" : "<p>One of the parameters in the request is invalid.</p>"
+      }, {
+        "shape" : "TooManyRequestsException",
+        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of time.</p>"
+      } ],
+      "documentation" : "<p>Creates a VPC link.</p>"
+    },
+    "DeleteAccessLogSettings" : {
+      "name" : "DeleteAccessLogSettings",
+      "http" : {
+        "method" : "DELETE",
+        "requestUri" : "/v2/apis/{apiId}/stages/{stageName}/accesslogsettings",
+        "responseCode" : 204
+      },
+      "input" : {
+        "shape" : "DeleteAccessLogSettingsRequest"
+      },
+      "errors" : [ {
+        "shape" : "NotFoundException",
+        "documentation" : "<p>The resource specified in the request was not found.</p>"
+      }, {
+        "shape" : "TooManyRequestsException",
+        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of time.</p>"
+      } ],
+      "documentation" : "<p>Deletes the AccessLogSettings for a Stage. To disable access logging for a Stage, delete its AccessLogSettings.</p>"
+    },
     "DeleteApi" : {
       "name" : "DeleteApi",
       "http" : {
@@ -345,7 +390,7 @@
         "documentation" : "<p>The resource specified in the request was not found.</p>"
       }, {
         "shape" : "TooManyRequestsException",
-        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of\n time.</p>"
+        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of time.</p>"
       } ],
       "documentation" : "<p>Deletes an Api resource.</p>"
     },
@@ -364,7 +409,7 @@
         "documentation" : "<p>The resource specified in the request was not found.</p>"
       }, {
         "shape" : "TooManyRequestsException",
-        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of\n time.</p>"
+        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of time.</p>"
       }, {
         "shape" : "BadRequestException",
         "documentation" : "<p>One of the parameters in the request is invalid.</p>"
@@ -386,10 +431,29 @@
         "documentation" : "<p>The resource specified in the request was not found.</p>"
       }, {
         "shape" : "TooManyRequestsException",
-        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of\n time.</p>"
+        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of time.</p>"
       } ],
       "documentation" : "<p>Deletes an Authorizer.</p>"
     },
+    "DeleteCorsConfiguration" : {
+      "name" : "DeleteCorsConfiguration",
+      "http" : {
+        "method" : "DELETE",
+        "requestUri" : "/v2/apis/{apiId}/cors",
+        "responseCode" : 204
+      },
+      "input" : {
+        "shape" : "DeleteCorsConfigurationRequest"
+      },
+      "errors" : [ {
+        "shape" : "NotFoundException",
+        "documentation" : "<p>The resource specified in the request was not found.</p>"
+      }, {
+        "shape" : "TooManyRequestsException",
+        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of time.</p>"
+      } ],
+      "documentation" : "<p>Deletes a CORS configuration.</p>"
+    },
     "DeleteDeployment" : {
       "name" : "DeleteDeployment",
       "http" : {
@@ -405,7 +469,7 @@
         "documentation" : "<p>The resource specified in the request was not found.</p>"
       }, {
         "shape" : "TooManyRequestsException",
-        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of\n time.</p>"
+        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of time.</p>"
       } ],
       "documentation" : "<p>Deletes a Deployment.</p>"
     },
@@ -424,7 +488,7 @@
         "documentation" : "<p>The resource specified in the request was not found.</p>"
       }, {
         "shape" : "TooManyRequestsException",
-        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of\n time.</p>"
+        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of time.</p>"
       } ],
       "documentation" : "<p>Deletes a domain name.</p>"
     },
@@ -443,7 +507,7 @@
         "documentation" : "<p>The resource specified in the request was not found.</p>"
       }, {
         "shape" : "TooManyRequestsException",
-        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of\n time.</p>"
+        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of time.</p>"
       } ],
       "documentation" : "<p>Deletes an Integration.</p>"
     },
@@ -462,7 +526,7 @@
         "documentation" : "<p>The resource specified in the request was not found.</p>"
       }, {
         "shape" : "TooManyRequestsException",
-        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of\n time.</p>"
+        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of time.</p>"
       } ],
       "documentation" : "<p>Deletes an IntegrationResponses.</p>"
     },
@@ -481,7 +545,7 @@
         "documentation" : "<p>The resource specified in the request was not found.</p>"
       }, {
         "shape" : "TooManyRequestsException",
-        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of\n time.</p>"
+        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of time.</p>"
       } ],
       "documentation" : "<p>Deletes a Model.</p>"
     },
@@ -500,10 +564,29 @@
         "documentation" : "<p>The resource specified in the request was not found.</p>"
       }, {
         "shape" : "TooManyRequestsException",
-        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of\n time.</p>"
+        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of time.</p>"
       } ],
       "documentation" : "<p>Deletes a Route.</p>"
     },
+    "DeleteRouteRequestParameter" : {
+      "name" : "DeleteRouteRequestParameter",
+      "http" : {
+        "method" : "DELETE",
+        "requestUri" : "/v2/apis/{apiId}/routes/{routeId}/requestparameters/{requestParameterKey}",
+        "responseCode" : 204
+      },
+      "input" : {
+        "shape" : "DeleteRouteRequestParameterRequest"
+      },
+      "errors" : [ {
+        "shape" : "NotFoundException",
+        "documentation" : "<p>The resource specified in the request was not found.</p>"
+      }, {
+        "shape" : "TooManyRequestsException",
+        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of time.</p>"
+      } ],
+      "documentation" : "<p>Deletes a route request parameter.</p>"
+    },
     "DeleteRouteResponse" : {
       "name" : "DeleteRouteResponse",
       "http" : {
@@ -519,10 +602,29 @@
         "documentation" : "<p>The resource specified in the request was not found.</p>"
       }, {
         "shape" : "TooManyRequestsException",
-        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of\n time.</p>"
+        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of time.</p>"
       } ],
       "documentation" : "<p>Deletes a RouteResponse.</p>"
     },
+    "DeleteRouteSettings" : {
+      "name" : "DeleteRouteSettings",
+      "http" : {
+        "method" : "DELETE",
+        "requestUri" : "/v2/apis/{apiId}/stages/{stageName}/routesettings/{routeKey}",
+        "responseCode" : 204
+      },
+      "input" : {
+        "shape" : "DeleteRouteSettingsRequest"
+      },
+      "errors" : [ {
+        "shape" : "NotFoundException",
+        "documentation" : "<p>The resource specified in the request was not found.</p>"
+      }, {
+        "shape" : "TooManyRequestsException",
+        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of time.</p>"
+      } ],
+      "documentation" : "<p>Deletes the RouteSettings for a stage.</p>"
+    },
     "DeleteStage" : {
       "name" : "DeleteStage",
       "http" : {
@@ -538,10 +640,33 @@
         "documentation" : "<p>The resource specified in the request was not found.</p>"
       }, {
         "shape" : "TooManyRequestsException",
-        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of\n time.</p>"
+        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of time.</p>"
       } ],
       "documentation" : "<p>Deletes a Stage.</p>"
     },
+    "DeleteVpcLink" : {
+      "name" : "DeleteVpcLink",
+      "http" : {
+        "method" : "DELETE",
+        "requestUri" : "/v2/vpclinks/{vpcLinkId}",
+        "responseCode" : 202
+      },
+      "input" : {
+        "shape" : "DeleteVpcLinkRequest"
+      },
+      "output" : {
+        "shape" : "DeleteVpcLinkResponse",
+        "documentation" : "<p>202 response</p>"
+      },
+      "errors" : [ {
+        "shape" : "NotFoundException",
+        "documentation" : "<p>The resource specified in the request was not found.</p>"
+      }, {
+        "shape" : "TooManyRequestsException",
+        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of time.</p>"
+      } ],
+      "documentation" : "<p>Deletes a VPC link.</p>"
+    },
     "GetApi" : {
       "name" : "GetApi",
       "http" : {
@@ -561,7 +686,7 @@
         "documentation" : "<p>The resource specified in the request was not found.</p>"
       }, {
         "shape" : "TooManyRequestsException",
-        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of\n time.</p>"
+        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of time.</p>"
       } ],
       "documentation" : "<p>Gets an Api resource.</p>"
     },
@@ -584,12 +709,12 @@
         "documentation" : "<p>The resource specified in the request was not found.</p>"
       }, {
         "shape" : "TooManyRequestsException",
-        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of\n time.</p>"
+        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of time.</p>"
       }, {
         "shape" : "BadRequestException",
         "documentation" : "<p>One of the parameters in the request is invalid.</p>"
       } ],
-      "documentation" : "<p>The API mapping.</p>"
+      "documentation" : "<p>Gets an API mapping.</p>"
     },
     "GetApiMappings" : {
       "name" : "GetApiMappings",
@@ -610,12 +735,12 @@
         "documentation" : "<p>The resource specified in the request was not found.</p>"
       }, {
         "shape" : "TooManyRequestsException",
-        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of\n time.</p>"
+        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of time.</p>"
       }, {
         "shape" : "BadRequestException",
         "documentation" : "<p>One of the parameters in the request is invalid.</p>"
       } ],
-      "documentation" : "<p>The API mappings.</p>"
+      "documentation" : "<p>Gets API mappings.</p>"
     },
     "GetApis" : {
       "name" : "GetApis",
@@ -636,7 +761,7 @@
         "documentation" : "<p>The resource specified in the request was not found.</p>"
       }, {
         "shape" : "TooManyRequestsException",
-        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of\n time.</p>"
+        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of time.</p>"
       }, {
         "shape" : "BadRequestException",
         "documentation" : "<p>One of the parameters in the request is invalid.</p>"
@@ -662,7 +787,7 @@
         "documentation" : "<p>The resource specified in the request was not found.</p>"
       }, {
         "shape" : "TooManyRequestsException",
-        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of\n time.</p>"
+        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of time.</p>"
       } ],
       "documentation" : "<p>Gets an Authorizer.</p>"
     },
@@ -685,7 +810,7 @@
         "documentation" : "<p>The resource specified in the request was not found.</p>"
       }, {
         "shape" : "TooManyRequestsException",
-        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of\n time.</p>"
+        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of time.</p>"
       }, {
         "shape" : "BadRequestException",
         "documentation" : "<p>One of the parameters in the request is invalid.</p>"
@@ -711,7 +836,7 @@
         "documentation" : "<p>The resource specified in the request was not found.</p>"
       }, {
         "shape" : "TooManyRequestsException",
-        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of\n time.</p>"
+        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of time.</p>"
       } ],
       "documentation" : "<p>Gets a Deployment.</p>"
     },
@@ -734,7 +859,7 @@
         "documentation" : "<p>The resource specified in the request was not found.</p>"
       }, {
         "shape" : "TooManyRequestsException",
-        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of\n time.</p>"
+        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of time.</p>"
       }, {
         "shape" : "BadRequestException",
         "documentation" : "<p>One of the parameters in the request is invalid.</p>"
@@ -760,7 +885,7 @@
         "documentation" : "<p>The resource specified in the request was not found.</p>"
       }, {
         "shape" : "TooManyRequestsException",
-        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of\n time.</p>"
+        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of time.</p>"
       } ],
       "documentation" : "<p>Gets a domain name.</p>"
     },
@@ -783,7 +908,7 @@
         "documentation" : "<p>The resource specified in the request was not found.</p>"
       }, {
         "shape" : "TooManyRequestsException",
-        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of\n time.</p>"
+        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of time.</p>"
       }, {
         "shape" : "BadRequestException",
         "documentation" : "<p>One of the parameters in the request is invalid.</p>"
@@ -801,7 +926,7 @@
         "shape" : "GetIntegrationRequest"
       },
       "output" : {
-        "shape" : "GetIntegrationResponse",
+        "shape" : "GetIntegrationResult",
         "documentation" : "<p>Success</p>"
       },
       "errors" : [ {
@@ -809,7 +934,7 @@
         "documentation" : "<p>The resource specified in the request was not found.</p>"
       }, {
         "shape" : "TooManyRequestsException",
-        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of\n time.</p>"
+        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of time.</p>"
       } ],
       "documentation" : "<p>Gets an Integration.</p>"
     },
@@ -832,7 +957,7 @@
         "documentation" : "<p>The resource specified in the request was not found.</p>"
       }, {
         "shape" : "TooManyRequestsException",
-        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of\n time.</p>"
+        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of time.</p>"
       } ],
       "documentation" : "<p>Gets an IntegrationResponses.</p>"
     },
@@ -855,7 +980,7 @@
         "documentation" : "<p>The resource specified in the request was not found.</p>"
       }, {
         "shape" : "TooManyRequestsException",
-        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of\n time.</p>"
+        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of time.</p>"
       }, {
         "shape" : "BadRequestException",
         "documentation" : "<p>One of the parameters in the request is invalid.</p>"
@@ -881,7 +1006,7 @@
         "documentation" : "<p>The resource specified in the request was not found.</p>"
       }, {
         "shape" : "TooManyRequestsException",
-        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of\n time.</p>"
+        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of time.</p>"
       }, {
         "shape" : "BadRequestException",
         "documentation" : "<p>One of the parameters in the request is invalid.</p>"
@@ -907,7 +1032,7 @@
         "documentation" : "<p>The resource specified in the request was not found.</p>"
       }, {
         "shape" : "TooManyRequestsException",
-        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of\n time.</p>"
+        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of time.</p>"
       } ],
       "documentation" : "<p>Gets a Model.</p>"
     },
@@ -930,7 +1055,7 @@
         "documentation" : "<p>The resource specified in the request was not found.</p>"
       }, {
         "shape" : "TooManyRequestsException",
-        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of\n time.</p>"
+        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of time.</p>"
       } ],
       "documentation" : "<p>Gets a model template.</p>"
     },
@@ -953,7 +1078,7 @@
         "documentation" : "<p>The resource specified in the request was not found.</p>"
       }, {
         "shape" : "TooManyRequestsException",
-        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of\n time.</p>"
+        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of time.</p>"
       }, {
         "shape" : "BadRequestException",
         "documentation" : "<p>One of the parameters in the request is invalid.</p>"
@@ -971,7 +1096,7 @@
         "shape" : "GetRouteRequest"
       },
       "output" : {
-        "shape" : "GetRouteResponse",
+        "shape" : "GetRouteResult",
         "documentation" : "<p>Success</p>"
       },
       "errors" : [ {
@@ -979,7 +1104,7 @@
         "documentation" : "<p>The resource specified in the request was not found.</p>"
       }, {
         "shape" : "TooManyRequestsException",
-        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of\n time.</p>"
+        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of time.</p>"
       } ],
       "documentation" : "<p>Gets a Route.</p>"
     },
@@ -1002,7 +1127,7 @@
         "documentation" : "<p>The resource specified in the request was not found.</p>"
       }, {
         "shape" : "TooManyRequestsException",
-        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of\n time.</p>"
+        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of time.</p>"
       } ],
       "documentation" : "<p>Gets a RouteResponse.</p>"
     },
@@ -1025,7 +1150,7 @@
         "documentation" : "<p>The resource specified in the request was not found.</p>"
       }, {
         "shape" : "TooManyRequestsException",
-        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of\n time.</p>"
+        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of time.</p>"
       }, {
         "shape" : "BadRequestException",
         "documentation" : "<p>One of the parameters in the request is invalid.</p>"
@@ -1051,7 +1176,7 @@
         "documentation" : "<p>The resource specified in the request was not found.</p>"
       }, {
         "shape" : "TooManyRequestsException",
-        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of\n time.</p>"
+        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of time.</p>"
       }, {
         "shape" : "BadRequestException",
         "documentation" : "<p>One of the parameters in the request is invalid.</p>"
@@ -1077,7 +1202,7 @@
         "documentation" : "<p>The resource specified in the request was not found.</p>"
       }, {
         "shape" : "TooManyRequestsException",
-        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of\n time.</p>"
+        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of time.</p>"
       } ],
       "documentation" : "<p>Gets a Stage.</p>"
     },
@@ -1100,7 +1225,7 @@
         "documentation" : "<p>The resource specified in the request was not found.</p>"
       }, {
         "shape" : "TooManyRequestsException",
-        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of\n time.</p>"
+        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of time.</p>"
       }, {
         "shape" : "BadRequestException",
         "documentation" : "<p>One of the parameters in the request is invalid.</p>"
@@ -1118,14 +1243,119 @@
         "shape" : "GetTagsRequest"
       },
       "output" : {
-        "shape" : "GetTagsResponse"
+        "shape" : "GetTagsResponse",
+        "documentation" : "<p>Success</p>"
+      },
+      "errors" : [ {
+        "shape" : "NotFoundException",
+        "documentation" : "<p>The resource specified in the request was not found.</p>"
+      }, {
+        "shape" : "TooManyRequestsException",
+        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of time.</p>"
+      }, {
+        "shape" : "BadRequestException",
+        "documentation" : "<p>One of the parameters in the request is invalid.</p>"
+      }, {
+        "shape" : "ConflictException",
+        "documentation" : "<p>The resource already exists.</p>"
+      } ],
+      "documentation" : "<p>Gets a collection of Tag resources.</p>"
+    },
+    "GetVpcLink" : {
+      "name" : "GetVpcLink",
+      "http" : {
+        "method" : "GET",
+        "requestUri" : "/v2/vpclinks/{vpcLinkId}",
+        "responseCode" : 200
+      },
+      "input" : {
+        "shape" : "GetVpcLinkRequest"
+      },
+      "output" : {
+        "shape" : "GetVpcLinkResponse",
+        "documentation" : "<p>Success</p>"
+      },
+      "errors" : [ {
+        "shape" : "NotFoundException",
+        "documentation" : "<p>The resource specified in the request was not found.</p>"
+      }, {
+        "shape" : "TooManyRequestsException",
+        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of time.</p>"
+      } ],
+      "documentation" : "<p>Gets a VPC link.</p>"
+    },
+    "GetVpcLinks" : {
+      "name" : "GetVpcLinks",
+      "http" : {
+        "method" : "GET",
+        "requestUri" : "/v2/vpclinks",
+        "responseCode" : 200
+      },
+      "input" : {
+        "shape" : "GetVpcLinksRequest"
+      },
+      "output" : {
+        "shape" : "GetVpcLinksResponse",
+        "documentation" : "<p>Success</p>"
+      },
+      "errors" : [ {
+        "shape" : "BadRequestException",
+        "documentation" : "<p>One of the parameters in the request is invalid.</p>"
+      }, {
+        "shape" : "TooManyRequestsException",
+        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of time.</p>"
+      } ],
+      "documentation" : "<p>Gets a collection of VPC links.</p>"
+    },
+    "ImportApi" : {
+      "name" : "ImportApi",
+      "http" : {
+        "method" : "PUT",
+        "requestUri" : "/v2/apis",
+        "responseCode" : 201
+      },
+      "input" : {
+        "shape" : "ImportApiRequest"
+      },
+      "output" : {
+        "shape" : "ImportApiResponse",
+        "documentation" : "<p>The request has succeeded and has resulted in the creation of a resource.</p>"
+      },
+      "errors" : [ {
+        "shape" : "NotFoundException",
+        "documentation" : "<p>The resource specified in the request was not found.</p>"
+      }, {
+        "shape" : "TooManyRequestsException",
+        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of time.</p>"
+      }, {
+        "shape" : "BadRequestException",
+        "documentation" : "<p>One of the parameters in the request is invalid.</p>"
+      }, {
+        "shape" : "ConflictException",
+        "documentation" : "<p>The resource already exists.</p>"
+      } ],
+      "documentation" : "<p>Imports an API.</p>"
+    },
+    "ReimportApi" : {
+      "name" : "ReimportApi",
+      "http" : {
+        "method" : "PUT",
+        "requestUri" : "/v2/apis/{apiId}",
+        "responseCode" : 201
+      },
+      "input" : {
+        "shape" : "ReimportApiRequest"
+      },
+      "output" : {
+        "shape" : "ReimportApiResponse",
+        "documentation" : "<p>The request has succeeded and has resulted in the creation of a resource.</p>"
       },
       "errors" : [ {
         "shape" : "NotFoundException",
         "documentation" : "<p>The resource specified in the request was not found.</p>"
       }, {
         "shape" : "TooManyRequestsException",
-        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of\n time.</p>"
+        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of time.</p>"
       }, {
         "shape" : "BadRequestException",
         "documentation" : "<p>One of the parameters in the request is invalid.</p>"
@@ -1133,7 +1363,7 @@
         "shape" : "ConflictException",
         "documentation" : "<p>The resource already exists.</p>"
       } ],
-      "documentation" : "<p>Gets the Tags for an API.</p>"
+      "documentation" : "<p>Puts an Api resource.</p>"
     },
     "TagResource" : {
       "name" : "TagResource",
@@ -1146,14 +1376,15 @@
         "shape" : "TagResourceRequest"
       },
       "output" : {
-        "shape" : "TagResourceResponse"
+        "shape" : "TagResourceResponse",
+        "documentation" : "<p>The request has succeeded and has resulted in the creation of a resource.</p>"
       },
       "errors" : [ {
         "shape" : "NotFoundException",
         "documentation" : "<p>The resource specified in the request was not found.</p>"
       }, {
         "shape" : "TooManyRequestsException",
-        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of\n time.</p>"
+        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of time.</p>"
       }, {
         "shape" : "BadRequestException",
         "documentation" : "<p>One of the parameters in the request is invalid.</p>"
@@ -1161,7 +1392,7 @@
         "shape" : "ConflictException",
         "documentation" : "<p>The resource already exists.</p>"
       } ],
-      "documentation" : "<p>Tag an APIGW resource</p>"
+      "documentation" : "<p>Creates a new Tag resource to represent a tag.</p>"
     },
     "UntagResource" : {
       "name" : "UntagResource",
@@ -1178,7 +1409,7 @@
         "documentation" : "<p>The resource specified in the request was not found.</p>"
       }, {
         "shape" : "TooManyRequestsException",
-        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of\n time.</p>"
+        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of time.</p>"
       }, {
         "shape" : "BadRequestException",
         "documentation" : "<p>One of the parameters in the request is invalid.</p>"
@@ -1186,7 +1417,7 @@
         "shape" : "ConflictException",
         "documentation" : "<p>The resource already exists.</p>"
       } ],
-      "documentation" : "<p>Untag an APIGW resource</p>"
+      "documentation" : "<p>Deletes a Tag.</p>"
     },
     "UpdateApi" : {
       "name" : "UpdateApi",
@@ -1207,7 +1438,7 @@
         "documentation" : "<p>The resource specified in the request was not found.</p>"
       }, {
         "shape" : "TooManyRequestsException",
-        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of\n time.</p>"
+        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of time.</p>"
       }, {
         "shape" : "BadRequestException",
         "documentation" : "<p>One of the parameters in the request is invalid.</p>"
@@ -1236,7 +1467,7 @@
         "documentation" : "<p>The resource specified in the request was not found.</p>"
       }, {
         "shape" : "TooManyRequestsException",
-        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of\n time.</p>"
+        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of time.</p>"
       }, {
         "shape" : "BadRequestException",
         "documentation" : "<p>One of the parameters in the request is invalid.</p>"
@@ -1265,7 +1496,7 @@
         "documentation" : "<p>The resource specified in the request was not found.</p>"
       }, {
         "shape" : "TooManyRequestsException",
-        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of\n time.</p>"
+        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of time.</p>"
       }, {
         "shape" : "BadRequestException",
         "documentation" : "<p>One of the parameters in the request is invalid.</p>"
@@ -1294,7 +1525,7 @@
         "documentation" : "<p>The resource specified in the request was not found.</p>"
       }, {
         "shape" : "TooManyRequestsException",
-        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of\n time.</p>"
+        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of time.</p>"
       }, {
         "shape" : "BadRequestException",
         "documentation" : "<p>One of the parameters in the request is invalid.</p>"
@@ -1323,7 +1554,7 @@
         "documentation" : "<p>The resource specified in the request was not found.</p>"
       }, {
         "shape" : "TooManyRequestsException",
-        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of\n time.</p>"
+        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of time.</p>"
       }, {
         "shape" : "BadRequestException",
         "documentation" : "<p>One of the parameters in the request is invalid.</p>"
@@ -1344,7 +1575,7 @@
         "shape" : "UpdateIntegrationRequest"
       },
       "output" : {
-        "shape" : "UpdateIntegrationResponse",
+        "shape" : "UpdateIntegrationResult",
         "documentation" : "<p>Success</p>"
       },
       "errors" : [ {
@@ -1352,7 +1583,7 @@
         "documentation" : "<p>The resource specified in the request was not found.</p>"
       }, {
         "shape" : "TooManyRequestsException",
-        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of\n time.</p>"
+        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of time.</p>"
       }, {
         "shape" : "BadRequestException",
         "documentation" : "<p>One of the parameters in the request is invalid.</p>"
@@ -1381,7 +1612,7 @@
         "documentation" : "<p>The resource specified in the request was not found.</p>"
       }, {
         "shape" : "TooManyRequestsException",
-        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of\n time.</p>"
+        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of time.</p>"
       }, {
         "shape" : "BadRequestException",
         "documentation" : "<p>One of the parameters in the request is invalid.</p>"
@@ -1410,7 +1641,7 @@
         "documentation" : "<p>The resource specified in the request was not found.</p>"
       }, {
         "shape" : "TooManyRequestsException",
-        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of\n time.</p>"
+        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of time.</p>"
       }, {
         "shape" : "BadRequestException",
         "documentation" : "<p>One of the parameters in the request is invalid.</p>"
@@ -1431,7 +1662,7 @@
         "shape" : "UpdateRouteRequest"
       },
       "output" : {
-        "shape" : "UpdateRouteResponse",
+        "shape" : "UpdateRouteResult",
         "documentation" : "<p>Success</p>"
       },
       "errors" : [ {
@@ -1439,7 +1670,7 @@
         "documentation" : "<p>The resource specified in the request was not found.</p>"
       }, {
         "shape" : "TooManyRequestsException",
-        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of\n time.</p>"
+        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of time.</p>"
       }, {
         "shape" : "BadRequestException",
         "documentation" : "<p>One of the parameters in the request is invalid.</p>"
@@ -1468,7 +1699,7 @@
         "documentation" : "<p>The resource specified in the request was not found.</p>"
       }, {
         "shape" : "TooManyRequestsException",
-        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of\n time.</p>"
+        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of time.</p>"
       }, {
         "shape" : "BadRequestException",
         "documentation" : "<p>One of the parameters in the request is invalid.</p>"
@@ -1497,7 +1728,7 @@
         "documentation" : "<p>The resource specified in the request was not found.</p>"
       }, {
         "shape" : "TooManyRequestsException",
-        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of\n time.</p>"
+        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of time.</p>"
       }, {
         "shape" : "BadRequestException",
         "documentation" : "<p>One of the parameters in the request is invalid.</p>"
@@ -1506,9 +1737,48 @@
         "documentation" : "<p>The resource already exists.</p>"
       } ],
       "documentation" : "<p>Updates a Stage.</p>"
+    },
+    "UpdateVpcLink" : {
+      "name" : "UpdateVpcLink",
+      "http" : {
+        "method" : "PATCH",
+        "requestUri" : "/v2/vpclinks/{vpcLinkId}",
+        "responseCode" : 200
+      },
+      "input" : {
+        "shape" : "UpdateVpcLinkRequest"
+      },
+      "output" : {
+        "shape" : "UpdateVpcLinkResponse",
+        "documentation" : "<p>200 response</p>"
+      },
+      "errors" : [ {
+        "shape" : "NotFoundException",
+        "documentation" : "<p>The resource specified in the request was not found.</p>"
+      }, {
+        "shape" : "TooManyRequestsException",
+        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of time.</p>"
+      }, {
+        "shape" : "BadRequestException",
+        "documentation" : "<p>One of the parameters in the request is invalid.</p>"
+      } ],
+      "documentation" : "<p>Updates a VPC link.</p>"
     }
   },
   "shapes" : {
+    "AccessDeniedException" : {
+      "type" : "structure",
+      "members" : {
+        "Message" : {
+          "shape" : "__string",
+          "locationName" : "message"
+        }
+      },
+      "exception" : true,
+      "error" : {
+        "httpStatusCode" : 403
+      }
+    },
     "AccessLogSettings" : {
       "type" : "structure",
       "members" : {
@@ -1520,7 +1790,7 @@
         "Format" : {
           "shape" : "StringWithLengthBetween1And1024",
           "locationName" : "format",
-          "documentation" : "<p>A single line format of the access logs of data, as specified by selected $context\n variables. The format must include at least $context.requestId.</p>"
+          "documentation" : "<p>A single line format of the access logs of data, as specified by selected $context variables. The format must include at least $context.requestId.</p>"
         }
       },
       "documentation" : "<p>Settings for logging access in a stage.</p>"
@@ -1531,7 +1801,7 @@
         "ApiEndpoint" : {
           "shape" : "__string",
           "locationName" : "apiEndpoint",
-          "documentation" : "<p>The URI of the API, of the form {api-id}.execute-api.{region}.amazonaws.com. The\n stage name is typically appended to this URI to form a complete path to a deployed\n API stage.</p>"
+          "documentation" : "<p>The URI of the API, of the form {api-id}.execute-api.{region}.amazonaws.com. The stage name is typically appended to this URI to form a complete path to a deployed API stage.</p>"
         },
         "ApiId" : {
           "shape" : "Id",
@@ -1541,7 +1811,12 @@
         "ApiKeySelectionExpression" : {
           "shape" : "SelectionExpression",
           "locationName" : "apiKeySelectionExpression",
-          "documentation" : "<p>An API key selection expression. See <a href=\"https://docs.aws.amazon.com/apigateway/latest/developerguide/apigateway-websocket-api-selection-expressions.html#apigateway-websocket-api-apikey-selection-expressions\">API Key Selection Expressions</a>.</p>"
+          "documentation" : "<p>An API key selection expression. Supported only for WebSocket APIs. See <a href=\"https://docs.aws.amazon.com/apigateway/latest/developerguide/apigateway-websocket-api-selection-expressions.html#apigateway-websocket-api-apikey-selection-expressions\">API Key Selection Expressions</a>.</p>"
+        },
+        "CorsConfiguration" : {
+          "shape" : "Cors",
+          "locationName" : "corsConfiguration",
+          "documentation" : "<p>A CORS configuration. Supported only for HTTP APIs.</p>"
         },
         "CreatedDate" : {
           "shape" : "__timestampIso8601",
@@ -1556,7 +1831,12 @@
         "DisableSchemaValidation" : {
           "shape" : "__boolean",
           "locationName" : "disableSchemaValidation",
-          "documentation" : "<p>Avoid validating models when creating a deployment.</p>"
+          "documentation" : "<p>Avoid validating models when creating a deployment. Supported only for WebSocket APIs.</p>"
+        },
+        "ImportInfo" : {
+          "shape" : "__listOf__string",
+          "locationName" : "importInfo",
+          "documentation" : "<p>The validation information during API import. This may include particular properties of your OpenAPI definition which are ignored during import. Supported only for HTTP APIs.</p>"
         },
         "Name" : {
           "shape" : "StringWithLengthBetween1And128",
@@ -1566,12 +1846,17 @@
         "ProtocolType" : {
           "shape" : "ProtocolType",
           "locationName" : "protocolType",
-          "documentation" : "<p>The API protocol: Currently only WEBSOCKET is supported.</p>"
+          "documentation" : "<p>The API protocol.</p>"
         },
         "RouteSelectionExpression" : {
           "shape" : "SelectionExpression",
           "locationName" : "routeSelectionExpression",
-          "documentation" : "<p>The route selection expression for the API.</p>"
+          "documentation" : "<p>The route selection expression for the API. For HTTP APIs, the routeSelectionExpression must be ${request.method} ${request.path}. If not provided, this will be the default for HTTP APIs. This property is required for WebSocket APIs.</p>"
+        },
+        "Tags" : {
+          "shape" : "Tags",
+          "locationName" : "tags",
+          "documentation" : "<p>A collection of tags associated with the API.</p>"
         },
         "Version" : {
           "shape" : "StringWithLengthBetween1And64",
@@ -1581,16 +1866,11 @@
         "Warnings" : {
           "shape" : "__listOf__string",
           "locationName" : "warnings",
-          "documentation" : "<p>The warning messages reported when failonwarnings is turned on during\n API import.</p>"
-        },
-        "Tags" : {
-          "shape" : "Tags",
-          "locationName" : "tags",
-          "documentation" : "<p>The key-value map of strings. The valid character set is [a-zA-Z+-=._:/]. The tag key can be up to 128 characters and must not start with aws:. The tag value can be up to 256 characters..</p>"
+          "documentation" : "<p>The warning messages reported when failonwarnings is turned on during API import.</p>"
         }
       },
       "documentation" : "<p>Represents an API.</p>",
-      "required" : [ "RouteSelectionExpression", "ProtocolType", "Name" ]
+      "required" : [ "RouteSelectionExpression", "Name", "ProtocolType" ]
     },
     "ApiMapping" : {
       "type" : "structure",
@@ -1630,7 +1910,7 @@
         "NextToken" : {
           "shape" : "NextToken",
           "locationName" : "nextToken",
-          "documentation" : "<p>The next page of elements from this collection. Not valid for the last element of\n the collection.</p>"
+          "documentation" : "<p>The next page of elements from this collection. Not valid for the last element of the collection.</p>"
         }
       },
       "documentation" : "<p>Represents a collection of ApiMappings resources.</p>"
@@ -1646,7 +1926,7 @@
         "NextToken" : {
           "shape" : "NextToken",
           "locationName" : "nextToken",
-          "documentation" : "<p>The next page of elements from this collection. Not valid for the last element of\n the collection.</p>"
+          "documentation" : "<p>The next page of elements from this collection. Not valid for the last element of the collection.</p>"
         }
       },
       "documentation" : "<p>Represents a collection of APIs.</p>"
@@ -1657,15 +1937,15 @@
     },
     "AuthorizationScopes" : {
       "type" : "list",
-      "documentation" : "<p>A list of authorization scopes configured on a route. The scopes are used with a\n COGNITO_USER_POOLS authorizer to authorize the method invocation. The authorization\n works by matching the route scopes against the scopes parsed from the access token in\n the incoming request. The method invocation is authorized if any route scope matches\n a claimed scope in the access token. Otherwise, the invocation is not authorized.\n When the route scope is configured, the client must provide an access token instead\n of an identity token for authorization purposes.</p>",
+      "documentation" : "<p>A list of authorization scopes configured on a route. The scopes are used with a JWT authorizer to authorize the method invocation. The authorization works by matching the route scopes against the scopes parsed from the access token in the incoming request. The method invocation is authorized if any route scope matches a claimed scope in the access token. Otherwise, the invocation is not authorized. When the route scope is configured, the client must provide an access token instead of an identity token for authorization purposes.</p>",
       "member" : {
         "shape" : "StringWithLengthBetween1And64"
       }
     },
     "AuthorizationType" : {
       "type" : "string",
-      "documentation" : "<p>The authorization type. Valid values are NONE for open access,\n AWS_IAM for using AWS IAM permissions, and CUSTOM for\n using a Lambda authorizer.</p>",
-      "enum" : [ "NONE", "AWS_IAM", "CUSTOM" ]
+      "documentation" : "<p>The authorization type. For WebSocket APIs, valid values are NONE for open access, AWS_IAM for using AWS IAM permissions, and CUSTOM for using a Lambda authorizer. For HTTP APIs, valid values are NONE for open access, or JWT for using JSON Web Tokens.</p>",
+      "enum" : [ "NONE", "AWS_IAM", "CUSTOM", "JWT" ]
     },
     "Authorizer" : {
       "type" : "structure",
@@ -1673,7 +1953,7 @@
         "AuthorizerCredentialsArn" : {
           "shape" : "Arn",
           "locationName" : "authorizerCredentialsArn",
-          "documentation" : "<p>Specifies the required credentials as an IAM role for API Gateway to invoke the\n authorizer. To specify an IAM role for API Gateway to assume, use the role's Amazon\n Resource Name (ARN). To use resource-based permissions on the Lambda function,\n specify null.</p>"
+          "documentation" : "<p>Specifies the required credentials as an IAM role for API Gateway to invoke the authorizer. To specify an IAM role for API Gateway to assume, use the role's Amazon Resource Name (ARN). To use resource-based permissions on the Lambda function, specify null. Supported only for REQUEST authorizers.</p>"
         },
         "AuthorizerId" : {
           "shape" : "Id",
@@ -1683,37 +1963,37 @@
         "AuthorizerResultTtlInSeconds" : {
           "shape" : "IntegerWithLengthBetween0And3600",
           "locationName" : "authorizerResultTtlInSeconds",
-          "documentation" : "<p>The time to live (TTL), in seconds, of cached authorizer results. If it equals 0,\n authorization caching is disabled. If it is greater than 0, API Gateway will cache\n authorizer responses. If this field is not set, the default value is 300. The maximum\n value is 3600, or 1 hour.</p>"
+          "documentation" : "<p>Authorizer caching is not currently supported. Don't specify this value for authorizers.</p>"
         },
         "AuthorizerType" : {
           "shape" : "AuthorizerType",
           "locationName" : "authorizerType",
-          "documentation" : "<p>The authorizer type. Currently the only valid value is REQUEST, for a\n Lambda function using incoming request parameters.</p>"
+          "documentation" : "<p>The authorizer type. For WebSocket APIs, specify REQUEST for a Lambda function using incoming request parameters. For HTTP APIs, specify JWT to use JSON Web Tokens.</p>"
         },
         "AuthorizerUri" : {
           "shape" : "UriWithLengthBetween1And2048",
           "locationName" : "authorizerUri",
-          "documentation" : "<p>The authorizer's Uniform Resource Identifier (URI).\n ForREQUEST authorizers, this must be a\n well-formed Lambda function URI, for example,\n arn:aws:apigateway:us-west-2:lambda:path/2015-03-31/functions/arn:aws:lambda:us-west-2:{account_id}:function:{lambda_function_name}/invocations.\n In general, the URI has this form:\n arn:aws:apigateway:{region}:lambda:path/{service_api}\n , where {region} is the same as the region hosting the Lambda\n function, path indicates that the remaining substring in the URI should be treated as\n the path to the resource, including the initial /. For Lambda functions,\n this is usually of the form\n /2015-03-31/functions/[FunctionARN]/invocations.</p>"
+          "documentation" : "<p>The authorizer's Uniform Resource Identifier (URI). ForREQUEST authorizers, this must be a well-formed Lambda function URI, for example, arn:aws:apigateway:us-west-2:lambda:path/2015-03-31/functions/arn:aws:lambda:us-west-2:<replaceable>{account_id}</replaceable>:function:<replaceable>{lambda_function_name}</replaceable>/invocations. In general, the URI has this form: arn:aws:apigateway:<replaceable>{region}</replaceable>:lambda:path/<replaceable>{service_api}</replaceable>\n               , where <replaceable></replaceable>{region} is the same as the region hosting the Lambda function, path indicates that the remaining substring in the URI should be treated as the path to the resource, including the initial /. For Lambda functions, this is usually of the form /2015-03-31/functions/[FunctionARN]/invocations. Supported only for REQUEST authorizers.</p>"
         },
         "IdentitySource" : {
           "shape" : "IdentitySourceList",
           "locationName" : "identitySource",
-          "documentation" : "<p>The identity source for which authorization is requested.</p><p>For the REQUEST authorizer, this is required when authorization\n caching is enabled. The value is a comma-separated string of one or more mapping\n expressions of the specified request parameters. For example, if an Auth\n header and a Name query string parameters are defined as identity\n sources, this value is method.request.header.Auth,\n method.request.querystring.Name. These parameters will be used to\n derive the authorization caching key and to perform runtime validation of the\n REQUEST authorizer by verifying all of the identity-related request\n parameters are present, not null, and non-empty. Only when this is true does the\n authorizer invoke the authorizer Lambda function, otherwise, it returns a 401\n Unauthorized response without calling the Lambda function. The valid value\n is a string of comma-separated mapping expressions of the specified request\n parameters. When the authorization caching is not enabled, this property is\n optional.</p>"
+          "documentation" : "<p>The identity source for which authorization is requested.</p> <p>For a REQUEST authorizer, this is optional. The value is a set of one or more mapping expressions of the specified request parameters. Currently, the identity source can be headers, query string parameters, stage variables, and context parameters. For example, if an Auth header and a Name query string parameter are defined as identity sources, this value is route.request.header.Auth, route.request.querystring.Name. These parameters will be used to perform runtime validation for Lambda-based authorizers by verifying all of the identity-related request parameters are present in the request, not null, and non-empty. Only when this is true does the authorizer invoke the authorizer Lambda function. Otherwise, it returns a 401 Unauthorized response without calling the Lambda function.</p> <p>For JWT, a single entry that specifies where to extract the JSON Web Token (JWT) from inbound requests. Currently only header-based and query parameter-based selections are supported, for example \"$request.header.Authorization\".</p>"
         },
         "IdentityValidationExpression" : {
           "shape" : "StringWithLengthBetween0And1024",
           "locationName" : "identityValidationExpression",
-          "documentation" : "<p>The\n validation expression does not apply to the REQUEST authorizer.</p>"
+          "documentation" : "<p>The validation expression does not apply to the REQUEST authorizer.</p>"
+        },
+        "JwtConfiguration" : {
+          "shape" : "JWTConfiguration",
+          "locationName" : "jwtConfiguration",
+          "documentation" : "<p>Represents the configuration of a JWT authorizer. Required for the JWT authorizer type. Supported only for HTTP APIs.</p>"
         },
         "Name" : {
           "shape" : "StringWithLengthBetween1And128",
           "locationName" : "name",
           "documentation" : "<p>The name of the authorizer.</p>"
-        },
-        "ProviderArns" : {
-          "shape" : "ProviderArnList",
-          "locationName" : "providerArns",
-          "documentation" : "<p>For\n REQUEST authorizer, this is not\n defined.</p>"
         }
       },
       "documentation" : "<p>Represents an authorizer.</p>",
@@ -1721,8 +2001,8 @@
     },
     "AuthorizerType" : {
       "type" : "string",
-      "documentation" : "<p>The authorizer type. Currently the only valid value is REQUEST, for a\n Lambda function using incoming request parameters.</p>",
-      "enum" : [ "REQUEST" ]
+      "documentation" : "<p>The authorizer type. For WebSocket APIs, specify REQUEST for a Lambda function using incoming request parameters. For HTTP APIs, specify JWT to use JSON Web Tokens.</p>",
+      "enum" : [ "REQUEST", "JWT" ]
     },
     "Authorizers" : {
       "type" : "structure",
@@ -1735,7 +2015,7 @@
         "NextToken" : {
           "shape" : "NextToken",
           "locationName" : "nextToken",
-          "documentation" : "<p>The next page of elements from this collection. Not valid for the last element of\n the collection.</p>"
+          "documentation" : "<p>The next page of elements from this collection. Not valid for the last element of the collection.</p>"
         }
       },
       "documentation" : "<p>Represents a collection of authorizers.</p>"
@@ -1749,7 +2029,7 @@
           "documentation" : "<p>Describes the error encountered.</p>"
         }
       },
-      "documentation" : "<p>The request is not valid, for example, the input is incomplete or incorrect. See\n the accompanying error message for details.</p>",
+      "documentation" : "<p>The request is not valid, for example, the input is incomplete or incorrect. See the accompanying error message for details.</p>",
       "exception" : true,
       "error" : {
         "httpStatusCode" : 400
@@ -1764,7 +2044,7 @@
           "documentation" : "<p>Describes the error encountered.</p>"
         }
       },
-      "documentation" : "<p>The requested operation would cause a conflict with the current state of a service\n resource associated with the request. Resolve the conflict before retrying this\n request. See the accompanying error message for details.</p>",
+      "documentation" : "<p>The requested operation would cause a conflict with the current state of a service resource associated with the request. Resolve the conflict before retrying this request. See the accompanying error message for details.</p>",
       "exception" : true,
       "error" : {
         "httpStatusCode" : 409
@@ -1777,16 +2057,83 @@
     },
     "ContentHandlingStrategy" : {
       "type" : "string",
-      "documentation" : "<p>Specifies how to handle response payload content type conversions.</p>",
+      "documentation" : "<p>Specifies how to handle response payload content type conversions. Supported only for WebSocket APIs.</p>",
       "enum" : [ "CONVERT_TO_BINARY", "CONVERT_TO_TEXT" ]
     },
+    "Cors" : {
+      "type" : "structure",
+      "members" : {
+        "AllowCredentials" : {
+          "shape" : "__boolean",
+          "locationName" : "allowCredentials",
+          "documentation" : "<p>Specifies whether credentials are included in the CORS request. Supported only for HTTP APIs.</p>"
+        },
+        "AllowHeaders" : {
+          "shape" : "CorsHeaderList",
+          "locationName" : "allowHeaders",
+          "documentation" : "<p>Represents a collection of allowed headers. Supported only for HTTP APIs.</p>"
+        },
+        "AllowMethods" : {
+          "shape" : "CorsMethodList",
+          "locationName" : "allowMethods",
+          "documentation" : "<p>Represents a collection of allowed HTTP methods. Supported only for HTTP APIs.</p>"
+        },
+        "AllowOrigins" : {
+          "shape" : "CorsOriginList",
+          "locationName" : "allowOrigins",
+          "documentation" : "<p>Represents a collection of allowed origins. Supported only for HTTP APIs.</p>"
+        },
+        "ExposeHeaders" : {
+          "shape" : "CorsHeaderList",
+          "locationName" : "exposeHeaders",
+          "documentation" : "<p>Represents a collection of exposed headers. Supported only for HTTP APIs.</p>"
+        },
+        "MaxAge" : {
+          "shape" : "IntegerWithLengthBetweenMinus1And86400",
+          "locationName" : "maxAge",
+          "documentation" : "<p>The number of seconds that the browser should cache preflight request results. Supported only for HTTP APIs.</p>"
+        }
+      },
+      "documentation" : "<p>Represents a CORS configuration. Supported only for HTTP APIs. See <a href=\"https://docs.aws.amazon.com/apigateway/latest/developerguide/http-api-cors.html\">Configuring CORS</a> for more information.</p>"
+    },
+    "CorsHeaderList" : {
+      "type" : "list",
+      "documentation" : "<p>Represents a collection of allowed headers. Supported only for HTTP APIs.</p>",
+      "member" : {
+        "shape" : "__string"
+      }
+    },
+    "CorsMethodList" : {
+      "type" : "list",
+      "documentation" : "<p>Represents a collection of methods. Supported only for HTTP APIs.</p>",
+      "member" : {
+        "shape" : "StringWithLengthBetween1And64"
+      }
+    },
+    "CorsOriginList" : {
+      "type" : "list",
+      "documentation" : "<p>Represents a collection of origins. Supported only for HTTP APIs.</p>",
+      "member" : {
+        "shape" : "__string"
+      }
+    },
     "CreateApiInput" : {
       "type" : "structure",
       "members" : {
         "ApiKeySelectionExpression" : {
           "shape" : "SelectionExpression",
           "locationName" : "apiKeySelectionExpression",
-          "documentation" : "<p>An API key selection expression. See <a href=\"https://docs.aws.amazon.com/apigateway/latest/developerguide/apigateway-websocket-api-selection-expressions.html#apigateway-websocket-api-apikey-selection-expressions\">API Key Selection Expressions</a>.</p>"
+          "documentation" : "<p>An API key selection expression. Supported only for WebSocket APIs. See <a href=\"https://docs.aws.amazon.com/apigateway/latest/developerguide/apigateway-websocket-api-selection-expressions.html#apigateway-websocket-api-apikey-selection-expressions\">API Key Selection Expressions</a>.</p>"
+        },
+        "CorsConfiguration" : {
+          "shape" : "Cors",
+          "locationName" : "corsConfiguration",
+          "documentation" : "<p>A CORS configuration. Supported only for HTTP APIs. See <a href=\"https://docs.aws.amazon.com/apigateway/latest/developerguide/http-api-cors.html\">Configuring CORS</a> for more information.</p>"
+        },
+        "CredentialsArn" : {
+          "shape" : "Arn",
+          "locationName" : "credentialsArn",
+          "documentation" : "<p>This property is part of quick create. It specifies the credentials required for the integration, if any. For a Lambda integration, three options are available. To specify an IAM Role for API Gateway to assume, use the role's Amazon Resource Name (ARN). To require that the caller's identity be passed through from the request, specify arn:aws:iam::*:user/*. To use resource-based permissions on supported AWS services, specify null. Currently, this property is not used for HTTP integrations. Supported only for HTTP APIs.</p>"
         },
         "Description" : {
           "shape" : "StringWithLengthBetween0And1024",
@@ -1796,7 +2143,7 @@
         "DisableSchemaValidation" : {
           "shape" : "__boolean",
           "locationName" : "disableSchemaValidation",
-          "documentation" : "<p>Avoid validating models when creating a deployment.</p>"
+          "documentation" : "<p>Avoid validating models when creating a deployment. Supported only for WebSocket APIs.</p>"
         },
         "Name" : {
           "shape" : "StringWithLengthBetween1And128",
@@ -1806,26 +2153,36 @@
         "ProtocolType" : {
           "shape" : "ProtocolType",
           "locationName" : "protocolType",
-          "documentation" : "<p>The API protocol: Currently only WEBSOCKET is supported.</p>"
+          "documentation" : "<p>The API protocol.</p>"
+        },
+        "RouteKey" : {
+          "shape" : "SelectionKey",
+          "locationName" : "routeKey",
+          "documentation" : "<p>This property is part of quick create. If you don't specify a routeKey, a default route of $default is created. The $default route acts as a catch-all for any request made to your API, for a particular stage. The $default route key can't be modified. You can add routes after creating the API, and you can update the route keys of additional routes. Supported only for HTTP APIs.</p>"
         },
         "RouteSelectionExpression" : {
           "shape" : "SelectionExpression",
           "locationName" : "routeSelectionExpression",
-          "documentation" : "<p>The route selection expression for the API.</p>"
+          "documentation" : "<p>The route selection expression for the API. For HTTP APIs, the routeSelectionExpression must be ${request.method} ${request.path}. If not provided, this will be the default for HTTP APIs. This property is required for WebSocket APIs.</p>"
+        },
+        "Tags" : {
+          "shape" : "Tags",
+          "locationName" : "tags",
+          "documentation" : "<p>The collection of tags. Each tag element is associated with a given resource.</p>"
+        },
+        "Target" : {
+          "shape" : "UriWithLengthBetween1And2048",
+          "locationName" : "target",
+          "documentation" : "<p>This property is part of quick create. Quick create produces an API with an integration, a default catch-all route, and a default stage which is configured to automatically deploy changes. For HTTP integrations, specify a fully qualified URL. For Lambda integrations, specify a function ARN. The type of the integration will be HTTP_PROXY or AWS_PROXY, respectively. Supported only for HTTP APIs.</p>"
         },
         "Version" : {
           "shape" : "StringWithLengthBetween1And64",
           "locationName" : "version",
           "documentation" : "<p>A version identifier for the API.</p>"
-        },
-        "Tags" : {
-          "shape" : "Tags",
-          "locationName" : "tags",
-          "documentation" : "<p>The key-value map of strings. The valid character set is [a-zA-Z+-=._:/]. The tag key can be up to 128 characters and must not start with aws:. The tag value can be up to 256 characters..</p>"
         }
       },
       "documentation" : "<p>Represents the input parameters for a CreateApi request.</p>",
-      "required" : [ "RouteSelectionExpression", "ProtocolType", "Name" ]
+      "required" : [ "ProtocolType", "Name" ]
     },
     "CreateApiMappingInput" : {
       "type" : "structure",
@@ -1838,7 +2195,7 @@
         "ApiMappingKey" : {
           "shape" : "SelectionKey",
           "locationName" : "apiMappingKey",
-          "documentation" : ""
+          "documentation" : "The API mapping key."
         },
         "Stage" : {
           "shape" : "StringWithLengthBetween1And128",
@@ -1846,7 +2203,7 @@
           "documentation" : "<p>The API stage.</p>"
         }
       },
-      "documentation" : "<p>Represents the input parameters for a CreateApiMapping\n request.</p>",
+      "documentation" : "<p>Represents the input parameters for a CreateApiMapping request.</p>",
       "required" : [ "Stage", "ApiId" ]
     },
     "CreateApiMappingRequest" : {
@@ -1860,7 +2217,7 @@
         "ApiMappingKey" : {
           "shape" : "SelectionKey",
           "locationName" : "apiMappingKey",
-          "documentation" : ""
+          "documentation" : "The API mapping key."
         },
         "DomainName" : {
           "shape" : "__string",
@@ -1874,6 +2231,7 @@
           "documentation" : "<p>The API stage.</p>"
         }
       },
+      "documentation" : "<p>Creates a new ApiMapping resource to represent an API mapping.</p>",
       "required" : [ "DomainName", "Stage", "ApiId" ]
     },
     "CreateApiMappingResponse" : {
@@ -1907,7 +2265,17 @@
         "ApiKeySelectionExpression" : {
           "shape" : "SelectionExpression",
           "locationName" : "apiKeySelectionExpression",
-          "documentation" : "<p>An API key selection expression. See <a href=\"https://docs.aws.amazon.com/apigateway/latest/developerguide/apigateway-websocket-api-selection-expressions.html#apigateway-websocket-api-apikey-selection-expressions\">API Key Selection Expressions</a>.</p>"
+          "documentation" : "<p>An API key selection expression. Supported only for WebSocket APIs. See <a href=\"https://docs.aws.amazon.com/apigateway/latest/developerguide/apigateway-websocket-api-selection-expressions.html#apigateway-websocket-api-apikey-selection-expressions\">API Key Selection Expressions</a>.</p>"
+        },
+        "CorsConfiguration" : {
+          "shape" : "Cors",
+          "locationName" : "corsConfiguration",
+          "documentation" : "<p>A CORS configuration. Supported only for HTTP APIs. See <a href=\"https://docs.aws.amazon.com/apigateway/latest/developerguide/http-api-cors.html\">Configuring CORS</a> for more information.</p>"
+        },
+        "CredentialsArn" : {
+          "shape" : "Arn",
+          "locationName" : "credentialsArn",
+          "documentation" : "<p>This property is part of quick create. It specifies the credentials required for the integration, if any. For a Lambda integration, three options are available. To specify an IAM Role for API Gateway to assume, use the role's Amazon Resource Name (ARN). To require that the caller's identity be passed through from the request, specify arn:aws:iam::*:user/*. To use resource-based permissions on supported AWS services, specify null. Currently, this property is not used for HTTP integrations. Supported only for HTTP APIs.</p>"
         },
         "Description" : {
           "shape" : "StringWithLengthBetween0And1024",
@@ -1917,7 +2285,7 @@
         "DisableSchemaValidation" : {
           "shape" : "__boolean",
           "locationName" : "disableSchemaValidation",
-          "documentation" : "<p>Avoid validating models when creating a deployment.</p>"
+          "documentation" : "<p>Avoid validating models when creating a deployment. Supported only for WebSocket APIs.</p>"
         },
         "Name" : {
           "shape" : "StringWithLengthBetween1And128",
@@ -1927,25 +2295,36 @@
         "ProtocolType" : {
           "shape" : "ProtocolType",
           "locationName" : "protocolType",
-          "documentation" : "<p>The API protocol: Currently only WEBSOCKET is supported.</p>"
+          "documentation" : "<p>The API protocol.</p>"
         },
-        "RouteSelectionExpression" : {
+        "RouteKey" : {
+          "shape" : "SelectionKey",
+          "locationName" : "routeKey",
+          "documentation" : "<p>This property is part of quick create. If you don't specify a routeKey, a default route of $default is created. The $default route acts as a catch-all for any request made to your API, for a particular stage. The $default route key can't be modified. You can add routes after creating the API, and you can update the route keys of additional routes. Supported only for HTTP APIs.</p>"
+        },
+        "RouteSelectionExpression" : {
           "shape" : "SelectionExpression",
           "locationName" : "routeSelectionExpression",
-          "documentation" : "<p>The route selection expression for the API.</p>"
+          "documentation" : "<p>The route selection expression for the API. For HTTP APIs, the routeSelectionExpression must be ${request.method} ${request.path}. If not provided, this will be the default for HTTP APIs. This property is required for WebSocket APIs.</p>"
+        },
+        "Tags" : {
+          "shape" : "Tags",
+          "locationName" : "tags",
+          "documentation" : "<p>The collection of tags. Each tag element is associated with a given resource.</p>"
+        },
+        "Target" : {
+          "shape" : "UriWithLengthBetween1And2048",
+          "locationName" : "target",
+          "documentation" : "<p>This property is part of quick create. Quick create produces an API with an integration, a default catch-all route, and a default stage which is configured to automatically deploy changes. For HTTP integrations, specify a fully qualified URL. For Lambda integrations, specify a function ARN. The type of the integration will be HTTP_PROXY or AWS_PROXY, respectively. Supported only for HTTP APIs.</p>"
         },
         "Version" : {
           "shape" : "StringWithLengthBetween1And64",
           "locationName" : "version",
           "documentation" : "<p>A version identifier for the API.</p>"
-        },
-        "Tags" : {
-          "shape" : "Tags",
-          "locationName" : "tags",
-          "documentation" : "<p>The key-value map of strings. The valid character set is [a-zA-Z+-=._:/]. The tag key can be up to 128 characters and must not start with aws:. The tag value can be up to 256 characters..</p>"
         }
       },
-      "required" : [ "RouteSelectionExpression", "ProtocolType", "Name" ]
+      "documentation" : "<p>Creates a new Api resource to represent an API.</p>",
+      "required" : [ "ProtocolType", "Name" ]
     },
     "CreateApiResponse" : {
       "type" : "structure",
@@ -1953,7 +2332,7 @@
         "ApiEndpoint" : {
           "shape" : "__string",
           "locationName" : "apiEndpoint",
-          "documentation" : "<p>The URI of the API, of the form {api-id}.execute-api.{region}.amazonaws.com. The\n stage name is typically appended to this URI to form a complete path to a deployed\n API stage.</p>"
+          "documentation" : "<p>The URI of the API, of the form {api-id}.execute-api.{region}.amazonaws.com. The stage name is typically appended to this URI to form a complete path to a deployed API stage.</p>"
         },
         "ApiId" : {
           "shape" : "Id",
@@ -1963,7 +2342,12 @@
         "ApiKeySelectionExpression" : {
           "shape" : "SelectionExpression",
           "locationName" : "apiKeySelectionExpression",
-          "documentation" : "<p>An API key selection expression. See <a href=\"https://docs.aws.amazon.com/apigateway/latest/developerguide/apigateway-websocket-api-selection-expressions.html#apigateway-websocket-api-apikey-selection-expressions\">API Key Selection Expressions</a>.</p>"
+          "documentation" : "<p>An API key selection expression. Supported only for WebSocket APIs. See <a href=\"https://docs.aws.amazon.com/apigateway/latest/developerguide/apigateway-websocket-api-selection-expressions.html#apigateway-websocket-api-apikey-selection-expressions\">API Key Selection Expressions</a>.</p>"
+        },
+        "CorsConfiguration" : {
+          "shape" : "Cors",
+          "locationName" : "corsConfiguration",
+          "documentation" : "<p>A CORS configuration. Supported only for HTTP APIs.</p>"
         },
         "CreatedDate" : {
           "shape" : "__timestampIso8601",
@@ -1978,7 +2362,12 @@
         "DisableSchemaValidation" : {
           "shape" : "__boolean",
           "locationName" : "disableSchemaValidation",
-          "documentation" : "<p>Avoid validating models when creating a deployment.</p>"
+          "documentation" : "<p>Avoid validating models when creating a deployment. Supported only for WebSocket APIs.</p>"
+        },
+        "ImportInfo" : {
+          "shape" : "__listOf__string",
+          "locationName" : "importInfo",
+          "documentation" : "<p>The validation information during API import. This may include particular properties of your OpenAPI definition which are ignored during import. Supported only for HTTP APIs.</p>"
         },
         "Name" : {
           "shape" : "StringWithLengthBetween1And128",
@@ -1988,12 +2377,17 @@
         "ProtocolType" : {
           "shape" : "ProtocolType",
           "locationName" : "protocolType",
-          "documentation" : "<p>The API protocol: Currently only WEBSOCKET is supported.</p>"
+          "documentation" : "<p>The API protocol.</p>"
         },
         "RouteSelectionExpression" : {
           "shape" : "SelectionExpression",
           "locationName" : "routeSelectionExpression",
-          "documentation" : "<p>The route selection expression for the API.</p>"
+          "documentation" : "<p>The route selection expression for the API. For HTTP APIs, the routeSelectionExpression must be ${request.method} ${request.path}. If not provided, this will be the default for HTTP APIs. This property is required for WebSocket APIs.</p>"
+        },
+        "Tags" : {
+          "shape" : "Tags",
+          "locationName" : "tags",
+          "documentation" : "<p>A collection of tags associated with the API.</p>"
         },
         "Version" : {
           "shape" : "StringWithLengthBetween1And64",
@@ -2003,12 +2397,7 @@
         "Warnings" : {
           "shape" : "__listOf__string",
           "locationName" : "warnings",
-          "documentation" : "<p>The warning messages reported when failonwarnings is turned on during\n API import.</p>"
-        },
-        "Tags" : {
-          "shape" : "Tags",
-          "locationName" : "tags",
-          "documentation" : "<p>The key-value map of strings. The valid character set is [a-zA-Z+-=._:/]. The tag key can be up to 128 characters and must not start with aws:. The tag value can be up to 256 characters..</p>"
+          "documentation" : "<p>The warning messages reported when failonwarnings is turned on during API import.</p>"
         }
       }
     },
@@ -2018,46 +2407,46 @@
         "AuthorizerCredentialsArn" : {
           "shape" : "Arn",
           "locationName" : "authorizerCredentialsArn",
-          "documentation" : "<p>Specifies the required credentials as an IAM role for API Gateway to invoke the\n authorizer. To specify an IAM role for API Gateway to assume, use the role's Amazon\n Resource Name (ARN). To use resource-based permissions on the Lambda function,\n specify null.</p>"
+          "documentation" : "<p>Specifies the required credentials as an IAM role for API Gateway to invoke the authorizer. To specify an IAM role for API Gateway to assume, use the role's Amazon Resource Name (ARN). To use resource-based permissions on the Lambda function, specify null. Supported only for REQUEST authorizers.</p>"
         },
         "AuthorizerResultTtlInSeconds" : {
           "shape" : "IntegerWithLengthBetween0And3600",
           "locationName" : "authorizerResultTtlInSeconds",
-          "documentation" : "<p>The time to live (TTL), in seconds, of cached authorizer results. If it equals 0,\n authorization caching is disabled. If it is greater than 0, API Gateway will cache\n authorizer responses. If this field is not set, the default value is 300. The maximum\n value is 3600, or 1 hour.</p>"
+          "documentation" : "<p>Authorizer caching is not currently supported. Don't specify this value for authorizers.</p>"
         },
         "AuthorizerType" : {
           "shape" : "AuthorizerType",
           "locationName" : "authorizerType",
-          "documentation" : "<p>The authorizer type. Currently the only valid value is REQUEST, for a\n Lambda function using incoming request parameters.</p>"
+          "documentation" : "<p>The authorizer type. For WebSocket APIs, specify REQUEST for a Lambda function using incoming request parameters. For HTTP APIs, specify JWT to use JSON Web Tokens.</p>"
         },
         "AuthorizerUri" : {
           "shape" : "UriWithLengthBetween1And2048",
           "locationName" : "authorizerUri",
-          "documentation" : "<p>The authorizer's Uniform Resource Identifier (URI). For\n REQUEST authorizers, this must be a\n well-formed Lambda function URI, for example,\n arn:aws:apigateway:us-west-2:lambda:path/2015-03-31/functions/arn:aws:lambda:us-west-2:{account_id}:function:{lambda_function_name}/invocations.\n In general, the URI has this form:\n arn:aws:apigateway:{region}:lambda:path/{service_api}\n , where {region} is the same as the region hosting the Lambda\n function, path indicates that the remaining substring in the URI should be treated as\n the path to the resource, including the initial /. For Lambda functions,\n this is usually of the form\n /2015-03-31/functions/[FunctionARN]/invocations.</p>"
+          "documentation" : "<p>The authorizer's Uniform Resource Identifier (URI). For REQUEST authorizers, this must be a well-formed Lambda function URI, for example, arn:aws:apigateway:us-west-2:lambda:path/2015-03-31/functions/arn:aws:lambda:us-west-2:<replaceable>{account_id}</replaceable>:function:<replaceable>{lambda_function_name}</replaceable>/invocations. In general, the URI has this form: arn:aws:apigateway:<replaceable>{region}</replaceable>:lambda:path/<replaceable>{service_api}</replaceable>\n               , where <replaceable></replaceable>{region} is the same as the region hosting the Lambda function, path indicates that the remaining substring in the URI should be treated as the path to the resource, including the initial /. For Lambda functions, this is usually of the form /2015-03-31/functions/[FunctionARN]/invocations. Supported only for REQUEST authorizers.</p>"
         },
         "IdentitySource" : {
           "shape" : "IdentitySourceList",
           "locationName" : "identitySource",
-          "documentation" : "<p>The identity source for which authorization is requested.</p><p>For the REQUEST authorizer, this is required when authorization\n caching is enabled. The value is a comma-separated string of one or more mapping\n expressions of the specified request parameters. For example, if an Auth\n header and a Name query string parameters are defined as identity\n sources, this value is method.request.header.Auth,\n method.request.querystring.Name. These parameters will be used to\n derive the authorization caching key and to perform runtime validation of the\n REQUEST authorizer by verifying all of the identity-related request\n parameters are present, not null, and non-empty. Only when this is true does the\n authorizer invoke the authorizer Lambda function, otherwise, it returns a 401\n Unauthorized response without calling the Lambda function. The valid value\n is a string of comma-separated mapping expressions of the specified request\n parameters. When the authorization caching is not enabled, this property is\n optional.</p>"
+          "documentation" : "<p>The identity source for which authorization is requested.</p> <p>For a REQUEST authorizer, this is optional. The value is a set of one or more mapping expressions of the specified request parameters. Currently, the identity source can be headers, query string parameters, stage variables, and context parameters. For example, if an Auth header and a Name query string parameter are defined as identity sources, this value is route.request.header.Auth, route.request.querystring.Name. These parameters will be used to perform runtime validation for Lambda-based authorizers by verifying all of the identity-related request parameters are present in the request, not null, and non-empty. Only when this is true does the authorizer invoke the authorizer Lambda function. Otherwise, it returns a 401 Unauthorized response without calling the Lambda function.</p> <p>For JWT, a single entry that specifies where to extract the JSON Web Token (JWT )from inbound requests. Currently only header-based and query parameter-based selections are supported, for example \"$request.header.Authorization\".</p>"
         },
         "IdentityValidationExpression" : {
           "shape" : "StringWithLengthBetween0And1024",
           "locationName" : "identityValidationExpression",
-          "documentation" : "<p>The\n validation expression does not apply to the REQUEST authorizer.</p>"
+          "documentation" : "<p>This parameter is not used.</p>"
+        },
+        "JwtConfiguration" : {
+          "shape" : "JWTConfiguration",
+          "locationName" : "jwtConfiguration",
+          "documentation" : "<p>Represents the configuration of a JWT authorizer. Required for the JWT authorizer type. Supported only for HTTP APIs.</p>"
         },
         "Name" : {
           "shape" : "StringWithLengthBetween1And128",
           "locationName" : "name",
           "documentation" : "<p>The name of the authorizer.</p>"
-        },
-        "ProviderArns" : {
-          "shape" : "ProviderArnList",
-          "locationName" : "providerArns",
-          "documentation" : "<p>For\n REQUEST authorizer, this is not\n defined.</p>"
         }
       },
-      "documentation" : "<p>Represents the input parameters for a CreateAuthorizer\n request.</p>",
-      "required" : [ "AuthorizerUri", "AuthorizerType", "IdentitySource", "Name" ]
+      "documentation" : "<p>Represents the input parameters for a CreateAuthorizer request.</p>",
+      "required" : [ "AuthorizerType", "IdentitySource", "Name" ]
     },
     "CreateAuthorizerRequest" : {
       "type" : "structure",
@@ -2071,45 +2460,46 @@
         "AuthorizerCredentialsArn" : {
           "shape" : "Arn",
           "locationName" : "authorizerCredentialsArn",
-          "documentation" : "<p>Specifies the required credentials as an IAM role for API Gateway to invoke the\n authorizer. To specify an IAM role for API Gateway to assume, use the role's Amazon\n Resource Name (ARN). To use resource-based permissions on the Lambda function,\n specify null.</p>"
+          "documentation" : "<p>Specifies the required credentials as an IAM role for API Gateway to invoke the authorizer. To specify an IAM role for API Gateway to assume, use the role's Amazon Resource Name (ARN). To use resource-based permissions on the Lambda function, specify null. Supported only for REQUEST authorizers.</p>"
         },
         "AuthorizerResultTtlInSeconds" : {
           "shape" : "IntegerWithLengthBetween0And3600",
           "locationName" : "authorizerResultTtlInSeconds",
-          "documentation" : "<p>The time to live (TTL), in seconds, of cached authorizer results. If it equals 0,\n authorization caching is disabled. If it is greater than 0, API Gateway will cache\n authorizer responses. If this field is not set, the default value is 300. The maximum\n value is 3600, or 1 hour.</p>"
+          "documentation" : "<p>Authorizer caching is not currently supported. Don't specify this value for authorizers.</p>"
         },
         "AuthorizerType" : {
           "shape" : "AuthorizerType",
           "locationName" : "authorizerType",
-          "documentation" : "<p>The authorizer type. Currently the only valid value is REQUEST, for a\n Lambda function using incoming request parameters.</p>"
+          "documentation" : "<p>The authorizer type. For WebSocket APIs, specify REQUEST for a Lambda function using incoming request parameters. For HTTP APIs, specify JWT to use JSON Web Tokens.</p>"
         },
         "AuthorizerUri" : {
           "shape" : "UriWithLengthBetween1And2048",
           "locationName" : "authorizerUri",
-          "documentation" : "<p>The authorizer's Uniform Resource Identifier (URI). For\n REQUEST authorizers, this must be a\n well-formed Lambda function URI, for example,\n arn:aws:apigateway:us-west-2:lambda:path/2015-03-31/functions/arn:aws:lambda:us-west-2:{account_id}:function:{lambda_function_name}/invocations.\n In general, the URI has this form:\n arn:aws:apigateway:{region}:lambda:path/{service_api}\n , where {region} is the same as the region hosting the Lambda\n function, path indicates that the remaining substring in the URI should be treated as\n the path to the resource, including the initial /. For Lambda functions,\n this is usually of the form\n /2015-03-31/functions/[FunctionARN]/invocations.</p>"
+          "documentation" : "<p>The authorizer's Uniform Resource Identifier (URI). For REQUEST authorizers, this must be a well-formed Lambda function URI, for example, arn:aws:apigateway:us-west-2:lambda:path/2015-03-31/functions/arn:aws:lambda:us-west-2:<replaceable>{account_id}</replaceable>:function:<replaceable>{lambda_function_name}</replaceable>/invocations. In general, the URI has this form: arn:aws:apigateway:<replaceable>{region}</replaceable>:lambda:path/<replaceable>{service_api}</replaceable>\n               , where <replaceable></replaceable>{region} is the same as the region hosting the Lambda function, path indicates that the remaining substring in the URI should be treated as the path to the resource, including the initial /. For Lambda functions, this is usually of the form /2015-03-31/functions/[FunctionARN]/invocations. Supported only for REQUEST authorizers.</p>"
         },
         "IdentitySource" : {
           "shape" : "IdentitySourceList",
           "locationName" : "identitySource",
-          "documentation" : "<p>The identity source for which authorization is requested.</p><p>For the REQUEST authorizer, this is required when authorization\n caching is enabled. The value is a comma-separated string of one or more mapping\n expressions of the specified request parameters. For example, if an Auth\n header and a Name query string parameters are defined as identity\n sources, this value is method.request.header.Auth,\n method.request.querystring.Name. These parameters will be used to\n derive the authorization caching key and to perform runtime validation of the\n REQUEST authorizer by verifying all of the identity-related request\n parameters are present, not null, and non-empty. Only when this is true does the\n authorizer invoke the authorizer Lambda function, otherwise, it returns a 401\n Unauthorized response without calling the Lambda function. The valid value\n is a string of comma-separated mapping expressions of the specified request\n parameters. When the authorization caching is not enabled, this property is\n optional.</p>"
+          "documentation" : "<p>The identity source for which authorization is requested.</p> <p>For a REQUEST authorizer, this is optional. The value is a set of one or more mapping expressions of the specified request parameters. Currently, the identity source can be headers, query string parameters, stage variables, and context parameters. For example, if an Auth header and a Name query string parameter are defined as identity sources, this value is route.request.header.Auth, route.request.querystring.Name. These parameters will be used to perform runtime validation for Lambda-based authorizers by verifying all of the identity-related request parameters are present in the request, not null, and non-empty. Only when this is true does the authorizer invoke the authorizer Lambda function. Otherwise, it returns a 401 Unauthorized response without calling the Lambda function.</p> <p>For JWT, a single entry that specifies where to extract the JSON Web Token (JWT )from inbound requests. Currently only header-based and query parameter-based selections are supported, for example \"$request.header.Authorization\".</p>"
         },
         "IdentityValidationExpression" : {
           "shape" : "StringWithLengthBetween0And1024",
           "locationName" : "identityValidationExpression",
-          "documentation" : "<p>The\n validation expression does not apply to the REQUEST authorizer.</p>"
+          "documentation" : "<p>This parameter is not used.</p>"
+        },
+        "JwtConfiguration" : {
+          "shape" : "JWTConfiguration",
+          "locationName" : "jwtConfiguration",
+          "documentation" : "<p>Represents the configuration of a JWT authorizer. Required for the JWT authorizer type. Supported only for HTTP APIs.</p>"
         },
         "Name" : {
           "shape" : "StringWithLengthBetween1And128",
           "locationName" : "name",
           "documentation" : "<p>The name of the authorizer.</p>"
-        },
-        "ProviderArns" : {
-          "shape" : "ProviderArnList",
-          "locationName" : "providerArns",
-          "documentation" : "<p>For\n REQUEST authorizer, this is not\n defined.</p>"
         }
       },
-      "required" : [ "ApiId", "AuthorizerUri", "AuthorizerType", "IdentitySource", "Name" ]
+      "documentation" : "<p>Creates a new Authorizer resource to represent an authorizer.</p>",
+      "required" : [ "ApiId", "AuthorizerType", "IdentitySource", "Name" ]
     },
     "CreateAuthorizerResponse" : {
       "type" : "structure",
@@ -2117,7 +2507,7 @@
         "AuthorizerCredentialsArn" : {
           "shape" : "Arn",
           "locationName" : "authorizerCredentialsArn",
-          "documentation" : "<p>Specifies the required credentials as an IAM role for API Gateway to invoke the\n authorizer. To specify an IAM role for API Gateway to assume, use the role's Amazon\n Resource Name (ARN). To use resource-based permissions on the Lambda function,\n specify null.</p>"
+          "documentation" : "<p>Specifies the required credentials as an IAM role for API Gateway to invoke the authorizer. To specify an IAM role for API Gateway to assume, use the role's Amazon Resource Name (ARN). To use resource-based permissions on the Lambda function, specify null. Supported only for REQUEST authorizers.</p>"
         },
         "AuthorizerId" : {
           "shape" : "Id",
@@ -2127,37 +2517,37 @@
         "AuthorizerResultTtlInSeconds" : {
           "shape" : "IntegerWithLengthBetween0And3600",
           "locationName" : "authorizerResultTtlInSeconds",
-          "documentation" : "<p>The time to live (TTL), in seconds, of cached authorizer results. If it equals 0,\n authorization caching is disabled. If it is greater than 0, API Gateway will cache\n authorizer responses. If this field is not set, the default value is 300. The maximum\n value is 3600, or 1 hour.</p>"
+          "documentation" : "<p>Authorizer caching is not currently supported. Don't specify this value for authorizers.</p>"
         },
         "AuthorizerType" : {
           "shape" : "AuthorizerType",
           "locationName" : "authorizerType",
-          "documentation" : "<p>The authorizer type. Currently the only valid value is REQUEST, for a\n Lambda function using incoming request parameters.</p>"
+          "documentation" : "<p>The authorizer type. For WebSocket APIs, specify REQUEST for a Lambda function using incoming request parameters. For HTTP APIs, specify JWT to use JSON Web Tokens.</p>"
         },
         "AuthorizerUri" : {
           "shape" : "UriWithLengthBetween1And2048",
           "locationName" : "authorizerUri",
-          "documentation" : "<p>The authorizer's Uniform Resource Identifier (URI).\n ForREQUEST authorizers, this must be a\n well-formed Lambda function URI, for example,\n arn:aws:apigateway:us-west-2:lambda:path/2015-03-31/functions/arn:aws:lambda:us-west-2:{account_id}:function:{lambda_function_name}/invocations.\n In general, the URI has this form:\n arn:aws:apigateway:{region}:lambda:path/{service_api}\n , where {region} is the same as the region hosting the Lambda\n function, path indicates that the remaining substring in the URI should be treated as\n the path to the resource, including the initial /. For Lambda functions,\n this is usually of the form\n /2015-03-31/functions/[FunctionARN]/invocations.</p>"
+          "documentation" : "<p>The authorizer's Uniform Resource Identifier (URI). ForREQUEST authorizers, this must be a well-formed Lambda function URI, for example, arn:aws:apigateway:us-west-2:lambda:path/2015-03-31/functions/arn:aws:lambda:us-west-2:<replaceable>{account_id}</replaceable>:function:<replaceable>{lambda_function_name}</replaceable>/invocations. In general, the URI has this form: arn:aws:apigateway:<replaceable>{region}</replaceable>:lambda:path/<replaceable>{service_api}</replaceable>\n               , where <replaceable></replaceable>{region} is the same as the region hosting the Lambda function, path indicates that the remaining substring in the URI should be treated as the path to the resource, including the initial /. For Lambda functions, this is usually of the form /2015-03-31/functions/[FunctionARN]/invocations. Supported only for REQUEST authorizers.</p>"
         },
         "IdentitySource" : {
           "shape" : "IdentitySourceList",
           "locationName" : "identitySource",
-          "documentation" : "<p>The identity source for which authorization is requested.</p><p>For the REQUEST authorizer, this is required when authorization\n caching is enabled. The value is a comma-separated string of one or more mapping\n expressions of the specified request parameters. For example, if an Auth\n header and a Name query string parameters are defined as identity\n sources, this value is method.request.header.Auth,\n method.request.querystring.Name. These parameters will be used to\n derive the authorization caching key and to perform runtime validation of the\n REQUEST authorizer by verifying all of the identity-related request\n parameters are present, not null, and non-empty. Only when this is true does the\n authorizer invoke the authorizer Lambda function, otherwise, it returns a 401\n Unauthorized response without calling the Lambda function. The valid value\n is a string of comma-separated mapping expressions of the specified request\n parameters. When the authorization caching is not enabled, this property is\n optional.</p>"
+          "documentation" : "<p>The identity source for which authorization is requested.</p> <p>For a REQUEST authorizer, this is optional. The value is a set of one or more mapping expressions of the specified request parameters. Currently, the identity source can be headers, query string parameters, stage variables, and context parameters. For example, if an Auth header and a Name query string parameter are defined as identity sources, this value is route.request.header.Auth, route.request.querystring.Name. These parameters will be used to perform runtime validation for Lambda-based authorizers by verifying all of the identity-related request parameters are present in the request, not null, and non-empty. Only when this is true does the authorizer invoke the authorizer Lambda function. Otherwise, it returns a 401 Unauthorized response without calling the Lambda function.</p> <p>For JWT, a single entry that specifies where to extract the JSON Web Token (JWT) from inbound requests. Currently only header-based and query parameter-based selections are supported, for example \"$request.header.Authorization\".</p>"
         },
         "IdentityValidationExpression" : {
           "shape" : "StringWithLengthBetween0And1024",
           "locationName" : "identityValidationExpression",
-          "documentation" : "<p>The\n validation expression does not apply to the REQUEST authorizer.</p>"
+          "documentation" : "<p>The validation expression does not apply to the REQUEST authorizer.</p>"
+        },
+        "JwtConfiguration" : {
+          "shape" : "JWTConfiguration",
+          "locationName" : "jwtConfiguration",
+          "documentation" : "<p>Represents the configuration of a JWT authorizer. Required for the JWT authorizer type. Supported only for HTTP APIs.</p>"
         },
         "Name" : {
           "shape" : "StringWithLengthBetween1And128",
           "locationName" : "name",
           "documentation" : "<p>The name of the authorizer.</p>"
-        },
-        "ProviderArns" : {
-          "shape" : "ProviderArnList",
-          "locationName" : "providerArns",
-          "documentation" : "<p>For\n REQUEST authorizer, this is not\n defined.</p>"
         }
       }
     },
@@ -2172,10 +2562,10 @@
         "StageName" : {
           "shape" : "StringWithLengthBetween1And128",
           "locationName" : "stageName",
-          "documentation" : "<p>The name of the Stage resource for the Deployment\n resource to create.</p>"
+          "documentation" : "<p>The name of the Stage resource for the Deployment resource to create.</p>"
         }
       },
-      "documentation" : "<p>Represents the input parameters for a CreateDeployment\n request.</p>"
+      "documentation" : "<p>Represents the input parameters for a CreateDeployment request.</p>"
     },
     "CreateDeploymentRequest" : {
       "type" : "structure",
@@ -2194,14 +2584,20 @@
         "StageName" : {
           "shape" : "StringWithLengthBetween1And128",
           "locationName" : "stageName",
-          "documentation" : "<p>The name of the Stage resource for the Deployment\n resource to create.</p>"
+          "documentation" : "<p>The name of the Stage resource for the Deployment resource to create.</p>"
         }
       },
+      "documentation" : "<p>Creates a new Deployment resource to represent a deployment.</p>",
       "required" : [ "ApiId" ]
     },
     "CreateDeploymentResponse" : {
       "type" : "structure",
       "members" : {
+        "AutoDeployed" : {
+          "shape" : "__boolean",
+          "locationName" : "autoDeployed",
+          "documentation" : "<p>Specifies whether a deployment was automatically released.</p>"
+        },
         "CreatedDate" : {
           "shape" : "__timestampIso8601",
           "locationName" : "createdDate",
@@ -2215,7 +2611,7 @@
         "DeploymentStatus" : {
           "shape" : "DeploymentStatus",
           "locationName" : "deploymentStatus",
-          "documentation" : "<p>The status of the deployment: PENDING, FAILED, or\n SUCCEEDED.</p>"
+          "documentation" : "<p>The status of the deployment: PENDING, FAILED, or SUCCEEDED.</p>"
         },
         "DeploymentStatusMessage" : {
           "shape" : "__string",
@@ -2245,11 +2641,10 @@
         "Tags" : {
           "shape" : "Tags",
           "locationName" : "tags",
-          "documentation" : "<p>The key-value map of strings. The valid character set is [a-zA-Z+-=._:/]. The tag key can be up to 128 characters and must not start with aws:. The tag value can be up to 256 characters..</p>"
+          "documentation" : "<p>The collection of tags associated with a domain name.</p>"
         }
-
       },
-      "documentation" : "<p>Represents the input parameters for a CreateDomainName\n request.</p>",
+      "documentation" : "<p>Represents the input parameters for a CreateDomainName request.</p>",
       "required" : [ "DomainName" ]
     },
     "CreateDomainNameRequest" : {
@@ -2268,9 +2663,10 @@
         "Tags" : {
           "shape" : "Tags",
           "locationName" : "tags",
-          "documentation" : "<p>The key-value map of strings. The valid character set is [a-zA-Z+-=._:/]. The tag key can be up to 128 characters and must not start with aws:. The tag value can be up to 256 characters..</p>"
+          "documentation" : "<p>The collection of tags associated with a domain name.</p>"
         }
       },
+      "documentation" : "<p>Creates a new DomainName resource to represent a domain name.</p>",
       "required" : [ "DomainName" ]
     },
     "CreateDomainNameResponse" : {
@@ -2294,7 +2690,7 @@
         "Tags" : {
           "shape" : "Tags",
           "locationName" : "tags",
-          "documentation" : "<p>The key-value map of strings. The valid character set is [a-zA-Z+-=._:/]. The tag key can be up to 128 characters and must not start with aws:. The tag value can be up to 256 characters..</p>"
+          "documentation" : "<p>The collection of tags associated with a domain name.</p>"
         }
       }
     },
@@ -2304,22 +2700,22 @@
         "ConnectionId" : {
           "shape" : "StringWithLengthBetween1And1024",
           "locationName" : "connectionId",
-          "documentation" : "<p>The connection ID.</p>"
+          "documentation" : "<p>The ID of the VPC link for a private integration. Supported only for HTTP APIs.</p>"
         },
         "ConnectionType" : {
           "shape" : "ConnectionType",
           "locationName" : "connectionType",
-          "documentation" : "<p>The type of the network connection to the integration endpoint. Currently the only\n valid value is INTERNET, for connections through the public routable\n internet.</p>"
+          "documentation" : "<p>The type of the network connection to the integration endpoint. Specify INTERNET for connections through the public routable internet or VPC_LINK for private connections between API Gateway and resources in a VPC. The default value is INTERNET.</p>"
         },
         "ContentHandlingStrategy" : {
           "shape" : "ContentHandlingStrategy",
           "locationName" : "contentHandlingStrategy",
-          "documentation" : "<p>Specifies how to handle response payload content type conversions. Supported\n values are CONVERT_TO_BINARY and CONVERT_TO_TEXT, with the\n following behaviors:</p><p>\n CONVERT_TO_BINARY: Converts a response payload from a Base64-encoded\n string to the corresponding binary blob.</p><p>\n CONVERT_TO_TEXT: Converts a response payload from a binary blob to a\n Base64-encoded string.</p><p>If this property is not defined, the response payload will be passed through from\n the integration response to the route response or method response without\n modification.</p>"
+          "documentation" : "<p>Supported only for WebSocket APIs. Specifies how to handle response payload content type conversions. Supported values are CONVERT_TO_BINARY and CONVERT_TO_TEXT, with the following behaviors:</p> <p>CONVERT_TO_BINARY: Converts a response payload from a Base64-encoded string to the corresponding binary blob.</p> <p>CONVERT_TO_TEXT: Converts a response payload from a binary blob to a Base64-encoded string.</p> <p>If this property is not defined, the response payload will be passed through from the integration response to the route response or method response without modification.</p>"
         },
         "CredentialsArn" : {
           "shape" : "Arn",
           "locationName" : "credentialsArn",
-          "documentation" : "<p>Specifies the credentials required for the integration, if any. For AWS\n integrations, three options are available. To specify an IAM Role for API Gateway to\n assume, use the role's Amazon Resource Name (ARN). To require that the caller's\n identity be passed through from the request, specify the string\n arn:aws:iam::*:user/*. To use resource-based permissions on supported\n AWS services, specify null.</p>"
+          "documentation" : "<p>Specifies the credentials required for the integration, if any. For AWS integrations, three options are available. To specify an IAM Role for API Gateway to assume, use the role's Amazon Resource Name (ARN). To require that the caller's identity be passed through from the request, specify the string arn:aws:iam::*:user/*. To use resource-based permissions on supported AWS services, specify null.</p>"
         },
         "Description" : {
           "shape" : "StringWithLengthBetween0And1024",
@@ -2334,27 +2730,32 @@
         "IntegrationType" : {
           "shape" : "IntegrationType",
           "locationName" : "integrationType",
-          "documentation" : "<p>The integration type of an integration. One of the following:</p><p>\n AWS: for integrating the route or method request with an AWS service\n action, including the Lambda function-invoking action. With the Lambda\n function-invoking action, this is referred to as the Lambda custom integration. With\n any other AWS service action, this is known as AWS integration.</p><p>\n AWS_PROXY: for integrating the route or method request with the Lambda\n function-invoking action with the client request passed through as-is. This\n integration is also referred to as Lambda proxy integration.</p><p>\n HTTP: for integrating the route or method request with an HTTP\n endpoint. This\n integration is also referred to as HTTP custom integration.</p><p>\n HTTP_PROXY: for integrating route or method request with an HTTP\n endpoint, with the client\n request passed through as-is. This is also referred to as HTTP proxy\n integration.</p><p>\n MOCK: for integrating the route or method request with API Gateway as a\n \"loopback\" endpoint without invoking any backend.</p>"
+          "documentation" : "<p>The integration type of an integration. One of the following:</p> <p>AWS: for integrating the route or method request with an AWS service action, including the Lambda function-invoking action. With the Lambda function-invoking action, this is referred to as the Lambda custom integration. With any other AWS service action, this is known as AWS integration. Supported only for WebSocket APIs.</p> <p>AWS_PROXY: for integrating the route or method request with the Lambda function-invoking action with the client request passed through as-is. This integration is also referred to as Lambda proxy integration.</p> <p>HTTP: for integrating the route or method request with an HTTP endpoint. This integration is also referred to as the HTTP custom integration. Supported only for WebSocket APIs.</p> <p>HTTP_PROXY: for integrating the route or method request with an HTTP endpoint, with the client request passed through as-is. This is also referred to as HTTP proxy integration. For HTTP API private integrations, use an HTTP_PROXY integration.</p> <p>MOCK: for integrating the route or method request with API Gateway as a \"loopback\" endpoint without invoking any backend. Supported only for WebSocket APIs.</p>"
         },
         "IntegrationUri" : {
           "shape" : "UriWithLengthBetween1And2048",
           "locationName" : "integrationUri",
-          "documentation" : "<p>For a Lambda proxy integration, this is the URI of the Lambda function.</p>"
+          "documentation" : "<p>For a Lambda integration, specify the URI of a Lambda function.</p> <p>For an HTTP integration, specify a fully-qualified URL.</p> <p>For an HTTP API private integration, specify the ARN of an Application Load Balancer listener, Network Load Balancer listener, or AWS Cloud Map service. If you specify the ARN of an AWS Cloud Map service, API Gateway uses DiscoverInstances to identify resources. You can use query parameters to target specific resources. To learn more, see <a href=\"https://alpha-docs-aws.amazon.com/cloud-map/latest/api/API_DiscoverInstances.html\">DiscoverInstances</a>. For private integrations, all resources must be owned by the same AWS account.</p>"
         },
         "PassthroughBehavior" : {
           "shape" : "PassthroughBehavior",
           "locationName" : "passthroughBehavior",
-          "documentation" : "<p>Specifies the pass-through behavior for incoming requests based on the\n Content-Type header in the request, and the available mapping\n templates specified as the requestTemplates property on the\n Integration resource. There are three valid values:\n WHEN_NO_MATCH, WHEN_NO_TEMPLATES, and\n NEVER.</p><p>\n WHEN_NO_MATCH passes the request body for unmapped content types through\n to the integration backend without transformation.</p><p>\n NEVER rejects unmapped content types with an HTTP 415 Unsupported\n Media Type response.</p><p>\n WHEN_NO_TEMPLATES allows pass-through when the integration has no\n content types mapped to templates. However, if there is at least one content type\n defined, unmapped content types will be rejected with the same HTTP 415\n Unsupported Media Type response.</p>"
+          "documentation" : "<p>Specifies the pass-through behavior for incoming requests based on the Content-Type header in the request, and the available mapping templates specified as the requestTemplates property on the Integration resource. There are three valid values: WHEN_NO_MATCH, WHEN_NO_TEMPLATES, and NEVER. Supported only for WebSocket APIs.</p> <p>WHEN_NO_MATCH passes the request body for unmapped content types through to the integration backend without transformation.</p> <p>NEVER rejects unmapped content types with an HTTP 415 Unsupported Media Type response.</p> <p>WHEN_NO_TEMPLATES allows pass-through when the integration has no content types mapped to templates. However, if there is at least one content type defined, unmapped content types will be rejected with the same HTTP 415 Unsupported Media Type response.</p>"
+        },
+        "PayloadFormatVersion" : {
+          "shape" : "StringWithLengthBetween1And64",
+          "locationName" : "payloadFormatVersion",
+          "documentation" : "<p>Specifies the format of the payload sent to an integration. Required for HTTP APIs.</p>"
         },
         "RequestParameters" : {
           "shape" : "IntegrationParameters",
           "locationName" : "requestParameters",
-          "documentation" : "<p>A key-value map specifying request parameters that are passed from the method\n request to the backend. The key is an integration request parameter name and the\n associated value is a method request parameter value or static value that must be\n enclosed within single quotes and pre-encoded as required by the backend. The method\n request parameter value must match the pattern of\n method.request.{location}.{name}\n , where \n {location}\n  is querystring, path, or header; and \n {name}\n  must be a valid and unique method request parameter name.</p>"
+          "documentation" : "<p>A key-value map specifying request parameters that are passed from the method request to the backend. The key is an integration request parameter name and the associated value is a method request parameter value or static value that must be enclosed within single quotes and pre-encoded as required by the backend. The method request parameter value must match the pattern of method.request.<replaceable>{location}</replaceable>.<replaceable>{name}</replaceable>\n               , where \n                  <replaceable>{location}</replaceable>\n                is querystring, path, or header; and \n                  <replaceable>{name}</replaceable>\n                must be a valid and unique method request parameter name. Supported only for WebSocket APIs.</p>"
         },
         "RequestTemplates" : {
           "shape" : "TemplateMap",
           "locationName" : "requestTemplates",
-          "documentation" : "<p>Represents a map of Velocity templates that are applied on the request payload\n based on the value of the Content-Type header sent by the client. The content type\n value is the key in this map, and the template (as a String) is the value.</p>"
+          "documentation" : "<p>Represents a map of Velocity templates that are applied on the request payload based on the value of the Content-Type header sent by the client. The content type value is the key in this map, and the template (as a String) is the value. Supported only for WebSocket APIs.</p>"
         },
         "TemplateSelectionExpression" : {
           "shape" : "SelectionExpression",
@@ -2362,12 +2763,17 @@
           "documentation" : "<p>The template selection expression for the integration.</p>"
         },
         "TimeoutInMillis" : {
-          "shape" : "IntegerWithLengthBetween50And29000",
+          "shape" : "IntegerWithLengthBetween50And30000",
           "locationName" : "timeoutInMillis",
-          "documentation" : "<p>Custom timeout between 50 and 29,000 milliseconds. The default value is 29,000\n milliseconds or 29 seconds.</p>"
+          "documentation" : "<p>Custom timeout between 50 and 29,000 milliseconds for WebSocket APIs and between 50 and 30,000 milliseconds for HTTP APIs. The default timeout is 29 seconds for WebSocket APIs and 30 seconds for HTTP APIs.</p>"
+        },
+        "TlsConfig" : {
+          "shape" : "TlsConfigInput",
+          "locationName" : "tlsConfig",
+          "documentation" : "<p>The TLS configuration for a private integration. If you specify a TLS configuration, private integration traffic uses the HTTPS protocol. Supported only for HTTP APIs.</p>"
         }
       },
-      "documentation" : "<p>Represents the input parameters for a CreateIntegration\n request.</p>",
+      "documentation" : "<p>Represents the input parameters for a CreateIntegration request.</p>",
       "required" : [ "IntegrationType" ]
     },
     "CreateIntegrationRequest" : {
@@ -2382,22 +2788,22 @@
         "ConnectionId" : {
           "shape" : "StringWithLengthBetween1And1024",
           "locationName" : "connectionId",
-          "documentation" : "<p>The connection ID.</p>"
+          "documentation" : "<p>The ID of the VPC link for a private integration. Supported only for HTTP APIs.</p>"
         },
         "ConnectionType" : {
           "shape" : "ConnectionType",
           "locationName" : "connectionType",
-          "documentation" : "<p>The type of the network connection to the integration endpoint. Currently the only\n valid value is INTERNET, for connections through the public routable\n internet.</p>"
+          "documentation" : "<p>The type of the network connection to the integration endpoint. Specify INTERNET for connections through the public routable internet or VPC_LINK for private connections between API Gateway and resources in a VPC. The default value is INTERNET.</p>"
         },
         "ContentHandlingStrategy" : {
           "shape" : "ContentHandlingStrategy",
           "locationName" : "contentHandlingStrategy",
-          "documentation" : "<p>Specifies how to handle response payload content type conversions. Supported\n values are CONVERT_TO_BINARY and CONVERT_TO_TEXT, with the\n following behaviors:</p><p>\n CONVERT_TO_BINARY: Converts a response payload from a Base64-encoded\n string to the corresponding binary blob.</p><p>\n CONVERT_TO_TEXT: Converts a response payload from a binary blob to a\n Base64-encoded string.</p><p>If this property is not defined, the response payload will be passed through from\n the integration response to the route response or method response without\n modification.</p>"
+          "documentation" : "<p>Supported only for WebSocket APIs. Specifies how to handle response payload content type conversions. Supported values are CONVERT_TO_BINARY and CONVERT_TO_TEXT, with the following behaviors:</p> <p>CONVERT_TO_BINARY: Converts a response payload from a Base64-encoded string to the corresponding binary blob.</p> <p>CONVERT_TO_TEXT: Converts a response payload from a binary blob to a Base64-encoded string.</p> <p>If this property is not defined, the response payload will be passed through from the integration response to the route response or method response without modification.</p>"
         },
         "CredentialsArn" : {
           "shape" : "Arn",
           "locationName" : "credentialsArn",
-          "documentation" : "<p>Specifies the credentials required for the integration, if any. For AWS\n integrations, three options are available. To specify an IAM Role for API Gateway to\n assume, use the role's Amazon Resource Name (ARN). To require that the caller's\n identity be passed through from the request, specify the string\n arn:aws:iam::*:user/*. To use resource-based permissions on supported\n AWS services, specify null.</p>"
+          "documentation" : "<p>Specifies the credentials required for the integration, if any. For AWS integrations, three options are available. To specify an IAM Role for API Gateway to assume, use the role's Amazon Resource Name (ARN). To require that the caller's identity be passed through from the request, specify the string arn:aws:iam::*:user/*. To use resource-based permissions on supported AWS services, specify null.</p>"
         },
         "Description" : {
           "shape" : "StringWithLengthBetween0And1024",
@@ -2412,27 +2818,32 @@
         "IntegrationType" : {
           "shape" : "IntegrationType",
           "locationName" : "integrationType",
-          "documentation" : "<p>The integration type of an integration. One of the following:</p><p>\n AWS: for integrating the route or method request with an AWS service\n action, including the Lambda function-invoking action. With the Lambda\n function-invoking action, this is referred to as the Lambda custom integration. With\n any other AWS service action, this is known as AWS integration.</p><p>\n AWS_PROXY: for integrating the route or method request with the Lambda\n function-invoking action with the client request passed through as-is. This\n integration is also referred to as Lambda proxy integration.</p><p>\n HTTP: for integrating the route or method request with an HTTP\n endpoint. This\n integration is also referred to as HTTP custom integration.</p><p>\n HTTP_PROXY: for integrating route or method request with an HTTP\n endpoint, with the client\n request passed through as-is. This is also referred to as HTTP proxy\n integration.</p><p>\n MOCK: for integrating the route or method request with API Gateway as a\n \"loopback\" endpoint without invoking any backend.</p>"
+          "documentation" : "<p>The integration type of an integration. One of the following:</p> <p>AWS: for integrating the route or method request with an AWS service action, including the Lambda function-invoking action. With the Lambda function-invoking action, this is referred to as the Lambda custom integration. With any other AWS service action, this is known as AWS integration. Supported only for WebSocket APIs.</p> <p>AWS_PROXY: for integrating the route or method request with the Lambda function-invoking action with the client request passed through as-is. This integration is also referred to as Lambda proxy integration.</p> <p>HTTP: for integrating the route or method request with an HTTP endpoint. This integration is also referred to as the HTTP custom integration. Supported only for WebSocket APIs.</p> <p>HTTP_PROXY: for integrating the route or method request with an HTTP endpoint, with the client request passed through as-is. This is also referred to as HTTP proxy integration. For HTTP API private integrations, use an HTTP_PROXY integration.</p> <p>MOCK: for integrating the route or method request with API Gateway as a \"loopback\" endpoint without invoking any backend. Supported only for WebSocket APIs.</p>"
         },
         "IntegrationUri" : {
           "shape" : "UriWithLengthBetween1And2048",
           "locationName" : "integrationUri",
-          "documentation" : "<p>For a Lambda proxy integration, this is the URI of the Lambda function.</p>"
+          "documentation" : "<p>For a Lambda integration, specify the URI of a Lambda function.</p> <p>For an HTTP integration, specify a fully-qualified URL.</p> <p>For an HTTP API private integration, specify the ARN of an Application Load Balancer listener, Network Load Balancer listener, or AWS Cloud Map service. If you specify the ARN of an AWS Cloud Map service, API Gateway uses DiscoverInstances to identify resources. You can use query parameters to target specific resources. To learn more, see <a href=\"https://alpha-docs-aws.amazon.com/cloud-map/latest/api/API_DiscoverInstances.html\">DiscoverInstances</a>. For private integrations, all resources must be owned by the same AWS account.</p>"
         },
         "PassthroughBehavior" : {
           "shape" : "PassthroughBehavior",
           "locationName" : "passthroughBehavior",
-          "documentation" : "<p>Specifies the pass-through behavior for incoming requests based on the\n Content-Type header in the request, and the available mapping\n templates specified as the requestTemplates property on the\n Integration resource. There are three valid values:\n WHEN_NO_MATCH, WHEN_NO_TEMPLATES, and\n NEVER.</p><p>\n WHEN_NO_MATCH passes the request body for unmapped content types through\n to the integration backend without transformation.</p><p>\n NEVER rejects unmapped content types with an HTTP 415 Unsupported\n Media Type response.</p><p>\n WHEN_NO_TEMPLATES allows pass-through when the integration has no\n content types mapped to templates. However, if there is at least one content type\n defined, unmapped content types will be rejected with the same HTTP 415\n Unsupported Media Type response.</p>"
+          "documentation" : "<p>Specifies the pass-through behavior for incoming requests based on the Content-Type header in the request, and the available mapping templates specified as the requestTemplates property on the Integration resource. There are three valid values: WHEN_NO_MATCH, WHEN_NO_TEMPLATES, and NEVER. Supported only for WebSocket APIs.</p> <p>WHEN_NO_MATCH passes the request body for unmapped content types through to the integration backend without transformation.</p> <p>NEVER rejects unmapped content types with an HTTP 415 Unsupported Media Type response.</p> <p>WHEN_NO_TEMPLATES allows pass-through when the integration has no content types mapped to templates. However, if there is at least one content type defined, unmapped content types will be rejected with the same HTTP 415 Unsupported Media Type response.</p>"
+        },
+        "PayloadFormatVersion" : {
+          "shape" : "StringWithLengthBetween1And64",
+          "locationName" : "payloadFormatVersion",
+          "documentation" : "<p>Specifies the format of the payload sent to an integration. Required for HTTP APIs.</p>"
         },
         "RequestParameters" : {
           "shape" : "IntegrationParameters",
           "locationName" : "requestParameters",
-          "documentation" : "<p>A key-value map specifying request parameters that are passed from the method\n request to the backend. The key is an integration request parameter name and the\n associated value is a method request parameter value or static value that must be\n enclosed within single quotes and pre-encoded as required by the backend. The method\n request parameter value must match the pattern of\n method.request.{location}.{name}\n , where \n {location}\n  is querystring, path, or header; and \n {name}\n  must be a valid and unique method request parameter name.</p>"
+          "documentation" : "<p>A key-value map specifying request parameters that are passed from the method request to the backend. The key is an integration request parameter name and the associated value is a method request parameter value or static value that must be enclosed within single quotes and pre-encoded as required by the backend. The method request parameter value must match the pattern of method.request.<replaceable>{location}</replaceable>.<replaceable>{name}</replaceable>\n               , where \n                  <replaceable>{location}</replaceable>\n                is querystring, path, or header; and \n                  <replaceable>{name}</replaceable>\n                must be a valid and unique method request parameter name. Supported only for WebSocket APIs.</p>"
         },
         "RequestTemplates" : {
           "shape" : "TemplateMap",
           "locationName" : "requestTemplates",
-          "documentation" : "<p>Represents a map of Velocity templates that are applied on the request payload\n based on the value of the Content-Type header sent by the client. The content type\n value is the key in this map, and the template (as a String) is the value.</p>"
+          "documentation" : "<p>Represents a map of Velocity templates that are applied on the request payload based on the value of the Content-Type header sent by the client. The content type value is the key in this map, and the template (as a String) is the value. Supported only for WebSocket APIs.</p>"
         },
         "TemplateSelectionExpression" : {
           "shape" : "SelectionExpression",
@@ -2440,35 +2851,46 @@
           "documentation" : "<p>The template selection expression for the integration.</p>"
         },
         "TimeoutInMillis" : {
-          "shape" : "IntegerWithLengthBetween50And29000",
+          "shape" : "IntegerWithLengthBetween50And30000",
           "locationName" : "timeoutInMillis",
-          "documentation" : "<p>Custom timeout between 50 and 29,000 milliseconds. The default value is 29,000\n milliseconds or 29 seconds.</p>"
+          "documentation" : "<p>Custom timeout between 50 and 29,000 milliseconds for WebSocket APIs and between 50 and 30,000 milliseconds for HTTP APIs. The default timeout is 29 seconds for WebSocket APIs and 30 seconds for HTTP APIs.</p>"
+        },
+        "TlsConfig" : {
+          "shape" : "TlsConfigInput",
+          "locationName" : "tlsConfig",
+          "documentation" : "<p>The TLS configuration for a private integration. If you specify a TLS configuration, private integration traffic uses the HTTPS protocol. Supported only for HTTP APIs.</p>"
         }
       },
+      "documentation" : "<p>Creates a new Integration resource to represent an integration.</p>",
       "required" : [ "ApiId", "IntegrationType" ]
     },
-    "CreateIntegrationResponse" : {
+    "CreateIntegrationResult" : {
       "type" : "structure",
       "members" : {
+        "ApiGatewayManaged" : {
+          "shape" : "__boolean",
+          "locationName" : "apiGatewayManaged",
+          "documentation" : "<p>Specifies whether an integration is managed by API Gateway. If you created an API using using quick create, the resulting integration is managed by API Gateway. You can update a managed integration, but you can't delete it.</p>"
+        },
         "ConnectionId" : {
           "shape" : "StringWithLengthBetween1And1024",
           "locationName" : "connectionId",
-          "documentation" : "<p>The connection ID.</p>"
+          "documentation" : "<p>The ID of the VPC link for a private integration. Supported only for HTTP APIs.</p>"
         },
         "ConnectionType" : {
           "shape" : "ConnectionType",
           "locationName" : "connectionType",
-          "documentation" : "<p>The type of the network connection to the integration endpoint. Currently the only\n valid value is INTERNET, for connections through the public routable\n internet.</p>"
+          "documentation" : "<p>The type of the network connection to the integration endpoint. Specify INTERNET for connections through the public routable internet or VPC_LINK for private connections between API Gateway and resources in a VPC. The default value is INTERNET.</p>"
         },
         "ContentHandlingStrategy" : {
           "shape" : "ContentHandlingStrategy",
           "locationName" : "contentHandlingStrategy",
-          "documentation" : "<p>Specifies how to handle response payload content type conversions. Supported\n values are CONVERT_TO_BINARY and CONVERT_TO_TEXT, with the\n following behaviors:</p><p>\n CONVERT_TO_BINARY: Converts a response payload from a Base64-encoded\n string to the corresponding binary blob.</p><p>\n CONVERT_TO_TEXT: Converts a response payload from a binary blob to a\n Base64-encoded string.</p><p>If this property is not defined, the response payload will be passed through from\n the integration response to the route response or method response without\n modification.</p>"
+          "documentation" : "<p>Supported only for WebSocket APIs. Specifies how to handle response payload content type conversions. Supported values are CONVERT_TO_BINARY and CONVERT_TO_TEXT, with the following behaviors:</p> <p>CONVERT_TO_BINARY: Converts a response payload from a Base64-encoded string to the corresponding binary blob.</p> <p>CONVERT_TO_TEXT: Converts a response payload from a binary blob to a Base64-encoded string.</p> <p>If this property is not defined, the response payload will be passed through from the integration response to the route response or method response without modification.</p>"
         },
         "CredentialsArn" : {
           "shape" : "Arn",
           "locationName" : "credentialsArn",
-          "documentation" : "<p>Specifies the credentials required for the integration, if any. For AWS\n integrations, three options are available. To specify an IAM Role for API Gateway to\n assume, use the role's Amazon Resource Name (ARN). To require that the caller's\n identity be passed through from the request, specify the string\n arn:aws:iam::*:user/*. To use resource-based permissions on supported\n AWS services, specify null.</p>"
+          "documentation" : "<p>Specifies the credentials required for the integration, if any. For AWS integrations, three options are available. To specify an IAM Role for API Gateway to assume, use the role's Amazon Resource Name (ARN). To require that the caller's identity be passed through from the request, specify the string arn:aws:iam::*:user/*. To use resource-based permissions on supported AWS services, specify null.</p>"
         },
         "Description" : {
           "shape" : "StringWithLengthBetween0And1024",
@@ -2488,42 +2910,52 @@
         "IntegrationResponseSelectionExpression" : {
           "shape" : "SelectionExpression",
           "locationName" : "integrationResponseSelectionExpression",
-          "documentation" : "<p>The integration response selection expression for the integration. See <a href=\"https://docs.aws.amazon.com/apigateway/latest/developerguide/apigateway-websocket-api-selection-expressions.html#apigateway-websocket-api-integration-response-selection-expressions\">Integration Response Selection Expressions</a>.</p>"
+          "documentation" : "<p>The integration response selection expression for the integration. Supported only for WebSocket APIs. See <a href=\"https://docs.aws.amazon.com/apigateway/latest/developerguide/apigateway-websocket-api-selection-expressions.html#apigateway-websocket-api-integration-response-selection-expressions\">Integration Response Selection Expressions</a>.</p>"
         },
         "IntegrationType" : {
           "shape" : "IntegrationType",
           "locationName" : "integrationType",
-          "documentation" : "<p>The integration type of an integration. One of the following:</p><p>\n AWS: for integrating the route or method request with an AWS service\n action, including the Lambda function-invoking action. With the Lambda\n function-invoking action, this is referred to as the Lambda custom integration. With\n any other AWS service action, this is known as AWS integration.</p><p>\n AWS_PROXY: for integrating the route or method request with the Lambda\n function-invoking action with the client request passed through as-is. This\n integration is also referred to as Lambda proxy integration.</p><p>\n HTTP: for integrating the route or method request with an HTTP\n endpoint. This\n integration is also referred to as the HTTP custom integration.</p><p>\n HTTP_PROXY: for integrating route or method request with an HTTP\n endpoint, with the client\n request passed through as-is. This is also referred to as HTTP proxy\n integration.</p><p>\n MOCK: for integrating the route or method request with API Gateway as a\n \"loopback\" endpoint without invoking any backend.</p>"
+          "documentation" : "<p>The integration type of an integration. One of the following:</p> <p>AWS: for integrating the route or method request with an AWS service action, including the Lambda function-invoking action. With the Lambda function-invoking action, this is referred to as the Lambda custom integration. With any other AWS service action, this is known as AWS integration. Supported only for WebSocket APIs.</p> <p>AWS_PROXY: for integrating the route or method request with the Lambda function-invoking action with the client request passed through as-is. This integration is also referred to as Lambda proxy integration.</p> <p>HTTP: for integrating the route or method request with an HTTP endpoint. This integration is also referred to as the HTTP custom integration. Supported only for WebSocket APIs.</p> <p>HTTP_PROXY: for integrating the route or method request with an HTTP endpoint, with the client request passed through as-is. This is also referred to as HTTP proxy integration.</p> <p>MOCK: for integrating the route or method request with API Gateway as a \"loopback\" endpoint without invoking any backend. Supported only for WebSocket APIs.</p>"
         },
         "IntegrationUri" : {
           "shape" : "UriWithLengthBetween1And2048",
           "locationName" : "integrationUri",
-          "documentation" : "<p>For a Lambda proxy integration, this is the URI of the Lambda function.</p>"
+          "documentation" : "<p>For a Lambda integration, specify the URI of a Lambda function.</p> <p>For an HTTP integration, specify a fully-qualified URL.</p> <p>For an HTTP API private integration, specify the ARN of an Application Load Balancer listener, Network Load Balancer listener, or AWS Cloud Map service. If you specify the ARN of an AWS Cloud Map service, API Gateway uses DiscoverInstances to identify resources. You can use query parameters to target specific resources. To learn more, see <a href=\"https://alpha-docs-aws.amazon.com/cloud-map/latest/api/API_DiscoverInstances.html\">DiscoverInstances</a>. For private integrations, all resources must be owned by the same AWS account.</p>"
         },
         "PassthroughBehavior" : {
           "shape" : "PassthroughBehavior",
           "locationName" : "passthroughBehavior",
-          "documentation" : "<p>Specifies the pass-through behavior for incoming requests based on the\n Content-Type header in the request, and the available mapping\n templates specified as the requestTemplates property on the\n Integration resource. There are three valid values:\n WHEN_NO_MATCH, WHEN_NO_TEMPLATES, and\n NEVER.</p><p>\n WHEN_NO_MATCH passes the request body for unmapped content types through\n to the integration backend without transformation.</p><p>\n NEVER rejects unmapped content types with an HTTP 415 Unsupported\n Media Type response.</p><p>\n WHEN_NO_TEMPLATES allows pass-through when the integration has no\n content types mapped to templates. However, if there is at least one content type\n defined, unmapped content types will be rejected with the same HTTP 415\n Unsupported Media Type response.</p>"
+          "documentation" : "<p>Specifies the pass-through behavior for incoming requests based on the Content-Type header in the request, and the available mapping templates specified as the requestTemplates property on the Integration resource. There are three valid values: WHEN_NO_MATCH, WHEN_NO_TEMPLATES, and NEVER. Supported only for WebSocket APIs.</p> <p>WHEN_NO_MATCH passes the request body for unmapped content types through to the integration backend without transformation.</p> <p>NEVER rejects unmapped content types with an HTTP 415 Unsupported Media Type response.</p> <p>WHEN_NO_TEMPLATES allows pass-through when the integration has no content types mapped to templates. However, if there is at least one content type defined, unmapped content types will be rejected with the same HTTP 415 Unsupported Media Type response.</p>"
+        },
+        "PayloadFormatVersion" : {
+          "shape" : "StringWithLengthBetween1And64",
+          "locationName" : "payloadFormatVersion",
+          "documentation" : "<p>Specifies the format of the payload sent to an integration. Required for HTTP APIs.</p>"
         },
         "RequestParameters" : {
           "shape" : "IntegrationParameters",
           "locationName" : "requestParameters",
-          "documentation" : "<p>A key-value map specifying request parameters that are passed from the method\n request to the backend. The key is an integration request parameter name and the\n associated value is a method request parameter value or static value that must be\n enclosed within single quotes and pre-encoded as required by the backend. The method\n request parameter value must match the pattern of\n method.request.{location}.{name}\n , where \n {location}\n  is querystring, path, or header; and \n {name}\n  must be a valid and unique method request parameter name.</p>"
+          "documentation" : "<p>A key-value map specifying request parameters that are passed from the method request to the backend. The key is an integration request parameter name and the associated value is a method request parameter value or static value that must be enclosed within single quotes and pre-encoded as required by the backend. The method request parameter value must match the pattern of method.request.<replaceable>{location}</replaceable>.<replaceable>{name}</replaceable>\n               , where \n                  <replaceable>{location}</replaceable>\n                is querystring, path, or header; and \n                  <replaceable>{name}</replaceable>\n                must be a valid and unique method request parameter name. Supported only for WebSocket APIs.</p>"
         },
         "RequestTemplates" : {
           "shape" : "TemplateMap",
           "locationName" : "requestTemplates",
-          "documentation" : "<p>Represents a map of Velocity templates that are applied on the request payload\n based on the value of the Content-Type header sent by the client. The content type\n value is the key in this map, and the template (as a String) is the value.</p>"
+          "documentation" : "<p>Represents a map of Velocity templates that are applied on the request payload based on the value of the Content-Type header sent by the client. The content type value is the key in this map, and the template (as a String) is the value. Supported only for WebSocket APIs.</p>"
         },
         "TemplateSelectionExpression" : {
           "shape" : "SelectionExpression",
           "locationName" : "templateSelectionExpression",
-          "documentation" : "<p>The template selection expression for the integration.</p>"
+          "documentation" : "<p>The template selection expression for the integration. Supported only for WebSocket APIs.</p>"
         },
         "TimeoutInMillis" : {
-          "shape" : "IntegerWithLengthBetween50And29000",
+          "shape" : "IntegerWithLengthBetween50And30000",
           "locationName" : "timeoutInMillis",
-          "documentation" : "<p>Custom timeout between 50 and 29,000 milliseconds. The default value is 29,000\n milliseconds or 29 seconds.</p>"
+          "documentation" : "<p>Custom timeout between 50 and 29,000 milliseconds for WebSocket APIs and between 50 and 30,000 milliseconds for HTTP APIs. The default timeout is 29 seconds for WebSocket APIs and 30 seconds for HTTP APIs.</p>"
+        },
+        "TlsConfig" : {
+          "shape" : "TlsConfig",
+          "locationName" : "tlsConfig",
+          "documentation" : "<p>The TLS configuration for a private integration. If you specify a TLS configuration, private integration traffic uses the HTTPS protocol. Supported only for HTTP APIs.</p>"
         }
       }
     },
@@ -2533,7 +2965,7 @@
         "ContentHandlingStrategy" : {
           "shape" : "ContentHandlingStrategy",
           "locationName" : "contentHandlingStrategy",
-          "documentation" : "<p>Specifies how to handle response payload content type conversions. Supported\n values are CONVERT_TO_BINARY and CONVERT_TO_TEXT, with the\n following behaviors:</p><p>\n CONVERT_TO_BINARY: Converts a response payload from a Base64-encoded\n string to the corresponding binary blob.</p><p>\n CONVERT_TO_TEXT: Converts a response payload from a binary blob to a\n Base64-encoded string.</p><p>If this property is not defined, the response payload will be passed through from\n the integration response to the route response or method response without\n modification.</p>"
+          "documentation" : "<p>Specifies how to handle response payload content type conversions. Supported values are CONVERT_TO_BINARY and CONVERT_TO_TEXT, with the following behaviors:</p> <p>CONVERT_TO_BINARY: Converts a response payload from a Base64-encoded string to the corresponding binary blob.</p> <p>CONVERT_TO_TEXT: Converts a response payload from a binary blob to a Base64-encoded string.</p> <p>If this property is not defined, the response payload will be passed through from the integration response to the route response or method response without modification.</p>"
         },
         "IntegrationResponseKey" : {
           "shape" : "SelectionKey",
@@ -2543,20 +2975,20 @@
         "ResponseParameters" : {
           "shape" : "IntegrationParameters",
           "locationName" : "responseParameters",
-          "documentation" : "<p>A key-value map specifying response parameters that are passed to the method\n response from the backend. The key is a method response header parameter name and the\n mapped value is an integration response header value, a static value enclosed within\n a pair of single quotes, or a JSON expression from the integration response body. The\n mapping key must match the pattern of method.response.header.{name},\n where {name} is a valid and unique header name. The mapped non-static\n value must match the pattern of integration.response.header.{name} or\n integration.response.body.{JSON-expression}, where\n {name} is a valid and unique response header name and\n {JSON-expression} is a valid JSON expression without the $\n prefix.</p>"
+          "documentation" : "<p>A key-value map specifying response parameters that are passed to the method response from the backend. The key is a method response header parameter name and the mapped value is an integration response header value, a static value enclosed within a pair of single quotes, or a JSON expression from the integration response body. The mapping key must match the pattern of method.response.header.{name}, where {name} is a valid and unique header name. The mapped non-static value must match the pattern of integration.response.header.{name} or integration.response.body.{JSON-expression}, where {name} is a valid and unique response header name and {JSON-expression} is a valid JSON expression without the $ prefix.</p>"
         },
         "ResponseTemplates" : {
           "shape" : "TemplateMap",
           "locationName" : "responseTemplates",
-          "documentation" : "<p>The collection of response templates for the integration response as a\n string-to-string map of key-value pairs. Response templates are represented as a\n key/value map, with a content-type as the key and a template as the value.</p>"
+          "documentation" : "<p>The collection of response templates for the integration response as a string-to-string map of key-value pairs. Response templates are represented as a key/value map, with a content-type as the key and a template as the value.</p>"
         },
         "TemplateSelectionExpression" : {
           "shape" : "SelectionExpression",
           "locationName" : "templateSelectionExpression",
-          "documentation" : "<p>The template selection expression for the integration response.</p>"
+          "documentation" : "<p>The template selection expression for the integration response. Supported only for WebSocket APIs.</p>"
         }
       },
-      "documentation" : "<p>Represents the input parameters for a CreateIntegrationResponse\n request.</p>",
+      "documentation" : "<p>Represents the input parameters for a CreateIntegrationResponse request.</p>",
       "required" : [ "IntegrationResponseKey" ]
     },
     "CreateIntegrationResponseRequest" : {
@@ -2571,7 +3003,7 @@
         "ContentHandlingStrategy" : {
           "shape" : "ContentHandlingStrategy",
           "locationName" : "contentHandlingStrategy",
-          "documentation" : "<p>Specifies how to handle response payload content type conversions. Supported\n values are CONVERT_TO_BINARY and CONVERT_TO_TEXT, with the\n following behaviors:</p><p>\n CONVERT_TO_BINARY: Converts a response payload from a Base64-encoded\n string to the corresponding binary blob.</p><p>\n CONVERT_TO_TEXT: Converts a response payload from a binary blob to a\n Base64-encoded string.</p><p>If this property is not defined, the response payload will be passed through from\n the integration response to the route response or method response without\n modification.</p>"
+          "documentation" : "<p>Specifies how to handle response payload content type conversions. Supported values are CONVERT_TO_BINARY and CONVERT_TO_TEXT, with the following behaviors:</p> <p>CONVERT_TO_BINARY: Converts a response payload from a Base64-encoded string to the corresponding binary blob.</p> <p>CONVERT_TO_TEXT: Converts a response payload from a binary blob to a Base64-encoded string.</p> <p>If this property is not defined, the response payload will be passed through from the integration response to the route response or method response without modification.</p>"
         },
         "IntegrationId" : {
           "shape" : "__string",
@@ -2587,19 +3019,20 @@
         "ResponseParameters" : {
           "shape" : "IntegrationParameters",
           "locationName" : "responseParameters",
-          "documentation" : "<p>A key-value map specifying response parameters that are passed to the method\n response from the backend. The key is a method response header parameter name and the\n mapped value is an integration response header value, a static value enclosed within\n a pair of single quotes, or a JSON expression from the integration response body. The\n mapping key must match the pattern of method.response.header.{name},\n where {name} is a valid and unique header name. The mapped non-static\n value must match the pattern of integration.response.header.{name} or\n integration.response.body.{JSON-expression}, where\n {name} is a valid and unique response header name and\n {JSON-expression} is a valid JSON expression without the $\n prefix.</p>"
+          "documentation" : "<p>A key-value map specifying response parameters that are passed to the method response from the backend. The key is a method response header parameter name and the mapped value is an integration response header value, a static value enclosed within a pair of single quotes, or a JSON expression from the integration response body. The mapping key must match the pattern of method.response.header.{name}, where {name} is a valid and unique header name. The mapped non-static value must match the pattern of integration.response.header.{name} or integration.response.body.{JSON-expression}, where {name} is a valid and unique response header name and {JSON-expression} is a valid JSON expression without the $ prefix.</p>"
         },
         "ResponseTemplates" : {
           "shape" : "TemplateMap",
           "locationName" : "responseTemplates",
-          "documentation" : "<p>The collection of response templates for the integration response as a\n string-to-string map of key-value pairs. Response templates are represented as a\n key/value map, with a content-type as the key and a template as the value.</p>"
+          "documentation" : "<p>The collection of response templates for the integration response as a string-to-string map of key-value pairs. Response templates are represented as a key/value map, with a content-type as the key and a template as the value.</p>"
         },
         "TemplateSelectionExpression" : {
           "shape" : "SelectionExpression",
           "locationName" : "templateSelectionExpression",
-          "documentation" : "<p>The template selection expression for the integration response.</p>"
+          "documentation" : "<p>The template selection expression for the integration response. Supported only for WebSocket APIs.</p>"
         }
       },
+      "documentation" : "<p>Creates a new IntegrationResponse resource to represent an integration response.</p>",
       "required" : [ "ApiId", "IntegrationId", "IntegrationResponseKey" ]
     },
     "CreateIntegrationResponseResponse" : {
@@ -2608,7 +3041,7 @@
         "ContentHandlingStrategy" : {
           "shape" : "ContentHandlingStrategy",
           "locationName" : "contentHandlingStrategy",
-          "documentation" : "<p>Specifies how to handle response payload content type conversions. Supported\n values are CONVERT_TO_BINARY and CONVERT_TO_TEXT, with the\n following behaviors:</p><p>\n CONVERT_TO_BINARY: Converts a response payload from a Base64-encoded\n string to the corresponding binary blob.</p><p>\n CONVERT_TO_TEXT: Converts a response payload from a binary blob to a\n Base64-encoded string.</p><p>If this property is not defined, the response payload will be passed through from\n the integration response to the route response or method response without\n modification.</p>"
+          "documentation" : "<p>Supported only for WebSocket APIs. Specifies how to handle response payload content type conversions. Supported values are CONVERT_TO_BINARY and CONVERT_TO_TEXT, with the following behaviors:</p> <p>CONVERT_TO_BINARY: Converts a response payload from a Base64-encoded string to the corresponding binary blob.</p> <p>CONVERT_TO_TEXT: Converts a response payload from a binary blob to a Base64-encoded string.</p> <p>If this property is not defined, the response payload will be passed through from the integration response to the route response or method response without modification.</p>"
         },
         "IntegrationResponseId" : {
           "shape" : "Id",
@@ -2623,12 +3056,12 @@
         "ResponseParameters" : {
           "shape" : "IntegrationParameters",
           "locationName" : "responseParameters",
-          "documentation" : "<p>A key-value map specifying response parameters that are passed to the method\n response from the backend. The key is a method response header parameter name and the\n mapped value is an integration response header value, a static value enclosed within\n a pair of single quotes, or a JSON expression from the integration response body. The\n mapping key must match the pattern of method.response.header.{name}, where name is a\n valid and unique header name. The mapped non-static value must match the pattern of\n integration.response.header.{name} or integration.response.body.{JSON-expression},\n where name is a valid and unique response header name and JSON-expression is a valid\n JSON expression without the $ prefix.</p>"
+          "documentation" : "<p>A key-value map specifying response parameters that are passed to the method response from the backend. The key is a method response header parameter name and the mapped value is an integration response header value, a static value enclosed within a pair of single quotes, or a JSON expression from the integration response body. The mapping key must match the pattern of method.response.header.{name}, where name is a valid and unique header name. The mapped non-static value must match the pattern of integration.response.header.{name} or integration.response.body.{JSON-expression}, where name is a valid and unique response header name and JSON-expression is a valid JSON expression without the $ prefix.</p>"
         },
         "ResponseTemplates" : {
           "shape" : "TemplateMap",
           "locationName" : "responseTemplates",
-          "documentation" : "<p>The collection of response templates for the integration response as a\n string-to-string map of key-value pairs. Response templates are represented as a\n key/value map, with a content-type as the key and a template as the value.</p>"
+          "documentation" : "<p>The collection of response templates for the integration response as a string-to-string map of key-value pairs. Response templates are represented as a key/value map, with a content-type as the key and a template as the value.</p>"
         },
         "TemplateSelectionExpression" : {
           "shape" : "SelectionExpression",
@@ -2658,7 +3091,7 @@
         "Schema" : {
           "shape" : "StringWithLengthBetween0And32K",
           "locationName" : "schema",
-          "documentation" : "<p>The schema for the model. For application/json models, this should be JSON schema\n draft 4 model.</p>"
+          "documentation" : "<p>The schema for the model. For application/json models, this should be JSON schema draft 4 model.</p>"
         }
       },
       "documentation" : "<p>Represents the input parameters for a CreateModel request.</p>",
@@ -2691,9 +3124,10 @@
         "Schema" : {
           "shape" : "StringWithLengthBetween0And32K",
           "locationName" : "schema",
-          "documentation" : "<p>The schema for the model. For application/json models, this should be JSON schema\n draft 4 model.</p>"
+          "documentation" : "<p>The schema for the model. For application/json models, this should be JSON schema draft 4 model.</p>"
         }
       },
+      "documentation" : "<p>Creates a new Model.</p>",
       "required" : [ "ApiId", "Schema", "Name" ]
     },
     "CreateModelResponse" : {
@@ -2722,7 +3156,7 @@
         "Schema" : {
           "shape" : "StringWithLengthBetween0And32K",
           "locationName" : "schema",
-          "documentation" : "<p>The schema for the model. For application/json models, this should be JSON schema\n draft 4 model.</p>"
+          "documentation" : "<p>The schema for the model. For application/json models, this should be JSON schema draft 4 model.</p>"
         }
       }
     },
@@ -2732,27 +3166,27 @@
         "ApiKeyRequired" : {
           "shape" : "__boolean",
           "locationName" : "apiKeyRequired",
-          "documentation" : "<p>Specifies whether an API key is required for the route.</p>"
+          "documentation" : "<p>Specifies whether an API key is required for the route. Supported only for WebSocket APIs.</p>"
         },
         "AuthorizationScopes" : {
           "shape" : "AuthorizationScopes",
           "locationName" : "authorizationScopes",
-          "documentation" : "<p>The authorization scopes supported by this\n route.</p>"
+          "documentation" : "<p>The authorization scopes supported by this route.</p>"
         },
         "AuthorizationType" : {
           "shape" : "AuthorizationType",
           "locationName" : "authorizationType",
-          "documentation" : "<p>The authorization type for the route. Valid values are NONE for open\n access, AWS_IAM for using AWS IAM permissions, and CUSTOM\n for using a Lambda\n authorizer.</p>"
+          "documentation" : "<p>The authorization type for the route. For WebSocket APIs, valid values are NONE for open access, AWS_IAM for using AWS IAM permissions, and CUSTOM for using a Lambda authorizer For HTTP APIs, valid values are NONE for open access, or JWT for using JSON Web Tokens.</p>"
         },
         "AuthorizerId" : {
           "shape" : "Id",
           "locationName" : "authorizerId",
-          "documentation" : "<p>The identifier of the Authorizer resource to be associated with this\n route, if the authorizationType is CUSTOM\n . The authorizer identifier is generated by API Gateway\n when you created the authorizer.</p>"
+          "documentation" : "<p>The identifier of the Authorizer resource to be associated with this route. The authorizer identifier is generated by API Gateway when you created the authorizer.</p>"
         },
         "ModelSelectionExpression" : {
           "shape" : "SelectionExpression",
           "locationName" : "modelSelectionExpression",
-          "documentation" : "<p>The model selection expression for the route.</p>"
+          "documentation" : "<p>The model selection expression for the route. Supported only for WebSocket APIs.</p>"
         },
         "OperationName" : {
           "shape" : "StringWithLengthBetween1And64",
@@ -2762,12 +3196,12 @@
         "RequestModels" : {
           "shape" : "RouteModels",
           "locationName" : "requestModels",
-          "documentation" : "<p>The request models for the route.</p>"
+          "documentation" : "<p>The request models for the route. Supported only for WebSocket APIs.</p>"
         },
         "RequestParameters" : {
           "shape" : "RouteParameters",
           "locationName" : "requestParameters",
-          "documentation" : "<p>The request parameters for the route.</p>"
+          "documentation" : "<p>The request parameters for the route. Supported only for WebSocket APIs.</p>"
         },
         "RouteKey" : {
           "shape" : "SelectionKey",
@@ -2777,7 +3211,7 @@
         "RouteResponseSelectionExpression" : {
           "shape" : "SelectionExpression",
           "locationName" : "routeResponseSelectionExpression",
-          "documentation" : "<p>The route response selection expression for the route.</p>"
+          "documentation" : "<p>The route response selection expression for the route. Supported only for WebSocket APIs.</p>"
         },
         "Target" : {
           "shape" : "StringWithLengthBetween1And128",
@@ -2800,27 +3234,27 @@
         "ApiKeyRequired" : {
           "shape" : "__boolean",
           "locationName" : "apiKeyRequired",
-          "documentation" : "<p>Specifies whether an API key is required for the route.</p>"
+          "documentation" : "<p>Specifies whether an API key is required for the route. Supported only for WebSocket APIs.</p>"
         },
         "AuthorizationScopes" : {
           "shape" : "AuthorizationScopes",
           "locationName" : "authorizationScopes",
-          "documentation" : "<p>The authorization scopes supported by this\n route.</p>"
+          "documentation" : "<p>The authorization scopes supported by this route.</p>"
         },
         "AuthorizationType" : {
           "shape" : "AuthorizationType",
           "locationName" : "authorizationType",
-          "documentation" : "<p>The authorization type for the route. Valid values are NONE for open\n access, AWS_IAM for using AWS IAM permissions, and CUSTOM\n for using a Lambda\n authorizer.</p>"
+          "documentation" : "<p>The authorization type for the route. For WebSocket APIs, valid values are NONE for open access, AWS_IAM for using AWS IAM permissions, and CUSTOM for using a Lambda authorizer For HTTP APIs, valid values are NONE for open access, or JWT for using JSON Web Tokens.</p>"
         },
         "AuthorizerId" : {
           "shape" : "Id",
           "locationName" : "authorizerId",
-          "documentation" : "<p>The identifier of the Authorizer resource to be associated with this\n route, if the authorizationType is CUSTOM\n . The authorizer identifier is generated by API Gateway\n when you created the authorizer.</p>"
+          "documentation" : "<p>The identifier of the Authorizer resource to be associated with this route. The authorizer identifier is generated by API Gateway when you created the authorizer.</p>"
         },
         "ModelSelectionExpression" : {
           "shape" : "SelectionExpression",
           "locationName" : "modelSelectionExpression",
-          "documentation" : "<p>The model selection expression for the route.</p>"
+          "documentation" : "<p>The model selection expression for the route. Supported only for WebSocket APIs.</p>"
         },
         "OperationName" : {
           "shape" : "StringWithLengthBetween1And64",
@@ -2830,12 +3264,12 @@
         "RequestModels" : {
           "shape" : "RouteModels",
           "locationName" : "requestModels",
-          "documentation" : "<p>The request models for the route.</p>"
+          "documentation" : "<p>The request models for the route. Supported only for WebSocket APIs.</p>"
         },
         "RequestParameters" : {
           "shape" : "RouteParameters",
           "locationName" : "requestParameters",
-          "documentation" : "<p>The request parameters for the route.</p>"
+          "documentation" : "<p>The request parameters for the route. Supported only for WebSocket APIs.</p>"
         },
         "RouteKey" : {
           "shape" : "SelectionKey",
@@ -2845,7 +3279,7 @@
         "RouteResponseSelectionExpression" : {
           "shape" : "SelectionExpression",
           "locationName" : "routeResponseSelectionExpression",
-          "documentation" : "<p>The route response selection expression for the route.</p>"
+          "documentation" : "<p>The route response selection expression for the route. Supported only for WebSocket APIs.</p>"
         },
         "Target" : {
           "shape" : "StringWithLengthBetween1And128",
@@ -2853,35 +3287,41 @@
           "documentation" : "<p>The target for the route.</p>"
         }
       },
+      "documentation" : "<p>Creates a new Route resource to represent a route.</p>",
       "required" : [ "ApiId", "RouteKey" ]
     },
-    "CreateRouteResponse" : {
+    "CreateRouteResult" : {
       "type" : "structure",
       "members" : {
+        "ApiGatewayManaged" : {
+          "shape" : "__boolean",
+          "locationName" : "apiGatewayManaged",
+          "documentation" : "<p>Specifies whether a route is managed by API Gateway. If you created an API using quick create, the $default route is managed by API Gateway. You can't modify the $default route key.</p>"
+        },
         "ApiKeyRequired" : {
           "shape" : "__boolean",
           "locationName" : "apiKeyRequired",
-          "documentation" : "<p>Specifies whether an API key is required for this route.</p>"
+          "documentation" : "<p>Specifies whether an API key is required for this route. Supported only for WebSocket APIs.</p>"
         },
         "AuthorizationScopes" : {
           "shape" : "AuthorizationScopes",
           "locationName" : "authorizationScopes",
-          "documentation" : "<p>A list of authorization scopes configured on a route. The scopes are used with a\n COGNITO_USER_POOLS authorizer to authorize the method invocation. The authorization\n works by matching the route scopes against the scopes parsed from the access token in\n the incoming request. The method invocation is authorized if any route scope matches\n a claimed scope in the access token. Otherwise, the invocation is not authorized.\n When the route scope is configured, the client must provide an access token instead\n of an identity token for authorization purposes.</p>"
+          "documentation" : "<p>A list of authorization scopes configured on a route. The scopes are used with a JWT authorizer to authorize the method invocation. The authorization works by matching the route scopes against the scopes parsed from the access token in the incoming request. The method invocation is authorized if any route scope matches a claimed scope in the access token. Otherwise, the invocation is not authorized. When the route scope is configured, the client must provide an access token instead of an identity token for authorization purposes.</p>"
         },
         "AuthorizationType" : {
           "shape" : "AuthorizationType",
           "locationName" : "authorizationType",
-          "documentation" : "<p>The authorization type for the route. Valid values are NONE for open\n access, AWS_IAM for using AWS IAM permissions, and CUSTOM\n for using a Lambda\n authorizer</p>"
+          "documentation" : "<p>The authorization type for the route. For WebSocket APIs, valid values are NONE for open access, AWS_IAM for using AWS IAM permissions, and CUSTOM for using a Lambda authorizer For HTTP APIs, valid values are NONE for open access, or JWT for using JSON Web Tokens.</p>"
         },
         "AuthorizerId" : {
           "shape" : "Id",
           "locationName" : "authorizerId",
-          "documentation" : "<p>The identifier of the Authorizer resource to be associated with this\n route, if the authorizationType is CUSTOM\n . The authorizer identifier is generated by API Gateway\n when you created the authorizer.</p>"
+          "documentation" : "<p>The identifier of the Authorizer resource to be associated with this route. The authorizer identifier is generated by API Gateway when you created the authorizer.</p>"
         },
         "ModelSelectionExpression" : {
           "shape" : "SelectionExpression",
           "locationName" : "modelSelectionExpression",
-          "documentation" : "<p>The model selection expression for the route.</p>"
+          "documentation" : "<p>The model selection expression for the route. Supported only for WebSocket APIs.</p>"
         },
         "OperationName" : {
           "shape" : "StringWithLengthBetween1And64",
@@ -2891,12 +3331,12 @@
         "RequestModels" : {
           "shape" : "RouteModels",
           "locationName" : "requestModels",
-          "documentation" : "<p>The request models for the route.</p>"
+          "documentation" : "<p>The request models for the route. Supported only for WebSocket APIs.</p>"
         },
         "RequestParameters" : {
           "shape" : "RouteParameters",
           "locationName" : "requestParameters",
-          "documentation" : "<p>The request parameters for the route.</p>"
+          "documentation" : "<p>The request parameters for the route. Supported only for WebSocket APIs.</p>"
         },
         "RouteId" : {
           "shape" : "Id",
@@ -2911,7 +3351,7 @@
         "RouteResponseSelectionExpression" : {
           "shape" : "SelectionExpression",
           "locationName" : "routeResponseSelectionExpression",
-          "documentation" : "<p>The route response selection expression for the route.</p>"
+          "documentation" : "<p>The route response selection expression for the route. Supported only for WebSocket APIs.</p>"
         },
         "Target" : {
           "shape" : "StringWithLengthBetween1And128",
@@ -2926,7 +3366,7 @@
         "ModelSelectionExpression" : {
           "shape" : "SelectionExpression",
           "locationName" : "modelSelectionExpression",
-          "documentation" : "<p>The model selection expression for the route response.</p>"
+          "documentation" : "<p>The model selection expression for the route response. Supported only for WebSocket APIs.</p>"
         },
         "ResponseModels" : {
           "shape" : "RouteModels",
@@ -2944,7 +3384,7 @@
           "documentation" : "<p>The route response key.</p>"
         }
       },
-      "documentation" : "<p>Represents the input parameters for an CreateRouteResponse\n request.</p>",
+      "documentation" : "<p>Represents the input parameters for an CreateRouteResponse request.</p>",
       "required" : [ "RouteResponseKey" ]
     },
     "CreateRouteResponseRequest" : {
@@ -2959,7 +3399,7 @@
         "ModelSelectionExpression" : {
           "shape" : "SelectionExpression",
           "locationName" : "modelSelectionExpression",
-          "documentation" : "<p>The model selection expression for the route response.</p>"
+          "documentation" : "<p>The model selection expression for the route response. Supported only for WebSocket APIs.</p>"
         },
         "ResponseModels" : {
           "shape" : "RouteModels",
@@ -2983,6 +3423,7 @@
           "documentation" : "<p>The route response key.</p>"
         }
       },
+      "documentation" : "<p>Creates a new RouteResponse resource to represent a route response.</p>",
       "required" : [ "ApiId", "RouteId", "RouteResponseKey" ]
     },
     "CreateRouteResponseResponse" : {
@@ -2991,7 +3432,7 @@
         "ModelSelectionExpression" : {
           "shape" : "SelectionExpression",
           "locationName" : "modelSelectionExpression",
-          "documentation" : "<p>Represents the model selection expression of a route response.</p>"
+          "documentation" : "<p>Represents the model selection expression of a route response. Supported only for WebSocket APIs.</p>"
         },
         "ResponseModels" : {
           "shape" : "RouteModels",
@@ -3023,10 +3464,15 @@
           "locationName" : "accessLogSettings",
           "documentation" : "<p>Settings for logging access in this stage.</p>"
         },
+        "AutoDeploy" : {
+          "shape" : "__boolean",
+          "locationName" : "autoDeploy",
+          "documentation" : "<p>Specifies whether updates to an API automatically trigger a new deployment. The default value is false.</p>"
+        },
         "ClientCertificateId" : {
           "shape" : "Id",
           "locationName" : "clientCertificateId",
-          "documentation" : "<p>The identifier of a client certificate for a Stage.</p>"
+          "documentation" : "<p>The identifier of a client certificate for a Stage. Supported only for WebSocket APIs.</p>"
         },
         "DefaultRouteSettings" : {
           "shape" : "RouteSettings",
@@ -3046,7 +3492,7 @@
         "RouteSettings" : {
           "shape" : "RouteSettingsMap",
           "locationName" : "routeSettings",
-          "documentation" : "<p>Route settings for the stage.</p>"
+          "documentation" : "<p>Route settings for the stage, by routeKey.</p>"
         },
         "StageName" : {
           "shape" : "StringWithLengthBetween1And128",
@@ -3056,12 +3502,12 @@
         "StageVariables" : {
           "shape" : "StageVariablesMap",
           "locationName" : "stageVariables",
-          "documentation" : "<p>A map that defines the stage variables for a Stage. Variable names\n can have alphanumeric and underscore characters, and the values must match\n [A-Za-z0-9-._~:/?#&=,]+.</p>"
+          "documentation" : "<p>A map that defines the stage variables for a Stage. Variable names can have alphanumeric and underscore characters, and the values must match [A-Za-z0-9-._~:/?#&amp;=,]+.</p>"
         },
         "Tags" : {
           "shape" : "Tags",
           "locationName" : "tags",
-          "documentation" : "<p>The key-value map of strings. The valid character set is [a-zA-Z+-=._:/]. The tag key can be up to 128 characters and must not start with aws:. The tag value can be up to 256 characters..</p>"
+          "documentation" : "<p>The collection of tags. Each tag element is associated with a given resource.</p>"
         }
       },
       "documentation" : "<p>Represents the input parameters for a CreateStage request.</p>",
@@ -3081,10 +3527,15 @@
           "locationName" : "apiId",
           "documentation" : "<p>The API identifier.</p>"
         },
+        "AutoDeploy" : {
+          "shape" : "__boolean",
+          "locationName" : "autoDeploy",
+          "documentation" : "<p>Specifies whether updates to an API automatically trigger a new deployment. The default value is false.</p>"
+        },
         "ClientCertificateId" : {
           "shape" : "Id",
           "locationName" : "clientCertificateId",
-          "documentation" : "<p>The identifier of a client certificate for a Stage.</p>"
+          "documentation" : "<p>The identifier of a client certificate for a Stage. Supported only for WebSocket APIs.</p>"
         },
         "DefaultRouteSettings" : {
           "shape" : "RouteSettings",
@@ -3104,7 +3555,7 @@
         "RouteSettings" : {
           "shape" : "RouteSettingsMap",
           "locationName" : "routeSettings",
-          "documentation" : "<p>Route settings for the stage.</p>"
+          "documentation" : "<p>Route settings for the stage, by routeKey.</p>"
         },
         "StageName" : {
           "shape" : "StringWithLengthBetween1And128",
@@ -3114,14 +3565,15 @@
         "StageVariables" : {
           "shape" : "StageVariablesMap",
           "locationName" : "stageVariables",
-          "documentation" : "<p>A map that defines the stage variables for a Stage. Variable names\n can have alphanumeric and underscore characters, and the values must match\n [A-Za-z0-9-._~:/?#&=,]+.</p>"
+          "documentation" : "<p>A map that defines the stage variables for a Stage. Variable names can have alphanumeric and underscore characters, and the values must match [A-Za-z0-9-._~:/?#&amp;=,]+.</p>"
         },
         "Tags" : {
           "shape" : "Tags",
           "locationName" : "tags",
-          "documentation" : "<p>The key-value map of strings. The valid character set is [a-zA-Z+-=._:/]. The tag key can be up to 128 characters and must not start with aws:. The tag value can be up to 256 characters..</p>"
+          "documentation" : "<p>The collection of tags. Each tag element is associated with a given resource.</p>"
         }
       },
+      "documentation" : "<p>Creates a new Stage resource to represent a stage.</p>",
       "required" : [ "ApiId", "StageName" ]
     },
     "CreateStageResponse" : {
@@ -3132,10 +3584,20 @@
           "locationName" : "accessLogSettings",
           "documentation" : "<p>Settings for logging access in this stage.</p>"
         },
+        "ApiGatewayManaged" : {
+          "shape" : "__boolean",
+          "locationName" : "apiGatewayManaged",
+          "documentation" : "<p>Specifies whether a stage is managed by API Gateway. If you created an API using quick create, the $default stage is managed by API Gateway. You can't modify the $default stage.</p>"
+        },
+        "AutoDeploy" : {
+          "shape" : "__boolean",
+          "locationName" : "autoDeploy",
+          "documentation" : "<p>Specifies whether updates to an API automatically trigger a new deployment. The default value is false.</p>"
+        },
         "ClientCertificateId" : {
           "shape" : "Id",
           "locationName" : "clientCertificateId",
-          "documentation" : "<p>The identifier of a client certificate for a Stage.</p>"
+          "documentation" : "<p>The identifier of a client certificate for a Stage. Supported only for WebSocket APIs.</p>"
         },
         "CreatedDate" : {
           "shape" : "__timestampIso8601",
@@ -3150,13 +3612,18 @@
         "DeploymentId" : {
           "shape" : "Id",
           "locationName" : "deploymentId",
-          "documentation" : "<p>The identifier of the Deployment that the Stage is\n associated with.</p>"
+          "documentation" : "<p>The identifier of the Deployment that the Stage is associated with. Can't be updated if autoDeploy is enabled.</p>"
         },
         "Description" : {
           "shape" : "StringWithLengthBetween0And1024",
           "locationName" : "description",
           "documentation" : "<p>The description of the stage.</p>"
         },
+        "LastDeploymentStatusMessage" : {
+          "shape" : "__string",
+          "locationName" : "lastDeploymentStatusMessage",
+          "documentation" : "<p>Describes the status of the last deployment of a stage. Supported only for stages with autoDeploy enabled.</p>"
+        },
         "LastUpdatedDate" : {
           "shape" : "__timestampIso8601",
           "locationName" : "lastUpdatedDate",
@@ -3165,7 +3632,7 @@
         "RouteSettings" : {
           "shape" : "RouteSettingsMap",
           "locationName" : "routeSettings",
-          "documentation" : "<p>Route settings for the stage.</p>"
+          "documentation" : "<p>Route settings for the stage, by routeKey.</p>"
         },
         "StageName" : {
           "shape" : "StringWithLengthBetween1And128",
@@ -3175,15 +3642,137 @@
         "StageVariables" : {
           "shape" : "StageVariablesMap",
           "locationName" : "stageVariables",
-          "documentation" : "<p>A map that defines the stage variables for a stage resource. Variable names can\n have alphanumeric and underscore characters, and the values must match\n [A-Za-z0-9-._~:/?#&=,]+.</p>"
+          "documentation" : "<p>A map that defines the stage variables for a stage resource. Variable names can have alphanumeric and underscore characters, and the values must match [A-Za-z0-9-._~:/?#&amp;=,]+.</p>"
+        },
+        "Tags" : {
+          "shape" : "Tags",
+          "locationName" : "tags",
+          "documentation" : "<p>The collection of tags. Each tag element is associated with a given resource.</p>"
+        }
+      }
+    },
+    "CreateVpcLinkInput" : {
+      "type" : "structure",
+      "members" : {
+        "Name" : {
+          "shape" : "StringWithLengthBetween1And128",
+          "locationName" : "name",
+          "documentation" : "<p>The name of the VPC link.</p>"
+        },
+        "SecurityGroupIds" : {
+          "shape" : "SecurityGroupIdList",
+          "locationName" : "securityGroupIds",
+          "documentation" : "<p>A list of security group IDs for the VPC link.</p>"
+        },
+        "SubnetIds" : {
+          "shape" : "SubnetIdList",
+          "locationName" : "subnetIds",
+          "documentation" : "<p>A list of subnet IDs to include in the VPC link.</p>"
+        },
+        "Tags" : {
+          "shape" : "Tags",
+          "locationName" : "tags",
+          "documentation" : "<p>A list of tags.</p>"
+        }
+      },
+      "documentation" : "<p>Represents the input parameters for a CreateVpcLink request.</p>",
+      "required" : [ "SubnetIds", "Name" ]
+    },
+    "CreateVpcLinkRequest" : {
+      "type" : "structure",
+      "members" : {
+        "Name" : {
+          "shape" : "StringWithLengthBetween1And128",
+          "locationName" : "name",
+          "documentation" : "<p>The name of the VPC link.</p>"
+        },
+        "SecurityGroupIds" : {
+          "shape" : "SecurityGroupIdList",
+          "locationName" : "securityGroupIds",
+          "documentation" : "<p>A list of security group IDs for the VPC link.</p>"
+        },
+        "SubnetIds" : {
+          "shape" : "SubnetIdList",
+          "locationName" : "subnetIds",
+          "documentation" : "<p>A list of subnet IDs to include in the VPC link.</p>"
         },
         "Tags" : {
           "shape" : "Tags",
           "locationName" : "tags",
-          "documentation" : "<p>The key-value map of strings. The valid character set is [a-zA-Z+-=._:/]. The tag key can be up to 128 characters and must not start with aws:. The tag value can be up to 256 characters..</p>"
+          "documentation" : "<p>A list of tags.</p>"
+        }
+      },
+      "documentation" : "<p>Creates a VPC link</p>",
+      "required" : [ "SubnetIds", "Name" ]
+    },
+    "CreateVpcLinkResponse" : {
+      "type" : "structure",
+      "members" : {
+        "CreatedDate" : {
+          "shape" : "__timestampIso8601",
+          "locationName" : "createdDate",
+          "documentation" : "<p>The timestamp when the VPC link was created.</p>"
+        },
+        "Name" : {
+          "shape" : "StringWithLengthBetween1And128",
+          "locationName" : "name",
+          "documentation" : "<p>The name of the VPC link.</p>"
+        },
+        "SecurityGroupIds" : {
+          "shape" : "SecurityGroupIdList",
+          "locationName" : "securityGroupIds",
+          "documentation" : "<p>A list of security group IDs for the VPC link.</p>"
+        },
+        "SubnetIds" : {
+          "shape" : "SubnetIdList",
+          "locationName" : "subnetIds",
+          "documentation" : "<p>A list of subnet IDs to include in the VPC link.</p>"
+        },
+        "Tags" : {
+          "shape" : "Tags",
+          "locationName" : "tags",
+          "documentation" : "<p>Tags for the VPC link.</p>"
+        },
+        "VpcLinkId" : {
+          "shape" : "Id",
+          "locationName" : "vpcLinkId",
+          "documentation" : "<p>The ID of the VPC link.</p>"
+        },
+        "VpcLinkStatus" : {
+          "shape" : "VpcLinkStatus",
+          "locationName" : "vpcLinkStatus",
+          "documentation" : "<p>The status of the VPC link.</p>"
+        },
+        "VpcLinkStatusMessage" : {
+          "shape" : "StringWithLengthBetween0And1024",
+          "locationName" : "vpcLinkStatusMessage",
+          "documentation" : "<p>A message summarizing the cause of the status of the VPC link.</p>"
+        },
+        "VpcLinkVersion" : {
+          "shape" : "VpcLinkVersion",
+          "locationName" : "vpcLinkVersion",
+          "documentation" : "<p>The version of the VPC link.</p>"
         }
       }
     },
+    "DeleteAccessLogSettingsRequest" : {
+      "type" : "structure",
+      "members" : {
+        "ApiId" : {
+          "shape" : "__string",
+          "location" : "uri",
+          "locationName" : "apiId",
+          "documentation" : "<p>The API identifier.</p>"
+        },
+        "StageName" : {
+          "shape" : "__string",
+          "location" : "uri",
+          "locationName" : "stageName",
+          "documentation" : "<p>The stage name. Stage names can only contain alphanumeric characters, hyphens, and underscores. Maximum length is 128 characters.</p>"
+        }
+      },
+      "required" : [ "StageName", "ApiId" ]
+    },
     "DeleteApiMappingRequest" : {
       "type" : "structure",
       "members" : {
@@ -3232,6 +3821,18 @@
       },
       "required" : [ "AuthorizerId", "ApiId" ]
     },
+    "DeleteCorsConfigurationRequest" : {
+      "type" : "structure",
+      "members" : {
+        "ApiId" : {
+          "shape" : "__string",
+          "location" : "uri",
+          "locationName" : "apiId",
+          "documentation" : "<p>The API identifier.</p>"
+        }
+      },
+      "required" : [ "ApiId" ]
+    },
     "DeleteDeploymentRequest" : {
       "type" : "structure",
       "members" : {
@@ -3340,6 +3941,30 @@
       },
       "required" : [ "ApiId", "RouteId" ]
     },
+    "DeleteRouteRequestParameterRequest" : {
+      "type" : "structure",
+      "members" : {
+        "ApiId" : {
+          "shape" : "__string",
+          "location" : "uri",
+          "locationName" : "apiId",
+          "documentation" : "<p>The API identifier.</p>"
+        },
+        "RequestParameterKey" : {
+          "shape" : "__string",
+          "location" : "uri",
+          "locationName" : "requestParameterKey",
+          "documentation" : "<p>The route request parameter key.</p>"
+        },
+        "RouteId" : {
+          "shape" : "__string",
+          "location" : "uri",
+          "locationName" : "routeId",
+          "documentation" : "<p>The route ID.</p>"
+        }
+      },
+      "required" : [ "RequestParameterKey", "ApiId", "RouteId" ]
+    },
     "DeleteRouteResponseRequest" : {
       "type" : "structure",
       "members" : {
@@ -3364,6 +3989,30 @@
       },
       "required" : [ "RouteResponseId", "ApiId", "RouteId" ]
     },
+    "DeleteRouteSettingsRequest" : {
+      "type" : "structure",
+      "members" : {
+        "ApiId" : {
+          "shape" : "__string",
+          "location" : "uri",
+          "locationName" : "apiId",
+          "documentation" : "<p>The API identifier.</p>"
+        },
+        "RouteKey" : {
+          "shape" : "__string",
+          "location" : "uri",
+          "locationName" : "routeKey",
+          "documentation" : "<p>The route key.</p>"
+        },
+        "StageName" : {
+          "shape" : "__string",
+          "location" : "uri",
+          "locationName" : "stageName",
+          "documentation" : "<p>The stage name. Stage names can only contain alphanumeric characters, hyphens, and underscores. Maximum length is 128 characters.</p>"
+        }
+      },
+      "required" : [ "StageName", "RouteKey", "ApiId" ]
+    },
     "DeleteStageRequest" : {
       "type" : "structure",
       "members" : {
@@ -3377,14 +4026,35 @@
           "shape" : "__string",
           "location" : "uri",
           "locationName" : "stageName",
-          "documentation" : "<p>The stage name.</p>"
+          "documentation" : "<p>The stage name. Stage names can only contain alphanumeric characters, hyphens, and underscores. Maximum length is 128 characters.</p>"
         }
       },
       "required" : [ "StageName", "ApiId" ]
     },
+    "DeleteVpcLinkRequest" : {
+      "type" : "structure",
+      "members" : {
+        "VpcLinkId" : {
+          "shape" : "__string",
+          "location" : "uri",
+          "locationName" : "vpcLinkId",
+          "documentation" : "<p>The ID of the VPC link.</p>"
+        }
+      },
+      "required" : [ "VpcLinkId" ]
+    },
+    "DeleteVpcLinkResponse" : {
+      "type" : "structure",
+      "members" : { }
+    },
     "Deployment" : {
       "type" : "structure",
       "members" : {
+        "AutoDeployed" : {
+          "shape" : "__boolean",
+          "locationName" : "autoDeployed",
+          "documentation" : "<p>Specifies whether a deployment was automatically released.</p>"
+        },
         "CreatedDate" : {
           "shape" : "__timestampIso8601",
           "locationName" : "createdDate",
@@ -3398,7 +4068,7 @@
         "DeploymentStatus" : {
           "shape" : "DeploymentStatus",
           "locationName" : "deploymentStatus",
-          "documentation" : "<p>The status of the deployment: PENDING, FAILED, or\n SUCCEEDED.</p>"
+          "documentation" : "<p>The status of the deployment: PENDING, FAILED, or SUCCEEDED.</p>"
         },
         "DeploymentStatusMessage" : {
           "shape" : "__string",
@@ -3411,7 +4081,7 @@
           "documentation" : "<p>The description for the deployment.</p>"
         }
       },
-      "documentation" : "<p>An immutable representation of an API that can be called by users. A\n Deployment must be associated with a Stage for it to be\n callable over the internet.</p>"
+      "documentation" : "<p>An immutable representation of an API that can be called by users. A Deployment must be associated with a Stage for it to be callable over the internet.</p>"
     },
     "DeploymentStatus" : {
       "type" : "string",
@@ -3429,10 +4099,10 @@
         "NextToken" : {
           "shape" : "NextToken",
           "locationName" : "nextToken",
-          "documentation" : "<p>The next page of elements from this collection. Not valid for the last element of\n the collection.</p>"
+          "documentation" : "<p>The next page of elements from this collection. Not valid for the last element of the collection.</p>"
         }
       },
-      "documentation" : "<p>A collection resource that contains zero or more references to your existing\n deployments, and links that guide you on how to interact with your collection. The\n collection offers a paginated view of the contained deployments.</p>"
+      "documentation" : "<p>A collection resource that contains zero or more references to your existing deployments, and links that guide you on how to interact with your collection. The collection offers a paginated view of the contained deployments.</p>"
     },
     "DomainName" : {
       "type" : "structure",
@@ -3455,7 +4125,7 @@
         "Tags" : {
           "shape" : "Tags",
           "locationName" : "tags",
-          "documentation" : "<p>The key-value map of strings. The valid character set is [a-zA-Z+-=._:/]. The tag key can be up to 128 characters and must not start with aws:. The tag value can be up to 256 characters..</p>"
+          "documentation" : "<p>The collection of tags associated with a domain name.</p>"
         }
       },
       "documentation" : "<p>Represents a domain name.</p>",
@@ -3467,22 +4137,32 @@
         "ApiGatewayDomainName" : {
           "shape" : "__string",
           "locationName" : "apiGatewayDomainName",
-          "documentation" : "<p>A domain name for the WebSocket API.</p>"
+          "documentation" : "<p>A domain name for the API.</p>"
         },
         "CertificateArn" : {
           "shape" : "Arn",
           "locationName" : "certificateArn",
-          "documentation" : "<p>An AWS-managed certificate that will be used by the edge-optimized endpoint for\n this domain name. AWS Certificate Manager is the only supported source.</p>"
+          "documentation" : "<p>An AWS-managed certificate that will be used by the edge-optimized endpoint for this domain name. AWS Certificate Manager is the only supported source.</p>"
         },
         "CertificateName" : {
           "shape" : "StringWithLengthBetween1And128",
           "locationName" : "certificateName",
-          "documentation" : "<p>The user-friendly name of the certificate that will be used by the edge-optimized\n endpoint for this domain name.</p>"
+          "documentation" : "<p>The user-friendly name of the certificate that will be used by the edge-optimized endpoint for this domain name.</p>"
         },
         "CertificateUploadDate" : {
           "shape" : "__timestampIso8601",
           "locationName" : "certificateUploadDate",
-          "documentation" : "<p>The timestamp when the certificate that was used by edge-optimized endpoint for\n this domain name was uploaded.</p>"
+          "documentation" : "<p>The timestamp when the certificate that was used by edge-optimized endpoint for this domain name was uploaded.</p>"
+        },
+        "DomainNameStatus" : {
+          "shape" : "DomainNameStatus",
+          "locationName" : "domainNameStatus",
+          "documentation" : "<p>The status of the domain name migration. The valid values are AVAILABLE and UPDATING. If the status is UPDATING, the domain cannot be modified further until the existing operation is complete. If it is AVAILABLE, the domain can be updated.</p>"
+        },
+        "DomainNameStatusMessage" : {
+          "shape" : "__string",
+          "locationName" : "domainNameStatusMessage",
+          "documentation" : "<p>An optional text message containing detailed information about status of the domain name migration.</p>"
         },
         "EndpointType" : {
           "shape" : "EndpointType",
@@ -3498,16 +4178,6 @@
           "shape" : "SecurityPolicy",
           "locationName" : "securityPolicy",
           "documentation" : "<p>The Transport Layer Security (TLS) version of the security policy for this domain name. The valid values are TLS_1_0 and TLS_1_2.</p>"
-        },
-        "DomainNameStatus" : {
-          "shape" : "DomainNameStatus",
-          "locationName" : "domainNameStatus",
-          "documentation" : "<p>The status of the domain name migration. The valid values are AVAILABLE and UPDATING. If the status is UPDATING, the domain cannot be modified further until the existing operation is complete. If it is AVAILABLE, the domain can be updated.</p>"
-        },
-        "DomainNameStatusMessage" : {
-          "shape" : "__string",
-          "locationName" : "domainNameStatusMessage",
-          "documentation" : "<p>An optional text message containing detailed information about status of the domain name migration.</p>"
         }
       },
       "documentation" : "<p>The domain name configuration.</p>"
@@ -3519,6 +4189,11 @@
         "shape" : "DomainNameConfiguration"
       }
     },
+    "DomainNameStatus" : {
+      "type" : "string",
+      "documentation" : "<p>The status of the domain name migration. The valid values are AVAILABLE and UPDATING. If the status is UPDATING, the domain cannot be modified further until the existing operation is complete. If it is AVAILABLE, the domain can be updated.</p>",
+      "enum" : [ "AVAILABLE", "UPDATING" ]
+    },
     "DomainNames" : {
       "type" : "structure",
       "members" : {
@@ -3530,7 +4205,7 @@
         "NextToken" : {
           "shape" : "NextToken",
           "locationName" : "nextToken",
-          "documentation" : "<p>The next page of elements from this collection. Not valid for the last element of\n the collection.</p>"
+          "documentation" : "<p>The next page of elements from this collection. Not valid for the last element of the collection.</p>"
         }
       },
       "documentation" : "<p>Represents a collection of domain names.</p>"
@@ -3540,16 +4215,6 @@
       "documentation" : "<p>Represents an endpoint type.</p>",
       "enum" : [ "REGIONAL", "EDGE" ]
     },
-    "SecurityPolicy" : {
-      "type" : "string",
-      "documentation" : "<p>The Transport Layer Security (TLS) version of the security policy for this domain name. The valid values are TLS_1_0 and TLS_1_2.</p>",
-      "enum" : [ "TLS_1_0", "TLS_1_2" ]
-    },
-    "DomainNameStatus" : {
-      "type" : "string",
-      "documentation" : "<p>The status of the domain name migration. The valid values are AVAILABLE and UPDATING. If the status is UPDATING, the domain cannot be modified further until the existing operation is complete. If it is AVAILABLE, the domain can be updated.</p>",
-      "enum" : [ "AVAILABLE", "UPDATING"]
-    },
     "GetApiMappingRequest" : {
       "type" : "structure",
       "members" : {
@@ -3612,7 +4277,7 @@
           "shape" : "__string",
           "location" : "querystring",
           "locationName" : "nextToken",
-          "documentation" : "<p>The next page of elements from this collection. Not valid for the last element of\n the collection.</p>"
+          "documentation" : "<p>The next page of elements from this collection. Not valid for the last element of the collection.</p>"
         }
       },
       "required" : [ "DomainName" ]
@@ -3628,7 +4293,7 @@
         "NextToken" : {
           "shape" : "NextToken",
           "locationName" : "nextToken",
-          "documentation" : "<p>The next page of elements from this collection. Not valid for the last element of\n the collection.</p>"
+          "documentation" : "<p>The next page of elements from this collection. Not valid for the last element of the collection.</p>"
         }
       }
     },
@@ -3650,7 +4315,7 @@
         "ApiEndpoint" : {
           "shape" : "__string",
           "locationName" : "apiEndpoint",
-          "documentation" : "<p>The URI of the API, of the form {api-id}.execute-api.{region}.amazonaws.com. The\n stage name is typically appended to this URI to form a complete path to a deployed\n API stage.</p>"
+          "documentation" : "<p>The URI of the API, of the form {api-id}.execute-api.{region}.amazonaws.com. The stage name is typically appended to this URI to form a complete path to a deployed API stage.</p>"
         },
         "ApiId" : {
           "shape" : "Id",
@@ -3660,7 +4325,12 @@
         "ApiKeySelectionExpression" : {
           "shape" : "SelectionExpression",
           "locationName" : "apiKeySelectionExpression",
-          "documentation" : "<p>An API key selection expression. See <a href=\"https://docs.aws.amazon.com/apigateway/latest/developerguide/apigateway-websocket-api-selection-expressions.html#apigateway-websocket-api-apikey-selection-expressions\">API Key Selection Expressions</a>.</p>"
+          "documentation" : "<p>An API key selection expression. Supported only for WebSocket APIs. See <a href=\"https://docs.aws.amazon.com/apigateway/latest/developerguide/apigateway-websocket-api-selection-expressions.html#apigateway-websocket-api-apikey-selection-expressions\">API Key Selection Expressions</a>.</p>"
+        },
+        "CorsConfiguration" : {
+          "shape" : "Cors",
+          "locationName" : "corsConfiguration",
+          "documentation" : "<p>A CORS configuration. Supported only for HTTP APIs.</p>"
         },
         "CreatedDate" : {
           "shape" : "__timestampIso8601",
@@ -3675,7 +4345,12 @@
         "DisableSchemaValidation" : {
           "shape" : "__boolean",
           "locationName" : "disableSchemaValidation",
-          "documentation" : "<p>Avoid validating models when creating a deployment.</p>"
+          "documentation" : "<p>Avoid validating models when creating a deployment. Supported only for WebSocket APIs.</p>"
+        },
+        "ImportInfo" : {
+          "shape" : "__listOf__string",
+          "locationName" : "importInfo",
+          "documentation" : "<p>The validation information during API import. This may include particular properties of your OpenAPI definition which are ignored during import. Supported only for HTTP APIs.</p>"
         },
         "Name" : {
           "shape" : "StringWithLengthBetween1And128",
@@ -3685,12 +4360,17 @@
         "ProtocolType" : {
           "shape" : "ProtocolType",
           "locationName" : "protocolType",
-          "documentation" : "<p>The API protocol: Currently only WEBSOCKET is supported.</p>"
+          "documentation" : "<p>The API protocol.</p>"
         },
         "RouteSelectionExpression" : {
           "shape" : "SelectionExpression",
           "locationName" : "routeSelectionExpression",
-          "documentation" : "<p>The route selection expression for the API.</p>"
+          "documentation" : "<p>The route selection expression for the API. For HTTP APIs, the routeSelectionExpression must be ${request.method} ${request.path}. If not provided, this will be the default for HTTP APIs. This property is required for WebSocket APIs.</p>"
+        },
+        "Tags" : {
+          "shape" : "Tags",
+          "locationName" : "tags",
+          "documentation" : "<p>A collection of tags associated with the API.</p>"
         },
         "Version" : {
           "shape" : "StringWithLengthBetween1And64",
@@ -3700,12 +4380,7 @@
         "Warnings" : {
           "shape" : "__listOf__string",
           "locationName" : "warnings",
-          "documentation" : "<p>The warning messages reported when failonwarnings is turned on during\n API import.</p>"
-        },
-        "Tags" : {
-          "shape" : "Tags",
-          "locationName" : "tags",
-          "documentation" : "<p>The key-value map of strings. The valid character set is [a-zA-Z+-=._:/]. The tag key can be up to 128 characters and must not start with aws:. The tag value can be up to 256 characters..</p>"
+          "documentation" : "<p>The warning messages reported when failonwarnings is turned on during API import.</p>"
         }
       }
     },
@@ -3722,7 +4397,7 @@
           "shape" : "__string",
           "location" : "querystring",
           "locationName" : "nextToken",
-          "documentation" : "<p>The next page of elements from this collection. Not valid for the last element of\n the collection.</p>"
+          "documentation" : "<p>The next page of elements from this collection. Not valid for the last element of the collection.</p>"
         }
       }
     },
@@ -3737,7 +4412,7 @@
         "NextToken" : {
           "shape" : "NextToken",
           "locationName" : "nextToken",
-          "documentation" : "<p>The next page of elements from this collection. Not valid for the last element of\n the collection.</p>"
+          "documentation" : "<p>The next page of elements from this collection. Not valid for the last element of the collection.</p>"
         }
       }
     },
@@ -3765,7 +4440,7 @@
         "AuthorizerCredentialsArn" : {
           "shape" : "Arn",
           "locationName" : "authorizerCredentialsArn",
-          "documentation" : "<p>Specifies the required credentials as an IAM role for API Gateway to invoke the\n authorizer. To specify an IAM role for API Gateway to assume, use the role's Amazon\n Resource Name (ARN). To use resource-based permissions on the Lambda function,\n specify null.</p>"
+          "documentation" : "<p>Specifies the required credentials as an IAM role for API Gateway to invoke the authorizer. To specify an IAM role for API Gateway to assume, use the role's Amazon Resource Name (ARN). To use resource-based permissions on the Lambda function, specify null. Supported only for REQUEST authorizers.</p>"
         },
         "AuthorizerId" : {
           "shape" : "Id",
@@ -3775,37 +4450,37 @@
         "AuthorizerResultTtlInSeconds" : {
           "shape" : "IntegerWithLengthBetween0And3600",
           "locationName" : "authorizerResultTtlInSeconds",
-          "documentation" : "<p>The time to live (TTL), in seconds, of cached authorizer results. If it equals 0,\n authorization caching is disabled. If it is greater than 0, API Gateway will cache\n authorizer responses. If this field is not set, the default value is 300. The maximum\n value is 3600, or 1 hour.</p>"
+          "documentation" : "<p>Authorizer caching is not currently supported. Don't specify this value for authorizers.</p>"
         },
         "AuthorizerType" : {
           "shape" : "AuthorizerType",
           "locationName" : "authorizerType",
-          "documentation" : "<p>The authorizer type. Currently the only valid value is REQUEST, for a\n Lambda function using incoming request parameters.</p>"
+          "documentation" : "<p>The authorizer type. For WebSocket APIs, specify REQUEST for a Lambda function using incoming request parameters. For HTTP APIs, specify JWT to use JSON Web Tokens.</p>"
         },
         "AuthorizerUri" : {
           "shape" : "UriWithLengthBetween1And2048",
           "locationName" : "authorizerUri",
-          "documentation" : "<p>The authorizer's Uniform Resource Identifier (URI).\n ForREQUEST authorizers, this must be a\n well-formed Lambda function URI, for example,\n arn:aws:apigateway:us-west-2:lambda:path/2015-03-31/functions/arn:aws:lambda:us-west-2:{account_id}:function:{lambda_function_name}/invocations.\n In general, the URI has this form:\n arn:aws:apigateway:{region}:lambda:path/{service_api}\n , where {region} is the same as the region hosting the Lambda\n function, path indicates that the remaining substring in the URI should be treated as\n the path to the resource, including the initial /. For Lambda functions,\n this is usually of the form\n /2015-03-31/functions/[FunctionARN]/invocations.</p>"
+          "documentation" : "<p>The authorizer's Uniform Resource Identifier (URI). ForREQUEST authorizers, this must be a well-formed Lambda function URI, for example, arn:aws:apigateway:us-west-2:lambda:path/2015-03-31/functions/arn:aws:lambda:us-west-2:<replaceable>{account_id}</replaceable>:function:<replaceable>{lambda_function_name}</replaceable>/invocations. In general, the URI has this form: arn:aws:apigateway:<replaceable>{region}</replaceable>:lambda:path/<replaceable>{service_api}</replaceable>\n               , where <replaceable></replaceable>{region} is the same as the region hosting the Lambda function, path indicates that the remaining substring in the URI should be treated as the path to the resource, including the initial /. For Lambda functions, this is usually of the form /2015-03-31/functions/[FunctionARN]/invocations. Supported only for REQUEST authorizers.</p>"
         },
         "IdentitySource" : {
           "shape" : "IdentitySourceList",
           "locationName" : "identitySource",
-          "documentation" : "<p>The identity source for which authorization is requested.</p><p>For the REQUEST authorizer, this is required when authorization\n caching is enabled. The value is a comma-separated string of one or more mapping\n expressions of the specified request parameters. For example, if an Auth\n header and a Name query string parameters are defined as identity\n sources, this value is method.request.header.Auth,\n method.request.querystring.Name. These parameters will be used to\n derive the authorization caching key and to perform runtime validation of the\n REQUEST authorizer by verifying all of the identity-related request\n parameters are present, not null, and non-empty. Only when this is true does the\n authorizer invoke the authorizer Lambda function, otherwise, it returns a 401\n Unauthorized response without calling the Lambda function. The valid value\n is a string of comma-separated mapping expressions of the specified request\n parameters. When the authorization caching is not enabled, this property is\n optional.</p>"
+          "documentation" : "<p>The identity source for which authorization is requested.</p> <p>For a REQUEST authorizer, this is optional. The value is a set of one or more mapping expressions of the specified request parameters. Currently, the identity source can be headers, query string parameters, stage variables, and context parameters. For example, if an Auth header and a Name query string parameter are defined as identity sources, this value is route.request.header.Auth, route.request.querystring.Name. These parameters will be used to perform runtime validation for Lambda-based authorizers by verifying all of the identity-related request parameters are present in the request, not null, and non-empty. Only when this is true does the authorizer invoke the authorizer Lambda function. Otherwise, it returns a 401 Unauthorized response without calling the Lambda function.</p> <p>For JWT, a single entry that specifies where to extract the JSON Web Token (JWT) from inbound requests. Currently only header-based and query parameter-based selections are supported, for example \"$request.header.Authorization\".</p>"
         },
         "IdentityValidationExpression" : {
           "shape" : "StringWithLengthBetween0And1024",
           "locationName" : "identityValidationExpression",
-          "documentation" : "<p>The\n validation expression does not apply to the REQUEST authorizer.</p>"
+          "documentation" : "<p>The validation expression does not apply to the REQUEST authorizer.</p>"
+        },
+        "JwtConfiguration" : {
+          "shape" : "JWTConfiguration",
+          "locationName" : "jwtConfiguration",
+          "documentation" : "<p>Represents the configuration of a JWT authorizer. Required for the JWT authorizer type. Supported only for HTTP APIs.</p>"
         },
         "Name" : {
           "shape" : "StringWithLengthBetween1And128",
           "locationName" : "name",
           "documentation" : "<p>The name of the authorizer.</p>"
-        },
-        "ProviderArns" : {
-          "shape" : "ProviderArnList",
-          "locationName" : "providerArns",
-          "documentation" : "<p>For\n REQUEST authorizer, this is not\n defined.</p>"
         }
       }
     },
@@ -3828,7 +4503,7 @@
           "shape" : "__string",
           "location" : "querystring",
           "locationName" : "nextToken",
-          "documentation" : "<p>The next page of elements from this collection. Not valid for the last element of\n the collection.</p>"
+          "documentation" : "<p>The next page of elements from this collection. Not valid for the last element of the collection.</p>"
         }
       },
       "required" : [ "ApiId" ]
@@ -3844,7 +4519,7 @@
         "NextToken" : {
           "shape" : "NextToken",
           "locationName" : "nextToken",
-          "documentation" : "<p>The next page of elements from this collection. Not valid for the last element of\n the collection.</p>"
+          "documentation" : "<p>The next page of elements from this collection. Not valid for the last element of the collection.</p>"
         }
       }
     },
@@ -3869,6 +4544,11 @@
     "GetDeploymentResponse" : {
       "type" : "structure",
       "members" : {
+        "AutoDeployed" : {
+          "shape" : "__boolean",
+          "locationName" : "autoDeployed",
+          "documentation" : "<p>Specifies whether a deployment was automatically released.</p>"
+        },
         "CreatedDate" : {
           "shape" : "__timestampIso8601",
           "locationName" : "createdDate",
@@ -3882,7 +4562,7 @@
         "DeploymentStatus" : {
           "shape" : "DeploymentStatus",
           "locationName" : "deploymentStatus",
-          "documentation" : "<p>The status of the deployment: PENDING, FAILED, or\n SUCCEEDED.</p>"
+          "documentation" : "<p>The status of the deployment: PENDING, FAILED, or SUCCEEDED.</p>"
         },
         "DeploymentStatusMessage" : {
           "shape" : "__string",
@@ -3915,7 +4595,7 @@
           "shape" : "__string",
           "location" : "querystring",
           "locationName" : "nextToken",
-          "documentation" : "<p>The next page of elements from this collection. Not valid for the last element of\n the collection.</p>"
+          "documentation" : "<p>The next page of elements from this collection. Not valid for the last element of the collection.</p>"
         }
       },
       "required" : [ "ApiId" ]
@@ -3931,7 +4611,7 @@
         "NextToken" : {
           "shape" : "NextToken",
           "locationName" : "nextToken",
-          "documentation" : "<p>The next page of elements from this collection. Not valid for the last element of\n the collection.</p>"
+          "documentation" : "<p>The next page of elements from this collection. Not valid for the last element of the collection.</p>"
         }
       }
     },
@@ -3968,7 +4648,7 @@
         "Tags" : {
           "shape" : "Tags",
           "locationName" : "tags",
-          "documentation" : "<p>The key-value map of strings. The valid character set is [a-zA-Z+-=._:/]. The tag key can be up to 128 characters and must not start with aws:. The tag value can be up to 256 characters..</p>"
+          "documentation" : "<p>The collection of tags associated with a domain name.</p>"
         }
       }
     },
@@ -3985,7 +4665,7 @@
           "shape" : "__string",
           "location" : "querystring",
           "locationName" : "nextToken",
-          "documentation" : "<p>The next page of elements from this collection. Not valid for the last element of\n the collection.</p>"
+          "documentation" : "<p>The next page of elements from this collection. Not valid for the last element of the collection.</p>"
         }
       }
     },
@@ -4000,7 +4680,7 @@
         "NextToken" : {
           "shape" : "NextToken",
           "locationName" : "nextToken",
-          "documentation" : "<p>The next page of elements from this collection. Not valid for the last element of\n the collection.</p>"
+          "documentation" : "<p>The next page of elements from this collection. Not valid for the last element of the collection.</p>"
         }
       }
     },
@@ -4022,28 +4702,33 @@
       },
       "required" : [ "ApiId", "IntegrationId" ]
     },
-    "GetIntegrationResponse" : {
+    "GetIntegrationResult" : {
       "type" : "structure",
       "members" : {
+        "ApiGatewayManaged" : {
+          "shape" : "__boolean",
+          "locationName" : "apiGatewayManaged",
+          "documentation" : "<p>Specifies whether an integration is managed by API Gateway. If you created an API using using quick create, the resulting integration is managed by API Gateway. You can update a managed integration, but you can't delete it.</p>"
+        },
         "ConnectionId" : {
           "shape" : "StringWithLengthBetween1And1024",
           "locationName" : "connectionId",
-          "documentation" : "<p>The connection ID.</p>"
+          "documentation" : "<p>The ID of the VPC link for a private integration. Supported only for HTTP APIs.</p>"
         },
         "ConnectionType" : {
           "shape" : "ConnectionType",
           "locationName" : "connectionType",
-          "documentation" : "<p>The type of the network connection to the integration endpoint. Currently the only\n valid value is INTERNET, for connections through the public routable\n internet.</p>"
+          "documentation" : "<p>The type of the network connection to the integration endpoint. Specify INTERNET for connections through the public routable internet or VPC_LINK for private connections between API Gateway and resources in a VPC. The default value is INTERNET.</p>"
         },
         "ContentHandlingStrategy" : {
           "shape" : "ContentHandlingStrategy",
           "locationName" : "contentHandlingStrategy",
-          "documentation" : "<p>Specifies how to handle response payload content type conversions. Supported\n values are CONVERT_TO_BINARY and CONVERT_TO_TEXT, with the\n following behaviors:</p><p>\n CONVERT_TO_BINARY: Converts a response payload from a Base64-encoded\n string to the corresponding binary blob.</p><p>\n CONVERT_TO_TEXT: Converts a response payload from a binary blob to a\n Base64-encoded string.</p><p>If this property is not defined, the response payload will be passed through from\n the integration response to the route response or method response without\n modification.</p>"
+          "documentation" : "<p>Supported only for WebSocket APIs. Specifies how to handle response payload content type conversions. Supported values are CONVERT_TO_BINARY and CONVERT_TO_TEXT, with the following behaviors:</p> <p>CONVERT_TO_BINARY: Converts a response payload from a Base64-encoded string to the corresponding binary blob.</p> <p>CONVERT_TO_TEXT: Converts a response payload from a binary blob to a Base64-encoded string.</p> <p>If this property is not defined, the response payload will be passed through from the integration response to the route response or method response without modification.</p>"
         },
         "CredentialsArn" : {
           "shape" : "Arn",
           "locationName" : "credentialsArn",
-          "documentation" : "<p>Specifies the credentials required for the integration, if any. For AWS\n integrations, three options are available. To specify an IAM Role for API Gateway to\n assume, use the role's Amazon Resource Name (ARN). To require that the caller's\n identity be passed through from the request, specify the string\n arn:aws:iam::*:user/*. To use resource-based permissions on supported\n AWS services, specify null.</p>"
+          "documentation" : "<p>Specifies the credentials required for the integration, if any. For AWS integrations, three options are available. To specify an IAM Role for API Gateway to assume, use the role's Amazon Resource Name (ARN). To require that the caller's identity be passed through from the request, specify the string arn:aws:iam::*:user/*. To use resource-based permissions on supported AWS services, specify null.</p>"
         },
         "Description" : {
           "shape" : "StringWithLengthBetween0And1024",
@@ -4063,42 +4748,52 @@
         "IntegrationResponseSelectionExpression" : {
           "shape" : "SelectionExpression",
           "locationName" : "integrationResponseSelectionExpression",
-          "documentation" : "<p>The integration response selection expression for the integration. See <a href=\"https://docs.aws.amazon.com/apigateway/latest/developerguide/apigateway-websocket-api-selection-expressions.html#apigateway-websocket-api-integration-response-selection-expressions\">Integration Response Selection Expressions</a>.</p>"
+          "documentation" : "<p>The integration response selection expression for the integration. Supported only for WebSocket APIs. See <a href=\"https://docs.aws.amazon.com/apigateway/latest/developerguide/apigateway-websocket-api-selection-expressions.html#apigateway-websocket-api-integration-response-selection-expressions\">Integration Response Selection Expressions</a>.</p>"
         },
         "IntegrationType" : {
           "shape" : "IntegrationType",
           "locationName" : "integrationType",
-          "documentation" : "<p>The integration type of an integration. One of the following:</p><p>\n AWS: for integrating the route or method request with an AWS service\n action, including the Lambda function-invoking action. With the Lambda\n function-invoking action, this is referred to as the Lambda custom integration. With\n any other AWS service action, this is known as AWS integration.</p><p>\n AWS_PROXY: for integrating the route or method request with the Lambda\n function-invoking action with the client request passed through as-is. This\n integration is also referred to as Lambda proxy integration.</p><p>\n HTTP: for integrating the route or method request with an HTTP\n endpoint. This\n integration is also referred to as the HTTP custom integration.</p><p>\n HTTP_PROXY: for integrating route or method request with an HTTP\n endpoint, with the client\n request passed through as-is. This is also referred to as HTTP proxy\n integration.</p><p>\n MOCK: for integrating the route or method request with API Gateway as a\n \"loopback\" endpoint without invoking any backend.</p>"
+          "documentation" : "<p>The integration type of an integration. One of the following:</p> <p>AWS: for integrating the route or method request with an AWS service action, including the Lambda function-invoking action. With the Lambda function-invoking action, this is referred to as the Lambda custom integration. With any other AWS service action, this is known as AWS integration. Supported only for WebSocket APIs.</p> <p>AWS_PROXY: for integrating the route or method request with the Lambda function-invoking action with the client request passed through as-is. This integration is also referred to as Lambda proxy integration.</p> <p>HTTP: for integrating the route or method request with an HTTP endpoint. This integration is also referred to as the HTTP custom integration. Supported only for WebSocket APIs.</p> <p>HTTP_PROXY: for integrating the route or method request with an HTTP endpoint, with the client request passed through as-is. This is also referred to as HTTP proxy integration.</p> <p>MOCK: for integrating the route or method request with API Gateway as a \"loopback\" endpoint without invoking any backend. Supported only for WebSocket APIs.</p>"
         },
         "IntegrationUri" : {
           "shape" : "UriWithLengthBetween1And2048",
           "locationName" : "integrationUri",
-          "documentation" : "<p>For a Lambda proxy integration, this is the URI of the Lambda function.</p>"
+          "documentation" : "<p>For a Lambda integration, specify the URI of a Lambda function.</p> <p>For an HTTP integration, specify a fully-qualified URL.</p> <p>For an HTTP API private integration, specify the ARN of an Application Load Balancer listener, Network Load Balancer listener, or AWS Cloud Map service. If you specify the ARN of an AWS Cloud Map service, API Gateway uses DiscoverInstances to identify resources. You can use query parameters to target specific resources. To learn more, see <a href=\"https://alpha-docs-aws.amazon.com/cloud-map/latest/api/API_DiscoverInstances.html\">DiscoverInstances</a>. For private integrations, all resources must be owned by the same AWS account.</p>"
         },
         "PassthroughBehavior" : {
           "shape" : "PassthroughBehavior",
           "locationName" : "passthroughBehavior",
-          "documentation" : "<p>Specifies the pass-through behavior for incoming requests based on the\n Content-Type header in the request, and the available mapping\n templates specified as the requestTemplates property on the\n Integration resource. There are three valid values:\n WHEN_NO_MATCH, WHEN_NO_TEMPLATES, and\n NEVER.</p><p>\n WHEN_NO_MATCH passes the request body for unmapped content types through\n to the integration backend without transformation.</p><p>\n NEVER rejects unmapped content types with an HTTP 415 Unsupported\n Media Type response.</p><p>\n WHEN_NO_TEMPLATES allows pass-through when the integration has no\n content types mapped to templates. However, if there is at least one content type\n defined, unmapped content types will be rejected with the same HTTP 415\n Unsupported Media Type response.</p>"
+          "documentation" : "<p>Specifies the pass-through behavior for incoming requests based on the Content-Type header in the request, and the available mapping templates specified as the requestTemplates property on the Integration resource. There are three valid values: WHEN_NO_MATCH, WHEN_NO_TEMPLATES, and NEVER. Supported only for WebSocket APIs.</p> <p>WHEN_NO_MATCH passes the request body for unmapped content types through to the integration backend without transformation.</p> <p>NEVER rejects unmapped content types with an HTTP 415 Unsupported Media Type response.</p> <p>WHEN_NO_TEMPLATES allows pass-through when the integration has no content types mapped to templates. However, if there is at least one content type defined, unmapped content types will be rejected with the same HTTP 415 Unsupported Media Type response.</p>"
+        },
+        "PayloadFormatVersion" : {
+          "shape" : "StringWithLengthBetween1And64",
+          "locationName" : "payloadFormatVersion",
+          "documentation" : "<p>Specifies the format of the payload sent to an integration. Required for HTTP APIs.</p>"
         },
         "RequestParameters" : {
           "shape" : "IntegrationParameters",
           "locationName" : "requestParameters",
-          "documentation" : "<p>A key-value map specifying request parameters that are passed from the method\n request to the backend. The key is an integration request parameter name and the\n associated value is a method request parameter value or static value that must be\n enclosed within single quotes and pre-encoded as required by the backend. The method\n request parameter value must match the pattern of\n method.request.{location}.{name}\n , where \n {location}\n  is querystring, path, or header; and \n {name}\n  must be a valid and unique method request parameter name.</p>"
+          "documentation" : "<p>A key-value map specifying request parameters that are passed from the method request to the backend. The key is an integration request parameter name and the associated value is a method request parameter value or static value that must be enclosed within single quotes and pre-encoded as required by the backend. The method request parameter value must match the pattern of method.request.<replaceable>{location}</replaceable>.<replaceable>{name}</replaceable>\n               , where \n                  <replaceable>{location}</replaceable>\n                is querystring, path, or header; and \n                  <replaceable>{name}</replaceable>\n                must be a valid and unique method request parameter name. Supported only for WebSocket APIs.</p>"
         },
         "RequestTemplates" : {
           "shape" : "TemplateMap",
           "locationName" : "requestTemplates",
-          "documentation" : "<p>Represents a map of Velocity templates that are applied on the request payload\n based on the value of the Content-Type header sent by the client. The content type\n value is the key in this map, and the template (as a String) is the value.</p>"
+          "documentation" : "<p>Represents a map of Velocity templates that are applied on the request payload based on the value of the Content-Type header sent by the client. The content type value is the key in this map, and the template (as a String) is the value. Supported only for WebSocket APIs.</p>"
         },
         "TemplateSelectionExpression" : {
           "shape" : "SelectionExpression",
           "locationName" : "templateSelectionExpression",
-          "documentation" : "<p>The template selection expression for the integration.</p>"
+          "documentation" : "<p>The template selection expression for the integration. Supported only for WebSocket APIs.</p>"
         },
         "TimeoutInMillis" : {
-          "shape" : "IntegerWithLengthBetween50And29000",
+          "shape" : "IntegerWithLengthBetween50And30000",
           "locationName" : "timeoutInMillis",
-          "documentation" : "<p>Custom timeout between 50 and 29,000 milliseconds. The default value is 29,000\n milliseconds or 29 seconds.</p>"
+          "documentation" : "<p>Custom timeout between 50 and 29,000 milliseconds for WebSocket APIs and between 50 and 30,000 milliseconds for HTTP APIs. The default timeout is 29 seconds for WebSocket APIs and 30 seconds for HTTP APIs.</p>"
+        },
+        "TlsConfig" : {
+          "shape" : "TlsConfig",
+          "locationName" : "tlsConfig",
+          "documentation" : "<p>The TLS configuration for a private integration. If you specify a TLS configuration, private integration traffic uses the HTTPS protocol. Supported only for HTTP APIs.</p>"
         }
       }
     },
@@ -4121,7 +4816,7 @@
           "shape" : "__string",
           "location" : "uri",
           "locationName" : "integrationResponseId",
-          "documentation" : "The integration response ID."
+          "documentation" : "<p>The integration response ID.</p>"
         }
       },
       "required" : [ "ApiId", "IntegrationResponseId", "IntegrationId" ]
@@ -4132,7 +4827,7 @@
         "ContentHandlingStrategy" : {
           "shape" : "ContentHandlingStrategy",
           "locationName" : "contentHandlingStrategy",
-          "documentation" : "<p>Specifies how to handle response payload content type conversions. Supported\n values are CONVERT_TO_BINARY and CONVERT_TO_TEXT, with the\n following behaviors:</p><p>\n CONVERT_TO_BINARY: Converts a response payload from a Base64-encoded\n string to the corresponding binary blob.</p><p>\n CONVERT_TO_TEXT: Converts a response payload from a binary blob to a\n Base64-encoded string.</p><p>If this property is not defined, the response payload will be passed through from\n the integration response to the route response or method response without\n modification.</p>"
+          "documentation" : "<p>Supported only for WebSocket APIs. Specifies how to handle response payload content type conversions. Supported values are CONVERT_TO_BINARY and CONVERT_TO_TEXT, with the following behaviors:</p> <p>CONVERT_TO_BINARY: Converts a response payload from a Base64-encoded string to the corresponding binary blob.</p> <p>CONVERT_TO_TEXT: Converts a response payload from a binary blob to a Base64-encoded string.</p> <p>If this property is not defined, the response payload will be passed through from the integration response to the route response or method response without modification.</p>"
         },
         "IntegrationResponseId" : {
           "shape" : "Id",
@@ -4147,12 +4842,12 @@
         "ResponseParameters" : {
           "shape" : "IntegrationParameters",
           "locationName" : "responseParameters",
-          "documentation" : "<p>A key-value map specifying response parameters that are passed to the method\n response from the backend. The key is a method response header parameter name and the\n mapped value is an integration response header value, a static value enclosed within\n a pair of single quotes, or a JSON expression from the integration response body. The\n mapping key must match the pattern of method.response.header.{name}, where name is a\n valid and unique header name. The mapped non-static value must match the pattern of\n integration.response.header.{name} or integration.response.body.{JSON-expression},\n where name is a valid and unique response header name and JSON-expression is a valid\n JSON expression without the $ prefix.</p>"
+          "documentation" : "<p>A key-value map specifying response parameters that are passed to the method response from the backend. The key is a method response header parameter name and the mapped value is an integration response header value, a static value enclosed within a pair of single quotes, or a JSON expression from the integration response body. The mapping key must match the pattern of method.response.header.{name}, where name is a valid and unique header name. The mapped non-static value must match the pattern of integration.response.header.{name} or integration.response.body.{JSON-expression}, where name is a valid and unique response header name and JSON-expression is a valid JSON expression without the $ prefix.</p>"
         },
         "ResponseTemplates" : {
           "shape" : "TemplateMap",
           "locationName" : "responseTemplates",
-          "documentation" : "<p>The collection of response templates for the integration response as a\n string-to-string map of key-value pairs. Response templates are represented as a\n key/value map, with a content-type as the key and a template as the value.</p>"
+          "documentation" : "<p>The collection of response templates for the integration response as a string-to-string map of key-value pairs. Response templates are represented as a key/value map, with a content-type as the key and a template as the value.</p>"
         },
         "TemplateSelectionExpression" : {
           "shape" : "SelectionExpression",
@@ -4186,7 +4881,7 @@
           "shape" : "__string",
           "location" : "querystring",
           "locationName" : "nextToken",
-          "documentation" : "<p>The next page of elements from this collection. Not valid for the last element of\n the collection.</p>"
+          "documentation" : "<p>The next page of elements from this collection. Not valid for the last element of the collection.</p>"
         }
       },
       "required" : [ "IntegrationId", "ApiId" ]
@@ -4202,7 +4897,7 @@
         "NextToken" : {
           "shape" : "NextToken",
           "locationName" : "nextToken",
-          "documentation" : "<p>The next page of elements from this collection. Not valid for the last element of\n the collection.</p>"
+          "documentation" : "<p>The next page of elements from this collection. Not valid for the last element of the collection.</p>"
         }
       }
     },
@@ -4225,7 +4920,7 @@
           "shape" : "__string",
           "location" : "querystring",
           "locationName" : "nextToken",
-          "documentation" : "<p>The next page of elements from this collection. Not valid for the last element of\n the collection.</p>"
+          "documentation" : "<p>The next page of elements from this collection. Not valid for the last element of the collection.</p>"
         }
       },
       "required" : [ "ApiId" ]
@@ -4241,7 +4936,7 @@
         "NextToken" : {
           "shape" : "NextToken",
           "locationName" : "nextToken",
-          "documentation" : "<p>The next page of elements from this collection. Not valid for the last element of\n the collection.</p>"
+          "documentation" : "<p>The next page of elements from this collection. Not valid for the last element of the collection.</p>"
         }
       }
     },
@@ -4289,7 +4984,7 @@
         "Schema" : {
           "shape" : "StringWithLengthBetween0And32K",
           "locationName" : "schema",
-          "documentation" : "<p>The schema for the model. For application/json models, this should be JSON schema\n draft 4 model.</p>"
+          "documentation" : "<p>The schema for the model. For application/json models, this should be JSON schema draft 4 model.</p>"
         }
       }
     },
@@ -4340,7 +5035,7 @@
           "shape" : "__string",
           "location" : "querystring",
           "locationName" : "nextToken",
-          "documentation" : "<p>The next page of elements from this collection. Not valid for the last element of\n the collection.</p>"
+          "documentation" : "<p>The next page of elements from this collection. Not valid for the last element of the collection.</p>"
         }
       },
       "required" : [ "ApiId" ]
@@ -4356,7 +5051,7 @@
         "NextToken" : {
           "shape" : "NextToken",
           "locationName" : "nextToken",
-          "documentation" : "<p>The next page of elements from this collection. Not valid for the last element of\n the collection.</p>"
+          "documentation" : "<p>The next page of elements from this collection. Not valid for the last element of the collection.</p>"
         }
       }
     },
@@ -4378,33 +5073,38 @@
       },
       "required" : [ "ApiId", "RouteId" ]
     },
-    "GetRouteResponse" : {
+    "GetRouteResult" : {
       "type" : "structure",
       "members" : {
-        "ApiKeyRequired" : {
+        "ApiGatewayManaged" : {
+          "shape" : "__boolean",
+          "locationName" : "apiGatewayManaged",
+          "documentation" : "<p>Specifies whether a route is managed by API Gateway. If you created an API using quick create, the $default route is managed by API Gateway. You can't modify the $default route key.</p>"
+        },
+        "ApiKeyRequired" : {
           "shape" : "__boolean",
           "locationName" : "apiKeyRequired",
-          "documentation" : "<p>Specifies whether an API key is required for this route.</p>"
+          "documentation" : "<p>Specifies whether an API key is required for this route. Supported only for WebSocket APIs.</p>"
         },
         "AuthorizationScopes" : {
           "shape" : "AuthorizationScopes",
           "locationName" : "authorizationScopes",
-          "documentation" : "<p>A list of authorization scopes configured on a route. The scopes are used with a\n COGNITO_USER_POOLS authorizer to authorize the method invocation. The authorization\n works by matching the route scopes against the scopes parsed from the access token in\n the incoming request. The method invocation is authorized if any route scope matches\n a claimed scope in the access token. Otherwise, the invocation is not authorized.\n When the route scope is configured, the client must provide an access token instead\n of an identity token for authorization purposes.</p>"
+          "documentation" : "<p>A list of authorization scopes configured on a route. The scopes are used with a JWT authorizer to authorize the method invocation. The authorization works by matching the route scopes against the scopes parsed from the access token in the incoming request. The method invocation is authorized if any route scope matches a claimed scope in the access token. Otherwise, the invocation is not authorized. When the route scope is configured, the client must provide an access token instead of an identity token for authorization purposes.</p>"
         },
         "AuthorizationType" : {
           "shape" : "AuthorizationType",
           "locationName" : "authorizationType",
-          "documentation" : "<p>The authorization type for the route. Valid values are NONE for open\n access, AWS_IAM for using AWS IAM permissions, and CUSTOM\n for using a Lambda\n authorizer</p>"
+          "documentation" : "<p>The authorization type for the route. For WebSocket APIs, valid values are NONE for open access, AWS_IAM for using AWS IAM permissions, and CUSTOM for using a Lambda authorizer For HTTP APIs, valid values are NONE for open access, or JWT for using JSON Web Tokens.</p>"
         },
         "AuthorizerId" : {
           "shape" : "Id",
           "locationName" : "authorizerId",
-          "documentation" : "<p>The identifier of the Authorizer resource to be associated with this\n route, if the authorizationType is CUSTOM\n . The authorizer identifier is generated by API Gateway\n when you created the authorizer.</p>"
+          "documentation" : "<p>The identifier of the Authorizer resource to be associated with this route. The authorizer identifier is generated by API Gateway when you created the authorizer.</p>"
         },
         "ModelSelectionExpression" : {
           "shape" : "SelectionExpression",
           "locationName" : "modelSelectionExpression",
-          "documentation" : "<p>The model selection expression for the route.</p>"
+          "documentation" : "<p>The model selection expression for the route. Supported only for WebSocket APIs.</p>"
         },
         "OperationName" : {
           "shape" : "StringWithLengthBetween1And64",
@@ -4414,12 +5114,12 @@
         "RequestModels" : {
           "shape" : "RouteModels",
           "locationName" : "requestModels",
-          "documentation" : "<p>The request models for the route.</p>"
+          "documentation" : "<p>The request models for the route. Supported only for WebSocket APIs.</p>"
         },
         "RequestParameters" : {
           "shape" : "RouteParameters",
           "locationName" : "requestParameters",
-          "documentation" : "<p>The request parameters for the route.</p>"
+          "documentation" : "<p>The request parameters for the route. Supported only for WebSocket APIs.</p>"
         },
         "RouteId" : {
           "shape" : "Id",
@@ -4434,7 +5134,7 @@
         "RouteResponseSelectionExpression" : {
           "shape" : "SelectionExpression",
           "locationName" : "routeResponseSelectionExpression",
-          "documentation" : "<p>The route response selection expression for the route.</p>"
+          "documentation" : "<p>The route response selection expression for the route. Supported only for WebSocket APIs.</p>"
         },
         "Target" : {
           "shape" : "StringWithLengthBetween1And128",
@@ -4473,7 +5173,7 @@
         "ModelSelectionExpression" : {
           "shape" : "SelectionExpression",
           "locationName" : "modelSelectionExpression",
-          "documentation" : "<p>Represents the model selection expression of a route response.</p>"
+          "documentation" : "<p>Represents the model selection expression of a route response. Supported only for WebSocket APIs.</p>"
         },
         "ResponseModels" : {
           "shape" : "RouteModels",
@@ -4516,7 +5216,7 @@
           "shape" : "__string",
           "location" : "querystring",
           "locationName" : "nextToken",
-          "documentation" : "<p>The next page of elements from this collection. Not valid for the last element of\n the collection.</p>"
+          "documentation" : "<p>The next page of elements from this collection. Not valid for the last element of the collection.</p>"
         },
         "RouteId" : {
           "shape" : "__string",
@@ -4538,7 +5238,7 @@
         "NextToken" : {
           "shape" : "NextToken",
           "locationName" : "nextToken",
-          "documentation" : "<p>The next page of elements from this collection. Not valid for the last element of\n the collection.</p>"
+          "documentation" : "<p>The next page of elements from this collection. Not valid for the last element of the collection.</p>"
         }
       }
     },
@@ -4561,7 +5261,7 @@
           "shape" : "__string",
           "location" : "querystring",
           "locationName" : "nextToken",
-          "documentation" : "<p>The next page of elements from this collection. Not valid for the last element of\n the collection.</p>"
+          "documentation" : "<p>The next page of elements from this collection. Not valid for the last element of the collection.</p>"
         }
       },
       "required" : [ "ApiId" ]
@@ -4577,7 +5277,7 @@
         "NextToken" : {
           "shape" : "NextToken",
           "locationName" : "nextToken",
-          "documentation" : "<p>The next page of elements from this collection. Not valid for the last element of\n the collection.</p>"
+          "documentation" : "<p>The next page of elements from this collection. Not valid for the last element of the collection.</p>"
         }
       }
     },
@@ -4594,7 +5294,7 @@
           "shape" : "__string",
           "location" : "uri",
           "locationName" : "stageName",
-          "documentation" : "<p>The stage name.</p>"
+          "documentation" : "<p>The stage name. Stage names can only contain alphanumeric characters, hyphens, and underscores. Maximum length is 128 characters.</p>"
         }
       },
       "required" : [ "StageName", "ApiId" ]
@@ -4607,10 +5307,20 @@
           "locationName" : "accessLogSettings",
           "documentation" : "<p>Settings for logging access in this stage.</p>"
         },
+        "ApiGatewayManaged" : {
+          "shape" : "__boolean",
+          "locationName" : "apiGatewayManaged",
+          "documentation" : "<p>Specifies whether a stage is managed by API Gateway. If you created an API using quick create, the $default stage is managed by API Gateway. You can't modify the $default stage.</p>"
+        },
+        "AutoDeploy" : {
+          "shape" : "__boolean",
+          "locationName" : "autoDeploy",
+          "documentation" : "<p>Specifies whether updates to an API automatically trigger a new deployment. The default value is false.</p>"
+        },
         "ClientCertificateId" : {
           "shape" : "Id",
           "locationName" : "clientCertificateId",
-          "documentation" : "<p>The identifier of a client certificate for a Stage.</p>"
+          "documentation" : "<p>The identifier of a client certificate for a Stage. Supported only for WebSocket APIs.</p>"
         },
         "CreatedDate" : {
           "shape" : "__timestampIso8601",
@@ -4625,13 +5335,18 @@
         "DeploymentId" : {
           "shape" : "Id",
           "locationName" : "deploymentId",
-          "documentation" : "<p>The identifier of the Deployment that the Stage is\n associated with.</p>"
+          "documentation" : "<p>The identifier of the Deployment that the Stage is associated with. Can't be updated if autoDeploy is enabled.</p>"
         },
         "Description" : {
           "shape" : "StringWithLengthBetween0And1024",
           "locationName" : "description",
           "documentation" : "<p>The description of the stage.</p>"
         },
+        "LastDeploymentStatusMessage" : {
+          "shape" : "__string",
+          "locationName" : "lastDeploymentStatusMessage",
+          "documentation" : "<p>Describes the status of the last deployment of a stage. Supported only for stages with autoDeploy enabled.</p>"
+        },
         "LastUpdatedDate" : {
           "shape" : "__timestampIso8601",
           "locationName" : "lastUpdatedDate",
@@ -4640,7 +5355,7 @@
         "RouteSettings" : {
           "shape" : "RouteSettingsMap",
           "locationName" : "routeSettings",
-          "documentation" : "<p>Route settings for the stage.</p>"
+          "documentation" : "<p>Route settings for the stage, by routeKey.</p>"
         },
         "StageName" : {
           "shape" : "StringWithLengthBetween1And128",
@@ -4650,12 +5365,12 @@
         "StageVariables" : {
           "shape" : "StageVariablesMap",
           "locationName" : "stageVariables",
-          "documentation" : "<p>A map that defines the stage variables for a stage resource. Variable names can\n have alphanumeric and underscore characters, and the values must match\n [A-Za-z0-9-._~:/?#&=,]+.</p>"
+          "documentation" : "<p>A map that defines the stage variables for a stage resource. Variable names can have alphanumeric and underscore characters, and the values must match [A-Za-z0-9-._~:/?#&amp;=,]+.</p>"
         },
         "Tags" : {
           "shape" : "Tags",
           "locationName" : "tags",
-          "documentation" : "<p>The key-value map of strings. The valid character set is [a-zA-Z+-=._:/]. The tag key can be up to 128 characters and must not start with aws:. The tag value can be up to 256 characters..</p>"
+          "documentation" : "<p>The collection of tags. Each tag element is associated with a given resource.</p>"
         }
       }
     },
@@ -4678,7 +5393,7 @@
           "shape" : "__string",
           "location" : "querystring",
           "locationName" : "nextToken",
-          "documentation" : "<p>The next page of elements from this collection. Not valid for the last element of\n the collection.</p>"
+          "documentation" : "<p>The next page of elements from this collection. Not valid for the last element of the collection.</p>"
         }
       },
       "required" : [ "ApiId" ]
@@ -4694,7 +5409,122 @@
         "NextToken" : {
           "shape" : "NextToken",
           "locationName" : "nextToken",
-          "documentation" : "<p>The next page of elements from this collection. Not valid for the last element of\n the collection.</p>"
+          "documentation" : "<p>The next page of elements from this collection. Not valid for the last element of the collection.</p>"
+        }
+      }
+    },
+    "GetTagsRequest" : {
+      "type" : "structure",
+      "members" : {
+        "ResourceArn" : {
+          "shape" : "__string",
+          "location" : "uri",
+          "locationName" : "resource-arn",
+          "documentation" : "<p>The resource ARN for the tag.</p>"
+        }
+      },
+      "required" : [ "ResourceArn" ]
+    },
+    "GetTagsResponse" : {
+      "type" : "structure",
+      "members" : {
+        "Tags" : {
+          "shape" : "Tags",
+          "locationName": "tags"
+        }
+      }
+    },
+    "GetVpcLinkRequest" : {
+      "type" : "structure",
+      "members" : {
+        "VpcLinkId" : {
+          "shape" : "__string",
+          "location" : "uri",
+          "locationName" : "vpcLinkId",
+          "documentation" : "<p>The ID of the VPC link.</p>"
+        }
+      },
+      "required" : [ "VpcLinkId" ]
+    },
+    "GetVpcLinkResponse" : {
+      "type" : "structure",
+      "members" : {
+        "CreatedDate" : {
+          "shape" : "__timestampIso8601",
+          "locationName" : "createdDate",
+          "documentation" : "<p>The timestamp when the VPC link was created.</p>"
+        },
+        "Name" : {
+          "shape" : "StringWithLengthBetween1And128",
+          "locationName" : "name",
+          "documentation" : "<p>The name of the VPC link.</p>"
+        },
+        "SecurityGroupIds" : {
+          "shape" : "SecurityGroupIdList",
+          "locationName" : "securityGroupIds",
+          "documentation" : "<p>A list of security group IDs for the VPC link.</p>"
+        },
+        "SubnetIds" : {
+          "shape" : "SubnetIdList",
+          "locationName" : "subnetIds",
+          "documentation" : "<p>A list of subnet IDs to include in the VPC link.</p>"
+        },
+        "Tags" : {
+          "shape" : "Tags",
+          "locationName" : "tags",
+          "documentation" : "<p>Tags for the VPC link.</p>"
+        },
+        "VpcLinkId" : {
+          "shape" : "Id",
+          "locationName" : "vpcLinkId",
+          "documentation" : "<p>The ID of the VPC link.</p>"
+        },
+        "VpcLinkStatus" : {
+          "shape" : "VpcLinkStatus",
+          "locationName" : "vpcLinkStatus",
+          "documentation" : "<p>The status of the VPC link.</p>"
+        },
+        "VpcLinkStatusMessage" : {
+          "shape" : "StringWithLengthBetween0And1024",
+          "locationName" : "vpcLinkStatusMessage",
+          "documentation" : "<p>A message summarizing the cause of the status of the VPC link.</p>"
+        },
+        "VpcLinkVersion" : {
+          "shape" : "VpcLinkVersion",
+          "locationName" : "vpcLinkVersion",
+          "documentation" : "<p>The version of the VPC link.</p>"
+        }
+      }
+    },
+    "GetVpcLinksRequest" : {
+      "type" : "structure",
+      "members" : {
+        "MaxResults" : {
+          "shape" : "__string",
+          "location" : "querystring",
+          "locationName" : "maxResults",
+          "documentation" : "<p>The maximum number of elements to be returned for this resource.</p>"
+        },
+        "NextToken" : {
+          "shape" : "__string",
+          "location" : "querystring",
+          "locationName" : "nextToken",
+          "documentation" : "<p>The next page of elements from this collection. Not valid for the last element of the collection.</p>"
+        }
+      }
+    },
+    "GetVpcLinksResponse" : {
+      "type" : "structure",
+      "members" : {
+        "Items" : {
+          "shape" : "__listOfVpcLink",
+          "locationName" : "items",
+          "documentation" : "<p>A collection of VPC links.</p>"
+        },
+        "NextToken" : {
+          "shape" : "NextToken",
+          "locationName" : "nextToken",
+          "documentation" : "<p>The next page of elements from this collection. Not valid for the last element of the collection.</p>"
         }
       }
     },
@@ -4704,45 +5534,167 @@
     },
     "IdentitySourceList" : {
       "type" : "list",
-      "documentation" : "<p>The identity source for which authorization is requested. For the REQUEST\n authorizer, this is required when authorization caching is enabled. The value is a\n comma-separated string of one or more mapping expressions of the specified request\n parameters. For example, if an Auth header, a Name query string parameter are defined\n as identity sources, this value is $method.request.header.Auth,\n $method.request.querystring.Name. These parameters will be used to derive\n the authorization caching key and to perform runtime validation of the REQUEST\n authorizer by verifying all of the identity-related request parameters are present,\n not null and non-empty. Only when this is true does the authorizer invoke the\n authorizer Lambda function, otherwise, it returns a 401 Unauthorized\n response without calling the Lambda function. The valid value is a string of\n comma-separated mapping expressions of the specified request parameters. When the\n authorization caching is not enabled, this property is optional.</p>",
+      "documentation" : "<p>The identity source for which authorization is requested. For the REQUEST authorizer, this is required when authorization caching is enabled. The value is a comma-separated string of one or more mapping expressions of the specified request parameters. For example, if an Auth header, a Name query string parameter are defined as identity sources, this value is $method.request.header.Auth, $method.request.querystring.Name. These parameters will be used to derive the authorization caching key and to perform runtime validation of the REQUEST authorizer by verifying all of the identity-related request parameters are present, not null and non-empty. Only when this is true does the authorizer invoke the authorizer Lambda function, otherwise, it returns a 401 Unauthorized response without calling the Lambda function. The valid value is a string of comma-separated mapping expressions of the specified request parameters. When the authorization caching is not enabled, this property is optional.</p>",
       "member" : {
         "shape" : "__string"
       }
     },
+    "ImportApiInput" : {
+      "type" : "structure",
+      "members" : {
+        "Body" : {
+          "shape" : "__string",
+          "locationName" : "body",
+          "documentation" : "<p>The OpenAPI definition. Supported only for HTTP APIs.</p>"
+        }
+      },
+      "documentation" : "<p>Represents the input to ImportAPI. Supported only for HTTP APIs.</p>",
+      "required" : [ "Body" ]
+    },
+    "ImportApiRequest" : {
+      "type" : "structure",
+      "members" : {
+        "Basepath" : {
+          "shape" : "__string",
+          "location" : "querystring",
+          "locationName" : "basepath",
+          "documentation" : "<p>Specifies how to interpret the base path of the API during import. Valid values are ignore, prepend, and split. The default value is ignore. To learn more, see <a href=\"https://alpha-docs-aws.amazon.com/apigateway/latest/developerguide/api-gateway-import-api-basePath.html\">Set the OpenAPI basePath Property</a>. Supported only for HTTP APIs.</p>"
+        },
+        "Body" : {
+          "shape" : "__string",
+          "locationName" : "body",
+          "documentation" : "<p>The OpenAPI definition. Supported only for HTTP APIs.</p>"
+        },
+        "FailOnWarnings" : {
+          "shape" : "__boolean",
+          "location" : "querystring",
+          "locationName" : "failOnWarnings",
+          "documentation" : "<p>Specifies whether to rollback the API creation (true) or not (false) when a warning is encountered. The default value is false.</p>"
+        }
+      },
+      "documentation" : "<p></p>",
+      "required" : [ "Body" ]
+    },
+    "ImportApiResponse" : {
+      "type" : "structure",
+      "members" : {
+        "ApiEndpoint" : {
+          "shape" : "__string",
+          "locationName" : "apiEndpoint",
+          "documentation" : "<p>The URI of the API, of the form {api-id}.execute-api.{region}.amazonaws.com. The stage name is typically appended to this URI to form a complete path to a deployed API stage.</p>"
+        },
+        "ApiId" : {
+          "shape" : "Id",
+          "locationName" : "apiId",
+          "documentation" : "<p>The API ID.</p>"
+        },
+        "ApiKeySelectionExpression" : {
+          "shape" : "SelectionExpression",
+          "locationName" : "apiKeySelectionExpression",
+          "documentation" : "<p>An API key selection expression. Supported only for WebSocket APIs. See <a href=\"https://docs.aws.amazon.com/apigateway/latest/developerguide/apigateway-websocket-api-selection-expressions.html#apigateway-websocket-api-apikey-selection-expressions\">API Key Selection Expressions</a>.</p>"
+        },
+        "CorsConfiguration" : {
+          "shape" : "Cors",
+          "locationName" : "corsConfiguration",
+          "documentation" : "<p>A CORS configuration. Supported only for HTTP APIs.</p>"
+        },
+        "CreatedDate" : {
+          "shape" : "__timestampIso8601",
+          "locationName" : "createdDate",
+          "documentation" : "<p>The timestamp when the API was created.</p>"
+        },
+        "Description" : {
+          "shape" : "StringWithLengthBetween0And1024",
+          "locationName" : "description",
+          "documentation" : "<p>The description of the API.</p>"
+        },
+        "DisableSchemaValidation" : {
+          "shape" : "__boolean",
+          "locationName" : "disableSchemaValidation",
+          "documentation" : "<p>Avoid validating models when creating a deployment. Supported only for WebSocket APIs.</p>"
+        },
+        "ImportInfo" : {
+          "shape" : "__listOf__string",
+          "locationName" : "importInfo",
+          "documentation" : "<p>The validation information during API import. This may include particular properties of your OpenAPI definition which are ignored during import. Supported only for HTTP APIs.</p>"
+        },
+        "Name" : {
+          "shape" : "StringWithLengthBetween1And128",
+          "locationName" : "name",
+          "documentation" : "<p>The name of the API.</p>"
+        },
+        "ProtocolType" : {
+          "shape" : "ProtocolType",
+          "locationName" : "protocolType",
+          "documentation" : "<p>The API protocol.</p>"
+        },
+        "RouteSelectionExpression" : {
+          "shape" : "SelectionExpression",
+          "locationName" : "routeSelectionExpression",
+          "documentation" : "<p>The route selection expression for the API. For HTTP APIs, the routeSelectionExpression must be ${request.method} ${request.path}. If not provided, this will be the default for HTTP APIs. This property is required for WebSocket APIs.</p>"
+        },
+        "Tags" : {
+          "shape" : "Tags",
+          "locationName" : "tags",
+          "documentation" : "<p>A collection of tags associated with the API.</p>"
+        },
+        "Version" : {
+          "shape" : "StringWithLengthBetween1And64",
+          "locationName" : "version",
+          "documentation" : "<p>A version identifier for the API.</p>"
+        },
+        "Warnings" : {
+          "shape" : "__listOf__string",
+          "locationName" : "warnings",
+          "documentation" : "<p>The warning messages reported when failonwarnings is turned on during API import.</p>"
+        }
+      }
+    },
     "IntegerWithLengthBetween0And3600" : {
       "type" : "integer",
       "documentation" : "<p>An integer with a value between [0-3600].</p>",
-      "min" : -2147483648,
-      "max" : 2147483647
+      "min" : 0,
+      "max" : 3600
+    },
+    "IntegerWithLengthBetween50And30000" : {
+      "type" : "integer",
+      "documentation" : "<p>An integer with a value between [50-30000].</p>",
+      "min" : 50,
+      "max" : 30000
     },
-    "IntegerWithLengthBetween50And29000" : {
+    "IntegerWithLengthBetweenMinus1And86400" : {
       "type" : "integer",
-      "documentation" : "<p>An integer with a value between [50-29000].</p>",
-      "min" : -2147483648,
-      "max" : 2147483647
+      "documentation" : "<p>An integer with a value between -1 and 86400. Supported only for HTTP APIs.</p>",
+      "min" : -1,
+      "max" : 86400
     },
     "Integration" : {
       "type" : "structure",
       "members" : {
+        "ApiGatewayManaged" : {
+          "shape" : "__boolean",
+          "locationName" : "apiGatewayManaged",
+          "documentation" : "<p>Specifies whether an integration is managed by API Gateway. If you created an API using using quick create, the resulting integration is managed by API Gateway. You can update a managed integration, but you can't delete it.</p>"
+        },
         "ConnectionId" : {
           "shape" : "StringWithLengthBetween1And1024",
           "locationName" : "connectionId",
-          "documentation" : "<p>The connection ID.</p>"
+          "documentation" : "<p>The ID of the VPC link for a private integration. Supported only for HTTP APIs.</p>"
         },
         "ConnectionType" : {
           "shape" : "ConnectionType",
           "locationName" : "connectionType",
-          "documentation" : "<p>The type of the network connection to the integration endpoint. Currently the only\n valid value is INTERNET, for connections through the public routable\n internet.</p>"
+          "documentation" : "<p>The type of the network connection to the integration endpoint. Specify INTERNET for connections through the public routable internet or VPC_LINK for private connections between API Gateway and resources in a VPC. The default value is INTERNET.</p>"
         },
         "ContentHandlingStrategy" : {
           "shape" : "ContentHandlingStrategy",
           "locationName" : "contentHandlingStrategy",
-          "documentation" : "<p>Specifies how to handle response payload content type conversions. Supported\n values are CONVERT_TO_BINARY and CONVERT_TO_TEXT, with the\n following behaviors:</p><p>\n CONVERT_TO_BINARY: Converts a response payload from a Base64-encoded\n string to the corresponding binary blob.</p><p>\n CONVERT_TO_TEXT: Converts a response payload from a binary blob to a\n Base64-encoded string.</p><p>If this property is not defined, the response payload will be passed through from\n the integration response to the route response or method response without\n modification.</p>"
+          "documentation" : "<p>Supported only for WebSocket APIs. Specifies how to handle response payload content type conversions. Supported values are CONVERT_TO_BINARY and CONVERT_TO_TEXT, with the following behaviors:</p> <p>CONVERT_TO_BINARY: Converts a response payload from a Base64-encoded string to the corresponding binary blob.</p> <p>CONVERT_TO_TEXT: Converts a response payload from a binary blob to a Base64-encoded string.</p> <p>If this property is not defined, the response payload will be passed through from the integration response to the route response or method response without modification.</p>"
         },
         "CredentialsArn" : {
           "shape" : "Arn",
           "locationName" : "credentialsArn",
-          "documentation" : "<p>Specifies the credentials required for the integration, if any. For AWS\n integrations, three options are available. To specify an IAM Role for API Gateway to\n assume, use the role's Amazon Resource Name (ARN). To require that the caller's\n identity be passed through from the request, specify the string\n arn:aws:iam::*:user/*. To use resource-based permissions on supported\n AWS services, specify null.</p>"
+          "documentation" : "<p>Specifies the credentials required for the integration, if any. For AWS integrations, three options are available. To specify an IAM Role for API Gateway to assume, use the role's Amazon Resource Name (ARN). To require that the caller's identity be passed through from the request, specify the string arn:aws:iam::*:user/*. To use resource-based permissions on supported AWS services, specify null.</p>"
         },
         "Description" : {
           "shape" : "StringWithLengthBetween0And1024",
@@ -4762,49 +5714,59 @@
         "IntegrationResponseSelectionExpression" : {
           "shape" : "SelectionExpression",
           "locationName" : "integrationResponseSelectionExpression",
-          "documentation" : "<p>The integration response selection expression for the integration. See <a href=\"https://docs.aws.amazon.com/apigateway/latest/developerguide/apigateway-websocket-api-selection-expressions.html#apigateway-websocket-api-integration-response-selection-expressions\">Integration Response Selection Expressions</a>.</p>"
+          "documentation" : "<p>The integration response selection expression for the integration. Supported only for WebSocket APIs. See <a href=\"https://docs.aws.amazon.com/apigateway/latest/developerguide/apigateway-websocket-api-selection-expressions.html#apigateway-websocket-api-integration-response-selection-expressions\">Integration Response Selection Expressions</a>.</p>"
         },
         "IntegrationType" : {
           "shape" : "IntegrationType",
           "locationName" : "integrationType",
-          "documentation" : "<p>The integration type of an integration. One of the following:</p><p>\n AWS: for integrating the route or method request with an AWS service\n action, including the Lambda function-invoking action. With the Lambda\n function-invoking action, this is referred to as the Lambda custom integration. With\n any other AWS service action, this is known as AWS integration.</p><p>\n AWS_PROXY: for integrating the route or method request with the Lambda\n function-invoking action with the client request passed through as-is. This\n integration is also referred to as Lambda proxy integration.</p><p>\n HTTP: for integrating the route or method request with an HTTP\n endpoint. This\n integration is also referred to as the HTTP custom integration.</p><p>\n HTTP_PROXY: for integrating route or method request with an HTTP\n endpoint, with the client\n request passed through as-is. This is also referred to as HTTP proxy\n integration.</p><p>\n MOCK: for integrating the route or method request with API Gateway as a\n \"loopback\" endpoint without invoking any backend.</p>"
+          "documentation" : "<p>The integration type of an integration. One of the following:</p> <p>AWS: for integrating the route or method request with an AWS service action, including the Lambda function-invoking action. With the Lambda function-invoking action, this is referred to as the Lambda custom integration. With any other AWS service action, this is known as AWS integration. Supported only for WebSocket APIs.</p> <p>AWS_PROXY: for integrating the route or method request with the Lambda function-invoking action with the client request passed through as-is. This integration is also referred to as Lambda proxy integration.</p> <p>HTTP: for integrating the route or method request with an HTTP endpoint. This integration is also referred to as the HTTP custom integration. Supported only for WebSocket APIs.</p> <p>HTTP_PROXY: for integrating the route or method request with an HTTP endpoint, with the client request passed through as-is. This is also referred to as HTTP proxy integration.</p> <p>MOCK: for integrating the route or method request with API Gateway as a \"loopback\" endpoint without invoking any backend. Supported only for WebSocket APIs.</p>"
         },
         "IntegrationUri" : {
           "shape" : "UriWithLengthBetween1And2048",
           "locationName" : "integrationUri",
-          "documentation" : "<p>For a Lambda proxy integration, this is the URI of the Lambda function.</p>"
+          "documentation" : "<p>For a Lambda integration, specify the URI of a Lambda function.</p> <p>For an HTTP integration, specify a fully-qualified URL.</p> <p>For an HTTP API private integration, specify the ARN of an Application Load Balancer listener, Network Load Balancer listener, or AWS Cloud Map service. If you specify the ARN of an AWS Cloud Map service, API Gateway uses DiscoverInstances to identify resources. You can use query parameters to target specific resources. To learn more, see <a href=\"https://alpha-docs-aws.amazon.com/cloud-map/latest/api/API_DiscoverInstances.html\">DiscoverInstances</a>. For private integrations, all resources must be owned by the same AWS account.</p>"
         },
         "PassthroughBehavior" : {
           "shape" : "PassthroughBehavior",
           "locationName" : "passthroughBehavior",
-          "documentation" : "<p>Specifies the pass-through behavior for incoming requests based on the\n Content-Type header in the request, and the available mapping\n templates specified as the requestTemplates property on the\n Integration resource. There are three valid values:\n WHEN_NO_MATCH, WHEN_NO_TEMPLATES, and\n NEVER.</p><p>\n WHEN_NO_MATCH passes the request body for unmapped content types through\n to the integration backend without transformation.</p><p>\n NEVER rejects unmapped content types with an HTTP 415 Unsupported\n Media Type response.</p><p>\n WHEN_NO_TEMPLATES allows pass-through when the integration has no\n content types mapped to templates. However, if there is at least one content type\n defined, unmapped content types will be rejected with the same HTTP 415\n Unsupported Media Type response.</p>"
+          "documentation" : "<p>Specifies the pass-through behavior for incoming requests based on the Content-Type header in the request, and the available mapping templates specified as the requestTemplates property on the Integration resource. There are three valid values: WHEN_NO_MATCH, WHEN_NO_TEMPLATES, and NEVER. Supported only for WebSocket APIs.</p> <p>WHEN_NO_MATCH passes the request body for unmapped content types through to the integration backend without transformation.</p> <p>NEVER rejects unmapped content types with an HTTP 415 Unsupported Media Type response.</p> <p>WHEN_NO_TEMPLATES allows pass-through when the integration has no content types mapped to templates. However, if there is at least one content type defined, unmapped content types will be rejected with the same HTTP 415 Unsupported Media Type response.</p>"
+        },
+        "PayloadFormatVersion" : {
+          "shape" : "StringWithLengthBetween1And64",
+          "locationName" : "payloadFormatVersion",
+          "documentation" : "<p>Specifies the format of the payload sent to an integration. Required for HTTP APIs.</p>"
         },
         "RequestParameters" : {
           "shape" : "IntegrationParameters",
           "locationName" : "requestParameters",
-          "documentation" : "<p>A key-value map specifying request parameters that are passed from the method\n request to the backend. The key is an integration request parameter name and the\n associated value is a method request parameter value or static value that must be\n enclosed within single quotes and pre-encoded as required by the backend. The method\n request parameter value must match the pattern of\n method.request.{location}.{name}\n , where \n {location}\n  is querystring, path, or header; and \n {name}\n  must be a valid and unique method request parameter name.</p>"
+          "documentation" : "<p>A key-value map specifying request parameters that are passed from the method request to the backend. The key is an integration request parameter name and the associated value is a method request parameter value or static value that must be enclosed within single quotes and pre-encoded as required by the backend. The method request parameter value must match the pattern of method.request.<replaceable>{location}</replaceable>.<replaceable>{name}</replaceable>\n               , where \n                  <replaceable>{location}</replaceable>\n                is querystring, path, or header; and \n                  <replaceable>{name}</replaceable>\n                must be a valid and unique method request parameter name. Supported only for WebSocket APIs.</p>"
         },
         "RequestTemplates" : {
           "shape" : "TemplateMap",
           "locationName" : "requestTemplates",
-          "documentation" : "<p>Represents a map of Velocity templates that are applied on the request payload\n based on the value of the Content-Type header sent by the client. The content type\n value is the key in this map, and the template (as a String) is the value.</p>"
+          "documentation" : "<p>Represents a map of Velocity templates that are applied on the request payload based on the value of the Content-Type header sent by the client. The content type value is the key in this map, and the template (as a String) is the value. Supported only for WebSocket APIs.</p>"
         },
         "TemplateSelectionExpression" : {
           "shape" : "SelectionExpression",
           "locationName" : "templateSelectionExpression",
-          "documentation" : "<p>The template selection expression for the integration.</p>"
+          "documentation" : "<p>The template selection expression for the integration. Supported only for WebSocket APIs.</p>"
         },
         "TimeoutInMillis" : {
-          "shape" : "IntegerWithLengthBetween50And29000",
+          "shape" : "IntegerWithLengthBetween50And30000",
           "locationName" : "timeoutInMillis",
-          "documentation" : "<p>Custom timeout between 50 and 29,000 milliseconds. The default value is 29,000\n milliseconds or 29 seconds.</p>"
+          "documentation" : "<p>Custom timeout between 50 and 29,000 milliseconds for WebSocket APIs and between 50 and 30,000 milliseconds for HTTP APIs. The default timeout is 29 seconds for WebSocket APIs and 30 seconds for HTTP APIs.</p>"
+        },
+        "TlsConfig" : {
+          "shape" : "TlsConfig",
+          "locationName" : "tlsConfig",
+          "documentation" : "<p>The TLS configuration for a private integration. If you specify a TLS configuration, private integration traffic uses the HTTPS protocol. Supported only for HTTP APIs.</p>"
         }
       },
       "documentation" : "<p>Represents an integration.</p>"
     },
     "IntegrationParameters" : {
       "type" : "map",
-      "documentation" : "<p>A key-value map specifying response parameters that are passed to the method\n response from the backend. The key is a method response header parameter name and the\n mapped value is an integration response header value, a static value enclosed within\n a pair of single quotes, or a JSON expression from the integration response body. The\n mapping key must match the pattern of method.response.header.{name}, where name is a\n valid and unique header name. The mapped non-static value must match the pattern of\n integration.response.header.{name} or integration.response.body.{JSON-expression},\n where name is a valid and unique response header name and JSON-expression is a valid\n JSON expression without the $ prefix.</p>",
+      "documentation" : "<p>A key-value map specifying response parameters that are passed to the method response from the backend. The key is a method response header parameter name and the mapped value is an integration response header value, a static value enclosed within a pair of single quotes, or a JSON expression from the integration response body. The mapping key must match the pattern of method.response.header.{name}, where name is a valid and unique header name. The mapped non-static value must match the pattern of integration.response.header.{name} or integration.response.body.{JSON-expression}, where name is a valid and unique response header name and JSON-expression is a valid JSON expression without the $ prefix.</p>",
       "key" : {
         "shape" : "__string"
       },
@@ -4818,7 +5780,7 @@
         "ContentHandlingStrategy" : {
           "shape" : "ContentHandlingStrategy",
           "locationName" : "contentHandlingStrategy",
-          "documentation" : "<p>Specifies how to handle response payload content type conversions. Supported\n values are CONVERT_TO_BINARY and CONVERT_TO_TEXT, with the\n following behaviors:</p><p>\n CONVERT_TO_BINARY: Converts a response payload from a Base64-encoded\n string to the corresponding binary blob.</p><p>\n CONVERT_TO_TEXT: Converts a response payload from a binary blob to a\n Base64-encoded string.</p><p>If this property is not defined, the response payload will be passed through from\n the integration response to the route response or method response without\n modification.</p>"
+          "documentation" : "<p>Supported only for WebSocket APIs. Specifies how to handle response payload content type conversions. Supported values are CONVERT_TO_BINARY and CONVERT_TO_TEXT, with the following behaviors:</p> <p>CONVERT_TO_BINARY: Converts a response payload from a Base64-encoded string to the corresponding binary blob.</p> <p>CONVERT_TO_TEXT: Converts a response payload from a binary blob to a Base64-encoded string.</p> <p>If this property is not defined, the response payload will be passed through from the integration response to the route response or method response without modification.</p>"
         },
         "IntegrationResponseId" : {
           "shape" : "Id",
@@ -4833,12 +5795,12 @@
         "ResponseParameters" : {
           "shape" : "IntegrationParameters",
           "locationName" : "responseParameters",
-          "documentation" : "<p>A key-value map specifying response parameters that are passed to the method\n response from the backend. The key is a method response header parameter name and the\n mapped value is an integration response header value, a static value enclosed within\n a pair of single quotes, or a JSON expression from the integration response body. The\n mapping key must match the pattern of method.response.header.{name}, where name is a\n valid and unique header name. The mapped non-static value must match the pattern of\n integration.response.header.{name} or integration.response.body.{JSON-expression},\n where name is a valid and unique response header name and JSON-expression is a valid\n JSON expression without the $ prefix.</p>"
+          "documentation" : "<p>A key-value map specifying response parameters that are passed to the method response from the backend. The key is a method response header parameter name and the mapped value is an integration response header value, a static value enclosed within a pair of single quotes, or a JSON expression from the integration response body. The mapping key must match the pattern of method.response.header.{name}, where name is a valid and unique header name. The mapped non-static value must match the pattern of integration.response.header.{name} or integration.response.body.{JSON-expression}, where name is a valid and unique response header name and JSON-expression is a valid JSON expression without the $ prefix.</p>"
         },
         "ResponseTemplates" : {
           "shape" : "TemplateMap",
           "locationName" : "responseTemplates",
-          "documentation" : "<p>The collection of response templates for the integration response as a\n string-to-string map of key-value pairs. Response templates are represented as a\n key/value map, with a content-type as the key and a template as the value.</p>"
+          "documentation" : "<p>The collection of response templates for the integration response as a string-to-string map of key-value pairs. Response templates are represented as a key/value map, with a content-type as the key and a template as the value.</p>"
         },
         "TemplateSelectionExpression" : {
           "shape" : "SelectionExpression",
@@ -4860,7 +5822,7 @@
         "NextToken" : {
           "shape" : "NextToken",
           "locationName" : "nextToken",
-          "documentation" : "<p>The next page of elements from this collection. Not valid for the last element of\n the collection.</p>"
+          "documentation" : "<p>The next page of elements from this collection. Not valid for the last element of the collection.</p>"
         }
       },
       "documentation" : "<p>Represents a collection of integration responses.</p>"
@@ -4881,11 +5843,27 @@
         "NextToken" : {
           "shape" : "NextToken",
           "locationName" : "nextToken",
-          "documentation" : "<p>The next page of elements from this collection. Not valid for the last element of\n the collection.</p>"
+          "documentation" : "<p>The next page of elements from this collection. Not valid for the last element of the collection.</p>"
         }
       },
       "documentation" : "<p>Represents a collection of integrations.</p>"
     },
+    "JWTConfiguration" : {
+      "type" : "structure",
+      "members" : {
+        "Audience" : {
+          "shape" : "__listOf__string",
+          "locationName" : "audience",
+          "documentation" : "<p>A list of the intended recipients of the JWT. A valid JWT must provide an aud that matches at least one entry in this list. See <a href=\"https://tools.ietf.org/html/rfc7519#section-4.1.3\">RFC 7519</a>. Supported only for HTTP APIs.</p>"
+        },
+        "Issuer" : {
+          "shape" : "UriWithLengthBetween1And2048",
+          "locationName" : "issuer",
+          "documentation" : "<p>The base domain of the identity provider that issues JSON Web Tokens. For example, an Amazon Cognito user pool has the following format: https://cognito-idp.<replaceable>{region}</replaceable>.amazonaws.com/<replaceable>{userPoolId}</replaceable>\n               . Required for the JWT authorizer type. Supported only for HTTP APIs.</p>"
+        }
+      },
+      "documentation" : "<p>Represents the configuration of a JWT authorizer. Required for the JWT authorizer type. Supported only for HTTP APIs.</p>"
+    },
     "LimitExceededException" : {
       "type" : "structure",
       "members" : {
@@ -4902,30 +5880,10 @@
       },
       "documentation" : "<p>A limit has been exceeded. See the accompanying error message for details.</p>"
     },
-    "GetTagsRequest" : {
-      "type" : "structure",
-      "members" : {
-        "ResourceArn" : {
-          "shape" : "__string",
-          "location" : "uri",
-          "locationName" : "resource-arn"
-        }
-      },
-      "required" : [ "ResourceArn" ]
-    },
-    "GetTagsResponse" : {
-      "type" : "structure",
-      "members" : {
-        "Tags" : {
-          "shape" : "__mapOf__string",
-          "locationName" : "tags"
-        }
-      }
-    },
     "LoggingLevel" : {
       "type" : "string",
       "documentation" : "<p>The logging level.</p>",
-      "enum" : [ "ERROR", "INFO", "false" ]
+      "enum" : [ "ERROR", "INFO", "OFF" ]
     },
     "Model" : {
       "type" : "structure",
@@ -4953,10 +5911,10 @@
         "Schema" : {
           "shape" : "StringWithLengthBetween0And32K",
           "locationName" : "schema",
-          "documentation" : "<p>The schema for the model. For application/json models, this should be JSON schema\n draft 4 model.</p>"
+          "documentation" : "<p>The schema for the model. For application/json models, this should be JSON schema draft 4 model.</p>"
         }
       },
-      "documentation" : "<p>Represents a data model for an API. See <a href=\"https://docs.aws.amazon.com/apigateway/latest/developerguide/models-mappings.html\">Create Models and Mapping Templates for Request and Response\n Mappings</a>.</p>",
+      "documentation" : "<p>Represents a data model for an API. Supported only for WebSocket APIs. See <a href=\"https://docs.aws.amazon.com/apigateway/latest/developerguide/models-mappings.html\">Create Models and Mapping Templates for Request and Response Mappings</a>.</p>",
       "required" : [ "Name" ]
     },
     "Models" : {
@@ -4970,14 +5928,14 @@
         "NextToken" : {
           "shape" : "NextToken",
           "locationName" : "nextToken",
-          "documentation" : "<p>The next page of elements from this collection. Not valid for the last element of\n the collection.</p>"
+          "documentation" : "<p>The next page of elements from this collection. Not valid for the last element of the collection.</p>"
         }
       },
-      "documentation" : "<p>Represents a collection of data models. See <a href=\"https://docs.aws.amazon.com/apigateway/latest/developerguide/models-mappings.html\">Create Models and Mapping Templates for Request and Response\n Mappings</a>.</p>"
+      "documentation" : "<p>Represents a collection of data models. See <a href=\"https://docs.aws.amazon.com/apigateway/latest/developerguide/models-mappings.html\">Create Models and Mapping Templates for Request and Response Mappings</a>.</p>"
     },
     "NextToken" : {
       "type" : "string",
-      "documentation" : "<p>The next page of elements from this collection. Not valid for the last element of\n the collection.</p>"
+      "documentation" : "<p>The next page of elements from this collection. Not valid for the last element of the collection.</p>"
     },
     "NotFoundException" : {
       "type" : "structure",
@@ -4993,7 +5951,7 @@
           "documentation" : "<p>The resource type.</p>"
         }
       },
-      "documentation" : "<p>The resource specified in the request was not found. See the message\n field for more information.</p>",
+      "documentation" : "<p>The resource specified in the request was not found. See the message field for more information.</p>",
       "exception" : true,
       "error" : {
         "httpStatusCode" : 404
@@ -5008,52 +5966,167 @@
           "documentation" : "<p>Whether or not the parameter is required.</p>"
         }
       },
-      "documentation" : "<p>Validation constraints imposed on parameters of a request (path, query string,\n headers).</p>"
+      "documentation" : "<p>Validation constraints imposed on parameters of a request (path, query string, headers).</p>"
     },
     "PassthroughBehavior" : {
       "type" : "string",
-      "documentation" : "<p>Represents passthrough behavior for an integration response.</p>",
+      "documentation" : "<p>Represents passthrough behavior for an integration response. Supported only for WebSocket APIs.</p>",
       "enum" : [ "WHEN_NO_MATCH", "NEVER", "WHEN_NO_TEMPLATES" ]
     },
     "ProtocolType" : {
       "type" : "string",
-      "documentation" : "",
-      "enum" : [ "WEBSOCKET" ]
+      "documentation" : "Represents a protocol type.",
+      "enum" : [ "WEBSOCKET", "HTTP" ]
     },
-    "ProviderArnList" : {
-      "type" : "list",
-      "documentation" : "<p>For REQUEST authorizer, this is not defined.</p>",
-      "member" : {
-        "shape" : "Arn"
+    "ReimportApiInput" : {
+      "type" : "structure",
+      "members" : {
+        "Body" : {
+          "shape" : "__string",
+          "locationName" : "body",
+          "documentation" : "<p>The OpenAPI definition. Supported only for HTTP APIs.</p>"
+        }
+      },
+      "documentation" : "<p>Overwrites the configuration of an existing API using the provided definition. Supported only for HTTP APIs.</p>",
+      "required" : [ "Body" ]
+    },
+    "ReimportApiRequest" : {
+      "type" : "structure",
+      "members" : {
+        "ApiId" : {
+          "shape" : "__string",
+          "location" : "uri",
+          "locationName" : "apiId",
+          "documentation" : "<p>The API identifier.</p>"
+        },
+        "Basepath" : {
+          "shape" : "__string",
+          "location" : "querystring",
+          "locationName" : "basepath",
+          "documentation" : "<p>Specifies how to interpret the base path of the API during import. Valid values are ignore, prepend, and split. The default value is ignore. To learn more, see <a href=\"https://alpha-docs-aws.amazon.com/apigateway/latest/developerguide/api-gateway-import-api-basePath.html\">Set the OpenAPI basePath Property</a>. Supported only for HTTP APIs.</p>"
+        },
+        "Body" : {
+          "shape" : "__string",
+          "locationName" : "body",
+          "documentation" : "<p>The OpenAPI definition. Supported only for HTTP APIs.</p>"
+        },
+        "FailOnWarnings" : {
+          "shape" : "__boolean",
+          "location" : "querystring",
+          "locationName" : "failOnWarnings",
+          "documentation" : "<p>Specifies whether to rollback the API creation (true) or not (false) when a warning is encountered. The default value is false.</p>"
+        }
+      },
+      "documentation" : "<p></p>",
+      "required" : [ "ApiId", "Body" ]
+    },
+    "ReimportApiResponse" : {
+      "type" : "structure",
+      "members" : {
+        "ApiEndpoint" : {
+          "shape" : "__string",
+          "locationName" : "apiEndpoint",
+          "documentation" : "<p>The URI of the API, of the form {api-id}.execute-api.{region}.amazonaws.com. The stage name is typically appended to this URI to form a complete path to a deployed API stage.</p>"
+        },
+        "ApiId" : {
+          "shape" : "Id",
+          "locationName" : "apiId",
+          "documentation" : "<p>The API ID.</p>"
+        },
+        "ApiKeySelectionExpression" : {
+          "shape" : "SelectionExpression",
+          "locationName" : "apiKeySelectionExpression",
+          "documentation" : "<p>An API key selection expression. Supported only for WebSocket APIs. See <a href=\"https://docs.aws.amazon.com/apigateway/latest/developerguide/apigateway-websocket-api-selection-expressions.html#apigateway-websocket-api-apikey-selection-expressions\">API Key Selection Expressions</a>.</p>"
+        },
+        "CorsConfiguration" : {
+          "shape" : "Cors",
+          "locationName" : "corsConfiguration",
+          "documentation" : "<p>A CORS configuration. Supported only for HTTP APIs.</p>"
+        },
+        "CreatedDate" : {
+          "shape" : "__timestampIso8601",
+          "locationName" : "createdDate",
+          "documentation" : "<p>The timestamp when the API was created.</p>"
+        },
+        "Description" : {
+          "shape" : "StringWithLengthBetween0And1024",
+          "locationName" : "description",
+          "documentation" : "<p>The description of the API.</p>"
+        },
+        "DisableSchemaValidation" : {
+          "shape" : "__boolean",
+          "locationName" : "disableSchemaValidation",
+          "documentation" : "<p>Avoid validating models when creating a deployment. Supported only for WebSocket APIs.</p>"
+        },
+        "ImportInfo" : {
+          "shape" : "__listOf__string",
+          "locationName" : "importInfo",
+          "documentation" : "<p>The validation information during API import. This may include particular properties of your OpenAPI definition which are ignored during import. Supported only for HTTP APIs.</p>"
+        },
+        "Name" : {
+          "shape" : "StringWithLengthBetween1And128",
+          "locationName" : "name",
+          "documentation" : "<p>The name of the API.</p>"
+        },
+        "ProtocolType" : {
+          "shape" : "ProtocolType",
+          "locationName" : "protocolType",
+          "documentation" : "<p>The API protocol.</p>"
+        },
+        "RouteSelectionExpression" : {
+          "shape" : "SelectionExpression",
+          "locationName" : "routeSelectionExpression",
+          "documentation" : "<p>The route selection expression for the API. For HTTP APIs, the routeSelectionExpression must be ${request.method} ${request.path}. If not provided, this will be the default for HTTP APIs. This property is required for WebSocket APIs.</p>"
+        },
+        "Tags" : {
+          "shape" : "Tags",
+          "locationName" : "tags",
+          "documentation" : "<p>A collection of tags associated with the API.</p>"
+        },
+        "Version" : {
+          "shape" : "StringWithLengthBetween1And64",
+          "locationName" : "version",
+          "documentation" : "<p>A version identifier for the API.</p>"
+        },
+        "Warnings" : {
+          "shape" : "__listOf__string",
+          "locationName" : "warnings",
+          "documentation" : "<p>The warning messages reported when failonwarnings is turned on during API import.</p>"
+        }
       }
     },
     "Route" : {
       "type" : "structure",
       "members" : {
+        "ApiGatewayManaged" : {
+          "shape" : "__boolean",
+          "locationName" : "apiGatewayManaged",
+          "documentation" : "<p>Specifies whether a route is managed by API Gateway. If you created an API using quick create, the $default route is managed by API Gateway. You can't modify the $default route key.</p>"
+        },
         "ApiKeyRequired" : {
           "shape" : "__boolean",
           "locationName" : "apiKeyRequired",
-          "documentation" : "<p>Specifies whether an API key is required for this route.</p>"
+          "documentation" : "<p>Specifies whether an API key is required for this route. Supported only for WebSocket APIs.</p>"
         },
         "AuthorizationScopes" : {
           "shape" : "AuthorizationScopes",
           "locationName" : "authorizationScopes",
-          "documentation" : "<p>A list of authorization scopes configured on a route. The scopes are used with a\n COGNITO_USER_POOLS authorizer to authorize the method invocation. The authorization\n works by matching the route scopes against the scopes parsed from the access token in\n the incoming request. The method invocation is authorized if any route scope matches\n a claimed scope in the access token. Otherwise, the invocation is not authorized.\n When the route scope is configured, the client must provide an access token instead\n of an identity token for authorization purposes.</p>"
+          "documentation" : "<p>A list of authorization scopes configured on a route. The scopes are used with a JWT authorizer to authorize the method invocation. The authorization works by matching the route scopes against the scopes parsed from the access token in the incoming request. The method invocation is authorized if any route scope matches a claimed scope in the access token. Otherwise, the invocation is not authorized. When the route scope is configured, the client must provide an access token instead of an identity token for authorization purposes.</p>"
         },
         "AuthorizationType" : {
           "shape" : "AuthorizationType",
           "locationName" : "authorizationType",
-          "documentation" : "<p>The authorization type for the route. Valid values are NONE for open\n access, AWS_IAM for using AWS IAM permissions, and CUSTOM\n for using a Lambda\n authorizer</p>"
+          "documentation" : "<p>The authorization type for the route. For WebSocket APIs, valid values are NONE for open access, AWS_IAM for using AWS IAM permissions, and CUSTOM for using a Lambda authorizer For HTTP APIs, valid values are NONE for open access, or JWT for using JSON Web Tokens.</p>"
         },
         "AuthorizerId" : {
           "shape" : "Id",
           "locationName" : "authorizerId",
-          "documentation" : "<p>The identifier of the Authorizer resource to be associated with this\n route, if the authorizationType is CUSTOM\n . The authorizer identifier is generated by API Gateway\n when you created the authorizer.</p>"
+          "documentation" : "<p>The identifier of the Authorizer resource to be associated with this route. The authorizer identifier is generated by API Gateway when you created the authorizer.</p>"
         },
         "ModelSelectionExpression" : {
           "shape" : "SelectionExpression",
           "locationName" : "modelSelectionExpression",
-          "documentation" : "<p>The model selection expression for the route.</p>"
+          "documentation" : "<p>The model selection expression for the route. Supported only for WebSocket APIs.</p>"
         },
         "OperationName" : {
           "shape" : "StringWithLengthBetween1And64",
@@ -5063,12 +6136,12 @@
         "RequestModels" : {
           "shape" : "RouteModels",
           "locationName" : "requestModels",
-          "documentation" : "<p>The request models for the route.</p>"
+          "documentation" : "<p>The request models for the route. Supported only for WebSocket APIs.</p>"
         },
         "RequestParameters" : {
           "shape" : "RouteParameters",
           "locationName" : "requestParameters",
-          "documentation" : "<p>The request parameters for the route.</p>"
+          "documentation" : "<p>The request parameters for the route. Supported only for WebSocket APIs.</p>"
         },
         "RouteId" : {
           "shape" : "Id",
@@ -5083,7 +6156,7 @@
         "RouteResponseSelectionExpression" : {
           "shape" : "SelectionExpression",
           "locationName" : "routeResponseSelectionExpression",
-          "documentation" : "<p>The route response selection expression for the route.</p>"
+          "documentation" : "<p>The route response selection expression for the route. Supported only for WebSocket APIs.</p>"
         },
         "Target" : {
           "shape" : "StringWithLengthBetween1And128",
@@ -5120,7 +6193,7 @@
         "ModelSelectionExpression" : {
           "shape" : "SelectionExpression",
           "locationName" : "modelSelectionExpression",
-          "documentation" : "<p>Represents the model selection expression of a route response.</p>"
+          "documentation" : "<p>Represents the model selection expression of a route response. Supported only for WebSocket APIs.</p>"
         },
         "ResponseModels" : {
           "shape" : "RouteModels",
@@ -5157,7 +6230,7 @@
         "NextToken" : {
           "shape" : "NextToken",
           "locationName" : "nextToken",
-          "documentation" : "<p>The next page of elements from this collection. Not valid for the last element of\n the collection.</p>"
+          "documentation" : "<p>The next page of elements from this collection. Not valid for the last element of the collection.</p>"
         }
       },
       "documentation" : "<p>Represents a collection of route responses.</p>"
@@ -5168,7 +6241,7 @@
         "DataTraceEnabled" : {
           "shape" : "__boolean",
           "locationName" : "dataTraceEnabled",
-          "documentation" : "<p>Specifies whether (true) or not (false) data trace\n logging is enabled for this route. This property affects the log entries pushed to\n Amazon CloudWatch Logs.</p>"
+          "documentation" : "<p>Specifies whether (true) or not (false) data trace logging is enabled for this route. This property affects the log entries pushed to Amazon CloudWatch Logs. Supported only for WebSocket APIs.</p>"
         },
         "DetailedMetricsEnabled" : {
           "shape" : "__boolean",
@@ -5178,7 +6251,7 @@
         "LoggingLevel" : {
           "shape" : "LoggingLevel",
           "locationName" : "loggingLevel",
-          "documentation" : "<p>Specifies the logging level for this route: DEBUG, INFO,\n or WARN. This property affects the log entries pushed to Amazon\n CloudWatch Logs.</p>"
+          "documentation" : "<p>Specifies the logging level for this route: INFO, ERROR, or OFF. This property affects the log entries pushed to Amazon CloudWatch Logs. Supported only for WebSocket APIs.</p>"
         },
         "ThrottlingBurstLimit" : {
           "shape" : "__integer",
@@ -5214,18 +6287,30 @@
         "NextToken" : {
           "shape" : "NextToken",
           "locationName" : "nextToken",
-          "documentation" : "<p>The next page of elements from this collection. Not valid for the last element of\n the collection.</p>"
+          "documentation" : "<p>The next page of elements from this collection. Not valid for the last element of the collection.</p>"
         }
       },
       "documentation" : "<p>Represents a collection of routes.</p>"
     },
+    "SecurityGroupIdList" : {
+      "type" : "list",
+      "documentation" : "<p>A list of security group IDs for the VPC link.</p>",
+      "member" : {
+        "shape" : "__string"
+      }
+    },
+    "SecurityPolicy" : {
+      "type" : "string",
+      "documentation" : "<p>The Transport Layer Security (TLS) version of the security policy for this domain name. The valid values are TLS_1_0 and TLS_1_2.</p>",
+      "enum" : [ "TLS_1_0", "TLS_1_2" ]
+    },
     "SelectionExpression" : {
       "type" : "string",
       "documentation" : "<p>An expression used to extract information at runtime. See <a href=\"https://docs.aws.amazon.com/apigateway/latest/developerguide/apigateway-websocket-api-selection-expressions.html#apigateway-websocket-api-apikey-selection-expressions\">Selection Expressions</a> for more information.</p>"
     },
     "SelectionKey" : {
       "type" : "string",
-      "documentation" : "<p>After evaulating a selection expression, the result is compared against one or\n more selection keys to find a matching key. See <a href=\"https://docs.aws.amazon.com/apigateway/latest/developerguide/apigateway-websocket-api-selection-expressions.html#apigateway-websocket-api-apikey-selection-expressions\">Selection Expressions</a> for a list of expressions and each expression's\n associated selection key type.</p>"
+      "documentation" : "<p>After evaluating a selection expression, the result is compared against one or more selection keys to find a matching key. See <a href=\"https://docs.aws.amazon.com/apigateway/latest/developerguide/apigateway-websocket-api-selection-expressions.html#apigateway-websocket-api-apikey-selection-expressions\">Selection Expressions</a> for a list of expressions and each expression's associated selection key type.</p>"
     },
     "Stage" : {
       "type" : "structure",
@@ -5235,10 +6320,20 @@
           "locationName" : "accessLogSettings",
           "documentation" : "<p>Settings for logging access in this stage.</p>"
         },
+        "ApiGatewayManaged" : {
+          "shape" : "__boolean",
+          "locationName" : "apiGatewayManaged",
+          "documentation" : "<p>Specifies whether a stage is managed by API Gateway. If you created an API using quick create, the $default stage is managed by API Gateway. You can't modify the $default stage.</p>"
+        },
+        "AutoDeploy" : {
+          "shape" : "__boolean",
+          "locationName" : "autoDeploy",
+          "documentation" : "<p>Specifies whether updates to an API automatically trigger a new deployment. The default value is false.</p>"
+        },
         "ClientCertificateId" : {
           "shape" : "Id",
           "locationName" : "clientCertificateId",
-          "documentation" : "<p>The identifier of a client certificate for a Stage.</p>"
+          "documentation" : "<p>The identifier of a client certificate for a Stage. Supported only for WebSocket APIs.</p>"
         },
         "CreatedDate" : {
           "shape" : "__timestampIso8601",
@@ -5253,13 +6348,18 @@
         "DeploymentId" : {
           "shape" : "Id",
           "locationName" : "deploymentId",
-          "documentation" : "<p>The identifier of the Deployment that the Stage is\n associated with.</p>"
+          "documentation" : "<p>The identifier of the Deployment that the Stage is associated with. Can't be updated if autoDeploy is enabled.</p>"
         },
         "Description" : {
           "shape" : "StringWithLengthBetween0And1024",
           "locationName" : "description",
           "documentation" : "<p>The description of the stage.</p>"
         },
+        "LastDeploymentStatusMessage" : {
+          "shape" : "__string",
+          "locationName" : "lastDeploymentStatusMessage",
+          "documentation" : "<p>Describes the status of the last deployment of a stage. Supported only for stages with autoDeploy enabled.</p>"
+        },
         "LastUpdatedDate" : {
           "shape" : "__timestampIso8601",
           "locationName" : "lastUpdatedDate",
@@ -5268,7 +6368,7 @@
         "RouteSettings" : {
           "shape" : "RouteSettingsMap",
           "locationName" : "routeSettings",
-          "documentation" : "<p>Route settings for the stage.</p>"
+          "documentation" : "<p>Route settings for the stage, by routeKey.</p>"
         },
         "StageName" : {
           "shape" : "StringWithLengthBetween1And128",
@@ -5278,12 +6378,12 @@
         "StageVariables" : {
           "shape" : "StageVariablesMap",
           "locationName" : "stageVariables",
-          "documentation" : "<p>A map that defines the stage variables for a stage resource. Variable names can\n have alphanumeric and underscore characters, and the values must match\n [A-Za-z0-9-._~:/?#&=,]+.</p>"
+          "documentation" : "<p>A map that defines the stage variables for a stage resource. Variable names can have alphanumeric and underscore characters, and the values must match [A-Za-z0-9-._~:/?#&amp;=,]+.</p>"
         },
         "Tags" : {
           "shape" : "Tags",
           "locationName" : "tags",
-          "documentation" : "<p>The key-value map of strings. The valid character set is [a-zA-Z+-=._:/]. The tag key can be up to 128 characters and must not start with aws:. The tag value can be up to 256 characters..</p>"
+          "documentation" : "<p>The collection of tags. Each tag element is associated with a given resource.</p>"
         }
       },
       "documentation" : "<p>Represents an API stage.</p>",
@@ -5310,10 +6410,10 @@
         "NextToken" : {
           "shape" : "NextToken",
           "locationName" : "nextToken",
-          "documentation" : "<p>The next page of elements from this collection. Not valid for the last element of\n the collection.</p>"
+          "documentation" : "<p>The next page of elements from this collection. Not valid for the last element of the collection.</p>"
         }
       },
-      "documentation" : "<p>A collection of Stage resources that are associated with the ApiKey\n resource.</p>"
+      "documentation" : "<p>A collection of Stage resources that are associated with the ApiKey resource.</p>"
     },
     "StringWithLengthBetween0And1024" : {
       "type" : "string",
@@ -5335,6 +6435,10 @@
       "type" : "string",
       "documentation" : "<p>A string with a length between [1-128].</p>"
     },
+    "StringWithLengthBetween1And1600" : {
+      "type" : "string",
+      "documentation" : "<p>A string with a length between [0-1600].</p>"
+    },
     "StringWithLengthBetween1And256" : {
       "type" : "string",
       "documentation" : "<p>A string with a length between [1-256].</p>"
@@ -5347,9 +6451,12 @@
       "type" : "string",
       "documentation" : "<p>A string with a length between [1-64].</p>"
     },
-    "StringWithLengthBetween1And1600" : {
-      "type" : "string",
-      "documentation" : "<p>A string with a length between [1-1600].</p>"
+    "SubnetIdList" : {
+      "type" : "list",
+      "documentation" : "<p>A list of subnet IDs to include in the VPC link.</p>",
+      "member" : {
+        "shape" : "__string"
+      }
     },
     "TagResourceInput" : {
       "type" : "structure",
@@ -5357,9 +6464,10 @@
         "Tags" : {
           "shape" : "Tags",
           "locationName" : "tags",
-          "documentation" : "<p>The key-value map of strings. The valid character set is [a-zA-Z+-=._:/]. The tag key can be up to 128 characters and must not start with aws:. The tag value can be up to 256 characters..</p>"
+          "documentation" : "<p>The collection of tags. Each tag element is associated with a given resource.</p>"
         }
-      }
+      },
+      "documentation" : "<p>Represents the input parameters for a TagResource request.</p>"
     },
     "TagResourceRequest" : {
       "type" : "structure",
@@ -5368,14 +6476,15 @@
           "shape" : "__string",
           "location" : "uri",
           "locationName" : "resource-arn",
-          "documentation" : "<p>AWS resource arn </p>"
+          "documentation" : "<p>The resource ARN for the tag.</p>"
         },
         "Tags" : {
           "shape" : "Tags",
           "locationName" : "tags",
-          "documentation" : "<p>The key-value map of strings. The valid character set is [a-zA-Z+-=._:/]. The tag key can be up to 128 characters and must not start with aws:. The tag value can be up to 256 characters..</p>"
+          "documentation" : "<p>The collection of tags. Each tag element is associated with a given resource.</p>"
         }
       },
+      "documentation" : "<p>Creates a new Tag resource to represent a tag.</p>",
       "required" : [ "ResourceArn" ]
     },
     "TagResourceResponse" : {
@@ -5384,6 +6493,7 @@
     },
     "Tags" : {
       "type" : "map",
+      "documentation" : "<p>Represents a collection of tags associated with the resource.</p>",
       "key" : {
         "shape" : "__string"
       },
@@ -5391,24 +6501,6 @@
         "shape" : "StringWithLengthBetween1And1600"
       }
     },
-    "UntagResourceRequest" : {
-      "type" : "structure",
-      "members" : {
-        "ResourceArn" : {
-          "shape" : "__string",
-          "location" : "uri",
-          "locationName" : "resource-arn",
-          "documentation" : "<p>AWS resource arn </p>"
-        },
-        "TagKeys" : {
-          "shape" : "__listOf__string",
-          "location" : "querystring",
-          "locationName" : "tagKeys",
-          "documentation" : "<p>The Tag keys to delete</p>"
-        }
-      },
-      "required" : [ "TagKeys", "ResourceArn" ]
-    },
     "Template" : {
       "type" : "structure",
       "members" : {
@@ -5422,7 +6514,7 @@
     },
     "TemplateMap" : {
       "type" : "map",
-      "documentation" : "<p>A mapping of identifier keys to templates. The value is an actual template script.\n The key is typically a SelectionKey which is chosen based on evaluating\n a selection expression.</p>",
+      "documentation" : "<p>A mapping of identifier keys to templates. The value is an actual template script. The key is typically a SelectionKey which is chosen based on evaluating a selection expression.</p>",
       "key" : {
         "shape" : "__string"
       },
@@ -5430,6 +6522,28 @@
         "shape" : "StringWithLengthBetween0And32K"
       }
     },
+    "TlsConfig" : {
+      "type" : "structure",
+      "members" : {
+        "ServerNameToVerify" : {
+          "shape" : "StringWithLengthBetween1And512",
+          "locationName" : "serverNameToVerify",
+          "documentation" : "<p>If you specify a server name, API Gateway uses it to verify the hostname on the integration's certificate. The server name is also included in the TLS handshake to support Server Name Indication (SNI) or virtual hosting.</p>"
+        }
+      },
+      "documentation" : "<p>The TLS configuration for a private integration. If you specify a TLS configuration, private integration traffic uses the HTTPS protocol. Supported only for HTTP APIs.</p>"
+    },
+    "TlsConfigInput" : {
+      "type" : "structure",
+      "members" : {
+        "ServerNameToVerify" : {
+          "shape" : "StringWithLengthBetween1And512",
+          "locationName" : "serverNameToVerify",
+          "documentation" : "<p>If you specify a server name, API Gateway uses it to verify the hostname on the integration's certificate. The server name is also included in the TLS handshake to support Server Name Indication (SNI) or virtual hosting.</p>"
+        }
+      },
+      "documentation" : "<p>The TLS configuration for a private integration. If you specify a TLS configuration, private integration traffic uses the HTTPS protocol. Supported only for HTTP APIs.</p>"
+    },
     "TooManyRequestsException" : {
       "type" : "structure",
       "members" : {
@@ -5450,13 +6564,41 @@
         "httpStatusCode" : 429
       }
     },
+    "UntagResourceRequest" : {
+      "type" : "structure",
+      "members" : {
+        "ResourceArn" : {
+          "shape" : "__string",
+          "location" : "uri",
+          "locationName" : "resource-arn",
+          "documentation" : "<p>The resource ARN for the tag.</p>"
+        },
+        "TagKeys" : {
+          "shape" : "__listOf__string",
+          "location" : "querystring",
+          "locationName" : "tagKeys",
+          "documentation" : "<p>The Tag keys to delete</p>"
+        }
+      },
+      "required" : [ "ResourceArn", "TagKeys" ]
+    },
     "UpdateApiInput" : {
       "type" : "structure",
       "members" : {
         "ApiKeySelectionExpression" : {
           "shape" : "SelectionExpression",
           "locationName" : "apiKeySelectionExpression",
-          "documentation" : "<p>An API key selection expression. See <a href=\"https://docs.aws.amazon.com/apigateway/latest/developerguide/apigateway-websocket-api-selection-expressions.html#apigateway-websocket-api-apikey-selection-expressions\">API Key Selection Expressions</a>.</p>"
+          "documentation" : "<p>An API key selection expression. Supported only for WebSocket APIs. See <a href=\"https://docs.aws.amazon.com/apigateway/latest/developerguide/apigateway-websocket-api-selection-expressions.html#apigateway-websocket-api-apikey-selection-expressions\">API Key Selection Expressions</a>.</p>"
+        },
+        "CorsConfiguration" : {
+          "shape" : "Cors",
+          "locationName" : "corsConfiguration",
+          "documentation" : "<p>A CORS configuration. Supported only for HTTP APIs.</p>"
+        },
+        "CredentialsArn" : {
+          "shape" : "Arn",
+          "locationName" : "credentialsArn",
+          "documentation" : "<p>This property is part of quick create. It specifies the credentials required for the integration, if any. For a Lambda integration, three options are available. To specify an IAM Role for API Gateway to assume, use the role's Amazon Resource Name (ARN). To require that the caller's identity be passed through from the request, specify arn:aws:iam::*:user/*. To use resource-based permissions on supported AWS services, specify null. Currently, this property is not used for HTTP integrations. If provided, this value replaces the credentials associated with the quick create integration. Supported only for HTTP APIs.</p>"
         },
         "Description" : {
           "shape" : "StringWithLengthBetween0And1024",
@@ -5466,17 +6608,27 @@
         "DisableSchemaValidation" : {
           "shape" : "__boolean",
           "locationName" : "disableSchemaValidation",
-          "documentation" : "<p>Avoid validating models when creating a deployment.</p>"
+          "documentation" : "<p>Avoid validating models when creating a deployment. Supported only for WebSocket APIs.</p>"
         },
         "Name" : {
           "shape" : "StringWithLengthBetween1And128",
           "locationName" : "name",
           "documentation" : "<p>The name of the API.</p>"
         },
+        "RouteKey" : {
+          "shape" : "SelectionKey",
+          "locationName" : "routeKey",
+          "documentation" : "<p>This property is part of quick create. If not specified, the route created using quick create is kept. Otherwise, this value replaces the route key of the quick create route. Additional routes may still be added after the API is updated. Supported only for HTTP APIs.</p>"
+        },
         "RouteSelectionExpression" : {
           "shape" : "SelectionExpression",
           "locationName" : "routeSelectionExpression",
-          "documentation" : "<p>The route selection expression for the API.</p>"
+          "documentation" : "<p>The route selection expression for the API. For HTTP APIs, the routeSelectionExpression must be ${request.method} ${request.path}. If not provided, this will be the default for HTTP APIs. This property is required for WebSocket APIs.</p>"
+        },
+        "Target" : {
+          "shape" : "UriWithLengthBetween1And2048",
+          "locationName" : "target",
+          "documentation" : "<p>This property is part of quick create. For HTTP integrations, specify a fully qualified URL. For Lambda integrations, specify a function ARN. The type of the integration will be HTTP_PROXY or AWS_PROXY, respectively. The value provided updates the integration URI and integration type. You can update a quick-created target, but you can't remove it from an API. Supported only for HTTP APIs.</p>"
         },
         "Version" : {
           "shape" : "StringWithLengthBetween1And64",
@@ -5505,7 +6657,7 @@
           "documentation" : "<p>The API stage.</p>"
         }
       },
-      "documentation" : "<p>Represents the input parameters for an UpdateApiMapping\n request.</p>"
+      "documentation" : "<p>Represents the input parameters for an UpdateApiMapping request.</p>"
     },
     "UpdateApiMappingRequest" : {
       "type" : "structure",
@@ -5538,6 +6690,7 @@
           "documentation" : "<p>The API stage.</p>"
         }
       },
+      "documentation" : "<p>Updates an ApiMapping.</p>",
       "required" : [ "ApiMappingId", "ApiId", "DomainName" ]
     },
     "UpdateApiMappingResponse" : {
@@ -5577,7 +6730,17 @@
         "ApiKeySelectionExpression" : {
           "shape" : "SelectionExpression",
           "locationName" : "apiKeySelectionExpression",
-          "documentation" : "<p>An API key selection expression. See <a href=\"https://docs.aws.amazon.com/apigateway/latest/developerguide/apigateway-websocket-api-selection-expressions.html#apigateway-websocket-api-apikey-selection-expressions\">API Key Selection Expressions</a>.</p>"
+          "documentation" : "<p>An API key selection expression. Supported only for WebSocket APIs. See <a href=\"https://docs.aws.amazon.com/apigateway/latest/developerguide/apigateway-websocket-api-selection-expressions.html#apigateway-websocket-api-apikey-selection-expressions\">API Key Selection Expressions</a>.</p>"
+        },
+        "CorsConfiguration" : {
+          "shape" : "Cors",
+          "locationName" : "corsConfiguration",
+          "documentation" : "<p>A CORS configuration. Supported only for HTTP APIs.</p>"
+        },
+        "CredentialsArn" : {
+          "shape" : "Arn",
+          "locationName" : "credentialsArn",
+          "documentation" : "<p>This property is part of quick create. It specifies the credentials required for the integration, if any. For a Lambda integration, three options are available. To specify an IAM Role for API Gateway to assume, use the role's Amazon Resource Name (ARN). To require that the caller's identity be passed through from the request, specify arn:aws:iam::*:user/*. To use resource-based permissions on supported AWS services, specify null. Currently, this property is not used for HTTP integrations. If provided, this value replaces the credentials associated with the quick create integration. Supported only for HTTP APIs.</p>"
         },
         "Description" : {
           "shape" : "StringWithLengthBetween0And1024",
@@ -5587,17 +6750,27 @@
         "DisableSchemaValidation" : {
           "shape" : "__boolean",
           "locationName" : "disableSchemaValidation",
-          "documentation" : "<p>Avoid validating models when creating a deployment.</p>"
+          "documentation" : "<p>Avoid validating models when creating a deployment. Supported only for WebSocket APIs.</p>"
         },
         "Name" : {
           "shape" : "StringWithLengthBetween1And128",
           "locationName" : "name",
           "documentation" : "<p>The name of the API.</p>"
         },
+        "RouteKey" : {
+          "shape" : "SelectionKey",
+          "locationName" : "routeKey",
+          "documentation" : "<p>This property is part of quick create. If not specified, the route created using quick create is kept. Otherwise, this value replaces the route key of the quick create route. Additional routes may still be added after the API is updated. Supported only for HTTP APIs.</p>"
+        },
         "RouteSelectionExpression" : {
           "shape" : "SelectionExpression",
           "locationName" : "routeSelectionExpression",
-          "documentation" : "<p>The route selection expression for the API.</p>"
+          "documentation" : "<p>The route selection expression for the API. For HTTP APIs, the routeSelectionExpression must be ${request.method} ${request.path}. If not provided, this will be the default for HTTP APIs. This property is required for WebSocket APIs.</p>"
+        },
+        "Target" : {
+          "shape" : "UriWithLengthBetween1And2048",
+          "locationName" : "target",
+          "documentation" : "<p>This property is part of quick create. For HTTP integrations, specify a fully qualified URL. For Lambda integrations, specify a function ARN. The type of the integration will be HTTP_PROXY or AWS_PROXY, respectively. The value provided updates the integration URI and integration type. You can update a quick-created target, but you can't remove it from an API. Supported only for HTTP APIs.</p>"
         },
         "Version" : {
           "shape" : "StringWithLengthBetween1And64",
@@ -5605,6 +6778,7 @@
           "documentation" : "<p>A version identifier for the API.</p>"
         }
       },
+      "documentation" : "<p>Updates an Api.</p>",
       "required" : [ "ApiId" ]
     },
     "UpdateApiResponse" : {
@@ -5613,7 +6787,7 @@
         "ApiEndpoint" : {
           "shape" : "__string",
           "locationName" : "apiEndpoint",
-          "documentation" : "<p>The URI of the API, of the form {api-id}.execute-api.{region}.amazonaws.com. The\n stage name is typically appended to this URI to form a complete path to a deployed\n API stage.</p>"
+          "documentation" : "<p>The URI of the API, of the form {api-id}.execute-api.{region}.amazonaws.com. The stage name is typically appended to this URI to form a complete path to a deployed API stage.</p>"
         },
         "ApiId" : {
           "shape" : "Id",
@@ -5623,7 +6797,12 @@
         "ApiKeySelectionExpression" : {
           "shape" : "SelectionExpression",
           "locationName" : "apiKeySelectionExpression",
-          "documentation" : "<p>An API key selection expression. See <a href=\"https://docs.aws.amazon.com/apigateway/latest/developerguide/apigateway-websocket-api-selection-expressions.html#apigateway-websocket-api-apikey-selection-expressions\">API Key Selection Expressions</a>.</p>"
+          "documentation" : "<p>An API key selection expression. Supported only for WebSocket APIs. See <a href=\"https://docs.aws.amazon.com/apigateway/latest/developerguide/apigateway-websocket-api-selection-expressions.html#apigateway-websocket-api-apikey-selection-expressions\">API Key Selection Expressions</a>.</p>"
+        },
+        "CorsConfiguration" : {
+          "shape" : "Cors",
+          "locationName" : "corsConfiguration",
+          "documentation" : "<p>A CORS configuration. Supported only for HTTP APIs.</p>"
         },
         "CreatedDate" : {
           "shape" : "__timestampIso8601",
@@ -5638,7 +6817,12 @@
         "DisableSchemaValidation" : {
           "shape" : "__boolean",
           "locationName" : "disableSchemaValidation",
-          "documentation" : "<p>Avoid validating models when creating a deployment.</p>"
+          "documentation" : "<p>Avoid validating models when creating a deployment. Supported only for WebSocket APIs.</p>"
+        },
+        "ImportInfo" : {
+          "shape" : "__listOf__string",
+          "locationName" : "importInfo",
+          "documentation" : "<p>The validation information during API import. This may include particular properties of your OpenAPI definition which are ignored during import. Supported only for HTTP APIs.</p>"
         },
         "Name" : {
           "shape" : "StringWithLengthBetween1And128",
@@ -5648,12 +6832,17 @@
         "ProtocolType" : {
           "shape" : "ProtocolType",
           "locationName" : "protocolType",
-          "documentation" : "<p>The API protocol: Currently only WEBSOCKET is supported.</p>"
+          "documentation" : "<p>The API protocol.</p>"
         },
         "RouteSelectionExpression" : {
           "shape" : "SelectionExpression",
           "locationName" : "routeSelectionExpression",
-          "documentation" : "<p>The route selection expression for the API.</p>"
+          "documentation" : "<p>The route selection expression for the API. For HTTP APIs, the routeSelectionExpression must be ${request.method} ${request.path}. If not provided, this will be the default for HTTP APIs. This property is required for WebSocket APIs.</p>"
+        },
+        "Tags" : {
+          "shape" : "Tags",
+          "locationName" : "tags",
+          "documentation" : "<p>A collection of tags associated with the API.</p>"
         },
         "Version" : {
           "shape" : "StringWithLengthBetween1And64",
@@ -5663,12 +6852,7 @@
         "Warnings" : {
           "shape" : "__listOf__string",
           "locationName" : "warnings",
-          "documentation" : "<p>The warning messages reported when failonwarnings is turned on during\n API import.</p>"
-        },
-        "Tags" : {
-          "shape" : "Tags",
-          "locationName" : "tags",
-          "documentation" : "<p>The key-value map of strings. The valid character set is [a-zA-Z+-=._:/]. The tag key can be up to 128 characters and must not start with aws:. The tag value can be up to 256 characters..</p>"
+          "documentation" : "<p>The warning messages reported when failonwarnings is turned on during API import.</p>"
         }
       }
     },
@@ -5678,42 +6862,42 @@
         "AuthorizerCredentialsArn" : {
           "shape" : "Arn",
           "locationName" : "authorizerCredentialsArn",
-          "documentation" : "<p>Specifies the required credentials as an IAM role for API Gateway to invoke the\n authorizer. To specify an IAM role for API Gateway to assume, use the role's Amazon\n Resource Name (ARN). To use resource-based permissions on the Lambda function,\n specify null.</p>"
+          "documentation" : "<p>Specifies the required credentials as an IAM role for API Gateway to invoke the authorizer. To specify an IAM role for API Gateway to assume, use the role's Amazon Resource Name (ARN). To use resource-based permissions on the Lambda function, specify null.</p>"
         },
         "AuthorizerResultTtlInSeconds" : {
           "shape" : "IntegerWithLengthBetween0And3600",
           "locationName" : "authorizerResultTtlInSeconds",
-          "documentation" : "<p>The time to live (TTL), in seconds, of cached authorizer results. If it is zero,\n authorization caching is disabled. If it is greater than zero, API Gateway will cache\n authorizer responses. If this field is not set, the default value is 300. The maximum\n value is 3600, or 1 hour.</p>"
+          "documentation" : "<p>Authorizer caching is not currently supported. Don't specify this value for authorizers.</p>"
         },
         "AuthorizerType" : {
           "shape" : "AuthorizerType",
           "locationName" : "authorizerType",
-          "documentation" : "<p>The authorizer type. Currently the only valid value is REQUEST, for a\n Lambda function using incoming request parameters.</p>"
+          "documentation" : "<p>The authorizer type. For WebSocket APIs, specify REQUEST for a Lambda function using incoming request parameters. For HTTP APIs, specify JWT to use JSON Web Tokens.</p>"
         },
         "AuthorizerUri" : {
           "shape" : "UriWithLengthBetween1And2048",
           "locationName" : "authorizerUri",
-          "documentation" : "<p>The authorizer's Uniform Resource Identifier (URI). For\n REQUEST authorizers, this must be a\n well-formed Lambda function URI, for example,\n arn:aws:apigateway:us-west-2:lambda:path/2015-03-31/functions/arn:aws:lambda:us-west-2:{account_id}:function:{lambda_function_name}/invocations.\n In general, the URI has this form:\n arn:aws:apigateway:{region}:lambda:path/{service_api}\n , where {region} is the same as the region hosting the Lambda\n function, path indicates that the remaining substring in the URI should be treated as\n the path to the resource, including the initial /. For Lambda functions,\n this is usually of the form\n /2015-03-31/functions/[FunctionARN]/invocations.</p>"
+          "documentation" : "<p>The authorizer's Uniform Resource Identifier (URI). For REQUEST authorizers, this must be a well-formed Lambda function URI, for example, arn:aws:apigateway:us-west-2:lambda:path/2015-03-31/functions/arn:aws:lambda:us-west-2:<replaceable>{account_id}</replaceable>:function:<replaceable>{lambda_function_name}</replaceable>/invocations. In general, the URI has this form: arn:aws:apigateway:<replaceable>{region}</replaceable>:lambda:path/<replaceable>{service_api}</replaceable>\n               , where <replaceable></replaceable>{region} is the same as the region hosting the Lambda function, path indicates that the remaining substring in the URI should be treated as the path to the resource, including the initial /. For Lambda functions, this is usually of the form /2015-03-31/functions/[FunctionARN]/invocations. Supported only for REQUEST authorizers.</p>"
         },
         "IdentitySource" : {
           "shape" : "IdentitySourceList",
           "locationName" : "identitySource",
-          "documentation" : "<p>The identity source for which authorization is requested.</p><p>For the REQUEST authorizer, this is required when authorization\n caching is enabled. The value is a comma-separated string of one or more mapping\n expressions of the specified request parameters. For example, if an Auth header, a\n Name query string parameter are defined as identity sources, this value is\n $method.request.header.Auth, $method.request.querystring.Name. These\n parameters will be used to derive the authorization caching key and to perform\n runtime validation of the REQUEST authorizer by verifying all of the\n identity-related request parameters are present, not null and non-empty. Only when\n this is true does the authorizer invoke the authorizer Lambda function, otherwise, it\n returns a 401 Unauthorized response without calling the Lambda function.\n The valid value is a string of comma-separated mapping expressions of the specified\n request parameters. When the authorization caching is not enabled, this property is\n optional.</p>"
+          "documentation" : "<p>The identity source for which authorization is requested.</p> <p>For a REQUEST authorizer, this is optional. The value is a set of one or more mapping expressions of the specified request parameters. Currently, the identity source can be headers, query string parameters, stage variables, and context parameters. For example, if an Auth header and a Name query string parameter are defined as identity sources, this value is route.request.header.Auth, route.request.querystring.Name. These parameters will be used to perform runtime validation for Lambda-based authorizers by verifying all of the identity-related request parameters are present in the request, not null, and non-empty. Only when this is true does the authorizer invoke the authorizer Lambda function. Otherwise, it returns a 401 Unauthorized response without calling the Lambda function.</p> <p>For JWT, a single entry that specifies where to extract the JSON Web Token (JWT) from inbound requests. Currently only header-based and query parameter-based selections are supported, for example \"$request.header.Authorization\".</p>"
         },
         "IdentityValidationExpression" : {
           "shape" : "StringWithLengthBetween0And1024",
           "locationName" : "identityValidationExpression",
-          "documentation" : "<p>The\n validation expression does not apply to the REQUEST authorizer.</p>"
+          "documentation" : "<p>This parameter is not used.</p>"
+        },
+        "JwtConfiguration" : {
+          "shape" : "JWTConfiguration",
+          "locationName" : "jwtConfiguration",
+          "documentation" : "<p>Represents the configuration of a JWT authorizer. Required for the JWT authorizer type. Supported only for HTTP APIs.</p>"
         },
         "Name" : {
           "shape" : "StringWithLengthBetween1And128",
           "locationName" : "name",
           "documentation" : "<p>The name of the authorizer.</p>"
-        },
-        "ProviderArns" : {
-          "shape" : "ProviderArnList",
-          "locationName" : "providerArns",
-          "documentation" : "<p>For\n REQUEST authorizer, this is not\n defined.</p>"
         }
       },
       "documentation" : "<p>The input parameters for an UpdateAuthorizer request.</p>"
@@ -5730,7 +6914,7 @@
         "AuthorizerCredentialsArn" : {
           "shape" : "Arn",
           "locationName" : "authorizerCredentialsArn",
-          "documentation" : "<p>Specifies the required credentials as an IAM role for API Gateway to invoke the\n authorizer. To specify an IAM role for API Gateway to assume, use the role's Amazon\n Resource Name (ARN). To use resource-based permissions on the Lambda function,\n specify null.</p>"
+          "documentation" : "<p>Specifies the required credentials as an IAM role for API Gateway to invoke the authorizer. To specify an IAM role for API Gateway to assume, use the role's Amazon Resource Name (ARN). To use resource-based permissions on the Lambda function, specify null.</p>"
         },
         "AuthorizerId" : {
           "shape" : "__string",
@@ -5741,39 +6925,40 @@
         "AuthorizerResultTtlInSeconds" : {
           "shape" : "IntegerWithLengthBetween0And3600",
           "locationName" : "authorizerResultTtlInSeconds",
-          "documentation" : "<p>The time to live (TTL), in seconds, of cached authorizer results. If it is zero,\n authorization caching is disabled. If it is greater than zero, API Gateway will cache\n authorizer responses. If this field is not set, the default value is 300. The maximum\n value is 3600, or 1 hour.</p>"
+          "documentation" : "<p>Authorizer caching is not currently supported. Don't specify this value for authorizers.</p>"
         },
         "AuthorizerType" : {
           "shape" : "AuthorizerType",
           "locationName" : "authorizerType",
-          "documentation" : "<p>The authorizer type. Currently the only valid value is REQUEST, for a\n Lambda function using incoming request parameters.</p>"
+          "documentation" : "<p>The authorizer type. For WebSocket APIs, specify REQUEST for a Lambda function using incoming request parameters. For HTTP APIs, specify JWT to use JSON Web Tokens.</p>"
         },
         "AuthorizerUri" : {
           "shape" : "UriWithLengthBetween1And2048",
           "locationName" : "authorizerUri",
-          "documentation" : "<p>The authorizer's Uniform Resource Identifier (URI). For\n REQUEST authorizers, this must be a\n well-formed Lambda function URI, for example,\n arn:aws:apigateway:us-west-2:lambda:path/2015-03-31/functions/arn:aws:lambda:us-west-2:{account_id}:function:{lambda_function_name}/invocations.\n In general, the URI has this form:\n arn:aws:apigateway:{region}:lambda:path/{service_api}\n , where {region} is the same as the region hosting the Lambda\n function, path indicates that the remaining substring in the URI should be treated as\n the path to the resource, including the initial /. For Lambda functions,\n this is usually of the form\n /2015-03-31/functions/[FunctionARN]/invocations.</p>"
+          "documentation" : "<p>The authorizer's Uniform Resource Identifier (URI). For REQUEST authorizers, this must be a well-formed Lambda function URI, for example, arn:aws:apigateway:us-west-2:lambda:path/2015-03-31/functions/arn:aws:lambda:us-west-2:<replaceable>{account_id}</replaceable>:function:<replaceable>{lambda_function_name}</replaceable>/invocations. In general, the URI has this form: arn:aws:apigateway:<replaceable>{region}</replaceable>:lambda:path/<replaceable>{service_api}</replaceable>\n               , where <replaceable></replaceable>{region} is the same as the region hosting the Lambda function, path indicates that the remaining substring in the URI should be treated as the path to the resource, including the initial /. For Lambda functions, this is usually of the form /2015-03-31/functions/[FunctionARN]/invocations. Supported only for REQUEST authorizers.</p>"
         },
         "IdentitySource" : {
           "shape" : "IdentitySourceList",
           "locationName" : "identitySource",
-          "documentation" : "<p>The identity source for which authorization is requested.</p><p>For the REQUEST authorizer, this is required when authorization\n caching is enabled. The value is a comma-separated string of one or more mapping\n expressions of the specified request parameters. For example, if an Auth header, a\n Name query string parameter are defined as identity sources, this value is\n $method.request.header.Auth, $method.request.querystring.Name. These\n parameters will be used to derive the authorization caching key and to perform\n runtime validation of the REQUEST authorizer by verifying all of the\n identity-related request parameters are present, not null and non-empty. Only when\n this is true does the authorizer invoke the authorizer Lambda function, otherwise, it\n returns a 401 Unauthorized response without calling the Lambda function.\n The valid value is a string of comma-separated mapping expressions of the specified\n request parameters. When the authorization caching is not enabled, this property is\n optional.</p>"
+          "documentation" : "<p>The identity source for which authorization is requested.</p> <p>For a REQUEST authorizer, this is optional. The value is a set of one or more mapping expressions of the specified request parameters. Currently, the identity source can be headers, query string parameters, stage variables, and context parameters. For example, if an Auth header and a Name query string parameter are defined as identity sources, this value is route.request.header.Auth, route.request.querystring.Name. These parameters will be used to perform runtime validation for Lambda-based authorizers by verifying all of the identity-related request parameters are present in the request, not null, and non-empty. Only when this is true does the authorizer invoke the authorizer Lambda function. Otherwise, it returns a 401 Unauthorized response without calling the Lambda function.</p> <p>For JWT, a single entry that specifies where to extract the JSON Web Token (JWT) from inbound requests. Currently only header-based and query parameter-based selections are supported, for example \"$request.header.Authorization\".</p>"
         },
         "IdentityValidationExpression" : {
           "shape" : "StringWithLengthBetween0And1024",
           "locationName" : "identityValidationExpression",
-          "documentation" : "<p>The\n validation expression does not apply to the REQUEST authorizer.</p>"
+          "documentation" : "<p>This parameter is not used.</p>"
+        },
+        "JwtConfiguration" : {
+          "shape" : "JWTConfiguration",
+          "locationName" : "jwtConfiguration",
+          "documentation" : "<p>Represents the configuration of a JWT authorizer. Required for the JWT authorizer type. Supported only for HTTP APIs.</p>"
         },
         "Name" : {
           "shape" : "StringWithLengthBetween1And128",
           "locationName" : "name",
           "documentation" : "<p>The name of the authorizer.</p>"
-        },
-        "ProviderArns" : {
-          "shape" : "ProviderArnList",
-          "locationName" : "providerArns",
-          "documentation" : "<p>For\n REQUEST authorizer, this is not\n defined.</p>"
         }
       },
+      "documentation" : "<p>Updates an Authorizer.</p>",
       "required" : [ "AuthorizerId", "ApiId" ]
     },
     "UpdateAuthorizerResponse" : {
@@ -5782,7 +6967,7 @@
         "AuthorizerCredentialsArn" : {
           "shape" : "Arn",
           "locationName" : "authorizerCredentialsArn",
-          "documentation" : "<p>Specifies the required credentials as an IAM role for API Gateway to invoke the\n authorizer. To specify an IAM role for API Gateway to assume, use the role's Amazon\n Resource Name (ARN). To use resource-based permissions on the Lambda function,\n specify null.</p>"
+          "documentation" : "<p>Specifies the required credentials as an IAM role for API Gateway to invoke the authorizer. To specify an IAM role for API Gateway to assume, use the role's Amazon Resource Name (ARN). To use resource-based permissions on the Lambda function, specify null. Supported only for REQUEST authorizers.</p>"
         },
         "AuthorizerId" : {
           "shape" : "Id",
@@ -5792,37 +6977,37 @@
         "AuthorizerResultTtlInSeconds" : {
           "shape" : "IntegerWithLengthBetween0And3600",
           "locationName" : "authorizerResultTtlInSeconds",
-          "documentation" : "<p>The time to live (TTL), in seconds, of cached authorizer results. If it equals 0,\n authorization caching is disabled. If it is greater than 0, API Gateway will cache\n authorizer responses. If this field is not set, the default value is 300. The maximum\n value is 3600, or 1 hour.</p>"
+          "documentation" : "<p>Authorizer caching is not currently supported. Don't specify this value for authorizers.</p>"
         },
         "AuthorizerType" : {
           "shape" : "AuthorizerType",
           "locationName" : "authorizerType",
-          "documentation" : "<p>The authorizer type. Currently the only valid value is REQUEST, for a\n Lambda function using incoming request parameters.</p>"
+          "documentation" : "<p>The authorizer type. For WebSocket APIs, specify REQUEST for a Lambda function using incoming request parameters. For HTTP APIs, specify JWT to use JSON Web Tokens.</p>"
         },
         "AuthorizerUri" : {
           "shape" : "UriWithLengthBetween1And2048",
           "locationName" : "authorizerUri",
-          "documentation" : "<p>The authorizer's Uniform Resource Identifier (URI).\n ForREQUEST authorizers, this must be a\n well-formed Lambda function URI, for example,\n arn:aws:apigateway:us-west-2:lambda:path/2015-03-31/functions/arn:aws:lambda:us-west-2:{account_id}:function:{lambda_function_name}/invocations.\n In general, the URI has this form:\n arn:aws:apigateway:{region}:lambda:path/{service_api}\n , where {region} is the same as the region hosting the Lambda\n function, path indicates that the remaining substring in the URI should be treated as\n the path to the resource, including the initial /. For Lambda functions,\n this is usually of the form\n /2015-03-31/functions/[FunctionARN]/invocations.</p>"
+          "documentation" : "<p>The authorizer's Uniform Resource Identifier (URI). ForREQUEST authorizers, this must be a well-formed Lambda function URI, for example, arn:aws:apigateway:us-west-2:lambda:path/2015-03-31/functions/arn:aws:lambda:us-west-2:<replaceable>{account_id}</replaceable>:function:<replaceable>{lambda_function_name}</replaceable>/invocations. In general, the URI has this form: arn:aws:apigateway:<replaceable>{region}</replaceable>:lambda:path/<replaceable>{service_api}</replaceable>\n               , where <replaceable></replaceable>{region} is the same as the region hosting the Lambda function, path indicates that the remaining substring in the URI should be treated as the path to the resource, including the initial /. For Lambda functions, this is usually of the form /2015-03-31/functions/[FunctionARN]/invocations. Supported only for REQUEST authorizers.</p>"
         },
         "IdentitySource" : {
           "shape" : "IdentitySourceList",
           "locationName" : "identitySource",
-          "documentation" : "<p>The identity source for which authorization is requested.</p><p>For the REQUEST authorizer, this is required when authorization\n caching is enabled. The value is a comma-separated string of one or more mapping\n expressions of the specified request parameters. For example, if an Auth\n header and a Name query string parameters are defined as identity\n sources, this value is method.request.header.Auth,\n method.request.querystring.Name. These parameters will be used to\n derive the authorization caching key and to perform runtime validation of the\n REQUEST authorizer by verifying all of the identity-related request\n parameters are present, not null, and non-empty. Only when this is true does the\n authorizer invoke the authorizer Lambda function, otherwise, it returns a 401\n Unauthorized response without calling the Lambda function. The valid value\n is a string of comma-separated mapping expressions of the specified request\n parameters. When the authorization caching is not enabled, this property is\n optional.</p>"
+          "documentation" : "<p>The identity source for which authorization is requested.</p> <p>For a REQUEST authorizer, this is optional. The value is a set of one or more mapping expressions of the specified request parameters. Currently, the identity source can be headers, query string parameters, stage variables, and context parameters. For example, if an Auth header and a Name query string parameter are defined as identity sources, this value is route.request.header.Auth, route.request.querystring.Name. These parameters will be used to perform runtime validation for Lambda-based authorizers by verifying all of the identity-related request parameters are present in the request, not null, and non-empty. Only when this is true does the authorizer invoke the authorizer Lambda function. Otherwise, it returns a 401 Unauthorized response without calling the Lambda function.</p> <p>For JWT, a single entry that specifies where to extract the JSON Web Token (JWT) from inbound requests. Currently only header-based and query parameter-based selections are supported, for example \"$request.header.Authorization\".</p>"
         },
         "IdentityValidationExpression" : {
           "shape" : "StringWithLengthBetween0And1024",
           "locationName" : "identityValidationExpression",
-          "documentation" : "<p>The\n validation expression does not apply to the REQUEST authorizer.</p>"
+          "documentation" : "<p>The validation expression does not apply to the REQUEST authorizer.</p>"
+        },
+        "JwtConfiguration" : {
+          "shape" : "JWTConfiguration",
+          "locationName" : "jwtConfiguration",
+          "documentation" : "<p>Represents the configuration of a JWT authorizer. Required for the JWT authorizer type. Supported only for HTTP APIs.</p>"
         },
         "Name" : {
           "shape" : "StringWithLengthBetween1And128",
           "locationName" : "name",
           "documentation" : "<p>The name of the authorizer.</p>"
-        },
-        "ProviderArns" : {
-          "shape" : "ProviderArnList",
-          "locationName" : "providerArns",
-          "documentation" : "<p>For\n REQUEST authorizer, this is not\n defined.</p>"
         }
       }
     },
@@ -5835,7 +7020,7 @@
           "documentation" : "<p>The description for the deployment resource.</p>"
         }
       },
-      "documentation" : "<p>Represents the input parameters for an UpdateDeployment\n request.</p>"
+      "documentation" : "<p>Represents the input parameters for an UpdateDeployment request.</p>"
     },
     "UpdateDeploymentRequest" : {
       "type" : "structure",
@@ -5858,11 +7043,17 @@
           "documentation" : "<p>The description for the deployment resource.</p>"
         }
       },
+      "documentation" : "<p>Updates a Deployment.</p>",
       "required" : [ "ApiId", "DeploymentId" ]
     },
     "UpdateDeploymentResponse" : {
       "type" : "structure",
       "members" : {
+        "AutoDeployed" : {
+          "shape" : "__boolean",
+          "locationName" : "autoDeployed",
+          "documentation" : "<p>Specifies whether a deployment was automatically released.</p>"
+        },
         "CreatedDate" : {
           "shape" : "__timestampIso8601",
           "locationName" : "createdDate",
@@ -5876,7 +7067,7 @@
         "DeploymentStatus" : {
           "shape" : "DeploymentStatus",
           "locationName" : "deploymentStatus",
-          "documentation" : "<p>The status of the deployment: PENDING, FAILED, or\n SUCCEEDED.</p>"
+          "documentation" : "<p>The status of the deployment: PENDING, FAILED, or SUCCEEDED.</p>"
         },
         "DeploymentStatusMessage" : {
           "shape" : "__string",
@@ -5899,7 +7090,7 @@
           "documentation" : "<p>The domain name configurations.</p>"
         }
       },
-      "documentation" : "<p>Represents the input parameters for an UpdateDomainName\n request.</p>"
+      "documentation" : "<p>Represents the input parameters for an UpdateDomainName request.</p>"
     },
     "UpdateDomainNameRequest" : {
       "type" : "structure",
@@ -5916,6 +7107,7 @@
           "documentation" : "<p>The domain name configurations.</p>"
         }
       },
+      "documentation" : "<p>Updates a DomainName.</p>",
       "required" : [ "DomainName" ]
     },
     "UpdateDomainNameResponse" : {
@@ -5939,7 +7131,7 @@
         "Tags" : {
           "shape" : "Tags",
           "locationName" : "tags",
-          "documentation" : "<p>The key-value map of strings. The valid character set is [a-zA-Z+-=._:/]. The tag key can be up to 128 characters and must not start with aws:. The tag value can be up to 256 characters..</p>"
+          "documentation" : "<p>The collection of tags associated with a domain name.</p>"
         }
       }
     },
@@ -5949,22 +7141,22 @@
         "ConnectionId" : {
           "shape" : "StringWithLengthBetween1And1024",
           "locationName" : "connectionId",
-          "documentation" : "<p>The connection ID.</p>"
+          "documentation" : "<p>The ID of the VPC link for a private integration. Supported only for HTTP APIs.</p>"
         },
         "ConnectionType" : {
           "shape" : "ConnectionType",
           "locationName" : "connectionType",
-          "documentation" : "<p>The type of the network connection to the integration endpoint. Currently the only\n valid value is INTERNET, for connections through the public routable\n internet.</p>"
+          "documentation" : "<p>The type of the network connection to the integration endpoint. Specify INTERNET for connections through the public routable internet or VPC_LINK for private connections between API Gateway and resources in a VPC. The default value is INTERNET.</p>"
         },
         "ContentHandlingStrategy" : {
           "shape" : "ContentHandlingStrategy",
           "locationName" : "contentHandlingStrategy",
-          "documentation" : "<p>Specifies how to handle response payload content type conversions. Supported\n values are CONVERT_TO_BINARY and CONVERT_TO_TEXT, with the\n following behaviors:</p><p>\n CONVERT_TO_BINARY: Converts a response payload from a Base64-encoded\n string to the corresponding binary blob.</p><p>\n CONVERT_TO_TEXT: Converts a response payload from a binary blob to a\n Base64-encoded string.</p><p>If this property is not defined, the response payload will be passed through from\n the integration response to the route response or method response without\n modification.</p>"
+          "documentation" : "<p>Supported only for WebSocket APIs. Specifies how to handle response payload content type conversions. Supported values are CONVERT_TO_BINARY and CONVERT_TO_TEXT, with the following behaviors:</p> <p>CONVERT_TO_BINARY: Converts a response payload from a Base64-encoded string to the corresponding binary blob.</p> <p>CONVERT_TO_TEXT: Converts a response payload from a binary blob to a Base64-encoded string.</p> <p>If this property is not defined, the response payload will be passed through from the integration response to the route response or method response without modification.</p>"
         },
         "CredentialsArn" : {
           "shape" : "Arn",
           "locationName" : "credentialsArn",
-          "documentation" : "<p>Specifies the credentials required for the integration, if any. For AWS\n integrations, three options are available. To specify an IAM Role for API Gateway to\n assume, use the role's Amazon Resource Name (ARN). To require that the caller's\n identity be passed through from the request, specify the string\n arn:aws:iam::*:user/*. To use resource-based permissions on supported\n AWS services, specify null.</p>"
+          "documentation" : "<p>Specifies the credentials required for the integration, if any. For AWS integrations, three options are available. To specify an IAM Role for API Gateway to assume, use the role's Amazon Resource Name (ARN). To require that the caller's identity be passed through from the request, specify the string arn:aws:iam::*:user/*. To use resource-based permissions on supported AWS services, specify null.</p>"
         },
         "Description" : {
           "shape" : "StringWithLengthBetween0And1024",
@@ -5979,27 +7171,32 @@
         "IntegrationType" : {
           "shape" : "IntegrationType",
           "locationName" : "integrationType",
-          "documentation" : "<p>The integration type of an integration. One of the following:</p><p>\n AWS: for integrating the route or method request with an AWS service\n action, including the Lambda function-invoking action. With the Lambda\n function-invoking action, this is referred to as the Lambda custom integration. With\n any other AWS service action, this is known as AWS integration.</p><p>\n AWS_PROXY: for integrating the route or method request with the Lambda\n function-invoking action with the client request passed through as-is. This\n integration is also referred to as Lambda proxy integration.</p><p>\n HTTP: for integrating the route or method request with an HTTP\n endpoint. This\n integration is also referred to as the HTTP custom integration.</p><p>\n HTTP_PROXY: for integrating route or method request with an HTTP\n endpoint, with the client\n request passed through as-is. This is also referred to as HTTP proxy\n integration.</p><p>\n MOCK: for integrating the route or method request with API Gateway as a\n \"loopback\" endpoint without invoking any backend.</p>"
+          "documentation" : "<p>The integration type of an integration. One of the following:</p> <p>AWS: for integrating the route or method request with an AWS service action, including the Lambda function-invoking action. With the Lambda function-invoking action, this is referred to as the Lambda custom integration. With any other AWS service action, this is known as AWS integration. Supported only for WebSocket APIs.</p> <p>AWS_PROXY: for integrating the route or method request with the Lambda function-invoking action with the client request passed through as-is. This integration is also referred to as Lambda proxy integration.</p> <p>HTTP: for integrating the route or method request with an HTTP endpoint. This integration is also referred to as the HTTP custom integration. Supported only for WebSocket APIs.</p> <p>HTTP_PROXY: for integrating the route or method request with an HTTP endpoint, with the client request passed through as-is. This is also referred to as HTTP proxy integration. For HTTP API private integrations, use an HTTP_PROXY integration.</p> <p>MOCK: for integrating the route or method request with API Gateway as a \"loopback\" endpoint without invoking any backend. Supported only for WebSocket APIs.</p>"
         },
         "IntegrationUri" : {
           "shape" : "UriWithLengthBetween1And2048",
           "locationName" : "integrationUri",
-          "documentation" : "<p>For a Lambda proxy integration, this is the URI of the Lambda function.</p>"
+          "documentation" : "<p>For a Lambda integration, specify the URI of a Lambda function.</p> <p>For an HTTP integration, specify a fully-qualified URL.</p> <p>For an HTTP API private integration, specify the ARN of an Application Load Balancer listener, Network Load Balancer listener, or AWS Cloud Map service. If you specify the ARN of an AWS Cloud Map service, API Gateway uses DiscoverInstances to identify resources. You can use query parameters to target specific resources. To learn more, see <a href=\"https://alpha-docs-aws.amazon.com/cloud-map/latest/api/API_DiscoverInstances.html\">DiscoverInstances</a>. For private integrations, all resources must be owned by the same AWS account.</p>"
         },
         "PassthroughBehavior" : {
           "shape" : "PassthroughBehavior",
           "locationName" : "passthroughBehavior",
-          "documentation" : "<p>Specifies the pass-through behavior for incoming requests based on the\n Content-Type header in the request, and the available mapping\n templates specified as the requestTemplates property on the\n Integration resource. There are three valid values:\n WHEN_NO_MATCH, WHEN_NO_TEMPLATES, and\n NEVER.</p><p>\n WHEN_NO_MATCH passes the request body for unmapped content types through\n to the integration backend without transformation.</p><p>\n NEVER rejects unmapped content types with an HTTP 415 Unsupported\n Media Type response.</p><p>\n WHEN_NO_TEMPLATES allows pass-through when the integration has no\n content types mapped to templates. However, if there is at least one content type\n defined, unmapped content types will be rejected with the same HTTP 415\n Unsupported Media Type response.</p>"
+          "documentation" : "<p>Specifies the pass-through behavior for incoming requests based on the Content-Type header in the request, and the available mapping templates specified as the requestTemplates property on the Integration resource. There are three valid values: WHEN_NO_MATCH, WHEN_NO_TEMPLATES, and NEVER. Supported only for WebSocket APIs.</p> <p>WHEN_NO_MATCH passes the request body for unmapped content types through to the integration backend without transformation.</p> <p>NEVER rejects unmapped content types with an HTTP 415 Unsupported Media Type response.</p> <p>WHEN_NO_TEMPLATES allows pass-through when the integration has no content types mapped to templates. However, if there is at least one content type defined, unmapped content types will be rejected with the same HTTP 415 Unsupported Media Type response.</p>"
+        },
+        "PayloadFormatVersion" : {
+          "shape" : "StringWithLengthBetween1And64",
+          "locationName" : "payloadFormatVersion",
+          "documentation" : "<p>Specifies the format of the payload sent to an integration. Required for HTTP APIs.</p>"
         },
         "RequestParameters" : {
           "shape" : "IntegrationParameters",
           "locationName" : "requestParameters",
-          "documentation" : "<p>A key-value map specifying request parameters that are passed from the method\n request to the backend. The key is an integration request parameter name and the\n associated value is a method request parameter value or static value that must be\n enclosed within single quotes and pre-encoded as required by the backend. The method\n request parameter value must match the pattern of\n method.request.{location}.{name}\n , where \n {location}\n  is querystring, path, or header; and \n {name}\n  must be a valid and unique method request parameter name.</p>"
+          "documentation" : "<p>A key-value map specifying request parameters that are passed from the method request to the backend. The key is an integration request parameter name and the associated value is a method request parameter value or static value that must be enclosed within single quotes and pre-encoded as required by the backend. The method request parameter value must match the pattern of method.request.<replaceable>{location}</replaceable>.<replaceable>{name}</replaceable>\n               , where \n                  <replaceable>{location}</replaceable>\n                is querystring, path, or header; and \n                  <replaceable>{name}</replaceable>\n                must be a valid and unique method request parameter name. Supported only for WebSocket APIs.</p>"
         },
         "RequestTemplates" : {
           "shape" : "TemplateMap",
           "locationName" : "requestTemplates",
-          "documentation" : "<p>Represents a map of Velocity templates that are applied on the request payload\n based on the value of the Content-Type header sent by the client. The content type\n value is the key in this map, and the template (as a String) is the value.</p>"
+          "documentation" : "<p>Represents a map of Velocity templates that are applied on the request payload based on the value of the Content-Type header sent by the client. The content type value is the key in this map, and the template (as a String) is the value. Supported only for WebSocket APIs.</p>"
         },
         "TemplateSelectionExpression" : {
           "shape" : "SelectionExpression",
@@ -6007,12 +7204,17 @@
           "documentation" : "<p>The template selection expression for the integration.</p>"
         },
         "TimeoutInMillis" : {
-          "shape" : "IntegerWithLengthBetween50And29000",
+          "shape" : "IntegerWithLengthBetween50And30000",
           "locationName" : "timeoutInMillis",
-          "documentation" : "<p>Custom timeout between 50 and 29,000 milliseconds. The default value is 29,000\n milliseconds or 29 seconds.</p>"
+          "documentation" : "<p>Custom timeout between 50 and 29,000 milliseconds for WebSocket APIs and between 50 and 30,000 milliseconds for HTTP APIs. The default timeout is 29 seconds for WebSocket APIs and 30 seconds for HTTP APIs.</p>"
+        },
+        "TlsConfig" : {
+          "shape" : "TlsConfigInput",
+          "locationName" : "tlsConfig",
+          "documentation" : "<p>The TLS configuration for a private integration. If you specify a TLS configuration, private integration traffic uses the HTTPS protocol. Supported only for HTTP APIs.</p>"
         }
       },
-      "documentation" : "<p>Represents the input parameters for an UpdateIntegration\n request.</p>"
+      "documentation" : "<p>Represents the input parameters for an UpdateIntegration request.</p>"
     },
     "UpdateIntegrationRequest" : {
       "type" : "structure",
@@ -6026,22 +7228,22 @@
         "ConnectionId" : {
           "shape" : "StringWithLengthBetween1And1024",
           "locationName" : "connectionId",
-          "documentation" : "<p>The connection ID.</p>"
+          "documentation" : "<p>The ID of the VPC link for a private integration. Supported only for HTTP APIs.</p>"
         },
         "ConnectionType" : {
           "shape" : "ConnectionType",
           "locationName" : "connectionType",
-          "documentation" : "<p>The type of the network connection to the integration endpoint. Currently the only\n valid value is INTERNET, for connections through the public routable\n internet.</p>"
+          "documentation" : "<p>The type of the network connection to the integration endpoint. Specify INTERNET for connections through the public routable internet or VPC_LINK for private connections between API Gateway and resources in a VPC. The default value is INTERNET.</p>"
         },
         "ContentHandlingStrategy" : {
           "shape" : "ContentHandlingStrategy",
           "locationName" : "contentHandlingStrategy",
-          "documentation" : "<p>Specifies how to handle response payload content type conversions. Supported\n values are CONVERT_TO_BINARY and CONVERT_TO_TEXT, with the\n following behaviors:</p><p>\n CONVERT_TO_BINARY: Converts a response payload from a Base64-encoded\n string to the corresponding binary blob.</p><p>\n CONVERT_TO_TEXT: Converts a response payload from a binary blob to a\n Base64-encoded string.</p><p>If this property is not defined, the response payload will be passed through from\n the integration response to the route response or method response without\n modification.</p>"
+          "documentation" : "<p>Supported only for WebSocket APIs. Specifies how to handle response payload content type conversions. Supported values are CONVERT_TO_BINARY and CONVERT_TO_TEXT, with the following behaviors:</p> <p>CONVERT_TO_BINARY: Converts a response payload from a Base64-encoded string to the corresponding binary blob.</p> <p>CONVERT_TO_TEXT: Converts a response payload from a binary blob to a Base64-encoded string.</p> <p>If this property is not defined, the response payload will be passed through from the integration response to the route response or method response without modification.</p>"
         },
         "CredentialsArn" : {
           "shape" : "Arn",
           "locationName" : "credentialsArn",
-          "documentation" : "<p>Specifies the credentials required for the integration, if any. For AWS\n integrations, three options are available. To specify an IAM Role for API Gateway to\n assume, use the role's Amazon Resource Name (ARN). To require that the caller's\n identity be passed through from the request, specify the string\n arn:aws:iam::*:user/*. To use resource-based permissions on supported\n AWS services, specify null.</p>"
+          "documentation" : "<p>Specifies the credentials required for the integration, if any. For AWS integrations, three options are available. To specify an IAM Role for API Gateway to assume, use the role's Amazon Resource Name (ARN). To require that the caller's identity be passed through from the request, specify the string arn:aws:iam::*:user/*. To use resource-based permissions on supported AWS services, specify null.</p>"
         },
         "Description" : {
           "shape" : "StringWithLengthBetween0And1024",
@@ -6062,27 +7264,32 @@
         "IntegrationType" : {
           "shape" : "IntegrationType",
           "locationName" : "integrationType",
-          "documentation" : "<p>The integration type of an integration. One of the following:</p><p>\n AWS: for integrating the route or method request with an AWS service\n action, including the Lambda function-invoking action. With the Lambda\n function-invoking action, this is referred to as the Lambda custom integration. With\n any other AWS service action, this is known as AWS integration.</p><p>\n AWS_PROXY: for integrating the route or method request with the Lambda\n function-invoking action with the client request passed through as-is. This\n integration is also referred to as Lambda proxy integration.</p><p>\n HTTP: for integrating the route or method request with an HTTP\n endpoint. This\n integration is also referred to as the HTTP custom integration.</p><p>\n HTTP_PROXY: for integrating route or method request with an HTTP\n endpoint, with the client\n request passed through as-is. This is also referred to as HTTP proxy\n integration.</p><p>\n MOCK: for integrating the route or method request with API Gateway as a\n \"loopback\" endpoint without invoking any backend.</p>"
+          "documentation" : "<p>The integration type of an integration. One of the following:</p> <p>AWS: for integrating the route or method request with an AWS service action, including the Lambda function-invoking action. With the Lambda function-invoking action, this is referred to as the Lambda custom integration. With any other AWS service action, this is known as AWS integration. Supported only for WebSocket APIs.</p> <p>AWS_PROXY: for integrating the route or method request with the Lambda function-invoking action with the client request passed through as-is. This integration is also referred to as Lambda proxy integration.</p> <p>HTTP: for integrating the route or method request with an HTTP endpoint. This integration is also referred to as the HTTP custom integration. Supported only for WebSocket APIs.</p> <p>HTTP_PROXY: for integrating the route or method request with an HTTP endpoint, with the client request passed through as-is. This is also referred to as HTTP proxy integration. For HTTP API private integrations, use an HTTP_PROXY integration.</p> <p>MOCK: for integrating the route or method request with API Gateway as a \"loopback\" endpoint without invoking any backend. Supported only for WebSocket APIs.</p>"
         },
         "IntegrationUri" : {
           "shape" : "UriWithLengthBetween1And2048",
           "locationName" : "integrationUri",
-          "documentation" : "<p>For a Lambda proxy integration, this is the URI of the Lambda function.</p>"
+          "documentation" : "<p>For a Lambda integration, specify the URI of a Lambda function.</p> <p>For an HTTP integration, specify a fully-qualified URL.</p> <p>For an HTTP API private integration, specify the ARN of an Application Load Balancer listener, Network Load Balancer listener, or AWS Cloud Map service. If you specify the ARN of an AWS Cloud Map service, API Gateway uses DiscoverInstances to identify resources. You can use query parameters to target specific resources. To learn more, see <a href=\"https://alpha-docs-aws.amazon.com/cloud-map/latest/api/API_DiscoverInstances.html\">DiscoverInstances</a>. For private integrations, all resources must be owned by the same AWS account.</p>"
         },
         "PassthroughBehavior" : {
           "shape" : "PassthroughBehavior",
           "locationName" : "passthroughBehavior",
-          "documentation" : "<p>Specifies the pass-through behavior for incoming requests based on the\n Content-Type header in the request, and the available mapping\n templates specified as the requestTemplates property on the\n Integration resource. There are three valid values:\n WHEN_NO_MATCH, WHEN_NO_TEMPLATES, and\n NEVER.</p><p>\n WHEN_NO_MATCH passes the request body for unmapped content types through\n to the integration backend without transformation.</p><p>\n NEVER rejects unmapped content types with an HTTP 415 Unsupported\n Media Type response.</p><p>\n WHEN_NO_TEMPLATES allows pass-through when the integration has no\n content types mapped to templates. However, if there is at least one content type\n defined, unmapped content types will be rejected with the same HTTP 415\n Unsupported Media Type response.</p>"
+          "documentation" : "<p>Specifies the pass-through behavior for incoming requests based on the Content-Type header in the request, and the available mapping templates specified as the requestTemplates property on the Integration resource. There are three valid values: WHEN_NO_MATCH, WHEN_NO_TEMPLATES, and NEVER. Supported only for WebSocket APIs.</p> <p>WHEN_NO_MATCH passes the request body for unmapped content types through to the integration backend without transformation.</p> <p>NEVER rejects unmapped content types with an HTTP 415 Unsupported Media Type response.</p> <p>WHEN_NO_TEMPLATES allows pass-through when the integration has no content types mapped to templates. However, if there is at least one content type defined, unmapped content types will be rejected with the same HTTP 415 Unsupported Media Type response.</p>"
+        },
+        "PayloadFormatVersion" : {
+          "shape" : "StringWithLengthBetween1And64",
+          "locationName" : "payloadFormatVersion",
+          "documentation" : "<p>Specifies the format of the payload sent to an integration. Required for HTTP APIs.</p>"
         },
         "RequestParameters" : {
           "shape" : "IntegrationParameters",
           "locationName" : "requestParameters",
-          "documentation" : "<p>A key-value map specifying request parameters that are passed from the method\n request to the backend. The key is an integration request parameter name and the\n associated value is a method request parameter value or static value that must be\n enclosed within single quotes and pre-encoded as required by the backend. The method\n request parameter value must match the pattern of\n method.request.{location}.{name}\n , where \n {location}\n  is querystring, path, or header; and \n {name}\n  must be a valid and unique method request parameter name.</p>"
+          "documentation" : "<p>A key-value map specifying request parameters that are passed from the method request to the backend. The key is an integration request parameter name and the associated value is a method request parameter value or static value that must be enclosed within single quotes and pre-encoded as required by the backend. The method request parameter value must match the pattern of method.request.<replaceable>{location}</replaceable>.<replaceable>{name}</replaceable>\n               , where \n                  <replaceable>{location}</replaceable>\n                is querystring, path, or header; and \n                  <replaceable>{name}</replaceable>\n                must be a valid and unique method request parameter name. Supported only for WebSocket APIs.</p>"
         },
         "RequestTemplates" : {
           "shape" : "TemplateMap",
           "locationName" : "requestTemplates",
-          "documentation" : "<p>Represents a map of Velocity templates that are applied on the request payload\n based on the value of the Content-Type header sent by the client. The content type\n value is the key in this map, and the template (as a String) is the value.</p>"
+          "documentation" : "<p>Represents a map of Velocity templates that are applied on the request payload based on the value of the Content-Type header sent by the client. The content type value is the key in this map, and the template (as a String) is the value. Supported only for WebSocket APIs.</p>"
         },
         "TemplateSelectionExpression" : {
           "shape" : "SelectionExpression",
@@ -6090,35 +7297,46 @@
           "documentation" : "<p>The template selection expression for the integration.</p>"
         },
         "TimeoutInMillis" : {
-          "shape" : "IntegerWithLengthBetween50And29000",
+          "shape" : "IntegerWithLengthBetween50And30000",
           "locationName" : "timeoutInMillis",
-          "documentation" : "<p>Custom timeout between 50 and 29,000 milliseconds. The default value is 29,000\n milliseconds or 29 seconds.</p>"
+          "documentation" : "<p>Custom timeout between 50 and 29,000 milliseconds for WebSocket APIs and between 50 and 30,000 milliseconds for HTTP APIs. The default timeout is 29 seconds for WebSocket APIs and 30 seconds for HTTP APIs.</p>"
+        },
+        "TlsConfig" : {
+          "shape" : "TlsConfigInput",
+          "locationName" : "tlsConfig",
+          "documentation" : "<p>The TLS configuration for a private integration. If you specify a TLS configuration, private integration traffic uses the HTTPS protocol. Supported only for HTTP APIs.</p>"
         }
       },
+      "documentation" : "<p>Updates an Integration.</p>",
       "required" : [ "ApiId", "IntegrationId" ]
     },
-    "UpdateIntegrationResponse" : {
+    "UpdateIntegrationResult" : {
       "type" : "structure",
       "members" : {
+        "ApiGatewayManaged" : {
+          "shape" : "__boolean",
+          "locationName" : "apiGatewayManaged",
+          "documentation" : "<p>Specifies whether an integration is managed by API Gateway. If you created an API using using quick create, the resulting integration is managed by API Gateway. You can update a managed integration, but you can't delete it.</p>"
+        },
         "ConnectionId" : {
           "shape" : "StringWithLengthBetween1And1024",
           "locationName" : "connectionId",
-          "documentation" : "<p>The connection ID.</p>"
+          "documentation" : "<p>The ID of the VPC link for a private integration. Supported only for HTTP APIs.</p>"
         },
         "ConnectionType" : {
           "shape" : "ConnectionType",
           "locationName" : "connectionType",
-          "documentation" : "<p>The type of the network connection to the integration endpoint. Currently the only\n valid value is INTERNET, for connections through the public routable\n internet.</p>"
+          "documentation" : "<p>The type of the network connection to the integration endpoint. Specify INTERNET for connections through the public routable internet or VPC_LINK for private connections between API Gateway and resources in a VPC. The default value is INTERNET.</p>"
         },
         "ContentHandlingStrategy" : {
           "shape" : "ContentHandlingStrategy",
           "locationName" : "contentHandlingStrategy",
-          "documentation" : "<p>Specifies how to handle response payload content type conversions. Supported\n values are CONVERT_TO_BINARY and CONVERT_TO_TEXT, with the\n following behaviors:</p><p>\n CONVERT_TO_BINARY: Converts a response payload from a Base64-encoded\n string to the corresponding binary blob.</p><p>\n CONVERT_TO_TEXT: Converts a response payload from a binary blob to a\n Base64-encoded string.</p><p>If this property is not defined, the response payload will be passed through from\n the integration response to the route response or method response without\n modification.</p>"
+          "documentation" : "<p>Supported only for WebSocket APIs. Specifies how to handle response payload content type conversions. Supported values are CONVERT_TO_BINARY and CONVERT_TO_TEXT, with the following behaviors:</p> <p>CONVERT_TO_BINARY: Converts a response payload from a Base64-encoded string to the corresponding binary blob.</p> <p>CONVERT_TO_TEXT: Converts a response payload from a binary blob to a Base64-encoded string.</p> <p>If this property is not defined, the response payload will be passed through from the integration response to the route response or method response without modification.</p>"
         },
         "CredentialsArn" : {
           "shape" : "Arn",
           "locationName" : "credentialsArn",
-          "documentation" : "<p>Specifies the credentials required for the integration, if any. For AWS\n integrations, three options are available. To specify an IAM Role for API Gateway to\n assume, use the role's Amazon Resource Name (ARN). To require that the caller's\n identity be passed through from the request, specify the string\n arn:aws:iam::*:user/*. To use resource-based permissions on supported\n AWS services, specify null.</p>"
+          "documentation" : "<p>Specifies the credentials required for the integration, if any. For AWS integrations, three options are available. To specify an IAM Role for API Gateway to assume, use the role's Amazon Resource Name (ARN). To require that the caller's identity be passed through from the request, specify the string arn:aws:iam::*:user/*. To use resource-based permissions on supported AWS services, specify null.</p>"
         },
         "Description" : {
           "shape" : "StringWithLengthBetween0And1024",
@@ -6138,42 +7356,52 @@
         "IntegrationResponseSelectionExpression" : {
           "shape" : "SelectionExpression",
           "locationName" : "integrationResponseSelectionExpression",
-          "documentation" : "<p>The integration response selection expression for the integration. See <a href=\"https://docs.aws.amazon.com/apigateway/latest/developerguide/apigateway-websocket-api-selection-expressions.html#apigateway-websocket-api-integration-response-selection-expressions\">Integration Response Selection Expressions</a>.</p>"
+          "documentation" : "<p>The integration response selection expression for the integration. Supported only for WebSocket APIs. See <a href=\"https://docs.aws.amazon.com/apigateway/latest/developerguide/apigateway-websocket-api-selection-expressions.html#apigateway-websocket-api-integration-response-selection-expressions\">Integration Response Selection Expressions</a>.</p>"
         },
         "IntegrationType" : {
           "shape" : "IntegrationType",
           "locationName" : "integrationType",
-          "documentation" : "<p>The integration type of an integration. One of the following:</p><p>\n AWS: for integrating the route or method request with an AWS service\n action, including the Lambda function-invoking action. With the Lambda\n function-invoking action, this is referred to as the Lambda custom integration. With\n any other AWS service action, this is known as AWS integration.</p><p>\n AWS_PROXY: for integrating the route or method request with the Lambda\n function-invoking action with the client request passed through as-is. This\n integration is also referred to as Lambda proxy integration.</p><p>\n HTTP: for integrating the route or method request with an HTTP\n endpoint. This\n integration is also referred to as the HTTP custom integration.</p><p>\n HTTP_PROXY: for integrating route or method request with an HTTP\n endpoint, with the client\n request passed through as-is. This is also referred to as HTTP proxy\n integration.</p><p>\n MOCK: for integrating the route or method request with API Gateway as a\n \"loopback\" endpoint without invoking any backend.</p>"
+          "documentation" : "<p>The integration type of an integration. One of the following:</p> <p>AWS: for integrating the route or method request with an AWS service action, including the Lambda function-invoking action. With the Lambda function-invoking action, this is referred to as the Lambda custom integration. With any other AWS service action, this is known as AWS integration. Supported only for WebSocket APIs.</p> <p>AWS_PROXY: for integrating the route or method request with the Lambda function-invoking action with the client request passed through as-is. This integration is also referred to as Lambda proxy integration.</p> <p>HTTP: for integrating the route or method request with an HTTP endpoint. This integration is also referred to as the HTTP custom integration. Supported only for WebSocket APIs.</p> <p>HTTP_PROXY: for integrating the route or method request with an HTTP endpoint, with the client request passed through as-is. This is also referred to as HTTP proxy integration.</p> <p>MOCK: for integrating the route or method request with API Gateway as a \"loopback\" endpoint without invoking any backend. Supported only for WebSocket APIs.</p>"
         },
         "IntegrationUri" : {
           "shape" : "UriWithLengthBetween1And2048",
           "locationName" : "integrationUri",
-          "documentation" : "<p>For a Lambda proxy integration, this is the URI of the Lambda function.</p>"
+          "documentation" : "<p>For a Lambda integration, specify the URI of a Lambda function.</p> <p>For an HTTP integration, specify a fully-qualified URL.</p> <p>For an HTTP API private integration, specify the ARN of an Application Load Balancer listener, Network Load Balancer listener, or AWS Cloud Map service. If you specify the ARN of an AWS Cloud Map service, API Gateway uses DiscoverInstances to identify resources. You can use query parameters to target specific resources. To learn more, see <a href=\"https://alpha-docs-aws.amazon.com/cloud-map/latest/api/API_DiscoverInstances.html\">DiscoverInstances</a>. For private integrations, all resources must be owned by the same AWS account.</p>"
         },
         "PassthroughBehavior" : {
           "shape" : "PassthroughBehavior",
           "locationName" : "passthroughBehavior",
-          "documentation" : "<p>Specifies the pass-through behavior for incoming requests based on the\n Content-Type header in the request, and the available mapping\n templates specified as the requestTemplates property on the\n Integration resource. There are three valid values:\n WHEN_NO_MATCH, WHEN_NO_TEMPLATES, and\n NEVER.</p><p>\n WHEN_NO_MATCH passes the request body for unmapped content types through\n to the integration backend without transformation.</p><p>\n NEVER rejects unmapped content types with an HTTP 415 Unsupported\n Media Type response.</p><p>\n WHEN_NO_TEMPLATES allows pass-through when the integration has no\n content types mapped to templates. However, if there is at least one content type\n defined, unmapped content types will be rejected with the same HTTP 415\n Unsupported Media Type response.</p>"
+          "documentation" : "<p>Specifies the pass-through behavior for incoming requests based on the Content-Type header in the request, and the available mapping templates specified as the requestTemplates property on the Integration resource. There are three valid values: WHEN_NO_MATCH, WHEN_NO_TEMPLATES, and NEVER. Supported only for WebSocket APIs.</p> <p>WHEN_NO_MATCH passes the request body for unmapped content types through to the integration backend without transformation.</p> <p>NEVER rejects unmapped content types with an HTTP 415 Unsupported Media Type response.</p> <p>WHEN_NO_TEMPLATES allows pass-through when the integration has no content types mapped to templates. However, if there is at least one content type defined, unmapped content types will be rejected with the same HTTP 415 Unsupported Media Type response.</p>"
+        },
+        "PayloadFormatVersion" : {
+          "shape" : "StringWithLengthBetween1And64",
+          "locationName" : "payloadFormatVersion",
+          "documentation" : "<p>Specifies the format of the payload sent to an integration. Required for HTTP APIs.</p>"
         },
         "RequestParameters" : {
           "shape" : "IntegrationParameters",
           "locationName" : "requestParameters",
-          "documentation" : "<p>A key-value map specifying request parameters that are passed from the method\n request to the backend. The key is an integration request parameter name and the\n associated value is a method request parameter value or static value that must be\n enclosed within single quotes and pre-encoded as required by the backend. The method\n request parameter value must match the pattern of\n method.request.{location}.{name}\n , where \n {location}\n  is querystring, path, or header; and \n {name}\n  must be a valid and unique method request parameter name.</p>"
+          "documentation" : "<p>A key-value map specifying request parameters that are passed from the method request to the backend. The key is an integration request parameter name and the associated value is a method request parameter value or static value that must be enclosed within single quotes and pre-encoded as required by the backend. The method request parameter value must match the pattern of method.request.<replaceable>{location}</replaceable>.<replaceable>{name}</replaceable>\n               , where \n                  <replaceable>{location}</replaceable>\n                is querystring, path, or header; and \n                  <replaceable>{name}</replaceable>\n                must be a valid and unique method request parameter name. Supported only for WebSocket APIs.</p>"
         },
         "RequestTemplates" : {
           "shape" : "TemplateMap",
           "locationName" : "requestTemplates",
-          "documentation" : "<p>Represents a map of Velocity templates that are applied on the request payload\n based on the value of the Content-Type header sent by the client. The content type\n value is the key in this map, and the template (as a String) is the value.</p>"
+          "documentation" : "<p>Represents a map of Velocity templates that are applied on the request payload based on the value of the Content-Type header sent by the client. The content type value is the key in this map, and the template (as a String) is the value. Supported only for WebSocket APIs.</p>"
         },
         "TemplateSelectionExpression" : {
           "shape" : "SelectionExpression",
           "locationName" : "templateSelectionExpression",
-          "documentation" : "<p>The template selection expression for the integration.</p>"
+          "documentation" : "<p>The template selection expression for the integration. Supported only for WebSocket APIs.</p>"
         },
         "TimeoutInMillis" : {
-          "shape" : "IntegerWithLengthBetween50And29000",
+          "shape" : "IntegerWithLengthBetween50And30000",
           "locationName" : "timeoutInMillis",
-          "documentation" : "<p>Custom timeout between 50 and 29,000 milliseconds. The default value is 29,000\n milliseconds or 29 seconds.</p>"
+          "documentation" : "<p>Custom timeout between 50 and 29,000 milliseconds for WebSocket APIs and between 50 and 30,000 milliseconds for HTTP APIs. The default timeout is 29 seconds for WebSocket APIs and 30 seconds for HTTP APIs.</p>"
+        },
+        "TlsConfig" : {
+          "shape" : "TlsConfig",
+          "locationName" : "tlsConfig",
+          "documentation" : "<p>The TLS configuration for a private integration. If you specify a TLS configuration, private integration traffic uses the HTTPS protocol. Supported only for HTTP APIs.</p>"
         }
       }
     },
@@ -6183,7 +7411,7 @@
         "ContentHandlingStrategy" : {
           "shape" : "ContentHandlingStrategy",
           "locationName" : "contentHandlingStrategy",
-          "documentation" : "<p>Specifies how to handle response payload content type conversions. Supported\n values are CONVERT_TO_BINARY and CONVERT_TO_TEXT, with the\n following behaviors:</p><p>\n CONVERT_TO_BINARY: Converts a response payload from a Base64-encoded\n string to the corresponding binary blob.</p><p>\n CONVERT_TO_TEXT: Converts a response payload from a binary blob to a\n Base64-encoded string.</p><p>If this property is not defined, the response payload will be passed through from\n the integration response to the route response or method response without\n modification.</p>"
+          "documentation" : "<p>Supported only for WebSocket APIs. Specifies how to handle response payload content type conversions. Supported values are CONVERT_TO_BINARY and CONVERT_TO_TEXT, with the following behaviors:</p> <p>CONVERT_TO_BINARY: Converts a response payload from a Base64-encoded string to the corresponding binary blob.</p> <p>CONVERT_TO_TEXT: Converts a response payload from a binary blob to a Base64-encoded string.</p> <p>If this property is not defined, the response payload will be passed through from the integration response to the route response or method response without modification.</p>"
         },
         "IntegrationResponseKey" : {
           "shape" : "SelectionKey",
@@ -6193,20 +7421,20 @@
         "ResponseParameters" : {
           "shape" : "IntegrationParameters",
           "locationName" : "responseParameters",
-          "documentation" : "<p>A key-value map specifying response parameters that are passed to the method\n response from the backend. The key is a method response header parameter name and the\n mapped value is an integration response header value, a static value enclosed within\n a pair of single quotes, or a JSON expression from the integration response body. The\n mapping key must match the pattern of\n method.response.header.{name}\n , where name is a valid and unique header name. The mapped non-static value\n must match the pattern of\n integration.response.header.{name}\n  or\n integration.response.body.{JSON-expression}\n , where \n {name}\n  is a valid and unique response header name and \n {JSON-expression}\n  is a valid JSON expression without the $ prefix.</p>"
+          "documentation" : "<p>A key-value map specifying response parameters that are passed to the method response from the backend. The key is a method response header parameter name and the mapped value is an integration response header value, a static value enclosed within a pair of single quotes, or a JSON expression from the integration response body. The mapping key must match the pattern of method.response.header.<replaceable>{name}</replaceable>\n               , where name is a valid and unique header name. The mapped non-static value must match the pattern of integration.response.header.<replaceable>{name}</replaceable>\n                or integration.response.body.<replaceable>{JSON-expression}</replaceable>\n               , where \n                  <replaceable>{name}</replaceable>\n                is a valid and unique response header name and \n                  <replaceable>{JSON-expression}</replaceable>\n                is a valid JSON expression without the $ prefix.</p>"
         },
         "ResponseTemplates" : {
           "shape" : "TemplateMap",
           "locationName" : "responseTemplates",
-          "documentation" : "<p>The collection of response templates for the integration response as a\n string-to-string map of key-value pairs. Response templates are represented as a\n key/value map, with a content-type as the key and a template as the value.</p>"
+          "documentation" : "<p>The collection of response templates for the integration response as a string-to-string map of key-value pairs. Response templates are represented as a key/value map, with a content-type as the key and a template as the value.</p>"
         },
         "TemplateSelectionExpression" : {
           "shape" : "SelectionExpression",
           "locationName" : "templateSelectionExpression",
-          "documentation" : "<p>The template selection expression for the integration response.</p>"
+          "documentation" : "<p>The template selection expression for the integration response. Supported only for WebSocket APIs.</p>"
         }
       },
-      "documentation" : "<p>Represents the input parameters for an UpdateIntegrationResponse\n request.</p>"
+      "documentation" : "<p>Represents the input parameters for an UpdateIntegrationResponse request.</p>"
     },
     "UpdateIntegrationResponseRequest" : {
       "type" : "structure",
@@ -6220,7 +7448,7 @@
         "ContentHandlingStrategy" : {
           "shape" : "ContentHandlingStrategy",
           "locationName" : "contentHandlingStrategy",
-          "documentation" : "<p>Specifies how to handle response payload content type conversions. Supported\n values are CONVERT_TO_BINARY and CONVERT_TO_TEXT, with the\n following behaviors:</p><p>\n CONVERT_TO_BINARY: Converts a response payload from a Base64-encoded\n string to the corresponding binary blob.</p><p>\n CONVERT_TO_TEXT: Converts a response payload from a binary blob to a\n Base64-encoded string.</p><p>If this property is not defined, the response payload will be passed through from\n the integration response to the route response or method response without\n modification.</p>"
+          "documentation" : "<p>Supported only for WebSocket APIs. Specifies how to handle response payload content type conversions. Supported values are CONVERT_TO_BINARY and CONVERT_TO_TEXT, with the following behaviors:</p> <p>CONVERT_TO_BINARY: Converts a response payload from a Base64-encoded string to the corresponding binary blob.</p> <p>CONVERT_TO_TEXT: Converts a response payload from a binary blob to a Base64-encoded string.</p> <p>If this property is not defined, the response payload will be passed through from the integration response to the route response or method response without modification.</p>"
         },
         "IntegrationId" : {
           "shape" : "__string",
@@ -6232,7 +7460,7 @@
           "shape" : "__string",
           "location" : "uri",
           "locationName" : "integrationResponseId",
-          "documentation" : "The integration response ID."
+          "documentation" : "<p>The integration response ID.</p>"
         },
         "IntegrationResponseKey" : {
           "shape" : "SelectionKey",
@@ -6242,19 +7470,20 @@
         "ResponseParameters" : {
           "shape" : "IntegrationParameters",
           "locationName" : "responseParameters",
-          "documentation" : "<p>A key-value map specifying response parameters that are passed to the method\n response from the backend. The key is a method response header parameter name and the\n mapped value is an integration response header value, a static value enclosed within\n a pair of single quotes, or a JSON expression from the integration response body. The\n mapping key must match the pattern of\n method.response.header.{name}\n , where name is a valid and unique header name. The mapped non-static value\n must match the pattern of\n integration.response.header.{name}\n  or\n integration.response.body.{JSON-expression}\n , where \n {name}\n  is a valid and unique response header name and \n {JSON-expression}\n  is a valid JSON expression without the $ prefix.</p>"
+          "documentation" : "<p>A key-value map specifying response parameters that are passed to the method response from the backend. The key is a method response header parameter name and the mapped value is an integration response header value, a static value enclosed within a pair of single quotes, or a JSON expression from the integration response body. The mapping key must match the pattern of method.response.header.<replaceable>{name}</replaceable>\n               , where name is a valid and unique header name. The mapped non-static value must match the pattern of integration.response.header.<replaceable>{name}</replaceable>\n                or integration.response.body.<replaceable>{JSON-expression}</replaceable>\n               , where \n                  <replaceable>{name}</replaceable>\n                is a valid and unique response header name and \n                  <replaceable>{JSON-expression}</replaceable>\n                is a valid JSON expression without the $ prefix.</p>"
         },
         "ResponseTemplates" : {
           "shape" : "TemplateMap",
           "locationName" : "responseTemplates",
-          "documentation" : "<p>The collection of response templates for the integration response as a\n string-to-string map of key-value pairs. Response templates are represented as a\n key/value map, with a content-type as the key and a template as the value.</p>"
+          "documentation" : "<p>The collection of response templates for the integration response as a string-to-string map of key-value pairs. Response templates are represented as a key/value map, with a content-type as the key and a template as the value.</p>"
         },
         "TemplateSelectionExpression" : {
           "shape" : "SelectionExpression",
           "locationName" : "templateSelectionExpression",
-          "documentation" : "<p>The template selection expression for the integration response.</p>"
+          "documentation" : "<p>The template selection expression for the integration response. Supported only for WebSocket APIs.</p>"
         }
       },
+      "documentation" : "<p>Updates an IntegrationResponses.</p>",
       "required" : [ "ApiId", "IntegrationResponseId", "IntegrationId" ]
     },
     "UpdateIntegrationResponseResponse" : {
@@ -6263,7 +7492,7 @@
         "ContentHandlingStrategy" : {
           "shape" : "ContentHandlingStrategy",
           "locationName" : "contentHandlingStrategy",
-          "documentation" : "<p>Specifies how to handle response payload content type conversions. Supported\n values are CONVERT_TO_BINARY and CONVERT_TO_TEXT, with the\n following behaviors:</p><p>\n CONVERT_TO_BINARY: Converts a response payload from a Base64-encoded\n string to the corresponding binary blob.</p><p>\n CONVERT_TO_TEXT: Converts a response payload from a binary blob to a\n Base64-encoded string.</p><p>If this property is not defined, the response payload will be passed through from\n the integration response to the route response or method response without\n modification.</p>"
+          "documentation" : "<p>Supported only for WebSocket APIs. Specifies how to handle response payload content type conversions. Supported values are CONVERT_TO_BINARY and CONVERT_TO_TEXT, with the following behaviors:</p> <p>CONVERT_TO_BINARY: Converts a response payload from a Base64-encoded string to the corresponding binary blob.</p> <p>CONVERT_TO_TEXT: Converts a response payload from a binary blob to a Base64-encoded string.</p> <p>If this property is not defined, the response payload will be passed through from the integration response to the route response or method response without modification.</p>"
         },
         "IntegrationResponseId" : {
           "shape" : "Id",
@@ -6278,12 +7507,12 @@
         "ResponseParameters" : {
           "shape" : "IntegrationParameters",
           "locationName" : "responseParameters",
-          "documentation" : "<p>A key-value map specifying response parameters that are passed to the method\n response from the backend. The key is a method response header parameter name and the\n mapped value is an integration response header value, a static value enclosed within\n a pair of single quotes, or a JSON expression from the integration response body. The\n mapping key must match the pattern of method.response.header.{name}, where name is a\n valid and unique header name. The mapped non-static value must match the pattern of\n integration.response.header.{name} or integration.response.body.{JSON-expression},\n where name is a valid and unique response header name and JSON-expression is a valid\n JSON expression without the $ prefix.</p>"
+          "documentation" : "<p>A key-value map specifying response parameters that are passed to the method response from the backend. The key is a method response header parameter name and the mapped value is an integration response header value, a static value enclosed within a pair of single quotes, or a JSON expression from the integration response body. The mapping key must match the pattern of method.response.header.{name}, where name is a valid and unique header name. The mapped non-static value must match the pattern of integration.response.header.{name} or integration.response.body.{JSON-expression}, where name is a valid and unique response header name and JSON-expression is a valid JSON expression without the $ prefix.</p>"
         },
         "ResponseTemplates" : {
           "shape" : "TemplateMap",
           "locationName" : "responseTemplates",
-          "documentation" : "<p>The collection of response templates for the integration response as a\n string-to-string map of key-value pairs. Response templates are represented as a\n key/value map, with a content-type as the key and a template as the value.</p>"
+          "documentation" : "<p>The collection of response templates for the integration response as a string-to-string map of key-value pairs. Response templates are represented as a key/value map, with a content-type as the key and a template as the value.</p>"
         },
         "TemplateSelectionExpression" : {
           "shape" : "SelectionExpression",
@@ -6313,10 +7542,10 @@
         "Schema" : {
           "shape" : "StringWithLengthBetween0And32K",
           "locationName" : "schema",
-          "documentation" : "<p>The schema for the model. For application/json models, this should be JSON schema\n draft 4 model.</p>"
+          "documentation" : "<p>The schema for the model. For application/json models, this should be JSON schema draft 4 model.</p>"
         }
       },
-      "documentation" : "<p>Represents the input parameters for an UpdateModel request.</p>"
+      "documentation" : "<p>Represents the input parameters for an UpdateModel request. Supported only for WebSocket APIs.</p>"
     },
     "UpdateModelRequest" : {
       "type" : "structure",
@@ -6351,9 +7580,10 @@
         "Schema" : {
           "shape" : "StringWithLengthBetween0And32K",
           "locationName" : "schema",
-          "documentation" : "<p>The schema for the model. For application/json models, this should be JSON schema\n draft 4 model.</p>"
+          "documentation" : "<p>The schema for the model. For application/json models, this should be JSON schema draft 4 model.</p>"
         }
       },
+      "documentation" : "<p>Updates a Model.</p>",
       "required" : [ "ModelId", "ApiId" ]
     },
     "UpdateModelResponse" : {
@@ -6382,7 +7612,7 @@
         "Schema" : {
           "shape" : "StringWithLengthBetween0And32K",
           "locationName" : "schema",
-          "documentation" : "<p>The schema for the model. For application/json models, this should be JSON schema\n draft 4 model.</p>"
+          "documentation" : "<p>The schema for the model. For application/json models, this should be JSON schema draft 4 model.</p>"
         }
       }
     },
@@ -6392,27 +7622,27 @@
         "ApiKeyRequired" : {
           "shape" : "__boolean",
           "locationName" : "apiKeyRequired",
-          "documentation" : "<p>Specifies whether an API key is required for the route.</p>"
+          "documentation" : "<p>Specifies whether an API key is required for the route. Supported only for WebSocket APIs.</p>"
         },
         "AuthorizationScopes" : {
           "shape" : "AuthorizationScopes",
           "locationName" : "authorizationScopes",
-          "documentation" : "<p>The authorization scopes supported by this\n route.</p>"
+          "documentation" : "<p>The authorization scopes supported by this route.</p>"
         },
         "AuthorizationType" : {
           "shape" : "AuthorizationType",
           "locationName" : "authorizationType",
-          "documentation" : "<p>The authorization type for the route. Valid values are NONE for open\n access, AWS_IAM for using AWS IAM permissions, and CUSTOM\n for using a Lambda\n authorizer.</p>"
+          "documentation" : "<p>The authorization type for the route. For WebSocket APIs, valid values are NONE for open access, AWS_IAM for using AWS IAM permissions, and CUSTOM for using a Lambda authorizer For HTTP APIs, valid values are NONE for open access, or JWT for using JSON Web Tokens.</p>"
         },
         "AuthorizerId" : {
           "shape" : "Id",
           "locationName" : "authorizerId",
-          "documentation" : "<p>The identifier of the Authorizer resource to be associated with this\n route, if the authorizationType is CUSTOM\n . The authorizer identifier is generated by API Gateway\n when you created the authorizer.</p>"
+          "documentation" : "<p>The identifier of the Authorizer resource to be associated with this route. The authorizer identifier is generated by API Gateway when you created the authorizer.</p>"
         },
         "ModelSelectionExpression" : {
           "shape" : "SelectionExpression",
           "locationName" : "modelSelectionExpression",
-          "documentation" : "<p>The model selection expression for the route.</p>"
+          "documentation" : "<p>The model selection expression for the route. Supported only for WebSocket APIs.</p>"
         },
         "OperationName" : {
           "shape" : "StringWithLengthBetween1And64",
@@ -6422,12 +7652,12 @@
         "RequestModels" : {
           "shape" : "RouteModels",
           "locationName" : "requestModels",
-          "documentation" : "<p>The request models for the route.</p>"
+          "documentation" : "<p>The request models for the route. Supported only for WebSocket APIs.</p>"
         },
         "RequestParameters" : {
           "shape" : "RouteParameters",
           "locationName" : "requestParameters",
-          "documentation" : "<p>The request parameters for the route.</p>"
+          "documentation" : "<p>The request parameters for the route. Supported only for WebSocket APIs.</p>"
         },
         "RouteKey" : {
           "shape" : "SelectionKey",
@@ -6437,7 +7667,7 @@
         "RouteResponseSelectionExpression" : {
           "shape" : "SelectionExpression",
           "locationName" : "routeResponseSelectionExpression",
-          "documentation" : "<p>The route response selection expression for the route.</p>"
+          "documentation" : "<p>The route response selection expression for the route. Supported only for WebSocket APIs.</p>"
         },
         "Target" : {
           "shape" : "StringWithLengthBetween1And128",
@@ -6459,27 +7689,27 @@
         "ApiKeyRequired" : {
           "shape" : "__boolean",
           "locationName" : "apiKeyRequired",
-          "documentation" : "<p>Specifies whether an API key is required for the route.</p>"
+          "documentation" : "<p>Specifies whether an API key is required for the route. Supported only for WebSocket APIs.</p>"
         },
         "AuthorizationScopes" : {
           "shape" : "AuthorizationScopes",
           "locationName" : "authorizationScopes",
-          "documentation" : "<p>The authorization scopes supported by this\n route.</p>"
+          "documentation" : "<p>The authorization scopes supported by this route.</p>"
         },
         "AuthorizationType" : {
           "shape" : "AuthorizationType",
           "locationName" : "authorizationType",
-          "documentation" : "<p>The authorization type for the route. Valid values are NONE for open\n access, AWS_IAM for using AWS IAM permissions, and CUSTOM\n for using a Lambda\n authorizer.</p>"
+          "documentation" : "<p>The authorization type for the route. For WebSocket APIs, valid values are NONE for open access, AWS_IAM for using AWS IAM permissions, and CUSTOM for using a Lambda authorizer For HTTP APIs, valid values are NONE for open access, or JWT for using JSON Web Tokens.</p>"
         },
         "AuthorizerId" : {
           "shape" : "Id",
           "locationName" : "authorizerId",
-          "documentation" : "<p>The identifier of the Authorizer resource to be associated with this\n route, if the authorizationType is CUSTOM\n . The authorizer identifier is generated by API Gateway\n when you created the authorizer.</p>"
+          "documentation" : "<p>The identifier of the Authorizer resource to be associated with this route. The authorizer identifier is generated by API Gateway when you created the authorizer.</p>"
         },
         "ModelSelectionExpression" : {
           "shape" : "SelectionExpression",
           "locationName" : "modelSelectionExpression",
-          "documentation" : "<p>The model selection expression for the route.</p>"
+          "documentation" : "<p>The model selection expression for the route. Supported only for WebSocket APIs.</p>"
         },
         "OperationName" : {
           "shape" : "StringWithLengthBetween1And64",
@@ -6489,12 +7719,12 @@
         "RequestModels" : {
           "shape" : "RouteModels",
           "locationName" : "requestModels",
-          "documentation" : "<p>The request models for the route.</p>"
+          "documentation" : "<p>The request models for the route. Supported only for WebSocket APIs.</p>"
         },
         "RequestParameters" : {
           "shape" : "RouteParameters",
           "locationName" : "requestParameters",
-          "documentation" : "<p>The request parameters for the route.</p>"
+          "documentation" : "<p>The request parameters for the route. Supported only for WebSocket APIs.</p>"
         },
         "RouteId" : {
           "shape" : "__string",
@@ -6510,7 +7740,7 @@
         "RouteResponseSelectionExpression" : {
           "shape" : "SelectionExpression",
           "locationName" : "routeResponseSelectionExpression",
-          "documentation" : "<p>The route response selection expression for the route.</p>"
+          "documentation" : "<p>The route response selection expression for the route. Supported only for WebSocket APIs.</p>"
         },
         "Target" : {
           "shape" : "StringWithLengthBetween1And128",
@@ -6518,35 +7748,41 @@
           "documentation" : "<p>The target for the route.</p>"
         }
       },
+      "documentation" : "<p>Updates a Route.</p>",
       "required" : [ "ApiId", "RouteId" ]
     },
-    "UpdateRouteResponse" : {
+    "UpdateRouteResult" : {
       "type" : "structure",
       "members" : {
+        "ApiGatewayManaged" : {
+          "shape" : "__boolean",
+          "locationName" : "apiGatewayManaged",
+          "documentation" : "<p>Specifies whether a route is managed by API Gateway. If you created an API using quick create, the $default route is managed by API Gateway. You can't modify the $default route key.</p>"
+        },
         "ApiKeyRequired" : {
           "shape" : "__boolean",
           "locationName" : "apiKeyRequired",
-          "documentation" : "<p>Specifies whether an API key is required for this route.</p>"
+          "documentation" : "<p>Specifies whether an API key is required for this route. Supported only for WebSocket APIs.</p>"
         },
         "AuthorizationScopes" : {
           "shape" : "AuthorizationScopes",
           "locationName" : "authorizationScopes",
-          "documentation" : "<p>A list of authorization scopes configured on a route. The scopes are used with a\n COGNITO_USER_POOLS authorizer to authorize the method invocation. The authorization\n works by matching the route scopes against the scopes parsed from the access token in\n the incoming request. The method invocation is authorized if any route scope matches\n a claimed scope in the access token. Otherwise, the invocation is not authorized.\n When the route scope is configured, the client must provide an access token instead\n of an identity token for authorization purposes.</p>"
+          "documentation" : "<p>A list of authorization scopes configured on a route. The scopes are used with a JWT authorizer to authorize the method invocation. The authorization works by matching the route scopes against the scopes parsed from the access token in the incoming request. The method invocation is authorized if any route scope matches a claimed scope in the access token. Otherwise, the invocation is not authorized. When the route scope is configured, the client must provide an access token instead of an identity token for authorization purposes.</p>"
         },
         "AuthorizationType" : {
           "shape" : "AuthorizationType",
           "locationName" : "authorizationType",
-          "documentation" : "<p>The authorization type for the route. Valid values are NONE for open\n access, AWS_IAM for using AWS IAM permissions, and CUSTOM\n for using a Lambda\n authorizer</p>"
+          "documentation" : "<p>The authorization type for the route. For WebSocket APIs, valid values are NONE for open access, AWS_IAM for using AWS IAM permissions, and CUSTOM for using a Lambda authorizer For HTTP APIs, valid values are NONE for open access, or JWT for using JSON Web Tokens.</p>"
         },
         "AuthorizerId" : {
           "shape" : "Id",
           "locationName" : "authorizerId",
-          "documentation" : "<p>The identifier of the Authorizer resource to be associated with this\n route, if the authorizationType is CUSTOM\n . The authorizer identifier is generated by API Gateway\n when you created the authorizer.</p>"
+          "documentation" : "<p>The identifier of the Authorizer resource to be associated with this route. The authorizer identifier is generated by API Gateway when you created the authorizer.</p>"
         },
         "ModelSelectionExpression" : {
           "shape" : "SelectionExpression",
           "locationName" : "modelSelectionExpression",
-          "documentation" : "<p>The model selection expression for the route.</p>"
+          "documentation" : "<p>The model selection expression for the route. Supported only for WebSocket APIs.</p>"
         },
         "OperationName" : {
           "shape" : "StringWithLengthBetween1And64",
@@ -6556,12 +7792,12 @@
         "RequestModels" : {
           "shape" : "RouteModels",
           "locationName" : "requestModels",
-          "documentation" : "<p>The request models for the route.</p>"
+          "documentation" : "<p>The request models for the route. Supported only for WebSocket APIs.</p>"
         },
         "RequestParameters" : {
           "shape" : "RouteParameters",
           "locationName" : "requestParameters",
-          "documentation" : "<p>The request parameters for the route.</p>"
+          "documentation" : "<p>The request parameters for the route. Supported only for WebSocket APIs.</p>"
         },
         "RouteId" : {
           "shape" : "Id",
@@ -6576,7 +7812,7 @@
         "RouteResponseSelectionExpression" : {
           "shape" : "SelectionExpression",
           "locationName" : "routeResponseSelectionExpression",
-          "documentation" : "<p>The route response selection expression for the route.</p>"
+          "documentation" : "<p>The route response selection expression for the route. Supported only for WebSocket APIs.</p>"
         },
         "Target" : {
           "shape" : "StringWithLengthBetween1And128",
@@ -6591,7 +7827,7 @@
         "ModelSelectionExpression" : {
           "shape" : "SelectionExpression",
           "locationName" : "modelSelectionExpression",
-          "documentation" : "<p>The model selection expression for the route response.</p>"
+          "documentation" : "<p>The model selection expression for the route response. Supported only for WebSocket APIs.</p>"
         },
         "ResponseModels" : {
           "shape" : "RouteModels",
@@ -6609,7 +7845,7 @@
           "documentation" : "<p>The route response key.</p>"
         }
       },
-      "documentation" : "<p>Represents the input parameters for an UpdateRouteResponse\n request.</p>"
+      "documentation" : "<p>Represents the input parameters for an UpdateRouteResponse request.</p>"
     },
     "UpdateRouteResponseRequest" : {
       "type" : "structure",
@@ -6623,7 +7859,7 @@
         "ModelSelectionExpression" : {
           "shape" : "SelectionExpression",
           "locationName" : "modelSelectionExpression",
-          "documentation" : "<p>The model selection expression for the route response.</p>"
+          "documentation" : "<p>The model selection expression for the route response. Supported only for WebSocket APIs.</p>"
         },
         "ResponseModels" : {
           "shape" : "RouteModels",
@@ -6653,6 +7889,7 @@
           "documentation" : "<p>The route response key.</p>"
         }
       },
+      "documentation" : "<p>Updates a RouteResponse.</p>",
       "required" : [ "RouteResponseId", "ApiId", "RouteId" ]
     },
     "UpdateRouteResponseResponse" : {
@@ -6661,7 +7898,7 @@
         "ModelSelectionExpression" : {
           "shape" : "SelectionExpression",
           "locationName" : "modelSelectionExpression",
-          "documentation" : "<p>Represents the model selection expression of a route response.</p>"
+          "documentation" : "<p>Represents the model selection expression of a route response. Supported only for WebSocket APIs.</p>"
         },
         "ResponseModels" : {
           "shape" : "RouteModels",
@@ -6693,6 +7930,11 @@
           "locationName" : "accessLogSettings",
           "documentation" : "<p>Settings for logging access in this stage.</p>"
         },
+        "AutoDeploy" : {
+          "shape" : "__boolean",
+          "locationName" : "autoDeploy",
+          "documentation" : "<p>Specifies whether updates to an API automatically trigger a new deployment. The default value is false.</p>"
+        },
         "ClientCertificateId" : {
           "shape" : "Id",
           "locationName" : "clientCertificateId",
@@ -6706,7 +7948,7 @@
         "DeploymentId" : {
           "shape" : "Id",
           "locationName" : "deploymentId",
-          "documentation" : "<p>The deployment identifier for the API stage.</p>"
+          "documentation" : "<p>The deployment identifier for the API stage. Can't be updated if autoDeploy is enabled.</p>"
         },
         "Description" : {
           "shape" : "StringWithLengthBetween0And1024",
@@ -6721,7 +7963,7 @@
         "StageVariables" : {
           "shape" : "StageVariablesMap",
           "locationName" : "stageVariables",
-          "documentation" : "<p>A map that defines the stage variables for a Stage. Variable names\n can have alphanumeric and underscore characters, and the values must match\n [A-Za-z0-9-._~:/?#&=,]+.</p>"
+          "documentation" : "<p>A map that defines the stage variables for a Stage. Variable names can have alphanumeric and underscore characters, and the values must match [A-Za-z0-9-._~:/?#&amp;=,]+.</p>"
         }
       },
       "documentation" : "<p>Represents the input parameters for an UpdateStage request.</p>"
@@ -6740,6 +7982,11 @@
           "locationName" : "apiId",
           "documentation" : "<p>The API identifier.</p>"
         },
+        "AutoDeploy" : {
+          "shape" : "__boolean",
+          "locationName" : "autoDeploy",
+          "documentation" : "<p>Specifies whether updates to an API automatically trigger a new deployment. The default value is false.</p>"
+        },
         "ClientCertificateId" : {
           "shape" : "Id",
           "locationName" : "clientCertificateId",
@@ -6753,7 +8000,7 @@
         "DeploymentId" : {
           "shape" : "Id",
           "locationName" : "deploymentId",
-          "documentation" : "<p>The deployment identifier for the API stage.</p>"
+          "documentation" : "<p>The deployment identifier for the API stage. Can't be updated if autoDeploy is enabled.</p>"
         },
         "Description" : {
           "shape" : "StringWithLengthBetween0And1024",
@@ -6769,14 +8016,15 @@
           "shape" : "__string",
           "location" : "uri",
           "locationName" : "stageName",
-          "documentation" : "<p>The stage name.</p>"
+          "documentation" : "<p>The stage name. Stage names can only contain alphanumeric characters, hyphens, and underscores. Maximum length is 128 characters.</p>"
         },
         "StageVariables" : {
           "shape" : "StageVariablesMap",
           "locationName" : "stageVariables",
-          "documentation" : "<p>A map that defines the stage variables for a Stage. Variable names\n can have alphanumeric and underscore characters, and the values must match\n [A-Za-z0-9-._~:/?#&=,]+.</p>"
+          "documentation" : "<p>A map that defines the stage variables for a Stage. Variable names can have alphanumeric and underscore characters, and the values must match [A-Za-z0-9-._~:/?#&amp;=,]+.</p>"
         }
       },
+      "documentation" : "<p>Updates a Stage.</p>",
       "required" : [ "StageName", "ApiId" ]
     },
     "UpdateStageResponse" : {
@@ -6787,10 +8035,20 @@
           "locationName" : "accessLogSettings",
           "documentation" : "<p>Settings for logging access in this stage.</p>"
         },
+        "ApiGatewayManaged" : {
+          "shape" : "__boolean",
+          "locationName" : "apiGatewayManaged",
+          "documentation" : "<p>Specifies whether a stage is managed by API Gateway. If you created an API using quick create, the $default stage is managed by API Gateway. You can't modify the $default stage.</p>"
+        },
+        "AutoDeploy" : {
+          "shape" : "__boolean",
+          "locationName" : "autoDeploy",
+          "documentation" : "<p>Specifies whether updates to an API automatically trigger a new deployment. The default value is false.</p>"
+        },
         "ClientCertificateId" : {
           "shape" : "Id",
           "locationName" : "clientCertificateId",
-          "documentation" : "<p>The identifier of a client certificate for a Stage.</p>"
+          "documentation" : "<p>The identifier of a client certificate for a Stage. Supported only for WebSocket APIs.</p>"
         },
         "CreatedDate" : {
           "shape" : "__timestampIso8601",
@@ -6805,13 +8063,18 @@
         "DeploymentId" : {
           "shape" : "Id",
           "locationName" : "deploymentId",
-          "documentation" : "<p>The identifier of the Deployment that the Stage is\n associated with.</p>"
+          "documentation" : "<p>The identifier of the Deployment that the Stage is associated with. Can't be updated if autoDeploy is enabled.</p>"
         },
         "Description" : {
           "shape" : "StringWithLengthBetween0And1024",
           "locationName" : "description",
           "documentation" : "<p>The description of the stage.</p>"
         },
+        "LastDeploymentStatusMessage" : {
+          "shape" : "__string",
+          "locationName" : "lastDeploymentStatusMessage",
+          "documentation" : "<p>Describes the status of the last deployment of a stage. Supported only for stages with autoDeploy enabled.</p>"
+        },
         "LastUpdatedDate" : {
           "shape" : "__timestampIso8601",
           "locationName" : "lastUpdatedDate",
@@ -6820,7 +8083,7 @@
         "RouteSettings" : {
           "shape" : "RouteSettingsMap",
           "locationName" : "routeSettings",
-          "documentation" : "<p>Route settings for the stage.</p>"
+          "documentation" : "<p>Route settings for the stage, by routeKey.</p>"
         },
         "StageName" : {
           "shape" : "StringWithLengthBetween1And128",
@@ -6830,12 +8093,91 @@
         "StageVariables" : {
           "shape" : "StageVariablesMap",
           "locationName" : "stageVariables",
-          "documentation" : "<p>A map that defines the stage variables for a stage resource. Variable names can\n have alphanumeric and underscore characters, and the values must match\n [A-Za-z0-9-._~:/?#&=,]+.</p>"
+          "documentation" : "<p>A map that defines the stage variables for a stage resource. Variable names can have alphanumeric and underscore characters, and the values must match [A-Za-z0-9-._~:/?#&amp;=,]+.</p>"
+        },
+        "Tags" : {
+          "shape" : "Tags",
+          "locationName" : "tags",
+          "documentation" : "<p>The collection of tags. Each tag element is associated with a given resource.</p>"
+        }
+      }
+    },
+    "UpdateVpcLinkInput" : {
+      "type" : "structure",
+      "members" : {
+        "Name" : {
+          "shape" : "StringWithLengthBetween1And128",
+          "locationName" : "name",
+          "documentation" : "<p>The name of the VPC link.</p>"
+        }
+      },
+      "documentation" : "<p>Represents the input parameters for an UpdateVpcLink request.</p>"
+    },
+    "UpdateVpcLinkRequest" : {
+      "type" : "structure",
+      "members" : {
+        "Name" : {
+          "shape" : "StringWithLengthBetween1And128",
+          "locationName" : "name",
+          "documentation" : "<p>The name of the VPC link.</p>"
+        },
+        "VpcLinkId" : {
+          "shape" : "__string",
+          "location" : "uri",
+          "locationName" : "vpcLinkId",
+          "documentation" : "<p>The ID of the VPC link.</p>"
+        }
+      },
+      "documentation" : "<p>Updates a VPC link.</p>",
+      "required" : [ "VpcLinkId" ]
+    },
+    "UpdateVpcLinkResponse" : {
+      "type" : "structure",
+      "members" : {
+        "CreatedDate" : {
+          "shape" : "__timestampIso8601",
+          "locationName" : "createdDate",
+          "documentation" : "<p>The timestamp when the VPC link was created.</p>"
+        },
+        "Name" : {
+          "shape" : "StringWithLengthBetween1And128",
+          "locationName" : "name",
+          "documentation" : "<p>The name of the VPC link.</p>"
+        },
+        "SecurityGroupIds" : {
+          "shape" : "SecurityGroupIdList",
+          "locationName" : "securityGroupIds",
+          "documentation" : "<p>A list of security group IDs for the VPC link.</p>"
+        },
+        "SubnetIds" : {
+          "shape" : "SubnetIdList",
+          "locationName" : "subnetIds",
+          "documentation" : "<p>A list of subnet IDs to include in the VPC link.</p>"
         },
         "Tags" : {
           "shape" : "Tags",
           "locationName" : "tags",
-          "documentation" : "<p>The key-value map of strings. The valid character set is [a-zA-Z+-=._:/]. The tag key can be up to 128 characters and must not start with aws:. The tag value can be up to 256 characters..</p>"
+          "documentation" : "<p>Tags for the VPC link.</p>"
+        },
+        "VpcLinkId" : {
+          "shape" : "Id",
+          "locationName" : "vpcLinkId",
+          "documentation" : "<p>The ID of the VPC link.</p>"
+        },
+        "VpcLinkStatus" : {
+          "shape" : "VpcLinkStatus",
+          "locationName" : "vpcLinkStatus",
+          "documentation" : "<p>The status of the VPC link.</p>"
+        },
+        "VpcLinkStatusMessage" : {
+          "shape" : "StringWithLengthBetween0And1024",
+          "locationName" : "vpcLinkStatusMessage",
+          "documentation" : "<p>A message summarizing the cause of the status of the VPC link.</p>"
+        },
+        "VpcLinkVersion" : {
+          "shape" : "VpcLinkVersion",
+          "locationName" : "vpcLinkVersion",
+          "documentation" : "<p>The version of the VPC link.</p>"
         }
       }
     },
@@ -6843,6 +8185,84 @@
       "type" : "string",
       "documentation" : "<p>A string representation of a URI with a length between [1-2048].</p>"
     },
+    "VpcLink" : {
+      "type" : "structure",
+      "members" : {
+        "CreatedDate" : {
+          "shape" : "__timestampIso8601",
+          "locationName" : "createdDate",
+          "documentation" : "<p>The timestamp when the VPC link was created.</p>"
+        },
+        "Name" : {
+          "shape" : "StringWithLengthBetween1And128",
+          "locationName" : "name",
+          "documentation" : "<p>The name of the VPC link.</p>"
+        },
+        "SecurityGroupIds" : {
+          "shape" : "SecurityGroupIdList",
+          "locationName" : "securityGroupIds",
+          "documentation" : "<p>A list of security group IDs for the VPC link.</p>"
+        },
+        "SubnetIds" : {
+          "shape" : "SubnetIdList",
+          "locationName" : "subnetIds",
+          "documentation" : "<p>A list of subnet IDs to include in the VPC link.</p>"
+        },
+        "Tags" : {
+          "shape" : "Tags",
+          "locationName" : "tags",
+          "documentation" : "<p>Tags for the VPC link.</p>"
+        },
+        "VpcLinkId" : {
+          "shape" : "Id",
+          "locationName" : "vpcLinkId",
+          "documentation" : "<p>The ID of the VPC link.</p>"
+        },
+        "VpcLinkStatus" : {
+          "shape" : "VpcLinkStatus",
+          "locationName" : "vpcLinkStatus",
+          "documentation" : "<p>The status of the VPC link.</p>"
+        },
+        "VpcLinkStatusMessage" : {
+          "shape" : "StringWithLengthBetween0And1024",
+          "locationName" : "vpcLinkStatusMessage",
+          "documentation" : "<p>A message summarizing the cause of the status of the VPC link.</p>"
+        },
+        "VpcLinkVersion" : {
+          "shape" : "VpcLinkVersion",
+          "locationName" : "vpcLinkVersion",
+          "documentation" : "<p>The version of the VPC link.</p>"
+        }
+      },
+      "documentation" : "<p>Represents a VPC link.</p>",
+      "required" : [ "VpcLinkId", "SecurityGroupIds", "SubnetIds", "Name" ]
+    },
+    "VpcLinkStatus" : {
+      "type" : "string",
+      "documentation" : "<p>The status of the VPC link.</p>",
+      "enum" : [ "PENDING", "AVAILABLE", "DELETING", "FAILED", "INACTIVE" ]
+    },
+    "VpcLinkVersion" : {
+      "type" : "string",
+      "documentation" : "<p>The version of the VPC link.</p>",
+      "enum" : [ "V2" ]
+    },
+    "VpcLinks" : {
+      "type" : "structure",
+      "members" : {
+        "Items" : {
+          "shape" : "__listOfVpcLink",
+          "locationName" : "items",
+          "documentation" : "<p>A collection of VPC links.</p>"
+        },
+        "NextToken" : {
+          "shape" : "NextToken",
+          "locationName" : "nextToken",
+          "documentation" : "<p>The next page of elements from this collection. Not valid for the last element of the collection.</p>"
+        }
+      },
+      "documentation" : "<p>Represents a collection of VPCLinks.</p>"
+    },
     "__boolean" : {
       "type" : "boolean"
     },
@@ -6918,6 +8338,12 @@
         "shape" : "Stage"
       }
     },
+    "__listOfVpcLink" : {
+      "type" : "list",
+      "member" : {
+        "shape" : "VpcLink"
+      }
+    },
     "__listOf__string" : {
       "type" : "list",
       "member" : {
@@ -6930,15 +8356,6 @@
     "__string" : {
       "type" : "string"
     },
-    "__mapOf__string" : {
-      "type" : "map",
-      "key" : {
-        "shape" : "__string"
-      },
-      "value" : {
-        "shape" : "__string"
-      }
-    },
     "__timestampIso8601" : {
       "type" : "timestamp",
       "timestampFormat" : "iso8601"
@@ -6948,15 +8365,5 @@
       "timestampFormat" : "unixTimestamp"
     }
   },
-  "authorizers" : {
-    "authorization_strategy" : {
-      "name" : "authorization_strategy",
-      "type" : "provided",
-      "placement" : {
-        "location" : "header",
-        "name" : "Authorization"
-      }
-    }
-  },
   "documentation" : "<p>Amazon API Gateway V2</p>"
 }
diff --git a/services/appconfig/pom.xml b/services/appconfig/pom.xml
new file mode 100644
index 000000000000..942f15f4eac7
--- /dev/null
+++ b/services/appconfig/pom.xml
@@ -0,0 +1,60 @@
+<?xml version="1.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.
+  -->
+
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>software.amazon.awssdk</groupId>
+        <artifactId>services</artifactId>
+        <version>2.11.8-SNAPSHOT</version>
+    </parent>
+    <artifactId>appconfig</artifactId>
+    <name>AWS Java SDK :: Services :: AppConfig</name>
+    <description>The AWS Java SDK for AppConfig module holds the client classes that are used for
+        communicating with AppConfig.
+    </description>
+    <url>https://aws.amazon.com/sdkforjava</url>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifestEntries>
+                            <Automatic-Module-Name>software.amazon.awssdk.services.appconfig</Automatic-Module-Name>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>protocol-core</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>aws-json-protocol</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/services/appconfig/src/main/resources/codegen-resources/paginators-1.json b/services/appconfig/src/main/resources/codegen-resources/paginators-1.json
new file mode 100644
index 000000000000..6a79ddb03f74
--- /dev/null
+++ b/services/appconfig/src/main/resources/codegen-resources/paginators-1.json
@@ -0,0 +1,29 @@
+{
+  "pagination": {
+    "ListApplications": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "MaxResults"
+    },
+    "ListConfigurationProfiles": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "MaxResults"
+    },
+    "ListDeploymentStrategies": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "MaxResults"
+    },
+    "ListDeployments": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "MaxResults"
+    },
+    "ListEnvironments": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "MaxResults"
+    }
+  }
+}
diff --git a/services/appconfig/src/main/resources/codegen-resources/service-2.json b/services/appconfig/src/main/resources/codegen-resources/service-2.json
new file mode 100644
index 000000000000..e4353582bc71
--- /dev/null
+++ b/services/appconfig/src/main/resources/codegen-resources/service-2.json
@@ -0,0 +1,1870 @@
+{
+  "version":"2.0",
+  "metadata":{
+    "apiVersion":"2019-10-09",
+    "endpointPrefix":"appconfig",
+    "jsonVersion":"1.1",
+    "protocol":"rest-json",
+    "serviceAbbreviation":"AppConfig",
+    "serviceFullName":"Amazon AppConfig",
+    "serviceId":"AppConfig",
+    "signatureVersion":"v4",
+    "signingName":"appconfig",
+    "uid":"appconfig-2019-10-09"
+  },
+  "operations":{
+    "CreateApplication":{
+      "name":"CreateApplication",
+      "http":{
+        "method":"POST",
+        "requestUri":"/applications",
+        "responseCode":201
+      },
+      "input":{"shape":"CreateApplicationRequest"},
+      "output":{"shape":"Application"},
+      "errors":[
+        {"shape":"BadRequestException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>An application in AppConfig is a logical unit of code that provides capabilities for your customers. For example, an application can be a microservice that runs on Amazon EC2 instances, a mobile application installed by your users, a serverless application using Amazon API Gateway and AWS Lambda, or any system you run on behalf of others.</p>"
+    },
+    "CreateConfigurationProfile":{
+      "name":"CreateConfigurationProfile",
+      "http":{
+        "method":"POST",
+        "requestUri":"/applications/{ApplicationId}/configurationprofiles",
+        "responseCode":201
+      },
+      "input":{"shape":"CreateConfigurationProfileRequest"},
+      "output":{"shape":"ConfigurationProfile"},
+      "errors":[
+        {"shape":"BadRequestException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Information that enables AppConfig to access the configuration source. Valid configuration sources include Systems Manager (SSM) documents, SSM Parameter Store parameters, and Amazon S3 objects. A configuration profile includes the following information.</p> <ul> <li> <p>The Uri location of the configuration data.</p> </li> <li> <p>The AWS Identity and Access Management (IAM) role that provides access to the configuration data.</p> </li> <li> <p>A validator for the configuration data. Available validators include either a JSON Schema or an AWS Lambda function.</p> </li> </ul> <p>For more information, see <a href=\"http://docs.aws.amazon.com/systems-manager/latest/userguide/appconfig-creating-configuration-and-profile.html\">Create a Configuration and a Configuration Profile</a> in the <i>AWS AppConfig User Guide</i>.</p>"
+    },
+    "CreateDeploymentStrategy":{
+      "name":"CreateDeploymentStrategy",
+      "http":{
+        "method":"POST",
+        "requestUri":"/deploymentstrategies",
+        "responseCode":201
+      },
+      "input":{"shape":"CreateDeploymentStrategyRequest"},
+      "output":{"shape":"DeploymentStrategy"},
+      "errors":[
+        {"shape":"InternalServerException"},
+        {"shape":"BadRequestException"}
+      ],
+      "documentation":"<p>A deployment strategy defines important criteria for rolling out your configuration to the designated targets. A deployment strategy includes: the overall duration required, a percentage of targets to receive the deployment during each interval, an algorithm that defines how percentage grows, and bake time.</p>"
+    },
+    "CreateEnvironment":{
+      "name":"CreateEnvironment",
+      "http":{
+        "method":"POST",
+        "requestUri":"/applications/{ApplicationId}/environments",
+        "responseCode":201
+      },
+      "input":{"shape":"CreateEnvironmentRequest"},
+      "output":{"shape":"Environment"},
+      "errors":[
+        {"shape":"InternalServerException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"BadRequestException"}
+      ],
+      "documentation":"<p>For each application, you define one or more environments. An environment is a logical deployment group of AppConfig targets, such as applications in a <code>Beta</code> or <code>Production</code> environment. You can also define environments for application subcomponents such as the <code>Web</code>, <code>Mobile</code> and <code>Back-end</code> components for your application. You can configure Amazon CloudWatch alarms for each environment. The system monitors alarms during a configuration deployment. If an alarm is triggered, the system rolls back the configuration.</p>"
+    },
+    "DeleteApplication":{
+      "name":"DeleteApplication",
+      "http":{
+        "method":"DELETE",
+        "requestUri":"/applications/{ApplicationId}",
+        "responseCode":204
+      },
+      "input":{"shape":"DeleteApplicationRequest"},
+      "errors":[
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InternalServerException"},
+        {"shape":"BadRequestException"}
+      ],
+      "documentation":"<p>Delete an application. Deleting an application does not delete a configuration from a host.</p>"
+    },
+    "DeleteConfigurationProfile":{
+      "name":"DeleteConfigurationProfile",
+      "http":{
+        "method":"DELETE",
+        "requestUri":"/applications/{ApplicationId}/configurationprofiles/{ConfigurationProfileId}",
+        "responseCode":204
+      },
+      "input":{"shape":"DeleteConfigurationProfileRequest"},
+      "errors":[
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ConflictException"},
+        {"shape":"InternalServerException"},
+        {"shape":"BadRequestException"}
+      ],
+      "documentation":"<p>Delete a configuration profile. Deleting a configuration profile does not delete a configuration from a host.</p>"
+    },
+    "DeleteDeploymentStrategy":{
+      "name":"DeleteDeploymentStrategy",
+      "http":{
+        "method":"DELETE",
+        "requestUri":"/deployementstrategies/{DeploymentStrategyId}",
+        "responseCode":204
+      },
+      "input":{"shape":"DeleteDeploymentStrategyRequest"},
+      "errors":[
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InternalServerException"},
+        {"shape":"BadRequestException"}
+      ],
+      "documentation":"<p>Delete a deployment strategy. Deleting a deployment strategy does not delete a configuration from a host.</p>"
+    },
+    "DeleteEnvironment":{
+      "name":"DeleteEnvironment",
+      "http":{
+        "method":"DELETE",
+        "requestUri":"/applications/{ApplicationId}/environments/{EnvironmentId}",
+        "responseCode":204
+      },
+      "input":{"shape":"DeleteEnvironmentRequest"},
+      "errors":[
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ConflictException"},
+        {"shape":"InternalServerException"},
+        {"shape":"BadRequestException"}
+      ],
+      "documentation":"<p>Delete an environment. Deleting an environment does not delete a configuration from a host.</p>"
+    },
+    "GetApplication":{
+      "name":"GetApplication",
+      "http":{
+        "method":"GET",
+        "requestUri":"/applications/{ApplicationId}",
+        "responseCode":200
+      },
+      "input":{"shape":"GetApplicationRequest"},
+      "output":{"shape":"Application"},
+      "errors":[
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InternalServerException"},
+        {"shape":"BadRequestException"}
+      ],
+      "documentation":"<p>Retrieve information about an application.</p>"
+    },
+    "GetConfiguration":{
+      "name":"GetConfiguration",
+      "http":{
+        "method":"GET",
+        "requestUri":"/applications/{Application}/environments/{Environment}/configurations/{Configuration}",
+        "responseCode":200
+      },
+      "input":{"shape":"GetConfigurationRequest"},
+      "output":{"shape":"Configuration"},
+      "errors":[
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InternalServerException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"BadRequestException"}
+      ],
+      "documentation":"<p>Retrieve information about a configuration.</p>"
+    },
+    "GetConfigurationProfile":{
+      "name":"GetConfigurationProfile",
+      "http":{
+        "method":"GET",
+        "requestUri":"/applications/{ApplicationId}/configurationprofiles/{ConfigurationProfileId}",
+        "responseCode":200
+      },
+      "input":{"shape":"GetConfigurationProfileRequest"},
+      "output":{"shape":"ConfigurationProfile"},
+      "errors":[
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InternalServerException"},
+        {"shape":"BadRequestException"}
+      ],
+      "documentation":"<p>Retrieve information about a configuration profile.</p>"
+    },
+    "GetDeployment":{
+      "name":"GetDeployment",
+      "http":{
+        "method":"GET",
+        "requestUri":"/applications/{ApplicationId}/environments/{EnvironmentId}/deployments/{DeploymentNumber}",
+        "responseCode":200
+      },
+      "input":{"shape":"GetDeploymentRequest"},
+      "output":{"shape":"Deployment"},
+      "errors":[
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InternalServerException"},
+        {"shape":"BadRequestException"}
+      ],
+      "documentation":"<p>Retrieve information about a configuration deployment.</p>"
+    },
+    "GetDeploymentStrategy":{
+      "name":"GetDeploymentStrategy",
+      "http":{
+        "method":"GET",
+        "requestUri":"/deploymentstrategies/{DeploymentStrategyId}",
+        "responseCode":200
+      },
+      "input":{"shape":"GetDeploymentStrategyRequest"},
+      "output":{"shape":"DeploymentStrategy"},
+      "errors":[
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InternalServerException"},
+        {"shape":"BadRequestException"}
+      ],
+      "documentation":"<p>Retrieve information about a deployment strategy. A deployment strategy defines important criteria for rolling out your configuration to the designated targets. A deployment strategy includes: the overall duration required, a percentage of targets to receive the deployment during each interval, an algorithm that defines how percentage grows, and bake time.</p>"
+    },
+    "GetEnvironment":{
+      "name":"GetEnvironment",
+      "http":{
+        "method":"GET",
+        "requestUri":"/applications/{ApplicationId}/environments/{EnvironmentId}",
+        "responseCode":200
+      },
+      "input":{"shape":"GetEnvironmentRequest"},
+      "output":{"shape":"Environment"},
+      "errors":[
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InternalServerException"},
+        {"shape":"BadRequestException"}
+      ],
+      "documentation":"<p>Retrieve information about an environment. An environment is a logical deployment group of AppConfig applications, such as applications in a <code>Production</code> environment or in an <code>EU_Region</code> environment. Each configuration deployment targets an environment. You can enable one or more Amazon CloudWatch alarms for an environment. If an alarm is triggered during a deployment, AppConfig roles back the configuration.</p>"
+    },
+    "ListApplications":{
+      "name":"ListApplications",
+      "http":{
+        "method":"GET",
+        "requestUri":"/applications",
+        "responseCode":200
+      },
+      "input":{"shape":"ListApplicationsRequest"},
+      "output":{"shape":"Applications"},
+      "errors":[
+        {"shape":"InternalServerException"},
+        {"shape":"BadRequestException"}
+      ],
+      "documentation":"<p>List all applications in your AWS account.</p>"
+    },
+    "ListConfigurationProfiles":{
+      "name":"ListConfigurationProfiles",
+      "http":{
+        "method":"GET",
+        "requestUri":"/applications/{ApplicationId}/configurationprofiles",
+        "responseCode":200
+      },
+      "input":{"shape":"ListConfigurationProfilesRequest"},
+      "output":{"shape":"ConfigurationProfiles"},
+      "errors":[
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InternalServerException"},
+        {"shape":"BadRequestException"}
+      ],
+      "documentation":"<p>Lists the configuration profiles for an application.</p>"
+    },
+    "ListDeploymentStrategies":{
+      "name":"ListDeploymentStrategies",
+      "http":{
+        "method":"GET",
+        "requestUri":"/deploymentstrategies",
+        "responseCode":200
+      },
+      "input":{"shape":"ListDeploymentStrategiesRequest"},
+      "output":{"shape":"DeploymentStrategies"},
+      "errors":[
+        {"shape":"InternalServerException"},
+        {"shape":"BadRequestException"}
+      ],
+      "documentation":"<p>List deployment strategies.</p>"
+    },
+    "ListDeployments":{
+      "name":"ListDeployments",
+      "http":{
+        "method":"GET",
+        "requestUri":"/applications/{ApplicationId}/environments/{EnvironmentId}/deployments",
+        "responseCode":200
+      },
+      "input":{"shape":"ListDeploymentsRequest"},
+      "output":{"shape":"Deployments"},
+      "errors":[
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InternalServerException"},
+        {"shape":"BadRequestException"}
+      ],
+      "documentation":"<p>Lists the deployments for an environment.</p>"
+    },
+    "ListEnvironments":{
+      "name":"ListEnvironments",
+      "http":{
+        "method":"GET",
+        "requestUri":"/applications/{ApplicationId}/environments",
+        "responseCode":200
+      },
+      "input":{"shape":"ListEnvironmentsRequest"},
+      "output":{"shape":"Environments"},
+      "errors":[
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InternalServerException"},
+        {"shape":"BadRequestException"}
+      ],
+      "documentation":"<p>List the environments for an application.</p>"
+    },
+    "ListTagsForResource":{
+      "name":"ListTagsForResource",
+      "http":{
+        "method":"GET",
+        "requestUri":"/tags/{ResourceArn}",
+        "responseCode":200
+      },
+      "input":{"shape":"ListTagsForResourceRequest"},
+      "output":{"shape":"ResourceTags"},
+      "errors":[
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"BadRequestException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Retrieves the list of key-value tags assigned to the resource.</p>"
+    },
+    "StartDeployment":{
+      "name":"StartDeployment",
+      "http":{
+        "method":"POST",
+        "requestUri":"/applications/{ApplicationId}/environments/{EnvironmentId}/deployments",
+        "responseCode":201
+      },
+      "input":{"shape":"StartDeploymentRequest"},
+      "output":{"shape":"Deployment"},
+      "errors":[
+        {"shape":"BadRequestException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ConflictException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Starts a deployment.</p>"
+    },
+    "StopDeployment":{
+      "name":"StopDeployment",
+      "http":{
+        "method":"DELETE",
+        "requestUri":"/applications/{ApplicationId}/environments/{EnvironmentId}/deployments/{DeploymentNumber}",
+        "responseCode":202
+      },
+      "input":{"shape":"StopDeploymentRequest"},
+      "output":{"shape":"Deployment"},
+      "errors":[
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InternalServerException"},
+        {"shape":"BadRequestException"}
+      ],
+      "documentation":"<p>Stops a deployment. This API action works only on deployments that have a status of <code>DEPLOYING</code>. This action moves the deployment to a status of <code>ROLLED_BACK</code>.</p>"
+    },
+    "TagResource":{
+      "name":"TagResource",
+      "http":{
+        "method":"POST",
+        "requestUri":"/tags/{ResourceArn}",
+        "responseCode":204
+      },
+      "input":{"shape":"TagResourceRequest"},
+      "errors":[
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"BadRequestException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Metadata to assign to an AppConfig resource. Tags help organize and categorize your AppConfig resources. Each tag consists of a key and an optional value, both of which you define. You can specify a maximum of 50 tags for a resource.</p>"
+    },
+    "UntagResource":{
+      "name":"UntagResource",
+      "http":{
+        "method":"DELETE",
+        "requestUri":"/tags/{ResourceArn}",
+        "responseCode":204
+      },
+      "input":{"shape":"UntagResourceRequest"},
+      "errors":[
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"BadRequestException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Deletes a tag key and value from an AppConfig resource.</p>"
+    },
+    "UpdateApplication":{
+      "name":"UpdateApplication",
+      "http":{
+        "method":"PATCH",
+        "requestUri":"/applications/{ApplicationId}",
+        "responseCode":200
+      },
+      "input":{"shape":"UpdateApplicationRequest"},
+      "output":{"shape":"Application"},
+      "errors":[
+        {"shape":"BadRequestException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Updates an application.</p>"
+    },
+    "UpdateConfigurationProfile":{
+      "name":"UpdateConfigurationProfile",
+      "http":{
+        "method":"PATCH",
+        "requestUri":"/applications/{ApplicationId}/configurationprofiles/{ConfigurationProfileId}",
+        "responseCode":200
+      },
+      "input":{"shape":"UpdateConfigurationProfileRequest"},
+      "output":{"shape":"ConfigurationProfile"},
+      "errors":[
+        {"shape":"BadRequestException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Updates a configuration profile.</p>"
+    },
+    "UpdateDeploymentStrategy":{
+      "name":"UpdateDeploymentStrategy",
+      "http":{
+        "method":"PATCH",
+        "requestUri":"/deploymentstrategies/{DeploymentStrategyId}",
+        "responseCode":200
+      },
+      "input":{"shape":"UpdateDeploymentStrategyRequest"},
+      "output":{"shape":"DeploymentStrategy"},
+      "errors":[
+        {"shape":"BadRequestException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Updates a deployment strategy.</p>"
+    },
+    "UpdateEnvironment":{
+      "name":"UpdateEnvironment",
+      "http":{
+        "method":"PATCH",
+        "requestUri":"/applications/{ApplicationId}/environments/{EnvironmentId}",
+        "responseCode":200
+      },
+      "input":{"shape":"UpdateEnvironmentRequest"},
+      "output":{"shape":"Environment"},
+      "errors":[
+        {"shape":"BadRequestException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Updates an environment.</p>"
+    },
+    "ValidateConfiguration":{
+      "name":"ValidateConfiguration",
+      "http":{
+        "method":"POST",
+        "requestUri":"/applications/{ApplicationId}/configurationprofiles/{ConfigurationProfileId}/validators",
+        "responseCode":204
+      },
+      "input":{"shape":"ValidateConfigurationRequest"},
+      "errors":[
+        {"shape":"BadRequestException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Uses the validators in a configuration profile to validate a configuration.</p>"
+    }
+  },
+  "shapes":{
+    "Application":{
+      "type":"structure",
+      "members":{
+        "Id":{
+          "shape":"Id",
+          "documentation":"<p>The application ID.</p>"
+        },
+        "Name":{
+          "shape":"Name",
+          "documentation":"<p>The application name.</p>"
+        },
+        "Description":{
+          "shape":"Description",
+          "documentation":"<p>The description of the application.</p>"
+        }
+      }
+    },
+    "ApplicationList":{
+      "type":"list",
+      "member":{"shape":"Application"}
+    },
+    "Applications":{
+      "type":"structure",
+      "members":{
+        "Items":{
+          "shape":"ApplicationList",
+          "documentation":"<p>The elements from this collection.</p>"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>The token for the next set of items to return. Use this token to get the next set of results.</p>"
+        }
+      }
+    },
+    "Arn":{
+      "type":"string",
+      "max":2048,
+      "min":20,
+      "pattern":"arn:(aws[a-zA-Z-]*)?:[a-z]+:([a-z]{2}((-gov)|(-iso(b?)))?-[a-z]+-\\d{1})?:(\\d{12})?:[a-zA-Z0-9-_/:.]+"
+    },
+    "BadRequestException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"String"}
+      },
+      "documentation":"<p>The input fails to satisfy the constraints specified by an AWS service.</p>",
+      "error":{"httpStatusCode":400},
+      "exception":true
+    },
+    "Blob":{"type":"blob"},
+    "Configuration":{
+      "type":"structure",
+      "members":{
+        "Content":{
+          "shape":"Blob",
+          "documentation":"<p>The content of the configuration or the configuration data.</p>"
+        },
+        "ConfigurationVersion":{
+          "shape":"Version",
+          "documentation":"<p>The configuration version.</p>",
+          "location":"header",
+          "locationName":"Configuration-Version"
+        },
+        "ContentType":{
+          "shape":"String",
+          "documentation":"<p>A standard MIME type describing the format of the configuration content. For more information, see <a href=\"http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.17\">Content-Type</a>.</p>",
+          "location":"header",
+          "locationName":"Content-Type"
+        }
+      },
+      "payload":"Content"
+    },
+    "ConfigurationProfile":{
+      "type":"structure",
+      "members":{
+        "ApplicationId":{
+          "shape":"Id",
+          "documentation":"<p>The application ID.</p>"
+        },
+        "Id":{
+          "shape":"Id",
+          "documentation":"<p>The configuration profile ID.</p>"
+        },
+        "Name":{
+          "shape":"Name",
+          "documentation":"<p>The name of the configuration profile.</p>"
+        },
+        "Description":{
+          "shape":"Description",
+          "documentation":"<p>The configuration profile description.</p>"
+        },
+        "LocationUri":{
+          "shape":"Uri",
+          "documentation":"<p>The URI location of the configuration.</p>"
+        },
+        "RetrievalRoleArn":{
+          "shape":"Arn",
+          "documentation":"<p>The ARN of an IAM role with permission to access the configuration at the specified LocationUri.</p>"
+        },
+        "Validators":{
+          "shape":"ValidatorList",
+          "documentation":"<p>A list of methods for validating the configuration.</p>"
+        }
+      }
+    },
+    "ConfigurationProfileSummary":{
+      "type":"structure",
+      "members":{
+        "ApplicationId":{
+          "shape":"Id",
+          "documentation":"<p>The application ID.</p>"
+        },
+        "Id":{
+          "shape":"Id",
+          "documentation":"<p>The ID of the configuration profile.</p>"
+        },
+        "Name":{
+          "shape":"Name",
+          "documentation":"<p>The name of the configuration profile.</p>"
+        },
+        "LocationUri":{
+          "shape":"Uri",
+          "documentation":"<p>The URI location of the configuration.</p>"
+        },
+        "ValidatorTypes":{
+          "shape":"ValidatorTypeList",
+          "documentation":"<p>The types of validators in the configuration profile.</p>"
+        }
+      },
+      "documentation":"<p>A summary of a configuration profile.</p>"
+    },
+    "ConfigurationProfileSummaryList":{
+      "type":"list",
+      "member":{"shape":"ConfigurationProfileSummary"}
+    },
+    "ConfigurationProfiles":{
+      "type":"structure",
+      "members":{
+        "Items":{
+          "shape":"ConfigurationProfileSummaryList",
+          "documentation":"<p>The elements from this collection.</p>"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>The token for the next set of items to return. Use this token to get the next set of results.</p>"
+        }
+      }
+    },
+    "ConflictException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"String"}
+      },
+      "documentation":"<p>The request could not be processed because of conflict in the current state of the resource.</p>",
+      "error":{"httpStatusCode":409},
+      "exception":true
+    },
+    "CreateApplicationRequest":{
+      "type":"structure",
+      "required":["Name"],
+      "members":{
+        "Name":{
+          "shape":"Name",
+          "documentation":"<p>A name for the application.</p>"
+        },
+        "Description":{
+          "shape":"Description",
+          "documentation":"<p>A description of the application.</p>"
+        },
+        "Tags":{
+          "shape":"TagMap",
+          "documentation":"<p>Metadata to assign to the application. Tags help organize and categorize your AppConfig resources. Each tag consists of a key and an optional value, both of which you define.</p>"
+        }
+      }
+    },
+    "CreateConfigurationProfileRequest":{
+      "type":"structure",
+      "required":[
+        "ApplicationId",
+        "Name",
+        "LocationUri",
+        "RetrievalRoleArn"
+      ],
+      "members":{
+        "ApplicationId":{
+          "shape":"Id",
+          "documentation":"<p>The application ID.</p>",
+          "location":"uri",
+          "locationName":"ApplicationId"
+        },
+        "Name":{
+          "shape":"Name",
+          "documentation":"<p>A name for the configuration profile.</p>"
+        },
+        "Description":{
+          "shape":"Description",
+          "documentation":"<p>A description of the configuration profile.</p>"
+        },
+        "LocationUri":{
+          "shape":"Uri",
+          "documentation":"<p>A URI to locate the configuration. You can specify a Systems Manager (SSM) document, an SSM Parameter Store parameter, or an Amazon S3 object. For an SSM document, specify either the document name in the format <code>ssm-document://&lt;Document_name&gt;</code> or the Amazon Resource Name (ARN). For a parameter, specify either the parameter name in the format <code>ssm-parameter://&lt;Parameter_name&gt;</code> or the ARN. For an Amazon S3 object, specify the URI in the following format: <code>s3://&lt;bucket&gt;/&lt;objectKey&gt; </code>. Here is an example: s3://my-bucket/my-app/us-east-1/my-config.json</p>"
+        },
+        "RetrievalRoleArn":{
+          "shape":"Arn",
+          "documentation":"<p>The ARN of an IAM role with permission to access the configuration at the specified LocationUri.</p>"
+        },
+        "Validators":{
+          "shape":"ValidatorList",
+          "documentation":"<p>A list of methods for validating the configuration.</p>"
+        },
+        "Tags":{
+          "shape":"TagMap",
+          "documentation":"<p>Metadata to assign to the configuration profile. Tags help organize and categorize your AppConfig resources. Each tag consists of a key and an optional value, both of which you define.</p>"
+        }
+      }
+    },
+    "CreateDeploymentStrategyRequest":{
+      "type":"structure",
+      "required":[
+        "Name",
+        "DeploymentDurationInMinutes",
+        "GrowthFactor",
+        "ReplicateTo"
+      ],
+      "members":{
+        "Name":{
+          "shape":"Name",
+          "documentation":"<p>A name for the deployment strategy.</p>"
+        },
+        "Description":{
+          "shape":"Description",
+          "documentation":"<p>A description of the deployment strategy.</p>"
+        },
+        "DeploymentDurationInMinutes":{
+          "shape":"MinutesBetween0And24Hours",
+          "documentation":"<p>Total amount of time for a deployment to last.</p>",
+          "box":true
+        },
+        "FinalBakeTimeInMinutes":{
+          "shape":"MinutesBetween0And24Hours",
+          "documentation":"<p>The amount of time AppConfig monitors for alarms before considering the deployment to be complete and no longer eligible for automatic roll back.</p>"
+        },
+        "GrowthFactor":{
+          "shape":"GrowthFactor",
+          "documentation":"<p>The percentage of targets to receive a deployed configuration during each interval.</p>",
+          "box":true
+        },
+        "GrowthType":{
+          "shape":"GrowthType",
+          "documentation":"<p>The algorithm used to define how percentage grows over time. AWS AppConfig supports the following growth types:</p> <p> <b>Linear</b>: For this type, AppConfig processes the deployment by dividing the total number of targets by the value specified for <code>Step percentage</code>. For example, a linear deployment that uses a <code>Step percentage</code> of 10 deploys the configuration to 10 percent of the hosts. After those deployments are complete, the system deploys the configuration to the next 10 percent. This continues until 100% of the targets have successfully received the configuration.</p> <p> <b>Exponential</b>: For this type, AppConfig processes the deployment exponentially using the following formula: <code>G*(2^N)</code>. In this formula, <code>G</code> is the growth factor specified by the user and <code>N</code> is the number of steps until the configuration is deployed to all targets. For example, if you specify a growth factor of 2, then the system rolls out the configuration as follows:</p> <p> <code>2*(2^0)</code> </p> <p> <code>2*(2^1)</code> </p> <p> <code>2*(2^2)</code> </p> <p>Expressed numerically, the deployment rolls out as follows: 2% of the targets, 4% of the targets, 8% of the targets, and continues until the configuration has been deployed to all targets.</p>"
+        },
+        "ReplicateTo":{
+          "shape":"ReplicateTo",
+          "documentation":"<p>Save the deployment strategy to a Systems Manager (SSM) document.</p>"
+        },
+        "Tags":{
+          "shape":"TagMap",
+          "documentation":"<p>Metadata to assign to the deployment strategy. Tags help organize and categorize your AppConfig resources. Each tag consists of a key and an optional value, both of which you define.</p>"
+        }
+      }
+    },
+    "CreateEnvironmentRequest":{
+      "type":"structure",
+      "required":[
+        "ApplicationId",
+        "Name"
+      ],
+      "members":{
+        "ApplicationId":{
+          "shape":"Id",
+          "documentation":"<p>The application ID.</p>",
+          "location":"uri",
+          "locationName":"ApplicationId"
+        },
+        "Name":{
+          "shape":"Name",
+          "documentation":"<p>A name for the environment.</p>"
+        },
+        "Description":{
+          "shape":"Description",
+          "documentation":"<p>A description of the environment.</p>"
+        },
+        "Monitors":{
+          "shape":"MonitorList",
+          "documentation":"<p>Amazon CloudWatch alarms to monitor during the deployment process.</p>"
+        },
+        "Tags":{
+          "shape":"TagMap",
+          "documentation":"<p>Metadata to assign to the environment. Tags help organize and categorize your AppConfig resources. Each tag consists of a key and an optional value, both of which you define.</p>"
+        }
+      }
+    },
+    "DeleteApplicationRequest":{
+      "type":"structure",
+      "required":["ApplicationId"],
+      "members":{
+        "ApplicationId":{
+          "shape":"Id",
+          "documentation":"<p>The ID of the application to delete.</p>",
+          "location":"uri",
+          "locationName":"ApplicationId"
+        }
+      }
+    },
+    "DeleteConfigurationProfileRequest":{
+      "type":"structure",
+      "required":[
+        "ApplicationId",
+        "ConfigurationProfileId"
+      ],
+      "members":{
+        "ApplicationId":{
+          "shape":"Id",
+          "documentation":"<p>The application ID that includes the configuration profile you want to delete.</p>",
+          "location":"uri",
+          "locationName":"ApplicationId"
+        },
+        "ConfigurationProfileId":{
+          "shape":"Id",
+          "documentation":"<p>The ID of the configuration profile you want to delete.</p>",
+          "location":"uri",
+          "locationName":"ConfigurationProfileId"
+        }
+      }
+    },
+    "DeleteDeploymentStrategyRequest":{
+      "type":"structure",
+      "required":["DeploymentStrategyId"],
+      "members":{
+        "DeploymentStrategyId":{
+          "shape":"DeploymentStrategyId",
+          "documentation":"<p>The ID of the deployment strategy you want to delete.</p>",
+          "location":"uri",
+          "locationName":"DeploymentStrategyId"
+        }
+      }
+    },
+    "DeleteEnvironmentRequest":{
+      "type":"structure",
+      "required":[
+        "ApplicationId",
+        "EnvironmentId"
+      ],
+      "members":{
+        "ApplicationId":{
+          "shape":"Id",
+          "documentation":"<p>The application ID that includes the environment you want to delete.</p>",
+          "location":"uri",
+          "locationName":"ApplicationId"
+        },
+        "EnvironmentId":{
+          "shape":"Id",
+          "documentation":"<p>The ID of the environment you want to delete.</p>",
+          "location":"uri",
+          "locationName":"EnvironmentId"
+        }
+      }
+    },
+    "Deployment":{
+      "type":"structure",
+      "members":{
+        "ApplicationId":{
+          "shape":"Id",
+          "documentation":"<p>The ID of the application that was deployed.</p>"
+        },
+        "EnvironmentId":{
+          "shape":"Id",
+          "documentation":"<p>The ID of the environment that was deployed.</p>"
+        },
+        "DeploymentStrategyId":{
+          "shape":"Id",
+          "documentation":"<p>The ID of the deployment strategy that was deployed.</p>"
+        },
+        "ConfigurationProfileId":{
+          "shape":"Id",
+          "documentation":"<p>The ID of the configuration profile that was deployed.</p>"
+        },
+        "DeploymentNumber":{
+          "shape":"Integer",
+          "documentation":"<p>The sequence number of the deployment.</p>"
+        },
+        "ConfigurationName":{
+          "shape":"Name",
+          "documentation":"<p>The name of the configuration.</p>"
+        },
+        "ConfigurationLocationUri":{
+          "shape":"Uri",
+          "documentation":"<p>Information about the source location of the configuration.</p>"
+        },
+        "ConfigurationVersion":{
+          "shape":"Version",
+          "documentation":"<p>The configuration version that was deployed.</p>"
+        },
+        "Description":{
+          "shape":"Description",
+          "documentation":"<p>The description of the deployment.</p>"
+        },
+        "DeploymentDurationInMinutes":{
+          "shape":"MinutesBetween0And24Hours",
+          "documentation":"<p>Total amount of time the deployment lasted.</p>"
+        },
+        "GrowthType":{
+          "shape":"GrowthType",
+          "documentation":"<p>The algorithm used to define how percentage grew over time.</p>"
+        },
+        "GrowthFactor":{
+          "shape":"Percentage",
+          "documentation":"<p>The percentage of targets to receive a deployed configuration during each interval.</p>"
+        },
+        "FinalBakeTimeInMinutes":{
+          "shape":"MinutesBetween0And24Hours",
+          "documentation":"<p>The amount of time AppConfig monitored for alarms before considering the deployment to be complete and no longer eligible for automatic roll back.</p>"
+        },
+        "State":{
+          "shape":"DeploymentState",
+          "documentation":"<p>The state of the deployment.</p>"
+        },
+        "EventLog":{
+          "shape":"DeploymentEvents",
+          "documentation":"<p>A list containing all events related to a deployment. The most recent events are displayed first.</p>"
+        },
+        "PercentageComplete":{
+          "shape":"Percentage",
+          "documentation":"<p>The percentage of targets for which the deployment is available.</p>"
+        },
+        "StartedAt":{
+          "shape":"Iso8601DateTime",
+          "documentation":"<p>The time the deployment started.</p>"
+        },
+        "CompletedAt":{
+          "shape":"Iso8601DateTime",
+          "documentation":"<p>The time the deployment completed. </p>"
+        }
+      }
+    },
+    "DeploymentEvent":{
+      "type":"structure",
+      "members":{
+        "EventType":{
+          "shape":"DeploymentEventType",
+          "documentation":"<p>The type of deployment event. Deployment event types include the start, stop, or completion of a deployment; a percentage update; the start or stop of a bake period; the start or completion of a rollback.</p>"
+        },
+        "TriggeredBy":{
+          "shape":"TriggeredBy",
+          "documentation":"<p>The entity that triggered the deployment event. Events can be triggered by a user, AWS AppConfig, an Amazon CloudWatch alarm, or an internal error.</p>"
+        },
+        "Description":{
+          "shape":"Description",
+          "documentation":"<p>A description of the deployment event. Descriptions include, but are not limited to, the user account or the CloudWatch alarm ARN that initiated a rollback, the percentage of hosts that received the deployment, or in the case of an internal error, a recommendation to attempt a new deployment.</p>"
+        },
+        "OccurredAt":{
+          "shape":"Iso8601DateTime",
+          "documentation":"<p>The date and time the event occurred.</p>"
+        }
+      },
+      "documentation":"<p>An object that describes a deployment event.</p>"
+    },
+    "DeploymentEventType":{
+      "type":"string",
+      "enum":[
+        "PERCENTAGE_UPDATED",
+        "ROLLBACK_STARTED",
+        "ROLLBACK_COMPLETED",
+        "BAKE_TIME_STARTED",
+        "DEPLOYMENT_STARTED",
+        "DEPLOYMENT_COMPLETED"
+      ]
+    },
+    "DeploymentEvents":{
+      "type":"list",
+      "member":{"shape":"DeploymentEvent"}
+    },
+    "DeploymentList":{
+      "type":"list",
+      "member":{"shape":"DeploymentSummary"}
+    },
+    "DeploymentState":{
+      "type":"string",
+      "enum":[
+        "BAKING",
+        "VALIDATING",
+        "DEPLOYING",
+        "COMPLETE",
+        "ROLLING_BACK",
+        "ROLLED_BACK"
+      ]
+    },
+    "DeploymentStrategies":{
+      "type":"structure",
+      "members":{
+        "Items":{
+          "shape":"DeploymentStrategyList",
+          "documentation":"<p>The elements from this collection.</p>"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>The token for the next set of items to return. Use this token to get the next set of results.</p>"
+        }
+      }
+    },
+    "DeploymentStrategy":{
+      "type":"structure",
+      "members":{
+        "Id":{
+          "shape":"Id",
+          "documentation":"<p>The deployment strategy ID.</p>"
+        },
+        "Name":{
+          "shape":"Name",
+          "documentation":"<p>The name of the deployment strategy.</p>"
+        },
+        "Description":{
+          "shape":"Description",
+          "documentation":"<p>The description of the deployment strategy.</p>"
+        },
+        "DeploymentDurationInMinutes":{
+          "shape":"MinutesBetween0And24Hours",
+          "documentation":"<p>Total amount of time the deployment lasted.</p>"
+        },
+        "GrowthType":{
+          "shape":"GrowthType",
+          "documentation":"<p>The algorithm used to define how percentage grew over time.</p>"
+        },
+        "GrowthFactor":{
+          "shape":"Percentage",
+          "documentation":"<p>The percentage of targets that received a deployed configuration during each interval.</p>"
+        },
+        "FinalBakeTimeInMinutes":{
+          "shape":"MinutesBetween0And24Hours",
+          "documentation":"<p>The amount of time AppConfig monitored for alarms before considering the deployment to be complete and no longer eligible for automatic roll back.</p>"
+        },
+        "ReplicateTo":{
+          "shape":"ReplicateTo",
+          "documentation":"<p>Save the deployment strategy to a Systems Manager (SSM) document.</p>"
+        }
+      }
+    },
+    "DeploymentStrategyId":{
+      "type":"string",
+      "pattern":"([a-z0-9]{4,7}|arn:aws.*)"
+    },
+    "DeploymentStrategyList":{
+      "type":"list",
+      "member":{"shape":"DeploymentStrategy"}
+    },
+    "DeploymentSummary":{
+      "type":"structure",
+      "members":{
+        "DeploymentNumber":{
+          "shape":"Integer",
+          "documentation":"<p>The sequence number of the deployment.</p>"
+        },
+        "ConfigurationName":{
+          "shape":"Name",
+          "documentation":"<p>The name of the configuration.</p>"
+        },
+        "ConfigurationVersion":{
+          "shape":"Version",
+          "documentation":"<p>The version of the configuration.</p>"
+        },
+        "DeploymentDurationInMinutes":{
+          "shape":"MinutesBetween0And24Hours",
+          "documentation":"<p>Total amount of time the deployment lasted.</p>"
+        },
+        "GrowthType":{
+          "shape":"GrowthType",
+          "documentation":"<p>The algorithm used to define how percentage grows over time.</p>"
+        },
+        "GrowthFactor":{
+          "shape":"Percentage",
+          "documentation":"<p>The percentage of targets to receive a deployed configuration during each interval.</p>"
+        },
+        "FinalBakeTimeInMinutes":{
+          "shape":"MinutesBetween0And24Hours",
+          "documentation":"<p>The amount of time AppConfig monitors for alarms before considering the deployment to be complete and no longer eligible for automatic roll back.</p>"
+        },
+        "State":{
+          "shape":"DeploymentState",
+          "documentation":"<p>The state of the deployment.</p>"
+        },
+        "PercentageComplete":{
+          "shape":"Percentage",
+          "documentation":"<p>The percentage of targets for which the deployment is available.</p>"
+        },
+        "StartedAt":{
+          "shape":"Iso8601DateTime",
+          "documentation":"<p>Time the deployment started.</p>"
+        },
+        "CompletedAt":{
+          "shape":"Iso8601DateTime",
+          "documentation":"<p>Time the deployment completed.</p>"
+        }
+      },
+      "documentation":"<p>Information about the deployment.</p>"
+    },
+    "Deployments":{
+      "type":"structure",
+      "members":{
+        "Items":{
+          "shape":"DeploymentList",
+          "documentation":"<p>The elements from this collection.</p>"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>The token for the next set of items to return. Use this token to get the next set of results.</p>"
+        }
+      }
+    },
+    "Description":{
+      "type":"string",
+      "max":1024,
+      "min":0
+    },
+    "Environment":{
+      "type":"structure",
+      "members":{
+        "ApplicationId":{
+          "shape":"Id",
+          "documentation":"<p>The application ID.</p>"
+        },
+        "Id":{
+          "shape":"Id",
+          "documentation":"<p>The environment ID.</p>"
+        },
+        "Name":{
+          "shape":"Name",
+          "documentation":"<p>The name of the environment.</p>"
+        },
+        "Description":{
+          "shape":"Description",
+          "documentation":"<p>The description of the environment.</p>"
+        },
+        "State":{
+          "shape":"EnvironmentState",
+          "documentation":"<p>The state of the environment. An environment can be in one of the following states: <code>READY_FOR_DEPLOYMENT</code>, <code>DEPLOYING</code>, <code>ROLLING_BACK</code>, or <code>ROLLED_BACK</code> </p>"
+        },
+        "Monitors":{
+          "shape":"MonitorList",
+          "documentation":"<p>Amazon CloudWatch alarms monitored during the deployment.</p>"
+        }
+      }
+    },
+    "EnvironmentList":{
+      "type":"list",
+      "member":{"shape":"Environment"}
+    },
+    "EnvironmentState":{
+      "type":"string",
+      "enum":[
+        "READY_FOR_DEPLOYMENT",
+        "DEPLOYING",
+        "ROLLING_BACK",
+        "ROLLED_BACK"
+      ]
+    },
+    "Environments":{
+      "type":"structure",
+      "members":{
+        "Items":{
+          "shape":"EnvironmentList",
+          "documentation":"<p>The elements from this collection.</p>"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>The token for the next set of items to return. Use this token to get the next set of results.</p>"
+        }
+      }
+    },
+    "GetApplicationRequest":{
+      "type":"structure",
+      "required":["ApplicationId"],
+      "members":{
+        "ApplicationId":{
+          "shape":"Id",
+          "documentation":"<p>The ID of the application you want to get.</p>",
+          "location":"uri",
+          "locationName":"ApplicationId"
+        }
+      }
+    },
+    "GetConfigurationProfileRequest":{
+      "type":"structure",
+      "required":[
+        "ApplicationId",
+        "ConfigurationProfileId"
+      ],
+      "members":{
+        "ApplicationId":{
+          "shape":"Id",
+          "documentation":"<p>The ID of the application that includes the configuration profile you want to get.</p>",
+          "location":"uri",
+          "locationName":"ApplicationId"
+        },
+        "ConfigurationProfileId":{
+          "shape":"Id",
+          "documentation":"<p>The ID of the configuration profile you want to get.</p>",
+          "location":"uri",
+          "locationName":"ConfigurationProfileId"
+        }
+      }
+    },
+    "GetConfigurationRequest":{
+      "type":"structure",
+      "required":[
+        "Application",
+        "Environment",
+        "Configuration",
+        "ClientId"
+      ],
+      "members":{
+        "Application":{
+          "shape":"StringWithLengthBetween1And64",
+          "documentation":"<p>The application to get. Specify either the application name or the application ID.</p>",
+          "location":"uri",
+          "locationName":"Application"
+        },
+        "Environment":{
+          "shape":"StringWithLengthBetween1And64",
+          "documentation":"<p>The environment to get. Specify either the environment name or the environment ID.</p>",
+          "location":"uri",
+          "locationName":"Environment"
+        },
+        "Configuration":{
+          "shape":"StringWithLengthBetween1And64",
+          "documentation":"<p>The configuration to get. Specify either the configuration name or the configuration ID.</p>",
+          "location":"uri",
+          "locationName":"Configuration"
+        },
+        "ClientId":{
+          "shape":"StringWithLengthBetween1And64",
+          "documentation":"<p>A unique ID to identify the client for the configuration. This ID enables AppConfig to deploy the configuration in intervals, as defined in the deployment strategy.</p>",
+          "location":"querystring",
+          "locationName":"client_id"
+        },
+        "ClientConfigurationVersion":{
+          "shape":"Version",
+          "documentation":"<p>The configuration version returned in the most recent GetConfiguration response.</p>",
+          "location":"querystring",
+          "locationName":"client_configuration_version"
+        }
+      }
+    },
+    "GetDeploymentRequest":{
+      "type":"structure",
+      "required":[
+        "ApplicationId",
+        "EnvironmentId",
+        "DeploymentNumber"
+      ],
+      "members":{
+        "ApplicationId":{
+          "shape":"Id",
+          "documentation":"<p>The ID of the application that includes the deployment you want to get. </p>",
+          "location":"uri",
+          "locationName":"ApplicationId"
+        },
+        "EnvironmentId":{
+          "shape":"Id",
+          "documentation":"<p>The ID of the environment that includes the deployment you want to get. </p>",
+          "location":"uri",
+          "locationName":"EnvironmentId"
+        },
+        "DeploymentNumber":{
+          "shape":"Integer",
+          "documentation":"<p>The sequence number of the deployment.</p>",
+          "box":true,
+          "location":"uri",
+          "locationName":"DeploymentNumber"
+        }
+      }
+    },
+    "GetDeploymentStrategyRequest":{
+      "type":"structure",
+      "required":["DeploymentStrategyId"],
+      "members":{
+        "DeploymentStrategyId":{
+          "shape":"DeploymentStrategyId",
+          "documentation":"<p>The ID of the deployment strategy to get.</p>",
+          "location":"uri",
+          "locationName":"DeploymentStrategyId"
+        }
+      }
+    },
+    "GetEnvironmentRequest":{
+      "type":"structure",
+      "required":[
+        "ApplicationId",
+        "EnvironmentId"
+      ],
+      "members":{
+        "ApplicationId":{
+          "shape":"Id",
+          "documentation":"<p>The ID of the application that includes the environment you want to get.</p>",
+          "location":"uri",
+          "locationName":"ApplicationId"
+        },
+        "EnvironmentId":{
+          "shape":"Id",
+          "documentation":"<p>The ID of the environment you wnat to get.</p>",
+          "location":"uri",
+          "locationName":"EnvironmentId"
+        }
+      }
+    },
+    "GrowthFactor":{
+      "type":"float",
+      "max":100.0,
+      "min":1.0
+    },
+    "GrowthType":{
+      "type":"string",
+      "enum":[
+        "LINEAR",
+        "EXPONENTIAL"
+      ]
+    },
+    "Id":{
+      "type":"string",
+      "pattern":"[a-z0-9]{4,7}"
+    },
+    "Integer":{"type":"integer"},
+    "InternalServerException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"String"}
+      },
+      "documentation":"<p>There was an internal failure in the AppConfig service.</p>",
+      "error":{"httpStatusCode":500},
+      "exception":true,
+      "fault":true
+    },
+    "Iso8601DateTime":{
+      "type":"timestamp",
+      "timestampFormat":"iso8601"
+    },
+    "ListApplicationsRequest":{
+      "type":"structure",
+      "members":{
+        "MaxResults":{
+          "shape":"MaxResults",
+          "documentation":"<p>The maximum number of items to return for this call. The call also returns a token that you can specify in a subsequent call to get the next set of results.</p>",
+          "box":true,
+          "location":"querystring",
+          "locationName":"max_results"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>A token to start the list. Use this token to get the next set of results.</p>",
+          "location":"querystring",
+          "locationName":"next_token"
+        }
+      }
+    },
+    "ListConfigurationProfilesRequest":{
+      "type":"structure",
+      "required":["ApplicationId"],
+      "members":{
+        "ApplicationId":{
+          "shape":"Id",
+          "documentation":"<p>The application ID.</p>",
+          "location":"uri",
+          "locationName":"ApplicationId"
+        },
+        "MaxResults":{
+          "shape":"MaxResults",
+          "documentation":"<p>The maximum number of items to return for this call. The call also returns a token that you can specify in a subsequent call to get the next set of results.</p>",
+          "box":true,
+          "location":"querystring",
+          "locationName":"max_results"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>A token to start the list. Use this token to get the next set of results.</p>",
+          "location":"querystring",
+          "locationName":"next_token"
+        }
+      }
+    },
+    "ListDeploymentStrategiesRequest":{
+      "type":"structure",
+      "members":{
+        "MaxResults":{
+          "shape":"MaxResults",
+          "documentation":"<p>The maximum number of items to return for this call. The call also returns a token that you can specify in a subsequent call to get the next set of results.</p>",
+          "box":true,
+          "location":"querystring",
+          "locationName":"max_results"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>A token to start the list. Use this token to get the next set of results.</p>",
+          "location":"querystring",
+          "locationName":"next_token"
+        }
+      }
+    },
+    "ListDeploymentsRequest":{
+      "type":"structure",
+      "required":[
+        "ApplicationId",
+        "EnvironmentId"
+      ],
+      "members":{
+        "ApplicationId":{
+          "shape":"Id",
+          "documentation":"<p>The application ID.</p>",
+          "location":"uri",
+          "locationName":"ApplicationId"
+        },
+        "EnvironmentId":{
+          "shape":"Id",
+          "documentation":"<p>The environment ID.</p>",
+          "location":"uri",
+          "locationName":"EnvironmentId"
+        },
+        "MaxResults":{
+          "shape":"MaxResults",
+          "documentation":"<p>The maximum number of items to return for this call. The call also returns a token that you can specify in a subsequent call to get the next set of results.</p>",
+          "box":true,
+          "location":"querystring",
+          "locationName":"max_results"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>A token to start the list. Use this token to get the next set of results.</p>",
+          "location":"querystring",
+          "locationName":"next_token"
+        }
+      }
+    },
+    "ListEnvironmentsRequest":{
+      "type":"structure",
+      "required":["ApplicationId"],
+      "members":{
+        "ApplicationId":{
+          "shape":"Id",
+          "documentation":"<p>The application ID.</p>",
+          "location":"uri",
+          "locationName":"ApplicationId"
+        },
+        "MaxResults":{
+          "shape":"MaxResults",
+          "documentation":"<p>The maximum number of items to return for this call. The call also returns a token that you can specify in a subsequent call to get the next set of results.</p>",
+          "box":true,
+          "location":"querystring",
+          "locationName":"max_results"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>A token to start the list. Use this token to get the next set of results.</p>",
+          "location":"querystring",
+          "locationName":"next_token"
+        }
+      }
+    },
+    "ListTagsForResourceRequest":{
+      "type":"structure",
+      "required":["ResourceArn"],
+      "members":{
+        "ResourceArn":{
+          "shape":"Arn",
+          "documentation":"<p>The resource ARN.</p>",
+          "location":"uri",
+          "locationName":"ResourceArn"
+        }
+      }
+    },
+    "MaxResults":{
+      "type":"integer",
+      "max":50,
+      "min":1
+    },
+    "MinutesBetween0And24Hours":{
+      "type":"integer",
+      "max":1440,
+      "min":0
+    },
+    "Monitor":{
+      "type":"structure",
+      "members":{
+        "AlarmArn":{
+          "shape":"Arn",
+          "documentation":"<p>ARN of the Amazon CloudWatch alarm.</p>"
+        },
+        "AlarmRoleArn":{
+          "shape":"Arn",
+          "documentation":"<p>ARN of an IAM role for AppConfig to monitor <code>AlarmArn</code>.</p>"
+        }
+      },
+      "documentation":"<p>Amazon CloudWatch alarms to monitor during the deployment process.</p>"
+    },
+    "MonitorList":{
+      "type":"list",
+      "member":{"shape":"Monitor"},
+      "max":5,
+      "min":0
+    },
+    "Name":{
+      "type":"string",
+      "max":64,
+      "min":1
+    },
+    "NextToken":{
+      "type":"string",
+      "max":2048,
+      "min":1
+    },
+    "Percentage":{
+      "type":"float",
+      "max":100.0,
+      "min":1.0
+    },
+    "ReplicateTo":{
+      "type":"string",
+      "enum":[
+        "NONE",
+        "SSM_DOCUMENT"
+      ]
+    },
+    "ResourceNotFoundException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"String"},
+        "ResourceName":{"shape":"String"}
+      },
+      "documentation":"<p>The requested resource could not be found.</p>",
+      "error":{"httpStatusCode":404},
+      "exception":true
+    },
+    "ResourceTags":{
+      "type":"structure",
+      "members":{
+        "Tags":{
+          "shape":"TagMap",
+          "documentation":"<p>Metadata to assign to AppConfig resources. Tags help organize and categorize your AppConfig resources. Each tag consists of a key and an optional value, both of which you define.</p>"
+        }
+      }
+    },
+    "StartDeploymentRequest":{
+      "type":"structure",
+      "required":[
+        "ApplicationId",
+        "EnvironmentId",
+        "DeploymentStrategyId",
+        "ConfigurationProfileId",
+        "ConfigurationVersion"
+      ],
+      "members":{
+        "ApplicationId":{
+          "shape":"Id",
+          "documentation":"<p>The application ID.</p>",
+          "location":"uri",
+          "locationName":"ApplicationId"
+        },
+        "EnvironmentId":{
+          "shape":"Id",
+          "documentation":"<p>The environment ID.</p>",
+          "location":"uri",
+          "locationName":"EnvironmentId"
+        },
+        "DeploymentStrategyId":{
+          "shape":"DeploymentStrategyId",
+          "documentation":"<p>The deployment strategy ID.</p>"
+        },
+        "ConfigurationProfileId":{
+          "shape":"Id",
+          "documentation":"<p>The configuration profile ID.</p>"
+        },
+        "ConfigurationVersion":{
+          "shape":"Version",
+          "documentation":"<p>The configuration version to deploy.</p>"
+        },
+        "Description":{
+          "shape":"Description",
+          "documentation":"<p>A description of the deployment.</p>"
+        },
+        "Tags":{
+          "shape":"TagMap",
+          "documentation":"<p>Metadata to assign to the deployment. Tags help organize and categorize your AppConfig resources. Each tag consists of a key and an optional value, both of which you define.</p>"
+        }
+      }
+    },
+    "StopDeploymentRequest":{
+      "type":"structure",
+      "required":[
+        "ApplicationId",
+        "EnvironmentId",
+        "DeploymentNumber"
+      ],
+      "members":{
+        "ApplicationId":{
+          "shape":"Id",
+          "documentation":"<p>The application ID.</p>",
+          "location":"uri",
+          "locationName":"ApplicationId"
+        },
+        "EnvironmentId":{
+          "shape":"Id",
+          "documentation":"<p>The environment ID.</p>",
+          "location":"uri",
+          "locationName":"EnvironmentId"
+        },
+        "DeploymentNumber":{
+          "shape":"Integer",
+          "documentation":"<p>The sequence number of the deployment.</p>",
+          "box":true,
+          "location":"uri",
+          "locationName":"DeploymentNumber"
+        }
+      }
+    },
+    "String":{"type":"string"},
+    "StringWithLengthBetween0And32768":{
+      "type":"string",
+      "max":32768,
+      "min":0
+    },
+    "StringWithLengthBetween1And64":{
+      "type":"string",
+      "max":64,
+      "min":1
+    },
+    "TagKey":{
+      "type":"string",
+      "max":128,
+      "min":1
+    },
+    "TagKeyList":{
+      "type":"list",
+      "member":{"shape":"TagKey"},
+      "max":50,
+      "min":0
+    },
+    "TagMap":{
+      "type":"map",
+      "key":{"shape":"TagKey"},
+      "value":{"shape":"TagValue"},
+      "max":50,
+      "min":0
+    },
+    "TagResourceRequest":{
+      "type":"structure",
+      "required":[
+        "ResourceArn",
+        "Tags"
+      ],
+      "members":{
+        "ResourceArn":{
+          "shape":"Arn",
+          "documentation":"<p>The ARN of the resource for which to retrieve tags.</p>",
+          "location":"uri",
+          "locationName":"ResourceArn"
+        },
+        "Tags":{
+          "shape":"TagMap",
+          "documentation":"<p>The key-value string map. The valid character set is [a-zA-Z+-=._:/]. The tag key can be up to 128 characters and must not start with <code>aws:</code>. The tag value can be up to 256 characters.</p>"
+        }
+      }
+    },
+    "TagValue":{
+      "type":"string",
+      "max":256
+    },
+    "TriggeredBy":{
+      "type":"string",
+      "enum":[
+        "USER",
+        "APPCONFIG",
+        "CLOUDWATCH_ALARM",
+        "INTERNAL_ERROR"
+      ]
+    },
+    "UntagResourceRequest":{
+      "type":"structure",
+      "required":[
+        "ResourceArn",
+        "TagKeys"
+      ],
+      "members":{
+        "ResourceArn":{
+          "shape":"Arn",
+          "documentation":"<p>The ARN of the resource for which to remove tags.</p>",
+          "location":"uri",
+          "locationName":"ResourceArn"
+        },
+        "TagKeys":{
+          "shape":"TagKeyList",
+          "documentation":"<p>The tag keys to delete.</p>",
+          "location":"querystring",
+          "locationName":"tagKeys"
+        }
+      }
+    },
+    "UpdateApplicationRequest":{
+      "type":"structure",
+      "required":["ApplicationId"],
+      "members":{
+        "ApplicationId":{
+          "shape":"Id",
+          "documentation":"<p>The application ID.</p>",
+          "location":"uri",
+          "locationName":"ApplicationId"
+        },
+        "Name":{
+          "shape":"Name",
+          "documentation":"<p>The name of the application.</p>"
+        },
+        "Description":{
+          "shape":"Description",
+          "documentation":"<p>A description of the application.</p>"
+        }
+      }
+    },
+    "UpdateConfigurationProfileRequest":{
+      "type":"structure",
+      "required":[
+        "ApplicationId",
+        "ConfigurationProfileId"
+      ],
+      "members":{
+        "ApplicationId":{
+          "shape":"Id",
+          "documentation":"<p>The application ID.</p>",
+          "location":"uri",
+          "locationName":"ApplicationId"
+        },
+        "ConfigurationProfileId":{
+          "shape":"Id",
+          "documentation":"<p>The ID of the configuration profile.</p>",
+          "location":"uri",
+          "locationName":"ConfigurationProfileId"
+        },
+        "Name":{
+          "shape":"Name",
+          "documentation":"<p>The name of the configuration profile.</p>"
+        },
+        "Description":{
+          "shape":"Description",
+          "documentation":"<p>A description of the configuration profile.</p>"
+        },
+        "RetrievalRoleArn":{
+          "shape":"Arn",
+          "documentation":"<p>The ARN of an IAM role with permission to access the configuration at the specified LocationUri.</p>"
+        },
+        "Validators":{
+          "shape":"ValidatorList",
+          "documentation":"<p>A list of methods for validating the configuration.</p>"
+        }
+      }
+    },
+    "UpdateDeploymentStrategyRequest":{
+      "type":"structure",
+      "required":["DeploymentStrategyId"],
+      "members":{
+        "DeploymentStrategyId":{
+          "shape":"DeploymentStrategyId",
+          "documentation":"<p>The deployment strategy ID.</p>",
+          "location":"uri",
+          "locationName":"DeploymentStrategyId"
+        },
+        "Description":{
+          "shape":"Description",
+          "documentation":"<p>A description of the deployment strategy.</p>"
+        },
+        "DeploymentDurationInMinutes":{
+          "shape":"MinutesBetween0And24Hours",
+          "documentation":"<p>Total amount of time for a deployment to last.</p>",
+          "box":true
+        },
+        "FinalBakeTimeInMinutes":{
+          "shape":"MinutesBetween0And24Hours",
+          "documentation":"<p>The amount of time AppConfig monitors for alarms before considering the deployment to be complete and no longer eligible for automatic roll back.</p>",
+          "box":true
+        },
+        "GrowthFactor":{
+          "shape":"GrowthFactor",
+          "documentation":"<p>The percentage of targets to receive a deployed configuration during each interval.</p>",
+          "box":true
+        },
+        "GrowthType":{
+          "shape":"GrowthType",
+          "documentation":"<p>The algorithm used to define how percentage grows over time. AWS AppConfig supports the following growth types:</p> <p> <b>Linear</b>: For this type, AppConfig processes the deployment by increments of the growth factor evenly distributed over the deployment time. For example, a linear deployment that uses a growth factor of 20 initially makes the configuration available to 20 percent of the targets. After 1/5th of the deployment time has passed, the system updates the percentage to 40 percent. This continues until 100% of the targets are set to receive the deployed configuration.</p> <p> <b>Exponential</b>: For this type, AppConfig processes the deployment exponentially using the following formula: <code>G*(2^N)</code>. In this formula, <code>G</code> is the growth factor specified by the user and <code>N</code> is the number of steps until the configuration is deployed to all targets. For example, if you specify a growth factor of 2, then the system rolls out the configuration as follows:</p> <p> <code>2*(2^0)</code> </p> <p> <code>2*(2^1)</code> </p> <p> <code>2*(2^2)</code> </p> <p>Expressed numerically, the deployment rolls out as follows: 2% of the targets, 4% of the targets, 8% of the targets, and continues until the configuration has been deployed to all targets.</p>"
+        }
+      }
+    },
+    "UpdateEnvironmentRequest":{
+      "type":"structure",
+      "required":[
+        "ApplicationId",
+        "EnvironmentId"
+      ],
+      "members":{
+        "ApplicationId":{
+          "shape":"Id",
+          "documentation":"<p>The application ID.</p>",
+          "location":"uri",
+          "locationName":"ApplicationId"
+        },
+        "EnvironmentId":{
+          "shape":"Id",
+          "documentation":"<p>The environment ID.</p>",
+          "location":"uri",
+          "locationName":"EnvironmentId"
+        },
+        "Name":{
+          "shape":"Name",
+          "documentation":"<p>The name of the environment.</p>"
+        },
+        "Description":{
+          "shape":"Description",
+          "documentation":"<p>A description of the environment.</p>"
+        },
+        "Monitors":{
+          "shape":"MonitorList",
+          "documentation":"<p>Amazon CloudWatch alarms to monitor during the deployment process.</p>"
+        }
+      }
+    },
+    "Uri":{
+      "type":"string",
+      "max":2048,
+      "min":1
+    },
+    "ValidateConfigurationRequest":{
+      "type":"structure",
+      "required":[
+        "ApplicationId",
+        "ConfigurationProfileId",
+        "ConfigurationVersion"
+      ],
+      "members":{
+        "ApplicationId":{
+          "shape":"Id",
+          "documentation":"<p>The application ID.</p>",
+          "location":"uri",
+          "locationName":"ApplicationId"
+        },
+        "ConfigurationProfileId":{
+          "shape":"Id",
+          "documentation":"<p>The configuration profile ID.</p>",
+          "location":"uri",
+          "locationName":"ConfigurationProfileId"
+        },
+        "ConfigurationVersion":{
+          "shape":"Version",
+          "documentation":"<p>The version of the configuration to validate.</p>",
+          "location":"querystring",
+          "locationName":"configuration_version"
+        }
+      }
+    },
+    "Validator":{
+      "type":"structure",
+      "required":[
+        "Type",
+        "Content"
+      ],
+      "members":{
+        "Type":{
+          "shape":"ValidatorType",
+          "documentation":"<p>AppConfig supports validators of type <code>JSON_SCHEMA</code> and <code>LAMBDA</code> </p>"
+        },
+        "Content":{
+          "shape":"StringWithLengthBetween0And32768",
+          "documentation":"<p>Either the JSON Schema content or the Amazon Resource Name (ARN) of an AWS Lambda function.</p>"
+        }
+      },
+      "documentation":"<p>A validator provides a syntactic or semantic check to ensure the configuration you want to deploy functions as intended. To validate your application configuration data, you provide a schema or a Lambda function that runs against the configuration. The configuration deployment or update can only proceed when the configuration data is valid.</p>"
+    },
+    "ValidatorList":{
+      "type":"list",
+      "member":{"shape":"Validator"},
+      "max":2,
+      "min":0
+    },
+    "ValidatorType":{
+      "type":"string",
+      "enum":[
+        "JSON_SCHEMA",
+        "LAMBDA"
+      ]
+    },
+    "ValidatorTypeList":{
+      "type":"list",
+      "member":{"shape":"ValidatorType"},
+      "max":2,
+      "min":0
+    },
+    "Version":{
+      "type":"string",
+      "max":128,
+      "min":1
+    }
+  },
+  "documentation":"<fullname>AWS AppConfig</fullname> <p>Use AWS AppConfig, a capability of AWS Systems Manager, to create, manage, and quickly deploy application configurations. AppConfig supports controlled deployments to applications of any size and includes built-in validation checks and monitoring. You can use AppConfig with applications hosted on Amazon EC2 instances, AWS Lambda, containers, mobile applications, or IoT devices.</p> <p>To prevent errors when deploying application configurations, especially for production systems where a simple typo could cause an unexpected outage, AppConfig includes validators. A validator provides a syntactic or semantic check to ensure that the configuration you want to deploy works as intended. To validate your application configuration data, you provide a schema or a Lambda function that runs against the configuration. The configuration deployment or update can only proceed when the configuration data is valid.</p> <p>During a configuration deployment, AppConfig monitors the application to ensure that the deployment is successful. If the system encounters an error, AppConfig rolls back the change to minimize impact for your application users. You can configure a deployment strategy for each application or environment that includes deployment criteria, including velocity, bake time, and alarms to monitor. Similar to error monitoring, if a deployment triggers an alarm, AppConfig automatically rolls back to the previous version. </p> <p>AppConfig supports multiple use cases. Here are some examples.</p> <ul> <li> <p> <b>Application tuning</b>: Use AppConfig to carefully introduce changes to your application that can only be tested with production traffic.</p> </li> <li> <p> <b>Feature toggle</b>: Use AppConfig to turn on new features that require a timely deployment, such as a product launch or announcement. </p> </li> <li> <p> <b>User membership</b>: Use AppConfig to allow premium subscribers to access paid content. </p> </li> <li> <p> <b>Operational issues</b>: Use AppConfig to reduce stress on your application when a dependency or other external factor impacts the system.</p> </li> </ul> <p>This reference is intended to be used with the <a href=\"http://docs.aws.amazon.com/systems-manager/latest/userguide/appconfig.html\">AWS AppConfig User Guide</a>.</p>"
+}
diff --git a/services/applicationautoscaling/build.properties b/services/applicationautoscaling/build.properties
index ecf2dae6fcb1..15ec2da1fc71 100644
--- a/services/applicationautoscaling/build.properties
+++ b/services/applicationautoscaling/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/applicationautoscaling/pom.xml b/services/applicationautoscaling/pom.xml
index d92593cf5055..23502d714885 100644
--- a/services/applicationautoscaling/pom.xml
+++ b/services/applicationautoscaling/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>applicationautoscaling</artifactId>
     <name>AWS Java SDK :: Services :: AWS Application Auto Scaling</name>
diff --git a/services/applicationautoscaling/src/it/java/software/amazon/awssdk/services/applicationautoscaling/ServiceIntegrationTest.java b/services/applicationautoscaling/src/it/java/software/amazon/awssdk/services/applicationautoscaling/ServiceIntegrationTest.java
index 64cd71f19317..4ab1cbd5bdc5 100644
--- a/services/applicationautoscaling/src/it/java/software/amazon/awssdk/services/applicationautoscaling/ServiceIntegrationTest.java
+++ b/services/applicationautoscaling/src/it/java/software/amazon/awssdk/services/applicationautoscaling/ServiceIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/applicationautoscaling/src/main/resources/codegen-resources/service-2.json b/services/applicationautoscaling/src/main/resources/codegen-resources/service-2.json
index e8e551b1b265..21a638e7fc8f 100644
--- a/services/applicationautoscaling/src/main/resources/codegen-resources/service-2.json
+++ b/services/applicationautoscaling/src/main/resources/codegen-resources/service-2.json
@@ -2,7 +2,7 @@
   "version":"2.0",
   "metadata":{
     "apiVersion":"2016-02-06",
-    "endpointPrefix":"autoscaling",
+    "endpointPrefix":"application-autoscaling",
     "jsonVersion":"1.1",
     "protocol":"json",
     "serviceFullName":"Application Auto Scaling",
@@ -268,11 +268,11 @@
         },
         "ResourceId":{
           "shape":"ResourceIdMaxLen1600",
-          "documentation":"<p>The identifier of the resource associated with the scalable target. This string consists of the resource type and unique identifier.</p> <ul> <li> <p>ECS service - The resource type is <code>service</code> and the unique identifier is the cluster name and service name. Example: <code>service/default/sample-webapp</code>.</p> </li> <li> <p>Spot Fleet request - The resource type is <code>spot-fleet-request</code> and the unique identifier is the Spot Fleet request ID. Example: <code>spot-fleet-request/sfr-73fbd2ce-aa30-494c-8788-1cee4EXAMPLE</code>.</p> </li> <li> <p>EMR cluster - The resource type is <code>instancegroup</code> and the unique identifier is the cluster ID and instance group ID. Example: <code>instancegroup/j-2EEZNYKUA1NTV/ig-1791Y4E1L8YI0</code>.</p> </li> <li> <p>AppStream 2.0 fleet - The resource type is <code>fleet</code> and the unique identifier is the fleet name. Example: <code>fleet/sample-fleet</code>.</p> </li> <li> <p>DynamoDB table - The resource type is <code>table</code> and the unique identifier is the resource ID. Example: <code>table/my-table</code>.</p> </li> <li> <p>DynamoDB global secondary index - The resource type is <code>index</code> and the unique identifier is the resource ID. Example: <code>table/my-table/index/my-table-index</code>.</p> </li> <li> <p>Aurora DB cluster - The resource type is <code>cluster</code> and the unique identifier is the cluster name. Example: <code>cluster:my-db-cluster</code>.</p> </li> <li> <p>Amazon SageMaker endpoint variants - The resource type is <code>variant</code> and the unique identifier is the resource ID. Example: <code>endpoint/my-end-point/variant/KMeansClustering</code>.</p> </li> <li> <p>Custom resources are not supported with a resource type. This parameter must specify the <code>OutputValue</code> from the CloudFormation template stack used to access the resources. The unique identifier is defined by the service provider. More information is available in our <a href=\"https://github.com/aws/aws-auto-scaling-custom-resource\">GitHub repository</a>.</p> </li> </ul>"
+          "documentation":"<p>The identifier of the resource associated with the scalable target. This string consists of the resource type and unique identifier.</p> <ul> <li> <p>ECS service - The resource type is <code>service</code> and the unique identifier is the cluster name and service name. Example: <code>service/default/sample-webapp</code>.</p> </li> <li> <p>Spot Fleet request - The resource type is <code>spot-fleet-request</code> and the unique identifier is the Spot Fleet request ID. Example: <code>spot-fleet-request/sfr-73fbd2ce-aa30-494c-8788-1cee4EXAMPLE</code>.</p> </li> <li> <p>EMR cluster - The resource type is <code>instancegroup</code> and the unique identifier is the cluster ID and instance group ID. Example: <code>instancegroup/j-2EEZNYKUA1NTV/ig-1791Y4E1L8YI0</code>.</p> </li> <li> <p>AppStream 2.0 fleet - The resource type is <code>fleet</code> and the unique identifier is the fleet name. Example: <code>fleet/sample-fleet</code>.</p> </li> <li> <p>DynamoDB table - The resource type is <code>table</code> and the unique identifier is the table name. Example: <code>table/my-table</code>.</p> </li> <li> <p>DynamoDB global secondary index - The resource type is <code>index</code> and the unique identifier is the index name. Example: <code>table/my-table/index/my-table-index</code>.</p> </li> <li> <p>Aurora DB cluster - The resource type is <code>cluster</code> and the unique identifier is the cluster name. Example: <code>cluster:my-db-cluster</code>.</p> </li> <li> <p>Amazon SageMaker endpoint variant - The resource type is <code>variant</code> and the unique identifier is the resource ID. Example: <code>endpoint/my-end-point/variant/KMeansClustering</code>.</p> </li> <li> <p>Custom resources are not supported with a resource type. This parameter must specify the <code>OutputValue</code> from the CloudFormation template stack used to access the resources. The unique identifier is defined by the service provider. More information is available in our <a href=\"https://github.com/aws/aws-auto-scaling-custom-resource\">GitHub repository</a>.</p> </li> <li> <p>Amazon Comprehend document classification endpoint - The resource type and unique identifier are specified using the endpoint ARN. Example: <code>arn:aws:comprehend:us-west-2:123456789012:document-classifier-endpoint/EXAMPLE</code>.</p> </li> <li> <p>Lambda provisioned concurrency - The resource type is <code>function</code> and the unique identifier is the function name with a function version or alias name suffix that is not <code>$LATEST</code>. Example: <code>function:my-function:prod</code> or <code>function:my-function:1</code>.</p> </li> </ul>"
         },
         "ScalableDimension":{
           "shape":"ScalableDimension",
-          "documentation":"<p>The scalable dimension. This string consists of the service namespace, resource type, and scaling property.</p> <ul> <li> <p> <code>ecs:service:DesiredCount</code> - The desired task count of an ECS service.</p> </li> <li> <p> <code>ec2:spot-fleet-request:TargetCapacity</code> - The target capacity of a Spot Fleet request.</p> </li> <li> <p> <code>elasticmapreduce:instancegroup:InstanceCount</code> - The instance count of an EMR Instance Group.</p> </li> <li> <p> <code>appstream:fleet:DesiredCapacity</code> - The desired capacity of an AppStream 2.0 fleet.</p> </li> <li> <p> <code>dynamodb:table:ReadCapacityUnits</code> - The provisioned read capacity for a DynamoDB table.</p> </li> <li> <p> <code>dynamodb:table:WriteCapacityUnits</code> - The provisioned write capacity for a DynamoDB table.</p> </li> <li> <p> <code>dynamodb:index:ReadCapacityUnits</code> - The provisioned read capacity for a DynamoDB global secondary index.</p> </li> <li> <p> <code>dynamodb:index:WriteCapacityUnits</code> - The provisioned write capacity for a DynamoDB global secondary index.</p> </li> <li> <p> <code>rds:cluster:ReadReplicaCount</code> - The count of Aurora Replicas in an Aurora DB cluster. Available for Aurora MySQL-compatible edition and Aurora PostgreSQL-compatible edition.</p> </li> <li> <p> <code>sagemaker:variant:DesiredInstanceCount</code> - The number of EC2 instances for an Amazon SageMaker model endpoint variant.</p> </li> <li> <p> <code>custom-resource:ResourceType:Property</code> - The scalable dimension for a custom resource provided by your own application or service.</p> </li> </ul>"
+          "documentation":"<p>The scalable dimension. This string consists of the service namespace, resource type, and scaling property.</p> <ul> <li> <p> <code>ecs:service:DesiredCount</code> - The desired task count of an ECS service.</p> </li> <li> <p> <code>ec2:spot-fleet-request:TargetCapacity</code> - The target capacity of a Spot Fleet request.</p> </li> <li> <p> <code>elasticmapreduce:instancegroup:InstanceCount</code> - The instance count of an EMR Instance Group.</p> </li> <li> <p> <code>appstream:fleet:DesiredCapacity</code> - The desired capacity of an AppStream 2.0 fleet.</p> </li> <li> <p> <code>dynamodb:table:ReadCapacityUnits</code> - The provisioned read capacity for a DynamoDB table.</p> </li> <li> <p> <code>dynamodb:table:WriteCapacityUnits</code> - The provisioned write capacity for a DynamoDB table.</p> </li> <li> <p> <code>dynamodb:index:ReadCapacityUnits</code> - The provisioned read capacity for a DynamoDB global secondary index.</p> </li> <li> <p> <code>dynamodb:index:WriteCapacityUnits</code> - The provisioned write capacity for a DynamoDB global secondary index.</p> </li> <li> <p> <code>rds:cluster:ReadReplicaCount</code> - The count of Aurora Replicas in an Aurora DB cluster. Available for Aurora MySQL-compatible edition and Aurora PostgreSQL-compatible edition.</p> </li> <li> <p> <code>sagemaker:variant:DesiredInstanceCount</code> - The number of EC2 instances for an Amazon SageMaker model endpoint variant.</p> </li> <li> <p> <code>custom-resource:ResourceType:Property</code> - The scalable dimension for a custom resource provided by your own application or service.</p> </li> <li> <p> <code>comprehend:document-classifier-endpoint:DesiredInferenceUnits</code> - The number of inference units for an Amazon Comprehend document classification endpoint.</p> </li> <li> <p> <code>lambda:function:ProvisionedConcurrency</code> - The provisioned concurrency for a Lambda function.</p> </li> </ul>"
         }
       }
     },
@@ -300,11 +300,11 @@
         },
         "ResourceId":{
           "shape":"ResourceIdMaxLen1600",
-          "documentation":"<p>The identifier of the resource associated with the scheduled action. This string consists of the resource type and unique identifier.</p> <ul> <li> <p>ECS service - The resource type is <code>service</code> and the unique identifier is the cluster name and service name. Example: <code>service/default/sample-webapp</code>.</p> </li> <li> <p>Spot Fleet request - The resource type is <code>spot-fleet-request</code> and the unique identifier is the Spot Fleet request ID. Example: <code>spot-fleet-request/sfr-73fbd2ce-aa30-494c-8788-1cee4EXAMPLE</code>.</p> </li> <li> <p>EMR cluster - The resource type is <code>instancegroup</code> and the unique identifier is the cluster ID and instance group ID. Example: <code>instancegroup/j-2EEZNYKUA1NTV/ig-1791Y4E1L8YI0</code>.</p> </li> <li> <p>AppStream 2.0 fleet - The resource type is <code>fleet</code> and the unique identifier is the fleet name. Example: <code>fleet/sample-fleet</code>.</p> </li> <li> <p>DynamoDB table - The resource type is <code>table</code> and the unique identifier is the resource ID. Example: <code>table/my-table</code>.</p> </li> <li> <p>DynamoDB global secondary index - The resource type is <code>index</code> and the unique identifier is the resource ID. Example: <code>table/my-table/index/my-table-index</code>.</p> </li> <li> <p>Aurora DB cluster - The resource type is <code>cluster</code> and the unique identifier is the cluster name. Example: <code>cluster:my-db-cluster</code>.</p> </li> <li> <p>Amazon SageMaker endpoint variants - The resource type is <code>variant</code> and the unique identifier is the resource ID. Example: <code>endpoint/my-end-point/variant/KMeansClustering</code>.</p> </li> <li> <p>Custom resources are not supported with a resource type. This parameter must specify the <code>OutputValue</code> from the CloudFormation template stack used to access the resources. The unique identifier is defined by the service provider. More information is available in our <a href=\"https://github.com/aws/aws-auto-scaling-custom-resource\">GitHub repository</a>.</p> </li> </ul>"
+          "documentation":"<p>The identifier of the resource associated with the scheduled action. This string consists of the resource type and unique identifier.</p> <ul> <li> <p>ECS service - The resource type is <code>service</code> and the unique identifier is the cluster name and service name. Example: <code>service/default/sample-webapp</code>.</p> </li> <li> <p>Spot Fleet request - The resource type is <code>spot-fleet-request</code> and the unique identifier is the Spot Fleet request ID. Example: <code>spot-fleet-request/sfr-73fbd2ce-aa30-494c-8788-1cee4EXAMPLE</code>.</p> </li> <li> <p>EMR cluster - The resource type is <code>instancegroup</code> and the unique identifier is the cluster ID and instance group ID. Example: <code>instancegroup/j-2EEZNYKUA1NTV/ig-1791Y4E1L8YI0</code>.</p> </li> <li> <p>AppStream 2.0 fleet - The resource type is <code>fleet</code> and the unique identifier is the fleet name. Example: <code>fleet/sample-fleet</code>.</p> </li> <li> <p>DynamoDB table - The resource type is <code>table</code> and the unique identifier is the table name. Example: <code>table/my-table</code>.</p> </li> <li> <p>DynamoDB global secondary index - The resource type is <code>index</code> and the unique identifier is the index name. Example: <code>table/my-table/index/my-table-index</code>.</p> </li> <li> <p>Aurora DB cluster - The resource type is <code>cluster</code> and the unique identifier is the cluster name. Example: <code>cluster:my-db-cluster</code>.</p> </li> <li> <p>Amazon SageMaker endpoint variant - The resource type is <code>variant</code> and the unique identifier is the resource ID. Example: <code>endpoint/my-end-point/variant/KMeansClustering</code>.</p> </li> <li> <p>Custom resources are not supported with a resource type. This parameter must specify the <code>OutputValue</code> from the CloudFormation template stack used to access the resources. The unique identifier is defined by the service provider. More information is available in our <a href=\"https://github.com/aws/aws-auto-scaling-custom-resource\">GitHub repository</a>.</p> </li> <li> <p>Amazon Comprehend document classification endpoint - The resource type and unique identifier are specified using the endpoint ARN. Example: <code>arn:aws:comprehend:us-west-2:123456789012:document-classifier-endpoint/EXAMPLE</code>.</p> </li> <li> <p>Lambda provisioned concurrency - The resource type is <code>function</code> and the unique identifier is the function name with a function version or alias name suffix that is not <code>$LATEST</code>. Example: <code>function:my-function:prod</code> or <code>function:my-function:1</code>.</p> </li> </ul>"
         },
         "ScalableDimension":{
           "shape":"ScalableDimension",
-          "documentation":"<p>The scalable dimension. This string consists of the service namespace, resource type, and scaling property.</p> <ul> <li> <p> <code>ecs:service:DesiredCount</code> - The desired task count of an ECS service.</p> </li> <li> <p> <code>ec2:spot-fleet-request:TargetCapacity</code> - The target capacity of a Spot Fleet request.</p> </li> <li> <p> <code>elasticmapreduce:instancegroup:InstanceCount</code> - The instance count of an EMR Instance Group.</p> </li> <li> <p> <code>appstream:fleet:DesiredCapacity</code> - The desired capacity of an AppStream 2.0 fleet.</p> </li> <li> <p> <code>dynamodb:table:ReadCapacityUnits</code> - The provisioned read capacity for a DynamoDB table.</p> </li> <li> <p> <code>dynamodb:table:WriteCapacityUnits</code> - The provisioned write capacity for a DynamoDB table.</p> </li> <li> <p> <code>dynamodb:index:ReadCapacityUnits</code> - The provisioned read capacity for a DynamoDB global secondary index.</p> </li> <li> <p> <code>dynamodb:index:WriteCapacityUnits</code> - The provisioned write capacity for a DynamoDB global secondary index.</p> </li> <li> <p> <code>rds:cluster:ReadReplicaCount</code> - The count of Aurora Replicas in an Aurora DB cluster. Available for Aurora MySQL-compatible edition and Aurora PostgreSQL-compatible edition.</p> </li> <li> <p> <code>sagemaker:variant:DesiredInstanceCount</code> - The number of EC2 instances for an Amazon SageMaker model endpoint variant.</p> </li> <li> <p> <code>custom-resource:ResourceType:Property</code> - The scalable dimension for a custom resource provided by your own application or service.</p> </li> </ul>"
+          "documentation":"<p>The scalable dimension. This string consists of the service namespace, resource type, and scaling property.</p> <ul> <li> <p> <code>ecs:service:DesiredCount</code> - The desired task count of an ECS service.</p> </li> <li> <p> <code>ec2:spot-fleet-request:TargetCapacity</code> - The target capacity of a Spot Fleet request.</p> </li> <li> <p> <code>elasticmapreduce:instancegroup:InstanceCount</code> - The instance count of an EMR Instance Group.</p> </li> <li> <p> <code>appstream:fleet:DesiredCapacity</code> - The desired capacity of an AppStream 2.0 fleet.</p> </li> <li> <p> <code>dynamodb:table:ReadCapacityUnits</code> - The provisioned read capacity for a DynamoDB table.</p> </li> <li> <p> <code>dynamodb:table:WriteCapacityUnits</code> - The provisioned write capacity for a DynamoDB table.</p> </li> <li> <p> <code>dynamodb:index:ReadCapacityUnits</code> - The provisioned read capacity for a DynamoDB global secondary index.</p> </li> <li> <p> <code>dynamodb:index:WriteCapacityUnits</code> - The provisioned write capacity for a DynamoDB global secondary index.</p> </li> <li> <p> <code>rds:cluster:ReadReplicaCount</code> - The count of Aurora Replicas in an Aurora DB cluster. Available for Aurora MySQL-compatible edition and Aurora PostgreSQL-compatible edition.</p> </li> <li> <p> <code>sagemaker:variant:DesiredInstanceCount</code> - The number of EC2 instances for an Amazon SageMaker model endpoint variant.</p> </li> <li> <p> <code>custom-resource:ResourceType:Property</code> - The scalable dimension for a custom resource provided by your own application or service.</p> </li> <li> <p> <code>comprehend:document-classifier-endpoint:DesiredInferenceUnits</code> - The number of inference units for an Amazon Comprehend document classification endpoint.</p> </li> <li> <p> <code>lambda:function:ProvisionedConcurrency</code> - The provisioned concurrency for a Lambda function.</p> </li> </ul>"
         }
       }
     },
@@ -327,11 +327,11 @@
         },
         "ResourceId":{
           "shape":"ResourceIdMaxLen1600",
-          "documentation":"<p>The identifier of the resource associated with the scalable target. This string consists of the resource type and unique identifier.</p> <ul> <li> <p>ECS service - The resource type is <code>service</code> and the unique identifier is the cluster name and service name. Example: <code>service/default/sample-webapp</code>.</p> </li> <li> <p>Spot Fleet request - The resource type is <code>spot-fleet-request</code> and the unique identifier is the Spot Fleet request ID. Example: <code>spot-fleet-request/sfr-73fbd2ce-aa30-494c-8788-1cee4EXAMPLE</code>.</p> </li> <li> <p>EMR cluster - The resource type is <code>instancegroup</code> and the unique identifier is the cluster ID and instance group ID. Example: <code>instancegroup/j-2EEZNYKUA1NTV/ig-1791Y4E1L8YI0</code>.</p> </li> <li> <p>AppStream 2.0 fleet - The resource type is <code>fleet</code> and the unique identifier is the fleet name. Example: <code>fleet/sample-fleet</code>.</p> </li> <li> <p>DynamoDB table - The resource type is <code>table</code> and the unique identifier is the resource ID. Example: <code>table/my-table</code>.</p> </li> <li> <p>DynamoDB global secondary index - The resource type is <code>index</code> and the unique identifier is the resource ID. Example: <code>table/my-table/index/my-table-index</code>.</p> </li> <li> <p>Aurora DB cluster - The resource type is <code>cluster</code> and the unique identifier is the cluster name. Example: <code>cluster:my-db-cluster</code>.</p> </li> <li> <p>Amazon SageMaker endpoint variants - The resource type is <code>variant</code> and the unique identifier is the resource ID. Example: <code>endpoint/my-end-point/variant/KMeansClustering</code>.</p> </li> <li> <p>Custom resources are not supported with a resource type. This parameter must specify the <code>OutputValue</code> from the CloudFormation template stack used to access the resources. The unique identifier is defined by the service provider. More information is available in our <a href=\"https://github.com/aws/aws-auto-scaling-custom-resource\">GitHub repository</a>.</p> </li> </ul>"
+          "documentation":"<p>The identifier of the resource associated with the scalable target. This string consists of the resource type and unique identifier.</p> <ul> <li> <p>ECS service - The resource type is <code>service</code> and the unique identifier is the cluster name and service name. Example: <code>service/default/sample-webapp</code>.</p> </li> <li> <p>Spot Fleet request - The resource type is <code>spot-fleet-request</code> and the unique identifier is the Spot Fleet request ID. Example: <code>spot-fleet-request/sfr-73fbd2ce-aa30-494c-8788-1cee4EXAMPLE</code>.</p> </li> <li> <p>EMR cluster - The resource type is <code>instancegroup</code> and the unique identifier is the cluster ID and instance group ID. Example: <code>instancegroup/j-2EEZNYKUA1NTV/ig-1791Y4E1L8YI0</code>.</p> </li> <li> <p>AppStream 2.0 fleet - The resource type is <code>fleet</code> and the unique identifier is the fleet name. Example: <code>fleet/sample-fleet</code>.</p> </li> <li> <p>DynamoDB table - The resource type is <code>table</code> and the unique identifier is the table name. Example: <code>table/my-table</code>.</p> </li> <li> <p>DynamoDB global secondary index - The resource type is <code>index</code> and the unique identifier is the index name. Example: <code>table/my-table/index/my-table-index</code>.</p> </li> <li> <p>Aurora DB cluster - The resource type is <code>cluster</code> and the unique identifier is the cluster name. Example: <code>cluster:my-db-cluster</code>.</p> </li> <li> <p>Amazon SageMaker endpoint variant - The resource type is <code>variant</code> and the unique identifier is the resource ID. Example: <code>endpoint/my-end-point/variant/KMeansClustering</code>.</p> </li> <li> <p>Custom resources are not supported with a resource type. This parameter must specify the <code>OutputValue</code> from the CloudFormation template stack used to access the resources. The unique identifier is defined by the service provider. More information is available in our <a href=\"https://github.com/aws/aws-auto-scaling-custom-resource\">GitHub repository</a>.</p> </li> <li> <p>Amazon Comprehend document classification endpoint - The resource type and unique identifier are specified using the endpoint ARN. Example: <code>arn:aws:comprehend:us-west-2:123456789012:document-classifier-endpoint/EXAMPLE</code>.</p> </li> <li> <p>Lambda provisioned concurrency - The resource type is <code>function</code> and the unique identifier is the function name with a function version or alias name suffix that is not <code>$LATEST</code>. Example: <code>function:my-function:prod</code> or <code>function:my-function:1</code>.</p> </li> </ul>"
         },
         "ScalableDimension":{
           "shape":"ScalableDimension",
-          "documentation":"<p>The scalable dimension associated with the scalable target. This string consists of the service namespace, resource type, and scaling property.</p> <ul> <li> <p> <code>ecs:service:DesiredCount</code> - The desired task count of an ECS service.</p> </li> <li> <p> <code>ec2:spot-fleet-request:TargetCapacity</code> - The target capacity of a Spot Fleet request.</p> </li> <li> <p> <code>elasticmapreduce:instancegroup:InstanceCount</code> - The instance count of an EMR Instance Group.</p> </li> <li> <p> <code>appstream:fleet:DesiredCapacity</code> - The desired capacity of an AppStream 2.0 fleet.</p> </li> <li> <p> <code>dynamodb:table:ReadCapacityUnits</code> - The provisioned read capacity for a DynamoDB table.</p> </li> <li> <p> <code>dynamodb:table:WriteCapacityUnits</code> - The provisioned write capacity for a DynamoDB table.</p> </li> <li> <p> <code>dynamodb:index:ReadCapacityUnits</code> - The provisioned read capacity for a DynamoDB global secondary index.</p> </li> <li> <p> <code>dynamodb:index:WriteCapacityUnits</code> - The provisioned write capacity for a DynamoDB global secondary index.</p> </li> <li> <p> <code>rds:cluster:ReadReplicaCount</code> - The count of Aurora Replicas in an Aurora DB cluster. Available for Aurora MySQL-compatible edition and Aurora PostgreSQL-compatible edition.</p> </li> <li> <p> <code>sagemaker:variant:DesiredInstanceCount</code> - The number of EC2 instances for an Amazon SageMaker model endpoint variant.</p> </li> <li> <p> <code>custom-resource:ResourceType:Property</code> - The scalable dimension for a custom resource provided by your own application or service.</p> </li> </ul>"
+          "documentation":"<p>The scalable dimension associated with the scalable target. This string consists of the service namespace, resource type, and scaling property.</p> <ul> <li> <p> <code>ecs:service:DesiredCount</code> - The desired task count of an ECS service.</p> </li> <li> <p> <code>ec2:spot-fleet-request:TargetCapacity</code> - The target capacity of a Spot Fleet request.</p> </li> <li> <p> <code>elasticmapreduce:instancegroup:InstanceCount</code> - The instance count of an EMR Instance Group.</p> </li> <li> <p> <code>appstream:fleet:DesiredCapacity</code> - The desired capacity of an AppStream 2.0 fleet.</p> </li> <li> <p> <code>dynamodb:table:ReadCapacityUnits</code> - The provisioned read capacity for a DynamoDB table.</p> </li> <li> <p> <code>dynamodb:table:WriteCapacityUnits</code> - The provisioned write capacity for a DynamoDB table.</p> </li> <li> <p> <code>dynamodb:index:ReadCapacityUnits</code> - The provisioned read capacity for a DynamoDB global secondary index.</p> </li> <li> <p> <code>dynamodb:index:WriteCapacityUnits</code> - The provisioned write capacity for a DynamoDB global secondary index.</p> </li> <li> <p> <code>rds:cluster:ReadReplicaCount</code> - The count of Aurora Replicas in an Aurora DB cluster. Available for Aurora MySQL-compatible edition and Aurora PostgreSQL-compatible edition.</p> </li> <li> <p> <code>sagemaker:variant:DesiredInstanceCount</code> - The number of EC2 instances for an Amazon SageMaker model endpoint variant.</p> </li> <li> <p> <code>custom-resource:ResourceType:Property</code> - The scalable dimension for a custom resource provided by your own application or service.</p> </li> <li> <p> <code>comprehend:document-classifier-endpoint:DesiredInferenceUnits</code> - The number of inference units for an Amazon Comprehend document classification endpoint.</p> </li> <li> <p> <code>lambda:function:ProvisionedConcurrency</code> - The provisioned concurrency for a Lambda function.</p> </li> </ul>"
         }
       }
     },
@@ -350,11 +350,11 @@
         },
         "ResourceIds":{
           "shape":"ResourceIdsMaxLen1600",
-          "documentation":"<p>The identifier of the resource associated with the scalable target. This string consists of the resource type and unique identifier. If you specify a scalable dimension, you must also specify a resource ID.</p> <ul> <li> <p>ECS service - The resource type is <code>service</code> and the unique identifier is the cluster name and service name. Example: <code>service/default/sample-webapp</code>.</p> </li> <li> <p>Spot Fleet request - The resource type is <code>spot-fleet-request</code> and the unique identifier is the Spot Fleet request ID. Example: <code>spot-fleet-request/sfr-73fbd2ce-aa30-494c-8788-1cee4EXAMPLE</code>.</p> </li> <li> <p>EMR cluster - The resource type is <code>instancegroup</code> and the unique identifier is the cluster ID and instance group ID. Example: <code>instancegroup/j-2EEZNYKUA1NTV/ig-1791Y4E1L8YI0</code>.</p> </li> <li> <p>AppStream 2.0 fleet - The resource type is <code>fleet</code> and the unique identifier is the fleet name. Example: <code>fleet/sample-fleet</code>.</p> </li> <li> <p>DynamoDB table - The resource type is <code>table</code> and the unique identifier is the resource ID. Example: <code>table/my-table</code>.</p> </li> <li> <p>DynamoDB global secondary index - The resource type is <code>index</code> and the unique identifier is the resource ID. Example: <code>table/my-table/index/my-table-index</code>.</p> </li> <li> <p>Aurora DB cluster - The resource type is <code>cluster</code> and the unique identifier is the cluster name. Example: <code>cluster:my-db-cluster</code>.</p> </li> <li> <p>Amazon SageMaker endpoint variants - The resource type is <code>variant</code> and the unique identifier is the resource ID. Example: <code>endpoint/my-end-point/variant/KMeansClustering</code>.</p> </li> <li> <p>Custom resources are not supported with a resource type. This parameter must specify the <code>OutputValue</code> from the CloudFormation template stack used to access the resources. The unique identifier is defined by the service provider. More information is available in our <a href=\"https://github.com/aws/aws-auto-scaling-custom-resource\">GitHub repository</a>.</p> </li> </ul>"
+          "documentation":"<p>The identifier of the resource associated with the scalable target. This string consists of the resource type and unique identifier. If you specify a scalable dimension, you must also specify a resource ID.</p> <ul> <li> <p>ECS service - The resource type is <code>service</code> and the unique identifier is the cluster name and service name. Example: <code>service/default/sample-webapp</code>.</p> </li> <li> <p>Spot Fleet request - The resource type is <code>spot-fleet-request</code> and the unique identifier is the Spot Fleet request ID. Example: <code>spot-fleet-request/sfr-73fbd2ce-aa30-494c-8788-1cee4EXAMPLE</code>.</p> </li> <li> <p>EMR cluster - The resource type is <code>instancegroup</code> and the unique identifier is the cluster ID and instance group ID. Example: <code>instancegroup/j-2EEZNYKUA1NTV/ig-1791Y4E1L8YI0</code>.</p> </li> <li> <p>AppStream 2.0 fleet - The resource type is <code>fleet</code> and the unique identifier is the fleet name. Example: <code>fleet/sample-fleet</code>.</p> </li> <li> <p>DynamoDB table - The resource type is <code>table</code> and the unique identifier is the table name. Example: <code>table/my-table</code>.</p> </li> <li> <p>DynamoDB global secondary index - The resource type is <code>index</code> and the unique identifier is the index name. Example: <code>table/my-table/index/my-table-index</code>.</p> </li> <li> <p>Aurora DB cluster - The resource type is <code>cluster</code> and the unique identifier is the cluster name. Example: <code>cluster:my-db-cluster</code>.</p> </li> <li> <p>Amazon SageMaker endpoint variant - The resource type is <code>variant</code> and the unique identifier is the resource ID. Example: <code>endpoint/my-end-point/variant/KMeansClustering</code>.</p> </li> <li> <p>Custom resources are not supported with a resource type. This parameter must specify the <code>OutputValue</code> from the CloudFormation template stack used to access the resources. The unique identifier is defined by the service provider. More information is available in our <a href=\"https://github.com/aws/aws-auto-scaling-custom-resource\">GitHub repository</a>.</p> </li> <li> <p>Amazon Comprehend document classification endpoint - The resource type and unique identifier are specified using the endpoint ARN. Example: <code>arn:aws:comprehend:us-west-2:123456789012:document-classifier-endpoint/EXAMPLE</code>.</p> </li> <li> <p>Lambda provisioned concurrency - The resource type is <code>function</code> and the unique identifier is the function name with a function version or alias name suffix that is not <code>$LATEST</code>. Example: <code>function:my-function:prod</code> or <code>function:my-function:1</code>.</p> </li> </ul>"
         },
         "ScalableDimension":{
           "shape":"ScalableDimension",
-          "documentation":"<p>The scalable dimension associated with the scalable target. This string consists of the service namespace, resource type, and scaling property. If you specify a scalable dimension, you must also specify a resource ID.</p> <ul> <li> <p> <code>ecs:service:DesiredCount</code> - The desired task count of an ECS service.</p> </li> <li> <p> <code>ec2:spot-fleet-request:TargetCapacity</code> - The target capacity of a Spot Fleet request.</p> </li> <li> <p> <code>elasticmapreduce:instancegroup:InstanceCount</code> - The instance count of an EMR Instance Group.</p> </li> <li> <p> <code>appstream:fleet:DesiredCapacity</code> - The desired capacity of an AppStream 2.0 fleet.</p> </li> <li> <p> <code>dynamodb:table:ReadCapacityUnits</code> - The provisioned read capacity for a DynamoDB table.</p> </li> <li> <p> <code>dynamodb:table:WriteCapacityUnits</code> - The provisioned write capacity for a DynamoDB table.</p> </li> <li> <p> <code>dynamodb:index:ReadCapacityUnits</code> - The provisioned read capacity for a DynamoDB global secondary index.</p> </li> <li> <p> <code>dynamodb:index:WriteCapacityUnits</code> - The provisioned write capacity for a DynamoDB global secondary index.</p> </li> <li> <p> <code>rds:cluster:ReadReplicaCount</code> - The count of Aurora Replicas in an Aurora DB cluster. Available for Aurora MySQL-compatible edition and Aurora PostgreSQL-compatible edition.</p> </li> <li> <p> <code>sagemaker:variant:DesiredInstanceCount</code> - The number of EC2 instances for an Amazon SageMaker model endpoint variant.</p> </li> <li> <p> <code>custom-resource:ResourceType:Property</code> - The scalable dimension for a custom resource provided by your own application or service.</p> </li> </ul>"
+          "documentation":"<p>The scalable dimension associated with the scalable target. This string consists of the service namespace, resource type, and scaling property. If you specify a scalable dimension, you must also specify a resource ID.</p> <ul> <li> <p> <code>ecs:service:DesiredCount</code> - The desired task count of an ECS service.</p> </li> <li> <p> <code>ec2:spot-fleet-request:TargetCapacity</code> - The target capacity of a Spot Fleet request.</p> </li> <li> <p> <code>elasticmapreduce:instancegroup:InstanceCount</code> - The instance count of an EMR Instance Group.</p> </li> <li> <p> <code>appstream:fleet:DesiredCapacity</code> - The desired capacity of an AppStream 2.0 fleet.</p> </li> <li> <p> <code>dynamodb:table:ReadCapacityUnits</code> - The provisioned read capacity for a DynamoDB table.</p> </li> <li> <p> <code>dynamodb:table:WriteCapacityUnits</code> - The provisioned write capacity for a DynamoDB table.</p> </li> <li> <p> <code>dynamodb:index:ReadCapacityUnits</code> - The provisioned read capacity for a DynamoDB global secondary index.</p> </li> <li> <p> <code>dynamodb:index:WriteCapacityUnits</code> - The provisioned write capacity for a DynamoDB global secondary index.</p> </li> <li> <p> <code>rds:cluster:ReadReplicaCount</code> - The count of Aurora Replicas in an Aurora DB cluster. Available for Aurora MySQL-compatible edition and Aurora PostgreSQL-compatible edition.</p> </li> <li> <p> <code>sagemaker:variant:DesiredInstanceCount</code> - The number of EC2 instances for an Amazon SageMaker model endpoint variant.</p> </li> <li> <p> <code>custom-resource:ResourceType:Property</code> - The scalable dimension for a custom resource provided by your own application or service.</p> </li> <li> <p> <code>comprehend:document-classifier-endpoint:DesiredInferenceUnits</code> - The number of inference units for an Amazon Comprehend document classification endpoint.</p> </li> <li> <p> <code>lambda:function:ProvisionedConcurrency</code> - The provisioned concurrency for a Lambda function.</p> </li> </ul>"
         },
         "MaxResults":{
           "shape":"MaxResults",
@@ -389,11 +389,11 @@
         },
         "ResourceId":{
           "shape":"ResourceIdMaxLen1600",
-          "documentation":"<p>The identifier of the resource associated with the scaling activity. This string consists of the resource type and unique identifier. If you specify a scalable dimension, you must also specify a resource ID.</p> <ul> <li> <p>ECS service - The resource type is <code>service</code> and the unique identifier is the cluster name and service name. Example: <code>service/default/sample-webapp</code>.</p> </li> <li> <p>Spot Fleet request - The resource type is <code>spot-fleet-request</code> and the unique identifier is the Spot Fleet request ID. Example: <code>spot-fleet-request/sfr-73fbd2ce-aa30-494c-8788-1cee4EXAMPLE</code>.</p> </li> <li> <p>EMR cluster - The resource type is <code>instancegroup</code> and the unique identifier is the cluster ID and instance group ID. Example: <code>instancegroup/j-2EEZNYKUA1NTV/ig-1791Y4E1L8YI0</code>.</p> </li> <li> <p>AppStream 2.0 fleet - The resource type is <code>fleet</code> and the unique identifier is the fleet name. Example: <code>fleet/sample-fleet</code>.</p> </li> <li> <p>DynamoDB table - The resource type is <code>table</code> and the unique identifier is the resource ID. Example: <code>table/my-table</code>.</p> </li> <li> <p>DynamoDB global secondary index - The resource type is <code>index</code> and the unique identifier is the resource ID. Example: <code>table/my-table/index/my-table-index</code>.</p> </li> <li> <p>Aurora DB cluster - The resource type is <code>cluster</code> and the unique identifier is the cluster name. Example: <code>cluster:my-db-cluster</code>.</p> </li> <li> <p>Amazon SageMaker endpoint variants - The resource type is <code>variant</code> and the unique identifier is the resource ID. Example: <code>endpoint/my-end-point/variant/KMeansClustering</code>.</p> </li> <li> <p>Custom resources are not supported with a resource type. This parameter must specify the <code>OutputValue</code> from the CloudFormation template stack used to access the resources. The unique identifier is defined by the service provider. More information is available in our <a href=\"https://github.com/aws/aws-auto-scaling-custom-resource\">GitHub repository</a>.</p> </li> </ul>"
+          "documentation":"<p>The identifier of the resource associated with the scaling activity. This string consists of the resource type and unique identifier. If you specify a scalable dimension, you must also specify a resource ID.</p> <ul> <li> <p>ECS service - The resource type is <code>service</code> and the unique identifier is the cluster name and service name. Example: <code>service/default/sample-webapp</code>.</p> </li> <li> <p>Spot Fleet request - The resource type is <code>spot-fleet-request</code> and the unique identifier is the Spot Fleet request ID. Example: <code>spot-fleet-request/sfr-73fbd2ce-aa30-494c-8788-1cee4EXAMPLE</code>.</p> </li> <li> <p>EMR cluster - The resource type is <code>instancegroup</code> and the unique identifier is the cluster ID and instance group ID. Example: <code>instancegroup/j-2EEZNYKUA1NTV/ig-1791Y4E1L8YI0</code>.</p> </li> <li> <p>AppStream 2.0 fleet - The resource type is <code>fleet</code> and the unique identifier is the fleet name. Example: <code>fleet/sample-fleet</code>.</p> </li> <li> <p>DynamoDB table - The resource type is <code>table</code> and the unique identifier is the table name. Example: <code>table/my-table</code>.</p> </li> <li> <p>DynamoDB global secondary index - The resource type is <code>index</code> and the unique identifier is the index name. Example: <code>table/my-table/index/my-table-index</code>.</p> </li> <li> <p>Aurora DB cluster - The resource type is <code>cluster</code> and the unique identifier is the cluster name. Example: <code>cluster:my-db-cluster</code>.</p> </li> <li> <p>Amazon SageMaker endpoint variant - The resource type is <code>variant</code> and the unique identifier is the resource ID. Example: <code>endpoint/my-end-point/variant/KMeansClustering</code>.</p> </li> <li> <p>Custom resources are not supported with a resource type. This parameter must specify the <code>OutputValue</code> from the CloudFormation template stack used to access the resources. The unique identifier is defined by the service provider. More information is available in our <a href=\"https://github.com/aws/aws-auto-scaling-custom-resource\">GitHub repository</a>.</p> </li> <li> <p>Amazon Comprehend document classification endpoint - The resource type and unique identifier are specified using the endpoint ARN. Example: <code>arn:aws:comprehend:us-west-2:123456789012:document-classifier-endpoint/EXAMPLE</code>.</p> </li> <li> <p>Lambda provisioned concurrency - The resource type is <code>function</code> and the unique identifier is the function name with a function version or alias name suffix that is not <code>$LATEST</code>. Example: <code>function:my-function:prod</code> or <code>function:my-function:1</code>.</p> </li> </ul>"
         },
         "ScalableDimension":{
           "shape":"ScalableDimension",
-          "documentation":"<p>The scalable dimension. This string consists of the service namespace, resource type, and scaling property. If you specify a scalable dimension, you must also specify a resource ID.</p> <ul> <li> <p> <code>ecs:service:DesiredCount</code> - The desired task count of an ECS service.</p> </li> <li> <p> <code>ec2:spot-fleet-request:TargetCapacity</code> - The target capacity of a Spot Fleet request.</p> </li> <li> <p> <code>elasticmapreduce:instancegroup:InstanceCount</code> - The instance count of an EMR Instance Group.</p> </li> <li> <p> <code>appstream:fleet:DesiredCapacity</code> - The desired capacity of an AppStream 2.0 fleet.</p> </li> <li> <p> <code>dynamodb:table:ReadCapacityUnits</code> - The provisioned read capacity for a DynamoDB table.</p> </li> <li> <p> <code>dynamodb:table:WriteCapacityUnits</code> - The provisioned write capacity for a DynamoDB table.</p> </li> <li> <p> <code>dynamodb:index:ReadCapacityUnits</code> - The provisioned read capacity for a DynamoDB global secondary index.</p> </li> <li> <p> <code>dynamodb:index:WriteCapacityUnits</code> - The provisioned write capacity for a DynamoDB global secondary index.</p> </li> <li> <p> <code>rds:cluster:ReadReplicaCount</code> - The count of Aurora Replicas in an Aurora DB cluster. Available for Aurora MySQL-compatible edition and Aurora PostgreSQL-compatible edition.</p> </li> <li> <p> <code>sagemaker:variant:DesiredInstanceCount</code> - The number of EC2 instances for an Amazon SageMaker model endpoint variant.</p> </li> <li> <p> <code>custom-resource:ResourceType:Property</code> - The scalable dimension for a custom resource provided by your own application or service.</p> </li> </ul>"
+          "documentation":"<p>The scalable dimension. This string consists of the service namespace, resource type, and scaling property. If you specify a scalable dimension, you must also specify a resource ID.</p> <ul> <li> <p> <code>ecs:service:DesiredCount</code> - The desired task count of an ECS service.</p> </li> <li> <p> <code>ec2:spot-fleet-request:TargetCapacity</code> - The target capacity of a Spot Fleet request.</p> </li> <li> <p> <code>elasticmapreduce:instancegroup:InstanceCount</code> - The instance count of an EMR Instance Group.</p> </li> <li> <p> <code>appstream:fleet:DesiredCapacity</code> - The desired capacity of an AppStream 2.0 fleet.</p> </li> <li> <p> <code>dynamodb:table:ReadCapacityUnits</code> - The provisioned read capacity for a DynamoDB table.</p> </li> <li> <p> <code>dynamodb:table:WriteCapacityUnits</code> - The provisioned write capacity for a DynamoDB table.</p> </li> <li> <p> <code>dynamodb:index:ReadCapacityUnits</code> - The provisioned read capacity for a DynamoDB global secondary index.</p> </li> <li> <p> <code>dynamodb:index:WriteCapacityUnits</code> - The provisioned write capacity for a DynamoDB global secondary index.</p> </li> <li> <p> <code>rds:cluster:ReadReplicaCount</code> - The count of Aurora Replicas in an Aurora DB cluster. Available for Aurora MySQL-compatible edition and Aurora PostgreSQL-compatible edition.</p> </li> <li> <p> <code>sagemaker:variant:DesiredInstanceCount</code> - The number of EC2 instances for an Amazon SageMaker model endpoint variant.</p> </li> <li> <p> <code>custom-resource:ResourceType:Property</code> - The scalable dimension for a custom resource provided by your own application or service.</p> </li> <li> <p> <code>comprehend:document-classifier-endpoint:DesiredInferenceUnits</code> - The number of inference units for an Amazon Comprehend document classification endpoint.</p> </li> <li> <p> <code>lambda:function:ProvisionedConcurrency</code> - The provisioned concurrency for a Lambda function.</p> </li> </ul>"
         },
         "MaxResults":{
           "shape":"MaxResults",
@@ -432,11 +432,11 @@
         },
         "ResourceId":{
           "shape":"ResourceIdMaxLen1600",
-          "documentation":"<p>The identifier of the resource associated with the scaling policy. This string consists of the resource type and unique identifier. If you specify a scalable dimension, you must also specify a resource ID.</p> <ul> <li> <p>ECS service - The resource type is <code>service</code> and the unique identifier is the cluster name and service name. Example: <code>service/default/sample-webapp</code>.</p> </li> <li> <p>Spot Fleet request - The resource type is <code>spot-fleet-request</code> and the unique identifier is the Spot Fleet request ID. Example: <code>spot-fleet-request/sfr-73fbd2ce-aa30-494c-8788-1cee4EXAMPLE</code>.</p> </li> <li> <p>EMR cluster - The resource type is <code>instancegroup</code> and the unique identifier is the cluster ID and instance group ID. Example: <code>instancegroup/j-2EEZNYKUA1NTV/ig-1791Y4E1L8YI0</code>.</p> </li> <li> <p>AppStream 2.0 fleet - The resource type is <code>fleet</code> and the unique identifier is the fleet name. Example: <code>fleet/sample-fleet</code>.</p> </li> <li> <p>DynamoDB table - The resource type is <code>table</code> and the unique identifier is the resource ID. Example: <code>table/my-table</code>.</p> </li> <li> <p>DynamoDB global secondary index - The resource type is <code>index</code> and the unique identifier is the resource ID. Example: <code>table/my-table/index/my-table-index</code>.</p> </li> <li> <p>Aurora DB cluster - The resource type is <code>cluster</code> and the unique identifier is the cluster name. Example: <code>cluster:my-db-cluster</code>.</p> </li> <li> <p>Amazon SageMaker endpoint variants - The resource type is <code>variant</code> and the unique identifier is the resource ID. Example: <code>endpoint/my-end-point/variant/KMeansClustering</code>.</p> </li> <li> <p>Custom resources are not supported with a resource type. This parameter must specify the <code>OutputValue</code> from the CloudFormation template stack used to access the resources. The unique identifier is defined by the service provider. More information is available in our <a href=\"https://github.com/aws/aws-auto-scaling-custom-resource\">GitHub repository</a>.</p> </li> </ul>"
+          "documentation":"<p>The identifier of the resource associated with the scaling policy. This string consists of the resource type and unique identifier. If you specify a scalable dimension, you must also specify a resource ID.</p> <ul> <li> <p>ECS service - The resource type is <code>service</code> and the unique identifier is the cluster name and service name. Example: <code>service/default/sample-webapp</code>.</p> </li> <li> <p>Spot Fleet request - The resource type is <code>spot-fleet-request</code> and the unique identifier is the Spot Fleet request ID. Example: <code>spot-fleet-request/sfr-73fbd2ce-aa30-494c-8788-1cee4EXAMPLE</code>.</p> </li> <li> <p>EMR cluster - The resource type is <code>instancegroup</code> and the unique identifier is the cluster ID and instance group ID. Example: <code>instancegroup/j-2EEZNYKUA1NTV/ig-1791Y4E1L8YI0</code>.</p> </li> <li> <p>AppStream 2.0 fleet - The resource type is <code>fleet</code> and the unique identifier is the fleet name. Example: <code>fleet/sample-fleet</code>.</p> </li> <li> <p>DynamoDB table - The resource type is <code>table</code> and the unique identifier is the table name. Example: <code>table/my-table</code>.</p> </li> <li> <p>DynamoDB global secondary index - The resource type is <code>index</code> and the unique identifier is the index name. Example: <code>table/my-table/index/my-table-index</code>.</p> </li> <li> <p>Aurora DB cluster - The resource type is <code>cluster</code> and the unique identifier is the cluster name. Example: <code>cluster:my-db-cluster</code>.</p> </li> <li> <p>Amazon SageMaker endpoint variant - The resource type is <code>variant</code> and the unique identifier is the resource ID. Example: <code>endpoint/my-end-point/variant/KMeansClustering</code>.</p> </li> <li> <p>Custom resources are not supported with a resource type. This parameter must specify the <code>OutputValue</code> from the CloudFormation template stack used to access the resources. The unique identifier is defined by the service provider. More information is available in our <a href=\"https://github.com/aws/aws-auto-scaling-custom-resource\">GitHub repository</a>.</p> </li> <li> <p>Amazon Comprehend document classification endpoint - The resource type and unique identifier are specified using the endpoint ARN. Example: <code>arn:aws:comprehend:us-west-2:123456789012:document-classifier-endpoint/EXAMPLE</code>.</p> </li> <li> <p>Lambda provisioned concurrency - The resource type is <code>function</code> and the unique identifier is the function name with a function version or alias name suffix that is not <code>$LATEST</code>. Example: <code>function:my-function:prod</code> or <code>function:my-function:1</code>.</p> </li> </ul>"
         },
         "ScalableDimension":{
           "shape":"ScalableDimension",
-          "documentation":"<p>The scalable dimension. This string consists of the service namespace, resource type, and scaling property. If you specify a scalable dimension, you must also specify a resource ID.</p> <ul> <li> <p> <code>ecs:service:DesiredCount</code> - The desired task count of an ECS service.</p> </li> <li> <p> <code>ec2:spot-fleet-request:TargetCapacity</code> - The target capacity of a Spot Fleet request.</p> </li> <li> <p> <code>elasticmapreduce:instancegroup:InstanceCount</code> - The instance count of an EMR Instance Group.</p> </li> <li> <p> <code>appstream:fleet:DesiredCapacity</code> - The desired capacity of an AppStream 2.0 fleet.</p> </li> <li> <p> <code>dynamodb:table:ReadCapacityUnits</code> - The provisioned read capacity for a DynamoDB table.</p> </li> <li> <p> <code>dynamodb:table:WriteCapacityUnits</code> - The provisioned write capacity for a DynamoDB table.</p> </li> <li> <p> <code>dynamodb:index:ReadCapacityUnits</code> - The provisioned read capacity for a DynamoDB global secondary index.</p> </li> <li> <p> <code>dynamodb:index:WriteCapacityUnits</code> - The provisioned write capacity for a DynamoDB global secondary index.</p> </li> <li> <p> <code>rds:cluster:ReadReplicaCount</code> - The count of Aurora Replicas in an Aurora DB cluster. Available for Aurora MySQL-compatible edition and Aurora PostgreSQL-compatible edition.</p> </li> <li> <p> <code>sagemaker:variant:DesiredInstanceCount</code> - The number of EC2 instances for an Amazon SageMaker model endpoint variant.</p> </li> <li> <p> <code>custom-resource:ResourceType:Property</code> - The scalable dimension for a custom resource provided by your own application or service.</p> </li> </ul>"
+          "documentation":"<p>The scalable dimension. This string consists of the service namespace, resource type, and scaling property. If you specify a scalable dimension, you must also specify a resource ID.</p> <ul> <li> <p> <code>ecs:service:DesiredCount</code> - The desired task count of an ECS service.</p> </li> <li> <p> <code>ec2:spot-fleet-request:TargetCapacity</code> - The target capacity of a Spot Fleet request.</p> </li> <li> <p> <code>elasticmapreduce:instancegroup:InstanceCount</code> - The instance count of an EMR Instance Group.</p> </li> <li> <p> <code>appstream:fleet:DesiredCapacity</code> - The desired capacity of an AppStream 2.0 fleet.</p> </li> <li> <p> <code>dynamodb:table:ReadCapacityUnits</code> - The provisioned read capacity for a DynamoDB table.</p> </li> <li> <p> <code>dynamodb:table:WriteCapacityUnits</code> - The provisioned write capacity for a DynamoDB table.</p> </li> <li> <p> <code>dynamodb:index:ReadCapacityUnits</code> - The provisioned read capacity for a DynamoDB global secondary index.</p> </li> <li> <p> <code>dynamodb:index:WriteCapacityUnits</code> - The provisioned write capacity for a DynamoDB global secondary index.</p> </li> <li> <p> <code>rds:cluster:ReadReplicaCount</code> - The count of Aurora Replicas in an Aurora DB cluster. Available for Aurora MySQL-compatible edition and Aurora PostgreSQL-compatible edition.</p> </li> <li> <p> <code>sagemaker:variant:DesiredInstanceCount</code> - The number of EC2 instances for an Amazon SageMaker model endpoint variant.</p> </li> <li> <p> <code>custom-resource:ResourceType:Property</code> - The scalable dimension for a custom resource provided by your own application or service.</p> </li> <li> <p> <code>comprehend:document-classifier-endpoint:DesiredInferenceUnits</code> - The number of inference units for an Amazon Comprehend document classification endpoint.</p> </li> <li> <p> <code>lambda:function:ProvisionedConcurrency</code> - The provisioned concurrency for a Lambda function.</p> </li> </ul>"
         },
         "MaxResults":{
           "shape":"MaxResults",
@@ -475,11 +475,11 @@
         },
         "ResourceId":{
           "shape":"ResourceIdMaxLen1600",
-          "documentation":"<p>The identifier of the resource associated with the scheduled action. This string consists of the resource type and unique identifier. If you specify a scalable dimension, you must also specify a resource ID.</p> <ul> <li> <p>ECS service - The resource type is <code>service</code> and the unique identifier is the cluster name and service name. Example: <code>service/default/sample-webapp</code>.</p> </li> <li> <p>Spot Fleet request - The resource type is <code>spot-fleet-request</code> and the unique identifier is the Spot Fleet request ID. Example: <code>spot-fleet-request/sfr-73fbd2ce-aa30-494c-8788-1cee4EXAMPLE</code>.</p> </li> <li> <p>EMR cluster - The resource type is <code>instancegroup</code> and the unique identifier is the cluster ID and instance group ID. Example: <code>instancegroup/j-2EEZNYKUA1NTV/ig-1791Y4E1L8YI0</code>.</p> </li> <li> <p>AppStream 2.0 fleet - The resource type is <code>fleet</code> and the unique identifier is the fleet name. Example: <code>fleet/sample-fleet</code>.</p> </li> <li> <p>DynamoDB table - The resource type is <code>table</code> and the unique identifier is the resource ID. Example: <code>table/my-table</code>.</p> </li> <li> <p>DynamoDB global secondary index - The resource type is <code>index</code> and the unique identifier is the resource ID. Example: <code>table/my-table/index/my-table-index</code>.</p> </li> <li> <p>Aurora DB cluster - The resource type is <code>cluster</code> and the unique identifier is the cluster name. Example: <code>cluster:my-db-cluster</code>.</p> </li> <li> <p>Amazon SageMaker endpoint variants - The resource type is <code>variant</code> and the unique identifier is the resource ID. Example: <code>endpoint/my-end-point/variant/KMeansClustering</code>.</p> </li> <li> <p>Custom resources are not supported with a resource type. This parameter must specify the <code>OutputValue</code> from the CloudFormation template stack used to access the resources. The unique identifier is defined by the service provider. More information is available in our <a href=\"https://github.com/aws/aws-auto-scaling-custom-resource\">GitHub repository</a>.</p> </li> </ul>"
+          "documentation":"<p>The identifier of the resource associated with the scheduled action. This string consists of the resource type and unique identifier. If you specify a scalable dimension, you must also specify a resource ID.</p> <ul> <li> <p>ECS service - The resource type is <code>service</code> and the unique identifier is the cluster name and service name. Example: <code>service/default/sample-webapp</code>.</p> </li> <li> <p>Spot Fleet request - The resource type is <code>spot-fleet-request</code> and the unique identifier is the Spot Fleet request ID. Example: <code>spot-fleet-request/sfr-73fbd2ce-aa30-494c-8788-1cee4EXAMPLE</code>.</p> </li> <li> <p>EMR cluster - The resource type is <code>instancegroup</code> and the unique identifier is the cluster ID and instance group ID. Example: <code>instancegroup/j-2EEZNYKUA1NTV/ig-1791Y4E1L8YI0</code>.</p> </li> <li> <p>AppStream 2.0 fleet - The resource type is <code>fleet</code> and the unique identifier is the fleet name. Example: <code>fleet/sample-fleet</code>.</p> </li> <li> <p>DynamoDB table - The resource type is <code>table</code> and the unique identifier is the table name. Example: <code>table/my-table</code>.</p> </li> <li> <p>DynamoDB global secondary index - The resource type is <code>index</code> and the unique identifier is the index name. Example: <code>table/my-table/index/my-table-index</code>.</p> </li> <li> <p>Aurora DB cluster - The resource type is <code>cluster</code> and the unique identifier is the cluster name. Example: <code>cluster:my-db-cluster</code>.</p> </li> <li> <p>Amazon SageMaker endpoint variant - The resource type is <code>variant</code> and the unique identifier is the resource ID. Example: <code>endpoint/my-end-point/variant/KMeansClustering</code>.</p> </li> <li> <p>Custom resources are not supported with a resource type. This parameter must specify the <code>OutputValue</code> from the CloudFormation template stack used to access the resources. The unique identifier is defined by the service provider. More information is available in our <a href=\"https://github.com/aws/aws-auto-scaling-custom-resource\">GitHub repository</a>.</p> </li> <li> <p>Amazon Comprehend document classification endpoint - The resource type and unique identifier are specified using the endpoint ARN. Example: <code>arn:aws:comprehend:us-west-2:123456789012:document-classifier-endpoint/EXAMPLE</code>.</p> </li> <li> <p>Lambda provisioned concurrency - The resource type is <code>function</code> and the unique identifier is the function name with a function version or alias name suffix that is not <code>$LATEST</code>. Example: <code>function:my-function:prod</code> or <code>function:my-function:1</code>.</p> </li> </ul>"
         },
         "ScalableDimension":{
           "shape":"ScalableDimension",
-          "documentation":"<p>The scalable dimension. This string consists of the service namespace, resource type, and scaling property. If you specify a scalable dimension, you must also specify a resource ID.</p> <ul> <li> <p> <code>ecs:service:DesiredCount</code> - The desired task count of an ECS service.</p> </li> <li> <p> <code>ec2:spot-fleet-request:TargetCapacity</code> - The target capacity of a Spot Fleet request.</p> </li> <li> <p> <code>elasticmapreduce:instancegroup:InstanceCount</code> - The instance count of an EMR Instance Group.</p> </li> <li> <p> <code>appstream:fleet:DesiredCapacity</code> - The desired capacity of an AppStream 2.0 fleet.</p> </li> <li> <p> <code>dynamodb:table:ReadCapacityUnits</code> - The provisioned read capacity for a DynamoDB table.</p> </li> <li> <p> <code>dynamodb:table:WriteCapacityUnits</code> - The provisioned write capacity for a DynamoDB table.</p> </li> <li> <p> <code>dynamodb:index:ReadCapacityUnits</code> - The provisioned read capacity for a DynamoDB global secondary index.</p> </li> <li> <p> <code>dynamodb:index:WriteCapacityUnits</code> - The provisioned write capacity for a DynamoDB global secondary index.</p> </li> <li> <p> <code>rds:cluster:ReadReplicaCount</code> - The count of Aurora Replicas in an Aurora DB cluster. Available for Aurora MySQL-compatible edition and Aurora PostgreSQL-compatible edition.</p> </li> <li> <p> <code>sagemaker:variant:DesiredInstanceCount</code> - The number of EC2 instances for an Amazon SageMaker model endpoint variant.</p> </li> <li> <p> <code>custom-resource:ResourceType:Property</code> - The scalable dimension for a custom resource provided by your own application or service.</p> </li> </ul>"
+          "documentation":"<p>The scalable dimension. This string consists of the service namespace, resource type, and scaling property. If you specify a scalable dimension, you must also specify a resource ID.</p> <ul> <li> <p> <code>ecs:service:DesiredCount</code> - The desired task count of an ECS service.</p> </li> <li> <p> <code>ec2:spot-fleet-request:TargetCapacity</code> - The target capacity of a Spot Fleet request.</p> </li> <li> <p> <code>elasticmapreduce:instancegroup:InstanceCount</code> - The instance count of an EMR Instance Group.</p> </li> <li> <p> <code>appstream:fleet:DesiredCapacity</code> - The desired capacity of an AppStream 2.0 fleet.</p> </li> <li> <p> <code>dynamodb:table:ReadCapacityUnits</code> - The provisioned read capacity for a DynamoDB table.</p> </li> <li> <p> <code>dynamodb:table:WriteCapacityUnits</code> - The provisioned write capacity for a DynamoDB table.</p> </li> <li> <p> <code>dynamodb:index:ReadCapacityUnits</code> - The provisioned read capacity for a DynamoDB global secondary index.</p> </li> <li> <p> <code>dynamodb:index:WriteCapacityUnits</code> - The provisioned write capacity for a DynamoDB global secondary index.</p> </li> <li> <p> <code>rds:cluster:ReadReplicaCount</code> - The count of Aurora Replicas in an Aurora DB cluster. Available for Aurora MySQL-compatible edition and Aurora PostgreSQL-compatible edition.</p> </li> <li> <p> <code>sagemaker:variant:DesiredInstanceCount</code> - The number of EC2 instances for an Amazon SageMaker model endpoint variant.</p> </li> <li> <p> <code>custom-resource:ResourceType:Property</code> - The scalable dimension for a custom resource provided by your own application or service.</p> </li> <li> <p> <code>comprehend:document-classifier-endpoint:DesiredInferenceUnits</code> - The number of inference units for an Amazon Comprehend document classification endpoint.</p> </li> <li> <p> <code>lambda:function:ProvisionedConcurrency</code> - The provisioned concurrency for a Lambda function.</p> </li> </ul>"
         },
         "MaxResults":{
           "shape":"MaxResults",
@@ -597,7 +597,10 @@
         "EC2SpotFleetRequestAverageNetworkOut",
         "SageMakerVariantInvocationsPerInstance",
         "ECSServiceAverageCPUUtilization",
-        "ECSServiceAverageMemoryUtilization"
+        "ECSServiceAverageMemoryUtilization",
+        "AppStreamAverageCapacityUtilization",
+        "ComprehendInferenceUtilization",
+        "LambdaProvisionedConcurrencyUtilization"
       ]
     },
     "MetricUnit":{"type":"string"},
@@ -657,15 +660,15 @@
         },
         "ResourceId":{
           "shape":"ResourceIdMaxLen1600",
-          "documentation":"<p>The identifier of the resource associated with the scaling policy. This string consists of the resource type and unique identifier.</p> <ul> <li> <p>ECS service - The resource type is <code>service</code> and the unique identifier is the cluster name and service name. Example: <code>service/default/sample-webapp</code>.</p> </li> <li> <p>Spot Fleet request - The resource type is <code>spot-fleet-request</code> and the unique identifier is the Spot Fleet request ID. Example: <code>spot-fleet-request/sfr-73fbd2ce-aa30-494c-8788-1cee4EXAMPLE</code>.</p> </li> <li> <p>EMR cluster - The resource type is <code>instancegroup</code> and the unique identifier is the cluster ID and instance group ID. Example: <code>instancegroup/j-2EEZNYKUA1NTV/ig-1791Y4E1L8YI0</code>.</p> </li> <li> <p>AppStream 2.0 fleet - The resource type is <code>fleet</code> and the unique identifier is the fleet name. Example: <code>fleet/sample-fleet</code>.</p> </li> <li> <p>DynamoDB table - The resource type is <code>table</code> and the unique identifier is the resource ID. Example: <code>table/my-table</code>.</p> </li> <li> <p>DynamoDB global secondary index - The resource type is <code>index</code> and the unique identifier is the resource ID. Example: <code>table/my-table/index/my-table-index</code>.</p> </li> <li> <p>Aurora DB cluster - The resource type is <code>cluster</code> and the unique identifier is the cluster name. Example: <code>cluster:my-db-cluster</code>.</p> </li> <li> <p>Amazon SageMaker endpoint variants - The resource type is <code>variant</code> and the unique identifier is the resource ID. Example: <code>endpoint/my-end-point/variant/KMeansClustering</code>.</p> </li> <li> <p>Custom resources are not supported with a resource type. This parameter must specify the <code>OutputValue</code> from the CloudFormation template stack used to access the resources. The unique identifier is defined by the service provider. More information is available in our <a href=\"https://github.com/aws/aws-auto-scaling-custom-resource\">GitHub repository</a>.</p> </li> </ul>"
+          "documentation":"<p>The identifier of the resource associated with the scaling policy. This string consists of the resource type and unique identifier.</p> <ul> <li> <p>ECS service - The resource type is <code>service</code> and the unique identifier is the cluster name and service name. Example: <code>service/default/sample-webapp</code>.</p> </li> <li> <p>Spot Fleet request - The resource type is <code>spot-fleet-request</code> and the unique identifier is the Spot Fleet request ID. Example: <code>spot-fleet-request/sfr-73fbd2ce-aa30-494c-8788-1cee4EXAMPLE</code>.</p> </li> <li> <p>EMR cluster - The resource type is <code>instancegroup</code> and the unique identifier is the cluster ID and instance group ID. Example: <code>instancegroup/j-2EEZNYKUA1NTV/ig-1791Y4E1L8YI0</code>.</p> </li> <li> <p>AppStream 2.0 fleet - The resource type is <code>fleet</code> and the unique identifier is the fleet name. Example: <code>fleet/sample-fleet</code>.</p> </li> <li> <p>DynamoDB table - The resource type is <code>table</code> and the unique identifier is the table name. Example: <code>table/my-table</code>.</p> </li> <li> <p>DynamoDB global secondary index - The resource type is <code>index</code> and the unique identifier is the index name. Example: <code>table/my-table/index/my-table-index</code>.</p> </li> <li> <p>Aurora DB cluster - The resource type is <code>cluster</code> and the unique identifier is the cluster name. Example: <code>cluster:my-db-cluster</code>.</p> </li> <li> <p>Amazon SageMaker endpoint variant - The resource type is <code>variant</code> and the unique identifier is the resource ID. Example: <code>endpoint/my-end-point/variant/KMeansClustering</code>.</p> </li> <li> <p>Custom resources are not supported with a resource type. This parameter must specify the <code>OutputValue</code> from the CloudFormation template stack used to access the resources. The unique identifier is defined by the service provider. More information is available in our <a href=\"https://github.com/aws/aws-auto-scaling-custom-resource\">GitHub repository</a>.</p> </li> <li> <p>Amazon Comprehend document classification endpoint - The resource type and unique identifier are specified using the endpoint ARN. Example: <code>arn:aws:comprehend:us-west-2:123456789012:document-classifier-endpoint/EXAMPLE</code>.</p> </li> <li> <p>Lambda provisioned concurrency - The resource type is <code>function</code> and the unique identifier is the function name with a function version or alias name suffix that is not <code>$LATEST</code>. Example: <code>function:my-function:prod</code> or <code>function:my-function:1</code>.</p> </li> </ul>"
         },
         "ScalableDimension":{
           "shape":"ScalableDimension",
-          "documentation":"<p>The scalable dimension. This string consists of the service namespace, resource type, and scaling property.</p> <ul> <li> <p> <code>ecs:service:DesiredCount</code> - The desired task count of an ECS service.</p> </li> <li> <p> <code>ec2:spot-fleet-request:TargetCapacity</code> - The target capacity of a Spot Fleet request.</p> </li> <li> <p> <code>elasticmapreduce:instancegroup:InstanceCount</code> - The instance count of an EMR Instance Group.</p> </li> <li> <p> <code>appstream:fleet:DesiredCapacity</code> - The desired capacity of an AppStream 2.0 fleet.</p> </li> <li> <p> <code>dynamodb:table:ReadCapacityUnits</code> - The provisioned read capacity for a DynamoDB table.</p> </li> <li> <p> <code>dynamodb:table:WriteCapacityUnits</code> - The provisioned write capacity for a DynamoDB table.</p> </li> <li> <p> <code>dynamodb:index:ReadCapacityUnits</code> - The provisioned read capacity for a DynamoDB global secondary index.</p> </li> <li> <p> <code>dynamodb:index:WriteCapacityUnits</code> - The provisioned write capacity for a DynamoDB global secondary index.</p> </li> <li> <p> <code>rds:cluster:ReadReplicaCount</code> - The count of Aurora Replicas in an Aurora DB cluster. Available for Aurora MySQL-compatible edition and Aurora PostgreSQL-compatible edition.</p> </li> <li> <p> <code>sagemaker:variant:DesiredInstanceCount</code> - The number of EC2 instances for an Amazon SageMaker model endpoint variant.</p> </li> <li> <p> <code>custom-resource:ResourceType:Property</code> - The scalable dimension for a custom resource provided by your own application or service.</p> </li> </ul>"
+          "documentation":"<p>The scalable dimension. This string consists of the service namespace, resource type, and scaling property.</p> <ul> <li> <p> <code>ecs:service:DesiredCount</code> - The desired task count of an ECS service.</p> </li> <li> <p> <code>ec2:spot-fleet-request:TargetCapacity</code> - The target capacity of a Spot Fleet request.</p> </li> <li> <p> <code>elasticmapreduce:instancegroup:InstanceCount</code> - The instance count of an EMR Instance Group.</p> </li> <li> <p> <code>appstream:fleet:DesiredCapacity</code> - The desired capacity of an AppStream 2.0 fleet.</p> </li> <li> <p> <code>dynamodb:table:ReadCapacityUnits</code> - The provisioned read capacity for a DynamoDB table.</p> </li> <li> <p> <code>dynamodb:table:WriteCapacityUnits</code> - The provisioned write capacity for a DynamoDB table.</p> </li> <li> <p> <code>dynamodb:index:ReadCapacityUnits</code> - The provisioned read capacity for a DynamoDB global secondary index.</p> </li> <li> <p> <code>dynamodb:index:WriteCapacityUnits</code> - The provisioned write capacity for a DynamoDB global secondary index.</p> </li> <li> <p> <code>rds:cluster:ReadReplicaCount</code> - The count of Aurora Replicas in an Aurora DB cluster. Available for Aurora MySQL-compatible edition and Aurora PostgreSQL-compatible edition.</p> </li> <li> <p> <code>sagemaker:variant:DesiredInstanceCount</code> - The number of EC2 instances for an Amazon SageMaker model endpoint variant.</p> </li> <li> <p> <code>custom-resource:ResourceType:Property</code> - The scalable dimension for a custom resource provided by your own application or service.</p> </li> <li> <p> <code>comprehend:document-classifier-endpoint:DesiredInferenceUnits</code> - The number of inference units for an Amazon Comprehend document classification endpoint.</p> </li> <li> <p> <code>lambda:function:ProvisionedConcurrency</code> - The provisioned concurrency for a Lambda function.</p> </li> </ul>"
         },
         "PolicyType":{
           "shape":"PolicyType",
-          "documentation":"<p>The policy type. This parameter is required if you are creating a scaling policy.</p> <p>The following policy types are supported: </p> <p> <code>TargetTrackingScaling</code>—Not supported for Amazon EMR or AppStream</p> <p> <code>StepScaling</code>—Not supported for Amazon DynamoDB</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/autoscaling/application/userguide/application-auto-scaling-target-tracking.html\">Target Tracking Scaling Policies</a> and <a href=\"https://docs.aws.amazon.com/autoscaling/application/userguide/application-auto-scaling-step-scaling-policies.html\">Step Scaling Policies</a> in the <i>Application Auto Scaling User Guide</i>.</p>"
+          "documentation":"<p>The policy type. This parameter is required if you are creating a scaling policy.</p> <p>The following policy types are supported: </p> <p> <code>TargetTrackingScaling</code>—Not supported for Amazon EMR</p> <p> <code>StepScaling</code>—Not supported for DynamoDB, Amazon Comprehend, or AWS Lambda</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/autoscaling/application/userguide/application-auto-scaling-target-tracking.html\">Target Tracking Scaling Policies</a> and <a href=\"https://docs.aws.amazon.com/autoscaling/application/userguide/application-auto-scaling-step-scaling-policies.html\">Step Scaling Policies</a> in the <i>Application Auto Scaling User Guide</i>.</p>"
         },
         "StepScalingPolicyConfiguration":{
           "shape":"StepScalingPolicyConfiguration",
@@ -714,11 +717,11 @@
         },
         "ResourceId":{
           "shape":"ResourceIdMaxLen1600",
-          "documentation":"<p>The identifier of the resource associated with the scheduled action. This string consists of the resource type and unique identifier.</p> <ul> <li> <p>ECS service - The resource type is <code>service</code> and the unique identifier is the cluster name and service name. Example: <code>service/default/sample-webapp</code>.</p> </li> <li> <p>Spot Fleet request - The resource type is <code>spot-fleet-request</code> and the unique identifier is the Spot Fleet request ID. Example: <code>spot-fleet-request/sfr-73fbd2ce-aa30-494c-8788-1cee4EXAMPLE</code>.</p> </li> <li> <p>EMR cluster - The resource type is <code>instancegroup</code> and the unique identifier is the cluster ID and instance group ID. Example: <code>instancegroup/j-2EEZNYKUA1NTV/ig-1791Y4E1L8YI0</code>.</p> </li> <li> <p>AppStream 2.0 fleet - The resource type is <code>fleet</code> and the unique identifier is the fleet name. Example: <code>fleet/sample-fleet</code>.</p> </li> <li> <p>DynamoDB table - The resource type is <code>table</code> and the unique identifier is the resource ID. Example: <code>table/my-table</code>.</p> </li> <li> <p>DynamoDB global secondary index - The resource type is <code>index</code> and the unique identifier is the resource ID. Example: <code>table/my-table/index/my-table-index</code>.</p> </li> <li> <p>Aurora DB cluster - The resource type is <code>cluster</code> and the unique identifier is the cluster name. Example: <code>cluster:my-db-cluster</code>.</p> </li> <li> <p>Amazon SageMaker endpoint variants - The resource type is <code>variant</code> and the unique identifier is the resource ID. Example: <code>endpoint/my-end-point/variant/KMeansClustering</code>.</p> </li> <li> <p>Custom resources are not supported with a resource type. This parameter must specify the <code>OutputValue</code> from the CloudFormation template stack used to access the resources. The unique identifier is defined by the service provider. More information is available in our <a href=\"https://github.com/aws/aws-auto-scaling-custom-resource\">GitHub repository</a>.</p> </li> </ul>"
+          "documentation":"<p>The identifier of the resource associated with the scheduled action. This string consists of the resource type and unique identifier.</p> <ul> <li> <p>ECS service - The resource type is <code>service</code> and the unique identifier is the cluster name and service name. Example: <code>service/default/sample-webapp</code>.</p> </li> <li> <p>Spot Fleet request - The resource type is <code>spot-fleet-request</code> and the unique identifier is the Spot Fleet request ID. Example: <code>spot-fleet-request/sfr-73fbd2ce-aa30-494c-8788-1cee4EXAMPLE</code>.</p> </li> <li> <p>EMR cluster - The resource type is <code>instancegroup</code> and the unique identifier is the cluster ID and instance group ID. Example: <code>instancegroup/j-2EEZNYKUA1NTV/ig-1791Y4E1L8YI0</code>.</p> </li> <li> <p>AppStream 2.0 fleet - The resource type is <code>fleet</code> and the unique identifier is the fleet name. Example: <code>fleet/sample-fleet</code>.</p> </li> <li> <p>DynamoDB table - The resource type is <code>table</code> and the unique identifier is the table name. Example: <code>table/my-table</code>.</p> </li> <li> <p>DynamoDB global secondary index - The resource type is <code>index</code> and the unique identifier is the index name. Example: <code>table/my-table/index/my-table-index</code>.</p> </li> <li> <p>Aurora DB cluster - The resource type is <code>cluster</code> and the unique identifier is the cluster name. Example: <code>cluster:my-db-cluster</code>.</p> </li> <li> <p>Amazon SageMaker endpoint variant - The resource type is <code>variant</code> and the unique identifier is the resource ID. Example: <code>endpoint/my-end-point/variant/KMeansClustering</code>.</p> </li> <li> <p>Custom resources are not supported with a resource type. This parameter must specify the <code>OutputValue</code> from the CloudFormation template stack used to access the resources. The unique identifier is defined by the service provider. More information is available in our <a href=\"https://github.com/aws/aws-auto-scaling-custom-resource\">GitHub repository</a>.</p> </li> <li> <p>Amazon Comprehend document classification endpoint - The resource type and unique identifier are specified using the endpoint ARN. Example: <code>arn:aws:comprehend:us-west-2:123456789012:document-classifier-endpoint/EXAMPLE</code>.</p> </li> <li> <p>Lambda provisioned concurrency - The resource type is <code>function</code> and the unique identifier is the function name with a function version or alias name suffix that is not <code>$LATEST</code>. Example: <code>function:my-function:prod</code> or <code>function:my-function:1</code>.</p> </li> </ul>"
         },
         "ScalableDimension":{
           "shape":"ScalableDimension",
-          "documentation":"<p>The scalable dimension. This string consists of the service namespace, resource type, and scaling property.</p> <ul> <li> <p> <code>ecs:service:DesiredCount</code> - The desired task count of an ECS service.</p> </li> <li> <p> <code>ec2:spot-fleet-request:TargetCapacity</code> - The target capacity of a Spot Fleet request.</p> </li> <li> <p> <code>elasticmapreduce:instancegroup:InstanceCount</code> - The instance count of an EMR Instance Group.</p> </li> <li> <p> <code>appstream:fleet:DesiredCapacity</code> - The desired capacity of an AppStream 2.0 fleet.</p> </li> <li> <p> <code>dynamodb:table:ReadCapacityUnits</code> - The provisioned read capacity for a DynamoDB table.</p> </li> <li> <p> <code>dynamodb:table:WriteCapacityUnits</code> - The provisioned write capacity for a DynamoDB table.</p> </li> <li> <p> <code>dynamodb:index:ReadCapacityUnits</code> - The provisioned read capacity for a DynamoDB global secondary index.</p> </li> <li> <p> <code>dynamodb:index:WriteCapacityUnits</code> - The provisioned write capacity for a DynamoDB global secondary index.</p> </li> <li> <p> <code>rds:cluster:ReadReplicaCount</code> - The count of Aurora Replicas in an Aurora DB cluster. Available for Aurora MySQL-compatible edition and Aurora PostgreSQL-compatible edition.</p> </li> <li> <p> <code>sagemaker:variant:DesiredInstanceCount</code> - The number of EC2 instances for an Amazon SageMaker model endpoint variant.</p> </li> <li> <p> <code>custom-resource:ResourceType:Property</code> - The scalable dimension for a custom resource provided by your own application or service.</p> </li> </ul>"
+          "documentation":"<p>The scalable dimension. This string consists of the service namespace, resource type, and scaling property.</p> <ul> <li> <p> <code>ecs:service:DesiredCount</code> - The desired task count of an ECS service.</p> </li> <li> <p> <code>ec2:spot-fleet-request:TargetCapacity</code> - The target capacity of a Spot Fleet request.</p> </li> <li> <p> <code>elasticmapreduce:instancegroup:InstanceCount</code> - The instance count of an EMR Instance Group.</p> </li> <li> <p> <code>appstream:fleet:DesiredCapacity</code> - The desired capacity of an AppStream 2.0 fleet.</p> </li> <li> <p> <code>dynamodb:table:ReadCapacityUnits</code> - The provisioned read capacity for a DynamoDB table.</p> </li> <li> <p> <code>dynamodb:table:WriteCapacityUnits</code> - The provisioned write capacity for a DynamoDB table.</p> </li> <li> <p> <code>dynamodb:index:ReadCapacityUnits</code> - The provisioned read capacity for a DynamoDB global secondary index.</p> </li> <li> <p> <code>dynamodb:index:WriteCapacityUnits</code> - The provisioned write capacity for a DynamoDB global secondary index.</p> </li> <li> <p> <code>rds:cluster:ReadReplicaCount</code> - The count of Aurora Replicas in an Aurora DB cluster. Available for Aurora MySQL-compatible edition and Aurora PostgreSQL-compatible edition.</p> </li> <li> <p> <code>sagemaker:variant:DesiredInstanceCount</code> - The number of EC2 instances for an Amazon SageMaker model endpoint variant.</p> </li> <li> <p> <code>custom-resource:ResourceType:Property</code> - The scalable dimension for a custom resource provided by your own application or service.</p> </li> <li> <p> <code>comprehend:document-classifier-endpoint:DesiredInferenceUnits</code> - The number of inference units for an Amazon Comprehend document classification endpoint.</p> </li> <li> <p> <code>lambda:function:ProvisionedConcurrency</code> - The provisioned concurrency for a Lambda function.</p> </li> </ul>"
         },
         "StartTime":{
           "shape":"TimestampType",
@@ -753,11 +756,11 @@
         },
         "ResourceId":{
           "shape":"ResourceIdMaxLen1600",
-          "documentation":"<p>The identifier of the resource that is associated with the scalable target. This string consists of the resource type and unique identifier.</p> <ul> <li> <p>ECS service - The resource type is <code>service</code> and the unique identifier is the cluster name and service name. Example: <code>service/default/sample-webapp</code>.</p> </li> <li> <p>Spot Fleet request - The resource type is <code>spot-fleet-request</code> and the unique identifier is the Spot Fleet request ID. Example: <code>spot-fleet-request/sfr-73fbd2ce-aa30-494c-8788-1cee4EXAMPLE</code>.</p> </li> <li> <p>EMR cluster - The resource type is <code>instancegroup</code> and the unique identifier is the cluster ID and instance group ID. Example: <code>instancegroup/j-2EEZNYKUA1NTV/ig-1791Y4E1L8YI0</code>.</p> </li> <li> <p>AppStream 2.0 fleet - The resource type is <code>fleet</code> and the unique identifier is the fleet name. Example: <code>fleet/sample-fleet</code>.</p> </li> <li> <p>DynamoDB table - The resource type is <code>table</code> and the unique identifier is the resource ID. Example: <code>table/my-table</code>.</p> </li> <li> <p>DynamoDB global secondary index - The resource type is <code>index</code> and the unique identifier is the resource ID. Example: <code>table/my-table/index/my-table-index</code>.</p> </li> <li> <p>Aurora DB cluster - The resource type is <code>cluster</code> and the unique identifier is the cluster name. Example: <code>cluster:my-db-cluster</code>.</p> </li> <li> <p>Amazon SageMaker endpoint variants - The resource type is <code>variant</code> and the unique identifier is the resource ID. Example: <code>endpoint/my-end-point/variant/KMeansClustering</code>.</p> </li> <li> <p>Custom resources are not supported with a resource type. This parameter must specify the <code>OutputValue</code> from the CloudFormation template stack used to access the resources. The unique identifier is defined by the service provider. More information is available in our <a href=\"https://github.com/aws/aws-auto-scaling-custom-resource\">GitHub repository</a>.</p> </li> </ul>"
+          "documentation":"<p>The identifier of the resource that is associated with the scalable target. This string consists of the resource type and unique identifier.</p> <ul> <li> <p>ECS service - The resource type is <code>service</code> and the unique identifier is the cluster name and service name. Example: <code>service/default/sample-webapp</code>.</p> </li> <li> <p>Spot Fleet request - The resource type is <code>spot-fleet-request</code> and the unique identifier is the Spot Fleet request ID. Example: <code>spot-fleet-request/sfr-73fbd2ce-aa30-494c-8788-1cee4EXAMPLE</code>.</p> </li> <li> <p>EMR cluster - The resource type is <code>instancegroup</code> and the unique identifier is the cluster ID and instance group ID. Example: <code>instancegroup/j-2EEZNYKUA1NTV/ig-1791Y4E1L8YI0</code>.</p> </li> <li> <p>AppStream 2.0 fleet - The resource type is <code>fleet</code> and the unique identifier is the fleet name. Example: <code>fleet/sample-fleet</code>.</p> </li> <li> <p>DynamoDB table - The resource type is <code>table</code> and the unique identifier is the table name. Example: <code>table/my-table</code>.</p> </li> <li> <p>DynamoDB global secondary index - The resource type is <code>index</code> and the unique identifier is the index name. Example: <code>table/my-table/index/my-table-index</code>.</p> </li> <li> <p>Aurora DB cluster - The resource type is <code>cluster</code> and the unique identifier is the cluster name. Example: <code>cluster:my-db-cluster</code>.</p> </li> <li> <p>Amazon SageMaker endpoint variant - The resource type is <code>variant</code> and the unique identifier is the resource ID. Example: <code>endpoint/my-end-point/variant/KMeansClustering</code>.</p> </li> <li> <p>Custom resources are not supported with a resource type. This parameter must specify the <code>OutputValue</code> from the CloudFormation template stack used to access the resources. The unique identifier is defined by the service provider. More information is available in our <a href=\"https://github.com/aws/aws-auto-scaling-custom-resource\">GitHub repository</a>.</p> </li> <li> <p>Amazon Comprehend document classification endpoint - The resource type and unique identifier are specified using the endpoint ARN. Example: <code>arn:aws:comprehend:us-west-2:123456789012:document-classifier-endpoint/EXAMPLE</code>.</p> </li> <li> <p>Lambda provisioned concurrency - The resource type is <code>function</code> and the unique identifier is the function name with a function version or alias name suffix that is not <code>$LATEST</code>. Example: <code>function:my-function:prod</code> or <code>function:my-function:1</code>.</p> </li> </ul>"
         },
         "ScalableDimension":{
           "shape":"ScalableDimension",
-          "documentation":"<p>The scalable dimension associated with the scalable target. This string consists of the service namespace, resource type, and scaling property.</p> <ul> <li> <p> <code>ecs:service:DesiredCount</code> - The desired task count of an ECS service.</p> </li> <li> <p> <code>ec2:spot-fleet-request:TargetCapacity</code> - The target capacity of a Spot Fleet request.</p> </li> <li> <p> <code>elasticmapreduce:instancegroup:InstanceCount</code> - The instance count of an EMR Instance Group.</p> </li> <li> <p> <code>appstream:fleet:DesiredCapacity</code> - The desired capacity of an AppStream 2.0 fleet.</p> </li> <li> <p> <code>dynamodb:table:ReadCapacityUnits</code> - The provisioned read capacity for a DynamoDB table.</p> </li> <li> <p> <code>dynamodb:table:WriteCapacityUnits</code> - The provisioned write capacity for a DynamoDB table.</p> </li> <li> <p> <code>dynamodb:index:ReadCapacityUnits</code> - The provisioned read capacity for a DynamoDB global secondary index.</p> </li> <li> <p> <code>dynamodb:index:WriteCapacityUnits</code> - The provisioned write capacity for a DynamoDB global secondary index.</p> </li> <li> <p> <code>rds:cluster:ReadReplicaCount</code> - The count of Aurora Replicas in an Aurora DB cluster. Available for Aurora MySQL-compatible edition and Aurora PostgreSQL-compatible edition.</p> </li> <li> <p> <code>sagemaker:variant:DesiredInstanceCount</code> - The number of EC2 instances for an Amazon SageMaker model endpoint variant.</p> </li> <li> <p> <code>custom-resource:ResourceType:Property</code> - The scalable dimension for a custom resource provided by your own application or service.</p> </li> </ul>"
+          "documentation":"<p>The scalable dimension associated with the scalable target. This string consists of the service namespace, resource type, and scaling property.</p> <ul> <li> <p> <code>ecs:service:DesiredCount</code> - The desired task count of an ECS service.</p> </li> <li> <p> <code>ec2:spot-fleet-request:TargetCapacity</code> - The target capacity of a Spot Fleet request.</p> </li> <li> <p> <code>elasticmapreduce:instancegroup:InstanceCount</code> - The instance count of an EMR Instance Group.</p> </li> <li> <p> <code>appstream:fleet:DesiredCapacity</code> - The desired capacity of an AppStream 2.0 fleet.</p> </li> <li> <p> <code>dynamodb:table:ReadCapacityUnits</code> - The provisioned read capacity for a DynamoDB table.</p> </li> <li> <p> <code>dynamodb:table:WriteCapacityUnits</code> - The provisioned write capacity for a DynamoDB table.</p> </li> <li> <p> <code>dynamodb:index:ReadCapacityUnits</code> - The provisioned read capacity for a DynamoDB global secondary index.</p> </li> <li> <p> <code>dynamodb:index:WriteCapacityUnits</code> - The provisioned write capacity for a DynamoDB global secondary index.</p> </li> <li> <p> <code>rds:cluster:ReadReplicaCount</code> - The count of Aurora Replicas in an Aurora DB cluster. Available for Aurora MySQL-compatible edition and Aurora PostgreSQL-compatible edition.</p> </li> <li> <p> <code>sagemaker:variant:DesiredInstanceCount</code> - The number of EC2 instances for an Amazon SageMaker model endpoint variant.</p> </li> <li> <p> <code>custom-resource:ResourceType:Property</code> - The scalable dimension for a custom resource provided by your own application or service.</p> </li> <li> <p> <code>comprehend:document-classifier-endpoint:DesiredInferenceUnits</code> - The number of inference units for an Amazon Comprehend document classification endpoint.</p> </li> <li> <p> <code>lambda:function:ProvisionedConcurrency</code> - The provisioned concurrency for a Lambda function.</p> </li> </ul>"
         },
         "MinCapacity":{
           "shape":"ResourceCapacity",
@@ -773,7 +776,7 @@
         },
         "SuspendedState":{
           "shape":"SuspendedState",
-          "documentation":"<p>An embedded object that contains attributes and attribute values that are used to suspend and resume automatic scaling. Setting the value of an attribute to <code>true</code> suspends the specified scaling activities. Setting it to <code>false</code> (default) resumes the specified scaling activities. </p> <p> <b>Suspension Outcomes</b> </p> <ul> <li> <p>For <code>DynamicScalingInSuspended</code>, while a suspension is in effect, all scale-in activities that are triggered by a scaling policy are suspended.</p> </li> <li> <p>For <code>DynamicScalingOutSuspended</code>, while a suspension is in effect, all scale-out activities that are triggered by a scaling policy are suspended.</p> </li> <li> <p>For <code>ScheduledScalingSuspended</code>, while a suspension is in effect, all scaling activities that involve scheduled actions are suspended. </p> </li> </ul> <p>For more information, see <a href=\"https://docs.aws.amazon.com/autoscaling/application/userguide/application-auto-scaling-suspend-resume-scaling.html\">Suspend and Resume Application Auto Scaling</a> in the <i>Application Auto Scaling User Guide</i>.</p>"
+          "documentation":"<p>An embedded object that contains attributes and attribute values that are used to suspend and resume automatic scaling. Setting the value of an attribute to <code>true</code> suspends the specified scaling activities. Setting it to <code>false</code> (default) resumes the specified scaling activities. </p> <p> <b>Suspension Outcomes</b> </p> <ul> <li> <p>For <code>DynamicScalingInSuspended</code>, while a suspension is in effect, all scale-in activities that are triggered by a scaling policy are suspended.</p> </li> <li> <p>For <code>DynamicScalingOutSuspended</code>, while a suspension is in effect, all scale-out activities that are triggered by a scaling policy are suspended.</p> </li> <li> <p>For <code>ScheduledScalingSuspended</code>, while a suspension is in effect, all scaling activities that involve scheduled actions are suspended. </p> </li> </ul> <p>For more information, see <a href=\"https://docs.aws.amazon.com/autoscaling/application/userguide/application-auto-scaling-suspend-resume-scaling.html\">Suspending and Resuming Scaling</a> in the <i>Application Auto Scaling User Guide</i>.</p>"
         }
       }
     },
@@ -815,7 +818,9 @@
         "dynamodb:index:WriteCapacityUnits",
         "rds:cluster:ReadReplicaCount",
         "sagemaker:variant:DesiredInstanceCount",
-        "custom-resource:ResourceType:Property"
+        "custom-resource:ResourceType:Property",
+        "comprehend:document-classifier-endpoint:DesiredInferenceUnits",
+        "lambda:function:ProvisionedConcurrency"
       ]
     },
     "ScalableTarget":{
@@ -836,11 +841,11 @@
         },
         "ResourceId":{
           "shape":"ResourceIdMaxLen1600",
-          "documentation":"<p>The identifier of the resource associated with the scalable target. This string consists of the resource type and unique identifier.</p> <ul> <li> <p>ECS service - The resource type is <code>service</code> and the unique identifier is the cluster name and service name. Example: <code>service/default/sample-webapp</code>.</p> </li> <li> <p>Spot Fleet request - The resource type is <code>spot-fleet-request</code> and the unique identifier is the Spot Fleet request ID. Example: <code>spot-fleet-request/sfr-73fbd2ce-aa30-494c-8788-1cee4EXAMPLE</code>.</p> </li> <li> <p>EMR cluster - The resource type is <code>instancegroup</code> and the unique identifier is the cluster ID and instance group ID. Example: <code>instancegroup/j-2EEZNYKUA1NTV/ig-1791Y4E1L8YI0</code>.</p> </li> <li> <p>AppStream 2.0 fleet - The resource type is <code>fleet</code> and the unique identifier is the fleet name. Example: <code>fleet/sample-fleet</code>.</p> </li> <li> <p>DynamoDB table - The resource type is <code>table</code> and the unique identifier is the resource ID. Example: <code>table/my-table</code>.</p> </li> <li> <p>DynamoDB global secondary index - The resource type is <code>index</code> and the unique identifier is the resource ID. Example: <code>table/my-table/index/my-table-index</code>.</p> </li> <li> <p>Aurora DB cluster - The resource type is <code>cluster</code> and the unique identifier is the cluster name. Example: <code>cluster:my-db-cluster</code>.</p> </li> <li> <p>Amazon SageMaker endpoint variants - The resource type is <code>variant</code> and the unique identifier is the resource ID. Example: <code>endpoint/my-end-point/variant/KMeansClustering</code>.</p> </li> <li> <p>Custom resources are not supported with a resource type. This parameter must specify the <code>OutputValue</code> from the CloudFormation template stack used to access the resources. The unique identifier is defined by the service provider. More information is available in our <a href=\"https://github.com/aws/aws-auto-scaling-custom-resource\">GitHub repository</a>.</p> </li> </ul>"
+          "documentation":"<p>The identifier of the resource associated with the scalable target. This string consists of the resource type and unique identifier.</p> <ul> <li> <p>ECS service - The resource type is <code>service</code> and the unique identifier is the cluster name and service name. Example: <code>service/default/sample-webapp</code>.</p> </li> <li> <p>Spot Fleet request - The resource type is <code>spot-fleet-request</code> and the unique identifier is the Spot Fleet request ID. Example: <code>spot-fleet-request/sfr-73fbd2ce-aa30-494c-8788-1cee4EXAMPLE</code>.</p> </li> <li> <p>EMR cluster - The resource type is <code>instancegroup</code> and the unique identifier is the cluster ID and instance group ID. Example: <code>instancegroup/j-2EEZNYKUA1NTV/ig-1791Y4E1L8YI0</code>.</p> </li> <li> <p>AppStream 2.0 fleet - The resource type is <code>fleet</code> and the unique identifier is the fleet name. Example: <code>fleet/sample-fleet</code>.</p> </li> <li> <p>DynamoDB table - The resource type is <code>table</code> and the unique identifier is the table name. Example: <code>table/my-table</code>.</p> </li> <li> <p>DynamoDB global secondary index - The resource type is <code>index</code> and the unique identifier is the index name. Example: <code>table/my-table/index/my-table-index</code>.</p> </li> <li> <p>Aurora DB cluster - The resource type is <code>cluster</code> and the unique identifier is the cluster name. Example: <code>cluster:my-db-cluster</code>.</p> </li> <li> <p>Amazon SageMaker endpoint variant - The resource type is <code>variant</code> and the unique identifier is the resource ID. Example: <code>endpoint/my-end-point/variant/KMeansClustering</code>.</p> </li> <li> <p>Custom resources are not supported with a resource type. This parameter must specify the <code>OutputValue</code> from the CloudFormation template stack used to access the resources. The unique identifier is defined by the service provider. More information is available in our <a href=\"https://github.com/aws/aws-auto-scaling-custom-resource\">GitHub repository</a>.</p> </li> <li> <p>Amazon Comprehend document classification endpoint - The resource type and unique identifier are specified using the endpoint ARN. Example: <code>arn:aws:comprehend:us-west-2:123456789012:document-classifier-endpoint/EXAMPLE</code>.</p> </li> <li> <p>Lambda provisioned concurrency - The resource type is <code>function</code> and the unique identifier is the function name with a function version or alias name suffix that is not <code>$LATEST</code>. Example: <code>function:my-function:prod</code> or <code>function:my-function:1</code>.</p> </li> </ul>"
         },
         "ScalableDimension":{
           "shape":"ScalableDimension",
-          "documentation":"<p>The scalable dimension associated with the scalable target. This string consists of the service namespace, resource type, and scaling property.</p> <ul> <li> <p> <code>ecs:service:DesiredCount</code> - The desired task count of an ECS service.</p> </li> <li> <p> <code>ec2:spot-fleet-request:TargetCapacity</code> - The target capacity of a Spot Fleet request.</p> </li> <li> <p> <code>elasticmapreduce:instancegroup:InstanceCount</code> - The instance count of an EMR Instance Group.</p> </li> <li> <p> <code>appstream:fleet:DesiredCapacity</code> - The desired capacity of an AppStream 2.0 fleet.</p> </li> <li> <p> <code>dynamodb:table:ReadCapacityUnits</code> - The provisioned read capacity for a DynamoDB table.</p> </li> <li> <p> <code>dynamodb:table:WriteCapacityUnits</code> - The provisioned write capacity for a DynamoDB table.</p> </li> <li> <p> <code>dynamodb:index:ReadCapacityUnits</code> - The provisioned read capacity for a DynamoDB global secondary index.</p> </li> <li> <p> <code>dynamodb:index:WriteCapacityUnits</code> - The provisioned write capacity for a DynamoDB global secondary index.</p> </li> <li> <p> <code>rds:cluster:ReadReplicaCount</code> - The count of Aurora Replicas in an Aurora DB cluster. Available for Aurora MySQL-compatible edition and Aurora PostgreSQL-compatible edition.</p> </li> <li> <p> <code>sagemaker:variant:DesiredInstanceCount</code> - The number of EC2 instances for an Amazon SageMaker model endpoint variant.</p> </li> <li> <p> <code>custom-resource:ResourceType:Property</code> - The scalable dimension for a custom resource provided by your own application or service.</p> </li> </ul>"
+          "documentation":"<p>The scalable dimension associated with the scalable target. This string consists of the service namespace, resource type, and scaling property.</p> <ul> <li> <p> <code>ecs:service:DesiredCount</code> - The desired task count of an ECS service.</p> </li> <li> <p> <code>ec2:spot-fleet-request:TargetCapacity</code> - The target capacity of a Spot Fleet request.</p> </li> <li> <p> <code>elasticmapreduce:instancegroup:InstanceCount</code> - The instance count of an EMR Instance Group.</p> </li> <li> <p> <code>appstream:fleet:DesiredCapacity</code> - The desired capacity of an AppStream 2.0 fleet.</p> </li> <li> <p> <code>dynamodb:table:ReadCapacityUnits</code> - The provisioned read capacity for a DynamoDB table.</p> </li> <li> <p> <code>dynamodb:table:WriteCapacityUnits</code> - The provisioned write capacity for a DynamoDB table.</p> </li> <li> <p> <code>dynamodb:index:ReadCapacityUnits</code> - The provisioned read capacity for a DynamoDB global secondary index.</p> </li> <li> <p> <code>dynamodb:index:WriteCapacityUnits</code> - The provisioned write capacity for a DynamoDB global secondary index.</p> </li> <li> <p> <code>rds:cluster:ReadReplicaCount</code> - The count of Aurora Replicas in an Aurora DB cluster. Available for Aurora MySQL-compatible edition and Aurora PostgreSQL-compatible edition.</p> </li> <li> <p> <code>sagemaker:variant:DesiredInstanceCount</code> - The number of EC2 instances for an Amazon SageMaker model endpoint variant.</p> </li> <li> <p> <code>custom-resource:ResourceType:Property</code> - The scalable dimension for a custom resource provided by your own application or service.</p> </li> <li> <p> <code>comprehend:document-classifier-endpoint:DesiredInferenceUnits</code> - The number of inference units for an Amazon Comprehend document classification endpoint.</p> </li> <li> <p> <code>lambda:function:ProvisionedConcurrency</code> - The provisioned concurrency for a Lambda function.</p> </li> </ul>"
         },
         "MinCapacity":{
           "shape":"ResourceCapacity",
@@ -907,11 +912,11 @@
         },
         "ResourceId":{
           "shape":"ResourceIdMaxLen1600",
-          "documentation":"<p>The identifier of the resource associated with the scaling activity. This string consists of the resource type and unique identifier.</p> <ul> <li> <p>ECS service - The resource type is <code>service</code> and the unique identifier is the cluster name and service name. Example: <code>service/default/sample-webapp</code>.</p> </li> <li> <p>Spot Fleet request - The resource type is <code>spot-fleet-request</code> and the unique identifier is the Spot Fleet request ID. Example: <code>spot-fleet-request/sfr-73fbd2ce-aa30-494c-8788-1cee4EXAMPLE</code>.</p> </li> <li> <p>EMR cluster - The resource type is <code>instancegroup</code> and the unique identifier is the cluster ID and instance group ID. Example: <code>instancegroup/j-2EEZNYKUA1NTV/ig-1791Y4E1L8YI0</code>.</p> </li> <li> <p>AppStream 2.0 fleet - The resource type is <code>fleet</code> and the unique identifier is the fleet name. Example: <code>fleet/sample-fleet</code>.</p> </li> <li> <p>DynamoDB table - The resource type is <code>table</code> and the unique identifier is the resource ID. Example: <code>table/my-table</code>.</p> </li> <li> <p>DynamoDB global secondary index - The resource type is <code>index</code> and the unique identifier is the resource ID. Example: <code>table/my-table/index/my-table-index</code>.</p> </li> <li> <p>Aurora DB cluster - The resource type is <code>cluster</code> and the unique identifier is the cluster name. Example: <code>cluster:my-db-cluster</code>.</p> </li> <li> <p>Amazon SageMaker endpoint variants - The resource type is <code>variant</code> and the unique identifier is the resource ID. Example: <code>endpoint/my-end-point/variant/KMeansClustering</code>.</p> </li> <li> <p>Custom resources are not supported with a resource type. This parameter must specify the <code>OutputValue</code> from the CloudFormation template stack used to access the resources. The unique identifier is defined by the service provider. More information is available in our <a href=\"https://github.com/aws/aws-auto-scaling-custom-resource\">GitHub repository</a>.</p> </li> </ul>"
+          "documentation":"<p>The identifier of the resource associated with the scaling activity. This string consists of the resource type and unique identifier.</p> <ul> <li> <p>ECS service - The resource type is <code>service</code> and the unique identifier is the cluster name and service name. Example: <code>service/default/sample-webapp</code>.</p> </li> <li> <p>Spot Fleet request - The resource type is <code>spot-fleet-request</code> and the unique identifier is the Spot Fleet request ID. Example: <code>spot-fleet-request/sfr-73fbd2ce-aa30-494c-8788-1cee4EXAMPLE</code>.</p> </li> <li> <p>EMR cluster - The resource type is <code>instancegroup</code> and the unique identifier is the cluster ID and instance group ID. Example: <code>instancegroup/j-2EEZNYKUA1NTV/ig-1791Y4E1L8YI0</code>.</p> </li> <li> <p>AppStream 2.0 fleet - The resource type is <code>fleet</code> and the unique identifier is the fleet name. Example: <code>fleet/sample-fleet</code>.</p> </li> <li> <p>DynamoDB table - The resource type is <code>table</code> and the unique identifier is the table name. Example: <code>table/my-table</code>.</p> </li> <li> <p>DynamoDB global secondary index - The resource type is <code>index</code> and the unique identifier is the index name. Example: <code>table/my-table/index/my-table-index</code>.</p> </li> <li> <p>Aurora DB cluster - The resource type is <code>cluster</code> and the unique identifier is the cluster name. Example: <code>cluster:my-db-cluster</code>.</p> </li> <li> <p>Amazon SageMaker endpoint variant - The resource type is <code>variant</code> and the unique identifier is the resource ID. Example: <code>endpoint/my-end-point/variant/KMeansClustering</code>.</p> </li> <li> <p>Custom resources are not supported with a resource type. This parameter must specify the <code>OutputValue</code> from the CloudFormation template stack used to access the resources. The unique identifier is defined by the service provider. More information is available in our <a href=\"https://github.com/aws/aws-auto-scaling-custom-resource\">GitHub repository</a>.</p> </li> <li> <p>Amazon Comprehend document classification endpoint - The resource type and unique identifier are specified using the endpoint ARN. Example: <code>arn:aws:comprehend:us-west-2:123456789012:document-classifier-endpoint/EXAMPLE</code>.</p> </li> <li> <p>Lambda provisioned concurrency - The resource type is <code>function</code> and the unique identifier is the function name with a function version or alias name suffix that is not <code>$LATEST</code>. Example: <code>function:my-function:prod</code> or <code>function:my-function:1</code>.</p> </li> </ul>"
         },
         "ScalableDimension":{
           "shape":"ScalableDimension",
-          "documentation":"<p>The scalable dimension. This string consists of the service namespace, resource type, and scaling property.</p> <ul> <li> <p> <code>ecs:service:DesiredCount</code> - The desired task count of an ECS service.</p> </li> <li> <p> <code>ec2:spot-fleet-request:TargetCapacity</code> - The target capacity of a Spot Fleet request.</p> </li> <li> <p> <code>elasticmapreduce:instancegroup:InstanceCount</code> - The instance count of an EMR Instance Group.</p> </li> <li> <p> <code>appstream:fleet:DesiredCapacity</code> - The desired capacity of an AppStream 2.0 fleet.</p> </li> <li> <p> <code>dynamodb:table:ReadCapacityUnits</code> - The provisioned read capacity for a DynamoDB table.</p> </li> <li> <p> <code>dynamodb:table:WriteCapacityUnits</code> - The provisioned write capacity for a DynamoDB table.</p> </li> <li> <p> <code>dynamodb:index:ReadCapacityUnits</code> - The provisioned read capacity for a DynamoDB global secondary index.</p> </li> <li> <p> <code>dynamodb:index:WriteCapacityUnits</code> - The provisioned write capacity for a DynamoDB global secondary index.</p> </li> <li> <p> <code>rds:cluster:ReadReplicaCount</code> - The count of Aurora Replicas in an Aurora DB cluster. Available for Aurora MySQL-compatible edition and Aurora PostgreSQL-compatible edition.</p> </li> <li> <p> <code>sagemaker:variant:DesiredInstanceCount</code> - The number of EC2 instances for an Amazon SageMaker model endpoint variant.</p> </li> <li> <p> <code>custom-resource:ResourceType:Property</code> - The scalable dimension for a custom resource provided by your own application or service.</p> </li> </ul>"
+          "documentation":"<p>The scalable dimension. This string consists of the service namespace, resource type, and scaling property.</p> <ul> <li> <p> <code>ecs:service:DesiredCount</code> - The desired task count of an ECS service.</p> </li> <li> <p> <code>ec2:spot-fleet-request:TargetCapacity</code> - The target capacity of a Spot Fleet request.</p> </li> <li> <p> <code>elasticmapreduce:instancegroup:InstanceCount</code> - The instance count of an EMR Instance Group.</p> </li> <li> <p> <code>appstream:fleet:DesiredCapacity</code> - The desired capacity of an AppStream 2.0 fleet.</p> </li> <li> <p> <code>dynamodb:table:ReadCapacityUnits</code> - The provisioned read capacity for a DynamoDB table.</p> </li> <li> <p> <code>dynamodb:table:WriteCapacityUnits</code> - The provisioned write capacity for a DynamoDB table.</p> </li> <li> <p> <code>dynamodb:index:ReadCapacityUnits</code> - The provisioned read capacity for a DynamoDB global secondary index.</p> </li> <li> <p> <code>dynamodb:index:WriteCapacityUnits</code> - The provisioned write capacity for a DynamoDB global secondary index.</p> </li> <li> <p> <code>rds:cluster:ReadReplicaCount</code> - The count of Aurora Replicas in an Aurora DB cluster. Available for Aurora MySQL-compatible edition and Aurora PostgreSQL-compatible edition.</p> </li> <li> <p> <code>sagemaker:variant:DesiredInstanceCount</code> - The number of EC2 instances for an Amazon SageMaker model endpoint variant.</p> </li> <li> <p> <code>custom-resource:ResourceType:Property</code> - The scalable dimension for a custom resource provided by your own application or service.</p> </li> <li> <p> <code>comprehend:document-classifier-endpoint:DesiredInferenceUnits</code> - The number of inference units for an Amazon Comprehend document classification endpoint.</p> </li> <li> <p> <code>lambda:function:ProvisionedConcurrency</code> - The provisioned concurrency for a Lambda function.</p> </li> </ul>"
         },
         "Description":{
           "shape":"XmlString",
@@ -986,11 +991,11 @@
         },
         "ResourceId":{
           "shape":"ResourceIdMaxLen1600",
-          "documentation":"<p>The identifier of the resource associated with the scaling policy. This string consists of the resource type and unique identifier.</p> <ul> <li> <p>ECS service - The resource type is <code>service</code> and the unique identifier is the cluster name and service name. Example: <code>service/default/sample-webapp</code>.</p> </li> <li> <p>Spot Fleet request - The resource type is <code>spot-fleet-request</code> and the unique identifier is the Spot Fleet request ID. Example: <code>spot-fleet-request/sfr-73fbd2ce-aa30-494c-8788-1cee4EXAMPLE</code>.</p> </li> <li> <p>EMR cluster - The resource type is <code>instancegroup</code> and the unique identifier is the cluster ID and instance group ID. Example: <code>instancegroup/j-2EEZNYKUA1NTV/ig-1791Y4E1L8YI0</code>.</p> </li> <li> <p>AppStream 2.0 fleet - The resource type is <code>fleet</code> and the unique identifier is the fleet name. Example: <code>fleet/sample-fleet</code>.</p> </li> <li> <p>DynamoDB table - The resource type is <code>table</code> and the unique identifier is the resource ID. Example: <code>table/my-table</code>.</p> </li> <li> <p>DynamoDB global secondary index - The resource type is <code>index</code> and the unique identifier is the resource ID. Example: <code>table/my-table/index/my-table-index</code>.</p> </li> <li> <p>Aurora DB cluster - The resource type is <code>cluster</code> and the unique identifier is the cluster name. Example: <code>cluster:my-db-cluster</code>.</p> </li> <li> <p>Amazon SageMaker endpoint variants - The resource type is <code>variant</code> and the unique identifier is the resource ID. Example: <code>endpoint/my-end-point/variant/KMeansClustering</code>.</p> </li> <li> <p>Custom resources are not supported with a resource type. This parameter must specify the <code>OutputValue</code> from the CloudFormation template stack used to access the resources. The unique identifier is defined by the service provider. More information is available in our <a href=\"https://github.com/aws/aws-auto-scaling-custom-resource\">GitHub repository</a>.</p> </li> </ul>"
+          "documentation":"<p>The identifier of the resource associated with the scaling policy. This string consists of the resource type and unique identifier.</p> <ul> <li> <p>ECS service - The resource type is <code>service</code> and the unique identifier is the cluster name and service name. Example: <code>service/default/sample-webapp</code>.</p> </li> <li> <p>Spot Fleet request - The resource type is <code>spot-fleet-request</code> and the unique identifier is the Spot Fleet request ID. Example: <code>spot-fleet-request/sfr-73fbd2ce-aa30-494c-8788-1cee4EXAMPLE</code>.</p> </li> <li> <p>EMR cluster - The resource type is <code>instancegroup</code> and the unique identifier is the cluster ID and instance group ID. Example: <code>instancegroup/j-2EEZNYKUA1NTV/ig-1791Y4E1L8YI0</code>.</p> </li> <li> <p>AppStream 2.0 fleet - The resource type is <code>fleet</code> and the unique identifier is the fleet name. Example: <code>fleet/sample-fleet</code>.</p> </li> <li> <p>DynamoDB table - The resource type is <code>table</code> and the unique identifier is the table name. Example: <code>table/my-table</code>.</p> </li> <li> <p>DynamoDB global secondary index - The resource type is <code>index</code> and the unique identifier is the index name. Example: <code>table/my-table/index/my-table-index</code>.</p> </li> <li> <p>Aurora DB cluster - The resource type is <code>cluster</code> and the unique identifier is the cluster name. Example: <code>cluster:my-db-cluster</code>.</p> </li> <li> <p>Amazon SageMaker endpoint variant - The resource type is <code>variant</code> and the unique identifier is the resource ID. Example: <code>endpoint/my-end-point/variant/KMeansClustering</code>.</p> </li> <li> <p>Custom resources are not supported with a resource type. This parameter must specify the <code>OutputValue</code> from the CloudFormation template stack used to access the resources. The unique identifier is defined by the service provider. More information is available in our <a href=\"https://github.com/aws/aws-auto-scaling-custom-resource\">GitHub repository</a>.</p> </li> <li> <p>Amazon Comprehend document classification endpoint - The resource type and unique identifier are specified using the endpoint ARN. Example: <code>arn:aws:comprehend:us-west-2:123456789012:document-classifier-endpoint/EXAMPLE</code>.</p> </li> <li> <p>Lambda provisioned concurrency - The resource type is <code>function</code> and the unique identifier is the function name with a function version or alias name suffix that is not <code>$LATEST</code>. Example: <code>function:my-function:prod</code> or <code>function:my-function:1</code>.</p> </li> </ul>"
         },
         "ScalableDimension":{
           "shape":"ScalableDimension",
-          "documentation":"<p>The scalable dimension. This string consists of the service namespace, resource type, and scaling property.</p> <ul> <li> <p> <code>ecs:service:DesiredCount</code> - The desired task count of an ECS service.</p> </li> <li> <p> <code>ec2:spot-fleet-request:TargetCapacity</code> - The target capacity of a Spot Fleet request.</p> </li> <li> <p> <code>elasticmapreduce:instancegroup:InstanceCount</code> - The instance count of an EMR Instance Group.</p> </li> <li> <p> <code>appstream:fleet:DesiredCapacity</code> - The desired capacity of an AppStream 2.0 fleet.</p> </li> <li> <p> <code>dynamodb:table:ReadCapacityUnits</code> - The provisioned read capacity for a DynamoDB table.</p> </li> <li> <p> <code>dynamodb:table:WriteCapacityUnits</code> - The provisioned write capacity for a DynamoDB table.</p> </li> <li> <p> <code>dynamodb:index:ReadCapacityUnits</code> - The provisioned read capacity for a DynamoDB global secondary index.</p> </li> <li> <p> <code>dynamodb:index:WriteCapacityUnits</code> - The provisioned write capacity for a DynamoDB global secondary index.</p> </li> <li> <p> <code>rds:cluster:ReadReplicaCount</code> - The count of Aurora Replicas in an Aurora DB cluster. Available for Aurora MySQL-compatible edition and Aurora PostgreSQL-compatible edition.</p> </li> <li> <p> <code>sagemaker:variant:DesiredInstanceCount</code> - The number of EC2 instances for an Amazon SageMaker model endpoint variant.</p> </li> <li> <p> <code>custom-resource:ResourceType:Property</code> - The scalable dimension for a custom resource provided by your own application or service.</p> </li> </ul>"
+          "documentation":"<p>The scalable dimension. This string consists of the service namespace, resource type, and scaling property.</p> <ul> <li> <p> <code>ecs:service:DesiredCount</code> - The desired task count of an ECS service.</p> </li> <li> <p> <code>ec2:spot-fleet-request:TargetCapacity</code> - The target capacity of a Spot Fleet request.</p> </li> <li> <p> <code>elasticmapreduce:instancegroup:InstanceCount</code> - The instance count of an EMR Instance Group.</p> </li> <li> <p> <code>appstream:fleet:DesiredCapacity</code> - The desired capacity of an AppStream 2.0 fleet.</p> </li> <li> <p> <code>dynamodb:table:ReadCapacityUnits</code> - The provisioned read capacity for a DynamoDB table.</p> </li> <li> <p> <code>dynamodb:table:WriteCapacityUnits</code> - The provisioned write capacity for a DynamoDB table.</p> </li> <li> <p> <code>dynamodb:index:ReadCapacityUnits</code> - The provisioned read capacity for a DynamoDB global secondary index.</p> </li> <li> <p> <code>dynamodb:index:WriteCapacityUnits</code> - The provisioned write capacity for a DynamoDB global secondary index.</p> </li> <li> <p> <code>rds:cluster:ReadReplicaCount</code> - The count of Aurora Replicas in an Aurora DB cluster. Available for Aurora MySQL-compatible edition and Aurora PostgreSQL-compatible edition.</p> </li> <li> <p> <code>sagemaker:variant:DesiredInstanceCount</code> - The number of EC2 instances for an Amazon SageMaker model endpoint variant.</p> </li> <li> <p> <code>custom-resource:ResourceType:Property</code> - The scalable dimension for a custom resource provided by your own application or service.</p> </li> <li> <p> <code>comprehend:document-classifier-endpoint:DesiredInferenceUnits</code> - The number of inference units for an Amazon Comprehend document classification endpoint.</p> </li> <li> <p> <code>lambda:function:ProvisionedConcurrency</code> - The provisioned concurrency for a Lambda function.</p> </li> </ul>"
         },
         "PolicyType":{
           "shape":"PolicyType",
@@ -1045,11 +1050,11 @@
         },
         "ResourceId":{
           "shape":"ResourceIdMaxLen1600",
-          "documentation":"<p>The identifier of the resource associated with the scaling policy. This string consists of the resource type and unique identifier.</p> <ul> <li> <p>ECS service - The resource type is <code>service</code> and the unique identifier is the cluster name and service name. Example: <code>service/default/sample-webapp</code>.</p> </li> <li> <p>Spot Fleet request - The resource type is <code>spot-fleet-request</code> and the unique identifier is the Spot Fleet request ID. Example: <code>spot-fleet-request/sfr-73fbd2ce-aa30-494c-8788-1cee4EXAMPLE</code>.</p> </li> <li> <p>EMR cluster - The resource type is <code>instancegroup</code> and the unique identifier is the cluster ID and instance group ID. Example: <code>instancegroup/j-2EEZNYKUA1NTV/ig-1791Y4E1L8YI0</code>.</p> </li> <li> <p>AppStream 2.0 fleet - The resource type is <code>fleet</code> and the unique identifier is the fleet name. Example: <code>fleet/sample-fleet</code>.</p> </li> <li> <p>DynamoDB table - The resource type is <code>table</code> and the unique identifier is the resource ID. Example: <code>table/my-table</code>.</p> </li> <li> <p>DynamoDB global secondary index - The resource type is <code>index</code> and the unique identifier is the resource ID. Example: <code>table/my-table/index/my-table-index</code>.</p> </li> <li> <p>Aurora DB cluster - The resource type is <code>cluster</code> and the unique identifier is the cluster name. Example: <code>cluster:my-db-cluster</code>.</p> </li> <li> <p>Amazon SageMaker endpoint variants - The resource type is <code>variant</code> and the unique identifier is the resource ID. Example: <code>endpoint/my-end-point/variant/KMeansClustering</code>.</p> </li> <li> <p>Custom resources are not supported with a resource type. This parameter must specify the <code>OutputValue</code> from the CloudFormation template stack used to access the resources. The unique identifier is defined by the service provider. More information is available in our <a href=\"https://github.com/aws/aws-auto-scaling-custom-resource\">GitHub repository</a>.</p> </li> </ul>"
+          "documentation":"<p>The identifier of the resource associated with the scaling policy. This string consists of the resource type and unique identifier.</p> <ul> <li> <p>ECS service - The resource type is <code>service</code> and the unique identifier is the cluster name and service name. Example: <code>service/default/sample-webapp</code>.</p> </li> <li> <p>Spot Fleet request - The resource type is <code>spot-fleet-request</code> and the unique identifier is the Spot Fleet request ID. Example: <code>spot-fleet-request/sfr-73fbd2ce-aa30-494c-8788-1cee4EXAMPLE</code>.</p> </li> <li> <p>EMR cluster - The resource type is <code>instancegroup</code> and the unique identifier is the cluster ID and instance group ID. Example: <code>instancegroup/j-2EEZNYKUA1NTV/ig-1791Y4E1L8YI0</code>.</p> </li> <li> <p>AppStream 2.0 fleet - The resource type is <code>fleet</code> and the unique identifier is the fleet name. Example: <code>fleet/sample-fleet</code>.</p> </li> <li> <p>DynamoDB table - The resource type is <code>table</code> and the unique identifier is the table name. Example: <code>table/my-table</code>.</p> </li> <li> <p>DynamoDB global secondary index - The resource type is <code>index</code> and the unique identifier is the index name. Example: <code>table/my-table/index/my-table-index</code>.</p> </li> <li> <p>Aurora DB cluster - The resource type is <code>cluster</code> and the unique identifier is the cluster name. Example: <code>cluster:my-db-cluster</code>.</p> </li> <li> <p>Amazon SageMaker endpoint variant - The resource type is <code>variant</code> and the unique identifier is the resource ID. Example: <code>endpoint/my-end-point/variant/KMeansClustering</code>.</p> </li> <li> <p>Custom resources are not supported with a resource type. This parameter must specify the <code>OutputValue</code> from the CloudFormation template stack used to access the resources. The unique identifier is defined by the service provider. More information is available in our <a href=\"https://github.com/aws/aws-auto-scaling-custom-resource\">GitHub repository</a>.</p> </li> <li> <p>Amazon Comprehend document classification endpoint - The resource type and unique identifier are specified using the endpoint ARN. Example: <code>arn:aws:comprehend:us-west-2:123456789012:document-classifier-endpoint/EXAMPLE</code>.</p> </li> <li> <p>Lambda provisioned concurrency - The resource type is <code>function</code> and the unique identifier is the function name with a function version or alias name suffix that is not <code>$LATEST</code>. Example: <code>function:my-function:prod</code> or <code>function:my-function:1</code>.</p> </li> </ul>"
         },
         "ScalableDimension":{
           "shape":"ScalableDimension",
-          "documentation":"<p>The scalable dimension. This string consists of the service namespace, resource type, and scaling property.</p> <ul> <li> <p> <code>ecs:service:DesiredCount</code> - The desired task count of an ECS service.</p> </li> <li> <p> <code>ec2:spot-fleet-request:TargetCapacity</code> - The target capacity of a Spot Fleet request.</p> </li> <li> <p> <code>elasticmapreduce:instancegroup:InstanceCount</code> - The instance count of an EMR Instance Group.</p> </li> <li> <p> <code>appstream:fleet:DesiredCapacity</code> - The desired capacity of an AppStream 2.0 fleet.</p> </li> <li> <p> <code>dynamodb:table:ReadCapacityUnits</code> - The provisioned read capacity for a DynamoDB table.</p> </li> <li> <p> <code>dynamodb:table:WriteCapacityUnits</code> - The provisioned write capacity for a DynamoDB table.</p> </li> <li> <p> <code>dynamodb:index:ReadCapacityUnits</code> - The provisioned read capacity for a DynamoDB global secondary index.</p> </li> <li> <p> <code>dynamodb:index:WriteCapacityUnits</code> - The provisioned write capacity for a DynamoDB global secondary index.</p> </li> <li> <p> <code>rds:cluster:ReadReplicaCount</code> - The count of Aurora Replicas in an Aurora DB cluster. Available for Aurora MySQL-compatible edition and Aurora PostgreSQL-compatible edition.</p> </li> <li> <p> <code>sagemaker:variant:DesiredInstanceCount</code> - The number of EC2 instances for an Amazon SageMaker model endpoint variant.</p> </li> <li> <p> <code>custom-resource:ResourceType:Property</code> - The scalable dimension for a custom resource provided by your own application or service.</p> </li> </ul>"
+          "documentation":"<p>The scalable dimension. This string consists of the service namespace, resource type, and scaling property.</p> <ul> <li> <p> <code>ecs:service:DesiredCount</code> - The desired task count of an ECS service.</p> </li> <li> <p> <code>ec2:spot-fleet-request:TargetCapacity</code> - The target capacity of a Spot Fleet request.</p> </li> <li> <p> <code>elasticmapreduce:instancegroup:InstanceCount</code> - The instance count of an EMR Instance Group.</p> </li> <li> <p> <code>appstream:fleet:DesiredCapacity</code> - The desired capacity of an AppStream 2.0 fleet.</p> </li> <li> <p> <code>dynamodb:table:ReadCapacityUnits</code> - The provisioned read capacity for a DynamoDB table.</p> </li> <li> <p> <code>dynamodb:table:WriteCapacityUnits</code> - The provisioned write capacity for a DynamoDB table.</p> </li> <li> <p> <code>dynamodb:index:ReadCapacityUnits</code> - The provisioned read capacity for a DynamoDB global secondary index.</p> </li> <li> <p> <code>dynamodb:index:WriteCapacityUnits</code> - The provisioned write capacity for a DynamoDB global secondary index.</p> </li> <li> <p> <code>rds:cluster:ReadReplicaCount</code> - The count of Aurora Replicas in an Aurora DB cluster. Available for Aurora MySQL-compatible edition and Aurora PostgreSQL-compatible edition.</p> </li> <li> <p> <code>sagemaker:variant:DesiredInstanceCount</code> - The number of EC2 instances for an Amazon SageMaker model endpoint variant.</p> </li> <li> <p> <code>custom-resource:ResourceType:Property</code> - The scalable dimension for a custom resource provided by your own application or service.</p> </li> <li> <p> <code>comprehend:document-classifier-endpoint:DesiredInferenceUnits</code> - The number of inference units for an Amazon Comprehend document classification endpoint.</p> </li> <li> <p> <code>lambda:function:ProvisionedConcurrency</code> - The provisioned concurrency for a Lambda function.</p> </li> </ul>"
         },
         "StartTime":{
           "shape":"TimestampType",
@@ -1090,7 +1095,9 @@
         "dynamodb",
         "rds",
         "sagemaker",
-        "custom-resource"
+        "custom-resource",
+        "comprehend",
+        "lambda"
       ]
     },
     "StepAdjustment":{
@@ -1205,5 +1212,5 @@
       "pattern":"[\\u0020-\\uD7FF\\uE000-\\uFFFD\\uD800\\uDC00-\\uDBFF\\uDFFF\\r\\n\\t]*"
     }
   },
-  "documentation":"<p>With Application Auto Scaling, you can configure automatic scaling for the following resources:</p> <ul> <li> <p>Amazon ECS services</p> </li> <li> <p>Amazon EC2 Spot Fleet requests</p> </li> <li> <p>Amazon EMR clusters</p> </li> <li> <p>Amazon AppStream 2.0 fleets</p> </li> <li> <p>Amazon DynamoDB tables and global secondary indexes throughput capacity</p> </li> <li> <p>Amazon Aurora Replicas</p> </li> <li> <p>Amazon SageMaker endpoint variants</p> </li> <li> <p>Custom resources provided by your own applications or services</p> </li> </ul> <p> <b>API Summary</b> </p> <p>The Application Auto Scaling service API includes three key sets of actions: </p> <ul> <li> <p>Register and manage scalable targets - Register AWS or custom resources as scalable targets (a resource that Application Auto Scaling can scale), set minimum and maximum capacity limits, and retrieve information on existing scalable targets.</p> </li> <li> <p>Configure and manage automatic scaling - Define scaling policies to dynamically scale your resources in response to CloudWatch alarms, schedule one-time or recurring scaling actions, and retrieve your recent scaling activity history.</p> </li> <li> <p>Suspend and resume scaling - Temporarily suspend and later resume automatic scaling by calling the <a>RegisterScalableTarget</a> action for any Application Auto Scaling scalable target. You can suspend and resume, individually or in combination, scale-out activities triggered by a scaling policy, scale-in activities triggered by a scaling policy, and scheduled scaling. </p> </li> </ul> <p>To learn more about Application Auto Scaling, including information about granting IAM users required permissions for Application Auto Scaling actions, see the <a href=\"https://docs.aws.amazon.com/autoscaling/application/userguide/what-is-application-auto-scaling.html\">Application Auto Scaling User Guide</a>.</p>"
+  "documentation":"<p>With Application Auto Scaling, you can configure automatic scaling for the following resources:</p> <ul> <li> <p>Amazon ECS services</p> </li> <li> <p>Amazon EC2 Spot Fleet requests</p> </li> <li> <p>Amazon EMR clusters</p> </li> <li> <p>Amazon AppStream 2.0 fleets</p> </li> <li> <p>Amazon DynamoDB tables and global secondary indexes throughput capacity</p> </li> <li> <p>Amazon Aurora Replicas</p> </li> <li> <p>Amazon SageMaker endpoint variants</p> </li> <li> <p>Custom resources provided by your own applications or services</p> </li> <li> <p>Amazon Comprehend document classification endpoints</p> </li> <li> <p>AWS Lambda function provisioned concurrency</p> </li> </ul> <p> <b>API Summary</b> </p> <p>The Application Auto Scaling service API includes three key sets of actions: </p> <ul> <li> <p>Register and manage scalable targets - Register AWS or custom resources as scalable targets (a resource that Application Auto Scaling can scale), set minimum and maximum capacity limits, and retrieve information on existing scalable targets.</p> </li> <li> <p>Configure and manage automatic scaling - Define scaling policies to dynamically scale your resources in response to CloudWatch alarms, schedule one-time or recurring scaling actions, and retrieve your recent scaling activity history.</p> </li> <li> <p>Suspend and resume scaling - Temporarily suspend and later resume automatic scaling by calling the <a>RegisterScalableTarget</a> action for any Application Auto Scaling scalable target. You can suspend and resume, individually or in combination, scale-out activities triggered by a scaling policy, scale-in activities triggered by a scaling policy, and scheduled scaling. </p> </li> </ul> <p>To learn more about Application Auto Scaling, including information about granting IAM users required permissions for Application Auto Scaling actions, see the <a href=\"https://docs.aws.amazon.com/autoscaling/application/userguide/what-is-application-auto-scaling.html\">Application Auto Scaling User Guide</a>.</p>"
 }
diff --git a/services/applicationautoscaling/src/test/resources/cucumber.properties b/services/applicationautoscaling/src/test/resources/cucumber.properties
index d74d941c7fa7..90a3e8438a8a 100644
--- a/services/applicationautoscaling/src/test/resources/cucumber.properties
+++ b/services/applicationautoscaling/src/test/resources/cucumber.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/applicationdiscovery/build.properties b/services/applicationdiscovery/build.properties
index ecf2dae6fcb1..15ec2da1fc71 100644
--- a/services/applicationdiscovery/build.properties
+++ b/services/applicationdiscovery/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/applicationdiscovery/pom.xml b/services/applicationdiscovery/pom.xml
index 7fd8c70dfabc..cd4710aab6a7 100644
--- a/services/applicationdiscovery/pom.xml
+++ b/services/applicationdiscovery/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>applicationdiscovery</artifactId>
     <name>AWS Java SDK :: Services :: AWS Application Discovery Service</name>
diff --git a/services/applicationdiscovery/src/main/resources/codegen-resources/service-2.json b/services/applicationdiscovery/src/main/resources/codegen-resources/service-2.json
index 1f54b8d94247..a7d015d4d1d7 100644
--- a/services/applicationdiscovery/src/main/resources/codegen-resources/service-2.json
+++ b/services/applicationdiscovery/src/main/resources/codegen-resources/service-2.json
@@ -24,7 +24,8 @@
         {"shape":"AuthorizationErrorException"},
         {"shape":"InvalidParameterException"},
         {"shape":"InvalidParameterValueException"},
-        {"shape":"ServerInternalErrorException"}
+        {"shape":"ServerInternalErrorException"},
+        {"shape":"HomeRegionNotSetException"}
       ],
       "documentation":"<p>Associates one or more configuration items with an application.</p>"
     },
@@ -38,8 +39,10 @@
       "output":{"shape":"BatchDeleteImportDataResponse"},
       "errors":[
         {"shape":"AuthorizationErrorException"},
+        {"shape":"InvalidParameterException"},
         {"shape":"InvalidParameterValueException"},
-        {"shape":"ServerInternalErrorException"}
+        {"shape":"ServerInternalErrorException"},
+        {"shape":"HomeRegionNotSetException"}
       ],
       "documentation":"<p>Deletes one or more import tasks, each identified by their import ID. Each import task has a number of records that can identify servers or applications. </p> <p>AWS Application Discovery Service has built-in matching logic that will identify when discovered servers match existing entries that you've previously discovered, the information for the already-existing discovered server is updated. When you delete an import task that contains records that were used to match, the information in those matched records that comes from the deleted records will also be deleted.</p>"
     },
@@ -55,7 +58,8 @@
         {"shape":"AuthorizationErrorException"},
         {"shape":"InvalidParameterException"},
         {"shape":"InvalidParameterValueException"},
-        {"shape":"ServerInternalErrorException"}
+        {"shape":"ServerInternalErrorException"},
+        {"shape":"HomeRegionNotSetException"}
       ],
       "documentation":"<p>Creates an application with the given name and description.</p>"
     },
@@ -72,7 +76,8 @@
         {"shape":"ResourceNotFoundException"},
         {"shape":"InvalidParameterException"},
         {"shape":"InvalidParameterValueException"},
-        {"shape":"ServerInternalErrorException"}
+        {"shape":"ServerInternalErrorException"},
+        {"shape":"HomeRegionNotSetException"}
       ],
       "documentation":"<p>Creates one or more tags for configuration items. Tags are metadata that help you categorize IT assets. This API accepts a list of multiple configuration items.</p>"
     },
@@ -88,7 +93,8 @@
         {"shape":"AuthorizationErrorException"},
         {"shape":"InvalidParameterException"},
         {"shape":"InvalidParameterValueException"},
-        {"shape":"ServerInternalErrorException"}
+        {"shape":"ServerInternalErrorException"},
+        {"shape":"HomeRegionNotSetException"}
       ],
       "documentation":"<p>Deletes a list of applications and their associations with configuration items.</p>"
     },
@@ -105,7 +111,8 @@
         {"shape":"ResourceNotFoundException"},
         {"shape":"InvalidParameterException"},
         {"shape":"InvalidParameterValueException"},
-        {"shape":"ServerInternalErrorException"}
+        {"shape":"ServerInternalErrorException"},
+        {"shape":"HomeRegionNotSetException"}
       ],
       "documentation":"<p>Deletes the association between configuration items and one or more tags. This API accepts a list of multiple configuration items.</p>"
     },
@@ -121,7 +128,8 @@
         {"shape":"AuthorizationErrorException"},
         {"shape":"InvalidParameterException"},
         {"shape":"InvalidParameterValueException"},
-        {"shape":"ServerInternalErrorException"}
+        {"shape":"ServerInternalErrorException"},
+        {"shape":"HomeRegionNotSetException"}
       ],
       "documentation":"<p>Lists agents or connectors as specified by ID or other filters. All agents/connectors associated with your user account can be listed if you call <code>DescribeAgents</code> as is without passing any parameters.</p>"
     },
@@ -137,9 +145,10 @@
         {"shape":"AuthorizationErrorException"},
         {"shape":"InvalidParameterException"},
         {"shape":"InvalidParameterValueException"},
-        {"shape":"ServerInternalErrorException"}
+        {"shape":"ServerInternalErrorException"},
+        {"shape":"HomeRegionNotSetException"}
       ],
-      "documentation":"<p>Retrieves attributes for a list of configuration item IDs.</p> <note> <p>All of the supplied IDs must be for the same asset type from one of the following:</p> <ul> <li> <p>server</p> </li> <li> <p>application</p> </li> <li> <p>process</p> </li> <li> <p>connection</p> </li> </ul> <p>Output fields are specific to the asset type specified. For example, the output for a <i>server</i> configuration item includes a list of attributes about the server, such as host name, operating system, number of network cards, etc.</p> <p>For a complete list of outputs for each asset type, see <a href=\"http://docs.aws.amazon.com/application-discovery/latest/APIReference/discovery-api-queries.html#DescribeConfigurations\">Using the DescribeConfigurations Action</a>.</p> </note>"
+      "documentation":"<p>Retrieves attributes for a list of configuration item IDs.</p> <note> <p>All of the supplied IDs must be for the same asset type from one of the following:</p> <ul> <li> <p>server</p> </li> <li> <p>application</p> </li> <li> <p>process</p> </li> <li> <p>connection</p> </li> </ul> <p>Output fields are specific to the asset type specified. For example, the output for a <i>server</i> configuration item includes a list of attributes about the server, such as host name, operating system, number of network cards, etc.</p> <p>For a complete list of outputs for each asset type, see <a href=\"https://docs.aws.amazon.com/application-discovery/latest/userguide/discovery-api-queries.html#DescribeConfigurations\">Using the DescribeConfigurations Action</a> in the <i>AWS Application Discovery Service User Guide</i>.</p> </note>"
     },
     "DescribeContinuousExports":{
       "name":"DescribeContinuousExports",
@@ -155,7 +164,8 @@
         {"shape":"InvalidParameterValueException"},
         {"shape":"ServerInternalErrorException"},
         {"shape":"OperationNotPermittedException"},
-        {"shape":"ResourceNotFoundException"}
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"HomeRegionNotSetException"}
       ],
       "documentation":"<p>Lists exports as specified by ID. All continuous exports associated with your user account can be listed if you call <code>DescribeContinuousExports</code> as is without passing any parameters.</p>"
     },
@@ -172,7 +182,8 @@
         {"shape":"ResourceNotFoundException"},
         {"shape":"InvalidParameterException"},
         {"shape":"InvalidParameterValueException"},
-        {"shape":"ServerInternalErrorException"}
+        {"shape":"ServerInternalErrorException"},
+        {"shape":"HomeRegionNotSetException"}
       ],
       "documentation":"<p> <code>DescribeExportConfigurations</code> is deprecated. Use <a href=\"https://docs.aws.amazon.com/application-discovery/latest/APIReference/API_DescribeExportTasks.html\">DescribeImportTasks</a>, instead.</p>",
       "deprecated":true
@@ -189,7 +200,8 @@
         {"shape":"AuthorizationErrorException"},
         {"shape":"InvalidParameterException"},
         {"shape":"InvalidParameterValueException"},
-        {"shape":"ServerInternalErrorException"}
+        {"shape":"ServerInternalErrorException"},
+        {"shape":"HomeRegionNotSetException"}
       ],
       "documentation":"<p>Retrieve status of one or more export tasks. You can retrieve the status of up to 100 export tasks.</p>"
     },
@@ -203,8 +215,10 @@
       "output":{"shape":"DescribeImportTasksResponse"},
       "errors":[
         {"shape":"AuthorizationErrorException"},
+        {"shape":"InvalidParameterException"},
         {"shape":"InvalidParameterValueException"},
-        {"shape":"ServerInternalErrorException"}
+        {"shape":"ServerInternalErrorException"},
+        {"shape":"HomeRegionNotSetException"}
       ],
       "documentation":"<p>Returns an array of import tasks for your account, including status information, times, IDs, the Amazon S3 Object URL for the import file, and more.</p>"
     },
@@ -221,7 +235,8 @@
         {"shape":"ResourceNotFoundException"},
         {"shape":"InvalidParameterException"},
         {"shape":"InvalidParameterValueException"},
-        {"shape":"ServerInternalErrorException"}
+        {"shape":"ServerInternalErrorException"},
+        {"shape":"HomeRegionNotSetException"}
       ],
       "documentation":"<p>Retrieves a list of configuration items that have tags as specified by the key-value pairs, name and value, passed to the optional parameter <code>filters</code>.</p> <p>There are three valid tag filter names:</p> <ul> <li> <p>tagKey</p> </li> <li> <p>tagValue</p> </li> <li> <p>configurationId</p> </li> </ul> <p>Also, all configuration items associated with your user account that have tags can be listed if you call <code>DescribeTags</code> as is without passing any parameters.</p>"
     },
@@ -237,7 +252,8 @@
         {"shape":"AuthorizationErrorException"},
         {"shape":"InvalidParameterException"},
         {"shape":"InvalidParameterValueException"},
-        {"shape":"ServerInternalErrorException"}
+        {"shape":"ServerInternalErrorException"},
+        {"shape":"HomeRegionNotSetException"}
       ],
       "documentation":"<p>Disassociates one or more configuration items from an application.</p>"
     },
@@ -253,7 +269,8 @@
         {"shape":"InvalidParameterException"},
         {"shape":"InvalidParameterValueException"},
         {"shape":"ServerInternalErrorException"},
-        {"shape":"OperationNotPermittedException"}
+        {"shape":"OperationNotPermittedException"},
+        {"shape":"HomeRegionNotSetException"}
       ],
       "documentation":"<p>Deprecated. Use <code>StartExportTask</code> instead.</p> <p>Exports all discovered configuration data to an Amazon S3 bucket or an application that enables you to view and evaluate the data. Data includes tags and tag associations, processes, connections, servers, and system performance. This API returns an export ID that you can query using the <i>DescribeExportConfigurations</i> API. The system imposes a limit of two configuration exports in six hours.</p>",
       "deprecated":true
@@ -270,7 +287,8 @@
         {"shape":"AuthorizationErrorException"},
         {"shape":"InvalidParameterException"},
         {"shape":"InvalidParameterValueException"},
-        {"shape":"ServerInternalErrorException"}
+        {"shape":"ServerInternalErrorException"},
+        {"shape":"HomeRegionNotSetException"}
       ],
       "documentation":"<p>Retrieves a short summary of discovered assets.</p> <p>This API operation takes no request parameters and is called as is at the command prompt as shown in the example.</p>"
     },
@@ -287,9 +305,10 @@
         {"shape":"ResourceNotFoundException"},
         {"shape":"InvalidParameterException"},
         {"shape":"InvalidParameterValueException"},
-        {"shape":"ServerInternalErrorException"}
+        {"shape":"ServerInternalErrorException"},
+        {"shape":"HomeRegionNotSetException"}
       ],
-      "documentation":"<p>Retrieves a list of configuration items as specified by the value passed to the required paramater <code>configurationType</code>. Optional filtering may be applied to refine search results.</p>"
+      "documentation":"<p>Retrieves a list of configuration items as specified by the value passed to the required parameter <code>configurationType</code>. Optional filtering may be applied to refine search results.</p>"
     },
     "ListServerNeighbors":{
       "name":"ListServerNeighbors",
@@ -303,7 +322,8 @@
         {"shape":"AuthorizationErrorException"},
         {"shape":"InvalidParameterException"},
         {"shape":"InvalidParameterValueException"},
-        {"shape":"ServerInternalErrorException"}
+        {"shape":"ServerInternalErrorException"},
+        {"shape":"HomeRegionNotSetException"}
       ],
       "documentation":"<p>Retrieves a list of servers that are one network hop away from a specified server.</p>"
     },
@@ -322,7 +342,8 @@
         {"shape":"InvalidParameterValueException"},
         {"shape":"ServerInternalErrorException"},
         {"shape":"OperationNotPermittedException"},
-        {"shape":"ResourceInUseException"}
+        {"shape":"ResourceInUseException"},
+        {"shape":"HomeRegionNotSetException"}
       ],
       "documentation":"<p>Start the continuous flow of agent's discovered data into Amazon Athena.</p>"
     },
@@ -338,7 +359,8 @@
         {"shape":"AuthorizationErrorException"},
         {"shape":"InvalidParameterException"},
         {"shape":"InvalidParameterValueException"},
-        {"shape":"ServerInternalErrorException"}
+        {"shape":"ServerInternalErrorException"},
+        {"shape":"HomeRegionNotSetException"}
       ],
       "documentation":"<p>Instructs the specified agents or connectors to start collecting data.</p>"
     },
@@ -355,7 +377,8 @@
         {"shape":"InvalidParameterException"},
         {"shape":"InvalidParameterValueException"},
         {"shape":"ServerInternalErrorException"},
-        {"shape":"OperationNotPermittedException"}
+        {"shape":"OperationNotPermittedException"},
+        {"shape":"HomeRegionNotSetException"}
       ],
       "documentation":"<p> Begins the export of discovered data to an S3 bucket.</p> <p> If you specify <code>agentIds</code> in a filter, the task exports up to 72 hours of detailed data collected by the identified Application Discovery Agent, including network, process, and performance details. A time range for exported agent data may be set by using <code>startTime</code> and <code>endTime</code>. Export of detailed agent data is limited to five concurrently running exports. </p> <p> If you do not include an <code>agentIds</code> filter, summary data is exported that includes both AWS Agentless Discovery Connector data and summary data from AWS Discovery Agents. Export of summary data is limited to two exports per day. </p>"
     },
@@ -370,10 +393,12 @@
       "errors":[
         {"shape":"ResourceInUseException"},
         {"shape":"AuthorizationErrorException"},
+        {"shape":"InvalidParameterException"},
         {"shape":"InvalidParameterValueException"},
-        {"shape":"ServerInternalErrorException"}
+        {"shape":"ServerInternalErrorException"},
+        {"shape":"HomeRegionNotSetException"}
       ],
-      "documentation":"<p>Starts an import task, which allows you to import details of your on-premises environment directly into AWS without having to use the Application Discovery Service (ADS) tools such as the Discovery Connector or Discovery Agent. This gives you the option to perform migration assessment and planning directly from your imported data, including the ability to group your devices as applications and track their migration status.</p> <p>To start an import request, do this:</p> <ol> <li> <p>Download the specially formatted comma separated value (CSV) import template, which you can find here: <a href=\"https://s3-us-west-2.amazonaws.com/templates-7cffcf56-bd96-4b1c-b45b-a5b42f282e46/import_template.csv\">https://s3-us-west-2.amazonaws.com/templates-7cffcf56-bd96-4b1c-b45b-a5b42f282e46/import_template.csv</a>.</p> </li> <li> <p>Fill out the template with your server and application data.</p> </li> <li> <p>Upload your import file to an Amazon S3 bucket, and make a note of it's Object URL. Your import file must be in the CSV format.</p> </li> <li> <p>Use the console or the <code>StartImportTask</code> command with the AWS CLI or one of the AWS SDKs to import the records from your file.</p> </li> </ol> <p>For more information, including step-by-step procedures, see <a href=\"https://docs.aws.amazon.com/application-discovery/latest/userguide/discovery-import.html\">Migration Hub Import</a> in the <i>AWS Application Discovery Service User Guide</i>.</p> <note> <p>There are limits to the number of import tasks you can create (and delete) in an AWS account. For more information, see <a href=\"https://docs.aws.amazon.com/application-discovery/latest/userguide/ads_service_limits.html\">AWS Application Discovery Service Limits</a> in the <i>AWS Application Discovery Service User Guide</i>.</p> </note>"
+      "documentation":"<p>Starts an import task, which allows you to import details of your on-premises environment directly into AWS Migration Hub without having to use the Application Discovery Service (ADS) tools such as the Discovery Connector or Discovery Agent. This gives you the option to perform migration assessment and planning directly from your imported data, including the ability to group your devices as applications and track their migration status.</p> <p>To start an import request, do this:</p> <ol> <li> <p>Download the specially formatted comma separated value (CSV) import template, which you can find here: <a href=\"https://s3-us-west-2.amazonaws.com/templates-7cffcf56-bd96-4b1c-b45b-a5b42f282e46/import_template.csv\">https://s3-us-west-2.amazonaws.com/templates-7cffcf56-bd96-4b1c-b45b-a5b42f282e46/import_template.csv</a>.</p> </li> <li> <p>Fill out the template with your server and application data.</p> </li> <li> <p>Upload your import file to an Amazon S3 bucket, and make a note of it's Object URL. Your import file must be in the CSV format.</p> </li> <li> <p>Use the console or the <code>StartImportTask</code> command with the AWS CLI or one of the AWS SDKs to import the records from your file.</p> </li> </ol> <p>For more information, including step-by-step procedures, see <a href=\"https://docs.aws.amazon.com/application-discovery/latest/userguide/discovery-import.html\">Migration Hub Import</a> in the <i>AWS Application Discovery Service User Guide</i>.</p> <note> <p>There are limits to the number of import tasks you can create (and delete) in an AWS account. For more information, see <a href=\"https://docs.aws.amazon.com/application-discovery/latest/userguide/ads_service_limits.html\">AWS Application Discovery Service Limits</a> in the <i>AWS Application Discovery Service User Guide</i>.</p> </note>"
     },
     "StopContinuousExport":{
       "name":"StopContinuousExport",
@@ -390,7 +415,8 @@
         {"shape":"ServerInternalErrorException"},
         {"shape":"OperationNotPermittedException"},
         {"shape":"ResourceNotFoundException"},
-        {"shape":"ResourceInUseException"}
+        {"shape":"ResourceInUseException"},
+        {"shape":"HomeRegionNotSetException"}
       ],
       "documentation":"<p>Stop the continuous flow of agent's discovered data into Amazon Athena.</p>"
     },
@@ -406,7 +432,8 @@
         {"shape":"AuthorizationErrorException"},
         {"shape":"InvalidParameterException"},
         {"shape":"InvalidParameterValueException"},
-        {"shape":"ServerInternalErrorException"}
+        {"shape":"ServerInternalErrorException"},
+        {"shape":"HomeRegionNotSetException"}
       ],
       "documentation":"<p>Instructs the specified agents or connectors to stop collecting data.</p>"
     },
@@ -422,7 +449,8 @@
         {"shape":"AuthorizationErrorException"},
         {"shape":"InvalidParameterException"},
         {"shape":"InvalidParameterValueException"},
-        {"shape":"ServerInternalErrorException"}
+        {"shape":"ServerInternalErrorException"},
+        {"shape":"HomeRegionNotSetException"}
       ],
       "documentation":"<p>Updates metadata about an application.</p>"
     }
@@ -1028,7 +1056,7 @@
       "members":{
         "exportIds":{
           "shape":"ExportIds",
-          "documentation":"<p>A list of continuous export ids to search for.</p>"
+          "documentation":"<p>A list of continuous export IDs to search for.</p>"
         },
         "maxResults":{
           "shape":"Integer",
@@ -1309,7 +1337,7 @@
           "documentation":"<p>A conditional operator. The following operators are valid: EQUALS, NOT_EQUALS, CONTAINS, NOT_CONTAINS. If you specify multiple filters, the system utilizes all filters as though concatenated by <i>AND</i>. If you specify multiple values for a particular filter, the system differentiates the values using <i>OR</i>. Calling either <i>DescribeConfigurations</i> or <i>ListConfigurations</i> returns attributes of matching configuration items.</p>"
         }
       },
-      "documentation":"<p>A filter that can use conditional operators.</p> <p>For more information about filters, see <a href=\"http://docs.aws.amazon.com/application-discovery/latest/APIReference/discovery-api-queries.html\">Querying Discovered Configuration Items</a>. </p>"
+      "documentation":"<p>A filter that can use conditional operators.</p> <p>For more information about filters, see <a href=\"https://docs.aws.amazon.com/application-discovery/latest/userguide/discovery-api-queries.html\">Querying Discovered Configuration Items</a> in the <i>AWS Application Discovery Service User Guide</i>. </p>"
     },
     "FilterName":{"type":"string"},
     "FilterValue":{"type":"string"},
@@ -1355,6 +1383,14 @@
         }
       }
     },
+    "HomeRegionNotSetException":{
+      "type":"structure",
+      "members":{
+        "message":{"shape":"Message"}
+      },
+      "documentation":"<p>The home region is not set. Set the home region to continue.</p>",
+      "exception":true
+    },
     "ImportStatus":{
       "type":"string",
       "enum":[
@@ -1504,7 +1540,7 @@
         },
         "filters":{
           "shape":"Filters",
-          "documentation":"<p>You can filter the request using various logical operators and a <i>key</i>-<i>value</i> format. For example: </p> <p> <code>{\"key\": \"serverType\", \"value\": \"webServer\"}</code> </p> <p>For a complete list of filter options and guidance about using them with this action, see <a href=\"http://docs.aws.amazon.com/application-discovery/latest/APIReference/discovery-api-queries.html#ListConfigurations\">Querying Discovered Configuration Items</a>. </p>"
+          "documentation":"<p>You can filter the request using various logical operators and a <i>key</i>-<i>value</i> format. For example: </p> <p> <code>{\"key\": \"serverType\", \"value\": \"webServer\"}</code> </p> <p>For a complete list of filter options and guidance about using them with this action, see <a href=\"https://docs.aws.amazon.com/application-discovery/latest/userguide/discovery-api-queries.html#ListConfigurations\">Using the ListConfigurations Action</a> in the <i>AWS Application Discovery Service User Guide</i>.</p>"
         },
         "maxResults":{
           "shape":"Integer",
@@ -1516,7 +1552,7 @@
         },
         "orderBy":{
           "shape":"OrderByList",
-          "documentation":"<p>Certain filter criteria return output that can be sorted in ascending or descending order. For a list of output characteristics for each filter, see <a href=\"http://docs.aws.amazon.com/application-discovery/latest/APIReference/discovery-api-queries.html#ListConfigurations\">Using the ListConfigurations Action</a>.</p>"
+          "documentation":"<p>Certain filter criteria return output that can be sorted in ascending or descending order. For a list of output characteristics for each filter, see <a href=\"https://docs.aws.amazon.com/application-discovery/latest/userguide/discovery-api-queries.html#ListConfigurations\">Using the ListConfigurations Action</a> in the <i>AWS Application Discovery Service User Guide</i>.</p>"
         }
       }
     },
@@ -1916,5 +1952,5 @@
       ]
     }
   },
-  "documentation":"<fullname>AWS Application Discovery Service</fullname> <p>AWS Application Discovery Service helps you plan application migration projects by automatically identifying servers, virtual machines (VMs), software, and software dependencies running in your on-premises data centers. Application Discovery Service also collects application performance data, which can help you assess the outcome of your migration. The data collected by Application Discovery Service is securely retained in an AWS-hosted and managed database in the cloud. You can export the data as a CSV or XML file into your preferred visualization tool or cloud-migration solution to plan your migration. For more information, see <a href=\"http://aws.amazon.com/application-discovery/faqs/\">AWS Application Discovery Service FAQ</a>.</p> <p>Application Discovery Service offers two modes of operation:</p> <ul> <li> <p> <b>Agentless discovery</b> mode is recommended for environments that use VMware vCenter Server. This mode doesn't require you to install an agent on each host. Agentless discovery gathers server information regardless of the operating systems, which minimizes the time required for initial on-premises infrastructure assessment. Agentless discovery doesn't collect information about software and software dependencies. It also doesn't work in non-VMware environments. </p> </li> <li> <p> <b>Agent-based discovery</b> mode collects a richer set of data than agentless discovery by using the AWS Application Discovery Agent, which you install on one or more hosts in your data center. The agent captures infrastructure and application information, including an inventory of installed software applications, system and process performance, resource utilization, and network dependencies between workloads. The information collected by agents is secured at rest and in transit to the Application Discovery Service database in the cloud. </p> </li> </ul> <p>We recommend that you use agent-based discovery for non-VMware environments and to collect information about software and software dependencies. You can also run agent-based and agentless discovery simultaneously. Use agentless discovery to quickly complete the initial infrastructure assessment and then install agents on select hosts.</p> <p>Application Discovery Service integrates with application discovery solutions from AWS Partner Network (APN) partners. Third-party application discovery tools can query Application Discovery Service and write to the Application Discovery Service database using a public API. You can then import the data into either a visualization tool or cloud-migration solution.</p> <important> <p>Application Discovery Service doesn't gather sensitive information. All data is handled according to the <a href=\"http://aws.amazon.com/privacy/\">AWS Privacy Policy</a>. You can operate Application Discovery Service offline to inspect collected data before it is shared with the service.</p> </important> <p>This API reference provides descriptions, syntax, and usage examples for each of the actions and data types for Application Discovery Service. The topic for each action shows the API request parameters and the response. Alternatively, you can use one of the AWS SDKs to access an API that is tailored to the programming language or platform that you're using. For more information, see <a href=\"http://aws.amazon.com/tools/#SDKs\">AWS SDKs</a>.</p> <p>This guide is intended for use with the <a href=\"http://docs.aws.amazon.com/application-discovery/latest/userguide/\"> <i>AWS Application Discovery Service User Guide</i> </a>.</p>"
+  "documentation":"<fullname>AWS Application Discovery Service</fullname> <p>AWS Application Discovery Service helps you plan application migration projects. It automatically identifies servers, virtual machines (VMs), and network dependencies in your on-premises data centers. For more information, see the <a href=\"http://aws.amazon.com/application-discovery/faqs/\">AWS Application Discovery Service FAQ</a>. Application Discovery Service offers three ways of performing discovery and collecting data about your on-premises servers:</p> <ul> <li> <p> <b>Agentless discovery</b> is recommended for environments that use VMware vCenter Server. This mode doesn't require you to install an agent on each host. It does not work in non-VMware environments.</p> <ul> <li> <p>Agentless discovery gathers server information regardless of the operating systems, which minimizes the time required for initial on-premises infrastructure assessment.</p> </li> <li> <p>Agentless discovery doesn't collect information about network dependencies, only agent-based discovery collects that information.</p> </li> </ul> </li> </ul> <ul> <li> <p> <b>Agent-based discovery</b> collects a richer set of data than agentless discovery by using the AWS Application Discovery Agent, which you install on one or more hosts in your data center.</p> <ul> <li> <p> The agent captures infrastructure and application information, including an inventory of running processes, system performance information, resource utilization, and network dependencies.</p> </li> <li> <p>The information collected by agents is secured at rest and in transit to the Application Discovery Service database in the cloud. </p> </li> </ul> </li> </ul> <ul> <li> <p> <b>AWS Partner Network (APN) solutions</b> integrate with Application Discovery Service, enabling you to import details of your on-premises environment directly into Migration Hub without using the discovery connector or discovery agent.</p> <ul> <li> <p>Third-party application discovery tools can query AWS Application Discovery Service, and they can write to the Application Discovery Service database using the public API.</p> </li> <li> <p>In this way, you can import data into Migration Hub and view it, so that you can associate applications with servers and track migrations.</p> </li> </ul> </li> </ul> <p> <b>Recommendations</b> </p> <p>We recommend that you use agent-based discovery for non-VMware environments, and whenever you want to collect information about network dependencies. You can run agent-based and agentless discovery simultaneously. Use agentless discovery to complete the initial infrastructure assessment quickly, and then install agents on select hosts to collect additional information.</p> <p> <b>Working With This Guide</b> </p> <p>This API reference provides descriptions, syntax, and usage examples for each of the actions and data types for Application Discovery Service. The topic for each action shows the API request parameters and the response. Alternatively, you can use one of the AWS SDKs to access an API that is tailored to the programming language or platform that you're using. For more information, see <a href=\"http://aws.amazon.com/tools/#SDKs\">AWS SDKs</a>.</p> <note> <ul> <li> <p>Remember that you must set your Migration Hub home region before you call any of these APIs.</p> </li> <li> <p>You must make API calls for write actions (create, notify, associate, disassociate, import, or put) while in your home region, or a <code>HomeRegionNotSetException</code> error is returned.</p> </li> <li> <p>API calls for read actions (list, describe, stop, and delete) are permitted outside of your home region.</p> </li> <li> <p>Although it is unlikely, the Migration Hub home region could change. If you call APIs outside the home region, an <code>InvalidInputException</code> is returned.</p> </li> <li> <p>You must call <code>GetHomeRegion</code> to obtain the latest Migration Hub home region.</p> </li> </ul> </note> <p>This guide is intended for use with the <a href=\"http://docs.aws.amazon.com/application-discovery/latest/userguide/\">AWS Application Discovery Service User Guide</a>.</p> <important> <p>All data is handled according to the <a href=\"http://aws.amazon.com/privacy/\">AWS Privacy Policy</a>. You can operate Application Discovery Service offline to inspect collected data before it is shared with the service.</p> </important>"
 }
diff --git a/services/applicationdiscovery/src/test/resources/cucumber.properties b/services/applicationdiscovery/src/test/resources/cucumber.properties
index 0221004d2fd5..0c008816b81d 100644
--- a/services/applicationdiscovery/src/test/resources/cucumber.properties
+++ b/services/applicationdiscovery/src/test/resources/cucumber.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/applicationinsights/pom.xml b/services/applicationinsights/pom.xml
index a79721b3456e..1ea59661bb05 100644
--- a/services/applicationinsights/pom.xml
+++ b/services/applicationinsights/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>applicationinsights</artifactId>
     <name>AWS Java SDK :: Services :: Application Insights</name>
diff --git a/services/applicationinsights/src/main/resources/codegen-resources/paginators-1.json b/services/applicationinsights/src/main/resources/codegen-resources/paginators-1.json
index 445d63ccef7c..2f237e4c9580 100644
--- a/services/applicationinsights/src/main/resources/codegen-resources/paginators-1.json
+++ b/services/applicationinsights/src/main/resources/codegen-resources/paginators-1.json
@@ -10,6 +10,21 @@
       "output_token": "NextToken",
       "limit_key": "MaxResults"
     },
+    "ListConfigurationHistory": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "MaxResults"
+    },
+    "ListLogPatternSets": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "MaxResults"
+    },
+    "ListLogPatterns": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "MaxResults"
+    },
     "ListProblems": {
       "input_token": "NextToken",
       "output_token": "NextToken",
diff --git a/services/applicationinsights/src/main/resources/codegen-resources/service-2.json b/services/applicationinsights/src/main/resources/codegen-resources/service-2.json
index ff953ee0641e..1c847097a688 100644
--- a/services/applicationinsights/src/main/resources/codegen-resources/service-2.json
+++ b/services/applicationinsights/src/main/resources/codegen-resources/service-2.json
@@ -26,7 +26,8 @@
         {"shape":"ResourceInUseException"},
         {"shape":"ResourceNotFoundException"},
         {"shape":"ValidationException"},
-        {"shape":"InternalServerException"}
+        {"shape":"InternalServerException"},
+        {"shape":"TagsAlreadyExistException"}
       ],
       "documentation":"<p>Adds an application that is created from a resource group.</p>"
     },
@@ -46,6 +47,22 @@
       ],
       "documentation":"<p>Creates a custom component by grouping similar standalone instances to monitor.</p>"
     },
+    "CreateLogPattern":{
+      "name":"CreateLogPattern",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"CreateLogPatternRequest"},
+      "output":{"shape":"CreateLogPatternResponse"},
+      "errors":[
+        {"shape":"ResourceInUseException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ValidationException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Adds an log pattern to a <code>LogPatternSet</code>.</p>"
+    },
     "DeleteApplication":{
       "name":"DeleteApplication",
       "http":{
@@ -77,6 +94,22 @@
       ],
       "documentation":"<p>Ungroups a custom component. When you ungroup custom components, all applicable monitors that are set up for the component are removed and the instances revert to their standalone status.</p>"
     },
+    "DeleteLogPattern":{
+      "name":"DeleteLogPattern",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DeleteLogPatternRequest"},
+      "output":{"shape":"DeleteLogPatternResponse"},
+      "errors":[
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ValidationException"},
+        {"shape":"BadRequestException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Removes the specified log pattern from a <code>LogPatternSet</code>.</p>"
+    },
     "DescribeApplication":{
       "name":"DescribeApplication",
       "http":{
@@ -137,6 +170,21 @@
       ],
       "documentation":"<p>Describes the recommended monitoring configuration of the component.</p>"
     },
+    "DescribeLogPattern":{
+      "name":"DescribeLogPattern",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DescribeLogPatternRequest"},
+      "output":{"shape":"DescribeLogPatternResponse"},
+      "errors":[
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ValidationException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Describe a specific log pattern from a <code>LogPatternSet</code>.</p>"
+    },
     "DescribeObservation":{
       "name":"DescribeObservation",
       "http":{
@@ -211,6 +259,51 @@
       ],
       "documentation":"<p>Lists the auto-grouped, standalone, and custom components of the application.</p>"
     },
+    "ListConfigurationHistory":{
+      "name":"ListConfigurationHistory",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"ListConfigurationHistoryRequest"},
+      "output":{"shape":"ListConfigurationHistoryResponse"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p> Lists the INFO, WARN, and ERROR events for periodic configuration updates performed by Application Insights. Examples of events represented are: </p> <ul> <li> <p>INFO: creating a new alarm or updating an alarm threshold.</p> </li> <li> <p>WARN: alarm not created due to insufficient data points used to predict thresholds.</p> </li> <li> <p>ERROR: alarm not created due to permission errors or exceeding quotas. </p> </li> </ul>"
+    },
+    "ListLogPatternSets":{
+      "name":"ListLogPatternSets",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"ListLogPatternSetsRequest"},
+      "output":{"shape":"ListLogPatternSetsResponse"},
+      "errors":[
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ValidationException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Lists the log pattern sets in the specific application.</p>"
+    },
+    "ListLogPatterns":{
+      "name":"ListLogPatterns",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"ListLogPatternsRequest"},
+      "output":{"shape":"ListLogPatternsResponse"},
+      "errors":[
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ValidationException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Lists the log patterns in the specific log <code>LogPatternSet</code>.</p>"
+    },
     "ListProblems":{
       "name":"ListProblems",
       "http":{
@@ -226,6 +319,49 @@
       ],
       "documentation":"<p>Lists the problems with your application.</p>"
     },
+    "ListTagsForResource":{
+      "name":"ListTagsForResource",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"ListTagsForResourceRequest"},
+      "output":{"shape":"ListTagsForResourceResponse"},
+      "errors":[
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ValidationException"}
+      ],
+      "documentation":"<p>Retrieve a list of the tags (keys and values) that are associated with a specified application. A <i>tag</i> is a label that you optionally define and associate with an application. Each tag consists of a required <i>tag key</i> and an optional associated <i>tag value</i>. A tag key is a general label that acts as a category for more specific tag values. A tag value acts as a descriptor within a tag key.</p>"
+    },
+    "TagResource":{
+      "name":"TagResource",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"TagResourceRequest"},
+      "output":{"shape":"TagResourceResponse"},
+      "errors":[
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"TooManyTagsException"},
+        {"shape":"ValidationException"}
+      ],
+      "documentation":"<p>Add one or more tags (keys and values) to a specified application. A <i>tag</i> is a label that you optionally define and associate with an application. Tags can help you categorize and manage application in different ways, such as by purpose, owner, environment, or other criteria. </p> <p>Each tag consists of a required <i>tag key</i> and an associated <i>tag value</i>, both of which you define. A tag key is a general label that acts as a category for more specific tag values. A tag value acts as a descriptor within a tag key.</p>"
+    },
+    "UntagResource":{
+      "name":"UntagResource",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"UntagResourceRequest"},
+      "output":{"shape":"UntagResourceResponse"},
+      "errors":[
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ValidationException"}
+      ],
+      "documentation":"<p>Remove one or more tags (keys and values) from a specified application.</p>"
+    },
     "UpdateApplication":{
       "name":"UpdateApplication",
       "http":{
@@ -270,11 +406,32 @@
         {"shape":"ValidationException"},
         {"shape":"InternalServerException"}
       ],
-      "documentation":"<p>Updates the monitoring configurations for the component. The configuration input parameter is an escaped JSON of the configuration and should match the schema of what is returned by <code>DescribeComponentConfigurationRecommendation</code>.</p>"
+      "documentation":"<p>Updates the monitoring configurations for the component. The configuration input parameter is an escaped JSON of the configuration and should match the schema of what is returned by <code>DescribeComponentConfigurationRecommendation</code>. </p>"
+    },
+    "UpdateLogPattern":{
+      "name":"UpdateLogPattern",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"UpdateLogPatternRequest"},
+      "output":{"shape":"UpdateLogPatternResponse"},
+      "errors":[
+        {"shape":"ResourceInUseException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ValidationException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Adds a log pattern to a <code>LogPatternSet</code>.</p>"
     }
   },
   "shapes":{
     "AffectedResource":{"type":"string"},
+    "AmazonResourceName":{
+      "type":"string",
+      "max":1011,
+      "min":1
+    },
     "ApplicationComponent":{
       "type":"structure",
       "members":{
@@ -320,9 +477,13 @@
           "shape":"OpsCenterEnabled",
           "documentation":"<p> Indicates whether Application Insights will create opsItems for any problem detected by Application Insights for an application. </p>"
         },
+        "CWEMonitorEnabled":{
+          "shape":"CWEMonitorEnabled",
+          "documentation":"<p> Indicates whether Application Insights can listen to CloudWatch events for the application resources, such as <code>instance terminated</code>, <code>failed deployment</code>, and others. </p>"
+        },
         "Remarks":{
           "shape":"Remarks",
-          "documentation":"<p>The issues on the user side that block Application Insights from successfully monitoring an application.</p>"
+          "documentation":"<p>The issues on the user side that block Application Insights from successfully monitoring an application. Example remarks include:</p> <ul> <li> <p>“Configuring application, detected 1 Errors, 3 Warnings”</p> </li> <li> <p>“Configuring application, detected 1 Unconfigured Components”</p> </li> </ul>"
         }
       },
       "documentation":"<p>Describes the status of the application.</p>"
@@ -339,8 +500,82 @@
       "documentation":"<p>The request is not understood by the server.</p>",
       "exception":true
     },
-    "ComponentConfiguration":{"type":"string"},
+    "CWEMonitorEnabled":{"type":"boolean"},
+    "CloudWatchEventDetailType":{"type":"string"},
+    "CloudWatchEventId":{"type":"string"},
+    "CloudWatchEventSource":{
+      "type":"string",
+      "enum":[
+        "EC2",
+        "CODE_DEPLOY",
+        "HEALTH"
+      ]
+    },
+    "CodeDeployApplication":{"type":"string"},
+    "CodeDeployDeploymentGroup":{"type":"string"},
+    "CodeDeployDeploymentId":{"type":"string"},
+    "CodeDeployInstanceGroupId":{"type":"string"},
+    "CodeDeployState":{"type":"string"},
+    "ComponentConfiguration":{
+      "type":"string",
+      "max":10000,
+      "min":1
+    },
     "ComponentName":{"type":"string"},
+    "ConfigurationEvent":{
+      "type":"structure",
+      "members":{
+        "MonitoredResourceARN":{
+          "shape":"ConfigurationEventMonitoredResourceARN",
+          "documentation":"<p> The resource monitored by Application Insights. </p>"
+        },
+        "EventStatus":{
+          "shape":"ConfigurationEventStatus",
+          "documentation":"<p> The status of the configuration update event. Possible values include INFO, WARN, and ERROR. </p>"
+        },
+        "EventResourceType":{
+          "shape":"ConfigurationEventResourceType",
+          "documentation":"<p> The resource type that Application Insights attempted to configure, for example, CLOUDWATCH_ALARM. </p>"
+        },
+        "EventTime":{
+          "shape":"ConfigurationEventTime",
+          "documentation":"<p> The timestamp of the event. </p>"
+        },
+        "EventDetail":{
+          "shape":"ConfigurationEventDetail",
+          "documentation":"<p> The details of the event in plain text. </p>"
+        },
+        "EventResourceName":{
+          "shape":"ConfigurationEventResourceName",
+          "documentation":"<p> The name of the resource Application Insights attempted to configure. </p>"
+        }
+      },
+      "documentation":"<p> The event information. </p>"
+    },
+    "ConfigurationEventDetail":{"type":"string"},
+    "ConfigurationEventList":{
+      "type":"list",
+      "member":{"shape":"ConfigurationEvent"}
+    },
+    "ConfigurationEventMonitoredResourceARN":{"type":"string"},
+    "ConfigurationEventResourceName":{"type":"string"},
+    "ConfigurationEventResourceType":{
+      "type":"string",
+      "enum":[
+        "CLOUDWATCH_ALARM",
+        "CLOUDFORMATION",
+        "SSM_ASSOCIATION"
+      ]
+    },
+    "ConfigurationEventStatus":{
+      "type":"string",
+      "enum":[
+        "INFO",
+        "WARN",
+        "ERROR"
+      ]
+    },
+    "ConfigurationEventTime":{"type":"timestamp"},
     "CreateApplicationRequest":{
       "type":"structure",
       "required":["ResourceGroupName"],
@@ -353,9 +588,17 @@
           "shape":"OpsCenterEnabled",
           "documentation":"<p> When set to <code>true</code>, creates opsItems for any problems detected on an application. </p>"
         },
+        "CWEMonitorEnabled":{
+          "shape":"CWEMonitorEnabled",
+          "documentation":"<p> Indicates whether Application Insights can listen to CloudWatch events for the application resources, such as <code>instance terminated</code>, <code>failed deployment</code>, and others. </p>"
+        },
         "OpsItemSNSTopicArn":{
           "shape":"OpsItemSNSTopicArn",
           "documentation":"<p> The SNS topic provided to Application Insights that is associated to the created opsItem. Allows you to receive notifications for updates to the opsItem. </p>"
+        },
+        "Tags":{
+          "shape":"TagList",
+          "documentation":"<p>List of tags to add to the application. tag key (<code>Key</code>) and an associated tag value (<code>Value</code>). The maximum length of a tag key is 128 characters. The maximum length of a tag value is 256 characters.</p>"
         }
       }
     },
@@ -395,6 +638,51 @@
       "members":{
       }
     },
+    "CreateLogPatternRequest":{
+      "type":"structure",
+      "required":[
+        "ResourceGroupName",
+        "PatternSetName",
+        "PatternName",
+        "Pattern",
+        "Rank"
+      ],
+      "members":{
+        "ResourceGroupName":{
+          "shape":"ResourceGroupName",
+          "documentation":"<p>The name of the resource group.</p>"
+        },
+        "PatternSetName":{
+          "shape":"LogPatternSetName",
+          "documentation":"<p>The name of the log pattern set.</p>"
+        },
+        "PatternName":{
+          "shape":"LogPatternName",
+          "documentation":"<p>The name of the log pattern.</p>"
+        },
+        "Pattern":{
+          "shape":"LogPatternRegex",
+          "documentation":"<p>The log pattern.</p>"
+        },
+        "Rank":{
+          "shape":"LogPatternRank",
+          "documentation":"<p>Rank of the log pattern.</p>"
+        }
+      }
+    },
+    "CreateLogPatternResponse":{
+      "type":"structure",
+      "members":{
+        "LogPattern":{
+          "shape":"LogPattern",
+          "documentation":"<p>The successfully created log pattern.</p>"
+        },
+        "ResourceGroupName":{
+          "shape":"ResourceGroupName",
+          "documentation":"<p>The name of the resource group.</p>"
+        }
+      }
+    },
     "DeleteApplicationRequest":{
       "type":"structure",
       "required":["ResourceGroupName"],
@@ -432,6 +720,33 @@
       "members":{
       }
     },
+    "DeleteLogPatternRequest":{
+      "type":"structure",
+      "required":[
+        "ResourceGroupName",
+        "PatternSetName",
+        "PatternName"
+      ],
+      "members":{
+        "ResourceGroupName":{
+          "shape":"ResourceGroupName",
+          "documentation":"<p>The name of the resource group.</p>"
+        },
+        "PatternSetName":{
+          "shape":"LogPatternSetName",
+          "documentation":"<p>The name of the log pattern set.</p>"
+        },
+        "PatternName":{
+          "shape":"LogPatternName",
+          "documentation":"<p>The name of the log pattern.</p>"
+        }
+      }
+    },
+    "DeleteLogPatternResponse":{
+      "type":"structure",
+      "members":{
+      }
+    },
     "DescribeApplicationRequest":{
       "type":"structure",
       "required":["ResourceGroupName"],
@@ -469,7 +784,7 @@
         },
         "Tier":{
           "shape":"Tier",
-          "documentation":"<p>The tier of the application component. Supported tiers include <code>DOT_NET_WORKER</code>, <code>DOT_NET_WEB</code>, <code>SQL_SERVER</code>, and <code>DEFAULT</code>.</p>"
+          "documentation":"<p>The tier of the application component. Supported tiers include <code>DOT_NET_CORE</code>, <code>DOT_NET_WORKER</code>, <code>DOT_NET_WEB</code>, <code>SQL_SERVER</code>, and <code>DEFAULT</code>.</p>"
         }
       }
     },
@@ -508,7 +823,7 @@
         },
         "Tier":{
           "shape":"Tier",
-          "documentation":"<p>The tier of the application component. Supported tiers include <code>DOT_NET_WORKER</code>, <code>DOT_NET_WEB</code>, <code>SQL_SERVER</code>, and <code>DEFAULT</code> </p>"
+          "documentation":"<p>The tier of the application component. Supported tiers include <code>DOT_NET_CORE</code>, <code>DOT_NET_WORKER</code>, <code>DOT_NET_WEB</code>, <code>SQL_SERVER</code>, and <code>DEFAULT</code> </p>"
         },
         "ComponentConfiguration":{
           "shape":"ComponentConfiguration",
@@ -543,6 +858,41 @@
         }
       }
     },
+    "DescribeLogPatternRequest":{
+      "type":"structure",
+      "required":[
+        "ResourceGroupName",
+        "PatternSetName",
+        "PatternName"
+      ],
+      "members":{
+        "ResourceGroupName":{
+          "shape":"ResourceGroupName",
+          "documentation":"<p>The name of the resource group.</p>"
+        },
+        "PatternSetName":{
+          "shape":"LogPatternSetName",
+          "documentation":"<p>The name of the log pattern set.</p>"
+        },
+        "PatternName":{
+          "shape":"LogPatternName",
+          "documentation":"<p>The name of the log pattern.</p>"
+        }
+      }
+    },
+    "DescribeLogPatternResponse":{
+      "type":"structure",
+      "members":{
+        "ResourceGroupName":{
+          "shape":"ResourceGroupName",
+          "documentation":"<p>The name of the resource group.</p>"
+        },
+        "LogPattern":{
+          "shape":"LogPattern",
+          "documentation":"<p>The successfully created log pattern.</p>"
+        }
+      }
+    },
     "DescribeObservationRequest":{
       "type":"structure",
       "required":["ObservationId"],
@@ -600,8 +950,10 @@
         }
       }
     },
+    "Ec2State":{"type":"string"},
     "EndTime":{"type":"timestamp"},
     "ErrorMsg":{"type":"string"},
+    "ExceptionMessage":{"type":"string"},
     "Feedback":{
       "type":"map",
       "key":{"shape":"FeedbackKey"},
@@ -620,6 +972,11 @@
         "NOT_USEFUL"
       ]
     },
+    "HealthEventArn":{"type":"string"},
+    "HealthEventDescription":{"type":"string"},
+    "HealthEventTypeCategory":{"type":"string"},
+    "HealthEventTypeCode":{"type":"string"},
+    "HealthService":{"type":"string"},
     "Insights":{"type":"string"},
     "InternalServerException":{
       "type":"structure",
@@ -688,6 +1045,122 @@
         }
       }
     },
+    "ListConfigurationHistoryRequest":{
+      "type":"structure",
+      "members":{
+        "ResourceGroupName":{
+          "shape":"ResourceGroupName",
+          "documentation":"<p>Resource group to which the application belongs. </p>"
+        },
+        "StartTime":{
+          "shape":"StartTime",
+          "documentation":"<p>The start time of the event. </p>"
+        },
+        "EndTime":{
+          "shape":"EndTime",
+          "documentation":"<p>The end time of the event.</p>"
+        },
+        "EventStatus":{
+          "shape":"ConfigurationEventStatus",
+          "documentation":"<p>The status of the configuration update event. Possible values include INFO, WARN, and ERROR.</p>"
+        },
+        "MaxResults":{
+          "shape":"MaxEntities",
+          "documentation":"<p> The maximum number of results returned by <code>ListConfigurationHistory</code> in paginated output. When this parameter is used, <code>ListConfigurationHistory</code> returns only <code>MaxResults</code> in a single page along with a <code>NextToken</code> response element. The remaining results of the initial request can be seen by sending another <code>ListConfigurationHistory</code> request with the returned <code>NextToken</code> value. If this parameter is not used, then <code>ListConfigurationHistory</code> returns all results. </p>"
+        },
+        "NextToken":{
+          "shape":"PaginationToken",
+          "documentation":"<p>The <code>NextToken</code> value returned from a previous paginated <code>ListConfigurationHistory</code> request where <code>MaxResults</code> was used and the results exceeded the value of that parameter. Pagination continues from the end of the previous results that returned the <code>NextToken</code> value. This value is <code>null</code> when there are no more results to return.</p>"
+        }
+      }
+    },
+    "ListConfigurationHistoryResponse":{
+      "type":"structure",
+      "members":{
+        "EventList":{
+          "shape":"ConfigurationEventList",
+          "documentation":"<p> The list of configuration events and their corresponding details. </p>"
+        },
+        "NextToken":{
+          "shape":"PaginationToken",
+          "documentation":"<p>The <code>NextToken</code> value to include in a future <code>ListConfigurationHistory</code> request. When the results of a <code>ListConfigurationHistory</code> request exceed <code>MaxResults</code>, this value can be used to retrieve the next page of results. This value is <code>null</code> when there are no more results to return.</p>"
+        }
+      }
+    },
+    "ListLogPatternSetsRequest":{
+      "type":"structure",
+      "required":["ResourceGroupName"],
+      "members":{
+        "ResourceGroupName":{
+          "shape":"ResourceGroupName",
+          "documentation":"<p>The name of the resource group.</p>"
+        },
+        "MaxResults":{
+          "shape":"MaxEntities",
+          "documentation":"<p>The maximum number of results to return in a single call. To retrieve the remaining results, make another call with the returned <code>NextToken</code> value.</p>"
+        },
+        "NextToken":{
+          "shape":"PaginationToken",
+          "documentation":"<p>The token to request the next page of results.</p>"
+        }
+      }
+    },
+    "ListLogPatternSetsResponse":{
+      "type":"structure",
+      "members":{
+        "ResourceGroupName":{
+          "shape":"ResourceGroupName",
+          "documentation":"<p>The name of the resource group.</p>"
+        },
+        "LogPatternSets":{
+          "shape":"LogPatternSetList",
+          "documentation":"<p>The list of log pattern sets.</p>"
+        },
+        "NextToken":{
+          "shape":"PaginationToken",
+          "documentation":"<p>The token used to retrieve the next page of results. This value is <code>null</code> when there are no more results to return. </p>"
+        }
+      }
+    },
+    "ListLogPatternsRequest":{
+      "type":"structure",
+      "required":["ResourceGroupName"],
+      "members":{
+        "ResourceGroupName":{
+          "shape":"ResourceGroupName",
+          "documentation":"<p>The name of the resource group.</p>"
+        },
+        "PatternSetName":{
+          "shape":"LogPatternSetName",
+          "documentation":"<p>The name of the log pattern set.</p>"
+        },
+        "MaxResults":{
+          "shape":"MaxEntities",
+          "documentation":"<p>The maximum number of results to return in a single call. To retrieve the remaining results, make another call with the returned <code>NextToken</code> value.</p>"
+        },
+        "NextToken":{
+          "shape":"PaginationToken",
+          "documentation":"<p>The token to request the next page of results.</p>"
+        }
+      }
+    },
+    "ListLogPatternsResponse":{
+      "type":"structure",
+      "members":{
+        "ResourceGroupName":{
+          "shape":"ResourceGroupName",
+          "documentation":"<p>The name of the resource group.</p>"
+        },
+        "LogPatterns":{
+          "shape":"LogPatternList",
+          "documentation":"<p>The list of log patterns.</p>"
+        },
+        "NextToken":{
+          "shape":"PaginationToken",
+          "documentation":"<p>The token used to retrieve the next page of results. This value is <code>null</code> when there are no more results to return. </p>"
+        }
+      }
+    },
     "ListProblemsRequest":{
       "type":"structure",
       "members":{
@@ -726,6 +1199,25 @@
         }
       }
     },
+    "ListTagsForResourceRequest":{
+      "type":"structure",
+      "required":["ResourceARN"],
+      "members":{
+        "ResourceARN":{
+          "shape":"AmazonResourceName",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the application that you want to retrieve tag information for.</p>"
+        }
+      }
+    },
+    "ListTagsForResourceResponse":{
+      "type":"structure",
+      "members":{
+        "Tags":{
+          "shape":"TagList",
+          "documentation":"<p>An array that lists all the tags that are associated with the application. Each tag consists of a required tag key (<code>Key</code>) and an associated tag value (<code>Value</code>).</p>"
+        }
+      }
+    },
     "LogFilter":{
       "type":"string",
       "enum":[
@@ -735,6 +1227,54 @@
       ]
     },
     "LogGroup":{"type":"string"},
+    "LogPattern":{
+      "type":"structure",
+      "members":{
+        "PatternSetName":{
+          "shape":"LogPatternSetName",
+          "documentation":"<p>The name of the log pattern. A log pattern name can contains at many as 30 characters, and it cannot be empty. The characters can be Unicode letters, digits or one of the following symbols: period, dash, underscore.</p>"
+        },
+        "PatternName":{
+          "shape":"LogPatternName",
+          "documentation":"<p>The name of the log pattern. A log pattern name can contains at many as 50 characters, and it cannot be empty. The characters can be Unicode letters, digits or one of the following symbols: period, dash, underscore.</p>"
+        },
+        "Pattern":{
+          "shape":"LogPatternRegex",
+          "documentation":"<p>A regular expression that defines the log pattern. A log pattern can contains at many as 50 characters, and it cannot be empty.</p>"
+        },
+        "Rank":{
+          "shape":"LogPatternRank",
+          "documentation":"<p>Rank of the log pattern.</p>"
+        }
+      },
+      "documentation":"<p>An object that defines the log patterns that belongs to a <code>LogPatternSet</code>.</p>"
+    },
+    "LogPatternList":{
+      "type":"list",
+      "member":{"shape":"LogPattern"}
+    },
+    "LogPatternName":{
+      "type":"string",
+      "max":50,
+      "min":1,
+      "pattern":"[a-zA-Z0-9\\.\\-_]*"
+    },
+    "LogPatternRank":{"type":"integer"},
+    "LogPatternRegex":{
+      "type":"string",
+      "max":50,
+      "min":1
+    },
+    "LogPatternSetList":{
+      "type":"list",
+      "member":{"shape":"LogPatternSetName"}
+    },
+    "LogPatternSetName":{
+      "type":"string",
+      "max":30,
+      "min":1,
+      "pattern":"[a-zA-Z0-9\\.\\-_]*"
+    },
     "LogText":{"type":"string"},
     "MaxEntities":{
       "type":"integer",
@@ -799,17 +1339,110 @@
         "Value":{
           "shape":"Value",
           "documentation":"<p>The value of the source observation metric.</p>"
+        },
+        "CloudWatchEventId":{
+          "shape":"CloudWatchEventId",
+          "documentation":"<p> The ID of the CloudWatch Event-based observation related to the detected problem. </p>"
+        },
+        "CloudWatchEventSource":{
+          "shape":"CloudWatchEventSource",
+          "documentation":"<p> The source of the CloudWatch Event. </p>"
+        },
+        "CloudWatchEventDetailType":{
+          "shape":"CloudWatchEventDetailType",
+          "documentation":"<p> The detail type of the CloudWatch Event-based observation, for example, <code>EC2 Instance State-change Notification</code>. </p>"
+        },
+        "HealthEventArn":{
+          "shape":"HealthEventArn",
+          "documentation":"<p> The Amazon Resource Name (ARN) of the AWS Health Event-based observation.</p>"
+        },
+        "HealthService":{
+          "shape":"HealthService",
+          "documentation":"<p> The service to which the AWS Health Event belongs, such as EC2. </p>"
+        },
+        "HealthEventTypeCode":{
+          "shape":"HealthEventTypeCode",
+          "documentation":"<p> The type of the AWS Health event, for example, <code>AWS_EC2_POWER_CONNECTIVITY_ISSUE</code>. </p>"
+        },
+        "HealthEventTypeCategory":{
+          "shape":"HealthEventTypeCategory",
+          "documentation":"<p> The category of the AWS Health event, such as <code>issue</code>. </p>"
+        },
+        "HealthEventDescription":{
+          "shape":"HealthEventDescription",
+          "documentation":"<p> The description of the AWS Health event provided by the service, such as Amazon EC2. </p>"
+        },
+        "CodeDeployDeploymentId":{
+          "shape":"CodeDeployDeploymentId",
+          "documentation":"<p> The deployment ID of the CodeDeploy-based observation related to the detected problem. </p>"
+        },
+        "CodeDeployDeploymentGroup":{
+          "shape":"CodeDeployDeploymentGroup",
+          "documentation":"<p> The deployment group to which the CodeDeploy deployment belongs. </p>"
+        },
+        "CodeDeployState":{
+          "shape":"CodeDeployState",
+          "documentation":"<p> The status of the CodeDeploy deployment, for example <code>SUCCESS</code> or <code> FAILURE</code>. </p>"
+        },
+        "CodeDeployApplication":{
+          "shape":"CodeDeployApplication",
+          "documentation":"<p> The CodeDeploy application to which the deployment belongs. </p>"
+        },
+        "CodeDeployInstanceGroupId":{
+          "shape":"CodeDeployInstanceGroupId",
+          "documentation":"<p> The instance group to which the CodeDeploy instance belongs. </p>"
+        },
+        "Ec2State":{
+          "shape":"Ec2State",
+          "documentation":"<p> The state of the instance, such as <code>STOPPING</code> or <code>TERMINATING</code>. </p>"
+        },
+        "XRayFaultPercent":{
+          "shape":"XRayFaultPercent",
+          "documentation":"<p> The X-Ray request fault percentage for this node. </p>"
+        },
+        "XRayThrottlePercent":{
+          "shape":"XRayThrottlePercent",
+          "documentation":"<p> The X-Ray request throttle percentage for this node. </p>"
+        },
+        "XRayErrorPercent":{
+          "shape":"XRayErrorPercent",
+          "documentation":"<p> The X-Ray request error percentage for this node. </p>"
+        },
+        "XRayRequestCount":{
+          "shape":"XRayRequestCount",
+          "documentation":"<p> The X-Ray request count for this node. </p>"
+        },
+        "XRayRequestAverageLatency":{
+          "shape":"XRayRequestAverageLatency",
+          "documentation":"<p> The X-Ray node request average latency for this node. </p>"
+        },
+        "XRayNodeName":{
+          "shape":"XRayNodeName",
+          "documentation":"<p> The name of the X-Ray node. </p>"
+        },
+        "XRayNodeType":{
+          "shape":"XRayNodeType",
+          "documentation":"<p> The type of the X-Ray node. </p>"
         }
       },
       "documentation":"<p>Describes an anomaly or error with the application.</p>"
     },
-    "ObservationId":{"type":"string"},
+    "ObservationId":{
+      "type":"string",
+      "max":38,
+      "min":38,
+      "pattern":"o-[0-9a-fA-F]{8}\\-[0-9a-fA-F]{4}\\-[0-9a-fA-F]{4}\\-[0-9a-fA-F]{4}\\-[0-9a-fA-F]{12}"
+    },
     "ObservationList":{
       "type":"list",
       "member":{"shape":"Observation"}
     },
     "OpsCenterEnabled":{"type":"boolean"},
-    "OpsItemSNSTopicArn":{"type":"string"},
+    "OpsItemSNSTopicArn":{
+      "type":"string",
+      "max":300,
+      "min":20
+    },
     "PaginationToken":{"type":"string"},
     "Problem":{
       "type":"structure",
@@ -857,7 +1490,12 @@
       },
       "documentation":"<p>Describes a problem that is detected by correlating observations.</p>"
     },
-    "ProblemId":{"type":"string"},
+    "ProblemId":{
+      "type":"string",
+      "max":38,
+      "min":38,
+      "pattern":"p-[0-9a-fA-F]{8}\\-[0-9a-fA-F]{4}\\-[0-9a-fA-F]{4}\\-[0-9a-fA-F]{4}\\-[0-9a-fA-F]{12}"
+    },
     "ProblemList":{
       "type":"list",
       "member":{"shape":"Problem"}
@@ -874,8 +1512,17 @@
     },
     "Remarks":{"type":"string"},
     "RemoveSNSTopic":{"type":"boolean"},
-    "ResourceARN":{"type":"string"},
-    "ResourceGroupName":{"type":"string"},
+    "ResourceARN":{
+      "type":"string",
+      "max":1011,
+      "min":1
+    },
+    "ResourceGroupName":{
+      "type":"string",
+      "max":256,
+      "min":1,
+      "pattern":"[a-zA-Z0-9\\.\\-_]*"
+    },
     "ResourceInUseException":{
       "type":"structure",
       "members":{
@@ -900,9 +1547,9 @@
     "SeverityLevel":{
       "type":"string",
       "enum":[
-        "LOW",
-        "MEDIUM",
-        "HIGH"
+        "Low",
+        "Medium",
+        "High"
       ]
     },
     "SourceARN":{"type":"string"},
@@ -916,9 +1563,124 @@
         "PENDING"
       ]
     },
-    "Tier":{"type":"string"},
+    "Tag":{
+      "type":"structure",
+      "required":[
+        "Key",
+        "Value"
+      ],
+      "members":{
+        "Key":{
+          "shape":"TagKey",
+          "documentation":"<p>One part of a key-value pair that defines a tag. The maximum length of a tag key is 128 characters. The minimum length is 1 character.</p>"
+        },
+        "Value":{
+          "shape":"TagValue",
+          "documentation":"<p>The optional part of a key-value pair that defines a tag. The maximum length of a tag value is 256 characters. The minimum length is 0 characters. If you don't want an application to have a specific tag value, don't specify a value for this parameter.</p>"
+        }
+      },
+      "documentation":"<p>An object that defines the tags associated with an application. A <i>tag</i> is a label that you optionally define and associate with an application. Tags can help you categorize and manage resources in different ways, such as by purpose, owner, environment, or other criteria.</p> <p>Each tag consists of a required <i>tag key</i> and an associated <i>tag value</i>, both of which you define. A tag key is a general label that acts as a category for a more specific tag value. A tag value acts as a descriptor within a tag key. A tag key can contain as many as 128 characters. A tag value can contain as many as 256 characters. The characters can be Unicode letters, digits, white space, or one of the following symbols: _ . : / = + -. The following additional restrictions apply to tags:</p> <ul> <li> <p>Tag keys and values are case sensitive.</p> </li> <li> <p>For each associated resource, each tag key must be unique and it can have only one value.</p> </li> <li> <p>The <code>aws:</code> prefix is reserved for use by AWS; you can’t use it in any tag keys or values that you define. In addition, you can't edit or remove tag keys or values that use this prefix. </p> </li> </ul>"
+    },
+    "TagKey":{
+      "type":"string",
+      "max":128,
+      "min":1
+    },
+    "TagKeyList":{
+      "type":"list",
+      "member":{"shape":"TagKey"},
+      "max":200,
+      "min":0
+    },
+    "TagList":{
+      "type":"list",
+      "member":{"shape":"Tag"},
+      "max":200,
+      "min":0
+    },
+    "TagResourceRequest":{
+      "type":"structure",
+      "required":[
+        "ResourceARN",
+        "Tags"
+      ],
+      "members":{
+        "ResourceARN":{
+          "shape":"AmazonResourceName",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the application that you want to add one or more tags to.</p>"
+        },
+        "Tags":{
+          "shape":"TagList",
+          "documentation":"<p>A list of tags that to add to the application. A tag consists of a required tag key (<code>Key</code>) and an associated tag value (<code>Value</code>). The maximum length of a tag key is 128 characters. The maximum length of a tag value is 256 characters.</p>"
+        }
+      }
+    },
+    "TagResourceResponse":{
+      "type":"structure",
+      "members":{
+      }
+    },
+    "TagValue":{
+      "type":"string",
+      "max":256,
+      "min":0
+    },
+    "TagsAlreadyExistException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"ExceptionMessage"}
+      },
+      "documentation":"<p>Tags are already registered for the specified application ARN.</p>",
+      "exception":true
+    },
+    "Tier":{
+      "type":"string",
+      "enum":[
+        "DEFAULT",
+        "DOT_NET_CORE",
+        "DOT_NET_WORKER",
+        "DOT_NET_WEB",
+        "SQL_SERVER"
+      ],
+      "max":50,
+      "min":1
+    },
     "Title":{"type":"string"},
+    "TooManyTagsException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"ExceptionMessage"},
+        "ResourceName":{
+          "shape":"AmazonResourceName",
+          "documentation":"<p>The name of the resource with too many tags.</p>"
+        }
+      },
+      "documentation":"<p>The number of the provided tags is beyond the limit, or the number of total tags you are trying to attach to the specified resource exceeds the limit.</p>",
+      "exception":true
+    },
     "Unit":{"type":"string"},
+    "UntagResourceRequest":{
+      "type":"structure",
+      "required":[
+        "ResourceARN",
+        "TagKeys"
+      ],
+      "members":{
+        "ResourceARN":{
+          "shape":"AmazonResourceName",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the application that you want to remove one or more tags from.</p>"
+        },
+        "TagKeys":{
+          "shape":"TagKeyList",
+          "documentation":"<p>The tags (tag keys) that you want to remove from the resource. When you specify a tag key, the action removes both that key and its associated tag value.</p> <p>To remove more than one tag from the application, append the <code>TagKeys</code> parameter and argument for each additional tag to remove, separated by an ampersand. </p>"
+        }
+      }
+    },
+    "UntagResourceResponse":{
+      "type":"structure",
+      "members":{
+      }
+    },
     "UpdateApplicationRequest":{
       "type":"structure",
       "required":["ResourceGroupName"],
@@ -931,6 +1693,10 @@
           "shape":"OpsCenterEnabled",
           "documentation":"<p> When set to <code>true</code>, creates opsItems for any problems detected on an application. </p>"
         },
+        "CWEMonitorEnabled":{
+          "shape":"CWEMonitorEnabled",
+          "documentation":"<p> Indicates whether Application Insights can listen to CloudWatch events for the application resources, such as <code>instance terminated</code>, <code>failed deployment</code>, and others. </p>"
+        },
         "OpsItemSNSTopicArn":{
           "shape":"OpsItemSNSTopicArn",
           "documentation":"<p> The SNS topic provided to Application Insights that is associated to the created opsItem. Allows you to receive notifications for updates to the opsItem.</p>"
@@ -971,11 +1737,11 @@
         },
         "Tier":{
           "shape":"Tier",
-          "documentation":"<p>The tier of the application component. Supported tiers include <code>DOT_NET_WORKER</code>, <code>DOT_NET_WEB</code>, <code>SQL_SERVER</code>, and <code>DEFAULT</code>.</p>"
+          "documentation":"<p>The tier of the application component. Supported tiers include <code>DOT_NET_WORKER</code>, <code>DOT_NET_WEB</code>, <code>DOT_NET_CORE</code>, <code>SQL_SERVER</code>, and <code>DEFAULT</code>.</p>"
         },
         "ComponentConfiguration":{
           "shape":"ComponentConfiguration",
-          "documentation":"<p>The configuration settings of the component. The value is the escaped JSON of the configuration. For more information about the JSON format, see <a href=\"https://docs.aws.amazon.com/sdk-for-javascript/v2/developer-guide/working-with-json.html\">Working with JSON</a>. You can send a request to <code>DescribeComponentConfigurationRecommendation</code> to see the recommended configuration for a component.</p>"
+          "documentation":"<p>The configuration settings of the component. The value is the escaped JSON of the configuration. For more information about the JSON format, see <a href=\"https://docs.aws.amazon.com/sdk-for-javascript/v2/developer-guide/working-with-json.html\">Working with JSON</a>. You can send a request to <code>DescribeComponentConfigurationRecommendation</code> to see the recommended configuration for a component. For the complete format of the component configuration file, see <a href=\"https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/component-config.html\">Component Configuration</a>.</p>"
         }
       }
     },
@@ -1014,6 +1780,49 @@
       "members":{
       }
     },
+    "UpdateLogPatternRequest":{
+      "type":"structure",
+      "required":[
+        "ResourceGroupName",
+        "PatternSetName",
+        "PatternName"
+      ],
+      "members":{
+        "ResourceGroupName":{
+          "shape":"ResourceGroupName",
+          "documentation":"<p>The name of the resource group.</p>"
+        },
+        "PatternSetName":{
+          "shape":"LogPatternSetName",
+          "documentation":"<p>The name of the log pattern set.</p>"
+        },
+        "PatternName":{
+          "shape":"LogPatternName",
+          "documentation":"<p>The name of the log pattern.</p>"
+        },
+        "Pattern":{
+          "shape":"LogPatternRegex",
+          "documentation":"<p>The log pattern.</p>"
+        },
+        "Rank":{
+          "shape":"LogPatternRank",
+          "documentation":"<p>Rank of the log pattern.</p>"
+        }
+      }
+    },
+    "UpdateLogPatternResponse":{
+      "type":"structure",
+      "members":{
+        "ResourceGroupName":{
+          "shape":"ResourceGroupName",
+          "documentation":"<p>The name of the resource group.</p>"
+        },
+        "LogPattern":{
+          "shape":"LogPattern",
+          "documentation":"<p>The successfully created log pattern.</p>"
+        }
+      }
+    },
     "ValidationException":{
       "type":"structure",
       "members":{
@@ -1022,7 +1831,14 @@
       "documentation":"<p>The parameter is not valid.</p>",
       "exception":true
     },
-    "Value":{"type":"double"}
+    "Value":{"type":"double"},
+    "XRayErrorPercent":{"type":"integer"},
+    "XRayFaultPercent":{"type":"integer"},
+    "XRayNodeName":{"type":"string"},
+    "XRayNodeType":{"type":"string"},
+    "XRayRequestAverageLatency":{"type":"long"},
+    "XRayRequestCount":{"type":"integer"},
+    "XRayThrottlePercent":{"type":"integer"}
   },
   "documentation":"<fullname>Amazon CloudWatch Application Insights for .NET and SQL Server</fullname> <p> Amazon CloudWatch Application Insights for .NET and SQL Server is a service that helps you detect common problems with your .NET and SQL Server-based applications. It enables you to pinpoint the source of issues in your applications (built with technologies such as Microsoft IIS, .NET, and Microsoft SQL Server), by providing key insights into detected problems.</p> <p>After you onboard your application, CloudWatch Application Insights for .NET and SQL Server identifies, recommends, and sets up metrics and logs. It continuously analyzes and correlates your metrics and logs for unusual behavior to surface actionable problems with your application. For example, if your application is slow and unresponsive and leading to HTTP 500 errors in your Application Load Balancer (ALB), Application Insights informs you that a memory pressure problem with your SQL Server database is occurring. It bases this analysis on impactful metrics and log errors. </p>"
 }
diff --git a/services/appmesh/pom.xml b/services/appmesh/pom.xml
index beceec6b0622..b5d271c50d72 100644
--- a/services/appmesh/pom.xml
+++ b/services/appmesh/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>appmesh</artifactId>
     <name>AWS Java SDK :: Services :: App Mesh</name>
diff --git a/services/appmesh/src/main/resources/codegen-resources/service-2.json b/services/appmesh/src/main/resources/codegen-resources/service-2.json
index b2cf20c47661..dbef33f43d56 100644
--- a/services/appmesh/src/main/resources/codegen-resources/service-2.json
+++ b/services/appmesh/src/main/resources/codegen-resources/service-2.json
@@ -94,7 +94,7 @@
           "shape": "TooManyRequestsException"
         }
       ],
-      "documentation": "<p>Creates a route that is associated with a virtual router.</p>\n         <p>You can use the <code>prefix</code> parameter in your route specification for path-based\n         routing of requests. For example, if your virtual service name is\n            <code>my-service.local</code> and you want the route to match requests to\n            <code>my-service.local/metrics</code>, your prefix should be\n         <code>/metrics</code>.</p>\n         <p>If your route matches a request, you can distribute traffic to one or more target\n         virtual nodes with relative weighting.</p>",
+      "documentation": "<p>Creates a route that is associated with a virtual router.</p>\n         <p>You can use the <code>prefix</code> parameter in your route specification for path-based\n         routing of requests. For example, if your virtual service name is\n            <code>my-service.local</code> and you want the route to match requests to\n            <code>my-service.local/metrics</code>, your prefix should be\n         <code>/metrics</code>.</p>\n         <p>If your route matches a request, you can distribute traffic to one or more target\n         virtual nodes with relative weighting.</p>\n         <p>For more information about routes, see <a href=\"https://docs.aws.amazon.com/app-mesh/latest/userguide/routes.html\">Routes</a>.</p>",
       "idempotent": true
     },
     "CreateVirtualNode": {
@@ -136,7 +136,7 @@
           "shape": "TooManyRequestsException"
         }
       ],
-      "documentation": "<p>Creates a virtual node within a service mesh.</p>\n         <p>A virtual node acts as a logical pointer to a particular task group, such as an Amazon ECS\n         service or a Kubernetes deployment. When you create a virtual node, you can specify the\n         service discovery information for your task group.</p>\n         <p>Any inbound traffic that your virtual node expects should be specified as a\n            <code>listener</code>. Any outbound traffic that your virtual node expects to reach\n         should be specified as a <code>backend</code>.</p>\n         <p>The response metadata for your new virtual node contains the <code>arn</code> that is\n         associated with the virtual node. Set this value (either the full ARN or the truncated\n         resource name: for example, <code>mesh/default/virtualNode/simpleapp</code>) as the\n            <code>APPMESH_VIRTUAL_NODE_NAME</code> environment variable for your task group's Envoy\n         proxy container in your task definition or pod spec. This is then mapped to the\n            <code>node.id</code> and <code>node.cluster</code> Envoy parameters.</p>\n         <note>\n            <p>If you require your Envoy stats or tracing to use a different name, you can override\n            the <code>node.cluster</code> value that is set by\n               <code>APPMESH_VIRTUAL_NODE_NAME</code> with the\n               <code>APPMESH_VIRTUAL_NODE_CLUSTER</code> environment variable.</p>\n         </note>",
+      "documentation": "<p>Creates a virtual node within a service mesh.</p>\n         <p>A virtual node acts as a logical pointer to a particular task group, such as an Amazon ECS\n         service or a Kubernetes deployment. When you create a virtual node, you can specify the\n         service discovery information for your task group.</p>\n         <p>Any inbound traffic that your virtual node expects should be specified as a\n            <code>listener</code>. Any outbound traffic that your virtual node expects to reach\n         should be specified as a <code>backend</code>.</p>\n         <p>The response metadata for your new virtual node contains the <code>arn</code> that is\n         associated with the virtual node. Set this value (either the full ARN or the truncated\n         resource name: for example, <code>mesh/default/virtualNode/simpleapp</code>) as the\n            <code>APPMESH_VIRTUAL_NODE_NAME</code> environment variable for your task group's Envoy\n         proxy container in your task definition or pod spec. This is then mapped to the\n            <code>node.id</code> and <code>node.cluster</code> Envoy parameters.</p>\n         <note>\n            <p>If you require your Envoy stats or tracing to use a different name, you can override\n            the <code>node.cluster</code> value that is set by\n               <code>APPMESH_VIRTUAL_NODE_NAME</code> with the\n               <code>APPMESH_VIRTUAL_NODE_CLUSTER</code> environment variable.</p>\n         </note>\n         <p>For more information about virtual nodes, see <a href=\"https://docs.aws.amazon.com/app-mesh/latest/userguide/virtual_nodes.html\">Virtual Nodes</a>.</p>",
       "idempotent": true
     },
     "CreateVirtualRouter": {
@@ -178,7 +178,7 @@
           "shape": "TooManyRequestsException"
         }
       ],
-      "documentation": "<p>Creates a virtual router within a service mesh.</p>\n         <p>Any inbound traffic that your virtual router expects should be specified as a\n            <code>listener</code>. </p>\n         <p>Virtual routers handle traffic for one or more virtual services within your mesh. After\n         you create your virtual router, create and associate routes for your virtual router that\n         direct incoming requests to different virtual nodes.</p>",
+      "documentation": "<p>Creates a virtual router within a service mesh.</p>\n         <p>Any inbound traffic that your virtual router expects should be specified as a\n            <code>listener</code>. </p>\n         <p>Virtual routers handle traffic for one or more virtual services within your mesh. After\n         you create your virtual router, create and associate routes for your virtual router that\n         direct incoming requests to different virtual nodes.</p>\n         <p>For more information about virtual routers, see <a href=\"https://docs.aws.amazon.com/app-mesh/latest/userguide/virtual_routers.html\">Virtual Routers</a>.</p>",
       "idempotent": true
     },
     "CreateVirtualService": {
@@ -220,7 +220,7 @@
           "shape": "TooManyRequestsException"
         }
       ],
-      "documentation": "<p>Creates a virtual service within a service mesh.</p>\n         <p>A virtual service is an abstraction of a real service that is provided by a virtual node\n         directly or indirectly by means of a virtual router. Dependent services call your virtual\n         service by its <code>virtualServiceName</code>, and those requests are routed to the\n         virtual node or virtual router that is specified as the provider for the virtual\n         service.</p>",
+      "documentation": "<p>Creates a virtual service within a service mesh.</p>\n         <p>A virtual service is an abstraction of a real service that is provided by a virtual node\n         directly or indirectly by means of a virtual router. Dependent services call your virtual\n         service by its <code>virtualServiceName</code>, and those requests are routed to the\n         virtual node or virtual router that is specified as the provider for the virtual\n         service.</p>\n         <p>For more information about virtual services, see <a href=\"https://docs.aws.amazon.com/app-mesh/latest/userguide/virtual_services.html\">Virtual Services</a>.</p>",
       "idempotent": true
     },
     "DeleteMesh": {
@@ -1096,6 +1096,1402 @@
       },
       "documentation": "<p>An object that represents a virtual router listener.</p>"
     },
+    "VirtualRouterStatusCode": {
+      "type": "string",
+      "enum": [
+        "ACTIVE",
+        "DELETED",
+        "INACTIVE"
+      ]
+    },
+    "TagKeyList": {
+      "type": "list",
+      "member": {
+        "shape": "TagKey"
+      },
+      "min": 0,
+      "max": 50
+    },
+    "GrpcRetryPolicy": {
+      "type": "structure",
+      "required": [
+        "maxRetries",
+        "perRetryTimeout"
+      ],
+      "members": {
+        "grpcRetryEvents": {
+          "shape": "GrpcRetryPolicyEvents",
+          "documentation": "<p>Specify at least one of the valid values.</p>"
+        },
+        "httpRetryEvents": {
+          "shape": "HttpRetryPolicyEvents",
+          "documentation": "<p>Specify at least one of the following values.</p>\n         <ul>\n            <li>\n               <p>\n                  <b>server-error</b> – HTTP status codes 500, 501,\n                  502, 503, 504, 505, 506, 507, 508, 510, and 511</p>\n            </li>\n            <li>\n               <p>\n                  <b>gateway-error</b> – HTTP status codes 502,\n                  503, and 504</p>\n            </li>\n            <li>\n               <p>\n                  <b>client-error</b> – HTTP status code 409</p>\n            </li>\n            <li>\n               <p>\n                  <b>stream-error</b> – Retry on refused\n                  stream</p>\n            </li>\n         </ul>"
+        },
+        "maxRetries": {
+          "shape": "MaxRetries",
+          "documentation": "<p>The maximum number of retry attempts.</p>"
+        },
+        "perRetryTimeout": {
+          "shape": "Duration",
+          "documentation": "<p>An object that represents a duration of time.</p>"
+        },
+        "tcpRetryEvents": {
+          "shape": "TcpRetryPolicyEvents",
+          "documentation": "<p>Specify a valid value.</p>"
+        }
+      },
+      "documentation": "<p>An object that represents a retry policy. Specify at least one value for at least one of the types of <code>RetryEvents</code>, a value for <code>maxRetries</code>, and a value for <code>perRetryTimeout</code>.</p>"
+    },
+    "CreateVirtualNodeOutput": {
+      "type": "structure",
+      "required": [
+        "virtualNode"
+      ],
+      "members": {
+        "virtualNode": {
+          "shape": "VirtualNodeData",
+          "documentation": "<p>The full description of your virtual node following the create call.</p>"
+        }
+      },
+      "documentation": "",
+      "payload": "virtualNode"
+    },
+    "Logging": {
+      "type": "structure",
+      "members": {
+        "accessLog": {
+          "shape": "AccessLog",
+          "documentation": "<p>The access log configuration for a virtual node.</p>"
+        }
+      },
+      "documentation": "<p>An object that represents the logging information for a virtual node.</p>"
+    },
+    "Long": {
+      "type": "long",
+      "box": true
+    },
+    "UpdateVirtualRouterOutput": {
+      "type": "structure",
+      "required": [
+        "virtualRouter"
+      ],
+      "members": {
+        "virtualRouter": {
+          "shape": "VirtualRouterData",
+          "documentation": "<p>A full description of the virtual router that was updated.</p>"
+        }
+      },
+      "documentation": "",
+      "payload": "virtualRouter"
+    },
+    "ListVirtualRoutersOutput": {
+      "type": "structure",
+      "required": [
+        "virtualRouters"
+      ],
+      "members": {
+        "nextToken": {
+          "shape": "String",
+          "documentation": "<p>The <code>nextToken</code> value to include in a future <code>ListVirtualRouters</code>\n         request. When the results of a <code>ListVirtualRouters</code> request exceed\n            <code>limit</code>, you can use this value to retrieve the next page of results. This\n         value is <code>null</code> when there are no more results to return.</p>"
+        },
+        "virtualRouters": {
+          "shape": "VirtualRouterList",
+          "documentation": "<p>The list of existing virtual routers for the specified service mesh.</p>"
+        }
+      },
+      "documentation": ""
+    },
+    "ResourceMetadata": {
+      "type": "structure",
+      "required": [
+        "arn",
+        "createdAt",
+        "lastUpdatedAt",
+        "meshOwner",
+        "resourceOwner",
+        "uid",
+        "version"
+      ],
+      "members": {
+        "arn": {
+          "shape": "Arn",
+          "documentation": "<p>The full Amazon Resource Name (ARN) for the resource.</p>"
+        },
+        "createdAt": {
+          "shape": "Timestamp",
+          "documentation": "<p>The Unix epoch timestamp in seconds for when the resource was created.</p>"
+        },
+        "lastUpdatedAt": {
+          "shape": "Timestamp",
+          "documentation": "<p>The Unix epoch timestamp in seconds for when the resource was last updated.</p>"
+        },
+        "meshOwner": {
+          "shape": "AccountId",
+          "documentation": "<p>The AWS IAM account ID of the service mesh owner. If the account ID is not your own, then it's\n               the ID of the account that shared the mesh with your account. For more information about mesh sharing, see <a href=\"https://docs.aws.amazon.com/app-mesh/latest/userguide/sharing.html\">Working with Shared Meshes</a>.</p>"
+        },
+        "resourceOwner": {
+          "shape": "AccountId",
+          "documentation": "<p>The AWS IAM account ID of the resource owner. If the account ID is not your own, then it's\n               the ID of the mesh owner, or another account that the mesh is shared with. For more information about mesh sharing, see <a href=\"https://docs.aws.amazon.com/app-mesh/latest/userguide/sharing.html\">Working with Shared Meshes</a>.</p>"
+        },
+        "uid": {
+          "shape": "String",
+          "documentation": "<p>The unique identifier for the resource.</p>"
+        },
+        "version": {
+          "shape": "Long",
+          "documentation": "<p>The version of the resource. Resources are created at version 1, and this version is\n         incremented each time that they're updated.</p>"
+        }
+      },
+      "documentation": "<p>An object that represents metadata for a resource.</p>"
+    },
+    "ResourceInUseException": {
+      "type": "structure",
+      "members": {
+        "message": {
+          "shape": "String"
+        }
+      },
+      "documentation": "<p>You can't delete the specified resource because it's in use or required by another\n         resource.</p>",
+      "exception": true,
+      "error": {
+        "code": "ResourceInUseException",
+        "httpStatusCode": 409,
+        "senderFault": true
+      }
+    },
+    "UpdateVirtualNodeOutput": {
+      "type": "structure",
+      "required": [
+        "virtualNode"
+      ],
+      "members": {
+        "virtualNode": {
+          "shape": "VirtualNodeData",
+          "documentation": "<p>A full description of the virtual node that was updated.</p>"
+        }
+      },
+      "documentation": "",
+      "payload": "virtualNode"
+    },
+    "ListRoutesOutput": {
+      "type": "structure",
+      "required": [
+        "routes"
+      ],
+      "members": {
+        "nextToken": {
+          "shape": "String",
+          "documentation": "<p>The <code>nextToken</code> value to include in a future <code>ListRoutes</code> request.\n         When the results of a <code>ListRoutes</code> request exceed <code>limit</code>, you can\n         use this value to retrieve the next page of results. This value is <code>null</code> when\n         there are no more results to return.</p>"
+        },
+        "routes": {
+          "shape": "RouteList",
+          "documentation": "<p>The list of existing routes for the specified service mesh and virtual router.</p>"
+        }
+      },
+      "documentation": ""
+    },
+    "VirtualServiceBackend": {
+      "type": "structure",
+      "required": [
+        "virtualServiceName"
+      ],
+      "members": {
+        "clientPolicy": {
+          "shape": "ClientPolicy",
+          "documentation": "<p>A reference to an object that represents the client policy for a backend.</p>"
+        },
+        "virtualServiceName": {
+          "shape": "ServiceName",
+          "documentation": "<p>The name of the virtual service that is acting as a virtual node backend.</p>"
+        }
+      },
+      "documentation": "<p>An object that represents a virtual service backend for a virtual node.</p>"
+    },
+    "BadRequestException": {
+      "type": "structure",
+      "members": {
+        "message": {
+          "shape": "String"
+        }
+      },
+      "documentation": "<p>The request syntax was malformed. Check your request syntax and try again.</p>",
+      "exception": true,
+      "error": {
+        "code": "BadRequestException",
+        "httpStatusCode": 400,
+        "senderFault": true
+      }
+    },
+    "GrpcRouteMetadataList": {
+      "type": "list",
+      "member": {
+        "shape": "GrpcRouteMetadata"
+      },
+      "min": 1,
+      "max": 10
+    },
+    "ListenerTlsMode": {
+      "type": "string",
+      "enum": [
+        "DISABLED",
+        "PERMISSIVE",
+        "STRICT"
+      ]
+    },
+    "HealthCheckPolicy": {
+      "type": "structure",
+      "required": [
+        "healthyThreshold",
+        "intervalMillis",
+        "protocol",
+        "timeoutMillis",
+        "unhealthyThreshold"
+      ],
+      "members": {
+        "healthyThreshold": {
+          "shape": "HealthCheckThreshold",
+          "documentation": "<p>The number of consecutive successful health checks that must occur before declaring\n         listener healthy.</p>"
+        },
+        "intervalMillis": {
+          "shape": "HealthCheckIntervalMillis",
+          "documentation": "<p>The time period in milliseconds between each health check execution.</p>"
+        },
+        "path": {
+          "shape": "String",
+          "documentation": "<p>The destination path for the health check request. This value is only used if the specified \n         protocol is HTTP or HTTP/2. For any other protocol, this value is ignored.</p>"
+        },
+        "port": {
+          "shape": "PortNumber",
+          "documentation": "<p>The destination port for the health check request. This port must match the port defined\n         in the <a>PortMapping</a> for the listener.</p>"
+        },
+        "protocol": {
+          "shape": "PortProtocol",
+          "documentation": "<p>The protocol for the health check request. If you specify <code>grpc</code>, then your service must conform to the <a href=\"https://github.com/grpc/grpc/blob/master/doc/health-checking.md\">GRPC Health Checking Protocol</a>.</p>"
+        },
+        "timeoutMillis": {
+          "shape": "HealthCheckTimeoutMillis",
+          "documentation": "<p>The amount of time to wait when receiving a response from the health check, in\n         milliseconds.</p>"
+        },
+        "unhealthyThreshold": {
+          "shape": "HealthCheckThreshold",
+          "documentation": "<p>The number of consecutive failed health checks that must occur before declaring a\n         virtual node unhealthy. </p>"
+        }
+      },
+      "documentation": "<p>An object that represents the health check policy for a virtual node's listener.</p>"
+    },
+    "EgressFilter": {
+      "type": "structure",
+      "required": [
+        "type"
+      ],
+      "members": {
+        "type": {
+          "shape": "EgressFilterType",
+          "documentation": "<p>The egress filter type. By default, the type is <code>DROP_ALL</code>, which allows\n         egress only from virtual nodes to other defined resources in the service mesh (and any\n         traffic to <code>*.amazonaws.com</code> for AWS API calls). You can set the egress filter\n         type to <code>ALLOW_ALL</code> to allow egress to any endpoint inside or outside of the\n         service mesh.</p>"
+        }
+      },
+      "documentation": "<p>An object that represents the egress filter rules for a service mesh.</p>"
+    },
+    "VirtualServiceList": {
+      "type": "list",
+      "member": {
+        "shape": "VirtualServiceRef"
+      }
+    },
+    "ClientPolicy": {
+      "type": "structure",
+      "members": {
+        "tls": {
+          "shape": "ClientPolicyTls",
+          "documentation": "<p>A reference to an object that represents a Transport Layer Security (TLS) client policy.</p>"
+        }
+      },
+      "documentation": "<p>An object that represents a client policy.</p>"
+    },
+    "Boolean": {
+      "type": "boolean",
+      "box": true
+    },
+    "HttpRetryPolicyEvent": {
+      "type": "string",
+      "min": 1,
+      "max": 25
+    },
+    "DescribeVirtualServiceOutput": {
+      "type": "structure",
+      "required": [
+        "virtualService"
+      ],
+      "members": {
+        "virtualService": {
+          "shape": "VirtualServiceData",
+          "documentation": "<p>The full description of your virtual service.</p>"
+        }
+      },
+      "documentation": "",
+      "payload": "virtualService"
+    },
+    "CertificateAuthorityArns": {
+      "type": "list",
+      "member": {
+        "shape": "Arn"
+      },
+      "min": 1,
+      "max": 3
+    },
+    "DescribeVirtualNodeOutput": {
+      "type": "structure",
+      "required": [
+        "virtualNode"
+      ],
+      "members": {
+        "virtualNode": {
+          "shape": "VirtualNodeData",
+          "documentation": "<p>The full description of your virtual node.</p>"
+        }
+      },
+      "documentation": "",
+      "payload": "virtualNode"
+    },
+    "AwsCloudMapName": {
+      "type": "string",
+      "min": 1,
+      "max": 1024,
+      "pattern": "((?=^.{1,127}$)^([a-zA-Z0-9_][a-zA-Z0-9-_]{0,61}[a-zA-Z0-9_]|[a-zA-Z0-9])(.([a-zA-Z0-9_][a-zA-Z0-9-_]{0,61}[a-zA-Z0-9_]|[a-zA-Z0-9]))*$)|(^.$)"
+    },
+    "CreateRouteOutput": {
+      "type": "structure",
+      "required": [
+        "route"
+      ],
+      "members": {
+        "route": {
+          "shape": "RouteData",
+          "documentation": "<p>The full description of your mesh following the create call.</p>"
+        }
+      },
+      "documentation": "",
+      "payload": "route"
+    },
+    "DnsServiceDiscovery": {
+      "type": "structure",
+      "required": [
+        "hostname"
+      ],
+      "members": {
+        "hostname": {
+          "shape": "Hostname",
+          "documentation": "<p>Specifies the DNS service discovery hostname for the virtual node. </p>"
+        }
+      },
+      "documentation": "<p>An object that represents the DNS service discovery information for your virtual\n         node.</p>"
+    },
+    "DeleteRouteInput": {
+      "type": "structure",
+      "required": [
+        "meshName",
+        "routeName",
+        "virtualRouterName"
+      ],
+      "members": {
+        "meshName": {
+          "shape": "ResourceName",
+          "documentation": "<p>The name of the service mesh to delete the route in.</p>",
+          "location": "uri",
+          "locationName": "meshName"
+        },
+        "meshOwner": {
+          "shape": "AccountId",
+          "documentation": "<p>The AWS IAM account ID of the service mesh owner. If the account ID is not your own, then it's\n               the ID of the account that shared the mesh with your account. For more information about mesh sharing, see <a href=\"https://docs.aws.amazon.com/app-mesh/latest/userguide/sharing.html\">Working with Shared Meshes</a>.</p>",
+          "location": "querystring",
+          "locationName": "meshOwner"
+        },
+        "routeName": {
+          "shape": "ResourceName",
+          "documentation": "<p>The name of the route to delete.</p>",
+          "location": "uri",
+          "locationName": "routeName"
+        },
+        "virtualRouterName": {
+          "shape": "ResourceName",
+          "documentation": "<p>The name of the virtual router to delete the route in.</p>",
+          "location": "uri",
+          "locationName": "virtualRouterName"
+        }
+      },
+      "documentation": ""
+    },
+    "VirtualNodeData": {
+      "type": "structure",
+      "required": [
+        "meshName",
+        "metadata",
+        "spec",
+        "status",
+        "virtualNodeName"
+      ],
+      "members": {
+        "meshName": {
+          "shape": "ResourceName",
+          "documentation": "<p>The name of the service mesh that the virtual node resides in.</p>"
+        },
+        "metadata": {
+          "shape": "ResourceMetadata",
+          "documentation": "<p>The associated metadata for the virtual node.</p>"
+        },
+        "spec": {
+          "shape": "VirtualNodeSpec",
+          "documentation": "<p>The specifications of the virtual node.</p>"
+        },
+        "status": {
+          "shape": "VirtualNodeStatus",
+          "documentation": "<p>The current status for the virtual node.</p>"
+        },
+        "virtualNodeName": {
+          "shape": "ResourceName",
+          "documentation": "<p>The name of the virtual node.</p>"
+        }
+      },
+      "documentation": "<p>An object that represents a virtual node returned by a describe operation.</p>"
+    },
+    "UntagResourceOutput": {
+      "type": "structure",
+      "members": { },
+      "documentation": ""
+    },
+    "TcpRetryPolicyEvent": {
+      "type": "string",
+      "enum": [
+        "connection-error"
+      ]
+    },
+    "Backend": {
+      "type": "structure",
+      "members": {
+        "virtualService": {
+          "shape": "VirtualServiceBackend",
+          "documentation": "<p>Specifies a virtual service to use as a backend for a virtual node. </p>"
+        }
+      },
+      "documentation": "<p>An object that represents the backends that a virtual node is expected to send outbound\n         traffic to. </p>"
+    },
+    "ListMeshesInput": {
+      "type": "structure",
+      "members": {
+        "limit": {
+          "shape": "ListMeshesLimit",
+          "documentation": "<p>The maximum number of results returned by <code>ListMeshes</code> in paginated output.\n         When you use this parameter, <code>ListMeshes</code> returns only <code>limit</code>\n         results in a single page along with a <code>nextToken</code> response element. You can see\n         the remaining results of the initial request by sending another <code>ListMeshes</code>\n         request with the returned <code>nextToken</code> value. This value can be between\n         1 and 100. If you don't use this parameter,\n            <code>ListMeshes</code> returns up to 100 results and a\n            <code>nextToken</code> value if applicable.</p>",
+          "location": "querystring",
+          "locationName": "limit"
+        },
+        "nextToken": {
+          "shape": "String",
+          "documentation": "<p>The <code>nextToken</code> value returned from a previous paginated\n            <code>ListMeshes</code> request where <code>limit</code> was used and the results\n         exceeded the value of that parameter. Pagination continues from the end of the previous\n         results that returned the <code>nextToken</code> value.</p> \n         <note>\n            <p>This token should be treated as an opaque identifier that is used only to\n                retrieve the next items in a list and not for other programmatic purposes.</p>\n        </note>",
+          "location": "querystring",
+          "locationName": "nextToken"
+        }
+      },
+      "documentation": ""
+    },
+    "VirtualRouterData": {
+      "type": "structure",
+      "required": [
+        "meshName",
+        "metadata",
+        "spec",
+        "status",
+        "virtualRouterName"
+      ],
+      "members": {
+        "meshName": {
+          "shape": "ResourceName",
+          "documentation": "<p>The name of the service mesh that the virtual router resides in.</p>"
+        },
+        "metadata": {
+          "shape": "ResourceMetadata",
+          "documentation": "<p>The associated metadata for the virtual router.</p>"
+        },
+        "spec": {
+          "shape": "VirtualRouterSpec",
+          "documentation": "<p>The specifications of the virtual router.</p>"
+        },
+        "status": {
+          "shape": "VirtualRouterStatus",
+          "documentation": "<p>The current status of the virtual router.</p>"
+        },
+        "virtualRouterName": {
+          "shape": "ResourceName",
+          "documentation": "<p>The name of the virtual router.</p>"
+        }
+      },
+      "documentation": "<p>An object that represents a virtual router returned by a describe operation.</p>"
+    },
+    "UpdateMeshInput": {
+      "type": "structure",
+      "required": [
+        "meshName"
+      ],
+      "members": {
+        "clientToken": {
+          "shape": "String",
+          "documentation": "<p>Unique, case-sensitive identifier that you provide to ensure the idempotency of the\nrequest. Up to 36 letters, numbers, hyphens, and underscores are allowed.</p>",
+          "idempotencyToken": true
+        },
+        "meshName": {
+          "shape": "ResourceName",
+          "documentation": "<p>The name of the service mesh to update.</p>",
+          "location": "uri",
+          "locationName": "meshName"
+        },
+        "spec": {
+          "shape": "MeshSpec",
+          "documentation": "<p>The service mesh specification to apply.</p>"
+        }
+      },
+      "documentation": ""
+    },
+    "CreateVirtualRouterInput": {
+      "type": "structure",
+      "required": [
+        "meshName",
+        "spec",
+        "virtualRouterName"
+      ],
+      "members": {
+        "clientToken": {
+          "shape": "String",
+          "documentation": "<p>Unique, case-sensitive identifier that you provide to ensure the idempotency of the\nrequest. Up to 36 letters, numbers, hyphens, and underscores are allowed.</p>",
+          "idempotencyToken": true
+        },
+        "meshName": {
+          "shape": "ResourceName",
+          "documentation": "<p>The name of the service mesh to create the virtual router in.</p>",
+          "location": "uri",
+          "locationName": "meshName"
+        },
+        "meshOwner": {
+          "shape": "AccountId",
+          "documentation": "<p>The AWS IAM account ID of the service mesh owner. If the account ID is not your own, then\n               the account that you specify must share the mesh with your account before you can create \n             the resource in the service mesh. For more information about mesh sharing, see <a href=\"https://docs.aws.amazon.com/app-mesh/latest/userguide/sharing.html\">Working with Shared Meshes</a>.</p>",
+          "location": "querystring",
+          "locationName": "meshOwner"
+        },
+        "spec": {
+          "shape": "VirtualRouterSpec",
+          "documentation": "<p>The virtual router specification to apply.</p>"
+        },
+        "tags": {
+          "shape": "TagList",
+          "documentation": "<p>Optional metadata that you can apply to the virtual router to assist with categorization\n         and organization. Each tag consists of a key and an optional value, both of which you\n         define. Tag keys can have a maximum character length of 128 characters, and tag values can have\n            a maximum length of 256 characters.</p>",
+          "tags": [
+            "not-preview"
+          ]
+        },
+        "virtualRouterName": {
+          "shape": "ResourceName",
+          "documentation": "<p>The name to use for the virtual router.</p>"
+        }
+      },
+      "documentation": ""
+    },
+    "DescribeVirtualRouterOutput": {
+      "type": "structure",
+      "required": [
+        "virtualRouter"
+      ],
+      "members": {
+        "virtualRouter": {
+          "shape": "VirtualRouterData",
+          "documentation": "<p>The full description of your virtual router.</p>"
+        }
+      },
+      "documentation": "",
+      "payload": "virtualRouter"
+    },
+    "CreateMeshOutput": {
+      "type": "structure",
+      "required": [
+        "mesh"
+      ],
+      "members": {
+        "mesh": {
+          "shape": "MeshData",
+          "documentation": "<p>The full description of your service mesh following the create call.</p>"
+        }
+      },
+      "documentation": "",
+      "payload": "mesh"
+    },
+    "CreateVirtualRouterOutput": {
+      "type": "structure",
+      "required": [
+        "virtualRouter"
+      ],
+      "members": {
+        "virtualRouter": {
+          "shape": "VirtualRouterData",
+          "documentation": "<p>The full description of your virtual router following the create call.</p>"
+        }
+      },
+      "documentation": "",
+      "payload": "virtualRouter"
+    },
+    "VirtualServiceStatus": {
+      "type": "structure",
+      "required": [
+        "status"
+      ],
+      "members": {
+        "status": {
+          "shape": "VirtualServiceStatusCode",
+          "documentation": "<p>The current status of the virtual service.</p>"
+        }
+      },
+      "documentation": "<p>An object that represents the status of a virtual service.</p>"
+    },
+    "HttpRetryPolicyEvents": {
+      "type": "list",
+      "member": {
+        "shape": "HttpRetryPolicyEvent"
+      },
+      "min": 1,
+      "max": 25
+    },
+    "ListenerTlsCertificate": {
+      "type": "structure",
+      "members": {
+        "acm": {
+          "shape": "ListenerTlsAcmCertificate",
+          "documentation": "<p>A reference to an object that represents an AWS Certicate Manager (ACM) certificate.</p>"
+        },
+        "file": {
+          "shape": "ListenerTlsFileCertificate",
+          "documentation": "<p>A reference to an object that represents a local file certificate.</p>"
+        }
+      },
+      "documentation": "<p>An object that represents a listener's Transport Layer Security (TLS) certificate.</p>"
+    },
+    "ListMeshesLimit": {
+      "type": "integer",
+      "box": true,
+      "min": 1,
+      "max": 100
+    },
+    "AwsCloudMapInstanceAttributeKey": {
+      "type": "string",
+      "min": 1,
+      "max": 255,
+      "pattern": "^[a-zA-Z0-9!-~]+$"
+    },
+    "VirtualRouterSpec": {
+      "type": "structure",
+      "members": {
+        "listeners": {
+          "shape": "VirtualRouterListeners",
+          "documentation": "<p>The listeners that the virtual router is expected to receive inbound traffic from.\n         You can specify one listener.</p>"
+        }
+      },
+      "documentation": "<p>An object that represents the specification of a virtual router.</p>"
+    },
+    "VirtualNodeSpec": {
+      "type": "structure",
+      "members": {
+        "backendDefaults": {
+          "shape": "BackendDefaults",
+          "documentation": "<p>A reference to an object that represents the defaults for backends.</p>"
+        },
+        "backends": {
+          "shape": "Backends",
+          "documentation": "<p>The backends that the virtual node is expected to send outbound traffic to.</p>"
+        },
+        "listeners": {
+          "shape": "Listeners",
+          "documentation": "<p>The listener that the virtual node is expected to receive inbound traffic from.\n         You can specify one listener.</p>"
+        },
+        "logging": {
+          "shape": "Logging",
+          "documentation": "<p>The inbound and outbound access logging information for the virtual node.</p>"
+        },
+        "serviceDiscovery": {
+          "shape": "ServiceDiscovery",
+          "documentation": "<p>The service discovery information for the virtual node. If your virtual node does not\n         expect ingress traffic, you can omit this parameter. If you specify a <code>listener</code>,\n         then you must specify service discovery information.</p>"
+        }
+      },
+      "documentation": "<p>An object that represents the specification of a virtual node.</p>"
+    },
+    "ListMeshesOutput": {
+      "type": "structure",
+      "required": [
+        "meshes"
+      ],
+      "members": {
+        "meshes": {
+          "shape": "MeshList",
+          "documentation": "<p>The list of existing service meshes.</p>"
+        },
+        "nextToken": {
+          "shape": "String",
+          "documentation": "<p>The <code>nextToken</code> value to include in a future <code>ListMeshes</code> request.\n         When the results of a <code>ListMeshes</code> request exceed <code>limit</code>, you can\n         use this value to retrieve the next page of results. This value is <code>null</code> when\n         there are no more results to return.</p>"
+        }
+      },
+      "documentation": ""
+    },
+    "VirtualRouterListeners": {
+      "type": "list",
+      "member": {
+        "shape": "VirtualRouterListener"
+      },
+      "min": 1,
+      "max": 1
+    },
+    "PortSet": {
+      "type": "list",
+      "member": {
+        "shape": "PortNumber"
+      }
+    },
+    "HttpMethod": {
+      "type": "string",
+      "enum": [
+        "CONNECT",
+        "DELETE",
+        "GET",
+        "HEAD",
+        "OPTIONS",
+        "PATCH",
+        "POST",
+        "PUT",
+        "TRACE"
+      ]
+    },
+    "ConflictException": {
+      "type": "structure",
+      "members": {
+        "message": {
+          "shape": "String"
+        }
+      },
+      "documentation": "<p>The request contains a client token that was used for a previous update resource call\n         with different specifications. Try the request again with a new client token.</p>",
+      "exception": true,
+      "error": {
+        "code": "ConflictException",
+        "httpStatusCode": 409,
+        "senderFault": true
+      }
+    },
+    "MeshList": {
+      "type": "list",
+      "member": {
+        "shape": "MeshRef"
+      }
+    },
+    "MaxRetries": {
+      "type": "long",
+      "box": true,
+      "min": 0
+    },
+    "TlsValidationContextTrust": {
+      "type": "structure",
+      "members": {
+        "acm": {
+          "shape": "TlsValidationContextAcmTrust",
+          "documentation": "<p>A reference to an object that represents a TLS validation context trust for an AWS Certicate Manager (ACM) certificate.</p>"
+        },
+        "file": {
+          "shape": "TlsValidationContextFileTrust",
+          "documentation": "<p>An object that represents a TLS validation context trust for a local file.</p>"
+        }
+      },
+      "documentation": "<p>An object that represents a Transport Layer Security (TLS) validation context trust.</p>"
+    },
+    "PortMapping": {
+      "type": "structure",
+      "required": [
+        "port",
+        "protocol"
+      ],
+      "members": {
+        "port": {
+          "shape": "PortNumber",
+          "documentation": "<p>The port used for the port mapping.</p>"
+        },
+        "protocol": {
+          "shape": "PortProtocol",
+          "documentation": "<p>The protocol used for the port mapping. Specify one protocol.</p>"
+        }
+      },
+      "documentation": "<p>An object that represents a port mapping.</p>"
+    },
+    "ListVirtualServicesOutput": {
+      "type": "structure",
+      "required": [
+        "virtualServices"
+      ],
+      "members": {
+        "nextToken": {
+          "shape": "String",
+          "documentation": "<p>The <code>nextToken</code> value to include in a future <code>ListVirtualServices</code>\n         request. When the results of a <code>ListVirtualServices</code> request exceed\n            <code>limit</code>, you can use this value to retrieve the next page of results. This\n         value is <code>null</code> when there are no more results to return.</p>"
+        },
+        "virtualServices": {
+          "shape": "VirtualServiceList",
+          "documentation": "<p>The list of existing virtual services for the specified service mesh.</p>"
+        }
+      },
+      "documentation": ""
+    },
+    "AwsCloudMapInstanceAttributeValue": {
+      "type": "string",
+      "min": 1,
+      "max": 1024,
+      "pattern": "^([a-zA-Z0-9!-~][ ta-zA-Z0-9!-~]*){0,1}[a-zA-Z0-9!-~]{0,1}$"
+    },
+    "WeightedTarget": {
+      "type": "structure",
+      "required": [
+        "virtualNode",
+        "weight"
+      ],
+      "members": {
+        "virtualNode": {
+          "shape": "ResourceName",
+          "documentation": "<p>The virtual node to associate with the weighted target.</p>"
+        },
+        "weight": {
+          "shape": "PercentInt",
+          "documentation": "<p>The relative weight of the weighted target.</p>"
+        }
+      },
+      "documentation": "<p>An object that represents a target and its relative weight. Traffic is distributed across\n         targets according to their relative weight. For example, a weighted target with a relative\n         weight of 50 receives five times as much traffic as one with a relative weight of\n         10. The total weight for all targets combined must be less than or equal to 100.</p>"
+    },
+    "RouteRef": {
+      "type": "structure",
+      "required": [
+        "arn",
+        "meshName",
+        "meshOwner",
+        "resourceOwner",
+        "routeName",
+        "virtualRouterName"
+      ],
+      "members": {
+        "arn": {
+          "shape": "Arn",
+          "documentation": "<p>The full Amazon Resource Name (ARN) for the route.</p>"
+        },
+        "meshName": {
+          "shape": "ResourceName",
+          "documentation": "<p>The name of the service mesh that the route resides in.</p>"
+        },
+        "meshOwner": {
+          "shape": "AccountId",
+          "documentation": "<p>The AWS IAM account ID of the service mesh owner. If the account ID is not your own, then it's\n               the ID of the account that shared the mesh with your account. For more information about mesh sharing, see <a href=\"https://docs.aws.amazon.com/app-mesh/latest/userguide/sharing.html\">Working with Shared Meshes</a>.</p>"
+        },
+        "resourceOwner": {
+          "shape": "AccountId",
+          "documentation": "<p>The AWS IAM account ID of the resource owner. If the account ID is not your own, then it's\n               the ID of the mesh owner, or another account that the mesh is shared with. For more information about mesh sharing, see <a href=\"https://docs.aws.amazon.com/app-mesh/latest/userguide/sharing.html\">Working with Shared Meshes</a>.</p>"
+        },
+        "routeName": {
+          "shape": "ResourceName",
+          "documentation": "<p>The name of the route.</p>"
+        },
+        "virtualRouterName": {
+          "shape": "ResourceName",
+          "documentation": "<p>The virtual router that the route is associated with.</p>"
+        }
+      },
+      "documentation": "<p>An object that represents a route returned by a list operation.</p>"
+    },
+    "DeleteVirtualNodeInput": {
+      "type": "structure",
+      "required": [
+        "meshName",
+        "virtualNodeName"
+      ],
+      "members": {
+        "meshName": {
+          "shape": "ResourceName",
+          "documentation": "<p>The name of the service mesh to delete the virtual node in.</p>",
+          "location": "uri",
+          "locationName": "meshName"
+        },
+        "meshOwner": {
+          "shape": "AccountId",
+          "documentation": "<p>The AWS IAM account ID of the service mesh owner. If the account ID is not your own, then it's\n               the ID of the account that shared the mesh with your account. For more information about mesh sharing, see <a href=\"https://docs.aws.amazon.com/app-mesh/latest/userguide/sharing.html\">Working with Shared Meshes</a>.</p>",
+          "location": "querystring",
+          "locationName": "meshOwner"
+        },
+        "virtualNodeName": {
+          "shape": "ResourceName",
+          "documentation": "<p>The name of the virtual node to delete.</p>",
+          "location": "uri",
+          "locationName": "virtualNodeName"
+        }
+      },
+      "documentation": ""
+    },
+    "RouteData": {
+      "type": "structure",
+      "required": [
+        "meshName",
+        "metadata",
+        "routeName",
+        "spec",
+        "status",
+        "virtualRouterName"
+      ],
+      "members": {
+        "meshName": {
+          "shape": "ResourceName",
+          "documentation": "<p>The name of the service mesh that the route resides in.</p>"
+        },
+        "metadata": {
+          "shape": "ResourceMetadata",
+          "documentation": "<p>The associated metadata for the route.</p>"
+        },
+        "routeName": {
+          "shape": "ResourceName",
+          "documentation": "<p>The name of the route.</p>"
+        },
+        "spec": {
+          "shape": "RouteSpec",
+          "documentation": "<p>The specifications of the route.</p>"
+        },
+        "status": {
+          "shape": "RouteStatus",
+          "documentation": "<p>The status of the route.</p>"
+        },
+        "virtualRouterName": {
+          "shape": "ResourceName",
+          "documentation": "<p>The virtual router that the route is associated with.</p>"
+        }
+      },
+      "documentation": "<p>An object that represents a route returned by a describe operation.</p>"
+    },
+    "RouteStatusCode": {
+      "type": "string",
+      "enum": [
+        "ACTIVE",
+        "DELETED",
+        "INACTIVE"
+      ]
+    },
+    "InternalServerErrorException": {
+      "type": "structure",
+      "members": {
+        "message": {
+          "shape": "String"
+        }
+      },
+      "documentation": "<p>The request processing has failed because of an unknown error, exception, or\n         failure.</p>",
+      "exception": true,
+      "error": {
+        "code": "InternalServerErrorException",
+        "httpStatusCode": 500,
+        "fault": true
+      }
+    },
+    "HeaderName": {
+      "type": "string",
+      "min": 1,
+      "max": 50
+    },
+    "TagList": {
+      "type": "list",
+      "member": {
+        "shape": "TagRef"
+      },
+      "min": 0,
+      "max": 50
+    },
+    "GrpcRetryPolicyEvent": {
+      "type": "string",
+      "enum": [
+        "cancelled",
+        "deadline-exceeded",
+        "internal",
+        "resource-exhausted",
+        "unavailable"
+      ]
+    },
+    "TlsValidationContextAcmTrust": {
+      "type": "structure",
+      "required": [
+        "certificateAuthorityArns"
+      ],
+      "members": {
+        "certificateAuthorityArns": {
+          "shape": "CertificateAuthorityArns",
+          "documentation": "<p>One or more ACM Amazon Resource Name (ARN)s.</p>"
+        }
+      },
+      "documentation": "<p>An object that represents a TLS validation context trust for an AWS Certicate Manager (ACM) certificate.</p>"
+    },
+    "ForbiddenException": {
+      "type": "structure",
+      "members": {
+        "message": {
+          "shape": "String"
+        }
+      },
+      "documentation": "<p>You don't have permissions to perform this action.</p>",
+      "exception": true,
+      "error": {
+        "code": "ForbiddenException",
+        "httpStatusCode": 403,
+        "senderFault": true
+      }
+    },
+    "HeaderMatchMethod": {
+      "type": "structure",
+      "members": {
+        "exact": {
+          "shape": "HeaderMatch",
+          "documentation": "<p>The value sent by the client must match the specified value exactly.</p>"
+        },
+        "prefix": {
+          "shape": "HeaderMatch",
+          "documentation": "<p>The value sent by the client must begin with the specified characters.</p>"
+        },
+        "range": {
+          "shape": "MatchRange",
+          "documentation": "<p>An object that represents the range of values to match on.</p>"
+        },
+        "regex": {
+          "shape": "HeaderMatch",
+          "documentation": "<p>The value sent by the client must include the specified characters.</p>"
+        },
+        "suffix": {
+          "shape": "HeaderMatch",
+          "documentation": "<p>The value sent by the client must end with the specified characters.</p>"
+        }
+      },
+      "documentation": "<p>An object that represents the method and value to match with the header value sent in a\n         request. Specify one match method.</p>"
+    },
+    "DeleteMeshOutput": {
+      "type": "structure",
+      "required": [
+        "mesh"
+      ],
+      "members": {
+        "mesh": {
+          "shape": "MeshData",
+          "documentation": "<p>The service mesh that was deleted.</p>"
+        }
+      },
+      "documentation": "",
+      "payload": "mesh"
+    },
+    "EgressFilterType": {
+      "type": "string",
+      "enum": [
+        "ALLOW_ALL",
+        "DROP_ALL"
+      ]
+    },
+    "DurationValue": {
+      "type": "long",
+      "box": true,
+      "min": 0
+    },
+    "Hostname": {
+      "type": "string"
+    },
+    "TagResourceInput": {
+      "type": "structure",
+      "required": [
+        "resourceArn",
+        "tags"
+      ],
+      "members": {
+        "resourceArn": {
+          "shape": "Arn",
+          "documentation": "<p>The Amazon Resource Name (ARN) of the resource to add tags to.</p>",
+          "location": "querystring",
+          "locationName": "resourceArn"
+        },
+        "tags": {
+          "shape": "TagList",
+          "documentation": "<p>The tags to add to the resource. A tag is an array of key-value pairs.\n         Tag keys can have a maximum character length of 128 characters, and tag values can have\n            a maximum length of 256 characters.</p>"
+        }
+      },
+      "documentation": ""
+    },
+    "VirtualServiceProvider": {
+      "type": "structure",
+      "members": {
+        "virtualNode": {
+          "shape": "VirtualNodeServiceProvider",
+          "documentation": "<p>The virtual node associated with a virtual service.</p>"
+        },
+        "virtualRouter": {
+          "shape": "VirtualRouterServiceProvider",
+          "documentation": "<p>The virtual router associated with a virtual service.</p>"
+        }
+      },
+      "documentation": "<p>An object that represents the provider for a virtual service.</p>"
+    },
+    "GrpcRouteMatch": {
+      "type": "structure",
+      "members": {
+        "metadata": {
+          "shape": "GrpcRouteMetadataList",
+          "documentation": "<p>An object that represents the data to match from the request.</p>"
+        },
+        "methodName": {
+          "shape": "MethodName",
+          "documentation": "<p>The method name to match from the request. If you specify a name, you must also specify a <code>serviceName</code>.</p>"
+        },
+        "serviceName": {
+          "shape": "ServiceName",
+          "documentation": "<p>The fully qualified domain name for the service to match from the request.</p>"
+        }
+      },
+      "documentation": "<p>An object that represents the criteria for determining a request match.</p>"
+    },
+    "AwsCloudMapServiceDiscovery": {
+      "type": "structure",
+      "required": [
+        "namespaceName",
+        "serviceName"
+      ],
+      "members": {
+        "attributes": {
+          "shape": "AwsCloudMapInstanceAttributes",
+          "documentation": "<p>A string map that contains attributes with values that you can use to filter instances\n         by any custom attribute that you specified when you registered the instance. Only instances\n         that match all of the specified key/value pairs will be returned.</p>"
+        },
+        "namespaceName": {
+          "shape": "AwsCloudMapName",
+          "documentation": "<p>The name of the AWS Cloud Map namespace to use.</p>"
+        },
+        "serviceName": {
+          "shape": "AwsCloudMapName",
+          "documentation": "<p>The name of the AWS Cloud Map service to use.</p>"
+        }
+      },
+      "documentation": "<p>An object that represents the AWS Cloud Map service discovery information for your virtual\n         node.</p>"
+    },
+    "UpdateVirtualServiceOutput": {
+      "type": "structure",
+      "required": [
+        "virtualService"
+      ],
+      "members": {
+        "virtualService": {
+          "shape": "VirtualServiceData",
+          "documentation": "<p>A full description of the virtual service that was updated.</p>"
+        }
+      },
+      "documentation": "",
+      "payload": "virtualService"
+    },
+    "MeshStatus": {
+      "type": "structure",
+      "members": {
+        "status": {
+          "shape": "MeshStatusCode",
+          "documentation": "<p>The current mesh status.</p>"
+        }
+      },
+      "documentation": "<p>An object that represents the status of a service mesh.</p>"
+    },
+    "CreateVirtualNodeInput": {
+      "type": "structure",
+      "required": [
+        "meshName",
+        "spec",
+        "virtualNodeName"
+      ],
+      "members": {
+        "clientToken": {
+          "shape": "String",
+          "documentation": "<p>Unique, case-sensitive identifier that you provide to ensure the idempotency of the\nrequest. Up to 36 letters, numbers, hyphens, and underscores are allowed.</p>",
+          "idempotencyToken": true
+        },
+        "meshName": {
+          "shape": "ResourceName",
+          "documentation": "<p>The name of the service mesh to create the virtual node in.</p>",
+          "location": "uri",
+          "locationName": "meshName"
+        },
+        "meshOwner": {
+          "shape": "AccountId",
+          "documentation": "<p>The AWS IAM account ID of the service mesh owner. If the account ID is not your own, then\n               the account that you specify must share the mesh with your account before you can create \n             the resource in the service mesh. For more information about mesh sharing, see <a href=\"https://docs.aws.amazon.com/app-mesh/latest/userguide/sharing.html\">Working with Shared Meshes</a>.</p>",
+          "location": "querystring",
+          "locationName": "meshOwner"
+        },
+        "spec": {
+          "shape": "VirtualNodeSpec",
+          "documentation": "<p>The virtual node specification to apply.</p>"
+        },
+        "tags": {
+          "shape": "TagList",
+          "documentation": "<p>Optional metadata that you can apply to the virtual node to assist with categorization\n         and organization. Each tag consists of a key and an optional value, both of which you\n         define. Tag keys can have a maximum character length of 128 characters, and tag values can have\n            a maximum length of 256 characters.</p>",
+          "tags": [
+            "not-preview"
+          ]
+        },
+        "virtualNodeName": {
+          "shape": "ResourceName",
+          "documentation": "<p>The name to use for the virtual node.</p>"
+        }
+      },
+      "documentation": ""
+    },
+    "NotFoundException": {
+      "type": "structure",
+      "members": {
+        "message": {
+          "shape": "String"
+        }
+      },
+      "documentation": "<p>The specified resource doesn't exist. Check your request syntax and try again.</p>",
+      "exception": true,
+      "error": {
+        "code": "NotFoundException",
+        "httpStatusCode": 404,
+        "senderFault": true
+      }
+    },
+    "RouteSpec": {
+      "type": "structure",
+      "members": {
+        "grpcRoute": {
+          "shape": "GrpcRoute",
+          "documentation": "<p>An object that represents the specification of a gRPC route.</p>"
+        },
+        "http2Route": {
+          "shape": "HttpRoute",
+          "documentation": "<p>An object that represents the specification of an HTTP/2 route.</p>"
+        },
+        "httpRoute": {
+          "shape": "HttpRoute",
+          "documentation": "<p>An object that represents the specification of an HTTP route.</p>"
+        },
+        "priority": {
+          "shape": "RoutePriority",
+          "documentation": "<p>The priority for the route. Routes are matched based on the specified value, where 0 is\n         the highest priority.</p>"
+        },
+        "tcpRoute": {
+          "shape": "TcpRoute",
+          "documentation": "<p>An object that represents the specification of a TCP route.</p>"
+        }
+      },
+      "documentation": "<p>An object that represents a route specification. Specify one route type.</p>"
+    },
+    "CreateVirtualServiceOutput": {
+      "type": "structure",
+      "required": [
+        "virtualService"
+      ],
+      "members": {
+        "virtualService": {
+          "shape": "VirtualServiceData",
+          "documentation": "<p>The full description of your virtual service following the create call.</p>"
+        }
+      },
+      "documentation": "",
+      "payload": "virtualService"
+    },
+    "FileAccessLog": {
+      "type": "structure",
+      "required": [
+        "path"
+      ],
+      "members": {
+        "path": {
+          "shape": "FilePath",
+          "documentation": "<p>The file path to write access logs to. You can use <code>/dev/stdout</code> to send\n         access logs to standard out and configure your Envoy container to use a log driver, such as\n            <code>awslogs</code>, to export the access logs to a log storage service such as Amazon\n         CloudWatch Logs. You can also specify a path in the Envoy container's file system to write\n         the files to disk.</p>\n         <note>\n            <p>The Envoy process must have write permissions to the path that you specify here.\n            Otherwise, Envoy fails to bootstrap properly.</p>\n         </note>"
+        }
+      },
+      "documentation": "<p>An object that represents an access log file.</p>"
+    },
+    "VirtualRouterServiceProvider": {
+      "type": "structure",
+      "required": [
+        "virtualRouterName"
+      ],
+      "members": {
+        "virtualRouterName": {
+          "shape": "ResourceName",
+          "documentation": "<p>The name of the virtual router that is acting as a service provider.</p>"
+        }
+      },
+      "documentation": "<p>An object that represents a virtual node service provider.</p>"
+    },
+    "DeleteVirtualServiceInput": {
+      "type": "structure",
+      "required": [
+        "meshName",
+        "virtualServiceName"
+      ],
+      "members": {
+        "meshName": {
+          "shape": "ResourceName",
+          "documentation": "<p>The name of the service mesh to delete the virtual service in.</p>",
+          "location": "uri",
+          "locationName": "meshName"
+        },
+        "meshOwner": {
+          "shape": "AccountId",
+          "documentation": "<p>The AWS IAM account ID of the service mesh owner. If the account ID is not your own, then it's\n               the ID of the account that shared the mesh with your account. For more information about mesh sharing, see <a href=\"https://docs.aws.amazon.com/app-mesh/latest/userguide/sharing.html\">Working with Shared Meshes</a>.</p>",
+          "location": "querystring",
+          "locationName": "meshOwner"
+        },
+        "virtualServiceName": {
+          "shape": "ServiceName",
+          "documentation": "<p>The name of the virtual service to delete.</p>",
+          "location": "uri",
+          "locationName": "virtualServiceName"
+        }
+      },
+      "documentation": ""
+    },
+    "TlsValidationContext": {
+      "type": "structure",
+      "required": [
+        "trust"
+      ],
+      "members": {
+        "trust": {
+          "shape": "TlsValidationContextTrust",
+          "documentation": "<p>A reference to an object that represents a TLS validation context trust.</p>"
+        }
+      },
+      "documentation": "<p>An object that represents a Transport Layer Security (TLS) validation context.</p>"
+    },
+    "DeleteVirtualRouterOutput": {
+      "type": "structure",
+      "required": [
+        "virtualRouter"
+      ],
+      "members": {
+        "virtualRouter": {
+          "shape": "VirtualRouterData",
+          "documentation": "<p>The virtual router that was deleted.</p>"
+        }
+      },
+      "documentation": "",
+      "payload": "virtualRouter"
+    },
+    "TagsLimit": {
+      "type": "integer",
+      "box": true,
+      "min": 1,
+      "max": 50
+    },
+    "DeleteVirtualNodeOutput": {
+      "type": "structure",
+      "required": [
+        "virtualNode"
+      ],
+      "members": {
+        "virtualNode": {
+          "shape": "VirtualNodeData",
+          "documentation": "<p>The virtual node that was deleted.</p>"
+        }
+      },
+      "documentation": "",
+      "payload": "virtualNode"
+    },
     "UpdateVirtualNodeInput": {
       "type": "structure",
       "required": [
@@ -1115,6 +2511,12 @@
           "location": "uri",
           "locationName": "meshName"
         },
+        "meshOwner": {
+          "shape": "AccountId",
+          "documentation": "<p>The AWS IAM account ID of the service mesh owner. If the account ID is not your own, then it's\n               the ID of the account that shared the mesh with your account. For more information about mesh sharing, see <a href=\"https://docs.aws.amazon.com/app-mesh/latest/userguide/sharing.html\">Working with Shared Meshes</a>.</p>",
+          "location": "querystring",
+          "locationName": "meshOwner"
+        },
         "spec": {
           "shape": "VirtualNodeSpec",
           "documentation": "<p>The new virtual node specification to apply. This overwrites the existing data.</p>"
@@ -1128,6 +2530,24 @@
       },
       "documentation": ""
     },
+    "ListenerTls": {
+      "type": "structure",
+      "required": [
+        "certificate",
+        "mode"
+      ],
+      "members": {
+        "certificate": {
+          "shape": "ListenerTlsCertificate",
+          "documentation": "<p>A reference to an object that represents a listener's TLS certificate.</p>"
+        },
+        "mode": {
+          "shape": "ListenerTlsMode",
+          "documentation": "<p>Specify one of the following modes.</p>\n         <ul>\n            <li>\n               <p>\n                  <b/>STRICT – Listener only accepts connections with TLS enabled. </p>\n            </li>\n            <li>\n               <p>\n                  <b/>PERMISSIVE – Listener accepts connections with or without TLS enabled.</p>\n            </li>\n            <li>\n               <p>\n                  <b/>DISABLED –  Listener only accepts connections without TLS. </p>\n            </li>\n         </ul>"
+        }
+      },
+      "documentation": "<p>An object that represents the Transport Layer Security (TLS) properties for a listener.</p>"
+    },
     "DeleteMeshInput": {
       "type": "structure",
       "required": [
@@ -1170,13 +2590,22 @@
           "location": "uri",
           "locationName": "meshName"
         },
+        "meshOwner": {
+          "shape": "AccountId",
+          "documentation": "<p>The AWS IAM account ID of the service mesh owner. If the account ID is not your own, then\n               the account that you specify must share the mesh with your account before you can create \n             the resource in the service mesh. For more information about mesh sharing, see <a href=\"https://docs.aws.amazon.com/app-mesh/latest/userguide/sharing.html\">Working with Shared Meshes</a>.</p>",
+          "location": "querystring",
+          "locationName": "meshOwner"
+        },
         "spec": {
           "shape": "VirtualServiceSpec",
           "documentation": "<p>The virtual service specification to apply.</p>"
         },
         "tags": {
           "shape": "TagList",
-          "documentation": "<p>Optional metadata that you can apply to the virtual service to assist with\n         categorization and organization. Each tag consists of a key and an optional value, both of\n         which you define. Tag keys can have a maximum character length of 128 characters, and tag values can have\n            a maximum length of 256 characters.</p>"
+          "documentation": "<p>Optional metadata that you can apply to the virtual service to assist with\n         categorization and organization. Each tag consists of a key and an optional value, both of\n         which you define. Tag keys can have a maximum character length of 128 characters, and tag values can have\n            a maximum length of 256 characters.</p>",
+          "tags": [
+            "not-preview"
+          ]
         },
         "virtualServiceName": {
           "shape": "ServiceName",
@@ -1185,14 +2614,6 @@
       },
       "documentation": ""
     },
-    "VirtualRouterStatusCode": {
-      "type": "string",
-      "enum": [
-        "ACTIVE",
-        "DELETED",
-        "INACTIVE"
-      ]
-    },
     "UpdateVirtualRouterInput": {
       "type": "structure",
       "required": [
@@ -1212,6 +2633,12 @@
           "location": "uri",
           "locationName": "meshName"
         },
+        "meshOwner": {
+          "shape": "AccountId",
+          "documentation": "<p>The AWS IAM account ID of the service mesh owner. If the account ID is not your own, then it's\n               the ID of the account that shared the mesh with your account. For more information about mesh sharing, see <a href=\"https://docs.aws.amazon.com/app-mesh/latest/userguide/sharing.html\">Working with Shared Meshes</a>.</p>",
+          "location": "querystring",
+          "locationName": "meshOwner"
+        },
         "spec": {
           "shape": "VirtualRouterSpec",
           "documentation": "<p>The new virtual router specification to apply. This overwrites the existing data.</p>"
@@ -1225,44 +2652,6 @@
       },
       "documentation": ""
     },
-    "TagKeyList": {
-      "type": "list",
-      "member": {
-        "shape": "TagKey"
-      },
-      "min": 0,
-      "max": 50
-    },
-    "GrpcRetryPolicy": {
-      "type": "structure",
-      "required": [
-        "maxRetries",
-        "perRetryTimeout"
-      ],
-      "members": {
-        "grpcRetryEvents": {
-          "shape": "GrpcRetryPolicyEvents",
-          "documentation": "<p>Specify at least one of the valid values.</p>"
-        },
-        "httpRetryEvents": {
-          "shape": "HttpRetryPolicyEvents",
-          "documentation": "<p>Specify at least one of the following values.</p>\n         <ul>\n            <li>\n               <p>\n                  <b>server-error</b> – HTTP status codes 500, 501,\n                  502, 503, 504, 505, 506, 507, 508, 510, and 511</p>\n            </li>\n            <li>\n               <p>\n                  <b>gateway-error</b> – HTTP status codes 502,\n                  503, and 504</p>\n            </li>\n            <li>\n               <p>\n                  <b>client-error</b> – HTTP status code 409</p>\n            </li>\n            <li>\n               <p>\n                  <b>stream-error</b> – Retry on refused\n                  stream</p>\n            </li>\n         </ul>"
-        },
-        "maxRetries": {
-          "shape": "MaxRetries",
-          "documentation": "<p>The maximum number of retry attempts.</p>"
-        },
-        "perRetryTimeout": {
-          "shape": "Duration",
-          "documentation": "<p>An object that represents a duration of time.</p>"
-        },
-        "tcpRetryEvents": {
-          "shape": "TcpRetryPolicyEvents",
-          "documentation": "<p>Specify a valid value.</p>"
-        }
-      },
-      "documentation": "<p>An object that represents a retry policy. Specify at least one value for at least one of the types of <code>RetryEvents</code>, a value for <code>maxRetries</code>, and a value for <code>perRetryTimeout</code>.</p>"
-    },
     "ListTagsForResourceInput": {
       "type": "structure",
       "required": [
@@ -1288,31 +2677,7 @@
           "locationName": "resourceArn"
         }
       },
-      "documentation": ""
-    },
-    "CreateVirtualNodeOutput": {
-      "type": "structure",
-      "required": [
-        "virtualNode"
-      ],
-      "members": {
-        "virtualNode": {
-          "shape": "VirtualNodeData",
-          "documentation": "<p>The full description of your virtual node following the create call.</p>"
-        }
-      },
-      "documentation": "",
-      "payload": "virtualNode"
-    },
-    "Logging": {
-      "type": "structure",
-      "members": {
-        "accessLog": {
-          "shape": "AccessLog",
-          "documentation": "<p>The access log configuration for a virtual node.</p>"
-        }
-      },
-      "documentation": "<p>An object that represents the logging information for a virtual node.</p>"
+      "documentation": ""
     },
     "GrpcRetryPolicyEvents": {
       "type": "list",
@@ -1337,24 +2702,6 @@
         "fault": true
       }
     },
-    "Long": {
-      "type": "long",
-      "box": true
-    },
-    "UpdateVirtualRouterOutput": {
-      "type": "structure",
-      "required": [
-        "virtualRouter"
-      ],
-      "members": {
-        "virtualRouter": {
-          "shape": "VirtualRouterData",
-          "documentation": "<p>A full description of the virtual router that was updated.</p>"
-        }
-      },
-      "documentation": "",
-      "payload": "virtualRouter"
-    },
     "DescribeMeshOutput": {
       "type": "structure",
       "required": [
@@ -1382,6 +2729,12 @@
           "location": "uri",
           "locationName": "meshName"
         },
+        "meshOwner": {
+          "shape": "AccountId",
+          "documentation": "<p>The AWS IAM account ID of the service mesh owner. If the account ID is not your own, then it's\n               the ID of the account that shared the mesh with your account. For more information about mesh sharing, see <a href=\"https://docs.aws.amazon.com/app-mesh/latest/userguide/sharing.html\">Working with Shared Meshes</a>.</p>",
+          "location": "querystring",
+          "locationName": "meshOwner"
+        },
         "virtualRouterName": {
           "shape": "ResourceName",
           "documentation": "<p>The name of the virtual router to delete.</p>",
@@ -1391,23 +2744,6 @@
       },
       "documentation": ""
     },
-    "ListVirtualRoutersOutput": {
-      "type": "structure",
-      "required": [
-        "virtualRouters"
-      ],
-      "members": {
-        "nextToken": {
-          "shape": "String",
-          "documentation": "<p>The <code>nextToken</code> value to include in a future <code>ListVirtualRouters</code>\n         request. When the results of a <code>ListVirtualRouters</code> request exceed\n            <code>limit</code>, you can use this value to retrieve the next page of results. This\n         value is <code>null</code> when there are no more results to return.</p>"
-        },
-        "virtualRouters": {
-          "shape": "VirtualRouterList",
-          "documentation": "<p>The list of existing virtual routers for the specified service mesh.</p>"
-        }
-      },
-      "documentation": ""
-    },
     "DescribeRouteInput": {
       "type": "structure",
       "required": [
@@ -1422,6 +2758,12 @@
           "location": "uri",
           "locationName": "meshName"
         },
+        "meshOwner": {
+          "shape": "AccountId",
+          "documentation": "<p>The AWS IAM account ID of the service mesh owner. If the account ID is not your own, then it's\n               the ID of the account that shared the mesh with your account. For more information about mesh sharing, see <a href=\"https://docs.aws.amazon.com/app-mesh/latest/userguide/sharing.html\">Working with Shared Meshes</a>.</p>",
+          "location": "querystring",
+          "locationName": "meshOwner"
+        },
         "routeName": {
           "shape": "ResourceName",
           "documentation": "<p>The name of the route to describe.</p>",
@@ -1451,39 +2793,6 @@
       "documentation": "",
       "payload": "route"
     },
-    "ResourceMetadata": {
-      "type": "structure",
-      "required": [
-        "arn",
-        "createdAt",
-        "lastUpdatedAt",
-        "uid",
-        "version"
-      ],
-      "members": {
-        "arn": {
-          "shape": "Arn",
-          "documentation": "<p>The full Amazon Resource Name (ARN) for the resource.</p>"
-        },
-        "createdAt": {
-          "shape": "Timestamp",
-          "documentation": "<p>The Unix epoch timestamp in seconds for when the resource was created.</p>"
-        },
-        "lastUpdatedAt": {
-          "shape": "Timestamp",
-          "documentation": "<p>The Unix epoch timestamp in seconds for when the resource was last updated.</p>"
-        },
-        "uid": {
-          "shape": "String",
-          "documentation": "<p>The unique identifier for the resource.</p>"
-        },
-        "version": {
-          "shape": "Long",
-          "documentation": "<p>The version of the resource. Resources are created at version 1, and this version is\n         incremented each time that they're updated.</p>"
-        }
-      },
-      "documentation": "<p>An object that represents metadata for a resource.</p>"
-    },
     "Listeners": {
       "type": "list",
       "member": {
@@ -1496,23 +2805,6 @@
       "type": "list",
       "member": {
         "shape": "Backend"
-      },
-      "min": 0,
-      "max": 25
-    },
-    "ResourceInUseException": {
-      "type": "structure",
-      "members": {
-        "message": {
-          "shape": "String"
-        }
-      },
-      "documentation": "<p>You can't delete the specified resource because it's in use or required by another\n         resource.</p>",
-      "exception": true,
-      "error": {
-        "code": "ResourceInUseException",
-        "httpStatusCode": 409,
-        "senderFault": true
       }
     },
     "PortProtocol": {
@@ -1524,50 +2816,6 @@
         "tcp"
       ]
     },
-    "UpdateVirtualNodeOutput": {
-      "type": "structure",
-      "required": [
-        "virtualNode"
-      ],
-      "members": {
-        "virtualNode": {
-          "shape": "VirtualNodeData",
-          "documentation": "<p>A full description of the virtual node that was updated.</p>"
-        }
-      },
-      "documentation": "",
-      "payload": "virtualNode"
-    },
-    "ListRoutesOutput": {
-      "type": "structure",
-      "required": [
-        "routes"
-      ],
-      "members": {
-        "nextToken": {
-          "shape": "String",
-          "documentation": "<p>The <code>nextToken</code> value to include in a future <code>ListRoutes</code> request.\n         When the results of a <code>ListRoutes</code> request exceed <code>limit</code>, you can\n         use this value to retrieve the next page of results. This value is <code>null</code> when\n         there are no more results to return.</p>"
-        },
-        "routes": {
-          "shape": "RouteList",
-          "documentation": "<p>The list of existing routes for the specified service mesh and virtual router.</p>"
-        }
-      },
-      "documentation": ""
-    },
-    "VirtualServiceBackend": {
-      "type": "structure",
-      "required": [
-        "virtualServiceName"
-      ],
-      "members": {
-        "virtualServiceName": {
-          "shape": "ServiceName",
-          "documentation": "<p>The name of the virtual service that is acting as a virtual node backend.</p>"
-        }
-      },
-      "documentation": "<p>An object that represents a virtual service backend for a virtual node.</p>"
-    },
     "VirtualNodeStatusCode": {
       "type": "string",
       "enum": [
@@ -1579,21 +2827,6 @@
     "ServiceName": {
       "type": "string"
     },
-    "BadRequestException": {
-      "type": "structure",
-      "members": {
-        "message": {
-          "shape": "String"
-        }
-      },
-      "documentation": "<p>The request syntax was malformed. Check your request syntax and try again.</p>",
-      "exception": true,
-      "error": {
-        "code": "BadRequestException",
-        "httpStatusCode": 400,
-        "senderFault": true
-      }
-    },
     "UpdateVirtualServiceInput": {
       "type": "structure",
       "required": [
@@ -1613,6 +2846,12 @@
           "location": "uri",
           "locationName": "meshName"
         },
+        "meshOwner": {
+          "shape": "AccountId",
+          "documentation": "<p>The AWS IAM account ID of the service mesh owner. If the account ID is not your own, then it's\n               the ID of the account that shared the mesh with your account. For more information about mesh sharing, see <a href=\"https://docs.aws.amazon.com/app-mesh/latest/userguide/sharing.html\">Working with Shared Meshes</a>.</p>",
+          "location": "querystring",
+          "locationName": "meshOwner"
+        },
         "spec": {
           "shape": "VirtualServiceSpec",
           "documentation": "<p>The new virtual service specification to apply. This overwrites the existing\n         data.</p>"
@@ -1650,14 +2889,6 @@
       "min": 0,
       "max": 100
     },
-    "GrpcRouteMetadataList": {
-      "type": "list",
-      "member": {
-        "shape": "GrpcRouteMetadata"
-      },
-      "min": 1,
-      "max": 10
-    },
     "MethodName": {
       "type": "string",
       "min": 1,
@@ -1700,6 +2931,12 @@
           "location": "uri",
           "locationName": "meshName"
         },
+        "meshOwner": {
+          "shape": "AccountId",
+          "documentation": "<p>The AWS IAM account ID of the service mesh owner. If the account ID is not your own, then it's\n               the ID of the account that shared the mesh with your account. For more information about mesh sharing, see <a href=\"https://docs.aws.amazon.com/app-mesh/latest/userguide/sharing.html\">Working with Shared Meshes</a>.</p>",
+          "location": "querystring",
+          "locationName": "meshOwner"
+        },
         "nextToken": {
           "shape": "String",
           "documentation": "<p>The <code>nextToken</code> value returned from a previous paginated\n            <code>ListRoutes</code> request where <code>limit</code> was used and the results\n         exceeded the value of that parameter. Pagination continues from the end of the previous\n         results that returned the <code>nextToken</code> value.</p>",
@@ -1715,52 +2952,13 @@
       },
       "documentation": ""
     },
-    "HealthCheckPolicy": {
-      "type": "structure",
-      "required": [
-        "healthyThreshold",
-        "intervalMillis",
-        "protocol",
-        "timeoutMillis",
-        "unhealthyThreshold"
-      ],
-      "members": {
-        "healthyThreshold": {
-          "shape": "HealthCheckThreshold",
-          "documentation": "<p>The number of consecutive successful health checks that must occur before declaring\n         listener healthy.</p>"
-        },
-        "intervalMillis": {
-          "shape": "HealthCheckIntervalMillis",
-          "documentation": "<p>The time period in milliseconds between each health check execution.</p>"
-        },
-        "path": {
-          "shape": "String",
-          "documentation": "<p>The destination path for the health check request. This is required only if the\n         specified protocol is HTTP. If the protocol is TCP, this parameter is ignored.</p>"
-        },
-        "port": {
-          "shape": "PortNumber",
-          "documentation": "<p>The destination port for the health check request. This port must match the port defined\n         in the <a>PortMapping</a> for the listener.</p>"
-        },
-        "protocol": {
-          "shape": "PortProtocol",
-          "documentation": "<p>The protocol for the health check request.</p>"
-        },
-        "timeoutMillis": {
-          "shape": "HealthCheckTimeoutMillis",
-          "documentation": "<p>The amount of time to wait when receiving a response from the health check, in\n         milliseconds.</p>"
-        },
-        "unhealthyThreshold": {
-          "shape": "HealthCheckThreshold",
-          "documentation": "<p>The number of consecutive failed health checks that must occur before declaring a\n         virtual node unhealthy. </p>"
-        }
-      },
-      "documentation": "<p>An object that represents the health check policy for a virtual node's listener.</p>"
-    },
     "VirtualServiceRef": {
       "type": "structure",
       "required": [
         "arn",
         "meshName",
+        "meshOwner",
+        "resourceOwner",
         "virtualServiceName"
       ],
       "members": {
@@ -1772,6 +2970,14 @@
           "shape": "ResourceName",
           "documentation": "<p>The name of the service mesh that the virtual service resides in.</p>"
         },
+        "meshOwner": {
+          "shape": "AccountId",
+          "documentation": "<p>The AWS IAM account ID of the service mesh owner. If the account ID is not your own, then it's\n               the ID of the account that shared the mesh with your account. For more information about mesh sharing, see <a href=\"https://docs.aws.amazon.com/app-mesh/latest/userguide/sharing.html\">Working with Shared Meshes</a>.</p>"
+        },
+        "resourceOwner": {
+          "shape": "AccountId",
+          "documentation": "<p>The AWS IAM account ID of the resource owner. If the account ID is not your own, then it's\n               the ID of the mesh owner, or another account that the mesh is shared with. For more information about mesh sharing, see <a href=\"https://docs.aws.amazon.com/app-mesh/latest/userguide/sharing.html\">Working with Shared Meshes</a>.</p>"
+        },
         "virtualServiceName": {
           "shape": "ServiceName",
           "documentation": "<p>The name of the virtual service.</p>"
@@ -1779,25 +2985,6 @@
       },
       "documentation": "<p>An object that represents a virtual service returned by a list operation.</p>"
     },
-    "EgressFilter": {
-      "type": "structure",
-      "required": [
-        "type"
-      ],
-      "members": {
-        "type": {
-          "shape": "EgressFilterType",
-          "documentation": "<p>The egress filter type. By default, the type is <code>DROP_ALL</code>, which allows\n         egress only from virtual nodes to other defined resources in the service mesh (and any\n         traffic to <code>*.amazonaws.com</code> for AWS API calls). You can set the egress filter\n         type to <code>ALLOW_ALL</code> to allow egress to any endpoint inside or outside of the\n         service mesh.</p>"
-        }
-      },
-      "documentation": "<p>An object that represents the egress filter rules for a service mesh.</p>"
-    },
-    "VirtualServiceList": {
-      "type": "list",
-      "member": {
-        "shape": "VirtualServiceRef"
-      }
-    },
     "VirtualNodeStatus": {
       "type": "structure",
       "required": [
@@ -1816,6 +3003,8 @@
       "required": [
         "arn",
         "meshName",
+        "meshOwner",
+        "resourceOwner",
         "virtualRouterName"
       ],
       "members": {
@@ -1827,6 +3016,14 @@
           "shape": "ResourceName",
           "documentation": "<p>The name of the service mesh that the virtual router resides in.</p>"
         },
+        "meshOwner": {
+          "shape": "AccountId",
+          "documentation": "<p>The AWS IAM account ID of the service mesh owner. If the account ID is not your own, then it's\n               the ID of the account that shared the mesh with your account. For more information about mesh sharing, see <a href=\"https://docs.aws.amazon.com/app-mesh/latest/userguide/sharing.html\">Working with Shared Meshes</a>.</p>"
+        },
+        "resourceOwner": {
+          "shape": "AccountId",
+          "documentation": "<p>The AWS IAM account ID of the resource owner. If the account ID is not your own, then it's\n               the ID of the mesh owner, or another account that the mesh is shared with. For more information about mesh sharing, see <a href=\"https://docs.aws.amazon.com/app-mesh/latest/userguide/sharing.html\">Working with Shared Meshes</a>.</p>"
+        },
         "virtualRouterName": {
           "shape": "ResourceName",
           "documentation": "<p>The name of the virtual router.</p>"
@@ -1866,10 +3063,6 @@
       },
       "documentation": "<p>An object that represents a virtual service returned by a describe operation.</p>"
     },
-    "Boolean": {
-      "type": "boolean",
-      "box": true
-    },
     "HttpRouteHeader": {
       "type": "structure",
       "required": [
@@ -1877,38 +3070,19 @@
       ],
       "members": {
         "invert": {
-          "shape": "Boolean",
-          "documentation": "<p>Specify <code>True</code> to match anything except the match criteria. The default value is <code>False</code>.</p>"
-        },
-        "match": {
-          "shape": "HeaderMatchMethod",
-          "documentation": "<p>The <code>HeaderMatchMethod</code> object.</p>"
-        },
-        "name": {
-          "shape": "HeaderName",
-          "documentation": "<p>A name for the HTTP header in the client request that will be matched on.</p>"
-        }
-      },
-      "documentation": "<p>An object that represents the HTTP header in the request.</p>"
-    },
-    "HttpRetryPolicyEvent": {
-      "type": "string",
-      "min": 1,
-      "max": 25
-    },
-    "DescribeVirtualServiceOutput": {
-      "type": "structure",
-      "required": [
-        "virtualService"
-      ],
-      "members": {
-        "virtualService": {
-          "shape": "VirtualServiceData",
-          "documentation": "<p>The full description of your virtual service.</p>"
+          "shape": "Boolean",
+          "documentation": "<p>Specify <code>True</code> to match anything except the match criteria. The default value is <code>False</code>.</p>"
+        },
+        "match": {
+          "shape": "HeaderMatchMethod",
+          "documentation": "<p>The <code>HeaderMatchMethod</code> object.</p>"
+        },
+        "name": {
+          "shape": "HeaderName",
+          "documentation": "<p>A name for the HTTP header in the client request that will be matched on.</p>"
         }
       },
-      "documentation": "",
-      "payload": "virtualService"
+      "documentation": "<p>An object that represents the HTTP header in the request.</p>"
     },
     "FilePath": {
       "type": "string",
@@ -1926,6 +3100,8 @@
       "required": [
         "arn",
         "meshName",
+        "meshOwner",
+        "resourceOwner",
         "virtualNodeName"
       ],
       "members": {
@@ -1937,6 +3113,14 @@
           "shape": "ResourceName",
           "documentation": "<p>The name of the service mesh that the virtual node resides in.</p>"
         },
+        "meshOwner": {
+          "shape": "AccountId",
+          "documentation": "<p>The AWS IAM account ID of the service mesh owner. If the account ID is not your own, then it's\n               the ID of the account that shared the mesh with your account. For more information about mesh sharing, see <a href=\"https://docs.aws.amazon.com/app-mesh/latest/userguide/sharing.html\">Working with Shared Meshes</a>.</p>"
+        },
+        "resourceOwner": {
+          "shape": "AccountId",
+          "documentation": "<p>The AWS IAM account ID of the resource owner. If the account ID is not your own, then it's\n               the ID of the mesh owner, or another account that the mesh is shared with. For more information about mesh sharing, see <a href=\"https://docs.aws.amazon.com/app-mesh/latest/userguide/sharing.html\">Working with Shared Meshes</a>.</p>"
+        },
         "virtualNodeName": {
           "shape": "ResourceName",
           "documentation": "<p>The name of the virtual node.</p>"
@@ -1965,7 +3149,10 @@
         },
         "tags": {
           "shape": "TagList",
-          "documentation": "<p>Optional metadata that you can apply to the service mesh to assist with categorization\n         and organization. Each tag consists of a key and an optional value, both of which you\n         define. Tag keys can have a maximum character length of 128 characters, and tag values can have\n            a maximum length of 256 characters.</p>"
+          "documentation": "<p>Optional metadata that you can apply to the service mesh to assist with categorization\n         and organization. Each tag consists of a key and an optional value, both of which you\n         define. Tag keys can have a maximum character length of 128 characters, and tag values can have\n            a maximum length of 256 characters.</p>",
+          "tags": [
+            "not-preview"
+          ]
         }
       },
       "documentation": ""
@@ -1983,26 +3170,6 @@
       },
       "documentation": "<p>An object that represents the action to take if a match is determined.</p>"
     },
-    "DescribeVirtualNodeOutput": {
-      "type": "structure",
-      "required": [
-        "virtualNode"
-      ],
-      "members": {
-        "virtualNode": {
-          "shape": "VirtualNodeData",
-          "documentation": "<p>The full description of your virtual node.</p>"
-        }
-      },
-      "documentation": "",
-      "payload": "virtualNode"
-    },
-    "AwsCloudMapName": {
-      "type": "string",
-      "min": 1,
-      "max": 1024,
-      "pattern": "((?=^.{1,127}$)^([a-zA-Z0-9_][a-zA-Z0-9-_]{0,61}[a-zA-Z0-9_]|[a-zA-Z0-9])(.([a-zA-Z0-9_][a-zA-Z0-9-_]{0,61}[a-zA-Z0-9_]|[a-zA-Z0-9]))*$)|(^.$)"
-    },
     "LimitExceededException": {
       "type": "structure",
       "members": {
@@ -2031,20 +3198,6 @@
       "documentation": "",
       "payload": "mesh"
     },
-    "CreateRouteOutput": {
-      "type": "structure",
-      "required": [
-        "route"
-      ],
-      "members": {
-        "route": {
-          "shape": "RouteData",
-          "documentation": "<p>The full description of your mesh following the create call.</p>"
-        }
-      },
-      "documentation": "",
-      "payload": "route"
-    },
     "GrpcRouteMetadataMatchMethod": {
       "type": "structure",
       "members": {
@@ -2071,19 +3224,6 @@
       },
       "documentation": "<p>An object that represents the match method. Specify one of the match values.</p>"
     },
-    "DnsServiceDiscovery": {
-      "type": "structure",
-      "required": [
-        "hostname"
-      ],
-      "members": {
-        "hostname": {
-          "shape": "Hostname",
-          "documentation": "<p>Specifies the DNS service discovery hostname for the virtual node. </p>"
-        }
-      },
-      "documentation": "<p>An object that represents the DNS service discovery information for your virtual\n         node.</p>"
-    },
     "DescribeVirtualServiceInput": {
       "type": "structure",
       "required": [
@@ -2097,6 +3237,12 @@
           "location": "uri",
           "locationName": "meshName"
         },
+        "meshOwner": {
+          "shape": "AccountId",
+          "documentation": "<p>The AWS IAM account ID of the service mesh owner. If the account ID is not your own, then it's\n               the ID of the account that shared the mesh with your account. For more information about mesh sharing, see <a href=\"https://docs.aws.amazon.com/app-mesh/latest/userguide/sharing.html\">Working with Shared Meshes</a>.</p>",
+          "location": "querystring",
+          "locationName": "meshOwner"
+        },
         "virtualServiceName": {
           "shape": "ServiceName",
           "documentation": "<p>The name of the virtual service to describe.</p>",
@@ -2112,73 +3258,6 @@
       "min": 1,
       "max": 100
     },
-    "DeleteRouteInput": {
-      "type": "structure",
-      "required": [
-        "meshName",
-        "routeName",
-        "virtualRouterName"
-      ],
-      "members": {
-        "meshName": {
-          "shape": "ResourceName",
-          "documentation": "<p>The name of the service mesh to delete the route in.</p>",
-          "location": "uri",
-          "locationName": "meshName"
-        },
-        "routeName": {
-          "shape": "ResourceName",
-          "documentation": "<p>The name of the route to delete.</p>",
-          "location": "uri",
-          "locationName": "routeName"
-        },
-        "virtualRouterName": {
-          "shape": "ResourceName",
-          "documentation": "<p>The name of the virtual router to delete the route in.</p>",
-          "location": "uri",
-          "locationName": "virtualRouterName"
-        }
-      },
-      "documentation": ""
-    },
-    "VirtualNodeData": {
-      "type": "structure",
-      "required": [
-        "meshName",
-        "metadata",
-        "spec",
-        "status",
-        "virtualNodeName"
-      ],
-      "members": {
-        "meshName": {
-          "shape": "ResourceName",
-          "documentation": "<p>The name of the service mesh that the virtual node resides in.</p>"
-        },
-        "metadata": {
-          "shape": "ResourceMetadata",
-          "documentation": "<p>The associated metadata for the virtual node.</p>"
-        },
-        "spec": {
-          "shape": "VirtualNodeSpec",
-          "documentation": "<p>The specifications of the virtual node.</p>"
-        },
-        "status": {
-          "shape": "VirtualNodeStatus",
-          "documentation": "<p>The current status for the virtual node.</p>"
-        },
-        "virtualNodeName": {
-          "shape": "ResourceName",
-          "documentation": "<p>The name of the virtual node.</p>"
-        }
-      },
-      "documentation": "<p>An object that represents a virtual node returned by a describe operation.</p>"
-    },
-    "UntagResourceOutput": {
-      "type": "structure",
-      "members": { },
-      "documentation": ""
-    },
     "AwsCloudMapInstanceAttribute": {
       "type": "structure",
       "required": [
@@ -2197,12 +3276,6 @@
       },
       "documentation": "<p>An object that represents the AWS Cloud Map attribute information for your virtual\n         node.</p>"
     },
-    "TcpRetryPolicyEvent": {
-      "type": "string",
-      "enum": [
-        "connection-error"
-      ]
-    },
     "VirtualServiceSpec": {
       "type": "structure",
       "members": {
@@ -2213,16 +3286,6 @@
       },
       "documentation": "<p>An object that represents the specification of a virtual service.</p>"
     },
-    "Backend": {
-      "type": "structure",
-      "members": {
-        "virtualService": {
-          "shape": "VirtualServiceBackend",
-          "documentation": "<p>Specifies a virtual service to use as a backend for a virtual node. </p>"
-        }
-      },
-      "documentation": "<p>An object that represents the backends that a virtual node is expected to send outbound\n         traffic to. </p>"
-    },
     "MatchRange": {
       "type": "structure",
       "required": [
@@ -2259,24 +3322,6 @@
         "shape": "VirtualRouterRef"
       }
     },
-    "ListMeshesInput": {
-      "type": "structure",
-      "members": {
-        "limit": {
-          "shape": "ListMeshesLimit",
-          "documentation": "<p>The maximum number of results returned by <code>ListMeshes</code> in paginated output.\n         When you use this parameter, <code>ListMeshes</code> returns only <code>limit</code>\n         results in a single page along with a <code>nextToken</code> response element. You can see\n         the remaining results of the initial request by sending another <code>ListMeshes</code>\n         request with the returned <code>nextToken</code> value. This value can be between\n         1 and 100. If you don't use this parameter,\n            <code>ListMeshes</code> returns up to 100 results and a\n            <code>nextToken</code> value if applicable.</p>",
-          "location": "querystring",
-          "locationName": "limit"
-        },
-        "nextToken": {
-          "shape": "String",
-          "documentation": "<p>The <code>nextToken</code> value returned from a previous paginated\n            <code>ListMeshes</code> request where <code>limit</code> was used and the results\n         exceeded the value of that parameter. Pagination continues from the end of the previous\n         results that returned the <code>nextToken</code> value.</p> \n         <note>\n            <p>This token should be treated as an opaque identifier that is used only to\n                retrieve the next items in a list and not for other programmatic purposes.</p>\n        </note>",
-          "location": "querystring",
-          "locationName": "nextToken"
-        }
-      },
-      "documentation": ""
-    },
     "Arn": {
       "type": "string"
     },
@@ -2317,6 +3362,12 @@
           "location": "uri",
           "locationName": "meshName"
         },
+        "meshOwner": {
+          "shape": "AccountId",
+          "documentation": "<p>The AWS IAM account ID of the service mesh owner. If the account ID is not your own, then it's\n               the ID of the account that shared the mesh with your account. For more information about mesh sharing, see <a href=\"https://docs.aws.amazon.com/app-mesh/latest/userguide/sharing.html\">Working with Shared Meshes</a>.</p>",
+          "location": "querystring",
+          "locationName": "meshOwner"
+        },
         "nextToken": {
           "shape": "String",
           "documentation": "<p>The <code>nextToken</code> value returned from a previous paginated\n            <code>ListVirtualRouters</code> request where <code>limit</code> was used and the\n         results exceeded the value of that parameter. Pagination continues from the end of the\n         previous results that returned the <code>nextToken</code> value.</p>",
@@ -2326,63 +3377,6 @@
       },
       "documentation": ""
     },
-    "VirtualRouterData": {
-      "type": "structure",
-      "required": [
-        "meshName",
-        "metadata",
-        "spec",
-        "status",
-        "virtualRouterName"
-      ],
-      "members": {
-        "meshName": {
-          "shape": "ResourceName",
-          "documentation": "<p>The name of the service mesh that the virtual router resides in.</p>"
-        },
-        "metadata": {
-          "shape": "ResourceMetadata",
-          "documentation": "<p>The associated metadata for the virtual router.</p>"
-        },
-        "spec": {
-          "shape": "VirtualRouterSpec",
-          "documentation": "<p>The specifications of the virtual router.</p>"
-        },
-        "status": {
-          "shape": "VirtualRouterStatus",
-          "documentation": "<p>The current status of the virtual router.</p>"
-        },
-        "virtualRouterName": {
-          "shape": "ResourceName",
-          "documentation": "<p>The name of the virtual router.</p>"
-        }
-      },
-      "documentation": "<p>An object that represents a virtual router returned by a describe operation.</p>"
-    },
-    "UpdateMeshInput": {
-      "type": "structure",
-      "required": [
-        "meshName"
-      ],
-      "members": {
-        "clientToken": {
-          "shape": "String",
-          "documentation": "<p>Unique, case-sensitive identifier that you provide to ensure the idempotency of the\nrequest. Up to 36 letters, numbers, hyphens, and underscores are allowed.</p>",
-          "idempotencyToken": true
-        },
-        "meshName": {
-          "shape": "ResourceName",
-          "documentation": "<p>The name of the service mesh to update.</p>",
-          "location": "uri",
-          "locationName": "meshName"
-        },
-        "spec": {
-          "shape": "MeshSpec",
-          "documentation": "<p>The service mesh specification to apply.</p>"
-        }
-      },
-      "documentation": ""
-    },
     "DurationUnit": {
       "type": "string",
       "enum": [
@@ -2403,56 +3397,28 @@
       ],
       "members": {
         "limit": {
-          "shape": "ListVirtualServicesLimit",
-          "documentation": "<p>The maximum number of results returned by <code>ListVirtualServices</code> in paginated\n         output. When you use this parameter, <code>ListVirtualServices</code> returns only\n            <code>limit</code> results in a single page along with a <code>nextToken</code> response\n         element. You can see the remaining results of the initial request by sending another\n            <code>ListVirtualServices</code> request with the returned <code>nextToken</code> value.\n         This value can be between 1 and 100. If you don't use this\n         parameter, <code>ListVirtualServices</code> returns up to 100 results and\n         a <code>nextToken</code> value if applicable.</p>",
-          "location": "querystring",
-          "locationName": "limit"
-        },
-        "meshName": {
-          "shape": "ResourceName",
-          "documentation": "<p>The name of the service mesh to list virtual services in.</p>",
-          "location": "uri",
-          "locationName": "meshName"
-        },
-        "nextToken": {
-          "shape": "String",
-          "documentation": "<p>The <code>nextToken</code> value returned from a previous paginated\n            <code>ListVirtualServices</code> request where <code>limit</code> was used and the\n         results exceeded the value of that parameter. Pagination continues from the end of the\n         previous results that returned the <code>nextToken</code> value.</p>",
-          "location": "querystring",
-          "locationName": "nextToken"
-        }
-      },
-      "documentation": ""
-    },
-    "CreateVirtualRouterInput": {
-      "type": "structure",
-      "required": [
-        "meshName",
-        "spec",
-        "virtualRouterName"
-      ],
-      "members": {
-        "clientToken": {
-          "shape": "String",
-          "documentation": "<p>Unique, case-sensitive identifier that you provide to ensure the idempotency of the\nrequest. Up to 36 letters, numbers, hyphens, and underscores are allowed.</p>",
-          "idempotencyToken": true
+          "shape": "ListVirtualServicesLimit",
+          "documentation": "<p>The maximum number of results returned by <code>ListVirtualServices</code> in paginated\n         output. When you use this parameter, <code>ListVirtualServices</code> returns only\n            <code>limit</code> results in a single page along with a <code>nextToken</code> response\n         element. You can see the remaining results of the initial request by sending another\n            <code>ListVirtualServices</code> request with the returned <code>nextToken</code> value.\n         This value can be between 1 and 100. If you don't use this\n         parameter, <code>ListVirtualServices</code> returns up to 100 results and\n         a <code>nextToken</code> value if applicable.</p>",
+          "location": "querystring",
+          "locationName": "limit"
         },
         "meshName": {
           "shape": "ResourceName",
-          "documentation": "<p>The name of the service mesh to create the virtual router in.</p>",
+          "documentation": "<p>The name of the service mesh to list virtual services in.</p>",
           "location": "uri",
           "locationName": "meshName"
         },
-        "spec": {
-          "shape": "VirtualRouterSpec",
-          "documentation": "<p>The virtual router specification to apply.</p>"
-        },
-        "tags": {
-          "shape": "TagList",
-          "documentation": "<p>Optional metadata that you can apply to the virtual router to assist with categorization\n         and organization. Each tag consists of a key and an optional value, both of which you\n         define. Tag keys can have a maximum character length of 128 characters, and tag values can have\n            a maximum length of 256 characters.</p>"
+        "meshOwner": {
+          "shape": "AccountId",
+          "documentation": "<p>The AWS IAM account ID of the service mesh owner. If the account ID is not your own, then it's\n               the ID of the account that shared the mesh with your account. For more information about mesh sharing, see <a href=\"https://docs.aws.amazon.com/app-mesh/latest/userguide/sharing.html\">Working with Shared Meshes</a>.</p>",
+          "location": "querystring",
+          "locationName": "meshOwner"
         },
-        "virtualRouterName": {
-          "shape": "ResourceName",
-          "documentation": "<p>The name to use for the virtual router.</p>"
+        "nextToken": {
+          "shape": "String",
+          "documentation": "<p>The <code>nextToken</code> value returned from a previous paginated\n            <code>ListVirtualServices</code> request where <code>limit</code> was used and the\n         results exceeded the value of that parameter. Pagination continues from the end of the\n         previous results that returned the <code>nextToken</code> value.</p>",
+          "location": "querystring",
+          "locationName": "nextToken"
         }
       },
       "documentation": ""
@@ -2485,6 +3451,12 @@
           "location": "uri",
           "locationName": "meshName"
         },
+        "meshOwner": {
+          "shape": "AccountId",
+          "documentation": "<p>The AWS IAM account ID of the service mesh owner. If the account ID is not your own, then it's\n               the ID of the account that shared the mesh with your account. For more information about mesh sharing, see <a href=\"https://docs.aws.amazon.com/app-mesh/latest/userguide/sharing.html\">Working with Shared Meshes</a>.</p>",
+          "location": "querystring",
+          "locationName": "meshOwner"
+        },
         "nextToken": {
           "shape": "String",
           "documentation": "<p>The <code>nextToken</code> value returned from a previous paginated\n            <code>ListVirtualNodes</code> request where <code>limit</code> was used and the results\n         exceeded the value of that parameter. Pagination continues from the end of the previous\n         results that returned the <code>nextToken</code> value.</p>",
@@ -2494,69 +3466,6 @@
       },
       "documentation": ""
     },
-    "DescribeVirtualRouterOutput": {
-      "type": "structure",
-      "required": [
-        "virtualRouter"
-      ],
-      "members": {
-        "virtualRouter": {
-          "shape": "VirtualRouterData",
-          "documentation": "<p>The full description of your virtual router.</p>"
-        }
-      },
-      "documentation": "",
-      "payload": "virtualRouter"
-    },
-    "CreateMeshOutput": {
-      "type": "structure",
-      "required": [
-        "mesh"
-      ],
-      "members": {
-        "mesh": {
-          "shape": "MeshData",
-          "documentation": "<p>The full description of your service mesh following the create call.</p>"
-        }
-      },
-      "documentation": "",
-      "payload": "mesh"
-    },
-    "CreateVirtualRouterOutput": {
-      "type": "structure",
-      "required": [
-        "virtualRouter"
-      ],
-      "members": {
-        "virtualRouter": {
-          "shape": "VirtualRouterData",
-          "documentation": "<p>The full description of your virtual router following the create call.</p>"
-        }
-      },
-      "documentation": "",
-      "payload": "virtualRouter"
-    },
-    "VirtualServiceStatus": {
-      "type": "structure",
-      "required": [
-        "status"
-      ],
-      "members": {
-        "status": {
-          "shape": "VirtualServiceStatusCode",
-          "documentation": "<p>The current status of the virtual service.</p>"
-        }
-      },
-      "documentation": "<p>An object that represents the status of a virtual service.</p>"
-    },
-    "HttpRetryPolicyEvents": {
-      "type": "list",
-      "member": {
-        "shape": "HttpRetryPolicyEvent"
-      },
-      "min": 1,
-      "max": 25
-    },
     "ListVirtualNodesLimit": {
       "type": "integer",
       "box": true,
@@ -2569,33 +3478,11 @@
       "min": 2000,
       "max": 60000
     },
-    "ListMeshesLimit": {
-      "type": "integer",
-      "box": true,
-      "min": 1,
-      "max": 100
-    },
     "ResourceName": {
       "type": "string",
       "min": 1,
       "max": 255
     },
-    "AwsCloudMapInstanceAttributeKey": {
-      "type": "string",
-      "min": 1,
-      "max": 255,
-      "pattern": "^[a-zA-Z0-9!-~]+$"
-    },
-    "VirtualRouterSpec": {
-      "type": "structure",
-      "members": {
-        "listeners": {
-          "shape": "VirtualRouterListeners",
-          "documentation": "<p>The listeners that the virtual router is expected to receive inbound traffic from.\n         You can specify one listener.</p>"
-        }
-      },
-      "documentation": "<p>An object that represents the specification of a virtual router.</p>"
-    },
     "TooManyRequestsException": {
       "type": "structure",
       "members": {
@@ -2619,66 +3506,10 @@
       "min": 1,
       "max": 255
     },
-    "VirtualNodeSpec": {
-      "type": "structure",
-      "members": {
-        "backends": {
-          "shape": "Backends",
-          "documentation": "<p>The backends that the virtual node is expected to send outbound traffic to.</p>"
-        },
-        "listeners": {
-          "shape": "Listeners",
-          "documentation": "<p>The listeners that the virtual node is expected to receive inbound traffic from.\n         You can specify one listener.</p>"
-        },
-        "logging": {
-          "shape": "Logging",
-          "documentation": "<p>The inbound and outbound access logging information for the virtual node.</p>"
-        },
-        "serviceDiscovery": {
-          "shape": "ServiceDiscovery",
-          "documentation": "<p>The service discovery information for the virtual node. If your virtual node does not\n         expect ingress traffic, you can omit this parameter.</p>"
-        }
-      },
-      "documentation": "<p>An object that represents the specification of a virtual node.</p>"
-    },
-    "ListMeshesOutput": {
-      "type": "structure",
-      "required": [
-        "meshes"
-      ],
-      "members": {
-        "meshes": {
-          "shape": "MeshList",
-          "documentation": "<p>The list of existing service meshes.</p>"
-        },
-        "nextToken": {
-          "shape": "String",
-          "documentation": "<p>The <code>nextToken</code> value to include in a future <code>ListMeshes</code> request.\n         When the results of a <code>ListMeshes</code> request exceed <code>limit</code>, you can\n         use this value to retrieve the next page of results. This value is <code>null</code> when\n         there are no more results to return.</p>"
-        }
-      },
-      "documentation": ""
-    },
-    "VirtualRouterListeners": {
-      "type": "list",
-      "member": {
-        "shape": "VirtualRouterListener"
-      },
-      "min": 1,
-      "max": 1
-    },
-    "HttpMethod": {
+    "AccountId": {
       "type": "string",
-      "enum": [
-        "CONNECT",
-        "DELETE",
-        "GET",
-        "HEAD",
-        "OPTIONS",
-        "PATCH",
-        "POST",
-        "PUT",
-        "TRACE"
-      ]
+      "min": 12,
+      "max": 12
     },
     "Duration": {
       "type": "structure",
@@ -2694,21 +3525,6 @@
       },
       "documentation": "<p>An object that represents a duration of time.</p>"
     },
-    "ConflictException": {
-      "type": "structure",
-      "members": {
-        "message": {
-          "shape": "String"
-        }
-      },
-      "documentation": "<p>The request contains a client token that was used for a previous update resource call\n         with different specifications. Try the request again with a new client token.</p>",
-      "exception": true,
-      "error": {
-        "code": "ConflictException",
-        "httpStatusCode": 409,
-        "senderFault": true
-      }
-    },
     "DescribeRouteOutput": {
       "type": "structure",
       "required": [
@@ -2748,12 +3564,6 @@
       },
       "documentation": "<p>An object that represents the requirements for a route to match HTTP requests for a virtual\n         router.</p>"
     },
-    "MeshList": {
-      "type": "list",
-      "member": {
-        "shape": "MeshRef"
-      }
-    },
     "TagRef": {
       "type": "structure",
       "required": [
@@ -2775,7 +3585,9 @@
       "type": "structure",
       "required": [
         "arn",
-        "meshName"
+        "meshName",
+        "meshOwner",
+        "resourceOwner"
       ],
       "members": {
         "arn": {
@@ -2785,15 +3597,18 @@
         "meshName": {
           "shape": "ResourceName",
           "documentation": "<p>The name of the service mesh.</p>"
+        },
+        "meshOwner": {
+          "shape": "AccountId",
+          "documentation": "<p>The AWS IAM account ID of the service mesh owner. If the account ID is not your own, then it's\n               the ID of the account that shared the mesh with your account. For more information about mesh sharing, see <a href=\"https://docs.aws.amazon.com/app-mesh/latest/userguide/sharing.html\">Working with Shared Meshes</a>.</p>"
+        },
+        "resourceOwner": {
+          "shape": "AccountId",
+          "documentation": "<p>The AWS IAM account ID of the resource owner. If the account ID is not your own, then it's\n               the ID of the mesh owner, or another account that the mesh is shared with. For more information about mesh sharing, see <a href=\"https://docs.aws.amazon.com/app-mesh/latest/userguide/sharing.html\">Working with Shared Meshes</a>.</p>"
         }
       },
       "documentation": "<p>An object that represents a service mesh returned by a list operation.</p>"
     },
-    "MaxRetries": {
-      "type": "long",
-      "box": true,
-      "min": 0
-    },
     "MeshStatusCode": {
       "type": "string",
       "enum": [
@@ -2802,24 +3617,6 @@
         "INACTIVE"
       ]
     },
-    "PortMapping": {
-      "type": "structure",
-      "required": [
-        "port",
-        "protocol"
-      ],
-      "members": {
-        "port": {
-          "shape": "PortNumber",
-          "documentation": "<p>The port used for the port mapping.</p>"
-        },
-        "protocol": {
-          "shape": "PortProtocol",
-          "documentation": "<p>The protocol used for the port mapping. Specify one protocol.</p>"
-        }
-      },
-      "documentation": "<p>An object that represents a port mapping.</p>"
-    },
     "MeshData": {
       "type": "structure",
       "required": [
@@ -2840,67 +3637,26 @@
         "spec": {
           "shape": "MeshSpec",
           "documentation": "<p>The associated specification for the service mesh.</p>"
-        },
-        "status": {
-          "shape": "MeshStatus",
-          "documentation": "<p>The status of the service mesh.</p>"
-        }
-      },
-      "documentation": "<p>An object that represents a service mesh returned by a describe operation.</p>"
-    },
-    "VirtualRouterStatus": {
-      "type": "structure",
-      "required": [
-        "status"
-      ],
-      "members": {
-        "status": {
-          "shape": "VirtualRouterStatusCode",
-          "documentation": "<p>The current status of the virtual router.</p>"
-        }
-      },
-      "documentation": "<p>An object that represents the status of a virtual router. </p>"
-    },
-    "ListVirtualServicesOutput": {
-      "type": "structure",
-      "required": [
-        "virtualServices"
-      ],
-      "members": {
-        "nextToken": {
-          "shape": "String",
-          "documentation": "<p>The <code>nextToken</code> value to include in a future <code>ListVirtualServices</code>\n         request. When the results of a <code>ListVirtualServices</code> request exceed\n            <code>limit</code>, you can use this value to retrieve the next page of results. This\n         value is <code>null</code> when there are no more results to return.</p>"
-        },
-        "virtualServices": {
-          "shape": "VirtualServiceList",
-          "documentation": "<p>The list of existing virtual services for the specified service mesh.</p>"
-        }
-      },
-      "documentation": ""
-    },
-    "AwsCloudMapInstanceAttributeValue": {
-      "type": "string",
-      "min": 1,
-      "max": 1024,
-      "pattern": "^([a-zA-Z0-9!-~][ ta-zA-Z0-9!-~]*){0,1}[a-zA-Z0-9!-~]{0,1}$"
+        },
+        "status": {
+          "shape": "MeshStatus",
+          "documentation": "<p>The status of the service mesh.</p>"
+        }
+      },
+      "documentation": "<p>An object that represents a service mesh returned by a describe operation.</p>"
     },
-    "WeightedTarget": {
+    "VirtualRouterStatus": {
       "type": "structure",
       "required": [
-        "virtualNode",
-        "weight"
+        "status"
       ],
       "members": {
-        "virtualNode": {
-          "shape": "ResourceName",
-          "documentation": "<p>The virtual node to associate with the weighted target.</p>"
-        },
-        "weight": {
-          "shape": "PercentInt",
-          "documentation": "<p>The relative weight of the weighted target.</p>"
+        "status": {
+          "shape": "VirtualRouterStatusCode",
+          "documentation": "<p>The current status of the virtual router.</p>"
         }
       },
-      "documentation": "<p>An object that represents a target and its relative weight. Traffic is distributed across\n         targets according to their relative weight. For example, a weighted target with a relative\n         weight of 50 receives five times as much traffic as one with a relative weight of\n         10. The total weight for all targets combined must be less than or equal to 100.</p>"
+      "documentation": "<p>An object that represents the status of a virtual router. </p>"
     },
     "TcpRouteAction": {
       "type": "structure",
@@ -2928,6 +3684,12 @@
           "location": "uri",
           "locationName": "meshName"
         },
+        "meshOwner": {
+          "shape": "AccountId",
+          "documentation": "<p>The AWS IAM account ID of the service mesh owner. If the account ID is not your own, then it's\n               the ID of the account that shared the mesh with your account. For more information about mesh sharing, see <a href=\"https://docs.aws.amazon.com/app-mesh/latest/userguide/sharing.html\">Working with Shared Meshes</a>.</p>",
+          "location": "querystring",
+          "locationName": "meshOwner"
+        },
         "virtualNodeName": {
           "shape": "ResourceName",
           "documentation": "<p>The name of the virtual node to describe.</p>",
@@ -2950,34 +3712,6 @@
       },
       "documentation": "<p>An object that represents the current status of a route.</p>"
     },
-    "RouteRef": {
-      "type": "structure",
-      "required": [
-        "arn",
-        "meshName",
-        "routeName",
-        "virtualRouterName"
-      ],
-      "members": {
-        "arn": {
-          "shape": "Arn",
-          "documentation": "<p>The full Amazon Resource Name (ARN) for the route.</p>"
-        },
-        "meshName": {
-          "shape": "ResourceName",
-          "documentation": "<p>The name of the service mesh that the route resides in.</p>"
-        },
-        "routeName": {
-          "shape": "ResourceName",
-          "documentation": "<p>The name of the route.</p>"
-        },
-        "virtualRouterName": {
-          "shape": "ResourceName",
-          "documentation": "<p>The virtual router that the route is associated with.</p>"
-        }
-      },
-      "documentation": "<p>An object that represents a route returned by a list operation.</p>"
-    },
     "Listener": {
       "type": "structure",
       "required": [
@@ -2991,6 +3725,10 @@
         "portMapping": {
           "shape": "PortMapping",
           "documentation": "<p>The port mapping information for the listener.</p>"
+        },
+        "tls": {
+          "shape": "ListenerTls",
+          "documentation": "<p>A reference to an object that represents the Transport Layer Security (TLS) properties for a listener.</p>"
         }
       },
       "documentation": "<p>An object that represents a listener for a virtual node.</p>"
@@ -3015,81 +3753,35 @@
           "documentation": "<p>An object that represents a retry policy.</p>"
         }
       },
-      "documentation": "<p>An object that represents a GRPC route type.</p>"
+      "documentation": "<p>An object that represents a gRPC route type.</p>"
     },
-    "DeleteVirtualNodeInput": {
-      "type": "structure",
-      "required": [
-        "meshName",
-        "virtualNodeName"
-      ],
-      "members": {
-        "meshName": {
-          "shape": "ResourceName",
-          "documentation": "<p>The name of the service mesh to delete the virtual node in.</p>",
-          "location": "uri",
-          "locationName": "meshName"
-        },
-        "virtualNodeName": {
-          "shape": "ResourceName",
-          "documentation": "<p>The name of the virtual node to delete.</p>",
-          "location": "uri",
-          "locationName": "virtualNodeName"
-        }
-      },
-      "documentation": ""
+    "ListRoutesLimit": {
+      "type": "integer",
+      "box": true,
+      "min": 1,
+      "max": 100
     },
-    "RouteData": {
+    "ClientPolicyTls": {
       "type": "structure",
       "required": [
-        "meshName",
-        "metadata",
-        "routeName",
-        "spec",
-        "status",
-        "virtualRouterName"
+        "validation"
       ],
       "members": {
-        "meshName": {
-          "shape": "ResourceName",
-          "documentation": "<p>The name of the service mesh that the route resides in.</p>"
-        },
-        "metadata": {
-          "shape": "ResourceMetadata",
-          "documentation": "<p>The associated metadata for the route.</p>"
-        },
-        "routeName": {
-          "shape": "ResourceName",
-          "documentation": "<p>The name of the route.</p>"
-        },
-        "spec": {
-          "shape": "RouteSpec",
-          "documentation": "<p>The specifications of the route.</p>"
+        "enforce": {
+          "shape": "Boolean",
+          "box": true,
+          "documentation": "<p>Whether the policy is enforced. The default is <code>True</code>, if a value isn't specified.</p>"
         },
-        "status": {
-          "shape": "RouteStatus",
-          "documentation": "<p>The status of the route.</p>"
+        "ports": {
+          "shape": "PortSet",
+          "documentation": "<p>The range of ports that the policy is enforced for.</p>"
         },
-        "virtualRouterName": {
-          "shape": "ResourceName",
-          "documentation": "<p>The virtual router that the route is associated with.</p>"
+        "validation": {
+          "shape": "TlsValidationContext",
+          "documentation": "<p>A reference to an object that represents a TLS validation context.</p>"
         }
       },
-      "documentation": "<p>An object that represents a route returned by a describe operation.</p>"
-    },
-    "RouteStatusCode": {
-      "type": "string",
-      "enum": [
-        "ACTIVE",
-        "DELETED",
-        "INACTIVE"
-      ]
-    },
-    "ListRoutesLimit": {
-      "type": "integer",
-      "box": true,
-      "min": 1,
-      "max": 100
+      "documentation": "<p>An object that represents a Transport Layer Security (TLS) client policy.</p>"
     },
     "DeleteVirtualServiceOutput": {
       "type": "structure",
@@ -3118,43 +3810,33 @@
       },
       "documentation": "<p>An object that represents a virtual node service provider.</p>"
     },
-    "InternalServerErrorException": {
+    "BackendDefaults": {
       "type": "structure",
       "members": {
-        "message": {
-          "shape": "String"
+        "clientPolicy": {
+          "shape": "ClientPolicy",
+          "documentation": "<p>A reference to an object that represents a client policy.</p>"
         }
       },
-      "documentation": "<p>The request processing has failed because of an unknown error, exception, or\n         failure.</p>",
-      "exception": true,
-      "error": {
-        "code": "InternalServerErrorException",
-        "httpStatusCode": 500,
-        "fault": true
-      }
-    },
-    "HeaderName": {
-      "type": "string",
-      "min": 1,
-      "max": 50
+      "documentation": "<p>An object that represents the default properties for a backend.</p>"
     },
-    "TagList": {
-      "type": "list",
-      "member": {
-        "shape": "TagRef"
+    "ListenerTlsFileCertificate": {
+      "type": "structure",
+      "required": [
+        "certificateChain",
+        "privateKey"
+      ],
+      "members": {
+        "certificateChain": {
+          "shape": "FilePath",
+          "documentation": "<p>The certificate chain for the certificate.</p>"
+        },
+        "privateKey": {
+          "shape": "FilePath",
+          "documentation": "<p>The private key for a certificate stored on the file system of the virtual node that the proxy is running on.</p>"
+        }
       },
-      "min": 0,
-      "max": 50
-    },
-    "GrpcRetryPolicyEvent": {
-      "type": "string",
-      "enum": [
-        "cancelled",
-        "deadline-exceeded",
-        "internal",
-        "resource-exhausted",
-        "unavailable"
-      ]
+      "documentation": "<p>An object that represents a local file certificate. The certificate must meet specific requirements and you must have proxy authorization enabled. For more information, see <a href=\"https://docs.aws.amazon.com/app-mesh/latest/userguide/virtual-node-tls.html#virtual-node-tls-prerequisites\">Transport Layer Security (TLS)</a>.</p>"
     },
     "HttpRetryPolicy": {
       "type": "structure",
@@ -3195,6 +3877,12 @@
           "location": "uri",
           "locationName": "meshName"
         },
+        "meshOwner": {
+          "shape": "AccountId",
+          "documentation": "<p>The AWS IAM account ID of the service mesh owner. If the account ID is not your own, then it's\n               the ID of the account that shared the mesh with your account. For more information about mesh sharing, see <a href=\"https://docs.aws.amazon.com/app-mesh/latest/userguide/sharing.html\">Working with Shared Meshes</a>.</p>",
+          "location": "querystring",
+          "locationName": "meshOwner"
+        },
         "virtualRouterName": {
           "shape": "ResourceName",
           "documentation": "<p>The name of the virtual router to describe.</p>",
@@ -3215,21 +3903,6 @@
         "shape": "RouteRef"
       }
     },
-    "ForbiddenException": {
-      "type": "structure",
-      "members": {
-        "message": {
-          "shape": "String"
-        }
-      },
-      "documentation": "<p>You don't have permissions to perform this action.</p>",
-      "exception": true,
-      "error": {
-        "code": "ForbiddenException",
-        "httpStatusCode": 403,
-        "senderFault": true
-      }
-    },
     "TooManyTagsException": {
       "type": "structure",
       "members": {
@@ -3245,85 +3918,23 @@
         "senderFault": true
       }
     },
-    "HeaderMatchMethod": {
-      "type": "structure",
-      "members": {
-        "exact": {
-          "shape": "HeaderMatch",
-          "documentation": "<p>The value sent by the client must match the specified value exactly.</p>"
-        },
-        "prefix": {
-          "shape": "HeaderMatch",
-          "documentation": "<p>The value sent by the client must begin with the specified characters.</p>"
-        },
-        "range": {
-          "shape": "MatchRange",
-          "documentation": "<p>An object that represents the range of values to match on.</p>"
-        },
-        "regex": {
-          "shape": "HeaderMatch",
-          "documentation": "<p>The value sent by the client must include the specified characters.</p>"
-        },
-        "suffix": {
-          "shape": "HeaderMatch",
-          "documentation": "<p>The value sent by the client must end with the specified characters.</p>"
-        }
-      },
-      "documentation": "<p>An object that represents the method and value to match with the header value sent in a\n         request. Specify one match method.</p>"
-    },
-    "DeleteMeshOutput": {
-      "type": "structure",
-      "required": [
-        "mesh"
-      ],
-      "members": {
-        "mesh": {
-          "shape": "MeshData",
-          "documentation": "<p>The service mesh that was deleted.</p>"
-        }
-      },
-      "documentation": "",
-      "payload": "mesh"
-    },
-    "EgressFilterType": {
-      "type": "string",
-      "enum": [
-        "ALLOW_ALL",
-        "DROP_ALL"
-      ]
-    },
-    "DurationValue": {
-      "type": "long",
-      "box": true,
-      "min": 0
-    },
-    "Hostname": {
-      "type": "string"
-    },
     "PortNumber": {
-      "type": "integer",
-      "min": 1,
-      "max": 65535
-    },
-    "TagResourceInput": {
-      "type": "structure",
-      "required": [
-        "resourceArn",
-        "tags"
-      ],
-      "members": {
-        "resourceArn": {
-          "shape": "Arn",
-          "documentation": "<p>The Amazon Resource Name (ARN) of the resource to add tags to.</p>",
-          "location": "querystring",
-          "locationName": "resourceArn"
-        },
-        "tags": {
-          "shape": "TagList",
-          "documentation": "<p>The tags to add to the resource. A tag is an array of key-value pairs.\n         Tag keys can have a maximum character length of 128 characters, and tag values can have\n            a maximum length of 256 characters.</p>"
+      "type": "integer",
+      "min": 1,
+      "max": 65535
+    },
+    "TlsValidationContextFileTrust": {
+      "type": "structure",
+      "required": [
+        "certificateChain"
+      ],
+      "members": {
+        "certificateChain": {
+          "shape": "FilePath",
+          "documentation": "<p>The certificate trust chain for a certificate stored on the file system of the virtual node that the proxy is running on.</p>"
         }
       },
-      "documentation": ""
+      "documentation": "<p>An object that represents a Transport Layer Security (TLS) validation context trust for a local file.</p>"
     },
     "GrpcRouteMetadata": {
       "type": "structure",
@@ -3366,6 +3977,12 @@
           "location": "uri",
           "locationName": "meshName"
         },
+        "meshOwner": {
+          "shape": "AccountId",
+          "documentation": "<p>The AWS IAM account ID of the service mesh owner. If the account ID is not your own, then\n               the account that you specify must share the mesh with your account before you can create \n             the resource in the service mesh. For more information about mesh sharing, see <a href=\"https://docs.aws.amazon.com/app-mesh/latest/userguide/sharing.html\">Working with Shared Meshes</a>.</p>",
+          "location": "querystring",
+          "locationName": "meshOwner"
+        },
         "routeName": {
           "shape": "ResourceName",
           "documentation": "<p>The name to use for the route.</p>"
@@ -3376,11 +3993,14 @@
         },
         "tags": {
           "shape": "TagList",
-          "documentation": "<p>Optional metadata that you can apply to the route to assist with categorization and\n         organization. Each tag consists of a key and an optional value, both of which you define.\n         Tag keys can have a maximum character length of 128 characters, and tag values can have\n            a maximum length of 256 characters.</p>"
+          "documentation": "<p>Optional metadata that you can apply to the route to assist with categorization and\n         organization. Each tag consists of a key and an optional value, both of which you define.\n         Tag keys can have a maximum character length of 128 characters, and tag values can have\n            a maximum length of 256 characters.</p>",
+          "tags": [
+            "not-preview"
+          ]
         },
         "virtualRouterName": {
           "shape": "ResourceName",
-          "documentation": "<p>The name of the virtual router in which to create the route.</p>",
+          "documentation": "<p>The name of the virtual router in which to create the route. If the virtual router is in a shared mesh,\n         then you must be the owner of the virtual router resource.</p>",
           "location": "uri",
           "locationName": "virtualRouterName"
         }
@@ -3403,63 +4023,9 @@
       "min": 1,
       "max": 10
     },
-    "VirtualServiceProvider": {
-      "type": "structure",
-      "members": {
-        "virtualNode": {
-          "shape": "VirtualNodeServiceProvider",
-          "documentation": "<p>The virtual node associated with a virtual service.</p>"
-        },
-        "virtualRouter": {
-          "shape": "VirtualRouterServiceProvider",
-          "documentation": "<p>The virtual router associated with a virtual service.</p>"
-        }
-      },
-      "documentation": "<p>An object that represents the provider for a virtual service.</p>"
-    },
-    "GrpcRouteMatch": {
-      "type": "structure",
-      "members": {
-        "metadata": {
-          "shape": "GrpcRouteMetadataList",
-          "documentation": "<p>An object that represents the data to match from the request.</p>"
-        },
-        "methodName": {
-          "shape": "MethodName",
-          "documentation": "<p>The method name to match from the request. If you specify a name, you must also specify a <code>serviceName</code>.</p>"
-        },
-        "serviceName": {
-          "shape": "ServiceName",
-          "documentation": "<p>The fully qualified domain name for the service to match from the request.</p>"
-        }
-      },
-      "documentation": "<p>An object that represents the criteria for determining a request match.</p>"
-    },
     "String": {
       "type": "string"
     },
-    "AwsCloudMapServiceDiscovery": {
-      "type": "structure",
-      "required": [
-        "namespaceName",
-        "serviceName"
-      ],
-      "members": {
-        "attributes": {
-          "shape": "AwsCloudMapInstanceAttributes",
-          "documentation": "<p>A string map that contains attributes with values that you can use to filter instances\n         by any custom attribute that you specified when you registered the instance. Only instances\n         that match all of the specified key/value pairs will be returned.</p>"
-        },
-        "namespaceName": {
-          "shape": "AwsCloudMapName",
-          "documentation": "<p>The name of the AWS Cloud Map namespace to use.</p>"
-        },
-        "serviceName": {
-          "shape": "AwsCloudMapName",
-          "documentation": "<p>The name of the AWS Cloud Map service to use.</p>"
-        }
-      },
-      "documentation": "<p>An object that represents the AWS Cloud Map service discovery information for your virtual\n         node.</p>"
-    },
     "HttpScheme": {
       "type": "string",
       "enum": [
@@ -3467,20 +4033,6 @@
         "https"
       ]
     },
-    "UpdateVirtualServiceOutput": {
-      "type": "structure",
-      "required": [
-        "virtualService"
-      ],
-      "members": {
-        "virtualService": {
-          "shape": "VirtualServiceData",
-          "documentation": "<p>A full description of the virtual service that was updated.</p>"
-        }
-      },
-      "documentation": "",
-      "payload": "virtualService"
-    },
     "UpdateRouteInput": {
       "type": "structure",
       "required": [
@@ -3501,6 +4053,12 @@
           "location": "uri",
           "locationName": "meshName"
         },
+        "meshOwner": {
+          "shape": "AccountId",
+          "documentation": "<p>The AWS IAM account ID of the service mesh owner. If the account ID is not your own, then it's\n               the ID of the account that shared the mesh with your account. For more information about mesh sharing, see <a href=\"https://docs.aws.amazon.com/app-mesh/latest/userguide/sharing.html\">Working with Shared Meshes</a>.</p>",
+          "location": "querystring",
+          "locationName": "meshOwner"
+        },
         "routeName": {
           "shape": "ResourceName",
           "documentation": "<p>The name of the route to update.</p>",
@@ -3520,91 +4078,6 @@
       },
       "documentation": ""
     },
-    "MeshStatus": {
-      "type": "structure",
-      "members": {
-        "status": {
-          "shape": "MeshStatusCode",
-          "documentation": "<p>The current mesh status.</p>"
-        }
-      },
-      "documentation": "<p>An object that represents the status of a service mesh.</p>"
-    },
-    "CreateVirtualNodeInput": {
-      "type": "structure",
-      "required": [
-        "meshName",
-        "spec",
-        "virtualNodeName"
-      ],
-      "members": {
-        "clientToken": {
-          "shape": "String",
-          "documentation": "<p>Unique, case-sensitive identifier that you provide to ensure the idempotency of the\nrequest. Up to 36 letters, numbers, hyphens, and underscores are allowed.</p>",
-          "idempotencyToken": true
-        },
-        "meshName": {
-          "shape": "ResourceName",
-          "documentation": "<p>The name of the service mesh to create the virtual node in.</p>",
-          "location": "uri",
-          "locationName": "meshName"
-        },
-        "spec": {
-          "shape": "VirtualNodeSpec",
-          "documentation": "<p>The virtual node specification to apply.</p>"
-        },
-        "tags": {
-          "shape": "TagList",
-          "documentation": "<p>Optional metadata that you can apply to the virtual node to assist with categorization\n         and organization. Each tag consists of a key and an optional value, both of which you\n         define. Tag keys can have a maximum character length of 128 characters, and tag values can have\n            a maximum length of 256 characters.</p>"
-        },
-        "virtualNodeName": {
-          "shape": "ResourceName",
-          "documentation": "<p>The name to use for the virtual node.</p>"
-        }
-      },
-      "documentation": ""
-    },
-    "NotFoundException": {
-      "type": "structure",
-      "members": {
-        "message": {
-          "shape": "String"
-        }
-      },
-      "documentation": "<p>The specified resource doesn't exist. Check your request syntax and try again.</p>",
-      "exception": true,
-      "error": {
-        "code": "NotFoundException",
-        "httpStatusCode": 404,
-        "senderFault": true
-      }
-    },
-    "RouteSpec": {
-      "type": "structure",
-      "members": {
-        "grpcRoute": {
-          "shape": "GrpcRoute",
-          "documentation": "<p>An object that represents the specification of a GRPC route.</p>"
-        },
-        "http2Route": {
-          "shape": "HttpRoute",
-          "documentation": "<p>An object that represents the specification of an HTTP2 route.</p>"
-        },
-        "httpRoute": {
-          "shape": "HttpRoute",
-          "documentation": "<p>An object that represents the specification of an HTTP route.</p>"
-        },
-        "priority": {
-          "shape": "RoutePriority",
-          "documentation": "<p>The priority for the route. Routes are matched based on the specified value, where 0 is\n         the highest priority.</p>"
-        },
-        "tcpRoute": {
-          "shape": "TcpRoute",
-          "documentation": "<p>An object that represents the specification of a TCP route.</p>"
-        }
-      },
-      "documentation": "<p>An object that represents a route specification. Specify one route type.</p>"
-    },
     "HttpRoute": {
       "type": "structure",
       "required": [
@@ -3625,7 +4098,7 @@
           "documentation": "<p>An object that represents a retry policy.</p>"
         }
       },
-      "documentation": "<p>An object that represents an HTTP or HTTP2 route type.</p>"
+      "documentation": "<p>An object that represents an HTTP or HTTP/2 route type.</p>"
     },
     "DescribeMeshInput": {
       "type": "structure",
@@ -3638,6 +4111,12 @@
           "documentation": "<p>The name of the service mesh to describe.</p>",
           "location": "uri",
           "locationName": "meshName"
+        },
+        "meshOwner": {
+          "shape": "AccountId",
+          "documentation": "<p>The AWS IAM account ID of the service mesh owner. If the account ID is not your own, then it's\n               the ID of the account that shared the mesh with your account. For more information about mesh sharing, see <a href=\"https://docs.aws.amazon.com/app-mesh/latest/userguide/sharing.html\">Working with Shared Meshes</a>.</p>",
+          "location": "querystring",
+          "locationName": "meshOwner"
         }
       },
       "documentation": ""
@@ -3652,68 +4131,6 @@
       },
       "documentation": "<p>An object that represents the specification of a service mesh.</p>"
     },
-    "CreateVirtualServiceOutput": {
-      "type": "structure",
-      "required": [
-        "virtualService"
-      ],
-      "members": {
-        "virtualService": {
-          "shape": "VirtualServiceData",
-          "documentation": "<p>The full description of your virtual service following the create call.</p>"
-        }
-      },
-      "documentation": "",
-      "payload": "virtualService"
-    },
-    "FileAccessLog": {
-      "type": "structure",
-      "required": [
-        "path"
-      ],
-      "members": {
-        "path": {
-          "shape": "FilePath",
-          "documentation": "<p>The file path to write access logs to. You can use <code>/dev/stdout</code> to send\n         access logs to standard out and configure your Envoy container to use a log driver, such as\n            <code>awslogs</code>, to export the access logs to a log storage service such as Amazon\n         CloudWatch Logs. You can also specify a path in the Envoy container's file system to write\n         the files to disk.</p>\n         <note>\n            <p>The Envoy process must have write permissions to the path that you specify here.\n            Otherwise, Envoy fails to bootstrap properly.</p>\n         </note>"
-        }
-      },
-      "documentation": "<p>An object that represents an access log file.</p>"
-    },
-    "VirtualRouterServiceProvider": {
-      "type": "structure",
-      "required": [
-        "virtualRouterName"
-      ],
-      "members": {
-        "virtualRouterName": {
-          "shape": "ResourceName",
-          "documentation": "<p>The name of the virtual router that is acting as a service provider.</p>"
-        }
-      },
-      "documentation": "<p>An object that represents a virtual node service provider.</p>"
-    },
-    "DeleteVirtualServiceInput": {
-      "type": "structure",
-      "required": [
-        "meshName",
-        "virtualServiceName"
-      ],
-      "members": {
-        "meshName": {
-          "shape": "ResourceName",
-          "documentation": "<p>The name of the service mesh to delete the virtual service in.</p>",
-          "location": "uri",
-          "locationName": "meshName"
-        },
-        "virtualServiceName": {
-          "shape": "ServiceName",
-          "documentation": "<p>The name of the virtual service to delete.</p>",
-          "location": "uri",
-          "locationName": "virtualServiceName"
-        }
-      },
-      "documentation": ""
-    },
     "ListTagsForResourceOutput": {
       "type": "structure",
       "required": [
@@ -3782,25 +4199,18 @@
       },
       "documentation": ""
     },
-    "DeleteVirtualRouterOutput": {
+    "ListenerTlsAcmCertificate": {
       "type": "structure",
       "required": [
-        "virtualRouter"
+        "certificateArn"
       ],
       "members": {
-        "virtualRouter": {
-          "shape": "VirtualRouterData",
-          "documentation": "<p>The virtual router that was deleted.</p>"
+        "certificateArn": {
+          "shape": "Arn",
+          "documentation": "<p>The Amazon Resource Name (ARN) for the certificate. The certificate must meet specific requirements and you must have proxy authorization enabled. For more information, see <a href=\"https://docs.aws.amazon.com/app-mesh/latest/userguide/virtual-node-tls.html#virtual-node-tls-prerequisites\">Transport Layer Security (TLS)</a>.</p>"
         }
       },
-      "documentation": "",
-      "payload": "virtualRouter"
-    },
-    "TagsLimit": {
-      "type": "integer",
-      "box": true,
-      "min": 1,
-      "max": 50
+      "documentation": "<p>An object that represents an AWS Certicate Manager (ACM) certificate.</p>"
     },
     "TagKey": {
       "type": "string",
@@ -3814,20 +4224,6 @@
         "DELETED",
         "INACTIVE"
       ]
-    },
-    "DeleteVirtualNodeOutput": {
-      "type": "structure",
-      "required": [
-        "virtualNode"
-      ],
-      "members": {
-        "virtualNode": {
-          "shape": "VirtualNodeData",
-          "documentation": "<p>The virtual node that was deleted.</p>"
-        }
-      },
-      "documentation": "",
-      "payload": "virtualNode"
     }
   }
 }
diff --git a/services/appstream/build.properties b/services/appstream/build.properties
index ecf2dae6fcb1..15ec2da1fc71 100644
--- a/services/appstream/build.properties
+++ b/services/appstream/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/appstream/pom.xml b/services/appstream/pom.xml
index 23b5965a21c6..1ae1986247ad 100644
--- a/services/appstream/pom.xml
+++ b/services/appstream/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>appstream</artifactId>
     <name>AWS Java SDK :: Services :: Amazon AppStream</name>
diff --git a/services/appstream/src/test/resources/cucumber.properties b/services/appstream/src/test/resources/cucumber.properties
index c2a56cf8d558..b3f4069e1299 100644
--- a/services/appstream/src/test/resources/cucumber.properties
+++ b/services/appstream/src/test/resources/cucumber.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/appsync/pom.xml b/services/appsync/pom.xml
index 55aaaec25d59..01a12b515d39 100644
--- a/services/appsync/pom.xml
+++ b/services/appsync/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>services</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
 
     <artifactId>appsync</artifactId>
diff --git a/services/appsync/src/main/resources/codegen-resources/service-2.json b/services/appsync/src/main/resources/codegen-resources/service-2.json
index 2f5c90d80cd4..b2dfb3719b8e 100644
--- a/services/appsync/src/main/resources/codegen-resources/service-2.json
+++ b/services/appsync/src/main/resources/codegen-resources/service-2.json
@@ -13,6 +13,23 @@
     "uid":"appsync-2017-07-25"
   },
   "operations":{
+    "CreateApiCache":{
+      "name":"CreateApiCache",
+      "http":{
+        "method":"POST",
+        "requestUri":"/v1/apis/{apiId}/ApiCaches"
+      },
+      "input":{"shape":"CreateApiCacheRequest"},
+      "output":{"shape":"CreateApiCacheResponse"},
+      "errors":[
+        {"shape":"BadRequestException"},
+        {"shape":"ConcurrentModificationException"},
+        {"shape":"NotFoundException"},
+        {"shape":"UnauthorizedException"},
+        {"shape":"InternalFailureException"}
+      ],
+      "documentation":"<p>Creates a cache for the GraphQL API.</p>"
+    },
     "CreateApiKey":{
       "name":"CreateApiKey",
       "http":{
@@ -117,6 +134,23 @@
       ],
       "documentation":"<p>Creates a <code>Type</code> object.</p>"
     },
+    "DeleteApiCache":{
+      "name":"DeleteApiCache",
+      "http":{
+        "method":"DELETE",
+        "requestUri":"/v1/apis/{apiId}/ApiCaches"
+      },
+      "input":{"shape":"DeleteApiCacheRequest"},
+      "output":{"shape":"DeleteApiCacheResponse"},
+      "errors":[
+        {"shape":"BadRequestException"},
+        {"shape":"ConcurrentModificationException"},
+        {"shape":"NotFoundException"},
+        {"shape":"UnauthorizedException"},
+        {"shape":"InternalFailureException"}
+      ],
+      "documentation":"<p>Deletes an <code>ApiCache</code> object.</p>"
+    },
     "DeleteApiKey":{
       "name":"DeleteApiKey",
       "http":{
@@ -217,6 +251,40 @@
       ],
       "documentation":"<p>Deletes a <code>Type</code> object.</p>"
     },
+    "FlushApiCache":{
+      "name":"FlushApiCache",
+      "http":{
+        "method":"DELETE",
+        "requestUri":"/v1/apis/{apiId}/FlushCache"
+      },
+      "input":{"shape":"FlushApiCacheRequest"},
+      "output":{"shape":"FlushApiCacheResponse"},
+      "errors":[
+        {"shape":"BadRequestException"},
+        {"shape":"ConcurrentModificationException"},
+        {"shape":"NotFoundException"},
+        {"shape":"UnauthorizedException"},
+        {"shape":"InternalFailureException"}
+      ],
+      "documentation":"<p>Flushes an <code>ApiCache</code> object.</p>"
+    },
+    "GetApiCache":{
+      "name":"GetApiCache",
+      "http":{
+        "method":"GET",
+        "requestUri":"/v1/apis/{apiId}/ApiCaches"
+      },
+      "input":{"shape":"GetApiCacheRequest"},
+      "output":{"shape":"GetApiCacheResponse"},
+      "errors":[
+        {"shape":"BadRequestException"},
+        {"shape":"ConcurrentModificationException"},
+        {"shape":"NotFoundException"},
+        {"shape":"UnauthorizedException"},
+        {"shape":"InternalFailureException"}
+      ],
+      "documentation":"<p>Retrieves an <code>ApiCache</code> object.</p>"
+    },
     "GetDataSource":{
       "name":"GetDataSource",
       "http":{
@@ -513,6 +581,23 @@
       ],
       "documentation":"<p>Untags a resource.</p>"
     },
+    "UpdateApiCache":{
+      "name":"UpdateApiCache",
+      "http":{
+        "method":"POST",
+        "requestUri":"/v1/apis/{apiId}/ApiCaches/update"
+      },
+      "input":{"shape":"UpdateApiCacheRequest"},
+      "output":{"shape":"UpdateApiCacheResponse"},
+      "errors":[
+        {"shape":"BadRequestException"},
+        {"shape":"ConcurrentModificationException"},
+        {"shape":"NotFoundException"},
+        {"shape":"UnauthorizedException"},
+        {"shape":"InternalFailureException"}
+      ],
+      "documentation":"<p>Updates the cache for the GraphQL API.</p>"
+    },
     "UpdateApiKey":{
       "name":"UpdateApiKey",
       "http":{
@@ -648,6 +733,65 @@
       "type":"list",
       "member":{"shape":"AdditionalAuthenticationProvider"}
     },
+    "ApiCache":{
+      "type":"structure",
+      "members":{
+        "ttl":{
+          "shape":"Long",
+          "documentation":"<p>TTL in seconds for cache entries.</p> <p>Valid values are between 1 and 3600 seconds.</p>"
+        },
+        "apiCachingBehavior":{
+          "shape":"ApiCachingBehavior",
+          "documentation":"<p>Caching behavior.</p> <ul> <li> <p> <b>FULL_REQUEST_CACHING</b>: All requests are fully cached.</p> </li> <li> <p> <b>PER_RESOLVER_CACHING</b>: Individual resovlers that you specify are cached.</p> </li> </ul>"
+        },
+        "transitEncryptionEnabled":{
+          "shape":"Boolean",
+          "documentation":"<p>Transit encryption flag when connecting to cache. This setting cannot be updated after creation.</p>"
+        },
+        "atRestEncryptionEnabled":{
+          "shape":"Boolean",
+          "documentation":"<p>At rest encryption flag for cache. This setting cannot be updated after creation.</p>"
+        },
+        "type":{
+          "shape":"ApiCacheType",
+          "documentation":"<p>The cache instance type.</p> <ul> <li> <p> <b>T2_SMALL</b>: A t2.small instance type.</p> </li> <li> <p> <b>T2_MEDIUM</b>: A t2.medium instance type.</p> </li> <li> <p> <b>R4_LARGE</b>: A r4.large instance type.</p> </li> <li> <p> <b>R4_XLARGE</b>: A r4.xlarge instance type.</p> </li> <li> <p> <b>R4_2XLARGE</b>: A r4.2xlarge instance type.</p> </li> <li> <p> <b>R4_4XLARGE</b>: A r4.4xlarge instance type.</p> </li> <li> <p> <b>R4_8XLARGE</b>: A r4.8xlarge instance type.</p> </li> </ul>"
+        },
+        "status":{
+          "shape":"ApiCacheStatus",
+          "documentation":"<p>The cache instance status.</p> <ul> <li> <p> <b>AVAILABLE</b>: The instance is available for use.</p> </li> <li> <p> <b>CREATING</b>: The instance is currently creating.</p> </li> <li> <p> <b>DELETING</b>: The instance is currently deleting.</p> </li> <li> <p> <b>MODIFYING</b>: The instance is currently modifying.</p> </li> <li> <p> <b>FAILED</b>: The instance has failed creation.</p> </li> </ul>"
+        }
+      },
+      "documentation":"<p>The <code>ApiCache</code> object.</p>"
+    },
+    "ApiCacheStatus":{
+      "type":"string",
+      "enum":[
+        "AVAILABLE",
+        "CREATING",
+        "DELETING",
+        "MODIFYING",
+        "FAILED"
+      ]
+    },
+    "ApiCacheType":{
+      "type":"string",
+      "enum":[
+        "T2_SMALL",
+        "T2_MEDIUM",
+        "R4_LARGE",
+        "R4_XLARGE",
+        "R4_2XLARGE",
+        "R4_4XLARGE",
+        "R4_8XLARGE"
+      ]
+    },
+    "ApiCachingBehavior":{
+      "type":"string",
+      "enum":[
+        "FULL_REQUEST_CACHING",
+        "PER_RESOLVER_CACHING"
+      ]
+    },
     "ApiKey":{
       "type":"structure",
       "members":{
@@ -751,6 +895,24 @@
     "Blob":{"type":"blob"},
     "Boolean":{"type":"boolean"},
     "BooleanValue":{"type":"boolean"},
+    "CachingConfig":{
+      "type":"structure",
+      "members":{
+        "ttl":{
+          "shape":"Long",
+          "documentation":"<p>The TTL in seconds for a resolver that has caching enabled.</p> <p>Valid values are between 1 and 3600 seconds.</p>"
+        },
+        "cachingKeys":{
+          "shape":"CachingKeys",
+          "documentation":"<p>The caching keys for a resolver that has caching enabled.</p> <p>Valid values are entries from the <code>$context.identity</code> and <code>$context.arguments</code> maps.</p>"
+        }
+      },
+      "documentation":"<p>The caching configuration for a resolver that has caching enabled.</p>"
+    },
+    "CachingKeys":{
+      "type":"list",
+      "member":{"shape":"String"}
+    },
     "CognitoUserPoolConfig":{
       "type":"structure",
       "required":[
@@ -782,6 +944,70 @@
       "error":{"httpStatusCode":409},
       "exception":true
     },
+    "ConflictDetectionType":{
+      "type":"string",
+      "enum":[
+        "VERSION",
+        "NONE"
+      ]
+    },
+    "ConflictHandlerType":{
+      "type":"string",
+      "enum":[
+        "OPTIMISTIC_CONCURRENCY",
+        "LAMBDA",
+        "AUTOMERGE",
+        "NONE"
+      ]
+    },
+    "CreateApiCacheRequest":{
+      "type":"structure",
+      "required":[
+        "apiId",
+        "ttl",
+        "apiCachingBehavior",
+        "type"
+      ],
+      "members":{
+        "apiId":{
+          "shape":"String",
+          "documentation":"<p>The GraphQL API Id.</p>",
+          "location":"uri",
+          "locationName":"apiId"
+        },
+        "ttl":{
+          "shape":"Long",
+          "documentation":"<p>TTL in seconds for cache entries.</p> <p>Valid values are between 1 and 3600 seconds.</p>"
+        },
+        "transitEncryptionEnabled":{
+          "shape":"Boolean",
+          "documentation":"<p>Transit encryption flag when connecting to cache. This setting cannot be updated after creation.</p>"
+        },
+        "atRestEncryptionEnabled":{
+          "shape":"Boolean",
+          "documentation":"<p>At rest encryption flag for cache. This setting cannot be updated after creation.</p>"
+        },
+        "apiCachingBehavior":{
+          "shape":"ApiCachingBehavior",
+          "documentation":"<p>Caching behavior.</p> <ul> <li> <p> <b>FULL_REQUEST_CACHING</b>: All requests are fully cached.</p> </li> <li> <p> <b>PER_RESOLVER_CACHING</b>: Individual resovlers that you specify are cached.</p> </li> </ul>"
+        },
+        "type":{
+          "shape":"ApiCacheType",
+          "documentation":"<p>The cache instance type.</p> <ul> <li> <p> <b>T2_SMALL</b>: A t2.small instance type.</p> </li> <li> <p> <b>T2_MEDIUM</b>: A t2.medium instance type.</p> </li> <li> <p> <b>R4_LARGE</b>: A r4.large instance type.</p> </li> <li> <p> <b>R4_XLARGE</b>: A r4.xlarge instance type.</p> </li> <li> <p> <b>R4_2XLARGE</b>: A r4.2xlarge instance type.</p> </li> <li> <p> <b>R4_4XLARGE</b>: A r4.4xlarge instance type.</p> </li> <li> <p> <b>R4_8XLARGE</b>: A r4.8xlarge instance type.</p> </li> </ul>"
+        }
+      },
+      "documentation":"<p>Represents the input of a <code>CreateApiCache</code> operation.</p>"
+    },
+    "CreateApiCacheResponse":{
+      "type":"structure",
+      "members":{
+        "apiCache":{
+          "shape":"ApiCache",
+          "documentation":"<p>The <code>ApiCache</code> object.</p>"
+        }
+      },
+      "documentation":"<p>Represents the output of a <code>CreateApiCache</code> operation.</p>"
+    },
     "CreateApiKeyRequest":{
       "type":"structure",
       "required":["apiId"],
@@ -957,6 +1183,10 @@
         "additionalAuthenticationProviders":{
           "shape":"AdditionalAuthenticationProviders",
           "documentation":"<p>A list of additional authentication providers for the <code>GraphqlApi</code> API.</p>"
+        },
+        "xrayEnabled":{
+          "shape":"Boolean",
+          "documentation":"<p>A flag indicating whether to enable X-Ray tracing for the <code>GraphqlApi</code>.</p>"
         }
       }
     },
@@ -1013,6 +1243,14 @@
         "pipelineConfig":{
           "shape":"PipelineConfig",
           "documentation":"<p>The <code>PipelineConfig</code>.</p>"
+        },
+        "syncConfig":{
+          "shape":"SyncConfig",
+          "documentation":"<p>The <code>SyncConfig</code> for a resolver attached to a versioned datasource.</p>"
+        },
+        "cachingConfig":{
+          "shape":"CachingConfig",
+          "documentation":"<p>The caching configuration for the resolver.</p>"
         }
       }
     },
@@ -1126,6 +1364,25 @@
         "DENY"
       ]
     },
+    "DeleteApiCacheRequest":{
+      "type":"structure",
+      "required":["apiId"],
+      "members":{
+        "apiId":{
+          "shape":"String",
+          "documentation":"<p>The API ID.</p>",
+          "location":"uri",
+          "locationName":"apiId"
+        }
+      },
+      "documentation":"<p>Represents the input of a <code>DeleteApiCache</code> operation.</p>"
+    },
+    "DeleteApiCacheResponse":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>Represents the output of a <code>DeleteApiCache</code> operation.</p>"
+    },
     "DeleteApiKeyRequest":{
       "type":"structure",
       "required":[
@@ -1280,6 +1537,24 @@
       "members":{
       }
     },
+    "DeltaSyncConfig":{
+      "type":"structure",
+      "members":{
+        "baseTableTTL":{
+          "shape":"Long",
+          "documentation":"<p>The number of minutes an Item is stored in the datasource.</p>"
+        },
+        "deltaSyncTableName":{
+          "shape":"String",
+          "documentation":"<p>The Delta Sync table name.</p>"
+        },
+        "deltaSyncTableTTL":{
+          "shape":"Long",
+          "documentation":"<p>The number of minutes a Delta Sync log entry is stored in the Delta Sync table.</p>"
+        }
+      },
+      "documentation":"<p>Describes a Delta Sync configuration.</p>"
+    },
     "DynamodbDataSourceConfig":{
       "type":"structure",
       "required":[
@@ -1298,6 +1573,14 @@
         "useCallerCredentials":{
           "shape":"Boolean",
           "documentation":"<p>Set to TRUE to use Amazon Cognito credentials with this data source.</p>"
+        },
+        "deltaSyncConfig":{
+          "shape":"DeltaSyncConfig",
+          "documentation":"<p>The <code>DeltaSyncConfig</code> for a versioned datasource.</p>"
+        },
+        "versioned":{
+          "shape":"Boolean",
+          "documentation":"<p>Set to TRUE to use Conflict Detection and Resolution with this data source.</p>"
         }
       },
       "documentation":"<p>Describes an Amazon DynamoDB data source configuration.</p>"
@@ -1329,6 +1612,25 @@
         "ALL"
       ]
     },
+    "FlushApiCacheRequest":{
+      "type":"structure",
+      "required":["apiId"],
+      "members":{
+        "apiId":{
+          "shape":"String",
+          "documentation":"<p>The API ID.</p>",
+          "location":"uri",
+          "locationName":"apiId"
+        }
+      },
+      "documentation":"<p>Represents the input of a <code>FlushApiCache</code> operation.</p>"
+    },
+    "FlushApiCacheResponse":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>Represents the output of a <code>FlushApiCache</code> operation.</p>"
+    },
     "FunctionConfiguration":{
       "type":"structure",
       "members":{
@@ -1375,6 +1677,29 @@
       "type":"list",
       "member":{"shape":"String"}
     },
+    "GetApiCacheRequest":{
+      "type":"structure",
+      "required":["apiId"],
+      "members":{
+        "apiId":{
+          "shape":"String",
+          "documentation":"<p>The API ID.</p>",
+          "location":"uri",
+          "locationName":"apiId"
+        }
+      },
+      "documentation":"<p>Represents the input of a <code>GetApiCache</code> operation.</p>"
+    },
+    "GetApiCacheResponse":{
+      "type":"structure",
+      "members":{
+        "apiCache":{
+          "shape":"ApiCache",
+          "documentation":"<p>The <code>ApiCache</code> object.</p>"
+        }
+      },
+      "documentation":"<p>Represents the output of a <code>GetApiCache</code> operation.</p>"
+    },
     "GetDataSourceRequest":{
       "type":"structure",
       "required":[
@@ -1643,6 +1968,10 @@
         "additionalAuthenticationProviders":{
           "shape":"AdditionalAuthenticationProviders",
           "documentation":"<p>A list of additional authentication providers for the <code>GraphqlApi</code> API.</p>"
+        },
+        "xrayEnabled":{
+          "shape":"Boolean",
+          "documentation":"<p>A flag representing whether X-Ray tracing is enabled for this <code>GraphqlApi</code>.</p>"
         }
       },
       "documentation":"<p>Describes a GraphQL API.</p>"
@@ -1675,6 +2004,16 @@
       "exception":true,
       "fault":true
     },
+    "LambdaConflictHandlerConfig":{
+      "type":"structure",
+      "members":{
+        "lambdaConflictHandlerArn":{
+          "shape":"String",
+          "documentation":"<p>The Arn for the Lambda function to use as the Conflict Handler.</p>"
+        }
+      },
+      "documentation":"<p>The <code>LambdaConflictHandlerConfig</code> object when configuring LAMBDA as the Conflict Handler.</p>"
+    },
     "LambdaDataSourceConfig":{
       "type":"structure",
       "required":["lambdaFunctionArn"],
@@ -2074,6 +2413,8 @@
     },
     "PaginationToken":{
       "type":"string",
+      "max":65536,
+      "min":1,
       "pattern":"[\\\\S]+"
     },
     "PipelineConfig":{
@@ -2164,6 +2505,14 @@
         "pipelineConfig":{
           "shape":"PipelineConfig",
           "documentation":"<p>The <code>PipelineConfig</code>.</p>"
+        },
+        "syncConfig":{
+          "shape":"SyncConfig",
+          "documentation":"<p>The <code>SyncConfig</code> for a resolver attached to a versioned datasource.</p>"
+        },
+        "cachingConfig":{
+          "shape":"CachingConfig",
+          "documentation":"<p>The caching configuration for the resolver.</p>"
         }
       },
       "documentation":"<p>Describes a resolver.</p>"
@@ -2187,6 +2536,8 @@
     },
     "ResourceName":{
       "type":"string",
+      "max":65536,
+      "min":1,
       "pattern":"[_A-Za-z][_0-9A-Za-z]*"
     },
     "SchemaStatus":{
@@ -2229,6 +2580,24 @@
       }
     },
     "String":{"type":"string"},
+    "SyncConfig":{
+      "type":"structure",
+      "members":{
+        "conflictHandler":{
+          "shape":"ConflictHandlerType",
+          "documentation":"<p>The Conflict Resolution strategy to perform in the event of a conflict.</p> <ul> <li> <p> <b>OPTIMISTIC_CONCURRENCY</b>: Resolve conflicts by rejecting mutations when versions do not match the latest version at the server.</p> </li> <li> <p> <b>AUTOMERGE</b>: Resolve conflicts with the Automerge conflict resolution strategy.</p> </li> <li> <p> <b>LAMBDA</b>: Resolve conflicts with a Lambda function supplied in the LambdaConflictHandlerConfig.</p> </li> </ul>"
+        },
+        "conflictDetection":{
+          "shape":"ConflictDetectionType",
+          "documentation":"<p>The Conflict Detection strategy to use.</p> <ul> <li> <p> <b>VERSION</b>: Detect conflicts based on object versions for this resolver.</p> </li> <li> <p> <b>NONE</b>: Do not detect conflicts when executing this resolver.</p> </li> </ul>"
+        },
+        "lambdaConflictHandlerConfig":{
+          "shape":"LambdaConflictHandlerConfig",
+          "documentation":"<p>The <code>LambdaConflictHandlerConfig</code> when configuring LAMBDA as the Conflict Handler.</p>"
+        }
+      },
+      "documentation":"<p>Describes a Sync configuration for a resolver.</p> <p>Contains information on which Conflict Detection as well as Resolution strategy should be performed when the resolver is invoked.</p>"
+    },
     "TagKey":{
       "type":"string",
       "documentation":"<p>The key for the tag.</p>",
@@ -2351,6 +2720,46 @@
       "members":{
       }
     },
+    "UpdateApiCacheRequest":{
+      "type":"structure",
+      "required":[
+        "apiId",
+        "ttl",
+        "apiCachingBehavior",
+        "type"
+      ],
+      "members":{
+        "apiId":{
+          "shape":"String",
+          "documentation":"<p>The GraphQL API Id.</p>",
+          "location":"uri",
+          "locationName":"apiId"
+        },
+        "ttl":{
+          "shape":"Long",
+          "documentation":"<p>TTL in seconds for cache entries.</p> <p>Valid values are between 1 and 3600 seconds.</p>"
+        },
+        "apiCachingBehavior":{
+          "shape":"ApiCachingBehavior",
+          "documentation":"<p>Caching behavior.</p> <ul> <li> <p> <b>FULL_REQUEST_CACHING</b>: All requests are fully cached.</p> </li> <li> <p> <b>PER_RESOLVER_CACHING</b>: Individual resovlers that you specify are cached.</p> </li> </ul>"
+        },
+        "type":{
+          "shape":"ApiCacheType",
+          "documentation":"<p>The cache instance type.</p> <ul> <li> <p> <b>T2_SMALL</b>: A t2.small instance type.</p> </li> <li> <p> <b>T2_MEDIUM</b>: A t2.medium instance type.</p> </li> <li> <p> <b>R4_LARGE</b>: A r4.large instance type.</p> </li> <li> <p> <b>R4_XLARGE</b>: A r4.xlarge instance type.</p> </li> <li> <p> <b>R4_2XLARGE</b>: A r4.2xlarge instance type.</p> </li> <li> <p> <b>R4_4XLARGE</b>: A r4.4xlarge instance type.</p> </li> <li> <p> <b>R4_8XLARGE</b>: A r4.8xlarge instance type.</p> </li> </ul>"
+        }
+      },
+      "documentation":"<p>Represents the input of a <code>UpdateApiCache</code> operation.</p>"
+    },
+    "UpdateApiCacheResponse":{
+      "type":"structure",
+      "members":{
+        "apiCache":{
+          "shape":"ApiCache",
+          "documentation":"<p>The <code>ApiCache</code> object.</p>"
+        }
+      },
+      "documentation":"<p>Represents the output of a <code>UpdateApiCache</code> operation.</p>"
+    },
     "UpdateApiKeyRequest":{
       "type":"structure",
       "required":[
@@ -2546,6 +2955,10 @@
         "additionalAuthenticationProviders":{
           "shape":"AdditionalAuthenticationProviders",
           "documentation":"<p>A list of additional authentication providers for the <code>GraphqlApi</code> API.</p>"
+        },
+        "xrayEnabled":{
+          "shape":"Boolean",
+          "documentation":"<p>A flag indicating whether to enable X-Ray tracing for the <code>GraphqlApi</code>.</p>"
         }
       }
     },
@@ -2604,6 +3017,14 @@
         "pipelineConfig":{
           "shape":"PipelineConfig",
           "documentation":"<p>The <code>PipelineConfig</code>.</p>"
+        },
+        "syncConfig":{
+          "shape":"SyncConfig",
+          "documentation":"<p>The <code>SyncConfig</code> for a resolver attached to a versioned datasource.</p>"
+        },
+        "cachingConfig":{
+          "shape":"CachingConfig",
+          "documentation":"<p>The caching configuration for the resolver.</p>"
         }
       }
     },
diff --git a/services/athena/build.properties b/services/athena/build.properties
index ecf2dae6fcb1..15ec2da1fc71 100644
--- a/services/athena/build.properties
+++ b/services/athena/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/athena/pom.xml b/services/athena/pom.xml
index 67809504a77b..9eab66019763 100644
--- a/services/athena/pom.xml
+++ b/services/athena/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>athena</artifactId>
     <name>AWS Java SDK :: Services :: Amazon Athena</name>
diff --git a/services/athena/src/main/resources/codegen-resources/service-2.json b/services/athena/src/main/resources/codegen-resources/service-2.json
index 2cb116c3595f..35988536b21c 100644
--- a/services/athena/src/main/resources/codegen-resources/service-2.json
+++ b/services/athena/src/main/resources/codegen-resources/service-2.json
@@ -167,7 +167,7 @@
         {"shape":"InternalServerException"},
         {"shape":"InvalidRequestException"}
       ],
-      "documentation":"<p>Provides a list of available query IDs only for queries saved in the specified workgroup. Requires that you have access to the workgroup.</p> <p>For code samples using the AWS SDK for Java, see <a href=\"http://docs.aws.amazon.com/athena/latest/ug/code-samples.html\">Examples and Code Samples</a> in the <i>Amazon Athena User Guide</i>.</p>"
+      "documentation":"<p>Provides a list of available query IDs only for queries saved in the specified workgroup. Requires that you have access to the workgroup. If a workgroup is not specified, lists the saved queries for the primary workgroup.</p> <p>For code samples using the AWS SDK for Java, see <a href=\"http://docs.aws.amazon.com/athena/latest/ug/code-samples.html\">Examples and Code Samples</a> in the <i>Amazon Athena User Guide</i>.</p>"
     },
     "ListQueryExecutions":{
       "name":"ListQueryExecutions",
@@ -181,7 +181,7 @@
         {"shape":"InternalServerException"},
         {"shape":"InvalidRequestException"}
       ],
-      "documentation":"<p>Provides a list of available query execution IDs for the queries in the specified workgroup. Requires you to have access to the workgroup in which the queries ran.</p> <p>For code samples using the AWS SDK for Java, see <a href=\"http://docs.aws.amazon.com/athena/latest/ug/code-samples.html\">Examples and Code Samples</a> in the <i>Amazon Athena User Guide</i>.</p>"
+      "documentation":"<p>Provides a list of available query execution IDs for the queries in the specified workgroup. If a workgroup is not specified, returns a list of query execution IDs for the primary workgroup. Requires you to have access to the workgroup in which the queries ran.</p> <p>For code samples using the AWS SDK for Java, see <a href=\"http://docs.aws.amazon.com/athena/latest/ug/code-samples.html\">Examples and Code Samples</a> in the <i>Amazon Athena User Guide</i>.</p>"
     },
     "ListTagsForResource":{
       "name":"ListTagsForResource",
@@ -694,7 +694,7 @@
         },
         "WorkGroup":{
           "shape":"WorkGroupName",
-          "documentation":"<p>The name of the workgroup from which the named queries are being returned.</p>"
+          "documentation":"<p>The name of the workgroup from which the named queries are returned. If a workgroup is not specified, the saved queries for the primary workgroup are returned.</p>"
         }
       }
     },
@@ -724,7 +724,7 @@
         },
         "WorkGroup":{
           "shape":"WorkGroupName",
-          "documentation":"<p>The name of the workgroup from which queries are being returned.</p>"
+          "documentation":"<p>The name of the workgroup from which queries are returned. If a workgroup is not specified, a list of available query execution IDs for the queries in the primary workgroup is returned.</p>"
         }
       }
     },
@@ -908,7 +908,7 @@
         },
         "Statistics":{
           "shape":"QueryExecutionStatistics",
-          "documentation":"<p>The location of a manifest file that tracks file locations generated by the query, the amount of data scanned by the query, and the amount of time that it took the query to run.</p>"
+          "documentation":"<p>Query execution statistics, such as the amount of data scanned, the amount of time that the query took to process, and the type of statement that was run.</p>"
         },
         "WorkGroup":{
           "shape":"WorkGroupName",
@@ -961,17 +961,33 @@
         },
         "DataManifestLocation":{
           "shape":"String",
-          "documentation":"<p>The location and file name of a data manifest file. The manifest file is saved to the Athena query results location in Amazon S3. It tracks files that the query wrote to Amazon S3. If the query fails, the manifest file also tracks files that the query intended to write. The manifest is useful for identifying orphaned files resulting from a failed query. For more information, see <a href=\"https://docs.aws.amazon.com/athena/latest/ug/querying.html\">Working with Query Output Files</a> in the <i>Amazon Athena User Guide</i>.</p>"
+          "documentation":"<p>The location and file name of a data manifest file. The manifest file is saved to the Athena query results location in Amazon S3. The manifest file tracks files that the query wrote to Amazon S3. If the query fails, the manifest file also tracks files that the query intended to write. The manifest is useful for identifying orphaned files resulting from a failed query. For more information, see <a href=\"https://docs.aws.amazon.com/athena/latest/ug/querying.html\">Working with Query Results, Output Files, and Query History</a> in the <i>Amazon Athena User Guide</i>.</p>"
+        },
+        "TotalExecutionTimeInMillis":{
+          "shape":"Long",
+          "documentation":"<p>The number of milliseconds that Athena took to run the query.</p>"
+        },
+        "QueryQueueTimeInMillis":{
+          "shape":"Long",
+          "documentation":"<p>The number of milliseconds that the query was in your query queue waiting for resources. Note that if transient errors occur, Athena might automatically add the query back to the queue.</p>"
+        },
+        "QueryPlanningTimeInMillis":{
+          "shape":"Long",
+          "documentation":"<p>The number of milliseconds that Athena took to plan the query processing flow. This includes the time spent retrieving table partitions from the data source. Note that because the query engine performs the query planning, query planning time is a subset of engine processing time.</p>"
+        },
+        "ServiceProcessingTimeInMillis":{
+          "shape":"Long",
+          "documentation":"<p>The number of milliseconds that Athena took to finalize and publish the query results after the query engine finished running the query.</p>"
         }
       },
-      "documentation":"<p>The location of a manifest file that tracks file locations generated by the query, the amount of data scanned by the query, and the amount of time that it took the query to run.</p>"
+      "documentation":"<p>The amount of data scanned during the query execution and the amount of time that it took to execute, and the type of statement that was run.</p>"
     },
     "QueryExecutionStatus":{
       "type":"structure",
       "members":{
         "State":{
           "shape":"QueryExecutionState",
-          "documentation":"<p>The state of query execution. <code>QUEUED</code> state is listed but is not used by Athena and is reserved for future use. <code>RUNNING</code> indicates that the query has been submitted to the service, and Athena will execute the query as soon as resources are available. <code>SUCCEEDED</code> indicates that the query completed without errors. <code>FAILED</code> indicates that the query experienced an error and did not complete processing. <code>CANCELLED</code> indicates that a user input interrupted query execution. </p>"
+          "documentation":"<p>The state of query execution. <code>QUEUED</code> indicates that the query has been submitted to the service, and Athena will execute the query as soon as resources are available. <code>RUNNING</code> indicates that the query is in execution phase. <code>SUCCEEDED</code> indicates that the query completed without errors. <code>FAILED</code> indicates that the query experienced an error and did not complete processing. <code>CANCELLED</code> indicates that a user input interrupted query execution. </p>"
         },
         "StateChangeReason":{
           "shape":"String",
diff --git a/services/autoscaling/build.properties b/services/autoscaling/build.properties
index ecf2dae6fcb1..15ec2da1fc71 100644
--- a/services/autoscaling/build.properties
+++ b/services/autoscaling/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/autoscaling/pom.xml b/services/autoscaling/pom.xml
index a8104c55f762..abd618fc9e5a 100644
--- a/services/autoscaling/pom.xml
+++ b/services/autoscaling/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>autoscaling</artifactId>
     <name>AWS Java SDK :: Services :: Auto Scaling</name>
diff --git a/services/autoscaling/src/it/java/software/amazon/awssdk/services/autoscaling/AutoScalingIntegrationTest.java b/services/autoscaling/src/it/java/software/amazon/awssdk/services/autoscaling/AutoScalingIntegrationTest.java
index 22efb393771c..d733b8aac478 100644
--- a/services/autoscaling/src/it/java/software/amazon/awssdk/services/autoscaling/AutoScalingIntegrationTest.java
+++ b/services/autoscaling/src/it/java/software/amazon/awssdk/services/autoscaling/AutoScalingIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -16,7 +16,6 @@
 package software.amazon.awssdk.services.autoscaling;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
diff --git a/services/autoscaling/src/it/java/software/amazon/awssdk/services/autoscaling/IntegrationTestBase.java b/services/autoscaling/src/it/java/software/amazon/awssdk/services/autoscaling/IntegrationTestBase.java
index 82353c69e266..167317fe81a9 100644
--- a/services/autoscaling/src/it/java/software/amazon/awssdk/services/autoscaling/IntegrationTestBase.java
+++ b/services/autoscaling/src/it/java/software/amazon/awssdk/services/autoscaling/IntegrationTestBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/autoscaling/src/main/resources/codegen-resources/service-2.json b/services/autoscaling/src/main/resources/codegen-resources/service-2.json
index 7731c48bd30c..b66a03a92b87 100644
--- a/services/autoscaling/src/main/resources/codegen-resources/service-2.json
+++ b/services/autoscaling/src/main/resources/codegen-resources/service-2.json
@@ -39,7 +39,7 @@
         {"shape":"ResourceContentionFault"},
         {"shape":"ServiceLinkedRoleFailure"}
       ],
-      "documentation":"<p>Attaches one or more target groups to the specified Auto Scaling group. </p> <p>To describe the target groups for an Auto Scaling group, use <a>DescribeLoadBalancerTargetGroups</a>. To detach the target group from the Auto Scaling group, use <a>DetachLoadBalancerTargetGroups</a>.</p> <p>With Application Load Balancers and Network Load Balancers, instances are registered as targets with a target group. With Classic Load Balancers, instances are registered with the load balancer. For more information, see <a href=\"https://docs.aws.amazon.com/autoscaling/ec2/userguide/attach-load-balancer-asg.html\">Attaching a Load Balancer to Your Auto Scaling Group</a> in the <i>Amazon EC2 Auto Scaling User Guide</i>.</p>"
+      "documentation":"<p>Attaches one or more target groups to the specified Auto Scaling group.</p> <p>To describe the target groups for an Auto Scaling group, use <a>DescribeLoadBalancerTargetGroups</a>. To detach the target group from the Auto Scaling group, use <a>DetachLoadBalancerTargetGroups</a>.</p> <p>With Application Load Balancers and Network Load Balancers, instances are registered as targets with a target group. With Classic Load Balancers, instances are registered with the load balancer. For more information, see <a href=\"https://docs.aws.amazon.com/autoscaling/ec2/userguide/attach-load-balancer-asg.html\">Attaching a Load Balancer to Your Auto Scaling Group</a> in the <i>Amazon EC2 Auto Scaling User Guide</i>.</p>"
     },
     "AttachLoadBalancers":{
       "name":"AttachLoadBalancers",
@@ -121,7 +121,7 @@
         {"shape":"ResourceContentionFault"},
         {"shape":"ServiceLinkedRoleFailure"}
       ],
-      "documentation":"<p>Creates an Auto Scaling group with the specified name and attributes.</p> <p>If you exceed your maximum limit of Auto Scaling groups, the call fails. For information about viewing this limit, see <a>DescribeAccountLimits</a>. For information about updating this limit, see <a href=\"https://docs.aws.amazon.com/autoscaling/ec2/userguide/as-account-limits.html\">Amazon EC2 Auto Scaling Limits</a> in the <i>Amazon EC2 Auto Scaling User Guide</i>.</p>"
+      "documentation":"<p>Creates an Auto Scaling group with the specified name and attributes.</p> <p>If you exceed your maximum limit of Auto Scaling groups, the call fails. For information about viewing this limit, see <a>DescribeAccountLimits</a>. For information about updating this limit, see <a href=\"https://docs.aws.amazon.com/autoscaling/ec2/userguide/as-account-limits.html\">Amazon EC2 Auto Scaling Service Quotas</a> in the <i>Amazon EC2 Auto Scaling User Guide</i>.</p>"
     },
     "CreateLaunchConfiguration":{
       "name":"CreateLaunchConfiguration",
@@ -135,7 +135,7 @@
         {"shape":"LimitExceededFault"},
         {"shape":"ResourceContentionFault"}
       ],
-      "documentation":"<p>Creates a launch configuration.</p> <p>If you exceed your maximum limit of launch configurations, the call fails. For information about viewing this limit, see <a>DescribeAccountLimits</a>. For information about updating this limit, see <a href=\"https://docs.aws.amazon.com/autoscaling/ec2/userguide/as-account-limits.html\">Amazon EC2 Auto Scaling Limits</a> in the <i>Amazon EC2 Auto Scaling User Guide</i>.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/autoscaling/ec2/userguide/LaunchConfiguration.html\">Launch Configurations</a> in the <i>Amazon EC2 Auto Scaling User Guide</i>.</p>"
+      "documentation":"<p>Creates a launch configuration.</p> <p>If you exceed your maximum limit of launch configurations, the call fails. For information about viewing this limit, see <a>DescribeAccountLimits</a>. For information about updating this limit, see <a href=\"https://docs.aws.amazon.com/autoscaling/ec2/userguide/as-account-limits.html\">Amazon EC2 Auto Scaling Service Quotas</a> in the <i>Amazon EC2 Auto Scaling User Guide</i>.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/autoscaling/ec2/userguide/LaunchConfiguration.html\">Launch Configurations</a> in the <i>Amazon EC2 Auto Scaling User Guide</i>.</p>"
     },
     "CreateOrUpdateTags":{
       "name":"CreateOrUpdateTags",
@@ -258,7 +258,7 @@
       "errors":[
         {"shape":"ResourceContentionFault"}
       ],
-      "documentation":"<p>Describes the current Amazon EC2 Auto Scaling resource limits for your AWS account.</p> <p>For information about requesting an increase in these limits, see <a href=\"https://docs.aws.amazon.com/autoscaling/ec2/userguide/as-account-limits.html\">Amazon EC2 Auto Scaling Limits</a> in the <i>Amazon EC2 Auto Scaling User Guide</i>.</p>"
+      "documentation":"<p>Describes the current Amazon EC2 Auto Scaling resource quotas for your AWS account.</p> <p>For information about requesting an increase, see <a href=\"https://docs.aws.amazon.com/autoscaling/ec2/userguide/as-account-limits.html\">Amazon EC2 Auto Scaling Service Quotas</a> in the <i>Amazon EC2 Auto Scaling User Guide</i>.</p>"
     },
     "DescribeAdjustmentTypes":{
       "name":"DescribeAdjustmentTypes",
@@ -501,7 +501,7 @@
         {"shape":"InvalidNextToken"},
         {"shape":"ResourceContentionFault"}
       ],
-      "documentation":"<p>Describes the actions scheduled for your Auto Scaling group that haven't run or that have not reached their end time. To describe the actions that have already run, use <a>DescribeScalingActivities</a>. </p>"
+      "documentation":"<p>Describes the actions scheduled for your Auto Scaling group that haven't run or that have not reached their end time. To describe the actions that have already run, use <a>DescribeScalingActivities</a>.</p>"
     },
     "DescribeTags":{
       "name":"DescribeTags",
@@ -621,7 +621,7 @@
       "errors":[
         {"shape":"ResourceContentionFault"}
       ],
-      "documentation":"<p>Moves the specified instances into the standby state.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/autoscaling/ec2/userguide/as-enter-exit-standby.html\">Temporarily Removing Instances from Your Auto Scaling Group</a> in the <i>Amazon EC2 Auto Scaling User Guide</i>.</p>"
+      "documentation":"<p>Moves the specified instances into the standby state.</p> <p>If you choose to decrement the desired capacity of the Auto Scaling group, the instances can enter standby as long as the desired capacity of the Auto Scaling group after the instances are placed into standby is equal to or greater than the minimum capacity of the group.</p> <p>If you choose not to decrement the desired capacity of the Auto Scaling group, the Auto Scaling group launches new instances to replace the instances on standby.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/autoscaling/ec2/userguide/as-enter-exit-standby.html\">Temporarily Removing Instances from Your Auto Scaling Group</a> in the <i>Amazon EC2 Auto Scaling User Guide</i>.</p>"
     },
     "ExecutePolicy":{
       "name":"ExecutePolicy",
@@ -650,7 +650,7 @@
       "errors":[
         {"shape":"ResourceContentionFault"}
       ],
-      "documentation":"<p>Moves the specified instances out of the standby state.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/autoscaling/ec2/userguide/as-enter-exit-standby.html\">Temporarily Removing Instances from Your Auto Scaling Group</a> in the <i>Amazon EC2 Auto Scaling User Guide</i>.</p>"
+      "documentation":"<p>Moves the specified instances out of the standby state.</p> <p>After you put the instances back in service, the desired capacity is incremented.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/autoscaling/ec2/userguide/as-enter-exit-standby.html\">Temporarily Removing Instances from Your Auto Scaling Group</a> in the <i>Amazon EC2 Auto Scaling User Guide</i>.</p>"
     },
     "PutLifecycleHook":{
       "name":"PutLifecycleHook",
@@ -699,7 +699,7 @@
         {"shape":"ResourceContentionFault"},
         {"shape":"ServiceLinkedRoleFailure"}
       ],
-      "documentation":"<p>Creates or updates a scaling policy for an Auto Scaling group. To update an existing scaling policy, use the existing policy name and set the parameters to change. Any existing parameter not changed in an update to an existing policy is not changed in this update request.</p> <p>For more information about using scaling policies to scale your Auto Scaling group automatically, see <a href=\"https://docs.aws.amazon.com/autoscaling/ec2/userguide/as-scale-based-on-demand.html\">Dynamic Scaling</a> in the <i>Amazon EC2 Auto Scaling User Guide</i>.</p>"
+      "documentation":"<p>Creates or updates a scaling policy for an Auto Scaling group.</p> <p>For more information about using scaling policies to scale your Auto Scaling group automatically, see <a href=\"https://docs.aws.amazon.com/autoscaling/ec2/userguide/as-scale-based-on-demand.html\">Dynamic Scaling</a> in the <i>Amazon EC2 Auto Scaling User Guide</i>.</p>"
     },
     "PutScheduledUpdateGroupAction":{
       "name":"PutScheduledUpdateGroupAction",
@@ -814,7 +814,7 @@
         {"shape":"ScalingActivityInProgressFault"},
         {"shape":"ResourceContentionFault"}
       ],
-      "documentation":"<p>Terminates the specified instance and optionally adjusts the desired group size.</p> <p>This call simply makes a termination request. The instance is not terminated immediately.</p>"
+      "documentation":"<p>Terminates the specified instance and optionally adjusts the desired group size. This call simply makes a termination request. The instance is not terminated immediately. When an instance is terminated, the instance status changes to <code>terminated</code>. You can't connect to or start an instance after you've terminated it.</p> <p>If you do not specify the option to decrement the desired capacity, Amazon EC2 Auto Scaling launches instances to replace the ones that are terminated. </p> <p>By default, Amazon EC2 Auto Scaling balances instances across all Availability Zones. If you decrement the desired capacity, your Auto Scaling group can become unbalanced between Availability Zones. Amazon EC2 Auto Scaling tries to rebalance the group, and rebalancing might terminate instances in other zones. For more information, see <a href=\"https://docs.aws.amazon.com/autoscaling/ec2/userguide/auto-scaling-benefits.html#AutoScalingBehavior.InstanceUsage\">Rebalancing Activities</a> in the <i>Amazon EC2 Auto Scaling User Guide</i>.</p>"
     },
     "UpdateAutoScalingGroup":{
       "name":"UpdateAutoScalingGroup",
@@ -828,7 +828,7 @@
         {"shape":"ResourceContentionFault"},
         {"shape":"ServiceLinkedRoleFailure"}
       ],
-      "documentation":"<p>Updates the configuration for the specified Auto Scaling group.</p> <p>To update an Auto Scaling group, specify the name of the group and the parameter that you want to change. Any parameters that you don't specify are not changed by this update request. The new settings take effect on any scaling activities after this call returns. Scaling activities that are currently in progress aren't affected.</p> <p>If you associate a new launch configuration or template with an Auto Scaling group, all new instances will get the updated configuration. Existing instances continue to run with the configuration that they were originally launched with. When you update a group to specify a mixed instances policy instead of a launch configuration or template, existing instances may be replaced to match the new purchasing options that you specified in the policy. For example, if the group currently has 100% On-Demand capacity and the policy specifies 50% Spot capacity, this means that half of your instances will be gradually terminated and relaunched as Spot Instances. When replacing instances, Amazon EC2 Auto Scaling launches new instances before terminating the old ones, so that updating your group does not compromise the performance or availability of your application.</p> <p>Note the following about changing <code>DesiredCapacity</code>, <code>MaxSize</code>, or <code>MinSize</code>:</p> <ul> <li> <p>If a scale-in event occurs as a result of a new <code>DesiredCapacity</code> value that is lower than the current size of the group, the Auto Scaling group uses its termination policy to determine which instances to terminate.</p> </li> <li> <p>If you specify a new value for <code>MinSize</code> without specifying a value for <code>DesiredCapacity</code>, and the new <code>MinSize</code> is larger than the current size of the group, this sets the group's <code>DesiredCapacity</code> to the new <code>MinSize</code> value.</p> </li> <li> <p>If you specify a new value for <code>MaxSize</code> without specifying a value for <code>DesiredCapacity</code>, and the new <code>MaxSize</code> is smaller than the current size of the group, this sets the group's <code>DesiredCapacity</code> to the new <code>MaxSize</code> value.</p> </li> </ul> <p>To see which parameters have been set, use <a>DescribeAutoScalingGroups</a>. You can also view the scaling policies for an Auto Scaling group using <a>DescribePolicies</a>. If the group has scaling policies, you can update them using <a>PutScalingPolicy</a>.</p>"
+      "documentation":"<p>Updates the configuration for the specified Auto Scaling group.</p> <p>To update an Auto Scaling group, specify the name of the group and the parameter that you want to change. Any parameters that you don't specify are not changed by this update request. The new settings take effect on any scaling activities after this call returns. </p> <p>If you associate a new launch configuration or template with an Auto Scaling group, all new instances will get the updated configuration. Existing instances continue to run with the configuration that they were originally launched with. When you update a group to specify a mixed instances policy instead of a launch configuration or template, existing instances may be replaced to match the new purchasing options that you specified in the policy. For example, if the group currently has 100% On-Demand capacity and the policy specifies 50% Spot capacity, this means that half of your instances will be gradually terminated and relaunched as Spot Instances. When replacing instances, Amazon EC2 Auto Scaling launches new instances before terminating the old ones, so that updating your group does not compromise the performance or availability of your application.</p> <p>Note the following about changing <code>DesiredCapacity</code>, <code>MaxSize</code>, or <code>MinSize</code>:</p> <ul> <li> <p>If a scale-in event occurs as a result of a new <code>DesiredCapacity</code> value that is lower than the current size of the group, the Auto Scaling group uses its termination policy to determine which instances to terminate.</p> </li> <li> <p>If you specify a new value for <code>MinSize</code> without specifying a value for <code>DesiredCapacity</code>, and the new <code>MinSize</code> is larger than the current size of the group, this sets the group's <code>DesiredCapacity</code> to the new <code>MinSize</code> value.</p> </li> <li> <p>If you specify a new value for <code>MaxSize</code> without specifying a value for <code>DesiredCapacity</code>, and the new <code>MaxSize</code> is smaller than the current size of the group, this sets the group's <code>DesiredCapacity</code> to the new <code>MaxSize</code> value.</p> </li> </ul> <p>To see which parameters have been set, use <a>DescribeAutoScalingGroups</a>. You can also view the scaling policies for an Auto Scaling group using <a>DescribePolicies</a>. If the group has scaling policies, you can update them using <a>PutScalingPolicy</a>.</p>"
     }
   },
   "shapes":{
@@ -1060,7 +1060,7 @@
         },
         "MixedInstancesPolicy":{
           "shape":"MixedInstancesPolicy",
-          "documentation":"<p>The mixed instances policy for the group. </p>"
+          "documentation":"<p>The mixed instances policy for the group.</p>"
         },
         "MinSize":{
           "shape":"AutoScalingGroupMinSize",
@@ -1141,6 +1141,10 @@
         "ServiceLinkedRoleARN":{
           "shape":"ResourceName",
           "documentation":"<p>The Amazon Resource Name (ARN) of the service-linked role that the Auto Scaling group uses to call other AWS services on your behalf.</p>"
+        },
+        "MaxInstanceLifetime":{
+          "shape":"MaxInstanceLifetime",
+          "documentation":"<p>The maximum amount of time, in seconds, that an instance can be in service.</p> <p>Valid Range: Minimum value of 604800.</p>"
         }
       },
       "documentation":"<p>Describes an Auto Scaling group.</p>"
@@ -1157,7 +1161,7 @@
       "members":{
         "AutoScalingGroupNames":{
           "shape":"AutoScalingGroupNames",
-          "documentation":"<p>The names of the Auto Scaling groups. Each name can be a maximum of 1600 characters. By default, you can only specify up to 50 names. You can optionally increase this limit using the <code>MaxRecords</code> parameter. </p> <p>If you omit this parameter, all Auto Scaling groups are described.</p>"
+          "documentation":"<p>The names of the Auto Scaling groups. Each name can be a maximum of 1600 characters. By default, you can only specify up to 50 names. You can optionally increase this limit using the <code>MaxRecords</code> parameter.</p> <p>If you omit this parameter, all Auto Scaling groups are described.</p>"
         },
         "NextToken":{
           "shape":"XmlString",
@@ -1165,7 +1169,7 @@
         },
         "MaxRecords":{
           "shape":"MaxRecords",
-          "documentation":"<p>The maximum number of items to return with this call. The default value is <code>50</code> and the maximum value is <code>100</code>. </p>"
+          "documentation":"<p>The maximum number of items to return with this call. The default value is <code>50</code> and the maximum value is <code>100</code>.</p>"
         }
       }
     },
@@ -1202,6 +1206,10 @@
           "shape":"XmlStringMaxLen19",
           "documentation":"<p>The ID of the instance.</p>"
         },
+        "InstanceType":{
+          "shape":"XmlStringMaxLen255",
+          "documentation":"<p>The instance type of the EC2 instance.</p>"
+        },
         "AutoScalingGroupName":{
           "shape":"XmlStringMaxLen255",
           "documentation":"<p>The name of the Auto Scaling group for the instance.</p>"
@@ -1229,6 +1237,10 @@
         "ProtectedFromScaleIn":{
           "shape":"InstanceProtected",
           "documentation":"<p>Indicates whether the instance is protected from termination by Amazon EC2 Auto Scaling when scaling in.</p>"
+        },
+        "WeightedCapacity":{
+          "shape":"XmlStringMaxLen32",
+          "documentation":"<p>The number of capacity units contributed by the instance based on its instance type.</p> <p>Valid Range: Minimum value of 1. Maximum value of 999.</p>"
         }
       },
       "documentation":"<p>Describes an EC2 instance associated with an Auto Scaling group.</p>"
@@ -1264,7 +1276,7 @@
       "members":{
         "FailedScheduledActions":{
           "shape":"FailedScheduledUpdateGroupActionRequests",
-          "documentation":"<p>The names of the scheduled actions that could not be deleted, including an error message. </p>"
+          "documentation":"<p>The names of the scheduled actions that could not be deleted, including an error message.</p>"
         }
       }
     },
@@ -1307,7 +1319,7 @@
         },
         "ScheduledUpdateGroupActions":{
           "shape":"ScheduledUpdateGroupActionRequests",
-          "documentation":"<p>One or more scheduled actions. The maximum number allowed is 50. </p>"
+          "documentation":"<p>One or more scheduled actions. The maximum number allowed is 50.</p>"
         }
       }
     },
@@ -1486,6 +1498,10 @@
         "ServiceLinkedRoleARN":{
           "shape":"ResourceName",
           "documentation":"<p>The Amazon Resource Name (ARN) of the service-linked role that the Auto Scaling group uses to call other AWS services on your behalf. By default, Amazon EC2 Auto Scaling uses a service-linked role named AWSServiceRoleForAutoScaling, which it creates if it does not exist. For more information, see <a href=\"https://docs.aws.amazon.com/autoscaling/ec2/userguide/autoscaling-service-linked-role.html\">Service-Linked Roles</a> in the <i>Amazon EC2 Auto Scaling User Guide</i>.</p>"
+        },
+        "MaxInstanceLifetime":{
+          "shape":"MaxInstanceLifetime",
+          "documentation":"<p>The maximum amount of time, in seconds, that an instance can be in service.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/autoscaling/ec2/userguide/asg-max-instance-lifetime.html\">Replacing Auto Scaling Instances Based on Maximum Instance Lifetime</a> in the <i>Amazon EC2 Auto Scaling User Guide</i>.</p> <p>Valid Range: Minimum value of 604800.</p>"
         }
       }
     },
@@ -1511,11 +1527,11 @@
         },
         "ClassicLinkVPCId":{
           "shape":"XmlStringMaxLen255",
-          "documentation":"<p>The ID of a ClassicLink-enabled VPC to link your EC2-Classic instances to. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/vpc-classiclink.html\">ClassicLink</a> in the <i>Amazon EC2 User Guide for Linux Instances</i> and <a href=\"https://docs.aws.amazon.com/autoscaling/ec2/userguide/asg-in-vpc.html#as-ClassicLink\">Linking EC2-Classic Instances to a VPC</a> in the <i>Amazon EC2 Auto Scaling User Guide</i>.</p> <p>This parameter can only be used if you are launching EC2-Classic instances. </p>"
+          "documentation":"<p>The ID of a ClassicLink-enabled VPC to link your EC2-Classic instances to. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/vpc-classiclink.html\">ClassicLink</a> in the <i>Amazon EC2 User Guide for Linux Instances</i> and <a href=\"https://docs.aws.amazon.com/autoscaling/ec2/userguide/asg-in-vpc.html#as-ClassicLink\">Linking EC2-Classic Instances to a VPC</a> in the <i>Amazon EC2 Auto Scaling User Guide</i>.</p> <p>This parameter can only be used if you are launching EC2-Classic instances.</p>"
         },
         "ClassicLinkVPCSecurityGroups":{
           "shape":"ClassicLinkVPCSecurityGroups",
-          "documentation":"<p>The IDs of one or more security groups for the specified ClassicLink-enabled VPC. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/vpc-classiclink.html\">ClassicLink</a> in the <i>Amazon EC2 User Guide for Linux Instances</i> and <a href=\"https://docs.aws.amazon.com/autoscaling/ec2/userguide/asg-in-vpc.html#as-ClassicLink\">Linking EC2-Classic Instances to a VPC</a> in the <i>Amazon EC2 Auto Scaling User Guide</i>.</p> <p>If you specify the <code>ClassicLinkVPCId</code> parameter, you must specify this parameter. </p>"
+          "documentation":"<p>The IDs of one or more security groups for the specified ClassicLink-enabled VPC. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/vpc-classiclink.html\">ClassicLink</a> in the <i>Amazon EC2 User Guide for Linux Instances</i> and <a href=\"https://docs.aws.amazon.com/autoscaling/ec2/userguide/asg-in-vpc.html#as-ClassicLink\">Linking EC2-Classic Instances to a VPC</a> in the <i>Amazon EC2 Auto Scaling User Guide</i>.</p> <p>If you specify the <code>ClassicLinkVPCId</code> parameter, you must specify this parameter.</p>"
         },
         "UserData":{
           "shape":"XmlStringUserData",
@@ -1543,19 +1559,19 @@
         },
         "InstanceMonitoring":{
           "shape":"InstanceMonitoring",
-          "documentation":"<p>Controls whether instances in this group are launched with detailed (<code>true</code>) or basic (<code>false</code>) monitoring. </p> <p>The default value is <code>true</code> (enabled). </p> <important> <p>When detailed monitoring is enabled, Amazon CloudWatch generates metrics every minute and your account is charged a fee. When you disable detailed monitoring, CloudWatch generates metrics every 5 minutes. For more information, see <a href=\"https://docs.aws.amazon.com/autoscaling/latest/userguide/as-instance-monitoring.html#enable-as-instance-metrics\">Configure Monitoring for Auto Scaling Instances</a> in the <i>Amazon EC2 Auto Scaling User Guide</i>. </p> </important>"
+          "documentation":"<p>Controls whether instances in this group are launched with detailed (<code>true</code>) or basic (<code>false</code>) monitoring.</p> <p>The default value is <code>true</code> (enabled).</p> <important> <p>When detailed monitoring is enabled, Amazon CloudWatch generates metrics every minute and your account is charged a fee. When you disable detailed monitoring, CloudWatch generates metrics every 5 minutes. For more information, see <a href=\"https://docs.aws.amazon.com/autoscaling/latest/userguide/as-instance-monitoring.html#enable-as-instance-metrics\">Configure Monitoring for Auto Scaling Instances</a> in the <i>Amazon EC2 Auto Scaling User Guide</i>.</p> </important>"
         },
         "SpotPrice":{
           "shape":"SpotPrice",
-          "documentation":"<p>The maximum hourly price to be paid for any Spot Instance launched to fulfill the request. Spot Instances are launched when the price you specify exceeds the current Spot market price. For more information, see <a href=\"https://docs.aws.amazon.com/autoscaling/ec2/userguide/asg-launch-spot-instances.html\">Launching Spot Instances in Your Auto Scaling Group</a> in the <i>Amazon EC2 Auto Scaling User Guide</i>.</p> <p>If a Spot price is set, then the Auto Scaling group will only launch instances when the Spot price has been met, regardless of the setting in the Auto Scaling group's <code>DesiredCapacity</code>. </p> <note> <p>When you change your Spot price by creating a new launch configuration, running instances will continue to run as long as the Spot price for those running instances is higher than the current Spot market price. </p> </note>"
+          "documentation":"<p>The maximum hourly price to be paid for any Spot Instance launched to fulfill the request. Spot Instances are launched when the price you specify exceeds the current Spot price. For more information, see <a href=\"https://docs.aws.amazon.com/autoscaling/ec2/userguide/asg-launch-spot-instances.html\">Launching Spot Instances in Your Auto Scaling Group</a> in the <i>Amazon EC2 Auto Scaling User Guide</i>.</p> <note> <p>When you change your maximum price by creating a new launch configuration, running instances will continue to run as long as the maximum price for those running instances is higher than the current Spot price.</p> </note>"
         },
         "IamInstanceProfile":{
           "shape":"XmlStringMaxLen1600",
-          "documentation":"<p>The name or the Amazon Resource Name (ARN) of the instance profile associated with the IAM role for the instance. The instance profile contains the IAM role. </p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/autoscaling/ec2/userguide/us-iam-role.html\">IAM Role for Applications That Run on Amazon EC2 Instances</a> in the <i>Amazon EC2 Auto Scaling User Guide</i>.</p>"
+          "documentation":"<p>The name or the Amazon Resource Name (ARN) of the instance profile associated with the IAM role for the instance. The instance profile contains the IAM role.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/autoscaling/ec2/userguide/us-iam-role.html\">IAM Role for Applications That Run on Amazon EC2 Instances</a> in the <i>Amazon EC2 Auto Scaling User Guide</i>.</p>"
         },
         "EbsOptimized":{
           "shape":"EbsOptimized",
-          "documentation":"<p>Specifies whether the launch configuration is optimized for EBS I/O (<code>true</code>) or not (<code>false</code>). The optimization provides dedicated throughput to Amazon EBS and an optimized configuration stack to provide optimal I/O performance. This optimization is not available with all instance types. Additional fees are incurred when you enable EBS optimization for an instance type that is not EBS-optimized by default. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSOptimized.html\">Amazon EBS-Optimized Instances</a> in the <i>Amazon EC2 User Guide for Linux Instances</i>.</p> <p>The default value is <code>false</code>. </p>"
+          "documentation":"<p>Specifies whether the launch configuration is optimized for EBS I/O (<code>true</code>) or not (<code>false</code>). The optimization provides dedicated throughput to Amazon EBS and an optimized configuration stack to provide optimal I/O performance. This optimization is not available with all instance types. Additional fees are incurred when you enable EBS optimization for an instance type that is not EBS-optimized by default. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSOptimized.html\">Amazon EBS-Optimized Instances</a> in the <i>Amazon EC2 User Guide for Linux Instances</i>.</p> <p>The default value is <code>false</code>.</p>"
         },
         "AssociatePublicIpAddress":{
           "shape":"AssociatePublicIpAddress",
@@ -1563,7 +1579,7 @@
         },
         "PlacementTenancy":{
           "shape":"XmlStringMaxLen64",
-          "documentation":"<p>The tenancy of the instance. An instance with <code>dedicated</code> tenancy runs on isolated, single-tenant hardware and can only be launched into a VPC.</p> <p>To launch dedicated instances into a shared tenancy VPC (a VPC with the instance placement tenancy attribute set to <code>default</code>), you must set the value of this parameter to <code>dedicated</code>.</p> <p>If you specify <code>PlacementTenancy</code>, you must specify at least one subnet for <code>VPCZoneIdentifier</code> when you create your group.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/autoscaling/ec2/userguide/asg-in-vpc.html#as-vpc-tenancy\">Instance Placement Tenancy</a> in the <i>Amazon EC2 Auto Scaling User Guide</i>.</p> <p>Valid values: <code>default</code> | <code>dedicated</code> </p>"
+          "documentation":"<p>The tenancy of the instance. An instance with <code>dedicated</code> tenancy runs on isolated, single-tenant hardware and can only be launched into a VPC.</p> <p>To launch dedicated instances into a shared tenancy VPC (a VPC with the instance placement tenancy attribute set to <code>default</code>), you must set the value of this parameter to <code>dedicated</code>.</p> <p>If you specify <code>PlacementTenancy</code>, you must specify at least one subnet for <code>VPCZoneIdentifier</code> when you create your group.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/autoscaling/ec2/userguide/asg-in-vpc.html#as-vpc-tenancy\">Instance Placement Tenancy</a> in the <i>Amazon EC2 Auto Scaling User Guide</i>.</p> <p>Valid Values: <code>default</code> | <code>dedicated</code> </p>"
         }
       }
     },
@@ -1606,7 +1622,7 @@
           "documentation":"<p>The unit of the metric.</p>"
         }
       },
-      "documentation":"<p>Represents a CloudWatch metric of your choosing for a target tracking scaling policy to use with Amazon EC2 Auto Scaling.</p> <p>To create your customized metric specification:</p> <ul> <li> <p>Add values for each required parameter from CloudWatch. You can use an existing metric, or a new metric that you create. To use your own metric, you must first publish the metric to CloudWatch. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/publishingMetrics.html\">Publish Custom Metrics</a> in the <i>Amazon CloudWatch User Guide</i>.</p> </li> <li> <p>Choose a metric that changes proportionally with capacity. The value of the metric should increase or decrease in inverse proportion to the number of capacity units. That is, the value of the metric should decrease when capacity increases. </p> </li> </ul> <p>For more information about CloudWatch, see <a href=\"https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/cloudwatch_concepts.html\">Amazon CloudWatch Concepts</a>. </p>"
+      "documentation":"<p>Represents a CloudWatch metric of your choosing for a target tracking scaling policy to use with Amazon EC2 Auto Scaling.</p> <p>To create your customized metric specification:</p> <ul> <li> <p>Add values for each required parameter from CloudWatch. You can use an existing metric, or a new metric that you create. To use your own metric, you must first publish the metric to CloudWatch. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/publishingMetrics.html\">Publish Custom Metrics</a> in the <i>Amazon CloudWatch User Guide</i>.</p> </li> <li> <p>Choose a metric that changes proportionally with capacity. The value of the metric should increase or decrease in inverse proportion to the number of capacity units. That is, the value of the metric should decrease when capacity increases.</p> </li> </ul> <p>For more information about CloudWatch, see <a href=\"https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/cloudwatch_concepts.html\">Amazon CloudWatch Concepts</a>.</p>"
     },
     "DeleteAutoScalingGroupType":{
       "type":"structure",
@@ -1707,11 +1723,11 @@
       "members":{
         "MaxNumberOfAutoScalingGroups":{
           "shape":"MaxNumberOfAutoScalingGroups",
-          "documentation":"<p>The maximum number of groups allowed for your AWS account. The default limit is 200 per AWS Region.</p>"
+          "documentation":"<p>The maximum number of groups allowed for your AWS account. The default is 200 groups per AWS Region.</p>"
         },
         "MaxNumberOfLaunchConfigurations":{
           "shape":"MaxNumberOfLaunchConfigurations",
-          "documentation":"<p>The maximum number of launch configurations allowed for your AWS account. The default limit is 200 per AWS Region.</p>"
+          "documentation":"<p>The maximum number of launch configurations allowed for your AWS account. The default is 200 launch configurations per AWS Region.</p>"
         },
         "NumberOfAutoScalingGroups":{
           "shape":"NumberOfAutoScalingGroups",
@@ -2091,15 +2107,15 @@
       "members":{
         "SnapshotId":{
           "shape":"XmlStringMaxLen255",
-          "documentation":"<p>The snapshot ID of the volume to use. </p> <p>Conditional: This parameter is optional if you specify a volume size. If you specify both <code>SnapshotId</code> and <code>VolumeSize</code>, <code>VolumeSize</code> must be equal or greater than the size of the snapshot.</p>"
+          "documentation":"<p>The snapshot ID of the volume to use.</p> <p>Conditional: This parameter is optional if you specify a volume size. If you specify both <code>SnapshotId</code> and <code>VolumeSize</code>, <code>VolumeSize</code> must be equal or greater than the size of the snapshot.</p>"
         },
         "VolumeSize":{
           "shape":"BlockDeviceEbsVolumeSize",
-          "documentation":"<p>The volume size, in Gibibytes (GiB). </p> <p>This can be a number from 1-1,024 for <code>standard</code>, 4-16,384 for <code>io1</code>, 1-16,384 for <code>gp2</code>, and 500-16,384 for <code>st1</code> and <code>sc1</code>. If you specify a snapshot, the volume size must be equal to or larger than the snapshot size.</p> <p>Default: If you create a volume from a snapshot and you don't specify a volume size, the default is the snapshot size.</p> <note> <p>At least one of VolumeSize or SnapshotId is required.</p> </note>"
+          "documentation":"<p>The volume size, in Gibibytes (GiB).</p> <p>This can be a number from 1-1,024 for <code>standard</code>, 4-16,384 for <code>io1</code>, 1-16,384 for <code>gp2</code>, and 500-16,384 for <code>st1</code> and <code>sc1</code>. If you specify a snapshot, the volume size must be equal to or larger than the snapshot size.</p> <p>Default: If you create a volume from a snapshot and you don't specify a volume size, the default is the snapshot size.</p> <note> <p>At least one of VolumeSize or SnapshotId is required.</p> </note>"
         },
         "VolumeType":{
           "shape":"BlockDeviceEbsVolumeType",
-          "documentation":"<p>The volume type, which can be <code>standard</code> for Magnetic, <code>io1</code> for Provisioned IOPS SSD, <code>gp2</code> for General Purpose SSD, <code>st1</code> for Throughput Optimized HDD, or <code>sc1</code> for Cold HDD. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSVolumeTypes.html\">Amazon EBS Volume Types</a> in the <i>Amazon EC2 User Guide for Linux Instances</i>.</p> <p>Valid values: <code>standard</code> | <code>io1</code> | <code>gp2</code> | <code>st1</code> | <code>sc1</code> </p>"
+          "documentation":"<p>The volume type, which can be <code>standard</code> for Magnetic, <code>io1</code> for Provisioned IOPS SSD, <code>gp2</code> for General Purpose SSD, <code>st1</code> for Throughput Optimized HDD, or <code>sc1</code> for Cold HDD. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSVolumeTypes.html\">Amazon EBS Volume Types</a> in the <i>Amazon EC2 User Guide for Linux Instances</i>.</p> <p>Valid Values: <code>standard</code> | <code>io1</code> | <code>gp2</code> | <code>st1</code> | <code>sc1</code> </p>"
         },
         "DeleteOnTermination":{
           "shape":"BlockDeviceEbsDeleteOnTermination",
@@ -2111,7 +2127,7 @@
         },
         "Encrypted":{
           "shape":"BlockDeviceEbsEncrypted",
-          "documentation":"<p>Specifies whether the volume should be encrypted. Encrypted EBS volumes can only be attached to instances that support Amazon EBS encryption. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSEncryption.html#EBSEncryption_supported_instances\">Supported Instance Types</a>. If your AMI uses encrypted volumes, you can also only launch it on supported instance types.</p> <note> <p>If you are creating a volume from a snapshot, you cannot specify an encryption value. Volumes that are created from encrypted snapshots are automatically encrypted, and volumes that are created from unencrypted snapshots are automatically unencrypted. By default, encrypted snapshots use the AWS managed CMK that is used for EBS encryption, but you can specify a custom CMK when you create the snapshot. The ability to encrypt a snapshot during copying also allows you to apply a new CMK to an already-encrypted snapshot. Volumes restored from the resulting copy are only accessible using the new CMK. </p> <p>Enabling <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSEncryption.html#encryption-by-default\">encryption by default</a> results in all EBS volumes being encrypted with the AWS managed CMK or a customer managed CMK, whether or not the snapshot was encrypted.</p> </note> <p>For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/AMIEncryption.html\">Using Encryption with EBS-Backed AMIs</a> in the <i>Amazon EC2 User Guide for Linux Instances</i> and <a href=\"https://docs.aws.amazon.com/autoscaling/ec2/userguide/key-policy-requirements-EBS-encryption.html\">Required CMK Key Policy for Use with Encrypted Volumes</a> in the <i>Amazon EC2 Auto Scaling User Guide</i>.</p>"
+          "documentation":"<p>Specifies whether the volume should be encrypted. Encrypted EBS volumes can only be attached to instances that support Amazon EBS encryption. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSEncryption.html#EBSEncryption_supported_instances\">Supported Instance Types</a>. If your AMI uses encrypted volumes, you can also only launch it on supported instance types.</p> <note> <p>If you are creating a volume from a snapshot, you cannot specify an encryption value. Volumes that are created from encrypted snapshots are automatically encrypted, and volumes that are created from unencrypted snapshots are automatically unencrypted. By default, encrypted snapshots use the AWS managed CMK that is used for EBS encryption, but you can specify a custom CMK when you create the snapshot. The ability to encrypt a snapshot during copying also allows you to apply a new CMK to an already-encrypted snapshot. Volumes restored from the resulting copy are only accessible using the new CMK.</p> <p>Enabling <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSEncryption.html#encryption-by-default\">encryption by default</a> results in all EBS volumes being encrypted with the AWS managed CMK or a customer managed CMK, whether or not the snapshot was encrypted.</p> </note> <p>For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/AMIEncryption.html\">Using Encryption with EBS-Backed AMIs</a> in the <i>Amazon EC2 User Guide for Linux Instances</i> and <a href=\"https://docs.aws.amazon.com/autoscaling/ec2/userguide/key-policy-requirements-EBS-encryption.html\">Required CMK Key Policy for Use with Encrypted Volumes</a> in the <i>Amazon EC2 Auto Scaling User Guide</i>.</p>"
         }
       },
       "documentation":"<p>Describes an Amazon EBS volume. Used in combination with <a>BlockDeviceMapping</a>.</p>"
@@ -2296,6 +2312,10 @@
           "shape":"XmlStringMaxLen19",
           "documentation":"<p>The ID of the instance.</p>"
         },
+        "InstanceType":{
+          "shape":"XmlStringMaxLen255",
+          "documentation":"<p>The instance type of the EC2 instance.</p>"
+        },
         "AvailabilityZone":{
           "shape":"XmlStringMaxLen255",
           "documentation":"<p>The Availability Zone in which the instance is running.</p>"
@@ -2319,6 +2339,10 @@
         "ProtectedFromScaleIn":{
           "shape":"InstanceProtected",
           "documentation":"<p>Indicates whether the instance is protected from termination by Amazon EC2 Auto Scaling when scaling in.</p>"
+        },
+        "WeightedCapacity":{
+          "shape":"XmlStringMaxLen32",
+          "documentation":"<p>The number of capacity units contributed by the instance based on its instance type.</p> <p>Valid Range: Minimum value of 1. Maximum value of 999.</p>"
         }
       },
       "documentation":"<p>Describes an EC2 instance.</p>"
@@ -2347,30 +2371,30 @@
       "members":{
         "OnDemandAllocationStrategy":{
           "shape":"XmlString",
-          "documentation":"<p>Indicates how to allocate instance types to fulfill On-Demand capacity. </p> <p>The only valid value is <code>prioritized</code>, which is also the default value. This strategy uses the order of instance type overrides for the <a>LaunchTemplate</a> to define the launch priority of each instance type. The first instance type in the array is prioritized higher than the last. If all your On-Demand capacity cannot be fulfilled using your highest priority instance, then the Auto Scaling groups launches the remaining capacity using the second priority instance type, and so on. </p>"
+          "documentation":"<p>Indicates how to allocate instance types to fulfill On-Demand capacity.</p> <p>The only valid value is <code>prioritized</code>, which is also the default value. This strategy uses the order of instance type overrides for the <a>LaunchTemplate</a> to define the launch priority of each instance type. The first instance type in the array is prioritized higher than the last. If all your On-Demand capacity cannot be fulfilled using your highest priority instance, then the Auto Scaling groups launches the remaining capacity using the second priority instance type, and so on.</p>"
         },
         "OnDemandBaseCapacity":{
           "shape":"OnDemandBaseCapacity",
-          "documentation":"<p>The minimum amount of the Auto Scaling group's capacity that must be fulfilled by On-Demand Instances. This base portion is provisioned first as your group scales.</p> <p>The default value is <code>0</code>. If you leave this parameter set to <code>0</code>, On-Demand Instances are launched as a percentage of the Auto Scaling group's desired capacity, per the <code>OnDemandPercentageAboveBaseCapacity</code> setting.</p>"
+          "documentation":"<p>The minimum amount of the Auto Scaling group's capacity that must be fulfilled by On-Demand Instances. This base portion is provisioned first as your group scales.</p> <p>Default if not set is 0. If you leave it set to 0, On-Demand Instances are launched as a percentage of the Auto Scaling group's desired capacity, per the <code>OnDemandPercentageAboveBaseCapacity</code> setting.</p> <note> <p>An update to this setting means a gradual replacement of instances to maintain the specified number of On-Demand Instances for your base capacity. When replacing instances, Amazon EC2 Auto Scaling launches new instances before terminating the old ones.</p> </note>"
         },
         "OnDemandPercentageAboveBaseCapacity":{
           "shape":"OnDemandPercentageAboveBaseCapacity",
-          "documentation":"<p>Controls the percentages of On-Demand Instances and Spot Instances for your additional capacity beyond <code>OnDemandBaseCapacity</code>. The range is 0–100.</p> <p>The default value is <code>100</code>. If you leave this parameter set to <code>100</code>, the percentages are 100% for On-Demand Instances and 0% for Spot Instances. </p>"
+          "documentation":"<p>Controls the percentages of On-Demand Instances and Spot Instances for your additional capacity beyond <code>OnDemandBaseCapacity</code>.</p> <p>Default if not set is 100. If you leave it set to 100, the percentages are 100% for On-Demand Instances and 0% for Spot Instances.</p> <note> <p>An update to this setting means a gradual replacement of instances to maintain the percentage of On-Demand Instances for your additional capacity above the base capacity. When replacing instances, Amazon EC2 Auto Scaling launches new instances before terminating the old ones.</p> </note> <p>Valid Range: Minimum value of 0. Maximum value of 100.</p>"
         },
         "SpotAllocationStrategy":{
           "shape":"XmlString",
-          "documentation":"<p>Indicates how to allocate instances across Spot Instance pools. </p> <p>If the allocation strategy is <code>lowest-price</code>, the Auto Scaling group launches instances using the Spot pools with the lowest price, and evenly allocates your instances across the number of Spot pools that you specify. If the allocation strategy is <code>capacity-optimized</code>, the Auto Scaling group launches instances using Spot pools that are optimally chosen based on the available Spot capacity. </p> <p>The default Spot allocation strategy for calls that you make through the API, the AWS CLI, or the AWS SDKs is <code>lowest-price</code>. The default Spot allocation strategy for the AWS Management Console is <code>capacity-optimized</code>.</p> <p>Valid values: <code>lowest-price</code> | <code>capacity-optimized</code> </p>"
+          "documentation":"<p>Indicates how to allocate instances across Spot Instance pools.</p> <p>If the allocation strategy is <code>lowest-price</code>, the Auto Scaling group launches instances using the Spot pools with the lowest price, and evenly allocates your instances across the number of Spot pools that you specify. If the allocation strategy is <code>capacity-optimized</code>, the Auto Scaling group launches instances using Spot pools that are optimally chosen based on the available Spot capacity.</p> <p>The default Spot allocation strategy for calls that you make through the API, the AWS CLI, or the AWS SDKs is <code>lowest-price</code>. The default Spot allocation strategy for the AWS Management Console is <code>capacity-optimized</code>.</p> <p>Valid values: <code>lowest-price</code> | <code>capacity-optimized</code> </p>"
         },
         "SpotInstancePools":{
           "shape":"SpotInstancePools",
-          "documentation":"<p>The number of Spot Instance pools across which to allocate your Spot Instances. The Spot pools are determined from the different instance types in the Overrides array of <a>LaunchTemplate</a>. The range is 1–20. The default value is <code>2</code>. </p> <p>Valid only when the Spot allocation strategy is <code>lowest-price</code>. </p>"
+          "documentation":"<p>The number of Spot Instance pools across which to allocate your Spot Instances. The Spot pools are determined from the different instance types in the Overrides array of <a>LaunchTemplate</a>. Default if not set is 2.</p> <p>Used only when the Spot allocation strategy is <code>lowest-price</code>.</p> <p>Valid Range: Minimum value of 1. Maximum value of 20.</p>"
         },
         "SpotMaxPrice":{
           "shape":"MixedInstanceSpotPrice",
           "documentation":"<p>The maximum price per unit hour that you are willing to pay for a Spot Instance. If you leave the value of this parameter blank (which is the default), the maximum Spot price is set at the On-Demand price.</p> <p>To remove a value that you previously set, include the parameter but leave the value blank.</p>"
         }
       },
-      "documentation":"<p>Describes an instances distribution for an Auto Scaling group with <a>MixedInstancesPolicy</a>.</p> <p>The instances distribution specifies the distribution of On-Demand Instances and Spot Instances, the maximum price to pay for Spot Instances, and how the Auto Scaling group allocates instance types to fulfill On-Demand and Spot capacity.</p>"
+      "documentation":"<p>Describes an instances distribution for an Auto Scaling group with <a>MixedInstancesPolicy</a>.</p> <p>The instances distribution specifies the distribution of On-Demand Instances and Spot Instances, the maximum price to pay for Spot Instances, and how the Auto Scaling group allocates instance types to fulfill On-Demand and Spot capacity.</p> <p>When you update <code>SpotAllocationStrategy</code>, <code>SpotInstancePools</code>, or <code>SpotMaxPrice</code>, this update action does not deploy any changes across the running Amazon EC2 instances in the group. Your existing Spot Instances continue to run as long as the maximum price for those instances is higher than the current Spot price. When scale out occurs, Amazon EC2 Auto Scaling launches instances based on the new settings. When scale in occurs, Amazon EC2 Auto Scaling terminates instances according to the group's termination policies.</p>"
     },
     "InvalidNextToken":{
       "type":"structure",
@@ -2407,7 +2431,7 @@
         },
         "ImageId":{
           "shape":"XmlStringMaxLen255",
-          "documentation":"<p>The ID of the Amazon Machine Image (AMI) to use to launch your EC2 instances. </p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/finding-an-ami.html\">Finding an AMI</a> in the <i>Amazon EC2 User Guide for Linux Instances</i>.</p>"
+          "documentation":"<p>The ID of the Amazon Machine Image (AMI) to use to launch your EC2 instances.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/finding-an-ami.html\">Finding an AMI</a> in the <i>Amazon EC2 User Guide for Linux Instances</i>.</p>"
         },
         "KeyName":{
           "shape":"XmlStringMaxLen255",
@@ -2415,19 +2439,19 @@
         },
         "SecurityGroups":{
           "shape":"SecurityGroups",
-          "documentation":"<p>A list that contains the security groups to assign to the instances in the Auto Scaling group. </p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/AmazonVPC/latest/UserGuide/VPC_SecurityGroups.html\">Security Groups for Your VPC</a> in the <i>Amazon Virtual Private Cloud User Guide</i>.</p>"
+          "documentation":"<p>A list that contains the security groups to assign to the instances in the Auto Scaling group.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/AmazonVPC/latest/UserGuide/VPC_SecurityGroups.html\">Security Groups for Your VPC</a> in the <i>Amazon Virtual Private Cloud User Guide</i>.</p>"
         },
         "ClassicLinkVPCId":{
           "shape":"XmlStringMaxLen255",
-          "documentation":"<p>The ID of a ClassicLink-enabled VPC to link your EC2-Classic instances to. </p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/vpc-classiclink.html\">ClassicLink</a> in the <i>Amazon EC2 User Guide for Linux Instances</i> and <a href=\"https://docs.aws.amazon.com/autoscaling/ec2/userguide/asg-in-vpc.html#as-ClassicLink\">Linking EC2-Classic Instances to a VPC</a> in the <i>Amazon EC2 Auto Scaling User Guide</i>.</p>"
+          "documentation":"<p>The ID of a ClassicLink-enabled VPC to link your EC2-Classic instances to.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/vpc-classiclink.html\">ClassicLink</a> in the <i>Amazon EC2 User Guide for Linux Instances</i> and <a href=\"https://docs.aws.amazon.com/autoscaling/ec2/userguide/asg-in-vpc.html#as-ClassicLink\">Linking EC2-Classic Instances to a VPC</a> in the <i>Amazon EC2 Auto Scaling User Guide</i>.</p>"
         },
         "ClassicLinkVPCSecurityGroups":{
           "shape":"ClassicLinkVPCSecurityGroups",
-          "documentation":"<p>The IDs of one or more security groups for the VPC specified in <code>ClassicLinkVPCId</code>. </p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/vpc-classiclink.html\">ClassicLink</a> in the <i>Amazon EC2 User Guide for Linux Instances</i> and <a href=\"https://docs.aws.amazon.com/autoscaling/ec2/userguide/asg-in-vpc.html#as-ClassicLink\">Linking EC2-Classic Instances to a VPC</a> in the <i>Amazon EC2 Auto Scaling User Guide</i>.</p>"
+          "documentation":"<p>The IDs of one or more security groups for the VPC specified in <code>ClassicLinkVPCId</code>.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/vpc-classiclink.html\">ClassicLink</a> in the <i>Amazon EC2 User Guide for Linux Instances</i> and <a href=\"https://docs.aws.amazon.com/autoscaling/ec2/userguide/asg-in-vpc.html#as-ClassicLink\">Linking EC2-Classic Instances to a VPC</a> in the <i>Amazon EC2 Auto Scaling User Guide</i>.</p>"
         },
         "UserData":{
           "shape":"XmlStringUserData",
-          "documentation":"<p>The Base64-encoded user data to make available to the launched EC2 instances. </p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-instance-metadata.html\">Instance Metadata and User Data</a> in the <i>Amazon EC2 User Guide for Linux Instances</i>.</p>"
+          "documentation":"<p>The Base64-encoded user data to make available to the launched EC2 instances.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-instance-metadata.html\">Instance Metadata and User Data</a> in the <i>Amazon EC2 User Guide for Linux Instances</i>.</p>"
         },
         "InstanceType":{
           "shape":"XmlStringMaxLen255",
@@ -2447,15 +2471,15 @@
         },
         "InstanceMonitoring":{
           "shape":"InstanceMonitoring",
-          "documentation":"<p>Controls whether instances in this group are launched with detailed (<code>true</code>) or basic (<code>false</code>) monitoring. </p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/autoscaling/latest/userguide/as-instance-monitoring.html#enable-as-instance-metrics\">Configure Monitoring for Auto Scaling Instances</a> in the <i>Amazon EC2 Auto Scaling User Guide</i>. </p>"
+          "documentation":"<p>Controls whether instances in this group are launched with detailed (<code>true</code>) or basic (<code>false</code>) monitoring.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/autoscaling/latest/userguide/as-instance-monitoring.html#enable-as-instance-metrics\">Configure Monitoring for Auto Scaling Instances</a> in the <i>Amazon EC2 Auto Scaling User Guide</i>.</p>"
         },
         "SpotPrice":{
           "shape":"SpotPrice",
-          "documentation":"<p>The maximum hourly price to be paid for any Spot Instance launched to fulfill the request. Spot Instances are launched when the price you specify exceeds the current Spot market price. </p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/autoscaling/ec2/userguide/asg-launch-spot-instances.html\">Launching Spot Instances in Your Auto Scaling Group</a> in the <i>Amazon EC2 Auto Scaling User Guide</i>.</p>"
+          "documentation":"<p>The maximum hourly price to be paid for any Spot Instance launched to fulfill the request. Spot Instances are launched when the price you specify exceeds the current Spot price.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/autoscaling/ec2/userguide/asg-launch-spot-instances.html\">Launching Spot Instances in Your Auto Scaling Group</a> in the <i>Amazon EC2 Auto Scaling User Guide</i>.</p>"
         },
         "IamInstanceProfile":{
           "shape":"XmlStringMaxLen1600",
-          "documentation":"<p>The name or the Amazon Resource Name (ARN) of the instance profile associated with the IAM role for the instance. The instance profile contains the IAM role. </p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/autoscaling/ec2/userguide/us-iam-role.html\">IAM Role for Applications That Run on Amazon EC2 Instances</a> in the <i>Amazon EC2 Auto Scaling User Guide</i>.</p>"
+          "documentation":"<p>The name or the Amazon Resource Name (ARN) of the instance profile associated with the IAM role for the instance. The instance profile contains the IAM role.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/autoscaling/ec2/userguide/us-iam-role.html\">IAM Role for Applications That Run on Amazon EC2 Instances</a> in the <i>Amazon EC2 Auto Scaling User Guide</i>.</p>"
         },
         "CreatedTime":{
           "shape":"TimestampType",
@@ -2463,11 +2487,11 @@
         },
         "EbsOptimized":{
           "shape":"EbsOptimized",
-          "documentation":"<p>Specifies whether the launch configuration is optimized for EBS I/O (<code>true</code>) or not (<code>false</code>). </p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSOptimized.html\">Amazon EBS-Optimized Instances</a> in the <i>Amazon EC2 User Guide for Linux Instances</i>.</p>"
+          "documentation":"<p>Specifies whether the launch configuration is optimized for EBS I/O (<code>true</code>) or not (<code>false</code>).</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSOptimized.html\">Amazon EBS-Optimized Instances</a> in the <i>Amazon EC2 User Guide for Linux Instances</i>.</p>"
         },
         "AssociatePublicIpAddress":{
           "shape":"AssociatePublicIpAddress",
-          "documentation":"<p>For Auto Scaling groups that are running in a VPC, specifies whether to assign a public IP address to the group's instances. </p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/autoscaling/ec2/userguide/asg-in-vpc.html\">Launching Auto Scaling Instances in a VPC</a> in the <i>Amazon EC2 Auto Scaling User Guide</i>.</p>"
+          "documentation":"<p>For Auto Scaling groups that are running in a VPC, specifies whether to assign a public IP address to the group's instances.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/autoscaling/ec2/userguide/asg-in-vpc.html\">Launching Auto Scaling Instances in a VPC</a> in the <i>Amazon EC2 Auto Scaling User Guide</i>.</p>"
         },
         "PlacementTenancy":{
           "shape":"XmlStringMaxLen64",
@@ -2530,14 +2554,14 @@
       "members":{
         "LaunchTemplateSpecification":{
           "shape":"LaunchTemplateSpecification",
-          "documentation":"<p>The launch template to use. You must specify either the launch template ID or launch template name in the request. </p>"
+          "documentation":"<p>The launch template to use. You must specify either the launch template ID or launch template name in the request.</p>"
         },
         "Overrides":{
           "shape":"Overrides",
-          "documentation":"<p>Any parameters that you specify override the same parameters in the launch template. Currently, the only supported override is instance type. You must specify between 2 and 20 overrides.</p>"
+          "documentation":"<p>An optional setting. Any parameters that you specify override the same parameters in the launch template. Currently, the only supported override is instance type. You can specify between 1 and 20 instance types.</p>"
         }
       },
-      "documentation":"<p>Describes a launch template and overrides. </p> <p>The overrides are used to override the instance type specified by the launch template with multiple instance types that can be used to launch On-Demand Instances and Spot Instances. </p>"
+      "documentation":"<p>Describes a launch template and overrides.</p> <p>The overrides are used to override the instance type specified by the launch template with multiple instance types that can be used to launch On-Demand Instances and Spot Instances.</p> <p>When you update the launch template or overrides, existing Amazon EC2 instances continue to run. When scale out occurs, Amazon EC2 Auto Scaling launches instances to match the new settings. When scale in occurs, Amazon EC2 Auto Scaling terminates instances according to the group's termination policies.</p>"
     },
     "LaunchTemplateName":{
       "type":"string",
@@ -2550,10 +2574,14 @@
       "members":{
         "InstanceType":{
           "shape":"XmlStringMaxLen255",
-          "documentation":"<p>The instance type. </p> <p>For information about available instance types, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/instance-types.html#AvailableInstanceTypes\">Available Instance Types</a> in the <i>Amazon Elastic Compute Cloud User Guide.</i> </p>"
+          "documentation":"<p>The instance type.</p> <p>For information about available instance types, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/instance-types.html#AvailableInstanceTypes\">Available Instance Types</a> in the <i>Amazon Elastic Compute Cloud User Guide.</i> </p>"
+        },
+        "WeightedCapacity":{
+          "shape":"XmlStringMaxLen32",
+          "documentation":"<p>The number of capacity units, which gives the instance type a proportional weight to other instance types. For example, larger instance types are generally weighted more than smaller instance types. These are the same units that you chose to set the desired capacity in terms of instances, or a performance attribute such as vCPUs, memory, or I/O.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/autoscaling/ec2/userguide/asg-instance-weighting.html\">Instance Weighting for Amazon EC2 Auto Scaling</a> in the <i>Amazon EC2 Auto Scaling User Guide</i>.</p> <p>Valid Range: Minimum value of 1. Maximum value of 999.</p>"
         }
       },
-      "documentation":"<p>Describes an override for a launch template. </p>"
+      "documentation":"<p>Describes an override for a launch template.</p>"
     },
     "LaunchTemplateSpecification":{
       "type":"structure",
@@ -2747,6 +2775,7 @@
       "type":"list",
       "member":{"shape":"LoadBalancerTargetGroupState"}
     },
+    "MaxInstanceLifetime":{"type":"integer"},
     "MaxNumberOfAutoScalingGroups":{"type":"integer"},
     "MaxNumberOfLaunchConfigurations":{"type":"integer"},
     "MaxRecords":{"type":"integer"},
@@ -2848,7 +2877,7 @@
         },
         "InstancesDistribution":{
           "shape":"InstancesDistribution",
-          "documentation":"<p>The instances distribution to use.</p> <p>If you leave this parameter unspecified when creating a mixed instances policy, the default values are used.</p>"
+          "documentation":"<p>The instances distribution to use.</p> <p>If you leave this parameter unspecified, the value for each parameter in <code>InstancesDistribution</code> uses a default value.</p>"
         }
       },
       "documentation":"<p>Describes a mixed instances policy for an Auto Scaling group. With mixed instances, your Auto Scaling group can provision a combination of On-Demand Instances and Spot Instances across multiple instance types. For more information, see <a href=\"https://docs.aws.amazon.com/autoscaling/ec2/userguide/asg-purchase-options.html\">Auto Scaling Groups with Multiple Instance Types and Purchase Options</a> in the <i>Amazon EC2 Auto Scaling User Guide</i>.</p> <p>You can create a mixed instances policy for a new Auto Scaling group, or you can create it for an existing group by updating the group to specify <code>MixedInstancesPolicy</code> as the top-level parameter instead of a launch configuration or template. For more information, see <a>CreateAutoScalingGroup</a> and <a>UpdateAutoScalingGroup</a>.</p>"
@@ -2933,11 +2962,11 @@
       "members":{
         "PredefinedMetricType":{
           "shape":"MetricType",
-          "documentation":"<p>The metric type.</p>"
+          "documentation":"<p>The metric type. The following predefined metrics are available:</p> <ul> <li> <p> <code>ASGAverageCPUUtilization</code> - Average CPU utilization of the Auto Scaling group.</p> </li> <li> <p> <code>ASGAverageNetworkIn</code> - Average number of bytes received on all network interfaces by the Auto Scaling group.</p> </li> <li> <p> <code>ASGAverageNetworkOut</code> - Average number of bytes sent out on all network interfaces by the Auto Scaling group.</p> </li> <li> <p> <code>ALBRequestCountPerTarget</code> - Number of requests completed per target in an Application Load Balancer target group.</p> </li> </ul>"
         },
         "ResourceLabel":{
           "shape":"XmlStringMaxLen1023",
-          "documentation":"<p>Identifies the resource associated with the metric type. The following predefined metrics are available:</p> <ul> <li> <p> <code>ASGAverageCPUUtilization</code> - Average CPU utilization of the Auto Scaling group.</p> </li> <li> <p> <code>ASGAverageNetworkIn</code> - Average number of bytes received on all network interfaces by the Auto Scaling group.</p> </li> <li> <p> <code>ASGAverageNetworkOut</code> - Average number of bytes sent out on all network interfaces by the Auto Scaling group.</p> </li> <li> <p> <code>ALBRequestCountPerTarget</code> - Number of requests completed per target in an Application Load Balancer target group.</p> </li> </ul> <p>For predefined metric types <code>ASGAverageCPUUtilization</code>, <code>ASGAverageNetworkIn</code>, and <code>ASGAverageNetworkOut</code>, the parameter must not be specified as the resource associated with the metric type is the Auto Scaling group. For predefined metric type <code>ALBRequestCountPerTarget</code>, the parameter must be specified in the format: <code>app/<i>load-balancer-name</i>/<i>load-balancer-id</i>/targetgroup/<i>target-group-name</i>/<i>target-group-id</i> </code>, where <code>app/<i>load-balancer-name</i>/<i>load-balancer-id</i> </code> is the final portion of the load balancer ARN, and <code>targetgroup/<i>target-group-name</i>/<i>target-group-id</i> </code> is the final portion of the target group ARN. The target group must be attached to the Auto Scaling group.</p>"
+          "documentation":"<p>Identifies the resource associated with the metric type. You can't specify a resource label unless the metric type is <code>ALBRequestCountPerTarget</code> and there is a target group attached to the Auto Scaling group.</p> <p>The format is <code>app/<i>load-balancer-name</i>/<i>load-balancer-id</i>/targetgroup/<i>target-group-name</i>/<i>target-group-id</i> </code>, where </p> <ul> <li> <p> <code>app/<i>load-balancer-name</i>/<i>load-balancer-id</i> </code> is the final portion of the load balancer ARN, and</p> </li> <li> <p> <code>targetgroup/<i>target-group-name</i>/<i>target-group-id</i> </code> is the final portion of the target group ARN.</p> </li> </ul>"
         }
       },
       "documentation":"<p>Represents a predefined metric for a target tracking scaling policy to use with Amazon EC2 Auto Scaling.</p>"
@@ -3074,7 +3103,7 @@
         },
         "ScalingAdjustment":{
           "shape":"PolicyIncrement",
-          "documentation":"<p>The amount by which a simple scaling policy scales the Auto Scaling group in response to an alarm breach. The adjustment is based on the value that you specified in the <code>AdjustmentType</code> parameter (either an absolute number or a percentage). A positive value adds to the current capacity and a negative value subtracts from the current capacity. For exact capacity, you must specify a positive value. </p> <p>Conditional: If you specify <code>SimpleScaling</code> for the policy type, you must specify this parameter. (Not used with any other policy type.) </p>"
+          "documentation":"<p>The amount by which a simple scaling policy scales the Auto Scaling group in response to an alarm breach. The adjustment is based on the value that you specified in the <code>AdjustmentType</code> parameter (either an absolute number or a percentage). A positive value adds to the current capacity and a negative value subtracts from the current capacity. For exact capacity, you must specify a positive value.</p> <p>Conditional: If you specify <code>SimpleScaling</code> for the policy type, you must specify this parameter. (Not used with any other policy type.) </p>"
         },
         "Cooldown":{
           "shape":"Cooldown",
@@ -3095,6 +3124,10 @@
         "TargetTrackingConfiguration":{
           "shape":"TargetTrackingConfiguration",
           "documentation":"<p>A target tracking scaling policy. Includes support for predefined or customized metrics.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/autoscaling/ec2/APIReference/API_TargetTrackingConfiguration.html\">TargetTrackingConfiguration</a> in the <i>Amazon EC2 Auto Scaling API Reference</i>.</p> <p>Conditional: If you specify <code>TargetTrackingScaling</code> for the policy type, you must specify this parameter. (Not used with any other policy type.) </p>"
+        },
+        "Enabled":{
+          "shape":"ScalingPolicyEnabled",
+          "documentation":"<p>Indicates whether the scaling policy is enabled or disabled. The default is enabled. For more information, see <a href=\"https://docs.aws.amazon.com/autoscaling/ec2/userguide/as-enable-disable-scaling-policy.html\">Disabling a Scaling Policy for an Auto Scaling Group</a> in the <i>Amazon EC2 Auto Scaling User Guide</i>.</p>"
         }
       }
     },
@@ -3123,7 +3156,7 @@
         },
         "EndTime":{
           "shape":"TimestampType",
-          "documentation":"<p>The date and time for the recurring schedule to end. Amazon EC2 Auto Scaling does not perform the action after this time. </p>"
+          "documentation":"<p>The date and time for the recurring schedule to end. Amazon EC2 Auto Scaling does not perform the action after this time.</p>"
         },
         "Recurrence":{
           "shape":"XmlStringMaxLen255",
@@ -3306,10 +3339,15 @@
         "TargetTrackingConfiguration":{
           "shape":"TargetTrackingConfiguration",
           "documentation":"<p>A target tracking scaling policy.</p>"
+        },
+        "Enabled":{
+          "shape":"ScalingPolicyEnabled",
+          "documentation":"<p>Indicates whether the policy is enabled (<code>true</code>) or disabled (<code>false</code>).</p>"
         }
       },
       "documentation":"<p>Describes a scaling policy.</p>"
     },
+    "ScalingPolicyEnabled":{"type":"boolean"},
     "ScalingProcessQuery":{
       "type":"structure",
       "required":["AutoScalingGroupName"],
@@ -3370,7 +3408,7 @@
         },
         "Recurrence":{
           "shape":"XmlStringMaxLen255",
-          "documentation":"<p>The recurring schedule for the action, in Unix cron syntax format. </p> <p>When <code>StartTime</code> and <code>EndTime</code> are specified with <code>Recurrence</code>, they form the boundaries of when the recurring action starts and stops.</p>"
+          "documentation":"<p>The recurring schedule for the action, in Unix cron syntax format.</p> <p>When <code>StartTime</code> and <code>EndTime</code> are specified with <code>Recurrence</code>, they form the boundaries of when the recurring action starts and stops.</p>"
         },
         "MinSize":{
           "shape":"AutoScalingGroupMinSize",
@@ -3385,7 +3423,7 @@
           "documentation":"<p>The number of instances you prefer to maintain in the group.</p>"
         }
       },
-      "documentation":"<p>Describes a scheduled scaling action. Used in response to <a>DescribeScheduledActions</a>. </p>"
+      "documentation":"<p>Describes a scheduled scaling action. Used in response to <a>DescribeScheduledActions</a>.</p>"
     },
     "ScheduledUpdateGroupActionRequest":{
       "type":"structure",
@@ -3420,7 +3458,7 @@
           "documentation":"<p>The number of EC2 instances that should be running in the group.</p>"
         }
       },
-      "documentation":"<p>Describes one or more scheduled scaling action updates for a specified Auto Scaling group. Used in combination with <a>BatchPutScheduledUpdateGroupAction</a>.</p> <p>When updating a scheduled scaling action, all optional parameters are left unchanged if not specified. </p>"
+      "documentation":"<p>Describes one or more scheduled scaling action updates for a specified Auto Scaling group. Used in combination with <a>BatchPutScheduledUpdateGroupAction</a>.</p> <p>When updating a scheduled scaling action, all optional parameters are left unchanged if not specified.</p>"
     },
     "ScheduledUpdateGroupActionRequests":{
       "type":"list",
@@ -3710,7 +3748,7 @@
         },
         "LaunchConfigurationName":{
           "shape":"ResourceName",
-          "documentation":"<p>The name of the launch configuration. If you specify <code>LaunchConfigurationName</code> in your update request, you can't specify <code>LaunchTemplate</code> or <code>MixedInstancesPolicy</code>.</p> <important> <p>To update an Auto Scaling group with a launch configuration with <code>InstanceMonitoring</code> set to <code>false</code>, you must first disable the collection of group metrics. Otherwise, you get an error. If you have previously enabled the collection of group metrics, you can disable it using <a>DisableMetricsCollection</a>.</p> </important>"
+          "documentation":"<p>The name of the launch configuration. If you specify <code>LaunchConfigurationName</code> in your update request, you can't specify <code>LaunchTemplate</code> or <code>MixedInstancesPolicy</code>.</p>"
         },
         "LaunchTemplate":{
           "shape":"LaunchTemplateSpecification",
@@ -3767,6 +3805,10 @@
         "ServiceLinkedRoleARN":{
           "shape":"ResourceName",
           "documentation":"<p>The Amazon Resource Name (ARN) of the service-linked role that the Auto Scaling group uses to call other AWS services on your behalf. For more information, see <a href=\"https://docs.aws.amazon.com/autoscaling/ec2/userguide/autoscaling-service-linked-role.html\">Service-Linked Roles</a> in the <i>Amazon EC2 Auto Scaling User Guide</i>.</p>"
+        },
+        "MaxInstanceLifetime":{
+          "shape":"MaxInstanceLifetime",
+          "documentation":"<p>The maximum amount of time, in seconds, that an instance can be in service.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/autoscaling/ec2/userguide/asg-max-instance-lifetime.html\">Replacing Auto Scaling Instances Based on Maximum Instance Lifetime</a> in the <i>Amazon EC2 Auto Scaling User Guide</i>.</p> <p>Valid Range: Minimum value of 604800.</p>"
         }
       }
     },
diff --git a/services/autoscaling/src/test/resources/cucumber.properties b/services/autoscaling/src/test/resources/cucumber.properties
index de2eb50e1929..017b001a4bfa 100644
--- a/services/autoscaling/src/test/resources/cucumber.properties
+++ b/services/autoscaling/src/test/resources/cucumber.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/autoscalingplans/pom.xml b/services/autoscalingplans/pom.xml
index ccfd471e5a75..da4101fdf0ed 100644
--- a/services/autoscalingplans/pom.xml
+++ b/services/autoscalingplans/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>autoscalingplans</artifactId>
     <name>AWS Java SDK :: Services :: Auto Scaling Plans</name>
diff --git a/services/autoscalingplans/src/main/resources/codegen-resources/service-2.json b/services/autoscalingplans/src/main/resources/codegen-resources/service-2.json
index dafa7bb2c4cd..9f6a8d5227fc 100644
--- a/services/autoscalingplans/src/main/resources/codegen-resources/service-2.json
+++ b/services/autoscalingplans/src/main/resources/codegen-resources/service-2.json
@@ -2,7 +2,7 @@
   "version":"2.0",
   "metadata":{
     "apiVersion":"2018-01-06",
-    "endpointPrefix":"autoscaling",
+    "endpointPrefix":"autoscaling-plans",
     "jsonVersion":"1.1",
     "protocol":"json",
     "serviceFullName":"AWS Auto Scaling Plans",
diff --git a/services/backup/pom.xml b/services/backup/pom.xml
index b8f5cb355efd..ede48d850d48 100644
--- a/services/backup/pom.xml
+++ b/services/backup/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>backup</artifactId>
     <name>AWS Java SDK :: Services :: Backup</name>
diff --git a/services/backup/src/main/resources/codegen-resources/paginators-1.json b/services/backup/src/main/resources/codegen-resources/paginators-1.json
index 0df18752e017..6996abbd1b72 100644
--- a/services/backup/src/main/resources/codegen-resources/paginators-1.json
+++ b/services/backup/src/main/resources/codegen-resources/paginators-1.json
@@ -30,6 +30,11 @@
       "output_token": "NextToken",
       "limit_key": "MaxResults"
     },
+    "ListCopyJobs": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "MaxResults"
+    },
     "ListProtectedResources": {
       "input_token": "NextToken",
       "output_token": "NextToken",
diff --git a/services/backup/src/main/resources/codegen-resources/service-2.json b/services/backup/src/main/resources/codegen-resources/service-2.json
index 54c4c0ca4d19..a80b024a3f4a 100644
--- a/services/backup/src/main/resources/codegen-resources/service-2.json
+++ b/services/backup/src/main/resources/codegen-resources/service-2.json
@@ -26,7 +26,7 @@
         {"shape":"MissingParameterValueException"},
         {"shape":"ServiceUnavailableException"}
       ],
-      "documentation":"<p>Backup plans are documents that contain information that AWS Backup uses to schedule tasks that create recovery points of resources.</p> <p>If you call <code>CreateBackupPlan</code> with a plan that already exists, the existing <code>backupPlanId</code> is returned.</p>",
+      "documentation":"<p>Backup plans are documents that contain information that AWS Backup uses to schedule tasks that create recovery points of resources.</p> <p>If you call <code>CreateBackupPlan</code> with a plan that already exists, an <code>AlreadyExistsException</code> is returned.</p>",
       "idempotent":true
     },
     "CreateBackupSelection":{
@@ -44,7 +44,7 @@
         {"shape":"MissingParameterValueException"},
         {"shape":"ServiceUnavailableException"}
       ],
-      "documentation":"<p>Creates a JSON document that specifies a set of resources to assign to a backup plan. Resources can be included by specifying patterns for a <code>ListOfTags</code> and selected <code>Resources</code>. </p> <p>For example, consider the following patterns:</p> <ul> <li> <p> <code>Resources: \"arn:aws:ec2:region:account-id:volume/volume-id\"</code> </p> </li> <li> <p> <code>ConditionKey:\"department\"</code> </p> <p> <code>ConditionValue:\"finance\"</code> </p> <p> <code>ConditionType:\"StringEquals\"</code> </p> </li> <li> <p> <code>ConditionKey:\"importance\"</code> </p> <p> <code>ConditionValue:\"critical\"</code> </p> <p> <code>ConditionType:\"StringEquals\"</code> </p> </li> </ul> <p>Using these patterns would back up all Amazon Elastic Block Store (Amazon EBS) volumes that are tagged as <code>\"department=finance\"</code>, <code>\"importance=critical\"</code>, in addition to an EBS volume with the specified volume Id.</p> <p>Resources and conditions are additive in that all resources that match the pattern are selected. This shouldn't be confused with a logical AND, where all conditions must match. The matching patterns are logically 'put together using the OR operator. In other words, all patterns that match are selected for backup.</p>",
+      "documentation":"<p>Creates a JSON document that specifies a set of resources to assign to a backup plan. Resources can be included by specifying patterns for a <code>ListOfTags</code> and selected <code>Resources</code>. </p> <p>For example, consider the following patterns:</p> <ul> <li> <p> <code>Resources: \"arn:aws:ec2:region:account-id:volume/volume-id\"</code> </p> </li> <li> <p> <code>ConditionKey:\"department\"</code> </p> <p> <code>ConditionValue:\"finance\"</code> </p> <p> <code>ConditionType:\"STRINGEQUALS\"</code> </p> </li> <li> <p> <code>ConditionKey:\"importance\"</code> </p> <p> <code>ConditionValue:\"critical\"</code> </p> <p> <code>ConditionType:\"STRINGEQUALS\"</code> </p> </li> </ul> <p>Using these patterns would back up all Amazon Elastic Block Store (Amazon EBS) volumes that are tagged as <code>\"department=finance\"</code>, <code>\"importance=critical\"</code>, in addition to an EBS volume with the specified volume Id.</p> <p>Resources and conditions are additive in that all resources that match the pattern are selected. This shouldn't be confused with a logical AND, where all conditions must match. The matching patterns are logically 'put together using the OR operator. In other words, all patterns that match are selected for backup.</p>",
       "idempotent":true
     },
     "CreateBackupVault":{
@@ -197,6 +197,23 @@
       "documentation":"<p>Returns metadata about a backup vault specified by its name.</p>",
       "idempotent":true
     },
+    "DescribeCopyJob":{
+      "name":"DescribeCopyJob",
+      "http":{
+        "method":"GET",
+        "requestUri":"/copy-jobs/{copyJobId}"
+      },
+      "input":{"shape":"DescribeCopyJobInput"},
+      "output":{"shape":"DescribeCopyJobOutput"},
+      "errors":[
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InvalidParameterValueException"},
+        {"shape":"MissingParameterValueException"},
+        {"shape":"ServiceUnavailableException"}
+      ],
+      "documentation":"<p>Returns metadata associated with creating a copy of a resource.</p>",
+      "idempotent":true
+    },
     "DescribeProtectedResource":{
       "name":"DescribeProtectedResource",
       "http":{
@@ -380,7 +397,7 @@
         {"shape":"MissingParameterValueException"},
         {"shape":"ServiceUnavailableException"}
       ],
-      "documentation":"<p>Returns two sets of metadata key-value pairs. The first set lists the metadata that the recovery point was created with. The second set lists the metadata key-value pairs that are required to restore the recovery point.</p> <p>These sets can be the same, or the restore metadata set can contain different values if the target service to be restored has changed since the recovery point was created and now requires additional or different information in order to be restored.</p>",
+      "documentation":"<p>Returns a set of metadata key-value pairs that were used to create the backup.</p>",
       "idempotent":true
     },
     "GetSupportedResourceTypes":{
@@ -405,6 +422,7 @@
       "output":{"shape":"ListBackupJobsOutput"},
       "errors":[
         {"shape":"InvalidParameterValueException"},
+        {"shape":"InvalidRequestException"},
         {"shape":"ServiceUnavailableException"}
       ],
       "documentation":"<p>Returns metadata about your backup jobs.</p>",
@@ -494,6 +512,20 @@
       "documentation":"<p>Returns a list of recovery point storage containers along with information about them.</p>",
       "idempotent":true
     },
+    "ListCopyJobs":{
+      "name":"ListCopyJobs",
+      "http":{
+        "method":"GET",
+        "requestUri":"/copy-jobs/"
+      },
+      "input":{"shape":"ListCopyJobsInput"},
+      "output":{"shape":"ListCopyJobsOutput"},
+      "errors":[
+        {"shape":"InvalidParameterValueException"},
+        {"shape":"ServiceUnavailableException"}
+      ],
+      "documentation":"<p>Returns metadata about your copy jobs.</p>"
+    },
     "ListProtectedResources":{
       "name":"ListProtectedResources",
       "http":{
@@ -627,6 +659,24 @@
       "documentation":"<p>Starts a job to create a one-time backup of the specified resource.</p>",
       "idempotent":true
     },
+    "StartCopyJob":{
+      "name":"StartCopyJob",
+      "http":{
+        "method":"PUT",
+        "requestUri":"/copy-jobs"
+      },
+      "input":{"shape":"StartCopyJobInput"},
+      "output":{"shape":"StartCopyJobOutput"},
+      "errors":[
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InvalidParameterValueException"},
+        {"shape":"MissingParameterValueException"},
+        {"shape":"ServiceUnavailableException"},
+        {"shape":"LimitExceededException"}
+      ],
+      "documentation":"<p>Starts a job to create a one-time copy of the specified resource.</p>",
+      "idempotent":true
+    },
     "StartRestoreJob":{
       "name":"StartRestoreJob",
       "http":{
@@ -985,6 +1035,10 @@
         "RuleId":{
           "shape":"string",
           "documentation":"<p>Uniquely identifies a rule that is used to schedule the backup of a selection of resources.</p>"
+        },
+        "CopyActions":{
+          "shape":"CopyActions",
+          "documentation":"<p>An array of <code>CopyAction</code> objects, which contains the details of the copy operation.</p>"
         }
       },
       "documentation":"<p>Specifies a scheduled task used to back up a selection of resources.</p>"
@@ -1023,6 +1077,10 @@
         "RecoveryPointTags":{
           "shape":"Tags",
           "documentation":"<p>To help organize your resources, you can assign your own metadata to the resources that you create. Each tag is a key-value pair.</p>"
+        },
+        "CopyActions":{
+          "shape":"CopyActions",
+          "documentation":"<p>An array of <code>CopyAction</code> objects, which contains the details of the copy operation.</p>"
         }
       },
       "documentation":"<p>Specifies a scheduled task used to back up a selection of resources.</p>"
@@ -1056,11 +1114,11 @@
         },
         "Resources":{
           "shape":"ResourceArns",
-          "documentation":"<p>An array of strings that either contain Amazon Resource Names (ARNs) or match patterns such as \"<code>arn:aws:ec2:us-east-1:123456789012:volume/*</code>\" of resources to assign to a backup plan.</p>"
+          "documentation":"<p>An array of strings that contain Amazon Resource Names (ARNs) of resources to assign to a backup plan.</p>"
         },
         "ListOfTags":{
           "shape":"ListOfTags",
-          "documentation":"<p>An array of conditions used to specify a set of resources to assign to a backup plan; for example, <code>\"StringEquals\": {\"ec2:ResourceTag/Department\": \"accounting\"</code>.</p>"
+          "documentation":"<p>An array of conditions used to specify a set of resources to assign to a backup plan; for example, <code>\"STRINGEQUALS\": {\"ec2:ResourceTag/Department\": \"accounting\"</code>.</p>"
         }
       },
       "documentation":"<p>Used to specify a set of resources to a backup plan.</p>"
@@ -1108,8 +1166,16 @@
       "enum":[
         "BACKUP_JOB_STARTED",
         "BACKUP_JOB_COMPLETED",
+        "BACKUP_JOB_SUCCESSFUL",
+        "BACKUP_JOB_FAILED",
+        "BACKUP_JOB_EXPIRED",
         "RESTORE_JOB_STARTED",
         "RESTORE_JOB_COMPLETED",
+        "RESTORE_JOB_SUCCESSFUL",
+        "RESTORE_JOB_FAILED",
+        "COPY_JOB_STARTED",
+        "COPY_JOB_SUCCESSFUL",
+        "COPY_JOB_FAILED",
         "RECOVERY_POINT_MODIFIED",
         "BACKUP_PLAN_CREATED",
         "BACKUP_PLAN_MODIFIED"
@@ -1182,7 +1248,7 @@
       "members":{
         "ConditionType":{
           "shape":"ConditionType",
-          "documentation":"<p>An operation, such as <code>StringEquals</code>, that is applied to a key-value pair used to filter resources in a selection.</p>"
+          "documentation":"<p>An operation, such as <code>STRINGEQUALS</code>, that is applied to a key-value pair used to filter resources in a selection.</p>"
         },
         "ConditionKey":{
           "shape":"ConditionKey",
@@ -1193,7 +1259,7 @@
           "documentation":"<p>The value in a key-value pair. For example, in <code>\"ec2:ResourceTag/Department\": \"accounting\"</code>, <code>\"accounting\"</code> is the value.</p>"
         }
       },
-      "documentation":"<p>Contains an array of triplets made up of a condition type (such as <code>StringEquals</code>), a key, and a value. Conditions are used to filter resources in a selection that is assigned to a backup plan.</p>"
+      "documentation":"<p>Contains an array of triplets made up of a condition type (such as <code>STRINGEQUALS</code>), a key, and a value. Conditions are used to filter resources in a selection that is assigned to a backup plan.</p>"
     },
     "ConditionKey":{"type":"string"},
     "ConditionType":{
@@ -1201,6 +1267,94 @@
       "enum":["STRINGEQUALS"]
     },
     "ConditionValue":{"type":"string"},
+    "CopyAction":{
+      "type":"structure",
+      "required":["DestinationBackupVaultArn"],
+      "members":{
+        "Lifecycle":{"shape":"Lifecycle"},
+        "DestinationBackupVaultArn":{
+          "shape":"ARN",
+          "documentation":"<p>An Amazon Resource Name (ARN) that uniquely identifies the destination backup vault for the copied backup. For example, arn:aws:backup:us-east-1:123456789012:vault:aBackupVault.</p>"
+        }
+      },
+      "documentation":"<p>The details of the copy operation.</p>"
+    },
+    "CopyActions":{
+      "type":"list",
+      "member":{"shape":"CopyAction"}
+    },
+    "CopyJob":{
+      "type":"structure",
+      "members":{
+        "CopyJobId":{
+          "shape":"string",
+          "documentation":"<p>Uniquely identifies a request to AWS Backup to copy a resource.</p>"
+        },
+        "SourceBackupVaultArn":{
+          "shape":"ARN",
+          "documentation":"<p>An Amazon Resource Name (ARN) that uniquely identifies a source copy vault; for example, arn:aws:backup:us-east-1:123456789012:vault:aBackupVault. </p>"
+        },
+        "SourceRecoveryPointArn":{
+          "shape":"ARN",
+          "documentation":"<p>An ARN that uniquely identifies a source recovery point; for example, arn:aws:backup:us-east-1:123456789012:recovery-point:1EB3B5E7-9EB0-435A-A80B-108B488B0D45. </p>"
+        },
+        "DestinationBackupVaultArn":{
+          "shape":"ARN",
+          "documentation":"<p>An Amazon Resource Name (ARN) that uniquely identifies a destination copy vault; for example, arn:aws:backup:us-east-1:123456789012:vault:aBackupVault.</p>"
+        },
+        "DestinationRecoveryPointArn":{
+          "shape":"ARN",
+          "documentation":"<p>An ARN that uniquely identifies a destination recovery point; for example, arn:aws:backup:us-east-1:123456789012:recovery-point:1EB3B5E7-9EB0-435A-A80B-108B488B0D45. </p>"
+        },
+        "ResourceArn":{
+          "shape":"ARN",
+          "documentation":"<p>The type of AWS resource to be copied; for example, an Amazon Elastic Block Store (Amazon EBS) volume or an Amazon Relational Database Service (Amazon RDS) database. </p>"
+        },
+        "CreationDate":{
+          "shape":"timestamp",
+          "documentation":"<p>The date and time a copy job is created, in Unix format and Coordinated Universal Time (UTC). The value of CreationDate is accurate to milliseconds. For example, the value 1516925490.087 represents Friday, January 26, 2018 12:11:30.087 AM. </p>"
+        },
+        "CompletionDate":{
+          "shape":"timestamp",
+          "documentation":"<p>The date and time a job to create a copy job is completed, in Unix format and Coordinated Universal Time (UTC). The value of CompletionDate is accurate to milliseconds. For example, the value 1516925490.087 represents Friday, January 26, 2018 12:11:30.087 AM. </p>"
+        },
+        "State":{
+          "shape":"CopyJobState",
+          "documentation":"<p>The current state of a resource recovery point.</p>"
+        },
+        "StatusMessage":{
+          "shape":"string",
+          "documentation":"<p>A detailed message explaining the status of the job that to copy a resource.</p>"
+        },
+        "BackupSizeInBytes":{
+          "shape":"Long",
+          "documentation":"<p>The size, in bytes, of a copy job.</p>"
+        },
+        "IamRoleArn":{
+          "shape":"IAMRoleArn",
+          "documentation":"<p>Specifies the IAM role ARN used to copy the target recovery point; for example, arn:aws:iam::123456789012:role/S3Access.</p>"
+        },
+        "CreatedBy":{"shape":"RecoveryPointCreator"},
+        "ResourceType":{
+          "shape":"ResourceType",
+          "documentation":"<p>The type of AWS resource to be copied; for example, an Amazon Elastic Block Store (Amazon EBS) volume or an Amazon Relational Database Service (Amazon RDS) database. </p>"
+        }
+      },
+      "documentation":"<p>Contains detailed information about a copy job.</p>"
+    },
+    "CopyJobState":{
+      "type":"string",
+      "enum":[
+        "CREATED",
+        "RUNNING",
+        "COMPLETED",
+        "FAILED"
+      ]
+    },
+    "CopyJobsList":{
+      "type":"list",
+      "member":{"shape":"CopyJob"}
+    },
     "CreateBackupPlanInput":{
       "type":"structure",
       "required":["BackupPlan"],
@@ -1255,7 +1409,7 @@
         },
         "BackupSelection":{
           "shape":"BackupSelection",
-          "documentation":"<p>Specifies the body of a request to assign a set of resources to a backup plan.</p> <p>It includes an array of resources, an optional array of patterns to exclude resources, an optional role to provide access to the AWS service the resource belongs to, and an optional array of tags used to identify a set of resources.</p>"
+          "documentation":"<p>Specifies the body of a request to assign a set of resources to a backup plan.</p>"
         },
         "CreatorRequestId":{
           "shape":"string",
@@ -1577,6 +1731,27 @@
         }
       }
     },
+    "DescribeCopyJobInput":{
+      "type":"structure",
+      "required":["CopyJobId"],
+      "members":{
+        "CopyJobId":{
+          "shape":"string",
+          "documentation":"<p>Uniquely identifies a request to AWS Backup to copy a resource.</p>",
+          "location":"uri",
+          "locationName":"copyJobId"
+        }
+      }
+    },
+    "DescribeCopyJobOutput":{
+      "type":"structure",
+      "members":{
+        "CopyJob":{
+          "shape":"CopyJob",
+          "documentation":"<p>Contains detailed information about a copy job.</p>"
+        }
+      }
+    },
     "DescribeProtectedResourceInput":{
       "type":"structure",
       "required":["ResourceArn"],
@@ -1903,7 +2078,7 @@
       "members":{
         "BackupSelection":{
           "shape":"BackupSelection",
-          "documentation":"<p>Specifies the body of a request to assign a set of resources to a backup plan.</p> <p>It includes an array of resources, an optional array of patterns to exclude resources, an optional role to provide access to the AWS service that the resource belongs to, and an optional array of tags used to identify a set of resources.</p>"
+          "documentation":"<p>Specifies the body of a request to assign a set of resources to a backup plan.</p>"
         },
         "SelectionId":{
           "shape":"string",
@@ -2019,7 +2194,7 @@
         },
         "RestoreMetadata":{
           "shape":"Metadata",
-          "documentation":"<p>A set of metadata key-value pairs that lists the metadata key-value pairs that are required to restore the recovery point.</p>"
+          "documentation":"<p>The set of metadata key-value pairs that describes the original configuration of the backed-up resource. These values vary depending on the service that is being restored.</p>"
         }
       }
     },
@@ -2028,7 +2203,7 @@
       "members":{
         "ResourceTypes":{
           "shape":"ResourceTypes",
-          "documentation":"<p>Contains a string with the supported AWS resource types:</p> <ul> <li> <p> <code>EBS</code> for Amazon Elastic Block Store</p> </li> <li> <p> <code>SGW</code> for AWS Storage Gateway</p> </li> <li> <p> <code>RDS</code> for Amazon Relational Database Service</p> </li> <li> <p> <code>DDB</code> for Amazon DynamoDB</p> </li> <li> <p> <code>EFS</code> for Amazon Elastic File System</p> </li> </ul>"
+          "documentation":"<p>Contains a string with the supported AWS resource types:</p> <ul> <li> <p> <code>EBS</code> for Amazon Elastic Block Store</p> </li> <li> <p> <code>Storage Gateway</code> for AWS Storage Gateway</p> </li> <li> <p> <code>RDS</code> for Amazon Relational Database Service</p> </li> <li> <p> <code>DDB</code> for Amazon DynamoDB</p> </li> <li> <p> <code>EFS</code> for Amazon Elastic File System</p> </li> </ul>"
         }
       }
     },
@@ -2077,10 +2252,10 @@
         },
         "DeleteAfterDays":{
           "shape":"Long",
-          "documentation":"<p>Specifies the number of days after creation that a recovery point is deleted. Must be greater than <code>MoveToColdStorageAfterDays</code>.</p>"
+          "documentation":"<p>Specifies the number of days after creation that a recovery point is deleted. Must be greater than 90 days plus <code>MoveToColdStorageAfterDays</code>.</p>"
         }
       },
-      "documentation":"<p>Contains an array of <code>Transition</code> objects specifying how long in days before a recovery point transitions to cold storage or is deleted.</p>"
+      "documentation":"<p>Contains an array of <code>Transition</code> objects specifying how long in days before a recovery point transitions to cold storage or is deleted.</p> <p>Backups transitioned to cold storage must be stored in cold storage for a minimum of 90 days. Therefore, on the console, the “expire after days” setting must be 90 days greater than the “transition to cold after days” setting. The “transition to cold after days” setting cannot be changed after a backup has been transitioned to cold. </p>"
     },
     "LimitExceededException":{
       "type":"structure",
@@ -2146,7 +2321,7 @@
         },
         "ByResourceType":{
           "shape":"ResourceType",
-          "documentation":"<p>Returns only backup jobs for the specified resources:</p> <ul> <li> <p> <code>EBS</code> for Amazon Elastic Block Store</p> </li> <li> <p> <code>SGW</code> for AWS Storage Gateway</p> </li> <li> <p> <code>RDS</code> for Amazon Relational Database Service</p> </li> <li> <p> <code>DDB</code> for Amazon DynamoDB</p> </li> <li> <p> <code>EFS</code> for Amazon Elastic File System</p> </li> </ul>",
+          "documentation":"<p>Returns only backup jobs for the specified resources:</p> <ul> <li> <p> <code>DynamoDB</code> for Amazon DynamoDB</p> </li> <li> <p> <code>EBS</code> for Amazon Elastic Block Store</p> </li> <li> <p> <code>EFS</code> for Amazon Elastic File System</p> </li> <li> <p> <code>RDS</code> for Amazon Relational Database Service</p> </li> <li> <p> <code>Storage Gateway</code> for AWS Storage Gateway</p> </li> </ul>",
           "location":"querystring",
           "locationName":"resourceType"
         }
@@ -2335,6 +2510,72 @@
         }
       }
     },
+    "ListCopyJobsInput":{
+      "type":"structure",
+      "members":{
+        "NextToken":{
+          "shape":"string",
+          "documentation":"<p>The next item following a partial list of returned items. For example, if a request is made to return maxResults number of items, NextToken allows you to return more items in your list starting at the location pointed to by the next token. </p>",
+          "location":"querystring",
+          "locationName":"nextToken"
+        },
+        "MaxResults":{
+          "shape":"MaxResults",
+          "documentation":"<p>The maximum number of items to be returned.</p>",
+          "location":"querystring",
+          "locationName":"maxResults"
+        },
+        "ByResourceArn":{
+          "shape":"ARN",
+          "documentation":"<p>Returns only copy jobs that match the specified resource Amazon Resource Name (ARN). </p>",
+          "location":"querystring",
+          "locationName":"resourceArn"
+        },
+        "ByState":{
+          "shape":"CopyJobState",
+          "documentation":"<p>Returns only copy jobs that are in the specified state.</p>",
+          "location":"querystring",
+          "locationName":"state"
+        },
+        "ByCreatedBefore":{
+          "shape":"timestamp",
+          "documentation":"<p>Returns only copy jobs that were created before the specified date.</p>",
+          "location":"querystring",
+          "locationName":"createdBefore"
+        },
+        "ByCreatedAfter":{
+          "shape":"timestamp",
+          "documentation":"<p>Returns only copy jobs that were created after the specified date.</p>",
+          "location":"querystring",
+          "locationName":"createdAfter"
+        },
+        "ByResourceType":{
+          "shape":"ResourceType",
+          "documentation":"<p>Returns only backup jobs for the specified resources:</p> <ul> <li> <p> <code>DynamoDB</code> for Amazon DynamoDB</p> </li> <li> <p> <code>EBS</code> for Amazon Elastic Block Store</p> </li> <li> <p> <code>EFS</code> for Amazon Elastic File System</p> </li> <li> <p> <code>RDS</code> for Amazon Relational Database Service</p> </li> <li> <p> <code>Storage Gateway</code> for AWS Storage Gateway</p> </li> </ul>",
+          "location":"querystring",
+          "locationName":"resourceType"
+        },
+        "ByDestinationVaultArn":{
+          "shape":"string",
+          "documentation":"<p>An Amazon Resource Name (ARN) that uniquely identifies a source backup vault to copy from; for example, arn:aws:backup:us-east-1:123456789012:vault:aBackupVault. </p>",
+          "location":"querystring",
+          "locationName":"destinationVaultArn"
+        }
+      }
+    },
+    "ListCopyJobsOutput":{
+      "type":"structure",
+      "members":{
+        "CopyJobs":{
+          "shape":"CopyJobsList",
+          "documentation":"<p>An array of structures containing metadata about your copy jobs returned in JSON format. </p>"
+        },
+        "NextToken":{
+          "shape":"string",
+          "documentation":"<p>The next item following a partial list of returned items. For example, if a request is made to return maxResults number of items, NextToken allows you to return more items in your list starting at the location pointed to by the next token. </p>"
+        }
+      }
+    },
     "ListOfTags":{
       "type":"list",
       "member":{"shape":"Condition"}
@@ -2549,7 +2790,8 @@
     "Metadata":{
       "type":"map",
       "key":{"shape":"MetadataKey"},
-      "value":{"shape":"MetadataValue"}
+      "value":{"shape":"MetadataValue"},
+      "sensitive":true
     },
     "MetadataKey":{"type":"string"},
     "MetadataValue":{"type":"string"},
@@ -2905,7 +3147,7 @@
         },
         "IdempotencyToken":{
           "shape":"string",
-          "documentation":"<p>A customer chosen string that can be used to distinguish between calls to <code>StartBackupJob</code>. Idempotency tokens time out after one hour. Therefore, if you call <code>StartBackupJob</code> multiple times with the same idempotency token within one hour, AWS Backup recognizes that you are requesting only one backup job and initiates only one. If you change the idempotency token for each call, AWS Backup recognizes that you are requesting to start multiple backups.</p>"
+          "documentation":"<p>A customer chosen string that can be used to distinguish between calls to <code>StartBackupJob</code>.</p>"
         },
         "StartWindowMinutes":{
           "shape":"WindowMinutes",
@@ -2942,6 +3184,51 @@
         }
       }
     },
+    "StartCopyJobInput":{
+      "type":"structure",
+      "required":[
+        "RecoveryPointArn",
+        "SourceBackupVaultName",
+        "DestinationBackupVaultArn",
+        "IamRoleArn"
+      ],
+      "members":{
+        "RecoveryPointArn":{
+          "shape":"ARN",
+          "documentation":"<p>An ARN that uniquely identifies a recovery point to use for the copy job; for example, arn:aws:backup:us-east-1:123456789012:recovery-point:1EB3B5E7-9EB0-435A-A80B-108B488B0D45. </p>"
+        },
+        "SourceBackupVaultName":{
+          "shape":"BackupVaultName",
+          "documentation":"<p>The name of a logical source container where backups are stored. Backup vaults are identified by names that are unique to the account used to create them and the AWS Region where they are created. They consist of lowercase letters, numbers, and hyphens. &gt;</p>"
+        },
+        "DestinationBackupVaultArn":{
+          "shape":"ARN",
+          "documentation":"<p>An Amazon Resource Name (ARN) that uniquely identifies a destination backup vault to copy to; for example, <code>arn:aws:backup:us-east-1:123456789012:vault:aBackupVault</code>.</p>"
+        },
+        "IamRoleArn":{
+          "shape":"IAMRoleArn",
+          "documentation":"<p>Specifies the IAM role ARN used to copy the target recovery point; for example, arn:aws:iam::123456789012:role/S3Access.</p>"
+        },
+        "IdempotencyToken":{
+          "shape":"string",
+          "documentation":"<p>A customer chosen string that can be used to distinguish between calls to <code>StartCopyJob</code>.</p>"
+        },
+        "Lifecycle":{"shape":"Lifecycle"}
+      }
+    },
+    "StartCopyJobOutput":{
+      "type":"structure",
+      "members":{
+        "CopyJobId":{
+          "shape":"string",
+          "documentation":"<p>Uniquely identifies a request to AWS Backup to copy a resource.</p>"
+        },
+        "CreationDate":{
+          "shape":"timestamp",
+          "documentation":"<p>The date and time that a backup job is started, in Unix format and Coordinated Universal Time (UTC). The value of CreationDate is accurate to milliseconds. For example, the value 1516925490.087 represents Friday, January 26, 2018 12:11:30.087 AM. &gt;</p>"
+        }
+      }
+    },
     "StartRestoreJobInput":{
       "type":"structure",
       "required":[
@@ -2956,7 +3243,7 @@
         },
         "Metadata":{
           "shape":"Metadata",
-          "documentation":"<p>A set of metadata key-value pairs. Lists the metadata that the recovery point was created with.</p>"
+          "documentation":"<p>A set of metadata key-value pairs. Contains information, such as a resource name, required to restore a recovery point.</p> <p> You can get configuration metadata about a resource at the time it was backed-up by calling <code>GetRecoveryPointRestoreMetadata</code>. However, values in addition to those provided by <code>GetRecoveryPointRestoreMetadata</code> might be required to restore a resource. For example, you might need to provide a new resource name if the original already exists.</p> <p>You need to specify specific metadata to restore an Amazon Elastic File System (Amazon EFS) instance:</p> <ul> <li> <p> <code>file-system-id</code>: ID of the Amazon EFS file system that is backed up by AWS Backup. Returned in <code>GetRecoveryPointRestoreMetadata</code>.</p> </li> <li> <p> <code>Encrypted</code>: A Boolean value that, if true, specifies that the file system is encrypted. If <code>KmsKeyId</code> is specified, <code>Encrypted</code> must be set to <code>true</code>.</p> </li> <li> <p> <code>KmsKeyId</code>: Specifies the AWS KMS key that is used to encrypt the restored file system.</p> </li> <li> <p> <code>PerformanceMode</code>: Specifies the throughput mode of the file system.</p> </li> <li> <p> <code>CreationToken</code>: A user-supplied value that ensures the uniqueness (idempotency) of the request.</p> </li> <li> <p> <code>newFileSystem</code>: A Boolean value that, if true, specifies that the recovery point is restored to a new Amazon EFS file system.</p> </li> </ul>"
         },
         "IamRoleArn":{
           "shape":"IAMRoleArn",
@@ -2964,11 +3251,11 @@
         },
         "IdempotencyToken":{
           "shape":"string",
-          "documentation":"<p>A customer chosen string that can be used to distinguish between calls to <code>StartRestoreJob</code>. Idempotency tokens time out after one hour. Therefore, if you call <code>StartRestoreJob</code> multiple times with the same idempotency token within one hour, AWS Backup recognizes that you are requesting only one restore job and initiates only one. If you change the idempotency token for each call, AWS Backup recognizes that you are requesting to start multiple restores. </p>"
+          "documentation":"<p>A customer chosen string that can be used to distinguish between calls to <code>StartRestoreJob</code>.</p>"
         },
         "ResourceType":{
           "shape":"ResourceType",
-          "documentation":"<p>Starts a job to restore a recovery point for one of the following resources:</p> <ul> <li> <p> <code>EBS</code> for Amazon Elastic Block Store</p> </li> <li> <p> <code>SGW</code> for AWS Storage Gateway</p> </li> <li> <p> <code>RDS</code> for Amazon Relational Database Service</p> </li> <li> <p> <code>DDB</code> for Amazon DynamoDB</p> </li> <li> <p> <code>EFS</code> for Amazon Elastic File System</p> </li> </ul>"
+          "documentation":"<p>Starts a job to restore a recovery point for one of the following resources:</p> <ul> <li> <p> <code>EBS</code> for Amazon Elastic Block Store</p> </li> <li> <p> <code>Storage Gateway</code> for AWS Storage Gateway</p> </li> <li> <p> <code>RDS</code> for Amazon Relational Database Service</p> </li> <li> <p> <code>DDB</code> for Amazon DynamoDB</p> </li> <li> <p> <code>EFS</code> for Amazon Elastic File System</p> </li> </ul>"
         }
       }
     },
diff --git a/services/batch/build.properties b/services/batch/build.properties
index ecf2dae6fcb1..15ec2da1fc71 100644
--- a/services/batch/build.properties
+++ b/services/batch/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/batch/pom.xml b/services/batch/pom.xml
index c6baf3de63eb..008f451dfffd 100644
--- a/services/batch/pom.xml
+++ b/services/batch/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>batch</artifactId>
     <name>AWS Java SDK :: Services :: AWS Batch</name>
diff --git a/services/batch/src/main/resources/codegen-resources/service-2.json b/services/batch/src/main/resources/codegen-resources/service-2.json
index a8f97a57c1a3..62bfde5f3592 100644
--- a/services/batch/src/main/resources/codegen-resources/service-2.json
+++ b/services/batch/src/main/resources/codegen-resources/service-2.json
@@ -94,7 +94,7 @@
         {"shape":"ClientException"},
         {"shape":"ServerException"}
       ],
-      "documentation":"<p>Deregisters an AWS Batch job definition.</p>"
+      "documentation":"<p>Deregisters an AWS Batch job definition. Job definitions will be permanently deleted after 180 days.</p>"
     },
     "DescribeComputeEnvironments":{
       "name":"DescribeComputeEnvironments",
@@ -510,7 +510,7 @@
         },
         "allocationStrategy":{
           "shape":"CRAllocationStrategy",
-          "documentation":"<p>The allocation strategy to use for the compute resource in case not enough instances of the best fitting instance type can be allocated. This could be due to availability of the instance type in the region or <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-resource-limits.html\">Amazon EC2 service limits</a>. If this is not specified, the default is <code>BEST_FIT</code>, which will use only the best fitting instance type, waiting for additional capacity if it's not available. This allocation strategy keeps costs lower but can limit scaling. <code>BEST_FIT_PROGRESSIVE</code> will select an additional instance type that is large enough to meet the requirements of the jobs in the queue, with a preference for an instance type with a lower cost. <code>SPOT_CAPACITY_OPTIMIZED</code> is only available for Spot Instance compute resources and will select an additional instance type that is large enough to meet the requirements of the jobs in the queue, with a preference for an instance type that is less likely to be interrupted.</p>"
+          "documentation":"<p>The allocation strategy to use for the compute resource in case not enough instances of the best fitting instance type can be allocated. This could be due to availability of the instance type in the region or <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-resource-limits.html\">Amazon EC2 service limits</a>. If this is not specified, the default is <code>BEST_FIT</code>, which will use only the best fitting instance type, waiting for additional capacity if it's not available. This allocation strategy keeps costs lower but can limit scaling. If you are using Spot Fleets with <code>BEST_FIT</code> then the Spot Fleet IAM Role must be specified. <code>BEST_FIT_PROGRESSIVE</code> will select additional instance types that are large enough to meet the requirements of the jobs in the queue, with a preference for instance types with a lower cost per vCPU. <code>SPOT_CAPACITY_OPTIMIZED</code> is only available for Spot Instance compute resources and will select additional instance types that are large enough to meet the requirements of the jobs in the queue, with a preference for instance types that are less likely to be interrupted. For more information, see <a href=\"https://docs.aws.amazon.com/batch/latest/userguide/allocation-strategies.html \">Allocation Strategies</a> in the <i>AWS Batch User Guide</i>.</p>"
         },
         "minvCpus":{
           "shape":"Integer",
@@ -562,7 +562,7 @@
         },
         "spotIamFleetRole":{
           "shape":"String",
-          "documentation":"<p>The Amazon Resource Name (ARN) of the Amazon EC2 Spot Fleet IAM role applied to a <code>SPOT</code> compute environment. For more information, see <a href=\"https://docs.aws.amazon.com/batch/latest/userguide/spot_fleet_IAM_role.html\">Amazon EC2 Spot Fleet Role</a> in the <i>AWS Batch User Guide</i>.</p>"
+          "documentation":"<p>The Amazon Resource Name (ARN) of the Amazon EC2 Spot Fleet IAM role applied to a <code>SPOT</code> compute environment. This role is required if the allocation strategy set to <code>BEST_FIT</code> or if the allocation strategy is not specified. For more information, see <a href=\"https://docs.aws.amazon.com/batch/latest/userguide/spot_fleet_IAM_role.html\">Amazon EC2 Spot Fleet Role</a> in the <i>AWS Batch User Guide</i>.</p>"
         },
         "launchTemplate":{
           "shape":"LaunchTemplateSpecification",
@@ -1239,7 +1239,7 @@
         },
         "dependsOn":{
           "shape":"JobDependencyList",
-          "documentation":"<p>A list of job names or IDs on which this job depends.</p>"
+          "documentation":"<p>A list of job IDs on which this job depends.</p>"
         },
         "jobDefinition":{
           "shape":"String",
@@ -1775,7 +1775,7 @@
         },
         "jobDefinition":{
           "shape":"String",
-          "documentation":"<p>The job definition used by this job. This value can be either a <code>name:revision</code> or the Amazon Resource Name (ARN) for the job definition.</p>"
+          "documentation":"<p>The job definition used by this job. This value can be one of <code>name</code>, <code>name:revision</code>, or the Amazon Resource Name (ARN) for the job definition. If <code>name</code> is specified without a revision then the latest active revision is used.</p>"
         },
         "parameters":{
           "shape":"ParametersMap",
diff --git a/services/batch/src/test/resources/cucumber.properties b/services/batch/src/test/resources/cucumber.properties
index 6cc2437e6cf7..150f67b38e00 100644
--- a/services/batch/src/test/resources/cucumber.properties
+++ b/services/batch/src/test/resources/cucumber.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/budgets/build.properties b/services/budgets/build.properties
index ecf2dae6fcb1..15ec2da1fc71 100644
--- a/services/budgets/build.properties
+++ b/services/budgets/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/budgets/pom.xml b/services/budgets/pom.xml
index 5f4759aea080..76a79b345806 100644
--- a/services/budgets/pom.xml
+++ b/services/budgets/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>budgets</artifactId>
     <name>AWS Java SDK :: Services :: AWS Budgets</name>
diff --git a/services/budgets/src/main/resources/codegen-resources/service-2.json b/services/budgets/src/main/resources/codegen-resources/service-2.json
index 90d7197fd7a8..f6d1e1cf5371 100755
--- a/services/budgets/src/main/resources/codegen-resources/service-2.json
+++ b/services/budgets/src/main/resources/codegen-resources/service-2.json
@@ -25,7 +25,8 @@
         {"shape":"InvalidParameterException"},
         {"shape":"InternalErrorException"},
         {"shape":"CreationLimitExceededException"},
-        {"shape":"DuplicateRecordException"}
+        {"shape":"DuplicateRecordException"},
+        {"shape":"AccessDeniedException"}
       ],
       "documentation":"<p>Creates a budget and, if included, notifications and subscribers. </p> <important> <p>Only one of <code>BudgetLimit</code> or <code>PlannedBudgetLimits</code> can be present in the syntax at one time. Use the syntax that matches your case. The Request Syntax section shows the <code>BudgetLimit</code> syntax. For <code>PlannedBudgetLimits</code>, see the <a href=\"https://docs.aws.amazon.com/aws-cost-management/latest/APIReference/API_budgets_CreateBudget.html#API_CreateBudget_Examples\">Examples</a> section. </p> </important>"
     },
@@ -42,7 +43,8 @@
         {"shape":"InvalidParameterException"},
         {"shape":"NotFoundException"},
         {"shape":"CreationLimitExceededException"},
-        {"shape":"DuplicateRecordException"}
+        {"shape":"DuplicateRecordException"},
+        {"shape":"AccessDeniedException"}
       ],
       "documentation":"<p>Creates a notification. You must create the budget before you create the associated notification.</p>"
     },
@@ -59,7 +61,8 @@
         {"shape":"InvalidParameterException"},
         {"shape":"CreationLimitExceededException"},
         {"shape":"DuplicateRecordException"},
-        {"shape":"NotFoundException"}
+        {"shape":"NotFoundException"},
+        {"shape":"AccessDeniedException"}
       ],
       "documentation":"<p>Creates a subscriber. You must create the associated budget and notification before you create the subscriber.</p>"
     },
@@ -74,7 +77,8 @@
       "errors":[
         {"shape":"InternalErrorException"},
         {"shape":"InvalidParameterException"},
-        {"shape":"NotFoundException"}
+        {"shape":"NotFoundException"},
+        {"shape":"AccessDeniedException"}
       ],
       "documentation":"<p>Deletes a budget. You can delete your budget at any time.</p> <important> <p>Deleting a budget also deletes the notifications and subscribers that are associated with that budget.</p> </important>"
     },
@@ -89,7 +93,8 @@
       "errors":[
         {"shape":"InvalidParameterException"},
         {"shape":"InternalErrorException"},
-        {"shape":"NotFoundException"}
+        {"shape":"NotFoundException"},
+        {"shape":"AccessDeniedException"}
       ],
       "documentation":"<p>Deletes a notification.</p> <important> <p>Deleting a notification also deletes the subscribers that are associated with the notification.</p> </important>"
     },
@@ -104,7 +109,8 @@
       "errors":[
         {"shape":"InternalErrorException"},
         {"shape":"InvalidParameterException"},
-        {"shape":"NotFoundException"}
+        {"shape":"NotFoundException"},
+        {"shape":"AccessDeniedException"}
       ],
       "documentation":"<p>Deletes a subscriber.</p> <important> <p>Deleting the last subscriber to a notification also deletes the notification.</p> </important>"
     },
@@ -119,7 +125,8 @@
       "errors":[
         {"shape":"InternalErrorException"},
         {"shape":"InvalidParameterException"},
-        {"shape":"NotFoundException"}
+        {"shape":"NotFoundException"},
+        {"shape":"AccessDeniedException"}
       ],
       "documentation":"<p>Describes a budget.</p> <important> <p>The Request Syntax section shows the <code>BudgetLimit</code> syntax. For <code>PlannedBudgetLimits</code>, see the <a href=\"https://docs.aws.amazon.com/aws-cost-management/latest/APIReference/API_budgets_DescribeBudget.html#API_DescribeBudget_Examples\">Examples</a> section. </p> </important>"
     },
@@ -136,7 +143,8 @@
         {"shape":"InvalidParameterException"},
         {"shape":"NotFoundException"},
         {"shape":"InvalidNextTokenException"},
-        {"shape":"ExpiredNextTokenException"}
+        {"shape":"ExpiredNextTokenException"},
+        {"shape":"AccessDeniedException"}
       ],
       "documentation":"<p>Describes the history for <code>DAILY</code>, <code>MONTHLY</code>, and <code>QUARTERLY</code> budgets. Budget history isn't available for <code>ANNUAL</code> budgets.</p>"
     },
@@ -153,7 +161,8 @@
         {"shape":"InvalidParameterException"},
         {"shape":"NotFoundException"},
         {"shape":"InvalidNextTokenException"},
-        {"shape":"ExpiredNextTokenException"}
+        {"shape":"ExpiredNextTokenException"},
+        {"shape":"AccessDeniedException"}
       ],
       "documentation":"<p>Lists the budgets that are associated with an account.</p> <important> <p>The Request Syntax section shows the <code>BudgetLimit</code> syntax. For <code>PlannedBudgetLimits</code>, see the <a href=\"https://docs.aws.amazon.com/aws-cost-management/latest/APIReference/API_budgets_DescribeBudgets.html#API_DescribeBudgets_Examples\">Examples</a> section. </p> </important>"
     },
@@ -170,7 +179,8 @@
         {"shape":"InvalidParameterException"},
         {"shape":"NotFoundException"},
         {"shape":"InvalidNextTokenException"},
-        {"shape":"ExpiredNextTokenException"}
+        {"shape":"ExpiredNextTokenException"},
+        {"shape":"AccessDeniedException"}
       ],
       "documentation":"<p>Lists the notifications that are associated with a budget.</p>"
     },
@@ -187,7 +197,8 @@
         {"shape":"NotFoundException"},
         {"shape":"InvalidParameterException"},
         {"shape":"InvalidNextTokenException"},
-        {"shape":"ExpiredNextTokenException"}
+        {"shape":"ExpiredNextTokenException"},
+        {"shape":"AccessDeniedException"}
       ],
       "documentation":"<p>Lists the subscribers that are associated with a notification.</p>"
     },
@@ -202,7 +213,8 @@
       "errors":[
         {"shape":"InternalErrorException"},
         {"shape":"InvalidParameterException"},
-        {"shape":"NotFoundException"}
+        {"shape":"NotFoundException"},
+        {"shape":"AccessDeniedException"}
       ],
       "documentation":"<p>Updates a budget. You can change every part of a budget except for the <code>budgetName</code> and the <code>calculatedSpend</code>. When you modify a budget, the <code>calculatedSpend</code> drops to zero until AWS has new usage data to use for forecasting.</p> <important> <p>Only one of <code>BudgetLimit</code> or <code>PlannedBudgetLimits</code> can be present in the syntax at one time. Use the syntax that matches your case. The Request Syntax section shows the <code>BudgetLimit</code> syntax. For <code>PlannedBudgetLimits</code>, see the <a href=\"https://docs.aws.amazon.com/aws-cost-management/latest/APIReference/API_budgets_UpdateBudget.html#API_UpdateBudget_Examples\">Examples</a> section. </p> </important>"
     },
@@ -218,7 +230,8 @@
         {"shape":"InternalErrorException"},
         {"shape":"InvalidParameterException"},
         {"shape":"NotFoundException"},
-        {"shape":"DuplicateRecordException"}
+        {"shape":"DuplicateRecordException"},
+        {"shape":"AccessDeniedException"}
       ],
       "documentation":"<p>Updates a notification.</p>"
     },
@@ -234,12 +247,21 @@
         {"shape":"InternalErrorException"},
         {"shape":"InvalidParameterException"},
         {"shape":"NotFoundException"},
-        {"shape":"DuplicateRecordException"}
+        {"shape":"DuplicateRecordException"},
+        {"shape":"AccessDeniedException"}
       ],
       "documentation":"<p>Updates a subscriber.</p>"
     }
   },
   "shapes":{
+    "AccessDeniedException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"errorMessage"}
+      },
+      "documentation":"<p>You are not authorized to use this operation with the given parameters.</p>",
+      "exception":true
+    },
     "AccountId":{
       "type":"string",
       "documentation":"<p>The account ID of the user. It should be a 12-digit number.</p>",
@@ -261,7 +283,7 @@
         },
         "BudgetLimit":{
           "shape":"Spend",
-          "documentation":"<p>The total amount of cost, usage, RI utilization, or RI coverage that you want to track with your budget.</p> <p> <code>BudgetLimit</code> is required for cost or usage budgets, but optional for RI utilization or coverage budgets. RI utilization or coverage budgets default to <code>100</code>, which is the only valid value for RI utilization or coverage budgets. You can't use <code>BudgetLimit</code> with <code>PlannedBudgetLimits</code> for <code>CreateBudget</code> and <code>UpdateBudget</code> actions. </p>"
+          "documentation":"<p>The total amount of cost, usage, RI utilization, RI coverage, Savings Plans utilization, or Savings Plans coverage that you want to track with your budget.</p> <p> <code>BudgetLimit</code> is required for cost or usage budgets, but optional for RI or Savings Plans utilization or coverage budgets. RI and Savings Plans utilization or coverage budgets default to <code>100</code>, which is the only valid value for RI or Savings Plans utilization or coverage budgets. You can't use <code>BudgetLimit</code> with <code>PlannedBudgetLimits</code> for <code>CreateBudget</code> and <code>UpdateBudget</code> actions. </p>"
         },
         "PlannedBudgetLimits":{
           "shape":"PlannedBudgetLimits",
@@ -273,11 +295,11 @@
         },
         "CostTypes":{
           "shape":"CostTypes",
-          "documentation":"<p>The types of costs that are included in this <code>COST</code> budget.</p> <p> <code>USAGE</code>, <code>RI_UTILIZATION</code>, and <code>RI_COVERAGE</code> budgets do not have <code>CostTypes</code>.</p>"
+          "documentation":"<p>The types of costs that are included in this <code>COST</code> budget.</p> <p> <code>USAGE</code>, <code>RI_UTILIZATION</code>, <code>RI_COVERAGE</code>, <code>Savings_Plans_Utilization</code>, and <code>Savings_Plans_Coverage</code> budgets do not have <code>CostTypes</code>.</p>"
         },
         "TimeUnit":{
           "shape":"TimeUnit",
-          "documentation":"<p>The length of time until a budget resets the actual and forecasted spend. <code>DAILY</code> is available only for <code>RI_UTILIZATION</code> and <code>RI_COVERAGE</code> budgets.</p>"
+          "documentation":"<p>The length of time until a budget resets the actual and forecasted spend. <code>DAILY</code> is available only for <code>RI_UTILIZATION</code>, <code>RI_COVERAGE</code>, <code>Savings_Plans_Utilization</code>, and <code>Savings_Plans_Coverage</code> budgets.</p>"
         },
         "TimePeriod":{
           "shape":"TimePeriod",
@@ -289,7 +311,7 @@
         },
         "BudgetType":{
           "shape":"BudgetType",
-          "documentation":"<p>Whether this budget tracks costs, usage, RI utilization, or RI coverage.</p>"
+          "documentation":"<p>Whether this budget tracks costs, usage, RI utilization, RI coverage, Savings Plans utilization, or Savings Plans coverage.</p>"
         },
         "LastUpdatedTime":{
           "shape":"GenericTimestamp",
@@ -333,7 +355,9 @@
         "USAGE",
         "COST",
         "RI_UTILIZATION",
-        "RI_COVERAGE"
+        "RI_COVERAGE",
+        "SAVINGS_PLANS_UTILIZATION",
+        "SAVINGS_PLANS_COVERAGE"
       ]
     },
     "BudgetedAndActualAmounts":{
@@ -1005,7 +1029,7 @@
         },
         "Address":{
           "shape":"SubscriberAddress",
-          "documentation":"<p>The address that AWS sends budget notifications to, either an SNS topic or an email.</p> <p>AWS validates the address for a <code>CreateSubscriber</code> request with the <code>.*</code> regex.</p>"
+          "documentation":"<p>The address that AWS sends budget notifications to, either an SNS topic or an email.</p> <p>When you create a subscriber, the value of <code>Address</code> can't contain line breaks.</p>"
         }
       },
       "documentation":"<p>The subscriber to a budget notification. The subscriber consists of a subscription type and either an Amazon SNS topic or an email address.</p> <p>For example, an email subscriber would have the following parameters:</p> <ul> <li> <p>A <code>subscriptionType</code> of <code>EMAIL</code> </p> </li> <li> <p>An <code>address</code> of <code>example@example.com</code> </p> </li> </ul>"
@@ -1015,7 +1039,7 @@
       "documentation":"<p> A string that contains an email address or SNS topic for the subscriber's address.</p>",
       "max":2147483647,
       "min":1,
-      "pattern":"(?s).*",
+      "pattern":"(.*[\\n\\r\\t\\f\\ ]?)*",
       "sensitive":true
     },
     "Subscribers":{
diff --git a/services/budgets/src/test/resources/cucumber.properties b/services/budgets/src/test/resources/cucumber.properties
index a0687bef673a..f40e33477f4b 100644
--- a/services/budgets/src/test/resources/cucumber.properties
+++ b/services/budgets/src/test/resources/cucumber.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/chime/pom.xml b/services/chime/pom.xml
index e342c6ac6a81..556834880c05 100644
--- a/services/chime/pom.xml
+++ b/services/chime/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>chime</artifactId>
     <name>AWS Java SDK :: Services :: Chime</name>
diff --git a/services/chime/src/main/resources/codegen-resources/paginators-1.json b/services/chime/src/main/resources/codegen-resources/paginators-1.json
index 1a3a06e0cfe6..7d55169a0377 100644
--- a/services/chime/src/main/resources/codegen-resources/paginators-1.json
+++ b/services/chime/src/main/resources/codegen-resources/paginators-1.json
@@ -5,11 +5,21 @@
       "output_token": "NextToken",
       "limit_key": "MaxResults"
     },
+    "ListAttendees": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "MaxResults"
+    },
     "ListBots": {
       "input_token": "NextToken",
       "output_token": "NextToken",
       "limit_key": "MaxResults"
     },
+    "ListMeetings": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "MaxResults"
+    },
     "ListPhoneNumberOrders": {
       "input_token": "NextToken",
       "output_token": "NextToken",
@@ -20,6 +30,16 @@
       "output_token": "NextToken",
       "limit_key": "MaxResults"
     },
+    "ListRoomMemberships": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "MaxResults"
+    },
+    "ListRooms": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "MaxResults"
+    },
     "ListUsers": {
       "input_token": "NextToken",
       "output_token": "NextToken",
diff --git a/services/chime/src/main/resources/codegen-resources/service-2.json b/services/chime/src/main/resources/codegen-resources/service-2.json
index 7f4f42cd0e01..730d251ce52b 100644
--- a/services/chime/src/main/resources/codegen-resources/service-2.json
+++ b/services/chime/src/main/resources/codegen-resources/service-2.json
@@ -73,6 +73,67 @@
       ],
       "documentation":"<p>Associates phone numbers with the specified Amazon Chime Voice Connector group.</p>"
     },
+    "AssociateSigninDelegateGroupsWithAccount":{
+      "name":"AssociateSigninDelegateGroupsWithAccount",
+      "http":{
+        "method":"POST",
+        "requestUri":"/accounts/{accountId}?operation=associate-signin-delegate-groups",
+        "responseCode":200
+      },
+      "input":{"shape":"AssociateSigninDelegateGroupsWithAccountRequest"},
+      "output":{"shape":"AssociateSigninDelegateGroupsWithAccountResponse"},
+      "errors":[
+        {"shape":"UnauthorizedClientException"},
+        {"shape":"NotFoundException"},
+        {"shape":"ForbiddenException"},
+        {"shape":"BadRequestException"},
+        {"shape":"ThrottledClientException"},
+        {"shape":"ServiceUnavailableException"},
+        {"shape":"ServiceFailureException"}
+      ],
+      "documentation":"<p>Associates the specified sign-in delegate groups with the specified Amazon Chime account.</p>"
+    },
+    "BatchCreateAttendee":{
+      "name":"BatchCreateAttendee",
+      "http":{
+        "method":"POST",
+        "requestUri":"/meetings/{meetingId}/attendees?operation=batch-create",
+        "responseCode":201
+      },
+      "input":{"shape":"BatchCreateAttendeeRequest"},
+      "output":{"shape":"BatchCreateAttendeeResponse"},
+      "errors":[
+        {"shape":"BadRequestException"},
+        {"shape":"ForbiddenException"},
+        {"shape":"NotFoundException"},
+        {"shape":"ResourceLimitExceededException"},
+        {"shape":"ThrottledClientException"},
+        {"shape":"UnauthorizedClientException"},
+        {"shape":"ServiceUnavailableException"},
+        {"shape":"ServiceFailureException"}
+      ],
+      "documentation":"<p>Creates up to 100 new attendees for an active Amazon Chime SDK meeting. For more information about the Amazon Chime SDK, see <a href=\"https://docs.aws.amazon.com/chime/latest/dg/meetings-sdk.html\">Using the Amazon Chime SDK</a> in the <i>Amazon Chime Developer Guide</i>. </p>"
+    },
+    "BatchCreateRoomMembership":{
+      "name":"BatchCreateRoomMembership",
+      "http":{
+        "method":"POST",
+        "requestUri":"/accounts/{accountId}/rooms/{roomId}/memberships?operation=batch-create",
+        "responseCode":201
+      },
+      "input":{"shape":"BatchCreateRoomMembershipRequest"},
+      "output":{"shape":"BatchCreateRoomMembershipResponse"},
+      "errors":[
+        {"shape":"UnauthorizedClientException"},
+        {"shape":"NotFoundException"},
+        {"shape":"BadRequestException"},
+        {"shape":"ForbiddenException"},
+        {"shape":"ThrottledClientException"},
+        {"shape":"ServiceUnavailableException"},
+        {"shape":"ServiceFailureException"}
+      ],
+      "documentation":"<p>Adds up to 50 members to a chat room in an Amazon Chime Enterprise account. Members can be either users or bots. The member role designates whether the member is a chat room administrator or a general chat room member.</p>"
+    },
     "BatchDeletePhoneNumber":{
       "name":"BatchDeletePhoneNumber",
       "http":{
@@ -111,7 +172,7 @@
         {"shape":"ServiceUnavailableException"},
         {"shape":"ServiceFailureException"}
       ],
-      "documentation":"<p>Suspends up to 50 users from a <code>Team</code> or <code>EnterpriseLWA</code> Amazon Chime account. For more information about different account types, see <a href=\"https://docs.aws.amazon.com/chime/latest/ag/manage-chime-account.html\">Managing Your Amazon Chime Accounts</a> in the <i>Amazon Chime Administration Guide</i>.</p> <p>Users suspended from a <code>Team</code> account are dissasociated from the account, but they can continue to use Amazon Chime as free users. To remove the suspension from suspended <code>Team</code> account users, invite them to the <code>Team</code> account again. You can use the <a>InviteUsers</a> action to do so.</p> <p>Users suspended from an <code>EnterpriseLWA</code> account are immediately signed out of Amazon Chime and can no longer sign in. To remove the suspension from suspended <code>EnterpriseLWA</code> account users, use the <a>BatchUnsuspendUser</a> action. </p> <p>To sign out users without suspending them, use the <a>LogoutUser</a> action.</p>"
+      "documentation":"<p>Suspends up to 50 users from a <code>Team</code> or <code>EnterpriseLWA</code> Amazon Chime account. For more information about different account types, see <a href=\"https://docs.aws.amazon.com/chime/latest/ag/manage-chime-account.html\">Managing Your Amazon Chime Accounts</a> in the <i>Amazon Chime Administration Guide</i>.</p> <p>Users suspended from a <code>Team</code> account are disassociated from the account, but they can continue to use Amazon Chime as free users. To remove the suspension from suspended <code>Team</code> account users, invite them to the <code>Team</code> account again. You can use the <a>InviteUsers</a> action to do so.</p> <p>Users suspended from an <code>EnterpriseLWA</code> account are immediately signed out of Amazon Chime and can no longer sign in. To remove the suspension from suspended <code>EnterpriseLWA</code> account users, use the <a>BatchUnsuspendUser</a> action. </p> <p>To sign out users without suspending them, use the <a>LogoutUser</a> action.</p>"
     },
     "BatchUnsuspendUser":{
       "name":"BatchUnsuspendUser",
@@ -193,6 +254,27 @@
       ],
       "documentation":"<p>Creates an Amazon Chime account under the administrator's AWS account. Only <code>Team</code> account types are currently supported for this action. For more information about different account types, see <a href=\"https://docs.aws.amazon.com/chime/latest/ag/manage-chime-account.html\">Managing Your Amazon Chime Accounts</a> in the <i>Amazon Chime Administration Guide</i>.</p>"
     },
+    "CreateAttendee":{
+      "name":"CreateAttendee",
+      "http":{
+        "method":"POST",
+        "requestUri":"/meetings/{meetingId}/attendees",
+        "responseCode":201
+      },
+      "input":{"shape":"CreateAttendeeRequest"},
+      "output":{"shape":"CreateAttendeeResponse"},
+      "errors":[
+        {"shape":"BadRequestException"},
+        {"shape":"ForbiddenException"},
+        {"shape":"NotFoundException"},
+        {"shape":"ResourceLimitExceededException"},
+        {"shape":"ThrottledClientException"},
+        {"shape":"UnauthorizedClientException"},
+        {"shape":"ServiceUnavailableException"},
+        {"shape":"ServiceFailureException"}
+      ],
+      "documentation":"<p>Creates a new attendee for an active Amazon Chime SDK meeting. For more information about the Amazon Chime SDK, see <a href=\"https://docs.aws.amazon.com/chime/latest/dg/meetings-sdk.html\">Using the Amazon Chime SDK</a> in the <i>Amazon Chime Developer Guide</i>.</p>"
+    },
     "CreateBot":{
       "name":"CreateBot",
       "http":{
@@ -209,10 +291,31 @@
         {"shape":"BadRequestException"},
         {"shape":"UnauthorizedClientException"},
         {"shape":"ResourceLimitExceededException"},
-        {"shape":"NotFoundException"}
+        {"shape":"NotFoundException"},
+        {"shape":"ThrottledClientException"}
       ],
       "documentation":"<p>Creates a bot for an Amazon Chime Enterprise account.</p>"
     },
+    "CreateMeeting":{
+      "name":"CreateMeeting",
+      "http":{
+        "method":"POST",
+        "requestUri":"/meetings",
+        "responseCode":201
+      },
+      "input":{"shape":"CreateMeetingRequest"},
+      "output":{"shape":"CreateMeetingResponse"},
+      "errors":[
+        {"shape":"BadRequestException"},
+        {"shape":"ForbiddenException"},
+        {"shape":"ResourceLimitExceededException"},
+        {"shape":"ThrottledClientException"},
+        {"shape":"UnauthorizedClientException"},
+        {"shape":"ServiceUnavailableException"},
+        {"shape":"ServiceFailureException"}
+      ],
+      "documentation":"<p>Creates a new Amazon Chime SDK meeting in the specified media Region with no initial attendees. For more information about the Amazon Chime SDK, see <a href=\"https://docs.aws.amazon.com/chime/latest/dg/meetings-sdk.html\">Using the Amazon Chime SDK</a> in the <i>Amazon Chime Developer Guide</i>.</p>"
+    },
     "CreatePhoneNumberOrder":{
       "name":"CreatePhoneNumberOrder",
       "http":{
@@ -234,6 +337,70 @@
       ],
       "documentation":"<p>Creates an order for phone numbers to be provisioned. Choose from Amazon Chime Business Calling and Amazon Chime Voice Connector product types. For toll-free numbers, you must use the Amazon Chime Voice Connector product type.</p>"
     },
+    "CreateRoom":{
+      "name":"CreateRoom",
+      "http":{
+        "method":"POST",
+        "requestUri":"/accounts/{accountId}/rooms",
+        "responseCode":201
+      },
+      "input":{"shape":"CreateRoomRequest"},
+      "output":{"shape":"CreateRoomResponse"},
+      "errors":[
+        {"shape":"NotFoundException"},
+        {"shape":"BadRequestException"},
+        {"shape":"ForbiddenException"},
+        {"shape":"UnauthorizedClientException"},
+        {"shape":"ResourceLimitExceededException"},
+        {"shape":"ThrottledClientException"},
+        {"shape":"ServiceUnavailableException"},
+        {"shape":"ServiceFailureException"}
+      ],
+      "documentation":"<p>Creates a chat room for the specified Amazon Chime Enterprise account.</p>"
+    },
+    "CreateRoomMembership":{
+      "name":"CreateRoomMembership",
+      "http":{
+        "method":"POST",
+        "requestUri":"/accounts/{accountId}/rooms/{roomId}/memberships",
+        "responseCode":201
+      },
+      "input":{"shape":"CreateRoomMembershipRequest"},
+      "output":{"shape":"CreateRoomMembershipResponse"},
+      "errors":[
+        {"shape":"ConflictException"},
+        {"shape":"UnauthorizedClientException"},
+        {"shape":"NotFoundException"},
+        {"shape":"BadRequestException"},
+        {"shape":"ForbiddenException"},
+        {"shape":"ResourceLimitExceededException"},
+        {"shape":"ThrottledClientException"},
+        {"shape":"ServiceUnavailableException"},
+        {"shape":"ServiceFailureException"}
+      ],
+      "documentation":"<p>Adds a member to a chat room in an Amazon Chime Enterprise account. A member can be either a user or a bot. The member role designates whether the member is a chat room administrator or a general chat room member.</p>"
+    },
+    "CreateUser":{
+      "name":"CreateUser",
+      "http":{
+        "method":"POST",
+        "requestUri":"/accounts/{accountId}/users?operation=create",
+        "responseCode":201
+      },
+      "input":{"shape":"CreateUserRequest"},
+      "output":{"shape":"CreateUserResponse"},
+      "errors":[
+        {"shape":"UnauthorizedClientException"},
+        {"shape":"NotFoundException"},
+        {"shape":"ConflictException"},
+        {"shape":"ForbiddenException"},
+        {"shape":"BadRequestException"},
+        {"shape":"ThrottledClientException"},
+        {"shape":"ServiceUnavailableException"},
+        {"shape":"ServiceFailureException"}
+      ],
+      "documentation":"<p>Creates a user under the specified Amazon Chime account.</p>"
+    },
     "CreateVoiceConnector":{
       "name":"CreateVoiceConnector",
       "http":{
@@ -274,7 +441,7 @@
         {"shape":"ServiceUnavailableException"},
         {"shape":"ServiceFailureException"}
       ],
-      "documentation":"<p>Creates an Amazon Chime Voice Connector group under the administrator's AWS account. You can associate up to three existing Amazon Chime Voice Connectors with the Amazon Chime Voice Connector group by including <code>VoiceConnectorItems</code> in the request.</p> <p>You can include Amazon Chime Voice Connectors from different AWS Regions in your group. This creates a fault tolerant mechanism for fallback in case of availability events.</p>"
+      "documentation":"<p>Creates an Amazon Chime Voice Connector group under the administrator's AWS account. You can associate Amazon Chime Voice Connectors with the Amazon Chime Voice Connector group by including <code>VoiceConnectorItems</code> in the request.</p> <p>You can include Amazon Chime Voice Connectors from different AWS Regions in your group. This creates a fault tolerant mechanism for fallback in case of availability events.</p>"
     },
     "DeleteAccount":{
       "name":"DeleteAccount",
@@ -297,6 +464,25 @@
       ],
       "documentation":"<p>Deletes the specified Amazon Chime account. You must suspend all users before deleting a <code>Team</code> account. You can use the <a>BatchSuspendUser</a> action to do so.</p> <p>For <code>EnterpriseLWA</code> and <code>EnterpriseAD</code> accounts, you must release the claimed domains for your Amazon Chime account before deletion. As soon as you release the domain, all users under that account are suspended.</p> <p>Deleted accounts appear in your <code>Disabled</code> accounts list for 90 days. To restore a deleted account from your <code>Disabled</code> accounts list, you must contact AWS Support.</p> <p>After 90 days, deleted accounts are permanently removed from your <code>Disabled</code> accounts list.</p>"
     },
+    "DeleteAttendee":{
+      "name":"DeleteAttendee",
+      "http":{
+        "method":"DELETE",
+        "requestUri":"/meetings/{meetingId}/attendees/{attendeeId}",
+        "responseCode":204
+      },
+      "input":{"shape":"DeleteAttendeeRequest"},
+      "errors":[
+        {"shape":"BadRequestException"},
+        {"shape":"ForbiddenException"},
+        {"shape":"ThrottledClientException"},
+        {"shape":"NotFoundException"},
+        {"shape":"UnauthorizedClientException"},
+        {"shape":"ServiceUnavailableException"},
+        {"shape":"ServiceFailureException"}
+      ],
+      "documentation":"<p>Deletes an attendee from the specified Amazon Chime SDK meeting and deletes their <code>JoinToken</code>. Attendees are automatically deleted when a Amazon Chime SDK meeting is deleted. For more information about the Amazon Chime SDK, see <a href=\"https://docs.aws.amazon.com/chime/latest/dg/meetings-sdk.html\">Using the Amazon Chime SDK</a> in the <i>Amazon Chime Developer Guide</i>.</p>"
+    },
     "DeleteEventsConfiguration":{
       "name":"DeleteEventsConfiguration",
       "http":{
@@ -315,6 +501,25 @@
       ],
       "documentation":"<p>Deletes the events configuration that allows a bot to receive outgoing events.</p>"
     },
+    "DeleteMeeting":{
+      "name":"DeleteMeeting",
+      "http":{
+        "method":"DELETE",
+        "requestUri":"/meetings/{meetingId}",
+        "responseCode":204
+      },
+      "input":{"shape":"DeleteMeetingRequest"},
+      "errors":[
+        {"shape":"BadRequestException"},
+        {"shape":"ForbiddenException"},
+        {"shape":"ThrottledClientException"},
+        {"shape":"NotFoundException"},
+        {"shape":"UnauthorizedClientException"},
+        {"shape":"ServiceUnavailableException"},
+        {"shape":"ServiceFailureException"}
+      ],
+      "documentation":"<p>Deletes the specified Amazon Chime SDK meeting. When a meeting is deleted, its attendees are also deleted and clients can no longer join it. For more information about the Amazon Chime SDK, see <a href=\"https://docs.aws.amazon.com/chime/latest/dg/meetings-sdk.html\">Using the Amazon Chime SDK</a> in the <i>Amazon Chime Developer Guide</i>.</p>"
+    },
     "DeletePhoneNumber":{
       "name":"DeletePhoneNumber",
       "http":{
@@ -334,6 +539,44 @@
       ],
       "documentation":"<p>Moves the specified phone number into the <b>Deletion queue</b>. A phone number must be disassociated from any users or Amazon Chime Voice Connectors before it can be deleted.</p> <p>Deleted phone numbers remain in the <b>Deletion queue</b> for 7 days before they are deleted permanently.</p>"
     },
+    "DeleteRoom":{
+      "name":"DeleteRoom",
+      "http":{
+        "method":"DELETE",
+        "requestUri":"/accounts/{accountId}/rooms/{roomId}",
+        "responseCode":204
+      },
+      "input":{"shape":"DeleteRoomRequest"},
+      "errors":[
+        {"shape":"BadRequestException"},
+        {"shape":"ForbiddenException"},
+        {"shape":"NotFoundException"},
+        {"shape":"UnauthorizedClientException"},
+        {"shape":"ThrottledClientException"},
+        {"shape":"ServiceUnavailableException"},
+        {"shape":"ServiceFailureException"}
+      ],
+      "documentation":"<p>Deletes a chat room in an Amazon Chime Enterprise account.</p>"
+    },
+    "DeleteRoomMembership":{
+      "name":"DeleteRoomMembership",
+      "http":{
+        "method":"DELETE",
+        "requestUri":"/accounts/{accountId}/rooms/{roomId}/memberships/{memberId}",
+        "responseCode":204
+      },
+      "input":{"shape":"DeleteRoomMembershipRequest"},
+      "errors":[
+        {"shape":"UnauthorizedClientException"},
+        {"shape":"NotFoundException"},
+        {"shape":"BadRequestException"},
+        {"shape":"ForbiddenException"},
+        {"shape":"ThrottledClientException"},
+        {"shape":"ServiceUnavailableException"},
+        {"shape":"ServiceFailureException"}
+      ],
+      "documentation":"<p>Removes a member from a chat room in an Amazon Chime Enterprise account.</p>"
+    },
     "DeleteVoiceConnector":{
       "name":"DeleteVoiceConnector",
       "http":{
@@ -510,6 +753,26 @@
       ],
       "documentation":"<p>Disassociates the specified phone numbers from the specified Amazon Chime Voice Connector group.</p>"
     },
+    "DisassociateSigninDelegateGroupsFromAccount":{
+      "name":"DisassociateSigninDelegateGroupsFromAccount",
+      "http":{
+        "method":"POST",
+        "requestUri":"/accounts/{accountId}?operation=disassociate-signin-delegate-groups",
+        "responseCode":200
+      },
+      "input":{"shape":"DisassociateSigninDelegateGroupsFromAccountRequest"},
+      "output":{"shape":"DisassociateSigninDelegateGroupsFromAccountResponse"},
+      "errors":[
+        {"shape":"UnauthorizedClientException"},
+        {"shape":"NotFoundException"},
+        {"shape":"ForbiddenException"},
+        {"shape":"BadRequestException"},
+        {"shape":"ThrottledClientException"},
+        {"shape":"ServiceUnavailableException"},
+        {"shape":"ServiceFailureException"}
+      ],
+      "documentation":"<p>Disassociates the specified sign-in delegate groups from the specified Amazon Chime account.</p>"
+    },
     "GetAccount":{
       "name":"GetAccount",
       "http":{
@@ -548,6 +811,26 @@
       ],
       "documentation":"<p>Retrieves account settings for the specified Amazon Chime account ID, such as remote control and dial out settings. For more information about these settings, see <a href=\"https://docs.aws.amazon.com/chime/latest/ag/policies.html\">Use the Policies Page</a> in the <i>Amazon Chime Administration Guide</i>.</p>"
     },
+    "GetAttendee":{
+      "name":"GetAttendee",
+      "http":{
+        "method":"GET",
+        "requestUri":"/meetings/{meetingId}/attendees/{attendeeId}",
+        "responseCode":200
+      },
+      "input":{"shape":"GetAttendeeRequest"},
+      "output":{"shape":"GetAttendeeResponse"},
+      "errors":[
+        {"shape":"BadRequestException"},
+        {"shape":"ForbiddenException"},
+        {"shape":"NotFoundException"},
+        {"shape":"ThrottledClientException"},
+        {"shape":"UnauthorizedClientException"},
+        {"shape":"ServiceUnavailableException"},
+        {"shape":"ServiceFailureException"}
+      ],
+      "documentation":"<p>Gets the Amazon Chime SDK attendee details for a specified meeting ID and attendee ID. For more information about the Amazon Chime SDK, see <a href=\"https://docs.aws.amazon.com/chime/latest/dg/meetings-sdk.html\">Using the Amazon Chime SDK</a> in the <i>Amazon Chime Developer Guide</i>.</p>"
+    },
     "GetBot":{
       "name":"GetBot",
       "http":{
@@ -563,7 +846,8 @@
         {"shape":"ForbiddenException"},
         {"shape":"UnauthorizedClientException"},
         {"shape":"NotFoundException"},
-        {"shape":"BadRequestException"}
+        {"shape":"BadRequestException"},
+        {"shape":"ThrottledClientException"}
       ],
       "documentation":"<p>Retrieves details for the specified bot, such as bot email address, bot type, status, and display name.</p>"
     },
@@ -605,6 +889,26 @@
       ],
       "documentation":"<p>Retrieves global settings for the administrator's AWS account, such as Amazon Chime Business Calling and Amazon Chime Voice Connector settings.</p>"
     },
+    "GetMeeting":{
+      "name":"GetMeeting",
+      "http":{
+        "method":"GET",
+        "requestUri":"/meetings/{meetingId}",
+        "responseCode":200
+      },
+      "input":{"shape":"GetMeetingRequest"},
+      "output":{"shape":"GetMeetingResponse"},
+      "errors":[
+        {"shape":"BadRequestException"},
+        {"shape":"ForbiddenException"},
+        {"shape":"NotFoundException"},
+        {"shape":"ThrottledClientException"},
+        {"shape":"UnauthorizedClientException"},
+        {"shape":"ServiceUnavailableException"},
+        {"shape":"ServiceFailureException"}
+      ],
+      "documentation":"<p>Gets the Amazon Chime SDK meeting details for the specified meeting ID. For more information about the Amazon Chime SDK, see <a href=\"https://docs.aws.amazon.com/chime/latest/dg/meetings-sdk.html\">Using the Amazon Chime SDK</a> in the <i>Amazon Chime Developer Guide</i>.</p>"
+    },
     "GetPhoneNumber":{
       "name":"GetPhoneNumber",
       "http":{
@@ -662,6 +966,26 @@
       ],
       "documentation":"<p>Retrieves the phone number settings for the administrator's AWS account, such as the default outbound calling name.</p>"
     },
+    "GetRoom":{
+      "name":"GetRoom",
+      "http":{
+        "method":"GET",
+        "requestUri":"/accounts/{accountId}/rooms/{roomId}",
+        "responseCode":200
+      },
+      "input":{"shape":"GetRoomRequest"},
+      "output":{"shape":"GetRoomResponse"},
+      "errors":[
+        {"shape":"BadRequestException"},
+        {"shape":"ForbiddenException"},
+        {"shape":"NotFoundException"},
+        {"shape":"UnauthorizedClientException"},
+        {"shape":"ThrottledClientException"},
+        {"shape":"ServiceUnavailableException"},
+        {"shape":"ServiceFailureException"}
+      ],
+      "documentation":"<p>Retrieves room details, such as the room name, for a room in an Amazon Chime Enterprise account.</p>"
+    },
     "GetUser":{
       "name":"GetUser",
       "http":{
@@ -800,7 +1124,7 @@
         {"shape":"ServiceUnavailableException"},
         {"shape":"ServiceFailureException"}
       ],
-      "documentation":"<p>Retrieves the streaming configuration details for the specified Amazon Chime Voice Connector. Shows whether media streaming is enabled for sending to Amazon Kinesis, and shows the retention period for the Amazon Kinesis data, in hours.</p>"
+      "documentation":"<p>Retrieves the streaming configuration details for the specified Amazon Chime Voice Connector. Shows whether media streaming is enabled for sending to Amazon Kinesis. It also shows the retention period, in hours, for the Amazon Kinesis data.</p>"
     },
     "GetVoiceConnectorTermination":{
       "name":"GetVoiceConnectorTermination",
@@ -860,7 +1184,7 @@
         {"shape":"ServiceUnavailableException"},
         {"shape":"ServiceFailureException"}
       ],
-      "documentation":"<p>Sends email invites to as many as 50 users, inviting them to the specified Amazon Chime <code>Team</code> account. Only <code>Team</code> account types are currently supported for this action. </p>"
+      "documentation":"<p>Sends email to a maximum of 50 users, inviting them to the specified Amazon Chime <code>Team</code> account. Only <code>Team</code> account types are currently supported for this action. </p>"
     },
     "ListAccounts":{
       "name":"ListAccounts",
@@ -881,6 +1205,26 @@
       ],
       "documentation":"<p>Lists the Amazon Chime accounts under the administrator's AWS account. You can filter accounts by account name prefix. To find out which Amazon Chime account a user belongs to, you can filter by the user's email address, which returns one account result.</p>"
     },
+    "ListAttendees":{
+      "name":"ListAttendees",
+      "http":{
+        "method":"GET",
+        "requestUri":"/meetings/{meetingId}/attendees",
+        "responseCode":200
+      },
+      "input":{"shape":"ListAttendeesRequest"},
+      "output":{"shape":"ListAttendeesResponse"},
+      "errors":[
+        {"shape":"BadRequestException"},
+        {"shape":"ForbiddenException"},
+        {"shape":"NotFoundException"},
+        {"shape":"ThrottledClientException"},
+        {"shape":"UnauthorizedClientException"},
+        {"shape":"ServiceUnavailableException"},
+        {"shape":"ServiceFailureException"}
+      ],
+      "documentation":"<p>Lists the attendees for the specified Amazon Chime SDK meeting. For more information about the Amazon Chime SDK, see <a href=\"https://docs.aws.amazon.com/chime/latest/dg/meetings-sdk.html\">Using the Amazon Chime SDK</a> in the <i>Amazon Chime Developer Guide</i>.</p>"
+    },
     "ListBots":{
       "name":"ListBots",
       "http":{
@@ -896,22 +1240,42 @@
         {"shape":"ForbiddenException"},
         {"shape":"UnauthorizedClientException"},
         {"shape":"BadRequestException"},
-        {"shape":"NotFoundException"}
+        {"shape":"NotFoundException"},
+        {"shape":"ThrottledClientException"}
       ],
       "documentation":"<p>Lists the bots associated with the administrator's Amazon Chime Enterprise account ID.</p>"
     },
-    "ListPhoneNumberOrders":{
-      "name":"ListPhoneNumberOrders",
+    "ListMeetings":{
+      "name":"ListMeetings",
       "http":{
         "method":"GET",
-        "requestUri":"/phone-number-orders",
+        "requestUri":"/meetings",
         "responseCode":200
       },
-      "input":{"shape":"ListPhoneNumberOrdersRequest"},
-      "output":{"shape":"ListPhoneNumberOrdersResponse"},
+      "input":{"shape":"ListMeetingsRequest"},
+      "output":{"shape":"ListMeetingsResponse"},
       "errors":[
-        {"shape":"UnauthorizedClientException"},
-        {"shape":"ForbiddenException"},
+        {"shape":"BadRequestException"},
+        {"shape":"ForbiddenException"},
+        {"shape":"ThrottledClientException"},
+        {"shape":"UnauthorizedClientException"},
+        {"shape":"ServiceUnavailableException"},
+        {"shape":"ServiceFailureException"}
+      ],
+      "documentation":"<p>Lists up to 100 active Amazon Chime SDK meetings. For more information about the Amazon Chime SDK, see <a href=\"https://docs.aws.amazon.com/chime/latest/dg/meetings-sdk.html\">Using the Amazon Chime SDK</a> in the <i>Amazon Chime Developer Guide</i>.</p>"
+    },
+    "ListPhoneNumberOrders":{
+      "name":"ListPhoneNumberOrders",
+      "http":{
+        "method":"GET",
+        "requestUri":"/phone-number-orders",
+        "responseCode":200
+      },
+      "input":{"shape":"ListPhoneNumberOrdersRequest"},
+      "output":{"shape":"ListPhoneNumberOrdersResponse"},
+      "errors":[
+        {"shape":"UnauthorizedClientException"},
+        {"shape":"ForbiddenException"},
         {"shape":"BadRequestException"},
         {"shape":"ThrottledClientException"},
         {"shape":"ServiceUnavailableException"},
@@ -937,6 +1301,46 @@
       ],
       "documentation":"<p>Lists the phone numbers for the specified Amazon Chime account, Amazon Chime user, Amazon Chime Voice Connector, or Amazon Chime Voice Connector group.</p>"
     },
+    "ListRoomMemberships":{
+      "name":"ListRoomMemberships",
+      "http":{
+        "method":"GET",
+        "requestUri":"/accounts/{accountId}/rooms/{roomId}/memberships",
+        "responseCode":200
+      },
+      "input":{"shape":"ListRoomMembershipsRequest"},
+      "output":{"shape":"ListRoomMembershipsResponse"},
+      "errors":[
+        {"shape":"NotFoundException"},
+        {"shape":"BadRequestException"},
+        {"shape":"ForbiddenException"},
+        {"shape":"UnauthorizedClientException"},
+        {"shape":"ThrottledClientException"},
+        {"shape":"ServiceUnavailableException"},
+        {"shape":"ServiceFailureException"}
+      ],
+      "documentation":"<p>Lists the membership details for the specified room in an Amazon Chime Enterprise account, such as the members' IDs, email addresses, and names.</p>"
+    },
+    "ListRooms":{
+      "name":"ListRooms",
+      "http":{
+        "method":"GET",
+        "requestUri":"/accounts/{accountId}/rooms",
+        "responseCode":200
+      },
+      "input":{"shape":"ListRoomsRequest"},
+      "output":{"shape":"ListRoomsResponse"},
+      "errors":[
+        {"shape":"NotFoundException"},
+        {"shape":"BadRequestException"},
+        {"shape":"ForbiddenException"},
+        {"shape":"UnauthorizedClientException"},
+        {"shape":"ThrottledClientException"},
+        {"shape":"ServiceUnavailableException"},
+        {"shape":"ServiceFailureException"}
+      ],
+      "documentation":"<p>Lists the room details for the specified Amazon Chime Enterprise account. Optionally, filter the results by a member ID (user ID or bot ID) to see a list of rooms that the member belongs to.</p>"
+    },
     "ListUsers":{
       "name":"ListUsers",
       "http":{
@@ -1113,7 +1517,7 @@
         {"shape":"ServiceUnavailableException"},
         {"shape":"ServiceFailureException"}
       ],
-      "documentation":"<p>Adds a streaming configuration for the specified Amazon Chime Voice Connector. The streaming configuration specifies whether media streaming is enabled for sending to Amazon Kinesis, and sets the retention period for the Amazon Kinesis data, in hours.</p>"
+      "documentation":"<p>Adds a streaming configuration for the specified Amazon Chime Voice Connector. The streaming configuration specifies whether media streaming is enabled for sending to Amazon Kinesis. It also sets the retention period, in hours, for the Amazon Kinesis data.</p>"
     },
     "PutVoiceConnectorTermination":{
       "name":"PutVoiceConnectorTermination",
@@ -1170,7 +1574,8 @@
         {"shape":"ForbiddenException"},
         {"shape":"BadRequestException"},
         {"shape":"UnauthorizedClientException"},
-        {"shape":"NotFoundException"}
+        {"shape":"NotFoundException"},
+        {"shape":"ThrottledClientException"}
       ],
       "documentation":"<p>Regenerates the security token for a bot.</p>"
     },
@@ -1290,7 +1695,8 @@
         {"shape":"ForbiddenException"},
         {"shape":"BadRequestException"},
         {"shape":"UnauthorizedClientException"},
-        {"shape":"NotFoundException"}
+        {"shape":"NotFoundException"},
+        {"shape":"ThrottledClientException"}
       ],
       "documentation":"<p>Updates the status of the specified bot, such as starting or stopping the bot from running in your Amazon Chime Enterprise account.</p>"
     },
@@ -1348,7 +1754,47 @@
         {"shape":"ServiceUnavailableException"},
         {"shape":"ServiceFailureException"}
       ],
-      "documentation":"<p>Updates the phone number settings for the administrator's AWS account, such as the default outbound calling name. You can update the default outbound calling name once every seven days. Outbound calling names can take up to 72 hours to be updated.</p>"
+      "documentation":"<p>Updates the phone number settings for the administrator's AWS account, such as the default outbound calling name. You can update the default outbound calling name once every seven days. Outbound calling names can take up to 72 hours to update.</p>"
+    },
+    "UpdateRoom":{
+      "name":"UpdateRoom",
+      "http":{
+        "method":"POST",
+        "requestUri":"/accounts/{accountId}/rooms/{roomId}",
+        "responseCode":200
+      },
+      "input":{"shape":"UpdateRoomRequest"},
+      "output":{"shape":"UpdateRoomResponse"},
+      "errors":[
+        {"shape":"BadRequestException"},
+        {"shape":"ForbiddenException"},
+        {"shape":"NotFoundException"},
+        {"shape":"UnauthorizedClientException"},
+        {"shape":"ThrottledClientException"},
+        {"shape":"ServiceUnavailableException"},
+        {"shape":"ServiceFailureException"}
+      ],
+      "documentation":"<p>Updates room details, such as the room name, for a room in an Amazon Chime Enterprise account.</p>"
+    },
+    "UpdateRoomMembership":{
+      "name":"UpdateRoomMembership",
+      "http":{
+        "method":"POST",
+        "requestUri":"/accounts/{accountId}/rooms/{roomId}/memberships/{memberId}",
+        "responseCode":200
+      },
+      "input":{"shape":"UpdateRoomMembershipRequest"},
+      "output":{"shape":"UpdateRoomMembershipResponse"},
+      "errors":[
+        {"shape":"UnauthorizedClientException"},
+        {"shape":"NotFoundException"},
+        {"shape":"BadRequestException"},
+        {"shape":"ForbiddenException"},
+        {"shape":"ThrottledClientException"},
+        {"shape":"ServiceUnavailableException"},
+        {"shape":"ServiceFailureException"}
+      ],
+      "documentation":"<p>Updates room membership details, such as the member role, for a room in an Amazon Chime Enterprise account. The member role designates whether the member is a chat room administrator or a general chat room member. The member role can be updated only for user IDs.</p>"
     },
     "UpdateUser":{
       "name":"UpdateUser",
@@ -1477,6 +1923,10 @@
         "SupportedLicenses":{
           "shape":"LicenseList",
           "documentation":"<p>Supported licenses for the Amazon Chime account.</p>"
+        },
+        "SigninDelegateGroups":{
+          "shape":"SigninDelegateGroupList",
+          "documentation":"<p>The sign-in delegate groups associated with the account.</p>"
         }
       },
       "documentation":"<p>The Amazon Chime account details. An AWS account can have multiple Amazon Chime accounts.</p>"
@@ -1514,6 +1964,27 @@
         "EnterpriseOIDC"
       ]
     },
+    "AlexaForBusinessMetadata":{
+      "type":"structure",
+      "members":{
+        "IsAlexaForBusinessEnabled":{
+          "shape":"Boolean",
+          "documentation":"<p>Starts or stops Alexa for Business.</p>"
+        },
+        "AlexaForBusinessRoomArn":{
+          "shape":"SensitiveString",
+          "documentation":"<p>The ARN of the room resource.</p>"
+        }
+      },
+      "documentation":"<p>The Alexa for Business metadata associated with an Amazon Chime user, used to integrate Alexa for Business with a device.</p>"
+    },
+    "Arn":{
+      "type":"string",
+      "max":1024,
+      "min":1,
+      "pattern":"^arn[\\/\\:\\-\\_\\.a-zA-Z0-9]+$",
+      "sensitive":true
+    },
     "AssociatePhoneNumberWithUserRequest":{
       "type":"structure",
       "required":[
@@ -1603,6 +2074,52 @@
         }
       }
     },
+    "AssociateSigninDelegateGroupsWithAccountRequest":{
+      "type":"structure",
+      "required":[
+        "AccountId",
+        "SigninDelegateGroups"
+      ],
+      "members":{
+        "AccountId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The Amazon Chime account ID.</p>",
+          "location":"uri",
+          "locationName":"accountId"
+        },
+        "SigninDelegateGroups":{
+          "shape":"SigninDelegateGroupList",
+          "documentation":"<p>The sign-in delegate groups.</p>"
+        }
+      }
+    },
+    "AssociateSigninDelegateGroupsWithAccountResponse":{
+      "type":"structure",
+      "members":{
+      }
+    },
+    "Attendee":{
+      "type":"structure",
+      "members":{
+        "ExternalUserId":{
+          "shape":"ExternalUserIdType",
+          "documentation":"<p>The Amazon Chime SDK external user ID. Links the attendee to an identity managed by a builder application.</p>"
+        },
+        "AttendeeId":{
+          "shape":"GuidString",
+          "documentation":"<p>The Amazon Chime SDK attendee ID.</p>"
+        },
+        "JoinToken":{
+          "shape":"JoinTokenString",
+          "documentation":"<p>The join token used by the Amazon Chime SDK attendee.</p>"
+        }
+      },
+      "documentation":"<p>An Amazon Chime SDK meeting attendee. Includes a unique <code>AttendeeId</code> and <code>JoinToken</code>. The <code>JoinToken</code> allows a client to authenticate and join as the specified attendee. The <code>JoinToken</code> expires when the meeting ends or when <a>DeleteAttendee</a> is called. After that, the attendee is unable to join the meeting.</p> <p>We recommend securely transferring each <code>JoinToken</code> from your server application to the client so that no other client has access to the token except for the one authorized to represent the attendee.</p>"
+    },
+    "AttendeeList":{
+      "type":"list",
+      "member":{"shape":"Attendee"}
+    },
     "BadRequestException":{
       "type":"structure",
       "members":{
@@ -1613,6 +2130,77 @@
       "error":{"httpStatusCode":400},
       "exception":true
     },
+    "BatchCreateAttendeeErrorList":{
+      "type":"list",
+      "member":{"shape":"CreateAttendeeError"}
+    },
+    "BatchCreateAttendeeRequest":{
+      "type":"structure",
+      "required":[
+        "MeetingId",
+        "Attendees"
+      ],
+      "members":{
+        "MeetingId":{
+          "shape":"GuidString",
+          "documentation":"<p>The Amazon Chime SDK meeting ID.</p>",
+          "location":"uri",
+          "locationName":"meetingId"
+        },
+        "Attendees":{
+          "shape":"CreateAttendeeRequestItemList",
+          "documentation":"<p>The request containing the attendees to create.</p>"
+        }
+      }
+    },
+    "BatchCreateAttendeeResponse":{
+      "type":"structure",
+      "members":{
+        "Attendees":{
+          "shape":"AttendeeList",
+          "documentation":"<p>The attendee information, including attendees IDs and join tokens.</p>"
+        },
+        "Errors":{
+          "shape":"BatchCreateAttendeeErrorList",
+          "documentation":"<p>If the action fails for one or more of the attendees in the request, a list of the attendees is returned, along with error codes and error messages.</p>"
+        }
+      }
+    },
+    "BatchCreateRoomMembershipRequest":{
+      "type":"structure",
+      "required":[
+        "AccountId",
+        "RoomId",
+        "MembershipItemList"
+      ],
+      "members":{
+        "AccountId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The Amazon Chime account ID.</p>",
+          "location":"uri",
+          "locationName":"accountId"
+        },
+        "RoomId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The room ID.</p>",
+          "location":"uri",
+          "locationName":"roomId"
+        },
+        "MembershipItemList":{
+          "shape":"MembershipItemList",
+          "documentation":"<p>The list of membership items.</p>"
+        }
+      }
+    },
+    "BatchCreateRoomMembershipResponse":{
+      "type":"structure",
+      "members":{
+        "Errors":{
+          "shape":"MemberErrorList",
+          "documentation":"<p>If the action fails for one or more of the member IDs in the request, a list of the member IDs is returned, along with error codes and error messages.</p>"
+        }
+      }
+    },
     "BatchDeletePhoneNumberRequest":{
       "type":"structure",
       "required":["PhoneNumberIds"],
@@ -1816,6 +2404,13 @@
       "type":"list",
       "member":{"shape":"CallingRegion"}
     },
+    "ClientRequestToken":{
+      "type":"string",
+      "max":64,
+      "min":2,
+      "pattern":"[-_a-zA-Z0-9]*",
+      "sensitive":true
+    },
     "ConflictException":{
       "type":"structure",
       "members":{
@@ -1849,6 +2444,67 @@
         }
       }
     },
+    "CreateAttendeeError":{
+      "type":"structure",
+      "members":{
+        "ExternalUserId":{
+          "shape":"ExternalUserIdType",
+          "documentation":"<p>The Amazon Chime SDK external user ID. Links the attendee to an identity managed by a builder application.</p>"
+        },
+        "ErrorCode":{
+          "shape":"String",
+          "documentation":"<p>The error code.</p>"
+        },
+        "ErrorMessage":{
+          "shape":"String",
+          "documentation":"<p>The error message.</p>"
+        }
+      },
+      "documentation":"<p>The list of errors returned when errors are encountered during the BatchCreateAttendee and CreateAttendee actions. This includes external user IDs, error codes, and error messages.</p>"
+    },
+    "CreateAttendeeRequest":{
+      "type":"structure",
+      "required":[
+        "MeetingId",
+        "ExternalUserId"
+      ],
+      "members":{
+        "MeetingId":{
+          "shape":"GuidString",
+          "documentation":"<p>The Amazon Chime SDK meeting ID.</p>",
+          "location":"uri",
+          "locationName":"meetingId"
+        },
+        "ExternalUserId":{
+          "shape":"ExternalUserIdType",
+          "documentation":"<p>The Amazon Chime SDK external user ID. Links the attendee to an identity managed by a builder application.</p>"
+        }
+      }
+    },
+    "CreateAttendeeRequestItem":{
+      "type":"structure",
+      "required":["ExternalUserId"],
+      "members":{
+        "ExternalUserId":{
+          "shape":"ExternalUserIdType",
+          "documentation":"<p>The Amazon Chime SDK external user ID. Links the attendee to an identity managed by a builder application.</p>"
+        }
+      },
+      "documentation":"<p>The Amazon Chime SDK attendee fields to create, used with the BatchCreateAttendee action.</p>"
+    },
+    "CreateAttendeeRequestItemList":{
+      "type":"list",
+      "member":{"shape":"CreateAttendeeRequestItem"}
+    },
+    "CreateAttendeeResponse":{
+      "type":"structure",
+      "members":{
+        "Attendee":{
+          "shape":"Attendee",
+          "documentation":"<p>The attendee information, including attendee ID and join token.</p>"
+        }
+      }
+    },
     "CreateBotRequest":{
       "type":"structure",
       "required":[
@@ -1881,6 +2537,38 @@
         }
       }
     },
+    "CreateMeetingRequest":{
+      "type":"structure",
+      "required":["ClientRequestToken"],
+      "members":{
+        "ClientRequestToken":{
+          "shape":"ClientRequestToken",
+          "documentation":"<p>The unique identifier for the client request. Use a different token for different meetings.</p>",
+          "idempotencyToken":true
+        },
+        "MeetingHostId":{
+          "shape":"ExternalUserIdType",
+          "documentation":"<p>Reserved.</p>"
+        },
+        "MediaRegion":{
+          "shape":"String",
+          "documentation":"<p>The Region in which to create the meeting. Available values: <code>ap-northeast-1</code>, <code>ap-southeast-1</code>, <code>ap-southeast-2</code>, <code>ca-central-1</code>, <code>eu-central-1</code>, <code>eu-north-1</code>, <code>eu-west-1</code>, <code>eu-west-2</code>, <code>eu-west-3</code>, <code>sa-east-1</code>, <code>us-east-1</code>, <code>us-east-2</code>, <code>us-west-1</code>, <code>us-west-2</code>.</p>"
+        },
+        "NotificationsConfiguration":{
+          "shape":"MeetingNotificationConfiguration",
+          "documentation":"<p>The configuration for resource targets to receive notifications when meeting and attendee events occur.</p>"
+        }
+      }
+    },
+    "CreateMeetingResponse":{
+      "type":"structure",
+      "members":{
+        "Meeting":{
+          "shape":"Meeting",
+          "documentation":"<p>The meeting information, including the meeting ID and <code>MediaPlacement</code>.</p>"
+        }
+      }
+    },
     "CreatePhoneNumberOrderRequest":{
       "type":"structure",
       "required":[
@@ -1907,43 +2595,145 @@
         }
       }
     },
-    "CreateVoiceConnectorGroupRequest":{
+    "CreateRoomMembershipRequest":{
       "type":"structure",
-      "required":["Name"],
+      "required":[
+        "AccountId",
+        "RoomId",
+        "MemberId"
+      ],
       "members":{
-        "Name":{
-          "shape":"VoiceConnectorGroupName",
-          "documentation":"<p>The name of the Amazon Chime Voice Connector group.</p>"
+        "AccountId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The Amazon Chime account ID.</p>",
+          "location":"uri",
+          "locationName":"accountId"
         },
-        "VoiceConnectorItems":{
-          "shape":"VoiceConnectorItemList",
-          "documentation":"<p>The Amazon Chime Voice Connectors to route inbound calls to.</p>"
+        "RoomId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The room ID.</p>",
+          "location":"uri",
+          "locationName":"roomId"
+        },
+        "MemberId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The Amazon Chime member ID (user ID or bot ID).</p>"
+        },
+        "Role":{
+          "shape":"RoomMembershipRole",
+          "documentation":"<p>The role of the member.</p>"
         }
       }
     },
-    "CreateVoiceConnectorGroupResponse":{
+    "CreateRoomMembershipResponse":{
       "type":"structure",
       "members":{
-        "VoiceConnectorGroup":{
-          "shape":"VoiceConnectorGroup",
-          "documentation":"<p>The Amazon Chime Voice Connector group details.</p>"
+        "RoomMembership":{
+          "shape":"RoomMembership",
+          "documentation":"<p>The room membership details.</p>"
         }
       }
     },
-    "CreateVoiceConnectorRequest":{
+    "CreateRoomRequest":{
       "type":"structure",
       "required":[
-        "Name",
-        "RequireEncryption"
+        "AccountId",
+        "Name"
       ],
       "members":{
-        "Name":{
-          "shape":"VoiceConnectorName",
-          "documentation":"<p>The name of the Amazon Chime Voice Connector.</p>"
+        "AccountId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The Amazon Chime account ID.</p>",
+          "location":"uri",
+          "locationName":"accountId"
         },
-        "AwsRegion":{
-          "shape":"VoiceConnectorAwsRegion",
-          "documentation":"<p>The AWS Region in which the Amazon Chime Voice Connector is created. Default value: <code>us-east-1</code>.</p>"
+        "Name":{
+          "shape":"SensitiveString",
+          "documentation":"<p>The room name.</p>"
+        },
+        "ClientRequestToken":{
+          "shape":"ClientRequestToken",
+          "documentation":"<p>The idempotency token for the request.</p>",
+          "idempotencyToken":true
+        }
+      }
+    },
+    "CreateRoomResponse":{
+      "type":"structure",
+      "members":{
+        "Room":{
+          "shape":"Room",
+          "documentation":"<p>The room details.</p>"
+        }
+      }
+    },
+    "CreateUserRequest":{
+      "type":"structure",
+      "required":["AccountId"],
+      "members":{
+        "AccountId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The Amazon Chime account ID.</p>",
+          "location":"uri",
+          "locationName":"accountId"
+        },
+        "Username":{
+          "shape":"String",
+          "documentation":"<p>The user name.</p>"
+        },
+        "Email":{
+          "shape":"EmailAddress",
+          "documentation":"<p>The user's email address.</p>"
+        },
+        "UserType":{
+          "shape":"UserType",
+          "documentation":"<p>The user type.</p>"
+        }
+      }
+    },
+    "CreateUserResponse":{
+      "type":"structure",
+      "members":{
+        "User":{"shape":"User"}
+      }
+    },
+    "CreateVoiceConnectorGroupRequest":{
+      "type":"structure",
+      "required":["Name"],
+      "members":{
+        "Name":{
+          "shape":"VoiceConnectorGroupName",
+          "documentation":"<p>The name of the Amazon Chime Voice Connector group.</p>"
+        },
+        "VoiceConnectorItems":{
+          "shape":"VoiceConnectorItemList",
+          "documentation":"<p>The Amazon Chime Voice Connectors to route inbound calls to.</p>"
+        }
+      }
+    },
+    "CreateVoiceConnectorGroupResponse":{
+      "type":"structure",
+      "members":{
+        "VoiceConnectorGroup":{
+          "shape":"VoiceConnectorGroup",
+          "documentation":"<p>The Amazon Chime Voice Connector group details.</p>"
+        }
+      }
+    },
+    "CreateVoiceConnectorRequest":{
+      "type":"structure",
+      "required":[
+        "Name",
+        "RequireEncryption"
+      ],
+      "members":{
+        "Name":{
+          "shape":"VoiceConnectorName",
+          "documentation":"<p>The name of the Amazon Chime Voice Connector.</p>"
+        },
+        "AwsRegion":{
+          "shape":"VoiceConnectorAwsRegion",
+          "documentation":"<p>The AWS Region in which the Amazon Chime Voice Connector is created. Default value: <code>us-east-1</code>.</p>"
         },
         "RequireEncryption":{
           "shape":"Boolean",
@@ -1999,6 +2789,27 @@
       "members":{
       }
     },
+    "DeleteAttendeeRequest":{
+      "type":"structure",
+      "required":[
+        "MeetingId",
+        "AttendeeId"
+      ],
+      "members":{
+        "MeetingId":{
+          "shape":"GuidString",
+          "documentation":"<p>The Amazon Chime SDK meeting ID.</p>",
+          "location":"uri",
+          "locationName":"meetingId"
+        },
+        "AttendeeId":{
+          "shape":"GuidString",
+          "documentation":"<p>The Amazon Chime SDK attendee ID.</p>",
+          "location":"uri",
+          "locationName":"attendeeId"
+        }
+      }
+    },
     "DeleteEventsConfigurationRequest":{
       "type":"structure",
       "required":[
@@ -2020,6 +2831,18 @@
         }
       }
     },
+    "DeleteMeetingRequest":{
+      "type":"structure",
+      "required":["MeetingId"],
+      "members":{
+        "MeetingId":{
+          "shape":"GuidString",
+          "documentation":"<p>The Amazon Chime SDK meeting ID.</p>",
+          "location":"uri",
+          "locationName":"meetingId"
+        }
+      }
+    },
     "DeletePhoneNumberRequest":{
       "type":"structure",
       "required":["PhoneNumberId"],
@@ -2032,6 +2855,55 @@
         }
       }
     },
+    "DeleteRoomMembershipRequest":{
+      "type":"structure",
+      "required":[
+        "AccountId",
+        "RoomId",
+        "MemberId"
+      ],
+      "members":{
+        "AccountId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The Amazon Chime account ID.</p>",
+          "location":"uri",
+          "locationName":"accountId"
+        },
+        "RoomId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The room ID.</p>",
+          "location":"uri",
+          "locationName":"roomId"
+        },
+        "MemberId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The member ID (user ID or bot ID).</p>",
+          "location":"uri",
+          "locationName":"memberId"
+        }
+      }
+    },
+    "DeleteRoomRequest":{
+      "type":"structure",
+      "required":[
+        "AccountId",
+        "RoomId"
+      ],
+      "members":{
+        "AccountId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The Amazon Chime account ID.</p>",
+          "location":"uri",
+          "locationName":"accountId"
+        },
+        "RoomId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The chat room ID.</p>",
+          "location":"uri",
+          "locationName":"roomId"
+        }
+      }
+    },
     "DeleteVoiceConnectorGroupRequest":{
       "type":"structure",
       "required":["VoiceConnectorGroupId"],
@@ -2184,6 +3056,30 @@
         }
       }
     },
+    "DisassociateSigninDelegateGroupsFromAccountRequest":{
+      "type":"structure",
+      "required":[
+        "AccountId",
+        "GroupNames"
+      ],
+      "members":{
+        "AccountId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The Amazon Chime account ID.</p>",
+          "location":"uri",
+          "locationName":"accountId"
+        },
+        "GroupNames":{
+          "shape":"NonEmptyStringList",
+          "documentation":"<p>The sign-in delegate group names.</p>"
+        }
+      }
+    },
+    "DisassociateSigninDelegateGroupsFromAccountResponse":{
+      "type":"structure",
+      "members":{
+      }
+    },
     "E164PhoneNumber":{
       "type":"string",
       "pattern":"^\\+?[1-9]\\d{1,14}$",
@@ -2243,6 +3139,12 @@
       },
       "documentation":"<p>The configuration that allows a bot to receive outgoing events. Can be either an HTTPS endpoint or a Lambda function ARN.</p>"
     },
+    "ExternalUserIdType":{
+      "type":"string",
+      "max":64,
+      "min":2,
+      "sensitive":true
+    },
     "ForbiddenException":{
       "type":"structure",
       "members":{
@@ -2295,6 +3197,36 @@
         }
       }
     },
+    "GetAttendeeRequest":{
+      "type":"structure",
+      "required":[
+        "MeetingId",
+        "AttendeeId"
+      ],
+      "members":{
+        "MeetingId":{
+          "shape":"GuidString",
+          "documentation":"<p>The Amazon Chime SDK meeting ID.</p>",
+          "location":"uri",
+          "locationName":"meetingId"
+        },
+        "AttendeeId":{
+          "shape":"GuidString",
+          "documentation":"<p>The Amazon Chime SDK attendee ID.</p>",
+          "location":"uri",
+          "locationName":"attendeeId"
+        }
+      }
+    },
+    "GetAttendeeResponse":{
+      "type":"structure",
+      "members":{
+        "Attendee":{
+          "shape":"Attendee",
+          "documentation":"<p>The Amazon Chime SDK attendee information.</p>"
+        }
+      }
+    },
     "GetBotRequest":{
       "type":"structure",
       "required":[
@@ -2368,6 +3300,27 @@
         }
       }
     },
+    "GetMeetingRequest":{
+      "type":"structure",
+      "required":["MeetingId"],
+      "members":{
+        "MeetingId":{
+          "shape":"GuidString",
+          "documentation":"<p>The Amazon Chime SDK meeting ID.</p>",
+          "location":"uri",
+          "locationName":"meetingId"
+        }
+      }
+    },
+    "GetMeetingResponse":{
+      "type":"structure",
+      "members":{
+        "Meeting":{
+          "shape":"Meeting",
+          "documentation":"<p>The Amazon Chime SDK meeting information.</p>"
+        }
+      }
+    },
     "GetPhoneNumberOrderRequest":{
       "type":"structure",
       "required":["PhoneNumberOrderId"],
@@ -2423,6 +3376,36 @@
         }
       }
     },
+    "GetRoomRequest":{
+      "type":"structure",
+      "required":[
+        "AccountId",
+        "RoomId"
+      ],
+      "members":{
+        "AccountId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The Amazon Chime account ID.</p>",
+          "location":"uri",
+          "locationName":"accountId"
+        },
+        "RoomId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The room ID.</p>",
+          "location":"uri",
+          "locationName":"roomId"
+        }
+      }
+    },
+    "GetRoomResponse":{
+      "type":"structure",
+      "members":{
+        "Room":{
+          "shape":"Room",
+          "documentation":"<p>The room details.</p>"
+        }
+      }
+    },
     "GetUserRequest":{
       "type":"structure",
       "required":[
@@ -2683,7 +3666,11 @@
         },
         "UserEmailList":{
           "shape":"UserEmailList",
-          "documentation":"<p>The user email addresses to which to send the invite.</p>"
+          "documentation":"<p>The user email addresses to which to send the email invitation.</p>"
+        },
+        "UserType":{
+          "shape":"UserType",
+          "documentation":"<p>The user type.</p>"
         }
       }
     },
@@ -2692,7 +3679,7 @@
       "members":{
         "Invites":{
           "shape":"InviteList",
-          "documentation":"<p>The invite details.</p>"
+          "documentation":"<p>The email invitation details.</p>"
         }
       }
     },
@@ -2700,6 +3687,12 @@
       "type":"timestamp",
       "timestampFormat":"iso8601"
     },
+    "JoinTokenString":{
+      "type":"string",
+      "max":2048,
+      "min":2,
+      "sensitive":true
+    },
     "License":{
       "type":"string",
       "enum":[
@@ -2755,6 +3748,43 @@
         }
       }
     },
+    "ListAttendeesRequest":{
+      "type":"structure",
+      "required":["MeetingId"],
+      "members":{
+        "MeetingId":{
+          "shape":"GuidString",
+          "documentation":"<p>The Amazon Chime SDK meeting ID.</p>",
+          "location":"uri",
+          "locationName":"meetingId"
+        },
+        "NextToken":{
+          "shape":"String",
+          "documentation":"<p>The token to use to retrieve the next page of results.</p>",
+          "location":"querystring",
+          "locationName":"next-token"
+        },
+        "MaxResults":{
+          "shape":"ResultMax",
+          "documentation":"<p>The maximum number of results to return in a single call.</p>",
+          "location":"querystring",
+          "locationName":"max-results"
+        }
+      }
+    },
+    "ListAttendeesResponse":{
+      "type":"structure",
+      "members":{
+        "Attendees":{
+          "shape":"AttendeeList",
+          "documentation":"<p>The Amazon Chime SDK attendee information.</p>"
+        },
+        "NextToken":{
+          "shape":"String",
+          "documentation":"<p>The token to use to retrieve the next page of results.</p>"
+        }
+      }
+    },
     "ListBotsRequest":{
       "type":"structure",
       "required":["AccountId"],
@@ -2767,7 +3797,121 @@
         },
         "MaxResults":{
           "shape":"ResultMax",
-          "documentation":"<p>The maximum number of results to return in a single call. Default is 10.</p>",
+          "documentation":"<p>The maximum number of results to return in a single call. The default is 10.</p>",
+          "location":"querystring",
+          "locationName":"max-results"
+        },
+        "NextToken":{
+          "shape":"String",
+          "documentation":"<p>The token to use to retrieve the next page of results.</p>",
+          "location":"querystring",
+          "locationName":"next-token"
+        }
+      }
+    },
+    "ListBotsResponse":{
+      "type":"structure",
+      "members":{
+        "Bots":{
+          "shape":"BotList",
+          "documentation":"<p>List of bots and bot details.</p>"
+        },
+        "NextToken":{
+          "shape":"String",
+          "documentation":"<p>The token to use to retrieve the next page of results.</p>"
+        }
+      }
+    },
+    "ListMeetingsRequest":{
+      "type":"structure",
+      "members":{
+        "NextToken":{
+          "shape":"String",
+          "documentation":"<p>The token to use to retrieve the next page of results.</p>",
+          "location":"querystring",
+          "locationName":"next-token"
+        },
+        "MaxResults":{
+          "shape":"ResultMax",
+          "documentation":"<p>The maximum number of results to return in a single call.</p>",
+          "location":"querystring",
+          "locationName":"max-results"
+        }
+      }
+    },
+    "ListMeetingsResponse":{
+      "type":"structure",
+      "members":{
+        "Meetings":{
+          "shape":"MeetingList",
+          "documentation":"<p>The Amazon Chime SDK meeting information.</p>"
+        },
+        "NextToken":{
+          "shape":"String",
+          "documentation":"<p>The token to use to retrieve the next page of results.</p>"
+        }
+      }
+    },
+    "ListPhoneNumberOrdersRequest":{
+      "type":"structure",
+      "members":{
+        "NextToken":{
+          "shape":"String",
+          "documentation":"<p>The token to use to retrieve the next page of results.</p>",
+          "location":"querystring",
+          "locationName":"next-token"
+        },
+        "MaxResults":{
+          "shape":"ResultMax",
+          "documentation":"<p>The maximum number of results to return in a single call.</p>",
+          "location":"querystring",
+          "locationName":"max-results"
+        }
+      }
+    },
+    "ListPhoneNumberOrdersResponse":{
+      "type":"structure",
+      "members":{
+        "PhoneNumberOrders":{
+          "shape":"PhoneNumberOrderList",
+          "documentation":"<p>The phone number order details.</p>"
+        },
+        "NextToken":{
+          "shape":"String",
+          "documentation":"<p>The token to use to retrieve the next page of results.</p>"
+        }
+      }
+    },
+    "ListPhoneNumbersRequest":{
+      "type":"structure",
+      "members":{
+        "Status":{
+          "shape":"PhoneNumberStatus",
+          "documentation":"<p>The phone number status.</p>",
+          "location":"querystring",
+          "locationName":"status"
+        },
+        "ProductType":{
+          "shape":"PhoneNumberProductType",
+          "documentation":"<p>The phone number product type.</p>",
+          "location":"querystring",
+          "locationName":"product-type"
+        },
+        "FilterName":{
+          "shape":"PhoneNumberAssociationName",
+          "documentation":"<p>The filter to use to limit the number of results.</p>",
+          "location":"querystring",
+          "locationName":"filter-name"
+        },
+        "FilterValue":{
+          "shape":"String",
+          "documentation":"<p>The value to use for the filter.</p>",
+          "location":"querystring",
+          "locationName":"filter-value"
+        },
+        "MaxResults":{
+          "shape":"ResultMax",
+          "documentation":"<p>The maximum number of results to return in a single call.</p>",
           "location":"querystring",
           "locationName":"max-results"
         },
@@ -2779,12 +3923,12 @@
         }
       }
     },
-    "ListBotsResponse":{
+    "ListPhoneNumbersResponse":{
       "type":"structure",
       "members":{
-        "Bots":{
-          "shape":"BotList",
-          "documentation":"<p>List of bots and bot details.</p>"
+        "PhoneNumbers":{
+          "shape":"PhoneNumberList",
+          "documentation":"<p>The phone number details.</p>"
         },
         "NextToken":{
           "shape":"String",
@@ -2792,29 +3936,45 @@
         }
       }
     },
-    "ListPhoneNumberOrdersRequest":{
+    "ListRoomMembershipsRequest":{
       "type":"structure",
+      "required":[
+        "AccountId",
+        "RoomId"
+      ],
       "members":{
-        "NextToken":{
-          "shape":"String",
-          "documentation":"<p>The token to use to retrieve the next page of results.</p>",
-          "location":"querystring",
-          "locationName":"next-token"
+        "AccountId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The Amazon Chime account ID.</p>",
+          "location":"uri",
+          "locationName":"accountId"
+        },
+        "RoomId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The room ID.</p>",
+          "location":"uri",
+          "locationName":"roomId"
         },
         "MaxResults":{
           "shape":"ResultMax",
           "documentation":"<p>The maximum number of results to return in a single call.</p>",
           "location":"querystring",
           "locationName":"max-results"
+        },
+        "NextToken":{
+          "shape":"String",
+          "documentation":"<p>The token to use to retrieve the next page of results.</p>",
+          "location":"querystring",
+          "locationName":"next-token"
         }
       }
     },
-    "ListPhoneNumberOrdersResponse":{
+    "ListRoomMembershipsResponse":{
       "type":"structure",
       "members":{
-        "PhoneNumberOrders":{
-          "shape":"PhoneNumberOrderList",
-          "documentation":"<p>The phone number order details.</p>"
+        "RoomMemberships":{
+          "shape":"RoomMembershipList",
+          "documentation":"<p>The room membership details.</p>"
         },
         "NextToken":{
           "shape":"String",
@@ -2822,32 +3982,21 @@
         }
       }
     },
-    "ListPhoneNumbersRequest":{
+    "ListRoomsRequest":{
       "type":"structure",
+      "required":["AccountId"],
       "members":{
-        "Status":{
-          "shape":"PhoneNumberStatus",
-          "documentation":"<p>The phone number status.</p>",
-          "location":"querystring",
-          "locationName":"status"
-        },
-        "ProductType":{
-          "shape":"PhoneNumberProductType",
-          "documentation":"<p>The phone number product type.</p>",
-          "location":"querystring",
-          "locationName":"product-type"
-        },
-        "FilterName":{
-          "shape":"PhoneNumberAssociationName",
-          "documentation":"<p>The filter to use to limit the number of results.</p>",
-          "location":"querystring",
-          "locationName":"filter-name"
+        "AccountId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The Amazon Chime account ID.</p>",
+          "location":"uri",
+          "locationName":"accountId"
         },
-        "FilterValue":{
+        "MemberId":{
           "shape":"String",
-          "documentation":"<p>The value to use for the filter.</p>",
+          "documentation":"<p>The member ID (user ID or bot ID).</p>",
           "location":"querystring",
-          "locationName":"filter-value"
+          "locationName":"member-id"
         },
         "MaxResults":{
           "shape":"ResultMax",
@@ -2863,12 +4012,12 @@
         }
       }
     },
-    "ListPhoneNumbersResponse":{
+    "ListRoomsResponse":{
       "type":"structure",
       "members":{
-        "PhoneNumbers":{
-          "shape":"PhoneNumberList",
-          "documentation":"<p>The phone number details.</p>"
+        "Rooms":{
+          "shape":"RoomList",
+          "documentation":"<p>The room details.</p>"
         },
         "NextToken":{
           "shape":"String",
@@ -2892,6 +4041,12 @@
           "location":"querystring",
           "locationName":"user-email"
         },
+        "UserType":{
+          "shape":"UserType",
+          "documentation":"<p>The user type.</p>",
+          "location":"querystring",
+          "locationName":"user-type"
+        },
         "MaxResults":{
           "shape":"ProfileServiceMaxResults",
           "documentation":"<p>The maximum number of results to return in a single call. Defaults to 100.</p>",
@@ -3036,6 +4191,151 @@
       "members":{
       }
     },
+    "MediaPlacement":{
+      "type":"structure",
+      "members":{
+        "AudioHostUrl":{
+          "shape":"UriType",
+          "documentation":"<p>The audio host URL.</p>"
+        },
+        "AudioFallbackUrl":{
+          "shape":"UriType",
+          "documentation":"<p>The audio fallback URL.</p>"
+        },
+        "ScreenDataUrl":{
+          "shape":"UriType",
+          "documentation":"<p>The screen data URL.</p>"
+        },
+        "ScreenSharingUrl":{
+          "shape":"UriType",
+          "documentation":"<p>The screen sharing URL.</p>"
+        },
+        "ScreenViewingUrl":{
+          "shape":"UriType",
+          "documentation":"<p>The screen viewing URL.</p>"
+        },
+        "SignalingUrl":{
+          "shape":"UriType",
+          "documentation":"<p>The signaling URL.</p>"
+        },
+        "TurnControlUrl":{
+          "shape":"UriType",
+          "documentation":"<p>The turn control URL.</p>"
+        }
+      },
+      "documentation":"<p>A set of endpoints used by clients to connect to the media service group for a Amazon Chime SDK meeting.</p>"
+    },
+    "Meeting":{
+      "type":"structure",
+      "members":{
+        "MeetingId":{
+          "shape":"GuidString",
+          "documentation":"<p>The Amazon Chime SDK meeting ID.</p>"
+        },
+        "MediaPlacement":{
+          "shape":"MediaPlacement",
+          "documentation":"<p>The media placement for the meeting.</p>"
+        },
+        "MediaRegion":{
+          "shape":"String",
+          "documentation":"<p>The Region in which to create the meeting. Available values: <code>ap-northeast-1</code>, <code>ap-southeast-1</code>, <code>ap-southeast-2</code>, <code>ca-central-1</code>, <code>eu-central-1</code>, <code>eu-north-1</code>, <code>eu-west-1</code>, <code>eu-west-2</code>, <code>eu-west-3</code>, <code>sa-east-1</code>, <code>us-east-1</code>, <code>us-east-2</code>, <code>us-west-1</code>, <code>us-west-2</code>.</p>"
+        }
+      },
+      "documentation":"<p>A meeting created using the Amazon Chime SDK.</p>"
+    },
+    "MeetingList":{
+      "type":"list",
+      "member":{"shape":"Meeting"}
+    },
+    "MeetingNotificationConfiguration":{
+      "type":"structure",
+      "members":{
+        "SnsTopicArn":{
+          "shape":"Arn",
+          "documentation":"<p>The SNS topic ARN.</p>"
+        },
+        "SqsQueueArn":{
+          "shape":"Arn",
+          "documentation":"<p>The SQS queue ARN.</p>"
+        }
+      },
+      "documentation":"<p>The configuration for resource targets to receive notifications when Amazon Chime SDK meeting and attendee events occur.</p>"
+    },
+    "Member":{
+      "type":"structure",
+      "members":{
+        "MemberId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The member ID (user ID or bot ID).</p>"
+        },
+        "MemberType":{
+          "shape":"MemberType",
+          "documentation":"<p>The member type.</p>"
+        },
+        "Email":{
+          "shape":"SensitiveString",
+          "documentation":"<p>The member email address.</p>"
+        },
+        "FullName":{
+          "shape":"SensitiveString",
+          "documentation":"<p>The member name.</p>"
+        },
+        "AccountId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The Amazon Chime account ID.</p>"
+        }
+      },
+      "documentation":"<p>The member details, such as email address, name, member ID, and member type.</p>"
+    },
+    "MemberError":{
+      "type":"structure",
+      "members":{
+        "MemberId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The member ID.</p>"
+        },
+        "ErrorCode":{
+          "shape":"ErrorCode",
+          "documentation":"<p>The error code.</p>"
+        },
+        "ErrorMessage":{
+          "shape":"String",
+          "documentation":"<p>The error message.</p>"
+        }
+      },
+      "documentation":"<p>The list of errors returned when a member action results in an error.</p>"
+    },
+    "MemberErrorList":{
+      "type":"list",
+      "member":{"shape":"MemberError"}
+    },
+    "MemberType":{
+      "type":"string",
+      "enum":[
+        "User",
+        "Bot",
+        "Webhook"
+      ]
+    },
+    "MembershipItem":{
+      "type":"structure",
+      "members":{
+        "MemberId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The member ID.</p>"
+        },
+        "Role":{
+          "shape":"RoomMembershipRole",
+          "documentation":"<p>The member role.</p>"
+        }
+      },
+      "documentation":"<p>Membership details, such as member ID and member role.</p>"
+    },
+    "MembershipItemList":{
+      "type":"list",
+      "member":{"shape":"MembershipItem"},
+      "max":50
+    },
     "NonEmptyString":{
       "type":"string",
       "pattern":".*\\S.*"
@@ -3633,6 +4933,74 @@
       "max":99,
       "min":1
     },
+    "Room":{
+      "type":"structure",
+      "members":{
+        "RoomId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The room ID.</p>"
+        },
+        "Name":{
+          "shape":"SensitiveString",
+          "documentation":"<p>The room name.</p>"
+        },
+        "AccountId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The Amazon Chime account ID.</p>"
+        },
+        "CreatedBy":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The identifier of the room creator.</p>"
+        },
+        "CreatedTimestamp":{
+          "shape":"Iso8601Timestamp",
+          "documentation":"<p>The room creation timestamp, in ISO 8601 format.</p>"
+        },
+        "UpdatedTimestamp":{
+          "shape":"Iso8601Timestamp",
+          "documentation":"<p>The room update timestamp, in ISO 8601 format.</p>"
+        }
+      },
+      "documentation":"<p>The Amazon Chime chat room details.</p>"
+    },
+    "RoomList":{
+      "type":"list",
+      "member":{"shape":"Room"}
+    },
+    "RoomMembership":{
+      "type":"structure",
+      "members":{
+        "RoomId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The room ID.</p>"
+        },
+        "Member":{"shape":"Member"},
+        "Role":{
+          "shape":"RoomMembershipRole",
+          "documentation":"<p>The membership role.</p>"
+        },
+        "InvitedBy":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The identifier of the user that invited the room member.</p>"
+        },
+        "UpdatedTimestamp":{
+          "shape":"Iso8601Timestamp",
+          "documentation":"<p>The room membership update timestamp, in ISO 8601 format.</p>"
+        }
+      },
+      "documentation":"<p>The room membership details.</p>"
+    },
+    "RoomMembershipList":{
+      "type":"list",
+      "member":{"shape":"RoomMembership"}
+    },
+    "RoomMembershipRole":{
+      "type":"string",
+      "enum":[
+        "Administrator",
+        "Member"
+      ]
+    },
     "SearchAvailablePhoneNumbersRequest":{
       "type":"structure",
       "members":{
@@ -3719,13 +5087,27 @@
       "exception":true,
       "fault":true
     },
+    "SigninDelegateGroup":{
+      "type":"structure",
+      "members":{
+        "GroupName":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The group name.</p>"
+        }
+      },
+      "documentation":"<p>An Active Directory (AD) group whose members are granted permission to act as delegates.</p>"
+    },
+    "SigninDelegateGroupList":{
+      "type":"list",
+      "member":{"shape":"SigninDelegateGroup"}
+    },
     "StreamingConfiguration":{
       "type":"structure",
       "required":["DataRetentionInHours"],
       "members":{
         "DataRetentionInHours":{
           "shape":"DataRetentionInHours",
-          "documentation":"<p>The retention period for the Amazon Kinesis data, in hours.</p>"
+          "documentation":"<p>The retention period, in hours, for the Amazon Kinesis data.</p>"
         },
         "Disabled":{
           "shape":"Boolean",
@@ -3767,7 +5149,7 @@
       "members":{
         "CpsLimit":{
           "shape":"CpsLimit",
-          "documentation":"<p>The limit on calls per second. Max value based on account service limit. Default value of 1.</p>"
+          "documentation":"<p>The limit on calls per second. Max value based on account service quota. Default value of 1.</p>"
         },
         "DefaultPhoneNumber":{
           "shape":"E164PhoneNumber",
@@ -4000,6 +5382,81 @@
         }
       }
     },
+    "UpdateRoomMembershipRequest":{
+      "type":"structure",
+      "required":[
+        "AccountId",
+        "RoomId",
+        "MemberId"
+      ],
+      "members":{
+        "AccountId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The Amazon Chime account ID.</p>",
+          "location":"uri",
+          "locationName":"accountId"
+        },
+        "RoomId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The room ID.</p>",
+          "location":"uri",
+          "locationName":"roomId"
+        },
+        "MemberId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The member ID.</p>",
+          "location":"uri",
+          "locationName":"memberId"
+        },
+        "Role":{
+          "shape":"RoomMembershipRole",
+          "documentation":"<p>The role of the member.</p>"
+        }
+      }
+    },
+    "UpdateRoomMembershipResponse":{
+      "type":"structure",
+      "members":{
+        "RoomMembership":{
+          "shape":"RoomMembership",
+          "documentation":"<p>The room membership details.</p>"
+        }
+      }
+    },
+    "UpdateRoomRequest":{
+      "type":"structure",
+      "required":[
+        "AccountId",
+        "RoomId"
+      ],
+      "members":{
+        "AccountId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The Amazon Chime account ID.</p>",
+          "location":"uri",
+          "locationName":"accountId"
+        },
+        "RoomId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The room ID.</p>",
+          "location":"uri",
+          "locationName":"roomId"
+        },
+        "Name":{
+          "shape":"SensitiveString",
+          "documentation":"<p>The room name.</p>"
+        }
+      }
+    },
+    "UpdateRoomResponse":{
+      "type":"structure",
+      "members":{
+        "Room":{
+          "shape":"Room",
+          "documentation":"<p>The room details.</p>"
+        }
+      }
+    },
     "UpdateUserRequest":{
       "type":"structure",
       "required":[
@@ -4022,6 +5479,14 @@
         "LicenseType":{
           "shape":"License",
           "documentation":"<p>The user license type to update. This must be a supported license type for the Amazon Chime account that the user belongs to.</p>"
+        },
+        "UserType":{
+          "shape":"UserType",
+          "documentation":"<p>The user type.</p>"
+        },
+        "AlexaForBusinessMetadata":{
+          "shape":"AlexaForBusinessMetadata",
+          "documentation":"<p>The Alexa for Business metadata.</p>"
         }
       }
     },
@@ -4036,6 +5501,14 @@
         "LicenseType":{
           "shape":"License",
           "documentation":"<p>The user license type.</p>"
+        },
+        "UserType":{
+          "shape":"UserType",
+          "documentation":"<p>The user type.</p>"
+        },
+        "AlexaForBusinessMetadata":{
+          "shape":"AlexaForBusinessMetadata",
+          "documentation":"<p>The Alexa for Business metadata.</p>"
         }
       },
       "documentation":"<p>The user ID and user fields to update, used with the <a>BatchUpdateUser</a> action.</p>"
@@ -4146,6 +5619,10 @@
         }
       }
     },
+    "UriType":{
+      "type":"string",
+      "max":4096
+    },
     "User":{
       "type":"structure",
       "required":["UserId"],
@@ -4174,6 +5651,10 @@
           "shape":"License",
           "documentation":"<p>The license type for the user.</p>"
         },
+        "UserType":{
+          "shape":"UserType",
+          "documentation":"<p>The user type.</p>"
+        },
         "UserRegistrationStatus":{
           "shape":"RegistrationStatus",
           "documentation":"<p>The user registration status.</p>"
@@ -4190,6 +5671,10 @@
           "shape":"Iso8601Timestamp",
           "documentation":"<p>Date and time when the user is invited to the Amazon Chime account, in ISO 8601 format.</p>"
         },
+        "AlexaForBusinessMetadata":{
+          "shape":"AlexaForBusinessMetadata",
+          "documentation":"<p>The Alexa for Business metadata.</p>"
+        },
         "PersonalPIN":{
           "shape":"String",
           "documentation":"<p>The user's personal meeting PIN.</p>"
@@ -4244,6 +5729,13 @@
       },
       "documentation":"<p>Settings associated with an Amazon Chime user, including inbound and outbound calling and text messaging.</p>"
     },
+    "UserType":{
+      "type":"string",
+      "enum":[
+        "PrivateUser",
+        "SharedDevice"
+      ]
+    },
     "VoiceConnector":{
       "type":"structure",
       "members":{
@@ -4368,5 +5860,5 @@
       "documentation":"<p>The Amazon Chime Voice Connector settings. Includes any Amazon S3 buckets designated for storing call detail records.</p>"
     }
   },
-  "documentation":"<p>The Amazon Chime API (application programming interface) is designed for administrators to use to perform key tasks, such as creating and managing Amazon Chime accounts and users. This guide provides detailed information about the Amazon Chime API, including operations, types, inputs and outputs, and error codes.</p> <p>You can use an AWS SDK, the AWS Command Line Interface (AWS CLI), or the REST API to make API calls. We recommend using an AWS SDK or the AWS CLI. Each API operation includes links to information about using it with a language-specific AWS SDK or the AWS CLI.</p> <dl> <dt>Using an AWS SDK</dt> <dd> <p>You don't need to write code to calculate a signature for request authentication. The SDK clients authenticate your requests by using access keys that you provide. For more information about AWS SDKs, see the <a href=\"http://aws.amazon.com/developer/\">AWS Developer Center</a>.</p> </dd> <dt>Using the AWS CLI</dt> <dd> <p>Use your access keys with the AWS CLI to make API calls. For information about setting up the AWS CLI, see <a href=\"https://docs.aws.amazon.com/cli/latest/userguide/installing.html\">Installing the AWS Command Line Interface</a> in the <i>AWS Command Line Interface User Guide</i>. For a list of available Amazon Chime commands, see the <a href=\"https://docs.aws.amazon.com/cli/latest/reference/chime/index.html\">Amazon Chime commands</a> in the <i>AWS CLI Command Reference</i>.</p> </dd> <dt>Using REST API</dt> <dd> <p>If you use REST to make API calls, you must authenticate your request by providing a signature. Amazon Chime supports signature version 4. For more information, see <a href=\"https://docs.aws.amazon.com/general/latest/gr/signature-version-4.html\">Signature Version 4 Signing Process</a> in the <i>Amazon Web Services General Reference</i>.</p> <p>When making REST API calls, use the service name <code>chime</code> and REST endpoint <code>https://service.chime.aws.amazon.com</code>.</p> </dd> </dl> <p>Administrative permissions are controlled using AWS Identity and Access Management (IAM). For more information, see <a href=\"https://docs.aws.amazon.com/chime/latest/ag/control-access.html\">Control Access to the Amazon Chime Console</a> in the <i>Amazon Chime Administration Guide</i>.</p>"
+  "documentation":"<p>The Amazon Chime API (application programming interface) is designed for developers to perform key tasks, such as creating and managing Amazon Chime accounts, users, and Voice Connectors. This guide provides detailed information about the Amazon Chime API, including operations, types, inputs and outputs, and error codes. It also includes some server-side API actions to use with the Amazon Chime SDK. For more information about the Amazon Chime SDK, see <a href=\"https://docs.aws.amazon.com/chime/latest/dg/meetings-sdk.html\">Using the Amazon Chime SDK</a> in the <i>Amazon Chime Developer Guide</i>.</p> <p>You can use an AWS SDK, the AWS Command Line Interface (AWS CLI), or the REST API to make API calls. We recommend using an AWS SDK or the AWS CLI. Each API operation includes links to information about using it with a language-specific AWS SDK or the AWS CLI.</p> <dl> <dt>Using an AWS SDK</dt> <dd> <p>You don't need to write code to calculate a signature for request authentication. The SDK clients authenticate your requests by using access keys that you provide. For more information about AWS SDKs, see the <a href=\"http://aws.amazon.com/developer/\">AWS Developer Center</a>.</p> </dd> <dt>Using the AWS CLI</dt> <dd> <p>Use your access keys with the AWS CLI to make API calls. For information about setting up the AWS CLI, see <a href=\"https://docs.aws.amazon.com/cli/latest/userguide/installing.html\">Installing the AWS Command Line Interface</a> in the <i>AWS Command Line Interface User Guide</i>. For a list of available Amazon Chime commands, see the <a href=\"https://docs.aws.amazon.com/cli/latest/reference/chime/index.html\">Amazon Chime commands</a> in the <i>AWS CLI Command Reference</i>.</p> </dd> <dt>Using REST API</dt> <dd> <p>If you use REST to make API calls, you must authenticate your request by providing a signature. Amazon Chime supports signature version 4. For more information, see <a href=\"https://docs.aws.amazon.com/general/latest/gr/signature-version-4.html\">Signature Version 4 Signing Process</a> in the <i>Amazon Web Services General Reference</i>.</p> <p>When making REST API calls, use the service name <code>chime</code> and REST endpoint <code>https://service.chime.aws.amazon.com</code>.</p> </dd> </dl> <p>Administrative permissions are controlled using AWS Identity and Access Management (IAM). For more information, see <a href=\"https://docs.aws.amazon.com/chime/latest/ag/security-iam.html\">Identity and Access Management for Amazon Chime</a> in the <i>Amazon Chime Administration Guide</i>.</p>"
 }
diff --git a/services/cloud9/pom.xml b/services/cloud9/pom.xml
index a938faff22b5..027d8bbe996c 100644
--- a/services/cloud9/pom.xml
+++ b/services/cloud9/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>services</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>cloud9</artifactId>
diff --git a/services/cloud9/src/main/resources/codegen-resources/service-2.json b/services/cloud9/src/main/resources/codegen-resources/service-2.json
index 98d7035f8157..023cf7d82bd9 100644
--- a/services/cloud9/src/main/resources/codegen-resources/service-2.json
+++ b/services/cloud9/src/main/resources/codegen-resources/service-2.json
@@ -168,6 +168,51 @@
       ],
       "documentation":"<p>Gets a list of AWS Cloud9 development environment identifiers.</p>"
     },
+    "ListTagsForResource":{
+      "name":"ListTagsForResource",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"ListTagsForResourceRequest"},
+      "output":{"shape":"ListTagsForResourceResponse"},
+      "errors":[
+        {"shape":"NotFoundException"},
+        {"shape":"InternalServerErrorException"},
+        {"shape":"BadRequestException"}
+      ],
+      "documentation":"<p>Gets a list of the tags associated with an AWS Cloud9 development environment.</p>"
+    },
+    "TagResource":{
+      "name":"TagResource",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"TagResourceRequest"},
+      "output":{"shape":"TagResourceResponse"},
+      "errors":[
+        {"shape":"NotFoundException"},
+        {"shape":"InternalServerErrorException"},
+        {"shape":"BadRequestException"}
+      ],
+      "documentation":"<p>Adds tags to an AWS Cloud9 development environment.</p> <important> <p>Tags that you add to an AWS Cloud9 environment by using this method will NOT be automatically propagated to underlying resources.</p> </important>"
+    },
+    "UntagResource":{
+      "name":"UntagResource",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"UntagResourceRequest"},
+      "output":{"shape":"UntagResourceResponse"},
+      "errors":[
+        {"shape":"NotFoundException"},
+        {"shape":"InternalServerErrorException"},
+        {"shape":"BadRequestException"}
+      ],
+      "documentation":"<p>Removes tags from an AWS Cloud9 development environment.</p>"
+    },
     "UpdateEnvironment":{
       "name":"UpdateEnvironment",
       "http":{
@@ -273,6 +318,10 @@
         "ownerArn":{
           "shape":"UserArn",
           "documentation":"<p>The Amazon Resource Name (ARN) of the environment owner. This ARN can be the ARN of any AWS IAM principal. If this value is not specified, the ARN defaults to this environment's creator.</p>"
+        },
+        "tags":{
+          "shape":"TagList",
+          "documentation":"<p>An array of key-value pairs that will be associated with the new AWS Cloud9 development environment.</p>"
         }
       }
     },
@@ -467,6 +516,10 @@
       },
       "documentation":"<p>Information about an AWS Cloud9 development environment.</p>"
     },
+    "EnvironmentArn":{
+      "type":"string",
+      "pattern":"arn:aws:cloud9:([a-z]{2}-[a-z]+-\\d{1}):[0-9]{12}:environment:[a-zA-Z0-9]{8,32}"
+    },
     "EnvironmentDescription":{
       "type":"string",
       "max":200,
@@ -620,6 +673,25 @@
         }
       }
     },
+    "ListTagsForResourceRequest":{
+      "type":"structure",
+      "required":["ResourceARN"],
+      "members":{
+        "ResourceARN":{
+          "shape":"EnvironmentArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the AWS Cloud9 development environment to get the tags for.</p>"
+        }
+      }
+    },
+    "ListTagsForResourceResponse":{
+      "type":"structure",
+      "members":{
+        "Tags":{
+          "shape":"TagList",
+          "documentation":"<p>The list of tags associated with the AWS Cloud9 development environment.</p>"
+        }
+      }
+    },
     "MaxResults":{
       "type":"integer",
       "box":true,
@@ -658,6 +730,68 @@
       "max":30,
       "min":5
     },
+    "Tag":{
+      "type":"structure",
+      "required":[
+        "Key",
+        "Value"
+      ],
+      "members":{
+        "Key":{
+          "shape":"TagKey",
+          "documentation":"<p>The <b>name</b> part of a tag.</p>"
+        },
+        "Value":{
+          "shape":"TagValue",
+          "documentation":"<p>The <b>value</b> part of a tag.</p>"
+        }
+      },
+      "documentation":"<p>Metadata that is associated with AWS resources. In particular, a name-value pair that can be associated with an AWS Cloud9 development environment. There are two types of tags: <i>user tags</i> and <i>system tags</i>. A user tag is created by the user. A system tag is automatically created by AWS services. A system tag is prefixed with \"aws:\" and cannot be modified by the user.</p>"
+    },
+    "TagKey":{
+      "type":"string",
+      "max":128,
+      "min":1
+    },
+    "TagKeyList":{
+      "type":"list",
+      "member":{"shape":"TagKey"},
+      "max":200,
+      "min":0
+    },
+    "TagList":{
+      "type":"list",
+      "member":{"shape":"Tag"},
+      "max":200,
+      "min":0
+    },
+    "TagResourceRequest":{
+      "type":"structure",
+      "required":[
+        "ResourceARN",
+        "Tags"
+      ],
+      "members":{
+        "ResourceARN":{
+          "shape":"EnvironmentArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the AWS Cloud9 development environment to add tags to.</p>"
+        },
+        "Tags":{
+          "shape":"TagList",
+          "documentation":"<p>The list of tags to add to the given AWS Cloud9 development environment.</p>"
+        }
+      }
+    },
+    "TagResourceResponse":{
+      "type":"structure",
+      "members":{
+      }
+    },
+    "TagValue":{
+      "type":"string",
+      "max":256,
+      "min":0
+    },
     "Timestamp":{"type":"timestamp"},
     "TooManyRequestsException":{
       "type":"structure",
@@ -666,6 +800,28 @@
       "documentation":"<p>Too many service requests were made over the given time period.</p>",
       "exception":true
     },
+    "UntagResourceRequest":{
+      "type":"structure",
+      "required":[
+        "ResourceARN",
+        "TagKeys"
+      ],
+      "members":{
+        "ResourceARN":{
+          "shape":"EnvironmentArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the AWS Cloud9 development environment to remove tags from.</p>"
+        },
+        "TagKeys":{
+          "shape":"TagKeyList",
+          "documentation":"<p>The tag names of the tags to remove from the given AWS Cloud9 development environment.</p>"
+        }
+      }
+    },
+    "UntagResourceResponse":{
+      "type":"structure",
+      "members":{
+      }
+    },
     "UpdateEnvironmentMembershipRequest":{
       "type":"structure",
       "required":[
@@ -722,8 +878,8 @@
     },
     "UserArn":{
       "type":"string",
-      "pattern":"^arn:aws:(iam|sts)::\\d+:(root|(user\\/[\\w+=/:,.@-]{1,64}|federated-user\\/[\\w+=/:,.@-]{2,32}|assumed-role\\/[\\w+=/:,.@-]{1,64}\\/[\\w+=/:,.@-]{1,64}))$"
+      "pattern":"^arn:aws:(iam|sts)::\\d+:(root|(user\\/[\\w+=/:,.@-]{1,64}|federated-user\\/[\\w+=/:,.@-]{2,32}|assumed-role\\/[\\w+=:,.@-]{1,64}\\/[\\w+=,.@-]{1,64}))$"
     }
   },
-  "documentation":"<fullname>AWS Cloud9</fullname> <p>AWS Cloud9 is a collection of tools that you can use to code, build, run, test, debug, and release software in the cloud.</p> <p>For more information about AWS Cloud9, see the <a href=\"https://docs.aws.amazon.com/cloud9/latest/user-guide\">AWS Cloud9 User Guide</a>.</p> <p>AWS Cloud9 supports these operations:</p> <ul> <li> <p> <code>CreateEnvironmentEC2</code>: Creates an AWS Cloud9 development environment, launches an Amazon EC2 instance, and then connects from the instance to the environment.</p> </li> <li> <p> <code>CreateEnvironmentMembership</code>: Adds an environment member to an environment.</p> </li> <li> <p> <code>DeleteEnvironment</code>: Deletes an environment. If an Amazon EC2 instance is connected to the environment, also terminates the instance.</p> </li> <li> <p> <code>DeleteEnvironmentMembership</code>: Deletes an environment member from an environment.</p> </li> <li> <p> <code>DescribeEnvironmentMemberships</code>: Gets information about environment members for an environment.</p> </li> <li> <p> <code>DescribeEnvironments</code>: Gets information about environments.</p> </li> <li> <p> <code>DescribeEnvironmentStatus</code>: Gets status information for an environment.</p> </li> <li> <p> <code>ListEnvironments</code>: Gets a list of environment identifiers.</p> </li> <li> <p> <code>UpdateEnvironment</code>: Changes the settings of an existing environment.</p> </li> <li> <p> <code>UpdateEnvironmentMembership</code>: Changes the settings of an existing environment member for an environment.</p> </li> </ul>"
+  "documentation":"<fullname>AWS Cloud9</fullname> <p>AWS Cloud9 is a collection of tools that you can use to code, build, run, test, debug, and release software in the cloud.</p> <p>For more information about AWS Cloud9, see the <a href=\"https://docs.aws.amazon.com/cloud9/latest/user-guide\">AWS Cloud9 User Guide</a>.</p> <p>AWS Cloud9 supports these operations:</p> <ul> <li> <p> <code>CreateEnvironmentEC2</code>: Creates an AWS Cloud9 development environment, launches an Amazon EC2 instance, and then connects from the instance to the environment.</p> </li> <li> <p> <code>CreateEnvironmentMembership</code>: Adds an environment member to an environment.</p> </li> <li> <p> <code>DeleteEnvironment</code>: Deletes an environment. If an Amazon EC2 instance is connected to the environment, also terminates the instance.</p> </li> <li> <p> <code>DeleteEnvironmentMembership</code>: Deletes an environment member from an environment.</p> </li> <li> <p> <code>DescribeEnvironmentMemberships</code>: Gets information about environment members for an environment.</p> </li> <li> <p> <code>DescribeEnvironments</code>: Gets information about environments.</p> </li> <li> <p> <code>DescribeEnvironmentStatus</code>: Gets status information for an environment.</p> </li> <li> <p> <code>ListEnvironments</code>: Gets a list of environment identifiers.</p> </li> <li> <p> <code>ListTagsForResource</code>: Gets the tags for an environment.</p> </li> <li> <p> <code>TagResource</code>: Adds tags to an environment.</p> </li> <li> <p> <code>UntagResource</code>: Removes tags from an environment.</p> </li> <li> <p> <code>UpdateEnvironment</code>: Changes the settings of an existing environment.</p> </li> <li> <p> <code>UpdateEnvironmentMembership</code>: Changes the settings of an existing environment member for an environment.</p> </li> </ul>"
 }
diff --git a/services/clouddirectory/build.properties b/services/clouddirectory/build.properties
index ecf2dae6fcb1..15ec2da1fc71 100644
--- a/services/clouddirectory/build.properties
+++ b/services/clouddirectory/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/clouddirectory/pom.xml b/services/clouddirectory/pom.xml
index d03a13615de8..aead307e22e2 100644
--- a/services/clouddirectory/pom.xml
+++ b/services/clouddirectory/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>clouddirectory</artifactId>
     <name>AWS Java SDK :: Services :: Amazon CloudDirectory</name>
diff --git a/services/cloudformation/build.properties b/services/cloudformation/build.properties
index ecf2dae6fcb1..15ec2da1fc71 100644
--- a/services/cloudformation/build.properties
+++ b/services/cloudformation/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/cloudformation/pom.xml b/services/cloudformation/pom.xml
index a8524d1d666e..bcba9c1c9c6a 100644
--- a/services/cloudformation/pom.xml
+++ b/services/cloudformation/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>cloudformation</artifactId>
     <name>AWS Java SDK :: Services :: AWS CloudFormation</name>
diff --git a/services/cloudformation/src/it/java/software/amazon/awssdk/services/cloudformation/ClockSkewIntegrationTest.java b/services/cloudformation/src/it/java/software/amazon/awssdk/services/cloudformation/ClockSkewIntegrationTest.java
index 4ed21b31db25..592b22e42938 100644
--- a/services/cloudformation/src/it/java/software/amazon/awssdk/services/cloudformation/ClockSkewIntegrationTest.java
+++ b/services/cloudformation/src/it/java/software/amazon/awssdk/services/cloudformation/ClockSkewIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/cloudformation/src/it/java/software/amazon/awssdk/services/cloudformation/CloudFormationIntegrationTestBase.java b/services/cloudformation/src/it/java/software/amazon/awssdk/services/cloudformation/CloudFormationIntegrationTestBase.java
index dbdcdddeec37..ea3ffac251a6 100644
--- a/services/cloudformation/src/it/java/software/amazon/awssdk/services/cloudformation/CloudFormationIntegrationTestBase.java
+++ b/services/cloudformation/src/it/java/software/amazon/awssdk/services/cloudformation/CloudFormationIntegrationTestBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/cloudformation/src/it/java/software/amazon/awssdk/services/cloudformation/SendEmptyListIntegrationTest.java b/services/cloudformation/src/it/java/software/amazon/awssdk/services/cloudformation/SendEmptyListIntegrationTest.java
index d0fa3c1a48b0..1f782214ed5d 100644
--- a/services/cloudformation/src/it/java/software/amazon/awssdk/services/cloudformation/SendEmptyListIntegrationTest.java
+++ b/services/cloudformation/src/it/java/software/amazon/awssdk/services/cloudformation/SendEmptyListIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/cloudformation/src/main/resources/codegen-resources/paginators-1.json b/services/cloudformation/src/main/resources/codegen-resources/paginators-1.json
index 51df4af1a13c..fb1c4ff2699d 100644
--- a/services/cloudformation/src/main/resources/codegen-resources/paginators-1.json
+++ b/services/cloudformation/src/main/resources/codegen-resources/paginators-1.json
@@ -37,6 +37,21 @@
       "input_token": "NextToken",
       "output_token": "NextToken",
       "result_key": "StackSummaries"
+    },
+    "ListTypeRegistrations": {
+      "input_token": "NextToken",
+      "limit_key": "MaxResults",
+      "output_token": "NextToken"
+    },
+    "ListTypeVersions": {
+      "input_token": "NextToken",
+      "limit_key": "MaxResults",
+      "output_token": "NextToken"
+    },
+    "ListTypes": {
+      "input_token": "NextToken",
+      "limit_key": "MaxResults",
+      "output_token": "NextToken"
     }
   }
 }
\ No newline at end of file
diff --git a/services/cloudformation/src/main/resources/codegen-resources/service-2.json b/services/cloudformation/src/main/resources/codegen-resources/service-2.json
index f29128b33644..e82b51e984d5 100644
--- a/services/cloudformation/src/main/resources/codegen-resources/service-2.json
+++ b/services/cloudformation/src/main/resources/codegen-resources/service-2.json
@@ -55,7 +55,7 @@
         {"shape":"InsufficientCapabilitiesException"},
         {"shape":"LimitExceededException"}
       ],
-      "documentation":"<p>Creates a list of changes that will be applied to a stack so that you can review the changes before executing them. You can create a change set for a stack that doesn't exist or an existing stack. If you create a change set for a stack that doesn't exist, the change set shows all of the resources that AWS CloudFormation will create. If you create a change set for an existing stack, AWS CloudFormation compares the stack's information with the information that you submit in the change set and lists the differences. Use change sets to understand which resources AWS CloudFormation will create or change, and how it will change resources in an existing stack, before you create or update a stack.</p> <p>To create a change set for a stack that doesn't exist, for the <code>ChangeSetType</code> parameter, specify <code>CREATE</code>. To create a change set for an existing stack, specify <code>UPDATE</code> for the <code>ChangeSetType</code> parameter. After the <code>CreateChangeSet</code> call successfully completes, AWS CloudFormation starts creating the change set. To check the status of the change set or to review it, use the <a>DescribeChangeSet</a> action.</p> <p>When you are satisfied with the changes the change set will make, execute the change set by using the <a>ExecuteChangeSet</a> action. AWS CloudFormation doesn't make changes until you execute the change set.</p>"
+      "documentation":"<p>Creates a list of changes that will be applied to a stack so that you can review the changes before executing them. You can create a change set for a stack that doesn't exist or an existing stack. If you create a change set for a stack that doesn't exist, the change set shows all of the resources that AWS CloudFormation will create. If you create a change set for an existing stack, AWS CloudFormation compares the stack's information with the information that you submit in the change set and lists the differences. Use change sets to understand which resources AWS CloudFormation will create or change, and how it will change resources in an existing stack, before you create or update a stack.</p> <p>To create a change set for a stack that doesn't exist, for the <code>ChangeSetType</code> parameter, specify <code>CREATE</code>. To create a change set for an existing stack, specify <code>UPDATE</code> for the <code>ChangeSetType</code> parameter. To create a change set for an import operation, specify <code>IMPORT</code> for the <code>ChangeSetType</code> parameter. After the <code>CreateChangeSet</code> call successfully completes, AWS CloudFormation starts creating the change set. To check the status of the change set or to review it, use the <a>DescribeChangeSet</a> action.</p> <p>When you are satisfied with the changes the change set will make, execute the change set by using the <a>ExecuteChangeSet</a> action. AWS CloudFormation doesn't make changes until you execute the change set.</p>"
     },
     "CreateStack":{
       "name":"CreateStack",
@@ -95,7 +95,7 @@
         {"shape":"InvalidOperationException"},
         {"shape":"LimitExceededException"}
       ],
-      "documentation":"<p>Creates stack instances for the specified accounts, within the specified regions. A stack instance refers to a stack in a specific account and region. <code>Accounts</code> and <code>Regions</code> are required parameters—you must specify at least one account and one region. </p>"
+      "documentation":"<p>Creates stack instances for the specified accounts, within the specified regions. A stack instance refers to a stack in a specific account and region. You must specify at least one value for either <code>Accounts</code> or <code>DeploymentTargets</code>, and you must specify at least one value for <code>Regions</code>.</p>"
     },
     "CreateStackSet":{
       "name":"CreateStackSet",
@@ -180,6 +180,24 @@
       ],
       "documentation":"<p>Deletes a stack set. Before you can delete a stack set, all of its member stack instances must be deleted. For more information about how to do this, see <a>DeleteStackInstances</a>. </p>"
     },
+    "DeregisterType":{
+      "name":"DeregisterType",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DeregisterTypeInput"},
+      "output":{
+        "shape":"DeregisterTypeOutput",
+        "resultWrapper":"DeregisterTypeResult"
+      },
+      "errors":[
+        {"shape":"CFNRegistryException"},
+        {"shape":"TypeNotFoundException"}
+      ],
+      "documentation":"<p>Removes a type or type version from active use in the CloudFormation registry. If a type or type version is deregistered, it cannot be used in CloudFormation operations.</p> <p>To deregister a type, you must individually deregister all registered versions of that type. If a type has only a single registered version, deregistering that version results in the type itself being deregistered. </p> <p>You cannot deregister the default version of a type, unless it is the only registered version of that type, in which case the type itself is deregistered as well. </p>",
+      "idempotent":true
+    },
     "DescribeAccountLimits":{
       "name":"DescribeAccountLimits",
       "http":{
@@ -337,6 +355,41 @@
       },
       "documentation":"<p>Returns the description for the specified stack; if no stack name was specified, then it returns the description for all the stacks created.</p> <note> <p>If the stack does not exist, an <code>AmazonCloudFormationException</code> is returned.</p> </note>"
     },
+    "DescribeType":{
+      "name":"DescribeType",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DescribeTypeInput"},
+      "output":{
+        "shape":"DescribeTypeOutput",
+        "resultWrapper":"DescribeTypeResult"
+      },
+      "errors":[
+        {"shape":"CFNRegistryException"},
+        {"shape":"TypeNotFoundException"}
+      ],
+      "documentation":"<p>Returns detailed information about a type that has been registered.</p> <p>If you specify a <code>VersionId</code>, <code>DescribeType</code> returns information about that specific type version. Otherwise, it returns information about the default type version.</p>",
+      "idempotent":true
+    },
+    "DescribeTypeRegistration":{
+      "name":"DescribeTypeRegistration",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DescribeTypeRegistrationInput"},
+      "output":{
+        "shape":"DescribeTypeRegistrationOutput",
+        "resultWrapper":"DescribeTypeRegistrationResult"
+      },
+      "errors":[
+        {"shape":"CFNRegistryException"}
+      ],
+      "documentation":"<p>Returns information about a type's registration, including its current status and type and version identifiers.</p> <p>When you initiate a registration request using <code> <a>RegisterType</a> </code>, you can then use <code> <a>DescribeTypeRegistration</a> </code> to monitor the progress of that registration request.</p> <p>Once the registration request has completed, use <code> <a>DescribeType</a> </code> to return detailed informaiton about a type.</p>",
+      "idempotent":true
+    },
     "DetectStackDrift":{
       "name":"DetectStackDrift",
       "http":{
@@ -363,6 +416,24 @@
       },
       "documentation":"<p>Returns information about whether a resource's actual configuration differs, or has <i>drifted</i>, from it's expected configuration, as defined in the stack template and any values specified as template parameters. This information includes actual and expected property values for resources in which AWS CloudFormation detects drift. Only resource properties explicitly defined in the stack template are checked for drift. For more information about stack and resource drift, see <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/using-cfn-stack-drift.html\">Detecting Unregulated Configuration Changes to Stacks and Resources</a>.</p> <p>Use <code>DetectStackResourceDrift</code> to detect drift on individual resources, or <a>DetectStackDrift</a> to detect drift on all resources in a given stack that support drift detection.</p> <p>Resources that do not currently support drift detection cannot be checked. For a list of resources that support drift detection, see <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/using-cfn-stack-drift-resource-list.html\">Resources that Support Drift Detection</a>.</p>"
     },
+    "DetectStackSetDrift":{
+      "name":"DetectStackSetDrift",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DetectStackSetDriftInput"},
+      "output":{
+        "shape":"DetectStackSetDriftOutput",
+        "resultWrapper":"DetectStackSetDriftResult"
+      },
+      "errors":[
+        {"shape":"InvalidOperationException"},
+        {"shape":"OperationInProgressException"},
+        {"shape":"StackSetNotFoundException"}
+      ],
+      "documentation":"<p>Detect drift on a stack set. When CloudFormation performs drift detection on a stack set, it performs drift detection on the stack associated with each stack instance in the stack set. For more information, see <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/stacksets-drift.html\">How CloudFormation Performs Drift Detection on a Stack Set</a>.</p> <p> <code>DetectStackSetDrift</code> returns the <code>OperationId</code> of the stack set drift detection operation. Use this operation id with <code> <a>DescribeStackSetOperation</a> </code> to monitor the progress of the drift detection operation. The drift detection operation may take some time, depending on the number of stack instances included in the stack set, as well as the number of resources included in each stack.</p> <p>Once the operation has completed, use the following actions to return drift information:</p> <ul> <li> <p>Use <code> <a>DescribeStackSet</a> </code> to return detailed informaiton about the stack set, including detailed information about the last <i>completed</i> drift operation performed on the stack set. (Information about drift operations that are in progress is not included.)</p> </li> <li> <p>Use <code> <a>ListStackInstances</a> </code> to return a list of stack instances belonging to the stack set, including the drift status and last drift time checked of each instance.</p> </li> <li> <p>Use <code> <a>DescribeStackInstance</a> </code> to return detailed information about a specific stack instance, including its drift status and last drift time checked.</p> </li> </ul> <p>For more information on performing a drift detection operation on a stack set, see <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/stacksets-drift.html\">Detecting Unmanaged Changes in Stack Sets</a>. </p> <p>You can only run a single drift detection operation on a given stack set at one time. </p> <p>To stop a drift detection stack set operation, use <code> <a>StopStackSetOperation</a> </code>.</p>"
+    },
     "EstimateTemplateCost":{
       "name":"EstimateTemplateCost",
       "http":{
@@ -567,6 +638,92 @@
       },
       "documentation":"<p>Returns the summary information for stacks whose status matches the specified StackStatusFilter. Summary information for stacks that have been deleted is kept for 90 days after the stack is deleted. If no StackStatusFilter is specified, summary information for all stacks is returned (including existing stacks and stacks that have been deleted).</p>"
     },
+    "ListTypeRegistrations":{
+      "name":"ListTypeRegistrations",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"ListTypeRegistrationsInput"},
+      "output":{
+        "shape":"ListTypeRegistrationsOutput",
+        "resultWrapper":"ListTypeRegistrationsResult"
+      },
+      "errors":[
+        {"shape":"CFNRegistryException"}
+      ],
+      "documentation":"<p>Returns a list of registration tokens for the specified type(s).</p>",
+      "idempotent":true
+    },
+    "ListTypeVersions":{
+      "name":"ListTypeVersions",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"ListTypeVersionsInput"},
+      "output":{
+        "shape":"ListTypeVersionsOutput",
+        "resultWrapper":"ListTypeVersionsResult"
+      },
+      "errors":[
+        {"shape":"CFNRegistryException"}
+      ],
+      "documentation":"<p>Returns summary information about the versions of a type.</p>",
+      "idempotent":true
+    },
+    "ListTypes":{
+      "name":"ListTypes",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"ListTypesInput"},
+      "output":{
+        "shape":"ListTypesOutput",
+        "resultWrapper":"ListTypesResult"
+      },
+      "errors":[
+        {"shape":"CFNRegistryException"}
+      ],
+      "documentation":"<p>Returns summary information about types that have been registered with CloudFormation.</p>",
+      "idempotent":true
+    },
+    "RecordHandlerProgress":{
+      "name":"RecordHandlerProgress",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"RecordHandlerProgressInput"},
+      "output":{
+        "shape":"RecordHandlerProgressOutput",
+        "resultWrapper":"RecordHandlerProgressResult"
+      },
+      "errors":[
+        {"shape":"InvalidStateTransitionException"},
+        {"shape":"OperationStatusCheckFailedException"}
+      ],
+      "documentation":"<p>Reports progress of a resource handler to CloudFormation.</p> <p>Reserved for use by the <a href=\"https://docs.aws.amazon.com/cloudformation-cli/latest/userguide/what-is-cloudformation-cli.html\">CloudFormation CLI</a>. Do not use this API in your code.</p>",
+      "idempotent":true
+    },
+    "RegisterType":{
+      "name":"RegisterType",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"RegisterTypeInput"},
+      "output":{
+        "shape":"RegisterTypeOutput",
+        "resultWrapper":"RegisterTypeResult"
+      },
+      "errors":[
+        {"shape":"CFNRegistryException"}
+      ],
+      "documentation":"<p>Registers a type with the CloudFormation service. Registering a type makes it available for use in CloudFormation templates in your AWS account, and includes:</p> <ul> <li> <p>Validating the resource schema</p> </li> <li> <p>Determining which handlers have been specified for the resource</p> </li> <li> <p>Making the resource type available for use in your account</p> </li> </ul> <p>For more information on how to develop types and ready them for registeration, see <a href=\"https://docs.aws.amazon.com/cloudformation-cli/latest/userguide/resource-types.html\">Creating Resource Providers</a> in the <i>CloudFormation CLI User Guide</i>.</p> <p>Once you have initiated a registration request using <code> <a>RegisterType</a> </code>, you can use <code> <a>DescribeTypeRegistration</a> </code> to monitor the progress of the registration request.</p>",
+      "idempotent":true
+    },
     "SetStackPolicy":{
       "name":"SetStackPolicy",
       "http":{
@@ -576,6 +733,24 @@
       "input":{"shape":"SetStackPolicyInput"},
       "documentation":"<p>Sets a stack policy for a specified stack.</p>"
     },
+    "SetTypeDefaultVersion":{
+      "name":"SetTypeDefaultVersion",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"SetTypeDefaultVersionInput"},
+      "output":{
+        "shape":"SetTypeDefaultVersionOutput",
+        "resultWrapper":"SetTypeDefaultVersionResult"
+      },
+      "errors":[
+        {"shape":"CFNRegistryException"},
+        {"shape":"TypeNotFoundException"}
+      ],
+      "documentation":"<p>Specify the default version of a type. The default version of a type will be used in CloudFormation operations.</p>",
+      "idempotent":true
+    },
     "SignalResource":{
       "name":"SignalResource",
       "http":{
@@ -673,7 +848,7 @@
         "shape":"UpdateTerminationProtectionOutput",
         "resultWrapper":"UpdateTerminationProtectionResult"
       },
-      "documentation":"<p>Updates termination protection for the specified stack. If a user attempts to delete a stack with termination protection enabled, the operation fails and the stack remains unchanged. For more information, see <a href=\"AWSCloudFormation/latest/UserGuide/using-cfn-protect-stacks.html\">Protecting a Stack From Being Deleted</a> in the <i>AWS CloudFormation User Guide</i>.</p> <p> For <a href=\"AWSCloudFormation/latest/UserGuide/using-cfn-nested-stacks.html\">nested stacks</a>, termination protection is set on the root stack and cannot be changed directly on the nested stack.</p>"
+      "documentation":"<p>Updates termination protection for the specified stack. If a user attempts to delete a stack with termination protection enabled, the operation fails and the stack remains unchanged. For more information, see <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/using-cfn-protect-stacks.html\">Protecting a Stack From Being Deleted</a> in the <i>AWS CloudFormation User Guide</i>.</p> <p> For <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/using-cfn-nested-stacks.html\">nested stacks</a>, termination protection is set on the root stack and cannot be changed directly on the nested stack.</p>"
     },
     "ValidateTemplate":{
       "name":"ValidateTemplate",
@@ -692,7 +867,7 @@
   "shapes":{
     "Account":{
       "type":"string",
-      "pattern":"[0-9]{12}"
+      "pattern":"^[0-9]{12}$"
     },
     "AccountGateResult":{
       "type":"structure",
@@ -722,14 +897,14 @@
       "members":{
         "Name":{
           "shape":"LimitName",
-          "documentation":"<p>The name of the account limit.</p>"
+          "documentation":"<p>The name of the account limit.</p> <p>Values: <code>ConcurrentResourcesLimit</code> | <code>StackLimit</code> | <code>StackOutputsLimit</code> </p>"
         },
         "Value":{
           "shape":"LimitValue",
           "documentation":"<p>The value that is associated with the account limit name.</p>"
         }
       },
-      "documentation":"<p>The AccountLimit data type. For more information about account limits, see <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/cloudformation-limits.html\">AWS CloudFormation Limits</a> in the <i>AWS CloudFormation User Guide</i>.</p>"
+      "documentation":"<p>The AccountLimit data type. </p> <p>CloudFormation has the following limits per account:</p> <ul> <li> <p>Number of concurrent resources</p> </li> <li> <p>Number of stacks</p> </li> <li> <p>Number of stack outputs</p> </li> </ul> <p>For more information about these account limits, and other CloudFormation limits, see <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/cloudformation-limits.html\">AWS CloudFormation Limits</a> in the <i>AWS CloudFormation User Guide</i>.</p>"
     },
     "AccountLimitList":{
       "type":"list",
@@ -757,6 +932,21 @@
       "exception":true
     },
     "Arn":{"type":"string"},
+    "AutoDeployment":{
+      "type":"structure",
+      "members":{
+        "Enabled":{
+          "shape":"AutoDeploymentNullable",
+          "documentation":"<p>If set to <code>true</code>, StackSets automatically deploys additional stack instances to AWS Organizations accounts that are added to a target organization or organizational unit (OU) in the specified Regions. If an account is removed from a target organization or OU, StackSets deletes stack instances from the account in the specified Regions.</p>"
+        },
+        "RetainStacksOnAccountRemoval":{
+          "shape":"RetainStacksOnAccountRemovalNullable",
+          "documentation":"<p>If set to <code>true</code>, stack resources are retained when an account is removed from a target organization or OU. If set to <code>false</code>, stack resources are deleted. Specify only if <code>Enabled</code> is set to <code>True</code>.</p>"
+        }
+      },
+      "documentation":"<p>[<code>Service-managed</code> permissions] Describes whether StackSets automatically deploys to AWS Organizations accounts that are added to a target organization or organizational unit (OU).</p>"
+    },
+    "AutoDeploymentNullable":{"type":"boolean"},
     "BoxedInteger":{
       "type":"integer",
       "box":true
@@ -767,6 +957,19 @@
       "max":100,
       "min":1
     },
+    "CFNRegistryException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p>An error occurred during a CloudFormation registry operation.</p>",
+      "error":{
+        "code":"CFNRegistryException",
+        "httpStatusCode":400,
+        "senderFault":true
+      },
+      "exception":true
+    },
     "CancelUpdateStackInput":{
       "type":"structure",
       "required":["StackName"],
@@ -815,7 +1018,8 @@
       "enum":[
         "Add",
         "Modify",
-        "Remove"
+        "Remove",
+        "Import"
       ]
     },
     "ChangeSetId":{
@@ -908,7 +1112,8 @@
       "type":"string",
       "enum":[
         "CREATE",
-        "UPDATE"
+        "UPDATE",
+        "IMPORT"
       ]
     },
     "ChangeSource":{
@@ -998,7 +1203,7 @@
         },
         "Capabilities":{
           "shape":"Capabilities",
-          "documentation":"<p>In some cases, you must explicity acknowledge that your stack template contains certain capabilities in order for AWS CloudFormation to create the stack.</p> <ul> <li> <p> <code>CAPABILITY_IAM</code> and <code>CAPABILITY_NAMED_IAM</code> </p> <p>Some stack templates might include resources that can affect permissions in your AWS account; for example, by creating new AWS Identity and Access Management (IAM) users. For those stacks, you must explicitly acknowledge this by specifying one of these capabilities.</p> <p>The following IAM resources require you to specify either the <code>CAPABILITY_IAM</code> or <code>CAPABILITY_NAMED_IAM</code> capability.</p> <ul> <li> <p>If you have IAM resources, you can specify either capability. </p> </li> <li> <p>If you have IAM resources with custom names, you <i>must</i> specify <code>CAPABILITY_NAMED_IAM</code>. </p> </li> <li> <p>If you don't specify either of these capabilities, AWS CloudFormation returns an <code>InsufficientCapabilities</code> error.</p> </li> </ul> <p>If your stack template contains these resources, we recommend that you review all permissions associated with them and edit their permissions if necessary.</p> <ul> <li> <p> <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-accesskey.html\"> AWS::IAM::AccessKey</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-group.html\"> AWS::IAM::Group</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-instanceprofile.html\"> AWS::IAM::InstanceProfile</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-policy.html\"> AWS::IAM::Policy</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-role.html\"> AWS::IAM::Role</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-user.html\"> AWS::IAM::User</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-addusertogroup.html\"> AWS::IAM::UserToGroupAddition</a> </p> </li> </ul> <p>For more information, see <a href=\"http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/using-iam-template.html#capabilities\">Acknowledging IAM Resources in AWS CloudFormation Templates</a>.</p> </li> <li> <p> <code>CAPABILITY_AUTO_EXPAND</code> </p> <p>Some template contain macros. Macros perform custom processing on templates; this can include simple actions like find-and-replace operations, all the way to extensive transformations of entire templates. Because of this, users typically create a change set from the processed template, so that they can review the changes resulting from the macros before actually creating the stack. If your stack template contains one or more macros, and you choose to create a stack directly from the processed template, without first reviewing the resulting changes in a change set, you must acknowledge this capability. This includes the <a href=\"http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/create-reusable-transform-function-snippets-and-add-to-your-template-with-aws-include-transform.html\">AWS::Include</a> and <a href=\"http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/transform-aws-serverless.html\">AWS::Serverless</a> transforms, which are macros hosted by AWS CloudFormation.</p> <note> <p>This capacity does not apply to creating change sets, and specifying it when creating change sets has no effect.</p> <p>Also, change sets do not currently support nested stacks. If you want to create a stack from a stack template that contains macros <i>and</i> nested stacks, you must create or update the stack directly from the template using the <a>CreateStack</a> or <a>UpdateStack</a> action, and specifying this capability.</p> </note> <p>For more information on macros, see <a href=\"http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/template-macros.html\">Using AWS CloudFormation Macros to Perform Custom Processing on Templates</a>.</p> </li> </ul>"
+          "documentation":"<p>In some cases, you must explicitly acknowledge that your stack template contains certain capabilities in order for AWS CloudFormation to create the stack.</p> <ul> <li> <p> <code>CAPABILITY_IAM</code> and <code>CAPABILITY_NAMED_IAM</code> </p> <p>Some stack templates might include resources that can affect permissions in your AWS account; for example, by creating new AWS Identity and Access Management (IAM) users. For those stacks, you must explicitly acknowledge this by specifying one of these capabilities.</p> <p>The following IAM resources require you to specify either the <code>CAPABILITY_IAM</code> or <code>CAPABILITY_NAMED_IAM</code> capability.</p> <ul> <li> <p>If you have IAM resources, you can specify either capability. </p> </li> <li> <p>If you have IAM resources with custom names, you <i>must</i> specify <code>CAPABILITY_NAMED_IAM</code>. </p> </li> <li> <p>If you don't specify either of these capabilities, AWS CloudFormation returns an <code>InsufficientCapabilities</code> error.</p> </li> </ul> <p>If your stack template contains these resources, we recommend that you review all permissions associated with them and edit their permissions if necessary.</p> <ul> <li> <p> <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-accesskey.html\"> AWS::IAM::AccessKey</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-group.html\"> AWS::IAM::Group</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-instanceprofile.html\"> AWS::IAM::InstanceProfile</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-policy.html\"> AWS::IAM::Policy</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-role.html\"> AWS::IAM::Role</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-user.html\"> AWS::IAM::User</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-addusertogroup.html\"> AWS::IAM::UserToGroupAddition</a> </p> </li> </ul> <p>For more information, see <a href=\"http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/using-iam-template.html#capabilities\">Acknowledging IAM Resources in AWS CloudFormation Templates</a>.</p> </li> <li> <p> <code>CAPABILITY_AUTO_EXPAND</code> </p> <p>Some template contain macros. Macros perform custom processing on templates; this can include simple actions like find-and-replace operations, all the way to extensive transformations of entire templates. Because of this, users typically create a change set from the processed template, so that they can review the changes resulting from the macros before actually creating the stack. If your stack template contains one or more macros, and you choose to create a stack directly from the processed template, without first reviewing the resulting changes in a change set, you must acknowledge this capability. This includes the <a href=\"http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/create-reusable-transform-function-snippets-and-add-to-your-template-with-aws-include-transform.html\">AWS::Include</a> and <a href=\"http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/transform-aws-serverless.html\">AWS::Serverless</a> transforms, which are macros hosted by AWS CloudFormation.</p> <note> <p>This capacity does not apply to creating change sets, and specifying it when creating change sets has no effect.</p> <p>Also, change sets do not currently support nested stacks. If you want to create a stack from a stack template that contains macros <i>and</i> nested stacks, you must create or update the stack directly from the template using the <a>CreateStack</a> or <a>UpdateStack</a> action, and specifying this capability.</p> </note> <p>For more information on macros, see <a href=\"http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/template-macros.html\">Using AWS CloudFormation Macros to Perform Custom Processing on Templates</a>.</p> </li> </ul>"
         },
         "ResourceTypes":{
           "shape":"ResourceTypes",
@@ -1034,7 +1239,11 @@
         },
         "ChangeSetType":{
           "shape":"ChangeSetType",
-          "documentation":"<p>The type of change set operation. To create a change set for a new stack, specify <code>CREATE</code>. To create a change set for an existing stack, specify <code>UPDATE</code>.</p> <p>If you create a change set for a new stack, AWS Cloudformation creates a stack with a unique stack ID, but no template or resources. The stack will be in the <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/using-cfn-describing-stacks.html#d0e11995\"> <code>REVIEW_IN_PROGRESS</code> </a> state until you execute the change set.</p> <p>By default, AWS CloudFormation specifies <code>UPDATE</code>. You can't use the <code>UPDATE</code> type to create a change set for a new stack or the <code>CREATE</code> type to create a change set for an existing stack.</p>"
+          "documentation":"<p>The type of change set operation. To create a change set for a new stack, specify <code>CREATE</code>. To create a change set for an existing stack, specify <code>UPDATE</code>. To create a change set for an import operation, specify <code>IMPORT</code>.</p> <p>If you create a change set for a new stack, AWS Cloudformation creates a stack with a unique stack ID, but no template or resources. The stack will be in the <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/using-cfn-describing-stacks.html#d0e11995\"> <code>REVIEW_IN_PROGRESS</code> </a> state until you execute the change set.</p> <p>By default, AWS CloudFormation specifies <code>UPDATE</code>. You can't use the <code>UPDATE</code> type to create a change set for a new stack or the <code>CREATE</code> type to create a change set for an existing stack.</p>"
+        },
+        "ResourcesToImport":{
+          "shape":"ResourcesToImport",
+          "documentation":"<p>The resources to import into your stack.</p>"
         }
       },
       "documentation":"<p>The input for the <a>CreateChangeSet</a> action.</p>"
@@ -1091,7 +1300,7 @@
         },
         "Capabilities":{
           "shape":"Capabilities",
-          "documentation":"<p>In some cases, you must explicity acknowledge that your stack template contains certain capabilities in order for AWS CloudFormation to create the stack.</p> <ul> <li> <p> <code>CAPABILITY_IAM</code> and <code>CAPABILITY_NAMED_IAM</code> </p> <p>Some stack templates might include resources that can affect permissions in your AWS account; for example, by creating new AWS Identity and Access Management (IAM) users. For those stacks, you must explicitly acknowledge this by specifying one of these capabilities.</p> <p>The following IAM resources require you to specify either the <code>CAPABILITY_IAM</code> or <code>CAPABILITY_NAMED_IAM</code> capability.</p> <ul> <li> <p>If you have IAM resources, you can specify either capability. </p> </li> <li> <p>If you have IAM resources with custom names, you <i>must</i> specify <code>CAPABILITY_NAMED_IAM</code>. </p> </li> <li> <p>If you don't specify either of these capabilities, AWS CloudFormation returns an <code>InsufficientCapabilities</code> error.</p> </li> </ul> <p>If your stack template contains these resources, we recommend that you review all permissions associated with them and edit their permissions if necessary.</p> <ul> <li> <p> <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-accesskey.html\"> AWS::IAM::AccessKey</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-group.html\"> AWS::IAM::Group</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-instanceprofile.html\"> AWS::IAM::InstanceProfile</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-policy.html\"> AWS::IAM::Policy</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-role.html\"> AWS::IAM::Role</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-user.html\"> AWS::IAM::User</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-addusertogroup.html\"> AWS::IAM::UserToGroupAddition</a> </p> </li> </ul> <p>For more information, see <a href=\"http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/using-iam-template.html#capabilities\">Acknowledging IAM Resources in AWS CloudFormation Templates</a>.</p> </li> <li> <p> <code>CAPABILITY_AUTO_EXPAND</code> </p> <p>Some template contain macros. Macros perform custom processing on templates; this can include simple actions like find-and-replace operations, all the way to extensive transformations of entire templates. Because of this, users typically create a change set from the processed template, so that they can review the changes resulting from the macros before actually creating the stack. If your stack template contains one or more macros, and you choose to create a stack directly from the processed template, without first reviewing the resulting changes in a change set, you must acknowledge this capability. This includes the <a href=\"http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/create-reusable-transform-function-snippets-and-add-to-your-template-with-aws-include-transform.html\">AWS::Include</a> and <a href=\"http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/transform-aws-serverless.html\">AWS::Serverless</a> transforms, which are macros hosted by AWS CloudFormation.</p> <p>Change sets do not currently support nested stacks. If you want to create a stack from a stack template that contains macros <i>and</i> nested stacks, you must create the stack directly from the template using this capability.</p> <important> <p>You should only create stacks directly from a stack template that contains macros if you know what processing the macro performs.</p> <p>Each macro relies on an underlying Lambda service function for processing stack templates. Be aware that the Lambda function owner can update the function operation without AWS CloudFormation being notified.</p> </important> <p>For more information, see <a href=\"http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/template-macros.html\">Using AWS CloudFormation Macros to Perform Custom Processing on Templates</a>.</p> </li> </ul>"
+          "documentation":"<p>In some cases, you must explicitly acknowledge that your stack template contains certain capabilities in order for AWS CloudFormation to create the stack.</p> <ul> <li> <p> <code>CAPABILITY_IAM</code> and <code>CAPABILITY_NAMED_IAM</code> </p> <p>Some stack templates might include resources that can affect permissions in your AWS account; for example, by creating new AWS Identity and Access Management (IAM) users. For those stacks, you must explicitly acknowledge this by specifying one of these capabilities.</p> <p>The following IAM resources require you to specify either the <code>CAPABILITY_IAM</code> or <code>CAPABILITY_NAMED_IAM</code> capability.</p> <ul> <li> <p>If you have IAM resources, you can specify either capability. </p> </li> <li> <p>If you have IAM resources with custom names, you <i>must</i> specify <code>CAPABILITY_NAMED_IAM</code>. </p> </li> <li> <p>If you don't specify either of these capabilities, AWS CloudFormation returns an <code>InsufficientCapabilities</code> error.</p> </li> </ul> <p>If your stack template contains these resources, we recommend that you review all permissions associated with them and edit their permissions if necessary.</p> <ul> <li> <p> <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-accesskey.html\"> AWS::IAM::AccessKey</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-group.html\"> AWS::IAM::Group</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-instanceprofile.html\"> AWS::IAM::InstanceProfile</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-policy.html\"> AWS::IAM::Policy</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-role.html\"> AWS::IAM::Role</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-user.html\"> AWS::IAM::User</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-addusertogroup.html\"> AWS::IAM::UserToGroupAddition</a> </p> </li> </ul> <p>For more information, see <a href=\"http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/using-iam-template.html#capabilities\">Acknowledging IAM Resources in AWS CloudFormation Templates</a>.</p> </li> <li> <p> <code>CAPABILITY_AUTO_EXPAND</code> </p> <p>Some template contain macros. Macros perform custom processing on templates; this can include simple actions like find-and-replace operations, all the way to extensive transformations of entire templates. Because of this, users typically create a change set from the processed template, so that they can review the changes resulting from the macros before actually creating the stack. If your stack template contains one or more macros, and you choose to create a stack directly from the processed template, without first reviewing the resulting changes in a change set, you must acknowledge this capability. This includes the <a href=\"http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/create-reusable-transform-function-snippets-and-add-to-your-template-with-aws-include-transform.html\">AWS::Include</a> and <a href=\"http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/transform-aws-serverless.html\">AWS::Serverless</a> transforms, which are macros hosted by AWS CloudFormation.</p> <p>Change sets do not currently support nested stacks. If you want to create a stack from a stack template that contains macros <i>and</i> nested stacks, you must create the stack directly from the template using this capability.</p> <important> <p>You should only create stacks directly from a stack template that contains macros if you know what processing the macro performs.</p> <p>Each macro relies on an underlying Lambda service function for processing stack templates. Be aware that the Lambda function owner can update the function operation without AWS CloudFormation being notified.</p> </important> <p>For more information, see <a href=\"http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/template-macros.html\">Using AWS CloudFormation Macros to Perform Custom Processing on Templates</a>.</p> </li> </ul>"
         },
         "ResourceTypes":{
           "shape":"ResourceTypes",
@@ -1132,7 +1341,6 @@
       "type":"structure",
       "required":[
         "StackSetName",
-        "Accounts",
         "Regions"
       ],
       "members":{
@@ -1142,7 +1350,11 @@
         },
         "Accounts":{
           "shape":"AccountList",
-          "documentation":"<p>The names of one or more AWS accounts that you want to create stack instances in the specified region(s) for.</p>"
+          "documentation":"<p>[Self-managed permissions] The names of one or more AWS accounts that you want to create stack instances in the specified region(s) for.</p> <p>You can specify <code>Accounts</code> or <code>DeploymentTargets</code>, but not both.</p>"
+        },
+        "DeploymentTargets":{
+          "shape":"DeploymentTargets",
+          "documentation":"<p>[<code>Service-managed</code> permissions] The AWS Organizations accounts for which to create stack instances in the specified Regions.</p> <p>You can specify <code>Accounts</code> or <code>DeploymentTargets</code>, but not both.</p>"
         },
         "Regions":{
           "shape":"RegionList",
@@ -1208,7 +1420,7 @@
         },
         "Capabilities":{
           "shape":"Capabilities",
-          "documentation":"<p>In some cases, you must explicity acknowledge that your stack set template contains certain capabilities in order for AWS CloudFormation to create the stack set and related stack instances.</p> <ul> <li> <p> <code>CAPABILITY_IAM</code> and <code>CAPABILITY_NAMED_IAM</code> </p> <p>Some stack templates might include resources that can affect permissions in your AWS account; for example, by creating new AWS Identity and Access Management (IAM) users. For those stack sets, you must explicitly acknowledge this by specifying one of these capabilities.</p> <p>The following IAM resources require you to specify either the <code>CAPABILITY_IAM</code> or <code>CAPABILITY_NAMED_IAM</code> capability.</p> <ul> <li> <p>If you have IAM resources, you can specify either capability. </p> </li> <li> <p>If you have IAM resources with custom names, you <i>must</i> specify <code>CAPABILITY_NAMED_IAM</code>. </p> </li> <li> <p>If you don't specify either of these capabilities, AWS CloudFormation returns an <code>InsufficientCapabilities</code> error.</p> </li> </ul> <p>If your stack template contains these resources, we recommend that you review all permissions associated with them and edit their permissions if necessary.</p> <ul> <li> <p> <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-accesskey.html\"> AWS::IAM::AccessKey</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-group.html\"> AWS::IAM::Group</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-instanceprofile.html\"> AWS::IAM::InstanceProfile</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-policy.html\"> AWS::IAM::Policy</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-role.html\"> AWS::IAM::Role</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-user.html\"> AWS::IAM::User</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-addusertogroup.html\"> AWS::IAM::UserToGroupAddition</a> </p> </li> </ul> <p>For more information, see <a href=\"http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/using-iam-template.html#capabilities\">Acknowledging IAM Resources in AWS CloudFormation Templates</a>.</p> </li> <li> <p> <code>CAPABILITY_AUTO_EXPAND</code> </p> <p>Some templates contain macros. If your stack template contains one or more macros, and you choose to create a stack directly from the processed template, without first reviewing the resulting changes in a change set, you must acknowledge this capability. For more information, see <a href=\"http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/template-macros.html\">Using AWS CloudFormation Macros to Perform Custom Processing on Templates</a>.</p> <note> <p>Stack sets do not currently support macros in stack templates. (This includes the <a href=\"http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/create-reusable-transform-function-snippets-and-add-to-your-template-with-aws-include-transform.html\">AWS::Include</a> and <a href=\"http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/transform-aws-serverless.html\">AWS::Serverless</a> transforms, which are macros hosted by AWS CloudFormation.) Even if you specify this capability, if you include a macro in your template the stack set operation will fail.</p> </note> </li> </ul>"
+          "documentation":"<p>In some cases, you must explicitly acknowledge that your stack set template contains certain capabilities in order for AWS CloudFormation to create the stack set and related stack instances.</p> <ul> <li> <p> <code>CAPABILITY_IAM</code> and <code>CAPABILITY_NAMED_IAM</code> </p> <p>Some stack templates might include resources that can affect permissions in your AWS account; for example, by creating new AWS Identity and Access Management (IAM) users. For those stack sets, you must explicitly acknowledge this by specifying one of these capabilities.</p> <p>The following IAM resources require you to specify either the <code>CAPABILITY_IAM</code> or <code>CAPABILITY_NAMED_IAM</code> capability.</p> <ul> <li> <p>If you have IAM resources, you can specify either capability. </p> </li> <li> <p>If you have IAM resources with custom names, you <i>must</i> specify <code>CAPABILITY_NAMED_IAM</code>. </p> </li> <li> <p>If you don't specify either of these capabilities, AWS CloudFormation returns an <code>InsufficientCapabilities</code> error.</p> </li> </ul> <p>If your stack template contains these resources, we recommend that you review all permissions associated with them and edit their permissions if necessary.</p> <ul> <li> <p> <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-accesskey.html\"> AWS::IAM::AccessKey</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-group.html\"> AWS::IAM::Group</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-instanceprofile.html\"> AWS::IAM::InstanceProfile</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-policy.html\"> AWS::IAM::Policy</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-role.html\"> AWS::IAM::Role</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-user.html\"> AWS::IAM::User</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-addusertogroup.html\"> AWS::IAM::UserToGroupAddition</a> </p> </li> </ul> <p>For more information, see <a href=\"http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/using-iam-template.html#capabilities\">Acknowledging IAM Resources in AWS CloudFormation Templates</a>.</p> </li> <li> <p> <code>CAPABILITY_AUTO_EXPAND</code> </p> <p>Some templates contain macros. If your stack template contains one or more macros, and you choose to create a stack directly from the processed template, without first reviewing the resulting changes in a change set, you must acknowledge this capability. For more information, see <a href=\"http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/template-macros.html\">Using AWS CloudFormation Macros to Perform Custom Processing on Templates</a>.</p> <note> <p>Stack sets do not currently support macros in stack templates. (This includes the <a href=\"http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/create-reusable-transform-function-snippets-and-add-to-your-template-with-aws-include-transform.html\">AWS::Include</a> and <a href=\"http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/transform-aws-serverless.html\">AWS::Serverless</a> transforms, which are macros hosted by AWS CloudFormation.) Even if you specify this capability, if you include a macro in your template the stack set operation will fail.</p> </note> </li> </ul>"
         },
         "Tags":{
           "shape":"Tags",
@@ -1222,6 +1434,14 @@
           "shape":"ExecutionRoleName",
           "documentation":"<p>The name of the IAM execution role to use to create the stack set. If you do not specify an execution role, AWS CloudFormation uses the <code>AWSCloudFormationStackSetExecutionRole</code> role for the stack set operation.</p> <p>Specify an IAM role only if you are using customized execution roles to control which stack resources users and groups can include in their stack sets. </p>"
         },
+        "PermissionModel":{
+          "shape":"PermissionModels",
+          "documentation":"<p>Describes how the IAM roles required for stack set operations are created. By default, <code>SELF-MANAGED</code> is specified.</p> <ul> <li> <p>With <code>self-managed</code> permissions, you must create the administrator and execution roles required to deploy to target accounts. For more information, see <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/stacksets-prereqs-self-managed.html\">Grant Self-Managed Stack Set Permissions</a>.</p> </li> <li> <p>With <code>service-managed</code> permissions, StackSets automatically creates the IAM roles required to deploy to accounts managed by AWS Organizations. For more information, see <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/stacksets-prereqs-service-managed.html\">Grant Service-Managed Stack Set Permissions</a>.</p> </li> </ul>"
+        },
+        "AutoDeployment":{
+          "shape":"AutoDeployment",
+          "documentation":"<p>Describes whether StackSets automatically deploys to AWS Organizations accounts that are added to the target organization or organizational unit (OU). Specify only if <code>PermissionModel</code> is <code>SERVICE_MANAGED</code>.</p> <p>If you specify <code>AutoDeployment</code>, do not specify <code>DeploymentTargets</code> or <code>Regions</code>.</p>"
+        },
         "ClientRequestToken":{
           "shape":"ClientRequestToken",
           "documentation":"<p>A unique identifier for this <code>CreateStackSet</code> request. Specify this token if you plan to retry requests so that AWS CloudFormation knows that you're not attempting to create another stack set with the same name. You might retry <code>CreateStackSet</code> requests to ensure that AWS CloudFormation successfully received them.</p> <p>If you don't specify an operation ID, the SDK generates one automatically. </p>",
@@ -1299,7 +1519,6 @@
       "type":"structure",
       "required":[
         "StackSetName",
-        "Accounts",
         "Regions",
         "RetainStacks"
       ],
@@ -1310,7 +1529,11 @@
         },
         "Accounts":{
           "shape":"AccountList",
-          "documentation":"<p>The names of the AWS accounts that you want to delete stack instances for.</p>"
+          "documentation":"<p>[Self-managed permissions] The names of the AWS accounts that you want to delete stack instances for.</p> <p>You can specify <code>Accounts</code> or <code>DeploymentTargets</code>, but not both.</p>"
+        },
+        "DeploymentTargets":{
+          "shape":"DeploymentTargets",
+          "documentation":"<p>[<code>Service-managed</code> permissions] The AWS Organizations accounts from which to delete stack instances.</p> <p>You can specify <code>Accounts</code> or <code>DeploymentTargets</code>, but not both.</p>"
         },
         "Regions":{
           "shape":"RegionList",
@@ -1356,6 +1579,53 @@
       }
     },
     "DeletionTime":{"type":"timestamp"},
+    "DeploymentTargets":{
+      "type":"structure",
+      "members":{
+        "Accounts":{
+          "shape":"AccountList",
+          "documentation":"<p>The names of one or more AWS accounts for which you want to deploy stack set updates.</p>"
+        },
+        "OrganizationalUnitIds":{
+          "shape":"OrganizationalUnitIdList",
+          "documentation":"<p>The organization root ID or organizational unit (OUs) IDs to which StackSets deploys.</p>"
+        }
+      },
+      "documentation":"<p>[<code>Service-managed</code> permissions] The AWS Organizations accounts to which StackSets deploys.</p> <p>For update operations, you can specify either <code>Accounts</code> or <code>OrganizationalUnitIds</code>. For create and delete operations, specify <code>OrganizationalUnitIds</code>.</p>"
+    },
+    "DeprecatedStatus":{
+      "type":"string",
+      "enum":[
+        "LIVE",
+        "DEPRECATED"
+      ]
+    },
+    "DeregisterTypeInput":{
+      "type":"structure",
+      "members":{
+        "Arn":{
+          "shape":"PrivateTypeArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the type.</p> <p>Conditional: You must specify either <code>TypeName</code> and <code>Type</code>, or <code>Arn</code>.</p>"
+        },
+        "Type":{
+          "shape":"RegistryType",
+          "documentation":"<p>The kind of type.</p> <p>Currently the only valid value is <code>RESOURCE</code>.</p> <p>Conditional: You must specify either <code>TypeName</code> and <code>Type</code>, or <code>Arn</code>.</p>"
+        },
+        "TypeName":{
+          "shape":"TypeName",
+          "documentation":"<p>The name of the type.</p> <p>Conditional: You must specify either <code>TypeName</code> and <code>Type</code>, or <code>Arn</code>.</p>"
+        },
+        "VersionId":{
+          "shape":"TypeVersionId",
+          "documentation":"<p>The ID of a specific version of the type. The version ID is the value at the end of the Amazon Resource Name (ARN) assigned to the type version when it is registered.</p>"
+        }
+      }
+    },
+    "DeregisterTypeOutput":{
+      "type":"structure",
+      "members":{
+      }
+    },
     "DescribeAccountLimitsInput":{
       "type":"structure",
       "members":{
@@ -1742,6 +2012,123 @@
       },
       "documentation":"<p>The output for a <a>DescribeStacks</a> action.</p>"
     },
+    "DescribeTypeInput":{
+      "type":"structure",
+      "members":{
+        "Type":{
+          "shape":"RegistryType",
+          "documentation":"<p>The kind of type. </p> <p>Currently the only valid value is <code>RESOURCE</code>.</p> <p>Conditional: You must specify either <code>TypeName</code> and <code>Type</code>, or <code>Arn</code>.</p>"
+        },
+        "TypeName":{
+          "shape":"TypeName",
+          "documentation":"<p>The name of the type.</p> <p>Conditional: You must specify either <code>TypeName</code> and <code>Type</code>, or <code>Arn</code>.</p>"
+        },
+        "Arn":{
+          "shape":"TypeArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the type.</p> <p>Conditional: You must specify either <code>TypeName</code> and <code>Type</code>, or <code>Arn</code>.</p>"
+        },
+        "VersionId":{
+          "shape":"TypeVersionId",
+          "documentation":"<p>The ID of a specific version of the type. The version ID is the value at the end of the Amazon Resource Name (ARN) assigned to the type version when it is registered.</p> <p>If you specify a <code>VersionId</code>, <code>DescribeType</code> returns information about that specific type version. Otherwise, it returns information about the default type version.</p>"
+        }
+      }
+    },
+    "DescribeTypeOutput":{
+      "type":"structure",
+      "members":{
+        "Arn":{
+          "shape":"TypeArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the type.</p>"
+        },
+        "Type":{
+          "shape":"RegistryType",
+          "documentation":"<p>The kind of type. </p> <p>Currently the only valid value is <code>RESOURCE</code>.</p>"
+        },
+        "TypeName":{
+          "shape":"TypeName",
+          "documentation":"<p>The name of the registered type.</p>"
+        },
+        "DefaultVersionId":{
+          "shape":"TypeVersionId",
+          "documentation":"<p>The ID of the default version of the type. The default version is used when the type version is not specified.</p> <p>To set the default version of a type, use <code> <a>SetTypeDefaultVersion</a> </code>. </p>"
+        },
+        "Description":{
+          "shape":"Description",
+          "documentation":"<p>The description of the registered type.</p>"
+        },
+        "Schema":{
+          "shape":"TypeSchema",
+          "documentation":"<p>The schema that defines the type.</p> <p>For more information on type schemas, see <a href=\"https://docs.aws.amazon.com/cloudformation-cli/latest/userguide/resource-type-schema.html\">Resource Provider Schema</a> in the <i>CloudFormation CLI User Guide</i>.</p>"
+        },
+        "ProvisioningType":{
+          "shape":"ProvisioningType",
+          "documentation":"<p>The provisioning behavior of the type. AWS CloudFormation determines the provisioning type during registration, based on the types of handlers in the schema handler package submitted.</p> <p>Valid values include:</p> <ul> <li> <p> <code>FULLY_MUTABLE</code>: The type includes an update handler to process updates to the type during stack update operations.</p> </li> <li> <p> <code>IMMUTABLE</code>: The type does not include an update handler, so the type cannot be updated and must instead be replaced during stack update operations.</p> </li> <li> <p> <code>NON_PROVISIONABLE</code>: The type does not include all of the following handlers, and therefore cannot actually be provisioned.</p> <ul> <li> <p>create</p> </li> <li> <p>read</p> </li> <li> <p>delete</p> </li> </ul> </li> </ul>"
+        },
+        "DeprecatedStatus":{
+          "shape":"DeprecatedStatus",
+          "documentation":"<p>The deprecation status of the type.</p> <p>Valid values include:</p> <ul> <li> <p> <code>LIVE</code>: The type is registered and can be used in CloudFormation operations, dependent on its provisioning behavior and visibility scope.</p> </li> <li> <p> <code>DEPRECATED</code>: The type has been deregistered and can no longer be used in CloudFormation operations. </p> </li> </ul>"
+        },
+        "LoggingConfig":{
+          "shape":"LoggingConfig",
+          "documentation":"<p>Contains logging configuration information for a type.</p>"
+        },
+        "ExecutionRoleArn":{
+          "shape":"RoleArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the IAM execution role used to register the type. If your resource type calls AWS APIs in any of its handlers, you must create an <i> <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles.html\">IAM execution role</a> </i> that includes the necessary permissions to call those AWS APIs, and provision that execution role in your account. CloudFormation then assumes that execution role to provide your resource type with the appropriate credentials.</p>"
+        },
+        "Visibility":{
+          "shape":"Visibility",
+          "documentation":"<p>The scope at which the type is visible and usable in CloudFormation operations.</p> <p>Valid values include:</p> <ul> <li> <p> <code>PRIVATE</code>: The type is only visible and usable within the account in which it is registered. Currently, AWS CloudFormation marks any types you register as <code>PRIVATE</code>.</p> </li> <li> <p> <code>PUBLIC</code>: The type is publically visible and usable within any Amazon account.</p> </li> </ul>"
+        },
+        "SourceUrl":{
+          "shape":"OptionalSecureUrl",
+          "documentation":"<p>The URL of the source code for the type.</p>"
+        },
+        "DocumentationUrl":{
+          "shape":"OptionalSecureUrl",
+          "documentation":"<p>The URL of a page providing detailed documentation for this type.</p>"
+        },
+        "LastUpdated":{
+          "shape":"Timestamp",
+          "documentation":"<p>When the specified type version was registered.</p>"
+        },
+        "TimeCreated":{
+          "shape":"Timestamp",
+          "documentation":"<p>When the specified type version was registered.</p>"
+        }
+      }
+    },
+    "DescribeTypeRegistrationInput":{
+      "type":"structure",
+      "required":["RegistrationToken"],
+      "members":{
+        "RegistrationToken":{
+          "shape":"RegistrationToken",
+          "documentation":"<p>The identifier for this registration request.</p> <p>This registration token is generated by CloudFormation when you initiate a registration request using <code> <a>RegisterType</a> </code>.</p>"
+        }
+      }
+    },
+    "DescribeTypeRegistrationOutput":{
+      "type":"structure",
+      "members":{
+        "ProgressStatus":{
+          "shape":"RegistrationStatus",
+          "documentation":"<p>The current status of the type registration request.</p>"
+        },
+        "Description":{
+          "shape":"Description",
+          "documentation":"<p>The description of the type registration request.</p>"
+        },
+        "TypeArn":{
+          "shape":"TypeArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the type being registered.</p> <p>For registration requests with a <code>ProgressStatus</code> of other than <code>COMPLETE</code>, this will be <code>null</code>.</p>"
+        },
+        "TypeVersionArn":{
+          "shape":"TypeArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of this specific version of the type being registered.</p> <p>For registration requests with a <code>ProgressStatus</code> of other than <code>COMPLETE</code>, this will be <code>null</code>.</p>"
+        }
+      }
+    },
     "Description":{
       "type":"string",
       "max":1024,
@@ -1798,6 +2185,31 @@
         }
       }
     },
+    "DetectStackSetDriftInput":{
+      "type":"structure",
+      "required":["StackSetName"],
+      "members":{
+        "StackSetName":{
+          "shape":"StackSetNameOrId",
+          "documentation":"<p>The name of the stack set on which to perform the drift detection operation.</p>"
+        },
+        "OperationPreferences":{"shape":"StackSetOperationPreferences"},
+        "OperationId":{
+          "shape":"ClientRequestToken",
+          "documentation":"<p> <i>The ID of the stack set operation.</i> </p>",
+          "idempotencyToken":true
+        }
+      }
+    },
+    "DetectStackSetDriftOutput":{
+      "type":"structure",
+      "members":{
+        "OperationId":{
+          "shape":"ClientRequestToken",
+          "documentation":"<p>The ID of the drift detection stack set operation. </p> <p>you can use this operation id with <code> <a>DescribeStackSetOperation</a> </code> to monitor the progress of the drift detection operation. </p>"
+        }
+      }
+    },
     "DifferenceType":{
       "type":"string",
       "enum":[
@@ -1807,7 +2219,16 @@
       ]
     },
     "DisableRollback":{"type":"boolean"},
+    "DriftedStackInstancesCount":{
+      "type":"integer",
+      "min":0
+    },
     "EnableTerminationProtection":{"type":"boolean"},
+    "ErrorMessage":{
+      "type":"string",
+      "max":255,
+      "min":1
+    },
     "EstimateTemplateCostInput":{
       "type":"structure",
       "members":{
@@ -1910,6 +2331,10 @@
       "type":"list",
       "member":{"shape":"Export"}
     },
+    "FailedStackInstancesCount":{
+      "type":"integer",
+      "min":0
+    },
     "FailureToleranceCount":{
       "type":"integer",
       "min":0
@@ -2028,14 +2453,45 @@
         "DeclaredTransforms":{
           "shape":"TransformsList",
           "documentation":"<p>A list of the transforms that are declared in the template.</p>"
+        },
+        "ResourceIdentifierSummaries":{
+          "shape":"ResourceIdentifierSummaries",
+          "documentation":"<p>A list of resource identifier summaries that describe the target resources of an import operation and the properties you can provide during the import to identify the target resources. For example, <code>BucketName</code> is a possible identifier property for an <code>AWS::S3::Bucket</code> resource. </p>"
         }
       },
       "documentation":"<p>The output for the <a>GetTemplateSummary</a> action.</p>"
     },
+    "HandlerErrorCode":{
+      "type":"string",
+      "enum":[
+        "NotUpdatable",
+        "InvalidRequest",
+        "AccessDenied",
+        "InvalidCredentials",
+        "AlreadyExists",
+        "NotFound",
+        "ResourceConflict",
+        "Throttling",
+        "ServiceLimitExceeded",
+        "NotStabilized",
+        "GeneralServiceException",
+        "ServiceInternalError",
+        "NetworkFailure",
+        "InternalFailure"
+      ]
+    },
     "Imports":{
       "type":"list",
       "member":{"shape":"StackName"}
     },
+    "InProgressStackInstancesCount":{
+      "type":"integer",
+      "min":0
+    },
+    "InSyncStackInstancesCount":{
+      "type":"integer",
+      "min":0
+    },
     "InsufficientCapabilitiesException":{
       "type":"structure",
       "members":{
@@ -2072,6 +2528,18 @@
       },
       "exception":true
     },
+    "InvalidStateTransitionException":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>Error reserved for use by the <a href=\"https://docs.aws.amazon.com/cloudformation-cli/latest/userguide/what-is-cloudformation-cli.html\">CloudFormation CLI</a>. CloudFormation does not return this error to users.</p>",
+      "error":{
+        "code":"InvalidStateTransition",
+        "httpStatusCode":400,
+        "senderFault":true
+      },
+      "exception":true
+    },
     "Key":{"type":"string"},
     "LastUpdatedTime":{"type":"timestamp"},
     "LimitExceededException":{
@@ -2361,24 +2829,170 @@
       },
       "documentation":"<p>The output for <a>ListStacks</a> action.</p>"
     },
-    "LogicalResourceId":{"type":"string"},
-    "LogicalResourceIds":{
-      "type":"list",
-      "member":{"shape":"LogicalResourceId"},
-      "max":200,
-      "min":1
-    },
-    "MaxConcurrentCount":{
-      "type":"integer",
-      "min":1
-    },
-    "MaxConcurrentPercentage":{
-      "type":"integer",
-      "max":100,
-      "min":1
-    },
-    "MaxResults":{
-      "type":"integer",
+    "ListTypeRegistrationsInput":{
+      "type":"structure",
+      "members":{
+        "Type":{
+          "shape":"RegistryType",
+          "documentation":"<p>The kind of type.</p> <p>Currently the only valid value is <code>RESOURCE</code>.</p> <p>Conditional: You must specify either <code>TypeName</code> and <code>Type</code>, or <code>Arn</code>.</p>"
+        },
+        "TypeName":{
+          "shape":"TypeName",
+          "documentation":"<p>The name of the type.</p> <p>Conditional: You must specify either <code>TypeName</code> and <code>Type</code>, or <code>Arn</code>.</p>"
+        },
+        "TypeArn":{
+          "shape":"TypeArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the type.</p> <p>Conditional: You must specify either <code>TypeName</code> and <code>Type</code>, or <code>Arn</code>.</p>"
+        },
+        "RegistrationStatusFilter":{
+          "shape":"RegistrationStatus",
+          "documentation":"<p>The current status of the type registration request.</p> <p>The default is <code>IN_PROGRESS</code>.</p>"
+        },
+        "MaxResults":{
+          "shape":"MaxResults",
+          "documentation":"<p>The maximum number of results to be returned with a single call. If the number of available results exceeds this maximum, the response includes a <code>NextToken</code> value that you can assign to the <code>NextToken</code> request parameter to get the next set of results.</p>"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>If the previous paginated request didn't return all of the remaining results, the response object's <code>NextToken</code> parameter value is set to a token. To retrieve the next set of results, call this action again and assign that token to the request object's <code>NextToken</code> parameter. If there are no remaining results, the previous response object's <code>NextToken</code> parameter is set to <code>null</code>.</p>"
+        }
+      }
+    },
+    "ListTypeRegistrationsOutput":{
+      "type":"structure",
+      "members":{
+        "RegistrationTokenList":{
+          "shape":"RegistrationTokenList",
+          "documentation":"<p> A list of type registration tokens.</p> <p>Use <code> <a>DescribeTypeRegistration</a> </code> to return detailed information about a type registration request.</p>"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>If the request doesn't return all of the remaining results, <code>NextToken</code> is set to a token. To retrieve the next set of results, call this action again and assign that token to the request object's <code>NextToken</code> parameter. If the request returns all results, <code>NextToken</code> is set to <code>null</code>.</p>"
+        }
+      }
+    },
+    "ListTypeVersionsInput":{
+      "type":"structure",
+      "members":{
+        "Type":{
+          "shape":"RegistryType",
+          "documentation":"<p>The kind of the type.</p> <p>Currently the only valid value is <code>RESOURCE</code>.</p> <p>Conditional: You must specify either <code>TypeName</code> and <code>Type</code>, or <code>Arn</code>.</p>"
+        },
+        "TypeName":{
+          "shape":"TypeName",
+          "documentation":"<p>The name of the type for which you want version summary information.</p> <p>Conditional: You must specify either <code>TypeName</code> and <code>Type</code>, or <code>Arn</code>.</p>"
+        },
+        "Arn":{
+          "shape":"PrivateTypeArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the type for which you want version summary information.</p> <p>Conditional: You must specify either <code>TypeName</code> and <code>Type</code>, or <code>Arn</code>.</p>"
+        },
+        "MaxResults":{
+          "shape":"MaxResults",
+          "documentation":"<p>The maximum number of results to be returned with a single call. If the number of available results exceeds this maximum, the response includes a <code>NextToken</code> value that you can assign to the <code>NextToken</code> request parameter to get the next set of results.</p>"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>If the previous paginated request didn't return all of the remaining results, the response object's <code>NextToken</code> parameter value is set to a token. To retrieve the next set of results, call this action again and assign that token to the request object's <code>NextToken</code> parameter. If there are no remaining results, the previous response object's <code>NextToken</code> parameter is set to <code>null</code>.</p>"
+        },
+        "DeprecatedStatus":{
+          "shape":"DeprecatedStatus",
+          "documentation":"<p>The deprecation status of the type versions that you want to get summary information about.</p> <p>Valid values include:</p> <ul> <li> <p> <code>LIVE</code>: The type version is registered and can be used in CloudFormation operations, dependent on its provisioning behavior and visibility scope.</p> </li> <li> <p> <code>DEPRECATED</code>: The type version has been deregistered and can no longer be used in CloudFormation operations. </p> </li> </ul> <p>The default is <code>LIVE</code>.</p>"
+        }
+      }
+    },
+    "ListTypeVersionsOutput":{
+      "type":"structure",
+      "members":{
+        "TypeVersionSummaries":{
+          "shape":"TypeVersionSummaries",
+          "documentation":"<p>A list of <code>TypeVersionSummary</code> structures that contain information about the specified type's versions.</p>"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>If the request doesn't return all of the remaining results, <code>NextToken</code> is set to a token. To retrieve the next set of results, call this action again and assign that token to the request object's <code>NextToken</code> parameter. If the request returns all results, <code>NextToken</code> is set to <code>null</code>.</p>"
+        }
+      }
+    },
+    "ListTypesInput":{
+      "type":"structure",
+      "members":{
+        "Visibility":{
+          "shape":"Visibility",
+          "documentation":"<p>The scope at which the type is visible and usable in CloudFormation operations.</p> <p>Valid values include:</p> <ul> <li> <p> <code>PRIVATE</code>: The type is only visible and usable within the account in which it is registered. Currently, AWS CloudFormation marks any types you create as <code>PRIVATE</code>.</p> </li> <li> <p> <code>PUBLIC</code>: The type is publically visible and usable within any Amazon account.</p> </li> </ul> <p>The default is <code>PRIVATE</code>.</p>"
+        },
+        "ProvisioningType":{
+          "shape":"ProvisioningType",
+          "documentation":"<p>The provisioning behavior of the type. AWS CloudFormation determines the provisioning type during registration, based on the types of handlers in the schema handler package submitted.</p> <p>Valid values include:</p> <ul> <li> <p> <code>FULLY_MUTABLE</code>: The type includes an update handler to process updates to the type during stack update operations.</p> </li> <li> <p> <code>IMMUTABLE</code>: The type does not include an update handler, so the type cannot be updated and must instead be replaced during stack update operations.</p> </li> <li> <p> <code>NON_PROVISIONABLE</code>: The type does not include create, read, and delete handlers, and therefore cannot actually be provisioned.</p> </li> </ul>"
+        },
+        "DeprecatedStatus":{
+          "shape":"DeprecatedStatus",
+          "documentation":"<p>The deprecation status of the types that you want to get summary information about.</p> <p>Valid values include:</p> <ul> <li> <p> <code>LIVE</code>: The type is registered for use in CloudFormation operations.</p> </li> <li> <p> <code>DEPRECATED</code>: The type has been deregistered and can no longer be used in CloudFormation operations. </p> </li> </ul>"
+        },
+        "MaxResults":{
+          "shape":"MaxResults",
+          "documentation":"<p>The maximum number of results to be returned with a single call. If the number of available results exceeds this maximum, the response includes a <code>NextToken</code> value that you can assign to the <code>NextToken</code> request parameter to get the next set of results.</p>"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>If the previous paginated request didn't return all of the remaining results, the response object's <code>NextToken</code> parameter value is set to a token. To retrieve the next set of results, call this action again and assign that token to the request object's <code>NextToken</code> parameter. If there are no remaining results, the previous response object's <code>NextToken</code> parameter is set to <code>null</code>.</p>"
+        }
+      }
+    },
+    "ListTypesOutput":{
+      "type":"structure",
+      "members":{
+        "TypeSummaries":{
+          "shape":"TypeSummaries",
+          "documentation":"<p>A list of <code>TypeSummary</code> structures that contain information about the specified types.</p>"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>If the request doesn't return all of the remaining results, <code>NextToken</code> is set to a token. To retrieve the next set of results, call this action again and assign that token to the request object's <code>NextToken</code> parameter. If the request returns all results, <code>NextToken</code> is set to <code>null</code>.</p>"
+        }
+      }
+    },
+    "LogGroupName":{
+      "type":"string",
+      "max":512,
+      "min":1,
+      "pattern":"[\\.\\-_/#A-Za-z0-9]+"
+    },
+    "LoggingConfig":{
+      "type":"structure",
+      "required":[
+        "LogRoleArn",
+        "LogGroupName"
+      ],
+      "members":{
+        "LogRoleArn":{
+          "shape":"RoleArn",
+          "documentation":"<p>The ARN of the role that CloudFormation should assume when sending log entries to CloudWatch logs.</p>"
+        },
+        "LogGroupName":{
+          "shape":"LogGroupName",
+          "documentation":"<p>The Amazon CloudWatch log group to which CloudFormation sends error logging information when invoking the type's handlers.</p>"
+        }
+      },
+      "documentation":"<p>Contains logging configuration information for a type.</p>"
+    },
+    "LogicalResourceId":{"type":"string"},
+    "LogicalResourceIds":{
+      "type":"list",
+      "member":{"shape":"LogicalResourceId"},
+      "max":200,
+      "min":1
+    },
+    "MaxConcurrentCount":{
+      "type":"integer",
+      "min":1
+    },
+    "MaxConcurrentPercentage":{
+      "type":"integer",
+      "max":100,
+      "min":1
+    },
+    "MaxResults":{
+      "type":"integer",
       "max":100,
       "min":1
     },
@@ -2456,6 +3070,39 @@
       },
       "exception":true
     },
+    "OperationStatus":{
+      "type":"string",
+      "enum":[
+        "PENDING",
+        "IN_PROGRESS",
+        "SUCCESS",
+        "FAILED"
+      ]
+    },
+    "OperationStatusCheckFailedException":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>Error reserved for use by the <a href=\"https://docs.aws.amazon.com/cloudformation-cli/latest/userguide/what-is-cloudformation-cli.html\">CloudFormation CLI</a>. CloudFormation does not return this error to users.</p>",
+      "error":{
+        "code":"ConditionalCheckFailed",
+        "httpStatusCode":400,
+        "senderFault":true
+      },
+      "exception":true
+    },
+    "OptionalSecureUrl":{
+      "type":"string",
+      "max":4096
+    },
+    "OrganizationalUnitId":{
+      "type":"string",
+      "pattern":"^(ou-[a-z0-9]{4,32}-[a-z0-9]{8,32}|r-[a-z0-9]{4,32})$"
+    },
+    "OrganizationalUnitIdList":{
+      "type":"list",
+      "member":{"shape":"OrganizationalUnitId"}
+    },
     "Output":{
       "type":"structure",
       "members":{
@@ -2557,6 +3204,13 @@
       "type":"list",
       "member":{"shape":"Parameter"}
     },
+    "PermissionModels":{
+      "type":"string",
+      "enum":[
+        "SERVICE_MANAGED",
+        "SELF_MANAGED"
+      ]
+    },
     "PhysicalResourceId":{"type":"string"},
     "PhysicalResourceIdContext":{
       "type":"list",
@@ -2581,6 +3235,11 @@
       },
       "documentation":"<p>Context information that enables AWS CloudFormation to uniquely identify a resource. AWS CloudFormation uses context key-value pairs in cases where a resource's logical and physical IDs are not enough to uniquely identify that resource. Each context key-value pair specifies a resource that contains the targeted resource.</p>"
     },
+    "PrivateTypeArn":{
+      "type":"string",
+      "max":1024,
+      "pattern":"arn:aws[A-Za-z0-9-]{0,64}:cloudformation:[A-Za-z0-9-]{1,64}:[0-9]{12}:type/.+"
+    },
     "Properties":{"type":"string"},
     "PropertyDifference":{
       "type":"structure",
@@ -2617,12 +3276,129 @@
     "PropertyName":{"type":"string"},
     "PropertyPath":{"type":"string"},
     "PropertyValue":{"type":"string"},
+    "ProvisioningType":{
+      "type":"string",
+      "enum":[
+        "NON_PROVISIONABLE",
+        "IMMUTABLE",
+        "FULLY_MUTABLE"
+      ]
+    },
     "Reason":{"type":"string"},
-    "Region":{"type":"string"},
+    "RecordHandlerProgressInput":{
+      "type":"structure",
+      "required":[
+        "BearerToken",
+        "OperationStatus"
+      ],
+      "members":{
+        "BearerToken":{
+          "shape":"ClientToken",
+          "documentation":"<p>Reserved for use by the <a href=\"https://docs.aws.amazon.com/cloudformation-cli/latest/userguide/what-is-cloudformation-cli.html\">CloudFormation CLI</a>.</p>"
+        },
+        "OperationStatus":{
+          "shape":"OperationStatus",
+          "documentation":"<p>Reserved for use by the <a href=\"https://docs.aws.amazon.com/cloudformation-cli/latest/userguide/what-is-cloudformation-cli.html\">CloudFormation CLI</a>.</p>"
+        },
+        "CurrentOperationStatus":{
+          "shape":"OperationStatus",
+          "documentation":"<p>Reserved for use by the <a href=\"https://docs.aws.amazon.com/cloudformation-cli/latest/userguide/what-is-cloudformation-cli.html\">CloudFormation CLI</a>.</p>"
+        },
+        "StatusMessage":{
+          "shape":"StatusMessage",
+          "documentation":"<p>Reserved for use by the <a href=\"https://docs.aws.amazon.com/cloudformation-cli/latest/userguide/what-is-cloudformation-cli.html\">CloudFormation CLI</a>.</p>"
+        },
+        "ErrorCode":{
+          "shape":"HandlerErrorCode",
+          "documentation":"<p>Reserved for use by the <a href=\"https://docs.aws.amazon.com/cloudformation-cli/latest/userguide/what-is-cloudformation-cli.html\">CloudFormation CLI</a>.</p>"
+        },
+        "ResourceModel":{
+          "shape":"ResourceModel",
+          "documentation":"<p>Reserved for use by the <a href=\"https://docs.aws.amazon.com/cloudformation-cli/latest/userguide/what-is-cloudformation-cli.html\">CloudFormation CLI</a>.</p>"
+        },
+        "ClientRequestToken":{
+          "shape":"ClientRequestToken",
+          "documentation":"<p>Reserved for use by the <a href=\"https://docs.aws.amazon.com/cloudformation-cli/latest/userguide/what-is-cloudformation-cli.html\">CloudFormation CLI</a>.</p>"
+        }
+      }
+    },
+    "RecordHandlerProgressOutput":{
+      "type":"structure",
+      "members":{
+      }
+    },
+    "Region":{
+      "type":"string",
+      "pattern":"^[a-zA-Z0-9-]{1,128}$"
+    },
     "RegionList":{
       "type":"list",
       "member":{"shape":"Region"}
     },
+    "RegisterTypeInput":{
+      "type":"structure",
+      "required":[
+        "TypeName",
+        "SchemaHandlerPackage"
+      ],
+      "members":{
+        "Type":{
+          "shape":"RegistryType",
+          "documentation":"<p>The kind of type.</p> <p>Currently, the only valid value is <code>RESOURCE</code>.</p>"
+        },
+        "TypeName":{
+          "shape":"TypeName",
+          "documentation":"<p>The name of the type being registered.</p> <p>We recommend that type names adhere to the following pattern: <i>company_or_organization</i>::<i>service</i>::<i>type</i>.</p> <note> <p>The following organization namespaces are reserved and cannot be used in your resource type names:</p> <ul> <li> <p> <code>Alexa</code> </p> </li> <li> <p> <code>AMZN</code> </p> </li> <li> <p> <code>Amazon</code> </p> </li> <li> <p> <code>AWS</code> </p> </li> <li> <p> <code>Custom</code> </p> </li> <li> <p> <code>Dev</code> </p> </li> </ul> </note>"
+        },
+        "SchemaHandlerPackage":{
+          "shape":"S3Url",
+          "documentation":"<p>A url to the S3 bucket containing the schema handler package that contains the schema, event handlers, and associated files for the type you want to register.</p> <p>For information on generating a schema handler package for the type you want to register, see <a href=\"https://docs.aws.amazon.com/cloudformation-cli/latest/userguide/resource-type-cli-submit.html\">submit</a> in the <i>CloudFormation CLI User Guide</i>.</p> <note> <p>As part of registering a resource provider type, CloudFormation must be able to access the S3 bucket which contains the schema handler package for that resource provider. For more information, see <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/registry.html#registry-register-permissions\">IAM Permissions for Registering a Resource Provider</a> in the <i>AWS CloudFormation User Guide</i>.</p> </note>"
+        },
+        "LoggingConfig":{
+          "shape":"LoggingConfig",
+          "documentation":"<p>Specifies logging configuration information for a type.</p>"
+        },
+        "ExecutionRoleArn":{
+          "shape":"RoleArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the IAM execution role to use to register the type. If your resource type calls AWS APIs in any of its handlers, you must create an <i> <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles.html\">IAM execution role</a> </i> that includes the necessary permissions to call those AWS APIs, and provision that execution role in your account. CloudFormation then assumes that execution role to provide your resource type with the appropriate credentials.</p>"
+        },
+        "ClientRequestToken":{
+          "shape":"RequestToken",
+          "documentation":"<p>A unique identifier that acts as an idempotency key for this registration request. Specifying a client request token prevents CloudFormation from generating more than one version of a type from the same registeration request, even if the request is submitted multiple times. </p>"
+        }
+      }
+    },
+    "RegisterTypeOutput":{
+      "type":"structure",
+      "members":{
+        "RegistrationToken":{
+          "shape":"RegistrationToken",
+          "documentation":"<p>The identifier for this registration request.</p> <p>Use this registration token when calling <code> <a>DescribeTypeRegistration</a> </code>, which returns information about the status and IDs of the type registration. </p>"
+        }
+      }
+    },
+    "RegistrationStatus":{
+      "type":"string",
+      "enum":[
+        "COMPLETE",
+        "IN_PROGRESS",
+        "FAILED"
+      ]
+    },
+    "RegistrationToken":{
+      "type":"string",
+      "max":128,
+      "min":1,
+      "pattern":"[a-zA-Z0-9][-a-zA-Z0-9]*"
+    },
+    "RegistrationTokenList":{
+      "type":"list",
+      "member":{"shape":"RegistrationToken"}
+    },
+    "RegistryType":{
+      "type":"string",
+      "enum":["RESOURCE"]
+    },
     "Replacement":{
       "type":"string",
       "enum":[
@@ -2631,6 +3407,12 @@
         "Conditional"
       ]
     },
+    "RequestToken":{
+      "type":"string",
+      "max":128,
+      "min":1,
+      "pattern":"[a-zA-Z0-9][-a-zA-Z0-9]*"
+    },
     "RequiresRecreation":{
       "type":"string",
       "enum":[
@@ -2710,6 +3492,54 @@
       "type":"list",
       "member":{"shape":"ResourceChangeDetail"}
     },
+    "ResourceIdentifierProperties":{
+      "type":"map",
+      "key":{"shape":"ResourceIdentifierPropertyKey"},
+      "value":{"shape":"ResourceIdentifierPropertyValue"},
+      "max":256,
+      "min":1
+    },
+    "ResourceIdentifierPropertyKey":{
+      "type":"string",
+      "max":2048,
+      "min":1
+    },
+    "ResourceIdentifierPropertyValue":{
+      "type":"string",
+      "max":2048,
+      "min":1
+    },
+    "ResourceIdentifierSummaries":{
+      "type":"list",
+      "member":{"shape":"ResourceIdentifierSummary"}
+    },
+    "ResourceIdentifierSummary":{
+      "type":"structure",
+      "members":{
+        "ResourceType":{
+          "shape":"ResourceType",
+          "documentation":"<p>The template resource type of the target resources, such as <code>AWS::S3::Bucket</code>.</p>"
+        },
+        "LogicalResourceIds":{
+          "shape":"LogicalResourceIds",
+          "documentation":"<p>The logical IDs of the target resources of the specified <code>ResourceType</code>, as defined in the import template.</p>"
+        },
+        "ResourceIdentifiers":{
+          "shape":"ResourceIdentifiers",
+          "documentation":"<p>The resource properties you can provide during the import to identify your target resources. For example, <code>BucketName</code> is a possible identifier property for <code>AWS::S3::Bucket</code> resources.</p>"
+        }
+      },
+      "documentation":"<p>Describes the target resources of a specific type in your import template (for example, all <code>AWS::S3::Bucket</code> resources) and the properties you can provide during the import to identify resources of that type.</p>"
+    },
+    "ResourceIdentifiers":{
+      "type":"list",
+      "member":{"shape":"ResourceIdentifierPropertyKey"}
+    },
+    "ResourceModel":{
+      "type":"string",
+      "max":16384,
+      "min":1
+    },
     "ResourceProperties":{"type":"string"},
     "ResourceSignalStatus":{
       "type":"string",
@@ -2735,7 +3565,13 @@
         "DELETE_SKIPPED",
         "UPDATE_IN_PROGRESS",
         "UPDATE_FAILED",
-        "UPDATE_COMPLETE"
+        "UPDATE_COMPLETE",
+        "IMPORT_FAILED",
+        "IMPORT_COMPLETE",
+        "IMPORT_IN_PROGRESS",
+        "IMPORT_ROLLBACK_IN_PROGRESS",
+        "IMPORT_ROLLBACK_FAILED",
+        "IMPORT_ROLLBACK_COMPLETE"
       ]
     },
     "ResourceStatusReason":{"type":"string"},
@@ -2757,6 +3593,29 @@
       },
       "documentation":"<p>The field that AWS CloudFormation will change, such as the name of a resource's property, and whether the resource will be recreated.</p>"
     },
+    "ResourceToImport":{
+      "type":"structure",
+      "required":[
+        "ResourceType",
+        "LogicalResourceId",
+        "ResourceIdentifier"
+      ],
+      "members":{
+        "ResourceType":{
+          "shape":"ResourceType",
+          "documentation":"<p>The type of resource to import into your stack, such as <code>AWS::S3::Bucket</code>. </p>"
+        },
+        "LogicalResourceId":{
+          "shape":"LogicalResourceId",
+          "documentation":"<p>The logical ID of the target resource as specified in the template.</p>"
+        },
+        "ResourceIdentifier":{
+          "shape":"ResourceIdentifierProperties",
+          "documentation":"<p>A key-value pair that identifies the target resource. The key is an identifier property (for example, <code>BucketName</code> for <code>AWS::S3::Bucket</code> resources) and the value is the actual property value (for example, <code>MyS3Bucket</code>).</p>"
+        }
+      },
+      "documentation":"<p>Describes the target resource of an import operation.</p>"
+    },
     "ResourceToSkip":{
       "type":"string",
       "pattern":"[a-zA-Z0-9]+|[a-zA-Z][-a-zA-Z0-9]*\\.[a-zA-Z0-9]+"
@@ -2770,6 +3629,11 @@
       "type":"list",
       "member":{"shape":"ResourceType"}
     },
+    "ResourcesToImport":{
+      "type":"list",
+      "member":{"shape":"ResourceToImport"},
+      "max":200
+    },
     "ResourcesToSkip":{
       "type":"list",
       "member":{"shape":"ResourceToSkip"}
@@ -2780,11 +3644,18 @@
     },
     "RetainStacks":{"type":"boolean"},
     "RetainStacksNullable":{"type":"boolean"},
+    "RetainStacksOnAccountRemovalNullable":{"type":"boolean"},
     "RoleARN":{
       "type":"string",
       "max":2048,
       "min":20
     },
+    "RoleArn":{
+      "type":"string",
+      "max":256,
+      "min":1,
+      "pattern":"arn:.+:iam::[0-9]{12}:role/.+"
+    },
     "RollbackConfiguration":{
       "type":"structure",
       "members":{
@@ -2822,6 +3693,11 @@
       "member":{"shape":"RollbackTrigger"},
       "max":5
     },
+    "S3Url":{
+      "type":"string",
+      "max":4096,
+      "min":1
+    },
     "Scope":{
       "type":"list",
       "member":{"shape":"ResourceAttribute"}
@@ -2845,6 +3721,32 @@
       },
       "documentation":"<p>The input for the <a>SetStackPolicy</a> action.</p>"
     },
+    "SetTypeDefaultVersionInput":{
+      "type":"structure",
+      "members":{
+        "Arn":{
+          "shape":"PrivateTypeArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the type for which you want version summary information.</p> <p>Conditional: You must specify either <code>TypeName</code> and <code>Type</code>, or <code>Arn</code>.</p>"
+        },
+        "Type":{
+          "shape":"RegistryType",
+          "documentation":"<p>The kind of type.</p> <p>Conditional: You must specify either <code>TypeName</code> and <code>Type</code>, or <code>Arn</code>.</p>"
+        },
+        "TypeName":{
+          "shape":"TypeName",
+          "documentation":"<p>The name of the type.</p> <p>Conditional: You must specify either <code>TypeName</code> and <code>Type</code>, or <code>Arn</code>.</p>"
+        },
+        "VersionId":{
+          "shape":"TypeVersionId",
+          "documentation":"<p>The ID of a specific version of the type. The version ID is the value at the end of the Amazon Resource Name (ARN) assigned to the type version when it is registered.</p>"
+        }
+      }
+    },
+    "SetTypeDefaultVersionOutput":{
+      "type":"structure",
+      "members":{
+      }
+    },
     "SignalResourceInput":{
       "type":"structure",
       "required":[
@@ -2963,7 +3865,7 @@
         },
         "RootId":{
           "shape":"StackId",
-          "documentation":"<p>For nested stacks--stacks created as resources for another stack--the stack ID of the the top-level stack to which the nested stack ultimately belongs.</p> <p>For more information, see <a href=\"http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/using-cfn-nested-stacks.html\">Working with Nested Stacks</a> in the <i>AWS CloudFormation User Guide</i>.</p>"
+          "documentation":"<p>For nested stacks--stacks created as resources for another stack--the stack ID of the top-level stack to which the nested stack ultimately belongs.</p> <p>For more information, see <a href=\"http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/using-cfn-nested-stacks.html\">Working with Nested Stacks</a> in the <i>AWS CloudFormation User Guide</i>.</p>"
         },
         "DriftInformation":{
           "shape":"StackDriftInformation",
@@ -3099,7 +4001,7 @@
         },
         "Account":{
           "shape":"Account",
-          "documentation":"<p>The name of the AWS account that the stack instance is associated with.</p>"
+          "documentation":"<p>[Self-managed permissions] The name of the AWS account that the stack instance is associated with.</p>"
         },
         "StackId":{
           "shape":"StackId",
@@ -3116,6 +4018,18 @@
         "StatusReason":{
           "shape":"Reason",
           "documentation":"<p>The explanation for the specific status code that is assigned to this stack instance.</p>"
+        },
+        "OrganizationalUnitId":{
+          "shape":"OrganizationalUnitId",
+          "documentation":"<p>[<code>Service-managed</code> permissions] The organization root ID or organizational unit (OU) ID that the stack instance is associated with.</p>"
+        },
+        "DriftStatus":{
+          "shape":"StackDriftStatus",
+          "documentation":"<p>Status of the stack instance's actual configuration compared to the expected template and parameter configuration of the stack set to which it belongs. </p> <ul> <li> <p> <code>DRIFTED</code>: The stack differs from the expected template and parameter configuration of the stack set to which it belongs. A stack instance is considered to have drifted if one or more of the resources in the associated stack have drifted.</p> </li> <li> <p> <code>NOT_CHECKED</code>: AWS CloudFormation has not checked if the stack instance differs from its expected stack set configuration.</p> </li> <li> <p> <code>IN_SYNC</code>: The stack instance's actual configuration matches its expected stack set configuration.</p> </li> <li> <p> <code>UNKNOWN</code>: This value is reserved for future use.</p> </li> </ul>"
+        },
+        "LastDriftCheckTimestamp":{
+          "shape":"Timestamp",
+          "documentation":"<p>Most recent time when CloudFormation performed a drift detection operation on the stack instance. This value will be <code>NULL</code> for any stack instance on which drift detection has not yet been performed.</p>"
         }
       },
       "documentation":"<p>An AWS CloudFormation stack, in a specific account and region, that's part of a stack set operation. A stack instance is a reference to an attempted or actual stack in a given account within a given region. A stack instance can exist without a stack—for example, if the stack couldn't be created for some reason. A stack instance is associated with only one stack set. Each stack instance contains the ID of its associated stack set, as well as the ID of the actual stack and the stack status.</p>"
@@ -3157,7 +4071,7 @@
         },
         "Account":{
           "shape":"Account",
-          "documentation":"<p>The name of the AWS account that the stack instance is associated with.</p>"
+          "documentation":"<p>[Self-managed permissions] The name of the AWS account that the stack instance is associated with.</p>"
         },
         "StackId":{
           "shape":"StackId",
@@ -3170,6 +4084,18 @@
         "StatusReason":{
           "shape":"Reason",
           "documentation":"<p>The explanation for the specific status code assigned to this stack instance.</p>"
+        },
+        "OrganizationalUnitId":{
+          "shape":"OrganizationalUnitId",
+          "documentation":"<p>[<code>Service-managed</code> permissions] The organization root ID or organizational unit (OU) ID that the stack instance is associated with.</p>"
+        },
+        "DriftStatus":{
+          "shape":"StackDriftStatus",
+          "documentation":"<p>Status of the stack instance's actual configuration compared to the expected template and parameter configuration of the stack set to which it belongs. </p> <ul> <li> <p> <code>DRIFTED</code>: The stack differs from the expected template and parameter configuration of the stack set to which it belongs. A stack instance is considered to have drifted if one or more of the resources in the associated stack have drifted.</p> </li> <li> <p> <code>NOT_CHECKED</code>: AWS CloudFormation has not checked if the stack instance differs from its expected stack set configuration.</p> </li> <li> <p> <code>IN_SYNC</code>: The stack instance's actual configuration matches its expected stack set configuration.</p> </li> <li> <p> <code>UNKNOWN</code>: This value is reserved for future use.</p> </li> </ul>"
+        },
+        "LastDriftCheckTimestamp":{
+          "shape":"Timestamp",
+          "documentation":"<p>Most recent time when CloudFormation performed a drift detection operation on the stack instance. This value will be <code>NULL</code> for any stack instance on which drift detection has not yet been performed.</p>"
         }
       },
       "documentation":"<p>The structure that contains summary information about a stack instance.</p>"
@@ -3504,11 +4430,83 @@
         "ExecutionRoleName":{
           "shape":"ExecutionRoleName",
           "documentation":"<p>The name of the IAM execution role used to create or update the stack set. </p> <p>Use customized execution roles to control which stack resources users and groups can include in their stack sets. </p>"
+        },
+        "StackSetDriftDetectionDetails":{
+          "shape":"StackSetDriftDetectionDetails",
+          "documentation":"<p>Detailed information about the drift status of the stack set.</p> <p>For stack sets, contains information about the last <i>completed</i> drift operation performed on the stack set. Information about drift operations currently in progress is not included.</p>"
+        },
+        "AutoDeployment":{
+          "shape":"AutoDeployment",
+          "documentation":"<p>[<code>Service-managed</code> permissions] Describes whether StackSets automatically deploys to AWS Organizations accounts that are added to a target organization or organizational unit (OU).</p>"
+        },
+        "PermissionModel":{
+          "shape":"PermissionModels",
+          "documentation":"<p>Describes how the IAM roles required for stack set operations are created.</p> <ul> <li> <p>With <code>self-managed</code> permissions, you must create the administrator and execution roles required to deploy to target accounts. For more information, see <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/stacksets-prereqs-self-managed.html\">Grant Self-Managed Stack Set Permissions</a>.</p> </li> <li> <p>With <code>service-managed</code> permissions, StackSets automatically creates the IAM roles required to deploy to accounts managed by AWS Organizations. For more information, see <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/stacksets-prereqs-service-managed.html\">Grant Service-Managed Stack Set Permissions</a>.</p> </li> </ul>"
+        },
+        "OrganizationalUnitIds":{
+          "shape":"OrganizationalUnitIdList",
+          "documentation":"<p>[<code>Service-managed</code> permissions] The organization root ID or organizational unit (OUs) IDs to which stacks in your stack set have been deployed.</p>"
         }
       },
       "documentation":"<p>A structure that contains information about a stack set. A stack set enables you to provision stacks into AWS accounts and across regions by using a single CloudFormation template. In the stack set, you specify the template to use, as well as any parameters and capabilities that the template requires. </p>"
     },
     "StackSetARN":{"type":"string"},
+    "StackSetDriftDetectionDetails":{
+      "type":"structure",
+      "members":{
+        "DriftStatus":{
+          "shape":"StackSetDriftStatus",
+          "documentation":"<p>Status of the stack set's actual configuration compared to its expected template and parameter configuration. A stack set is considered to have drifted if one or more of its stack instances have drifted from their expected template and parameter configuration.</p> <ul> <li> <p> <code>DRIFTED</code>: One or more of the stack instances belonging to the stack set stack differs from the expected template and parameter configuration. A stack instance is considered to have drifted if one or more of the resources in the associated stack have drifted.</p> </li> <li> <p> <code>NOT_CHECKED</code>: AWS CloudFormation has not checked the stack set for drift.</p> </li> <li> <p> <code>IN_SYNC</code>: All of the stack instances belonging to the stack set stack match from the expected template and parameter configuration.</p> </li> </ul>"
+        },
+        "DriftDetectionStatus":{
+          "shape":"StackSetDriftDetectionStatus",
+          "documentation":"<p>The status of the stack set drift detection operation.</p> <ul> <li> <p> <code>COMPLETED</code>: The drift detection operation completed without failing on any stack instances.</p> </li> <li> <p> <code>FAILED</code>: The drift detection operation exceeded the specified failure tolerance. </p> </li> <li> <p> <code>PARTIAL_SUCCESS</code>: The drift detection operation completed without exceeding the failure tolerance for the operation.</p> </li> <li> <p> <code>IN_PROGRESS</code>: The drift detection operation is currently being performed.</p> </li> <li> <p> <code>STOPPED</code>: The user has cancelled the drift detection operation.</p> </li> </ul>"
+        },
+        "LastDriftCheckTimestamp":{
+          "shape":"Timestamp",
+          "documentation":"<p>Most recent time when CloudFormation performed a drift detection operation on the stack set. This value will be <code>NULL</code> for any stack set on which drift detection has not yet been performed.</p>"
+        },
+        "TotalStackInstancesCount":{
+          "shape":"TotalStackInstancesCount",
+          "documentation":"<p>The total number of stack instances belonging to this stack set. </p> <p>The total number of stack instances is equal to the total of:</p> <ul> <li> <p>Stack instances that match the stack set configuration. </p> </li> <li> <p>Stack instances that have drifted from the stack set configuration. </p> </li> <li> <p>Stack instances where the drift detection operation has failed.</p> </li> <li> <p>Stack instances currently being checked for drift.</p> </li> </ul>"
+        },
+        "DriftedStackInstancesCount":{
+          "shape":"DriftedStackInstancesCount",
+          "documentation":"<p>The number of stack instances that have drifted from the expected template and parameter configuration of the stack set. A stack instance is considered to have drifted if one or more of the resources in the associated stack do not match their expected configuration.</p>"
+        },
+        "InSyncStackInstancesCount":{
+          "shape":"InSyncStackInstancesCount",
+          "documentation":"<p>The number of stack instances which match the expected template and parameter configuration of the stack set.</p>"
+        },
+        "InProgressStackInstancesCount":{
+          "shape":"InProgressStackInstancesCount",
+          "documentation":"<p>The number of stack instances that are currently being checked for drift.</p>"
+        },
+        "FailedStackInstancesCount":{
+          "shape":"FailedStackInstancesCount",
+          "documentation":"<p>The number of stack instances for which the drift detection operation failed.</p>"
+        }
+      },
+      "documentation":"<p>Detailed information about the drift status of the stack set.</p> <p>For stack sets, contains information about the last <i>completed</i> drift operation performed on the stack set. Information about drift operations in-progress is not included. </p> <p>For stack set operations, includes information about drift operations currently being performed on the stack set.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/stacksets-drift.html\">Detecting Unmanaged Changes in Stack Sets</a> in the <i>AWS CloudFormation User Guide</i>.</p>"
+    },
+    "StackSetDriftDetectionStatus":{
+      "type":"string",
+      "enum":[
+        "COMPLETED",
+        "FAILED",
+        "PARTIAL_SUCCESS",
+        "IN_PROGRESS",
+        "STOPPED"
+      ]
+    },
+    "StackSetDriftStatus":{
+      "type":"string",
+      "enum":[
+        "DRIFTED",
+        "IN_SYNC",
+        "NOT_CHECKED"
+      ]
+    },
     "StackSetId":{"type":"string"},
     "StackSetName":{"type":"string"},
     "StackSetNameOrId":{
@@ -3556,7 +4554,7 @@
         },
         "Status":{
           "shape":"StackSetOperationStatus",
-          "documentation":"<p>The status of the operation. </p> <ul> <li> <p> <code>FAILED</code>: The operation exceeded the specified failure tolerance. The failure tolerance value that you've set for an operation is applied for each region during stack create and update operations. If the number of failed stacks within a region exceeds the failure tolerance, the status of the operation in the region is set to <code>FAILED</code>. This in turn sets the status of the operation as a whole to <code>FAILED</code>, and AWS CloudFormation cancels the operation in any remaining regions.</p> </li> <li> <p> <code>RUNNING</code>: The operation is currently being performed.</p> </li> <li> <p> <code>STOPPED</code>: The user has cancelled the operation.</p> </li> <li> <p> <code>STOPPING</code>: The operation is in the process of stopping, at user request. </p> </li> <li> <p> <code>SUCCEEDED</code>: The operation completed creating or updating all the specified stacks without exceeding the failure tolerance for the operation.</p> </li> </ul>"
+          "documentation":"<p>The status of the operation. </p> <ul> <li> <p> <code>FAILED</code>: The operation exceeded the specified failure tolerance. The failure tolerance value that you've set for an operation is applied for each region during stack create and update operations. If the number of failed stacks within a region exceeds the failure tolerance, the status of the operation in the region is set to <code>FAILED</code>. This in turn sets the status of the operation as a whole to <code>FAILED</code>, and AWS CloudFormation cancels the operation in any remaining regions.</p> </li> <li> <p> <code>QUEUED</code>: [Service-managed permissions] For automatic deployments that require a sequence of operations. The operation is queued to be performed. For more information, see the <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/stacksets-concepts.html#stackset-status-codes\">stack set operation status codes</a> in the AWS CloudFormation User Guide.</p> </li> <li> <p> <code>RUNNING</code>: The operation is currently being performed.</p> </li> <li> <p> <code>STOPPED</code>: The user has cancelled the operation.</p> </li> <li> <p> <code>STOPPING</code>: The operation is in the process of stopping, at user request. </p> </li> <li> <p> <code>SUCCEEDED</code>: The operation completed creating or updating all the specified stacks without exceeding the failure tolerance for the operation.</p> </li> </ul>"
         },
         "OperationPreferences":{
           "shape":"StackSetOperationPreferences",
@@ -3581,6 +4579,14 @@
         "EndTimestamp":{
           "shape":"Timestamp",
           "documentation":"<p>The time at which the stack set operation ended, across all accounts and regions specified. Note that this doesn't necessarily mean that the stack set operation was successful, or even attempted, in each account or region.</p>"
+        },
+        "DeploymentTargets":{
+          "shape":"DeploymentTargets",
+          "documentation":"<p>[<code>Service-managed</code> permissions] The AWS Organizations accounts affected by the stack operation.</p>"
+        },
+        "StackSetDriftDetectionDetails":{
+          "shape":"StackSetDriftDetectionDetails",
+          "documentation":"<p>Detailed information about the drift status of the stack set. This includes information about drift operations currently being performed on the stack set.</p> <p>this information will only be present for stack set operations whose <code>Action</code> type is <code>DETECT_DRIFT</code>.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/stacksets-drift.html\">Detecting Unmanaged Changes in Stack Sets</a> in the AWS CloudFormation User Guide.</p>"
         }
       },
       "documentation":"<p>The structure that contains information about a stack set operation. </p>"
@@ -3590,7 +4596,8 @@
       "enum":[
         "CREATE",
         "UPDATE",
-        "DELETE"
+        "DELETE",
+        "DETECT_DRIFT"
       ]
     },
     "StackSetOperationPreferences":{
@@ -3638,7 +4645,7 @@
       "members":{
         "Account":{
           "shape":"Account",
-          "documentation":"<p>The name of the AWS account for this operation result.</p>"
+          "documentation":"<p>[Self-managed permissions] The name of the AWS account for this operation result.</p>"
         },
         "Region":{
           "shape":"Region",
@@ -3655,6 +4662,10 @@
         "AccountGateResult":{
           "shape":"AccountGateResult",
           "documentation":"<p>The results of the account gate function AWS CloudFormation invokes, if present, before proceeding with stack set operations in an account</p>"
+        },
+        "OrganizationalUnitId":{
+          "shape":"OrganizationalUnitId",
+          "documentation":"<p>[<code>Service-managed</code> permissions] The organization root ID or organizational unit (OU) ID for this operation result.</p>"
         }
       },
       "documentation":"<p>The structure that contains information about a specified operation's results for a given account in a given region.</p>"
@@ -3666,7 +4677,8 @@
         "SUCCEEDED",
         "FAILED",
         "STOPPING",
-        "STOPPED"
+        "STOPPED",
+        "QUEUED"
       ]
     },
     "StackSetOperationSummaries":{
@@ -3686,7 +4698,7 @@
         },
         "Status":{
           "shape":"StackSetOperationStatus",
-          "documentation":"<p>The overall status of the operation.</p> <ul> <li> <p> <code>FAILED</code>: The operation exceeded the specified failure tolerance. The failure tolerance value that you've set for an operation is applied for each region during stack create and update operations. If the number of failed stacks within a region exceeds the failure tolerance, the status of the operation in the region is set to <code>FAILED</code>. This in turn sets the status of the operation as a whole to <code>FAILED</code>, and AWS CloudFormation cancels the operation in any remaining regions.</p> </li> <li> <p> <code>RUNNING</code>: The operation is currently being performed.</p> </li> <li> <p> <code>STOPPED</code>: The user has cancelled the operation.</p> </li> <li> <p> <code>STOPPING</code>: The operation is in the process of stopping, at user request. </p> </li> <li> <p> <code>SUCCEEDED</code>: The operation completed creating or updating all the specified stacks without exceeding the failure tolerance for the operation.</p> </li> </ul>"
+          "documentation":"<p>The overall status of the operation.</p> <ul> <li> <p> <code>FAILED</code>: The operation exceeded the specified failure tolerance. The failure tolerance value that you've set for an operation is applied for each region during stack create and update operations. If the number of failed stacks within a region exceeds the failure tolerance, the status of the operation in the region is set to <code>FAILED</code>. This in turn sets the status of the operation as a whole to <code>FAILED</code>, and AWS CloudFormation cancels the operation in any remaining regions.</p> </li> <li> <p> <code>QUEUED</code>: [Service-managed permissions] For automatic deployments that require a sequence of operations. The operation is queued to be performed. For more information, see the <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/stacksets-concepts.html#stackset-status-codes\">stack set operation status codes</a> in the AWS CloudFormation User Guide.</p> </li> <li> <p> <code>RUNNING</code>: The operation is currently being performed.</p> </li> <li> <p> <code>STOPPED</code>: The user has cancelled the operation.</p> </li> <li> <p> <code>STOPPING</code>: The operation is in the process of stopping, at user request. </p> </li> <li> <p> <code>SUCCEEDED</code>: The operation completed creating or updating all the specified stacks without exceeding the failure tolerance for the operation.</p> </li> </ul>"
         },
         "CreationTimestamp":{
           "shape":"Timestamp",
@@ -3728,6 +4740,22 @@
         "Status":{
           "shape":"StackSetStatus",
           "documentation":"<p>The status of the stack set.</p>"
+        },
+        "AutoDeployment":{
+          "shape":"AutoDeployment",
+          "documentation":"<p>[<code>Service-managed</code> permissions] Describes whether StackSets automatically deploys to AWS Organizations accounts that are added to a target organizational unit (OU).</p>"
+        },
+        "PermissionModel":{
+          "shape":"PermissionModels",
+          "documentation":"<p>Describes how the IAM roles required for stack set operations are created.</p> <ul> <li> <p>With <code>self-managed</code> permissions, you must create the administrator and execution roles required to deploy to target accounts. For more information, see <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/stacksets-prereqs-self-managed.html\">Grant Self-Managed Stack Set Permissions</a>.</p> </li> <li> <p>With <code>service-managed</code> permissions, StackSets automatically creates the IAM roles required to deploy to accounts managed by AWS Organizations. For more information, see <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/stacksets-prereqs-service-managed.html\">Grant Service-Managed Stack Set Permissions</a>.</p> </li> </ul>"
+        },
+        "DriftStatus":{
+          "shape":"StackDriftStatus",
+          "documentation":"<p>Status of the stack set's actual configuration compared to its expected template and parameter configuration. A stack set is considered to have drifted if one or more of its stack instances have drifted from their expected template and parameter configuration.</p> <ul> <li> <p> <code>DRIFTED</code>: One or more of the stack instances belonging to the stack set stack differs from the expected template and parameter configuration. A stack instance is considered to have drifted if one or more of the resources in the associated stack have drifted.</p> </li> <li> <p> <code>NOT_CHECKED</code>: AWS CloudFormation has not checked the stack set for drift.</p> </li> <li> <p> <code>IN_SYNC</code>: All of the stack instances belonging to the stack set stack match from the expected template and parameter configuration.</p> </li> <li> <p> <code>UNKNOWN</code>: This value is reserved for future use.</p> </li> </ul>"
+        },
+        "LastDriftCheckTimestamp":{
+          "shape":"Timestamp",
+          "documentation":"<p>Most recent time when CloudFormation performed a drift detection operation on the stack set. This value will be <code>NULL</code> for any stack set on which drift detection has not yet been performed.</p>"
         }
       },
       "documentation":"<p>The structures that contain summary information about the specified stack set.</p>"
@@ -3751,7 +4779,12 @@
         "UPDATE_ROLLBACK_FAILED",
         "UPDATE_ROLLBACK_COMPLETE_CLEANUP_IN_PROGRESS",
         "UPDATE_ROLLBACK_COMPLETE",
-        "REVIEW_IN_PROGRESS"
+        "REVIEW_IN_PROGRESS",
+        "IMPORT_IN_PROGRESS",
+        "IMPORT_COMPLETE",
+        "IMPORT_ROLLBACK_IN_PROGRESS",
+        "IMPORT_ROLLBACK_FAILED",
+        "IMPORT_ROLLBACK_COMPLETE"
       ]
     },
     "StackStatusFilter":{
@@ -3809,7 +4842,7 @@
         },
         "RootId":{
           "shape":"StackId",
-          "documentation":"<p>For nested stacks--stacks created as resources for another stack--the stack ID of the the top-level stack to which the nested stack ultimately belongs.</p> <p>For more information, see <a href=\"http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/using-cfn-nested-stacks.html\">Working with Nested Stacks</a> in the <i>AWS CloudFormation User Guide</i>.</p>"
+          "documentation":"<p>For nested stacks--stacks created as resources for another stack--the stack ID of the top-level stack to which the nested stack ultimately belongs.</p> <p>For more information, see <a href=\"http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/using-cfn-nested-stacks.html\">Working with Nested Stacks</a> in the <i>AWS CloudFormation User Guide</i>.</p>"
         },
         "DriftInformation":{
           "shape":"StackDriftInformationSummary",
@@ -3838,6 +4871,10 @@
       },
       "exception":true
     },
+    "StatusMessage":{
+      "type":"string",
+      "max":1024
+    },
     "StopStackSetOperationInput":{
       "type":"structure",
       "required":[
@@ -3953,12 +4990,118 @@
       },
       "exception":true
     },
+    "TotalStackInstancesCount":{
+      "type":"integer",
+      "min":0
+    },
     "TransformName":{"type":"string"},
     "TransformsList":{
       "type":"list",
       "member":{"shape":"TransformName"}
     },
     "Type":{"type":"string"},
+    "TypeArn":{
+      "type":"string",
+      "max":1024,
+      "pattern":"arn:aws[A-Za-z0-9-]{0,64}:cloudformation:[A-Za-z0-9-]{1,64}:([0-9]{12})?:type/.+"
+    },
+    "TypeName":{
+      "type":"string",
+      "max":196,
+      "min":10,
+      "pattern":"[A-Za-z0-9]{2,64}::[A-Za-z0-9]{2,64}::[A-Za-z0-9]{2,64}"
+    },
+    "TypeNotFoundException":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>The specified type does not exist in the CloudFormation registry.</p>",
+      "error":{
+        "code":"TypeNotFoundException",
+        "httpStatusCode":404,
+        "senderFault":true
+      },
+      "exception":true
+    },
+    "TypeSchema":{
+      "type":"string",
+      "max":16777216,
+      "min":1
+    },
+    "TypeSummaries":{
+      "type":"list",
+      "member":{"shape":"TypeSummary"}
+    },
+    "TypeSummary":{
+      "type":"structure",
+      "members":{
+        "Type":{
+          "shape":"RegistryType",
+          "documentation":"<p>The kind of type.</p>"
+        },
+        "TypeName":{
+          "shape":"TypeName",
+          "documentation":"<p>The name of the type.</p>"
+        },
+        "DefaultVersionId":{
+          "shape":"TypeVersionId",
+          "documentation":"<p>The ID of the default version of the type. The default version is used when the type version is not specified.</p> <p>To set the default version of a type, use <code> <a>SetTypeDefaultVersion</a> </code>. </p>"
+        },
+        "TypeArn":{
+          "shape":"TypeArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the type.</p>"
+        },
+        "LastUpdated":{
+          "shape":"Timestamp",
+          "documentation":"<p>When the current default version of the type was registered.</p>"
+        },
+        "Description":{
+          "shape":"Description",
+          "documentation":"<p>The description of the type.</p>"
+        }
+      },
+      "documentation":"<p>Contains summary information about the specified CloudFormation type.</p>"
+    },
+    "TypeVersionId":{
+      "type":"string",
+      "max":128,
+      "min":1,
+      "pattern":"[A-Za-z0-9-]+"
+    },
+    "TypeVersionSummaries":{
+      "type":"list",
+      "member":{"shape":"TypeVersionSummary"}
+    },
+    "TypeVersionSummary":{
+      "type":"structure",
+      "members":{
+        "Type":{
+          "shape":"RegistryType",
+          "documentation":"<p>The kind of type.</p>"
+        },
+        "TypeName":{
+          "shape":"TypeName",
+          "documentation":"<p>The name of the type.</p>"
+        },
+        "VersionId":{
+          "shape":"TypeVersionId",
+          "documentation":"<p>The ID of a specific version of the type. The version ID is the value at the end of the Amazon Resource Name (ARN) assigned to the type version when it is registered.</p>"
+        },
+        "Arn":{
+          "shape":"TypeArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the type version.</p>"
+        },
+        "TimeCreated":{
+          "shape":"Timestamp",
+          "documentation":"<p>When the version was registered.</p>"
+        },
+        "Description":{
+          "shape":"Description",
+          "documentation":"<p>The description of the type version.</p>"
+        }
+      },
+      "documentation":"<p>Contains summary information about a specific version of a CloudFormation type.</p>"
+    },
     "UpdateStackInput":{
       "type":"structure",
       "required":["StackName"],
@@ -3993,7 +5136,7 @@
         },
         "Capabilities":{
           "shape":"Capabilities",
-          "documentation":"<p>In some cases, you must explicity acknowledge that your stack template contains certain capabilities in order for AWS CloudFormation to update the stack.</p> <ul> <li> <p> <code>CAPABILITY_IAM</code> and <code>CAPABILITY_NAMED_IAM</code> </p> <p>Some stack templates might include resources that can affect permissions in your AWS account; for example, by creating new AWS Identity and Access Management (IAM) users. For those stacks, you must explicitly acknowledge this by specifying one of these capabilities.</p> <p>The following IAM resources require you to specify either the <code>CAPABILITY_IAM</code> or <code>CAPABILITY_NAMED_IAM</code> capability.</p> <ul> <li> <p>If you have IAM resources, you can specify either capability. </p> </li> <li> <p>If you have IAM resources with custom names, you <i>must</i> specify <code>CAPABILITY_NAMED_IAM</code>. </p> </li> <li> <p>If you don't specify either of these capabilities, AWS CloudFormation returns an <code>InsufficientCapabilities</code> error.</p> </li> </ul> <p>If your stack template contains these resources, we recommend that you review all permissions associated with them and edit their permissions if necessary.</p> <ul> <li> <p> <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-accesskey.html\"> AWS::IAM::AccessKey</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-group.html\"> AWS::IAM::Group</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-instanceprofile.html\"> AWS::IAM::InstanceProfile</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-policy.html\"> AWS::IAM::Policy</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-role.html\"> AWS::IAM::Role</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-user.html\"> AWS::IAM::User</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-addusertogroup.html\"> AWS::IAM::UserToGroupAddition</a> </p> </li> </ul> <p>For more information, see <a href=\"http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/using-iam-template.html#capabilities\">Acknowledging IAM Resources in AWS CloudFormation Templates</a>.</p> </li> <li> <p> <code>CAPABILITY_AUTO_EXPAND</code> </p> <p>Some template contain macros. Macros perform custom processing on templates; this can include simple actions like find-and-replace operations, all the way to extensive transformations of entire templates. Because of this, users typically create a change set from the processed template, so that they can review the changes resulting from the macros before actually updating the stack. If your stack template contains one or more macros, and you choose to update a stack directly from the processed template, without first reviewing the resulting changes in a change set, you must acknowledge this capability. This includes the <a href=\"http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/create-reusable-transform-function-snippets-and-add-to-your-template-with-aws-include-transform.html\">AWS::Include</a> and <a href=\"http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/transform-aws-serverless.html\">AWS::Serverless</a> transforms, which are macros hosted by AWS CloudFormation.</p> <p>Change sets do not currently support nested stacks. If you want to update a stack from a stack template that contains macros <i>and</i> nested stacks, you must update the stack directly from the template using this capability.</p> <important> <p>You should only update stacks directly from a stack template that contains macros if you know what processing the macro performs.</p> <p>Each macro relies on an underlying Lambda service function for processing stack templates. Be aware that the Lambda function owner can update the function operation without AWS CloudFormation being notified.</p> </important> <p>For more information, see <a href=\"http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/template-macros.html\">Using AWS CloudFormation Macros to Perform Custom Processing on Templates</a>.</p> </li> </ul>"
+          "documentation":"<p>In some cases, you must explicitly acknowledge that your stack template contains certain capabilities in order for AWS CloudFormation to update the stack.</p> <ul> <li> <p> <code>CAPABILITY_IAM</code> and <code>CAPABILITY_NAMED_IAM</code> </p> <p>Some stack templates might include resources that can affect permissions in your AWS account; for example, by creating new AWS Identity and Access Management (IAM) users. For those stacks, you must explicitly acknowledge this by specifying one of these capabilities.</p> <p>The following IAM resources require you to specify either the <code>CAPABILITY_IAM</code> or <code>CAPABILITY_NAMED_IAM</code> capability.</p> <ul> <li> <p>If you have IAM resources, you can specify either capability. </p> </li> <li> <p>If you have IAM resources with custom names, you <i>must</i> specify <code>CAPABILITY_NAMED_IAM</code>. </p> </li> <li> <p>If you don't specify either of these capabilities, AWS CloudFormation returns an <code>InsufficientCapabilities</code> error.</p> </li> </ul> <p>If your stack template contains these resources, we recommend that you review all permissions associated with them and edit their permissions if necessary.</p> <ul> <li> <p> <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-accesskey.html\"> AWS::IAM::AccessKey</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-group.html\"> AWS::IAM::Group</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-instanceprofile.html\"> AWS::IAM::InstanceProfile</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-policy.html\"> AWS::IAM::Policy</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-role.html\"> AWS::IAM::Role</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-user.html\"> AWS::IAM::User</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-addusertogroup.html\"> AWS::IAM::UserToGroupAddition</a> </p> </li> </ul> <p>For more information, see <a href=\"http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/using-iam-template.html#capabilities\">Acknowledging IAM Resources in AWS CloudFormation Templates</a>.</p> </li> <li> <p> <code>CAPABILITY_AUTO_EXPAND</code> </p> <p>Some template contain macros. Macros perform custom processing on templates; this can include simple actions like find-and-replace operations, all the way to extensive transformations of entire templates. Because of this, users typically create a change set from the processed template, so that they can review the changes resulting from the macros before actually updating the stack. If your stack template contains one or more macros, and you choose to update a stack directly from the processed template, without first reviewing the resulting changes in a change set, you must acknowledge this capability. This includes the <a href=\"http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/create-reusable-transform-function-snippets-and-add-to-your-template-with-aws-include-transform.html\">AWS::Include</a> and <a href=\"http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/transform-aws-serverless.html\">AWS::Serverless</a> transforms, which are macros hosted by AWS CloudFormation.</p> <p>Change sets do not currently support nested stacks. If you want to update a stack from a stack template that contains macros <i>and</i> nested stacks, you must update the stack directly from the template using this capability.</p> <important> <p>You should only update stacks directly from a stack template that contains macros if you know what processing the macro performs.</p> <p>Each macro relies on an underlying Lambda service function for processing stack templates. Be aware that the Lambda function owner can update the function operation without AWS CloudFormation being notified.</p> </important> <p>For more information, see <a href=\"http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/template-macros.html\">Using AWS CloudFormation Macros to Perform Custom Processing on Templates</a>.</p> </li> </ul>"
         },
         "ResourceTypes":{
           "shape":"ResourceTypes",
@@ -4034,7 +5177,6 @@
       "type":"structure",
       "required":[
         "StackSetName",
-        "Accounts",
         "Regions"
       ],
       "members":{
@@ -4044,7 +5186,11 @@
         },
         "Accounts":{
           "shape":"AccountList",
-          "documentation":"<p>The names of one or more AWS accounts for which you want to update parameter values for stack instances. The overridden parameter values will be applied to all stack instances in the specified accounts and regions.</p>"
+          "documentation":"<p>[Self-managed permissions] The names of one or more AWS accounts for which you want to update parameter values for stack instances. The overridden parameter values will be applied to all stack instances in the specified accounts and regions.</p> <p>You can specify <code>Accounts</code> or <code>DeploymentTargets</code>, but not both.</p>"
+        },
+        "DeploymentTargets":{
+          "shape":"DeploymentTargets",
+          "documentation":"<p>[<code>Service-managed</code> permissions] The AWS Organizations accounts for which you want to update parameter values for stack instances. If your update targets OUs, the overridden parameter values only apply to the accounts that are currently in the target OUs and their child OUs. Accounts added to the target OUs and their child OUs in the future won't use the overridden values.</p> <p>You can specify <code>Accounts</code> or <code>DeploymentTargets</code>, but not both.</p>"
         },
         "Regions":{
           "shape":"RegionList",
@@ -4114,7 +5260,7 @@
         },
         "Capabilities":{
           "shape":"Capabilities",
-          "documentation":"<p>In some cases, you must explicity acknowledge that your stack template contains certain capabilities in order for AWS CloudFormation to update the stack set and its associated stack instances.</p> <ul> <li> <p> <code>CAPABILITY_IAM</code> and <code>CAPABILITY_NAMED_IAM</code> </p> <p>Some stack templates might include resources that can affect permissions in your AWS account; for example, by creating new AWS Identity and Access Management (IAM) users. For those stacks sets, you must explicitly acknowledge this by specifying one of these capabilities.</p> <p>The following IAM resources require you to specify either the <code>CAPABILITY_IAM</code> or <code>CAPABILITY_NAMED_IAM</code> capability.</p> <ul> <li> <p>If you have IAM resources, you can specify either capability. </p> </li> <li> <p>If you have IAM resources with custom names, you <i>must</i> specify <code>CAPABILITY_NAMED_IAM</code>. </p> </li> <li> <p>If you don't specify either of these capabilities, AWS CloudFormation returns an <code>InsufficientCapabilities</code> error.</p> </li> </ul> <p>If your stack template contains these resources, we recommend that you review all permissions associated with them and edit their permissions if necessary.</p> <ul> <li> <p> <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-accesskey.html\"> AWS::IAM::AccessKey</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-group.html\"> AWS::IAM::Group</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-instanceprofile.html\"> AWS::IAM::InstanceProfile</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-policy.html\"> AWS::IAM::Policy</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-role.html\"> AWS::IAM::Role</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-user.html\"> AWS::IAM::User</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-addusertogroup.html\"> AWS::IAM::UserToGroupAddition</a> </p> </li> </ul> <p>For more information, see <a href=\"http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/using-iam-template.html#capabilities\">Acknowledging IAM Resources in AWS CloudFormation Templates</a>.</p> </li> <li> <p> <code>CAPABILITY_AUTO_EXPAND</code> </p> <p>Some templates contain macros. If your stack template contains one or more macros, and you choose to update a stack directly from the processed template, without first reviewing the resulting changes in a change set, you must acknowledge this capability. For more information, see <a href=\"http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/template-macros.html\">Using AWS CloudFormation Macros to Perform Custom Processing on Templates</a>.</p> <important> <p>Stack sets do not currently support macros in stack templates. (This includes the <a href=\"http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/create-reusable-transform-function-snippets-and-add-to-your-template-with-aws-include-transform.html\">AWS::Include</a> and <a href=\"http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/transform-aws-serverless.html\">AWS::Serverless</a> transforms, which are macros hosted by AWS CloudFormation.) Even if you specify this capability, if you include a macro in your template the stack set operation will fail.</p> </important> </li> </ul>"
+          "documentation":"<p>In some cases, you must explicitly acknowledge that your stack template contains certain capabilities in order for AWS CloudFormation to update the stack set and its associated stack instances.</p> <ul> <li> <p> <code>CAPABILITY_IAM</code> and <code>CAPABILITY_NAMED_IAM</code> </p> <p>Some stack templates might include resources that can affect permissions in your AWS account; for example, by creating new AWS Identity and Access Management (IAM) users. For those stacks sets, you must explicitly acknowledge this by specifying one of these capabilities.</p> <p>The following IAM resources require you to specify either the <code>CAPABILITY_IAM</code> or <code>CAPABILITY_NAMED_IAM</code> capability.</p> <ul> <li> <p>If you have IAM resources, you can specify either capability. </p> </li> <li> <p>If you have IAM resources with custom names, you <i>must</i> specify <code>CAPABILITY_NAMED_IAM</code>. </p> </li> <li> <p>If you don't specify either of these capabilities, AWS CloudFormation returns an <code>InsufficientCapabilities</code> error.</p> </li> </ul> <p>If your stack template contains these resources, we recommend that you review all permissions associated with them and edit their permissions if necessary.</p> <ul> <li> <p> <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-accesskey.html\"> AWS::IAM::AccessKey</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-group.html\"> AWS::IAM::Group</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-instanceprofile.html\"> AWS::IAM::InstanceProfile</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-policy.html\"> AWS::IAM::Policy</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-role.html\"> AWS::IAM::Role</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-user.html\"> AWS::IAM::User</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-addusertogroup.html\"> AWS::IAM::UserToGroupAddition</a> </p> </li> </ul> <p>For more information, see <a href=\"http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/using-iam-template.html#capabilities\">Acknowledging IAM Resources in AWS CloudFormation Templates</a>.</p> </li> <li> <p> <code>CAPABILITY_AUTO_EXPAND</code> </p> <p>Some templates contain macros. If your stack template contains one or more macros, and you choose to update a stack directly from the processed template, without first reviewing the resulting changes in a change set, you must acknowledge this capability. For more information, see <a href=\"http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/template-macros.html\">Using AWS CloudFormation Macros to Perform Custom Processing on Templates</a>.</p> <important> <p>Stack sets do not currently support macros in stack templates. (This includes the <a href=\"http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/create-reusable-transform-function-snippets-and-add-to-your-template-with-aws-include-transform.html\">AWS::Include</a> and <a href=\"http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/transform-aws-serverless.html\">AWS::Serverless</a> transforms, which are macros hosted by AWS CloudFormation.) Even if you specify this capability, if you include a macro in your template the stack set operation will fail.</p> </important> </li> </ul>"
         },
         "Tags":{
           "shape":"Tags",
@@ -4132,6 +5278,18 @@
           "shape":"ExecutionRoleName",
           "documentation":"<p>The name of the IAM execution role to use to update the stack set. If you do not specify an execution role, AWS CloudFormation uses the <code>AWSCloudFormationStackSetExecutionRole</code> role for the stack set operation.</p> <p>Specify an IAM role only if you are using customized execution roles to control which stack resources users and groups can include in their stack sets. </p> <p> If you specify a customized execution role, AWS CloudFormation uses that role to update the stack. If you do not specify a customized execution role, AWS CloudFormation performs the update using the role previously associated with the stack set, so long as you have permissions to perform operations on the stack set.</p>"
         },
+        "DeploymentTargets":{
+          "shape":"DeploymentTargets",
+          "documentation":"<p>[<code>Service-managed</code> permissions] The AWS Organizations accounts in which to update associated stack instances.</p> <p>To update all the stack instances associated with this stack set, do not specify <code>DeploymentTargets</code> or <code>Regions</code>.</p> <p>If the stack set update includes changes to the template (that is, if <code>TemplateBody</code> or <code>TemplateURL</code> is specified), or the <code>Parameters</code>, AWS CloudFormation marks all stack instances with a status of <code>OUTDATED</code> prior to updating the stack instances in the specified accounts and Regions. If the stack set update does not include changes to the template or parameters, AWS CloudFormation updates the stack instances in the specified accounts and Regions, while leaving all other stack instances with their existing stack instance status.</p>"
+        },
+        "PermissionModel":{
+          "shape":"PermissionModels",
+          "documentation":"<p>Describes how the IAM roles required for stack set operations are created. You cannot modify <code>PermissionModel</code> if there are stack instances associated with your stack set.</p> <ul> <li> <p>With <code>self-managed</code> permissions, you must create the administrator and execution roles required to deploy to target accounts. For more information, see <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/stacksets-prereqs-self-managed.html\">Grant Self-Managed Stack Set Permissions</a>.</p> </li> <li> <p>With <code>service-managed</code> permissions, StackSets automatically creates the IAM roles required to deploy to accounts managed by AWS Organizations. For more information, see <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/stacksets-prereqs-service-managed.html\">Grant Service-Managed Stack Set Permissions</a>.</p> </li> </ul>"
+        },
+        "AutoDeployment":{
+          "shape":"AutoDeployment",
+          "documentation":"<p>[<code>Service-managed</code> permissions] Describes whether StackSets automatically deploys to AWS Organizations accounts that are added to a target organization or organizational unit (OU).</p> <p>If you specify <code>AutoDeployment</code>, do not specify <code>DeploymentTargets</code> or <code>Regions</code>.</p>"
+        },
         "OperationId":{
           "shape":"ClientRequestToken",
           "documentation":"<p>The unique ID for this stack set operation. </p> <p>The operation ID also functions as an idempotency token, to ensure that AWS CloudFormation performs the stack set operation only once, even if you retry the request multiple times. You might retry stack set operation requests to ensure that AWS CloudFormation successfully received them.</p> <p>If you don't specify an operation ID, AWS CloudFormation generates one automatically.</p> <p>Repeating this stack set operation with a new operation ID retries all stack instances whose status is <code>OUTDATED</code>. </p>",
@@ -4139,7 +5297,7 @@
         },
         "Accounts":{
           "shape":"AccountList",
-          "documentation":"<p>The accounts in which to update associated stack instances. If you specify accounts, you must also specify the regions in which to update stack set instances.</p> <p>To update <i>all</i> the stack instances associated with this stack set, do not specify the <code>Accounts</code> or <code>Regions</code> properties.</p> <p>If the stack set update includes changes to the template (that is, if the <code>TemplateBody</code> or <code>TemplateURL</code> properties are specified), or the <code>Parameters</code> property, AWS CloudFormation marks all stack instances with a status of <code>OUTDATED</code> prior to updating the stack instances in the specified accounts and regions. If the stack set update does not include changes to the template or parameters, AWS CloudFormation updates the stack instances in the specified accounts and regions, while leaving all other stack instances with their existing stack instance status. </p>"
+          "documentation":"<p>[Self-managed permissions] The accounts in which to update associated stack instances. If you specify accounts, you must also specify the regions in which to update stack set instances.</p> <p>To update <i>all</i> the stack instances associated with this stack set, do not specify the <code>Accounts</code> or <code>Regions</code> properties.</p> <p>If the stack set update includes changes to the template (that is, if the <code>TemplateBody</code> or <code>TemplateURL</code> properties are specified), or the <code>Parameters</code> property, AWS CloudFormation marks all stack instances with a status of <code>OUTDATED</code> prior to updating the stack instances in the specified accounts and regions. If the stack set update does not include changes to the template or parameters, AWS CloudFormation updates the stack instances in the specified accounts and regions, while leaving all other stack instances with their existing stack instance status. </p>"
         },
         "Regions":{
           "shape":"RegionList",
@@ -4226,7 +5384,14 @@
       "documentation":"<p>The output for <a>ValidateTemplate</a> action.</p>"
     },
     "Value":{"type":"string"},
-    "Version":{"type":"string"}
+    "Version":{"type":"string"},
+    "Visibility":{
+      "type":"string",
+      "enum":[
+        "PUBLIC",
+        "PRIVATE"
+      ]
+    }
   },
   "documentation":"<fullname>AWS CloudFormation</fullname> <p>AWS CloudFormation allows you to create and manage AWS infrastructure deployments predictably and repeatedly. You can use AWS CloudFormation to leverage AWS products, such as Amazon Elastic Compute Cloud, Amazon Elastic Block Store, Amazon Simple Notification Service, Elastic Load Balancing, and Auto Scaling to build highly-reliable, highly scalable, cost-effective applications without creating or configuring the underlying AWS infrastructure.</p> <p>With AWS CloudFormation, you declare all of your resources and dependencies in a template file. The template defines a collection of resources as a single unit called a stack. AWS CloudFormation creates and deletes all member resources of the stack together and manages all dependencies between the resources for you.</p> <p>For more information about AWS CloudFormation, see the <a href=\"http://aws.amazon.com/cloudformation/\">AWS CloudFormation Product Page</a>.</p> <p>Amazon CloudFormation makes use of other AWS products. If you need additional technical information about a specific AWS product, you can find the product's technical documentation at <a href=\"https://docs.aws.amazon.com/\">docs.aws.amazon.com</a>.</p>"
 }
diff --git a/services/cloudformation/src/main/resources/codegen-resources/waiters-2.json b/services/cloudformation/src/main/resources/codegen-resources/waiters-2.json
index 4e8c8282182b..a8d91064666e 100644
--- a/services/cloudformation/src/main/resources/codegen-resources/waiters-2.json
+++ b/services/cloudformation/src/main/resources/codegen-resources/waiters-2.json
@@ -102,6 +102,12 @@
           "matcher": "pathAny",
           "state": "failure"
         },
+        {
+          "argument": "Stacks[].StackStatus",
+          "expected": "UPDATE_ROLLBACK_IN_PROGRESS",
+          "matcher": "pathAny",
+          "state": "failure"
+        },
         {
           "argument": "Stacks[].StackStatus",
           "expected": "UPDATE_ROLLBACK_FAILED",
@@ -110,7 +116,7 @@
         },
         {
           "argument": "Stacks[].StackStatus",
-          "expected": "UPDATE_ROLLBACK_IN_PROGRESS",
+          "expected": "UPDATE_ROLLBACK_COMPLETE",
           "matcher": "pathAny",
           "state": "failure"
         }
@@ -153,6 +159,55 @@
         }
       ]
     },
+    "StackImportComplete": {
+      "delay": 30,
+      "maxAttempts": 120,
+      "operation": "DescribeStacks",
+      "description": "Wait until stack status is IMPORT_COMPLETE.",
+      "acceptors": [
+        {
+          "argument": "Stacks[].StackStatus",
+          "expected": "IMPORT_COMPLETE",
+          "matcher": "pathAll",
+          "state": "success"
+        },
+        {
+          "expected": "ROLLBACK_COMPLETE",
+          "matcher": "pathAny",
+          "state": "failure",
+          "argument": "Stacks[].StackStatus"
+        },
+        {
+          "expected": "ROLLBACK_FAILED",
+          "matcher": "pathAny",
+          "state": "failure",
+          "argument": "Stacks[].StackStatus"
+        },
+        {
+          "argument": "Stacks[].StackStatus",
+          "expected": "IMPORT_ROLLBACK_IN_PROGRESS",
+          "matcher": "pathAny",
+          "state": "failure"
+        },
+        {
+          "argument": "Stacks[].StackStatus",
+          "expected": "IMPORT_ROLLBACK_FAILED",
+          "matcher": "pathAny",
+          "state": "failure"
+        },
+        {
+          "expected": "IMPORT_ROLLBACK_COMPLETE",
+          "matcher": "pathAny",
+          "state": "failure",
+          "argument": "Stacks[].StackStatus"
+        },
+        {
+          "expected": "ValidationError",
+          "matcher": "error",
+          "state": "failure"
+        }
+      ]
+    },
     "ChangeSetCreateComplete": {
       "delay": 30,
       "operation": "DescribeChangeSet",
@@ -177,6 +232,26 @@
           "state": "failure"
         }
       ]
+    },
+    "TypeRegistrationComplete": {
+      "delay": 30,
+      "operation": "DescribeTypeRegistration",
+      "maxAttempts": 120,
+      "description": "Wait until type registration is COMPLETE.",
+      "acceptors": [
+        {
+          "argument": "ProgressStatus",
+          "expected": "COMPLETE",
+          "matcher": "path",
+          "state": "success"
+        },
+        {
+          "argument": "ProgressStatus",
+          "expected": "FAILED",
+          "matcher": "path",
+          "state": "failure"
+        }
+      ]
     }
   }
 }
diff --git a/services/cloudformation/src/test/resources/cucumber.properties b/services/cloudformation/src/test/resources/cucumber.properties
index 32acee2f86f8..23bb5c9fe823 100644
--- a/services/cloudformation/src/test/resources/cucumber.properties
+++ b/services/cloudformation/src/test/resources/cucumber.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/cloudfront/build.properties b/services/cloudfront/build.properties
index ecf2dae6fcb1..15ec2da1fc71 100644
--- a/services/cloudfront/build.properties
+++ b/services/cloudfront/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/cloudfront/pom.xml b/services/cloudfront/pom.xml
index b797e47b81f0..ceb9407cce3b 100644
--- a/services/cloudfront/pom.xml
+++ b/services/cloudfront/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>cloudfront</artifactId>
     <name>AWS Java SDK :: Services :: Amazon CloudFront</name>
diff --git a/services/cloudfront/src/main/resources/codegen-resources/service-2.json b/services/cloudfront/src/main/resources/codegen-resources/service-2.json
index 1ab4369a5609..f93309e84e1d 100644
--- a/services/cloudfront/src/main/resources/codegen-resources/service-2.json
+++ b/services/cloudfront/src/main/resources/codegen-resources/service-2.json
@@ -923,7 +923,7 @@
         },
         "ICPRecordalStatus":{
           "shape":"ICPRecordalStatus",
-          "documentation":"<p>The Internet Content Provider (ICP) recordal status for a CNAME. The ICPRecordalStatus is set to APPROVED for all CNAMEs (aliases) in regions outside of China. </p> <p>The status values returned are the following:</p> <ul> <li> <p> <b>APPROVED</b> indicates that the associated CNAME has a valid ICP recordal number. Multiple CNAMEs can be associated with a distribution, and CNAMEs can correspond to different ICP recordals. To be marked as APPROVED, that is, valid to use with China region, a CNAME must have one ICP recordal number associated with it.</p> </li> <li> <p> <b>SUSPENDED</b> indicates that the associated CNAME does not have a valid ICP recordal number.</p> </li> <li> <p> <b>PENDING</b> indicates that at least one CNAME associated with the distribution does not have a valid ICP recordal number.</p> </li> </ul>"
+          "documentation":"<p>The Internet Content Provider (ICP) recordal status for a CNAME. The ICPRecordalStatus is set to APPROVED for all CNAMEs (aliases) in regions outside of China. </p> <p>The status values returned are the following:</p> <ul> <li> <p> <b>APPROVED</b> indicates that the associated CNAME has a valid ICP recordal number. Multiple CNAMEs can be associated with a distribution, and CNAMEs can correspond to different ICP recordals. To be marked as APPROVED, that is, valid to use with China region, a CNAME must have one ICP recordal number associated with it.</p> </li> <li> <p> <b>SUSPENDED</b> indicates that the associated CNAME does not have a valid ICP recordal number.</p> </li> <li> <p> <b>PENDING</b> indicates that CloudFront can't determine the ICP recordal status of the CNAME associated with the distribution because there was an error in trying to determine the status. You can try again to see if the error is resolved in which case CloudFront returns an APPROVED or SUSPENDED status.</p> </li> </ul>"
         }
       },
       "documentation":"<p>AWS services in China customers must file for an Internet Content Provider (ICP) recordal if they want to serve content publicly on an alternate domain name, also known as a CNAME, that they've added to CloudFront. AliasICPRecordal provides the ICP recordal status for CNAMEs associated with distributions. The status is returned in the CloudFront response; you can't configure it yourself.</p> <p>For more information about ICP recordals, see <a href=\"https://docs.amazonaws.cn/en_us/aws/latest/userguide/accounts-and-credentials.html\"> Signup, Accounts, and Credentials</a> in <i>Getting Started with AWS services in China</i>.</p>"
@@ -1022,7 +1022,7 @@
         },
         "ForwardedValues":{
           "shape":"ForwardedValues",
-          "documentation":"<p>A complex type that specifies how CloudFront handles query strings and cookies.</p>"
+          "documentation":"<p>A complex type that specifies how CloudFront handles query strings, cookies, and HTTP headers.</p>"
         },
         "TrustedSigners":{
           "shape":"TrustedSigners",
@@ -1321,11 +1321,11 @@
       "members":{
         "Quantity":{
           "shape":"integer",
-          "documentation":"<p>The number of different cookies that you want CloudFront to forward to the origin for this cache behavior.</p>"
+          "documentation":"<p>The number of different cookies that you want CloudFront to forward to the origin for this cache behavior. The value must equal the number of items that are in the <code>Items</code> field.</p> <p>When you set <code>Forward = whitelist</code> (in the <code>CookiePreferences</code> object), this value must be <code>1</code> or higher.</p>"
         },
         "Items":{
           "shape":"CookieNameList",
-          "documentation":"<p>A complex type that contains one <code>Name</code> element for each cookie that you want CloudFront to forward to the origin for this cache behavior.</p>"
+          "documentation":"<p>A complex type that contains one <code>Name</code> element for each cookie that you want CloudFront to forward to the origin for this cache behavior. It must contain the same number of items that is specified in the <code>Quantity</code> field.</p> <p>When you set <code>Forward = whitelist</code> (in the <code>CookiePreferences</code> object), this field must contain at least one item.</p>"
         }
       },
       "documentation":"<p>A complex type that specifies whether you want CloudFront to forward cookies to the origin and, if so, which ones. For more information about forwarding cookies to the origin, see <a href=\"https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/header-caching.html\"> Caching Content Based on Request Headers</a> in the <i>Amazon CloudFront Developer Guide</i>.</p>"
@@ -1336,11 +1336,11 @@
       "members":{
         "Forward":{
           "shape":"ItemSelection",
-          "documentation":"<p>Specifies which cookies to forward to the origin for this cache behavior: all, none, or the list of cookies specified in the <code>WhitelistedNames</code> complex type.</p> <p>Amazon S3 doesn't process cookies. When the cache behavior is forwarding requests to an Amazon S3 origin, specify none for the <code>Forward</code> element. </p>"
+          "documentation":"<p>Specifies which cookies to forward to the origin for this cache behavior: all, none, or the list of cookies specified in the <code>WhitelistedNames</code> complex type.</p> <p>Amazon S3 doesn't process cookies. When the cache behavior is forwarding requests to an Amazon S3 origin, specify none for the <code>Forward</code> element.</p>"
         },
         "WhitelistedNames":{
           "shape":"CookieNames",
-          "documentation":"<p>Required if you specify <code>whitelist</code> for the value of <code>Forward:</code>. A complex type that specifies how many different cookies you want CloudFront to forward to the origin for this cache behavior and, if you want to forward selected cookies, the names of those cookies.</p> <p>If you specify <code>all</code> or none for the value of <code>Forward</code>, omit <code>WhitelistedNames</code>. If you change the value of <code>Forward</code> from <code>whitelist</code> to all or none and you don't delete the <code>WhitelistedNames</code> element and its child elements, CloudFront deletes them automatically.</p> <p>For the current limit on the number of cookie names that you can whitelist for each cache behavior, see <a href=\"https://docs.aws.amazon.com/general/latest/gr/xrefaws_service_limits.html#limits_cloudfront\"> CloudFront Limits</a> in the <i>AWS General Reference</i>.</p>"
+          "documentation":"<p>Required if you specify <code>whitelist</code> for the value of <code>Forward</code>. A complex type that specifies how many different cookies you want CloudFront to forward to the origin for this cache behavior and, if you want to forward selected cookies, the names of those cookies.</p> <p>If you specify <code>all</code> or <code>none</code> for the value of <code>Forward</code>, omit <code>WhitelistedNames</code>. If you change the value of <code>Forward</code> from <code>whitelist</code> to <code>all</code> or <code>none</code> and you don't delete the <code>WhitelistedNames</code> element and its child elements, CloudFront deletes them automatically.</p> <p>For the current limit on the number of cookie names that you can whitelist for each cache behavior, see <a href=\"https://docs.aws.amazon.com/general/latest/gr/xrefaws_service_limits.html#limits_cloudfront\"> CloudFront Limits</a> in the <i>AWS General Reference</i>.</p>"
         }
       },
       "documentation":"<p>A complex type that specifies whether you want CloudFront to forward cookies to the origin and, if so, which ones. For more information about forwarding cookies to the origin, see <a href=\"https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/Cookies.html\">Caching Content Based on Cookies</a> in the <i>Amazon CloudFront Developer Guide</i>.</p>"
@@ -1685,15 +1685,15 @@
         },
         "ResponsePagePath":{
           "shape":"string",
-          "documentation":"<p>The path to the custom error page that you want CloudFront to return to a viewer when your origin returns the HTTP status code specified by <code>ErrorCode</code>, for example, <code>/4xx-errors/403-forbidden.html</code>. If you want to store your objects and your custom error pages in different locations, your distribution must include a cache behavior for which the following is true:</p> <ul> <li> <p>The value of <code>PathPattern</code> matches the path to your custom error messages. For example, suppose you saved custom error pages for 4xx errors in an Amazon S3 bucket in a directory named <code>/4xx-errors</code>. Your distribution must include a cache behavior for which the path pattern routes requests for your custom error pages to that location, for example, <code>/4xx-errors/*</code>. </p> </li> <li> <p>The value of <code>TargetOriginId</code> specifies the value of the <code>ID</code> element for the origin that contains your custom error pages.</p> </li> </ul> <p>If you specify a value for <code>ResponsePagePath</code>, you must also specify a value for <code>ResponseCode</code>. If you don't want to specify a value, include an empty element, <code>&lt;ResponsePagePath&gt;</code>, in the XML document.</p> <p>We recommend that you store custom error pages in an Amazon S3 bucket. If you store custom error pages on an HTTP server and the server starts to return 5xx errors, CloudFront can't get the files that you want to return to viewers because the origin server is unavailable.</p>"
+          "documentation":"<p>The path to the custom error page that you want CloudFront to return to a viewer when your origin returns the HTTP status code specified by <code>ErrorCode</code>, for example, <code>/4xx-errors/403-forbidden.html</code>. If you want to store your objects and your custom error pages in different locations, your distribution must include a cache behavior for which the following is true:</p> <ul> <li> <p>The value of <code>PathPattern</code> matches the path to your custom error messages. For example, suppose you saved custom error pages for 4xx errors in an Amazon S3 bucket in a directory named <code>/4xx-errors</code>. Your distribution must include a cache behavior for which the path pattern routes requests for your custom error pages to that location, for example, <code>/4xx-errors/*</code>. </p> </li> <li> <p>The value of <code>TargetOriginId</code> specifies the value of the <code>ID</code> element for the origin that contains your custom error pages.</p> </li> </ul> <p>If you specify a value for <code>ResponsePagePath</code>, you must also specify a value for <code>ResponseCode</code>.</p> <p>We recommend that you store custom error pages in an Amazon S3 bucket. If you store custom error pages on an HTTP server and the server starts to return 5xx errors, CloudFront can't get the files that you want to return to viewers because the origin server is unavailable.</p>"
         },
         "ResponseCode":{
           "shape":"string",
-          "documentation":"<p>The HTTP status code that you want CloudFront to return to the viewer along with the custom error page. There are a variety of reasons that you might want CloudFront to return a status code different from the status code that your origin returned to CloudFront, for example:</p> <ul> <li> <p>Some Internet devices (some firewalls and corporate proxies, for example) intercept HTTP 4xx and 5xx and prevent the response from being returned to the viewer. If you substitute <code>200</code>, the response typically won't be intercepted.</p> </li> <li> <p>If you don't care about distinguishing among different client errors or server errors, you can specify <code>400</code> or <code>500</code> as the <code>ResponseCode</code> for all 4xx or 5xx errors.</p> </li> <li> <p>You might want to return a <code>200</code> status code (OK) and static website so your customers don't know that your website is down.</p> </li> </ul> <p>If you specify a value for <code>ResponseCode</code>, you must also specify a value for <code>ResponsePagePath</code>. If you don't want to specify a value, include an empty element, <code>&lt;ResponseCode&gt;</code>, in the XML document.</p>"
+          "documentation":"<p>The HTTP status code that you want CloudFront to return to the viewer along with the custom error page. There are a variety of reasons that you might want CloudFront to return a status code different from the status code that your origin returned to CloudFront, for example:</p> <ul> <li> <p>Some Internet devices (some firewalls and corporate proxies, for example) intercept HTTP 4xx and 5xx and prevent the response from being returned to the viewer. If you substitute <code>200</code>, the response typically won't be intercepted.</p> </li> <li> <p>If you don't care about distinguishing among different client errors or server errors, you can specify <code>400</code> or <code>500</code> as the <code>ResponseCode</code> for all 4xx or 5xx errors.</p> </li> <li> <p>You might want to return a <code>200</code> status code (OK) and static website so your customers don't know that your website is down.</p> </li> </ul> <p>If you specify a value for <code>ResponseCode</code>, you must also specify a value for <code>ResponsePagePath</code>.</p>"
         },
         "ErrorCachingMinTTL":{
           "shape":"long",
-          "documentation":"<p>The minimum amount of time, in seconds, that you want CloudFront to cache the HTTP status code specified in <code>ErrorCode</code>. When this time period has elapsed, CloudFront queries your origin to see whether the problem that caused the error has been resolved and the requested object is now available.</p> <p>If you don't want to specify a value, include an empty element, <code>&lt;ErrorCachingMinTTL&gt;</code>, in the XML document.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/custom-error-pages.html\">Customizing Error Responses</a> in the <i>Amazon CloudFront Developer Guide</i>.</p>"
+          "documentation":"<p>The minimum amount of time, in seconds, that you want CloudFront to cache the HTTP status code specified in <code>ErrorCode</code>. When this time period has elapsed, CloudFront queries your origin to see whether the problem that caused the error has been resolved and the requested object is now available.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/custom-error-pages.html\">Customizing Error Responses</a> in the <i>Amazon CloudFront Developer Guide</i>.</p>"
         }
       },
       "documentation":"<p>A complex type that controls:</p> <ul> <li> <p>Whether CloudFront replaces HTTP status codes in the 4xx and 5xx range with custom error messages before returning the response to the viewer. </p> </li> <li> <p>How long CloudFront caches HTTP status codes in the 4xx and 5xx range.</p> </li> </ul> <p>For more information about custom error pages, see <a href=\"https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/custom-error-pages.html\">Customizing Error Responses</a> in the <i>Amazon CloudFront Developer Guide</i>.</p>"
@@ -1786,7 +1786,7 @@
         },
         "ForwardedValues":{
           "shape":"ForwardedValues",
-          "documentation":"<p>A complex type that specifies how CloudFront handles query strings and cookies.</p>"
+          "documentation":"<p>A complex type that specifies how CloudFront handles query strings, cookies, and HTTP headers.</p>"
         },
         "TrustedSigners":{
           "shape":"TrustedSigners",
@@ -2060,7 +2060,7 @@
         },
         "ViewerCertificate":{
           "shape":"ViewerCertificate",
-          "documentation":"<p>A complex type that specifies whether you want viewers to use HTTP or HTTPS to request your objects, whether you're using an alternate domain name with HTTPS, and if so, if you're using AWS Certificate Manager (ACM) or a third-party certificate authority.</p>"
+          "documentation":"<p>A complex type that determines the distribution’s SSL/TLS configuration for communicating with viewers.</p>"
         },
         "Restrictions":{
           "shape":"Restrictions",
@@ -2068,7 +2068,7 @@
         },
         "WebACLId":{
           "shape":"string",
-          "documentation":"<p>A unique identifier that specifies the AWS WAF web ACL, if any, to associate with this distribution.</p> <p>AWS WAF is a web application firewall that lets you monitor the HTTP and HTTPS requests that are forwarded to CloudFront, and lets you control access to your content. Based on conditions that you specify, such as the IP addresses that requests originate from or the values of query strings, CloudFront responds to requests either with the requested content or with an HTTP 403 status code (Forbidden). You can also configure CloudFront to return a custom error page when a request is blocked. For more information about AWS WAF, see the <a href=\"http://docs.aws.amazon.com/waf/latest/developerguide/what-is-aws-waf.html\">AWS WAF Developer Guide</a>. </p>"
+          "documentation":"<p>A unique identifier that specifies the AWS WAF web ACL, if any, to associate with this distribution. To specify a web ACL created using the latest version of AWS WAF, use the ACL ARN, for example <code>arn:aws:wafv2:us-east-1:123456789012:global/webacl/ExampleWebACL/473e64fd-f30b-4765-81a0-62ad96dd167a</code>. To specify a web ACL created using AWS WAF Classic, use the ACL ID, for example <code>473e64fd-f30b-4765-81a0-62ad96dd167a</code>.</p> <p>AWS WAF is a web application firewall that lets you monitor the HTTP and HTTPS requests that are forwarded to CloudFront, and lets you control access to your content. Based on conditions that you specify, such as the IP addresses that requests originate from or the values of query strings, CloudFront responds to requests either with the requested content or with an HTTP 403 status code (Forbidden). You can also configure CloudFront to return a custom error page when a request is blocked. For more information about AWS WAF, see the <a href=\"https://docs.aws.amazon.com/waf/latest/developerguide/what-is-aws-waf.html\">AWS WAF Developer Guide</a>. </p>"
         },
         "HttpVersion":{
           "shape":"HttpVersion",
@@ -2225,7 +2225,7 @@
         },
         "ViewerCertificate":{
           "shape":"ViewerCertificate",
-          "documentation":"<p>A complex type that specifies whether you want viewers to use HTTP or HTTPS to request your objects, whether you're using an alternate domain name with HTTPS, and if so, if you're using AWS Certificate Manager (ACM) or a third-party certificate authority.</p>"
+          "documentation":"<p>A complex type that determines the distribution’s SSL/TLS configuration for communicating with viewers.</p>"
         },
         "Restrictions":{
           "shape":"Restrictions",
@@ -2630,7 +2630,7 @@
           "documentation":"<p>A complex type that contains information about the query string parameters that you want CloudFront to use for caching for this cache behavior.</p>"
         }
       },
-      "documentation":"<p>A complex type that specifies how CloudFront handles query strings and cookies.</p>"
+      "documentation":"<p>A complex type that specifies how CloudFront handles query strings, cookies, and HTTP headers.</p>"
     },
     "GeoRestriction":{
       "type":"structure",
@@ -3247,7 +3247,7 @@
       "members":{
         "Message":{"shape":"string"}
       },
-      "documentation":"<p>Query string parameters specified in the response body are not valid.</p>",
+      "documentation":"<p>The query string parameters specified are not valid.</p>",
       "error":{"httpStatusCode":400},
       "exception":true
     },
@@ -3274,7 +3274,7 @@
       "members":{
         "Message":{"shape":"string"}
       },
-      "documentation":"<p>A response code specified in the response body is not valid.</p>",
+      "documentation":"<p>A response code is not valid.</p>",
       "error":{"httpStatusCode":400},
       "exception":true
     },
@@ -3283,7 +3283,7 @@
       "members":{
         "Message":{"shape":"string"}
       },
-      "documentation":"<p>TTL order specified in the response body is not valid.</p>",
+      "documentation":"<p>The TTL order specified is not valid.</p>",
       "error":{"httpStatusCode":400},
       "exception":true
     },
@@ -3292,7 +3292,7 @@
       "members":{
         "Message":{"shape":"string"}
       },
-      "documentation":"<p>Tagging specified in the response body is not valid.</p>",
+      "documentation":"<p>The tagging specified is not valid.</p>",
       "error":{"httpStatusCode":400},
       "exception":true
     },
@@ -3301,7 +3301,7 @@
       "members":{
         "Message":{"shape":"string"}
       },
-      "documentation":"<p>A viewer certificate specified in the response body is not valid.</p>",
+      "documentation":"<p>A viewer certificate specified is not valid.</p>",
       "error":{"httpStatusCode":400},
       "exception":true
     },
@@ -3310,7 +3310,7 @@
       "members":{
         "Message":{"shape":"string"}
       },
-      "documentation":"<p>A web ACL id specified in the response body is not valid.</p>",
+      "documentation":"<p>A web ACL ID specified is not valid. To specify a web ACL created using the latest version of AWS WAF, use the ACL ARN, for example <code>arn:aws:wafv2:us-east-1:123456789012:global/webacl/ExampleWebACL/473e64fd-f30b-4765-81a0-62ad96dd167a</code>. To specify a web ACL created using AWS WAF Classic, use the ACL ID, for example <code>473e64fd-f30b-4765-81a0-62ad96dd167a</code>.</p>",
       "error":{"httpStatusCode":400},
       "exception":true
     },
@@ -5391,36 +5391,36 @@
       "members":{
         "CloudFrontDefaultCertificate":{
           "shape":"boolean",
-          "documentation":"<p>If you're using the CloudFront domain name for your distribution, such as <code>d111111abcdef8.cloudfront.net</code>, specify the following value:</p> <ul> <li> <p> <code>&lt;CloudFrontDefaultCertificate&gt;true&lt;CloudFrontDefaultCertificate&gt; </code> </p> </li> </ul>"
+          "documentation":"<p>If the distribution uses the CloudFront domain name such as <code>d111111abcdef8.cloudfront.net</code>, set this field to <code>true</code>.</p> <p>If the distribution uses <code>Aliases</code> (alternate domain names or CNAMEs), set this field to <code>false</code> and specify values for the following fields:</p> <ul> <li> <p> <code>ACMCertificateArn</code> or <code>IAMCertificateId</code> (specify a value for one, not both)</p> </li> <li> <p> <code>MinimumProtocolVersion</code> </p> </li> <li> <p> <code>SSLSupportMethod</code> </p> </li> </ul>"
         },
         "IAMCertificateId":{
           "shape":"string",
-          "documentation":"<p>If you want viewers to use HTTPS to request your objects and you're using an alternate domain name, you must choose the type of certificate that you want to use. Specify the following value if you purchased your certificate from a third-party certificate authority:</p> <ul> <li> <p> <code>&lt;IAMCertificateId&gt;<i>IAM certificate ID</i>&lt;IAMCertificateId&gt;</code> where <code> <i>IAM certificate ID</i> </code> is the ID that IAM returned when you added the certificate to the IAM certificate store.</p> </li> </ul> <p>If you specify <code>IAMCertificateId</code>, you must also specify a value for <code>SSLSupportMethod</code>.</p>"
+          "documentation":"<p>If the distribution uses <code>Aliases</code> (alternate domain names or CNAMEs) and the SSL/TLS certificate is stored in <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_server-certs.html\">AWS Identity and Access Management (AWS IAM)</a>, provide the ID of the IAM certificate.</p> <p>If you specify an IAM certificate ID, you must also specify values for <code>MinimumProtocolVerison</code> and <code>SSLSupportMethod</code>. </p>"
         },
         "ACMCertificateArn":{
           "shape":"string",
-          "documentation":"<p>If you want viewers to use HTTPS to request your objects and you're using an alternate domain name, you must choose the type of certificate that you want to use. Specify the following value if ACM provided your certificate:</p> <ul> <li> <p> <code>&lt;ACMCertificateArn&gt;<i>ARN for ACM SSL/TLS certificate</i>&lt;ACMCertificateArn&gt;</code> where <code> <i>ARN for ACM SSL/TLS certificate</i> </code> is the ARN for the ACM SSL/TLS certificate that you want to use for this distribution.</p> </li> </ul> <p>If you specify <code>ACMCertificateArn</code>, you must also specify a value for <code>SSLSupportMethod</code>.</p>"
+          "documentation":"<p>If the distribution uses <code>Aliases</code> (alternate domain names or CNAMEs) and the SSL/TLS certificate is stored in <a href=\"https://docs.aws.amazon.com/acm/latest/userguide/acm-overview.html\">AWS Certificate Manager (ACM)</a>, provide the Amazon Resource Name (ARN) of the ACM certificate. CloudFront only supports ACM certificates in the US East (N. Virginia) Region (<code>us-east-1</code>).</p> <p>If you specify an ACM certificate ARN, you must also specify values for <code>MinimumProtocolVerison</code> and <code>SSLSupportMethod</code>. </p>"
         },
         "SSLSupportMethod":{
           "shape":"SSLSupportMethod",
-          "documentation":"<p>If you specify a value for <a href=\"https://docs.aws.amazon.com/cloudfront/latest/APIReference/API_ViewerCertificate.html#cloudfront-Type-ViewerCertificate-ACMCertificateArn\">ACMCertificateArn</a> or for <a href=\"https://docs.aws.amazon.com/cloudfront/latest/APIReference/API_ViewerCertificate.html#cloudfront-Type-ViewerCertificate-IAMCertificateId\">IAMCertificateId</a>, you must also specify how you want CloudFront to serve HTTPS requests: using a method that works for browsers and clients released after 2010 or one that works for all clients.</p> <ul> <li> <p> <code>sni-only</code>: CloudFront can respond to HTTPS requests from viewers that support Server Name Indication (SNI). All modern browsers support SNI, but there are a few that don't. For a current list of the browsers that support SNI, see the <a href=\"http://en.wikipedia.org/wiki/Server_Name_Indication\">Wikipedia entry Server Name Indication</a>. To learn about options to explore if you have users with browsers that don't include SNI support, see <a href=\"https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/cnames-https-dedicated-ip-or-sni.html\">Choosing How CloudFront Serves HTTPS Requests</a> in the <i>Amazon CloudFront Developer Guide</i>.</p> </li> <li> <p> <code>vip</code>: CloudFront uses dedicated IP addresses for your content and can respond to HTTPS requests from any viewer. However, there are additional monthly charges. For details, including specific pricing information, see <a href=\"http://aws.amazon.com/cloudfront/custom-ssl-domains/\">Custom SSL options for Amazon CloudFront</a> on the AWS marketing site.</p> </li> </ul> <p>Don't specify a value for <code>SSLSupportMethod</code> if you specified <code>&lt;CloudFrontDefaultCertificate&gt;true&lt;CloudFrontDefaultCertificate&gt;</code>.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/cnames-https-dedicated-ip-or-sni.html\">Choosing How CloudFront Serves HTTPS Requests</a> in the <i>Amazon CloudFront Developer Guide</i>.</p>"
+          "documentation":"<p>If the distribution uses <code>Aliases</code> (alternate domain names or CNAMEs), specify which viewers the distribution accepts HTTPS connections from.</p> <ul> <li> <p> <code>sni-only</code> – The distribution accepts HTTPS connections from only viewers that support <a href=\"https://en.wikipedia.org/wiki/Server_Name_Indication\">server name indication (SNI)</a>. This is recommended. Most browsers and clients released after 2010 support SNI.</p> </li> <li> <p> <code>vip</code> – The distribution accepts HTTPS connections from all viewers including those that don’t support SNI. This is not recommended, and results in additional monthly charges from CloudFront.</p> </li> </ul> <p>If the distribution uses the CloudFront domain name such as <code>d111111abcdef8.cloudfront.net</code>, don’t set a value for this field.</p>"
         },
         "MinimumProtocolVersion":{
           "shape":"MinimumProtocolVersion",
-          "documentation":"<p>Specify the security policy that you want CloudFront to use for HTTPS connections. A security policy determines two settings:</p> <ul> <li> <p>The minimum SSL/TLS protocol that CloudFront uses to communicate with viewers</p> </li> <li> <p>The cipher that CloudFront uses to encrypt the content that it returns to viewers</p> </li> </ul> <note> <p>On the CloudFront console, this setting is called <b>Security policy</b>.</p> </note> <p>We recommend that you specify <code>TLSv1.1_2016</code> unless your users are using browsers or devices that do not support TLSv1.1 or later.</p> <p>When both of the following are true, you must specify <code>TLSv1</code> or later for the security policy: </p> <ul> <li> <p>You're using a custom certificate: you specified a value for <code>ACMCertificateArn</code> or for <code>IAMCertificateId</code> </p> </li> <li> <p>You're using SNI: you specified <code>sni-only</code> for <code>SSLSupportMethod</code> </p> </li> </ul> <p>If you specify <code>true</code> for <code>CloudFrontDefaultCertificate</code>, CloudFront automatically sets the security policy to <code>TLSv1</code> regardless of the value that you specify for <code>MinimumProtocolVersion</code>.</p> <p>For information about the relationship between the security policy that you choose and the protocols and ciphers that CloudFront uses to communicate with viewers, see <a href=\"https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/secure-connections-supported-viewer-protocols-ciphers.html#secure-connections-supported-ciphers\"> Supported SSL/TLS Protocols and Ciphers for Communication Between Viewers and CloudFront</a> in the <i>Amazon CloudFront Developer Guide</i>.</p>"
+          "documentation":"<p>If the distribution uses <code>Aliases</code> (alternate domain names or CNAMEs), specify the security policy that you want CloudFront to use for HTTPS connections with viewers. The security policy determines two settings:</p> <ul> <li> <p>The minimum SSL/TLS protocol that CloudFront can use to communicate with viewers.</p> </li> <li> <p>The ciphers that CloudFront can use to encrypt the content that it returns to viewers.</p> </li> </ul> <p>For more information, see <a href=\"https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/distribution-web-values-specify.html#DownloadDistValues-security-policy\">Security Policy</a> and <a href=\"https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/secure-connections-supported-viewer-protocols-ciphers.html#secure-connections-supported-ciphers\">Supported Protocols and Ciphers Between Viewers and CloudFront</a> in the <i>Amazon CloudFront Developer Guide</i>.</p> <note> <p>On the CloudFront console, this setting is called <b>Security Policy</b>.</p> </note> <p>We recommend that you specify <code>TLSv1.2_2018</code> unless your viewers are using browsers or devices that don’t support TLSv1.2.</p> <p>When you’re using SNI only (you set <code>SSLSupportMethod</code> to <code>sni-only</code>), you must specify <code>TLSv1</code> or higher. </p> <p>If the distribution uses the CloudFront domain name such as <code>d111111abcdef8.cloudfront.net</code> (you set <code>CloudFrontDefaultCertificate</code> to <code>true</code>), CloudFront automatically sets the security policy to <code>TLSv1</code> regardless of the value that you set here.</p>"
         },
         "Certificate":{
           "shape":"string",
-          "documentation":"<p>This field is no longer used. Use one of the following fields instead:</p> <ul> <li> <p> <a href=\"https://docs.aws.amazon.com/cloudfront/latest/APIReference/API_ViewerCertificate.html#cloudfront-Type-ViewerCertificate-ACMCertificateArn\">ACMCertificateArn</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/cloudfront/latest/APIReference/API_ViewerCertificate.html#cloudfront-Type-ViewerCertificate-IAMCertificateId\">IAMCertificateId</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/cloudfront/latest/APIReference/API_ViewerCertificate.html#cloudfront-Type-ViewerCertificate-CloudFrontDefaultCertificate\">CloudFrontDefaultCertificate</a> </p> </li> </ul>",
+          "documentation":"<p>This field is deprecated. Use one of the following fields instead:</p> <ul> <li> <p> <code>ACMCertificateArn</code> </p> </li> <li> <p> <code>IAMCertificateId</code> </p> </li> <li> <p> <code>CloudFrontDefaultCertificate</code> </p> </li> </ul>",
           "deprecated":true
         },
         "CertificateSource":{
           "shape":"CertificateSource",
-          "documentation":"<p>This field is no longer used. Use one of the following fields instead:</p> <ul> <li> <p> <a href=\"https://docs.aws.amazon.com/cloudfront/latest/APIReference/API_ViewerCertificate.html#cloudfront-Type-ViewerCertificate-ACMCertificateArn\">ACMCertificateArn</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/cloudfront/latest/APIReference/API_ViewerCertificate.html#cloudfront-Type-ViewerCertificate-IAMCertificateId\">IAMCertificateId</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/cloudfront/latest/APIReference/API_ViewerCertificate.html#cloudfront-Type-ViewerCertificate-CloudFrontDefaultCertificate\">CloudFrontDefaultCertificate</a> </p> </li> </ul>",
+          "documentation":"<p>This field is deprecated. Use one of the following fields instead:</p> <ul> <li> <p> <code>ACMCertificateArn</code> </p> </li> <li> <p> <code>IAMCertificateId</code> </p> </li> <li> <p> <code>CloudFrontDefaultCertificate</code> </p> </li> </ul>",
           "deprecated":true
         }
       },
-      "documentation":"<p>A complex type that specifies the following:</p> <ul> <li> <p>Whether you want viewers to use HTTP or HTTPS to request your objects.</p> </li> <li> <p>If you want viewers to use HTTPS, whether you're using an alternate domain name such as <code>example.com</code> or the CloudFront domain name for your distribution, such as <code>d111111abcdef8.cloudfront.net</code>.</p> </li> <li> <p>If you're using an alternate domain name, whether AWS Certificate Manager (ACM) provided the certificate, or you purchased a certificate from a third-party certificate authority and imported it into ACM or uploaded it to the IAM certificate store.</p> </li> </ul> <p>Specify only one of the following values: </p> <ul> <li> <p> <a href=\"https://docs.aws.amazon.com/cloudfront/latest/APIReference/API_ViewerCertificate.html#cloudfront-Type-ViewerCertificate-ACMCertificateArn\">ACMCertificateArn</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/cloudfront/latest/APIReference/API_ViewerCertificate.html#cloudfront-Type-ViewerCertificate-IAMCertificateId\">IAMCertificateId</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/cloudfront/latest/APIReference/API_ViewerCertificate.html#cloudfront-Type-ViewerCertificate-CloudFrontDefaultCertificate\">CloudFrontDefaultCertificate</a> </p> </li> </ul> <p>For more information, see <a href=\"https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/SecureConnections.html#CNAMEsAndHTTPS\"> Using Alternate Domain Names and HTTPS</a> in the <i>Amazon CloudFront Developer Guide</i>.</p>"
+      "documentation":"<p>A complex type that determines the distribution’s SSL/TLS configuration for communicating with viewers.</p> <p>If the distribution doesn’t use <code>Aliases</code> (also known as alternate domain names or CNAMEs)—that is, if the distribution uses the CloudFront domain name such as <code>d111111abcdef8.cloudfront.net</code>—set <code>CloudFrontDefaultCertificate</code> to <code>true</code> and leave all other fields empty.</p> <p>If the distribution uses <code>Aliases</code> (alternate domain names or CNAMEs), use the fields in this type to specify the following settings:</p> <ul> <li> <p>Which viewers the distribution accepts HTTPS connections from: only viewers that support <a href=\"https://en.wikipedia.org/wiki/Server_Name_Indication\">server name indication (SNI)</a> (recommended), or all viewers including those that don’t support SNI.</p> <ul> <li> <p>To accept HTTPS connections from only viewers that support SNI, set <code>SSLSupportMethod</code> to <code>sni-only</code>. This is recommended. Most browsers and clients released after 2010 support SNI. </p> </li> <li> <p>To accept HTTPS connections from all viewers, including those that don’t support SNI, set <code>SSLSupportMethod</code> to <code>vip</code>. This is not recommended, and results in additional monthly charges from CloudFront. </p> </li> </ul> </li> <li> <p>The minimum SSL/TLS protocol version that the distribution can use to communicate with viewers. To specify a minimum version, choose a value for <code>MinimumProtocolVersion</code>. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/distribution-web-values-specify.html#DownloadDistValues-security-policy\">Security Policy</a> in the <i>Amazon CloudFront Developer Guide</i>.</p> </li> <li> <p>The location of the SSL/TLS certificate, <a href=\"https://docs.aws.amazon.com/acm/latest/userguide/acm-overview.html\">AWS Certificate Manager (ACM)</a> (recommended) or <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_server-certs.html\">AWS Identity and Access Management (AWS IAM)</a>. You specify the location by setting a value in one of the following fields (not both):</p> <ul> <li> <p> <code>ACMCertificateArn</code> </p> </li> <li> <p> <code>IAMCertificateId</code> </p> </li> </ul> </li> </ul> <p>All distributions support HTTPS connections from viewers. To require viewers to use HTTPS only, or to redirect them from HTTP to HTTPS, use <code>ViewerProtocolPolicy</code> in the <code>CacheBehavior</code> or <code>DefaultCacheBehavior</code>. To specify how CloudFront should use SSL/TLS to communicate with your custom origin, use <code>CustomOriginConfig</code>.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/using-https.html\">Using HTTPS with CloudFront</a> and <a href=\"https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/using-https-alternate-domain-names.html\"> Using Alternate Domain Names and HTTPS</a> in the <i>Amazon CloudFront Developer Guide</i>.</p>"
     },
     "ViewerProtocolPolicy":{
       "type":"string",
diff --git a/services/cloudfront/src/test/resources/cucumber.properties b/services/cloudfront/src/test/resources/cucumber.properties
index 27755b861ca4..6a4571d3493d 100644
--- a/services/cloudfront/src/test/resources/cucumber.properties
+++ b/services/cloudfront/src/test/resources/cucumber.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/cloudhsm/build.properties b/services/cloudhsm/build.properties
index ecf2dae6fcb1..15ec2da1fc71 100644
--- a/services/cloudhsm/build.properties
+++ b/services/cloudhsm/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/cloudhsm/pom.xml b/services/cloudhsm/pom.xml
index f8fa2654646f..335454f43a33 100644
--- a/services/cloudhsm/pom.xml
+++ b/services/cloudhsm/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>cloudhsm</artifactId>
     <name>AWS Java SDK :: Services :: AWS CloudHSM</name>
diff --git a/services/cloudhsm/src/it/java/software/amazon/awssdk/services/cloudhsm/IntegrationTestBase.java b/services/cloudhsm/src/it/java/software/amazon/awssdk/services/cloudhsm/IntegrationTestBase.java
index c0f24d67aabe..424ad090273c 100644
--- a/services/cloudhsm/src/it/java/software/amazon/awssdk/services/cloudhsm/IntegrationTestBase.java
+++ b/services/cloudhsm/src/it/java/software/amazon/awssdk/services/cloudhsm/IntegrationTestBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/cloudhsm/src/test/resources/cucumber.properties b/services/cloudhsm/src/test/resources/cucumber.properties
index 6918d14a076e..ad120b7a36f7 100644
--- a/services/cloudhsm/src/test/resources/cucumber.properties
+++ b/services/cloudhsm/src/test/resources/cucumber.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/cloudhsmv2/pom.xml b/services/cloudhsmv2/pom.xml
index 5dc4b0e0fe87..7ad8750fe0c1 100644
--- a/services/cloudhsmv2/pom.xml
+++ b/services/cloudhsmv2/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>services</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>cloudhsmv2</artifactId>
diff --git a/services/cloudhsmv2/src/main/resources/codegen-resources/service-2.json b/services/cloudhsmv2/src/main/resources/codegen-resources/service-2.json
index 31c7a2614e89..51c2a78b733b 100644
--- a/services/cloudhsmv2/src/main/resources/codegen-resources/service-2.json
+++ b/services/cloudhsmv2/src/main/resources/codegen-resources/service-2.json
@@ -23,11 +23,12 @@
       "input":{"shape":"CopyBackupToRegionRequest"},
       "output":{"shape":"CopyBackupToRegionResponse"},
       "errors":[
+        {"shape":"CloudHsmAccessDeniedException"},
         {"shape":"CloudHsmInternalFailureException"},
-        {"shape":"CloudHsmServiceException"},
-        {"shape":"CloudHsmResourceNotFoundException"},
         {"shape":"CloudHsmInvalidRequestException"},
-        {"shape":"CloudHsmAccessDeniedException"}
+        {"shape":"CloudHsmResourceNotFoundException"},
+        {"shape":"CloudHsmServiceException"},
+        {"shape":"CloudHsmTagException"}
       ],
       "documentation":"<p>Copy an AWS CloudHSM cluster backup to a different region.</p>"
     },
@@ -40,11 +41,12 @@
       "input":{"shape":"CreateClusterRequest"},
       "output":{"shape":"CreateClusterResponse"},
       "errors":[
+        {"shape":"CloudHsmAccessDeniedException"},
         {"shape":"CloudHsmInternalFailureException"},
-        {"shape":"CloudHsmServiceException"},
-        {"shape":"CloudHsmResourceNotFoundException"},
         {"shape":"CloudHsmInvalidRequestException"},
-        {"shape":"CloudHsmAccessDeniedException"}
+        {"shape":"CloudHsmResourceNotFoundException"},
+        {"shape":"CloudHsmServiceException"},
+        {"shape":"CloudHsmTagException"}
       ],
       "documentation":"<p>Creates a new AWS CloudHSM cluster.</p>"
     },
@@ -74,13 +76,13 @@
       "input":{"shape":"DeleteBackupRequest"},
       "output":{"shape":"DeleteBackupResponse"},
       "errors":[
+        {"shape":"CloudHsmAccessDeniedException"},
         {"shape":"CloudHsmInternalFailureException"},
-        {"shape":"CloudHsmServiceException"},
-        {"shape":"CloudHsmResourceNotFoundException"},
         {"shape":"CloudHsmInvalidRequestException"},
-        {"shape":"CloudHsmAccessDeniedException"}
+        {"shape":"CloudHsmResourceNotFoundException"},
+        {"shape":"CloudHsmServiceException"}
       ],
-      "documentation":"<p>Deletes a specified AWS CloudHSM backup. A backup can be restored up to 7 days after the DeleteBackup request. For more information on restoring a backup, see <a>RestoreBackup</a> </p>"
+      "documentation":"<p>Deletes a specified AWS CloudHSM backup. A backup can be restored up to 7 days after the DeleteBackup request is made. For more information on restoring a backup, see <a>RestoreBackup</a>.</p>"
     },
     "DeleteCluster":{
       "name":"DeleteCluster",
@@ -91,11 +93,12 @@
       "input":{"shape":"DeleteClusterRequest"},
       "output":{"shape":"DeleteClusterResponse"},
       "errors":[
+        {"shape":"CloudHsmAccessDeniedException"},
         {"shape":"CloudHsmInternalFailureException"},
-        {"shape":"CloudHsmServiceException"},
-        {"shape":"CloudHsmResourceNotFoundException"},
         {"shape":"CloudHsmInvalidRequestException"},
-        {"shape":"CloudHsmAccessDeniedException"}
+        {"shape":"CloudHsmResourceNotFoundException"},
+        {"shape":"CloudHsmServiceException"},
+        {"shape":"CloudHsmTagException"}
       ],
       "documentation":"<p>Deletes the specified AWS CloudHSM cluster. Before you can delete a cluster, you must delete all HSMs in the cluster. To see if the cluster contains any HSMs, use <a>DescribeClusters</a>. To delete an HSM, use <a>DeleteHsm</a>.</p>"
     },
@@ -125,11 +128,12 @@
       "input":{"shape":"DescribeBackupsRequest"},
       "output":{"shape":"DescribeBackupsResponse"},
       "errors":[
+        {"shape":"CloudHsmAccessDeniedException"},
         {"shape":"CloudHsmInternalFailureException"},
-        {"shape":"CloudHsmServiceException"},
-        {"shape":"CloudHsmResourceNotFoundException"},
         {"shape":"CloudHsmInvalidRequestException"},
-        {"shape":"CloudHsmAccessDeniedException"}
+        {"shape":"CloudHsmResourceNotFoundException"},
+        {"shape":"CloudHsmServiceException"},
+        {"shape":"CloudHsmTagException"}
       ],
       "documentation":"<p>Gets information about backups of AWS CloudHSM clusters.</p> <p>This is a paginated operation, which means that each response might contain only a subset of all the backups. When the response contains only a subset of backups, it includes a <code>NextToken</code> value. Use this value in a subsequent <code>DescribeBackups</code> request to get more backups. When you receive a response with no <code>NextToken</code> (or an empty or null value), that means there are no more backups to get.</p>"
     },
@@ -142,10 +146,11 @@
       "input":{"shape":"DescribeClustersRequest"},
       "output":{"shape":"DescribeClustersResponse"},
       "errors":[
+        {"shape":"CloudHsmAccessDeniedException"},
         {"shape":"CloudHsmInternalFailureException"},
-        {"shape":"CloudHsmServiceException"},
         {"shape":"CloudHsmInvalidRequestException"},
-        {"shape":"CloudHsmAccessDeniedException"}
+        {"shape":"CloudHsmServiceException"},
+        {"shape":"CloudHsmTagException"}
       ],
       "documentation":"<p>Gets information about AWS CloudHSM clusters.</p> <p>This is a paginated operation, which means that each response might contain only a subset of all the clusters. When the response contains only a subset of clusters, it includes a <code>NextToken</code> value. Use this value in a subsequent <code>DescribeClusters</code> request to get more clusters. When you receive a response with no <code>NextToken</code> (or an empty or null value), that means there are no more clusters to get.</p>"
     },
@@ -158,11 +163,11 @@
       "input":{"shape":"InitializeClusterRequest"},
       "output":{"shape":"InitializeClusterResponse"},
       "errors":[
+        {"shape":"CloudHsmAccessDeniedException"},
         {"shape":"CloudHsmInternalFailureException"},
-        {"shape":"CloudHsmServiceException"},
-        {"shape":"CloudHsmResourceNotFoundException"},
         {"shape":"CloudHsmInvalidRequestException"},
-        {"shape":"CloudHsmAccessDeniedException"}
+        {"shape":"CloudHsmResourceNotFoundException"},
+        {"shape":"CloudHsmServiceException"}
       ],
       "documentation":"<p>Claims an AWS CloudHSM cluster by submitting the cluster certificate issued by your issuing certificate authority (CA) and the CA's root certificate. Before you can claim a cluster, you must sign the cluster's certificate signing request (CSR) with your issuing CA. To get the cluster's CSR, use <a>DescribeClusters</a>.</p>"
     },
@@ -175,11 +180,12 @@
       "input":{"shape":"ListTagsRequest"},
       "output":{"shape":"ListTagsResponse"},
       "errors":[
+        {"shape":"CloudHsmAccessDeniedException"},
         {"shape":"CloudHsmInternalFailureException"},
-        {"shape":"CloudHsmServiceException"},
-        {"shape":"CloudHsmResourceNotFoundException"},
         {"shape":"CloudHsmInvalidRequestException"},
-        {"shape":"CloudHsmAccessDeniedException"}
+        {"shape":"CloudHsmResourceNotFoundException"},
+        {"shape":"CloudHsmServiceException"},
+        {"shape":"CloudHsmTagException"}
       ],
       "documentation":"<p>Gets a list of tags for the specified AWS CloudHSM cluster.</p> <p>This is a paginated operation, which means that each response might contain only a subset of all the tags. When the response contains only a subset of tags, it includes a <code>NextToken</code> value. Use this value in a subsequent <code>ListTags</code> request to get more tags. When you receive a response with no <code>NextToken</code> (or an empty or null value), that means there are no more tags to get.</p>"
     },
@@ -192,13 +198,13 @@
       "input":{"shape":"RestoreBackupRequest"},
       "output":{"shape":"RestoreBackupResponse"},
       "errors":[
+        {"shape":"CloudHsmAccessDeniedException"},
         {"shape":"CloudHsmInternalFailureException"},
-        {"shape":"CloudHsmServiceException"},
-        {"shape":"CloudHsmResourceNotFoundException"},
         {"shape":"CloudHsmInvalidRequestException"},
-        {"shape":"CloudHsmAccessDeniedException"}
+        {"shape":"CloudHsmResourceNotFoundException"},
+        {"shape":"CloudHsmServiceException"}
       ],
-      "documentation":"<p>Restores a specified AWS CloudHSM backup that is in the <code>PENDING_DELETION</code> state. For more information on deleting a backup, see <a>DeleteBackup</a>.</p>"
+      "documentation":"<p>Restores a specified AWS CloudHSM backup that is in the <code>PENDING_DELETION</code> state. For mor information on deleting a backup, see <a>DeleteBackup</a>.</p>"
     },
     "TagResource":{
       "name":"TagResource",
@@ -209,11 +215,12 @@
       "input":{"shape":"TagResourceRequest"},
       "output":{"shape":"TagResourceResponse"},
       "errors":[
+        {"shape":"CloudHsmAccessDeniedException"},
         {"shape":"CloudHsmInternalFailureException"},
-        {"shape":"CloudHsmServiceException"},
-        {"shape":"CloudHsmResourceNotFoundException"},
         {"shape":"CloudHsmInvalidRequestException"},
-        {"shape":"CloudHsmAccessDeniedException"}
+        {"shape":"CloudHsmResourceNotFoundException"},
+        {"shape":"CloudHsmServiceException"},
+        {"shape":"CloudHsmTagException"}
       ],
       "documentation":"<p>Adds or overwrites one or more tags for the specified AWS CloudHSM cluster.</p>"
     },
@@ -226,11 +233,12 @@
       "input":{"shape":"UntagResourceRequest"},
       "output":{"shape":"UntagResourceResponse"},
       "errors":[
+        {"shape":"CloudHsmAccessDeniedException"},
         {"shape":"CloudHsmInternalFailureException"},
-        {"shape":"CloudHsmServiceException"},
-        {"shape":"CloudHsmResourceNotFoundException"},
         {"shape":"CloudHsmInvalidRequestException"},
-        {"shape":"CloudHsmAccessDeniedException"}
+        {"shape":"CloudHsmResourceNotFoundException"},
+        {"shape":"CloudHsmServiceException"},
+        {"shape":"CloudHsmTagException"}
       ],
       "documentation":"<p>Removes the specified tag or tags from the specified AWS CloudHSM cluster.</p>"
     }
@@ -256,16 +264,29 @@
           "shape":"Timestamp",
           "documentation":"<p>The date and time when the backup was created.</p>"
         },
-        "CopyTimestamp":{"shape":"Timestamp"},
-        "SourceRegion":{"shape":"Region"},
-        "SourceBackup":{"shape":"BackupId"},
-        "SourceCluster":{"shape":"ClusterId"},
+        "CopyTimestamp":{
+          "shape":"Timestamp",
+          "documentation":"<p>The date and time when the backup was copied from a source backup.</p>"
+        },
+        "SourceRegion":{
+          "shape":"Region",
+          "documentation":"<p>The AWS region that contains the source backup from which the new backup was copied.</p>"
+        },
+        "SourceBackup":{
+          "shape":"BackupId",
+          "documentation":"<p>The identifier (ID) of the source backup from which the new backup was copied.</p>"
+        },
+        "SourceCluster":{
+          "shape":"ClusterId",
+          "documentation":"<p>The identifier (ID) of the cluster containing the source backup from which the new backup was copied. .</p>"
+        },
         "DeleteTimestamp":{
           "shape":"Timestamp",
           "documentation":"<p>The date and time when the backup will be permanently deleted.</p>"
-        }
+        },
+        "TagList":{"shape":"TagList"}
       },
-      "documentation":"<p>Contains information about a backup of an AWS CloudHSM cluster.</p>"
+      "documentation":"<p>Contains information about a backup of an AWS CloudHSM cluster. All backup objects contain the BackupId, BackupState, ClusterId, and CreateTimestamp parameters. Backups that were copied into a destination region additionally contain the CopyTimestamp, SourceBackup, SourceCluster, and SourceRegion paramters. A backup that is pending deletion will include the DeleteTimestamp parameter.</p>"
     },
     "BackupId":{
       "type":"string",
@@ -361,6 +382,13 @@
       "documentation":"<p>The request was rejected because an error occurred.</p>",
       "exception":true
     },
+    "CloudHsmTagException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"errorMessage"}
+      },
+      "exception":true
+    },
     "Cluster":{
       "type":"structure",
       "members":{
@@ -406,7 +434,7 @@
         },
         "SubnetMapping":{
           "shape":"ExternalSubnetMapping",
-          "documentation":"<p>A map of the cluster's subnets and their corresponding Availability Zones.</p>"
+          "documentation":"<p>A map from availability zone to the cluster’s subnet in that availability zone.</p>"
         },
         "VpcId":{
           "shape":"VpcId",
@@ -415,7 +443,8 @@
         "Certificates":{
           "shape":"Certificates",
           "documentation":"<p>Contains one or more certificates or a certificate signing request (CSR).</p>"
-        }
+        },
+        "TagList":{"shape":"TagList"}
       },
       "documentation":"<p>Contains information about an AWS CloudHSM cluster.</p>"
     },
@@ -455,7 +484,8 @@
         "BackupId":{
           "shape":"BackupId",
           "documentation":"<p>The ID of the backup that will be copied to the destination region. </p>"
-        }
+        },
+        "TagList":{"shape":"TagList"}
       }
     },
     "CopyBackupToRegionResponse":{
@@ -485,7 +515,8 @@
         "SourceBackupId":{
           "shape":"BackupId",
           "documentation":"<p>The identifier (ID) of the cluster backup to restore. Use this value to restore the cluster from a backup instead of creating a new cluster. To find the backup ID, use <a>DescribeBackups</a>.</p>"
-        }
+        },
+        "TagList":{"shape":"TagList"}
       }
     },
     "CreateClusterResponse":{
@@ -611,7 +642,10 @@
           "shape":"Filters",
           "documentation":"<p>One or more filters to limit the items returned in the response.</p> <p>Use the <code>backupIds</code> filter to return only the specified backups. Specify backups by their backup identifier (ID).</p> <p>Use the <code>sourceBackupIds</code> filter to return only the backups created from a source backup. The <code>sourceBackupID</code> of a source backup is returned by the <a>CopyBackupToRegion</a> operation.</p> <p>Use the <code>clusterIds</code> filter to return only the backups for the specified clusters. Specify clusters by their cluster identifier (ID).</p> <p>Use the <code>states</code> filter to return only backups that match the specified state.</p>"
         },
-        "SortAscending":{"shape":"Boolean"}
+        "SortAscending":{
+          "shape":"Boolean",
+          "documentation":"<p>Designates whether or not to sort the return backups by ascending chronological order of generation.</p>"
+        }
       }
     },
     "DescribeBackupsResponse":{
@@ -660,11 +694,24 @@
     "DestinationBackup":{
       "type":"structure",
       "members":{
-        "CreateTimestamp":{"shape":"Timestamp"},
-        "SourceRegion":{"shape":"Region"},
-        "SourceBackup":{"shape":"BackupId"},
-        "SourceCluster":{"shape":"ClusterId"}
-      }
+        "CreateTimestamp":{
+          "shape":"Timestamp",
+          "documentation":"<p>The date and time when both the source backup was created.</p>"
+        },
+        "SourceRegion":{
+          "shape":"Region",
+          "documentation":"<p>The AWS region that contains the source backup from which the new backup was copied.</p>"
+        },
+        "SourceBackup":{
+          "shape":"BackupId",
+          "documentation":"<p>The identifier (ID) of the source backup from which the new backup was copied.</p>"
+        },
+        "SourceCluster":{
+          "shape":"ClusterId",
+          "documentation":"<p>The identifier (ID) of the cluster containing the source backup from which the new backup was copied.</p>"
+        }
+      },
+      "documentation":"<p>Contains information about the backup that will be copied and created by the <a>CopyBackupToRegion</a> operation.</p>"
     },
     "EniId":{
       "type":"string",
@@ -767,7 +814,7 @@
         },
         "TrustAnchor":{
           "shape":"Cert",
-          "documentation":"<p>The issuing certificate of the issuing certificate authority (CA) that issued (signed) the cluster certificate. This can be a root (self-signed) certificate or a certificate chain that begins with the certificate that issued the cluster certificate and ends with a root certificate. The certificate or certificate chain must be in PEM format and can contain a maximum of 5000 characters.</p>"
+          "documentation":"<p>The issuing certificate of the issuing certificate authority (CA) that issued (signed) the cluster certificate. You must use a self-signed certificate. The certificate used to sign the HSM CSR must be directly available, and thus must be the root certificate. The certificate must be in PEM format and can contain a maximum of 5000 characters.</p>"
         }
       }
     },
@@ -793,7 +840,7 @@
       "required":["ResourceId"],
       "members":{
         "ResourceId":{
-          "shape":"ClusterId",
+          "shape":"ResourceId",
           "documentation":"<p>The cluster identifier (ID) for the cluster whose tags you are getting. To find the cluster ID, use <a>DescribeClusters</a>.</p>"
         },
         "NextToken":{
@@ -839,6 +886,10 @@
       "type":"string",
       "pattern":"[a-z]{2}(-(gov))?-(east|west|north|south|central){1,2}-\\d"
     },
+    "ResourceId":{
+      "type":"string",
+      "pattern":"(?:cluster|backup)-[2-7a-zA-Z]{11,16}"
+    },
     "RestoreBackupRequest":{
       "type":"structure",
       "required":["BackupId"],
@@ -860,7 +911,7 @@
     },
     "SecurityGroup":{
       "type":"string",
-      "pattern":"sg-[0-9a-fA-F]"
+      "pattern":"sg-[0-9a-fA-F]{8,17}"
     },
     "StateMessage":{
       "type":"string",
@@ -926,7 +977,7 @@
       ],
       "members":{
         "ResourceId":{
-          "shape":"ClusterId",
+          "shape":"ResourceId",
           "documentation":"<p>The cluster identifier (ID) for the cluster that you are tagging. To find the cluster ID, use <a>DescribeClusters</a>.</p>"
         },
         "TagList":{
@@ -955,7 +1006,7 @@
       ],
       "members":{
         "ResourceId":{
-          "shape":"ClusterId",
+          "shape":"ResourceId",
           "documentation":"<p>The cluster identifier (ID) for the cluster whose tags you are removing. To find the cluster ID, use <a>DescribeClusters</a>.</p>"
         },
         "TagKeyList":{
@@ -975,5 +1026,5 @@
     },
     "errorMessage":{"type":"string"}
   },
-  "documentation":"<p>For more information about AWS CloudHSM, see <a href=\"http://aws.amazon.com/cloudhsm/\">AWS CloudHSM</a> and the <a href=\"http://docs.aws.amazon.com/cloudhsm/latest/userguide/\">AWS CloudHSM User Guide</a>.</p>"
+  "documentation":"<p>For more information about AWS CloudHSM, see <a href=\"http://aws.amazon.com/cloudhsm/\">AWS CloudHSM</a> and the <a href=\"https://docs.aws.amazon.com/cloudhsm/latest/userguide/\">AWS CloudHSM User Guide</a>.</p>"
 }
diff --git a/services/cloudsearch/build.properties b/services/cloudsearch/build.properties
index ecf2dae6fcb1..15ec2da1fc71 100644
--- a/services/cloudsearch/build.properties
+++ b/services/cloudsearch/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/cloudsearch/pom.xml b/services/cloudsearch/pom.xml
index 8b3868cdd5eb..ba2d4aa52aaf 100644
--- a/services/cloudsearch/pom.xml
+++ b/services/cloudsearch/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>cloudsearch</artifactId>
     <name>AWS Java SDK :: Services :: Amazon CloudSearch</name>
diff --git a/services/cloudsearch/src/it/java/software/amazon/awssdk/services/cloudsearch/CloudSearchv2IntegrationTest.java b/services/cloudsearch/src/it/java/software/amazon/awssdk/services/cloudsearch/CloudSearchv2IntegrationTest.java
index 6385f56d2396..85838e4037bd 100644
--- a/services/cloudsearch/src/it/java/software/amazon/awssdk/services/cloudsearch/CloudSearchv2IntegrationTest.java
+++ b/services/cloudsearch/src/it/java/software/amazon/awssdk/services/cloudsearch/CloudSearchv2IntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/cloudsearch/src/main/resources/codegen-resources/paginators-1.json b/services/cloudsearch/src/main/resources/codegen-resources/paginators-1.json
new file mode 100644
index 000000000000..fc7e95d086ed
--- /dev/null
+++ b/services/cloudsearch/src/main/resources/codegen-resources/paginators-1.json
@@ -0,0 +1,19 @@
+{
+  "pagination": {
+    "DescribeAnalysisSchemes": {
+      "result_key": "AnalysisSchemes"
+    },
+    "DescribeDomains": {
+      "result_key": "DomainStatusList"
+    },
+    "DescribeExpressions": {
+      "result_key": "Expressions"
+    },
+    "DescribeIndexFields": {
+      "result_key": "IndexFields"
+    },
+    "DescribeSuggesters": {
+      "result_key": "Suggesters"
+    }
+  }
+}
\ No newline at end of file
diff --git a/services/cloudsearch/src/main/resources/codegen-resources/service-2.json b/services/cloudsearch/src/main/resources/codegen-resources/service-2.json
index 6d7ccf17b5c1..8dcf4c6ebe6b 100644
--- a/services/cloudsearch/src/main/resources/codegen-resources/service-2.json
+++ b/services/cloudsearch/src/main/resources/codegen-resources/service-2.json
@@ -3,14 +3,13 @@
   "metadata":{
     "apiVersion":"2013-01-01",
     "endpointPrefix":"cloudsearch",
+    "protocol":"query",
     "serviceFullName":"Amazon CloudSearch",
-    "serviceId": "CloudSearch",
+    "serviceId":"CloudSearch",
     "signatureVersion":"v4",
-    "xmlNamespace":"http://cloudsearch.amazonaws.com/doc/2013-01-01/",
-    "protocol":"query",
-    "uid":"cloudsearch-2013-01-01"
+    "uid":"cloudsearch-2013-01-01",
+    "xmlNamespace":"http://cloudsearch.amazonaws.com/doc/2013-01-01/"
   },
-  "documentation":"<fullname>Amazon CloudSearch Configuration Service</fullname> <p>You use the Amazon CloudSearch configuration service to create, configure, and manage search domains. Configuration service requests are submitted using the AWS Query protocol. AWS Query requests are HTTP or HTTPS requests submitted via HTTP GET or POST with a query parameter named Action.</p> <p>The endpoint for configuration service requests is region-specific: cloudsearch.<i>region</i>.amazonaws.com. For example, cloudsearch.us-east-1.amazonaws.com. For a current list of supported regions and endpoints, see <a href=\"http://docs.aws.amazon.com/general/latest/gr/rande.html#cloudsearch_region\" target=\"_blank\">Regions and Endpoints</a>.</p>",
   "operations":{
     "BuildSuggesters":{
       "name":"BuildSuggesters",
@@ -18,40 +17,15 @@
         "method":"POST",
         "requestUri":"/"
       },
-      "input":{
-        "shape":"BuildSuggestersRequest",
-        "documentation":"<p>Container for the parameters to the <code><a>BuildSuggester</a></code> operation. Specifies the name of the domain you want to update.</p>"
-      },
+      "input":{"shape":"BuildSuggestersRequest"},
       "output":{
         "shape":"BuildSuggestersResponse",
-        "documentation":"<p>The result of a <code>BuildSuggester</code> request. Contains a list of the fields used for suggestions.</p>",
         "resultWrapper":"BuildSuggestersResult"
       },
       "errors":[
-        {
-          "shape":"BaseException",
-          "exception":true,
-          "documentation":"<p>An error occurred while processing the request.</p>"
-        },
-        {
-          "shape":"InternalException",
-          "error":{
-            "code":"InternalException",
-            "httpStatusCode":500
-          },
-          "exception":true,
-          "documentation":"<p>An internal error occurred while processing the request. If this problem persists, report an issue from the <a href=\"http://status.aws.amazon.com/\" target=\"_blank\">Service Health Dashboard</a>.</p>"
-        },
-        {
-          "shape":"ResourceNotFoundException",
-          "error":{
-            "code":"ResourceNotFound",
-            "httpStatusCode":409,
-            "senderFault":true
-          },
-          "exception":true,
-          "documentation":"<p>The request was rejected because it attempted to reference a resource that does not exist.</p>"
-        }
+        {"shape":"BaseException"},
+        {"shape":"InternalException"},
+        {"shape":"ResourceNotFoundException"}
       ],
       "documentation":"<p>Indexes the search suggestions. For more information, see <a href=\"http://docs.aws.amazon.com/cloudsearch/latest/developerguide/getting-suggestions.html#configuring-suggesters\">Configuring Suggesters</a> in the <i>Amazon CloudSearch Developer Guide</i>.</p>"
     },
@@ -61,40 +35,15 @@
         "method":"POST",
         "requestUri":"/"
       },
-      "input":{
-        "shape":"CreateDomainRequest",
-        "documentation":"<p>Container for the parameters to the <code><a>CreateDomain</a></code> operation. Specifies a name for the new search domain.</p>"
-      },
+      "input":{"shape":"CreateDomainRequest"},
       "output":{
         "shape":"CreateDomainResponse",
-        "documentation":"<p>The result of a <code>CreateDomainRequest</code>. Contains the status of a newly created domain.</p>",
         "resultWrapper":"CreateDomainResult"
       },
       "errors":[
-        {
-          "shape":"BaseException",
-          "exception":true,
-          "documentation":"<p>An error occurred while processing the request.</p>"
-        },
-        {
-          "shape":"InternalException",
-          "error":{
-            "code":"InternalException",
-            "httpStatusCode":500
-          },
-          "exception":true,
-          "documentation":"<p>An internal error occurred while processing the request. If this problem persists, report an issue from the <a href=\"http://status.aws.amazon.com/\" target=\"_blank\">Service Health Dashboard</a>.</p>"
-        },
-        {
-          "shape":"LimitExceededException",
-          "error":{
-            "code":"LimitExceeded",
-            "httpStatusCode":409,
-            "senderFault":true
-          },
-          "exception":true,
-          "documentation":"<p>The request was rejected because a resource limit has already been met.</p>"
-        }
+        {"shape":"BaseException"},
+        {"shape":"InternalException"},
+        {"shape":"LimitExceededException"}
       ],
       "documentation":"<p>Creates a new search domain. For more information, see <a href=\"http://docs.aws.amazon.com/cloudsearch/latest/developerguide/creating-domains.html\" target=\"_blank\">Creating a Search Domain</a> in the <i>Amazon CloudSearch Developer Guide</i>.</p>"
     },
@@ -104,60 +53,17 @@
         "method":"POST",
         "requestUri":"/"
       },
-      "input":{
-        "shape":"DefineAnalysisSchemeRequest",
-        "documentation":"<p>Container for the parameters to the <code><a>DefineAnalysisScheme</a></code> operation. Specifies the name of the domain you want to update and the analysis scheme configuration.</p>"
-      },
+      "input":{"shape":"DefineAnalysisSchemeRequest"},
       "output":{
         "shape":"DefineAnalysisSchemeResponse",
-        "documentation":"<p>The result of a <code><a>DefineAnalysisScheme</a></code> request. Contains the status of the newly-configured analysis scheme.</p>",
         "resultWrapper":"DefineAnalysisSchemeResult"
       },
       "errors":[
-        {
-          "shape":"BaseException",
-          "exception":true,
-          "documentation":"<p>An error occurred while processing the request.</p>"
-        },
-        {
-          "shape":"InternalException",
-          "error":{
-            "code":"InternalException",
-            "httpStatusCode":500
-          },
-          "exception":true,
-          "documentation":"<p>An internal error occurred while processing the request. If this problem persists, report an issue from the <a href=\"http://status.aws.amazon.com/\" target=\"_blank\">Service Health Dashboard</a>.</p>"
-        },
-        {
-          "shape":"LimitExceededException",
-          "error":{
-            "code":"LimitExceeded",
-            "httpStatusCode":409,
-            "senderFault":true
-          },
-          "exception":true,
-          "documentation":"<p>The request was rejected because a resource limit has already been met.</p>"
-        },
-        {
-          "shape":"InvalidTypeException",
-          "error":{
-            "code":"InvalidType",
-            "httpStatusCode":409,
-            "senderFault":true
-          },
-          "exception":true,
-          "documentation":"<p>The request was rejected because it specified an invalid type definition.</p>"
-        },
-        {
-          "shape":"ResourceNotFoundException",
-          "error":{
-            "code":"ResourceNotFound",
-            "httpStatusCode":409,
-            "senderFault":true
-          },
-          "exception":true,
-          "documentation":"<p>The request was rejected because it attempted to reference a resource that does not exist.</p>"
-        }
+        {"shape":"BaseException"},
+        {"shape":"InternalException"},
+        {"shape":"LimitExceededException"},
+        {"shape":"InvalidTypeException"},
+        {"shape":"ResourceNotFoundException"}
       ],
       "documentation":"<p>Configures an analysis scheme that can be applied to a <code>text</code> or <code>text-array</code> field to define language-specific text processing options. For more information, see <a href=\"http://docs.aws.amazon.com/cloudsearch/latest/developerguide/configuring-analysis-schemes.html\" target=\"_blank\">Configuring Analysis Schemes</a> in the <i>Amazon CloudSearch Developer Guide</i>.</p>"
     },
@@ -167,60 +73,17 @@
         "method":"POST",
         "requestUri":"/"
       },
-      "input":{
-        "shape":"DefineExpressionRequest",
-        "documentation":"<p>Container for the parameters to the <code><a>DefineExpression</a></code> operation. Specifies the name of the domain you want to update and the expression you want to configure.</p>"
-      },
+      "input":{"shape":"DefineExpressionRequest"},
       "output":{
         "shape":"DefineExpressionResponse",
-        "documentation":"<p>The result of a <code>DefineExpression</code> request. Contains the status of the newly-configured expression.</p>",
         "resultWrapper":"DefineExpressionResult"
       },
       "errors":[
-        {
-          "shape":"BaseException",
-          "exception":true,
-          "documentation":"<p>An error occurred while processing the request.</p>"
-        },
-        {
-          "shape":"InternalException",
-          "error":{
-            "code":"InternalException",
-            "httpStatusCode":500
-          },
-          "exception":true,
-          "documentation":"<p>An internal error occurred while processing the request. If this problem persists, report an issue from the <a href=\"http://status.aws.amazon.com/\" target=\"_blank\">Service Health Dashboard</a>.</p>"
-        },
-        {
-          "shape":"LimitExceededException",
-          "error":{
-            "code":"LimitExceeded",
-            "httpStatusCode":409,
-            "senderFault":true
-          },
-          "exception":true,
-          "documentation":"<p>The request was rejected because a resource limit has already been met.</p>"
-        },
-        {
-          "shape":"InvalidTypeException",
-          "error":{
-            "code":"InvalidType",
-            "httpStatusCode":409,
-            "senderFault":true
-          },
-          "exception":true,
-          "documentation":"<p>The request was rejected because it specified an invalid type definition.</p>"
-        },
-        {
-          "shape":"ResourceNotFoundException",
-          "error":{
-            "code":"ResourceNotFound",
-            "httpStatusCode":409,
-            "senderFault":true
-          },
-          "exception":true,
-          "documentation":"<p>The request was rejected because it attempted to reference a resource that does not exist.</p>"
-        }
+        {"shape":"BaseException"},
+        {"shape":"InternalException"},
+        {"shape":"LimitExceededException"},
+        {"shape":"InvalidTypeException"},
+        {"shape":"ResourceNotFoundException"}
       ],
       "documentation":"<p>Configures an <code><a>Expression</a></code> for the search domain. Used to create new expressions and modify existing ones. If the expression exists, the new configuration replaces the old one. For more information, see <a href=\"http://docs.aws.amazon.com/cloudsearch/latest/developerguide/configuring-expressions.html\" target=\"_blank\">Configuring Expressions</a> in the <i>Amazon CloudSearch Developer Guide</i>.</p>"
     },
@@ -230,60 +93,17 @@
         "method":"POST",
         "requestUri":"/"
       },
-      "input":{
-        "shape":"DefineIndexFieldRequest",
-        "documentation":"<p>Container for the parameters to the <code><a>DefineIndexField</a></code> operation. Specifies the name of the domain you want to update and the index field configuration.</p>"
-      },
+      "input":{"shape":"DefineIndexFieldRequest"},
       "output":{
         "shape":"DefineIndexFieldResponse",
-        "documentation":"<p>The result of a <code><a>DefineIndexField</a></code> request. Contains the status of the newly-configured index field.</p>",
         "resultWrapper":"DefineIndexFieldResult"
       },
       "errors":[
-        {
-          "shape":"BaseException",
-          "exception":true,
-          "documentation":"<p>An error occurred while processing the request.</p>"
-        },
-        {
-          "shape":"InternalException",
-          "error":{
-            "code":"InternalException",
-            "httpStatusCode":500
-          },
-          "exception":true,
-          "documentation":"<p>An internal error occurred while processing the request. If this problem persists, report an issue from the <a href=\"http://status.aws.amazon.com/\" target=\"_blank\">Service Health Dashboard</a>.</p>"
-        },
-        {
-          "shape":"LimitExceededException",
-          "error":{
-            "code":"LimitExceeded",
-            "httpStatusCode":409,
-            "senderFault":true
-          },
-          "exception":true,
-          "documentation":"<p>The request was rejected because a resource limit has already been met.</p>"
-        },
-        {
-          "shape":"InvalidTypeException",
-          "error":{
-            "code":"InvalidType",
-            "httpStatusCode":409,
-            "senderFault":true
-          },
-          "exception":true,
-          "documentation":"<p>The request was rejected because it specified an invalid type definition.</p>"
-        },
-        {
-          "shape":"ResourceNotFoundException",
-          "error":{
-            "code":"ResourceNotFound",
-            "httpStatusCode":409,
-            "senderFault":true
-          },
-          "exception":true,
-          "documentation":"<p>The request was rejected because it attempted to reference a resource that does not exist.</p>"
-        }
+        {"shape":"BaseException"},
+        {"shape":"InternalException"},
+        {"shape":"LimitExceededException"},
+        {"shape":"InvalidTypeException"},
+        {"shape":"ResourceNotFoundException"}
       ],
       "documentation":"<p>Configures an <code><a>IndexField</a></code> for the search domain. Used to create new fields and modify existing ones. You must specify the name of the domain you are configuring and an index field configuration. The index field configuration specifies a unique name, the index field type, and the options you want to configure for the field. The options you can specify depend on the <code><a>IndexFieldType</a></code>. If the field exists, the new configuration replaces the old one. For more information, see <a href=\"http://docs.aws.amazon.com/cloudsearch/latest/developerguide/configuring-index-fields.html\" target=\"_blank\">Configuring Index Fields</a> in the <i>Amazon CloudSearch Developer Guide</i>. </p>"
     },
@@ -293,60 +113,17 @@
         "method":"POST",
         "requestUri":"/"
       },
-      "input":{
-        "shape":"DefineSuggesterRequest",
-        "documentation":"<p>Container for the parameters to the <code><a>DefineSuggester</a></code> operation. Specifies the name of the domain you want to update and the suggester configuration.</p>"
-      },
+      "input":{"shape":"DefineSuggesterRequest"},
       "output":{
         "shape":"DefineSuggesterResponse",
-        "documentation":"<p>The result of a <code>DefineSuggester</code> request. Contains the status of the newly-configured suggester.</p>",
         "resultWrapper":"DefineSuggesterResult"
       },
       "errors":[
-        {
-          "shape":"BaseException",
-          "exception":true,
-          "documentation":"<p>An error occurred while processing the request.</p>"
-        },
-        {
-          "shape":"InternalException",
-          "error":{
-            "code":"InternalException",
-            "httpStatusCode":500
-          },
-          "exception":true,
-          "documentation":"<p>An internal error occurred while processing the request. If this problem persists, report an issue from the <a href=\"http://status.aws.amazon.com/\" target=\"_blank\">Service Health Dashboard</a>.</p>"
-        },
-        {
-          "shape":"LimitExceededException",
-          "error":{
-            "code":"LimitExceeded",
-            "httpStatusCode":409,
-            "senderFault":true
-          },
-          "exception":true,
-          "documentation":"<p>The request was rejected because a resource limit has already been met.</p>"
-        },
-        {
-          "shape":"InvalidTypeException",
-          "error":{
-            "code":"InvalidType",
-            "httpStatusCode":409,
-            "senderFault":true
-          },
-          "exception":true,
-          "documentation":"<p>The request was rejected because it specified an invalid type definition.</p>"
-        },
-        {
-          "shape":"ResourceNotFoundException",
-          "error":{
-            "code":"ResourceNotFound",
-            "httpStatusCode":409,
-            "senderFault":true
-          },
-          "exception":true,
-          "documentation":"<p>The request was rejected because it attempted to reference a resource that does not exist.</p>"
-        }
+        {"shape":"BaseException"},
+        {"shape":"InternalException"},
+        {"shape":"LimitExceededException"},
+        {"shape":"InvalidTypeException"},
+        {"shape":"ResourceNotFoundException"}
       ],
       "documentation":"<p>Configures a suggester for a domain. A suggester enables you to display possible matches before users finish typing their queries. When you configure a suggester, you must specify the name of the text field you want to search for possible matches and a unique name for the suggester. For more information, see <a href=\"http://docs.aws.amazon.com/cloudsearch/latest/developerguide/getting-suggestions.html\" target=\"_blank\">Getting Search Suggestions</a> in the <i>Amazon CloudSearch Developer Guide</i>.</p>"
     },
@@ -356,50 +133,16 @@
         "method":"POST",
         "requestUri":"/"
       },
-      "input":{
-        "shape":"DeleteAnalysisSchemeRequest",
-        "documentation":"<p>Container for the parameters to the <code><a>DeleteAnalysisScheme</a></code> operation. Specifies the name of the domain you want to update and the analysis scheme you want to delete. </p>"
-      },
+      "input":{"shape":"DeleteAnalysisSchemeRequest"},
       "output":{
         "shape":"DeleteAnalysisSchemeResponse",
-        "documentation":"<p>The result of a <code>DeleteAnalysisScheme</code> request. Contains the status of the deleted analysis scheme.</p>",
         "resultWrapper":"DeleteAnalysisSchemeResult"
       },
       "errors":[
-        {
-          "shape":"BaseException",
-          "exception":true,
-          "documentation":"<p>An error occurred while processing the request.</p>"
-        },
-        {
-          "shape":"InternalException",
-          "error":{
-            "code":"InternalException",
-            "httpStatusCode":500
-          },
-          "exception":true,
-          "documentation":"<p>An internal error occurred while processing the request. If this problem persists, report an issue from the <a href=\"http://status.aws.amazon.com/\" target=\"_blank\">Service Health Dashboard</a>.</p>"
-        },
-        {
-          "shape":"InvalidTypeException",
-          "error":{
-            "code":"InvalidType",
-            "httpStatusCode":409,
-            "senderFault":true
-          },
-          "exception":true,
-          "documentation":"<p>The request was rejected because it specified an invalid type definition.</p>"
-        },
-        {
-          "shape":"ResourceNotFoundException",
-          "error":{
-            "code":"ResourceNotFound",
-            "httpStatusCode":409,
-            "senderFault":true
-          },
-          "exception":true,
-          "documentation":"<p>The request was rejected because it attempted to reference a resource that does not exist.</p>"
-        }
+        {"shape":"BaseException"},
+        {"shape":"InternalException"},
+        {"shape":"InvalidTypeException"},
+        {"shape":"ResourceNotFoundException"}
       ],
       "documentation":"<p>Deletes an analysis scheme. For more information, see <a href=\"http://docs.aws.amazon.com/cloudsearch/latest/developerguide/configuring-analysis-schemes.html\" target=\"_blank\">Configuring Analysis Schemes</a> in the <i>Amazon CloudSearch Developer Guide</i>. </p>"
     },
@@ -409,30 +152,14 @@
         "method":"POST",
         "requestUri":"/"
       },
-      "input":{
-        "shape":"DeleteDomainRequest",
-        "documentation":"<p>Container for the parameters to the <code><a>DeleteDomain</a></code> operation. Specifies the name of the domain you want to delete.</p>"
-      },
+      "input":{"shape":"DeleteDomainRequest"},
       "output":{
         "shape":"DeleteDomainResponse",
-        "documentation":"<p>The result of a <code>DeleteDomain</code> request. Contains the status of a newly deleted domain, or no status if the domain has already been completely deleted.</p>",
         "resultWrapper":"DeleteDomainResult"
       },
       "errors":[
-        {
-          "shape":"BaseException",
-          "exception":true,
-          "documentation":"<p>An error occurred while processing the request.</p>"
-        },
-        {
-          "shape":"InternalException",
-          "error":{
-            "code":"InternalException",
-            "httpStatusCode":500
-          },
-          "exception":true,
-          "documentation":"<p>An internal error occurred while processing the request. If this problem persists, report an issue from the <a href=\"http://status.aws.amazon.com/\" target=\"_blank\">Service Health Dashboard</a>.</p>"
-        }
+        {"shape":"BaseException"},
+        {"shape":"InternalException"}
       ],
       "documentation":"<p>Permanently deletes a search domain and all of its data. Once a domain has been deleted, it cannot be recovered. For more information, see <a href=\"http://docs.aws.amazon.com/cloudsearch/latest/developerguide/deleting-domains.html\" target=\"_blank\">Deleting a Search Domain</a> in the <i>Amazon CloudSearch Developer Guide</i>. </p>"
     },
@@ -442,50 +169,16 @@
         "method":"POST",
         "requestUri":"/"
       },
-      "input":{
-        "shape":"DeleteExpressionRequest",
-        "documentation":"<p>Container for the parameters to the <code><a>DeleteExpression</a></code> operation. Specifies the name of the domain you want to update and the name of the expression you want to delete.</p>"
-      },
+      "input":{"shape":"DeleteExpressionRequest"},
       "output":{
         "shape":"DeleteExpressionResponse",
-        "documentation":"<p>The result of a <code><a>DeleteExpression</a></code> request. Specifies the expression being deleted.</p>",
         "resultWrapper":"DeleteExpressionResult"
       },
       "errors":[
-        {
-          "shape":"BaseException",
-          "exception":true,
-          "documentation":"<p>An error occurred while processing the request.</p>"
-        },
-        {
-          "shape":"InternalException",
-          "error":{
-            "code":"InternalException",
-            "httpStatusCode":500
-          },
-          "exception":true,
-          "documentation":"<p>An internal error occurred while processing the request. If this problem persists, report an issue from the <a href=\"http://status.aws.amazon.com/\" target=\"_blank\">Service Health Dashboard</a>.</p>"
-        },
-        {
-          "shape":"InvalidTypeException",
-          "error":{
-            "code":"InvalidType",
-            "httpStatusCode":409,
-            "senderFault":true
-          },
-          "exception":true,
-          "documentation":"<p>The request was rejected because it specified an invalid type definition.</p>"
-        },
-        {
-          "shape":"ResourceNotFoundException",
-          "error":{
-            "code":"ResourceNotFound",
-            "httpStatusCode":409,
-            "senderFault":true
-          },
-          "exception":true,
-          "documentation":"<p>The request was rejected because it attempted to reference a resource that does not exist.</p>"
-        }
+        {"shape":"BaseException"},
+        {"shape":"InternalException"},
+        {"shape":"InvalidTypeException"},
+        {"shape":"ResourceNotFoundException"}
       ],
       "documentation":"<p>Removes an <code><a>Expression</a></code> from the search domain. For more information, see <a href=\"http://docs.aws.amazon.com/cloudsearch/latest/developerguide/configuring-expressions.html\" target=\"_blank\">Configuring Expressions</a> in the <i>Amazon CloudSearch Developer Guide</i>.</p>"
     },
@@ -495,50 +188,16 @@
         "method":"POST",
         "requestUri":"/"
       },
-      "input":{
-        "shape":"DeleteIndexFieldRequest",
-        "documentation":"<p>Container for the parameters to the <code><a>DeleteIndexField</a></code> operation. Specifies the name of the domain you want to update and the name of the index field you want to delete.</p>"
-      },
+      "input":{"shape":"DeleteIndexFieldRequest"},
       "output":{
         "shape":"DeleteIndexFieldResponse",
-        "documentation":"<p>The result of a <code><a>DeleteIndexField</a></code> request.</p>",
         "resultWrapper":"DeleteIndexFieldResult"
       },
       "errors":[
-        {
-          "shape":"BaseException",
-          "exception":true,
-          "documentation":"<p>An error occurred while processing the request.</p>"
-        },
-        {
-          "shape":"InternalException",
-          "error":{
-            "code":"InternalException",
-            "httpStatusCode":500
-          },
-          "exception":true,
-          "documentation":"<p>An internal error occurred while processing the request. If this problem persists, report an issue from the <a href=\"http://status.aws.amazon.com/\" target=\"_blank\">Service Health Dashboard</a>.</p>"
-        },
-        {
-          "shape":"InvalidTypeException",
-          "error":{
-            "code":"InvalidType",
-            "httpStatusCode":409,
-            "senderFault":true
-          },
-          "exception":true,
-          "documentation":"<p>The request was rejected because it specified an invalid type definition.</p>"
-        },
-        {
-          "shape":"ResourceNotFoundException",
-          "error":{
-            "code":"ResourceNotFound",
-            "httpStatusCode":409,
-            "senderFault":true
-          },
-          "exception":true,
-          "documentation":"<p>The request was rejected because it attempted to reference a resource that does not exist.</p>"
-        }
+        {"shape":"BaseException"},
+        {"shape":"InternalException"},
+        {"shape":"InvalidTypeException"},
+        {"shape":"ResourceNotFoundException"}
       ],
       "documentation":"<p>Removes an <code><a>IndexField</a></code> from the search domain. For more information, see <a href=\"http://docs.aws.amazon.com/cloudsearch/latest/developerguide/configuring-index-fields.html\" target=\"_blank\">Configuring Index Fields</a> in the <i>Amazon CloudSearch Developer Guide</i>.</p>"
     },
@@ -548,50 +207,16 @@
         "method":"POST",
         "requestUri":"/"
       },
-      "input":{
-        "shape":"DeleteSuggesterRequest",
-        "documentation":"<p>Container for the parameters to the <code><a>DeleteSuggester</a></code> operation. Specifies the name of the domain you want to update and name of the suggester you want to delete.</p>"
-      },
+      "input":{"shape":"DeleteSuggesterRequest"},
       "output":{
         "shape":"DeleteSuggesterResponse",
-        "documentation":"<p>The result of a <code>DeleteSuggester</code> request. Contains the status of the deleted suggester.</p>",
         "resultWrapper":"DeleteSuggesterResult"
       },
       "errors":[
-        {
-          "shape":"BaseException",
-          "exception":true,
-          "documentation":"<p>An error occurred while processing the request.</p>"
-        },
-        {
-          "shape":"InternalException",
-          "error":{
-            "code":"InternalException",
-            "httpStatusCode":500
-          },
-          "exception":true,
-          "documentation":"<p>An internal error occurred while processing the request. If this problem persists, report an issue from the <a href=\"http://status.aws.amazon.com/\" target=\"_blank\">Service Health Dashboard</a>.</p>"
-        },
-        {
-          "shape":"InvalidTypeException",
-          "error":{
-            "code":"InvalidType",
-            "httpStatusCode":409,
-            "senderFault":true
-          },
-          "exception":true,
-          "documentation":"<p>The request was rejected because it specified an invalid type definition.</p>"
-        },
-        {
-          "shape":"ResourceNotFoundException",
-          "error":{
-            "code":"ResourceNotFound",
-            "httpStatusCode":409,
-            "senderFault":true
-          },
-          "exception":true,
-          "documentation":"<p>The request was rejected because it attempted to reference a resource that does not exist.</p>"
-        }
+        {"shape":"BaseException"},
+        {"shape":"InternalException"},
+        {"shape":"InvalidTypeException"},
+        {"shape":"ResourceNotFoundException"}
       ],
       "documentation":"<p>Deletes a suggester. For more information, see <a href=\"http://docs.aws.amazon.com/cloudsearch/latest/developerguide/getting-suggestions.html\" target=\"_blank\">Getting Search Suggestions</a> in the <i>Amazon CloudSearch Developer Guide</i>.</p>"
     },
@@ -601,40 +226,15 @@
         "method":"POST",
         "requestUri":"/"
       },
-      "input":{
-        "shape":"DescribeAnalysisSchemesRequest",
-        "documentation":"<p>Container for the parameters to the <code><a>DescribeAnalysisSchemes</a></code> operation. Specifies the name of the domain you want to describe. To limit the response to particular analysis schemes, specify the names of the analysis schemes you want to describe. To show the active configuration and exclude any pending changes, set the <code>Deployed</code> option to <code>true</code>. </p>"
-      },
+      "input":{"shape":"DescribeAnalysisSchemesRequest"},
       "output":{
         "shape":"DescribeAnalysisSchemesResponse",
-        "documentation":"<p>The result of a <code>DescribeAnalysisSchemes</code> request. Contains the analysis schemes configured for the domain specified in the request.</p>",
         "resultWrapper":"DescribeAnalysisSchemesResult"
       },
       "errors":[
-        {
-          "shape":"BaseException",
-          "exception":true,
-          "documentation":"<p>An error occurred while processing the request.</p>"
-        },
-        {
-          "shape":"InternalException",
-          "error":{
-            "code":"InternalException",
-            "httpStatusCode":500
-          },
-          "exception":true,
-          "documentation":"<p>An internal error occurred while processing the request. If this problem persists, report an issue from the <a href=\"http://status.aws.amazon.com/\" target=\"_blank\">Service Health Dashboard</a>.</p>"
-        },
-        {
-          "shape":"ResourceNotFoundException",
-          "error":{
-            "code":"ResourceNotFound",
-            "httpStatusCode":409,
-            "senderFault":true
-          },
-          "exception":true,
-          "documentation":"<p>The request was rejected because it attempted to reference a resource that does not exist.</p>"
-        }
+        {"shape":"BaseException"},
+        {"shape":"InternalException"},
+        {"shape":"ResourceNotFoundException"}
       ],
       "documentation":"<p>Gets the analysis schemes configured for a domain. An analysis scheme defines language-specific text processing options for a <code>text</code> field. Can be limited to specific analysis schemes by name. By default, shows all analysis schemes and includes any pending changes to the configuration. Set the <code>Deployed</code> option to <code>true</code> to show the active configuration and exclude pending changes. For more information, see <a href=\"http://docs.aws.amazon.com/cloudsearch/latest/developerguide/configuring-analysis-schemes.html\" target=\"_blank\">Configuring Analysis Schemes</a> in the <i>Amazon CloudSearch Developer Guide</i>.</p>"
     },
@@ -644,103 +244,55 @@
         "method":"POST",
         "requestUri":"/"
       },
-      "input":{
-        "shape":"DescribeAvailabilityOptionsRequest",
-        "documentation":"<p>Container for the parameters to the <code><a>DescribeAvailabilityOptions</a></code> operation. Specifies the name of the domain you want to describe. To show the active configuration and exclude any pending changes, set the Deployed option to <code>true</code>.</p>"
-      },
+      "input":{"shape":"DescribeAvailabilityOptionsRequest"},
       "output":{
         "shape":"DescribeAvailabilityOptionsResponse",
-        "documentation":"<p>The result of a <code>DescribeAvailabilityOptions</code> request. Indicates whether or not the Multi-AZ option is enabled for the domain specified in the request. </p>",
         "resultWrapper":"DescribeAvailabilityOptionsResult"
       },
       "errors":[
-        {
-          "shape":"BaseException",
-          "exception":true,
-          "documentation":"<p>An error occurred while processing the request.</p>"
-        },
-        {
-          "shape":"InternalException",
-          "error":{
-            "code":"InternalException",
-            "httpStatusCode":500
-          },
-          "exception":true,
-          "documentation":"<p>An internal error occurred while processing the request. If this problem persists, report an issue from the <a href=\"http://status.aws.amazon.com/\" target=\"_blank\">Service Health Dashboard</a>.</p>"
-        },
-        {
-          "shape":"InvalidTypeException",
-          "error":{
-            "code":"InvalidType",
-            "httpStatusCode":409,
-            "senderFault":true
-          },
-          "exception":true,
-          "documentation":"<p>The request was rejected because it specified an invalid type definition.</p>"
-        },
-        {
-          "shape":"LimitExceededException",
-          "error":{
-            "code":"LimitExceeded",
-            "httpStatusCode":409,
-            "senderFault":true
-          },
-          "exception":true,
-          "documentation":"<p>The request was rejected because a resource limit has already been met.</p>"
-        },
-        {
-          "shape":"ResourceNotFoundException",
-          "error":{
-            "code":"ResourceNotFound",
-            "httpStatusCode":409,
-            "senderFault":true
-          },
-          "exception":true,
-          "documentation":"<p>The request was rejected because it attempted to reference a resource that does not exist.</p>"
-        },
-        {
-          "shape":"DisabledOperationException",
-          "error":{
-            "code":"DisabledAction",
-            "httpStatusCode":409,
-            "senderFault":true
-          },
-          "exception":true,
-          "documentation":"<p>The request was rejected because it attempted an operation which is not enabled.</p>"
-        }
+        {"shape":"BaseException"},
+        {"shape":"InternalException"},
+        {"shape":"InvalidTypeException"},
+        {"shape":"LimitExceededException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"DisabledOperationException"}
       ],
       "documentation":"<p>Gets the availability options configured for a domain. By default, shows the configuration with any pending changes. Set the <code>Deployed</code> option to <code>true</code> to show the active configuration and exclude pending changes. For more information, see <a href=\"http://docs.aws.amazon.com/cloudsearch/latest/developerguide/configuring-availability-options.html\" target=\"_blank\">Configuring Availability Options</a> in the <i>Amazon CloudSearch Developer Guide</i>.</p>"
     },
+    "DescribeDomainEndpointOptions":{
+      "name":"DescribeDomainEndpointOptions",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DescribeDomainEndpointOptionsRequest"},
+      "output":{
+        "shape":"DescribeDomainEndpointOptionsResponse",
+        "resultWrapper":"DescribeDomainEndpointOptionsResult"
+      },
+      "errors":[
+        {"shape":"BaseException"},
+        {"shape":"InternalException"},
+        {"shape":"LimitExceededException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"DisabledOperationException"}
+      ],
+      "documentation":"<p>Returns the domain's endpoint options, specifically whether all requests to the domain must arrive over HTTPS. For more information, see <a href=\"http://docs.aws.amazon.com/cloudsearch/latest/developerguide/configuring-domain-endpoint-options.html\" target=\"_blank\">Configuring Domain Endpoint Options</a> in the <i>Amazon CloudSearch Developer Guide</i>.</p>"
+    },
     "DescribeDomains":{
       "name":"DescribeDomains",
       "http":{
         "method":"POST",
         "requestUri":"/"
       },
-      "input":{
-        "shape":"DescribeDomainsRequest",
-        "documentation":"<p>Container for the parameters to the <code><a>DescribeDomains</a></code> operation. By default shows the status of all domains. To restrict the response to particular domains, specify the names of the domains you want to describe.</p>"
-      },
+      "input":{"shape":"DescribeDomainsRequest"},
       "output":{
         "shape":"DescribeDomainsResponse",
-        "documentation":"<p>The result of a <code>DescribeDomains</code> request. Contains the status of the domains specified in the request or all domains owned by the account.</p>",
         "resultWrapper":"DescribeDomainsResult"
       },
       "errors":[
-        {
-          "shape":"BaseException",
-          "exception":true,
-          "documentation":"<p>An error occurred while processing the request.</p>"
-        },
-        {
-          "shape":"InternalException",
-          "error":{
-            "code":"InternalException",
-            "httpStatusCode":500
-          },
-          "exception":true,
-          "documentation":"<p>An internal error occurred while processing the request. If this problem persists, report an issue from the <a href=\"http://status.aws.amazon.com/\" target=\"_blank\">Service Health Dashboard</a>.</p>"
-        }
+        {"shape":"BaseException"},
+        {"shape":"InternalException"}
       ],
       "documentation":"<p>Gets information about the search domains owned by this account. Can be limited to specific domains. Shows all domains by default. To get the number of searchable documents in a domain, use the console or submit a <code>matchall</code> request to your domain's search endpoint: <code>q=matchall&amp;amp;q.parser=structured&amp;amp;size=0</code>. For more information, see <a href=\"http://docs.aws.amazon.com/cloudsearch/latest/developerguide/getting-domain-info.html\" target=\"_blank\">Getting Information about a Search Domain</a> in the <i>Amazon CloudSearch Developer Guide</i>.</p>"
     },
@@ -750,40 +302,15 @@
         "method":"POST",
         "requestUri":"/"
       },
-      "input":{
-        "shape":"DescribeExpressionsRequest",
-        "documentation":"<p>Container for the parameters to the <code><a>DescribeDomains</a></code> operation. Specifies the name of the domain you want to describe. To restrict the response to particular expressions, specify the names of the expressions you want to describe. To show the active configuration and exclude any pending changes, set the <code>Deployed</code> option to <code>true</code>.</p>"
-      },
+      "input":{"shape":"DescribeExpressionsRequest"},
       "output":{
         "shape":"DescribeExpressionsResponse",
-        "documentation":"<p>The result of a <code>DescribeExpressions</code> request. Contains the expressions configured for the domain specified in the request.</p>",
         "resultWrapper":"DescribeExpressionsResult"
       },
       "errors":[
-        {
-          "shape":"BaseException",
-          "exception":true,
-          "documentation":"<p>An error occurred while processing the request.</p>"
-        },
-        {
-          "shape":"InternalException",
-          "error":{
-            "code":"InternalException",
-            "httpStatusCode":500
-          },
-          "exception":true,
-          "documentation":"<p>An internal error occurred while processing the request. If this problem persists, report an issue from the <a href=\"http://status.aws.amazon.com/\" target=\"_blank\">Service Health Dashboard</a>.</p>"
-        },
-        {
-          "shape":"ResourceNotFoundException",
-          "error":{
-            "code":"ResourceNotFound",
-            "httpStatusCode":409,
-            "senderFault":true
-          },
-          "exception":true,
-          "documentation":"<p>The request was rejected because it attempted to reference a resource that does not exist.</p>"
-        }
+        {"shape":"BaseException"},
+        {"shape":"InternalException"},
+        {"shape":"ResourceNotFoundException"}
       ],
       "documentation":"<p>Gets the expressions configured for the search domain. Can be limited to specific expressions by name. By default, shows all expressions and includes any pending changes to the configuration. Set the <code>Deployed</code> option to <code>true</code> to show the active configuration and exclude pending changes. For more information, see <a href=\"http://docs.aws.amazon.com/cloudsearch/latest/developerguide/configuring-expressions.html\" target=\"_blank\">Configuring Expressions</a> in the <i>Amazon CloudSearch Developer Guide</i>.</p>"
     },
@@ -793,40 +320,15 @@
         "method":"POST",
         "requestUri":"/"
       },
-      "input":{
-        "shape":"DescribeIndexFieldsRequest",
-        "documentation":"<p>Container for the parameters to the <code><a>DescribeIndexFields</a></code> operation. Specifies the name of the domain you want to describe. To restrict the response to particular index fields, specify the names of the index fields you want to describe. To show the active configuration and exclude any pending changes, set the <code>Deployed</code> option to <code>true</code>.</p>"
-      },
+      "input":{"shape":"DescribeIndexFieldsRequest"},
       "output":{
         "shape":"DescribeIndexFieldsResponse",
-        "documentation":"<p>The result of a <code>DescribeIndexFields</code> request. Contains the index fields configured for the domain specified in the request.</p>",
         "resultWrapper":"DescribeIndexFieldsResult"
       },
       "errors":[
-        {
-          "shape":"BaseException",
-          "exception":true,
-          "documentation":"<p>An error occurred while processing the request.</p>"
-        },
-        {
-          "shape":"InternalException",
-          "error":{
-            "code":"InternalException",
-            "httpStatusCode":500
-          },
-          "exception":true,
-          "documentation":"<p>An internal error occurred while processing the request. If this problem persists, report an issue from the <a href=\"http://status.aws.amazon.com/\" target=\"_blank\">Service Health Dashboard</a>.</p>"
-        },
-        {
-          "shape":"ResourceNotFoundException",
-          "error":{
-            "code":"ResourceNotFound",
-            "httpStatusCode":409,
-            "senderFault":true
-          },
-          "exception":true,
-          "documentation":"<p>The request was rejected because it attempted to reference a resource that does not exist.</p>"
-        }
+        {"shape":"BaseException"},
+        {"shape":"InternalException"},
+        {"shape":"ResourceNotFoundException"}
       ],
       "documentation":"<p>Gets information about the index fields configured for the search domain. Can be limited to specific fields by name. By default, shows all fields and includes any pending changes to the configuration. Set the <code>Deployed</code> option to <code>true</code> to show the active configuration and exclude pending changes. For more information, see <a href=\"http://docs.aws.amazon.com/cloudsearch/latest/developerguide/getting-domain-info.html\" target=\"_blank\">Getting Domain Information</a> in the <i>Amazon CloudSearch Developer Guide</i>.</p>"
     },
@@ -836,40 +338,15 @@
         "method":"POST",
         "requestUri":"/"
       },
-      "input":{
-        "shape":"DescribeScalingParametersRequest",
-        "documentation":"<p>Container for the parameters to the <code><a>DescribeScalingParameters</a></code> operation. Specifies the name of the domain you want to describe. </p>"
-      },
+      "input":{"shape":"DescribeScalingParametersRequest"},
       "output":{
         "shape":"DescribeScalingParametersResponse",
-        "documentation":"<p>The result of a <code>DescribeScalingParameters</code> request. Contains the scaling parameters configured for the domain specified in the request.</p>",
         "resultWrapper":"DescribeScalingParametersResult"
       },
       "errors":[
-        {
-          "shape":"BaseException",
-          "exception":true,
-          "documentation":"<p>An error occurred while processing the request.</p>"
-        },
-        {
-          "shape":"InternalException",
-          "error":{
-            "code":"InternalException",
-            "httpStatusCode":500
-          },
-          "exception":true,
-          "documentation":"<p>An internal error occurred while processing the request. If this problem persists, report an issue from the <a href=\"http://status.aws.amazon.com/\" target=\"_blank\">Service Health Dashboard</a>.</p>"
-        },
-        {
-          "shape":"ResourceNotFoundException",
-          "error":{
-            "code":"ResourceNotFound",
-            "httpStatusCode":409,
-            "senderFault":true
-          },
-          "exception":true,
-          "documentation":"<p>The request was rejected because it attempted to reference a resource that does not exist.</p>"
-        }
+        {"shape":"BaseException"},
+        {"shape":"InternalException"},
+        {"shape":"ResourceNotFoundException"}
       ],
       "documentation":"<p>Gets the scaling parameters configured for a domain. A domain's scaling parameters specify the desired search instance type and replication count. For more information, see <a href=\"http://docs.aws.amazon.com/cloudsearch/latest/developerguide/configuring-scaling-options.html\" target=\"_blank\">Configuring Scaling Options</a> in the <i>Amazon CloudSearch Developer Guide</i>.</p>"
     },
@@ -879,40 +356,15 @@
         "method":"POST",
         "requestUri":"/"
       },
-      "input":{
-        "shape":"DescribeServiceAccessPoliciesRequest",
-        "documentation":"<p>Container for the parameters to the <code><a>DescribeServiceAccessPolicies</a></code> operation. Specifies the name of the domain you want to describe. To show the active configuration and exclude any pending changes, set the <code>Deployed</code> option to <code>true</code>.</p>"
-      },
+      "input":{"shape":"DescribeServiceAccessPoliciesRequest"},
       "output":{
         "shape":"DescribeServiceAccessPoliciesResponse",
-        "documentation":"<p>The result of a <code>DescribeServiceAccessPolicies</code> request.</p>",
         "resultWrapper":"DescribeServiceAccessPoliciesResult"
       },
       "errors":[
-        {
-          "shape":"BaseException",
-          "exception":true,
-          "documentation":"<p>An error occurred while processing the request.</p>"
-        },
-        {
-          "shape":"InternalException",
-          "error":{
-            "code":"InternalException",
-            "httpStatusCode":500
-          },
-          "exception":true,
-          "documentation":"<p>An internal error occurred while processing the request. If this problem persists, report an issue from the <a href=\"http://status.aws.amazon.com/\" target=\"_blank\">Service Health Dashboard</a>.</p>"
-        },
-        {
-          "shape":"ResourceNotFoundException",
-          "error":{
-            "code":"ResourceNotFound",
-            "httpStatusCode":409,
-            "senderFault":true
-          },
-          "exception":true,
-          "documentation":"<p>The request was rejected because it attempted to reference a resource that does not exist.</p>"
-        }
+        {"shape":"BaseException"},
+        {"shape":"InternalException"},
+        {"shape":"ResourceNotFoundException"}
       ],
       "documentation":"<p>Gets information about the access policies that control access to the domain's document and search endpoints. By default, shows the configuration with any pending changes. Set the <code>Deployed</code> option to <code>true</code> to show the active configuration and exclude pending changes. For more information, see <a href=\"http://docs.aws.amazon.com/cloudsearch/latest/developerguide/configuring-access.html\" target=\"_blank\">Configuring Access for a Search Domain</a> in the <i>Amazon CloudSearch Developer Guide</i>.</p>"
     },
@@ -922,40 +374,15 @@
         "method":"POST",
         "requestUri":"/"
       },
-      "input":{
-        "shape":"DescribeSuggestersRequest",
-        "documentation":"<p>Container for the parameters to the <code><a>DescribeSuggester</a></code> operation. Specifies the name of the domain you want to describe. To restrict the response to particular suggesters, specify the names of the suggesters you want to describe. To show the active configuration and exclude any pending changes, set the <code>Deployed</code> option to <code>true</code>.</p>"
-      },
+      "input":{"shape":"DescribeSuggestersRequest"},
       "output":{
         "shape":"DescribeSuggestersResponse",
-        "documentation":"<p>The result of a <code>DescribeSuggesters</code> request.</p>",
         "resultWrapper":"DescribeSuggestersResult"
       },
       "errors":[
-        {
-          "shape":"BaseException",
-          "exception":true,
-          "documentation":"<p>An error occurred while processing the request.</p>"
-        },
-        {
-          "shape":"InternalException",
-          "error":{
-            "code":"InternalException",
-            "httpStatusCode":500
-          },
-          "exception":true,
-          "documentation":"<p>An internal error occurred while processing the request. If this problem persists, report an issue from the <a href=\"http://status.aws.amazon.com/\" target=\"_blank\">Service Health Dashboard</a>.</p>"
-        },
-        {
-          "shape":"ResourceNotFoundException",
-          "error":{
-            "code":"ResourceNotFound",
-            "httpStatusCode":409,
-            "senderFault":true
-          },
-          "exception":true,
-          "documentation":"<p>The request was rejected because it attempted to reference a resource that does not exist.</p>"
-        }
+        {"shape":"BaseException"},
+        {"shape":"InternalException"},
+        {"shape":"ResourceNotFoundException"}
       ],
       "documentation":"<p>Gets the suggesters configured for a domain. A suggester enables you to display possible matches before users finish typing their queries. Can be limited to specific suggesters by name. By default, shows all suggesters and includes any pending changes to the configuration. Set the <code>Deployed</code> option to <code>true</code> to show the active configuration and exclude pending changes. For more information, see <a href=\"http://docs.aws.amazon.com/cloudsearch/latest/developerguide/getting-suggestions.html\" target=\"_blank\">Getting Search Suggestions</a> in the <i>Amazon CloudSearch Developer Guide</i>.</p>"
     },
@@ -965,40 +392,15 @@
         "method":"POST",
         "requestUri":"/"
       },
-      "input":{
-        "shape":"IndexDocumentsRequest",
-        "documentation":"<p>Container for the parameters to the <code><a>IndexDocuments</a></code> operation. Specifies the name of the domain you want to re-index.</p>"
-      },
+      "input":{"shape":"IndexDocumentsRequest"},
       "output":{
         "shape":"IndexDocumentsResponse",
-        "documentation":"<p>The result of an <code>IndexDocuments</code> request. Contains the status of the indexing operation, including the fields being indexed.</p>",
         "resultWrapper":"IndexDocumentsResult"
       },
       "errors":[
-        {
-          "shape":"BaseException",
-          "exception":true,
-          "documentation":"<p>An error occurred while processing the request.</p>"
-        },
-        {
-          "shape":"InternalException",
-          "error":{
-            "code":"InternalException",
-            "httpStatusCode":500
-          },
-          "exception":true,
-          "documentation":"<p>An internal error occurred while processing the request. If this problem persists, report an issue from the <a href=\"http://status.aws.amazon.com/\" target=\"_blank\">Service Health Dashboard</a>.</p>"
-        },
-        {
-          "shape":"ResourceNotFoundException",
-          "error":{
-            "code":"ResourceNotFound",
-            "httpStatusCode":409,
-            "senderFault":true
-          },
-          "exception":true,
-          "documentation":"<p>The request was rejected because it attempted to reference a resource that does not exist.</p>"
-        }
+        {"shape":"BaseException"},
+        {"shape":"InternalException"},
+        {"shape":"ResourceNotFoundException"}
       ],
       "documentation":"<p>Tells the search domain to start indexing its documents using the latest indexing options. This operation must be invoked to activate options whose <a>OptionStatus</a> is <code>RequiresIndexDocuments</code>.</p>"
     },
@@ -1010,15 +412,10 @@
       },
       "output":{
         "shape":"ListDomainNamesResponse",
-        "documentation":"<p>The result of a <code>ListDomainNames</code> request. Contains a list of the domains owned by an account.</p>",
         "resultWrapper":"ListDomainNamesResult"
       },
       "errors":[
-        {
-          "shape":"BaseException",
-          "exception":true,
-          "documentation":"<p>An error occurred while processing the request.</p>"
-        }
+        {"shape":"BaseException"}
       ],
       "documentation":"<p>Lists all search domains owned by an account.</p>"
     },
@@ -1028,133 +425,61 @@
         "method":"POST",
         "requestUri":"/"
       },
-      "input":{
-        "shape":"UpdateAvailabilityOptionsRequest",
-        "documentation":"<p>Container for the parameters to the <code><a>UpdateAvailabilityOptions</a></code> operation. Specifies the name of the domain you want to update and the Multi-AZ availability option.</p>"
-      },
+      "input":{"shape":"UpdateAvailabilityOptionsRequest"},
       "output":{
         "shape":"UpdateAvailabilityOptionsResponse",
-        "documentation":"<p>The result of a <code>UpdateAvailabilityOptions</code> request. Contains the status of the domain's availability options. </p>",
         "resultWrapper":"UpdateAvailabilityOptionsResult"
       },
       "errors":[
-        {
-          "shape":"BaseException",
-          "exception":true,
-          "documentation":"<p>An error occurred while processing the request.</p>"
-        },
-        {
-          "shape":"InternalException",
-          "error":{
-            "code":"InternalException",
-            "httpStatusCode":500
-          },
-          "exception":true,
-          "documentation":"<p>An internal error occurred while processing the request. If this problem persists, report an issue from the <a href=\"http://status.aws.amazon.com/\" target=\"_blank\">Service Health Dashboard</a>.</p>"
-        },
-        {
-          "shape":"InvalidTypeException",
-          "error":{
-            "code":"InvalidType",
-            "httpStatusCode":409,
-            "senderFault":true
-          },
-          "exception":true,
-          "documentation":"<p>The request was rejected because it specified an invalid type definition.</p>"
-        },
-        {
-          "shape":"LimitExceededException",
-          "error":{
-            "code":"LimitExceeded",
-            "httpStatusCode":409,
-            "senderFault":true
-          },
-          "exception":true,
-          "documentation":"<p>The request was rejected because a resource limit has already been met.</p>"
-        },
-        {
-          "shape":"ResourceNotFoundException",
-          "error":{
-            "code":"ResourceNotFound",
-            "httpStatusCode":409,
-            "senderFault":true
-          },
-          "exception":true,
-          "documentation":"<p>The request was rejected because it attempted to reference a resource that does not exist.</p>"
-        },
-        {
-          "shape":"DisabledOperationException",
-          "error":{
-            "code":"DisabledAction",
-            "httpStatusCode":409,
-            "senderFault":true
-          },
-          "exception":true,
-          "documentation":"<p>The request was rejected because it attempted an operation which is not enabled.</p>"
-        }
+        {"shape":"BaseException"},
+        {"shape":"InternalException"},
+        {"shape":"InvalidTypeException"},
+        {"shape":"LimitExceededException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"DisabledOperationException"},
+        {"shape":"ValidationException"}
       ],
       "documentation":"<p>Configures the availability options for a domain. Enabling the Multi-AZ option expands an Amazon CloudSearch domain to an additional Availability Zone in the same Region to increase fault tolerance in the event of a service disruption. Changes to the Multi-AZ option can take about half an hour to become active. For more information, see <a href=\"http://docs.aws.amazon.com/cloudsearch/latest/developerguide/configuring-availability-options.html\" target=\"_blank\">Configuring Availability Options</a> in the <i>Amazon CloudSearch Developer Guide</i>.</p>"
     },
+    "UpdateDomainEndpointOptions":{
+      "name":"UpdateDomainEndpointOptions",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"UpdateDomainEndpointOptionsRequest"},
+      "output":{
+        "shape":"UpdateDomainEndpointOptionsResponse",
+        "resultWrapper":"UpdateDomainEndpointOptionsResult"
+      },
+      "errors":[
+        {"shape":"BaseException"},
+        {"shape":"InternalException"},
+        {"shape":"InvalidTypeException"},
+        {"shape":"LimitExceededException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"DisabledOperationException"},
+        {"shape":"ValidationException"}
+      ],
+      "documentation":"<p>Updates the domain's endpoint options, specifically whether all requests to the domain must arrive over HTTPS. For more information, see <a href=\"http://docs.aws.amazon.com/cloudsearch/latest/developerguide/configuring-domain-endpoint-options.html\" target=\"_blank\">Configuring Domain Endpoint Options</a> in the <i>Amazon CloudSearch Developer Guide</i>.</p>"
+    },
     "UpdateScalingParameters":{
       "name":"UpdateScalingParameters",
       "http":{
         "method":"POST",
         "requestUri":"/"
       },
-      "input":{
-        "shape":"UpdateScalingParametersRequest",
-        "documentation":"<p>Container for the parameters to the <code><a>UpdateScalingParameters</a></code> operation. Specifies the name of the domain you want to update and the scaling parameters you want to configure.</p>"
-      },
+      "input":{"shape":"UpdateScalingParametersRequest"},
       "output":{
         "shape":"UpdateScalingParametersResponse",
-        "documentation":"<p>The result of a <code>UpdateScalingParameters</code> request. Contains the status of the newly-configured scaling parameters.</p>",
         "resultWrapper":"UpdateScalingParametersResult"
       },
       "errors":[
-        {
-          "shape":"BaseException",
-          "exception":true,
-          "documentation":"<p>An error occurred while processing the request.</p>"
-        },
-        {
-          "shape":"InternalException",
-          "error":{
-            "code":"InternalException",
-            "httpStatusCode":500
-          },
-          "exception":true,
-          "documentation":"<p>An internal error occurred while processing the request. If this problem persists, report an issue from the <a href=\"http://status.aws.amazon.com/\" target=\"_blank\">Service Health Dashboard</a>.</p>"
-        },
-        {
-          "shape":"LimitExceededException",
-          "error":{
-            "code":"LimitExceeded",
-            "httpStatusCode":409,
-            "senderFault":true
-          },
-          "exception":true,
-          "documentation":"<p>The request was rejected because a resource limit has already been met.</p>"
-        },
-        {
-          "shape":"ResourceNotFoundException",
-          "error":{
-            "code":"ResourceNotFound",
-            "httpStatusCode":409,
-            "senderFault":true
-          },
-          "exception":true,
-          "documentation":"<p>The request was rejected because it attempted to reference a resource that does not exist.</p>"
-        },
-        {
-          "shape":"InvalidTypeException",
-          "error":{
-            "code":"InvalidType",
-            "httpStatusCode":409,
-            "senderFault":true
-          },
-          "exception":true,
-          "documentation":"<p>The request was rejected because it specified an invalid type definition.</p>"
-        }
+        {"shape":"BaseException"},
+        {"shape":"InternalException"},
+        {"shape":"LimitExceededException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InvalidTypeException"}
       ],
       "documentation":"<p>Configures scaling parameters for a domain. A domain's scaling parameters specify the desired search instance type and replication count. Amazon CloudSearch will still automatically scale your domain based on the volume of data and traffic, but not below the desired instance type and replication count. If the Multi-AZ option is enabled, these values control the resources used per Availability Zone. For more information, see <a href=\"http://docs.aws.amazon.com/cloudsearch/latest/developerguide/configuring-scaling-options.html\" target=\"_blank\">Configuring Scaling Options</a> in the <i>Amazon CloudSearch Developer Guide</i>. </p>"
     },
@@ -1164,60 +489,17 @@
         "method":"POST",
         "requestUri":"/"
       },
-      "input":{
-        "shape":"UpdateServiceAccessPoliciesRequest",
-        "documentation":"<p>Container for the parameters to the <code><a>UpdateServiceAccessPolicies</a></code> operation. Specifies the name of the domain you want to update and the access rules you want to configure.</p>"
-      },
+      "input":{"shape":"UpdateServiceAccessPoliciesRequest"},
       "output":{
         "shape":"UpdateServiceAccessPoliciesResponse",
-        "documentation":"<p>The result of an <code>UpdateServiceAccessPolicies</code> request. Contains the new access policies.</p>",
         "resultWrapper":"UpdateServiceAccessPoliciesResult"
       },
       "errors":[
-        {
-          "shape":"BaseException",
-          "exception":true,
-          "documentation":"<p>An error occurred while processing the request.</p>"
-        },
-        {
-          "shape":"InternalException",
-          "error":{
-            "code":"InternalException",
-            "httpStatusCode":500
-          },
-          "exception":true,
-          "documentation":"<p>An internal error occurred while processing the request. If this problem persists, report an issue from the <a href=\"http://status.aws.amazon.com/\" target=\"_blank\">Service Health Dashboard</a>.</p>"
-        },
-        {
-          "shape":"LimitExceededException",
-          "error":{
-            "code":"LimitExceeded",
-            "httpStatusCode":409,
-            "senderFault":true
-          },
-          "exception":true,
-          "documentation":"<p>The request was rejected because a resource limit has already been met.</p>"
-        },
-        {
-          "shape":"ResourceNotFoundException",
-          "error":{
-            "code":"ResourceNotFound",
-            "httpStatusCode":409,
-            "senderFault":true
-          },
-          "exception":true,
-          "documentation":"<p>The request was rejected because it attempted to reference a resource that does not exist.</p>"
-        },
-        {
-          "shape":"InvalidTypeException",
-          "error":{
-            "code":"InvalidType",
-            "httpStatusCode":409,
-            "senderFault":true
-          },
-          "exception":true,
-          "documentation":"<p>The request was rejected because it specified an invalid type definition.</p>"
-        }
+        {"shape":"BaseException"},
+        {"shape":"InternalException"},
+        {"shape":"LimitExceededException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InvalidTypeException"}
       ],
       "documentation":"<p>Configures the access rules that control access to the domain's document and search endpoints. For more information, see <a href=\"http://docs.aws.amazon.com/cloudsearch/latest/developerguide/configuring-access.html\" target=\"_blank\"> Configuring Access for an Amazon CloudSearch Domain</a>.</p>"
     }
@@ -1293,6 +575,7 @@
     },
     "AnalysisSchemeLanguage":{
       "type":"string",
+      "documentation":"<p>An <a href=\"http://tools.ietf.org/html/rfc4646\" target=\"_blank\">IETF RFC 4646</a> language code or <code>mul</code> for multiple languages.</p>",
       "enum":[
         "ar",
         "bg",
@@ -1329,8 +612,7 @@
         "tr",
         "zh-Hans",
         "zh-Hant"
-      ],
-      "documentation":"<p>An <a href=\"http://tools.ietf.org/html/rfc4646\" target=\"_blank\">IETF RFC 4646</a> language code or <code>mul</code> for multiple languages.</p>"
+      ]
     },
     "AnalysisSchemeStatus":{
       "type":"structure",
@@ -1370,8 +652,8 @@
         "Code":{"shape":"ErrorCode"},
         "Message":{"shape":"ErrorMessage"}
       },
-      "exception":true,
-      "documentation":"<p>An error occurred while processing the request.</p>"
+      "documentation":"<p>An error occurred while processing the request.</p>",
+      "exception":true
     },
     "Boolean":{"type":"boolean"},
     "BuildSuggestersRequest":{
@@ -1720,6 +1002,31 @@
       },
       "documentation":"<p>The result of a <code>DescribeAvailabilityOptions</code> request. Indicates whether or not the Multi-AZ option is enabled for the domain specified in the request. </p>"
     },
+    "DescribeDomainEndpointOptionsRequest":{
+      "type":"structure",
+      "required":["DomainName"],
+      "members":{
+        "DomainName":{
+          "shape":"DomainName",
+          "documentation":"<p>A string that represents the name of a domain.</p>"
+        },
+        "Deployed":{
+          "shape":"Boolean",
+          "documentation":"<p>Whether to retrieve the latest configuration (which might be in a Processing state) or the current, active configuration. Defaults to <code>false</code>.</p>"
+        }
+      },
+      "documentation":"<p>Container for the parameters to the <code><a>DescribeDomainEndpointOptions</a></code> operation. Specify the name of the domain you want to describe. To show the active configuration and exclude any pending changes, set the Deployed option to <code>true</code>.</p>"
+    },
+    "DescribeDomainEndpointOptionsResponse":{
+      "type":"structure",
+      "members":{
+        "DomainEndpointOptions":{
+          "shape":"DomainEndpointOptionsStatus",
+          "documentation":"<p>The status and configuration of a search domain's endpoint options.</p>"
+        }
+      },
+      "documentation":"<p>The result of a <code>DescribeDomainEndpointOptions</code> request. Contains the status and configuration of a search domain's endpoint options. </p>"
+    },
     "DescribeDomainsRequest":{
       "type":"structure",
       "members":{
@@ -1874,13 +1181,13 @@
       "type":"structure",
       "members":{
       },
+      "documentation":"<p>The request was rejected because it attempted an operation which is not enabled.</p>",
       "error":{
         "code":"DisabledAction",
         "httpStatusCode":409,
         "senderFault":true
       },
-      "exception":true,
-      "documentation":"<p>The request was rejected because it attempted an operation which is not enabled.</p>"
+      "exception":true
     },
     "DocumentSuggesterOptions":{
       "type":"structure",
@@ -1901,18 +1208,50 @@
       },
       "documentation":"<p>Options for a search suggester.</p>"
     },
+    "DomainEndpointOptions":{
+      "type":"structure",
+      "members":{
+        "EnforceHTTPS":{
+          "shape":"Boolean",
+          "documentation":"<p>Whether the domain is HTTPS only enabled.</p>"
+        },
+        "TLSSecurityPolicy":{
+          "shape":"TLSSecurityPolicy",
+          "documentation":"<p>The minimum required TLS version</p>"
+        }
+      },
+      "documentation":"<p>The domain's endpoint options.</p>"
+    },
+    "DomainEndpointOptionsStatus":{
+      "type":"structure",
+      "required":[
+        "Options",
+        "Status"
+      ],
+      "members":{
+        "Options":{
+          "shape":"DomainEndpointOptions",
+          "documentation":"<p>The domain endpoint options configured for the domain.</p>"
+        },
+        "Status":{
+          "shape":"OptionStatus",
+          "documentation":"<p>The status of the configured domain endpoint options.</p>"
+        }
+      },
+      "documentation":"<p>The configuration and status of the domain's endpoint options.</p>"
+    },
     "DomainId":{
       "type":"string",
-      "min":1,
+      "documentation":"<p>An internally generated unique identifier for a domain.</p>",
       "max":64,
-      "documentation":"<p>An internally generated unique identifier for a domain.</p>"
+      "min":1
     },
     "DomainName":{
       "type":"string",
-      "min":3,
+      "documentation":"<p>A string that represents the name of a domain. Domain names are unique across the domains owned by an account within an AWS region. Domain names start with a letter or number and can contain the following characters: a-z (lowercase), 0-9, and - (hyphen).</p>",
       "max":28,
-      "pattern":"[a-z][a-z0-9\\-]+",
-      "documentation":"<p>A string that represents the name of a domain. Domain names are unique across the domains owned by an account within an AWS region. Domain names start with a letter or number and can contain the following characters: a-z (lowercase), 0-9, and - (hyphen).</p>"
+      "min":3,
+      "pattern":"[a-z][a-z0-9\\-]+"
     },
     "DomainNameList":{
       "type":"list",
@@ -2040,8 +1379,8 @@
     },
     "DynamicFieldName":{
       "type":"string",
-      "min":1,
       "max":64,
+      "min":1,
       "pattern":"([a-z][a-z0-9_]*\\*?|\\*[a-z0-9_]*)"
     },
     "DynamicFieldNameList":{
@@ -2090,16 +1429,16 @@
     },
     "ExpressionValue":{
       "type":"string",
-      "min":1,
+      "documentation":"<p>The expression to evaluate for sorting while processing a search request. The <code>Expression</code> syntax is based on JavaScript expressions. For more information, see <a href=\"http://docs.aws.amazon.com/cloudsearch/latest/developerguide/configuring-expressions.html\" target=\"_blank\">Configuring Expressions</a> in the <i>Amazon CloudSearch Developer Guide</i>.</p>",
       "max":10240,
-      "documentation":"<p>The expression to evaluate for sorting while processing a search request. The <code>Expression</code> syntax is based on JavaScript expressions. For more information, see <a href=\"http://docs.aws.amazon.com/cloudsearch/latest/developerguide/configuring-expressions.html\" target=\"_blank\">Configuring Expressions</a> in the <i>Amazon CloudSearch Developer Guide</i>.</p>"
+      "min":1
     },
     "FieldName":{
       "type":"string",
-      "min":1,
+      "documentation":"<p>A string that represents the name of an index field. CloudSearch supports regular index fields as well as dynamic fields. A dynamic field's name defines a pattern that begins or ends with a wildcard. Any document fields that don't map to a regular index field but do match a dynamic field's pattern are configured with the dynamic field's indexing options. </p> <p>Regular field names begin with a letter and can contain the following characters: a-z (lowercase), 0-9, and _ (underscore). Dynamic field names must begin or end with a wildcard (*). The wildcard can also be the only character in a dynamic field name. Multiple wildcards, and wildcards embedded within a string are not supported. </p> <p>The name <code>score</code> is reserved and cannot be used as a field name. To reference a document's ID, you can use the name <code>_id</code>. </p>",
       "max":64,
-      "pattern":"[a-z][a-z0-9_]*",
-      "documentation":"<p>A string that represents the name of an index field. CloudSearch supports regular index fields as well as dynamic fields. A dynamic field's name defines a pattern that begins or ends with a wildcard. Any document fields that don't map to a regular index field but do match a dynamic field's pattern are configured with the dynamic field's indexing options. </p> <p>Regular field names begin with a letter and can contain the following characters: a-z (lowercase), 0-9, and _ (underscore). Dynamic field names must begin or end with a wildcard (*). The wildcard can also be the only character in a dynamic field name. Multiple wildcards, and wildcards embedded within a string are not supported. </p> <p>The name <code>score</code> is reserved and cannot be used as a field name. To reference a document's ID, you can use the name <code>_id</code>. </p>"
+      "min":1,
+      "pattern":"[a-z][a-z0-9_]*"
     },
     "FieldNameCommaList":{
       "type":"string",
@@ -2112,9 +1451,9 @@
     },
     "FieldValue":{
       "type":"string",
-      "min":0,
+      "documentation":"<p>The value of a field attribute.</p>",
       "max":1024,
-      "documentation":"<p>The value of a field attribute.</p>"
+      "min":0
     },
     "IndexDocumentsRequest":{
       "type":"structure",
@@ -2179,6 +1518,7 @@
     },
     "IndexFieldType":{
       "type":"string",
+      "documentation":"<p>The type of field. The valid options for a field depend on the field type. For more information about the supported field types, see <a href=\"http://docs.aws.amazon.com/cloudsearch/latest/developerguide/configuring-index-fields.html\" target=\"_blank\">Configuring Index Fields</a> in the <i>Amazon CloudSearch Developer Guide</i>.</p>",
       "enum":[
         "int",
         "double",
@@ -2191,8 +1531,7 @@
         "literal-array",
         "text-array",
         "date-array"
-      ],
-      "documentation":"<p>The type of field. The valid options for a field depend on the field type. For more information about the supported field types, see <a href=\"http://docs.aws.amazon.com/cloudsearch/latest/developerguide/configuring-index-fields.html\" target=\"_blank\">Configuring Index Fields</a> in the <i>Amazon CloudSearch Developer Guide</i>.</p>"
+      ]
     },
     "InstanceCount":{
       "type":"integer",
@@ -2258,24 +1597,24 @@
       "type":"structure",
       "members":{
       },
+      "documentation":"<p>An internal error occurred while processing the request. If this problem persists, report an issue from the <a href=\"http://status.aws.amazon.com/\" target=\"_blank\">Service Health Dashboard</a>.</p>",
       "error":{
         "code":"InternalException",
         "httpStatusCode":500
       },
-      "exception":true,
-      "documentation":"<p>An internal error occurred while processing the request. If this problem persists, report an issue from the <a href=\"http://status.aws.amazon.com/\" target=\"_blank\">Service Health Dashboard</a>.</p>"
+      "exception":true
     },
     "InvalidTypeException":{
       "type":"structure",
       "members":{
       },
+      "documentation":"<p>The request was rejected because it specified an invalid type definition.</p>",
       "error":{
         "code":"InvalidType",
         "httpStatusCode":409,
         "senderFault":true
       },
-      "exception":true,
-      "documentation":"<p>The request was rejected because it specified an invalid type definition.</p>"
+      "exception":true
     },
     "LatLonOptions":{
       "type":"structure",
@@ -2308,13 +1647,13 @@
       "type":"structure",
       "members":{
       },
+      "documentation":"<p>The request was rejected because a resource limit has already been met.</p>",
       "error":{
         "code":"LimitExceeded",
         "httpStatusCode":409,
         "senderFault":true
       },
-      "exception":true,
-      "documentation":"<p>The request was rejected because a resource limit has already been met.</p>"
+      "exception":true
     },
     "Limits":{
       "type":"structure",
@@ -2402,13 +1741,13 @@
     "MultiAZ":{"type":"boolean"},
     "OptionState":{
       "type":"string",
+      "documentation":"<p>The state of processing a change to an option. One of:</p> <ul> <li>RequiresIndexDocuments: The option's latest value will not be deployed until <a>IndexDocuments</a> has been called and indexing is complete.</li> <li>Processing: The option's latest value is in the process of being activated.</li> <li>Active: The option's latest value is fully deployed. </li> <li>FailedToValidate: The option value is not compatible with the domain's data and cannot be used to index the data. You must either modify the option value or update or remove the incompatible documents.</li> </ul>",
       "enum":[
         "RequiresIndexDocuments",
         "Processing",
         "Active",
         "FailedToValidate"
-      ],
-      "documentation":"<p>The state of processing a change to an option. One of:</p> <ul> <li>RequiresIndexDocuments: The option's latest value will not be deployed until <a>IndexDocuments</a> has been called and indexing is complete.</li> <li>Processing: The option's latest value is in the process of being activated.</li> <li>Active: The option's latest value is fully deployed. </li> <li>FailedToValidate: The option value is not compatible with the domain's data and cannot be used to index the data. You must either modify the option value or update or remove the incompatible documents.</li> </ul>"
+      ]
     },
     "OptionStatus":{
       "type":"structure",
@@ -2432,7 +1771,7 @@
         },
         "State":{
           "shape":"OptionState",
-          "documentation":"<p>The state of processing a change to an option. Possible values:</p> <ul> <li> <code>RequiresIndexDocuments</code>: the option's latest value will not be deployed until <a>IndexDocuments</a> has been called and indexing is complete.</li> <li> <code>Processing</code>: the option's latest value is in the process of being activated. </li> <li> <code>Active</code>: the option's latest value is completely deployed.</li> <li> <code>FailedToValidate</code>: the option value is not compatible with the domain's data and cannot be used to index the data. You must either modify the option value or update or remove the incompatible documents.</li> </ul>"
+          "documentation":"<p>The state of processing a change to an option. Possible values:</p><ul> <li><code>RequiresIndexDocuments</code>: the option's latest value will not be deployed until <a>IndexDocuments</a> has been called and indexing is complete.</li> <li><code>Processing</code>: the option's latest value is in the process of being activated. </li> <li><code>Active</code>: the option's latest value is completely deployed.</li> <li><code>FailedToValidate</code>: the option value is not compatible with the domain's data and cannot be used to index the data. You must either modify the option value or update or remove the incompatible documents.</li> </ul>"
         },
         "PendingDeletion":{
           "shape":"Boolean",
@@ -2443,11 +1782,12 @@
     },
     "PartitionCount":{
       "type":"integer",
-      "min":1,
-      "documentation":"<p>The number of partitions used to hold the domain's index.</p>"
+      "documentation":"<p>The number of partitions used to hold the domain's index.</p>",
+      "min":1
     },
     "PartitionInstanceType":{
       "type":"string",
+      "documentation":"<p>The instance type (such as <code>search.m1.small</code>) on which an index partition is hosted.</p>",
       "enum":[
         "search.m1.small",
         "search.m1.large",
@@ -2457,8 +1797,7 @@
         "search.m3.large",
         "search.m3.xlarge",
         "search.m3.2xlarge"
-      ],
-      "documentation":"<p>The instance type (such as <code>search.m1.small</code>) on which an index partition is hosted.</p>"
+      ]
     },
     "PolicyDocument":{
       "type":"string",
@@ -2468,13 +1807,13 @@
       "type":"structure",
       "members":{
       },
+      "documentation":"<p>The request was rejected because it attempted to reference a resource that does not exist.</p>",
       "error":{
         "code":"ResourceNotFound",
         "httpStatusCode":409,
         "senderFault":true
       },
-      "exception":true,
-      "documentation":"<p>The request was rejected because it attempted to reference a resource that does not exist.</p>"
+      "exception":true
     },
     "ScalingParameters":{
       "type":"structure",
@@ -2523,10 +1862,10 @@
     },
     "StandardName":{
       "type":"string",
-      "min":1,
+      "documentation":"<p>Names must begin with a letter and can contain the following characters: a-z (lowercase), 0-9, and _ (underscore).</p>",
       "max":64,
-      "pattern":"[a-z][a-z0-9_]*",
-      "documentation":"<p>Names must begin with a letter and can contain the following characters: a-z (lowercase), 0-9, and _ (underscore).</p>"
+      "min":1,
+      "pattern":"[a-z][a-z0-9_]*"
     },
     "StandardNameList":{
       "type":"list",
@@ -2570,6 +1909,14 @@
       "member":{"shape":"SuggesterStatus"},
       "documentation":"<p>Contains the status of multiple suggesters.</p>"
     },
+    "TLSSecurityPolicy":{
+      "type":"string",
+      "documentation":"<p>The minimum required TLS version.</p>",
+      "enum":[
+        "Policy-Min-TLS-1-0-2019-07",
+        "Policy-Min-TLS-1-2-2019-07"
+      ]
+    },
     "TextArrayOptions":{
       "type":"structure",
       "members":{
@@ -2652,6 +1999,34 @@
       },
       "documentation":"<p>The result of a <code>UpdateAvailabilityOptions</code> request. Contains the status of the domain's availability options. </p>"
     },
+    "UpdateDomainEndpointOptionsRequest":{
+      "type":"structure",
+      "required":[
+        "DomainName",
+        "DomainEndpointOptions"
+      ],
+      "members":{
+        "DomainName":{
+          "shape":"DomainName",
+          "documentation":"<p>A string that represents the name of a domain.</p>"
+        },
+        "DomainEndpointOptions":{
+          "shape":"DomainEndpointOptions",
+          "documentation":"<p>Whether to require that all requests to the domain arrive over HTTPS. We recommend Policy-Min-TLS-1-2-2019-07 for TLSSecurityPolicy. For compatibility with older clients, the default is Policy-Min-TLS-1-0-2019-07. </p>"
+        }
+      },
+      "documentation":"<p>Container for the parameters to the <code><a>UpdateDomainEndpointOptions</a></code> operation. Specifies the name of the domain you want to update and the domain endpoint options.</p>"
+    },
+    "UpdateDomainEndpointOptionsResponse":{
+      "type":"structure",
+      "members":{
+        "DomainEndpointOptions":{
+          "shape":"DomainEndpointOptionsStatus",
+          "documentation":"<p>The newly-configured domain endpoint options.</p>"
+        }
+      },
+      "documentation":"<p>The result of a <code>UpdateDomainEndpointOptions</code> request. Contains the configuration and status of the domain's endpoint options. </p>"
+    },
     "UpdateScalingParametersRequest":{
       "type":"structure",
       "required":[
@@ -2699,9 +2074,17 @@
       "documentation":"<p>The result of an <code>UpdateServiceAccessPolicies</code> request. Contains the new access policies.</p>"
     },
     "UpdateTimestamp":{"type":"timestamp"},
+    "ValidationException":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>The request was rejected because it has invalid parameters.</p>",
+      "exception":true
+    },
     "Word":{
       "type":"string",
       "pattern":"[\\S]+"
     }
-  }
+  },
+  "documentation":"<fullname>Amazon CloudSearch Configuration Service</fullname> <p>You use the Amazon CloudSearch configuration service to create, configure, and manage search domains. Configuration service requests are submitted using the AWS Query protocol. AWS Query requests are HTTP or HTTPS requests submitted via HTTP GET or POST with a query parameter named Action.</p> <p>The endpoint for configuration service requests is region-specific: cloudsearch.<i>region</i>.amazonaws.com. For example, cloudsearch.us-east-1.amazonaws.com. For a current list of supported regions and endpoints, see <a href=\"http://docs.aws.amazon.com/general/latest/gr/rande.html#cloudsearch_region\" target=\"_blank\">Regions and Endpoints</a>.</p>"
 }
diff --git a/services/cloudsearchdomain/pom.xml b/services/cloudsearchdomain/pom.xml
index c5c14921d261..527dceeb14bb 100644
--- a/services/cloudsearchdomain/pom.xml
+++ b/services/cloudsearchdomain/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -22,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>cloudsearchdomain</artifactId>
     <name>AWS Java SDK :: Services :: Amazon CloudSearch Domain</name>
diff --git a/services/cloudsearchdomain/src/main/java/software/amazon/awssdk/services/cloudsearchdomain/internal/SwitchToPostInterceptor.java b/services/cloudsearchdomain/src/main/java/software/amazon/awssdk/services/cloudsearchdomain/internal/SwitchToPostInterceptor.java
index 4644656b84c0..e81b3b853438 100644
--- a/services/cloudsearchdomain/src/main/java/software/amazon/awssdk/services/cloudsearchdomain/internal/SwitchToPostInterceptor.java
+++ b/services/cloudsearchdomain/src/main/java/software/amazon/awssdk/services/cloudsearchdomain/internal/SwitchToPostInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/cloudsearchdomain/src/test/java/software/amazon/awssdk/cloudsearchdomain/SearchRequestUnitTest.java b/services/cloudsearchdomain/src/test/java/software/amazon/awssdk/cloudsearchdomain/SearchRequestUnitTest.java
index e1d7c47c02c8..b1dd78002dbf 100644
--- a/services/cloudsearchdomain/src/test/java/software/amazon/awssdk/cloudsearchdomain/SearchRequestUnitTest.java
+++ b/services/cloudsearchdomain/src/test/java/software/amazon/awssdk/cloudsearchdomain/SearchRequestUnitTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/cloudsearchdomain/src/test/resources/cucumber.properties b/services/cloudsearchdomain/src/test/resources/cucumber.properties
index ee7b347549fa..1b392931be6e 100644
--- a/services/cloudsearchdomain/src/test/resources/cucumber.properties
+++ b/services/cloudsearchdomain/src/test/resources/cucumber.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/cloudsearchdomain/src/test/resources/log4j.properties b/services/cloudsearchdomain/src/test/resources/log4j.properties
index e6e60ab769ec..359acf756369 100644
--- a/services/cloudsearchdomain/src/test/resources/log4j.properties
+++ b/services/cloudsearchdomain/src/test/resources/log4j.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/cloudtrail/build.properties b/services/cloudtrail/build.properties
index ecf2dae6fcb1..15ec2da1fc71 100644
--- a/services/cloudtrail/build.properties
+++ b/services/cloudtrail/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/cloudtrail/pom.xml b/services/cloudtrail/pom.xml
index cf764c930271..c2f22311e6d3 100644
--- a/services/cloudtrail/pom.xml
+++ b/services/cloudtrail/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>cloudtrail</artifactId>
     <name>AWS Java SDK :: Services :: AWS CloudTrail</name>
diff --git a/services/cloudtrail/src/it/java/software/amazon/awssdk/services/cloudtrail/CloudTrailIntegrationTest.java b/services/cloudtrail/src/it/java/software/amazon/awssdk/services/cloudtrail/CloudTrailIntegrationTest.java
index e0e450da1100..f287a6a1f93e 100644
--- a/services/cloudtrail/src/it/java/software/amazon/awssdk/services/cloudtrail/CloudTrailIntegrationTest.java
+++ b/services/cloudtrail/src/it/java/software/amazon/awssdk/services/cloudtrail/CloudTrailIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/cloudtrail/src/it/java/software/amazon/awssdk/services/cloudtrail/IntegrationTestBase.java b/services/cloudtrail/src/it/java/software/amazon/awssdk/services/cloudtrail/IntegrationTestBase.java
index 4e0ebfe9fe59..3810ddba3d54 100644
--- a/services/cloudtrail/src/it/java/software/amazon/awssdk/services/cloudtrail/IntegrationTestBase.java
+++ b/services/cloudtrail/src/it/java/software/amazon/awssdk/services/cloudtrail/IntegrationTestBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/cloudtrail/src/main/resources/codegen-resources/paginators-1.json b/services/cloudtrail/src/main/resources/codegen-resources/paginators-1.json
index 868fef815f87..30bbeca81281 100644
--- a/services/cloudtrail/src/main/resources/codegen-resources/paginators-1.json
+++ b/services/cloudtrail/src/main/resources/codegen-resources/paginators-1.json
@@ -3,6 +3,21 @@
     "DescribeTrails": {
       "result_key": "trailList"
     },
+    "ListPublicKeys": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "result_key": "PublicKeyList"
+    },
+    "ListTags": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "result_key": "ResourceTagList"
+    },
+    "ListTrails": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "result_key": "Trails"
+    },
     "LookupEvents": {
       "input_token": "NextToken",
       "limit_key": "MaxResults",
diff --git a/services/cloudtrail/src/main/resources/codegen-resources/service-2.json b/services/cloudtrail/src/main/resources/codegen-resources/service-2.json
index 373f1e012f60..9b2edf9a3cd6 100644
--- a/services/cloudtrail/src/main/resources/codegen-resources/service-2.json
+++ b/services/cloudtrail/src/main/resources/codegen-resources/service-2.json
@@ -32,7 +32,7 @@
         {"shape":"OperationNotPermittedException"},
         {"shape":"NotOrganizationMasterAccountException"}
       ],
-      "documentation":"<p>Adds one or more tags to a trail, up to a limit of 50. Tags must be unique per trail. Overwrites an existing tag's value when a new value is specified for an existing tag key. If you specify a key without a value, the tag will be created with the specified key and a value of null. You can tag a trail that applies to all regions only from the region in which the trail was created (that is, from its home region).</p>",
+      "documentation":"<p>Adds one or more tags to a trail, up to a limit of 50. Overwrites an existing tag's value when a new value is specified for an existing tag key. Tag key names must be unique for a trail; you cannot have two keys with the same name but different values. If you specify a key without a value, the tag will be created with the specified key and a value of null. You can tag a trail that applies to all AWS Regions only from the Region in which the trail was created (also known as its home region).</p>",
       "idempotent":true
     },
     "CreateTrail":{
@@ -63,6 +63,7 @@
         {"shape":"InvalidCloudWatchLogsLogGroupArnException"},
         {"shape":"InvalidCloudWatchLogsRoleArnException"},
         {"shape":"CloudWatchLogsDeliveryUnavailableException"},
+        {"shape":"InvalidTagParameterException"},
         {"shape":"UnsupportedOperationException"},
         {"shape":"OperationNotPermittedException"},
         {"shape":"CloudTrailAccessNotEnabledException"},
@@ -71,7 +72,7 @@
         {"shape":"OrganizationsNotInUseException"},
         {"shape":"OrganizationNotInAllFeaturesModeException"}
       ],
-      "documentation":"<p>Creates a trail that specifies the settings for delivery of log data to an Amazon S3 bucket. A maximum of five trails can exist in a region, irrespective of the region in which they were created.</p>",
+      "documentation":"<p>Creates a trail that specifies the settings for delivery of log data to an Amazon S3 bucket. </p>",
       "idempotent":true
     },
     "DeleteTrail":{
@@ -104,9 +105,10 @@
       "output":{"shape":"DescribeTrailsResponse"},
       "errors":[
         {"shape":"UnsupportedOperationException"},
-        {"shape":"OperationNotPermittedException"}
+        {"shape":"OperationNotPermittedException"},
+        {"shape":"InvalidTrailNameException"}
       ],
-      "documentation":"<p>Retrieves settings for the trail associated with the current region for your account.</p>",
+      "documentation":"<p>Retrieves settings for one or more trails associated with the current region for your account.</p>",
       "idempotent":true
     },
     "GetEventSelectors":{
@@ -123,7 +125,42 @@
         {"shape":"UnsupportedOperationException"},
         {"shape":"OperationNotPermittedException"}
       ],
-      "documentation":"<p>Describes the settings for the event selectors that you configured for your trail. The information returned for your event selectors includes the following:</p> <ul> <li> <p>If your event selector includes read-only events, write-only events, or all events. This applies to both management events and data events.</p> </li> <li> <p>If your event selector includes management events.</p> </li> <li> <p>If your event selector includes data events, the Amazon S3 objects or AWS Lambda functions that you are logging for data events.</p> </li> </ul> <p>For more information, see <a href=\"http://docs.aws.amazon.com/awscloudtrail/latest/userguide/logging-management-and-data-events-with-cloudtrail.html\">Logging Data and Management Events for Trails </a> in the <i>AWS CloudTrail User Guide</i>.</p>",
+      "documentation":"<p>Describes the settings for the event selectors that you configured for your trail. The information returned for your event selectors includes the following:</p> <ul> <li> <p>If your event selector includes read-only events, write-only events, or all events. This applies to both management events and data events.</p> </li> <li> <p>If your event selector includes management events.</p> </li> <li> <p>If your event selector includes data events, the Amazon S3 objects or AWS Lambda functions that you are logging for data events.</p> </li> </ul> <p>For more information, see <a href=\"https://docs.aws.amazon.com/awscloudtrail/latest/userguide/logging-management-and-data-events-with-cloudtrail.html\">Logging Data and Management Events for Trails </a> in the <i>AWS CloudTrail User Guide</i>.</p>",
+      "idempotent":true
+    },
+    "GetInsightSelectors":{
+      "name":"GetInsightSelectors",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"GetInsightSelectorsRequest"},
+      "output":{"shape":"GetInsightSelectorsResponse"},
+      "errors":[
+        {"shape":"TrailNotFoundException"},
+        {"shape":"InvalidTrailNameException"},
+        {"shape":"UnsupportedOperationException"},
+        {"shape":"OperationNotPermittedException"},
+        {"shape":"InsightNotEnabledException"}
+      ],
+      "documentation":"<p>Describes the settings for the Insights event selectors that you configured for your trail. <code>GetInsightSelectors</code> shows if CloudTrail Insights event logging is enabled on the trail, and if it is, which insight types are enabled. If you run <code>GetInsightSelectors</code> on a trail that does not have Insights events enabled, the operation throws the exception <code>InsightNotEnabledException</code> </p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/awscloudtrail/latest/userguide/logging-insights-events-with-cloudtrail.html\">Logging CloudTrail Insights Events for Trails </a> in the <i>AWS CloudTrail User Guide</i>.</p>",
+      "idempotent":true
+    },
+    "GetTrail":{
+      "name":"GetTrail",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"GetTrailRequest"},
+      "output":{"shape":"GetTrailResponse"},
+      "errors":[
+        {"shape":"TrailNotFoundException"},
+        {"shape":"InvalidTrailNameException"},
+        {"shape":"UnsupportedOperationException"},
+        {"shape":"OperationNotPermittedException"}
+      ],
+      "documentation":"<p>Returns settings information for a specified trail.</p>",
       "idempotent":true
     },
     "GetTrailStatus":{
@@ -136,7 +173,9 @@
       "output":{"shape":"GetTrailStatusResponse"},
       "errors":[
         {"shape":"TrailNotFoundException"},
-        {"shape":"InvalidTrailNameException"}
+        {"shape":"InvalidTrailNameException"},
+        {"shape":"UnsupportedOperationException"},
+        {"shape":"OperationNotPermittedException"}
       ],
       "documentation":"<p>Returns a JSON-formatted list of information about the specified trail. Fields include information on delivery errors, Amazon SNS and Amazon S3 errors, and start and stop logging times for each trail. This operation returns trail status from a single region. To return trail status from all regions, you must call the operation on each region.</p>",
       "idempotent":true
@@ -178,6 +217,21 @@
       "documentation":"<p>Lists the tags for the trail in the current region.</p>",
       "idempotent":true
     },
+    "ListTrails":{
+      "name":"ListTrails",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"ListTrailsRequest"},
+      "output":{"shape":"ListTrailsResponse"},
+      "errors":[
+        {"shape":"UnsupportedOperationException"},
+        {"shape":"OperationNotPermittedException"}
+      ],
+      "documentation":"<p>Lists trails that are in the current account.</p>",
+      "idempotent":true
+    },
     "LookupEvents":{
       "name":"LookupEvents",
       "http":{
@@ -190,9 +244,12 @@
         {"shape":"InvalidLookupAttributesException"},
         {"shape":"InvalidTimeRangeException"},
         {"shape":"InvalidMaxResultsException"},
-        {"shape":"InvalidNextTokenException"}
+        {"shape":"InvalidNextTokenException"},
+        {"shape":"InvalidEventCategoryException"},
+        {"shape":"UnsupportedOperationException"},
+        {"shape":"OperationNotPermittedException"}
       ],
-      "documentation":"<p>Looks up <a href=\"https://docs.aws.amazon.com/awscloudtrail/latest/userguide/cloudtrail-concepts.html#cloudtrail-concepts-management-events\">management events</a> captured by CloudTrail. Events for a region can be looked up in that region during the last 90 days. Lookup supports the following attributes:</p> <ul> <li> <p>AWS access key</p> </li> <li> <p>Event ID</p> </li> <li> <p>Event name</p> </li> <li> <p>Event source</p> </li> <li> <p>Read only</p> </li> <li> <p>Resource name</p> </li> <li> <p>Resource type</p> </li> <li> <p>User name</p> </li> </ul> <p>All attributes are optional. The default number of results returned is 50, with a maximum of 50 possible. The response includes a token that you can use to get the next page of results.</p> <important> <p>The rate of lookup requests is limited to one per second per account. If this limit is exceeded, a throttling error occurs.</p> </important> <important> <p>Events that occurred during the selected time range will not be available for lookup if CloudTrail logging was not enabled when the events occurred.</p> </important>",
+      "documentation":"<p>Looks up <a href=\"https://docs.aws.amazon.com/awscloudtrail/latest/userguide/cloudtrail-concepts.html#cloudtrail-concepts-management-events\">management events</a> or <a href=\"https://docs.aws.amazon.com/awscloudtrail/latest/userguide/cloudtrail-concepts.html#cloudtrail-concepts-insights-events\">CloudTrail Insights events</a> that are captured by CloudTrail. You can look up events that occurred in a region within the last 90 days. Lookup supports the following attributes for management events:</p> <ul> <li> <p>AWS access key</p> </li> <li> <p>Event ID</p> </li> <li> <p>Event name</p> </li> <li> <p>Event source</p> </li> <li> <p>Read only</p> </li> <li> <p>Resource name</p> </li> <li> <p>Resource type</p> </li> <li> <p>User name</p> </li> </ul> <p>Lookup supports the following attributes for Insights events:</p> <ul> <li> <p>Event ID</p> </li> <li> <p>Event name</p> </li> <li> <p>Event source</p> </li> </ul> <p>All attributes are optional. The default number of results returned is 50, with a maximum of 50 possible. The response includes a token that you can use to get the next page of results.</p> <important> <p>The rate of lookup requests is limited to two per second per account. If this limit is exceeded, a throttling error occurs.</p> </important>",
       "idempotent":true
     },
     "PutEventSelectors":{
@@ -213,7 +270,29 @@
         {"shape":"NotOrganizationMasterAccountException"},
         {"shape":"InsufficientDependencyServiceAccessPermissionException"}
       ],
-      "documentation":"<p>Configures an event selector for your trail. Use event selectors to further specify the management and data event settings for your trail. By default, trails created without specific event selectors will be configured to log all read and write management events, and no data events. </p> <p>When an event occurs in your account, CloudTrail evaluates the event selectors in all trails. For each trail, if the event matches any event selector, the trail processes and logs the event. If the event doesn't match any event selector, the trail doesn't log the event. </p> <p>Example</p> <ol> <li> <p>You create an event selector for a trail and specify that you want write-only events.</p> </li> <li> <p>The EC2 <code>GetConsoleOutput</code> and <code>RunInstances</code> API operations occur in your account.</p> </li> <li> <p>CloudTrail evaluates whether the events match your event selectors.</p> </li> <li> <p>The <code>RunInstances</code> is a write-only event and it matches your event selector. The trail logs the event.</p> </li> <li> <p>The <code>GetConsoleOutput</code> is a read-only event but it doesn't match your event selector. The trail doesn't log the event. </p> </li> </ol> <p>The <code>PutEventSelectors</code> operation must be called from the region in which the trail was created; otherwise, an <code>InvalidHomeRegionException</code> is thrown.</p> <p>You can configure up to five event selectors for each trail. For more information, see <a href=\"http://docs.aws.amazon.com/awscloudtrail/latest/userguide/logging-management-and-data-events-with-cloudtrail.html\">Logging Data and Management Events for Trails </a> and <a href=\"https://docs.aws.amazon.com/awscloudtrail/latest/userguide/WhatIsCloudTrail-Limits.html\">Limits in AWS CloudTrail</a> in the <i>AWS CloudTrail User Guide</i>.</p>",
+      "documentation":"<p>Configures an event selector for your trail. Use event selectors to further specify the management and data event settings for your trail. By default, trails created without specific event selectors will be configured to log all read and write management events, and no data events. </p> <p>When an event occurs in your account, CloudTrail evaluates the event selectors in all trails. For each trail, if the event matches any event selector, the trail processes and logs the event. If the event doesn't match any event selector, the trail doesn't log the event. </p> <p>Example</p> <ol> <li> <p>You create an event selector for a trail and specify that you want write-only events.</p> </li> <li> <p>The EC2 <code>GetConsoleOutput</code> and <code>RunInstances</code> API operations occur in your account.</p> </li> <li> <p>CloudTrail evaluates whether the events match your event selectors.</p> </li> <li> <p>The <code>RunInstances</code> is a write-only event and it matches your event selector. The trail logs the event.</p> </li> <li> <p>The <code>GetConsoleOutput</code> is a read-only event but it doesn't match your event selector. The trail doesn't log the event. </p> </li> </ol> <p>The <code>PutEventSelectors</code> operation must be called from the region in which the trail was created; otherwise, an <code>InvalidHomeRegionException</code> is thrown.</p> <p>You can configure up to five event selectors for each trail. For more information, see <a href=\"https://docs.aws.amazon.com/awscloudtrail/latest/userguide/logging-management-and-data-events-with-cloudtrail.html\">Logging Data and Management Events for Trails </a> and <a href=\"https://docs.aws.amazon.com/awscloudtrail/latest/userguide/WhatIsCloudTrail-Limits.html\">Limits in AWS CloudTrail</a> in the <i>AWS CloudTrail User Guide</i>.</p>",
+      "idempotent":true
+    },
+    "PutInsightSelectors":{
+      "name":"PutInsightSelectors",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"PutInsightSelectorsRequest"},
+      "output":{"shape":"PutInsightSelectorsResponse"},
+      "errors":[
+        {"shape":"TrailNotFoundException"},
+        {"shape":"InvalidTrailNameException"},
+        {"shape":"InvalidHomeRegionException"},
+        {"shape":"InvalidInsightSelectorsException"},
+        {"shape":"InsufficientS3BucketPolicyException"},
+        {"shape":"InsufficientEncryptionPolicyException"},
+        {"shape":"UnsupportedOperationException"},
+        {"shape":"OperationNotPermittedException"},
+        {"shape":"NotOrganizationMasterAccountException"}
+      ],
+      "documentation":"<p>Lets you enable Insights event logging by specifying the Insights selectors that you want to enable on an existing trail. You also use <code>PutInsightSelectors</code> to turn off Insights event logging, by passing an empty list of insight types. In this release, only <code>ApiCallRateInsight</code> is supported as an Insights selector.</p>",
       "idempotent":true
     },
     "RemoveTags":{
@@ -297,6 +376,7 @@
         {"shape":"InvalidKmsKeyIdException"},
         {"shape":"InvalidTrailNameException"},
         {"shape":"TrailNotProvidedException"},
+        {"shape":"InvalidEventSelectorsException"},
         {"shape":"InvalidParameterCombinationException"},
         {"shape":"InvalidHomeRegionException"},
         {"shape":"KmsKeyNotFoundException"},
@@ -375,11 +455,11 @@
         },
         "S3BucketName":{
           "shape":"String",
-          "documentation":"<p>Specifies the name of the Amazon S3 bucket designated for publishing log files. See <a href=\"http://docs.aws.amazon.com/awscloudtrail/latest/userguide/create_trail_naming_policy.html\">Amazon S3 Bucket Naming Requirements</a>.</p>"
+          "documentation":"<p>Specifies the name of the Amazon S3 bucket designated for publishing log files. See <a href=\"https://docs.aws.amazon.com/awscloudtrail/latest/userguide/create_trail_naming_policy.html\">Amazon S3 Bucket Naming Requirements</a>.</p>"
         },
         "S3KeyPrefix":{
           "shape":"String",
-          "documentation":"<p>Specifies the Amazon S3 key prefix that comes after the name of the bucket you have designated for log file delivery. For more information, see <a href=\"http://docs.aws.amazon.com/awscloudtrail/latest/userguide/cloudtrail-find-log-files.html\">Finding Your CloudTrail Log Files</a>. The maximum length is 200 characters.</p>"
+          "documentation":"<p>Specifies the Amazon S3 key prefix that comes after the name of the bucket you have designated for log file delivery. For more information, see <a href=\"https://docs.aws.amazon.com/awscloudtrail/latest/userguide/cloudtrail-find-log-files.html\">Finding Your CloudTrail Log Files</a>. The maximum length is 200 characters.</p>"
         },
         "SnsTopicName":{
           "shape":"String",
@@ -391,7 +471,7 @@
         },
         "IsMultiRegionTrail":{
           "shape":"Boolean",
-          "documentation":"<p>Specifies whether the trail is created in the current region or in all regions. The default is false.</p>"
+          "documentation":"<p>Specifies whether the trail is created in the current region or in all regions. The default is false, which creates a trail only in the region where you are signed in. As a best practice, consider creating trails that log events in all regions.</p>"
         },
         "EnableLogFileValidation":{
           "shape":"Boolean",
@@ -412,7 +492,8 @@
         "IsOrganizationTrail":{
           "shape":"Boolean",
           "documentation":"<p>Specifies whether the trail is created for all accounts in an organization in AWS Organizations, or only for the current AWS account. The default is false, and cannot be true unless the call is made on behalf of an AWS account that is the master account for an organization in AWS Organizations.</p>"
-        }
+        },
+        "TagsList":{"shape":"TagsList"}
       },
       "documentation":"<p>Specifies the settings for each trail.</p>"
     },
@@ -429,11 +510,11 @@
         },
         "S3KeyPrefix":{
           "shape":"String",
-          "documentation":"<p>Specifies the Amazon S3 key prefix that comes after the name of the bucket you have designated for log file delivery. For more information, see <a href=\"http://docs.aws.amazon.com/awscloudtrail/latest/userguide/cloudtrail-find-log-files.html\">Finding Your CloudTrail Log Files</a>.</p>"
+          "documentation":"<p>Specifies the Amazon S3 key prefix that comes after the name of the bucket you have designated for log file delivery. For more information, see <a href=\"https://docs.aws.amazon.com/awscloudtrail/latest/userguide/cloudtrail-find-log-files.html\">Finding Your CloudTrail Log Files</a>.</p>"
         },
         "SnsTopicName":{
           "shape":"String",
-          "documentation":"<p>This field is deprecated. Use SnsTopicARN.</p>",
+          "documentation":"<p>This field is no longer in use. Use SnsTopicARN.</p>",
           "deprecated":true
         },
         "SnsTopicARN":{
@@ -484,10 +565,10 @@
         },
         "Values":{
           "shape":"DataResourceValues",
-          "documentation":"<p>An array of Amazon Resource Name (ARN) strings or partial ARN strings for the specified objects.</p> <ul> <li> <p>To log data events for all objects in all S3 buckets in your AWS account, specify the prefix as <code>arn:aws:s3:::</code>. </p> <note> <p>This will also enable logging of data event activity performed by any user or role in your AWS account, even if that activity is performed on a bucket that belongs to another AWS account. </p> </note> </li> <li> <p>To log data events for all objects in all S3 buckets that include <i>my-bucket</i> in their names, specify the prefix as <code>aws:s3:::my-bucket</code>. The trail logs data events for all objects in all buckets whose name contains a match for <i>my-bucket</i>. </p> </li> <li> <p>To log data events for all objects in an S3 bucket, specify the bucket and an empty object prefix such as <code>arn:aws:s3:::bucket-1/</code>. The trail logs data events for all objects in this S3 bucket.</p> </li> <li> <p>To log data events for specific objects, specify the S3 bucket and object prefix such as <code>arn:aws:s3:::bucket-1/example-images</code>. The trail logs data events for objects in this S3 bucket that match the prefix.</p> </li> <li> <p>To log data events for all functions in your AWS account, specify the prefix as <code>arn:aws:lambda</code>.</p> <note> <p>This will also enable logging of <code>Invoke</code> activity performed by any user or role in your AWS account, even if that activity is performed on a function that belongs to another AWS account. </p> </note> </li> <li> <p>To log data eents for a specific Lambda function, specify the function ARN.</p> <note> <p>Lambda function ARNs are exact. Unlike S3, you cannot use matching. For example, if you specify a function ARN <i>arn:aws:lambda:us-west-2:111111111111:function:helloworld</i>, data events will only be logged for <i>arn:aws:lambda:us-west-2:111111111111:function:helloworld</i>. They will not be logged for <i>arn:aws:lambda:us-west-2:111111111111:function:helloworld2</i>.</p> </note> </li> </ul>"
+          "documentation":"<p>An array of Amazon Resource Name (ARN) strings or partial ARN strings for the specified objects.</p> <ul> <li> <p>To log data events for all objects in all S3 buckets in your AWS account, specify the prefix as <code>arn:aws:s3:::</code>. </p> <note> <p>This will also enable logging of data event activity performed by any user or role in your AWS account, even if that activity is performed on a bucket that belongs to another AWS account. </p> </note> </li> <li> <p>To log data events for all objects in an S3 bucket, specify the bucket and an empty object prefix such as <code>arn:aws:s3:::bucket-1/</code>. The trail logs data events for all objects in this S3 bucket.</p> </li> <li> <p>To log data events for specific objects, specify the S3 bucket and object prefix such as <code>arn:aws:s3:::bucket-1/example-images</code>. The trail logs data events for objects in this S3 bucket that match the prefix.</p> </li> <li> <p>To log data events for all functions in your AWS account, specify the prefix as <code>arn:aws:lambda</code>.</p> <note> <p>This will also enable logging of <code>Invoke</code> activity performed by any user or role in your AWS account, even if that activity is performed on a function that belongs to another AWS account. </p> </note> </li> <li> <p>To log data events for a specific Lambda function, specify the function ARN.</p> <note> <p>Lambda function ARNs are exact. For example, if you specify a function ARN <i>arn:aws:lambda:us-west-2:111111111111:function:helloworld</i>, data events will only be logged for <i>arn:aws:lambda:us-west-2:111111111111:function:helloworld</i>. They will not be logged for <i>arn:aws:lambda:us-west-2:111111111111:function:helloworld2</i>.</p> </note> </li> </ul>"
         }
       },
-      "documentation":"<p>The Amazon S3 buckets or AWS Lambda functions that you specify in your event selectors for your trail to log data events. Data events provide insight into the resource operations performed on or within a resource itself. These are also known as data plane operations. You can specify up to 250 data resources for a trail.</p> <note> <p>The total number of allowed data resources is 250. This number can be distributed between 1 and 5 event selectors, but the total cannot exceed 250 across all selectors.</p> </note> <p>The following example demonstrates how logging works when you configure logging of all data events for an S3 bucket named <code>bucket-1</code>. In this example, the CloudTrail user spcified an empty prefix, and the option to log both <code>Read</code> and <code>Write</code> data events.</p> <ol> <li> <p>A user uploads an image file to <code>bucket-1</code>.</p> </li> <li> <p>The <code>PutObject</code> API operation is an Amazon S3 object-level API. It is recorded as a data event in CloudTrail. Because the CloudTrail user specified an S3 bucket with an empty prefix, events that occur on any object in that bucket are logged. The trail processes and logs the event.</p> </li> <li> <p>A user uploads an object to an Amazon S3 bucket named <code>arn:aws:s3:::bucket-2</code>.</p> </li> <li> <p>The <code>PutObject</code> API operation occurred for an object in an S3 bucket that the CloudTrail user didn't specify for the trail. The trail doesn’t log the event.</p> </li> </ol> <p>The following example demonstrates how logging works when you configure logging of AWS Lambda data events for a Lambda function named <i>MyLambdaFunction</i>, but not for all AWS Lambda functions.</p> <ol> <li> <p>A user runs a script that includes a call to the <i>MyLambdaFunction</i> function and the <i>MyOtherLambdaFunction</i> function.</p> </li> <li> <p>The <code>Invoke</code> API operation on <i>MyLambdaFunction</i> is an AWS Lambda API. It is recorded as a data event in CloudTrail. Because the CloudTrail user specified logging data events for <i>MyLambdaFunction</i>, any invocations of that function are logged. The trail processes and logs the event. </p> </li> <li> <p>The <code>Invoke</code> API operation on <i>MyOtherLambdaFunction</i> is an AWS Lambda API. Because the CloudTrail user did not specify logging data events for all Lambda functions, the <code>Invoke</code> operation for <i>MyOtherLambdaFunction</i> does not match the function specified for the trail. The trail doesn’t log the event. </p> </li> </ol>"
+      "documentation":"<p>The Amazon S3 buckets or AWS Lambda functions that you specify in your event selectors for your trail to log data events. Data events provide information about the resource operations performed on or within a resource itself. These are also known as data plane operations. You can specify up to 250 data resources for a trail.</p> <note> <p>The total number of allowed data resources is 250. This number can be distributed between 1 and 5 event selectors, but the total cannot exceed 250 across all selectors.</p> </note> <p>The following example demonstrates how logging works when you configure logging of all data events for an S3 bucket named <code>bucket-1</code>. In this example, the CloudTrail user specified an empty prefix, and the option to log both <code>Read</code> and <code>Write</code> data events.</p> <ol> <li> <p>A user uploads an image file to <code>bucket-1</code>.</p> </li> <li> <p>The <code>PutObject</code> API operation is an Amazon S3 object-level API. It is recorded as a data event in CloudTrail. Because the CloudTrail user specified an S3 bucket with an empty prefix, events that occur on any object in that bucket are logged. The trail processes and logs the event.</p> </li> <li> <p>A user uploads an object to an Amazon S3 bucket named <code>arn:aws:s3:::bucket-2</code>.</p> </li> <li> <p>The <code>PutObject</code> API operation occurred for an object in an S3 bucket that the CloudTrail user didn't specify for the trail. The trail doesn’t log the event.</p> </li> </ol> <p>The following example demonstrates how logging works when you configure logging of AWS Lambda data events for a Lambda function named <i>MyLambdaFunction</i>, but not for all AWS Lambda functions.</p> <ol> <li> <p>A user runs a script that includes a call to the <i>MyLambdaFunction</i> function and the <i>MyOtherLambdaFunction</i> function.</p> </li> <li> <p>The <code>Invoke</code> API operation on <i>MyLambdaFunction</i> is an AWS Lambda API. It is recorded as a data event in CloudTrail. Because the CloudTrail user specified logging data events for <i>MyLambdaFunction</i>, any invocations of that function are logged. The trail processes and logs the event. </p> </li> <li> <p>The <code>Invoke</code> API operation on <i>MyOtherLambdaFunction</i> is an AWS Lambda API. Because the CloudTrail user did not specify logging data events for all Lambda functions, the <code>Invoke</code> operation for <i>MyOtherLambdaFunction</i> does not match the function specified for the trail. The trail doesn’t log the event. </p> </li> </ol>"
     },
     "DataResourceValues":{
       "type":"list",
@@ -534,7 +615,7 @@
       "members":{
         "trailList":{
           "shape":"TrailList",
-          "documentation":"<p>The list of trail objects.</p>"
+          "documentation":"<p>The list of trail objects. Trail objects with string values are only returned if values for the objects exist in a trail's configuration. For example, <code>SNSTopicName</code> and <code>SNSTopicARN</code> are only returned in results if a trail is configured to send SNS notifications. Similarly, <code>KMSKeyId</code> only appears in results if a trail's log files are encrypted with AWS KMS-managed keys.</p>"
         }
       },
       "documentation":"<p>Returns the objects or data listed below if successful. Otherwise, returns an error.</p>"
@@ -581,6 +662,10 @@
       },
       "documentation":"<p>Contains information about an event that was returned by a lookup request. The result includes a representation of a CloudTrail event.</p>"
     },
+    "EventCategory":{
+      "type":"string",
+      "enum":["insight"]
+    },
     "EventSelector":{
       "type":"structure",
       "members":{
@@ -590,11 +675,15 @@
         },
         "IncludeManagementEvents":{
           "shape":"Boolean",
-          "documentation":"<p>Specify if you want your event selector to include management events for your trail.</p> <p> For more information, see <a href=\"http://docs.aws.amazon.com/awscloudtrail/latest/userguide/logging-management-and-data-events-with-cloudtrail.html#logging-management-events\">Management Events</a> in the <i>AWS CloudTrail User Guide</i>.</p> <p>By default, the value is <code>true</code>.</p>"
+          "documentation":"<p>Specify if you want your event selector to include management events for your trail.</p> <p> For more information, see <a href=\"https://docs.aws.amazon.com/awscloudtrail/latest/userguide/logging-management-and-data-events-with-cloudtrail.html#logging-management-events\">Management Events</a> in the <i>AWS CloudTrail User Guide</i>.</p> <p>By default, the value is <code>true</code>.</p>"
         },
         "DataResources":{
           "shape":"DataResources",
-          "documentation":"<p>CloudTrail supports data event logging for Amazon S3 objects and AWS Lambda functions. You can specify up to 250 resources for an individual event selector, but the total number of data resources cannot exceed 250 across all event selectors in a trail. This limit does not apply if you configure resource logging for all data events. </p> <p>For more information, see <a href=\"http://docs.aws.amazon.com/awscloudtrail/latest/userguide/logging-management-and-data-events-with-cloudtrail.html#logging-data-events\">Data Events</a> and <a href=\"https://docs.aws.amazon.com/awscloudtrail/latest/userguide/WhatIsCloudTrail-Limits.html\">Limits in AWS CloudTrail</a> in the <i>AWS CloudTrail User Guide</i>.</p>"
+          "documentation":"<p>CloudTrail supports data event logging for Amazon S3 objects and AWS Lambda functions. You can specify up to 250 resources for an individual event selector, but the total number of data resources cannot exceed 250 across all event selectors in a trail. This limit does not apply if you configure resource logging for all data events. </p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/awscloudtrail/latest/userguide/logging-management-and-data-events-with-cloudtrail.html#logging-data-events\">Data Events</a> and <a href=\"https://docs.aws.amazon.com/awscloudtrail/latest/userguide/WhatIsCloudTrail-Limits.html\">Limits in AWS CloudTrail</a> in the <i>AWS CloudTrail User Guide</i>.</p>"
+        },
+        "ExcludeManagementEventSources":{
+          "shape":"ExcludeManagementEventSources",
+          "documentation":"<p>An optional list of service event sources from which you do not want management events to be logged on your trail. In this release, the list can be empty (disables the filter), or it can filter out AWS Key Management Service events by containing <code>\"kms.amazonaws.com\"</code>. By default, <code>ExcludeManagementEventSources</code> is empty, and AWS KMS events are included in events that are logged to your trail. </p>"
         }
       },
       "documentation":"<p>Use event selectors to further specify the management and data event settings for your trail. By default, trails created without specific event selectors will be configured to log all read and write management events, and no data events. When an event occurs in your account, CloudTrail evaluates the event selector for all trails. For each trail, if the event matches any event selector, the trail processes and logs the event. If the event doesn't match any event selector, the trail doesn't log the event.</p> <p>You can configure up to five event selectors for a trail.</p>"
@@ -607,6 +696,10 @@
       "type":"list",
       "member":{"shape":"Event"}
     },
+    "ExcludeManagementEventSources":{
+      "type":"list",
+      "member":{"shape":"String"}
+    },
     "GetEventSelectorsRequest":{
       "type":"structure",
       "required":["TrailName"],
@@ -630,6 +723,45 @@
         }
       }
     },
+    "GetInsightSelectorsRequest":{
+      "type":"structure",
+      "required":["TrailName"],
+      "members":{
+        "TrailName":{
+          "shape":"String",
+          "documentation":"<p>Specifies the name of the trail or trail ARN. If you specify a trail name, the string must meet the following requirements:</p> <ul> <li> <p>Contain only ASCII letters (a-z, A-Z), numbers (0-9), periods (.), underscores (_), or dashes (-)</p> </li> <li> <p>Start with a letter or number, and end with a letter or number</p> </li> <li> <p>Be between 3 and 128 characters</p> </li> <li> <p>Have no adjacent periods, underscores or dashes. Names like <code>my-_namespace</code> and <code>my--namespace</code> are not valid.</p> </li> <li> <p>Not be in IP address format (for example, 192.168.5.4)</p> </li> </ul> <p>If you specify a trail ARN, it must be in the format:</p> <p> <code>arn:aws:cloudtrail:us-east-2:123456789012:trail/MyTrail</code> </p>"
+        }
+      }
+    },
+    "GetInsightSelectorsResponse":{
+      "type":"structure",
+      "members":{
+        "TrailARN":{
+          "shape":"String",
+          "documentation":"<p>The Amazon Resource Name (ARN) of a trail for which you want to get Insights selectors.</p>"
+        },
+        "InsightSelectors":{
+          "shape":"InsightSelectors",
+          "documentation":"<p>A JSON string that contains the insight types you want to log on a trail. In this release, only <code>ApiCallRateInsight</code> is supported as an insight type.</p>"
+        }
+      }
+    },
+    "GetTrailRequest":{
+      "type":"structure",
+      "required":["Name"],
+      "members":{
+        "Name":{
+          "shape":"String",
+          "documentation":"<p>The name or the Amazon Resource Name (ARN) of the trail for which you want to retrieve settings information.</p>"
+        }
+      }
+    },
+    "GetTrailResponse":{
+      "type":"structure",
+      "members":{
+        "Trail":{"shape":"Trail"}
+      }
+    },
     "GetTrailStatusRequest":{
       "type":"structure",
       "required":["Name"],
@@ -650,11 +782,11 @@
         },
         "LatestDeliveryError":{
           "shape":"String",
-          "documentation":"<p>Displays any Amazon S3 error that CloudTrail encountered when attempting to deliver log files to the designated bucket. For more information see the topic <a href=\"http://docs.aws.amazon.com/AmazonS3/latest/API/ErrorResponses.html\">Error Responses</a> in the Amazon S3 API Reference. </p> <note> <p>This error occurs only when there is a problem with the destination S3 bucket and will not occur for timeouts. To resolve the issue, create a new bucket and call <code>UpdateTrail</code> to specify the new bucket, or fix the existing objects so that CloudTrail can again write to the bucket.</p> </note>"
+          "documentation":"<p>Displays any Amazon S3 error that CloudTrail encountered when attempting to deliver log files to the designated bucket. For more information see the topic <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/API/ErrorResponses.html\">Error Responses</a> in the Amazon S3 API Reference. </p> <note> <p>This error occurs only when there is a problem with the destination S3 bucket and will not occur for timeouts. To resolve the issue, create a new bucket and call <code>UpdateTrail</code> to specify the new bucket, or fix the existing objects so that CloudTrail can again write to the bucket.</p> </note>"
         },
         "LatestNotificationError":{
           "shape":"String",
-          "documentation":"<p>Displays any Amazon SNS error that CloudTrail encountered when attempting to send a notification. For more information about Amazon SNS errors, see the <a href=\"http://docs.aws.amazon.com/sns/latest/dg/welcome.html\">Amazon SNS Developer Guide</a>. </p>"
+          "documentation":"<p>Displays any Amazon SNS error that CloudTrail encountered when attempting to send a notification. For more information about Amazon SNS errors, see the <a href=\"https://docs.aws.amazon.com/sns/latest/dg/welcome.html\">Amazon SNS Developer Guide</a>. </p>"
         },
         "LatestDeliveryTime":{
           "shape":"Date",
@@ -686,35 +818,60 @@
         },
         "LatestDigestDeliveryError":{
           "shape":"String",
-          "documentation":"<p>Displays any Amazon S3 error that CloudTrail encountered when attempting to deliver a digest file to the designated bucket. For more information see the topic <a href=\"http://docs.aws.amazon.com/AmazonS3/latest/API/ErrorResponses.html\">Error Responses</a> in the Amazon S3 API Reference. </p> <note> <p>This error occurs only when there is a problem with the destination S3 bucket and will not occur for timeouts. To resolve the issue, create a new bucket and call <code>UpdateTrail</code> to specify the new bucket, or fix the existing objects so that CloudTrail can again write to the bucket.</p> </note>"
+          "documentation":"<p>Displays any Amazon S3 error that CloudTrail encountered when attempting to deliver a digest file to the designated bucket. For more information see the topic <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/API/ErrorResponses.html\">Error Responses</a> in the Amazon S3 API Reference. </p> <note> <p>This error occurs only when there is a problem with the destination S3 bucket and will not occur for timeouts. To resolve the issue, create a new bucket and call <code>UpdateTrail</code> to specify the new bucket, or fix the existing objects so that CloudTrail can again write to the bucket.</p> </note>"
         },
         "LatestDeliveryAttemptTime":{
           "shape":"String",
-          "documentation":"<p>This field is deprecated.</p>"
+          "documentation":"<p>This field is no longer in use.</p>"
         },
         "LatestNotificationAttemptTime":{
           "shape":"String",
-          "documentation":"<p>This field is deprecated.</p>"
+          "documentation":"<p>This field is no longer in use.</p>"
         },
         "LatestNotificationAttemptSucceeded":{
           "shape":"String",
-          "documentation":"<p>This field is deprecated.</p>"
+          "documentation":"<p>This field is no longer in use.</p>"
         },
         "LatestDeliveryAttemptSucceeded":{
           "shape":"String",
-          "documentation":"<p>This field is deprecated.</p>"
+          "documentation":"<p>This field is no longer in use.</p>"
         },
         "TimeLoggingStarted":{
           "shape":"String",
-          "documentation":"<p>This field is deprecated.</p>"
+          "documentation":"<p>This field is no longer in use.</p>"
         },
         "TimeLoggingStopped":{
           "shape":"String",
-          "documentation":"<p>This field is deprecated.</p>"
+          "documentation":"<p>This field is no longer in use.</p>"
         }
       },
       "documentation":"<p>Returns the objects or data listed below if successful. Otherwise, returns an error.</p>"
     },
+    "InsightNotEnabledException":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>If you run <code>GetInsightSelectors</code> on a trail that does not have Insights events enabled, the operation throws the exception <code>InsightNotEnabledException</code>.</p>",
+      "exception":true
+    },
+    "InsightSelector":{
+      "type":"structure",
+      "members":{
+        "InsightType":{
+          "shape":"InsightType",
+          "documentation":"<p>The type of insights to log on a trail. In this release, only <code>ApiCallRateInsight</code> is supported as an insight type.</p>"
+        }
+      },
+      "documentation":"<p>A JSON string that contains a list of insight types that are logged on a trail.</p>"
+    },
+    "InsightSelectors":{
+      "type":"list",
+      "member":{"shape":"InsightSelector"}
+    },
+    "InsightType":{
+      "type":"string",
+      "enum":["ApiCallRateInsight"]
+    },
     "InsufficientDependencyServiceAccessPermissionException":{
       "type":"structure",
       "members":{
@@ -757,6 +914,13 @@
       "documentation":"<p>This exception is thrown when the provided role is not valid.</p>",
       "exception":true
     },
+    "InvalidEventCategoryException":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>Occurs if an event category that is not valid is specified as a value of <code>EventCategory</code>.</p>",
+      "exception":true
+    },
     "InvalidEventSelectorsException":{
       "type":"structure",
       "members":{
@@ -771,6 +935,13 @@
       "documentation":"<p>This exception is thrown when an operation is called on a trail from a region other than the region in which the trail was created.</p>",
       "exception":true
     },
+    "InvalidInsightSelectorsException":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>The formatting or syntax of the <code>InsightSelectors</code> JSON statement in your <code>PutInsightSelectors</code> or <code>GetInsightSelectors</code> request is not valid, or the specified insight type in the <code>InsightSelectors</code> statement is not a valid insight type.</p>",
+      "exception":true
+    },
     "InvalidKmsKeyIdException":{
       "type":"structure",
       "members":{
@@ -831,7 +1002,7 @@
       "type":"structure",
       "members":{
       },
-      "documentation":"<p>This exception is thrown when the key or value specified for the tag does not match the regular expression <code>^([\\\\p{L}\\\\p{Z}\\\\p{N}_.:/=+\\\\-@]*)$</code>.</p>",
+      "documentation":"<p>This exception is thrown when the specified tag key or values are not valid. It can also occur if there are duplicate tags or too many tags on the resource.</p>",
       "exception":true
     },
     "InvalidTimeRangeException":{
@@ -866,7 +1037,7 @@
       "type":"structure",
       "members":{
       },
-      "documentation":"<p>This exception is deprecated.</p>",
+      "documentation":"<p>This exception is no longer in use.</p>",
       "deprecated":true,
       "exception":true
     },
@@ -938,6 +1109,28 @@
       },
       "documentation":"<p>Returns the objects or data listed below if successful. Otherwise, returns an error.</p>"
     },
+    "ListTrailsRequest":{
+      "type":"structure",
+      "members":{
+        "NextToken":{
+          "shape":"String",
+          "documentation":"<p>The token to use to get the next page of results after a previous API call. This token must be passed in with the same parameters that were specified in the the original call. For example, if the original call specified an AttributeKey of 'Username' with a value of 'root', the call with NextToken should include those same parameters.</p>"
+        }
+      }
+    },
+    "ListTrailsResponse":{
+      "type":"structure",
+      "members":{
+        "Trails":{
+          "shape":"Trails",
+          "documentation":"<p>Returns the name, ARN, and home region of trails in the current account.</p>"
+        },
+        "NextToken":{
+          "shape":"String",
+          "documentation":"<p>The token to use to get the next page of results after a previous API call. If the token does not appear, there are no more results to return. The token must be passed in with the same parameters as the previous call. For example, if the original call specified an AttributeKey of 'Username' with a value of 'root', the call with NextToken should include those same parameters.</p>"
+        }
+      }
+    },
     "LookupAttribute":{
       "type":"structure",
       "required":[
@@ -988,6 +1181,10 @@
           "shape":"Date",
           "documentation":"<p>Specifies that only events that occur before or at the specified time are returned. If the specified end time is before the specified start time, an error is returned.</p>"
         },
+        "EventCategory":{
+          "shape":"EventCategory",
+          "documentation":"<p>Specifies the event category. If you do not specify an event category, events of the category are not returned in the response. For example, if you do not specify <code>insight</code> as the value of <code>EventCategory</code>, no Insights events are returned.</p>"
+        },
         "MaxResults":{
           "shape":"MaxResults",
           "documentation":"<p>The number of events to return. Possible values are 1 through 50. The default is 50.</p>"
@@ -1110,6 +1307,36 @@
         }
       }
     },
+    "PutInsightSelectorsRequest":{
+      "type":"structure",
+      "required":[
+        "TrailName",
+        "InsightSelectors"
+      ],
+      "members":{
+        "TrailName":{
+          "shape":"String",
+          "documentation":"<p>The name of the CloudTrail trail for which you want to change or add Insights selectors.</p>"
+        },
+        "InsightSelectors":{
+          "shape":"InsightSelectors",
+          "documentation":"<p>A JSON string that contains the insight types you want to log on a trail. In this release, only <code>ApiCallRateInsight</code> is supported as an insight type.</p>"
+        }
+      }
+    },
+    "PutInsightSelectorsResponse":{
+      "type":"structure",
+      "members":{
+        "TrailARN":{
+          "shape":"String",
+          "documentation":"<p>The Amazon Resource Name (ARN) of a trail for which you want to change or add Insights selectors.</p>"
+        },
+        "InsightSelectors":{
+          "shape":"InsightSelectors",
+          "documentation":"<p>A JSON string that contains the insight types you want to log on a trail. In this release, only <code>ApiCallRateInsight</code> is supported as an insight type.</p>"
+        }
+      }
+    },
     "ReadWriteType":{
       "type":"string",
       "enum":[
@@ -1144,7 +1371,7 @@
       "members":{
         "ResourceType":{
           "shape":"String",
-          "documentation":"<p>The type of a resource referenced by the event returned. When the resource type cannot be determined, null is returned. Some examples of resource types are: <b>Instance</b> for EC2, <b>Trail</b> for CloudTrail, <b>DBInstance</b> for RDS, and <b>AccessKey</b> for IAM. For a list of resource types supported for event lookup, see <a href=\"http://docs.aws.amazon.com/awscloudtrail/latest/userguide/lookup_supported_resourcetypes.html\">Resource Types Supported for Event Lookup</a>.</p>"
+          "documentation":"<p>The type of a resource referenced by the event returned. When the resource type cannot be determined, null is returned. Some examples of resource types are: <b>Instance</b> for EC2, <b>Trail</b> for CloudTrail, <b>DBInstance</b> for RDS, and <b>AccessKey</b> for IAM. To learn more about how to look up and filter events by the resource types supported for a service, see <a href=\"https://docs.aws.amazon.com/awscloudtrail/latest/userguide/view-cloudtrail-events-console.html#filtering-cloudtrail-events\">Filtering CloudTrail Events</a>.</p>"
         },
         "ResourceName":{
           "shape":"String",
@@ -1272,15 +1499,15 @@
         },
         "S3BucketName":{
           "shape":"String",
-          "documentation":"<p>Name of the Amazon S3 bucket into which CloudTrail delivers your trail files. See <a href=\"http://docs.aws.amazon.com/awscloudtrail/latest/userguide/create_trail_naming_policy.html\">Amazon S3 Bucket Naming Requirements</a>.</p>"
+          "documentation":"<p>Name of the Amazon S3 bucket into which CloudTrail delivers your trail files. See <a href=\"https://docs.aws.amazon.com/awscloudtrail/latest/userguide/create_trail_naming_policy.html\">Amazon S3 Bucket Naming Requirements</a>.</p>"
         },
         "S3KeyPrefix":{
           "shape":"String",
-          "documentation":"<p>Specifies the Amazon S3 key prefix that comes after the name of the bucket you have designated for log file delivery. For more information, see <a href=\"http://docs.aws.amazon.com/awscloudtrail/latest/userguide/cloudtrail-find-log-files.html\">Finding Your CloudTrail Log Files</a>.The maximum length is 200 characters.</p>"
+          "documentation":"<p>Specifies the Amazon S3 key prefix that comes after the name of the bucket you have designated for log file delivery. For more information, see <a href=\"https://docs.aws.amazon.com/awscloudtrail/latest/userguide/cloudtrail-find-log-files.html\">Finding Your CloudTrail Log Files</a>.The maximum length is 200 characters.</p>"
         },
         "SnsTopicName":{
           "shape":"String",
-          "documentation":"<p>This field is deprecated. Use SnsTopicARN.</p>",
+          "documentation":"<p>This field is no longer in use. Use SnsTopicARN.</p>",
           "deprecated":true
         },
         "SnsTopicARN":{
@@ -1293,7 +1520,7 @@
         },
         "IsMultiRegionTrail":{
           "shape":"Boolean",
-          "documentation":"<p>Specifies whether the trail belongs only to one region or exists in all regions.</p>"
+          "documentation":"<p>Specifies whether the trail exists only in one region or exists in all regions.</p>"
         },
         "HomeRegion":{
           "shape":"String",
@@ -1323,6 +1550,10 @@
           "shape":"Boolean",
           "documentation":"<p>Specifies if the trail has custom event selectors.</p>"
         },
+        "HasInsightSelectors":{
+          "shape":"Boolean",
+          "documentation":"<p>Specifies whether a trail has insight types specified in an <code>InsightSelector</code> list.</p>"
+        },
         "IsOrganizationTrail":{
           "shape":"Boolean",
           "documentation":"<p>Specifies whether the trail is an organization trail.</p>"
@@ -1337,6 +1568,24 @@
       "documentation":"<p>This exception is thrown when the specified trail already exists.</p>",
       "exception":true
     },
+    "TrailInfo":{
+      "type":"structure",
+      "members":{
+        "TrailARN":{
+          "shape":"String",
+          "documentation":"<p>The ARN of a trail.</p>"
+        },
+        "Name":{
+          "shape":"String",
+          "documentation":"<p>The name of a trail.</p>"
+        },
+        "HomeRegion":{
+          "shape":"String",
+          "documentation":"<p>The AWS region in which a trail was created.</p>"
+        }
+      },
+      "documentation":"<p>Information about a CloudTrail trail, including the trail's name, home region, and Amazon Resource Name (ARN).</p>"
+    },
     "TrailList":{
       "type":"list",
       "member":{"shape":"Trail"}
@@ -1356,9 +1605,13 @@
       "type":"structure",
       "members":{
       },
-      "documentation":"<p>This exception is deprecated.</p>",
+      "documentation":"<p>This exception is no longer in use.</p>",
       "exception":true
     },
+    "Trails":{
+      "type":"list",
+      "member":{"shape":"TrailInfo"}
+    },
     "UnsupportedOperationException":{
       "type":"structure",
       "members":{
@@ -1376,11 +1629,11 @@
         },
         "S3BucketName":{
           "shape":"String",
-          "documentation":"<p>Specifies the name of the Amazon S3 bucket designated for publishing log files. See <a href=\"http://docs.aws.amazon.com/awscloudtrail/latest/userguide/create_trail_naming_policy.html\">Amazon S3 Bucket Naming Requirements</a>.</p>"
+          "documentation":"<p>Specifies the name of the Amazon S3 bucket designated for publishing log files. See <a href=\"https://docs.aws.amazon.com/awscloudtrail/latest/userguide/create_trail_naming_policy.html\">Amazon S3 Bucket Naming Requirements</a>.</p>"
         },
         "S3KeyPrefix":{
           "shape":"String",
-          "documentation":"<p>Specifies the Amazon S3 key prefix that comes after the name of the bucket you have designated for log file delivery. For more information, see <a href=\"http://docs.aws.amazon.com/awscloudtrail/latest/userguide/cloudtrail-find-log-files.html\">Finding Your CloudTrail Log Files</a>. The maximum length is 200 characters.</p>"
+          "documentation":"<p>Specifies the Amazon S3 key prefix that comes after the name of the bucket you have designated for log file delivery. For more information, see <a href=\"https://docs.aws.amazon.com/awscloudtrail/latest/userguide/cloudtrail-find-log-files.html\">Finding Your CloudTrail Log Files</a>. The maximum length is 200 characters.</p>"
         },
         "SnsTopicName":{
           "shape":"String",
@@ -1392,7 +1645,7 @@
         },
         "IsMultiRegionTrail":{
           "shape":"Boolean",
-          "documentation":"<p>Specifies whether the trail applies only to the current region or to all regions. The default is false. If the trail exists only in the current region and this value is set to true, shadow trails (replications of the trail) will be created in the other regions. If the trail exists in all regions and this value is set to false, the trail will remain in the region where it was created, and its shadow trails in other regions will be deleted.</p>"
+          "documentation":"<p>Specifies whether the trail applies only to the current region or to all regions. The default is false. If the trail exists only in the current region and this value is set to true, shadow trails (replications of the trail) will be created in the other regions. If the trail exists in all regions and this value is set to false, the trail will remain in the region where it was created, and its shadow trails in other regions will be deleted. As a best practice, consider using trails that log events in all regions.</p>"
         },
         "EnableLogFileValidation":{
           "shape":"Boolean",
@@ -1430,11 +1683,11 @@
         },
         "S3KeyPrefix":{
           "shape":"String",
-          "documentation":"<p>Specifies the Amazon S3 key prefix that comes after the name of the bucket you have designated for log file delivery. For more information, see <a href=\"http://docs.aws.amazon.com/awscloudtrail/latest/userguide/cloudtrail-find-log-files.html\">Finding Your CloudTrail Log Files</a>.</p>"
+          "documentation":"<p>Specifies the Amazon S3 key prefix that comes after the name of the bucket you have designated for log file delivery. For more information, see <a href=\"https://docs.aws.amazon.com/awscloudtrail/latest/userguide/cloudtrail-find-log-files.html\">Finding Your CloudTrail Log Files</a>.</p>"
         },
         "SnsTopicName":{
           "shape":"String",
-          "documentation":"<p>This field is deprecated. Use SnsTopicARN.</p>",
+          "documentation":"<p>This field is no longer in use. Use SnsTopicARN.</p>",
           "deprecated":true
         },
         "SnsTopicARN":{
@@ -1477,5 +1730,5 @@
       "documentation":"<p>Returns the objects or data listed below if successful. Otherwise, returns an error.</p>"
     }
   },
-  "documentation":"<fullname>AWS CloudTrail</fullname> <p>This is the CloudTrail API Reference. It provides descriptions of actions, data types, common parameters, and common errors for CloudTrail.</p> <p>CloudTrail is a web service that records AWS API calls for your AWS account and delivers log files to an Amazon S3 bucket. The recorded information includes the identity of the user, the start time of the AWS API call, the source IP address, the request parameters, and the response elements returned by the service.</p> <note> <p>As an alternative to the API, you can use one of the AWS SDKs, which consist of libraries and sample code for various programming languages and platforms (Java, Ruby, .NET, iOS, Android, etc.). The SDKs provide a convenient way to create programmatic access to AWSCloudTrail. For example, the SDKs take care of cryptographically signing requests, managing errors, and retrying requests automatically. For information about the AWS SDKs, including how to download and install them, see the <a href=\"http://aws.amazon.com/tools/\">Tools for Amazon Web Services page</a>.</p> </note> <p>See the <a href=\"http://docs.aws.amazon.com/awscloudtrail/latest/userguide/cloudtrail-user-guide.html\">AWS CloudTrail User Guide</a> for information about the data that is included with each AWS API call listed in the log files.</p>"
+  "documentation":"<fullname>AWS CloudTrail</fullname> <p>This is the CloudTrail API Reference. It provides descriptions of actions, data types, common parameters, and common errors for CloudTrail.</p> <p>CloudTrail is a web service that records AWS API calls for your AWS account and delivers log files to an Amazon S3 bucket. The recorded information includes the identity of the user, the start time of the AWS API call, the source IP address, the request parameters, and the response elements returned by the service.</p> <note> <p>As an alternative to the API, you can use one of the AWS SDKs, which consist of libraries and sample code for various programming languages and platforms (Java, Ruby, .NET, iOS, Android, etc.). The SDKs provide a convenient way to create programmatic access to AWSCloudTrail. For example, the SDKs take care of cryptographically signing requests, managing errors, and retrying requests automatically. For information about the AWS SDKs, including how to download and install them, see the <a href=\"http://aws.amazon.com/tools/\">Tools for Amazon Web Services page</a>.</p> </note> <p>See the <a href=\"https://docs.aws.amazon.com/awscloudtrail/latest/userguide/cloudtrail-user-guide.html\">AWS CloudTrail User Guide</a> for information about the data that is included with each AWS API call listed in the log files.</p>"
 }
diff --git a/services/cloudtrail/src/test/resources/cucumber.properties b/services/cloudtrail/src/test/resources/cucumber.properties
index eae53511cae4..4d59a874a6f2 100644
--- a/services/cloudtrail/src/test/resources/cucumber.properties
+++ b/services/cloudtrail/src/test/resources/cucumber.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/cloudwatch/build.properties b/services/cloudwatch/build.properties
index ecf2dae6fcb1..15ec2da1fc71 100644
--- a/services/cloudwatch/build.properties
+++ b/services/cloudwatch/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/cloudwatch/pom.xml b/services/cloudwatch/pom.xml
index 5b1999a7601d..f20011ed726d 100644
--- a/services/cloudwatch/pom.xml
+++ b/services/cloudwatch/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>cloudwatch</artifactId>
     <name>AWS Java SDK :: Services :: Amazon CloudWatch</name>
diff --git a/services/cloudwatch/src/it/java/software/amazon/awssdk/services/cloudwatch/CloudWatchIntegrationTest.java b/services/cloudwatch/src/it/java/software/amazon/awssdk/services/cloudwatch/CloudWatchIntegrationTest.java
index 3825fcc350ab..640dcb076048 100644
--- a/services/cloudwatch/src/it/java/software/amazon/awssdk/services/cloudwatch/CloudWatchIntegrationTest.java
+++ b/services/cloudwatch/src/it/java/software/amazon/awssdk/services/cloudwatch/CloudWatchIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/cloudwatch/src/main/java/software/amazon/awssdk/services/cloudwatch/internal/CloudWatchHttpConfigurationOptions.java b/services/cloudwatch/src/main/java/software/amazon/awssdk/services/cloudwatch/internal/CloudWatchHttpConfigurationOptions.java
deleted file mode 100644
index 91c5c47b0a7e..000000000000
--- a/services/cloudwatch/src/main/java/software/amazon/awssdk/services/cloudwatch/internal/CloudWatchHttpConfigurationOptions.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.cloudwatch.internal;
-
-import java.time.Duration;
-import software.amazon.awssdk.annotations.SdkInternalApi;
-import software.amazon.awssdk.http.SdkHttpConfigurationOption;
-import software.amazon.awssdk.utils.AttributeMap;
-
-/**
- * CloudWatch specific http configurations
- */
-@SdkInternalApi
-public final class CloudWatchHttpConfigurationOptions {
-    private static final AttributeMap OPTIONS = AttributeMap
-        .builder()
-        .put(SdkHttpConfigurationOption.CONNECTION_MAX_IDLE_TIMEOUT, Duration.ofSeconds(5))
-        .build();
-
-    private CloudWatchHttpConfigurationOptions() {
-    }
-
-    public static AttributeMap defaultHttpConfig() {
-        return OPTIONS;
-    }
-}
diff --git a/services/cloudwatch/src/main/resources/codegen-resources/customization.config b/services/cloudwatch/src/main/resources/codegen-resources/customization.config
index 2b810eaa289a..5c580ec85631 100644
--- a/services/cloudwatch/src/main/resources/codegen-resources/customization.config
+++ b/services/cloudwatch/src/main/resources/codegen-resources/customization.config
@@ -9,6 +9,5 @@
     "deleteDashboards",
     "putDashboard",
     "getDashboard"
-  ],
-  "serviceSpecificHttpConfig": "software.amazon.awssdk.services.cloudwatch.internal.CloudWatchHttpConfigurationOptions"
+  ]
 }
diff --git a/services/cloudwatch/src/main/resources/codegen-resources/paginators-1.json b/services/cloudwatch/src/main/resources/codegen-resources/paginators-1.json
index a9875d406501..2e351eb7fd20 100644
--- a/services/cloudwatch/src/main/resources/codegen-resources/paginators-1.json
+++ b/services/cloudwatch/src/main/resources/codegen-resources/paginators-1.json
@@ -10,11 +10,19 @@
       "input_token": "NextToken",
       "limit_key": "MaxRecords",
       "output_token": "NextToken",
-      "result_key": "MetricAlarms"
+      "result_key": [
+        "MetricAlarms",
+        "CompositeAlarms"
+      ]
     },
     "DescribeAlarmsForMetric": {
       "result_key": "MetricAlarms"
     },
+    "DescribeInsightRules": {
+      "input_token": "NextToken",
+      "limit_key": "MaxResults",
+      "output_token": "NextToken"
+    },
     "GetMetricData": {
       "input_token": "NextToken",
       "limit_key": "MaxDatapoints",
diff --git a/services/cloudwatch/src/main/resources/codegen-resources/service-2.json b/services/cloudwatch/src/main/resources/codegen-resources/service-2.json
index c75d6352de49..913f76e89c4e 100644
--- a/services/cloudwatch/src/main/resources/codegen-resources/service-2.json
+++ b/services/cloudwatch/src/main/resources/codegen-resources/service-2.json
@@ -22,7 +22,7 @@
       "errors":[
         {"shape":"ResourceNotFound"}
       ],
-      "documentation":"<p>Deletes the specified alarms. You can delete up to 50 alarms in one operation. In the event of an error, no alarms are deleted.</p>"
+      "documentation":"<p>Deletes the specified alarms. You can delete up to 100 alarms in one operation. However, this total can include no more than one composite alarm. For example, you could delete 99 metric alarms and one composite alarms with one operation, but you can't delete two composite alarms with one operation.</p> <p> In the event of an error, no alarms are deleted.</p> <note> <p>It is possible to create a loop or cycle of composite alarms, where composite alarm A depends on composite alarm B, and composite alarm B also depends on composite alarm A. In this scenario, you can't delete any composite alarm that is part of the cycle because there is always still a composite alarm that depends on that alarm that you want to delete.</p> <p>To get out of such a situation, you must break the cycle by changing the rule of one of the composite alarms in the cycle to remove a dependency that creates the cycle. The simplest change to make to break a cycle is to change the <code>AlarmRule</code> of one of the alarms to <code>False</code>. </p> <p>Additionally, the evaluation of composite alarms stops if CloudWatch detects a cycle in the evaluation path. </p> </note>"
     },
     "DeleteAnomalyDetector":{
       "name":"DeleteAnomalyDetector",
@@ -61,6 +61,23 @@
       ],
       "documentation":"<p>Deletes all dashboards that you specify. You may specify up to 100 dashboards to delete. If there is an error during this call, no dashboards are deleted.</p>"
     },
+    "DeleteInsightRules":{
+      "name":"DeleteInsightRules",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DeleteInsightRulesInput"},
+      "output":{
+        "shape":"DeleteInsightRulesOutput",
+        "resultWrapper":"DeleteInsightRulesResult"
+      },
+      "errors":[
+        {"shape":"InvalidParameterValueException"},
+        {"shape":"MissingRequiredParameterException"}
+      ],
+      "documentation":"<p>Permanently deletes the specified Contributor Insights rules.</p> <p>If you create a rule, delete it, and then re-create it with the same name, historical data from the first time the rule was created may or may not be available.</p>"
+    },
     "DescribeAlarmHistory":{
       "name":"DescribeAlarmHistory",
       "http":{
@@ -75,7 +92,7 @@
       "errors":[
         {"shape":"InvalidNextToken"}
       ],
-      "documentation":"<p>Retrieves the history for the specified alarm. You can filter the results by date range or item type. If an alarm name is not specified, the histories for all alarms are returned.</p> <p>CloudWatch retains the history of an alarm even if you delete the alarm.</p>"
+      "documentation":"<p>Retrieves the history for the specified alarm. You can filter the results by date range or item type. If an alarm name is not specified, the histories for either all metric alarms or all composite alarms are returned.</p> <p>CloudWatch retains the history of an alarm even if you delete the alarm.</p>"
     },
     "DescribeAlarms":{
       "name":"DescribeAlarms",
@@ -91,7 +108,7 @@
       "errors":[
         {"shape":"InvalidNextToken"}
       ],
-      "documentation":"<p>Retrieves the specified alarms. If no alarms are specified, all alarms are returned. Alarms can be retrieved by using only a prefix for the alarm name, the alarm state, or a prefix for any action.</p>"
+      "documentation":"<p>Retrieves the specified alarms. You can filter the results by specifying a a prefix for the alarm name, the alarm state, or a prefix for any action.</p>"
     },
     "DescribeAlarmsForMetric":{
       "name":"DescribeAlarmsForMetric",
@@ -124,6 +141,22 @@
       ],
       "documentation":"<p>Lists the anomaly detection models that you have created in your account. You can list all models in your account or filter the results to only the models that are related to a certain namespace, metric name, or metric dimension.</p>"
     },
+    "DescribeInsightRules":{
+      "name":"DescribeInsightRules",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DescribeInsightRulesInput"},
+      "output":{
+        "shape":"DescribeInsightRulesOutput",
+        "resultWrapper":"DescribeInsightRulesResult"
+      },
+      "errors":[
+        {"shape":"InvalidNextToken"}
+      ],
+      "documentation":"<p>Returns a list of all the Contributor Insights rules in your account. All rules in your account are returned with a single operation.</p> <p>For more information about Contributor Insights, see <a href=\"https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/ContributorInsights.html\">Using Contributor Insights to Analyze High-Cardinality Data</a>.</p>"
+    },
     "DisableAlarmActions":{
       "name":"DisableAlarmActions",
       "http":{
@@ -133,6 +166,23 @@
       "input":{"shape":"DisableAlarmActionsInput"},
       "documentation":"<p>Disables the actions for the specified alarms. When an alarm's actions are disabled, the alarm actions do not execute when the alarm state changes.</p>"
     },
+    "DisableInsightRules":{
+      "name":"DisableInsightRules",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DisableInsightRulesInput"},
+      "output":{
+        "shape":"DisableInsightRulesOutput",
+        "resultWrapper":"DisableInsightRulesResult"
+      },
+      "errors":[
+        {"shape":"InvalidParameterValueException"},
+        {"shape":"MissingRequiredParameterException"}
+      ],
+      "documentation":"<p>Disables the specified Contributor Insights rules. When rules are disabled, they do not analyze log groups and do not incur costs.</p>"
+    },
     "EnableAlarmActions":{
       "name":"EnableAlarmActions",
       "http":{
@@ -142,6 +192,24 @@
       "input":{"shape":"EnableAlarmActionsInput"},
       "documentation":"<p>Enables the actions for the specified alarms.</p>"
     },
+    "EnableInsightRules":{
+      "name":"EnableInsightRules",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"EnableInsightRulesInput"},
+      "output":{
+        "shape":"EnableInsightRulesOutput",
+        "resultWrapper":"EnableInsightRulesResult"
+      },
+      "errors":[
+        {"shape":"InvalidParameterValueException"},
+        {"shape":"MissingRequiredParameterException"},
+        {"shape":"LimitExceededException"}
+      ],
+      "documentation":"<p>Enables the specified Contributor Insights rules. When rules are enabled, they immediately begin analyzing log data.</p>"
+    },
     "GetDashboard":{
       "name":"GetDashboard",
       "http":{
@@ -160,6 +228,24 @@
       ],
       "documentation":"<p>Displays the details of the dashboard that you specify.</p> <p>To copy an existing dashboard, use <code>GetDashboard</code>, and then use the data returned within <code>DashboardBody</code> as the template for the new dashboard when you call <code>PutDashboard</code> to create the copy.</p>"
     },
+    "GetInsightRuleReport":{
+      "name":"GetInsightRuleReport",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"GetInsightRuleReportInput"},
+      "output":{
+        "shape":"GetInsightRuleReportOutput",
+        "resultWrapper":"GetInsightRuleReportResult"
+      },
+      "errors":[
+        {"shape":"InvalidParameterValueException"},
+        {"shape":"MissingRequiredParameterException"},
+        {"shape":"ResourceNotFoundException"}
+      ],
+      "documentation":"<p>This operation returns the time series data collected by a Contributor Insights rule. The data includes the identity and number of contributors to the log group.</p> <p>You can also optionally return one or more statistics about each data point in the time series. These statistics can include the following:</p> <ul> <li> <p> <code>UniqueContributors</code> -- the number of unique contributors for each data point.</p> </li> <li> <p> <code>MaxContributorValue</code> -- the value of the top contributor for each data point. The identity of the contributor may change for each data point in the graph.</p> <p>If this rule aggregates by COUNT, the top contributor for each data point is the contributor with the most occurrences in that period. If the rule aggregates by SUM, the top contributor is the contributor with the highest sum in the log field specified by the rule's <code>Value</code>, during that period.</p> </li> <li> <p> <code>SampleCount</code> -- the number of data points matched by the rule.</p> </li> <li> <p> <code>Sum</code> -- the sum of the values from all contributors during the time period represented by that data point.</p> </li> <li> <p> <code>Minimum</code> -- the minimum value from a single observation during the time period represented by that data point.</p> </li> <li> <p> <code>Maximum</code> -- the maximum value from a single observation during the time period represented by that data point.</p> </li> <li> <p> <code>Average</code> -- the average value from all contributors during the time period represented by that data point.</p> </li> </ul>"
+    },
     "GetMetricData":{
       "name":"GetMetricData",
       "http":{
@@ -174,7 +260,7 @@
       "errors":[
         {"shape":"InvalidNextToken"}
       ],
-      "documentation":"<p>You can use the <code>GetMetricData</code> API to retrieve as many as 100 different metrics in a single request, with a total of as many as 100,800 datapoints. You can also optionally perform math expressions on the values of the returned statistics, to create new time series that represent new insights into your data. For example, using Lambda metrics, you could divide the Errors metric by the Invocations metric to get an error rate time series. For more information about metric math expressions, see <a href=\"https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/using-metric-math.html#metric-math-syntax\">Metric Math Syntax and Functions</a> in the <i>Amazon CloudWatch User Guide</i>.</p> <p>Calls to the <code>GetMetricData</code> API have a different pricing structure than calls to <code>GetMetricStatistics</code>. For more information about pricing, see <a href=\"https://aws.amazon.com/cloudwatch/pricing/\">Amazon CloudWatch Pricing</a>.</p> <p>Amazon CloudWatch retains metric data as follows:</p> <ul> <li> <p>Data points with a period of less than 60 seconds are available for 3 hours. These data points are high-resolution metrics and are available only for custom metrics that have been defined with a <code>StorageResolution</code> of 1.</p> </li> <li> <p>Data points with a period of 60 seconds (1-minute) are available for 15 days.</p> </li> <li> <p>Data points with a period of 300 seconds (5-minute) are available for 63 days.</p> </li> <li> <p>Data points with a period of 3600 seconds (1 hour) are available for 455 days (15 months).</p> </li> </ul> <p>Data points that are initially published with a shorter period are aggregated together for long-term storage. For example, if you collect data using a period of 1 minute, the data remains available for 15 days with 1-minute resolution. After 15 days, this data is still available, but is aggregated and retrievable only with a resolution of 5 minutes. After 63 days, the data is further aggregated and is available with a resolution of 1 hour.</p> <p>If you omit <code>Unit</code> in your request, all data that was collected with any unit is returned, along with the corresponding units that were specified when the data was reported to CloudWatch. If you specify a unit, the operation returns only data data that was collected with that unit specified. If you specify a unit that does not match the data collected, the results of the operation are null. CloudWatch does not perform unit conversions.</p>"
+      "documentation":"<p>You can use the <code>GetMetricData</code> API to retrieve as many as 500 different metrics in a single request, with a total of as many as 100,800 data points. You can also optionally perform math expressions on the values of the returned statistics, to create new time series that represent new insights into your data. For example, using Lambda metrics, you could divide the Errors metric by the Invocations metric to get an error rate time series. For more information about metric math expressions, see <a href=\"https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/using-metric-math.html#metric-math-syntax\">Metric Math Syntax and Functions</a> in the <i>Amazon CloudWatch User Guide</i>.</p> <p>Calls to the <code>GetMetricData</code> API have a different pricing structure than calls to <code>GetMetricStatistics</code>. For more information about pricing, see <a href=\"https://aws.amazon.com/cloudwatch/pricing/\">Amazon CloudWatch Pricing</a>.</p> <p>Amazon CloudWatch retains metric data as follows:</p> <ul> <li> <p>Data points with a period of less than 60 seconds are available for 3 hours. These data points are high-resolution metrics and are available only for custom metrics that have been defined with a <code>StorageResolution</code> of 1.</p> </li> <li> <p>Data points with a period of 60 seconds (1-minute) are available for 15 days.</p> </li> <li> <p>Data points with a period of 300 seconds (5-minute) are available for 63 days.</p> </li> <li> <p>Data points with a period of 3600 seconds (1 hour) are available for 455 days (15 months).</p> </li> </ul> <p>Data points that are initially published with a shorter period are aggregated together for long-term storage. For example, if you collect data using a period of 1 minute, the data remains available for 15 days with 1-minute resolution. After 15 days, this data is still available, but is aggregated and retrievable only with a resolution of 5 minutes. After 63 days, the data is further aggregated and is available with a resolution of 1 hour.</p> <p>If you omit <code>Unit</code> in your request, all data that was collected with any unit is returned, along with the corresponding units that were specified when the data was reported to CloudWatch. If you specify a unit, the operation returns only data data that was collected with that unit specified. If you specify a unit that does not match the data collected, the results of the operation are null. CloudWatch does not perform unit conversions.</p>"
     },
     "GetMetricStatistics":{
       "name":"GetMetricStatistics",
@@ -240,7 +326,7 @@
         {"shape":"InternalServiceFault"},
         {"shape":"InvalidParameterValueException"}
       ],
-      "documentation":"<p>List the specified metrics. You can use the returned metrics with <a>GetMetricData</a> or <a>GetMetricStatistics</a> to obtain statistical data.</p> <p>Up to 500 results are returned for any one call. To retrieve additional results, use the returned token with subsequent calls.</p> <p>After you create a metric, allow up to fifteen minutes before the metric appears. Statistics about the metric, however, are available sooner using <a>GetMetricData</a> or <a>GetMetricStatistics</a>.</p>"
+      "documentation":"<p>List the specified metrics. You can use the returned metrics with <a href=\"https://docs.aws.amazon.com/AmazonCloudWatch/latest/APIReference/API_GetMetricData.html\">GetMetricData</a> or <a href=\"https://docs.aws.amazon.com/AmazonCloudWatch/latest/APIReference/API_GetMetricStatistics.html\">GetMetricStatistics</a> to obtain statistical data.</p> <p>Up to 500 results are returned for any one call. To retrieve additional results, use the returned token with subsequent calls.</p> <p>After you create a metric, allow up to fifteen minutes before the metric appears. Statistics about the metric, however, are available sooner using <a href=\"https://docs.aws.amazon.com/AmazonCloudWatch/latest/APIReference/API_GetMetricData.html\">GetMetricData</a> or <a href=\"https://docs.aws.amazon.com/AmazonCloudWatch/latest/APIReference/API_GetMetricStatistics.html\">GetMetricStatistics</a>.</p>"
     },
     "ListTagsForResource":{
       "name":"ListTagsForResource",
@@ -279,6 +365,18 @@
       ],
       "documentation":"<p>Creates an anomaly detection model for a CloudWatch metric. You can use the model to display a band of expected normal values when the metric is graphed.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/CloudWatch_Anomaly_Detection.html\">CloudWatch Anomaly Detection</a>.</p>"
     },
+    "PutCompositeAlarm":{
+      "name":"PutCompositeAlarm",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"PutCompositeAlarmInput"},
+      "errors":[
+        {"shape":"LimitExceededFault"}
+      ],
+      "documentation":"<p>Creates or updates a <i>composite alarm</i>. When you create a composite alarm, you specify a rule expression for the alarm that takes into account the alarm states of other alarms that you have created. The composite alarm goes into ALARM state only if all conditions of the rule are met.</p> <p>The alarms specified in a composite alarm's rule expression can include metric alarms and other composite alarms.</p> <p>Using composite alarms can reduce alarm noise. You can create multiple metric alarms, and also create a composite alarm and set up alerts only for the composite alarm. For example, you could create a composite alarm that goes into ALARM state only when more than one of the underlying metric alarms are in ALARM state.</p> <p>Currently, the only alarm actions that can be taken by composite alarms are notifying SNS topics.</p> <note> <p>It is possible to create a loop or cycle of composite alarms, where composite alarm A depends on composite alarm B, and composite alarm B also depends on composite alarm A. In this scenario, you can't delete any composite alarm that is part of the cycle because there is always still a composite alarm that depends on that alarm that you want to delete.</p> <p>To get out of such a situation, you must break the cycle by changing the rule of one of the composite alarms in the cycle to remove a dependency that creates the cycle. The simplest change to make to break a cycle is to change the <code>AlarmRule</code> of one of the alarms to <code>False</code>. </p> <p>Additionally, the evaluation of composite alarms stops if CloudWatch detects a cycle in the evaluation path. </p> </note> <p>When this operation creates an alarm, the alarm state is immediately set to <code>INSUFFICIENT_DATA</code>. The alarm is then evaluated and its state is set appropriately. Any actions associated with the new state are then executed. For a composite alarm, this initial time after creation is the only time that the alarm can be in <code>INSUFFICIENT_DATA</code> state.</p> <p>When you update an existing alarm, its state is left unchanged, but the update completely overwrites the previous configuration of the alarm.</p>"
+    },
     "PutDashboard":{
       "name":"PutDashboard",
       "http":{
@@ -296,6 +394,24 @@
       ],
       "documentation":"<p>Creates a dashboard if it does not already exist, or updates an existing dashboard. If you update a dashboard, the entire contents are replaced with what you specify here.</p> <p>All dashboards in your account are global, not region-specific.</p> <p>A simple way to create a dashboard using <code>PutDashboard</code> is to copy an existing dashboard. To copy an existing dashboard using the console, you can load the dashboard and then use the View/edit source command in the Actions menu to display the JSON block for that dashboard. Another way to copy a dashboard is to use <code>GetDashboard</code>, and then use the data returned within <code>DashboardBody</code> as the template for the new dashboard when you call <code>PutDashboard</code>.</p> <p>When you create a dashboard with <code>PutDashboard</code>, a good practice is to add a text widget at the top of the dashboard with a message that the dashboard was created by script and should not be changed in the console. This message could also point console users to the location of the <code>DashboardBody</code> script or the CloudFormation template used to create the dashboard.</p>"
     },
+    "PutInsightRule":{
+      "name":"PutInsightRule",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"PutInsightRuleInput"},
+      "output":{
+        "shape":"PutInsightRuleOutput",
+        "resultWrapper":"PutInsightRuleResult"
+      },
+      "errors":[
+        {"shape":"InvalidParameterValueException"},
+        {"shape":"MissingRequiredParameterException"},
+        {"shape":"LimitExceededException"}
+      ],
+      "documentation":"<p>Creates a Contributor Insights rule. Rules evaluate log events in a CloudWatch Logs log group, enabling you to find contributor data for the log events in that log group. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/ContributorInsights.html\">Using Contributor Insights to Analyze High-Cardinality Data</a>.</p> <p>If you create a rule, delete it, and then re-create it with the same name, historical data from the first time the rule was created may or may not be available.</p>"
+    },
     "PutMetricAlarm":{
       "name":"PutMetricAlarm",
       "http":{
@@ -321,7 +437,7 @@
         {"shape":"InvalidParameterCombinationException"},
         {"shape":"InternalServiceFault"}
       ],
-      "documentation":"<p>Publishes metric data points to Amazon CloudWatch. CloudWatch associates the data points with the specified metric. If the specified metric does not exist, CloudWatch creates the metric. When CloudWatch creates a metric, it can take up to fifteen minutes for the metric to appear in calls to <a>ListMetrics</a>.</p> <p>You can publish either individual data points in the <code>Value</code> field, or arrays of values and the number of times each value occurred during the period by using the <code>Values</code> and <code>Counts</code> fields in the <code>MetricDatum</code> structure. Using the <code>Values</code> and <code>Counts</code> method enables you to publish up to 150 values per metric with one <code>PutMetricData</code> request, and supports retrieving percentile statistics on this data.</p> <p>Each <code>PutMetricData</code> request is limited to 40 KB in size for HTTP POST requests. You can send a payload compressed by gzip. Each request is also limited to no more than 20 different metrics.</p> <p>Although the <code>Value</code> parameter accepts numbers of type <code>Double</code>, CloudWatch rejects values that are either too small or too large. Values must be in the range of 8.515920e-109 to 1.174271e+108 (Base 10) or 2e-360 to 2e360 (Base 2). In addition, special values (for example, NaN, +Infinity, -Infinity) are not supported.</p> <p>You can use up to 10 dimensions per metric to further clarify what data the metric collects. Each dimension consists of a Name and Value pair. For more information about specifying dimensions, see <a href=\"https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/publishingMetrics.html\">Publishing Metrics</a> in the <i>Amazon CloudWatch User Guide</i>.</p> <p>Data points with time stamps from 24 hours ago or longer can take at least 48 hours to become available for <a>GetMetricData</a> or <a>GetMetricStatistics</a> from the time they are submitted.</p> <p>CloudWatch needs raw data points to calculate percentile statistics. If you publish data using a statistic set instead, you can only retrieve percentile statistics for this data if one of the following conditions is true:</p> <ul> <li> <p>The <code>SampleCount</code> value of the statistic set is 1 and <code>Min</code>, <code>Max</code>, and <code>Sum</code> are all equal.</p> </li> <li> <p>The <code>Min</code> and <code>Max</code> are equal, and <code>Sum</code> is equal to <code>Min</code> multiplied by <code>SampleCount</code>.</p> </li> </ul>"
+      "documentation":"<p>Publishes metric data points to Amazon CloudWatch. CloudWatch associates the data points with the specified metric. If the specified metric does not exist, CloudWatch creates the metric. When CloudWatch creates a metric, it can take up to fifteen minutes for the metric to appear in calls to <a href=\"https://docs.aws.amazon.com/AmazonCloudWatch/latest/APIReference/API_ListMetrics.html\">ListMetrics</a>.</p> <p>You can publish either individual data points in the <code>Value</code> field, or arrays of values and the number of times each value occurred during the period by using the <code>Values</code> and <code>Counts</code> fields in the <code>MetricDatum</code> structure. Using the <code>Values</code> and <code>Counts</code> method enables you to publish up to 150 values per metric with one <code>PutMetricData</code> request, and supports retrieving percentile statistics on this data.</p> <p>Each <code>PutMetricData</code> request is limited to 40 KB in size for HTTP POST requests. You can send a payload compressed by gzip. Each request is also limited to no more than 20 different metrics.</p> <p>Although the <code>Value</code> parameter accepts numbers of type <code>Double</code>, CloudWatch rejects values that are either too small or too large. Values must be in the range of -2^360 to 2^360. In addition, special values (for example, NaN, +Infinity, -Infinity) are not supported.</p> <p>You can use up to 10 dimensions per metric to further clarify what data the metric collects. Each dimension consists of a Name and Value pair. For more information about specifying dimensions, see <a href=\"https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/publishingMetrics.html\">Publishing Metrics</a> in the <i>Amazon CloudWatch User Guide</i>.</p> <p>Data points with time stamps from 24 hours ago or longer can take at least 48 hours to become available for <a href=\"https://docs.aws.amazon.com/AmazonCloudWatch/latest/APIReference/API_GetMetricData.html\">GetMetricData</a> or <a href=\"https://docs.aws.amazon.com/AmazonCloudWatch/latest/APIReference/API_GetMetricStatistics.html\">GetMetricStatistics</a> from the time they are submitted. Data points with time stamps between 3 and 24 hours ago can take as much as 2 hours to become available for for <a href=\"https://docs.aws.amazon.com/AmazonCloudWatch/latest/APIReference/API_GetMetricData.html\">GetMetricData</a> or <a href=\"https://docs.aws.amazon.com/AmazonCloudWatch/latest/APIReference/API_GetMetricStatistics.html\">GetMetricStatistics</a>.</p> <p>CloudWatch needs raw data points to calculate percentile statistics. If you publish data using a statistic set instead, you can only retrieve percentile statistics for this data if one of the following conditions is true:</p> <ul> <li> <p>The <code>SampleCount</code> value of the statistic set is 1 and <code>Min</code>, <code>Max</code>, and <code>Sum</code> are all equal.</p> </li> <li> <p>The <code>Min</code> and <code>Max</code> are equal, and <code>Sum</code> is equal to <code>Min</code> multiplied by <code>SampleCount</code>.</p> </li> </ul>"
     },
     "SetAlarmState":{
       "name":"SetAlarmState",
@@ -334,7 +450,7 @@
         {"shape":"ResourceNotFound"},
         {"shape":"InvalidFormatFault"}
       ],
-      "documentation":"<p>Temporarily sets the state of an alarm for testing purposes. When the updated state differs from the previous value, the action configured for the appropriate state is invoked. For example, if your alarm is configured to send an Amazon SNS message when an alarm is triggered, temporarily changing the alarm state to <code>ALARM</code> sends an SNS message. The alarm returns to its actual state (often within seconds). Because the alarm state change happens quickly, it is typically only visible in the alarm's <b>History</b> tab in the Amazon CloudWatch console or through <a>DescribeAlarmHistory</a>.</p>"
+      "documentation":"<p>Temporarily sets the state of an alarm for testing purposes. When the updated state differs from the previous value, the action configured for the appropriate state is invoked. For example, if your alarm is configured to send an Amazon SNS message when an alarm is triggered, temporarily changing the alarm state to <code>ALARM</code> sends an SNS message.</p> <p>Metric alarms returns to their actual state quickly, often within seconds. Because the metric alarm state change happens quickly, it is typically only visible in the alarm's <b>History</b> tab in the Amazon CloudWatch console or through <a href=\"https://docs.aws.amazon.com/AmazonCloudWatch/latest/APIReference/API_DescribeAlarmHistory.html\">DescribeAlarmHistory</a>.</p> <p>If you use <code>SetAlarmState</code> on a composite alarm, the composite alarm is not guaranteed to return to its actual state. It will return to its actual state only once any of its children alarms change state. It is also re-evaluated if you update its configuration.</p> <p>If an alarm triggers EC2 Auto Scaling policies or application Auto Scaling policies, you must include information in the <code>StateReasonData</code> parameter to enable the policy to take the correct action.</p>"
     },
     "TagResource":{
       "name":"TagResource",
@@ -399,6 +515,10 @@
           "shape":"AlarmName",
           "documentation":"<p>The descriptive name for the alarm.</p>"
         },
+        "AlarmType":{
+          "shape":"AlarmType",
+          "documentation":"<p>The type of alarm, either metric alarm or composite alarm.</p>"
+        },
         "Timestamp":{
           "shape":"Timestamp",
           "documentation":"<p>The time stamp for the alarm history item.</p>"
@@ -437,6 +557,22 @@
       "member":{"shape":"AlarmName"},
       "max":100
     },
+    "AlarmRule":{
+      "type":"string",
+      "max":10240,
+      "min":1
+    },
+    "AlarmType":{
+      "type":"string",
+      "enum":[
+        "CompositeAlarm",
+        "MetricAlarm"
+      ]
+    },
+    "AlarmTypes":{
+      "type":"list",
+      "member":{"shape":"AlarmType"}
+    },
     "AmazonResourceName":{
       "type":"string",
       "max":1024,
@@ -464,9 +600,13 @@
         "Configuration":{
           "shape":"AnomalyDetectorConfiguration",
           "documentation":"<p>The configuration specifies details about how the anomaly detection model is to be trained, including time ranges to exclude from use for training the model, and the time zone to use for the metric.</p>"
+        },
+        "StateValue":{
+          "shape":"AnomalyDetectorStateValue",
+          "documentation":"<p>The current status of the anomaly detector's training. The possible values are <code>TRAINED | PENDING_TRAINING | TRAINED_INSUFFICIENT_DATA</code> </p>"
         }
       },
-      "documentation":"<p>An anomaly detection model associated with a particular CloudWatch metric athresnd statistic. You can use the model to display a band of expected normal values when the metric is graphed.</p>"
+      "documentation":"<p>An anomaly detection model associated with a particular CloudWatch metric and statistic. You can use the model to display a band of expected normal values when the metric is graphed.</p>"
     },
     "AnomalyDetectorConfiguration":{
       "type":"structure",
@@ -487,11 +627,23 @@
       "member":{"shape":"Range"}
     },
     "AnomalyDetectorMetricTimezone":{"type":"string"},
+    "AnomalyDetectorStateValue":{
+      "type":"string",
+      "enum":[
+        "PENDING_TRAINING",
+        "TRAINED_INSUFFICIENT_DATA",
+        "TRAINED"
+      ]
+    },
     "AnomalyDetectors":{
       "type":"list",
       "member":{"shape":"AnomalyDetector"}
     },
     "AwsQueryErrorMessage":{"type":"string"},
+    "BatchFailures":{
+      "type":"list",
+      "member":{"shape":"PartialFailure"}
+    },
     "ComparisonOperator":{
       "type":"string",
       "enum":[
@@ -504,6 +656,83 @@
         "GreaterThanUpperThreshold"
       ]
     },
+    "CompositeAlarm":{
+      "type":"structure",
+      "members":{
+        "ActionsEnabled":{
+          "shape":"ActionsEnabled",
+          "documentation":"<p>Indicates whether actions should be executed during any changes to the alarm state.</p>"
+        },
+        "AlarmActions":{
+          "shape":"ResourceList",
+          "documentation":"<p>The actions to execute when this alarm transitions to the ALARM state from any other state. Each action is specified as an Amazon Resource Name (ARN).</p>"
+        },
+        "AlarmArn":{
+          "shape":"AlarmArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the alarm.</p>"
+        },
+        "AlarmConfigurationUpdatedTimestamp":{
+          "shape":"Timestamp",
+          "documentation":"<p>The time stamp of the last update to the alarm configuration.</p>"
+        },
+        "AlarmDescription":{
+          "shape":"AlarmDescription",
+          "documentation":"<p>The description of the alarm.</p>"
+        },
+        "AlarmName":{
+          "shape":"AlarmName",
+          "documentation":"<p>The name of the alarm.</p>"
+        },
+        "AlarmRule":{
+          "shape":"AlarmRule",
+          "documentation":"<p>The rule that this alarm uses to evaluate its alarm state.</p>"
+        },
+        "InsufficientDataActions":{
+          "shape":"ResourceList",
+          "documentation":"<p>The actions to execute when this alarm transitions to the INSUFFICIENT_DATA state from any other state. Each action is specified as an Amazon Resource Name (ARN).</p>"
+        },
+        "OKActions":{
+          "shape":"ResourceList",
+          "documentation":"<p>The actions to execute when this alarm transitions to the OK state from any other state. Each action is specified as an Amazon Resource Name (ARN).</p>"
+        },
+        "StateReason":{
+          "shape":"StateReason",
+          "documentation":"<p>An explanation for the alarm state, in text format.</p>"
+        },
+        "StateReasonData":{
+          "shape":"StateReasonData",
+          "documentation":"<p>An explanation for the alarm state, in JSON format.</p>"
+        },
+        "StateUpdatedTimestamp":{
+          "shape":"Timestamp",
+          "documentation":"<p>The time stamp of the last update to the alarm state.</p>"
+        },
+        "StateValue":{
+          "shape":"StateValue",
+          "documentation":"<p>The state value for the alarm.</p>"
+        }
+      },
+      "documentation":"<p>The details about a composite alarm.</p>",
+      "xmlOrder":[
+        "ActionsEnabled",
+        "AlarmActions",
+        "AlarmArn",
+        "AlarmConfigurationUpdatedTimestamp",
+        "AlarmDescription",
+        "AlarmName",
+        "AlarmRule",
+        "InsufficientDataActions",
+        "OKActions",
+        "StateReason",
+        "StateReasonData",
+        "StateUpdatedTimestamp",
+        "StateValue"
+      ]
+    },
+    "CompositeAlarms":{
+      "type":"list",
+      "member":{"shape":"CompositeAlarm"}
+    },
     "ConcurrentModificationException":{
       "type":"structure",
       "members":{
@@ -723,6 +952,25 @@
       "members":{
       }
     },
+    "DeleteInsightRulesInput":{
+      "type":"structure",
+      "required":["RuleNames"],
+      "members":{
+        "RuleNames":{
+          "shape":"InsightRuleNames",
+          "documentation":"<p>An array of the rule names to delete. If you need to find out the names of your rules, use <a href=\"https://docs.aws.amazon.com/AmazonCloudWatch/latest/APIReference/API_DescribeInsightRules.html\">DescribeInsightRules</a>.</p>"
+        }
+      }
+    },
+    "DeleteInsightRulesOutput":{
+      "type":"structure",
+      "members":{
+        "Failures":{
+          "shape":"BatchFailures",
+          "documentation":"<p>An array listing the rules that could not be deleted. You cannot delete built-in rules.</p>"
+        }
+      }
+    },
     "DescribeAlarmHistoryInput":{
       "type":"structure",
       "members":{
@@ -730,6 +978,10 @@
           "shape":"AlarmName",
           "documentation":"<p>The name of the alarm.</p>"
         },
+        "AlarmTypes":{
+          "shape":"AlarmTypes",
+          "documentation":"<p>Use this parameter to specify whether you want the operation to return metric alarms or composite alarms. If you omit this parameter, only metric alarms are returned.</p>"
+        },
         "HistoryItemType":{
           "shape":"HistoryItemType",
           "documentation":"<p>The type of alarm histories to retrieve.</p>"
@@ -749,6 +1001,10 @@
         "NextToken":{
           "shape":"NextToken",
           "documentation":"<p>The token returned by a previous call to indicate that there is more data available.</p>"
+        },
+        "ScanBy":{
+          "shape":"ScanBy",
+          "documentation":"<p>Specified whether to return the newest or oldest alarm history first. Specify <code>TimestampDescending</code> to have the newest event history returned first, and specify <code>TimestampAscending</code> to have the oldest history returned first.</p>"
         }
       }
     },
@@ -816,19 +1072,31 @@
       "members":{
         "AlarmNames":{
           "shape":"AlarmNames",
-          "documentation":"<p>The names of the alarms.</p>"
+          "documentation":"<p>The names of the alarms to retrieve information about.</p>"
         },
         "AlarmNamePrefix":{
           "shape":"AlarmNamePrefix",
-          "documentation":"<p>The alarm name prefix. If this parameter is specified, you cannot specify <code>AlarmNames</code>.</p>"
+          "documentation":"<p>An alarm name prefix. If you specify this parameter, you receive information about all alarms that have names that start with this prefix.</p> <p>If this parameter is specified, you cannot specify <code>AlarmNames</code>.</p>"
+        },
+        "AlarmTypes":{
+          "shape":"AlarmTypes",
+          "documentation":"<p>Use this parameter to specify whether you want the operation to return metric alarms or composite alarms. If you omit this parameter, only metric alarms are returned.</p>"
+        },
+        "ChildrenOfAlarmName":{
+          "shape":"AlarmName",
+          "documentation":"<p>If you use this parameter and specify the name of a composite alarm, the operation returns information about the \"children\" alarms of the alarm you specify. These are the metric alarms and composite alarms referenced in the <code>AlarmRule</code> field of the composite alarm that you specify in <code>ChildrenOfAlarmName</code>. Information about the composite alarm that you name in <code>ChildrenOfAlarmName</code> is not returned.</p> <p>If you specify <code>ChildrenOfAlarmName</code>, you cannot specify any other parameters in the request except for <code>MaxRecords</code> and <code>NextToken</code>. If you do so, you will receive a validation error.</p> <note> <p>Only the <code>Alarm Name</code>, <code>ARN</code>, <code>StateValue</code> (OK/ALARM/INSUFFICIENT_DATA), and <code>StateUpdatedTimestamp</code> information are returned by this operation when you use this parameter. To get complete information about these alarms, perform another <code>DescribeAlarms</code> operation and specify the parent alarm names in the <code>AlarmNames</code> parameter.</p> </note>"
+        },
+        "ParentsOfAlarmName":{
+          "shape":"AlarmName",
+          "documentation":"<p>If you use this parameter and specify the name of a metric or composite alarm, the operation returns information about the \"parent\" alarms of the alarm you specify. These are the composite alarms that have <code>AlarmRule</code> parameters that reference the alarm named in <code>ParentsOfAlarmName</code>. Information about the alarm that you specify in <code>ParentsOfAlarmName</code> is not returned.</p> <p>If you specify <code>ParentsOfAlarmName</code>, you cannot specify any other parameters in the request except for <code>MaxRecords</code> and <code>NextToken</code>. If you do so, you will receive a validation error.</p> <note> <p>Only the Alarm Name and ARN are returned by this operation when you use this parameter. To get complete information about these alarms, perform another <code>DescribeAlarms</code> operation and specify the parent alarm names in the <code>AlarmNames</code> parameter.</p> </note>"
         },
         "StateValue":{
           "shape":"StateValue",
-          "documentation":"<p>The state value to be used in matching alarms.</p>"
+          "documentation":"<p>Specify this parameter to receive information only about alarms that are currently in the state that you specify.</p>"
         },
         "ActionPrefix":{
           "shape":"ActionPrefix",
-          "documentation":"<p>The action name prefix.</p>"
+          "documentation":"<p>Use this parameter to filter the results of the operation to only those alarms that use a certain alarm action. For example, you could specify the ARN of an SNS topic to find all alarms that send notifications to that topic.</p>"
         },
         "MaxRecords":{
           "shape":"MaxRecords",
@@ -843,9 +1111,13 @@
     "DescribeAlarmsOutput":{
       "type":"structure",
       "members":{
+        "CompositeAlarms":{
+          "shape":"CompositeAlarms",
+          "documentation":"<p>The information about any composite alarms returned by the operation.</p>"
+        },
         "MetricAlarms":{
           "shape":"MetricAlarms",
-          "documentation":"<p>The information for the specified alarms.</p>"
+          "documentation":"<p>The information about any metric alarms returned by the operation.</p>"
         },
         "NextToken":{
           "shape":"NextToken",
@@ -862,7 +1134,7 @@
         },
         "MaxResults":{
           "shape":"MaxReturnedResultsCount",
-          "documentation":"<p>The maximum number of results to return in one operation. The maximum value you can specify is 10.</p> <p>To retrieve the remaining results, make another call with the returned <code>NextToken</code> value. </p>"
+          "documentation":"<p>The maximum number of results to return in one operation. The maximum value that you can specify is 100.</p> <p>To retrieve the remaining results, make another call with the returned <code>NextToken</code> value. </p>"
         },
         "Namespace":{
           "shape":"Namespace",
@@ -891,6 +1163,32 @@
         }
       }
     },
+    "DescribeInsightRulesInput":{
+      "type":"structure",
+      "members":{
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>Reserved for future use.</p>"
+        },
+        "MaxResults":{
+          "shape":"InsightRuleMaxResults",
+          "documentation":"<p>This parameter is not currently used. Reserved for future use. If it is used in the future, the maximum value may be different.</p>"
+        }
+      }
+    },
+    "DescribeInsightRulesOutput":{
+      "type":"structure",
+      "members":{
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>Reserved for future use.</p>"
+        },
+        "InsightRules":{
+          "shape":"InsightRules",
+          "documentation":"<p>The rules returned by the operation.</p>"
+        }
+      }
+    },
     "Dimension":{
       "type":"structure",
       "required":[
@@ -958,6 +1256,25 @@
         }
       }
     },
+    "DisableInsightRulesInput":{
+      "type":"structure",
+      "required":["RuleNames"],
+      "members":{
+        "RuleNames":{
+          "shape":"InsightRuleNames",
+          "documentation":"<p>An array of the rule names to disable. If you need to find out the names of your rules, use <a href=\"https://docs.aws.amazon.com/AmazonCloudWatch/latest/APIReference/API_DescribeInsightRules.html\">DescribeInsightRules</a>.</p>"
+        }
+      }
+    },
+    "DisableInsightRulesOutput":{
+      "type":"structure",
+      "members":{
+        "Failures":{
+          "shape":"BatchFailures",
+          "documentation":"<p>An array listing the rules that could not be disabled. You cannot disable built-in rules.</p>"
+        }
+      }
+    },
     "EnableAlarmActionsInput":{
       "type":"structure",
       "required":["AlarmNames"],
@@ -968,6 +1285,25 @@
         }
       }
     },
+    "EnableInsightRulesInput":{
+      "type":"structure",
+      "required":["RuleNames"],
+      "members":{
+        "RuleNames":{
+          "shape":"InsightRuleNames",
+          "documentation":"<p>An array of the rule names to enable. If you need to find out the names of your rules, use <a href=\"https://docs.aws.amazon.com/AmazonCloudWatch/latest/APIReference/API_DescribeInsightRules.html\">DescribeInsightRules</a>.</p>"
+        }
+      }
+    },
+    "EnableInsightRulesOutput":{
+      "type":"structure",
+      "members":{
+        "Failures":{
+          "shape":"BatchFailures",
+          "documentation":"<p>An array listing the rules that could not be enabled. You cannot disable or enable built-in rules.</p>"
+        }
+      }
+    },
     "ErrorMessage":{
       "type":"string",
       "max":255,
@@ -982,6 +1318,7 @@
       "type":"integer",
       "min":1
     },
+    "ExceptionType":{"type":"string"},
     "ExtendedStatistic":{
       "type":"string",
       "pattern":"p(\\d{1,2}(\\.\\d{0,2})?|100)"
@@ -992,6 +1329,9 @@
       "max":10,
       "min":1
     },
+    "FailureCode":{"type":"string"},
+    "FailureDescription":{"type":"string"},
+    "FailureResource":{"type":"string"},
     "FaultDescription":{"type":"string"},
     "GetDashboardInput":{
       "type":"structure",
@@ -1012,7 +1352,7 @@
         },
         "DashboardBody":{
           "shape":"DashboardBody",
-          "documentation":"<p>The detailed information about the dashboard, including what widgets are included and their location on the dashboard. For more information about the <code>DashboardBody</code> syntax, see <a>CloudWatch-Dashboard-Body-Structure</a>. </p>"
+          "documentation":"<p>The detailed information about the dashboard, including what widgets are included and their location on the dashboard. For more information about the <code>DashboardBody</code> syntax, see <a href=\"https://docs.aws.amazon.com/AmazonCloudWatch/latest/APIReference/CloudWatch-Dashboard-Body-Structure.html\">Dashboard Body Structure and Syntax</a>. </p>"
         },
         "DashboardName":{
           "shape":"DashboardName",
@@ -1020,6 +1360,74 @@
         }
       }
     },
+    "GetInsightRuleReportInput":{
+      "type":"structure",
+      "required":[
+        "RuleName",
+        "StartTime",
+        "EndTime",
+        "Period"
+      ],
+      "members":{
+        "RuleName":{
+          "shape":"InsightRuleName",
+          "documentation":"<p>The name of the rule that you want to see data from.</p>"
+        },
+        "StartTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>The start time of the data to use in the report. When used in a raw HTTP Query API, it is formatted as <code>yyyy-MM-dd'T'HH:mm:ss</code>. For example, <code>2019-07-01T23:59:59</code>.</p>"
+        },
+        "EndTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>The end time of the data to use in the report. When used in a raw HTTP Query API, it is formatted as <code>yyyy-MM-dd'T'HH:mm:ss</code>. For example, <code>2019-07-01T23:59:59</code>.</p>"
+        },
+        "Period":{
+          "shape":"Period",
+          "documentation":"<p>The period, in seconds, to use for the statistics in the <code>InsightRuleMetricDatapoint</code> results.</p>"
+        },
+        "MaxContributorCount":{
+          "shape":"InsightRuleUnboundInteger",
+          "documentation":"<p>The maximum number of contributors to include in the report. The range is 1 to 100. If you omit this, the default of 10 is used.</p>"
+        },
+        "Metrics":{
+          "shape":"InsightRuleMetricList",
+          "documentation":"<p>Specifies which metrics to use for aggregation of contributor values for the report. You can specify one or more of the following metrics:</p> <ul> <li> <p> <code>UniqueContributors</code> -- the number of unique contributors for each data point.</p> </li> <li> <p> <code>MaxContributorValue</code> -- the value of the top contributor for each data point. The identity of the contributor may change for each data point in the graph.</p> <p>If this rule aggregates by COUNT, the top contributor for each data point is the contributor with the most occurrences in that period. If the rule aggregates by SUM, the top contributor is the contributor with the highest sum in the log field specified by the rule's <code>Value</code>, during that period.</p> </li> <li> <p> <code>SampleCount</code> -- the number of data points matched by the rule.</p> </li> <li> <p> <code>Sum</code> -- the sum of the values from all contributors during the time period represented by that data point.</p> </li> <li> <p> <code>Minimum</code> -- the minimum value from a single observation during the time period represented by that data point.</p> </li> <li> <p> <code>Maximum</code> -- the maximum value from a single observation during the time period represented by that data point.</p> </li> <li> <p> <code>Average</code> -- the average value from all contributors during the time period represented by that data point.</p> </li> </ul>"
+        },
+        "OrderBy":{
+          "shape":"InsightRuleOrderBy",
+          "documentation":"<p>Determines what statistic to use to rank the contributors. Valid values are SUM and MAXIMUM.</p>"
+        }
+      }
+    },
+    "GetInsightRuleReportOutput":{
+      "type":"structure",
+      "members":{
+        "KeyLabels":{
+          "shape":"InsightRuleContributorKeyLabels",
+          "documentation":"<p>An array of the strings used as the keys for this rule. The keys are the dimensions used to classify contributors. If the rule contains more than one key, then each unique combination of values for the keys is counted as a unique contributor.</p>"
+        },
+        "AggregationStatistic":{
+          "shape":"InsightRuleAggregationStatistic",
+          "documentation":"<p>Specifies whether this rule aggregates contributor data by COUNT or SUM.</p>"
+        },
+        "AggregateValue":{
+          "shape":"InsightRuleUnboundDouble",
+          "documentation":"<p>The sum of the values from all individual contributors that match the rule.</p>"
+        },
+        "ApproximateUniqueCount":{
+          "shape":"InsightRuleUnboundLong",
+          "documentation":"<p>An approximate count of the unique contributors found by this rule in this time period.</p>"
+        },
+        "Contributors":{
+          "shape":"InsightRuleContributors",
+          "documentation":"<p>An array of the unique contributors found by this rule in this time period. If the rule contains multiple keys, each combination of values for the keys counts as a unique contributor.</p>"
+        },
+        "MetricDatapoints":{
+          "shape":"InsightRuleMetricDatapoints",
+          "documentation":"<p>A time series of metric data points that matches the time period in the rule request.</p>"
+        }
+      }
+    },
     "GetMetricDataInput":{
       "type":"structure",
       "required":[
@@ -1030,7 +1438,7 @@
       "members":{
         "MetricDataQueries":{
           "shape":"MetricDataQueries",
-          "documentation":"<p>The metric queries to be returned. A single <code>GetMetricData</code> call can include as many as 100 <code>MetricDataQuery</code> structures. Each of these structures can specify either a metric to retrieve, or a math expression to perform on retrieved data. </p>"
+          "documentation":"<p>The metric queries to be returned. A single <code>GetMetricData</code> call can include as many as 500 <code>MetricDataQuery</code> structures. Each of these structures can specify either a metric to retrieve, or a math expression to perform on retrieved data. </p>"
         },
         "StartTime":{
           "shape":"Timestamp",
@@ -1096,11 +1504,11 @@
         },
         "StartTime":{
           "shape":"Timestamp",
-          "documentation":"<p>The time stamp that determines the first data point to return. Start times are evaluated relative to the time that CloudWatch receives the request.</p> <p>The value specified is inclusive; results include data points with the specified time stamp. The time stamp must be in ISO 8601 UTC format (for example, 2016-10-03T23:00:00Z).</p> <p>CloudWatch rounds the specified time stamp as follows:</p> <ul> <li> <p>Start time less than 15 days ago - Round down to the nearest whole minute. For example, 12:32:34 is rounded down to 12:32:00.</p> </li> <li> <p>Start time between 15 and 63 days ago - Round down to the nearest 5-minute clock interval. For example, 12:32:34 is rounded down to 12:30:00.</p> </li> <li> <p>Start time greater than 63 days ago - Round down to the nearest 1-hour clock interval. For example, 12:32:34 is rounded down to 12:00:00.</p> </li> </ul> <p>If you set <code>Period</code> to 5, 10, or 30, the start time of your request is rounded down to the nearest time that corresponds to even 5-, 10-, or 30-second divisions of a minute. For example, if you make a query at (HH:mm:ss) 01:05:23 for the previous 10-second period, the start time of your request is rounded down and you receive data from 01:05:10 to 01:05:20. If you make a query at 15:07:17 for the previous 5 minutes of data, using a period of 5 seconds, you receive data timestamped between 15:02:15 and 15:07:15. </p>"
+          "documentation":"<p>The time stamp that determines the first data point to return. Start times are evaluated relative to the time that CloudWatch receives the request.</p> <p>The value specified is inclusive; results include data points with the specified time stamp. In a raw HTTP query, the time stamp must be in ISO 8601 UTC format (for example, 2016-10-03T23:00:00Z).</p> <p>CloudWatch rounds the specified time stamp as follows:</p> <ul> <li> <p>Start time less than 15 days ago - Round down to the nearest whole minute. For example, 12:32:34 is rounded down to 12:32:00.</p> </li> <li> <p>Start time between 15 and 63 days ago - Round down to the nearest 5-minute clock interval. For example, 12:32:34 is rounded down to 12:30:00.</p> </li> <li> <p>Start time greater than 63 days ago - Round down to the nearest 1-hour clock interval. For example, 12:32:34 is rounded down to 12:00:00.</p> </li> </ul> <p>If you set <code>Period</code> to 5, 10, or 30, the start time of your request is rounded down to the nearest time that corresponds to even 5-, 10-, or 30-second divisions of a minute. For example, if you make a query at (HH:mm:ss) 01:05:23 for the previous 10-second period, the start time of your request is rounded down and you receive data from 01:05:10 to 01:05:20. If you make a query at 15:07:17 for the previous 5 minutes of data, using a period of 5 seconds, you receive data timestamped between 15:02:15 and 15:07:15. </p>"
         },
         "EndTime":{
           "shape":"Timestamp",
-          "documentation":"<p>The time stamp that determines the last data point to return.</p> <p>The value specified is exclusive; results include data points up to the specified time stamp. The time stamp must be in ISO 8601 UTC format (for example, 2016-10-10T23:00:00Z).</p>"
+          "documentation":"<p>The time stamp that determines the last data point to return.</p> <p>The value specified is exclusive; results include data points up to the specified time stamp. In a raw HTTP query, the time stamp must be in ISO 8601 UTC format (for example, 2016-10-10T23:00:00Z).</p>"
         },
         "Period":{
           "shape":"Period",
@@ -1139,7 +1547,7 @@
       "members":{
         "MetricWidget":{
           "shape":"MetricWidget",
-          "documentation":"<p>A JSON string that defines the bitmap graph to be retrieved. The string includes the metrics to include in the graph, statistics, annotations, title, axis limits, and so on. You can include only one <code>MetricWidget</code> parameter in each <code>GetMetricWidgetImage</code> call.</p> <p>For more information about the syntax of <code>MetricWidget</code> see <a>CloudWatch-Metric-Widget-Structure</a>.</p> <p>If any metric on the graph could not load all the requested data points, an orange triangle with an exclamation point appears next to the graph legend.</p>"
+          "documentation":"<p>A JSON string that defines the bitmap graph to be retrieved. The string includes the metrics to include in the graph, statistics, annotations, title, axis limits, and so on. You can include only one <code>MetricWidget</code> parameter in each <code>GetMetricWidgetImage</code> call.</p> <p>For more information about the syntax of <code>MetricWidget</code> see <a href=\"https://docs.aws.amazon.com/AmazonCloudWatch/latest/APIReference/CloudWatch-Metric-Widget-Structure.html\">GetMetricWidgetImage: Metric Widget Structure and Syntax</a>.</p> <p>If any metric on the graph could not load all the requested data points, an orange triangle with an exclamation point appears next to the graph legend.</p>"
         },
         "OutputFormat":{
           "shape":"OutputFormat",
@@ -1174,6 +1582,188 @@
       "max":255,
       "min":1
     },
+    "InsightRule":{
+      "type":"structure",
+      "required":[
+        "Name",
+        "State",
+        "Schema",
+        "Definition"
+      ],
+      "members":{
+        "Name":{
+          "shape":"InsightRuleName",
+          "documentation":"<p>The name of the rule.</p>"
+        },
+        "State":{
+          "shape":"InsightRuleState",
+          "documentation":"<p>Indicates whether the rule is enabled or disabled.</p>"
+        },
+        "Schema":{
+          "shape":"InsightRuleSchema",
+          "documentation":"<p>For rules that you create, this is always <code>{\"Name\": \"CloudWatchLogRule\", \"Version\": 1}</code>. For built-in rules, this is <code>{\"Name\": \"ServiceLogRule\", \"Version\": 1}</code> </p>"
+        },
+        "Definition":{
+          "shape":"InsightRuleDefinition",
+          "documentation":"<p>The definition of the rule, as a JSON object. The definition contains the keywords used to define contributors, the value to aggregate on if this rule returns a sum instead of a count, and the filters. For details on the valid syntax, see <a href=\"https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/ContributorInsights-RuleSyntax.html\">Contributor Insights Rule Syntax</a>.</p>"
+        }
+      },
+      "documentation":"<p>This structure contains the definition for a Contributor Insights rule.</p>"
+    },
+    "InsightRuleAggregationStatistic":{"type":"string"},
+    "InsightRuleContributor":{
+      "type":"structure",
+      "required":[
+        "Keys",
+        "ApproximateAggregateValue",
+        "Datapoints"
+      ],
+      "members":{
+        "Keys":{
+          "shape":"InsightRuleContributorKeys",
+          "documentation":"<p>One of the log entry field keywords that is used to define contributors for this rule.</p>"
+        },
+        "ApproximateAggregateValue":{
+          "shape":"InsightRuleUnboundDouble",
+          "documentation":"<p>An approximation of the aggregate value that comes from this contributor.</p>"
+        },
+        "Datapoints":{
+          "shape":"InsightRuleContributorDatapoints",
+          "documentation":"<p>An array of the data points where this contributor is present. Only the data points when this contributor appeared are included in the array.</p>"
+        }
+      },
+      "documentation":"<p>One of the unique contributors found by a Contributor Insights rule. If the rule contains multiple keys, then a unique contributor is a unique combination of values from all the keys in the rule.</p> <p>If the rule contains a single key, then each unique contributor is each unique value for this key.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/AmazonCloudWatch/latest/APIReference/API_GetInsightRuleReport.html\">GetInsightRuleReport</a>.</p>"
+    },
+    "InsightRuleContributorDatapoint":{
+      "type":"structure",
+      "required":[
+        "Timestamp",
+        "ApproximateValue"
+      ],
+      "members":{
+        "Timestamp":{
+          "shape":"Timestamp",
+          "documentation":"<p>The timestamp of the data point.</p>"
+        },
+        "ApproximateValue":{
+          "shape":"InsightRuleUnboundDouble",
+          "documentation":"<p>The approximate value that this contributor added during this timestamp.</p>"
+        }
+      },
+      "documentation":"<p>One data point related to one contributor.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/AmazonCloudWatch/latest/APIReference/API_GetInsightRuleReport.html\">GetInsightRuleReport</a> and <a href=\"https://docs.aws.amazon.com/AmazonCloudWatch/latest/APIReference/API_InsightRuleContributor.html\">InsightRuleContributor</a>.</p>"
+    },
+    "InsightRuleContributorDatapoints":{
+      "type":"list",
+      "member":{"shape":"InsightRuleContributorDatapoint"}
+    },
+    "InsightRuleContributorKey":{"type":"string"},
+    "InsightRuleContributorKeyLabel":{"type":"string"},
+    "InsightRuleContributorKeyLabels":{
+      "type":"list",
+      "member":{"shape":"InsightRuleContributorKeyLabel"}
+    },
+    "InsightRuleContributorKeys":{
+      "type":"list",
+      "member":{"shape":"InsightRuleContributorKey"}
+    },
+    "InsightRuleContributors":{
+      "type":"list",
+      "member":{"shape":"InsightRuleContributor"}
+    },
+    "InsightRuleDefinition":{
+      "type":"string",
+      "max":8192,
+      "min":1,
+      "pattern":"[\\x00-\\x7F]+"
+    },
+    "InsightRuleMaxResults":{
+      "type":"integer",
+      "max":500,
+      "min":1
+    },
+    "InsightRuleMetricDatapoint":{
+      "type":"structure",
+      "required":["Timestamp"],
+      "members":{
+        "Timestamp":{
+          "shape":"Timestamp",
+          "documentation":"<p>The timestamp of the data point.</p>"
+        },
+        "UniqueContributors":{
+          "shape":"InsightRuleUnboundDouble",
+          "documentation":"<p>The number of unique contributors who published data during this timestamp.</p> <p>This statistic is returned only if you included it in the <code>Metrics</code> array in your request.</p>"
+        },
+        "MaxContributorValue":{
+          "shape":"InsightRuleUnboundDouble",
+          "documentation":"<p>The maximum value provided by one contributor during this timestamp. Each timestamp is evaluated separately, so the identity of the max contributor could be different for each timestamp.</p> <p>This statistic is returned only if you included it in the <code>Metrics</code> array in your request.</p>"
+        },
+        "SampleCount":{
+          "shape":"InsightRuleUnboundDouble",
+          "documentation":"<p>The number of occurrences that matched the rule during this data point.</p> <p>This statistic is returned only if you included it in the <code>Metrics</code> array in your request.</p>"
+        },
+        "Average":{
+          "shape":"InsightRuleUnboundDouble",
+          "documentation":"<p>The average value from all contributors during the time period represented by that data point.</p> <p>This statistic is returned only if you included it in the <code>Metrics</code> array in your request.</p>"
+        },
+        "Sum":{
+          "shape":"InsightRuleUnboundDouble",
+          "documentation":"<p>The sum of the values from all contributors during the time period represented by that data point.</p> <p>This statistic is returned only if you included it in the <code>Metrics</code> array in your request.</p>"
+        },
+        "Minimum":{
+          "shape":"InsightRuleUnboundDouble",
+          "documentation":"<p>The minimum value from a single contributor during the time period represented by that data point.</p> <p>This statistic is returned only if you included it in the <code>Metrics</code> array in your request.</p>"
+        },
+        "Maximum":{
+          "shape":"InsightRuleUnboundDouble",
+          "documentation":"<p>The maximum value from a single occurence from a single contributor during the time period represented by that data point.</p> <p>This statistic is returned only if you included it in the <code>Metrics</code> array in your request.</p>"
+        }
+      },
+      "documentation":"<p>One data point from the metric time series returned in a Contributor Insights rule report.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/AmazonCloudWatch/latest/APIReference/API_GetInsightRuleReport.html\">GetInsightRuleReport</a>.</p>"
+    },
+    "InsightRuleMetricDatapoints":{
+      "type":"list",
+      "member":{"shape":"InsightRuleMetricDatapoint"}
+    },
+    "InsightRuleMetricList":{
+      "type":"list",
+      "member":{"shape":"InsightRuleMetricName"}
+    },
+    "InsightRuleMetricName":{
+      "type":"string",
+      "max":32,
+      "min":1,
+      "pattern":"[\\x20-\\x7E]+"
+    },
+    "InsightRuleName":{
+      "type":"string",
+      "max":128,
+      "min":1,
+      "pattern":"[\\x20-\\x7E]+"
+    },
+    "InsightRuleNames":{
+      "type":"list",
+      "member":{"shape":"InsightRuleName"}
+    },
+    "InsightRuleOrderBy":{
+      "type":"string",
+      "max":32,
+      "min":1,
+      "pattern":"[\\x20-\\x7E]+"
+    },
+    "InsightRuleSchema":{"type":"string"},
+    "InsightRuleState":{
+      "type":"string",
+      "max":32,
+      "min":1,
+      "pattern":"[\\x20-\\x7E]+"
+    },
+    "InsightRuleUnboundDouble":{"type":"double"},
+    "InsightRuleUnboundInteger":{"type":"integer"},
+    "InsightRuleUnboundLong":{"type":"long"},
+    "InsightRules":{
+      "type":"list",
+      "member":{"shape":"InsightRule"}
+    },
     "InternalServiceFault":{
       "type":"structure",
       "members":{
@@ -1502,7 +2092,7 @@
         },
         "DatapointsToAlarm":{
           "shape":"DatapointsToAlarm",
-          "documentation":"<p>The number of datapoints that must be breaching to trigger the alarm.</p>"
+          "documentation":"<p>The number of data points that must be breaching to trigger the alarm.</p>"
         },
         "Threshold":{
           "shape":"Threshold",
@@ -1529,7 +2119,7 @@
           "documentation":"<p>In an alarm based on an anomaly detection model, this is the ID of the <code>ANOMALY_DETECTION_BAND</code> function used as the threshold for the alarm.</p>"
         }
       },
-      "documentation":"<p>Represents an alarm.</p>",
+      "documentation":"<p>The details about a metric alarm.</p>",
       "xmlOrder":[
         "AlarmName",
         "AlarmArn",
@@ -1598,10 +2188,10 @@
         },
         "Period":{
           "shape":"Period",
-          "documentation":"<p>The granularity, in seconds, of the returned data points. For metrics with regular resolution, a period can be as short as one minute (60 seconds) and must be a multiple of 60. For high-resolution metrics that are collected at intervals of less than one minute, the period can be 1, 5, 10, 30, 60, or any multiple of 60. High-resolution metrics are those metrics stored by a <code>PutMetricData</code> operation that includes a <code>StorageResolution of 1 second</code>.</p> <p>Use this field only when you are performing a <code>GetMetricData</code> operation, and only when you are specifying the <code>Expression</code> field. Do not use this field with a <code>PutMetricAlarm</code> operation or when you are specifying a <code>MetricStat</code> in a <code>GetMetricData</code> operation.</p> <p/>"
+          "documentation":"<p>The granularity, in seconds, of the returned data points. For metrics with regular resolution, a period can be as short as one minute (60 seconds) and must be a multiple of 60. For high-resolution metrics that are collected at intervals of less than one minute, the period can be 1, 5, 10, 30, 60, or any multiple of 60. High-resolution metrics are those metrics stored by a <code>PutMetricData</code> operation that includes a <code>StorageResolution of 1 second</code>.</p>"
         }
       },
-      "documentation":"<p>This structure is used in both <code>GetMetricData</code> and <code>PutMetricAlarm</code>. The supported use of this structure is different for those two operations.</p> <p>When used in <code>GetMetricData</code>, it indicates the metric data to return, and whether this call is just retrieving a batch set of data for one metric, or is performing a math expression on metric data. A single <code>GetMetricData</code> call can include up to 100 <code>MetricDataQuery</code> structures.</p> <p>When used in <code>PutMetricAlarm</code>, it enables you to create an alarm based on a metric math expression. Each <code>MetricDataQuery</code> in the array specifies either a metric to retrieve, or a math expression to be performed on retrieved metrics. A single <code>PutMetricAlarm</code> call can include up to 20 <code>MetricDataQuery</code> structures in the array. The 20 structures can include as many as 10 structures that contain a <code>MetricStat</code> parameter to retrieve a metric, and as many as 10 structures that contain the <code>Expression</code> parameter to perform a math expression. Of those <code>Expression</code> structures, one must have <code>True</code> as the value for <code>ReturnData</code>. The result of this expression is the value the alarm watches.</p> <p>Any expression used in a <code>PutMetricAlarm</code> operation must return a single time series. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/using-metric-math.html#metric-math-syntax\">Metric Math Syntax and Functions</a> in the <i>Amazon CloudWatch User Guide</i>.</p> <p>Some of the parameters of this structure also have different uses whether you are using this structure in a <code>GetMetricData</code> operation or a <code>PutMetricAlarm</code> operation. These differences are explained in the following parameter list.</p>"
+      "documentation":"<p>This structure is used in both <code>GetMetricData</code> and <code>PutMetricAlarm</code>. The supported use of this structure is different for those two operations.</p> <p>When used in <code>GetMetricData</code>, it indicates the metric data to return, and whether this call is just retrieving a batch set of data for one metric, or is performing a math expression on metric data. A single <code>GetMetricData</code> call can include up to 500 <code>MetricDataQuery</code> structures.</p> <p>When used in <code>PutMetricAlarm</code>, it enables you to create an alarm based on a metric math expression. Each <code>MetricDataQuery</code> in the array specifies either a metric to retrieve, or a math expression to be performed on retrieved metrics. A single <code>PutMetricAlarm</code> call can include up to 20 <code>MetricDataQuery</code> structures in the array. The 20 structures can include as many as 10 structures that contain a <code>MetricStat</code> parameter to retrieve a metric, and as many as 10 structures that contain the <code>Expression</code> parameter to perform a math expression. Of those <code>Expression</code> structures, one must have <code>True</code> as the value for <code>ReturnData</code>. The result of this expression is the value the alarm watches.</p> <p>Any expression used in a <code>PutMetricAlarm</code> operation must return a single time series. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/using-metric-math.html#metric-math-syntax\">Metric Math Syntax and Functions</a> in the <i>Amazon CloudWatch User Guide</i>.</p> <p>Some of the parameters of this structure also have different uses whether you are using this structure in a <code>GetMetricData</code> operation or a <code>PutMetricAlarm</code> operation. These differences are explained in the following parameter list.</p>"
     },
     "MetricDataResult":{
       "type":"structure",
@@ -1659,7 +2249,7 @@
         },
         "Value":{
           "shape":"DatapointValue",
-          "documentation":"<p>The value for the metric.</p> <p>Although the parameter accepts numbers of type Double, CloudWatch rejects values that are either too small or too large. Values must be in the range of 8.515920e-109 to 1.174271e+108 (Base 10) or 2e-360 to 2e360 (Base 2). In addition, special values (for example, NaN, +Infinity, -Infinity) are not supported.</p>"
+          "documentation":"<p>The value for the metric.</p> <p>Although the parameter accepts numbers of type Double, CloudWatch rejects values that are either too small or too large. Values must be in the range of -2^360 to 2^360. In addition, special values (for example, NaN, +Infinity, -Infinity) are not supported.</p>"
         },
         "StatisticValues":{
           "shape":"StatisticSet",
@@ -1667,7 +2257,7 @@
         },
         "Values":{
           "shape":"Values",
-          "documentation":"<p>Array of numbers representing the values for the metric during the period. Each unique value is listed just once in this array, and the corresponding number in the <code>Counts</code> array specifies the number of times that value occurred during the period. You can include up to 150 unique values in each <code>PutMetricData</code> action that specifies a <code>Values</code> array.</p> <p>Although the <code>Values</code> array accepts numbers of type <code>Double</code>, CloudWatch rejects values that are either too small or too large. Values must be in the range of 8.515920e-109 to 1.174271e+108 (Base 10) or 2e-360 to 2e360 (Base 2). In addition, special values (for example, NaN, +Infinity, -Infinity) are not supported.</p>"
+          "documentation":"<p>Array of numbers representing the values for the metric during the period. Each unique value is listed just once in this array, and the corresponding number in the <code>Counts</code> array specifies the number of times that value occurred during the period. You can include up to 150 unique values in each <code>PutMetricData</code> action that specifies a <code>Values</code> array.</p> <p>Although the <code>Values</code> array accepts numbers of type <code>Double</code>, CloudWatch rejects values that are either too small or too large. Values must be in the range of -2^360 to 2^360. In addition, special values (for example, NaN, +Infinity, -Infinity) are not supported.</p>"
         },
         "Counts":{
           "shape":"Counts",
@@ -1758,6 +2348,28 @@
     },
     "NextToken":{"type":"string"},
     "OutputFormat":{"type":"string"},
+    "PartialFailure":{
+      "type":"structure",
+      "members":{
+        "FailureResource":{
+          "shape":"FailureResource",
+          "documentation":"<p>The specified rule that could not be deleted.</p>"
+        },
+        "ExceptionType":{
+          "shape":"ExceptionType",
+          "documentation":"<p>The type of error.</p>"
+        },
+        "FailureCode":{
+          "shape":"FailureCode",
+          "documentation":"<p>The code of the error.</p>"
+        },
+        "FailureDescription":{
+          "shape":"FailureDescription",
+          "documentation":"<p>A description of the error.</p>"
+        }
+      },
+      "documentation":"<p>This array is empty if the API operation was successful for all the rules specified in the request. If the operation could not process one of the rules, the following data is returned for each of those rules.</p>"
+    },
     "Period":{
       "type":"integer",
       "min":1
@@ -1797,6 +2409,47 @@
       "members":{
       }
     },
+    "PutCompositeAlarmInput":{
+      "type":"structure",
+      "required":[
+        "AlarmName",
+        "AlarmRule"
+      ],
+      "members":{
+        "ActionsEnabled":{
+          "shape":"ActionsEnabled",
+          "documentation":"<p>Indicates whether actions should be executed during any changes to the alarm state of the composite alarm. The default is <code>TRUE</code>.</p>"
+        },
+        "AlarmActions":{
+          "shape":"ResourceList",
+          "documentation":"<p>The actions to execute when this alarm transitions to the <code>ALARM</code> state from any other state. Each action is specified as an Amazon Resource Name (ARN).</p> <p>Valid Values: <code>arn:aws:sns:<i>region</i>:<i>account-id</i>:<i>sns-topic-name</i> </code> </p>"
+        },
+        "AlarmDescription":{
+          "shape":"AlarmDescription",
+          "documentation":"<p>The description for the composite alarm.</p>"
+        },
+        "AlarmName":{
+          "shape":"AlarmName",
+          "documentation":"<p>The name for the composite alarm. This name must be unique within your AWS account.</p>"
+        },
+        "AlarmRule":{
+          "shape":"AlarmRule",
+          "documentation":"<p>An expression that specifies which other alarms are to be evaluated to determine this composite alarm's state. For each alarm that you reference, you designate a function that specifies whether that alarm needs to be in ALARM state, OK state, or INSUFFICIENT_DATA state. You can use operators (AND, OR and NOT) to combine multiple functions in a single expression. You can use parenthesis to logically group the functions in your expression.</p> <p>You can use either alarm names or ARNs to reference the other alarms that are to be evaluated.</p> <p>Functions can include the following:</p> <ul> <li> <p> <code>ALARM(\"<i>alarm-name</i> or <i>alarm-ARN</i>\")</code> is TRUE if the named alarm is in ALARM state.</p> </li> <li> <p> <code>OK(\"<i>alarm-name</i> or <i>alarm-ARN</i>\")</code> is TRUE if the named alarm is in OK state.</p> </li> <li> <p> <code>INSUFFICIENT_DATA(\"<i>alarm-name</i> or <i>alarm-ARN</i>\")</code> is TRUE if the named alarm is in INSUFFICIENT_DATA state.</p> </li> <li> <p> <code>TRUE</code> always evaluates to TRUE.</p> </li> <li> <p> <code>FALSE</code> always evaluates to FALSE.</p> </li> </ul> <p>TRUE and FALSE are useful for testing a complex <code>AlarmRule</code> structure, and for testing your alarm actions.</p> <p>Alarm names specified in <code>AlarmRule</code> can be surrounded with double-quotes (\"), but do not have to be.</p> <p>The following are some examples of <code>AlarmRule</code>:</p> <ul> <li> <p> <code>ALARM(CPUUtilizationTooHigh) AND ALARM(DiskReadOpsTooHigh)</code> specifies that the composite alarm goes into ALARM state only if both CPUUtilizationTooHigh and DiskReadOpsTooHigh alarms are in ALARM state.</p> </li> <li> <p> <code>ALARM(CPUUtilizationTooHigh) AND NOT ALARM(DeploymentInProgress)</code> specifies that the alarm goes to ALARM state if CPUUtilizationTooHigh is in ALARM state and DeploymentInProgress is not in ALARM state. This example reduces alarm noise during a known deployment window.</p> </li> <li> <p> <code>(ALARM(CPUUtilizationTooHigh) OR ALARM(DiskReadOpsTooHigh)) AND OK(NetworkOutTooHigh)</code> goes into ALARM state if CPUUtilizationTooHigh OR DiskReadOpsTooHigh is in ALARM state, and if NetworkOutTooHigh is in OK state. This provides another example of using a composite alarm to prevent noise. This rule ensures that you are not notified with an alarm action on high CPU or disk usage if a known network problem is also occurring.</p> </li> </ul> <p>The <code>AlarmRule</code> can specify as many as 100 \"children\" alarms. The <code>AlarmRule</code> expression can have as many as 500 elements. Elements are child alarms, TRUE or FALSE statements, and parentheses.</p>"
+        },
+        "InsufficientDataActions":{
+          "shape":"ResourceList",
+          "documentation":"<p>The actions to execute when this alarm transitions to the <code>INSUFFICIENT_DATA</code> state from any other state. Each action is specified as an Amazon Resource Name (ARN).</p> <p>Valid Values: <code>arn:aws:sns:<i>region</i>:<i>account-id</i>:<i>sns-topic-name</i> </code> </p>"
+        },
+        "OKActions":{
+          "shape":"ResourceList",
+          "documentation":"<p>The actions to execute when this alarm transitions to an <code>OK</code> state from any other state. Each action is specified as an Amazon Resource Name (ARN).</p> <p>Valid Values: <code>arn:aws:sns:<i>region</i>:<i>account-id</i>:<i>sns-topic-name</i> </code> </p>"
+        },
+        "Tags":{
+          "shape":"TagList",
+          "documentation":"<p>A list of key-value pairs to associate with the composite alarm. You can associate as many as 50 tags with an alarm.</p> <p>Tags can help you organize and categorize your resources. You can also use them to scope user permissions, by granting a user permission to access or change only resources with certain tag values.</p>"
+        }
+      }
+    },
     "PutDashboardInput":{
       "type":"structure",
       "required":[
@@ -1810,7 +2463,7 @@
         },
         "DashboardBody":{
           "shape":"DashboardBody",
-          "documentation":"<p>The detailed information about the dashboard in JSON format, including the widgets to include and their location on the dashboard. This parameter is required.</p> <p>For more information about the syntax, see <a>CloudWatch-Dashboard-Body-Structure</a>.</p>"
+          "documentation":"<p>The detailed information about the dashboard in JSON format, including the widgets to include and their location on the dashboard. This parameter is required.</p> <p>For more information about the syntax, see <a href=\"https://docs.aws.amazon.com/AmazonCloudWatch/latest/APIReference/CloudWatch-Dashboard-Body-Structure.html\">Dashboard Body Structure and Syntax</a>.</p>"
         }
       }
     },
@@ -1823,6 +2476,32 @@
         }
       }
     },
+    "PutInsightRuleInput":{
+      "type":"structure",
+      "required":[
+        "RuleName",
+        "RuleDefinition"
+      ],
+      "members":{
+        "RuleName":{
+          "shape":"InsightRuleName",
+          "documentation":"<p>A unique name for the rule.</p>"
+        },
+        "RuleState":{
+          "shape":"InsightRuleState",
+          "documentation":"<p>The state of the rule. Valid values are ENABLED and DISABLED.</p>"
+        },
+        "RuleDefinition":{
+          "shape":"InsightRuleDefinition",
+          "documentation":"<p>The definition of the rule, as a JSON object. For details on the valid syntax, see <a href=\"https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/ContributorInsights-RuleSyntax.html\">Contributor Insights Rule Syntax</a>.</p>"
+        }
+      }
+    },
+    "PutInsightRuleOutput":{
+      "type":"structure",
+      "members":{
+      }
+    },
     "PutMetricAlarmInput":{
       "type":"structure",
       "required":[
@@ -1845,15 +2524,15 @@
         },
         "OKActions":{
           "shape":"ResourceList",
-          "documentation":"<p>The actions to execute when this alarm transitions to an <code>OK</code> state from any other state. Each action is specified as an Amazon Resource Name (ARN).</p> <p>Valid Values: <code>arn:aws:automate:<i>region</i>:ec2:stop</code> | <code>arn:aws:automate:<i>region</i>:ec2:terminate</code> | <code>arn:aws:automate:<i>region</i>:ec2:recover</code> | <code>arn:aws:automate:<i>region</i>:ec2:reboot</code> | <code>arn:aws:sns:<i>region</i>:<i>account-id</i>:<i>sns-topic-name</i> </code> | <code>arn:aws:autoscaling:<i>region</i>:<i>account-id</i>:scalingPolicy:<i>policy-id</i>autoScalingGroupName/<i>group-friendly-name</i>:policyName/<i>policy-friendly-name</i> </code> </p> <p>Valid Values (for use with IAM roles): <code>arn:aws:swf:<i>region</i>:<i>account-id</i>:action/actions/AWS_EC2.InstanceId.Stop/1.0</code> | <code>arn:aws:swf:<i>region</i>:<i>account-id</i>:action/actions/AWS_EC2.InstanceId.Terminate/1.0</code> | <code>arn:aws:swf:<i>region</i>:<i>account-id</i>:action/actions/AWS_EC2.InstanceId.Reboot/1.0</code> </p>"
+          "documentation":"<p>The actions to execute when this alarm transitions to an <code>OK</code> state from any other state. Each action is specified as an Amazon Resource Name (ARN).</p> <p>Valid Values: <code>arn:aws:automate:<i>region</i>:ec2:stop</code> | <code>arn:aws:automate:<i>region</i>:ec2:terminate</code> | <code>arn:aws:automate:<i>region</i>:ec2:recover</code> | <code>arn:aws:automate:<i>region</i>:ec2:reboot</code> | <code>arn:aws:sns:<i>region</i>:<i>account-id</i>:<i>sns-topic-name</i> </code> | <code>arn:aws:autoscaling:<i>region</i>:<i>account-id</i>:scalingPolicy:<i>policy-id</i>:autoScalingGroupName/<i>group-friendly-name</i>:policyName/<i>policy-friendly-name</i> </code> </p> <p>Valid Values (for use with IAM roles): <code>arn:aws:swf:<i>region</i>:<i>account-id</i>:action/actions/AWS_EC2.InstanceId.Stop/1.0</code> | <code>arn:aws:swf:<i>region</i>:<i>account-id</i>:action/actions/AWS_EC2.InstanceId.Terminate/1.0</code> | <code>arn:aws:swf:<i>region</i>:<i>account-id</i>:action/actions/AWS_EC2.InstanceId.Reboot/1.0</code> </p>"
         },
         "AlarmActions":{
           "shape":"ResourceList",
-          "documentation":"<p>The actions to execute when this alarm transitions to the <code>ALARM</code> state from any other state. Each action is specified as an Amazon Resource Name (ARN).</p> <p>Valid Values: <code>arn:aws:automate:<i>region</i>:ec2:stop</code> | <code>arn:aws:automate:<i>region</i>:ec2:terminate</code> | <code>arn:aws:automate:<i>region</i>:ec2:recover</code> | <code>arn:aws:automate:<i>region</i>:ec2:reboot</code> | <code>arn:aws:sns:<i>region</i>:<i>account-id</i>:<i>sns-topic-name</i> </code> | <code>arn:aws:autoscaling:<i>region</i>:<i>account-id</i>:scalingPolicy:<i>policy-id</i>autoScalingGroupName/<i>group-friendly-name</i>:policyName/<i>policy-friendly-name</i> </code> </p> <p>Valid Values (for use with IAM roles): <code>arn:aws:swf:<i>region</i>:<i>account-id</i>:action/actions/AWS_EC2.InstanceId.Stop/1.0</code> | <code>arn:aws:swf:<i>region</i>:<i>account-id</i>:action/actions/AWS_EC2.InstanceId.Terminate/1.0</code> | <code>arn:aws:swf:<i>region</i>:<i>account-id</i>:action/actions/AWS_EC2.InstanceId.Reboot/1.0</code> </p>"
+          "documentation":"<p>The actions to execute when this alarm transitions to the <code>ALARM</code> state from any other state. Each action is specified as an Amazon Resource Name (ARN).</p> <p>Valid Values: <code>arn:aws:automate:<i>region</i>:ec2:stop</code> | <code>arn:aws:automate:<i>region</i>:ec2:terminate</code> | <code>arn:aws:automate:<i>region</i>:ec2:recover</code> | <code>arn:aws:automate:<i>region</i>:ec2:reboot</code> | <code>arn:aws:sns:<i>region</i>:<i>account-id</i>:<i>sns-topic-name</i> </code> | <code>arn:aws:autoscaling:<i>region</i>:<i>account-id</i>:scalingPolicy:<i>policy-id</i>:autoScalingGroupName/<i>group-friendly-name</i>:policyName/<i>policy-friendly-name</i> </code> </p> <p>Valid Values (for use with IAM roles): <code>arn:aws:swf:<i>region</i>:<i>account-id</i>:action/actions/AWS_EC2.InstanceId.Stop/1.0</code> | <code>arn:aws:swf:<i>region</i>:<i>account-id</i>:action/actions/AWS_EC2.InstanceId.Terminate/1.0</code> | <code>arn:aws:swf:<i>region</i>:<i>account-id</i>:action/actions/AWS_EC2.InstanceId.Reboot/1.0</code> </p>"
         },
         "InsufficientDataActions":{
           "shape":"ResourceList",
-          "documentation":"<p>The actions to execute when this alarm transitions to the <code>INSUFFICIENT_DATA</code> state from any other state. Each action is specified as an Amazon Resource Name (ARN).</p> <p>Valid Values: <code>arn:aws:automate:<i>region</i>:ec2:stop</code> | <code>arn:aws:automate:<i>region</i>:ec2:terminate</code> | <code>arn:aws:automate:<i>region</i>:ec2:recover</code> | <code>arn:aws:automate:<i>region</i>:ec2:reboot</code> | <code>arn:aws:sns:<i>region</i>:<i>account-id</i>:<i>sns-topic-name</i> </code> | <code>arn:aws:autoscaling:<i>region</i>:<i>account-id</i>:scalingPolicy:<i>policy-id</i>autoScalingGroupName/<i>group-friendly-name</i>:policyName/<i>policy-friendly-name</i> </code> </p> <p>Valid Values (for use with IAM roles): <code>&gt;arn:aws:swf:<i>region</i>:<i>account-id</i>:action/actions/AWS_EC2.InstanceId.Stop/1.0</code> | <code>arn:aws:swf:<i>region</i>:<i>account-id</i>:action/actions/AWS_EC2.InstanceId.Terminate/1.0</code> | <code>arn:aws:swf:<i>region</i>:<i>account-id</i>:action/actions/AWS_EC2.InstanceId.Reboot/1.0</code> </p>"
+          "documentation":"<p>The actions to execute when this alarm transitions to the <code>INSUFFICIENT_DATA</code> state from any other state. Each action is specified as an Amazon Resource Name (ARN).</p> <p>Valid Values: <code>arn:aws:automate:<i>region</i>:ec2:stop</code> | <code>arn:aws:automate:<i>region</i>:ec2:terminate</code> | <code>arn:aws:automate:<i>region</i>:ec2:recover</code> | <code>arn:aws:automate:<i>region</i>:ec2:reboot</code> | <code>arn:aws:sns:<i>region</i>:<i>account-id</i>:<i>sns-topic-name</i> </code> | <code>arn:aws:autoscaling:<i>region</i>:<i>account-id</i>:scalingPolicy:<i>policy-id</i>:autoScalingGroupName/<i>group-friendly-name</i>:policyName/<i>policy-friendly-name</i> </code> </p> <p>Valid Values (for use with IAM roles): <code>&gt;arn:aws:swf:<i>region</i>:<i>account-id</i>:action/actions/AWS_EC2.InstanceId.Stop/1.0</code> | <code>arn:aws:swf:<i>region</i>:<i>account-id</i>:action/actions/AWS_EC2.InstanceId.Terminate/1.0</code> | <code>arn:aws:swf:<i>region</i>:<i>account-id</i>:action/actions/AWS_EC2.InstanceId.Reboot/1.0</code> </p>"
         },
         "MetricName":{
           "shape":"MetricName",
@@ -1889,7 +2568,7 @@
         },
         "DatapointsToAlarm":{
           "shape":"DatapointsToAlarm",
-          "documentation":"<p>The number of datapoints that must be breaching to trigger the alarm. This is used only if you are setting an \"M out of N\" alarm. In that case, this value is the M. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/AlarmThatSendsEmail.html#alarm-evaluation\">Evaluating an Alarm</a> in the <i>Amazon CloudWatch User Guide</i>.</p>"
+          "documentation":"<p>The number of data points that must be breaching to trigger the alarm. This is used only if you are setting an \"M out of N\" alarm. In that case, this value is the M. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/AlarmThatSendsEmail.html#alarm-evaluation\">Evaluating an Alarm</a> in the <i>Amazon CloudWatch User Guide</i>.</p>"
         },
         "Threshold":{
           "shape":"Threshold",
@@ -1909,7 +2588,7 @@
         },
         "Metrics":{
           "shape":"MetricDataQueries",
-          "documentation":"<p>An array of <code>MetricDataQuery</code> structures that enable you to create an alarm based on the result of a metric math expression. For each <code>PutMetricAlarm</code> operation, you must specify either <code>MetricName</code> or a <code>Metrics</code> array.</p> <p>Each item in the <code>Metrics</code> array either retrieves a metric or performs a math expression.</p> <p>One item in the <code>Metrics</code> array is the expression that the alarm watches. You designate this expression by setting <code>ReturnValue</code> to true for this object in the array. For more information, see <a>MetricDataQuery</a>.</p> <p>If you use the <code>Metrics</code> parameter, you cannot include the <code>MetricName</code>, <code>Dimensions</code>, <code>Period</code>, <code>Namespace</code>, <code>Statistic</code>, or <code>ExtendedStatistic</code> parameters of <code>PutMetricAlarm</code> in the same operation. Instead, you retrieve the metrics you are using in your math expression as part of the <code>Metrics</code> array.</p>"
+          "documentation":"<p>An array of <code>MetricDataQuery</code> structures that enable you to create an alarm based on the result of a metric math expression. For each <code>PutMetricAlarm</code> operation, you must specify either <code>MetricName</code> or a <code>Metrics</code> array.</p> <p>Each item in the <code>Metrics</code> array either retrieves a metric or performs a math expression.</p> <p>One item in the <code>Metrics</code> array is the expression that the alarm watches. You designate this expression by setting <code>ReturnValue</code> to true for this object in the array. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonCloudWatch/latest/APIReference/API_MetricDataQuery.html\">MetricDataQuery</a>.</p> <p>If you use the <code>Metrics</code> parameter, you cannot include the <code>MetricName</code>, <code>Dimensions</code>, <code>Period</code>, <code>Namespace</code>, <code>Statistic</code>, or <code>ExtendedStatistic</code> parameters of <code>PutMetricAlarm</code> in the same operation. Instead, you retrieve the metrics you are using in your math expression as part of the <code>Metrics</code> array.</p>"
         },
         "Tags":{
           "shape":"TagList",
@@ -2032,7 +2711,7 @@
         },
         "StateReasonData":{
           "shape":"StateReasonData",
-          "documentation":"<p>The reason that this alarm is set to this specific state, in JSON format.</p>"
+          "documentation":"<p>The reason that this alarm is set to this specific state, in JSON format.</p> <p>For SNS or EC2 alarm actions, this is just informational. But for EC2 Auto Scaling or application Auto Scaling alarm actions, the Auto Scaling policy uses the information in this field to take the correct action.</p>"
         }
       }
     },
diff --git a/services/cloudwatch/src/main/resources/codegen-resources/waiters-2.json b/services/cloudwatch/src/main/resources/codegen-resources/waiters-2.json
index cb0cf0bfe752..32803bba55ee 100644
--- a/services/cloudwatch/src/main/resources/codegen-resources/waiters-2.json
+++ b/services/cloudwatch/src/main/resources/codegen-resources/waiters-2.json
@@ -13,6 +13,19 @@
           "state": "success"
         }
       ]
+    },
+    "CompositeAlarmExists": {
+      "delay": 5,
+      "maxAttempts": 40,
+      "operation": "DescribeAlarms",
+      "acceptors": [
+        {
+          "matcher": "path",
+          "expected": true,
+          "argument": "length(CompositeAlarms[]) > `0`",
+          "state": "success"
+        }
+      ]
     }
   }
 }
diff --git a/services/cloudwatch/src/test/resources/cucumber.properties b/services/cloudwatch/src/test/resources/cucumber.properties
index ae6c0b3ec29b..8a430e30be54 100644
--- a/services/cloudwatch/src/test/resources/cucumber.properties
+++ b/services/cloudwatch/src/test/resources/cucumber.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/cloudwatchevents/build.properties b/services/cloudwatchevents/build.properties
index ecf2dae6fcb1..15ec2da1fc71 100644
--- a/services/cloudwatchevents/build.properties
+++ b/services/cloudwatchevents/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/cloudwatchevents/pom.xml b/services/cloudwatchevents/pom.xml
index 893dd533ff97..ed705fc3e36a 100644
--- a/services/cloudwatchevents/pom.xml
+++ b/services/cloudwatchevents/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>cloudwatchevents</artifactId>
     <name>AWS Java SDK :: Services :: Amazon CloudWatch Events</name>
diff --git a/services/cloudwatchevents/src/it/java/software/amazon/awssdk/services/cloudwatchevents/CloudWatchEventsIntegrationTest.java b/services/cloudwatchevents/src/it/java/software/amazon/awssdk/services/cloudwatchevents/CloudWatchEventsIntegrationTest.java
index 753565ba52b7..e2b6e5ac7f4a 100644
--- a/services/cloudwatchevents/src/it/java/software/amazon/awssdk/services/cloudwatchevents/CloudWatchEventsIntegrationTest.java
+++ b/services/cloudwatchevents/src/it/java/software/amazon/awssdk/services/cloudwatchevents/CloudWatchEventsIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/cloudwatchevents/src/main/resources/codegen-resources/service-2.json b/services/cloudwatchevents/src/main/resources/codegen-resources/service-2.json
index 2e9da78b75f0..6b4e3a35f7b2 100644
--- a/services/cloudwatchevents/src/main/resources/codegen-resources/service-2.json
+++ b/services/cloudwatchevents/src/main/resources/codegen-resources/service-2.json
@@ -21,10 +21,11 @@
       "input":{"shape":"ActivateEventSourceRequest"},
       "errors":[
         {"shape":"ResourceNotFoundException"},
+        {"shape":"ConcurrentModificationException"},
         {"shape":"InvalidStateException"},
         {"shape":"InternalException"}
       ],
-      "documentation":"<p>Activates a partner event source that has been deactivated. Once activated, your matching event bus will start receiving events from the event source.</p> <note> <p>This operation is performed by AWS customers, not by SaaS partners.</p> </note>"
+      "documentation":"<p>Activates a partner event source that has been deactivated. Once activated, your matching event bus will start receiving events from the event source.</p>"
     },
     "CreateEventBus":{
       "name":"CreateEventBus",
@@ -42,7 +43,7 @@
         {"shape":"ConcurrentModificationException"},
         {"shape":"LimitExceededException"}
       ],
-      "documentation":"<p>Creates a new event bus within your account. This can be a custom event bus which you can use to receive events from your own custom applications and services, or it can be a partner event bus which can be matched to a partner event source.</p> <note> <p>This operation is used by AWS customers, not by SaaS partners.</p> </note>"
+      "documentation":"<p>Creates a new event bus within your account. This can be a custom event bus which you can use to receive events from your custom applications and services, or it can be a partner event bus which can be matched to a partner event source.</p>"
     },
     "CreatePartnerEventSource":{
       "name":"CreatePartnerEventSource",
@@ -58,7 +59,7 @@
         {"shape":"ConcurrentModificationException"},
         {"shape":"LimitExceededException"}
       ],
-      "documentation":"<p>Called by an SaaS partner to create a partner event source.</p> <note> <p>This operation is not used by AWS customers.</p> </note> <p>Each partner event source can be used by one AWS account to create a matching partner event bus in that AWS account. A SaaS partner must create one partner event source for each AWS account that wants to receive those event types. </p> <p>A partner event source creates events based on resources in the SaaS partner's service or application.</p> <p>An AWS account that creates a partner event bus that matches the partner event source can use that event bus to receive events from the partner, and then process them using AWS Events rules and targets.</p> <p>Partner event source names follow this format:</p> <p> <code>aws.partner/<i>partner_name</i>/<i>event_namespace</i>/<i>event_name</i> </code> </p> <ul> <li> <p> <i>partner_name</i> is determined during partner registration and identifies the partner to AWS customers.</p> </li> <li> <p>For <i>event_namespace</i>, we recommend that partners use a string that identifies the AWS customer within the partner's system. This should not be the customer's AWS account ID.</p> </li> <li> <p> <i>event_name</i> is determined by the partner, and should uniquely identify an event-generating resource within the partner system. This should help AWS customers decide whether to create an event bus to receive these events.</p> </li> </ul>"
+      "documentation":"<p>Called by an SaaS partner to create a partner event source. This operation is not used by AWS customers.</p> <p>Each partner event source can be used by one AWS account to create a matching partner event bus in that AWS account. A SaaS partner must create one partner event source for each AWS account that wants to receive those event types. </p> <p>A partner event source creates events based on resources within the SaaS partner's service or application.</p> <p>An AWS account that creates a partner event bus that matches the partner event source can use that event bus to receive events from the partner, and then process them using AWS Events rules and targets.</p> <p>Partner event source names follow this format:</p> <p> <code> <i>partner_name</i>/<i>event_namespace</i>/<i>event_name</i> </code> </p> <p> <i>partner_name</i> is determined during partner registration and identifies the partner to AWS customers. <i>event_namespace</i> is determined by the partner and is a way for the partner to categorize their events. <i>event_name</i> is determined by the partner, and should uniquely identify an event-generating resource within the partner system. The combination of <i>event_namespace</i> and <i>event_name</i> should help AWS customers decide whether to create an event bus to receive these events.</p>"
     },
     "DeactivateEventSource":{
       "name":"DeactivateEventSource",
@@ -69,10 +70,11 @@
       "input":{"shape":"DeactivateEventSourceRequest"},
       "errors":[
         {"shape":"ResourceNotFoundException"},
+        {"shape":"ConcurrentModificationException"},
         {"shape":"InvalidStateException"},
         {"shape":"InternalException"}
       ],
-      "documentation":"<p>An AWS customer uses this operation to temporarily stop receiving events from the specified partner event source. The matching event bus isn't deleted. </p> <p>When you deactivate a partner event source, the source goes into <code>PENDING</code> state. If it remains in <code>PENDING</code> state for more than two weeks, it's deleted.</p> <p>To activate a deactivated partner event source, use <a>ActivateEventSource</a>.</p>"
+      "documentation":"<p>You can use this operation to temporarily stop receiving events from the specified partner event source. The matching event bus is not deleted. </p> <p>When you deactivate a partner event source, the source goes into PENDING state. If it remains in PENDING state for more than two weeks, it is deleted.</p> <p>To activate a deactivated partner event source, use <a>ActivateEventSource</a>.</p>"
     },
     "DeleteEventBus":{
       "name":"DeleteEventBus",
@@ -82,9 +84,10 @@
       },
       "input":{"shape":"DeleteEventBusRequest"},
       "errors":[
-        {"shape":"InternalException"}
+        {"shape":"InternalException"},
+        {"shape":"ConcurrentModificationException"}
       ],
-      "documentation":"<p>Deletes the specified custom event bus or partner event bus. All rules associated with this event bus are also deleted. You can't delete your account's default event bus.</p> <note> <p>This operation is performed by AWS customers, not by SaaS partners.</p> </note>"
+      "documentation":"<p>Deletes the specified custom event bus or partner event bus. All rules associated with this event bus need to be deleted. You can't delete your account's default event bus.</p>"
     },
     "DeletePartnerEventSource":{
       "name":"DeletePartnerEventSource",
@@ -94,9 +97,10 @@
       },
       "input":{"shape":"DeletePartnerEventSourceRequest"},
       "errors":[
-        {"shape":"InternalException"}
+        {"shape":"InternalException"},
+        {"shape":"ConcurrentModificationException"}
       ],
-      "documentation":"<p>This operation is used by SaaS partners to delete a partner event source. AWS customers don't use this operation.</p> <p>When you delete an event source, the status of the corresponding partner event bus in the AWS customer account becomes <code>DELETED</code>.</p>"
+      "documentation":"<p>This operation is used by SaaS partners to delete a partner event source. This operation is not used by AWS customers.</p> <p>When you delete an event source, the status of the corresponding partner event bus in the AWS customer account becomes DELETED.</p> <p/>"
     },
     "DeleteRule":{
       "name":"DeleteRule",
@@ -111,7 +115,7 @@
         {"shape":"InternalException"},
         {"shape":"ResourceNotFoundException"}
       ],
-      "documentation":"<p>Deletes the specified rule.</p> <p>Before you can delete the rule, you must remove all targets, using <a>RemoveTargets</a>.</p> <p>When you delete a rule, incoming events might continue to match to the deleted rule. Allow a short period of time for changes to take effect.</p> <p>Managed rules are rules created and managed by another AWS service on your behalf. These rules are created by those other AWS services to support functionality in those services. You can delete these rules using the <code>Force</code> option, but you should do so only if you're sure that the other service isn't still using that rule.</p>"
+      "documentation":"<p>Deletes the specified rule.</p> <p>Before you can delete the rule, you must remove all targets, using <a>RemoveTargets</a>.</p> <p>When you delete a rule, incoming events might continue to match to the deleted rule. Allow a short period of time for changes to take effect.</p> <p>Managed rules are rules created and managed by another AWS service on your behalf. These rules are created by those other AWS services to support functionality in those services. You can delete these rules using the <code>Force</code> option, but you should do so only if you are sure the other service is not still using that rule.</p>"
     },
     "DescribeEventBus":{
       "name":"DescribeEventBus",
@@ -139,7 +143,7 @@
         {"shape":"ResourceNotFoundException"},
         {"shape":"InternalException"}
       ],
-      "documentation":"<p>This operation lists details about a partner event source that is shared with your account.</p> <note> <p>This operation is run by AWS customers, not by SaaS partners.</p> </note>"
+      "documentation":"<p>This operation lists details about a partner event source that is shared with your account.</p>"
     },
     "DescribePartnerEventSource":{
       "name":"DescribePartnerEventSource",
@@ -153,7 +157,7 @@
         {"shape":"ResourceNotFoundException"},
         {"shape":"InternalException"}
       ],
-      "documentation":"<p>An SaaS partner can use this operation to list details about a partner event source that they have created.</p> <note> <p>AWS customers do not use this operation. Instead, AWS customers can use <a>DescribeEventSource</a> to see details about a partner event source that is shared with them.</p> </note>"
+      "documentation":"<p>An SaaS partner can use this operation to list details about a partner event source that they have created. AWS customers do not use this operation. Instead, AWS customers can use <a>DescribeEventSource</a> to see details about a partner event source that is shared with them.</p>"
     },
     "DescribeRule":{
       "name":"DescribeRule",
@@ -167,7 +171,7 @@
         {"shape":"ResourceNotFoundException"},
         {"shape":"InternalException"}
       ],
-      "documentation":"<p>Describes the specified rule.</p> <p> <code>DescribeRule</code> doesn't list the targets of a rule. To see the targets associated with a rule, use <a>ListTargetsByRule</a>.</p>"
+      "documentation":"<p>Describes the specified rule.</p> <p>DescribeRule does not list the targets of a rule. To see the targets associated with a rule, use <a>ListTargetsByRule</a>.</p>"
     },
     "DisableRule":{
       "name":"DisableRule",
@@ -182,7 +186,7 @@
         {"shape":"ManagedRuleException"},
         {"shape":"InternalException"}
       ],
-      "documentation":"<p>Disables the specified rule. A disabled rule won't match any events and won't self-trigger if it has a schedule expression.</p> <p>When you disable a rule, incoming events might continue to match to the disabled rule. Allow a short period of time for changes to take effect.</p>"
+      "documentation":"<p>Disables the specified rule. A disabled rule won't match any events, and won't self-trigger if it has a schedule expression.</p> <p>When you disable a rule, incoming events might continue to match to the disabled rule. Allow a short period of time for changes to take effect.</p>"
     },
     "EnableRule":{
       "name":"EnableRule",
@@ -197,7 +201,7 @@
         {"shape":"ManagedRuleException"},
         {"shape":"InternalException"}
       ],
-      "documentation":"<p>Enables the specified rule. If the rule doesn't exist, the operation fails.</p> <p>When you enable a rule, incoming events might not immediately start matching to a newly enabled rule. Allow a short period of time for changes to take effect.</p>"
+      "documentation":"<p>Enables the specified rule. If the rule does not exist, the operation fails.</p> <p>When you enable a rule, incoming events might not immediately start matching to a newly enabled rule. Allow a short period of time for changes to take effect.</p>"
     },
     "ListEventBuses":{
       "name":"ListEventBuses",
@@ -210,7 +214,7 @@
       "errors":[
         {"shape":"InternalException"}
       ],
-      "documentation":"<p>Lists all the event buses in your account, including the default event bus, custom event buses, and partner event buses.</p> <note> <p>This operation is run by AWS customers, not by SaaS partners.</p> </note>"
+      "documentation":"<p>Lists all the event buses in your account, including the default event bus, custom event buses, and partner event buses.</p>"
     },
     "ListEventSources":{
       "name":"ListEventSources",
@@ -223,7 +227,7 @@
       "errors":[
         {"shape":"InternalException"}
       ],
-      "documentation":"<p>You can use this to see all the partner event sources that have been shared with your AWS account. For more information about partner event sources, see <a>CreateEventBus</a>.</p> <note> <p>This operation is run by AWS customers, not by SaaS partners.</p> </note>"
+      "documentation":"<p>You can use this to see all the partner event sources that have been shared with your AWS account. For more information about partner event sources, see <a>CreateEventBus</a>.</p>"
     },
     "ListPartnerEventSourceAccounts":{
       "name":"ListPartnerEventSourceAccounts",
@@ -237,7 +241,7 @@
         {"shape":"ResourceNotFoundException"},
         {"shape":"InternalException"}
       ],
-      "documentation":"<p>An SaaS partner can use this operation to display the AWS account ID that a particular partner event source name is associated with.</p> <note> <p>This operation is used by SaaS partners, not by AWS customers.</p> </note>"
+      "documentation":"<p>An SaaS partner can use this operation to display the AWS account ID that a particular partner event source name is associated with. This operation is not used by AWS customers.</p>"
     },
     "ListPartnerEventSources":{
       "name":"ListPartnerEventSources",
@@ -250,7 +254,7 @@
       "errors":[
         {"shape":"InternalException"}
       ],
-      "documentation":"<p>An SaaS partner can use this operation to list all the partner event source names that they have created.</p> <note> <p>This operation is not used by AWS customers.</p> </note>"
+      "documentation":"<p>An SaaS partner can use this operation to list all the partner event source names that they have created. This operation is not used by AWS customers.</p>"
     },
     "ListRuleNamesByTarget":{
       "name":"ListRuleNamesByTarget",
@@ -264,7 +268,7 @@
         {"shape":"InternalException"},
         {"shape":"ResourceNotFoundException"}
       ],
-      "documentation":"<p>Lists the rules for the specified target. You can see which rules can invoke a specific target in your account.</p>"
+      "documentation":"<p>Lists the rules for the specified target. You can see which of the rules in Amazon EventBridge can invoke a specific target in your account.</p>"
     },
     "ListRules":{
       "name":"ListRules",
@@ -278,7 +282,7 @@
         {"shape":"InternalException"},
         {"shape":"ResourceNotFoundException"}
       ],
-      "documentation":"<p>Lists your EventBridge rules. You can either list all the rules or provide a prefix to match to the rule names.</p> <p> <code>ListRules</code> doesn't list the targets of a rule. To see the targets associated with a rule, use <a>ListTargetsByRule</a>.</p>"
+      "documentation":"<p>Lists your Amazon EventBridge rules. You can either list all the rules or you can provide a prefix to match to the rule names.</p> <p>ListRules does not list the targets of a rule. To see the targets associated with a rule, use <a>ListTargetsByRule</a>.</p>"
     },
     "ListTagsForResource":{
       "name":"ListTagsForResource",
@@ -292,7 +296,7 @@
         {"shape":"ResourceNotFoundException"},
         {"shape":"InternalException"}
       ],
-      "documentation":"<p>Displays the tags associated with an EventBridge resource. In EventBridge, rules can be tagged.</p>"
+      "documentation":"<p>Displays the tags associated with an EventBridge resource. In EventBridge, rules and event buses can be tagged.</p>"
     },
     "ListTargetsByRule":{
       "name":"ListTargetsByRule",
@@ -319,7 +323,7 @@
       "errors":[
         {"shape":"InternalException"}
       ],
-      "documentation":"<p>Sends custom events to EventBridge so that they can be matched to rules. These events can be from your custom applications and services.</p>"
+      "documentation":"<p>Sends custom events to Amazon EventBridge so that they can be matched to rules.</p>"
     },
     "PutPartnerEvents":{
       "name":"PutPartnerEvents",
@@ -332,7 +336,7 @@
       "errors":[
         {"shape":"InternalException"}
       ],
-      "documentation":"<p>This is used by SaaS partners to write events to a customer's partner event bus.</p> <note> <p>AWS customers do not use this operation. Instead, AWS customers can use <a>PutEvents</a> to write custom events from their own applications to an event bus.</p> </note>"
+      "documentation":"<p>This is used by SaaS partners to write events to a customer's partner event bus. AWS customers do not use this operation.</p>"
     },
     "PutPermission":{
       "name":"PutPermission",
@@ -347,7 +351,7 @@
         {"shape":"InternalException"},
         {"shape":"ConcurrentModificationException"}
       ],
-      "documentation":"<p>Running <code>PutPermission</code> permits the specified AWS account or AWS organization to put events to the specified <i>event bus</i>. Rules in your account are triggered by these events arriving to an event bus in your account. </p> <p>For another account to send events to your account, that external account must have a rule with your account's event bus as a target.</p> <p>To enable multiple AWS accounts to put events to an event bus, run <code>PutPermission</code> once for each of these accounts. Or, if all the accounts are members of the same AWS organization, you can run <code>PutPermission</code> once specifying <code>Principal</code> as \"*\" and specifying the AWS organization ID in <code>Condition</code>, to grant permissions to all accounts in that organization.</p> <p>If you grant permissions using an organization, then accounts in that organization must specify a <code>RoleArn</code> with proper permissions when they use <code>PutTarget</code> to add your account's event bus as a target. For more information, see <a href=\"https://docs.aws.amazon.com/eventbridge/latest/userguide/eventbridge-cross-account-event-delivery.html\">Sending and Receiving Events Between AWS Accounts</a> in the <i>Amazon EventBridge User Guide</i>.</p> <p>The permission policy on an event bus can't exceed 10 KB in size.</p>"
+      "documentation":"<p>Running <code>PutPermission</code> permits the specified AWS account or AWS organization to put events to the specified <i>event bus</i>. CloudWatch Events rules in your account are triggered by these events arriving to an event bus in your account. </p> <p>For another account to send events to your account, that external account must have an EventBridge rule with your account's event bus as a target.</p> <p>To enable multiple AWS accounts to put events to your event bus, run <code>PutPermission</code> once for each of these accounts. Or, if all the accounts are members of the same AWS organization, you can run <code>PutPermission</code> once specifying <code>Principal</code> as \"*\" and specifying the AWS organization ID in <code>Condition</code>, to grant permissions to all accounts in that organization.</p> <p>If you grant permissions using an organization, then accounts in that organization must specify a <code>RoleArn</code> with proper permissions when they use <code>PutTarget</code> to add your account's event bus as a target. For more information, see <a href=\"https://docs.aws.amazon.com/eventbridge/latest/userguide/eventbridge-cross-account-event-delivery.html\">Sending and Receiving Events Between AWS Accounts</a> in the <i>Amazon EventBridge User Guide</i>.</p> <p>The permission policy on the default event bus cannot exceed 10 KB in size.</p>"
     },
     "PutRule":{
       "name":"PutRule",
@@ -365,7 +369,7 @@
         {"shape":"InternalException"},
         {"shape":"ResourceNotFoundException"}
       ],
-      "documentation":"<p>Creates or updates the specified rule. Rules are enabled by default or based on value of the state. You can disable a rule using <a>DisableRule</a>.</p> <p>A single rule watches for events from a single event bus. Events generated by AWS services go to your account's default event bus. Events generated by SaaS partner services or applications go to the matching partner event bus. If you have custom applications or services, you can specify whether their events go to your default event bus or a custom event bus that you have created. For more information, see <a>CreateEventBus</a>.</p> <p>If you're updating an existing rule, the rule is replaced with what you specify in this <code>PutRule</code> command. If you omit arguments in <code>PutRule</code>, the old values for those arguments aren't kept. Instead, they're replaced with null values.</p> <p>When you create or update a rule, incoming events might not immediately start matching to new or updated rules. Allow a short period of time for changes to take effect.</p> <p>A rule must contain at least an <code>EventPattern</code> or <code>ScheduleExpression</code>. Rules with <code>EventPatterns</code> are triggered when a matching event is observed. Rules with <code>ScheduleExpressions</code> self-trigger based on the given schedule. A rule can have both an <code>EventPattern</code> and a <code>ScheduleExpression</code>, in which case the rule triggers on matching events as well as on a schedule.</p> <p>When you initially create a rule, you can optionally assign one or more tags to the rule. Tags can help you organize and categorize your resources. You can also use them to scope user permissions, by granting a user permission to access or change only rules with certain tag values. To use the <code>PutRule</code> operation and assign tags, you must have both the <code>events:PutRule</code> and <code>events:TagResource</code> permissions.</p> <p>If you are updating an existing rule, any tags you specify in the <code>PutRule</code> operation are ignored. To update the tags of an existing rule, use <a>TagResource</a> and <a>UntagResource</a>.</p> <p>Most services in AWS treat <code>:</code> or <code>/</code> as the same character in Amazon Resource Names (ARNs). However, EventBridge uses an exact match in event patterns and rules. Be sure to use the correct ARN characters when creating event patterns so that they match the ARN syntax in the event that you want to match.</p> <p>In EventBridge, you could create rules that lead to infinite loops, where a rule is fired repeatedly. For example, a rule might detect that ACLs have changed on an S3 bucket, and trigger software to change them to the desired state. If you don't write the rule carefully, the subsequent change to the ACLs fires the rule again, creating an infinite loop.</p> <p>To prevent this, write the rules so that the triggered actions don't refire the same rule. For example, your rule could fire only if ACLs are found to be in a bad state, instead of after any change. </p> <p>An infinite loop can quickly cause higher than expected charges. We recommend that you use budgeting, which alerts you when charges exceed your specified limit. For more information, see <a href=\"https://docs.aws.amazon.com/awsaccountbilling/latest/aboutv2/budgets-managing-costs.html\">Managing Your Costs with Budgets</a>.</p>"
+      "documentation":"<p>Creates or updates the specified rule. Rules are enabled by default, or based on value of the state. You can disable a rule using <a>DisableRule</a>.</p> <p>A single rule watches for events from a single event bus. Events generated by AWS services go to your account's default event bus. Events generated by SaaS partner services or applications go to the matching partner event bus. If you have custom applications or services, you can specify whether their events go to your default event bus or a custom event bus that you have created. For more information, see <a>CreateEventBus</a>.</p> <p>If you are updating an existing rule, the rule is replaced with what you specify in this <code>PutRule</code> command. If you omit arguments in <code>PutRule</code>, the old values for those arguments are not kept. Instead, they are replaced with null values.</p> <p>When you create or update a rule, incoming events might not immediately start matching to new or updated rules. Allow a short period of time for changes to take effect.</p> <p>A rule must contain at least an EventPattern or ScheduleExpression. Rules with EventPatterns are triggered when a matching event is observed. Rules with ScheduleExpressions self-trigger based on the given schedule. A rule can have both an EventPattern and a ScheduleExpression, in which case the rule triggers on matching events as well as on a schedule.</p> <p>When you initially create a rule, you can optionally assign one or more tags to the rule. Tags can help you organize and categorize your resources. You can also use them to scope user permissions, by granting a user permission to access or change only rules with certain tag values. To use the <code>PutRule</code> operation and assign tags, you must have both the <code>events:PutRule</code> and <code>events:TagResource</code> permissions.</p> <p>If you are updating an existing rule, any tags you specify in the <code>PutRule</code> operation are ignored. To update the tags of an existing rule, use <a>TagResource</a> and <a>UntagResource</a>.</p> <p>Most services in AWS treat : or / as the same character in Amazon Resource Names (ARNs). However, EventBridge uses an exact match in event patterns and rules. Be sure to use the correct ARN characters when creating event patterns so that they match the ARN syntax in the event you want to match.</p> <p>In EventBridge, it is possible to create rules that lead to infinite loops, where a rule is fired repeatedly. For example, a rule might detect that ACLs have changed on an S3 bucket, and trigger software to change them to the desired state. If the rule is not written carefully, the subsequent change to the ACLs fires the rule again, creating an infinite loop.</p> <p>To prevent this, write the rules so that the triggered actions do not re-fire the same rule. For example, your rule could fire only if ACLs are found to be in a bad state, instead of after any change. </p> <p>An infinite loop can quickly cause higher than expected charges. We recommend that you use budgeting, which alerts you when charges exceed your specified limit. For more information, see <a href=\"https://docs.aws.amazon.com/awsaccountbilling/latest/aboutv2/budgets-managing-costs.html\">Managing Your Costs with Budgets</a>.</p>"
     },
     "PutTargets":{
       "name":"PutTargets",
@@ -382,7 +386,7 @@
         {"shape":"ManagedRuleException"},
         {"shape":"InternalException"}
       ],
-      "documentation":"<p>Adds the specified targets to the specified rule, or updates the targets if they're already associated with the rule.</p> <p>Targets are the resources that are invoked when a rule is triggered.</p> <p>You can configure the following as targets in EventBridge:</p> <ul> <li> <p>EC2 instances</p> </li> <li> <p>SSM Run Command</p> </li> <li> <p>SSM Automation</p> </li> <li> <p>AWS Lambda functions</p> </li> <li> <p>Data streams in Amazon Kinesis Data Streams</p> </li> <li> <p>Data delivery streams in Amazon Kinesis Data Firehose</p> </li> <li> <p>Amazon ECS tasks</p> </li> <li> <p>AWS Step Functions state machines</p> </li> <li> <p>AWS Batch jobs</p> </li> <li> <p>AWS CodeBuild projects</p> </li> <li> <p>Pipelines in AWS CodePipeline</p> </li> <li> <p>Amazon Inspector assessment templates</p> </li> <li> <p>Amazon SNS topics</p> </li> <li> <p>Amazon SQS queues, including FIFO queues</p> </li> <li> <p>The default event bus of another AWS account</p> </li> </ul> <p>Creating rules with built-in targets is supported only on the AWS Management Console. The built-in targets are <code>EC2 CreateSnapshot API call</code>, <code>EC2 RebootInstances API call</code>, <code>EC2 StopInstances API call</code>, and <code>EC2 TerminateInstances API call</code>. </p> <p>For some target types, <code>PutTargets</code> provides target-specific parameters. If the target is a Kinesis data stream, you can optionally specify which shard the event goes to by using the <code>KinesisParameters</code> argument. To invoke a command on multiple EC2 instances with one rule, you can use the <code>RunCommandParameters</code> field.</p> <p>To be able to make API calls against the resources that you own, Amazon EventBridge needs the appropriate permissions. For AWS Lambda and Amazon SNS resources, EventBridge relies on resource-based policies. For EC2 instances, Kinesis data streams, and AWS Step Functions state machines, EventBridge relies on IAM roles that you specify in the <code>RoleARN</code> argument in <code>PutTargets</code>. For more information, see <a href=\"https://docs.aws.amazon.com/eventbridge/latest/userguide/auth-and-access-control-eventbridge.html\">Authentication and Access Control</a> in the <i>Amazon EventBridge User Guide</i>.</p> <p>If another AWS account is in the same Region and has granted you permission (using <code>PutPermission</code>), you can send events to that account. Set that account's event bus as a target of the rules in your account. To send the matched events to the other account, specify that account's event bus as the <code>Arn</code> value when you run <code>PutTargets</code>. If your account sends events to another account, your account is charged for each sent event. Each event sent to another account is charged as a custom event. The account receiving the event isn't charged. For more information, see <a href=\"https://aws.amazon.com/eventbridge/pricing/\">Amazon EventBridge Pricing</a>.</p> <p>If you're setting an event bus in another account as the target and that account granted permission to your account through an organization instead of directly by the account ID, you must specify a <code>RoleArn</code> with proper permissions in the <code>Target</code> structure. For more information, see <a href=\"https://docs.aws.amazon.com/eventbridge/latest/userguide/eventbridge-cross-account-event-delivery.html\">Sending and Receiving Events Between AWS Accounts</a> in the <i>Amazon EventBridge User Guide</i>.</p> <p>For more information about enabling cross-account events, see <a>PutPermission</a>.</p> <p> <code>Input</code>, <code>InputPath</code>, and <code>InputTransformer</code> are mutually exclusive and optional parameters of a target. When a rule is triggered due to a matched event:</p> <ul> <li> <p>If none of the following arguments are specified for a target, the entire event is passed to the target in JSON format (unless the target is Amazon EC2 Run Command or Amazon ECS task, in which case nothing from the event is passed to the target).</p> </li> <li> <p>If <code>Input</code> is specified in the form of valid JSON, then the matched event is overridden with this constant.</p> </li> <li> <p>If <code>InputPath</code> is specified in the form of JSONPath (for example, <code>$.detail</code>), only the part of the event specified in the path is passed to the target (for example, only the detail part of the event is passed).</p> </li> <li> <p>If <code>InputTransformer</code> is specified, one or more specified JSONPaths are extracted from the event and used as values in a template that you specify as the input to the target.</p> </li> </ul> <p>When you specify <code>InputPath</code> or <code>InputTransformer</code>, you must use JSON dot notation, not bracket notation.</p> <p>When you add targets to a rule and the associated rule triggers soon after, new or updated targets might not be immediately invoked. Allow a short period of time for changes to take effect.</p> <p>This action can partially fail if too many requests are made at the same time. If that happens, <code>FailedEntryCount</code> is nonzero in the response, and each entry in <code>FailedEntries</code> provides the ID of the failed target and the error code.</p>"
+      "documentation":"<p>Adds the specified targets to the specified rule, or updates the targets if they are already associated with the rule.</p> <p>Targets are the resources that are invoked when a rule is triggered.</p> <p>You can configure the following as targets for Events:</p> <ul> <li> <p>EC2 instances</p> </li> <li> <p>SSM Run Command</p> </li> <li> <p>SSM Automation</p> </li> <li> <p>AWS Lambda functions</p> </li> <li> <p>Data streams in Amazon Kinesis Data Streams</p> </li> <li> <p>Data delivery streams in Amazon Kinesis Data Firehose</p> </li> <li> <p>Amazon ECS tasks</p> </li> <li> <p>AWS Step Functions state machines</p> </li> <li> <p>AWS Batch jobs</p> </li> <li> <p>AWS CodeBuild projects</p> </li> <li> <p>Pipelines in AWS CodePipeline</p> </li> <li> <p>Amazon Inspector assessment templates</p> </li> <li> <p>Amazon SNS topics</p> </li> <li> <p>Amazon SQS queues, including FIFO queues</p> </li> <li> <p>The default event bus of another AWS account</p> </li> </ul> <p>Creating rules with built-in targets is supported only in the AWS Management Console. The built-in targets are <code>EC2 CreateSnapshot API call</code>, <code>EC2 RebootInstances API call</code>, <code>EC2 StopInstances API call</code>, and <code>EC2 TerminateInstances API call</code>. </p> <p>For some target types, <code>PutTargets</code> provides target-specific parameters. If the target is a Kinesis data stream, you can optionally specify which shard the event goes to by using the <code>KinesisParameters</code> argument. To invoke a command on multiple EC2 instances with one rule, you can use the <code>RunCommandParameters</code> field.</p> <p>To be able to make API calls against the resources that you own, Amazon CloudWatch Events needs the appropriate permissions. For AWS Lambda and Amazon SNS resources, EventBridge relies on resource-based policies. For EC2 instances, Kinesis data streams, and AWS Step Functions state machines, EventBridge relies on IAM roles that you specify in the <code>RoleARN</code> argument in <code>PutTargets</code>. For more information, see <a href=\"https://docs.aws.amazon.com/eventbridge/latest/userguide/auth-and-access-control-eventbridge.html\">Authentication and Access Control</a> in the <i>Amazon EventBridge User Guide</i>.</p> <p>If another AWS account is in the same region and has granted you permission (using <code>PutPermission</code>), you can send events to that account. Set that account's event bus as a target of the rules in your account. To send the matched events to the other account, specify that account's event bus as the <code>Arn</code> value when you run <code>PutTargets</code>. If your account sends events to another account, your account is charged for each sent event. Each event sent to another account is charged as a custom event. The account receiving the event is not charged. For more information, see <a href=\"https://aws.amazon.com/cloudwatch/pricing/\">Amazon CloudWatch Pricing</a>.</p> <note> <p> <code>Input</code>, <code>InputPath</code>, and <code>InputTransformer</code> are not available with <code>PutTarget</code> if the target is an event bus of a different AWS account.</p> </note> <p>If you are setting the event bus of another account as the target, and that account granted permission to your account through an organization instead of directly by the account ID, then you must specify a <code>RoleArn</code> with proper permissions in the <code>Target</code> structure. For more information, see <a href=\"https://docs.aws.amazon.com/eventbridge/latest/userguide/eventbridge-cross-account-event-delivery.html\">Sending and Receiving Events Between AWS Accounts</a> in the <i>Amazon EventBridge User Guide</i>.</p> <p>For more information about enabling cross-account events, see <a>PutPermission</a>.</p> <p> <b>Input</b>, <b>InputPath</b>, and <b>InputTransformer</b> are mutually exclusive and optional parameters of a target. When a rule is triggered due to a matched event:</p> <ul> <li> <p>If none of the following arguments are specified for a target, then the entire event is passed to the target in JSON format (unless the target is Amazon EC2 Run Command or Amazon ECS task, in which case nothing from the event is passed to the target).</p> </li> <li> <p>If <b>Input</b> is specified in the form of valid JSON, then the matched event is overridden with this constant.</p> </li> <li> <p>If <b>InputPath</b> is specified in the form of JSONPath (for example, <code>$.detail</code>), then only the part of the event specified in the path is passed to the target (for example, only the detail part of the event is passed).</p> </li> <li> <p>If <b>InputTransformer</b> is specified, then one or more specified JSONPaths are extracted from the event and used as values in a template that you specify as the input to the target.</p> </li> </ul> <p>When you specify <code>InputPath</code> or <code>InputTransformer</code>, you must use JSON dot notation, not bracket notation.</p> <p>When you add targets to a rule and the associated rule triggers soon after, new or updated targets might not be immediately invoked. Allow a short period of time for changes to take effect.</p> <p>This action can partially fail if too many requests are made at the same time. If that happens, <code>FailedEntryCount</code> is non-zero in the response and each entry in <code>FailedEntries</code> provides the ID of the failed target and the error code.</p>"
     },
     "RemovePermission":{
       "name":"RemovePermission",
@@ -428,7 +432,7 @@
         {"shape":"InternalException"},
         {"shape":"ManagedRuleException"}
       ],
-      "documentation":"<p>Assigns one or more tags (key-value pairs) to the specified EventBridge resource. Tags can help you organize and categorize your resources. You can also use them to scope user permissions by granting a user permission to access or change only resources with certain tag values. In EventBridge, rules can be tagged.</p> <p>Tags don't have any semantic meaning to AWS and are interpreted strictly as strings of characters.</p> <p>You can use the <code>TagResource</code> action with a rule that already has tags. If you specify a new tag key for the rule, this tag is appended to the list of tags associated with the rule. If you specify a tag key that is already associated with the rule, the new tag value that you specify replaces the previous value for that tag.</p> <p>You can associate as many as 50 tags with a resource.</p>"
+      "documentation":"<p>Assigns one or more tags (key-value pairs) to the specified EventBridge resource. Tags can help you organize and categorize your resources. You can also use them to scope user permissions by granting a user permission to access or change only resources with certain tag values. In EventBridge, rules and event buses can be tagged.</p> <p>Tags don't have any semantic meaning to AWS and are interpreted strictly as strings of characters.</p> <p>You can use the <code>TagResource</code> action with a resource that already has tags. If you specify a new tag key, this tag is appended to the list of tags associated with the resource. If you specify a tag key that is already associated with the resource, the new tag value that you specify replaces the previous value for that tag.</p> <p>You can associate as many as 50 tags with a resource.</p>"
     },
     "TestEventPattern":{
       "name":"TestEventPattern",
@@ -442,7 +446,7 @@
         {"shape":"InvalidEventPatternException"},
         {"shape":"InternalException"}
       ],
-      "documentation":"<p>Tests whether the specified event pattern matches the provided event.</p> <p>Most services in AWS treat <code>:</code> or <code>/</code> as the same character in Amazon Resource Names (ARNs). However, EventBridge uses an exact match in event patterns and rules. Be sure to use the correct ARN characters when creating event patterns so that they match the ARN syntax in the event that you want to match.</p>"
+      "documentation":"<p>Tests whether the specified event pattern matches the provided event.</p> <p>Most services in AWS treat : or / as the same character in Amazon Resource Names (ARNs). However, EventBridge uses an exact match in event patterns and rules. Be sure to use the correct ARN characters when creating event patterns so that they match the ARN syntax in the event you want to match.</p>"
     },
     "UntagResource":{
       "name":"UntagResource",
@@ -458,7 +462,7 @@
         {"shape":"ConcurrentModificationException"},
         {"shape":"ManagedRuleException"}
       ],
-      "documentation":"<p>Removes one or more tags from the specified EventBridge resource. In EventBridge, rules can be tagged.</p>"
+      "documentation":"<p>Removes one or more tags from the specified EventBridge resource. In CloudWatch Events, rules and event buses can be tagged.</p>"
     }
   },
   "shapes":{
@@ -506,14 +510,14 @@
         },
         "SecurityGroups":{
           "shape":"StringList",
-          "documentation":"<p>Specifies the security groups associated with the task. These security groups must all be in the same VPC. You can specify as many as five security groups. If you don't specify a security group, the default security group for the VPC is used.</p>"
+          "documentation":"<p>Specifies the security groups associated with the task. These security groups must all be in the same VPC. You can specify as many as five security groups. If you do not specify a security group, the default security group for the VPC is used.</p>"
         },
         "AssignPublicIp":{
           "shape":"AssignPublicIp",
           "documentation":"<p>Specifies whether the task's elastic network interface receives a public IP address. You can specify <code>ENABLED</code> only when <code>LaunchType</code> in <code>EcsParameters</code> is set to <code>FARGATE</code>.</p>"
         }
       },
-      "documentation":"<p>This structure specifies the VPC subnets and security groups for the task and whether a public IP address is to be used. This structure is relevant only for ECS tasks that use the <code>awsvpc</code> network mode.</p>"
+      "documentation":"<p>This structure specifies the VPC subnets and security groups for the task, and whether a public IP address is to be used. This structure is relevant only for ECS tasks that use the <code>awsvpc</code> network mode.</p>"
     },
     "BatchArrayProperties":{
       "type":"structure",
@@ -546,7 +550,7 @@
         },
         "RetryStrategy":{
           "shape":"BatchRetryStrategy",
-          "documentation":"<p>The retry strategy to use for failed jobs if the target is an AWS Batch job. The retry strategy is the number of times to retry the failed job execution. Valid values are 1–10. When you specify a retry strategy here, it overrides the retry strategy defined in the job definition.</p>"
+          "documentation":"<p>The retry strategy to use for failed jobs, if the target is an AWS Batch job. The retry strategy is the number of times to retry the failed job execution. Valid values are 1–10. When you specify a retry strategy here, it overrides the retry strategy defined in the job definition.</p>"
         }
       },
       "documentation":"<p>The custom parameters to be used when the target is an AWS Batch job.</p>"
@@ -559,14 +563,14 @@
           "documentation":"<p>The number of times to attempt to retry, if the job fails. Valid values are 1–10.</p>"
         }
       },
-      "documentation":"<p>The retry strategy to use for failed jobs if the target is an AWS Batch job. If you specify a retry strategy here, it overrides the retry strategy defined in the job definition.</p>"
+      "documentation":"<p>The retry strategy to use for failed jobs, if the target is an AWS Batch job. If you specify a retry strategy here, it overrides the retry strategy defined in the job definition.</p>"
     },
     "Boolean":{"type":"boolean"},
     "ConcurrentModificationException":{
       "type":"structure",
       "members":{
       },
-      "documentation":"<p>There is concurrent modification on a resource.</p>",
+      "documentation":"<p>There is concurrent modification on a rule or target.</p>",
       "exception":true
     },
     "Condition":{
@@ -579,18 +583,18 @@
       "members":{
         "Type":{
           "shape":"String",
-          "documentation":"<p>The type of condition. Currently, the only supported value is <code>StringEquals</code>.</p>"
+          "documentation":"<p>Specifies the type of condition. Currently the only supported value is <code>StringEquals</code>.</p>"
         },
         "Key":{
           "shape":"String",
-          "documentation":"<p>The key for the condition. Currently, the only supported key is <code>aws:PrincipalOrgID</code>.</p>"
+          "documentation":"<p>Specifies the key for the condition. Currently the only supported key is <code>aws:PrincipalOrgID</code>.</p>"
         },
         "Value":{
           "shape":"String",
-          "documentation":"<p>The value for the key. Currently, this must be the ID of the organization.</p>"
+          "documentation":"<p>Specifies the value for the key. Currently, this must be the ID of the organization.</p>"
         }
       },
-      "documentation":"<p>A JSON string that you can use to limit the event bus permissions that you're granting to only accounts that fulfill the condition. Currently, the only supported condition is membership in a certain AWS organization. The string must contain <code>Type</code>, <code>Key</code>, and <code>Value</code> fields. The <code>Value</code> field specifies the ID of the AWS organization. The following is an example value for <code>Condition</code>:</p> <p> <code>'{\"Type\" : \"StringEquals\", \"Key\": \"aws:PrincipalOrgID\", \"Value\": \"o-1234567890\"}'</code> </p>"
+      "documentation":"<p>A JSON string which you can use to limit the event bus permissions you are granting to only accounts that fulfill the condition. Currently, the only supported condition is membership in a certain AWS organization. The string must contain <code>Type</code>, <code>Key</code>, and <code>Value</code> fields. The <code>Value</code> field specifies the ID of the AWS organization. Following is an example value for <code>Condition</code>:</p> <p> <code>'{\"Type\" : \"StringEquals\", \"Key\": \"aws:PrincipalOrgID\", \"Value\": \"o-1234567890\"}'</code> </p>"
     },
     "CreateEventBusRequest":{
       "type":"structure",
@@ -598,11 +602,15 @@
       "members":{
         "Name":{
           "shape":"EventBusName",
-          "documentation":"<p>The name of the new event bus. </p> <p>The names of custom event buses can't contain the <code>/</code> character. You can't use the name <code>default</code> for a custom event bus because this name is already used for your account's default event bus.</p> <p>If this is a partner event bus, the name must exactly match the name of the partner event source that this event bus is matched to. This name will include the <code>/</code> character.</p>"
+          "documentation":"<p>The name of the new event bus. </p> <p>Event bus names cannot contain the / character. You can't use the name <code>default</code> for a custom event bus, as this name is already used for your account's default event bus.</p> <p>If this is a partner event bus, the name must exactly match the name of the partner event source that this event bus is matched to.</p>"
         },
         "EventSourceName":{
           "shape":"EventSourceName",
-          "documentation":"<p>If you're creating a partner event bus, this specifies the partner event source that the new event bus will be matched with.</p>"
+          "documentation":"<p>If you are creating a partner event bus, this specifies the partner event source that the new event bus will be matched with.</p>"
+        },
+        "Tags":{
+          "shape":"TagList",
+          "documentation":"<p>Tags to associate with the event bus.</p>"
         }
       }
     },
@@ -628,7 +636,7 @@
         },
         "Account":{
           "shape":"AccountId",
-          "documentation":"<p>The AWS account ID of the customer who is permitted to create a matching partner event bus for this partner event source.</p>"
+          "documentation":"<p>The AWS account ID that is permitted to create a matching partner event bus for this partner event source.</p>"
         }
       }
     },
@@ -749,7 +757,7 @@
         },
         "ExpirationTime":{
           "shape":"Timestamp",
-          "documentation":"<p>The date and time that the event source will expire if you don't create a matching event bus.</p>"
+          "documentation":"<p>The date and time that the event source will expire if you do not create a matching event bus.</p>"
         },
         "Name":{
           "shape":"String",
@@ -757,7 +765,7 @@
         },
         "State":{
           "shape":"EventSourceState",
-          "documentation":"<p>The state of the event source. If it's <code>ACTIVE</code>, you have already created a matching event bus for this event source, and that event bus is active. If it's <code>PENDING</code>, either you haven't yet created a matching event bus, or that event bus is deactivated. If it's <code>DELETED</code>, you have created a matching event bus, but the event source has since been deleted.</p>"
+          "documentation":"<p>The state of the event source. If it is ACTIVE, you have already created a matching event bus for this event source, and that event bus is active. If it is PENDING, either you haven't yet created a matching event bus, or that event bus is deactivated. If it is DELETED, you have created a matching event bus, but the event source has since been deleted.</p>"
         }
       }
     },
@@ -811,11 +819,11 @@
         },
         "EventPattern":{
           "shape":"EventPattern",
-          "documentation":"<p>The event pattern. For more information, see <a href=\"https://docs.aws.amazon.com/eventbridge/latest/userguide/eventbridge-and-event-patterns.html\">Event Patterns</a> in the <i>Amazon EventBridge User Guide</i>.</p>"
+          "documentation":"<p>The event pattern. For more information, see <a href=\"https://docs.aws.amazon.com/eventbridge/latest/userguide/eventbridge-and-event-patterns.html\">Events and Event Patterns</a> in the <i>Amazon EventBridge User Guide</i>.</p>"
         },
         "ScheduleExpression":{
           "shape":"ScheduleExpression",
-          "documentation":"<p>The scheduling expression: for example, <code>\"cron(0 20 * * ? *)\"</code> or <code>\"rate(5 minutes)\"</code>.</p>"
+          "documentation":"<p>The scheduling expression. For example, \"cron(0 20 * * ? *)\", \"rate(5 minutes)\".</p>"
         },
         "State":{
           "shape":"RuleState",
@@ -871,7 +879,7 @@
         },
         "NetworkConfiguration":{
           "shape":"NetworkConfiguration",
-          "documentation":"<p>Use this structure if the ECS task uses the <code>awsvpc</code> network mode. This structure specifies the VPC subnets and security groups associated with the task and whether a public IP address is to be used. This structure is required if <code>LaunchType</code> is <code>FARGATE</code> because the <code>awsvpc</code> mode is required for Fargate tasks.</p> <p>If you specify <code>NetworkConfiguration</code> when the target ECS task doesn't use the <code>awsvpc</code> network mode, the task fails.</p>"
+          "documentation":"<p>Use this structure if the ECS task uses the <code>awsvpc</code> network mode. This structure specifies the VPC subnets and security groups associated with the task, and whether a public IP address is to be used. This structure is required if <code>LaunchType</code> is <code>FARGATE</code> because the <code>awsvpc</code> mode is required for Fargate tasks.</p> <p>If you specify <code>NetworkConfiguration</code> when the target ECS task does not use the <code>awsvpc</code> network mode, the task fails.</p>"
         },
         "PlatformVersion":{
           "shape":"String",
@@ -948,11 +956,11 @@
         },
         "CreationTime":{
           "shape":"Timestamp",
-          "documentation":"<p>The date and time when the event source was created.</p>"
+          "documentation":"<p>The date and time the event source was created.</p>"
         },
         "ExpirationTime":{
           "shape":"Timestamp",
-          "documentation":"<p>The date and time when the event source will expire if the AWS account doesn't create a matching event bus for it.</p>"
+          "documentation":"<p>The date and time that the event source will expire, if the AWS account doesn't create a matching event bus for it.</p>"
         },
         "Name":{
           "shape":"String",
@@ -960,7 +968,7 @@
         },
         "State":{
           "shape":"EventSourceState",
-          "documentation":"<p>The state of the event source. If it's <code>ACTIVE</code>, you have already created a matching event bus for this event source, and that event bus is active. If it's <code>PENDING</code>, either you haven't yet created a matching event bus, or that event bus is deactivated. If it's <code>DELETED</code>, you have created a matching event bus, but the event source has since been deleted.</p>"
+          "documentation":"<p>The state of the event source. If it is ACTIVE, you have already created a matching event bus for this event source, and that event bus is active. If it is PENDING, either you haven't yet created a matching event bus, or that event bus is deactivated. If it is DELETED, you have created a matching event bus, but the event source has since been deleted.</p>"
         }
       },
       "documentation":"<p>A partner event source is created by an SaaS partner. If a customer creates a partner event bus that matches this event source, that AWS account can receive events from the partner's applications or services.</p>"
@@ -996,11 +1004,11 @@
       "members":{
         "InputPathsMap":{
           "shape":"TransformerPaths",
-          "documentation":"<p>Map of JSON paths to be extracted from the event. You can then insert these in the template in <code>InputTemplate</code> to produce the output to be sent to the target.</p> <p> <code>InputPathsMap</code> is an array key-value pairs, where each value is a valid JSON path. You can have as many as 10 key-value pairs. You must use JSON dot notation, not bracket notation.</p> <p>The keys can't start with <code>\"AWS\"</code>.</p>"
+          "documentation":"<p>Map of JSON paths to be extracted from the event. You can then insert these in the template in <code>InputTemplate</code> to produce the output you want to be sent to the target.</p> <p> <code>InputPathsMap</code> is an array key-value pairs, where each value is a valid JSON path. You can have as many as 10 key-value pairs. You must use JSON dot notation, not bracket notation.</p> <p>The keys cannot start with \"AWS.\" </p>"
         },
         "InputTemplate":{
           "shape":"TransformerInput",
-          "documentation":"<p>Input template where you specify placeholders that will be filled with the values of the keys from <code>InputPathsMap</code> to customize the data sent to the target. Enclose each <code>InputPathsMaps</code> value in brackets: &lt;<i>value</i>&gt;. The InputTemplate must be valid JSON.</p> <p>If <code>InputTemplate</code> is a JSON object (surrounded by curly braces), the following restrictions apply:</p> <ul> <li> <p>The placeholder can't be used as an object key</p> </li> <li> <p>Object values can't include quote marks</p> </li> </ul> <p>The following example shows the syntax for using <code>InputPathsMap</code> and <code>InputTemplate</code>.</p> <p> <code> \"InputTransformer\":</code> </p> <p> <code>{</code> </p> <p> <code>\"InputPathsMap\": {\"instance\": \"$.detail.instance\",\"status\": \"$.detail.status\"},</code> </p> <p> <code>\"InputTemplate\": \"&lt;instance&gt; is in state &lt;status&gt;\"</code> </p> <p> <code>}</code> </p> <p>To have the <code>InputTemplate</code> include quote marks within a JSON string, escape each quote marks with a slash, as in the following example:</p> <p> <code> \"InputTransformer\":</code> </p> <p> <code>{</code> </p> <p> <code>\"InputPathsMap\": {\"instance\": \"$.detail.instance\",\"status\": \"$.detail.status\"},</code> </p> <p> <code>\"InputTemplate\": \"&lt;instance&gt; is in state \\\"&lt;status&gt;\\\"\"</code> </p> <p> <code>}</code> </p>"
+          "documentation":"<p>Input template where you specify placeholders that will be filled with the values of the keys from <code>InputPathsMap</code> to customize the data sent to the target. Enclose each <code>InputPathsMaps</code> value in brackets: &lt;<i>value</i>&gt; The InputTemplate must be valid JSON.</p> <p>If <code>InputTemplate</code> is a JSON object (surrounded by curly braces), the following restrictions apply:</p> <ul> <li> <p>The placeholder cannot be used as an object key.</p> </li> <li> <p>Object values cannot include quote marks.</p> </li> </ul> <p>The following example shows the syntax for using <code>InputPathsMap</code> and <code>InputTemplate</code>.</p> <p> <code> \"InputTransformer\":</code> </p> <p> <code>{</code> </p> <p> <code>\"InputPathsMap\": {\"instance\": \"$.detail.instance\",\"status\": \"$.detail.status\"},</code> </p> <p> <code>\"InputTemplate\": \"&lt;instance&gt; is in state &lt;status&gt;\"</code> </p> <p> <code>}</code> </p> <p>To have the <code>InputTemplate</code> include quote marks within a JSON string, escape each quote marks with a slash, as in the following example:</p> <p> <code> \"InputTransformer\":</code> </p> <p> <code>{</code> </p> <p> <code>\"InputPathsMap\": {\"instance\": \"$.detail.instance\",\"status\": \"$.detail.status\"},</code> </p> <p> <code>\"InputTemplate\": \"&lt;instance&gt; is in state \\\"&lt;status&gt;\\\"\"</code> </p> <p> <code>}</code> </p>"
         }
       },
       "documentation":"<p>Contains the parameters needed for you to provide custom input to a target based on one or more pieces of data extracted from the event.</p>"
@@ -1024,14 +1032,14 @@
       "type":"structure",
       "members":{
       },
-      "documentation":"<p>The event pattern isn't valid.</p>",
+      "documentation":"<p>The event pattern is not valid.</p>",
       "exception":true
     },
     "InvalidStateException":{
       "type":"structure",
       "members":{
       },
-      "documentation":"<p>The specified state isn't a valid state for an event source.</p>",
+      "documentation":"<p>The specified state is not a valid state for an event source.</p>",
       "exception":true
     },
     "KinesisParameters":{
@@ -1043,7 +1051,7 @@
           "documentation":"<p>The JSON path to be extracted from the event and used as the partition key. For more information, see <a href=\"https://docs.aws.amazon.com/streams/latest/dev/key-concepts.html#partition-key\">Amazon Kinesis Streams Key Concepts</a> in the <i>Amazon Kinesis Streams Developer Guide</i>.</p>"
         }
       },
-      "documentation":"<p>This object enables you to specify a JSON path to extract from the event and use as the partition key for the Amazon Kinesis data stream so that you can control the shard that the event goes to. If you don't include this parameter, the default is to use the <code>eventId</code> as the partition key.</p>"
+      "documentation":"<p>This object enables you to specify a JSON path to extract from the event and use as the partition key for the Amazon Kinesis data stream, so that you can control the shard to which the event goes. If you do not include this parameter, the default is to use the <code>eventId</code> as the partition key.</p>"
     },
     "LaunchType":{
       "type":"string",
@@ -1056,7 +1064,7 @@
       "type":"structure",
       "members":{
       },
-      "documentation":"<p>You tried to create more resources than is allowed.</p>",
+      "documentation":"<p>You tried to create more rules or add more targets to a rule than is allowed.</p>",
       "exception":true
     },
     "LimitMax100":{
@@ -1081,7 +1089,7 @@
         },
         "Limit":{
           "shape":"LimitMax100",
-          "documentation":"<p>Specifying this limits the number of results returned by this operation. The operation also returns a <code>NextToken</code> that you can use in a subsequent operation to retrieve the next set of results.</p>"
+          "documentation":"<p>Specifying this limits the number of results returned by this operation. The operation also returns a NextToken which you can use in a subsequent operation to retrieve the next set of results.</p>"
         }
       }
     },
@@ -1111,7 +1119,7 @@
         },
         "Limit":{
           "shape":"LimitMax100",
-          "documentation":"<p>Specifying this limits the number of results returned by this operation. The operation also returns a <code>NextToken</code> that you can use in a subsequent operation to retrieve the next set of results.</p>"
+          "documentation":"<p>Specifying this limits the number of results returned by this operation. The operation also returns a NextToken which you can use in a subsequent operation to retrieve the next set of results.</p>"
         }
       }
     },
@@ -1142,7 +1150,7 @@
         },
         "Limit":{
           "shape":"LimitMax100",
-          "documentation":"<p>Specifying this limits the number of results returned by this operation. The operation also returns a <code>NextToken</code> that you can use in a subsequent operation to retrieve the next set of results.</p>"
+          "documentation":"<p>Specifying this limits the number of results returned by this operation. The operation also returns a NextToken which you can use in a subsequent operation to retrieve the next set of results.</p>"
         }
       }
     },
@@ -1173,7 +1181,7 @@
         },
         "Limit":{
           "shape":"LimitMax100",
-          "documentation":"<p>pecifying this limits the number of results returned by this operation. The operation also returns a <code>NextToken</code> that you can use in a subsequent operation to retrieve the next set of results.</p>"
+          "documentation":"<p>pecifying this limits the number of results returned by this operation. The operation also returns a NextToken which you can use in a subsequent operation to retrieve the next set of results.</p>"
         }
       }
     },
@@ -1265,7 +1273,7 @@
       "members":{
         "ResourceARN":{
           "shape":"Arn",
-          "documentation":"<p>The ARN of the rule for which you want to view tags.</p>"
+          "documentation":"<p>The ARN of the EventBridge resource for which you want to view tags.</p>"
         }
       }
     },
@@ -1274,7 +1282,7 @@
       "members":{
         "Tags":{
           "shape":"TagList",
-          "documentation":"<p>The list of tag keys and values associated with the rule that you specified.</p>"
+          "documentation":"<p>The list of tag keys and values associated with the resource you specified</p>"
         }
       }
     },
@@ -1322,7 +1330,7 @@
       "type":"structure",
       "members":{
       },
-      "documentation":"<p>An AWS service created this rule on behalf of your account. That service manages it. If you see this error in response to <code>DeleteRule</code> or <code>RemoveTargets</code>, you can use the <code>Force</code> parameter in those calls to delete the rule or remove targets from the rule. You can't modify these managed rules by using <code>DisableRule</code>, <code>EnableRule</code>, <code>PutTargets</code>, <code>PutRule</code>, <code>TagResource</code>, or <code>UntagResource</code>. </p>",
+      "documentation":"<p>This rule was created by an AWS service on behalf of your account. It is managed by that service. If you see this error in response to <code>DeleteRule</code> or <code>RemoveTargets</code>, you can use the <code>Force</code> parameter in those calls to delete the rule or remove targets from the rule. You cannot modify these managed rules by using <code>DisableRule</code>, <code>EnableRule</code>, <code>PutTargets</code>, <code>PutRule</code>, <code>TagResource</code>, or <code>UntagResource</code>. </p>",
       "exception":true
     },
     "MessageGroupId":{"type":"string"},
@@ -1331,7 +1339,7 @@
       "members":{
         "awsvpcConfiguration":{
           "shape":"AwsVpcConfiguration",
-          "documentation":"<p>Use this structure to specify the VPC subnets and security groups for the task and whether a public IP address is to be used. This structure is relevant only for ECS tasks that use the <code>awsvpc</code> network mode.</p>"
+          "documentation":"<p>Use this structure to specify the VPC subnets and security groups for the task, and whether a public IP address is to be used. This structure is relevant only for ECS tasks that use the <code>awsvpc</code> network mode.</p>"
         }
       },
       "documentation":"<p>This structure specifies the network configuration for an ECS task.</p>"
@@ -1370,15 +1378,15 @@
         },
         "CreationTime":{
           "shape":"Timestamp",
-          "documentation":"<p>The date and time when the event source was created.</p>"
+          "documentation":"<p>The date and time the event source was created.</p>"
         },
         "ExpirationTime":{
           "shape":"Timestamp",
-          "documentation":"<p>The date and time when the event source will expire if the AWS account doesn't create a matching event bus for it.</p>"
+          "documentation":"<p>The date and time that the event source will expire, if the AWS account doesn't create a matching event bus for it.</p>"
         },
         "State":{
           "shape":"EventSourceState",
-          "documentation":"<p>The state of the event source. If it's <code>ACTIVE</code>, you have already created a matching event bus for this event source, and that event bus is active. If it's <code>PENDING</code>, either you haven't yet created a matching event bus, or that event bus is deactivated. If it's <code>DELETED</code>, you have created a matching event bus, but the event source has since been deleted.</p>"
+          "documentation":"<p>The state of the event source. If it is ACTIVE, you have already created a matching event bus for this event source, and that event bus is active. If it is PENDING, either you haven't yet created a matching event bus, or that event bus is deactivated. If it is DELETED, you have created a matching event bus, but the event source has since been deleted.</p>"
         }
       },
       "documentation":"<p>The AWS account that a partner event source has been offered to.</p>"
@@ -1425,27 +1433,27 @@
       "members":{
         "Time":{
           "shape":"EventTime",
-          "documentation":"<p>The timestamp of the event, per <a href=\"https://www.rfc-editor.org/rfc/rfc3339.txt\">RFC3339</a>. If no timestamp is provided, the timestamp of the <a>PutEvents</a> call is used.</p>"
+          "documentation":"<p>The time stamp of the event, per <a href=\"https://www.rfc-editor.org/rfc/rfc3339.txt\">RFC3339</a>. If no time stamp is provided, the time stamp of the <a>PutEvents</a> call is used.</p>"
         },
         "Source":{
           "shape":"String",
-          "documentation":"<p>The source of the event. This field is required.</p>"
+          "documentation":"<p>The source of the event.</p>"
         },
         "Resources":{
           "shape":"EventResourceList",
-          "documentation":"<p>AWS resources, identified by Amazon Resource Name (ARN), that the event primarily concerns. Any number, including zero, can be present.</p>"
+          "documentation":"<p>AWS resources, identified by Amazon Resource Name (ARN), which the event primarily concerns. Any number, including zero, may be present.</p>"
         },
         "DetailType":{
           "shape":"String",
-          "documentation":"<p>Free-form string used to decide which fields to expect in the event detail.</p>"
+          "documentation":"<p>Free-form string used to decide what fields to expect in the event detail.</p>"
         },
         "Detail":{
           "shape":"String",
-          "documentation":"<p>A valid JSON string. There is no other schema imposed. The JSON string can contain fields and nested subobjects.</p>"
+          "documentation":"<p>A valid JSON string. There is no other schema imposed. The JSON string may contain fields and nested subobjects.</p>"
         },
         "EventBusName":{
           "shape":"NonPartnerEventBusName",
-          "documentation":"<p>The event bus that will receive the event. Only the rules that are associated with this event bus can match the event.</p>"
+          "documentation":"<p>The event bus that will receive the event. Only the rules that are associated with this event bus will be able to match the event.</p>"
         }
       },
       "documentation":"<p>Represents an event to be submitted.</p>"
@@ -1509,20 +1517,20 @@
           "documentation":"<p>The date and time of the event.</p>"
         },
         "Source":{
-          "shape":"String",
+          "shape":"EventSourceName",
           "documentation":"<p>The event source that is generating the evntry.</p>"
         },
         "Resources":{
           "shape":"EventResourceList",
-          "documentation":"<p>AWS resources, identified by Amazon Resource Name (ARN), that the event primarily concerns. Any number, including zero, can be present.</p>"
+          "documentation":"<p>AWS resources, identified by Amazon Resource Name (ARN), which the event primarily concerns. Any number, including zero, may be present.</p>"
         },
         "DetailType":{
           "shape":"String",
-          "documentation":"<p>A free-form string used to decide which fields to expect in the event detail.</p>"
+          "documentation":"<p>A free-form string used to decide what fields to expect in the event detail.</p>"
         },
         "Detail":{
           "shape":"String",
-          "documentation":"<p>A valid JSON string. There is no other schema imposed. The JSON string can contain fields and nested subobjects.</p>"
+          "documentation":"<p>A valid JSON string. There is no other schema imposed. The JSON string may contain fields and nested subobjects.</p>"
         }
       },
       "documentation":"<p>The details about an event generated by an SaaS partner.</p>"
@@ -1538,7 +1546,7 @@
       "members":{
         "FailedEntryCount":{
           "shape":"Integer",
-          "documentation":"<p>The number of events from this operation that couldn't be written to the partner event bus.</p>"
+          "documentation":"<p>The number of events from this operation that could not be written to the partner event bus.</p>"
         },
         "Entries":{
           "shape":"PutPartnerEventsResultEntryList",
@@ -1562,7 +1570,7 @@
           "documentation":"<p>The error message that explains why the event submission failed.</p>"
         }
       },
-      "documentation":"<p>Represents an event that a partner tried to generate but failed.</p>"
+      "documentation":"<p>Represents an event that a partner tried to generate, but failed.</p>"
     },
     "PutPartnerEventsResultEntryList":{
       "type":"list",
@@ -1582,19 +1590,19 @@
         },
         "Action":{
           "shape":"Action",
-          "documentation":"<p>The action that you're enabling the other account to perform. Currently, this must be <code>events:PutEvents</code>.</p>"
+          "documentation":"<p>The action that you are enabling the other account to perform. Currently, this must be <code>events:PutEvents</code>.</p>"
         },
         "Principal":{
           "shape":"Principal",
-          "documentation":"<p>The 12-digit AWS account ID that you are permitting to put events to your default event bus. Specify \"*\" to permit any account to put events to your default event bus.</p> <p>If you specify \"*\" without specifying <code>Condition</code>, avoid creating rules that might match undesirable events. To create more secure rules, make sure that the event pattern for each rule contains an <code>account</code> field with a specific account ID to receive events from. Rules with an account field don't match any events sent from other accounts.</p>"
+          "documentation":"<p>The 12-digit AWS account ID that you are permitting to put events to your default event bus. Specify \"*\" to permit any account to put events to your default event bus.</p> <p>If you specify \"*\" without specifying <code>Condition</code>, avoid creating rules that may match undesirable events. To create more secure rules, make sure that the event pattern for each rule contains an <code>account</code> field with a specific account ID from which to receive events. Rules with an account field do not match any events sent from other accounts.</p>"
         },
         "StatementId":{
           "shape":"StatementId",
-          "documentation":"<p>An identifier string for the external account that you're granting permissions to. If you later want to revoke the permission for this external account, specify this <code>StatementId</code> when you run <a>RemovePermission</a>.</p>"
+          "documentation":"<p>An identifier string for the external account that you are granting permissions to. If you later want to revoke the permission for this external account, specify this <code>StatementId</code> when you run <a>RemovePermission</a>.</p>"
         },
         "Condition":{
           "shape":"Condition",
-          "documentation":"<p>This parameter enables you to limit the permission to accounts that fulfill a certain condition, such as being a member of a certain AWS organization. For more information about AWS Organizations, see <a href=\"https://docs.aws.amazon.com/organizations/latest/userguide/orgs_introduction.html\">What Is AWS Organizations?</a> in the <i>AWS Organizations User Guide</i>.</p> <p>If you specify <code>Condition</code> with an AWS organization ID and specify \"*\" as the value for <code>Principal</code>, you grant permission to all the accounts in the named organization.</p> <p>The <code>Condition</code> is a JSON string that must contain <code>Type</code>, <code>Key</code>, and <code>Value</code> fields.</p>"
+          "documentation":"<p>This parameter enables you to limit the permission to accounts that fulfill a certain condition, such as being a member of a certain AWS organization. For more information about AWS Organizations, see <a href=\"https://docs.aws.amazon.com/organizations/latest/userguide/orgs_introduction.html\">What Is AWS Organizations</a> in the <i>AWS Organizations User Guide</i>.</p> <p>If you specify <code>Condition</code> with an AWS organization ID, and specify \"*\" as the value for <code>Principal</code>, you grant permission to all the accounts in the named organization.</p> <p>The <code>Condition</code> is a JSON string which must contain <code>Type</code>, <code>Key</code>, and <code>Value</code> fields.</p>"
         }
       }
     },
@@ -1604,15 +1612,15 @@
       "members":{
         "Name":{
           "shape":"RuleName",
-          "documentation":"<p>The name of the rule that you're creating or updating.</p>"
+          "documentation":"<p>The name of the rule that you are creating or updating.</p>"
         },
         "ScheduleExpression":{
           "shape":"ScheduleExpression",
-          "documentation":"<p>The scheduling expression: for example, <code>\"cron(0 20 * * ? *)\"</code> or <code>\"rate(5 minutes)\"</code>.</p>"
+          "documentation":"<p>The scheduling expression. For example, \"cron(0 20 * * ? *)\" or \"rate(5 minutes)\".</p>"
         },
         "EventPattern":{
           "shape":"EventPattern",
-          "documentation":"<p>The event pattern. For more information, see <a href=\"https://docs.aws.amazon.com/eventbridge/latest/userguide/eventbridge-and-event-patterns.html\">Event Patterns</a> in the <i>Amazon EventBridge User Guide</i>.</p>"
+          "documentation":"<p>The event pattern. For more information, see <a href=\"https://docs.aws.amazon.com/eventbridge/latest/userguide/eventbridge-and-event-patterns.html\">Events and Event Patterns</a> in the <i>Amazon EventBridge User Guide</i>.</p>"
         },
         "State":{
           "shape":"RuleState",
@@ -1736,7 +1744,7 @@
         },
         "Force":{
           "shape":"Boolean",
-          "documentation":"<p>If this is a managed rule created by an AWS service on your behalf, you must specify <code>Force</code> as <code>True</code> to remove targets. This parameter is ignored for rules that aren't managed rules. You can check whether a rule is a managed rule by using <code>DescribeRule</code> or <code>ListRules</code> and checking the <code>ManagedBy</code> field of the response.</p>"
+          "documentation":"<p>If this is a managed rule, created by an AWS service on your behalf, you must specify <code>Force</code> as <code>True</code> to remove targets. This parameter is ignored for rules that are not managed rules. You can check whether a rule is a managed rule by using <code>DescribeRule</code> or <code>ListRules</code> and checking the <code>ManagedBy</code> field of the response.</p>"
         }
       }
     },
@@ -1779,14 +1787,14 @@
       "type":"structure",
       "members":{
       },
-      "documentation":"<p>The resource that you're trying to create already exists.</p>",
+      "documentation":"<p>The resource you are trying to create already exists.</p>",
       "exception":true
     },
     "ResourceNotFoundException":{
       "type":"structure",
       "members":{
       },
-      "documentation":"<p>An entity that you specified doesn't exist.</p>",
+      "documentation":"<p>An entity that you specified does not exist.</p>",
       "exception":true
     },
     "RoleArn":{
@@ -1807,7 +1815,7 @@
         },
         "EventPattern":{
           "shape":"EventPattern",
-          "documentation":"<p>The event pattern of the rule. For more information, see <a href=\"https://docs.aws.amazon.com/eventbridge/latest/userguide/eventbridge-and-event-patterns.html\">Event Patterns</a> in the <i>Amazon EventBridge User Guide</i>.</p>"
+          "documentation":"<p>The event pattern of the rule. For more information, see <a href=\"https://docs.aws.amazon.com/eventbridge/latest/userguide/eventbridge-and-event-patterns.html\">Events and Event Patterns</a> in the <i>Amazon EventBridge User Guide</i>.</p>"
         },
         "State":{
           "shape":"RuleState",
@@ -1819,7 +1827,7 @@
         },
         "ScheduleExpression":{
           "shape":"ScheduleExpression",
-          "documentation":"<p>The scheduling expression: for example, <code>\"cron(0 20 * * ? *)\"</code> or <code>\"rate(5 minutes)\"</code>.</p>"
+          "documentation":"<p>The scheduling expression. For example, \"cron(0 20 * * ? *)\", \"rate(5 minutes)\".</p>"
         },
         "RoleArn":{
           "shape":"RoleArn",
@@ -1827,7 +1835,7 @@
         },
         "ManagedBy":{
           "shape":"ManagedBy",
-          "documentation":"<p>If an AWS service created the rule on behalf of your account, this field displays the principal name of the service that created the rule.</p>"
+          "documentation":"<p>If the rule was created on behalf of your account by an AWS service, this field displays the principal name of the service that created the rule.</p>"
         },
         "EventBusName":{
           "shape":"EventBusName",
@@ -1872,10 +1880,10 @@
       "members":{
         "RunCommandTargets":{
           "shape":"RunCommandTargets",
-          "documentation":"<p>Currently, we support including only one <code>RunCommandTarget</code> block, which specifies either an array of <code>InstanceIds</code> or a tag.</p>"
+          "documentation":"<p>Currently, we support including only one RunCommandTarget block, which specifies either an array of InstanceIds or a tag.</p>"
         }
       },
-      "documentation":"<p>This parameter contains the criteria (either <code>InstanceIds</code> or a tag) used to specify which EC2 instances are to be sent the command. </p>"
+      "documentation":"<p>This parameter contains the criteria (either InstanceIds or a tag) used to specify which EC2 instances are to be sent the command. </p>"
     },
     "RunCommandTarget":{
       "type":"structure",
@@ -1893,7 +1901,7 @@
           "documentation":"<p>If <code>Key</code> is <code>tag:</code> <i>tag-key</i>, <code>Values</code> is a list of tag values. If <code>Key</code> is <code>InstanceIds</code>, <code>Values</code> is a list of Amazon EC2 instance IDs.</p>"
         }
       },
-      "documentation":"<p>Information about the EC2 instances that are to be sent the command, specified as key-value pairs. Each <code>RunCommandTarget</code> block can include only one key, but this key can specify multiple values.</p>"
+      "documentation":"<p>Information about the EC2 instances that are to be sent the command, specified as key-value pairs. Each <code>RunCommandTarget</code> block can include only one key, but this key may specify multiple values.</p>"
     },
     "RunCommandTargetKey":{
       "type":"string",
@@ -1952,14 +1960,14 @@
       "members":{
         "Key":{
           "shape":"TagKey",
-          "documentation":"<p>A string that you can use to assign a value. The combination of tag keys and values can help you organize and categorize your resources.</p>"
+          "documentation":"<p>A string you can use to assign a value. The combination of tag keys and values can help you organize and categorize your resources.</p>"
         },
         "Value":{
           "shape":"TagValue",
           "documentation":"<p>The value for the specified tag key.</p>"
         }
       },
-      "documentation":"<p>A key-value pair associated with an AWS resource. In EventBridge, rules support tagging.</p>"
+      "documentation":"<p>A key-value pair associated with an AWS resource. In EventBridge, rules and event buses support tagging.</p>"
     },
     "TagKey":{
       "type":"string",
@@ -1983,11 +1991,11 @@
       "members":{
         "ResourceARN":{
           "shape":"Arn",
-          "documentation":"<p>The ARN of the rule that you're adding tags to.</p>"
+          "documentation":"<p>The ARN of the EventBridge resource that you're adding tags to.</p>"
         },
         "Tags":{
           "shape":"TagList",
-          "documentation":"<p>The list of key-value pairs to associate with the rule.</p>"
+          "documentation":"<p>The list of key-value pairs to associate with the resource.</p>"
         }
       }
     },
@@ -2034,7 +2042,7 @@
         },
         "KinesisParameters":{
           "shape":"KinesisParameters",
-          "documentation":"<p>The custom parameter that you can use to control the shard assignment when the target is a Kinesis data stream. If you don't include this parameter, the default is to use the <code>eventId</code> as the partition key.</p>"
+          "documentation":"<p>The custom parameter you can use to control the shard assignment, when the target is a Kinesis data stream. If you do not include this parameter, the default is to use the <code>eventId</code> as the partition key.</p>"
         },
         "RunCommandParameters":{
           "shape":"RunCommandParameters",
@@ -2042,7 +2050,7 @@
         },
         "EcsParameters":{
           "shape":"EcsParameters",
-          "documentation":"<p>Contains the Amazon ECS task definition and task count to be used if the event target is an Amazon ECS task. For more information about Amazon ECS tasks, see <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/task_defintions.html\">Task Definitions </a> in the <i>Amazon EC2 Container Service Developer Guide</i>.</p>"
+          "documentation":"<p>Contains the Amazon ECS task definition and task count to be used, if the event target is an Amazon ECS task. For more information about Amazon ECS tasks, see <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/task_defintions.html\">Task Definitions </a> in the <i>Amazon EC2 Container Service Developer Guide</i>.</p>"
         },
         "BatchParameters":{
           "shape":"BatchParameters",
@@ -2053,7 +2061,7 @@
           "documentation":"<p>Contains the message group ID to use when the target is a FIFO queue.</p> <p>If you specify an SQS FIFO queue as a target, the queue must have content-based deduplication enabled.</p>"
         }
       },
-      "documentation":"<p>Targets are the resources to be invoked when a rule is triggered. For a complete list of services and resources that can be set as a target, see <a>PutTargets</a>.</p> <p>If you're setting the event bus of another account as the target and that account granted permission to your account through an organization instead of directly by the account ID, you must specify a <code>RoleArn</code> with proper permissions in the <code>Target</code> structure. For more information, see <a href=\"https://docs.aws.amazon.com/eventbridge/latest/userguide/eventbridge-cross-account-event-delivery.html\">Sending and Receiving Events Between AWS Accounts</a> in the <i>Amazon EventBridge User Guide</i>.</p>"
+      "documentation":"<p>Targets are the resources to be invoked when a rule is triggered. For a complete list of services and resources that can be set as a target, see <a>PutTargets</a>.</p> <p>If you are setting the event bus of another account as the target, and that account granted permission to your account through an organization instead of directly by the account ID, then you must specify a <code>RoleArn</code> with proper permissions in the <code>Target</code> structure. For more information, see <a href=\"https://docs.aws.amazon.com/eventbridge/latest/userguide/eventbridge-cross-account-event-delivery.html\">Sending and Receiving Events Between AWS Accounts</a> in the <i>Amazon EventBridge User Guide</i>.</p>"
     },
     "TargetArn":{
       "type":"string",
@@ -2099,7 +2107,7 @@
       "members":{
         "EventPattern":{
           "shape":"EventPattern",
-          "documentation":"<p>The event pattern. For more information, see <a href=\"https://docs.aws.amazon.com/eventbridge/latest/userguide/eventbridge-and-event-patterns.html\">Event Patterns</a> in the <i>Amazon EventBridge User Guide</i>.</p>"
+          "documentation":"<p>The event pattern. For more information, see <a href=\"https://docs.aws.amazon.com/eventbridge/latest/userguide/eventbridge-and-event-patterns.html\">Events and Event Patterns</a> in the <i>Amazon EventBridge User Guide</i>.</p>"
         },
         "Event":{
           "shape":"String",
@@ -2137,7 +2145,7 @@
       "members":{
         "ResourceARN":{
           "shape":"Arn",
-          "documentation":"<p>The ARN of the rule that you're removing tags from.</p>"
+          "documentation":"<p>The ARN of the EventBridge resource from which you are removing tags.</p>"
         },
         "TagKeys":{
           "shape":"TagKeyList",
@@ -2151,5 +2159,5 @@
       }
     }
   },
-  "documentation":"<p>Amazon EventBridge helps you to respond to state changes in your AWS resources. When your resources change state, they automatically send events into an event stream. You can create rules that match selected events in the stream and route them to targets to take action. You can also use rules to take action on a predetermined schedule. For example, you can configure rules to:</p> <ul> <li> <p>Automatically invoke an AWS Lambda function to update DNS entries when an event notifies you that Amazon EC2 instance enters the running state</p> </li> <li> <p>Direct specific API records from AWS CloudTrail to an Amazon Kinesis data stream for detailed analysis of potential security or availability risks</p> </li> <li> <p>Periodically invoke a built-in target to create a snapshot of an Amazon EBS volume</p> </li> </ul> <p>For more information about the features of Amazon EventBridge, see the <a href=\"https://docs.aws.amazon.com/eventbridge/latest/userguide/\">Amazon EventBridge User Guide</a>.</p>"
+  "documentation":"<p>Amazon EventBridge helps you to respond to state changes in your AWS resources. When your resources change state, they automatically send events into an event stream. You can create rules that match selected events in the stream and route them to targets to take action. You can also use rules to take action on a predetermined schedule. For example, you can configure rules to:</p> <ul> <li> <p>Automatically invoke an AWS Lambda function to update DNS entries when an event notifies you that Amazon EC2 instance enters the running state.</p> </li> <li> <p>Direct specific API records from AWS CloudTrail to an Amazon Kinesis data stream for detailed analysis of potential security or availability risks.</p> </li> <li> <p>Periodically invoke a built-in target to create a snapshot of an Amazon EBS volume.</p> </li> </ul> <p>For more information about the features of Amazon EventBridge, see the <a href=\"https://docs.aws.amazon.com/eventbridge/latest/userguide\">Amazon EventBridge User Guide</a>.</p>"
 }
diff --git a/services/cloudwatchevents/src/test/resources/cucumber.properties b/services/cloudwatchevents/src/test/resources/cucumber.properties
index 13cf4271d346..b983445dcba6 100644
--- a/services/cloudwatchevents/src/test/resources/cucumber.properties
+++ b/services/cloudwatchevents/src/test/resources/cucumber.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/cloudwatchlogs/build.properties b/services/cloudwatchlogs/build.properties
index ecf2dae6fcb1..15ec2da1fc71 100644
--- a/services/cloudwatchlogs/build.properties
+++ b/services/cloudwatchlogs/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/cloudwatchlogs/pom.xml b/services/cloudwatchlogs/pom.xml
index 2e706a7eb9fa..e3ad775c6bf3 100644
--- a/services/cloudwatchlogs/pom.xml
+++ b/services/cloudwatchlogs/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>cloudwatchlogs</artifactId>
     <name>AWS Java SDK :: Services :: Amazon CloudWatch Logs</name>
diff --git a/services/cloudwatchlogs/src/it/java/software/amazon/awssdk/services/cloudwatchlogs/IntegrationTestBase.java b/services/cloudwatchlogs/src/it/java/software/amazon/awssdk/services/cloudwatchlogs/IntegrationTestBase.java
index d205b89acdb4..346b39d16d7b 100644
--- a/services/cloudwatchlogs/src/it/java/software/amazon/awssdk/services/cloudwatchlogs/IntegrationTestBase.java
+++ b/services/cloudwatchlogs/src/it/java/software/amazon/awssdk/services/cloudwatchlogs/IntegrationTestBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/cloudwatchlogs/src/it/java/software/amazon/awssdk/services/cloudwatchlogs/ServiceIntegrationTest.java b/services/cloudwatchlogs/src/it/java/software/amazon/awssdk/services/cloudwatchlogs/ServiceIntegrationTest.java
index 7f1255ae3c54..e63d1aefdf4f 100644
--- a/services/cloudwatchlogs/src/it/java/software/amazon/awssdk/services/cloudwatchlogs/ServiceIntegrationTest.java
+++ b/services/cloudwatchlogs/src/it/java/software/amazon/awssdk/services/cloudwatchlogs/ServiceIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/cloudwatchlogs/src/main/resources/codegen-resources/service-2.json b/services/cloudwatchlogs/src/main/resources/codegen-resources/service-2.json
index 6475f815eb23..7d69f02ed878 100644
--- a/services/cloudwatchlogs/src/main/resources/codegen-resources/service-2.json
+++ b/services/cloudwatchlogs/src/main/resources/codegen-resources/service-2.json
@@ -25,7 +25,7 @@
         {"shape":"OperationAbortedException"},
         {"shape":"ServiceUnavailableException"}
       ],
-      "documentation":"<p>Associates the specified AWS Key Management Service (AWS KMS) customer master key (CMK) with the specified log group.</p> <p>Associating an AWS KMS CMK with a log group overrides any existing associations between the log group and a CMK. After a CMK is associated with a log group, all newly ingested data for the log group is encrypted using the CMK. This association is stored as long as the data encrypted with the CMK is still within Amazon CloudWatch Logs. This enables Amazon CloudWatch Logs to decrypt this data whenever it is requested.</p> <p>Note that it can take up to 5 minutes for this operation to take effect.</p> <p>If you attempt to associate a CMK with a log group but the CMK does not exist or the CMK is disabled, you will receive an <code>InvalidParameterException</code> error. </p>"
+      "documentation":"<p>Associates the specified AWS Key Management Service (AWS KMS) customer master key (CMK) with the specified log group.</p> <p>Associating an AWS KMS CMK with a log group overrides any existing associations between the log group and a CMK. After a CMK is associated with a log group, all newly ingested data for the log group is encrypted using the CMK. This association is stored as long as the data encrypted with the CMK is still within Amazon CloudWatch Logs. This enables Amazon CloudWatch Logs to decrypt this data whenever it is requested.</p> <note> <p> <b>Important:</b> CloudWatch Logs supports only symmetric CMKs. Do not use an associate an asymmetric CMK with your log group. For more information, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/symmetric-asymmetric.html\">Using Symmetric and Asymmetric Keys</a>.</p> </note> <p>Note that it can take up to 5 minutes for this operation to take effect.</p> <p>If you attempt to associate a CMK with a log group but the CMK does not exist or the CMK is disabled, you will receive an <code>InvalidParameterException</code> error. </p>"
     },
     "CancelExportTask":{
       "name":"CancelExportTask",
@@ -74,7 +74,7 @@
         {"shape":"OperationAbortedException"},
         {"shape":"ServiceUnavailableException"}
       ],
-      "documentation":"<p>Creates a log group with the specified name.</p> <p>You can create up to 5000 log groups per account.</p> <p>You must use the following guidelines when naming a log group:</p> <ul> <li> <p>Log group names must be unique within a region for an AWS account.</p> </li> <li> <p>Log group names can be between 1 and 512 characters long.</p> </li> <li> <p>Log group names consist of the following characters: a-z, A-Z, 0-9, '_' (underscore), '-' (hyphen), '/' (forward slash), and '.' (period).</p> </li> </ul> <p>If you associate a AWS Key Management Service (AWS KMS) customer master key (CMK) with the log group, ingested data is encrypted using the CMK. This association is stored as long as the data encrypted with the CMK is still within Amazon CloudWatch Logs. This enables Amazon CloudWatch Logs to decrypt this data whenever it is requested.</p> <p>If you attempt to associate a CMK with the log group but the CMK does not exist or the CMK is disabled, you will receive an <code>InvalidParameterException</code> error. </p>"
+      "documentation":"<p>Creates a log group with the specified name.</p> <p>You can create up to 20,000 log groups per account.</p> <p>You must use the following guidelines when naming a log group:</p> <ul> <li> <p>Log group names must be unique within a region for an AWS account.</p> </li> <li> <p>Log group names can be between 1 and 512 characters long.</p> </li> <li> <p>Log group names consist of the following characters: a-z, A-Z, 0-9, '_' (underscore), '-' (hyphen), '/' (forward slash), '.' (period), and '#' (number sign)</p> </li> </ul> <p>If you associate a AWS Key Management Service (AWS KMS) customer master key (CMK) with the log group, ingested data is encrypted using the CMK. This association is stored as long as the data encrypted with the CMK is still within Amazon CloudWatch Logs. This enables Amazon CloudWatch Logs to decrypt this data whenever it is requested.</p> <p>If you attempt to associate a CMK with the log group but the CMK does not exist or the CMK is disabled, you will receive an <code>InvalidParameterException</code> error. </p> <note> <p> <b>Important:</b> CloudWatch Logs supports only symmetric CMKs. Do not associate an asymmetric CMK with your log group. For more information, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/symmetric-asymmetric.html\">Using Symmetric and Asymmetric Keys</a>.</p> </note>"
     },
     "CreateLogStream":{
       "name":"CreateLogStream",
@@ -89,7 +89,7 @@
         {"shape":"ResourceNotFoundException"},
         {"shape":"ServiceUnavailableException"}
       ],
-      "documentation":"<p>Creates a log stream for the specified log group.</p> <p>There is no limit on the number of log streams that you can create for a log group.</p> <p>You must use the following guidelines when naming a log stream:</p> <ul> <li> <p>Log stream names must be unique within the log group.</p> </li> <li> <p>Log stream names can be between 1 and 512 characters long.</p> </li> <li> <p>The ':' (colon) and '*' (asterisk) characters are not allowed.</p> </li> </ul>"
+      "documentation":"<p>Creates a log stream for the specified log group.</p> <p>There is no limit on the number of log streams that you can create for a log group. There is a limit of 50 TPS on <code>CreateLogStream</code> operations, after which transactions are throttled.</p> <p>You must use the following guidelines when naming a log stream:</p> <ul> <li> <p>Log stream names must be unique within the log group.</p> </li> <li> <p>Log stream names can be between 1 and 512 characters long.</p> </li> <li> <p>The ':' (colon) and '*' (asterisk) characters are not allowed.</p> </li> </ul>"
     },
     "DeleteDestination":{
       "name":"DeleteDestination",
@@ -430,7 +430,7 @@
         {"shape":"OperationAbortedException"},
         {"shape":"ServiceUnavailableException"}
       ],
-      "documentation":"<p>Creates or updates a destination. A destination encapsulates a physical resource (such as an Amazon Kinesis stream) and enables you to subscribe to a real-time stream of log events for a different account, ingested using <a>PutLogEvents</a>. A destination can be an Amazon Kinesis stream, Amazon Kinesis Data Firehose strea, or an AWS Lambda function.</p> <p>Through an access policy, a destination controls what is written to it. By default, <code>PutDestination</code> does not set any access policy with the destination, which means a cross-account user cannot call <a>PutSubscriptionFilter</a> against this destination. To enable this, the destination owner must call <a>PutDestinationPolicy</a> after <code>PutDestination</code>.</p>"
+      "documentation":"<p>Creates or updates a destination. This operation is used only to create destinations for cross-account subscriptions.</p> <p>A destination encapsulates a physical resource (such as an Amazon Kinesis stream) and enables you to subscribe to a real-time stream of log events for a different account, ingested using <a>PutLogEvents</a>.</p> <p>Through an access policy, a destination controls what is written to it. By default, <code>PutDestination</code> does not set any access policy with the destination, which means a cross-account user cannot call <a>PutSubscriptionFilter</a> against this destination. To enable this, the destination owner must call <a>PutDestinationPolicy</a> after <code>PutDestination</code>.</p>"
     },
     "PutDestinationPolicy":{
       "name":"PutDestinationPolicy",
@@ -462,7 +462,7 @@
         {"shape":"ServiceUnavailableException"},
         {"shape":"UnrecognizedClientException"}
       ],
-      "documentation":"<p>Uploads a batch of log events to the specified log stream.</p> <p>You must include the sequence token obtained from the response of the previous call. An upload in a newly created log stream does not require a sequence token. You can also get the sequence token using <a>DescribeLogStreams</a>. If you call <code>PutLogEvents</code> twice within a narrow time period using the same value for <code>sequenceToken</code>, both calls may be successful, or one may be rejected.</p> <p>The batch of events must satisfy the following constraints:</p> <ul> <li> <p>The maximum batch size is 1,048,576 bytes, and this size is calculated as the sum of all event messages in UTF-8, plus 26 bytes for each log event.</p> </li> <li> <p>None of the log events in the batch can be more than 2 hours in the future.</p> </li> <li> <p>None of the log events in the batch can be older than 14 days or older than the retention period of the log group.</p> </li> <li> <p>The log events in the batch must be in chronological ordered by their timestamp. The timestamp is the time the event occurred, expressed as the number of milliseconds after Jan 1, 1970 00:00:00 UTC. (In AWS Tools for PowerShell and the AWS SDK for .NET, the timestamp is specified in .NET format: yyyy-mm-ddThh:mm:ss. For example, 2017-09-15T13:45:30.) </p> </li> <li> <p>The maximum number of log events in a batch is 10,000.</p> </li> <li> <p>A batch of log events in a single request cannot span more than 24 hours. Otherwise, the operation fails.</p> </li> </ul> <p>If a call to PutLogEvents returns \"UnrecognizedClientException\" the most likely cause is an invalid AWS access key ID or secret key. </p>"
+      "documentation":"<p>Uploads a batch of log events to the specified log stream.</p> <p>You must include the sequence token obtained from the response of the previous call. An upload in a newly created log stream does not require a sequence token. You can also get the sequence token in the <code>expectedSequenceToken</code> field from <code>InvalidSequenceTokenException</code>. If you call <code>PutLogEvents</code> twice within a narrow time period using the same value for <code>sequenceToken</code>, both calls may be successful, or one may be rejected.</p> <p>The batch of events must satisfy the following constraints:</p> <ul> <li> <p>The maximum batch size is 1,048,576 bytes, and this size is calculated as the sum of all event messages in UTF-8, plus 26 bytes for each log event.</p> </li> <li> <p>None of the log events in the batch can be more than 2 hours in the future.</p> </li> <li> <p>None of the log events in the batch can be older than 14 days or older than the retention period of the log group.</p> </li> <li> <p>The log events in the batch must be in chronological ordered by their timestamp. The timestamp is the time the event occurred, expressed as the number of milliseconds after Jan 1, 1970 00:00:00 UTC. (In AWS Tools for PowerShell and the AWS SDK for .NET, the timestamp is specified in .NET format: yyyy-mm-ddThh:mm:ss. For example, 2017-09-15T13:45:30.) </p> </li> <li> <p>A batch of log events in a single request cannot span more than 24 hours. Otherwise, the operation fails.</p> </li> <li> <p>The maximum number of log events in a batch is 10,000.</p> </li> <li> <p>There is a quota of 5 requests per second per log stream. Additional requests are throttled. This quota can't be changed.</p> </li> </ul> <p>If a call to PutLogEvents returns \"UnrecognizedClientException\" the most likely cause is an invalid AWS access key ID or secret key. </p>"
     },
     "PutMetricFilter":{
       "name":"PutMetricFilter",
@@ -617,7 +617,7 @@
         },
         "kmsKeyId":{
           "shape":"KmsKeyId",
-          "documentation":"<p>The Amazon Resource Name (ARN) of the CMK to use when encrypting log data. For more information, see <a href=\"https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html#arn-syntax-kms\">Amazon Resource Names - AWS Key Management Service (AWS KMS)</a>.</p>"
+          "documentation":"<p>The Amazon Resource Name (ARN) of the CMK to use when encrypting log data. This must be a symmetric CMK. For more information, see <a href=\"https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html#arn-syntax-kms\">Amazon Resource Names - AWS Key Management Service (AWS KMS)</a> and <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/symmetric-asymmetric.html\">Using Symmetric and Asymmetric Keys</a>.</p>"
         }
       }
     },
@@ -1382,7 +1382,7 @@
         },
         "nextToken":{
           "shape":"NextToken",
-          "documentation":"<p>The token for the next set of items to return. (You received this token from a previous call.)</p>"
+          "documentation":"<p>The token for the next set of items to return. (You received this token from a previous call.)</p> <p>Using this token works only when you specify <code>true</code> for <code>startFromHead</code>.</p>"
         },
         "limit":{
           "shape":"EventsLimit",
@@ -1530,7 +1530,7 @@
       "members":{
         "expectedSequenceToken":{"shape":"SequenceToken"}
       },
-      "documentation":"<p>The sequence token is not valid.</p>",
+      "documentation":"<p>The sequence token is not valid. You can get the correct sequence token in the <code>expectedSequenceToken</code> field in the <code>InvalidSequenceTokenException</code> message. </p>",
       "exception":true
     },
     "KmsKeyId":{
@@ -1666,7 +1666,7 @@
         },
         "storedBytes":{
           "shape":"StoredBytes",
-          "documentation":"<p>The number of bytes stored.</p> <p> <b>IMPORTANT:</b> Starting on June 17, 2019, this parameter will be deprecated for log streams, and will be reported as zero. This change applies only to log streams. The <code>storedBytes</code> parameter for log groups is not affected.</p>",
+          "documentation":"<p>The number of bytes stored.</p> <p> <b>IMPORTANT:</b>On June 17, 2019, this parameter was deprecated for log streams, and is always reported as zero. This change applies only to log streams. The <code>storedBytes</code> parameter for log groups is not affected.</p>",
           "deprecated":true,
           "deprecatedMessage":"Starting on June 17, 2019, this parameter will be deprecated for log streams, and will be reported as zero. This change applies only to log streams. The storedBytes parameter for log groups is not affected."
         }
@@ -2266,7 +2266,7 @@
         },
         "limit":{
           "shape":"EventsLimit",
-          "documentation":"<p>The maximum number of log events to return in the query. If the query string uses the <code>fields</code> command, only the specified fields and their values are returned.</p>"
+          "documentation":"<p>The maximum number of log events to return in the query. If the query string uses the <code>fields</code> command, only the specified fields and their values are returned. The default is 1000.</p>"
         }
       }
     },
diff --git a/services/cloudwatchlogs/src/test/resources/cucumber.properties b/services/cloudwatchlogs/src/test/resources/cucumber.properties
index 2167e1e35cc0..7c15e091f05c 100644
--- a/services/cloudwatchlogs/src/test/resources/cucumber.properties
+++ b/services/cloudwatchlogs/src/test/resources/cucumber.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/cloudwatchlogs/src/test/resources/log4j.properties b/services/cloudwatchlogs/src/test/resources/log4j.properties
index 8635ae508bec..5a12212f4f08 100644
--- a/services/cloudwatchlogs/src/test/resources/log4j.properties
+++ b/services/cloudwatchlogs/src/test/resources/log4j.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/codebuild/build.properties b/services/codebuild/build.properties
index ecf2dae6fcb1..15ec2da1fc71 100644
--- a/services/codebuild/build.properties
+++ b/services/codebuild/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/codebuild/pom.xml b/services/codebuild/pom.xml
index 90013a66f5e6..77dd54a08cc8 100644
--- a/services/codebuild/pom.xml
+++ b/services/codebuild/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>codebuild</artifactId>
     <name>AWS Java SDK :: Services :: AWS Code Build</name>
diff --git a/services/codebuild/src/main/resources/codegen-resources/service-2.json b/services/codebuild/src/main/resources/codegen-resources/service-2.json
index 5a4f10da294b..4e46f04643b4 100644
--- a/services/codebuild/src/main/resources/codegen-resources/service-2.json
+++ b/services/codebuild/src/main/resources/codegen-resources/service-2.json
@@ -36,7 +36,7 @@
       "errors":[
         {"shape":"InvalidInputException"}
       ],
-      "documentation":"<p>Gets information about builds.</p>"
+      "documentation":"<p>Gets information about one or more builds.</p>"
     },
     "BatchGetProjects":{
       "name":"BatchGetProjects",
@@ -49,7 +49,33 @@
       "errors":[
         {"shape":"InvalidInputException"}
       ],
-      "documentation":"<p>Gets information about build projects.</p>"
+      "documentation":"<p>Gets information about one or more build projects.</p>"
+    },
+    "BatchGetReportGroups":{
+      "name":"BatchGetReportGroups",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"BatchGetReportGroupsInput"},
+      "output":{"shape":"BatchGetReportGroupsOutput"},
+      "errors":[
+        {"shape":"InvalidInputException"}
+      ],
+      "documentation":"<p> Returns an array of report groups. </p>"
+    },
+    "BatchGetReports":{
+      "name":"BatchGetReports",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"BatchGetReportsInput"},
+      "output":{"shape":"BatchGetReportsOutput"},
+      "errors":[
+        {"shape":"InvalidInputException"}
+      ],
+      "documentation":"<p> Returns an array of reports. </p>"
     },
     "CreateProject":{
       "name":"CreateProject",
@@ -66,6 +92,21 @@
       ],
       "documentation":"<p>Creates a build project.</p>"
     },
+    "CreateReportGroup":{
+      "name":"CreateReportGroup",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"CreateReportGroupInput"},
+      "output":{"shape":"CreateReportGroupOutput"},
+      "errors":[
+        {"shape":"InvalidInputException"},
+        {"shape":"ResourceAlreadyExistsException"},
+        {"shape":"AccountLimitExceededException"}
+      ],
+      "documentation":"<p> Creates a report group. A report group contains a collection of reports. </p>"
+    },
     "CreateWebhook":{
       "name":"CreateWebhook",
       "http":{
@@ -93,7 +134,46 @@
       "errors":[
         {"shape":"InvalidInputException"}
       ],
-      "documentation":"<p>Deletes a build project.</p>"
+      "documentation":"<p> Deletes a build project. When you delete a project, its builds are not deleted. </p>"
+    },
+    "DeleteReport":{
+      "name":"DeleteReport",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DeleteReportInput"},
+      "output":{"shape":"DeleteReportOutput"},
+      "errors":[
+        {"shape":"InvalidInputException"}
+      ],
+      "documentation":"<p> Deletes a report. </p>"
+    },
+    "DeleteReportGroup":{
+      "name":"DeleteReportGroup",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DeleteReportGroupInput"},
+      "output":{"shape":"DeleteReportGroupOutput"},
+      "errors":[
+        {"shape":"InvalidInputException"}
+      ],
+      "documentation":"<p> <code>DeleteReportGroup</code>: Deletes a report group. Before you delete a report group, you must delete its reports. Use <a href=\"https://docs.aws.amazon.com/codebuild/latest/APIReference/API_ListReportsForReportGroup.html\">ListReportsForReportGroup</a> to get the reports in a report group. Use <a href=\"https://docs.aws.amazon.com/codebuild/latest/APIReference/API_DeleteReport.html\">DeleteReport</a> to delete the reports. If you call <code>DeleteReportGroup</code> for a report group that contains one or more reports, an exception is thrown. </p>"
+    },
+    "DeleteResourcePolicy":{
+      "name":"DeleteResourcePolicy",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DeleteResourcePolicyInput"},
+      "output":{"shape":"DeleteResourcePolicyOutput"},
+      "errors":[
+        {"shape":"InvalidInputException"}
+      ],
+      "documentation":"<p> Deletes a resource policy that is identified by its resource ARN. </p>"
     },
     "DeleteSourceCredentials":{
       "name":"DeleteSourceCredentials",
@@ -124,6 +204,34 @@
       ],
       "documentation":"<p>For an existing AWS CodeBuild build project that has its source code stored in a GitHub or Bitbucket repository, stops AWS CodeBuild from rebuilding the source code every time a code change is pushed to the repository.</p>"
     },
+    "DescribeTestCases":{
+      "name":"DescribeTestCases",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DescribeTestCasesInput"},
+      "output":{"shape":"DescribeTestCasesOutput"},
+      "errors":[
+        {"shape":"InvalidInputException"},
+        {"shape":"ResourceNotFoundException"}
+      ],
+      "documentation":"<p> Returns a list of details about test cases for a report. </p>"
+    },
+    "GetResourcePolicy":{
+      "name":"GetResourcePolicy",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"GetResourcePolicyInput"},
+      "output":{"shape":"GetResourcePolicyOutput"},
+      "errors":[
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InvalidInputException"}
+      ],
+      "documentation":"<p> Gets a resource policy that is identified by its resource ARN. </p>"
+    },
     "ImportSourceCredentials":{
       "name":"ImportSourceCredentials",
       "http":{
@@ -203,6 +311,72 @@
       ],
       "documentation":"<p>Gets a list of build project names, with each build project name representing a single build project.</p>"
     },
+    "ListReportGroups":{
+      "name":"ListReportGroups",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"ListReportGroupsInput"},
+      "output":{"shape":"ListReportGroupsOutput"},
+      "errors":[
+        {"shape":"InvalidInputException"}
+      ],
+      "documentation":"<p> Gets a list ARNs for the report groups in the current AWS account. </p>"
+    },
+    "ListReports":{
+      "name":"ListReports",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"ListReportsInput"},
+      "output":{"shape":"ListReportsOutput"},
+      "errors":[
+        {"shape":"InvalidInputException"}
+      ],
+      "documentation":"<p> Returns a list of ARNs for the reports in the current AWS account. </p>"
+    },
+    "ListReportsForReportGroup":{
+      "name":"ListReportsForReportGroup",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"ListReportsForReportGroupInput"},
+      "output":{"shape":"ListReportsForReportGroupOutput"},
+      "errors":[
+        {"shape":"InvalidInputException"},
+        {"shape":"ResourceNotFoundException"}
+      ],
+      "documentation":"<p> Returns a list of ARNs for the reports that belong to a <code>ReportGroup</code>. </p>"
+    },
+    "ListSharedProjects":{
+      "name":"ListSharedProjects",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"ListSharedProjectsInput"},
+      "output":{"shape":"ListSharedProjectsOutput"},
+      "errors":[
+        {"shape":"InvalidInputException"}
+      ],
+      "documentation":"<p> Gets a list of projects that are shared with other AWS accounts or users. </p>"
+    },
+    "ListSharedReportGroups":{
+      "name":"ListSharedReportGroups",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"ListSharedReportGroupsInput"},
+      "output":{"shape":"ListSharedReportGroupsOutput"},
+      "errors":[
+        {"shape":"InvalidInputException"}
+      ],
+      "documentation":"<p> Gets a list of report groups that are shared with other AWS accounts or users. </p>"
+    },
     "ListSourceCredentials":{
       "name":"ListSourceCredentials",
       "http":{
@@ -213,6 +387,20 @@
       "output":{"shape":"ListSourceCredentialsOutput"},
       "documentation":"<p> Returns a list of <code>SourceCredentialsInfo</code> objects. </p>"
     },
+    "PutResourcePolicy":{
+      "name":"PutResourcePolicy",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"PutResourcePolicyInput"},
+      "output":{"shape":"PutResourcePolicyOutput"},
+      "errors":[
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InvalidInputException"}
+      ],
+      "documentation":"<p> Stores a resource policy for the ARN of a <code>Project</code> or <code>ReportGroup</code> object. </p>"
+    },
     "StartBuild":{
       "name":"StartBuild",
       "http":{
@@ -256,6 +444,20 @@
       ],
       "documentation":"<p>Changes the settings of a build project.</p>"
     },
+    "UpdateReportGroup":{
+      "name":"UpdateReportGroup",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"UpdateReportGroupInput"},
+      "output":{"shape":"UpdateReportGroupOutput"},
+      "errors":[
+        {"shape":"InvalidInputException"},
+        {"shape":"ResourceNotFoundException"}
+      ],
+      "documentation":"<p> Updates a report group. </p>"
+    },
     "UpdateWebhook":{
       "name":"UpdateWebhook",
       "http":{
@@ -362,7 +564,7 @@
       "members":{
         "names":{
           "shape":"ProjectNames",
-          "documentation":"<p>The names of the build projects.</p>"
+          "documentation":"<p>The names or ARNs of the build projects. To get information about a project shared with your AWS account, its ARN must be specified. You cannot specify a shared project using its name.</p>"
         }
       }
     },
@@ -379,6 +581,52 @@
         }
       }
     },
+    "BatchGetReportGroupsInput":{
+      "type":"structure",
+      "required":["reportGroupArns"],
+      "members":{
+        "reportGroupArns":{
+          "shape":"ReportGroupArns",
+          "documentation":"<p> An array of report group ARNs that identify the report groups to return. </p>"
+        }
+      }
+    },
+    "BatchGetReportGroupsOutput":{
+      "type":"structure",
+      "members":{
+        "reportGroups":{
+          "shape":"ReportGroups",
+          "documentation":"<p> The array of report groups returned by <code>BatchGetReportGroups</code>. </p>"
+        },
+        "reportGroupsNotFound":{
+          "shape":"ReportGroupArns",
+          "documentation":"<p> An array of ARNs passed to <code>BatchGetReportGroups</code> that are not associated with a <code>ReportGroup</code>. </p>"
+        }
+      }
+    },
+    "BatchGetReportsInput":{
+      "type":"structure",
+      "required":["reportArns"],
+      "members":{
+        "reportArns":{
+          "shape":"ReportArns",
+          "documentation":"<p> An array of ARNs that identify the <code>Report</code> objects to return. </p>"
+        }
+      }
+    },
+    "BatchGetReportsOutput":{
+      "type":"structure",
+      "members":{
+        "reports":{
+          "shape":"Reports",
+          "documentation":"<p> The array of <code>Report</code> objects returned by <code>BatchGetReports</code>. </p>"
+        },
+        "reportsNotFound":{
+          "shape":"ReportArns",
+          "documentation":"<p> An array of ARNs passed to <code>BatchGetReportGroups</code> that are not associated with a <code>Report</code>. </p>"
+        }
+      }
+    },
     "Boolean":{"type":"boolean"},
     "Build":{
       "type":"structure",
@@ -391,6 +639,10 @@
           "shape":"NonEmptyString",
           "documentation":"<p>The Amazon Resource Name (ARN) of the build.</p>"
         },
+        "buildNumber":{
+          "shape":"WrapperLong",
+          "documentation":"<p>The number of the build. For each project, the <code>buildNumber</code> of its first build is <code>1</code>. The <code>buildNumber</code> of each subsequent build is incremented by <code>1</code>. If a build is deleted, the <code>buildNumber</code> of other builds does not change.</p>"
+        },
         "startTime":{
           "shape":"Timestamp",
           "documentation":"<p>When the build process started, expressed in Unix time format.</p>"
@@ -433,7 +685,7 @@
         },
         "secondarySourceVersions":{
           "shape":"ProjectSecondarySourceVersions",
-          "documentation":"<p> An array of <code>ProjectSourceVersion</code> objects. Each <code>ProjectSourceVersion</code> must be one of: </p> <ul> <li> <p>For AWS CodeCommit: the commit ID to use.</p> </li> <li> <p>For GitHub: the commit ID, pull request ID, branch name, or tag name that corresponds to the version of the source code you want to build. If a pull request ID is specified, it must use the format <code>pr/pull-request-ID</code> (for example, <code>pr/25</code>). If a branch name is specified, the branch's HEAD commit ID is used. If not specified, the default branch's HEAD commit ID is used.</p> </li> <li> <p>For Bitbucket: the commit ID, branch name, or tag name that corresponds to the version of the source code you want to build. If a branch name is specified, the branch's HEAD commit ID is used. If not specified, the default branch's HEAD commit ID is used.</p> </li> <li> <p>For Amazon Simple Storage Service (Amazon S3): the version ID of the object that represents the build input ZIP file to use.</p> </li> </ul>"
+          "documentation":"<p> An array of <code>ProjectSourceVersion</code> objects. Each <code>ProjectSourceVersion</code> must be one of: </p> <ul> <li> <p>For AWS CodeCommit: the commit ID, branch, or Git tag to use.</p> </li> <li> <p>For GitHub: the commit ID, pull request ID, branch name, or tag name that corresponds to the version of the source code you want to build. If a pull request ID is specified, it must use the format <code>pr/pull-request-ID</code> (for example, <code>pr/25</code>). If a branch name is specified, the branch's HEAD commit ID is used. If not specified, the default branch's HEAD commit ID is used.</p> </li> <li> <p>For Bitbucket: the commit ID, branch name, or tag name that corresponds to the version of the source code you want to build. If a branch name is specified, the branch's HEAD commit ID is used. If not specified, the default branch's HEAD commit ID is used.</p> </li> <li> <p>For Amazon Simple Storage Service (Amazon S3): the version ID of the object that represents the build input ZIP file to use.</p> </li> </ul>"
         },
         "artifacts":{
           "shape":"BuildArtifacts",
@@ -486,6 +738,18 @@
         "encryptionKey":{
           "shape":"NonEmptyString",
           "documentation":"<p>The AWS Key Management Service (AWS KMS) customer master key (CMK) to be used for encrypting the build output artifacts.</p> <note> <p> You can use a cross-account KMS key to encrypt the build output artifacts if your service role has permission to that key. </p> </note> <p>You can specify either the Amazon Resource Name (ARN) of the CMK or, if available, the CMK's alias (using the format <code>alias/<i>alias-name</i> </code>).</p>"
+        },
+        "exportedEnvironmentVariables":{
+          "shape":"ExportedEnvironmentVariables",
+          "documentation":"<p> A list of exported environment variables for this build. </p>"
+        },
+        "reportArns":{
+          "shape":"BuildReportArns",
+          "documentation":"<p> An array of the ARNs associated with this build's reports. </p>"
+        },
+        "fileSystemLocations":{
+          "shape":"ProjectFileSystemLocations",
+          "documentation":"<p> An array of <code>ProjectFileSystemLocation</code> objects for a CodeBuild build project. A <code>ProjectFileSystemLocation</code> object specifies the <code>identifier</code>, <code>location</code>, <code>mountOptions</code>, <code>mountPoint</code>, and <code>type</code> of a file system created using Amazon Elastic File System. </p>"
         }
       },
       "documentation":"<p>Information about a build.</p>"
@@ -507,7 +771,7 @@
         },
         "overrideArtifactName":{
           "shape":"WrapperBoolean",
-          "documentation":"<p> If this flag is set, a name specified in the build spec file overrides the artifact name. The name specified in a build spec file is calculated at build time and uses the Shell Command Language. For example, you can append a date and time to your artifact name so that it is always unique. </p>"
+          "documentation":"<p> If this flag is set, a name specified in the buildspec file overrides the artifact name. The name specified in a buildspec file is calculated at build time and uses the Shell Command Language. For example, you can append a date and time to your artifact name so that it is always unique. </p>"
         },
         "encryptionDisabled":{
           "shape":"WrapperBoolean",
@@ -596,6 +860,10 @@
       "type":"list",
       "member":{"shape":"BuildPhase"}
     },
+    "BuildReportArns":{
+      "type":"list",
+      "member":{"shape":"String"}
+    },
     "Builds":{
       "type":"list",
       "member":{"shape":"Build"}
@@ -644,7 +912,8 @@
       "enum":[
         "BUILD_GENERAL1_SMALL",
         "BUILD_GENERAL1_MEDIUM",
-        "BUILD_GENERAL1_LARGE"
+        "BUILD_GENERAL1_LARGE",
+        "BUILD_GENERAL1_2XLARGE"
       ]
     },
     "CreateProjectInput":{
@@ -675,7 +944,7 @@
         },
         "sourceVersion":{
           "shape":"String",
-          "documentation":"<p> A version of the build input to be built for this project. If not specified, the latest version is used. If specified, it must be one of: </p> <ul> <li> <p>For AWS CodeCommit: the commit ID to use.</p> </li> <li> <p>For GitHub: the commit ID, pull request ID, branch name, or tag name that corresponds to the version of the source code you want to build. If a pull request ID is specified, it must use the format <code>pr/pull-request-ID</code> (for example <code>pr/25</code>). If a branch name is specified, the branch's HEAD commit ID is used. If not specified, the default branch's HEAD commit ID is used.</p> </li> <li> <p>For Bitbucket: the commit ID, branch name, or tag name that corresponds to the version of the source code you want to build. If a branch name is specified, the branch's HEAD commit ID is used. If not specified, the default branch's HEAD commit ID is used.</p> </li> <li> <p>For Amazon Simple Storage Service (Amazon S3): the version ID of the object that represents the build input ZIP file to use.</p> </li> </ul> <p> If <code>sourceVersion</code> is specified at the build level, then that version takes precedence over this <code>sourceVersion</code> (at the project level). </p> <p> For more information, see <a href=\"https://docs.aws.amazon.com/codebuild/latest/userguide/sample-source-version.html\">Source Version Sample with CodeBuild</a> in the <i>AWS CodeBuild User Guide</i>. </p>"
+          "documentation":"<p> A version of the build input to be built for this project. If not specified, the latest version is used. If specified, it must be one of: </p> <ul> <li> <p>For AWS CodeCommit: the commit ID, branch, or Git tag to use.</p> </li> <li> <p>For GitHub: the commit ID, pull request ID, branch name, or tag name that corresponds to the version of the source code you want to build. If a pull request ID is specified, it must use the format <code>pr/pull-request-ID</code> (for example <code>pr/25</code>). If a branch name is specified, the branch's HEAD commit ID is used. If not specified, the default branch's HEAD commit ID is used.</p> </li> <li> <p>For Bitbucket: the commit ID, branch name, or tag name that corresponds to the version of the source code you want to build. If a branch name is specified, the branch's HEAD commit ID is used. If not specified, the default branch's HEAD commit ID is used.</p> </li> <li> <p>For Amazon Simple Storage Service (Amazon S3): the version ID of the object that represents the build input ZIP file to use.</p> </li> </ul> <p> If <code>sourceVersion</code> is specified at the build level, then that version takes precedence over this <code>sourceVersion</code> (at the project level). </p> <p> For more information, see <a href=\"https://docs.aws.amazon.com/codebuild/latest/userguide/sample-source-version.html\">Source Version Sample with CodeBuild</a> in the <i>AWS CodeBuild User Guide</i>. </p>"
         },
         "secondarySourceVersions":{
           "shape":"ProjectSecondarySourceVersions",
@@ -728,6 +997,10 @@
         "logsConfig":{
           "shape":"LogsConfig",
           "documentation":"<p> Information about logs for the build project. These can be logs in Amazon CloudWatch Logs, logs uploaded to a specified S3 bucket, or both. </p>"
+        },
+        "fileSystemLocations":{
+          "shape":"ProjectFileSystemLocations",
+          "documentation":"<p> An array of <code>ProjectFileSystemLocation</code> objects for a CodeBuild build project. A <code>ProjectFileSystemLocation</code> object specifies the <code>identifier</code>, <code>location</code>, <code>mountOptions</code>, <code>mountPoint</code>, and <code>type</code> of a file system created using Amazon Elastic File System. </p>"
         }
       }
     },
@@ -740,6 +1013,37 @@
         }
       }
     },
+    "CreateReportGroupInput":{
+      "type":"structure",
+      "required":[
+        "name",
+        "type",
+        "exportConfig"
+      ],
+      "members":{
+        "name":{
+          "shape":"ReportGroupName",
+          "documentation":"<p> The name of the report group. </p>"
+        },
+        "type":{
+          "shape":"ReportType",
+          "documentation":"<p> The type of report group. </p>"
+        },
+        "exportConfig":{
+          "shape":"ReportExportConfig",
+          "documentation":"<p> A <code>ReportExportConfig</code> object that contains information about where the report group test results are exported. </p>"
+        }
+      }
+    },
+    "CreateReportGroupOutput":{
+      "type":"structure",
+      "members":{
+        "reportGroup":{
+          "shape":"ReportGroup",
+          "documentation":"<p> Information about the report group that was created. </p>"
+        }
+      }
+    },
     "CreateWebhookInput":{
       "type":"structure",
       "required":["projectName"],
@@ -786,6 +1090,51 @@
       "members":{
       }
     },
+    "DeleteReportGroupInput":{
+      "type":"structure",
+      "required":["arn"],
+      "members":{
+        "arn":{
+          "shape":"NonEmptyString",
+          "documentation":"<p> The ARN of the report group to delete. </p>"
+        }
+      }
+    },
+    "DeleteReportGroupOutput":{
+      "type":"structure",
+      "members":{
+      }
+    },
+    "DeleteReportInput":{
+      "type":"structure",
+      "required":["arn"],
+      "members":{
+        "arn":{
+          "shape":"NonEmptyString",
+          "documentation":"<p> The ARN of the report to delete. </p>"
+        }
+      }
+    },
+    "DeleteReportOutput":{
+      "type":"structure",
+      "members":{
+      }
+    },
+    "DeleteResourcePolicyInput":{
+      "type":"structure",
+      "required":["resourceArn"],
+      "members":{
+        "resourceArn":{
+          "shape":"NonEmptyString",
+          "documentation":"<p> The ARN of the resource that is associated with the resource policy. </p>"
+        }
+      }
+    },
+    "DeleteResourcePolicyOutput":{
+      "type":"structure",
+      "members":{
+      }
+    },
     "DeleteSourceCredentialsInput":{
       "type":"structure",
       "required":["arn"],
@@ -820,6 +1169,41 @@
       "members":{
       }
     },
+    "DescribeTestCasesInput":{
+      "type":"structure",
+      "required":["reportArn"],
+      "members":{
+        "reportArn":{
+          "shape":"String",
+          "documentation":"<p> The ARN of the report for which test cases are returned. </p>"
+        },
+        "nextToken":{
+          "shape":"String",
+          "documentation":"<p> During a previous call, the maximum number of items that can be returned is the value specified in <code>maxResults</code>. If there more items in the list, then a unique string called a <i>nextToken</i> is returned. To get the next batch of items in the list, call this operation again, adding the next token to the call. To get all of the items in the list, keep calling this operation with each subsequent next token that is returned, until no more next tokens are returned. </p>"
+        },
+        "maxResults":{
+          "shape":"PageSize",
+          "documentation":"<p> The maximum number of paginated test cases returned per response. Use <code>nextToken</code> to iterate pages in the list of returned <code>TestCase</code> objects. The default value is 100. </p>"
+        },
+        "filter":{
+          "shape":"TestCaseFilter",
+          "documentation":"<p> A <code>TestCaseFilter</code> object used to filter the returned reports. </p>"
+        }
+      }
+    },
+    "DescribeTestCasesOutput":{
+      "type":"structure",
+      "members":{
+        "nextToken":{
+          "shape":"String",
+          "documentation":"<p> During a previous call, the maximum number of items that can be returned is the value specified in <code>maxResults</code>. If there more items in the list, then a unique string called a <i>nextToken</i> is returned. To get the next batch of items in the list, call this operation again, adding the next token to the call. To get all of the items in the list, keep calling this operation with each subsequent next token that is returned, until no more next tokens are returned. </p>"
+        },
+        "testCases":{
+          "shape":"TestCases",
+          "documentation":"<p> The returned list of test cases. </p>"
+        }
+      }
+    },
     "EnvironmentImage":{
       "type":"structure",
       "members":{
@@ -882,7 +1266,9 @@
       "type":"string",
       "enum":[
         "WINDOWS_CONTAINER",
-        "LINUX_CONTAINER"
+        "LINUX_CONTAINER",
+        "LINUX_GPU_CONTAINER",
+        "ARM_CONTAINER"
       ]
     },
     "EnvironmentVariable":{
@@ -898,11 +1284,11 @@
         },
         "value":{
           "shape":"String",
-          "documentation":"<p>The value of the environment variable.</p> <important> <p>We strongly discourage the use of environment variables to store sensitive values, especially AWS secret key IDs and secret access keys. Environment variables can be displayed in plain text using the AWS CodeBuild console and the AWS Command Line Interface (AWS CLI).</p> </important>"
+          "documentation":"<p>The value of the environment variable.</p> <important> <p>We strongly discourage the use of <code>PLAINTEXT</code> environment variables to store sensitive values, especially AWS secret key IDs and secret access keys. <code>PLAINTEXT</code> environment variables can be displayed in plain text using the AWS CodeBuild console and the AWS Command Line Interface (AWS CLI). For sensitive values, we recommend you use an environment variable of type <code>PARAMETER_STORE</code> or <code>SECRETS_MANAGER</code>.</p> </important>"
         },
         "type":{
           "shape":"EnvironmentVariableType",
-          "documentation":"<p>The type of environment variable. Valid values include:</p> <ul> <li> <p> <code>PARAMETER_STORE</code>: An environment variable stored in Amazon EC2 Systems Manager Parameter Store.</p> </li> <li> <p> <code>PLAINTEXT</code>: An environment variable in plaintext format.</p> </li> </ul>"
+          "documentation":"<p>The type of environment variable. Valid values include:</p> <ul> <li> <p> <code>PARAMETER_STORE</code>: An environment variable stored in Amazon EC2 Systems Manager Parameter Store.</p> </li> <li> <p> <code>PLAINTEXT</code>: An environment variable in plain text format. This is the default value.</p> </li> <li> <p> <code>SECRETS_MANAGER</code>: An environment variable stored in AWS Secrets Manager.</p> </li> </ul>"
         }
       },
       "documentation":"<p>Information about an environment variable for a build project or a build.</p>"
@@ -911,13 +1297,36 @@
       "type":"string",
       "enum":[
         "PLAINTEXT",
-        "PARAMETER_STORE"
+        "PARAMETER_STORE",
+        "SECRETS_MANAGER"
       ]
     },
     "EnvironmentVariables":{
       "type":"list",
       "member":{"shape":"EnvironmentVariable"}
     },
+    "ExportedEnvironmentVariable":{
+      "type":"structure",
+      "members":{
+        "name":{
+          "shape":"NonEmptyString",
+          "documentation":"<p> The name of this exported environment variable. </p>"
+        },
+        "value":{
+          "shape":"String",
+          "documentation":"<p> The value assigned to this exported environment variable. </p> <note> <p> During a build, the value of a variable is available starting with the <code>install</code> phase. It can be updated between the start of the <code>install</code> phase and the end of the <code>post_build</code> phase. After the <code>post_build</code> phase ends, the value of exported variables cannot change.</p> </note>"
+        }
+      },
+      "documentation":"<p> Information about an exported environment variable. </p>"
+    },
+    "ExportedEnvironmentVariables":{
+      "type":"list",
+      "member":{"shape":"ExportedEnvironmentVariable"}
+    },
+    "FileSystemType":{
+      "type":"string",
+      "enum":["EFS"]
+    },
     "FilterGroup":{
       "type":"list",
       "member":{"shape":"WebhookFilter"}
@@ -926,6 +1335,25 @@
       "type":"list",
       "member":{"shape":"FilterGroup"}
     },
+    "GetResourcePolicyInput":{
+      "type":"structure",
+      "required":["resourceArn"],
+      "members":{
+        "resourceArn":{
+          "shape":"NonEmptyString",
+          "documentation":"<p> The ARN of the resource that is associated with the resource policy. </p>"
+        }
+      }
+    },
+    "GetResourcePolicyOutput":{
+      "type":"structure",
+      "members":{
+        "policy":{
+          "shape":"NonEmptyString",
+          "documentation":"<p> The resource policy for the resource identified by the input ARN parameter. </p>"
+        }
+      }
+    },
     "GitCloneDepth":{
       "type":"integer",
       "min":0
@@ -1048,7 +1476,7 @@
         },
         "nextToken":{
           "shape":"String",
-          "documentation":"<p>During a previous call, if there are more than 100 items in the list, only the first 100 items are returned, along with a unique string called a <i>next token</i>. To get the next batch of items in the list, call this operation again, adding the next token to the call. To get all of the items in the list, keep calling this operation with each subsequent next token that is returned, until no more next tokens are returned.</p>"
+          "documentation":"<p>During a previous call, if there are more than 100 items in the list, only the first 100 items are returned, along with a unique string called a <i>nextToken</i>. To get the next batch of items in the list, call this operation again, adding the next token to the call. To get all of the items in the list, keep calling this operation with each subsequent next token that is returned, until no more next tokens are returned.</p>"
         }
       }
     },
@@ -1061,7 +1489,7 @@
         },
         "nextToken":{
           "shape":"String",
-          "documentation":"<p>If there are more than 100 items in the list, only the first 100 items are returned, along with a unique string called a <i>next token</i>. To get the next batch of items in the list, call this operation again, adding the next token to the call.</p>"
+          "documentation":"<p>If there are more than 100 items in the list, only the first 100 items are returned, along with a unique string called a <i>nextToken</i>. To get the next batch of items in the list, call this operation again, adding the next token to the call.</p>"
         }
       }
     },
@@ -1074,7 +1502,7 @@
         },
         "nextToken":{
           "shape":"String",
-          "documentation":"<p>During a previous call, if there are more than 100 items in the list, only the first 100 items are returned, along with a unique string called a <i>next token</i>. To get the next batch of items in the list, call this operation again, adding the next token to the call. To get all of the items in the list, keep calling this operation with each subsequent next token that is returned, until no more next tokens are returned.</p>"
+          "documentation":"<p>During a previous call, if there are more than 100 items in the list, only the first 100 items are returned, along with a unique string called a <i>nextToken</i>. To get the next batch of items in the list, call this operation again, adding the next token to the call. To get all of the items in the list, keep calling this operation with each subsequent next token that is returned, until no more next tokens are returned.</p>"
         }
       }
     },
@@ -1087,7 +1515,7 @@
         },
         "nextToken":{
           "shape":"String",
-          "documentation":"<p>If there are more than 100 items in the list, only the first 100 items are returned, along with a unique string called a <i>next token</i>. To get the next batch of items in the list, call this operation again, adding the next token to the call.</p>"
+          "documentation":"<p>If there are more than 100 items in the list, only the first 100 items are returned, along with a unique string called a <i>nextToken</i>. To get the next batch of items in the list, call this operation again, adding the next token to the call.</p>"
         }
       }
     },
@@ -1118,7 +1546,7 @@
         },
         "nextToken":{
           "shape":"NonEmptyString",
-          "documentation":"<p>During a previous call, if there are more than 100 items in the list, only the first 100 items are returned, along with a unique string called a <i>next token</i>. To get the next batch of items in the list, call this operation again, adding the next token to the call. To get all of the items in the list, keep calling this operation with each subsequent next token that is returned, until no more next tokens are returned.</p>"
+          "documentation":"<p>During a previous call, if there are more than 100 items in the list, only the first 100 items are returned, along with a unique string called a <i>nextToken</i>. To get the next batch of items in the list, call this operation again, adding the next token to the call. To get all of the items in the list, keep calling this operation with each subsequent next token that is returned, until no more next tokens are returned.</p>"
         }
       }
     },
@@ -1127,7 +1555,7 @@
       "members":{
         "nextToken":{
           "shape":"String",
-          "documentation":"<p>If there are more than 100 items in the list, only the first 100 items are returned, along with a unique string called a <i>next token</i>. To get the next batch of items in the list, call this operation again, adding the next token to the call.</p>"
+          "documentation":"<p>If there are more than 100 items in the list, only the first 100 items are returned, along with a unique string called a <i>nextToken</i>. To get the next batch of items in the list, call this operation again, adding the next token to the call.</p>"
         },
         "projects":{
           "shape":"ProjectNames",
@@ -1135,7 +1563,182 @@
         }
       }
     },
-    "ListSourceCredentialsInput":{
+    "ListReportGroupsInput":{
+      "type":"structure",
+      "members":{
+        "sortOrder":{
+          "shape":"SortOrderType",
+          "documentation":"<p> Used to specify the order to sort the list of returned report groups. Valid values are <code>ASCENDING</code> and <code>DESCENDING</code>. </p>"
+        },
+        "sortBy":{
+          "shape":"ReportGroupSortByType",
+          "documentation":"<p> The criterion to be used to list build report groups. Valid values include: </p> <ul> <li> <p> <code>CREATED_TIME</code>: List based on when each report group was created.</p> </li> <li> <p> <code>LAST_MODIFIED_TIME</code>: List based on when each report group was last changed.</p> </li> <li> <p> <code>NAME</code>: List based on each report group's name.</p> </li> </ul>"
+        },
+        "nextToken":{
+          "shape":"String",
+          "documentation":"<p> During a previous call, the maximum number of items that can be returned is the value specified in <code>maxResults</code>. If there more items in the list, then a unique string called a <i>nextToken</i> is returned. To get the next batch of items in the list, call this operation again, adding the next token to the call. To get all of the items in the list, keep calling this operation with each subsequent next token that is returned, until no more next tokens are returned. </p>"
+        },
+        "maxResults":{
+          "shape":"PageSize",
+          "documentation":"<p> The maximum number of paginated report groups returned per response. Use <code>nextToken</code> to iterate pages in the list of returned <code>ReportGroup</code> objects. The default value is 100. </p>"
+        }
+      }
+    },
+    "ListReportGroupsOutput":{
+      "type":"structure",
+      "members":{
+        "nextToken":{
+          "shape":"String",
+          "documentation":"<p> During a previous call, the maximum number of items that can be returned is the value specified in <code>maxResults</code>. If there more items in the list, then a unique string called a <i>nextToken</i> is returned. To get the next batch of items in the list, call this operation again, adding the next token to the call. To get all of the items in the list, keep calling this operation with each subsequent next token that is returned, until no more next tokens are returned. </p>"
+        },
+        "reportGroups":{
+          "shape":"ReportGroupArns",
+          "documentation":"<p> The list of ARNs for the report groups in the current AWS account. </p>"
+        }
+      }
+    },
+    "ListReportsForReportGroupInput":{
+      "type":"structure",
+      "required":["reportGroupArn"],
+      "members":{
+        "reportGroupArn":{
+          "shape":"String",
+          "documentation":"<p> The ARN of the report group for which you want to return report ARNs. </p>"
+        },
+        "nextToken":{
+          "shape":"String",
+          "documentation":"<p> During a previous call, the maximum number of items that can be returned is the value specified in <code>maxResults</code>. If there more items in the list, then a unique string called a <i>nextToken</i> is returned. To get the next batch of items in the list, call this operation again, adding the next token to the call. To get all of the items in the list, keep calling this operation with each subsequent next token that is returned, until no more next tokens are returned. </p>"
+        },
+        "sortOrder":{
+          "shape":"SortOrderType",
+          "documentation":"<p> Use to specify whether the results are returned in ascending or descending order. </p>"
+        },
+        "maxResults":{
+          "shape":"PageSize",
+          "documentation":"<p> The maximum number of paginated reports in this report group returned per response. Use <code>nextToken</code> to iterate pages in the list of returned <code>Report</code> objects. The default value is 100. </p>"
+        },
+        "filter":{
+          "shape":"ReportFilter",
+          "documentation":"<p> A <code>ReportFilter</code> object used to filter the returned reports. </p>"
+        }
+      }
+    },
+    "ListReportsForReportGroupOutput":{
+      "type":"structure",
+      "members":{
+        "nextToken":{
+          "shape":"String",
+          "documentation":"<p> During a previous call, the maximum number of items that can be returned is the value specified in <code>maxResults</code>. If there more items in the list, then a unique string called a <i>nextToken</i> is returned. To get the next batch of items in the list, call this operation again, adding the next token to the call. To get all of the items in the list, keep calling this operation with each subsequent next token that is returned, until no more next tokens are returned. </p>"
+        },
+        "reports":{
+          "shape":"ReportArns",
+          "documentation":"<p> The list of returned report group ARNs. </p>"
+        }
+      }
+    },
+    "ListReportsInput":{
+      "type":"structure",
+      "members":{
+        "sortOrder":{
+          "shape":"SortOrderType",
+          "documentation":"<p> Specifies the sort order for the list of returned reports. Valid values are: </p> <ul> <li> <p> <code>ASCENDING</code>: return reports in chronological order based on their creation date. </p> </li> <li> <p> <code>DESCENDING</code>: return reports in the reverse chronological order based on their creation date. </p> </li> </ul>"
+        },
+        "nextToken":{
+          "shape":"String",
+          "documentation":"<p> During a previous call, the maximum number of items that can be returned is the value specified in <code>maxResults</code>. If there more items in the list, then a unique string called a <i>nextToken</i> is returned. To get the next batch of items in the list, call this operation again, adding the next token to the call. To get all of the items in the list, keep calling this operation with each subsequent next token that is returned, until no more next tokens are returned. </p>"
+        },
+        "maxResults":{
+          "shape":"PageSize",
+          "documentation":"<p> The maximum number of paginated reports returned per response. Use <code>nextToken</code> to iterate pages in the list of returned <code>Report</code> objects. The default value is 100. </p>"
+        },
+        "filter":{
+          "shape":"ReportFilter",
+          "documentation":"<p> A <code>ReportFilter</code> object used to filter the returned reports. </p>"
+        }
+      }
+    },
+    "ListReportsOutput":{
+      "type":"structure",
+      "members":{
+        "nextToken":{
+          "shape":"String",
+          "documentation":"<p> During a previous call, the maximum number of items that can be returned is the value specified in <code>maxResults</code>. If there more items in the list, then a unique string called a <i>nextToken</i> is returned. To get the next batch of items in the list, call this operation again, adding the next token to the call. To get all of the items in the list, keep calling this operation with each subsequent next token that is returned, until no more next tokens are returned. </p>"
+        },
+        "reports":{
+          "shape":"ReportArns",
+          "documentation":"<p> The list of returned ARNs for the reports in the current AWS account. </p>"
+        }
+      }
+    },
+    "ListSharedProjectsInput":{
+      "type":"structure",
+      "members":{
+        "sortBy":{
+          "shape":"SharedResourceSortByType",
+          "documentation":"<p> The criterion to be used to list build projects shared with the current AWS account or user. Valid values include: </p> <ul> <li> <p> <code>ARN</code>: List based on the ARN. </p> </li> <li> <p> <code>MODIFIED_TIME</code>: List based on when information about the shared project was last changed. </p> </li> </ul>"
+        },
+        "sortOrder":{
+          "shape":"SortOrderType",
+          "documentation":"<p>The order in which to list shared build projects. Valid values include:</p> <ul> <li> <p> <code>ASCENDING</code>: List in ascending order.</p> </li> <li> <p> <code>DESCENDING</code>: List in descending order.</p> </li> </ul>"
+        },
+        "maxResults":{
+          "shape":"PageSize",
+          "documentation":"<p> The maximum number of paginated shared build projects returned per response. Use <code>nextToken</code> to iterate pages in the list of returned <code>Project</code> objects. The default value is 100. </p>"
+        },
+        "nextToken":{
+          "shape":"NonEmptyString",
+          "documentation":"<p> During a previous call, the maximum number of items that can be returned is the value specified in <code>maxResults</code>. If there more items in the list, then a unique string called a <i>nextToken</i> is returned. To get the next batch of items in the list, call this operation again, adding the next token to the call. To get all of the items in the list, keep calling this operation with each subsequent next token that is returned, until no more next tokens are returned. </p>"
+        }
+      }
+    },
+    "ListSharedProjectsOutput":{
+      "type":"structure",
+      "members":{
+        "nextToken":{
+          "shape":"String",
+          "documentation":"<p> During a previous call, the maximum number of items that can be returned is the value specified in <code>maxResults</code>. If there more items in the list, then a unique string called a <i>nextToken</i> is returned. To get the next batch of items in the list, call this operation again, adding the next token to the call. To get all of the items in the list, keep calling this operation with each subsequent next token that is returned, until no more next tokens are returned. </p>"
+        },
+        "projects":{
+          "shape":"ProjectArns",
+          "documentation":"<p> The list of ARNs for the build projects shared with the current AWS account or user. </p>"
+        }
+      }
+    },
+    "ListSharedReportGroupsInput":{
+      "type":"structure",
+      "members":{
+        "sortOrder":{
+          "shape":"SortOrderType",
+          "documentation":"<p>The order in which to list shared report groups. Valid values include:</p> <ul> <li> <p> <code>ASCENDING</code>: List in ascending order.</p> </li> <li> <p> <code>DESCENDING</code>: List in descending order.</p> </li> </ul>"
+        },
+        "sortBy":{
+          "shape":"SharedResourceSortByType",
+          "documentation":"<p> The criterion to be used to list report groups shared with the current AWS account or user. Valid values include: </p> <ul> <li> <p> <code>ARN</code>: List based on the ARN. </p> </li> <li> <p> <code>MODIFIED_TIME</code>: List based on when information about the shared report group was last changed. </p> </li> </ul>"
+        },
+        "nextToken":{
+          "shape":"String",
+          "documentation":"<p> During a previous call, the maximum number of items that can be returned is the value specified in <code>maxResults</code>. If there more items in the list, then a unique string called a <i>nextToken</i> is returned. To get the next batch of items in the list, call this operation again, adding the next token to the call. To get all of the items in the list, keep calling this operation with each subsequent next token that is returned, until no more next tokens are returned. </p>"
+        },
+        "maxResults":{
+          "shape":"PageSize",
+          "documentation":"<p> The maximum number of paginated shared report groups per response. Use <code>nextToken</code> to iterate pages in the list of returned <code>ReportGroup</code> objects. The default value is 100. </p>"
+        }
+      }
+    },
+    "ListSharedReportGroupsOutput":{
+      "type":"structure",
+      "members":{
+        "nextToken":{
+          "shape":"String",
+          "documentation":"<p> During a previous call, the maximum number of items that can be returned is the value specified in <code>maxResults</code>. If there more items in the list, then a unique string called a <i>nextToken</i> is returned. To get the next batch of items in the list, call this operation again, adding the next token to the call. To get all of the items in the list, keep calling this operation with each subsequent next token that is returned, until no more next tokens are returned. </p>"
+        },
+        "reportGroups":{
+          "shape":"ReportGroupArns",
+          "documentation":"<p> The list of ARNs for the report groups shared with the current AWS account or user. </p>"
+        }
+      }
+    },
+    "ListSourceCredentialsInput":{
       "type":"structure",
       "members":{
       }
@@ -1189,6 +1792,14 @@
           "shape":"String",
           "documentation":"<p> The URL to a build log in an S3 bucket. </p>"
         },
+        "cloudWatchLogsArn":{
+          "shape":"String",
+          "documentation":"<p> The ARN of Amazon CloudWatch Logs for a build project. Its format is <code>arn:${Partition}:logs:${Region}:${Account}:log-group:${LogGroupName}:log-stream:${LogStreamName}</code>. For more information, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/list_amazoncloudwatchlogs.html#amazoncloudwatchlogs-resources-for-iam-policies\">Resources Defined by Amazon CloudWatch Logs</a>. </p>"
+        },
+        "s3LogsArn":{
+          "shape":"String",
+          "documentation":"<p> The ARN of S3 logs for a build project. Its format is <code>arn:${Partition}:s3:::${BucketName}/${ObjectName}</code>. For more information, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/list_amazons3.html#amazons3-resources-for-iam-policies\">Resources Defined by Amazon S3</a>. </p>"
+        },
         "cloudWatchLogs":{
           "shape":"CloudWatchLogsConfig",
           "documentation":"<p> Information about Amazon CloudWatch Logs for a build project. </p>"
@@ -1225,6 +1836,11 @@
       "documentation":"<p>There was a problem with the underlying OAuth provider.</p>",
       "exception":true
     },
+    "PageSize":{
+      "type":"integer",
+      "max":100,
+      "min":1
+    },
     "PhaseContext":{
       "type":"structure",
       "members":{
@@ -1277,7 +1893,7 @@
         },
         "sourceVersion":{
           "shape":"String",
-          "documentation":"<p>A version of the build input to be built for this project. If not specified, the latest version is used. If specified, it must be one of:</p> <ul> <li> <p>For AWS CodeCommit: the commit ID to use.</p> </li> <li> <p>For GitHub: the commit ID, pull request ID, branch name, or tag name that corresponds to the version of the source code you want to build. If a pull request ID is specified, it must use the format <code>pr/pull-request-ID</code> (for example <code>pr/25</code>). If a branch name is specified, the branch's HEAD commit ID is used. If not specified, the default branch's HEAD commit ID is used.</p> </li> <li> <p>For Bitbucket: the commit ID, branch name, or tag name that corresponds to the version of the source code you want to build. If a branch name is specified, the branch's HEAD commit ID is used. If not specified, the default branch's HEAD commit ID is used.</p> </li> <li> <p>For Amazon Simple Storage Service (Amazon S3): the version ID of the object that represents the build input ZIP file to use.</p> </li> </ul> <p> If <code>sourceVersion</code> is specified at the build level, then that version takes precedence over this <code>sourceVersion</code> (at the project level). </p> <p> For more information, see <a href=\"https://docs.aws.amazon.com/codebuild/latest/userguide/sample-source-version.html\">Source Version Sample with CodeBuild</a> in the <i>AWS CodeBuild User Guide</i>. </p>"
+          "documentation":"<p>A version of the build input to be built for this project. If not specified, the latest version is used. If specified, it must be one of:</p> <ul> <li> <p>For AWS CodeCommit: the commit ID, branch, or Git tag to use.</p> </li> <li> <p>For GitHub: the commit ID, pull request ID, branch name, or tag name that corresponds to the version of the source code you want to build. If a pull request ID is specified, it must use the format <code>pr/pull-request-ID</code> (for example <code>pr/25</code>). If a branch name is specified, the branch's HEAD commit ID is used. If not specified, the default branch's HEAD commit ID is used.</p> </li> <li> <p>For Bitbucket: the commit ID, branch name, or tag name that corresponds to the version of the source code you want to build. If a branch name is specified, the branch's HEAD commit ID is used. If not specified, the default branch's HEAD commit ID is used.</p> </li> <li> <p>For Amazon Simple Storage Service (Amazon S3): the version ID of the object that represents the build input ZIP file to use.</p> </li> </ul> <p> If <code>sourceVersion</code> is specified at the build level, then that version takes precedence over this <code>sourceVersion</code> (at the project level). </p> <p> For more information, see <a href=\"https://docs.aws.amazon.com/codebuild/latest/userguide/sample-source-version.html\">Source Version Sample with CodeBuild</a> in the <i>AWS CodeBuild User Guide</i>. </p>"
         },
         "secondarySourceVersions":{
           "shape":"ProjectSecondarySourceVersions",
@@ -1342,17 +1958,27 @@
         "logsConfig":{
           "shape":"LogsConfig",
           "documentation":"<p> Information about logs for the build project. A project can create logs in Amazon CloudWatch Logs, an S3 bucket, or both. </p>"
+        },
+        "fileSystemLocations":{
+          "shape":"ProjectFileSystemLocations",
+          "documentation":"<p> An array of <code>ProjectFileSystemLocation</code> objects for a CodeBuild build project. A <code>ProjectFileSystemLocation</code> object specifies the <code>identifier</code>, <code>location</code>, <code>mountOptions</code>, <code>mountPoint</code>, and <code>type</code> of a file system created using Amazon Elastic File System. </p>"
         }
       },
       "documentation":"<p>Information about a build project.</p>"
     },
+    "ProjectArns":{
+      "type":"list",
+      "member":{"shape":"NonEmptyString"},
+      "max":100,
+      "min":1
+    },
     "ProjectArtifacts":{
       "type":"structure",
       "required":["type"],
       "members":{
         "type":{
           "shape":"ArtifactsType",
-          "documentation":"<p>The type of build output artifact. Valid values include:</p> <ul> <li> <p> <code>CODEPIPELINE</code>: The build project has build output generated through AWS CodePipeline.</p> </li> <li> <p> <code>NO_ARTIFACTS</code>: The build project does not produce any build output.</p> </li> <li> <p> <code>S3</code>: The build project stores build output in Amazon Simple Storage Service (Amazon S3).</p> </li> </ul>"
+          "documentation":"<p>The type of build output artifact. Valid values include:</p> <ul> <li> <p> <code>CODEPIPELINE</code>: The build project has build output generated through AWS CodePipeline. </p> <note> <p>The <code>CODEPIPELINE</code> type is not supported for <code>secondaryArtifacts</code>.</p> </note> </li> <li> <p> <code>NO_ARTIFACTS</code>: The build project does not produce any build output.</p> </li> <li> <p> <code>S3</code>: The build project stores build output in Amazon Simple Storage Service (Amazon S3).</p> </li> </ul>"
         },
         "location":{
           "shape":"String",
@@ -1376,7 +2002,7 @@
         },
         "overrideArtifactName":{
           "shape":"WrapperBoolean",
-          "documentation":"<p> If this flag is set, a name specified in the build spec file overrides the artifact name. The name specified in a build spec file is calculated at build time and uses the Shell Command Language. For example, you can append a date and time to your artifact name so that it is always unique. </p>"
+          "documentation":"<p> If this flag is set, a name specified in the buildspec file overrides the artifact name. The name specified in a buildspec file is calculated at build time and uses the Shell Command Language. For example, you can append a date and time to your artifact name so that it is always unique. </p>"
         },
         "encryptionDisabled":{
           "shape":"WrapperBoolean",
@@ -1423,7 +2049,7 @@
         },
         "modes":{
           "shape":"ProjectCacheModes",
-          "documentation":"<p> If you use a <code>LOCAL</code> cache, the local cache mode. You can use one or more local cache modes at the same time. </p> <ul> <li> <p> <code>LOCAL_SOURCE_CACHE</code> mode caches Git metadata for primary and secondary sources. After the cache is created, subsequent builds pull only the change between commits. This mode is a good choice for projects with a clean working directory and a source that is a large Git repository. If you choose this option and your project does not use a Git repository (GitHub, GitHub Enterprise, or Bitbucket), the option is ignored. </p> </li> <li> <p> <code>LOCAL_DOCKER_LAYER_CACHE</code> mode caches existing Docker layers. This mode is a good choice for projects that build or pull large Docker images. It can prevent the performance issues caused by pulling large Docker images down from the network. </p> <note> <ul> <li> <p> You can use a Docker layer cache in the Linux environment only. </p> </li> <li> <p> The <code>privileged</code> flag must be set so that your project has the required Docker permissions. </p> </li> <li> <p> You should consider the security implications before you use a Docker layer cache. </p> </li> </ul> </note> </li> </ul> <ul> <li> <p> <code>LOCAL_CUSTOM_CACHE</code> mode caches directories you specify in the buildspec file. This mode is a good choice if your build scenario is not suited to one of the other three local cache modes. If you use a custom cache: </p> <ul> <li> <p> Only directories can be specified for caching. You cannot specify individual files. </p> </li> <li> <p> Symlinks are used to reference cached directories. </p> </li> <li> <p> Cached directories are linked to your build before it downloads its project sources. Cached items are overriden if a source item has the same name. Directories are specified using cache paths in the buildspec file. </p> </li> </ul> </li> </ul>"
+          "documentation":"<p> If you use a <code>LOCAL</code> cache, the local cache mode. You can use one or more local cache modes at the same time. </p> <ul> <li> <p> <code>LOCAL_SOURCE_CACHE</code> mode caches Git metadata for primary and secondary sources. After the cache is created, subsequent builds pull only the change between commits. This mode is a good choice for projects with a clean working directory and a source that is a large Git repository. If you choose this option and your project does not use a Git repository (GitHub, GitHub Enterprise, or Bitbucket), the option is ignored. </p> </li> <li> <p> <code>LOCAL_DOCKER_LAYER_CACHE</code> mode caches existing Docker layers. This mode is a good choice for projects that build or pull large Docker images. It can prevent the performance issues caused by pulling large Docker images down from the network. </p> <note> <ul> <li> <p> You can use a Docker layer cache in the Linux environment only. </p> </li> <li> <p> The <code>privileged</code> flag must be set so that your project has the required Docker permissions. </p> </li> <li> <p> You should consider the security implications before you use a Docker layer cache. </p> </li> </ul> </note> </li> </ul> <ul> <li> <p> <code>LOCAL_CUSTOM_CACHE</code> mode caches directories you specify in the buildspec file. This mode is a good choice if your build scenario is not suited to one of the other three local cache modes. If you use a custom cache: </p> <ul> <li> <p> Only directories can be specified for caching. You cannot specify individual files. </p> </li> <li> <p> Symlinks are used to reference cached directories. </p> </li> <li> <p> Cached directories are linked to your build before it downloads its project sources. Cached items are overridden if a source item has the same name. Directories are specified using cache paths in the buildspec file. </p> </li> </ul> </li> </ul>"
         }
       },
       "documentation":"<p>Information about the cache for the build project.</p>"
@@ -1447,7 +2073,7 @@
       "members":{
         "type":{
           "shape":"EnvironmentType",
-          "documentation":"<p>The type of build environment to use for related builds.</p>"
+          "documentation":"<p>The type of build environment to use for related builds.</p> <ul> <li> <p>The environment type <code>ARM_CONTAINER</code> is available only in regions US East (N. Virginia), US East (Ohio), US West (Oregon), EU (Ireland), Asia Pacific (Mumbai), Asia Pacific (Tokyo), Asia Pacific (Sydney), and EU (Frankfurt).</p> </li> <li> <p>The environment type <code>LINUX_CONTAINER</code> with compute type <code>build.general1.2xlarge</code> is available only in regions US East (N. Virginia), US East (N. Virginia), US West (Oregon), Canada (Central), EU (Ireland), EU (London), EU (Frankfurt), Asia Pacific (Tokyo), Asia Pacific (Seoul), Asia Pacific (Singapore), Asia Pacific (Sydney), China (Beijing), and China (Ningxia).</p> </li> <li> <p>The environment type <code>LINUX_GPU_CONTAINER</code> is available only in regions US East (N. Virginia), US East (N. Virginia), US West (Oregon), Canada (Central), EU (Ireland), EU (London), EU (Frankfurt), Asia Pacific (Tokyo), Asia Pacific (Seoul), Asia Pacific (Singapore), Asia Pacific (Sydney) , China (Beijing), and China (Ningxia).</p> </li> </ul>"
         },
         "image":{
           "shape":"NonEmptyString",
@@ -1455,7 +2081,7 @@
         },
         "computeType":{
           "shape":"ComputeType",
-          "documentation":"<p>Information about the compute resources the build project uses. Available values include:</p> <ul> <li> <p> <code>BUILD_GENERAL1_SMALL</code>: Use up to 3 GB memory and 2 vCPUs for builds.</p> </li> <li> <p> <code>BUILD_GENERAL1_MEDIUM</code>: Use up to 7 GB memory and 4 vCPUs for builds.</p> </li> <li> <p> <code>BUILD_GENERAL1_LARGE</code>: Use up to 15 GB memory and 8 vCPUs for builds.</p> </li> </ul>"
+          "documentation":"<p>Information about the compute resources the build project uses. Available values include:</p> <ul> <li> <p> <code>BUILD_GENERAL1_SMALL</code>: Use up to 3 GB memory and 2 vCPUs for builds.</p> </li> <li> <p> <code>BUILD_GENERAL1_MEDIUM</code>: Use up to 7 GB memory and 4 vCPUs for builds.</p> </li> <li> <p> <code>BUILD_GENERAL1_LARGE</code>: Use up to 16 GB memory and 8 vCPUs for builds, depending on your environment type.</p> </li> <li> <p> <code>BUILD_GENERAL1_2XLARGE</code>: Use up to 145 GB memory, 72 vCPUs, and 824 GB of SSD storage for builds. This compute type supports Docker images up to 100 GB uncompressed.</p> </li> </ul> <p> If you use <code>BUILD_GENERAL1_LARGE</code>: </p> <ul> <li> <p> For environment type <code>LINUX_CONTAINER</code>, you can use up to 15 GB memory and 8 vCPUs for builds. </p> </li> <li> <p> For environment type <code>LINUX_GPU_CONTAINER</code>, you can use up to 255 GB memory, 32 vCPUs, and 4 NVIDIA Tesla V100 GPUs for builds.</p> </li> <li> <p> For environment type <code>ARM_CONTAINER</code>, you can use up to 16 GB memory and 8 vCPUs on ARM-based processors for builds.</p> </li> </ul> <p> For more information, see <a href=\"https://docs.aws.amazon.com/codebuild/latest/userguide/build-env-ref-compute-types.html\">Build Environment Compute Types</a> in the <i>AWS CodeBuild User Guide.</i> </p>"
         },
         "environmentVariables":{
           "shape":"EnvironmentVariables",
@@ -1463,7 +2089,7 @@
         },
         "privilegedMode":{
           "shape":"WrapperBoolean",
-          "documentation":"<p>Enables running the Docker daemon inside a Docker container. Set to true only if the build project is used to build Docker images. Otherwise, a build that attempts to interact with the Docker daemon fails.</p> <p>You can initialize the Docker daemon during the install phase of your build by adding one of the following sets of commands to the install phase of your buildspec file:</p> <p>If the operating system's base image is Ubuntu Linux:</p> <p> <code>- nohup /usr/local/bin/dockerd --host=unix:///var/run/docker.sock --host=tcp://0.0.0.0:2375 --storage-driver=overlay&amp;</code> </p> <p> <code>- timeout 15 sh -c \"until docker info; do echo .; sleep 1; done\"</code> </p> <p>If the operating system's base image is Alpine Linux and the previous command does not work, add the <code>-t</code> argument to <code>timeout</code>:</p> <p> <code>- nohup /usr/local/bin/dockerd --host=unix:///var/run/docker.sock --host=tcp://0.0.0.0:2375 --storage-driver=overlay&amp;</code> </p> <p> <code>- timeout -t 15 sh -c \"until docker info; do echo .; sleep 1; done\"</code> </p>"
+          "documentation":"<p>Enables running the Docker daemon inside a Docker container. Set to true only if the build project is used to build Docker images. Otherwise, a build that attempts to interact with the Docker daemon fails. The default setting is <code>false</code>.</p> <p>You can initialize the Docker daemon during the install phase of your build by adding one of the following sets of commands to the install phase of your buildspec file:</p> <p>If the operating system's base image is Ubuntu Linux:</p> <p> <code>- nohup /usr/local/bin/dockerd --host=unix:///var/run/docker.sock --host=tcp://0.0.0.0:2375 --storage-driver=overlay&amp;</code> </p> <p> <code>- timeout 15 sh -c \"until docker info; do echo .; sleep 1; done\"</code> </p> <p>If the operating system's base image is Alpine Linux and the previous command does not work, add the <code>-t</code> argument to <code>timeout</code>:</p> <p> <code>- nohup /usr/local/bin/dockerd --host=unix:///var/run/docker.sock --host=tcp://0.0.0.0:2375 --storage-driver=overlay&amp;</code> </p> <p> <code>- timeout -t 15 sh -c \"until docker info; do echo .; sleep 1; done\"</code> </p>"
         },
         "certificate":{
           "shape":"String",
@@ -1480,6 +2106,36 @@
       },
       "documentation":"<p>Information about the build environment of the build project.</p>"
     },
+    "ProjectFileSystemLocation":{
+      "type":"structure",
+      "members":{
+        "type":{
+          "shape":"FileSystemType",
+          "documentation":"<p> The type of the file system. The one supported type is <code>EFS</code>. </p>"
+        },
+        "location":{
+          "shape":"String",
+          "documentation":"<p> A string that specifies the location of the file system created by Amazon EFS. Its format is <code>efs-dns-name:/directory-path</code>. You can find the DNS name of file system when you view it in the AWS EFS console. The directory path is a path to a directory in the file system that CodeBuild mounts. For example, if the DNS name of a file system is <code>fs-abcd1234.efs.us-west-2.amazonaws.com</code>, and its mount directory is <code>my-efs-mount-directory</code>, then the <code>location</code> is <code>fs-abcd1234.efs.us-west-2.amazonaws.com:/my-efs-mount-directory</code>. </p> <p> The directory path in the format <code>efs-dns-name:/directory-path</code> is optional. If you do not specify a directory path, the location is only the DNS name and CodeBuild mounts the entire file system. </p>"
+        },
+        "mountPoint":{
+          "shape":"String",
+          "documentation":"<p> The location in the container where you mount the file system. </p>"
+        },
+        "identifier":{
+          "shape":"String",
+          "documentation":"<p> The name used to access a file system created by Amazon EFS. CodeBuild creates an environment variable by appending the <code>identifier</code> in all capital letters to <code>CODEBUILD_</code>. For example, if you specify <code>my-efs</code> for <code>identifier</code>, a new environment variable is create named <code>CODEBUILD_MY-EFS</code>. </p> <p> The <code>identifier</code> is used to mount your file system. </p>"
+        },
+        "mountOptions":{
+          "shape":"String",
+          "documentation":"<p> The mount options for a file system created by AWS EFS. The default mount options used by CodeBuild are <code>nfsvers=4.1,rsize=1048576,wsize=1048576,hard,timeo=600,retrans=2</code>. For more information, see <a href=\"https://docs.aws.amazon.com/efs/latest/ug/mounting-fs-nfs-mount-settings.html\">Recommended NFS Mount Options</a>. </p>"
+        }
+      },
+      "documentation":"<p> Information about a file system created by Amazon Elastic File System (EFS). For more information, see <a href=\"https://docs.aws.amazon.com/efs/latest/ug/whatisefs.html\">What Is Amazon Elastic File System?</a> </p>"
+    },
+    "ProjectFileSystemLocations":{
+      "type":"list",
+      "member":{"shape":"ProjectFileSystemLocation"}
+    },
     "ProjectName":{
       "type":"string",
       "max":255,
@@ -1512,11 +2168,11 @@
       "members":{
         "type":{
           "shape":"SourceType",
-          "documentation":"<p>The type of repository that contains the source code to be built. Valid values include:</p> <ul> <li> <p> <code>BITBUCKET</code>: The source code is in a Bitbucket repository.</p> </li> <li> <p> <code>CODECOMMIT</code>: The source code is in an AWS CodeCommit repository.</p> </li> <li> <p> <code>CODEPIPELINE</code>: The source code settings are specified in the source action of a pipeline in AWS CodePipeline.</p> </li> <li> <p> <code>GITHUB</code>: The source code is in a GitHub repository.</p> </li> <li> <p> <code>NO_SOURCE</code>: The project does not have input source code.</p> </li> <li> <p> <code>S3</code>: The source code is in an Amazon Simple Storage Service (Amazon S3) input bucket.</p> </li> </ul>"
+          "documentation":"<p>The type of repository that contains the source code to be built. Valid values include:</p> <ul> <li> <p> <code>BITBUCKET</code>: The source code is in a Bitbucket repository.</p> </li> <li> <p> <code>CODECOMMIT</code>: The source code is in an AWS CodeCommit repository.</p> </li> <li> <p> <code>CODEPIPELINE</code>: The source code settings are specified in the source action of a pipeline in AWS CodePipeline.</p> </li> <li> <p> <code>GITHUB</code>: The source code is in a GitHub repository.</p> </li> <li> <p> <code>GITHUB_ENTERPRISE</code>: The source code is in a GitHub Enterprise repository.</p> </li> <li> <p> <code>NO_SOURCE</code>: The project does not have input source code.</p> </li> <li> <p> <code>S3</code>: The source code is in an Amazon Simple Storage Service (Amazon S3) input bucket.</p> </li> </ul>"
         },
         "location":{
           "shape":"String",
-          "documentation":"<p>Information about the location of the source code to be built. Valid values include:</p> <ul> <li> <p>For source code settings that are specified in the source action of a pipeline in AWS CodePipeline, <code>location</code> should not be specified. If it is specified, AWS CodePipeline ignores it. This is because AWS CodePipeline uses the settings in a pipeline's source action instead of this value.</p> </li> <li> <p>For source code in an AWS CodeCommit repository, the HTTPS clone URL to the repository that contains the source code and the build spec (for example, <code>https://git-codecommit.<i>region-ID</i>.amazonaws.com/v1/repos/<i>repo-name</i> </code>).</p> </li> <li> <p>For source code in an Amazon Simple Storage Service (Amazon S3) input bucket, one of the following. </p> <ul> <li> <p> The path to the ZIP file that contains the source code (for example, <code> <i>bucket-name</i>/<i>path</i>/<i>to</i>/<i>object-name</i>.zip</code>). </p> </li> <li> <p> The path to the folder that contains the source code (for example, <code> <i>bucket-name</i>/<i>path</i>/<i>to</i>/<i>source-code</i>/<i>folder</i>/</code>). </p> </li> </ul> </li> <li> <p>For source code in a GitHub repository, the HTTPS clone URL to the repository that contains the source and the build spec. You must connect your AWS account to your GitHub account. Use the AWS CodeBuild console to start creating a build project. When you use the console to connect (or reconnect) with GitHub, on the GitHub <b>Authorize application</b> page, for <b>Organization access</b>, choose <b>Request access</b> next to each repository you want to allow AWS CodeBuild to have access to, and then choose <b>Authorize application</b>. (After you have connected to your GitHub account, you do not need to finish creating the build project. You can leave the AWS CodeBuild console.) To instruct AWS CodeBuild to use this connection, in the <code>source</code> object, set the <code>auth</code> object's <code>type</code> value to <code>OAUTH</code>.</p> </li> <li> <p>For source code in a Bitbucket repository, the HTTPS clone URL to the repository that contains the source and the build spec. You must connect your AWS account to your Bitbucket account. Use the AWS CodeBuild console to start creating a build project. When you use the console to connect (or reconnect) with Bitbucket, on the Bitbucket <b>Confirm access to your account</b> page, choose <b>Grant access</b>. (After you have connected to your Bitbucket account, you do not need to finish creating the build project. You can leave the AWS CodeBuild console.) To instruct AWS CodeBuild to use this connection, in the <code>source</code> object, set the <code>auth</code> object's <code>type</code> value to <code>OAUTH</code>.</p> </li> </ul>"
+          "documentation":"<p>Information about the location of the source code to be built. Valid values include:</p> <ul> <li> <p>For source code settings that are specified in the source action of a pipeline in AWS CodePipeline, <code>location</code> should not be specified. If it is specified, AWS CodePipeline ignores it. This is because AWS CodePipeline uses the settings in a pipeline's source action instead of this value.</p> </li> <li> <p>For source code in an AWS CodeCommit repository, the HTTPS clone URL to the repository that contains the source code and the buildspec file (for example, <code>https://git-codecommit.<i>region-ID</i>.amazonaws.com/v1/repos/<i>repo-name</i> </code>).</p> </li> <li> <p>For source code in an Amazon Simple Storage Service (Amazon S3) input bucket, one of the following. </p> <ul> <li> <p> The path to the ZIP file that contains the source code (for example, <code> <i>bucket-name</i>/<i>path</i>/<i>to</i>/<i>object-name</i>.zip</code>). </p> </li> <li> <p> The path to the folder that contains the source code (for example, <code> <i>bucket-name</i>/<i>path</i>/<i>to</i>/<i>source-code</i>/<i>folder</i>/</code>). </p> </li> </ul> </li> <li> <p>For source code in a GitHub repository, the HTTPS clone URL to the repository that contains the source and the buildspec file. You must connect your AWS account to your GitHub account. Use the AWS CodeBuild console to start creating a build project. When you use the console to connect (or reconnect) with GitHub, on the GitHub <b>Authorize application</b> page, for <b>Organization access</b>, choose <b>Request access</b> next to each repository you want to allow AWS CodeBuild to have access to, and then choose <b>Authorize application</b>. (After you have connected to your GitHub account, you do not need to finish creating the build project. You can leave the AWS CodeBuild console.) To instruct AWS CodeBuild to use this connection, in the <code>source</code> object, set the <code>auth</code> object's <code>type</code> value to <code>OAUTH</code>.</p> </li> <li> <p>For source code in a Bitbucket repository, the HTTPS clone URL to the repository that contains the source and the buildspec file. You must connect your AWS account to your Bitbucket account. Use the AWS CodeBuild console to start creating a build project. When you use the console to connect (or reconnect) with Bitbucket, on the Bitbucket <b>Confirm access to your account</b> page, choose <b>Grant access</b>. (After you have connected to your Bitbucket account, you do not need to finish creating the build project. You can leave the AWS CodeBuild console.) To instruct AWS CodeBuild to use this connection, in the <code>source</code> object, set the <code>auth</code> object's <code>type</code> value to <code>OAUTH</code>.</p> </li> </ul>"
         },
         "gitCloneDepth":{
           "shape":"GitCloneDepth",
@@ -1528,7 +2184,7 @@
         },
         "buildspec":{
           "shape":"String",
-          "documentation":"<p>The build spec declaration to use for the builds in this build project.</p> <p>If this value is not specified, a build spec must be included along with the source code to be built.</p>"
+          "documentation":"<p>The buildspec file declaration to use for the builds in this build project.</p> <p> If this value is set, it can be either an inline buildspec definition, the path to an alternate buildspec file relative to the value of the built-in <code>CODEBUILD_SRC_DIR</code> environment variable, or the path to an S3 bucket. The bucket must be in the same AWS Region as the build project. Specify the buildspec file using its ARN (for example, <code>arn:aws:s3:::my-codebuild-sample2/buildspec.yml</code>). If this value is not provided or is set to an empty string, the source code must contain a buildspec file in its root directory. For more information, see <a href=\"https://docs.aws.amazon.com/codebuild/latest/userguide/build-spec-ref.html#build-spec-ref-name-storage\">Buildspec File Name and Storage Location</a>. </p>"
         },
         "auth":{
           "shape":"SourceAuth",
@@ -1536,7 +2192,7 @@
         },
         "reportBuildStatus":{
           "shape":"WrapperBoolean",
-          "documentation":"<p> Set to true to report the status of a build's start and finish to your source provider. This option is valid only when your source provider is GitHub, GitHub Enterprise, or Bitbucket. If this is set and you use a different source provider, an invalidInputException is thrown. </p>"
+          "documentation":"<p> Set to true to report the status of a build's start and finish to your source provider. This option is valid only when your source provider is GitHub, GitHub Enterprise, or Bitbucket. If this is set and you use a different source provider, an invalidInputException is thrown. </p> <note> <p> The status of a build triggered by a webhook is always reported to your source provider. </p> </note>"
         },
         "insecureSsl":{
           "shape":"WrapperBoolean",
@@ -1562,7 +2218,7 @@
         },
         "sourceVersion":{
           "shape":"String",
-          "documentation":"<p>The source version for the corresponding source identifier. If specified, must be one of:</p> <ul> <li> <p>For AWS CodeCommit: the commit ID to use.</p> </li> <li> <p>For GitHub: the commit ID, pull request ID, branch name, or tag name that corresponds to the version of the source code you want to build. If a pull request ID is specified, it must use the format <code>pr/pull-request-ID</code> (for example, <code>pr/25</code>). If a branch name is specified, the branch's HEAD commit ID is used. If not specified, the default branch's HEAD commit ID is used.</p> </li> <li> <p>For Bitbucket: the commit ID, branch name, or tag name that corresponds to the version of the source code you want to build. If a branch name is specified, the branch's HEAD commit ID is used. If not specified, the default branch's HEAD commit ID is used.</p> </li> <li> <p>For Amazon Simple Storage Service (Amazon S3): the version ID of the object that represents the build input ZIP file to use.</p> </li> </ul> <p> For more information, see <a href=\"https://docs.aws.amazon.com/codebuild/latest/userguide/sample-source-version.html\">Source Version Sample with CodeBuild</a> in the <i>AWS CodeBuild User Guide</i>. </p>"
+          "documentation":"<p>The source version for the corresponding source identifier. If specified, must be one of:</p> <ul> <li> <p>For AWS CodeCommit: the commit ID, branch, or Git tag to use.</p> </li> <li> <p>For GitHub: the commit ID, pull request ID, branch name, or tag name that corresponds to the version of the source code you want to build. If a pull request ID is specified, it must use the format <code>pr/pull-request-ID</code> (for example, <code>pr/25</code>). If a branch name is specified, the branch's HEAD commit ID is used. If not specified, the default branch's HEAD commit ID is used.</p> </li> <li> <p>For Bitbucket: the commit ID, branch name, or tag name that corresponds to the version of the source code you want to build. If a branch name is specified, the branch's HEAD commit ID is used. If not specified, the default branch's HEAD commit ID is used.</p> </li> <li> <p>For Amazon Simple Storage Service (Amazon S3): the version ID of the object that represents the build input ZIP file to use.</p> </li> </ul> <p> For more information, see <a href=\"https://docs.aws.amazon.com/codebuild/latest/userguide/sample-source-version.html\">Source Version Sample with CodeBuild</a> in the <i>AWS CodeBuild User Guide</i>. </p>"
         }
       },
       "documentation":"<p> A source identifier and its corresponding version. </p>"
@@ -1577,6 +2233,32 @@
       "type":"list",
       "member":{"shape":"Project"}
     },
+    "PutResourcePolicyInput":{
+      "type":"structure",
+      "required":[
+        "policy",
+        "resourceArn"
+      ],
+      "members":{
+        "policy":{
+          "shape":"NonEmptyString",
+          "documentation":"<p> A JSON-formatted resource policy. For more information, see <a href=\"https://docs.aws.amazon.com/codebuild/latest/userguide/project-sharing.html#project-sharing-share\">Sharing a Project</a> and <a href=\"https://docs.aws.amazon.com/codebuild/latest/userguide/report-groups-sharing.html#report-groups-sharing-share\">Sharing a Report Group</a> in the <i>AWS CodeBuild User Guide</i>. </p>"
+        },
+        "resourceArn":{
+          "shape":"NonEmptyString",
+          "documentation":"<p> The ARN of the <code>Project</code> or <code>ReportGroup</code> resource you want to associate with a resource policy. </p>"
+        }
+      }
+    },
+    "PutResourcePolicyOutput":{
+      "type":"structure",
+      "members":{
+        "resourceArn":{
+          "shape":"NonEmptyString",
+          "documentation":"<p> The ARN of the <code>Project</code> or <code>ReportGroup</code> resource that is associated with a resource policy. </p>"
+        }
+      }
+    },
     "RegistryCredential":{
       "type":"structure",
       "required":[
@@ -1586,7 +2268,7 @@
       "members":{
         "credential":{
           "shape":"NonEmptyString",
-          "documentation":"<p> The Amazon Resource Name (ARN) or name of credentials created using AWS Secrets Manager. </p> <note> <p> The <code>credential</code> can use the name of the credentials only if they exist in your current region. </p> </note>"
+          "documentation":"<p> The Amazon Resource Name (ARN) or name of credentials created using AWS Secrets Manager. </p> <note> <p> The <code>credential</code> can use the name of the credentials only if they exist in your current AWS Region. </p> </note>"
         },
         "credentialProvider":{
           "shape":"CredentialProviderType",
@@ -1595,6 +2277,180 @@
       },
       "documentation":"<p> Information about credentials that provide access to a private Docker registry. When this is set: </p> <ul> <li> <p> <code>imagePullCredentialsType</code> must be set to <code>SERVICE_ROLE</code>. </p> </li> <li> <p> images cannot be curated or an Amazon ECR image.</p> </li> </ul> <p> For more information, see <a href=\"https://docs.aws.amazon.com/codebuild/latest/userguide/sample-private-registry.html\">Private Registry with AWS Secrets Manager Sample for AWS CodeBuild</a>. </p>"
     },
+    "Report":{
+      "type":"structure",
+      "members":{
+        "arn":{
+          "shape":"NonEmptyString",
+          "documentation":"<p> The ARN of the report run. </p>"
+        },
+        "type":{
+          "shape":"ReportType",
+          "documentation":"<p> The type of the report that was run. </p>"
+        },
+        "name":{
+          "shape":"String",
+          "documentation":"<p> The name of the report that was run. </p>"
+        },
+        "reportGroupArn":{
+          "shape":"NonEmptyString",
+          "documentation":"<p> The ARN of the report group associated with this report. </p>"
+        },
+        "executionId":{
+          "shape":"String",
+          "documentation":"<p> The ARN of the build run that generated this report. </p>"
+        },
+        "status":{
+          "shape":"ReportStatusType",
+          "documentation":"<p> The status of this report. </p>"
+        },
+        "created":{
+          "shape":"Timestamp",
+          "documentation":"<p> The date and time this report run occurred. </p>"
+        },
+        "expired":{
+          "shape":"Timestamp",
+          "documentation":"<p> The date and time a report expires. A report expires 30 days after it is created. An expired report is not available to view in CodeBuild. </p>"
+        },
+        "exportConfig":{
+          "shape":"ReportExportConfig",
+          "documentation":"<p> Information about where the raw data used to generate this report was exported. </p>"
+        },
+        "truncated":{
+          "shape":"WrapperBoolean",
+          "documentation":"<p> A boolean that specifies if this report run is truncated. The list of test cases is truncated after the maximum number of test cases is reached. </p>"
+        },
+        "testSummary":{
+          "shape":"TestReportSummary",
+          "documentation":"<p> A <code>TestReportSummary</code> object that contains information about this test report. </p>"
+        }
+      },
+      "documentation":"<p> Information about the results from running a series of test cases during the run of a build project. The test cases are specified in the buildspec for the build project using one or more paths to the test case files. You can specify any type of tests you want, such as unit tests, integration tests, and functional tests. </p>"
+    },
+    "ReportArns":{
+      "type":"list",
+      "member":{"shape":"NonEmptyString"},
+      "max":100,
+      "min":1
+    },
+    "ReportExportConfig":{
+      "type":"structure",
+      "members":{
+        "exportConfigType":{
+          "shape":"ReportExportConfigType",
+          "documentation":"<p> The export configuration type. Valid values are: </p> <ul> <li> <p> <code>S3</code>: The report results are exported to an S3 bucket. </p> </li> <li> <p> <code>NO_EXPORT</code>: The report results are not exported. </p> </li> </ul>"
+        },
+        "s3Destination":{
+          "shape":"S3ReportExportConfig",
+          "documentation":"<p> A <code>S3ReportExportConfig</code> object that contains information about the S3 bucket where the run of a report is exported. </p>"
+        }
+      },
+      "documentation":"<p> Information about the location where the run of a report is exported. </p>"
+    },
+    "ReportExportConfigType":{
+      "type":"string",
+      "enum":[
+        "S3",
+        "NO_EXPORT"
+      ]
+    },
+    "ReportFilter":{
+      "type":"structure",
+      "members":{
+        "status":{
+          "shape":"ReportStatusType",
+          "documentation":"<p> The status used to filter reports. You can filter using one status only. </p>"
+        }
+      },
+      "documentation":"<p> A filter used to return reports with the status specified by the input <code>status</code> parameter. </p>"
+    },
+    "ReportGroup":{
+      "type":"structure",
+      "members":{
+        "arn":{
+          "shape":"NonEmptyString",
+          "documentation":"<p> The ARN of a <code>ReportGroup</code>. </p>"
+        },
+        "name":{
+          "shape":"ReportGroupName",
+          "documentation":"<p> The name of a <code>ReportGroup</code>. </p>"
+        },
+        "type":{
+          "shape":"ReportType",
+          "documentation":"<p> The type of the <code>ReportGroup</code>. The one valid value is <code>TEST</code>. </p>"
+        },
+        "exportConfig":{
+          "shape":"ReportExportConfig",
+          "documentation":"<p> Information about the destination where the raw data of this <code>ReportGroup</code> is exported. </p>"
+        },
+        "created":{
+          "shape":"Timestamp",
+          "documentation":"<p> The date and time this <code>ReportGroup</code> was created. </p>"
+        },
+        "lastModified":{
+          "shape":"Timestamp",
+          "documentation":"<p> The date and time this <code>ReportGroup</code> was last modified. </p>"
+        }
+      },
+      "documentation":"<p> A series of reports. Each report contains information about the results from running a series of test cases. You specify the test cases for a report group in the buildspec for a build project using one or more paths to the test case files. </p>"
+    },
+    "ReportGroupArns":{
+      "type":"list",
+      "member":{"shape":"NonEmptyString"},
+      "max":100,
+      "min":1
+    },
+    "ReportGroupName":{
+      "type":"string",
+      "max":128,
+      "min":2
+    },
+    "ReportGroupSortByType":{
+      "type":"string",
+      "enum":[
+        "NAME",
+        "CREATED_TIME",
+        "LAST_MODIFIED_TIME"
+      ]
+    },
+    "ReportGroups":{
+      "type":"list",
+      "member":{"shape":"ReportGroup"},
+      "max":100,
+      "min":1
+    },
+    "ReportPackagingType":{
+      "type":"string",
+      "enum":[
+        "ZIP",
+        "NONE"
+      ]
+    },
+    "ReportStatusCounts":{
+      "type":"map",
+      "key":{"shape":"String"},
+      "value":{"shape":"WrapperInt"}
+    },
+    "ReportStatusType":{
+      "type":"string",
+      "enum":[
+        "GENERATING",
+        "SUCCEEDED",
+        "FAILED",
+        "INCOMPLETE",
+        "DELETING"
+      ]
+    },
+    "ReportType":{
+      "type":"string",
+      "enum":["TEST"]
+    },
+    "Reports":{
+      "type":"list",
+      "member":{"shape":"Report"},
+      "max":100,
+      "min":1
+    },
     "ResourceAlreadyExistsException":{
       "type":"structure",
       "members":{
@@ -1628,6 +2484,32 @@
       },
       "documentation":"<p> Information about S3 logs for a build project. </p>"
     },
+    "S3ReportExportConfig":{
+      "type":"structure",
+      "members":{
+        "bucket":{
+          "shape":"NonEmptyString",
+          "documentation":"<p> The name of the S3 bucket where the raw data of a report are exported. </p>"
+        },
+        "path":{
+          "shape":"String",
+          "documentation":"<p> The path to the exported report's raw data results. </p>"
+        },
+        "packaging":{
+          "shape":"ReportPackagingType",
+          "documentation":"<p> The type of build output artifact to create. Valid values include: </p> <ul> <li> <p> <code>NONE</code>: AWS CodeBuild creates the raw data in the output bucket. This is the default if packaging is not specified. </p> </li> <li> <p> <code>ZIP</code>: AWS CodeBuild creates a ZIP file with the raw data in the output bucket. </p> </li> </ul>"
+        },
+        "encryptionKey":{
+          "shape":"NonEmptyString",
+          "documentation":"<p> The encryption key for the report's encrypted raw data. </p>"
+        },
+        "encryptionDisabled":{
+          "shape":"WrapperBoolean",
+          "documentation":"<p> A boolean value that specifies if the results of a report are encrypted. </p>"
+        }
+      },
+      "documentation":"<p> Information about the S3 bucket where the raw data of a report are exported. </p>"
+    },
     "SecurityGroupIds":{
       "type":"list",
       "member":{"shape":"NonEmptyString"},
@@ -1646,6 +2528,13 @@
         "GITHUB_ENTERPRISE"
       ]
     },
+    "SharedResourceSortByType":{
+      "type":"string",
+      "enum":[
+        "ARN",
+        "MODIFIED_TIME"
+      ]
+    },
     "SortOrderType":{
       "type":"string",
       "enum":[
@@ -1724,7 +2613,7 @@
         },
         "sourceVersion":{
           "shape":"String",
-          "documentation":"<p>A version of the build input to be built, for this build only. If not specified, the latest version is used. If specified, must be one of:</p> <ul> <li> <p>For AWS CodeCommit: the commit ID to use.</p> </li> <li> <p>For GitHub: the commit ID, pull request ID, branch name, or tag name that corresponds to the version of the source code you want to build. If a pull request ID is specified, it must use the format <code>pr/pull-request-ID</code> (for example <code>pr/25</code>). If a branch name is specified, the branch's HEAD commit ID is used. If not specified, the default branch's HEAD commit ID is used.</p> </li> <li> <p>For Bitbucket: the commit ID, branch name, or tag name that corresponds to the version of the source code you want to build. If a branch name is specified, the branch's HEAD commit ID is used. If not specified, the default branch's HEAD commit ID is used.</p> </li> <li> <p>For Amazon Simple Storage Service (Amazon S3): the version ID of the object that represents the build input ZIP file to use.</p> </li> </ul> <p> If <code>sourceVersion</code> is specified at the project level, then this <code>sourceVersion</code> (at the build level) takes precedence. </p> <p> For more information, see <a href=\"https://docs.aws.amazon.com/codebuild/latest/userguide/sample-source-version.html\">Source Version Sample with CodeBuild</a> in the <i>AWS CodeBuild User Guide</i>. </p>"
+          "documentation":"<p>A version of the build input to be built, for this build only. If not specified, the latest version is used. If specified, must be one of:</p> <ul> <li> <p>For AWS CodeCommit: the commit ID, branch, or Git tag to use.</p> </li> <li> <p>For GitHub: the commit ID, pull request ID, branch name, or tag name that corresponds to the version of the source code you want to build. If a pull request ID is specified, it must use the format <code>pr/pull-request-ID</code> (for example <code>pr/25</code>). If a branch name is specified, the branch's HEAD commit ID is used. If not specified, the default branch's HEAD commit ID is used.</p> </li> <li> <p>For Bitbucket: the commit ID, branch name, or tag name that corresponds to the version of the source code you want to build. If a branch name is specified, the branch's HEAD commit ID is used. If not specified, the default branch's HEAD commit ID is used.</p> </li> <li> <p>For Amazon Simple Storage Service (Amazon S3): the version ID of the object that represents the build input ZIP file to use.</p> </li> </ul> <p> If <code>sourceVersion</code> is specified at the project level, then this <code>sourceVersion</code> (at the build level) takes precedence. </p> <p> For more information, see <a href=\"https://docs.aws.amazon.com/codebuild/latest/userguide/sample-source-version.html\">Source Version Sample with CodeBuild</a> in the <i>AWS CodeBuild User Guide</i>. </p>"
         },
         "artifactsOverride":{
           "shape":"ProjectArtifacts",
@@ -1760,7 +2649,7 @@
         },
         "buildspecOverride":{
           "shape":"String",
-          "documentation":"<p>A build spec declaration that overrides, for this build only, the latest one already defined in the build project.</p>"
+          "documentation":"<p>A buildspec file declaration that overrides, for this build only, the latest one already defined in the build project.</p> <p> If this value is set, it can be either an inline buildspec definition, the path to an alternate buildspec file relative to the value of the built-in <code>CODEBUILD_SRC_DIR</code> environment variable, or the path to an S3 bucket. The bucket must be in the same AWS Region as the build project. Specify the buildspec file using its ARN (for example, <code>arn:aws:s3:::my-codebuild-sample2/buildspec.yml</code>). If this value is not provided or is set to an empty string, the source code must contain a buildspec file in its root directory. For more information, see <a href=\"https://docs.aws.amazon.com/codebuild/latest/userguide/build-spec-ref.html#build-spec-ref-name-storage\">Buildspec File Name and Storage Location</a>. </p>"
         },
         "insecureSslOverride":{
           "shape":"WrapperBoolean",
@@ -1768,7 +2657,7 @@
         },
         "reportBuildStatusOverride":{
           "shape":"WrapperBoolean",
-          "documentation":"<p> Set to true to report to your source provider the status of a build's start and completion. If you use this option with a source provider other than GitHub, GitHub Enterprise, or Bitbucket, an invalidInputException is thrown. </p>"
+          "documentation":"<p> Set to true to report to your source provider the status of a build's start and completion. If you use this option with a source provider other than GitHub, GitHub Enterprise, or Bitbucket, an invalidInputException is thrown. </p> <note> <p> The status of a build triggered by a webhook is always reported to your source provider. </p> </note>"
         },
         "environmentTypeOverride":{
           "shape":"EnvironmentType",
@@ -1806,6 +2695,10 @@
           "shape":"TimeOut",
           "documentation":"<p> The number of minutes a build is allowed to be queued before it times out. </p>"
         },
+        "encryptionKeyOverride":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The AWS Key Management Service (AWS KMS) customer master key (CMK) that overrides the one specified in the build project. The CMK key encrypts the build output artifacts.</p> <note> <p> You can use a cross-account KMS key to encrypt the build output artifacts if your service role has permission to that key. </p> </note> <p>You can specify either the Amazon Resource Name (ARN) of the CMK or, if available, the CMK's alias (using the format <code>alias/<i>alias-name</i> </code>).</p>"
+        },
         "idempotencyToken":{
           "shape":"String",
           "documentation":"<p>A unique, case sensitive identifier you provide to ensure the idempotency of the StartBuild request. The token is included in the StartBuild request and is valid for 12 hours. If you repeat the StartBuild request with the same token, but change a parameter, AWS CodeBuild returns a parameter mismatch error. </p>"
@@ -1889,6 +2782,81 @@
       "max":50,
       "min":0
     },
+    "TestCase":{
+      "type":"structure",
+      "members":{
+        "reportArn":{
+          "shape":"NonEmptyString",
+          "documentation":"<p> The ARN of the report to which the test case belongs. </p>"
+        },
+        "testRawDataPath":{
+          "shape":"String",
+          "documentation":"<p> The path to the raw data file that contains the test result. </p>"
+        },
+        "prefix":{
+          "shape":"String",
+          "documentation":"<p> A string that is applied to a series of related test cases. CodeBuild generates the prefix. The prefix depends on the framework used to generate the tests. </p>"
+        },
+        "name":{
+          "shape":"String",
+          "documentation":"<p> The name of the test case. </p>"
+        },
+        "status":{
+          "shape":"String",
+          "documentation":"<p> The status returned by the test case after it was run. Valid statuses are <code>SUCCEEDED</code>, <code>FAILED</code>, <code>ERROR</code>, <code>SKIPPED</code>, and <code>UNKNOWN</code>. </p>"
+        },
+        "durationInNanoSeconds":{
+          "shape":"WrapperLong",
+          "documentation":"<p> The number of nanoseconds it took to run this test case. </p>"
+        },
+        "message":{
+          "shape":"String",
+          "documentation":"<p> A message associated with a test case. For example, an error message or stack trace. </p>"
+        },
+        "expired":{
+          "shape":"Timestamp",
+          "documentation":"<p> The date and time a test case expires. A test case expires 30 days after it is created. An expired test case is not available to view in CodeBuild. </p>"
+        }
+      },
+      "documentation":"<p> Information about a test case created using a framework such as NUnit or Cucumber. A test case might be a unit test or a configuration test. </p>"
+    },
+    "TestCaseFilter":{
+      "type":"structure",
+      "members":{
+        "status":{
+          "shape":"String",
+          "documentation":"<p> The status used to filter test cases. Valid statuses are <code>SUCCEEDED</code>, <code>FAILED</code>, <code>ERROR</code>, <code>SKIPPED</code>, and <code>UNKNOWN</code>. A <code>TestCaseFilter</code> can have one status. </p>"
+        }
+      },
+      "documentation":"<p> A filter used to return specific types of test cases. </p>"
+    },
+    "TestCases":{
+      "type":"list",
+      "member":{"shape":"TestCase"}
+    },
+    "TestReportSummary":{
+      "type":"structure",
+      "required":[
+        "total",
+        "statusCounts",
+        "durationInNanoSeconds"
+      ],
+      "members":{
+        "total":{
+          "shape":"WrapperInt",
+          "documentation":"<p> The number of test cases in this <code>TestReportSummary</code>. The total includes truncated test cases. </p>"
+        },
+        "statusCounts":{
+          "shape":"ReportStatusCounts",
+          "documentation":"<p> A map that contains the number of each type of status returned by the test results in this <code>TestReportSummary</code>. </p>"
+        },
+        "durationInNanoSeconds":{
+          "shape":"WrapperLong",
+          "documentation":"<p> The number of nanoseconds it took to run all of the test cases in this report. </p>"
+        }
+      },
+      "documentation":"<p> Information about a test report. </p>"
+    },
     "TimeOut":{
       "type":"integer",
       "max":480,
@@ -1917,7 +2885,7 @@
         },
         "sourceVersion":{
           "shape":"String",
-          "documentation":"<p> A version of the build input to be built for this project. If not specified, the latest version is used. If specified, it must be one of: </p> <ul> <li> <p>For AWS CodeCommit: the commit ID to use.</p> </li> <li> <p>For GitHub: the commit ID, pull request ID, branch name, or tag name that corresponds to the version of the source code you want to build. If a pull request ID is specified, it must use the format <code>pr/pull-request-ID</code> (for example <code>pr/25</code>). If a branch name is specified, the branch's HEAD commit ID is used. If not specified, the default branch's HEAD commit ID is used.</p> </li> <li> <p>For Bitbucket: the commit ID, branch name, or tag name that corresponds to the version of the source code you want to build. If a branch name is specified, the branch's HEAD commit ID is used. If not specified, the default branch's HEAD commit ID is used.</p> </li> <li> <p>For Amazon Simple Storage Service (Amazon S3): the version ID of the object that represents the build input ZIP file to use.</p> </li> </ul> <p> If <code>sourceVersion</code> is specified at the build level, then that version takes precedence over this <code>sourceVersion</code> (at the project level). </p> <p> For more information, see <a href=\"https://docs.aws.amazon.com/codebuild/latest/userguide/sample-source-version.html\">Source Version Sample with CodeBuild</a> in the <i>AWS CodeBuild User Guide</i>. </p>"
+          "documentation":"<p> A version of the build input to be built for this project. If not specified, the latest version is used. If specified, it must be one of: </p> <ul> <li> <p>For AWS CodeCommit: the commit ID, branch, or Git tag to use.</p> </li> <li> <p>For GitHub: the commit ID, pull request ID, branch name, or tag name that corresponds to the version of the source code you want to build. If a pull request ID is specified, it must use the format <code>pr/pull-request-ID</code> (for example <code>pr/25</code>). If a branch name is specified, the branch's HEAD commit ID is used. If not specified, the default branch's HEAD commit ID is used.</p> </li> <li> <p>For Bitbucket: the commit ID, branch name, or tag name that corresponds to the version of the source code you want to build. If a branch name is specified, the branch's HEAD commit ID is used. If not specified, the default branch's HEAD commit ID is used.</p> </li> <li> <p>For Amazon Simple Storage Service (Amazon S3): the version ID of the object that represents the build input ZIP file to use.</p> </li> </ul> <p> If <code>sourceVersion</code> is specified at the build level, then that version takes precedence over this <code>sourceVersion</code> (at the project level). </p> <p> For more information, see <a href=\"https://docs.aws.amazon.com/codebuild/latest/userguide/sample-source-version.html\">Source Version Sample with CodeBuild</a> in the <i>AWS CodeBuild User Guide</i>. </p>"
         },
         "secondarySourceVersions":{
           "shape":"ProjectSecondarySourceVersions",
@@ -1970,6 +2938,10 @@
         "logsConfig":{
           "shape":"LogsConfig",
           "documentation":"<p> Information about logs for the build project. A project can create logs in Amazon CloudWatch Logs, logs in an S3 bucket, or both. </p>"
+        },
+        "fileSystemLocations":{
+          "shape":"ProjectFileSystemLocations",
+          "documentation":"<p> An array of <code>ProjectFileSystemLocation</code> objects for a CodeBuild build project. A <code>ProjectFileSystemLocation</code> object specifies the <code>identifier</code>, <code>location</code>, <code>mountOptions</code>, <code>mountPoint</code>, and <code>type</code> of a file system created using Amazon Elastic File System. </p>"
         }
       }
     },
@@ -1982,6 +2954,29 @@
         }
       }
     },
+    "UpdateReportGroupInput":{
+      "type":"structure",
+      "required":["arn"],
+      "members":{
+        "arn":{
+          "shape":"NonEmptyString",
+          "documentation":"<p> The ARN of the report group to update. </p>"
+        },
+        "exportConfig":{
+          "shape":"ReportExportConfig",
+          "documentation":"<p> Used to specify an updated export type. Valid values are: </p> <ul> <li> <p> <code>S3</code>: The report results are exported to an S3 bucket. </p> </li> <li> <p> <code>NO_EXPORT</code>: The report results are not exported. </p> </li> </ul>"
+        }
+      }
+    },
+    "UpdateReportGroupOutput":{
+      "type":"structure",
+      "members":{
+        "reportGroup":{
+          "shape":"ReportGroup",
+          "documentation":"<p> Information about the updated report group. </p>"
+        }
+      }
+    },
     "UpdateWebhookInput":{
       "type":"structure",
       "required":["projectName"],
@@ -2000,7 +2995,7 @@
         },
         "filterGroups":{
           "shape":"FilterGroups",
-          "documentation":"<p> An array of arrays of <code>WebhookFilter</code> objects used to determine if a webhook event can trigger a build. A filter group must pcontain at least one <code>EVENT</code> <code>WebhookFilter</code>. </p>"
+          "documentation":"<p> An array of arrays of <code>WebhookFilter</code> objects used to determine if a webhook event can trigger a build. A filter group must contain at least one <code>EVENT</code> <code>WebhookFilter</code>. </p>"
         }
       }
     },
@@ -2103,5 +3098,5 @@
     "WrapperInt":{"type":"integer"},
     "WrapperLong":{"type":"long"}
   },
-  "documentation":"<fullname>AWS CodeBuild</fullname> <p>AWS CodeBuild is a fully managed build service in the cloud. AWS CodeBuild compiles your source code, runs unit tests, and produces artifacts that are ready to deploy. AWS CodeBuild eliminates the need to provision, manage, and scale your own build servers. It provides prepackaged build environments for the most popular programming languages and build tools, such as Apache Maven, Gradle, and more. You can also fully customize build environments in AWS CodeBuild to use your own build tools. AWS CodeBuild scales automatically to meet peak build requests. You pay only for the build time you consume. For more information about AWS CodeBuild, see the <i>AWS CodeBuild User Guide</i>.</p> <p>AWS CodeBuild supports these operations:</p> <ul> <li> <p> <code>BatchDeleteBuilds</code>: Deletes one or more builds.</p> </li> <li> <p> <code>BatchGetProjects</code>: Gets information about one or more build projects. A <i>build project</i> defines how AWS CodeBuild runs a build. This includes information such as where to get the source code to build, the build environment to use, the build commands to run, and where to store the build output. A <i>build environment</i> is a representation of operating system, programming language runtime, and tools that AWS CodeBuild uses to run a build. You can add tags to build projects to help manage your resources and costs.</p> </li> <li> <p> <code>CreateProject</code>: Creates a build project.</p> </li> <li> <p> <code>CreateWebhook</code>: For an existing AWS CodeBuild build project that has its source code stored in a GitHub or Bitbucket repository, enables AWS CodeBuild to start rebuilding the source code every time a code change is pushed to the repository.</p> </li> <li> <p> <code>UpdateWebhook</code>: Changes the settings of an existing webhook.</p> </li> <li> <p> <code>DeleteProject</code>: Deletes a build project.</p> </li> <li> <p> <code>DeleteWebhook</code>: For an existing AWS CodeBuild build project that has its source code stored in a GitHub or Bitbucket repository, stops AWS CodeBuild from rebuilding the source code every time a code change is pushed to the repository.</p> </li> <li> <p> <code>ListProjects</code>: Gets a list of build project names, with each build project name representing a single build project.</p> </li> <li> <p> <code>UpdateProject</code>: Changes the settings of an existing build project.</p> </li> <li> <p> <code>BatchGetBuilds</code>: Gets information about one or more builds.</p> </li> <li> <p> <code>ListBuilds</code>: Gets a list of build IDs, with each build ID representing a single build.</p> </li> <li> <p> <code>ListBuildsForProject</code>: Gets a list of build IDs for the specified build project, with each build ID representing a single build.</p> </li> <li> <p> <code>StartBuild</code>: Starts running a build.</p> </li> <li> <p> <code>StopBuild</code>: Attempts to stop running a build.</p> </li> <li> <p> <code>ListCuratedEnvironmentImages</code>: Gets information about Docker images that are managed by AWS CodeBuild.</p> </li> <li> <p> <code>DeleteSourceCredentials</code>: Deletes a set of GitHub, GitHub Enterprise, or Bitbucket source credentials.</p> </li> <li> <p> <code>ImportSourceCredentials</code>: Imports the source repository credentials for an AWS CodeBuild project that has its source code stored in a GitHub, GitHub Enterprise, or Bitbucket repository.</p> </li> <li> <p> <code>ListSourceCredentials</code>: Returns a list of <code>SourceCredentialsInfo</code> objects. Each <code>SourceCredentialsInfo</code> object includes the authentication type, token ARN, and type of source provider for one set of credentials.</p> </li> </ul>"
+  "documentation":"<fullname>AWS CodeBuild</fullname> <p>AWS CodeBuild is a fully managed build service in the cloud. AWS CodeBuild compiles your source code, runs unit tests, and produces artifacts that are ready to deploy. AWS CodeBuild eliminates the need to provision, manage, and scale your own build servers. It provides prepackaged build environments for the most popular programming languages and build tools, such as Apache Maven, Gradle, and more. You can also fully customize build environments in AWS CodeBuild to use your own build tools. AWS CodeBuild scales automatically to meet peak build requests. You pay only for the build time you consume. For more information about AWS CodeBuild, see the <i> <a href=\"https://docs.aws.amazon.com/codebuild/latest/userguide/welcome.html\">AWS CodeBuild User Guide</a>.</i> </p> <p>AWS CodeBuild supports these operations:</p> <ul> <li> <p> <code>BatchDeleteBuilds</code>: Deletes one or more builds.</p> </li> <li> <p> <code>BatchGetBuilds</code>: Gets information about one or more builds.</p> </li> <li> <p> <code>BatchGetProjects</code>: Gets information about one or more build projects. A <i>build project</i> defines how AWS CodeBuild runs a build. This includes information such as where to get the source code to build, the build environment to use, the build commands to run, and where to store the build output. A <i>build environment</i> is a representation of operating system, programming language runtime, and tools that AWS CodeBuild uses to run a build. You can add tags to build projects to help manage your resources and costs.</p> </li> <li> <p> <code>BatchGetReportGroups</code>: Returns an array of report groups. </p> </li> <li> <p> <code>BatchGetReports</code>: Returns an array of reports. </p> </li> <li> <p> <code>CreateProject</code>: Creates a build project.</p> </li> <li> <p> <code>CreateReportGroup</code>: Creates a report group. A report group contains a collection of reports. </p> </li> <li> <p> <code>CreateWebhook</code>: For an existing AWS CodeBuild build project that has its source code stored in a GitHub or Bitbucket repository, enables AWS CodeBuild to start rebuilding the source code every time a code change is pushed to the repository.</p> </li> <li> <p> <code>DeleteProject</code>: Deletes a build project.</p> </li> <li> <p> <code>DeleteReport</code>: Deletes a report. </p> </li> <li> <p> <code>DeleteReportGroup</code>: Deletes a report group. </p> </li> <li> <p> <code>DeleteResourcePolicy</code>: Deletes a resource policy that is identified by its resource ARN. </p> </li> <li> <p> <code>DeleteSourceCredentials</code>: Deletes a set of GitHub, GitHub Enterprise, or Bitbucket source credentials.</p> </li> <li> <p> <code>DeleteWebhook</code>: For an existing AWS CodeBuild build project that has its source code stored in a GitHub or Bitbucket repository, stops AWS CodeBuild from rebuilding the source code every time a code change is pushed to the repository.</p> </li> <li> <p> <code>DescribeTestCases</code>: Returns a list of details about test cases for a report. </p> </li> <li> <p> <code>GetResourcePolicy</code>: Gets a resource policy that is identified by its resource ARN. </p> </li> <li> <p> <code>ImportSourceCredentials</code>: Imports the source repository credentials for an AWS CodeBuild project that has its source code stored in a GitHub, GitHub Enterprise, or Bitbucket repository.</p> </li> <li> <p> <code>InvalidateProjectCache</code>: Resets the cache for a project.</p> </li> <li> <p> <code>ListBuilds</code>: Gets a list of build IDs, with each build ID representing a single build.</p> </li> <li> <p> <code>ListBuildsForProject</code>: Gets a list of build IDs for the specified build project, with each build ID representing a single build.</p> </li> <li> <p> <code>ListCuratedEnvironmentImages</code>: Gets information about Docker images that are managed by AWS CodeBuild.</p> </li> <li> <p> <code>ListProjects</code>: Gets a list of build project names, with each build project name representing a single build project.</p> </li> <li> <p> <code>ListReportGroups</code>: Gets a list ARNs for the report groups in the current AWS account. </p> </li> <li> <p> <code>ListReports</code>: Gets a list ARNs for the reports in the current AWS account. </p> </li> <li> <p> <code>ListReportsForReportGroup</code>: Returns a list of ARNs for the reports that belong to a <code>ReportGroup</code>. </p> </li> <li> <p> <code>ListSharedProjects</code>: Gets a list of ARNs associated with projects shared with the current AWS account or user.</p> </li> <li> <p> <code>ListSharedReportGroups</code>: Gets a list of ARNs associated with report groups shared with the current AWS account or user</p> </li> <li> <p> <code>ListSourceCredentials</code>: Returns a list of <code>SourceCredentialsInfo</code> objects. Each <code>SourceCredentialsInfo</code> object includes the authentication type, token ARN, and type of source provider for one set of credentials.</p> </li> <li> <p> <code>PutResourcePolicy</code>: Stores a resource policy for the ARN of a <code>Project</code> or <code>ReportGroup</code> object. </p> </li> <li> <p> <code>StartBuild</code>: Starts running a build.</p> </li> <li> <p> <code>StopBuild</code>: Attempts to stop running a build.</p> </li> <li> <p> <code>UpdateProject</code>: Changes the settings of an existing build project.</p> </li> <li> <p> <code>UpdateReportGroup</code>: Changes a report group.</p> </li> <li> <p> <code>UpdateWebhook</code>: Changes the settings of an existing webhook.</p> </li> </ul>"
 }
diff --git a/services/codebuild/src/test/resources/cucumber.properties b/services/codebuild/src/test/resources/cucumber.properties
index e1db0f04ab5e..da335eb6e3ab 100644
--- a/services/codebuild/src/test/resources/cucumber.properties
+++ b/services/codebuild/src/test/resources/cucumber.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/codecommit/build.properties b/services/codecommit/build.properties
index ecf2dae6fcb1..15ec2da1fc71 100644
--- a/services/codecommit/build.properties
+++ b/services/codecommit/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/codecommit/pom.xml b/services/codecommit/pom.xml
index f040ae736a45..3dce7c123c5f 100644
--- a/services/codecommit/pom.xml
+++ b/services/codecommit/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>codecommit</artifactId>
     <name>AWS Java SDK :: Services :: AWS CodeCommit</name>
diff --git a/services/codecommit/src/it/java/software/amazon/awssdk/services/codecommit/AwsCodeCommitServiceIntegrationTest.java b/services/codecommit/src/it/java/software/amazon/awssdk/services/codecommit/AwsCodeCommitServiceIntegrationTest.java
index d6945fc019cc..9f5a6e0ee3fe 100644
--- a/services/codecommit/src/it/java/software/amazon/awssdk/services/codecommit/AwsCodeCommitServiceIntegrationTest.java
+++ b/services/codecommit/src/it/java/software/amazon/awssdk/services/codecommit/AwsCodeCommitServiceIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/codecommit/src/main/resources/codegen-resources/paginators-1.json b/services/codecommit/src/main/resources/codegen-resources/paginators-1.json
index c917eaa80e85..5fcda36b895d 100644
--- a/services/codecommit/src/main/resources/codegen-resources/paginators-1.json
+++ b/services/codecommit/src/main/resources/codegen-resources/paginators-1.json
@@ -30,6 +30,16 @@
       "limit_key": "maxConflictFiles",
       "output_token": "nextToken"
     },
+    "ListApprovalRuleTemplates": {
+      "input_token": "nextToken",
+      "limit_key": "maxResults",
+      "output_token": "nextToken"
+    },
+    "ListAssociatedApprovalRuleTemplatesForRepository": {
+      "input_token": "nextToken",
+      "limit_key": "maxResults",
+      "output_token": "nextToken"
+    },
     "ListBranches": {
       "input_token": "nextToken",
       "output_token": "nextToken",
@@ -44,6 +54,11 @@
       "input_token": "nextToken",
       "output_token": "nextToken",
       "result_key": "repositories"
+    },
+    "ListRepositoriesForApprovalRuleTemplate": {
+      "input_token": "nextToken",
+      "limit_key": "maxResults",
+      "output_token": "nextToken"
     }
   }
 }
\ No newline at end of file
diff --git a/services/codecommit/src/main/resources/codegen-resources/service-2.json b/services/codecommit/src/main/resources/codegen-resources/service-2.json
index 77df15276f90..255175f3143d 100644
--- a/services/codecommit/src/main/resources/codegen-resources/service-2.json
+++ b/services/codecommit/src/main/resources/codegen-resources/service-2.json
@@ -13,6 +13,51 @@
     "uid":"codecommit-2015-04-13"
   },
   "operations":{
+    "AssociateApprovalRuleTemplateWithRepository":{
+      "name":"AssociateApprovalRuleTemplateWithRepository",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"AssociateApprovalRuleTemplateWithRepositoryInput"},
+      "errors":[
+        {"shape":"ApprovalRuleTemplateNameRequiredException"},
+        {"shape":"InvalidApprovalRuleTemplateNameException"},
+        {"shape":"ApprovalRuleTemplateDoesNotExistException"},
+        {"shape":"MaximumRuleTemplatesAssociatedWithRepositoryException"},
+        {"shape":"RepositoryNameRequiredException"},
+        {"shape":"InvalidRepositoryNameException"},
+        {"shape":"RepositoryDoesNotExistException"},
+        {"shape":"EncryptionIntegrityChecksFailedException"},
+        {"shape":"EncryptionKeyAccessDeniedException"},
+        {"shape":"EncryptionKeyDisabledException"},
+        {"shape":"EncryptionKeyNotFoundException"},
+        {"shape":"EncryptionKeyUnavailableException"}
+      ],
+      "documentation":"<p>Creates an association between an approval rule template and a specified repository. Then, the next time a pull request is created in the repository where the destination reference (if specified) matches the destination reference (branch) for the pull request, an approval rule that matches the template conditions is automatically created for that pull request. If no destination references are specified in the template, an approval rule that matches the template contents is created for all pull requests in that repository.</p>"
+    },
+    "BatchAssociateApprovalRuleTemplateWithRepositories":{
+      "name":"BatchAssociateApprovalRuleTemplateWithRepositories",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"BatchAssociateApprovalRuleTemplateWithRepositoriesInput"},
+      "output":{"shape":"BatchAssociateApprovalRuleTemplateWithRepositoriesOutput"},
+      "errors":[
+        {"shape":"ApprovalRuleTemplateNameRequiredException"},
+        {"shape":"InvalidApprovalRuleTemplateNameException"},
+        {"shape":"ApprovalRuleTemplateDoesNotExistException"},
+        {"shape":"RepositoryNamesRequiredException"},
+        {"shape":"MaximumRepositoryNamesExceededException"},
+        {"shape":"EncryptionIntegrityChecksFailedException"},
+        {"shape":"EncryptionKeyAccessDeniedException"},
+        {"shape":"EncryptionKeyDisabledException"},
+        {"shape":"EncryptionKeyNotFoundException"},
+        {"shape":"EncryptionKeyUnavailableException"}
+      ],
+      "documentation":"<p>Creates an association between an approval rule template and one or more specified repositories. </p>"
+    },
     "BatchDescribeMergeConflicts":{
       "name":"BatchDescribeMergeConflicts",
       "http":{
@@ -46,6 +91,28 @@
       ],
       "documentation":"<p>Returns information about one or more merge conflicts in the attempted merge of two commit specifiers using the squash or three-way merge strategy.</p>"
     },
+    "BatchDisassociateApprovalRuleTemplateFromRepositories":{
+      "name":"BatchDisassociateApprovalRuleTemplateFromRepositories",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"BatchDisassociateApprovalRuleTemplateFromRepositoriesInput"},
+      "output":{"shape":"BatchDisassociateApprovalRuleTemplateFromRepositoriesOutput"},
+      "errors":[
+        {"shape":"ApprovalRuleTemplateNameRequiredException"},
+        {"shape":"InvalidApprovalRuleTemplateNameException"},
+        {"shape":"ApprovalRuleTemplateDoesNotExistException"},
+        {"shape":"RepositoryNamesRequiredException"},
+        {"shape":"MaximumRepositoryNamesExceededException"},
+        {"shape":"EncryptionIntegrityChecksFailedException"},
+        {"shape":"EncryptionKeyAccessDeniedException"},
+        {"shape":"EncryptionKeyDisabledException"},
+        {"shape":"EncryptionKeyNotFoundException"},
+        {"shape":"EncryptionKeyUnavailableException"}
+      ],
+      "documentation":"<p>Removes the association between an approval rule template and one or more specified repositories. </p>"
+    },
     "BatchGetCommits":{
       "name":"BatchGetCommits",
       "http":{
@@ -86,7 +153,26 @@
         {"shape":"EncryptionKeyNotFoundException"},
         {"shape":"EncryptionKeyUnavailableException"}
       ],
-      "documentation":"<p>Returns information about one or more repositories.</p> <note> <p>The description field for a repository accepts all HTML characters and all valid Unicode characters. Applications that do not HTML-encode the description and display it in a web page could expose users to potentially malicious code. Make sure that you HTML-encode the description field in any application that uses this API to display the repository description on a web page.</p> </note>"
+      "documentation":"<p>Returns information about one or more repositories.</p> <note> <p>The description field for a repository accepts all HTML characters and all valid Unicode characters. Applications that do not HTML-encode the description and display it in a webpage can expose users to potentially malicious code. Make sure that you HTML-encode the description field in any application that uses this API to display the repository description on a webpage.</p> </note>"
+    },
+    "CreateApprovalRuleTemplate":{
+      "name":"CreateApprovalRuleTemplate",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"CreateApprovalRuleTemplateInput"},
+      "output":{"shape":"CreateApprovalRuleTemplateOutput"},
+      "errors":[
+        {"shape":"ApprovalRuleTemplateNameRequiredException"},
+        {"shape":"InvalidApprovalRuleTemplateNameException"},
+        {"shape":"ApprovalRuleTemplateNameAlreadyExistsException"},
+        {"shape":"ApprovalRuleTemplateContentRequiredException"},
+        {"shape":"InvalidApprovalRuleTemplateContentException"},
+        {"shape":"InvalidApprovalRuleTemplateDescriptionException"},
+        {"shape":"NumberOfRuleTemplatesExceededException"}
+      ],
+      "documentation":"<p>Creates a template for approval rules that can then be associated with one or more repositories in your AWS account. When you associate a template with a repository, AWS CodeCommit creates an approval rule that matches the conditions of the template for all pull requests that meet the conditions of the template. For more information, see <a>AssociateApprovalRuleTemplateWithRepository</a>.</p>"
     },
     "CreateBranch":{
       "name":"CreateBranch",
@@ -111,7 +197,7 @@
         {"shape":"EncryptionKeyNotFoundException"},
         {"shape":"EncryptionKeyUnavailableException"}
       ],
-      "documentation":"<p>Creates a new branch in a repository and points the branch to a commit.</p> <note> <p>Calling the create branch operation does not set a repository's default branch. To do this, call the update default branch operation.</p> </note>"
+      "documentation":"<p>Creates a branch in a repository and points the branch to a commit.</p> <note> <p>Calling the create branch operation does not set a repository's default branch. To do this, call the update default branch operation.</p> </note>"
     },
     "CreateCommit":{
       "name":"CreateCommit",
@@ -200,6 +286,33 @@
       ],
       "documentation":"<p>Creates a pull request in the specified repository.</p>"
     },
+    "CreatePullRequestApprovalRule":{
+      "name":"CreatePullRequestApprovalRule",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"CreatePullRequestApprovalRuleInput"},
+      "output":{"shape":"CreatePullRequestApprovalRuleOutput"},
+      "errors":[
+        {"shape":"ApprovalRuleNameRequiredException"},
+        {"shape":"InvalidApprovalRuleNameException"},
+        {"shape":"ApprovalRuleNameAlreadyExistsException"},
+        {"shape":"ApprovalRuleContentRequiredException"},
+        {"shape":"InvalidApprovalRuleContentException"},
+        {"shape":"NumberOfRulesExceededException"},
+        {"shape":"PullRequestDoesNotExistException"},
+        {"shape":"InvalidPullRequestIdException"},
+        {"shape":"PullRequestIdRequiredException"},
+        {"shape":"PullRequestAlreadyClosedException"},
+        {"shape":"EncryptionIntegrityChecksFailedException"},
+        {"shape":"EncryptionKeyAccessDeniedException"},
+        {"shape":"EncryptionKeyDisabledException"},
+        {"shape":"EncryptionKeyNotFoundException"},
+        {"shape":"EncryptionKeyUnavailableException"}
+      ],
+      "documentation":"<p>Creates an approval rule for a pull request.</p>"
+    },
     "CreateRepository":{
       "name":"CreateRepository",
       "http":{
@@ -272,7 +385,22 @@
         {"shape":"EncryptionKeyNotFoundException"},
         {"shape":"EncryptionKeyUnavailableException"}
       ],
-      "documentation":"<p>Creates an unreferenced commit that represents the result of merging two branches using a specified merge strategy. This can help you determine the outcome of a potential merge. This API cannot be used with the fast-forward merge strategy, as that strategy does not create a merge commit.</p> <note> <p>This unreferenced merge commit can only be accessed using the GetCommit API or through git commands such as git fetch. To retrieve this commit, you must specify its commit ID or otherwise reference it.</p> </note>"
+      "documentation":"<p>Creates an unreferenced commit that represents the result of merging two branches using a specified merge strategy. This can help you determine the outcome of a potential merge. This API cannot be used with the fast-forward merge strategy because that strategy does not create a merge commit.</p> <note> <p>This unreferenced merge commit can only be accessed using the GetCommit API or through git commands such as git fetch. To retrieve this commit, you must specify its commit ID or otherwise reference it.</p> </note>"
+    },
+    "DeleteApprovalRuleTemplate":{
+      "name":"DeleteApprovalRuleTemplate",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DeleteApprovalRuleTemplateInput"},
+      "output":{"shape":"DeleteApprovalRuleTemplateOutput"},
+      "errors":[
+        {"shape":"ApprovalRuleTemplateNameRequiredException"},
+        {"shape":"InvalidApprovalRuleTemplateNameException"},
+        {"shape":"ApprovalRuleTemplateInUseException"}
+      ],
+      "documentation":"<p>Deletes a specified approval rule template. Deleting a template does not remove approval rules on pull requests already created with the template.</p>"
     },
     "DeleteBranch":{
       "name":"DeleteBranch",
@@ -345,7 +473,31 @@
         {"shape":"EncryptionKeyNotFoundException"},
         {"shape":"EncryptionKeyUnavailableException"}
       ],
-      "documentation":"<p>Deletes a specified file from a specified branch. A commit is created on the branch that contains the revision. The file will still exist in the commits prior to the commit that contains the deletion.</p>"
+      "documentation":"<p>Deletes a specified file from a specified branch. A commit is created on the branch that contains the revision. The file still exists in the commits earlier to the commit that contains the deletion.</p>"
+    },
+    "DeletePullRequestApprovalRule":{
+      "name":"DeletePullRequestApprovalRule",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DeletePullRequestApprovalRuleInput"},
+      "output":{"shape":"DeletePullRequestApprovalRuleOutput"},
+      "errors":[
+        {"shape":"PullRequestDoesNotExistException"},
+        {"shape":"InvalidPullRequestIdException"},
+        {"shape":"PullRequestIdRequiredException"},
+        {"shape":"PullRequestAlreadyClosedException"},
+        {"shape":"ApprovalRuleNameRequiredException"},
+        {"shape":"InvalidApprovalRuleNameException"},
+        {"shape":"CannotDeleteApprovalRuleFromTemplateException"},
+        {"shape":"EncryptionIntegrityChecksFailedException"},
+        {"shape":"EncryptionKeyAccessDeniedException"},
+        {"shape":"EncryptionKeyDisabledException"},
+        {"shape":"EncryptionKeyNotFoundException"},
+        {"shape":"EncryptionKeyUnavailableException"}
+      ],
+      "documentation":"<p>Deletes an approval rule from a specified pull request. Approval rules can be deleted from a pull request only if the pull request is open, and if the approval rule was created specifically for a pull request and not generated from an approval rule template associated with the repository where the pull request was created. You cannot delete an approval rule from a merged or closed pull request.</p>"
     },
     "DeleteRepository":{
       "name":"DeleteRepository",
@@ -364,7 +516,7 @@
         {"shape":"EncryptionKeyNotFoundException"},
         {"shape":"EncryptionKeyUnavailableException"}
       ],
-      "documentation":"<p>Deletes a repository. If a specified repository was already deleted, a null repository ID will be returned.</p> <important> <p>Deleting a repository also deletes all associated objects and metadata. After a repository is deleted, all future push calls to the deleted repository will fail.</p> </important>"
+      "documentation":"<p>Deletes a repository. If a specified repository was already deleted, a null repository ID is returned.</p> <important> <p>Deleting a repository also deletes all associated objects and metadata. After a repository is deleted, all future push calls to the deleted repository fail.</p> </important>"
     },
     "DescribeMergeConflicts":{
       "name":"DescribeMergeConflicts",
@@ -399,7 +551,7 @@
         {"shape":"EncryptionKeyNotFoundException"},
         {"shape":"EncryptionKeyUnavailableException"}
       ],
-      "documentation":"<p>Returns information about one or more merge conflicts in the attempted merge of two commit specifiers using the squash or three-way merge strategy. If the merge option for the attempted merge is specified as FAST_FORWARD_MERGE, an exception will be thrown.</p>"
+      "documentation":"<p>Returns information about one or more merge conflicts in the attempted merge of two commit specifiers using the squash or three-way merge strategy. If the merge option for the attempted merge is specified as FAST_FORWARD_MERGE, an exception is thrown.</p>"
     },
     "DescribePullRequestEvents":{
       "name":"DescribePullRequestEvents",
@@ -426,6 +578,66 @@
       ],
       "documentation":"<p>Returns information about one or more pull request events.</p>"
     },
+    "DisassociateApprovalRuleTemplateFromRepository":{
+      "name":"DisassociateApprovalRuleTemplateFromRepository",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DisassociateApprovalRuleTemplateFromRepositoryInput"},
+      "errors":[
+        {"shape":"ApprovalRuleTemplateNameRequiredException"},
+        {"shape":"InvalidApprovalRuleTemplateNameException"},
+        {"shape":"ApprovalRuleTemplateDoesNotExistException"},
+        {"shape":"RepositoryNameRequiredException"},
+        {"shape":"InvalidRepositoryNameException"},
+        {"shape":"RepositoryDoesNotExistException"},
+        {"shape":"EncryptionIntegrityChecksFailedException"},
+        {"shape":"EncryptionKeyAccessDeniedException"},
+        {"shape":"EncryptionKeyDisabledException"},
+        {"shape":"EncryptionKeyNotFoundException"},
+        {"shape":"EncryptionKeyUnavailableException"}
+      ],
+      "documentation":"<p>Removes the association between a template and a repository so that approval rules based on the template are not automatically created when pull requests are created in the specified repository. This does not delete any approval rules previously created for pull requests through the template association.</p>"
+    },
+    "EvaluatePullRequestApprovalRules":{
+      "name":"EvaluatePullRequestApprovalRules",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"EvaluatePullRequestApprovalRulesInput"},
+      "output":{"shape":"EvaluatePullRequestApprovalRulesOutput"},
+      "errors":[
+        {"shape":"PullRequestDoesNotExistException"},
+        {"shape":"InvalidPullRequestIdException"},
+        {"shape":"PullRequestIdRequiredException"},
+        {"shape":"InvalidRevisionIdException"},
+        {"shape":"RevisionIdRequiredException"},
+        {"shape":"RevisionNotCurrentException"},
+        {"shape":"EncryptionIntegrityChecksFailedException"},
+        {"shape":"EncryptionKeyAccessDeniedException"},
+        {"shape":"EncryptionKeyDisabledException"},
+        {"shape":"EncryptionKeyNotFoundException"},
+        {"shape":"EncryptionKeyUnavailableException"}
+      ],
+      "documentation":"<p>Evaluates whether a pull request has met all the conditions specified in its associated approval rules.</p>"
+    },
+    "GetApprovalRuleTemplate":{
+      "name":"GetApprovalRuleTemplate",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"GetApprovalRuleTemplateInput"},
+      "output":{"shape":"GetApprovalRuleTemplateOutput"},
+      "errors":[
+        {"shape":"ApprovalRuleTemplateNameRequiredException"},
+        {"shape":"InvalidApprovalRuleTemplateNameException"},
+        {"shape":"ApprovalRuleTemplateDoesNotExistException"}
+      ],
+      "documentation":"<p>Returns information about a specified approval rule template.</p>"
+    },
     "GetBlob":{
       "name":"GetBlob",
       "http":{
@@ -448,7 +660,7 @@
         {"shape":"EncryptionKeyUnavailableException"},
         {"shape":"FileTooLargeException"}
       ],
-      "documentation":"<p>Returns the base-64 encoded content of an individual blob within a repository.</p>"
+      "documentation":"<p>Returns the base-64 encoded content of an individual blob in a repository.</p>"
     },
     "GetBranch":{
       "name":"GetBranch",
@@ -592,7 +804,7 @@
         {"shape":"EncryptionKeyNotFoundException"},
         {"shape":"EncryptionKeyUnavailableException"}
       ],
-      "documentation":"<p>Returns information about the differences in a valid commit specifier (such as a branch, tag, HEAD, commit ID or other fully qualified reference). Results can be limited to a specified path.</p>"
+      "documentation":"<p>Returns information about the differences in a valid commit specifier (such as a branch, tag, HEAD, commit ID, or other fully qualified reference). Results can be limited to a specified path.</p>"
     },
     "GetFile":{
       "name":"GetFile",
@@ -730,7 +942,7 @@
         {"shape":"EncryptionKeyNotFoundException"},
         {"shape":"EncryptionKeyUnavailableException"}
       ],
-      "documentation":"<p>Returns information about the merge options available for merging two specified branches. For details about why a particular merge option is not available, use GetMergeConflicts or DescribeMergeConflicts.</p>"
+      "documentation":"<p>Returns information about the merge options available for merging two specified branches. For details about why a merge option is not available, use GetMergeConflicts or DescribeMergeConflicts.</p>"
     },
     "GetPullRequest":{
       "name":"GetPullRequest",
@@ -752,6 +964,50 @@
       ],
       "documentation":"<p>Gets information about a pull request in a specified repository.</p>"
     },
+    "GetPullRequestApprovalStates":{
+      "name":"GetPullRequestApprovalStates",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"GetPullRequestApprovalStatesInput"},
+      "output":{"shape":"GetPullRequestApprovalStatesOutput"},
+      "errors":[
+        {"shape":"PullRequestDoesNotExistException"},
+        {"shape":"InvalidPullRequestIdException"},
+        {"shape":"PullRequestIdRequiredException"},
+        {"shape":"InvalidRevisionIdException"},
+        {"shape":"RevisionIdRequiredException"},
+        {"shape":"EncryptionIntegrityChecksFailedException"},
+        {"shape":"EncryptionKeyAccessDeniedException"},
+        {"shape":"EncryptionKeyDisabledException"},
+        {"shape":"EncryptionKeyNotFoundException"},
+        {"shape":"EncryptionKeyUnavailableException"}
+      ],
+      "documentation":"<p>Gets information about the approval states for a specified pull request. Approval states only apply to pull requests that have one or more approval rules applied to them.</p>"
+    },
+    "GetPullRequestOverrideState":{
+      "name":"GetPullRequestOverrideState",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"GetPullRequestOverrideStateInput"},
+      "output":{"shape":"GetPullRequestOverrideStateOutput"},
+      "errors":[
+        {"shape":"PullRequestDoesNotExistException"},
+        {"shape":"InvalidPullRequestIdException"},
+        {"shape":"PullRequestIdRequiredException"},
+        {"shape":"InvalidRevisionIdException"},
+        {"shape":"RevisionIdRequiredException"},
+        {"shape":"EncryptionIntegrityChecksFailedException"},
+        {"shape":"EncryptionKeyAccessDeniedException"},
+        {"shape":"EncryptionKeyDisabledException"},
+        {"shape":"EncryptionKeyNotFoundException"},
+        {"shape":"EncryptionKeyUnavailableException"}
+      ],
+      "documentation":"<p>Returns information about whether approval rules have been set aside (overridden) for a pull request, and if so, the Amazon Resource Name (ARN) of the user or identity that overrode the rules and their requirements for the pull request.</p>"
+    },
     "GetRepository":{
       "name":"GetRepository",
       "http":{
@@ -770,7 +1026,7 @@
         {"shape":"EncryptionKeyNotFoundException"},
         {"shape":"EncryptionKeyUnavailableException"}
       ],
-      "documentation":"<p>Returns information about a repository.</p> <note> <p>The description field for a repository accepts all HTML characters and all valid Unicode characters. Applications that do not HTML-encode the description and display it in a web page could expose users to potentially malicious code. Make sure that you HTML-encode the description field in any application that uses this API to display the repository description on a web page.</p> </note>"
+      "documentation":"<p>Returns information about a repository.</p> <note> <p>The description field for a repository accepts all HTML characters and all valid Unicode characters. Applications that do not HTML-encode the description and display it in a webpage can expose users to potentially malicious code. Make sure that you HTML-encode the description field in any application that uses this API to display the repository description on a webpage.</p> </note>"
     },
     "GetRepositoryTriggers":{
       "name":"GetRepositoryTriggers",
@@ -792,6 +1048,42 @@
       ],
       "documentation":"<p>Gets information about triggers configured for a repository.</p>"
     },
+    "ListApprovalRuleTemplates":{
+      "name":"ListApprovalRuleTemplates",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"ListApprovalRuleTemplatesInput"},
+      "output":{"shape":"ListApprovalRuleTemplatesOutput"},
+      "errors":[
+        {"shape":"InvalidMaxResultsException"},
+        {"shape":"InvalidContinuationTokenException"}
+      ],
+      "documentation":"<p>Lists all approval rule templates in the specified AWS Region in your AWS account. If an AWS Region is not specified, the AWS Region where you are signed in is used.</p>"
+    },
+    "ListAssociatedApprovalRuleTemplatesForRepository":{
+      "name":"ListAssociatedApprovalRuleTemplatesForRepository",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"ListAssociatedApprovalRuleTemplatesForRepositoryInput"},
+      "output":{"shape":"ListAssociatedApprovalRuleTemplatesForRepositoryOutput"},
+      "errors":[
+        {"shape":"RepositoryNameRequiredException"},
+        {"shape":"InvalidRepositoryNameException"},
+        {"shape":"RepositoryDoesNotExistException"},
+        {"shape":"InvalidMaxResultsException"},
+        {"shape":"InvalidContinuationTokenException"},
+        {"shape":"EncryptionIntegrityChecksFailedException"},
+        {"shape":"EncryptionKeyAccessDeniedException"},
+        {"shape":"EncryptionKeyDisabledException"},
+        {"shape":"EncryptionKeyNotFoundException"},
+        {"shape":"EncryptionKeyUnavailableException"}
+      ],
+      "documentation":"<p>Lists all approval rule templates that are associated with a specified repository.</p>"
+    },
     "ListBranches":{
       "name":"ListBranches",
       "http":{
@@ -853,6 +1145,28 @@
       ],
       "documentation":"<p>Gets information about one or more repositories.</p>"
     },
+    "ListRepositoriesForApprovalRuleTemplate":{
+      "name":"ListRepositoriesForApprovalRuleTemplate",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"ListRepositoriesForApprovalRuleTemplateInput"},
+      "output":{"shape":"ListRepositoriesForApprovalRuleTemplateOutput"},
+      "errors":[
+        {"shape":"ApprovalRuleTemplateNameRequiredException"},
+        {"shape":"InvalidApprovalRuleTemplateNameException"},
+        {"shape":"ApprovalRuleTemplateDoesNotExistException"},
+        {"shape":"InvalidMaxResultsException"},
+        {"shape":"InvalidContinuationTokenException"},
+        {"shape":"EncryptionIntegrityChecksFailedException"},
+        {"shape":"EncryptionKeyAccessDeniedException"},
+        {"shape":"EncryptionKeyDisabledException"},
+        {"shape":"EncryptionKeyNotFoundException"},
+        {"shape":"EncryptionKeyUnavailableException"}
+      ],
+      "documentation":"<p>Lists all repositories associated with the specified approval rule template.</p>"
+    },
     "ListTagsForResource":{
       "name":"ListTagsForResource",
       "http":{
@@ -867,7 +1181,7 @@
         {"shape":"ResourceArnRequiredException"},
         {"shape":"InvalidResourceArnException"}
       ],
-      "documentation":"<p>Gets information about AWS tags for a specified Amazon Resource Name (ARN) in AWS CodeCommit. For a list of valid resources in AWS CodeCommit, see <a href=\"https://docs.aws.amazon.com/codecommit/latest/userguide/auth-and-access-control-iam-access-control-identity-based.html#arn-formats\">CodeCommit Resources and Operations</a> in the AWS CodeCommit User Guide.</p>"
+      "documentation":"<p>Gets information about AWS tags for a specified Amazon Resource Name (ARN) in AWS CodeCommit. For a list of valid resources in AWS CodeCommit, see <a href=\"https://docs.aws.amazon.com/codecommit/latest/userguide/auth-and-access-control-iam-access-control-identity-based.html#arn-formats\">CodeCommit Resources and Operations</a> in the<i> AWS CodeCommit User Guide</i>.</p>"
     },
     "MergeBranchesByFastForward":{
       "name":"MergeBranchesByFastForward",
@@ -1024,6 +1338,7 @@
         {"shape":"InvalidRepositoryNameException"},
         {"shape":"RepositoryDoesNotExistException"},
         {"shape":"ConcurrentReferenceUpdateException"},
+        {"shape":"PullRequestApprovalRulesNotSatisfiedException"},
         {"shape":"EncryptionIntegrityChecksFailedException"},
         {"shape":"EncryptionKeyAccessDeniedException"},
         {"shape":"EncryptionKeyDisabledException"},
@@ -1073,6 +1388,7 @@
         {"shape":"InvalidRepositoryNameException"},
         {"shape":"RepositoryDoesNotExistException"},
         {"shape":"RepositoryNotAssociatedWithPullRequestException"},
+        {"shape":"PullRequestApprovalRulesNotSatisfiedException"},
         {"shape":"EncryptionIntegrityChecksFailedException"},
         {"shape":"EncryptionKeyAccessDeniedException"},
         {"shape":"EncryptionKeyDisabledException"},
@@ -1122,6 +1438,7 @@
         {"shape":"RepositoryDoesNotExistException"},
         {"shape":"RepositoryNotAssociatedWithPullRequestException"},
         {"shape":"ConcurrentReferenceUpdateException"},
+        {"shape":"PullRequestApprovalRulesNotSatisfiedException"},
         {"shape":"EncryptionIntegrityChecksFailedException"},
         {"shape":"EncryptionKeyAccessDeniedException"},
         {"shape":"EncryptionKeyDisabledException"},
@@ -1130,6 +1447,32 @@
       ],
       "documentation":"<p>Attempts to merge the source commit of a pull request into the specified destination branch for that pull request at the specified commit using the three-way merge strategy. If the merge is successful, it closes the pull request.</p>"
     },
+    "OverridePullRequestApprovalRules":{
+      "name":"OverridePullRequestApprovalRules",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"OverridePullRequestApprovalRulesInput"},
+      "errors":[
+        {"shape":"PullRequestDoesNotExistException"},
+        {"shape":"InvalidPullRequestIdException"},
+        {"shape":"PullRequestIdRequiredException"},
+        {"shape":"InvalidRevisionIdException"},
+        {"shape":"RevisionIdRequiredException"},
+        {"shape":"InvalidOverrideStatusException"},
+        {"shape":"OverrideStatusRequiredException"},
+        {"shape":"OverrideAlreadySetException"},
+        {"shape":"RevisionNotCurrentException"},
+        {"shape":"PullRequestAlreadyClosedException"},
+        {"shape":"EncryptionIntegrityChecksFailedException"},
+        {"shape":"EncryptionKeyAccessDeniedException"},
+        {"shape":"EncryptionKeyDisabledException"},
+        {"shape":"EncryptionKeyNotFoundException"},
+        {"shape":"EncryptionKeyUnavailableException"}
+      ],
+      "documentation":"<p>Sets aside (overrides) all approval rule requirements for a specified pull request.</p>"
+    },
     "PostCommentForComparedCommit":{
       "name":"PostCommentForComparedCommit",
       "http":{
@@ -1301,7 +1644,7 @@
         {"shape":"EncryptionKeyNotFoundException"},
         {"shape":"EncryptionKeyUnavailableException"}
       ],
-      "documentation":"<p>Replaces all triggers for a repository. This can be used to create or delete triggers.</p>"
+      "documentation":"<p>Replaces all triggers for a repository. Used to create or delete triggers.</p>"
     },
     "TagResource":{
       "name":"TagResource",
@@ -1321,7 +1664,7 @@
         {"shape":"InvalidSystemTagUsageException"},
         {"shape":"TagPolicyException"}
       ],
-      "documentation":"<p>Adds or updates tags for a resource in AWS CodeCommit. For a list of valid resources in AWS CodeCommit, see <a href=\"https://docs.aws.amazon.com/codecommit/latest/userguide/auth-and-access-control-iam-access-control-identity-based.html#arn-formats\">CodeCommit Resources and Operations</a> in the AWS CodeCommit User Guide.</p>"
+      "documentation":"<p>Adds or updates tags for a resource in AWS CodeCommit. For a list of valid resources in AWS CodeCommit, see <a href=\"https://docs.aws.amazon.com/codecommit/latest/userguide/auth-and-access-control-iam-access-control-identity-based.html#arn-formats\">CodeCommit Resources and Operations</a> in the <i>AWS CodeCommit User Guide</i>.</p>"
     },
     "TestRepositoryTriggers":{
       "name":"TestRepositoryTriggers",
@@ -1354,7 +1697,7 @@
         {"shape":"EncryptionKeyNotFoundException"},
         {"shape":"EncryptionKeyUnavailableException"}
       ],
-      "documentation":"<p>Tests the functionality of repository triggers by sending information to the trigger target. If real data is available in the repository, the test will send data from the last commit. If no data is available, sample data will be generated.</p>"
+      "documentation":"<p>Tests the functionality of repository triggers by sending information to the trigger target. If real data is available in the repository, the test sends data from the last commit. If no data is available, sample data is generated.</p>"
     },
     "UntagResource":{
       "name":"UntagResource",
@@ -1374,7 +1717,57 @@
         {"shape":"InvalidSystemTagUsageException"},
         {"shape":"TagPolicyException"}
       ],
-      "documentation":"<p>Removes tags for a resource in AWS CodeCommit. For a list of valid resources in AWS CodeCommit, see <a href=\"https://docs.aws.amazon.com/codecommit/latest/userguide/auth-and-access-control-iam-access-control-identity-based.html#arn-formats\">CodeCommit Resources and Operations</a> in the AWS CodeCommit User Guide.</p>"
+      "documentation":"<p>Removes tags for a resource in AWS CodeCommit. For a list of valid resources in AWS CodeCommit, see <a href=\"https://docs.aws.amazon.com/codecommit/latest/userguide/auth-and-access-control-iam-access-control-identity-based.html#arn-formats\">CodeCommit Resources and Operations</a> in the <i>AWS CodeCommit User Guide</i>.</p>"
+    },
+    "UpdateApprovalRuleTemplateContent":{
+      "name":"UpdateApprovalRuleTemplateContent",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"UpdateApprovalRuleTemplateContentInput"},
+      "output":{"shape":"UpdateApprovalRuleTemplateContentOutput"},
+      "errors":[
+        {"shape":"InvalidApprovalRuleTemplateNameException"},
+        {"shape":"ApprovalRuleTemplateNameRequiredException"},
+        {"shape":"ApprovalRuleTemplateDoesNotExistException"},
+        {"shape":"InvalidApprovalRuleTemplateContentException"},
+        {"shape":"InvalidRuleContentSha256Exception"},
+        {"shape":"ApprovalRuleTemplateContentRequiredException"}
+      ],
+      "documentation":"<p>Updates the content of an approval rule template. You can change the number of required approvals, the membership of the approval rule, and whether an approval pool is defined.</p>"
+    },
+    "UpdateApprovalRuleTemplateDescription":{
+      "name":"UpdateApprovalRuleTemplateDescription",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"UpdateApprovalRuleTemplateDescriptionInput"},
+      "output":{"shape":"UpdateApprovalRuleTemplateDescriptionOutput"},
+      "errors":[
+        {"shape":"InvalidApprovalRuleTemplateNameException"},
+        {"shape":"ApprovalRuleTemplateNameRequiredException"},
+        {"shape":"ApprovalRuleTemplateDoesNotExistException"},
+        {"shape":"InvalidApprovalRuleTemplateDescriptionException"}
+      ],
+      "documentation":"<p>Updates the description for a specified approval rule template.</p>"
+    },
+    "UpdateApprovalRuleTemplateName":{
+      "name":"UpdateApprovalRuleTemplateName",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"UpdateApprovalRuleTemplateNameInput"},
+      "output":{"shape":"UpdateApprovalRuleTemplateNameOutput"},
+      "errors":[
+        {"shape":"InvalidApprovalRuleTemplateNameException"},
+        {"shape":"ApprovalRuleTemplateNameRequiredException"},
+        {"shape":"ApprovalRuleTemplateDoesNotExistException"},
+        {"shape":"ApprovalRuleTemplateNameAlreadyExistsException"}
+      ],
+      "documentation":"<p>Updates the name of a specified approval rule template.</p>"
     },
     "UpdateComment":{
       "name":"UpdateComment",
@@ -1417,6 +1810,61 @@
       ],
       "documentation":"<p>Sets or changes the default branch name for the specified repository.</p> <note> <p>If you use this operation to change the default branch name to the current default branch name, a success message is returned even though the default branch did not change.</p> </note>"
     },
+    "UpdatePullRequestApprovalRuleContent":{
+      "name":"UpdatePullRequestApprovalRuleContent",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"UpdatePullRequestApprovalRuleContentInput"},
+      "output":{"shape":"UpdatePullRequestApprovalRuleContentOutput"},
+      "errors":[
+        {"shape":"PullRequestDoesNotExistException"},
+        {"shape":"InvalidPullRequestIdException"},
+        {"shape":"PullRequestIdRequiredException"},
+        {"shape":"PullRequestAlreadyClosedException"},
+        {"shape":"ApprovalRuleNameRequiredException"},
+        {"shape":"InvalidApprovalRuleNameException"},
+        {"shape":"ApprovalRuleDoesNotExistException"},
+        {"shape":"InvalidRuleContentSha256Exception"},
+        {"shape":"ApprovalRuleContentRequiredException"},
+        {"shape":"InvalidApprovalRuleContentException"},
+        {"shape":"CannotModifyApprovalRuleFromTemplateException"},
+        {"shape":"EncryptionIntegrityChecksFailedException"},
+        {"shape":"EncryptionKeyAccessDeniedException"},
+        {"shape":"EncryptionKeyDisabledException"},
+        {"shape":"EncryptionKeyNotFoundException"},
+        {"shape":"EncryptionKeyUnavailableException"}
+      ],
+      "documentation":"<p>Updates the structure of an approval rule created specifically for a pull request. For example, you can change the number of required approvers and the approval pool for approvers. </p>"
+    },
+    "UpdatePullRequestApprovalState":{
+      "name":"UpdatePullRequestApprovalState",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"UpdatePullRequestApprovalStateInput"},
+      "errors":[
+        {"shape":"PullRequestDoesNotExistException"},
+        {"shape":"InvalidPullRequestIdException"},
+        {"shape":"PullRequestIdRequiredException"},
+        {"shape":"InvalidRevisionIdException"},
+        {"shape":"RevisionIdRequiredException"},
+        {"shape":"InvalidApprovalStateException"},
+        {"shape":"ApprovalStateRequiredException"},
+        {"shape":"PullRequestCannotBeApprovedByAuthorException"},
+        {"shape":"RevisionNotCurrentException"},
+        {"shape":"PullRequestAlreadyClosedException"},
+        {"shape":"MaximumNumberOfApprovalsExceededException"},
+        {"shape":"EncryptionIntegrityChecksFailedException"},
+        {"shape":"EncryptionKeyAccessDeniedException"},
+        {"shape":"EncryptionKeyDisabledException"},
+        {"shape":"EncryptionKeyNotFoundException"},
+        {"shape":"EncryptionKeyUnavailableException"}
+      ],
+      "documentation":"<p>Updates the state of a user's approval on a pull request. The user is derived from the signed-in account when the request is made.</p>"
+    },
     "UpdatePullRequestDescription":{
       "name":"UpdatePullRequestDescription",
       "http":{
@@ -1493,7 +1941,7 @@
         {"shape":"EncryptionKeyNotFoundException"},
         {"shape":"EncryptionKeyUnavailableException"}
       ],
-      "documentation":"<p>Sets or changes the comment or description for a repository.</p> <note> <p>The description field for a repository accepts all HTML characters and all valid Unicode characters. Applications that do not HTML-encode the description and display it in a web page could expose users to potentially malicious code. Make sure that you HTML-encode the description field in any application that uses this API to display the repository description on a web page.</p> </note>"
+      "documentation":"<p>Sets or changes the comment or description for a repository.</p> <note> <p>The description field for a repository accepts all HTML characters and all valid Unicode characters. Applications that do not HTML-encode the description and display it in a webpage can expose users to potentially malicious code. Make sure that you HTML-encode the description field in any application that uses this API to display the repository description on a webpage.</p> </note>"
     },
     "UpdateRepositoryName":{
       "name":"UpdateRepositoryName",
@@ -1508,7 +1956,7 @@
         {"shape":"RepositoryNameRequiredException"},
         {"shape":"InvalidRepositoryNameException"}
       ],
-      "documentation":"<p>Renames a repository. The repository name must be unique across the calling AWS account. In addition, repository names are limited to 100 alphanumeric, dash, and underscore characters, and cannot include certain characters. The suffix \".git\" is prohibited. For a full description of the limits on repository names, see <a href=\"https://docs.aws.amazon.com/codecommit/latest/userguide/limits.html\">Limits</a> in the AWS CodeCommit User Guide.</p>"
+      "documentation":"<p>Renames a repository. The repository name must be unique across the calling AWS account. Repository names are limited to 100 alphanumeric, dash, and underscore characters, and cannot include certain characters. The suffix .git is prohibited. For more information about the limits on repository names, see <a href=\"https://docs.aws.amazon.com/codecommit/latest/userguide/limits.html\">Limits</a> in the AWS CodeCommit User Guide.</p>"
     }
   },
   "shapes":{
@@ -1516,18 +1964,352 @@
     "ActorDoesNotExistException":{
       "type":"structure",
       "members":{
-      },
-      "documentation":"<p>The specified Amazon Resource Name (ARN) does not exist in the AWS account.</p>",
-      "exception":true
+      },
+      "documentation":"<p>The specified Amazon Resource Name (ARN) does not exist in the AWS account.</p>",
+      "exception":true
+    },
+    "AdditionalData":{"type":"string"},
+    "Approval":{
+      "type":"structure",
+      "members":{
+        "userArn":{
+          "shape":"Arn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the user.</p>"
+        },
+        "approvalState":{
+          "shape":"ApprovalState",
+          "documentation":"<p>The state of the approval, APPROVE or REVOKE. REVOKE states are not stored.</p>"
+        }
+      },
+      "documentation":"<p>Returns information about a specific approval on a pull request.</p>"
+    },
+    "ApprovalList":{
+      "type":"list",
+      "member":{"shape":"Approval"}
+    },
+    "ApprovalRule":{
+      "type":"structure",
+      "members":{
+        "approvalRuleId":{
+          "shape":"ApprovalRuleId",
+          "documentation":"<p>The system-generated ID of the approval rule.</p>"
+        },
+        "approvalRuleName":{
+          "shape":"ApprovalRuleName",
+          "documentation":"<p>The name of the approval rule.</p>"
+        },
+        "approvalRuleContent":{
+          "shape":"ApprovalRuleContent",
+          "documentation":"<p>The content of the approval rule.</p>"
+        },
+        "ruleContentSha256":{
+          "shape":"RuleContentSha256",
+          "documentation":"<p>The SHA-256 hash signature for the content of the approval rule.</p>"
+        },
+        "lastModifiedDate":{
+          "shape":"LastModifiedDate",
+          "documentation":"<p>The date the approval rule was most recently changed, in timestamp format.</p>"
+        },
+        "creationDate":{
+          "shape":"CreationDate",
+          "documentation":"<p>The date the approval rule was created, in timestamp format.</p>"
+        },
+        "lastModifiedUser":{
+          "shape":"Arn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the user who made the most recent changes to the approval rule.</p>"
+        },
+        "originApprovalRuleTemplate":{
+          "shape":"OriginApprovalRuleTemplate",
+          "documentation":"<p>The approval rule template used to create the rule.</p>"
+        }
+      },
+      "documentation":"<p>Returns information about an approval rule.</p>"
+    },
+    "ApprovalRuleContent":{
+      "type":"string",
+      "max":3000,
+      "min":1
+    },
+    "ApprovalRuleContentRequiredException":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>The content for the approval rule is empty. You must provide some content for an approval rule. The content cannot be null.</p>",
+      "exception":true
+    },
+    "ApprovalRuleDoesNotExistException":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>The specified approval rule does not exist.</p>",
+      "exception":true
+    },
+    "ApprovalRuleEventMetadata":{
+      "type":"structure",
+      "members":{
+        "approvalRuleName":{
+          "shape":"ApprovalRuleName",
+          "documentation":"<p>The name of the approval rule.</p>"
+        },
+        "approvalRuleId":{
+          "shape":"ApprovalRuleId",
+          "documentation":"<p>The system-generated ID of the approval rule.</p>"
+        },
+        "approvalRuleContent":{
+          "shape":"ApprovalRuleContent",
+          "documentation":"<p>The content of the approval rule.</p>"
+        }
+      },
+      "documentation":"<p>Returns information about an event for an approval rule.</p>"
+    },
+    "ApprovalRuleId":{"type":"string"},
+    "ApprovalRuleName":{
+      "type":"string",
+      "max":100,
+      "min":1
+    },
+    "ApprovalRuleNameAlreadyExistsException":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>An approval rule with that name already exists. Approval rule names must be unique within the scope of a pull request.</p>",
+      "exception":true
+    },
+    "ApprovalRuleNameRequiredException":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>An approval rule name is required, but was not specified.</p>",
+      "exception":true
+    },
+    "ApprovalRuleOverriddenEventMetadata":{
+      "type":"structure",
+      "members":{
+        "revisionId":{
+          "shape":"RevisionId",
+          "documentation":"<p>The revision ID of the pull request when the override event occurred.</p>"
+        },
+        "overrideStatus":{
+          "shape":"OverrideStatus",
+          "documentation":"<p>The status of the override event.</p>"
+        }
+      },
+      "documentation":"<p>Returns information about an override event for approval rules for a pull request.</p>"
+    },
+    "ApprovalRuleTemplate":{
+      "type":"structure",
+      "members":{
+        "approvalRuleTemplateId":{
+          "shape":"ApprovalRuleTemplateId",
+          "documentation":"<p>The system-generated ID of the approval rule template.</p>"
+        },
+        "approvalRuleTemplateName":{
+          "shape":"ApprovalRuleTemplateName",
+          "documentation":"<p>The name of the approval rule template.</p>"
+        },
+        "approvalRuleTemplateDescription":{
+          "shape":"ApprovalRuleTemplateDescription",
+          "documentation":"<p>The description of the approval rule template.</p>"
+        },
+        "approvalRuleTemplateContent":{
+          "shape":"ApprovalRuleTemplateContent",
+          "documentation":"<p>The content of the approval rule template.</p>"
+        },
+        "ruleContentSha256":{
+          "shape":"RuleContentSha256",
+          "documentation":"<p>The SHA-256 hash signature for the content of the approval rule template.</p>"
+        },
+        "lastModifiedDate":{
+          "shape":"LastModifiedDate",
+          "documentation":"<p>The date the approval rule template was most recently changed, in timestamp format.</p>"
+        },
+        "creationDate":{
+          "shape":"CreationDate",
+          "documentation":"<p>The date the approval rule template was created, in timestamp format.</p>"
+        },
+        "lastModifiedUser":{
+          "shape":"Arn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the user who made the most recent changes to the approval rule template.</p>"
+        }
+      },
+      "documentation":"<p>Returns information about an approval rule template.</p>"
+    },
+    "ApprovalRuleTemplateContent":{
+      "type":"string",
+      "max":3000,
+      "min":1
+    },
+    "ApprovalRuleTemplateContentRequiredException":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>The content for the approval rule template is empty. You must provide some content for an approval rule template. The content cannot be null.</p>",
+      "exception":true
+    },
+    "ApprovalRuleTemplateDescription":{
+      "type":"string",
+      "max":1000,
+      "min":0
+    },
+    "ApprovalRuleTemplateDoesNotExistException":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>The specified approval rule template does not exist. Verify that the name is correct and that you are signed in to the AWS Region where the template was created, and then try again.</p>",
+      "exception":true
+    },
+    "ApprovalRuleTemplateId":{"type":"string"},
+    "ApprovalRuleTemplateInUseException":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>The approval rule template is associated with one or more repositories. You cannot delete a template that is associated with a repository. Remove all associations, and then try again.</p>",
+      "exception":true
+    },
+    "ApprovalRuleTemplateName":{
+      "type":"string",
+      "max":100,
+      "min":1
+    },
+    "ApprovalRuleTemplateNameAlreadyExistsException":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>You cannot create an approval rule template with that name because a template with that name already exists in this AWS Region for your AWS account. Approval rule template names must be unique.</p>",
+      "exception":true
+    },
+    "ApprovalRuleTemplateNameList":{
+      "type":"list",
+      "member":{"shape":"ApprovalRuleTemplateName"}
+    },
+    "ApprovalRuleTemplateNameRequiredException":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>An approval rule template name is required, but was not specified.</p>",
+      "exception":true
+    },
+    "ApprovalRulesList":{
+      "type":"list",
+      "member":{"shape":"ApprovalRule"}
+    },
+    "ApprovalRulesNotSatisfiedList":{
+      "type":"list",
+      "member":{"shape":"ApprovalRuleName"}
+    },
+    "ApprovalRulesSatisfiedList":{
+      "type":"list",
+      "member":{"shape":"ApprovalRuleName"}
+    },
+    "ApprovalState":{
+      "type":"string",
+      "enum":[
+        "APPROVE",
+        "REVOKE"
+      ]
+    },
+    "ApprovalStateChangedEventMetadata":{
+      "type":"structure",
+      "members":{
+        "revisionId":{
+          "shape":"RevisionId",
+          "documentation":"<p>The revision ID of the pull request when the approval state changed.</p>"
+        },
+        "approvalStatus":{
+          "shape":"ApprovalState",
+          "documentation":"<p>The approval status for the pull request.</p>"
+        }
+      },
+      "documentation":"<p>Returns information about a change in the approval state for a pull request.</p>"
+    },
+    "ApprovalStateRequiredException":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>An approval state is required, but was not specified.</p>",
+      "exception":true
+    },
+    "Approved":{"type":"boolean"},
+    "Arn":{"type":"string"},
+    "AssociateApprovalRuleTemplateWithRepositoryInput":{
+      "type":"structure",
+      "required":[
+        "approvalRuleTemplateName",
+        "repositoryName"
+      ],
+      "members":{
+        "approvalRuleTemplateName":{
+          "shape":"ApprovalRuleTemplateName",
+          "documentation":"<p>The name for the approval rule template. </p>"
+        },
+        "repositoryName":{
+          "shape":"RepositoryName",
+          "documentation":"<p>The name of the repository that you want to associate with the template.</p>"
+        }
+      }
+    },
+    "AuthorDoesNotExistException":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>The specified Amazon Resource Name (ARN) does not exist in the AWS account.</p>",
+      "exception":true
+    },
+    "BatchAssociateApprovalRuleTemplateWithRepositoriesError":{
+      "type":"structure",
+      "members":{
+        "repositoryName":{
+          "shape":"RepositoryName",
+          "documentation":"<p>The name of the repository where the association was not made.</p>"
+        },
+        "errorCode":{
+          "shape":"ErrorCode",
+          "documentation":"<p>An error code that specifies whether the repository name was not valid or not found.</p>"
+        },
+        "errorMessage":{
+          "shape":"ErrorMessage",
+          "documentation":"<p>An error message that provides details about why the repository name was not found or not valid.</p>"
+        }
+      },
+      "documentation":"<p>Returns information about errors in a BatchAssociateApprovalRuleTemplateWithRepositories operation.</p>"
+    },
+    "BatchAssociateApprovalRuleTemplateWithRepositoriesErrorsList":{
+      "type":"list",
+      "member":{"shape":"BatchAssociateApprovalRuleTemplateWithRepositoriesError"}
+    },
+    "BatchAssociateApprovalRuleTemplateWithRepositoriesInput":{
+      "type":"structure",
+      "required":[
+        "approvalRuleTemplateName",
+        "repositoryNames"
+      ],
+      "members":{
+        "approvalRuleTemplateName":{
+          "shape":"ApprovalRuleTemplateName",
+          "documentation":"<p>The name of the template you want to associate with one or more repositories.</p>"
+        },
+        "repositoryNames":{
+          "shape":"RepositoryNameList",
+          "documentation":"<p>The names of the repositories you want to associate with the template.</p> <note> <p>The length constraint limit is for each string in the array. The array itself can be empty.</p> </note>"
+        }
+      }
     },
-    "AdditionalData":{"type":"string"},
-    "Arn":{"type":"string"},
-    "AuthorDoesNotExistException":{
+    "BatchAssociateApprovalRuleTemplateWithRepositoriesOutput":{
       "type":"structure",
+      "required":[
+        "associatedRepositoryNames",
+        "errors"
+      ],
       "members":{
-      },
-      "documentation":"<p>The specified Amazon Resource Name (ARN) does not exist in the AWS account.</p>",
-      "exception":true
+        "associatedRepositoryNames":{
+          "shape":"RepositoryNameList",
+          "documentation":"<p>A list of names of the repositories that have been associated with the template.</p>"
+        },
+        "errors":{
+          "shape":"BatchAssociateApprovalRuleTemplateWithRepositoriesErrorsList",
+          "documentation":"<p>A list of any errors that might have occurred while attempting to create the association between the template and the repositories.</p>"
+        }
+      }
     },
     "BatchDescribeMergeConflictsError":{
       "type":"structure",
@@ -1550,7 +2332,7 @@
           "documentation":"<p>The message provided by the exception.</p>"
         }
       },
-      "documentation":"<p>Information about errors in a BatchDescribeMergeConflicts operation.</p>"
+      "documentation":"<p>Returns information about errors in a BatchDescribeMergeConflicts operation.</p>"
     },
     "BatchDescribeMergeConflictsErrors":{
       "type":"list",
@@ -1571,11 +2353,11 @@
         },
         "destinationCommitSpecifier":{
           "shape":"CommitName",
-          "documentation":"<p>The branch, tag, HEAD, or other fully qualified reference used to identify a commit. For example, a branch name or a full commit ID.</p>"
+          "documentation":"<p>The branch, tag, HEAD, or other fully qualified reference used to identify a commit (for example, a branch name or a full commit ID).</p>"
         },
         "sourceCommitSpecifier":{
           "shape":"CommitName",
-          "documentation":"<p>The branch, tag, HEAD, or other fully qualified reference used to identify a commit. For example, a branch name or a full commit ID.</p>"
+          "documentation":"<p>The branch, tag, HEAD, or other fully qualified reference used to identify a commit (for example, a branch name or a full commit ID).</p>"
         },
         "mergeOption":{
           "shape":"MergeOptionTypeEnum",
@@ -1595,15 +2377,15 @@
         },
         "conflictDetailLevel":{
           "shape":"ConflictDetailLevelTypeEnum",
-          "documentation":"<p>The level of conflict detail to use. If unspecified, the default FILE_LEVEL is used, which will return a not mergeable result if the same file has differences in both branches. If LINE_LEVEL is specified, a conflict will be considered not mergeable if the same file in both branches has differences on the same line.</p>"
+          "documentation":"<p>The level of conflict detail to use. If unspecified, the default FILE_LEVEL is used, which returns a not-mergeable result if the same file has differences in both branches. If LINE_LEVEL is specified, a conflict is considered not mergeable if the same file in both branches has differences on the same line.</p>"
         },
         "conflictResolutionStrategy":{
           "shape":"ConflictResolutionStrategyTypeEnum",
-          "documentation":"<p>Specifies which branch to use when resolving conflicts, or whether to attempt automatically merging two versions of a file. The default is NONE, which requires any conflicts to be resolved manually before the merge operation will be successful.</p>"
+          "documentation":"<p>Specifies which branch to use when resolving conflicts, or whether to attempt automatically merging two versions of a file. The default is NONE, which requires any conflicts to be resolved manually before the merge operation is successful.</p>"
         },
         "nextToken":{
           "shape":"NextToken",
-          "documentation":"<p>An enumeration token that when provided in a request, returns the next batch of the results.</p>"
+          "documentation":"<p>An enumeration token that, when provided in a request, returns the next batch of the results.</p>"
         }
       }
     },
@@ -1641,6 +2423,62 @@
         }
       }
     },
+    "BatchDisassociateApprovalRuleTemplateFromRepositoriesError":{
+      "type":"structure",
+      "members":{
+        "repositoryName":{
+          "shape":"RepositoryName",
+          "documentation":"<p>The name of the repository where the association with the template was not able to be removed.</p>"
+        },
+        "errorCode":{
+          "shape":"ErrorCode",
+          "documentation":"<p>An error code that specifies whether the repository name was not valid or not found.</p>"
+        },
+        "errorMessage":{
+          "shape":"ErrorMessage",
+          "documentation":"<p>An error message that provides details about why the repository name was either not found or not valid.</p>"
+        }
+      },
+      "documentation":"<p>Returns information about errors in a BatchDisassociateApprovalRuleTemplateFromRepositories operation.</p>"
+    },
+    "BatchDisassociateApprovalRuleTemplateFromRepositoriesErrorsList":{
+      "type":"list",
+      "member":{"shape":"BatchDisassociateApprovalRuleTemplateFromRepositoriesError"}
+    },
+    "BatchDisassociateApprovalRuleTemplateFromRepositoriesInput":{
+      "type":"structure",
+      "required":[
+        "approvalRuleTemplateName",
+        "repositoryNames"
+      ],
+      "members":{
+        "approvalRuleTemplateName":{
+          "shape":"ApprovalRuleTemplateName",
+          "documentation":"<p>The name of the template that you want to disassociate from one or more repositories.</p>"
+        },
+        "repositoryNames":{
+          "shape":"RepositoryNameList",
+          "documentation":"<p>The repository names that you want to disassociate from the approval rule template.</p> <note> <p>The length constraint limit is for each string in the array. The array itself can be empty.</p> </note>"
+        }
+      }
+    },
+    "BatchDisassociateApprovalRuleTemplateFromRepositoriesOutput":{
+      "type":"structure",
+      "required":[
+        "disassociatedRepositoryNames",
+        "errors"
+      ],
+      "members":{
+        "disassociatedRepositoryNames":{
+          "shape":"RepositoryNameList",
+          "documentation":"<p>A list of repository names that have had their association with the template removed.</p>"
+        },
+        "errors":{
+          "shape":"BatchDisassociateApprovalRuleTemplateFromRepositoriesErrorsList",
+          "documentation":"<p>A list of any errors that might have occurred while attempting to remove the association between the template and the repositories.</p>"
+        }
+      }
+    },
     "BatchGetCommitsError":{
       "type":"structure",
       "members":{
@@ -1672,7 +2510,7 @@
       "members":{
         "commitIds":{
           "shape":"CommitIdsInputList",
-          "documentation":"<p>The full commit IDs of the commits to get information about.</p> <note> <p>You must supply the full SHAs of each commit. You cannot use shortened SHAs.</p> </note>"
+          "documentation":"<p>The full commit IDs of the commits to get information about.</p> <note> <p>You must supply the full SHA IDs of each commit. You cannot use shortened SHA IDs.</p> </note>"
         },
         "repositoryName":{
           "shape":"RepositoryName",
@@ -1689,7 +2527,7 @@
         },
         "errors":{
           "shape":"BatchGetCommitsErrorsList",
-          "documentation":"<p>Returns any commit IDs for which information could not be found. For example, if one of the commit IDs was a shortened SHA or that commit was not found in the specified repository, the ID will return an error object with additional information.</p>"
+          "documentation":"<p>Returns any commit IDs for which information could not be found. For example, if one of the commit IDs was a shortened SHA ID or that commit was not found in the specified repository, the ID returns an error object with more information.</p>"
         }
       }
     },
@@ -1699,7 +2537,7 @@
       "members":{
         "repositoryNames":{
           "shape":"RepositoryNameList",
-          "documentation":"<p>The names of the repositories to get information about.</p>"
+          "documentation":"<p>The names of the repositories to get information about.</p> <note> <p>The length constraint limit is for each string in the array. The array itself can be empty.</p> </note>"
         }
       },
       "documentation":"<p>Represents the input of a batch get repositories operation.</p>"
@@ -1736,7 +2574,7 @@
       "type":"structure",
       "members":{
       },
-      "documentation":"<p>A blob ID is required but was not specified.</p>",
+      "documentation":"<p>A blob ID is required, but was not specified.</p>",
       "exception":true
     },
     "BlobMetadata":{
@@ -1748,7 +2586,7 @@
         },
         "path":{
           "shape":"Path",
-          "documentation":"<p>The path to the blob and any associated file name, if any.</p>"
+          "documentation":"<p>The path to the blob and associated file name, if any.</p>"
         },
         "mode":{
           "shape":"Mode",
@@ -1794,7 +2632,7 @@
       "type":"structure",
       "members":{
       },
-      "documentation":"<p>The specified branch name is not valid because it is a tag name. Type the name of a current branch in the repository. For a list of valid branch names, use <a>ListBranches</a>.</p>",
+      "documentation":"<p>The specified branch name is not valid because it is a tag name. Enter the name of a branch in the repository. For a list of valid branch names, use <a>ListBranches</a>.</p>",
       "exception":true
     },
     "BranchNameList":{
@@ -1805,7 +2643,21 @@
       "type":"structure",
       "members":{
       },
-      "documentation":"<p>A branch name is required but was not specified.</p>",
+      "documentation":"<p>A branch name is required, but was not specified.</p>",
+      "exception":true
+    },
+    "CannotDeleteApprovalRuleFromTemplateException":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>The approval rule cannot be deleted from the pull request because it was created by an approval rule template and applied to the pull request automatically.</p>",
+      "exception":true
+    },
+    "CannotModifyApprovalRuleFromTemplateException":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>The approval rule cannot be modified for the pull request because it was created by an approval rule template and applied to the pull request automatically.</p>",
       "exception":true
     },
     "CapitalBoolean":{"type":"boolean"},
@@ -1822,7 +2674,7 @@
       "type":"structure",
       "members":{
       },
-      "documentation":"<p>A client request token is required. A client request token is an unique, client-generated idempotency token that when provided in a request, ensures the request cannot be repeated with a changed parameter. If a request is received with the same parameters and a token is included, the request will return information about the initial request that used that token.</p>",
+      "documentation":"<p>A client request token is required. A client request token is an unique, client-generated idempotency token that, when provided in a request, ensures the request cannot be repeated with a changed parameter. If a request is received with the same parameters and a token is included, the request returns information about the initial request that used that token.</p>",
       "exception":true
     },
     "CloneUrlHttp":{"type":"string"},
@@ -1860,7 +2712,7 @@
         },
         "clientRequestToken":{
           "shape":"ClientRequestToken",
-          "documentation":"<p>A unique, client-generated idempotency token that when provided in a request, ensures the request cannot be repeated with a changed parameter. If a request is received with the same parameters and a token is included, the request will return information about the initial request that used that token.</p>"
+          "documentation":"<p>A unique, client-generated idempotency token that, when provided in a request, ensures the request cannot be repeated with a changed parameter. If a request is received with the same parameters and a token is included, the request returns information about the initial request that used that token.</p>"
         }
       },
       "documentation":"<p>Returns information about a specific comment.</p>"
@@ -1890,7 +2742,7 @@
       "type":"structure",
       "members":{
       },
-      "documentation":"<p>No comment exists with the provided ID. Verify that you have provided the correct ID, and then try again.</p>",
+      "documentation":"<p>No comment exists with the provided ID. Verify that you have used the correct ID, and then try again.</p>",
       "exception":true
     },
     "CommentId":{"type":"string"},
@@ -1921,23 +2773,23 @@
         },
         "beforeCommitId":{
           "shape":"CommitId",
-          "documentation":"<p>The full commit ID of the commit used to establish the 'before' of the comparison.</p>"
+          "documentation":"<p>The full commit ID of the commit used to establish the before of the comparison.</p>"
         },
         "afterCommitId":{
           "shape":"CommitId",
-          "documentation":"<p>The full commit ID of the commit used to establish the 'after' of the comparison.</p>"
+          "documentation":"<p>The full commit ID of the commit used to establish the after of the comparison.</p>"
         },
         "beforeBlobId":{
           "shape":"ObjectId",
-          "documentation":"<p>The full blob ID of the commit used to establish the 'before' of the comparison.</p>"
+          "documentation":"<p>The full blob ID of the commit used to establish the before of the comparison.</p>"
         },
         "afterBlobId":{
           "shape":"ObjectId",
-          "documentation":"<p>The full blob ID of the commit used to establish the 'after' of the comparison.</p>"
+          "documentation":"<p>The full blob ID of the commit used to establish the after of the comparison.</p>"
         },
         "location":{
           "shape":"Location",
-          "documentation":"<p>Location information about the comment on the comparison, including the file name, line number, and whether the version of the file where the comment was made is 'BEFORE' or 'AFTER'.</p>"
+          "documentation":"<p>Location information about the comment on the comparison, including the file name, line number, and whether the version of the file where the comment was made is BEFORE or AFTER.</p>"
         },
         "comments":{
           "shape":"Comments",
@@ -1963,11 +2815,11 @@
         },
         "beforeCommitId":{
           "shape":"CommitId",
-          "documentation":"<p>The full commit ID of the commit that was the tip of the destination branch when the pull request was created. This commit will be superceded by the after commit in the source branch when and if you merge the source branch into the destination branch.</p>"
+          "documentation":"<p>The full commit ID of the commit that was the tip of the destination branch when the pull request was created. This commit is superceded by the after commit in the source branch when and if you merge the source branch into the destination branch.</p>"
         },
         "afterCommitId":{
           "shape":"CommitId",
-          "documentation":"<p>he full commit ID of the commit that was the tip of the source branch at the time the comment was made. </p>"
+          "documentation":"<p>The full commit ID of the commit that was the tip of the source branch at the time the comment was made. </p>"
         },
         "beforeBlobId":{
           "shape":"ObjectId",
@@ -1979,7 +2831,7 @@
         },
         "location":{
           "shape":"Location",
-          "documentation":"<p>Location information about the comment on the pull request, including the file name, line number, and whether the version of the file where the comment was made is 'BEFORE' (destination branch) or 'AFTER' (source branch).</p>"
+          "documentation":"<p>Location information about the comment on the pull request, including the file name, line number, and whether the version of the file where the comment was made is BEFORE (destination branch) or AFTER (source branch).</p>"
         },
         "comments":{
           "shape":"Comments",
@@ -1997,7 +2849,7 @@
       "members":{
         "commitId":{
           "shape":"ObjectId",
-          "documentation":"<p>The full SHA of the specified commit. </p>"
+          "documentation":"<p>The full SHA ID of the specified commit. </p>"
         },
         "treeId":{
           "shape":"ObjectId",
@@ -2021,7 +2873,7 @@
         },
         "additionalData":{
           "shape":"AdditionalData",
-          "documentation":"<p>Any additional data associated with the specified commit.</p>"
+          "documentation":"<p>Any other data associated with the specified commit.</p>"
         }
       },
       "documentation":"<p>Returns information about a specific commit.</p>"
@@ -2063,6 +2915,7 @@
       "type":"structure",
       "members":{
       },
+      "documentation":"<p>A list of commit IDs is required, but was either not specified or the list was empty.</p>",
       "exception":true
     },
     "CommitMessageLengthExceededException":{
@@ -2167,18 +3020,18 @@
       "members":{
         "replaceContents":{
           "shape":"ReplaceContentEntries",
-          "documentation":"<p>Files that will have content replaced as part of the merge conflict resolution.</p>"
+          "documentation":"<p>Files to have content replaced as part of the merge conflict resolution.</p>"
         },
         "deleteFiles":{
           "shape":"DeleteFileEntries",
-          "documentation":"<p>Files that will be deleted as part of the merge conflict resolution.</p>"
+          "documentation":"<p>Files to be deleted as part of the merge conflict resolution.</p>"
         },
         "setFileModes":{
           "shape":"SetFileModeEntries",
-          "documentation":"<p>File modes that will be set as part of the merge conflict resolution.</p>"
+          "documentation":"<p>File modes that are set as part of the merge conflict resolution.</p>"
         }
       },
-      "documentation":"<p>A list of inputs to use when resolving conflicts during a merge if AUTOMERGE is chosen as the conflict resolution strategy.</p>"
+      "documentation":"<p>If AUTOMERGE is the conflict resolution strategy, a list of inputs to use when resolving conflicts during a merge.</p>"
     },
     "ConflictResolutionStrategyTypeEnum":{
       "type":"string",
@@ -2194,6 +3047,37 @@
       "member":{"shape":"Conflict"}
     },
     "Content":{"type":"string"},
+    "CreateApprovalRuleTemplateInput":{
+      "type":"structure",
+      "required":[
+        "approvalRuleTemplateName",
+        "approvalRuleTemplateContent"
+      ],
+      "members":{
+        "approvalRuleTemplateName":{
+          "shape":"ApprovalRuleTemplateName",
+          "documentation":"<p>The name of the approval rule template. Provide descriptive names, because this name is applied to the approval rules created automatically in associated repositories.</p>"
+        },
+        "approvalRuleTemplateContent":{
+          "shape":"ApprovalRuleTemplateContent",
+          "documentation":"<p>The content of the approval rule that is created on pull requests in associated repositories. If you specify one or more destination references (branches), approval rules are created in an associated repository only if their destination references (branches) match those specified in the template.</p> <note> <p>When you create the content of the approval rule template, you can specify approvers in an approval pool in one of two ways:</p> <ul> <li> <p> <b>CodeCommitApprovers</b>: This option only requires an AWS account and a resource. It can be used for both IAM users and federated access users whose name matches the provided resource name. This is a very powerful option that offers a great deal of flexibility. For example, if you specify the AWS account <i>123456789012</i> and <i>Mary_Major</i>, all of the following are counted as approvals coming from that user:</p> <ul> <li> <p>An IAM user in the account (arn:aws:iam::<i>123456789012</i>:user/<i>Mary_Major</i>)</p> </li> <li> <p>A federated user identified in IAM as Mary_Major (arn:aws:sts::<i>123456789012</i>:federated-user/<i>Mary_Major</i>)</p> </li> </ul> <p>This option does not recognize an active session of someone assuming the role of CodeCommitReview with a role session name of <i>Mary_Major</i> (arn:aws:sts::<i>123456789012</i>:assumed-role/CodeCommitReview/<i>Mary_Major</i>) unless you include a wildcard (*Mary_Major).</p> </li> <li> <p> <b>Fully qualified ARN</b>: This option allows you to specify the fully qualified Amazon Resource Name (ARN) of the IAM user or role. </p> </li> </ul> <p>For more information about IAM ARNs, wildcards, and formats, see <a href=\"https://docs.aws.amazon.com/iam/latest/UserGuide/reference_identifiers.html\">IAM Identifiers</a> in the <i>IAM User Guide</i>.</p> </note>"
+        },
+        "approvalRuleTemplateDescription":{
+          "shape":"ApprovalRuleTemplateDescription",
+          "documentation":"<p>The description of the approval rule template. Consider providing a description that explains what this template does and when it might be appropriate to associate it with repositories.</p>"
+        }
+      }
+    },
+    "CreateApprovalRuleTemplateOutput":{
+      "type":"structure",
+      "required":["approvalRuleTemplate"],
+      "members":{
+        "approvalRuleTemplate":{
+          "shape":"ApprovalRuleTemplate",
+          "documentation":"<p>The content and structure of the created approval rule template.</p>"
+        }
+      }
+    },
     "CreateBranchInput":{
       "type":"structure",
       "required":[
@@ -2226,19 +3110,19 @@
       "members":{
         "repositoryName":{
           "shape":"RepositoryName",
-          "documentation":"<p>The name of the repository where you will create the commit.</p>"
+          "documentation":"<p>The name of the repository where you create the commit.</p>"
         },
         "branchName":{
           "shape":"BranchName",
-          "documentation":"<p>The name of the branch where you will create the commit.</p>"
+          "documentation":"<p>The name of the branch where you create the commit.</p>"
         },
         "parentCommitId":{
           "shape":"CommitId",
-          "documentation":"<p>The ID of the commit that is the parent of the commit you will create. If this is an empty repository, this is not required.</p>"
+          "documentation":"<p>The ID of the commit that is the parent of the commit you create. Not required if this is an empty repository.</p>"
         },
         "authorName":{
           "shape":"Name",
-          "documentation":"<p>The name of the author who created the commit. This information will be used as both the author and committer for the commit.</p>"
+          "documentation":"<p>The name of the author who created the commit. This information is used as both the author and committer for the commit.</p>"
         },
         "email":{
           "shape":"Email",
@@ -2246,11 +3130,11 @@
         },
         "commitMessage":{
           "shape":"Message",
-          "documentation":"<p>The commit message you want to include as part of creating the commit. Commit messages are limited to 256 KB. If no message is specified, a default message will be used.</p>"
+          "documentation":"<p>The commit message you want to include in the commit. Commit messages are limited to 256 KB. If no message is specified, a default message is used.</p>"
         },
         "keepEmptyFolders":{
           "shape":"KeepEmptyFolders",
-          "documentation":"<p>If the commit contains deletions, whether to keep a folder or folder structure if the changes leave the folders empty. If this is specified as true, a .gitkeep file will be created for empty folders. The default is false.</p>"
+          "documentation":"<p>If the commit contains deletions, whether to keep a folder or folder structure if the changes leave the folders empty. If true, a ..gitkeep file is created for empty folders. The default is false.</p>"
         },
         "putFiles":{
           "shape":"PutFileEntries",
@@ -2258,7 +3142,7 @@
         },
         "deleteFiles":{
           "shape":"DeleteFileEntries",
-          "documentation":"<p>The files to delete in this commit. These files will still exist in prior commits.</p>"
+          "documentation":"<p>The files to delete in this commit. These files still exist in earlier commits.</p>"
         },
         "setFileModes":{
           "shape":"SetFileModeEntries",
@@ -2291,6 +3175,38 @@
         }
       }
     },
+    "CreatePullRequestApprovalRuleInput":{
+      "type":"structure",
+      "required":[
+        "pullRequestId",
+        "approvalRuleName",
+        "approvalRuleContent"
+      ],
+      "members":{
+        "pullRequestId":{
+          "shape":"PullRequestId",
+          "documentation":"<p>The system-generated ID of the pull request for which you want to create the approval rule.</p>"
+        },
+        "approvalRuleName":{
+          "shape":"ApprovalRuleName",
+          "documentation":"<p>The name for the approval rule.</p>"
+        },
+        "approvalRuleContent":{
+          "shape":"ApprovalRuleContent",
+          "documentation":"<p>The content of the approval rule, including the number of approvals needed and the structure of an approval pool defined for approvals, if any. For more information about approval pools, see the AWS CodeCommit User Guide.</p> <note> <p>When you create the content of the approval rule, you can specify approvers in an approval pool in one of two ways:</p> <ul> <li> <p> <b>CodeCommitApprovers</b>: This option only requires an AWS account and a resource. It can be used for both IAM users and federated access users whose name matches the provided resource name. This is a very powerful option that offers a great deal of flexibility. For example, if you specify the AWS account <i>123456789012</i> and <i>Mary_Major</i>, all of the following would be counted as approvals coming from that user:</p> <ul> <li> <p>An IAM user in the account (arn:aws:iam::<i>123456789012</i>:user/<i>Mary_Major</i>)</p> </li> <li> <p>A federated user identified in IAM as Mary_Major (arn:aws:sts::<i>123456789012</i>:federated-user/<i>Mary_Major</i>)</p> </li> </ul> <p>This option does not recognize an active session of someone assuming the role of CodeCommitReview with a role session name of <i>Mary_Major</i> (arn:aws:sts::<i>123456789012</i>:assumed-role/CodeCommitReview/<i>Mary_Major</i>) unless you include a wildcard (*Mary_Major).</p> </li> <li> <p> <b>Fully qualified ARN</b>: This option allows you to specify the fully qualified Amazon Resource Name (ARN) of the IAM user or role. </p> </li> </ul> <p>For more information about IAM ARNs, wildcards, and formats, see <a href=\"https://docs.aws.amazon.com/iam/latest/UserGuide/reference_identifiers.html\">IAM Identifiers</a> in the <i>IAM User Guide</i>.</p> </note>"
+        }
+      }
+    },
+    "CreatePullRequestApprovalRuleOutput":{
+      "type":"structure",
+      "required":["approvalRule"],
+      "members":{
+        "approvalRule":{
+          "shape":"ApprovalRule",
+          "documentation":"<p>Information about the created approval rule.</p>"
+        }
+      }
+    },
     "CreatePullRequestInput":{
       "type":"structure",
       "required":[
@@ -2300,7 +3216,7 @@
       "members":{
         "title":{
           "shape":"Title",
-          "documentation":"<p>The title of the pull request. This title will be used to identify the pull request to other users in the repository.</p>"
+          "documentation":"<p>The title of the pull request. This title is used to identify the pull request to other users in the repository.</p>"
         },
         "description":{
           "shape":"Description",
@@ -2308,11 +3224,11 @@
         },
         "targets":{
           "shape":"TargetList",
-          "documentation":"<p>The targets for the pull request, including the source of the code to be reviewed (the source branch), and the destination where the creator of the pull request intends the code to be merged after the pull request is closed (the destination branch).</p>"
+          "documentation":"<p>The targets for the pull request, including the source of the code to be reviewed (the source branch) and the destination where the creator of the pull request intends the code to be merged after the pull request is closed (the destination branch).</p>"
         },
         "clientRequestToken":{
           "shape":"ClientRequestToken",
-          "documentation":"<p>A unique, client-generated idempotency token that when provided in a request, ensures the request cannot be repeated with a changed parameter. If a request is received with the same parameters and a token is included, the request will return information about the initial request that used that token.</p> <note> <p>The AWS SDKs prepopulate client request tokens. If using an AWS SDK, you do not have to generate an idempotency token, as this will be done for you.</p> </note>",
+          "documentation":"<p>A unique, client-generated idempotency token that, when provided in a request, ensures the request cannot be repeated with a changed parameter. If a request is received with the same parameters and a token is included, the request returns information about the initial request that used that token.</p> <note> <p>The AWS SDKs prepopulate client request tokens. If you are using an AWS SDK, an idempotency token is created for you.</p> </note>",
           "idempotencyToken":true
         }
       }
@@ -2333,11 +3249,11 @@
       "members":{
         "repositoryName":{
           "shape":"RepositoryName",
-          "documentation":"<p>The name of the new repository to be created.</p> <note> <p>The repository name must be unique across the calling AWS account. In addition, repository names are limited to 100 alphanumeric, dash, and underscore characters, and cannot include certain characters. For a full description of the limits on repository names, see <a href=\"https://docs.aws.amazon.com/codecommit/latest/userguide/limits.html\">Limits</a> in the AWS CodeCommit User Guide. The suffix \".git\" is prohibited.</p> </note>"
+          "documentation":"<p>The name of the new repository to be created.</p> <note> <p>The repository name must be unique across the calling AWS account. Repository names are limited to 100 alphanumeric, dash, and underscore characters, and cannot include certain characters. For more information about the limits on repository names, see <a href=\"https://docs.aws.amazon.com/codecommit/latest/userguide/limits.html\">Limits</a> in the <i>AWS CodeCommit User Guide</i>. The suffix .git is prohibited.</p> </note>"
         },
         "repositoryDescription":{
           "shape":"RepositoryDescription",
-          "documentation":"<p>A comment or description about the new repository.</p> <note> <p>The description field for a repository accepts all HTML characters and all valid Unicode characters. Applications that do not HTML-encode the description and display it in a web page could expose users to potentially malicious code. Make sure that you HTML-encode the description field in any application that uses this API to display the repository description on a web page.</p> </note>"
+          "documentation":"<p>A comment or description about the new repository.</p> <note> <p>The description field for a repository accepts all HTML characters and all valid Unicode characters. Applications that do not HTML-encode the description and display it in a webpage can expose users to potentially malicious code. Make sure that you HTML-encode the description field in any application that uses this API to display the repository description on a webpage.</p> </note>"
         },
         "tags":{
           "shape":"TagsMap",
@@ -2371,11 +3287,11 @@
         },
         "sourceCommitSpecifier":{
           "shape":"CommitName",
-          "documentation":"<p>The branch, tag, HEAD, or other fully qualified reference used to identify a commit. For example, a branch name or a full commit ID.</p>"
+          "documentation":"<p>The branch, tag, HEAD, or other fully qualified reference used to identify a commit (for example, a branch name or a full commit ID).</p>"
         },
         "destinationCommitSpecifier":{
           "shape":"CommitName",
-          "documentation":"<p>The branch, tag, HEAD, or other fully qualified reference used to identify a commit. For example, a branch name or a full commit ID.</p>"
+          "documentation":"<p>The branch, tag, HEAD, or other fully qualified reference used to identify a commit (for example, a branch name or a full commit ID).</p>"
         },
         "mergeOption":{
           "shape":"MergeOptionTypeEnum",
@@ -2383,15 +3299,15 @@
         },
         "conflictDetailLevel":{
           "shape":"ConflictDetailLevelTypeEnum",
-          "documentation":"<p>The level of conflict detail to use. If unspecified, the default FILE_LEVEL is used, which will return a not mergeable result if the same file has differences in both branches. If LINE_LEVEL is specified, a conflict will be considered not mergeable if the same file in both branches has differences on the same line.</p>"
+          "documentation":"<p>The level of conflict detail to use. If unspecified, the default FILE_LEVEL is used, which returns a not-mergeable result if the same file has differences in both branches. If LINE_LEVEL is specified, a conflict is considered not mergeable if the same file in both branches has differences on the same line.</p>"
         },
         "conflictResolutionStrategy":{
           "shape":"ConflictResolutionStrategyTypeEnum",
-          "documentation":"<p>Specifies which branch to use when resolving conflicts, or whether to attempt automatically merging two versions of a file. The default is NONE, which requires any conflicts to be resolved manually before the merge operation will be successful.</p>"
+          "documentation":"<p>Specifies which branch to use when resolving conflicts, or whether to attempt automatically merging two versions of a file. The default is NONE, which requires any conflicts to be resolved manually before the merge operation is successful.</p>"
         },
         "authorName":{
           "shape":"Name",
-          "documentation":"<p>The name of the author who created the unreferenced commit. This information will be used as both the author and committer for the commit.</p>"
+          "documentation":"<p>The name of the author who created the unreferenced commit. This information is used as both the author and committer for the commit.</p>"
         },
         "email":{
           "shape":"Email",
@@ -2403,11 +3319,11 @@
         },
         "keepEmptyFolders":{
           "shape":"KeepEmptyFolders",
-          "documentation":"<p>If the commit contains deletions, whether to keep a folder or folder structure if the changes leave the folders empty. If this is specified as true, a .gitkeep file will be created for empty folders. The default is false.</p>"
+          "documentation":"<p>If the commit contains deletions, whether to keep a folder or folder structure if the changes leave the folders empty. If this is specified as true, a .gitkeep file is created for empty folders. The default is false.</p>"
         },
         "conflictResolution":{
           "shape":"ConflictResolution",
-          "documentation":"<p>A list of inputs to use when resolving conflicts during a merge if AUTOMERGE is chosen as the conflict resolution strategy.</p>"
+          "documentation":"<p>If AUTOMERGE is the conflict resolution strategy, a list of inputs to use when resolving conflicts during a merge.</p>"
         }
       }
     },
@@ -2433,6 +3349,26 @@
       "documentation":"<p>The specified branch is the default branch for the repository, and cannot be deleted. To delete this branch, you must first set another branch as the default branch.</p>",
       "exception":true
     },
+    "DeleteApprovalRuleTemplateInput":{
+      "type":"structure",
+      "required":["approvalRuleTemplateName"],
+      "members":{
+        "approvalRuleTemplateName":{
+          "shape":"ApprovalRuleTemplateName",
+          "documentation":"<p>The name of the approval rule template to delete.</p>"
+        }
+      }
+    },
+    "DeleteApprovalRuleTemplateOutput":{
+      "type":"structure",
+      "required":["approvalRuleTemplateId"],
+      "members":{
+        "approvalRuleTemplateId":{
+          "shape":"ApprovalRuleTemplateId",
+          "documentation":"<p>The system-generated ID of the deleted approval rule template. If the template has been previously deleted, the only response is a 200 OK.</p>"
+        }
+      }
+    },
     "DeleteBranchInput":{
       "type":"structure",
       "required":[
@@ -2490,10 +3426,10 @@
       "members":{
         "filePath":{
           "shape":"Path",
-          "documentation":"<p>The full path of the file that will be deleted, including the name of the file.</p>"
+          "documentation":"<p>The full path of the file to be deleted, including the name of the file.</p>"
         }
       },
-      "documentation":"<p>A file that will be deleted as part of a commit.</p>"
+      "documentation":"<p>A file that is deleted as part of a commit.</p>"
     },
     "DeleteFileInput":{
       "type":"structure",
@@ -2510,31 +3446,31 @@
         },
         "branchName":{
           "shape":"BranchName",
-          "documentation":"<p>The name of the branch where the commit will be made deleting the file.</p>"
+          "documentation":"<p>The name of the branch where the commit that deletes the file is made.</p>"
         },
         "filePath":{
           "shape":"Path",
-          "documentation":"<p>The fully-qualified path to the file that will be deleted, including the full name and extension of that file. For example, /examples/file.md is a fully qualified path to a file named file.md in a folder named examples.</p>"
+          "documentation":"<p>The fully qualified path to the file that to be deleted, including the full name and extension of that file. For example, /examples/file.md is a fully qualified path to a file named file.md in a folder named examples.</p>"
         },
         "parentCommitId":{
           "shape":"CommitId",
-          "documentation":"<p>The ID of the commit that is the tip of the branch where you want to create the commit that will delete the file. This must be the HEAD commit for the branch. The commit that deletes the file will be created from this commit ID.</p>"
+          "documentation":"<p>The ID of the commit that is the tip of the branch where you want to create the commit that deletes the file. This must be the HEAD commit for the branch. The commit that deletes the file is created from this commit ID.</p>"
         },
         "keepEmptyFolders":{
           "shape":"KeepEmptyFolders",
-          "documentation":"<p>Specifies whether to delete the folder or directory that contains the file you want to delete if that file is the only object in the folder or directory. By default, empty folders will be deleted. This includes empty folders that are part of the directory structure. For example, if the path to a file is dir1/dir2/dir3/dir4, and dir2 and dir3 are empty, deleting the last file in dir4 will also delete the empty folders dir4, dir3, and dir2.</p>"
+          "documentation":"<p>If a file is the only object in the folder or directory, specifies whether to delete the folder or directory that contains the file. By default, empty folders are deleted. This includes empty folders that are part of the directory structure. For example, if the path to a file is dir1/dir2/dir3/dir4, and dir2 and dir3 are empty, deleting the last file in dir4 also deletes the empty folders dir4, dir3, and dir2.</p>"
         },
         "commitMessage":{
           "shape":"Message",
-          "documentation":"<p>The commit message you want to include as part of deleting the file. Commit messages are limited to 256 KB. If no message is specified, a default message will be used.</p>"
+          "documentation":"<p>The commit message you want to include as part of deleting the file. Commit messages are limited to 256 KB. If no message is specified, a default message is used.</p>"
         },
         "name":{
           "shape":"Name",
-          "documentation":"<p>The name of the author of the commit that deletes the file. If no name is specified, the user's ARN will be used as the author name and committer name.</p>"
+          "documentation":"<p>The name of the author of the commit that deletes the file. If no name is specified, the user's ARN is used as the author name and committer name.</p>"
         },
         "email":{
           "shape":"Email",
-          "documentation":"<p>The email address for the commit that deletes the file. If no email address is specified, the email address will be left blank.</p>"
+          "documentation":"<p>The email address for the commit that deletes the file. If no email address is specified, the email address is left blank.</p>"
         }
       }
     },
@@ -2561,7 +3497,34 @@
         },
         "filePath":{
           "shape":"Path",
-          "documentation":"<p>The fully-qualified path to the file that will be deleted, including the full name and extension of that file.</p>"
+          "documentation":"<p>The fully qualified path to the file to be deleted, including the full name and extension of that file.</p>"
+        }
+      }
+    },
+    "DeletePullRequestApprovalRuleInput":{
+      "type":"structure",
+      "required":[
+        "pullRequestId",
+        "approvalRuleName"
+      ],
+      "members":{
+        "pullRequestId":{
+          "shape":"PullRequestId",
+          "documentation":"<p>The system-generated ID of the pull request that contains the approval rule you want to delete.</p>"
+        },
+        "approvalRuleName":{
+          "shape":"ApprovalRuleName",
+          "documentation":"<p>The name of the approval rule you want to delete.</p>"
+        }
+      }
+    },
+    "DeletePullRequestApprovalRuleOutput":{
+      "type":"structure",
+      "required":["approvalRuleId"],
+      "members":{
+        "approvalRuleId":{
+          "shape":"ApprovalRuleId",
+          "documentation":"<p>The ID of the deleted approval rule. </p> <note> <p>If the approval rule was deleted in an earlier API call, the response is 200 OK without content.</p> </note>"
         }
       }
     },
@@ -2602,11 +3565,11 @@
         },
         "destinationCommitSpecifier":{
           "shape":"CommitName",
-          "documentation":"<p>The branch, tag, HEAD, or other fully qualified reference used to identify a commit. For example, a branch name or a full commit ID.</p>"
+          "documentation":"<p>The branch, tag, HEAD, or other fully qualified reference used to identify a commit (for example, a branch name or a full commit ID).</p>"
         },
         "sourceCommitSpecifier":{
           "shape":"CommitName",
-          "documentation":"<p>The branch, tag, HEAD, or other fully qualified reference used to identify a commit. For example, a branch name or a full commit ID.</p>"
+          "documentation":"<p>The branch, tag, HEAD, or other fully qualified reference used to identify a commit (for example, a branch name or a full commit ID).</p>"
         },
         "mergeOption":{
           "shape":"MergeOptionTypeEnum",
@@ -2622,15 +3585,15 @@
         },
         "conflictDetailLevel":{
           "shape":"ConflictDetailLevelTypeEnum",
-          "documentation":"<p>The level of conflict detail to use. If unspecified, the default FILE_LEVEL is used, which will return a not mergeable result if the same file has differences in both branches. If LINE_LEVEL is specified, a conflict will be considered not mergeable if the same file in both branches has differences on the same line.</p>"
+          "documentation":"<p>The level of conflict detail to use. If unspecified, the default FILE_LEVEL is used, which returns a not-mergeable result if the same file has differences in both branches. If LINE_LEVEL is specified, a conflict is considered not mergeable if the same file in both branches has differences on the same line.</p>"
         },
         "conflictResolutionStrategy":{
           "shape":"ConflictResolutionStrategyTypeEnum",
-          "documentation":"<p>Specifies which branch to use when resolving conflicts, or whether to attempt automatically merging two versions of a file. The default is NONE, which requires any conflicts to be resolved manually before the merge operation will be successful.</p>"
+          "documentation":"<p>Specifies which branch to use when resolving conflicts, or whether to attempt automatically merging two versions of a file. The default is NONE, which requires any conflicts to be resolved manually before the merge operation is successful.</p>"
         },
         "nextToken":{
           "shape":"NextToken",
-          "documentation":"<p>An enumeration token that when provided in a request, returns the next batch of the results.</p>"
+          "documentation":"<p>An enumeration token that, when provided in a request, returns the next batch of the results.</p>"
         }
       }
     },
@@ -2683,15 +3646,15 @@
         },
         "actorArn":{
           "shape":"Arn",
-          "documentation":"<p>The Amazon Resource Name (ARN) of the user whose actions resulted in the event. Examples include updating the pull request with additional commits or changing the status of a pull request.</p>"
+          "documentation":"<p>The Amazon Resource Name (ARN) of the user whose actions resulted in the event. Examples include updating the pull request with more commits or changing the status of a pull request.</p>"
         },
         "nextToken":{
           "shape":"NextToken",
-          "documentation":"<p>An enumeration token that when provided in a request, returns the next batch of the results.</p>"
+          "documentation":"<p>An enumeration token that, when provided in a request, returns the next batch of the results.</p>"
         },
         "maxResults":{
           "shape":"MaxResults",
-          "documentation":"<p>A non-negative integer used to limit the number of returned results. The default is 100 events, which is also the maximum number of events that can be returned in a result.</p>"
+          "documentation":"<p>A non-zero, non-negative integer used to limit the number of returned results. The default is 100 events, which is also the maximum number of events that can be returned in a result.</p>"
         }
       }
     },
@@ -2742,6 +3705,23 @@
       "documentation":"<p>A file cannot be added to the repository because the specified path name has the same name as a file that already exists in this repository. Either provide a different name for the file, or specify a different path for the file.</p>",
       "exception":true
     },
+    "DisassociateApprovalRuleTemplateFromRepositoryInput":{
+      "type":"structure",
+      "required":[
+        "approvalRuleTemplateName",
+        "repositoryName"
+      ],
+      "members":{
+        "approvalRuleTemplateName":{
+          "shape":"ApprovalRuleTemplateName",
+          "documentation":"<p>The name of the approval rule template to disassociate from a specified repository.</p>"
+        },
+        "repositoryName":{
+          "shape":"RepositoryName",
+          "documentation":"<p>The name of the repository you want to disassociate from the template.</p>"
+        }
+      }
+    },
     "Email":{"type":"string"},
     "EncryptionIntegrityChecksFailedException":{
       "type":"structure",
@@ -2781,6 +3761,55 @@
     },
     "ErrorCode":{"type":"string"},
     "ErrorMessage":{"type":"string"},
+    "EvaluatePullRequestApprovalRulesInput":{
+      "type":"structure",
+      "required":[
+        "pullRequestId",
+        "revisionId"
+      ],
+      "members":{
+        "pullRequestId":{
+          "shape":"PullRequestId",
+          "documentation":"<p>The system-generated ID of the pull request you want to evaluate.</p>"
+        },
+        "revisionId":{
+          "shape":"RevisionId",
+          "documentation":"<p>The system-generated ID for the pull request revision. To retrieve the most recent revision ID for a pull request, use <a>GetPullRequest</a>.</p>"
+        }
+      }
+    },
+    "EvaluatePullRequestApprovalRulesOutput":{
+      "type":"structure",
+      "required":["evaluation"],
+      "members":{
+        "evaluation":{
+          "shape":"Evaluation",
+          "documentation":"<p>The result of the evaluation, including the names of the rules whose conditions have been met (if any), the names of the rules whose conditions have not been met (if any), whether the pull request is in the approved state, and whether the pull request approval rule has been set aside by an override. </p>"
+        }
+      }
+    },
+    "Evaluation":{
+      "type":"structure",
+      "members":{
+        "approved":{
+          "shape":"Approved",
+          "documentation":"<p>Whether the state of the pull request is approved.</p>"
+        },
+        "overridden":{
+          "shape":"Overridden",
+          "documentation":"<p>Whether the approval rule requirements for the pull request have been overridden and no longer need to be met.</p>"
+        },
+        "approvalRulesSatisfied":{
+          "shape":"ApprovalRulesSatisfiedList",
+          "documentation":"<p>The names of the approval rules that have had their conditions met.</p>"
+        },
+        "approvalRulesNotSatisfied":{
+          "shape":"ApprovalRulesNotSatisfiedList",
+          "documentation":"<p>The names of the approval rules that have not had their conditions met.</p>"
+        }
+      },
+      "documentation":"<p>Returns information about the approval rules applied to a pull request and whether conditions have been met.</p>"
+    },
     "EventDate":{"type":"timestamp"},
     "ExceptionName":{"type":"string"},
     "File":{
@@ -2792,7 +3821,7 @@
         },
         "absolutePath":{
           "shape":"Path",
-          "documentation":"<p>The fully-qualified path to the file in the repository.</p>"
+          "documentation":"<p>The fully qualified path to the file in the repository.</p>"
         },
         "relativePath":{
           "shape":"Path",
@@ -2813,7 +3842,7 @@
       "type":"structure",
       "members":{
       },
-      "documentation":"<p>The commit cannot be created because both a source file and file content have been specified for the same file. You cannot provide both. Either specify a source file, or provide the file content directly.</p>",
+      "documentation":"<p>The commit cannot be created because both a source file and file content have been specified for the same file. You cannot provide both. Either specify a source file or provide the file content directly.</p>",
       "exception":true
     },
     "FileContentRequiredException":{
@@ -2827,14 +3856,14 @@
       "type":"structure",
       "members":{
       },
-      "documentation":"<p>The file cannot be added because it is too large. The maximum file size that can be added is 6 MB, and the combined file content change size is 7 MB. Consider making these changes using a Git client.</p>",
+      "documentation":"<p>The file cannot be added because it is too large. The maximum file size is 6 MB, and the combined file content change size is 7 MB. Consider making these changes using a Git client.</p>",
       "exception":true
     },
     "FileDoesNotExistException":{
       "type":"structure",
       "members":{
       },
-      "documentation":"<p>The specified file does not exist. Verify that you have provided the correct name of the file, including its full path and extension.</p>",
+      "documentation":"<p>The specified file does not exist. Verify that you have used the correct file name, full path, and extension.</p>",
       "exception":true
     },
     "FileEntryRequiredException":{
@@ -2853,7 +3882,7 @@
       "members":{
         "absolutePath":{
           "shape":"Path",
-          "documentation":"<p>The full path to the file that will be added or updated, including the name of the file.</p>"
+          "documentation":"<p>The full path to the file to be added or updated, including the name of the file.</p>"
         },
         "blobId":{
           "shape":"ObjectId",
@@ -2864,13 +3893,13 @@
           "documentation":"<p>The extrapolated file mode permissions for the file. Valid values include EXECUTABLE and NORMAL.</p>"
         }
       },
-      "documentation":"<p>A file that will be added, updated, or deleted as part of a commit.</p>"
+      "documentation":"<p>A file to be added, updated, or deleted as part of a commit.</p>"
     },
     "FileModeRequiredException":{
       "type":"structure",
       "members":{
       },
-      "documentation":"<p>The commit cannot be created because a file mode is required to update mode permissions for an existing file, but no file mode has been specified.</p>",
+      "documentation":"<p>The commit cannot be created because no file mode has been specified. A file mode is required to update mode permissions for a file.</p>",
       "exception":true
     },
     "FileModeTypeEnum":{
@@ -2956,7 +3985,7 @@
         },
         "absolutePath":{
           "shape":"Path",
-          "documentation":"<p>The fully-qualified path of the folder in the repository.</p>"
+          "documentation":"<p>The fully qualified path of the folder in the repository.</p>"
         },
         "relativePath":{
           "shape":"Path",
@@ -2976,13 +4005,33 @@
       "type":"structure",
       "members":{
       },
-      "documentation":"<p>The specified folder does not exist. Either the folder name is not correct, or you did not provide the full path to the folder.</p>",
+      "documentation":"<p>The specified folder does not exist. Either the folder name is not correct, or you did not enter the full path to the folder.</p>",
       "exception":true
     },
     "FolderList":{
       "type":"list",
       "member":{"shape":"Folder"}
     },
+    "GetApprovalRuleTemplateInput":{
+      "type":"structure",
+      "required":["approvalRuleTemplateName"],
+      "members":{
+        "approvalRuleTemplateName":{
+          "shape":"ApprovalRuleTemplateName",
+          "documentation":"<p>The name of the approval rule template for which you want to get information.</p>"
+        }
+      }
+    },
+    "GetApprovalRuleTemplateOutput":{
+      "type":"structure",
+      "required":["approvalRuleTemplate"],
+      "members":{
+        "approvalRuleTemplate":{
+          "shape":"ApprovalRuleTemplate",
+          "documentation":"<p>The content and structure of the approval rule template.</p>"
+        }
+      }
+    },
     "GetBlobInput":{
       "type":"structure",
       "required":[
@@ -3068,11 +4117,11 @@
         },
         "beforeCommitId":{
           "shape":"CommitId",
-          "documentation":"<p>To establish the directionality of the comparison, the full commit ID of the 'before' commit.</p>"
+          "documentation":"<p>To establish the directionality of the comparison, the full commit ID of the before commit.</p>"
         },
         "afterCommitId":{
           "shape":"CommitId",
-          "documentation":"<p>To establish the directionality of the comparison, the full commit ID of the 'after' commit.</p>"
+          "documentation":"<p>To establish the directionality of the comparison, the full commit ID of the after commit.</p>"
         },
         "nextToken":{
           "shape":"NextToken",
@@ -3080,7 +4129,7 @@
         },
         "maxResults":{
           "shape":"MaxResults",
-          "documentation":"<p>A non-negative integer used to limit the number of returned results. The default is 100 comments, and is configurable up to 500.</p>"
+          "documentation":"<p>A non-zero, non-negative integer used to limit the number of returned results. The default is 100 comments, but you can configure up to 500.</p>"
         }
       }
     },
@@ -3119,11 +4168,11 @@
         },
         "nextToken":{
           "shape":"NextToken",
-          "documentation":"<p>An enumeration token that when provided in a request, returns the next batch of the results.</p>"
+          "documentation":"<p>An enumeration token that, when provided in a request, returns the next batch of the results.</p>"
         },
         "maxResults":{
           "shape":"MaxResults",
-          "documentation":"<p>A non-negative integer used to limit the number of returned results. The default is 100 comments. You can return up to 500 comments with a single request.</p>"
+          "documentation":"<p>A non-zero, non-negative integer used to limit the number of returned results. The default is 100 comments. You can return up to 500 comments with a single request.</p>"
         }
       }
     },
@@ -3153,7 +4202,7 @@
         },
         "commitId":{
           "shape":"ObjectId",
-          "documentation":"<p>The commit ID. Commit IDs are the full SHA of the commit.</p>"
+          "documentation":"<p>The commit ID. Commit IDs are the full SHA ID of the commit.</p>"
         }
       },
       "documentation":"<p>Represents the input of a get commit operation.</p>"
@@ -3182,7 +4231,7 @@
         },
         "beforeCommitSpecifier":{
           "shape":"CommitName",
-          "documentation":"<p>The branch, tag, HEAD, or other fully qualified reference used to identify a commit. For example, the full commit ID. Optional. If not specified, all changes prior to the <code>afterCommitSpecifier</code> value will be shown. If you do not use <code>beforeCommitSpecifier</code> in your request, consider limiting the results with <code>maxResults</code>.</p>"
+          "documentation":"<p>The branch, tag, HEAD, or other fully qualified reference used to identify a commit (for example, the full commit ID). Optional. If not specified, all changes before the <code>afterCommitSpecifier</code> value are shown. If you do not use <code>beforeCommitSpecifier</code> in your request, consider limiting the results with <code>maxResults</code>.</p>"
         },
         "afterCommitSpecifier":{
           "shape":"CommitName",
@@ -3190,19 +4239,19 @@
         },
         "beforePath":{
           "shape":"Path",
-          "documentation":"<p>The file path in which to check for differences. Limits the results to this path. Can also be used to specify the previous name of a directory or folder. If <code>beforePath</code> and <code>afterPath</code> are not specified, differences will be shown for all paths.</p>"
+          "documentation":"<p>The file path in which to check for differences. Limits the results to this path. Can also be used to specify the previous name of a directory or folder. If <code>beforePath</code> and <code>afterPath</code> are not specified, differences are shown for all paths.</p>"
         },
         "afterPath":{
           "shape":"Path",
-          "documentation":"<p>The file path in which to check differences. Limits the results to this path. Can also be used to specify the changed name of a directory or folder, if it has changed. If not specified, differences will be shown for all paths.</p>"
+          "documentation":"<p>The file path in which to check differences. Limits the results to this path. Can also be used to specify the changed name of a directory or folder, if it has changed. If not specified, differences are shown for all paths.</p>"
         },
         "MaxResults":{
           "shape":"Limit",
-          "documentation":"<p>A non-negative integer used to limit the number of returned results.</p>"
+          "documentation":"<p>A non-zero, non-negative integer used to limit the number of returned results.</p>"
         },
         "NextToken":{
           "shape":"NextToken",
-          "documentation":"<p>An enumeration token that when provided in a request, returns the next batch of the results.</p>"
+          "documentation":"<p>An enumeration token that, when provided in a request, returns the next batch of the results.</p>"
         }
       }
     },
@@ -3211,7 +4260,7 @@
       "members":{
         "differences":{
           "shape":"DifferenceList",
-          "documentation":"<p>A differences data type object that contains information about the differences, including whether the difference is added, modified, or deleted (A, D, M).</p>"
+          "documentation":"<p>A data type object that contains information about the differences, including whether the difference is added, modified, or deleted (A, D, M).</p>"
         },
         "NextToken":{
           "shape":"NextToken",
@@ -3232,11 +4281,11 @@
         },
         "commitSpecifier":{
           "shape":"CommitName",
-          "documentation":"<p>The fully-quaified reference that identifies the commit that contains the file. For example, you could specify a full commit ID, a tag, a branch name, or a reference such as refs/heads/master. If none is provided, then the head commit will be used.</p>"
+          "documentation":"<p>The fully quaified reference that identifies the commit that contains the file. For example, you can specify a full commit ID, a tag, a branch name, or a reference such as refs/heads/master. If none is provided, the head commit is used.</p>"
         },
         "filePath":{
           "shape":"Path",
-          "documentation":"<p>The fully-qualified path to the file, including the full name and extension of the file. For example, /examples/file.md is the fully-qualified path to a file named file.md in a folder named examples.</p>"
+          "documentation":"<p>The fully qualified path to the file, including the full name and extension of the file. For example, /examples/file.md is the fully qualified path to a file named file.md in a folder named examples.</p>"
         }
       }
     },
@@ -3261,11 +4310,11 @@
         },
         "filePath":{
           "shape":"Path",
-          "documentation":"<p>The fully qualified path to the specified file. This returns the name and extension of the file.</p>"
+          "documentation":"<p>The fully qualified path to the specified file. Returns the name and extension of the file.</p>"
         },
         "fileMode":{
           "shape":"FileModeTypeEnum",
-          "documentation":"<p>The extrapolated file mode permissions of the blob. Valid values include strings such as EXECUTABLE and not numeric values.</p> <note> <p>The file mode permissions returned by this API are not the standard file mode permission values, such as 100644, but rather extrapolated values. See below for a full list of supported return values.</p> </note>"
+          "documentation":"<p>The extrapolated file mode permissions of the blob. Valid values include strings such as EXECUTABLE and not numeric values.</p> <note> <p>The file mode permissions returned by this API are not the standard file mode permission values, such as 100644, but rather extrapolated values. See the supported return values.</p> </note>"
         },
         "fileSize":{
           "shape":"ObjectSize",
@@ -3290,11 +4339,11 @@
         },
         "commitSpecifier":{
           "shape":"CommitName",
-          "documentation":"<p>A fully-qualified reference used to identify a commit that contains the version of the folder's content to return. A fully-qualified reference can be a commit ID, branch name, tag, or reference such as HEAD. If no specifier is provided, the folder content will be returned as it exists in the HEAD commit.</p>"
+          "documentation":"<p>A fully qualified reference used to identify a commit that contains the version of the folder's content to return. A fully qualified reference can be a commit ID, branch name, tag, or reference such as HEAD. If no specifier is provided, the folder content is returned as it exists in the HEAD commit.</p>"
         },
         "folderPath":{
           "shape":"Path",
-          "documentation":"<p>The fully-qualified path to the folder whose contents will be returned, including the folder name. For example, /examples is a fully-qualified path to a folder named examples that was created off of the root directory (/) of a repository. </p>"
+          "documentation":"<p>The fully qualified path to the folder whose contents are returned, including the folder name. For example, /examples is a fully-qualified path to a folder named examples that was created off of the root directory (/) of a repository. </p>"
         }
       }
     },
@@ -3307,11 +4356,11 @@
       "members":{
         "commitId":{
           "shape":"ObjectId",
-          "documentation":"<p>The full commit ID used as a reference for which version of the folder content is returned.</p>"
+          "documentation":"<p>The full commit ID used as a reference for the returned version of the folder content.</p>"
         },
         "folderPath":{
           "shape":"Path",
-          "documentation":"<p>The fully-qualified path of the folder whose contents are returned.</p>"
+          "documentation":"<p>The fully qualified path of the folder whose contents are returned.</p>"
         },
         "treeId":{
           "shape":"ObjectId",
@@ -3319,19 +4368,19 @@
         },
         "subFolders":{
           "shape":"FolderList",
-          "documentation":"<p>The list of folders that exist beneath the specified folder, if any.</p>"
+          "documentation":"<p>The list of folders that exist under the specified folder, if any.</p>"
         },
         "files":{
           "shape":"FileList",
-          "documentation":"<p>The list of files that exist in the specified folder, if any.</p>"
+          "documentation":"<p>The list of files in the specified folder, if any.</p>"
         },
         "symbolicLinks":{
           "shape":"SymbolicLinkList",
-          "documentation":"<p>The list of symbolic links to other files and folders that exist in the specified folder, if any.</p>"
+          "documentation":"<p>The list of symbolic links to other files and folders in the specified folder, if any.</p>"
         },
         "subModules":{
           "shape":"SubModuleList",
-          "documentation":"<p>The list of submodules that exist in the specified folder, if any.</p>"
+          "documentation":"<p>The list of submodules in the specified folder, if any.</p>"
         }
       }
     },
@@ -3349,19 +4398,19 @@
         },
         "sourceCommitSpecifier":{
           "shape":"CommitName",
-          "documentation":"<p>The branch, tag, HEAD, or other fully qualified reference used to identify a commit. For example, a branch name or a full commit ID.</p>"
+          "documentation":"<p>The branch, tag, HEAD, or other fully qualified reference used to identify a commit (for example, a branch name or a full commit ID).</p>"
         },
         "destinationCommitSpecifier":{
           "shape":"CommitName",
-          "documentation":"<p>The branch, tag, HEAD, or other fully qualified reference used to identify a commit. For example, a branch name or a full commit ID.</p>"
+          "documentation":"<p>The branch, tag, HEAD, or other fully qualified reference used to identify a commit (for example, a branch name or a full commit ID).</p>"
         },
         "conflictDetailLevel":{
           "shape":"ConflictDetailLevelTypeEnum",
-          "documentation":"<p>The level of conflict detail to use. If unspecified, the default FILE_LEVEL is used, which will return a not mergeable result if the same file has differences in both branches. If LINE_LEVEL is specified, a conflict will be considered not mergeable if the same file in both branches has differences on the same line.</p>"
+          "documentation":"<p>The level of conflict detail to use. If unspecified, the default FILE_LEVEL is used, which returns a not-mergeable result if the same file has differences in both branches. If LINE_LEVEL is specified, a conflict is considered not mergeable if the same file in both branches has differences on the same line.</p>"
         },
         "conflictResolutionStrategy":{
           "shape":"ConflictResolutionStrategyTypeEnum",
-          "documentation":"<p>Specifies which branch to use when resolving conflicts, or whether to attempt automatically merging two versions of a file. The default is NONE, which requires any conflicts to be resolved manually before the merge operation will be successful.</p>"
+          "documentation":"<p>Specifies which branch to use when resolving conflicts, or whether to attempt automatically merging two versions of a file. The default is NONE, which requires any conflicts to be resolved manually before the merge operation is successful.</p>"
         }
       }
     },
@@ -3382,7 +4431,7 @@
         },
         "mergedCommitId":{
           "shape":"ObjectId",
-          "documentation":"<p>The commit ID for the merge commit created when the source branch was merged into the destination branch. If the fast-forward merge strategy was used, no merge commit exists.</p>"
+          "documentation":"<p>The commit ID for the merge commit created when the source branch was merged into the destination branch. If the fast-forward merge strategy was used, there is no merge commit.</p>"
         }
       }
     },
@@ -3401,11 +4450,11 @@
         },
         "destinationCommitSpecifier":{
           "shape":"CommitName",
-          "documentation":"<p>The branch, tag, HEAD, or other fully qualified reference used to identify a commit. For example, a branch name or a full commit ID.</p>"
+          "documentation":"<p>The branch, tag, HEAD, or other fully qualified reference used to identify a commit (for example, a branch name or a full commit ID).</p>"
         },
         "sourceCommitSpecifier":{
           "shape":"CommitName",
-          "documentation":"<p>The branch, tag, HEAD, or other fully qualified reference used to identify a commit. For example, a branch name or a full commit ID.</p>"
+          "documentation":"<p>The branch, tag, HEAD, or other fully qualified reference used to identify a commit (for example, a branch name or a full commit ID).</p>"
         },
         "mergeOption":{
           "shape":"MergeOptionTypeEnum",
@@ -3413,7 +4462,7 @@
         },
         "conflictDetailLevel":{
           "shape":"ConflictDetailLevelTypeEnum",
-          "documentation":"<p>The level of conflict detail to use. If unspecified, the default FILE_LEVEL is used, which will return a not mergeable result if the same file has differences in both branches. If LINE_LEVEL is specified, a conflict will be considered not mergeable if the same file in both branches has differences on the same line.</p>"
+          "documentation":"<p>The level of conflict detail to use. If unspecified, the default FILE_LEVEL is used, which returns a not-mergeable result if the same file has differences in both branches. If LINE_LEVEL is specified, a conflict is considered not mergeable if the same file in both branches has differences on the same line.</p>"
         },
         "maxConflictFiles":{
           "shape":"MaxResults",
@@ -3421,11 +4470,11 @@
         },
         "conflictResolutionStrategy":{
           "shape":"ConflictResolutionStrategyTypeEnum",
-          "documentation":"<p>Specifies which branch to use when resolving conflicts, or whether to attempt automatically merging two versions of a file. The default is NONE, which requires any conflicts to be resolved manually before the merge operation will be successful.</p>"
+          "documentation":"<p>Specifies which branch to use when resolving conflicts, or whether to attempt automatically merging two versions of a file. The default is NONE, which requires any conflicts to be resolved manually before the merge operation is successful.</p>"
         },
         "nextToken":{
           "shape":"NextToken",
-          "documentation":"<p>An enumeration token that when provided in a request, returns the next batch of the results.</p>"
+          "documentation":"<p>An enumeration token that, when provided in a request, returns the next batch of the results.</p>"
         }
       }
     },
@@ -3456,7 +4505,7 @@
         },
         "conflictMetadataList":{
           "shape":"ConflictMetadataList",
-          "documentation":"<p>A list of metadata for any conflicting files. If the specified merge strategy is FAST_FORWARD_MERGE, this list will always be empty.</p>"
+          "documentation":"<p>A list of metadata for any conflicting files. If the specified merge strategy is FAST_FORWARD_MERGE, this list is always empty.</p>"
         },
         "nextToken":{
           "shape":"NextToken",
@@ -3478,19 +4527,19 @@
         },
         "sourceCommitSpecifier":{
           "shape":"CommitName",
-          "documentation":"<p>The branch, tag, HEAD, or other fully qualified reference used to identify a commit. For example, a branch name or a full commit ID.</p>"
+          "documentation":"<p>The branch, tag, HEAD, or other fully qualified reference used to identify a commit (for example, a branch name or a full commit ID).</p>"
         },
         "destinationCommitSpecifier":{
           "shape":"CommitName",
-          "documentation":"<p>The branch, tag, HEAD, or other fully qualified reference used to identify a commit. For example, a branch name or a full commit ID.</p>"
+          "documentation":"<p>The branch, tag, HEAD, or other fully qualified reference used to identify a commit (for example, a branch name or a full commit ID).</p>"
         },
         "conflictDetailLevel":{
           "shape":"ConflictDetailLevelTypeEnum",
-          "documentation":"<p>The level of conflict detail to use. If unspecified, the default FILE_LEVEL is used, which will return a not mergeable result if the same file has differences in both branches. If LINE_LEVEL is specified, a conflict will be considered not mergeable if the same file in both branches has differences on the same line.</p>"
+          "documentation":"<p>The level of conflict detail to use. If unspecified, the default FILE_LEVEL is used, which returns a not-mergeable result if the same file has differences in both branches. If LINE_LEVEL is specified, a conflict is considered not mergeable if the same file in both branches has differences on the same line.</p>"
         },
         "conflictResolutionStrategy":{
           "shape":"ConflictResolutionStrategyTypeEnum",
-          "documentation":"<p>Specifies which branch to use when resolving conflicts, or whether to attempt automatically merging two versions of a file. The default is NONE, which requires any conflicts to be resolved manually before the merge operation will be successful.</p>"
+          "documentation":"<p>Specifies which branch to use when resolving conflicts, or whether to attempt automatically merging two versions of a file. The default is NONE, which requires any conflicts to be resolved manually before the merge operation is successful.</p>"
         }
       }
     },
@@ -3521,6 +4570,32 @@
         }
       }
     },
+    "GetPullRequestApprovalStatesInput":{
+      "type":"structure",
+      "required":[
+        "pullRequestId",
+        "revisionId"
+      ],
+      "members":{
+        "pullRequestId":{
+          "shape":"PullRequestId",
+          "documentation":"<p>The system-generated ID for the pull request.</p>"
+        },
+        "revisionId":{
+          "shape":"RevisionId",
+          "documentation":"<p>The system-generated ID for the pull request revision.</p>"
+        }
+      }
+    },
+    "GetPullRequestApprovalStatesOutput":{
+      "type":"structure",
+      "members":{
+        "approvals":{
+          "shape":"ApprovalList",
+          "documentation":"<p>Information about users who have approved the pull request.</p>"
+        }
+      }
+    },
     "GetPullRequestInput":{
       "type":"structure",
       "required":["pullRequestId"],
@@ -3541,6 +4616,36 @@
         }
       }
     },
+    "GetPullRequestOverrideStateInput":{
+      "type":"structure",
+      "required":[
+        "pullRequestId",
+        "revisionId"
+      ],
+      "members":{
+        "pullRequestId":{
+          "shape":"PullRequestId",
+          "documentation":"<p>The ID of the pull request for which you want to get information about whether approval rules have been set aside (overridden).</p>"
+        },
+        "revisionId":{
+          "shape":"RevisionId",
+          "documentation":"<p>The system-generated ID of the revision for the pull request. To retrieve the most recent revision ID, use <a>GetPullRequest</a>.</p>"
+        }
+      }
+    },
+    "GetPullRequestOverrideStateOutput":{
+      "type":"structure",
+      "members":{
+        "overridden":{
+          "shape":"Overridden",
+          "documentation":"<p>A Boolean value that indicates whether a pull request has had its rules set aside (TRUE) or whether all approval rules still apply (FALSE).</p>"
+        },
+        "overrider":{
+          "shape":"Arn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the user or identity that overrode the rules and their requirements for the pull request.</p>"
+        }
+      }
+    },
     "GetRepositoryInput":{
       "type":"structure",
       "required":["repositoryName"],
@@ -3560,46 +4665,88 @@
           "documentation":"<p>Information about the repository.</p>"
         }
       },
-      "documentation":"<p>Represents the output of a get repository operation.</p>"
+      "documentation":"<p>Represents the output of a get repository operation.</p>"
+    },
+    "GetRepositoryTriggersInput":{
+      "type":"structure",
+      "required":["repositoryName"],
+      "members":{
+        "repositoryName":{
+          "shape":"RepositoryName",
+          "documentation":"<p>The name of the repository for which the trigger is configured.</p>"
+        }
+      },
+      "documentation":"<p>Represents the input of a get repository triggers operation.</p>"
+    },
+    "GetRepositoryTriggersOutput":{
+      "type":"structure",
+      "members":{
+        "configurationId":{
+          "shape":"RepositoryTriggersConfigurationId",
+          "documentation":"<p>The system-generated unique ID for the trigger.</p>"
+        },
+        "triggers":{
+          "shape":"RepositoryTriggersList",
+          "documentation":"<p>The JSON block of configuration information for each trigger.</p>"
+        }
+      },
+      "documentation":"<p>Represents the output of a get repository triggers operation.</p>"
+    },
+    "HunkContent":{"type":"string"},
+    "IdempotencyParameterMismatchException":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>The client request token is not valid. Either the token is not in a valid format, or the token has been used in a previous request and cannot be reused.</p>",
+      "exception":true
+    },
+    "InvalidActorArnException":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>The Amazon Resource Name (ARN) is not valid. Make sure that you have provided the full ARN for the user who initiated the change for the pull request, and then try again.</p>",
+      "exception":true
+    },
+    "InvalidApprovalRuleContentException":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>The content for the approval rule is not valid.</p>",
+      "exception":true
+    },
+    "InvalidApprovalRuleNameException":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>The name for the approval rule is not valid.</p>",
+      "exception":true
     },
-    "GetRepositoryTriggersInput":{
+    "InvalidApprovalRuleTemplateContentException":{
       "type":"structure",
-      "required":["repositoryName"],
       "members":{
-        "repositoryName":{
-          "shape":"RepositoryName",
-          "documentation":"<p>The name of the repository for which the trigger is configured.</p>"
-        }
       },
-      "documentation":"<p>Represents the input of a get repository triggers operation.</p>"
+      "documentation":"<p>The content of the approval rule template is not valid.</p>",
+      "exception":true
     },
-    "GetRepositoryTriggersOutput":{
+    "InvalidApprovalRuleTemplateDescriptionException":{
       "type":"structure",
       "members":{
-        "configurationId":{
-          "shape":"RepositoryTriggersConfigurationId",
-          "documentation":"<p>The system-generated unique ID for the trigger.</p>"
-        },
-        "triggers":{
-          "shape":"RepositoryTriggersList",
-          "documentation":"<p>The JSON block of configuration information for each trigger.</p>"
-        }
       },
-      "documentation":"<p>Represents the output of a get repository triggers operation.</p>"
+      "documentation":"<p>The description for the approval rule template is not valid because it exceeds the maximum characters allowed for a description. For more information about limits in AWS CodeCommit, see <a href=\"https://docs.aws.amazon.com/codecommit/latest/userguide/limits.html\">AWS CodeCommit User Guide</a>.</p>",
+      "exception":true
     },
-    "HunkContent":{"type":"string"},
-    "IdempotencyParameterMismatchException":{
+    "InvalidApprovalRuleTemplateNameException":{
       "type":"structure",
       "members":{
       },
-      "documentation":"<p>The client request token is not valid. Either the token is not in a valid format, or the token has been used in a previous request and cannot be re-used.</p>",
+      "documentation":"<p>The name of the approval rule template is not valid. Template names must be between 1 and 100 valid characters in length. For more information about limits in AWS CodeCommit, see <a href=\"https://docs.aws.amazon.com/codecommit/latest/userguide/limits.html\">AWS CodeCommit User Guide</a>.</p>",
       "exception":true
     },
-    "InvalidActorArnException":{
+    "InvalidApprovalStateException":{
       "type":"structure",
       "members":{
       },
-      "documentation":"<p>The Amazon Resource Name (ARN) is not valid. Make sure that you have provided the full ARN for the user who initiated the change for the pull request, and then try again.</p>",
+      "documentation":"<p>The state for the approval is not valid. Valid values include APPROVE and REVOKE. </p>",
       "exception":true
     },
     "InvalidAuthorArnException":{
@@ -3690,7 +4837,7 @@
       "type":"structure",
       "members":{
       },
-      "documentation":"<p>The pull request description is not valid. Descriptions are limited to 1,000 characters in length.</p>",
+      "documentation":"<p>The pull request description is not valid. Descriptions cannot be more than 1,000 characters.</p>",
       "exception":true
     },
     "InvalidDestinationCommitSpecifierException":{
@@ -3711,7 +4858,7 @@
       "type":"structure",
       "members":{
       },
-      "documentation":"<p>The location of the file is not valid. Make sure that you include the extension of the file as well as the file name.</p>",
+      "documentation":"<p>The location of the file is not valid. Make sure that you include the file name and extension.</p>",
       "exception":true
     },
     "InvalidFileModeException":{
@@ -3763,6 +4910,13 @@
       "documentation":"<p>The specified sort order is not valid.</p>",
       "exception":true
     },
+    "InvalidOverrideStatusException":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>The override status is not valid. Valid statuses are OVERRIDE and REVOKE.</p>",
+      "exception":true
+    },
     "InvalidParentCommitIdException":{
       "type":"structure",
       "members":{
@@ -3809,7 +4963,7 @@
       "type":"structure",
       "members":{
       },
-      "documentation":"<p>The specified reference name format is not valid. Reference names must conform to the Git references format, for example refs/heads/master. For more information, see <a href=\"https://git-scm.com/book/en/v2/Git-Internals-Git-References\">Git Internals - Git References</a> or consult your Git documentation.</p>",
+      "documentation":"<p>The specified reference name format is not valid. Reference names must conform to the Git references format (for example, refs/heads/master). For more information, see <a href=\"https://git-scm.com/book/en/v2/Git-Internals-Git-References\">Git Internals - Git References</a> or consult your Git documentation.</p>",
       "exception":true
     },
     "InvalidRelativeFileVersionEnumException":{
@@ -3844,7 +4998,7 @@
       "type":"structure",
       "members":{
       },
-      "documentation":"<p>At least one specified repository name is not valid.</p> <note> <p>This exception only occurs when a specified repository name is not valid. Other exceptions occur when a required repository parameter is missing, or when a specified repository does not exist.</p> </note>",
+      "documentation":"<p>A specified repository name is not valid.</p> <note> <p>This exception occurs only when a specified repository name is not valid. Other exceptions occur when a required repository parameter is missing, or when a specified repository does not exist.</p> </note>",
       "exception":true
     },
     "InvalidRepositoryTriggerBranchNameException":{
@@ -3886,7 +5040,7 @@
       "type":"structure",
       "members":{
       },
-      "documentation":"<p>The region for the trigger target does not match the region for the repository. Triggers must be created in the same region as the target for the trigger.</p>",
+      "documentation":"<p>The AWS Region for the trigger target does not match the AWS Region for the repository. Triggers must be created in the same Region as the target for the trigger.</p>",
       "exception":true
     },
     "InvalidResourceArnException":{
@@ -3896,6 +5050,20 @@
       "documentation":"<p>The value for the resource ARN is not valid. For more information about resources in AWS CodeCommit, see <a href=\"https://docs.aws.amazon.com/codecommit/latest/userguide/auth-and-access-control-iam-access-control-identity-based.html#arn-formats\">CodeCommit Resources and Operations</a> in the AWS CodeCommit User Guide.</p>",
       "exception":true
     },
+    "InvalidRevisionIdException":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>The revision ID is not valid. Use GetPullRequest to determine the value.</p>",
+      "exception":true
+    },
+    "InvalidRuleContentSha256Exception":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>The SHA-256 hash signature for the rule content is not valid.</p>",
+      "exception":true
+    },
     "InvalidSortByException":{
       "type":"structure",
       "members":{
@@ -3992,6 +5160,63 @@
       "box":true
     },
     "LineNumber":{"type":"integer"},
+    "ListApprovalRuleTemplatesInput":{
+      "type":"structure",
+      "members":{
+        "nextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>An enumeration token that, when provided in a request, returns the next batch of the results.</p>"
+        },
+        "maxResults":{
+          "shape":"MaxResults",
+          "documentation":"<p>A non-zero, non-negative integer used to limit the number of returned results.</p>"
+        }
+      }
+    },
+    "ListApprovalRuleTemplatesOutput":{
+      "type":"structure",
+      "members":{
+        "approvalRuleTemplateNames":{
+          "shape":"ApprovalRuleTemplateNameList",
+          "documentation":"<p>The names of all the approval rule templates found in the AWS Region for your AWS account.</p>"
+        },
+        "nextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>An enumeration token that allows the operation to batch the next results of the operation.</p>"
+        }
+      }
+    },
+    "ListAssociatedApprovalRuleTemplatesForRepositoryInput":{
+      "type":"structure",
+      "required":["repositoryName"],
+      "members":{
+        "repositoryName":{
+          "shape":"RepositoryName",
+          "documentation":"<p>The name of the repository for which you want to list all associated approval rule templates.</p>"
+        },
+        "nextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>An enumeration token that, when provided in a request, returns the next batch of the results.</p>"
+        },
+        "maxResults":{
+          "shape":"MaxResults",
+          "documentation":"<p>A non-zero, non-negative integer used to limit the number of returned results.</p>"
+        }
+      }
+    },
+    "ListAssociatedApprovalRuleTemplatesForRepositoryOutput":{
+      "type":"structure",
+      "members":{
+        "approvalRuleTemplateNames":{
+          "shape":"ApprovalRuleTemplateNameList",
+          "documentation":"<p>The names of all approval rule templates associated with the repository.</p>"
+        },
+        "nextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>An enumeration token that allows the operation to batch the next results of the operation.</p>"
+        }
+      }
+    },
     "ListBranchesInput":{
       "type":"structure",
       "required":["repositoryName"],
@@ -4039,11 +5264,11 @@
         },
         "nextToken":{
           "shape":"NextToken",
-          "documentation":"<p>An enumeration token that when provided in a request, returns the next batch of the results.</p>"
+          "documentation":"<p>An enumeration token that, when provided in a request, returns the next batch of the results.</p>"
         },
         "maxResults":{
           "shape":"MaxResults",
-          "documentation":"<p>A non-negative integer used to limit the number of returned results.</p>"
+          "documentation":"<p>A non-zero, non-negative integer used to limit the number of returned results.</p>"
         }
       }
     },
@@ -4057,7 +5282,38 @@
         },
         "nextToken":{
           "shape":"NextToken",
-          "documentation":"<p>An enumeration token that when provided in a request, returns the next batch of the results.</p>"
+          "documentation":"<p>An enumeration token that allows the operation to batch the next results of the operation.</p>"
+        }
+      }
+    },
+    "ListRepositoriesForApprovalRuleTemplateInput":{
+      "type":"structure",
+      "required":["approvalRuleTemplateName"],
+      "members":{
+        "approvalRuleTemplateName":{
+          "shape":"ApprovalRuleTemplateName",
+          "documentation":"<p>The name of the approval rule template for which you want to list repositories that are associated with that template.</p>"
+        },
+        "nextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>An enumeration token that, when provided in a request, returns the next batch of the results.</p>"
+        },
+        "maxResults":{
+          "shape":"MaxResults",
+          "documentation":"<p>A non-zero, non-negative integer used to limit the number of returned results.</p>"
+        }
+      }
+    },
+    "ListRepositoriesForApprovalRuleTemplateOutput":{
+      "type":"structure",
+      "members":{
+        "repositoryNames":{
+          "shape":"RepositoryNameList",
+          "documentation":"<p>A list of repository names that are associated with the specified approval rule template.</p>"
+        },
+        "nextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>An enumeration token that allows the operation to batch the next results of the operation.</p>"
         }
       }
     },
@@ -4103,7 +5359,7 @@
         },
         "nextToken":{
           "shape":"NextToken",
-          "documentation":"<p>An enumeration token that when provided in a request, returns the next batch of the results.</p>"
+          "documentation":"<p>An enumeration token that, when provided in a request, returns the next batch of the results.</p>"
         }
       }
     },
@@ -4129,11 +5385,11 @@
         },
         "filePosition":{
           "shape":"Position",
-          "documentation":"<p>The position of a change within a compared file, in line number format.</p>"
+          "documentation":"<p>The position of a change in a compared file, in line number format.</p>"
         },
         "relativeFileVersion":{
           "shape":"RelativeFileVersionEnum",
-          "documentation":"<p>In a comparison of commits or a pull request, whether the change is in the 'before' or 'after' of that comparison.</p>"
+          "documentation":"<p>In a comparison of commits or a pull request, whether the change is in the before or after of that comparison.</p>"
         }
       },
       "documentation":"<p>Returns information about the location of a change or comment in the comparison between two commits or a pull request.</p>"
@@ -4178,7 +5434,14 @@
       "type":"structure",
       "members":{
       },
-      "documentation":"<p>The maximum number of items to compare between the source or destination branches and the merge base has exceeded the maximum allowed.</p>",
+      "documentation":"<p>The number of items to compare between the source or destination branches and the merge base has exceeded the maximum allowed.</p>",
+      "exception":true
+    },
+    "MaximumNumberOfApprovalsExceededException":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>The number of approvals required for the approval rule exceeds the maximum number allowed.</p>",
       "exception":true
     },
     "MaximumOpenPullRequestsExceededException":{
@@ -4192,7 +5455,7 @@
       "type":"structure",
       "members":{
       },
-      "documentation":"<p>The maximum number of allowed repository names was exceeded. Currently, this number is 25.</p>",
+      "documentation":"<p>The maximum number of allowed repository names was exceeded. Currently, this number is 100.</p>",
       "exception":true
     },
     "MaximumRepositoryTriggersExceededException":{
@@ -4202,6 +5465,13 @@
       "documentation":"<p>The number of triggers allowed for the repository was exceeded.</p>",
       "exception":true
     },
+    "MaximumRuleTemplatesAssociatedWithRepositoryException":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>The maximum number of approval rule templates for a repository has been exceeded. You cannot associate more than 25 approval rule templates with a repository.</p>",
+      "exception":true
+    },
     "MergeBranchesByFastForwardInput":{
       "type":"structure",
       "required":[
@@ -4216,15 +5486,15 @@
         },
         "sourceCommitSpecifier":{
           "shape":"CommitName",
-          "documentation":"<p>The branch, tag, HEAD, or other fully qualified reference used to identify a commit. For example, a branch name or a full commit ID.</p>"
+          "documentation":"<p>The branch, tag, HEAD, or other fully qualified reference used to identify a commit (for example, a branch name or a full commit ID).</p>"
         },
         "destinationCommitSpecifier":{
           "shape":"CommitName",
-          "documentation":"<p>The branch, tag, HEAD, or other fully qualified reference used to identify a commit. For example, a branch name or a full commit ID.</p>"
+          "documentation":"<p>The branch, tag, HEAD, or other fully qualified reference used to identify a commit (for example, a branch name or a full commit ID).</p>"
         },
         "targetBranch":{
           "shape":"BranchName",
-          "documentation":"<p>The branch where the merge will be applied.</p>"
+          "documentation":"<p>The branch where the merge is applied.</p>"
         }
       }
     },
@@ -4255,31 +5525,31 @@
         },
         "sourceCommitSpecifier":{
           "shape":"CommitName",
-          "documentation":"<p>The branch, tag, HEAD, or other fully qualified reference used to identify a commit. For example, a branch name or a full commit ID.</p>"
+          "documentation":"<p>The branch, tag, HEAD, or other fully qualified reference used to identify a commit (for example, a branch name or a full commit ID).</p>"
         },
         "destinationCommitSpecifier":{
           "shape":"CommitName",
-          "documentation":"<p>The branch, tag, HEAD, or other fully qualified reference used to identify a commit. For example, a branch name or a full commit ID.</p>"
+          "documentation":"<p>The branch, tag, HEAD, or other fully qualified reference used to identify a commit (for example, a branch name or a full commit ID).</p>"
         },
         "targetBranch":{
           "shape":"BranchName",
-          "documentation":"<p>The branch where the merge will be applied. </p>"
+          "documentation":"<p>The branch where the merge is applied. </p>"
         },
         "conflictDetailLevel":{
           "shape":"ConflictDetailLevelTypeEnum",
-          "documentation":"<p>The level of conflict detail to use. If unspecified, the default FILE_LEVEL is used, which will return a not mergeable result if the same file has differences in both branches. If LINE_LEVEL is specified, a conflict will be considered not mergeable if the same file in both branches has differences on the same line.</p>"
+          "documentation":"<p>The level of conflict detail to use. If unspecified, the default FILE_LEVEL is used, which returns a not-mergeable result if the same file has differences in both branches. If LINE_LEVEL is specified, a conflict is considered not mergeable if the same file in both branches has differences on the same line.</p>"
         },
         "conflictResolutionStrategy":{
           "shape":"ConflictResolutionStrategyTypeEnum",
-          "documentation":"<p>Specifies which branch to use when resolving conflicts, or whether to attempt automatically merging two versions of a file. The default is NONE, which requires any conflicts to be resolved manually before the merge operation will be successful.</p>"
+          "documentation":"<p>Specifies which branch to use when resolving conflicts, or whether to attempt automatically merging two versions of a file. The default is NONE, which requires any conflicts to be resolved manually before the merge operation is successful.</p>"
         },
         "authorName":{
           "shape":"Name",
-          "documentation":"<p>The name of the author who created the commit. This information will be used as both the author and committer for the commit.</p>"
+          "documentation":"<p>The name of the author who created the commit. This information is used as both the author and committer for the commit.</p>"
         },
         "email":{
           "shape":"Email",
-          "documentation":"<p>The email address of the person merging the branches. This information will be used in the commit information for the merge.</p>"
+          "documentation":"<p>The email address of the person merging the branches. This information is used in the commit information for the merge.</p>"
         },
         "commitMessage":{
           "shape":"Message",
@@ -4287,11 +5557,11 @@
         },
         "keepEmptyFolders":{
           "shape":"KeepEmptyFolders",
-          "documentation":"<p>If the commit contains deletions, whether to keep a folder or folder structure if the changes leave the folders empty. If this is specified as true, a .gitkeep file will be created for empty folders. The default is false.</p>"
+          "documentation":"<p>If the commit contains deletions, whether to keep a folder or folder structure if the changes leave the folders empty. If this is specified as true, a .gitkeep file is created for empty folders. The default is false.</p>"
         },
         "conflictResolution":{
           "shape":"ConflictResolution",
-          "documentation":"<p>A list of inputs to use when resolving conflicts during a merge if AUTOMERGE is chosen as the conflict resolution strategy.</p>"
+          "documentation":"<p>If AUTOMERGE is the conflict resolution strategy, a list of inputs to use when resolving conflicts during a merge.</p>"
         }
       }
     },
@@ -4322,31 +5592,31 @@
         },
         "sourceCommitSpecifier":{
           "shape":"CommitName",
-          "documentation":"<p>The branch, tag, HEAD, or other fully qualified reference used to identify a commit. For example, a branch name or a full commit ID.</p>"
+          "documentation":"<p>The branch, tag, HEAD, or other fully qualified reference used to identify a commit (for example, a branch name or a full commit ID).</p>"
         },
         "destinationCommitSpecifier":{
           "shape":"CommitName",
-          "documentation":"<p>The branch, tag, HEAD, or other fully qualified reference used to identify a commit. For example, a branch name or a full commit ID.</p>"
+          "documentation":"<p>The branch, tag, HEAD, or other fully qualified reference used to identify a commit (for example, a branch name or a full commit ID).</p>"
         },
         "targetBranch":{
           "shape":"BranchName",
-          "documentation":"<p>The branch where the merge will be applied. </p>"
+          "documentation":"<p>The branch where the merge is applied. </p>"
         },
         "conflictDetailLevel":{
           "shape":"ConflictDetailLevelTypeEnum",
-          "documentation":"<p>The level of conflict detail to use. If unspecified, the default FILE_LEVEL is used, which will return a not mergeable result if the same file has differences in both branches. If LINE_LEVEL is specified, a conflict will be considered not mergeable if the same file in both branches has differences on the same line.</p>"
+          "documentation":"<p>The level of conflict detail to use. If unspecified, the default FILE_LEVEL is used, which returns a not-mergeable result if the same file has differences in both branches. If LINE_LEVEL is specified, a conflict is considered not mergeable if the same file in both branches has differences on the same line.</p>"
         },
         "conflictResolutionStrategy":{
           "shape":"ConflictResolutionStrategyTypeEnum",
-          "documentation":"<p>Specifies which branch to use when resolving conflicts, or whether to attempt automatically merging two versions of a file. The default is NONE, which requires any conflicts to be resolved manually before the merge operation will be successful.</p>"
+          "documentation":"<p>Specifies which branch to use when resolving conflicts, or whether to attempt automatically merging two versions of a file. The default is NONE, which requires any conflicts to be resolved manually before the merge operation is successful.</p>"
         },
         "authorName":{
           "shape":"Name",
-          "documentation":"<p>The name of the author who created the commit. This information will be used as both the author and committer for the commit.</p>"
+          "documentation":"<p>The name of the author who created the commit. This information is used as both the author and committer for the commit.</p>"
         },
         "email":{
           "shape":"Email",
-          "documentation":"<p>The email address of the person merging the branches. This information will be used in the commit information for the merge.</p>"
+          "documentation":"<p>The email address of the person merging the branches. This information is used in the commit information for the merge.</p>"
         },
         "commitMessage":{
           "shape":"Message",
@@ -4354,11 +5624,11 @@
         },
         "keepEmptyFolders":{
           "shape":"KeepEmptyFolders",
-          "documentation":"<p>If the commit contains deletions, whether to keep a folder or folder structure if the changes leave the folders empty. If this is specified as true, a .gitkeep file will be created for empty folders. The default is false.</p>"
+          "documentation":"<p>If the commit contains deletions, whether to keep a folder or folder structure if the changes leave the folders empty. If true, a .gitkeep file is created for empty folders. The default is false.</p>"
         },
         "conflictResolution":{
           "shape":"ConflictResolution",
-          "documentation":"<p>A list of inputs to use when resolving conflicts during a merge if AUTOMERGE is chosen as the conflict resolution strategy.</p>"
+          "documentation":"<p>If AUTOMERGE is the conflict resolution strategy, a list of inputs to use when resolving conflicts during a merge.</p>"
         }
       }
     },
@@ -4380,7 +5650,7 @@
       "members":{
         "isConflict":{
           "shape":"IsHunkConflict",
-          "documentation":"<p>A Boolean value indicating whether a combination of hunks contains a conflict. Conflicts occur when the same file or the same lines in a file were modified in both the source and destination of a merge or pull request. Valid values include true, false, and null. This will be true when the hunk represents a conflict and one or more files contains a line conflict. File mode conflicts in a merge will not set this to be true.</p>"
+          "documentation":"<p>A Boolean value indicating whether a combination of hunks contains a conflict. Conflicts occur when the same file or the same lines in a file were modified in both the source and destination of a merge or pull request. Valid values include true, false, and null. True when the hunk represents a conflict and one or more files contains a line conflict. File mode conflicts in a merge do not set this to true.</p>"
         },
         "source":{
           "shape":"MergeHunkDetail",
@@ -4410,7 +5680,7 @@
         },
         "hunkContent":{
           "shape":"HunkContent",
-          "documentation":"<p>The base-64 encoded content of the hunk merged region that might or might not contain a conflict.</p>"
+          "documentation":"<p>The base-64 encoded content of the hunk merged region that might contain a conflict.</p>"
         }
       },
       "documentation":"<p>Information about the details of a merge hunk that contains a conflict in a merge or pull request operation.</p>"
@@ -4446,7 +5716,7 @@
       "members":{
         "source":{
           "shape":"ChangeTypeEnum",
-          "documentation":"<p>The operation on a file (add, modify, or delete) of a file in the source of a merge or pull request.</p>"
+          "documentation":"<p>The operation (add, modify, or delete) on a file in the source of a merge or pull request.</p>"
         },
         "destination":{
           "shape":"ChangeTypeEnum",
@@ -4500,7 +5770,7 @@
       "members":{
         "pullRequest":{
           "shape":"PullRequest",
-          "documentation":"<p>Information about the specified pull request, including information about the merge.</p>"
+          "documentation":"<p>Information about the specified pull request, including the merge.</p>"
         }
       }
     },
@@ -4525,11 +5795,11 @@
         },
         "conflictDetailLevel":{
           "shape":"ConflictDetailLevelTypeEnum",
-          "documentation":"<p>The level of conflict detail to use. If unspecified, the default FILE_LEVEL is used, which will return a not mergeable result if the same file has differences in both branches. If LINE_LEVEL is specified, a conflict will be considered not mergeable if the same file in both branches has differences on the same line.</p>"
+          "documentation":"<p>The level of conflict detail to use. If unspecified, the default FILE_LEVEL is used, which returns a not-mergeable result if the same file has differences in both branches. If LINE_LEVEL is specified, a conflict is considered not mergeable if the same file in both branches has differences on the same line.</p>"
         },
         "conflictResolutionStrategy":{
           "shape":"ConflictResolutionStrategyTypeEnum",
-          "documentation":"<p>Specifies which branch to use when resolving conflicts, or whether to attempt automatically merging two versions of a file. The default is NONE, which requires any conflicts to be resolved manually before the merge operation will be successful.</p>"
+          "documentation":"<p>Specifies which branch to use when resolving conflicts, or whether to attempt automatically merging two versions of a file. The default is NONE, which requires any conflicts to be resolved manually before the merge operation is successful.</p>"
         },
         "commitMessage":{
           "shape":"Message",
@@ -4537,19 +5807,19 @@
         },
         "authorName":{
           "shape":"Name",
-          "documentation":"<p>The name of the author who created the commit. This information will be used as both the author and committer for the commit.</p>"
+          "documentation":"<p>The name of the author who created the commit. This information is used as both the author and committer for the commit.</p>"
         },
         "email":{
           "shape":"Email",
-          "documentation":"<p>The email address of the person merging the branches. This information will be used in the commit information for the merge.</p>"
+          "documentation":"<p>The email address of the person merging the branches. This information is used in the commit information for the merge.</p>"
         },
         "keepEmptyFolders":{
           "shape":"KeepEmptyFolders",
-          "documentation":"<p>If the commit contains deletions, whether to keep a folder or folder structure if the changes leave the folders empty. If this is specified as true, a .gitkeep file will be created for empty folders. The default is false.</p>"
+          "documentation":"<p>If the commit contains deletions, whether to keep a folder or folder structure if the changes leave the folders empty. If true, a .gitkeep file is created for empty folders. The default is false.</p>"
         },
         "conflictResolution":{
           "shape":"ConflictResolution",
-          "documentation":"<p>A list of inputs to use when resolving conflicts during a merge if AUTOMERGE is chosen as the conflict resolution strategy.</p>"
+          "documentation":"<p>If AUTOMERGE is the conflict resolution strategy, a list of inputs to use when resolving conflicts during a merge.</p>"
         }
       }
     },
@@ -4580,11 +5850,11 @@
         },
         "conflictDetailLevel":{
           "shape":"ConflictDetailLevelTypeEnum",
-          "documentation":"<p>The level of conflict detail to use. If unspecified, the default FILE_LEVEL is used, which will return a not mergeable result if the same file has differences in both branches. If LINE_LEVEL is specified, a conflict will be considered not mergeable if the same file in both branches has differences on the same line.</p>"
+          "documentation":"<p>The level of conflict detail to use. If unspecified, the default FILE_LEVEL is used, which returns a not-mergeable result if the same file has differences in both branches. If LINE_LEVEL is specified, a conflict is considered not mergeable if the same file in both branches has differences on the same line.</p>"
         },
         "conflictResolutionStrategy":{
           "shape":"ConflictResolutionStrategyTypeEnum",
-          "documentation":"<p>Specifies which branch to use when resolving conflicts, or whether to attempt automatically merging two versions of a file. The default is NONE, which requires any conflicts to be resolved manually before the merge operation will be successful.</p>"
+          "documentation":"<p>Specifies which branch to use when resolving conflicts, or whether to attempt automatically merging two versions of a file. The default is NONE, which requires any conflicts to be resolved manually before the merge operation is successful.</p>"
         },
         "commitMessage":{
           "shape":"Message",
@@ -4592,19 +5862,19 @@
         },
         "authorName":{
           "shape":"Name",
-          "documentation":"<p>The name of the author who created the commit. This information will be used as both the author and committer for the commit.</p>"
+          "documentation":"<p>The name of the author who created the commit. This information is used as both the author and committer for the commit.</p>"
         },
         "email":{
           "shape":"Email",
-          "documentation":"<p>The email address of the person merging the branches. This information will be used in the commit information for the merge.</p>"
+          "documentation":"<p>The email address of the person merging the branches. This information is used in the commit information for the merge.</p>"
         },
         "keepEmptyFolders":{
           "shape":"KeepEmptyFolders",
-          "documentation":"<p>If the commit contains deletions, whether to keep a folder or folder structure if the changes leave the folders empty. If this is specified as true, a .gitkeep file will be created for empty folders. The default is false.</p>"
+          "documentation":"<p>If the commit contains deletions, whether to keep a folder or folder structure if the changes leave the folders empty. If true, a .gitkeep file is created for empty folders. The default is false.</p>"
         },
         "conflictResolution":{
           "shape":"ConflictResolution",
-          "documentation":"<p>A list of inputs to use when resolving conflicts during a merge if AUTOMERGE is chosen as the conflict resolution strategy.</p>"
+          "documentation":"<p>If AUTOMERGE is the conflict resolution strategy, a list of inputs to use when resolving conflicts during a merge.</p>"
         }
       }
     },
@@ -4647,6 +5917,20 @@
       "exception":true
     },
     "NumberOfConflicts":{"type":"integer"},
+    "NumberOfRuleTemplatesExceededException":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>The maximum number of approval rule templates has been exceeded for this AWS Region. </p>",
+      "exception":true
+    },
+    "NumberOfRulesExceededException":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>The approval rule cannot be added. The pull request has the maximum number of approval rules associated with it.</p>",
+      "exception":true
+    },
     "ObjectId":{"type":"string"},
     "ObjectSize":{"type":"long"},
     "ObjectTypeEnum":{
@@ -4683,6 +5967,64 @@
         "descending"
       ]
     },
+    "OriginApprovalRuleTemplate":{
+      "type":"structure",
+      "members":{
+        "approvalRuleTemplateId":{
+          "shape":"ApprovalRuleTemplateId",
+          "documentation":"<p>The ID of the template that created the approval rule.</p>"
+        },
+        "approvalRuleTemplateName":{
+          "shape":"ApprovalRuleTemplateName",
+          "documentation":"<p>The name of the template that created the approval rule.</p>"
+        }
+      },
+      "documentation":"<p>Returns information about the template that created the approval rule for a pull request.</p>"
+    },
+    "Overridden":{"type":"boolean"},
+    "OverrideAlreadySetException":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>The pull request has already had its approval rules set to override.</p>",
+      "exception":true
+    },
+    "OverridePullRequestApprovalRulesInput":{
+      "type":"structure",
+      "required":[
+        "pullRequestId",
+        "revisionId",
+        "overrideStatus"
+      ],
+      "members":{
+        "pullRequestId":{
+          "shape":"PullRequestId",
+          "documentation":"<p>The system-generated ID of the pull request for which you want to override all approval rule requirements. To get this information, use <a>GetPullRequest</a>.</p>"
+        },
+        "revisionId":{
+          "shape":"RevisionId",
+          "documentation":"<p>The system-generated ID of the most recent revision of the pull request. You cannot override approval rules for anything but the most recent revision of a pull request. To get the revision ID, use GetPullRequest.</p>"
+        },
+        "overrideStatus":{
+          "shape":"OverrideStatus",
+          "documentation":"<p>Whether you want to set aside approval rule requirements for the pull request (OVERRIDE) or revoke a previous override and apply approval rule requirements (REVOKE). REVOKE status is not stored.</p>"
+        }
+      }
+    },
+    "OverrideStatus":{
+      "type":"string",
+      "enum":[
+        "OVERRIDE",
+        "REVOKE"
+      ]
+    },
+    "OverrideStatusRequiredException":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>An override status is required, but no value was provided. Valid values include OVERRIDE and REVOKE.</p>",
+      "exception":true
+    },
     "ParentCommitDoesNotExistException":{
       "type":"structure",
       "members":{
@@ -4738,11 +6080,11 @@
         },
         "beforeCommitId":{
           "shape":"CommitId",
-          "documentation":"<p>To establish the directionality of the comparison, the full commit ID of the 'before' commit.</p> <note> <p>This is required for commenting on any commit unless that commit is the initial commit.</p> </note>"
+          "documentation":"<p>To establish the directionality of the comparison, the full commit ID of the before commit. Required for commenting on any commit unless that commit is the initial commit.</p>"
         },
         "afterCommitId":{
           "shape":"CommitId",
-          "documentation":"<p>To establish the directionality of the comparison, the full commit ID of the 'after' commit.</p>"
+          "documentation":"<p>To establish the directionality of the comparison, the full commit ID of the after commit.</p>"
         },
         "location":{
           "shape":"Location",
@@ -4754,7 +6096,7 @@
         },
         "clientRequestToken":{
           "shape":"ClientRequestToken",
-          "documentation":"<p>A unique, client-generated idempotency token that when provided in a request, ensures the request cannot be repeated with a changed parameter. If a request is received with the same parameters and a token is included, the request will return information about the initial request that used that token.</p>",
+          "documentation":"<p>A unique, client-generated idempotency token that, when provided in a request, ensures the request cannot be repeated with a changed parameter. If a request is received with the same parameters and a token is included, the request returns information about the initial request that used that token.</p>",
           "idempotencyToken":true
         }
       }
@@ -4768,19 +6110,19 @@
         },
         "beforeCommitId":{
           "shape":"CommitId",
-          "documentation":"<p>In the directionality you established, the full commit ID of the 'before' commit.</p>"
+          "documentation":"<p>In the directionality you established, the full commit ID of the before commit.</p>"
         },
         "afterCommitId":{
           "shape":"CommitId",
-          "documentation":"<p>In the directionality you established, the full commit ID of the 'after' commit.</p>"
+          "documentation":"<p>In the directionality you established, the full commit ID of the after commit.</p>"
         },
         "beforeBlobId":{
           "shape":"ObjectId",
-          "documentation":"<p>In the directionality you established, the blob ID of the 'before' blob.</p>"
+          "documentation":"<p>In the directionality you established, the blob ID of the before blob.</p>"
         },
         "afterBlobId":{
           "shape":"ObjectId",
-          "documentation":"<p>In the directionality you established, the blob ID of the 'after' blob.</p>"
+          "documentation":"<p>In the directionality you established, the blob ID of the after blob.</p>"
         },
         "location":{
           "shape":"Location",
@@ -4820,7 +6162,7 @@
         },
         "location":{
           "shape":"Location",
-          "documentation":"<p>The location of the change where you want to post your comment. If no location is provided, the comment will be posted as a general comment on the pull request difference between the before commit ID and the after commit ID.</p>"
+          "documentation":"<p>The location of the change where you want to post your comment. If no location is provided, the comment is posted as a general comment on the pull request difference between the before commit ID and the after commit ID.</p>"
         },
         "content":{
           "shape":"Content",
@@ -4828,7 +6170,7 @@
         },
         "clientRequestToken":{
           "shape":"ClientRequestToken",
-          "documentation":"<p>A unique, client-generated idempotency token that when provided in a request, ensures the request cannot be repeated with a changed parameter. If a request is received with the same parameters and a token is included, the request will return information about the initial request that used that token.</p>",
+          "documentation":"<p>A unique, client-generated idempotency token that, when provided in a request, ensures the request cannot be repeated with a changed parameter. If a request is received with the same parameters and a token is included, the request returns information about the initial request that used that token.</p>",
           "idempotencyToken":true
         }
       }
@@ -4850,15 +6192,15 @@
         },
         "afterCommitId":{
           "shape":"CommitId",
-          "documentation":"<p>The full commit ID of the commit in the destination branch where the pull request will be merged.</p>"
+          "documentation":"<p>The full commit ID of the commit in the destination branch where the pull request is merged.</p>"
         },
         "beforeBlobId":{
           "shape":"ObjectId",
-          "documentation":"<p>In the directionality of the pull request, the blob ID of the 'before' blob.</p>"
+          "documentation":"<p>In the directionality of the pull request, the blob ID of the before blob.</p>"
         },
         "afterBlobId":{
           "shape":"ObjectId",
-          "documentation":"<p>In the directionality of the pull request, the blob ID of the 'after' blob.</p>"
+          "documentation":"<p>In the directionality of the pull request, the blob ID of the after blob.</p>"
         },
         "location":{
           "shape":"Location",
@@ -4883,7 +6225,7 @@
         },
         "clientRequestToken":{
           "shape":"ClientRequestToken",
-          "documentation":"<p>A unique, client-generated idempotency token that when provided in a request, ensures the request cannot be repeated with a changed parameter. If a request is received with the same parameters and a token is included, the request will return information about the initial request that used that token.</p>",
+          "documentation":"<p>A unique, client-generated idempotency token that, when provided in a request, ensures the request cannot be repeated with a changed parameter. If a request is received with the same parameters and a token is included, the request returns information about the initial request that used that token.</p>",
           "idempotencyToken":true
         },
         "content":{
@@ -4910,7 +6252,7 @@
         },
         "title":{
           "shape":"Title",
-          "documentation":"<p>The user-defined title of the pull request. This title is displayed in the list of pull requests to other users of the repository.</p>"
+          "documentation":"<p>The user-defined title of the pull request. This title is displayed in the list of pull requests to other repository users.</p>"
         },
         "description":{
           "shape":"Description",
@@ -4938,7 +6280,15 @@
         },
         "clientRequestToken":{
           "shape":"ClientRequestToken",
-          "documentation":"<p>A unique, client-generated idempotency token that when provided in a request, ensures the request cannot be repeated with a changed parameter. If a request is received with the same parameters and a token is included, the request will return information about the initial request that used that token.</p>"
+          "documentation":"<p>A unique, client-generated idempotency token that, when provided in a request, ensures the request cannot be repeated with a changed parameter. If a request is received with the same parameters and a token is included, the request returns information about the initial request that used that token.</p>"
+        },
+        "revisionId":{
+          "shape":"RevisionId",
+          "documentation":"<p>The system-generated revision ID for the pull request.</p>"
+        },
+        "approvalRules":{
+          "shape":"ApprovalRulesList",
+          "documentation":"<p>The approval rules applied to the pull request.</p>"
         }
       },
       "documentation":"<p>Returns information about a pull request.</p>"
@@ -4950,6 +6300,20 @@
       "documentation":"<p>The pull request status cannot be updated because it is already closed.</p>",
       "exception":true
     },
+    "PullRequestApprovalRulesNotSatisfiedException":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>The pull request cannot be merged because one or more approval rules applied to the pull request have conditions that have not been met.</p>",
+      "exception":true
+    },
+    "PullRequestCannotBeApprovedByAuthorException":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>The approval cannot be applied because the user approving the pull request matches the user who created the pull request. You cannot approve a pull request that you created.</p>",
+      "exception":true
+    },
     "PullRequestCreatedEventMetadata":{
       "type":"structure",
       "members":{
@@ -4992,11 +6356,11 @@
         },
         "pullRequestEventType":{
           "shape":"PullRequestEventType",
-          "documentation":"<p>The type of the pull request event, for example a status change event (PULL_REQUEST_STATUS_CHANGED) or update event (PULL_REQUEST_SOURCE_REFERENCE_UPDATED).</p>"
+          "documentation":"<p>The type of the pull request event (for example, a status change event (PULL_REQUEST_STATUS_CHANGED) or update event (PULL_REQUEST_SOURCE_REFERENCE_UPDATED)).</p>"
         },
         "actorArn":{
           "shape":"Arn",
-          "documentation":"<p>The Amazon Resource Name (ARN) of the user whose actions resulted in the event. Examples include updating the pull request with additional commits or changing the status of a pull request.</p>"
+          "documentation":"<p>The Amazon Resource Name (ARN) of the user whose actions resulted in the event. Examples include updating the pull request with more commits or changing the status of a pull request.</p>"
         },
         "pullRequestCreatedEventMetadata":{
           "shape":"PullRequestCreatedEventMetadata",
@@ -5013,6 +6377,18 @@
         "pullRequestMergedStateChangedEventMetadata":{
           "shape":"PullRequestMergedStateChangedEventMetadata",
           "documentation":"<p>Information about the change in mergability state for the pull request event.</p>"
+        },
+        "approvalRuleEventMetadata":{
+          "shape":"ApprovalRuleEventMetadata",
+          "documentation":"<p>Information about a pull request event.</p>"
+        },
+        "approvalStateChangedEventMetadata":{
+          "shape":"ApprovalStateChangedEventMetadata",
+          "documentation":"<p>Information about an approval state change for a pull request.</p>"
+        },
+        "approvalRuleOverriddenEventMetadata":{
+          "shape":"ApprovalRuleOverriddenEventMetadata",
+          "documentation":"<p>Information about an approval rule override event for a pull request.</p>"
         }
       },
       "documentation":"<p>Returns information about a pull request event.</p>"
@@ -5027,7 +6403,12 @@
         "PULL_REQUEST_CREATED",
         "PULL_REQUEST_STATUS_CHANGED",
         "PULL_REQUEST_SOURCE_REFERENCE_UPDATED",
-        "PULL_REQUEST_MERGE_STATE_CHANGED"
+        "PULL_REQUEST_MERGE_STATE_CHANGED",
+        "PULL_REQUEST_APPROVAL_RULE_CREATED",
+        "PULL_REQUEST_APPROVAL_RULE_UPDATED",
+        "PULL_REQUEST_APPROVAL_RULE_DELETED",
+        "PULL_REQUEST_APPROVAL_RULE_OVERRIDDEN",
+        "PULL_REQUEST_APPROVAL_STATE_CHANGED"
       ]
     },
     "PullRequestId":{"type":"string"},
@@ -5051,7 +6432,7 @@
         },
         "destinationReference":{
           "shape":"ReferenceName",
-          "documentation":"<p>The name of the branch that the pull request will be merged into.</p>"
+          "documentation":"<p>The name of the branch that the pull request is merged into.</p>"
         },
         "mergeMetadata":{
           "shape":"MergeMetadata",
@@ -5119,7 +6500,7 @@
         },
         "destinationReference":{
           "shape":"ReferenceName",
-          "documentation":"<p>The branch of the repository where the pull request changes will be merged into. Also known as the destination branch. </p>"
+          "documentation":"<p>The branch of the repository where the pull request changes are merged. Also known as the destination branch. </p>"
         },
         "destinationCommit":{
           "shape":"CommitId",
@@ -5127,7 +6508,7 @@
         },
         "sourceCommit":{
           "shape":"CommitId",
-          "documentation":"<p>The full commit ID of the tip of the source branch used to create the pull request. If the pull request branch is updated by a push while the pull request is open, the commit ID will change to reflect the new tip of the branch.</p>"
+          "documentation":"<p>The full commit ID of the tip of the source branch used to create the pull request. If the pull request branch is updated by a push while the pull request is open, the commit ID changes to reflect the new tip of the branch.</p>"
         },
         "mergeBase":{
           "shape":"CommitId",
@@ -5169,7 +6550,7 @@
           "documentation":"<p>The name and full path of the file that contains the changes you want to make as part of the commit, if you are not providing the file content directly.</p>"
         }
       },
-      "documentation":"<p>Information about a file that will be added or updated as part of a commit.</p>"
+      "documentation":"<p>Information about a file added or updated as part of a commit.</p>"
     },
     "PutFileEntryConflictException":{
       "type":"structure",
@@ -5193,7 +6574,7 @@
         },
         "branchName":{
           "shape":"BranchName",
-          "documentation":"<p>The name of the branch where you want to add or update the file. If this is an empty repository, this branch will be created.</p>"
+          "documentation":"<p>The name of the branch where you want to add or update the file. If this is an empty repository, this branch is created.</p>"
         },
         "fileContent":{
           "shape":"FileContent",
@@ -5201,23 +6582,23 @@
         },
         "filePath":{
           "shape":"Path",
-          "documentation":"<p>The name of the file you want to add or update, including the relative path to the file in the repository.</p> <note> <p>If the path does not currently exist in the repository, the path will be created as part of adding the file.</p> </note>"
+          "documentation":"<p>The name of the file you want to add or update, including the relative path to the file in the repository.</p> <note> <p>If the path does not currently exist in the repository, the path is created as part of adding the file.</p> </note>"
         },
         "fileMode":{
           "shape":"FileModeTypeEnum",
-          "documentation":"<p>The file mode permissions of the blob. Valid file mode permissions are listed below.</p>"
+          "documentation":"<p>The file mode permissions of the blob. Valid file mode permissions are listed here.</p>"
         },
         "parentCommitId":{
           "shape":"CommitId",
-          "documentation":"<p>The full commit ID of the head commit in the branch where you want to add or update the file. If this is an empty repository, no commit ID is required. If this is not an empty repository, a commit ID is required. </p> <p>The commit ID must match the ID of the head commit at the time of the operation, or an error will occur, and the file will not be added or updated.</p>"
+          "documentation":"<p>The full commit ID of the head commit in the branch where you want to add or update the file. If this is an empty repository, no commit ID is required. If this is not an empty repository, a commit ID is required. </p> <p>The commit ID must match the ID of the head commit at the time of the operation. Otherwise, an error occurs, and the file is not added or updated.</p>"
         },
         "commitMessage":{
           "shape":"Message",
-          "documentation":"<p>A message about why this file was added or updated. While optional, adding a message is strongly encouraged in order to provide a more useful commit history for your repository.</p>"
+          "documentation":"<p>A message about why this file was added or updated. Although it is optional, a message makes the commit history for your repository more useful.</p>"
         },
         "name":{
           "shape":"Name",
-          "documentation":"<p>The name of the person adding or updating the file. While optional, adding a name is strongly encouraged in order to provide a more useful commit history for your repository.</p>"
+          "documentation":"<p>The name of the person adding or updating the file. Although it is optional, a name makes the commit history for your repository more useful.</p>"
         },
         "email":{
           "shape":"Email",
@@ -5235,7 +6616,7 @@
       "members":{
         "commitId":{
           "shape":"ObjectId",
-          "documentation":"<p>The full SHA of the commit that contains this file change.</p>"
+          "documentation":"<p>The full SHA ID of the commit that contains this file change.</p>"
         },
         "blobId":{
           "shape":"ObjectId",
@@ -5263,7 +6644,7 @@
           "documentation":"<p>The JSON block of configuration information for each trigger.</p>"
         }
       },
-      "documentation":"<p>Represents the input ofa put repository triggers operation.</p>"
+      "documentation":"<p>Represents the input of a put repository triggers operation.</p>"
     },
     "PutRepositoryTriggersOutput":{
       "type":"structure",
@@ -5338,7 +6719,7 @@
       "type":"structure",
       "members":{
       },
-      "documentation":"<p>USE_NEW_CONTENT was specified but no replacement content has been provided.</p>",
+      "documentation":"<p>USE_NEW_CONTENT was specified, but no replacement content has been provided.</p>",
       "exception":true
     },
     "ReplacementTypeEnum":{
@@ -5465,14 +6846,14 @@
       "type":"structure",
       "members":{
       },
-      "documentation":"<p>A repository name is required but was not specified.</p>",
+      "documentation":"<p>A repository name is required, but was not specified.</p>",
       "exception":true
     },
     "RepositoryNamesRequiredException":{
       "type":"structure",
       "members":{
       },
-      "documentation":"<p>A repository names object is required but was not specified.</p>",
+      "documentation":"<p>At least one repository name object is required, but was not specified.</p>",
       "exception":true
     },
     "RepositoryNotAssociatedWithPullRequestException":{
@@ -5500,19 +6881,19 @@
         },
         "destinationArn":{
           "shape":"Arn",
-          "documentation":"<p>The ARN of the resource that is the target for a trigger. For example, the ARN of a topic in Amazon SNS.</p>"
+          "documentation":"<p>The ARN of the resource that is the target for a trigger (for example, the ARN of a topic in Amazon SNS).</p>"
         },
         "customData":{
           "shape":"RepositoryTriggerCustomData",
-          "documentation":"<p>Any custom data associated with the trigger that will be included in the information sent to the target of the trigger.</p>"
+          "documentation":"<p>Any custom data associated with the trigger to be included in the information sent to the target of the trigger.</p>"
         },
         "branches":{
           "shape":"BranchNameList",
-          "documentation":"<p>The branches that will be included in the trigger configuration. If you specify an empty array, the trigger will apply to all branches.</p> <note> <p>Although no content is required in the array, you must include the array itself.</p> </note>"
+          "documentation":"<p>The branches to be included in the trigger configuration. If you specify an empty array, the trigger applies to all branches.</p> <note> <p>Although no content is required in the array, you must include the array itself.</p> </note>"
         },
         "events":{
           "shape":"RepositoryTriggerEventList",
-          "documentation":"<p>The repository events that will cause the trigger to run actions in another service, such as sending a notification through Amazon SNS. </p> <note> <p>The valid value \"all\" cannot be used with any other values.</p> </note>"
+          "documentation":"<p>The repository events that cause the trigger to run actions in another service, such as sending a notification through Amazon SNS. </p> <note> <p>The valid value \"all\" cannot be used with any other values.</p> </note>"
         }
       },
       "documentation":"<p>Information about a trigger for a repository.</p>"
@@ -5521,7 +6902,7 @@
       "type":"structure",
       "members":{
       },
-      "documentation":"<p>At least one branch name is required but was not specified in the trigger configuration.</p>",
+      "documentation":"<p>At least one branch name is required, but was not specified in the trigger configuration.</p>",
       "exception":true
     },
     "RepositoryTriggerCustomData":{"type":"string"},
@@ -5529,7 +6910,7 @@
       "type":"structure",
       "members":{
       },
-      "documentation":"<p>A destination ARN for the target service for the trigger is required but was not specified.</p>",
+      "documentation":"<p>A destination ARN for the target service for the trigger is required, but was not specified.</p>",
       "exception":true
     },
     "RepositoryTriggerEventEnum":{
@@ -5549,7 +6930,7 @@
       "type":"structure",
       "members":{
       },
-      "documentation":"<p>At least one event for the trigger is required but was not specified.</p>",
+      "documentation":"<p>At least one event for the trigger is required, but was not specified.</p>",
       "exception":true
     },
     "RepositoryTriggerExecutionFailure":{
@@ -5561,7 +6942,7 @@
         },
         "failureMessage":{
           "shape":"RepositoryTriggerExecutionFailureMessage",
-          "documentation":"<p>Additional message information about the trigger that did not run.</p>"
+          "documentation":"<p>Message information about the trigger that did not run.</p>"
         }
       },
       "documentation":"<p>A trigger failed to run.</p>"
@@ -5580,7 +6961,7 @@
       "type":"structure",
       "members":{
       },
-      "documentation":"<p>A name for the trigger is required but was not specified.</p>",
+      "documentation":"<p>A name for the trigger is required, but was not specified.</p>",
       "exception":true
     },
     "RepositoryTriggersConfigurationId":{"type":"string"},
@@ -5592,7 +6973,7 @@
       "type":"structure",
       "members":{
       },
-      "documentation":"<p>The list of triggers for the repository is required but was not specified.</p>",
+      "documentation":"<p>The list of triggers for the repository is required, but was not specified.</p>",
       "exception":true
     },
     "ResourceArn":{"type":"string"},
@@ -5610,6 +6991,22 @@
       "documentation":"<p>The commit cannot be created because one of the changes specifies copying or moving a .gitkeep file.</p>",
       "exception":true
     },
+    "RevisionId":{"type":"string"},
+    "RevisionIdRequiredException":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>A revision ID is required, but was not provided.</p>",
+      "exception":true
+    },
+    "RevisionNotCurrentException":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>The revision ID provided in the request does not match the current revision ID. Use GetPullRequest to retrieve the current revision ID.</p>",
+      "exception":true
+    },
+    "RuleContentSha256":{"type":"string"},
     "SameFileContentException":{
       "type":"structure",
       "members":{
@@ -5657,7 +7054,7 @@
       "type":"structure",
       "members":{
       },
-      "documentation":"<p>The source branch and the destination branch for the pull request are the same. You must specify different branches for the source and destination.</p>",
+      "documentation":"<p>The source branch and destination branch for the pull request are the same. You must specify different branches for the source and destination.</p>",
       "exception":true
     },
     "SourceFileOrContentRequiredException":{
@@ -5713,7 +7110,7 @@
         },
         "absolutePath":{
           "shape":"Path",
-          "documentation":"<p>The fully-qualified path to the folder that contains the symbolic link.</p>"
+          "documentation":"<p>The fully qualified path to the folder that contains the symbolic link.</p>"
         },
         "relativePath":{
           "shape":"Path",
@@ -5804,7 +7201,7 @@
         },
         "destinationReference":{
           "shape":"ReferenceName",
-          "documentation":"<p>The branch of the repository where the pull request changes will be merged into. Also known as the destination branch.</p>"
+          "documentation":"<p>The branch of the repository where the pull request changes are merged. Also known as the destination branch.</p>"
         }
       },
       "documentation":"<p>Returns information about a target for a pull request.</p>"
@@ -5854,7 +7251,7 @@
         },
         "failedExecutions":{
           "shape":"RepositoryTriggerExecutionFailureList",
-          "documentation":"<p>The list of triggers that were not able to be tested. This list provides the names of the triggers that could not be tested, separated by commas.</p>"
+          "documentation":"<p>The list of triggers that were not tested. This list provides the names of the triggers that could not be tested, separated by commas.</p>"
         }
       },
       "documentation":"<p>Represents the output of a test repository triggers operation.</p>"
@@ -5908,6 +7305,88 @@
         }
       }
     },
+    "UpdateApprovalRuleTemplateContentInput":{
+      "type":"structure",
+      "required":[
+        "approvalRuleTemplateName",
+        "newRuleContent"
+      ],
+      "members":{
+        "approvalRuleTemplateName":{
+          "shape":"ApprovalRuleTemplateName",
+          "documentation":"<p>The name of the approval rule template where you want to update the content of the rule. </p>"
+        },
+        "newRuleContent":{
+          "shape":"ApprovalRuleTemplateContent",
+          "documentation":"<p>The content that replaces the existing content of the rule. Content statements must be complete. You cannot provide only the changes.</p>"
+        },
+        "existingRuleContentSha256":{
+          "shape":"RuleContentSha256",
+          "documentation":"<p>The SHA-256 hash signature for the content of the approval rule. You can retrieve this information by using <a>GetPullRequest</a>.</p>"
+        }
+      }
+    },
+    "UpdateApprovalRuleTemplateContentOutput":{
+      "type":"structure",
+      "required":["approvalRuleTemplate"],
+      "members":{
+        "approvalRuleTemplate":{"shape":"ApprovalRuleTemplate"}
+      }
+    },
+    "UpdateApprovalRuleTemplateDescriptionInput":{
+      "type":"structure",
+      "required":[
+        "approvalRuleTemplateName",
+        "approvalRuleTemplateDescription"
+      ],
+      "members":{
+        "approvalRuleTemplateName":{
+          "shape":"ApprovalRuleTemplateName",
+          "documentation":"<p>The name of the template for which you want to update the description.</p>"
+        },
+        "approvalRuleTemplateDescription":{
+          "shape":"ApprovalRuleTemplateDescription",
+          "documentation":"<p>The updated description of the approval rule template.</p>"
+        }
+      }
+    },
+    "UpdateApprovalRuleTemplateDescriptionOutput":{
+      "type":"structure",
+      "required":["approvalRuleTemplate"],
+      "members":{
+        "approvalRuleTemplate":{
+          "shape":"ApprovalRuleTemplate",
+          "documentation":"<p>The structure and content of the updated approval rule template.</p>"
+        }
+      }
+    },
+    "UpdateApprovalRuleTemplateNameInput":{
+      "type":"structure",
+      "required":[
+        "oldApprovalRuleTemplateName",
+        "newApprovalRuleTemplateName"
+      ],
+      "members":{
+        "oldApprovalRuleTemplateName":{
+          "shape":"ApprovalRuleTemplateName",
+          "documentation":"<p>The current name of the approval rule template.</p>"
+        },
+        "newApprovalRuleTemplateName":{
+          "shape":"ApprovalRuleTemplateName",
+          "documentation":"<p>The new name you want to apply to the approval rule template.</p>"
+        }
+      }
+    },
+    "UpdateApprovalRuleTemplateNameOutput":{
+      "type":"structure",
+      "required":["approvalRuleTemplate"],
+      "members":{
+        "approvalRuleTemplate":{
+          "shape":"ApprovalRuleTemplate",
+          "documentation":"<p>The structure and content of the updated approval rule template.</p>"
+        }
+      }
+    },
     "UpdateCommentInput":{
       "type":"structure",
       "required":[
@@ -5921,7 +7400,7 @@
         },
         "content":{
           "shape":"Content",
-          "documentation":"<p>The updated content with which you want to replace the existing content of the comment.</p>"
+          "documentation":"<p>The updated content to replace the existing content of the comment.</p>"
         }
       }
     },
@@ -5952,6 +7431,64 @@
       },
       "documentation":"<p>Represents the input of an update default branch operation.</p>"
     },
+    "UpdatePullRequestApprovalRuleContentInput":{
+      "type":"structure",
+      "required":[
+        "pullRequestId",
+        "approvalRuleName",
+        "newRuleContent"
+      ],
+      "members":{
+        "pullRequestId":{
+          "shape":"PullRequestId",
+          "documentation":"<p>The system-generated ID of the pull request.</p>"
+        },
+        "approvalRuleName":{
+          "shape":"ApprovalRuleName",
+          "documentation":"<p>The name of the approval rule you want to update.</p>"
+        },
+        "existingRuleContentSha256":{
+          "shape":"RuleContentSha256",
+          "documentation":"<p>The SHA-256 hash signature for the content of the approval rule. You can retrieve this information by using <a>GetPullRequest</a>.</p>"
+        },
+        "newRuleContent":{
+          "shape":"ApprovalRuleContent",
+          "documentation":"<p>The updated content for the approval rule.</p> <note> <p>When you update the content of the approval rule, you can specify approvers in an approval pool in one of two ways:</p> <ul> <li> <p> <b>CodeCommitApprovers</b>: This option only requires an AWS account and a resource. It can be used for both IAM users and federated access users whose name matches the provided resource name. This is a very powerful option that offers a great deal of flexibility. For example, if you specify the AWS account <i>123456789012</i> and <i>Mary_Major</i>, all of the following are counted as approvals coming from that user:</p> <ul> <li> <p>An IAM user in the account (arn:aws:iam::<i>123456789012</i>:user/<i>Mary_Major</i>)</p> </li> <li> <p>A federated user identified in IAM as Mary_Major (arn:aws:sts::<i>123456789012</i>:federated-user/<i>Mary_Major</i>)</p> </li> </ul> <p>This option does not recognize an active session of someone assuming the role of CodeCommitReview with a role session name of <i>Mary_Major</i> (arn:aws:sts::<i>123456789012</i>:assumed-role/CodeCommitReview/<i>Mary_Major</i>) unless you include a wildcard (*Mary_Major).</p> </li> <li> <p> <b>Fully qualified ARN</b>: This option allows you to specify the fully qualified Amazon Resource Name (ARN) of the IAM user or role. </p> </li> </ul> <p>For more information about IAM ARNs, wildcards, and formats, see <a href=\"https://docs.aws.amazon.com/iam/latest/UserGuide/reference_identifiers.html\">IAM Identifiers</a> in the <i>IAM User Guide</i>.</p> </note>"
+        }
+      }
+    },
+    "UpdatePullRequestApprovalRuleContentOutput":{
+      "type":"structure",
+      "required":["approvalRule"],
+      "members":{
+        "approvalRule":{
+          "shape":"ApprovalRule",
+          "documentation":"<p>Information about the updated approval rule.</p>"
+        }
+      }
+    },
+    "UpdatePullRequestApprovalStateInput":{
+      "type":"structure",
+      "required":[
+        "pullRequestId",
+        "revisionId",
+        "approvalState"
+      ],
+      "members":{
+        "pullRequestId":{
+          "shape":"PullRequestId",
+          "documentation":"<p>The system-generated ID of the pull request.</p>"
+        },
+        "revisionId":{
+          "shape":"RevisionId",
+          "documentation":"<p>The system-generated ID of the revision.</p>"
+        },
+        "approvalState":{
+          "shape":"ApprovalState",
+          "documentation":"<p>The approval state to associate with the user on the pull request.</p>"
+        }
+      }
+    },
     "UpdatePullRequestDescriptionInput":{
       "type":"structure",
       "required":[
@@ -5965,7 +7502,7 @@
         },
         "description":{
           "shape":"Description",
-          "documentation":"<p>The updated content of the description for the pull request. This content will replace the existing description.</p>"
+          "documentation":"<p>The updated content of the description for the pull request. This content replaces the existing description.</p>"
         }
       }
     },
@@ -5992,7 +7529,7 @@
         },
         "pullRequestStatus":{
           "shape":"PullRequestStatusEnum",
-          "documentation":"<p>The status of the pull request. The only valid operations are to update the status from <code>OPEN</code> to <code>OPEN</code>, <code>OPEN</code> to <code>CLOSED</code> or from from <code>CLOSED</code> to <code>CLOSED</code>.</p>"
+          "documentation":"<p>The status of the pull request. The only valid operations are to update the status from <code>OPEN</code> to <code>OPEN</code>, <code>OPEN</code> to <code>CLOSED</code> or from <code>CLOSED</code> to <code>CLOSED</code>.</p>"
         }
       }
     },
@@ -6019,7 +7556,7 @@
         },
         "title":{
           "shape":"Title",
-          "documentation":"<p>The updated title of the pull request. This will replace the existing title.</p>"
+          "documentation":"<p>The updated title of the pull request. This replaces the existing title.</p>"
         }
       }
     },
@@ -6057,7 +7594,7 @@
       "members":{
         "oldName":{
           "shape":"RepositoryName",
-          "documentation":"<p>The existing name of the repository.</p>"
+          "documentation":"<p>The current name of the repository.</p>"
         },
         "newName":{
           "shape":"RepositoryName",
@@ -6086,5 +7623,5 @@
     },
     "blob":{"type":"blob"}
   },
-  "documentation":"<fullname>AWS CodeCommit</fullname> <p>This is the <i>AWS CodeCommit API Reference</i>. This reference provides descriptions of the operations and data types for AWS CodeCommit API along with usage examples.</p> <p>You can use the AWS CodeCommit API to work with the following objects:</p> <p>Repositories, by calling the following:</p> <ul> <li> <p> <a>BatchGetRepositories</a>, which returns information about one or more repositories associated with your AWS account.</p> </li> <li> <p> <a>CreateRepository</a>, which creates an AWS CodeCommit repository.</p> </li> <li> <p> <a>DeleteRepository</a>, which deletes an AWS CodeCommit repository.</p> </li> <li> <p> <a>GetRepository</a>, which returns information about a specified repository.</p> </li> <li> <p> <a>ListRepositories</a>, which lists all AWS CodeCommit repositories associated with your AWS account.</p> </li> <li> <p> <a>UpdateRepositoryDescription</a>, which sets or updates the description of the repository.</p> </li> <li> <p> <a>UpdateRepositoryName</a>, which changes the name of the repository. If you change the name of a repository, no other users of that repository will be able to access it until you send them the new HTTPS or SSH URL to use.</p> </li> </ul> <p>Branches, by calling the following:</p> <ul> <li> <p> <a>CreateBranch</a>, which creates a new branch in a specified repository.</p> </li> <li> <p> <a>DeleteBranch</a>, which deletes the specified branch in a repository unless it is the default branch.</p> </li> <li> <p> <a>GetBranch</a>, which returns information about a specified branch.</p> </li> <li> <p> <a>ListBranches</a>, which lists all branches for a specified repository.</p> </li> <li> <p> <a>UpdateDefaultBranch</a>, which changes the default branch for a repository.</p> </li> </ul> <p>Files, by calling the following:</p> <ul> <li> <p> <a>DeleteFile</a>, which deletes the content of a specified file from a specified branch.</p> </li> <li> <p> <a>GetBlob</a>, which returns the base-64 encoded content of an individual Git blob object within a repository.</p> </li> <li> <p> <a>GetFile</a>, which returns the base-64 encoded content of a specified file.</p> </li> <li> <p> <a>GetFolder</a>, which returns the contents of a specified folder or directory.</p> </li> <li> <p> <a>PutFile</a>, which adds or modifies a single file in a specified repository and branch.</p> </li> </ul> <p>Commits, by calling the following:</p> <ul> <li> <p> <a>BatchGetCommits</a>, which returns information about one or more commits in a repository</p> </li> <li> <p> <a>CreateCommit</a>, which creates a commit for changes to a repository.</p> </li> <li> <p> <a>GetCommit</a>, which returns information about a commit, including commit messages and author and committer information.</p> </li> <li> <p> <a>GetDifferences</a>, which returns information about the differences in a valid commit specifier (such as a branch, tag, HEAD, commit ID or other fully qualified reference).</p> </li> </ul> <p>Merges, by calling the following:</p> <ul> <li> <p> <a>BatchDescribeMergeConflicts</a>, which returns information about conflicts in a merge between commits in a repository.</p> </li> <li> <p> <a>CreateUnreferencedMergeCommit</a>, which creates an unreferenced commit between two branches or commits for the purpose of comparing them and identifying any potential conflicts.</p> </li> <li> <p> <a>DescribeMergeConflicts</a>, which returns information about merge conflicts between the base, source, and destination versions of a file in a potential merge.</p> </li> <li> <p> <a>GetMergeCommit</a>, which returns information about the merge between a source and destination commit. </p> </li> <li> <p> <a>GetMergeConflicts</a>, which returns information about merge conflicts between the source and destination branch in a pull request.</p> </li> <li> <p> <a>GetMergeOptions</a>, which returns information about the available merge options between two branches or commit specifiers.</p> </li> <li> <p> <a>MergeBranchesByFastForward</a>, which merges two branches using the fast-forward merge option.</p> </li> <li> <p> <a>MergeBranchesBySquash</a>, which merges two branches using the squash merge option.</p> </li> <li> <p> <a>MergeBranchesByThreeWay</a>, which merges two branches using the three-way merge option.</p> </li> </ul> <p>Pull requests, by calling the following:</p> <ul> <li> <p> <a>CreatePullRequest</a>, which creates a pull request in a specified repository.</p> </li> <li> <p> <a>DescribePullRequestEvents</a>, which returns information about one or more pull request events.</p> </li> <li> <p> <a>GetCommentsForPullRequest</a>, which returns information about comments on a specified pull request.</p> </li> <li> <p> <a>GetPullRequest</a>, which returns information about a specified pull request.</p> </li> <li> <p> <a>ListPullRequests</a>, which lists all pull requests for a repository.</p> </li> <li> <p> <a>MergePullRequestByFastForward</a>, which merges the source destination branch of a pull request into the specified destination branch for that pull request using the fast-forward merge option.</p> </li> <li> <p> <a>MergePullRequestBySquash</a>, which merges the source destination branch of a pull request into the specified destination branch for that pull request using the squash merge option.</p> </li> <li> <p> <a>MergePullRequestByThreeWay</a>. which merges the source destination branch of a pull request into the specified destination branch for that pull request using the three-way merge option.</p> </li> <li> <p> <a>PostCommentForPullRequest</a>, which posts a comment to a pull request at the specified line, file, or request.</p> </li> <li> <p> <a>UpdatePullRequestDescription</a>, which updates the description of a pull request.</p> </li> <li> <p> <a>UpdatePullRequestStatus</a>, which updates the status of a pull request.</p> </li> <li> <p> <a>UpdatePullRequestTitle</a>, which updates the title of a pull request.</p> </li> </ul> <p>Comments in a repository, by calling the following:</p> <ul> <li> <p> <a>DeleteCommentContent</a>, which deletes the content of a comment on a commit in a repository.</p> </li> <li> <p> <a>GetComment</a>, which returns information about a comment on a commit.</p> </li> <li> <p> <a>GetCommentsForComparedCommit</a>, which returns information about comments on the comparison between two commit specifiers in a repository.</p> </li> <li> <p> <a>PostCommentForComparedCommit</a>, which creates a comment on the comparison between two commit specifiers in a repository.</p> </li> <li> <p> <a>PostCommentReply</a>, which creates a reply to a comment.</p> </li> <li> <p> <a>UpdateComment</a>, which updates the content of a comment on a commit in a repository.</p> </li> </ul> <p>Tags used to tag resources in AWS CodeCommit (not Git tags), by calling the following:</p> <ul> <li> <p> <a>ListTagsForResource</a>, which gets information about AWS tags for a specified Amazon Resource Name (ARN) in AWS CodeCommit.</p> </li> <li> <p> <a>TagResource</a>, which adds or updates tags for a resource in AWS CodeCommit.</p> </li> <li> <p> <a>UntagResource</a>, which removes tags for a resource in AWS CodeCommit.</p> </li> </ul> <p>Triggers, by calling the following:</p> <ul> <li> <p> <a>GetRepositoryTriggers</a>, which returns information about triggers configured for a repository.</p> </li> <li> <p> <a>PutRepositoryTriggers</a>, which replaces all triggers for a repository and can be used to create or delete triggers.</p> </li> <li> <p> <a>TestRepositoryTriggers</a>, which tests the functionality of a repository trigger by sending data to the trigger target.</p> </li> </ul> <p>For information about how to use AWS CodeCommit, see the <a href=\"https://docs.aws.amazon.com/codecommit/latest/userguide/welcome.html\">AWS CodeCommit User Guide</a>.</p>"
+  "documentation":"<fullname>AWS CodeCommit</fullname> <p>This is the <i>AWS CodeCommit API Reference</i>. This reference provides descriptions of the operations and data types for AWS CodeCommit API along with usage examples.</p> <p>You can use the AWS CodeCommit API to work with the following objects:</p> <p>Repositories, by calling the following:</p> <ul> <li> <p> <a>BatchGetRepositories</a>, which returns information about one or more repositories associated with your AWS account.</p> </li> <li> <p> <a>CreateRepository</a>, which creates an AWS CodeCommit repository.</p> </li> <li> <p> <a>DeleteRepository</a>, which deletes an AWS CodeCommit repository.</p> </li> <li> <p> <a>GetRepository</a>, which returns information about a specified repository.</p> </li> <li> <p> <a>ListRepositories</a>, which lists all AWS CodeCommit repositories associated with your AWS account.</p> </li> <li> <p> <a>UpdateRepositoryDescription</a>, which sets or updates the description of the repository.</p> </li> <li> <p> <a>UpdateRepositoryName</a>, which changes the name of the repository. If you change the name of a repository, no other users of that repository can access it until you send them the new HTTPS or SSH URL to use.</p> </li> </ul> <p>Branches, by calling the following:</p> <ul> <li> <p> <a>CreateBranch</a>, which creates a branch in a specified repository.</p> </li> <li> <p> <a>DeleteBranch</a>, which deletes the specified branch in a repository unless it is the default branch.</p> </li> <li> <p> <a>GetBranch</a>, which returns information about a specified branch.</p> </li> <li> <p> <a>ListBranches</a>, which lists all branches for a specified repository.</p> </li> <li> <p> <a>UpdateDefaultBranch</a>, which changes the default branch for a repository.</p> </li> </ul> <p>Files, by calling the following:</p> <ul> <li> <p> <a>DeleteFile</a>, which deletes the content of a specified file from a specified branch.</p> </li> <li> <p> <a>GetBlob</a>, which returns the base-64 encoded content of an individual Git blob object in a repository.</p> </li> <li> <p> <a>GetFile</a>, which returns the base-64 encoded content of a specified file.</p> </li> <li> <p> <a>GetFolder</a>, which returns the contents of a specified folder or directory.</p> </li> <li> <p> <a>PutFile</a>, which adds or modifies a single file in a specified repository and branch.</p> </li> </ul> <p>Commits, by calling the following:</p> <ul> <li> <p> <a>BatchGetCommits</a>, which returns information about one or more commits in a repository.</p> </li> <li> <p> <a>CreateCommit</a>, which creates a commit for changes to a repository.</p> </li> <li> <p> <a>GetCommit</a>, which returns information about a commit, including commit messages and author and committer information.</p> </li> <li> <p> <a>GetDifferences</a>, which returns information about the differences in a valid commit specifier (such as a branch, tag, HEAD, commit ID, or other fully qualified reference).</p> </li> </ul> <p>Merges, by calling the following:</p> <ul> <li> <p> <a>BatchDescribeMergeConflicts</a>, which returns information about conflicts in a merge between commits in a repository.</p> </li> <li> <p> <a>CreateUnreferencedMergeCommit</a>, which creates an unreferenced commit between two branches or commits for the purpose of comparing them and identifying any potential conflicts.</p> </li> <li> <p> <a>DescribeMergeConflicts</a>, which returns information about merge conflicts between the base, source, and destination versions of a file in a potential merge.</p> </li> <li> <p> <a>GetMergeCommit</a>, which returns information about the merge between a source and destination commit. </p> </li> <li> <p> <a>GetMergeConflicts</a>, which returns information about merge conflicts between the source and destination branch in a pull request.</p> </li> <li> <p> <a>GetMergeOptions</a>, which returns information about the available merge options between two branches or commit specifiers.</p> </li> <li> <p> <a>MergeBranchesByFastForward</a>, which merges two branches using the fast-forward merge option.</p> </li> <li> <p> <a>MergeBranchesBySquash</a>, which merges two branches using the squash merge option.</p> </li> <li> <p> <a>MergeBranchesByThreeWay</a>, which merges two branches using the three-way merge option.</p> </li> </ul> <p>Pull requests, by calling the following:</p> <ul> <li> <p> <a>CreatePullRequest</a>, which creates a pull request in a specified repository.</p> </li> <li> <p> <a>CreatePullRequestApprovalRule</a>, which creates an approval rule for a specified pull request.</p> </li> <li> <p> <a>DeletePullRequestApprovalRule</a>, which deletes an approval rule for a specified pull request.</p> </li> <li> <p> <a>DescribePullRequestEvents</a>, which returns information about one or more pull request events.</p> </li> <li> <p> <a>EvaluatePullRequestApprovalRules</a>, which evaluates whether a pull request has met all the conditions specified in its associated approval rules.</p> </li> <li> <p> <a>GetCommentsForPullRequest</a>, which returns information about comments on a specified pull request.</p> </li> <li> <p> <a>GetPullRequest</a>, which returns information about a specified pull request.</p> </li> <li> <p> <a>GetPullRequestApprovalStates</a>, which returns information about the approval states for a specified pull request.</p> </li> <li> <p> <a>GetPullRequestOverrideState</a>, which returns information about whether approval rules have been set aside (overriden) for a pull request, and if so, the Amazon Resource Name (ARN) of the user or identity that overrode the rules and their requirements for the pull request.</p> </li> <li> <p> <a>ListPullRequests</a>, which lists all pull requests for a repository.</p> </li> <li> <p> <a>MergePullRequestByFastForward</a>, which merges the source destination branch of a pull request into the specified destination branch for that pull request using the fast-forward merge option.</p> </li> <li> <p> <a>MergePullRequestBySquash</a>, which merges the source destination branch of a pull request into the specified destination branch for that pull request using the squash merge option.</p> </li> <li> <p> <a>MergePullRequestByThreeWay</a>. which merges the source destination branch of a pull request into the specified destination branch for that pull request using the three-way merge option.</p> </li> <li> <p> <a>OverridePullRequestApprovalRules</a>, which sets aside all approval rule requirements for a pull request.</p> </li> <li> <p> <a>PostCommentForPullRequest</a>, which posts a comment to a pull request at the specified line, file, or request.</p> </li> <li> <p> <a>UpdatePullRequestApprovalRuleContent</a>, which updates the structure of an approval rule for a pull request.</p> </li> <li> <p> <a>UpdatePullRequestApprovalState</a>, which updates the state of an approval on a pull request.</p> </li> <li> <p> <a>UpdatePullRequestDescription</a>, which updates the description of a pull request.</p> </li> <li> <p> <a>UpdatePullRequestStatus</a>, which updates the status of a pull request.</p> </li> <li> <p> <a>UpdatePullRequestTitle</a>, which updates the title of a pull request.</p> </li> </ul> <p>Approval rule templates, by calling the following:</p> <ul> <li> <p> <a>AssociateApprovalRuleTemplateWithRepository</a>, which associates a template with a specified repository. After the template is associated with a repository, AWS CodeCommit creates approval rules that match the template conditions on every pull request created in the specified repository.</p> </li> <li> <p> <a>BatchAssociateApprovalRuleTemplateWithRepositories</a>, which associates a template with one or more specified repositories. After the template is associated with a repository, AWS CodeCommit creates approval rules that match the template conditions on every pull request created in the specified repositories.</p> </li> <li> <p> <a>BatchDisassociateApprovalRuleTemplateFromRepositories</a>, which removes the association between a template and specified repositories so that approval rules based on the template are not automatically created when pull requests are created in those repositories.</p> </li> <li> <p> <a>CreateApprovalRuleTemplate</a>, which creates a template for approval rules that can then be associated with one or more repositories in your AWS account.</p> </li> <li> <p> <a>DeleteApprovalRuleTemplate</a>, which deletes the specified template. It does not remove approval rules on pull requests already created with the template.</p> </li> <li> <p> <a>DisassociateApprovalRuleTemplateFromRepository</a>, which removes the association between a template and a repository so that approval rules based on the template are not automatically created when pull requests are created in the specified repository.</p> </li> <li> <p> <a>GetApprovalRuleTemplate</a>, which returns information about an approval rule template.</p> </li> <li> <p> <a>ListApprovalRuleTemplates</a>, which lists all approval rule templates in the AWS Region in your AWS account.</p> </li> <li> <p> <a>ListAssociatedApprovalRuleTemplatesForRepository</a>, which lists all approval rule templates that are associated with a specified repository.</p> </li> <li> <p> <a>ListRepositoriesForApprovalRuleTemplate</a>, which lists all repositories associated with the specified approval rule template.</p> </li> <li> <p> <a>UpdateApprovalRuleTemplateDescription</a>, which updates the description of an approval rule template.</p> </li> <li> <p> <a>UpdateApprovalRuleTemplateName</a>, which updates the name of an approval rule template.</p> </li> <li> <p> <a>UpdateApprovalRuleTemplateContent</a>, which updates the content of an approval rule template.</p> </li> </ul> <p>Comments in a repository, by calling the following:</p> <ul> <li> <p> <a>DeleteCommentContent</a>, which deletes the content of a comment on a commit in a repository.</p> </li> <li> <p> <a>GetComment</a>, which returns information about a comment on a commit.</p> </li> <li> <p> <a>GetCommentsForComparedCommit</a>, which returns information about comments on the comparison between two commit specifiers in a repository.</p> </li> <li> <p> <a>PostCommentForComparedCommit</a>, which creates a comment on the comparison between two commit specifiers in a repository.</p> </li> <li> <p> <a>PostCommentReply</a>, which creates a reply to a comment.</p> </li> <li> <p> <a>UpdateComment</a>, which updates the content of a comment on a commit in a repository.</p> </li> </ul> <p>Tags used to tag resources in AWS CodeCommit (not Git tags), by calling the following:</p> <ul> <li> <p> <a>ListTagsForResource</a>, which gets information about AWS tags for a specified Amazon Resource Name (ARN) in AWS CodeCommit.</p> </li> <li> <p> <a>TagResource</a>, which adds or updates tags for a resource in AWS CodeCommit.</p> </li> <li> <p> <a>UntagResource</a>, which removes tags for a resource in AWS CodeCommit.</p> </li> </ul> <p>Triggers, by calling the following:</p> <ul> <li> <p> <a>GetRepositoryTriggers</a>, which returns information about triggers configured for a repository.</p> </li> <li> <p> <a>PutRepositoryTriggers</a>, which replaces all triggers for a repository and can be used to create or delete triggers.</p> </li> <li> <p> <a>TestRepositoryTriggers</a>, which tests the functionality of a repository trigger by sending data to the trigger target.</p> </li> </ul> <p>For information about how to use AWS CodeCommit, see the <a href=\"https://docs.aws.amazon.com/codecommit/latest/userguide/welcome.html\">AWS CodeCommit User Guide</a>.</p>"
 }
diff --git a/services/codecommit/src/test/resources/cucumber.properties b/services/codecommit/src/test/resources/cucumber.properties
index d4f91057991d..03c94fd92ea5 100644
--- a/services/codecommit/src/test/resources/cucumber.properties
+++ b/services/codecommit/src/test/resources/cucumber.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/codedeploy/build.properties b/services/codedeploy/build.properties
index ecf2dae6fcb1..15ec2da1fc71 100644
--- a/services/codedeploy/build.properties
+++ b/services/codedeploy/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/codedeploy/pom.xml b/services/codedeploy/pom.xml
index c6f716b582e9..86e99c8d9fee 100644
--- a/services/codedeploy/pom.xml
+++ b/services/codedeploy/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>codedeploy</artifactId>
     <name>AWS Java SDK :: Services :: AWS CodeDeploy</name>
diff --git a/services/codedeploy/src/it/java/software/amazon/awssdk/services/codedeploy/CodeDeployIntegrationTest.java b/services/codedeploy/src/it/java/software/amazon/awssdk/services/codedeploy/CodeDeployIntegrationTest.java
index 204abd46f1d9..5975dfa92aec 100644
--- a/services/codedeploy/src/it/java/software/amazon/awssdk/services/codedeploy/CodeDeployIntegrationTest.java
+++ b/services/codedeploy/src/it/java/software/amazon/awssdk/services/codedeploy/CodeDeployIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/codedeploy/src/it/java/software/amazon/awssdk/services/codedeploy/IntegrationTestBase.java b/services/codedeploy/src/it/java/software/amazon/awssdk/services/codedeploy/IntegrationTestBase.java
index 2dee92be7118..c2577fb2b4c3 100644
--- a/services/codedeploy/src/it/java/software/amazon/awssdk/services/codedeploy/IntegrationTestBase.java
+++ b/services/codedeploy/src/it/java/software/amazon/awssdk/services/codedeploy/IntegrationTestBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/codeguruprofiler/pom.xml b/services/codeguruprofiler/pom.xml
new file mode 100644
index 000000000000..7e56369d83ee
--- /dev/null
+++ b/services/codeguruprofiler/pom.xml
@@ -0,0 +1,60 @@
+<?xml version="1.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.
+  -->
+
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>software.amazon.awssdk</groupId>
+        <artifactId>services</artifactId>
+        <version>2.11.8-SNAPSHOT</version>
+    </parent>
+    <artifactId>codeguruprofiler</artifactId>
+    <name>AWS Java SDK :: Services :: CodeGuruProfiler</name>
+    <description>The AWS Java SDK for CodeGuruProfiler module holds the client classes that are used for
+        communicating with CodeGuruProfiler.
+    </description>
+    <url>https://aws.amazon.com/sdkforjava</url>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifestEntries>
+                            <Automatic-Module-Name>software.amazon.awssdk.services.codeguruprofiler</Automatic-Module-Name>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>protocol-core</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>aws-json-protocol</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/services/codeguruprofiler/src/main/resources/codegen-resources/paginators-1.json b/services/codeguruprofiler/src/main/resources/codegen-resources/paginators-1.json
new file mode 100644
index 000000000000..afbbca8aabb5
--- /dev/null
+++ b/services/codeguruprofiler/src/main/resources/codegen-resources/paginators-1.json
@@ -0,0 +1,14 @@
+{
+  "pagination": {
+    "ListProfileTimes": {
+      "input_token": "nextToken",
+      "output_token": "nextToken",
+      "limit_key": "maxResults"
+    },
+    "ListProfilingGroups": {
+      "input_token": "nextToken",
+      "output_token": "nextToken",
+      "limit_key": "maxResults"
+    }
+  }
+}
diff --git a/services/codeguruprofiler/src/main/resources/codegen-resources/service-2.json b/services/codeguruprofiler/src/main/resources/codegen-resources/service-2.json
new file mode 100644
index 000000000000..f9f10049de00
--- /dev/null
+++ b/services/codeguruprofiler/src/main/resources/codegen-resources/service-2.json
@@ -0,0 +1,801 @@
+{
+  "version":"2.0",
+  "metadata":{
+    "apiVersion":"2019-07-18",
+    "endpointPrefix":"codeguru-profiler",
+    "jsonVersion":"1.1",
+    "protocol":"rest-json",
+    "serviceFullName":"Amazon CodeGuru Profiler",
+    "serviceId":"CodeGuruProfiler",
+    "signatureVersion":"v4",
+    "signingName":"codeguru-profiler",
+    "uid":"codeguruprofiler-2019-07-18"
+  },
+  "operations":{
+    "ConfigureAgent":{
+      "name":"ConfigureAgent",
+      "http":{
+        "method":"POST",
+        "requestUri":"/profilingGroups/{profilingGroupName}/configureAgent",
+        "responseCode":200
+      },
+      "input":{"shape":"ConfigureAgentRequest"},
+      "output":{"shape":"ConfigureAgentResponse"},
+      "errors":[
+        {"shape":"InternalServerException"},
+        {"shape":"ValidationException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"ResourceNotFoundException"}
+      ],
+      "documentation":"<p/>"
+    },
+    "CreateProfilingGroup":{
+      "name":"CreateProfilingGroup",
+      "http":{
+        "method":"POST",
+        "requestUri":"/profilingGroups",
+        "responseCode":201
+      },
+      "input":{"shape":"CreateProfilingGroupRequest"},
+      "output":{"shape":"CreateProfilingGroupResponse"},
+      "errors":[
+        {"shape":"ServiceQuotaExceededException"},
+        {"shape":"InternalServerException"},
+        {"shape":"ConflictException"},
+        {"shape":"ValidationException"},
+        {"shape":"ThrottlingException"}
+      ],
+      "documentation":"<p>Creates a profiling group.</p>",
+      "idempotent":true
+    },
+    "DeleteProfilingGroup":{
+      "name":"DeleteProfilingGroup",
+      "http":{
+        "method":"DELETE",
+        "requestUri":"/profilingGroups/{profilingGroupName}",
+        "responseCode":204
+      },
+      "input":{"shape":"DeleteProfilingGroupRequest"},
+      "output":{"shape":"DeleteProfilingGroupResponse"},
+      "errors":[
+        {"shape":"InternalServerException"},
+        {"shape":"ValidationException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"ResourceNotFoundException"}
+      ],
+      "documentation":"<p>Deletes a profiling group.</p>",
+      "idempotent":true
+    },
+    "DescribeProfilingGroup":{
+      "name":"DescribeProfilingGroup",
+      "http":{
+        "method":"GET",
+        "requestUri":"/profilingGroups/{profilingGroupName}",
+        "responseCode":200
+      },
+      "input":{"shape":"DescribeProfilingGroupRequest"},
+      "output":{"shape":"DescribeProfilingGroupResponse"},
+      "errors":[
+        {"shape":"InternalServerException"},
+        {"shape":"ValidationException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"ResourceNotFoundException"}
+      ],
+      "documentation":"<p>Describes a profiling group.</p>"
+    },
+    "GetProfile":{
+      "name":"GetProfile",
+      "http":{
+        "method":"GET",
+        "requestUri":"/profilingGroups/{profilingGroupName}/profile",
+        "responseCode":200
+      },
+      "input":{"shape":"GetProfileRequest"},
+      "output":{"shape":"GetProfileResponse"},
+      "errors":[
+        {"shape":"InternalServerException"},
+        {"shape":"ValidationException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"ResourceNotFoundException"}
+      ],
+      "documentation":"<p>Gets the aggregated profile of a profiling group for the specified time range. If the requested time range does not align with the available aggregated profiles, it is expanded to attain alignment. If aggregated profiles are available only for part of the period requested, the profile is returned from the earliest available to the latest within the requested time range. </p> <p>For example, if the requested time range is from 00:00 to 00:20 and the available profiles are from 00:15 to 00:25, the returned profile will be from 00:15 to 00:20. </p> <p>You must specify exactly two of the following parameters: <code>startTime</code>, <code>period</code>, and <code>endTime</code>. </p>"
+    },
+    "ListProfileTimes":{
+      "name":"ListProfileTimes",
+      "http":{
+        "method":"GET",
+        "requestUri":"/profilingGroups/{profilingGroupName}/profileTimes",
+        "responseCode":200
+      },
+      "input":{"shape":"ListProfileTimesRequest"},
+      "output":{"shape":"ListProfileTimesResponse"},
+      "errors":[
+        {"shape":"InternalServerException"},
+        {"shape":"ValidationException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"ResourceNotFoundException"}
+      ],
+      "documentation":"<p>List the start times of the available aggregated profiles of a profiling group for an aggregation period within the specified time range.</p>"
+    },
+    "ListProfilingGroups":{
+      "name":"ListProfilingGroups",
+      "http":{
+        "method":"GET",
+        "requestUri":"/profilingGroups",
+        "responseCode":200
+      },
+      "input":{"shape":"ListProfilingGroupsRequest"},
+      "output":{"shape":"ListProfilingGroupsResponse"},
+      "errors":[
+        {"shape":"InternalServerException"},
+        {"shape":"ThrottlingException"}
+      ],
+      "documentation":"<p>Lists profiling groups.</p>"
+    },
+    "PostAgentProfile":{
+      "name":"PostAgentProfile",
+      "http":{
+        "method":"POST",
+        "requestUri":"/profilingGroups/{profilingGroupName}/agentProfile",
+        "responseCode":204
+      },
+      "input":{"shape":"PostAgentProfileRequest"},
+      "output":{"shape":"PostAgentProfileResponse"},
+      "errors":[
+        {"shape":"InternalServerException"},
+        {"shape":"ValidationException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"ResourceNotFoundException"}
+      ],
+      "documentation":"<p/>"
+    },
+    "UpdateProfilingGroup":{
+      "name":"UpdateProfilingGroup",
+      "http":{
+        "method":"PUT",
+        "requestUri":"/profilingGroups/{profilingGroupName}",
+        "responseCode":200
+      },
+      "input":{"shape":"UpdateProfilingGroupRequest"},
+      "output":{"shape":"UpdateProfilingGroupResponse"},
+      "errors":[
+        {"shape":"InternalServerException"},
+        {"shape":"ConflictException"},
+        {"shape":"ValidationException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"ResourceNotFoundException"}
+      ],
+      "documentation":"<p>Updates a profiling group.</p>",
+      "idempotent":true
+    }
+  },
+  "shapes":{
+    "AgentConfiguration":{
+      "type":"structure",
+      "required":[
+        "periodInSeconds",
+        "shouldProfile"
+      ],
+      "members":{
+        "periodInSeconds":{
+          "shape":"Integer",
+          "documentation":"<p/>"
+        },
+        "shouldProfile":{
+          "shape":"Boolean",
+          "documentation":"<p/>"
+        }
+      },
+      "documentation":"<p/>"
+    },
+    "AgentOrchestrationConfig":{
+      "type":"structure",
+      "required":["profilingEnabled"],
+      "members":{
+        "profilingEnabled":{
+          "shape":"Boolean",
+          "documentation":"<p/>"
+        }
+      },
+      "documentation":"<p/>"
+    },
+    "AgentProfile":{"type":"blob"},
+    "AggregatedProfile":{"type":"blob"},
+    "AggregatedProfileTime":{
+      "type":"structure",
+      "members":{
+        "period":{
+          "shape":"AggregationPeriod",
+          "documentation":"<p>The time period.</p>"
+        },
+        "start":{
+          "shape":"Timestamp",
+          "documentation":"<p>The start time.</p>"
+        }
+      },
+      "documentation":"<p>Information about the time range of the latest available aggregated profile.</p>"
+    },
+    "AggregationPeriod":{
+      "type":"string",
+      "enum":[
+        "P1D",
+        "PT1H",
+        "PT5M"
+      ]
+    },
+    "Boolean":{
+      "type":"boolean",
+      "box":true
+    },
+    "ClientToken":{
+      "type":"string",
+      "max":64,
+      "min":1,
+      "pattern":"^[\\w-]+$"
+    },
+    "ConfigureAgentRequest":{
+      "type":"structure",
+      "required":["profilingGroupName"],
+      "members":{
+        "fleetInstanceId":{
+          "shape":"FleetInstanceId",
+          "documentation":"<p/>"
+        },
+        "profilingGroupName":{
+          "shape":"ProfilingGroupName",
+          "documentation":"<p/>",
+          "location":"uri",
+          "locationName":"profilingGroupName"
+        }
+      },
+      "documentation":"<p>The structure representing the configureAgentRequest.</p>"
+    },
+    "ConfigureAgentResponse":{
+      "type":"structure",
+      "required":["configuration"],
+      "members":{
+        "configuration":{
+          "shape":"AgentConfiguration",
+          "documentation":"<p/>"
+        }
+      },
+      "documentation":"<p>The structure representing the configureAgentResponse.</p>",
+      "payload":"configuration"
+    },
+    "ConflictException":{
+      "type":"structure",
+      "required":["message"],
+      "members":{
+        "message":{"shape":"String"}
+      },
+      "documentation":"<p>The requested operation would cause a conflict with the current state of a service resource associated with the request. Resolve the conflict before retrying this request. </p>",
+      "error":{
+        "httpStatusCode":409,
+        "senderFault":true
+      },
+      "exception":true
+    },
+    "CreateProfilingGroupRequest":{
+      "type":"structure",
+      "required":[
+        "clientToken",
+        "profilingGroupName"
+      ],
+      "members":{
+        "agentOrchestrationConfig":{
+          "shape":"AgentOrchestrationConfig",
+          "documentation":"<p>The agent orchestration configuration.</p>"
+        },
+        "clientToken":{
+          "shape":"ClientToken",
+          "documentation":"<p>Unique, case-sensitive identifier that you provide to ensure the idempotency of the request.</p> <p>This parameter specifies a unique identifier for the new profiling group that helps ensure idempotency.</p>",
+          "idempotencyToken":true,
+          "location":"querystring",
+          "locationName":"clientToken"
+        },
+        "profilingGroupName":{
+          "shape":"ProfilingGroupName",
+          "documentation":"<p>The name of the profiling group.</p>"
+        }
+      },
+      "documentation":"<p>The structure representing the createProfiliingGroupRequest.</p>"
+    },
+    "CreateProfilingGroupResponse":{
+      "type":"structure",
+      "required":["profilingGroup"],
+      "members":{
+        "profilingGroup":{
+          "shape":"ProfilingGroupDescription",
+          "documentation":"<p>Information about the new profiling group</p>"
+        }
+      },
+      "documentation":"<p>The structure representing the createProfilingGroupResponse.</p>",
+      "payload":"profilingGroup"
+    },
+    "DeleteProfilingGroupRequest":{
+      "type":"structure",
+      "required":["profilingGroupName"],
+      "members":{
+        "profilingGroupName":{
+          "shape":"ProfilingGroupName",
+          "documentation":"<p>The profiling group name to delete.</p>",
+          "location":"uri",
+          "locationName":"profilingGroupName"
+        }
+      },
+      "documentation":"<p>The structure representing the deleteProfilingGroupRequest.</p>"
+    },
+    "DeleteProfilingGroupResponse":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>The structure representing the deleteProfilingGroupResponse.</p>"
+    },
+    "DescribeProfilingGroupRequest":{
+      "type":"structure",
+      "required":["profilingGroupName"],
+      "members":{
+        "profilingGroupName":{
+          "shape":"ProfilingGroupName",
+          "documentation":"<p>The profiling group name.</p>",
+          "location":"uri",
+          "locationName":"profilingGroupName"
+        }
+      },
+      "documentation":"<p>The structure representing the describeProfilingGroupRequest.</p>"
+    },
+    "DescribeProfilingGroupResponse":{
+      "type":"structure",
+      "required":["profilingGroup"],
+      "members":{
+        "profilingGroup":{
+          "shape":"ProfilingGroupDescription",
+          "documentation":"<p>Information about a profiling group.</p>"
+        }
+      },
+      "documentation":"<p>The structure representing the describeProfilingGroupResponse.</p>",
+      "payload":"profilingGroup"
+    },
+    "FleetInstanceId":{
+      "type":"string",
+      "max":255,
+      "min":1,
+      "pattern":"^[\\w-.:/]+$"
+    },
+    "GetProfileRequest":{
+      "type":"structure",
+      "required":["profilingGroupName"],
+      "members":{
+        "accept":{
+          "shape":"String",
+          "documentation":"<p>The format of the profile to return. You can choose <code>application/json</code> or the default <code>application/x-amzn-ion</code>. </p>",
+          "location":"header",
+          "locationName":"Accept"
+        },
+        "endTime":{
+          "shape":"Timestamp",
+          "documentation":"<p/> <p>You must specify exactly two of the following parameters: <code>startTime</code>, <code>period</code>, and <code>endTime</code>. </p>",
+          "location":"querystring",
+          "locationName":"endTime"
+        },
+        "maxDepth":{
+          "shape":"MaxDepth",
+          "documentation":"<p>The maximum depth of the graph.</p>",
+          "location":"querystring",
+          "locationName":"maxDepth"
+        },
+        "period":{
+          "shape":"Period",
+          "documentation":"<p>The period of the profile to get. The time range must be in the past and not longer than one week. </p> <p>You must specify exactly two of the following parameters: <code>startTime</code>, <code>period</code>, and <code>endTime</code>. </p>",
+          "location":"querystring",
+          "locationName":"period"
+        },
+        "profilingGroupName":{
+          "shape":"ProfilingGroupName",
+          "documentation":"<p>The name of the profiling group to get.</p>",
+          "location":"uri",
+          "locationName":"profilingGroupName"
+        },
+        "startTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>The start time of the profile to get.</p> <p>You must specify exactly two of the following parameters: <code>startTime</code>, <code>period</code>, and <code>endTime</code>. </p>",
+          "location":"querystring",
+          "locationName":"startTime"
+        }
+      },
+      "documentation":"<p>The structure representing the getProfileRequest.</p>"
+    },
+    "GetProfileResponse":{
+      "type":"structure",
+      "required":[
+        "contentType",
+        "profile"
+      ],
+      "members":{
+        "contentEncoding":{
+          "shape":"String",
+          "documentation":"<p>The content encoding of the profile.</p>",
+          "location":"header",
+          "locationName":"Content-Encoding"
+        },
+        "contentType":{
+          "shape":"String",
+          "documentation":"<p>The content type of the profile in the payload. It is either <code>application/json</code> or the default <code>application/x-amzn-ion</code>.</p>",
+          "location":"header",
+          "locationName":"Content-Type"
+        },
+        "profile":{
+          "shape":"AggregatedProfile",
+          "documentation":"<p>Information about the profile.</p>"
+        }
+      },
+      "documentation":"<p>The structure representing the getProfileResponse.</p>",
+      "payload":"profile"
+    },
+    "Integer":{
+      "type":"integer",
+      "box":true
+    },
+    "InternalServerException":{
+      "type":"structure",
+      "required":["message"],
+      "members":{
+        "message":{"shape":"String"}
+      },
+      "documentation":"<p>The server encountered an internal error and is unable to complete the request.</p>",
+      "error":{"httpStatusCode":500},
+      "exception":true,
+      "fault":true
+    },
+    "ListProfileTimesRequest":{
+      "type":"structure",
+      "required":[
+        "endTime",
+        "period",
+        "profilingGroupName",
+        "startTime"
+      ],
+      "members":{
+        "endTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>The end time of the time range from which to list the profiles.</p>",
+          "location":"querystring",
+          "locationName":"endTime"
+        },
+        "maxResults":{
+          "shape":"MaxResults",
+          "documentation":"<p>The maximum number of profile time results returned by <code>ListProfileTimes</code> in paginated output. When this parameter is used, <code>ListProfileTimes</code> only returns <code>maxResults</code> results in a single page with a <code>nextToken</code> response element. The remaining results of the initial request can be seen by sending another <code>ListProfileTimes</code> request with the returned <code>nextToken</code> value. </p>",
+          "location":"querystring",
+          "locationName":"maxResults"
+        },
+        "nextToken":{
+          "shape":"PaginationToken",
+          "documentation":"<p>The <code>nextToken</code> value returned from a previous paginated <code>ListProfileTimes</code> request where <code>maxResults</code> was used and the results exceeded the value of that parameter. Pagination continues from the end of the previous results that returned the <code>nextToken</code> value. </p> <note> <p>This token should be treated as an opaque identifier that is only used to retrieve the next items in a list and not for other programmatic purposes.</p> </note>",
+          "location":"querystring",
+          "locationName":"nextToken"
+        },
+        "orderBy":{
+          "shape":"OrderBy",
+          "documentation":"<p>The order (ascending or descending by start time of the profile) to use when listing profiles. Defaults to <code>TIMESTAMP_DESCENDING</code>. </p>",
+          "location":"querystring",
+          "locationName":"orderBy"
+        },
+        "period":{
+          "shape":"AggregationPeriod",
+          "documentation":"<p>The aggregation period.</p>",
+          "location":"querystring",
+          "locationName":"period"
+        },
+        "profilingGroupName":{
+          "shape":"ProfilingGroupName",
+          "documentation":"<p>The name of the profiling group.</p>",
+          "location":"uri",
+          "locationName":"profilingGroupName"
+        },
+        "startTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>The start time of the time range from which to list the profiles.</p>",
+          "location":"querystring",
+          "locationName":"startTime"
+        }
+      },
+      "documentation":"<p>The structure representing the listProfileTimesRequest.</p>"
+    },
+    "ListProfileTimesResponse":{
+      "type":"structure",
+      "required":["profileTimes"],
+      "members":{
+        "nextToken":{
+          "shape":"PaginationToken",
+          "documentation":"<p>The <code>nextToken</code> value to include in a future <code>ListProfileTimes</code> request. When the results of a <code>ListProfileTimes</code> request exceed <code>maxResults</code>, this value can be used to retrieve the next page of results. This value is <code>null</code> when there are no more results to return. </p>"
+        },
+        "profileTimes":{
+          "shape":"ProfileTimes",
+          "documentation":"<p>The list of start times of the available profiles for the aggregation period in the specified time range. </p>"
+        }
+      },
+      "documentation":"<p>The structure representing the listProfileTimesResponse.</p>"
+    },
+    "ListProfilingGroupsRequest":{
+      "type":"structure",
+      "members":{
+        "includeDescription":{
+          "shape":"Boolean",
+          "documentation":"<p>A Boolean value indicating whether to include a description.</p>",
+          "location":"querystring",
+          "locationName":"includeDescription"
+        },
+        "maxResults":{
+          "shape":"MaxResults",
+          "documentation":"<p>The maximum number of profiling groups results returned by <code>ListProfilingGroups</code> in paginated output. When this parameter is used, <code>ListProfilingGroups</code> only returns <code>maxResults</code> results in a single page along with a <code>nextToken</code> response element. The remaining results of the initial request can be seen by sending another <code>ListProfilingGroups</code> request with the returned <code>nextToken</code> value. </p>",
+          "location":"querystring",
+          "locationName":"maxResults"
+        },
+        "nextToken":{
+          "shape":"PaginationToken",
+          "documentation":"<p>The <code>nextToken</code> value returned from a previous paginated <code>ListProfilingGroups</code> request where <code>maxResults</code> was used and the results exceeded the value of that parameter. Pagination continues from the end of the previous results that returned the <code>nextToken</code> value. </p> <note> <p>This token should be treated as an opaque identifier that is only used to retrieve the next items in a list and not for other programmatic purposes.</p> </note>",
+          "location":"querystring",
+          "locationName":"nextToken"
+        }
+      },
+      "documentation":"<p>The structure representing the listProfilingGroupsRequest.</p>"
+    },
+    "ListProfilingGroupsResponse":{
+      "type":"structure",
+      "required":["profilingGroupNames"],
+      "members":{
+        "nextToken":{
+          "shape":"PaginationToken",
+          "documentation":"<p>The <code>nextToken</code> value to include in a future <code>ListProfilingGroups</code> request. When the results of a <code>ListProfilingGroups</code> request exceed <code>maxResults</code>, this value can be used to retrieve the next page of results. This value is <code>null</code> when there are no more results to return. </p>"
+        },
+        "profilingGroupNames":{
+          "shape":"ProfilingGroupNames",
+          "documentation":"<p>Information about profiling group names.</p>"
+        },
+        "profilingGroups":{
+          "shape":"ProfilingGroupDescriptions",
+          "documentation":"<p>Information about profiling groups.</p>"
+        }
+      },
+      "documentation":"<p>The structure representing the listProfilingGroupsResponse.</p>"
+    },
+    "MaxDepth":{
+      "type":"integer",
+      "box":true,
+      "max":10000,
+      "min":1
+    },
+    "MaxResults":{
+      "type":"integer",
+      "box":true,
+      "max":1000,
+      "min":1
+    },
+    "OrderBy":{
+      "type":"string",
+      "enum":[
+        "TimestampAscending",
+        "TimestampDescending"
+      ]
+    },
+    "PaginationToken":{
+      "type":"string",
+      "max":64,
+      "min":1,
+      "pattern":"^[\\w-]+$"
+    },
+    "Period":{
+      "type":"string",
+      "max":64,
+      "min":1
+    },
+    "PostAgentProfileRequest":{
+      "type":"structure",
+      "required":[
+        "agentProfile",
+        "contentType",
+        "profilingGroupName"
+      ],
+      "members":{
+        "agentProfile":{
+          "shape":"AgentProfile",
+          "documentation":"<p/>"
+        },
+        "contentType":{
+          "shape":"String",
+          "documentation":"<p/>",
+          "location":"header",
+          "locationName":"Content-Type"
+        },
+        "profileToken":{
+          "shape":"ClientToken",
+          "documentation":"<p/>",
+          "idempotencyToken":true,
+          "location":"querystring",
+          "locationName":"profileToken"
+        },
+        "profilingGroupName":{
+          "shape":"ProfilingGroupName",
+          "documentation":"<p/>",
+          "location":"uri",
+          "locationName":"profilingGroupName"
+        }
+      },
+      "documentation":"<p>The structure representing the postAgentProfileRequest.</p>",
+      "payload":"agentProfile"
+    },
+    "PostAgentProfileResponse":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>The structure representing the postAgentProfileResponse.</p>"
+    },
+    "ProfileTime":{
+      "type":"structure",
+      "members":{
+        "start":{
+          "shape":"Timestamp",
+          "documentation":"<p>The start time of the profile.</p>"
+        }
+      },
+      "documentation":"<p>Information about the profile time.</p>"
+    },
+    "ProfileTimes":{
+      "type":"list",
+      "member":{"shape":"ProfileTime"}
+    },
+    "ProfilingGroupArn":{"type":"string"},
+    "ProfilingGroupDescription":{
+      "type":"structure",
+      "members":{
+        "agentOrchestrationConfig":{
+          "shape":"AgentOrchestrationConfig",
+          "documentation":"<p/>"
+        },
+        "arn":{
+          "shape":"ProfilingGroupArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) identifying the profiling group.</p>"
+        },
+        "createdAt":{
+          "shape":"Timestamp",
+          "documentation":"<p>The time, in milliseconds since the epoch, when the profiling group was created.</p>"
+        },
+        "name":{
+          "shape":"ProfilingGroupName",
+          "documentation":"<p>The name of the profiling group.</p>"
+        },
+        "profilingStatus":{
+          "shape":"ProfilingStatus",
+          "documentation":"<p>The status of the profiling group.</p>"
+        },
+        "updatedAt":{
+          "shape":"Timestamp",
+          "documentation":"<p>The time, in milliseconds since the epoch, when the profiling group was last updated.</p>"
+        }
+      },
+      "documentation":"<p>The description of a profiling group.</p>"
+    },
+    "ProfilingGroupDescriptions":{
+      "type":"list",
+      "member":{"shape":"ProfilingGroupDescription"}
+    },
+    "ProfilingGroupName":{
+      "type":"string",
+      "max":255,
+      "min":1,
+      "pattern":"^[\\w-]+$"
+    },
+    "ProfilingGroupNames":{
+      "type":"list",
+      "member":{"shape":"ProfilingGroupName"}
+    },
+    "ProfilingStatus":{
+      "type":"structure",
+      "members":{
+        "latestAgentOrchestratedAt":{
+          "shape":"Timestamp",
+          "documentation":"<p>The time, in milliseconds since the epoch, when the latest agent was orchestrated.</p>"
+        },
+        "latestAgentProfileReportedAt":{
+          "shape":"Timestamp",
+          "documentation":"<p>The time, in milliseconds since the epoch, when the latest agent was reported..</p>"
+        },
+        "latestAggregatedProfile":{
+          "shape":"AggregatedProfileTime",
+          "documentation":"<p>The latest aggregated profile</p>"
+        }
+      },
+      "documentation":"<p>Information about the profiling status.</p>"
+    },
+    "ResourceNotFoundException":{
+      "type":"structure",
+      "required":["message"],
+      "members":{
+        "message":{"shape":"String"}
+      },
+      "documentation":"<p>The resource specified in the request does not exist.</p>",
+      "error":{
+        "httpStatusCode":404,
+        "senderFault":true
+      },
+      "exception":true
+    },
+    "ServiceQuotaExceededException":{
+      "type":"structure",
+      "required":["message"],
+      "members":{
+        "message":{"shape":"String"}
+      },
+      "documentation":"<p>You have exceeded your service quota. To perform the requested action, remove some of the relevant resources, or use <a href=\"https://docs.aws.amazon.com/servicequotas/latest/userguide/intro.html\">Service Quotas</a> to request a service quota increase. </p>",
+      "error":{
+        "httpStatusCode":402,
+        "senderFault":true
+      },
+      "exception":true
+    },
+    "String":{"type":"string"},
+    "ThrottlingException":{
+      "type":"structure",
+      "required":["message"],
+      "members":{
+        "message":{"shape":"String"}
+      },
+      "documentation":"<p>The request was denied due to request throttling.</p>",
+      "error":{
+        "httpStatusCode":429,
+        "senderFault":true
+      },
+      "exception":true
+    },
+    "Timestamp":{
+      "type":"timestamp",
+      "timestampFormat":"iso8601"
+    },
+    "UpdateProfilingGroupRequest":{
+      "type":"structure",
+      "required":[
+        "agentOrchestrationConfig",
+        "profilingGroupName"
+      ],
+      "members":{
+        "agentOrchestrationConfig":{
+          "shape":"AgentOrchestrationConfig",
+          "documentation":"<p/>"
+        },
+        "profilingGroupName":{
+          "shape":"ProfilingGroupName",
+          "documentation":"<p>The name of the profiling group to update.</p>",
+          "location":"uri",
+          "locationName":"profilingGroupName"
+        }
+      },
+      "documentation":"<p>The structure representing the updateProfilingGroupRequest.</p>"
+    },
+    "UpdateProfilingGroupResponse":{
+      "type":"structure",
+      "required":["profilingGroup"],
+      "members":{
+        "profilingGroup":{
+          "shape":"ProfilingGroupDescription",
+          "documentation":"<p>Updated information about the profiling group.</p>"
+        }
+      },
+      "documentation":"<p>The structure representing the updateProfilingGroupResponse.</p>",
+      "payload":"profilingGroup"
+    },
+    "ValidationException":{
+      "type":"structure",
+      "required":["message"],
+      "members":{
+        "message":{"shape":"String"}
+      },
+      "documentation":"<p>The parameter is not valid.</p>",
+      "error":{
+        "httpStatusCode":400,
+        "senderFault":true
+      },
+      "exception":true
+    }
+  },
+  "documentation":"<p>This section provides documentation for the Amazon CodeGuru Profiler API operations.</p>"
+}
diff --git a/services/codegurureviewer/pom.xml b/services/codegurureviewer/pom.xml
new file mode 100644
index 000000000000..9675d92d2892
--- /dev/null
+++ b/services/codegurureviewer/pom.xml
@@ -0,0 +1,60 @@
+<?xml version="1.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.
+  -->
+
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>software.amazon.awssdk</groupId>
+        <artifactId>services</artifactId>
+        <version>2.11.8-SNAPSHOT</version>
+    </parent>
+    <artifactId>codegurureviewer</artifactId>
+    <name>AWS Java SDK :: Services :: CodeGuru Reviewer</name>
+    <description>The AWS Java SDK for CodeGuru Reviewer module holds the client classes that are used for
+        communicating with CodeGuru Reviewer.
+    </description>
+    <url>https://aws.amazon.com/sdkforjava</url>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifestEntries>
+                            <Automatic-Module-Name>software.amazon.awssdk.services.codegurureviewer</Automatic-Module-Name>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>protocol-core</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>aws-json-protocol</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/services/codegurureviewer/src/main/resources/codegen-resources/paginators-1.json b/services/codegurureviewer/src/main/resources/codegen-resources/paginators-1.json
new file mode 100644
index 000000000000..bbc1f584fdd7
--- /dev/null
+++ b/services/codegurureviewer/src/main/resources/codegen-resources/paginators-1.json
@@ -0,0 +1,10 @@
+{
+  "pagination": {
+    "ListRepositoryAssociations": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "MaxResults",
+      "result_key": "RepositoryAssociationSummaries"
+    }
+  }
+}
diff --git a/services/codegurureviewer/src/main/resources/codegen-resources/service-2.json b/services/codegurureviewer/src/main/resources/codegen-resources/service-2.json
new file mode 100644
index 000000000000..f7c36673e07a
--- /dev/null
+++ b/services/codegurureviewer/src/main/resources/codegen-resources/service-2.json
@@ -0,0 +1,447 @@
+{
+  "version":"2.0",
+  "metadata":{
+    "apiVersion":"2019-09-19",
+    "endpointPrefix":"codeguru-reviewer",
+    "jsonVersion":"1.1",
+    "protocol":"rest-json",
+    "serviceAbbreviation":"CodeGuruReviewer",
+    "serviceFullName":"Amazon CodeGuru Reviewer",
+    "serviceId":"CodeGuru Reviewer",
+    "signatureVersion":"v4",
+    "signingName":"codeguru-reviewer",
+    "uid":"codeguru-reviewer-2019-09-19"
+  },
+  "operations":{
+    "AssociateRepository":{
+      "name":"AssociateRepository",
+      "http":{
+        "method":"POST",
+        "requestUri":"/associations"
+      },
+      "input":{"shape":"AssociateRepositoryRequest"},
+      "output":{"shape":"AssociateRepositoryResponse"},
+      "errors":[
+        {"shape":"InternalServerException"},
+        {"shape":"ValidationException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"ConflictException"},
+        {"shape":"ThrottlingException"}
+      ],
+      "documentation":"<p>Associates an AWS CodeCommit repository with Amazon CodeGuru Reviewer. When you associate an AWS CodeCommit repository with Amazon CodeGuru Reviewer, Amazon CodeGuru Reviewer will provide recommendations for each pull request. You can view recommendations in the AWS CodeCommit repository.</p> <p>You can associate a GitHub repository using the Amazon CodeGuru Reviewer console.</p>"
+    },
+    "DescribeRepositoryAssociation":{
+      "name":"DescribeRepositoryAssociation",
+      "http":{
+        "method":"GET",
+        "requestUri":"/associations/{AssociationArn}"
+      },
+      "input":{"shape":"DescribeRepositoryAssociationRequest"},
+      "output":{"shape":"DescribeRepositoryAssociationResponse"},
+      "errors":[
+        {"shape":"NotFoundException"},
+        {"shape":"InternalServerException"},
+        {"shape":"ValidationException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"ThrottlingException"}
+      ],
+      "documentation":"<p>Describes a repository association.</p>"
+    },
+    "DisassociateRepository":{
+      "name":"DisassociateRepository",
+      "http":{
+        "method":"DELETE",
+        "requestUri":"/associations/{AssociationArn}"
+      },
+      "input":{"shape":"DisassociateRepositoryRequest"},
+      "output":{"shape":"DisassociateRepositoryResponse"},
+      "errors":[
+        {"shape":"NotFoundException"},
+        {"shape":"InternalServerException"},
+        {"shape":"ValidationException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"ConflictException"},
+        {"shape":"ThrottlingException"}
+      ],
+      "documentation":"<p>Removes the association between Amazon CodeGuru Reviewer and a repository.</p>"
+    },
+    "ListRepositoryAssociations":{
+      "name":"ListRepositoryAssociations",
+      "http":{
+        "method":"GET",
+        "requestUri":"/associations"
+      },
+      "input":{"shape":"ListRepositoryAssociationsRequest"},
+      "output":{"shape":"ListRepositoryAssociationsResponse"},
+      "errors":[
+        {"shape":"InternalServerException"},
+        {"shape":"ValidationException"},
+        {"shape":"ThrottlingException"}
+      ],
+      "documentation":"<p>Lists repository associations. You can optionally filter on one or more of the following recommendation properties: provider types, states, names, and owners.</p>"
+    }
+  },
+  "shapes":{
+    "AccessDeniedException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p>You do not have sufficient access to perform this action.</p>",
+      "error":{"httpStatusCode":403},
+      "exception":true
+    },
+    "Arn":{
+      "type":"string",
+      "max":1600,
+      "min":1,
+      "pattern":"^arn:aws[^:\\s]*:codeguru-reviewer:[^:\\s]+:[\\d]{12}:[a-z]+:[\\w-]+$"
+    },
+    "AssociateRepositoryRequest":{
+      "type":"structure",
+      "required":["Repository"],
+      "members":{
+        "Repository":{
+          "shape":"Repository",
+          "documentation":"<p>The repository to associate.</p>"
+        },
+        "ClientRequestToken":{
+          "shape":"ClientRequestToken",
+          "documentation":"<p>Unique, case-sensitive identifier that you provide to ensure the idempotency of the request.</p> <p>If you want to add a new repository association, this parameter specifies a unique identifier for the new repository association that helps ensure idempotency.</p> <p>If you use the AWS CLI or one of the AWS SDK to call this operation, then you can leave this parameter empty. The CLI or SDK generates a random UUID for you and includes that in the request. If you don't use the SDK and instead generate a raw HTTP request to the Secrets Manager service endpoint, then you must generate a ClientRequestToken yourself for new versions and include that value in the request.</p> <p>You typically only need to interact with this value if you implement your own retry logic and want to ensure that a given repository association is not created twice. We recommend that you generate a UUID-type value to ensure uniqueness within the specified repository association.</p> <p>Amazon CodeGuru Reviewer uses this value to prevent the accidental creation of duplicate repository associations if there are failures and retries. </p>",
+          "idempotencyToken":true
+        }
+      }
+    },
+    "AssociateRepositoryResponse":{
+      "type":"structure",
+      "members":{
+        "RepositoryAssociation":{
+          "shape":"RepositoryAssociation",
+          "documentation":"<p>Information about the repository association.</p>"
+        }
+      }
+    },
+    "AssociationId":{
+      "type":"string",
+      "max":64,
+      "min":1
+    },
+    "ClientRequestToken":{
+      "type":"string",
+      "max":64,
+      "min":1,
+      "pattern":"^[\\w-]+$"
+    },
+    "CodeCommitRepository":{
+      "type":"structure",
+      "required":["Name"],
+      "members":{
+        "Name":{
+          "shape":"Name",
+          "documentation":"<p>The name of the AWS CodeCommit repository.</p>"
+        }
+      },
+      "documentation":"<p>Information about an AWS CodeCommit repository.</p>"
+    },
+    "ConflictException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p>The requested operation would cause a conflict with the current state of a service resource associated with the request. Resolve the conflict before retrying this request. </p>",
+      "error":{"httpStatusCode":409},
+      "exception":true
+    },
+    "DescribeRepositoryAssociationRequest":{
+      "type":"structure",
+      "required":["AssociationArn"],
+      "members":{
+        "AssociationArn":{
+          "shape":"Arn",
+          "documentation":"<p>The Amazon Resource Name (ARN) identifying the association.</p>",
+          "location":"uri",
+          "locationName":"AssociationArn"
+        }
+      }
+    },
+    "DescribeRepositoryAssociationResponse":{
+      "type":"structure",
+      "members":{
+        "RepositoryAssociation":{
+          "shape":"RepositoryAssociation",
+          "documentation":"<p>Information about the repository association.</p>"
+        }
+      }
+    },
+    "DisassociateRepositoryRequest":{
+      "type":"structure",
+      "required":["AssociationArn"],
+      "members":{
+        "AssociationArn":{
+          "shape":"Arn",
+          "documentation":"<p>The Amazon Resource Name (ARN) identifying the association.</p>",
+          "location":"uri",
+          "locationName":"AssociationArn"
+        }
+      }
+    },
+    "DisassociateRepositoryResponse":{
+      "type":"structure",
+      "members":{
+        "RepositoryAssociation":{
+          "shape":"RepositoryAssociation",
+          "documentation":"<p>Information about the disassociated repository.</p>"
+        }
+      }
+    },
+    "ErrorMessage":{"type":"string"},
+    "InternalServerException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p>The server encountered an internal error and is unable to complete the request.</p>",
+      "error":{"httpStatusCode":500},
+      "exception":true,
+      "fault":true
+    },
+    "ListRepositoryAssociationsRequest":{
+      "type":"structure",
+      "members":{
+        "ProviderTypes":{
+          "shape":"ProviderTypes",
+          "documentation":"<p>List of provider types to use as a filter.</p>",
+          "location":"querystring",
+          "locationName":"ProviderType"
+        },
+        "States":{
+          "shape":"RepositoryAssociationStates",
+          "documentation":"<p>List of states to use as a filter.</p>",
+          "location":"querystring",
+          "locationName":"State"
+        },
+        "Names":{
+          "shape":"Names",
+          "documentation":"<p>List of names to use as a filter.</p>",
+          "location":"querystring",
+          "locationName":"Name"
+        },
+        "Owners":{
+          "shape":"Owners",
+          "documentation":"<p>List of owners to use as a filter. For AWS CodeCommit, the owner is the AWS account id. For GitHub, it is the GitHub account name.</p>",
+          "location":"querystring",
+          "locationName":"Owner"
+        },
+        "MaxResults":{
+          "shape":"MaxResults",
+          "documentation":"<p>The maximum number of repository association results returned by <code>ListRepositoryAssociations</code> in paginated output. When this parameter is used, <code>ListRepositoryAssociations</code> only returns <code>maxResults</code> results in a single page along with a <code>nextToken</code> response element. The remaining results of the initial request can be seen by sending another <code>ListRepositoryAssociations</code> request with the returned <code>nextToken</code> value. This value can be between 1 and 100. If this parameter is not used, then <code>ListRepositoryAssociations</code> returns up to 100 results and a <code>nextToken</code> value if applicable. </p>",
+          "location":"querystring",
+          "locationName":"MaxResults"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>The <code>nextToken</code> value returned from a previous paginated <code>ListRepositoryAssociations</code> request where <code>maxResults</code> was used and the results exceeded the value of that parameter. Pagination continues from the end of the previous results that returned the <code>nextToken</code> value. </p> <note> <p>This token should be treated as an opaque identifier that is only used to retrieve the next items in a list and not for other programmatic purposes.</p> </note>",
+          "location":"querystring",
+          "locationName":"NextToken"
+        }
+      }
+    },
+    "ListRepositoryAssociationsResponse":{
+      "type":"structure",
+      "members":{
+        "RepositoryAssociationSummaries":{
+          "shape":"RepositoryAssociationSummaries",
+          "documentation":"<p>A list of repository associations that meet the criteria of the request.</p>"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>The <code>nextToken</code> value to include in a future <code>ListRecommendations</code> request. When the results of a <code>ListRecommendations</code> request exceed <code>maxResults</code>, this value can be used to retrieve the next page of results. This value is <code>null</code> when there are no more results to return. </p>"
+        }
+      }
+    },
+    "MaxResults":{
+      "type":"integer",
+      "max":100,
+      "min":1
+    },
+    "Name":{
+      "type":"string",
+      "max":100,
+      "min":1
+    },
+    "Names":{
+      "type":"list",
+      "member":{"shape":"Name"},
+      "max":3,
+      "min":1
+    },
+    "NextToken":{
+      "type":"string",
+      "max":2048,
+      "min":1
+    },
+    "NotFoundException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p>The resource specified in the request was not found.</p>",
+      "error":{"httpStatusCode":404},
+      "exception":true
+    },
+    "Owner":{
+      "type":"string",
+      "max":100,
+      "min":1
+    },
+    "Owners":{
+      "type":"list",
+      "member":{"shape":"Owner"},
+      "max":3,
+      "min":1
+    },
+    "ProviderType":{
+      "type":"string",
+      "enum":[
+        "CodeCommit",
+        "GitHub"
+      ]
+    },
+    "ProviderTypes":{
+      "type":"list",
+      "member":{"shape":"ProviderType"},
+      "max":3,
+      "min":1
+    },
+    "Repository":{
+      "type":"structure",
+      "members":{
+        "CodeCommit":{
+          "shape":"CodeCommitRepository",
+          "documentation":"<p>Information about an AWS CodeCommit repository.</p>"
+        }
+      },
+      "documentation":"<p>Information about a repository.</p>"
+    },
+    "RepositoryAssociation":{
+      "type":"structure",
+      "members":{
+        "AssociationId":{
+          "shape":"AssociationId",
+          "documentation":"<p>The id of the repository association.</p>"
+        },
+        "AssociationArn":{
+          "shape":"Arn",
+          "documentation":"<p>The Amazon Resource Name (ARN) identifying the repository association.</p>"
+        },
+        "Name":{
+          "shape":"Name",
+          "documentation":"<p>The name of the repository.</p>"
+        },
+        "Owner":{
+          "shape":"Owner",
+          "documentation":"<p>The owner of the repository.</p>"
+        },
+        "ProviderType":{
+          "shape":"ProviderType",
+          "documentation":"<p>The provider type of the repository association.</p>"
+        },
+        "State":{
+          "shape":"RepositoryAssociationState",
+          "documentation":"<p>The state of the repository association.</p>"
+        },
+        "StateReason":{
+          "shape":"StateReason",
+          "documentation":"<p>A description of why the repository association is in the current state.</p>"
+        },
+        "LastUpdatedTimeStamp":{
+          "shape":"TimeStamp",
+          "documentation":"<p>The time, in milliseconds since the epoch, when the repository association was last updated.</p>"
+        },
+        "CreatedTimeStamp":{
+          "shape":"TimeStamp",
+          "documentation":"<p>The time, in milliseconds since the epoch, when the repository association was created.</p>"
+        }
+      },
+      "documentation":"<p>Information about a repository association.</p>"
+    },
+    "RepositoryAssociationState":{
+      "type":"string",
+      "enum":[
+        "Associated",
+        "Associating",
+        "Failed",
+        "Disassociating"
+      ]
+    },
+    "RepositoryAssociationStates":{
+      "type":"list",
+      "member":{"shape":"RepositoryAssociationState"},
+      "max":3,
+      "min":1
+    },
+    "RepositoryAssociationSummaries":{
+      "type":"list",
+      "member":{"shape":"RepositoryAssociationSummary"}
+    },
+    "RepositoryAssociationSummary":{
+      "type":"structure",
+      "members":{
+        "AssociationArn":{
+          "shape":"Arn",
+          "documentation":"<p>The Amazon Resource Name (ARN) identifying the repository association.</p>"
+        },
+        "LastUpdatedTimeStamp":{
+          "shape":"TimeStamp",
+          "documentation":"<p>The time, in milliseconds since the epoch, since the repository association was last updated. </p>"
+        },
+        "AssociationId":{
+          "shape":"AssociationId",
+          "documentation":"<p>The repository association ID.</p>"
+        },
+        "Name":{
+          "shape":"Name",
+          "documentation":"<p>The name of the repository association.</p>"
+        },
+        "Owner":{
+          "shape":"Owner",
+          "documentation":"<p>The owner of the repository association.</p>"
+        },
+        "ProviderType":{
+          "shape":"ProviderType",
+          "documentation":"<p>The provider type of the repository association.</p>"
+        },
+        "State":{
+          "shape":"RepositoryAssociationState",
+          "documentation":"<p>The state of the repository association.</p> <dl> <dt>Associated</dt> <dd> <p>Amazon CodeGuru Reviewer is associated with the repository. </p> </dd> <dt>Associating</dt> <dd> <p>The association is in progress. </p> </dd> <dt>Failed</dt> <dd> <p>The association failed. For more information about troubleshooting (or why it failed), see [troubleshooting topic]. </p> </dd> <dt>Disassociating</dt> <dd> <p>Amazon CodeGuru Reviewer is in the process of disassociating with the repository. </p> </dd> </dl>"
+        }
+      },
+      "documentation":"<p>Information about a repository association.</p>"
+    },
+    "StateReason":{
+      "type":"string",
+      "max":256,
+      "min":0
+    },
+    "ThrottlingException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p>The request was denied due to request throttling.</p>",
+      "error":{"httpStatusCode":429},
+      "exception":true
+    },
+    "TimeStamp":{"type":"timestamp"},
+    "ValidationException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p>The input fails to satisfy the specified constraints.</p>",
+      "error":{"httpStatusCode":400},
+      "exception":true
+    }
+  },
+  "documentation":"<p>This section provides documentation for the Amazon CodeGuru Reviewer API operations.</p>"
+}
diff --git a/services/codepipeline/build.properties b/services/codepipeline/build.properties
index ecf2dae6fcb1..15ec2da1fc71 100644
--- a/services/codepipeline/build.properties
+++ b/services/codepipeline/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/codepipeline/pom.xml b/services/codepipeline/pom.xml
index d3a9debbc714..765e8524ca62 100644
--- a/services/codepipeline/pom.xml
+++ b/services/codepipeline/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>codepipeline</artifactId>
     <name>AWS Java SDK :: Services :: AWS CodePipeline</name>
diff --git a/services/codepipeline/src/it/java/software/amazon/awssdk/services/codepipeline/AwsCodePipelineClientIntegrationTest.java b/services/codepipeline/src/it/java/software/amazon/awssdk/services/codepipeline/AwsCodePipelineClientIntegrationTest.java
index af6727d36743..4e9a440d0594 100644
--- a/services/codepipeline/src/it/java/software/amazon/awssdk/services/codepipeline/AwsCodePipelineClientIntegrationTest.java
+++ b/services/codepipeline/src/it/java/software/amazon/awssdk/services/codepipeline/AwsCodePipelineClientIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/codepipeline/src/main/resources/codegen-resources/service-2.json b/services/codepipeline/src/main/resources/codegen-resources/service-2.json
index aaa8d241e857..3ba303badb11 100644
--- a/services/codepipeline/src/main/resources/codegen-resources/service-2.json
+++ b/services/codepipeline/src/main/resources/codegen-resources/service-2.json
@@ -177,7 +177,7 @@
         {"shape":"ValidationException"},
         {"shape":"JobNotFoundException"}
       ],
-      "documentation":"<p>Returns information about a job. Used for custom actions only.</p> <important> <p>When this API is called, AWS CodePipeline returns temporary credentials for the Amazon S3 bucket used to store artifacts for the pipeline, if the action requires access to that Amazon S3 bucket for input or output artifacts. This API also returns any secret values defined for the action.</p> </important>"
+      "documentation":"<p>Returns information about a job. Used for custom actions only.</p> <important> <p>When this API is called, AWS CodePipeline returns temporary credentials for the S3 bucket used to store artifacts for the pipeline, if the action requires access to that S3 bucket for input or output artifacts. This API also returns any secret values defined for the action.</p> </important>"
     },
     "GetPipeline":{
       "name":"GetPipeline",
@@ -237,7 +237,7 @@
         {"shape":"InvalidClientTokenException"},
         {"shape":"InvalidJobException"}
       ],
-      "documentation":"<p>Requests the details of a job for a third party action. Used for partner actions only.</p> <important> <p>When this API is called, AWS CodePipeline returns temporary credentials for the Amazon S3 bucket used to store artifacts for the pipeline, if the action requires access to that Amazon S3 bucket for input or output artifacts. This API also returns any secret values defined for the action.</p> </important>"
+      "documentation":"<p>Requests the details of a job for a third party action. Used for partner actions only.</p> <important> <p>When this API is called, AWS CodePipeline returns temporary credentials for the S3 bucket used to store artifacts for the pipeline, if the action requires access to that S3 bucket for input or output artifacts. This API also returns any secret values defined for the action.</p> </important>"
     },
     "ListActionExecutions":{
       "name":"ListActionExecutions",
@@ -340,7 +340,7 @@
         {"shape":"ValidationException"},
         {"shape":"ActionTypeNotFoundException"}
       ],
-      "documentation":"<p>Returns information about any jobs for AWS CodePipeline to act on. <code>PollForJobs</code> is valid only for action types with \"Custom\" in the owner field. If the action type contains \"AWS\" or \"ThirdParty\" in the owner field, the <code>PollForJobs</code> action returns an error.</p> <important> <p>When this API is called, AWS CodePipeline returns temporary credentials for the Amazon S3 bucket used to store artifacts for the pipeline, if the action requires access to that Amazon S3 bucket for input or output artifacts. This API also returns any secret values defined for the action.</p> </important>"
+      "documentation":"<p>Returns information about any jobs for AWS CodePipeline to act on. <code>PollForJobs</code> is valid only for action types with \"Custom\" in the owner field. If the action type contains \"AWS\" or \"ThirdParty\" in the owner field, the <code>PollForJobs</code> action returns an error.</p> <important> <p>When this API is called, AWS CodePipeline returns temporary credentials for the S3 bucket used to store artifacts for the pipeline, if the action requires access to that S3 bucket for input or output artifacts. This API also returns any secret values defined for the action.</p> </important>"
     },
     "PollForThirdPartyJobs":{
       "name":"PollForThirdPartyJobs",
@@ -354,7 +354,7 @@
         {"shape":"ActionTypeNotFoundException"},
         {"shape":"ValidationException"}
       ],
-      "documentation":"<p>Determines whether there are any third party jobs for a job worker to act on. Used for partner actions only.</p> <important> <p>When this API is called, AWS CodePipeline returns temporary credentials for the Amazon S3 bucket used to store artifacts for the pipeline, if the action requires access to that Amazon S3 bucket for input or output artifacts.</p> </important>"
+      "documentation":"<p>Determines whether there are any third party jobs for a job worker to act on. Used for partner actions only.</p> <important> <p>When this API is called, AWS CodePipeline returns temporary credentials for the S3 bucket used to store artifacts for the pipeline, if the action requires access to that S3 bucket for input or output artifacts.</p> </important>"
     },
     "PutActionRevision":{
       "name":"PutActionRevision",
@@ -414,7 +414,8 @@
       "errors":[
         {"shape":"ValidationException"},
         {"shape":"JobNotFoundException"},
-        {"shape":"InvalidJobStateException"}
+        {"shape":"InvalidJobStateException"},
+        {"shape":"OutputVariablesSizeExceededException"}
       ],
       "documentation":"<p>Represents the success of a job as returned to the pipeline by a job worker. Used for custom actions only.</p>"
     },
@@ -513,6 +514,22 @@
       ],
       "documentation":"<p>Starts the specified pipeline. Specifically, it begins processing the latest commit to the source location specified as part of the pipeline.</p>"
     },
+    "StopPipelineExecution":{
+      "name":"StopPipelineExecution",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"StopPipelineExecutionInput"},
+      "output":{"shape":"StopPipelineExecutionOutput"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"PipelineNotFoundException"},
+        {"shape":"PipelineExecutionNotStoppableException"},
+        {"shape":"DuplicatedStopRequestException"}
+      ],
+      "documentation":"<p>Stops the specified pipeline execution. You choose to either stop the pipeline execution by completing in-progress actions without starting subsequent actions, or by abandoning in-progress actions. While completing or abandoning in-progress actions, the pipeline execution is in a <code>Stopping</code> state. After all in-progress actions are completed or abandoned, the pipeline execution is in a <code>Stopped</code> state.</p>"
+    },
     "TagResource":{
       "name":"TagResource",
       "http":{
@@ -594,7 +611,7 @@
           "documentation":"<p>The token for the session.</p>"
         }
       },
-      "documentation":"<p>Represents an AWS session credentials object. These credentials are temporary credentials that are issued by AWS Secure Token Service (STS). They can be used to access input and output artifacts in the Amazon S3 bucket used to store artifact for the pipeline in AWS CodePipeline.</p>",
+      "documentation":"<p>Represents an AWS session credentials object. These credentials are temporary credentials that are issued by AWS Secure Token Service (STS). They can be used to access input and output artifacts in the S3 bucket used to store artifact for the pipeline in AWS CodePipeline.</p>",
       "sensitive":true
     },
     "AccessKeyId":{"type":"string"},
@@ -810,6 +827,10 @@
         "region":{
           "shape":"AWSRegionName",
           "documentation":"<p>The action declaration's AWS Region, such as us-east-1.</p>"
+        },
+        "namespace":{
+          "shape":"ActionNamespace",
+          "documentation":"<p>The variable namespace associated with the action. All variables produced as output by this action fall under this namespace.</p>"
         }
       },
       "documentation":"<p>Represents information about an action declaration.</p>"
@@ -925,6 +946,10 @@
           "shape":"ActionConfigurationMap",
           "documentation":"<p>Configuration data for an action execution.</p>"
         },
+        "resolvedConfiguration":{
+          "shape":"ResolvedActionConfigurationMap",
+          "documentation":"<p>Configuration data for an action execution with all variable references replaced with their real values for the execution.</p>"
+        },
         "roleArn":{
           "shape":"RoleArn",
           "documentation":"<p>The ARN of the IAM service role that performs the declared action. This is assumed through the roleArn for the pipeline. </p>"
@@ -936,6 +961,10 @@
         "inputArtifacts":{
           "shape":"ArtifactDetailList",
           "documentation":"<p>Details of input artifacts of the action that correspond to the action execution.</p>"
+        },
+        "namespace":{
+          "shape":"ActionNamespace",
+          "documentation":"<p>The variable namespace associated with the action. All variables produced as output by this action fall under this namespace.</p>"
         }
       },
       "documentation":"<p>Input information used for an action execution.</p>"
@@ -950,6 +979,10 @@
         "executionResult":{
           "shape":"ActionExecutionResult",
           "documentation":"<p>Execution result information listed in the output details for an action execution.</p>"
+        },
+        "outputVariables":{
+          "shape":"OutputVariablesMap",
+          "documentation":"<p>The outputVariables field shows the key-value pairs that were output as part of that execution.</p>"
         }
       },
       "documentation":"<p>Output details listed for an action execution, such as the action execution result.</p>"
@@ -976,6 +1009,7 @@
       "type":"string",
       "enum":[
         "InProgress",
+        "Abandoned",
         "Succeeded",
         "Failed"
       ]
@@ -987,6 +1021,12 @@
       "min":1,
       "pattern":"[A-Za-z0-9.@\\-_]+"
     },
+    "ActionNamespace":{
+      "type":"string",
+      "max":100,
+      "min":1,
+      "pattern":"[A-Za-z0-9@\\-_]+"
+    },
     "ActionNotFoundException":{
       "type":"structure",
       "members":{
@@ -1266,7 +1306,7 @@
         },
         "s3Location":{
           "shape":"S3ArtifactLocation",
-          "documentation":"<p>The Amazon S3 bucket that contains the artifact.</p>"
+          "documentation":"<p>The S3 bucket that contains the artifact.</p>"
         }
       },
       "documentation":"<p>Represents information about the location of an artifact.</p>"
@@ -1328,14 +1368,14 @@
         },
         "location":{
           "shape":"ArtifactStoreLocation",
-          "documentation":"<p>The Amazon S3 bucket used for storing the artifacts for a pipeline. You can specify the name of an S3 bucket but not a folder in the bucket. A folder to contain the pipeline artifacts is created for you based on the name of the pipeline. You can use any Amazon S3 bucket in the same AWS Region as the pipeline to store your pipeline artifacts.</p>"
+          "documentation":"<p>The S3 bucket used for storing the artifacts for a pipeline. You can specify the name of an S3 bucket but not a folder in the bucket. A folder to contain the pipeline artifacts is created for you based on the name of the pipeline. You can use any S3 bucket in the same AWS Region as the pipeline to store your pipeline artifacts.</p>"
         },
         "encryptionKey":{
           "shape":"EncryptionKey",
           "documentation":"<p>The encryption key used to encrypt the data in the artifact store, such as an AWS Key Management Service (AWS KMS) key. If this is undefined, the default key for Amazon S3 is used.</p>"
         }
       },
-      "documentation":"<p>The Amazon S3 bucket where artifacts for the pipeline are stored.</p> <note> <p>You must include either <code>artifactStore</code> or <code>artifactStores</code> in your pipeline, but you cannot use both. If you create a cross-region action in your pipeline, you must use <code>artifactStores</code>.</p> </note>"
+      "documentation":"<p>The S3 bucket where artifacts for the pipeline are stored.</p> <note> <p>You must include either <code>artifactStore</code> or <code>artifactStores</code> in your pipeline, but you cannot use both. If you create a cross-region action in your pipeline, you must use <code>artifactStores</code>.</p> </note>"
     },
     "ArtifactStoreLocation":{
       "type":"string",
@@ -1626,6 +1666,14 @@
       "min":1,
       "pattern":"[a-zA-Z0-9!@ \\(\\)\\.\\*\\?\\-]+"
     },
+    "DuplicatedStopRequestException":{
+      "type":"structure",
+      "members":{
+        "message":{"shape":"Message"}
+      },
+      "documentation":"<p>The pipeline execution is already in a <code>Stopping</code> state. If you already chose to stop and wait, you cannot make that request again. You can choose to stop and abandon now, but be aware that this option can lead to failed tasks or out of sequence tasks. If you already chose to stop and abandon, you cannot make that request again.</p>",
+      "exception":true
+    },
     "EnableStageTransitionInput":{
       "type":"structure",
       "required":[
@@ -2073,7 +2121,7 @@
         },
         "artifactCredentials":{
           "shape":"AWSSessionCredentials",
-          "documentation":"<p>Represents an AWS session credentials object. These credentials are temporary credentials that are issued by AWS Secure Token Service (STS). They can be used to access input and output artifacts in the Amazon S3 bucket used to store artifacts for the pipeline in AWS CodePipeline.</p>"
+          "documentation":"<p>Represents an AWS session credentials object. These credentials are temporary credentials that are issued by AWS Secure Token Service (STS). They can be used to access input and output artifacts in the S3 bucket used to store artifacts for the pipeline in AWS CodePipeline.</p>"
         },
         "continuationToken":{
           "shape":"ContinuationToken",
@@ -2423,6 +2471,24 @@
       "type":"list",
       "member":{"shape":"OutputArtifact"}
     },
+    "OutputVariablesKey":{
+      "type":"string",
+      "pattern":"[A-Za-z0-9@\\-_]+"
+    },
+    "OutputVariablesMap":{
+      "type":"map",
+      "key":{"shape":"OutputVariablesKey"},
+      "value":{"shape":"OutputVariablesValue"}
+    },
+    "OutputVariablesSizeExceededException":{
+      "type":"structure",
+      "members":{
+        "message":{"shape":"Message"}
+      },
+      "documentation":"<p>Exceeded the total size limit for all variables in the pipeline.</p>",
+      "exception":true
+    },
+    "OutputVariablesValue":{"type":"string"},
     "Percentage":{
       "type":"integer",
       "max":100,
@@ -2476,7 +2542,7 @@
         },
         "artifactStore":{
           "shape":"ArtifactStore",
-          "documentation":"<p>Represents information about the Amazon S3 bucket where artifacts are stored for the pipeline.</p> <note> <p>You must include either <code>artifactStore</code> or <code>artifactStores</code> in your pipeline, but you cannot use both. If you create a cross-region action in your pipeline, you must use <code>artifactStores</code>.</p> </note>"
+          "documentation":"<p>Represents information about the S3 bucket where artifacts are stored for the pipeline.</p> <note> <p>You must include either <code>artifactStore</code> or <code>artifactStores</code> in your pipeline, but you cannot use both. If you create a cross-region action in your pipeline, you must use <code>artifactStores</code>.</p> </note>"
         },
         "artifactStores":{
           "shape":"ArtifactStoreMap",
@@ -2498,11 +2564,11 @@
       "members":{
         "pipelineName":{
           "shape":"PipelineName",
-          "documentation":"<p>The name of the pipeline that was executed.</p>"
+          "documentation":"<p>The name of the pipeline with the specified pipeline execution.</p>"
         },
         "pipelineVersion":{
           "shape":"PipelineVersion",
-          "documentation":"<p>The version number of the pipeline that was executed.</p>"
+          "documentation":"<p>The version number of the pipeline with the specified pipeline execution.</p>"
         },
         "pipelineExecutionId":{
           "shape":"PipelineExecutionId",
@@ -2510,7 +2576,7 @@
         },
         "status":{
           "shape":"PipelineExecutionStatus",
-          "documentation":"<p>The status of the pipeline execution.</p> <ul> <li> <p>InProgress: The pipeline execution is currently running.</p> </li> <li> <p>Succeeded: The pipeline execution was completed successfully. </p> </li> <li> <p>Superseded: While this pipeline execution was waiting for the next stage to be completed, a newer pipeline execution advanced and continued through the pipeline instead. </p> </li> <li> <p>Failed: The pipeline execution was not completed successfully.</p> </li> </ul>"
+          "documentation":"<p>The status of the pipeline execution.</p> <ul> <li> <p>InProgress: The pipeline execution is currently running.</p> </li> <li> <p>Stopped: The pipeline execution was manually stopped. For more information, see <a href=\"https://docs.aws.amazon.com/codepipeline/latest/userguide/concepts.html#concepts-executions-stopped\">Stopped Executions</a>.</p> </li> <li> <p>Stopping: The pipeline execution received a request to be manually stopped. Depending on the selected stop mode, the execution is either completing or abandoning in-progress actions. For more information, see <a href=\"https://docs.aws.amazon.com/codepipeline/latest/userguide/concepts.html#concepts-executions-stopped\">Stopped Executions</a>.</p> </li> <li> <p>Succeeded: The pipeline execution was completed successfully. </p> </li> <li> <p>Superseded: While this pipeline execution was waiting for the next stage to be completed, a newer pipeline execution advanced and continued through the pipeline instead. For more information, see <a href=\"https://docs.aws.amazon.com/codepipeline/latest/userguide/concepts.html#concepts-superseded\">Superseded Executions</a>.</p> </li> <li> <p>Failed: The pipeline execution was not completed successfully.</p> </li> </ul>"
         },
         "artifactRevisions":{
           "shape":"ArtifactRevisionList",
@@ -2530,10 +2596,20 @@
       "documentation":"<p>The pipeline execution was specified in an invalid format or cannot be found, or an execution ID does not belong to the specified pipeline. </p>",
       "exception":true
     },
+    "PipelineExecutionNotStoppableException":{
+      "type":"structure",
+      "members":{
+        "message":{"shape":"Message"}
+      },
+      "documentation":"<p>Unable to stop the pipeline execution. The execution might already be in a <code>Stopped</code> state, or it might no longer be in progress.</p>",
+      "exception":true
+    },
     "PipelineExecutionStatus":{
       "type":"string",
       "enum":[
         "InProgress",
+        "Stopped",
+        "Stopping",
         "Succeeded",
         "Superseded",
         "Failed"
@@ -2548,7 +2624,7 @@
         },
         "status":{
           "shape":"PipelineExecutionStatus",
-          "documentation":"<p>The status of the pipeline execution.</p> <ul> <li> <p>InProgress: The pipeline execution is currently running.</p> </li> <li> <p>Succeeded: The pipeline execution was completed successfully. </p> </li> <li> <p>Superseded: While this pipeline execution was waiting for the next stage to be completed, a newer pipeline execution advanced and continued through the pipeline instead. </p> </li> <li> <p>Failed: The pipeline execution was not completed successfully.</p> </li> </ul>"
+          "documentation":"<p>The status of the pipeline execution.</p> <ul> <li> <p>InProgress: The pipeline execution is currently running.</p> </li> <li> <p>Stopped: The pipeline execution was manually stopped. For more information, see <a href=\"https://docs.aws.amazon.com/codepipeline/latest/userguide/concepts.html#concepts-executions-stopped\">Stopped Executions</a>.</p> </li> <li> <p>Stopping: The pipeline execution received a request to be manually stopped. Depending on the selected stop mode, the execution is either completing or abandoning in-progress actions. For more information, see <a href=\"https://docs.aws.amazon.com/codepipeline/latest/userguide/concepts.html#concepts-executions-stopped\">Stopped Executions</a>.</p> </li> <li> <p>Succeeded: The pipeline execution was completed successfully. </p> </li> <li> <p>Superseded: While this pipeline execution was waiting for the next stage to be completed, a newer pipeline execution advanced and continued through the pipeline instead. For more information, see <a href=\"https://docs.aws.amazon.com/codepipeline/latest/userguide/concepts.html#concepts-superseded\">Superseded Executions</a>.</p> </li> <li> <p>Failed: The pipeline execution was not completed successfully.</p> </li> </ul>"
         },
         "startTime":{
           "shape":"Timestamp",
@@ -2565,6 +2641,10 @@
         "trigger":{
           "shape":"ExecutionTrigger",
           "documentation":"<p>The interaction or event that started a pipeline execution, such as automated change detection or a <code>StartPipelineExecution</code> API call.</p>"
+        },
+        "stopTrigger":{
+          "shape":"StopExecutionTrigger",
+          "documentation":"<p>The interaction that stopped a pipeline execution.</p>"
         }
       },
       "documentation":"<p>Summary information about a pipeline execution.</p>"
@@ -2828,6 +2908,10 @@
         "executionDetails":{
           "shape":"ExecutionDetails",
           "documentation":"<p>The execution details of the successful job, such as the actions taken by the job worker.</p>"
+        },
+        "outputVariables":{
+          "shape":"OutputVariablesMap",
+          "documentation":"<p>Key-value pairs produced as output by a job worker that can be made available to a downstream action configuration. <code>outputVariables</code> can be included only when there is no continuation token on the request.</p>"
         }
       },
       "documentation":"<p>Represents the input of a <code>PutJobSuccessResult</code> action.</p>"
@@ -2929,6 +3013,11 @@
       "members":{
       }
     },
+    "ResolvedActionConfigurationMap":{
+      "type":"map",
+      "key":{"shape":"String"},
+      "value":{"shape":"String"}
+    },
     "ResourceArn":{
       "type":"string",
       "pattern":"arn:aws(-[\\w]+)*:codepipeline:.+:[0-9]{12}:.+"
@@ -3007,14 +3096,14 @@
       "members":{
         "bucketName":{
           "shape":"S3BucketName",
-          "documentation":"<p>The name of the Amazon S3 bucket.</p>"
+          "documentation":"<p>The name of the S3 bucket.</p>"
         },
         "objectKey":{
           "shape":"S3ObjectKey",
-          "documentation":"<p>The key of the object in the Amazon S3 bucket, which uniquely identifies the object in the bucket.</p>"
+          "documentation":"<p>The key of the object in the S3 bucket, which uniquely identifies the object in the bucket.</p>"
         }
       },
-      "documentation":"<p>The location of the Amazon S3 bucket that contains a revision.</p>"
+      "documentation":"<p>The location of the S3 bucket that contains a revision.</p>"
     },
     "S3Bucket":{
       "type":"string",
@@ -3134,6 +3223,8 @@
       "enum":[
         "InProgress",
         "Failed",
+        "Stopped",
+        "Stopping",
         "Succeeded"
       ]
     },
@@ -3220,6 +3311,55 @@
       },
       "documentation":"<p>Represents the output of a <code>StartPipelineExecution</code> action.</p>"
     },
+    "StopExecutionTrigger":{
+      "type":"structure",
+      "members":{
+        "reason":{
+          "shape":"StopPipelineExecutionReason",
+          "documentation":"<p>The user-specified reason the pipeline was stopped.</p>"
+        }
+      },
+      "documentation":"<p>The interaction that stopped a pipeline execution.</p>"
+    },
+    "StopPipelineExecutionInput":{
+      "type":"structure",
+      "required":[
+        "pipelineName",
+        "pipelineExecutionId"
+      ],
+      "members":{
+        "pipelineName":{
+          "shape":"PipelineName",
+          "documentation":"<p>The name of the pipeline to stop.</p>"
+        },
+        "pipelineExecutionId":{
+          "shape":"PipelineExecutionId",
+          "documentation":"<p>The ID of the pipeline execution to be stopped in the current stage. Use the <code>GetPipelineState</code> action to retrieve the current pipelineExecutionId.</p>"
+        },
+        "abandon":{
+          "shape":"Boolean",
+          "documentation":"<p>Use this option to stop the pipeline execution by abandoning, rather than finishing, in-progress actions.</p> <note> <p>This option can lead to failed or out-of-sequence tasks.</p> </note>"
+        },
+        "reason":{
+          "shape":"StopPipelineExecutionReason",
+          "documentation":"<p>Use this option to enter comments, such as the reason the pipeline was stopped.</p>"
+        }
+      }
+    },
+    "StopPipelineExecutionOutput":{
+      "type":"structure",
+      "members":{
+        "pipelineExecutionId":{
+          "shape":"PipelineExecutionId",
+          "documentation":"<p>The unique system-generated ID of the pipeline execution that was stopped.</p>"
+        }
+      }
+    },
+    "StopPipelineExecutionReason":{
+      "type":"string",
+      "max":200
+    },
+    "String":{"type":"string"},
     "Tag":{
       "type":"structure",
       "required":[
@@ -3317,7 +3457,7 @@
         },
         "artifactCredentials":{
           "shape":"AWSSessionCredentials",
-          "documentation":"<p>Represents an AWS session credentials object. These credentials are temporary credentials that are issued by AWS Secure Token Service (STS). They can be used to access input and output artifacts in the Amazon S3 bucket used to store artifact for the pipeline in AWS CodePipeline. </p>"
+          "documentation":"<p>Represents an AWS session credentials object. These credentials are temporary credentials that are issued by AWS Secure Token Service (STS). They can be used to access input and output artifacts in the S3 bucket used to store artifact for the pipeline in AWS CodePipeline. </p>"
         },
         "continuationToken":{
           "shape":"ContinuationToken",
@@ -3588,5 +3728,5 @@
       "min":1
     }
   },
-  "documentation":"<fullname>AWS CodePipeline</fullname> <p> <b>Overview</b> </p> <p>This is the AWS CodePipeline API Reference. This guide provides descriptions of the actions and data types for AWS CodePipeline. Some functionality for your pipeline can only be configured through the API. For more information, see the <a href=\"https://docs.aws.amazon.com/codepipeline/latest/userguide/welcome.html\">AWS CodePipeline User Guide</a>.</p> <p>You can use the AWS CodePipeline API to work with pipelines, stages, actions, and transitions.</p> <p> <i>Pipelines</i> are models of automated release processes. Each pipeline is uniquely named, and consists of stages, actions, and transitions. </p> <p>You can work with pipelines by calling:</p> <ul> <li> <p> <a>CreatePipeline</a>, which creates a uniquely named pipeline.</p> </li> <li> <p> <a>DeletePipeline</a>, which deletes the specified pipeline.</p> </li> <li> <p> <a>GetPipeline</a>, which returns information about the pipeline structure and pipeline metadata, including the pipeline Amazon Resource Name (ARN).</p> </li> <li> <p> <a>GetPipelineExecution</a>, which returns information about a specific execution of a pipeline.</p> </li> <li> <p> <a>GetPipelineState</a>, which returns information about the current state of the stages and actions of a pipeline.</p> </li> <li> <p> <a>ListActionExecutions</a>, which returns action-level details for past executions. The details include full stage and action-level details, including individual action duration, status, any errors that occurred during the execution, and input and output artifact location details.</p> </li> <li> <p> <a>ListPipelines</a>, which gets a summary of all of the pipelines associated with your account.</p> </li> <li> <p> <a>ListPipelineExecutions</a>, which gets a summary of the most recent executions for a pipeline.</p> </li> <li> <p> <a>StartPipelineExecution</a>, which runs the most recent revision of an artifact through the pipeline.</p> </li> <li> <p> <a>UpdatePipeline</a>, which updates a pipeline with edits or changes to the structure of the pipeline.</p> </li> </ul> <p>Pipelines include <i>stages</i>. Each stage contains one or more actions that must complete before the next stage begins. A stage results in success or failure. If a stage fails, the pipeline stops at that stage and remains stopped until either a new version of an artifact appears in the source location, or a user takes action to rerun the most recent artifact through the pipeline. You can call <a>GetPipelineState</a>, which displays the status of a pipeline, including the status of stages in the pipeline, or <a>GetPipeline</a>, which returns the entire structure of the pipeline, including the stages of that pipeline. For more information about the structure of stages and actions, see <a href=\"https://docs.aws.amazon.com/codepipeline/latest/userguide/pipeline-structure.html\">AWS CodePipeline Pipeline Structure Reference</a>.</p> <p>Pipeline stages include <i>actions</i> that are categorized into categories such as source or build actions performed in a stage of a pipeline. For example, you can use a source action to import artifacts into a pipeline from a source such as Amazon S3. Like stages, you do not work with actions directly in most cases, but you do define and interact with actions when working with pipeline operations such as <a>CreatePipeline</a> and <a>GetPipelineState</a>. Valid action categories are:</p> <ul> <li> <p>Source</p> </li> <li> <p>Build</p> </li> <li> <p>Test</p> </li> <li> <p>Deploy</p> </li> <li> <p>Approval</p> </li> <li> <p>Invoke</p> </li> </ul> <p>Pipelines also include <i>transitions</i>, which allow the transition of artifacts from one stage to the next in a pipeline after the actions in one stage complete.</p> <p>You can work with transitions by calling:</p> <ul> <li> <p> <a>DisableStageTransition</a>, which prevents artifacts from transitioning to the next stage in a pipeline.</p> </li> <li> <p> <a>EnableStageTransition</a>, which enables transition of artifacts between stages in a pipeline. </p> </li> </ul> <p> <b>Using the API to integrate with AWS CodePipeline</b> </p> <p>For third-party integrators or developers who want to create their own integrations with AWS CodePipeline, the expected sequence varies from the standard API user. To integrate with AWS CodePipeline, developers need to work with the following items:</p> <p> <b>Jobs</b>, which are instances of an action. For example, a job for a source action might import a revision of an artifact from a source. </p> <p>You can work with jobs by calling:</p> <ul> <li> <p> <a>AcknowledgeJob</a>, which confirms whether a job worker has received the specified job.</p> </li> <li> <p> <a>GetJobDetails</a>, which returns the details of a job.</p> </li> <li> <p> <a>PollForJobs</a>, which determines whether there are any jobs to act on.</p> </li> <li> <p> <a>PutJobFailureResult</a>, which provides details of a job failure. </p> </li> <li> <p> <a>PutJobSuccessResult</a>, which provides details of a job success.</p> </li> </ul> <p> <b>Third party jobs</b>, which are instances of an action created by a partner action and integrated into AWS CodePipeline. Partner actions are created by members of the AWS Partner Network.</p> <p>You can work with third party jobs by calling:</p> <ul> <li> <p> <a>AcknowledgeThirdPartyJob</a>, which confirms whether a job worker has received the specified job.</p> </li> <li> <p> <a>GetThirdPartyJobDetails</a>, which requests the details of a job for a partner action.</p> </li> <li> <p> <a>PollForThirdPartyJobs</a>, which determines whether there are any jobs to act on. </p> </li> <li> <p> <a>PutThirdPartyJobFailureResult</a>, which provides details of a job failure.</p> </li> <li> <p> <a>PutThirdPartyJobSuccessResult</a>, which provides details of a job success.</p> </li> </ul>"
+  "documentation":"<fullname>AWS CodePipeline</fullname> <p> <b>Overview</b> </p> <p>This is the AWS CodePipeline API Reference. This guide provides descriptions of the actions and data types for AWS CodePipeline. Some functionality for your pipeline can only be configured through the API. For more information, see the <a href=\"https://docs.aws.amazon.com/codepipeline/latest/userguide/welcome.html\">AWS CodePipeline User Guide</a>.</p> <p>You can use the AWS CodePipeline API to work with pipelines, stages, actions, and transitions.</p> <p> <i>Pipelines</i> are models of automated release processes. Each pipeline is uniquely named, and consists of stages, actions, and transitions. </p> <p>You can work with pipelines by calling:</p> <ul> <li> <p> <a>CreatePipeline</a>, which creates a uniquely named pipeline.</p> </li> <li> <p> <a>DeletePipeline</a>, which deletes the specified pipeline.</p> </li> <li> <p> <a>GetPipeline</a>, which returns information about the pipeline structure and pipeline metadata, including the pipeline Amazon Resource Name (ARN).</p> </li> <li> <p> <a>GetPipelineExecution</a>, which returns information about a specific execution of a pipeline.</p> </li> <li> <p> <a>GetPipelineState</a>, which returns information about the current state of the stages and actions of a pipeline.</p> </li> <li> <p> <a>ListActionExecutions</a>, which returns action-level details for past executions. The details include full stage and action-level details, including individual action duration, status, any errors that occurred during the execution, and input and output artifact location details.</p> </li> <li> <p> <a>ListPipelines</a>, which gets a summary of all of the pipelines associated with your account.</p> </li> <li> <p> <a>ListPipelineExecutions</a>, which gets a summary of the most recent executions for a pipeline.</p> </li> <li> <p> <a>StartPipelineExecution</a>, which runs the most recent revision of an artifact through the pipeline.</p> </li> <li> <p> <a>StopPipelineExecution</a>, which stops the specified pipeline execution from continuing through the pipeline.</p> </li> <li> <p> <a>UpdatePipeline</a>, which updates a pipeline with edits or changes to the structure of the pipeline.</p> </li> </ul> <p>Pipelines include <i>stages</i>. Each stage contains one or more actions that must complete before the next stage begins. A stage results in success or failure. If a stage fails, the pipeline stops at that stage and remains stopped until either a new version of an artifact appears in the source location, or a user takes action to rerun the most recent artifact through the pipeline. You can call <a>GetPipelineState</a>, which displays the status of a pipeline, including the status of stages in the pipeline, or <a>GetPipeline</a>, which returns the entire structure of the pipeline, including the stages of that pipeline. For more information about the structure of stages and actions, see <a href=\"https://docs.aws.amazon.com/codepipeline/latest/userguide/pipeline-structure.html\">AWS CodePipeline Pipeline Structure Reference</a>.</p> <p>Pipeline stages include <i>actions</i> that are categorized into categories such as source or build actions performed in a stage of a pipeline. For example, you can use a source action to import artifacts into a pipeline from a source such as Amazon S3. Like stages, you do not work with actions directly in most cases, but you do define and interact with actions when working with pipeline operations such as <a>CreatePipeline</a> and <a>GetPipelineState</a>. Valid action categories are:</p> <ul> <li> <p>Source</p> </li> <li> <p>Build</p> </li> <li> <p>Test</p> </li> <li> <p>Deploy</p> </li> <li> <p>Approval</p> </li> <li> <p>Invoke</p> </li> </ul> <p>Pipelines also include <i>transitions</i>, which allow the transition of artifacts from one stage to the next in a pipeline after the actions in one stage complete.</p> <p>You can work with transitions by calling:</p> <ul> <li> <p> <a>DisableStageTransition</a>, which prevents artifacts from transitioning to the next stage in a pipeline.</p> </li> <li> <p> <a>EnableStageTransition</a>, which enables transition of artifacts between stages in a pipeline. </p> </li> </ul> <p> <b>Using the API to integrate with AWS CodePipeline</b> </p> <p>For third-party integrators or developers who want to create their own integrations with AWS CodePipeline, the expected sequence varies from the standard API user. To integrate with AWS CodePipeline, developers need to work with the following items:</p> <p> <b>Jobs</b>, which are instances of an action. For example, a job for a source action might import a revision of an artifact from a source. </p> <p>You can work with jobs by calling:</p> <ul> <li> <p> <a>AcknowledgeJob</a>, which confirms whether a job worker has received the specified job.</p> </li> <li> <p> <a>GetJobDetails</a>, which returns the details of a job.</p> </li> <li> <p> <a>PollForJobs</a>, which determines whether there are any jobs to act on.</p> </li> <li> <p> <a>PutJobFailureResult</a>, which provides details of a job failure. </p> </li> <li> <p> <a>PutJobSuccessResult</a>, which provides details of a job success.</p> </li> </ul> <p> <b>Third party jobs</b>, which are instances of an action created by a partner action and integrated into AWS CodePipeline. Partner actions are created by members of the AWS Partner Network.</p> <p>You can work with third party jobs by calling:</p> <ul> <li> <p> <a>AcknowledgeThirdPartyJob</a>, which confirms whether a job worker has received the specified job.</p> </li> <li> <p> <a>GetThirdPartyJobDetails</a>, which requests the details of a job for a partner action.</p> </li> <li> <p> <a>PollForThirdPartyJobs</a>, which determines whether there are any jobs to act on. </p> </li> <li> <p> <a>PutThirdPartyJobFailureResult</a>, which provides details of a job failure.</p> </li> <li> <p> <a>PutThirdPartyJobSuccessResult</a>, which provides details of a job success.</p> </li> </ul>"
 }
diff --git a/services/codepipeline/src/test/resources/cucumber.properties b/services/codepipeline/src/test/resources/cucumber.properties
index b8dfe1e318ee..ac4a94f403cc 100644
--- a/services/codepipeline/src/test/resources/cucumber.properties
+++ b/services/codepipeline/src/test/resources/cucumber.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/codestar/build.properties b/services/codestar/build.properties
index ecf2dae6fcb1..15ec2da1fc71 100644
--- a/services/codestar/build.properties
+++ b/services/codestar/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/codestar/pom.xml b/services/codestar/pom.xml
index 6f607a3d0a4b..a6ec7eecbb6a 100644
--- a/services/codestar/pom.xml
+++ b/services/codestar/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>codestar</artifactId>
     <name>AWS Java SDK :: Services :: AWS CodeStar</name>
diff --git a/services/codestarconnections/pom.xml b/services/codestarconnections/pom.xml
new file mode 100644
index 000000000000..311b5f961f90
--- /dev/null
+++ b/services/codestarconnections/pom.xml
@@ -0,0 +1,60 @@
+<?xml version="1.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.
+  -->
+
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>software.amazon.awssdk</groupId>
+        <artifactId>services</artifactId>
+        <version>2.11.8-SNAPSHOT</version>
+    </parent>
+    <artifactId>codestarconnections</artifactId>
+    <name>AWS Java SDK :: Services :: CodeStar connections</name>
+    <description>The AWS Java SDK for CodeStar connections module holds the client classes that are used for
+        communicating with CodeStar connections.
+    </description>
+    <url>https://aws.amazon.com/sdkforjava</url>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifestEntries>
+                            <Automatic-Module-Name>software.amazon.awssdk.services.codestarconnections</Automatic-Module-Name>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>protocol-core</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>aws-json-protocol</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/services/codestarconnections/src/main/resources/codegen-resources/paginators-1.json b/services/codestarconnections/src/main/resources/codegen-resources/paginators-1.json
new file mode 100644
index 000000000000..deffa71f04db
--- /dev/null
+++ b/services/codestarconnections/src/main/resources/codegen-resources/paginators-1.json
@@ -0,0 +1,9 @@
+{
+  "pagination": {
+    "ListConnections": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "MaxResults"
+    }
+  }
+}
diff --git a/services/codestarconnections/src/main/resources/codegen-resources/service-2.json b/services/codestarconnections/src/main/resources/codegen-resources/service-2.json
new file mode 100644
index 000000000000..9116e8ecc3fe
--- /dev/null
+++ b/services/codestarconnections/src/main/resources/codegen-resources/service-2.json
@@ -0,0 +1,250 @@
+{
+  "version":"2.0",
+  "metadata":{
+    "apiVersion":"2019-12-01",
+    "endpointPrefix":"codestar-connections",
+    "jsonVersion":"1.0",
+    "protocol":"json",
+    "serviceFullName":"AWS CodeStar connections",
+    "serviceId":"CodeStar connections",
+    "signatureVersion":"v4",
+    "signingName":"codestar-connections",
+    "targetPrefix":"com.amazonaws.codestar.connections.CodeStar_connections_20191201",
+    "uid":"codestar-connections-2019-12-01"
+  },
+  "operations":{
+    "CreateConnection":{
+      "name":"CreateConnection",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"CreateConnectionInput"},
+      "output":{"shape":"CreateConnectionOutput"},
+      "errors":[
+        {"shape":"LimitExceededException"}
+      ],
+      "documentation":"<p>Creates a connection that can then be given to other AWS services like CodePipeline so that it can access third-party code repositories. The connection is in pending status until the third-party connection handshake is completed from the console.</p>"
+    },
+    "DeleteConnection":{
+      "name":"DeleteConnection",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DeleteConnectionInput"},
+      "output":{"shape":"DeleteConnectionOutput"},
+      "errors":[
+        {"shape":"ResourceNotFoundException"}
+      ],
+      "documentation":"<p>The connection to be deleted.</p>"
+    },
+    "GetConnection":{
+      "name":"GetConnection",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"GetConnectionInput"},
+      "output":{"shape":"GetConnectionOutput"},
+      "errors":[
+        {"shape":"ResourceNotFoundException"}
+      ],
+      "documentation":"<p>Returns the connection ARN and details such as status, owner, and provider type.</p>"
+    },
+    "ListConnections":{
+      "name":"ListConnections",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"ListConnectionsInput"},
+      "output":{"shape":"ListConnectionsOutput"},
+      "documentation":"<p>Lists the connections associated with your account.</p>"
+    }
+  },
+  "shapes":{
+    "AccountId":{
+      "type":"string",
+      "max":12,
+      "min":12,
+      "pattern":"[0-9]{12}"
+    },
+    "Connection":{
+      "type":"structure",
+      "members":{
+        "ConnectionName":{
+          "shape":"ConnectionName",
+          "documentation":"<p>The name of the connection. Connection names must be unique in an AWS user account.</p>"
+        },
+        "ConnectionArn":{
+          "shape":"ConnectionArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the connection. The ARN is used as the connection reference when the connection is shared between AWS services.</p> <note> <p>The ARN is never reused if the connection is deleted.</p> </note>"
+        },
+        "ProviderType":{
+          "shape":"ProviderType",
+          "documentation":"<p>The name of the external provider where your third-party code repository is configured. Currently, the valid provider type is Bitbucket.</p>"
+        },
+        "OwnerAccountId":{
+          "shape":"AccountId",
+          "documentation":"<p>The name of the external provider where your third-party code repository is configured. For Bitbucket, this is the account ID of the owner of the Bitbucket repository.</p>"
+        },
+        "ConnectionStatus":{
+          "shape":"ConnectionStatus",
+          "documentation":"<p>The current status of the connection. </p>"
+        }
+      },
+      "documentation":"<p>The configuration that allows a service such as CodePipeline to connect to a third-party code repository.</p>"
+    },
+    "ConnectionArn":{
+      "type":"string",
+      "max":256,
+      "min":0,
+      "pattern":"arn:aws(-[\\w]+)*:.+:.+:[0-9]{12}:.+"
+    },
+    "ConnectionList":{
+      "type":"list",
+      "member":{"shape":"Connection"}
+    },
+    "ConnectionName":{
+      "type":"string",
+      "max":32,
+      "min":1
+    },
+    "ConnectionStatus":{
+      "type":"string",
+      "enum":[
+        "PENDING",
+        "AVAILABLE",
+        "ERROR"
+      ]
+    },
+    "CreateConnectionInput":{
+      "type":"structure",
+      "required":[
+        "ProviderType",
+        "ConnectionName"
+      ],
+      "members":{
+        "ProviderType":{
+          "shape":"ProviderType",
+          "documentation":"<p>The name of the external provider where your third-party code repository is configured. Currently, the valid provider type is Bitbucket.</p>"
+        },
+        "ConnectionName":{
+          "shape":"ConnectionName",
+          "documentation":"<p>The name of the connection to be created. The name must be unique in the calling AWS account.</p>"
+        }
+      }
+    },
+    "CreateConnectionOutput":{
+      "type":"structure",
+      "required":["ConnectionArn"],
+      "members":{
+        "ConnectionArn":{
+          "shape":"ConnectionArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the connection to be created. The ARN is used as the connection reference when the connection is shared between AWS services.</p> <note> <p>The ARN is never reused if the connection is deleted.</p> </note>"
+        }
+      }
+    },
+    "DeleteConnectionInput":{
+      "type":"structure",
+      "required":["ConnectionArn"],
+      "members":{
+        "ConnectionArn":{
+          "shape":"ConnectionArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the connection to be deleted.</p> <note> <p>The ARN is never reused if the connection is deleted.</p> </note>"
+        }
+      }
+    },
+    "DeleteConnectionOutput":{
+      "type":"structure",
+      "members":{
+      }
+    },
+    "ErrorMessage":{
+      "type":"string",
+      "max":600
+    },
+    "GetConnectionInput":{
+      "type":"structure",
+      "required":["ConnectionArn"],
+      "members":{
+        "ConnectionArn":{
+          "shape":"ConnectionArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of a connection.</p>"
+        }
+      }
+    },
+    "GetConnectionOutput":{
+      "type":"structure",
+      "members":{
+        "Connection":{
+          "shape":"Connection",
+          "documentation":"<p>The connection details, such as status, owner, and provider type.</p>"
+        }
+      }
+    },
+    "LimitExceededException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p>Exceeded the maximum limit for connections.</p>",
+      "exception":true
+    },
+    "ListConnectionsInput":{
+      "type":"structure",
+      "members":{
+        "ProviderTypeFilter":{
+          "shape":"ProviderType",
+          "documentation":"<p>Filters the list of connections to those associated with a specified provider, such as Bitbucket.</p>"
+        },
+        "MaxResults":{
+          "shape":"MaxResults",
+          "documentation":"<p>The maximum number of results to return in a single call. To retrieve the remaining results, make another call with the returned <code>nextToken</code> value.</p>"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>The token that was returned from the previous <code>ListConnections</code> call, which can be used to return the next set of connections in the list.</p>"
+        }
+      }
+    },
+    "ListConnectionsOutput":{
+      "type":"structure",
+      "members":{
+        "Connections":{
+          "shape":"ConnectionList",
+          "documentation":"<p>A list of connections and the details for each connection, such as status, owner, and provider type.</p>"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>A token that can be used in the next <code>ListConnections</code> call. To view all items in the list, continue to call this operation with each subsequent token until no more <code>nextToken</code> values are returned.</p>"
+        }
+      }
+    },
+    "MaxResults":{
+      "type":"integer",
+      "max":50,
+      "min":1
+    },
+    "NextToken":{
+      "type":"string",
+      "max":1024,
+      "min":1,
+      "pattern":"[a-zA-Z0-9=\\-\\\\/]+"
+    },
+    "ProviderType":{
+      "type":"string",
+      "enum":["Bitbucket"]
+    },
+    "ResourceNotFoundException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p>Resource not found. Verify the connection resource ARN and try again.</p>",
+      "exception":true
+    }
+  },
+  "documentation":"<p>This AWS CodeStar Connections API Reference provides descriptions and usage examples of the operations and data types for the AWS CodeStar Connections API. You can use the Connections API to work with connections and installations.</p> <p> <i>Connections</i> are configurations that you use to connect AWS resources to external code repositories. Each connection is a resource that can be given to services such as CodePipeline to connect to a third-party repository such as Bitbucket. For example, you can add the connection in CodePipeline so that it triggers your pipeline when a code change is made to your third-party code repository. Each connection is named and associated with a unique ARN that is used to reference the connection.</p> <p>When you create a connection, the console initiates a third-party connection handshake. <i>Installations</i> are the apps that are used to conduct this handshake. For example, the installation for the Bitbucket provider type is the Bitbucket Cloud app. When you create a connection, you can choose an existing installation or create one.</p> <p>You can work with connections by calling:</p> <ul> <li> <p> <a>CreateConnection</a>, which creates a uniquely named connection that can be referenced by services such as CodePipeline.</p> </li> <li> <p> <a>DeleteConnection</a>, which deletes the specified connection.</p> </li> <li> <p> <a>GetConnection</a>, which returns information about the connection, including the connection status.</p> </li> <li> <p> <a>ListConnections</a>, which lists the connections associated with your account.</p> </li> </ul> <p>For information about how to use AWS CodeStar Connections, see the <a href=\"https://docs.aws.amazon.com/codepipeline/latest/userguide/welcome.html\">AWS CodePipeline User Guide</a>.</p>"
+}
diff --git a/services/codestarnotifications/pom.xml b/services/codestarnotifications/pom.xml
new file mode 100644
index 000000000000..db0a9534e2bf
--- /dev/null
+++ b/services/codestarnotifications/pom.xml
@@ -0,0 +1,60 @@
+<?xml version="1.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.
+  -->
+
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>software.amazon.awssdk</groupId>
+        <artifactId>services</artifactId>
+        <version>2.11.8-SNAPSHOT</version>
+    </parent>
+    <artifactId>codestarnotifications</artifactId>
+    <name>AWS Java SDK :: Services :: Codestar Notifications</name>
+    <description>The AWS Java SDK for Codestar Notifications module holds the client classes that are used for
+        communicating with Codestar Notifications.
+    </description>
+    <url>https://aws.amazon.com/sdkforjava</url>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifestEntries>
+                            <Automatic-Module-Name>software.amazon.awssdk.services.codestarnotifications</Automatic-Module-Name>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>protocol-core</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>aws-json-protocol</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/services/codestarnotifications/src/main/resources/codegen-resources/paginators-1.json b/services/codestarnotifications/src/main/resources/codegen-resources/paginators-1.json
new file mode 100644
index 000000000000..c958196e0843
--- /dev/null
+++ b/services/codestarnotifications/src/main/resources/codegen-resources/paginators-1.json
@@ -0,0 +1,22 @@
+{
+  "pagination": {
+    "ListEventTypes": {
+      "input_token": "NextToken",
+      "limit_key": "MaxResults",
+      "output_token": "NextToken",
+      "result_key": "EventTypes"
+    },
+    "ListNotificationRules": {
+      "input_token": "NextToken",
+      "limit_key": "MaxResults",
+      "output_token": "NextToken",
+      "result_key": "NotificationRules"
+    },
+    "ListTargets": {
+      "input_token": "NextToken",
+      "limit_key": "MaxResults",
+      "output_token": "NextToken",
+      "result_key": "Targets"
+    }
+  }
+}
\ No newline at end of file
diff --git a/services/codestarnotifications/src/main/resources/codegen-resources/service-2.json b/services/codestarnotifications/src/main/resources/codegen-resources/service-2.json
new file mode 100644
index 000000000000..df94d9bcdccb
--- /dev/null
+++ b/services/codestarnotifications/src/main/resources/codegen-resources/service-2.json
@@ -0,0 +1,973 @@
+{
+  "version":"2.0",
+  "metadata":{
+    "apiVersion":"2019-10-15",
+    "endpointPrefix":"codestar-notifications",
+    "jsonVersion":"1.1",
+    "protocol":"rest-json",
+    "serviceFullName":"AWS CodeStar Notifications",
+    "serviceId":"codestar notifications",
+    "signatureVersion":"v4",
+    "signingName":"codestar-notifications",
+    "uid":"codestar-notifications-2019-10-15"
+  },
+  "operations":{
+    "CreateNotificationRule":{
+      "name":"CreateNotificationRule",
+      "http":{
+        "method":"POST",
+        "requestUri":"/createNotificationRule"
+      },
+      "input":{"shape":"CreateNotificationRuleRequest"},
+      "output":{"shape":"CreateNotificationRuleResult"},
+      "errors":[
+        {"shape":"ResourceAlreadyExistsException"},
+        {"shape":"ValidationException"},
+        {"shape":"LimitExceededException"},
+        {"shape":"ConfigurationException"},
+        {"shape":"ConcurrentModificationException"},
+        {"shape":"AccessDeniedException"}
+      ],
+      "documentation":"<p>Creates a notification rule for a resource. The rule specifies the events you want notifications about and the targets (such as SNS topics) where you want to receive them.</p>"
+    },
+    "DeleteNotificationRule":{
+      "name":"DeleteNotificationRule",
+      "http":{
+        "method":"POST",
+        "requestUri":"/deleteNotificationRule"
+      },
+      "input":{"shape":"DeleteNotificationRuleRequest"},
+      "output":{"shape":"DeleteNotificationRuleResult"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"LimitExceededException"},
+        {"shape":"ConcurrentModificationException"}
+      ],
+      "documentation":"<p>Deletes a notification rule for a resource.</p>"
+    },
+    "DeleteTarget":{
+      "name":"DeleteTarget",
+      "http":{
+        "method":"POST",
+        "requestUri":"/deleteTarget"
+      },
+      "input":{"shape":"DeleteTargetRequest"},
+      "output":{"shape":"DeleteTargetResult"},
+      "errors":[
+        {"shape":"ValidationException"}
+      ],
+      "documentation":"<p>Deletes a specified target for notifications.</p>"
+    },
+    "DescribeNotificationRule":{
+      "name":"DescribeNotificationRule",
+      "http":{
+        "method":"POST",
+        "requestUri":"/describeNotificationRule"
+      },
+      "input":{"shape":"DescribeNotificationRuleRequest"},
+      "output":{"shape":"DescribeNotificationRuleResult"},
+      "errors":[
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ValidationException"}
+      ],
+      "documentation":"<p>Returns information about a specified notification rule.</p>"
+    },
+    "ListEventTypes":{
+      "name":"ListEventTypes",
+      "http":{
+        "method":"POST",
+        "requestUri":"/listEventTypes"
+      },
+      "input":{"shape":"ListEventTypesRequest"},
+      "output":{"shape":"ListEventTypesResult"},
+      "errors":[
+        {"shape":"InvalidNextTokenException"},
+        {"shape":"ValidationException"}
+      ],
+      "documentation":"<p>Returns information about the event types available for configuring notifications.</p>"
+    },
+    "ListNotificationRules":{
+      "name":"ListNotificationRules",
+      "http":{
+        "method":"POST",
+        "requestUri":"/listNotificationRules"
+      },
+      "input":{"shape":"ListNotificationRulesRequest"},
+      "output":{"shape":"ListNotificationRulesResult"},
+      "errors":[
+        {"shape":"InvalidNextTokenException"},
+        {"shape":"ValidationException"}
+      ],
+      "documentation":"<p>Returns a list of the notification rules for an AWS account.</p>"
+    },
+    "ListTagsForResource":{
+      "name":"ListTagsForResource",
+      "http":{
+        "method":"POST",
+        "requestUri":"/listTagsForResource"
+      },
+      "input":{"shape":"ListTagsForResourceRequest"},
+      "output":{"shape":"ListTagsForResourceResult"},
+      "errors":[
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ValidationException"}
+      ],
+      "documentation":"<p>Returns a list of the tags associated with a notification rule.</p>"
+    },
+    "ListTargets":{
+      "name":"ListTargets",
+      "http":{
+        "method":"POST",
+        "requestUri":"/listTargets"
+      },
+      "input":{"shape":"ListTargetsRequest"},
+      "output":{"shape":"ListTargetsResult"},
+      "errors":[
+        {"shape":"InvalidNextTokenException"},
+        {"shape":"ValidationException"}
+      ],
+      "documentation":"<p>Returns a list of the notification rule targets for an AWS account.</p>"
+    },
+    "Subscribe":{
+      "name":"Subscribe",
+      "http":{
+        "method":"POST",
+        "requestUri":"/subscribe"
+      },
+      "input":{"shape":"SubscribeRequest"},
+      "output":{"shape":"SubscribeResult"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"ResourceNotFoundException"}
+      ],
+      "documentation":"<p>Creates an association between a notification rule and an SNS topic so that the associated target can receive notifications when the events described in the rule are triggered.</p>"
+    },
+    "TagResource":{
+      "name":"TagResource",
+      "http":{
+        "method":"POST",
+        "requestUri":"/tagResource"
+      },
+      "input":{"shape":"TagResourceRequest"},
+      "output":{"shape":"TagResourceResult"},
+      "errors":[
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ValidationException"},
+        {"shape":"ConcurrentModificationException"}
+      ],
+      "documentation":"<p>Associates a set of provided tags with a notification rule.</p>"
+    },
+    "Unsubscribe":{
+      "name":"Unsubscribe",
+      "http":{
+        "method":"POST",
+        "requestUri":"/unsubscribe"
+      },
+      "input":{"shape":"UnsubscribeRequest"},
+      "output":{"shape":"UnsubscribeResult"},
+      "errors":[
+        {"shape":"ValidationException"}
+      ],
+      "documentation":"<p>Removes an association between a notification rule and an Amazon SNS topic so that subscribers to that topic stop receiving notifications when the events described in the rule are triggered.</p>"
+    },
+    "UntagResource":{
+      "name":"UntagResource",
+      "http":{
+        "method":"POST",
+        "requestUri":"/untagResource"
+      },
+      "input":{"shape":"UntagResourceRequest"},
+      "output":{"shape":"UntagResourceResult"},
+      "errors":[
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ValidationException"},
+        {"shape":"ConcurrentModificationException"}
+      ],
+      "documentation":"<p>Removes the association between one or more provided tags and a notification rule.</p>"
+    },
+    "UpdateNotificationRule":{
+      "name":"UpdateNotificationRule",
+      "http":{
+        "method":"POST",
+        "requestUri":"/updateNotificationRule"
+      },
+      "input":{"shape":"UpdateNotificationRuleRequest"},
+      "output":{"shape":"UpdateNotificationRuleResult"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"ResourceNotFoundException"}
+      ],
+      "documentation":"<p>Updates a notification rule for a resource. You can change the events that trigger the notification rule, the status of the rule, and the targets that receive the notifications.</p> <note> <p>To add or remove tags for a notification rule, you must use <a>TagResource</a> and <a>UntagResource</a>.</p> </note>"
+    }
+  },
+  "shapes":{
+    "AccessDeniedException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"Message"}
+      },
+      "documentation":"<p>AWS CodeStar Notifications can't create the notification rule because you do not have sufficient permissions.</p>",
+      "error":{"httpStatusCode":403},
+      "exception":true
+    },
+    "ClientRequestToken":{
+      "type":"string",
+      "max":256,
+      "min":1,
+      "pattern":"^[\\w:/-]+$"
+    },
+    "ConcurrentModificationException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"Message"}
+      },
+      "documentation":"<p>AWS CodeStar Notifications can't complete the request because the resource is being modified by another process. Wait a few minutes and try again.</p>",
+      "error":{"httpStatusCode":400},
+      "exception":true
+    },
+    "ConfigurationException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"Message"}
+      },
+      "documentation":"<p>Some or all of the configuration is incomplete, missing, or not valid.</p>",
+      "error":{"httpStatusCode":400},
+      "exception":true
+    },
+    "CreateNotificationRuleRequest":{
+      "type":"structure",
+      "required":[
+        "Name",
+        "EventTypeIds",
+        "Resource",
+        "Targets",
+        "DetailType"
+      ],
+      "members":{
+        "Name":{
+          "shape":"NotificationRuleName",
+          "documentation":"<p>The name for the notification rule. Notifictaion rule names must be unique in your AWS account.</p>"
+        },
+        "EventTypeIds":{
+          "shape":"EventTypeIds",
+          "documentation":"<p>A list of event types associated with this notification rule. For a list of allowed events, see <a>EventTypeSummary</a>.</p>"
+        },
+        "Resource":{
+          "shape":"NotificationRuleResource",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the resource to associate with the notification rule. Supported resources include pipelines in AWS CodePipeline, repositories in AWS CodeCommit, and build projects in AWS CodeBuild.</p>"
+        },
+        "Targets":{
+          "shape":"Targets",
+          "documentation":"<p>A list of Amazon Resource Names (ARNs) of SNS topics to associate with the notification rule.</p>"
+        },
+        "DetailType":{
+          "shape":"DetailType",
+          "documentation":"<p>The level of detail to include in the notifications for this resource. BASIC will include only the contents of the event as it would appear in AWS CloudWatch. FULL will include any supplemental information provided by AWS CodeStar Notifications and/or the service for the resource for which the notification is created.</p>"
+        },
+        "ClientRequestToken":{
+          "shape":"ClientRequestToken",
+          "documentation":"<p>A unique, client-generated idempotency token that, when provided in a request, ensures the request cannot be repeated with a changed parameter. If a request with the same parameters is received and a token is included, the request returns information about the initial request that used that token.</p> <note> <p>The AWS SDKs prepopulate client request tokens. If you are using an AWS SDK, an idempotency token is created for you.</p> </note>",
+          "idempotencyToken":true
+        },
+        "Tags":{
+          "shape":"Tags",
+          "documentation":"<p>A list of tags to apply to this notification rule. Key names cannot start with \"aws\". </p>"
+        },
+        "Status":{
+          "shape":"NotificationRuleStatus",
+          "documentation":"<p>The status of the notification rule. The default value is ENABLED. If the status is set to DISABLED, notifications aren't sent for the notification rule.</p>"
+        }
+      }
+    },
+    "CreateNotificationRuleResult":{
+      "type":"structure",
+      "members":{
+        "Arn":{
+          "shape":"NotificationRuleArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the notification rule.</p>"
+        }
+      }
+    },
+    "CreatedTimestamp":{"type":"timestamp"},
+    "DeleteNotificationRuleRequest":{
+      "type":"structure",
+      "required":["Arn"],
+      "members":{
+        "Arn":{
+          "shape":"NotificationRuleArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the notification rule you want to delete.</p>"
+        }
+      }
+    },
+    "DeleteNotificationRuleResult":{
+      "type":"structure",
+      "members":{
+        "Arn":{
+          "shape":"NotificationRuleArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the deleted notification rule.</p>"
+        }
+      }
+    },
+    "DeleteTargetRequest":{
+      "type":"structure",
+      "required":["TargetAddress"],
+      "members":{
+        "TargetAddress":{
+          "shape":"TargetAddress",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the SNS topic to delete.</p>"
+        },
+        "ForceUnsubscribeAll":{
+          "shape":"ForceUnsubscribeAll",
+          "documentation":"<p>A Boolean value that can be used to delete all associations with this SNS topic. The default value is FALSE. If set to TRUE, all associations between that target and every notification rule in your AWS account are deleted.</p>"
+        }
+      }
+    },
+    "DeleteTargetResult":{
+      "type":"structure",
+      "members":{
+      }
+    },
+    "DescribeNotificationRuleRequest":{
+      "type":"structure",
+      "required":["Arn"],
+      "members":{
+        "Arn":{
+          "shape":"NotificationRuleArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the notification rule.</p>"
+        }
+      }
+    },
+    "DescribeNotificationRuleResult":{
+      "type":"structure",
+      "required":["Arn"],
+      "members":{
+        "Arn":{
+          "shape":"NotificationRuleArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the notification rule.</p>"
+        },
+        "Name":{
+          "shape":"NotificationRuleName",
+          "documentation":"<p>The name of the notification rule.</p>"
+        },
+        "EventTypes":{
+          "shape":"EventTypeBatch",
+          "documentation":"<p>A list of the event types associated with the notification rule.</p>"
+        },
+        "Resource":{
+          "shape":"NotificationRuleResource",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the resource associated with the notification rule.</p>"
+        },
+        "Targets":{
+          "shape":"TargetsBatch",
+          "documentation":"<p>A list of the SNS topics associated with the notification rule.</p>"
+        },
+        "DetailType":{
+          "shape":"DetailType",
+          "documentation":"<p>The level of detail included in the notifications for this resource. BASIC will include only the contents of the event as it would appear in AWS CloudWatch. FULL will include any supplemental information provided by AWS CodeStar Notifications and/or the service for the resource for which the notification is created.</p>"
+        },
+        "CreatedBy":{
+          "shape":"NotificationRuleCreatedBy",
+          "documentation":"<p>The name or email alias of the person who created the notification rule.</p>"
+        },
+        "Status":{
+          "shape":"NotificationRuleStatus",
+          "documentation":"<p>The status of the notification rule. Valid statuses are on (sending notifications) or off (not sending notifications).</p>"
+        },
+        "CreatedTimestamp":{
+          "shape":"CreatedTimestamp",
+          "documentation":"<p>The date and time the notification rule was created, in timestamp format.</p>"
+        },
+        "LastModifiedTimestamp":{
+          "shape":"LastModifiedTimestamp",
+          "documentation":"<p>The date and time the notification rule was most recently updated, in timestamp format.</p>"
+        },
+        "Tags":{
+          "shape":"Tags",
+          "documentation":"<p>The tags associated with the notification rule.</p>"
+        }
+      }
+    },
+    "DetailType":{
+      "type":"string",
+      "enum":[
+        "BASIC",
+        "FULL"
+      ]
+    },
+    "EventTypeBatch":{
+      "type":"list",
+      "member":{"shape":"EventTypeSummary"}
+    },
+    "EventTypeId":{
+      "type":"string",
+      "max":200,
+      "min":1
+    },
+    "EventTypeIds":{
+      "type":"list",
+      "member":{"shape":"EventTypeId"}
+    },
+    "EventTypeName":{"type":"string"},
+    "EventTypeSummary":{
+      "type":"structure",
+      "members":{
+        "EventTypeId":{
+          "shape":"EventTypeId",
+          "documentation":"<p>The system-generated ID of the event.</p>"
+        },
+        "ServiceName":{
+          "shape":"ServiceName",
+          "documentation":"<p>The name of the service for which the event applies.</p>"
+        },
+        "EventTypeName":{
+          "shape":"EventTypeName",
+          "documentation":"<p>The name of the event.</p>"
+        },
+        "ResourceType":{
+          "shape":"ResourceType",
+          "documentation":"<p>The resource type of the event.</p>"
+        }
+      },
+      "documentation":"<p>Returns information about an event that has triggered a notification rule.</p>"
+    },
+    "ForceUnsubscribeAll":{"type":"boolean"},
+    "InvalidNextTokenException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"Message"}
+      },
+      "documentation":"<p>The value for the enumeration token used in the request to return the next batch of the results is not valid. </p>",
+      "error":{"httpStatusCode":400},
+      "exception":true
+    },
+    "LastModifiedTimestamp":{"type":"timestamp"},
+    "LimitExceededException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"Message"}
+      },
+      "documentation":"<p>One of the AWS CodeStar Notifications limits has been exceeded. Limits apply to accounts, notification rules, notifications, resources, and targets. For more information, see Limits.</p>",
+      "error":{"httpStatusCode":400},
+      "exception":true
+    },
+    "ListEventTypesFilter":{
+      "type":"structure",
+      "required":[
+        "Name",
+        "Value"
+      ],
+      "members":{
+        "Name":{
+          "shape":"ListEventTypesFilterName",
+          "documentation":"<p>The system-generated name of the filter type you want to filter by.</p>"
+        },
+        "Value":{
+          "shape":"ListEventTypesFilterValue",
+          "documentation":"<p>The name of the resource type (for example, pipeline) or service name (for example, CodePipeline) that you want to filter by.</p>"
+        }
+      },
+      "documentation":"<p>Information about a filter to apply to the list of returned event types. You can filter by resource type or service name.</p>"
+    },
+    "ListEventTypesFilterName":{
+      "type":"string",
+      "enum":[
+        "RESOURCE_TYPE",
+        "SERVICE_NAME"
+      ]
+    },
+    "ListEventTypesFilterValue":{"type":"string"},
+    "ListEventTypesFilters":{
+      "type":"list",
+      "member":{"shape":"ListEventTypesFilter"}
+    },
+    "ListEventTypesRequest":{
+      "type":"structure",
+      "members":{
+        "Filters":{
+          "shape":"ListEventTypesFilters",
+          "documentation":"<p>The filters to use to return information by service or resource type.</p>"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>An enumeration token that, when provided in a request, returns the next batch of the results.</p>"
+        },
+        "MaxResults":{
+          "shape":"MaxResults",
+          "documentation":"<p>A non-negative integer used to limit the number of returned results. The default number is 50. The maximum number of results that can be returned is 100.</p>",
+          "box":true
+        }
+      }
+    },
+    "ListEventTypesResult":{
+      "type":"structure",
+      "members":{
+        "EventTypes":{
+          "shape":"EventTypeBatch",
+          "documentation":"<p>Information about each event, including service name, resource type, event ID, and event name.</p>"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>An enumeration token that can be used in a request to return the next batch of the results.</p>"
+        }
+      }
+    },
+    "ListNotificationRulesFilter":{
+      "type":"structure",
+      "required":[
+        "Name",
+        "Value"
+      ],
+      "members":{
+        "Name":{
+          "shape":"ListNotificationRulesFilterName",
+          "documentation":"<p>The name of the attribute you want to use to filter the returned notification rules.</p>"
+        },
+        "Value":{
+          "shape":"ListNotificationRulesFilterValue",
+          "documentation":"<p>The value of the attribute you want to use to filter the returned notification rules. For example, if you specify filtering by <i>RESOURCE</i> in Name, you might specify the ARN of a pipeline in AWS CodePipeline for the value.</p>"
+        }
+      },
+      "documentation":"<p>Information about a filter to apply to the list of returned notification rules. You can filter by event type, owner, resource, or target.</p>"
+    },
+    "ListNotificationRulesFilterName":{
+      "type":"string",
+      "enum":[
+        "EVENT_TYPE_ID",
+        "CREATED_BY",
+        "RESOURCE",
+        "TARGET_ADDRESS"
+      ]
+    },
+    "ListNotificationRulesFilterValue":{"type":"string"},
+    "ListNotificationRulesFilters":{
+      "type":"list",
+      "member":{"shape":"ListNotificationRulesFilter"}
+    },
+    "ListNotificationRulesRequest":{
+      "type":"structure",
+      "members":{
+        "Filters":{
+          "shape":"ListNotificationRulesFilters",
+          "documentation":"<p>The filters to use to return information by service or resource type. For valid values, see <a>ListNotificationRulesFilter</a>.</p> <note> <p>A filter with the same name can appear more than once when used with OR statements. Filters with different names should be applied with AND statements.</p> </note>"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>An enumeration token that, when provided in a request, returns the next batch of the results.</p>"
+        },
+        "MaxResults":{
+          "shape":"MaxResults",
+          "documentation":"<p>A non-negative integer used to limit the number of returned results. The maximum number of results that can be returned is 100.</p>",
+          "box":true
+        }
+      }
+    },
+    "ListNotificationRulesResult":{
+      "type":"structure",
+      "members":{
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>An enumeration token that can be used in a request to return the next batch of the results.</p>"
+        },
+        "NotificationRules":{
+          "shape":"NotificationRuleBatch",
+          "documentation":"<p>The list of notification rules for the AWS account, by Amazon Resource Name (ARN) and ID. </p>"
+        }
+      }
+    },
+    "ListTagsForResourceRequest":{
+      "type":"structure",
+      "required":["Arn"],
+      "members":{
+        "Arn":{
+          "shape":"NotificationRuleArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) for the notification rule.</p>"
+        }
+      }
+    },
+    "ListTagsForResourceResult":{
+      "type":"structure",
+      "members":{
+        "Tags":{
+          "shape":"Tags",
+          "documentation":"<p>The tags associated with the notification rule.</p>"
+        }
+      }
+    },
+    "ListTargetsFilter":{
+      "type":"structure",
+      "required":[
+        "Name",
+        "Value"
+      ],
+      "members":{
+        "Name":{
+          "shape":"ListTargetsFilterName",
+          "documentation":"<p>The name of the attribute you want to use to filter the returned targets.</p>"
+        },
+        "Value":{
+          "shape":"ListTargetsFilterValue",
+          "documentation":"<p>The value of the attribute you want to use to filter the returned targets. For example, if you specify <i>SNS</i> for the Target type, you could specify an Amazon Resource Name (ARN) for a topic as the value.</p>"
+        }
+      },
+      "documentation":"<p>Information about a filter to apply to the list of returned targets. You can filter by target type, address, or status. For example, to filter results to notification rules that have active Amazon SNS topics as targets, you could specify a ListTargetsFilter Name as TargetType and a Value of SNS, and a Name of TARGET_STATUS and a Value of ACTIVE.</p>"
+    },
+    "ListTargetsFilterName":{
+      "type":"string",
+      "enum":[
+        "TARGET_TYPE",
+        "TARGET_ADDRESS",
+        "TARGET_STATUS"
+      ]
+    },
+    "ListTargetsFilterValue":{"type":"string"},
+    "ListTargetsFilters":{
+      "type":"list",
+      "member":{"shape":"ListTargetsFilter"}
+    },
+    "ListTargetsRequest":{
+      "type":"structure",
+      "members":{
+        "Filters":{
+          "shape":"ListTargetsFilters",
+          "documentation":"<p>The filters to use to return information by service or resource type. Valid filters include target type, target address, and target status.</p> <note> <p>A filter with the same name can appear more than once when used with OR statements. Filters with different names should be applied with AND statements.</p> </note>"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>An enumeration token that, when provided in a request, returns the next batch of the results.</p>"
+        },
+        "MaxResults":{
+          "shape":"MaxResults",
+          "documentation":"<p>A non-negative integer used to limit the number of returned results. The maximum number of results that can be returned is 100.</p>",
+          "box":true
+        }
+      }
+    },
+    "ListTargetsResult":{
+      "type":"structure",
+      "members":{
+        "Targets":{
+          "shape":"TargetsBatch",
+          "documentation":"<p>The list of notification rule targets. </p>"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>An enumeration token that can be used in a request to return the next batch of results.</p>"
+        }
+      }
+    },
+    "MaxResults":{
+      "type":"integer",
+      "max":100,
+      "min":1
+    },
+    "Message":{
+      "type":"string",
+      "min":1
+    },
+    "NextToken":{
+      "type":"string",
+      "pattern":"^[\\w/+=]+$"
+    },
+    "NotificationRuleArn":{
+      "type":"string",
+      "pattern":"^arn:aws[^:\\s]*:codestar-notifications:[^:\\s]+:\\d{12}:notificationrule\\/(.*\\S)?$"
+    },
+    "NotificationRuleBatch":{
+      "type":"list",
+      "member":{"shape":"NotificationRuleSummary"}
+    },
+    "NotificationRuleCreatedBy":{
+      "type":"string",
+      "min":1
+    },
+    "NotificationRuleId":{
+      "type":"string",
+      "max":40,
+      "min":1
+    },
+    "NotificationRuleName":{
+      "type":"string",
+      "max":64,
+      "min":1,
+      "pattern":"[A-Za-z0-9\\-_ ]+$",
+      "sensitive":true
+    },
+    "NotificationRuleResource":{
+      "type":"string",
+      "pattern":"^arn:aws[^:\\s]*:[^:\\s]*:[^:\\s]*:[0-9]{12}:[^\\s]+$"
+    },
+    "NotificationRuleStatus":{
+      "type":"string",
+      "enum":[
+        "ENABLED",
+        "DISABLED"
+      ]
+    },
+    "NotificationRuleSummary":{
+      "type":"structure",
+      "members":{
+        "Id":{
+          "shape":"NotificationRuleId",
+          "documentation":"<p>The unique ID of the notification rule.</p>"
+        },
+        "Arn":{
+          "shape":"NotificationRuleArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the notification rule.</p>"
+        }
+      },
+      "documentation":"<p>Information about a specified notification rule.</p>"
+    },
+    "ResourceAlreadyExistsException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"Message"}
+      },
+      "documentation":"<p>A resource with the same name or ID already exists. Notification rule names must be unique in your AWS account.</p>",
+      "error":{"httpStatusCode":409},
+      "exception":true
+    },
+    "ResourceNotFoundException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"Message"}
+      },
+      "documentation":"<p>AWS CodeStar Notifications can't find a resource that matches the provided ARN. </p>",
+      "error":{"httpStatusCode":404},
+      "exception":true
+    },
+    "ResourceType":{
+      "type":"string",
+      "min":1,
+      "pattern":"^([a-zA-Z0-9-])+$"
+    },
+    "ServiceName":{"type":"string"},
+    "SubscribeRequest":{
+      "type":"structure",
+      "required":[
+        "Arn",
+        "Target"
+      ],
+      "members":{
+        "Arn":{
+          "shape":"NotificationRuleArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the notification rule for which you want to create the association.</p>"
+        },
+        "Target":{"shape":"Target"},
+        "ClientRequestToken":{
+          "shape":"ClientRequestToken",
+          "documentation":"<p>An enumeration token that, when provided in a request, returns the next batch of the results.</p>"
+        }
+      }
+    },
+    "SubscribeResult":{
+      "type":"structure",
+      "members":{
+        "Arn":{
+          "shape":"NotificationRuleArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the notification rule for which you have created assocations.</p>"
+        }
+      }
+    },
+    "TagKey":{
+      "type":"string",
+      "max":128,
+      "min":1,
+      "pattern":"^([\\p{L}\\p{Z}\\p{N}_.:/=+\\-@]*)$"
+    },
+    "TagKeys":{
+      "type":"list",
+      "member":{"shape":"TagKey"}
+    },
+    "TagResourceRequest":{
+      "type":"structure",
+      "required":[
+        "Arn",
+        "Tags"
+      ],
+      "members":{
+        "Arn":{
+          "shape":"NotificationRuleArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the notification rule to tag.</p>"
+        },
+        "Tags":{
+          "shape":"Tags",
+          "documentation":"<p>The list of tags to associate with the resource. Tag key names cannot start with \"aws\".</p>"
+        }
+      }
+    },
+    "TagResourceResult":{
+      "type":"structure",
+      "members":{
+        "Tags":{
+          "shape":"Tags",
+          "documentation":"<p>The list of tags associated with the resource.</p>"
+        }
+      }
+    },
+    "TagValue":{
+      "type":"string",
+      "max":256,
+      "pattern":"^([\\p{L}\\p{Z}\\p{N}_.:/=+\\-@]*)$"
+    },
+    "Tags":{
+      "type":"map",
+      "key":{"shape":"TagKey"},
+      "value":{"shape":"TagValue"}
+    },
+    "Target":{
+      "type":"structure",
+      "members":{
+        "TargetType":{
+          "shape":"TargetType",
+          "documentation":"<p>The target type. Can be an Amazon SNS topic.</p>"
+        },
+        "TargetAddress":{
+          "shape":"TargetAddress",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the SNS topic.</p>"
+        }
+      },
+      "documentation":"<p>Information about the SNS topics associated with a notification rule.</p>"
+    },
+    "TargetAddress":{
+      "type":"string",
+      "max":320,
+      "min":1,
+      "sensitive":true
+    },
+    "TargetStatus":{
+      "type":"string",
+      "enum":[
+        "PENDING",
+        "ACTIVE",
+        "UNREACHABLE",
+        "INACTIVE",
+        "DEACTIVATED"
+      ]
+    },
+    "TargetSummary":{
+      "type":"structure",
+      "members":{
+        "TargetAddress":{
+          "shape":"TargetAddress",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the SNS topic.</p>"
+        },
+        "TargetType":{
+          "shape":"TargetType",
+          "documentation":"<p>The type of the target (for example, SNS).</p>"
+        },
+        "TargetStatus":{
+          "shape":"TargetStatus",
+          "documentation":"<p>The status of the target.</p>"
+        }
+      },
+      "documentation":"<p>Information about the targets specified for a notification rule.</p>"
+    },
+    "TargetType":{
+      "type":"string",
+      "pattern":"^[A-Za-z]+$"
+    },
+    "Targets":{
+      "type":"list",
+      "member":{"shape":"Target"},
+      "max":10
+    },
+    "TargetsBatch":{
+      "type":"list",
+      "member":{"shape":"TargetSummary"}
+    },
+    "UnsubscribeRequest":{
+      "type":"structure",
+      "required":[
+        "Arn",
+        "TargetAddress"
+      ],
+      "members":{
+        "Arn":{
+          "shape":"NotificationRuleArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the notification rule.</p>"
+        },
+        "TargetAddress":{
+          "shape":"TargetAddress",
+          "documentation":"<p>The ARN of the SNS topic to unsubscribe from the notification rule.</p>"
+        }
+      }
+    },
+    "UnsubscribeResult":{
+      "type":"structure",
+      "required":["Arn"],
+      "members":{
+        "Arn":{
+          "shape":"NotificationRuleArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the the notification rule from which you have removed a subscription.</p>"
+        }
+      }
+    },
+    "UntagResourceRequest":{
+      "type":"structure",
+      "required":[
+        "Arn",
+        "TagKeys"
+      ],
+      "members":{
+        "Arn":{
+          "shape":"NotificationRuleArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the notification rule from which to remove the tags.</p>"
+        },
+        "TagKeys":{
+          "shape":"TagKeys",
+          "documentation":"<p>The key names of the tags to remove.</p>"
+        }
+      }
+    },
+    "UntagResourceResult":{
+      "type":"structure",
+      "members":{
+      }
+    },
+    "UpdateNotificationRuleRequest":{
+      "type":"structure",
+      "required":["Arn"],
+      "members":{
+        "Arn":{
+          "shape":"NotificationRuleArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the notification rule.</p>"
+        },
+        "Name":{
+          "shape":"NotificationRuleName",
+          "documentation":"<p>The name of the notification rule.</p>"
+        },
+        "Status":{
+          "shape":"NotificationRuleStatus",
+          "documentation":"<p>The status of the notification rule. Valid statuses include enabled (sending notifications) or disabled (not sending notifications).</p>"
+        },
+        "EventTypeIds":{
+          "shape":"EventTypeIds",
+          "documentation":"<p>A list of event types associated with this notification rule.</p>"
+        },
+        "Targets":{
+          "shape":"Targets",
+          "documentation":"<p>The address and type of the targets to receive notifications from this notification rule.</p>"
+        },
+        "DetailType":{
+          "shape":"DetailType",
+          "documentation":"<p>The level of detail to include in the notifications for this resource. BASIC will include only the contents of the event as it would appear in AWS CloudWatch. FULL will include any supplemental information provided by AWS CodeStar Notifications and/or the service for the resource for which the notification is created.</p>"
+        }
+      }
+    },
+    "UpdateNotificationRuleResult":{
+      "type":"structure",
+      "members":{
+      }
+    },
+    "ValidationException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"Message"}
+      },
+      "documentation":"<p>One or more parameter values are not valid.</p>",
+      "error":{"httpStatusCode":400},
+      "exception":true
+    }
+  },
+  "documentation":"<p>This AWS CodeStar Notifications API Reference provides descriptions and usage examples of the operations and data types for the AWS CodeStar Notifications API. You can use the AWS CodeStar Notifications API to work with the following objects:</p> <p>Notification rules, by calling the following: </p> <ul> <li> <p> <a>CreateNotificationRule</a>, which creates a notification rule for a resource in your account. </p> </li> <li> <p> <a>DeleteNotificationRule</a>, which deletes a notification rule. </p> </li> <li> <p> <a>DescribeNotificationRule</a>, which provides information about a notification rule. </p> </li> <li> <p> <a>ListNotificationRules</a>, which lists the notification rules associated with your account. </p> </li> <li> <p> <a>UpdateNotificationRule</a>, which changes the name, events, or targets associated with a notification rule. </p> </li> <li> <p> <a>Subscribe</a>, which subscribes a target to a notification rule. </p> </li> <li> <p> <a>Unsubscribe</a>, which removes a target from a notification rule. </p> </li> </ul> <p>Targets, by calling the following: </p> <ul> <li> <p> <a>DeleteTarget</a>, which removes a notification rule target (SNS topic) from a notification rule. </p> </li> <li> <p> <a>ListTargets</a>, which lists the targets associated with a notification rule. </p> </li> </ul> <p>Events, by calling the following: </p> <ul> <li> <p> <a>ListEventTypes</a>, which lists the event types you can include in a notification rule. </p> </li> </ul> <p>Tags, by calling the following: </p> <ul> <li> <p> <a>ListTagsForResource</a>, which lists the tags already associated with a notification rule in your account. </p> </li> <li> <p> <a>TagResource</a>, which associates a tag you provide with a notification rule in your account. </p> </li> <li> <p> <a>UntagResource</a>, which removes a tag from a notification rule in your account. </p> </li> </ul> <p> For information about how to use AWS CodeStar Notifications, see link in the CodeStarNotifications User Guide. </p>"
+}
diff --git a/services/cognitoidentity/build.properties b/services/cognitoidentity/build.properties
index ecf2dae6fcb1..15ec2da1fc71 100644
--- a/services/cognitoidentity/build.properties
+++ b/services/cognitoidentity/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/cognitoidentity/pom.xml b/services/cognitoidentity/pom.xml
index 112b99a4aac4..08880413f140 100644
--- a/services/cognitoidentity/pom.xml
+++ b/services/cognitoidentity/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>cognitoidentity</artifactId>
     <name>AWS Java SDK :: Services :: Amazon Cognito Identity</name>
diff --git a/services/cognitoidentity/src/main/resources/codegen-resources/service-2.json b/services/cognitoidentity/src/main/resources/codegen-resources/service-2.json
index 900e3b5a15d1..3ee6ced33d63 100644
--- a/services/cognitoidentity/src/main/resources/codegen-resources/service-2.json
+++ b/services/cognitoidentity/src/main/resources/codegen-resources/service-2.json
@@ -28,7 +28,7 @@
         {"shape":"InternalErrorException"},
         {"shape":"LimitExceededException"}
       ],
-      "documentation":"<p>Creates a new identity pool. The identity pool is a store of user identity information that is specific to your AWS account. The limit on identity pools is 60 per account. The keys for <code>SupportedLoginProviders</code> are as follows:</p> <ul> <li> <p>Facebook: <code>graph.facebook.com</code> </p> </li> <li> <p>Google: <code>accounts.google.com</code> </p> </li> <li> <p>Amazon: <code>www.amazon.com</code> </p> </li> <li> <p>Twitter: <code>api.twitter.com</code> </p> </li> <li> <p>Digits: <code>www.digits.com</code> </p> </li> </ul> <p>You must use AWS Developer credentials to call this API.</p>"
+      "documentation":"<p>Creates a new identity pool. The identity pool is a store of user identity information that is specific to your AWS account. The keys for <code>SupportedLoginProviders</code> are as follows:</p> <ul> <li> <p>Facebook: <code>graph.facebook.com</code> </p> </li> <li> <p>Google: <code>accounts.google.com</code> </p> </li> <li> <p>Amazon: <code>www.amazon.com</code> </p> </li> <li> <p>Twitter: <code>api.twitter.com</code> </p> </li> <li> <p>Digits: <code>www.digits.com</code> </p> </li> </ul> <p>You must use AWS Developer credentials to call this API.</p>"
     },
     "DeleteIdentities":{
       "name":"DeleteIdentities",
@@ -417,6 +417,7 @@
       "max":128,
       "min":1
     },
+    "ClassicFlow":{"type":"boolean"},
     "CognitoIdentityProvider":{
       "type":"structure",
       "members":{
@@ -479,6 +480,10 @@
           "shape":"IdentityPoolUnauthenticated",
           "documentation":"<p>TRUE if the identity pool supports unauthenticated logins.</p>"
         },
+        "AllowClassicFlow":{
+          "shape":"ClassicFlow",
+          "documentation":"<p>Enables or disables the Basic (Classic) authentication flow. For more information, see <a href=\"https://docs.aws.amazon.com/cognito/latest/developerguide/authentication-flow.html\">Identity Pools (Federated Identities) Authentication Flow</a> in the <i>Amazon Cognito Developer Guide</i>.</p>"
+        },
         "SupportedLoginProviders":{
           "shape":"IdentityProviders",
           "documentation":"<p>Optional key:value pairs mapping provider names to provider app IDs.</p>"
@@ -739,7 +744,7 @@
         },
         "TokenDuration":{
           "shape":"TokenDuration",
-          "documentation":"<p>The expiration time of the token, in seconds. You can specify a custom expiration time for the token so that you can cache it. If you don't provide an expiration time, the token is valid for 15 minutes. You can exchange the token with Amazon STS for temporary AWS credentials, which are valid for a maximum of one hour. The maximum token duration you can set is 24 hours. You should take care in setting the expiration time for a token, as there are significant security implications: an attacker could use a leaked token to access your AWS resources for the token's duration.</p>"
+          "documentation":"<p>The expiration time of the token, in seconds. You can specify a custom expiration time for the token so that you can cache it. If you don't provide an expiration time, the token is valid for 15 minutes. You can exchange the token with Amazon STS for temporary AWS credentials, which are valid for a maximum of one hour. The maximum token duration you can set is 24 hours. You should take care in setting the expiration time for a token, as there are significant security implications: an attacker could use a leaked token to access your AWS resources for the token's duration.</p> <note> <p>Please provide for a small grace period, usually no more than 5 minutes, to account for clock skew.</p> </note>"
         }
       },
       "documentation":"<p>Input to the <code>GetOpenIdTokenForDeveloperIdentity</code> action.</p>"
@@ -846,6 +851,10 @@
           "shape":"IdentityPoolUnauthenticated",
           "documentation":"<p>TRUE if the identity pool supports unauthenticated logins.</p>"
         },
+        "AllowClassicFlow":{
+          "shape":"ClassicFlow",
+          "documentation":"<p>Enables or disables the Basic (Classic) authentication flow. For more information, see <a href=\"https://docs.aws.amazon.com/cognito/latest/developerguide/authentication-flow.html\">Identity Pools (Federated Identities) Authentication Flow</a> in the <i>Amazon Cognito Developer Guide</i>.</p>"
+        },
         "SupportedLoginProviders":{
           "shape":"IdentityProviders",
           "documentation":"<p>Optional key:value pairs mapping provider names to provider app IDs.</p>"
@@ -883,7 +892,7 @@
       "type":"string",
       "max":128,
       "min":1,
-      "pattern":"[\\w ]+"
+      "pattern":"[\\w\\s+=,.@-]+"
     },
     "IdentityPoolShortDescription":{
       "type":"structure",
@@ -1345,7 +1354,10 @@
     },
     "TagResourceInput":{
       "type":"structure",
-      "required":["ResourceArn"],
+      "required":[
+        "ResourceArn",
+        "Tags"
+      ],
       "members":{
         "ResourceArn":{
           "shape":"ARNString",
@@ -1455,7 +1467,10 @@
     },
     "UntagResourceInput":{
       "type":"structure",
-      "required":["ResourceArn"],
+      "required":[
+        "ResourceArn",
+        "TagKeys"
+      ],
       "members":{
         "ResourceArn":{
           "shape":"ARNString",
diff --git a/services/cognitoidentity/src/test/resources/cucumber.properties b/services/cognitoidentity/src/test/resources/cucumber.properties
index e035af6a64ca..ee8ece63f8c4 100644
--- a/services/cognitoidentity/src/test/resources/cucumber.properties
+++ b/services/cognitoidentity/src/test/resources/cucumber.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/cognitoidentityprovider/build.properties b/services/cognitoidentityprovider/build.properties
index ecf2dae6fcb1..15ec2da1fc71 100644
--- a/services/cognitoidentityprovider/build.properties
+++ b/services/cognitoidentityprovider/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/cognitoidentityprovider/pom.xml b/services/cognitoidentityprovider/pom.xml
index b3c19cd08f60..3507c10f9e91 100644
--- a/services/cognitoidentityprovider/pom.xml
+++ b/services/cognitoidentityprovider/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>cognitoidentityprovider</artifactId>
     <name>AWS Java SDK :: Services :: Amazon Cognito Identity Provider Service</name>
diff --git a/services/cognitoidentityprovider/src/main/resources/codegen-resources/service-2.json b/services/cognitoidentityprovider/src/main/resources/codegen-resources/service-2.json
index 79ffb3b71dc6..13af0ec55196 100755
--- a/services/cognitoidentityprovider/src/main/resources/codegen-resources/service-2.json
+++ b/services/cognitoidentityprovider/src/main/resources/codegen-resources/service-2.json
@@ -551,7 +551,7 @@
         {"shape":"UserNotFoundException"},
         {"shape":"InternalErrorException"}
       ],
-      "documentation":"<p>Signs out users from all devices, as an administrator.</p> <p>Calling this action requires developer credentials.</p>"
+      "documentation":"<p>Signs out users from all devices, as an administrator. It also invalidates all refresh tokens issued to a user. The user's current access and Id tokens remain valid until their expiry. Access and Id tokens expire one hour after they are issued.</p> <p>Calling this action requires developer credentials.</p>"
     },
     "AssociateSoftwareToken":{
       "name":"AssociateSoftwareToken",
@@ -1109,7 +1109,7 @@
         {"shape":"UserNotConfirmedException"},
         {"shape":"InternalErrorException"}
       ],
-      "documentation":"<p>Calling this API causes a message to be sent to the end user with a confirmation code that is required to change the user's password. For the <code>Username</code> parameter, you can use the username or user alias. If a verified phone number exists for the user, the confirmation code is sent to the phone number. Otherwise, if a verified email exists, the confirmation code is sent to the email. If neither a verified phone number nor a verified email exists, <code>InvalidParameterException</code> is thrown. To use the confirmation code for resetting the password, call .</p>",
+      "documentation":"<p>Calling this API causes a message to be sent to the end user with a confirmation code that is required to change the user's password. For the <code>Username</code> parameter, you can use the username or user alias. The method used to send the confirmation code is sent according to the specified AccountRecoverySetting. For more information, see <a href=\"\">Recovering User Accounts</a> in the <i>Amazon Cognito Developer Guide</i>. If neither a verified phone number nor a verified email exists, an <code>InvalidParameterException</code> is thrown. To use the confirmation code for resetting the password, call .</p>",
       "authtype":"none"
     },
     "GetCSVHeader":{
@@ -1300,7 +1300,7 @@
         {"shape":"UserNotConfirmedException"},
         {"shape":"InternalErrorException"}
       ],
-      "documentation":"<p>Signs out users from all devices.</p>"
+      "documentation":"<p>Signs out users from all devices. It also invalidates all refresh tokens issued to a user. The user's current access and Id tokens remain valid until their expiry. Access and Id tokens expire one hour after they are issued.</p>"
     },
     "InitiateAuth":{
       "name":"InitiateAuth",
@@ -1807,7 +1807,7 @@
         {"shape":"NotAuthorizedException"},
         {"shape":"InternalErrorException"}
       ],
-      "documentation":"<p>Updates the specified group with the specified attributes.</p> <p>Calling this action requires developer credentials.</p>"
+      "documentation":"<p>Updates the specified group with the specified attributes.</p> <p>Calling this action requires developer credentials.</p> <important> <p>If you don't provide a value for an attribute, it will be set to the default value.</p> </important>"
     },
     "UpdateIdentityProvider":{
       "name":"UpdateIdentityProvider",
@@ -1842,7 +1842,7 @@
         {"shape":"TooManyRequestsException"},
         {"shape":"InternalErrorException"}
       ],
-      "documentation":"<p>Updates the name and scopes of resource server. All other fields are read-only.</p>"
+      "documentation":"<p>Updates the name and scopes of resource server. All other fields are read-only.</p> <important> <p>If you don't provide a value for an attribute, it will be set to the default value.</p> </important>"
     },
     "UpdateUserAttributes":{
       "name":"UpdateUserAttributes",
@@ -1896,7 +1896,7 @@
         {"shape":"UserPoolTaggingException"},
         {"shape":"InvalidEmailRoleAccessPolicyException"}
       ],
-      "documentation":"<p>Updates the specified user pool with the specified attributes. If you don't provide a value for an attribute, it will be set to the default value. You can get a list of the current user pool settings with .</p>"
+      "documentation":"<p>Updates the specified user pool with the specified attributes. You can get a list of the current user pool settings with .</p> <important> <p>If you don't provide a value for an attribute, it will be set to the default value.</p> </important>"
     },
     "UpdateUserPoolClient":{
       "name":"UpdateUserPoolClient",
@@ -1916,7 +1916,7 @@
         {"shape":"InvalidOAuthFlowException"},
         {"shape":"InternalErrorException"}
       ],
-      "documentation":"<p>Updates the specified user pool app client with the specified attributes. If you don't provide a value for an attribute, it will be set to the default value. You can get a list of the current user pool app client settings with .</p>"
+      "documentation":"<p>Updates the specified user pool app client with the specified attributes. You can get a list of the current user pool app client settings with .</p> <important> <p>If you don't provide a value for an attribute, it will be set to the default value.</p> </important>"
     },
     "UpdateUserPoolDomain":{
       "name":"UpdateUserPoolDomain",
@@ -1987,6 +1987,16 @@
   },
   "shapes":{
     "AWSAccountIdType":{"type":"string"},
+    "AccountRecoverySettingType":{
+      "type":"structure",
+      "members":{
+        "RecoveryMechanisms":{
+          "shape":"RecoveryMechanismsType",
+          "documentation":"<p>The list of <code>RecoveryOptionTypes</code>.</p>"
+        }
+      },
+      "documentation":"<p>The data type for <code>AccountRecoverySetting</code>.</p>"
+    },
     "AccountTakeoverActionNotifyType":{"type":"boolean"},
     "AccountTakeoverActionType":{
       "type":"structure",
@@ -2454,7 +2464,7 @@
         },
         "AuthFlow":{
           "shape":"AuthFlowType",
-          "documentation":"<p>The authentication flow for this call to execute. The API action will depend on this value. For example:</p> <ul> <li> <p> <code>REFRESH_TOKEN_AUTH</code> will take in a valid refresh token and return new tokens.</p> </li> <li> <p> <code>USER_SRP_AUTH</code> will take in <code>USERNAME</code> and <code>SRP_A</code> and return the SRP variables to be used for next challenge execution.</p> </li> <li> <p> <code>USER_PASSWORD_AUTH</code> will take in <code>USERNAME</code> and <code>PASSWORD</code> and return the next challenge or tokens.</p> </li> </ul> <p>Valid values include:</p> <ul> <li> <p> <code>USER_SRP_AUTH</code>: Authentication flow for the Secure Remote Password (SRP) protocol.</p> </li> <li> <p> <code>REFRESH_TOKEN_AUTH</code>/<code>REFRESH_TOKEN</code>: Authentication flow for refreshing the access token and ID token by supplying a valid refresh token.</p> </li> <li> <p> <code>CUSTOM_AUTH</code>: Custom authentication flow.</p> </li> <li> <p> <code>ADMIN_NO_SRP_AUTH</code>: Non-SRP authentication flow; you can pass in the USERNAME and PASSWORD directly if the flow is enabled for calling the app client.</p> </li> <li> <p> <code>USER_PASSWORD_AUTH</code>: Non-SRP authentication flow; USERNAME and PASSWORD are passed directly. If a user migration Lambda trigger is set, this flow will invoke the user migration Lambda if the USERNAME is not found in the user pool. </p> </li> </ul>"
+          "documentation":"<p>The authentication flow for this call to execute. The API action will depend on this value. For example:</p> <ul> <li> <p> <code>REFRESH_TOKEN_AUTH</code> will take in a valid refresh token and return new tokens.</p> </li> <li> <p> <code>USER_SRP_AUTH</code> will take in <code>USERNAME</code> and <code>SRP_A</code> and return the SRP variables to be used for next challenge execution.</p> </li> <li> <p> <code>USER_PASSWORD_AUTH</code> will take in <code>USERNAME</code> and <code>PASSWORD</code> and return the next challenge or tokens.</p> </li> </ul> <p>Valid values include:</p> <ul> <li> <p> <code>USER_SRP_AUTH</code>: Authentication flow for the Secure Remote Password (SRP) protocol.</p> </li> <li> <p> <code>REFRESH_TOKEN_AUTH</code>/<code>REFRESH_TOKEN</code>: Authentication flow for refreshing the access token and ID token by supplying a valid refresh token.</p> </li> <li> <p> <code>CUSTOM_AUTH</code>: Custom authentication flow.</p> </li> <li> <p> <code>ADMIN_NO_SRP_AUTH</code>: Non-SRP authentication flow; you can pass in the USERNAME and PASSWORD directly if the flow is enabled for calling the app client.</p> </li> <li> <p> <code>USER_PASSWORD_AUTH</code>: Non-SRP authentication flow; USERNAME and PASSWORD are passed directly. If a user migration Lambda trigger is set, this flow will invoke the user migration Lambda if the USERNAME is not found in the user pool. </p> </li> <li> <p> <code>ADMIN_USER_PASSWORD_AUTH</code>: Admin-based user password authentication. This replaces the <code>ADMIN_NO_SRP_AUTH</code> authentication flow. In this flow, Cognito receives the password in the request instead of using the SRP process to verify passwords.</p> </li> </ul>"
         },
         "AuthParameters":{
           "shape":"AuthParametersType",
@@ -3023,7 +3033,7 @@
           "documentation":"<p>If <code>UserDataShared</code> is <code>true</code>, Amazon Cognito will include user data in the events it publishes to Amazon Pinpoint analytics.</p>"
         }
       },
-      "documentation":"<p>The Amazon Pinpoint analytics configuration for collecting metrics for a user pool.</p>"
+      "documentation":"<p>The Amazon Pinpoint analytics configuration for collecting metrics for a user pool.</p> <note> <p>Cognito User Pools only supports sending events to Amazon Pinpoint projects in the US East (N. Virginia) us-east-1 Region, regardless of the region in which the user pool resides.</p> </note>"
     },
     "AnalyticsMetadataType":{
       "type":"structure",
@@ -3033,7 +3043,7 @@
           "documentation":"<p>The endpoint ID.</p>"
         }
       },
-      "documentation":"<p>An Amazon Pinpoint analytics endpoint.</p> <p>An endpoint uniquely identifies a mobile device, email address, or phone number that can receive messages from Amazon Pinpoint analytics.</p>"
+      "documentation":"<p>An Amazon Pinpoint analytics endpoint.</p> <p>An endpoint uniquely identifies a mobile device, email address, or phone number that can receive messages from Amazon Pinpoint analytics.</p> <note> <p>Cognito User Pools only supports sending events to Amazon Pinpoint projects in the US East (N. Virginia) us-east-1 Region, regardless of the region in which the user pool resides.</p> </note>"
     },
     "ArnType":{
       "type":"string",
@@ -3170,13 +3180,18 @@
         "REFRESH_TOKEN",
         "CUSTOM_AUTH",
         "ADMIN_NO_SRP_AUTH",
-        "USER_PASSWORD_AUTH"
+        "USER_PASSWORD_AUTH",
+        "ADMIN_USER_PASSWORD_AUTH"
       ]
     },
     "AuthParametersType":{
       "type":"map",
       "key":{"shape":"StringType"},
-      "value":{"shape":"StringType"}
+      "value":{"shape":"AuthParametersValueType"}
+    },
+    "AuthParametersValueType":{
+      "type":"string",
+      "sensitive":true
     },
     "AuthenticationResultType":{
       "type":"structure",
@@ -3511,7 +3526,7 @@
         },
         "ClientMetadata":{
           "shape":"ClientMetadataType",
-          "documentation":"<p>A map of custom key-value pairs that you can provide as input for any custom workflows that this action triggers. </p> <p>You create custom workflows by assigning AWS Lambda functions to user pool triggers. When you use the ConfirmForgotPassword API action, Amazon Cognito invokes the functions that are assigned to the <i>post confirmation</i> and <i>pre mutation</i> triggers. When Amazon Cognito invokes either of these functions, it passes a JSON payload, which the function receives as input. This payload contains a <code>clientMetadata</code> attribute, which provides the data that you assigned to the ClientMetadata parameter in your ConfirmForgotPassword request. In your function code in AWS Lambda, you can process the <code>clientMetadata</code> value to enhance your workflow for your specific needs.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/cognito/latest/developerguide/cognito-user-identity-pools-working-with-aws-lambda-triggers.html\">Customizing User Pool Workflows with Lambda Triggers</a> in the <i>Amazon Cognito Developer Guide</i>.</p> <note> <p>Take the following limitations into consideration when you use the ClientMetadata parameter:</p> <ul> <li> <p>Amazon Cognito does not store the ClientMetadata value. This data is available only to AWS Lambda triggers that are assigned to a user pool to support custom workflows. If your user pool configuration does not include triggers, the ClientMetadata parameter serves no purpose.</p> </li> <li> <p>Amazon Cognito does not validate the ClientMetadata value.</p> </li> <li> <p>Amazon Cognito does not encrypt the the ClientMetadata value, so don't use it to provide sensitive information.</p> </li> </ul> </note>"
+          "documentation":"<p>A map of custom key-value pairs that you can provide as input for any custom workflows that this action triggers. </p> <p>You create custom workflows by assigning AWS Lambda functions to user pool triggers. When you use the ConfirmForgotPassword API action, Amazon Cognito invokes the function that is assigned to the <i>post confirmation</i> trigger. When Amazon Cognito invokes this function, it passes a JSON payload, which the function receives as input. This payload contains a <code>clientMetadata</code> attribute, which provides the data that you assigned to the ClientMetadata parameter in your ConfirmForgotPassword request. In your function code in AWS Lambda, you can process the <code>clientMetadata</code> value to enhance your workflow for your specific needs.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/cognito/latest/developerguide/cognito-user-identity-pools-working-with-aws-lambda-triggers.html\">Customizing User Pool Workflows with Lambda Triggers</a> in the <i>Amazon Cognito Developer Guide</i>.</p> <note> <p>Take the following limitations into consideration when you use the ClientMetadata parameter:</p> <ul> <li> <p>Amazon Cognito does not store the ClientMetadata value. This data is available only to AWS Lambda triggers that are assigned to a user pool to support custom workflows. If your user pool configuration does not include triggers, the ClientMetadata parameter serves no purpose.</p> </li> <li> <p>Amazon Cognito does not validate the ClientMetadata value.</p> </li> <li> <p>Amazon Cognito does not encrypt the the ClientMetadata value, so don't use it to provide sensitive information.</p> </li> </ul> </note>"
         }
       },
       "documentation":"<p>The request representing the confirmation for a password reset.</p>"
@@ -3670,7 +3685,7 @@
         },
         "ProviderDetails":{
           "shape":"ProviderDetailsType",
-          "documentation":"<p>The identity provider details, such as <code>MetadataURL</code> and <code>MetadataFile</code>.</p>"
+          "documentation":"<p>The identity provider details. The following list describes the provider detail keys for each identity provider type.</p> <ul> <li> <p>For Google, Facebook and Login with Amazon:</p> <ul> <li> <p>client_id</p> </li> <li> <p>client_secret</p> </li> <li> <p>authorize_scopes</p> </li> </ul> </li> <li> <p>For Sign in with Apple:</p> <ul> <li> <p>client_id</p> </li> <li> <p>team_id</p> </li> <li> <p>key_id</p> </li> <li> <p>private_key</p> </li> <li> <p>authorize_scopes</p> </li> </ul> </li> <li> <p>For OIDC providers:</p> <ul> <li> <p>client_id</p> </li> <li> <p>client_secret</p> </li> <li> <p>attributes_request_method</p> </li> <li> <p>oidc_issuer</p> </li> <li> <p>authorize_scopes</p> </li> <li> <p>authorize_url <i>if not available from discovery URL specified by oidc_issuer key</i> </p> </li> <li> <p>token_url <i>if not available from discovery URL specified by oidc_issuer key</i> </p> </li> <li> <p>attributes_url <i>if not available from discovery URL specified by oidc_issuer key</i> </p> </li> <li> <p>jwks_uri <i>if not available from discovery URL specified by oidc_issuer key</i> </p> </li> <li> <p>authorize_scopes</p> </li> </ul> </li> <li> <p>For SAML providers:</p> <ul> <li> <p>MetadataFile OR MetadataURL</p> </li> <li> <p>IDPSignout <i>optional</i> </p> </li> </ul> </li> </ul>"
         },
         "AttributeMapping":{
           "shape":"AttributeMappingType",
@@ -3794,7 +3809,7 @@
         },
         "ExplicitAuthFlows":{
           "shape":"ExplicitAuthFlowsListType",
-          "documentation":"<p>The explicit authentication flows.</p>"
+          "documentation":"<p>The authentication flows that are supported by the user pool clients. Flow names without the <code>ALLOW_</code> prefix are deprecated in favor of new names with the <code>ALLOW_</code> prefix. Note that values with <code>ALLOW_</code> prefix cannot be used along with values without <code>ALLOW_</code> prefix.</p> <p>Valid values include:</p> <ul> <li> <p> <code>ALLOW_ADMIN_USER_PASSWORD_AUTH</code>: Enable admin based user password authentication flow <code>ADMIN_USER_PASSWORD_AUTH</code>. This setting replaces the <code>ADMIN_NO_SRP_AUTH</code> setting. With this authentication flow, Cognito receives the password in the request instead of using the SRP (Secure Remote Password protocol) protocol to verify passwords.</p> </li> <li> <p> <code>ALLOW_CUSTOM_AUTH</code>: Enable Lambda trigger based authentication.</p> </li> <li> <p> <code>ALLOW_USER_PASSWORD_AUTH</code>: Enable user password-based authentication. In this flow, Cognito receives the password in the request instead of using the SRP protocol to verify passwords.</p> </li> <li> <p> <code>ALLOW_USER_SRP_AUTH</code>: Enable SRP based authentication.</p> </li> <li> <p> <code>ALLOW_REFRESH_TOKEN_AUTH</code>: Enable authflow to refresh tokens.</p> </li> </ul>"
         },
         "SupportedIdentityProviders":{
           "shape":"SupportedIdentityProvidersListType",
@@ -3814,19 +3829,23 @@
         },
         "AllowedOAuthFlows":{
           "shape":"OAuthFlowsType",
-          "documentation":"<p>Set to <code>code</code> to initiate a code grant flow, which provides an authorization code as the response. This code can be exchanged for access tokens with the token endpoint.</p> <p>Set to <code>token</code> to specify that the client should get the access token (and, optionally, ID token, based on scopes) directly.</p>"
+          "documentation":"<p>The allowed OAuth flows.</p> <p>Set to <code>code</code> to initiate a code grant flow, which provides an authorization code as the response. This code can be exchanged for access tokens with the token endpoint.</p> <p>Set to <code>implicit</code> to specify that the client should get the access token (and, optionally, ID token, based on scopes) directly.</p> <p>Set to <code>client_credentials</code> to specify that the client should get the access token (and, optionally, ID token, based on scopes) from the token endpoint using a combination of client and client_secret.</p>"
         },
         "AllowedOAuthScopes":{
           "shape":"ScopeListType",
-          "documentation":"<p>A list of allowed <code>OAuth</code> scopes. Currently supported values are <code>\"phone\"</code>, <code>\"email\"</code>, <code>\"openid\"</code>, and <code>\"Cognito\"</code>. In addition to these values, custom scopes created in Resource Servers are also supported.</p>"
+          "documentation":"<p>The allowed OAuth scopes. Possible values provided by OAuth are: <code>phone</code>, <code>email</code>, <code>openid</code>, and <code>profile</code>. Possible values provided by AWS are: <code>aws.cognito.signin.user.admin</code>. Custom scopes created in Resource Servers are also supported.</p>"
         },
         "AllowedOAuthFlowsUserPoolClient":{
           "shape":"BooleanType",
-          "documentation":"<p>Set to <code>True</code> if the client is allowed to follow the OAuth protocol when interacting with Cognito user pools.</p>"
+          "documentation":"<p>Set to true if the client is allowed to follow the OAuth protocol when interacting with Cognito user pools.</p>"
         },
         "AnalyticsConfiguration":{
           "shape":"AnalyticsConfigurationType",
-          "documentation":"<p>The Amazon Pinpoint analytics configuration for collecting metrics for this user pool.</p>"
+          "documentation":"<p>The Amazon Pinpoint analytics configuration for collecting metrics for this user pool.</p> <note> <p>Cognito User Pools only supports sending events to Amazon Pinpoint projects in the US East (N. Virginia) us-east-1 Region, regardless of the region in which the user pool resides.</p> </note>"
+        },
+        "PreventUserExistenceErrors":{
+          "shape":"PreventUserExistenceErrorTypes",
+          "documentation":"<p>Use this setting to choose which errors and responses are returned by Cognito APIs during authentication, account confirmation, and password recovery when the user does not exist in the user pool. When set to <code>ENABLED</code> and the user does not exist, authentication returns an error indicating either the username or password was incorrect, and account confirmation and password recovery return a response indicating a code was sent to a simulated destination. When set to <code>LEGACY</code>, those APIs will return a <code>UserNotFoundException</code> exception if the user does not exist in the user pool.</p> <p>Valid values include:</p> <ul> <li> <p> <code>ENABLED</code> - This prevents user existence-related errors.</p> </li> <li> <p> <code>LEGACY</code> - This represents the old behavior of Cognito where user existence related errors are not prevented.</p> </li> </ul> <p>This setting affects the behavior of following APIs:</p> <ul> <li> <p> <a>AdminInitiateAuth</a> </p> </li> <li> <p> <a>AdminRespondToAuthChallenge</a> </p> </li> <li> <p> <a>InitiateAuth</a> </p> </li> <li> <p> <a>RespondToAuthChallenge</a> </p> </li> <li> <p> <a>ForgotPassword</a> </p> </li> <li> <p> <a>ConfirmForgotPassword</a> </p> </li> <li> <p> <a>ConfirmSignUp</a> </p> </li> <li> <p> <a>ResendConfirmationCode</a> </p> </li> </ul> <note> <p>After February 15th 2020, the value of <code>PreventUserExistenceErrors</code> will default to <code>ENABLED</code> for newly created user pool clients if no value is provided.</p> </note>"
         }
       },
       "documentation":"<p>Represents the request to create a user pool client.</p>"
@@ -3950,6 +3969,14 @@
         "UserPoolAddOns":{
           "shape":"UserPoolAddOnsType",
           "documentation":"<p>Used to enable advanced security risk detection. Set the key <code>AdvancedSecurityMode</code> to the value \"AUDIT\".</p>"
+        },
+        "UsernameConfiguration":{
+          "shape":"UsernameConfigurationType",
+          "documentation":"<p>You can choose to set case sensitivity on the username input for the selected sign-in option. For example, when this is set to <code>False</code>, users will be able to sign in using either \"username\" or \"Username\". This configuration is immutable once it has been set. For more information, see .</p>"
+        },
+        "AccountRecoverySetting":{
+          "shape":"AccountRecoverySettingType",
+          "documentation":"<p>Use this setting to define which verified available method a user can use to recover their password when they call <code>ForgotPassword</code>. It allows you to define a preferred method when a user has more than one method available. With this setting, SMS does not qualify for a valid password recovery mechanism if the user also has SMS MFA enabled. In the absence of this setting, Cognito uses the legacy behavior to determine the recovery method where SMS is preferred over email.</p> <note> <p>Starting February 1, 2020, the value of <code>AccountRecoverySetting</code> will default to <code>verified_email</code> first and <code>verified_phone_number</code> as the second option for newly created user pools if no value is provided.</p> </note>"
         }
       },
       "documentation":"<p>Represents the request to create a user pool.</p>"
@@ -4482,6 +4509,14 @@
         "EmailSendingAccount":{
           "shape":"EmailSendingAccountType",
           "documentation":"<p>Specifies whether Amazon Cognito emails your users by using its built-in email functionality or your Amazon SES email configuration. Specify one of the following values:</p> <dl> <dt>COGNITO_DEFAULT</dt> <dd> <p>When Amazon Cognito emails your users, it uses its built-in email functionality. When you use the default option, Amazon Cognito allows only a limited number of emails each day for your user pool. For typical production environments, the default email limit is below the required delivery volume. To achieve a higher delivery volume, specify DEVELOPER to use your Amazon SES email configuration.</p> <p>To look up the email delivery limit for the default option, see <a href=\"https://docs.aws.amazon.com/cognito/latest/developerguide/limits.html\">Limits in Amazon Cognito</a> in the <i>Amazon Cognito Developer Guide</i>.</p> <p>The default FROM address is no-reply@verificationemail.com. To customize the FROM address, provide the ARN of an Amazon SES verified email address for the <code>SourceArn</code> parameter.</p> </dd> <dt>DEVELOPER</dt> <dd> <p>When Amazon Cognito emails your users, it uses your Amazon SES configuration. Amazon Cognito calls Amazon SES on your behalf to send email from your verified email address. When you use this option, the email delivery limits are the same limits that apply to your Amazon SES verified email address in your AWS account.</p> <p>If you use this option, you must provide the ARN of an Amazon SES verified email address for the <code>SourceArn</code> parameter.</p> <p>Before Amazon Cognito can email your users, it requires additional permissions to call Amazon SES on your behalf. When you update your user pool with this option, Amazon Cognito creates a <i>service-linked role</i>, which is a type of IAM role, in your AWS account. This role contains the permissions that allow Amazon Cognito to access Amazon SES and send email messages with your address. For more information about the service-linked role that Amazon Cognito creates, see <a href=\"https://docs.aws.amazon.com/cognito/latest/developerguide/using-service-linked-roles.html\">Using Service-Linked Roles for Amazon Cognito</a> in the <i>Amazon Cognito Developer Guide</i>.</p> </dd> </dl>"
+        },
+        "From":{
+          "shape":"StringType",
+          "documentation":"<p>Identifies either the sender’s email address or the sender’s name with their email address. For example, <code>testuser@example.com</code> or <code>Test User &lt;testuser@example.com&gt;</code>. This address will appear before the body of the email.</p>"
+        },
+        "ConfigurationSet":{
+          "shape":"SESConfigurationSet",
+          "documentation":"<p>The set of configuration rules that can be applied to emails sent using Amazon SES. A configuration set is applied to an email by including a reference to the configuration set in the headers of the email. Once applied, all of the rules in that configuration set are applied to the email. Configuration sets can be used to apply the following types of rules to emails: </p> <ul> <li> <p>Event publishing – Amazon SES can track the number of send, delivery, open, click, bounce, and complaint events for each email sent. Use event publishing to send information about these events to other AWS services such as SNS and CloudWatch.</p> </li> <li> <p>IP pool management – When leasing dedicated IP addresses with Amazon SES, you can create groups of IP addresses, called dedicated IP pools. You can then associate the dedicated IP pools with configuration sets.</p> </li> </ul>"
         }
       },
       "documentation":"<p>The email configuration type.</p>"
@@ -4620,6 +4655,10 @@
         "RiskLevel":{
           "shape":"RiskLevelType",
           "documentation":"<p>The risk level.</p>"
+        },
+        "CompromisedCredentialsDetected":{
+          "shape":"WrappedBooleanType",
+          "documentation":"<p>Indicates whether compromised credentials were detected during an authentication event.</p>"
         }
       },
       "documentation":"<p>The event risk type.</p>"
@@ -4652,7 +4691,12 @@
       "enum":[
         "ADMIN_NO_SRP_AUTH",
         "CUSTOM_AUTH_FLOW_ONLY",
-        "USER_PASSWORD_AUTH"
+        "USER_PASSWORD_AUTH",
+        "ALLOW_ADMIN_USER_PASSWORD_AUTH",
+        "ALLOW_CUSTOM_AUTH",
+        "ALLOW_USER_PASSWORD_AUTH",
+        "ALLOW_USER_SRP_AUTH",
+        "ALLOW_REFRESH_TOKEN_AUTH"
       ]
     },
     "FeedbackValueType":{
@@ -5080,7 +5124,7 @@
         },
         "ProviderDetails":{
           "shape":"ProviderDetailsType",
-          "documentation":"<p>The identity provider details, such as <code>MetadataURL</code> and <code>MetadataFile</code>.</p>"
+          "documentation":"<p>The identity provider details. The following list describes the provider detail keys for each identity provider type.</p> <ul> <li> <p>For Google, Facebook and Login with Amazon:</p> <ul> <li> <p>client_id</p> </li> <li> <p>client_secret</p> </li> <li> <p>authorize_scopes</p> </li> </ul> </li> <li> <p>For Sign in with Apple:</p> <ul> <li> <p>client_id</p> </li> <li> <p>team_id</p> </li> <li> <p>key_id</p> </li> <li> <p>private_key</p> </li> <li> <p>authorize_scopes</p> </li> </ul> </li> <li> <p>For OIDC providers:</p> <ul> <li> <p>client_id</p> </li> <li> <p>client_secret</p> </li> <li> <p>attributes_request_method</p> </li> <li> <p>oidc_issuer</p> </li> <li> <p>authorize_scopes</p> </li> <li> <p>authorize_url <i>if not available from discovery URL specified by oidc_issuer key</i> </p> </li> <li> <p>token_url <i>if not available from discovery URL specified by oidc_issuer key</i> </p> </li> <li> <p>attributes_url <i>if not available from discovery URL specified by oidc_issuer key</i> </p> </li> <li> <p>jwks_uri <i>if not available from discovery URL specified by oidc_issuer key</i> </p> </li> <li> <p>authorize_scopes</p> </li> </ul> </li> <li> <p>For SAML providers:</p> <ul> <li> <p>MetadataFile OR MetadataURL</p> </li> <li> <p>IDPSignOut <i>optional</i> </p> </li> </ul> </li> </ul>"
         },
         "AttributeMapping":{
           "shape":"AttributeMappingType",
@@ -5108,6 +5152,7 @@
         "Facebook",
         "Google",
         "LoginWithAmazon",
+        "SignInWithApple",
         "OIDC"
       ]
     },
@@ -5134,7 +5179,7 @@
       "members":{
         "AuthFlow":{
           "shape":"AuthFlowType",
-          "documentation":"<p>The authentication flow for this call to execute. The API action will depend on this value. For example: </p> <ul> <li> <p> <code>REFRESH_TOKEN_AUTH</code> will take in a valid refresh token and return new tokens.</p> </li> <li> <p> <code>USER_SRP_AUTH</code> will take in <code>USERNAME</code> and <code>SRP_A</code> and return the SRP variables to be used for next challenge execution.</p> </li> <li> <p> <code>USER_PASSWORD_AUTH</code> will take in <code>USERNAME</code> and <code>PASSWORD</code> and return the next challenge or tokens.</p> </li> </ul> <p>Valid values include:</p> <ul> <li> <p> <code>USER_SRP_AUTH</code>: Authentication flow for the Secure Remote Password (SRP) protocol.</p> </li> <li> <p> <code>REFRESH_TOKEN_AUTH</code>/<code>REFRESH_TOKEN</code>: Authentication flow for refreshing the access token and ID token by supplying a valid refresh token.</p> </li> <li> <p> <code>CUSTOM_AUTH</code>: Custom authentication flow.</p> </li> <li> <p> <code>USER_PASSWORD_AUTH</code>: Non-SRP authentication flow; USERNAME and PASSWORD are passed directly. If a user migration Lambda trigger is set, this flow will invoke the user migration Lambda if the USERNAME is not found in the user pool. </p> </li> </ul> <p> <code>ADMIN_NO_SRP_AUTH</code> is not a valid value.</p>"
+          "documentation":"<p>The authentication flow for this call to execute. The API action will depend on this value. For example: </p> <ul> <li> <p> <code>REFRESH_TOKEN_AUTH</code> will take in a valid refresh token and return new tokens.</p> </li> <li> <p> <code>USER_SRP_AUTH</code> will take in <code>USERNAME</code> and <code>SRP_A</code> and return the SRP variables to be used for next challenge execution.</p> </li> <li> <p> <code>USER_PASSWORD_AUTH</code> will take in <code>USERNAME</code> and <code>PASSWORD</code> and return the next challenge or tokens.</p> </li> </ul> <p>Valid values include:</p> <ul> <li> <p> <code>USER_SRP_AUTH</code>: Authentication flow for the Secure Remote Password (SRP) protocol.</p> </li> <li> <p> <code>REFRESH_TOKEN_AUTH</code>/<code>REFRESH_TOKEN</code>: Authentication flow for refreshing the access token and ID token by supplying a valid refresh token.</p> </li> <li> <p> <code>CUSTOM_AUTH</code>: Custom authentication flow.</p> </li> <li> <p> <code>USER_PASSWORD_AUTH</code>: Non-SRP authentication flow; USERNAME and PASSWORD are passed directly. If a user migration Lambda trigger is set, this flow will invoke the user migration Lambda if the USERNAME is not found in the user pool. </p> </li> <li> <p> <code>ADMIN_USER_PASSWORD_AUTH</code>: Admin-based user password authentication. This replaces the <code>ADMIN_NO_SRP_AUTH</code> authentication flow. In this flow, Cognito receives the password in the request instead of using the SRP process to verify passwords.</p> </li> </ul> <p> <code>ADMIN_NO_SRP_AUTH</code> is not a valid value.</p>"
         },
         "AuthParameters":{
           "shape":"AuthParametersType",
@@ -5927,6 +5972,18 @@
       "documentation":"<p>This exception is thrown when a precondition is not met.</p>",
       "exception":true
     },
+    "PreventUserExistenceErrorTypes":{
+      "type":"string",
+      "enum":[
+        "LEGACY",
+        "ENABLED"
+      ]
+    },
+    "PriorityType":{
+      "type":"integer",
+      "max":2,
+      "min":1
+    },
     "ProviderDescription":{
       "type":"structure",
       "members":{
@@ -6000,6 +6057,38 @@
       "max":60,
       "min":0
     },
+    "RecoveryMechanismsType":{
+      "type":"list",
+      "member":{"shape":"RecoveryOptionType"},
+      "max":2,
+      "min":1
+    },
+    "RecoveryOptionNameType":{
+      "type":"string",
+      "enum":[
+        "verified_email",
+        "verified_phone_number",
+        "admin_only"
+      ]
+    },
+    "RecoveryOptionType":{
+      "type":"structure",
+      "required":[
+        "Priority",
+        "Name"
+      ],
+      "members":{
+        "Priority":{
+          "shape":"PriorityType",
+          "documentation":"<p>A positive integer specifying priority of a method with 1 being the highest priority.</p>"
+        },
+        "Name":{
+          "shape":"RecoveryOptionNameType",
+          "documentation":"<p>Specifies the recovery method for a user.</p>"
+        }
+      },
+      "documentation":"<p>A map containing a priority as a key, and recovery method name as a value.</p>"
+    },
     "RedirectUrlType":{
       "type":"string",
       "max":1024,
@@ -6264,6 +6353,12 @@
       "min":3,
       "pattern":"^[0-9A-Za-z\\.\\-_]*(?<!\\.)$"
     },
+    "SESConfigurationSet":{
+      "type":"string",
+      "max":64,
+      "min":1,
+      "pattern":"^[a-zA-Z0-9_-]+$"
+    },
     "SMSMfaSettingsType":{
       "type":"structure",
       "members":{
@@ -6291,7 +6386,7 @@
         },
         "DeveloperOnlyAttribute":{
           "shape":"BooleanType",
-          "documentation":"<p>Specifies whether the attribute type is developer only.</p>",
+          "documentation":"<note> <p>We recommend that you use <a href=\"https://docs.aws.amazon.com/cognito-user-identity-pools/latest/APIReference/API_UserPoolClientType.html#CognitoUserPools-Type-UserPoolClientType-WriteAttributes\">WriteAttributes</a> in the user pool client to control how attributes can be mutated for new use cases instead of using <code>DeveloperOnlyAttribute</code>.</p> </note> <p>Specifies whether the attribute type is developer only. This attribute can only be modified by an administrator. Users will not be able to modify this attribute using their access token. For example, <code>DeveloperOnlyAttribute</code> can be modified using the API but cannot be updated using the API.</p>",
           "box":true
         },
         "Mutable":{
@@ -7095,7 +7190,7 @@
         },
         "ClientMetadata":{
           "shape":"ClientMetadataType",
-          "documentation":"<p>A map of custom key-value pairs that you can provide as input for any custom workflows that this action triggers. </p> <p>You create custom workflows by assigning AWS Lambda functions to user pool triggers. When you use the UpdateUserAttributes API action, Amazon Cognito invokes the functions that are assigned to the <i>custom message</i> and <i>pre mutation</i> triggers. When Amazon Cognito invokes either of these functions, it passes a JSON payload, which the function receives as input. This payload contains a <code>clientMetadata</code> attribute, which provides the data that you assigned to the ClientMetadata parameter in your UpdateUserAttributes request. In your function code in AWS Lambda, you can process the <code>clientMetadata</code> value to enhance your workflow for your specific needs.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/cognito/latest/developerguide/cognito-user-identity-pools-working-with-aws-lambda-triggers.html\">Customizing User Pool Workflows with Lambda Triggers</a> in the <i>Amazon Cognito Developer Guide</i>.</p> <note> <p>Take the following limitations into consideration when you use the ClientMetadata parameter:</p> <ul> <li> <p>Amazon Cognito does not store the ClientMetadata value. This data is available only to AWS Lambda triggers that are assigned to a user pool to support custom workflows. If your user pool configuration does not include triggers, the ClientMetadata parameter serves no purpose.</p> </li> <li> <p>Amazon Cognito does not validate the ClientMetadata value.</p> </li> <li> <p>Amazon Cognito does not encrypt the the ClientMetadata value, so don't use it to provide sensitive information.</p> </li> </ul> </note>"
+          "documentation":"<p>A map of custom key-value pairs that you can provide as input for any custom workflows that this action triggers. </p> <p>You create custom workflows by assigning AWS Lambda functions to user pool triggers. When you use the UpdateUserAttributes API action, Amazon Cognito invokes the function that is assigned to the <i>custom message</i> trigger. When Amazon Cognito invokes this function, it passes a JSON payload, which the function receives as input. This payload contains a <code>clientMetadata</code> attribute, which provides the data that you assigned to the ClientMetadata parameter in your UpdateUserAttributes request. In your function code in AWS Lambda, you can process the <code>clientMetadata</code> value to enhance your workflow for your specific needs.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/cognito/latest/developerguide/cognito-user-identity-pools-working-with-aws-lambda-triggers.html\">Customizing User Pool Workflows with Lambda Triggers</a> in the <i>Amazon Cognito Developer Guide</i>.</p> <note> <p>Take the following limitations into consideration when you use the ClientMetadata parameter:</p> <ul> <li> <p>Amazon Cognito does not store the ClientMetadata value. This data is available only to AWS Lambda triggers that are assigned to a user pool to support custom workflows. If your user pool configuration does not include triggers, the ClientMetadata parameter serves no purpose.</p> </li> <li> <p>Amazon Cognito does not validate the ClientMetadata value.</p> </li> <li> <p>Amazon Cognito does not encrypt the the ClientMetadata value, so don't use it to provide sensitive information.</p> </li> </ul> </note>"
         }
       },
       "documentation":"<p>Represents the request to update user attributes.</p>"
@@ -7143,7 +7238,7 @@
         },
         "ExplicitAuthFlows":{
           "shape":"ExplicitAuthFlowsListType",
-          "documentation":"<p>Explicit authentication flows.</p>"
+          "documentation":"<p>The authentication flows that are supported by the user pool clients. Flow names without the <code>ALLOW_</code> prefix are deprecated in favor of new names with the <code>ALLOW_</code> prefix. Note that values with <code>ALLOW_</code> prefix cannot be used along with values without <code>ALLOW_</code> prefix.</p> <p>Valid values include:</p> <ul> <li> <p> <code>ALLOW_ADMIN_USER_PASSWORD_AUTH</code>: Enable admin based user password authentication flow <code>ADMIN_USER_PASSWORD_AUTH</code>. This setting replaces the <code>ADMIN_NO_SRP_AUTH</code> setting. With this authentication flow, Cognito receives the password in the request instead of using the SRP (Secure Remote Password protocol) protocol to verify passwords.</p> </li> <li> <p> <code>ALLOW_CUSTOM_AUTH</code>: Enable Lambda trigger based authentication.</p> </li> <li> <p> <code>ALLOW_USER_PASSWORD_AUTH</code>: Enable user password-based authentication. In this flow, Cognito receives the password in the request instead of using the SRP protocol to verify passwords.</p> </li> <li> <p> <code>ALLOW_USER_SRP_AUTH</code>: Enable SRP based authentication.</p> </li> <li> <p> <code>ALLOW_REFRESH_TOKEN_AUTH</code>: Enable authflow to refresh tokens.</p> </li> </ul>"
         },
         "SupportedIdentityProviders":{
           "shape":"SupportedIdentityProvidersListType",
@@ -7163,19 +7258,23 @@
         },
         "AllowedOAuthFlows":{
           "shape":"OAuthFlowsType",
-          "documentation":"<p>Set to <code>code</code> to initiate a code grant flow, which provides an authorization code as the response. This code can be exchanged for access tokens with the token endpoint.</p>"
+          "documentation":"<p>The allowed OAuth flows.</p> <p>Set to <code>code</code> to initiate a code grant flow, which provides an authorization code as the response. This code can be exchanged for access tokens with the token endpoint.</p> <p>Set to <code>implicit</code> to specify that the client should get the access token (and, optionally, ID token, based on scopes) directly.</p> <p>Set to <code>client_credentials</code> to specify that the client should get the access token (and, optionally, ID token, based on scopes) from the token endpoint using a combination of client and client_secret.</p>"
         },
         "AllowedOAuthScopes":{
           "shape":"ScopeListType",
-          "documentation":"<p>A list of allowed <code>OAuth</code> scopes. Currently supported values are <code>\"phone\"</code>, <code>\"email\"</code>, <code>\"openid\"</code>, and <code>\"Cognito\"</code>. In addition to these values, custom scopes created in Resource Servers are also supported.</p>"
+          "documentation":"<p>The allowed OAuth scopes. Possible values provided by OAuth are: <code>phone</code>, <code>email</code>, <code>openid</code>, and <code>profile</code>. Possible values provided by AWS are: <code>aws.cognito.signin.user.admin</code>. Custom scopes created in Resource Servers are also supported.</p>"
         },
         "AllowedOAuthFlowsUserPoolClient":{
           "shape":"BooleanType",
-          "documentation":"<p>Set to TRUE if the client is allowed to follow the OAuth protocol when interacting with Cognito user pools.</p>"
+          "documentation":"<p>Set to true if the client is allowed to follow the OAuth protocol when interacting with Cognito user pools.</p>"
         },
         "AnalyticsConfiguration":{
           "shape":"AnalyticsConfigurationType",
-          "documentation":"<p>The Amazon Pinpoint analytics configuration for collecting metrics for this user pool.</p>"
+          "documentation":"<p>The Amazon Pinpoint analytics configuration for collecting metrics for this user pool.</p> <note> <p>Cognito User Pools only supports sending events to Amazon Pinpoint projects in the US East (N. Virginia) us-east-1 Region, regardless of the region in which the user pool resides.</p> </note>"
+        },
+        "PreventUserExistenceErrors":{
+          "shape":"PreventUserExistenceErrorTypes",
+          "documentation":"<p>Use this setting to choose which errors and responses are returned by Cognito APIs during authentication, account confirmation, and password recovery when the user does not exist in the user pool. When set to <code>ENABLED</code> and the user does not exist, authentication returns an error indicating either the username or password was incorrect, and account confirmation and password recovery return a response indicating a code was sent to a simulated destination. When set to <code>LEGACY</code>, those APIs will return a <code>UserNotFoundException</code> exception if the user does not exist in the user pool.</p> <p>Valid values include:</p> <ul> <li> <p> <code>ENABLED</code> - This prevents user existence-related errors.</p> </li> <li> <p> <code>LEGACY</code> - This represents the old behavior of Cognito where user existence related errors are not prevented.</p> </li> </ul> <p>This setting affects the behavior of following APIs:</p> <ul> <li> <p> <a>AdminInitiateAuth</a> </p> </li> <li> <p> <a>AdminRespondToAuthChallenge</a> </p> </li> <li> <p> <a>InitiateAuth</a> </p> </li> <li> <p> <a>RespondToAuthChallenge</a> </p> </li> <li> <p> <a>ForgotPassword</a> </p> </li> <li> <p> <a>ConfirmForgotPassword</a> </p> </li> <li> <p> <a>ConfirmSignUp</a> </p> </li> <li> <p> <a>ResendConfirmationCode</a> </p> </li> </ul> <note> <p>After February 15th 2020, the value of <code>PreventUserExistenceErrors</code> will default to <code>ENABLED</code> for newly created user pool clients if no value is provided.</p> </note>"
         }
       },
       "documentation":"<p>Represents the request to update the user pool client.</p>"
@@ -7290,6 +7389,10 @@
         "UserPoolAddOns":{
           "shape":"UserPoolAddOnsType",
           "documentation":"<p>Used to enable advanced security risk detection. Set the key <code>AdvancedSecurityMode</code> to the value \"AUDIT\".</p>"
+        },
+        "AccountRecoverySetting":{
+          "shape":"AccountRecoverySettingType",
+          "documentation":"<p>Use this setting to define which verified available method a user can use to recover their password when they call <code>ForgotPassword</code>. It allows you to define a preferred method when a user has more than one method available. With this setting, SMS does not qualify for a valid password recovery mechanism if the user also has SMS MFA enabled. In the absence of this setting, Cognito uses the legacy behavior to determine the recovery method where SMS is preferred over email.</p>"
         }
       },
       "documentation":"<p>Represents the request to update the user pool.</p>"
@@ -7533,7 +7636,7 @@
         },
         "ExplicitAuthFlows":{
           "shape":"ExplicitAuthFlowsListType",
-          "documentation":"<p>The explicit authentication flows.</p>"
+          "documentation":"<p>The authentication flows that are supported by the user pool clients. Flow names without the <code>ALLOW_</code> prefix are deprecated in favor of new names with the <code>ALLOW_</code> prefix. Note that values with <code>ALLOW_</code> prefix cannot be used along with values without <code>ALLOW_</code> prefix.</p> <p>Valid values include:</p> <ul> <li> <p> <code>ALLOW_ADMIN_USER_PASSWORD_AUTH</code>: Enable admin based user password authentication flow <code>ADMIN_USER_PASSWORD_AUTH</code>. This setting replaces the <code>ADMIN_NO_SRP_AUTH</code> setting. With this authentication flow, Cognito receives the password in the request instead of using the SRP (Secure Remote Password protocol) protocol to verify passwords.</p> </li> <li> <p> <code>ALLOW_CUSTOM_AUTH</code>: Enable Lambda trigger based authentication.</p> </li> <li> <p> <code>ALLOW_USER_PASSWORD_AUTH</code>: Enable user password-based authentication. In this flow, Cognito receives the password in the request instead of using the SRP protocol to verify passwords.</p> </li> <li> <p> <code>ALLOW_USER_SRP_AUTH</code>: Enable SRP based authentication.</p> </li> <li> <p> <code>ALLOW_REFRESH_TOKEN_AUTH</code>: Enable authflow to refresh tokens.</p> </li> </ul>"
         },
         "SupportedIdentityProviders":{
           "shape":"SupportedIdentityProvidersListType",
@@ -7553,20 +7656,24 @@
         },
         "AllowedOAuthFlows":{
           "shape":"OAuthFlowsType",
-          "documentation":"<p>Set to <code>code</code> to initiate a code grant flow, which provides an authorization code as the response. This code can be exchanged for access tokens with the token endpoint.</p> <p>Set to <code>token</code> to specify that the client should get the access token (and, optionally, ID token, based on scopes) directly.</p>"
+          "documentation":"<p>The allowed OAuth flows.</p> <p>Set to <code>code</code> to initiate a code grant flow, which provides an authorization code as the response. This code can be exchanged for access tokens with the token endpoint.</p> <p>Set to <code>implicit</code> to specify that the client should get the access token (and, optionally, ID token, based on scopes) directly.</p> <p>Set to <code>client_credentials</code> to specify that the client should get the access token (and, optionally, ID token, based on scopes) from the token endpoint using a combination of client and client_secret.</p>"
         },
         "AllowedOAuthScopes":{
           "shape":"ScopeListType",
-          "documentation":"<p>A list of allowed <code>OAuth</code> scopes. Currently supported values are <code>\"phone\"</code>, <code>\"email\"</code>, <code>\"openid\"</code>, and <code>\"Cognito\"</code>. In addition to these values, custom scopes created in Resource Servers are also supported.</p>"
+          "documentation":"<p>The allowed OAuth scopes. Possible values provided by OAuth are: <code>phone</code>, <code>email</code>, <code>openid</code>, and <code>profile</code>. Possible values provided by AWS are: <code>aws.cognito.signin.user.admin</code>. Custom scopes created in Resource Servers are also supported.</p>"
         },
         "AllowedOAuthFlowsUserPoolClient":{
           "shape":"BooleanType",
-          "documentation":"<p>Set to TRUE if the client is allowed to follow the OAuth protocol when interacting with Cognito user pools.</p>",
+          "documentation":"<p>Set to true if the client is allowed to follow the OAuth protocol when interacting with Cognito user pools.</p>",
           "box":true
         },
         "AnalyticsConfiguration":{
           "shape":"AnalyticsConfigurationType",
-          "documentation":"<p>The Amazon Pinpoint analytics configuration for the user pool client.</p>"
+          "documentation":"<p>The Amazon Pinpoint analytics configuration for the user pool client.</p> <note> <p>Cognito User Pools only supports sending events to Amazon Pinpoint projects in the US East (N. Virginia) us-east-1 Region, regardless of the region in which the user pool resides.</p> </note>"
+        },
+        "PreventUserExistenceErrors":{
+          "shape":"PreventUserExistenceErrorTypes",
+          "documentation":"<p>Use this setting to choose which errors and responses are returned by Cognito APIs during authentication, account confirmation, and password recovery when the user does not exist in the user pool. When set to <code>ENABLED</code> and the user does not exist, authentication returns an error indicating either the username or password was incorrect, and account confirmation and password recovery return a response indicating a code was sent to a simulated destination. When set to <code>LEGACY</code>, those APIs will return a <code>UserNotFoundException</code> exception if the user does not exist in the user pool.</p> <p>Valid values include:</p> <ul> <li> <p> <code>ENABLED</code> - This prevents user existence-related errors.</p> </li> <li> <p> <code>LEGACY</code> - This represents the old behavior of Cognito where user existence related errors are not prevented.</p> </li> </ul> <p>This setting affects the behavior of following APIs:</p> <ul> <li> <p> <a>AdminInitiateAuth</a> </p> </li> <li> <p> <a>AdminRespondToAuthChallenge</a> </p> </li> <li> <p> <a>InitiateAuth</a> </p> </li> <li> <p> <a>RespondToAuthChallenge</a> </p> </li> <li> <p> <a>ForgotPassword</a> </p> </li> <li> <p> <a>ConfirmForgotPassword</a> </p> </li> <li> <p> <a>ConfirmSignUp</a> </p> </li> <li> <p> <a>ResendConfirmationCode</a> </p> </li> </ul> <note> <p>After February 15th 2020, the value of <code>PreventUserExistenceErrors</code> will default to <code>ENABLED</code> for newly created user pool clients if no value is provided.</p> </note>"
         }
       },
       "documentation":"<p>Contains information about a user pool client.</p>"
@@ -7767,9 +7874,17 @@
           "shape":"UserPoolAddOnsType",
           "documentation":"<p>The user pool add-ons.</p>"
         },
+        "UsernameConfiguration":{
+          "shape":"UsernameConfigurationType",
+          "documentation":"<p>You can choose to enable case sensitivity on the username input for the selected sign-in option. For example, when this is set to <code>False</code>, users will be able to sign in using either \"username\" or \"Username\". This configuration is immutable once it has been set. For more information, see .</p>"
+        },
         "Arn":{
           "shape":"ArnType",
           "documentation":"<p>The Amazon Resource Name (ARN) for the user pool.</p>"
+        },
+        "AccountRecoverySetting":{
+          "shape":"AccountRecoverySettingType",
+          "documentation":"<p>Use this setting to define which verified available method a user can use to recover their password when they call <code>ForgotPassword</code>. It allows you to define a preferred method when a user has more than one method available. With this setting, SMS does not qualify for a valid password recovery mechanism if the user also has SMS MFA enabled. In the absence of this setting, Cognito uses the legacy behavior to determine the recovery method where SMS is preferred over email.</p>"
         }
       },
       "documentation":"<p>A container for information about the user pool.</p>"
@@ -7831,6 +7946,17 @@
       "type":"list",
       "member":{"shape":"UsernameAttributeType"}
     },
+    "UsernameConfigurationType":{
+      "type":"structure",
+      "required":["CaseSensitive"],
+      "members":{
+        "CaseSensitive":{
+          "shape":"WrappedBooleanType",
+          "documentation":"<p>Specifies whether username case sensitivity will be applied for all users in the user pool through Cognito APIs.</p> <p>Valid values include:</p> <ul> <li> <p> <b> <code>True</code> </b>: Enables case sensitivity for all username input. When this option is set to <code>True</code>, users must sign in using the exact capitalization of their given username. For example, “UserName”. This is the default value.</p> </li> <li> <p> <b> <code>False</code> </b>: Enables case insensitivity for all username input. For example, when this option is set to <code>False</code>, users will be able to sign in using either \"username\" or \"Username\". This option also enables both <code>preferred_username</code> and <code>email</code> alias to be case insensitive, in addition to the <code>username</code> attribute.</p> </li> </ul>"
+        }
+      },
+      "documentation":"<p>The username configuration type. </p>"
+    },
     "UsernameExistsException":{
       "type":"structure",
       "members":{
@@ -7964,7 +8090,8 @@
       "members":{
       },
       "documentation":"<p>A container representing the response from the server from the request to verify user attributes.</p>"
-    }
+    },
+    "WrappedBooleanType":{"type":"boolean"}
   },
   "documentation":"<p>Using the Amazon Cognito User Pools API, you can create a user pool to manage directories and users. You can authenticate a user to obtain tokens related to user identity and access policies.</p> <p>This API reference provides information about user pools in Amazon Cognito User Pools.</p> <p>For more information, see the Amazon Cognito Documentation.</p>"
 }
diff --git a/services/cognitoidentityprovider/src/test/resources/cucumber.properties b/services/cognitoidentityprovider/src/test/resources/cucumber.properties
index 5a97ac411a08..f7d3f20e8390 100644
--- a/services/cognitoidentityprovider/src/test/resources/cucumber.properties
+++ b/services/cognitoidentityprovider/src/test/resources/cucumber.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/cognitosync/build.properties b/services/cognitosync/build.properties
index ecf2dae6fcb1..15ec2da1fc71 100644
--- a/services/cognitosync/build.properties
+++ b/services/cognitosync/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/cognitosync/pom.xml b/services/cognitosync/pom.xml
index c6ea36354317..48bd9036deb0 100644
--- a/services/cognitosync/pom.xml
+++ b/services/cognitosync/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>cognitosync</artifactId>
     <name>AWS Java SDK :: Services :: Amazon Cognito Sync</name>
diff --git a/services/cognitosync/src/test/resources/cucumber.properties b/services/cognitosync/src/test/resources/cucumber.properties
index b83c766e9a6a..1956b69fc1ef 100644
--- a/services/cognitosync/src/test/resources/cucumber.properties
+++ b/services/cognitosync/src/test/resources/cucumber.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/comprehend/pom.xml b/services/comprehend/pom.xml
index 489d98b2b037..5bb972e78bfb 100644
--- a/services/comprehend/pom.xml
+++ b/services/comprehend/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>services</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>comprehend</artifactId>
diff --git a/services/comprehend/src/main/resources/codegen-resources/service-2.json b/services/comprehend/src/main/resources/codegen-resources/service-2.json
index 8c579832e79f..a5607e55abf2 100644
--- a/services/comprehend/src/main/resources/codegen-resources/service-2.json
+++ b/services/comprehend/src/main/resources/codegen-resources/service-2.json
@@ -97,6 +97,22 @@
       ],
       "documentation":"<p>Inspects the text of a batch of documents for the syntax and part of speech of the words in the document and returns information about them. For more information, see <a>how-syntax</a>.</p>"
     },
+    "ClassifyDocument":{
+      "name":"ClassifyDocument",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"ClassifyDocumentRequest"},
+      "output":{"shape":"ClassifyDocumentResponse"},
+      "errors":[
+        {"shape":"InvalidRequestException"},
+        {"shape":"ResourceUnavailableException"},
+        {"shape":"TextSizeLimitExceededException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Creates a new document classification request to analyze a single document in real-time, using a previously created and trained custom model and an endpoint.</p>"
+    },
     "CreateDocumentClassifier":{
       "name":"CreateDocumentClassifier",
       "http":{
@@ -117,6 +133,26 @@
       ],
       "documentation":"<p>Creates a new document classifier that you can use to categorize documents. To create a classifier you provide a set of training documents that labeled with the categories that you want to use. After the classifier is trained you can use it to categorize a set of labeled documents into the categories. For more information, see <a>how-document-classification</a>.</p>"
     },
+    "CreateEndpoint":{
+      "name":"CreateEndpoint",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"CreateEndpointRequest"},
+      "output":{"shape":"CreateEndpointResponse"},
+      "errors":[
+        {"shape":"InvalidRequestException"},
+        {"shape":"ResourceInUseException"},
+        {"shape":"ResourceLimitExceededException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ResourceUnavailableException"},
+        {"shape":"TooManyRequestsException"},
+        {"shape":"TooManyTagsException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Creates a model-specific endpoint for synchronous inference for a previously trained custom model </p>"
+    },
     "CreateEntityRecognizer":{
       "name":"CreateEntityRecognizer",
       "http":{
@@ -155,6 +191,23 @@
       ],
       "documentation":"<p>Deletes a previously created document classifier</p> <p>Only those classifiers that are in terminated states (IN_ERROR, TRAINED) will be deleted. If an active inference job is using the model, a <code>ResourceInUseException</code> will be returned.</p> <p>This is an asynchronous action that puts the classifier into a DELETING state, and it is then removed by a background job. Once removed, the classifier disappears from your account and is no longer available for use. </p>"
     },
+    "DeleteEndpoint":{
+      "name":"DeleteEndpoint",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DeleteEndpointRequest"},
+      "output":{"shape":"DeleteEndpointResponse"},
+      "errors":[
+        {"shape":"InvalidRequestException"},
+        {"shape":"ResourceInUseException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"TooManyRequestsException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Deletes a model-specific endpoint for a previously-trained custom model. All endpoints must be deleted in order for the model to be deleted.</p>"
+    },
     "DeleteEntityRecognizer":{
       "name":"DeleteEntityRecognizer",
       "http":{
@@ -221,6 +274,22 @@
       ],
       "documentation":"<p>Gets the properties associated with a dominant language detection job. Use this operation to get the status of a detection job.</p>"
     },
+    "DescribeEndpoint":{
+      "name":"DescribeEndpoint",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DescribeEndpointRequest"},
+      "output":{"shape":"DescribeEndpointResponse"},
+      "errors":[
+        {"shape":"InvalidRequestException"},
+        {"shape":"TooManyRequestsException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Gets the properties associated with a specific endpoint. Use this operation to get the status of an endpoint.</p>"
+    },
     "DescribeEntitiesDetectionJob":{
       "name":"DescribeEntitiesDetectionJob",
       "http":{
@@ -428,6 +497,21 @@
       ],
       "documentation":"<p>Gets a list of the dominant language detection jobs that you have submitted.</p>"
     },
+    "ListEndpoints":{
+      "name":"ListEndpoints",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"ListEndpointsRequest"},
+      "output":{"shape":"ListEndpointsResponse"},
+      "errors":[
+        {"shape":"InvalidRequestException"},
+        {"shape":"TooManyRequestsException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Gets a list of all existing endpoints that you've created.</p>"
+    },
     "ListEntitiesDetectionJobs":{
       "name":"ListEntitiesDetectionJobs",
       "http":{
@@ -748,6 +832,25 @@
         {"shape":"InternalServerException"}
       ],
       "documentation":"<p>Removes a specific tag associated with an Amazon Comprehend resource. </p>"
+    },
+    "UpdateEndpoint":{
+      "name":"UpdateEndpoint",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"UpdateEndpointRequest"},
+      "output":{"shape":"UpdateEndpointResponse"},
+      "errors":[
+        {"shape":"InvalidRequestException"},
+        {"shape":"TooManyRequestsException"},
+        {"shape":"ResourceInUseException"},
+        {"shape":"ResourceLimitExceededException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ResourceUnavailableException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Updates information about the specified endpoint.</p>"
     }
   },
   "shapes":{
@@ -820,7 +923,7 @@
         },
         "LanguageCode":{
           "shape":"LanguageCode",
-          "documentation":"<p>The language of the input documents. You can specify any of the primary languages supported by Amazon Comprehend: German (\"de\"), English (\"en\"), Spanish (\"es\"), French (\"fr\"), Italian (\"it\"), or Portuguese (\"pt\"). All documents must be in the same language.</p>"
+          "documentation":"<p>The language of the input documents. You can specify any of the primary languages supported by Amazon Comprehend. All documents must be in the same language.</p>"
         }
       }
     },
@@ -868,7 +971,7 @@
         },
         "LanguageCode":{
           "shape":"LanguageCode",
-          "documentation":"<p>The language of the input documents. You can specify any of the primary languages supported by Amazon Comprehend: German (\"de\"), English (\"en\"), Spanish (\"es\"), French (\"fr\"), Italian (\"it\"), or Portuguese (\"pt\"). All documents must be in the same language.</p>"
+          "documentation":"<p>The language of the input documents. You can specify any of the primary languages supported by Amazon Comprehend. All documents must be in the same language.</p>"
         }
       }
     },
@@ -920,7 +1023,7 @@
         },
         "LanguageCode":{
           "shape":"LanguageCode",
-          "documentation":"<p>The language of the input documents. You can specify any of the primary languages supported by Amazon Comprehend: German (\"de\"), English (\"en\"), Spanish (\"es\"), French (\"fr\"), Italian (\"it\"), or Portuguese (\"pt\"). All documents must be in the same language.</p>"
+          "documentation":"<p>The language of the input documents. You can specify any of the primary languages supported by Amazon Comprehend. All documents must be in the same language.</p>"
         }
       }
     },
@@ -968,7 +1071,7 @@
         },
         "LanguageCode":{
           "shape":"SyntaxLanguageCode",
-          "documentation":"<p>The language of the input documents. You can specify any of the primary languages supported by Amazon Comprehend: German (\"de\"), English (\"en\"), Spanish (\"es\"), French (\"fr\"), Italian (\"it\"), or Portuguese (\"pt\"). All documents must be in the same language.</p>"
+          "documentation":"<p>The language of the input documents. You can specify any of the following languages supported by Amazon Comprehend: German (\"de\"), English (\"en\"), Spanish (\"es\"), French (\"fr\"), Italian (\"it\"), or Portuguese (\"pt\"). All documents must be in the same language.</p>"
         }
       }
     },
@@ -1037,6 +1140,22 @@
         "F1Score":{
           "shape":"Double",
           "documentation":"<p>A measure of how accurate the classifier results are for the test data. It is derived from the <code>Precision</code> and <code>Recall</code> values. The <code>F1Score</code> is the harmonic average of the two scores. The highest score is 1, and the worst score is 0. </p>"
+        },
+        "MicroPrecision":{
+          "shape":"Double",
+          "documentation":"<p>A measure of the usefulness of the recognizer results in the test data. High precision means that the recognizer returned substantially more relevant results than irrelevant ones. Unlike the Precision metric which comes from averaging the precision of all available labels, this is based on the overall score of all precision scores added together.</p>"
+        },
+        "MicroRecall":{
+          "shape":"Double",
+          "documentation":"<p>A measure of how complete the classifier results are for the test data. High recall means that the classifier returned most of the relevant results. Specifically, this indicates how many of the correct categories in the text that the model can predict. It is a percentage of correct categories in the text that can found. Instead of averaging the recall scores of all labels (as with Recall), micro Recall is based on the overall score of all recall scores added together.</p>"
+        },
+        "MicroF1Score":{
+          "shape":"Double",
+          "documentation":"<p>A measure of how accurate the classifier results are for the test data. It is a combination of the <code>Micro Precision</code> and <code>Micro Recall</code> values. The <code>Micro F1Score</code> is the harmonic mean of the two scores. The highest score is 1, and the worst score is 0.</p>"
+        },
+        "HammingLoss":{
+          "shape":"Double",
+          "documentation":"<p>Indicates the fraction of labels that are incorrectly predicted. Also seen as the fraction of wrong labels compared to the total number of labels. Scores closer to zero are better.</p>"
         }
       },
       "documentation":"<p>Describes the result metrics for the test data associated with an documentation classifier.</p>"
@@ -1063,6 +1182,36 @@
       },
       "documentation":"<p>Provides information about a document classifier.</p>"
     },
+    "ClassifyDocumentRequest":{
+      "type":"structure",
+      "required":[
+        "Text",
+        "EndpointArn"
+      ],
+      "members":{
+        "Text":{
+          "shape":"String",
+          "documentation":"<p>The document text to be analyzed.</p>"
+        },
+        "EndpointArn":{
+          "shape":"DocumentClassifierEndpointArn",
+          "documentation":"<p>The Amazon Resource Number (ARN) of the endpoint.</p>"
+        }
+      }
+    },
+    "ClassifyDocumentResponse":{
+      "type":"structure",
+      "members":{
+        "Classes":{
+          "shape":"ListOfClasses",
+          "documentation":"<p>The classes used by the document being analyzed. These are used for multi-class trained models. Individual classes are mutually exclusive and each document is expected to have only a single class assigned to it. For example, an animal can be a dog or a cat, but not both at the same time. </p>"
+        },
+        "Labels":{
+          "shape":"ListOfLabels",
+          "documentation":"<p>The labels used the document being analyzed. These are used for multi-label trained models. Individual labels represent different categories that are related in some manner and are not multually exclusive. For example, a movie can be just an action movie, or it can be an action movie, a science fiction movie, and a comedy, all at the same time. </p>"
+        }
+      }
+    },
     "ClientRequestTokenString":{
       "type":"string",
       "max":64,
@@ -1077,7 +1226,22 @@
     "ComprehendArnName":{
       "type":"string",
       "max":63,
-      "pattern":"^[a-zA-Z0-9](-*[a-zA-Z0-9])*"
+      "pattern":"^[a-zA-Z0-9](-*[a-zA-Z0-9])*$"
+    },
+    "ComprehendEndpointArn":{
+      "type":"string",
+      "max":256,
+      "pattern":"arn:aws(-[^:]+)?:comprehend:[a-zA-Z0-9-]*:[0-9]{12}:document-classifier-endpoint/[a-zA-Z0-9](-*[a-zA-Z0-9])*"
+    },
+    "ComprehendEndpointName":{
+      "type":"string",
+      "max":40,
+      "pattern":"^[a-zA-Z0-9](-*[a-zA-Z0-9])*$"
+    },
+    "ComprehendModelArn":{
+      "type":"string",
+      "max":256,
+      "pattern":"arn:aws(-[^:]+)?:comprehend:[a-zA-Z0-9-]*:[0-9]{12}:document-classifier/[a-zA-Z0-9](-*[a-zA-Z0-9])*"
     },
     "ConcurrentModificationException":{
       "type":"structure",
@@ -1123,7 +1287,7 @@
         },
         "LanguageCode":{
           "shape":"LanguageCode",
-          "documentation":"<p>The language of the input documents. You can specify any of the primary languages supported by Amazon Comprehend: German (\"de\"), English (\"en\"), Spanish (\"es\"), French (\"fr\"), Italian (\"it\"), or Portuguese (\"pt\"). All documents must be in the same language.</p>"
+          "documentation":"<p>The language of the input documents. You can specify any of the following languages supported by Amazon Comprehend: German (\"de\"), English (\"en\"), Spanish (\"es\"), French (\"fr\"), Italian (\"it\"), or Portuguese (\"pt\"). All documents must be in the same language.</p>"
         },
         "VolumeKmsKeyId":{
           "shape":"KmsKeyId",
@@ -1132,6 +1296,10 @@
         "VpcConfig":{
           "shape":"VpcConfig",
           "documentation":"<p>Configuration parameters for an optional private Virtual Private Cloud (VPC) containing the resources you are using for your custom classifier. For more information, see <a href=\"https://docs.aws.amazon.com/vpc/latest/userguide/what-is-amazon-vpc.html\">Amazon VPC</a>. </p>"
+        },
+        "Mode":{
+          "shape":"DocumentClassifierMode",
+          "documentation":"<p>Indicates the mode in which the classifier will be trained. The classifier can be trained in multi-class mode, which identifies one and only one class for each document, or multi-label mode, which identifies one or more labels for each document. In multi-label mode, multiple labels for an individual document are separated by a delimiter. The default delimiter between labels is a pipe (|).</p>"
         }
       }
     },
@@ -1144,6 +1312,46 @@
         }
       }
     },
+    "CreateEndpointRequest":{
+      "type":"structure",
+      "required":[
+        "EndpointName",
+        "ModelArn",
+        "DesiredInferenceUnits"
+      ],
+      "members":{
+        "EndpointName":{
+          "shape":"ComprehendEndpointName",
+          "documentation":"<p>This is the descriptive suffix that becomes part of the <code>EndpointArn</code> used for all subsequent requests to this resource. </p>"
+        },
+        "ModelArn":{
+          "shape":"ComprehendModelArn",
+          "documentation":"<p>The Amazon Resource Number (ARN) of the model to which the endpoint will be attached.</p>"
+        },
+        "DesiredInferenceUnits":{
+          "shape":"InferenceUnitsInteger",
+          "documentation":"<p> The desired number of inference units to be used by the model using this endpoint. Each inference unit represents of a throughput of 100 characters per second.</p>"
+        },
+        "ClientRequestToken":{
+          "shape":"ClientRequestTokenString",
+          "documentation":"<p>An idempotency token provided by the customer. If this token matches a previous endpoint creation request, Amazon Comprehend will not return a <code>ResourceInUseException</code>. </p>",
+          "idempotencyToken":true
+        },
+        "Tags":{
+          "shape":"TagList",
+          "documentation":"<p>Tags associated with the endpoint being created. A tag is a key-value pair that adds metadata to the endpoint. For example, a tag with \"Sales\" as the key might be added to an endpoint to indicate its use by the sales department. </p>"
+        }
+      }
+    },
+    "CreateEndpointResponse":{
+      "type":"structure",
+      "members":{
+        "EndpointArn":{
+          "shape":"ComprehendEndpointArn",
+          "documentation":"<p>The Amazon Resource Number (ARN) of the endpoint being created.</p>"
+        }
+      }
+    },
     "CreateEntityRecognizerRequest":{
       "type":"structure",
       "required":[
@@ -1212,6 +1420,21 @@
       "members":{
       }
     },
+    "DeleteEndpointRequest":{
+      "type":"structure",
+      "required":["EndpointArn"],
+      "members":{
+        "EndpointArn":{
+          "shape":"ComprehendEndpointArn",
+          "documentation":"<p>The Amazon Resource Number (ARN) of the endpoint being deleted.</p>"
+        }
+      }
+    },
+    "DeleteEndpointResponse":{
+      "type":"structure",
+      "members":{
+      }
+    },
     "DeleteEntityRecognizerRequest":{
       "type":"structure",
       "required":["EntityRecognizerArn"],
@@ -1284,6 +1507,25 @@
         }
       }
     },
+    "DescribeEndpointRequest":{
+      "type":"structure",
+      "required":["EndpointArn"],
+      "members":{
+        "EndpointArn":{
+          "shape":"ComprehendEndpointArn",
+          "documentation":"<p>The Amazon Resource Number (ARN) of the endpoint being described.</p>"
+        }
+      }
+    },
+    "DescribeEndpointResponse":{
+      "type":"structure",
+      "members":{
+        "EndpointProperties":{
+          "shape":"EndpointProperties",
+          "documentation":"<p>Describes information associated with the specific endpoint.</p>"
+        }
+      }
+    },
     "DescribeEntitiesDetectionJobRequest":{
       "type":"structure",
       "required":["JobId"],
@@ -1411,7 +1653,7 @@
         },
         "LanguageCode":{
           "shape":"LanguageCode",
-          "documentation":"<p>The language of the input documents. You can specify any of the primary languages supported by Amazon Comprehend: German (\"de\"), English (\"en\"), Spanish (\"es\"), French (\"fr\"), Italian (\"it\"), or Portuguese (\"pt\"). All documents must be in the same language.</p>"
+          "documentation":"<p>The language of the input documents. You can specify any of the primary languages supported by Amazon Comprehend. All documents must be in the same language.</p>"
         }
       }
     },
@@ -1437,7 +1679,7 @@
         },
         "LanguageCode":{
           "shape":"LanguageCode",
-          "documentation":"<p>The language of the input documents. You can specify any of the primary languages supported by Amazon Comprehend: German (\"de\"), English (\"en\"), Spanish (\"es\"), French (\"fr\"), Italian (\"it\"), or Portuguese (\"pt\"). All documents must be in the same language.</p>"
+          "documentation":"<p>The language of the input documents. You can specify any of the primary languages supported by Amazon Comprehend. All documents must be in the same language.</p>"
         }
       }
     },
@@ -1463,7 +1705,7 @@
         },
         "LanguageCode":{
           "shape":"LanguageCode",
-          "documentation":"<p>The language of the input documents. You can specify any of the primary languages supported by Amazon Comprehend: German (\"de\"), English (\"en\"), Spanish (\"es\"), French (\"fr\"), Italian (\"it\"), or Portuguese (\"pt\"). All documents must be in the same language.</p>"
+          "documentation":"<p>The language of the input documents. You can specify any of the primary languages supported by Amazon Comprehend. All documents must be in the same language.</p>"
         }
       }
     },
@@ -1493,7 +1735,7 @@
         },
         "LanguageCode":{
           "shape":"SyntaxLanguageCode",
-          "documentation":"<p>The language code of the input documents. You can specify any of the primary languages supported by Amazon Comprehend: German (\"de\"), English (\"en\"), Spanish (\"es\"), French (\"fr\"), Italian (\"it\"), or Portuguese (\"pt\").</p>"
+          "documentation":"<p>The language code of the input documents. You can specify any of the following languages supported by Amazon Comprehend: German (\"de\"), English (\"en\"), Spanish (\"es\"), French (\"fr\"), Italian (\"it\"), or Portuguese (\"pt\").</p>"
         }
       }
     },
@@ -1506,6 +1748,20 @@
         }
       }
     },
+    "DocumentClass":{
+      "type":"structure",
+      "members":{
+        "Name":{
+          "shape":"String",
+          "documentation":"<p>The name of the class.</p>"
+        },
+        "Score":{
+          "shape":"Float",
+          "documentation":"<p>The confidence score that Amazon Comprehend has this class correctly attributed.</p>"
+        }
+      },
+      "documentation":"<p>Specifies the class that categorizes the document being analyzed</p>"
+    },
     "DocumentClassificationJobFilter":{
       "type":"structure",
       "members":{
@@ -1591,6 +1847,11 @@
       "max":256,
       "pattern":"arn:aws(-[^:]+)?:comprehend:[a-zA-Z0-9-]*:[0-9]{12}:document-classifier/[a-zA-Z0-9](-*[a-zA-Z0-9])*"
     },
+    "DocumentClassifierEndpointArn":{
+      "type":"string",
+      "max":256,
+      "pattern":"arn:aws(-[^:]+)?:comprehend:[a-zA-Z0-9-]*:[0-9]{12}:document-classifier-endpoint/[a-zA-Z0-9](-*[a-zA-Z0-9])*"
+    },
     "DocumentClassifierFilter":{
       "type":"structure",
       "members":{
@@ -1616,10 +1877,21 @@
         "S3Uri":{
           "shape":"S3Uri",
           "documentation":"<p>The Amazon S3 URI for the input data. The S3 bucket must be in the same region as the API endpoint that you are calling. The URI can point to a single input file or it can provide the prefix for a collection of input files.</p> <p>For example, if you use the URI <code>S3://bucketName/prefix</code>, if the prefix is a single file, Amazon Comprehend uses that file as input. If more than one file begins with the prefix, Amazon Comprehend uses all of them as input.</p>"
+        },
+        "LabelDelimiter":{
+          "shape":"LabelDelimiter",
+          "documentation":"<p>Indicates the delimiter used to separate each label for training a multi-label classifier. The default delimiter between labels is a pipe (|). You can use a different character as a delimiter (if it's an allowed character) by specifying it under Delimiter for labels. If the training documents use a delimiter other than the default or the delimiter you specify, the labels on that line will be combined to make a single unique label, such as LABELLABELLABEL.</p>"
         }
       },
       "documentation":"<p>The input properties for training a document classifier. </p> <p>For more information on how the input file is formatted, see <a>how-document-classification-training-data</a>. </p>"
     },
+    "DocumentClassifierMode":{
+      "type":"string",
+      "enum":[
+        "MULTI_CLASS",
+        "MULTI_LABEL"
+      ]
+    },
     "DocumentClassifierOutputDataConfig":{
       "type":"structure",
       "members":{
@@ -1692,6 +1964,10 @@
         "VpcConfig":{
           "shape":"VpcConfig",
           "documentation":"<p> Configuration parameters for a private Virtual Private Cloud (VPC) containing the resources you are using for your custom classifier. For more information, see <a href=\"https://docs.aws.amazon.com/vpc/latest/userguide/what-is-amazon-vpc.html\">Amazon VPC</a>. </p>"
+        },
+        "Mode":{
+          "shape":"DocumentClassifierMode",
+          "documentation":"<p>Indicates the mode in which the specific classifier was trained. This also indicates the format of input documents and the format of the confusion matrix. Each classifier can only be trained in one mode and this cannot be changed once the classifier is trained.</p>"
         }
       },
       "documentation":"<p>Provides information about a document classifier.</p>"
@@ -1700,6 +1976,20 @@
       "type":"list",
       "member":{"shape":"DocumentClassifierProperties"}
     },
+    "DocumentLabel":{
+      "type":"structure",
+      "members":{
+        "Name":{
+          "shape":"String",
+          "documentation":"<p>The name of the label.</p>"
+        },
+        "Score":{
+          "shape":"Float",
+          "documentation":"<p>The confidence score that Amazon Comprehend has this label correctly attributed.</p>"
+        }
+      },
+      "documentation":"<p>Specifies one of the label or labels that categorize the document being analyzed.</p>"
+    },
     "DominantLanguage":{
       "type":"structure",
       "members":{
@@ -1791,6 +2081,80 @@
       "member":{"shape":"DominantLanguageDetectionJobProperties"}
     },
     "Double":{"type":"double"},
+    "EndpointFilter":{
+      "type":"structure",
+      "members":{
+        "ModelArn":{
+          "shape":"ComprehendModelArn",
+          "documentation":"<p>The Amazon Resource Number (ARN) of the model to which the endpoint is attached.</p>"
+        },
+        "Status":{
+          "shape":"EndpointStatus",
+          "documentation":"<p>Specifies the status of the endpoint being returned. Possible values are: Creating, Ready, Updating, Deleting, Failed.</p>"
+        },
+        "CreationTimeBefore":{
+          "shape":"Timestamp",
+          "documentation":"<p>Specifies a date before which the returned endpoint or endpoints were created.</p>"
+        },
+        "CreationTimeAfter":{
+          "shape":"Timestamp",
+          "documentation":"<p>Specifies a date after which the returned endpoint or endpoints were created.</p>"
+        }
+      },
+      "documentation":"<p>The filter used to determine which endpoints are are returned. You can filter jobs on their name, model, status, or the date and time that they were created. You can only set one filter at a time. </p>"
+    },
+    "EndpointProperties":{
+      "type":"structure",
+      "members":{
+        "EndpointArn":{
+          "shape":"ComprehendEndpointArn",
+          "documentation":"<p>The Amazon Resource Number (ARN) of the endpoint.</p>"
+        },
+        "Status":{
+          "shape":"EndpointStatus",
+          "documentation":"<p>Specifies the status of the endpoint. Because the endpoint updates and creation are asynchronous, so customers will need to wait for the endpoint to be <code>Ready</code> status before making inference requests.</p>"
+        },
+        "Message":{
+          "shape":"AnyLengthString",
+          "documentation":"<p>Specifies a reason for failure in cases of <code>Failed</code> status.</p>"
+        },
+        "ModelArn":{
+          "shape":"ComprehendModelArn",
+          "documentation":"<p>The Amazon Resource Number (ARN) of the model to which the endpoint is attached.</p>"
+        },
+        "DesiredInferenceUnits":{
+          "shape":"InferenceUnitsInteger",
+          "documentation":"<p>The desired number of inference units to be used by the model using this endpoint. Each inference unit represents of a throughput of 100 characters per second.</p>"
+        },
+        "CurrentInferenceUnits":{
+          "shape":"InferenceUnitsInteger",
+          "documentation":"<p>The number of inference units currently used by the model using this endpoint.</p>"
+        },
+        "CreationTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>The creation date and time of the endpoint.</p>"
+        },
+        "LastModifiedTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>The date and time that the endpoint was last modified.</p>"
+        }
+      },
+      "documentation":"<p>Specifies information about the specified endpoint.</p>"
+    },
+    "EndpointPropertiesList":{
+      "type":"list",
+      "member":{"shape":"EndpointProperties"}
+    },
+    "EndpointStatus":{
+      "type":"string",
+      "enum":[
+        "CREATING",
+        "DELETING",
+        "FAILED",
+        "IN_SERVICE",
+        "UPDATING"
+      ]
+    },
     "EntitiesDetectionJobFilter":{
       "type":"structure",
       "members":{
@@ -2040,7 +2404,7 @@
         },
         "NumberOfTrainMentions":{
           "shape":"Integer",
-          "documentation":"<p>indicates the number of times the given entity name was seen in the training data. </p>"
+          "documentation":"<p>Indicates the number of times the given entity type was seen in the training data. </p>"
         }
       },
       "documentation":"<p>Individual item from the list of entity types in the metadata of an entity recognizer.</p>"
@@ -2166,6 +2530,10 @@
       "min":20,
       "pattern":"arn:aws(-[^:]+)?:iam::[0-9]{12}:role/.+"
     },
+    "InferenceUnitsInteger":{
+      "type":"integer",
+      "min":1
+    },
     "InputDataConfig":{
       "type":"structure",
       "required":["S3Uri"],
@@ -2359,6 +2727,12 @@
       "documentation":"<p>The KMS customer managed key (CMK) entered cannot be validated. Verify the key and re-enter it.</p>",
       "exception":true
     },
+    "LabelDelimiter":{
+      "type":"string",
+      "max":1,
+      "min":1,
+      "pattern":"^[ ~!@#$%^*\\-_+=|\\\\:;\\t>?/]$"
+    },
     "LanguageCode":{
       "type":"string",
       "enum":[
@@ -2367,7 +2741,13 @@
         "fr",
         "de",
         "it",
-        "pt"
+        "pt",
+        "ar",
+        "hi",
+        "ja",
+        "ko",
+        "zh",
+        "zh-TW"
       ]
     },
     "ListDocumentClassificationJobsRequest":{
@@ -2460,6 +2840,36 @@
         }
       }
     },
+    "ListEndpointsRequest":{
+      "type":"structure",
+      "members":{
+        "Filter":{
+          "shape":"EndpointFilter",
+          "documentation":"<p>Filters the endpoints that are returned. You can filter endpoints on their name, model, status, or the date and time that they were created. You can only set one filter at a time. </p>"
+        },
+        "NextToken":{
+          "shape":"String",
+          "documentation":"<p>Identifies the next page of results to return.</p>"
+        },
+        "MaxResults":{
+          "shape":"MaxResultsInteger",
+          "documentation":"<p>The maximum number of results to return in each page. The default is 100.</p>"
+        }
+      }
+    },
+    "ListEndpointsResponse":{
+      "type":"structure",
+      "members":{
+        "EndpointPropertiesList":{
+          "shape":"EndpointPropertiesList",
+          "documentation":"<p>Displays a list of endpoint properties being retrieved by the service in response to the request.</p>"
+        },
+        "NextToken":{
+          "shape":"String",
+          "documentation":"<p>Identifies the next page of results to return.</p>"
+        }
+      }
+    },
     "ListEntitiesDetectionJobsRequest":{
       "type":"structure",
       "members":{
@@ -2550,6 +2960,10 @@
         }
       }
     },
+    "ListOfClasses":{
+      "type":"list",
+      "member":{"shape":"DocumentClass"}
+    },
     "ListOfDetectDominantLanguageResult":{
       "type":"list",
       "member":{"shape":"BatchDetectDominantLanguageItemResult"}
@@ -2582,6 +2996,10 @@
       "type":"list",
       "member":{"shape":"KeyPhrase"}
     },
+    "ListOfLabels":{
+      "type":"list",
+      "member":{"shape":"DocumentLabel"}
+    },
     "ListOfSyntaxTokens":{
       "type":"list",
       "member":{"shape":"SyntaxToken"}
@@ -3043,7 +3461,7 @@
         },
         "LanguageCode":{
           "shape":"LanguageCode",
-          "documentation":"<p>The language of the input documents. All documents must be in the same language. You can specify any of the languages supported by Amazon Comprehend: English (\"en\"), Spanish (\"es\"), French (\"fr\"), German (\"de\"), Italian (\"it\"), or Portuguese (\"pt\"). If custom entities recognition is used, this parameter is ignored and the language used for training the model is used instead.</p>"
+          "documentation":"<p>The language of the input documents. All documents must be in the same language. You can specify any of the languages supported by Amazon Comprehend. If custom entities recognition is used, this parameter is ignored and the language used for training the model is used instead.</p>"
         },
         "ClientRequestToken":{
           "shape":"ClientRequestTokenString",
@@ -3100,7 +3518,7 @@
         },
         "LanguageCode":{
           "shape":"LanguageCode",
-          "documentation":"<p>The language of the input documents. You can specify any of the primary languages supported by Amazon Comprehend: German (\"de\"), English (\"en\"), Spanish (\"es\"), French (\"fr\"), Italian (\"it\"), or Portuguese (\"pt\"). All documents must be in the same language.</p>"
+          "documentation":"<p>The language of the input documents. You can specify any of the primary languages supported by Amazon Comprehend. All documents must be in the same language.</p>"
         },
         "ClientRequestToken":{
           "shape":"ClientRequestTokenString",
@@ -3157,7 +3575,7 @@
         },
         "LanguageCode":{
           "shape":"LanguageCode",
-          "documentation":"<p>The language of the input documents. You can specify any of the primary languages supported by Amazon Comprehend: German (\"de\"), English (\"en\"), Spanish (\"es\"), French (\"fr\"), Italian (\"it\"), or Portuguese (\"pt\"). All documents must be in the same language.</p>"
+          "documentation":"<p>The language of the input documents. You can specify any of the primary languages supported by Amazon Comprehend. All documents must be in the same language.</p>"
         },
         "ClientRequestToken":{
           "shape":"ClientRequestTokenString",
@@ -3620,6 +4038,28 @@
       "members":{
       }
     },
+    "UpdateEndpointRequest":{
+      "type":"structure",
+      "required":[
+        "EndpointArn",
+        "DesiredInferenceUnits"
+      ],
+      "members":{
+        "EndpointArn":{
+          "shape":"ComprehendEndpointArn",
+          "documentation":"<p>The Amazon Resource Number (ARN) of the endpoint being updated.</p>"
+        },
+        "DesiredInferenceUnits":{
+          "shape":"InferenceUnitsInteger",
+          "documentation":"<p> The desired number of inference units to be used by the model using this endpoint. Each inference unit represents of a throughput of 100 characters per second.</p>"
+        }
+      }
+    },
+    "UpdateEndpointResponse":{
+      "type":"structure",
+      "members":{
+      }
+    },
     "VpcConfig":{
       "type":"structure",
       "required":[
diff --git a/services/comprehendmedical/pom.xml b/services/comprehendmedical/pom.xml
index 0ad7ffc7d00b..7102c96c19c5 100644
--- a/services/comprehendmedical/pom.xml
+++ b/services/comprehendmedical/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>comprehendmedical</artifactId>
     <name>AWS Java SDK :: Services :: ComprehendMedical</name>
diff --git a/services/comprehendmedical/src/main/resources/codegen-resources/service-2.json b/services/comprehendmedical/src/main/resources/codegen-resources/service-2.json
index 372eb8517ff9..a5d180ef103b 100644
--- a/services/comprehendmedical/src/main/resources/codegen-resources/service-2.json
+++ b/services/comprehendmedical/src/main/resources/codegen-resources/service-2.json
@@ -82,7 +82,7 @@
         {"shape":"InvalidEncodingException"},
         {"shape":"TextSizeLimitExceededException"}
       ],
-      "documentation":"<p>Inspects the clinical text for a variety of medical entities and returns specific information about them such as entity category, location, and confidence score on that information.</p> <p>The <code>DetectEntitiesV2</code> operation replaces the <a>DetectEntities</a> operation. This new action uses a different model for determining the entities in your medical text and changes the way that some entities are returned in the output. You should use the <code>DetectEntitiesV2</code> operation in all new applications.</p> <p>The <code>DetectEntitiesV2</code> operation returns the <code>Acuity</code> and <code>Direction</code> entities as attributes instead of types. It does not return the <code>Quality</code> or <code>Quantity</code> entities.</p>"
+      "documentation":"<p>Inspects the clinical text for a variety of medical entities and returns specific information about them such as entity category, location, and confidence score on that information. Amazon Comprehend Medical only detects medical entities in English language texts.</p> <p>The <code>DetectEntitiesV2</code> operation replaces the <a>DetectEntities</a> operation. This new action uses a different model for determining the entities in your medical text and changes the way that some entities are returned in the output. You should use the <code>DetectEntitiesV2</code> operation in all new applications.</p> <p>The <code>DetectEntitiesV2</code> operation returns the <code>Acuity</code> and <code>Direction</code> entities as attributes instead of types. </p>"
     },
     "DetectPHI":{
       "name":"DetectPHI",
@@ -100,7 +100,43 @@
         {"shape":"InvalidEncodingException"},
         {"shape":"TextSizeLimitExceededException"}
       ],
-      "documentation":"<p> Inspects the clinical text for protected health information (PHI) entities and entity category, location, and confidence score on that information.</p>"
+      "documentation":"<p> Inspects the clinical text for protected health information (PHI) entities and returns the entity category, location, and confidence score for each entity. Amazon Comprehend Medical only detects entities in English language texts.</p>"
+    },
+    "InferICD10CM":{
+      "name":"InferICD10CM",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"InferICD10CMRequest"},
+      "output":{"shape":"InferICD10CMResponse"},
+      "errors":[
+        {"shape":"InternalServerException"},
+        {"shape":"ServiceUnavailableException"},
+        {"shape":"TooManyRequestsException"},
+        {"shape":"InvalidRequestException"},
+        {"shape":"InvalidEncodingException"},
+        {"shape":"TextSizeLimitExceededException"}
+      ],
+      "documentation":"<p>InferICD10CM detects medical conditions as entities listed in a patient record and links those entities to normalized concept identifiers in the ICD-10-CM knowledge base from the Centers for Disease Control. Amazon Comprehend Medical only detects medical entities in English language texts.</p>"
+    },
+    "InferRxNorm":{
+      "name":"InferRxNorm",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"InferRxNormRequest"},
+      "output":{"shape":"InferRxNormResponse"},
+      "errors":[
+        {"shape":"InternalServerException"},
+        {"shape":"ServiceUnavailableException"},
+        {"shape":"TooManyRequestsException"},
+        {"shape":"InvalidRequestException"},
+        {"shape":"InvalidEncodingException"},
+        {"shape":"TextSizeLimitExceededException"}
+      ],
+      "documentation":"<p>InferRxNorm detects medications as entities listed in a patient record and links to the normalized concept identifiers in the RxNorm database from the National Library of Medicine. Amazon Comprehend Medical only detects medical entities in English language texts.</p>"
     },
     "ListEntitiesDetectionV2Jobs":{
       "name":"ListEntitiesDetectionV2Jobs",
@@ -214,6 +250,10 @@
           "shape":"Float",
           "documentation":"<p> The level of confidence that Amazon Comprehend Medical has that this attribute is correctly related to this entity. </p>"
         },
+        "RelationshipType":{
+          "shape":"RelationshipType",
+          "documentation":"<p>The type of relationship between the entity and attribute. Type for the relationship is <code>OVERLAP</code>, indicating that the entity occurred at the same time as the <code>Date_Expression</code>. </p>"
+        },
         "Id":{
           "shape":"Integer",
           "documentation":"<p> The numeric identifier for this attribute. This is a monotonically increasing id unique within this response rather than a global unique identifier. </p>"
@@ -224,12 +264,16 @@
         },
         "EndOffset":{
           "shape":"Integer",
-          "documentation":"<p> The 0-based character offset in the input text that shows where the attribute ends. The offset returns the UTF-8 code point in the string. </p>"
+          "documentation":"<p> The 0-based character offset in the input text that shows where the attribute ends. The offset returns the UTF-8 code point in the string.</p>"
         },
         "Text":{
           "shape":"String",
           "documentation":"<p> The segment of input text extracted as this attribute.</p>"
         },
+        "Category":{
+          "shape":"EntityType",
+          "documentation":"<p> The category of attribute. </p>"
+        },
         "Traits":{
           "shape":"TraitList",
           "documentation":"<p> Contextual information for this attribute. </p>"
@@ -463,7 +507,7 @@
       "members":{
         "Text":{
           "shape":"BoundedLengthString",
-          "documentation":"<p> A UTF-8 text string containing the clinical content being examined for PHI entities. Each string must contain fewer than 20,000 bytes of characters. </p>"
+          "documentation":"<p> A UTF-8 text string containing the clinical content being examined for PHI entities. Each string must contain fewer than 20,000 bytes of characters.</p>"
         }
       }
     },
@@ -517,11 +561,11 @@
         },
         "Type":{
           "shape":"EntitySubType",
-          "documentation":"<p> Describes the specific type of entity with category of entities. </p>"
+          "documentation":"<p> Describes the specific type of entity with category of entities.</p>"
         },
         "Traits":{
           "shape":"TraitList",
-          "documentation":"<p>Contextual information for the entity</p>"
+          "documentation":"<p>Contextual information for the entity.</p>"
         },
         "Attributes":{
           "shape":"AttributeList",
@@ -564,7 +608,13 @@
         "SYSTEM_ORGAN_SITE",
         "DIRECTION",
         "QUALITY",
-        "QUANTITY"
+        "QUANTITY",
+        "TIME_EXPRESSION",
+        "TIME_TO_MEDICATION_NAME",
+        "TIME_TO_DX_NAME",
+        "TIME_TO_TEST_NAME",
+        "TIME_TO_PROCEDURE_NAME",
+        "TIME_TO_TREATMENT_NAME"
       ]
     },
     "EntityType":{
@@ -574,16 +624,232 @@
         "MEDICAL_CONDITION",
         "PROTECTED_HEALTH_INFORMATION",
         "TEST_TREATMENT_PROCEDURE",
-        "ANATOMY"
+        "ANATOMY",
+        "TIME_EXPRESSION"
       ]
     },
     "Float":{"type":"float"},
+    "ICD10CMAttribute":{
+      "type":"structure",
+      "members":{
+        "Type":{
+          "shape":"ICD10CMAttributeType",
+          "documentation":"<p>The type of attribute. InferICD10CM detects entities of the type <code>DX_NAME</code>. </p>"
+        },
+        "Score":{
+          "shape":"Float",
+          "documentation":"<p>The level of confidence that Amazon Comprehend Medical has that the segment of text is correctly recognized as an attribute.</p>"
+        },
+        "RelationshipScore":{
+          "shape":"Float",
+          "documentation":"<p>The level of confidence that Amazon Comprehend Medical has that this attribute is correctly related to this entity.</p>"
+        },
+        "Id":{
+          "shape":"Integer",
+          "documentation":"<p>The numeric identifier for this attribute. This is a monotonically increasing id unique within this response rather than a global unique identifier.</p>"
+        },
+        "BeginOffset":{
+          "shape":"Integer",
+          "documentation":"<p>The 0-based character offset in the input text that shows where the attribute begins. The offset returns the UTF-8 code point in the string.</p>"
+        },
+        "EndOffset":{
+          "shape":"Integer",
+          "documentation":"<p>The 0-based character offset in the input text that shows where the attribute ends. The offset returns the UTF-8 code point in the string.</p>"
+        },
+        "Text":{
+          "shape":"String",
+          "documentation":"<p>The segment of input text which contains the detected attribute.</p>"
+        },
+        "Traits":{
+          "shape":"ICD10CMTraitList",
+          "documentation":"<p>The contextual information for the attribute. The traits recognized by InferICD10CM are <code>DIAGNOSIS</code>, <code>SIGN</code>, <code>SYMPTOM</code>, and <code>NEGATION</code>.</p>"
+        }
+      },
+      "documentation":"<p>The detected attributes that relate to an entity. This includes an extracted segment of the text that is an attribute of an entity, or otherwise related to an entity. InferICD10CM detects the following attributes: <code>Direction</code>, <code>System, Organ or Site</code>, and <code>Acuity</code>.</p>"
+    },
+    "ICD10CMAttributeList":{
+      "type":"list",
+      "member":{"shape":"ICD10CMAttribute"}
+    },
+    "ICD10CMAttributeType":{
+      "type":"string",
+      "enum":[
+        "ACUITY",
+        "DIRECTION",
+        "SYSTEM_ORGAN_SITE",
+        "QUALITY",
+        "QUANTITY"
+      ]
+    },
+    "ICD10CMConcept":{
+      "type":"structure",
+      "members":{
+        "Description":{
+          "shape":"String",
+          "documentation":"<p>The long description of the ICD-10-CM code in the ontology.</p>"
+        },
+        "Code":{
+          "shape":"String",
+          "documentation":"<p>The ICD-10-CM code that identifies the concept found in the knowledge base from the Centers for Disease Control.</p>"
+        },
+        "Score":{
+          "shape":"Float",
+          "documentation":"<p>The level of confidence that Amazon Comprehend Medical has that the entity is accurately linked to an ICD-10-CM concept.</p>"
+        }
+      },
+      "documentation":"<p> The ICD-10-CM concepts that the entity could refer to, along with a score indicating the likelihood of the match.</p>"
+    },
+    "ICD10CMConceptList":{
+      "type":"list",
+      "member":{"shape":"ICD10CMConcept"}
+    },
+    "ICD10CMEntity":{
+      "type":"structure",
+      "members":{
+        "Id":{
+          "shape":"Integer",
+          "documentation":"<p>The numeric identifier for the entity. This is a monotonically increasing id unique within this response rather than a global unique identifier.</p>"
+        },
+        "Text":{
+          "shape":"OntologyLinkingBoundedLengthString",
+          "documentation":"<p>The segment of input text that is matched to the detected entity.</p>"
+        },
+        "Category":{
+          "shape":"ICD10CMEntityCategory",
+          "documentation":"<p> The category of the entity. InferICD10CM detects entities in the <code>MEDICAL_CONDITION</code> category. </p>"
+        },
+        "Type":{
+          "shape":"ICD10CMEntityType",
+          "documentation":"<p>Describes the specific type of entity with category of entities. InferICD10CM detects entities of the type <code>DX_NAME</code>.</p>"
+        },
+        "Score":{
+          "shape":"Float",
+          "documentation":"<p>The level of confidence that Amazon Comprehend Medical has in the accuracy of the detection.</p>"
+        },
+        "BeginOffset":{
+          "shape":"Integer",
+          "documentation":"<p>The 0-based character offset in the input text that shows where the entity begins. The offset returns the UTF-8 code point in the string.</p>"
+        },
+        "EndOffset":{
+          "shape":"Integer",
+          "documentation":"<p>The 0-based character offset in the input text that shows where the entity ends. The offset returns the UTF-8 code point in the string.</p>"
+        },
+        "Attributes":{
+          "shape":"ICD10CMAttributeList",
+          "documentation":"<p>The detected attributes that relate to the entity. An extracted segment of the text that is an attribute of an entity, or otherwise related to an entity, such as the nature of a medical condition.</p>"
+        },
+        "Traits":{
+          "shape":"ICD10CMTraitList",
+          "documentation":"<p>Provides Contextual information for the entity. The traits recognized by InferICD10CM are <code>DIAGNOSIS</code>, <code>SIGN</code>, <code>SYMPTOM</code>, and <code>NEGATION.</code> </p>"
+        },
+        "ICD10CMConcepts":{
+          "shape":"ICD10CMConceptList",
+          "documentation":"<p>The ICD-10-CM concepts that the entity could refer to, along with a score indicating the likelihood of the match.</p>"
+        }
+      },
+      "documentation":"<p>The collection of medical entities extracted from the input text and their associated information. For each entity, the response provides the entity text, the entity category, where the entity text begins and ends, and the level of confidence that Amazon Comprehend Medical has in the detection and analysis. Attributes and traits of the entity are also returned. </p>"
+    },
+    "ICD10CMEntityCategory":{
+      "type":"string",
+      "enum":["MEDICAL_CONDITION"]
+    },
+    "ICD10CMEntityList":{
+      "type":"list",
+      "member":{"shape":"ICD10CMEntity"}
+    },
+    "ICD10CMEntityType":{
+      "type":"string",
+      "enum":["DX_NAME"]
+    },
+    "ICD10CMTrait":{
+      "type":"structure",
+      "members":{
+        "Name":{
+          "shape":"ICD10CMTraitName",
+          "documentation":"<p>Provides a name or contextual description about the trait.</p>"
+        },
+        "Score":{
+          "shape":"Float",
+          "documentation":"<p>The level of confidence that Amazon Comprehend Medical has that the segment of text is correctly recognized as a trait.</p>"
+        }
+      },
+      "documentation":"<p>Contextual information for the entity. The traits recognized by InferICD10CM are <code>DIAGNOSIS</code>, <code>SIGN</code>, <code>SYMPTOM</code>, and <code>NEGATION</code>.</p>"
+    },
+    "ICD10CMTraitList":{
+      "type":"list",
+      "member":{"shape":"ICD10CMTrait"}
+    },
+    "ICD10CMTraitName":{
+      "type":"string",
+      "enum":[
+        "NEGATION",
+        "DIAGNOSIS",
+        "SIGN",
+        "SYMPTOM"
+      ]
+    },
     "IamRoleArn":{
       "type":"string",
       "max":2048,
       "min":20,
       "pattern":"arn:aws(-[^:]+)?:iam::[0-9]{12}:role/.+"
     },
+    "InferICD10CMRequest":{
+      "type":"structure",
+      "required":["Text"],
+      "members":{
+        "Text":{
+          "shape":"OntologyLinkingBoundedLengthString",
+          "documentation":"<p>The input text used for analysis. The input for InferICD10CM is a string from 1 to 10000 characters.</p>"
+        }
+      }
+    },
+    "InferICD10CMResponse":{
+      "type":"structure",
+      "required":["Entities"],
+      "members":{
+        "Entities":{
+          "shape":"ICD10CMEntityList",
+          "documentation":"<p>The medical conditions detected in the text linked to ICD-10-CM concepts. If the action is successful, the service sends back an HTTP 200 response, as well as the entities detected.</p>"
+        },
+        "PaginationToken":{
+          "shape":"String",
+          "documentation":"<p>If the result of the previous request to <code>InferICD10CM</code> was truncated, include the <code>PaginationToken</code> to fetch the next page of medical condition entities. </p>"
+        },
+        "ModelVersion":{
+          "shape":"String",
+          "documentation":"<p>The version of the model used to analyze the documents, in the format <i>n</i>.<i>n</i>.<i>n</i> You can use this information to track the model used for a particular batch of documents.</p>"
+        }
+      }
+    },
+    "InferRxNormRequest":{
+      "type":"structure",
+      "required":["Text"],
+      "members":{
+        "Text":{
+          "shape":"OntologyLinkingBoundedLengthString",
+          "documentation":"<p>The input text used for analysis. The input for InferRxNorm is a string from 1 to 10000 characters.</p>"
+        }
+      }
+    },
+    "InferRxNormResponse":{
+      "type":"structure",
+      "required":["Entities"],
+      "members":{
+        "Entities":{
+          "shape":"RxNormEntityList",
+          "documentation":"<p>The medication entities detected in the text linked to RxNorm concepts. If the action is successful, the service sends back an HTTP 200 response, as well as the entities detected.</p>"
+        },
+        "PaginationToken":{
+          "shape":"String",
+          "documentation":"<p>If the result of the previous request to <code>InferRxNorm</code> was truncated, include the <code>PaginationToken</code> to fetch the next page of medication entities.</p>"
+        },
+        "ModelVersion":{
+          "shape":"String",
+          "documentation":"<p>The version of the model used to analyze the documents, in the format <i>n</i>.<i>n</i>.<i>n</i> You can use this information to track the model used for a particular batch of documents.</p>"
+        }
+      }
+    },
     "InputDataConfig":{
       "type":"structure",
       "required":["S3Bucket"],
@@ -597,7 +863,7 @@
           "documentation":"<p>The path to the input data files in the S3 bucket.</p>"
         }
       },
-      "documentation":"<p>The input properties for an entities detection job</p>"
+      "documentation":"<p>The input properties for an entities detection job.</p>"
     },
     "Integer":{"type":"integer"},
     "InternalServerException":{
@@ -730,6 +996,11 @@
       "min":1
     },
     "ModelVersion":{"type":"string"},
+    "OntologyLinkingBoundedLengthString":{
+      "type":"string",
+      "max":10000,
+      "min":1
+    },
     "OutputDataConfig":{
       "type":"structure",
       "required":["S3Bucket"],
@@ -745,6 +1016,28 @@
       },
       "documentation":"<p>The output properties for a detection job.</p>"
     },
+    "RelationshipType":{
+      "type":"string",
+      "enum":[
+        "EVERY",
+        "WITH_DOSAGE",
+        "ADMINISTERED_VIA",
+        "FOR",
+        "NEGATIVE",
+        "OVERLAP",
+        "DOSAGE",
+        "ROUTE_OR_MODE",
+        "FORM",
+        "FREQUENCY",
+        "DURATION",
+        "STRENGTH",
+        "RATE",
+        "ACUITY",
+        "TEST_VALUE",
+        "TEST_UNITS",
+        "DIRECTION"
+      ]
+    },
     "ResourceNotFoundException":{
       "type":"structure",
       "members":{
@@ -753,6 +1046,165 @@
       "documentation":"<p>The resource identified by the specified Amazon Resource Name (ARN) was not found. Check the ARN and try your request again.</p>",
       "exception":true
     },
+    "RxNormAttribute":{
+      "type":"structure",
+      "members":{
+        "Type":{
+          "shape":"RxNormAttributeType",
+          "documentation":"<p>The type of attribute. The types of attributes recognized by InferRxNorm are <code>BRAND_NAME</code> and <code>GENERIC_NAME</code>.</p>"
+        },
+        "Score":{
+          "shape":"Float",
+          "documentation":"<p>The level of confidence that Comprehend Medical has that the segment of text is correctly recognized as an attribute.</p>"
+        },
+        "RelationshipScore":{
+          "shape":"Float",
+          "documentation":"<p>The level of confidence that Amazon Comprehend Medical has that the attribute is accurately linked to an entity.</p>"
+        },
+        "Id":{
+          "shape":"Integer",
+          "documentation":"<p>The numeric identifier for this attribute. This is a monotonically increasing id unique within this response rather than a global unique identifier.</p>"
+        },
+        "BeginOffset":{
+          "shape":"Integer",
+          "documentation":"<p>The 0-based character offset in the input text that shows where the attribute begins. The offset returns the UTF-8 code point in the string.</p>"
+        },
+        "EndOffset":{
+          "shape":"Integer",
+          "documentation":"<p>The 0-based character offset in the input text that shows where the attribute ends. The offset returns the UTF-8 code point in the string.</p>"
+        },
+        "Text":{
+          "shape":"String",
+          "documentation":"<p>The segment of input text which corresponds to the detected attribute.</p>"
+        },
+        "Traits":{
+          "shape":"RxNormTraitList",
+          "documentation":"<p>Contextual information for the attribute. InferRxNorm recognizes the trait <code>NEGATION</code> for attributes, i.e. that the patient is not taking a specific dose or form of a medication.</p>"
+        }
+      },
+      "documentation":"<p>The extracted attributes that relate to this entity. The attributes recognized by InferRxNorm are <code>DOSAGE</code>, <code>DURATION</code>, <code>FORM</code>, <code>FREQUENCY</code>, <code>RATE</code>, <code>ROUTE_OR_MODE</code>.</p>"
+    },
+    "RxNormAttributeList":{
+      "type":"list",
+      "member":{"shape":"RxNormAttribute"}
+    },
+    "RxNormAttributeType":{
+      "type":"string",
+      "enum":[
+        "DOSAGE",
+        "DURATION",
+        "FORM",
+        "FREQUENCY",
+        "RATE",
+        "ROUTE_OR_MODE",
+        "STRENGTH"
+      ]
+    },
+    "RxNormConcept":{
+      "type":"structure",
+      "members":{
+        "Description":{
+          "shape":"String",
+          "documentation":"<p>The description of the RxNorm concept.</p>"
+        },
+        "Code":{
+          "shape":"String",
+          "documentation":"<p>RxNorm concept ID, also known as the RxCUI.</p>"
+        },
+        "Score":{
+          "shape":"Float",
+          "documentation":"<p>The level of confidence that Amazon Comprehend Medical has that the entity is accurately linked to the reported RxNorm concept.</p>"
+        }
+      },
+      "documentation":"<p>The RxNorm concept that the entity could refer to, along with a score indicating the likelihood of the match.</p>"
+    },
+    "RxNormConceptList":{
+      "type":"list",
+      "member":{"shape":"RxNormConcept"}
+    },
+    "RxNormEntity":{
+      "type":"structure",
+      "members":{
+        "Id":{
+          "shape":"Integer",
+          "documentation":"<p>The numeric identifier for the entity. This is a monotonically increasing id unique within this response rather than a global unique identifier.</p>"
+        },
+        "Text":{
+          "shape":"OntologyLinkingBoundedLengthString",
+          "documentation":"<p>The segment of input text extracted from which the entity was detected.</p>"
+        },
+        "Category":{
+          "shape":"RxNormEntityCategory",
+          "documentation":"<p>The category of the entity. The recognized categories are <code>GENERIC</code> or <code>BRAND_NAME</code>.</p>"
+        },
+        "Type":{
+          "shape":"RxNormEntityType",
+          "documentation":"<p> Describes the specific type of entity. For InferRxNorm, the recognized entity type is <code>MEDICATION</code>.</p>"
+        },
+        "Score":{
+          "shape":"Float",
+          "documentation":"<p>The level of confidence that Amazon Comprehend Medical has in the accuracy of the detected entity.</p>"
+        },
+        "BeginOffset":{
+          "shape":"Integer",
+          "documentation":"<p>The 0-based character offset in the input text that shows where the entity begins. The offset returns the UTF-8 code point in the string.</p>"
+        },
+        "EndOffset":{
+          "shape":"Integer",
+          "documentation":"<p>The 0-based character offset in the input text that shows where the entity ends. The offset returns the UTF-8 code point in the string.</p>"
+        },
+        "Attributes":{
+          "shape":"RxNormAttributeList",
+          "documentation":"<p>The extracted attributes that relate to the entity. The attributes recognized by InferRxNorm are <code>DOSAGE</code>, <code>DURATION</code>, <code>FORM</code>, <code>FREQUENCY</code>, <code>RATE</code>, <code>ROUTE_OR_MODE</code>, and <code>STRENGTH</code>.</p>"
+        },
+        "Traits":{
+          "shape":"RxNormTraitList",
+          "documentation":"<p> Contextual information for the entity.</p>"
+        },
+        "RxNormConcepts":{
+          "shape":"RxNormConceptList",
+          "documentation":"<p> The RxNorm concepts that the entity could refer to, along with a score indicating the likelihood of the match.</p>"
+        }
+      },
+      "documentation":"<p>The collection of medical entities extracted from the input text and their associated information. For each entity, the response provides the entity text, the entity category, where the entity text begins and ends, and the level of confidence that Amazon Comprehend Medical has in the detection and analysis. Attributes and traits of the entity are also returned. </p>"
+    },
+    "RxNormEntityCategory":{
+      "type":"string",
+      "enum":["MEDICATION"]
+    },
+    "RxNormEntityList":{
+      "type":"list",
+      "member":{"shape":"RxNormEntity"}
+    },
+    "RxNormEntityType":{
+      "type":"string",
+      "enum":[
+        "BRAND_NAME",
+        "GENERIC_NAME"
+      ]
+    },
+    "RxNormTrait":{
+      "type":"structure",
+      "members":{
+        "Name":{
+          "shape":"RxNormTraitName",
+          "documentation":"<p>Provides a name or contextual description about the trait.</p>"
+        },
+        "Score":{
+          "shape":"Float",
+          "documentation":"<p>The level of confidence that Amazon Comprehend Medical has in the accuracy of the detected trait.</p>"
+        }
+      },
+      "documentation":"<p>The contextual information for the entity. InferRxNorm recognizes the trait <code>NEGATION</code>, which is any indication that the patient is not taking a medication. </p>"
+    },
+    "RxNormTraitList":{
+      "type":"list",
+      "member":{"shape":"RxNormTrait"}
+    },
+    "RxNormTraitName":{
+      "type":"string",
+      "enum":["NEGATION"]
+    },
     "S3Bucket":{
       "type":"string",
       "max":63,
diff --git a/services/computeoptimizer/pom.xml b/services/computeoptimizer/pom.xml
new file mode 100644
index 000000000000..e1c7b44b95a0
--- /dev/null
+++ b/services/computeoptimizer/pom.xml
@@ -0,0 +1,60 @@
+<?xml version="1.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.
+  -->
+
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>software.amazon.awssdk</groupId>
+        <artifactId>services</artifactId>
+        <version>2.11.8-SNAPSHOT</version>
+    </parent>
+    <artifactId>computeoptimizer</artifactId>
+    <name>AWS Java SDK :: Services :: Compute Optimizer</name>
+    <description>The AWS Java SDK for Compute Optimizer module holds the client classes that are used for
+        communicating with Compute Optimizer.
+    </description>
+    <url>https://aws.amazon.com/sdkforjava</url>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifestEntries>
+                            <Automatic-Module-Name>software.amazon.awssdk.services.computeoptimizer</Automatic-Module-Name>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>protocol-core</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>aws-json-protocol</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/services/computeoptimizer/src/main/resources/codegen-resources/paginators-1.json b/services/computeoptimizer/src/main/resources/codegen-resources/paginators-1.json
new file mode 100644
index 000000000000..5677bd8e4a2d
--- /dev/null
+++ b/services/computeoptimizer/src/main/resources/codegen-resources/paginators-1.json
@@ -0,0 +1,4 @@
+{
+  "pagination": {
+  }
+}
diff --git a/services/computeoptimizer/src/main/resources/codegen-resources/service-2.json b/services/computeoptimizer/src/main/resources/codegen-resources/service-2.json
new file mode 100644
index 000000000000..7a83d941dbde
--- /dev/null
+++ b/services/computeoptimizer/src/main/resources/codegen-resources/service-2.json
@@ -0,0 +1,857 @@
+{
+  "version":"2.0",
+  "metadata":{
+    "apiVersion":"2019-11-01",
+    "endpointPrefix":"compute-optimizer",
+    "jsonVersion":"1.0",
+    "protocol":"json",
+    "serviceFullName":"AWS Compute Optimizer",
+    "serviceId":"Compute Optimizer",
+    "signatureVersion":"v4",
+    "signingName":"compute-optimizer",
+    "targetPrefix":"ComputeOptimizerService",
+    "uid":"compute-optimizer-2019-11-01"
+  },
+  "operations":{
+    "GetAutoScalingGroupRecommendations":{
+      "name":"GetAutoScalingGroupRecommendations",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"GetAutoScalingGroupRecommendationsRequest"},
+      "output":{"shape":"GetAutoScalingGroupRecommendationsResponse"},
+      "errors":[
+        {"shape":"OptInRequiredException"},
+        {"shape":"InternalServerException"},
+        {"shape":"ServiceUnavailableException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"InvalidParameterValueException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"MissingAuthenticationToken"},
+        {"shape":"ThrottlingException"}
+      ],
+      "documentation":"<p>Returns Auto Scaling group recommendations.</p> <p>AWS Compute Optimizer currently generates recommendations for Auto Scaling groups that are configured to run instances of the M, C, R, T, and X instance families. The service does not generate recommendations for Auto Scaling groups that have a scaling policy attached to them, or that do not have the same values for desired, minimum, and maximum capacity. In order for Compute Optimizer to analyze your Auto Scaling groups, they must be of a fixed size. For more information, see the <a href=\"https://docs.aws.amazon.com/compute-optimizer/latest/ug/what-is.html\">AWS Compute Optimizer User Guide</a>.</p>"
+    },
+    "GetEC2InstanceRecommendations":{
+      "name":"GetEC2InstanceRecommendations",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"GetEC2InstanceRecommendationsRequest"},
+      "output":{"shape":"GetEC2InstanceRecommendationsResponse"},
+      "errors":[
+        {"shape":"OptInRequiredException"},
+        {"shape":"InternalServerException"},
+        {"shape":"ServiceUnavailableException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"InvalidParameterValueException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"MissingAuthenticationToken"},
+        {"shape":"ThrottlingException"}
+      ],
+      "documentation":"<p>Returns Amazon EC2 instance recommendations.</p> <p>AWS Compute Optimizer currently generates recommendations for Amazon Elastic Compute Cloud (Amazon EC2) and Amazon EC2 Auto Scaling. It generates recommendations for M, C, R, T, and X instance families. For more information, see the <a href=\"https://docs.aws.amazon.com/compute-optimizer/latest/ug/what-is.html\">AWS Compute Optimizer User Guide</a>.</p>"
+    },
+    "GetEC2RecommendationProjectedMetrics":{
+      "name":"GetEC2RecommendationProjectedMetrics",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"GetEC2RecommendationProjectedMetricsRequest"},
+      "output":{"shape":"GetEC2RecommendationProjectedMetricsResponse"},
+      "errors":[
+        {"shape":"OptInRequiredException"},
+        {"shape":"InternalServerException"},
+        {"shape":"ServiceUnavailableException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"InvalidParameterValueException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"MissingAuthenticationToken"},
+        {"shape":"ThrottlingException"}
+      ],
+      "documentation":"<p>Returns the projected utilization metrics of Amazon EC2 instance recommendations.</p>"
+    },
+    "GetEnrollmentStatus":{
+      "name":"GetEnrollmentStatus",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"GetEnrollmentStatusRequest"},
+      "output":{"shape":"GetEnrollmentStatusResponse"},
+      "errors":[
+        {"shape":"InternalServerException"},
+        {"shape":"ServiceUnavailableException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"InvalidParameterValueException"},
+        {"shape":"MissingAuthenticationToken"},
+        {"shape":"ThrottlingException"}
+      ],
+      "documentation":"<p>Returns the enrollment (opt in) status of an account to the AWS Compute Optimizer service.</p> <p>If the account is a master account of an organization, this operation also confirms the enrollment status of member accounts within the organization.</p>"
+    },
+    "GetRecommendationSummaries":{
+      "name":"GetRecommendationSummaries",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"GetRecommendationSummariesRequest"},
+      "output":{"shape":"GetRecommendationSummariesResponse"},
+      "errors":[
+        {"shape":"OptInRequiredException"},
+        {"shape":"InternalServerException"},
+        {"shape":"ServiceUnavailableException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"InvalidParameterValueException"},
+        {"shape":"MissingAuthenticationToken"},
+        {"shape":"ThrottlingException"}
+      ],
+      "documentation":"<p>Returns the optimization findings for an account.</p> <p>For example, it returns the number of Amazon EC2 instances in an account that are under-provisioned, over-provisioned, or optimized. It also returns the number of Auto Scaling groups in an account that are not optimized, or optimized.</p>"
+    },
+    "UpdateEnrollmentStatus":{
+      "name":"UpdateEnrollmentStatus",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"UpdateEnrollmentStatusRequest"},
+      "output":{"shape":"UpdateEnrollmentStatusResponse"},
+      "errors":[
+        {"shape":"InternalServerException"},
+        {"shape":"ServiceUnavailableException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"InvalidParameterValueException"},
+        {"shape":"MissingAuthenticationToken"},
+        {"shape":"ThrottlingException"}
+      ],
+      "documentation":"<p>Updates the enrollment (opt in) status of an account to the AWS Compute Optimizer service.</p> <p>If the account is a master account of an organization, this operation can also enroll member accounts within the organization.</p>"
+    }
+  },
+  "shapes":{
+    "AccessDeniedException":{
+      "type":"structure",
+      "members":{
+        "message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p>You do not have sufficient access to perform this action.</p>",
+      "exception":true,
+      "synthetic":true
+    },
+    "AccountId":{"type":"string"},
+    "AccountIds":{
+      "type":"list",
+      "member":{"shape":"AccountId"}
+    },
+    "AutoScalingGroupArn":{"type":"string"},
+    "AutoScalingGroupArns":{
+      "type":"list",
+      "member":{"shape":"AutoScalingGroupArn"}
+    },
+    "AutoScalingGroupConfiguration":{
+      "type":"structure",
+      "members":{
+        "desiredCapacity":{
+          "shape":"DesiredCapacity",
+          "documentation":"<p>The desired capacity, or number of instances, for the Auto Scaling group.</p>"
+        },
+        "minSize":{
+          "shape":"MinSize",
+          "documentation":"<p>The minimum size, or minimum number of instances, for the Auto Scaling group.</p>"
+        },
+        "maxSize":{
+          "shape":"MaxSize",
+          "documentation":"<p>The maximum size, or maximum number of instances, for the Auto Scaling group.</p>"
+        },
+        "instanceType":{
+          "shape":"InstanceType",
+          "documentation":"<p>The instance type for the Auto Scaling group.</p>"
+        }
+      },
+      "documentation":"<p>Describes the configuration of an Auto Scaling group.</p>"
+    },
+    "AutoScalingGroupName":{"type":"string"},
+    "AutoScalingGroupRecommendation":{
+      "type":"structure",
+      "members":{
+        "accountId":{
+          "shape":"AccountId",
+          "documentation":"<p>The AWS account ID of the Auto Scaling group.</p>"
+        },
+        "autoScalingGroupArn":{
+          "shape":"AutoScalingGroupArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the Auto Scaling group.</p>"
+        },
+        "autoScalingGroupName":{
+          "shape":"AutoScalingGroupName",
+          "documentation":"<p>The name of the Auto Scaling group.</p>"
+        },
+        "finding":{
+          "shape":"Finding",
+          "documentation":"<p>The finding classification for the Auto Scaling group.</p> <p>Findings for Auto Scaling groups include:</p> <ul> <li> <p> <b> <code>NotOptimized</code> </b>—An Auto Scaling group is considered not optimized when AWS Compute Optimizer identifies a recommendation that can provide better performance for your workload.</p> </li> <li> <p> <b> <code>Optimized</code> </b>—An Auto Scaling group is considered optimized when Compute Optimizer determines that the group is correctly provisioned to run your workload based on the chosen instance type. For optimized resources, Compute Optimizer might recommend a new generation instance type.</p> </li> </ul> <note> <p>The values that are returned might be <code>NOT_OPTIMIZED</code> or <code>OPTIMIZED</code>.</p> </note>"
+        },
+        "utilizationMetrics":{
+          "shape":"UtilizationMetrics",
+          "documentation":"<p>An array of objects that describe the utilization metrics of the Auto Scaling group.</p>"
+        },
+        "lookBackPeriodInDays":{
+          "shape":"LookBackPeriodInDays",
+          "documentation":"<p>The number of days for which utilization metrics were analyzed for the Auto Scaling group.</p>"
+        },
+        "currentConfiguration":{
+          "shape":"AutoScalingGroupConfiguration",
+          "documentation":"<p>An array of objects that describe the current configuration of the Auto Scaling group.</p>"
+        },
+        "recommendationOptions":{
+          "shape":"AutoScalingGroupRecommendationOptions",
+          "documentation":"<p>An array of objects that describe the recommendation options for the Auto Scaling group.</p>"
+        },
+        "lastRefreshTimestamp":{
+          "shape":"LastRefreshTimestamp",
+          "documentation":"<p>The time stamp of when the Auto Scaling group recommendation was last refreshed.</p>"
+        }
+      },
+      "documentation":"<p>Describes an Auto Scaling group recommendation.</p>"
+    },
+    "AutoScalingGroupRecommendationOption":{
+      "type":"structure",
+      "members":{
+        "configuration":{
+          "shape":"AutoScalingGroupConfiguration",
+          "documentation":"<p>An array of objects that describe an Auto Scaling group configuration.</p>"
+        },
+        "projectedUtilizationMetrics":{
+          "shape":"ProjectedUtilizationMetrics",
+          "documentation":"<p>An array of objects that describe the projected utilization metrics of the Auto Scaling group recommendation option.</p>"
+        },
+        "performanceRisk":{
+          "shape":"PerformanceRisk",
+          "documentation":"<p>The performance risk of the Auto Scaling group configuration recommendation.</p> <p>Performance risk is the likelihood of the recommended instance type not meeting the performance requirement of your workload.</p> <p>The lowest performance risk is categorized as <code>0</code>, and the highest as <code>5</code>.</p>"
+        },
+        "rank":{
+          "shape":"Rank",
+          "documentation":"<p>The rank of the Auto Scaling group recommendation option.</p> <p>The top recommendation option is ranked as <code>1</code>.</p>"
+        }
+      },
+      "documentation":"<p>Describes a recommendation option for an Auto Scaling group.</p>"
+    },
+    "AutoScalingGroupRecommendationOptions":{
+      "type":"list",
+      "member":{"shape":"AutoScalingGroupRecommendationOption"}
+    },
+    "AutoScalingGroupRecommendations":{
+      "type":"list",
+      "member":{"shape":"AutoScalingGroupRecommendation"}
+    },
+    "Code":{"type":"string"},
+    "CurrentInstanceType":{"type":"string"},
+    "DesiredCapacity":{"type":"integer"},
+    "ErrorMessage":{"type":"string"},
+    "Filter":{
+      "type":"structure",
+      "members":{
+        "name":{
+          "shape":"FilterName",
+          "documentation":"<p>The name of the filter.</p> <p>Specify <code>Finding</code> to filter the results to a specific findings classification.</p> <p>Specify <code>RecommendationSourceType</code> to filter the results to a specific resource type.</p>"
+        },
+        "values":{
+          "shape":"FilterValues",
+          "documentation":"<p>The value of the filter.</p> <p>If you specify the <code>name</code> parameter as <code>Finding</code>, and you're recommendations for an <i>instance</i>, then the valid values are <code>Underprovisioned</code>, <code>Overprovisioned</code>, <code>NotOptimized</code>, or <code>Optimized</code>.</p> <p>If you specify the <code>name</code> parameter as <code>Finding</code>, and you're recommendations for an <i>Auto Scaling group</i>, then the valid values are <code>Optimized</code>, or <code>NotOptimized</code>.</p> <p>If you specify the <code>name</code> parameter as <code>RecommendationSourceType</code>, then the valid values are <code>EC2Instance</code>, or <code>AutoScalingGroup</code>.</p>"
+        }
+      },
+      "documentation":"<p>Describes a filter that returns a more specific list of recommendations.</p>"
+    },
+    "FilterName":{
+      "type":"string",
+      "enum":[
+        "Finding",
+        "RecommendationSourceType"
+      ]
+    },
+    "FilterValue":{"type":"string"},
+    "FilterValues":{
+      "type":"list",
+      "member":{"shape":"FilterValue"}
+    },
+    "Filters":{
+      "type":"list",
+      "member":{"shape":"Filter"}
+    },
+    "Finding":{
+      "type":"string",
+      "enum":[
+        "Underprovisioned",
+        "Overprovisioned",
+        "Optimized",
+        "NotOptimized"
+      ]
+    },
+    "GetAutoScalingGroupRecommendationsRequest":{
+      "type":"structure",
+      "members":{
+        "accountIds":{
+          "shape":"AccountIds",
+          "documentation":"<p>The AWS account IDs for which to return Auto Scaling group recommendations.</p> <p>Only one account ID can be specified per request.</p>"
+        },
+        "autoScalingGroupArns":{
+          "shape":"AutoScalingGroupArns",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the Auto Scaling groups for which to return recommendations.</p>"
+        },
+        "nextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>The token to advance to the next page of Auto Scaling group recommendations.</p>"
+        },
+        "maxResults":{
+          "shape":"MaxResults",
+          "documentation":"<p>The maximum number of Auto Scaling group recommendations to return with a single call.</p> <p>To retrieve the remaining results, make another call with the returned <code>NextToken</code> value.</p>"
+        },
+        "filters":{
+          "shape":"Filters",
+          "documentation":"<p>An array of objects that describe a filter that returns a more specific list of Auto Scaling group recommendations.</p>"
+        }
+      }
+    },
+    "GetAutoScalingGroupRecommendationsResponse":{
+      "type":"structure",
+      "members":{
+        "nextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>The token to use to advance to the next page of Auto Scaling group recommendations.</p> <p>This value is null when there are no more pages of Auto Scaling group recommendations to return.</p>"
+        },
+        "autoScalingGroupRecommendations":{
+          "shape":"AutoScalingGroupRecommendations",
+          "documentation":"<p>An array of objects that describe Auto Scaling group recommendations.</p>"
+        },
+        "errors":{
+          "shape":"GetRecommendationErrors",
+          "documentation":"<p>An array of objects that describe errors of the request.</p> <p>For example, an error is returned if you request recommendations for an unsupported Auto Scaling group.</p>"
+        }
+      }
+    },
+    "GetEC2InstanceRecommendationsRequest":{
+      "type":"structure",
+      "members":{
+        "instanceArns":{
+          "shape":"InstanceArns",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the instances for which to return recommendations.</p>"
+        },
+        "nextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>The token to advance to the next page of instance recommendations.</p>"
+        },
+        "maxResults":{
+          "shape":"MaxResults",
+          "documentation":"<p>The maximum number of instance recommendations to return with a single call.</p> <p>To retrieve the remaining results, make another call with the returned <code>NextToken</code> value.</p>"
+        },
+        "filters":{
+          "shape":"Filters",
+          "documentation":"<p>An array of objects that describe a filter that returns a more specific list of instance recommendations.</p>"
+        },
+        "accountIds":{
+          "shape":"AccountIds",
+          "documentation":"<p>The AWS account IDs for which to return instance recommendations.</p> <p>Only one account ID can be specified per request.</p>"
+        }
+      }
+    },
+    "GetEC2InstanceRecommendationsResponse":{
+      "type":"structure",
+      "members":{
+        "nextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>The token to use to advance to the next page of instance recommendations.</p> <p>This value is null when there are no more pages of instance recommendations to return.</p>"
+        },
+        "instanceRecommendations":{
+          "shape":"InstanceRecommendations",
+          "documentation":"<p>An array of objects that describe instance recommendations.</p>"
+        },
+        "errors":{
+          "shape":"GetRecommendationErrors",
+          "documentation":"<p>An array of objects that describe errors of the request.</p> <p>For example, an error is returned if you request recommendations for an instance of an unsupported instance family.</p>"
+        }
+      }
+    },
+    "GetEC2RecommendationProjectedMetricsRequest":{
+      "type":"structure",
+      "required":[
+        "instanceArn",
+        "stat",
+        "period",
+        "startTime",
+        "endTime"
+      ],
+      "members":{
+        "instanceArn":{
+          "shape":"InstanceArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the instances for which to return recommendation projected metrics.</p>"
+        },
+        "stat":{
+          "shape":"MetricStatistic",
+          "documentation":"<p>The statistic of the projected metrics.</p>"
+        },
+        "period":{
+          "shape":"Period",
+          "documentation":"<p>The granularity, in seconds, of the projected metrics data points.</p>"
+        },
+        "startTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>The time stamp of the first projected metrics data point to return.</p>"
+        },
+        "endTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>The time stamp of the last projected metrics data point to return.</p>"
+        }
+      }
+    },
+    "GetEC2RecommendationProjectedMetricsResponse":{
+      "type":"structure",
+      "members":{
+        "recommendedOptionProjectedMetrics":{
+          "shape":"RecommendedOptionProjectedMetrics",
+          "documentation":"<p>An array of objects that describe a projected metrics.</p>"
+        }
+      }
+    },
+    "GetEnrollmentStatusRequest":{
+      "type":"structure",
+      "members":{
+      }
+    },
+    "GetEnrollmentStatusResponse":{
+      "type":"structure",
+      "members":{
+        "status":{
+          "shape":"Status",
+          "documentation":"<p>The enrollment status of the account.</p>"
+        },
+        "statusReason":{
+          "shape":"StatusReason",
+          "documentation":"<p>The reason for the enrollment status of the account.</p> <p>For example, an account might show a status of <code>Pending</code> because member accounts of an organization require more time to be enrolled in the service.</p>"
+        },
+        "memberAccountsEnrolled":{
+          "shape":"MemberAccountsEnrolled",
+          "documentation":"<p>Confirms the enrollment status of member accounts within the organization, if the account is a master account of an organization.</p>"
+        }
+      }
+    },
+    "GetRecommendationError":{
+      "type":"structure",
+      "members":{
+        "identifier":{
+          "shape":"Identifier",
+          "documentation":"<p>The ID of the error.</p>"
+        },
+        "code":{
+          "shape":"Code",
+          "documentation":"<p>The error code.</p>"
+        },
+        "message":{
+          "shape":"Message",
+          "documentation":"<p>The message, or reason, for the error.</p>"
+        }
+      },
+      "documentation":"<p>Describes an error experienced when getting recommendations.</p> <p>For example, an error is returned if you request recommendations for an unsupported Auto Scaling group, or if you request recommendations for an instance of an unsupported instance family.</p>"
+    },
+    "GetRecommendationErrors":{
+      "type":"list",
+      "member":{"shape":"GetRecommendationError"}
+    },
+    "GetRecommendationSummariesRequest":{
+      "type":"structure",
+      "members":{
+        "accountIds":{
+          "shape":"AccountIds",
+          "documentation":"<p>The AWS account IDs for which to return recommendation summaries.</p> <p>Only one account ID can be specified per request.</p>"
+        },
+        "nextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>The token to advance to the next page of recommendation summaries.</p>"
+        },
+        "maxResults":{
+          "shape":"MaxResults",
+          "documentation":"<p>The maximum number of recommendation summaries to return with a single call.</p> <p>To retrieve the remaining results, make another call with the returned <code>NextToken</code> value.</p>"
+        }
+      }
+    },
+    "GetRecommendationSummariesResponse":{
+      "type":"structure",
+      "members":{
+        "nextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>The token to use to advance to the next page of recommendation summaries.</p> <p>This value is null when there are no more pages of recommendation summaries to return.</p>"
+        },
+        "recommendationSummaries":{
+          "shape":"RecommendationSummaries",
+          "documentation":"<p>An array of objects that summarize a recommendation.</p>"
+        }
+      }
+    },
+    "Identifier":{"type":"string"},
+    "IncludeMemberAccounts":{"type":"boolean"},
+    "InstanceArn":{"type":"string"},
+    "InstanceArns":{
+      "type":"list",
+      "member":{"shape":"InstanceArn"}
+    },
+    "InstanceName":{"type":"string"},
+    "InstanceRecommendation":{
+      "type":"structure",
+      "members":{
+        "instanceArn":{
+          "shape":"InstanceArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the current instance.</p>"
+        },
+        "accountId":{
+          "shape":"AccountId",
+          "documentation":"<p>The AWS account ID of the instance recommendation.</p>"
+        },
+        "instanceName":{
+          "shape":"InstanceName",
+          "documentation":"<p>The name of the current instance.</p>"
+        },
+        "currentInstanceType":{
+          "shape":"CurrentInstanceType",
+          "documentation":"<p>The instance type of the current instance.</p>"
+        },
+        "finding":{
+          "shape":"Finding",
+          "documentation":"<p>The finding classification for the instance.</p> <p>Findings for instances include:</p> <ul> <li> <p> <b> <code>Underprovisioned</code> </b>—An instance is considered under-provisioned when at least one specification of your instance, such as CPU, memory, or network, does not meet the performance requirements of your workload. Under-provisioned instances may lead to poor application performance.</p> </li> <li> <p> <b> <code>Overprovisioned</code> </b>—An instance is considered over-provisioned when at least one specification of your instance, such as CPU, memory, or network, can be sized down while still meeting the performance requirements of your workload, and no specification is under-provisioned. Over-provisioned instances may lead to unnecessary infrastructure cost.</p> </li> <li> <p> <b> <code>Optimized</code> </b>—An instance is considered optimized when all specifications of your instance, such as CPU, memory, and network, meet the performance requirements of your workload and is not over provisioned. An optimized instance runs your workloads with optimal performance and infrastructure cost. For optimized resources, AWS Compute Optimizer might recommend a new generation instance type.</p> </li> </ul> <note> <p>The values that are returned might be <code>UNDER_PROVISIONED</code>, <code>OVER_PROVISIONED</code>, or <code>OPTIMIZED</code>.</p> </note>"
+        },
+        "utilizationMetrics":{
+          "shape":"UtilizationMetrics",
+          "documentation":"<p>An array of objects that describe the utilization metrics of the instance.</p>"
+        },
+        "lookBackPeriodInDays":{
+          "shape":"LookBackPeriodInDays",
+          "documentation":"<p>The number of days for which utilization metrics were analyzed for the instance.</p>"
+        },
+        "recommendationOptions":{
+          "shape":"RecommendationOptions",
+          "documentation":"<p>An array of objects that describe the recommendation options for the instance.</p>"
+        },
+        "recommendationSources":{
+          "shape":"RecommendationSources",
+          "documentation":"<p>An array of objects that describe the source resource of the recommendation.</p>"
+        },
+        "lastRefreshTimestamp":{
+          "shape":"LastRefreshTimestamp",
+          "documentation":"<p>The time stamp of when the instance recommendation was last refreshed.</p>"
+        }
+      },
+      "documentation":"<p>Describes an Amazon EC2 instance recommendation.</p>"
+    },
+    "InstanceRecommendationOption":{
+      "type":"structure",
+      "members":{
+        "instanceType":{
+          "shape":"InstanceType",
+          "documentation":"<p>The instance type of the instance recommendation.</p>"
+        },
+        "projectedUtilizationMetrics":{
+          "shape":"ProjectedUtilizationMetrics",
+          "documentation":"<p>An array of objects that describe the projected utilization metrics of the instance recommendation option.</p>"
+        },
+        "performanceRisk":{
+          "shape":"PerformanceRisk",
+          "documentation":"<p>The performance risk of the instance recommendation option.</p> <p>Performance risk is the likelihood of the recommended instance type not meeting the performance requirement of your workload.</p> <p>The lowest performance risk is categorized as <code>0</code>, and the highest as <code>5</code>.</p>"
+        },
+        "rank":{
+          "shape":"Rank",
+          "documentation":"<p>The rank of the instance recommendation option.</p> <p>The top recommendation option is ranked as <code>1</code>.</p>"
+        }
+      },
+      "documentation":"<p>Describes a recommendation option for an Amazon EC2 instance.</p>"
+    },
+    "InstanceRecommendations":{
+      "type":"list",
+      "member":{"shape":"InstanceRecommendation"}
+    },
+    "InstanceType":{"type":"string"},
+    "InternalServerException":{
+      "type":"structure",
+      "members":{
+        "message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p>The request processing has failed because of an unknown error, exception, or failure.</p>",
+      "exception":true,
+      "fault":true
+    },
+    "InvalidParameterValueException":{
+      "type":"structure",
+      "members":{
+        "message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p>An invalid or out-of-range value was supplied for the input parameter.</p>",
+      "exception":true,
+      "synthetic":true
+    },
+    "LastRefreshTimestamp":{"type":"timestamp"},
+    "LookBackPeriodInDays":{"type":"double"},
+    "MaxResults":{
+      "type":"integer",
+      "box":true
+    },
+    "MaxSize":{"type":"integer"},
+    "MemberAccountsEnrolled":{"type":"boolean"},
+    "Message":{"type":"string"},
+    "MetricName":{
+      "type":"string",
+      "enum":[
+        "Cpu",
+        "Memory"
+      ]
+    },
+    "MetricStatistic":{
+      "type":"string",
+      "enum":[
+        "Maximum",
+        "Average"
+      ]
+    },
+    "MetricValue":{"type":"double"},
+    "MetricValues":{
+      "type":"list",
+      "member":{"shape":"MetricValue"}
+    },
+    "MinSize":{"type":"integer"},
+    "MissingAuthenticationToken":{
+      "type":"structure",
+      "members":{
+        "message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p>The request must contain either a valid (registered) AWS access key ID or X.509 certificate.</p>",
+      "exception":true,
+      "synthetic":true
+    },
+    "NextToken":{"type":"string"},
+    "OptInRequiredException":{
+      "type":"structure",
+      "members":{
+        "message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p>You must opt in to the service to perform this action.</p>",
+      "exception":true,
+      "synthetic":true
+    },
+    "PerformanceRisk":{
+      "type":"double",
+      "max":5,
+      "min":0
+    },
+    "Period":{"type":"integer"},
+    "ProjectedMetric":{
+      "type":"structure",
+      "members":{
+        "name":{
+          "shape":"MetricName",
+          "documentation":"<p>The name of the projected utilization metric.</p> <note> <p>Memory metrics are only returned for resources that have the unified CloudWatch agent installed on them. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/Install-CloudWatch-Agent.html\">Enabling Memory Utilization with the CloudWatch Agent</a>.</p> </note>"
+        },
+        "timestamps":{
+          "shape":"Timestamps",
+          "documentation":"<p>The time stamps of the projected utilization metric.</p>"
+        },
+        "values":{
+          "shape":"MetricValues",
+          "documentation":"<p>The values of the projected utilization metrics.</p>"
+        }
+      },
+      "documentation":"<p>Describes a projected utilization metric of a recommendation option, such as an Amazon EC2 instance.</p>"
+    },
+    "ProjectedMetrics":{
+      "type":"list",
+      "member":{"shape":"ProjectedMetric"}
+    },
+    "ProjectedUtilizationMetrics":{
+      "type":"list",
+      "member":{"shape":"UtilizationMetric"}
+    },
+    "Rank":{"type":"integer"},
+    "RecommendationOptions":{
+      "type":"list",
+      "member":{"shape":"InstanceRecommendationOption"}
+    },
+    "RecommendationSource":{
+      "type":"structure",
+      "members":{
+        "recommendationSourceArn":{
+          "shape":"RecommendationSourceArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the recommendation source.</p>"
+        },
+        "recommendationSourceType":{
+          "shape":"RecommendationSourceType",
+          "documentation":"<p>The resource type of the recommendation source.</p>"
+        }
+      },
+      "documentation":"<p>Describes the source of a recommendation, such as an Amazon EC2 instance or Auto Scaling group.</p>"
+    },
+    "RecommendationSourceArn":{"type":"string"},
+    "RecommendationSourceType":{
+      "type":"string",
+      "enum":[
+        "Ec2Instance",
+        "AutoScalingGroup"
+      ]
+    },
+    "RecommendationSources":{
+      "type":"list",
+      "member":{"shape":"RecommendationSource"}
+    },
+    "RecommendationSummaries":{
+      "type":"list",
+      "member":{"shape":"RecommendationSummary"}
+    },
+    "RecommendationSummary":{
+      "type":"structure",
+      "members":{
+        "summaries":{
+          "shape":"Summaries",
+          "documentation":"<p>An array of objects that describe a recommendation summary.</p>"
+        },
+        "recommendationResourceType":{
+          "shape":"RecommendationSourceType",
+          "documentation":"<p>The resource type of the recommendation.</p>"
+        },
+        "accountId":{
+          "shape":"AccountId",
+          "documentation":"<p>The AWS account ID of the recommendation summary.</p>"
+        }
+      },
+      "documentation":"<p>A summary of a recommendation.</p>"
+    },
+    "RecommendedInstanceType":{"type":"string"},
+    "RecommendedOptionProjectedMetric":{
+      "type":"structure",
+      "members":{
+        "recommendedInstanceType":{
+          "shape":"RecommendedInstanceType",
+          "documentation":"<p>The recommended instance type.</p>"
+        },
+        "rank":{
+          "shape":"Rank",
+          "documentation":"<p>The rank of the recommendation option projected metric.</p> <p>The top recommendation option is ranked as <code>1</code>.</p> <p>The projected metric rank correlates to the recommendation option rank. For example, the projected metric ranked as <code>1</code> is related to the recommendation option that is also ranked as <code>1</code> in the same response.</p>"
+        },
+        "projectedMetrics":{
+          "shape":"ProjectedMetrics",
+          "documentation":"<p>An array of objects that describe a projected utilization metric.</p>"
+        }
+      },
+      "documentation":"<p>Describes a projected utilization metric of a recommendation option.</p>"
+    },
+    "RecommendedOptionProjectedMetrics":{
+      "type":"list",
+      "member":{"shape":"RecommendedOptionProjectedMetric"}
+    },
+    "ResourceNotFoundException":{
+      "type":"structure",
+      "members":{
+        "message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p>The specified resource was not found.</p>",
+      "exception":true,
+      "synthetic":true
+    },
+    "ServiceUnavailableException":{
+      "type":"structure",
+      "members":{
+        "message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p>The request has failed due to a temporary failure of the server.</p>",
+      "exception":true,
+      "fault":true
+    },
+    "Status":{
+      "type":"string",
+      "enum":[
+        "Active",
+        "Inactive",
+        "Pending",
+        "Failed"
+      ]
+    },
+    "StatusReason":{"type":"string"},
+    "Summaries":{
+      "type":"list",
+      "member":{"shape":"Summary"}
+    },
+    "Summary":{
+      "type":"structure",
+      "members":{
+        "name":{
+          "shape":"Finding",
+          "documentation":"<p>The finding classification of the recommendation.</p>"
+        },
+        "value":{
+          "shape":"SummaryValue",
+          "documentation":"<p>The value of the recommendation summary.</p>"
+        }
+      },
+      "documentation":"<p>The summary of a recommendation.</p>"
+    },
+    "SummaryValue":{"type":"double"},
+    "ThrottlingException":{
+      "type":"structure",
+      "required":["message"],
+      "members":{
+        "message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p>The limit on the number of requests per second was exceeded.</p>",
+      "exception":true,
+      "synthetic":true
+    },
+    "Timestamp":{"type":"timestamp"},
+    "Timestamps":{
+      "type":"list",
+      "member":{"shape":"Timestamp"}
+    },
+    "UpdateEnrollmentStatusRequest":{
+      "type":"structure",
+      "required":["status"],
+      "members":{
+        "status":{
+          "shape":"Status",
+          "documentation":"<p>The new enrollment status of the account.</p> <p>Accepted options are <code>Active</code> or <code>Inactive</code>. You will get an error if <code>Pending</code> or <code>Failed</code> are specified.</p>"
+        },
+        "includeMemberAccounts":{
+          "shape":"IncludeMemberAccounts",
+          "documentation":"<p>Indicates whether to enroll member accounts within the organization, if the account is a master account of an organization.</p>"
+        }
+      }
+    },
+    "UpdateEnrollmentStatusResponse":{
+      "type":"structure",
+      "members":{
+        "status":{
+          "shape":"Status",
+          "documentation":"<p>The enrollment status of the account.</p>"
+        },
+        "statusReason":{
+          "shape":"StatusReason",
+          "documentation":"<p>The reason for the enrollment status of the account. For example, an account might show a status of <code>Pending</code> because member accounts of an organization require more time to be enrolled in the service.</p>"
+        }
+      }
+    },
+    "UtilizationMetric":{
+      "type":"structure",
+      "members":{
+        "name":{
+          "shape":"MetricName",
+          "documentation":"<p>The name of the utilization metric.</p> <note> <p>Memory metrics are only returned for resources that have the unified CloudWatch agent installed on them. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/Install-CloudWatch-Agent.html\">Enabling Memory Utilization with the CloudWatch Agent</a>.</p> </note>"
+        },
+        "statistic":{
+          "shape":"MetricStatistic",
+          "documentation":"<p>The statistic of the utilization metric.</p>"
+        },
+        "value":{
+          "shape":"MetricValue",
+          "documentation":"<p>The value of the utilization metric.</p>"
+        }
+      },
+      "documentation":"<p>Describes a utilization metric of a resource, such as an Amazon EC2 instance.</p>"
+    },
+    "UtilizationMetrics":{
+      "type":"list",
+      "member":{"shape":"UtilizationMetric"}
+    }
+  },
+  "documentation":"<p>AWS Compute Optimizer is a service that analyzes the configuration and utilization metrics of your AWS resources, such as EC2 instances and Auto Scaling groups. It reports whether your resources are optimal, and generates optimization recommendations to reduce the cost and improve the performance of your workloads. Compute Optimizer also provides recent utilization metric data, as well as projected utilization metric data for the recommendations, which you can use to evaluate which recommendation provides the best price-performance trade-off. The analysis of your usage patterns can help you decide when to move or resize your running resources, and still meet your performance and capacity requirements. For more information about Compute Optimizer, see the <a href=\"https://docs.aws.amazon.com/compute-optimizer/latest/ug/\">AWS Compute Optimizer User Guide</a>.</p>"
+}
diff --git a/services/config/build.properties b/services/config/build.properties
index ecf2dae6fcb1..15ec2da1fc71 100644
--- a/services/config/build.properties
+++ b/services/config/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/config/pom.xml b/services/config/pom.xml
index d6586984f2a1..3ede1cf0da4d 100644
--- a/services/config/pom.xml
+++ b/services/config/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>config</artifactId>
     <name>AWS Java SDK :: Services :: AWS Config</name>
diff --git a/services/config/src/main/resources/codegen-resources/paginators-1.json b/services/config/src/main/resources/codegen-resources/paginators-1.json
index 8e1ab7720c70..c7b61c50847e 100755
--- a/services/config/src/main/resources/codegen-resources/paginators-1.json
+++ b/services/config/src/main/resources/codegen-resources/paginators-1.json
@@ -16,6 +16,11 @@
       "limit_key": "limit",
       "output_token": "nextToken",
       "result_key": "configurationItems"
+    },
+    "SelectAggregateResourceConfig": {
+      "input_token": "NextToken",
+      "limit_key": "MaxResults",
+      "output_token": "NextToken"
     }
   }
 }
\ No newline at end of file
diff --git a/services/config/src/main/resources/codegen-resources/service-2.json b/services/config/src/main/resources/codegen-resources/service-2.json
index 54c0363952ec..5ac3ebe012a6 100755
--- a/services/config/src/main/resources/codegen-resources/service-2.json
+++ b/services/config/src/main/resources/codegen-resources/service-2.json
@@ -90,6 +90,19 @@
       ],
       "documentation":"<p>Deletes the configuration recorder.</p> <p>After the configuration recorder is deleted, AWS Config will not record resource configuration changes until you create a new configuration recorder.</p> <p>This action does not delete the configuration information that was previously recorded. You will be able to access the previously recorded information by using the <code>GetResourceConfigHistory</code> action, but you will not be able to access this information in the AWS Config console until you create a new configuration recorder.</p>"
     },
+    "DeleteConformancePack":{
+      "name":"DeleteConformancePack",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DeleteConformancePackRequest"},
+      "errors":[
+        {"shape":"NoSuchConformancePackException"},
+        {"shape":"ResourceInUseException"}
+      ],
+      "documentation":"<p>Deletes the specified conformance pack and all the AWS Config rules, remediation actions, and all evaluation results within that conformance pack.</p> <p>AWS Config sets the conformance pack to <code>DELETE_IN_PROGRESS</code> until the deletion is complete. You cannot update a conformance pack while it is in this state.</p>"
+    },
     "DeleteDeliveryChannel":{
       "name":"DeleteDeliveryChannel",
       "http":{
@@ -131,6 +144,20 @@
       ],
       "documentation":"<p>Deletes the specified organization config rule and all of its evaluation results from all member accounts in that organization. Only a master account can delete an organization config rule.</p> <p>AWS Config sets the state of a rule to DELETE_IN_PROGRESS until the deletion is complete. You cannot update a rule while it is in this state.</p>"
     },
+    "DeleteOrganizationConformancePack":{
+      "name":"DeleteOrganizationConformancePack",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DeleteOrganizationConformancePackRequest"},
+      "errors":[
+        {"shape":"NoSuchOrganizationConformancePackException"},
+        {"shape":"ResourceInUseException"},
+        {"shape":"OrganizationAccessDeniedException"}
+      ],
+      "documentation":"<p>Deletes the specified organization conformance pack and all of the config rules and remediation actions from all member accounts in that organization. Only a master account can delete an organization conformance pack.</p> <p>AWS Config sets the state of a conformance pack to DELETE_IN_PROGRESS until the deletion is complete. You cannot update a conformance pack while it is in this state. </p>"
+    },
     "DeletePendingAggregationRequest":{
       "name":"DeletePendingAggregationRequest",
       "http":{
@@ -153,7 +180,8 @@
       "output":{"shape":"DeleteRemediationConfigurationResponse"},
       "errors":[
         {"shape":"NoSuchRemediationConfigurationException"},
-        {"shape":"RemediationInProgressException"}
+        {"shape":"RemediationInProgressException"},
+        {"shape":"InsufficientPermissionsException"}
       ],
       "documentation":"<p>Deletes the remediation configuration.</p>"
     },
@@ -170,6 +198,19 @@
       ],
       "documentation":"<p>Deletes one or more remediation exceptions mentioned in the resource keys.</p>"
     },
+    "DeleteResourceConfig":{
+      "name":"DeleteResourceConfig",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DeleteResourceConfigRequest"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"NoRunningConfigurationRecorderException"}
+      ],
+      "documentation":"<p>Records the configuration state for a custom resource that has been deleted. This API records a new ConfigurationItem with a ResourceDeleted status. You can retrieve the ConfigurationItems recorded for this resource in your AWS Config History. </p>"
+    },
     "DeleteRetentionConfiguration":{
       "name":"DeleteRetentionConfiguration",
       "http":{
@@ -345,6 +386,52 @@
       ],
       "documentation":"<p>Returns the details for the specified configuration recorders. If the configuration recorder is not specified, this action returns the details for all configuration recorders associated with the account.</p> <note> <p>Currently, you can specify only one configuration recorder per region in your account.</p> </note>"
     },
+    "DescribeConformancePackCompliance":{
+      "name":"DescribeConformancePackCompliance",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DescribeConformancePackComplianceRequest"},
+      "output":{"shape":"DescribeConformancePackComplianceResponse"},
+      "errors":[
+        {"shape":"InvalidLimitException"},
+        {"shape":"InvalidNextTokenException"},
+        {"shape":"InvalidParameterValueException"},
+        {"shape":"NoSuchConfigRuleInConformancePackException"},
+        {"shape":"NoSuchConformancePackException"}
+      ],
+      "documentation":"<p>Returns compliance details for each rule in that conformance pack.</p> <note> <p>You must provide exact rule names.</p> </note>"
+    },
+    "DescribeConformancePackStatus":{
+      "name":"DescribeConformancePackStatus",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DescribeConformancePackStatusRequest"},
+      "output":{"shape":"DescribeConformancePackStatusResponse"},
+      "errors":[
+        {"shape":"InvalidLimitException"},
+        {"shape":"InvalidNextTokenException"}
+      ],
+      "documentation":"<p>Provides one or more conformance packs deployment status.</p> <note> <p>If there are no conformance packs then you will see an empty result.</p> </note>"
+    },
+    "DescribeConformancePacks":{
+      "name":"DescribeConformancePacks",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DescribeConformancePacksRequest"},
+      "output":{"shape":"DescribeConformancePacksResponse"},
+      "errors":[
+        {"shape":"NoSuchConformancePackException"},
+        {"shape":"InvalidLimitException"},
+        {"shape":"InvalidNextTokenException"}
+      ],
+      "documentation":"<p>Returns a list of one or more conformance packs.</p>"
+    },
     "DescribeDeliveryChannelStatus":{
       "name":"DescribeDeliveryChannelStatus",
       "http":{
@@ -403,6 +490,38 @@
       ],
       "documentation":"<p>Returns a list of organization config rules.</p> <note> <p>When you specify the limit and the next token, you receive a paginated response. Limit and next token are not applicable if you specify organization config rule names. It is only applicable, when you request all the organization config rules.</p> <p>Only a master account can call this API.</p> </note>"
     },
+    "DescribeOrganizationConformancePackStatuses":{
+      "name":"DescribeOrganizationConformancePackStatuses",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DescribeOrganizationConformancePackStatusesRequest"},
+      "output":{"shape":"DescribeOrganizationConformancePackStatusesResponse"},
+      "errors":[
+        {"shape":"NoSuchOrganizationConformancePackException"},
+        {"shape":"InvalidLimitException"},
+        {"shape":"InvalidNextTokenException"},
+        {"shape":"OrganizationAccessDeniedException"}
+      ],
+      "documentation":"<p>Provides organization conformance pack deployment status for an organization.</p> <note> <p>The status is not considered successful until organization conformance pack is successfully deployed in all the member accounts with an exception of excluded accounts.</p> <p>When you specify the limit and the next token, you receive a paginated response. Limit and next token are not applicable if you specify organization conformance pack names. They are only applicable, when you request all the organization conformance packs.</p> <p>Only a master account can call this API.</p> </note>"
+    },
+    "DescribeOrganizationConformancePacks":{
+      "name":"DescribeOrganizationConformancePacks",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DescribeOrganizationConformancePacksRequest"},
+      "output":{"shape":"DescribeOrganizationConformancePacksResponse"},
+      "errors":[
+        {"shape":"NoSuchOrganizationConformancePackException"},
+        {"shape":"InvalidNextTokenException"},
+        {"shape":"InvalidLimitException"},
+        {"shape":"OrganizationAccessDeniedException"}
+      ],
+      "documentation":"<p>Returns a list of organization conformance packs.</p> <note> <p>When you specify the limit and the next token, you receive a paginated response. </p> <p>Limit and next token are not applicable if you specify organization conformance packs names. They are only applicable, when you request all the organization conformance packs. </p> <p>Only a master account can call this API.</p> </note>"
+    },
     "DescribePendingAggregationRequests":{
       "name":"DescribePendingAggregationRequests",
       "http":{
@@ -585,6 +704,38 @@
       ],
       "documentation":"<p>Returns the number of resources that are compliant and the number that are noncompliant. You can specify one or more resource types to get these numbers for each resource type. The maximum number returned is 100.</p>"
     },
+    "GetConformancePackComplianceDetails":{
+      "name":"GetConformancePackComplianceDetails",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"GetConformancePackComplianceDetailsRequest"},
+      "output":{"shape":"GetConformancePackComplianceDetailsResponse"},
+      "errors":[
+        {"shape":"InvalidLimitException"},
+        {"shape":"InvalidNextTokenException"},
+        {"shape":"NoSuchConformancePackException"},
+        {"shape":"NoSuchConfigRuleInConformancePackException"},
+        {"shape":"InvalidParameterValueException"}
+      ],
+      "documentation":"<p>Returns compliance details of a conformance pack for all AWS resources that are monitered by conformance pack.</p>"
+    },
+    "GetConformancePackComplianceSummary":{
+      "name":"GetConformancePackComplianceSummary",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"GetConformancePackComplianceSummaryRequest"},
+      "output":{"shape":"GetConformancePackComplianceSummaryResponse"},
+      "errors":[
+        {"shape":"NoSuchConformancePackException"},
+        {"shape":"InvalidLimitException"},
+        {"shape":"InvalidNextTokenException"}
+      ],
+      "documentation":"<p>Returns compliance details for the conformance pack based on the cumulative compliance results of all the rules in that conformance pack.</p>"
+    },
     "GetDiscoveredResourceCounts":{
       "name":"GetDiscoveredResourceCounts",
       "http":{
@@ -616,6 +767,22 @@
       ],
       "documentation":"<p>Returns detailed status for each member account within an organization for a given organization config rule.</p> <note> <p>Only a master account can call this API.</p> </note>"
     },
+    "GetOrganizationConformancePackDetailedStatus":{
+      "name":"GetOrganizationConformancePackDetailedStatus",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"GetOrganizationConformancePackDetailedStatusRequest"},
+      "output":{"shape":"GetOrganizationConformancePackDetailedStatusResponse"},
+      "errors":[
+        {"shape":"NoSuchOrganizationConformancePackException"},
+        {"shape":"InvalidLimitException"},
+        {"shape":"InvalidNextTokenException"},
+        {"shape":"OrganizationAccessDeniedException"}
+      ],
+      "documentation":"<p>Returns detailed status for each member account within an organization for a given organization conformance pack.</p> <p>Only a master account can call this API.</p>"
+    },
     "GetResourceConfigHistory":{
       "name":"GetResourceConfigHistory",
       "http":{
@@ -744,6 +911,23 @@
       ],
       "documentation":"<p>Creates a new configuration recorder to record the selected resource configurations.</p> <p>You can use this action to change the role <code>roleARN</code> or the <code>recordingGroup</code> of an existing recorder. To change the role, call the action on the existing configuration recorder and specify a role.</p> <note> <p>Currently, you can specify only one configuration recorder per region in your account.</p> <p>If <code>ConfigurationRecorder</code> does not have the <b>recordingGroup</b> parameter specified, the default is to record all supported resource types.</p> </note>"
     },
+    "PutConformancePack":{
+      "name":"PutConformancePack",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"PutConformancePackRequest"},
+      "output":{"shape":"PutConformancePackResponse"},
+      "errors":[
+        {"shape":"InsufficientPermissionsException"},
+        {"shape":"ConformancePackTemplateValidationException"},
+        {"shape":"ResourceInUseException"},
+        {"shape":"InvalidParameterValueException"},
+        {"shape":"MaxNumberOfConformancePacksExceededException"}
+      ],
+      "documentation":"<p>Creates or updates a conformance pack. A conformance pack is a collection of AWS Config rules that can be easily deployed in an account and a region and across AWS Organization.</p> <p>This API creates a service linked role <code>AWSServiceRoleForConfigConforms</code> in your account. The service linked role is created only when the role does not exist in your account. AWS Config verifies the existence of role with <code>GetRole</code> action.</p> <note> <p>You must specify either the <code>TemplateS3Uri</code> or the <code>TemplateBody</code> parameter, but not both. If you provide both AWS Config uses the <code>TemplateS3Uri</code> parameter and ignores the <code>TemplateBody</code> parameter.</p> </note>"
+    },
     "PutDeliveryChannel":{
       "name":"PutDeliveryChannel",
       "http":{
@@ -797,6 +981,26 @@
       ],
       "documentation":"<p>Adds or updates organization config rule for your entire organization evaluating whether your AWS resources comply with your desired configurations. Only a master account can create or update an organization config rule.</p> <p>This API enables organization service access through the <code>EnableAWSServiceAccess</code> action and creates a service linked role <code>AWSServiceRoleForConfigMultiAccountSetup</code> in the master account of your organization. The service linked role is created only when the role does not exist in the master account. AWS Config verifies the existence of role with <code>GetRole</code> action.</p> <p>You can use this action to create both custom AWS Config rules and AWS managed Config rules. If you are adding a new custom AWS Config rule, you must first create AWS Lambda function in the master account that the rule invokes to evaluate your resources. When you use the <code>PutOrganizationConfigRule</code> action to add the rule to AWS Config, you must specify the Amazon Resource Name (ARN) that AWS Lambda assigns to the function. If you are adding an AWS managed Config rule, specify the rule's identifier for the <code>RuleIdentifier</code> key.</p> <p>The maximum number of organization config rules that AWS Config supports is 150.</p> <note> <p>Specify either <code>OrganizationCustomRuleMetadata</code> or <code>OrganizationManagedRuleMetadata</code>.</p> </note>"
     },
+    "PutOrganizationConformancePack":{
+      "name":"PutOrganizationConformancePack",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"PutOrganizationConformancePackRequest"},
+      "output":{"shape":"PutOrganizationConformancePackResponse"},
+      "errors":[
+        {"shape":"MaxNumberOfOrganizationConformancePacksExceededException"},
+        {"shape":"ResourceInUseException"},
+        {"shape":"ValidationException"},
+        {"shape":"OrganizationAccessDeniedException"},
+        {"shape":"InsufficientPermissionsException"},
+        {"shape":"OrganizationConformancePackTemplateValidationException"},
+        {"shape":"OrganizationAllFeaturesNotEnabledException"},
+        {"shape":"NoAvailableOrganizationException"}
+      ],
+      "documentation":"<p>Deploys conformance packs across member accounts in an AWS Organization.</p> <p>This API enables organization service access for <code>config-multiaccountsetup.amazonaws.com</code> through the <code>EnableAWSServiceAccess</code> action and creates a service linked role <code>AWSServiceRoleForConfigMultiAccountSetup</code> in the master account of your organization. The service linked role is created only when the role does not exist in the master account. AWS Config verifies the existence of role with GetRole action.</p> <note> <p>You must specify either the <code>TemplateS3Uri</code> or the <code>TemplateBody</code> parameter, but not both. If you provide both AWS Config uses the <code>TemplateS3Uri</code> parameter and ignores the <code>TemplateBody</code> parameter.</p> <p>AWS Config sets the state of a conformance pack to CREATE_IN_PROGRESS and UPDATE_IN_PROGRESS until the confomance pack is created or updated. You cannot update a conformance pack while it is in this state.</p> <p>You can create 6 conformance packs with 25 AWS Config rules in each pack.</p> </note>"
+    },
     "PutRemediationConfigurations":{
       "name":"PutRemediationConfigurations",
       "http":{
@@ -824,6 +1028,21 @@
       ],
       "documentation":"<p>A remediation exception is when a specific resource is no longer considered for auto-remediation. This API adds a new exception or updates an exisiting exception for a specific resource with a specific AWS Config rule. </p>"
     },
+    "PutResourceConfig":{
+      "name":"PutResourceConfig",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"PutResourceConfigRequest"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"InsufficientPermissionsException"},
+        {"shape":"NoRunningConfigurationRecorderException"},
+        {"shape":"MaxActiveResourcesExceededException"}
+      ],
+      "documentation":"<p>Records the configuration state for the resource provided in the request. The configuration state of a resource is represented in AWS Config as Configuration Items. Once this API records the configuration item, you can retrieve the list of configuration items for the custom resource type using existing AWS Config APIs. </p> <note> <p>The custom resource type must be registered with AWS CloudFormation. This API accepts the configuration item registered with AWS CloudFormation.</p> <p>When you call this API, AWS Config only stores configuration state of the resource provided in the request. This API does not change or remediate the configuration of the resource. </p> </note>"
+    },
     "PutRetentionConfiguration":{
       "name":"PutRetentionConfiguration",
       "http":{
@@ -838,6 +1057,22 @@
       ],
       "documentation":"<p>Creates and updates the retention configuration with details about retention period (number of days) that AWS Config stores your historical information. The API creates the <code>RetentionConfiguration</code> object and names the object as <b>default</b>. When you have a <code>RetentionConfiguration</code> object named <b>default</b>, calling the API modifies the default object. </p> <note> <p>Currently, AWS Config supports only one retention configuration per region in your account.</p> </note>"
     },
+    "SelectAggregateResourceConfig":{
+      "name":"SelectAggregateResourceConfig",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"SelectAggregateResourceConfigRequest"},
+      "output":{"shape":"SelectAggregateResourceConfigResponse"},
+      "errors":[
+        {"shape":"InvalidExpressionException"},
+        {"shape":"NoSuchConfigurationAggregatorException"},
+        {"shape":"InvalidLimitException"},
+        {"shape":"InvalidNextTokenException"}
+      ],
+      "documentation":"<p>Accepts a structured query language (SQL) SELECT command and an aggregator to query configuration state of AWS resources across multiple accounts and regions, performs the corresponding search, and returns resource configurations matching the properties.</p> <p>For more information about query components, see the <a href=\"https://docs.aws.amazon.com/config/latest/developerguide/query-components.html\"> <b>Query Components</b> </a> section in the AWS Config Developer Guide.</p>"
+    },
     "SelectResourceConfig":{
       "name":"SelectResourceConfig",
       "http":{
@@ -1179,9 +1414,14 @@
     "AllSupported":{"type":"boolean"},
     "AmazonResourceName":{
       "type":"string",
-      "max":256,
+      "max":1000,
       "min":1
     },
+    "Annotation":{
+      "type":"string",
+      "max":256,
+      "min":0
+    },
     "AutoRemediationAttemptSeconds":{
       "type":"long",
       "box":true,
@@ -1497,15 +1737,15 @@
       "required":["Source"],
       "members":{
         "ConfigRuleName":{
-          "shape":"StringWithCharLimit64",
+          "shape":"ConfigRuleName",
           "documentation":"<p>The name that you assign to the AWS Config rule. The name is required if you are adding a new rule.</p>"
         },
         "ConfigRuleArn":{
-          "shape":"String",
+          "shape":"StringWithCharLimit256",
           "documentation":"<p>The Amazon Resource Name (ARN) of the AWS Config rule.</p>"
         },
         "ConfigRuleId":{
-          "shape":"String",
+          "shape":"StringWithCharLimit64",
           "documentation":"<p>The ID of the AWS Config rule.</p>"
         },
         "Description":{
@@ -1586,7 +1826,7 @@
       "type":"structure",
       "members":{
         "ConfigRuleName":{
-          "shape":"StringWithCharLimit64",
+          "shape":"ConfigRuleName",
           "documentation":"<p>The name of the AWS Config rule.</p>"
         },
         "ConfigRuleArn":{
@@ -1617,6 +1857,7 @@
           "shape":"Date",
           "documentation":"<p>The time that you first activated the AWS Config rule.</p>"
         },
+        "LastDeactivatedTime":{"shape":"Date"},
         "LastErrorCode":{
           "shape":"String",
           "documentation":"<p>The error code that AWS Config returned when the rule last failed.</p>"
@@ -1805,7 +2046,7 @@
         },
         "relatedEvents":{
           "shape":"RelatedEventList",
-          "documentation":"<p>A list of CloudTrail event IDs.</p> <p>A populated field indicates that the current configuration was initiated by the events recorded in the CloudTrail log. For more information about CloudTrail, see <a href=\"https://docs.aws.amazon.com/awscloudtrail/latest/userguide/what_is_cloud_trail_top_level.html\">What Is AWS CloudTrail</a>.</p> <p>An empty field indicates that the current configuration was not initiated by any event.</p>"
+          "documentation":"<p>A list of CloudTrail event IDs.</p> <p>A populated field indicates that the current configuration was initiated by the events recorded in the CloudTrail log. For more information about CloudTrail, see <a href=\"https://docs.aws.amazon.com/awscloudtrail/latest/userguide/what_is_cloud_trail_top_level.html\">What Is AWS CloudTrail</a>.</p> <p>An empty field indicates that the current configuration was not initiated by any event. As of Version 1.3, the relatedEvents field is empty. You can access the <a href=\"https://docs.aws.amazon.com/awscloudtrail/latest/APIReference/API_LookupEvents.html\">LookupEvents API</a> in the <i>AWS CloudTrail API Reference</i> to retrieve the events for the resource.</p>"
         },
         "relationships":{
           "shape":"RelationshipList",
@@ -1907,75 +2148,395 @@
       "member":{"shape":"ConfigurationRecorderStatus"}
     },
     "ConfigurationStateId":{"type":"string"},
-    "CosmosPageLimit":{
-      "type":"integer",
-      "max":100,
-      "min":0
+    "ConformancePackArn":{
+      "type":"string",
+      "max":2048,
+      "min":1
     },
-    "Date":{"type":"timestamp"},
-    "DeleteAggregationAuthorizationRequest":{
+    "ConformancePackComplianceFilters":{
       "type":"structure",
-      "required":[
-        "AuthorizedAccountId",
-        "AuthorizedAwsRegion"
-      ],
       "members":{
-        "AuthorizedAccountId":{
-          "shape":"AccountId",
-          "documentation":"<p>The 12-digit account ID of the account authorized to aggregate data.</p>"
+        "ConfigRuleNames":{
+          "shape":"ConformancePackConfigRuleNames",
+          "documentation":"<p>Filters the results by AWS Config rule names.</p>"
         },
-        "AuthorizedAwsRegion":{
-          "shape":"AwsRegion",
-          "documentation":"<p>The region authorized to collect aggregated data.</p>"
+        "ComplianceType":{
+          "shape":"ConformancePackComplianceType",
+          "documentation":"<p>Filters the results by compliance.</p> <p>The allowed values are <code>COMPLIANT</code> and <code>NON_COMPLIANT</code>.</p>"
         }
-      }
+      },
+      "documentation":"<p>Filters the conformance pack by compliance types and AWS Config rule names.</p>"
     },
-    "DeleteConfigRuleRequest":{
+    "ConformancePackComplianceResourceIds":{
+      "type":"list",
+      "member":{"shape":"StringWithCharLimit256"},
+      "max":5,
+      "min":0
+    },
+    "ConformancePackComplianceSummary":{
       "type":"structure",
-      "required":["ConfigRuleName"],
+      "required":[
+        "ConformancePackName",
+        "ConformancePackComplianceStatus"
+      ],
       "members":{
-        "ConfigRuleName":{
-          "shape":"StringWithCharLimit64",
-          "documentation":"<p>The name of the AWS Config rule that you want to delete.</p>"
+        "ConformancePackName":{
+          "shape":"ConformancePackName",
+          "documentation":"<p>The name of the conformance pack name.</p>"
+        },
+        "ConformancePackComplianceStatus":{
+          "shape":"ConformancePackComplianceType",
+          "documentation":"<p>The status of the conformance pack. The allowed values are COMPLIANT and NON_COMPLIANT. </p>"
         }
       },
-      "documentation":"<p/>"
+      "documentation":"<p>Summary includes the name and status of the conformance pack.</p>"
     },
-    "DeleteConfigurationAggregatorRequest":{
-      "type":"structure",
-      "required":["ConfigurationAggregatorName"],
-      "members":{
-        "ConfigurationAggregatorName":{
-          "shape":"ConfigurationAggregatorName",
-          "documentation":"<p>The name of the configuration aggregator.</p>"
-        }
-      }
+    "ConformancePackComplianceSummaryList":{
+      "type":"list",
+      "member":{"shape":"ConformancePackComplianceSummary"},
+      "max":5,
+      "min":1
     },
-    "DeleteConfigurationRecorderRequest":{
+    "ConformancePackComplianceType":{
+      "type":"string",
+      "enum":[
+        "COMPLIANT",
+        "NON_COMPLIANT"
+      ]
+    },
+    "ConformancePackConfigRuleNames":{
+      "type":"list",
+      "member":{"shape":"StringWithCharLimit64"},
+      "max":10,
+      "min":0
+    },
+    "ConformancePackDetail":{
       "type":"structure",
-      "required":["ConfigurationRecorderName"],
+      "required":[
+        "ConformancePackName",
+        "ConformancePackArn",
+        "ConformancePackId",
+        "DeliveryS3Bucket"
+      ],
       "members":{
-        "ConfigurationRecorderName":{
-          "shape":"RecorderName",
-          "documentation":"<p>The name of the configuration recorder to be deleted. You can retrieve the name of your configuration recorder by using the <code>DescribeConfigurationRecorders</code> action.</p>"
+        "ConformancePackName":{
+          "shape":"ConformancePackName",
+          "documentation":"<p>Name of the conformance pack.</p>"
+        },
+        "ConformancePackArn":{
+          "shape":"ConformancePackArn",
+          "documentation":"<p>Amazon Resource Name (ARN) of the conformance pack.</p>"
+        },
+        "ConformancePackId":{
+          "shape":"ConformancePackId",
+          "documentation":"<p>ID of the conformance pack.</p>"
+        },
+        "DeliveryS3Bucket":{
+          "shape":"DeliveryS3Bucket",
+          "documentation":"<p>Conformance pack template that is used to create a pack. The delivery bucket name should start with awsconfigconforms. For example: \"Resource\": \"arn:aws:s3:::your_bucket_name/*\".</p>"
+        },
+        "DeliveryS3KeyPrefix":{
+          "shape":"DeliveryS3KeyPrefix",
+          "documentation":"<p>The prefix for the Amazon S3 bucket.</p>"
+        },
+        "ConformancePackInputParameters":{
+          "shape":"ConformancePackInputParameters",
+          "documentation":"<p>A list of <code>ConformancePackInputParameter</code> objects.</p>"
+        },
+        "LastUpdateRequestedTime":{
+          "shape":"Date",
+          "documentation":"<p>Last time when conformation pack update was requested. </p>"
+        },
+        "CreatedBy":{
+          "shape":"StringWithCharLimit256",
+          "documentation":"<p>AWS service that created the conformance pack.</p>"
         }
       },
-      "documentation":"<p>The request object for the <code>DeleteConfigurationRecorder</code> action.</p>"
+      "documentation":"<p>Returns details of a conformance pack. A conformance pack is a collection of AWS Config rules and remediation actions that can be easily deployed in an account and a region.</p>"
     },
-    "DeleteDeliveryChannelRequest":{
+    "ConformancePackDetailList":{
+      "type":"list",
+      "member":{"shape":"ConformancePackDetail"},
+      "max":25,
+      "min":0
+    },
+    "ConformancePackEvaluationFilters":{
       "type":"structure",
-      "required":["DeliveryChannelName"],
       "members":{
-        "DeliveryChannelName":{
-          "shape":"ChannelName",
-          "documentation":"<p>The name of the delivery channel to delete.</p>"
+        "ConfigRuleNames":{
+          "shape":"ConformancePackConfigRuleNames",
+          "documentation":"<p>Filters the results by AWS Config rule names.</p>"
+        },
+        "ComplianceType":{
+          "shape":"ConformancePackComplianceType",
+          "documentation":"<p>Filters the results by compliance.</p> <p>The allowed values are <code>COMPLIANT</code> and <code>NON_COMPLIANT</code>.</p>"
+        },
+        "ResourceType":{
+          "shape":"StringWithCharLimit256",
+          "documentation":"<p>Filters the results by the resource type (for example, <code>\"AWS::EC2::Instance\"</code>). </p>"
+        },
+        "ResourceIds":{
+          "shape":"ConformancePackComplianceResourceIds",
+          "documentation":"<p>Filters the results by resource IDs.</p> <note> <p>This is valid only when you provide resource type. If there is no resource type, you will see an error.</p> </note>"
         }
       },
-      "documentation":"<p>The input for the <a>DeleteDeliveryChannel</a> action. The action accepts the following data, in JSON format. </p>"
+      "documentation":"<p>Filters a conformance pack by AWS Config rule names, compliance types, AWS resource types, and resource IDs.</p>"
     },
-    "DeleteEvaluationResultsRequest":{
+    "ConformancePackEvaluationResult":{
+      "type":"structure",
+      "required":[
+        "ComplianceType",
+        "EvaluationResultIdentifier",
+        "ConfigRuleInvokedTime",
+        "ResultRecordedTime"
+      ],
+      "members":{
+        "ComplianceType":{
+          "shape":"ConformancePackComplianceType",
+          "documentation":"<p>The compliance type. The allowed values are <code>COMPLIANT</code> and <code>NON_COMPLIANT</code>. </p>"
+        },
+        "EvaluationResultIdentifier":{"shape":"EvaluationResultIdentifier"},
+        "ConfigRuleInvokedTime":{
+          "shape":"Date",
+          "documentation":"<p>The time when AWS Config rule evaluated AWS resource.</p>"
+        },
+        "ResultRecordedTime":{
+          "shape":"Date",
+          "documentation":"<p>The time when AWS Config recorded the evaluation result. </p>"
+        },
+        "Annotation":{
+          "shape":"Annotation",
+          "documentation":"<p>Supplementary information about how the evaluation determined the compliance. </p>"
+        }
+      },
+      "documentation":"<p>The details of a conformance pack evaluation. Provides AWS Config rule and AWS resource type that was evaluated, the compliance of the conformance pack, related time stamps, and supplementary information. </p>"
+    },
+    "ConformancePackId":{
+      "type":"string",
+      "max":1024,
+      "min":1
+    },
+    "ConformancePackInputParameter":{
+      "type":"structure",
+      "required":[
+        "ParameterName",
+        "ParameterValue"
+      ],
+      "members":{
+        "ParameterName":{
+          "shape":"ParameterName",
+          "documentation":"<p>One part of a key-value pair.</p>"
+        },
+        "ParameterValue":{
+          "shape":"ParameterValue",
+          "documentation":"<p>Another part of the key-value pair. </p>"
+        }
+      },
+      "documentation":"<p>Input parameters in the form of key-value pairs for the conformance pack, both of which you define. Keys can have a maximum character length of 128 characters, and values can have a maximum length of 256 characters.</p>"
+    },
+    "ConformancePackInputParameters":{
+      "type":"list",
+      "member":{"shape":"ConformancePackInputParameter"},
+      "max":60,
+      "min":0
+    },
+    "ConformancePackName":{
+      "type":"string",
+      "max":256,
+      "min":1,
+      "pattern":"[a-zA-Z][-a-zA-Z0-9]*"
+    },
+    "ConformancePackNamesList":{
+      "type":"list",
+      "member":{"shape":"ConformancePackName"},
+      "max":25,
+      "min":0
+    },
+    "ConformancePackNamesToSummarizeList":{
+      "type":"list",
+      "member":{"shape":"ConformancePackName"},
+      "max":5,
+      "min":1
+    },
+    "ConformancePackRuleCompliance":{
       "type":"structure",
-      "required":["ConfigRuleName"],
+      "members":{
+        "ConfigRuleName":{
+          "shape":"ConfigRuleName",
+          "documentation":"<p>Name of the config rule.</p>"
+        },
+        "ComplianceType":{
+          "shape":"ConformancePackComplianceType",
+          "documentation":"<p>Compliance of the AWS Config rule</p> <p>The allowed values are <code>COMPLIANT</code> and <code>NON_COMPLIANT</code>.</p>"
+        }
+      },
+      "documentation":"<p>Compliance information of one or more AWS Config rules within a conformance pack. You can filter using AWS Config rule names and compliance types.</p>"
+    },
+    "ConformancePackRuleComplianceList":{
+      "type":"list",
+      "member":{"shape":"ConformancePackRuleCompliance"},
+      "max":1000,
+      "min":0
+    },
+    "ConformancePackRuleEvaluationResultsList":{
+      "type":"list",
+      "member":{"shape":"ConformancePackEvaluationResult"},
+      "max":100,
+      "min":0
+    },
+    "ConformancePackState":{
+      "type":"string",
+      "enum":[
+        "CREATE_IN_PROGRESS",
+        "CREATE_COMPLETE",
+        "CREATE_FAILED",
+        "DELETE_IN_PROGRESS",
+        "DELETE_FAILED"
+      ]
+    },
+    "ConformancePackStatusDetail":{
+      "type":"structure",
+      "required":[
+        "ConformancePackName",
+        "ConformancePackId",
+        "ConformancePackArn",
+        "ConformancePackState",
+        "StackArn",
+        "LastUpdateRequestedTime"
+      ],
+      "members":{
+        "ConformancePackName":{
+          "shape":"ConformancePackName",
+          "documentation":"<p>Name of the conformance pack.</p>"
+        },
+        "ConformancePackId":{
+          "shape":"ConformancePackId",
+          "documentation":"<p>ID of the conformance pack.</p>"
+        },
+        "ConformancePackArn":{
+          "shape":"ConformancePackArn",
+          "documentation":"<p>Amazon Resource Name (ARN) of comformance pack.</p>"
+        },
+        "ConformancePackState":{
+          "shape":"ConformancePackState",
+          "documentation":"<p>Indicates deployment status of conformance pack.</p> <p>AWS Config sets the state of the conformance pack to:</p> <ul> <li> <p>CREATE_IN_PROGRESS when a conformance pack creation is in progress for an account.</p> </li> <li> <p>CREATE_COMPLETE when a conformance pack has been successfully created in your account.</p> </li> <li> <p>CREATE_FAILED when a conformance pack creation failed in your account.</p> </li> <li> <p>DELETE_IN_PROGRESS when a conformance pack deletion is in progress. </p> </li> <li> <p>DELETE_FAILED when a conformance pack deletion failed in your account.</p> </li> </ul>"
+        },
+        "StackArn":{
+          "shape":"StackArn",
+          "documentation":"<p>Amazon Resource Name (ARN) of AWS CloudFormation stack. </p>"
+        },
+        "ConformancePackStatusReason":{
+          "shape":"ConformancePackStatusReason",
+          "documentation":"<p>The reason of conformance pack creation failure.</p>"
+        },
+        "LastUpdateRequestedTime":{
+          "shape":"Date",
+          "documentation":"<p>Last time when conformation pack creation and update was requested.</p>"
+        },
+        "LastUpdateCompletedTime":{
+          "shape":"Date",
+          "documentation":"<p>Last time when conformation pack creation and update was successful.</p>"
+        }
+      },
+      "documentation":"<p>Status details of a conformance pack.</p>"
+    },
+    "ConformancePackStatusDetailsList":{
+      "type":"list",
+      "member":{"shape":"ConformancePackStatusDetail"},
+      "max":25,
+      "min":0
+    },
+    "ConformancePackStatusReason":{
+      "type":"string",
+      "max":2000,
+      "min":0
+    },
+    "ConformancePackTemplateValidationException":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>You have specified a template that is not valid or supported.</p>",
+      "exception":true
+    },
+    "CosmosPageLimit":{
+      "type":"integer",
+      "max":100,
+      "min":0
+    },
+    "Date":{"type":"timestamp"},
+    "DeleteAggregationAuthorizationRequest":{
+      "type":"structure",
+      "required":[
+        "AuthorizedAccountId",
+        "AuthorizedAwsRegion"
+      ],
+      "members":{
+        "AuthorizedAccountId":{
+          "shape":"AccountId",
+          "documentation":"<p>The 12-digit account ID of the account authorized to aggregate data.</p>"
+        },
+        "AuthorizedAwsRegion":{
+          "shape":"AwsRegion",
+          "documentation":"<p>The region authorized to collect aggregated data.</p>"
+        }
+      }
+    },
+    "DeleteConfigRuleRequest":{
+      "type":"structure",
+      "required":["ConfigRuleName"],
+      "members":{
+        "ConfigRuleName":{
+          "shape":"ConfigRuleName",
+          "documentation":"<p>The name of the AWS Config rule that you want to delete.</p>"
+        }
+      },
+      "documentation":"<p/>"
+    },
+    "DeleteConfigurationAggregatorRequest":{
+      "type":"structure",
+      "required":["ConfigurationAggregatorName"],
+      "members":{
+        "ConfigurationAggregatorName":{
+          "shape":"ConfigurationAggregatorName",
+          "documentation":"<p>The name of the configuration aggregator.</p>"
+        }
+      }
+    },
+    "DeleteConfigurationRecorderRequest":{
+      "type":"structure",
+      "required":["ConfigurationRecorderName"],
+      "members":{
+        "ConfigurationRecorderName":{
+          "shape":"RecorderName",
+          "documentation":"<p>The name of the configuration recorder to be deleted. You can retrieve the name of your configuration recorder by using the <code>DescribeConfigurationRecorders</code> action.</p>"
+        }
+      },
+      "documentation":"<p>The request object for the <code>DeleteConfigurationRecorder</code> action.</p>"
+    },
+    "DeleteConformancePackRequest":{
+      "type":"structure",
+      "required":["ConformancePackName"],
+      "members":{
+        "ConformancePackName":{
+          "shape":"ConformancePackName",
+          "documentation":"<p>Name of the conformance pack you want to delete.</p>"
+        }
+      }
+    },
+    "DeleteDeliveryChannelRequest":{
+      "type":"structure",
+      "required":["DeliveryChannelName"],
+      "members":{
+        "DeliveryChannelName":{
+          "shape":"ChannelName",
+          "documentation":"<p>The name of the delivery channel to delete.</p>"
+        }
+      },
+      "documentation":"<p>The input for the <a>DeleteDeliveryChannel</a> action. The action accepts the following data, in JSON format. </p>"
+    },
+    "DeleteEvaluationResultsRequest":{
+      "type":"structure",
+      "required":["ConfigRuleName"],
       "members":{
         "ConfigRuleName":{
           "shape":"StringWithCharLimit64",
@@ -2000,6 +2561,16 @@
         }
       }
     },
+    "DeleteOrganizationConformancePackRequest":{
+      "type":"structure",
+      "required":["OrganizationConformancePackName"],
+      "members":{
+        "OrganizationConformancePackName":{
+          "shape":"OrganizationConformancePackName",
+          "documentation":"<p>The name of organization conformance pack that you want to delete.</p>"
+        }
+      }
+    },
     "DeletePendingAggregationRequestRequest":{
       "type":"structure",
       "required":[
@@ -2062,6 +2633,23 @@
         }
       }
     },
+    "DeleteResourceConfigRequest":{
+      "type":"structure",
+      "required":[
+        "ResourceType",
+        "ResourceId"
+      ],
+      "members":{
+        "ResourceType":{
+          "shape":"ResourceTypeString",
+          "documentation":"<p>The type of the resource.</p>"
+        },
+        "ResourceId":{
+          "shape":"ResourceId",
+          "documentation":"<p>Unique identifier of the resource.</p>"
+        }
+      }
+    },
     "DeleteRetentionConfigurationRequest":{
       "type":"structure",
       "required":["RetentionConfigurationName"],
@@ -2153,6 +2741,16 @@
       "type":"list",
       "member":{"shape":"DeliveryChannelStatus"}
     },
+    "DeliveryS3Bucket":{
+      "type":"string",
+      "max":63,
+      "min":3
+    },
+    "DeliveryS3KeyPrefix":{
+      "type":"string",
+      "max":1024,
+      "min":1
+    },
     "DeliveryStatus":{
       "type":"string",
       "enum":[
@@ -2459,6 +3057,114 @@
       },
       "documentation":"<p>The output for the <a>DescribeConfigurationRecorders</a> action.</p>"
     },
+    "DescribeConformancePackComplianceLimit":{
+      "type":"integer",
+      "max":1000,
+      "min":0
+    },
+    "DescribeConformancePackComplianceRequest":{
+      "type":"structure",
+      "required":["ConformancePackName"],
+      "members":{
+        "ConformancePackName":{
+          "shape":"ConformancePackName",
+          "documentation":"<p>Name of the conformance pack.</p>"
+        },
+        "Filters":{
+          "shape":"ConformancePackComplianceFilters",
+          "documentation":"<p>A <code>ConformancePackComplianceFilters</code> object.</p>"
+        },
+        "Limit":{
+          "shape":"DescribeConformancePackComplianceLimit",
+          "documentation":"<p>The maximum number of AWS Config rules within a conformance pack are returned on each page.</p>"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>The <code>nextToken</code> string returned in a previous request that you use to request the next page of results in a paginated response.</p>"
+        }
+      }
+    },
+    "DescribeConformancePackComplianceResponse":{
+      "type":"structure",
+      "required":[
+        "ConformancePackName",
+        "ConformancePackRuleComplianceList"
+      ],
+      "members":{
+        "ConformancePackName":{
+          "shape":"ConformancePackName",
+          "documentation":"<p>Name of the conformance pack.</p>"
+        },
+        "ConformancePackRuleComplianceList":{
+          "shape":"ConformancePackRuleComplianceList",
+          "documentation":"<p>Returns a list of <code>ConformancePackRuleCompliance</code> objects.</p>"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>The <code>nextToken</code> string returned in a previous request that you use to request the next page of results in a paginated response.</p>"
+        }
+      }
+    },
+    "DescribeConformancePackStatusRequest":{
+      "type":"structure",
+      "members":{
+        "ConformancePackNames":{
+          "shape":"ConformancePackNamesList",
+          "documentation":"<p>Comma-separated list of conformance pack names.</p>"
+        },
+        "Limit":{
+          "shape":"PageSizeLimit",
+          "documentation":"<p>The maximum number of conformance packs status returned on each page.</p>"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>The <code>nextToken</code> string returned in a previous request that you use to request the next page of results in a paginated response.</p>"
+        }
+      }
+    },
+    "DescribeConformancePackStatusResponse":{
+      "type":"structure",
+      "members":{
+        "ConformancePackStatusDetails":{
+          "shape":"ConformancePackStatusDetailsList",
+          "documentation":"<p>A list of <code>ConformancePackStatusDetail</code> objects.</p>"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>The <code>nextToken</code> string returned in a previous request that you use to request the next page of results in a paginated response.</p>"
+        }
+      }
+    },
+    "DescribeConformancePacksRequest":{
+      "type":"structure",
+      "members":{
+        "ConformancePackNames":{
+          "shape":"ConformancePackNamesList",
+          "documentation":"<p>Comma-separated list of conformance pack names for which you want details. If you do not specify any names, AWS Config returns details for all your conformance packs. </p>"
+        },
+        "Limit":{
+          "shape":"PageSizeLimit",
+          "documentation":"<p>The maximum number of conformance packs returned on each page.</p>"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>The <code>nextToken</code> string returned in a previous request that you use to request the next page of results in a paginated response.</p>"
+        }
+      }
+    },
+    "DescribeConformancePacksResponse":{
+      "type":"structure",
+      "members":{
+        "ConformancePackDetails":{
+          "shape":"ConformancePackDetailList",
+          "documentation":"<p>Returns a list of <code>ConformancePackDetail</code> objects.</p>"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>The <code>nextToken</code> string returned in a previous request that you use to request the next page of results in a paginated response.</p>"
+        }
+      }
+    },
     "DescribeDeliveryChannelStatusRequest":{
       "type":"structure",
       "members":{
@@ -2551,7 +3257,7 @@
       "members":{
         "OrganizationConfigRules":{
           "shape":"OrganizationConfigRules",
-          "documentation":"<p>Retuns a list <code>OrganizationConfigRule</code> objects.</p>"
+          "documentation":"<p>Returns a list of <code>OrganizationConfigRule</code> objects.</p>"
         },
         "NextToken":{
           "shape":"String",
@@ -2559,6 +3265,66 @@
         }
       }
     },
+    "DescribeOrganizationConformancePackStatusesRequest":{
+      "type":"structure",
+      "members":{
+        "OrganizationConformancePackNames":{
+          "shape":"OrganizationConformancePackNames",
+          "documentation":"<p>The names of organization conformance packs for which you want status details. If you do not specify any names, AWS Config returns details for all your organization conformance packs. </p>"
+        },
+        "Limit":{
+          "shape":"CosmosPageLimit",
+          "documentation":"<p>The maximum number of OrganizationConformancePackStatuses returned on each page. If you do no specify a number, AWS Config uses the default. The default is 100. </p>"
+        },
+        "NextToken":{
+          "shape":"String",
+          "documentation":"<p>The nextToken string returned on a previous page that you use to get the next page of results in a paginated response. </p>"
+        }
+      }
+    },
+    "DescribeOrganizationConformancePackStatusesResponse":{
+      "type":"structure",
+      "members":{
+        "OrganizationConformancePackStatuses":{
+          "shape":"OrganizationConformancePackStatuses",
+          "documentation":"<p>A list of <code>OrganizationConformancePackStatus</code> objects. </p>"
+        },
+        "NextToken":{
+          "shape":"String",
+          "documentation":"<p>The nextToken string returned on a previous page that you use to get the next page of results in a paginated response. </p>"
+        }
+      }
+    },
+    "DescribeOrganizationConformancePacksRequest":{
+      "type":"structure",
+      "members":{
+        "OrganizationConformancePackNames":{
+          "shape":"OrganizationConformancePackNames",
+          "documentation":"<p>The name that you assign to an organization conformance pack.</p>"
+        },
+        "Limit":{
+          "shape":"CosmosPageLimit",
+          "documentation":"<p>The maximum number of organization config packs returned on each page. If you do no specify a number, AWS Config uses the default. The default is 100.</p>"
+        },
+        "NextToken":{
+          "shape":"String",
+          "documentation":"<p>The nextToken string returned on a previous page that you use to get the next page of results in a paginated response.</p>"
+        }
+      }
+    },
+    "DescribeOrganizationConformancePacksResponse":{
+      "type":"structure",
+      "members":{
+        "OrganizationConformancePacks":{
+          "shape":"OrganizationConformancePacks",
+          "documentation":"<p>Returns a list of OrganizationConformancePacks objects.</p>"
+        },
+        "NextToken":{
+          "shape":"String",
+          "documentation":"<p>The nextToken string returned on a previous page that you use to get the next page of results in a paginated response.</p>"
+        }
+      }
+    },
     "DescribePendingAggregationRequestsLimit":{
       "type":"integer",
       "max":20,
@@ -2795,7 +3561,7 @@
       "type":"structure",
       "members":{
         "ConfigRuleName":{
-          "shape":"StringWithCharLimit64",
+          "shape":"ConfigRuleName",
           "documentation":"<p>The name of the AWS Config rule that was used in the evaluation.</p>"
         },
         "ResourceType":{
@@ -3189,6 +3955,82 @@
       },
       "documentation":"<p/>"
     },
+    "GetConformancePackComplianceDetailsLimit":{
+      "type":"integer",
+      "max":100,
+      "min":0
+    },
+    "GetConformancePackComplianceDetailsRequest":{
+      "type":"structure",
+      "required":["ConformancePackName"],
+      "members":{
+        "ConformancePackName":{
+          "shape":"ConformancePackName",
+          "documentation":"<p>Name of the conformance pack.</p>"
+        },
+        "Filters":{
+          "shape":"ConformancePackEvaluationFilters",
+          "documentation":"<p>A <code>ConformancePackEvaluationFilters</code> object.</p>"
+        },
+        "Limit":{
+          "shape":"GetConformancePackComplianceDetailsLimit",
+          "documentation":"<p>The maximum number of evaluation results returned on each page. If you do no specify a number, AWS Config uses the default. The default is 100.</p>"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>The <code>nextToken</code> string returned in a previous request that you use to request the next page of results in a paginated response.</p>"
+        }
+      }
+    },
+    "GetConformancePackComplianceDetailsResponse":{
+      "type":"structure",
+      "required":["ConformancePackName"],
+      "members":{
+        "ConformancePackName":{
+          "shape":"ConformancePackName",
+          "documentation":"<p>Name of the conformance pack.</p>"
+        },
+        "ConformancePackRuleEvaluationResults":{
+          "shape":"ConformancePackRuleEvaluationResultsList",
+          "documentation":"<p>Returns a list of <code>ConformancePackEvaluationResult</code> objects.</p>"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>The <code>nextToken</code> string returned in a previous request that you use to request the next page of results in a paginated response.</p>"
+        }
+      }
+    },
+    "GetConformancePackComplianceSummaryRequest":{
+      "type":"structure",
+      "required":["ConformancePackNames"],
+      "members":{
+        "ConformancePackNames":{
+          "shape":"ConformancePackNamesToSummarizeList",
+          "documentation":"<p>Names of conformance packs.</p>"
+        },
+        "Limit":{
+          "shape":"PageSizeLimit",
+          "documentation":"<p>The maximum number of conformance packs returned on each page.</p>"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>The nextToken string returned on a previous page that you use to get the next page of results in a paginated response.</p>"
+        }
+      }
+    },
+    "GetConformancePackComplianceSummaryResponse":{
+      "type":"structure",
+      "members":{
+        "ConformancePackComplianceSummaryList":{
+          "shape":"ConformancePackComplianceSummaryList",
+          "documentation":"<p>A list of <code>ConformancePackComplianceSummary</code> objects. </p>"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>The nextToken string returned on a previous page that you use to get the next page of results in a paginated response.</p>"
+        }
+      }
+    },
     "GetDiscoveredResourceCountsRequest":{
       "type":"structure",
       "members":{
@@ -3258,6 +4100,41 @@
         }
       }
     },
+    "GetOrganizationConformancePackDetailedStatusRequest":{
+      "type":"structure",
+      "required":["OrganizationConformancePackName"],
+      "members":{
+        "OrganizationConformancePackName":{
+          "shape":"OrganizationConformancePackName",
+          "documentation":"<p>The name of organization conformance pack for which you want status details for member accounts.</p>"
+        },
+        "Filters":{
+          "shape":"OrganizationResourceDetailedStatusFilters",
+          "documentation":"<p>An <code>OrganizationResourceDetailedStatusFilters</code> object.</p>"
+        },
+        "Limit":{
+          "shape":"CosmosPageLimit",
+          "documentation":"<p>The maximum number of <code>OrganizationConformancePackDetailedStatuses</code> returned on each page. If you do not specify a number, AWS Config uses the default. The default is 100. </p>"
+        },
+        "NextToken":{
+          "shape":"String",
+          "documentation":"<p>The nextToken string returned on a previous page that you use to get the next page of results in a paginated response. </p>"
+        }
+      }
+    },
+    "GetOrganizationConformancePackDetailedStatusResponse":{
+      "type":"structure",
+      "members":{
+        "OrganizationConformancePackDetailedStatuses":{
+          "shape":"OrganizationConformancePackDetailedStatuses",
+          "documentation":"<p>A list of <code>OrganizationConformancePackDetailedStatus</code> objects. </p>"
+        },
+        "NextToken":{
+          "shape":"String",
+          "documentation":"<p>The nextToken string returned on a previous page that you use to get the next page of results in a paginated response. </p>"
+        }
+      }
+    },
     "GetResourceConfigHistoryRequest":{
       "type":"structure",
       "required":[
@@ -3349,7 +4226,7 @@
       "type":"structure",
       "members":{
       },
-      "documentation":"<p>Indicates one of the following errors:</p> <ul> <li> <p>For PutConfigRule, the rule cannot be created because the IAM role assigned to AWS Config lacks permissions to perform the config:Put* action.</p> </li> <li> <p>For PutConfigRule, the AWS Lambda function cannot be invoked. Check the function ARN, and check the function's permissions.</p> </li> <li> <p>For OrganizationConfigRule, organization config rule cannot be created because you do not have permissions to call IAM <code>GetRole</code> action or create service linked role.</p> </li> </ul>",
+      "documentation":"<p>Indicates one of the following errors:</p> <ul> <li> <p>For PutConfigRule, the rule cannot be created because the IAM role assigned to AWS Config lacks permissions to perform the config:Put* action.</p> </li> <li> <p>For PutConfigRule, the AWS Lambda function cannot be invoked. Check the function ARN, and check the function's permissions.</p> </li> <li> <p>For PutOrganizationConfigRule, organization config rule cannot be created because you do not have permissions to call IAM <code>GetRole</code> action or create a service linked role.</p> </li> <li> <p>For PutConformancePack and PutOrganizationConformancePack, a conformance pack cannot be created because you do not have permissions: </p> <ul> <li> <p>To call IAM <code>GetRole</code> action or create a service linked role.</p> </li> <li> <p>To read Amazon S3 bucket.</p> </li> </ul> </li> </ul>",
       "exception":true
     },
     "Integer":{"type":"integer"},
@@ -3576,6 +4453,13 @@
       }
     },
     "Long":{"type":"long"},
+    "MaxActiveResourcesExceededException":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>You have reached the limit (100,000) of active custom resource types in your account. Delete unused resources using <code>DeleteResourceConfig</code>.</p>",
+      "exception":true
+    },
     "MaxNumberOfConfigRulesExceededException":{
       "type":"structure",
       "members":{
@@ -3590,6 +4474,13 @@
       "documentation":"<p>You have reached the limit of the number of recorders you can create.</p>",
       "exception":true
     },
+    "MaxNumberOfConformancePacksExceededException":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>You have reached the limit (6) of the number of conformance packs in an account (6 conformance pack with 25 AWS Config rules per pack).</p>",
+      "exception":true
+    },
     "MaxNumberOfDeliveryChannelsExceededException":{
       "type":"structure",
       "members":{
@@ -3597,11 +4488,18 @@
       "documentation":"<p>You have reached the limit of the number of delivery channels you can create.</p>",
       "exception":true
     },
-    "MaxNumberOfOrganizationConfigRulesExceededException":{
+    "MaxNumberOfOrganizationConfigRulesExceededException":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>You have reached the limit of the number of organization config rules you can create.</p>",
+      "exception":true
+    },
+    "MaxNumberOfOrganizationConformancePacksExceededException":{
       "type":"structure",
       "members":{
       },
-      "documentation":"<p>You have reached the limit of the number of organization config rules you can create.</p>",
+      "documentation":"<p>You have reached the limit (6) of the number of organization conformance packs in an account (6 conformance pack with 25 AWS Config rules per pack per account).</p>",
       "exception":true
     },
     "MaxNumberOfRetentionConfigurationsExceededException":{
@@ -3627,12 +4525,12 @@
         "CREATE_SUCCESSFUL",
         "CREATE_IN_PROGRESS",
         "CREATE_FAILED",
-        "UPDATE_SUCCESSFUL",
-        "UPDATE_FAILED",
-        "UPDATE_IN_PROGRESS",
         "DELETE_SUCCESSFUL",
         "DELETE_FAILED",
-        "DELETE_IN_PROGRESS"
+        "DELETE_IN_PROGRESS",
+        "UPDATE_SUCCESSFUL",
+        "UPDATE_IN_PROGRESS",
+        "UPDATE_FAILED"
       ]
     },
     "MemberAccountStatus":{
@@ -3723,6 +4621,13 @@
       "documentation":"<p>One or more AWS Config rules in the request are invalid. Verify that the rule names are correct and try again.</p>",
       "exception":true
     },
+    "NoSuchConfigRuleInConformancePackException":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>AWS Config rule that you passed in the filter does not exist.</p>",
+      "exception":true
+    },
     "NoSuchConfigurationAggregatorException":{
       "type":"structure",
       "members":{
@@ -3737,6 +4642,13 @@
       "documentation":"<p>You have specified a configuration recorder that does not exist.</p>",
       "exception":true
     },
+    "NoSuchConformancePackException":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>You specified one or more conformance packs that do not exist.</p>",
+      "exception":true
+    },
     "NoSuchDeliveryChannelException":{
       "type":"structure",
       "members":{
@@ -3751,6 +4663,13 @@
       "documentation":"<p>You specified one or more organization config rules that do not exist.</p>",
       "exception":true
     },
+    "NoSuchOrganizationConformancePackException":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>AWS Config organization conformance pack that you passed in the filter does not exist.</p> <p>For DeleteOrganizationConformancePack, you tried to delete an organization conformance pack that does not exist.</p>",
+      "exception":true
+    },
     "NoSuchRemediationConfigurationException":{
       "type":"structure",
       "members":{
@@ -3777,7 +4696,7 @@
       "type":"structure",
       "members":{
       },
-      "documentation":"<p>For PutConfigAggregator API, no permission to call EnableAWSServiceAccess API.</p> <p>For all OrganizationConfigRule APIs, AWS Config throws an exception if APIs are called from member accounts. All APIs must be called from organization master account.</p>",
+      "documentation":"<p>For PutConfigAggregator API, no permission to call EnableAWSServiceAccess API.</p> <p>For all OrganizationConfigRule and OrganizationConformancePack APIs, AWS Config throws an exception if APIs are called from member accounts. All APIs must be called from organization master account.</p>",
       "exception":true
     },
     "OrganizationAggregationSource":{
@@ -3819,7 +4738,7 @@
         },
         "OrganizationConfigRuleArn":{
           "shape":"StringWithCharLimit256",
-          "documentation":"<p>The Amazon Resource Name (ARN) of organization config rule.</p>"
+          "documentation":"<p>Amazon Resource Name (ARN) of organization config rule.</p>"
         },
         "OrganizationManagedRuleMetadata":{
           "shape":"OrganizationManagedRuleMetadata",
@@ -3906,6 +4825,142 @@
       "type":"list",
       "member":{"shape":"OrganizationConfigRule"}
     },
+    "OrganizationConformancePack":{
+      "type":"structure",
+      "required":[
+        "OrganizationConformancePackName",
+        "OrganizationConformancePackArn",
+        "DeliveryS3Bucket",
+        "LastUpdateTime"
+      ],
+      "members":{
+        "OrganizationConformancePackName":{
+          "shape":"OrganizationConformancePackName",
+          "documentation":"<p>The name you assign to an organization conformance pack.</p>"
+        },
+        "OrganizationConformancePackArn":{
+          "shape":"StringWithCharLimit256",
+          "documentation":"<p>Amazon Resource Name (ARN) of organization conformance pack.</p>"
+        },
+        "DeliveryS3Bucket":{
+          "shape":"DeliveryS3Bucket",
+          "documentation":"<p>Location of an Amazon S3 bucket where AWS Config can deliver evaluation results and conformance pack template that is used to create a pack. </p>"
+        },
+        "DeliveryS3KeyPrefix":{
+          "shape":"DeliveryS3KeyPrefix",
+          "documentation":"<p>Any folder structure you want to add to an Amazon S3 bucket.</p>"
+        },
+        "ConformancePackInputParameters":{
+          "shape":"ConformancePackInputParameters",
+          "documentation":"<p>A list of <code>ConformancePackInputParameter</code> objects.</p>"
+        },
+        "ExcludedAccounts":{
+          "shape":"ExcludedAccounts",
+          "documentation":"<p>A comma-separated list of accounts excluded from organization conformance pack.</p>"
+        },
+        "LastUpdateTime":{
+          "shape":"Date",
+          "documentation":"<p>Last time when organization conformation pack was updated.</p>"
+        }
+      },
+      "documentation":"<p>An organization conformance pack that has information about conformance packs that AWS Config creates in member accounts. </p>"
+    },
+    "OrganizationConformancePackDetailedStatus":{
+      "type":"structure",
+      "required":[
+        "AccountId",
+        "ConformancePackName",
+        "Status"
+      ],
+      "members":{
+        "AccountId":{
+          "shape":"AccountId",
+          "documentation":"<p>The 12-digit account ID of a member account.</p>"
+        },
+        "ConformancePackName":{
+          "shape":"StringWithCharLimit256",
+          "documentation":"<p>The name of conformance pack deployed in the member account.</p>"
+        },
+        "Status":{
+          "shape":"OrganizationResourceDetailedStatus",
+          "documentation":"<p>Indicates deployment status for conformance pack in a member account. When master account calls <code>PutOrganizationConformancePack</code> action for the first time, conformance pack status is created in the member account. When master account calls <code>PutOrganizationConformancePack</code> action for the second time, conformance pack status is updated in the member account. Conformance pack status is deleted when the master account deletes <code>OrganizationConformancePack</code> and disables service access for <code>config-multiaccountsetup.amazonaws.com</code>. </p> <p> AWS Config sets the state of the conformance pack to:</p> <ul> <li> <p> <code>CREATE_SUCCESSFUL</code> when conformance pack has been created in the member account. </p> </li> <li> <p> <code>CREATE_IN_PROGRESS</code> when conformance pack is being created in the member account.</p> </li> <li> <p> <code>CREATE_FAILED</code> when conformance pack creation has failed in the member account.</p> </li> <li> <p> <code>DELETE_FAILED</code> when conformance pack deletion has failed in the member account.</p> </li> <li> <p> <code>DELETE_IN_PROGRESS</code> when conformance pack is being deleted in the member account.</p> </li> <li> <p> <code>DELETE_SUCCESSFUL</code> when conformance pack has been deleted in the member account. </p> </li> <li> <p> <code>UPDATE_SUCCESSFUL</code> when conformance pack has been updated in the member account.</p> </li> <li> <p> <code>UPDATE_IN_PROGRESS</code> when conformance pack is being updated in the member account.</p> </li> <li> <p> <code>UPDATE_FAILED</code> when conformance pack deletion has failed in the member account.</p> </li> </ul>"
+        },
+        "ErrorCode":{
+          "shape":"String",
+          "documentation":"<p>An error code that is returned when conformance pack creation or deletion failed in the member account. </p>"
+        },
+        "ErrorMessage":{
+          "shape":"String",
+          "documentation":"<p>An error message indicating that conformance pack account creation or deletion has failed due to an error in the member account. </p>"
+        },
+        "LastUpdateTime":{
+          "shape":"Date",
+          "documentation":"<p>The timestamp of the last status update.</p>"
+        }
+      },
+      "documentation":"<p>Organization conformance pack creation or deletion status in each member account. This includes the name of the conformance pack, the status, error code and error message when the conformance pack creation or deletion failed. </p>"
+    },
+    "OrganizationConformancePackDetailedStatuses":{
+      "type":"list",
+      "member":{"shape":"OrganizationConformancePackDetailedStatus"}
+    },
+    "OrganizationConformancePackName":{
+      "type":"string",
+      "max":128,
+      "min":1,
+      "pattern":"[a-zA-Z][-a-zA-Z0-9]*"
+    },
+    "OrganizationConformancePackNames":{
+      "type":"list",
+      "member":{"shape":"OrganizationConformancePackName"},
+      "max":25,
+      "min":0
+    },
+    "OrganizationConformancePackStatus":{
+      "type":"structure",
+      "required":[
+        "OrganizationConformancePackName",
+        "Status"
+      ],
+      "members":{
+        "OrganizationConformancePackName":{
+          "shape":"OrganizationConformancePackName",
+          "documentation":"<p>The name that you assign to organization conformance pack.</p>"
+        },
+        "Status":{
+          "shape":"OrganizationResourceStatus",
+          "documentation":"<p>Indicates deployment status of an organization conformance pack. When master account calls PutOrganizationConformancePack for the first time, conformance pack status is created in all the member accounts. When master account calls PutOrganizationConformancePack for the second time, conformance pack status is updated in all the member accounts. Additionally, conformance pack status is updated when one or more member accounts join or leave an organization. Conformance pack status is deleted when the master account deletes OrganizationConformancePack in all the member accounts and disables service access for <code>config-multiaccountsetup.amazonaws.com</code>.</p> <p>AWS Config sets the state of the conformance pack to:</p> <ul> <li> <p> <code>CREATE_SUCCESSFUL</code> when an organization conformance pack has been successfully created in all the member accounts. </p> </li> <li> <p> <code>CREATE_IN_PROGRESS</code> when an organization conformance pack creation is in progress.</p> </li> <li> <p> <code>CREATE_FAILED</code> when an organization conformance pack creation failed in one or more member accounts within that organization.</p> </li> <li> <p> <code>DELETE_FAILED</code> when an organization conformance pack deletion failed in one or more member accounts within that organization.</p> </li> <li> <p> <code>DELETE_IN_PROGRESS</code> when an organization conformance pack deletion is in progress.</p> </li> <li> <p> <code>DELETE_SUCCESSFUL</code> when an organization conformance pack has been successfully deleted from all the member accounts.</p> </li> <li> <p> <code>UPDATE_SUCCESSFUL</code> when an organization conformance pack has been successfully updated in all the member accounts.</p> </li> <li> <p> <code>UPDATE_IN_PROGRESS</code> when an organization conformance pack update is in progress.</p> </li> <li> <p> <code>UPDATE_FAILED</code> when an organization conformance pack update failed in one or more member accounts within that organization.</p> </li> </ul>"
+        },
+        "ErrorCode":{
+          "shape":"String",
+          "documentation":"<p>An error code that is returned when organization conformance pack creation or deletion has failed in a member account. </p>"
+        },
+        "ErrorMessage":{
+          "shape":"String",
+          "documentation":"<p>An error message indicating that organization conformance pack creation or deletion failed due to an error. </p>"
+        },
+        "LastUpdateTime":{
+          "shape":"Date",
+          "documentation":"<p>The timestamp of the last update.</p>"
+        }
+      },
+      "documentation":"<p>Returns the status for an organization conformance pack in an organization.</p>"
+    },
+    "OrganizationConformancePackStatuses":{
+      "type":"list",
+      "member":{"shape":"OrganizationConformancePackStatus"}
+    },
+    "OrganizationConformancePackTemplateValidationException":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>You have specified a template that is not valid or supported.</p>",
+      "exception":true
+    },
+    "OrganizationConformancePacks":{
+      "type":"list",
+      "member":{"shape":"OrganizationConformancePack"}
+    },
     "OrganizationCustomRuleMetadata":{
       "type":"structure",
       "required":[
@@ -3991,18 +5046,60 @@
       },
       "documentation":"<p>An object that specifies organization managed rule metadata such as resource type and ID of AWS resource along with the rule identifier. It also provides the frequency with which you want AWS Config to run evaluations for the rule if the trigger type is periodic.</p>"
     },
-    "OrganizationRuleStatus":{
+    "OrganizationResourceDetailedStatus":{
+      "type":"string",
+      "enum":[
+        "CREATE_SUCCESSFUL",
+        "CREATE_IN_PROGRESS",
+        "CREATE_FAILED",
+        "DELETE_SUCCESSFUL",
+        "DELETE_FAILED",
+        "DELETE_IN_PROGRESS",
+        "UPDATE_SUCCESSFUL",
+        "UPDATE_IN_PROGRESS",
+        "UPDATE_FAILED"
+      ]
+    },
+    "OrganizationResourceDetailedStatusFilters":{
+      "type":"structure",
+      "members":{
+        "AccountId":{
+          "shape":"AccountId",
+          "documentation":"<p>The 12-digit account ID of the member account within an organization.</p>"
+        },
+        "Status":{
+          "shape":"OrganizationResourceDetailedStatus",
+          "documentation":"<p>Indicates deployment status for conformance pack in a member account. When master account calls <code>PutOrganizationConformancePack</code> action for the first time, conformance pack status is created in the member account. When master account calls <code>PutOrganizationConformancePack</code> action for the second time, conformance pack status is updated in the member account. Conformance pack status is deleted when the master account deletes <code>OrganizationConformancePack</code> and disables service access for <code>config-multiaccountsetup.amazonaws.com</code>. </p> <p> AWS Config sets the state of the conformance pack to:</p> <ul> <li> <p> <code>CREATE_SUCCESSFUL</code> when conformance pack has been created in the member account. </p> </li> <li> <p> <code>CREATE_IN_PROGRESS</code> when conformance pack is being created in the member account.</p> </li> <li> <p> <code>CREATE_FAILED</code> when conformance pack creation has failed in the member account.</p> </li> <li> <p> <code>DELETE_FAILED</code> when conformance pack deletion has failed in the member account.</p> </li> <li> <p> <code>DELETE_IN_PROGRESS</code> when conformance pack is being deleted in the member account.</p> </li> <li> <p> <code>DELETE_SUCCESSFUL</code> when conformance pack has been deleted in the member account. </p> </li> <li> <p> <code>UPDATE_SUCCESSFUL</code> when conformance pack has been updated in the member account.</p> </li> <li> <p> <code>UPDATE_IN_PROGRESS</code> when conformance pack is being updated in the member account.</p> </li> <li> <p> <code>UPDATE_FAILED</code> when conformance pack deletion has failed in the member account.</p> </li> </ul>"
+        }
+      },
+      "documentation":"<p>Status filter object to filter results based on specific member account ID or status type for an organization conformance pack.</p>"
+    },
+    "OrganizationResourceStatus":{
       "type":"string",
       "enum":[
         "CREATE_SUCCESSFUL",
         "CREATE_IN_PROGRESS",
         "CREATE_FAILED",
+        "DELETE_SUCCESSFUL",
+        "DELETE_FAILED",
+        "DELETE_IN_PROGRESS",
         "UPDATE_SUCCESSFUL",
-        "UPDATE_FAILED",
         "UPDATE_IN_PROGRESS",
+        "UPDATE_FAILED"
+      ]
+    },
+    "OrganizationRuleStatus":{
+      "type":"string",
+      "enum":[
+        "CREATE_SUCCESSFUL",
+        "CREATE_IN_PROGRESS",
+        "CREATE_FAILED",
         "DELETE_SUCCESSFUL",
         "DELETE_FAILED",
-        "DELETE_IN_PROGRESS"
+        "DELETE_IN_PROGRESS",
+        "UPDATE_SUCCESSFUL",
+        "UPDATE_IN_PROGRESS",
+        "UPDATE_FAILED"
       ]
     },
     "OversizedConfigurationItemException":{
@@ -4019,6 +5116,21 @@
         "AWS"
       ]
     },
+    "PageSizeLimit":{
+      "type":"integer",
+      "max":20,
+      "min":0
+    },
+    "ParameterName":{
+      "type":"string",
+      "max":255,
+      "min":0
+    },
+    "ParameterValue":{
+      "type":"string",
+      "max":4096,
+      "min":0
+    },
     "PendingAggregationRequest":{
       "type":"structure",
       "members":{
@@ -4129,6 +5241,48 @@
       },
       "documentation":"<p>The input for the <a>PutConfigurationRecorder</a> action.</p>"
     },
+    "PutConformancePackRequest":{
+      "type":"structure",
+      "required":[
+        "ConformancePackName",
+        "DeliveryS3Bucket"
+      ],
+      "members":{
+        "ConformancePackName":{
+          "shape":"ConformancePackName",
+          "documentation":"<p>Name of the conformance pack you want to create.</p>"
+        },
+        "TemplateS3Uri":{
+          "shape":"TemplateS3Uri",
+          "documentation":"<p>Location of file containing the template body (<code>s3://bucketname/prefix</code>). The uri must point to the conformance pack template (max size: 300 KB) that is located in an Amazon S3 bucket in the same region as the conformance pack. </p> <note> <p>You must have access to read Amazon S3 bucket.</p> </note>"
+        },
+        "TemplateBody":{
+          "shape":"TemplateBody",
+          "documentation":"<p>A string containing full conformance pack template body. Structure containing the template body with a minimum length of 1 byte and a maximum length of 51,200 bytes.</p> <note> <p>You can only use a YAML template with one resource type, that is, config rule and a remediation action. </p> </note>"
+        },
+        "DeliveryS3Bucket":{
+          "shape":"DeliveryS3Bucket",
+          "documentation":"<p>AWS Config stores intermediate files while processing conformance pack template.</p>"
+        },
+        "DeliveryS3KeyPrefix":{
+          "shape":"DeliveryS3KeyPrefix",
+          "documentation":"<p>The prefix for the Amazon S3 bucket. </p>"
+        },
+        "ConformancePackInputParameters":{
+          "shape":"ConformancePackInputParameters",
+          "documentation":"<p>A list of <code>ConformancePackInputParameter</code> objects.</p>"
+        }
+      }
+    },
+    "PutConformancePackResponse":{
+      "type":"structure",
+      "members":{
+        "ConformancePackArn":{
+          "shape":"ConformancePackArn",
+          "documentation":"<p>ARN of the conformance pack.</p>"
+        }
+      }
+    },
     "PutDeliveryChannelRequest":{
       "type":"structure",
       "required":["DeliveryChannel"],
@@ -4200,6 +5354,52 @@
         }
       }
     },
+    "PutOrganizationConformancePackRequest":{
+      "type":"structure",
+      "required":[
+        "OrganizationConformancePackName",
+        "DeliveryS3Bucket"
+      ],
+      "members":{
+        "OrganizationConformancePackName":{
+          "shape":"OrganizationConformancePackName",
+          "documentation":"<p>Name of the organization conformance pack you want to create.</p>"
+        },
+        "TemplateS3Uri":{
+          "shape":"TemplateS3Uri",
+          "documentation":"<p>Location of file containing the template body. The uri must point to the conformance pack template (max size: 300 KB).</p> <note> <p>You must have access to read Amazon S3 bucket.</p> </note>"
+        },
+        "TemplateBody":{
+          "shape":"TemplateBody",
+          "documentation":"<p>A string containing full conformance pack template body. Structure containing the template body with a minimum length of 1 byte and a maximum length of 51,200 bytes.</p>"
+        },
+        "DeliveryS3Bucket":{
+          "shape":"DeliveryS3Bucket",
+          "documentation":"<p>Location of an Amazon S3 bucket where AWS Config can deliver evaluation results. AWS Config stores intermediate files while processing conformance pack template. </p> <p>The delivery bucket name should start with awsconfigconforms. For example: \"Resource\": \"arn:aws:s3:::your_bucket_name/*\". For more information, see <a href=\"https://docs.aws.amazon.com/config/latest/developerguide/conformance-pack-organization-apis.html\">Permissions for cross account bucket access</a>.</p>"
+        },
+        "DeliveryS3KeyPrefix":{
+          "shape":"DeliveryS3KeyPrefix",
+          "documentation":"<p>The prefix for the Amazon S3 bucket.</p>"
+        },
+        "ConformancePackInputParameters":{
+          "shape":"ConformancePackInputParameters",
+          "documentation":"<p>A list of <code>ConformancePackInputParameter</code> objects.</p>"
+        },
+        "ExcludedAccounts":{
+          "shape":"ExcludedAccounts",
+          "documentation":"<p>A list of AWS accounts to be excluded from an organization conformance pack while deploying a conformance pack.</p>"
+        }
+      }
+    },
+    "PutOrganizationConformancePackResponse":{
+      "type":"structure",
+      "members":{
+        "OrganizationConformancePackArn":{
+          "shape":"StringWithCharLimit256",
+          "documentation":"<p>ARN of the organization conformance pack.</p>"
+        }
+      }
+    },
     "PutRemediationConfigurationsRequest":{
       "type":"structure",
       "required":["RemediationConfigurations"],
@@ -4253,6 +5453,41 @@
         }
       }
     },
+    "PutResourceConfigRequest":{
+      "type":"structure",
+      "required":[
+        "ResourceType",
+        "SchemaVersionId",
+        "ResourceId",
+        "Configuration"
+      ],
+      "members":{
+        "ResourceType":{
+          "shape":"ResourceTypeString",
+          "documentation":"<p>The type of the resource. The custom resource type must be registered with AWS CloudFormation. </p> <note> <p>You cannot use the organization names “aws”, “amzn”, “amazon”, “alexa”, “custom” with custom resource types. It is the first part of the ResourceType up to the first ::.</p> </note>"
+        },
+        "SchemaVersionId":{
+          "shape":"SchemaVersionId",
+          "documentation":"<p>Version of the schema registered for the ResourceType in AWS CloudFormation.</p>"
+        },
+        "ResourceId":{
+          "shape":"ResourceId",
+          "documentation":"<p>Unique identifier of the resource.</p>"
+        },
+        "ResourceName":{
+          "shape":"ResourceName",
+          "documentation":"<p>Name of the resource.</p>"
+        },
+        "Configuration":{
+          "shape":"Configuration",
+          "documentation":"<p>The configuration object of the resource in valid JSON format. It must match the schema registered with AWS CloudFormation.</p> <note> <p>The configuration JSON must not exceed 64 KB.</p> </note>"
+        },
+        "Tags":{
+          "shape":"Tags",
+          "documentation":"<p>Tags associated with the resource.</p>"
+        }
+      }
+    },
     "PutRetentionConfigurationRequest":{
       "type":"structure",
       "required":["RetentionPeriodInDays"],
@@ -4315,7 +5550,7 @@
     },
     "ReevaluateConfigRuleNames":{
       "type":"list",
-      "member":{"shape":"StringWithCharLimit64"},
+      "member":{"shape":"ConfigRuleName"},
       "max":25,
       "min":1
     },
@@ -4692,7 +5927,7 @@
       "type":"structure",
       "members":{
       },
-      "documentation":"<p>You see this exception in the following cases: </p> <ul> <li> <p>For DeleteConfigRule API, AWS Config is deleting this rule. Try your request again later.</p> </li> <li> <p>For DeleteConfigRule API, the rule is deleting your evaluation results. Try your request again later.</p> </li> <li> <p>For DeleteConfigRule API, a remediation action is associated with the rule and AWS Config cannot delete this rule. Delete the remediation action associated with the rule before deleting the rule and try your request again later.</p> </li> <li> <p>For PutConfigOrganizationRule, organization config rule deletion is in progress. Try your request again later.</p> </li> <li> <p>For DeleteOrganizationConfigRule, organization config rule creation is in progress. Try your request again later.</p> </li> </ul>",
+      "documentation":"<p>You see this exception in the following cases: </p> <ul> <li> <p>For DeleteConfigRule, AWS Config is deleting this rule. Try your request again later.</p> </li> <li> <p>For DeleteConfigRule, the rule is deleting your evaluation results. Try your request again later.</p> </li> <li> <p>For DeleteConfigRule, a remediation action is associated with the rule and AWS Config cannot delete this rule. Delete the remediation action associated with the rule before deleting the rule and try your request again later.</p> </li> <li> <p>For PutConfigOrganizationRule, organization config rule deletion is in progress. Try your request again later.</p> </li> <li> <p>For DeleteOrganizationConfigRule, organization config rule creation is in progress. Try your request again later.</p> </li> <li> <p>For PutConformancePack and PutOrganizationConformancePack, a conformance pack creation, update, and deletion is in progress. Try your request again later.</p> </li> <li> <p>For DeleteConformancePack, a conformance pack creation, update, and deletion is in progress. Try your request again later.</p> </li> </ul>",
       "exception":true
     },
     "ResourceKey":{
@@ -4759,6 +5994,7 @@
         "AWS::EC2::VPCEndpointService",
         "AWS::EC2::FlowLog",
         "AWS::EC2::VPCPeeringConnection",
+        "AWS::Elasticsearch::Domain",
         "AWS::IAM::Group",
         "AWS::IAM::Policy",
         "AWS::IAM::Role",
@@ -4766,13 +6002,10 @@
         "AWS::ElasticLoadBalancingV2::LoadBalancer",
         "AWS::ACM::Certificate",
         "AWS::RDS::DBInstance",
-        "AWS::RDS::DBParameterGroup",
-        "AWS::RDS::DBOptionGroup",
         "AWS::RDS::DBSubnetGroup",
         "AWS::RDS::DBSecurityGroup",
         "AWS::RDS::DBSnapshot",
         "AWS::RDS::DBCluster",
-        "AWS::RDS::DBClusterParameterGroup",
         "AWS::RDS::DBClusterSnapshot",
         "AWS::RDS::EventSubscription",
         "AWS::S3::Bucket",
@@ -4803,36 +6036,43 @@
         "AWS::WAFRegional::WebACL",
         "AWS::CloudFront::Distribution",
         "AWS::CloudFront::StreamingDistribution",
-        "AWS::Lambda::Alias",
         "AWS::Lambda::Function",
         "AWS::ElasticBeanstalk::Application",
         "AWS::ElasticBeanstalk::ApplicationVersion",
         "AWS::ElasticBeanstalk::Environment",
-        "AWS::MobileHub::Project",
+        "AWS::WAFv2::WebACL",
+        "AWS::WAFv2::RuleGroup",
+        "AWS::WAFv2::IPSet",
+        "AWS::WAFv2::RegexPatternSet",
+        "AWS::WAFv2::ManagedRuleSet",
         "AWS::XRay::EncryptionConfig",
         "AWS::SSM::AssociationCompliance",
         "AWS::SSM::PatchCompliance",
         "AWS::Shield::Protection",
         "AWS::ShieldRegional::Protection",
         "AWS::Config::ResourceCompliance",
-        "AWS::LicenseManager::LicenseConfiguration",
-        "AWS::ApiGateway::DomainName",
-        "AWS::ApiGateway::Method",
         "AWS::ApiGateway::Stage",
         "AWS::ApiGateway::RestApi",
-        "AWS::ApiGatewayV2::DomainName",
         "AWS::ApiGatewayV2::Stage",
         "AWS::ApiGatewayV2::Api",
         "AWS::CodePipeline::Pipeline",
         "AWS::ServiceCatalog::CloudFormationProvisionedProduct",
         "AWS::ServiceCatalog::CloudFormationProduct",
-        "AWS::ServiceCatalog::Portfolio"
+        "AWS::ServiceCatalog::Portfolio",
+        "AWS::SQS::Queue",
+        "AWS::KMS::Key",
+        "AWS::QLDB::Ledger"
       ]
     },
     "ResourceTypeList":{
       "type":"list",
       "member":{"shape":"ResourceType"}
     },
+    "ResourceTypeString":{
+      "type":"string",
+      "max":196,
+      "min":1
+    },
     "ResourceTypes":{
       "type":"list",
       "member":{"shape":"StringWithCharLimit256"},
@@ -4908,6 +6148,12 @@
       "max":50,
       "min":0
     },
+    "SchemaVersionId":{
+      "type":"string",
+      "max":128,
+      "min":1,
+      "pattern":"[A-Za-z0-9-]+"
+    },
     "Scope":{
       "type":"structure",
       "members":{
@@ -4930,6 +6176,46 @@
       },
       "documentation":"<p>Defines which resources trigger an evaluation for an AWS Config rule. The scope can include one or more resource types, a combination of a tag key and value, or a combination of one resource type and one resource ID. Specify a scope to constrain which resources trigger an evaluation for a rule. Otherwise, evaluations for the rule are triggered when any resource in your recording group changes in configuration.</p>"
     },
+    "SelectAggregateResourceConfigRequest":{
+      "type":"structure",
+      "required":[
+        "Expression",
+        "ConfigurationAggregatorName"
+      ],
+      "members":{
+        "Expression":{
+          "shape":"Expression",
+          "documentation":"<p>The SQL query SELECT command. </p>"
+        },
+        "ConfigurationAggregatorName":{
+          "shape":"ConfigurationAggregatorName",
+          "documentation":"<p>The name of the configuration aggregator.</p>"
+        },
+        "Limit":{
+          "shape":"Limit",
+          "documentation":"<p>The maximum number of query results returned on each page. </p>"
+        },
+        "MaxResults":{"shape":"Limit"},
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>The nextToken string returned in a previous request that you use to request the next page of results in a paginated response. </p>"
+        }
+      }
+    },
+    "SelectAggregateResourceConfigResponse":{
+      "type":"structure",
+      "members":{
+        "Results":{
+          "shape":"Results",
+          "documentation":"<p>Returns the results for the SQL query.</p>"
+        },
+        "QueryInfo":{"shape":"QueryInfo"},
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>The nextToken string returned in a previous request that you use to request the next page of results in a paginated response. </p>"
+        }
+      }
+    },
     "SelectResourceConfigRequest":{
       "type":"structure",
       "required":["Expression"],
@@ -5025,6 +6311,11 @@
       },
       "documentation":"<p>AWS Systems Manager (SSM) specific remediation controls.</p>"
     },
+    "StackArn":{
+      "type":"string",
+      "max":2048,
+      "min":1
+    },
     "StartConfigRulesEvaluationRequest":{
       "type":"structure",
       "members":{
@@ -5231,6 +6522,17 @@
       "max":50,
       "min":0
     },
+    "TemplateBody":{
+      "type":"string",
+      "max":51200,
+      "min":1
+    },
+    "TemplateS3Uri":{
+      "type":"string",
+      "max":1024,
+      "min":1,
+      "pattern":"s3://.*"
+    },
     "TooManyTagsException":{
       "type":"structure",
       "members":{
diff --git a/services/config/src/test/resources/cucumber.properties b/services/config/src/test/resources/cucumber.properties
index 222608db214c..f08027c0639d 100644
--- a/services/config/src/test/resources/cucumber.properties
+++ b/services/config/src/test/resources/cucumber.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/connect/pom.xml b/services/connect/pom.xml
index baeb531f6b39..31f02da0bbf8 100644
--- a/services/connect/pom.xml
+++ b/services/connect/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>connect</artifactId>
     <name>AWS Java SDK :: Services :: Connect</name>
diff --git a/services/connect/src/main/resources/codegen-resources/service-2.json b/services/connect/src/main/resources/codegen-resources/service-2.json
index fe3d268ac5c7..d9526c5a2608 100644
--- a/services/connect/src/main/resources/codegen-resources/service-2.json
+++ b/services/connect/src/main/resources/codegen-resources/service-2.json
@@ -63,7 +63,7 @@
         {"shape":"ThrottlingException"},
         {"shape":"InternalServiceException"}
       ],
-      "documentation":"<p>Describes the specified user account.</p>"
+      "documentation":"<p>Describes the specified user account. You can find the instance ID in the console (it’s the final part of the ARN). The console does not display the user IDs. Instead, list the users and note the IDs provided in the output.</p>"
     },
     "DescribeUserHierarchyGroup":{
       "name":"DescribeUserHierarchyGroup",
@@ -268,6 +268,23 @@
       ],
       "documentation":"<p>Provides summary information about the security profiles for the specified Amazon Connect instance.</p>"
     },
+    "ListTagsForResource":{
+      "name":"ListTagsForResource",
+      "http":{
+        "method":"GET",
+        "requestUri":"/tags/{resourceArn}"
+      },
+      "input":{"shape":"ListTagsForResourceRequest"},
+      "output":{"shape":"ListTagsForResourceResponse"},
+      "errors":[
+        {"shape":"InvalidRequestException"},
+        {"shape":"InvalidParameterException"},
+        {"shape":"InternalServiceException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ThrottlingException"}
+      ],
+      "documentation":"<p>Lists the tags for the specified resource.</p>"
+    },
     "ListUserHierarchyGroups":{
       "name":"ListUserHierarchyGroups",
       "http":{
@@ -302,6 +319,23 @@
       ],
       "documentation":"<p>Provides summary information about the users for the specified Amazon Connect instance.</p>"
     },
+    "StartChatContact":{
+      "name":"StartChatContact",
+      "http":{
+        "method":"PUT",
+        "requestUri":"/contact/chat"
+      },
+      "input":{"shape":"StartChatContactRequest"},
+      "output":{"shape":"StartChatContactResponse"},
+      "errors":[
+        {"shape":"InvalidRequestException"},
+        {"shape":"InvalidParameterException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InternalServiceException"},
+        {"shape":"LimitExceededException"}
+      ],
+      "documentation":"<p>Initiates a contact flow to start a new chat for the customer. Response of this API provides a token required to obtain credentials from the <a href=\"https://docs.aws.amazon.com/connect-participant/latest/APIReference/API_CreateParticipantConnection.html\">CreateParticipantConnection</a> API in the Amazon Connect Participant Service.</p> <p>When a new chat contact is successfully created, clients need to subscribe to the participant’s connection for the created chat within 5 minutes. This is achieved by invoking <a href=\"https://docs.aws.amazon.com/connect-participant/latest/APIReference/API_CreateParticipantConnection.html\">CreateParticipantConnection</a> with WEBSOCKET and CONNECTION_CREDENTIALS. </p>"
+    },
     "StartOutboundVoiceContact":{
       "name":"StartOutboundVoiceContact",
       "http":{
@@ -338,6 +372,38 @@
       ],
       "documentation":"<p>Ends the specified contact.</p>"
     },
+    "TagResource":{
+      "name":"TagResource",
+      "http":{
+        "method":"POST",
+        "requestUri":"/tags/{resourceArn}"
+      },
+      "input":{"shape":"TagResourceRequest"},
+      "errors":[
+        {"shape":"InvalidRequestException"},
+        {"shape":"InvalidParameterException"},
+        {"shape":"InternalServiceException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ThrottlingException"}
+      ],
+      "documentation":"<p>Adds the specified tags to the specified resource.</p> <p>The supported resource type is users.</p>"
+    },
+    "UntagResource":{
+      "name":"UntagResource",
+      "http":{
+        "method":"DELETE",
+        "requestUri":"/tags/{resourceArn}"
+      },
+      "input":{"shape":"UntagResourceRequest"},
+      "errors":[
+        {"shape":"InvalidRequestException"},
+        {"shape":"InvalidParameterException"},
+        {"shape":"InternalServiceException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ThrottlingException"}
+      ],
+      "documentation":"<p>Removes the specified tags from the specified resource.</p>"
+    },
     "UpdateContactAttributes":{
       "name":"UpdateContactAttributes",
       "http":{
@@ -453,9 +519,8 @@
     },
     "AgentUsername":{
       "type":"string",
-      "max":20,
-      "min":1,
-      "pattern":"[a-zA-Z0-9\\_\\-\\.]+"
+      "max":100,
+      "min":1
     },
     "AttributeName":{
       "type":"string",
@@ -475,13 +540,44 @@
     "AutoAccept":{"type":"boolean"},
     "Channel":{
       "type":"string",
-      "enum":["VOICE"]
+      "enum":[
+        "VOICE",
+        "CHAT"
+      ]
     },
     "Channels":{
       "type":"list",
       "member":{"shape":"Channel"},
       "max":1
     },
+    "ChatContent":{
+      "type":"string",
+      "max":1024,
+      "min":1
+    },
+    "ChatContentType":{
+      "type":"string",
+      "max":100,
+      "min":1
+    },
+    "ChatMessage":{
+      "type":"structure",
+      "required":[
+        "ContentType",
+        "Content"
+      ],
+      "members":{
+        "ContentType":{
+          "shape":"ChatContentType",
+          "documentation":"<p>The type of the content. Supported types are text/plain.</p>"
+        },
+        "Content":{
+          "shape":"ChatContent",
+          "documentation":"<p>The content of the chat message.</p>"
+        }
+      },
+      "documentation":"<p>A chat message.</p>"
+    },
     "ClientToken":{
       "type":"string",
       "max":500
@@ -604,6 +700,10 @@
           "documentation":"<p>The identifier of the Amazon Connect instance.</p>",
           "location":"uri",
           "locationName":"InstanceId"
+        },
+        "Tags":{
+          "shape":"TagMap",
+          "documentation":"<p>One or more tags.</p>"
         }
       }
     },
@@ -688,7 +788,10 @@
         "AGENTS_STAFFED",
         "CONTACTS_IN_QUEUE",
         "OLDEST_CONTACT_AGE",
-        "CONTACTS_SCHEDULED"
+        "CONTACTS_SCHEDULED",
+        "AGENTS_ON_CONTACT",
+        "SLOTS_ACTIVE",
+        "SLOTS_AVAILABLE"
       ]
     },
     "CurrentMetricResult":{
@@ -842,6 +945,11 @@
       "documentation":"<p>Contains information about the dimensions for a set of metrics.</p>"
     },
     "DirectoryUserId":{"type":"string"},
+    "DisplayName":{
+      "type":"string",
+      "max":256,
+      "min":1
+    },
     "DuplicateResourceException":{
       "type":"structure",
       "members":{
@@ -920,7 +1028,7 @@
         },
         "CurrentMetrics":{
           "shape":"CurrentMetrics",
-          "documentation":"<p>The metrics to retrieve. Specify the name and unit for each metric. The following metrics are available:</p> <dl> <dt>AGENTS_AFTER_CONTACT_WORK</dt> <dd> <p>Unit: COUNT</p> </dd> <dt>AGENTS_AVAILABLE</dt> <dd> <p>Unit: COUNT</p> </dd> <dt>AGENTS_ERROR</dt> <dd> <p>Unit: COUNT</p> </dd> <dt>AGENTS_NON_PRODUCTIVE</dt> <dd> <p>Unit: COUNT</p> </dd> <dt>AGENTS_ON_CALL</dt> <dd> <p>Unit: COUNT</p> </dd> <dt>AGENTS_ONLINE</dt> <dd> <p>Unit: COUNT</p> </dd> <dt>AGENTS_STAFFED</dt> <dd> <p>Unit: COUNT</p> </dd> <dt>CONTACTS_IN_QUEUE</dt> <dd> <p>Unit: COUNT</p> </dd> <dt>CONTACTS_SCHEDULED</dt> <dd> <p>Unit: COUNT</p> </dd> <dt>OLDEST_CONTACT_AGE</dt> <dd> <p>Unit: SECONDS</p> </dd> </dl>"
+          "documentation":"<p>The metrics to retrieve. Specify the name and unit for each metric. The following metrics are available:</p> <dl> <dt>AGENTS_AFTER_CONTACT_WORK</dt> <dd> <p>Unit: COUNT</p> </dd> <dt>AGENTS_AVAILABLE</dt> <dd> <p>Unit: COUNT</p> </dd> <dt>AGENTS_ERROR</dt> <dd> <p>Unit: COUNT</p> </dd> <dt>AGENTS_NON_PRODUCTIVE</dt> <dd> <p>Unit: COUNT</p> </dd> <dt>AGENTS_ON_CALL</dt> <dd> <p>Unit: COUNT</p> </dd> <dt>AGENTS_ON_CONTACT</dt> <dd> <p>Unit: COUNT</p> </dd> <dt>AGENTS_ONLINE</dt> <dd> <p>Unit: COUNT</p> </dd> <dt>AGENTS_STAFFED</dt> <dd> <p>Unit: COUNT</p> </dd> <dt>CONTACTS_IN_QUEUE</dt> <dd> <p>Unit: COUNT</p> </dd> <dt>CONTACTS_SCHEDULED</dt> <dd> <p>Unit: COUNT</p> </dd> <dt>OLDEST_CONTACT_AGE</dt> <dd> <p>Unit: SECONDS</p> </dd> <dt>SLOTS_ACTIVE</dt> <dd> <p>Unit: COUNT</p> </dd> <dt>SLOTS_AVAILABLE</dt> <dd> <p>Unit: COUNT</p> </dd> </dl>"
         },
         "NextToken":{
           "shape":"NextToken",
@@ -1585,6 +1693,27 @@
         }
       }
     },
+    "ListTagsForResourceRequest":{
+      "type":"structure",
+      "required":["resourceArn"],
+      "members":{
+        "resourceArn":{
+          "shape":"ARN",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the resource.</p>",
+          "location":"uri",
+          "locationName":"resourceArn"
+        }
+      }
+    },
+    "ListTagsForResourceResponse":{
+      "type":"structure",
+      "members":{
+        "tags":{
+          "shape":"TagMap",
+          "documentation":"<p>Information about the tags.</p>"
+        }
+      }
+    },
     "ListUserHierarchyGroupsRequest":{
       "type":"structure",
       "required":["InstanceId"],
@@ -1685,6 +1814,27 @@
       "error":{"httpStatusCode":403},
       "exception":true
     },
+    "ParticipantDetails":{
+      "type":"structure",
+      "required":["DisplayName"],
+      "members":{
+        "DisplayName":{
+          "shape":"DisplayName",
+          "documentation":"<p>Display name of the participant.</p>"
+        }
+      },
+      "documentation":"<p>The customer's details.</p>"
+    },
+    "ParticipantId":{
+      "type":"string",
+      "max":256,
+      "min":1
+    },
+    "ParticipantToken":{
+      "type":"string",
+      "max":1000,
+      "min":1
+    },
     "Password":{
       "type":"string",
       "pattern":"/^(?=.*[a-z])(?=.*[A-Z])(?=.*\\d)[a-zA-Z\\d\\S]{8,64}$/"
@@ -2125,6 +2275,58 @@
       "type":"string",
       "sensitive":true
     },
+    "StartChatContactRequest":{
+      "type":"structure",
+      "required":[
+        "InstanceId",
+        "ContactFlowId",
+        "ParticipantDetails"
+      ],
+      "members":{
+        "InstanceId":{
+          "shape":"InstanceId",
+          "documentation":"<p>The identifier of the Amazon Connect instance.</p>"
+        },
+        "ContactFlowId":{
+          "shape":"ContactFlowId",
+          "documentation":"<p>The identifier of the contact flow for the chat.</p>"
+        },
+        "Attributes":{
+          "shape":"Attributes",
+          "documentation":"<p>A custom key-value pair using an attribute map. The attributes are standard Amazon Connect attributes, and can be accessed in contact flows just like any other contact attributes. </p> <p>There can be up to 32,768 UTF-8 bytes across all key-value pairs per contact. Attribute keys can include only alphanumeric, dash, and underscore characters.</p>"
+        },
+        "ParticipantDetails":{
+          "shape":"ParticipantDetails",
+          "documentation":"<p>Information identifying the participant.</p>"
+        },
+        "InitialMessage":{
+          "shape":"ChatMessage",
+          "documentation":"<p>The initial message to be sent to the newly created chat.</p>"
+        },
+        "ClientToken":{
+          "shape":"ClientToken",
+          "documentation":"<p>A unique, case-sensitive identifier that you provide to ensure the idempotency of the request.</p>",
+          "idempotencyToken":true
+        }
+      }
+    },
+    "StartChatContactResponse":{
+      "type":"structure",
+      "members":{
+        "ContactId":{
+          "shape":"ContactId",
+          "documentation":"<p>The identifier of this contact within the Amazon Connect instance. </p>"
+        },
+        "ParticipantId":{
+          "shape":"ParticipantId",
+          "documentation":"<p>The identifier for a chat participant. The participantId for a chat participant is the same throughout the chat lifecycle.</p>"
+        },
+        "ParticipantToken":{
+          "shape":"ParticipantToken",
+          "documentation":"<p>The token used by the chat participant to call <a href=\"https://docs.aws.amazon.com/connect-participant/latest/APIReference/API_CreateParticipantConnection.html\">CreateParticipantConnection</a>. The participant token is valid for the lifetime of a chat participant.</p>"
+        }
+      }
+    },
     "StartOutboundVoiceContactRequest":{
       "type":"structure",
       "required":[
@@ -2203,6 +2405,48 @@
       "members":{
       }
     },
+    "TagKey":{
+      "type":"string",
+      "max":128,
+      "min":1,
+      "pattern":"^(?!aws:)[a-zA-Z+-=._:/]+$"
+    },
+    "TagKeyList":{
+      "type":"list",
+      "member":{"shape":"TagKey"},
+      "max":50,
+      "min":1
+    },
+    "TagMap":{
+      "type":"map",
+      "key":{"shape":"TagKey"},
+      "value":{"shape":"TagValue"},
+      "max":50,
+      "min":1
+    },
+    "TagResourceRequest":{
+      "type":"structure",
+      "required":[
+        "resourceArn",
+        "tags"
+      ],
+      "members":{
+        "resourceArn":{
+          "shape":"ARN",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the resource.</p>",
+          "location":"uri",
+          "locationName":"resourceArn"
+        },
+        "tags":{
+          "shape":"TagMap",
+          "documentation":"<p>One or more tags. For example, { \"tags\": {\"key1\":\"value1\", \"key2\":\"value2\"} }.</p>"
+        }
+      }
+    },
+    "TagValue":{
+      "type":"string",
+      "max":256
+    },
     "Threshold":{
       "type":"structure",
       "members":{
@@ -2236,6 +2480,27 @@
         "PERCENT"
       ]
     },
+    "UntagResourceRequest":{
+      "type":"structure",
+      "required":[
+        "resourceArn",
+        "tagKeys"
+      ],
+      "members":{
+        "resourceArn":{
+          "shape":"ARN",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the resource.</p>",
+          "location":"uri",
+          "locationName":"resourceArn"
+        },
+        "tagKeys":{
+          "shape":"TagKeyList",
+          "documentation":"<p>The tag keys.</p>",
+          "location":"querystring",
+          "locationName":"tagKeys"
+        }
+      }
+    },
     "UpdateContactAttributesRequest":{
       "type":"structure",
       "required":[
@@ -2430,6 +2695,10 @@
         "HierarchyGroupId":{
           "shape":"HierarchyGroupId",
           "documentation":"<p>The identifier of the hierarchy group for the user.</p>"
+        },
+        "Tags":{
+          "shape":"TagMap",
+          "documentation":"<p>The tags.</p>"
         }
       },
       "documentation":"<p>Contains information about a user account for a Amazon Connect instance.</p>"
diff --git a/services/connectparticipant/pom.xml b/services/connectparticipant/pom.xml
new file mode 100644
index 000000000000..0d74d4e57c07
--- /dev/null
+++ b/services/connectparticipant/pom.xml
@@ -0,0 +1,60 @@
+<?xml version="1.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.
+  -->
+
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>software.amazon.awssdk</groupId>
+        <artifactId>services</artifactId>
+        <version>2.11.8-SNAPSHOT</version>
+    </parent>
+    <artifactId>connectparticipant</artifactId>
+    <name>AWS Java SDK :: Services :: ConnectParticipant</name>
+    <description>The AWS Java SDK for ConnectParticipant module holds the client classes that are used for
+        communicating with ConnectParticipant.
+    </description>
+    <url>https://aws.amazon.com/sdkforjava</url>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifestEntries>
+                            <Automatic-Module-Name>software.amazon.awssdk.services.connectparticipant</Automatic-Module-Name>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>protocol-core</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>aws-json-protocol</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/services/connectparticipant/src/main/resources/codegen-resources/paginators-1.json b/services/connectparticipant/src/main/resources/codegen-resources/paginators-1.json
new file mode 100644
index 000000000000..d37a1a26126f
--- /dev/null
+++ b/services/connectparticipant/src/main/resources/codegen-resources/paginators-1.json
@@ -0,0 +1,9 @@
+{
+  "pagination": {
+    "GetTranscript": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "MaxResults"
+    }
+  }
+}
diff --git a/services/connectparticipant/src/main/resources/codegen-resources/service-2.json b/services/connectparticipant/src/main/resources/codegen-resources/service-2.json
new file mode 100644
index 000000000000..50fff6ee9cae
--- /dev/null
+++ b/services/connectparticipant/src/main/resources/codegen-resources/service-2.json
@@ -0,0 +1,533 @@
+{
+  "version":"2.0",
+  "metadata":{
+    "apiVersion":"2018-09-07",
+    "endpointPrefix":"participant.connect",
+    "jsonVersion":"1.1",
+    "protocol":"rest-json",
+    "serviceAbbreviation":"Amazon Connect Participant",
+    "serviceFullName":"Amazon Connect Participant Service",
+    "serviceId":"ConnectParticipant",
+    "signatureVersion":"v4",
+    "signingName":"execute-api",
+    "uid":"connectparticipant-2018-09-07"
+  },
+  "operations":{
+    "CreateParticipantConnection":{
+      "name":"CreateParticipantConnection",
+      "http":{
+        "method":"POST",
+        "requestUri":"/participant/connection"
+      },
+      "input":{"shape":"CreateParticipantConnectionRequest"},
+      "output":{"shape":"CreateParticipantConnectionResponse"},
+      "errors":[
+        {"shape":"AccessDeniedException"},
+        {"shape":"InternalServerException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"ValidationException"}
+      ],
+      "documentation":"<p>Creates the participant's connection. Note that ParticipantToken is used for invoking this API instead of ConnectionToken.</p> <p>The participant token is valid for the lifetime of the participant – until the they are part of a contact.</p> <p>The response URL for <code>WEBSOCKET</code> Type has a connect expiry timeout of 100s. Clients must manually connect to the returned websocket URL and subscribe to the desired topic. </p> <p>For chat, you need to publish the following on the established websocket connection:</p> <p> <code>{\"topic\":\"aws/subscribe\",\"content\":{\"topics\":[\"aws/chat\"]}}</code> </p> <p>Upon websocket URL expiry, as specified in the response ConnectionExpiry parameter, clients need to call this API again to obtain a new websocket URL and perform the same steps as before.</p>"
+    },
+    "DisconnectParticipant":{
+      "name":"DisconnectParticipant",
+      "http":{
+        "method":"POST",
+        "requestUri":"/participant/disconnect"
+      },
+      "input":{"shape":"DisconnectParticipantRequest"},
+      "output":{"shape":"DisconnectParticipantResponse"},
+      "errors":[
+        {"shape":"AccessDeniedException"},
+        {"shape":"InternalServerException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"ValidationException"}
+      ],
+      "documentation":"<p>Disconnects a participant. Note that ConnectionToken is used for invoking this API instead of ParticipantToken.</p>"
+    },
+    "GetTranscript":{
+      "name":"GetTranscript",
+      "http":{
+        "method":"POST",
+        "requestUri":"/participant/transcript"
+      },
+      "input":{"shape":"GetTranscriptRequest"},
+      "output":{"shape":"GetTranscriptResponse"},
+      "errors":[
+        {"shape":"AccessDeniedException"},
+        {"shape":"InternalServerException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"ValidationException"}
+      ],
+      "documentation":"<p>Retrieves a transcript of the session. Note that ConnectionToken is used for invoking this API instead of ParticipantToken.</p>"
+    },
+    "SendEvent":{
+      "name":"SendEvent",
+      "http":{
+        "method":"POST",
+        "requestUri":"/participant/event"
+      },
+      "input":{"shape":"SendEventRequest"},
+      "output":{"shape":"SendEventResponse"},
+      "errors":[
+        {"shape":"AccessDeniedException"},
+        {"shape":"InternalServerException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"ValidationException"}
+      ],
+      "documentation":"<p>Sends an event. Note that ConnectionToken is used for invoking this API instead of ParticipantToken.</p>"
+    },
+    "SendMessage":{
+      "name":"SendMessage",
+      "http":{
+        "method":"POST",
+        "requestUri":"/participant/message"
+      },
+      "input":{"shape":"SendMessageRequest"},
+      "output":{"shape":"SendMessageResponse"},
+      "errors":[
+        {"shape":"AccessDeniedException"},
+        {"shape":"InternalServerException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"ValidationException"}
+      ],
+      "documentation":"<p>Sends a message. Note that ConnectionToken is used for invoking this API instead of ParticipantToken.</p>"
+    }
+  },
+  "shapes":{
+    "AccessDeniedException":{
+      "type":"structure",
+      "required":["Message"],
+      "members":{
+        "Message":{"shape":"Message"}
+      },
+      "documentation":"<p>You do not have sufficient access to perform this action.</p>",
+      "error":{"httpStatusCode":403},
+      "exception":true
+    },
+    "ChatContent":{
+      "type":"string",
+      "max":1024,
+      "min":1
+    },
+    "ChatContentType":{
+      "type":"string",
+      "max":100,
+      "min":1
+    },
+    "ChatItemId":{
+      "type":"string",
+      "max":256,
+      "min":1
+    },
+    "ChatItemType":{
+      "type":"string",
+      "enum":[
+        "MESSAGE",
+        "EVENT",
+        "CONNECTION_ACK"
+      ]
+    },
+    "ClientToken":{
+      "type":"string",
+      "max":500
+    },
+    "ConnectionCredentials":{
+      "type":"structure",
+      "members":{
+        "ConnectionToken":{
+          "shape":"ParticipantToken",
+          "documentation":"<p>The connection token.</p>"
+        },
+        "Expiry":{
+          "shape":"ISO8601Datetime",
+          "documentation":"<p>The expiration of the token.</p> <p>It's specified in ISO 8601 format: yyyy-MM-ddThh:mm:ss.SSSZ. For example, 2019-11-08T02:41:28.172Z.</p>"
+        }
+      },
+      "documentation":"<p>Connection credentials. </p>"
+    },
+    "ConnectionType":{
+      "type":"string",
+      "enum":[
+        "WEBSOCKET",
+        "CONNECTION_CREDENTIALS"
+      ]
+    },
+    "ConnectionTypeList":{
+      "type":"list",
+      "member":{"shape":"ConnectionType"},
+      "min":1
+    },
+    "ContactId":{
+      "type":"string",
+      "max":256,
+      "min":1
+    },
+    "CreateParticipantConnectionRequest":{
+      "type":"structure",
+      "required":[
+        "Type",
+        "ParticipantToken"
+      ],
+      "members":{
+        "Type":{
+          "shape":"ConnectionTypeList",
+          "documentation":"<p>Type of connection information required.</p>"
+        },
+        "ParticipantToken":{
+          "shape":"ParticipantToken",
+          "documentation":"<p>Participant Token as obtained from <a href=\"https://docs.aws.amazon.com/connect/latest/APIReference/API_StartChatContactResponse.html\">StartChatContact</a> API response.</p>",
+          "location":"header",
+          "locationName":"X-Amz-Bearer"
+        }
+      }
+    },
+    "CreateParticipantConnectionResponse":{
+      "type":"structure",
+      "members":{
+        "Websocket":{
+          "shape":"Websocket",
+          "documentation":"<p>Creates the participant's websocket connection.</p>"
+        },
+        "ConnectionCredentials":{
+          "shape":"ConnectionCredentials",
+          "documentation":"<p>Creates the participant's connection credentials. The authentication token associated with the participant's connection.</p>"
+        }
+      }
+    },
+    "DisconnectParticipantRequest":{
+      "type":"structure",
+      "required":["ConnectionToken"],
+      "members":{
+        "ClientToken":{
+          "shape":"ClientToken",
+          "documentation":"<p>A unique, case-sensitive identifier that you provide to ensure the idempotency of the request.</p>",
+          "idempotencyToken":true
+        },
+        "ConnectionToken":{
+          "shape":"ParticipantToken",
+          "documentation":"<p>The authentication token associated with the participant's connection.</p>",
+          "location":"header",
+          "locationName":"X-Amz-Bearer"
+        }
+      }
+    },
+    "DisconnectParticipantResponse":{
+      "type":"structure",
+      "members":{
+      }
+    },
+    "DisplayName":{
+      "type":"string",
+      "max":256,
+      "min":1
+    },
+    "GetTranscriptRequest":{
+      "type":"structure",
+      "required":["ConnectionToken"],
+      "members":{
+        "ContactId":{
+          "shape":"ContactId",
+          "documentation":"<p>The contactId from the current contact chain for which transcript is needed.</p>"
+        },
+        "MaxResults":{
+          "shape":"MaxResults",
+          "documentation":"<p>The maximum number of results to return in the page. Default: 10. </p>",
+          "box":true
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>The pagination token. Use the value returned previously in the next subsequent request to retrieve the next set of results.</p>"
+        },
+        "ScanDirection":{
+          "shape":"ScanDirection",
+          "documentation":"<p>The direction from StartPosition from which to retrieve message. Default: BACKWARD when no StartPosition is provided, FORWARD with StartPosition. </p>"
+        },
+        "SortOrder":{
+          "shape":"SortKey",
+          "documentation":"<p>The sort order for the records. Default: DESCENDING.</p>"
+        },
+        "StartPosition":{
+          "shape":"StartPosition",
+          "documentation":"<p>A filtering option for where to start.</p>"
+        },
+        "ConnectionToken":{
+          "shape":"ParticipantToken",
+          "documentation":"<p>The authentication token associated with the participant's connection.</p>",
+          "location":"header",
+          "locationName":"X-Amz-Bearer"
+        }
+      }
+    },
+    "GetTranscriptResponse":{
+      "type":"structure",
+      "members":{
+        "InitialContactId":{
+          "shape":"ContactId",
+          "documentation":"<p>The initial contact ID for the contact. </p>"
+        },
+        "Transcript":{
+          "shape":"Transcript",
+          "documentation":"<p>The list of messages in the session.</p>"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>The pagination token. Use the value returned previously in the next subsequent request to retrieve the next set of results.</p>"
+        }
+      }
+    },
+    "ISO8601Datetime":{"type":"string"},
+    "Instant":{
+      "type":"string",
+      "max":100,
+      "min":1
+    },
+    "InternalServerException":{
+      "type":"structure",
+      "required":["Message"],
+      "members":{
+        "Message":{"shape":"Message"}
+      },
+      "documentation":"<p>This exception occurs when there is an internal failure in the Amazon Connect service.</p>",
+      "error":{"httpStatusCode":500},
+      "exception":true,
+      "fault":true
+    },
+    "Item":{
+      "type":"structure",
+      "members":{
+        "AbsoluteTime":{
+          "shape":"Instant",
+          "documentation":"<p>The time when the message or event was sent.</p> <p>It's specified in ISO 8601 format: yyyy-MM-ddThh:mm:ss.SSSZ. For example, 2019-11-08T02:41:28.172Z.</p>"
+        },
+        "Content":{
+          "shape":"ChatContent",
+          "documentation":"<p>The content of the message or event.</p>"
+        },
+        "ContentType":{
+          "shape":"ChatContentType",
+          "documentation":"<p>The type of content of the item.</p>"
+        },
+        "Id":{
+          "shape":"ChatItemId",
+          "documentation":"<p>The ID of the item.</p>"
+        },
+        "Type":{
+          "shape":"ChatItemType",
+          "documentation":"<p>Type of the item: message or event. </p>"
+        },
+        "ParticipantId":{
+          "shape":"ParticipantId",
+          "documentation":"<p>The ID of the sender in the session.</p>"
+        },
+        "DisplayName":{
+          "shape":"DisplayName",
+          "documentation":"<p>The chat display name of the sender.</p>"
+        },
+        "ParticipantRole":{
+          "shape":"ParticipantRole",
+          "documentation":"<p>The role of the sender. For example, is it a customer, agent, or system.</p>"
+        }
+      },
+      "documentation":"<p>An item - message or event - that has been sent. </p>"
+    },
+    "MaxResults":{
+      "type":"integer",
+      "max":100,
+      "min":0
+    },
+    "Message":{"type":"string"},
+    "MostRecent":{
+      "type":"integer",
+      "max":100,
+      "min":0
+    },
+    "NextToken":{
+      "type":"string",
+      "max":1000,
+      "min":1
+    },
+    "ParticipantId":{
+      "type":"string",
+      "max":256,
+      "min":1
+    },
+    "ParticipantRole":{
+      "type":"string",
+      "enum":[
+        "AGENT",
+        "CUSTOMER",
+        "SYSTEM"
+      ]
+    },
+    "ParticipantToken":{
+      "type":"string",
+      "max":1000,
+      "min":1
+    },
+    "PreSignedConnectionUrl":{
+      "type":"string",
+      "max":2000,
+      "min":1
+    },
+    "Reason":{
+      "type":"string",
+      "max":2000,
+      "min":1
+    },
+    "ScanDirection":{
+      "type":"string",
+      "enum":[
+        "FORWARD",
+        "BACKWARD"
+      ]
+    },
+    "SendEventRequest":{
+      "type":"structure",
+      "required":[
+        "ContentType",
+        "ConnectionToken"
+      ],
+      "members":{
+        "ContentType":{
+          "shape":"ChatContentType",
+          "documentation":"<p>The content type of the request. Supported types are:</p> <ul> <li> <p>application/vnd.amazonaws.connect.event.typing</p> </li> <li> <p>application/vnd.amazonaws.connect.event.connection.acknowledged</p> </li> </ul>"
+        },
+        "Content":{
+          "shape":"ChatContent",
+          "documentation":"<p>The content of the event to be sent (for example, message text). This is not yet supported.</p>"
+        },
+        "ClientToken":{
+          "shape":"ClientToken",
+          "documentation":"<p>A unique, case-sensitive identifier that you provide to ensure the idempotency of the request.</p>",
+          "idempotencyToken":true
+        },
+        "ConnectionToken":{
+          "shape":"ParticipantToken",
+          "documentation":"<p>The authentication token associated with the participant's connection.</p>",
+          "location":"header",
+          "locationName":"X-Amz-Bearer"
+        }
+      }
+    },
+    "SendEventResponse":{
+      "type":"structure",
+      "members":{
+        "Id":{
+          "shape":"ChatItemId",
+          "documentation":"<p>The ID of the response.</p>"
+        },
+        "AbsoluteTime":{
+          "shape":"Instant",
+          "documentation":"<p>The time when the event was sent.</p> <p>It's specified in ISO 8601 format: yyyy-MM-ddThh:mm:ss.SSSZ. For example, 2019-11-08T02:41:28.172Z.</p>"
+        }
+      }
+    },
+    "SendMessageRequest":{
+      "type":"structure",
+      "required":[
+        "ContentType",
+        "Content",
+        "ConnectionToken"
+      ],
+      "members":{
+        "ContentType":{
+          "shape":"ChatContentType",
+          "documentation":"<p>The type of the content. Supported types are text/plain.</p>"
+        },
+        "Content":{
+          "shape":"ChatContent",
+          "documentation":"<p>The content of the message.</p>"
+        },
+        "ClientToken":{
+          "shape":"ClientToken",
+          "documentation":"<p>A unique, case-sensitive identifier that you provide to ensure the idempotency of the request.</p>",
+          "idempotencyToken":true
+        },
+        "ConnectionToken":{
+          "shape":"ParticipantToken",
+          "documentation":"<p>The authentication token associated with the connection.</p>",
+          "location":"header",
+          "locationName":"X-Amz-Bearer"
+        }
+      }
+    },
+    "SendMessageResponse":{
+      "type":"structure",
+      "members":{
+        "Id":{
+          "shape":"ChatItemId",
+          "documentation":"<p>The ID of the message.</p>"
+        },
+        "AbsoluteTime":{
+          "shape":"Instant",
+          "documentation":"<p>The time when the message was sent.</p> <p>It's specified in ISO 8601 format: yyyy-MM-ddThh:mm:ss.SSSZ. For example, 2019-11-08T02:41:28.172Z.</p>"
+        }
+      }
+    },
+    "SortKey":{
+      "type":"string",
+      "enum":[
+        "DESCENDING",
+        "ASCENDING"
+      ]
+    },
+    "StartPosition":{
+      "type":"structure",
+      "members":{
+        "Id":{
+          "shape":"ChatItemId",
+          "documentation":"<p>The ID of the message or event where to start. </p>"
+        },
+        "AbsoluteTime":{
+          "shape":"Instant",
+          "documentation":"<p>The time in ISO format where to start.</p> <p>It's specified in ISO 8601 format: yyyy-MM-ddThh:mm:ss.SSSZ. For example, 2019-11-08T02:41:28.172Z.</p>"
+        },
+        "MostRecent":{
+          "shape":"MostRecent",
+          "documentation":"<p>The start position of the most recent message where you want to start. </p>"
+        }
+      },
+      "documentation":"<p>A filtering option for where to start. For example, if you sent 100 messages, start with message 50. </p>"
+    },
+    "ThrottlingException":{
+      "type":"structure",
+      "required":["Message"],
+      "members":{
+        "Message":{"shape":"Message"}
+      },
+      "documentation":"<p>The request was denied due to request throttling.</p>",
+      "error":{"httpStatusCode":429},
+      "exception":true
+    },
+    "Transcript":{
+      "type":"list",
+      "member":{"shape":"Item"}
+    },
+    "ValidationException":{
+      "type":"structure",
+      "required":["Message"],
+      "members":{
+        "Message":{"shape":"Reason"}
+      },
+      "documentation":"<p>The input fails to satisfy the constraints specified by Amazon Connect.</p>",
+      "error":{"httpStatusCode":400},
+      "exception":true
+    },
+    "Websocket":{
+      "type":"structure",
+      "members":{
+        "Url":{
+          "shape":"PreSignedConnectionUrl",
+          "documentation":"<p>The URL of the websocket.</p>"
+        },
+        "ConnectionExpiry":{
+          "shape":"ISO8601Datetime",
+          "documentation":"<p>The URL expiration timestamp in ISO date format.</p> <p>It's specified in ISO 8601 format: yyyy-MM-ddThh:mm:ss.SSSZ. For example, 2019-11-08T02:41:28.172Z.</p>"
+        }
+      },
+      "documentation":"<p>The websocket for the participant's connection.</p>"
+    }
+  },
+  "documentation":"<p>Amazon Connect is a cloud-based contact center solution that makes it easy to set up and manage a customer contact center and provide reliable customer engagement at any scale.</p> <p>Amazon Connect enables customer contacts through voice or chat.</p> <p>The APIs described here are used by chat participants, such as agents and customers.</p>"
+}
diff --git a/services/costandusagereport/build.properties b/services/costandusagereport/build.properties
index ecf2dae6fcb1..15ec2da1fc71 100644
--- a/services/costandusagereport/build.properties
+++ b/services/costandusagereport/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/costandusagereport/pom.xml b/services/costandusagereport/pom.xml
index 483fad7c95f1..fcba43f2240b 100644
--- a/services/costandusagereport/pom.xml
+++ b/services/costandusagereport/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>costandusagereport</artifactId>
     <name>AWS Java SDK :: Services :: AWS Cost and Usage Report</name>
diff --git a/services/costexplorer/pom.xml b/services/costexplorer/pom.xml
index 32a9d025e3aa..f601e04efc17 100644
--- a/services/costexplorer/pom.xml
+++ b/services/costexplorer/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>services</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>costexplorer</artifactId>
diff --git a/services/costexplorer/src/main/resources/codegen-resources/paginators-1.json b/services/costexplorer/src/main/resources/codegen-resources/paginators-1.json
index 5677bd8e4a2d..e976e315b131 100644
--- a/services/costexplorer/src/main/resources/codegen-resources/paginators-1.json
+++ b/services/costexplorer/src/main/resources/codegen-resources/paginators-1.json
@@ -1,4 +1,14 @@
 {
   "pagination": {
+    "GetSavingsPlansCoverage": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "MaxResults"
+    },
+    "GetSavingsPlansUtilizationDetails": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "MaxResults"
+    }
   }
 }
diff --git a/services/costexplorer/src/main/resources/codegen-resources/service-2.json b/services/costexplorer/src/main/resources/codegen-resources/service-2.json
index 6aab1c1068ae..1372016b63db 100644
--- a/services/costexplorer/src/main/resources/codegen-resources/service-2.json
+++ b/services/costexplorer/src/main/resources/codegen-resources/service-2.json
@@ -14,6 +14,48 @@
     "uid":"ce-2017-10-25"
   },
   "operations":{
+    "CreateCostCategoryDefinition":{
+      "name":"CreateCostCategoryDefinition",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"CreateCostCategoryDefinitionRequest"},
+      "output":{"shape":"CreateCostCategoryDefinitionResponse"},
+      "errors":[
+        {"shape":"ServiceQuotaExceededException"},
+        {"shape":"LimitExceededException"}
+      ],
+      "documentation":"<important> <p> <i> <b>Cost Category is in public beta for AWS Billing and Cost Management and is subject to change. Your use of Cost Categories is subject to the Beta Service Participation terms of the <a href=\"http://aws.amazon.com/service-terms/\">AWS Service Terms</a> (Section 1.10).</b> </i> </p> </important> <p>Creates a new Cost Category with the requested name and rules.</p>"
+    },
+    "DeleteCostCategoryDefinition":{
+      "name":"DeleteCostCategoryDefinition",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DeleteCostCategoryDefinitionRequest"},
+      "output":{"shape":"DeleteCostCategoryDefinitionResponse"},
+      "errors":[
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"LimitExceededException"}
+      ],
+      "documentation":"<important> <p> <i> <b>Cost Category is in public beta for AWS Billing and Cost Management and is subject to change. Your use of Cost Categories is subject to the Beta Service Participation terms of the <a href=\"http://aws.amazon.com/service-terms/\">AWS Service Terms</a> (Section 1.10).</b> </i> </p> </important> <p>Deletes a Cost Category. Expenses from this month going forward will no longer be categorized with this Cost Category.</p>"
+    },
+    "DescribeCostCategoryDefinition":{
+      "name":"DescribeCostCategoryDefinition",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DescribeCostCategoryDefinitionRequest"},
+      "output":{"shape":"DescribeCostCategoryDefinitionResponse"},
+      "errors":[
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"LimitExceededException"}
+      ],
+      "documentation":"<important> <p> <i> <b>Cost Category is in public beta for AWS Billing and Cost Management and is subject to change. Your use of Cost Categories is subject to the Beta Service Participation terms of the <a href=\"http://aws.amazon.com/service-terms/\">AWS Service Terms</a> (Section 1.10).</b> </i> </p> </important> <p>Returns the name, ARN, rules, definition, and effective dates of a Cost Category that's defined in the account.</p> <p>You have the option to use <code>EffectiveOn</code> to return a Cost Category that is active on a specific date. If there is no <code>EffectiveOn</code> specified, you’ll see a Cost Category that is effective on the current date. If Cost Category is still effective, <code>EffectiveEnd</code> is omitted in the response. </p>"
+    },
     "GetCostAndUsage":{
       "name":"GetCostAndUsage",
       "http":{
@@ -29,7 +71,24 @@
         {"shape":"InvalidNextTokenException"},
         {"shape":"RequestChangedException"}
       ],
-      "documentation":"<p>Retrieves cost and usage metrics for your account. You can specify which cost and usage-related metric, such as <code>BlendedCosts</code> or <code>UsageQuantity</code>, that you want the request to return. You can also filter and group your data by various dimensions, such as <code>SERVICE</code> or <code>AZ</code>, in a specific time range. For a complete list of valid dimensions, see the <a href=\"http://docs.aws.amazon.com/aws-cost-management/latest/APIReference/API_GetDimensionValues.html\">GetDimensionValues</a> operation. Master accounts in an organization in AWS Organizations have access to all member accounts.</p>"
+      "documentation":"<p>Retrieves cost and usage metrics for your account. You can specify which cost and usage-related metric, such as <code>BlendedCosts</code> or <code>UsageQuantity</code>, that you want the request to return. You can also filter and group your data by various dimensions, such as <code>SERVICE</code> or <code>AZ</code>, in a specific time range. For a complete list of valid dimensions, see the <a href=\"https://docs.aws.amazon.com/aws-cost-management/latest/APIReference/API_GetDimensionValues.html\">GetDimensionValues</a> operation. Master accounts in an organization in AWS Organizations have access to all member accounts.</p>"
+    },
+    "GetCostAndUsageWithResources":{
+      "name":"GetCostAndUsageWithResources",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"GetCostAndUsageWithResourcesRequest"},
+      "output":{"shape":"GetCostAndUsageWithResourcesResponse"},
+      "errors":[
+        {"shape":"DataUnavailableException"},
+        {"shape":"LimitExceededException"},
+        {"shape":"BillExpirationException"},
+        {"shape":"InvalidNextTokenException"},
+        {"shape":"RequestChangedException"}
+      ],
+      "documentation":"<p>Retrieves cost and usage metrics with resources for your account. You can specify which cost and usage-related metric, such as <code>BlendedCosts</code> or <code>UsageQuantity</code>, that you want the request to return. You can also filter and group your data by various dimensions, such as <code>SERVICE</code> or <code>AZ</code>, in a specific time range. For a complete list of valid dimensions, see the <a href=\"http://docs.aws.amazon.com/aws-cost-management/latest/APIReference/API_GetDimensionValues.html\">GetDimensionValues</a> operation. Master accounts in an organization in AWS Organizations have access to all member accounts. This API is currently available for the Amazon Elastic Compute Cloud – Compute service only.</p> <note> <p>This is an opt-in only feature. You can enable this feature from the Cost Explorer Settings page. For information on how to access the Settings page, see <a href=\"https://docs.aws.amazon.com/awsaccountbilling/latest/aboutv2/ce-access.html\">Controlling Access for Cost Explorer</a> in the <i>AWS Billing and Cost Management User Guide</i>.</p> </note>"
     },
     "GetCostForecast":{
       "name":"GetCostForecast",
@@ -121,6 +180,64 @@
       ],
       "documentation":"<p>Creates recommendations that helps you save cost by identifying idle and underutilized Amazon EC2 instances.</p> <p>Recommendations are generated to either downsize or terminate instances, along with providing savings detail and metrics. For details on calculation and function, see <a href=\"https://docs.aws.amazon.com/awsaccountbilling/latest/aboutv2/ce-what-is.html\">Optimizing Your Cost with Rightsizing Recommendations</a>.</p>"
     },
+    "GetSavingsPlansCoverage":{
+      "name":"GetSavingsPlansCoverage",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"GetSavingsPlansCoverageRequest"},
+      "output":{"shape":"GetSavingsPlansCoverageResponse"},
+      "errors":[
+        {"shape":"LimitExceededException"},
+        {"shape":"DataUnavailableException"},
+        {"shape":"InvalidNextTokenException"}
+      ],
+      "documentation":"<p>Retrieves the Savings Plans covered for your account. This enables you to see how much of your cost is covered by a Savings Plan. An organization’s master account can see the coverage of the associated member accounts. For any time period, you can filter data for Savings Plans usage with the following dimensions:</p> <ul> <li> <p> <code>LINKED_ACCOUNT</code> </p> </li> <li> <p> <code>REGION</code> </p> </li> <li> <p> <code>SERVICE</code> </p> </li> <li> <p> <code>INSTANCE_FAMILY</code> </p> </li> </ul> <p>To determine valid values for a dimension, use the <code>GetDimensionValues</code> operation.</p>"
+    },
+    "GetSavingsPlansPurchaseRecommendation":{
+      "name":"GetSavingsPlansPurchaseRecommendation",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"GetSavingsPlansPurchaseRecommendationRequest"},
+      "output":{"shape":"GetSavingsPlansPurchaseRecommendationResponse"},
+      "errors":[
+        {"shape":"LimitExceededException"},
+        {"shape":"InvalidNextTokenException"}
+      ],
+      "documentation":"<p>Retrieves your request parameters, Savings Plan Recommendations Summary and Details. </p>"
+    },
+    "GetSavingsPlansUtilization":{
+      "name":"GetSavingsPlansUtilization",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"GetSavingsPlansUtilizationRequest"},
+      "output":{"shape":"GetSavingsPlansUtilizationResponse"},
+      "errors":[
+        {"shape":"LimitExceededException"},
+        {"shape":"DataUnavailableException"}
+      ],
+      "documentation":"<p>Retrieves the Savings Plans utilization for your account across date ranges with daily or monthly granularity. Master accounts in an organization have access to member accounts. You can use <code>GetDimensionValues</code> in <code>SAVINGS_PLANS</code> to determine the possible dimension values.</p> <note> <p>You cannot group by any dimension values for <code>GetSavingsPlansUtilization</code>.</p> </note>"
+    },
+    "GetSavingsPlansUtilizationDetails":{
+      "name":"GetSavingsPlansUtilizationDetails",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"GetSavingsPlansUtilizationDetailsRequest"},
+      "output":{"shape":"GetSavingsPlansUtilizationDetailsResponse"},
+      "errors":[
+        {"shape":"LimitExceededException"},
+        {"shape":"DataUnavailableException"},
+        {"shape":"InvalidNextTokenException"}
+      ],
+      "documentation":"<p>Retrieves attribute data along with aggregate utilization and savings data for a given time period. This doesn't support granular or grouped data (daily/monthly) in response. You can't retrieve data by dates in a single response similar to <code>GetSavingsPlanUtilization</code>, but you have the option to make multiple calls to <code>GetSavingsPlanUtilizationDetails</code> by providing individual dates. You can use <code>GetDimensionValues</code> in <code>SAVINGS_PLANS</code> to determine the possible dimension values.</p> <note> <p> <code>GetSavingsPlanUtilizationDetails</code> internally groups data by <code>SavingsPlansArn</code>.</p> </note>"
+    },
     "GetTags":{
       "name":"GetTags",
       "http":{
@@ -152,6 +269,34 @@
         {"shape":"UnresolvableUsageUnitException"}
       ],
       "documentation":"<p>Retrieves a forecast for how much Amazon Web Services predicts that you will use over the forecast time period that you select, based on your past usage. </p>"
+    },
+    "ListCostCategoryDefinitions":{
+      "name":"ListCostCategoryDefinitions",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"ListCostCategoryDefinitionsRequest"},
+      "output":{"shape":"ListCostCategoryDefinitionsResponse"},
+      "errors":[
+        {"shape":"LimitExceededException"}
+      ],
+      "documentation":"<important> <p> <i> <b>Cost Category is in public beta for AWS Billing and Cost Management and is subject to change. Your use of Cost Categories is subject to the Beta Service Participation terms of the <a href=\"http://aws.amazon.com/service-terms/\">AWS Service Terms</a> (Section 1.10).</b> </i> </p> </important> <p>Returns the name, ARN and effective dates of all Cost Categories defined in the account. You have the option to use <code>EffectiveOn</code> to return a list of Cost Categories that were active on a specific date. If there is no <code>EffectiveOn</code> specified, you’ll see Cost Categories that are effective on the current date. If Cost Category is still effective, <code>EffectiveEnd</code> is omitted in the response. </p>"
+    },
+    "UpdateCostCategoryDefinition":{
+      "name":"UpdateCostCategoryDefinition",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"UpdateCostCategoryDefinitionRequest"},
+      "output":{"shape":"UpdateCostCategoryDefinitionResponse"},
+      "errors":[
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ServiceQuotaExceededException"},
+        {"shape":"LimitExceededException"}
+      ],
+      "documentation":"<important> <p> <i> <b>Cost Category is in public beta for AWS Billing and Cost Management and is subject to change. Your use of Cost Categories is subject to the Beta Service Participation terms of the <a href=\"http://aws.amazon.com/service-terms/\">AWS Service Terms</a> (Section 1.10).</b> </i> </p> </important> <p>Updates an existing Cost Category. Changes made to the Cost Category rules will be used to categorize the current month’s expenses and future expenses. This won’t change categorization for the previous months.</p>"
     }
   },
   "shapes":{
@@ -164,6 +309,12 @@
     },
     "AmortizedRecurringFee":{"type":"string"},
     "AmortizedUpfrontFee":{"type":"string"},
+    "Arn":{
+      "type":"string",
+      "max":2048,
+      "min":20,
+      "pattern":"arn:aws[-a-z0-9]*:[a-z0-9]+:[-a-z0-9]*:[0-9]{12}:[-a-zA-Z0-9/:_]+"
+    },
     "AttributeType":{"type":"string"},
     "AttributeValue":{"type":"string"},
     "Attributes":{
@@ -183,9 +334,115 @@
       "type":"string",
       "enum":[
         "COST_AND_USAGE",
-        "RESERVATIONS"
+        "RESERVATIONS",
+        "SAVINGS_PLANS"
       ]
     },
+    "CostCategory":{
+      "type":"structure",
+      "required":[
+        "CostCategoryArn",
+        "EffectiveStart",
+        "Name",
+        "RuleVersion",
+        "Rules"
+      ],
+      "members":{
+        "CostCategoryArn":{
+          "shape":"Arn",
+          "documentation":"<p> The unique identifier for your Cost Category. </p>"
+        },
+        "EffectiveStart":{
+          "shape":"ZonedDateTime",
+          "documentation":"<p> The Cost Category's effective start date.</p>"
+        },
+        "EffectiveEnd":{
+          "shape":"ZonedDateTime",
+          "documentation":"<p> The Cost Category's effective end date.</p>"
+        },
+        "Name":{"shape":"CostCategoryName"},
+        "RuleVersion":{"shape":"CostCategoryRuleVersion"},
+        "Rules":{
+          "shape":"CostCategoryRulesList",
+          "documentation":"<p> Rules are processed in order. If there are multiple rules that match the line item, then the first rule to match is used to determine that Cost Category value. </p>"
+        }
+      },
+      "documentation":"<important> <p> <i> <b>Cost Category is in public beta for AWS Billing and Cost Management and is subject to change. Your use of Cost Categories is subject to the Beta Service Participation terms of the <a href=\"http://aws.amazon.com/service-terms/\">AWS Service Terms</a> (Section 1.10).</b> </i> </p> </important> <p>The structure of Cost Categories. This includes detailed metadata and the set of rules for the <code>CostCategory</code> object.</p>"
+    },
+    "CostCategoryName":{
+      "type":"string",
+      "documentation":"<p>The unique name of the Cost Category.</p>",
+      "max":255,
+      "min":1,
+      "pattern":"^(?! )[\\p{L}\\p{N}\\p{Z}-_]*(?<! )$"
+    },
+    "CostCategoryReference":{
+      "type":"structure",
+      "members":{
+        "CostCategoryArn":{
+          "shape":"Arn",
+          "documentation":"<p> The unique identifier for your Cost Category Reference. </p>"
+        },
+        "Name":{"shape":"CostCategoryName"},
+        "EffectiveStart":{
+          "shape":"ZonedDateTime",
+          "documentation":"<p> The Cost Category's effective start date.</p>"
+        },
+        "EffectiveEnd":{
+          "shape":"ZonedDateTime",
+          "documentation":"<p> The Cost Category's effective end date.</p>"
+        }
+      },
+      "documentation":"<important> <p> <i> <b>Cost Category is in public beta for AWS Billing and Cost Management and is subject to change. Your use of Cost Categories is subject to the Beta Service Participation terms of the <a href=\"http://aws.amazon.com/service-terms/\">AWS Service Terms</a> (Section 1.10).</b> </i> </p> </important> <p>A reference to a Cost Category containing only enough information to identify the Cost Category.</p> <p>You can use this information to retrieve the full Cost Category information using <code>DescribeCostCategory</code>.</p>"
+    },
+    "CostCategoryReferencesList":{
+      "type":"list",
+      "member":{"shape":"CostCategoryReference"}
+    },
+    "CostCategoryRule":{
+      "type":"structure",
+      "required":[
+        "Value",
+        "Rule"
+      ],
+      "members":{
+        "Value":{"shape":"CostCategoryValue"},
+        "Rule":{
+          "shape":"Expression",
+          "documentation":"<p>An <a href=\"https://docs.aws.amazon.com/aws-cost-management/latest/APIReference/API_Expression.html\">Expression</a> object used to categorize costs. This supports dimensions, Tags, and nested expressions. Currently the only dimensions supported is <code>LINKED_ACCOUNT</code>.</p> <p>Root level <code>OR</code> is not supported. We recommend you create a separate rule instead.</p>"
+        }
+      },
+      "documentation":"<important> <p> <i> <b>Cost Category is in public beta for AWS Billing and Cost Management and is subject to change. Your use of Cost Categories is subject to the Beta Service Participation terms of the <a href=\"http://aws.amazon.com/service-terms/\">AWS Service Terms</a> (Section 1.10).</b> </i> </p> </important> <p>Rules are processed in order. If there are multiple rules that match the line item, then the first rule to match is used to determine that Cost Category value.</p>"
+    },
+    "CostCategoryRuleVersion":{
+      "type":"string",
+      "documentation":"<p>The rule schema version in this particular Cost Category.</p>",
+      "enum":["CostCategoryExpression.v1"]
+    },
+    "CostCategoryRulesList":{
+      "type":"list",
+      "member":{"shape":"CostCategoryRule"},
+      "max":500,
+      "min":1
+    },
+    "CostCategoryValue":{
+      "type":"string",
+      "documentation":"<p>The value a line item will be categorized as, if it matches the rule.</p>",
+      "max":255,
+      "min":1,
+      "pattern":"^(?! )[\\p{L}\\p{N}\\p{Z}-_]*(?<! )$"
+    },
+    "CostCategoryValues":{
+      "type":"structure",
+      "members":{
+        "Key":{"shape":"CostCategoryName"},
+        "Values":{
+          "shape":"Values",
+          "documentation":"<p>The specific value of the Cost Category.</p>"
+        }
+      },
+      "documentation":"<important> <p> <i> <b>Cost Category is in public beta for AWS Billing and Cost Management and is subject to change. Your use of Cost Categories is subject to the Beta Service Participation terms of the <a href=\"http://aws.amazon.com/service-terms/\">AWS Service Terms</a> (Section 1.10).</b> </i> </p> </important> <p>The values that are available for Cost Categories.</p>"
+    },
     "Coverage":{
       "type":"structure",
       "members":{
@@ -282,6 +539,35 @@
       "type":"list",
       "member":{"shape":"CoverageByTime"}
     },
+    "CreateCostCategoryDefinitionRequest":{
+      "type":"structure",
+      "required":[
+        "Name",
+        "RuleVersion",
+        "Rules"
+      ],
+      "members":{
+        "Name":{"shape":"CostCategoryName"},
+        "RuleVersion":{"shape":"CostCategoryRuleVersion"},
+        "Rules":{
+          "shape":"CostCategoryRulesList",
+          "documentation":"<p> <code>CreateCostCategoryDefinition</code> supports dimensions, Tags, and nested expressions. Currently the only dimensions supported is <code>LINKED_ACCOUNT</code>.</p> <p>Root level <code>OR</code> is not supported. We recommend you create a separate rule instead.</p> <p>Rules are processed in order. If there are multiple rules that match the line item, then the first rule to match is used to determine that Cost Category value. </p>"
+        }
+      }
+    },
+    "CreateCostCategoryDefinitionResponse":{
+      "type":"structure",
+      "members":{
+        "CostCategoryArn":{
+          "shape":"Arn",
+          "documentation":"<p> The unique identifier for your newly created Cost Category. </p>"
+        },
+        "EffectiveStart":{
+          "shape":"ZonedDateTime",
+          "documentation":"<p> The Cost Category's effective start date. </p>"
+        }
+      }
+    },
     "CurrentInstance":{
       "type":"structure",
       "members":{
@@ -305,6 +591,10 @@
           "shape":"GenericString",
           "documentation":"<p> Number of hours during the lookback period covered by reservations.</p>"
         },
+        "SavingsPlansCoveredHoursInLookbackPeriod":{
+          "shape":"GenericString",
+          "documentation":"<p>Number of hours during the lookback period covered by Savings Plans.</p>"
+        },
         "OnDemandHoursInLookbackPeriod":{
           "shape":"GenericString",
           "documentation":"<p> Number of hours during the lookback period billed at On Demand rates.</p>"
@@ -350,6 +640,49 @@
       },
       "documentation":"<p>The time period that you want the usage and costs for. </p>"
     },
+    "DeleteCostCategoryDefinitionRequest":{
+      "type":"structure",
+      "required":["CostCategoryArn"],
+      "members":{
+        "CostCategoryArn":{
+          "shape":"Arn",
+          "documentation":"<p> The unique identifier for your Cost Category. </p>"
+        }
+      }
+    },
+    "DeleteCostCategoryDefinitionResponse":{
+      "type":"structure",
+      "members":{
+        "CostCategoryArn":{
+          "shape":"Arn",
+          "documentation":"<p> The unique identifier for your Cost Category. </p>"
+        },
+        "EffectiveEnd":{
+          "shape":"ZonedDateTime",
+          "documentation":"<p> The effective end date of the Cost Category as a result of deleting it. No costs after this date will be categorized by the deleted Cost Category. </p>"
+        }
+      }
+    },
+    "DescribeCostCategoryDefinitionRequest":{
+      "type":"structure",
+      "required":["CostCategoryArn"],
+      "members":{
+        "CostCategoryArn":{
+          "shape":"Arn",
+          "documentation":"<p> The unique identifier for your Cost Category. </p>"
+        },
+        "EffectiveOn":{
+          "shape":"ZonedDateTime",
+          "documentation":"<p> The date when the Cost Category was effective. </p>"
+        }
+      }
+    },
+    "DescribeCostCategoryDefinitionResponse":{
+      "type":"structure",
+      "members":{
+        "CostCategory":{"shape":"CostCategory"}
+      }
+    },
     "Dimension":{
       "type":"string",
       "enum":[
@@ -375,7 +708,11 @@
         "INSTANCE_TYPE_FAMILY",
         "BILLING_ENTITY",
         "RESERVATION_ID",
-        "RIGHTSIZING_TYPE"
+        "RESOURCE_ID",
+        "RIGHTSIZING_TYPE",
+        "SAVINGS_PLANS_TYPE",
+        "SAVINGS_PLAN_ARN",
+        "PAYMENT_OPTION"
       ]
     },
     "DimensionValues":{
@@ -599,9 +936,13 @@
         "Tags":{
           "shape":"TagValues",
           "documentation":"<p>The specific <code>Tag</code> to use for <code>Expression</code>.</p>"
+        },
+        "CostCategories":{
+          "shape":"CostCategoryValues",
+          "documentation":"<p> <i> <b>Cost Category is in public beta for AWS Billing and Cost Management and is subject to change. Your use of Cost Categories is subject to the Beta Service Participation terms of the <a href=\"http://aws.amazon.com/service-terms/\">AWS Service Terms</a> (Section 1.10).</b> </i> </p> <p>The specific <code>CostCategory</code> used for <code>Expression</code>.</p>"
         }
       },
-      "documentation":"<p>Use <code>Expression</code> to filter by cost or by usage. There are two patterns: </p> <ul> <li> <p>Simple dimension values - You can set the dimension name and values for the filters that you plan to use. For example, you can filter for <code>REGION==us-east-1 OR REGION==us-west-1</code>. The <code>Expression</code> for that looks like this:</p> <p> <code>{ \"Dimensions\": { \"Key\": \"REGION\", \"Values\": [ \"us-east-1\", “us-west-1” ] } }</code> </p> <p>The list of dimension values are OR'd together to retrieve cost or usage data. You can create <code>Expression</code> and <code>DimensionValues</code> objects using either <code>with*</code> methods or <code>set*</code> methods in multiple lines. </p> </li> <li> <p>Compound dimension values with logical operations - You can use multiple <code>Expression</code> types and the logical operators <code>AND/OR/NOT</code> to create a list of one or more <code>Expression</code> objects. This allows you to filter on more advanced options. For example, you can filter on <code>((REGION == us-east-1 OR REGION == us-west-1) OR (TAG.Type == Type1)) AND (USAGE_TYPE != DataTransfer)</code>. The <code>Expression</code> for that looks like this:</p> <p> <code>{ \"And\": [ {\"Or\": [ {\"Dimensions\": { \"Key\": \"REGION\", \"Values\": [ \"us-east-1\", \"us-west-1\" ] }}, {\"Tags\": { \"Key\": \"TagName\", \"Values\": [\"Value1\"] } } ]}, {\"Not\": {\"Dimensions\": { \"Key\": \"USAGE_TYPE\", \"Values\": [\"DataTransfer\"] }}} ] } </code> </p> <note> <p>Because each <code>Expression</code> can have only one operator, the service returns an error if more than one is specified. The following example shows an <code>Expression</code> object that creates an error.</p> </note> <p> <code> { \"And\": [ ... ], \"DimensionValues\": { \"Dimension\": \"USAGE_TYPE\", \"Values\": [ \"DataTransfer\" ] } } </code> </p> </li> </ul> <note> <p>For <code>GetRightsizingRecommendation</code> action, a combination of OR and NOT is not supported. OR is not supported between different dimensions, or dimensions and tags. NOT operators aren't supported. Dimentions are also limited to <code>LINKED_ACCOUNT</code>, <code>REGION</code>, or <code>RIGHTSIZING_TYPE</code>.</p> </note>"
+      "documentation":"<p>Use <code>Expression</code> to filter by cost or by usage. There are two patterns: </p> <ul> <li> <p>Simple dimension values - You can set the dimension name and values for the filters that you plan to use. For example, you can filter for <code>REGION==us-east-1 OR REGION==us-west-1</code>. The <code>Expression</code> for that looks like this:</p> <p> <code>{ \"Dimensions\": { \"Key\": \"REGION\", \"Values\": [ \"us-east-1\", “us-west-1” ] } }</code> </p> <p>The list of dimension values are OR'd together to retrieve cost or usage data. You can create <code>Expression</code> and <code>DimensionValues</code> objects using either <code>with*</code> methods or <code>set*</code> methods in multiple lines. </p> </li> <li> <p>Compound dimension values with logical operations - You can use multiple <code>Expression</code> types and the logical operators <code>AND/OR/NOT</code> to create a list of one or more <code>Expression</code> objects. This allows you to filter on more advanced options. For example, you can filter on <code>((REGION == us-east-1 OR REGION == us-west-1) OR (TAG.Type == Type1)) AND (USAGE_TYPE != DataTransfer)</code>. The <code>Expression</code> for that looks like this:</p> <p> <code>{ \"And\": [ {\"Or\": [ {\"Dimensions\": { \"Key\": \"REGION\", \"Values\": [ \"us-east-1\", \"us-west-1\" ] }}, {\"Tags\": { \"Key\": \"TagName\", \"Values\": [\"Value1\"] } } ]}, {\"Not\": {\"Dimensions\": { \"Key\": \"USAGE_TYPE\", \"Values\": [\"DataTransfer\"] }}} ] } </code> </p> <note> <p>Because each <code>Expression</code> can have only one operator, the service returns an error if more than one is specified. The following example shows an <code>Expression</code> object that creates an error.</p> </note> <p> <code> { \"And\": [ ... ], \"DimensionValues\": { \"Dimension\": \"USAGE_TYPE\", \"Values\": [ \"DataTransfer\" ] } } </code> </p> </li> </ul> <note> <p>For <code>GetRightsizingRecommendation</code> action, a combination of OR and NOT is not supported. OR is not supported between different dimensions, or dimensions and tags. NOT operators aren't supported. Dimensions are also limited to <code>LINKED_ACCOUNT</code>, <code>REGION</code>, or <code>RIGHTSIZING_TYPE</code>.</p> </note>"
     },
     "Expressions":{
       "type":"list",
@@ -645,19 +986,19 @@
         },
         "Granularity":{
           "shape":"Granularity",
-          "documentation":"<p>Sets the AWS cost granularity to <code>MONTHLY</code> or <code>DAILY</code>. If <code>Granularity</code> isn't set, the response object doesn't include the <code>Granularity</code>, either <code>MONTHLY</code> or <code>DAILY</code>. </p> <p>The <code>GetCostAndUsageRequest</code> operation supports only <code>DAILY</code> and <code>MONTHLY</code> granularities.</p>"
+          "documentation":"<p>Sets the AWS cost granularity to <code>MONTHLY</code> or <code>DAILY</code>, or <code>HOURLY</code>. If <code>Granularity</code> isn't set, the response object doesn't include the <code>Granularity</code>, either <code>MONTHLY</code> or <code>DAILY</code>, or <code>HOURLY</code>. </p>"
         },
         "Filter":{
           "shape":"Expression",
-          "documentation":"<p>Filters AWS costs by different dimensions. For example, you can specify <code>SERVICE</code> and <code>LINKED_ACCOUNT</code> and get the costs that are associated with that account's usage of that service. You can nest <code>Expression</code> objects to define any combination of dimension filters. For more information, see <a href=\"http://docs.aws.amazon.com/aws-cost-management/latest/APIReference/API_Expression.html\">Expression</a>. </p>"
+          "documentation":"<p>Filters AWS costs by different dimensions. For example, you can specify <code>SERVICE</code> and <code>LINKED_ACCOUNT</code> and get the costs that are associated with that account's usage of that service. You can nest <code>Expression</code> objects to define any combination of dimension filters. For more information, see <a href=\"https://docs.aws.amazon.com/aws-cost-management/latest/APIReference/API_Expression.html\">Expression</a>. </p>"
         },
         "Metrics":{
           "shape":"MetricNames",
-          "documentation":"<p>Which metrics are returned in the query. For more information about blended and unblended rates, see <a href=\"https://aws.amazon.com/premiumsupport/knowledge-center/blended-rates-intro/\">Why does the \"blended\" annotation appear on some line items in my bill?</a>. </p> <p>Valid values are <code>AmortizedCost</code>, <code>BlendedCost</code>, <code>NetAmortizedCost</code>, <code>NetUnblendedCost</code>, <code>NormalizedUsageAmount</code>, <code>UnblendedCost</code>, and <code>UsageQuantity</code>. </p> <note> <p>If you return the <code>UsageQuantity</code> metric, the service aggregates all usage numbers without taking into account the units. For example, if you aggregate <code>usageQuantity</code> across all of Amazon EC2, the results aren't meaningful because Amazon EC2 compute hours and data transfer are measured in different units (for example, hours vs. GB). To get more meaningful <code>UsageQuantity</code> metrics, filter by <code>UsageType</code> or <code>UsageTypeGroups</code>. </p> </note> <p> <code>Metrics</code> is required for <code>GetCostAndUsage</code> requests.</p>"
+          "documentation":"<p>Which metrics are returned in the query. For more information about blended and unblended rates, see <a href=\"http://aws.amazon.com/premiumsupport/knowledge-center/blended-rates-intro/\">Why does the \"blended\" annotation appear on some line items in my bill?</a>. </p> <p>Valid values are <code>AmortizedCost</code>, <code>BlendedCost</code>, <code>NetAmortizedCost</code>, <code>NetUnblendedCost</code>, <code>NormalizedUsageAmount</code>, <code>UnblendedCost</code>, and <code>UsageQuantity</code>. </p> <note> <p>If you return the <code>UsageQuantity</code> metric, the service aggregates all usage numbers without taking into account the units. For example, if you aggregate <code>usageQuantity</code> across all of Amazon EC2, the results aren't meaningful because Amazon EC2 compute hours and data transfer are measured in different units (for example, hours vs. GB). To get more meaningful <code>UsageQuantity</code> metrics, filter by <code>UsageType</code> or <code>UsageTypeGroups</code>. </p> </note> <p> <code>Metrics</code> is required for <code>GetCostAndUsage</code> requests.</p>"
         },
         "GroupBy":{
           "shape":"GroupDefinitions",
-          "documentation":"<p>You can group AWS costs using up to two different groups, either dimensions, tag keys, or both.</p> <p>When you group by tag key, you get all tag values, including empty strings.</p> <p>Valid values are <code>AZ</code>, <code>INSTANCE_TYPE</code>, <code>LEGAL_ENTITY_NAME</code>, <code>LINKED_ACCOUNT</code>, <code>OPERATION</code>, <code>PLATFORM</code>, <code>PURCHASE_TYPE</code>, <code>SERVICE</code>, <code>TAGS</code>, <code>TENANCY</code>, and <code>USAGE_TYPE</code>.</p>"
+          "documentation":"<p>You can group AWS costs using up to two different groups, either dimensions, tag keys, or both.</p> <p>When you group by tag key, you get all tag values, including empty strings.</p> <p>Valid values are <code>AZ</code>, <code>INSTANCE_TYPE</code>, <code>LEGAL_ENTITY_NAME</code>, <code>LINKED_ACCOUNT</code>, <code>OPERATION</code>, <code>PLATFORM</code>, <code>PURCHASE_TYPE</code>, <code>SERVICE</code>, <code>TAGS</code>, <code>TENANCY</code>, <code>RECORD_TYPE</code>, and <code>USAGE_TYPE</code>.</p>"
         },
         "NextPageToken":{
           "shape":"NextPageToken",
@@ -682,6 +1023,53 @@
         }
       }
     },
+    "GetCostAndUsageWithResourcesRequest":{
+      "type":"structure",
+      "required":["TimePeriod"],
+      "members":{
+        "TimePeriod":{
+          "shape":"DateInterval",
+          "documentation":"<p>Sets the start and end dates for retrieving Amazon Web Services costs. The range must be within the last 14 days (the start date cannot be earlier than 14 days ago). The start date is inclusive, but the end date is exclusive. For example, if <code>start</code> is <code>2017-01-01</code> and <code>end</code> is <code>2017-05-01</code>, then the cost and usage data is retrieved from <code>2017-01-01</code> up to and including <code>2017-04-30</code> but not including <code>2017-05-01</code>.</p>"
+        },
+        "Granularity":{
+          "shape":"Granularity",
+          "documentation":"<p>Sets the AWS cost granularity to <code>MONTHLY</code>, <code>DAILY</code>, or <code>HOURLY</code>. If <code>Granularity</code> isn't set, the response object doesn't include the <code>Granularity</code>, <code>MONTHLY</code>, <code>DAILY</code>, or <code>HOURLY</code>. </p>"
+        },
+        "Filter":{
+          "shape":"Expression",
+          "documentation":"<p>Filters Amazon Web Services costs by different dimensions. For example, you can specify <code>SERVICE</code> and <code>LINKED_ACCOUNT</code> and get the costs that are associated with that account's usage of that service. You can nest <code>Expression</code> objects to define any combination of dimension filters. For more information, see <a href=\"http://docs.aws.amazon.com/aws-cost-management/latest/APIReference/API_Expression.html\">Expression</a>. </p> <p>The <code>GetCostAndUsageWithResources</code> operation requires that you either group by or filter by a <code>ResourceId</code>.</p>"
+        },
+        "Metrics":{
+          "shape":"MetricNames",
+          "documentation":"<p>Which metrics are returned in the query. For more information about blended and unblended rates, see <a href=\"https://aws.amazon.com/premiumsupport/knowledge-center/blended-rates-intro/\">Why does the \"blended\" annotation appear on some line items in my bill?</a>. </p> <p>Valid values are <code>AmortizedCost</code>, <code>BlendedCost</code>, <code>NetAmortizedCost</code>, <code>NetUnblendedCost</code>, <code>NormalizedUsageAmount</code>, <code>UnblendedCost</code>, and <code>UsageQuantity</code>. </p> <note> <p>If you return the <code>UsageQuantity</code> metric, the service aggregates all usage numbers without taking the units into account. For example, if you aggregate <code>usageQuantity</code> across all of Amazon EC2, the results aren't meaningful because Amazon EC2 compute hours and data transfer are measured in different units (for example, hours vs. GB). To get more meaningful <code>UsageQuantity</code> metrics, filter by <code>UsageType</code> or <code>UsageTypeGroups</code>. </p> </note> <p> <code>Metrics</code> is required for <code>GetCostAndUsageWithResources</code> requests.</p>"
+        },
+        "GroupBy":{
+          "shape":"GroupDefinitions",
+          "documentation":"<p>You can group Amazon Web Services costs using up to two different groups: either dimensions, tag keys, or both.</p>"
+        },
+        "NextPageToken":{
+          "shape":"NextPageToken",
+          "documentation":"<p>The token to retrieve the next set of results. AWS provides the token when the response from a previous call has more results than the maximum page size.</p>"
+        }
+      }
+    },
+    "GetCostAndUsageWithResourcesResponse":{
+      "type":"structure",
+      "members":{
+        "NextPageToken":{
+          "shape":"NextPageToken",
+          "documentation":"<p>The token for the next set of retrievable results. AWS provides the token when the response from a previous call has more results than the maximum page size.</p>"
+        },
+        "GroupDefinitions":{
+          "shape":"GroupDefinitions",
+          "documentation":"<p>The groups that are specified by the <code>Filter</code> or <code>GroupBy</code> parameters in the request.</p>"
+        },
+        "ResultsByTime":{
+          "shape":"ResultsByTime",
+          "documentation":"<p>The time period that is covered by the results in the response.</p>"
+        }
+      }
+    },
     "GetCostForecastRequest":{
       "type":"structure",
       "required":[
@@ -696,7 +1084,7 @@
         },
         "Metric":{
           "shape":"Metric",
-          "documentation":"<p>Which metric Cost Explorer uses to create your forecast. For more information about blended and unblended rates, see <a href=\"https://aws.amazon.com/premiumsupport/knowledge-center/blended-rates-intro/\">Why does the \"blended\" annotation appear on some line items in my bill?</a>. </p> <p>Valid values for a <code>GetCostForecast</code> call are the following:</p> <ul> <li> <p>AMORTIZED_COST</p> </li> <li> <p>BLENDED_COST</p> </li> <li> <p>NET_AMORTIZED_COST</p> </li> <li> <p>NET_UNBLENDED_COST</p> </li> <li> <p>UNBLENDED_COST</p> </li> </ul>"
+          "documentation":"<p>Which metric Cost Explorer uses to create your forecast. For more information about blended and unblended rates, see <a href=\"http://aws.amazon.com/premiumsupport/knowledge-center/blended-rates-intro/\">Why does the \"blended\" annotation appear on some line items in my bill?</a>. </p> <p>Valid values for a <code>GetCostForecast</code> call are the following:</p> <ul> <li> <p>AMORTIZED_COST</p> </li> <li> <p>BLENDED_COST</p> </li> <li> <p>NET_AMORTIZED_COST</p> </li> <li> <p>NET_UNBLENDED_COST</p> </li> <li> <p>UNBLENDED_COST</p> </li> </ul>"
         },
         "Granularity":{
           "shape":"Granularity",
@@ -742,11 +1130,11 @@
         },
         "Dimension":{
           "shape":"Dimension",
-          "documentation":"<p>The name of the dimension. Each <code>Dimension</code> is available for a different <code>Context</code>. For more information, see <code>Context</code>.</p>"
+          "documentation":"<p>The name of the dimension. Each <code>Dimension</code> is available for a different <code>Context</code>. For more information, see <code>Context</code>. </p>"
         },
         "Context":{
           "shape":"Context",
-          "documentation":"<p>The context for the call to <code>GetDimensionValues</code>. This can be <code>RESERVATIONS</code> or <code>COST_AND_USAGE</code>. The default value is <code>COST_AND_USAGE</code>. If the context is set to <code>RESERVATIONS</code>, the resulting dimension values can be used in the <code>GetReservationUtilization</code> operation. If the context is set to <code>COST_AND_USAGE</code>, the resulting dimension values can be used in the <code>GetCostAndUsage</code> operation.</p> <p>If you set the context to <code>COST_AND_USAGE</code>, you can use the following dimensions for searching:</p> <ul> <li> <p>AZ - The Availability Zone. An example is <code>us-east-1a</code>.</p> </li> <li> <p>DATABASE_ENGINE - The Amazon Relational Database Service database. Examples are Aurora or MySQL.</p> </li> <li> <p>INSTANCE_TYPE - The type of Amazon EC2 instance. An example is <code>m4.xlarge</code>.</p> </li> <li> <p>LEGAL_ENTITY_NAME - The name of the organization that sells you AWS services, such as Amazon Web Services.</p> </li> <li> <p>LINKED_ACCOUNT - The description in the attribute map that includes the full name of the member account. The value field contains the AWS ID of the member account.</p> </li> <li> <p>OPERATING_SYSTEM - The operating system. Examples are Windows or Linux.</p> </li> <li> <p>OPERATION - The action performed. Examples include <code>RunInstance</code> and <code>CreateBucket</code>.</p> </li> <li> <p>PLATFORM - The Amazon EC2 operating system. Examples are Windows or Linux.</p> </li> <li> <p>PURCHASE_TYPE - The reservation type of the purchase to which this usage is related. Examples include On-Demand Instances and Standard Reserved Instances.</p> </li> <li> <p>SERVICE - The AWS service such as Amazon DynamoDB.</p> </li> <li> <p>USAGE_TYPE - The type of usage. An example is DataTransfer-In-Bytes. The response for the <code>GetDimensionValues</code> operation includes a unit attribute. Examples include GB and Hrs.</p> </li> <li> <p>USAGE_TYPE_GROUP - The grouping of common usage types. An example is Amazon EC2: CloudWatch – Alarms. The response for this operation includes a unit attribute.</p> </li> <li> <p>RECORD_TYPE - The different types of charges such as RI fees, usage costs, tax refunds, and credits.</p> </li> </ul> <p>If you set the context to <code>RESERVATIONS</code>, you can use the following dimensions for searching:</p> <ul> <li> <p>AZ - The Availability Zone. An example is <code>us-east-1a</code>.</p> </li> <li> <p>CACHE_ENGINE - The Amazon ElastiCache operating system. Examples are Windows or Linux.</p> </li> <li> <p>DEPLOYMENT_OPTION - The scope of Amazon Relational Database Service deployments. Valid values are <code>SingleAZ</code> and <code>MultiAZ</code>.</p> </li> <li> <p>INSTANCE_TYPE - The type of Amazon EC2 instance. An example is <code>m4.xlarge</code>.</p> </li> <li> <p>LINKED_ACCOUNT - The description in the attribute map that includes the full name of the member account. The value field contains the AWS ID of the member account.</p> </li> <li> <p>PLATFORM - The Amazon EC2 operating system. Examples are Windows or Linux.</p> </li> <li> <p>REGION - The AWS Region.</p> </li> <li> <p>SCOPE (Utilization only) - The scope of a Reserved Instance (RI). Values are regional or a single Availability Zone.</p> </li> <li> <p>TAG (Coverage only) - The tags that are associated with a Reserved Instance (RI).</p> </li> <li> <p>TENANCY - The tenancy of a resource. Examples are shared or dedicated.</p> </li> </ul>"
+          "documentation":"<p>The context for the call to <code>GetDimensionValues</code>. This can be <code>RESERVATIONS</code> or <code>COST_AND_USAGE</code>. The default value is <code>COST_AND_USAGE</code>. If the context is set to <code>RESERVATIONS</code>, the resulting dimension values can be used in the <code>GetReservationUtilization</code> operation. If the context is set to <code>COST_AND_USAGE</code>, the resulting dimension values can be used in the <code>GetCostAndUsage</code> operation.</p> <p>If you set the context to <code>COST_AND_USAGE</code>, you can use the following dimensions for searching:</p> <ul> <li> <p>AZ - The Availability Zone. An example is <code>us-east-1a</code>.</p> </li> <li> <p>DATABASE_ENGINE - The Amazon Relational Database Service database. Examples are Aurora or MySQL.</p> </li> <li> <p>INSTANCE_TYPE - The type of Amazon EC2 instance. An example is <code>m4.xlarge</code>.</p> </li> <li> <p>LEGAL_ENTITY_NAME - The name of the organization that sells you AWS services, such as Amazon Web Services.</p> </li> <li> <p>LINKED_ACCOUNT - The description in the attribute map that includes the full name of the member account. The value field contains the AWS ID of the member account.</p> </li> <li> <p>OPERATING_SYSTEM - The operating system. Examples are Windows or Linux.</p> </li> <li> <p>OPERATION - The action performed. Examples include <code>RunInstance</code> and <code>CreateBucket</code>.</p> </li> <li> <p>PLATFORM - The Amazon EC2 operating system. Examples are Windows or Linux.</p> </li> <li> <p>PURCHASE_TYPE - The reservation type of the purchase to which this usage is related. Examples include On-Demand Instances and Standard Reserved Instances.</p> </li> <li> <p>SERVICE - The AWS service such as Amazon DynamoDB.</p> </li> <li> <p>USAGE_TYPE - The type of usage. An example is DataTransfer-In-Bytes. The response for the <code>GetDimensionValues</code> operation includes a unit attribute. Examples include GB and Hrs.</p> </li> <li> <p>USAGE_TYPE_GROUP - The grouping of common usage types. An example is Amazon EC2: CloudWatch – Alarms. The response for this operation includes a unit attribute.</p> </li> <li> <p>RECORD_TYPE - The different types of charges such as RI fees, usage costs, tax refunds, and credits.</p> </li> <li> <p>RESOURCE_ID - The unique identifier of the resource. ResourceId is an opt-in feature only available for last 14 days for EC2-Compute Service.</p> </li> </ul> <p>If you set the context to <code>RESERVATIONS</code>, you can use the following dimensions for searching:</p> <ul> <li> <p>AZ - The Availability Zone. An example is <code>us-east-1a</code>.</p> </li> <li> <p>CACHE_ENGINE - The Amazon ElastiCache operating system. Examples are Windows or Linux.</p> </li> <li> <p>DEPLOYMENT_OPTION - The scope of Amazon Relational Database Service deployments. Valid values are <code>SingleAZ</code> and <code>MultiAZ</code>.</p> </li> <li> <p>INSTANCE_TYPE - The type of Amazon EC2 instance. An example is <code>m4.xlarge</code>.</p> </li> <li> <p>LINKED_ACCOUNT - The description in the attribute map that includes the full name of the member account. The value field contains the AWS ID of the member account.</p> </li> <li> <p>PLATFORM - The Amazon EC2 operating system. Examples are Windows or Linux.</p> </li> <li> <p>REGION - The AWS Region.</p> </li> <li> <p>SCOPE (Utilization only) - The scope of a Reserved Instance (RI). Values are regional or a single Availability Zone.</p> </li> <li> <p>TAG (Coverage only) - The tags that are associated with a Reserved Instance (RI).</p> </li> <li> <p>TENANCY - The tenancy of a resource. Examples are shared or dedicated.</p> </li> </ul> <p>If you set the context to <code>SAVINGS_PLANS</code>, you can use the following dimensions for searching:</p> <ul> <li> <p>SAVINGS_PLANS_TYPE - Type of Savings Plans (EC2 Instance or Compute)</p> </li> <li> <p>PAYMENT_OPTION - Payment option for the given Savings Plans (for example, All Upfront)</p> </li> <li> <p>REGION - The AWS Region.</p> </li> <li> <p>INSTANCE_TYPE_FAMILY - The family of instances (For example, <code>m5</code>)</p> </li> <li> <p>LINKED_ACCOUNT - The description in the attribute map that includes the full name of the member account. The value field contains the AWS ID of the member account.</p> </li> <li> <p>SAVINGS_PLAN_ARN - The unique identifier for your Savings Plan</p> </li> </ul>"
         },
         "NextPageToken":{
           "shape":"NextPageToken",
@@ -764,7 +1152,7 @@
       "members":{
         "DimensionValues":{
           "shape":"DimensionValuesWithAttributesList",
-          "documentation":"<p>The filters that you used to filter your request. Some dimensions are available only for a specific context.</p> <p>If you set the context to <code>COST_AND_USAGE</code>, you can use the following dimensions for searching:</p> <ul> <li> <p>AZ - The Availability Zone. An example is <code>us-east-1a</code>.</p> </li> <li> <p>DATABASE_ENGINE - The Amazon Relational Database Service database. Examples are Aurora or MySQL.</p> </li> <li> <p>INSTANCE_TYPE - The type of Amazon EC2 instance. An example is <code>m4.xlarge</code>.</p> </li> <li> <p>LEGAL_ENTITY_NAME - The name of the organization that sells you AWS services, such as Amazon Web Services.</p> </li> <li> <p>LINKED_ACCOUNT - The description in the attribute map that includes the full name of the member account. The value field contains the AWS ID of the member account.</p> </li> <li> <p>OPERATING_SYSTEM - The operating system. Examples are Windows or Linux.</p> </li> <li> <p>OPERATION - The action performed. Examples include <code>RunInstance</code> and <code>CreateBucket</code>.</p> </li> <li> <p>PLATFORM - The Amazon EC2 operating system. Examples are Windows or Linux.</p> </li> <li> <p>PURCHASE_TYPE - The reservation type of the purchase to which this usage is related. Examples include On-Demand Instances and Standard Reserved Instances.</p> </li> <li> <p>SERVICE - The AWS service such as Amazon DynamoDB.</p> </li> <li> <p>USAGE_TYPE - The type of usage. An example is DataTransfer-In-Bytes. The response for the <code>GetDimensionValues</code> operation includes a unit attribute. Examples include GB and Hrs.</p> </li> <li> <p>USAGE_TYPE_GROUP - The grouping of common usage types. An example is Amazon EC2: CloudWatch – Alarms. The response for this operation includes a unit attribute.</p> </li> <li> <p>RECORD_TYPE - The different types of charges such as RI fees, usage costs, tax refunds, and credits.</p> </li> </ul> <p>If you set the context to <code>RESERVATIONS</code>, you can use the following dimensions for searching:</p> <ul> <li> <p>AZ - The Availability Zone. An example is <code>us-east-1a</code>.</p> </li> <li> <p>CACHE_ENGINE - The Amazon ElastiCache operating system. Examples are Windows or Linux.</p> </li> <li> <p>DEPLOYMENT_OPTION - The scope of Amazon Relational Database Service deployments. Valid values are <code>SingleAZ</code> and <code>MultiAZ</code>.</p> </li> <li> <p>INSTANCE_TYPE - The type of Amazon EC2 instance. An example is <code>m4.xlarge</code>.</p> </li> <li> <p>LINKED_ACCOUNT - The description in the attribute map that includes the full name of the member account. The value field contains the AWS ID of the member account.</p> </li> <li> <p>PLATFORM - The Amazon EC2 operating system. Examples are Windows or Linux.</p> </li> <li> <p>REGION - The AWS Region.</p> </li> <li> <p>SCOPE (Utilization only) - The scope of a Reserved Instance (RI). Values are regional or a single Availability Zone.</p> </li> <li> <p>TAG (Coverage only) - The tags that are associated with a Reserved Instance (RI).</p> </li> <li> <p>TENANCY - The tenancy of a resource. Examples are shared or dedicated.</p> </li> </ul>"
+          "documentation":"<p>The filters that you used to filter your request. Some dimensions are available only for a specific context.</p> <p>If you set the context to <code>COST_AND_USAGE</code>, you can use the following dimensions for searching:</p> <ul> <li> <p>AZ - The Availability Zone. An example is <code>us-east-1a</code>.</p> </li> <li> <p>DATABASE_ENGINE - The Amazon Relational Database Service database. Examples are Aurora or MySQL.</p> </li> <li> <p>INSTANCE_TYPE - The type of Amazon EC2 instance. An example is <code>m4.xlarge</code>.</p> </li> <li> <p>LEGAL_ENTITY_NAME - The name of the organization that sells you AWS services, such as Amazon Web Services.</p> </li> <li> <p>LINKED_ACCOUNT - The description in the attribute map that includes the full name of the member account. The value field contains the AWS ID of the member account.</p> </li> <li> <p>OPERATING_SYSTEM - The operating system. Examples are Windows or Linux.</p> </li> <li> <p>OPERATION - The action performed. Examples include <code>RunInstance</code> and <code>CreateBucket</code>.</p> </li> <li> <p>PLATFORM - The Amazon EC2 operating system. Examples are Windows or Linux.</p> </li> <li> <p>PURCHASE_TYPE - The reservation type of the purchase to which this usage is related. Examples include On-Demand Instances and Standard Reserved Instances.</p> </li> <li> <p>SERVICE - The AWS service such as Amazon DynamoDB.</p> </li> <li> <p>USAGE_TYPE - The type of usage. An example is DataTransfer-In-Bytes. The response for the <code>GetDimensionValues</code> operation includes a unit attribute. Examples include GB and Hrs.</p> </li> <li> <p>USAGE_TYPE_GROUP - The grouping of common usage types. An example is Amazon EC2: CloudWatch – Alarms. The response for this operation includes a unit attribute.</p> </li> <li> <p>RECORD_TYPE - The different types of charges such as RI fees, usage costs, tax refunds, and credits.</p> </li> <li> <p>RESOURCE_ID - The unique identifier of the resource. ResourceId is an opt-in feature only available for last 14 days for EC2-Compute Service.</p> </li> </ul> <p>If you set the context to <code>RESERVATIONS</code>, you can use the following dimensions for searching:</p> <ul> <li> <p>AZ - The Availability Zone. An example is <code>us-east-1a</code>.</p> </li> <li> <p>CACHE_ENGINE - The Amazon ElastiCache operating system. Examples are Windows or Linux.</p> </li> <li> <p>DEPLOYMENT_OPTION - The scope of Amazon Relational Database Service deployments. Valid values are <code>SingleAZ</code> and <code>MultiAZ</code>.</p> </li> <li> <p>INSTANCE_TYPE - The type of Amazon EC2 instance. An example is <code>m4.xlarge</code>.</p> </li> <li> <p>LINKED_ACCOUNT - The description in the attribute map that includes the full name of the member account. The value field contains the AWS ID of the member account.</p> </li> <li> <p>PLATFORM - The Amazon EC2 operating system. Examples are Windows or Linux.</p> </li> <li> <p>REGION - The AWS Region.</p> </li> <li> <p>SCOPE (Utilization only) - The scope of a Reserved Instance (RI). Values are regional or a single Availability Zone.</p> </li> <li> <p>TAG (Coverage only) - The tags that are associated with a Reserved Instance (RI).</p> </li> <li> <p>TENANCY - The tenancy of a resource. Examples are shared or dedicated.</p> </li> </ul> <p>If you set the context to <code>SAVINGS_PLANS</code>, you can use the following dimensions for searching:</p> <ul> <li> <p>SAVINGS_PLANS_TYPE - Type of Savings Plans (EC2 Instance or Compute)</p> </li> <li> <p>PAYMENT_OPTION - Payment option for the given Savings Plans (for example, All Upfront)</p> </li> <li> <p>REGION - The AWS Region.</p> </li> <li> <p>INSTANCE_TYPE_FAMILY - The family of instances (For example, <code>m5</code>)</p> </li> <li> <p>LINKED_ACCOUNT - The description in the attribute map that includes the full name of the member account. The value field contains the AWS ID of the member account.</p> </li> <li> <p>SAVINGS_PLAN_ARN - The unique identifier for your Savings Plan</p> </li> </ul>"
         },
         "ReturnSize":{
           "shape":"PageSize",
@@ -798,7 +1186,7 @@
         },
         "Filter":{
           "shape":"Expression",
-          "documentation":"<p>Filters utilization data by dimensions. You can filter by the following dimensions:</p> <ul> <li> <p>AZ</p> </li> <li> <p>CACHE_ENGINE</p> </li> <li> <p>DATABASE_ENGINE</p> </li> <li> <p>DEPLOYMENT_OPTION</p> </li> <li> <p>INSTANCE_TYPE</p> </li> <li> <p>LINKED_ACCOUNT</p> </li> <li> <p>OPERATING_SYSTEM</p> </li> <li> <p>PLATFORM</p> </li> <li> <p>REGION</p> </li> <li> <p>SERVICE</p> </li> <li> <p>TAG</p> </li> <li> <p>TENANCY</p> </li> </ul> <p> <code>GetReservationCoverage</code> uses the same <a href=\"http://docs.aws.amazon.com/aws-cost-management/latest/APIReference/API_Expression.html\">Expression</a> object as the other operations, but only <code>AND</code> is supported among each dimension. You can nest only one level deep. If there are multiple values for a dimension, they are OR'd together.</p> <p>If you don't provide a <code>SERVICE</code> filter, Cost Explorer defaults to EC2.</p>"
+          "documentation":"<p>Filters utilization data by dimensions. You can filter by the following dimensions:</p> <ul> <li> <p>AZ</p> </li> <li> <p>CACHE_ENGINE</p> </li> <li> <p>DATABASE_ENGINE</p> </li> <li> <p>DEPLOYMENT_OPTION</p> </li> <li> <p>INSTANCE_TYPE</p> </li> <li> <p>LINKED_ACCOUNT</p> </li> <li> <p>OPERATING_SYSTEM</p> </li> <li> <p>PLATFORM</p> </li> <li> <p>REGION</p> </li> <li> <p>SERVICE</p> </li> <li> <p>TAG</p> </li> <li> <p>TENANCY</p> </li> </ul> <p> <code>GetReservationCoverage</code> uses the same <a href=\"https://docs.aws.amazon.com/aws-cost-management/latest/APIReference/API_Expression.html\">Expression</a> object as the other operations, but only <code>AND</code> is supported among each dimension. You can nest only one level deep. If there are multiple values for a dimension, they are OR'd together.</p> <p>If you don't provide a <code>SERVICE</code> filter, Cost Explorer defaults to EC2.</p>"
         },
         "Metrics":{
           "shape":"MetricNames",
@@ -843,7 +1231,7 @@
         },
         "AccountScope":{
           "shape":"AccountScope",
-          "documentation":"<p>The account scope that you want recommendations for. <code>PAYER</code> means that AWS includes the master account and any member accounts when it calculates its recommendations. <code>LINKED</code> means that AWS includes only member accounts when it calculates its recommendations.</p> <p>Valid values are <code>PAYER</code> and <code>LINKED</code>.</p>"
+          "documentation":"<p>The account scope that you want your recommendations for. Amazon Web Services calculates recommendations including the payer account and linked accounts if the value is set to <code>PAYER</code>. If the value is <code>LINKED</code>, recommendations are calculated for individual linked accounts only.</p>"
         },
         "LookbackPeriodInDays":{
           "shape":"LookbackPeriodInDays",
@@ -906,7 +1294,7 @@
         },
         "Filter":{
           "shape":"Expression",
-          "documentation":"<p>Filters utilization data by dimensions. You can filter by the following dimensions:</p> <ul> <li> <p>AZ</p> </li> <li> <p>CACHE_ENGINE</p> </li> <li> <p>DATABASE_ENGINE</p> </li> <li> <p>DEPLOYMENT_OPTION</p> </li> <li> <p>INSTANCE_TYPE</p> </li> <li> <p>LINKED_ACCOUNT</p> </li> <li> <p>OPERATING_SYSTEM</p> </li> <li> <p>PLATFORM</p> </li> <li> <p>REGION</p> </li> <li> <p>SERVICE</p> </li> <li> <p>SCOPE</p> </li> <li> <p>TENANCY</p> </li> </ul> <p> <code>GetReservationUtilization</code> uses the same <a href=\"http://docs.aws.amazon.com/aws-cost-management/latest/APIReference/API_Expression.html\">Expression</a> object as the other operations, but only <code>AND</code> is supported among each dimension, and nesting is supported up to only one level deep. If there are multiple values for a dimension, they are OR'd together.</p>"
+          "documentation":"<p>Filters utilization data by dimensions. You can filter by the following dimensions:</p> <ul> <li> <p>AZ</p> </li> <li> <p>CACHE_ENGINE</p> </li> <li> <p>DEPLOYMENT_OPTION</p> </li> <li> <p>INSTANCE_TYPE</p> </li> <li> <p>LINKED_ACCOUNT</p> </li> <li> <p>OPERATING_SYSTEM</p> </li> <li> <p>PLATFORM</p> </li> <li> <p>REGION</p> </li> <li> <p>SERVICE</p> </li> <li> <p>SCOPE</p> </li> <li> <p>TENANCY</p> </li> </ul> <p> <code>GetReservationUtilization</code> uses the same <a href=\"https://docs.aws.amazon.com/aws-cost-management/latest/APIReference/API_Expression.html\">Expression</a> object as the other operations, but only <code>AND</code> is supported among each dimension, and nesting is supported up to only one level deep. If there are multiple values for a dimension, they are OR'd together.</p>"
         },
         "NextPageToken":{
           "shape":"NextPageToken",
@@ -939,7 +1327,7 @@
         "Filter":{"shape":"Expression"},
         "Service":{
           "shape":"GenericString",
-          "documentation":"<p>The specific service that you want recommendations for.</p>"
+          "documentation":"<p>The specific service that you want recommendations for. The only valid value for <code>GetRightsizingRecommendation</code> is \"<code>AmazonEC2</code>\".</p>"
         },
         "PageSize":{
           "shape":"NonNegativeInteger",
@@ -972,63 +1360,249 @@
         }
       }
     },
-    "GetTagsRequest":{
+    "GetSavingsPlansCoverageRequest":{
       "type":"structure",
       "required":["TimePeriod"],
       "members":{
-        "SearchString":{
-          "shape":"SearchString",
-          "documentation":"<p>The value that you want to search for.</p>"
-        },
         "TimePeriod":{
           "shape":"DateInterval",
-          "documentation":"<p>The start and end dates for retrieving the dimension values. The start date is inclusive, but the end date is exclusive. For example, if <code>start</code> is <code>2017-01-01</code> and <code>end</code> is <code>2017-05-01</code>, then the cost and usage data is retrieved from <code>2017-01-01</code> up to and including <code>2017-04-30</code> but not including <code>2017-05-01</code>.</p>"
+          "documentation":"<p>The time period that you want the usage and costs for. The <code>Start</code> date must be within 13 months. The <code>End</code> date must be after the <code>Start</code> date, and before the current date. Future dates can't be used as an <code>End</code> date.</p>"
         },
-        "TagKey":{
-          "shape":"TagKey",
-          "documentation":"<p>The key of the tag that you want to return values for.</p>"
+        "GroupBy":{
+          "shape":"GroupDefinitions",
+          "documentation":"<p>You can group the data using the attributes <code>INSTANCE_FAMILY</code>, <code>REGION</code>, or <code>SERVICE</code>.</p>"
         },
-        "NextPageToken":{
+        "Granularity":{
+          "shape":"Granularity",
+          "documentation":"<p>The granularity of the Amazon Web Services cost data for your Savings Plans. <code>Granularity</code> can't be set if <code>GroupBy</code> is set.</p> <p>The <code>GetSavingsPlansCoverage</code> operation supports only <code>DAILY</code> and <code>MONTHLY</code> granularities.</p>"
+        },
+        "Filter":{
+          "shape":"Expression",
+          "documentation":"<p>Filters Savings Plans coverage data by dimensions. You can filter data for Savings Plans usage with the following dimensions:</p> <ul> <li> <p> <code>LINKED_ACCOUNT</code> </p> </li> <li> <p> <code>REGION</code> </p> </li> <li> <p> <code>SERVICE</code> </p> </li> <li> <p> <code>INSTANCE_FAMILY</code> </p> </li> </ul> <p> <code>GetSavingsPlansCoverage</code> uses the same <a href=\"https://docs.aws.amazon.com/aws-cost-management/latest/APIReference/API_Expression.html\">Expression</a> object as the other operations, but only <code>AND</code> is supported among each dimension. If there are multiple values for a dimension, they are OR'd together.</p>"
+        },
+        "Metrics":{
+          "shape":"MetricNames",
+          "documentation":"<p>The measurement that you want your Savings Plans coverage reported in. The only valid value is <code>SpendCoveredBySavingsPlans</code>.</p>"
+        },
+        "NextToken":{
           "shape":"NextPageToken",
-          "documentation":"<p>The token to retrieve the next set of results. AWS provides the token when the response from a previous call has more results than the maximum page size.</p>"
+          "documentation":"<p>The token to retrieve the next set of results. Amazon Web Services provides the token when the response from a previous call has more results than the maximum page size.</p>"
+        },
+        "MaxResults":{
+          "shape":"MaxResults",
+          "documentation":"<p>The number of items to be returned in a response. The default is <code>20</code>, with a minimum value of <code>1</code>.</p>",
+          "box":true
         }
       }
     },
-    "GetTagsResponse":{
+    "GetSavingsPlansCoverageResponse":{
       "type":"structure",
-      "required":[
-        "Tags",
-        "ReturnSize",
-        "TotalSize"
-      ],
+      "required":["SavingsPlansCoverages"],
       "members":{
-        "NextPageToken":{
-          "shape":"NextPageToken",
-          "documentation":"<p>The token for the next set of retrievable results. AWS provides the token when the response from a previous call has more results than the maximum page size.</p>"
-        },
-        "Tags":{
-          "shape":"TagList",
-          "documentation":"<p>The tags that match your request.</p>"
-        },
-        "ReturnSize":{
-          "shape":"PageSize",
-          "documentation":"<p>The number of query results that AWS returns at a time.</p>"
+        "SavingsPlansCoverages":{
+          "shape":"SavingsPlansCoverages",
+          "documentation":"<p>The amount of spend that your Savings Plans covered.</p>"
         },
-        "TotalSize":{
-          "shape":"PageSize",
-          "documentation":"<p>The total number of query results.</p>"
+        "NextToken":{
+          "shape":"NextPageToken",
+          "documentation":"<p>The token to retrieve the next set of results. Amazon Web Services provides the token when the response from a previous call has more results than the maximum page size.</p>"
         }
       }
     },
-    "GetUsageForecastRequest":{
+    "GetSavingsPlansPurchaseRecommendationRequest":{
       "type":"structure",
       "required":[
-        "TimePeriod",
-        "Metric",
-        "Granularity"
+        "SavingsPlansType",
+        "TermInYears",
+        "PaymentOption",
+        "LookbackPeriodInDays"
       ],
       "members":{
-        "TimePeriod":{
+        "SavingsPlansType":{
+          "shape":"SupportedSavingsPlansType",
+          "documentation":"<p>The Savings Plans recommendation type requested.</p>"
+        },
+        "TermInYears":{
+          "shape":"TermInYears",
+          "documentation":"<p>The savings plan recommendation term used to generated these recommendations.</p>"
+        },
+        "PaymentOption":{
+          "shape":"PaymentOption",
+          "documentation":"<p>The payment option used to generate these recommendations.</p>"
+        },
+        "AccountScope":{
+          "shape":"AccountScope",
+          "documentation":"<p>The account scope that you want your recommendations for. Amazon Web Services calculates recommendations including the payer account and linked accounts if the value is set to <code>PAYER</code>. If the value is <code>LINKED</code>, recommendations are calculated for individual linked accounts only.</p>"
+        },
+        "NextPageToken":{
+          "shape":"NextPageToken",
+          "documentation":"<p>The token to retrieve the next set of results. Amazon Web Services provides the token when the response from a previous call has more results than the maximum page size.</p>"
+        },
+        "PageSize":{
+          "shape":"NonNegativeInteger",
+          "documentation":"<p>The number of recommendations that you want returned in a single response object.</p>"
+        },
+        "LookbackPeriodInDays":{
+          "shape":"LookbackPeriodInDays",
+          "documentation":"<p>The lookback period used to generate the recommendation.</p>"
+        },
+        "Filter":{
+          "shape":"Expression",
+          "documentation":"<p>You can filter your recommendations by Account ID with the <code>LINKED_ACCOUNT</code> dimension. To filter your recommendations by Account ID, specify <code>Key</code> as <code>LINKED_ACCOUNT</code> and <code>Value</code> as the comma-separated Acount ID(s) for which you want to see Savings Plans purchase recommendations.</p> <p>For GetSavingsPlansPurchaseRecommendation, the <code>Filter</code> does not include <code>CostCategories</code> or <code>Tags</code>. It only includes <code>Dimensions</code>. With <code>Dimensions</code>, <code>Key</code> must be <code>LINKED_ACCOUNT</code> and <code>Value</code> can be a single Account ID or multiple comma-separated Account IDs for which you want to see Savings Plans Purchase Recommendations. <code>AND</code> and <code>OR</code> operators are not supported.</p>"
+        }
+      }
+    },
+    "GetSavingsPlansPurchaseRecommendationResponse":{
+      "type":"structure",
+      "members":{
+        "Metadata":{
+          "shape":"SavingsPlansPurchaseRecommendationMetadata",
+          "documentation":"<p>Information regarding this specific recommendation set.</p>"
+        },
+        "SavingsPlansPurchaseRecommendation":{
+          "shape":"SavingsPlansPurchaseRecommendation",
+          "documentation":"<p>Contains your request parameters, Savings Plan Recommendations Summary, and Details.</p>"
+        },
+        "NextPageToken":{
+          "shape":"NextPageToken",
+          "documentation":"<p>The token for the next set of retrievable results. AWS provides the token when the response from a previous call has more results than the maximum page size.</p>"
+        }
+      }
+    },
+    "GetSavingsPlansUtilizationDetailsRequest":{
+      "type":"structure",
+      "required":["TimePeriod"],
+      "members":{
+        "TimePeriod":{
+          "shape":"DateInterval",
+          "documentation":"<p>The time period that you want the usage and costs for. The <code>Start</code> date must be within 13 months. The <code>End</code> date must be after the <code>Start</code> date, and before the current date. Future dates can't be used as an <code>End</code> date.</p>"
+        },
+        "Filter":{
+          "shape":"Expression",
+          "documentation":"<p>Filters Savings Plans utilization coverage data for active Savings Plans dimensions. You can filter data with the following dimensions:</p> <ul> <li> <p> <code>LINKED_ACCOUNT</code> </p> </li> <li> <p> <code>SAVINGS_PLAN_ARN</code> </p> </li> <li> <p> <code>REGION</code> </p> </li> <li> <p> <code>PAYMENT_OPTION</code> </p> </li> <li> <p> <code>INSTANCE_TYPE_FAMILY</code> </p> </li> </ul> <p> <code>GetSavingsPlansUtilizationDetails</code> uses the same <a href=\"https://docs.aws.amazon.com/aws-cost-management/latest/APIReference/API_Expression.html\">Expression</a> object as the other operations, but only <code>AND</code> is supported among each dimension.</p>"
+        },
+        "NextToken":{
+          "shape":"NextPageToken",
+          "documentation":"<p>The token to retrieve the next set of results. Amazon Web Services provides the token when the response from a previous call has more results than the maximum page size.</p>"
+        },
+        "MaxResults":{
+          "shape":"MaxResults",
+          "documentation":"<p>The number of items to be returned in a response. The default is <code>20</code>, with a minimum value of <code>1</code>.</p>",
+          "box":true
+        }
+      }
+    },
+    "GetSavingsPlansUtilizationDetailsResponse":{
+      "type":"structure",
+      "required":[
+        "SavingsPlansUtilizationDetails",
+        "TimePeriod"
+      ],
+      "members":{
+        "SavingsPlansUtilizationDetails":{
+          "shape":"SavingsPlansUtilizationDetails",
+          "documentation":"<p>Retrieves a single daily or monthly Savings Plans utilization rate and details for your account.</p>"
+        },
+        "Total":{
+          "shape":"SavingsPlansUtilizationAggregates",
+          "documentation":"<p>The total Savings Plans utilization, regardless of time period.</p>"
+        },
+        "TimePeriod":{"shape":"DateInterval"},
+        "NextToken":{
+          "shape":"NextPageToken",
+          "documentation":"<p>The token to retrieve the next set of results. Amazon Web Services provides the token when the response from a previous call has more results than the maximum page size.</p>"
+        }
+      }
+    },
+    "GetSavingsPlansUtilizationRequest":{
+      "type":"structure",
+      "required":["TimePeriod"],
+      "members":{
+        "TimePeriod":{
+          "shape":"DateInterval",
+          "documentation":"<p>The time period that you want the usage and costs for. The <code>Start</code> date must be within 13 months. The <code>End</code> date must be after the <code>Start</code> date, and before the current date. Future dates can't be used as an <code>End</code> date.</p>"
+        },
+        "Granularity":{
+          "shape":"Granularity",
+          "documentation":"<p>The granularity of the Amazon Web Services utillization data for your Savings Plans.</p> <p>The <code>GetSavingsPlansUtilization</code> operation supports only <code>DAILY</code> and <code>MONTHLY</code> granularities.</p>"
+        },
+        "Filter":{
+          "shape":"Expression",
+          "documentation":"<p>Filters Savings Plans utilization coverage data for active Savings Plans dimensions. You can filter data with the following dimensions:</p> <ul> <li> <p> <code>LINKED_ACCOUNT</code> </p> </li> <li> <p> <code>SAVINGS_PLAN_ARN</code> </p> </li> <li> <p> <code>SAVINGS_PLANS_TYPE</code> </p> </li> <li> <p> <code>REGION</code> </p> </li> <li> <p> <code>PAYMENT_OPTION</code> </p> </li> <li> <p> <code>INSTANCE_TYPE_FAMILY</code> </p> </li> </ul> <p> <code>GetSavingsPlansUtilization</code> uses the same <a href=\"https://docs.aws.amazon.com/aws-cost-management/latest/APIReference/API_Expression.html\">Expression</a> object as the other operations, but only <code>AND</code> is supported among each dimension.</p>"
+        }
+      }
+    },
+    "GetSavingsPlansUtilizationResponse":{
+      "type":"structure",
+      "required":["Total"],
+      "members":{
+        "SavingsPlansUtilizationsByTime":{
+          "shape":"SavingsPlansUtilizationsByTime",
+          "documentation":"<p>The amount of cost/commitment you used your Savings Plans. This allows you to specify date ranges.</p>"
+        },
+        "Total":{
+          "shape":"SavingsPlansUtilizationAggregates",
+          "documentation":"<p>The total amount of cost/commitment that you used your Savings Plans, regardless of date ranges.</p>"
+        }
+      }
+    },
+    "GetTagsRequest":{
+      "type":"structure",
+      "required":["TimePeriod"],
+      "members":{
+        "SearchString":{
+          "shape":"SearchString",
+          "documentation":"<p>The value that you want to search for.</p>"
+        },
+        "TimePeriod":{
+          "shape":"DateInterval",
+          "documentation":"<p>The start and end dates for retrieving the dimension values. The start date is inclusive, but the end date is exclusive. For example, if <code>start</code> is <code>2017-01-01</code> and <code>end</code> is <code>2017-05-01</code>, then the cost and usage data is retrieved from <code>2017-01-01</code> up to and including <code>2017-04-30</code> but not including <code>2017-05-01</code>.</p>"
+        },
+        "TagKey":{
+          "shape":"TagKey",
+          "documentation":"<p>The key of the tag that you want to return values for.</p>"
+        },
+        "NextPageToken":{
+          "shape":"NextPageToken",
+          "documentation":"<p>The token to retrieve the next set of results. AWS provides the token when the response from a previous call has more results than the maximum page size.</p>"
+        }
+      }
+    },
+    "GetTagsResponse":{
+      "type":"structure",
+      "required":[
+        "Tags",
+        "ReturnSize",
+        "TotalSize"
+      ],
+      "members":{
+        "NextPageToken":{
+          "shape":"NextPageToken",
+          "documentation":"<p>The token for the next set of retrievable results. AWS provides the token when the response from a previous call has more results than the maximum page size.</p>"
+        },
+        "Tags":{
+          "shape":"TagList",
+          "documentation":"<p>The tags that match your request.</p>"
+        },
+        "ReturnSize":{
+          "shape":"PageSize",
+          "documentation":"<p>The number of query results that AWS returns at a time.</p>"
+        },
+        "TotalSize":{
+          "shape":"PageSize",
+          "documentation":"<p>The total number of query results.</p>"
+        }
+      }
+    },
+    "GetUsageForecastRequest":{
+      "type":"structure",
+      "required":[
+        "TimePeriod",
+        "Metric",
+        "Granularity"
+      ],
+      "members":{
+        "TimePeriod":{
           "shape":"DateInterval",
           "documentation":"<p>The start and end dates of the period that you want to retrieve usage forecast for. The start date is inclusive, but the end date is exclusive. For example, if <code>start</code> is <code>2017-01-01</code> and <code>end</code> is <code>2017-05-01</code>, then the cost and usage data is retrieved from <code>2017-01-01</code> up to and including <code>2017-04-30</code> but not including <code>2017-05-01</code>.</p>"
         },
@@ -1104,7 +1678,8 @@
       "type":"string",
       "enum":[
         "DIMENSION",
-        "TAG"
+        "TAG",
+        "COST_CATEGORY"
       ]
     },
     "GroupDefinitions":{
@@ -1162,6 +1737,32 @@
       "documentation":"<p>You made too many calls in a short period of time. Try again later.</p>",
       "exception":true
     },
+    "ListCostCategoryDefinitionsRequest":{
+      "type":"structure",
+      "members":{
+        "EffectiveOn":{
+          "shape":"ZonedDateTime",
+          "documentation":"<p> The date when the Cost Category was effective. </p>"
+        },
+        "NextToken":{
+          "shape":"NextPageToken",
+          "documentation":"<p> The token to retrieve the next set of results. Amazon Web Services provides the token when the response from a previous call has more results than the maximum page size. </p> <p>You can use this information to retrieve the full Cost Category information using <code>DescribeCostCategory</code>.</p>"
+        }
+      }
+    },
+    "ListCostCategoryDefinitionsResponse":{
+      "type":"structure",
+      "members":{
+        "CostCategoryReferences":{
+          "shape":"CostCategoryReferencesList",
+          "documentation":"<p> A reference to a Cost Category containing enough information to identify the Cost Category. </p>"
+        },
+        "NextToken":{
+          "shape":"NextPageToken",
+          "documentation":"<p> The token to retrieve the next set of results. Amazon Web Services provides the token when the response from a previous call has more results than the maximum page size. </p>"
+        }
+      }
+    },
     "LookbackPeriodInDays":{
       "type":"string",
       "enum":[
@@ -1170,6 +1771,10 @@
         "SIXTY_DAYS"
       ]
     },
+    "MaxResults":{
+      "type":"integer",
+      "min":1
+    },
     "Metric":{
       "type":"string",
       "enum":[
@@ -1213,7 +1818,7 @@
       "members":{
         "TargetInstances":{
           "shape":"TargetInstancesList",
-          "documentation":"<p> Identifies whether this instance type is the Amazon Web Services default recommendation.</p>"
+          "documentation":"<p>Identifies whether this instance type is the Amazon Web Services default recommendation.</p>"
         }
       },
       "documentation":"<p> Details on the modification recommendation.</p>"
@@ -1515,7 +2120,7 @@
         },
         "EstimatedReservationCostForLookbackPeriod":{
           "shape":"GenericString",
-          "documentation":"<p>How much AWS estimates that you would have spent for all usage during the specified historical period if you had had a reservation.</p>"
+          "documentation":"<p>How much AWS estimates that you would have spent for all usage during the specified historical period if you had a reservation.</p>"
         },
         "UpfrontCost":{
           "shape":"GenericString",
@@ -1606,6 +2211,14 @@
       },
       "documentation":"<p>Details on the resource.</p>"
     },
+    "ResourceNotFoundException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p> The specified ARN in the request doesn't exist. </p>",
+      "exception":true
+    },
     "ResourceUtilization":{
       "type":"structure",
       "members":{
@@ -1719,7 +2332,377 @@
         "MODIFY"
       ]
     },
+    "SavingsPlanArn":{"type":"string"},
+    "SavingsPlansAmortizedCommitment":{
+      "type":"structure",
+      "members":{
+        "AmortizedRecurringCommitment":{
+          "shape":"GenericString",
+          "documentation":"<p>The amortized amount of your Savings Plans commitment that was purchased with either a <code>Partial</code> or a <code>NoUpfront</code>.</p>"
+        },
+        "AmortizedUpfrontCommitment":{
+          "shape":"GenericString",
+          "documentation":"<p>The amortized amount of your Savings Plans commitment that was purchased with an <code>Upfront</code> or <code>PartialUpfront</code> Savings Plans.</p>"
+        },
+        "TotalAmortizedCommitment":{
+          "shape":"GenericString",
+          "documentation":"<p>The total amortized amount of your Savings Plans commitment, regardless of your Savings Plans purchase method. </p>"
+        }
+      },
+      "documentation":"<p>The amortized amount of Savings Plans purchased in a specific account during a specific time interval.</p>"
+    },
+    "SavingsPlansCoverage":{
+      "type":"structure",
+      "members":{
+        "Attributes":{
+          "shape":"Attributes",
+          "documentation":"<p>The attribute that applies to a specific <code>Dimension</code>.</p>"
+        },
+        "Coverage":{
+          "shape":"SavingsPlansCoverageData",
+          "documentation":"<p>The amount of Savings Plans eligible usage that the Savings Plans covered.</p>"
+        },
+        "TimePeriod":{"shape":"DateInterval"}
+      },
+      "documentation":"<p>The amount of Savings Plans eligible usage that is covered by Savings Plans. All calculations consider the On-Demand equivalent of your Savings Plans usage.</p>"
+    },
+    "SavingsPlansCoverageData":{
+      "type":"structure",
+      "members":{
+        "SpendCoveredBySavingsPlans":{
+          "shape":"GenericString",
+          "documentation":"<p>The amount of your Amazon Web Services usage that is covered by a Savings Plans.</p>"
+        },
+        "OnDemandCost":{
+          "shape":"GenericString",
+          "documentation":"<p>The cost of your Amazon Web Services usage at the public On-Demand rate.</p>"
+        },
+        "TotalCost":{
+          "shape":"GenericString",
+          "documentation":"<p>The total cost of your Amazon Web Services usage, regardless of your purchase option.</p>"
+        },
+        "CoveragePercentage":{
+          "shape":"GenericString",
+          "documentation":"<p>The percentage of your existing Savings Planscovered usage, divided by all of your eligible Savings Plans usage in an account(or set of accounts).</p>"
+        }
+      },
+      "documentation":"<p>Specific coverage percentage, On-Demand costs, and spend covered by Savings Plans, and total Savings Plans costs for an account.</p>"
+    },
+    "SavingsPlansCoverages":{
+      "type":"list",
+      "member":{"shape":"SavingsPlansCoverage"}
+    },
+    "SavingsPlansDetails":{
+      "type":"structure",
+      "members":{
+        "Region":{
+          "shape":"GenericString",
+          "documentation":"<p>A collection of AWS resources in a geographic area. Each AWS Region is isolated and independent of the other Regions.</p>"
+        },
+        "InstanceFamily":{
+          "shape":"GenericString",
+          "documentation":"<p>A group of instance types that Savings Plans applies to.</p>"
+        },
+        "OfferingId":{
+          "shape":"GenericString",
+          "documentation":"<p>The unique ID used to distinguish Savings Plans from one another.</p>"
+        }
+      },
+      "documentation":"<p>Attribute details on a specific Savings Plan.</p>"
+    },
+    "SavingsPlansPurchaseRecommendation":{
+      "type":"structure",
+      "members":{
+        "AccountScope":{
+          "shape":"AccountScope",
+          "documentation":"<p>The account scope that you want your recommendations for. Amazon Web Services calculates recommendations including the payer account and linked accounts if the value is set to <code>PAYER</code>. If the value is <code>LINKED</code>, recommendations are calculated for individual linked accounts only.</p>"
+        },
+        "SavingsPlansType":{
+          "shape":"SupportedSavingsPlansType",
+          "documentation":"<p>The requested Savings Plans recommendation type.</p>"
+        },
+        "TermInYears":{
+          "shape":"TermInYears",
+          "documentation":"<p>The Savings Plans recommendation term in years, used to generate the recommendation.</p>"
+        },
+        "PaymentOption":{
+          "shape":"PaymentOption",
+          "documentation":"<p>The payment option used to generate the recommendation.</p>"
+        },
+        "LookbackPeriodInDays":{
+          "shape":"LookbackPeriodInDays",
+          "documentation":"<p>The lookback period in days, used to generate the recommendation.</p>"
+        },
+        "SavingsPlansPurchaseRecommendationDetails":{
+          "shape":"SavingsPlansPurchaseRecommendationDetailList",
+          "documentation":"<p>Details for the Savings Plans we recommend you to purchase to cover existing, Savings Plans eligible workloads.</p>"
+        },
+        "SavingsPlansPurchaseRecommendationSummary":{
+          "shape":"SavingsPlansPurchaseRecommendationSummary",
+          "documentation":"<p>Summary metrics for your Savings Plans Recommendations. </p>"
+        }
+      },
+      "documentation":"<p>Contains your request parameters, Savings Plan Recommendations Summary, and Details.</p>"
+    },
+    "SavingsPlansPurchaseRecommendationDetail":{
+      "type":"structure",
+      "members":{
+        "SavingsPlansDetails":{
+          "shape":"SavingsPlansDetails",
+          "documentation":"<p>Details for your recommended Savings Plans.</p>"
+        },
+        "AccountId":{
+          "shape":"GenericString",
+          "documentation":"<p>The <code>AccountID</code> the recommendation is generated for.</p>"
+        },
+        "UpfrontCost":{
+          "shape":"GenericString",
+          "documentation":"<p>The upfront cost of the recommended Savings Plans, based on the selected payment option.</p>"
+        },
+        "EstimatedROI":{
+          "shape":"GenericString",
+          "documentation":"<p>The estimated return on investment based on the recommended Savings Plans purchased. This is calculated as <code>estimatedSavingsAmount</code>/ <code>estimatedSPCost</code>*100.</p>"
+        },
+        "CurrencyCode":{
+          "shape":"GenericString",
+          "documentation":"<p>The currency code Amazon Web Services used to generate the recommendations and present potential savings.</p>"
+        },
+        "EstimatedSPCost":{
+          "shape":"GenericString",
+          "documentation":"<p>The cost of the recommended Savings Plans over the length of the lookback period.</p>"
+        },
+        "EstimatedOnDemandCost":{
+          "shape":"GenericString",
+          "documentation":"<p>The remaining On-Demand cost estimated to not be covered by the recommended Savings Plans, over the length of the lookback period.</p>"
+        },
+        "EstimatedOnDemandCostWithCurrentCommitment":{
+          "shape":"GenericString",
+          "documentation":"<p> The estimated On-Demand costs you would expect with no additional commitment, based on your usage of the selected time period and the Savings Plans you own. </p>"
+        },
+        "EstimatedSavingsAmount":{
+          "shape":"GenericString",
+          "documentation":"<p>The estimated savings amount based on the recommended Savings Plans over the length of the lookback period.</p>"
+        },
+        "EstimatedSavingsPercentage":{
+          "shape":"GenericString",
+          "documentation":"<p>The estimated savings percentage relative to the total cost of applicable On-Demand usage over the lookback period.</p>"
+        },
+        "HourlyCommitmentToPurchase":{
+          "shape":"GenericString",
+          "documentation":"<p>The recommended hourly commitment level for the Savings Plans type, and configuration based on the usage during the lookback period.</p>"
+        },
+        "EstimatedAverageUtilization":{
+          "shape":"GenericString",
+          "documentation":"<p>The estimated utilization of the recommended Savings Plans.</p>"
+        },
+        "EstimatedMonthlySavingsAmount":{
+          "shape":"GenericString",
+          "documentation":"<p>The estimated monthly savings amount, based on the recommended Savings Plans.</p>"
+        },
+        "CurrentMinimumHourlyOnDemandSpend":{
+          "shape":"GenericString",
+          "documentation":"<p>The lowest value of hourly On-Demand spend over the lookback period of the applicable usage type.</p>"
+        },
+        "CurrentMaximumHourlyOnDemandSpend":{
+          "shape":"GenericString",
+          "documentation":"<p>The highest value of hourly On-Demand spend over the lookback period of the applicable usage type.</p>"
+        },
+        "CurrentAverageHourlyOnDemandSpend":{
+          "shape":"GenericString",
+          "documentation":"<p>The average value of hourly On-Demand spend over the lookback period of the applicable usage type.</p>"
+        }
+      },
+      "documentation":"<p>Details for your recommended Savings Plans.</p>"
+    },
+    "SavingsPlansPurchaseRecommendationDetailList":{
+      "type":"list",
+      "member":{"shape":"SavingsPlansPurchaseRecommendationDetail"}
+    },
+    "SavingsPlansPurchaseRecommendationMetadata":{
+      "type":"structure",
+      "members":{
+        "RecommendationId":{
+          "shape":"GenericString",
+          "documentation":"<p>The unique identifier for the recommendation set.</p>"
+        },
+        "GenerationTimestamp":{
+          "shape":"GenericString",
+          "documentation":"<p>The timestamp showing when the recommendations were generated.</p>"
+        }
+      },
+      "documentation":"<p>Metadata about your Savings Plans Purchase Recommendations.</p>"
+    },
+    "SavingsPlansPurchaseRecommendationSummary":{
+      "type":"structure",
+      "members":{
+        "EstimatedROI":{
+          "shape":"GenericString",
+          "documentation":"<p>The estimated return on investment based on the recommended Savings Plans and estimated savings.</p>"
+        },
+        "CurrencyCode":{
+          "shape":"GenericString",
+          "documentation":"<p>The currency code Amazon Web Services used to generate the recommendations and present potential savings.</p>"
+        },
+        "EstimatedTotalCost":{
+          "shape":"GenericString",
+          "documentation":"<p>The estimated total cost of the usage after purchasing the recommended Savings Plans. This is a sum of the cost of Savings Plans during this term, and the remaining On-Demand usage.</p>"
+        },
+        "CurrentOnDemandSpend":{
+          "shape":"GenericString",
+          "documentation":"<p>The current total on demand spend of the applicable usage types over the lookback period.</p>"
+        },
+        "EstimatedSavingsAmount":{
+          "shape":"GenericString",
+          "documentation":"<p>The estimated total savings over the lookback period, based on the purchase of the recommended Savings Plans.</p>"
+        },
+        "TotalRecommendationCount":{
+          "shape":"GenericString",
+          "documentation":"<p>The aggregate number of Savings Plans recommendations that exist for your account.</p>"
+        },
+        "DailyCommitmentToPurchase":{
+          "shape":"GenericString",
+          "documentation":"<p>The recommended Savings Plans cost on a daily (24 hourly) basis.</p>"
+        },
+        "HourlyCommitmentToPurchase":{
+          "shape":"GenericString",
+          "documentation":"<p>The recommended hourly commitment based on the recommendation parameters.</p>"
+        },
+        "EstimatedSavingsPercentage":{
+          "shape":"GenericString",
+          "documentation":"<p>The estimated savings relative to the total cost of On-Demand usage, over the lookback period. This is calculated as <code>estimatedSavingsAmount</code>/ <code>CurrentOnDemandSpend</code>*100.</p>"
+        },
+        "EstimatedMonthlySavingsAmount":{
+          "shape":"GenericString",
+          "documentation":"<p>The estimated monthly savings amount, based on the recommended Savings Plans purchase.</p>"
+        },
+        "EstimatedOnDemandCostWithCurrentCommitment":{
+          "shape":"GenericString",
+          "documentation":"<p> The estimated On-Demand costs you would expect with no additional commitment, based on your usage of the selected time period and the Savings Plans you own. </p>"
+        }
+      },
+      "documentation":"<p>Summary metrics for your Savings Plans Purchase Recommendations.</p>"
+    },
+    "SavingsPlansSavings":{
+      "type":"structure",
+      "members":{
+        "NetSavings":{
+          "shape":"GenericString",
+          "documentation":"<p>The savings amount that you are accumulating for the usage that is covered by a Savings Plans, when compared to the On-Demand equivalent of the same usage.</p>"
+        },
+        "OnDemandCostEquivalent":{
+          "shape":"GenericString",
+          "documentation":"<p>How much the amount that the usage would have cost if it was accrued at the On-Demand rate.</p>"
+        }
+      },
+      "documentation":"<p>The amount of savings you're accumulating, against the public On-Demand rate of the usage accrued in an account.</p>"
+    },
+    "SavingsPlansUtilization":{
+      "type":"structure",
+      "members":{
+        "TotalCommitment":{
+          "shape":"GenericString",
+          "documentation":"<p>The total amount of Savings Plans commitment that's been purchased in an account (or set of accounts).</p>"
+        },
+        "UsedCommitment":{
+          "shape":"GenericString",
+          "documentation":"<p>The amount of your Savings Plans commitment that was consumed from Savings Plans eligible usage in a specific period.</p>"
+        },
+        "UnusedCommitment":{
+          "shape":"GenericString",
+          "documentation":"<p>The amount of your Savings Plans commitment that was not consumed from Savings Plans eligible usage in a specific period.</p>"
+        },
+        "UtilizationPercentage":{
+          "shape":"GenericString",
+          "documentation":"<p>The amount of <code>UsedCommitment</code> divided by the <code>TotalCommitment</code> for your Savings Plans.</p>"
+        }
+      },
+      "documentation":"<p>The measurement of how well you are using your existing Savings Plans.</p>"
+    },
+    "SavingsPlansUtilizationAggregates":{
+      "type":"structure",
+      "required":["Utilization"],
+      "members":{
+        "Utilization":{
+          "shape":"SavingsPlansUtilization",
+          "documentation":"<p>A ratio of your effectiveness of using existing Savings Plans to apply to workloads that are Savings Plans eligible.</p>"
+        },
+        "Savings":{
+          "shape":"SavingsPlansSavings",
+          "documentation":"<p>The amount saved by using existing Savings Plans. Savings returns both net savings from Savings Plans, as well as the <code>onDemandCostEquivalent</code> of the Savings Plans when considering the utilization rate.</p>"
+        },
+        "AmortizedCommitment":{
+          "shape":"SavingsPlansAmortizedCommitment",
+          "documentation":"<p>The total amortized commitment for a Savings Plans. This includes the sum of the upfront and recurring Savings Plans fees.</p>"
+        }
+      },
+      "documentation":"<p>The aggregated utilization metrics for your Savings Plans usage.</p>"
+    },
+    "SavingsPlansUtilizationByTime":{
+      "type":"structure",
+      "required":[
+        "TimePeriod",
+        "Utilization"
+      ],
+      "members":{
+        "TimePeriod":{"shape":"DateInterval"},
+        "Utilization":{
+          "shape":"SavingsPlansUtilization",
+          "documentation":"<p>A ratio of your effectiveness of using existing Savings Plans to apply to workloads that are Savings Plans eligible.</p>"
+        },
+        "Savings":{
+          "shape":"SavingsPlansSavings",
+          "documentation":"<p>The amount saved by using existing Savings Plans. Savings returns both net savings from Savings Plans as well as the <code>onDemandCostEquivalent</code> of the Savings Plans when considering the utilization rate.</p>"
+        },
+        "AmortizedCommitment":{
+          "shape":"SavingsPlansAmortizedCommitment",
+          "documentation":"<p>The total amortized commitment for a Savings Plans. This includes the sum of the upfront and recurring Savings Plans fees.</p>"
+        }
+      },
+      "documentation":"<p>The amount of Savings Plans utilization, in hours.</p>"
+    },
+    "SavingsPlansUtilizationDetail":{
+      "type":"structure",
+      "members":{
+        "SavingsPlanArn":{
+          "shape":"SavingsPlanArn",
+          "documentation":"<p>The unique Amazon Resource Name (ARN) for a particular Savings Plan.</p>"
+        },
+        "Attributes":{
+          "shape":"Attributes",
+          "documentation":"<p>The attribute that applies to a specific <code>Dimension</code>.</p>"
+        },
+        "Utilization":{
+          "shape":"SavingsPlansUtilization",
+          "documentation":"<p>A ratio of your effectiveness of using existing Savings Plans to apply to workloads that are Savings Plans eligible.</p>"
+        },
+        "Savings":{
+          "shape":"SavingsPlansSavings",
+          "documentation":"<p>The amount saved by using existing Savings Plans. Savings returns both net savings from savings plans as well as the <code>onDemandCostEquivalent</code> of the Savings Plans when considering the utilization rate.</p>"
+        },
+        "AmortizedCommitment":{
+          "shape":"SavingsPlansAmortizedCommitment",
+          "documentation":"<p>The total amortized commitment for a Savings Plans. Includes the sum of the upfront and recurring Savings Plans fees.</p>"
+        }
+      },
+      "documentation":"<p>A single daily or monthly Savings Plans utilization rate, and details for your account. Master accounts in an organization have access to member accounts. You can use <code>GetDimensionValues</code> to determine the possible dimension values. </p>"
+    },
+    "SavingsPlansUtilizationDetails":{
+      "type":"list",
+      "member":{"shape":"SavingsPlansUtilizationDetail"}
+    },
+    "SavingsPlansUtilizationsByTime":{
+      "type":"list",
+      "member":{"shape":"SavingsPlansUtilizationByTime"}
+    },
     "SearchString":{"type":"string"},
+    "ServiceQuotaExceededException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p> You've reached the limit on the number of resources you can create, or exceeded the size of an individual resources. </p>",
+      "exception":true
+    },
     "ServiceSpecification":{
       "type":"structure",
       "members":{
@@ -1730,6 +2713,13 @@
       },
       "documentation":"<p>Hardware specifications for the service that you want recommendations for.</p>"
     },
+    "SupportedSavingsPlansType":{
+      "type":"string",
+      "enum":[
+        "COMPUTE_SP",
+        "EC2_INSTANCE_SP"
+      ]
+    },
     "TagKey":{"type":"string"},
     "TagList":{
       "type":"list",
@@ -1824,6 +2814,38 @@
     },
     "UnusedHours":{"type":"string"},
     "UnusedUnits":{"type":"string"},
+    "UpdateCostCategoryDefinitionRequest":{
+      "type":"structure",
+      "required":[
+        "CostCategoryArn",
+        "RuleVersion",
+        "Rules"
+      ],
+      "members":{
+        "CostCategoryArn":{
+          "shape":"Arn",
+          "documentation":"<p>The unique identifier for your Cost Category.</p>"
+        },
+        "RuleVersion":{"shape":"CostCategoryRuleVersion"},
+        "Rules":{
+          "shape":"CostCategoryRulesList",
+          "documentation":"<p> <code>UpdateCostCategoryDefinition</code> supports dimensions, Tags, and nested expressions. Currently the only dimensions supported is <code>LINKED_ACCOUNT</code>.</p> <p>Root level <code>OR</code> is not supported. We recommend you create a separate rule instead.</p> <p>Rules are processed in order. If there are multiple rules that match the line item, then the first rule to match is used to determine that Cost Category value. </p>"
+        }
+      }
+    },
+    "UpdateCostCategoryDefinitionResponse":{
+      "type":"structure",
+      "members":{
+        "CostCategoryArn":{
+          "shape":"Arn",
+          "documentation":"<p> The unique identifier for your Cost Category. </p>"
+        },
+        "EffectiveStart":{
+          "shape":"ZonedDateTime",
+          "documentation":"<p> The Cost Category's effective start date. </p>"
+        }
+      }
+    },
     "UtilizationByTime":{
       "type":"structure",
       "members":{
@@ -1856,7 +2878,14 @@
     "YearMonthDay":{
       "type":"string",
       "pattern":"(\\d{4}-\\d{2}-\\d{2})(T\\d{2}:\\d{2}:\\d{2}Z)?"
+    },
+    "ZonedDateTime":{
+      "type":"string",
+      "documentation":"<p>The time period that you want the usage and costs for.</p>",
+      "max":25,
+      "min":20,
+      "pattern":"^\\d{4}-\\d\\d-\\d\\dT\\d\\d:\\d\\d:\\d\\d(([+-]\\d\\d:\\d\\d)|Z)$"
     }
   },
-  "documentation":"<p>The Cost Explorer API enables you to programmatically query your cost and usage data. You can query for aggregated data such as total monthly costs or total daily usage. You can also query for granular data, such as the number of daily write operations for Amazon DynamoDB database tables in your production environment. </p> <p>Service Endpoint</p> <p>The Cost Explorer API provides the following endpoint:</p> <ul> <li> <p> <code>https://ce.us-east-1.amazonaws.com</code> </p> </li> </ul> <p>For information about costs associated with the Cost Explorer API, see <a href=\"https://aws.amazon.com/aws-cost-management/pricing/\">AWS Cost Management Pricing</a>.</p>"
+  "documentation":"<p>The Cost Explorer API enables you to programmatically query your cost and usage data. You can query for aggregated data such as total monthly costs or total daily usage. You can also query for granular data, such as the number of daily write operations for Amazon DynamoDB database tables in your production environment. </p> <p>Service Endpoint</p> <p>The Cost Explorer API provides the following endpoint:</p> <ul> <li> <p> <code>https://ce.us-east-1.amazonaws.com</code> </p> </li> </ul> <p>For information about costs associated with the Cost Explorer API, see <a href=\"http://aws.amazon.com/aws-cost-management/pricing/\">AWS Cost Management Pricing</a>.</p>"
 }
diff --git a/services/databasemigration/build.properties b/services/databasemigration/build.properties
index ecf2dae6fcb1..15ec2da1fc71 100644
--- a/services/databasemigration/build.properties
+++ b/services/databasemigration/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/databasemigration/pom.xml b/services/databasemigration/pom.xml
index b1568fcd3057..732780100c4c 100644
--- a/services/databasemigration/pom.xml
+++ b/services/databasemigration/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>databasemigration</artifactId>
     <name>AWS Java SDK :: Services :: AWS Database Migration Service</name>
diff --git a/services/databasemigration/src/main/resources/codegen-resources/service-2.json b/services/databasemigration/src/main/resources/codegen-resources/service-2.json
index 10909d832e69..b49f89f66b5a 100644
--- a/services/databasemigration/src/main/resources/codegen-resources/service-2.json
+++ b/services/databasemigration/src/main/resources/codegen-resources/service-2.json
@@ -98,7 +98,7 @@
         {"shape":"InvalidSubnet"},
         {"shape":"KMSKeyNotAccessibleFault"}
       ],
-      "documentation":"<p>Creates the replication instance using the specified parameters.</p>"
+      "documentation":"<p>Creates the replication instance using the specified parameters.</p> <p>AWS DMS requires that your account have certain roles with appropriate permissions before you can create a replication instance. For information on the required roles, see <a href=\"https://docs.aws.amazon.com/dms/latest/userguide/CHAP_Security.APIRole.html\">Creating the IAM Roles to Use With the AWS CLI and AWS DMS API</a>. For information on the required permissions, see <a href=\"https://docs.aws.amazon.com/dms/latest/userguide/CHAP_Security.IAMPermissions.html\">IAM Permissions Needed to Use AWS DMS</a>.</p>"
     },
     "CreateReplicationSubnetGroup":{
       "name":"CreateReplicationSubnetGroup",
@@ -805,10 +805,10 @@
       "members":{
         "Name":{
           "shape":"String",
-          "documentation":"<p>The name of the availability zone.</p>"
+          "documentation":"<p>The name of the Availability Zone.</p>"
         }
       },
-      "documentation":"<p/>"
+      "documentation":"<p>The name of the Availability Zone for use during database migration.</p>"
     },
     "AvailabilityZonesList":{
       "type":"list",
@@ -821,7 +821,7 @@
       "members":{
         "CertificateIdentifier":{
           "shape":"String",
-          "documentation":"<p>A customer-assigned name for the certificate. Identifiers must begin with a letter; must contain only ASCII letters, digits, and hyphens; and must not end with a hyphen or contain two consecutive hyphens.</p>"
+          "documentation":"<p>A customer-assigned name for the certificate. Identifiers must begin with a letter and must contain only ASCII letters, digits, and hyphens. They can't end with a hyphen or contain two consecutive hyphens.</p>"
         },
         "CertificateCreationDate":{
           "shape":"TStamp",
@@ -879,11 +879,11 @@
       "members":{
         "ReplicationInstanceArn":{
           "shape":"String",
-          "documentation":"<p>The Amazon Resource Name (ARN) of the replication instance.</p>"
+          "documentation":"<p>The ARN of the replication instance.</p>"
         },
         "EndpointArn":{
           "shape":"String",
-          "documentation":"<p>The Amazon Resource Name (ARN) string that uniquely identifies the endpoint.</p>"
+          "documentation":"<p>The ARN string that uniquely identifies the endpoint.</p>"
         },
         "Status":{
           "shape":"String",
@@ -895,14 +895,14 @@
         },
         "EndpointIdentifier":{
           "shape":"String",
-          "documentation":"<p>The identifier of the endpoint. Identifiers must begin with a letter; must contain only ASCII letters, digits, and hyphens; and must not end with a hyphen or contain two consecutive hyphens.</p>"
+          "documentation":"<p>The identifier of the endpoint. Identifiers must begin with a letter and must contain only ASCII letters, digits, and hyphens. They can't end with a hyphen or contain two consecutive hyphens.</p>"
         },
         "ReplicationInstanceIdentifier":{
           "shape":"String",
           "documentation":"<p>The replication instance identifier. This parameter is stored as a lowercase string.</p>"
         }
       },
-      "documentation":"<p/>"
+      "documentation":"<p>Status of the connection between an endpoint and a replication instance, including Amazon Resource Names (ARNs) and the last error message issued.</p>"
     },
     "ConnectionList":{
       "type":"list",
@@ -918,7 +918,7 @@
       "members":{
         "EndpointIdentifier":{
           "shape":"String",
-          "documentation":"<p>The database endpoint identifier. Identifiers must begin with a letter; must contain only ASCII letters, digits, and hyphens; and must not end with a hyphen or contain two consecutive hyphens.</p>"
+          "documentation":"<p>The database endpoint identifier. Identifiers must begin with a letter and must contain only ASCII letters, digits, and hyphens. They can't end with a hyphen or contain two consecutive hyphens.</p>"
         },
         "EndpointType":{
           "shape":"ReplicationEndpointTypeValue",
@@ -926,7 +926,7 @@
         },
         "EngineName":{
           "shape":"String",
-          "documentation":"<p>The type of engine for the endpoint. Valid values, depending on the <code>EndpointType</code> value, include <code>mysql</code>, <code>oracle</code>, <code>postgres</code>, <code>mariadb</code>, <code>aurora</code>, <code>aurora-postgresql</code>, <code>redshift</code>, <code>s3</code>, <code>db2</code>, <code>azuredb</code>, <code>sybase</code>, <code>dynamodb</code>, <code>mongodb</code>, and <code>sqlserver</code>.</p>"
+          "documentation":"<p>The type of engine for the endpoint. Valid values, depending on the <code>EndpointType</code> value, include <code>\"mysql\"</code>, <code>\"oracle\"</code>, <code>\"postgres\"</code>, <code>\"mariadb\"</code>, <code>\"aurora\"</code>, <code>\"aurora-postgresql\"</code>, <code>\"redshift\"</code>, <code>\"s3\"</code>, <code>\"db2\"</code>, <code>\"azuredb\"</code>, <code>\"sybase\"</code>, <code>\"dynamodb\"</code>, <code>\"mongodb\"</code>, <code>\"kinesis\"</code>, <code>\"kafka\"</code>, <code>\"elasticsearch\"</code>, <code>\"documentdb\"</code>, and <code>\"sqlserver\"</code>.</p>"
         },
         "Username":{
           "shape":"String",
@@ -978,7 +978,7 @@
         },
         "DynamoDbSettings":{
           "shape":"DynamoDbSettings",
-          "documentation":"<p>Settings in JSON format for the target Amazon DynamoDB endpoint. For more information about the available settings, see <a href=\"https://docs.aws.amazon.com/dms/latest/userguide/CHAP_Target.DynamoDB.html\">Using Object Mapping to Migrate Data to DynamoDB</a> in the <i>AWS Database Migration Service User Guide.</i> </p>"
+          "documentation":"<p>Settings in JSON format for the target Amazon DynamoDB endpoint. For information about other available settings, see <a href=\"https://docs.aws.amazon.com/dms/latest/userguide/CHAP_Target.DynamoDB.html\">Using Object Mapping to Migrate Data to DynamoDB</a> in the <i>AWS Database Migration Service User Guide.</i> </p>"
         },
         "S3Settings":{
           "shape":"S3Settings",
@@ -990,11 +990,15 @@
         },
         "MongoDbSettings":{
           "shape":"MongoDbSettings",
-          "documentation":"<p>Settings in JSON format for the source MongoDB endpoint. For more information about the available settings, see the configuration properties section in <a href=\"https://docs.aws.amazon.com/dms/latest/userguide/CHAP_Source.MongoDB.html\"> Using MongoDB as a Target for AWS Database Migration Service</a> in the <i>AWS Database Migration Service User Guide.</i> </p>"
+          "documentation":"<p>Settings in JSON format for the source MongoDB endpoint. For more information about the available settings, see the configuration properties section in <a href=\"https://docs.aws.amazon.com/dms/latest/userguide/CHAP_Source.MongoDB.html\">Using MongoDB as a Target for AWS Database Migration Service</a> in the <i>AWS Database Migration Service User Guide.</i> </p>"
         },
         "KinesisSettings":{
           "shape":"KinesisSettings",
-          "documentation":"<p>Settings in JSON format for the target Amazon Kinesis Data Streams endpoint. For more information about the available settings, see <a href=\"https://docs.aws.amazon.com/dms/latest/userguide/CHAP_Target.Kinesis.html#CHAP_Target.Kinesis.ObjectMapping\">Using Object Mapping to Migrate Data to a Kinesis Data Stream</a> in the <i>AWS Database Migration User Guide.</i> </p>"
+          "documentation":"<p>Settings in JSON format for the target endpoint for Amazon Kinesis Data Streams. For information about other available settings, see <a href=\"https://docs.aws.amazon.com/dms/latest/userguide/CHAP_Target.Kinesis.html#CHAP_Target.Kinesis.ObjectMapping\">Using Object Mapping to Migrate Data to a Kinesis Data Stream</a> in the <i>AWS Database Migration User Guide.</i> </p>"
+        },
+        "KafkaSettings":{
+          "shape":"KafkaSettings",
+          "documentation":"<p>Settings in JSON format for the target Apache Kafka endpoint. For information about other available settings, see <a href=\"https://docs.aws.amazon.com/dms/latest/userguide/CHAP_Target.Kafka.html#CHAP_Target.Kafka.ObjectMapping\">Using Object Mapping to Migrate Data to Apache Kafka</a> in the <i>AWS Database Migration User Guide.</i> </p>"
         },
         "ElasticsearchSettings":{
           "shape":"ElasticsearchSettings",
@@ -1031,7 +1035,7 @@
         },
         "SourceType":{
           "shape":"String",
-          "documentation":"<p> The type of AWS DMS resource that generates the events. For example, if you want to be notified of events generated by a replication instance, you set this parameter to <code>replication-instance</code>. If this value is not specified, all events are returned. </p> <p>Valid values: <code>replication-instance</code> | <code>replication-task</code> </p>"
+          "documentation":"<p> The type of AWS DMS resource that generates the events. For example, if you want to be notified of events generated by a replication instance, you set this parameter to <code>replication-instance</code>. If this value isn't specified, all events are returned. </p> <p>Valid values: <code>replication-instance</code> | <code>replication-task</code> </p>"
         },
         "EventCategories":{
           "shape":"EventCategoriesList",
@@ -1071,7 +1075,7 @@
       "members":{
         "ReplicationInstanceIdentifier":{
           "shape":"String",
-          "documentation":"<p>The replication instance identifier. This parameter is stored as a lowercase string.</p> <p>Constraints:</p> <ul> <li> <p>Must contain from 1 to 63 alphanumeric characters or hyphens.</p> </li> <li> <p>First character must be a letter.</p> </li> <li> <p>Cannot end with a hyphen or contain two consecutive hyphens.</p> </li> </ul> <p>Example: <code>myrepinstance</code> </p>"
+          "documentation":"<p>The replication instance identifier. This parameter is stored as a lowercase string.</p> <p>Constraints:</p> <ul> <li> <p>Must contain from 1 to 63 alphanumeric characters or hyphens.</p> </li> <li> <p>First character must be a letter.</p> </li> <li> <p>Can't end with a hyphen or contain two consecutive hyphens.</p> </li> </ul> <p>Example: <code>myrepinstance</code> </p>"
         },
         "AllocatedStorage":{
           "shape":"IntegerOptional",
@@ -1087,7 +1091,7 @@
         },
         "AvailabilityZone":{
           "shape":"String",
-          "documentation":"<p>The AWS Availability Zone where the replication instance will be created. The default value is a random, system-chosen Availability Zone in the endpoint's AWS Region, for example: <code>us-east-1d</code> </p>"
+          "documentation":"<p>The Availability Zone where the replication instance will be created. The default value is a random, system-chosen Availability Zone in the endpoint's AWS Region, for example: <code>us-east-1d</code> </p>"
         },
         "ReplicationSubnetGroupIdentifier":{
           "shape":"String",
@@ -1099,7 +1103,7 @@
         },
         "MultiAZ":{
           "shape":"BooleanOptional",
-          "documentation":"<p> Specifies whether the replication instance is a Multi-AZ deployment. You cannot set the <code>AvailabilityZone</code> parameter if the Multi-AZ parameter is set to <code>true</code>. </p>"
+          "documentation":"<p> Specifies whether the replication instance is a Multi-AZ deployment. You can't set the <code>AvailabilityZone</code> parameter if the Multi-AZ parameter is set to <code>true</code>. </p>"
         },
         "EngineVersion":{
           "shape":"String",
@@ -1107,7 +1111,7 @@
         },
         "AutoMinorVersionUpgrade":{
           "shape":"BooleanOptional",
-          "documentation":"<p>Indicates whether minor engine upgrades will be applied automatically to the replication instance during the maintenance window. This parameter defaults to <code>true</code>.</p> <p>Default: <code>true</code> </p>"
+          "documentation":"<p>A value that indicates whether minor engine upgrades are applied automatically to the replication instance during the maintenance window. This parameter defaults to <code>true</code>.</p> <p>Default: <code>true</code> </p>"
         },
         "Tags":{
           "shape":"TagList",
@@ -1220,7 +1224,7 @@
         },
         "CdcStartPosition":{
           "shape":"String",
-          "documentation":"<p>Indicates when you want a change data capture (CDC) operation to start. Use either CdcStartPosition or CdcStartTime to specify when you want a CDC operation to start. Specifying both values results in an error.</p> <p> The value can be in date, checkpoint, or LSN/SCN format.</p> <p>Date Example: --cdc-start-position “2018-03-08T12:12:12”</p> <p>Checkpoint Example: --cdc-start-position \"checkpoint:V1#27#mysql-bin-changelog.157832:1975:-1:2002:677883278264080:mysql-bin-changelog.157832:1876#0#0#*#0#93\"</p> <p>LSN Example: --cdc-start-position “mysql-bin-changelog.000024:373”</p>"
+          "documentation":"<p>Indicates when you want a change data capture (CDC) operation to start. Use either CdcStartPosition or CdcStartTime to specify when you want a CDC operation to start. Specifying both values results in an error.</p> <p> The value can be in date, checkpoint, or LSN/SCN format.</p> <p>Date Example: --cdc-start-position “2018-03-08T12:12:12”</p> <p>Checkpoint Example: --cdc-start-position \"checkpoint:V1#27#mysql-bin-changelog.157832:1975:-1:2002:677883278264080:mysql-bin-changelog.157832:1876#0#0#*#0#93\"</p> <p>LSN Example: --cdc-start-position “mysql-bin-changelog.000024:373”</p> <note> <p>When you use this task setting with a source PostgreSQL database, a logical replication slot should already be created and associated with the source endpoint. You can verify this by setting the <code>slotName</code> extra connection attribute to the name of this logical replication slot. For more information, see <a href=\"https://docs.aws.amazon.com/dms/latest/userguide/CHAP_Source.PostgreSQL.html#CHAP_Source.PostgreSQL.ConnectionAttrib\">Extra Connection Attributes When Using PostgreSQL as a Source for AWS DMS</a>.</p> </note>"
         },
         "CdcStopPosition":{
           "shape":"String",
@@ -1431,7 +1435,7 @@
         },
         "Marker":{
           "shape":"String",
-          "documentation":"<p> An optional pagination token provided by a previous request. If this parameter is specified, the response includes only records beyond the marker, up to the vlue specified by <code>MaxRecords</code>. </p>"
+          "documentation":"<p> An optional pagination token provided by a previous request. If this parameter is specified, the response includes only records beyond the marker, up to the value specified by <code>MaxRecords</code>. </p>"
         }
       }
     },
@@ -1849,7 +1853,7 @@
       "members":{
         "ReplicationTaskArn":{
           "shape":"String",
-          "documentation":"<p>- The Amazon Resource Name (ARN) string that uniquely identifies the task. When this input parameter is specified the API will return only one result and ignore the values of the max-records and marker parameters. </p>"
+          "documentation":"<p>The Amazon Resource Name (ARN) string that uniquely identifies the task. When this input parameter is specified, the API returns only one result and ignore the values of the <code>MaxRecords</code> and <code>Marker</code> parameters. </p>"
         },
         "MaxRecords":{
           "shape":"IntegerOptional",
@@ -2022,7 +2026,7 @@
           "documentation":"<p> The Amazon Resource Name (ARN) used by the service access IAM role. </p>"
         }
       },
-      "documentation":"<p/>"
+      "documentation":"<p>Provides the Amazon Resource Name (ARN) of the AWS Identity and Access Management (IAM) role used to define an Amazon DynamoDB target endpoint.</p>"
     },
     "ElasticsearchSettings":{
       "type":"structure",
@@ -2045,10 +2049,10 @@
         },
         "ErrorRetryDuration":{
           "shape":"IntegerOptional",
-          "documentation":"<p>The maximum number of seconds that DMS retries failed API requests to the Elasticsearch cluster.</p>"
+          "documentation":"<p>The maximum number of seconds for which DMS retries failed API requests to the Elasticsearch cluster.</p>"
         }
       },
-      "documentation":"<p/>"
+      "documentation":"<p>Provides information that defines an Elasticsearch endpoint.</p>"
     },
     "EncodingTypeValue":{
       "type":"string",
@@ -2070,7 +2074,7 @@
       "members":{
         "EndpointIdentifier":{
           "shape":"String",
-          "documentation":"<p>The database endpoint identifier. Identifiers must begin with a letter; must contain only ASCII letters, digits, and hyphens; and must not end with a hyphen or contain two consecutive hyphens.</p>"
+          "documentation":"<p>The database endpoint identifier. Identifiers must begin with a letter and must contain only ASCII letters, digits, and hyphens. They can't end with a hyphen or contain two consecutive hyphens.</p>"
         },
         "EndpointType":{
           "shape":"ReplicationEndpointTypeValue",
@@ -2078,7 +2082,7 @@
         },
         "EngineName":{
           "shape":"String",
-          "documentation":"<p>The database engine name. Valid values, depending on the EndpointType, include mysql, oracle, postgres, mariadb, aurora, aurora-postgresql, redshift, s3, db2, azuredb, sybase, dynamodb, mongodb, and sqlserver.</p>"
+          "documentation":"<p>The database engine name. Valid values, depending on the EndpointType, include <code>\"mysql\"</code>, <code>\"oracle\"</code>, <code>\"postgres\"</code>, <code>\"mariadb\"</code>, <code>\"aurora\"</code>, <code>\"aurora-postgresql\"</code>, <code>\"redshift\"</code>, <code>\"s3\"</code>, <code>\"db2\"</code>, <code>\"azuredb\"</code>, <code>\"sybase\"</code>, <code>\"dynamodb\"</code>, <code>\"mongodb\"</code>, <code>\"kinesis\"</code>, <code>\"kafka\"</code>, <code>\"elasticsearch\"</code>, <code>\"documentdb\"</code>, and <code>\"sqlserver\"</code>.</p>"
         },
         "EngineDisplayName":{
           "shape":"String",
@@ -2154,7 +2158,11 @@
         },
         "KinesisSettings":{
           "shape":"KinesisSettings",
-          "documentation":"<p>The settings for the Amazon Kinesis source endpoint. For more information, see the <code>KinesisSettings</code> structure.</p>"
+          "documentation":"<p>The settings for the Amazon Kinesis target endpoint. For more information, see the <code>KinesisSettings</code> structure.</p>"
+        },
+        "KafkaSettings":{
+          "shape":"KafkaSettings",
+          "documentation":"<p>The settings for the Apache Kafka target endpoint. For more information, see the <code>KafkaSettings</code> structure.</p>"
         },
         "ElasticsearchSettings":{
           "shape":"ElasticsearchSettings",
@@ -2165,7 +2173,7 @@
           "documentation":"<p>Settings for the Amazon Redshift endpoint.</p>"
         }
       },
-      "documentation":"<p/>"
+      "documentation":"<p>Describes an endpoint of a database instance in response to operations such as the following:</p> <ul> <li> <p> <code>CreateEndpoint</code> </p> </li> <li> <p> <code>DescribeEndpoint</code> </p> </li> <li> <p> <code>DescribeEndpointTypes</code> </p> </li> <li> <p> <code>ModifyEndpoint</code> </p> </li> </ul>"
     },
     "EndpointList":{
       "type":"list",
@@ -2195,7 +2203,7 @@
           "documentation":"<p>The date of the event.</p>"
         }
       },
-      "documentation":"<p/>"
+      "documentation":"<p>Describes an identifiable significant activity that affects a replication instance or task. This object can provide the message, the available event categories, the date and source of the event, and the AWS DMS resource type.</p>"
     },
     "EventCategoriesList":{
       "type":"list",
@@ -2213,7 +2221,7 @@
           "documentation":"<p> A list of event categories from a source type that you've chosen.</p>"
         }
       },
-      "documentation":"<p/>"
+      "documentation":"<p>Lists categories of events subscribed to, and generated by, the applicable AWS DMS resource type.</p>"
     },
     "EventCategoryGroupList":{
       "type":"list",
@@ -2263,7 +2271,7 @@
           "documentation":"<p>Boolean value that indicates if the event subscription is enabled.</p>"
         }
       },
-      "documentation":"<p/>"
+      "documentation":"<p>Describes an event notification subscription created by the <code>CreateEventSubscription</code> operation.</p>"
     },
     "EventSubscriptionsList":{
       "type":"list",
@@ -2286,7 +2294,7 @@
           "documentation":"<p>The filter value.</p>"
         }
       },
-      "documentation":"<p/>"
+      "documentation":"<p>Identifies the name and value of a source filter object used to limit the number and type of records transferred from your source to your target.</p>"
     },
     "FilterList":{
       "type":"list",
@@ -2302,7 +2310,7 @@
       "members":{
         "CertificateIdentifier":{
           "shape":"String",
-          "documentation":"<p>A customer-assigned name for the certificate. Identifiers must begin with a letter; must contain only ASCII letters, digits, and hyphens; and must not end with a hyphen or contain two consecutive hyphens.</p>"
+          "documentation":"<p>A customer-assigned name for the certificate. Identifiers must begin with a letter and must contain only ASCII letters, digits, and hyphens. They can't end with a hyphen or contain two consecutive hyphens.</p>"
         },
         "CertificatePem":{
           "shape":"String",
@@ -2421,6 +2429,20 @@
       "documentation":"<p>This request triggered AWS KMS request throttling.</p>",
       "exception":true
     },
+    "KafkaSettings":{
+      "type":"structure",
+      "members":{
+        "Broker":{
+          "shape":"String",
+          "documentation":"<p>The broker location and port of the Kafka broker that hosts your Kafka instance. Specify the broker in the form <code> <i>broker-hostname-or-ip</i>:<i>port</i> </code>. For example, <code>\"ec2-12-345-678-901.compute-1.amazonaws.com:2345\"</code>.</p>"
+        },
+        "Topic":{
+          "shape":"String",
+          "documentation":"<p>The topic to which you migrate the data. If you don't specify a topic, AWS DMS specifies <code>\"kafka-default-topic\"</code> as the migration topic.</p>"
+        }
+      },
+      "documentation":"<p>Provides information that describes an Apache Kafka endpoint. This information includes the output format of records applied to the endpoint and details of transaction and control table data information.</p>"
+    },
     "KeyList":{
       "type":"list",
       "member":{"shape":"String"}
@@ -2434,14 +2456,34 @@
         },
         "MessageFormat":{
           "shape":"MessageFormatValue",
-          "documentation":"<p>The output format for the records created on the endpoint. The message format is <code>JSON</code>.</p>"
+          "documentation":"<p>The output format for the records created on the endpoint. The message format is <code>JSON</code> (default) or <code>JSON_UNFORMATTED</code> (a single line with no tab).</p>"
         },
         "ServiceAccessRoleArn":{
           "shape":"String",
-          "documentation":"<p>The Amazon Resource Name (ARN) for the IAM role that DMS uses to write to the Amazon Kinesis data stream.</p>"
+          "documentation":"<p>The Amazon Resource Name (ARN) for the AWS Identity and Access Management (IAM) role that AWS DMS uses to write to the Kinesis data stream.</p>"
+        },
+        "IncludeTransactionDetails":{
+          "shape":"BooleanOptional",
+          "documentation":"<p>Provides detailed transaction information from the source database. This information includes a commit timestamp, a log position, and values for <code>transaction_id</code>, previous <code>transaction_id</code>, and <code>transaction_record_id</code> (the record offset within a transaction). The default is <code>False</code>.</p>"
+        },
+        "IncludePartitionValue":{
+          "shape":"BooleanOptional",
+          "documentation":"<p>Shows the partition value within the Kinesis message output, unless the partition type is <code>schema-table-type</code>. The default is <code>False</code>.</p>"
+        },
+        "PartitionIncludeSchemaTable":{
+          "shape":"BooleanOptional",
+          "documentation":"<p>Prefixes schema and table names to partition values, when the partition type is <code>primary-key-type</code>. Doing this increases data distribution among Kinesis shards. For example, suppose that a SysBench schema has thousands of tables and each table has only limited range for a primary key. In this case, the same primary key is sent from thousands of tables to the same shard, which causes throttling. The default is <code>False</code>.</p>"
+        },
+        "IncludeTableAlterOperations":{
+          "shape":"BooleanOptional",
+          "documentation":"<p>Includes any data definition language (DDL) operations that change the table in the control data, such as <code>rename-table</code>, <code>drop-table</code>, <code>add-column</code>, <code>drop-column</code>, and <code>rename-column</code>. The default is <code>False</code>.</p>"
+        },
+        "IncludeControlDetails":{
+          "shape":"BooleanOptional",
+          "documentation":"<p>Shows detailed control information for table definition, column definition, and table and column changes in the Kinesis message output. The default is <code>False</code>.</p>"
         }
       },
-      "documentation":"<p/>"
+      "documentation":"<p>Provides information that describes an Amazon Kinesis Data Stream endpoint. This information includes the output format of records applied to the endpoint and details of transaction and control table data information.</p>"
     },
     "ListTagsForResourceMessage":{
       "type":"structure",
@@ -2467,7 +2509,10 @@
     "Long":{"type":"long"},
     "MessageFormatValue":{
       "type":"string",
-      "enum":["json"]
+      "enum":[
+        "json",
+        "json-unformatted"
+      ]
     },
     "MigrationTypeValue":{
       "type":"string",
@@ -2487,7 +2532,7 @@
         },
         "EndpointIdentifier":{
           "shape":"String",
-          "documentation":"<p>The database endpoint identifier. Identifiers must begin with a letter; must contain only ASCII letters, digits, and hyphens; and must not end with a hyphen or contain two consecutive hyphens.</p>"
+          "documentation":"<p>The database endpoint identifier. Identifiers must begin with a letter and must contain only ASCII letters, digits, and hyphens. They can't end with a hyphen or contain two consecutive hyphens.</p>"
         },
         "EndpointType":{
           "shape":"ReplicationEndpointTypeValue",
@@ -2495,7 +2540,7 @@
         },
         "EngineName":{
           "shape":"String",
-          "documentation":"<p>The type of engine for the endpoint. Valid values, depending on the EndpointType, include mysql, oracle, postgres, mariadb, aurora, aurora-postgresql, redshift, s3, db2, azuredb, sybase, dynamodb, mongodb, and sqlserver.</p>"
+          "documentation":"<p>The type of engine for the endpoint. Valid values, depending on the EndpointType, include <code>\"mysql\"</code>, <code>\"oracle\"</code>, <code>\"postgres\"</code>, <code>\"mariadb\"</code>, <code>\"aurora\"</code>, <code>\"aurora-postgresql\"</code>, <code>\"redshift\"</code>, <code>\"s3\"</code>, <code>\"db2\"</code>, <code>\"azuredb\"</code>, <code>\"sybase\"</code>, <code>\"dynamodb\"</code>, <code>\"mongodb\"</code>, <code>\"kinesis\"</code>, <code>\"kafka\"</code>, <code>\"elasticsearch\"</code>, <code>\"documentdb\"</code>, and <code>\"sqlserver\"</code>.</p>"
         },
         "Username":{
           "shape":"String",
@@ -2539,7 +2584,7 @@
         },
         "DynamoDbSettings":{
           "shape":"DynamoDbSettings",
-          "documentation":"<p>Settings in JSON format for the target Amazon DynamoDB endpoint. For more information about the available settings, see <a href=\"https://docs.aws.amazon.com/dms/latest/userguide/CHAP_Target.DynamoDB.html\">Using Object Mapping to Migrate Data to DynamoDB</a> in the <i>AWS Database Migration Service User Guide.</i> </p>"
+          "documentation":"<p>Settings in JSON format for the target Amazon DynamoDB endpoint. For information about other available settings, see <a href=\"https://docs.aws.amazon.com/dms/latest/userguide/CHAP_Target.DynamoDB.html\">Using Object Mapping to Migrate Data to DynamoDB</a> in the <i>AWS Database Migration Service User Guide.</i> </p>"
         },
         "S3Settings":{
           "shape":"S3Settings",
@@ -2547,7 +2592,7 @@
         },
         "DmsTransferSettings":{
           "shape":"DmsTransferSettings",
-          "documentation":"<p>The settings in JSON format for the DMS transfer type of source endpoint. </p> <p>Attributes include the following:</p> <ul> <li> <p>serviceAccessRoleArn - The IAM role that has permission to access the Amazon S3 bucket.</p> </li> <li> <p>BucketName - The name of the S3 bucket to use.</p> </li> <li> <p>compressionType - An optional parameter to use GZIP to compress the target files. Set to NONE (the default) or do not use to leave the files uncompressed.</p> </li> </ul> <p>Shorthand syntax: ServiceAccessRoleArn=string ,BucketName=string,CompressionType=string</p> <p>JSON syntax:</p> <p> { \"ServiceAccessRoleArn\": \"string\", \"BucketName\": \"string\", \"CompressionType\": \"none\"|\"gzip\" } </p>"
+          "documentation":"<p>The settings in JSON format for the DMS transfer type of source endpoint. </p> <p>Attributes include the following:</p> <ul> <li> <p>serviceAccessRoleArn - The AWS Identity and Access Management (IAM) role that has permission to access the Amazon S3 bucket.</p> </li> <li> <p>BucketName - The name of the S3 bucket to use.</p> </li> <li> <p>compressionType - An optional parameter to use GZIP to compress the target files. Either set this parameter to NONE (the default) or don't use it to leave the files uncompressed.</p> </li> </ul> <p>Shorthand syntax for these settings is as follows: <code>ServiceAccessRoleArn=string ,BucketName=string,CompressionType=string</code> </p> <p>JSON syntax for these settings is as follows: <code>{ \"ServiceAccessRoleArn\": \"string\", \"BucketName\": \"string\", \"CompressionType\": \"none\"|\"gzip\" } </code> </p>"
         },
         "MongoDbSettings":{
           "shape":"MongoDbSettings",
@@ -2555,7 +2600,11 @@
         },
         "KinesisSettings":{
           "shape":"KinesisSettings",
-          "documentation":"<p>Settings in JSON format for the target Amazon Kinesis Data Streams endpoint. For more information about the available settings, see <a href=\"https://docs.aws.amazon.com/dms/latest/userguide/CHAP_Target.Kinesis.html#CHAP_Target.Kinesis.ObjectMapping\">Using Object Mapping to Migrate Data to a Kinesis Data Stream</a> in the <i>AWS Database Migration User Guide.</i> </p>"
+          "documentation":"<p>Settings in JSON format for the target endpoint for Amazon Kinesis Data Streams. For information about other available settings, see <a href=\"https://docs.aws.amazon.com/dms/latest/userguide/CHAP_Target.Kinesis.html#CHAP_Target.Kinesis.ObjectMapping\">Using Object Mapping to Migrate Data to a Kinesis Data Stream</a> in the <i>AWS Database Migration User Guide.</i> </p>"
+        },
+        "KafkaSettings":{
+          "shape":"KafkaSettings",
+          "documentation":"<p>Settings in JSON format for the target Apache Kafka endpoint. For information about other available settings, see <a href=\"https://docs.aws.amazon.com/dms/latest/userguide/CHAP_Target.Kafka.html#CHAP_Target.Kafka.ObjectMapping\">Using Object Mapping to Migrate Data to Apache Kafka</a> in the <i>AWS Database Migration User Guide.</i> </p>"
         },
         "ElasticsearchSettings":{
           "shape":"ElasticsearchSettings",
@@ -2642,7 +2691,7 @@
         },
         "MultiAZ":{
           "shape":"BooleanOptional",
-          "documentation":"<p> Specifies whether the replication instance is a Multi-AZ deployment. You cannot set the <code>AvailabilityZone</code> parameter if the Multi-AZ parameter is set to <code>true</code>. </p>"
+          "documentation":"<p> Specifies whether the replication instance is a Multi-AZ deployment. You can't set the <code>AvailabilityZone</code> parameter if the Multi-AZ parameter is set to <code>true</code>. </p>"
         },
         "EngineVersion":{
           "shape":"String",
@@ -2654,7 +2703,7 @@
         },
         "AutoMinorVersionUpgrade":{
           "shape":"BooleanOptional",
-          "documentation":"<p> Indicates that minor version upgrades will be applied automatically to the replication instance during the maintenance window. Changing this parameter does not result in an outage except in the following case and the change is asynchronously applied as soon as possible. An outage will result if this parameter is set to <code>true</code> during the maintenance window, and a newer minor version is available, and AWS DMS has enabled auto patching for that engine version. </p>"
+          "documentation":"<p>A value that indicates that minor version upgrades are applied automatically to the replication instance during the maintenance window. Changing this parameter doesn't result in an outage, except in the case dsecribed following. The change is asynchronously applied as soon as possible. </p> <p>An outage does result if these factors apply: </p> <ul> <li> <p>This parameter is set to <code>true</code> during the maintenance window.</p> </li> <li> <p>A newer minor version is available. </p> </li> <li> <p>AWS DMS has enabled automatic patching for the given engine version. </p> </li> </ul>"
         },
         "ReplicationInstanceIdentifier":{
           "shape":"String",
@@ -2735,7 +2784,7 @@
         },
         "CdcStartPosition":{
           "shape":"String",
-          "documentation":"<p>Indicates when you want a change data capture (CDC) operation to start. Use either CdcStartPosition or CdcStartTime to specify when you want a CDC operation to start. Specifying both values results in an error.</p> <p> The value can be in date, checkpoint, or LSN/SCN format.</p> <p>Date Example: --cdc-start-position “2018-03-08T12:12:12”</p> <p>Checkpoint Example: --cdc-start-position \"checkpoint:V1#27#mysql-bin-changelog.157832:1975:-1:2002:677883278264080:mysql-bin-changelog.157832:1876#0#0#*#0#93\"</p> <p>LSN Example: --cdc-start-position “mysql-bin-changelog.000024:373”</p>"
+          "documentation":"<p>Indicates when you want a change data capture (CDC) operation to start. Use either CdcStartPosition or CdcStartTime to specify when you want a CDC operation to start. Specifying both values results in an error.</p> <p> The value can be in date, checkpoint, or LSN/SCN format.</p> <p>Date Example: --cdc-start-position “2018-03-08T12:12:12”</p> <p>Checkpoint Example: --cdc-start-position \"checkpoint:V1#27#mysql-bin-changelog.157832:1975:-1:2002:677883278264080:mysql-bin-changelog.157832:1876#0#0#*#0#93\"</p> <p>LSN Example: --cdc-start-position “mysql-bin-changelog.000024:373”</p> <note> <p>When you use this task setting with a source PostgreSQL database, a logical replication slot should already be created and associated with the source endpoint. You can verify this by setting the <code>slotName</code> extra connection attribute to the name of this logical replication slot. For more information, see <a href=\"https://docs.aws.amazon.com/dms/latest/userguide/CHAP_Source.PostgreSQL.html#CHAP_Source.PostgreSQL.ConnectionAttrib\">Extra Connection Attributes When Using PostgreSQL as a Source for AWS DMS</a>.</p> </note>"
         },
         "CdcStopPosition":{
           "shape":"String",
@@ -2783,7 +2832,7 @@
         },
         "AuthMechanism":{
           "shape":"AuthMechanismValue",
-          "documentation":"<p> The authentication mechanism you use to access the MongoDB source endpoint.</p> <p>Valid values: DEFAULT, MONGODB_CR, SCRAM_SHA_1 </p> <p>DEFAULT – For MongoDB version 2.x, use MONGODB_CR. For MongoDB version 3.x, use SCRAM_SHA_1. This setting is not used when authType=No.</p>"
+          "documentation":"<p> The authentication mechanism you use to access the MongoDB source endpoint.</p> <p>Valid values: DEFAULT, MONGODB_CR, SCRAM_SHA_1 </p> <p>DEFAULT – For MongoDB version 2.x, use MONGODB_CR. For MongoDB version 3.x, use SCRAM_SHA_1. This setting isn't used when authType=No.</p>"
         },
         "NestingLevel":{
           "shape":"NestingLevelValue",
@@ -2799,14 +2848,14 @@
         },
         "AuthSource":{
           "shape":"String",
-          "documentation":"<p> The MongoDB database name. This setting is not used when <code>authType=NO</code>. </p> <p>The default is admin.</p>"
+          "documentation":"<p> The MongoDB database name. This setting isn't used when <code>authType=NO</code>. </p> <p>The default is admin.</p>"
         },
         "KmsKeyId":{
           "shape":"String",
           "documentation":"<p>The AWS KMS key identifier that is used to encrypt the content on the replication instance. If you don't specify a value for the <code>KmsKeyId</code> parameter, then AWS DMS uses your default encryption key. AWS KMS creates the default encryption key for your AWS account. Your AWS account has a different default encryption key for each AWS Region.</p>"
         }
       },
-      "documentation":"<p/>"
+      "documentation":"<p>Provides information that defines a MongoDB endpoint.</p>"
     },
     "NestingLevelValue":{
       "type":"string",
@@ -2855,7 +2904,7 @@
           "documentation":"<p>The value returned when the specified <code>EngineVersion</code> of the replication instance is in Beta or test mode. This indicates some features might not work as expected.</p> <note> <p>AWS DMS supports the <code>ReleaseStatus</code> parameter in versions 3.1.4 and later.</p> </note>"
         }
       },
-      "documentation":"<p/>"
+      "documentation":"<p>In response to the <code>DescribeOrderableReplicationInstances</code> operation, this object describes an available replication instance. This description includes the replication instance's type, engine version, and allocated storage.</p>"
     },
     "OrderableReplicationInstanceList":{
       "type":"list",
@@ -2877,26 +2926,26 @@
         },
         "AutoAppliedAfterDate":{
           "shape":"TStamp",
-          "documentation":"<p>The date of the maintenance window when the action will be applied. The maintenance action will be applied to the resource during its first maintenance window after this date. If this date is specified, any <code>next-maintenance</code> opt-in requests are ignored.</p>"
+          "documentation":"<p>The date of the maintenance window when the action is to be applied. The maintenance action is applied to the resource during its first maintenance window after this date. If this date is specified, any <code>next-maintenance</code> opt-in requests are ignored.</p>"
         },
         "ForcedApplyDate":{
           "shape":"TStamp",
-          "documentation":"<p>The date when the maintenance action will be automatically applied. The maintenance action will be applied to the resource on this date regardless of the maintenance window for the resource. If this date is specified, any <code>immediate</code> opt-in requests are ignored.</p>"
+          "documentation":"<p>The date when the maintenance action will be automatically applied. The maintenance action is applied to the resource on this date regardless of the maintenance window for the resource. If this date is specified, any <code>immediate</code> opt-in requests are ignored.</p>"
         },
         "OptInStatus":{
           "shape":"String",
-          "documentation":"<p>Indicates the type of opt-in request that has been received for the resource.</p>"
+          "documentation":"<p>The type of opt-in request that has been received for the resource.</p>"
         },
         "CurrentApplyDate":{
           "shape":"TStamp",
-          "documentation":"<p>The effective date when the pending maintenance action will be applied to the resource. This date takes into account opt-in requests received from the <code>ApplyPendingMaintenanceAction</code> API, the <code>AutoAppliedAfterDate</code>, and the <code>ForcedApplyDate</code>. This value is blank if an opt-in request has not been received and nothing has been specified as <code>AutoAppliedAfterDate</code> or <code>ForcedApplyDate</code>.</p>"
+          "documentation":"<p>The effective date when the pending maintenance action will be applied to the resource. This date takes into account opt-in requests received from the <code>ApplyPendingMaintenanceAction</code> API operation, and also the <code>AutoAppliedAfterDate</code> and <code>ForcedApplyDate</code> parameter values. This value is blank if an opt-in request has not been received and nothing has been specified for <code>AutoAppliedAfterDate</code> or <code>ForcedApplyDate</code>.</p>"
         },
         "Description":{
           "shape":"String",
           "documentation":"<p>A description providing more detail about the maintenance action.</p>"
         }
       },
-      "documentation":"<p/>"
+      "documentation":"<p>Describes a maintenance action pending for an AWS DMS resource, including when and how it will be applied. This data type is a response element to the <code>DescribePendingMaintenanceActions</code> operation.</p>"
     },
     "PendingMaintenanceActionDetails":{
       "type":"list",
@@ -3033,7 +3082,7 @@
           "documentation":"<p>The size of the write buffer to use in rows. Valid values range from 1 through 2,048. The default is 1,024. Use this setting to tune performance. </p>"
         }
       },
-      "documentation":"<p/>"
+      "documentation":"<p>Provides information that defines an Amazon Redshift endpoint.</p>"
     },
     "RefreshSchemasMessage":{
       "type":"structure",
@@ -3087,7 +3136,7 @@
           "documentation":"<p>The last failure message for the schema.</p>"
         }
       },
-      "documentation":"<p/>"
+      "documentation":"<p>Provides information that describes status of a schema at an endpoint specified by the <code>DescribeRefreshSchemaStatus</code> operation.</p>"
     },
     "RefreshSchemasStatusTypeValue":{
       "type":"string",
@@ -3214,7 +3263,7 @@
         },
         "MultiAZ":{
           "shape":"Boolean",
-          "documentation":"<p> Specifies whether the replication instance is a Multi-AZ deployment. You cannot set the <code>AvailabilityZone</code> parameter if the Multi-AZ parameter is set to <code>true</code>. </p>"
+          "documentation":"<p> Specifies whether the replication instance is a Multi-AZ deployment. You can't set the <code>AvailabilityZone</code> parameter if the Multi-AZ parameter is set to <code>true</code>. </p>"
         },
         "EngineVersion":{
           "shape":"String",
@@ -3256,7 +3305,7 @@
         },
         "SecondaryAvailabilityZone":{
           "shape":"String",
-          "documentation":"<p>The availability zone of the standby replication instance in a Multi-AZ deployment.</p>"
+          "documentation":"<p>The Availability Zone of the standby replication instance in a Multi-AZ deployment.</p>"
         },
         "FreeUntil":{
           "shape":"TStamp",
@@ -3267,7 +3316,7 @@
           "documentation":"<p>The DNS name servers for the replication instance.</p>"
         }
       },
-      "documentation":"<p/>"
+      "documentation":"<p>Provides information that defines a replication instance.</p>"
     },
     "ReplicationInstanceList":{
       "type":"list",
@@ -3316,14 +3365,14 @@
         },
         "MultiAZ":{
           "shape":"BooleanOptional",
-          "documentation":"<p> Specifies whether the replication instance is a Multi-AZ deployment. You cannot set the <code>AvailabilityZone</code> parameter if the Multi-AZ parameter is set to <code>true</code>. </p>"
+          "documentation":"<p> Specifies whether the replication instance is a Multi-AZ deployment. You can't set the <code>AvailabilityZone</code> parameter if the Multi-AZ parameter is set to <code>true</code>. </p>"
         },
         "EngineVersion":{
           "shape":"String",
           "documentation":"<p>The engine version number of the replication instance.</p>"
         }
       },
-      "documentation":"<p/>"
+      "documentation":"<p>Provides information about the values of pending modifications to a replication instance. This data type is an object of the <code>ReplicationInstance</code> user-defined data type. </p>"
     },
     "ReplicationSubnetGroup":{
       "type":"structure",
@@ -3349,7 +3398,7 @@
           "documentation":"<p>The subnets that are in the subnet group.</p>"
         }
       },
-      "documentation":"<p/>"
+      "documentation":"<p>Describes a subnet group in response to a request by the <code>DescribeReplicationSubnetGroup</code> operation.</p>"
     },
     "ReplicationSubnetGroupDoesNotCoverEnoughAZs":{
       "type":"structure",
@@ -3438,7 +3487,7 @@
           "documentation":"<p>The statistics for the task, including elapsed time, tables loaded, and table errors.</p>"
         }
       },
-      "documentation":"<p/>"
+      "documentation":"<p>Provides information that describes a replication task created by the <code>CreateReplicationTask</code> operation.</p>"
     },
     "ReplicationTaskAssessmentResult":{
       "type":"structure",
@@ -3508,9 +3557,29 @@
         "TablesErrored":{
           "shape":"Integer",
           "documentation":"<p>The number of errors that have occurred during this task.</p>"
+        },
+        "FreshStartDate":{
+          "shape":"TStamp",
+          "documentation":"<p>The date the replication task was started either with a fresh start or a target reload.</p>"
+        },
+        "StartDate":{
+          "shape":"TStamp",
+          "documentation":"<p>The date the replication task was started either with a fresh start or a resume. For more information, see <a href=\"https://docs.aws.amazon.com/dms/latest/APIReference/API_StartReplicationTask.html#DMS-StartReplicationTask-request-StartReplicationTaskType\">StartReplicationTaskType</a>.</p>"
+        },
+        "StopDate":{
+          "shape":"TStamp",
+          "documentation":"<p>The date the replication task was stopped.</p>"
+        },
+        "FullLoadStartDate":{
+          "shape":"TStamp",
+          "documentation":"<p>The date the replication task full load was started.</p>"
+        },
+        "FullLoadFinishDate":{
+          "shape":"TStamp",
+          "documentation":"<p>The date the replication task full load was completed.</p>"
         }
       },
-      "documentation":"<p/>"
+      "documentation":"<p>In response to a request by the <code>DescribeReplicationTasks</code> operation, this object provides a collection of statistics about a replication task.</p>"
     },
     "ResourceAlreadyExistsFault":{
       "type":"structure",
@@ -3548,7 +3617,7 @@
           "documentation":"<p>Detailed information about the pending maintenance action.</p>"
         }
       },
-      "documentation":"<p/>"
+      "documentation":"<p>Identifies an AWS DMS resource and any pending actions for it.</p>"
     },
     "ResourceQuotaExceededFault":{
       "type":"structure",
@@ -3582,7 +3651,7 @@
         },
         "BucketFolder":{
           "shape":"String",
-          "documentation":"<p> An optional parameter to set a folder name in the S3 bucket. If provided, tables are created in the path <code> <i>bucketFolder</i>/<i>schema_name</i>/<i>table_name</i>/</code>. If this parameter is not specified, then the path used is <code> <i>schema_name</i>/<i>table_name</i>/</code>. </p>"
+          "documentation":"<p> An optional parameter to set a folder name in the S3 bucket. If provided, tables are created in the path <code> <i>bucketFolder</i>/<i>schema_name</i>/<i>table_name</i>/</code>. If this parameter isn't specified, then the path used is <code> <i>schema_name</i>/<i>table_name</i>/</code>. </p>"
         },
         "BucketName":{
           "shape":"String",
@@ -3590,7 +3659,7 @@
         },
         "CompressionType":{
           "shape":"CompressionTypeValue",
-          "documentation":"<p> An optional parameter to use GZIP to compress the target files. Set to GZIP to compress the target files. Set to NONE (the default) or do not use to leave the files uncompressed. Applies to both .csv and .parquet file formats. </p>"
+          "documentation":"<p>An optional parameter to use GZIP to compress the target files. Set to GZIP to compress the target files. Either set this parameter to NONE (the default) or don't use it to leave the files uncompressed. This parameter applies to both .csv and .parquet file formats. </p>"
         },
         "EncryptionMode":{
           "shape":"EncryptionModeValue",
@@ -3630,11 +3699,11 @@
         },
         "IncludeOpForFullLoad":{
           "shape":"BooleanOptional",
-          "documentation":"<p>A value that enables a full load to write INSERT operations to the comma-separated value (.csv) output files only to indicate how the rows were added to the source database.</p> <note> <p>AWS DMS supports the <code>IncludeOpForFullLoad</code> parameter in versions 3.1.4 and later.</p> </note> <p>For full load, records can only be inserted. By default (the <code>false</code> setting), no information is recorded in these output files for a full load to indicate that the rows were inserted at the source database. If <code>IncludeOpForFullLoad</code> is set to <code>true</code> or <code>y</code>, the INSERT is recorded as an I annotation in the first field of the .csv file. This allows the format of your target records from a full load to be consistent with the target records from a CDC load.</p> <note> <p>This setting works together with the <code>CdcInsertsOnly</code> parameter for output to .csv files only. For more information about how these settings work together, see <a href=\"https://docs.aws.amazon.com/dms/latest/userguide/CHAP_Target.S3.html#CHAP_Target.S3.Configuring.InsertOps\">Indicating Source DB Operations in Migrated S3 Data</a> in the <i>AWS Database Migration Service User Guide.</i>.</p> </note>"
+          "documentation":"<p>A value that enables a full load to write INSERT operations to the comma-separated value (.csv) output files only to indicate how the rows were added to the source database.</p> <note> <p>AWS DMS supports the <code>IncludeOpForFullLoad</code> parameter in versions 3.1.4 and later.</p> </note> <p>For full load, records can only be inserted. By default (the <code>false</code> setting), no information is recorded in these output files for a full load to indicate that the rows were inserted at the source database. If <code>IncludeOpForFullLoad</code> is set to <code>true</code> or <code>y</code>, the INSERT is recorded as an I annotation in the first field of the .csv file. This allows the format of your target records from a full load to be consistent with the target records from a CDC load.</p> <note> <p>This setting works together with the <code>CdcInsertsOnly</code> and the <code>CdcInsertsAndUpdates</code> parameters for output to .csv files only. For more information about how these settings work together, see <a href=\"https://docs.aws.amazon.com/dms/latest/userguide/CHAP_Target.S3.html#CHAP_Target.S3.Configuring.InsertOps\">Indicating Source DB Operations in Migrated S3 Data</a> in the <i>AWS Database Migration Service User Guide.</i>.</p> </note>"
         },
         "CdcInsertsOnly":{
           "shape":"BooleanOptional",
-          "documentation":"<p>A value that enables a change data capture (CDC) load to write only INSERT operations to .csv or columnar storage (.parquet) output files. By default (the <code>false</code> setting), the first field in a .csv or .parquet record contains the letter I (INSERT), U (UPDATE), or D (DELETE). These values indicate whether the row was inserted, updated, or deleted at the source database for a CDC load to the target.</p> <p>If <code>CdcInsertsOnly</code> is set to <code>true</code> or <code>y</code>, only INSERTs from the source database are migrated to the .csv or .parquet file. For .csv format only, how these INSERTs are recorded depends on the value of <code>IncludeOpForFullLoad</code>. If <code>IncludeOpForFullLoad</code> is set to <code>true</code>, the first field of every CDC record is set to I to indicate the INSERT operation at the source. If <code>IncludeOpForFullLoad</code> is set to <code>false</code>, every CDC record is written without a first field to indicate the INSERT operation at the source. For more information about how these settings work together, see <a href=\"https://docs.aws.amazon.com/dms/latest/userguide/CHAP_Target.S3.html#CHAP_Target.S3.Configuring.InsertOps\">Indicating Source DB Operations in Migrated S3 Data</a> in the <i>AWS Database Migration Service User Guide.</i>.</p> <note> <p>AWS DMS supports this interaction between the <code>CdcInsertsOnly</code> and <code>IncludeOpForFullLoad</code> parameters in versions 3.1.4 and later. </p> </note>"
+          "documentation":"<p>A value that enables a change data capture (CDC) load to write only INSERT operations to .csv or columnar storage (.parquet) output files. By default (the <code>false</code> setting), the first field in a .csv or .parquet record contains the letter I (INSERT), U (UPDATE), or D (DELETE). These values indicate whether the row was inserted, updated, or deleted at the source database for a CDC load to the target.</p> <p>If <code>CdcInsertsOnly</code> is set to <code>true</code> or <code>y</code>, only INSERTs from the source database are migrated to the .csv or .parquet file. For .csv format only, how these INSERTs are recorded depends on the value of <code>IncludeOpForFullLoad</code>. If <code>IncludeOpForFullLoad</code> is set to <code>true</code>, the first field of every CDC record is set to I to indicate the INSERT operation at the source. If <code>IncludeOpForFullLoad</code> is set to <code>false</code>, every CDC record is written without a first field to indicate the INSERT operation at the source. For more information about how these settings work together, see <a href=\"https://docs.aws.amazon.com/dms/latest/userguide/CHAP_Target.S3.html#CHAP_Target.S3.Configuring.InsertOps\">Indicating Source DB Operations in Migrated S3 Data</a> in the <i>AWS Database Migration Service User Guide.</i>.</p> <note> <p>AWS DMS supports the interaction described preceding between the <code>CdcInsertsOnly</code> and <code>IncludeOpForFullLoad</code> parameters in versions 3.1.4 and later. </p> <p> <code>CdcInsertsOnly</code> and <code>CdcInsertsAndUpdates</code> can't both be set to <code>true</code> for the same endpoint. Set either <code>CdcInsertsOnly</code> or <code>CdcInsertsAndUpdates</code> to <code>true</code> for the same endpoint, but not both.</p> </note>"
         },
         "TimestampColumnName":{
           "shape":"String",
@@ -3643,6 +3712,10 @@
         "ParquetTimestampInMillisecond":{
           "shape":"BooleanOptional",
           "documentation":"<p>A value that specifies the precision of any <code>TIMESTAMP</code> column values that are written to an Amazon S3 object file in .parquet format.</p> <note> <p>AWS DMS supports the <code>ParquetTimestampInMillisecond</code> parameter in versions 3.1.4 and later.</p> </note> <p>When <code>ParquetTimestampInMillisecond</code> is set to <code>true</code> or <code>y</code>, AWS DMS writes all <code>TIMESTAMP</code> columns in a .parquet formatted file with millisecond precision. Otherwise, DMS writes them with microsecond precision.</p> <p>Currently, Amazon Athena and AWS Glue can handle only millisecond precision for <code>TIMESTAMP</code> values. Set this parameter to <code>true</code> for S3 endpoint object files that are .parquet formatted only if you plan to query or process the data with Athena or AWS Glue.</p> <note> <p>AWS DMS writes any <code>TIMESTAMP</code> column values written to an S3 file in .csv format with microsecond precision.</p> <p>Setting <code>ParquetTimestampInMillisecond</code> has no effect on the string format of the timestamp column value that is inserted by setting the <code>TimestampColumnName</code> parameter.</p> </note>"
+        },
+        "CdcInsertsAndUpdates":{
+          "shape":"BooleanOptional",
+          "documentation":"<p>A value that enables a change data capture (CDC) load to write INSERT and UPDATE operations to .csv or .parquet (columnar storage) output files. The default setting is <code>false</code>, but when <code>CdcInsertsAndUpdates</code> is set to <code>true</code>or <code>y</code>, INSERTs and UPDATEs from the source database are migrated to the .csv or .parquet file. </p> <p>For .csv file format only, how these INSERTs and UPDATEs are recorded depends on the value of the <code>IncludeOpForFullLoad</code> parameter. If <code>IncludeOpForFullLoad</code> is set to <code>true</code>, the first field of every CDC record is set to either <code>I</code> or <code>U</code> to indicate INSERT and UPDATE operations at the source. But if <code>IncludeOpForFullLoad</code> is set to <code>false</code>, CDC records are written without an indication of INSERT or UPDATE operations at the source. For more information about how these settings work together, see <a href=\"https://docs.aws.amazon.com/dms/latest/userguide/CHAP_Target.S3.html#CHAP_Target.S3.Configuring.InsertOps\">Indicating Source DB Operations in Migrated S3 Data</a> in the <i>AWS Database Migration Service User Guide.</i>.</p> <note> <p>AWS DMS supports the use of the <code>CdcInsertsAndUpdates</code> parameter in versions 3.3.1 and later.</p> <p> <code>CdcInsertsOnly</code> and <code>CdcInsertsAndUpdates</code> can't both be set to <code>true</code> for the same endpoint. Set either <code>CdcInsertsOnly</code> or <code>CdcInsertsAndUpdates</code> to <code>true</code> for the same endpoint, but not both.</p> </note>"
         }
       },
       "documentation":"<p>Settings for exporting data to Amazon S3. </p>"
@@ -3727,7 +3800,7 @@
         },
         "CdcStartPosition":{
           "shape":"String",
-          "documentation":"<p>Indicates when you want a change data capture (CDC) operation to start. Use either CdcStartPosition or CdcStartTime to specify when you want a CDC operation to start. Specifying both values results in an error.</p> <p> The value can be in date, checkpoint, or LSN/SCN format.</p> <p>Date Example: --cdc-start-position “2018-03-08T12:12:12”</p> <p>Checkpoint Example: --cdc-start-position \"checkpoint:V1#27#mysql-bin-changelog.157832:1975:-1:2002:677883278264080:mysql-bin-changelog.157832:1876#0#0#*#0#93\"</p> <p>LSN Example: --cdc-start-position “mysql-bin-changelog.000024:373”</p>"
+          "documentation":"<p>Indicates when you want a change data capture (CDC) operation to start. Use either CdcStartPosition or CdcStartTime to specify when you want a CDC operation to start. Specifying both values results in an error.</p> <p> The value can be in date, checkpoint, or LSN/SCN format.</p> <p>Date Example: --cdc-start-position “2018-03-08T12:12:12”</p> <p>Checkpoint Example: --cdc-start-position \"checkpoint:V1#27#mysql-bin-changelog.157832:1975:-1:2002:677883278264080:mysql-bin-changelog.157832:1876#0#0#*#0#93\"</p> <p>LSN Example: --cdc-start-position “mysql-bin-changelog.000024:373”</p> <note> <p>When you use this task setting with a source PostgreSQL database, a logical replication slot should already be created and associated with the source endpoint. You can verify this by setting the <code>slotName</code> extra connection attribute to the name of this logical replication slot. For more information, see <a href=\"https://docs.aws.amazon.com/dms/latest/userguide/CHAP_Source.PostgreSQL.html#CHAP_Source.PostgreSQL.ConnectionAttrib\">Extra Connection Attributes When Using PostgreSQL as a Source for AWS DMS</a>.</p> </note>"
         },
         "CdcStopPosition":{
           "shape":"String",
@@ -3803,7 +3876,7 @@
           "documentation":"<p>The status of the subnet.</p>"
         }
       },
-      "documentation":"<p/>"
+      "documentation":"<p>In response to a request by the <code>DescribeReplicationSubnetGroup</code> operation, this object identifies a subnet by its given Availability Zone, subnet identifier, and status.</p>"
     },
     "SubnetAlreadyInUse":{
       "type":"structure",
@@ -3829,7 +3902,7 @@
       "members":{
         "EngineName":{
           "shape":"String",
-          "documentation":"<p>The database engine name. Valid values, depending on the EndpointType, include mysql, oracle, postgres, mariadb, aurora, aurora-postgresql, redshift, s3, db2, azuredb, sybase, dynamodb, mongodb, and sqlserver.</p>"
+          "documentation":"<p>The database engine name. Valid values, depending on the EndpointType, include <code>\"mysql\"</code>, <code>\"oracle\"</code>, <code>\"postgres\"</code>, <code>\"mariadb\"</code>, <code>\"aurora\"</code>, <code>\"aurora-postgresql\"</code>, <code>\"redshift\"</code>, <code>\"s3\"</code>, <code>\"db2\"</code>, <code>\"azuredb\"</code>, <code>\"sybase\"</code>, <code>\"dynamodb\"</code>, <code>\"mongodb\"</code>, <code>\"kinesis\"</code>, <code>\"kafka\"</code>, <code>\"elasticsearch\"</code>, <code>\"documentdb\"</code>, and <code>\"sqlserver\"</code>.</p>"
         },
         "SupportsCDC":{
           "shape":"Boolean",
@@ -3844,7 +3917,7 @@
           "documentation":"<p>The expanded name for the engine name. For example, if the <code>EngineName</code> parameter is \"aurora,\" this value would be \"Amazon Aurora MySQL.\"</p>"
         }
       },
-      "documentation":"<p/>"
+      "documentation":"<p>Provides information about types of supported endpoints in response to a request by the <code>DescribeEndpointTypes</code> operation. This information includes the type of endpoint, the database engine name, and whether change data capture (CDC) is supported.</p>"
     },
     "SupportedEndpointTypeList":{
       "type":"list",
@@ -3880,23 +3953,35 @@
         },
         "Ddls":{
           "shape":"Long",
-          "documentation":"<p>The Data Definition Language (DDL) used to build and modify the structure of your tables.</p>"
+          "documentation":"<p>The data definition language (DDL) used to build and modify the structure of your tables.</p>"
         },
         "FullLoadRows":{
           "shape":"Long",
-          "documentation":"<p>The number of rows added during the Full Load operation.</p>"
+          "documentation":"<p>The number of rows added during the full load operation.</p>"
         },
         "FullLoadCondtnlChkFailedRows":{
           "shape":"Long",
-          "documentation":"<p>The number of rows that failed conditional checks during the Full Load operation (valid only for DynamoDB as a target migrations).</p>"
+          "documentation":"<p>The number of rows that failed conditional checks during the full load operation (valid only for migrations where DynamoDB is the target).</p>"
         },
         "FullLoadErrorRows":{
           "shape":"Long",
-          "documentation":"<p>The number of rows that failed to load during the Full Load operation (valid only for DynamoDB as a target migrations).</p>"
+          "documentation":"<p>The number of rows that failed to load during the full load operation (valid only for migrations where DynamoDB is the target).</p>"
+        },
+        "FullLoadStartTime":{
+          "shape":"TStamp",
+          "documentation":"<p>The time when the full load operation started.</p>"
+        },
+        "FullLoadEndTime":{
+          "shape":"TStamp",
+          "documentation":"<p>The time when the full load operation completed.</p>"
+        },
+        "FullLoadReloaded":{
+          "shape":"BooleanOptional",
+          "documentation":"<p>A value that indicates if the table was reloaded (<code>true</code>) or loaded as part of a new full load operation (<code>false</code>).</p>"
         },
         "LastUpdateTime":{
           "shape":"TStamp",
-          "documentation":"<p>The last time the table was updated.</p>"
+          "documentation":"<p>The last time a table was updated.</p>"
         },
         "TableState":{
           "shape":"String",
@@ -3912,18 +3997,18 @@
         },
         "ValidationSuspendedRecords":{
           "shape":"Long",
-          "documentation":"<p>The number of records that could not be validated.</p>"
+          "documentation":"<p>The number of records that couldn't be validated.</p>"
         },
         "ValidationState":{
           "shape":"String",
-          "documentation":"<p>The validation state of the table.</p> <p>The parameter can have the following values</p> <ul> <li> <p>Not enabled—Validation is not enabled for the table in the migration task.</p> </li> <li> <p>Pending records—Some records in the table are waiting for validation.</p> </li> <li> <p>Mismatched records—Some records in the table do not match between the source and target.</p> </li> <li> <p>Suspended records—Some records in the table could not be validated.</p> </li> <li> <p>No primary key—The table could not be validated because it had no primary key.</p> </li> <li> <p>Table error—The table was not validated because it was in an error state and some data was not migrated.</p> </li> <li> <p>Validated—All rows in the table were validated. If the table is updated, the status can change from Validated.</p> </li> <li> <p>Error—The table could not be validated because of an unexpected error.</p> </li> </ul>"
+          "documentation":"<p>The validation state of the table.</p> <p>This parameter can have the following values:</p> <ul> <li> <p>Not enabled - Validation isn't enabled for the table in the migration task.</p> </li> <li> <p>Pending records - Some records in the table are waiting for validation.</p> </li> <li> <p>Mismatched records - Some records in the table don't match between the source and target.</p> </li> <li> <p>Suspended records - Some records in the table couldn't be validated.</p> </li> <li> <p>No primary key - The table couldn't be validated because it has no primary key.</p> </li> <li> <p>Table error - The table wasn't validated because it's in an error state and some data wasn't migrated.</p> </li> <li> <p>Validated - All rows in the table are validated. If the table is updated, the status can change from Validated.</p> </li> <li> <p>Error - The table couldn't be validated because of an unexpected error.</p> </li> </ul>"
         },
         "ValidationStateDetails":{
           "shape":"String",
           "documentation":"<p>Additional details about the state of validation.</p>"
         }
       },
-      "documentation":"<p/>"
+      "documentation":"<p>Provides a collection of table statistics in response to a request by the <code>DescribeTableStatistics</code> operation.</p>"
     },
     "TableStatisticsList":{
       "type":"list",
@@ -3941,21 +4026,21 @@
           "documentation":"<p>The table name of the table to be reloaded.</p>"
         }
       },
-      "documentation":"<p/>"
+      "documentation":"<p>Provides the name of the schema and table to be reloaded.</p>"
     },
     "Tag":{
       "type":"structure",
       "members":{
         "Key":{
           "shape":"String",
-          "documentation":"<p>A key is the required name of the tag. The string value can be from 1 to 128 Unicode characters in length and cannot be prefixed with \"aws:\" or \"dms:\". The string can only contain only the set of Unicode letters, digits, white-space, '_', '.', '/', '=', '+', '-' (Java regex: \"^([\\\\p{L}\\\\p{Z}\\\\p{N}_.:/=+\\\\-]*)$\").</p>"
+          "documentation":"<p>A key is the required name of the tag. The string value can be from 1 to 128 Unicode characters in length and can't be prefixed with \"aws:\" or \"dms:\". The string can only contain only the set of Unicode letters, digits, white-space, '_', '.', '/', '=', '+', '-' (Java regex: \"^([\\\\p{L}\\\\p{Z}\\\\p{N}_.:/=+\\\\-]*)$\").</p>"
         },
         "Value":{
           "shape":"String",
-          "documentation":"<p>A value is the optional value of the tag. The string value can be from 1 to 256 Unicode characters in length and cannot be prefixed with \"aws:\" or \"dms:\". The string can only contain only the set of Unicode letters, digits, white-space, '_', '.', '/', '=', '+', '-' (Java regex: \"^([\\\\p{L}\\\\p{Z}\\\\p{N}_.:/=+\\\\-]*)$\").</p>"
+          "documentation":"<p>A value is the optional value of the tag. The string value can be from 1 to 256 Unicode characters in length and can't be prefixed with \"aws:\" or \"dms:\". The string can only contain only the set of Unicode letters, digits, white-space, '_', '.', '/', '=', '+', '-' (Java regex: \"^([\\\\p{L}\\\\p{Z}\\\\p{N}_.:/=+\\\\-]*)$\").</p>"
         }
       },
-      "documentation":"<p/>"
+      "documentation":"<p>A user-defined key-value pair that describes metadata added to an AWS DMS resource and that is used by operations such as the following:</p> <ul> <li> <p> <code>AddTagsToResource</code> </p> </li> <li> <p> <code>ListTagsForResource</code> </p> </li> <li> <p> <code>RemoveTagsFromResource</code> </p> </li> </ul>"
     },
     "TagList":{
       "type":"list",
@@ -4016,7 +4101,7 @@
           "documentation":"<p>The status of the VPC security group.</p>"
         }
       },
-      "documentation":"<p/>"
+      "documentation":"<p>Describes status of a security group associated with the virtual private cloud hosting your replication and DB instances.</p>"
     },
     "VpcSecurityGroupMembershipList":{
       "type":"list",
diff --git a/services/databasemigration/src/test/resources/cucumber.properties b/services/databasemigration/src/test/resources/cucumber.properties
index 3fe60cef4e80..f1a952f19a6f 100644
--- a/services/databasemigration/src/test/resources/cucumber.properties
+++ b/services/databasemigration/src/test/resources/cucumber.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/dataexchange/pom.xml b/services/dataexchange/pom.xml
new file mode 100644
index 000000000000..a687d0620e5a
--- /dev/null
+++ b/services/dataexchange/pom.xml
@@ -0,0 +1,60 @@
+<?xml version="1.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.
+  -->
+
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>software.amazon.awssdk</groupId>
+        <artifactId>services</artifactId>
+        <version>2.11.8-SNAPSHOT</version>
+    </parent>
+    <artifactId>dataexchange</artifactId>
+    <name>AWS Java SDK :: Services :: DataExchange</name>
+    <description>The AWS Java SDK for DataExchange module holds the client classes that are used for
+        communicating with DataExchange.
+    </description>
+    <url>https://aws.amazon.com/sdkforjava</url>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifestEntries>
+                            <Automatic-Module-Name>software.amazon.awssdk.services.dataexchange</Automatic-Module-Name>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>protocol-core</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>aws-json-protocol</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/services/dataexchange/src/main/resources/codegen-resources/paginators-1.json b/services/dataexchange/src/main/resources/codegen-resources/paginators-1.json
new file mode 100644
index 000000000000..d76ccf7f38be
--- /dev/null
+++ b/services/dataexchange/src/main/resources/codegen-resources/paginators-1.json
@@ -0,0 +1,28 @@
+{
+  "pagination": {
+    "ListDataSetRevisions": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "MaxResults",
+      "result_key": "Revisions"
+    },
+    "ListDataSets": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "MaxResults",
+      "result_key": "DataSets"
+    },
+    "ListJobs": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "MaxResults",
+      "result_key": "Jobs"
+    },
+    "ListRevisionAssets": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "MaxResults",
+      "result_key": "Assets"
+    }
+  }
+}
\ No newline at end of file
diff --git a/services/dataexchange/src/main/resources/codegen-resources/service-2.json b/services/dataexchange/src/main/resources/codegen-resources/service-2.json
new file mode 100644
index 000000000000..8057f64d11f5
--- /dev/null
+++ b/services/dataexchange/src/main/resources/codegen-resources/service-2.json
@@ -0,0 +1,2696 @@
+{
+  "metadata": {
+    "apiVersion": "2017-07-25",
+    "endpointPrefix": "dataexchange",
+    "signingName": "dataexchange",
+    "serviceFullName": "AWS Data Exchange",
+    "serviceId": "DataExchange",
+    "protocol": "rest-json",
+    "jsonVersion": "1.1",
+    "uid": "dataexchange-2017-07-25",
+    "signatureVersion": "v4"
+  },
+  "operations": {
+    "CancelJob": {
+      "name": "CancelJob",
+      "http": {
+        "method": "DELETE",
+        "requestUri": "/v1/jobs/{JobId}",
+        "responseCode": 204
+      },
+      "input": {
+        "shape": "CancelJobRequest"
+      },
+      "errors": [
+        {
+          "shape": "ResourceNotFoundException",
+          "documentation": "<p>404 response</p>"
+        },
+        {
+          "shape": "ThrottlingException",
+          "documentation": "<p>429 response</p>"
+        },
+        {
+          "shape": "ValidationException",
+          "documentation": "<p>400 response</p>"
+        },
+        {
+          "shape": "InternalServerException",
+          "documentation": "<p>500 response</p>"
+        },
+        {
+          "shape": "ConflictException",
+          "documentation": "<p>409 response</p>"
+        }
+      ],
+      "documentation": "<p>This operation cancels a job. Jobs can be cancelled only when they are in the WAITING state.</p>"
+    },
+    "CreateDataSet": {
+      "name": "CreateDataSet",
+      "http": {
+        "method": "POST",
+        "requestUri": "/v1/data-sets",
+        "responseCode": 201
+      },
+      "input": {
+        "shape": "CreateDataSetRequest"
+      },
+      "output": {
+        "shape": "CreateDataSetResponse",
+        "documentation": "<p>201 response</p>"
+      },
+      "errors": [
+        {
+          "shape": "ThrottlingException",
+          "documentation": "<p>429 response</p>"
+        },
+        {
+          "shape": "ValidationException",
+          "documentation": "<p>400 response</p>"
+        },
+        {
+          "shape": "InternalServerException",
+          "documentation": "<p>500 response</p>"
+        },
+        {
+          "shape": "ServiceLimitExceededException",
+          "documentation": "<p>402 response</p>"
+        },
+        {
+          "shape": "AccessDeniedException",
+          "documentation": "<p>403 response</p>"
+        }
+      ],
+      "documentation": "<p>This operation creates a data set.</p>"
+    },
+    "CreateJob": {
+      "name": "CreateJob",
+      "http": {
+        "method": "POST",
+        "requestUri": "/v1/jobs",
+        "responseCode": 201
+      },
+      "input": {
+        "shape": "CreateJobRequest"
+      },
+      "output": {
+        "shape": "CreateJobResponse",
+        "documentation": "<p>201 response</p>"
+      },
+      "errors": [
+        {
+          "shape": "ResourceNotFoundException",
+          "documentation": "<p>404 response</p>"
+        },
+        {
+          "shape": "ThrottlingException",
+          "documentation": "<p>429 response</p>"
+        },
+        {
+          "shape": "ValidationException",
+          "documentation": "<p>400 response</p>"
+        },
+        {
+          "shape": "InternalServerException",
+          "documentation": "<p>500 response</p>"
+        },
+        {
+          "shape": "AccessDeniedException",
+          "documentation": "<p>403 response</p>"
+        }
+      ],
+      "documentation": "<p>This operation creates a job.</p>"
+    },
+    "CreateRevision": {
+      "name": "CreateRevision",
+      "http": {
+        "method": "POST",
+        "requestUri": "/v1/data-sets/{DataSetId}/revisions",
+        "responseCode": 201
+      },
+      "input": {
+        "shape": "CreateRevisionRequest"
+      },
+      "output": {
+        "shape": "CreateRevisionResponse",
+        "documentation": "<p>201 response</p>"
+      },
+      "errors": [
+        {
+          "shape": "ResourceNotFoundException",
+          "documentation": "<p>404 response</p>"
+        },
+        {
+          "shape": "ThrottlingException",
+          "documentation": "<p>429 response</p>"
+        },
+        {
+          "shape": "ValidationException",
+          "documentation": "<p>400 response</p>"
+        },
+        {
+          "shape": "InternalServerException",
+          "documentation": "<p>500 response</p>"
+        },
+        {
+          "shape": "AccessDeniedException",
+          "documentation": "<p>403 response</p>"
+        }
+      ],
+      "documentation": "<p>This operation creates a revision for a data set.</p>"
+    },
+    "DeleteAsset": {
+      "name": "DeleteAsset",
+      "http": {
+        "method": "DELETE",
+        "requestUri": "/v1/data-sets/{DataSetId}/revisions/{RevisionId}/assets/{AssetId}",
+        "responseCode": 204
+      },
+      "input": {
+        "shape": "DeleteAssetRequest"
+      },
+      "errors": [
+        {
+          "shape": "ValidationException",
+          "documentation": "<p>400 response</p>"
+        },
+        {
+          "shape": "InternalServerException",
+          "documentation": "<p>500 response</p>"
+        },
+        {
+          "shape": "AccessDeniedException",
+          "documentation": "<p>403 response</p>"
+        },
+        {
+          "shape": "ResourceNotFoundException",
+          "documentation": "<p>404 response</p>"
+        },
+        {
+          "shape": "ThrottlingException",
+          "documentation": "<p>429 response</p>"
+        },
+        {
+          "shape": "ConflictException",
+          "documentation": "<p>409 response</p>"
+        }
+      ],
+      "documentation": "<p>This operation deletes an asset.</p>"
+    },
+    "DeleteDataSet": {
+      "name": "DeleteDataSet",
+      "http": {
+        "method": "DELETE",
+        "requestUri": "/v1/data-sets/{DataSetId}",
+        "responseCode": 204
+      },
+      "input": {
+        "shape": "DeleteDataSetRequest"
+      },
+      "errors": [
+        {
+          "shape": "ValidationException",
+          "documentation": "<p>400 response</p>"
+        },
+        {
+          "shape": "InternalServerException",
+          "documentation": "<p>500 response</p>"
+        },
+        {
+          "shape": "AccessDeniedException",
+          "documentation": "<p>403 response</p>"
+        },
+        {
+          "shape": "ResourceNotFoundException",
+          "documentation": "<p>404 response</p>"
+        },
+        {
+          "shape": "ThrottlingException",
+          "documentation": "<p>429 response</p>"
+        },
+        {
+          "shape": "ConflictException",
+          "documentation": "<p>409 response</p>"
+        }
+      ],
+      "documentation": "<p>This operation deletes a data set.</p>"
+    },
+    "DeleteRevision": {
+      "name": "DeleteRevision",
+      "http": {
+        "method": "DELETE",
+        "requestUri": "/v1/data-sets/{DataSetId}/revisions/{RevisionId}",
+        "responseCode": 204
+      },
+      "input": {
+        "shape": "DeleteRevisionRequest"
+      },
+      "errors": [
+        {
+          "shape": "ValidationException",
+          "documentation": "<p>400 response</p>"
+        },
+        {
+          "shape": "InternalServerException",
+          "documentation": "<p>500 response</p>"
+        },
+        {
+          "shape": "AccessDeniedException",
+          "documentation": "<p>403 response</p>"
+        },
+        {
+          "shape": "ResourceNotFoundException",
+          "documentation": "<p>404 response</p>"
+        },
+        {
+          "shape": "ThrottlingException",
+          "documentation": "<p>429 response</p>"
+        },
+        {
+          "shape": "ConflictException",
+          "documentation": "<p>409 response</p>"
+        }
+      ],
+      "documentation": "<p>This operation deletes a revision.</p>"
+    },
+    "GetAsset": {
+      "name": "GetAsset",
+      "http": {
+        "method": "GET",
+        "requestUri": "/v1/data-sets/{DataSetId}/revisions/{RevisionId}/assets/{AssetId}",
+        "responseCode": 200
+      },
+      "input": {
+        "shape": "GetAssetRequest"
+      },
+      "output": {
+        "shape": "GetAssetResponse",
+        "documentation": "<p>200 response</p>"
+      },
+      "errors": [
+        {
+          "shape": "ResourceNotFoundException",
+          "documentation": "<p>404 response</p>"
+        },
+        {
+          "shape": "ThrottlingException",
+          "documentation": "<p>429 response</p>"
+        },
+        {
+          "shape": "ValidationException",
+          "documentation": "<p>400 response</p>"
+        },
+        {
+          "shape": "InternalServerException",
+          "documentation": "<p>500 response</p>"
+        }
+      ],
+      "documentation": "<p>This operation returns information about an asset.</p>"
+    },
+    "GetDataSet": {
+      "name": "GetDataSet",
+      "http": {
+        "method": "GET",
+        "requestUri": "/v1/data-sets/{DataSetId}",
+        "responseCode": 200
+      },
+      "input": {
+        "shape": "GetDataSetRequest"
+      },
+      "output": {
+        "shape": "GetDataSetResponse",
+        "documentation": "<p>200 response</p>"
+      },
+      "errors": [
+        {
+          "shape": "ResourceNotFoundException",
+          "documentation": "<p>404 response</p>"
+        },
+        {
+          "shape": "ThrottlingException",
+          "documentation": "<p>429 response</p>"
+        },
+        {
+          "shape": "ValidationException",
+          "documentation": "<p>400 response</p>"
+        },
+        {
+          "shape": "InternalServerException",
+          "documentation": "<p>500 response</p>"
+        }
+      ],
+      "documentation": "<p>This operation returns information about a data set.</p>"
+    },
+    "GetJob": {
+      "name": "GetJob",
+      "http": {
+        "method": "GET",
+        "requestUri": "/v1/jobs/{JobId}",
+        "responseCode": 200
+      },
+      "input": {
+        "shape": "GetJobRequest"
+      },
+      "output": {
+        "shape": "GetJobResponse",
+        "documentation": "<p>200 response</p>"
+      },
+      "errors": [
+        {
+          "shape": "ResourceNotFoundException",
+          "documentation": "<p>404 response</p>"
+        },
+        {
+          "shape": "ThrottlingException",
+          "documentation": "<p>429 response</p>"
+        },
+        {
+          "shape": "ValidationException",
+          "documentation": "<p>400 response</p>"
+        },
+        {
+          "shape": "InternalServerException",
+          "documentation": "<p>500 response</p>"
+        }
+      ],
+      "documentation": "<p>This operation returns information about a job.</p>"
+    },
+    "GetRevision": {
+      "name": "GetRevision",
+      "http": {
+        "method": "GET",
+        "requestUri": "/v1/data-sets/{DataSetId}/revisions/{RevisionId}",
+        "responseCode": 200
+      },
+      "input": {
+        "shape": "GetRevisionRequest"
+      },
+      "output": {
+        "shape": "GetRevisionResponse",
+        "documentation": "<p>200 response</p>"
+      },
+      "errors": [
+        {
+          "shape": "ResourceNotFoundException",
+          "documentation": "<p>404 response</p>"
+        },
+        {
+          "shape": "ThrottlingException",
+          "documentation": "<p>429 response</p>"
+        },
+        {
+          "shape": "ValidationException",
+          "documentation": "<p>400 response</p>"
+        },
+        {
+          "shape": "InternalServerException",
+          "documentation": "<p>500 response</p>"
+        }
+      ],
+      "documentation": "<p>This operation returns information about a revision.</p>"
+    },
+    "ListDataSetRevisions": {
+      "name": "ListDataSetRevisions",
+      "http": {
+        "method": "GET",
+        "requestUri": "/v1/data-sets/{DataSetId}/revisions",
+        "responseCode": 200
+      },
+      "input": {
+        "shape": "ListDataSetRevisionsRequest"
+      },
+      "output": {
+        "shape": "ListDataSetRevisionsResponse",
+        "documentation": "<p>200 response</p>"
+      },
+      "errors": [
+        {
+          "shape": "ResourceNotFoundException",
+          "documentation": "<p>404 response</p>"
+        },
+        {
+          "shape": "ThrottlingException",
+          "documentation": "<p>429 response</p>"
+        },
+        {
+          "shape": "ValidationException",
+          "documentation": "<p>400 response</p>"
+        },
+        {
+          "shape": "InternalServerException",
+          "documentation": "<p>500 response</p>"
+        }
+      ],
+      "documentation": "<p>This operation lists a data set's revisions sorted by CreatedAt in descending order.</p>"
+    },
+    "ListDataSets": {
+      "name": "ListDataSets",
+      "http": {
+        "method": "GET",
+        "requestUri": "/v1/data-sets",
+        "responseCode": 200
+      },
+      "input": {
+        "shape": "ListDataSetsRequest"
+      },
+      "output": {
+        "shape": "ListDataSetsResponse",
+        "documentation": "<p>200 response</p>"
+      },
+      "errors": [
+        {
+          "shape": "ResourceNotFoundException",
+          "documentation": "<p>404 response</p>"
+        },
+        {
+          "shape": "ThrottlingException",
+          "documentation": "<p>429 response</p>"
+        },
+        {
+          "shape": "ValidationException",
+          "documentation": "<p>400 response</p>"
+        },
+        {
+          "shape": "InternalServerException",
+          "documentation": "<p>500 response</p>"
+        }
+      ],
+      "documentation": "<p>This operation lists your data sets. When listing by origin OWNED, results are sorted by CreatedAt in descending order. When listing by origin ENTITLED, there is no order and the maxResults parameter is ignored.</p>"
+    },
+    "ListJobs": {
+      "name": "ListJobs",
+      "http": {
+        "method": "GET",
+        "requestUri": "/v1/jobs",
+        "responseCode": 200
+      },
+      "input": {
+        "shape": "ListJobsRequest"
+      },
+      "output": {
+        "shape": "ListJobsResponse",
+        "documentation": "<p>200 response</p>"
+      },
+      "errors": [
+        {
+          "shape": "ResourceNotFoundException",
+          "documentation": "<p>404 response</p>"
+        },
+        {
+          "shape": "ThrottlingException",
+          "documentation": "<p>429 response</p>"
+        },
+        {
+          "shape": "ValidationException",
+          "documentation": "<p>400 response</p>"
+        },
+        {
+          "shape": "InternalServerException",
+          "documentation": "<p>500 response</p>"
+        }
+      ],
+      "documentation": "<p>This operation lists your jobs sorted by CreatedAt in descending order.</p>"
+    },
+    "ListRevisionAssets": {
+      "name": "ListRevisionAssets",
+      "http": {
+        "method": "GET",
+        "requestUri": "/v1/data-sets/{DataSetId}/revisions/{RevisionId}/assets",
+        "responseCode": 200
+      },
+      "input": {
+        "shape": "ListRevisionAssetsRequest"
+      },
+      "output": {
+        "shape": "ListRevisionAssetsResponse",
+        "documentation": "<p>200 response</p>"
+      },
+      "errors": [
+        {
+          "shape": "ResourceNotFoundException",
+          "documentation": "<p>404 response</p>"
+        },
+        {
+          "shape": "ThrottlingException",
+          "documentation": "<p>429 response</p>"
+        },
+        {
+          "shape": "ValidationException",
+          "documentation": "<p>400 response</p>"
+        },
+        {
+          "shape": "InternalServerException",
+          "documentation": "<p>500 response</p>"
+        }
+      ],
+      "documentation": "<p>This operation lists a revision's assets sorted alphabetically in descending order.</p>"
+    },
+    "ListTagsForResource": {
+      "name": "ListTagsForResource",
+      "http": {
+        "method": "GET",
+        "requestUri": "/tags/{resource-arn}",
+        "responseCode": 200
+      },
+      "input": {
+        "shape": "ListTagsForResourceRequest"
+      },
+      "output": {
+        "shape": "ListTagsForResourceResponse",
+        "documentation": "<p>200 response</p>"
+      },
+      "errors": [],
+      "documentation": "<p>This operation lists the tags on the resource.</p>"
+    },
+    "StartJob": {
+      "name": "StartJob",
+      "http": {
+        "method": "PATCH",
+        "requestUri": "/v1/jobs/{JobId}",
+        "responseCode": 202
+      },
+      "input": {
+        "shape": "StartJobRequest"
+      },
+      "output": {
+        "shape": "StartJobResponse",
+        "documentation": "<p>202 response</p>"
+      },
+      "errors": [
+        {
+          "shape": "ValidationException",
+          "documentation": "<p>400 response</p>"
+        },
+        {
+          "shape": "InternalServerException",
+          "documentation": "<p>500 response</p>"
+        },
+        {
+          "shape": "AccessDeniedException",
+          "documentation": "<p>403 response</p>"
+        },
+        {
+          "shape": "ResourceNotFoundException",
+          "documentation": "<p>404 response</p>"
+        },
+        {
+          "shape": "ThrottlingException",
+          "documentation": "<p>429 response</p>"
+        },
+        {
+          "shape": "ConflictException",
+          "documentation": "<p>409 response</p>"
+        }
+      ],
+      "documentation": "<p>This operation starts a job.</p>"
+    },
+    "TagResource": {
+      "name": "TagResource",
+      "http": {
+        "method": "POST",
+        "requestUri": "/tags/{resource-arn}",
+        "responseCode": 204
+      },
+      "input": {
+        "shape": "TagResourceRequest"
+      },
+      "errors": [],
+      "documentation": "<p>This operation tags a resource.</p>"
+    },
+    "UntagResource": {
+      "name": "UntagResource",
+      "http": {
+        "method": "DELETE",
+        "requestUri": "/tags/{resource-arn}",
+        "responseCode": 204
+      },
+      "input": {
+        "shape": "UntagResourceRequest"
+      },
+      "errors": [],
+      "documentation": "<p>This operation removes one or more tags from a resource.</p>"
+    },
+    "UpdateAsset": {
+      "name": "UpdateAsset",
+      "http": {
+        "method": "PATCH",
+        "requestUri": "/v1/data-sets/{DataSetId}/revisions/{RevisionId}/assets/{AssetId}",
+        "responseCode": 200
+      },
+      "input": {
+        "shape": "UpdateAssetRequest"
+      },
+      "output": {
+        "shape": "UpdateAssetResponse",
+        "documentation": "<p>200 response</p>"
+      },
+      "errors": [
+        {
+          "shape": "ValidationException",
+          "documentation": "<p>400 response</p>"
+        },
+        {
+          "shape": "InternalServerException",
+          "documentation": "<p>500 response</p>"
+        },
+        {
+          "shape": "AccessDeniedException",
+          "documentation": "<p>403 response</p>"
+        },
+        {
+          "shape": "ResourceNotFoundException",
+          "documentation": "<p>404 response</p>"
+        },
+        {
+          "shape": "ThrottlingException",
+          "documentation": "<p>429 response</p>"
+        },
+        {
+          "shape": "ConflictException",
+          "documentation": "<p>409 response</p>"
+        }
+      ],
+      "documentation": "<p>This operation updates an asset.</p>"
+    },
+    "UpdateDataSet": {
+      "name": "UpdateDataSet",
+      "http": {
+        "method": "PATCH",
+        "requestUri": "/v1/data-sets/{DataSetId}",
+        "responseCode": 200
+      },
+      "input": {
+        "shape": "UpdateDataSetRequest"
+      },
+      "output": {
+        "shape": "UpdateDataSetResponse",
+        "documentation": "<p>200 response</p>"
+      },
+      "errors": [
+        {
+          "shape": "ResourceNotFoundException",
+          "documentation": "<p>404 response</p>"
+        },
+        {
+          "shape": "ThrottlingException",
+          "documentation": "<p>429 response</p>"
+        },
+        {
+          "shape": "ValidationException",
+          "documentation": "<p>400 response</p>"
+        },
+        {
+          "shape": "InternalServerException",
+          "documentation": "<p>500 response</p>"
+        },
+        {
+          "shape": "AccessDeniedException",
+          "documentation": "<p>403 response</p>"
+        }
+      ],
+      "documentation": "<p>This operation updates a data set.</p>"
+    },
+    "UpdateRevision": {
+      "name": "UpdateRevision",
+      "http": {
+        "method": "PATCH",
+        "requestUri": "/v1/data-sets/{DataSetId}/revisions/{RevisionId}",
+        "responseCode": 200
+      },
+      "input": {
+        "shape": "UpdateRevisionRequest"
+      },
+      "output": {
+        "shape": "UpdateRevisionResponse",
+        "documentation": "<p>200 response</p>"
+      },
+      "errors": [
+        {
+          "shape": "ValidationException",
+          "documentation": "<p>400 response</p>"
+        },
+        {
+          "shape": "InternalServerException",
+          "documentation": "<p>500 response</p>"
+        },
+        {
+          "shape": "AccessDeniedException",
+          "documentation": "<p>403 response</p>"
+        },
+        {
+          "shape": "ResourceNotFoundException",
+          "documentation": "<p>404 response</p>"
+        },
+        {
+          "shape": "ThrottlingException",
+          "documentation": "<p>429 response</p>"
+        },
+        {
+          "shape": "ConflictException",
+          "documentation": "<p>409 response</p>"
+        }
+      ],
+      "documentation": "<p>This operation updates a revision.</p>"
+    }
+  },
+  "shapes": {
+    "AccessDeniedException": {
+      "type": "structure",
+      "members": {
+        "Message": {
+          "shape": "__string",
+          "documentation": "<p>Access to the resource is denied.</p>"
+        }
+      },
+      "documentation": "<p>Access to the resource is denied.</p>",
+      "required": [
+        "Message"
+      ],
+      "exception": true,
+      "error": {
+        "httpStatusCode": 403
+      }
+    },
+    "Arn": {
+      "type": "string",
+      "documentation": "<p>An Amazon Resource Name (ARN) that uniquely identifies an AWS resource.</p>"
+    },
+    "AssetDestinationEntry": {
+      "type": "structure",
+      "members": {
+        "AssetId": {
+          "shape": "Id",
+          "documentation": "<p>The unique identifier for the asset.</p>"
+        },
+        "Bucket": {
+          "shape": "__string",
+          "documentation": "<p>The S3 bucket that is the destination for the asset.</p>"
+        },
+        "Key": {
+          "shape": "__string",
+          "documentation": "<p>The name of the object in Amazon S3 for the asset.</p>"
+        }
+      },
+      "documentation": "<p>The destination for the asset.</p>",
+      "required": [
+        "Bucket",
+        "AssetId"
+      ]
+    },
+    "AssetDetails": {
+      "type": "structure",
+      "members": {
+        "S3SnapshotAsset": {
+          "shape": "S3SnapshotAsset"
+        }
+      }
+    },
+    "AssetEntry": {
+      "type": "structure",
+      "members": {
+        "Arn": {
+          "shape": "Arn",
+          "documentation": "<p>The ARN for the asset.</p>"
+        },
+        "AssetDetails": {
+          "shape": "AssetDetails",
+          "documentation": "<p>Information about the asset, including its size.</p>"
+        },
+        "AssetType": {
+          "shape": "AssetType",
+          "documentation": "<p>The type of file your data is stored in. Currently, the supported asset type is S3_SNAPSHOT.</p>"
+        },
+        "CreatedAt": {
+          "shape": "Timestamp",
+          "documentation": "<p>The date and time that the asset was created, in ISO 8601 format.</p>"
+        },
+        "DataSetId": {
+          "shape": "Id",
+          "documentation": "<p>The unique identifier for the data set associated with this asset.</p>"
+        },
+        "Id": {
+          "shape": "Id",
+          "documentation": "<p>The unique identifier for the asset.</p>"
+        },
+        "Name": {
+          "shape": "AssetName",
+          "documentation": "<p>The name of the asset. When importing from Amazon S3, the S3 object key is used as the asset name. When exporting to Amazon S3, the asset name is used as default target S3 object key.</p>"
+        },
+        "RevisionId": {
+          "shape": "Id",
+          "documentation": "<p>The unique identifier for the revision associated with this asset.</p>"
+        },
+        "SourceId": {
+          "shape": "Id",
+          "documentation": "<p>The asset ID of the owned asset corresponding to the entitled asset being viewed. This parameter is returned when an asset owner is viewing the entitled copy of its owned asset.</p>"
+        },
+        "UpdatedAt": {
+          "shape": "Timestamp",
+          "documentation": "<p>The date and time that the asset was last updated, in ISO 8601 format.</p>"
+        }
+      },
+      "documentation": "<p>An asset in AWS Data Exchange is a piece of data that can be stored as an S3 object. The asset can be a structured data file, an image file, or some other data file. When you create an import job for your files, you create an asset in AWS Data Exchange for each of those files.</p>",
+      "required": [
+        "AssetType",
+        "CreatedAt",
+        "DataSetId",
+        "Id",
+        "Arn",
+        "AssetDetails",
+        "UpdatedAt",
+        "RevisionId",
+        "Name"
+      ]
+    },
+    "AssetName": {
+      "type": "string",
+      "documentation": "<p>The name of the asset. When importing from Amazon S3, the S3 object key is used as the asset name. When exporting to Amazon S3, the asset name is used as default target S3 object key.</p>"
+    },
+    "AssetSourceEntry": {
+      "type": "structure",
+      "members": {
+        "Bucket": {
+          "shape": "__string",
+          "documentation": "<p>The S3 bucket that's part of the source of the asset.</p>"
+        },
+        "Key": {
+          "shape": "__string",
+          "documentation": "<p>The name of the object in Amazon S3 for the asset.</p>"
+        }
+      },
+      "documentation": "<p>The source of the assets.</p>",
+      "required": [
+        "Bucket",
+        "Key"
+      ]
+    },
+    "AssetType": {
+      "type": "string",
+      "documentation": "<p>The type of file your data is stored in. Currently, the supported asset type is S3_SNAPSHOT.</p>",
+      "enum": [
+        "S3_SNAPSHOT"
+      ]
+    },
+    "CancelJobRequest": {
+      "type": "structure",
+      "members": {
+        "JobId": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "JobId",
+          "documentation": "<p>The unique identifier for a job.</p>"
+        }
+      },
+      "required": [
+        "JobId"
+      ]
+    },
+    "Code": {
+      "type": "string",
+      "enum": [
+        "ACCESS_DENIED_EXCEPTION",
+        "INTERNAL_SERVER_EXCEPTION",
+        "MALWARE_DETECTED",
+        "RESOURCE_NOT_FOUND_EXCEPTION",
+        "SERVICE_QUOTA_EXCEEDED_EXCEPTION",
+        "VALIDATION_EXCEPTION",
+        "MALWARE_SCAN_ENCRYPTED_FILE"
+      ]
+    },
+    "ConflictException": {
+      "type": "structure",
+      "members": {
+        "Message": {
+          "shape": "__string",
+          "documentation": "<p>The request couldn't be completed because it conflicted with the current state of the resource.</p>"
+        },
+        "ResourceId": {
+          "shape": "__string",
+          "documentation": "<p>The unique identifier for the resource with the conflict.</p>"
+        },
+        "ResourceType": {
+          "shape": "ResourceType",
+          "documentation": "<p>The type of the resource with the conflict.</p>"
+        }
+      },
+      "documentation": "<p>The request couldn't be completed because it conflicted with the current state of the resource.</p>",
+      "required": [
+        "Message"
+      ],
+      "exception": true,
+      "error": {
+        "httpStatusCode": 409
+      }
+    },
+    "CreateDataSetRequest": {
+      "type": "structure",
+      "members": {
+        "AssetType": {
+          "shape": "AssetType",
+          "documentation": "<p>The type of file your data is stored in. Currently, the supported asset type is S3_SNAPSHOT.</p>"
+        },
+        "Description": {
+          "shape": "Description",
+          "documentation": "<p>A description for the data set. This value can be up to 16,348 characters long.</p>"
+        },
+        "Name": {
+          "shape": "Name",
+          "documentation": "<p>The name of the data set.</p>"
+        },
+        "Tags": {
+          "shape": "MapOf__string",
+          "documentation": "<p>A data set tag is an optional label that you can assign to a data set when you create it. Each tag consists of a key and an optional value, both of which you define. When you use tagging, you can also use tag-based access control in IAM policies to control access to these data sets and revisions.</p>"
+        }
+      },
+      "documentation": "<p>The request body for CreateDataSet.</p>",
+      "required": [
+        "AssetType",
+        "Description",
+        "Name"
+      ]
+    },
+    "CreateDataSetResponse": {
+      "type": "structure",
+      "members": {
+        "Arn": {
+          "shape": "Arn",
+          "documentation": "<p>The ARN for the data set.</p>"
+        },
+        "AssetType": {
+          "shape": "AssetType",
+          "documentation": "<p>The type of file your data is stored in. Currently, the supported asset type is S3_SNAPSHOT.</p>"
+        },
+        "CreatedAt": {
+          "shape": "Timestamp",
+          "documentation": "<p>The date and time that the data set was created, in ISO 8601 format.</p>"
+        },
+        "Description": {
+          "shape": "Description",
+          "documentation": "<p>The description for the data set.</p>"
+        },
+        "Id": {
+          "shape": "Id",
+          "documentation": "<p>The unique identifier for the data set.</p>"
+        },
+        "Name": {
+          "shape": "Name",
+          "documentation": "<p>The name of the data set.</p>"
+        },
+        "Origin": {
+          "shape": "Origin",
+          "documentation": "<p>A property that defines the data set as OWNED by the account (for providers) or ENTITLED to the account (for subscribers).</p>"
+        },
+        "OriginDetails": {
+          "shape": "OriginDetails",
+          "documentation": "<p>If the origin of this data set is ENTITLED, includes the details for the product on AWS Marketplace.</p>"
+        },
+        "SourceId": {
+          "shape": "Id",
+          "documentation": "<p>The data set ID of the owned data set corresponding to the entitled data set being viewed. This parameter is returned when a data set owner is viewing the entitled copy of its owned data set.</p>"
+        },
+        "Tags": {
+          "shape": "MapOf__string",
+          "documentation": "<p>The tags for the data set.</p>"
+        },
+        "UpdatedAt": {
+          "shape": "Timestamp",
+          "documentation": "<p>The date and time that the data set was last updated, in ISO 8601 format.</p>"
+        }
+      }
+    },
+    "CreateJobRequest": {
+      "type": "structure",
+      "members": {
+        "Details": {
+          "shape": "RequestDetails",
+          "documentation": "<p>The details for the CreateJob request.</p>"
+        },
+        "Type": {
+          "shape": "Type",
+          "documentation": "<p>The type of job to be created.</p>"
+        }
+      },
+      "documentation": "<p>The request body for CreateJob.</p>",
+      "required": [
+        "Type",
+        "Details"
+      ]
+    },
+    "CreateJobResponse": {
+      "type": "structure",
+      "members": {
+        "Arn": {
+          "shape": "Arn",
+          "documentation": "<p>The ARN for the job.</p>"
+        },
+        "CreatedAt": {
+          "shape": "Timestamp",
+          "documentation": "<p>The date and time that the job was created, in ISO 8601 format.</p>"
+        },
+        "Details": {
+          "shape": "ResponseDetails",
+          "documentation": "<p>Details about the job.</p>"
+        },
+        "Errors": {
+          "shape": "ListOfJobError",
+          "documentation": "<p>The errors associated with jobs.</p>"
+        },
+        "Id": {
+          "shape": "Id",
+          "documentation": "<p>The unique identifier for the job.</p>"
+        },
+        "State": {
+          "shape": "State",
+          "documentation": "<p>The state of the job.</p>"
+        },
+        "Type": {
+          "shape": "Type",
+          "documentation": "<p>The job type.</p>"
+        },
+        "UpdatedAt": {
+          "shape": "Timestamp",
+          "documentation": "<p>The date and time that the job was last updated, in ISO 8601 format.</p>"
+        }
+      }
+    },
+    "CreateRevisionRequest": {
+      "type": "structure",
+      "members": {
+        "Comment": {
+          "shape": "__stringMin0Max16384",
+          "documentation": "<p>An optional comment about the revision.</p>"
+        },
+        "DataSetId": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "DataSetId",
+          "documentation": "<p>The unique identifier for a data set.</p>"
+        },
+        "Tags": {
+          "shape": "MapOf__string",
+          "documentation": "<p>A revision tag is an optional label that you can assign to a revision when you create it. Each tag consists of a key and an optional value, both of which you define. When you use tagging, you can also use tag-based access control in IAM policies to control access to these data sets and revisions.</p>"
+        }
+      },
+      "documentation": "<p>The request body for CreateRevision.</p>",
+      "required": [
+        "DataSetId"
+      ]
+    },
+    "CreateRevisionResponse": {
+      "type": "structure",
+      "members": {
+        "Arn": {
+          "shape": "Arn",
+          "documentation": "<p>The ARN for the revision</p>"
+        },
+        "Comment": {
+          "shape": "__stringMin0Max16384",
+          "documentation": "<p>An optional comment about the revision.</p>"
+        },
+        "CreatedAt": {
+          "shape": "Timestamp",
+          "documentation": "<p>The date and time that the revision was created, in ISO 8601 format.</p>"
+        },
+        "DataSetId": {
+          "shape": "Id",
+          "documentation": "<p>The unique identifier for the data set associated with this revision.</p>"
+        },
+        "Finalized": {
+          "shape": "__boolean",
+          "documentation": "<p>To publish a revision to a data set in a product, the revision must first be finalized. Finalizing a revision tells AWS Data Exchange that your changes to the assets in the revision are complete. After it's in this read-only state, you can publish the revision to your products.</p> <p>Finalized revisions can be published through the AWS Data Exchange console or the AWS Marketplace Catalog API, using the StartChangeSet AWS Marketplace Catalog API action. When using the API, revisions are uniquely identified by their ARN.</p>"
+        },
+        "Id": {
+          "shape": "Id",
+          "documentation": "<p>The unique identifier for the revision.</p>"
+        },
+        "SourceId": {
+          "shape": "Id",
+          "documentation": "<p>The revision ID of the owned revision corresponding to the entitled revision being viewed. This parameter is returned when a revision owner is viewing the entitled copy of its owned revision.</p>"
+        },
+        "Tags": {
+          "shape": "MapOf__string",
+          "documentation": "<p>The tags for the revision.</p>"
+        },
+        "UpdatedAt": {
+          "shape": "Timestamp",
+          "documentation": "<p>The date and time that the revision was last updated, in ISO 8601 format.</p>"
+        }
+      }
+    },
+    "DataSetEntry": {
+      "type": "structure",
+      "members": {
+        "Arn": {
+          "shape": "Arn",
+          "documentation": "<p>The ARN for the data set.</p>"
+        },
+        "AssetType": {
+          "shape": "AssetType",
+          "documentation": "<p>The type of file your data is stored in. Currently, the supported asset type is S3_SNAPSHOT.</p>"
+        },
+        "CreatedAt": {
+          "shape": "Timestamp",
+          "documentation": "<p>The date and time that the data set was created, in ISO 8601 format.</p>"
+        },
+        "Description": {
+          "shape": "Description",
+          "documentation": "<p>The description for the data set.</p>"
+        },
+        "Id": {
+          "shape": "Id",
+          "documentation": "<p>The unique identifier for the data set.</p>"
+        },
+        "Name": {
+          "shape": "Name",
+          "documentation": "<p>The name of the data set.</p>"
+        },
+        "Origin": {
+          "shape": "Origin",
+          "documentation": "<p>A property that defines the data set as OWNED by the account (for providers) or ENTITLED to the account (for subscribers).</p>"
+        },
+        "OriginDetails": {
+          "shape": "OriginDetails",
+          "documentation": "<p>If the origin of this data set is ENTITLED, includes the details for the product on AWS Marketplace.</p>"
+        },
+        "SourceId": {
+          "shape": "Id",
+          "documentation": "<p>The data set ID of the owned data set corresponding to the entitled data set being viewed. This parameter is returned when a data set owner is viewing the entitled copy of its owned data set.</p>"
+        },
+        "UpdatedAt": {
+          "shape": "Timestamp",
+          "documentation": "<p>The date and time that the data set was last updated, in ISO 8601 format.</p>"
+        }
+      },
+      "documentation": "<p>A data set is an AWS resource with one or more revisions.</p>",
+      "required": [
+        "Origin",
+        "AssetType",
+        "Description",
+        "CreatedAt",
+        "Id",
+        "Arn",
+        "UpdatedAt",
+        "Name"
+      ]
+    },
+    "DeleteAssetRequest": {
+      "type": "structure",
+      "members": {
+        "AssetId": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "AssetId",
+          "documentation": "<p>The unique identifier for an asset.</p>"
+        },
+        "DataSetId": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "DataSetId",
+          "documentation": "<p>The unique identifier for a data set.</p>"
+        },
+        "RevisionId": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "RevisionId",
+          "documentation": "<p>The unique identifier for a revision.</p>"
+        }
+      },
+      "required": [
+        "RevisionId",
+        "AssetId",
+        "DataSetId"
+      ]
+    },
+    "DeleteDataSetRequest": {
+      "type": "structure",
+      "members": {
+        "DataSetId": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "DataSetId",
+          "documentation": "<p>The unique identifier for a data set.</p>"
+        }
+      },
+      "required": [
+        "DataSetId"
+      ]
+    },
+    "DeleteRevisionRequest": {
+      "type": "structure",
+      "members": {
+        "DataSetId": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "DataSetId",
+          "documentation": "<p>The unique identifier for a data set.</p>"
+        },
+        "RevisionId": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "RevisionId",
+          "documentation": "<p>The unique identifier for a revision.</p>"
+        }
+      },
+      "required": [
+        "RevisionId",
+        "DataSetId"
+      ]
+    },
+    "Description": {
+      "type": "string",
+      "documentation": "<p>A description of a resource.</p>"
+    },
+    "Details": {
+      "type": "structure",
+      "members": {
+        "ImportAssetFromSignedUrlJobErrorDetails": {
+          "shape": "ImportAssetFromSignedUrlJobErrorDetails"
+        },
+        "ImportAssetsFromS3JobErrorDetails": {
+          "shape": "ListOfAssetSourceEntry"
+        }
+      }
+    },
+    "ExportAssetToSignedUrlRequestDetails": {
+      "type": "structure",
+      "members": {
+        "AssetId": {
+          "shape": "Id",
+          "documentation": "<p>The unique identifier for the asset that is exported to a signed URL.</p>"
+        },
+        "DataSetId": {
+          "shape": "Id",
+          "documentation": "<p>The unique identifier for the data set associated with this export job.</p>"
+        },
+        "RevisionId": {
+          "shape": "Id",
+          "documentation": "<p>The unique identifier for the revision associated with this export request.</p>"
+        }
+      },
+      "documentation": "<p>Details of the operation to be performed by the job.</p>",
+      "required": [
+        "DataSetId",
+        "AssetId",
+        "RevisionId"
+      ]
+    },
+    "ExportAssetToSignedUrlResponseDetails": {
+      "type": "structure",
+      "members": {
+        "AssetId": {
+          "shape": "Id",
+          "documentation": "<p>The unique identifier for the asset associated with this export job.</p>"
+        },
+        "DataSetId": {
+          "shape": "Id",
+          "documentation": "<p>The unique identifier for the data set associated with this export job.</p>"
+        },
+        "RevisionId": {
+          "shape": "Id",
+          "documentation": "<p>The unique identifier for the revision associated with this export response.</p>"
+        },
+        "SignedUrl": {
+          "shape": "__string",
+          "documentation": "<p>The signed URL for the export request.</p>"
+        },
+        "SignedUrlExpiresAt": {
+          "shape": "Timestamp",
+          "documentation": "<p>The date and time that the signed URL expires, in ISO 8601 format.</p>"
+        }
+      },
+      "documentation": "<p>The details of the export to signed URL response.</p>",
+      "required": [
+        "DataSetId",
+        "AssetId",
+        "RevisionId"
+      ]
+    },
+    "ExportAssetsToS3RequestDetails": {
+      "type": "structure",
+      "members": {
+        "AssetDestinations": {
+          "shape": "ListOfAssetDestinationEntry",
+          "documentation": "<p>The destination for the asset.</p>"
+        },
+        "DataSetId": {
+          "shape": "Id",
+          "documentation": "<p>The unique identifier for the data set associated with this export job.</p>"
+        },
+        "RevisionId": {
+          "shape": "Id",
+          "documentation": "<p>The unique identifier for the revision associated with this export request.</p>"
+        }
+      },
+      "documentation": "<p>Details of the operation to be performed by the job.</p>",
+      "required": [
+        "AssetDestinations",
+        "DataSetId",
+        "RevisionId"
+      ]
+    },
+    "ExportAssetsToS3ResponseDetails": {
+      "type": "structure",
+      "members": {
+        "AssetDestinations": {
+          "shape": "ListOfAssetDestinationEntry",
+          "documentation": "<p>The destination in Amazon S3 where the asset is exported.</p>"
+        },
+        "DataSetId": {
+          "shape": "Id",
+          "documentation": "<p>The unique identifier for the data set associated with this export job.</p>"
+        },
+        "RevisionId": {
+          "shape": "Id",
+          "documentation": "<p>The unique identifier for the revision associated with this export response.</p>"
+        }
+      },
+      "documentation": "<p>Details about the export to Amazon S3 response.</p>",
+      "required": [
+        "AssetDestinations",
+        "DataSetId",
+        "RevisionId"
+      ]
+    },
+    "GetAssetRequest": {
+      "type": "structure",
+      "members": {
+        "AssetId": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "AssetId",
+          "documentation": "<p>The unique identifier for an asset.</p>"
+        },
+        "DataSetId": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "DataSetId",
+          "documentation": "<p>The unique identifier for a data set.</p>"
+        },
+        "RevisionId": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "RevisionId",
+          "documentation": "<p>The unique identifier for a revision.</p>"
+        }
+      },
+      "required": [
+        "RevisionId",
+        "AssetId",
+        "DataSetId"
+      ]
+    },
+    "GetAssetResponse": {
+      "type": "structure",
+      "members": {
+        "Arn": {
+          "shape": "Arn",
+          "documentation": "<p>The ARN for the asset.</p>"
+        },
+        "AssetDetails": {
+          "shape": "AssetDetails",
+          "documentation": "<p>Information about the asset, including its size.</p>"
+        },
+        "AssetType": {
+          "shape": "AssetType",
+          "documentation": "<p>The type of file your data is stored in. Currently, the supported asset type is S3_SNAPSHOT.</p>"
+        },
+        "CreatedAt": {
+          "shape": "Timestamp",
+          "documentation": "<p>The date and time that the asset was created, in ISO 8601 format.</p>"
+        },
+        "DataSetId": {
+          "shape": "Id",
+          "documentation": "<p>The unique identifier for the data set associated with this asset.</p>"
+        },
+        "Id": {
+          "shape": "Id",
+          "documentation": "<p>The unique identifier for the asset.</p>"
+        },
+        "Name": {
+          "shape": "AssetName",
+          "documentation": "<p>The name of the asset When importing from Amazon S3, the S3 object key is used as the asset name. When exporting to Amazon S3, the asset name is used as default target S3 object key.</p>"
+        },
+        "RevisionId": {
+          "shape": "Id",
+          "documentation": "<p>The unique identifier for the revision associated with this asset.</p>"
+        },
+        "SourceId": {
+          "shape": "Id",
+          "documentation": "<p>The asset ID of the owned asset corresponding to the entitled asset being viewed. This parameter is returned when an asset owner is viewing the entitled copy of its owned asset.</p>"
+        },
+        "UpdatedAt": {
+          "shape": "Timestamp",
+          "documentation": "<p>The date and time that the asset was last updated, in ISO 8601 format.</p>"
+        }
+      }
+    },
+    "GetDataSetRequest": {
+      "type": "structure",
+      "members": {
+        "DataSetId": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "DataSetId",
+          "documentation": "<p>The unique identifier for a data set.</p>"
+        }
+      },
+      "required": [
+        "DataSetId"
+      ]
+    },
+    "GetDataSetResponse": {
+      "type": "structure",
+      "members": {
+        "Arn": {
+          "shape": "Arn",
+          "documentation": "<p>The ARN for the data set.</p>"
+        },
+        "AssetType": {
+          "shape": "AssetType",
+          "documentation": "<p>The type of file your data is stored in. Currently, the supported asset type is S3_SNAPSHOT.</p>"
+        },
+        "CreatedAt": {
+          "shape": "Timestamp",
+          "documentation": "<p>The date and time that the data set was created, in ISO 8601 format.</p>"
+        },
+        "Description": {
+          "shape": "Description",
+          "documentation": "<p>The description for the data set.</p>"
+        },
+        "Id": {
+          "shape": "Id",
+          "documentation": "<p>The unique identifier for the data set.</p>"
+        },
+        "Name": {
+          "shape": "Name",
+          "documentation": "<p>The name of the data set.</p>"
+        },
+        "Origin": {
+          "shape": "Origin",
+          "documentation": "<p>A property that defines the data set as OWNED by the account (for providers) or ENTITLED to the account (for subscribers).</p>"
+        },
+        "OriginDetails": {
+          "shape": "OriginDetails",
+          "documentation": "<p>If the origin of this data set is ENTITLED, includes the details for the product on AWS Marketplace.</p>"
+        },
+        "SourceId": {
+          "shape": "Id",
+          "documentation": "<p>The data set ID of the owned data set corresponding to the entitled data set being viewed. This parameter is returned when a data set owner is viewing the entitled copy of its owned data set.</p>"
+        },
+        "Tags": {
+          "shape": "MapOf__string",
+          "documentation": "<p>The tags for the data set.</p>"
+        },
+        "UpdatedAt": {
+          "shape": "Timestamp",
+          "documentation": "<p>The date and time that the data set was last updated, in ISO 8601 format.</p>"
+        }
+      }
+    },
+    "GetJobRequest": {
+      "type": "structure",
+      "members": {
+        "JobId": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "JobId",
+          "documentation": "<p>The unique identifier for a job.</p>"
+        }
+      },
+      "required": [
+        "JobId"
+      ]
+    },
+    "GetJobResponse": {
+      "type": "structure",
+      "members": {
+        "Arn": {
+          "shape": "Arn",
+          "documentation": "<p>The ARN for the job.</p>"
+        },
+        "CreatedAt": {
+          "shape": "Timestamp",
+          "documentation": "<p>The date and time that the job was created, in ISO 8601 format.</p>"
+        },
+        "Details": {
+          "shape": "ResponseDetails",
+          "documentation": "<p>Details about the job.</p>"
+        },
+        "Errors": {
+          "shape": "ListOfJobError",
+          "documentation": "<p>The errors associated with jobs.</p>"
+        },
+        "Id": {
+          "shape": "Id",
+          "documentation": "<p>The unique identifier for the job.</p>"
+        },
+        "State": {
+          "shape": "State",
+          "documentation": "<p>The state of the job.</p>"
+        },
+        "Type": {
+          "shape": "Type",
+          "documentation": "<p>The job type.</p>"
+        },
+        "UpdatedAt": {
+          "shape": "Timestamp",
+          "documentation": "<p>The date and time that the job was last updated, in ISO 8601 format.</p>"
+        }
+      }
+    },
+    "GetRevisionRequest": {
+      "type": "structure",
+      "members": {
+        "DataSetId": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "DataSetId",
+          "documentation": "<p>The unique identifier for a data set.</p>"
+        },
+        "RevisionId": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "RevisionId",
+          "documentation": "<p>The unique identifier for a revision.</p>"
+        }
+      },
+      "required": [
+        "RevisionId",
+        "DataSetId"
+      ]
+    },
+    "GetRevisionResponse": {
+      "type": "structure",
+      "members": {
+        "Arn": {
+          "shape": "Arn",
+          "documentation": "<p>The ARN for the revision</p>"
+        },
+        "Comment": {
+          "shape": "__stringMin0Max16384",
+          "documentation": "<p>An optional comment about the revision.</p>"
+        },
+        "CreatedAt": {
+          "shape": "Timestamp",
+          "documentation": "<p>The date and time that the revision was created, in ISO 8601 format.</p>"
+        },
+        "DataSetId": {
+          "shape": "Id",
+          "documentation": "<p>The unique identifier for the data set associated with this revision.</p>"
+        },
+        "Finalized": {
+          "shape": "__boolean",
+          "documentation": "<p>To publish a revision to a data set in a product, the revision must first be finalized. Finalizing a revision tells AWS Data Exchange that your changes to the assets in the revision are complete. After it's in this read-only state, you can publish the revision to your products.</p> <p>Finalized revisions can be published through the AWS Data Exchange console or the AWS Marketplace Catalog API, using the StartChangeSet AWS Marketplace Catalog API action. When using the API, revisions are uniquely identified by their ARN.</p>"
+        },
+        "Id": {
+          "shape": "Id",
+          "documentation": "<p>The unique identifier for the revision.</p>"
+        },
+        "SourceId": {
+          "shape": "Id",
+          "documentation": "<p>The revision ID of the owned revision corresponding to the entitled revision being viewed. This parameter is returned when a revision owner is viewing the entitled copy of its owned revision.</p>"
+        },
+        "Tags": {
+          "shape": "MapOf__string",
+          "documentation": "<p>The tags for the revision.</p>"
+        },
+        "UpdatedAt": {
+          "shape": "Timestamp",
+          "documentation": "<p>The date and time that the revision was last updated, in ISO 8601 format.</p>"
+        }
+      }
+    },
+    "Id": {
+      "type": "string",
+      "documentation": "<p>A unique identifier.</p>"
+    },
+    "ImportAssetFromSignedUrlJobErrorDetails": {
+      "type": "structure",
+      "members": {
+        "AssetName": {
+          "shape": "AssetName"
+        }
+      },
+      "required": [
+        "AssetName"
+      ]
+    },
+    "ImportAssetFromSignedUrlRequestDetails": {
+      "type": "structure",
+      "members": {
+        "AssetName": {
+          "shape": "AssetName",
+          "documentation": "<p>The name of the asset. When importing from Amazon S3, the S3 object key is used as the asset name.</p>"
+        },
+        "DataSetId": {
+          "shape": "Id",
+          "documentation": "<p>The unique identifier for the data set associated with this import job.</p>"
+        },
+        "Md5Hash": {
+          "shape": "__stringMin24Max24PatternAZaZ094AZaZ092AZaZ093",
+          "documentation": "<p>The Base64-encoded Md5 hash for the asset, used to ensure the integrity of the file at that location.</p>"
+        },
+        "RevisionId": {
+          "shape": "Id",
+          "documentation": "<p>The unique identifier for the revision associated with this import request.</p>"
+        }
+      },
+      "documentation": "<p>Details of the operation to be performed by the job.</p>",
+      "required": [
+        "DataSetId",
+        "Md5Hash",
+        "RevisionId",
+        "AssetName"
+      ]
+    },
+    "ImportAssetFromSignedUrlResponseDetails": {
+      "type": "structure",
+      "members": {
+        "AssetName": {
+          "shape": "AssetName",
+          "documentation": "<p>The name for the asset associated with this import response.</p>"
+        },
+        "DataSetId": {
+          "shape": "Id",
+          "documentation": "<p>The unique identifier for the data set associated with this import job.</p>"
+        },
+        "Md5Hash": {
+          "shape": "__stringMin24Max24PatternAZaZ094AZaZ092AZaZ093",
+          "documentation": "<p>The Base64-encoded Md5 hash for the asset, used to ensure the integrity of the file at that location.</p>"
+        },
+        "RevisionId": {
+          "shape": "Id",
+          "documentation": "<p>The unique identifier for the revision associated with this import response.</p>"
+        },
+        "SignedUrl": {
+          "shape": "__string",
+          "documentation": "<p>The signed URL.</p>"
+        },
+        "SignedUrlExpiresAt": {
+          "shape": "Timestamp",
+          "documentation": "<p>The time and date at which the signed URL expires, in ISO 8601 format.</p>"
+        }
+      },
+      "documentation": "<p>The details in the response for an import request, including the signed URL and other information.</p>",
+      "required": [
+        "DataSetId",
+        "AssetName",
+        "RevisionId"
+      ]
+    },
+    "ImportAssetsFromS3RequestDetails": {
+      "type": "structure",
+      "members": {
+        "AssetSources": {
+          "shape": "ListOfAssetSourceEntry",
+          "documentation": "<p>Is a list of S3 bucket and object key pairs.</p>"
+        },
+        "DataSetId": {
+          "shape": "Id",
+          "documentation": "<p>The unique identifier for the data set associated with this import job.</p>"
+        },
+        "RevisionId": {
+          "shape": "Id",
+          "documentation": "<p>The unique identifier for the revision associated with this import request.</p>"
+        }
+      },
+      "documentation": "<p>Details of the operation to be performed by the job.</p>",
+      "required": [
+        "DataSetId",
+        "AssetSources",
+        "RevisionId"
+      ]
+    },
+    "ImportAssetsFromS3ResponseDetails": {
+      "type": "structure",
+      "members": {
+        "AssetSources": {
+          "shape": "ListOfAssetSourceEntry",
+          "documentation": "<p>Is a list of Amazon S3 bucket and object key pairs.</p>"
+        },
+        "DataSetId": {
+          "shape": "Id",
+          "documentation": "<p>The unique identifier for the data set associated with this import job.</p>"
+        },
+        "RevisionId": {
+          "shape": "Id",
+          "documentation": "<p>The unique identifier for the revision associated with this import response.</p>"
+        }
+      },
+      "documentation": "<p>Details from an import from Amazon S3 response.</p>",
+      "required": [
+        "DataSetId",
+        "AssetSources",
+        "RevisionId"
+      ]
+    },
+    "InternalServerException": {
+      "type": "structure",
+      "members": {
+        "Message": {
+          "shape": "__string",
+          "documentation": "The message identifying the service exception that occurred."
+        }
+      },
+      "documentation": "An exception occurred with the service.",
+      "required": [
+        "Message"
+      ],
+      "exception": true,
+      "error": {
+        "httpStatusCode": 500
+      }
+    },
+    "JobEntry": {
+      "type": "structure",
+      "members": {
+        "Arn": {
+          "shape": "Arn",
+          "documentation": "<p>The ARN for the job.</p>"
+        },
+        "CreatedAt": {
+          "shape": "Timestamp",
+          "documentation": "<p>The date and time that the job was created, in ISO 8601 format.</p>"
+        },
+        "Details": {
+          "shape": "ResponseDetails",
+          "documentation": "<p>Details of the operation to be performed by the job, such as export destination details or import source details.</p>"
+        },
+        "Errors": {
+          "shape": "ListOfJobError",
+          "documentation": "<p>Errors for jobs.</p>"
+        },
+        "Id": {
+          "shape": "Id",
+          "documentation": "<p>The unique identifier for the job.</p>"
+        },
+        "State": {
+          "shape": "State",
+          "documentation": "<p>The state of the job.</p>"
+        },
+        "Type": {
+          "shape": "Type",
+          "documentation": "<p>The job type.</p>"
+        },
+        "UpdatedAt": {
+          "shape": "Timestamp",
+          "documentation": "<p>The date and time that the job was last updated, in ISO 8601 format.</p>"
+        }
+      },
+      "documentation": "AWS Data Exchange Jobs are asynchronous import or export operations used to create or copy assets. A data set owner can both import and export as they see fit. Someone with an entitlement to a data set can only export. Jobs are deleted 90 days after they are created.",
+      "required": [
+        "Type",
+        "Details",
+        "State",
+        "CreatedAt",
+        "Id",
+        "Arn",
+        "UpdatedAt"
+      ]
+    },
+    "JobError": {
+      "type": "structure",
+      "members": {
+        "Code": {
+          "shape": "Code",
+          "documentation": "The code for the job error."
+        },
+        "Details": {
+          "shape": "Details"
+        },
+        "LimitName": {
+          "shape": "JobErrorLimitName",
+          "documentation": "<p>The name of the limit that was reached.</p>"
+        },
+        "LimitValue": {
+          "shape": "__double",
+          "documentation": "The value of the exceeded limit."
+        },
+        "Message": {
+          "shape": "__string",
+          "documentation": "The message related to the job error."
+        },
+        "ResourceId": {
+          "shape": "__string",
+          "documentation": "The unqiue identifier for the resource related to the error."
+        },
+        "ResourceType": {
+          "shape": "JobErrorResourceTypes",
+          "documentation": "The type of resource related to the error."
+        }
+      },
+      "documentation": "An error that occurred with the job request.",
+      "required": [
+        "Message",
+        "Code"
+      ]
+    },
+    "JobErrorLimitName": {
+      "type": "string",
+      "documentation": "The name of the limit that was reached.",
+      "enum": [
+        "Assets per revision",
+        "Asset size in GB"
+      ]
+    },
+    "JobErrorResourceTypes": {
+      "type": "string",
+      "documentation": "The types of resource which the job error can apply to.",
+      "enum": [
+        "REVISION",
+        "ASSET"
+      ]
+    },
+    "LimitName": {
+      "type": "string",
+      "enum": [
+        "Products per account",
+        "Data sets per account",
+        "Data sets per product",
+        "Revisions per data set",
+        "Assets per revision",
+        "Assets per import job from Amazon S3",
+        "Asset per export job from Amazon S3",
+        "Asset size in GB",
+        "Concurrent in progress jobs to import assets from Amazon S3",
+        "Concurrent in progress jobs to import assets from a signed URL",
+        "Concurrent in progress jobs to export assets to Amazon S3",
+        "Concurrent in progress jobs to export assets to a signed URL"
+      ]
+    },
+    "ListDataSetRevisionsRequest": {
+      "type": "structure",
+      "members": {
+        "DataSetId": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "DataSetId",
+          "documentation": "<p>The unique identifier for a data set.</p>"
+        },
+        "MaxResults": {
+          "shape": "MaxResults",
+          "location": "querystring",
+          "locationName": "maxResults",
+          "documentation": "<p>The maximum number of results returned by a single call.</p>"
+        },
+        "NextToken": {
+          "shape": "__string",
+          "location": "querystring",
+          "locationName": "nextToken",
+          "documentation": "<p>The token value retrieved from a previous call to access the next page of results.</p>"
+        }
+      },
+      "required": [
+        "DataSetId"
+      ]
+    },
+    "ListDataSetRevisionsResponse": {
+      "type": "structure",
+      "members": {
+        "NextToken": {
+          "shape": "NextToken",
+          "documentation": "<p>The token value retrieved from a previous call to access the next page of results.</p>"
+        },
+        "Revisions": {
+          "shape": "ListOfRevisionEntry",
+          "documentation": "<p>The asset objects listed by the request.</p>"
+        }
+      }
+    },
+    "ListDataSetsRequest": {
+      "type": "structure",
+      "members": {
+        "MaxResults": {
+          "shape": "MaxResults",
+          "location": "querystring",
+          "locationName": "maxResults",
+          "documentation": "<p>The maximum number of results returned by a single call.</p>"
+        },
+        "NextToken": {
+          "shape": "__string",
+          "location": "querystring",
+          "locationName": "nextToken",
+          "documentation": "<p>The token value retrieved from a previous call to access the next page of results.</p>"
+        },
+        "Origin": {
+          "shape": "__string",
+          "location": "querystring",
+          "locationName": "origin",
+          "documentation": "<p>A property that defines the data set as OWNED by the account (for providers) or ENTITLED to the account (for subscribers).</p>"
+        }
+      }
+    },
+    "ListDataSetsResponse": {
+      "type": "structure",
+      "members": {
+        "DataSets": {
+          "shape": "ListOfDataSetEntry",
+          "documentation": "<p>The data set objects listed by the request.</p>"
+        },
+        "NextToken": {
+          "shape": "NextToken",
+          "documentation": "<p>The token value retrieved from a previous call to access the next page of results.</p>"
+        }
+      }
+    },
+    "ListJobsRequest": {
+      "type": "structure",
+      "members": {
+        "DataSetId": {
+          "shape": "__string",
+          "location": "querystring",
+          "locationName": "dataSetId",
+          "documentation": "<p>The unique identifier for a data set.</p>"
+        },
+        "MaxResults": {
+          "shape": "MaxResults",
+          "location": "querystring",
+          "locationName": "maxResults",
+          "documentation": "<p>The maximum number of results returned by a single call.</p>"
+        },
+        "NextToken": {
+          "shape": "__string",
+          "location": "querystring",
+          "locationName": "nextToken",
+          "documentation": "<p>The token value retrieved from a previous call to access the next page of results.</p>"
+        },
+        "RevisionId": {
+          "shape": "__string",
+          "location": "querystring",
+          "locationName": "revisionId",
+          "documentation": "<p>The unique identifier for a revision.</p>"
+        }
+      }
+    },
+    "ListJobsResponse": {
+      "type": "structure",
+      "members": {
+        "Jobs": {
+          "shape": "ListOfJobEntry",
+          "documentation": "<p>The jobs listed by the request.</p>"
+        },
+        "NextToken": {
+          "shape": "NextToken",
+          "documentation": "<p>The token value retrieved from a previous call to access the next page of results.</p>"
+        }
+      }
+    },
+    "ListOfAssetDestinationEntry": {
+      "type": "list",
+      "documentation": "<p>The destination where the assets will be exported.</p>",
+      "member": {
+        "shape": "AssetDestinationEntry"
+      }
+    },
+    "ListOfAssetSourceEntry": {
+      "type": "list",
+      "documentation": "<p>The list of sources for the assets.</p>",
+      "member": {
+        "shape": "AssetSourceEntry"
+      }
+    },
+    "ListRevisionAssetsRequest": {
+      "type": "structure",
+      "members": {
+        "DataSetId": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "DataSetId",
+          "documentation": "<p>The unique identifier for a data set.</p>"
+        },
+        "MaxResults": {
+          "shape": "MaxResults",
+          "location": "querystring",
+          "locationName": "maxResults",
+          "documentation": "<p>The maximum number of results returned by a single call.</p>"
+        },
+        "NextToken": {
+          "shape": "__string",
+          "location": "querystring",
+          "locationName": "nextToken",
+          "documentation": "<p>The token value retrieved from a previous call to access the next page of results.</p>"
+        },
+        "RevisionId": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "RevisionId",
+          "documentation": "<p>The unique identifier for a revision.</p>"
+        }
+      },
+      "required": [
+        "RevisionId",
+        "DataSetId"
+      ]
+    },
+    "ListRevisionAssetsResponse": {
+      "type": "structure",
+      "members": {
+        "Assets": {
+          "shape": "ListOfAssetEntry",
+          "documentation": "<p>The asset objects listed by the request.</p>"
+        },
+        "NextToken": {
+          "shape": "NextToken",
+          "documentation": "<p>The token value retrieved from a previous call to access the next page of results.</p>"
+        }
+      }
+    },
+    "ListTagsForResourceRequest": {
+      "type": "structure",
+      "members": {
+        "ResourceArn": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "resource-arn",
+          "documentation": "<p>An Amazon Resource Name (ARN) that uniquely identifies an AWS resource.</p>"
+        }
+      },
+      "required": [
+        "ResourceArn"
+      ]
+    },
+    "ListTagsForResourceResponse": {
+      "type": "structure",
+      "members": {
+        "Tags": {
+          "shape": "MapOf__string",
+          "locationName": "tags",
+          "documentation": "A label that consists of a customer-defined key and an optional value."
+        }
+      }
+    },
+    "MaxResults": {
+      "type": "integer",
+      "min": 1,
+      "max": 25
+    },
+    "Name": {
+      "type": "string",
+      "documentation": "The name of the model."
+    },
+    "NextToken": {
+      "type": "string",
+      "documentation": "<p>The token value retrieved from a previous call to access the next page of results.</p>"
+    },
+    "Origin": {
+      "type": "string",
+      "documentation": "<p>A property that defines the data set as OWNED by the account (for providers) or ENTITLED to the account (for subscribers). When an owned data set is published in a product, AWS Data Exchange creates a copy of the data set. Subscribers can access that copy of the data set as an entitled data set.</p>",
+      "enum": [
+        "OWNED",
+        "ENTITLED"
+      ]
+    },
+    "OriginDetails": {
+      "type": "structure",
+      "members": {
+        "ProductId": {
+          "shape": "__string"
+        }
+      },
+      "required": [
+        "ProductId"
+      ]
+    },
+    "RequestDetails": {
+      "type": "structure",
+      "members": {
+        "ExportAssetToSignedUrl": {
+          "shape": "ExportAssetToSignedUrlRequestDetails",
+          "documentation": "<p>Details about the export to signed URL request.</p>"
+        },
+        "ExportAssetsToS3": {
+          "shape": "ExportAssetsToS3RequestDetails",
+          "documentation": "<p>Details about the export to Amazon S3 request.</p>"
+        },
+        "ImportAssetFromSignedUrl": {
+          "shape": "ImportAssetFromSignedUrlRequestDetails",
+          "documentation": "<p>Details about the import from signed URL request.</p>"
+        },
+        "ImportAssetsFromS3": {
+          "shape": "ImportAssetsFromS3RequestDetails",
+          "documentation": "<p>Details about the import from Amazon S3 request.</p>"
+        }
+      },
+      "documentation": "<p>The details for the request.</p>"
+    },
+    "ResourceNotFoundException": {
+      "type": "structure",
+      "members": {
+        "Message": {
+          "shape": "__string",
+          "documentation": "<p>The resource couldn't be found.</p>"
+        },
+        "ResourceId": {
+          "shape": "__string",
+          "documentation": "<p>The unique identifier for the resource that couldn't be found.</p>"
+        },
+        "ResourceType": {
+          "shape": "ResourceType",
+          "documentation": "<p>The type of resource that couldn't be found.</p>"
+        }
+      },
+      "documentation": "<p>The resource couldn't be found.</p>",
+      "required": [
+        "Message"
+      ],
+      "exception": true,
+      "error": {
+        "httpStatusCode": 404
+      }
+    },
+    "ResourceType": {
+      "type": "string",
+      "enum": [
+        "DATA_SET",
+        "REVISION",
+        "ASSET",
+        "JOB"
+      ]
+    },
+    "ResponseDetails": {
+      "type": "structure",
+      "members": {
+        "ExportAssetToSignedUrl": {
+          "shape": "ExportAssetToSignedUrlResponseDetails",
+          "documentation": "<p>Details for the export to signed URL response.</p>"
+        },
+        "ExportAssetsToS3": {
+          "shape": "ExportAssetsToS3ResponseDetails",
+          "documentation": "<p>Details for the export to Amazon S3 response.</p>"
+        },
+        "ImportAssetFromSignedUrl": {
+          "shape": "ImportAssetFromSignedUrlResponseDetails",
+          "documentation": "<p>Details for the import from signed URL response.</p>"
+        },
+        "ImportAssetsFromS3": {
+          "shape": "ImportAssetsFromS3ResponseDetails",
+          "documentation": "<p>Details for the import from Amazon S3 response.</p>"
+        }
+      },
+      "documentation": "<p>Details for the response.</p>"
+    },
+    "RevisionEntry": {
+      "type": "structure",
+      "members": {
+        "Arn": {
+          "shape": "Arn",
+          "documentation": "<p>The ARN for the revision.</p>"
+        },
+        "Comment": {
+          "shape": "__stringMin0Max16384",
+          "documentation": "<p>An optional comment about the revision.</p>"
+        },
+        "CreatedAt": {
+          "shape": "Timestamp",
+          "documentation": "<p>The date and time that the revision was created, in ISO 8601 format.</p>"
+        },
+        "DataSetId": {
+          "shape": "Id",
+          "documentation": "<p>The unique identifier for the data set associated with this revision.</p>"
+        },
+        "Finalized": {
+          "shape": "__boolean",
+          "documentation": "<p>To publish a revision to a data set in a product, the revision must first be finalized. Finalizing a revision tells AWS Data Exchange that your changes to the assets in the revision are complete. After it's in this read-only state, you can publish the revision to your products.</p> <p>Finalized revisions can be published through the AWS Data Exchange console or the AWS Marketplace Catalog API, using the StartChangeSet AWS Marketplace Catalog API action. When using the API, revisions are uniquely identified by their ARN.</p>"
+        },
+        "Id": {
+          "shape": "Id",
+          "documentation": "<p>The unique identifier for the revision.</p>"
+        },
+        "SourceId": {
+          "shape": "Id",
+          "documentation": "<p>The revision ID of the owned revision corresponding to the entitled revision being viewed. This parameter is returned when a revision owner is viewing the entitled copy of its owned revision.</p>"
+        },
+        "UpdatedAt": {
+          "shape": "Timestamp",
+          "documentation": "<p>The date and time that the revision was last updated, in ISO 8601 format.</p>"
+        }
+      },
+      "documentation": "<p>A revision is a container for one or more assets.</p>",
+      "required": [
+        "CreatedAt",
+        "DataSetId",
+        "Id",
+        "Arn",
+        "UpdatedAt"
+      ]
+    },
+    "S3SnapshotAsset": {
+      "type": "structure",
+      "members": {
+        "Size": {
+          "shape": "__doubleMin0",
+          "documentation": "<p>The size of the S3 object that is the object.</p>"
+        }
+      },
+      "documentation": "<p>The S3 object that is the asset.</p>",
+      "required": [
+        "Size"
+      ]
+    },
+    "ServiceLimitExceededException": {
+      "type": "structure",
+      "members": {
+        "LimitName": {
+          "shape": "LimitName",
+          "documentation": "<p>The name of the quota that was exceeded.</p>"
+        },
+        "LimitValue": {
+          "shape": "__double",
+          "documentation": "<p>The maximum value for the service-specific limit.</p>"
+        },
+        "Message": {
+          "shape": "__string",
+          "documentation": "<p>The request has exceeded the quotas imposed by the service.</p>"
+        }
+      },
+      "documentation": "<p>The request has exceeded the quotas imposed by the service.</p>",
+      "required": [
+        "Message"
+      ],
+      "exception": true,
+      "error": {
+        "httpStatusCode": 402
+      }
+    },
+    "StartJobRequest": {
+      "type": "structure",
+      "members": {
+        "JobId": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "JobId",
+          "documentation": "<p>The unique identifier for a job.</p>"
+        }
+      },
+      "required": [
+        "JobId"
+      ]
+    },
+    "StartJobResponse": {
+      "type": "structure",
+      "members": {}
+    },
+    "State": {
+      "type": "string",
+      "enum": [
+        "WAITING",
+        "IN_PROGRESS",
+        "ERROR",
+        "COMPLETED",
+        "CANCELLED",
+        "TIMED_OUT"
+      ]
+    },
+    "TagResourceRequest": {
+      "type": "structure",
+      "members": {
+        "ResourceArn": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "resource-arn",
+          "documentation": "<p>An Amazon Resource Name (ARN) that uniquely identifies an AWS resource.</p>"
+        },
+        "Tags": {
+          "shape": "MapOf__string",
+          "locationName": "tags",
+          "documentation": "A label that consists of a customer-defined key and an optional value."
+        }
+      },
+      "documentation": "<p>The request body for TagResource.</p>",
+      "required": [
+        "ResourceArn",
+        "Tags"
+      ]
+    },
+    "ThrottlingException": {
+      "type": "structure",
+      "members": {
+        "Message": {
+          "shape": "__string",
+          "documentation": "<p>The limit on the number of requests per second was exceeded.</p>"
+        }
+      },
+      "documentation": "<p>The limit on the number of requests per second was exceeded.</p>",
+      "required": [
+        "Message"
+      ],
+      "exception": true,
+      "error": {
+        "httpStatusCode": 429
+      }
+    },
+    "Timestamp": {
+      "type": "timestamp",
+      "documentation": "<p>Dates and times in AWS Data Exchange are recorded in ISO 8601 format.</p>",
+      "timestampFormat": "iso8601"
+    },
+    "Type": {
+      "type": "string",
+      "enum": [
+        "IMPORT_ASSETS_FROM_S3",
+        "IMPORT_ASSET_FROM_SIGNED_URL",
+        "EXPORT_ASSETS_TO_S3",
+        "EXPORT_ASSET_TO_SIGNED_URL"
+      ]
+    },
+    "UntagResourceRequest": {
+      "type": "structure",
+      "members": {
+        "ResourceArn": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "resource-arn",
+          "documentation": "<p>An Amazon Resource Name (ARN) that uniquely identifies an AWS resource.</p>"
+        },
+        "TagKeys": {
+          "shape": "ListOf__string",
+          "location": "querystring",
+          "locationName": "tagKeys",
+          "documentation": "The key tags."
+        }
+      },
+      "required": [
+        "TagKeys",
+        "ResourceArn"
+      ]
+    },
+    "UpdateAssetRequest": {
+      "type": "structure",
+      "members": {
+        "AssetId": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "AssetId",
+          "documentation": "<p>The unique identifier for an asset.</p>"
+        },
+        "DataSetId": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "DataSetId",
+          "documentation": "<p>The unique identifier for a data set.</p>"
+        },
+        "Name": {
+          "shape": "AssetName",
+          "documentation": "<p>The name of the asset. When importing from Amazon S3, the S3 object key is used as the asset name. When exporting to Amazon S3, the asset name is used as default target S3 object key.</p>"
+        },
+        "RevisionId": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "RevisionId",
+          "documentation": "<p>The unique identifier for a revision.</p>"
+        }
+      },
+      "documentation": "<p>The request body for UpdateAsset.</p>",
+      "required": [
+        "RevisionId",
+        "AssetId",
+        "DataSetId",
+        "Name"
+      ]
+    },
+    "UpdateAssetResponse": {
+      "type": "structure",
+      "members": {
+        "Arn": {
+          "shape": "Arn",
+          "documentation": "<p>The ARN for the asset.</p>"
+        },
+        "AssetDetails": {
+          "shape": "AssetDetails",
+          "documentation": "<p>Information about the asset, including its size.</p>"
+        },
+        "AssetType": {
+          "shape": "AssetType",
+          "documentation": "<p>The type of file your data is stored in. Currently, the supported asset type is S3_SNAPSHOT.</p>"
+        },
+        "CreatedAt": {
+          "shape": "Timestamp",
+          "documentation": "<p>The date and time that the asset was created, in ISO 8601 format.</p>"
+        },
+        "DataSetId": {
+          "shape": "Id",
+          "documentation": "<p>The unique identifier for the data set associated with this asset.</p>"
+        },
+        "Id": {
+          "shape": "Id",
+          "documentation": "<p>The unique identifier for the asset.</p>"
+        },
+        "Name": {
+          "shape": "AssetName",
+          "documentation": "<p>The name of the asset When importing from Amazon S3, the S3 object key is used as the asset name. When exporting to Amazon S3, the asset name is used as default target S3 object key.</p>"
+        },
+        "RevisionId": {
+          "shape": "Id",
+          "documentation": "<p>The unique identifier for the revision associated with this asset.</p>"
+        },
+        "SourceId": {
+          "shape": "Id",
+          "documentation": "<p>The asset ID of the owned asset corresponding to the entitled asset being viewed. This parameter is returned when an asset owner is viewing the entitled copy of its owned asset.</p>"
+        },
+        "UpdatedAt": {
+          "shape": "Timestamp",
+          "documentation": "<p>The date and time that the asset was last updated, in ISO 8601 format.</p>"
+        }
+      }
+    },
+    "UpdateDataSetRequest": {
+      "type": "structure",
+      "members": {
+        "DataSetId": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "DataSetId",
+          "documentation": "<p>The unique identifier for a data set.</p>"
+        },
+        "Description": {
+          "shape": "Description",
+          "documentation": "<p>The description for the data set.</p>"
+        },
+        "Name": {
+          "shape": "Name",
+          "documentation": "<p>The name of the data set.</p>"
+        }
+      },
+      "documentation": "<p>The request body for UpdateDataSet.</p>",
+      "required": [
+        "DataSetId"
+      ]
+    },
+    "UpdateDataSetResponse": {
+      "type": "structure",
+      "members": {
+        "Arn": {
+          "shape": "Arn",
+          "documentation": "<p>The ARN for the data set.</p>"
+        },
+        "AssetType": {
+          "shape": "AssetType",
+          "documentation": "<p>The type of file your data is stored in. Currently, the supported asset type is S3_SNAPSHOT.</p>"
+        },
+        "CreatedAt": {
+          "shape": "Timestamp",
+          "documentation": "<p>The date and time that the data set was created, in ISO 8601 format.</p>"
+        },
+        "Description": {
+          "shape": "Description",
+          "documentation": "<p>The description for the data set.</p>"
+        },
+        "Id": {
+          "shape": "Id",
+          "documentation": "<p>The unique identifier for the data set.</p>"
+        },
+        "Name": {
+          "shape": "Name",
+          "documentation": "<p>The name of the data set.</p>"
+        },
+        "Origin": {
+          "shape": "Origin",
+          "documentation": "<p>A property that defines the data set as OWNED by the account (for providers) or ENTITLED to the account (for subscribers).</p>"
+        },
+        "OriginDetails": {
+          "shape": "OriginDetails",
+          "documentation": "<p>If the origin of this data set is ENTITLED, includes the details for the product on AWS Marketplace.</p>"
+        },
+        "SourceId": {
+          "shape": "Id",
+          "documentation": "<p>The data set ID of the owned data set corresponding to the entitled data set being viewed. This parameter is returned when a data set owner is viewing the entitled copy of its owned data set.</p>"
+        },
+        "UpdatedAt": {
+          "shape": "Timestamp",
+          "documentation": "<p>The date and time that the data set was last updated, in ISO 8601 format.</p>"
+        }
+      }
+    },
+    "UpdateRevisionRequest": {
+      "type": "structure",
+      "members": {
+        "Comment": {
+          "shape": "__stringMin0Max16384",
+          "documentation": "<p>An optional comment about the revision.</p>"
+        },
+        "DataSetId": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "DataSetId",
+          "documentation": "<p>The unique identifier for a data set.</p>"
+        },
+        "Finalized": {
+          "shape": "__boolean",
+          "documentation": "<p>Finalizing a revision tells AWS Data Exchange that your changes to the assets in the revision are complete. After it's in this read-only state, you can publish the revision to your products.</p>"
+        },
+        "RevisionId": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "RevisionId",
+          "documentation": "<p>The unique identifier for a revision.</p>"
+        }
+      },
+      "documentation": "<p>The request body for UpdateRevision.</p>",
+      "required": [
+        "RevisionId",
+        "DataSetId"
+      ]
+    },
+    "UpdateRevisionResponse": {
+      "type": "structure",
+      "members": {
+        "Arn": {
+          "shape": "Arn",
+          "documentation": "<p>The ARN for the revision.</p>"
+        },
+        "Comment": {
+          "shape": "__stringMin0Max16384",
+          "documentation": "<p>An optional comment about the revision.</p>"
+        },
+        "CreatedAt": {
+          "shape": "Timestamp",
+          "documentation": "<p>The date and time that the revision was created, in ISO 8601 format.</p>"
+        },
+        "DataSetId": {
+          "shape": "Id",
+          "documentation": "<p>The unique identifier for the data set associated with this revision.</p>"
+        },
+        "Finalized": {
+          "shape": "__boolean",
+          "documentation": "<p>To publish a revision to a data set in a product, the revision must first be finalized. Finalizing a revision tells AWS Data Exchange that changes to the assets in the revision are complete. After it's in this read-only state, you can publish the revision to your products.</p> <p>Finalized revisions can be published through the AWS Data Exchange console or the AWS Marketplace Catalog API, using the StartChangeSet AWS Marketplace Catalog API action. When using the API, revisions are uniquely identified by their ARN.</p>"
+        },
+        "Id": {
+          "shape": "Id",
+          "documentation": "<p>The unique identifier for the revision.</p>"
+        },
+        "SourceId": {
+          "shape": "Id",
+          "documentation": "<p>The revision ID of the owned revision corresponding to the entitled revision being viewed. This parameter is returned when a revision owner is viewing the entitled copy of its owned revision.</p>"
+        },
+        "UpdatedAt": {
+          "shape": "Timestamp",
+          "documentation": "<p>The date and time that the revision was last updated, in ISO 8601 format.</p>"
+        }
+      }
+    },
+    "ValidationException": {
+      "type": "structure",
+      "members": {
+        "Message": {
+          "shape": "__string",
+          "documentation": "<p>The message that informs you about what was invalid about the request.</p>"
+        }
+      },
+      "documentation": "<p>The request was invalid.</p>",
+      "required": [
+        "Message"
+      ],
+      "exception": true,
+      "error": {
+        "httpStatusCode": 400
+      }
+    },
+    "__boolean": {
+      "type": "boolean"
+    },
+    "__double": {
+      "type": "double"
+    },
+    "__doubleMin0": {
+      "type": "double"
+    },
+    "ListOfAssetEntry": {
+      "type": "list",
+      "member": {
+        "shape": "AssetEntry"
+      }
+    },
+    "ListOfDataSetEntry": {
+      "type": "list",
+      "member": {
+        "shape": "DataSetEntry"
+      }
+    },
+    "ListOfJobEntry": {
+      "type": "list",
+      "member": {
+        "shape": "JobEntry"
+      }
+    },
+    "ListOfJobError": {
+      "type": "list",
+      "member": {
+        "shape": "JobError"
+      }
+    },
+    "ListOfRevisionEntry": {
+      "type": "list",
+      "member": {
+        "shape": "RevisionEntry"
+      }
+    },
+    "ListOf__string": {
+      "type": "list",
+      "member": {
+        "shape": "__string"
+      }
+    },
+    "MapOf__string": {
+      "type": "map",
+      "key": {
+        "shape": "__string"
+      },
+      "value": {
+        "shape": "__string"
+      }
+    },
+    "__string": {
+      "type": "string"
+    },
+    "__stringMin0Max16384": {
+      "type": "string",
+      "min": 0,
+      "max": 16384
+    },
+    "__stringMin24Max24PatternAZaZ094AZaZ092AZaZ093": {
+      "type": "string",
+      "min": 24,
+      "max": 24,
+      "pattern": "/^(?:[A-Za-z0-9+\\/]{4})*(?:[A-Za-z0-9+\\/]{2}==|[A-Za-z0-9+\\/]{3}=)?$/"
+    }
+  },
+  "authorizers": {
+    "create_job_authorizer": {
+      "name": "create_job_authorizer",
+      "type": "provided",
+      "placement": {
+        "location": "header",
+        "name": "Authorization"
+      }
+    },
+    "start_cancel_get_job_authorizer": {
+      "name": "start_cancel_get_job_authorizer",
+      "type": "provided",
+      "placement": {
+        "location": "header",
+        "name": "Authorization"
+      }
+    }
+  },
+  "documentation": "<p>AWS Data Exchange is a service that makes it easy for AWS customers to exchange data in the cloud. You can use the AWS Data Exchange APIs to create, update, manage, and access file-based data set in the AWS Cloud.</p><p>As a subscriber, you can view and access the data sets that you have an entitlement to through a subscription. You can use the APIS to download or copy your entitled data sets to Amazon S3 for use across a variety of AWS analytics and machine learning services.</p><p>As a provider, you can create and manage your data sets that you would like to publish to a product. Being able to package and provide your data sets into products requires a few steps to determine eligibility. For more information, visit the AWS Data Exchange User Guide.</p><p>A data set is a collection of data that can be changed or updated over time. Data sets can be updated using revisions, which represent a new version or incremental change to a data set.  A revision contains one or more assets. An asset in AWS Data Exchange is a piece of data that can be stored as an Amazon S3 object. The asset can be a structured data file, an image file, or some other data file. Jobs are asynchronous import or export operations used to create or copy assets.</p>"
+}
\ No newline at end of file
diff --git a/services/datapipeline/build.properties b/services/datapipeline/build.properties
index ecf2dae6fcb1..15ec2da1fc71 100644
--- a/services/datapipeline/build.properties
+++ b/services/datapipeline/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/datapipeline/pom.xml b/services/datapipeline/pom.xml
index 42668f4871e7..6506b32038a1 100644
--- a/services/datapipeline/pom.xml
+++ b/services/datapipeline/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>datapipeline</artifactId>
     <name>AWS Java SDK :: Services :: AWS Data Pipeline</name>
diff --git a/services/datapipeline/src/it/java/software/amazon/awssdk/services/datapipeline/DataPipelineIntegrationTest.java b/services/datapipeline/src/it/java/software/amazon/awssdk/services/datapipeline/DataPipelineIntegrationTest.java
index 0766fbd54efb..a9db484c6a44 100644
--- a/services/datapipeline/src/it/java/software/amazon/awssdk/services/datapipeline/DataPipelineIntegrationTest.java
+++ b/services/datapipeline/src/it/java/software/amazon/awssdk/services/datapipeline/DataPipelineIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/datapipeline/src/it/java/software/amazon/awssdk/services/datapipeline/IntegrationTestBase.java b/services/datapipeline/src/it/java/software/amazon/awssdk/services/datapipeline/IntegrationTestBase.java
index a886d8b08475..755a091a716c 100644
--- a/services/datapipeline/src/it/java/software/amazon/awssdk/services/datapipeline/IntegrationTestBase.java
+++ b/services/datapipeline/src/it/java/software/amazon/awssdk/services/datapipeline/IntegrationTestBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/datapipeline/src/test/resources/cucumber.properties b/services/datapipeline/src/test/resources/cucumber.properties
index 7373896560db..17ea630b4c1b 100644
--- a/services/datapipeline/src/test/resources/cucumber.properties
+++ b/services/datapipeline/src/test/resources/cucumber.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/datasync/pom.xml b/services/datasync/pom.xml
index e2366b81f506..c3af15e129d8 100644
--- a/services/datasync/pom.xml
+++ b/services/datasync/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>datasync</artifactId>
     <name>AWS Java SDK :: Services :: DataSync</name>
diff --git a/services/datasync/src/main/resources/codegen-resources/service-2.json b/services/datasync/src/main/resources/codegen-resources/service-2.json
index 819e02fa0848..605b7dad761f 100644
--- a/services/datasync/src/main/resources/codegen-resources/service-2.json
+++ b/services/datasync/src/main/resources/codegen-resources/service-2.json
@@ -56,6 +56,20 @@
       ],
       "documentation":"<p>Creates an endpoint for an Amazon EFS file system.</p>"
     },
+    "CreateLocationFsxWindows":{
+      "name":"CreateLocationFsxWindows",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"CreateLocationFsxWindowsRequest"},
+      "output":{"shape":"CreateLocationFsxWindowsResponse"},
+      "errors":[
+        {"shape":"InvalidRequestException"},
+        {"shape":"InternalException"}
+      ],
+      "documentation":"<p>Creates an endpoint for an Amazon FSx for Windows file system.</p>"
+    },
     "CreateLocationNfs":{
       "name":"CreateLocationNfs",
       "http":{
@@ -96,7 +110,7 @@
         {"shape":"InvalidRequestException"},
         {"shape":"InternalException"}
       ],
-      "documentation":"<p>Defines a file system on an Server Message Block (SMB) server that can be read from or written to</p>"
+      "documentation":"<p>Defines a file system on an Server Message Block (SMB) server that can be read from or written to.</p>"
     },
     "CreateTask":{
       "name":"CreateTask",
@@ -182,6 +196,20 @@
       ],
       "documentation":"<p>Returns metadata, such as the path information about an Amazon EFS location.</p>"
     },
+    "DescribeLocationFsxWindows":{
+      "name":"DescribeLocationFsxWindows",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DescribeLocationFsxWindowsRequest"},
+      "output":{"shape":"DescribeLocationFsxWindowsResponse"},
+      "errors":[
+        {"shape":"InvalidRequestException"},
+        {"shape":"InternalException"}
+      ],
+      "documentation":"<p>Returns metadata, such as the path information about an Amazon FSx for Windows location.</p>"
+    },
     "DescribeLocationNfs":{
       "name":"DescribeLocationNfs",
       "http":{
@@ -515,8 +543,8 @@
       ],
       "members":{
         "Subdirectory":{
-          "shape":"Subdirectory",
-          "documentation":"<p>A subdirectory in the location’s path. This subdirectory in the EFS file system is used to read data from the EFS source location or write data to the EFS destination. By default, AWS DataSync uses the root directory.</p>"
+          "shape":"EfsSubdirectory",
+          "documentation":"<p>A subdirectory in the location’s path. This subdirectory in the EFS file system is used to read data from the EFS source location or write data to the EFS destination. By default, AWS DataSync uses the root directory.</p> <note> <p> <code>Subdirectory</code> must be specified with forward slashes. For example <code>/path/to/folder</code>.</p> </note>"
         },
         "EfsFilesystemArn":{
           "shape":"EfsFilesystemArn",
@@ -543,6 +571,54 @@
       },
       "documentation":"<p>CreateLocationEfs</p>"
     },
+    "CreateLocationFsxWindowsRequest":{
+      "type":"structure",
+      "required":[
+        "FsxFilesystemArn",
+        "SecurityGroupArns",
+        "User",
+        "Password"
+      ],
+      "members":{
+        "Subdirectory":{
+          "shape":"FsxWindowsSubdirectory",
+          "documentation":"<p>A subdirectory in the location’s path. This subdirectory in the Amazon FSx for Windows file system is used to read data from the Amazon FSx for Windows source location or write data to the FSx for Windows destination.</p>"
+        },
+        "FsxFilesystemArn":{
+          "shape":"FsxFilesystemArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) for the FSx for Windows file system.</p>"
+        },
+        "SecurityGroupArns":{
+          "shape":"Ec2SecurityGroupArnList",
+          "documentation":"<p>The Amazon Resource Names (ARNs) of the security groups that are to use to configure the FSx for Windows file system.</p>"
+        },
+        "Tags":{
+          "shape":"TagList",
+          "documentation":"<p>The key-value pair that represents a tag that you want to add to the resource. The value can be an empty string. This value helps you manage, filter, and search for your resources. We recommend that you create a name tag for your location.</p>"
+        },
+        "User":{
+          "shape":"SmbUser",
+          "documentation":"<p>The user who has the permissions to access files and folders in the FSx for Windows file system.</p>"
+        },
+        "Domain":{
+          "shape":"SmbDomain",
+          "documentation":"<p>The name of the Windows domain that the FSx for Windows server belongs to.</p>"
+        },
+        "Password":{
+          "shape":"SmbPassword",
+          "documentation":"<p>The password of the user who has the permissions to access files and folders in the FSx for Windows file system.</p>"
+        }
+      }
+    },
+    "CreateLocationFsxWindowsResponse":{
+      "type":"structure",
+      "members":{
+        "LocationArn":{
+          "shape":"LocationArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the FSx for Windows file system location that is created.</p>"
+        }
+      }
+    },
     "CreateLocationNfsRequest":{
       "type":"structure",
       "required":[
@@ -552,7 +628,7 @@
       ],
       "members":{
         "Subdirectory":{
-          "shape":"NonEmptySubdirectory",
+          "shape":"NfsSubdirectory",
           "documentation":"<p>The subdirectory in the NFS file system that is used to read data from the NFS source location or write data to the NFS destination. The NFS path should be a path that's exported by the NFS server, or a subdirectory of that path. The path should be such that it can be mounted by other NFS clients in your network. </p> <p>To see all the paths exported by your NFS server. run \"<code>showmount -e nfs-server-name</code>\" from an NFS client that has access to your server. You can specify any directory that appears in the results, and any subdirectory of that directory. Ensure that the NFS export is accessible without Kerberos authentication. </p> <p>To transfer all the data in the folder you specified, DataSync needs to have permissions to read all the data. To ensure this, either configure the NFS export with <code>no_root_squash,</code> or ensure that the permissions for all of the files that you want DataSync allow read access for all users. Doing either enables the agent to read the files. For the agent to access directories, you must additionally enable all execute access.</p> <p>For information about NFS export configuration, see 18.7. The /etc/exports Configuration File in the Red Hat Enterprise Linux documentation.</p>"
         },
         "ServerHostname":{
@@ -592,7 +668,7 @@
       ],
       "members":{
         "Subdirectory":{
-          "shape":"Subdirectory",
+          "shape":"S3Subdirectory",
           "documentation":"<p>A subdirectory in the Amazon S3 bucket. This subdirectory in Amazon S3 is used to read data from the S3 source location or write data to the S3 destination.</p>"
         },
         "S3BucketArn":{
@@ -632,8 +708,8 @@
       ],
       "members":{
         "Subdirectory":{
-          "shape":"NonEmptySubdirectory",
-          "documentation":"<p>The subdirectory in the SMB file system that is used to read data from the SMB source location or write data to the SMB destination. The SMB path should be a path that's exported by the SMB server, or a subdirectory of that path. The path should be such that it can be mounted by other SMB clients in your network.</p> <p>To transfer all the data in the folder you specified, DataSync needs to have permissions to mount the SMB share, as well as to access all the data in that share. To ensure this, either ensure that the user/password specified belongs to the user who can mount the share, and who has the appropriate permissions for all of the files and directories that you want DataSync to access, or use credentials of a member of the Backup Operators group to mount the share. Doing either enables the agent to access the data. For the agent to access directories, you must additionally enable all execute access.</p>"
+          "shape":"SmbSubdirectory",
+          "documentation":"<p>The subdirectory in the SMB file system that is used to read data from the SMB source location or write data to the SMB destination. The SMB path should be a path that's exported by the SMB server, or a subdirectory of that path. The path should be such that it can be mounted by other SMB clients in your network.</p> <note> <p> <code>Subdirectory</code> must be specified with forward slashes. For example <code>/path/to/folder</code>.</p> </note> <p>To transfer all the data in the folder you specified, DataSync needs to have permissions to mount the SMB share, as well as to access all the data in that share. To ensure this, either ensure that the user/password specified belongs to the user who can mount the share, and who has the appropriate permissions for all of the files and directories that you want DataSync to access, or use credentials of a member of the Backup Operators group to mount the share. Doing either enables the agent to access the data. For the agent to access directories, you must additionally enable all execute access.</p>"
         },
         "ServerHostname":{
           "shape":"ServerHostname",
@@ -707,6 +783,10 @@
           "shape":"FilterList",
           "documentation":"<p>A list of filter rules that determines which files to exclude from a task. The list should contain a single filter string that consists of the patterns to exclude. The patterns are delimited by \"|\" (that is, a pipe), for example, <code>\"/folder1|/folder2\"</code> </p> <p> </p>"
         },
+        "Schedule":{
+          "shape":"TaskSchedule",
+          "documentation":"<p>Specifies a schedule used to periodically transfer files from a source to a destination location. The schedule should be specified in UTC time. For more information, see <a>task-scheduling</a>.</p>"
+        },
         "Tags":{
           "shape":"TagList",
           "documentation":"<p>The key-value pair that represents the tag that you want to add to the resource. The value can be an empty string. </p>"
@@ -847,6 +927,45 @@
       },
       "documentation":"<p>DescribeLocationEfsResponse</p>"
     },
+    "DescribeLocationFsxWindowsRequest":{
+      "type":"structure",
+      "required":["LocationArn"],
+      "members":{
+        "LocationArn":{
+          "shape":"LocationArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the FSx for Windows location to describe.</p>"
+        }
+      }
+    },
+    "DescribeLocationFsxWindowsResponse":{
+      "type":"structure",
+      "members":{
+        "LocationArn":{
+          "shape":"LocationArn",
+          "documentation":"<p>The Amazon resource Name (ARN) of the FSx for Windows location that was described.</p>"
+        },
+        "LocationUri":{
+          "shape":"LocationUri",
+          "documentation":"<p>The URL of the FSx for Windows location that was described.</p>"
+        },
+        "SecurityGroupArns":{
+          "shape":"Ec2SecurityGroupArnList",
+          "documentation":"<p>The Amazon Resource Names (ARNs) of the security groups that are configured for the for the FSx for Windows file system.</p>"
+        },
+        "CreationTime":{
+          "shape":"Time",
+          "documentation":"<p>The time that the FSx for Windows location was created.</p>"
+        },
+        "User":{
+          "shape":"SmbUser",
+          "documentation":"<p>The user who has the permissions to access files and folders in the FSx for Windows file system.</p>"
+        },
+        "Domain":{
+          "shape":"SmbDomain",
+          "documentation":"<p>The name of the Windows domain that the FSx for Windows server belongs to.</p>"
+        }
+      }
+    },
     "DescribeLocationNfsRequest":{
       "type":"structure",
       "required":["LocationArn"],
@@ -1080,6 +1199,10 @@
           "shape":"FilterList",
           "documentation":"<p>A list of filter rules that determines which files to exclude from a task. The list should contain a single filter string that consists of the patterns to exclude. The patterns are delimited by \"|\" (that is, a pipe), for example: <code>\"/folder1|/folder2\"</code> </p> <p> </p>"
         },
+        "Schedule":{
+          "shape":"TaskSchedule",
+          "documentation":"<p>The schedule used to periodically transfer files from a source to a destination location.</p>"
+        },
         "ErrorCode":{
           "shape":"string",
           "documentation":"<p>Errors that AWS DataSync encountered during execution of the task. You can use this error code to help troubleshoot issues.</p>"
@@ -1142,6 +1265,11 @@
       "max":128,
       "pattern":"^arn:(aws|aws-cn|aws-us-gov|aws-iso|aws-iso-b):elasticfilesystem:[a-z\\-0-9]*:[0-9]{12}:file-system/fs-.*$"
     },
+    "EfsSubdirectory":{
+      "type":"string",
+      "max":4096,
+      "pattern":"^[a-zA-Z0-9_\\-\\+\\./\\(\\)\\p{Zs}]*$"
+    },
     "Endpoint":{
       "type":"string",
       "max":15,
@@ -1152,7 +1280,8 @@
       "type":"string",
       "enum":[
         "PUBLIC",
-        "PRIVATE_LINK"
+        "PRIVATE_LINK",
+        "FIPS"
       ]
     },
     "FilterList":{
@@ -1186,6 +1315,16 @@
       "max":409600,
       "pattern":"^[^\\x00]+$"
     },
+    "FsxFilesystemArn":{
+      "type":"string",
+      "max":128,
+      "pattern":"^arn:(aws|aws-cn|aws-us-gov|aws-iso|aws-iso-b):fsx:[a-z\\-0-9]*:[0-9]{12}:file-system/fs-.*$"
+    },
+    "FsxWindowsSubdirectory":{
+      "type":"string",
+      "max":4096,
+      "pattern":"^[a-zA-Z0-9_\\-\\+\\./\\(\\)\\$\\p{Zs}]+$"
+    },
     "Gid":{
       "type":"string",
       "enum":[
@@ -1393,14 +1532,22 @@
     },
     "LocationUri":{
       "type":"string",
-      "max":4355,
-      "pattern":"^(efs|nfs|s3|smb)://[a-zA-Z0-9.\\-]+$"
+      "max":4356,
+      "pattern":"^(efs|nfs|s3|smb|fsxw)://[a-zA-Z0-9.\\-]+$"
     },
     "LogGroupArn":{
       "type":"string",
       "max":562,
       "pattern":"^arn:(aws|aws-cn|aws-us-gov|aws-iso|aws-iso-b):logs:[a-z\\-0-9]*:[0-9]{12}:log-group:([^:\\*]*)$"
     },
+    "LogLevel":{
+      "type":"string",
+      "enum":[
+        "OFF",
+        "BASIC",
+        "TRANSFER"
+      ]
+    },
     "MaxResults":{
       "type":"integer",
       "max":100,
@@ -1433,6 +1580,11 @@
       },
       "documentation":"<p>Represents the mount options that are available for DataSync to access an NFS location.</p>"
     },
+    "NfsSubdirectory":{
+      "type":"string",
+      "max":4096,
+      "pattern":"^[a-zA-Z0-9_\\-\\+\\./\\(\\)\\p{Zs}]+$"
+    },
     "NfsVersion":{
       "type":"string",
       "enum":[
@@ -1442,11 +1594,6 @@
         "NFS4_1"
       ]
     },
-    "NonEmptySubdirectory":{
-      "type":"string",
-      "max":4096,
-      "pattern":"^[a-zA-Z0-9_\\-\\./]+$"
-    },
     "OnPremConfig":{
       "type":"structure",
       "required":["AgentArns"],
@@ -1503,7 +1650,11 @@
         },
         "TaskQueueing":{
           "shape":"TaskQueueing",
-          "documentation":"<p>A value that determines whether tasks should be queued before executing the tasks. If set to <code>Enabled</code>, the tasks will queued. The default is <code>Enabled</code>.</p> <p>If you use the same agent to run multiple tasks you can enable the tasks to run in series. For more information see <a>task-queue</a>.</p>"
+          "documentation":"<p>A value that determines whether tasks should be queued before executing the tasks. If set to <code>ENABLED</code>, the tasks will be queued. The default is <code>ENABLED</code>.</p> <p>If you use the same agent to run multiple tasks you can enable the tasks to run in series. For more information see <a>queue-task-execution</a>.</p>"
+        },
+        "LogLevel":{
+          "shape":"LogLevel",
+          "documentation":"<p>A value that determines the type of logs DataSync will deliver to your AWS CloudWatch Logs file. If set to <code>OFF</code>, no logs will be delivered. <code>BASIC</code> will deliver a few logs per transfer operation and <code>TRANSFER</code> will deliver a verbose log that contains logs for every file that is transferred.</p>"
         }
       },
       "documentation":"<p>Represents the options that are available to control the behavior of a <a>StartTaskExecution</a> operation. Behavior includes preserving metadata such as user ID (UID), group ID (GID), and file permissions, and also overwriting files in the destination, data integrity verification, and so on.</p> <p>A task has a set of default options associated with it. If you don't specify an option in <a>StartTaskExecution</a>, the default value is used. You can override the defaults options on each task execution by specifying an overriding <code>Options</code> value to <a>StartTaskExecution</a>.</p>"
@@ -1539,7 +1690,6 @@
       "type":"string",
       "enum":[
         "NONE",
-        "BEST_EFFORT",
         "PRESERVE"
       ]
     },
@@ -1606,6 +1756,16 @@
         "DEEP_ARCHIVE"
       ]
     },
+    "S3Subdirectory":{
+      "type":"string",
+      "max":4096,
+      "pattern":"^[a-zA-Z0-9_\\-\\+\\./\\(\\)\\p{Zs}]*$"
+    },
+    "ScheduleExpressionCron":{
+      "type":"string",
+      "max":256,
+      "pattern":"^[a-zA-Z0-9\\ \\_\\*\\?\\,\\|\\^\\-\\/\\#\\s\\(\\)\\+]*$"
+    },
     "ServerHostname":{
       "type":"string",
       "max":255,
@@ -1629,12 +1789,18 @@
     "SmbPassword":{
       "type":"string",
       "max":104,
-      "pattern":"^.{0,104}$"
+      "pattern":"^.{0,104}$",
+      "sensitive":true
+    },
+    "SmbSubdirectory":{
+      "type":"string",
+      "max":4096,
+      "pattern":"^[a-zA-Z0-9_\\-\\+\\./\\(\\)\\$\\p{Zs}]+$"
     },
     "SmbUser":{
       "type":"string",
       "max":104,
-      "pattern":"^[^\\\\x5B\\\\x5D\\\\/:;|=,+*?]{1,104}$"
+      "pattern":"^[^\\x5B\\x5D\\\\/:;|=,+*?]{1,104}$"
     },
     "SmbVersion":{
       "type":"string",
@@ -1674,11 +1840,6 @@
       },
       "documentation":"<p>StartTaskExecutionResponse</p>"
     },
-    "Subdirectory":{
-      "type":"string",
-      "max":4096,
-      "pattern":"^[a-zA-Z0-9_\\-\\./]*$"
-    },
     "TagKey":{
       "type":"string",
       "max":256,
@@ -1739,7 +1900,7 @@
       "type":"string",
       "max":256,
       "min":1,
-      "pattern":"^[a-zA-Z0-9\\s+=._:/-]+$"
+      "pattern":"^[a-zA-Z0-9\\s+=._:@/-]+$"
     },
     "TaggableResourceArn":{
       "type":"string",
@@ -1785,6 +1946,10 @@
           "shape":"PhaseStatus",
           "documentation":"<p>The status of the PREPARING phase.</p>"
         },
+        "TotalDuration":{
+          "shape":"Duration",
+          "documentation":"<p>The total time in milliseconds that AWS DataSync took to transfer the file from the source to the destination location.</p>"
+        },
         "TransferDuration":{
           "shape":"Duration",
           "documentation":"<p>The total time in milliseconds that AWS DataSync spent in the TRANSFERRING phase.</p>"
@@ -1853,6 +2018,17 @@
         "DISABLED"
       ]
     },
+    "TaskSchedule":{
+      "type":"structure",
+      "required":["ScheduleExpression"],
+      "members":{
+        "ScheduleExpression":{
+          "shape":"ScheduleExpressionCron",
+          "documentation":"<p>A cron expression that specifies when AWS DataSync initiates a scheduled transfer from a source to a destination location. </p>"
+        }
+      },
+      "documentation":"<p>Specifies the schedule you want your task to use for repeated executions. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonCloudWatch/latest/events/ScheduledEvents.html\">Schedule Expressions for Rules</a>.</p>"
+    },
     "TaskStatus":{
       "type":"string",
       "enum":[
@@ -1929,6 +2105,10 @@
           "shape":"FilterList",
           "documentation":"<p>A list of filter rules that determines which files to exclude from a task. The list should contain a single filter string that consists of the patterns to exclude. The patterns are delimited by \"|\" (that is, a pipe), for example: <code>\"/folder1|/folder2\"</code> </p> <p> </p>"
         },
+        "Schedule":{
+          "shape":"TaskSchedule",
+          "documentation":"<p>Specifies a schedule used to periodically transfer files from a source to a destination location. You can configure your task to execute hourly, daily, weekly or on specific days of the week. You control when in the day or hour you want the task to execute. The time you specify is UTC time. For more information, see <a>task-scheduling</a>.</p>"
+        },
         "Name":{
           "shape":"TagValue",
           "documentation":"<p>The name of the task to update.</p>"
diff --git a/services/dax/build.properties b/services/dax/build.properties
index ecf2dae6fcb1..15ec2da1fc71 100644
--- a/services/dax/build.properties
+++ b/services/dax/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/dax/pom.xml b/services/dax/pom.xml
index 77287099bfed..e4c63c66fa63 100644
--- a/services/dax/pom.xml
+++ b/services/dax/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>dax</artifactId>
     <name>AWS Java SDK :: Services :: Amazon DynamoDB Accelerator (DAX)</name>
diff --git a/services/dax/src/main/resources/codegen-resources/service-2.json b/services/dax/src/main/resources/codegen-resources/service-2.json
index 588e9f46ab95..2a00dafa36b5 100644
--- a/services/dax/src/main/resources/codegen-resources/service-2.json
+++ b/services/dax/src/main/resources/codegen-resources/service-2.json
@@ -185,7 +185,7 @@
         {"shape":"InvalidParameterValueException"},
         {"shape":"InvalidParameterCombinationException"}
       ],
-      "documentation":"<p>Returns events related to DAX clusters and parameter groups. You can obtain events specific to a particular DAX cluster or parameter group by providing the name as a parameter.</p> <p>By default, only the events occurring within the last hour are returned; however, you can retrieve up to 14 days' worth of events if necessary.</p>"
+      "documentation":"<p>Returns events related to DAX clusters and parameter groups. You can obtain events specific to a particular DAX cluster or parameter group by providing the name as a parameter.</p> <p>By default, only the events occurring within the last 24 hours are returned; however, you can retrieve up to 14 days' worth of events if necessary.</p>"
     },
     "DescribeParameterGroups":{
       "name":"DescribeParameterGroups",
@@ -288,7 +288,7 @@
         {"shape":"InvalidParameterValueException"},
         {"shape":"InvalidParameterCombinationException"}
       ],
-      "documentation":"<p>Reboots a single node of a DAX cluster. The reboot action takes place as soon as possible. During the reboot, the node status is set to REBOOTING.</p>"
+      "documentation":"<p>Reboots a single node of a DAX cluster. The reboot action takes place as soon as possible. During the reboot, the node status is set to REBOOTING.</p> <note> <p> <code>RebootNode</code> restarts the DAX engine process and does not remove the contents of the cache. </p> </note>"
     },
     "TagResource":{
       "name":"TagResource",
@@ -521,11 +521,11 @@
         },
         "ReplicationFactor":{
           "shape":"Integer",
-          "documentation":"<p>The number of nodes in the DAX cluster. A replication factor of 1 will create a single-node cluster, without any read replicas. For additional fault tolerance, you can create a multiple node cluster with one or more read replicas. To do this, set <i>ReplicationFactor</i> to 2 or more.</p> <note> <p>AWS recommends that you have at least two read replicas per cluster.</p> </note>"
+          "documentation":"<p>The number of nodes in the DAX cluster. A replication factor of 1 will create a single-node cluster, without any read replicas. For additional fault tolerance, you can create a multiple node cluster with one or more read replicas. To do this, set <code>ReplicationFactor</code> to a number between 3 (one primary and two read replicas) and 10 (one primary and nine read replicas). <code>If the AvailabilityZones</code> parameter is provided, its length must equal the <code>ReplicationFactor</code>.</p> <note> <p>AWS recommends that you have at least two read replicas per cluster.</p> </note>"
         },
         "AvailabilityZones":{
           "shape":"AvailabilityZoneList",
-          "documentation":"<p>The Availability Zones (AZs) in which the cluster nodes will be created. All nodes belonging to the cluster are placed in these Availability Zones. Use this parameter if you want to distribute the nodes across multiple AZs.</p>"
+          "documentation":"<p>The Availability Zones (AZs) in which the cluster nodes will reside after the cluster has been created or updated. If provided, the length of this list must equal the <code>ReplicationFactor</code> parameter. If you omit this parameter, DAX will spread the nodes across Availability Zones for the highest availability.</p>"
         },
         "SubnetGroupName":{
           "shape":"String",
@@ -1392,6 +1392,7 @@
       "type":"structure",
       "members":{
       },
+      "documentation":"<p>The specified service linked role (SLR) was not found.</p>",
       "exception":true
     },
     "SourceType":{
@@ -1412,7 +1413,7 @@
         },
         "SubnetAvailabilityZone":{
           "shape":"String",
-          "documentation":"<p>The Availability Zone (AZ) for subnet subnet.</p>"
+          "documentation":"<p>The Availability Zone (AZ) for the subnet.</p>"
         }
       },
       "documentation":"<p>Represents the subnet associated with a DAX cluster. This parameter refers to subnets defined in Amazon Virtual Private Cloud (Amazon VPC) and used with DAX.</p>"
diff --git a/services/detective/pom.xml b/services/detective/pom.xml
new file mode 100644
index 000000000000..58e2bc4aadb3
--- /dev/null
+++ b/services/detective/pom.xml
@@ -0,0 +1,60 @@
+<?xml version="1.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.
+  -->
+
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>software.amazon.awssdk</groupId>
+        <artifactId>services</artifactId>
+        <version>2.11.8-SNAPSHOT</version>
+    </parent>
+    <artifactId>detective</artifactId>
+    <name>AWS Java SDK :: Services :: Detective</name>
+    <description>The AWS Java SDK for Detective module holds the client classes that are used for
+        communicating with Detective.
+    </description>
+    <url>https://aws.amazon.com/sdkforjava</url>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifestEntries>
+                            <Automatic-Module-Name>software.amazon.awssdk.services.detective</Automatic-Module-Name>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>protocol-core</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>aws-json-protocol</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/services/detective/src/main/resources/codegen-resources/paginators-1.json b/services/detective/src/main/resources/codegen-resources/paginators-1.json
new file mode 100644
index 000000000000..8ead136f5ee8
--- /dev/null
+++ b/services/detective/src/main/resources/codegen-resources/paginators-1.json
@@ -0,0 +1,19 @@
+{
+  "pagination": {
+    "ListGraphs": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "MaxResults"
+    },
+    "ListInvitations": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "MaxResults"
+    },
+    "ListMembers": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "MaxResults"
+    }
+  }
+}
diff --git a/services/detective/src/main/resources/codegen-resources/service-2.json b/services/detective/src/main/resources/codegen-resources/service-2.json
new file mode 100644
index 000000000000..67d527b795c3
--- /dev/null
+++ b/services/detective/src/main/resources/codegen-resources/service-2.json
@@ -0,0 +1,655 @@
+{
+  "version":"2.0",
+  "metadata":{
+    "apiVersion":"2018-10-26",
+    "endpointPrefix":"api.detective",
+    "jsonVersion":"1.1",
+    "protocol":"rest-json",
+    "serviceFullName":"Amazon Detective",
+    "serviceId":"Detective",
+    "signatureVersion":"v4",
+    "signingName":"detective",
+    "uid":"detective-2018-10-26"
+  },
+  "operations":{
+    "AcceptInvitation":{
+      "name":"AcceptInvitation",
+      "http":{
+        "method":"PUT",
+        "requestUri":"/invitation"
+      },
+      "input":{"shape":"AcceptInvitationRequest"},
+      "errors":[
+        {"shape":"ConflictException"},
+        {"shape":"InternalServerException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ValidationException"}
+      ],
+      "documentation":"<p>Accepts an invitation for the member account to contribute data to a behavior graph. This operation can only be called by an invited member account. </p> <p>The request provides the ARN of behavior graph.</p> <p>The member account status in the graph must be <code>INVITED</code>.</p>"
+    },
+    "CreateGraph":{
+      "name":"CreateGraph",
+      "http":{
+        "method":"POST",
+        "requestUri":"/graph"
+      },
+      "output":{"shape":"CreateGraphResponse"},
+      "errors":[
+        {"shape":"ConflictException"},
+        {"shape":"InternalServerException"},
+        {"shape":"ServiceQuotaExceededException"}
+      ],
+      "documentation":"<p>Creates a new behavior graph for the calling account, and sets that account as the master account. This operation is called by the account that is enabling Detective.</p> <p>Before you try to enable Detective, make sure that your account has been enrolled in Amazon GuardDuty for at least 48 hours. If you do not meet this requirement, you cannot enable Detective. If you do meet the GuardDuty prerequisite, then when you make the request to enable Detective, it checks whether your data volume is within the Detective quota. If it exceeds the quota, then you cannot enable Detective. </p> <p>The operation also enables Detective for the calling account in the currently selected Region. It returns the ARN of the new behavior graph.</p> <p> <code>CreateGraph</code> triggers a process to create the corresponding data tables for the new behavior graph.</p> <p>An account can only be the master account for one behavior graph within a Region. If the same account calls <code>CreateGraph</code> with the same master account, it always returns the same behavior graph ARN. It does not create a new behavior graph.</p>"
+    },
+    "CreateMembers":{
+      "name":"CreateMembers",
+      "http":{
+        "method":"POST",
+        "requestUri":"/graph/members"
+      },
+      "input":{"shape":"CreateMembersRequest"},
+      "output":{"shape":"CreateMembersResponse"},
+      "errors":[
+        {"shape":"InternalServerException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ValidationException"},
+        {"shape":"ServiceQuotaExceededException"}
+      ],
+      "documentation":"<p>Sends a request to invite the specified AWS accounts to be member accounts in the behavior graph. This operation can only be called by the master account for a behavior graph. </p> <p> <code>CreateMembers</code> verifies the accounts and then sends invitations to the verified accounts.</p> <p>The request provides the behavior graph ARN and the list of accounts to invite.</p> <p>The response separates the requested accounts into two lists:</p> <ul> <li> <p>The accounts that <code>CreateMembers</code> was able to start the verification for. This list includes member accounts that are being verified, that have passed verification and are being sent an invitation, and that have failed verification.</p> </li> <li> <p>The accounts that <code>CreateMembers</code> was unable to process. This list includes accounts that were already invited to be member accounts in the behavior graph.</p> </li> </ul>"
+    },
+    "DeleteGraph":{
+      "name":"DeleteGraph",
+      "http":{
+        "method":"POST",
+        "requestUri":"/graph/removal"
+      },
+      "input":{"shape":"DeleteGraphRequest"},
+      "errors":[
+        {"shape":"InternalServerException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ValidationException"}
+      ],
+      "documentation":"<p>Disables the specified behavior graph and queues it to be deleted. This operation removes the graph from each member account's list of behavior graphs.</p> <p> <code>DeleteGraph</code> can only be called by the master account for a behavior graph.</p>"
+    },
+    "DeleteMembers":{
+      "name":"DeleteMembers",
+      "http":{
+        "method":"POST",
+        "requestUri":"/graph/members/removal"
+      },
+      "input":{"shape":"DeleteMembersRequest"},
+      "output":{"shape":"DeleteMembersResponse"},
+      "errors":[
+        {"shape":"ConflictException"},
+        {"shape":"InternalServerException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ValidationException"}
+      ],
+      "documentation":"<p>Deletes one or more member accounts from the master account behavior graph. This operation can only be called by a Detective master account. That account cannot use <code>DeleteMembers</code> to delete their own account from the behavior graph. To disable a behavior graph, the master account uses the <code>DeleteGraph</code> API method.</p>"
+    },
+    "DisassociateMembership":{
+      "name":"DisassociateMembership",
+      "http":{
+        "method":"POST",
+        "requestUri":"/membership/removal"
+      },
+      "input":{"shape":"DisassociateMembershipRequest"},
+      "errors":[
+        {"shape":"ConflictException"},
+        {"shape":"InternalServerException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ValidationException"}
+      ],
+      "documentation":"<p>Removes the member account from the specified behavior graph. This operation can only be called by a member account that has the <code>ENABLED</code> status.</p>"
+    },
+    "GetMembers":{
+      "name":"GetMembers",
+      "http":{
+        "method":"POST",
+        "requestUri":"/graph/members/get"
+      },
+      "input":{"shape":"GetMembersRequest"},
+      "output":{"shape":"GetMembersResponse"},
+      "errors":[
+        {"shape":"InternalServerException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ValidationException"}
+      ],
+      "documentation":"<p>Returns the membership details for specified member accounts for a behavior graph.</p>"
+    },
+    "ListGraphs":{
+      "name":"ListGraphs",
+      "http":{
+        "method":"POST",
+        "requestUri":"/graphs/list"
+      },
+      "input":{"shape":"ListGraphsRequest"},
+      "output":{"shape":"ListGraphsResponse"},
+      "errors":[
+        {"shape":"InternalServerException"},
+        {"shape":"ValidationException"}
+      ],
+      "documentation":"<p>Returns the list of behavior graphs that the calling account is a master of. This operation can only be called by a master account.</p> <p>Because an account can currently only be the master of one behavior graph within a Region, the results always contain a single graph.</p>"
+    },
+    "ListInvitations":{
+      "name":"ListInvitations",
+      "http":{
+        "method":"POST",
+        "requestUri":"/invitations/list"
+      },
+      "input":{"shape":"ListInvitationsRequest"},
+      "output":{"shape":"ListInvitationsResponse"},
+      "errors":[
+        {"shape":"InternalServerException"},
+        {"shape":"ValidationException"}
+      ],
+      "documentation":"<p>Retrieves the list of open and accepted behavior graph invitations for the member account. This operation can only be called by a member account.</p> <p>Open invitations are invitations that the member account has not responded to.</p> <p>The results do not include behavior graphs for which the member account declined the invitation. The results also do not include behavior graphs that the member account resigned from or was removed from.</p>"
+    },
+    "ListMembers":{
+      "name":"ListMembers",
+      "http":{
+        "method":"POST",
+        "requestUri":"/graph/members/list"
+      },
+      "input":{"shape":"ListMembersRequest"},
+      "output":{"shape":"ListMembersResponse"},
+      "errors":[
+        {"shape":"InternalServerException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ValidationException"}
+      ],
+      "documentation":"<p>Retrieves the list of member accounts for a behavior graph. Does not return member accounts that were removed from the behavior graph.</p>"
+    },
+    "RejectInvitation":{
+      "name":"RejectInvitation",
+      "http":{
+        "method":"POST",
+        "requestUri":"/invitation/removal"
+      },
+      "input":{"shape":"RejectInvitationRequest"},
+      "errors":[
+        {"shape":"ConflictException"},
+        {"shape":"InternalServerException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ValidationException"}
+      ],
+      "documentation":"<p>Rejects an invitation to contribute the account data to a behavior graph. This operation must be called by a member account that has the <code>INVITED</code> status.</p>"
+    },
+    "StartMonitoringMember":{
+      "name":"StartMonitoringMember",
+      "http":{
+        "method":"POST",
+        "requestUri":"/graph/member/monitoringstate"
+      },
+      "input":{"shape":"StartMonitoringMemberRequest"},
+      "errors":[
+        {"shape":"ConflictException"},
+        {"shape":"InternalServerException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ServiceQuotaExceededException"},
+        {"shape":"ValidationException"}
+      ],
+      "documentation":"<p>Sends a request to enable data ingest for a member account that has a status of <code>ACCEPTED_BUT_DISABLED</code>.</p> <p>For valid member accounts, the status is updated as follows.</p> <ul> <li> <p>If Detective enabled the member account, then the new status is <code>ENABLED</code>.</p> </li> <li> <p>If Detective cannot enable the member account, the status remains <code>ACCEPTED_BUT_DISABLED</code>. </p> </li> </ul>"
+    }
+  },
+  "shapes":{
+    "AcceptInvitationRequest":{
+      "type":"structure",
+      "required":["GraphArn"],
+      "members":{
+        "GraphArn":{
+          "shape":"GraphArn",
+          "documentation":"<p>The ARN of the behavior graph that the member account is accepting the invitation for.</p> <p>The member account status in the behavior graph must be <code>INVITED</code>.</p>"
+        }
+      }
+    },
+    "Account":{
+      "type":"structure",
+      "required":[
+        "AccountId",
+        "EmailAddress"
+      ],
+      "members":{
+        "AccountId":{
+          "shape":"AccountId",
+          "documentation":"<p>The account identifier of the AWS account.</p>"
+        },
+        "EmailAddress":{
+          "shape":"EmailAddress",
+          "documentation":"<p>The AWS account root user email address for the AWS account.</p>"
+        }
+      },
+      "documentation":"<p>An AWS account that is the master of or a member of a behavior graph.</p>"
+    },
+    "AccountId":{
+      "type":"string",
+      "max":12,
+      "min":12,
+      "pattern":"^[0-9]+$"
+    },
+    "AccountIdList":{
+      "type":"list",
+      "member":{"shape":"AccountId"},
+      "max":50,
+      "min":1
+    },
+    "AccountList":{
+      "type":"list",
+      "member":{"shape":"Account"},
+      "max":50,
+      "min":1
+    },
+    "ConflictException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p>The request attempted an invalid action.</p>",
+      "error":{"httpStatusCode":409},
+      "exception":true
+    },
+    "CreateGraphResponse":{
+      "type":"structure",
+      "members":{
+        "GraphArn":{
+          "shape":"GraphArn",
+          "documentation":"<p>The ARN of the new behavior graph.</p>"
+        }
+      }
+    },
+    "CreateMembersRequest":{
+      "type":"structure",
+      "required":[
+        "GraphArn",
+        "Accounts"
+      ],
+      "members":{
+        "GraphArn":{
+          "shape":"GraphArn",
+          "documentation":"<p>The ARN of the behavior graph to invite the member accounts to contribute their data to.</p>"
+        },
+        "Message":{
+          "shape":"EmailMessage",
+          "documentation":"<p>Customized message text to include in the invitation email message to the invited member accounts.</p>"
+        },
+        "Accounts":{
+          "shape":"AccountList",
+          "documentation":"<p>The list of AWS accounts to invite to become member accounts in the behavior graph. For each invited account, the account list contains the account identifier and the AWS account root user email address.</p>"
+        }
+      }
+    },
+    "CreateMembersResponse":{
+      "type":"structure",
+      "members":{
+        "Members":{
+          "shape":"MemberDetailList",
+          "documentation":"<p>The set of member account invitation requests that Detective was able to process. This includes accounts that are being verified, that failed verification, and that passed verification and are being sent an invitation.</p>"
+        },
+        "UnprocessedAccounts":{
+          "shape":"UnprocessedAccountList",
+          "documentation":"<p>The list of accounts for which Detective was unable to process the invitation request. For each account, the list provides the reason why the request could not be processed. The list includes accounts that are already member accounts in the behavior graph.</p>"
+        }
+      }
+    },
+    "DeleteGraphRequest":{
+      "type":"structure",
+      "required":["GraphArn"],
+      "members":{
+        "GraphArn":{
+          "shape":"GraphArn",
+          "documentation":"<p>The ARN of the behavior graph to disable.</p>"
+        }
+      }
+    },
+    "DeleteMembersRequest":{
+      "type":"structure",
+      "required":[
+        "GraphArn",
+        "AccountIds"
+      ],
+      "members":{
+        "GraphArn":{
+          "shape":"GraphArn",
+          "documentation":"<p>The ARN of the behavior graph to delete members from.</p>"
+        },
+        "AccountIds":{
+          "shape":"AccountIdList",
+          "documentation":"<p>The list of AWS account identifiers for the member accounts to delete from the behavior graph.</p>"
+        }
+      }
+    },
+    "DeleteMembersResponse":{
+      "type":"structure",
+      "members":{
+        "AccountIds":{
+          "shape":"AccountIdList",
+          "documentation":"<p>The list of AWS account identifiers for the member accounts that Detective successfully deleted from the behavior graph.</p>"
+        },
+        "UnprocessedAccounts":{
+          "shape":"UnprocessedAccountList",
+          "documentation":"<p>The list of member accounts that Detective was not able to delete from the behavior graph. For each member account, provides the reason that the deletion could not be processed.</p>"
+        }
+      }
+    },
+    "DisassociateMembershipRequest":{
+      "type":"structure",
+      "required":["GraphArn"],
+      "members":{
+        "GraphArn":{
+          "shape":"GraphArn",
+          "documentation":"<p>The ARN of the behavior graph to remove the member account from.</p> <p>The member account's member status in the behavior graph must be <code>ENABLED</code>.</p>"
+        }
+      }
+    },
+    "EmailAddress":{
+      "type":"string",
+      "max":64,
+      "min":1,
+      "pattern":"^.+@.+$"
+    },
+    "EmailMessage":{
+      "type":"string",
+      "max":1000,
+      "min":1
+    },
+    "ErrorMessage":{"type":"string"},
+    "GetMembersRequest":{
+      "type":"structure",
+      "required":[
+        "GraphArn",
+        "AccountIds"
+      ],
+      "members":{
+        "GraphArn":{
+          "shape":"GraphArn",
+          "documentation":"<p>The ARN of the behavior graph for which to request the member details.</p>"
+        },
+        "AccountIds":{
+          "shape":"AccountIdList",
+          "documentation":"<p>The list of AWS account identifiers for the member account for which to return member details.</p> <p>You cannot use <code>GetMembers</code> to retrieve information about member accounts that were removed from the behavior graph.</p>"
+        }
+      }
+    },
+    "GetMembersResponse":{
+      "type":"structure",
+      "members":{
+        "MemberDetails":{
+          "shape":"MemberDetailList",
+          "documentation":"<p>The member account details that Detective is returning in response to the request.</p>"
+        },
+        "UnprocessedAccounts":{
+          "shape":"UnprocessedAccountList",
+          "documentation":"<p>The requested member accounts for which Detective was unable to return member details.</p> <p>For each account, provides the reason why the request could not be processed.</p>"
+        }
+      }
+    },
+    "Graph":{
+      "type":"structure",
+      "members":{
+        "Arn":{
+          "shape":"GraphArn",
+          "documentation":"<p>The ARN of the behavior graph.</p>"
+        },
+        "CreatedTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>The date and time that the behavior graph was created. The value is in milliseconds since the epoch.</p>"
+        }
+      },
+      "documentation":"<p>A behavior graph in Detective.</p>"
+    },
+    "GraphArn":{
+      "type":"string",
+      "pattern":"^arn:aws[-\\w]{0,10}?:detective:[-\\w]{2,20}?:\\d{12}?:graph:[abcdef\\d]{32}?$"
+    },
+    "GraphList":{
+      "type":"list",
+      "member":{"shape":"Graph"}
+    },
+    "InternalServerException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p>The request was valid but failed because of a problem with the service.</p>",
+      "error":{"httpStatusCode":500},
+      "exception":true
+    },
+    "ListGraphsRequest":{
+      "type":"structure",
+      "members":{
+        "NextToken":{
+          "shape":"PaginationToken",
+          "documentation":"<p>For requests to get the next page of results, the pagination token that was returned with the previous set of results. The initial request does not include a pagination token.</p>"
+        },
+        "MaxResults":{
+          "shape":"MemberResultsLimit",
+          "documentation":"<p>The maximum number of graphs to return at a time. The total must be less than the overall limit on the number of results to return, which is currently 200.</p>"
+        }
+      }
+    },
+    "ListGraphsResponse":{
+      "type":"structure",
+      "members":{
+        "GraphList":{
+          "shape":"GraphList",
+          "documentation":"<p>A list of behavior graphs that the account is a master for.</p>"
+        },
+        "NextToken":{
+          "shape":"PaginationToken",
+          "documentation":"<p>If there are more behavior graphs remaining in the results, then this is the pagination token to use to request the next page of behavior graphs.</p>"
+        }
+      }
+    },
+    "ListInvitationsRequest":{
+      "type":"structure",
+      "members":{
+        "NextToken":{
+          "shape":"PaginationToken",
+          "documentation":"<p>For requests to retrieve the next page of results, the pagination token that was returned with the previous page of results. The initial request does not include a pagination token.</p>"
+        },
+        "MaxResults":{
+          "shape":"MemberResultsLimit",
+          "documentation":"<p>The maximum number of behavior graph invitations to return in the response. The total must be less than the overall limit on the number of results to return, which is currently 200.</p>"
+        }
+      }
+    },
+    "ListInvitationsResponse":{
+      "type":"structure",
+      "members":{
+        "Invitations":{
+          "shape":"MemberDetailList",
+          "documentation":"<p>The list of behavior graphs for which the member account has open or accepted invitations.</p>"
+        },
+        "NextToken":{
+          "shape":"PaginationToken",
+          "documentation":"<p>If there are more behavior graphs remaining in the results, then this is the pagination token to use to request the next page of behavior graphs.</p>"
+        }
+      }
+    },
+    "ListMembersRequest":{
+      "type":"structure",
+      "required":["GraphArn"],
+      "members":{
+        "GraphArn":{
+          "shape":"GraphArn",
+          "documentation":"<p>The ARN of the behavior graph for which to retrieve the list of member accounts.</p>"
+        },
+        "NextToken":{
+          "shape":"PaginationToken",
+          "documentation":"<p>For requests to retrieve the next page of member account results, the pagination token that was returned with the previous page of results. The initial request does not include a pagination token.</p>"
+        },
+        "MaxResults":{
+          "shape":"MemberResultsLimit",
+          "documentation":"<p>The maximum number of member accounts to include in the response. The total must be less than the overall limit on the number of results to return, which is currently 200.</p>"
+        }
+      }
+    },
+    "ListMembersResponse":{
+      "type":"structure",
+      "members":{
+        "MemberDetails":{
+          "shape":"MemberDetailList",
+          "documentation":"<p>The list of member accounts in the behavior graph.</p> <p>The results include member accounts that did not pass verification and member accounts that have not yet accepted the invitation to the behavior graph. The results do not include member accounts that were removed from the behavior graph.</p>"
+        },
+        "NextToken":{
+          "shape":"PaginationToken",
+          "documentation":"<p>If there are more member accounts remaining in the results, then this is the pagination token to use to request the next page of member accounts.</p>"
+        }
+      }
+    },
+    "MemberDetail":{
+      "type":"structure",
+      "members":{
+        "AccountId":{
+          "shape":"AccountId",
+          "documentation":"<p>The AWS account identifier for the member account.</p>"
+        },
+        "EmailAddress":{
+          "shape":"EmailAddress",
+          "documentation":"<p>The AWS account root user email address for the member account.</p>"
+        },
+        "GraphArn":{
+          "shape":"GraphArn",
+          "documentation":"<p>The ARN of the behavior graph that the member account was invited to.</p>"
+        },
+        "MasterId":{
+          "shape":"AccountId",
+          "documentation":"<p>The AWS account identifier of the master account for the behavior graph.</p>"
+        },
+        "Status":{
+          "shape":"MemberStatus",
+          "documentation":"<p>The current membership status of the member account. The status can have one of the following values:</p> <ul> <li> <p> <code>INVITED</code> - Indicates that the member was sent an invitation but has not yet responded.</p> </li> <li> <p> <code>VERIFICATION_IN_PROGRESS</code> - Indicates that Detective is verifying that the account identifier and email address provided for the member account match. If they do match, then Detective sends the invitation. If the email address and account identifier don't match, then the member cannot be added to the behavior graph.</p> </li> <li> <p> <code>VERIFICATION_FAILED</code> - Indicates that the account and email address provided for the member account do not match, and Detective did not send an invitation to the account.</p> </li> <li> <p> <code>ENABLED</code> - Indicates that the member account accepted the invitation to contribute to the behavior graph.</p> </li> <li> <p> <code>ACCEPTED_BUT_DISABLED</code> - Indicates that the member account accepted the invitation but is prevented from contributing data to the behavior graph. <code>DisabledReason</code> provides the reason why the member account is not enabled.</p> </li> </ul> <p>Member accounts that declined an invitation or that were removed from the behavior graph are not included.</p>"
+        },
+        "DisabledReason":{
+          "shape":"MemberDisabledReason",
+          "documentation":"<p>For member accounts with a status of <code>ACCEPTED_BUT_DISABLED</code>, the reason that the member account is not enabled.</p> <p>The reason can have one of the following values:</p> <ul> <li> <p> <code>VOLUME_TOO_HIGH</code> - Indicates that adding the member account would cause the data volume for the behavior graph to be too high.</p> </li> <li> <p> <code>VOLUME_UNKNOWN</code> - Indicates that Detective is unable to verify the data volume for the member account. This is usually because the member account is not enrolled in Amazon GuardDuty. </p> </li> </ul>"
+        },
+        "InvitedTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>The date and time that Detective sent the invitation to the member account. The value is in milliseconds since the epoch.</p>"
+        },
+        "UpdatedTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>The date and time that the member account was last updated. The value is in milliseconds since the epoch.</p>"
+        },
+        "PercentOfGraphUtilization":{
+          "shape":"Percentage",
+          "documentation":"<p>The member account data volume as a percentage of the maximum allowed data volume. 0 indicates 0 percent, and 100 indicates 100 percent.</p> <p>Note that this is not the percentage of the behavior graph data volume.</p> <p>For example, the data volume for the behavior graph is 80 GB per day. The maximum data volume is 160 GB per day. If the data volume for the member account is 40 GB per day, then <code>PercentOfGraphUtilization</code> is 25. It represents 25% of the maximum allowed data volume. </p>"
+        },
+        "PercentOfGraphUtilizationUpdatedTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>The date and time when the graph utilization percentage was last updated.</p>"
+        }
+      },
+      "documentation":"<p>Details about a member account that was invited to contribute to a behavior graph.</p>"
+    },
+    "MemberDetailList":{
+      "type":"list",
+      "member":{"shape":"MemberDetail"}
+    },
+    "MemberDisabledReason":{
+      "type":"string",
+      "enum":[
+        "VOLUME_TOO_HIGH",
+        "VOLUME_UNKNOWN"
+      ]
+    },
+    "MemberResultsLimit":{
+      "type":"integer",
+      "box":true,
+      "max":200,
+      "min":1
+    },
+    "MemberStatus":{
+      "type":"string",
+      "enum":[
+        "INVITED",
+        "VERIFICATION_IN_PROGRESS",
+        "VERIFICATION_FAILED",
+        "ENABLED",
+        "ACCEPTED_BUT_DISABLED"
+      ]
+    },
+    "PaginationToken":{
+      "type":"string",
+      "max":1024,
+      "min":1
+    },
+    "Percentage":{"type":"double"},
+    "RejectInvitationRequest":{
+      "type":"structure",
+      "required":["GraphArn"],
+      "members":{
+        "GraphArn":{
+          "shape":"GraphArn",
+          "documentation":"<p>The ARN of the behavior graph to reject the invitation to.</p> <p>The member account's current member status in the behavior graph must be <code>INVITED</code>.</p>"
+        }
+      }
+    },
+    "ResourceNotFoundException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p>The request refers to a nonexistent resource.</p>",
+      "error":{"httpStatusCode":404},
+      "exception":true
+    },
+    "ServiceQuotaExceededException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p>This request cannot be completed for one of the following reasons.</p> <ul> <li> <p>The request would cause the number of member accounts in the behavior graph to exceed the maximum allowed. A behavior graph cannot have more than 1000 member accounts.</p> </li> <li> <p>The request would cause the data rate for the behavior graph to exceed the maximum allowed.</p> </li> <li> <p>Detective is unable to verify the data rate for the member account. This is usually because the member account is not enrolled in Amazon GuardDuty. </p> </li> </ul>",
+      "error":{"httpStatusCode":402},
+      "exception":true
+    },
+    "StartMonitoringMemberRequest":{
+      "type":"structure",
+      "required":[
+        "GraphArn",
+        "AccountId"
+      ],
+      "members":{
+        "GraphArn":{
+          "shape":"GraphArn",
+          "documentation":"<p>The ARN of the behavior graph.</p>"
+        },
+        "AccountId":{
+          "shape":"AccountId",
+          "documentation":"<p>The account ID of the member account to try to enable.</p> <p>The account must be an invited member account with a status of <code>ACCEPTED_BUT_DISABLED</code>. </p>"
+        }
+      }
+    },
+    "Timestamp":{"type":"timestamp"},
+    "UnprocessedAccount":{
+      "type":"structure",
+      "members":{
+        "AccountId":{
+          "shape":"AccountId",
+          "documentation":"<p>The AWS account identifier of the member account that was not processed.</p>"
+        },
+        "Reason":{
+          "shape":"UnprocessedReason",
+          "documentation":"<p>The reason that the member account request could not be processed.</p>"
+        }
+      },
+      "documentation":"<p>A member account that was included in a request but for which the request could not be processed.</p>"
+    },
+    "UnprocessedAccountList":{
+      "type":"list",
+      "member":{"shape":"UnprocessedAccount"}
+    },
+    "UnprocessedReason":{"type":"string"},
+    "ValidationException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p>The request parameters are invalid.</p>",
+      "error":{"httpStatusCode":400},
+      "exception":true
+    }
+  },
+  "documentation":"<p>Detective uses machine learning and purpose-built visualizations to help you analyze and investigate security issues across your Amazon Web Services (AWS) workloads. Detective automatically extracts time-based events such as login attempts, API calls, and network traffic from AWS CloudTrail and Amazon Virtual Private Cloud (Amazon VPC) flow logs. It also extracts findings detected by Amazon GuardDuty.</p> <p>The Detective API primarily supports the creation and management of behavior graphs. A behavior graph contains the extracted data from a set of member accounts, and is created and managed by a master account.</p> <p>Every behavior graph is specific to a Region. You can only use the API to manage graphs that belong to the Region that is associated with the currently selected endpoint.</p> <p>A Detective master account can use the Detective API to do the following:</p> <ul> <li> <p>Enable and disable Detective. Enabling Detective creates a new behavior graph.</p> </li> <li> <p>View the list of member accounts in a behavior graph.</p> </li> <li> <p>Add member accounts to a behavior graph.</p> </li> <li> <p>Remove member accounts from a behavior graph.</p> </li> </ul> <p>A member account can use the Detective API to do the following:</p> <ul> <li> <p>View the list of behavior graphs that they are invited to.</p> </li> <li> <p>Accept an invitation to contribute to a behavior graph.</p> </li> <li> <p>Decline an invitation to contribute to a behavior graph.</p> </li> <li> <p>Remove their account from a behavior graph.</p> </li> </ul> <p>All API actions are logged as CloudTrail events. See <a href=\"https://docs.aws.amazon.com/detective/latest/adminguide/logging-using-cloudtrail.html\">Logging Detective API Calls with CloudTrail</a>.</p>"
+}
diff --git a/services/devicefarm/build.properties b/services/devicefarm/build.properties
index ecf2dae6fcb1..15ec2da1fc71 100644
--- a/services/devicefarm/build.properties
+++ b/services/devicefarm/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/devicefarm/pom.xml b/services/devicefarm/pom.xml
index 94fc97c76441..598d6a3864d6 100644
--- a/services/devicefarm/pom.xml
+++ b/services/devicefarm/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>devicefarm</artifactId>
     <name>AWS Java SDK :: Services :: AWS Device Farm</name>
diff --git a/services/devicefarm/src/it/java/software/amazon/awssdk/services/devicefarm/DeviceFarmIntegrationTest.java b/services/devicefarm/src/it/java/software/amazon/awssdk/services/devicefarm/DeviceFarmIntegrationTest.java
index 3914007eff1b..ff0c9c69cffb 100644
--- a/services/devicefarm/src/it/java/software/amazon/awssdk/services/devicefarm/DeviceFarmIntegrationTest.java
+++ b/services/devicefarm/src/it/java/software/amazon/awssdk/services/devicefarm/DeviceFarmIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/devicefarm/src/main/resources/codegen-resources/paginators-1.json b/services/devicefarm/src/main/resources/codegen-resources/paginators-1.json
index 7f9e88c8ff14..92e2263422ed 100644
--- a/services/devicefarm/src/main/resources/codegen-resources/paginators-1.json
+++ b/services/devicefarm/src/main/resources/codegen-resources/paginators-1.json
@@ -58,6 +58,26 @@
       "output_token": "nextToken",
       "result_key": "suites"
     },
+    "ListTestGridProjects": {
+      "input_token": "nextToken",
+      "limit_key": "maxResult",
+      "output_token": "nextToken"
+    },
+    "ListTestGridSessionActions": {
+      "input_token": "nextToken",
+      "limit_key": "maxResult",
+      "output_token": "nextToken"
+    },
+    "ListTestGridSessionArtifacts": {
+      "input_token": "nextToken",
+      "limit_key": "maxResult",
+      "output_token": "nextToken"
+    },
+    "ListTestGridSessions": {
+      "input_token": "nextToken",
+      "limit_key": "maxResult",
+      "output_token": "nextToken"
+    },
     "ListTests": {
       "input_token": "nextToken",
       "output_token": "nextToken",
diff --git a/services/devicefarm/src/main/resources/codegen-resources/service-2.json b/services/devicefarm/src/main/resources/codegen-resources/service-2.json
index 975b226dd017..d47c301370c1 100644
--- a/services/devicefarm/src/main/resources/codegen-resources/service-2.json
+++ b/services/devicefarm/src/main/resources/codegen-resources/service-2.json
@@ -75,7 +75,7 @@
         {"shape":"ServiceAccountException"},
         {"shape":"TagOperationException"}
       ],
-      "documentation":"<p>Creates a new project.</p>"
+      "documentation":"<p>Creates a project.</p>"
     },
     "CreateRemoteAccessSession":{
       "name":"CreateRemoteAccessSession",
@@ -93,6 +93,34 @@
       ],
       "documentation":"<p>Specifies and starts a remote access session.</p>"
     },
+    "CreateTestGridProject":{
+      "name":"CreateTestGridProject",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"CreateTestGridProjectRequest"},
+      "output":{"shape":"CreateTestGridProjectResult"},
+      "errors":[
+        {"shape":"InternalServiceException"}
+      ],
+      "documentation":"<p>Creates a Selenium testing project. Projects are used to track <a>TestGridSession</a> instances.</p>"
+    },
+    "CreateTestGridUrl":{
+      "name":"CreateTestGridUrl",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"CreateTestGridUrlRequest"},
+      "output":{"shape":"CreateTestGridUrlResult"},
+      "errors":[
+        {"shape":"NotFoundException"},
+        {"shape":"ArgumentException"},
+        {"shape":"InternalServiceException"}
+      ],
+      "documentation":"<p>Creates a signed, short-term URL that can be passed to a Selenium <code>RemoteWebDriver</code> constructor.</p>"
+    },
     "CreateUpload":{
       "name":"CreateUpload",
       "http":{
@@ -186,7 +214,7 @@
         {"shape":"LimitExceededException"},
         {"shape":"ServiceAccountException"}
       ],
-      "documentation":"<p>Deletes an AWS Device Farm project, given the project ARN.</p> <p> <b>Note</b> Deleting this resource does not stop an in-progress run.</p>"
+      "documentation":"<p>Deletes an AWS Device Farm project, given the project ARN.</p> <p> Deleting this resource does not stop an in-progress run.</p>"
     },
     "DeleteRemoteAccessSession":{
       "name":"DeleteRemoteAccessSession",
@@ -218,7 +246,23 @@
         {"shape":"LimitExceededException"},
         {"shape":"ServiceAccountException"}
       ],
-      "documentation":"<p>Deletes the run, given the run ARN.</p> <p> <b>Note</b> Deleting this resource does not stop an in-progress run.</p>"
+      "documentation":"<p>Deletes the run, given the run ARN.</p> <p> Deleting this resource does not stop an in-progress run.</p>"
+    },
+    "DeleteTestGridProject":{
+      "name":"DeleteTestGridProject",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DeleteTestGridProjectRequest"},
+      "output":{"shape":"DeleteTestGridProjectResult"},
+      "errors":[
+        {"shape":"NotFoundException"},
+        {"shape":"ArgumentException"},
+        {"shape":"CannotDeleteException"},
+        {"shape":"InternalServiceException"}
+      ],
+      "documentation":"<p> Deletes a Selenium testing project and all content generated under it. </p> <important> <p>You cannot undo this operation.</p> </important> <note> <p>You cannot delete a project if it has active sessions.</p> </note>"
     },
     "DeleteUpload":{
       "name":"DeleteUpload",
@@ -266,7 +310,7 @@
         {"shape":"LimitExceededException"},
         {"shape":"ServiceAccountException"}
       ],
-      "documentation":"<p>Returns the number of unmetered iOS and/or unmetered Android devices that have been purchased by the account.</p>"
+      "documentation":"<p>Returns the number of unmetered iOS or unmetered Android devices that have been purchased by the account.</p>"
     },
     "GetDevice":{
       "name":"GetDevice",
@@ -298,7 +342,7 @@
         {"shape":"LimitExceededException"},
         {"shape":"ServiceAccountException"}
       ],
-      "documentation":"<p>Returns information about a device instance belonging to a private device fleet.</p>"
+      "documentation":"<p>Returns information about a device instance that belongs to a private device fleet.</p>"
     },
     "GetDevicePool":{
       "name":"GetDevicePool",
@@ -395,7 +439,7 @@
         {"shape":"LimitExceededException"},
         {"shape":"ServiceAccountException"}
       ],
-      "documentation":"<p>Gets the current status and future status of all offerings purchased by an AWS account. The response indicates how many offerings are currently available and the offerings that will be available in the next period. The API returns a <code>NotEligible</code> error if the user is not permitted to invoke the operation. Please contact <a href=\"mailto:aws-devicefarm-support@amazon.com\">aws-devicefarm-support@amazon.com</a> if you believe that you should be able to invoke this operation.</p>"
+      "documentation":"<p>Gets the current status and future status of all offerings purchased by an AWS account. The response indicates how many offerings are currently available and the offerings that will be available in the next period. The API returns a <code>NotEligible</code> error if the user is not permitted to invoke the operation. If you must be able to invoke this operation, contact <a href=\"mailto:aws-devicefarm-support@amazon.com\">aws-devicefarm-support@amazon.com</a>.</p>"
     },
     "GetProject":{
       "name":"GetProject",
@@ -477,6 +521,36 @@
       ],
       "documentation":"<p>Gets information about a test.</p>"
     },
+    "GetTestGridProject":{
+      "name":"GetTestGridProject",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"GetTestGridProjectRequest"},
+      "output":{"shape":"GetTestGridProjectResult"},
+      "errors":[
+        {"shape":"NotFoundException"},
+        {"shape":"ArgumentException"},
+        {"shape":"InternalServiceException"}
+      ],
+      "documentation":"<p>Retrieves information about a Selenium testing project.</p>"
+    },
+    "GetTestGridSession":{
+      "name":"GetTestGridSession",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"GetTestGridSessionRequest"},
+      "output":{"shape":"GetTestGridSessionResult"},
+      "errors":[
+        {"shape":"NotFoundException"},
+        {"shape":"ArgumentException"},
+        {"shape":"InternalServiceException"}
+      ],
+      "documentation":"<p>A session is an instance of a browser created through a <code>RemoteWebDriver</code> with the URL from <a>CreateTestGridUrlResult$url</a>. You can use the following to look up sessions:</p> <ul> <li> <p>The session ARN (<a>GetTestGridSessionRequest$sessionArn</a>).</p> </li> <li> <p>The project ARN and a session ID (<a>GetTestGridSessionRequest$projectArn</a> and <a>GetTestGridSessionRequest$sessionId</a>).</p> </li> </ul> <p/>"
+    },
     "GetUpload":{
       "name":"GetUpload",
       "http":{
@@ -651,7 +725,7 @@
         {"shape":"LimitExceededException"},
         {"shape":"ServiceAccountException"}
       ],
-      "documentation":"<p>Returns a list of offering promotions. Each offering promotion record contains the ID and description of the promotion. The API returns a <code>NotEligible</code> error if the caller is not permitted to invoke the operation. Contact <a href=\"mailto:aws-devicefarm-support@amazon.com\">aws-devicefarm-support@amazon.com</a> if you believe that you should be able to invoke this operation.</p>"
+      "documentation":"<p>Returns a list of offering promotions. Each offering promotion record contains the ID and description of the promotion. The API returns a <code>NotEligible</code> error if the caller is not permitted to invoke the operation. Contact <a href=\"mailto:aws-devicefarm-support@amazon.com\">aws-devicefarm-support@amazon.com</a> if you must be able to invoke this operation.</p>"
     },
     "ListOfferingTransactions":{
       "name":"ListOfferingTransactions",
@@ -668,7 +742,7 @@
         {"shape":"LimitExceededException"},
         {"shape":"ServiceAccountException"}
       ],
-      "documentation":"<p>Returns a list of all historical purchases, renewals, and system renewal transactions for an AWS account. The list is paginated and ordered by a descending timestamp (most recent transactions are first). The API returns a <code>NotEligible</code> error if the user is not permitted to invoke the operation. Please contact <a href=\"mailto:aws-devicefarm-support@amazon.com\">aws-devicefarm-support@amazon.com</a> if you believe that you should be able to invoke this operation.</p>"
+      "documentation":"<p>Returns a list of all historical purchases, renewals, and system renewal transactions for an AWS account. The list is paginated and ordered by a descending timestamp (most recent transactions are first). The API returns a <code>NotEligible</code> error if the user is not permitted to invoke the operation. If you must be able to invoke this operation, contact <a href=\"mailto:aws-devicefarm-support@amazon.com\">aws-devicefarm-support@amazon.com</a>.</p>"
     },
     "ListOfferings":{
       "name":"ListOfferings",
@@ -685,7 +759,7 @@
         {"shape":"LimitExceededException"},
         {"shape":"ServiceAccountException"}
       ],
-      "documentation":"<p>Returns a list of products or offerings that the user can manage through the API. Each offering record indicates the recurring price per unit and the frequency for that offering. The API returns a <code>NotEligible</code> error if the user is not permitted to invoke the operation. Please contact <a href=\"mailto:aws-devicefarm-support@amazon.com\">aws-devicefarm-support@amazon.com</a> if you believe that you should be able to invoke this operation.</p>"
+      "documentation":"<p>Returns a list of products or offerings that the user can manage through the API. Each offering record indicates the recurring price per unit and the frequency for that offering. The API returns a <code>NotEligible</code> error if the user is not permitted to invoke the operation. If you must be able to invoke this operation, contact <a href=\"mailto:aws-devicefarm-support@amazon.com\">aws-devicefarm-support@amazon.com</a>.</p>"
     },
     "ListProjects":{
       "name":"ListProjects",
@@ -776,11 +850,71 @@
       "input":{"shape":"ListTagsForResourceRequest"},
       "output":{"shape":"ListTagsForResourceResponse"},
       "errors":[
+        {"shape":"ArgumentException"},
         {"shape":"NotFoundException"},
         {"shape":"TagOperationException"}
       ],
       "documentation":"<p>List the tags for an AWS Device Farm resource.</p>"
     },
+    "ListTestGridProjects":{
+      "name":"ListTestGridProjects",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"ListTestGridProjectsRequest"},
+      "output":{"shape":"ListTestGridProjectsResult"},
+      "errors":[
+        {"shape":"ArgumentException"},
+        {"shape":"InternalServiceException"}
+      ],
+      "documentation":"<p>Gets a list of all Selenium testing projects in your account.</p>"
+    },
+    "ListTestGridSessionActions":{
+      "name":"ListTestGridSessionActions",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"ListTestGridSessionActionsRequest"},
+      "output":{"shape":"ListTestGridSessionActionsResult"},
+      "errors":[
+        {"shape":"NotFoundException"},
+        {"shape":"ArgumentException"},
+        {"shape":"InternalServiceException"}
+      ],
+      "documentation":"<p>Returns a list of the actions taken in a <a>TestGridSession</a>.</p>"
+    },
+    "ListTestGridSessionArtifacts":{
+      "name":"ListTestGridSessionArtifacts",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"ListTestGridSessionArtifactsRequest"},
+      "output":{"shape":"ListTestGridSessionArtifactsResult"},
+      "errors":[
+        {"shape":"NotFoundException"},
+        {"shape":"ArgumentException"},
+        {"shape":"InternalServiceException"}
+      ],
+      "documentation":"<p>Retrieves a list of artifacts created during the session.</p>"
+    },
+    "ListTestGridSessions":{
+      "name":"ListTestGridSessions",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"ListTestGridSessionsRequest"},
+      "output":{"shape":"ListTestGridSessionsResult"},
+      "errors":[
+        {"shape":"NotFoundException"},
+        {"shape":"ArgumentException"},
+        {"shape":"InternalServiceException"}
+      ],
+      "documentation":"<p>Retrieves a list of sessions for a <a>TestGridProject</a>.</p>"
+    },
     "ListTests":{
       "name":"ListTests",
       "http":{
@@ -811,7 +945,7 @@
         {"shape":"LimitExceededException"},
         {"shape":"ServiceAccountException"}
       ],
-      "documentation":"<p>Gets information about unique problems.</p>"
+      "documentation":"<p>Gets information about unique problems, such as exceptions or crashes.</p> <p>Unique problems are defined as a single instance of an error across a run, job, or suite. For example, if a call in your application consistently raises an exception (<code>OutOfBoundsException in MyActivity.java:386</code>), <code>ListUniqueProblems</code> returns a single entry instead of many individual entries for that exception.</p>"
     },
     "ListUploads":{
       "name":"ListUploads",
@@ -858,7 +992,7 @@
         {"shape":"LimitExceededException"},
         {"shape":"ServiceAccountException"}
       ],
-      "documentation":"<p>Immediately purchases offerings for an AWS account. Offerings renew with the latest total purchased quantity for an offering, unless the renewal was overridden. The API returns a <code>NotEligible</code> error if the user is not permitted to invoke the operation. Please contact <a href=\"mailto:aws-devicefarm-support@amazon.com\">aws-devicefarm-support@amazon.com</a> if you believe that you should be able to invoke this operation.</p>"
+      "documentation":"<p>Immediately purchases offerings for an AWS account. Offerings renew with the latest total purchased quantity for an offering, unless the renewal was overridden. The API returns a <code>NotEligible</code> error if the user is not permitted to invoke the operation. If you must be able to invoke this operation, contact <a href=\"mailto:aws-devicefarm-support@amazon.com\">aws-devicefarm-support@amazon.com</a>.</p>"
     },
     "RenewOffering":{
       "name":"RenewOffering",
@@ -875,7 +1009,7 @@
         {"shape":"LimitExceededException"},
         {"shape":"ServiceAccountException"}
       ],
-      "documentation":"<p>Explicitly sets the quantity of devices to renew for an offering, starting from the <code>effectiveDate</code> of the next period. The API returns a <code>NotEligible</code> error if the user is not permitted to invoke the operation. Please contact <a href=\"mailto:aws-devicefarm-support@amazon.com\">aws-devicefarm-support@amazon.com</a> if you believe that you should be able to invoke this operation.</p>"
+      "documentation":"<p>Explicitly sets the quantity of devices to renew for an offering, starting from the <code>effectiveDate</code> of the next period. The API returns a <code>NotEligible</code> error if the user is not permitted to invoke the operation. If you must be able to invoke this operation, contact <a href=\"mailto:aws-devicefarm-support@amazon.com\">aws-devicefarm-support@amazon.com</a>.</p>"
     },
     "ScheduleRun":{
       "name":"ScheduleRun",
@@ -908,7 +1042,7 @@
         {"shape":"LimitExceededException"},
         {"shape":"ServiceAccountException"}
       ],
-      "documentation":"<p>Initiates a stop request for the current job. AWS Device Farm will immediately stop the job on the device where tests have not started executing, and you will not be billed for this device. On the device where tests have started executing, Setup Suite and Teardown Suite tests will run to completion before stopping execution on the device. You will be billed for Setup, Teardown, and any tests that were in progress or already completed.</p>"
+      "documentation":"<p>Initiates a stop request for the current job. AWS Device Farm immediately stops the job on the device where tests have not started. You are not billed for this device. On the device where tests have started, setup suite and teardown suite tests run to completion on the device. You are billed for setup, teardown, and any tests that were in progress or already completed.</p>"
     },
     "StopRemoteAccessSession":{
       "name":"StopRemoteAccessSession",
@@ -940,7 +1074,7 @@
         {"shape":"LimitExceededException"},
         {"shape":"ServiceAccountException"}
       ],
-      "documentation":"<p>Initiates a stop request for the current test run. AWS Device Farm will immediately stop the run on devices where tests have not started executing, and you will not be billed for these devices. On devices where tests have started executing, Setup Suite and Teardown Suite tests will run to completion before stopping execution on those devices. You will be billed for Setup, Teardown, and any tests that were in progress or already completed.</p>"
+      "documentation":"<p>Initiates a stop request for the current test run. AWS Device Farm immediately stops the run on devices where tests have not started. You are not billed for these devices. On devices where tests have started executing, setup suite and teardown suite tests run to completion on those devices. You are billed for setup, teardown, and any tests that were in progress or already completed.</p>"
     },
     "TagResource":{
       "name":"TagResource",
@@ -951,12 +1085,13 @@
       "input":{"shape":"TagResourceRequest"},
       "output":{"shape":"TagResourceResponse"},
       "errors":[
+        {"shape":"ArgumentException"},
         {"shape":"NotFoundException"},
         {"shape":"TagOperationException"},
         {"shape":"TooManyTagsException"},
         {"shape":"TagPolicyException"}
       ],
-      "documentation":"<p>Associates the specified tags to a resource with the specified <code>resourceArn</code>. If existing tags on a resource are not specified in the request parameters, they are not changed. When a resource is deleted, the tags associated with that resource are deleted as well.</p>"
+      "documentation":"<p>Associates the specified tags to a resource with the specified <code>resourceArn</code>. If existing tags on a resource are not specified in the request parameters, they are not changed. When a resource is deleted, the tags associated with that resource are also deleted.</p>"
     },
     "UntagResource":{
       "name":"UntagResource",
@@ -967,6 +1102,7 @@
       "input":{"shape":"UntagResourceRequest"},
       "output":{"shape":"UntagResourceResponse"},
       "errors":[
+        {"shape":"ArgumentException"},
         {"shape":"NotFoundException"},
         {"shape":"TagOperationException"}
       ],
@@ -986,7 +1122,7 @@
         {"shape":"LimitExceededException"},
         {"shape":"ServiceAccountException"}
       ],
-      "documentation":"<p>Updates information about an existing private device instance.</p>"
+      "documentation":"<p>Updates information about a private device instance.</p>"
     },
     "UpdateDevicePool":{
       "name":"UpdateDevicePool",
@@ -1034,7 +1170,7 @@
         {"shape":"LimitExceededException"},
         {"shape":"ServiceAccountException"}
       ],
-      "documentation":"<p>Updates the network profile with specific settings.</p>"
+      "documentation":"<p>Updates the network profile.</p>"
     },
     "UpdateProject":{
       "name":"UpdateProject",
@@ -1052,6 +1188,21 @@
       ],
       "documentation":"<p>Modifies the specified project name, given the project ARN and a new name.</p>"
     },
+    "UpdateTestGridProject":{
+      "name":"UpdateTestGridProject",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"UpdateTestGridProjectRequest"},
+      "output":{"shape":"UpdateTestGridProjectResult"},
+      "errors":[
+        {"shape":"NotFoundException"},
+        {"shape":"ArgumentException"},
+        {"shape":"InternalServiceException"}
+      ],
+      "documentation":"<p>Change details of a project.</p>"
+    },
     "UpdateUpload":{
       "name":"UpdateUpload",
       "http":{
@@ -1066,7 +1217,7 @@
         {"shape":"LimitExceededException"},
         {"shape":"ServiceAccountException"}
       ],
-      "documentation":"<p>Update an uploaded test specification (test spec).</p>"
+      "documentation":"<p>Updates an uploaded test spec.</p>"
     },
     "UpdateVPCEConfiguration":{
       "name":"UpdateVPCEConfiguration",
@@ -1082,7 +1233,7 @@
         {"shape":"ServiceAccountException"},
         {"shape":"InvalidOperationException"}
       ],
-      "documentation":"<p>Updates information about an existing Amazon Virtual Private Cloud (VPC) endpoint configuration.</p>"
+      "documentation":"<p>Updates information about an Amazon Virtual Private Cloud (VPC) endpoint configuration.</p>"
     }
   },
   "shapes":{
@@ -1108,7 +1259,7 @@
         },
         "maxJobTimeoutMinutes":{
           "shape":"JobTimeoutMinutes",
-          "documentation":"<p>The maximum number of minutes a test run will execute before it times out.</p>"
+          "documentation":"<p>The maximum number of minutes a test run executes before it times out.</p>"
         },
         "trialMinutes":{
           "shape":"TrialMinutes",
@@ -1120,20 +1271,21 @@
         },
         "defaultJobTimeoutMinutes":{
           "shape":"JobTimeoutMinutes",
-          "documentation":"<p>The default number of minutes (at the account level) a test run will execute before it times out. The default value is 150 minutes.</p>"
+          "documentation":"<p>The default number of minutes (at the account level) a test run executes before it times out. The default value is 150 minutes.</p>"
         },
         "skipAppResign":{
           "shape":"SkipAppResign",
-          "documentation":"<p>When set to <code>true</code>, for private devices, Device Farm will not sign your app again. For public devices, Device Farm always signs your apps again and this parameter has no effect.</p> <p>For more information about how Device Farm re-signs your app(s), see <a href=\"https://aws.amazon.com/device-farm/faq/\">Do you modify my app?</a> in the <i>AWS Device Farm FAQs</i>.</p>"
+          "documentation":"<p>When set to <code>true</code>, for private devices, Device Farm does not sign your app again. For public devices, Device Farm always signs your apps again.</p> <p>For more information about how Device Farm re-signs your apps, see <a href=\"https://aws.amazon.com/device-farm/faq/\">Do you modify my app?</a> in the <i>AWS Device Farm FAQs</i>.</p>"
         }
       },
-      "documentation":"<p>A container for account-level settings within AWS Device Farm.</p>"
+      "documentation":"<p>A container for account-level settings in AWS Device Farm.</p>"
     },
     "AccountsCleanup":{"type":"boolean"},
     "AmazonResourceName":{
       "type":"string",
       "max":1011,
-      "min":32
+      "min":32,
+      "pattern":"^arn:.+"
     },
     "AmazonResourceNames":{
       "type":"list",
@@ -1168,7 +1320,7 @@
         },
         "type":{
           "shape":"ArtifactType",
-          "documentation":"<p>The artifact's type.</p> <p>Allowed values include the following:</p> <ul> <li> <p>UNKNOWN: An unknown type.</p> </li> <li> <p>SCREENSHOT: The screenshot type.</p> </li> <li> <p>DEVICE_LOG: The device log type.</p> </li> <li> <p>MESSAGE_LOG: The message log type.</p> </li> <li> <p>VIDEO_LOG: The video log type.</p> </li> <li> <p>RESULT_LOG: The result log type.</p> </li> <li> <p>SERVICE_LOG: The service log type.</p> </li> <li> <p>WEBKIT_LOG: The web kit log type.</p> </li> <li> <p>INSTRUMENTATION_OUTPUT: The instrumentation type.</p> </li> <li> <p>EXERCISER_MONKEY_OUTPUT: For Android, the artifact (log) generated by an Android fuzz test.</p> </li> <li> <p>CALABASH_JSON_OUTPUT: The Calabash JSON output type.</p> </li> <li> <p>CALABASH_PRETTY_OUTPUT: The Calabash pretty output type.</p> </li> <li> <p>CALABASH_STANDARD_OUTPUT: The Calabash standard output type.</p> </li> <li> <p>CALABASH_JAVA_XML_OUTPUT: The Calabash Java XML output type.</p> </li> <li> <p>AUTOMATION_OUTPUT: The automation output type.</p> </li> <li> <p>APPIUM_SERVER_OUTPUT: The Appium server output type.</p> </li> <li> <p>APPIUM_JAVA_OUTPUT: The Appium Java output type.</p> </li> <li> <p>APPIUM_JAVA_XML_OUTPUT: The Appium Java XML output type.</p> </li> <li> <p>APPIUM_PYTHON_OUTPUT: The Appium Python output type.</p> </li> <li> <p>APPIUM_PYTHON_XML_OUTPUT: The Appium Python XML output type.</p> </li> <li> <p>EXPLORER_EVENT_LOG: The Explorer event log output type.</p> </li> <li> <p>EXPLORER_SUMMARY_LOG: The Explorer summary log output type.</p> </li> <li> <p>APPLICATION_CRASH_REPORT: The application crash report output type.</p> </li> <li> <p>XCTEST_LOG: The Xcode test output type.</p> </li> <li> <p>VIDEO: The Video output type.</p> </li> <li> <p>CUSTOMER_ARTIFACT:The Customer Artifact output type.</p> </li> <li> <p>CUSTOMER_ARTIFACT_LOG: The Customer Artifact Log output type.</p> </li> <li> <p>TESTSPEC_OUTPUT: The Test Spec Output type.</p> </li> </ul>"
+          "documentation":"<p>The artifact's type.</p> <p>Allowed values include the following:</p> <ul> <li> <p>UNKNOWN</p> </li> <li> <p>SCREENSHOT</p> </li> <li> <p>DEVICE_LOG</p> </li> <li> <p>MESSAGE_LOG</p> </li> <li> <p>VIDEO_LOG</p> </li> <li> <p>RESULT_LOG</p> </li> <li> <p>SERVICE_LOG</p> </li> <li> <p>WEBKIT_LOG</p> </li> <li> <p>INSTRUMENTATION_OUTPUT</p> </li> <li> <p>EXERCISER_MONKEY_OUTPUT: the artifact (log) generated by an Android fuzz test.</p> </li> <li> <p>CALABASH_JSON_OUTPUT</p> </li> <li> <p>CALABASH_PRETTY_OUTPUT</p> </li> <li> <p>CALABASH_STANDARD_OUTPUT</p> </li> <li> <p>CALABASH_JAVA_XML_OUTPUT</p> </li> <li> <p>AUTOMATION_OUTPUT</p> </li> <li> <p>APPIUM_SERVER_OUTPUT</p> </li> <li> <p>APPIUM_JAVA_OUTPUT</p> </li> <li> <p>APPIUM_JAVA_XML_OUTPUT</p> </li> <li> <p>APPIUM_PYTHON_OUTPUT</p> </li> <li> <p>APPIUM_PYTHON_XML_OUTPUT</p> </li> <li> <p>EXPLORER_EVENT_LOG</p> </li> <li> <p>EXPLORER_SUMMARY_LOG</p> </li> <li> <p>APPLICATION_CRASH_REPORT</p> </li> <li> <p>XCTEST_LOG</p> </li> <li> <p>VIDEO</p> </li> <li> <p>CUSTOMER_ARTIFACT</p> </li> <li> <p>CUSTOMER_ARTIFACT_LOG</p> </li> <li> <p>TESTSPEC_OUTPUT</p> </li> </ul>"
         },
         "extension":{
           "shape":"String",
@@ -1176,7 +1328,7 @@
         },
         "url":{
           "shape":"URL",
-          "documentation":"<p>The pre-signed Amazon S3 URL that can be used with a corresponding GET request to download the artifact's file.</p>"
+          "documentation":"<p>The presigned Amazon S3 URL that can be used with a GET request to download the artifact's file.</p>"
         }
       },
       "documentation":"<p>Represents the output of a test. Examples of artifacts include logs and screenshots.</p>"
@@ -1243,14 +1395,22 @@
         },
         "architecture":{
           "shape":"String",
-          "documentation":"<p>The CPU's architecture, for example x86 or ARM.</p>"
+          "documentation":"<p>The CPU's architecture (for example, x86 or ARM).</p>"
         },
         "clock":{
           "shape":"Double",
           "documentation":"<p>The clock speed of the device's CPU, expressed in hertz (Hz). For example, a 1.2 GHz CPU is expressed as 1200000000.</p>"
         }
       },
-      "documentation":"<p>Represents the amount of CPU that an app is using on a physical device.</p> <p>Note that this does not represent system-wide CPU usage.</p>"
+      "documentation":"<p>Represents the amount of CPU that an app is using on a physical device. Does not represent system-wide CPU usage.</p>"
+    },
+    "CannotDeleteException":{
+      "type":"structure",
+      "members":{
+        "message":{"shape":"Message"}
+      },
+      "documentation":"<p>The requested object could not be deleted.</p>",
+      "exception":true
     },
     "ClientId":{
       "type":"string",
@@ -1322,7 +1482,7 @@
         },
         "maxDevices":{
           "shape":"Integer",
-          "documentation":"<p>The number of devices that Device Farm can add to your device pool. Device Farm adds devices that are available and that meet the criteria that you assign for the <code>rules</code> parameter. Depending on how many devices meet these constraints, your device pool might contain fewer devices than the value for this parameter.</p> <p>By specifying the maximum number of devices, you can control the costs that you incur by running tests.</p>"
+          "documentation":"<p>The number of devices that Device Farm can add to your device pool. Device Farm adds devices that are available and meet the criteria that you assign for the <code>rules</code> parameter. Depending on how many devices meet these constraints, your device pool might contain fewer devices than the value for this parameter.</p> <p>By specifying the maximum number of devices, you can control the costs that you incur by running tests.</p>"
         }
       },
       "documentation":"<p>Represents a request to the create device pool operation.</p>"
@@ -1351,15 +1511,15 @@
         },
         "packageCleanup":{
           "shape":"Boolean",
-          "documentation":"<p>When set to <code>true</code>, Device Farm will remove app packages after a test run. The default value is <code>false</code> for private devices.</p>"
+          "documentation":"<p>When set to <code>true</code>, Device Farm removes app packages after a test run. The default value is <code>false</code> for private devices.</p>"
         },
         "excludeAppPackagesFromCleanup":{
           "shape":"PackageIds",
-          "documentation":"<p>An array of strings specifying the list of app packages that should not be cleaned up from the device after a test run is over.</p> <p>The list of packages is only considered if you set <code>packageCleanup</code> to <code>true</code>.</p>"
+          "documentation":"<p>An array of strings that specifies the list of app packages that should not be cleaned up from the device after a test run.</p> <p>The list of packages is considered only if you set <code>packageCleanup</code> to <code>true</code>.</p>"
         },
         "rebootAfterUse":{
           "shape":"Boolean",
-          "documentation":"<p>When set to <code>true</code>, Device Farm will reboot the instance after a test run. The default value is <code>true</code>.</p>"
+          "documentation":"<p>When set to <code>true</code>, Device Farm reboots the instance after a test run. The default value is <code>true</code>.</p>"
         }
       }
     },
@@ -1368,7 +1528,7 @@
       "members":{
         "instanceProfile":{
           "shape":"InstanceProfile",
-          "documentation":"<p>An object containing information about your instance profile.</p>"
+          "documentation":"<p>An object that contains information about your instance profile.</p>"
         }
       }
     },
@@ -1385,7 +1545,7 @@
         },
         "name":{
           "shape":"Name",
-          "documentation":"<p>The name you wish to specify for the new network profile.</p>"
+          "documentation":"<p>The name for the new network profile.</p>"
         },
         "description":{
           "shape":"Message",
@@ -1393,7 +1553,7 @@
         },
         "type":{
           "shape":"NetworkProfileType",
-          "documentation":"<p>The type of network profile you wish to create. Valid values are listed below.</p>"
+          "documentation":"<p>The type of network profile to create. Valid values are listed here.</p>"
         },
         "uplinkBandwidthBits":{
           "shape":"Long",
@@ -1448,7 +1608,7 @@
         },
         "defaultJobTimeoutMinutes":{
           "shape":"JobTimeoutMinutes",
-          "documentation":"<p>Sets the execution timeout value (in minutes) for a project. All test runs in this project will use the specified execution timeout value unless overridden when scheduling a run.</p>"
+          "documentation":"<p>Sets the execution timeout value (in minutes) for a project. All test runs in this project use the specified execution timeout value unless overridden when scheduling a run.</p>"
         }
       },
       "documentation":"<p>Represents a request to the create project operation.</p>"
@@ -1472,7 +1632,7 @@
         },
         "vpceConfigurationArns":{
           "shape":"AmazonResourceNames",
-          "documentation":"<p>An array of Amazon Resource Names (ARNs) included in the VPC endpoint configuration.</p>"
+          "documentation":"<p>An array of ARNs included in the VPC endpoint configuration.</p>"
         }
       },
       "documentation":"<p>Configuration settings for a remote access session, including billing method.</p>"
@@ -1490,7 +1650,7 @@
         },
         "deviceArn":{
           "shape":"AmazonResourceName",
-          "documentation":"<p>The Amazon Resource Name (ARN) of the device for which you want to create a remote access session.</p>"
+          "documentation":"<p>The ARN of the device for which you want to create a remote access session.</p>"
         },
         "instanceArn":{
           "shape":"AmazonResourceName",
@@ -1498,11 +1658,11 @@
         },
         "sshPublicKey":{
           "shape":"SshPublicKey",
-          "documentation":"<p> <i>Ignored.</i> The public key of the <code>ssh</code> key pair you want to use for connecting to remote devices in your remote debugging session. This is only required if <code>remoteDebugEnabled</code> is set to <code>true</code>.</p> <p> <i>Remote debugging is <a href=\"https://docs.aws.amazon.com/devicefarm/latest/developerguide/history.html\">no longer supported</a>.</i> </p>"
+          "documentation":"<p>Ignored. The public key of the <code>ssh</code> key pair you want to use for connecting to remote devices in your remote debugging session. This key is required only if <code>remoteDebugEnabled</code> is set to <code>true</code>.</p> <p>Remote debugging is <a href=\"https://docs.aws.amazon.com/devicefarm/latest/developerguide/history.html\">no longer supported</a>.</p>"
         },
         "remoteDebugEnabled":{
           "shape":"Boolean",
-          "documentation":"<p>Set to <code>true</code> if you want to access devices remotely for debugging in your remote access session.</p> <p> <i>Remote debugging is <a href=\"https://docs.aws.amazon.com/devicefarm/latest/developerguide/history.html\">no longer supported</a>.</i> </p>"
+          "documentation":"<p>Set to <code>true</code> if you want to access devices remotely for debugging in your remote access session.</p> <p>Remote debugging is <a href=\"https://docs.aws.amazon.com/devicefarm/latest/developerguide/history.html\">no longer supported</a>.</p>"
         },
         "remoteRecordEnabled":{
           "shape":"Boolean",
@@ -1514,11 +1674,11 @@
         },
         "name":{
           "shape":"Name",
-          "documentation":"<p>The name of the remote access session that you wish to create.</p>"
+          "documentation":"<p>The name of the remote access session to create.</p>"
         },
         "clientId":{
           "shape":"ClientId",
-          "documentation":"<p>Unique identifier for the client. If you want access to multiple devices on the same client, you should pass the same <code>clientId</code> value in each call to <code>CreateRemoteAccessSession</code>. This is required only if <code>remoteDebugEnabled</code> is set to <code>true</code>.</p> <p> <i>Remote debugging is <a href=\"https://docs.aws.amazon.com/devicefarm/latest/developerguide/history.html\">no longer supported</a>.</i> </p>"
+          "documentation":"<p>Unique identifier for the client. If you want access to multiple devices on the same client, you should pass the same <code>clientId</code> value in each call to <code>CreateRemoteAccessSession</code>. This identifier is required only if <code>remoteDebugEnabled</code> is set to <code>true</code>.</p> <p>Remote debugging is <a href=\"https://docs.aws.amazon.com/devicefarm/latest/developerguide/history.html\">no longer supported</a>.</p>"
         },
         "configuration":{
           "shape":"CreateRemoteAccessSessionConfiguration",
@@ -1526,11 +1686,11 @@
         },
         "interactionMode":{
           "shape":"InteractionMode",
-          "documentation":"<p>The interaction mode of the remote access session. Valid values are:</p> <ul> <li> <p>INTERACTIVE: You can interact with the iOS device by viewing, touching, and rotating the screen. You <b>cannot</b> run XCUITest framework-based tests in this mode.</p> </li> <li> <p>NO_VIDEO: You are connected to the device but cannot interact with it or view the screen. This mode has the fastest test execution speed. You <b>can</b> run XCUITest framework-based tests in this mode.</p> </li> <li> <p>VIDEO_ONLY: You can view the screen but cannot touch or rotate it. You <b>can</b> run XCUITest framework-based tests and watch the screen in this mode.</p> </li> </ul>"
+          "documentation":"<p>The interaction mode of the remote access session. Valid values are:</p> <ul> <li> <p>INTERACTIVE: You can interact with the iOS device by viewing, touching, and rotating the screen. You cannot run XCUITest framework-based tests in this mode.</p> </li> <li> <p>NO_VIDEO: You are connected to the device, but cannot interact with it or view the screen. This mode has the fastest test execution speed. You can run XCUITest framework-based tests in this mode.</p> </li> <li> <p>VIDEO_ONLY: You can view the screen, but cannot touch or rotate it. You can run XCUITest framework-based tests and watch the screen in this mode.</p> </li> </ul>"
         },
         "skipAppResign":{
           "shape":"Boolean",
-          "documentation":"<p>When set to <code>true</code>, for private devices, Device Farm will not sign your app again. For public devices, Device Farm always signs your apps again and this parameter has no effect.</p> <p>For more information about how Device Farm re-signs your app(s), see <a href=\"https://aws.amazon.com/device-farm/faq/\">Do you modify my app?</a> in the <i>AWS Device Farm FAQs</i>.</p>"
+          "documentation":"<p>When set to <code>true</code>, for private devices, Device Farm does not sign your app again. For public devices, Device Farm always signs your apps again.</p> <p>For more information on how Device Farm modifies your uploads during tests, see <a href=\"https://aws.amazon.com/device-farm/faq/\">Do you modify my app?</a> </p>"
         }
       },
       "documentation":"<p>Creates and submits a request to start a remote access session.</p>"
@@ -1545,6 +1705,59 @@
       },
       "documentation":"<p>Represents the server response from a request to create a remote access session.</p>"
     },
+    "CreateTestGridProjectRequest":{
+      "type":"structure",
+      "required":["name"],
+      "members":{
+        "name":{
+          "shape":"ResourceName",
+          "documentation":"<p>Human-readable name of the Selenium testing project.</p>"
+        },
+        "description":{
+          "shape":"ResourceDescription",
+          "documentation":"<p>Human-readable description of the project.</p>"
+        }
+      }
+    },
+    "CreateTestGridProjectResult":{
+      "type":"structure",
+      "members":{
+        "testGridProject":{
+          "shape":"TestGridProject",
+          "documentation":"<p>ARN of the Selenium testing project that was created.</p>"
+        }
+      }
+    },
+    "CreateTestGridUrlRequest":{
+      "type":"structure",
+      "required":[
+        "projectArn",
+        "expiresInSeconds"
+      ],
+      "members":{
+        "projectArn":{
+          "shape":"DeviceFarmArn",
+          "documentation":"<p>ARN (from <a>CreateTestGridProject</a> or <a>ListTestGridProjects</a>) to associate with the short-term URL. </p>"
+        },
+        "expiresInSeconds":{
+          "shape":"TestGridUrlExpiresInSecondsInput",
+          "documentation":"<p>Lifetime, in seconds, of the URL.</p>"
+        }
+      }
+    },
+    "CreateTestGridUrlResult":{
+      "type":"structure",
+      "members":{
+        "url":{
+          "shape":"String",
+          "documentation":"<p>A signed URL, expiring in <a>CreateTestGridUrlRequest$expiresInSeconds</a> seconds, to be passed to a <code>RemoteWebDriver</code>. </p>"
+        },
+        "expires":{
+          "shape":"DateTime",
+          "documentation":"<p>The number of seconds the URL from <a>CreateTestGridUrlResult$url</a> stays active.</p>"
+        }
+      }
+    },
     "CreateUploadRequest":{
       "type":"structure",
       "required":[
@@ -1559,15 +1772,15 @@
         },
         "name":{
           "shape":"Name",
-          "documentation":"<p>The upload's file name. The name should not contain the '/' character. If uploading an iOS app, the file name needs to end with the <code>.ipa</code> extension. If uploading an Android app, the file name needs to end with the <code>.apk</code> extension. For all others, the file name must end with the <code>.zip</code> file extension.</p>"
+          "documentation":"<p>The upload's file name. The name should not contain any forward slashes (<code>/</code>). If you are uploading an iOS app, the file name must end with the <code>.ipa</code> extension. If you are uploading an Android app, the file name must end with the <code>.apk</code> extension. For all others, the file name must end with the <code>.zip</code> file extension.</p>"
         },
         "type":{
           "shape":"UploadType",
-          "documentation":"<p>The upload's upload type.</p> <p>Must be one of the following values:</p> <ul> <li> <p>ANDROID_APP: An Android upload.</p> </li> <li> <p>IOS_APP: An iOS upload.</p> </li> <li> <p>WEB_APP: A web application upload.</p> </li> <li> <p>EXTERNAL_DATA: An external data upload.</p> </li> <li> <p>APPIUM_JAVA_JUNIT_TEST_PACKAGE: An Appium Java JUnit test package upload.</p> </li> <li> <p>APPIUM_JAVA_TESTNG_TEST_PACKAGE: An Appium Java TestNG test package upload.</p> </li> <li> <p>APPIUM_PYTHON_TEST_PACKAGE: An Appium Python test package upload.</p> </li> <li> <p>APPIUM_NODE_TEST_PACKAGE: An Appium Node.js test package upload.</p> </li> <li> <p>APPIUM_RUBY_TEST_PACKAGE: An Appium Ruby test package upload.</p> </li> <li> <p>APPIUM_WEB_JAVA_JUNIT_TEST_PACKAGE: An Appium Java JUnit test package upload for a web app.</p> </li> <li> <p>APPIUM_WEB_JAVA_TESTNG_TEST_PACKAGE: An Appium Java TestNG test package upload for a web app.</p> </li> <li> <p>APPIUM_WEB_PYTHON_TEST_PACKAGE: An Appium Python test package upload for a web app.</p> </li> <li> <p>APPIUM_WEB_NODE_TEST_PACKAGE: An Appium Node.js test package upload for a web app.</p> </li> <li> <p>APPIUM_WEB_RUBY_TEST_PACKAGE: An Appium Ruby test package upload for a web app.</p> </li> <li> <p>CALABASH_TEST_PACKAGE: A Calabash test package upload.</p> </li> <li> <p>INSTRUMENTATION_TEST_PACKAGE: An instrumentation upload.</p> </li> <li> <p>UIAUTOMATION_TEST_PACKAGE: A uiautomation test package upload.</p> </li> <li> <p>UIAUTOMATOR_TEST_PACKAGE: A uiautomator test package upload.</p> </li> <li> <p>XCTEST_TEST_PACKAGE: An Xcode test package upload.</p> </li> <li> <p>XCTEST_UI_TEST_PACKAGE: An Xcode UI test package upload.</p> </li> <li> <p>APPIUM_JAVA_JUNIT_TEST_SPEC: An Appium Java JUnit test spec upload.</p> </li> <li> <p>APPIUM_JAVA_TESTNG_TEST_SPEC: An Appium Java TestNG test spec upload.</p> </li> <li> <p>APPIUM_PYTHON_TEST_SPEC: An Appium Python test spec upload.</p> </li> <li> <p>APPIUM_NODE_TEST_SPEC: An Appium Node.js test spec upload.</p> </li> <li> <p>APPIUM_RUBY_TEST_SPEC: An Appium Ruby test spec upload.</p> </li> <li> <p>APPIUM_WEB_JAVA_JUNIT_TEST_SPEC: An Appium Java JUnit test spec upload for a web app.</p> </li> <li> <p>APPIUM_WEB_JAVA_TESTNG_TEST_SPEC: An Appium Java TestNG test spec upload for a web app.</p> </li> <li> <p>APPIUM_WEB_PYTHON_TEST_SPEC: An Appium Python test spec upload for a web app.</p> </li> <li> <p>APPIUM_WEB_NODE_TEST_SPEC: An Appium Node.js test spec upload for a web app.</p> </li> <li> <p>APPIUM_WEB_RUBY_TEST_SPEC: An Appium Ruby test spec upload for a web app.</p> </li> <li> <p>INSTRUMENTATION_TEST_SPEC: An instrumentation test spec upload.</p> </li> <li> <p>XCTEST_UI_TEST_SPEC: An Xcode UI test spec upload.</p> </li> </ul> <p> <b>Note</b> If you call <code>CreateUpload</code> with <code>WEB_APP</code> specified, AWS Device Farm throws an <code>ArgumentException</code> error.</p>"
+          "documentation":"<p>The upload's upload type.</p> <p>Must be one of the following values:</p> <ul> <li> <p>ANDROID_APP</p> </li> <li> <p>IOS_APP</p> </li> <li> <p>WEB_APP</p> </li> <li> <p>EXTERNAL_DATA</p> </li> <li> <p>APPIUM_JAVA_JUNIT_TEST_PACKAGE</p> </li> <li> <p>APPIUM_JAVA_TESTNG_TEST_PACKAGE</p> </li> <li> <p>APPIUM_PYTHON_TEST_PACKAGE</p> </li> <li> <p>APPIUM_NODE_TEST_PACKAGE</p> </li> <li> <p>APPIUM_RUBY_TEST_PACKAGE</p> </li> <li> <p>APPIUM_WEB_JAVA_JUNIT_TEST_PACKAGE</p> </li> <li> <p>APPIUM_WEB_JAVA_TESTNG_TEST_PACKAGE</p> </li> <li> <p>APPIUM_WEB_PYTHON_TEST_PACKAGE</p> </li> <li> <p>APPIUM_WEB_NODE_TEST_PACKAGE</p> </li> <li> <p>APPIUM_WEB_RUBY_TEST_PACKAGE</p> </li> <li> <p>CALABASH_TEST_PACKAGE</p> </li> <li> <p>INSTRUMENTATION_TEST_PACKAGE</p> </li> <li> <p>UIAUTOMATION_TEST_PACKAGE</p> </li> <li> <p>UIAUTOMATOR_TEST_PACKAGE</p> </li> <li> <p>XCTEST_TEST_PACKAGE</p> </li> <li> <p>XCTEST_UI_TEST_PACKAGE</p> </li> <li> <p>APPIUM_JAVA_JUNIT_TEST_SPEC</p> </li> <li> <p>APPIUM_JAVA_TESTNG_TEST_SPEC</p> </li> <li> <p>APPIUM_PYTHON_TEST_SPEC</p> </li> <li> <p>APPIUM_NODE_TEST_SPEC</p> </li> <li> <p>APPIUM_RUBY_TEST_SPEC</p> </li> <li> <p>APPIUM_WEB_JAVA_JUNIT_TEST_SPEC</p> </li> <li> <p>APPIUM_WEB_JAVA_TESTNG_TEST_SPEC</p> </li> <li> <p>APPIUM_WEB_PYTHON_TEST_SPEC</p> </li> <li> <p>APPIUM_WEB_NODE_TEST_SPEC</p> </li> <li> <p>APPIUM_WEB_RUBY_TEST_SPEC</p> </li> <li> <p>INSTRUMENTATION_TEST_SPEC</p> </li> <li> <p>XCTEST_UI_TEST_SPEC</p> </li> </ul> <p> If you call <code>CreateUpload</code> with <code>WEB_APP</code> specified, AWS Device Farm throws an <code>ArgumentException</code> error.</p>"
         },
         "contentType":{
           "shape":"ContentType",
-          "documentation":"<p>The upload's content type (for example, \"application/octet-stream\").</p>"
+          "documentation":"<p>The upload's content type (for example, <code>application/octet-stream</code>).</p>"
         }
       },
       "documentation":"<p>Represents a request to the create upload operation.</p>"
@@ -1596,7 +1809,7 @@
         },
         "vpceServiceName":{
           "shape":"VPCEServiceName",
-          "documentation":"<p>The name of the VPC endpoint service running inside your AWS account that you want Device Farm to test.</p>"
+          "documentation":"<p>The name of the VPC endpoint service running in your AWS account that you want Device Farm to test.</p>"
         },
         "serviceDnsName":{
           "shape":"ServiceDnsName",
@@ -1604,7 +1817,7 @@
         },
         "vpceConfigurationDescription":{
           "shape":"VPCEConfigurationDescription",
-          "documentation":"<p>An optional description, providing more details about your VPC endpoint configuration.</p>"
+          "documentation":"<p>An optional description that provides details about your VPC endpoint configuration.</p>"
         }
       }
     },
@@ -1613,7 +1826,7 @@
       "members":{
         "vpceConfiguration":{
           "shape":"VPCEConfiguration",
-          "documentation":"<p>An object containing information about your VPC endpoint configuration.</p>"
+          "documentation":"<p>An object that contains information about your VPC endpoint configuration.</p>"
         }
       }
     },
@@ -1626,18 +1839,18 @@
       "members":{
         "iosPaths":{
           "shape":"IosPaths",
-          "documentation":"<p>Comma-separated list of paths on the iOS device where the artifacts generated by the customer's tests will be pulled from.</p>"
+          "documentation":"<p>Comma-separated list of paths on the iOS device where the artifacts generated by the customer's tests are pulled from.</p>"
         },
         "androidPaths":{
           "shape":"AndroidPaths",
-          "documentation":"<p>Comma-separated list of paths on the Android device where the artifacts generated by the customer's tests will be pulled from.</p>"
+          "documentation":"<p>Comma-separated list of paths on the Android device where the artifacts generated by the customer's tests are pulled from.</p>"
         },
         "deviceHostPaths":{
           "shape":"DeviceHostPaths",
-          "documentation":"<p>Comma-separated list of paths in the test execution environment where the artifacts generated by the customer's tests will be pulled from.</p>"
+          "documentation":"<p>Comma-separated list of paths in the test execution environment where the artifacts generated by the customer's tests are pulled from.</p>"
         }
       },
-      "documentation":"<p>A JSON object specifying the paths where the artifacts generated by the customer's tests, on the device or in the test environment, will be pulled from.</p> <p>Specify <code>deviceHostPaths</code> and optionally specify either <code>iosPaths</code> or <code>androidPaths</code>.</p> <p>For web app tests, you can specify both <code>iosPaths</code> and <code>androidPaths</code>.</p>"
+      "documentation":"<p>A JSON object that specifies the paths where the artifacts generated by the customer's tests, on the device or in the test environment, are pulled from.</p> <p>Specify <code>deviceHostPaths</code> and optionally specify either <code>iosPaths</code> or <code>androidPaths</code>.</p> <p>For web app tests, you can specify both <code>iosPaths</code> and <code>androidPaths</code>.</p>"
     },
     "DateTime":{"type":"timestamp"},
     "DeleteDevicePoolRequest":{
@@ -1646,7 +1859,7 @@
       "members":{
         "arn":{
           "shape":"AmazonResourceName",
-          "documentation":"<p>Represents the Amazon Resource Name (ARN) of the Device Farm device pool you wish to delete.</p>"
+          "documentation":"<p>Represents the Amazon Resource Name (ARN) of the Device Farm device pool to delete.</p>"
         }
       },
       "documentation":"<p>Represents a request to the delete device pool operation.</p>"
@@ -1678,7 +1891,7 @@
       "members":{
         "arn":{
           "shape":"AmazonResourceName",
-          "documentation":"<p>The Amazon Resource Name (ARN) of the network profile you want to delete.</p>"
+          "documentation":"<p>The ARN of the network profile to delete.</p>"
         }
       }
     },
@@ -1693,7 +1906,7 @@
       "members":{
         "arn":{
           "shape":"AmazonResourceName",
-          "documentation":"<p>Represents the Amazon Resource Name (ARN) of the Device Farm project you wish to delete.</p>"
+          "documentation":"<p>Represents the Amazon Resource Name (ARN) of the Device Farm project to delete.</p>"
         }
       },
       "documentation":"<p>Represents a request to the delete project operation.</p>"
@@ -1727,7 +1940,7 @@
       "members":{
         "arn":{
           "shape":"AmazonResourceName",
-          "documentation":"<p>The Amazon Resource Name (ARN) for the run you wish to delete.</p>"
+          "documentation":"<p>The Amazon Resource Name (ARN) for the run to delete.</p>"
         }
       },
       "documentation":"<p>Represents a request to the delete run operation.</p>"
@@ -1738,13 +1951,28 @@
       },
       "documentation":"<p>Represents the result of a delete run request.</p>"
     },
+    "DeleteTestGridProjectRequest":{
+      "type":"structure",
+      "required":["projectArn"],
+      "members":{
+        "projectArn":{
+          "shape":"DeviceFarmArn",
+          "documentation":"<p>The ARN of the project to delete, from <a>CreateTestGridProject</a> or <a>ListTestGridProjects</a>.</p>"
+        }
+      }
+    },
+    "DeleteTestGridProjectResult":{
+      "type":"structure",
+      "members":{
+      }
+    },
     "DeleteUploadRequest":{
       "type":"structure",
       "required":["arn"],
       "members":{
         "arn":{
           "shape":"AmazonResourceName",
-          "documentation":"<p>Represents the Amazon Resource Name (ARN) of the Device Farm upload you wish to delete.</p>"
+          "documentation":"<p>Represents the Amazon Resource Name (ARN) of the Device Farm upload to delete.</p>"
         }
       },
       "documentation":"<p>Represents a request to the delete upload operation.</p>"
@@ -1795,11 +2023,11 @@
         },
         "formFactor":{
           "shape":"DeviceFormFactor",
-          "documentation":"<p>The device's form factor.</p> <p>Allowed values include:</p> <ul> <li> <p>PHONE: The phone form factor.</p> </li> <li> <p>TABLET: The tablet form factor.</p> </li> </ul>"
+          "documentation":"<p>The device's form factor.</p> <p>Allowed values include:</p> <ul> <li> <p>PHONE</p> </li> <li> <p>TABLET</p> </li> </ul>"
         },
         "platform":{
           "shape":"DevicePlatform",
-          "documentation":"<p>The device's platform.</p> <p>Allowed values include:</p> <ul> <li> <p>ANDROID: The Android platform.</p> </li> <li> <p>IOS: The iOS platform.</p> </li> </ul>"
+          "documentation":"<p>The device's platform.</p> <p>Allowed values include:</p> <ul> <li> <p>ANDROID</p> </li> <li> <p>IOS</p> </li> </ul>"
         },
         "os":{
           "shape":"String",
@@ -1839,11 +2067,11 @@
         },
         "remoteDebugEnabled":{
           "shape":"Boolean",
-          "documentation":"<p>This flag is set to <code>true</code> if remote debugging is enabled for the device.</p> <p> <i>Remote debugging is <a href=\"https://docs.aws.amazon.com/devicefarm/latest/developerguide/history.html\">no longer supported</a>.</i> </p>"
+          "documentation":"<p>This flag is set to <code>true</code> if remote debugging is enabled for the device.</p> <p>Remote debugging is <a href=\"https://docs.aws.amazon.com/devicefarm/latest/developerguide/history.html\">no longer supported</a>.</p>"
         },
         "fleetType":{
           "shape":"String",
-          "documentation":"<p>The type of fleet to which this device belongs. Possible values for fleet type are PRIVATE and PUBLIC.</p>"
+          "documentation":"<p>The type of fleet to which this device belongs. Possible values are PRIVATE and PUBLIC.</p>"
         },
         "fleetName":{
           "shape":"String",
@@ -1851,11 +2079,11 @@
         },
         "instances":{
           "shape":"DeviceInstances",
-          "documentation":"<p>The instances belonging to this device.</p>"
+          "documentation":"<p>The instances that belong to this device.</p>"
         },
         "availability":{
           "shape":"DeviceAvailability",
-          "documentation":"<p>Reflects how likely a device will be available for a test run. It is currently available in the ListDevices and GetDevice API methods.</p>"
+          "documentation":"<p>Indicates how likely a device is available for a test run. Currently available in the <a>ListDevices</a> and GetDevice API methods.</p>"
         }
       },
       "documentation":"<p>Represents a device type that an app is tested against.</p>"
@@ -1887,23 +2115,29 @@
         "HIGHLY_AVAILABLE"
       ]
     },
+    "DeviceFarmArn":{
+      "type":"string",
+      "max":1011,
+      "min":32,
+      "pattern":"^arn:aws:devicefarm:.+"
+    },
     "DeviceFilter":{
       "type":"structure",
       "members":{
         "attribute":{
           "shape":"DeviceFilterAttribute",
-          "documentation":"<p>The aspect of a device such as platform or model used as the selection criteria in a device filter.</p> <p>The supported operators for each attribute are provided in the following list.</p> <dl> <dt>ARN</dt> <dd> <p>The Amazon Resource Name (ARN) of the device. For example, \"arn:aws:devicefarm:us-west-2::device:12345Example\".</p> <p> <i>Supported operators</i>: <code>EQUALS</code>, <code>IN</code>, <code>NOT_IN</code> </p> </dd> <dt>PLATFORM</dt> <dd> <p>The device platform. Valid values are \"ANDROID\" or \"IOS\".</p> <p> <i>Supported operators</i>: <code>EQUALS</code> </p> </dd> <dt>OS_VERSION</dt> <dd> <p>The operating system version. For example, \"10.3.2\".</p> <p> <i>Supported operators</i>: <code>EQUALS</code>, <code>GREATER_THAN</code>, <code>GREATER_THAN_OR_EQUALS</code>, <code>IN</code>, <code>LESS_THAN</code>, <code>LESS_THAN_OR_EQUALS</code>, <code>NOT_IN</code> </p> </dd> <dt>MODEL</dt> <dd> <p>The device model. For example, \"iPad 5th Gen\".</p> <p> <i>Supported operators</i>: <code>CONTAINS</code>, <code>EQUALS</code>, <code>IN</code>, <code>NOT_IN</code> </p> </dd> <dt>AVAILABILITY</dt> <dd> <p>The current availability of the device. Valid values are \"AVAILABLE\", \"HIGHLY_AVAILABLE\", \"BUSY\", or \"TEMPORARY_NOT_AVAILABLE\".</p> <p> <i>Supported operators</i>: <code>EQUALS</code> </p> </dd> <dt>FORM_FACTOR</dt> <dd> <p>The device form factor. Valid values are \"PHONE\" or \"TABLET\".</p> <p> <i>Supported operators</i>: <code>EQUALS</code> </p> </dd> <dt>MANUFACTURER</dt> <dd> <p>The device manufacturer. For example, \"Apple\".</p> <p> <i>Supported operators</i>: <code>EQUALS</code>, <code>IN</code>, <code>NOT_IN</code> </p> </dd> <dt>REMOTE_ACCESS_ENABLED</dt> <dd> <p>Whether the device is enabled for remote access. Valid values are \"TRUE\" or \"FALSE\".</p> <p> <i>Supported operators</i>: <code>EQUALS</code> </p> </dd> <dt>REMOTE_DEBUG_ENABLED</dt> <dd> <p> <i>Ignored.</i>Whether the device is enabled for remote debugging. Valid values are \"TRUE\" or \"FALSE\".</p> <p> <i>Supported operators</i>: <code>EQUALS</code> </p> <p> <i>This filter will be ignored, as remote debugging is <a href=\"https://docs.aws.amazon.com/devicefarm/latest/developerguide/history.html\">no longer supported</a>.</i> </p> </dd> <dt>INSTANCE_ARN</dt> <dd> <p>The Amazon Resource Name (ARN) of the device instance.</p> <p> <i>Supported operators</i>: <code>EQUALS</code>, <code>IN</code>, <code>NOT_IN</code> </p> </dd> <dt>INSTANCE_LABELS</dt> <dd> <p>The label of the device instance.</p> <p> <i>Supported operators</i>: <code>CONTAINS</code> </p> </dd> <dt>FLEET_TYPE</dt> <dd> <p>The fleet type. Valid values are \"PUBLIC\" or \"PRIVATE\".</p> <p> <i>Supported operators</i>: <code>EQUALS</code> </p> </dd> </dl>"
+          "documentation":"<p>The aspect of a device such as platform or model used as the selection criteria in a device filter.</p> <p>The supported operators for each attribute are provided in the following list.</p> <dl> <dt>ARN</dt> <dd> <p>The Amazon Resource Name (ARN) of the device (for example, <code>arn:aws:devicefarm:us-west-2::device:12345Example</code>).</p> <p>Supported operators: <code>EQUALS</code>, <code>IN</code>, <code>NOT_IN</code> </p> </dd> <dt>PLATFORM</dt> <dd> <p>The device platform. Valid values are ANDROID or IOS.</p> <p>Supported operators: <code>EQUALS</code> </p> </dd> <dt>OS_VERSION</dt> <dd> <p>The operating system version (for example, 10.3.2).</p> <p>Supported operators: <code>EQUALS</code>, <code>GREATER_THAN</code>, <code>GREATER_THAN_OR_EQUALS</code>, <code>IN</code>, <code>LESS_THAN</code>, <code>LESS_THAN_OR_EQUALS</code>, <code>NOT_IN</code> </p> </dd> <dt>MODEL</dt> <dd> <p>The device model (for example, iPad 5th Gen).</p> <p>Supported operators: <code>CONTAINS</code>, <code>EQUALS</code>, <code>IN</code>, <code>NOT_IN</code> </p> </dd> <dt>AVAILABILITY</dt> <dd> <p>The current availability of the device. Valid values are AVAILABLE, HIGHLY_AVAILABLE, BUSY, or TEMPORARY_NOT_AVAILABLE.</p> <p>Supported operators: <code>EQUALS</code> </p> </dd> <dt>FORM_FACTOR</dt> <dd> <p>The device form factor. Valid values are PHONE or TABLET.</p> <p>Supported operators: <code>EQUALS</code> </p> </dd> <dt>MANUFACTURER</dt> <dd> <p>The device manufacturer (for example, Apple).</p> <p>Supported operators: <code>EQUALS</code>, <code>IN</code>, <code>NOT_IN</code> </p> </dd> <dt>REMOTE_ACCESS_ENABLED</dt> <dd> <p>Whether the device is enabled for remote access. Valid values are TRUE or FALSE.</p> <p>Supported operators: <code>EQUALS</code> </p> </dd> <dt>REMOTE_DEBUG_ENABLED</dt> <dd> <p>Whether the device is enabled for remote debugging. Valid values are TRUE or FALSE.</p> <p>Supported operators: <code>EQUALS</code> </p> <p>Because remote debugging is <a href=\"https://docs.aws.amazon.com/devicefarm/latest/developerguide/history.html\">no longer supported</a>, this filter is ignored.</p> </dd> <dt>INSTANCE_ARN</dt> <dd> <p>The Amazon Resource Name (ARN) of the device instance.</p> <p>Supported operators: <code>EQUALS</code>, <code>IN</code>, <code>NOT_IN</code> </p> </dd> <dt>INSTANCE_LABELS</dt> <dd> <p>The label of the device instance.</p> <p>Supported operators: <code>CONTAINS</code> </p> </dd> <dt>FLEET_TYPE</dt> <dd> <p>The fleet type. Valid values are PUBLIC or PRIVATE.</p> <p>Supported operators: <code>EQUALS</code> </p> </dd> </dl>"
         },
         "operator":{
           "shape":"RuleOperator",
-          "documentation":"<p>Specifies how Device Farm compares the filter's attribute to the value. For the operators that are supported by each attribute, see the attribute descriptions.</p>"
+          "documentation":"<p>Specifies how Device Farm compares the filter's attribute to the value. See the attribute descriptions.</p>"
         },
         "values":{
           "shape":"DeviceFilterValues",
-          "documentation":"<p>An array of one or more filter values used in a device filter.</p> <p class=\"title\"> <b>Operator Values</b> </p> <ul> <li> <p>The IN and NOT_IN operators can take a values array that has more than one element.</p> </li> <li> <p>The other operators require an array with a single element.</p> </li> </ul> <p class=\"title\"> <b>Attribute Values</b> </p> <ul> <li> <p>The PLATFORM attribute can be set to \"ANDROID\" or \"IOS\".</p> </li> <li> <p>The AVAILABILITY attribute can be set to \"AVAILABLE\", \"HIGHLY_AVAILABLE\", \"BUSY\", or \"TEMPORARY_NOT_AVAILABLE\".</p> </li> <li> <p>The FORM_FACTOR attribute can be set to \"PHONE\" or \"TABLET\".</p> </li> <li> <p>The FLEET_TYPE attribute can be set to \"PUBLIC\" or \"PRIVATE\".</p> </li> </ul>"
+          "documentation":"<p>An array of one or more filter values used in a device filter.</p> <p class=\"title\"> <b>Operator Values</b> </p> <ul> <li> <p>The IN and NOT_IN operators can take a values array that has more than one element.</p> </li> <li> <p>The other operators require an array with a single element.</p> </li> </ul> <p class=\"title\"> <b>Attribute Values</b> </p> <ul> <li> <p>The PLATFORM attribute can be set to ANDROID or IOS.</p> </li> <li> <p>The AVAILABILITY attribute can be set to AVAILABLE, HIGHLY_AVAILABLE, BUSY, or TEMPORARY_NOT_AVAILABLE.</p> </li> <li> <p>The FORM_FACTOR attribute can be set to PHONE or TABLET.</p> </li> <li> <p>The FLEET_TYPE attribute can be set to PUBLIC or PRIVATE.</p> </li> </ul>"
         }
       },
-      "documentation":"<p>Represents a device filter used to select a set of devices to be included in a test run. This data structure is passed in as the <code>deviceSelectionConfiguration</code> parameter to ScheduleRun. For an example of the JSON request syntax, see <a>ScheduleRun</a>.</p> <p>It is also passed in as the <code>filters</code> parameter to ListDevices. For an example of the JSON request syntax, see <a>ListDevices</a>.</p>"
+      "documentation":"<p>Represents a device filter used to select a set of devices to be included in a test run. This data structure is passed in as the <code>deviceSelectionConfiguration</code> parameter to <code>ScheduleRun</code>. For an example of the JSON request syntax, see <a>ScheduleRun</a>.</p> <p>It is also passed in as the <code>filters</code> parameter to <code>ListDevices</code>. For an example of the JSON request syntax, see <a>ListDevices</a>.</p>"
     },
     "DeviceFilterAttribute":{
       "type":"string",
@@ -1950,15 +2184,15 @@
         },
         "deviceArn":{
           "shape":"AmazonResourceName",
-          "documentation":"<p>The Amazon Resource Name (ARN) of the device.</p>"
+          "documentation":"<p>The ARN of the device.</p>"
         },
         "labels":{
           "shape":"InstanceLabels",
-          "documentation":"<p>An array of strings describing the device instance.</p>"
+          "documentation":"<p>An array of strings that describe the device instance.</p>"
         },
         "status":{
           "shape":"InstanceStatus",
-          "documentation":"<p>The status of the device instance. Valid values are listed below.</p>"
+          "documentation":"<p>The status of the device instance. Valid values are listed here.</p>"
         },
         "udid":{
           "shape":"String",
@@ -1966,7 +2200,7 @@
         },
         "instanceProfile":{
           "shape":"InstanceProfile",
-          "documentation":"<p>A object containing information about the instance profile.</p>"
+          "documentation":"<p>A object that contains information about the instance profile.</p>"
         }
       },
       "documentation":"<p>Represents the device instance.</p>"
@@ -2025,7 +2259,7 @@
         },
         "maxDevices":{
           "shape":"Integer",
-          "documentation":"<p>The number of devices that Device Farm can add to your device pool. Device Farm adds devices that are available and that meet the criteria that you assign for the <code>rules</code> parameter. Depending on how many devices meet these constraints, your device pool might contain fewer devices than the value for this parameter.</p> <p>By specifying the maximum number of devices, you can control the costs that you incur by running tests.</p>"
+          "documentation":"<p>The number of devices that Device Farm can add to your device pool. Device Farm adds devices that are available and meet the criteria that you assign for the <code>rules</code> parameter. Depending on how many devices meet these constraints, your device pool might contain fewer devices than the value for this parameter.</p> <p>By specifying the maximum number of devices, you can control the costs that you incur by running tests.</p>"
         }
       },
       "documentation":"<p>Represents a collection of device types.</p>"
@@ -2035,7 +2269,7 @@
       "members":{
         "device":{
           "shape":"Device",
-          "documentation":"<p>The device (phone or tablet) that you wish to return information about.</p>"
+          "documentation":"<p>The device (phone or tablet) to return information about.</p>"
         },
         "compatible":{
           "shape":"Boolean",
@@ -2072,14 +2306,14 @@
       "members":{
         "filters":{
           "shape":"DeviceFilters",
-          "documentation":"<p>Used to dynamically select a set of devices for a test run. A filter is made up of an attribute, an operator, and one or more values.</p> <ul> <li> <p> <b>Attribute</b> </p> <p>The aspect of a device such as platform or model used as the selection criteria in a device filter.</p> <p>Allowed values include:</p> <ul> <li> <p>ARN: The Amazon Resource Name (ARN) of the device. For example, \"arn:aws:devicefarm:us-west-2::device:12345Example\".</p> </li> <li> <p>PLATFORM: The device platform. Valid values are \"ANDROID\" or \"IOS\".</p> </li> <li> <p>OS_VERSION: The operating system version. For example, \"10.3.2\".</p> </li> <li> <p>MODEL: The device model. For example, \"iPad 5th Gen\".</p> </li> <li> <p>AVAILABILITY: The current availability of the device. Valid values are \"AVAILABLE\", \"HIGHLY_AVAILABLE\", \"BUSY\", or \"TEMPORARY_NOT_AVAILABLE\".</p> </li> <li> <p>FORM_FACTOR: The device form factor. Valid values are \"PHONE\" or \"TABLET\".</p> </li> <li> <p>MANUFACTURER: The device manufacturer. For example, \"Apple\".</p> </li> <li> <p>REMOTE_ACCESS_ENABLED: Whether the device is enabled for remote access. Valid values are \"TRUE\" or \"FALSE\".</p> </li> <li> <p>REMOTE_DEBUG_ENABLED: Whether the device is enabled for remote debugging. Valid values are \"TRUE\" or \"FALSE\". <i>This filter will be ignored, as remote debugging is <a href=\"https://docs.aws.amazon.com/devicefarm/latest/developerguide/history.html\">no longer supported</a>.</i> </p> </li> <li> <p>INSTANCE_ARN: The Amazon Resource Name (ARN) of the device instance.</p> </li> <li> <p>INSTANCE_LABELS: The label of the device instance.</p> </li> <li> <p>FLEET_TYPE: The fleet type. Valid values are \"PUBLIC\" or \"PRIVATE\".</p> </li> </ul> </li> <li> <p> <b>Operator</b> </p> <p>The filter operator.</p> <ul> <li> <p>The EQUALS operator is available for every attribute except INSTANCE_LABELS.</p> </li> <li> <p>The CONTAINS operator is available for the INSTANCE_LABELS and MODEL attributes.</p> </li> <li> <p>The IN and NOT_IN operators are available for the ARN, OS_VERSION, MODEL, MANUFACTURER, and INSTANCE_ARN attributes.</p> </li> <li> <p>The LESS_THAN, GREATER_THAN, LESS_THAN_OR_EQUALS, and GREATER_THAN_OR_EQUALS operators are also available for the OS_VERSION attribute.</p> </li> </ul> </li> <li> <p> <b>Values</b> </p> <p>An array of one or more filter values.</p> <p class=\"title\"> <b>Operator Values</b> </p> <ul> <li> <p>The IN and NOT_IN operators can take a values array that has more than one element.</p> </li> <li> <p>The other operators require an array with a single element.</p> </li> </ul> <p class=\"title\"> <b>Attribute Values</b> </p> <ul> <li> <p>The PLATFORM attribute can be set to \"ANDROID\" or \"IOS\".</p> </li> <li> <p>The AVAILABILITY attribute can be set to \"AVAILABLE\", \"HIGHLY_AVAILABLE\", \"BUSY\", or \"TEMPORARY_NOT_AVAILABLE\".</p> </li> <li> <p>The FORM_FACTOR attribute can be set to \"PHONE\" or \"TABLET\".</p> </li> <li> <p>The FLEET_TYPE attribute can be set to \"PUBLIC\" or \"PRIVATE\".</p> </li> </ul> </li> </ul>"
+          "documentation":"<p>Used to dynamically select a set of devices for a test run. A filter is made up of an attribute, an operator, and one or more values.</p> <ul> <li> <p> <b>Attribute</b> </p> <p>The aspect of a device such as platform or model used as the selection criteria in a device filter.</p> <p>Allowed values include:</p> <ul> <li> <p>ARN: The Amazon Resource Name (ARN) of the device (for example, <code>arn:aws:devicefarm:us-west-2::device:12345Example</code>).</p> </li> <li> <p>PLATFORM: The device platform. Valid values are ANDROID or IOS.</p> </li> <li> <p>OS_VERSION: The operating system version (for example, 10.3.2).</p> </li> <li> <p>MODEL: The device model (for example, iPad 5th Gen).</p> </li> <li> <p>AVAILABILITY: The current availability of the device. Valid values are AVAILABLE, HIGHLY_AVAILABLE, BUSY, or TEMPORARY_NOT_AVAILABLE.</p> </li> <li> <p>FORM_FACTOR: The device form factor. Valid values are PHONE or TABLET.</p> </li> <li> <p>MANUFACTURER: The device manufacturer (for example, Apple).</p> </li> <li> <p>REMOTE_ACCESS_ENABLED: Whether the device is enabled for remote access. Valid values are TRUE or FALSE.</p> </li> <li> <p>REMOTE_DEBUG_ENABLED: Whether the device is enabled for remote debugging. Valid values are TRUE or FALSE. Because remote debugging is <a href=\"https://docs.aws.amazon.com/devicefarm/latest/developerguide/history.html\">no longer supported</a>, this filter is ignored.</p> </li> <li> <p>INSTANCE_ARN: The Amazon Resource Name (ARN) of the device instance.</p> </li> <li> <p>INSTANCE_LABELS: The label of the device instance.</p> </li> <li> <p>FLEET_TYPE: The fleet type. Valid values are PUBLIC or PRIVATE.</p> </li> </ul> </li> <li> <p> <b>Operator</b> </p> <p>The filter operator.</p> <ul> <li> <p>The EQUALS operator is available for every attribute except INSTANCE_LABELS.</p> </li> <li> <p>The CONTAINS operator is available for the INSTANCE_LABELS and MODEL attributes.</p> </li> <li> <p>The IN and NOT_IN operators are available for the ARN, OS_VERSION, MODEL, MANUFACTURER, and INSTANCE_ARN attributes.</p> </li> <li> <p>The LESS_THAN, GREATER_THAN, LESS_THAN_OR_EQUALS, and GREATER_THAN_OR_EQUALS operators are also available for the OS_VERSION attribute.</p> </li> </ul> </li> <li> <p> <b>Values</b> </p> <p>An array of one or more filter values.</p> <p class=\"title\"> <b>Operator Values</b> </p> <ul> <li> <p>The IN and NOT_IN operators can take a values array that has more than one element.</p> </li> <li> <p>The other operators require an array with a single element.</p> </li> </ul> <p class=\"title\"> <b>Attribute Values</b> </p> <ul> <li> <p>The PLATFORM attribute can be set to ANDROID or IOS.</p> </li> <li> <p>The AVAILABILITY attribute can be set to AVAILABLE, HIGHLY_AVAILABLE, BUSY, or TEMPORARY_NOT_AVAILABLE.</p> </li> <li> <p>The FORM_FACTOR attribute can be set to PHONE or TABLET.</p> </li> <li> <p>The FLEET_TYPE attribute can be set to PUBLIC or PRIVATE.</p> </li> </ul> </li> </ul>"
         },
         "maxDevices":{
           "shape":"Integer",
           "documentation":"<p>The maximum number of devices to be included in a test run.</p>"
         }
       },
-      "documentation":"<p>Represents the device filters used in a test run as well as the maximum number of devices to be included in the run. It is passed in as the <code>deviceSelectionConfiguration</code> request parameter in <a>ScheduleRun</a>.</p>"
+      "documentation":"<p>Represents the device filters used in a test run and the maximum number of devices to be included in the run. It is passed in as the <code>deviceSelectionConfiguration</code> request parameter in <a>ScheduleRun</a>.</p>"
     },
     "DeviceSelectionResult":{
       "type":"structure",
@@ -2097,7 +2331,7 @@
           "documentation":"<p>The maximum number of devices to be selected by a device filter and included in a test run.</p>"
         }
       },
-      "documentation":"<p>Contains the run results requested by the device selection configuration as well as how many devices were returned. For an example of the JSON response syntax, see <a>ScheduleRun</a>.</p>"
+      "documentation":"<p>Contains the run results requested by the device selection configuration and how many devices were returned. For an example of the JSON response syntax, see <a>ScheduleRun</a>.</p>"
     },
     "Devices":{
       "type":"list",
@@ -2110,23 +2344,23 @@
       "members":{
         "jobTimeoutMinutes":{
           "shape":"JobTimeoutMinutes",
-          "documentation":"<p>The number of minutes a test run will execute before it times out.</p>"
+          "documentation":"<p>The number of minutes a test run executes before it times out.</p>"
         },
         "accountsCleanup":{
           "shape":"AccountsCleanup",
-          "documentation":"<p>True if account cleanup is enabled at the beginning of the test; otherwise, false.</p>"
+          "documentation":"<p>True if account cleanup is enabled at the beginning of the test. Otherwise, false.</p>"
         },
         "appPackagesCleanup":{
           "shape":"AppPackagesCleanup",
-          "documentation":"<p>True if app package cleanup is enabled at the beginning of the test; otherwise, false.</p>"
+          "documentation":"<p>True if app package cleanup is enabled at the beginning of the test. Otherwise, false.</p>"
         },
         "videoCapture":{
           "shape":"VideoCapture",
-          "documentation":"<p>Set to true to enable video capture; otherwise, set to false. The default is true.</p>"
+          "documentation":"<p>Set to true to enable video capture. Otherwise, set to false. The default is true.</p>"
         },
         "skipAppResign":{
           "shape":"SkipAppResign",
-          "documentation":"<p>When set to <code>true</code>, for private devices, Device Farm will not sign your app again. For public devices, Device Farm always signs your apps again and this parameter has no effect.</p> <p>For more information about how Device Farm re-signs your app(s), see <a href=\"https://aws.amazon.com/device-farm/faq/\">Do you modify my app?</a> in the <i>AWS Device Farm FAQs</i>.</p>"
+          "documentation":"<p>When set to <code>true</code>, for private devices, Device Farm does not sign your app again. For public devices, Device Farm always signs your apps again.</p> <p>For more information about how Device Farm re-signs your apps, see <a href=\"https://aws.amazon.com/device-farm/faq/\">Do you modify my app?</a> in the <i>AWS Device Farm FAQs</i>.</p>"
         }
       },
       "documentation":"<p>Represents configuration information about a test run, such as the execution timeout (in minutes).</p>"
@@ -2200,7 +2434,7 @@
       "members":{
         "deviceInstance":{
           "shape":"DeviceInstance",
-          "documentation":"<p>An object containing information about your device instance.</p>"
+          "documentation":"<p>An object that contains information about your device instance.</p>"
         }
       }
     },
@@ -2218,7 +2452,7 @@
         },
         "testType":{
           "shape":"TestType",
-          "documentation":"<p>The test type for the specified device pool.</p> <p>Allowed values include the following:</p> <ul> <li> <p>BUILTIN_FUZZ: The built-in fuzz type.</p> </li> <li> <p>BUILTIN_EXPLORER: For Android, an app explorer that will traverse an Android app, interacting with it and capturing screenshots at the same time.</p> </li> <li> <p>APPIUM_JAVA_JUNIT: The Appium Java JUnit type.</p> </li> <li> <p>APPIUM_JAVA_TESTNG: The Appium Java TestNG type.</p> </li> <li> <p>APPIUM_PYTHON: The Appium Python type.</p> </li> <li> <p>APPIUM_NODE: The Appium Node.js type.</p> </li> <li> <p>APPIUM_RUBY: The Appium Ruby type.</p> </li> <li> <p>APPIUM_WEB_JAVA_JUNIT: The Appium Java JUnit type for web apps.</p> </li> <li> <p>APPIUM_WEB_JAVA_TESTNG: The Appium Java TestNG type for web apps.</p> </li> <li> <p>APPIUM_WEB_PYTHON: The Appium Python type for web apps.</p> </li> <li> <p>APPIUM_WEB_NODE: The Appium Node.js type for web apps.</p> </li> <li> <p>APPIUM_WEB_RUBY: The Appium Ruby type for web apps.</p> </li> <li> <p>CALABASH: The Calabash type.</p> </li> <li> <p>INSTRUMENTATION: The Instrumentation type.</p> </li> <li> <p>UIAUTOMATION: The uiautomation type.</p> </li> <li> <p>UIAUTOMATOR: The uiautomator type.</p> </li> <li> <p>XCTEST: The Xcode test type.</p> </li> <li> <p>XCTEST_UI: The Xcode UI test type.</p> </li> </ul>"
+          "documentation":"<p>The test type for the specified device pool.</p> <p>Allowed values include the following:</p> <ul> <li> <p>BUILTIN_FUZZ.</p> </li> <li> <p>BUILTIN_EXPLORER. For Android, an app explorer that traverses an Android app, interacting with it and capturing screenshots at the same time.</p> </li> <li> <p>APPIUM_JAVA_JUNIT.</p> </li> <li> <p>APPIUM_JAVA_TESTNG.</p> </li> <li> <p>APPIUM_PYTHON.</p> </li> <li> <p>APPIUM_NODE.</p> </li> <li> <p>APPIUM_RUBY.</p> </li> <li> <p>APPIUM_WEB_JAVA_JUNIT.</p> </li> <li> <p>APPIUM_WEB_JAVA_TESTNG.</p> </li> <li> <p>APPIUM_WEB_PYTHON.</p> </li> <li> <p>APPIUM_WEB_NODE.</p> </li> <li> <p>APPIUM_WEB_RUBY.</p> </li> <li> <p>CALABASH.</p> </li> <li> <p>INSTRUMENTATION.</p> </li> <li> <p>UIAUTOMATION.</p> </li> <li> <p>UIAUTOMATOR.</p> </li> <li> <p>XCTEST.</p> </li> <li> <p>XCTEST_UI.</p> </li> </ul>"
         },
         "test":{
           "shape":"ScheduleRunTest",
@@ -2226,7 +2460,7 @@
         },
         "configuration":{
           "shape":"ScheduleRunConfiguration",
-          "documentation":"<p>An object containing information about the settings for a run.</p>"
+          "documentation":"<p>An object that contains information about the settings for a run.</p>"
         }
       },
       "documentation":"<p>Represents a request to the get device pool compatibility operation.</p>"
@@ -2261,7 +2495,7 @@
       "members":{
         "devicePool":{
           "shape":"DevicePool",
-          "documentation":"<p>An object containing information about the requested device pool.</p>"
+          "documentation":"<p>An object that contains information about the requested device pool.</p>"
         }
       },
       "documentation":"<p>Represents the result of a get device pool request.</p>"
@@ -2282,7 +2516,7 @@
       "members":{
         "device":{
           "shape":"Device",
-          "documentation":"<p>An object containing information about the requested device.</p>"
+          "documentation":"<p>An object that contains information about the requested device.</p>"
         }
       },
       "documentation":"<p>Represents the result of a get device request.</p>"
@@ -2293,7 +2527,7 @@
       "members":{
         "arn":{
           "shape":"AmazonResourceName",
-          "documentation":"<p>The Amazon Resource Name (ARN) of your instance profile.</p>"
+          "documentation":"<p>The Amazon Resource Name (ARN) of an instance profile.</p>"
         }
       }
     },
@@ -2302,7 +2536,7 @@
       "members":{
         "instanceProfile":{
           "shape":"InstanceProfile",
-          "documentation":"<p>An object containing information about your instance profile.</p>"
+          "documentation":"<p>An object that contains information about an instance profile.</p>"
         }
       }
     },
@@ -2322,7 +2556,7 @@
       "members":{
         "job":{
           "shape":"Job",
-          "documentation":"<p>An object containing information about the requested job.</p>"
+          "documentation":"<p>An object that contains information about the requested job.</p>"
         }
       },
       "documentation":"<p>Represents the result of a get job request.</p>"
@@ -2333,7 +2567,7 @@
       "members":{
         "arn":{
           "shape":"AmazonResourceName",
-          "documentation":"<p>The Amazon Resource Name (ARN) of the network profile you want to return information about.</p>"
+          "documentation":"<p>The ARN of the network profile to return information about.</p>"
         }
       }
     },
@@ -2390,7 +2624,7 @@
       "members":{
         "project":{
           "shape":"Project",
-          "documentation":"<p>The project you wish to get information about.</p>"
+          "documentation":"<p>The project to get information about.</p>"
         }
       },
       "documentation":"<p>Represents the result of a get project request.</p>"
@@ -2432,7 +2666,7 @@
       "members":{
         "run":{
           "shape":"Run",
-          "documentation":"<p>The run you wish to get results from.</p>"
+          "documentation":"<p>The run to get results from.</p>"
         }
       },
       "documentation":"<p>Represents the result of a get run request.</p>"
@@ -2458,6 +2692,51 @@
       },
       "documentation":"<p>Represents the result of a get suite request.</p>"
     },
+    "GetTestGridProjectRequest":{
+      "type":"structure",
+      "required":["projectArn"],
+      "members":{
+        "projectArn":{
+          "shape":"DeviceFarmArn",
+          "documentation":"<p>The ARN of the Selenium testing project, from either <a>CreateTestGridProject</a> or <a>ListTestGridProjects</a>.</p>"
+        }
+      }
+    },
+    "GetTestGridProjectResult":{
+      "type":"structure",
+      "members":{
+        "testGridProject":{
+          "shape":"TestGridProject",
+          "documentation":"<p>A <a>TestGridProject</a>.</p>"
+        }
+      }
+    },
+    "GetTestGridSessionRequest":{
+      "type":"structure",
+      "members":{
+        "projectArn":{
+          "shape":"DeviceFarmArn",
+          "documentation":"<p>The ARN for the project that this session belongs to. See <a>CreateTestGridProject</a> and <a>ListTestGridProjects</a>.</p>"
+        },
+        "sessionId":{
+          "shape":"ResourceId",
+          "documentation":"<p>An ID associated with this session.</p>"
+        },
+        "sessionArn":{
+          "shape":"DeviceFarmArn",
+          "documentation":"<p>An ARN that uniquely identifies a <a>TestGridSession</a>.</p>"
+        }
+      }
+    },
+    "GetTestGridSessionResult":{
+      "type":"structure",
+      "members":{
+        "testGridSession":{
+          "shape":"TestGridSession",
+          "documentation":"<p>The <a>TestGridSession</a> that was requested.</p>"
+        }
+      }
+    },
     "GetTestRequest":{
       "type":"structure",
       "required":["arn"],
@@ -2515,7 +2794,7 @@
       "members":{
         "vpceConfiguration":{
           "shape":"VPCEConfiguration",
-          "documentation":"<p>An object containing information about your VPC endpoint configuration.</p>"
+          "documentation":"<p>An object that contains information about your VPC endpoint configuration.</p>"
         }
       }
     },
@@ -2543,7 +2822,7 @@
         },
         "type":{
           "shape":"DeviceAttribute",
-          "documentation":"<p>The type of incompatibility.</p> <p>Allowed values include:</p> <ul> <li> <p>ARN: The ARN.</p> </li> <li> <p>FORM_FACTOR: The form factor (for example, phone or tablet).</p> </li> <li> <p>MANUFACTURER: The manufacturer.</p> </li> <li> <p>PLATFORM: The platform (for example, Android or iOS).</p> </li> <li> <p>REMOTE_ACCESS_ENABLED: Whether the device is enabled for remote access.</p> </li> <li> <p>APPIUM_VERSION: The Appium version for the test.</p> </li> </ul>"
+          "documentation":"<p>The type of incompatibility.</p> <p>Allowed values include:</p> <ul> <li> <p>ARN</p> </li> <li> <p>FORM_FACTOR (for example, phone or tablet)</p> </li> <li> <p>MANUFACTURER</p> </li> <li> <p>PLATFORM (for example, Android or iOS)</p> </li> <li> <p>REMOTE_ACCESS_ENABLED</p> </li> <li> <p>APPIUM_VERSION</p> </li> </ul>"
         }
       },
       "documentation":"<p>Represents information about incompatibility.</p>"
@@ -2565,7 +2844,7 @@
         },
         "appArn":{
           "shape":"AmazonResourceName",
-          "documentation":"<p>The Amazon Resource Name (ARN) of the app about which you are requesting information.</p>"
+          "documentation":"<p>The ARN of the app about which you are requesting information.</p>"
         }
       },
       "documentation":"<p>Represents the request to install an Android application (in .apk format) or an iOS application (in .ipa format) as part of a remote access session.</p>"
@@ -2593,15 +2872,15 @@
         },
         "packageCleanup":{
           "shape":"Boolean",
-          "documentation":"<p>When set to <code>true</code>, Device Farm will remove app packages after a test run. The default value is <code>false</code> for private devices.</p>"
+          "documentation":"<p>When set to <code>true</code>, Device Farm removes app packages after a test run. The default value is <code>false</code> for private devices.</p>"
         },
         "excludeAppPackagesFromCleanup":{
           "shape":"PackageIds",
-          "documentation":"<p>An array of strings specifying the list of app packages that should not be cleaned up from the device after a test run is over.</p> <p>The list of packages is only considered if you set <code>packageCleanup</code> to <code>true</code>.</p>"
+          "documentation":"<p>An array of strings containing the list of app packages that should not be cleaned up from the device after a test run completes.</p> <p>The list of packages is considered only if you set <code>packageCleanup</code> to <code>true</code>.</p>"
         },
         "rebootAfterUse":{
           "shape":"Boolean",
-          "documentation":"<p>When set to <code>true</code>, Device Farm will reboot the instance after a test run. The default value is <code>true</code>.</p>"
+          "documentation":"<p>When set to <code>true</code>, Device Farm reboots the instance after a test run. The default value is <code>true</code>.</p>"
         },
         "name":{
           "shape":"Name",
@@ -2638,6 +2917,15 @@
       "max":64,
       "min":0
     },
+    "InternalServiceException":{
+      "type":"structure",
+      "members":{
+        "message":{"shape":"Message"}
+      },
+      "documentation":"<p>An internal exception was raised in the service. Contact <a href=\"mailto:aws-devicefarm-support@amazon.com\">aws-devicefarm-support@amazon.com</a> if you see this error. </p>",
+      "exception":true,
+      "fault":true
+    },
     "InvalidOperationException":{
       "type":"structure",
       "members":{
@@ -2663,7 +2951,7 @@
         },
         "type":{
           "shape":"TestType",
-          "documentation":"<p>The job's type.</p> <p>Allowed values include the following:</p> <ul> <li> <p>BUILTIN_FUZZ: The built-in fuzz type.</p> </li> <li> <p>BUILTIN_EXPLORER: For Android, an app explorer that will traverse an Android app, interacting with it and capturing screenshots at the same time.</p> </li> <li> <p>APPIUM_JAVA_JUNIT: The Appium Java JUnit type.</p> </li> <li> <p>APPIUM_JAVA_TESTNG: The Appium Java TestNG type.</p> </li> <li> <p>APPIUM_PYTHON: The Appium Python type.</p> </li> <li> <p>APPIUM_NODE: The Appium Node.js type.</p> </li> <li> <p>APPIUM_RUBY: The Appium Ruby type.</p> </li> <li> <p>APPIUM_WEB_JAVA_JUNIT: The Appium Java JUnit type for web apps.</p> </li> <li> <p>APPIUM_WEB_JAVA_TESTNG: The Appium Java TestNG type for web apps.</p> </li> <li> <p>APPIUM_WEB_PYTHON: The Appium Python type for web apps.</p> </li> <li> <p>APPIUM_WEB_NODE: The Appium Node.js type for web apps.</p> </li> <li> <p>APPIUM_WEB_RUBY: The Appium Ruby test type for web apps.</p> </li> <li> <p>CALABASH: The Calabash type.</p> </li> <li> <p>INSTRUMENTATION: The Instrumentation type.</p> </li> <li> <p>UIAUTOMATION: The uiautomation type.</p> </li> <li> <p>UIAUTOMATOR: The uiautomator type.</p> </li> <li> <p>XCTEST: The Xcode test type.</p> </li> <li> <p>XCTEST_UI: The Xcode UI test type.</p> </li> </ul>"
+          "documentation":"<p>The job's type.</p> <p>Allowed values include the following:</p> <ul> <li> <p>BUILTIN_FUZZ</p> </li> <li> <p>BUILTIN_EXPLORER. For Android, an app explorer that traverses an Android app, interacting with it and capturing screenshots at the same time.</p> </li> <li> <p>APPIUM_JAVA_JUNIT</p> </li> <li> <p>APPIUM_JAVA_TESTNG</p> </li> <li> <p>APPIUM_PYTHON</p> </li> <li> <p>APPIUM_NODE</p> </li> <li> <p>APPIUM_RUBY</p> </li> <li> <p>APPIUM_WEB_JAVA_JUNIT</p> </li> <li> <p>APPIUM_WEB_JAVA_TESTNG</p> </li> <li> <p>APPIUM_WEB_PYTHON</p> </li> <li> <p>APPIUM_WEB_NODE</p> </li> <li> <p>APPIUM_WEB_RUBY</p> </li> <li> <p>CALABASH</p> </li> <li> <p>INSTRUMENTATION</p> </li> <li> <p>UIAUTOMATION</p> </li> <li> <p>UIAUTOMATOR</p> </li> <li> <p>XCTEST</p> </li> <li> <p>XCTEST_UI</p> </li> </ul>"
         },
         "created":{
           "shape":"DateTime",
@@ -2671,11 +2959,11 @@
         },
         "status":{
           "shape":"ExecutionStatus",
-          "documentation":"<p>The job's status.</p> <p>Allowed values include:</p> <ul> <li> <p>PENDING: A pending status.</p> </li> <li> <p>PENDING_CONCURRENCY: A pending concurrency status.</p> </li> <li> <p>PENDING_DEVICE: A pending device status.</p> </li> <li> <p>PROCESSING: A processing status.</p> </li> <li> <p>SCHEDULING: A scheduling status.</p> </li> <li> <p>PREPARING: A preparing status.</p> </li> <li> <p>RUNNING: A running status.</p> </li> <li> <p>COMPLETED: A completed status.</p> </li> <li> <p>STOPPING: A stopping status.</p> </li> </ul>"
+          "documentation":"<p>The job's status.</p> <p>Allowed values include:</p> <ul> <li> <p>PENDING</p> </li> <li> <p>PENDING_CONCURRENCY</p> </li> <li> <p>PENDING_DEVICE</p> </li> <li> <p>PROCESSING</p> </li> <li> <p>SCHEDULING</p> </li> <li> <p>PREPARING</p> </li> <li> <p>RUNNING</p> </li> <li> <p>COMPLETED</p> </li> <li> <p>STOPPING</p> </li> </ul>"
         },
         "result":{
           "shape":"ExecutionResult",
-          "documentation":"<p>The job's result.</p> <p>Allowed values include:</p> <ul> <li> <p>PENDING: A pending condition.</p> </li> <li> <p>PASSED: A passing condition.</p> </li> <li> <p>WARNED: A warning condition.</p> </li> <li> <p>FAILED: A failed condition.</p> </li> <li> <p>SKIPPED: A skipped condition.</p> </li> <li> <p>ERRORED: An error condition.</p> </li> <li> <p>STOPPED: A stopped condition.</p> </li> </ul>"
+          "documentation":"<p>The job's result.</p> <p>Allowed values include:</p> <ul> <li> <p>PENDING</p> </li> <li> <p>PASSED</p> </li> <li> <p>WARNED</p> </li> <li> <p>FAILED</p> </li> <li> <p>SKIPPED</p> </li> <li> <p>ERRORED</p> </li> <li> <p>STOPPED</p> </li> </ul>"
         },
         "started":{
           "shape":"DateTime",
@@ -2699,7 +2987,7 @@
         },
         "instanceArn":{
           "shape":"AmazonResourceName",
-          "documentation":"<p>The Amazon Resource Name (ARN) of the instance.</p>"
+          "documentation":"<p>The ARN of the instance.</p>"
         },
         "deviceMinutes":{
           "shape":"DeviceMinutes",
@@ -2711,7 +2999,7 @@
         },
         "videoCapture":{
           "shape":"VideoCapture",
-          "documentation":"<p>This value is set to true if video capture is enabled; otherwise, it is set to false.</p>"
+          "documentation":"<p>This value is set to true if video capture is enabled. Otherwise, it is set to false.</p>"
         }
       },
       "documentation":"<p>Represents a device.</p>"
@@ -2741,11 +3029,11 @@
       "members":{
         "arn":{
           "shape":"AmazonResourceName",
-          "documentation":"<p>The Run, Job, Suite, or Test ARN.</p>"
+          "documentation":"<p>The run, job, suite, or test ARN.</p>"
         },
         "type":{
           "shape":"ArtifactCategory",
-          "documentation":"<p>The artifacts' type.</p> <p>Allowed values include:</p> <ul> <li> <p>FILE: The artifacts are files.</p> </li> <li> <p>LOG: The artifacts are logs.</p> </li> <li> <p>SCREENSHOT: The artifacts are screenshots.</p> </li> </ul>"
+          "documentation":"<p>The artifacts' type.</p> <p>Allowed values include:</p> <ul> <li> <p>FILE</p> </li> <li> <p>LOG</p> </li> <li> <p>SCREENSHOT</p> </li> </ul>"
         },
         "nextToken":{
           "shape":"PaginationToken",
@@ -2763,7 +3051,7 @@
         },
         "nextToken":{
           "shape":"PaginationToken",
-          "documentation":"<p>If the number of items that are returned is significantly large, this is an identifier that is also returned, which can be used in a subsequent call to this operation to return the next set of items in the list.</p>"
+          "documentation":"<p>If the number of items that are returned is significantly large, this is an identifier that is also returned. It can be used in a subsequent call to this operation to return the next set of items in the list.</p>"
         }
       },
       "documentation":"<p>Represents the result of a list artifacts operation.</p>"
@@ -2773,7 +3061,7 @@
       "members":{
         "maxResults":{
           "shape":"Integer",
-          "documentation":"<p>An integer specifying the maximum number of items you want to return in the API response.</p>"
+          "documentation":"<p>An integer that specifies the maximum number of items you want to return in the API response.</p>"
         },
         "nextToken":{
           "shape":"PaginationToken",
@@ -2786,7 +3074,7 @@
       "members":{
         "deviceInstances":{
           "shape":"DeviceInstances",
-          "documentation":"<p>An object containing information about your device instances.</p>"
+          "documentation":"<p>An object that contains information about your device instances.</p>"
         },
         "nextToken":{
           "shape":"PaginationToken",
@@ -2822,7 +3110,7 @@
         },
         "nextToken":{
           "shape":"PaginationToken",
-          "documentation":"<p>If the number of items that are returned is significantly large, this is an identifier that is also returned, which can be used in a subsequent call to this operation to return the next set of items in the list.</p>"
+          "documentation":"<p>If the number of items that are returned is significantly large, this is an identifier that is also returned. It can be used in a subsequent call to this operation to return the next set of items in the list.</p>"
         }
       },
       "documentation":"<p>Represents the result of a list device pools request.</p>"
@@ -2840,7 +3128,7 @@
         },
         "filters":{
           "shape":"DeviceFilters",
-          "documentation":"<p>Used to select a set of devices. A filter is made up of an attribute, an operator, and one or more values.</p> <ul> <li> <p>Attribute: The aspect of a device such as platform or model used as the selection criteria in a device filter.</p> <p>Allowed values include:</p> <ul> <li> <p>ARN: The Amazon Resource Name (ARN) of the device. For example, \"arn:aws:devicefarm:us-west-2::device:12345Example\".</p> </li> <li> <p>PLATFORM: The device platform. Valid values are \"ANDROID\" or \"IOS\".</p> </li> <li> <p>OS_VERSION: The operating system version. For example, \"10.3.2\".</p> </li> <li> <p>MODEL: The device model. For example, \"iPad 5th Gen\".</p> </li> <li> <p>AVAILABILITY: The current availability of the device. Valid values are \"AVAILABLE\", \"HIGHLY_AVAILABLE\", \"BUSY\", or \"TEMPORARY_NOT_AVAILABLE\".</p> </li> <li> <p>FORM_FACTOR: The device form factor. Valid values are \"PHONE\" or \"TABLET\".</p> </li> <li> <p>MANUFACTURER: The device manufacturer. For example, \"Apple\".</p> </li> <li> <p>REMOTE_ACCESS_ENABLED: Whether the device is enabled for remote access. Valid values are \"TRUE\" or \"FALSE\".</p> </li> <li> <p>REMOTE_DEBUG_ENABLED: Whether the device is enabled for remote debugging. Valid values are \"TRUE\" or \"FALSE\". <i>This attribute will be ignored, as remote debugging is <a href=\"https://docs.aws.amazon.com/devicefarm/latest/developerguide/history.html\">no longer supported</a>.</i> </p> </li> <li> <p>INSTANCE_ARN: The Amazon Resource Name (ARN) of the device instance.</p> </li> <li> <p>INSTANCE_LABELS: The label of the device instance.</p> </li> <li> <p>FLEET_TYPE: The fleet type. Valid values are \"PUBLIC\" or \"PRIVATE\".</p> </li> </ul> </li> <li> <p>Operator: The filter operator.</p> <ul> <li> <p>The EQUALS operator is available for every attribute except INSTANCE_LABELS.</p> </li> <li> <p>The CONTAINS operator is available for the INSTANCE_LABELS and MODEL attributes.</p> </li> <li> <p>The IN and NOT_IN operators are available for the ARN, OS_VERSION, MODEL, MANUFACTURER, and INSTANCE_ARN attributes.</p> </li> <li> <p>The LESS_THAN, GREATER_THAN, LESS_THAN_OR_EQUALS, and GREATER_THAN_OR_EQUALS operators are also available for the OS_VERSION attribute.</p> </li> </ul> </li> <li> <p>Values: An array of one or more filter values.</p> <ul> <li> <p>The IN and NOT_IN operators take a values array that has one or more elements.</p> </li> <li> <p>The other operators require an array with a single element.</p> </li> <li> <p>In a request, the AVAILABILITY attribute takes \"AVAILABLE\", \"HIGHLY_AVAILABLE\", \"BUSY\", or \"TEMPORARY_NOT_AVAILABLE\" as values.</p> </li> </ul> </li> </ul>"
+          "documentation":"<p>Used to select a set of devices. A filter is made up of an attribute, an operator, and one or more values.</p> <ul> <li> <p>Attribute: The aspect of a device such as platform or model used as the selection criteria in a device filter.</p> <p>Allowed values include:</p> <ul> <li> <p>ARN: The Amazon Resource Name (ARN) of the device (for example, <code>arn:aws:devicefarm:us-west-2::device:12345Example</code>).</p> </li> <li> <p>PLATFORM: The device platform. Valid values are ANDROID or IOS.</p> </li> <li> <p>OS_VERSION: The operating system version (for example, 10.3.2).</p> </li> <li> <p>MODEL: The device model (for example, iPad 5th Gen).</p> </li> <li> <p>AVAILABILITY: The current availability of the device. Valid values are AVAILABLE, HIGHLY_AVAILABLE, BUSY, or TEMPORARY_NOT_AVAILABLE.</p> </li> <li> <p>FORM_FACTOR: The device form factor. Valid values are PHONE or TABLET.</p> </li> <li> <p>MANUFACTURER: The device manufacturer (for example, Apple).</p> </li> <li> <p>REMOTE_ACCESS_ENABLED: Whether the device is enabled for remote access. Valid values are TRUE or FALSE.</p> </li> <li> <p>REMOTE_DEBUG_ENABLED: Whether the device is enabled for remote debugging. Valid values are TRUE or FALSE. Because remote debugging is <a href=\"https://docs.aws.amazon.com/devicefarm/latest/developerguide/history.html\">no longer supported</a>, this attribute is ignored.</p> </li> <li> <p>INSTANCE_ARN: The Amazon Resource Name (ARN) of the device instance.</p> </li> <li> <p>INSTANCE_LABELS: The label of the device instance.</p> </li> <li> <p>FLEET_TYPE: The fleet type. Valid values are PUBLIC or PRIVATE.</p> </li> </ul> </li> <li> <p>Operator: The filter operator.</p> <ul> <li> <p>The EQUALS operator is available for every attribute except INSTANCE_LABELS.</p> </li> <li> <p>The CONTAINS operator is available for the INSTANCE_LABELS and MODEL attributes.</p> </li> <li> <p>The IN and NOT_IN operators are available for the ARN, OS_VERSION, MODEL, MANUFACTURER, and INSTANCE_ARN attributes.</p> </li> <li> <p>The LESS_THAN, GREATER_THAN, LESS_THAN_OR_EQUALS, and GREATER_THAN_OR_EQUALS operators are also available for the OS_VERSION attribute.</p> </li> </ul> </li> <li> <p>Values: An array of one or more filter values.</p> <ul> <li> <p>The IN and NOT_IN operators take a values array that has one or more elements.</p> </li> <li> <p>The other operators require an array with a single element.</p> </li> <li> <p>In a request, the AVAILABILITY attribute takes the following values: AVAILABLE, HIGHLY_AVAILABLE, BUSY, or TEMPORARY_NOT_AVAILABLE.</p> </li> </ul> </li> </ul>"
         }
       },
       "documentation":"<p>Represents the result of a list devices request.</p>"
@@ -2854,7 +3142,7 @@
         },
         "nextToken":{
           "shape":"PaginationToken",
-          "documentation":"<p>If the number of items that are returned is significantly large, this is an identifier that is also returned, which can be used in a subsequent call to this operation to return the next set of items in the list.</p>"
+          "documentation":"<p>If the number of items that are returned is significantly large, this is an identifier that is also returned. It can be used in a subsequent call to this operation to return the next set of items in the list.</p>"
         }
       },
       "documentation":"<p>Represents the result of a list devices operation.</p>"
@@ -2864,7 +3152,7 @@
       "members":{
         "maxResults":{
           "shape":"Integer",
-          "documentation":"<p>An integer specifying the maximum number of items you want to return in the API response.</p>"
+          "documentation":"<p>An integer that specifies the maximum number of items you want to return in the API response.</p>"
         },
         "nextToken":{
           "shape":"PaginationToken",
@@ -2877,7 +3165,7 @@
       "members":{
         "instanceProfiles":{
           "shape":"InstanceProfiles",
-          "documentation":"<p>An object containing information about your instance profiles.</p>"
+          "documentation":"<p>An object that contains information about your instance profiles.</p>"
         },
         "nextToken":{
           "shape":"PaginationToken",
@@ -2909,7 +3197,7 @@
         },
         "nextToken":{
           "shape":"PaginationToken",
-          "documentation":"<p>If the number of items that are returned is significantly large, this is an identifier that is also returned, which can be used in a subsequent call to this operation to return the next set of items in the list.</p>"
+          "documentation":"<p>If the number of items that are returned is significantly large, this is an identifier that is also returned. It can be used in a subsequent call to this operation to return the next set of items in the list.</p>"
         }
       },
       "documentation":"<p>Represents the result of a list jobs request.</p>"
@@ -2924,7 +3212,7 @@
         },
         "type":{
           "shape":"NetworkProfileType",
-          "documentation":"<p>The type of network profile you wish to return information about. Valid values are listed below.</p>"
+          "documentation":"<p>The type of network profile to return information about. Valid values are listed here.</p>"
         },
         "nextToken":{
           "shape":"PaginationToken",
@@ -3006,7 +3294,7 @@
       "members":{
         "offerings":{
           "shape":"Offerings",
-          "documentation":"<p>A value representing the list offering results.</p>"
+          "documentation":"<p>A value that represents the list offering results.</p>"
         },
         "nextToken":{
           "shape":"PaginationToken",
@@ -3038,7 +3326,7 @@
         },
         "nextToken":{
           "shape":"PaginationToken",
-          "documentation":"<p>If the number of items that are returned is significantly large, this is an identifier that is also returned, which can be used in a subsequent call to this operation to return the next set of items in the list.</p>"
+          "documentation":"<p>If the number of items that are returned is significantly large, this is an identifier that is also returned. It can be used in a subsequent call to this operation to return the next set of items in the list.</p>"
         }
       },
       "documentation":"<p>Represents the result of a list projects request.</p>"
@@ -3063,7 +3351,7 @@
       "members":{
         "remoteAccessSessions":{
           "shape":"RemoteAccessSessions",
-          "documentation":"<p>A container representing the metadata from the service about each remote access session you are requesting.</p>"
+          "documentation":"<p>A container that represents the metadata from the service about each remote access session you are requesting.</p>"
         },
         "nextToken":{
           "shape":"PaginationToken",
@@ -3096,7 +3384,7 @@
         },
         "nextToken":{
           "shape":"PaginationToken",
-          "documentation":"<p>If the number of items that are returned is significantly large, this is an identifier that is also returned, which can be used in a subsequent call to this operation to return the next set of items in the list.</p>"
+          "documentation":"<p>If the number of items that are returned is significantly large, this is an identifier that is also returned. It can be used in a subsequent call to this operation to return the next set of items in the list.</p>"
         }
       },
       "documentation":"<p>Represents the result of a list runs request.</p>"
@@ -3125,7 +3413,7 @@
         },
         "nextToken":{
           "shape":"PaginationToken",
-          "documentation":"<p>If the number of items that are returned is significantly large, this is an identifier that is also returned, which can be used in a subsequent call to this operation to return the next set of items in the list.</p>"
+          "documentation":"<p>If the number of items that are returned is significantly large, this is an identifier that is also returned. It can be used in a subsequent call to this operation to return the next set of items in the list.</p>"
         }
       },
       "documentation":"<p>Represents the result of a list samples request.</p>"
@@ -3154,7 +3442,7 @@
         },
         "nextToken":{
           "shape":"PaginationToken",
-          "documentation":"<p>If the number of items that are returned is significantly large, this is an identifier that is also returned, which can be used in a subsequent call to this operation to return the next set of items in the list.</p>"
+          "documentation":"<p>If the number of items that are returned is significantly large, this is an identifier that is also returned. It can be used in a subsequent call to this operation to return the next set of items in the list.</p>"
         }
       },
       "documentation":"<p>Represents the result of a list suites request.</p>"
@@ -3164,8 +3452,8 @@
       "required":["ResourceARN"],
       "members":{
         "ResourceARN":{
-          "shape":"AmazonResourceName",
-          "documentation":"<p>The Amazon Resource Name (ARN) of the resource(s) for which to list tags. You can associate tags with the following Device Farm resources: <code>PROJECT</code>, <code>RUN</code>, <code>NETWORK_PROFILE</code>, <code>INSTANCE_PROFILE</code>, <code>DEVICE_INSTANCE</code>, <code>SESSION</code>, <code>DEVICE_POOL</code>, <code>DEVICE</code>, and <code>VPCE_CONFIGURATION</code>.</p>"
+          "shape":"DeviceFarmArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the resource or resources for which to list tags. You can associate tags with the following Device Farm resources: <code>PROJECT</code>, <code>RUN</code>, <code>NETWORK_PROFILE</code>, <code>INSTANCE_PROFILE</code>, <code>DEVICE_INSTANCE</code>, <code>SESSION</code>, <code>DEVICE_POOL</code>, <code>DEVICE</code>, and <code>VPCE_CONFIGURATION</code>.</p>"
         }
       }
     },
@@ -3174,7 +3462,150 @@
       "members":{
         "Tags":{
           "shape":"TagList",
-          "documentation":"<p>The tags to add to the resource. A tag is an array of key-value pairs. Tag keys can have a maximum character length of 128 characters, and tag values can have a maximum length of 256 characters.</p>"
+          "documentation":"<p>The tags to add to the resource. A tag is an array of key-value pairs. Tag keys can have a maximum character length of 128 characters. Tag values can have a maximum length of 256 characters.</p>"
+        }
+      }
+    },
+    "ListTestGridProjectsRequest":{
+      "type":"structure",
+      "members":{
+        "maxResult":{
+          "shape":"MaxPageSize",
+          "documentation":"<p>Return no more than this number of results.</p>"
+        },
+        "nextToken":{
+          "shape":"PaginationToken",
+          "documentation":"<p>From a response, used to continue a paginated listing. </p>"
+        }
+      }
+    },
+    "ListTestGridProjectsResult":{
+      "type":"structure",
+      "members":{
+        "testGridProjects":{
+          "shape":"TestGridProjects",
+          "documentation":"<p>The list of TestGridProjects, based on a <a>ListTestGridProjectsRequest</a>.</p>"
+        },
+        "nextToken":{
+          "shape":"PaginationToken",
+          "documentation":"<p>Used for pagination. Pass into <a>ListTestGridProjects</a> to get more results in a paginated request.</p>"
+        }
+      }
+    },
+    "ListTestGridSessionActionsRequest":{
+      "type":"structure",
+      "required":["sessionArn"],
+      "members":{
+        "sessionArn":{
+          "shape":"DeviceFarmArn",
+          "documentation":"<p>The ARN of the session to retrieve.</p>"
+        },
+        "maxResult":{
+          "shape":"MaxPageSize",
+          "documentation":"<p>The maximum number of sessions to return per response.</p>"
+        },
+        "nextToken":{
+          "shape":"PaginationToken",
+          "documentation":"<p>Pagination token.</p>"
+        }
+      }
+    },
+    "ListTestGridSessionActionsResult":{
+      "type":"structure",
+      "members":{
+        "actions":{
+          "shape":"TestGridSessionActions",
+          "documentation":"<p>The action taken by the session.</p>"
+        },
+        "nextToken":{
+          "shape":"PaginationToken",
+          "documentation":"<p>Pagination token.</p>"
+        }
+      }
+    },
+    "ListTestGridSessionArtifactsRequest":{
+      "type":"structure",
+      "required":["sessionArn"],
+      "members":{
+        "sessionArn":{
+          "shape":"DeviceFarmArn",
+          "documentation":"<p>The ARN of a <a>TestGridSession</a>. </p>"
+        },
+        "type":{
+          "shape":"TestGridSessionArtifactCategory",
+          "documentation":"<p>Limit results to a specified type of artifact.</p>"
+        },
+        "maxResult":{
+          "shape":"MaxPageSize",
+          "documentation":"<p>The maximum number of results to be returned by a request.</p>"
+        },
+        "nextToken":{
+          "shape":"PaginationToken",
+          "documentation":"<p>Pagination token.</p>"
+        }
+      }
+    },
+    "ListTestGridSessionArtifactsResult":{
+      "type":"structure",
+      "members":{
+        "artifacts":{
+          "shape":"TestGridSessionArtifacts",
+          "documentation":"<p>A list of test grid session artifacts for a <a>TestGridSession</a>.</p>"
+        },
+        "nextToken":{
+          "shape":"PaginationToken",
+          "documentation":"<p>Pagination token.</p>"
+        }
+      }
+    },
+    "ListTestGridSessionsRequest":{
+      "type":"structure",
+      "required":["projectArn"],
+      "members":{
+        "projectArn":{
+          "shape":"DeviceFarmArn",
+          "documentation":"<p>ARN of a <a>TestGridProject</a>.</p>"
+        },
+        "status":{
+          "shape":"TestGridSessionStatus",
+          "documentation":"<p>Return only sessions in this state.</p>"
+        },
+        "creationTimeAfter":{
+          "shape":"DateTime",
+          "documentation":"<p>Return only sessions created after this time.</p>"
+        },
+        "creationTimeBefore":{
+          "shape":"DateTime",
+          "documentation":"<p>Return only sessions created before this time.</p>"
+        },
+        "endTimeAfter":{
+          "shape":"DateTime",
+          "documentation":"<p>Return only sessions that ended after this time.</p>"
+        },
+        "endTimeBefore":{
+          "shape":"DateTime",
+          "documentation":"<p>Return only sessions that ended before this time.</p>"
+        },
+        "maxResult":{
+          "shape":"MaxPageSize",
+          "documentation":"<p>Return only this many results at a time.</p>"
+        },
+        "nextToken":{
+          "shape":"PaginationToken",
+          "documentation":"<p>Pagination token.</p>"
+        }
+      }
+    },
+    "ListTestGridSessionsResult":{
+      "type":"structure",
+      "members":{
+        "testGridSessions":{
+          "shape":"TestGridSessions",
+          "documentation":"<p>The sessions that match the criteria in a <a>ListTestGridSessionsRequest</a>. </p>"
+        },
+        "nextToken":{
+          "shape":"PaginationToken",
+          "documentation":"<p>Pagination token.</p>"
         }
       }
     },
@@ -3202,7 +3633,7 @@
         },
         "nextToken":{
           "shape":"PaginationToken",
-          "documentation":"<p>If the number of items that are returned is significantly large, this is an identifier that is also returned, which can be used in a subsequent call to this operation to return the next set of items in the list.</p>"
+          "documentation":"<p>If the number of items that are returned is significantly large, this is an identifier that is also returned. It can be used in a subsequent call to this operation to return the next set of items in the list.</p>"
         }
       },
       "documentation":"<p>Represents the result of a list tests request.</p>"
@@ -3227,11 +3658,11 @@
       "members":{
         "uniqueProblems":{
           "shape":"UniqueProblemsByExecutionResultMap",
-          "documentation":"<p>Information about the unique problems.</p> <p>Allowed values include:</p> <ul> <li> <p>PENDING: A pending condition.</p> </li> <li> <p>PASSED: A passing condition.</p> </li> <li> <p>WARNED: A warning condition.</p> </li> <li> <p>FAILED: A failed condition.</p> </li> <li> <p>SKIPPED: A skipped condition.</p> </li> <li> <p>ERRORED: An error condition.</p> </li> <li> <p>STOPPED: A stopped condition.</p> </li> </ul>"
+          "documentation":"<p>Information about the unique problems.</p> <p>Allowed values include:</p> <ul> <li> <p>PENDING</p> </li> <li> <p>PASSED</p> </li> <li> <p>WARNED</p> </li> <li> <p>FAILED</p> </li> <li> <p>SKIPPED</p> </li> <li> <p>ERRORED</p> </li> <li> <p>STOPPED</p> </li> </ul>"
         },
         "nextToken":{
           "shape":"PaginationToken",
-          "documentation":"<p>If the number of items that are returned is significantly large, this is an identifier that is also returned, which can be used in a subsequent call to this operation to return the next set of items in the list.</p>"
+          "documentation":"<p>If the number of items that are returned is significantly large, this is an identifier that is also returned. It can be used in a subsequent call to this operation to return the next set of items in the list.</p>"
         }
       },
       "documentation":"<p>Represents the result of a list unique problems request.</p>"
@@ -3246,7 +3677,7 @@
         },
         "type":{
           "shape":"UploadType",
-          "documentation":"<p>The type of upload.</p> <p>Must be one of the following values:</p> <ul> <li> <p>ANDROID_APP: An Android upload.</p> </li> <li> <p>IOS_APP: An iOS upload.</p> </li> <li> <p>WEB_APP: A web application upload.</p> </li> <li> <p>EXTERNAL_DATA: An external data upload.</p> </li> <li> <p>APPIUM_JAVA_JUNIT_TEST_PACKAGE: An Appium Java JUnit test package upload.</p> </li> <li> <p>APPIUM_JAVA_TESTNG_TEST_PACKAGE: An Appium Java TestNG test package upload.</p> </li> <li> <p>APPIUM_PYTHON_TEST_PACKAGE: An Appium Python test package upload.</p> </li> <li> <p>APPIUM_NODE_TEST_PACKAGE: An Appium Node.js test package upload.</p> </li> <li> <p>APPIUM_RUBY_TEST_PACKAGE: An Appium Ruby test package upload.</p> </li> <li> <p>APPIUM_WEB_JAVA_JUNIT_TEST_PACKAGE: An Appium Java JUnit test package upload for a web app.</p> </li> <li> <p>APPIUM_WEB_JAVA_TESTNG_TEST_PACKAGE: An Appium Java TestNG test package upload for a web app.</p> </li> <li> <p>APPIUM_WEB_PYTHON_TEST_PACKAGE: An Appium Python test package upload for a web app.</p> </li> <li> <p>APPIUM_WEB_NODE_TEST_PACKAGE: An Appium Node.js test package upload for a web app.</p> </li> <li> <p>APPIUM_WEB_RUBY_TEST_PACKAGE: An Appium Ruby test package upload for a web app.</p> </li> <li> <p>CALABASH_TEST_PACKAGE: A Calabash test package upload.</p> </li> <li> <p>INSTRUMENTATION_TEST_PACKAGE: An instrumentation upload.</p> </li> <li> <p>UIAUTOMATION_TEST_PACKAGE: A uiautomation test package upload.</p> </li> <li> <p>UIAUTOMATOR_TEST_PACKAGE: A uiautomator test package upload.</p> </li> <li> <p>XCTEST_TEST_PACKAGE: An Xcode test package upload.</p> </li> <li> <p>XCTEST_UI_TEST_PACKAGE: An Xcode UI test package upload.</p> </li> <li> <p>APPIUM_JAVA_JUNIT_TEST_SPEC: An Appium Java JUnit test spec upload.</p> </li> <li> <p>APPIUM_JAVA_TESTNG_TEST_SPEC: An Appium Java TestNG test spec upload.</p> </li> <li> <p>APPIUM_PYTHON_TEST_SPEC: An Appium Python test spec upload.</p> </li> <li> <p>APPIUM_NODE_TEST_SPEC: An Appium Node.js test spec upload.</p> </li> <li> <p> APPIUM_RUBY_TEST_SPEC: An Appium Ruby test spec upload.</p> </li> <li> <p>APPIUM_WEB_JAVA_JUNIT_TEST_SPEC: An Appium Java JUnit test spec upload for a web app.</p> </li> <li> <p>APPIUM_WEB_JAVA_TESTNG_TEST_SPEC: An Appium Java TestNG test spec upload for a web app.</p> </li> <li> <p>APPIUM_WEB_PYTHON_TEST_SPEC: An Appium Python test spec upload for a web app.</p> </li> <li> <p>APPIUM_WEB_NODE_TEST_SPEC: An Appium Node.js test spec upload for a web app.</p> </li> <li> <p>APPIUM_WEB_RUBY_TEST_SPEC: An Appium Ruby test spec upload for a web app.</p> </li> <li> <p>INSTRUMENTATION_TEST_SPEC: An instrumentation test spec upload.</p> </li> <li> <p>XCTEST_UI_TEST_SPEC: An Xcode UI test spec upload.</p> </li> </ul>"
+          "documentation":"<p>The type of upload.</p> <p>Must be one of the following values:</p> <ul> <li> <p>ANDROID_APP</p> </li> <li> <p>IOS_APP</p> </li> <li> <p>WEB_APP</p> </li> <li> <p>EXTERNAL_DATA</p> </li> <li> <p>APPIUM_JAVA_JUNIT_TEST_PACKAGE</p> </li> <li> <p>APPIUM_JAVA_TESTNG_TEST_PACKAGE</p> </li> <li> <p>APPIUM_PYTHON_TEST_PACKAGE</p> </li> <li> <p>APPIUM_NODE_TEST_PACKAGE</p> </li> <li> <p>APPIUM_RUBY_TEST_PACKAGE</p> </li> <li> <p>APPIUM_WEB_JAVA_JUNIT_TEST_PACKAGE</p> </li> <li> <p>APPIUM_WEB_JAVA_TESTNG_TEST_PACKAGE</p> </li> <li> <p>APPIUM_WEB_PYTHON_TEST_PACKAGE</p> </li> <li> <p>APPIUM_WEB_NODE_TEST_PACKAGE</p> </li> <li> <p>APPIUM_WEB_RUBY_TEST_PACKAGE</p> </li> <li> <p>CALABASH_TEST_PACKAGE</p> </li> <li> <p>INSTRUMENTATION_TEST_PACKAGE</p> </li> <li> <p>UIAUTOMATION_TEST_PACKAGE</p> </li> <li> <p>UIAUTOMATOR_TEST_PACKAGE</p> </li> <li> <p>XCTEST_TEST_PACKAGE</p> </li> <li> <p>XCTEST_UI_TEST_PACKAGE</p> </li> <li> <p>APPIUM_JAVA_JUNIT_TEST_SPEC</p> </li> <li> <p>APPIUM_JAVA_TESTNG_TEST_SPEC</p> </li> <li> <p>APPIUM_PYTHON_TEST_SPEC</p> </li> <li> <p>APPIUM_NODE_TEST_SPEC</p> </li> <li> <p> APPIUM_RUBY_TEST_SPEC</p> </li> <li> <p>APPIUM_WEB_JAVA_JUNIT_TEST_SPEC</p> </li> <li> <p>APPIUM_WEB_JAVA_TESTNG_TEST_SPEC</p> </li> <li> <p>APPIUM_WEB_PYTHON_TEST_SPEC</p> </li> <li> <p>APPIUM_WEB_NODE_TEST_SPEC</p> </li> <li> <p>APPIUM_WEB_RUBY_TEST_SPEC</p> </li> <li> <p>INSTRUMENTATION_TEST_SPEC</p> </li> <li> <p>XCTEST_UI_TEST_SPEC</p> </li> </ul>"
         },
         "nextToken":{
           "shape":"PaginationToken",
@@ -3264,7 +3695,7 @@
         },
         "nextToken":{
           "shape":"PaginationToken",
-          "documentation":"<p>If the number of items that are returned is significantly large, this is an identifier that is also returned, which can be used in a subsequent call to this operation to return the next set of items in the list.</p>"
+          "documentation":"<p>If the number of items that are returned is significantly large, this is an identifier that is also returned. It can be used in a subsequent call to this operation to return the next set of items in the list.</p>"
         }
       },
       "documentation":"<p>Represents the result of a list uploads request.</p>"
@@ -3274,7 +3705,7 @@
       "members":{
         "maxResults":{
           "shape":"Integer",
-          "documentation":"<p>An integer specifying the maximum number of items you want to return in the API response.</p>"
+          "documentation":"<p>An integer that specifies the maximum number of items you want to return in the API response.</p>"
         },
         "nextToken":{
           "shape":"PaginationToken",
@@ -3287,7 +3718,7 @@
       "members":{
         "vpceConfigurations":{
           "shape":"VPCEConfigurations",
-          "documentation":"<p>An array of <code>VPCEConfiguration</code> objects containing information about your VPC endpoint configuration.</p>"
+          "documentation":"<p>An array of <code>VPCEConfiguration</code> objects that contain information about your VPC endpoint configuration.</p>"
         },
         "nextToken":{
           "shape":"PaginationToken",
@@ -3311,9 +3742,14 @@
           "documentation":"<p>The longitude.</p>"
         }
       },
-      "documentation":"<p>Represents a latitude and longitude pair, expressed in geographic coordinate system degrees (for example 47.6204, -122.3491).</p> <p>Elevation is currently not supported.</p>"
+      "documentation":"<p>Represents a latitude and longitude pair, expressed in geographic coordinate system degrees (for example, 47.6204, -122.3491).</p> <p>Elevation is currently not supported.</p>"
     },
     "Long":{"type":"long"},
+    "MaxPageSize":{
+      "type":"integer",
+      "max":1000,
+      "min":1
+    },
     "MaxSlotMap":{
       "type":"map",
       "key":{"shape":"String"},
@@ -3338,10 +3774,10 @@
         },
         "currencyCode":{
           "shape":"CurrencyCode",
-          "documentation":"<p>The currency code of a monetary amount. For example, <code>USD</code> means \"U.S. dollars.\"</p>"
+          "documentation":"<p>The currency code of a monetary amount. For example, <code>USD</code> means U.S. dollars.</p>"
         }
       },
-      "documentation":"<p>A number representing the monetary amount for an offering or transaction.</p>"
+      "documentation":"<p>A number that represents the monetary amount for an offering or transaction.</p>"
     },
     "Name":{
       "type":"string",
@@ -3365,7 +3801,7 @@
         },
         "type":{
           "shape":"NetworkProfileType",
-          "documentation":"<p>The type of network profile. Valid values are listed below.</p>"
+          "documentation":"<p>The type of network profile. Valid values are listed here.</p>"
         },
         "uplinkBandwidthBits":{
           "shape":"Long",
@@ -3444,15 +3880,15 @@
         },
         "description":{
           "shape":"Message",
-          "documentation":"<p>A string describing the offering.</p>"
+          "documentation":"<p>A string that describes the offering.</p>"
         },
         "type":{
           "shape":"OfferingType",
-          "documentation":"<p>The type of offering (e.g., \"RECURRING\") for a device.</p>"
+          "documentation":"<p>The type of offering (for example, <code>RECURRING</code>) for a device.</p>"
         },
         "platform":{
           "shape":"DevicePlatform",
-          "documentation":"<p>The platform of the device (e.g., ANDROID or IOS).</p>"
+          "documentation":"<p>The platform of the device (for example, <code>ANDROID</code> or <code>IOS</code>).</p>"
         },
         "recurringCharges":{
           "shape":"RecurringCharges",
@@ -3474,7 +3910,7 @@
         },
         "description":{
           "shape":"Message",
-          "documentation":"<p>A string describing the offering promotion.</p>"
+          "documentation":"<p>A string that describes the offering promotion.</p>"
         }
       },
       "documentation":"<p>Represents information about an offering promotion.</p>"
@@ -3599,7 +4035,7 @@
         },
         "result":{
           "shape":"ExecutionResult",
-          "documentation":"<p>The problem's result.</p> <p>Allowed values include:</p> <ul> <li> <p>PENDING: A pending condition.</p> </li> <li> <p>PASSED: A passing condition.</p> </li> <li> <p>WARNED: A warning condition.</p> </li> <li> <p>FAILED: A failed condition.</p> </li> <li> <p>SKIPPED: A skipped condition.</p> </li> <li> <p>ERRORED: An error condition.</p> </li> <li> <p>STOPPED: A stopped condition.</p> </li> </ul>"
+          "documentation":"<p>The problem's result.</p> <p>Allowed values include:</p> <ul> <li> <p>PENDING</p> </li> <li> <p>PASSED</p> </li> <li> <p>WARNED</p> </li> <li> <p>FAILED</p> </li> <li> <p>SKIPPED</p> </li> <li> <p>ERRORED</p> </li> <li> <p>STOPPED</p> </li> </ul>"
         },
         "message":{
           "shape":"Message",
@@ -3639,7 +4075,7 @@
         },
         "defaultJobTimeoutMinutes":{
           "shape":"JobTimeoutMinutes",
-          "documentation":"<p>The default number of minutes (at the project level) a test run will execute before it times out. The default value is 150 minutes.</p>"
+          "documentation":"<p>The default number of minutes (at the project level) a test run executes before it times out. The default value is 150 minutes.</p>"
         },
         "created":{
           "shape":"DateTime",
@@ -3661,7 +4097,7 @@
         },
         "quantity":{
           "shape":"Integer",
-          "documentation":"<p>The number of device slots you wish to purchase in an offering request.</p>"
+          "documentation":"<p>The number of device slots to purchase in an offering request.</p>"
         },
         "offeringPromotionId":{
           "shape":"OfferingPromotionIdentifier",
@@ -3678,7 +4114,7 @@
           "documentation":"<p>Represents the offering transaction for the purchase result.</p>"
         }
       },
-      "documentation":"<p>The result of the purchase offering (e.g., success or failure).</p>"
+      "documentation":"<p>The result of the purchase offering (for example, success or failure).</p>"
     },
     "PurchasedDevicesMap":{
       "type":"map",
@@ -3690,19 +4126,19 @@
       "members":{
         "wifi":{
           "shape":"Boolean",
-          "documentation":"<p>True if Wi-Fi is enabled at the beginning of the test; otherwise, false.</p>"
+          "documentation":"<p>True if Wi-Fi is enabled at the beginning of the test. Otherwise, false.</p>"
         },
         "bluetooth":{
           "shape":"Boolean",
-          "documentation":"<p>True if Bluetooth is enabled at the beginning of the test; otherwise, false.</p>"
+          "documentation":"<p>True if Bluetooth is enabled at the beginning of the test. Otherwise, false.</p>"
         },
         "nfc":{
           "shape":"Boolean",
-          "documentation":"<p>True if NFC is enabled at the beginning of the test; otherwise, false.</p>"
+          "documentation":"<p>True if NFC is enabled at the beginning of the test. Otherwise, false.</p>"
         },
         "gps":{
           "shape":"Boolean",
-          "documentation":"<p>True if GPS is enabled at the beginning of the test; otherwise, false.</p>"
+          "documentation":"<p>True if GPS is enabled at the beginning of the test. Otherwise, false.</p>"
         }
       },
       "documentation":"<p>Represents the set of radios and their states on a device. Examples of radios include Wi-Fi, GPS, Bluetooth, and NFC.</p>"
@@ -3716,10 +4152,10 @@
         },
         "frequency":{
           "shape":"RecurringChargeFrequency",
-          "documentation":"<p>The frequency in which charges will recur.</p>"
+          "documentation":"<p>The frequency in which charges recur.</p>"
         }
       },
-      "documentation":"<p>Specifies whether charges for devices will be recurring.</p>"
+      "documentation":"<p>Specifies whether charges for devices are recurring.</p>"
     },
     "RecurringChargeFrequency":{
       "type":"string",
@@ -3746,11 +4182,11 @@
         },
         "status":{
           "shape":"ExecutionStatus",
-          "documentation":"<p>The status of the remote access session. Can be any of the following:</p> <ul> <li> <p>PENDING: A pending status.</p> </li> <li> <p>PENDING_CONCURRENCY: A pending concurrency status.</p> </li> <li> <p>PENDING_DEVICE: A pending device status.</p> </li> <li> <p>PROCESSING: A processing status.</p> </li> <li> <p>SCHEDULING: A scheduling status.</p> </li> <li> <p>PREPARING: A preparing status.</p> </li> <li> <p>RUNNING: A running status.</p> </li> <li> <p>COMPLETED: A completed status.</p> </li> <li> <p>STOPPING: A stopping status.</p> </li> </ul>"
+          "documentation":"<p>The status of the remote access session. Can be any of the following:</p> <ul> <li> <p>PENDING.</p> </li> <li> <p>PENDING_CONCURRENCY.</p> </li> <li> <p>PENDING_DEVICE.</p> </li> <li> <p>PROCESSING.</p> </li> <li> <p>SCHEDULING.</p> </li> <li> <p>PREPARING.</p> </li> <li> <p>RUNNING.</p> </li> <li> <p>COMPLETED.</p> </li> <li> <p>STOPPING.</p> </li> </ul>"
         },
         "result":{
           "shape":"ExecutionResult",
-          "documentation":"<p>The result of the remote access session. Can be any of the following:</p> <ul> <li> <p>PENDING: A pending condition.</p> </li> <li> <p>PASSED: A passing condition.</p> </li> <li> <p>WARNED: A warning condition.</p> </li> <li> <p>FAILED: A failed condition.</p> </li> <li> <p>SKIPPED: A skipped condition.</p> </li> <li> <p>ERRORED: An error condition.</p> </li> <li> <p>STOPPED: A stopped condition.</p> </li> </ul>"
+          "documentation":"<p>The result of the remote access session. Can be any of the following:</p> <ul> <li> <p>PENDING.</p> </li> <li> <p>PASSED.</p> </li> <li> <p>WARNED.</p> </li> <li> <p>FAILED.</p> </li> <li> <p>SKIPPED.</p> </li> <li> <p>ERRORED.</p> </li> <li> <p>STOPPED.</p> </li> </ul>"
         },
         "message":{
           "shape":"Message",
@@ -3770,11 +4206,11 @@
         },
         "instanceArn":{
           "shape":"AmazonResourceName",
-          "documentation":"<p>The Amazon Resource Name (ARN) of the instance.</p>"
+          "documentation":"<p>The ARN of the instance.</p>"
         },
         "remoteDebugEnabled":{
           "shape":"Boolean",
-          "documentation":"<p>This flag is set to <code>true</code> if remote debugging is enabled for the remote access session.</p> <p> <i>Remote debugging is <a href=\"https://docs.aws.amazon.com/devicefarm/latest/developerguide/history.html\">no longer supported</a>.</i> </p>"
+          "documentation":"<p>This flag is set to <code>true</code> if remote debugging is enabled for the remote access session.</p> <p>Remote debugging is <a href=\"https://docs.aws.amazon.com/devicefarm/latest/developerguide/history.html\">no longer supported</a>.</p>"
         },
         "remoteRecordEnabled":{
           "shape":"Boolean",
@@ -3782,19 +4218,19 @@
         },
         "remoteRecordAppArn":{
           "shape":"AmazonResourceName",
-          "documentation":"<p>The Amazon Resource Name (ARN) for the app to be recorded in the remote access session.</p>"
+          "documentation":"<p>The ARN for the app to be recorded in the remote access session.</p>"
         },
         "hostAddress":{
           "shape":"HostAddress",
-          "documentation":"<p>IP address of the EC2 host where you need to connect to remotely debug devices. Only returned if remote debugging is enabled for the remote access session.</p> <p> <i>Remote debugging is <a href=\"https://docs.aws.amazon.com/devicefarm/latest/developerguide/history.html\">no longer supported</a>.</i> </p>"
+          "documentation":"<p>IP address of the EC2 host where you need to connect to remotely debug devices. Only returned if remote debugging is enabled for the remote access session.</p> <p>Remote debugging is <a href=\"https://docs.aws.amazon.com/devicefarm/latest/developerguide/history.html\">no longer supported</a>.</p>"
         },
         "clientId":{
           "shape":"ClientId",
-          "documentation":"<p>Unique identifier of your client for the remote access session. Only returned if remote debugging is enabled for the remote access session.</p> <p> <i>Remote debugging is <a href=\"https://docs.aws.amazon.com/devicefarm/latest/developerguide/history.html\">no longer supported</a>.</i> </p>"
+          "documentation":"<p>Unique identifier of your client for the remote access session. Only returned if remote debugging is enabled for the remote access session.</p> <p>Remote debugging is <a href=\"https://docs.aws.amazon.com/devicefarm/latest/developerguide/history.html\">no longer supported</a>.</p>"
         },
         "billingMethod":{
           "shape":"BillingMethod",
-          "documentation":"<p>The billing method of the remote access session. Possible values include <code>METERED</code> or <code>UNMETERED</code>. For more information about metered devices, see <a href=\"https://docs.aws.amazon.com/devicefarm/latest/developerguide/welcome.html#welcome-terminology\">AWS Device Farm terminology</a>.\"</p>"
+          "documentation":"<p>The billing method of the remote access session. Possible values include <code>METERED</code> or <code>UNMETERED</code>. For more information about metered devices, see <a href=\"https://docs.aws.amazon.com/devicefarm/latest/developerguide/welcome.html#welcome-terminology\">AWS Device Farm terminology</a>.</p>"
         },
         "deviceMinutes":{
           "shape":"DeviceMinutes",
@@ -3806,15 +4242,15 @@
         },
         "deviceUdid":{
           "shape":"String",
-          "documentation":"<p>Unique device identifier for the remote device. Only returned if remote debugging is enabled for the remote access session.</p> <p> <i>Remote debugging is <a href=\"https://docs.aws.amazon.com/devicefarm/latest/developerguide/history.html\">no longer supported</a>.</i> </p>"
+          "documentation":"<p>Unique device identifier for the remote device. Only returned if remote debugging is enabled for the remote access session.</p> <p>Remote debugging is <a href=\"https://docs.aws.amazon.com/devicefarm/latest/developerguide/history.html\">no longer supported</a>.</p>"
         },
         "interactionMode":{
           "shape":"InteractionMode",
-          "documentation":"<p>The interaction mode of the remote access session. Valid values are:</p> <ul> <li> <p>INTERACTIVE: You can interact with the iOS device by viewing, touching, and rotating the screen. You <b>cannot</b> run XCUITest framework-based tests in this mode.</p> </li> <li> <p>NO_VIDEO: You are connected to the device but cannot interact with it or view the screen. This mode has the fastest test execution speed. You <b>can</b> run XCUITest framework-based tests in this mode.</p> </li> <li> <p>VIDEO_ONLY: You can view the screen but cannot touch or rotate it. You <b>can</b> run XCUITest framework-based tests and watch the screen in this mode.</p> </li> </ul>"
+          "documentation":"<p>The interaction mode of the remote access session. Valid values are:</p> <ul> <li> <p>INTERACTIVE: You can interact with the iOS device by viewing, touching, and rotating the screen. You cannot run XCUITest framework-based tests in this mode.</p> </li> <li> <p>NO_VIDEO: You are connected to the device, but cannot interact with it or view the screen. This mode has the fastest test execution speed. You can run XCUITest framework-based tests in this mode.</p> </li> <li> <p>VIDEO_ONLY: You can view the screen, but cannot touch or rotate it. You can run XCUITest framework-based tests and watch the screen in this mode.</p> </li> </ul>"
         },
         "skipAppResign":{
           "shape":"SkipAppResign",
-          "documentation":"<p>When set to <code>true</code>, for private devices, Device Farm will not sign your app again. For public devices, Device Farm always signs your apps again and this parameter has no effect.</p> <p>For more information about how Device Farm re-signs your app(s), see <a href=\"https://aws.amazon.com/device-farm/faq/\">Do you modify my app?</a> in the <i>AWS Device Farm FAQs</i>.</p>"
+          "documentation":"<p>When set to <code>true</code>, for private devices, Device Farm does not sign your app again. For public devices, Device Farm always signs your apps again.</p> <p>For more information about how Device Farm re-signs your apps, see <a href=\"https://aws.amazon.com/device-farm/faq/\">Do you modify my app?</a> in the <i>AWS Device Farm FAQs</i>.</p>"
         }
       },
       "documentation":"<p>Represents information about the remote access session.</p>"
@@ -3835,7 +4271,7 @@
           "documentation":"<p>The quantity requested in an offering renewal.</p>"
         }
       },
-      "documentation":"<p>A request representing an offering renewal.</p>"
+      "documentation":"<p>A request that represents an offering renewal.</p>"
     },
     "RenewOfferingResult":{
       "type":"structure",
@@ -3861,12 +4297,30 @@
       },
       "documentation":"<p>Represents the screen resolution of a device in height and width, expressed in pixels.</p>"
     },
+    "ResourceDescription":{
+      "type":"string",
+      "max":2048,
+      "min":1,
+      "pattern":".*\\S.*"
+    },
+    "ResourceId":{
+      "type":"string",
+      "max":128,
+      "min":1,
+      "pattern":".*\\S.*"
+    },
+    "ResourceName":{
+      "type":"string",
+      "max":64,
+      "min":1,
+      "pattern":".*\\S.*"
+    },
     "Rule":{
       "type":"structure",
       "members":{
         "attribute":{
           "shape":"DeviceAttribute",
-          "documentation":"<p>The rule's stringified attribute. For example, specify the value as <code>\"\\\"abc\\\"\"</code>.</p> <p>The supported operators for each attribute are provided in the following list.</p> <dl> <dt>APPIUM_VERSION</dt> <dd> <p>The Appium version for the test.</p> <p> <i>Supported operators</i>: <code>CONTAINS</code> </p> </dd> <dt>ARN</dt> <dd> <p>The Amazon Resource Name (ARN) of the device. For example, \"arn:aws:devicefarm:us-west-2::device:12345Example\".</p> <p> <i>Supported operators</i>: <code>EQUALS</code>, <code>IN</code>, <code>NOT_IN</code> </p> </dd> <dt>AVAILABILITY</dt> <dd> <p>The current availability of the device. Valid values are \"AVAILABLE\", \"HIGHLY_AVAILABLE\", \"BUSY\", or \"TEMPORARY_NOT_AVAILABLE\".</p> <p> <i>Supported operators</i>: <code>EQUALS</code> </p> </dd> <dt>FLEET_TYPE</dt> <dd> <p>The fleet type. Valid values are \"PUBLIC\" or \"PRIVATE\".</p> <p> <i>Supported operators</i>: <code>EQUALS</code> </p> </dd> <dt>FORM_FACTOR</dt> <dd> <p>The device form factor. Valid values are \"PHONE\" or \"TABLET\".</p> <p> <i>Supported operators</i>: <code>EQUALS</code>, <code>IN</code>, <code>NOT_IN</code> </p> </dd> <dt>INSTANCE_ARN</dt> <dd> <p>The Amazon Resource Name (ARN) of the device instance.</p> <p> <i>Supported operators</i>: <code>IN</code>, <code>NOT_IN</code> </p> </dd> <dt>INSTANCE_LABELS</dt> <dd> <p>The label of the device instance.</p> <p> <i>Supported operators</i>: <code>CONTAINS</code> </p> </dd> <dt>MANUFACTURER</dt> <dd> <p>The device manufacturer. For example, \"Apple\".</p> <p> <i>Supported operators</i>: <code>EQUALS</code>, <code>IN</code>, <code>NOT_IN</code> </p> </dd> <dt>MODEL</dt> <dd> <p>The device model, such as \"Apple iPad Air 2\" or \"Google Pixel\".</p> <p> <i>Supported operators</i>: <code>CONTAINS</code>, <code>EQUALS</code>, <code>IN</code>, <code>NOT_IN</code> </p> </dd> <dt>OS_VERSION</dt> <dd> <p>The operating system version. For example, \"10.3.2\".</p> <p> <i>Supported operators</i>: <code>EQUALS</code>, <code>GREATER_THAN</code>, <code>GREATER_THAN_OR_EQUALS</code>, <code>IN</code>, <code>LESS_THAN</code>, <code>LESS_THAN_OR_EQUALS</code>, <code>NOT_IN</code> </p> </dd> <dt>PLATFORM</dt> <dd> <p>The device platform. Valid values are \"ANDROID\" or \"IOS\".</p> <p> <i>Supported operators</i>: <code>EQUALS</code>, <code>IN</code>, <code>NOT_IN</code> </p> </dd> <dt>REMOTE_ACCESS_ENABLED</dt> <dd> <p>Whether the device is enabled for remote access. Valid values are \"TRUE\" or \"FALSE\".</p> <p> <i>Supported operators</i>: <code>EQUALS</code> </p> </dd> <dt>REMOTE_DEBUG_ENABLED</dt> <dd> <p>Whether the device is enabled for remote debugging. Valid values are \"TRUE\" or \"FALSE\".</p> <p> <i>Supported operators</i>: <code>EQUALS</code> </p> <p> <i>This filter will be ignored, as remote debugging is <a href=\"https://docs.aws.amazon.com/devicefarm/latest/developerguide/history.html\">no longer supported</a>.</i> </p> </dd> </dl>"
+          "documentation":"<p>The rule's stringified attribute. For example, specify the value as <code>\"\\\"abc\\\"\"</code>.</p> <p>The supported operators for each attribute are provided in the following list.</p> <dl> <dt>APPIUM_VERSION</dt> <dd> <p>The Appium version for the test.</p> <p>Supported operators: <code>CONTAINS</code> </p> </dd> <dt>ARN</dt> <dd> <p>The Amazon Resource Name (ARN) of the device (for example, <code>arn:aws:devicefarm:us-west-2::device:12345Example</code>.</p> <p>Supported operators: <code>EQUALS</code>, <code>IN</code>, <code>NOT_IN</code> </p> </dd> <dt>AVAILABILITY</dt> <dd> <p>The current availability of the device. Valid values are AVAILABLE, HIGHLY_AVAILABLE, BUSY, or TEMPORARY_NOT_AVAILABLE.</p> <p>Supported operators: <code>EQUALS</code> </p> </dd> <dt>FLEET_TYPE</dt> <dd> <p>The fleet type. Valid values are PUBLIC or PRIVATE.</p> <p>Supported operators: <code>EQUALS</code> </p> </dd> <dt>FORM_FACTOR</dt> <dd> <p>The device form factor. Valid values are PHONE or TABLET.</p> <p>Supported operators: <code>EQUALS</code>, <code>IN</code>, <code>NOT_IN</code> </p> </dd> <dt>INSTANCE_ARN</dt> <dd> <p>The Amazon Resource Name (ARN) of the device instance.</p> <p>Supported operators: <code>IN</code>, <code>NOT_IN</code> </p> </dd> <dt>INSTANCE_LABELS</dt> <dd> <p>The label of the device instance.</p> <p>Supported operators: <code>CONTAINS</code> </p> </dd> <dt>MANUFACTURER</dt> <dd> <p>The device manufacturer (for example, Apple).</p> <p>Supported operators: <code>EQUALS</code>, <code>IN</code>, <code>NOT_IN</code> </p> </dd> <dt>MODEL</dt> <dd> <p>The device model, such as Apple iPad Air 2 or Google Pixel.</p> <p>Supported operators: <code>CONTAINS</code>, <code>EQUALS</code>, <code>IN</code>, <code>NOT_IN</code> </p> </dd> <dt>OS_VERSION</dt> <dd> <p>The operating system version (for example, 10.3.2).</p> <p>Supported operators: <code>EQUALS</code>, <code>GREATER_THAN</code>, <code>GREATER_THAN_OR_EQUALS</code>, <code>IN</code>, <code>LESS_THAN</code>, <code>LESS_THAN_OR_EQUALS</code>, <code>NOT_IN</code> </p> </dd> <dt>PLATFORM</dt> <dd> <p>The device platform. Valid values are ANDROID or IOS.</p> <p>Supported operators: <code>EQUALS</code>, <code>IN</code>, <code>NOT_IN</code> </p> </dd> <dt>REMOTE_ACCESS_ENABLED</dt> <dd> <p>Whether the device is enabled for remote access. Valid values are TRUE or FALSE.</p> <p>Supported operators: <code>EQUALS</code> </p> </dd> <dt>REMOTE_DEBUG_ENABLED</dt> <dd> <p>Whether the device is enabled for remote debugging. Valid values are TRUE or FALSE.</p> <p>Supported operators: <code>EQUALS</code> </p> <p>Because remote debugging is <a href=\"https://docs.aws.amazon.com/devicefarm/latest/developerguide/history.html\">no longer supported</a>, this filter is ignored.</p> </dd> </dl>"
         },
         "operator":{
           "shape":"RuleOperator",
@@ -3909,11 +4363,11 @@
         },
         "type":{
           "shape":"TestType",
-          "documentation":"<p>The run's type.</p> <p>Must be one of the following values:</p> <ul> <li> <p>BUILTIN_FUZZ: The built-in fuzz type.</p> </li> <li> <p>BUILTIN_EXPLORER: For Android, an app explorer that will traverse an Android app, interacting with it and capturing screenshots at the same time.</p> </li> <li> <p>APPIUM_JAVA_JUNIT: The Appium Java JUnit type.</p> </li> <li> <p>APPIUM_JAVA_TESTNG: The Appium Java TestNG type.</p> </li> <li> <p>APPIUM_PYTHON: The Appium Python type.</p> </li> <li> <p>APPIUM_NODE: The Appium Node.js type.</p> </li> <li> <p>APPIUM_RUBY: The Appium Ruby type.</p> </li> <li> <p>APPIUM_WEB_JAVA_JUNIT: The Appium Java JUnit type for web apps.</p> </li> <li> <p>APPIUM_WEB_JAVA_TESTNG: The Appium Java TestNG type for web apps.</p> </li> <li> <p>APPIUM_WEB_PYTHON: The Appium Python type for web apps.</p> </li> <li> <p>APPIUM_WEB_NODE: The Appium Node.js type for web apps.</p> </li> <li> <p>APPIUM_WEB_RUBY: The Appium Ruby type for web apps.</p> </li> <li> <p>CALABASH: The Calabash type.</p> </li> <li> <p>INSTRUMENTATION: The Instrumentation type.</p> </li> <li> <p>UIAUTOMATION: The uiautomation type.</p> </li> <li> <p>UIAUTOMATOR: The uiautomator type.</p> </li> <li> <p>XCTEST: The Xcode test type.</p> </li> <li> <p>XCTEST_UI: The Xcode UI test type.</p> </li> </ul>"
+          "documentation":"<p>The run's type.</p> <p>Must be one of the following values:</p> <ul> <li> <p>BUILTIN_FUZZ</p> </li> <li> <p>BUILTIN_EXPLORER</p> <note> <p>For Android, an app explorer that traverses an Android app, interacting with it and capturing screenshots at the same time.</p> </note> </li> <li> <p>APPIUM_JAVA_JUNIT</p> </li> <li> <p>APPIUM_JAVA_TESTNG</p> </li> <li> <p>APPIUM_PYTHON</p> </li> <li> <p>APPIUM_NODE</p> </li> <li> <p>APPIUM_RUBY</p> </li> <li> <p>APPIUM_WEB_JAVA_JUNIT</p> </li> <li> <p>APPIUM_WEB_JAVA_TESTNG</p> </li> <li> <p>APPIUM_WEB_PYTHON</p> </li> <li> <p>APPIUM_WEB_NODE</p> </li> <li> <p>APPIUM_WEB_RUBY</p> </li> <li> <p>CALABASH</p> </li> <li> <p>INSTRUMENTATION</p> </li> <li> <p>UIAUTOMATION</p> </li> <li> <p>UIAUTOMATOR</p> </li> <li> <p>XCTEST</p> </li> <li> <p>XCTEST_UI</p> </li> </ul>"
         },
         "platform":{
           "shape":"DevicePlatform",
-          "documentation":"<p>The run's platform.</p> <p>Allowed values include:</p> <ul> <li> <p>ANDROID: The Android platform.</p> </li> <li> <p>IOS: The iOS platform.</p> </li> </ul>"
+          "documentation":"<p>The run's platform.</p> <p>Allowed values include:</p> <ul> <li> <p>ANDROID</p> </li> <li> <p>IOS</p> </li> </ul>"
         },
         "created":{
           "shape":"DateTime",
@@ -3921,11 +4375,11 @@
         },
         "status":{
           "shape":"ExecutionStatus",
-          "documentation":"<p>The run's status.</p> <p>Allowed values include:</p> <ul> <li> <p>PENDING: A pending status.</p> </li> <li> <p>PENDING_CONCURRENCY: A pending concurrency status.</p> </li> <li> <p>PENDING_DEVICE: A pending device status.</p> </li> <li> <p>PROCESSING: A processing status.</p> </li> <li> <p>SCHEDULING: A scheduling status.</p> </li> <li> <p>PREPARING: A preparing status.</p> </li> <li> <p>RUNNING: A running status.</p> </li> <li> <p>COMPLETED: A completed status.</p> </li> <li> <p>STOPPING: A stopping status.</p> </li> </ul>"
+          "documentation":"<p>The run's status.</p> <p>Allowed values include:</p> <ul> <li> <p>PENDING</p> </li> <li> <p>PENDING_CONCURRENCY</p> </li> <li> <p>PENDING_DEVICE</p> </li> <li> <p>PROCESSING</p> </li> <li> <p>SCHEDULING</p> </li> <li> <p>PREPARING</p> </li> <li> <p>RUNNING</p> </li> <li> <p>COMPLETED</p> </li> <li> <p>STOPPING</p> </li> </ul>"
         },
         "result":{
           "shape":"ExecutionResult",
-          "documentation":"<p>The run's result.</p> <p>Allowed values include:</p> <ul> <li> <p>PENDING: A pending condition.</p> </li> <li> <p>PASSED: A passing condition.</p> </li> <li> <p>WARNED: A warning condition.</p> </li> <li> <p>FAILED: A failed condition.</p> </li> <li> <p>SKIPPED: A skipped condition.</p> </li> <li> <p>ERRORED: An error condition.</p> </li> <li> <p>STOPPED: A stopped condition.</p> </li> </ul>"
+          "documentation":"<p>The run's result.</p> <p>Allowed values include:</p> <ul> <li> <p>PENDING</p> </li> <li> <p>PASSED</p> </li> <li> <p>WARNED</p> </li> <li> <p>FAILED</p> </li> <li> <p>SKIPPED</p> </li> <li> <p>ERRORED</p> </li> <li> <p>STOPPED</p> </li> </ul>"
         },
         "started":{
           "shape":"DateTime",
@@ -3953,7 +4407,7 @@
         },
         "billingMethod":{
           "shape":"BillingMethod",
-          "documentation":"<p>Specifies the billing method for a test run: <code>metered</code> or <code>unmetered</code>. If the parameter is not specified, the default value is <code>metered</code>.</p>"
+          "documentation":"<p>Specifies the billing method for a test run: <code>metered</code> or <code>unmetered</code>. If the parameter is not specified, the default value is <code>metered</code>.</p> <note> <p>If you have unmetered device slots, you must set this to <code>unmetered</code> to use them. Otherwise, the run is counted toward metered device minutes.</p> </note>"
         },
         "deviceMinutes":{
           "shape":"DeviceMinutes",
@@ -3965,7 +4419,7 @@
         },
         "parsingResultUrl":{
           "shape":"String",
-          "documentation":"<p>Read-only URL for an object in S3 bucket where you can get the parsing results of the test package. If the test package doesn't parse, the reason why it doesn't parse appears in the file that this URL points to.</p>"
+          "documentation":"<p>Read-only URL for an object in an S3 bucket where you can get the parsing results of the test package. If the test package doesn't parse, the reason why it doesn't parse appears in the file that this URL points to.</p>"
         },
         "resultCode":{
           "shape":"ExecutionResultCode",
@@ -3985,7 +4439,7 @@
         },
         "jobTimeoutMinutes":{
           "shape":"JobTimeoutMinutes",
-          "documentation":"<p>The number of minutes the job will execute before it times out.</p>"
+          "documentation":"<p>The number of minutes the job executes before it times out.</p>"
         },
         "devicePoolArn":{
           "shape":"AmazonResourceName",
@@ -4013,7 +4467,7 @@
         },
         "skipAppResign":{
           "shape":"SkipAppResign",
-          "documentation":"<p>When set to <code>true</code>, for private devices, Device Farm will not sign your app again. For public devices, Device Farm always signs your apps again and this parameter has no effect.</p> <p>For more information about how Device Farm re-signs your app(s), see <a href=\"https://aws.amazon.com/device-farm/faq/\">Do you modify my app?</a> in the <i>AWS Device Farm FAQs</i>.</p>"
+          "documentation":"<p>When set to <code>true</code>, for private devices, Device Farm does not sign your app again. For public devices, Device Farm always signs your apps again.</p> <p>For more information about how Device Farm re-signs your apps, see <a href=\"https://aws.amazon.com/device-farm/faq/\">Do you modify my app?</a> in the <i>AWS Device Farm FAQs</i>.</p>"
         },
         "testSpecArn":{
           "shape":"AmazonResourceName",
@@ -4024,7 +4478,7 @@
           "documentation":"<p>The results of a device filter used to select the devices for a test run.</p>"
         }
       },
-      "documentation":"<p>Represents a test run on a set of devices with a given app package, test parameters, etc.</p>"
+      "documentation":"<p>Represents a test run on a set of devices with a given app package, test parameters, and so on.</p>"
     },
     "Runs":{
       "type":"list",
@@ -4043,7 +4497,7 @@
         },
         "url":{
           "shape":"URL",
-          "documentation":"<p>The pre-signed Amazon S3 URL that can be used with a corresponding GET request to download the sample's file.</p>"
+          "documentation":"<p>The presigned Amazon S3 URL that can be used with a GET request to download the sample's file.</p>"
         }
       },
       "documentation":"<p>Represents a sample of performance data.</p>"
@@ -4079,7 +4533,7 @@
       "members":{
         "extraDataPackageArn":{
           "shape":"AmazonResourceName",
-          "documentation":"<p>The ARN of the extra data for the run. The extra data is a .zip file that AWS Device Farm will extract to external data for Android or the app's sandbox for iOS.</p>"
+          "documentation":"<p>The ARN of the extra data for the run. The extra data is a .zip file that AWS Device Farm extracts to external data for Android or the app's sandbox for iOS.</p>"
         },
         "networkProfileArn":{
           "shape":"AmazonResourceName",
@@ -4095,7 +4549,7 @@
         },
         "vpceConfigurationArns":{
           "shape":"AmazonResourceNames",
-          "documentation":"<p>An array of Amazon Resource Names (ARNs) for your VPC endpoint configurations.</p>"
+          "documentation":"<p>An array of ARNs for your VPC endpoint configurations.</p>"
         },
         "customerArtifactPaths":{
           "shape":"CustomerArtifactPaths",
@@ -4107,11 +4561,11 @@
         },
         "auxiliaryApps":{
           "shape":"AmazonResourceNames",
-          "documentation":"<p>A list of Upload ARNs for app packages that will be installed alongside your app.</p>"
+          "documentation":"<p>A list of upload ARNs for app packages to be installed with your app.</p>"
         },
         "billingMethod":{
           "shape":"BillingMethod",
-          "documentation":"<p>Specifies the billing method for a test run: <code>metered</code> or <code>unmetered</code>. If the parameter is not specified, the default value is <code>metered</code>.</p>"
+          "documentation":"<p>Specifies the billing method for a test run: <code>metered</code> or <code>unmetered</code>. If the parameter is not specified, the default value is <code>metered</code>.</p> <note> <p>If you have purchased unmetered device slots, you must set this parameter to <code>unmetered</code> to make use of them. Otherwise, your run counts against your metered time.</p> </note>"
         }
       },
       "documentation":"<p>Represents the settings for a run. Includes things like location, radio states, auxiliary apps, and network profiles.</p>"
@@ -4129,7 +4583,7 @@
         },
         "appArn":{
           "shape":"AmazonResourceName",
-          "documentation":"<p>The ARN of the app to schedule a run.</p>"
+          "documentation":"<p>The ARN of an application package to run tests against, created with <a>CreateUpload</a>. See <a>ListUploads</a>.</p>"
         },
         "devicePoolArn":{
           "shape":"AmazonResourceName",
@@ -4137,7 +4591,7 @@
         },
         "deviceSelectionConfiguration":{
           "shape":"DeviceSelectionConfiguration",
-          "documentation":"<p>The filter criteria used to dynamically select a set of devices for a test run, as well as the maximum number of devices to be included in the run.</p> <p>Either <b> <code>devicePoolArn</code> </b> or <b> <code>deviceSelectionConfiguration</code> </b> is required in a request.</p>"
+          "documentation":"<p>The filter criteria used to dynamically select a set of devices for a test run and the maximum number of devices to be included in the run.</p> <p>Either <b> <code>devicePoolArn</code> </b> or <b> <code>deviceSelectionConfiguration</code> </b> is required in a request.</p>"
         },
         "name":{
           "shape":"Name",
@@ -4174,11 +4628,11 @@
       "members":{
         "type":{
           "shape":"TestType",
-          "documentation":"<p>The test's type.</p> <p>Must be one of the following values:</p> <ul> <li> <p>BUILTIN_FUZZ: The built-in fuzz type.</p> </li> <li> <p>BUILTIN_EXPLORER: For Android, an app explorer that will traverse an Android app, interacting with it and capturing screenshots at the same time.</p> </li> <li> <p>APPIUM_JAVA_JUNIT: The Appium Java JUnit type.</p> </li> <li> <p>APPIUM_JAVA_TESTNG: The Appium Java TestNG type.</p> </li> <li> <p>APPIUM_PYTHON: The Appium Python type.</p> </li> <li> <p>APPIUM_NODE: The Appium Node.js type.</p> </li> <li> <p>APPIUM_RUBY: The Appium Ruby type.</p> </li> <li> <p>APPIUM_WEB_JAVA_JUNIT: The Appium Java JUnit type for web apps.</p> </li> <li> <p>APPIUM_WEB_JAVA_TESTNG: The Appium Java TestNG type for web apps.</p> </li> <li> <p>APPIUM_WEB_PYTHON: The Appium Python type for web apps.</p> </li> <li> <p>APPIUM_WEB_NODE: The Appium Node.js type for web apps.</p> </li> <li> <p>APPIUM_WEB_RUBY: The Appium Ruby type for web apps.</p> </li> <li> <p>CALABASH: The Calabash type.</p> </li> <li> <p>INSTRUMENTATION: The Instrumentation type.</p> </li> <li> <p>UIAUTOMATION: The uiautomation type.</p> </li> <li> <p>UIAUTOMATOR: The uiautomator type.</p> </li> <li> <p>XCTEST: The Xcode test type.</p> </li> <li> <p>XCTEST_UI: The Xcode UI test type.</p> </li> </ul>"
+          "documentation":"<p>The test's type.</p> <p>Must be one of the following values:</p> <ul> <li> <p>BUILTIN_FUZZ</p> </li> <li> <p>BUILTIN_EXPLORER. For Android, an app explorer that traverses an Android app, interacting with it and capturing screenshots at the same time.</p> </li> <li> <p>APPIUM_JAVA_JUNIT</p> </li> <li> <p>APPIUM_JAVA_TESTNG</p> </li> <li> <p>APPIUM_PYTHON</p> </li> <li> <p>APPIUM_NODE</p> </li> <li> <p>APPIUM_RUBY</p> </li> <li> <p>APPIUM_WEB_JAVA_JUNIT</p> </li> <li> <p>APPIUM_WEB_JAVA_TESTNG</p> </li> <li> <p>APPIUM_WEB_PYTHON</p> </li> <li> <p>APPIUM_WEB_NODE</p> </li> <li> <p>APPIUM_WEB_RUBY</p> </li> <li> <p>CALABASH</p> </li> <li> <p>INSTRUMENTATION</p> </li> <li> <p>UIAUTOMATION</p> </li> <li> <p>UIAUTOMATOR</p> </li> <li> <p>XCTEST</p> </li> <li> <p>XCTEST_UI</p> </li> </ul>"
         },
         "testPackageArn":{
           "shape":"AmazonResourceName",
-          "documentation":"<p>The ARN of the uploaded test that will be run.</p>"
+          "documentation":"<p>The ARN of the uploaded test to be run.</p>"
         },
         "testSpecArn":{
           "shape":"AmazonResourceName",
@@ -4190,10 +4644,10 @@
         },
         "parameters":{
           "shape":"TestParameters",
-          "documentation":"<p>The test's parameters, such as test framework parameters and fixture settings. Parameters are represented by name-value pairs of strings.</p> <p>For all tests:</p> <ul> <li> <p>app_performance_monitoring: Performance monitoring is enabled by default. Set this parameter to \"false\" to disable it.</p> </li> </ul> <p>For Calabash tests:</p> <ul> <li> <p>profile: A cucumber profile, for example, \"my_profile_name\".</p> </li> <li> <p>tags: You can limit execution to features or scenarios that have (or don't have) certain tags, for example, \"@smoke\" or \"@smoke,~@wip\".</p> </li> </ul> <p>For Appium tests (all types):</p> <ul> <li> <p>appium_version: The Appium version. Currently supported values are \"1.6.5\" (and higher), \"latest\", and \"default\".</p> <ul> <li> <p>“latest” will run the latest Appium version supported by Device Farm (1.9.1).</p> </li> <li> <p>For “default”, Device Farm will choose a compatible version of Appium for the device. The current behavior is to run 1.7.2 on Android devices and iOS 9 and earlier, 1.7.2 for iOS 10 and later.</p> </li> <li> <p>This behavior is subject to change.</p> </li> </ul> </li> </ul> <p>For Fuzz tests (Android only):</p> <ul> <li> <p>event_count: The number of events, between 1 and 10000, that the UI fuzz test should perform.</p> </li> <li> <p>throttle: The time, in ms, between 0 and 1000, that the UI fuzz test should wait between events.</p> </li> <li> <p>seed: A seed to use for randomizing the UI fuzz test. Using the same seed value between tests ensures identical event sequences.</p> </li> </ul> <p>For Explorer tests:</p> <ul> <li> <p>username: A username to use if the Explorer encounters a login form. If not supplied, no username will be inserted.</p> </li> <li> <p>password: A password to use if the Explorer encounters a login form. If not supplied, no password will be inserted.</p> </li> </ul> <p>For Instrumentation:</p> <ul> <li> <p>filter: A test filter string. Examples:</p> <ul> <li> <p>Running a single test case: \"com.android.abc.Test1\"</p> </li> <li> <p>Running a single test: \"com.android.abc.Test1#smoke\"</p> </li> <li> <p>Running multiple tests: \"com.android.abc.Test1,com.android.abc.Test2\"</p> </li> </ul> </li> </ul> <p>For XCTest and XCTestUI:</p> <ul> <li> <p>filter: A test filter string. Examples:</p> <ul> <li> <p>Running a single test class: \"LoginTests\"</p> </li> <li> <p>Running a multiple test classes: \"LoginTests,SmokeTests\"</p> </li> <li> <p>Running a single test: \"LoginTests/testValid\"</p> </li> <li> <p>Running multiple tests: \"LoginTests/testValid,LoginTests/testInvalid\"</p> </li> </ul> </li> </ul> <p>For UIAutomator:</p> <ul> <li> <p>filter: A test filter string. Examples:</p> <ul> <li> <p>Running a single test case: \"com.android.abc.Test1\"</p> </li> <li> <p>Running a single test: \"com.android.abc.Test1#smoke\"</p> </li> <li> <p>Running multiple tests: \"com.android.abc.Test1,com.android.abc.Test2\"</p> </li> </ul> </li> </ul>"
+          "documentation":"<p>The test's parameters, such as test framework parameters and fixture settings. Parameters are represented by name-value pairs of strings.</p> <p>For all tests:</p> <ul> <li> <p> <code>app_performance_monitoring</code>: Performance monitoring is enabled by default. Set this parameter to false to disable it.</p> </li> </ul> <p>For Calabash tests:</p> <ul> <li> <p>profile: A cucumber profile (for example, <code>my_profile_name</code>).</p> </li> <li> <p>tags: You can limit execution to features or scenarios that have (or don't have) certain tags (for example, @smoke or @smoke,~@wip).</p> </li> </ul> <p>For Appium tests (all types):</p> <ul> <li> <p>appium_version: The Appium version. Currently supported values are 1.6.5 (and later), latest, and default.</p> <ul> <li> <p>latest runs the latest Appium version supported by Device Farm (1.9.1).</p> </li> <li> <p>For default, Device Farm selects a compatible version of Appium for the device. The current behavior is to run 1.7.2 on Android devices and iOS 9 and earlier and 1.7.2 for iOS 10 and later.</p> </li> <li> <p>This behavior is subject to change.</p> </li> </ul> </li> </ul> <p>For fuzz tests (Android only):</p> <ul> <li> <p>event_count: The number of events, between 1 and 10000, that the UI fuzz test should perform.</p> </li> <li> <p>throttle: The time, in ms, between 0 and 1000, that the UI fuzz test should wait between events.</p> </li> <li> <p>seed: A seed to use for randomizing the UI fuzz test. Using the same seed value between tests ensures identical event sequences.</p> </li> </ul> <p>For Explorer tests:</p> <ul> <li> <p>username: A user name to use if the Explorer encounters a login form. If not supplied, no user name is inserted.</p> </li> <li> <p>password: A password to use if the Explorer encounters a login form. If not supplied, no password is inserted.</p> </li> </ul> <p>For Instrumentation:</p> <ul> <li> <p>filter: A test filter string. Examples:</p> <ul> <li> <p>Running a single test case: <code>com.android.abc.Test1</code> </p> </li> <li> <p>Running a single test: <code>com.android.abc.Test1#smoke</code> </p> </li> <li> <p>Running multiple tests: <code>com.android.abc.Test1,com.android.abc.Test2</code> </p> </li> </ul> </li> </ul> <p>For XCTest and XCTestUI:</p> <ul> <li> <p>filter: A test filter string. Examples:</p> <ul> <li> <p>Running a single test class: <code>LoginTests</code> </p> </li> <li> <p>Running a multiple test classes: <code>LoginTests,SmokeTests</code> </p> </li> <li> <p>Running a single test: <code>LoginTests/testValid</code> </p> </li> <li> <p>Running multiple tests: <code>LoginTests/testValid,LoginTests/testInvalid</code> </p> </li> </ul> </li> </ul> <p>For UIAutomator:</p> <ul> <li> <p>filter: A test filter string. Examples:</p> <ul> <li> <p>Running a single test case: <code>com.android.abc.Test1</code> </p> </li> <li> <p>Running a single test: <code>com.android.abc.Test1#smoke</code> </p> </li> <li> <p>Running multiple tests: <code>com.android.abc.Test1,com.android.abc.Test2</code> </p> </li> </ul> </li> </ul>"
         }
       },
-      "documentation":"<p>Represents test settings. This data structure is passed in as the \"test\" parameter to ScheduleRun. For an example of the JSON request syntax, see <a>ScheduleRun</a>.</p>"
+      "documentation":"<p>Represents test settings. This data structure is passed in as the test parameter to ScheduleRun. For an example of the JSON request syntax, see <a>ScheduleRun</a>.</p>"
     },
     "ServiceAccountException":{
       "type":"structure",
@@ -4223,7 +4677,7 @@
       "members":{
         "arn":{
           "shape":"AmazonResourceName",
-          "documentation":"<p>Represents the Amazon Resource Name (ARN) of the Device Farm job you wish to stop.</p>"
+          "documentation":"<p>Represents the Amazon Resource Name (ARN) of the Device Farm job to stop.</p>"
         }
       }
     },
@@ -4242,7 +4696,7 @@
       "members":{
         "arn":{
           "shape":"AmazonResourceName",
-          "documentation":"<p>The Amazon Resource Name (ARN) of the remote access session you wish to stop.</p>"
+          "documentation":"<p>The Amazon Resource Name (ARN) of the remote access session to stop.</p>"
         }
       },
       "documentation":"<p>Represents the request to stop the remote access session.</p>"
@@ -4252,7 +4706,7 @@
       "members":{
         "remoteAccessSession":{
           "shape":"RemoteAccessSession",
-          "documentation":"<p>A container representing the metadata from the service about the remote access session you are stopping.</p>"
+          "documentation":"<p>A container that represents the metadata from the service about the remote access session you are stopping.</p>"
         }
       },
       "documentation":"<p>Represents the response from the server that describes the remote access session when AWS Device Farm stops the session.</p>"
@@ -4263,7 +4717,7 @@
       "members":{
         "arn":{
           "shape":"AmazonResourceName",
-          "documentation":"<p>Represents the Amazon Resource Name (ARN) of the Device Farm run you wish to stop.</p>"
+          "documentation":"<p>Represents the Amazon Resource Name (ARN) of the Device Farm run to stop.</p>"
         }
       },
       "documentation":"<p>Represents the request to stop a specific run.</p>"
@@ -4292,7 +4746,7 @@
         },
         "type":{
           "shape":"TestType",
-          "documentation":"<p>The suite's type.</p> <p>Must be one of the following values:</p> <ul> <li> <p>BUILTIN_FUZZ: The built-in fuzz type.</p> </li> <li> <p>BUILTIN_EXPLORER: For Android, an app explorer that will traverse an Android app, interacting with it and capturing screenshots at the same time.</p> </li> <li> <p>APPIUM_JAVA_JUNIT: The Appium Java JUnit type.</p> </li> <li> <p>APPIUM_JAVA_TESTNG: The Appium Java TestNG type.</p> </li> <li> <p>APPIUM_PYTHON: The Appium Python type.</p> </li> <li> <p>APPIUM_NODE: The Appium Node.js type.</p> </li> <li> <p>APPIUM_RUBY: The Appium Ruby type.</p> </li> <li> <p>APPIUM_WEB_JAVA_JUNIT: The Appium Java JUnit type for web apps.</p> </li> <li> <p>APPIUM_WEB_JAVA_TESTNG: The Appium Java TestNG type for web apps.</p> </li> <li> <p>APPIUM_WEB_PYTHON: The Appium Python type for web apps.</p> </li> <li> <p>APPIUM_WEB_NODE: The Appium Node.js type for web apps.</p> </li> <li> <p>APPIUM_WEB_RUBY: The Appium Ruby type for web apps.</p> </li> <li> <p>CALABASH: The Calabash type.</p> </li> <li> <p>INSTRUMENTATION: The Instrumentation type.</p> </li> <li> <p>UIAUTOMATION: The uiautomation type.</p> </li> <li> <p>UIAUTOMATOR: The uiautomator type.</p> </li> <li> <p>XCTEST: The Xcode test type.</p> </li> <li> <p>XCTEST_UI: The Xcode UI test type.</p> </li> </ul>"
+          "documentation":"<p>The suite's type.</p> <p>Must be one of the following values:</p> <ul> <li> <p>BUILTIN_FUZZ</p> </li> <li> <p>BUILTIN_EXPLORER </p> <note> <p>Only available for Android; an app explorer that traverses an Android app, interacting with it and capturing screenshots at the same time.</p> </note> </li> <li> <p>APPIUM_JAVA_JUNIT</p> </li> <li> <p>APPIUM_JAVA_TESTNG</p> </li> <li> <p>APPIUM_PYTHON</p> </li> <li> <p>APPIUM_NODE</p> </li> <li> <p>APPIUM_RUBY</p> </li> <li> <p>APPIUM_WEB_JAVA_JUNIT</p> </li> <li> <p>APPIUM_WEB_JAVA_TESTNG</p> </li> <li> <p>APPIUM_WEB_PYTHON</p> </li> <li> <p>APPIUM_WEB_NODE</p> </li> <li> <p>APPIUM_WEB_RUBY</p> </li> <li> <p>CALABASH</p> </li> <li> <p>INSTRUMENTATION</p> </li> <li> <p>UIAUTOMATION</p> </li> <li> <p>UIAUTOMATOR</p> </li> <li> <p>XCTEST</p> </li> <li> <p>XCTEST_UI</p> </li> </ul>"
         },
         "created":{
           "shape":"DateTime",
@@ -4300,11 +4754,11 @@
         },
         "status":{
           "shape":"ExecutionStatus",
-          "documentation":"<p>The suite's status.</p> <p>Allowed values include:</p> <ul> <li> <p>PENDING: A pending status.</p> </li> <li> <p>PENDING_CONCURRENCY: A pending concurrency status.</p> </li> <li> <p>PENDING_DEVICE: A pending device status.</p> </li> <li> <p>PROCESSING: A processing status.</p> </li> <li> <p>SCHEDULING: A scheduling status.</p> </li> <li> <p>PREPARING: A preparing status.</p> </li> <li> <p>RUNNING: A running status.</p> </li> <li> <p>COMPLETED: A completed status.</p> </li> <li> <p>STOPPING: A stopping status.</p> </li> </ul>"
+          "documentation":"<p>The suite's status.</p> <p>Allowed values include:</p> <ul> <li> <p>PENDING</p> </li> <li> <p>PENDING_CONCURRENCY</p> </li> <li> <p>PENDING_DEVICE</p> </li> <li> <p>PROCESSING</p> </li> <li> <p>SCHEDULING</p> </li> <li> <p>PREPARING</p> </li> <li> <p>RUNNING</p> </li> <li> <p>COMPLETED</p> </li> <li> <p>STOPPING</p> </li> </ul>"
         },
         "result":{
           "shape":"ExecutionResult",
-          "documentation":"<p>The suite's result.</p> <p>Allowed values include:</p> <ul> <li> <p>PENDING: A pending condition.</p> </li> <li> <p>PASSED: A passing condition.</p> </li> <li> <p>WARNED: A warning condition.</p> </li> <li> <p>FAILED: A failed condition.</p> </li> <li> <p>SKIPPED: A skipped condition.</p> </li> <li> <p>ERRORED: An error condition.</p> </li> <li> <p>STOPPED: A stopped condition.</p> </li> </ul>"
+          "documentation":"<p>The suite's result.</p> <p>Allowed values include:</p> <ul> <li> <p>PENDING</p> </li> <li> <p>PASSED</p> </li> <li> <p>WARNED</p> </li> <li> <p>FAILED</p> </li> <li> <p>SKIPPED</p> </li> <li> <p>ERRORED</p> </li> <li> <p>STOPPED</p> </li> </ul>"
         },
         "started":{
           "shape":"DateTime",
@@ -4342,14 +4796,14 @@
       "members":{
         "Key":{
           "shape":"TagKey",
-          "documentation":"<p>One part of a key-value pair that make up a tag. A <code>key</code> is a general label that acts like a category for more specific tag values.</p>"
+          "documentation":"<p>One part of a key-value pair that makes up a tag. A <code>key</code> is a general label that acts like a category for more specific tag values.</p>"
         },
         "Value":{
           "shape":"TagValue",
-          "documentation":"<p>The optional part of a key-value pair that make up a tag. A <code>value</code> acts as a descriptor within a tag category (key).</p>"
+          "documentation":"<p>The optional part of a key-value pair that makes up a tag. A <code>value</code> acts as a descriptor in a tag category (key).</p>"
         }
       },
-      "documentation":"<p>The metadata that you apply to a resource to help you categorize and organize it. Each tag consists of a key and an optional value, both of which you define. Tag keys can have a maximum character length of 128 characters, and tag values can have a maximum length of 256 characters. </p>"
+      "documentation":"<p>The metadata that you apply to a resource to help you categorize and organize it. Each tag consists of a key and an optional value, both of which you define. Tag keys can have a maximum character length of 128 characters. Tag values can have a maximum length of 256 characters. </p>"
     },
     "TagKey":{
       "type":"string",
@@ -4392,12 +4846,12 @@
       ],
       "members":{
         "ResourceARN":{
-          "shape":"AmazonResourceName",
-          "documentation":"<p>The Amazon Resource Name (ARN) of the resource(s) to which to add tags. You can associate tags with the following Device Farm resources: <code>PROJECT</code>, <code>RUN</code>, <code>NETWORK_PROFILE</code>, <code>INSTANCE_PROFILE</code>, <code>DEVICE_INSTANCE</code>, <code>SESSION</code>, <code>DEVICE_POOL</code>, <code>DEVICE</code>, and <code>VPCE_CONFIGURATION</code>.</p>"
+          "shape":"DeviceFarmArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the resource or resources to which to add tags. You can associate tags with the following Device Farm resources: <code>PROJECT</code>, <code>RUN</code>, <code>NETWORK_PROFILE</code>, <code>INSTANCE_PROFILE</code>, <code>DEVICE_INSTANCE</code>, <code>SESSION</code>, <code>DEVICE_POOL</code>, <code>DEVICE</code>, and <code>VPCE_CONFIGURATION</code>.</p>"
         },
         "Tags":{
           "shape":"TagList",
-          "documentation":"<p>The tags to add to the resource. A tag is an array of key-value pairs. Tag keys can have a maximum character length of 128 characters, and tag values can have a maximum length of 256 characters.</p>"
+          "documentation":"<p>The tags to add to the resource. A tag is an array of key-value pairs. Tag keys can have a maximum character length of 128 characters. Tag values can have a maximum length of 256 characters.</p>"
         }
       }
     },
@@ -4424,7 +4878,7 @@
         },
         "type":{
           "shape":"TestType",
-          "documentation":"<p>The test's type.</p> <p>Must be one of the following values:</p> <ul> <li> <p>BUILTIN_FUZZ: The built-in fuzz type.</p> </li> <li> <p>BUILTIN_EXPLORER: For Android, an app explorer that will traverse an Android app, interacting with it and capturing screenshots at the same time.</p> </li> <li> <p>APPIUM_JAVA_JUNIT: The Appium Java JUnit type.</p> </li> <li> <p>APPIUM_JAVA_TESTNG: The Appium Java TestNG type.</p> </li> <li> <p>APPIUM_PYTHON: The Appium Python type.</p> </li> <li> <p>APPIUM_NODE: The Appium Node.js type.</p> </li> <li> <p>APPIUM_RUBY: The Appium Ruby type.</p> </li> <li> <p>APPIUM_WEB_JAVA_JUNIT: The Appium Java JUnit type for web apps.</p> </li> <li> <p>APPIUM_WEB_JAVA_TESTNG: The Appium Java TestNG type for web apps.</p> </li> <li> <p>APPIUM_WEB_PYTHON: The Appium Python type for web apps.</p> </li> <li> <p>APPIUM_WEB_NODE: The Appium Node.js type for web apps.</p> </li> <li> <p>APPIUM_WEB_RUBY: The Appium Ruby type for web apps.</p> </li> <li> <p>CALABASH: The Calabash type.</p> </li> <li> <p>INSTRUMENTATION: The Instrumentation type.</p> </li> <li> <p>UIAUTOMATION: The uiautomation type.</p> </li> <li> <p>UIAUTOMATOR: The uiautomator type.</p> </li> <li> <p>XCTEST: The Xcode test type.</p> </li> <li> <p>XCTEST_UI: The Xcode UI test type.</p> </li> </ul>"
+          "documentation":"<p>The test's type.</p> <p>Must be one of the following values:</p> <ul> <li> <p>BUILTIN_FUZZ</p> </li> <li> <p>BUILTIN_EXPLORER</p> <note> <p>For Android, an app explorer that traverses an Android app, interacting with it and capturing screenshots at the same time.</p> </note> </li> <li> <p>APPIUM_JAVA_JUNIT</p> </li> <li> <p>APPIUM_JAVA_TESTNG</p> </li> <li> <p>APPIUM_PYTHON</p> </li> <li> <p>APPIUM_NODE</p> </li> <li> <p>APPIUM_RUBY</p> </li> <li> <p>APPIUM_WEB_JAVA_JUNIT</p> </li> <li> <p>APPIUM_WEB_JAVA_TESTNG</p> </li> <li> <p>APPIUM_WEB_PYTHON</p> </li> <li> <p>APPIUM_WEB_NODE</p> </li> <li> <p>APPIUM_WEB_RUBY</p> </li> <li> <p>CALABASH</p> </li> <li> <p>INSTRUMENTATION</p> </li> <li> <p>UIAUTOMATION</p> </li> <li> <p>UIAUTOMATOR</p> </li> <li> <p>XCTEST</p> </li> <li> <p>XCTEST_UI</p> </li> </ul>"
         },
         "created":{
           "shape":"DateTime",
@@ -4432,11 +4886,11 @@
         },
         "status":{
           "shape":"ExecutionStatus",
-          "documentation":"<p>The test's status.</p> <p>Allowed values include:</p> <ul> <li> <p>PENDING: A pending status.</p> </li> <li> <p>PENDING_CONCURRENCY: A pending concurrency status.</p> </li> <li> <p>PENDING_DEVICE: A pending device status.</p> </li> <li> <p>PROCESSING: A processing status.</p> </li> <li> <p>SCHEDULING: A scheduling status.</p> </li> <li> <p>PREPARING: A preparing status.</p> </li> <li> <p>RUNNING: A running status.</p> </li> <li> <p>COMPLETED: A completed status.</p> </li> <li> <p>STOPPING: A stopping status.</p> </li> </ul>"
+          "documentation":"<p>The test's status.</p> <p>Allowed values include:</p> <ul> <li> <p>PENDING</p> </li> <li> <p>PENDING_CONCURRENCY</p> </li> <li> <p>PENDING_DEVICE</p> </li> <li> <p>PROCESSING</p> </li> <li> <p>SCHEDULING</p> </li> <li> <p>PREPARING</p> </li> <li> <p>RUNNING</p> </li> <li> <p>COMPLETED</p> </li> <li> <p>STOPPING</p> </li> </ul>"
         },
         "result":{
           "shape":"ExecutionResult",
-          "documentation":"<p>The test's result.</p> <p>Allowed values include:</p> <ul> <li> <p>PENDING: A pending condition.</p> </li> <li> <p>PASSED: A passing condition.</p> </li> <li> <p>WARNED: A warning condition.</p> </li> <li> <p>FAILED: A failed condition.</p> </li> <li> <p>SKIPPED: A skipped condition.</p> </li> <li> <p>ERRORED: An error condition.</p> </li> <li> <p>STOPPED: A stopped condition.</p> </li> </ul>"
+          "documentation":"<p>The test's result.</p> <p>Allowed values include:</p> <ul> <li> <p>PENDING</p> </li> <li> <p>PASSED</p> </li> <li> <p>WARNED</p> </li> <li> <p>FAILED</p> </li> <li> <p>SKIPPED</p> </li> <li> <p>ERRORED</p> </li> <li> <p>STOPPED</p> </li> </ul>"
         },
         "started":{
           "shape":"DateTime",
@@ -4461,6 +4915,146 @@
       },
       "documentation":"<p>Represents a condition that is evaluated.</p>"
     },
+    "TestGridProject":{
+      "type":"structure",
+      "members":{
+        "arn":{
+          "shape":"DeviceFarmArn",
+          "documentation":"<p>The ARN for the project.</p>"
+        },
+        "name":{
+          "shape":"String",
+          "documentation":"<p>A human-readable name for the project.</p>"
+        },
+        "description":{
+          "shape":"String",
+          "documentation":"<p>A human-readable description for the project.</p>"
+        },
+        "created":{
+          "shape":"DateTime",
+          "documentation":"<p>When the project was created.</p>"
+        }
+      },
+      "documentation":"<p>A Selenium testing project. Projects are used to collect and collate sessions.</p>"
+    },
+    "TestGridProjects":{
+      "type":"list",
+      "member":{"shape":"TestGridProject"}
+    },
+    "TestGridSession":{
+      "type":"structure",
+      "members":{
+        "arn":{
+          "shape":"DeviceFarmArn",
+          "documentation":"<p>The ARN of the session.</p>"
+        },
+        "status":{
+          "shape":"TestGridSessionStatus",
+          "documentation":"<p>The state of the session.</p>"
+        },
+        "created":{
+          "shape":"DateTime",
+          "documentation":"<p>The time that the session was started.</p>"
+        },
+        "ended":{
+          "shape":"DateTime",
+          "documentation":"<p>The time the session ended.</p>"
+        },
+        "billingMinutes":{
+          "shape":"Double",
+          "documentation":"<p>The number of billed minutes that were used for this session. </p>"
+        },
+        "seleniumProperties":{
+          "shape":"String",
+          "documentation":"<p>A JSON object of options and parameters passed to the Selenium WebDriver.</p>"
+        }
+      },
+      "documentation":"<p>A <a>TestGridSession</a> is a single instance of a browser launched from the URL provided by a call to <a>CreateTestGridUrl</a>.</p>"
+    },
+    "TestGridSessionAction":{
+      "type":"structure",
+      "members":{
+        "action":{
+          "shape":"String",
+          "documentation":"<p>The action taken by the session.</p>"
+        },
+        "started":{
+          "shape":"DateTime",
+          "documentation":"<p>The time that the session invoked the action.</p>"
+        },
+        "duration":{
+          "shape":"Long",
+          "documentation":"<p>The time, in milliseconds, that the action took to complete in the browser.</p>"
+        },
+        "statusCode":{
+          "shape":"String",
+          "documentation":"<p>HTTP status code returned to the browser when the action was taken.</p>"
+        },
+        "requestMethod":{
+          "shape":"String",
+          "documentation":"<p>HTTP method that the browser used to make the request.</p>"
+        }
+      },
+      "documentation":"<p>An action taken by a <a>TestGridSession</a> browser instance.</p>"
+    },
+    "TestGridSessionActions":{
+      "type":"list",
+      "member":{"shape":"TestGridSessionAction"}
+    },
+    "TestGridSessionArtifact":{
+      "type":"structure",
+      "members":{
+        "filename":{
+          "shape":"String",
+          "documentation":"<p>The file name of the artifact.</p>"
+        },
+        "type":{
+          "shape":"TestGridSessionArtifactType",
+          "documentation":"<p>The kind of artifact.</p>"
+        },
+        "url":{
+          "shape":"String",
+          "documentation":"<p>A semi-stable URL to the content of the object.</p>"
+        }
+      },
+      "documentation":"<p>Artifacts are video and other files that are produced in the process of running a browser in an automated context. </p> <note> <p>Video elements might be broken up into multiple artifacts as they grow in size during creation. </p> </note>"
+    },
+    "TestGridSessionArtifactCategory":{
+      "type":"string",
+      "enum":[
+        "VIDEO",
+        "LOG"
+      ]
+    },
+    "TestGridSessionArtifactType":{
+      "type":"string",
+      "enum":[
+        "UNKNOWN",
+        "VIDEO",
+        "SELENIUM_LOG"
+      ]
+    },
+    "TestGridSessionArtifacts":{
+      "type":"list",
+      "member":{"shape":"TestGridSessionArtifact"}
+    },
+    "TestGridSessionStatus":{
+      "type":"string",
+      "enum":[
+        "ACTIVE",
+        "CLOSED",
+        "ERRORED"
+      ]
+    },
+    "TestGridSessions":{
+      "type":"list",
+      "member":{"shape":"TestGridSession"}
+    },
+    "TestGridUrlExpiresInSecondsInput":{
+      "type":"integer",
+      "max":86400,
+      "min":60
+    },
     "TestParameters":{
       "type":"map",
       "key":{"shape":"String"},
@@ -4559,8 +5153,8 @@
       ],
       "members":{
         "ResourceARN":{
-          "shape":"AmazonResourceName",
-          "documentation":"<p>The Amazon Resource Name (ARN) of the resource(s) from which to delete tags. You can associate tags with the following Device Farm resources: <code>PROJECT</code>, <code>RUN</code>, <code>NETWORK_PROFILE</code>, <code>INSTANCE_PROFILE</code>, <code>DEVICE_INSTANCE</code>, <code>SESSION</code>, <code>DEVICE_POOL</code>, <code>DEVICE</code>, and <code>VPCE_CONFIGURATION</code>.</p>"
+          "shape":"DeviceFarmArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the resource or resources from which to delete tags. You can associate tags with the following Device Farm resources: <code>PROJECT</code>, <code>RUN</code>, <code>NETWORK_PROFILE</code>, <code>INSTANCE_PROFILE</code>, <code>DEVICE_INSTANCE</code>, <code>SESSION</code>, <code>DEVICE_POOL</code>, <code>DEVICE</code>, and <code>VPCE_CONFIGURATION</code>.</p>"
         },
         "TagKeys":{
           "shape":"TagKeyList",
@@ -4583,7 +5177,7 @@
         },
         "profileArn":{
           "shape":"AmazonResourceName",
-          "documentation":"<p>The Amazon Resource Name (ARN) of the profile that you want to associate with the device instance.</p>"
+          "documentation":"<p>The ARN of the profile that you want to associate with the device instance.</p>"
         },
         "labels":{
           "shape":"InstanceLabels",
@@ -4596,7 +5190,7 @@
       "members":{
         "deviceInstance":{
           "shape":"DeviceInstance",
-          "documentation":"<p>An object containing information about your device instance.</p>"
+          "documentation":"<p>An object that contains information about your device instance.</p>"
         }
       }
     },
@@ -4606,19 +5200,19 @@
       "members":{
         "arn":{
           "shape":"AmazonResourceName",
-          "documentation":"<p>The Amazon Resource Name (ARN) of the Device Farm device pool you wish to update.</p>"
+          "documentation":"<p>The Amazon Resource Name (ARN) of the Device Farm device pool to update.</p>"
         },
         "name":{
           "shape":"Name",
-          "documentation":"<p>A string representing the name of the device pool you wish to update.</p>"
+          "documentation":"<p>A string that represents the name of the device pool to update.</p>"
         },
         "description":{
           "shape":"Message",
-          "documentation":"<p>A description of the device pool you wish to update.</p>"
+          "documentation":"<p>A description of the device pool to update.</p>"
         },
         "rules":{
           "shape":"Rules",
-          "documentation":"<p>Represents the rules you wish to modify for the device pool. Updating rules is optional; however, if you choose to update rules for your request, the update will replace the existing rules.</p>"
+          "documentation":"<p>Represents the rules to modify for the device pool. Updating rules is optional. If you update rules for your request, the update replaces the existing rules.</p>"
         },
         "maxDevices":{
           "shape":"Integer",
@@ -4626,7 +5220,7 @@
         },
         "clearMaxDevices":{
           "shape":"Boolean",
-          "documentation":"<p>Sets whether the <code>maxDevices</code> parameter applies to your device pool. If you set this parameter to <code>true</code>, the <code>maxDevices</code> parameter does not apply, and Device Farm does not limit the number of devices that it adds to your device pool. In this case, Device Farm adds all available devices that meet the criteria that are specified for the <code>rules</code> parameter.</p> <p>If you use this parameter in your request, you cannot use the <code>maxDevices</code> parameter in the same request.</p>"
+          "documentation":"<p>Sets whether the <code>maxDevices</code> parameter applies to your device pool. If you set this parameter to <code>true</code>, the <code>maxDevices</code> parameter does not apply, and Device Farm does not limit the number of devices that it adds to your device pool. In this case, Device Farm adds all available devices that meet the criteria specified in the <code>rules</code> parameter.</p> <p>If you use this parameter in your request, you cannot use the <code>maxDevices</code> parameter in the same request.</p>"
         }
       },
       "documentation":"<p>Represents a request to the update device pool operation.</p>"
@@ -4663,7 +5257,7 @@
         },
         "excludeAppPackagesFromCleanup":{
           "shape":"PackageIds",
-          "documentation":"<p>An array of strings specifying the list of app packages that should not be cleaned up from the device after a test run is over.</p> <p>The list of packages is only considered if you set <code>packageCleanup</code> to <code>true</code>.</p>"
+          "documentation":"<p>An array of strings that specifies the list of app packages that should not be cleaned up from the device after a test run is over.</p> <p>The list of packages is only considered if you set <code>packageCleanup</code> to <code>true</code>.</p>"
         },
         "rebootAfterUse":{
           "shape":"Boolean",
@@ -4676,7 +5270,7 @@
       "members":{
         "instanceProfile":{
           "shape":"InstanceProfile",
-          "documentation":"<p>An object containing information about your instance profile.</p>"
+          "documentation":"<p>An object that contains information about your instance profile.</p>"
         }
       }
     },
@@ -4698,7 +5292,7 @@
         },
         "type":{
           "shape":"NetworkProfileType",
-          "documentation":"<p>The type of network profile you wish to return information about. Valid values are listed below.</p>"
+          "documentation":"<p>The type of network profile to return information about. Valid values are listed here.</p>"
         },
         "uplinkBandwidthBits":{
           "shape":"Long",
@@ -4749,15 +5343,15 @@
       "members":{
         "arn":{
           "shape":"AmazonResourceName",
-          "documentation":"<p>The Amazon Resource Name (ARN) of the project whose name you wish to update.</p>"
+          "documentation":"<p>The Amazon Resource Name (ARN) of the project whose name to update.</p>"
         },
         "name":{
           "shape":"Name",
-          "documentation":"<p>A string representing the new name of the project that you are updating.</p>"
+          "documentation":"<p>A string that represents the new name of the project that you are updating.</p>"
         },
         "defaultJobTimeoutMinutes":{
           "shape":"JobTimeoutMinutes",
-          "documentation":"<p>The number of minutes a test run in the project will execute before it times out.</p>"
+          "documentation":"<p>The number of minutes a test run in the project executes before it times out.</p>"
         }
       },
       "documentation":"<p>Represents a request to the update project operation.</p>"
@@ -4767,11 +5361,38 @@
       "members":{
         "project":{
           "shape":"Project",
-          "documentation":"<p>The project you wish to update.</p>"
+          "documentation":"<p>The project to update.</p>"
         }
       },
       "documentation":"<p>Represents the result of an update project request.</p>"
     },
+    "UpdateTestGridProjectRequest":{
+      "type":"structure",
+      "required":["projectArn"],
+      "members":{
+        "projectArn":{
+          "shape":"DeviceFarmArn",
+          "documentation":"<p>ARN of the project to update.</p>"
+        },
+        "name":{
+          "shape":"ResourceName",
+          "documentation":"<p>Human-readable name for the project.</p>"
+        },
+        "description":{
+          "shape":"ResourceDescription",
+          "documentation":"<p>Human-readable description for the project.</p>"
+        }
+      }
+    },
+    "UpdateTestGridProjectResult":{
+      "type":"structure",
+      "members":{
+        "testGridProject":{
+          "shape":"TestGridProject",
+          "documentation":"<p>The project, including updated information.</p>"
+        }
+      }
+    },
     "UpdateUploadRequest":{
       "type":"structure",
       "required":["arn"],
@@ -4782,15 +5403,15 @@
         },
         "name":{
           "shape":"Name",
-          "documentation":"<p>The upload's test spec file name. The name should not contain the '/' character. The test spec file name must end with the <code>.yaml</code> or <code>.yml</code> file extension.</p>"
+          "documentation":"<p>The upload's test spec file name. The name must not contain any forward slashes (/). The test spec file name must end with the <code>.yaml</code> or <code>.yml</code> file extension.</p>"
         },
         "contentType":{
           "shape":"ContentType",
-          "documentation":"<p>The upload's content type (for example, \"application/x-yaml\").</p>"
+          "documentation":"<p>The upload's content type (for example, <code>application/x-yaml</code>).</p>"
         },
         "editContent":{
           "shape":"Boolean",
-          "documentation":"<p>Set to true if the YAML file has changed and needs to be updated; otherwise, set to false.</p>"
+          "documentation":"<p>Set to true if the YAML file has changed and must be updated. Otherwise, set to false.</p>"
         }
       }
     },
@@ -4813,19 +5434,19 @@
         },
         "vpceConfigurationName":{
           "shape":"VPCEConfigurationName",
-          "documentation":"<p>The friendly name you give to your VPC endpoint configuration, to manage your configurations more easily.</p>"
+          "documentation":"<p>The friendly name you give to your VPC endpoint configuration to manage your configurations more easily.</p>"
         },
         "vpceServiceName":{
           "shape":"VPCEServiceName",
-          "documentation":"<p>The name of the VPC endpoint service running inside your AWS account that you want Device Farm to test.</p>"
+          "documentation":"<p>The name of the VPC endpoint service running in your AWS account that you want Device Farm to test.</p>"
         },
         "serviceDnsName":{
           "shape":"ServiceDnsName",
-          "documentation":"<p>The DNS (domain) name used to connect to your private service in your Amazon VPC. The DNS name must not already be in use on the Internet.</p>"
+          "documentation":"<p>The DNS (domain) name used to connect to your private service in your VPC. The DNS name must not already be in use on the internet.</p>"
         },
         "vpceConfigurationDescription":{
           "shape":"VPCEConfigurationDescription",
-          "documentation":"<p>An optional description, providing more details about your VPC endpoint configuration.</p>"
+          "documentation":"<p>An optional description that provides details about your VPC endpoint configuration.</p>"
         }
       }
     },
@@ -4834,7 +5455,7 @@
       "members":{
         "vpceConfiguration":{
           "shape":"VPCEConfiguration",
-          "documentation":"<p>An object containing information about your VPC endpoint configuration.</p>"
+          "documentation":"<p>An object that contains information about your VPC endpoint configuration.</p>"
         }
       }
     },
@@ -4855,15 +5476,15 @@
         },
         "type":{
           "shape":"UploadType",
-          "documentation":"<p>The upload's type.</p> <p>Must be one of the following values:</p> <ul> <li> <p>ANDROID_APP: An Android upload.</p> </li> <li> <p>IOS_APP: An iOS upload.</p> </li> <li> <p>WEB_APP: A web application upload.</p> </li> <li> <p>EXTERNAL_DATA: An external data upload.</p> </li> <li> <p>APPIUM_JAVA_JUNIT_TEST_PACKAGE: An Appium Java JUnit test package upload.</p> </li> <li> <p>APPIUM_JAVA_TESTNG_TEST_PACKAGE: An Appium Java TestNG test package upload.</p> </li> <li> <p>APPIUM_PYTHON_TEST_PACKAGE: An Appium Python test package upload.</p> </li> <li> <p>APPIUM_NODE_TEST_PACKAGE: An Appium Node.js test package upload.</p> </li> <li> <p>APPIUM_RUBY_TEST_PACKAGE: An Appium Ruby test package upload.</p> </li> <li> <p>APPIUM_WEB_JAVA_JUNIT_TEST_PACKAGE: An Appium Java JUnit test package upload for web apps.</p> </li> <li> <p>APPIUM_WEB_JAVA_TESTNG_TEST_PACKAGE: An Appium Java TestNG test package upload for web apps.</p> </li> <li> <p>APPIUM_WEB_PYTHON_TEST_PACKAGE: An Appium Python test package upload for web apps.</p> </li> <li> <p>APPIUM_WEB_NODE_TEST_PACKAGE: An Appium Node.js test package upload for web apps.</p> </li> <li> <p>APPIUM_WEB_RUBY_TEST_PACKAGE: An Appium Ruby test package upload for web apps.</p> </li> <li> <p>CALABASH_TEST_PACKAGE: A Calabash test package upload.</p> </li> <li> <p>INSTRUMENTATION_TEST_PACKAGE: An instrumentation upload.</p> </li> <li> <p>UIAUTOMATION_TEST_PACKAGE: A uiautomation test package upload.</p> </li> <li> <p>UIAUTOMATOR_TEST_PACKAGE: A uiautomator test package upload.</p> </li> <li> <p>XCTEST_TEST_PACKAGE: An Xcode test package upload.</p> </li> <li> <p>XCTEST_UI_TEST_PACKAGE: An Xcode UI test package upload.</p> </li> <li> <p>APPIUM_JAVA_JUNIT_TEST_SPEC: An Appium Java JUnit test spec upload.</p> </li> <li> <p>APPIUM_JAVA_TESTNG_TEST_SPEC: An Appium Java TestNG test spec upload.</p> </li> <li> <p>APPIUM_PYTHON_TEST_SPEC: An Appium Python test spec upload.</p> </li> <li> <p>APPIUM_NODE_TEST_SPEC: An Appium Node.js test spec upload.</p> </li> <li> <p>APPIUM_RUBY_TEST_SPEC: An Appium Ruby test spec upload.</p> </li> <li> <p>APPIUM_WEB_JAVA_JUNIT_TEST_SPEC: An Appium Java JUnit test spec upload for a web app.</p> </li> <li> <p>APPIUM_WEB_JAVA_TESTNG_TEST_SPEC: An Appium Java TestNG test spec upload for a web app.</p> </li> <li> <p>APPIUM_WEB_PYTHON_TEST_SPEC: An Appium Python test spec upload for a web app.</p> </li> <li> <p>APPIUM_WEB_NODE_TEST_SPEC: An Appium Node.js test spec upload for a web app.</p> </li> <li> <p>APPIUM_WEB_RUBY_TEST_SPEC: An Appium Ruby test spec upload for a web app.</p> </li> <li> <p>INSTRUMENTATION_TEST_SPEC: An instrumentation test spec upload.</p> </li> <li> <p>XCTEST_UI_TEST_SPEC: An Xcode UI test spec upload.</p> </li> </ul>"
+          "documentation":"<p>The upload's type.</p> <p>Must be one of the following values:</p> <ul> <li> <p>ANDROID_APP</p> </li> <li> <p>IOS_APP</p> </li> <li> <p>WEB_APP</p> </li> <li> <p>EXTERNAL_DATA</p> </li> <li> <p>APPIUM_JAVA_JUNIT_TEST_PACKAGE</p> </li> <li> <p>APPIUM_JAVA_TESTNG_TEST_PACKAGE</p> </li> <li> <p>APPIUM_PYTHON_TEST_PACKAGE</p> </li> <li> <p>APPIUM_NODE_TEST_PACKAGE</p> </li> <li> <p>APPIUM_RUBY_TEST_PACKAGE</p> </li> <li> <p>APPIUM_WEB_JAVA_JUNIT_TEST_PACKAGE</p> </li> <li> <p>APPIUM_WEB_JAVA_TESTNG_TEST_PACKAGE</p> </li> <li> <p>APPIUM_WEB_PYTHON_TEST_PACKAGE</p> </li> <li> <p>APPIUM_WEB_NODE_TEST_PACKAGE</p> </li> <li> <p>APPIUM_WEB_RUBY_TEST_PACKAGE</p> </li> <li> <p>CALABASH_TEST_PACKAGE</p> </li> <li> <p>INSTRUMENTATION_TEST_PACKAGE</p> </li> <li> <p>UIAUTOMATION_TEST_PACKAGE</p> </li> <li> <p>UIAUTOMATOR_TEST_PACKAGE</p> </li> <li> <p>XCTEST_TEST_PACKAGE</p> </li> <li> <p>XCTEST_UI_TEST_PACKAGE</p> </li> <li> <p>APPIUM_JAVA_JUNIT_TEST_SPEC</p> </li> <li> <p>APPIUM_JAVA_TESTNG_TEST_SPEC</p> </li> <li> <p>APPIUM_PYTHON_TEST_SPEC</p> </li> <li> <p>APPIUM_NODE_TEST_SPEC</p> </li> <li> <p>APPIUM_RUBY_TEST_SPEC</p> </li> <li> <p>APPIUM_WEB_JAVA_JUNIT_TEST_SPEC</p> </li> <li> <p>APPIUM_WEB_JAVA_TESTNG_TEST_SPEC</p> </li> <li> <p>APPIUM_WEB_PYTHON_TEST_SPEC</p> </li> <li> <p>APPIUM_WEB_NODE_TEST_SPEC</p> </li> <li> <p>APPIUM_WEB_RUBY_TEST_SPEC</p> </li> <li> <p>INSTRUMENTATION_TEST_SPEC</p> </li> <li> <p>XCTEST_UI_TEST_SPEC</p> </li> </ul>"
         },
         "status":{
           "shape":"UploadStatus",
-          "documentation":"<p>The upload's status.</p> <p>Must be one of the following values:</p> <ul> <li> <p>FAILED: A failed status.</p> </li> <li> <p>INITIALIZED: An initialized status.</p> </li> <li> <p>PROCESSING: A processing status.</p> </li> <li> <p>SUCCEEDED: A succeeded status.</p> </li> </ul>"
+          "documentation":"<p>The upload's status.</p> <p>Must be one of the following values:</p> <ul> <li> <p>FAILED</p> </li> <li> <p>INITIALIZED</p> </li> <li> <p>PROCESSING</p> </li> <li> <p>SUCCEEDED</p> </li> </ul>"
         },
         "url":{
           "shape":"URL",
-          "documentation":"<p>The pre-signed Amazon S3 URL that was used to store a file through a corresponding PUT request.</p>"
+          "documentation":"<p>The presigned Amazon S3 URL that was used to store a file using a PUT request.</p>"
         },
         "metadata":{
           "shape":"Metadata",
@@ -4871,7 +5492,7 @@
         },
         "contentType":{
           "shape":"ContentType",
-          "documentation":"<p>The upload's content type (for example, \"application/octet-stream\").</p>"
+          "documentation":"<p>The upload's content type (for example, <code>application/octet-stream</code>).</p>"
         },
         "message":{
           "shape":"Message",
@@ -4950,11 +5571,11 @@
         },
         "vpceConfigurationName":{
           "shape":"VPCEConfigurationName",
-          "documentation":"<p>The friendly name you give to your VPC endpoint configuration, to manage your configurations more easily.</p>"
+          "documentation":"<p>The friendly name you give to your VPC endpoint configuration to manage your configurations more easily.</p>"
         },
         "vpceServiceName":{
           "shape":"VPCEServiceName",
-          "documentation":"<p>The name of the VPC endpoint service running inside your AWS account that you want Device Farm to test.</p>"
+          "documentation":"<p>The name of the VPC endpoint service running in your AWS account that you want Device Farm to test.</p>"
         },
         "serviceDnsName":{
           "shape":"ServiceDnsName",
@@ -4962,7 +5583,7 @@
         },
         "vpceConfigurationDescription":{
           "shape":"VPCEConfigurationDescription",
-          "documentation":"<p>An optional description, providing more details about your VPC endpoint configuration.</p>"
+          "documentation":"<p>An optional description that provides details about your VPC endpoint configuration.</p>"
         }
       },
       "documentation":"<p>Represents an Amazon Virtual Private Cloud (VPC) endpoint configuration.</p>"
@@ -4988,5 +5609,5 @@
     },
     "VideoCapture":{"type":"boolean"}
   },
-  "documentation":"<p>AWS Device Farm is a service that enables mobile app developers to test Android, iOS, and Fire OS apps on physical phones, tablets, and other devices in the cloud.</p>"
+  "documentation":"<p>Welcome to the AWS Device Farm API documentation, which contains APIs for:</p> <ul> <li> <p>Testing on desktop browsers</p> <p> Device Farm makes it possible for you to test your web applications on desktop browsers using Selenium. The APIs for desktop browser testing contain <code>TestGrid</code> in their names. For more information, see <a href=\"https://docs.aws.amazon.com/devicefarm/latest/testgrid/\">Testing Web Applications on Selenium with Device Farm</a>.</p> </li> <li> <p>Testing on real mobile devices</p> <p>Device Farm makes it possible for you to test apps on physical phones, tablets, and other devices in the cloud. For more information, see the <a href=\"https://docs.aws.amazon.com/devicefarm/latest/developerguide/\">Device Farm Developer Guide</a>.</p> </li> </ul>"
 }
diff --git a/services/devicefarm/src/test/resources/cucumber.properties b/services/devicefarm/src/test/resources/cucumber.properties
index 7132d4ec9017..0a04a0ff5d4f 100644
--- a/services/devicefarm/src/test/resources/cucumber.properties
+++ b/services/devicefarm/src/test/resources/cucumber.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/directconnect/build.properties b/services/directconnect/build.properties
index ecf2dae6fcb1..15ec2da1fc71 100644
--- a/services/directconnect/build.properties
+++ b/services/directconnect/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/directconnect/pom.xml b/services/directconnect/pom.xml
index c6cdf25cbd4f..89910c4f994e 100644
--- a/services/directconnect/pom.xml
+++ b/services/directconnect/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>directconnect</artifactId>
     <name>AWS Java SDK :: Services :: AWS Direct Connect</name>
diff --git a/services/directconnect/src/it/java/software/amazon/awssdk/services/directconnect/IntegrationTestBase.java b/services/directconnect/src/it/java/software/amazon/awssdk/services/directconnect/IntegrationTestBase.java
index a796c1b84923..0c3097a56254 100644
--- a/services/directconnect/src/it/java/software/amazon/awssdk/services/directconnect/IntegrationTestBase.java
+++ b/services/directconnect/src/it/java/software/amazon/awssdk/services/directconnect/IntegrationTestBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/directconnect/src/it/java/software/amazon/awssdk/services/directconnect/ServiceIntegrationTest.java b/services/directconnect/src/it/java/software/amazon/awssdk/services/directconnect/ServiceIntegrationTest.java
index c85e3370b1bf..29f58e3bf9cf 100644
--- a/services/directconnect/src/it/java/software/amazon/awssdk/services/directconnect/ServiceIntegrationTest.java
+++ b/services/directconnect/src/it/java/software/amazon/awssdk/services/directconnect/ServiceIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/directconnect/src/test/resources/cucumber.properties b/services/directconnect/src/test/resources/cucumber.properties
index b684c4def9ac..c3222229c19f 100644
--- a/services/directconnect/src/test/resources/cucumber.properties
+++ b/services/directconnect/src/test/resources/cucumber.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/directory/build.properties b/services/directory/build.properties
index ecf2dae6fcb1..15ec2da1fc71 100644
--- a/services/directory/build.properties
+++ b/services/directory/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/directory/pom.xml b/services/directory/pom.xml
index 4b50393c54ba..1ceb138a953b 100644
--- a/services/directory/pom.xml
+++ b/services/directory/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>directory</artifactId>
     <name>AWS Java SDK :: Services :: AWS Directory Service</name>
diff --git a/services/directory/src/it/java/software/amazon/awssdk/services/directory/IntegrationTestBase.java b/services/directory/src/it/java/software/amazon/awssdk/services/directory/IntegrationTestBase.java
index 3221db361095..3f99bc288418 100644
--- a/services/directory/src/it/java/software/amazon/awssdk/services/directory/IntegrationTestBase.java
+++ b/services/directory/src/it/java/software/amazon/awssdk/services/directory/IntegrationTestBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/directory/src/it/java/software/amazon/awssdk/services/directory/ServiceIntegrationTest.java b/services/directory/src/it/java/software/amazon/awssdk/services/directory/ServiceIntegrationTest.java
index 95f37c4522e7..3e80fa88a814 100644
--- a/services/directory/src/it/java/software/amazon/awssdk/services/directory/ServiceIntegrationTest.java
+++ b/services/directory/src/it/java/software/amazon/awssdk/services/directory/ServiceIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/directory/src/main/resources/codegen-resources/service-2.json b/services/directory/src/main/resources/codegen-resources/service-2.json
index 0b142fed02b6..6c4d33a016af 100644
--- a/services/directory/src/main/resources/codegen-resources/service-2.json
+++ b/services/directory/src/main/resources/codegen-resources/service-2.json
@@ -167,7 +167,7 @@
         {"shape":"ClientException"},
         {"shape":"ServiceException"}
       ],
-      "documentation":"<p>Creates a Simple AD directory.</p> <p>Before you call <code>CreateDirectory</code>, ensure that all of the required permissions have been explicitly granted through a policy. For details about what permissions are required to run the <code>CreateDirectory</code> operation, see <a href=\"http://docs.aws.amazon.com/directoryservice/latest/admin-guide/UsingWithDS_IAM_ResourcePermissions.html\">AWS Directory Service API Permissions: Actions, Resources, and Conditions Reference</a>.</p>"
+      "documentation":"<p>Creates a Simple AD directory. For more information, see <a href=\"https://docs.aws.amazon.com/directoryservice/latest/admin-guide/directory_simple_ad.html\">Simple Active Directory</a> in the <i>AWS Directory Service Admin Guide</i>.</p> <p>Before you call <code>CreateDirectory</code>, ensure that all of the required permissions have been explicitly granted through a policy. For details about what permissions are required to run the <code>CreateDirectory</code> operation, see <a href=\"http://docs.aws.amazon.com/directoryservice/latest/admin-guide/UsingWithDS_IAM_ResourcePermissions.html\">AWS Directory Service API Permissions: Actions, Resources, and Conditions Reference</a>.</p>"
     },
     "CreateLogSubscription":{
       "name":"CreateLogSubscription",
@@ -185,7 +185,7 @@
         {"shape":"ClientException"},
         {"shape":"ServiceException"}
       ],
-      "documentation":"<p>Creates a subscription to forward real time Directory Service domain controller security logs to the specified CloudWatch log group in your AWS account.</p>"
+      "documentation":"<p>Creates a subscription to forward real-time Directory Service domain controller security logs to the specified Amazon CloudWatch log group in your AWS account.</p>"
     },
     "CreateMicrosoftAD":{
       "name":"CreateMicrosoftAD",
@@ -202,7 +202,7 @@
         {"shape":"ServiceException"},
         {"shape":"UnsupportedOperationException"}
       ],
-      "documentation":"<p>Creates an AWS Managed Microsoft AD directory.</p> <p>Before you call <i>CreateMicrosoftAD</i>, ensure that all of the required permissions have been explicitly granted through a policy. For details about what permissions are required to run the <i>CreateMicrosoftAD</i> operation, see <a href=\"http://docs.aws.amazon.com/directoryservice/latest/admin-guide/UsingWithDS_IAM_ResourcePermissions.html\">AWS Directory Service API Permissions: Actions, Resources, and Conditions Reference</a>.</p>"
+      "documentation":"<p>Creates a Microsoft AD directory in the AWS Cloud. For more information, see <a href=\"https://docs.aws.amazon.com/directoryservice/latest/admin-guide/directory_microsoft_ad.html\">AWS Managed Microsoft AD</a> in the <i>AWS Directory Service Admin Guide</i>.</p> <p>Before you call <i>CreateMicrosoftAD</i>, ensure that all of the required permissions have been explicitly granted through a policy. For details about what permissions are required to run the <i>CreateMicrosoftAD</i> operation, see <a href=\"http://docs.aws.amazon.com/directoryservice/latest/admin-guide/UsingWithDS_IAM_ResourcePermissions.html\">AWS Directory Service API Permissions: Actions, Resources, and Conditions Reference</a>.</p>"
     },
     "CreateSnapshot":{
       "name":"CreateSnapshot",
@@ -321,6 +321,26 @@
       ],
       "documentation":"<p>Deletes an existing trust relationship between your AWS Managed Microsoft AD directory and an external domain.</p>"
     },
+    "DeregisterCertificate":{
+      "name":"DeregisterCertificate",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DeregisterCertificateRequest"},
+      "output":{"shape":"DeregisterCertificateResult"},
+      "errors":[
+        {"shape":"DirectoryUnavailableException"},
+        {"shape":"DirectoryDoesNotExistException"},
+        {"shape":"CertificateDoesNotExistException"},
+        {"shape":"CertificateInUseException"},
+        {"shape":"UnsupportedOperationException"},
+        {"shape":"InvalidParameterException"},
+        {"shape":"ClientException"},
+        {"shape":"ServiceException"}
+      ],
+      "documentation":"<p>Deletes from the system the certificate that was registered for a secured LDAP connection.</p>"
+    },
     "DeregisterEventTopic":{
       "name":"DeregisterEventTopic",
       "http":{
@@ -337,6 +357,24 @@
       ],
       "documentation":"<p>Removes the specified directory as a publisher to the specified SNS topic.</p>"
     },
+    "DescribeCertificate":{
+      "name":"DescribeCertificate",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DescribeCertificateRequest"},
+      "output":{"shape":"DescribeCertificateResult"},
+      "errors":[
+        {"shape":"DirectoryDoesNotExistException"},
+        {"shape":"UnsupportedOperationException"},
+        {"shape":"CertificateDoesNotExistException"},
+        {"shape":"InvalidParameterException"},
+        {"shape":"ClientException"},
+        {"shape":"ServiceException"}
+      ],
+      "documentation":"<p>Displays information about the certificate registered for a secured LDAP connection.</p>"
+    },
     "DescribeConditionalForwarders":{
       "name":"DescribeConditionalForwarders",
       "http":{
@@ -406,6 +444,24 @@
       ],
       "documentation":"<p>Obtains information about which SNS topics receive status messages from the specified directory.</p> <p>If no input parameters are provided, such as DirectoryId or TopicName, this request describes all of the associations in the account.</p>"
     },
+    "DescribeLDAPSSettings":{
+      "name":"DescribeLDAPSSettings",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DescribeLDAPSSettingsRequest"},
+      "output":{"shape":"DescribeLDAPSSettingsResult"},
+      "errors":[
+        {"shape":"DirectoryDoesNotExistException"},
+        {"shape":"UnsupportedOperationException"},
+        {"shape":"InvalidNextTokenException"},
+        {"shape":"InvalidParameterException"},
+        {"shape":"ClientException"},
+        {"shape":"ServiceException"}
+      ],
+      "documentation":"<p>Describes the status of LDAP security for the specified directory.</p>"
+    },
     "DescribeSharedDirectories":{
       "name":"DescribeSharedDirectories",
       "http":{
@@ -459,6 +515,25 @@
       ],
       "documentation":"<p>Obtains information about the trust relationships for this account.</p> <p>If no input parameters are provided, such as DirectoryId or TrustIds, this request describes all the trust relationships belonging to the account.</p>"
     },
+    "DisableLDAPS":{
+      "name":"DisableLDAPS",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DisableLDAPSRequest"},
+      "output":{"shape":"DisableLDAPSResult"},
+      "errors":[
+        {"shape":"DirectoryUnavailableException"},
+        {"shape":"DirectoryDoesNotExistException"},
+        {"shape":"InvalidLDAPSStatusException"},
+        {"shape":"UnsupportedOperationException"},
+        {"shape":"InvalidParameterException"},
+        {"shape":"ClientException"},
+        {"shape":"ServiceException"}
+      ],
+      "documentation":"<p>Deactivates LDAP secure calls for the specified directory.</p>"
+    },
     "DisableRadius":{
       "name":"DisableRadius",
       "http":{
@@ -491,6 +566,26 @@
       ],
       "documentation":"<p>Disables single-sign on for a directory.</p>"
     },
+    "EnableLDAPS":{
+      "name":"EnableLDAPS",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"EnableLDAPSRequest"},
+      "output":{"shape":"EnableLDAPSResult"},
+      "errors":[
+        {"shape":"DirectoryUnavailableException"},
+        {"shape":"DirectoryDoesNotExistException"},
+        {"shape":"NoAvailableCertificateException"},
+        {"shape":"InvalidLDAPSStatusException"},
+        {"shape":"UnsupportedOperationException"},
+        {"shape":"InvalidParameterException"},
+        {"shape":"ClientException"},
+        {"shape":"ServiceException"}
+      ],
+      "documentation":"<p>Activates the switch for the specific directory to always use LDAP secure calls.</p>"
+    },
     "EnableRadius":{
       "name":"EnableRadius",
       "http":{
@@ -523,7 +618,7 @@
         {"shape":"ClientException"},
         {"shape":"ServiceException"}
       ],
-      "documentation":"<p>Enables single sign-on for a directory.</p>"
+      "documentation":"<p>Enables single sign-on for a directory. Single sign-on allows users in your directory to access certain AWS services from a computer joined to the directory without having to enter their credentials separately.</p>"
     },
     "GetDirectoryLimits":{
       "name":"GetDirectoryLimits",
@@ -538,7 +633,7 @@
         {"shape":"ClientException"},
         {"shape":"ServiceException"}
       ],
-      "documentation":"<p>Obtains directory limit information for the current region.</p>"
+      "documentation":"<p>Obtains directory limit information for the current Region.</p>"
     },
     "GetSnapshotLimits":{
       "name":"GetSnapshotLimits",
@@ -555,6 +650,24 @@
       ],
       "documentation":"<p>Obtains the manual snapshot limits for a directory.</p>"
     },
+    "ListCertificates":{
+      "name":"ListCertificates",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"ListCertificatesRequest"},
+      "output":{"shape":"ListCertificatesResult"},
+      "errors":[
+        {"shape":"DirectoryDoesNotExistException"},
+        {"shape":"UnsupportedOperationException"},
+        {"shape":"InvalidParameterException"},
+        {"shape":"InvalidNextTokenException"},
+        {"shape":"ClientException"},
+        {"shape":"ServiceException"}
+      ],
+      "documentation":"<p>For the specified directory, lists all the certificates registered for a secured LDAP connection.</p>"
+    },
     "ListIpRoutes":{
       "name":"ListIpRoutes",
       "http":{
@@ -621,6 +734,27 @@
       ],
       "documentation":"<p>Lists all tags on a directory.</p>"
     },
+    "RegisterCertificate":{
+      "name":"RegisterCertificate",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"RegisterCertificateRequest"},
+      "output":{"shape":"RegisterCertificateResult"},
+      "errors":[
+        {"shape":"DirectoryUnavailableException"},
+        {"shape":"DirectoryDoesNotExistException"},
+        {"shape":"InvalidCertificateException"},
+        {"shape":"CertificateLimitExceededException"},
+        {"shape":"CertificateAlreadyExistsException"},
+        {"shape":"UnsupportedOperationException"},
+        {"shape":"InvalidParameterException"},
+        {"shape":"ClientException"},
+        {"shape":"ServiceException"}
+      ],
+      "documentation":"<p>Registers a certificate for secured LDAP connection.</p>"
+    },
     "RegisterEventTopic":{
       "name":"RegisterEventTopic",
       "http":{
@@ -704,7 +838,7 @@
         {"shape":"ClientException"},
         {"shape":"ServiceException"}
       ],
-      "documentation":"<p>Resets the password for any user in your AWS Managed Microsoft AD or Simple AD directory.</p>"
+      "documentation":"<p>Resets the password for any user in your AWS Managed Microsoft AD or Simple AD directory.</p> <p>You can reset the password for any user in your directory with the following exceptions:</p> <ul> <li> <p>For Simple AD, you cannot reset the password for any user that is a member of either the <b>Domain Admins</b> or <b>Enterprise Admins</b> group except for the administrator user.</p> </li> <li> <p>For AWS Managed Microsoft AD, you can only reset the password for a user that is in an OU based off of the NetBIOS name that you typed when you created your directory. For example, you cannot reset the password for a user in the <b>AWS Reserved</b> OU. For more information about the OU structure for an AWS Managed Microsoft AD directory, see <a href=\"https://docs.aws.amazon.com/directoryservice/latest/admin-guide/ms_ad_getting_started_what_gets_created.html\">What Gets Created</a> in the <i>AWS Directory Service Administration Guide</i>.</p> </li> </ul>"
     },
     "RestoreFromSnapshot":{
       "name":"RestoreFromSnapshot",
@@ -1020,6 +1154,122 @@
       "members":{
       }
     },
+    "Certificate":{
+      "type":"structure",
+      "members":{
+        "CertificateId":{
+          "shape":"CertificateId",
+          "documentation":"<p>The identifier of the certificate.</p>"
+        },
+        "State":{
+          "shape":"CertificateState",
+          "documentation":"<p>The state of the certificate.</p>"
+        },
+        "StateReason":{
+          "shape":"CertificateStateReason",
+          "documentation":"<p>Describes a state change for the certificate.</p>"
+        },
+        "CommonName":{
+          "shape":"CertificateCN",
+          "documentation":"<p>The common name for the certificate.</p>"
+        },
+        "RegisteredDateTime":{
+          "shape":"CertificateRegisteredDateTime",
+          "documentation":"<p>The date and time that the certificate was registered.</p>"
+        },
+        "ExpiryDateTime":{
+          "shape":"CertificateExpiryDateTime",
+          "documentation":"<p>The date and time when the certificate will expire.</p>"
+        }
+      },
+      "documentation":"<p>Information about the certificate.</p>"
+    },
+    "CertificateAlreadyExistsException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"ExceptionMessage"},
+        "RequestId":{"shape":"RequestId"}
+      },
+      "documentation":"<p>The certificate has already been registered into the system.</p>",
+      "exception":true
+    },
+    "CertificateCN":{"type":"string"},
+    "CertificateData":{
+      "type":"string",
+      "max":8192,
+      "min":1
+    },
+    "CertificateDoesNotExistException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"ExceptionMessage"},
+        "RequestId":{"shape":"RequestId"}
+      },
+      "documentation":"<p>The certificate is not present in the system for describe or deregister activities.</p>",
+      "exception":true
+    },
+    "CertificateExpiryDateTime":{"type":"timestamp"},
+    "CertificateId":{
+      "type":"string",
+      "pattern":"^c-[0-9a-f]{10}$"
+    },
+    "CertificateInUseException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"ExceptionMessage"},
+        "RequestId":{"shape":"RequestId"}
+      },
+      "documentation":"<p>The certificate is being used for the LDAP security connection and cannot be removed without disabling LDAP security.</p>",
+      "exception":true
+    },
+    "CertificateInfo":{
+      "type":"structure",
+      "members":{
+        "CertificateId":{
+          "shape":"CertificateId",
+          "documentation":"<p>The identifier of the certificate.</p>"
+        },
+        "CommonName":{
+          "shape":"CertificateCN",
+          "documentation":"<p>The common name for the certificate.</p>"
+        },
+        "State":{
+          "shape":"CertificateState",
+          "documentation":"<p>The state of the certificate.</p>"
+        },
+        "ExpiryDateTime":{
+          "shape":"CertificateExpiryDateTime",
+          "documentation":"<p>The date and time when the certificate will expire.</p>"
+        }
+      },
+      "documentation":"<p>Contains general information about a certificate.</p>"
+    },
+    "CertificateLimitExceededException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"ExceptionMessage"},
+        "RequestId":{"shape":"RequestId"}
+      },
+      "documentation":"<p>The certificate could not be added because the certificate limit has been reached.</p>",
+      "exception":true
+    },
+    "CertificateRegisteredDateTime":{"type":"timestamp"},
+    "CertificateState":{
+      "type":"string",
+      "enum":[
+        "Registering",
+        "Registered",
+        "RegisterFailed",
+        "Deregistering",
+        "Deregistered",
+        "DeregisterFailed"
+      ]
+    },
+    "CertificateStateReason":{"type":"string"},
+    "CertificatesInfo":{
+      "type":"list",
+      "member":{"shape":"CertificateInfo"}
+    },
     "CidrIp":{
       "type":"string",
       "pattern":"^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])(\\/([1-9]|[1-2][0-9]|3[0-2]))$"
@@ -1113,7 +1363,7 @@
         },
         "Description":{
           "shape":"Description",
-          "documentation":"<p>A textual description for the directory.</p>"
+          "documentation":"<p>A description for the directory.</p>"
         },
         "Size":{
           "shape":"DirectorySize",
@@ -1263,15 +1513,15 @@
         },
         "ShortName":{
           "shape":"DirectoryShortName",
-          "documentation":"<p>The short name of the directory, such as <code>CORP</code>.</p>"
+          "documentation":"<p>The NetBIOS name of the directory, such as <code>CORP</code>.</p>"
         },
         "Password":{
           "shape":"Password",
-          "documentation":"<p>The password for the directory administrator. The directory creation process creates a directory administrator account with the user name <code>Administrator</code> and this password.</p>"
+          "documentation":"<p>The password for the directory administrator. The directory creation process creates a directory administrator account with the user name <code>Administrator</code> and this password.</p> <p>If you need to change the password for the administrator account, you can use the <a>ResetUserPassword</a> API call.</p>"
         },
         "Description":{
           "shape":"Description",
-          "documentation":"<p>A textual description for the directory.</p>"
+          "documentation":"<p>A description for the directory.</p>"
         },
         "Size":{
           "shape":"DirectorySize",
@@ -1307,7 +1557,7 @@
       "members":{
         "DirectoryId":{
           "shape":"DirectoryId",
-          "documentation":"<p>Identifier (ID) of the directory to which you want to subscribe and receive real-time logs to your specified CloudWatch log group.</p>"
+          "documentation":"<p>Identifier of the directory to which you want to subscribe and receive real-time logs to your specified CloudWatch log group.</p>"
         },
         "LogGroupName":{
           "shape":"LogGroupName",
@@ -1330,19 +1580,19 @@
       "members":{
         "Name":{
           "shape":"DirectoryName",
-          "documentation":"<p>The fully qualified domain name for the directory, such as <code>corp.example.com</code>. This name will resolve inside your VPC only. It does not need to be publicly resolvable.</p>"
+          "documentation":"<p>The fully qualified domain name for the AWS Managed Microsoft AD directory, such as <code>corp.example.com</code>. This name will resolve inside your VPC only. It does not need to be publicly resolvable.</p>"
         },
         "ShortName":{
           "shape":"DirectoryShortName",
-          "documentation":"<p>The NetBIOS name for your domain. A short identifier for your domain, such as <code>CORP</code>. If you don't specify a NetBIOS name, it will default to the first part of your directory DNS. For example, <code>CORP</code> for the directory DNS <code>corp.example.com</code>. </p>"
+          "documentation":"<p>The NetBIOS name for your domain, such as <code>CORP</code>. If you don't specify a NetBIOS name, it will default to the first part of your directory DNS. For example, <code>CORP</code> for the directory DNS <code>corp.example.com</code>. </p>"
         },
         "Password":{
           "shape":"Password",
-          "documentation":"<p>The password for the default administrative user named <code>Admin</code>.</p>"
+          "documentation":"<p>The password for the default administrative user named <code>Admin</code>.</p> <p>If you need to change the password for the administrator account, you can use the <a>ResetUserPassword</a> API call.</p>"
         },
         "Description":{
           "shape":"Description",
-          "documentation":"<p>A textual description for the directory. This label will appear on the AWS console <code>Directory Details</code> page after the directory is created.</p>"
+          "documentation":"<p>A description for the directory. This label will appear on the AWS console <code>Directory Details</code> page after the directory is created.</p>"
         },
         "VpcSettings":{
           "shape":"DirectoryVpcSettings",
@@ -1350,7 +1600,7 @@
         },
         "Edition":{
           "shape":"DirectoryEdition",
-          "documentation":"<p>AWS Managed Microsoft AD is available in two editions: Standard and Enterprise. Enterprise is the default.</p>"
+          "documentation":"<p>AWS Managed Microsoft AD is available in two editions: <code>Standard</code> and <code>Enterprise</code>. <code>Enterprise</code> is the default.</p>"
         },
         "Tags":{
           "shape":"Tags",
@@ -1508,7 +1758,7 @@
       "members":{
         "DirectoryId":{
           "shape":"DirectoryId",
-          "documentation":"<p>Identifier (ID) of the directory whose log subscription you want to delete.</p>"
+          "documentation":"<p>Identifier of the directory whose log subscription you want to delete.</p>"
         }
       }
     },
@@ -1563,6 +1813,28 @@
       },
       "documentation":"<p>The result of a DeleteTrust request.</p>"
     },
+    "DeregisterCertificateRequest":{
+      "type":"structure",
+      "required":[
+        "DirectoryId",
+        "CertificateId"
+      ],
+      "members":{
+        "DirectoryId":{
+          "shape":"DirectoryId",
+          "documentation":"<p>The identifier of the directory.</p>"
+        },
+        "CertificateId":{
+          "shape":"CertificateId",
+          "documentation":"<p>The identifier of the certificate.</p>"
+        }
+      }
+    },
+    "DeregisterCertificateResult":{
+      "type":"structure",
+      "members":{
+      }
+    },
     "DeregisterEventTopicRequest":{
       "type":"structure",
       "required":[
@@ -1587,6 +1859,32 @@
       },
       "documentation":"<p>The result of a DeregisterEventTopic request.</p>"
     },
+    "DescribeCertificateRequest":{
+      "type":"structure",
+      "required":[
+        "DirectoryId",
+        "CertificateId"
+      ],
+      "members":{
+        "DirectoryId":{
+          "shape":"DirectoryId",
+          "documentation":"<p>The identifier of the directory.</p>"
+        },
+        "CertificateId":{
+          "shape":"CertificateId",
+          "documentation":"<p>The identifier of the certificate.</p>"
+        }
+      }
+    },
+    "DescribeCertificateResult":{
+      "type":"structure",
+      "members":{
+        "Certificate":{
+          "shape":"Certificate",
+          "documentation":"<p>Information about the certificate, including registered date time, certificate state, the reason for the state, expiration date time, and certificate common name.</p>"
+        }
+      }
+    },
     "DescribeConditionalForwardersRequest":{
       "type":"structure",
       "required":["DirectoryId"],
@@ -1703,6 +2001,41 @@
       },
       "documentation":"<p>The result of a DescribeEventTopic request.</p>"
     },
+    "DescribeLDAPSSettingsRequest":{
+      "type":"structure",
+      "required":["DirectoryId"],
+      "members":{
+        "DirectoryId":{
+          "shape":"DirectoryId",
+          "documentation":"<p>The identifier of the directory.</p>"
+        },
+        "Type":{
+          "shape":"LDAPSType",
+          "documentation":"<p>The type of LDAP security to enable. Currently only the value <code>Client</code> is supported.</p>"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>The type of next token used for pagination.</p>"
+        },
+        "Limit":{
+          "shape":"PageLimit",
+          "documentation":"<p>Specifies the number of items that should be displayed on one page.</p>"
+        }
+      }
+    },
+    "DescribeLDAPSSettingsResult":{
+      "type":"structure",
+      "members":{
+        "LDAPSSettingsInfo":{
+          "shape":"LDAPSSettingsInfo",
+          "documentation":"<p>Information about LDAP security for the specified directory, including status of enablement, state last updated date time, and the reason for the state.</p>"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>The next token used to retrieve the LDAPS settings if the number of setting types exceeds page limit and there is another page.</p>"
+        }
+      }
+    },
     "DescribeSharedDirectoriesRequest":{
       "type":"structure",
       "required":["OwnerDirectoryId"],
@@ -1866,7 +2199,7 @@
         },
         "SubnetIds":{
           "shape":"SubnetIds",
-          "documentation":"<p>A list of subnet identifiers in the VPC that the AD connector is in.</p>"
+          "documentation":"<p>A list of subnet identifiers in the VPC that the AD Connector is in.</p>"
         },
         "CustomerUserName":{
           "shape":"UserName",
@@ -1920,7 +2253,7 @@
         },
         "Description":{
           "shape":"Description",
-          "documentation":"<p>The textual description for the directory.</p>"
+          "documentation":"<p>The description for the directory.</p>"
         },
         "DnsIpAddrs":{
           "shape":"DnsIpAddrs",
@@ -1994,6 +2327,15 @@
       "member":{"shape":"DirectoryDescription"},
       "documentation":"<p>A list of directory descriptions.</p>"
     },
+    "DirectoryDoesNotExistException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"ExceptionMessage"},
+        "RequestId":{"shape":"RequestId"}
+      },
+      "documentation":"<p>The specified directory does not exist in the system.</p>",
+      "exception":true
+    },
     "DirectoryEdition":{
       "type":"string",
       "enum":[
@@ -2024,11 +2366,11 @@
       "members":{
         "CloudOnlyDirectoriesLimit":{
           "shape":"Limit",
-          "documentation":"<p>The maximum number of cloud directories allowed in the region.</p>"
+          "documentation":"<p>The maximum number of cloud directories allowed in the Region.</p>"
         },
         "CloudOnlyDirectoriesCurrentCount":{
           "shape":"Limit",
-          "documentation":"<p>The current number of cloud directories in the region.</p>"
+          "documentation":"<p>The current number of cloud directories in the Region.</p>"
         },
         "CloudOnlyDirectoriesLimitReached":{
           "shape":"CloudOnlyDirectoriesLimitReached",
@@ -2048,18 +2390,18 @@
         },
         "ConnectedDirectoriesLimit":{
           "shape":"Limit",
-          "documentation":"<p>The maximum number of connected directories allowed in the region.</p>"
+          "documentation":"<p>The maximum number of connected directories allowed in the Region.</p>"
         },
         "ConnectedDirectoriesCurrentCount":{
           "shape":"Limit",
-          "documentation":"<p>The current number of connected directories in the region.</p>"
+          "documentation":"<p>The current number of connected directories in the Region.</p>"
         },
         "ConnectedDirectoriesLimitReached":{
           "shape":"ConnectedDirectoriesLimitReached",
           "documentation":"<p>Indicates if the connected directory limit has been reached.</p>"
         }
       },
-      "documentation":"<p>Contains directory limit information for a region.</p>"
+      "documentation":"<p>Contains directory limit information for a Region.</p>"
     },
     "DirectoryName":{
       "type":"string",
@@ -2159,6 +2501,28 @@
       },
       "documentation":"<p>Contains information about the directory.</p>"
     },
+    "DisableLDAPSRequest":{
+      "type":"structure",
+      "required":[
+        "DirectoryId",
+        "Type"
+      ],
+      "members":{
+        "DirectoryId":{
+          "shape":"DirectoryId",
+          "documentation":"<p>The identifier of the directory.</p>"
+        },
+        "Type":{
+          "shape":"LDAPSType",
+          "documentation":"<p>The type of LDAP security to enable. Currently only the value <code>Client</code> is supported.</p>"
+        }
+      }
+    },
+    "DisableLDAPSResult":{
+      "type":"structure",
+      "members":{
+      }
+    },
     "DisableRadiusRequest":{
       "type":"structure",
       "required":["DirectoryId"],
@@ -2285,6 +2649,28 @@
       "type":"list",
       "member":{"shape":"DomainController"}
     },
+    "EnableLDAPSRequest":{
+      "type":"structure",
+      "required":[
+        "DirectoryId",
+        "Type"
+      ],
+      "members":{
+        "DirectoryId":{
+          "shape":"DirectoryId",
+          "documentation":"<p>The identifier of the directory.</p>"
+        },
+        "Type":{
+          "shape":"LDAPSType",
+          "documentation":"<p>The type of LDAP security to enable. Currently only the value <code>Client</code> is supported.</p>"
+        }
+      }
+    },
+    "EnableLDAPSResult":{
+      "type":"structure",
+      "members":{
+      }
+    },
     "EnableRadiusRequest":{
       "type":"structure",
       "required":[
@@ -2398,7 +2784,7 @@
       "members":{
         "DirectoryLimits":{
           "shape":"DirectoryLimits",
-          "documentation":"<p>A <a>DirectoryLimits</a> object that contains the directory limits for the current region.</p>"
+          "documentation":"<p>A <a>DirectoryLimits</a> object that contains the directory limits for the current rRegion.</p>"
         }
       },
       "documentation":"<p>Contains the results of the <a>GetDirectoryLimits</a> operation.</p>"
@@ -2433,6 +2819,24 @@
       "documentation":"<p>The account does not have sufficient permission to perform the operation.</p>",
       "exception":true
     },
+    "InvalidCertificateException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"ExceptionMessage"},
+        "RequestId":{"shape":"RequestId"}
+      },
+      "documentation":"<p>The certificate PEM that was provided has incorrect encoding.</p>",
+      "exception":true
+    },
+    "InvalidLDAPSStatusException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"ExceptionMessage"},
+        "RequestId":{"shape":"RequestId"}
+      },
+      "documentation":"<p>The LDAP activities could not be performed because they are limited by the LDAPS status.</p>",
+      "exception":true
+    },
     "InvalidNextTokenException":{
       "type":"structure",
       "members":{
@@ -2550,6 +2954,42 @@
       "type":"list",
       "member":{"shape":"IpRouteInfo"}
     },
+    "LDAPSSettingInfo":{
+      "type":"structure",
+      "members":{
+        "LDAPSStatus":{
+          "shape":"LDAPSStatus",
+          "documentation":"<p>The state of the LDAPS settings.</p>"
+        },
+        "LDAPSStatusReason":{
+          "shape":"LDAPSStatusReason",
+          "documentation":"<p>Describes a state change for LDAPS.</p>"
+        },
+        "LastUpdatedDateTime":{
+          "shape":"LastUpdatedDateTime",
+          "documentation":"<p>The date and time when the LDAPS settings were last updated.</p>"
+        }
+      },
+      "documentation":"<p>Contains general information about the LDAPS settings.</p>"
+    },
+    "LDAPSSettingsInfo":{
+      "type":"list",
+      "member":{"shape":"LDAPSSettingInfo"}
+    },
+    "LDAPSStatus":{
+      "type":"string",
+      "enum":[
+        "Enabling",
+        "Enabled",
+        "EnableFailed",
+        "Disabled"
+      ]
+    },
+    "LDAPSStatusReason":{"type":"string"},
+    "LDAPSType":{
+      "type":"string",
+      "enum":["Client"]
+    },
     "LastUpdatedDateTime":{"type":"timestamp"},
     "LaunchTime":{"type":"timestamp"},
     "LdifContent":{
@@ -2561,6 +3001,37 @@
       "type":"integer",
       "min":0
     },
+    "ListCertificatesRequest":{
+      "type":"structure",
+      "required":["DirectoryId"],
+      "members":{
+        "DirectoryId":{
+          "shape":"DirectoryId",
+          "documentation":"<p>The identifier of the directory.</p>"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>A token for requesting another page of certificates if the <code>NextToken</code> response element indicates that more certificates are available. Use the value of the returned <code>NextToken</code> element in your request until the token comes back as <code>null</code>. Pass <code>null</code> if this is the first call.</p>"
+        },
+        "Limit":{
+          "shape":"PageLimit",
+          "documentation":"<p>The number of items that should show up on one page</p>"
+        }
+      }
+    },
+    "ListCertificatesResult":{
+      "type":"structure",
+      "members":{
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>Indicates whether another page of certificates is available when the number of available certificates exceeds the page limit.</p>"
+        },
+        "CertificatesInfo":{
+          "shape":"CertificatesInfo",
+          "documentation":"<p>A list of certificates with basic details including certificate ID, certificate common name, certificate state.</p>"
+        }
+      }
+    },
     "ListIpRoutesRequest":{
       "type":"structure",
       "required":["DirectoryId"],
@@ -2714,6 +3185,15 @@
     },
     "ManualSnapshotsLimitReached":{"type":"boolean"},
     "NextToken":{"type":"string"},
+    "NoAvailableCertificateException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"ExceptionMessage"},
+        "RequestId":{"shape":"RequestId"}
+      },
+      "documentation":"<p>The LDAP activities could not be performed because at least one valid certificate must be registered with the system.</p>",
+      "exception":true
+    },
     "Notes":{
       "type":"string",
       "max":1024,
@@ -2763,6 +3243,11 @@
       },
       "documentation":"<p>Describes the directory owner account details that have been shared to the directory consumer account.</p>"
     },
+    "PageLimit":{
+      "type":"integer",
+      "max":50,
+      "min":1
+    },
     "Password":{
       "type":"string",
       "pattern":"(?=^.{8,64}$)((?=.*\\d)(?=.*[A-Z])(?=.*[a-z])|(?=.*\\d)(?=.*[^A-Za-z0-9\\s])(?=.*[a-z])|(?=.*[^A-Za-z0-9\\s])(?=.*[A-Z])(?=.*[a-z])|(?=.*\\d)(?=.*[A-Z])(?=.*[^A-Za-z0-9\\s]))^.*",
@@ -2849,6 +3334,32 @@
       "max":20,
       "min":1
     },
+    "RegisterCertificateRequest":{
+      "type":"structure",
+      "required":[
+        "DirectoryId",
+        "CertificateData"
+      ],
+      "members":{
+        "DirectoryId":{
+          "shape":"DirectoryId",
+          "documentation":"<p>The identifier of the directory.</p>"
+        },
+        "CertificateData":{
+          "shape":"CertificateData",
+          "documentation":"<p>The certificate PEM string that needs to be registered.</p>"
+        }
+      }
+    },
+    "RegisterCertificateResult":{
+      "type":"structure",
+      "members":{
+        "CertificateId":{
+          "shape":"CertificateId",
+          "documentation":"<p>The identifier of the certificate.</p>"
+        }
+      }
+    },
     "RegisterEventTopicRequest":{
       "type":"structure",
       "required":[
diff --git a/services/directory/src/test/resources/cucumber.properties b/services/directory/src/test/resources/cucumber.properties
index 9f44ba06468d..bebc54c18ec7 100644
--- a/services/directory/src/test/resources/cucumber.properties
+++ b/services/directory/src/test/resources/cucumber.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/dlm/pom.xml b/services/dlm/pom.xml
index 494237f1b7d7..d7239c8a28ab 100644
--- a/services/dlm/pom.xml
+++ b/services/dlm/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>dlm</artifactId>
     <name>AWS Java SDK :: Services :: DLM</name>
diff --git a/services/dlm/src/main/resources/codegen-resources/service-2.json b/services/dlm/src/main/resources/codegen-resources/service-2.json
index 287eef1a8d4f..76ff6e7883cb 100644
--- a/services/dlm/src/main/resources/codegen-resources/service-2.json
+++ b/services/dlm/src/main/resources/codegen-resources/service-2.json
@@ -74,6 +74,51 @@
       ],
       "documentation":"<p>Gets detailed information about the specified lifecycle policy.</p>"
     },
+    "ListTagsForResource":{
+      "name":"ListTagsForResource",
+      "http":{
+        "method":"GET",
+        "requestUri":"/tags/{resourceArn}"
+      },
+      "input":{"shape":"ListTagsForResourceRequest"},
+      "output":{"shape":"ListTagsForResourceResponse"},
+      "errors":[
+        {"shape":"InternalServerException"},
+        {"shape":"InvalidRequestException"},
+        {"shape":"ResourceNotFoundException"}
+      ],
+      "documentation":"<p>Lists the tags for the specified resource.</p>"
+    },
+    "TagResource":{
+      "name":"TagResource",
+      "http":{
+        "method":"POST",
+        "requestUri":"/tags/{resourceArn}"
+      },
+      "input":{"shape":"TagResourceRequest"},
+      "output":{"shape":"TagResourceResponse"},
+      "errors":[
+        {"shape":"InternalServerException"},
+        {"shape":"InvalidRequestException"},
+        {"shape":"ResourceNotFoundException"}
+      ],
+      "documentation":"<p>Adds the specified tags to the specified resource.</p>"
+    },
+    "UntagResource":{
+      "name":"UntagResource",
+      "http":{
+        "method":"DELETE",
+        "requestUri":"/tags/{resourceArn}"
+      },
+      "input":{"shape":"UntagResourceRequest"},
+      "output":{"shape":"UntagResourceResponse"},
+      "errors":[
+        {"shape":"InternalServerException"},
+        {"shape":"InvalidRequestException"},
+        {"shape":"ResourceNotFoundException"}
+      ],
+      "documentation":"<p>Removes the specified tags from the specified resource.</p>"
+    },
     "UpdateLifecyclePolicy":{
       "name":"UpdateLifecyclePolicy",
       "http":{
@@ -92,7 +137,26 @@
     }
   },
   "shapes":{
+    "AvailabilityZone":{
+      "type":"string",
+      "max":16,
+      "min":0,
+      "pattern":"([a-z]+-){2,3}\\d[a-z]"
+    },
+    "AvailabilityZoneList":{
+      "type":"list",
+      "member":{"shape":"AvailabilityZone"},
+      "max":10,
+      "min":1
+    },
+    "CmkArn":{
+      "type":"string",
+      "max":2048,
+      "min":0,
+      "pattern":"arn:aws(-[a-z]{1,3}){0,2}:kms:([a-z]+-){2,3}\\d:\\d+:key/.*"
+    },
     "CopyTags":{"type":"boolean"},
+    "CopyTagsNullable":{"type":"boolean"},
     "Count":{
       "type":"integer",
       "max":1000,
@@ -121,7 +185,11 @@
         },
         "PolicyDetails":{
           "shape":"PolicyDetails",
-          "documentation":"<p>The configuration details of the lifecycle policy.</p> <p>Target tags cannot be re-used across lifecycle policies.</p>"
+          "documentation":"<p>The configuration details of the lifecycle policy.</p>"
+        },
+        "Tags":{
+          "shape":"TagMap",
+          "documentation":"<p>The tags to apply to the lifecycle policy during creation.</p>"
         }
       }
     },
@@ -156,6 +224,56 @@
       },
       "documentation":"<p>Specifies when to create snapshots of EBS volumes.</p>"
     },
+    "CrossRegionCopyRetainRule":{
+      "type":"structure",
+      "members":{
+        "Interval":{
+          "shape":"Interval",
+          "documentation":"<p>The amount of time to retain each snapshot. The maximum is 100 years. This is equivalent to 1200 months, 5200 weeks, or 36500 days.</p>"
+        },
+        "IntervalUnit":{
+          "shape":"RetentionIntervalUnitValues",
+          "documentation":"<p>The unit of time for time-based retention.</p>"
+        }
+      },
+      "documentation":"<p>Specifies the retention rule for cross-Region snapshot copies.</p>"
+    },
+    "CrossRegionCopyRule":{
+      "type":"structure",
+      "required":[
+        "TargetRegion",
+        "Encrypted"
+      ],
+      "members":{
+        "TargetRegion":{
+          "shape":"TargetRegion",
+          "documentation":"<p>The target Region.</p>"
+        },
+        "Encrypted":{
+          "shape":"Encrypted",
+          "documentation":"<p>To encrypt a copy of an unencrypted snapshot if encryption by default is not enabled, enable encryption using this parameter. Copies of encrypted snapshots are encrypted, even if this parameter is false or if encryption by default is not enabled.</p>"
+        },
+        "CmkArn":{
+          "shape":"CmkArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the AWS KMS customer master key (CMK) to use for EBS encryption. If this parameter is not specified, your AWS managed CMK for EBS is used.</p>"
+        },
+        "CopyTags":{
+          "shape":"CopyTagsNullable",
+          "documentation":"<p>Copy all user-defined tags from the source snapshot to the copied snapshot.</p>"
+        },
+        "RetainRule":{
+          "shape":"CrossRegionCopyRetainRule",
+          "documentation":"<p>The retention rule.</p>"
+        }
+      },
+      "documentation":"<p>Specifies a rule for cross-Region snapshot copies.</p>"
+    },
+    "CrossRegionCopyRules":{
+      "type":"list",
+      "member":{"shape":"CrossRegionCopyRule"},
+      "max":3,
+      "min":0
+    },
     "DeleteLifecyclePolicyRequest":{
       "type":"structure",
       "required":["PolicyId"],
@@ -173,10 +291,39 @@
       "members":{
       }
     },
+    "Encrypted":{"type":"boolean"},
     "ErrorCode":{"type":"string"},
     "ErrorMessage":{"type":"string"},
     "ExcludeBootVolume":{"type":"boolean"},
-    "ExecutionRoleArn":{"type":"string"},
+    "ExecutionRoleArn":{
+      "type":"string",
+      "max":2048,
+      "min":0,
+      "pattern":"arn:aws(-[a-z]{1,3}){0,2}:iam::\\d+:role/.*"
+    },
+    "FastRestoreRule":{
+      "type":"structure",
+      "required":["AvailabilityZones"],
+      "members":{
+        "Count":{
+          "shape":"Count",
+          "documentation":"<p>The number of snapshots to be enabled with fast snapshot restore.</p>"
+        },
+        "Interval":{
+          "shape":"Interval",
+          "documentation":"<p>The amount of time to enable fast snapshot restore. The maximum is 100 years. This is equivalent to 1200 months, 5200 weeks, or 36500 days.</p>"
+        },
+        "IntervalUnit":{
+          "shape":"RetentionIntervalUnitValues",
+          "documentation":"<p>The unit of time for enabling fast snapshot restore.</p>"
+        },
+        "AvailabilityZones":{
+          "shape":"AvailabilityZoneList",
+          "documentation":"<p>The Availability Zones in which to enable fast snapshot restore.</p>"
+        }
+      },
+      "documentation":"<p>Specifies a rule for enabling fast snapshot restore. You can enable fast snapshot restore based on either a count or a time interval.</p>"
+    },
     "GetLifecyclePoliciesRequest":{
       "type":"structure",
       "members":{
@@ -301,6 +448,10 @@
           "shape":"GettablePolicyStateValues",
           "documentation":"<p>The activation state of the lifecycle policy.</p>"
         },
+        "StatusMessage":{
+          "shape":"StatusMessage",
+          "documentation":"<p>The description of the status.</p>"
+        },
         "ExecutionRoleArn":{
           "shape":"ExecutionRoleArn",
           "documentation":"<p>The Amazon Resource Name (ARN) of the IAM role used to run the operations specified by the lifecycle policy.</p>"
@@ -316,6 +467,14 @@
         "PolicyDetails":{
           "shape":"PolicyDetails",
           "documentation":"<p>The configuration of the lifecycle policy</p>"
+        },
+        "Tags":{
+          "shape":"TagMap",
+          "documentation":"<p>The tags.</p>"
+        },
+        "PolicyArn":{
+          "shape":"PolicyArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the policy.</p>"
         }
       },
       "documentation":"<p>Detailed information about a lifecycle policy.</p>"
@@ -334,6 +493,10 @@
         "State":{
           "shape":"GettablePolicyStateValues",
           "documentation":"<p>The activation state of the lifecycle policy.</p>"
+        },
+        "Tags":{
+          "shape":"TagMap",
+          "documentation":"<p>The tags.</p>"
         }
       },
       "documentation":"<p>Summary information about a lifecycle policy.</p>"
@@ -356,6 +519,27 @@
       "error":{"httpStatusCode":429},
       "exception":true
     },
+    "ListTagsForResourceRequest":{
+      "type":"structure",
+      "required":["ResourceArn"],
+      "members":{
+        "ResourceArn":{
+          "shape":"PolicyArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the resource.</p>",
+          "location":"uri",
+          "locationName":"resourceArn"
+        }
+      }
+    },
+    "ListTagsForResourceResponse":{
+      "type":"structure",
+      "members":{
+        "Tags":{
+          "shape":"TagMap",
+          "documentation":"<p>Information about the tags.</p>"
+        }
+      }
+    },
     "Parameter":{"type":"string"},
     "ParameterList":{
       "type":"list",
@@ -366,22 +550,29 @@
       "members":{
         "ExcludeBootVolume":{
           "shape":"ExcludeBootVolume",
-          "documentation":"<p>When executing an EBS Snapshot Management – Instance policy, execute all CreateSnapshots calls with the <code>excludeBootVolume</code> set to the supplied field. Defaults to false. Only valid for EBS Snapshot Management – Instance policies.</p>"
+          "documentation":"<p>[EBS Snapshot Management – Instance policies only] Indicates whether to exclude the root volume from snapshots created using <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CreateSnapshots.html\">CreateSnapshots</a>. The default is false.</p>"
         }
       },
-      "documentation":"<p>Optional parameters that can be added to the policy. The set of valid parameters depends on the combination of <code>policyType</code> and <code>resourceType</code> values.</p>"
+      "documentation":"<p>Specifies optional parameters to add to a policy. The set of valid parameters depends on the combination of policy type and resource type.</p>"
+    },
+    "PolicyArn":{
+      "type":"string",
+      "max":2048,
+      "min":0,
+      "pattern":"^arn:aws(-[a-z]{1,3}){0,2}:dlm:[A-Za-z0-9_/.-]{0,63}:\\d+:policy/[0-9A-Za-z_-]{1,128}$"
     },
     "PolicyDescription":{
       "type":"string",
       "max":500,
-      "min":0
+      "min":0,
+      "pattern":"[0-9A-Za-z _-]+"
     },
     "PolicyDetails":{
       "type":"structure",
       "members":{
         "PolicyType":{
           "shape":"PolicyTypeValues",
-          "documentation":"<p>This field determines the valid target resource types and actions a policy can manage. This field defaults to EBS_SNAPSHOT_MANAGEMENT if not present.</p>"
+          "documentation":"<p>The valid target resource types and actions a policy can manage. The default is EBS_SNAPSHOT_MANAGEMENT.</p>"
         },
         "ResourceTypes":{
           "shape":"ResourceTypeValuesList",
@@ -397,12 +588,17 @@
         },
         "Parameters":{
           "shape":"Parameters",
-          "documentation":"<p>A set of optional parameters that can be provided by the policy. </p>"
+          "documentation":"<p>A set of optional parameters for the policy. </p>"
         }
       },
       "documentation":"<p>Specifies the configuration of a lifecycle policy.</p>"
     },
-    "PolicyId":{"type":"string"},
+    "PolicyId":{
+      "type":"string",
+      "max":64,
+      "min":0,
+      "pattern":"policy-[A-Za-z0-9]+"
+    },
     "PolicyIdList":{
       "type":"list",
       "member":{"shape":"PolicyId"}
@@ -444,14 +640,30 @@
     },
     "RetainRule":{
       "type":"structure",
-      "required":["Count"],
       "members":{
         "Count":{
           "shape":"Count",
-          "documentation":"<p>The number of snapshots to keep for each volume, up to a maximum of 1000.</p>"
+          "documentation":"<p>The number of snapshots to retain for each volume, up to a maximum of 1000.</p>"
+        },
+        "Interval":{
+          "shape":"Interval",
+          "documentation":"<p>The amount of time to retain each snapshot. The maximum is 100 years. This is equivalent to 1200 months, 5200 weeks, or 36500 days.</p>"
+        },
+        "IntervalUnit":{
+          "shape":"RetentionIntervalUnitValues",
+          "documentation":"<p>The unit of time for time-based retention.</p>"
         }
       },
-      "documentation":"<p>Specifies the number of snapshots to keep for each EBS volume.</p>"
+      "documentation":"<p>Specifies the retention rule for a lifecycle policy. You can retain snapshots based on either a count or a time interval.</p>"
+    },
+    "RetentionIntervalUnitValues":{
+      "type":"string",
+      "enum":[
+        "DAYS",
+        "WEEKS",
+        "MONTHS",
+        "YEARS"
+      ]
     },
     "Schedule":{
       "type":"structure",
@@ -474,14 +686,22 @@
         },
         "CreateRule":{
           "shape":"CreateRule",
-          "documentation":"<p>The create rule.</p>"
+          "documentation":"<p>The creation rule.</p>"
         },
         "RetainRule":{
           "shape":"RetainRule",
-          "documentation":"<p>The retain rule.</p>"
+          "documentation":"<p>The retention rule.</p>"
+        },
+        "FastRestoreRule":{
+          "shape":"FastRestoreRule",
+          "documentation":"<p>The rule for enabling fast snapshot restore.</p>"
+        },
+        "CrossRegionCopyRules":{
+          "shape":"CrossRegionCopyRules",
+          "documentation":"<p>The rule for cross-Region snapshot copies.</p>"
         }
       },
-      "documentation":"<p>Specifies a schedule.</p>"
+      "documentation":"<p>Specifies a backup schedule.</p>"
     },
     "ScheduleList":{
       "type":"list",
@@ -492,7 +712,8 @@
     "ScheduleName":{
       "type":"string",
       "max":500,
-      "min":0
+      "min":0,
+      "pattern":"[\\p{all}]*"
     },
     "SettablePolicyStateValues":{
       "type":"string",
@@ -501,7 +722,18 @@
         "DISABLED"
       ]
     },
-    "String":{"type":"string"},
+    "StatusMessage":{
+      "type":"string",
+      "max":500,
+      "min":0,
+      "pattern":"[\\p{all}]*"
+    },
+    "String":{
+      "type":"string",
+      "max":500,
+      "min":0,
+      "pattern":"[\\p{all}]*"
+    },
     "Tag":{
       "type":"structure",
       "required":[
@@ -520,7 +752,60 @@
       },
       "documentation":"<p>Specifies a tag for a resource.</p>"
     },
-    "TagFilter":{"type":"string"},
+    "TagFilter":{
+      "type":"string",
+      "max":256,
+      "min":0,
+      "pattern":"[\\p{all}]*"
+    },
+    "TagKey":{
+      "type":"string",
+      "max":128,
+      "min":1,
+      "pattern":"^(?!aws:)[a-zA-Z+-=._:/]+$"
+    },
+    "TagKeyList":{
+      "type":"list",
+      "member":{"shape":"TagKey"},
+      "max":200,
+      "min":1
+    },
+    "TagMap":{
+      "type":"map",
+      "key":{"shape":"TagKey"},
+      "value":{"shape":"TagValue"},
+      "max":200,
+      "min":1
+    },
+    "TagResourceRequest":{
+      "type":"structure",
+      "required":[
+        "ResourceArn",
+        "Tags"
+      ],
+      "members":{
+        "ResourceArn":{
+          "shape":"PolicyArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the resource.</p>",
+          "location":"uri",
+          "locationName":"resourceArn"
+        },
+        "Tags":{
+          "shape":"TagMap",
+          "documentation":"<p>One or more tags.</p>"
+        }
+      }
+    },
+    "TagResourceResponse":{
+      "type":"structure",
+      "members":{
+      }
+    },
+    "TagValue":{
+      "type":"string",
+      "max":256,
+      "pattern":"[\\p{all}]*"
+    },
     "TagsToAddFilterList":{
       "type":"list",
       "member":{"shape":"TagFilter"},
@@ -530,9 +815,15 @@
     "TagsToAddList":{
       "type":"list",
       "member":{"shape":"Tag"},
-      "max":50,
+      "max":45,
       "min":0
     },
+    "TargetRegion":{
+      "type":"string",
+      "max":16,
+      "min":0,
+      "pattern":"([a-z]+-){2,3}\\d"
+    },
     "TargetTagList":{
       "type":"list",
       "member":{"shape":"Tag"},
@@ -547,7 +838,9 @@
     },
     "Time":{
       "type":"string",
-      "pattern":"^([0-9]|0[0-9]|1[0-9]|2[0-3]):[0-5][0-9]$"
+      "max":5,
+      "min":5,
+      "pattern":"^(0[0-9]|1[0-9]|2[0-3]):[0-5][0-9]$"
     },
     "TimesList":{
       "type":"list",
@@ -558,6 +851,32 @@
       "type":"timestamp",
       "timestampFormat":"iso8601"
     },
+    "UntagResourceRequest":{
+      "type":"structure",
+      "required":[
+        "ResourceArn",
+        "TagKeys"
+      ],
+      "members":{
+        "ResourceArn":{
+          "shape":"PolicyArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the resource.</p>",
+          "location":"uri",
+          "locationName":"resourceArn"
+        },
+        "TagKeys":{
+          "shape":"TagKeyList",
+          "documentation":"<p>The tag keys.</p>",
+          "location":"querystring",
+          "locationName":"tagKeys"
+        }
+      }
+    },
+    "UntagResourceResponse":{
+      "type":"structure",
+      "members":{
+      }
+    },
     "UpdateLifecyclePolicyRequest":{
       "type":"structure",
       "required":["PolicyId"],
@@ -582,7 +901,7 @@
         },
         "PolicyDetails":{
           "shape":"PolicyDetails",
-          "documentation":"<p>The configuration of the lifecycle policy.</p> <p>Target tags cannot be re-used across policies.</p>"
+          "documentation":"<p>The configuration of the lifecycle policy. You cannot update the policy type or the resource type.</p>"
         }
       }
     },
@@ -594,7 +913,7 @@
     "VariableTagsList":{
       "type":"list",
       "member":{"shape":"Tag"},
-      "max":50,
+      "max":45,
       "min":0
     }
   },
diff --git a/services/docdb/pom.xml b/services/docdb/pom.xml
index bcc0a8a3a8fd..91437f694adb 100644
--- a/services/docdb/pom.xml
+++ b/services/docdb/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>docdb</artifactId>
     <name>AWS Java SDK :: Services :: DocDB</name>
diff --git a/services/docdb/src/main/resources/codegen-resources/service-2.json b/services/docdb/src/main/resources/codegen-resources/service-2.json
index 5a57835f2dda..aa6e0d304fa8 100644
--- a/services/docdb/src/main/resources/codegen-resources/service-2.json
+++ b/services/docdb/src/main/resources/codegen-resources/service-2.json
@@ -61,7 +61,7 @@
         {"shape":"DBParameterGroupQuotaExceededFault"},
         {"shape":"DBParameterGroupAlreadyExistsFault"}
       ],
-      "documentation":"<p>Copies the specified DB cluster parameter group.</p>"
+      "documentation":"<p>Copies the specified cluster parameter group.</p>"
     },
     "CopyDBClusterSnapshot":{
       "name":"CopyDBClusterSnapshot",
@@ -82,7 +82,7 @@
         {"shape":"SnapshotQuotaExceededFault"},
         {"shape":"KMSKeyNotAccessibleFault"}
       ],
-      "documentation":"<p>Copies a snapshot of a DB cluster.</p> <p>To copy a DB cluster snapshot from a shared manual DB cluster snapshot, <code>SourceDBClusterSnapshotIdentifier</code> must be the Amazon Resource Name (ARN) of the shared DB cluster snapshot.</p> <p>To cancel the copy operation after it is in progress, delete the target DB cluster snapshot identified by <code>TargetDBClusterSnapshotIdentifier</code> while that DB cluster snapshot is in the <i>copying</i> status.</p>"
+      "documentation":"<p>Copies a snapshot of a cluster.</p> <p>To copy a cluster snapshot from a shared manual cluster snapshot, <code>SourceDBClusterSnapshotIdentifier</code> must be the Amazon Resource Name (ARN) of the shared cluster snapshot.</p> <p>To cancel the copy operation after it is in progress, delete the target cluster snapshot identified by <code>TargetDBClusterSnapshotIdentifier</code> while that DB cluster snapshot is in the <i>copying</i> status.</p>"
     },
     "CreateDBCluster":{
       "name":"CreateDBCluster",
@@ -112,7 +112,7 @@
         {"shape":"DBInstanceNotFoundFault"},
         {"shape":"DBSubnetGroupDoesNotCoverEnoughAZs"}
       ],
-      "documentation":"<p>Creates a new Amazon DocumentDB DB cluster.</p>"
+      "documentation":"<p>Creates a new Amazon DocumentDB cluster.</p>"
     },
     "CreateDBClusterParameterGroup":{
       "name":"CreateDBClusterParameterGroup",
@@ -129,7 +129,7 @@
         {"shape":"DBParameterGroupQuotaExceededFault"},
         {"shape":"DBParameterGroupAlreadyExistsFault"}
       ],
-      "documentation":"<p>Creates a new DB cluster parameter group.</p> <p>Parameters in a DB cluster parameter group apply to all of the instances in a DB cluster.</p> <p>A DB cluster parameter group is initially created with the default parameters for the database engine used by instances in the DB cluster. To provide custom values for any of the parameters, you must modify the group after you create it. After you create a DB cluster parameter group, you must associate it with your DB cluster. For the new DB cluster parameter group and associated settings to take effect, you must then reboot the DB instances in the DB cluster without failover.</p> <important> <p>After you create a DB cluster parameter group, you should wait at least 5 minutes before creating your first DB cluster that uses that DB cluster parameter group as the default parameter group. This allows Amazon DocumentDB to fully complete the create action before the DB cluster parameter group is used as the default for a new DB cluster. This step is especially important for parameters that are critical when creating the default database for a DB cluster, such as the character set for the default database defined by the <code>character_set_database</code> parameter.</p> </important>"
+      "documentation":"<p>Creates a new cluster parameter group.</p> <p>Parameters in a cluster parameter group apply to all of the instances in a DB cluster.</p> <p>A cluster parameter group is initially created with the default parameters for the database engine used by instances in the cluster. To provide custom values for any of the parameters, you must modify the group after you create it. After you create a DB cluster parameter group, you must associate it with your cluster. For the new DB cluster parameter group and associated settings to take effect, you must then reboot the instances in the cluster without failover.</p> <important> <p>After you create a cluster parameter group, you should wait at least 5 minutes before creating your first cluster that uses that cluster parameter group as the default parameter group. This allows Amazon DocumentDB to fully complete the create action before the cluster parameter group is used as the default for a new cluster. This step is especially important for parameters that are critical when creating the default database for a cluster, such as the character set for the default database defined by the <code>character_set_database</code> parameter.</p> </important>"
     },
     "CreateDBClusterSnapshot":{
       "name":"CreateDBClusterSnapshot",
@@ -149,7 +149,7 @@
         {"shape":"SnapshotQuotaExceededFault"},
         {"shape":"InvalidDBClusterSnapshotStateFault"}
       ],
-      "documentation":"<p>Creates a snapshot of a DB cluster. </p>"
+      "documentation":"<p>Creates a snapshot of a cluster. </p>"
     },
     "CreateDBInstance":{
       "name":"CreateDBInstance",
@@ -179,7 +179,7 @@
         {"shape":"AuthorizationNotFoundFault"},
         {"shape":"KMSKeyNotAccessibleFault"}
       ],
-      "documentation":"<p>Creates a new DB instance.</p>"
+      "documentation":"<p>Creates a new instance.</p>"
     },
     "CreateDBSubnetGroup":{
       "name":"CreateDBSubnetGroup",
@@ -199,7 +199,7 @@
         {"shape":"DBSubnetGroupDoesNotCoverEnoughAZs"},
         {"shape":"InvalidSubnet"}
       ],
-      "documentation":"<p>Creates a new DB subnet group. DB subnet groups must contain at least one subnet in at least two Availability Zones in the AWS Region.</p>"
+      "documentation":"<p>Creates a new subnet group. subnet groups must contain at least one subnet in at least two Availability Zones in the AWS Region.</p>"
     },
     "DeleteDBCluster":{
       "name":"DeleteDBCluster",
@@ -219,7 +219,7 @@
         {"shape":"SnapshotQuotaExceededFault"},
         {"shape":"InvalidDBClusterSnapshotStateFault"}
       ],
-      "documentation":"<p>Deletes a previously provisioned DB cluster. When you delete a DB cluster, all automated backups for that DB cluster are deleted and can't be recovered. Manual DB cluster snapshots of the specified DB cluster are not deleted.</p> <p/>"
+      "documentation":"<p>Deletes a previously provisioned cluster. When you delete a cluster, all automated backups for that cluster are deleted and can't be recovered. Manual DB cluster snapshots of the specified cluster are not deleted.</p> <p/>"
     },
     "DeleteDBClusterParameterGroup":{
       "name":"DeleteDBClusterParameterGroup",
@@ -232,7 +232,7 @@
         {"shape":"InvalidDBParameterGroupStateFault"},
         {"shape":"DBParameterGroupNotFoundFault"}
       ],
-      "documentation":"<p>Deletes a specified DB cluster parameter group. The DB cluster parameter group to be deleted can't be associated with any DB clusters.</p>"
+      "documentation":"<p>Deletes a specified cluster parameter group. The cluster parameter group to be deleted can't be associated with any clusters.</p>"
     },
     "DeleteDBClusterSnapshot":{
       "name":"DeleteDBClusterSnapshot",
@@ -249,7 +249,7 @@
         {"shape":"InvalidDBClusterSnapshotStateFault"},
         {"shape":"DBClusterSnapshotNotFoundFault"}
       ],
-      "documentation":"<p>Deletes a DB cluster snapshot. If the snapshot is being copied, the copy operation is terminated.</p> <note> <p>The DB cluster snapshot must be in the <code>available</code> state to be deleted.</p> </note>"
+      "documentation":"<p>Deletes a cluster snapshot. If the snapshot is being copied, the copy operation is terminated.</p> <note> <p>The cluster snapshot must be in the <code>available</code> state to be deleted.</p> </note>"
     },
     "DeleteDBInstance":{
       "name":"DeleteDBInstance",
@@ -269,7 +269,7 @@
         {"shape":"SnapshotQuotaExceededFault"},
         {"shape":"InvalidDBClusterStateFault"}
       ],
-      "documentation":"<p>Deletes a previously provisioned DB instance. </p>"
+      "documentation":"<p>Deletes a previously provisioned instance. </p>"
     },
     "DeleteDBSubnetGroup":{
       "name":"DeleteDBSubnetGroup",
@@ -283,7 +283,7 @@
         {"shape":"InvalidDBSubnetStateFault"},
         {"shape":"DBSubnetGroupNotFoundFault"}
       ],
-      "documentation":"<p>Deletes a DB subnet group.</p> <note> <p>The specified database subnet group must not be associated with any DB instances.</p> </note>"
+      "documentation":"<p>Deletes a subnet group.</p> <note> <p>The specified database subnet group must not be associated with any DB instances.</p> </note>"
     },
     "DescribeCertificates":{
       "name":"DescribeCertificates",
@@ -299,7 +299,7 @@
       "errors":[
         {"shape":"CertificateNotFoundFault"}
       ],
-      "documentation":"<p>Returns a list of certificate authority (CA) certificates provided by Amazon RDS for this AWS account.</p>"
+      "documentation":"<p>Returns a list of certificate authority (CA) certificates provided by Amazon DocumentDB for this AWS account.</p>"
     },
     "DescribeDBClusterParameterGroups":{
       "name":"DescribeDBClusterParameterGroups",
@@ -315,7 +315,7 @@
       "errors":[
         {"shape":"DBParameterGroupNotFoundFault"}
       ],
-      "documentation":"<p>Returns a list of <code>DBClusterParameterGroup</code> descriptions. If a <code>DBClusterParameterGroupName</code> parameter is specified, the list contains only the description of the specified DB cluster parameter group. </p>"
+      "documentation":"<p>Returns a list of <code>DBClusterParameterGroup</code> descriptions. If a <code>DBClusterParameterGroupName</code> parameter is specified, the list contains only the description of the specified cluster parameter group. </p>"
     },
     "DescribeDBClusterParameters":{
       "name":"DescribeDBClusterParameters",
@@ -331,7 +331,7 @@
       "errors":[
         {"shape":"DBParameterGroupNotFoundFault"}
       ],
-      "documentation":"<p>Returns the detailed parameter list for a particular DB cluster parameter group.</p>"
+      "documentation":"<p>Returns the detailed parameter list for a particular cluster parameter group.</p>"
     },
     "DescribeDBClusterSnapshotAttributes":{
       "name":"DescribeDBClusterSnapshotAttributes",
@@ -347,7 +347,7 @@
       "errors":[
         {"shape":"DBClusterSnapshotNotFoundFault"}
       ],
-      "documentation":"<p>Returns a list of DB cluster snapshot attribute names and values for a manual DB cluster snapshot.</p> <p>When you share snapshots with other AWS accounts, <code>DescribeDBClusterSnapshotAttributes</code> returns the <code>restore</code> attribute and a list of IDs for the AWS accounts that are authorized to copy or restore the manual DB cluster snapshot. If <code>all</code> is included in the list of values for the <code>restore</code> attribute, then the manual DB cluster snapshot is public and can be copied or restored by all AWS accounts.</p>"
+      "documentation":"<p>Returns a list of cluster snapshot attribute names and values for a manual DB cluster snapshot.</p> <p>When you share snapshots with other AWS accounts, <code>DescribeDBClusterSnapshotAttributes</code> returns the <code>restore</code> attribute and a list of IDs for the AWS accounts that are authorized to copy or restore the manual cluster snapshot. If <code>all</code> is included in the list of values for the <code>restore</code> attribute, then the manual cluster snapshot is public and can be copied or restored by all AWS accounts.</p>"
     },
     "DescribeDBClusterSnapshots":{
       "name":"DescribeDBClusterSnapshots",
@@ -363,7 +363,7 @@
       "errors":[
         {"shape":"DBClusterSnapshotNotFoundFault"}
       ],
-      "documentation":"<p>Returns information about DB cluster snapshots. This API operation supports pagination.</p>"
+      "documentation":"<p>Returns information about cluster snapshots. This API operation supports pagination.</p>"
     },
     "DescribeDBClusters":{
       "name":"DescribeDBClusters",
@@ -379,7 +379,7 @@
       "errors":[
         {"shape":"DBClusterNotFoundFault"}
       ],
-      "documentation":"<p>Returns information about provisioned Amazon DocumentDB DB clusters. This API operation supports pagination.</p>"
+      "documentation":"<p>Returns information about provisioned Amazon DocumentDB clusters. This API operation supports pagination. For certain management features such as cluster and instance lifecycle management, Amazon DocumentDB leverages operational technology that is shared with Amazon RDS and Amazon Neptune. Use the <code>filterName=engine,Values=docdb</code> filter parameter to return only Amazon DocumentDB clusters.</p>"
     },
     "DescribeDBEngineVersions":{
       "name":"DescribeDBEngineVersions",
@@ -392,7 +392,7 @@
         "shape":"DBEngineVersionMessage",
         "resultWrapper":"DescribeDBEngineVersionsResult"
       },
-      "documentation":"<p>Returns a list of the available DB engines.</p>"
+      "documentation":"<p>Returns a list of the available engines.</p>"
     },
     "DescribeDBInstances":{
       "name":"DescribeDBInstances",
@@ -463,7 +463,7 @@
         "shape":"EventsMessage",
         "resultWrapper":"DescribeEventsResult"
       },
-      "documentation":"<p>Returns events related to DB instances, DB security groups, DB snapshots, and DB parameter groups for the past 14 days. You can obtain events specific to a particular DB instance, DB security group, DB snapshot, or DB parameter group by providing the name as a parameter. By default, the events of the past hour are returned.</p>"
+      "documentation":"<p>Returns events related to instances, security groups, snapshots, and DB parameter groups for the past 14 days. You can obtain events specific to a particular DB instance, security group, snapshot, or parameter group by providing the name as a parameter. By default, the events of the past hour are returned.</p>"
     },
     "DescribeOrderableDBInstanceOptions":{
       "name":"DescribeOrderableDBInstanceOptions",
@@ -476,7 +476,7 @@
         "shape":"OrderableDBInstanceOptionsMessage",
         "resultWrapper":"DescribeOrderableDBInstanceOptionsResult"
       },
-      "documentation":"<p>Returns a list of orderable DB instance options for the specified engine.</p>"
+      "documentation":"<p>Returns a list of orderable instance options for the specified engine.</p>"
     },
     "DescribePendingMaintenanceActions":{
       "name":"DescribePendingMaintenanceActions",
@@ -492,7 +492,7 @@
       "errors":[
         {"shape":"ResourceNotFoundFault"}
       ],
-      "documentation":"<p>Returns a list of resources (for example, DB instances) that have at least one pending maintenance action.</p>"
+      "documentation":"<p>Returns a list of resources (for example, instances) that have at least one pending maintenance action.</p>"
     },
     "FailoverDBCluster":{
       "name":"FailoverDBCluster",
@@ -510,7 +510,7 @@
         {"shape":"InvalidDBClusterStateFault"},
         {"shape":"InvalidDBInstanceStateFault"}
       ],
-      "documentation":"<p>Forces a failover for a DB cluster.</p> <p>A failover for a DB cluster promotes one of the Amazon DocumentDB replicas (read-only instances) in the DB cluster to be the primary instance (the cluster writer).</p> <p>If the primary instance fails, Amazon DocumentDB automatically fails over to an Amazon DocumentDB replica, if one exists. You can force a failover when you want to simulate a failure of a primary instance for testing.</p>"
+      "documentation":"<p>Forces a failover for a cluster.</p> <p>A failover for a cluster promotes one of the Amazon DocumentDB replicas (read-only instances) in the cluster to be the primary instance (the cluster writer).</p> <p>If the primary instance fails, Amazon DocumentDB automatically fails over to an Amazon DocumentDB replica, if one exists. You can force a failover when you want to simulate a failure of a primary instance for testing.</p>"
     },
     "ListTagsForResource":{
       "name":"ListTagsForResource",
@@ -554,7 +554,7 @@
         {"shape":"InvalidDBInstanceStateFault"},
         {"shape":"DBClusterAlreadyExistsFault"}
       ],
-      "documentation":"<p>Modifies a setting for an Amazon DocumentDB DB cluster. You can change one or more database configuration parameters by specifying these parameters and the new values in the request. </p>"
+      "documentation":"<p>Modifies a setting for an Amazon DocumentDB cluster. You can change one or more database configuration parameters by specifying these parameters and the new values in the request. </p>"
     },
     "ModifyDBClusterParameterGroup":{
       "name":"ModifyDBClusterParameterGroup",
@@ -571,7 +571,7 @@
         {"shape":"DBParameterGroupNotFoundFault"},
         {"shape":"InvalidDBParameterGroupStateFault"}
       ],
-      "documentation":"<p> Modifies the parameters of a DB cluster parameter group. To modify more than one parameter, submit a list of the following: <code>ParameterName</code>, <code>ParameterValue</code>, and <code>ApplyMethod</code>. A maximum of 20 parameters can be modified in a single request. </p> <note> <p>Changes to dynamic parameters are applied immediately. Changes to static parameters require a reboot or maintenance window before the change can take effect.</p> </note> <important> <p>After you create a DB cluster parameter group, you should wait at least 5 minutes before creating your first DB cluster that uses that DB cluster parameter group as the default parameter group. This allows Amazon DocumentDB to fully complete the create action before the parameter group is used as the default for a new DB cluster. This step is especially important for parameters that are critical when creating the default database for a DB cluster, such as the character set for the default database defined by the <code>character_set_database</code> parameter.</p> </important>"
+      "documentation":"<p> Modifies the parameters of a cluster parameter group. To modify more than one parameter, submit a list of the following: <code>ParameterName</code>, <code>ParameterValue</code>, and <code>ApplyMethod</code>. A maximum of 20 parameters can be modified in a single request. </p> <note> <p>Changes to dynamic parameters are applied immediately. Changes to static parameters require a reboot or maintenance window before the change can take effect.</p> </note> <important> <p>After you create a cluster parameter group, you should wait at least 5 minutes before creating your first cluster that uses that cluster parameter group as the default parameter group. This allows Amazon DocumentDB to fully complete the create action before the parameter group is used as the default for a new cluster. This step is especially important for parameters that are critical when creating the default database for a cluster, such as the character set for the default database defined by the <code>character_set_database</code> parameter.</p> </important>"
     },
     "ModifyDBClusterSnapshotAttribute":{
       "name":"ModifyDBClusterSnapshotAttribute",
@@ -589,7 +589,7 @@
         {"shape":"InvalidDBClusterSnapshotStateFault"},
         {"shape":"SharedSnapshotQuotaExceededFault"}
       ],
-      "documentation":"<p>Adds an attribute and values to, or removes an attribute and values from, a manual DB cluster snapshot.</p> <p>To share a manual DB cluster snapshot with other AWS accounts, specify <code>restore</code> as the <code>AttributeName</code>, and use the <code>ValuesToAdd</code> parameter to add a list of IDs of the AWS accounts that are authorized to restore the manual DB cluster snapshot. Use the value <code>all</code> to make the manual DB cluster snapshot public, which means that it can be copied or restored by all AWS accounts. Do not add the <code>all</code> value for any manual DB cluster snapshots that contain private information that you don't want available to all AWS accounts. If a manual DB cluster snapshot is encrypted, it can be shared, but only by specifying a list of authorized AWS account IDs for the <code>ValuesToAdd</code> parameter. You can't use <code>all</code> as a value for that parameter in this case.</p>"
+      "documentation":"<p>Adds an attribute and values to, or removes an attribute and values from, a manual DB cluster snapshot.</p> <p>To share a manual cluster snapshot with other AWS accounts, specify <code>restore</code> as the <code>AttributeName</code>, and use the <code>ValuesToAdd</code> parameter to add a list of IDs of the AWS accounts that are authorized to restore the manual cluster snapshot. Use the value <code>all</code> to make the manual cluster snapshot public, which means that it can be copied or restored by all AWS accounts. Do not add the <code>all</code> value for any manual DB cluster snapshots that contain private information that you don't want available to all AWS accounts. If a manual cluster snapshot is encrypted, it can be shared, but only by specifying a list of authorized AWS account IDs for the <code>ValuesToAdd</code> parameter. You can't use <code>all</code> as a value for that parameter in this case.</p>"
     },
     "ModifyDBInstance":{
       "name":"ModifyDBInstance",
@@ -617,7 +617,7 @@
         {"shape":"AuthorizationNotFoundFault"},
         {"shape":"CertificateNotFoundFault"}
       ],
-      "documentation":"<p>Modifies settings for a DB instance. You can change one or more database configuration parameters by specifying these parameters and the new values in the request.</p>"
+      "documentation":"<p>Modifies settings for an instance. You can change one or more database configuration parameters by specifying these parameters and the new values in the request.</p>"
     },
     "ModifyDBSubnetGroup":{
       "name":"ModifyDBSubnetGroup",
@@ -637,7 +637,7 @@
         {"shape":"DBSubnetGroupDoesNotCoverEnoughAZs"},
         {"shape":"InvalidSubnet"}
       ],
-      "documentation":"<p>Modifies an existing DB subnet group. DB subnet groups must contain at least one subnet in at least two Availability Zones in the AWS Region.</p>"
+      "documentation":"<p>Modifies an existing subnet group. subnet groups must contain at least one subnet in at least two Availability Zones in the AWS Region.</p>"
     },
     "RebootDBInstance":{
       "name":"RebootDBInstance",
@@ -654,7 +654,7 @@
         {"shape":"InvalidDBInstanceStateFault"},
         {"shape":"DBInstanceNotFoundFault"}
       ],
-      "documentation":"<p>You might need to reboot your DB instance, usually for maintenance reasons. For example, if you make certain changes, or if you change the DB cluster parameter group that is associated with the DB instance, you must reboot the instance for the changes to take effect. </p> <p>Rebooting a DB instance restarts the database engine service. Rebooting a DB instance results in a momentary outage, during which the DB instance status is set to <i>rebooting</i>. </p>"
+      "documentation":"<p>You might need to reboot your instance, usually for maintenance reasons. For example, if you make certain changes, or if you change the cluster parameter group that is associated with the instance, you must reboot the instance for the changes to take effect. </p> <p>Rebooting an instance restarts the database engine service. Rebooting an instance results in a momentary outage, during which the instance status is set to <i>rebooting</i>. </p>"
     },
     "RemoveTagsFromResource":{
       "name":"RemoveTagsFromResource",
@@ -685,7 +685,7 @@
         {"shape":"InvalidDBParameterGroupStateFault"},
         {"shape":"DBParameterGroupNotFoundFault"}
       ],
-      "documentation":"<p> Modifies the parameters of a DB cluster parameter group to the default value. To reset specific parameters, submit a list of the following: <code>ParameterName</code> and <code>ApplyMethod</code>. To reset the entire DB cluster parameter group, specify the <code>DBClusterParameterGroupName</code> and <code>ResetAllParameters</code> parameters. </p> <p> When you reset the entire group, dynamic parameters are updated immediately and static parameters are set to <code>pending-reboot</code> to take effect on the next DB instance reboot.</p>"
+      "documentation":"<p> Modifies the parameters of a cluster parameter group to the default value. To reset specific parameters, submit a list of the following: <code>ParameterName</code> and <code>ApplyMethod</code>. To reset the entire cluster parameter group, specify the <code>DBClusterParameterGroupName</code> and <code>ResetAllParameters</code> parameters. </p> <p> When you reset the entire group, dynamic parameters are updated immediately and static parameters are set to <code>pending-reboot</code> to take effect on the next DB instance reboot.</p>"
     },
     "RestoreDBClusterFromSnapshot":{
       "name":"RestoreDBClusterFromSnapshot",
@@ -716,7 +716,7 @@
         {"shape":"InvalidSubnet"},
         {"shape":"KMSKeyNotAccessibleFault"}
       ],
-      "documentation":"<p>Creates a new DB cluster from a DB snapshot or DB cluster snapshot.</p> <p>If a DB snapshot is specified, the target DB cluster is created from the source DB snapshot with a default configuration and default security group.</p> <p>If a DB cluster snapshot is specified, the target DB cluster is created from the source DB cluster restore point with the same configuration as the original source DB cluster, except that the new DB cluster is created with the default security group.</p>"
+      "documentation":"<p>Creates a new cluster from a snapshot or cluster snapshot.</p> <p>If a snapshot is specified, the target cluster is created from the source DB snapshot with a default configuration and default security group.</p> <p>If a cluster snapshot is specified, the target cluster is created from the source cluster restore point with the same configuration as the original source DB cluster, except that the new cluster is created with the default security group.</p>"
     },
     "RestoreDBClusterToPointInTime":{
       "name":"RestoreDBClusterToPointInTime",
@@ -746,7 +746,7 @@
         {"shape":"KMSKeyNotAccessibleFault"},
         {"shape":"StorageQuotaExceededFault"}
       ],
-      "documentation":"<p>Restores a DB cluster to an arbitrary point in time. Users can restore to any point in time before <code>LatestRestorableTime</code> for up to <code>BackupRetentionPeriod</code> days. The target DB cluster is created from the source DB cluster with the same configuration as the original DB cluster, except that the new DB cluster is created with the default DB security group. </p>"
+      "documentation":"<p>Restores a cluster to an arbitrary point in time. Users can restore to any point in time before <code>LatestRestorableTime</code> for up to <code>BackupRetentionPeriod</code> days. The target cluster is created from the source cluster with the same configuration as the original cluster, except that the new cluster is created with the default security group. </p>"
     },
     "StartDBCluster":{
       "name":"StartDBCluster",
@@ -851,7 +851,7 @@
       "type":"structure",
       "members":{
       },
-      "documentation":"<p>The specified CIDR IP or Amazon EC2 security group isn't authorized for the specified DB security group.</p> <p>Amazon DocumentDB also might not be authorized to perform necessary actions on your behalf using IAM.</p>",
+      "documentation":"<p>The specified CIDR IP or Amazon EC2 security group isn't authorized for the specified security group.</p> <p>Amazon DocumentDB also might not be authorized to perform necessary actions on your behalf using IAM.</p>",
       "error":{
         "code":"AuthorizationNotFound",
         "httpStatusCode":404,
@@ -961,7 +961,7 @@
           "documentation":"<p>The list of log types to disable.</p>"
         }
       },
-      "documentation":"<p>The configuration setting for the log types to be enabled for export to Amazon CloudWatch Logs for a specific DB instance or DB cluster.</p> <p>The <code>EnableLogTypes</code> and <code>DisableLogTypes</code> arrays determine which logs are exported (or not exported) to CloudWatch Logs. The values within these arrays depend on the DB engine that is being used.</p>"
+      "documentation":"<p>The configuration setting for the log types to be enabled for export to Amazon CloudWatch Logs for a specific instance or cluster.</p> <p>The <code>EnableLogTypes</code> and <code>DisableLogTypes</code> arrays determine which logs are exported (or not exported) to CloudWatch Logs. The values within these arrays depend on the engine that is being used.</p>"
     },
     "CopyDBClusterParameterGroupMessage":{
       "type":"structure",
@@ -973,15 +973,15 @@
       "members":{
         "SourceDBClusterParameterGroupIdentifier":{
           "shape":"String",
-          "documentation":"<p>The identifier or Amazon Resource Name (ARN) for the source DB cluster parameter group.</p> <p>Constraints:</p> <ul> <li> <p>Must specify a valid DB cluster parameter group.</p> </li> <li> <p>If the source DB cluster parameter group is in the same AWS Region as the copy, specify a valid DB parameter group identifier; for example, <code>my-db-cluster-param-group</code>, or a valid ARN.</p> </li> <li> <p>If the source DB parameter group is in a different AWS Region than the copy, specify a valid DB cluster parameter group ARN; for example, <code>arn:aws:rds:us-east-1:123456789012:cluster-pg:custom-cluster-group1</code>.</p> </li> </ul>"
+          "documentation":"<p>The identifier or Amazon Resource Name (ARN) for the source cluster parameter group.</p> <p>Constraints:</p> <ul> <li> <p>Must specify a valid cluster parameter group.</p> </li> <li> <p>If the source cluster parameter group is in the same AWS Region as the copy, specify a valid parameter group identifier; for example, <code>my-db-cluster-param-group</code>, or a valid ARN.</p> </li> <li> <p>If the source parameter group is in a different AWS Region than the copy, specify a valid cluster parameter group ARN; for example, <code>arn:aws:rds:us-east-1:123456789012:cluster-pg:custom-cluster-group1</code>.</p> </li> </ul>"
         },
         "TargetDBClusterParameterGroupIdentifier":{
           "shape":"String",
-          "documentation":"<p>The identifier for the copied DB cluster parameter group.</p> <p>Constraints:</p> <ul> <li> <p>Cannot be null, empty, or blank.</p> </li> <li> <p>Must contain from 1 to 255 letters, numbers, or hyphens.</p> </li> <li> <p>The first character must be a letter.</p> </li> <li> <p>Cannot end with a hyphen or contain two consecutive hyphens.</p> </li> </ul> <p>Example: <code>my-cluster-param-group1</code> </p>"
+          "documentation":"<p>The identifier for the copied cluster parameter group.</p> <p>Constraints:</p> <ul> <li> <p>Cannot be null, empty, or blank.</p> </li> <li> <p>Must contain from 1 to 255 letters, numbers, or hyphens.</p> </li> <li> <p>The first character must be a letter.</p> </li> <li> <p>Cannot end with a hyphen or contain two consecutive hyphens.</p> </li> </ul> <p>Example: <code>my-cluster-param-group1</code> </p>"
         },
         "TargetDBClusterParameterGroupDescription":{
           "shape":"String",
-          "documentation":"<p>A description for the copied DB cluster parameter group.</p>"
+          "documentation":"<p>A description for the copied cluster parameter group.</p>"
         },
         "Tags":{
           "shape":"TagList",
@@ -1005,27 +1005,27 @@
       "members":{
         "SourceDBClusterSnapshotIdentifier":{
           "shape":"String",
-          "documentation":"<p>The identifier of the DB cluster snapshot to copy. This parameter is not case sensitive.</p> <p>You can't copy an encrypted, shared DB cluster snapshot from one AWS Region to another.</p> <p>Constraints:</p> <ul> <li> <p>Must specify a valid system snapshot in the \"available\" state.</p> </li> <li> <p>If the source snapshot is in the same AWS Region as the copy, specify a valid DB snapshot identifier.</p> </li> <li> <p>If the source snapshot is in a different AWS Region than the copy, specify a valid DB cluster snapshot ARN.</p> </li> </ul> <p>Example: <code>my-cluster-snapshot1</code> </p>"
+          "documentation":"<p>The identifier of the cluster snapshot to copy. This parameter is not case sensitive.</p> <p>You can't copy an encrypted, shared cluster snapshot from one AWS Region to another.</p> <p>Constraints:</p> <ul> <li> <p>Must specify a valid system snapshot in the \"available\" state.</p> </li> <li> <p>If the source snapshot is in the same AWS Region as the copy, specify a valid snapshot identifier.</p> </li> <li> <p>If the source snapshot is in a different AWS Region than the copy, specify a valid cluster snapshot ARN.</p> </li> </ul> <p>Example: <code>my-cluster-snapshot1</code> </p>"
         },
         "TargetDBClusterSnapshotIdentifier":{
           "shape":"String",
-          "documentation":"<p>The identifier of the new DB cluster snapshot to create from the source DB cluster snapshot. This parameter is not case sensitive.</p> <p>Constraints:</p> <ul> <li> <p>Must contain from 1 to 63 letters, numbers, or hyphens.</p> </li> <li> <p>The first character must be a letter.</p> </li> <li> <p>Cannot end with a hyphen or contain two consecutive hyphens.</p> </li> </ul> <p>Example: <code>my-cluster-snapshot2</code> </p>"
+          "documentation":"<p>The identifier of the new cluster snapshot to create from the source cluster snapshot. This parameter is not case sensitive.</p> <p>Constraints:</p> <ul> <li> <p>Must contain from 1 to 63 letters, numbers, or hyphens.</p> </li> <li> <p>The first character must be a letter.</p> </li> <li> <p>Cannot end with a hyphen or contain two consecutive hyphens.</p> </li> </ul> <p>Example: <code>my-cluster-snapshot2</code> </p>"
         },
         "KmsKeyId":{
           "shape":"String",
-          "documentation":"<p>The AWS KMS key ID for an encrypted DB cluster snapshot. The AWS KMS key ID is the Amazon Resource Name (ARN), AWS KMS key identifier, or the AWS KMS key alias for the AWS KMS encryption key. </p> <p>If you copy an encrypted DB cluster snapshot from your AWS account, you can specify a value for <code>KmsKeyId</code> to encrypt the copy with a new AWS KMS encryption key. If you don't specify a value for <code>KmsKeyId</code>, then the copy of the DB cluster snapshot is encrypted with the same AWS KMS key as the source DB cluster snapshot. </p> <p>If you copy an encrypted DB cluster snapshot that is shared from another AWS account, then you must specify a value for <code>KmsKeyId</code>. </p> <p>To copy an encrypted DB cluster snapshot to another AWS Region, set <code>KmsKeyId</code> to the AWS KMS key ID that you want to use to encrypt the copy of the DB cluster snapshot in the destination Region. AWS KMS encryption keys are specific to the AWS Region that they are created in, and you can't use encryption keys from one Region in another Region.</p> <p>If you copy an unencrypted DB cluster snapshot and specify a value for the <code>KmsKeyId</code> parameter, an error is returned.</p>"
+          "documentation":"<p>The AWS KMS key ID for an encrypted cluster snapshot. The AWS KMS key ID is the Amazon Resource Name (ARN), AWS KMS key identifier, or the AWS KMS key alias for the AWS KMS encryption key. </p> <p>If you copy an encrypted cluster snapshot from your AWS account, you can specify a value for <code>KmsKeyId</code> to encrypt the copy with a new AWS KMS encryption key. If you don't specify a value for <code>KmsKeyId</code>, then the copy of the cluster snapshot is encrypted with the same AWS KMS key as the source cluster snapshot. </p> <p>If you copy an encrypted cluster snapshot that is shared from another AWS account, then you must specify a value for <code>KmsKeyId</code>. </p> <p>To copy an encrypted cluster snapshot to another AWS Region, set <code>KmsKeyId</code> to the AWS KMS key ID that you want to use to encrypt the copy of the cluster snapshot in the destination Region. AWS KMS encryption keys are specific to the AWS Region that they are created in, and you can't use encryption keys from one Region in another Region.</p> <p>If you copy an unencrypted cluster snapshot and specify a value for the <code>KmsKeyId</code> parameter, an error is returned.</p>"
         },
         "PreSignedUrl":{
           "shape":"String",
-          "documentation":"<p>The URL that contains a Signature Version 4 signed request for the <code>CopyDBClusterSnapshot</code> API action in the AWS Region that contains the source DB cluster snapshot to copy. You must use the <code>PreSignedUrl</code> parameter when copying an encrypted DB cluster snapshot from another AWS Region.</p> <p>The presigned URL must be a valid request for the <code>CopyDBSClusterSnapshot</code> API action that can be executed in the source AWS Region that contains the encrypted DB cluster snapshot to be copied. The presigned URL request must contain the following parameter values:</p> <ul> <li> <p> <code>KmsKeyId</code> - The AWS KMS key identifier for the key to use to encrypt the copy of the DB cluster snapshot in the destination AWS Region. This is the same identifier for both the <code>CopyDBClusterSnapshot</code> action that is called in the destination AWS Region, and the action contained in the presigned URL.</p> </li> <li> <p> <code>DestinationRegion</code> - The name of the AWS Region that the DB cluster snapshot will be created in.</p> </li> <li> <p> <code>SourceDBClusterSnapshotIdentifier</code> - The DB cluster snapshot identifier for the encrypted DB cluster snapshot to be copied. This identifier must be in the Amazon Resource Name (ARN) format for the source AWS Region. For example, if you are copying an encrypted DB cluster snapshot from the us-west-2 AWS Region, then your <code>SourceDBClusterSnapshotIdentifier</code> looks like the following example: <code>arn:aws:rds:us-west-2:123456789012:cluster-snapshot:my-cluster-snapshot-20161115</code>.</p> </li> </ul>"
+          "documentation":"<p>The URL that contains a Signature Version 4 signed request for the <code>CopyDBClusterSnapshot</code> API action in the AWS Region that contains the source cluster snapshot to copy. You must use the <code>PreSignedUrl</code> parameter when copying an encrypted cluster snapshot from another AWS Region.</p> <p>The presigned URL must be a valid request for the <code>CopyDBSClusterSnapshot</code> API action that can be executed in the source AWS Region that contains the encrypted DB cluster snapshot to be copied. The presigned URL request must contain the following parameter values:</p> <ul> <li> <p> <code>KmsKeyId</code> - The AWS KMS key identifier for the key to use to encrypt the copy of the cluster snapshot in the destination AWS Region. This is the same identifier for both the <code>CopyDBClusterSnapshot</code> action that is called in the destination AWS Region, and the action contained in the presigned URL.</p> </li> <li> <p> <code>DestinationRegion</code> - The name of the AWS Region that the DB cluster snapshot will be created in.</p> </li> <li> <p> <code>SourceDBClusterSnapshotIdentifier</code> - The cluster snapshot identifier for the encrypted cluster snapshot to be copied. This identifier must be in the Amazon Resource Name (ARN) format for the source AWS Region. For example, if you are copying an encrypted cluster snapshot from the us-west-2 AWS Region, then your <code>SourceDBClusterSnapshotIdentifier</code> looks like the following example: <code>arn:aws:rds:us-west-2:123456789012:cluster-snapshot:my-cluster-snapshot-20161115</code>.</p> </li> </ul>"
         },
         "CopyTags":{
           "shape":"BooleanOptional",
-          "documentation":"<p>Set to <code>true</code> to copy all tags from the source DB cluster snapshot to the target DB cluster snapshot, and otherwise <code>false</code>. The default is <code>false</code>.</p>"
+          "documentation":"<p>Set to <code>true</code> to copy all tags from the source cluster snapshot to the target cluster snapshot, and otherwise <code>false</code>. The default is <code>false</code>.</p>"
         },
         "Tags":{
           "shape":"TagList",
-          "documentation":"<p>The tags to be assigned to the DB cluster snapshot.</p>"
+          "documentation":"<p>The tags to be assigned to the cluster snapshot.</p>"
         }
       },
       "documentation":"<p>Represents the input to <a>CopyDBClusterSnapshot</a>.</p>"
@@ -1047,7 +1047,7 @@
       "members":{
         "AvailabilityZones":{
           "shape":"AvailabilityZones",
-          "documentation":"<p>A list of Amazon EC2 Availability Zones that instances in the DB cluster can be created in.</p>"
+          "documentation":"<p>A list of Amazon EC2 Availability Zones that instances in the cluster can be created in.</p>"
         },
         "BackupRetentionPeriod":{
           "shape":"IntegerOptional",
@@ -1055,23 +1055,23 @@
         },
         "DBClusterIdentifier":{
           "shape":"String",
-          "documentation":"<p>The DB cluster identifier. This parameter is stored as a lowercase string.</p> <p>Constraints:</p> <ul> <li> <p>Must contain from 1 to 63 letters, numbers, or hyphens.</p> </li> <li> <p>The first character must be a letter.</p> </li> <li> <p>Cannot end with a hyphen or contain two consecutive hyphens.</p> </li> </ul> <p>Example: <code>my-cluster</code> </p>"
+          "documentation":"<p>The cluster identifier. This parameter is stored as a lowercase string.</p> <p>Constraints:</p> <ul> <li> <p>Must contain from 1 to 63 letters, numbers, or hyphens.</p> </li> <li> <p>The first character must be a letter.</p> </li> <li> <p>Cannot end with a hyphen or contain two consecutive hyphens.</p> </li> </ul> <p>Example: <code>my-cluster</code> </p>"
         },
         "DBClusterParameterGroupName":{
           "shape":"String",
-          "documentation":"<p> The name of the DB cluster parameter group to associate with this DB cluster.</p>"
+          "documentation":"<p> The name of the cluster parameter group to associate with this cluster.</p>"
         },
         "VpcSecurityGroupIds":{
           "shape":"VpcSecurityGroupIdList",
-          "documentation":"<p>A list of EC2 VPC security groups to associate with this DB cluster.</p>"
+          "documentation":"<p>A list of EC2 VPC security groups to associate with this cluster.</p>"
         },
         "DBSubnetGroupName":{
           "shape":"String",
-          "documentation":"<p>A DB subnet group to associate with this DB cluster.</p> <p>Constraints: Must match the name of an existing <code>DBSubnetGroup</code>. Must not be default.</p> <p>Example: <code>mySubnetgroup</code> </p>"
+          "documentation":"<p>A subnet group to associate with this cluster.</p> <p>Constraints: Must match the name of an existing <code>DBSubnetGroup</code>. Must not be default.</p> <p>Example: <code>mySubnetgroup</code> </p>"
         },
         "Engine":{
           "shape":"String",
-          "documentation":"<p>The name of the database engine to be used for this DB cluster.</p> <p>Valid values: <code>docdb</code> </p>"
+          "documentation":"<p>The name of the database engine to be used for this cluster.</p> <p>Valid values: <code>docdb</code> </p>"
         },
         "EngineVersion":{
           "shape":"String",
@@ -1079,11 +1079,11 @@
         },
         "Port":{
           "shape":"IntegerOptional",
-          "documentation":"<p>The port number on which the instances in the DB cluster accept connections.</p>"
+          "documentation":"<p>The port number on which the instances in the cluster accept connections.</p>"
         },
         "MasterUsername":{
           "shape":"String",
-          "documentation":"<p>The name of the master user for the DB cluster.</p> <p>Constraints:</p> <ul> <li> <p>Must be from 1 to 63 letters or numbers.</p> </li> <li> <p>The first character must be a letter.</p> </li> <li> <p>Cannot be a reserved word for the chosen database engine.</p> </li> </ul>"
+          "documentation":"<p>The name of the master user for the cluster.</p> <p>Constraints:</p> <ul> <li> <p>Must be from 1 to 63 letters or numbers.</p> </li> <li> <p>The first character must be a letter.</p> </li> <li> <p>Cannot be a reserved word for the chosen database engine.</p> </li> </ul>"
         },
         "MasterUserPassword":{
           "shape":"String",
@@ -1099,15 +1099,15 @@
         },
         "Tags":{
           "shape":"TagList",
-          "documentation":"<p>The tags to be assigned to the DB cluster.</p>"
+          "documentation":"<p>The tags to be assigned to the cluster.</p>"
         },
         "StorageEncrypted":{
           "shape":"BooleanOptional",
-          "documentation":"<p>Specifies whether the DB cluster is encrypted.</p>"
+          "documentation":"<p>Specifies whether the cluster is encrypted.</p>"
         },
         "KmsKeyId":{
           "shape":"String",
-          "documentation":"<p>The AWS KMS key identifier for an encrypted DB cluster.</p> <p>The AWS KMS key identifier is the Amazon Resource Name (ARN) for the AWS KMS encryption key. If you are creating a DB cluster using the same AWS account that owns the AWS KMS encryption key that is used to encrypt the new DB cluster, you can use the AWS KMS key alias instead of the ARN for the AWS KMS encryption key.</p> <p>If an encryption key is not specified in <code>KmsKeyId</code>:</p> <ul> <li> <p>If <code>ReplicationSourceIdentifier</code> identifies an encrypted source, then Amazon DocumentDB uses the encryption key that is used to encrypt the source. Otherwise, Amazon DocumentDB uses your default encryption key. </p> </li> <li> <p>If the <code>StorageEncrypted</code> parameter is <code>true</code> and <code>ReplicationSourceIdentifier</code> is not specified, Amazon DocumentDB uses your default encryption key.</p> </li> </ul> <p>AWS KMS creates the default encryption key for your AWS account. Your AWS account has a different default encryption key for each AWS Region.</p> <p>If you create a replica of an encrypted DB cluster in another AWS Region, you must set <code>KmsKeyId</code> to a KMS key ID that is valid in the destination AWS Region. This key is used to encrypt the replica in that AWS Region.</p>"
+          "documentation":"<p>The AWS KMS key identifier for an encrypted cluster.</p> <p>The AWS KMS key identifier is the Amazon Resource Name (ARN) for the AWS KMS encryption key. If you are creating a cluster using the same AWS account that owns the AWS KMS encryption key that is used to encrypt the new cluster, you can use the AWS KMS key alias instead of the ARN for the AWS KMS encryption key.</p> <p>If an encryption key is not specified in <code>KmsKeyId</code>:</p> <ul> <li> <p>If <code>ReplicationSourceIdentifier</code> identifies an encrypted source, then Amazon DocumentDB uses the encryption key that is used to encrypt the source. Otherwise, Amazon DocumentDB uses your default encryption key. </p> </li> <li> <p>If the <code>StorageEncrypted</code> parameter is <code>true</code> and <code>ReplicationSourceIdentifier</code> is not specified, Amazon DocumentDB uses your default encryption key.</p> </li> </ul> <p>AWS KMS creates the default encryption key for your AWS account. Your AWS account has a different default encryption key for each AWS Region.</p> <p>If you create a replica of an encrypted cluster in another AWS Region, you must set <code>KmsKeyId</code> to a KMS key ID that is valid in the destination AWS Region. This key is used to encrypt the replica in that AWS Region.</p>"
         },
         "EnableCloudwatchLogsExports":{
           "shape":"LogTypeList",
@@ -1130,19 +1130,19 @@
       "members":{
         "DBClusterParameterGroupName":{
           "shape":"String",
-          "documentation":"<p>The name of the DB cluster parameter group.</p> <p>Constraints:</p> <ul> <li> <p>Must match the name of an existing <code>DBClusterParameterGroup</code>.</p> </li> </ul> <note> <p>This value is stored as a lowercase string.</p> </note>"
+          "documentation":"<p>The name of the cluster parameter group.</p> <p>Constraints:</p> <ul> <li> <p>Must not match the name of an existing <code>DBClusterParameterGroup</code>.</p> </li> </ul> <note> <p>This value is stored as a lowercase string.</p> </note>"
         },
         "DBParameterGroupFamily":{
           "shape":"String",
-          "documentation":"<p>The DB cluster parameter group family name.</p>"
+          "documentation":"<p>The cluster parameter group family name.</p>"
         },
         "Description":{
           "shape":"String",
-          "documentation":"<p>The description for the DB cluster parameter group.</p>"
+          "documentation":"<p>The description for the cluster parameter group.</p>"
         },
         "Tags":{
           "shape":"TagList",
-          "documentation":"<p>The tags to be assigned to the DB cluster parameter group.</p>"
+          "documentation":"<p>The tags to be assigned to the cluster parameter group.</p>"
         }
       },
       "documentation":"<p>Represents the input of <a>CreateDBClusterParameterGroup</a>.</p>"
@@ -1168,15 +1168,15 @@
       "members":{
         "DBClusterSnapshotIdentifier":{
           "shape":"String",
-          "documentation":"<p>The identifier of the DB cluster snapshot. This parameter is stored as a lowercase string.</p> <p>Constraints:</p> <ul> <li> <p>Must contain from 1 to 63 letters, numbers, or hyphens.</p> </li> <li> <p>The first character must be a letter.</p> </li> <li> <p>Cannot end with a hyphen or contain two consecutive hyphens.</p> </li> </ul> <p>Example: <code>my-cluster-snapshot1</code> </p>"
+          "documentation":"<p>The identifier of the cluster snapshot. This parameter is stored as a lowercase string.</p> <p>Constraints:</p> <ul> <li> <p>Must contain from 1 to 63 letters, numbers, or hyphens.</p> </li> <li> <p>The first character must be a letter.</p> </li> <li> <p>Cannot end with a hyphen or contain two consecutive hyphens.</p> </li> </ul> <p>Example: <code>my-cluster-snapshot1</code> </p>"
         },
         "DBClusterIdentifier":{
           "shape":"String",
-          "documentation":"<p>The identifier of the DB cluster to create a snapshot for. This parameter is not case sensitive.</p> <p>Constraints:</p> <ul> <li> <p>Must match the identifier of an existing <code>DBCluster</code>.</p> </li> </ul> <p>Example: <code>my-cluster</code> </p>"
+          "documentation":"<p>The identifier of the cluster to create a snapshot for. This parameter is not case sensitive.</p> <p>Constraints:</p> <ul> <li> <p>Must match the identifier of an existing <code>DBCluster</code>.</p> </li> </ul> <p>Example: <code>my-cluster</code> </p>"
         },
         "Tags":{
           "shape":"TagList",
-          "documentation":"<p>The tags to be assigned to the DB cluster snapshot.</p>"
+          "documentation":"<p>The tags to be assigned to the cluster snapshot.</p>"
         }
       },
       "documentation":"<p>Represents the input of <a>CreateDBClusterSnapshot</a>.</p>"
@@ -1198,11 +1198,11 @@
       "members":{
         "DBInstanceIdentifier":{
           "shape":"String",
-          "documentation":"<p>The DB instance identifier. This parameter is stored as a lowercase string.</p> <p>Constraints:</p> <ul> <li> <p>Must contain from 1 to 63 letters, numbers, or hyphens.</p> </li> <li> <p>The first character must be a letter.</p> </li> <li> <p>Cannot end with a hyphen or contain two consecutive hyphens.</p> </li> </ul> <p>Example: <code>mydbinstance</code> </p>"
+          "documentation":"<p>The instance identifier. This parameter is stored as a lowercase string.</p> <p>Constraints:</p> <ul> <li> <p>Must contain from 1 to 63 letters, numbers, or hyphens.</p> </li> <li> <p>The first character must be a letter.</p> </li> <li> <p>Cannot end with a hyphen or contain two consecutive hyphens.</p> </li> </ul> <p>Example: <code>mydbinstance</code> </p>"
         },
         "DBInstanceClass":{
           "shape":"String",
-          "documentation":"<p>The compute and memory capacity of the DB instance; for example, <code>db.r5.large</code>. </p>"
+          "documentation":"<p>The compute and memory capacity of the instance; for example, <code>db.r5.large</code>. </p>"
         },
         "Engine":{
           "shape":"String",
@@ -1210,7 +1210,7 @@
         },
         "AvailabilityZone":{
           "shape":"String",
-          "documentation":"<p> The Amazon EC2 Availability Zone that the DB instance is created in.</p> <p>Default: A random, system-chosen Availability Zone in the endpoint's AWS Region.</p> <p> Example: <code>us-east-1d</code> </p> <p> Constraint: The <code>AvailabilityZone</code> parameter can't be specified if the <code>MultiAZ</code> parameter is set to <code>true</code>. The specified Availability Zone must be in the same AWS Region as the current endpoint. </p>"
+          "documentation":"<p> The Amazon EC2 Availability Zone that the instance is created in.</p> <p>Default: A random, system-chosen Availability Zone in the endpoint's AWS Region.</p> <p> Example: <code>us-east-1d</code> </p> <p> Constraint: The <code>AvailabilityZone</code> parameter can't be specified if the <code>MultiAZ</code> parameter is set to <code>true</code>. The specified Availability Zone must be in the same AWS Region as the current endpoint. </p>"
         },
         "PreferredMaintenanceWindow":{
           "shape":"String",
@@ -1218,15 +1218,15 @@
         },
         "AutoMinorVersionUpgrade":{
           "shape":"BooleanOptional",
-          "documentation":"<p>Indicates that minor engine upgrades are applied automatically to the DB instance during the maintenance window.</p> <p>Default: <code>true</code> </p>"
+          "documentation":"<p>Indicates that minor engine upgrades are applied automatically to the instance during the maintenance window.</p> <p>Default: <code>true</code> </p>"
         },
         "Tags":{
           "shape":"TagList",
-          "documentation":"<p>The tags to be assigned to the DB instance. You can assign up to 10 tags to an instance.</p>"
+          "documentation":"<p>The tags to be assigned to the instance. You can assign up to 10 tags to an instance.</p>"
         },
         "DBClusterIdentifier":{
           "shape":"String",
-          "documentation":"<p>The identifier of the DB cluster that the instance will belong to.</p>"
+          "documentation":"<p>The identifier of the cluster that the instance will belong to.</p>"
         },
         "PromotionTier":{
           "shape":"IntegerOptional",
@@ -1251,19 +1251,19 @@
       "members":{
         "DBSubnetGroupName":{
           "shape":"String",
-          "documentation":"<p>The name for the DB subnet group. This value is stored as a lowercase string.</p> <p>Constraints: Must contain no more than 255 letters, numbers, periods, underscores, spaces, or hyphens. Must not be default.</p> <p>Example: <code>mySubnetgroup</code> </p>"
+          "documentation":"<p>The name for the subnet group. This value is stored as a lowercase string.</p> <p>Constraints: Must contain no more than 255 letters, numbers, periods, underscores, spaces, or hyphens. Must not be default.</p> <p>Example: <code>mySubnetgroup</code> </p>"
         },
         "DBSubnetGroupDescription":{
           "shape":"String",
-          "documentation":"<p>The description for the DB subnet group.</p>"
+          "documentation":"<p>The description for the subnet group.</p>"
         },
         "SubnetIds":{
           "shape":"SubnetIdentifierList",
-          "documentation":"<p>The Amazon EC2 subnet IDs for the DB subnet group.</p>"
+          "documentation":"<p>The Amazon EC2 subnet IDs for the subnet group.</p>"
         },
         "Tags":{
           "shape":"TagList",
-          "documentation":"<p>The tags to be assigned to the DB subnet group.</p>"
+          "documentation":"<p>The tags to be assigned to the subnet group.</p>"
         }
       },
       "documentation":"<p>Represents the input to <a>CreateDBSubnetGroup</a>.</p>"
@@ -1279,27 +1279,27 @@
       "members":{
         "AvailabilityZones":{
           "shape":"AvailabilityZones",
-          "documentation":"<p>Provides the list of Amazon EC2 Availability Zones that instances in the DB cluster can be created in.</p>"
+          "documentation":"<p>Provides the list of Amazon EC2 Availability Zones that instances in the cluster can be created in.</p>"
         },
         "BackupRetentionPeriod":{
           "shape":"IntegerOptional",
-          "documentation":"<p>Specifies the number of days for which automatic DB snapshots are retained.</p>"
+          "documentation":"<p>Specifies the number of days for which automatic snapshots are retained.</p>"
         },
         "DBClusterIdentifier":{
           "shape":"String",
-          "documentation":"<p>Contains a user-supplied DB cluster identifier. This identifier is the unique key that identifies a DB cluster.</p>"
+          "documentation":"<p>Contains a user-supplied cluster identifier. This identifier is the unique key that identifies a cluster.</p>"
         },
         "DBClusterParameterGroup":{
           "shape":"String",
-          "documentation":"<p>Specifies the name of the DB cluster parameter group for the DB cluster.</p>"
+          "documentation":"<p>Specifies the name of the cluster parameter group for the cluster.</p>"
         },
         "DBSubnetGroup":{
           "shape":"String",
-          "documentation":"<p>Specifies information on the subnet group that is associated with the DB cluster, including the name, description, and subnets in the subnet group.</p>"
+          "documentation":"<p>Specifies information on the subnet group that is associated with the cluster, including the name, description, and subnets in the subnet group.</p>"
         },
         "Status":{
           "shape":"String",
-          "documentation":"<p>Specifies the current state of this DB cluster.</p>"
+          "documentation":"<p>Specifies the current state of this cluster.</p>"
         },
         "PercentProgress":{
           "shape":"String",
@@ -1311,19 +1311,19 @@
         },
         "Endpoint":{
           "shape":"String",
-          "documentation":"<p>Specifies the connection endpoint for the primary instance of the DB cluster.</p>"
+          "documentation":"<p>Specifies the connection endpoint for the primary instance of the cluster.</p>"
         },
         "ReaderEndpoint":{
           "shape":"String",
-          "documentation":"<p>The reader endpoint for the DB cluster. The reader endpoint for a DB cluster load balances connections across the Amazon DocumentDB replicas that are available in a DB cluster. As clients request new connections to the reader endpoint, Amazon DocumentDB distributes the connection requests among the Amazon DocumentDB replicas in the DB cluster. This functionality can help balance your read workload across multiple Amazon DocumentDB replicas in your DB cluster. </p> <p>If a failover occurs, and the Amazon DocumentDB replica that you are connected to is promoted to be the primary instance, your connection is dropped. To continue sending your read workload to other Amazon DocumentDB replicas in the cluster, you can then reconnect to the reader endpoint.</p>"
+          "documentation":"<p>The reader endpoint for the cluster. The reader endpoint for a cluster load balances connections across the Amazon DocumentDB replicas that are available in a cluster. As clients request new connections to the reader endpoint, Amazon DocumentDB distributes the connection requests among the Amazon DocumentDB replicas in the cluster. This functionality can help balance your read workload across multiple Amazon DocumentDB replicas in your cluster. </p> <p>If a failover occurs, and the Amazon DocumentDB replica that you are connected to is promoted to be the primary instance, your connection is dropped. To continue sending your read workload to other Amazon DocumentDB replicas in the cluster, you can then reconnect to the reader endpoint.</p>"
         },
         "MultiAZ":{
           "shape":"Boolean",
-          "documentation":"<p>Specifies whether the DB cluster has instances in multiple Availability Zones.</p>"
+          "documentation":"<p>Specifies whether the cluster has instances in multiple Availability Zones.</p>"
         },
         "Engine":{
           "shape":"String",
-          "documentation":"<p>Provides the name of the database engine to be used for this DB cluster.</p>"
+          "documentation":"<p>Provides the name of the database engine to be used for this cluster.</p>"
         },
         "EngineVersion":{
           "shape":"String",
@@ -1339,7 +1339,7 @@
         },
         "MasterUsername":{
           "shape":"String",
-          "documentation":"<p>Contains the master user name for the DB cluster.</p>"
+          "documentation":"<p>Contains the master user name for the cluster.</p>"
         },
         "PreferredBackupWindow":{
           "shape":"String",
@@ -1351,11 +1351,11 @@
         },
         "DBClusterMembers":{
           "shape":"DBClusterMemberList",
-          "documentation":"<p>Provides the list of instances that make up the DB cluster.</p>"
+          "documentation":"<p>Provides the list of instances that make up the cluster.</p>"
         },
         "VpcSecurityGroups":{
           "shape":"VpcSecurityGroupMembershipList",
-          "documentation":"<p>Provides a list of virtual private cloud (VPC) security groups that the DB cluster belongs to.</p>"
+          "documentation":"<p>Provides a list of virtual private cloud (VPC) security groups that the cluster belongs to.</p>"
         },
         "HostedZoneId":{
           "shape":"String",
@@ -1363,45 +1363,45 @@
         },
         "StorageEncrypted":{
           "shape":"Boolean",
-          "documentation":"<p>Specifies whether the DB cluster is encrypted.</p>"
+          "documentation":"<p>Specifies whether the cluster is encrypted.</p>"
         },
         "KmsKeyId":{
           "shape":"String",
-          "documentation":"<p>If <code>StorageEncrypted</code> is <code>true</code>, the AWS KMS key identifier for the encrypted DB cluster.</p>"
+          "documentation":"<p>If <code>StorageEncrypted</code> is <code>true</code>, the AWS KMS key identifier for the encrypted cluster.</p>"
         },
         "DbClusterResourceId":{
           "shape":"String",
-          "documentation":"<p>The AWS Region-unique, immutable identifier for the DB cluster. This identifier is found in AWS CloudTrail log entries whenever the AWS KMS key for the DB cluster is accessed.</p>"
+          "documentation":"<p>The AWS Region-unique, immutable identifier for the cluster. This identifier is found in AWS CloudTrail log entries whenever the AWS KMS key for the cluster is accessed.</p>"
         },
         "DBClusterArn":{
           "shape":"String",
-          "documentation":"<p>The Amazon Resource Name (ARN) for the DB cluster.</p>"
+          "documentation":"<p>The Amazon Resource Name (ARN) for the cluster.</p>"
         },
         "AssociatedRoles":{
           "shape":"DBClusterRoles",
-          "documentation":"<p>Provides a list of the AWS Identity and Access Management (IAM) roles that are associated with the DB cluster. IAM roles that are associated with a DB cluster grant permission for the DB cluster to access other AWS services on your behalf.</p>"
+          "documentation":"<p>Provides a list of the AWS Identity and Access Management (IAM) roles that are associated with the cluster. IAM roles that are associated with a cluster grant permission for the cluster to access other AWS services on your behalf.</p>"
         },
         "ClusterCreateTime":{
           "shape":"TStamp",
-          "documentation":"<p>Specifies the time when the DB cluster was created, in Universal Coordinated Time (UTC).</p>"
+          "documentation":"<p>Specifies the time when the cluster was created, in Universal Coordinated Time (UTC).</p>"
         },
         "EnabledCloudwatchLogsExports":{
           "shape":"LogTypeList",
-          "documentation":"<p>A list of log types that this DB cluster is configured to export to Amazon CloudWatch Logs.</p>"
+          "documentation":"<p>A list of log types that this cluster is configured to export to Amazon CloudWatch Logs.</p>"
         },
         "DeletionProtection":{
           "shape":"Boolean",
           "documentation":"<p>Specifies whether this cluster can be deleted. If <code>DeletionProtection</code> is enabled, the cluster cannot be deleted unless it is modified and <code>DeletionProtection</code> is disabled. <code>DeletionProtection</code> protects clusters from being accidentally deleted.</p>"
         }
       },
-      "documentation":"<p>Detailed information about a DB cluster. </p>",
+      "documentation":"<p>Detailed information about a cluster. </p>",
       "wrapper":true
     },
     "DBClusterAlreadyExistsFault":{
       "type":"structure",
       "members":{
       },
-      "documentation":"<p>You already have a DB cluster with the given identifier.</p>",
+      "documentation":"<p>You already have a cluster with the given identifier.</p>",
       "error":{
         "code":"DBClusterAlreadyExistsFault",
         "httpStatusCode":400,
@@ -1421,22 +1421,22 @@
       "members":{
         "DBInstanceIdentifier":{
           "shape":"String",
-          "documentation":"<p>Specifies the instance identifier for this member of the DB cluster.</p>"
+          "documentation":"<p>Specifies the instance identifier for this member of the cluster.</p>"
         },
         "IsClusterWriter":{
           "shape":"Boolean",
-          "documentation":"<p>A value that is <code>true</code> if the cluster member is the primary instance for the DB cluster and <code>false</code> otherwise.</p>"
+          "documentation":"<p>A value that is <code>true</code> if the cluster member is the primary instance for the cluster and <code>false</code> otherwise.</p>"
         },
         "DBClusterParameterGroupStatus":{
           "shape":"String",
-          "documentation":"<p>Specifies the status of the DB cluster parameter group for this member of the DB cluster.</p>"
+          "documentation":"<p>Specifies the status of the cluster parameter group for this member of the DB cluster.</p>"
         },
         "PromotionTier":{
           "shape":"IntegerOptional",
           "documentation":"<p>A value that specifies the order in which an Amazon DocumentDB replica is promoted to the primary instance after a failure of the existing primary instance. </p>"
         }
       },
-      "documentation":"<p>Contains information about an instance that is part of a DB cluster.</p>",
+      "documentation":"<p>Contains information about an instance that is part of a cluster.</p>",
       "wrapper":true
     },
     "DBClusterMemberList":{
@@ -1455,7 +1455,7 @@
         },
         "DBClusters":{
           "shape":"DBClusterList",
-          "documentation":"<p>A list of DB clusters.</p>"
+          "documentation":"<p>A list of clusters.</p>"
         }
       },
       "documentation":"<p>Represents the output of <a>DescribeDBClusters</a>.</p>"
@@ -1464,7 +1464,7 @@
       "type":"structure",
       "members":{
       },
-      "documentation":"<p> <code>DBClusterIdentifier</code> doesn't refer to an existing DB cluster. </p>",
+      "documentation":"<p> <code>DBClusterIdentifier</code> doesn't refer to an existing cluster. </p>",
       "error":{
         "code":"DBClusterNotFoundFault",
         "httpStatusCode":404,
@@ -1477,22 +1477,22 @@
       "members":{
         "DBClusterParameterGroupName":{
           "shape":"String",
-          "documentation":"<p>Provides the name of the DB cluster parameter group.</p>"
+          "documentation":"<p>Provides the name of the cluster parameter group.</p>"
         },
         "DBParameterGroupFamily":{
           "shape":"String",
-          "documentation":"<p>Provides the name of the DB parameter group family that this DB cluster parameter group is compatible with.</p>"
+          "documentation":"<p>Provides the name of the parameter group family that this cluster parameter group is compatible with.</p>"
         },
         "Description":{
           "shape":"String",
-          "documentation":"<p>Provides the customer-specified description for this DB cluster parameter group.</p>"
+          "documentation":"<p>Provides the customer-specified description for this cluster parameter group.</p>"
         },
         "DBClusterParameterGroupArn":{
           "shape":"String",
-          "documentation":"<p>The Amazon Resource Name (ARN) for the DB cluster parameter group.</p>"
+          "documentation":"<p>The Amazon Resource Name (ARN) for the cluster parameter group.</p>"
         }
       },
-      "documentation":"<p>Detailed information about a DB cluster parameter group. </p>",
+      "documentation":"<p>Detailed information about a cluster parameter group. </p>",
       "wrapper":true
     },
     "DBClusterParameterGroupDetails":{
@@ -1500,7 +1500,7 @@
       "members":{
         "Parameters":{
           "shape":"ParametersList",
-          "documentation":"<p>Provides a list of parameters for the DB cluster parameter group.</p>"
+          "documentation":"<p>Provides a list of parameters for the cluster parameter group.</p>"
         },
         "Marker":{
           "shape":"String",
@@ -1521,16 +1521,16 @@
       "members":{
         "DBClusterParameterGroupName":{
           "shape":"String",
-          "documentation":"<p>The name of a DB cluster parameter group.</p> <p>Constraints:</p> <ul> <li> <p>Must be from 1 to 255 letters or numbers.</p> </li> <li> <p>The first character must be a letter.</p> </li> <li> <p>Cannot end with a hyphen or contain two consecutive hyphens.</p> </li> </ul> <note> <p>This value is stored as a lowercase string.</p> </note>"
+          "documentation":"<p>The name of a cluster parameter group.</p> <p>Constraints:</p> <ul> <li> <p>Must be from 1 to 255 letters or numbers.</p> </li> <li> <p>The first character must be a letter.</p> </li> <li> <p>Cannot end with a hyphen or contain two consecutive hyphens.</p> </li> </ul> <note> <p>This value is stored as a lowercase string.</p> </note>"
         }
       },
-      "documentation":"<p>Contains the name of a DB cluster parameter group.</p>"
+      "documentation":"<p>Contains the name of a cluster parameter group.</p>"
     },
     "DBClusterParameterGroupNotFoundFault":{
       "type":"structure",
       "members":{
       },
-      "documentation":"<p> <code>DBClusterParameterGroupName</code> doesn't refer to an existing DB cluster parameter group. </p>",
+      "documentation":"<p> <code>DBClusterParameterGroupName</code> doesn't refer to an existing cluster parameter group. </p>",
       "error":{
         "code":"DBClusterParameterGroupNotFound",
         "httpStatusCode":404,
@@ -1547,7 +1547,7 @@
         },
         "DBClusterParameterGroups":{
           "shape":"DBClusterParameterGroupList",
-          "documentation":"<p>A list of DB cluster parameter groups.</p>"
+          "documentation":"<p>A list of cluster parameter groups.</p>"
         }
       },
       "documentation":"<p>Represents the output of <a>DBClusterParameterGroups</a>.</p>"
@@ -1556,7 +1556,7 @@
       "type":"structure",
       "members":{
       },
-      "documentation":"<p>The DB cluster can't be created because you have reached the maximum allowed quota of DB clusters.</p>",
+      "documentation":"<p>The cluster can't be created because you have reached the maximum allowed quota of clusters.</p>",
       "error":{
         "code":"DBClusterQuotaExceededFault",
         "httpStatusCode":403,
@@ -1573,10 +1573,10 @@
         },
         "Status":{
           "shape":"String",
-          "documentation":"<p>Describes the state of association between the IAM role and the DB cluster. The <code>Status</code> property returns one of the following values:</p> <ul> <li> <p> <code>ACTIVE</code> - The IAM role ARN is associated with the DB cluster and can be used to access other AWS services on your behalf.</p> </li> <li> <p> <code>PENDING</code> - The IAM role ARN is being associated with the DB cluster.</p> </li> <li> <p> <code>INVALID</code> - The IAM role ARN is associated with the DB cluster, but the DB cluster cannot assume the IAM role to access other AWS services on your behalf.</p> </li> </ul>"
+          "documentation":"<p>Describes the state of association between the IAM role and the cluster. The <code>Status</code> property returns one of the following values:</p> <ul> <li> <p> <code>ACTIVE</code> - The IAM role ARN is associated with the cluster and can be used to access other AWS services on your behalf.</p> </li> <li> <p> <code>PENDING</code> - The IAM role ARN is being associated with the DB cluster.</p> </li> <li> <p> <code>INVALID</code> - The IAM role ARN is associated with the cluster, but the cluster cannot assume the IAM role to access other AWS services on your behalf.</p> </li> </ul>"
         }
       },
-      "documentation":"<p>Describes an AWS Identity and Access Management (IAM) role that is associated with a DB cluster.</p>"
+      "documentation":"<p>Describes an AWS Identity and Access Management (IAM) role that is associated with a cluster.</p>"
     },
     "DBClusterRoles":{
       "type":"list",
@@ -1590,15 +1590,15 @@
       "members":{
         "AvailabilityZones":{
           "shape":"AvailabilityZones",
-          "documentation":"<p>Provides the list of Amazon EC2 Availability Zones that instances in the DB cluster snapshot can be restored in.</p>"
+          "documentation":"<p>Provides the list of Amazon EC2 Availability Zones that instances in the cluster snapshot can be restored in.</p>"
         },
         "DBClusterSnapshotIdentifier":{
           "shape":"String",
-          "documentation":"<p>Specifies the identifier for the DB cluster snapshot.</p>"
+          "documentation":"<p>Specifies the identifier for the cluster snapshot.</p>"
         },
         "DBClusterIdentifier":{
           "shape":"String",
-          "documentation":"<p>Specifies the DB cluster identifier of the DB cluster that this DB cluster snapshot was created from.</p>"
+          "documentation":"<p>Specifies the cluster identifier of the cluster that this cluster snapshot was created from.</p>"
         },
         "SnapshotCreateTime":{
           "shape":"TStamp",
@@ -1610,31 +1610,31 @@
         },
         "Status":{
           "shape":"String",
-          "documentation":"<p>Specifies the status of this DB cluster snapshot.</p>"
+          "documentation":"<p>Specifies the status of this cluster snapshot.</p>"
         },
         "Port":{
           "shape":"Integer",
-          "documentation":"<p>Specifies the port that the DB cluster was listening on at the time of the snapshot.</p>"
+          "documentation":"<p>Specifies the port that the cluster was listening on at the time of the snapshot.</p>"
         },
         "VpcId":{
           "shape":"String",
-          "documentation":"<p>Provides the virtual private cloud (VPC) ID that is associated with the DB cluster snapshot.</p>"
+          "documentation":"<p>Provides the virtual private cloud (VPC) ID that is associated with the cluster snapshot.</p>"
         },
         "ClusterCreateTime":{
           "shape":"TStamp",
-          "documentation":"<p>Specifies the time when the DB cluster was created, in Universal Coordinated Time (UTC).</p>"
+          "documentation":"<p>Specifies the time when the cluster was created, in Universal Coordinated Time (UTC).</p>"
         },
         "MasterUsername":{
           "shape":"String",
-          "documentation":"<p>Provides the master user name for the DB cluster snapshot.</p>"
+          "documentation":"<p>Provides the master user name for the cluster snapshot.</p>"
         },
         "EngineVersion":{
           "shape":"String",
-          "documentation":"<p>Provides the version of the database engine for this DB cluster snapshot.</p>"
+          "documentation":"<p>Provides the version of the database engine for this cluster snapshot.</p>"
         },
         "SnapshotType":{
           "shape":"String",
-          "documentation":"<p>Provides the type of the DB cluster snapshot.</p>"
+          "documentation":"<p>Provides the type of the cluster snapshot.</p>"
         },
         "PercentProgress":{
           "shape":"Integer",
@@ -1642,29 +1642,29 @@
         },
         "StorageEncrypted":{
           "shape":"Boolean",
-          "documentation":"<p>Specifies whether the DB cluster snapshot is encrypted.</p>"
+          "documentation":"<p>Specifies whether the cluster snapshot is encrypted.</p>"
         },
         "KmsKeyId":{
           "shape":"String",
-          "documentation":"<p>If <code>StorageEncrypted</code> is <code>true</code>, the AWS KMS key identifier for the encrypted DB cluster snapshot.</p>"
+          "documentation":"<p>If <code>StorageEncrypted</code> is <code>true</code>, the AWS KMS key identifier for the encrypted cluster snapshot.</p>"
         },
         "DBClusterSnapshotArn":{
           "shape":"String",
-          "documentation":"<p>The Amazon Resource Name (ARN) for the DB cluster snapshot.</p>"
+          "documentation":"<p>The Amazon Resource Name (ARN) for the cluster snapshot.</p>"
         },
         "SourceDBClusterSnapshotArn":{
           "shape":"String",
-          "documentation":"<p>If the DB cluster snapshot was copied from a source DB cluster snapshot, the ARN for the source DB cluster snapshot; otherwise, a null value.</p>"
+          "documentation":"<p>If the cluster snapshot was copied from a source cluster snapshot, the ARN for the source cluster snapshot; otherwise, a null value.</p>"
         }
       },
-      "documentation":"<p>Detailed information about a DB cluster snapshot. </p>",
+      "documentation":"<p>Detailed information about a cluster snapshot. </p>",
       "wrapper":true
     },
     "DBClusterSnapshotAlreadyExistsFault":{
       "type":"structure",
       "members":{
       },
-      "documentation":"<p>You already have a DB cluster snapshot with the given identifier.</p>",
+      "documentation":"<p>You already have a cluster snapshot with the given identifier.</p>",
       "error":{
         "code":"DBClusterSnapshotAlreadyExistsFault",
         "httpStatusCode":400,
@@ -1677,14 +1677,14 @@
       "members":{
         "AttributeName":{
           "shape":"String",
-          "documentation":"<p>The name of the manual DB cluster snapshot attribute.</p> <p>The attribute named <code>restore</code> refers to the list of AWS accounts that have permission to copy or restore the manual DB cluster snapshot.</p>"
+          "documentation":"<p>The name of the manual cluster snapshot attribute.</p> <p>The attribute named <code>restore</code> refers to the list of AWS accounts that have permission to copy or restore the manual cluster snapshot.</p>"
         },
         "AttributeValues":{
           "shape":"AttributeValueList",
-          "documentation":"<p>The values for the manual DB cluster snapshot attribute.</p> <p>If the <code>AttributeName</code> field is set to <code>restore</code>, then this element returns a list of IDs of the AWS accounts that are authorized to copy or restore the manual DB cluster snapshot. If a value of <code>all</code> is in the list, then the manual DB cluster snapshot is public and available for any AWS account to copy or restore.</p>"
+          "documentation":"<p>The values for the manual cluster snapshot attribute.</p> <p>If the <code>AttributeName</code> field is set to <code>restore</code>, then this element returns a list of IDs of the AWS accounts that are authorized to copy or restore the manual cluster snapshot. If a value of <code>all</code> is in the list, then the manual cluster snapshot is public and available for any AWS account to copy or restore.</p>"
         }
       },
-      "documentation":"<p>Contains the name and values of a manual DB cluster snapshot attribute.</p> <p>Manual DB cluster snapshot attributes are used to authorize other AWS accounts to restore a manual DB cluster snapshot.</p>"
+      "documentation":"<p>Contains the name and values of a manual cluster snapshot attribute.</p> <p>Manual cluster snapshot attributes are used to authorize other AWS accounts to restore a manual cluster snapshot.</p>"
     },
     "DBClusterSnapshotAttributeList":{
       "type":"list",
@@ -1698,14 +1698,14 @@
       "members":{
         "DBClusterSnapshotIdentifier":{
           "shape":"String",
-          "documentation":"<p>The identifier of the DB cluster snapshot that the attributes apply to.</p>"
+          "documentation":"<p>The identifier of the cluster snapshot that the attributes apply to.</p>"
         },
         "DBClusterSnapshotAttributes":{
           "shape":"DBClusterSnapshotAttributeList",
-          "documentation":"<p>The list of attributes and values for the DB cluster snapshot.</p>"
+          "documentation":"<p>The list of attributes and values for the cluster snapshot.</p>"
         }
       },
-      "documentation":"<p>Detailed information about the attributes that are associated with a DB cluster snapshot.</p>",
+      "documentation":"<p>Detailed information about the attributes that are associated with a cluster snapshot.</p>",
       "wrapper":true
     },
     "DBClusterSnapshotList":{
@@ -1724,7 +1724,7 @@
         },
         "DBClusterSnapshots":{
           "shape":"DBClusterSnapshotList",
-          "documentation":"<p>Provides a list of DB cluster snapshots.</p>"
+          "documentation":"<p>Provides a list of cluster snapshots.</p>"
         }
       },
       "documentation":"<p>Represents the output of <a>DescribeDBClusterSnapshots</a>.</p>"
@@ -1733,7 +1733,7 @@
       "type":"structure",
       "members":{
       },
-      "documentation":"<p> <code>DBClusterSnapshotIdentifier</code> doesn't refer to an existing DB cluster snapshot. </p>",
+      "documentation":"<p> <code>DBClusterSnapshotIdentifier</code> doesn't refer to an existing cluster snapshot. </p>",
       "error":{
         "code":"DBClusterSnapshotNotFoundFault",
         "httpStatusCode":404,
@@ -1754,7 +1754,7 @@
         },
         "DBParameterGroupFamily":{
           "shape":"String",
-          "documentation":"<p>The name of the DB parameter group family for the database engine.</p>"
+          "documentation":"<p>The name of the parameter group family for the database engine.</p>"
         },
         "DBEngineDescription":{
           "shape":"String",
@@ -1777,7 +1777,7 @@
           "documentation":"<p>A value that indicates whether the engine version supports exporting the log types specified by <code>ExportableLogTypes</code> to CloudWatch Logs.</p>"
         }
       },
-      "documentation":"<p> Detailed information about a DB engine version. </p>"
+      "documentation":"<p> Detailed information about an engine version. </p>"
     },
     "DBEngineVersionList":{
       "type":"list",
@@ -1795,7 +1795,7 @@
         },
         "DBEngineVersions":{
           "shape":"DBEngineVersionList",
-          "documentation":"<p>Detailed information about one or more DB engine versions.</p>"
+          "documentation":"<p>Detailed information about one or more engine versions.</p>"
         }
       },
       "documentation":"<p>Represents the output of <a>DescribeDBEngineVersions</a>.</p>"
@@ -1805,15 +1805,15 @@
       "members":{
         "DBInstanceIdentifier":{
           "shape":"String",
-          "documentation":"<p>Contains a user-provided database identifier. This identifier is the unique key that identifies a DB instance.</p>"
+          "documentation":"<p>Contains a user-provided database identifier. This identifier is the unique key that identifies an instance.</p>"
         },
         "DBInstanceClass":{
           "shape":"String",
-          "documentation":"<p>Contains the name of the compute and memory capacity class of the DB instance.</p>"
+          "documentation":"<p>Contains the name of the compute and memory capacity class of the instance.</p>"
         },
         "Engine":{
           "shape":"String",
-          "documentation":"<p>Provides the name of the database engine to be used for this DB instance.</p>"
+          "documentation":"<p>Provides the name of the database engine to be used for this instance.</p>"
         },
         "DBInstanceStatus":{
           "shape":"String",
@@ -1825,7 +1825,7 @@
         },
         "InstanceCreateTime":{
           "shape":"TStamp",
-          "documentation":"<p>Provides the date and time that the DB instance was created.</p>"
+          "documentation":"<p>Provides the date and time that the instance was created.</p>"
         },
         "PreferredBackupWindow":{
           "shape":"String",
@@ -1833,19 +1833,19 @@
         },
         "BackupRetentionPeriod":{
           "shape":"Integer",
-          "documentation":"<p>Specifies the number of days for which automatic DB snapshots are retained.</p>"
+          "documentation":"<p>Specifies the number of days for which automatic snapshots are retained.</p>"
         },
         "VpcSecurityGroups":{
           "shape":"VpcSecurityGroupMembershipList",
-          "documentation":"<p>Provides a list of VPC security group elements that the DB instance belongs to.</p>"
+          "documentation":"<p>Provides a list of VPC security group elements that the instance belongs to.</p>"
         },
         "AvailabilityZone":{
           "shape":"String",
-          "documentation":"<p>Specifies the name of the Availability Zone that the DB instance is located in.</p>"
+          "documentation":"<p>Specifies the name of the Availability Zone that the instance is located in.</p>"
         },
         "DBSubnetGroup":{
           "shape":"DBSubnetGroup",
-          "documentation":"<p>Specifies information on the subnet group that is associated with the DB instance, including the name, description, and subnets in the subnet group.</p>"
+          "documentation":"<p>Specifies information on the subnet group that is associated with the instance, including the name, description, and subnets in the subnet group.</p>"
         },
         "PreferredMaintenanceWindow":{
           "shape":"String",
@@ -1853,7 +1853,7 @@
         },
         "PendingModifiedValues":{
           "shape":"PendingModifiedValues",
-          "documentation":"<p>Specifies that changes to the DB instance are pending. This element is included only when changes are pending. Specific changes are identified by subelements.</p>"
+          "documentation":"<p>Specifies that changes to the instance are pending. This element is included only when changes are pending. Specific changes are identified by subelements.</p>"
         },
         "LatestRestorableTime":{
           "shape":"TStamp",
@@ -1877,19 +1877,19 @@
         },
         "DBClusterIdentifier":{
           "shape":"String",
-          "documentation":"<p>Contains the name of the DB cluster that the DB instance is a member of if the DB instance is a member of a DB cluster.</p>"
+          "documentation":"<p>Contains the name of the cluster that the instance is a member of if the instance is a member of a cluster.</p>"
         },
         "StorageEncrypted":{
           "shape":"Boolean",
-          "documentation":"<p>Specifies whether or not the DB instance is encrypted.</p>"
+          "documentation":"<p>Specifies whether or not the instance is encrypted.</p>"
         },
         "KmsKeyId":{
           "shape":"String",
-          "documentation":"<p> If <code>StorageEncrypted</code> is <code>true</code>, the AWS KMS key identifier for the encrypted DB instance. </p>"
+          "documentation":"<p> If <code>StorageEncrypted</code> is <code>true</code>, the AWS KMS key identifier for the encrypted instance. </p>"
         },
         "DbiResourceId":{
           "shape":"String",
-          "documentation":"<p>The AWS Region-unique, immutable identifier for the DB instance. This identifier is found in AWS CloudTrail log entries whenever the AWS KMS key for the DB instance is accessed.</p>"
+          "documentation":"<p>The AWS Region-unique, immutable identifier for the instance. This identifier is found in AWS CloudTrail log entries whenever the AWS KMS key for the instance is accessed.</p>"
         },
         "CACertificateIdentifier":{
           "shape":"String",
@@ -1901,21 +1901,21 @@
         },
         "DBInstanceArn":{
           "shape":"String",
-          "documentation":"<p>The Amazon Resource Name (ARN) for the DB instance.</p>"
+          "documentation":"<p>The Amazon Resource Name (ARN) for the instance.</p>"
         },
         "EnabledCloudwatchLogsExports":{
           "shape":"LogTypeList",
-          "documentation":"<p>A list of log types that this DB instance is configured to export to Amazon CloudWatch Logs.</p>"
+          "documentation":"<p>A list of log types that this instance is configured to export to Amazon CloudWatch Logs.</p>"
         }
       },
-      "documentation":"<p>Detailed information about a DB instance. </p>",
+      "documentation":"<p>Detailed information about an instance. </p>",
       "wrapper":true
     },
     "DBInstanceAlreadyExistsFault":{
       "type":"structure",
       "members":{
       },
-      "documentation":"<p>You already have a DB instance with the given identifier.</p>",
+      "documentation":"<p>You already have a instance with the given identifier.</p>",
       "error":{
         "code":"DBInstanceAlreadyExists",
         "httpStatusCode":400,
@@ -1939,7 +1939,7 @@
         },
         "DBInstances":{
           "shape":"DBInstanceList",
-          "documentation":"<p>Detailed information about one or more DB instances. </p>"
+          "documentation":"<p>Detailed information about one or more instances. </p>"
         }
       },
       "documentation":"<p>Represents the output of <a>DescribeDBInstances</a>.</p>"
@@ -1948,7 +1948,7 @@
       "type":"structure",
       "members":{
       },
-      "documentation":"<p> <code>DBInstanceIdentifier</code> doesn't refer to an existing DB instance. </p>",
+      "documentation":"<p> <code>DBInstanceIdentifier</code> doesn't refer to an existing instance. </p>",
       "error":{
         "code":"DBInstanceNotFound",
         "httpStatusCode":404,
@@ -1969,14 +1969,14 @@
         },
         "Status":{
           "shape":"String",
-          "documentation":"<p>Status of the DB instance. For a <code>StatusType</code> of read replica, the values can be <code>replicating</code>, error, <code>stopped</code>, or <code>terminated</code>.</p>"
+          "documentation":"<p>Status of the instance. For a <code>StatusType</code> of read replica, the values can be <code>replicating</code>, error, <code>stopped</code>, or <code>terminated</code>.</p>"
         },
         "Message":{
           "shape":"String",
           "documentation":"<p>Details of the error if there is an error for the instance. If the instance is not in an error state, this value is blank.</p>"
         }
       },
-      "documentation":"<p>Provides a list of status information for a DB instance.</p>"
+      "documentation":"<p>Provides a list of status information for an instance.</p>"
     },
     "DBInstanceStatusInfoList":{
       "type":"list",
@@ -1989,7 +1989,7 @@
       "type":"structure",
       "members":{
       },
-      "documentation":"<p>A DB parameter group with the same name already exists.</p>",
+      "documentation":"<p>A parameter group with the same name already exists.</p>",
       "error":{
         "code":"DBParameterGroupAlreadyExists",
         "httpStatusCode":400,
@@ -2001,7 +2001,7 @@
       "type":"structure",
       "members":{
       },
-      "documentation":"<p> <code>DBParameterGroupName</code> doesn't refer to an existing DB parameter group. </p>",
+      "documentation":"<p> <code>DBParameterGroupName</code> doesn't refer to an existing parameter group. </p>",
       "error":{
         "code":"DBParameterGroupNotFound",
         "httpStatusCode":404,
@@ -2013,7 +2013,7 @@
       "type":"structure",
       "members":{
       },
-      "documentation":"<p>This request would cause you to exceed the allowed number of DB parameter groups.</p>",
+      "documentation":"<p>This request would cause you to exceed the allowed number of parameter groups.</p>",
       "error":{
         "code":"DBParameterGroupQuotaExceeded",
         "httpStatusCode":400,
@@ -2025,7 +2025,7 @@
       "type":"structure",
       "members":{
       },
-      "documentation":"<p> <code>DBSecurityGroupName</code> doesn't refer to an existing DB security group. </p>",
+      "documentation":"<p> <code>DBSecurityGroupName</code> doesn't refer to an existing security group. </p>",
       "error":{
         "code":"DBSecurityGroupNotFound",
         "httpStatusCode":404,
@@ -2049,7 +2049,7 @@
       "type":"structure",
       "members":{
       },
-      "documentation":"<p> <code>DBSnapshotIdentifier</code> doesn't refer to an existing DB snapshot. </p>",
+      "documentation":"<p> <code>DBSnapshotIdentifier</code> doesn't refer to an existing snapshot. </p>",
       "error":{
         "code":"DBSnapshotNotFound",
         "httpStatusCode":404,
@@ -2062,37 +2062,37 @@
       "members":{
         "DBSubnetGroupName":{
           "shape":"String",
-          "documentation":"<p>The name of the DB subnet group.</p>"
+          "documentation":"<p>The name of the subnet group.</p>"
         },
         "DBSubnetGroupDescription":{
           "shape":"String",
-          "documentation":"<p>Provides the description of the DB subnet group.</p>"
+          "documentation":"<p>Provides the description of the subnet group.</p>"
         },
         "VpcId":{
           "shape":"String",
-          "documentation":"<p>Provides the virtual private cloud (VPC) ID of the DB subnet group.</p>"
+          "documentation":"<p>Provides the virtual private cloud (VPC) ID of the subnet group.</p>"
         },
         "SubnetGroupStatus":{
           "shape":"String",
-          "documentation":"<p>Provides the status of the DB subnet group.</p>"
+          "documentation":"<p>Provides the status of the subnet group.</p>"
         },
         "Subnets":{
           "shape":"SubnetList",
-          "documentation":"<p>Detailed information about one or more subnets within a DB subnet group.</p>"
+          "documentation":"<p>Detailed information about one or more subnets within a subnet group.</p>"
         },
         "DBSubnetGroupArn":{
           "shape":"String",
           "documentation":"<p>The Amazon Resource Name (ARN) for the DB subnet group.</p>"
         }
       },
-      "documentation":"<p>Detailed information about a DB subnet group. </p>",
+      "documentation":"<p>Detailed information about a subnet group. </p>",
       "wrapper":true
     },
     "DBSubnetGroupAlreadyExistsFault":{
       "type":"structure",
       "members":{
       },
-      "documentation":"<p> <code>DBSubnetGroupName</code> is already being used by an existing DB subnet group. </p>",
+      "documentation":"<p> <code>DBSubnetGroupName</code> is already being used by an existing subnet group. </p>",
       "error":{
         "code":"DBSubnetGroupAlreadyExists",
         "httpStatusCode":400,
@@ -2104,7 +2104,7 @@
       "type":"structure",
       "members":{
       },
-      "documentation":"<p>Subnets in the DB subnet group should cover at least two Availability Zones unless there is only one Availability Zone.</p>",
+      "documentation":"<p>Subnets in the subnet group should cover at least two Availability Zones unless there is only one Availability Zone.</p>",
       "error":{
         "code":"DBSubnetGroupDoesNotCoverEnoughAZs",
         "httpStatusCode":400,
@@ -2121,7 +2121,7 @@
         },
         "DBSubnetGroups":{
           "shape":"DBSubnetGroups",
-          "documentation":"<p>Detailed information about one or more DB subnet groups.</p>"
+          "documentation":"<p>Detailed information about one or more subnet groups.</p>"
         }
       },
       "documentation":"<p>Represents the output of <a>DescribeDBSubnetGroups</a>.</p>"
@@ -2130,7 +2130,7 @@
       "type":"structure",
       "members":{
       },
-      "documentation":"<p> <code>DBSubnetGroupName</code> doesn't refer to an existing DB subnet group. </p>",
+      "documentation":"<p> <code>DBSubnetGroupName</code> doesn't refer to an existing subnet group. </p>",
       "error":{
         "code":"DBSubnetGroupNotFoundFault",
         "httpStatusCode":404,
@@ -2142,7 +2142,7 @@
       "type":"structure",
       "members":{
       },
-      "documentation":"<p>The request would cause you to exceed the allowed number of DB subnet groups.</p>",
+      "documentation":"<p>The request would cause you to exceed the allowed number of subnet groups.</p>",
       "error":{
         "code":"DBSubnetGroupQuotaExceeded",
         "httpStatusCode":400,
@@ -2161,7 +2161,7 @@
       "type":"structure",
       "members":{
       },
-      "documentation":"<p>The request would cause you to exceed the allowed number of subnets in a DB subnet group.</p>",
+      "documentation":"<p>The request would cause you to exceed the allowed number of subnets in a subnet group.</p>",
       "error":{
         "code":"DBSubnetQuotaExceededFault",
         "httpStatusCode":400,
@@ -2173,7 +2173,7 @@
       "type":"structure",
       "members":{
       },
-      "documentation":"<p>The DB upgrade failed because a resource that the DB depends on can't be modified.</p>",
+      "documentation":"<p>The upgrade failed because a resource that the depends on can't be modified.</p>",
       "error":{
         "code":"DBUpgradeDependencyFailure",
         "httpStatusCode":400,
@@ -2187,15 +2187,15 @@
       "members":{
         "DBClusterIdentifier":{
           "shape":"String",
-          "documentation":"<p>The DB cluster identifier for the DB cluster to be deleted. This parameter isn't case sensitive.</p> <p>Constraints:</p> <ul> <li> <p>Must match an existing <code>DBClusterIdentifier</code>.</p> </li> </ul>"
+          "documentation":"<p>The cluster identifier for the cluster to be deleted. This parameter isn't case sensitive.</p> <p>Constraints:</p> <ul> <li> <p>Must match an existing <code>DBClusterIdentifier</code>.</p> </li> </ul>"
         },
         "SkipFinalSnapshot":{
           "shape":"Boolean",
-          "documentation":"<p> Determines whether a final DB cluster snapshot is created before the DB cluster is deleted. If <code>true</code> is specified, no DB cluster snapshot is created. If <code>false</code> is specified, a DB cluster snapshot is created before the DB cluster is deleted. </p> <note> <p>If <code>SkipFinalSnapshot</code> is <code>false</code>, you must specify a <code>FinalDBSnapshotIdentifier</code> parameter.</p> </note> <p>Default: <code>false</code> </p>"
+          "documentation":"<p> Determines whether a final cluster snapshot is created before the cluster is deleted. If <code>true</code> is specified, no cluster snapshot is created. If <code>false</code> is specified, a cluster snapshot is created before the DB cluster is deleted. </p> <note> <p>If <code>SkipFinalSnapshot</code> is <code>false</code>, you must specify a <code>FinalDBSnapshotIdentifier</code> parameter.</p> </note> <p>Default: <code>false</code> </p>"
         },
         "FinalDBSnapshotIdentifier":{
           "shape":"String",
-          "documentation":"<p> The DB cluster snapshot identifier of the new DB cluster snapshot created when <code>SkipFinalSnapshot</code> is set to <code>false</code>. </p> <note> <p> Specifying this parameter and also setting the <code>SkipFinalShapshot</code> parameter to <code>true</code> results in an error. </p> </note> <p>Constraints:</p> <ul> <li> <p>Must be from 1 to 255 letters, numbers, or hyphens.</p> </li> <li> <p>The first character must be a letter.</p> </li> <li> <p>Cannot end with a hyphen or contain two consecutive hyphens.</p> </li> </ul>"
+          "documentation":"<p> The cluster snapshot identifier of the new cluster snapshot created when <code>SkipFinalSnapshot</code> is set to <code>false</code>. </p> <note> <p> Specifying this parameter and also setting the <code>SkipFinalShapshot</code> parameter to <code>true</code> results in an error. </p> </note> <p>Constraints:</p> <ul> <li> <p>Must be from 1 to 255 letters, numbers, or hyphens.</p> </li> <li> <p>The first character must be a letter.</p> </li> <li> <p>Cannot end with a hyphen or contain two consecutive hyphens.</p> </li> </ul>"
         }
       },
       "documentation":"<p>Represents the input to <a>DeleteDBCluster</a>.</p>"
@@ -2206,7 +2206,7 @@
       "members":{
         "DBClusterParameterGroupName":{
           "shape":"String",
-          "documentation":"<p>The name of the DB cluster parameter group.</p> <p>Constraints:</p> <ul> <li> <p>Must be the name of an existing DB cluster parameter group.</p> </li> <li> <p>You can't delete a default DB cluster parameter group.</p> </li> <li> <p>Cannot be associated with any DB clusters.</p> </li> </ul>"
+          "documentation":"<p>The name of the cluster parameter group.</p> <p>Constraints:</p> <ul> <li> <p>Must be the name of an existing cluster parameter group.</p> </li> <li> <p>You can't delete a default cluster parameter group.</p> </li> <li> <p>Cannot be associated with any clusters.</p> </li> </ul>"
         }
       },
       "documentation":"<p>Represents the input to <a>DeleteDBClusterParameterGroup</a>.</p>"
@@ -2223,7 +2223,7 @@
       "members":{
         "DBClusterSnapshotIdentifier":{
           "shape":"String",
-          "documentation":"<p>The identifier of the DB cluster snapshot to delete.</p> <p>Constraints: Must be the name of an existing DB cluster snapshot in the <code>available</code> state.</p>"
+          "documentation":"<p>The identifier of the cluster snapshot to delete.</p> <p>Constraints: Must be the name of an existing cluster snapshot in the <code>available</code> state.</p>"
         }
       },
       "documentation":"<p>Represents the input to <a>DeleteDBClusterSnapshot</a>.</p>"
@@ -2240,7 +2240,7 @@
       "members":{
         "DBInstanceIdentifier":{
           "shape":"String",
-          "documentation":"<p>The DB instance identifier for the DB instance to be deleted. This parameter isn't case sensitive.</p> <p>Constraints:</p> <ul> <li> <p>Must match the name of an existing DB instance.</p> </li> </ul>"
+          "documentation":"<p>The instance identifier for the instance to be deleted. This parameter isn't case sensitive.</p> <p>Constraints:</p> <ul> <li> <p>Must match the name of an existing instance.</p> </li> </ul>"
         }
       },
       "documentation":"<p>Represents the input to <a>DeleteDBInstance</a>.</p>"
@@ -2288,7 +2288,7 @@
       "members":{
         "DBClusterParameterGroupName":{
           "shape":"String",
-          "documentation":"<p>The name of a specific DB cluster parameter group to return details for.</p> <p>Constraints:</p> <ul> <li> <p>If provided, must match the name of an existing <code>DBClusterParameterGroup</code>.</p> </li> </ul>"
+          "documentation":"<p>The name of a specific cluster parameter group to return details for.</p> <p>Constraints:</p> <ul> <li> <p>If provided, must match the name of an existing <code>DBClusterParameterGroup</code>.</p> </li> </ul>"
         },
         "Filters":{
           "shape":"FilterList",
@@ -2311,7 +2311,7 @@
       "members":{
         "DBClusterParameterGroupName":{
           "shape":"String",
-          "documentation":"<p>The name of a specific DB cluster parameter group to return parameter details for.</p> <p>Constraints:</p> <ul> <li> <p>If provided, must match the name of an existing <code>DBClusterParameterGroup</code>.</p> </li> </ul>"
+          "documentation":"<p>The name of a specific cluster parameter group to return parameter details for.</p> <p>Constraints:</p> <ul> <li> <p>If provided, must match the name of an existing <code>DBClusterParameterGroup</code>.</p> </li> </ul>"
         },
         "Source":{
           "shape":"String",
@@ -2338,7 +2338,7 @@
       "members":{
         "DBClusterSnapshotIdentifier":{
           "shape":"String",
-          "documentation":"<p>The identifier for the DB cluster snapshot to describe the attributes for.</p>"
+          "documentation":"<p>The identifier for the cluster snapshot to describe the attributes for.</p>"
         }
       },
       "documentation":"<p>Represents the input to <a>DescribeDBClusterSnapshotAttributes</a>.</p>"
@@ -2354,15 +2354,15 @@
       "members":{
         "DBClusterIdentifier":{
           "shape":"String",
-          "documentation":"<p>The ID of the DB cluster to retrieve the list of DB cluster snapshots for. This parameter can't be used with the <code>DBClusterSnapshotIdentifier</code> parameter. This parameter is not case sensitive. </p> <p>Constraints:</p> <ul> <li> <p>If provided, must match the identifier of an existing <code>DBCluster</code>.</p> </li> </ul>"
+          "documentation":"<p>The ID of the cluster to retrieve the list of cluster snapshots for. This parameter can't be used with the <code>DBClusterSnapshotIdentifier</code> parameter. This parameter is not case sensitive. </p> <p>Constraints:</p> <ul> <li> <p>If provided, must match the identifier of an existing <code>DBCluster</code>.</p> </li> </ul>"
         },
         "DBClusterSnapshotIdentifier":{
           "shape":"String",
-          "documentation":"<p>A specific DB cluster snapshot identifier to describe. This parameter can't be used with the <code>DBClusterIdentifier</code> parameter. This value is stored as a lowercase string. </p> <p>Constraints:</p> <ul> <li> <p>If provided, must match the identifier of an existing <code>DBClusterSnapshot</code>.</p> </li> <li> <p>If this identifier is for an automated snapshot, the <code>SnapshotType</code> parameter must also be specified.</p> </li> </ul>"
+          "documentation":"<p>A specific cluster snapshot identifier to describe. This parameter can't be used with the <code>DBClusterIdentifier</code> parameter. This value is stored as a lowercase string. </p> <p>Constraints:</p> <ul> <li> <p>If provided, must match the identifier of an existing <code>DBClusterSnapshot</code>.</p> </li> <li> <p>If this identifier is for an automated snapshot, the <code>SnapshotType</code> parameter must also be specified.</p> </li> </ul>"
         },
         "SnapshotType":{
           "shape":"String",
-          "documentation":"<p>The type of DB cluster snapshots to be returned. You can specify one of the following values:</p> <ul> <li> <p> <code>automated</code> - Return all DB cluster snapshots that Amazon DocumentDB has automatically created for your AWS account.</p> </li> <li> <p> <code>manual</code> - Return all DB cluster snapshots that you have manually created for your AWS account.</p> </li> <li> <p> <code>shared</code> - Return all manual DB cluster snapshots that have been shared to your AWS account.</p> </li> <li> <p> <code>public</code> - Return all DB cluster snapshots that have been marked as public.</p> </li> </ul> <p>If you don't specify a <code>SnapshotType</code> value, then both automated and manual DB cluster snapshots are returned. You can include shared DB cluster snapshots with these results by setting the <code>IncludeShared</code> parameter to <code>true</code>. You can include public DB cluster snapshots with these results by setting the <code>IncludePublic</code> parameter to <code>true</code>.</p> <p>The <code>IncludeShared</code> and <code>IncludePublic</code> parameters don't apply for <code>SnapshotType</code> values of <code>manual</code> or <code>automated</code>. The <code>IncludePublic</code> parameter doesn't apply when <code>SnapshotType</code> is set to <code>shared</code>. The <code>IncludeShared</code> parameter doesn't apply when <code>SnapshotType</code> is set to <code>public</code>.</p>"
+          "documentation":"<p>The type of cluster snapshots to be returned. You can specify one of the following values:</p> <ul> <li> <p> <code>automated</code> - Return all cluster snapshots that Amazon DocumentDB has automatically created for your AWS account.</p> </li> <li> <p> <code>manual</code> - Return all cluster snapshots that you have manually created for your AWS account.</p> </li> <li> <p> <code>shared</code> - Return all manual cluster snapshots that have been shared to your AWS account.</p> </li> <li> <p> <code>public</code> - Return all cluster snapshots that have been marked as public.</p> </li> </ul> <p>If you don't specify a <code>SnapshotType</code> value, then both automated and manual cluster snapshots are returned. You can include shared cluster snapshots with these results by setting the <code>IncludeShared</code> parameter to <code>true</code>. You can include public cluster snapshots with these results by setting the <code>IncludePublic</code> parameter to <code>true</code>.</p> <p>The <code>IncludeShared</code> and <code>IncludePublic</code> parameters don't apply for <code>SnapshotType</code> values of <code>manual</code> or <code>automated</code>. The <code>IncludePublic</code> parameter doesn't apply when <code>SnapshotType</code> is set to <code>shared</code>. The <code>IncludeShared</code> parameter doesn't apply when <code>SnapshotType</code> is set to <code>public</code>.</p>"
         },
         "Filters":{
           "shape":"FilterList",
@@ -2378,11 +2378,11 @@
         },
         "IncludeShared":{
           "shape":"Boolean",
-          "documentation":"<p>Set to <code>true</code> to include shared manual DB cluster snapshots from other AWS accounts that this AWS account has been given permission to copy or restore, and otherwise <code>false</code>. The default is <code>false</code>.</p>"
+          "documentation":"<p>Set to <code>true</code> to include shared manual cluster snapshots from other AWS accounts that this AWS account has been given permission to copy or restore, and otherwise <code>false</code>. The default is <code>false</code>.</p>"
         },
         "IncludePublic":{
           "shape":"Boolean",
-          "documentation":"<p>Set to <code>true</code> to include manual DB cluster snapshots that are public and can be copied or restored by any AWS account, and otherwise <code>false</code>. The default is <code>false</code>.</p>"
+          "documentation":"<p>Set to <code>true</code> to include manual cluster snapshots that are public and can be copied or restored by any AWS account, and otherwise <code>false</code>. The default is <code>false</code>.</p>"
         }
       },
       "documentation":"<p>Represents the input to <a>DescribeDBClusterSnapshots</a>.</p>"
@@ -2392,11 +2392,11 @@
       "members":{
         "DBClusterIdentifier":{
           "shape":"String",
-          "documentation":"<p>The user-provided DB cluster identifier. If this parameter is specified, information from only the specific DB cluster is returned. This parameter isn't case sensitive.</p> <p>Constraints:</p> <ul> <li> <p>If provided, must match an existing <code>DBClusterIdentifier</code>.</p> </li> </ul>"
+          "documentation":"<p>The user-provided cluster identifier. If this parameter is specified, information from only the specific cluster is returned. This parameter isn't case sensitive.</p> <p>Constraints:</p> <ul> <li> <p>If provided, must match an existing <code>DBClusterIdentifier</code>.</p> </li> </ul>"
         },
         "Filters":{
           "shape":"FilterList",
-          "documentation":"<p>A filter that specifies one or more DB clusters to describe.</p> <p>Supported filters:</p> <ul> <li> <p> <code>db-cluster-id</code> - Accepts DB cluster identifiers and DB cluster Amazon Resource Names (ARNs). The results list only includes information about the DB clusters identified by these ARNs.</p> </li> </ul>"
+          "documentation":"<p>A filter that specifies one or more clusters to describe.</p> <p>Supported filters:</p> <ul> <li> <p> <code>db-cluster-id</code> - Accepts cluster identifiers and cluster Amazon Resource Names (ARNs). The results list only includes information about the clusters identified by these ARNs.</p> </li> </ul>"
         },
         "MaxRecords":{
           "shape":"IntegerOptional",
@@ -2422,7 +2422,7 @@
         },
         "DBParameterGroupFamily":{
           "shape":"String",
-          "documentation":"<p>The name of a specific DB parameter group family to return details for.</p> <p>Constraints:</p> <ul> <li> <p>If provided, must match an existing <code>DBParameterGroupFamily</code>.</p> </li> </ul>"
+          "documentation":"<p>The name of a specific parameter group family to return details for.</p> <p>Constraints:</p> <ul> <li> <p>If provided, must match an existing <code>DBParameterGroupFamily</code>.</p> </li> </ul>"
         },
         "Filters":{
           "shape":"FilterList",
@@ -2456,11 +2456,11 @@
       "members":{
         "DBInstanceIdentifier":{
           "shape":"String",
-          "documentation":"<p>The user-provided instance identifier. If this parameter is specified, information from only the specific DB instance is returned. This parameter isn't case sensitive.</p> <p>Constraints:</p> <ul> <li> <p>If provided, must match the identifier of an existing <code>DBInstance</code>.</p> </li> </ul>"
+          "documentation":"<p>The user-provided instance identifier. If this parameter is specified, information from only the specific instance is returned. This parameter isn't case sensitive.</p> <p>Constraints:</p> <ul> <li> <p>If provided, must match the identifier of an existing <code>DBInstance</code>.</p> </li> </ul>"
         },
         "Filters":{
           "shape":"FilterList",
-          "documentation":"<p>A filter that specifies one or more DB instances to describe.</p> <p>Supported filters:</p> <ul> <li> <p> <code>db-cluster-id</code> - Accepts DB cluster identifiers and DB cluster Amazon Resource Names (ARNs). The results list includes only the information about the DB instances that are associated with the DB clusters that are identified by these ARNs.</p> </li> <li> <p> <code>db-instance-id</code> - Accepts DB instance identifiers and DB instance ARNs. The results list includes only the information about the DB instances that are identified by these ARNs.</p> </li> </ul>"
+          "documentation":"<p>A filter that specifies one or more instances to describe.</p> <p>Supported filters:</p> <ul> <li> <p> <code>db-cluster-id</code> - Accepts cluster identifiers and cluster Amazon Resource Names (ARNs). The results list includes only the information about the instances that are associated with the clusters that are identified by these ARNs.</p> </li> <li> <p> <code>db-instance-id</code> - Accepts instance identifiers and instance ARNs. The results list includes only the information about the instances that are identified by these ARNs.</p> </li> </ul>"
         },
         "MaxRecords":{
           "shape":"IntegerOptional",
@@ -2478,7 +2478,7 @@
       "members":{
         "DBSubnetGroupName":{
           "shape":"String",
-          "documentation":"<p>The name of the DB subnet group to return details for.</p>"
+          "documentation":"<p>The name of the subnet group to return details for.</p>"
         },
         "Filters":{
           "shape":"FilterList",
@@ -2501,7 +2501,7 @@
       "members":{
         "DBParameterGroupFamily":{
           "shape":"String",
-          "documentation":"<p>The name of the DB cluster parameter group family to return the engine parameter information for.</p>"
+          "documentation":"<p>The name of the cluster parameter group family to return the engine parameter information for.</p>"
         },
         "Filters":{
           "shape":"FilterList",
@@ -2586,7 +2586,7 @@
       "members":{
         "Engine":{
           "shape":"String",
-          "documentation":"<p>The name of the engine to retrieve DB instance options for.</p>"
+          "documentation":"<p>The name of the engine to retrieve instance options for.</p>"
         },
         "EngineVersion":{
           "shape":"String",
@@ -2594,7 +2594,7 @@
         },
         "DBInstanceClass":{
           "shape":"String",
-          "documentation":"<p>The DB instance class filter value. Specify this parameter to show only the available offerings that match the specified DB instance class.</p>"
+          "documentation":"<p>The instance class filter value. Specify this parameter to show only the available offerings that match the specified instance class.</p>"
         },
         "LicenseModel":{
           "shape":"String",
@@ -2628,7 +2628,7 @@
         },
         "Filters":{
           "shape":"FilterList",
-          "documentation":"<p>A filter that specifies one or more resources to return pending maintenance actions for.</p> <p>Supported filters:</p> <ul> <li> <p> <code>db-cluster-id</code> - Accepts DB cluster identifiers and DB cluster Amazon Resource Names (ARNs). The results list includes only pending maintenance actions for the DB clusters identified by these ARNs.</p> </li> <li> <p> <code>db-instance-id</code> - Accepts DB instance identifiers and DB instance ARNs. The results list includes only pending maintenance actions for the DB instances identified by these ARNs.</p> </li> </ul>"
+          "documentation":"<p>A filter that specifies one or more resources to return pending maintenance actions for.</p> <p>Supported filters:</p> <ul> <li> <p> <code>db-cluster-id</code> - Accepts cluster identifiers and cluster Amazon Resource Names (ARNs). The results list includes only pending maintenance actions for the clusters identified by these ARNs.</p> </li> <li> <p> <code>db-instance-id</code> - Accepts instance identifiers and instance ARNs. The results list includes only pending maintenance actions for the DB instances identified by these ARNs.</p> </li> </ul>"
         },
         "Marker":{
           "shape":"String",
@@ -2646,7 +2646,7 @@
       "members":{
         "Address":{
           "shape":"String",
-          "documentation":"<p>Specifies the DNS address of the DB instance.</p>"
+          "documentation":"<p>Specifies the DNS address of the instance.</p>"
         },
         "Port":{
           "shape":"Integer",
@@ -2657,14 +2657,14 @@
           "documentation":"<p>Specifies the ID that Amazon Route 53 assigns when you create a hosted zone.</p>"
         }
       },
-      "documentation":"<p>Network information for accessing a DB cluster or DB instance. Client programs must specify a valid endpoint to access these Amazon DocumentDB resources.</p>"
+      "documentation":"<p>Network information for accessing a cluster or instance. Client programs must specify a valid endpoint to access these Amazon DocumentDB resources.</p>"
     },
     "EngineDefaults":{
       "type":"structure",
       "members":{
         "DBParameterGroupFamily":{
           "shape":"String",
-          "documentation":"<p>The name of the DB cluster parameter group family to return the engine parameter information for.</p>"
+          "documentation":"<p>The name of the cluster parameter group family to return the engine parameter information for.</p>"
         },
         "Marker":{
           "shape":"String",
@@ -2672,7 +2672,7 @@
         },
         "Parameters":{
           "shape":"ParametersList",
-          "documentation":"<p>The parameters of a particular DB cluster parameter group family.</p>"
+          "documentation":"<p>The parameters of a particular cluster parameter group family.</p>"
         }
       },
       "documentation":"<p>Contains the result of a successful invocation of the <code>DescribeEngineDefaultClusterParameters</code> operation. </p>",
@@ -2773,11 +2773,11 @@
       "members":{
         "DBClusterIdentifier":{
           "shape":"String",
-          "documentation":"<p>A DB cluster identifier to force a failover for. This parameter is not case sensitive.</p> <p>Constraints:</p> <ul> <li> <p>Must match the identifier of an existing <code>DBCluster</code>.</p> </li> </ul>"
+          "documentation":"<p>A cluster identifier to force a failover for. This parameter is not case sensitive.</p> <p>Constraints:</p> <ul> <li> <p>Must match the identifier of an existing <code>DBCluster</code>.</p> </li> </ul>"
         },
         "TargetDBInstanceIdentifier":{
           "shape":"String",
-          "documentation":"<p>The name of the instance to promote to the primary instance.</p> <p>You must specify the instance identifier for an Amazon DocumentDB replica in the DB cluster. For example, <code>mydbcluster-replica1</code>.</p>"
+          "documentation":"<p>The name of the instance to promote to the primary instance.</p> <p>You must specify the instance identifier for an Amazon DocumentDB replica in the cluster. For example, <code>mydbcluster-replica1</code>.</p>"
         }
       },
       "documentation":"<p>Represents the input to <a>FailoverDBCluster</a>.</p>"
@@ -2824,7 +2824,7 @@
       "type":"structure",
       "members":{
       },
-      "documentation":"<p>The request would cause you to exceed the allowed number of DB instances.</p>",
+      "documentation":"<p>The request would cause you to exceed the allowed number of instances.</p>",
       "error":{
         "code":"InstanceQuotaExceeded",
         "httpStatusCode":400,
@@ -2836,7 +2836,7 @@
       "type":"structure",
       "members":{
       },
-      "documentation":"<p>The DB cluster doesn't have enough capacity for the current operation.</p>",
+      "documentation":"<p>The cluster doesn't have enough capacity for the current operation.</p>",
       "error":{
         "code":"InsufficientDBClusterCapacityFault",
         "httpStatusCode":403,
@@ -2848,7 +2848,7 @@
       "type":"structure",
       "members":{
       },
-      "documentation":"<p>The specified DB instance class isn't available in the specified Availability Zone.</p>",
+      "documentation":"<p>The specified instance class isn't available in the specified Availability Zone.</p>",
       "error":{
         "code":"InsufficientDBInstanceCapacity",
         "httpStatusCode":400,
@@ -2874,7 +2874,7 @@
       "type":"structure",
       "members":{
       },
-      "documentation":"<p>The provided value isn't a valid DB cluster snapshot state.</p>",
+      "documentation":"<p>The provided value isn't a valid cluster snapshot state.</p>",
       "error":{
         "code":"InvalidDBClusterSnapshotStateFault",
         "httpStatusCode":400,
@@ -2886,7 +2886,7 @@
       "type":"structure",
       "members":{
       },
-      "documentation":"<p>The DB cluster isn't in a valid state.</p>",
+      "documentation":"<p>The cluster isn't in a valid state.</p>",
       "error":{
         "code":"InvalidDBClusterStateFault",
         "httpStatusCode":400,
@@ -2898,7 +2898,7 @@
       "type":"structure",
       "members":{
       },
-      "documentation":"<p> The specified DB instance isn't in the <i>available</i> state. </p>",
+      "documentation":"<p> The specified instance isn't in the <i>available</i> state. </p>",
       "error":{
         "code":"InvalidDBInstanceState",
         "httpStatusCode":400,
@@ -2910,7 +2910,7 @@
       "type":"structure",
       "members":{
       },
-      "documentation":"<p>The DB parameter group is in use, or it is in a state that is not valid. If you are trying to delete the parameter group, you can't delete it when the parameter group is in this state.</p>",
+      "documentation":"<p>The parameter group is in use, or it is in a state that is not valid. If you are trying to delete the parameter group, you can't delete it when the parameter group is in this state.</p>",
       "error":{
         "code":"InvalidDBParameterGroupState",
         "httpStatusCode":400,
@@ -2922,7 +2922,7 @@
       "type":"structure",
       "members":{
       },
-      "documentation":"<p>The state of the DB security group doesn't allow deletion.</p>",
+      "documentation":"<p>The state of the security group doesn't allow deletion.</p>",
       "error":{
         "code":"InvalidDBSecurityGroupState",
         "httpStatusCode":400,
@@ -2934,7 +2934,7 @@
       "type":"structure",
       "members":{
       },
-      "documentation":"<p>The state of the DB snapshot doesn't allow deletion.</p>",
+      "documentation":"<p>The state of the snapshot doesn't allow deletion.</p>",
       "error":{
         "code":"InvalidDBSnapshotState",
         "httpStatusCode":400,
@@ -2946,7 +2946,7 @@
       "type":"structure",
       "members":{
       },
-      "documentation":"<p>The DB subnet group can't be deleted because it's in use.</p>",
+      "documentation":"<p>The subnet group can't be deleted because it's in use.</p>",
       "error":{
         "code":"InvalidDBSubnetGroupStateFault",
         "httpStatusCode":400,
@@ -2958,7 +2958,7 @@
       "type":"structure",
       "members":{
       },
-      "documentation":"<p> The DB subnet isn't in the <i>available</i> state. </p>",
+      "documentation":"<p> The subnet isn't in the <i>available</i> state. </p>",
       "error":{
         "code":"InvalidDBSubnetStateFault",
         "httpStatusCode":400,
@@ -2994,7 +2994,7 @@
       "type":"structure",
       "members":{
       },
-      "documentation":"<p>The DB subnet group doesn't cover all Availability Zones after it is created because of changes that were made.</p>",
+      "documentation":"<p>The subnet group doesn't cover all Availability Zones after it is created because of changes that were made.</p>",
       "error":{
         "code":"InvalidVPCNetworkStateFault",
         "httpStatusCode":400,
@@ -3043,15 +3043,15 @@
       "members":{
         "DBClusterIdentifier":{
           "shape":"String",
-          "documentation":"<p>The DB cluster identifier for the cluster that is being modified. This parameter is not case sensitive.</p> <p>Constraints:</p> <ul> <li> <p>Must match the identifier of an existing <code>DBCluster</code>.</p> </li> </ul>"
+          "documentation":"<p>The cluster identifier for the cluster that is being modified. This parameter is not case sensitive.</p> <p>Constraints:</p> <ul> <li> <p>Must match the identifier of an existing <code>DBCluster</code>.</p> </li> </ul>"
         },
         "NewDBClusterIdentifier":{
           "shape":"String",
-          "documentation":"<p>The new DB cluster identifier for the DB cluster when renaming a DB cluster. This value is stored as a lowercase string.</p> <p>Constraints:</p> <ul> <li> <p>Must contain from 1 to 63 letters, numbers, or hyphens.</p> </li> <li> <p>The first character must be a letter.</p> </li> <li> <p>Cannot end with a hyphen or contain two consecutive hyphens.</p> </li> </ul> <p>Example: <code>my-cluster2</code> </p>"
+          "documentation":"<p>The new cluster identifier for the cluster when renaming a cluster. This value is stored as a lowercase string.</p> <p>Constraints:</p> <ul> <li> <p>Must contain from 1 to 63 letters, numbers, or hyphens.</p> </li> <li> <p>The first character must be a letter.</p> </li> <li> <p>Cannot end with a hyphen or contain two consecutive hyphens.</p> </li> </ul> <p>Example: <code>my-cluster2</code> </p>"
         },
         "ApplyImmediately":{
           "shape":"Boolean",
-          "documentation":"<p>A value that specifies whether the changes in this request and any pending changes are asynchronously applied as soon as possible, regardless of the <code>PreferredMaintenanceWindow</code> setting for the DB cluster. If this parameter is set to <code>false</code>, changes to the DB cluster are applied during the next maintenance window.</p> <p>The <code>ApplyImmediately</code> parameter affects only the <code>NewDBClusterIdentifier</code> and <code>MasterUserPassword</code> values. If you set this parameter value to <code>false</code>, the changes to the <code>NewDBClusterIdentifier</code> and <code>MasterUserPassword</code> values are applied during the next maintenance window. All other changes are applied immediately, regardless of the value of the <code>ApplyImmediately</code> parameter.</p> <p>Default: <code>false</code> </p>"
+          "documentation":"<p>A value that specifies whether the changes in this request and any pending changes are asynchronously applied as soon as possible, regardless of the <code>PreferredMaintenanceWindow</code> setting for the cluster. If this parameter is set to <code>false</code>, changes to the cluster are applied during the next maintenance window.</p> <p>The <code>ApplyImmediately</code> parameter affects only the <code>NewDBClusterIdentifier</code> and <code>MasterUserPassword</code> values. If you set this parameter value to <code>false</code>, the changes to the <code>NewDBClusterIdentifier</code> and <code>MasterUserPassword</code> values are applied during the next maintenance window. All other changes are applied immediately, regardless of the value of the <code>ApplyImmediately</code> parameter.</p> <p>Default: <code>false</code> </p>"
         },
         "BackupRetentionPeriod":{
           "shape":"IntegerOptional",
@@ -3059,15 +3059,15 @@
         },
         "DBClusterParameterGroupName":{
           "shape":"String",
-          "documentation":"<p>The name of the DB cluster parameter group to use for the DB cluster.</p>"
+          "documentation":"<p>The name of the cluster parameter group to use for the cluster.</p>"
         },
         "VpcSecurityGroupIds":{
           "shape":"VpcSecurityGroupIdList",
-          "documentation":"<p>A list of virtual private cloud (VPC) security groups that the DB cluster will belong to.</p>"
+          "documentation":"<p>A list of virtual private cloud (VPC) security groups that the cluster will belong to.</p>"
         },
         "Port":{
           "shape":"IntegerOptional",
-          "documentation":"<p>The port number on which the DB cluster accepts connections.</p> <p>Constraints: Must be a value from <code>1150</code> to <code>65535</code>. </p> <p>Default: The same port as the original DB cluster.</p>"
+          "documentation":"<p>The port number on which the cluster accepts connections.</p> <p>Constraints: Must be a value from <code>1150</code> to <code>65535</code>. </p> <p>Default: The same port as the original cluster.</p>"
         },
         "MasterUserPassword":{
           "shape":"String",
@@ -3083,7 +3083,7 @@
         },
         "CloudwatchLogsExportConfiguration":{
           "shape":"CloudwatchLogsExportConfiguration",
-          "documentation":"<p>The configuration setting for the log types to be enabled for export to Amazon CloudWatch Logs for a specific DB instance or DB cluster. The <code>EnableLogTypes</code> and <code>DisableLogTypes</code> arrays determine which logs are exported (or not exported) to CloudWatch Logs.</p>"
+          "documentation":"<p>The configuration setting for the log types to be enabled for export to Amazon CloudWatch Logs for a specific instance or cluster. The <code>EnableLogTypes</code> and <code>DisableLogTypes</code> arrays determine which logs are exported (or not exported) to CloudWatch Logs.</p>"
         },
         "EngineVersion":{
           "shape":"String",
@@ -3105,11 +3105,11 @@
       "members":{
         "DBClusterParameterGroupName":{
           "shape":"String",
-          "documentation":"<p>The name of the DB cluster parameter group to modify.</p>"
+          "documentation":"<p>The name of the cluster parameter group to modify.</p>"
         },
         "Parameters":{
           "shape":"ParametersList",
-          "documentation":"<p>A list of parameters in the DB cluster parameter group to modify.</p>"
+          "documentation":"<p>A list of parameters in the cluster parameter group to modify.</p>"
         }
       },
       "documentation":"<p>Represents the input to <a>ModifyDBClusterParameterGroup</a>.</p>"
@@ -3129,19 +3129,19 @@
       "members":{
         "DBClusterSnapshotIdentifier":{
           "shape":"String",
-          "documentation":"<p>The identifier for the DB cluster snapshot to modify the attributes for.</p>"
+          "documentation":"<p>The identifier for the cluster snapshot to modify the attributes for.</p>"
         },
         "AttributeName":{
           "shape":"String",
-          "documentation":"<p>The name of the DB cluster snapshot attribute to modify.</p> <p>To manage authorization for other AWS accounts to copy or restore a manual DB cluster snapshot, set this value to <code>restore</code>.</p>"
+          "documentation":"<p>The name of the cluster snapshot attribute to modify.</p> <p>To manage authorization for other AWS accounts to copy or restore a manual cluster snapshot, set this value to <code>restore</code>.</p>"
         },
         "ValuesToAdd":{
           "shape":"AttributeValueList",
-          "documentation":"<p>A list of DB cluster snapshot attributes to add to the attribute specified by <code>AttributeName</code>.</p> <p>To authorize other AWS accounts to copy or restore a manual DB cluster snapshot, set this list to include one or more AWS account IDs. To make the manual DB cluster snapshot restorable by any AWS account, set it to <code>all</code>. Do not add the <code>all</code> value for any manual DB cluster snapshots that contain private information that you don't want to be available to all AWS accounts.</p>"
+          "documentation":"<p>A list of cluster snapshot attributes to add to the attribute specified by <code>AttributeName</code>.</p> <p>To authorize other AWS accounts to copy or restore a manual cluster snapshot, set this list to include one or more AWS account IDs. To make the manual cluster snapshot restorable by any AWS account, set it to <code>all</code>. Do not add the <code>all</code> value for any manual cluster snapshots that contain private information that you don't want to be available to all AWS accounts.</p>"
         },
         "ValuesToRemove":{
           "shape":"AttributeValueList",
-          "documentation":"<p>A list of DB cluster snapshot attributes to remove from the attribute specified by <code>AttributeName</code>.</p> <p>To remove authorization for other AWS accounts to copy or restore a manual DB cluster snapshot, set this list to include one or more AWS account identifiers. To remove authorization for any AWS account to copy or restore the DB cluster snapshot, set it to <code>all</code> . If you specify <code>all</code>, an AWS account whose account ID is explicitly added to the <code>restore</code> attribute can still copy or restore a manual DB cluster snapshot.</p>"
+          "documentation":"<p>A list of cluster snapshot attributes to remove from the attribute specified by <code>AttributeName</code>.</p> <p>To remove authorization for other AWS accounts to copy or restore a manual cluster snapshot, set this list to include one or more AWS account identifiers. To remove authorization for any AWS account to copy or restore the cluster snapshot, set it to <code>all</code> . If you specify <code>all</code>, an AWS account whose account ID is explicitly added to the <code>restore</code> attribute can still copy or restore a manual cluster snapshot.</p>"
         }
       },
       "documentation":"<p>Represents the input to <a>ModifyDBClusterSnapshotAttribute</a>.</p>"
@@ -3158,27 +3158,27 @@
       "members":{
         "DBInstanceIdentifier":{
           "shape":"String",
-          "documentation":"<p>The DB instance identifier. This value is stored as a lowercase string.</p> <p>Constraints:</p> <ul> <li> <p>Must match the identifier of an existing <code>DBInstance</code>.</p> </li> </ul>"
+          "documentation":"<p>The instance identifier. This value is stored as a lowercase string.</p> <p>Constraints:</p> <ul> <li> <p>Must match the identifier of an existing <code>DBInstance</code>.</p> </li> </ul>"
         },
         "DBInstanceClass":{
           "shape":"String",
-          "documentation":"<p>The new compute and memory capacity of the DB instance; for example, <code>db.r5.large</code>. Not all DB instance classes are available in all AWS Regions. </p> <p>If you modify the DB instance class, an outage occurs during the change. The change is applied during the next maintenance window, unless <code>ApplyImmediately</code> is specified as <code>true</code> for this request. </p> <p>Default: Uses existing setting.</p>"
+          "documentation":"<p>The new compute and memory capacity of the instance; for example, <code>db.r5.large</code>. Not all instance classes are available in all AWS Regions. </p> <p>If you modify the instance class, an outage occurs during the change. The change is applied during the next maintenance window, unless <code>ApplyImmediately</code> is specified as <code>true</code> for this request. </p> <p>Default: Uses existing setting.</p>"
         },
         "ApplyImmediately":{
           "shape":"Boolean",
-          "documentation":"<p>Specifies whether the modifications in this request and any pending modifications are asynchronously applied as soon as possible, regardless of the <code>PreferredMaintenanceWindow</code> setting for the DB instance. </p> <p> If this parameter is set to <code>false</code>, changes to the DB instance are applied during the next maintenance window. Some parameter changes can cause an outage and are applied on the next reboot.</p> <p>Default: <code>false</code> </p>"
+          "documentation":"<p>Specifies whether the modifications in this request and any pending modifications are asynchronously applied as soon as possible, regardless of the <code>PreferredMaintenanceWindow</code> setting for the instance. </p> <p> If this parameter is set to <code>false</code>, changes to the instance are applied during the next maintenance window. Some parameter changes can cause an outage and are applied on the next reboot.</p> <p>Default: <code>false</code> </p>"
         },
         "PreferredMaintenanceWindow":{
           "shape":"String",
-          "documentation":"<p>The weekly time range (in UTC) during which system maintenance can occur, which might result in an outage. Changing this parameter doesn't result in an outage except in the following situation, and the change is asynchronously applied as soon as possible. If there are pending actions that cause a reboot, and the maintenance window is changed to include the current time, changing this parameter causes a reboot of the DB instance. If you are moving this window to the current time, there must be at least 30 minutes between the current time and end of the window to ensure that pending changes are applied.</p> <p>Default: Uses existing setting.</p> <p>Format: <code>ddd:hh24:mi-ddd:hh24:mi</code> </p> <p>Valid days: Mon, Tue, Wed, Thu, Fri, Sat, Sun</p> <p>Constraints: Must be at least 30 minutes.</p>"
+          "documentation":"<p>The weekly time range (in UTC) during which system maintenance can occur, which might result in an outage. Changing this parameter doesn't result in an outage except in the following situation, and the change is asynchronously applied as soon as possible. If there are pending actions that cause a reboot, and the maintenance window is changed to include the current time, changing this parameter causes a reboot of the instance. If you are moving this window to the current time, there must be at least 30 minutes between the current time and end of the window to ensure that pending changes are applied.</p> <p>Default: Uses existing setting.</p> <p>Format: <code>ddd:hh24:mi-ddd:hh24:mi</code> </p> <p>Valid days: Mon, Tue, Wed, Thu, Fri, Sat, Sun</p> <p>Constraints: Must be at least 30 minutes.</p>"
         },
         "AutoMinorVersionUpgrade":{
           "shape":"BooleanOptional",
-          "documentation":"<p>Indicates that minor version upgrades are applied automatically to the DB instance during the maintenance window. Changing this parameter doesn't result in an outage except in the following case, and the change is asynchronously applied as soon as possible. An outage results if this parameter is set to <code>true</code> during the maintenance window, and a newer minor version is available, and Amazon DocumentDB has enabled automatic patching for that engine version. </p>"
+          "documentation":"<p>Indicates that minor version upgrades are applied automatically to the instance during the maintenance window. Changing this parameter doesn't result in an outage except in the following case, and the change is asynchronously applied as soon as possible. An outage results if this parameter is set to <code>true</code> during the maintenance window, and a newer minor version is available, and Amazon DocumentDB has enabled automatic patching for that engine version. </p>"
         },
         "NewDBInstanceIdentifier":{
           "shape":"String",
-          "documentation":"<p> The new DB instance identifier for the DB instance when renaming a DB instance. When you change the DB instance identifier, an instance reboot occurs immediately if you set <code>Apply Immediately</code> to <code>true</code>. It occurs during the next maintenance window if you set <code>Apply Immediately</code> to <code>false</code>. This value is stored as a lowercase string. </p> <p>Constraints:</p> <ul> <li> <p>Must contain from 1 to 63 letters, numbers, or hyphens.</p> </li> <li> <p>The first character must be a letter.</p> </li> <li> <p>Cannot end with a hyphen or contain two consecutive hyphens.</p> </li> </ul> <p>Example: <code>mydbinstance</code> </p>"
+          "documentation":"<p> The new instance identifier for the instance when renaming an instance. When you change the instance identifier, an instance reboot occurs immediately if you set <code>Apply Immediately</code> to <code>true</code>. It occurs during the next maintenance window if you set <code>Apply Immediately</code> to <code>false</code>. This value is stored as a lowercase string. </p> <p>Constraints:</p> <ul> <li> <p>Must contain from 1 to 63 letters, numbers, or hyphens.</p> </li> <li> <p>The first character must be a letter.</p> </li> <li> <p>Cannot end with a hyphen or contain two consecutive hyphens.</p> </li> </ul> <p>Example: <code>mydbinstance</code> </p>"
         },
         "CACertificateIdentifier":{
           "shape":"String",
@@ -3206,15 +3206,15 @@
       "members":{
         "DBSubnetGroupName":{
           "shape":"String",
-          "documentation":"<p>The name for the DB subnet group. This value is stored as a lowercase string. You can't modify the default subnet group. </p> <p>Constraints: Must match the name of an existing <code>DBSubnetGroup</code>. Must not be default.</p> <p>Example: <code>mySubnetgroup</code> </p>"
+          "documentation":"<p>The name for the subnet group. This value is stored as a lowercase string. You can't modify the default subnet group. </p> <p>Constraints: Must match the name of an existing <code>DBSubnetGroup</code>. Must not be default.</p> <p>Example: <code>mySubnetgroup</code> </p>"
         },
         "DBSubnetGroupDescription":{
           "shape":"String",
-          "documentation":"<p>The description for the DB subnet group.</p>"
+          "documentation":"<p>The description for the subnet group.</p>"
         },
         "SubnetIds":{
           "shape":"SubnetIdentifierList",
-          "documentation":"<p>The Amazon EC2 subnet IDs for the DB subnet group.</p>"
+          "documentation":"<p>The Amazon EC2 subnet IDs for the subnet group.</p>"
         }
       },
       "documentation":"<p>Represents the input to <a>ModifyDBSubnetGroup</a>.</p>"
@@ -3230,30 +3230,30 @@
       "members":{
         "Engine":{
           "shape":"String",
-          "documentation":"<p>The engine type of a DB instance.</p>"
+          "documentation":"<p>The engine type of an instance.</p>"
         },
         "EngineVersion":{
           "shape":"String",
-          "documentation":"<p>The engine version of a DB instance.</p>"
+          "documentation":"<p>The engine version of an instance.</p>"
         },
         "DBInstanceClass":{
           "shape":"String",
-          "documentation":"<p>The DB instance class for a DB instance.</p>"
+          "documentation":"<p>The instance class for an instance.</p>"
         },
         "LicenseModel":{
           "shape":"String",
-          "documentation":"<p>The license model for a DB instance.</p>"
+          "documentation":"<p>The license model for an instance.</p>"
         },
         "AvailabilityZones":{
           "shape":"AvailabilityZoneList",
-          "documentation":"<p>A list of Availability Zones for a DB instance.</p>"
+          "documentation":"<p>A list of Availability Zones for an instance.</p>"
         },
         "Vpc":{
           "shape":"Boolean",
-          "documentation":"<p>Indicates whether a DB instance is in a virtual private cloud (VPC).</p>"
+          "documentation":"<p>Indicates whether an instance is in a virtual private cloud (VPC).</p>"
         }
       },
-      "documentation":"<p>The options that are available for a DB instance.</p>",
+      "documentation":"<p>The options that are available for an instance.</p>",
       "wrapper":true
     },
     "OrderableDBInstanceOptionsList":{
@@ -3268,7 +3268,7 @@
       "members":{
         "OrderableDBInstanceOptions":{
           "shape":"OrderableDBInstanceOptionsList",
-          "documentation":"<p>The options that are available for a particular orderable DB instance.</p>"
+          "documentation":"<p>The options that are available for a particular orderable instance.</p>"
         },
         "Marker":{
           "shape":"String",
@@ -3407,19 +3407,19 @@
       "members":{
         "DBInstanceClass":{
           "shape":"String",
-          "documentation":"<p> Contains the new <code>DBInstanceClass</code> for the DB instance that will be applied or is currently being applied. </p>"
+          "documentation":"<p> Contains the new <code>DBInstanceClass</code> for the instance that will be applied or is currently being applied. </p>"
         },
         "AllocatedStorage":{
           "shape":"IntegerOptional",
-          "documentation":"<p> Contains the new <code>AllocatedStorage</code> size for the DB instance that will be applied or is currently being applied. </p>"
+          "documentation":"<p> Contains the new <code>AllocatedStorage</code> size for then instance that will be applied or is currently being applied. </p>"
         },
         "MasterUserPassword":{
           "shape":"String",
-          "documentation":"<p>Contains the pending or currently in-progress change of the master credentials for the DB instance.</p>"
+          "documentation":"<p>Contains the pending or currently in-progress change of the master credentials for the instance.</p>"
         },
         "Port":{
           "shape":"IntegerOptional",
-          "documentation":"<p>Specifies the pending port for the DB instance.</p>"
+          "documentation":"<p>Specifies the pending port for the instance.</p>"
         },
         "BackupRetentionPeriod":{
           "shape":"IntegerOptional",
@@ -3427,7 +3427,7 @@
         },
         "MultiAZ":{
           "shape":"BooleanOptional",
-          "documentation":"<p>Indicates that the Single-AZ DB instance is to change to a Multi-AZ deployment.</p>"
+          "documentation":"<p>Indicates that the Single-AZ instance is to change to a Multi-AZ deployment.</p>"
         },
         "EngineVersion":{
           "shape":"String",
@@ -3435,19 +3435,19 @@
         },
         "LicenseModel":{
           "shape":"String",
-          "documentation":"<p>The license model for the DB instance.</p> <p>Valid values: <code>license-included</code>, <code>bring-your-own-license</code>, <code>general-public-license</code> </p>"
+          "documentation":"<p>The license model for the instance.</p> <p>Valid values: <code>license-included</code>, <code>bring-your-own-license</code>, <code>general-public-license</code> </p>"
         },
         "Iops":{
           "shape":"IntegerOptional",
-          "documentation":"<p>Specifies the new Provisioned IOPS value for the DB instance that will be applied or is currently being applied.</p>"
+          "documentation":"<p>Specifies the new Provisioned IOPS value for the instance that will be applied or is currently being applied.</p>"
         },
         "DBInstanceIdentifier":{
           "shape":"String",
-          "documentation":"<p> Contains the new <code>DBInstanceIdentifier</code> for the DB instance that will be applied or is currently being applied. </p>"
+          "documentation":"<p> Contains the new <code>DBInstanceIdentifier</code> for the instance that will be applied or is currently being applied. </p>"
         },
         "StorageType":{
           "shape":"String",
-          "documentation":"<p>Specifies the storage type to be associated with the DB instance.</p>"
+          "documentation":"<p>Specifies the storage type to be associated with the instance.</p>"
         },
         "CACertificateIdentifier":{
           "shape":"String",
@@ -3455,14 +3455,14 @@
         },
         "DBSubnetGroupName":{
           "shape":"String",
-          "documentation":"<p>The new DB subnet group for the DB instance. </p>"
+          "documentation":"<p>The new subnet group for the instance. </p>"
         },
         "PendingCloudwatchLogsExports":{
           "shape":"PendingCloudwatchLogsExports",
           "documentation":"<p>A list of the log types whose configuration is still pending. These log types are in the process of being activated or deactivated.</p>"
         }
       },
-      "documentation":"<p> One or more modified settings for a DB instance. These modified settings have been requested, but haven't been applied yet.</p>"
+      "documentation":"<p> One or more modified settings for an instance. These modified settings have been requested, but haven't been applied yet.</p>"
     },
     "RebootDBInstanceMessage":{
       "type":"structure",
@@ -3470,7 +3470,7 @@
       "members":{
         "DBInstanceIdentifier":{
           "shape":"String",
-          "documentation":"<p>The DB instance identifier. This parameter is stored as a lowercase string.</p> <p>Constraints:</p> <ul> <li> <p>Must match the identifier of an existing <code>DBInstance</code>.</p> </li> </ul>"
+          "documentation":"<p>The instance identifier. This parameter is stored as a lowercase string.</p> <p>Constraints:</p> <ul> <li> <p>Must match the identifier of an existing <code>DBInstance</code>.</p> </li> </ul>"
         },
         "ForceFailover":{
           "shape":"BooleanOptional",
@@ -3509,15 +3509,15 @@
       "members":{
         "DBClusterParameterGroupName":{
           "shape":"String",
-          "documentation":"<p>The name of the DB cluster parameter group to reset.</p>"
+          "documentation":"<p>The name of the cluster parameter group to reset.</p>"
         },
         "ResetAllParameters":{
           "shape":"Boolean",
-          "documentation":"<p>A value that is set to <code>true</code> to reset all parameters in the DB cluster parameter group to their default values, and <code>false</code> otherwise. You can't use this parameter if there is a list of parameter names specified for the <code>Parameters</code> parameter.</p>"
+          "documentation":"<p>A value that is set to <code>true</code> to reset all parameters in the cluster parameter group to their default values, and <code>false</code> otherwise. You can't use this parameter if there is a list of parameter names specified for the <code>Parameters</code> parameter.</p>"
         },
         "Parameters":{
           "shape":"ParametersList",
-          "documentation":"<p>A list of parameter names in the DB cluster parameter group to reset to the default values. You can't use this parameter if the <code>ResetAllParameters</code> parameter is set to <code>true</code>.</p>"
+          "documentation":"<p>A list of parameter names in the cluster parameter group to reset to the default values. You can't use this parameter if the <code>ResetAllParameters</code> parameter is set to <code>true</code>.</p>"
         }
       },
       "documentation":"<p>Represents the input to <a>ResetDBClusterParameterGroup</a>.</p>"
@@ -3563,39 +3563,39 @@
         },
         "DBClusterIdentifier":{
           "shape":"String",
-          "documentation":"<p>The name of the DB cluster to create from the DB snapshot or DB cluster snapshot. This parameter isn't case sensitive.</p> <p>Constraints:</p> <ul> <li> <p>Must contain from 1 to 63 letters, numbers, or hyphens.</p> </li> <li> <p>The first character must be a letter.</p> </li> <li> <p>Cannot end with a hyphen or contain two consecutive hyphens.</p> </li> </ul> <p>Example: <code>my-snapshot-id</code> </p>"
+          "documentation":"<p>The name of the cluster to create from the snapshot or cluster snapshot. This parameter isn't case sensitive.</p> <p>Constraints:</p> <ul> <li> <p>Must contain from 1 to 63 letters, numbers, or hyphens.</p> </li> <li> <p>The first character must be a letter.</p> </li> <li> <p>Cannot end with a hyphen or contain two consecutive hyphens.</p> </li> </ul> <p>Example: <code>my-snapshot-id</code> </p>"
         },
         "SnapshotIdentifier":{
           "shape":"String",
-          "documentation":"<p>The identifier for the DB snapshot or DB cluster snapshot to restore from.</p> <p>You can use either the name or the Amazon Resource Name (ARN) to specify a DB cluster snapshot. However, you can use only the ARN to specify a DB snapshot.</p> <p>Constraints:</p> <ul> <li> <p>Must match the identifier of an existing snapshot.</p> </li> </ul>"
+          "documentation":"<p>The identifier for the snapshot or cluster snapshot to restore from.</p> <p>You can use either the name or the Amazon Resource Name (ARN) to specify a cluster snapshot. However, you can use only the ARN to specify a snapshot.</p> <p>Constraints:</p> <ul> <li> <p>Must match the identifier of an existing snapshot.</p> </li> </ul>"
         },
         "Engine":{
           "shape":"String",
-          "documentation":"<p>The database engine to use for the new DB cluster.</p> <p>Default: The same as source.</p> <p>Constraint: Must be compatible with the engine of the source.</p>"
+          "documentation":"<p>The database engine to use for the new cluster.</p> <p>Default: The same as source.</p> <p>Constraint: Must be compatible with the engine of the source.</p>"
         },
         "EngineVersion":{
           "shape":"String",
-          "documentation":"<p>The version of the database engine to use for the new DB cluster.</p>"
+          "documentation":"<p>The version of the database engine to use for the new cluster.</p>"
         },
         "Port":{
           "shape":"IntegerOptional",
-          "documentation":"<p>The port number on which the new DB cluster accepts connections.</p> <p>Constraints: Must be a value from <code>1150</code> to <code>65535</code>.</p> <p>Default: The same port as the original DB cluster.</p>"
+          "documentation":"<p>The port number on which the new cluster accepts connections.</p> <p>Constraints: Must be a value from <code>1150</code> to <code>65535</code>.</p> <p>Default: The same port as the original cluster.</p>"
         },
         "DBSubnetGroupName":{
           "shape":"String",
-          "documentation":"<p>The name of the DB subnet group to use for the new DB cluster.</p> <p>Constraints: If provided, must match the name of an existing <code>DBSubnetGroup</code>.</p> <p>Example: <code>mySubnetgroup</code> </p>"
+          "documentation":"<p>The name of the subnet group to use for the new cluster.</p> <p>Constraints: If provided, must match the name of an existing <code>DBSubnetGroup</code>.</p> <p>Example: <code>mySubnetgroup</code> </p>"
         },
         "VpcSecurityGroupIds":{
           "shape":"VpcSecurityGroupIdList",
-          "documentation":"<p>A list of virtual private cloud (VPC) security groups that the new DB cluster will belong to.</p>"
+          "documentation":"<p>A list of virtual private cloud (VPC) security groups that the new cluster will belong to.</p>"
         },
         "Tags":{
           "shape":"TagList",
-          "documentation":"<p>The tags to be assigned to the restored DB cluster.</p>"
+          "documentation":"<p>The tags to be assigned to the restored cluster.</p>"
         },
         "KmsKeyId":{
           "shape":"String",
-          "documentation":"<p>The AWS KMS key identifier to use when restoring an encrypted DB cluster from a DB snapshot or DB cluster snapshot.</p> <p>The AWS KMS key identifier is the Amazon Resource Name (ARN) for the AWS KMS encryption key. If you are restoring a DB cluster with the same AWS account that owns the AWS KMS encryption key used to encrypt the new DB cluster, then you can use the AWS KMS key alias instead of the ARN for the AWS KMS encryption key.</p> <p>If you do not specify a value for the <code>KmsKeyId</code> parameter, then the following occurs:</p> <ul> <li> <p>If the DB snapshot or DB cluster snapshot in <code>SnapshotIdentifier</code> is encrypted, then the restored DB cluster is encrypted using the AWS KMS key that was used to encrypt the DB snapshot or the DB cluster snapshot.</p> </li> <li> <p>If the DB snapshot or the DB cluster snapshot in <code>SnapshotIdentifier</code> is not encrypted, then the restored DB cluster is not encrypted.</p> </li> </ul>"
+          "documentation":"<p>The AWS KMS key identifier to use when restoring an encrypted cluster from a DB snapshot or cluster snapshot.</p> <p>The AWS KMS key identifier is the Amazon Resource Name (ARN) for the AWS KMS encryption key. If you are restoring a cluster with the same AWS account that owns the AWS KMS encryption key used to encrypt the new cluster, then you can use the AWS KMS key alias instead of the ARN for the AWS KMS encryption key.</p> <p>If you do not specify a value for the <code>KmsKeyId</code> parameter, then the following occurs:</p> <ul> <li> <p>If the snapshot or cluster snapshot in <code>SnapshotIdentifier</code> is encrypted, then the restored cluster is encrypted using the AWS KMS key that was used to encrypt the snapshot or the cluster snapshot.</p> </li> <li> <p>If the snapshot or the cluster snapshot in <code>SnapshotIdentifier</code> is not encrypted, then the restored DB cluster is not encrypted.</p> </li> </ul>"
         },
         "EnableCloudwatchLogsExports":{
           "shape":"LogTypeList",
@@ -3623,39 +3623,39 @@
       "members":{
         "DBClusterIdentifier":{
           "shape":"String",
-          "documentation":"<p>The name of the new DB cluster to be created.</p> <p>Constraints:</p> <ul> <li> <p>Must contain from 1 to 63 letters, numbers, or hyphens.</p> </li> <li> <p>The first character must be a letter.</p> </li> <li> <p>Cannot end with a hyphen or contain two consecutive hyphens.</p> </li> </ul>"
+          "documentation":"<p>The name of the new cluster to be created.</p> <p>Constraints:</p> <ul> <li> <p>Must contain from 1 to 63 letters, numbers, or hyphens.</p> </li> <li> <p>The first character must be a letter.</p> </li> <li> <p>Cannot end with a hyphen or contain two consecutive hyphens.</p> </li> </ul>"
         },
         "SourceDBClusterIdentifier":{
           "shape":"String",
-          "documentation":"<p>The identifier of the source DB cluster from which to restore.</p> <p>Constraints:</p> <ul> <li> <p>Must match the identifier of an existing <code>DBCluster</code>.</p> </li> </ul>"
+          "documentation":"<p>The identifier of the source cluster from which to restore.</p> <p>Constraints:</p> <ul> <li> <p>Must match the identifier of an existing <code>DBCluster</code>.</p> </li> </ul>"
         },
         "RestoreToTime":{
           "shape":"TStamp",
-          "documentation":"<p>The date and time to restore the DB cluster to.</p> <p>Valid values: A time in Universal Coordinated Time (UTC) format.</p> <p>Constraints:</p> <ul> <li> <p>Must be before the latest restorable time for the DB instance.</p> </li> <li> <p>Must be specified if the <code>UseLatestRestorableTime</code> parameter is not provided.</p> </li> <li> <p>Cannot be specified if the <code>UseLatestRestorableTime</code> parameter is <code>true</code>.</p> </li> <li> <p>Cannot be specified if the <code>RestoreType</code> parameter is <code>copy-on-write</code>.</p> </li> </ul> <p>Example: <code>2015-03-07T23:45:00Z</code> </p>"
+          "documentation":"<p>The date and time to restore the cluster to.</p> <p>Valid values: A time in Universal Coordinated Time (UTC) format.</p> <p>Constraints:</p> <ul> <li> <p>Must be before the latest restorable time for the instance.</p> </li> <li> <p>Must be specified if the <code>UseLatestRestorableTime</code> parameter is not provided.</p> </li> <li> <p>Cannot be specified if the <code>UseLatestRestorableTime</code> parameter is <code>true</code>.</p> </li> <li> <p>Cannot be specified if the <code>RestoreType</code> parameter is <code>copy-on-write</code>.</p> </li> </ul> <p>Example: <code>2015-03-07T23:45:00Z</code> </p>"
         },
         "UseLatestRestorableTime":{
           "shape":"Boolean",
-          "documentation":"<p>A value that is set to <code>true</code> to restore the DB cluster to the latest restorable backup time, and <code>false</code> otherwise. </p> <p>Default: <code>false</code> </p> <p>Constraints: Cannot be specified if the <code>RestoreToTime</code> parameter is provided.</p>"
+          "documentation":"<p>A value that is set to <code>true</code> to restore the cluster to the latest restorable backup time, and <code>false</code> otherwise. </p> <p>Default: <code>false</code> </p> <p>Constraints: Cannot be specified if the <code>RestoreToTime</code> parameter is provided.</p>"
         },
         "Port":{
           "shape":"IntegerOptional",
-          "documentation":"<p>The port number on which the new DB cluster accepts connections.</p> <p>Constraints: Must be a value from <code>1150</code> to <code>65535</code>. </p> <p>Default: The default port for the engine.</p>"
+          "documentation":"<p>The port number on which the new cluster accepts connections.</p> <p>Constraints: Must be a value from <code>1150</code> to <code>65535</code>. </p> <p>Default: The default port for the engine.</p>"
         },
         "DBSubnetGroupName":{
           "shape":"String",
-          "documentation":"<p>The DB subnet group name to use for the new DB cluster.</p> <p>Constraints: If provided, must match the name of an existing <code>DBSubnetGroup</code>.</p> <p>Example: <code>mySubnetgroup</code> </p>"
+          "documentation":"<p>The subnet group name to use for the new cluster.</p> <p>Constraints: If provided, must match the name of an existing <code>DBSubnetGroup</code>.</p> <p>Example: <code>mySubnetgroup</code> </p>"
         },
         "VpcSecurityGroupIds":{
           "shape":"VpcSecurityGroupIdList",
-          "documentation":"<p>A list of VPC security groups that the new DB cluster belongs to.</p>"
+          "documentation":"<p>A list of VPC security groups that the new cluster belongs to.</p>"
         },
         "Tags":{
           "shape":"TagList",
-          "documentation":"<p>The tags to be assigned to the restored DB cluster.</p>"
+          "documentation":"<p>The tags to be assigned to the restored cluster.</p>"
         },
         "KmsKeyId":{
           "shape":"String",
-          "documentation":"<p>The AWS KMS key identifier to use when restoring an encrypted DB cluster from an encrypted DB cluster.</p> <p>The AWS KMS key identifier is the Amazon Resource Name (ARN) for the AWS KMS encryption key. If you are restoring a DB cluster with the same AWS account that owns the AWS KMS encryption key used to encrypt the new DB cluster, then you can use the AWS KMS key alias instead of the ARN for the AWS KMS encryption key.</p> <p>You can restore to a new DB cluster and encrypt the new DB cluster with an AWS KMS key that is different from the AWS KMS key used to encrypt the source DB cluster. The new DB cluster is encrypted with the AWS KMS key identified by the <code>KmsKeyId</code> parameter.</p> <p>If you do not specify a value for the <code>KmsKeyId</code> parameter, then the following occurs:</p> <ul> <li> <p>If the DB cluster is encrypted, then the restored DB cluster is encrypted using the AWS KMS key that was used to encrypt the source DB cluster.</p> </li> <li> <p>If the DB cluster is not encrypted, then the restored DB cluster is not encrypted.</p> </li> </ul> <p>If <code>DBClusterIdentifier</code> refers to a DB cluster that is not encrypted, then the restore request is rejected.</p>"
+          "documentation":"<p>The AWS KMS key identifier to use when restoring an encrypted cluster from an encrypted cluster.</p> <p>The AWS KMS key identifier is the Amazon Resource Name (ARN) for the AWS KMS encryption key. If you are restoring a cluster with the same AWS account that owns the AWS KMS encryption key used to encrypt the new cluster, then you can use the AWS KMS key alias instead of the ARN for the AWS KMS encryption key.</p> <p>You can restore to a new cluster and encrypt the new cluster with an AWS KMS key that is different from the AWS KMS key used to encrypt the source cluster. The new DB cluster is encrypted with the AWS KMS key identified by the <code>KmsKeyId</code> parameter.</p> <p>If you do not specify a value for the <code>KmsKeyId</code> parameter, then the following occurs:</p> <ul> <li> <p>If the cluster is encrypted, then the restored cluster is encrypted using the AWS KMS key that was used to encrypt the source cluster.</p> </li> <li> <p>If the cluster is not encrypted, then the restored cluster is not encrypted.</p> </li> </ul> <p>If <code>DBClusterIdentifier</code> refers to a cluster that is not encrypted, then the restore request is rejected.</p>"
         },
         "EnableCloudwatchLogsExports":{
           "shape":"LogTypeList",
@@ -3690,7 +3690,7 @@
       "type":"structure",
       "members":{
       },
-      "documentation":"<p>The request would cause you to exceed the allowed number of DB snapshots.</p>",
+      "documentation":"<p>The request would cause you to exceed the allowed number of snapshots.</p>",
       "error":{
         "code":"SnapshotQuotaExceeded",
         "httpStatusCode":400,
@@ -3745,7 +3745,7 @@
       "type":"structure",
       "members":{
       },
-      "documentation":"<p>The request would cause you to exceed the allowed amount of storage available across all DB instances.</p>",
+      "documentation":"<p>The request would cause you to exceed the allowed amount of storage available across all instances.</p>",
       "error":{
         "code":"StorageQuotaExceeded",
         "httpStatusCode":400,
@@ -3788,7 +3788,7 @@
       "type":"structure",
       "members":{
       },
-      "documentation":"<p>The DB subnet is already in use in the Availability Zone.</p>",
+      "documentation":"<p>The subnet is already in use in the Availability Zone.</p>",
       "error":{
         "code":"SubnetAlreadyInUse",
         "httpStatusCode":400,
@@ -3855,7 +3855,7 @@
         },
         "Description":{
           "shape":"String",
-          "documentation":"<p>The version of the database engine that a DB instance can be upgraded to.</p>"
+          "documentation":"<p>The version of the database engine that an instance can be upgraded to.</p>"
         },
         "AutoUpgrade":{
           "shape":"Boolean",
@@ -3866,7 +3866,7 @@
           "documentation":"<p>A value that indicates whether a database engine is upgraded to a major version.</p>"
         }
       },
-      "documentation":"<p>The version of the database engine that a DB instance can be upgraded to.</p>"
+      "documentation":"<p>The version of the database engine that an instance can be upgraded to.</p>"
     },
     "ValidUpgradeTargetList":{
       "type":"list",
diff --git a/services/dynamodb/build.properties b/services/dynamodb/build.properties
index ecf2dae6fcb1..15ec2da1fc71 100644
--- a/services/dynamodb/build.properties
+++ b/services/dynamodb/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/dynamodb/pom.xml b/services/dynamodb/pom.xml
index 8d3fbd0944aa..857a89f90acf 100644
--- a/services/dynamodb/pom.xml
+++ b/services/dynamodb/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>dynamodb</artifactId>
     <name>AWS Java SDK :: Services :: Amazon DynamoDB</name>
@@ -57,6 +57,11 @@
             <artifactId>protocol-core</artifactId>
             <version>${awsjavasdk.version}</version>
         </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>profiles</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
         <dependency>
             <artifactId>sts</artifactId>
             <groupId>software.amazon.awssdk</groupId>
diff --git a/services/dynamodb/src/it/java/software/amazon/awssdk/services/dynamodb/BaseResultIntegrationTest.java b/services/dynamodb/src/it/java/software/amazon/awssdk/services/dynamodb/BaseResultIntegrationTest.java
index 2b8a6463f01f..9a952684b463 100644
--- a/services/dynamodb/src/it/java/software/amazon/awssdk/services/dynamodb/BaseResultIntegrationTest.java
+++ b/services/dynamodb/src/it/java/software/amazon/awssdk/services/dynamodb/BaseResultIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/dynamodb/src/it/java/software/amazon/awssdk/services/dynamodb/DynamoDbJavaClientExceptionIntegrationTest.java b/services/dynamodb/src/it/java/software/amazon/awssdk/services/dynamodb/DynamoDbJavaClientExceptionIntegrationTest.java
index a53269b62801..741c1253c34f 100644
--- a/services/dynamodb/src/it/java/software/amazon/awssdk/services/dynamodb/DynamoDbJavaClientExceptionIntegrationTest.java
+++ b/services/dynamodb/src/it/java/software/amazon/awssdk/services/dynamodb/DynamoDbJavaClientExceptionIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/dynamodb/src/it/java/software/amazon/awssdk/services/dynamodb/DynamoServiceIntegrationTest.java b/services/dynamodb/src/it/java/software/amazon/awssdk/services/dynamodb/DynamoServiceIntegrationTest.java
index f8cbde3cd36f..c4e83bd6f3c9 100644
--- a/services/dynamodb/src/it/java/software/amazon/awssdk/services/dynamodb/DynamoServiceIntegrationTest.java
+++ b/services/dynamodb/src/it/java/software/amazon/awssdk/services/dynamodb/DynamoServiceIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/dynamodb/src/it/java/software/amazon/awssdk/services/dynamodb/PaginatorIntegrationTest.java b/services/dynamodb/src/it/java/software/amazon/awssdk/services/dynamodb/PaginatorIntegrationTest.java
index 33dc48197a75..d9d2983ca132 100644
--- a/services/dynamodb/src/it/java/software/amazon/awssdk/services/dynamodb/PaginatorIntegrationTest.java
+++ b/services/dynamodb/src/it/java/software/amazon/awssdk/services/dynamodb/PaginatorIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/dynamodb/src/it/java/software/amazon/awssdk/services/dynamodb/ParallelScanIntegrationTest.java b/services/dynamodb/src/it/java/software/amazon/awssdk/services/dynamodb/ParallelScanIntegrationTest.java
index ca692fb5dd80..799cc9487d54 100644
--- a/services/dynamodb/src/it/java/software/amazon/awssdk/services/dynamodb/ParallelScanIntegrationTest.java
+++ b/services/dynamodb/src/it/java/software/amazon/awssdk/services/dynamodb/ParallelScanIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/dynamodb/src/it/java/software/amazon/awssdk/services/dynamodb/ProvisionedThroughputThrottlingIntegrationTest.java b/services/dynamodb/src/it/java/software/amazon/awssdk/services/dynamodb/ProvisionedThroughputThrottlingIntegrationTest.java
index c3a9e26ca269..5ccfba47d8eb 100644
--- a/services/dynamodb/src/it/java/software/amazon/awssdk/services/dynamodb/ProvisionedThroughputThrottlingIntegrationTest.java
+++ b/services/dynamodb/src/it/java/software/amazon/awssdk/services/dynamodb/ProvisionedThroughputThrottlingIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/dynamodb/src/it/java/software/amazon/awssdk/services/dynamodb/SecondaryIndexesIntegrationTest.java b/services/dynamodb/src/it/java/software/amazon/awssdk/services/dynamodb/SecondaryIndexesIntegrationTest.java
index c41870c5c7f2..7fa9f295548a 100644
--- a/services/dynamodb/src/it/java/software/amazon/awssdk/services/dynamodb/SecondaryIndexesIntegrationTest.java
+++ b/services/dynamodb/src/it/java/software/amazon/awssdk/services/dynamodb/SecondaryIndexesIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/dynamodb/src/it/java/software/amazon/awssdk/services/dynamodb/SecurityManagerIntegrationTest.java b/services/dynamodb/src/it/java/software/amazon/awssdk/services/dynamodb/SecurityManagerIntegrationTest.java
index 13d7f67054b0..f0b55bced2e1 100644
--- a/services/dynamodb/src/it/java/software/amazon/awssdk/services/dynamodb/SecurityManagerIntegrationTest.java
+++ b/services/dynamodb/src/it/java/software/amazon/awssdk/services/dynamodb/SecurityManagerIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/dynamodb/src/it/java/software/amazon/awssdk/services/dynamodb/SignersIntegrationTest.java b/services/dynamodb/src/it/java/software/amazon/awssdk/services/dynamodb/SignersIntegrationTest.java
index 5cdf3799833e..9448eee99820 100644
--- a/services/dynamodb/src/it/java/software/amazon/awssdk/services/dynamodb/SignersIntegrationTest.java
+++ b/services/dynamodb/src/it/java/software/amazon/awssdk/services/dynamodb/SignersIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/dynamodb/src/it/java/software/amazon/awssdk/services/dynamodb/streams/StreamsIntegrationTest.java b/services/dynamodb/src/it/java/software/amazon/awssdk/services/dynamodb/streams/StreamsIntegrationTest.java
index 2b300e4299fd..d4858abb08d2 100644
--- a/services/dynamodb/src/it/java/software/amazon/awssdk/services/dynamodb/streams/StreamsIntegrationTest.java
+++ b/services/dynamodb/src/it/java/software/amazon/awssdk/services/dynamodb/streams/StreamsIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/dynamodb/src/main/java/software/amazon/awssdk/services/dynamodb/DynamoDbRetryPolicy.java b/services/dynamodb/src/main/java/software/amazon/awssdk/services/dynamodb/DynamoDbRetryPolicy.java
index 341201bf4732..f5b0208eb9df 100644
--- a/services/dynamodb/src/main/java/software/amazon/awssdk/services/dynamodb/DynamoDbRetryPolicy.java
+++ b/services/dynamodb/src/main/java/software/amazon/awssdk/services/dynamodb/DynamoDbRetryPolicy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -16,9 +16,12 @@
 package software.amazon.awssdk.services.dynamodb;
 
 import java.time.Duration;
-import software.amazon.awssdk.annotations.SdkProtectedApi;
+import software.amazon.awssdk.annotations.SdkInternalApi;
 import software.amazon.awssdk.awscore.retry.AwsRetryPolicy;
+import software.amazon.awssdk.core.client.config.SdkClientConfiguration;
+import software.amazon.awssdk.core.client.config.SdkClientOption;
 import software.amazon.awssdk.core.internal.retry.SdkDefaultRetrySetting;
+import software.amazon.awssdk.core.retry.RetryMode;
 import software.amazon.awssdk.core.retry.RetryPolicy;
 import software.amazon.awssdk.core.retry.backoff.BackoffStrategy;
 import software.amazon.awssdk.core.retry.backoff.FullJitterBackoffStrategy;
@@ -26,44 +29,58 @@
 /**
  * Default retry policy for DynamoDB Client.
  */
-@SdkProtectedApi
-public final class DynamoDbRetryPolicy {
+@SdkInternalApi
+final class DynamoDbRetryPolicy {
 
-    /** Default max retry count for DynamoDB client **/
-    private static final int DEFAULT_MAX_ERROR_RETRY = 8;
+    /**
+     * Default max retry count for DynamoDB client, when using the LEGACY retry mode.
+     **/
+    private static final int LEGACY_MAX_ERROR_RETRY = 8;
 
     /**
-     * Default base sleep time for DynamoDB.
+     * Default base sleep time for DynamoDB, when using the LEGACY retry mode.
      **/
-    private static final Duration DEFAULT_BASE_DELAY = Duration.ofMillis(25);
+    private static final Duration LEGACY_BASE_DELAY = Duration.ofMillis(25);
 
     /**
      * The default back-off strategy for DynamoDB client, which increases
      * exponentially up to a max amount of delay. Compared to the SDK default
      * back-off strategy, it applies a smaller scale factor.
+     *
+     * This is only used when using the LEGACY retry mode.
      */
-    private static final BackoffStrategy DEFAULT_BACKOFF_STRATEGY =
+    private static final BackoffStrategy LEGACY_BACKOFF_STRATEGY =
         FullJitterBackoffStrategy.builder()
-                                 .baseDelay(DEFAULT_BASE_DELAY)
+                                 .baseDelay(LEGACY_BASE_DELAY)
                                  .maxBackoffTime(SdkDefaultRetrySetting.MAX_BACKOFF)
                                  .build();
 
-    /**
-     * Default retry policy for DynamoDB.
-     */
-    private static final RetryPolicy DEFAULT =
-        AwsRetryPolicy.defaultRetryPolicy().toBuilder()
-                      .numRetries(DEFAULT_MAX_ERROR_RETRY)
-                      .backoffStrategy(DEFAULT_BACKOFF_STRATEGY).build();
-
     private DynamoDbRetryPolicy() {
-
     }
 
-    /**
-     * @return Default retry policy used by DynamoDbClient
-     */
-    public static RetryPolicy defaultPolicy() {
-        return DEFAULT;
+    public static RetryPolicy resolveRetryPolicy(SdkClientConfiguration config) {
+        RetryPolicy configuredRetryPolicy = config.option(SdkClientOption.RETRY_POLICY);
+        if (configuredRetryPolicy != null) {
+            return configuredRetryPolicy;
+        }
+
+        RetryMode retryMode = RetryMode.resolver()
+                                       .profileFile(() -> config.option(SdkClientOption.PROFILE_FILE))
+                                       .profileName(config.option(SdkClientOption.PROFILE_NAME))
+                                       .resolve();
+
+        if (retryMode != RetryMode.LEGACY) {
+            return AwsRetryPolicy.forRetryMode(retryMode)
+                                 .toBuilder()
+                                 .additionalRetryConditionsAllowed(false)
+                                 .build();
+        }
+
+        return AwsRetryPolicy.forRetryMode(RetryMode.LEGACY)
+                             .toBuilder()
+                             .additionalRetryConditionsAllowed(false)
+                             .numRetries(LEGACY_MAX_ERROR_RETRY)
+                             .backoffStrategy(LEGACY_BACKOFF_STRATEGY)
+                             .build();
     }
 }
diff --git a/services/dynamodb/src/main/resources/codegen-resources/dynamodb/paginators-1.json b/services/dynamodb/src/main/resources/codegen-resources/dynamodb/paginators-1.json
index 3037d662ada4..ab2d5c8c08f4 100755
--- a/services/dynamodb/src/main/resources/codegen-resources/dynamodb/paginators-1.json
+++ b/services/dynamodb/src/main/resources/codegen-resources/dynamodb/paginators-1.json
@@ -4,6 +4,11 @@
       "input_token": "RequestItems",
       "output_token": "UnprocessedKeys"
     },
+    "ListContributorInsights": {
+      "input_token": "NextToken",
+      "limit_key": "MaxResults",
+      "output_token": "NextToken"
+    },
     "ListTables": {
       "input_token": "ExclusiveStartTableName",
       "limit_key": "Limit",
diff --git a/services/dynamodb/src/main/resources/codegen-resources/dynamodb/service-2.json b/services/dynamodb/src/main/resources/codegen-resources/dynamodb/service-2.json
index 656e0055e4a1..28bd407ac755 100755
--- a/services/dynamodb/src/main/resources/codegen-resources/dynamodb/service-2.json
+++ b/services/dynamodb/src/main/resources/codegen-resources/dynamodb/service-2.json
@@ -84,7 +84,7 @@
         {"shape":"GlobalTableAlreadyExistsException"},
         {"shape":"TableNotFoundException"}
       ],
-      "documentation":"<p>Creates a global table from an existing table. A global table creates a replication relationship between two or more DynamoDB tables with the same table name in the provided Regions. </p> <p>If you want to add a new replica table to a global table, each of the following conditions must be true:</p> <ul> <li> <p>The table must have the same primary key as all of the other replicas.</p> </li> <li> <p>The table must have the same name as all of the other replicas.</p> </li> <li> <p>The table must have DynamoDB Streams enabled, with the stream containing both the new and the old images of the item.</p> </li> <li> <p>None of the replica tables in the global table can contain any data.</p> </li> </ul> <p> If global secondary indexes are specified, then the following conditions must also be met: </p> <ul> <li> <p> The global secondary indexes must have the same name. </p> </li> <li> <p> The global secondary indexes must have the same hash key and sort key (if present). </p> </li> </ul> <important> <p> Write capacity settings should be set consistently across your replica tables and secondary indexes. DynamoDB strongly recommends enabling auto scaling to manage the write capacity settings for all of your global tables replicas and indexes. </p> <p> If you prefer to manage write capacity settings manually, you should provision equal replicated write capacity units to your replica tables. You should also provision equal replicated write capacity units to matching secondary indexes across your global table. </p> </important>",
+      "documentation":"<p>Creates a global table from an existing table. A global table creates a replication relationship between two or more DynamoDB tables with the same table name in the provided Regions. </p> <note> <p>This method only applies to <a href=\"https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/globaltables.V1.html\">Version 2017.11.29</a> of global tables.</p> </note> <p>If you want to add a new replica table to a global table, each of the following conditions must be true:</p> <ul> <li> <p>The table must have the same primary key as all of the other replicas.</p> </li> <li> <p>The table must have the same name as all of the other replicas.</p> </li> <li> <p>The table must have DynamoDB Streams enabled, with the stream containing both the new and the old images of the item.</p> </li> <li> <p>None of the replica tables in the global table can contain any data.</p> </li> </ul> <p> If global secondary indexes are specified, then the following conditions must also be met: </p> <ul> <li> <p> The global secondary indexes must have the same name. </p> </li> <li> <p> The global secondary indexes must have the same hash key and sort key (if present). </p> </li> </ul> <important> <p> Write capacity settings should be set consistently across your replica tables and secondary indexes. DynamoDB strongly recommends enabling auto scaling to manage the write capacity settings for all of your global tables replicas and indexes. </p> <p> If you prefer to manage write capacity settings manually, you should provision equal replicated write capacity units to your replica tables. You should also provision equal replicated write capacity units to matching secondary indexes across your global table. </p> </important>",
       "endpointdiscovery":{
       }
     },
@@ -194,6 +194,20 @@
       "endpointdiscovery":{
       }
     },
+    "DescribeContributorInsights":{
+      "name":"DescribeContributorInsights",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DescribeContributorInsightsInput"},
+      "output":{"shape":"DescribeContributorInsightsOutput"},
+      "errors":[
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InternalServerError"}
+      ],
+      "documentation":"<p>Returns information about contributor insights, for a given table or global secondary index.</p>"
+    },
     "DescribeEndpoints":{
       "name":"DescribeEndpoints",
       "http":{
@@ -217,7 +231,7 @@
         {"shape":"InternalServerError"},
         {"shape":"GlobalTableNotFoundException"}
       ],
-      "documentation":"<p>Returns information about the specified global table.</p>",
+      "documentation":"<p>Returns information about the specified global table.</p> <note> <p>This method only applies to <a href=\"https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/globaltables.V1.html\">Version 2017.11.29</a> of global tables.</p> </note>",
       "endpointdiscovery":{
       }
     },
@@ -233,7 +247,7 @@
         {"shape":"GlobalTableNotFoundException"},
         {"shape":"InternalServerError"}
       ],
-      "documentation":"<p>Describes Region-specific settings for a global table.</p>",
+      "documentation":"<p>Describes Region-specific settings for a global table.</p> <note> <p>This method only applies to <a href=\"https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/globaltables.V1.html\">Version 2017.11.29</a> of global tables.</p> </note>",
       "endpointdiscovery":{
       }
     },
@@ -268,6 +282,20 @@
       "endpointdiscovery":{
       }
     },
+    "DescribeTableReplicaAutoScaling":{
+      "name":"DescribeTableReplicaAutoScaling",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DescribeTableReplicaAutoScalingInput"},
+      "output":{"shape":"DescribeTableReplicaAutoScalingOutput"},
+      "errors":[
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InternalServerError"}
+      ],
+      "documentation":"<p>Describes auto scaling settings across replicas of the global table at once.</p> <note> <p>This method only applies to <a href=\"https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/globaltables.V2.html\">Version 2019.11.21</a> of global tables.</p> </note>"
+    },
     "DescribeTimeToLive":{
       "name":"DescribeTimeToLive",
       "http":{
@@ -317,6 +345,20 @@
       "endpointdiscovery":{
       }
     },
+    "ListContributorInsights":{
+      "name":"ListContributorInsights",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"ListContributorInsightsInput"},
+      "output":{"shape":"ListContributorInsightsOutput"},
+      "errors":[
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InternalServerError"}
+      ],
+      "documentation":"<p>Returns a list of ContributorInsightsSummary for a table and all its global secondary indexes.</p>"
+    },
     "ListGlobalTables":{
       "name":"ListGlobalTables",
       "http":{
@@ -328,7 +370,7 @@
       "errors":[
         {"shape":"InternalServerError"}
       ],
-      "documentation":"<p>Lists all global tables that have a replica in the specified Region.</p>",
+      "documentation":"<p>Lists all global tables that have a replica in the specified Region.</p> <note> <p>This method only applies to <a href=\"https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/globaltables.V1.html\">Version 2017.11.29</a> of global tables.</p> </note>",
       "endpointdiscovery":{
       }
     },
@@ -490,9 +532,10 @@
         {"shape":"ResourceNotFoundException"},
         {"shape":"TransactionCanceledException"},
         {"shape":"ProvisionedThroughputExceededException"},
+        {"shape":"RequestLimitExceeded"},
         {"shape":"InternalServerError"}
       ],
-      "documentation":"<p> <code>TransactGetItems</code> is a synchronous operation that atomically retrieves multiple items from one or more tables (but not from indexes) in a single account and Region. A <code>TransactGetItems</code> call can contain up to 25 <code>TransactGetItem</code> objects, each of which contains a <code>Get</code> structure that specifies an item to retrieve from a table in the account and Region. A call to <code>TransactGetItems</code> cannot retrieve items from tables in more than one AWS account or Region. The aggregate size of the items in the transaction cannot exceed 4 MB.</p> <note> <p>All AWS Regions and AWS GovCloud (US) support up to 25 items per transaction with up to 4 MB of data, except the following AWS Regions: </p> <ul> <li> <p>China (Beijing)</p> </li> <li> <p>China (Ningxia)</p> </li> </ul> <p>The China (Beijing) and China (Ningxia) Regions support up to 10 items per transaction with up to 4 MB of data. </p> </note> <p>DynamoDB rejects the entire <code>TransactGetItems</code> request if any of the following is true:</p> <ul> <li> <p>A conflicting operation is in the process of updating an item to be read.</p> </li> <li> <p>There is insufficient provisioned capacity for the transaction to be completed.</p> </li> <li> <p>There is a user error, such as an invalid data format.</p> </li> <li> <p>The aggregate size of the items in the transaction cannot exceed 4 MB.</p> </li> </ul>",
+      "documentation":"<p> <code>TransactGetItems</code> is a synchronous operation that atomically retrieves multiple items from one or more tables (but not from indexes) in a single account and Region. A <code>TransactGetItems</code> call can contain up to 25 <code>TransactGetItem</code> objects, each of which contains a <code>Get</code> structure that specifies an item to retrieve from a table in the account and Region. A call to <code>TransactGetItems</code> cannot retrieve items from tables in more than one AWS account or Region. The aggregate size of the items in the transaction cannot exceed 4 MB.</p> <p>DynamoDB rejects the entire <code>TransactGetItems</code> request if any of the following is true:</p> <ul> <li> <p>A conflicting operation is in the process of updating an item to be read.</p> </li> <li> <p>There is insufficient provisioned capacity for the transaction to be completed.</p> </li> <li> <p>There is a user error, such as an invalid data format.</p> </li> <li> <p>The aggregate size of the items in the transaction cannot exceed 4 MB.</p> </li> </ul>",
       "endpointdiscovery":{
       }
     },
@@ -510,9 +553,10 @@
         {"shape":"TransactionInProgressException"},
         {"shape":"IdempotentParameterMismatchException"},
         {"shape":"ProvisionedThroughputExceededException"},
+        {"shape":"RequestLimitExceeded"},
         {"shape":"InternalServerError"}
       ],
-      "documentation":"<p> <code>TransactWriteItems</code> is a synchronous write operation that groups up to 25 action requests. These actions can target items in different tables, but not in different AWS accounts or Regions, and no two actions can target the same item. For example, you cannot both <code>ConditionCheck</code> and <code>Update</code> the same item. The aggregate size of the items in the transaction cannot exceed 4 MB.</p> <note> <p>All AWS Regions and AWS GovCloud (US) support up to 25 items per transaction with up to 4 MB of data, except the following AWS Regions: </p> <ul> <li> <p>China (Beijing)</p> </li> <li> <p>China (Ningxia)</p> </li> </ul> <p>The China (Beijing) and China (Ningxia) Regions support up to 10 items per transaction with up to 4 MB of data. </p> </note> <p>The actions are completed atomically so that either all of them succeed, or all of them fail. They are defined by the following objects:</p> <ul> <li> <p> <code>Put</code>  &#x97;   Initiates a <code>PutItem</code> operation to write a new item. This structure specifies the primary key of the item to be written, the name of the table to write it in, an optional condition expression that must be satisfied for the write to succeed, a list of the item's attributes, and a field indicating whether to retrieve the item's attributes if the condition is not met.</p> </li> <li> <p> <code>Update</code>  &#x97;   Initiates an <code>UpdateItem</code> operation to update an existing item. This structure specifies the primary key of the item to be updated, the name of the table where it resides, an optional condition expression that must be satisfied for the update to succeed, an expression that defines one or more attributes to be updated, and a field indicating whether to retrieve the item's attributes if the condition is not met.</p> </li> <li> <p> <code>Delete</code>  &#x97;   Initiates a <code>DeleteItem</code> operation to delete an existing item. This structure specifies the primary key of the item to be deleted, the name of the table where it resides, an optional condition expression that must be satisfied for the deletion to succeed, and a field indicating whether to retrieve the item's attributes if the condition is not met.</p> </li> <li> <p> <code>ConditionCheck</code>  &#x97;   Applies a condition to an item that is not being modified by the transaction. This structure specifies the primary key of the item to be checked, the name of the table where it resides, a condition expression that must be satisfied for the transaction to succeed, and a field indicating whether to retrieve the item's attributes if the condition is not met.</p> </li> </ul> <p>DynamoDB rejects the entire <code>TransactWriteItems</code> request if any of the following is true:</p> <ul> <li> <p>A condition in one of the condition expressions is not met.</p> </li> <li> <p>An ongoing operation is in the process of updating the same item.</p> </li> <li> <p>There is insufficient provisioned capacity for the transaction to be completed.</p> </li> <li> <p>An item size becomes too large (bigger than 400 KB), a local secondary index (LSI) becomes too large, or a similar validation error occurs because of changes made by the transaction.</p> </li> <li> <p>The aggregate size of the items in the transaction exceeds 4 MB.</p> </li> <li> <p>There is a user error, such as an invalid data format.</p> </li> </ul>",
+      "documentation":"<p> <code>TransactWriteItems</code> is a synchronous write operation that groups up to 25 action requests. These actions can target items in different tables, but not in different AWS accounts or Regions, and no two actions can target the same item. For example, you cannot both <code>ConditionCheck</code> and <code>Update</code> the same item. The aggregate size of the items in the transaction cannot exceed 4 MB.</p> <p>The actions are completed atomically so that either all of them succeed, or all of them fail. They are defined by the following objects:</p> <ul> <li> <p> <code>Put</code>  &#x97;   Initiates a <code>PutItem</code> operation to write a new item. This structure specifies the primary key of the item to be written, the name of the table to write it in, an optional condition expression that must be satisfied for the write to succeed, a list of the item's attributes, and a field indicating whether to retrieve the item's attributes if the condition is not met.</p> </li> <li> <p> <code>Update</code>  &#x97;   Initiates an <code>UpdateItem</code> operation to update an existing item. This structure specifies the primary key of the item to be updated, the name of the table where it resides, an optional condition expression that must be satisfied for the update to succeed, an expression that defines one or more attributes to be updated, and a field indicating whether to retrieve the item's attributes if the condition is not met.</p> </li> <li> <p> <code>Delete</code>  &#x97;   Initiates a <code>DeleteItem</code> operation to delete an existing item. This structure specifies the primary key of the item to be deleted, the name of the table where it resides, an optional condition expression that must be satisfied for the deletion to succeed, and a field indicating whether to retrieve the item's attributes if the condition is not met.</p> </li> <li> <p> <code>ConditionCheck</code>  &#x97;   Applies a condition to an item that is not being modified by the transaction. This structure specifies the primary key of the item to be checked, the name of the table where it resides, a condition expression that must be satisfied for the transaction to succeed, and a field indicating whether to retrieve the item's attributes if the condition is not met.</p> </li> </ul> <p>DynamoDB rejects the entire <code>TransactWriteItems</code> request if any of the following is true:</p> <ul> <li> <p>A condition in one of the condition expressions is not met.</p> </li> <li> <p>An ongoing operation is in the process of updating the same item.</p> </li> <li> <p>There is insufficient provisioned capacity for the transaction to be completed.</p> </li> <li> <p>An item size becomes too large (bigger than 400 KB), a local secondary index (LSI) becomes too large, or a similar validation error occurs because of changes made by the transaction.</p> </li> <li> <p>The aggregate size of the items in the transaction exceeds 4 MB.</p> </li> <li> <p>There is a user error, such as an invalid data format.</p> </li> </ul>",
       "endpointdiscovery":{
       }
     },
@@ -550,6 +594,20 @@
       "endpointdiscovery":{
       }
     },
+    "UpdateContributorInsights":{
+      "name":"UpdateContributorInsights",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"UpdateContributorInsightsInput"},
+      "output":{"shape":"UpdateContributorInsightsOutput"},
+      "errors":[
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InternalServerError"}
+      ],
+      "documentation":"<p>Updates the status for contributor insights for a specific table or index.</p>"
+    },
     "UpdateGlobalTable":{
       "name":"UpdateGlobalTable",
       "http":{
@@ -628,6 +686,22 @@
       "endpointdiscovery":{
       }
     },
+    "UpdateTableReplicaAutoScaling":{
+      "name":"UpdateTableReplicaAutoScaling",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"UpdateTableReplicaAutoScalingInput"},
+      "output":{"shape":"UpdateTableReplicaAutoScalingOutput"},
+      "errors":[
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ResourceInUseException"},
+        {"shape":"LimitExceededException"},
+        {"shape":"InternalServerError"}
+      ],
+      "documentation":"<p>Updates auto scaling settings on your global tables at once.</p> <note> <p>This method only applies to <a href=\"https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/globaltables.V2.html\">Version 2019.11.21</a> of global tables.</p> </note>"
+    },
     "UpdateTimeToLive":{
       "name":"UpdateTimeToLive",
       "http":{
@@ -648,6 +722,25 @@
     }
   },
   "shapes":{
+    "ArchivalReason":{"type":"string"},
+    "ArchivalSummary":{
+      "type":"structure",
+      "members":{
+        "ArchivalDateTime":{
+          "shape":"Date",
+          "documentation":"<p>The date and time when table archival was initiated by DynamoDB, in UNIX epoch time format.</p>"
+        },
+        "ArchivalReason":{
+          "shape":"ArchivalReason",
+          "documentation":"<p>The reason DynamoDB archived the table. Currently, the only possible value is:</p> <ul> <li> <p> <code>INACCESSIBLE_ENCRYPTION_CREDENTIALS</code> - The table was archived due to the table's AWS KMS key being inaccessible for more than seven days. An On-Demand backup was created at the archival time.</p> </li> </ul>"
+        },
+        "ArchivalBackupArn":{
+          "shape":"BackupArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the backup the table was archived to, when applicable in the archival reason. If you wish to restore this backup to the same table name, you will need to delete the original table.</p>"
+        }
+      },
+      "documentation":"<p>Contains details of a table archival operation.</p>"
+    },
     "AttributeAction":{
       "type":"string",
       "enum":[
@@ -798,7 +891,7 @@
           "documentation":"<p>Represents a target tracking scaling policy configuration.</p>"
         }
       },
-      "documentation":"<p>Represents the autoscaling policy to be modified.</p>"
+      "documentation":"<p>Represents the auto scaling policy to be modified.</p>"
     },
     "AutoScalingRoleArn":{
       "type":"string",
@@ -819,18 +912,18 @@
         },
         "AutoScalingDisabled":{
           "shape":"BooleanObject",
-          "documentation":"<p>Disabled autoscaling for this global table or global secondary index.</p>"
+          "documentation":"<p>Disabled auto scaling for this global table or global secondary index.</p>"
         },
         "AutoScalingRoleArn":{
           "shape":"String",
-          "documentation":"<p>Role ARN used for configuring autoScaling policy.</p>"
+          "documentation":"<p>Role ARN used for configuring the auto scaling policy.</p>"
         },
         "ScalingPolicies":{
           "shape":"AutoScalingPolicyDescriptionList",
           "documentation":"<p>Information about the scaling policies.</p>"
         }
       },
-      "documentation":"<p>Represents the autoscaling settings for a global table or global secondary index.</p>"
+      "documentation":"<p>Represents the auto scaling settings for a global table or global secondary index.</p>"
     },
     "AutoScalingSettingsUpdate":{
       "type":"structure",
@@ -845,18 +938,18 @@
         },
         "AutoScalingDisabled":{
           "shape":"BooleanObject",
-          "documentation":"<p>Disabled autoscaling for this global table or global secondary index.</p>"
+          "documentation":"<p>Disabled auto scaling for this global table or global secondary index.</p>"
         },
         "AutoScalingRoleArn":{
           "shape":"AutoScalingRoleArn",
-          "documentation":"<p>Role ARN used for configuring autoscaling policy.</p>"
+          "documentation":"<p>Role ARN used for configuring auto scaling policy.</p>"
         },
         "ScalingPolicyUpdate":{
           "shape":"AutoScalingPolicyUpdate",
           "documentation":"<p>The scaling policy to apply for scaling target global table or global secondary index capacity units.</p>"
         }
       },
-      "documentation":"<p>Represents the autoscaling settings to be modified for a global table or global secondary index.</p>"
+      "documentation":"<p>Represents the auto scaling settings to be modified for a global table or global secondary index.</p>"
     },
     "AutoScalingTargetTrackingScalingPolicyConfigurationDescription":{
       "type":"structure",
@@ -868,7 +961,7 @@
         },
         "ScaleInCooldown":{
           "shape":"IntegerObject",
-          "documentation":"<p>The amount of time, in seconds, after a scale in activity completes before another scale in activity can start. The cooldown period is used to block subsequent scale in requests until it has expired. You should scale in conservatively to protect your application's availability. However, if another alarm triggers a scale out policy during the cooldown period after a scale-in, application autoscaling scales out your scalable target immediately. </p>"
+          "documentation":"<p>The amount of time, in seconds, after a scale in activity completes before another scale in activity can start. The cooldown period is used to block subsequent scale in requests until it has expired. You should scale in conservatively to protect your application's availability. However, if another alarm triggers a scale out policy during the cooldown period after a scale-in, application auto scaling scales out your scalable target immediately. </p>"
         },
         "ScaleOutCooldown":{
           "shape":"IntegerObject",
@@ -891,7 +984,7 @@
         },
         "ScaleInCooldown":{
           "shape":"IntegerObject",
-          "documentation":"<p>The amount of time, in seconds, after a scale in activity completes before another scale in activity can start. The cooldown period is used to block subsequent scale in requests until it has expired. You should scale in conservatively to protect your application's availability. However, if another alarm triggers a scale out policy during the cooldown period after a scale-in, application autoscaling scales out your scalable target immediately. </p>"
+          "documentation":"<p>The amount of time, in seconds, after a scale in activity completes before another scale in activity can start. The cooldown period is used to block subsequent scale in requests until it has expired. You should scale in conservatively to protect your application's availability. However, if another alarm triggers a scale out policy during the cooldown period after a scale-in, application auto scaling scales out your scalable target immediately. </p>"
         },
         "ScaleOutCooldown":{
           "shape":"IntegerObject",
@@ -1208,7 +1301,7 @@
     "CancellationReasonList":{
       "type":"list",
       "member":{"shape":"CancellationReason"},
-      "max":10,
+      "max":25,
       "min":1
     },
     "Capacity":{
@@ -1301,7 +1394,7 @@
           "documentation":"<p>Use <code>ReturnValuesOnConditionCheckFailure</code> to get the item attributes if the <code>ConditionCheck</code> condition fails. For <code>ReturnValuesOnConditionCheckFailure</code>, the valid values are: NONE and ALL_OLD.</p>"
         }
       },
-      "documentation":"<p>Represents a request to perform a check that an item exists or to check the condition of specific attributes of the item..</p>"
+      "documentation":"<p>Represents a request to perform a check that an item exists or to check the condition of specific attributes of the item.</p>"
     },
     "ConditionExpression":{"type":"string"},
     "ConditionalCheckFailedException":{
@@ -1392,6 +1485,53 @@
       "documentation":"<p>Backups have not yet been enabled for this table.</p>",
       "exception":true
     },
+    "ContributorInsightsAction":{
+      "type":"string",
+      "enum":[
+        "ENABLE",
+        "DISABLE"
+      ]
+    },
+    "ContributorInsightsRule":{
+      "type":"string",
+      "pattern":"[A-Za-z0-9][A-Za-z0-9\\-\\_\\.]{0,126}[A-Za-z0-9]"
+    },
+    "ContributorInsightsRuleList":{
+      "type":"list",
+      "member":{"shape":"ContributorInsightsRule"}
+    },
+    "ContributorInsightsStatus":{
+      "type":"string",
+      "enum":[
+        "ENABLING",
+        "ENABLED",
+        "DISABLING",
+        "DISABLED",
+        "FAILED"
+      ]
+    },
+    "ContributorInsightsSummaries":{
+      "type":"list",
+      "member":{"shape":"ContributorInsightsSummary"}
+    },
+    "ContributorInsightsSummary":{
+      "type":"structure",
+      "members":{
+        "TableName":{
+          "shape":"TableName",
+          "documentation":"<p>Name of the table associated with the summary.</p>"
+        },
+        "IndexName":{
+          "shape":"IndexName",
+          "documentation":"<p>Name of the index associated with the summary, if any.</p>"
+        },
+        "ContributorInsightsStatus":{
+          "shape":"ContributorInsightsStatus",
+          "documentation":"<p>Describes the current status for contributor insights for the given table and index, if applicable.</p>"
+        }
+      },
+      "documentation":"<p>Represents a Contributor Insights summary entry..</p>"
+    },
     "CreateBackupInput":{
       "type":"structure",
       "required":[
@@ -1477,11 +1617,34 @@
       "members":{
         "RegionName":{
           "shape":"RegionName",
-          "documentation":"<p>The region of the replica to be added.</p>"
+          "documentation":"<p>The Region of the replica to be added.</p>"
         }
       },
       "documentation":"<p>Represents a replica to be added.</p>"
     },
+    "CreateReplicationGroupMemberAction":{
+      "type":"structure",
+      "required":["RegionName"],
+      "members":{
+        "RegionName":{
+          "shape":"RegionName",
+          "documentation":"<p>The Region where the new replica will be created.</p>"
+        },
+        "KMSMasterKeyId":{
+          "shape":"KMSMasterKeyId",
+          "documentation":"<p>The AWS KMS customer master key (CMK) that should be used for AWS KMS encryption in the new replica. To specify a CMK, use its key ID, Amazon Resource Name (ARN), alias name, or alias ARN. Note that you should only provide this parameter if the key is different from the default DynamoDB KMS master key alias/aws/dynamodb.</p>"
+        },
+        "ProvisionedThroughputOverride":{
+          "shape":"ProvisionedThroughputOverride",
+          "documentation":"<p>Replica-specific provisioned throughput. If not specified, uses the source table's provisioned throughput settings.</p>"
+        },
+        "GlobalSecondaryIndexes":{
+          "shape":"ReplicaGlobalSecondaryIndexList",
+          "documentation":"<p>Replica-specific global secondary index settings.</p>"
+        }
+      },
+      "documentation":"<p>Represents a replica to be created.</p>"
+    },
     "CreateTableInput":{
       "type":"structure",
       "required":[
@@ -1512,7 +1675,7 @@
         },
         "BillingMode":{
           "shape":"BillingMode",
-          "documentation":"<p>Controls how you are charged for read and write throughput and how you manage capacity. This setting can be changed later.</p> <ul> <li> <p> <code>PROVISIONED</code> - Sets the billing mode to <code>PROVISIONED</code>. We recommend using <code>PROVISIONED</code> for predictable workloads.</p> </li> <li> <p> <code>PAY_PER_REQUEST</code> - Sets the billing mode to <code>PAY_PER_REQUEST</code>. We recommend using <code>PAY_PER_REQUEST</code> for unpredictable workloads. </p> </li> </ul>"
+          "documentation":"<p>Controls how you are charged for read and write throughput and how you manage capacity. This setting can be changed later.</p> <ul> <li> <p> <code>PROVISIONED</code> - We recommend using <code>PROVISIONED</code> for predictable workloads. <code>PROVISIONED</code> sets the billing mode to <a href=\"https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/HowItWorks.ReadWriteCapacityMode.html#HowItWorks.ProvisionedThroughput.Manual\">Provisioned Mode</a>.</p> </li> <li> <p> <code>PAY_PER_REQUEST</code> - We recommend using <code>PAY_PER_REQUEST</code> for unpredictable workloads. <code>PAY_PER_REQUEST</code> sets the billing mode to <a href=\"https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/HowItWorks.ReadWriteCapacityMode.html#HowItWorks.OnDemand\">On-Demand Mode</a>. </p> </li> </ul>"
         },
         "ProvisionedThroughput":{
           "shape":"ProvisionedThroughput",
@@ -1679,11 +1842,22 @@
       "members":{
         "RegionName":{
           "shape":"RegionName",
-          "documentation":"<p>The region of the replica to be removed.</p>"
+          "documentation":"<p>The Region of the replica to be removed.</p>"
         }
       },
       "documentation":"<p>Represents a replica to be removed.</p>"
     },
+    "DeleteReplicationGroupMemberAction":{
+      "type":"structure",
+      "required":["RegionName"],
+      "members":{
+        "RegionName":{
+          "shape":"RegionName",
+          "documentation":"<p>The Region where the replica exists.</p>"
+        }
+      },
+      "documentation":"<p>Represents a replica to be deleted.</p>"
+    },
     "DeleteRequest":{
       "type":"structure",
       "required":["Key"],
@@ -1754,6 +1928,49 @@
         }
       }
     },
+    "DescribeContributorInsightsInput":{
+      "type":"structure",
+      "required":["TableName"],
+      "members":{
+        "TableName":{
+          "shape":"TableName",
+          "documentation":"<p>The name of the table to describe.</p>"
+        },
+        "IndexName":{
+          "shape":"IndexName",
+          "documentation":"<p>The name of the global secondary index to describe, if applicable.</p>"
+        }
+      }
+    },
+    "DescribeContributorInsightsOutput":{
+      "type":"structure",
+      "members":{
+        "TableName":{
+          "shape":"TableName",
+          "documentation":"<p>The name of the table being described.</p>"
+        },
+        "IndexName":{
+          "shape":"IndexName",
+          "documentation":"<p>The name of the global secondary index being described.</p>"
+        },
+        "ContributorInsightsRuleList":{
+          "shape":"ContributorInsightsRuleList",
+          "documentation":"<p>List of names of the associated Alpine rules.</p>"
+        },
+        "ContributorInsightsStatus":{
+          "shape":"ContributorInsightsStatus",
+          "documentation":"<p>Current Status contributor insights.</p>"
+        },
+        "LastUpdateDateTime":{
+          "shape":"LastUpdateDateTime",
+          "documentation":"<p>Timestamp of the last time the status was changed.</p>"
+        },
+        "FailureException":{
+          "shape":"FailureException",
+          "documentation":"<p>Returns information about the last failure that encountered.</p> <p>The most common exceptions for a FAILED status are:</p> <ul> <li> <p>LimitExceededException - Per-account Amazon CloudWatch Contributor Insights rule limit reached. Please disable Contributor Insights for other tables/indexes OR disable Contributor Insights rules before retrying.</p> </li> <li> <p>AccessDeniedException - Amazon CloudWatch Contributor Insights rules cannot be modified due to insufficient permissions.</p> </li> <li> <p>AccessDeniedException - Failed to create service-linked role for Contributor Insights due to insufficient permissions.</p> </li> <li> <p>InternalServerError - Failed to create Amazon CloudWatch Contributor Insights rules. Please retry request.</p> </li> </ul>"
+        }
+      }
+    },
     "DescribeEndpointsRequest":{
       "type":"structure",
       "members":{
@@ -1860,6 +2077,25 @@
       },
       "documentation":"<p>Represents the output of a <code>DescribeTable</code> operation.</p>"
     },
+    "DescribeTableReplicaAutoScalingInput":{
+      "type":"structure",
+      "required":["TableName"],
+      "members":{
+        "TableName":{
+          "shape":"TableName",
+          "documentation":"<p>The name of the table.</p>"
+        }
+      }
+    },
+    "DescribeTableReplicaAutoScalingOutput":{
+      "type":"structure",
+      "members":{
+        "TableAutoScalingDescription":{
+          "shape":"TableAutoScalingDescription",
+          "documentation":"<p>Represents the auto scaling properties of the table.</p>"
+        }
+      }
+    },
     "DescribeTimeToLiveInput":{
       "type":"structure",
       "required":["TableName"],
@@ -1903,6 +2139,8 @@
       "member":{"shape":"Endpoint"}
     },
     "ErrorMessage":{"type":"string"},
+    "ExceptionDescription":{"type":"string"},
+    "ExceptionName":{"type":"string"},
     "ExpectedAttributeMap":{
       "type":"map",
       "key":{"shape":"AttributeName"},
@@ -1928,7 +2166,7 @@
           "documentation":"<p>One or more values to evaluate against the supplied attribute. The number of values in the list depends on the <code>ComparisonOperator</code> being used.</p> <p>For type Number, value comparisons are numeric.</p> <p>String value comparisons for greater than, equals, or less than are based on ASCII character code values. For example, <code>a</code> is greater than <code>A</code>, and <code>a</code> is greater than <code>B</code>. For a list of code values, see <a href=\"http://en.wikipedia.org/wiki/ASCII#ASCII_printable_characters\">http://en.wikipedia.org/wiki/ASCII#ASCII_printable_characters</a>.</p> <p>For Binary, DynamoDB treats each byte of the binary data as unsigned when it compares binary values.</p> <p>For information on specifying data types in JSON, see <a href=\"https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/DataFormat.html\">JSON Data Format</a> in the <i>Amazon DynamoDB Developer Guide</i>.</p>"
         }
       },
-      "documentation":"<p>Represents a condition to be compared with an attribute value. This condition can be used with <code>DeleteItem</code>, <code>PutItem</code> or <code>UpdateItem</code> operations; if the comparison evaluates to true, the operation succeeds; if not, the operation fails. You can use <code>ExpectedAttributeValue</code> in one of two different ways:</p> <ul> <li> <p>Use <code>AttributeValueList</code> to specify one or more values to compare against an attribute. Use <code>ComparisonOperator</code> to specify how you want to perform the comparison. If the comparison evaluates to true, then the conditional operation succeeds.</p> </li> <li> <p>Use <code>Value</code> to specify a value that DynamoDB will compare against an attribute. If the values match, then <code>ExpectedAttributeValue</code> evaluates to true and the conditional operation succeeds. Optionally, you can also set <code>Exists</code> to false, indicating that you <i>do not</i> expect to find the attribute value in the table. In this case, the conditional operation succeeds only if the comparison evaluates to false.</p> </li> </ul> <p> <code>Value</code> and <code>Exists</code> are incompatible with <code>AttributeValueList</code> and <code>ComparisonOperator</code>. Note that if you use both sets of parameters at once, DynamoDB will return a <code>ValidationException</code> exception.</p>"
+      "documentation":"<p>Represents a condition to be compared with an attribute value. This condition can be used with <code>DeleteItem</code>, <code>PutItem</code>, or <code>UpdateItem</code> operations; if the comparison evaluates to true, the operation succeeds; if not, the operation fails. You can use <code>ExpectedAttributeValue</code> in one of two different ways:</p> <ul> <li> <p>Use <code>AttributeValueList</code> to specify one or more values to compare against an attribute. Use <code>ComparisonOperator</code> to specify how you want to perform the comparison. If the comparison evaluates to true, then the conditional operation succeeds.</p> </li> <li> <p>Use <code>Value</code> to specify a value that DynamoDB will compare against an attribute. If the values match, then <code>ExpectedAttributeValue</code> evaluates to true and the conditional operation succeeds. Optionally, you can also set <code>Exists</code> to false, indicating that you <i>do not</i> expect to find the attribute value in the table. In this case, the conditional operation succeeds only if the comparison evaluates to false.</p> </li> </ul> <p> <code>Value</code> and <code>Exists</code> are incompatible with <code>AttributeValueList</code> and <code>ComparisonOperator</code>. Note that if you use both sets of parameters at once, DynamoDB will return a <code>ValidationException</code> exception.</p>"
     },
     "ExpressionAttributeNameMap":{
       "type":"map",
@@ -1942,6 +2180,20 @@
       "value":{"shape":"AttributeValue"}
     },
     "ExpressionAttributeValueVariable":{"type":"string"},
+    "FailureException":{
+      "type":"structure",
+      "members":{
+        "ExceptionName":{
+          "shape":"ExceptionName",
+          "documentation":"<p>Exception name.</p>"
+        },
+        "ExceptionDescription":{
+          "shape":"ExceptionDescription",
+          "documentation":"<p>Description of the failure.</p>"
+        }
+      },
+      "documentation":"<p>Represents a failure a contributor insights operation.</p>"
+    },
     "FilterConditionMap":{
       "type":"map",
       "key":{"shape":"AttributeName"},
@@ -2036,7 +2288,7 @@
         },
         "KeySchema":{
           "shape":"KeySchema",
-          "documentation":"<p>The complete key schema for a global secondary index, which consists of one or more pairs of attribute names and key types:</p> <ul> <li> <p> <code>HASH</code> - partition key</p> </li> <li> <p> <code>RANGE</code> - sort key</p> </li> </ul> <note> <p>The partition key of an item is also known as its <i>hash attribute</i>. The term \"hash attribute\" derives from DynamoDB' usage of an internal hash function to evenly distribute data items across partitions, based on their partition key values.</p> <p>The sort key of an item is also known as its <i>range attribute</i>. The term \"range attribute\" derives from the way DynamoDB stores items with the same partition key physically close together, in sorted order by the sort key value.</p> </note>"
+          "documentation":"<p>The complete key schema for a global secondary index, which consists of one or more pairs of attribute names and key types:</p> <ul> <li> <p> <code>HASH</code> - partition key</p> </li> <li> <p> <code>RANGE</code> - sort key</p> </li> </ul> <note> <p>The partition key of an item is also known as its <i>hash attribute</i>. The term \"hash attribute\" derives from DynamoDB's usage of an internal hash function to evenly distribute data items across partitions, based on their partition key values.</p> <p>The sort key of an item is also known as its <i>range attribute</i>. The term \"range attribute\" derives from the way DynamoDB stores items with the same partition key physically close together, in sorted order by the sort key value.</p> </note>"
         },
         "Projection":{
           "shape":"Projection",
@@ -2049,6 +2301,22 @@
       },
       "documentation":"<p>Represents the properties of a global secondary index.</p>"
     },
+    "GlobalSecondaryIndexAutoScalingUpdate":{
+      "type":"structure",
+      "members":{
+        "IndexName":{
+          "shape":"IndexName",
+          "documentation":"<p>The name of the global secondary index.</p>"
+        },
+        "ProvisionedWriteCapacityAutoScalingUpdate":{"shape":"AutoScalingSettingsUpdate"}
+      },
+      "documentation":"<p>Represents the auto scaling settings of a global secondary index for a global table that will be modified.</p>"
+    },
+    "GlobalSecondaryIndexAutoScalingUpdateList":{
+      "type":"list",
+      "member":{"shape":"GlobalSecondaryIndexAutoScalingUpdate"},
+      "min":1
+    },
     "GlobalSecondaryIndexDescription":{
       "type":"structure",
       "members":{
@@ -2058,7 +2326,7 @@
         },
         "KeySchema":{
           "shape":"KeySchema",
-          "documentation":"<p>The complete key schema for a global secondary index, which consists of one or more pairs of attribute names and key types:</p> <ul> <li> <p> <code>HASH</code> - partition key</p> </li> <li> <p> <code>RANGE</code> - sort key</p> </li> </ul> <note> <p>The partition key of an item is also known as its <i>hash attribute</i>. The term \"hash attribute\" derives from DynamoDB' usage of an internal hash function to evenly distribute data items across partitions, based on their partition key values.</p> <p>The sort key of an item is also known as its <i>range attribute</i>. The term \"range attribute\" derives from the way DynamoDB stores items with the same partition key physically close together, in sorted order by the sort key value.</p> </note>"
+          "documentation":"<p>The complete key schema for a global secondary index, which consists of one or more pairs of attribute names and key types:</p> <ul> <li> <p> <code>HASH</code> - partition key</p> </li> <li> <p> <code>RANGE</code> - sort key</p> </li> </ul> <note> <p>The partition key of an item is also known as its <i>hash attribute</i>. The term \"hash attribute\" derives from DynamoDB's usage of an internal hash function to evenly distribute data items across partitions, based on their partition key values.</p> <p>The sort key of an item is also known as its <i>range attribute</i>. The term \"range attribute\" derives from the way DynamoDB stores items with the same partition key physically close together, in sorted order by the sort key value.</p> </note>"
         },
         "Projection":{
           "shape":"Projection",
@@ -2070,7 +2338,7 @@
         },
         "Backfilling":{
           "shape":"Backfilling",
-          "documentation":"<p>Indicates whether the index is currently backfilling. <i>Backfilling</i> is the process of reading items from the table and determining whether they can be added to the index. (Not all items will qualify: For example, a partition key cannot have any duplicate values.) If an item can be added to the index, DynamoDB will do so. After all items have been processed, the backfilling operation is complete and <code>Backfilling</code> is false.</p> <note> <p>For indexes that were created during a <code>CreateTable</code> operation, the <code>Backfilling</code> attribute does not appear in the <code>DescribeTable</code> output.</p> </note>"
+          "documentation":"<p>Indicates whether the index is currently backfilling. <i>Backfilling</i> is the process of reading items from the table and determining whether they can be added to the index. (Not all items will qualify: For example, a partition key cannot have any duplicate values.) If an item can be added to the index, DynamoDB will do so. After all items have been processed, the backfilling operation is complete and <code>Backfilling</code> is false.</p> <p>You can delete an index that is being created during the <code>Backfilling</code> phase when <code>IndexStatus</code> is set to CREATING and <code>Backfilling</code> is true. You can't delete the index that is being created when <code>IndexStatus</code> is set to CREATING and <code>Backfilling</code> is false. </p> <note> <p>For indexes that were created during a <code>CreateTable</code> operation, the <code>Backfilling</code> attribute does not appear in the <code>DescribeTable</code> output.</p> </note>"
         },
         "ProvisionedThroughput":{
           "shape":"ProvisionedThroughputDescription",
@@ -2104,7 +2372,7 @@
         },
         "KeySchema":{
           "shape":"KeySchema",
-          "documentation":"<p>The complete key schema for a global secondary index, which consists of one or more pairs of attribute names and key types:</p> <ul> <li> <p> <code>HASH</code> - partition key</p> </li> <li> <p> <code>RANGE</code> - sort key</p> </li> </ul> <note> <p>The partition key of an item is also known as its <i>hash attribute</i>. The term \"hash attribute\" derives from DynamoDB' usage of an internal hash function to evenly distribute data items across partitions, based on their partition key values.</p> <p>The sort key of an item is also known as its <i>range attribute</i>. The term \"range attribute\" derives from the way DynamoDB stores items with the same partition key physically close together, in sorted order by the sort key value.</p> </note>"
+          "documentation":"<p>The complete key schema for a global secondary index, which consists of one or more pairs of attribute names and key types:</p> <ul> <li> <p> <code>HASH</code> - partition key</p> </li> <li> <p> <code>RANGE</code> - sort key</p> </li> </ul> <note> <p>The partition key of an item is also known as its <i>hash attribute</i>. The term \"hash attribute\" derives from DynamoDB's usage of an internal hash function to evenly distribute data items across partitions, based on their partition key values.</p> <p>The sort key of an item is also known as its <i>range attribute</i>. The term \"range attribute\" derives from the way DynamoDB stores items with the same partition key physically close together, in sorted order by the sort key value.</p> </note>"
         },
         "Projection":{
           "shape":"Projection",
@@ -2156,7 +2424,7 @@
         },
         "ReplicationGroup":{
           "shape":"ReplicaList",
-          "documentation":"<p>The regions where the global table has replicas.</p>"
+          "documentation":"<p>The Regions where the global table has replicas.</p>"
         }
       },
       "documentation":"<p>Represents the properties of a global table.</p>"
@@ -2175,7 +2443,7 @@
       "members":{
         "ReplicationGroup":{
           "shape":"ReplicaDescriptionList",
-          "documentation":"<p>The regions where the global table has replicas.</p>"
+          "documentation":"<p>The Regions where the global table has replicas.</p>"
         },
         "GlobalTableArn":{
           "shape":"GlobalTableArnString",
@@ -2210,7 +2478,7 @@
         },
         "ProvisionedWriteCapacityAutoScalingSettingsUpdate":{
           "shape":"AutoScalingSettingsUpdate",
-          "documentation":"<p>AutoScaling settings for managing a global secondary index's write capacity units.</p>"
+          "documentation":"<p>Auto scaling settings for managing a global secondary index's write capacity units.</p>"
         }
       },
       "documentation":"<p>Represents the settings of a global secondary index for a global table that will be modified.</p>"
@@ -2360,7 +2628,7 @@
     "ItemResponseList":{
       "type":"list",
       "member":{"shape":"ItemResponse"},
-      "max":10,
+      "max":25,
       "min":1
     },
     "KMSMasterKeyArn":{"type":"string"},
@@ -2406,7 +2674,7 @@
         },
         "KeyType":{
           "shape":"KeyType",
-          "documentation":"<p>The role that this key attribute will assume:</p> <ul> <li> <p> <code>HASH</code> - partition key</p> </li> <li> <p> <code>RANGE</code> - sort key</p> </li> </ul> <note> <p>The partition key of an item is also known as its <i>hash attribute</i>. The term \"hash attribute\" derives from DynamoDB' usage of an internal hash function to evenly distribute data items across partitions, based on their partition key values.</p> <p>The sort key of an item is also known as its <i>range attribute</i>. The term \"range attribute\" derives from the way DynamoDB stores items with the same partition key physically close together, in sorted order by the sort key value.</p> </note>"
+          "documentation":"<p>The role that this key attribute will assume:</p> <ul> <li> <p> <code>HASH</code> - partition key</p> </li> <li> <p> <code>RANGE</code> - sort key</p> </li> </ul> <note> <p>The partition key of an item is also known as its <i>hash attribute</i>. The term \"hash attribute\" derives from DynamoDB's usage of an internal hash function to evenly distribute data items across partitions, based on their partition key values.</p> <p>The sort key of an item is also known as its <i>range attribute</i>. The term \"range attribute\" derives from the way DynamoDB stores items with the same partition key physically close together, in sorted order by the sort key value.</p> </note>"
         }
       },
       "documentation":"<p>Represents <i>a single element</i> of a key schema. A key schema specifies the attributes that make up the primary key of a table, or the key attributes of an index.</p> <p>A <code>KeySchemaElement</code> represents exactly one attribute of the primary key. For example, a simple primary key would be represented by one <code>KeySchemaElement</code> (for the partition key). A composite primary key would require one <code>KeySchemaElement</code> for the partition key, and another <code>KeySchemaElement</code> for the sort key.</p> <p>A <code>KeySchemaElement</code> must be a scalar, top-level attribute (not a nested attribute). The data type must be one of String, Number, or Binary. The attribute cannot be nested within a List or a Map.</p>"
@@ -2445,6 +2713,7 @@
       },
       "documentation":"<p>Represents a set of primary keys and, for each key, the attributes to retrieve from the table.</p> <p>For each primary key, you must provide <i>all</i> of the key attributes. For example, with a simple primary key, you only need to provide the partition key. For a composite primary key, you must provide <i>both</i> the partition key and the sort key.</p>"
     },
+    "LastUpdateDateTime":{"type":"timestamp"},
     "LimitExceededException":{
       "type":"structure",
       "members":{
@@ -2502,6 +2771,40 @@
         }
       }
     },
+    "ListContributorInsightsInput":{
+      "type":"structure",
+      "members":{
+        "TableName":{
+          "shape":"TableName",
+          "documentation":"<p>The name of the table.</p>"
+        },
+        "NextToken":{
+          "shape":"NextTokenString",
+          "documentation":"<p>A token to for the desired page, if there is one.</p>"
+        },
+        "MaxResults":{
+          "shape":"ListContributorInsightsLimit",
+          "documentation":"<p>Maximum number of results to return per page.</p>"
+        }
+      }
+    },
+    "ListContributorInsightsLimit":{
+      "type":"integer",
+      "max":100
+    },
+    "ListContributorInsightsOutput":{
+      "type":"structure",
+      "members":{
+        "ContributorInsightsSummaries":{
+          "shape":"ContributorInsightsSummaries",
+          "documentation":"<p>A list of ContributorInsightsSummary.</p>"
+        },
+        "NextToken":{
+          "shape":"NextTokenString",
+          "documentation":"<p>A token to go to the next page if there is one.</p>"
+        }
+      }
+    },
     "ListGlobalTablesInput":{
       "type":"structure",
       "members":{
@@ -2511,7 +2814,7 @@
         },
         "Limit":{
           "shape":"PositiveIntegerObject",
-          "documentation":"<p>The maximum number of table names to return.</p>"
+          "documentation":"<p>The maximum number of table names to return, if the parameter is not specified DynamoDB defaults to 100.</p> <p>If the number of global tables DynamoDB finds reaches this limit, it stops the operation and returns the table names collected up to that point, with a table name in the <code>LastEvaluatedGlobalTableName</code> to apply in a subsequent operation to the <code>ExclusiveStartGlobalTableName</code> parameter.</p>"
         },
         "RegionName":{
           "shape":"RegionName",
@@ -2606,7 +2909,7 @@
         },
         "KeySchema":{
           "shape":"KeySchema",
-          "documentation":"<p>The complete key schema for the local secondary index, consisting of one or more pairs of attribute names and key types:</p> <ul> <li> <p> <code>HASH</code> - partition key</p> </li> <li> <p> <code>RANGE</code> - sort key</p> </li> </ul> <note> <p>The partition key of an item is also known as its <i>hash attribute</i>. The term \"hash attribute\" derives from DynamoDB' usage of an internal hash function to evenly distribute data items across partitions, based on their partition key values.</p> <p>The sort key of an item is also known as its <i>range attribute</i>. The term \"range attribute\" derives from the way DynamoDB stores items with the same partition key physically close together, in sorted order by the sort key value.</p> </note>"
+          "documentation":"<p>The complete key schema for the local secondary index, consisting of one or more pairs of attribute names and key types:</p> <ul> <li> <p> <code>HASH</code> - partition key</p> </li> <li> <p> <code>RANGE</code> - sort key</p> </li> </ul> <note> <p>The partition key of an item is also known as its <i>hash attribute</i>. The term \"hash attribute\" derives from DynamoDB's usage of an internal hash function to evenly distribute data items across partitions, based on their partition key values.</p> <p>The sort key of an item is also known as its <i>range attribute</i>. The term \"range attribute\" derives from the way DynamoDB stores items with the same partition key physically close together, in sorted order by the sort key value.</p> </note>"
         },
         "Projection":{
           "shape":"Projection",
@@ -2624,7 +2927,7 @@
         },
         "KeySchema":{
           "shape":"KeySchema",
-          "documentation":"<p>The complete key schema for the local secondary index, consisting of one or more pairs of attribute names and key types:</p> <ul> <li> <p> <code>HASH</code> - partition key</p> </li> <li> <p> <code>RANGE</code> - sort key</p> </li> </ul> <note> <p>The partition key of an item is also known as its <i>hash attribute</i>. The term \"hash attribute\" derives from DynamoDB' usage of an internal hash function to evenly distribute data items across partitions, based on their partition key values.</p> <p>The sort key of an item is also known as its <i>range attribute</i>. The term \"range attribute\" derives from the way DynamoDB stores items with the same partition key physically close together, in sorted order by the sort key value.</p> </note>"
+          "documentation":"<p>The complete key schema for the local secondary index, consisting of one or more pairs of attribute names and key types:</p> <ul> <li> <p> <code>HASH</code> - partition key</p> </li> <li> <p> <code>RANGE</code> - sort key</p> </li> </ul> <note> <p>The partition key of an item is also known as its <i>hash attribute</i>. The term \"hash attribute\" derives from DynamoDB's usage of an internal hash function to evenly distribute data items across partitions, based on their partition key values.</p> <p>The sort key of an item is also known as its <i>range attribute</i>. The term \"range attribute\" derives from the way DynamoDB stores items with the same partition key physically close together, in sorted order by the sort key value.</p> </note>"
         },
         "Projection":{
           "shape":"Projection",
@@ -2658,7 +2961,7 @@
         },
         "KeySchema":{
           "shape":"KeySchema",
-          "documentation":"<p>The complete key schema for a local secondary index, which consists of one or more pairs of attribute names and key types:</p> <ul> <li> <p> <code>HASH</code> - partition key</p> </li> <li> <p> <code>RANGE</code> - sort key</p> </li> </ul> <note> <p>The partition key of an item is also known as its <i>hash attribute</i>. The term \"hash attribute\" derives from DynamoDB' usage of an internal hash function to evenly distribute data items across partitions, based on their partition key values.</p> <p>The sort key of an item is also known as its <i>range attribute</i>. The term \"range attribute\" derives from the way DynamoDB stores items with the same partition key physically close together, in sorted order by the sort key value.</p> </note>"
+          "documentation":"<p>The complete key schema for a local secondary index, which consists of one or more pairs of attribute names and key types:</p> <ul> <li> <p> <code>HASH</code> - partition key</p> </li> <li> <p> <code>RANGE</code> - sort key</p> </li> </ul> <note> <p>The partition key of an item is also known as its <i>hash attribute</i>. The term \"hash attribute\" derives from DynamoDB's usage of an internal hash function to evenly distribute data items across partitions, based on their partition key values.</p> <p>The sort key of an item is also known as its <i>range attribute</i>. The term \"range attribute\" derives from the way DynamoDB stores items with the same partition key physically close together, in sorted order by the sort key value.</p> </note>"
         },
         "Projection":{
           "shape":"Projection",
@@ -2712,7 +3015,7 @@
         },
         "EarliestRestorableDateTime":{
           "shape":"Date",
-          "documentation":"<p>Specifies the earliest point in time you can restore your table to. It You can restore your table to any point in time during the last 35 days. </p>"
+          "documentation":"<p>Specifies the earliest point in time you can restore your table to. You can restore your table to any point in time during the last 35 days. </p>"
         },
         "LatestRestorableDateTime":{
           "shape":"Date",
@@ -2760,7 +3063,7 @@
       "members":{
         "ProjectionType":{
           "shape":"ProjectionType",
-          "documentation":"<p>The set of attributes that are projected into the index:</p> <ul> <li> <p> <code>KEYS_ONLY</code> - Only the index and primary keys are projected into the index.</p> </li> <li> <p> <code>INCLUDE</code> - Only the specified table attributes are projected into the index. The list of projected attributes are in <code>NonKeyAttributes</code>.</p> </li> <li> <p> <code>ALL</code> - All of the table attributes are projected into the index.</p> </li> </ul>"
+          "documentation":"<p>The set of attributes that are projected into the index:</p> <ul> <li> <p> <code>KEYS_ONLY</code> - Only the index and primary keys are projected into the index.</p> </li> <li> <p> <code>INCLUDE</code> - Only the specified table attributes are projected into the index. The list of projected attributes is in <code>NonKeyAttributes</code>.</p> </li> <li> <p> <code>ALL</code> - All of the table attributes are projected into the index.</p> </li> </ul>"
         },
         "NonKeyAttributes":{
           "shape":"NonKeyAttributeNameList",
@@ -2833,6 +3136,16 @@
       "documentation":"<p>Your request rate is too high. The AWS SDKs for DynamoDB automatically retry requests that receive this exception. Your request is eventually successful, unless your retry queue is too large to finish. Reduce the frequency of requests and use exponential backoff. For more information, go to <a href=\"https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/Programming.Errors.html#Programming.Errors.RetryAndBackoff\">Error Retries and Exponential Backoff</a> in the <i>Amazon DynamoDB Developer Guide</i>.</p>",
       "exception":true
     },
+    "ProvisionedThroughputOverride":{
+      "type":"structure",
+      "members":{
+        "ReadCapacityUnits":{
+          "shape":"PositiveLongObject",
+          "documentation":"<p>Replica-specific read capacity units. If not specified, uses the source table's read capacity settings.</p>"
+        }
+      },
+      "documentation":"<p>Replica-specific provisioned throughput settings. If not specified, uses the source table's provisioned throughput settings.</p>"
+    },
     "Put":{
       "type":"structure",
       "required":[
@@ -2943,7 +3256,7 @@
       "members":{
         "Item":{
           "shape":"PutItemInputAttributeMap",
-          "documentation":"<p>A map of attribute name to attribute values, representing the primary key of an item to be processed by <code>PutItem</code>. All of the table's primary key attributes must be specified, and their data types must match those of the table's key schema. If any attributes are present in the item which are part of an index key schema for the table, their types must match the index key schema.</p>"
+          "documentation":"<p>A map of attribute name to attribute values, representing the primary key of an item to be processed by <code>PutItem</code>. All of the table's primary key attributes must be specified, and their data types must match those of the table's key schema. If any attributes are present in the item that are part of an index key schema for the table, their types must match the index key schema.</p>"
         }
       },
       "documentation":"<p>Represents a request to perform a <code>PutItem</code> operation on an item.</p>"
@@ -3052,7 +3365,7 @@
       "members":{
         "RegionName":{
           "shape":"RegionName",
-          "documentation":"<p>The region where the replica needs to be created.</p>"
+          "documentation":"<p>The Region where the replica needs to be created.</p>"
         }
       },
       "documentation":"<p>Represents the properties of a replica.</p>"
@@ -3065,12 +3378,81 @@
       "documentation":"<p>The specified replica is already part of the global table.</p>",
       "exception":true
     },
+    "ReplicaAutoScalingDescription":{
+      "type":"structure",
+      "members":{
+        "RegionName":{
+          "shape":"RegionName",
+          "documentation":"<p>The Region where the replica exists.</p>"
+        },
+        "GlobalSecondaryIndexes":{
+          "shape":"ReplicaGlobalSecondaryIndexAutoScalingDescriptionList",
+          "documentation":"<p>Replica-specific global secondary index auto scaling settings.</p>"
+        },
+        "ReplicaProvisionedReadCapacityAutoScalingSettings":{"shape":"AutoScalingSettingsDescription"},
+        "ReplicaProvisionedWriteCapacityAutoScalingSettings":{"shape":"AutoScalingSettingsDescription"},
+        "ReplicaStatus":{
+          "shape":"ReplicaStatus",
+          "documentation":"<p>The current state of the replica:</p> <ul> <li> <p> <code>CREATING</code> - The replica is being created.</p> </li> <li> <p> <code>UPDATING</code> - The replica is being updated.</p> </li> <li> <p> <code>DELETING</code> - The replica is being deleted.</p> </li> <li> <p> <code>ACTIVE</code> - The replica is ready for use.</p> </li> </ul>"
+        }
+      },
+      "documentation":"<p>Represents the auto scaling settings of the replica.</p>"
+    },
+    "ReplicaAutoScalingDescriptionList":{
+      "type":"list",
+      "member":{"shape":"ReplicaAutoScalingDescription"}
+    },
+    "ReplicaAutoScalingUpdate":{
+      "type":"structure",
+      "required":["RegionName"],
+      "members":{
+        "RegionName":{
+          "shape":"RegionName",
+          "documentation":"<p>The Region where the replica exists.</p>"
+        },
+        "ReplicaGlobalSecondaryIndexUpdates":{
+          "shape":"ReplicaGlobalSecondaryIndexAutoScalingUpdateList",
+          "documentation":"<p>Represents the auto scaling settings of global secondary indexes that will be modified.</p>"
+        },
+        "ReplicaProvisionedReadCapacityAutoScalingUpdate":{"shape":"AutoScalingSettingsUpdate"}
+      },
+      "documentation":"<p>Represents the auto scaling settings of a replica that will be modified.</p>"
+    },
+    "ReplicaAutoScalingUpdateList":{
+      "type":"list",
+      "member":{"shape":"ReplicaAutoScalingUpdate"},
+      "min":1
+    },
     "ReplicaDescription":{
       "type":"structure",
       "members":{
         "RegionName":{
           "shape":"RegionName",
-          "documentation":"<p>The name of the region.</p>"
+          "documentation":"<p>The name of the Region.</p>"
+        },
+        "ReplicaStatus":{
+          "shape":"ReplicaStatus",
+          "documentation":"<p>The current state of the replica:</p> <ul> <li> <p> <code>CREATING</code> - The replica is being created.</p> </li> <li> <p> <code>UPDATING</code> - The replica is being updated.</p> </li> <li> <p> <code>DELETING</code> - The replica is being deleted.</p> </li> <li> <p> <code>ACTIVE</code> - The replica is ready for use.</p> </li> </ul>"
+        },
+        "ReplicaStatusDescription":{
+          "shape":"ReplicaStatusDescription",
+          "documentation":"<p>Detailed information about the replica status.</p>"
+        },
+        "ReplicaStatusPercentProgress":{
+          "shape":"ReplicaStatusPercentProgress",
+          "documentation":"<p>Specifies the progress of a Create, Update, or Delete action on the replica as a percentage.</p>"
+        },
+        "KMSMasterKeyId":{
+          "shape":"KMSMasterKeyId",
+          "documentation":"<p>The AWS KMS customer master key (CMK) of the replica that will be used for AWS KMS encryption.</p>"
+        },
+        "ProvisionedThroughputOverride":{
+          "shape":"ProvisionedThroughputOverride",
+          "documentation":"<p>Replica-specific provisioned throughput. If not described, uses the source table's provisioned throughput settings.</p>"
+        },
+        "GlobalSecondaryIndexes":{
+          "shape":"ReplicaGlobalSecondaryIndexDescriptionList",
+          "documentation":"<p>Replica-specific global secondary index settings.</p>"
         }
       },
       "documentation":"<p>Contains the details of the replica.</p>"
@@ -3079,6 +3461,79 @@
       "type":"list",
       "member":{"shape":"ReplicaDescription"}
     },
+    "ReplicaGlobalSecondaryIndex":{
+      "type":"structure",
+      "required":["IndexName"],
+      "members":{
+        "IndexName":{
+          "shape":"IndexName",
+          "documentation":"<p>The name of the global secondary index.</p>"
+        },
+        "ProvisionedThroughputOverride":{
+          "shape":"ProvisionedThroughputOverride",
+          "documentation":"<p>Replica table GSI-specific provisioned throughput. If not specified, uses the source table GSI's read capacity settings.</p>"
+        }
+      },
+      "documentation":"<p>Represents the properties of a replica global secondary index.</p>"
+    },
+    "ReplicaGlobalSecondaryIndexAutoScalingDescription":{
+      "type":"structure",
+      "members":{
+        "IndexName":{
+          "shape":"IndexName",
+          "documentation":"<p>The name of the global secondary index.</p>"
+        },
+        "IndexStatus":{
+          "shape":"IndexStatus",
+          "documentation":"<p>The current state of the replica global secondary index:</p> <ul> <li> <p> <code>CREATING</code> - The index is being created.</p> </li> <li> <p> <code>UPDATING</code> - The index is being updated.</p> </li> <li> <p> <code>DELETING</code> - The index is being deleted.</p> </li> <li> <p> <code>ACTIVE</code> - The index is ready for use.</p> </li> </ul>"
+        },
+        "ProvisionedReadCapacityAutoScalingSettings":{"shape":"AutoScalingSettingsDescription"},
+        "ProvisionedWriteCapacityAutoScalingSettings":{"shape":"AutoScalingSettingsDescription"}
+      },
+      "documentation":"<p>Represents the auto scaling configuration for a replica global secondary index.</p>"
+    },
+    "ReplicaGlobalSecondaryIndexAutoScalingDescriptionList":{
+      "type":"list",
+      "member":{"shape":"ReplicaGlobalSecondaryIndexAutoScalingDescription"}
+    },
+    "ReplicaGlobalSecondaryIndexAutoScalingUpdate":{
+      "type":"structure",
+      "members":{
+        "IndexName":{
+          "shape":"IndexName",
+          "documentation":"<p>The name of the global secondary index.</p>"
+        },
+        "ProvisionedReadCapacityAutoScalingUpdate":{"shape":"AutoScalingSettingsUpdate"}
+      },
+      "documentation":"<p>Represents the auto scaling settings of a global secondary index for a replica that will be modified.</p>"
+    },
+    "ReplicaGlobalSecondaryIndexAutoScalingUpdateList":{
+      "type":"list",
+      "member":{"shape":"ReplicaGlobalSecondaryIndexAutoScalingUpdate"}
+    },
+    "ReplicaGlobalSecondaryIndexDescription":{
+      "type":"structure",
+      "members":{
+        "IndexName":{
+          "shape":"IndexName",
+          "documentation":"<p>The name of the global secondary index.</p>"
+        },
+        "ProvisionedThroughputOverride":{
+          "shape":"ProvisionedThroughputOverride",
+          "documentation":"<p>If not described, uses the source table GSI's read capacity settings.</p>"
+        }
+      },
+      "documentation":"<p>Represents the properties of a replica global secondary index.</p>"
+    },
+    "ReplicaGlobalSecondaryIndexDescriptionList":{
+      "type":"list",
+      "member":{"shape":"ReplicaGlobalSecondaryIndexDescription"}
+    },
+    "ReplicaGlobalSecondaryIndexList":{
+      "type":"list",
+      "member":{"shape":"ReplicaGlobalSecondaryIndex"},
+      "min":1
+    },
     "ReplicaGlobalSecondaryIndexSettingsDescription":{
       "type":"structure",
       "required":["IndexName"],
@@ -3097,7 +3552,7 @@
         },
         "ProvisionedReadCapacityAutoScalingSettings":{
           "shape":"AutoScalingSettingsDescription",
-          "documentation":"<p>Autoscaling settings for a global secondary index replica's read capacity units.</p>"
+          "documentation":"<p>Auto scaling settings for a global secondary index replica's read capacity units.</p>"
         },
         "ProvisionedWriteCapacityUnits":{
           "shape":"PositiveLongObject",
@@ -3105,7 +3560,7 @@
         },
         "ProvisionedWriteCapacityAutoScalingSettings":{
           "shape":"AutoScalingSettingsDescription",
-          "documentation":"<p>AutoScaling settings for a global secondary index replica's write capacity units.</p>"
+          "documentation":"<p>Auto scaling settings for a global secondary index replica's write capacity units.</p>"
         }
       },
       "documentation":"<p>Represents the properties of a global secondary index.</p>"
@@ -3128,7 +3583,7 @@
         },
         "ProvisionedReadCapacityAutoScalingSettingsUpdate":{
           "shape":"AutoScalingSettingsUpdate",
-          "documentation":"<p>Autoscaling settings for managing a global secondary index replica's read capacity units.</p>"
+          "documentation":"<p>Auto scaling settings for managing a global secondary index replica's read capacity units.</p>"
         }
       },
       "documentation":"<p>Represents the settings of a global secondary index for a global table that will be modified.</p>"
@@ -3157,11 +3612,11 @@
       "members":{
         "RegionName":{
           "shape":"RegionName",
-          "documentation":"<p>The region name of the replica.</p>"
+          "documentation":"<p>The Region name of the replica.</p>"
         },
         "ReplicaStatus":{
           "shape":"ReplicaStatus",
-          "documentation":"<p>The current state of the region:</p> <ul> <li> <p> <code>CREATING</code> - The region is being created.</p> </li> <li> <p> <code>UPDATING</code> - The region is being updated.</p> </li> <li> <p> <code>DELETING</code> - The region is being deleted.</p> </li> <li> <p> <code>ACTIVE</code> - The region is ready for use.</p> </li> </ul>"
+          "documentation":"<p>The current state of the Region:</p> <ul> <li> <p> <code>CREATING</code> - The Region is being created.</p> </li> <li> <p> <code>UPDATING</code> - The Region is being updated.</p> </li> <li> <p> <code>DELETING</code> - The Region is being deleted.</p> </li> <li> <p> <code>ACTIVE</code> - The Region is ready for use.</p> </li> </ul>"
         },
         "ReplicaBillingModeSummary":{
           "shape":"BillingModeSummary",
@@ -3173,7 +3628,7 @@
         },
         "ReplicaProvisionedReadCapacityAutoScalingSettings":{
           "shape":"AutoScalingSettingsDescription",
-          "documentation":"<p>Autoscaling settings for a global table replica's read capacity units.</p>"
+          "documentation":"<p>Auto scaling settings for a global table replica's read capacity units.</p>"
         },
         "ReplicaProvisionedWriteCapacityUnits":{
           "shape":"NonNegativeLongObject",
@@ -3181,7 +3636,7 @@
         },
         "ReplicaProvisionedWriteCapacityAutoScalingSettings":{
           "shape":"AutoScalingSettingsDescription",
-          "documentation":"<p>AutoScaling settings for a global table replica's write capacity units.</p>"
+          "documentation":"<p>Auto scaling settings for a global table replica's write capacity units.</p>"
         },
         "ReplicaGlobalSecondaryIndexSettings":{
           "shape":"ReplicaGlobalSecondaryIndexSettingsDescriptionList",
@@ -3200,7 +3655,7 @@
       "members":{
         "RegionName":{
           "shape":"RegionName",
-          "documentation":"<p>The region of the replica to be added.</p>"
+          "documentation":"<p>The Region of the replica to be added.</p>"
         },
         "ReplicaProvisionedReadCapacityUnits":{
           "shape":"PositiveLongObject",
@@ -3208,14 +3663,14 @@
         },
         "ReplicaProvisionedReadCapacityAutoScalingSettingsUpdate":{
           "shape":"AutoScalingSettingsUpdate",
-          "documentation":"<p>Autoscaling settings for managing a global table replica's read capacity units.</p>"
+          "documentation":"<p>Auto scaling settings for managing a global table replica's read capacity units.</p>"
         },
         "ReplicaGlobalSecondaryIndexSettingsUpdate":{
           "shape":"ReplicaGlobalSecondaryIndexSettingsUpdateList",
           "documentation":"<p>Represents the settings of a global secondary index for a global table that will be modified.</p>"
         }
       },
-      "documentation":"<p>Represents the settings for a global table in a region that will be modified.</p>"
+      "documentation":"<p>Represents the settings for a global table in a Region that will be modified.</p>"
     },
     "ReplicaSettingsUpdateList":{
       "type":"list",
@@ -3227,11 +3682,14 @@
       "type":"string",
       "enum":[
         "CREATING",
+        "CREATION_FAILED",
         "UPDATING",
         "DELETING",
         "ACTIVE"
       ]
     },
+    "ReplicaStatusDescription":{"type":"string"},
+    "ReplicaStatusPercentProgress":{"type":"string"},
     "ReplicaUpdate":{
       "type":"structure",
       "members":{
@@ -3250,6 +3708,29 @@
       "type":"list",
       "member":{"shape":"ReplicaUpdate"}
     },
+    "ReplicationGroupUpdate":{
+      "type":"structure",
+      "members":{
+        "Create":{
+          "shape":"CreateReplicationGroupMemberAction",
+          "documentation":"<p>The parameters required for creating a replica for the table.</p>"
+        },
+        "Update":{
+          "shape":"UpdateReplicationGroupMemberAction",
+          "documentation":"<p>The parameters required for updating a replica for the table.</p>"
+        },
+        "Delete":{
+          "shape":"DeleteReplicationGroupMemberAction",
+          "documentation":"<p>The parameters required for deleting a replica for the table.</p>"
+        }
+      },
+      "documentation":"<p>Represents one of the following:</p> <ul> <li> <p>A new replica to be added to an existing regional table or global table. This request invokes the <code>CreateTableReplica</code> action in the destination Region.</p> </li> <li> <p>New parameters for an existing replica. This request invokes the <code>UpdateTable</code> action in the destination Region.</p> </li> <li> <p>An existing replica to be deleted. The request invokes the <code>DeleteTableReplica</code> action in the destination Region, deleting the replica and all if its items in the destination Region.</p> </li> </ul>"
+    },
+    "ReplicationGroupUpdateList":{
+      "type":"list",
+      "member":{"shape":"ReplicationGroupUpdate"},
+      "min":1
+    },
     "RequestLimitExceeded":{
       "type":"structure",
       "members":{
@@ -3295,11 +3776,11 @@
       "members":{
         "SourceBackupArn":{
           "shape":"BackupArn",
-          "documentation":"<p>ARN of the backup from which the table was restored.</p>"
+          "documentation":"<p>The Amazon Resource Name (ARN) of the backup from which the table was restored.</p>"
         },
         "SourceTableArn":{
           "shape":"TableArn",
-          "documentation":"<p>ARN of the source table of the backup that is being restored.</p>"
+          "documentation":"<p>The ARN of the source table of the backup that is being restored.</p>"
         },
         "RestoreDateTime":{
           "shape":"Date",
@@ -3326,6 +3807,26 @@
         "BackupArn":{
           "shape":"BackupArn",
           "documentation":"<p>The Amazon Resource Name (ARN) associated with the backup.</p>"
+        },
+        "BillingModeOverride":{
+          "shape":"BillingMode",
+          "documentation":"<p>The billing mode of the restored table.</p>"
+        },
+        "GlobalSecondaryIndexOverride":{
+          "shape":"GlobalSecondaryIndexList",
+          "documentation":"<p>List of global secondary indexes for the restored table. The indexes provided should match existing secondary indexes. You can choose to exclude some or all of the indexes at the time of restore.</p>"
+        },
+        "LocalSecondaryIndexOverride":{
+          "shape":"LocalSecondaryIndexList",
+          "documentation":"<p>List of local secondary indexes for the restored table. The indexes provided should match existing secondary indexes. You can choose to exclude some or all of the indexes at the time of restore.</p>"
+        },
+        "ProvisionedThroughputOverride":{
+          "shape":"ProvisionedThroughput",
+          "documentation":"<p>Provisioned throughput settings for the restored table.</p>"
+        },
+        "SSESpecificationOverride":{
+          "shape":"SSESpecification",
+          "documentation":"<p>The new server-side encryption settings for the restored table.</p>"
         }
       }
     },
@@ -3340,11 +3841,12 @@
     },
     "RestoreTableToPointInTimeInput":{
       "type":"structure",
-      "required":[
-        "SourceTableName",
-        "TargetTableName"
-      ],
+      "required":["TargetTableName"],
       "members":{
+        "SourceTableArn":{
+          "shape":"TableArn",
+          "documentation":"<p>The DynamoDB table that will be restored. This value is an Amazon Resource Name (ARN).</p>"
+        },
         "SourceTableName":{
           "shape":"TableName",
           "documentation":"<p>Name of the source table that is being restored.</p>"
@@ -3360,6 +3862,26 @@
         "RestoreDateTime":{
           "shape":"Date",
           "documentation":"<p>Time in the past to restore the table to.</p>"
+        },
+        "BillingModeOverride":{
+          "shape":"BillingMode",
+          "documentation":"<p>The billing mode of the restored table.</p>"
+        },
+        "GlobalSecondaryIndexOverride":{
+          "shape":"GlobalSecondaryIndexList",
+          "documentation":"<p>List of global secondary indexes for the restored table. The indexes provided should match existing secondary indexes. You can choose to exclude some or all of the indexes at the time of restore.</p>"
+        },
+        "LocalSecondaryIndexOverride":{
+          "shape":"LocalSecondaryIndexList",
+          "documentation":"<p>List of local secondary indexes for the restored table. The indexes provided should match existing secondary indexes. You can choose to exclude some or all of the indexes at the time of restore.</p>"
+        },
+        "ProvisionedThroughputOverride":{
+          "shape":"ProvisionedThroughput",
+          "documentation":"<p>Provisioned throughput settings for the restored table.</p>"
+        },
+        "SSESpecificationOverride":{
+          "shape":"SSESpecification",
+          "documentation":"<p>The new server-side encryption settings for the restored table.</p>"
         }
       }
     },
@@ -3414,11 +3936,15 @@
         },
         "SSEType":{
           "shape":"SSEType",
-          "documentation":"<p>Server-side encryption type. The only supported value is:</p> <ul> <li> <p> <code>KMS</code> - Server-side encryption which uses AWS Key Management Service. Key is stored in your account and is managed by AWS KMS (KMS charges apply).</p> </li> </ul>"
+          "documentation":"<p>Server-side encryption type. The only supported value is:</p> <ul> <li> <p> <code>KMS</code> - Server-side encryption that uses AWS Key Management Service. The key is stored in your account and is managed by AWS KMS (AWS KMS charges apply).</p> </li> </ul>"
         },
         "KMSMasterKeyArn":{
           "shape":"KMSMasterKeyArn",
-          "documentation":"<p>The KMS customer master key (CMK) ARN used for the KMS encryption.</p>"
+          "documentation":"<p>The AWS KMS customer master key (CMK) ARN used for the AWS KMS encryption.</p>"
+        },
+        "InaccessibleEncryptionDateTime":{
+          "shape":"Date",
+          "documentation":"<p>Indicates the time, in UNIX epoch date format, when DynamoDB detected that the table's AWS KMS key was inaccessible. This attribute will automatically be cleared when DynamoDB detects that the table's AWS KMS key is accessible again. DynamoDB will initiate the table archival process when table's AWS KMS key remains inaccessible for more than seven days from this date.</p>"
         }
       },
       "documentation":"<p>The description of the server-side encryption status on the specified table.</p>"
@@ -3433,11 +3959,11 @@
         },
         "SSEType":{
           "shape":"SSEType",
-          "documentation":"<p>Server-side encryption type. The only supported value is:</p> <ul> <li> <p> <code>KMS</code> - Server-side encryption which uses AWS Key Management Service. Key is stored in your account and is managed by AWS KMS (KMS charges apply).</p> </li> </ul>"
+          "documentation":"<p>Server-side encryption type. The only supported value is:</p> <ul> <li> <p> <code>KMS</code> - Server-side encryption that uses AWS Key Management Service. The key is stored in your account and is managed by AWS KMS (AWS KMS charges apply).</p> </li> </ul>"
         },
         "KMSMasterKeyId":{
           "shape":"KMSMasterKeyId",
-          "documentation":"<p>The KMS Customer Master Key (CMK) which should be used for the KMS encryption. To specify a CMK, use its key ID, Amazon Resource Name (ARN), alias name, or alias ARN. Note that you should only provide this parameter if the key is different from the default DynamoDB Customer Master Key alias/aws/dynamodb.</p>"
+          "documentation":"<p>The AWS KMS customer master key (CMK) that should be used for the AWS KMS encryption. To specify a CMK, use its key ID, Amazon Resource Name (ARN), alias name, or alias ARN. Note that you should only provide this parameter if the key is different from the default DynamoDB customer master key alias/aws/dynamodb.</p>"
         }
       },
       "documentation":"<p>Represents the settings used to enable server-side encryption.</p>"
@@ -3609,7 +4135,7 @@
         },
         "TableSizeBytes":{
           "shape":"Long",
-          "documentation":"<p>Size of the table in bytes. Please note this is an approximate value.</p>"
+          "documentation":"<p>Size of the table in bytes. Note that this is an approximate value.</p>"
         },
         "KeySchema":{
           "shape":"KeySchema",
@@ -3625,7 +4151,7 @@
         },
         "ItemCount":{
           "shape":"ItemCount",
-          "documentation":"<p>Number of items in the table. Please note this is an approximate value. </p>"
+          "documentation":"<p>Number of items in the table. Note that this is an approximate value. </p>"
         },
         "BillingMode":{
           "shape":"BillingMode",
@@ -3643,7 +4169,7 @@
         },
         "GlobalSecondaryIndexes":{
           "shape":"GlobalSecondaryIndexes",
-          "documentation":"<p>Represents the GSI properties for the table when the backup was created. It includes the IndexName, KeySchema, Projection and ProvisionedThroughput for the GSIs on the table at the time of backup. </p>"
+          "documentation":"<p>Represents the GSI properties for the table when the backup was created. It includes the IndexName, KeySchema, Projection, and ProvisionedThroughput for the GSIs on the table at the time of backup. </p>"
         },
         "StreamDescription":{
           "shape":"StreamSpecification",
@@ -3668,6 +4194,7 @@
     "StreamEnabled":{"type":"boolean"},
     "StreamSpecification":{
       "type":"structure",
+      "required":["StreamEnabled"],
       "members":{
         "StreamEnabled":{
           "shape":"StreamEnabled",
@@ -3704,6 +4231,24 @@
       "exception":true
     },
     "TableArn":{"type":"string"},
+    "TableAutoScalingDescription":{
+      "type":"structure",
+      "members":{
+        "TableName":{
+          "shape":"TableName",
+          "documentation":"<p>The name of the table.</p>"
+        },
+        "TableStatus":{
+          "shape":"TableStatus",
+          "documentation":"<p>The current state of the table:</p> <ul> <li> <p> <code>CREATING</code> - The table is being created.</p> </li> <li> <p> <code>UPDATING</code> - The table is being updated.</p> </li> <li> <p> <code>DELETING</code> - The table is being deleted.</p> </li> <li> <p> <code>ACTIVE</code> - The table is ready for use.</p> </li> </ul>"
+        },
+        "Replicas":{
+          "shape":"ReplicaAutoScalingDescriptionList",
+          "documentation":"<p>Represents replicas of the global table.</p>"
+        }
+      },
+      "documentation":"<p>Represents the auto scaling configuration for a global table.</p>"
+    },
     "TableCreationDateTime":{"type":"timestamp"},
     "TableDescription":{
       "type":"structure",
@@ -3722,7 +4267,7 @@
         },
         "TableStatus":{
           "shape":"TableStatus",
-          "documentation":"<p>The current state of the table:</p> <ul> <li> <p> <code>CREATING</code> - The table is being created.</p> </li> <li> <p> <code>UPDATING</code> - The table is being updated.</p> </li> <li> <p> <code>DELETING</code> - The table is being deleted.</p> </li> <li> <p> <code>ACTIVE</code> - The table is ready for use.</p> </li> </ul>"
+          "documentation":"<p>The current state of the table:</p> <ul> <li> <p> <code>CREATING</code> - The table is being created.</p> </li> <li> <p> <code>UPDATING</code> - The table is being updated.</p> </li> <li> <p> <code>DELETING</code> - The table is being deleted.</p> </li> <li> <p> <code>ACTIVE</code> - The table is ready for use.</p> </li> <li> <p> <code>INACCESSIBLE_ENCRYPTION_CREDENTIALS</code> - The AWS KMS key used to encrypt the table in inaccessible. Table operations may fail due to failure to use the AWS KMS key. DynamoDB will initiate the table archival process when a table's AWS KMS key remains inaccessible for more than seven days. </p> </li> <li> <p> <code>ARCHIVING</code> - The table is being archived. Operations are not allowed until archival is complete. </p> </li> <li> <p> <code>ARCHIVED</code> - The table has been archived. See the ArchivalReason for more information. </p> </li> </ul>"
         },
         "CreationDateTime":{
           "shape":"Date",
@@ -3754,11 +4299,11 @@
         },
         "LocalSecondaryIndexes":{
           "shape":"LocalSecondaryIndexDescriptionList",
-          "documentation":"<p>Represents one or more local secondary indexes on the table. Each index is scoped to a given partition key value. Tables with one or more local secondary indexes are subject to an item collection size limit, where the amount of data within a given item collection cannot exceed 10 GB. Each element is composed of:</p> <ul> <li> <p> <code>IndexName</code> - The name of the local secondary index.</p> </li> <li> <p> <code>KeySchema</code> - Specifies the complete index key schema. The attribute names in the key schema must be between 1 and 255 characters (inclusive). The key schema must begin with the same partition key as the table.</p> </li> <li> <p> <code>Projection</code> - Specifies attributes that are copied (projected) from the table into the index. These are in addition to the primary key attributes and index key attributes, which are automatically projected. Each attribute specification is composed of:</p> <ul> <li> <p> <code>ProjectionType</code> - One of the following:</p> <ul> <li> <p> <code>KEYS_ONLY</code> - Only the index and primary keys are projected into the index.</p> </li> <li> <p> <code>INCLUDE</code> - Only the specified table attributes are projected into the index. The list of projected attributes are in <code>NonKeyAttributes</code>.</p> </li> <li> <p> <code>ALL</code> - All of the table attributes are projected into the index.</p> </li> </ul> </li> <li> <p> <code>NonKeyAttributes</code> - A list of one or more non-key attribute names that are projected into the secondary index. The total count of attributes provided in <code>NonKeyAttributes</code>, summed across all of the secondary indexes, must not exceed 20. If you project the same attribute into two different indexes, this counts as two distinct attributes when determining the total.</p> </li> </ul> </li> <li> <p> <code>IndexSizeBytes</code> - Represents the total size of the index, in bytes. DynamoDB updates this value approximately every six hours. Recent changes might not be reflected in this value.</p> </li> <li> <p> <code>ItemCount</code> - Represents the number of items in the index. DynamoDB updates this value approximately every six hours. Recent changes might not be reflected in this value.</p> </li> </ul> <p>If the table is in the <code>DELETING</code> state, no information about indexes will be returned.</p>"
+          "documentation":"<p>Represents one or more local secondary indexes on the table. Each index is scoped to a given partition key value. Tables with one or more local secondary indexes are subject to an item collection size limit, where the amount of data within a given item collection cannot exceed 10 GB. Each element is composed of:</p> <ul> <li> <p> <code>IndexName</code> - The name of the local secondary index.</p> </li> <li> <p> <code>KeySchema</code> - Specifies the complete index key schema. The attribute names in the key schema must be between 1 and 255 characters (inclusive). The key schema must begin with the same partition key as the table.</p> </li> <li> <p> <code>Projection</code> - Specifies attributes that are copied (projected) from the table into the index. These are in addition to the primary key attributes and index key attributes, which are automatically projected. Each attribute specification is composed of:</p> <ul> <li> <p> <code>ProjectionType</code> - One of the following:</p> <ul> <li> <p> <code>KEYS_ONLY</code> - Only the index and primary keys are projected into the index.</p> </li> <li> <p> <code>INCLUDE</code> - Only the specified table attributes are projected into the index. The list of projected attributes is in <code>NonKeyAttributes</code>.</p> </li> <li> <p> <code>ALL</code> - All of the table attributes are projected into the index.</p> </li> </ul> </li> <li> <p> <code>NonKeyAttributes</code> - A list of one or more non-key attribute names that are projected into the secondary index. The total count of attributes provided in <code>NonKeyAttributes</code>, summed across all of the secondary indexes, must not exceed 20. If you project the same attribute into two different indexes, this counts as two distinct attributes when determining the total.</p> </li> </ul> </li> <li> <p> <code>IndexSizeBytes</code> - Represents the total size of the index, in bytes. DynamoDB updates this value approximately every six hours. Recent changes might not be reflected in this value.</p> </li> <li> <p> <code>ItemCount</code> - Represents the number of items in the index. DynamoDB updates this value approximately every six hours. Recent changes might not be reflected in this value.</p> </li> </ul> <p>If the table is in the <code>DELETING</code> state, no information about indexes will be returned.</p>"
         },
         "GlobalSecondaryIndexes":{
           "shape":"GlobalSecondaryIndexDescriptionList",
-          "documentation":"<p>The global secondary indexes, if any, on the table. Each index is scoped to a given partition key value. Each element is composed of:</p> <ul> <li> <p> <code>Backfilling</code> - If true, then the index is currently in the backfilling phase. Backfilling occurs only when a new global secondary index is added to the table; it is the process by which DynamoDB populates the new index with data from the table. (This attribute does not appear for indexes that were created during a <code>CreateTable</code> operation.)</p> </li> <li> <p> <code>IndexName</code> - The name of the global secondary index.</p> </li> <li> <p> <code>IndexSizeBytes</code> - The total size of the global secondary index, in bytes. DynamoDB updates this value approximately every six hours. Recent changes might not be reflected in this value. </p> </li> <li> <p> <code>IndexStatus</code> - The current status of the global secondary index:</p> <ul> <li> <p> <code>CREATING</code> - The index is being created.</p> </li> <li> <p> <code>UPDATING</code> - The index is being updated.</p> </li> <li> <p> <code>DELETING</code> - The index is being deleted.</p> </li> <li> <p> <code>ACTIVE</code> - The index is ready for use.</p> </li> </ul> </li> <li> <p> <code>ItemCount</code> - The number of items in the global secondary index. DynamoDB updates this value approximately every six hours. Recent changes might not be reflected in this value. </p> </li> <li> <p> <code>KeySchema</code> - Specifies the complete index key schema. The attribute names in the key schema must be between 1 and 255 characters (inclusive). The key schema must begin with the same partition key as the table.</p> </li> <li> <p> <code>Projection</code> - Specifies attributes that are copied (projected) from the table into the index. These are in addition to the primary key attributes and index key attributes, which are automatically projected. Each attribute specification is composed of:</p> <ul> <li> <p> <code>ProjectionType</code> - One of the following:</p> <ul> <li> <p> <code>KEYS_ONLY</code> - Only the index and primary keys are projected into the index.</p> </li> <li> <p> <code>INCLUDE</code> - Only the specified table attributes are projected into the index. The list of projected attributes are in <code>NonKeyAttributes</code>.</p> </li> <li> <p> <code>ALL</code> - All of the table attributes are projected into the index.</p> </li> </ul> </li> <li> <p> <code>NonKeyAttributes</code> - A list of one or more non-key attribute names that are projected into the secondary index. The total count of attributes provided in <code>NonKeyAttributes</code>, summed across all of the secondary indexes, must not exceed 20. If you project the same attribute into two different indexes, this counts as two distinct attributes when determining the total.</p> </li> </ul> </li> <li> <p> <code>ProvisionedThroughput</code> - The provisioned throughput settings for the global secondary index, consisting of read and write capacity units, along with data about increases and decreases. </p> </li> </ul> <p>If the table is in the <code>DELETING</code> state, no information about indexes will be returned.</p>"
+          "documentation":"<p>The global secondary indexes, if any, on the table. Each index is scoped to a given partition key value. Each element is composed of:</p> <ul> <li> <p> <code>Backfilling</code> - If true, then the index is currently in the backfilling phase. Backfilling occurs only when a new global secondary index is added to the table. It is the process by which DynamoDB populates the new index with data from the table. (This attribute does not appear for indexes that were created during a <code>CreateTable</code> operation.) </p> <p> You can delete an index that is being created during the <code>Backfilling</code> phase when <code>IndexStatus</code> is set to CREATING and <code>Backfilling</code> is true. You can't delete the index that is being created when <code>IndexStatus</code> is set to CREATING and <code>Backfilling</code> is false. (This attribute does not appear for indexes that were created during a <code>CreateTable</code> operation.)</p> </li> <li> <p> <code>IndexName</code> - The name of the global secondary index.</p> </li> <li> <p> <code>IndexSizeBytes</code> - The total size of the global secondary index, in bytes. DynamoDB updates this value approximately every six hours. Recent changes might not be reflected in this value. </p> </li> <li> <p> <code>IndexStatus</code> - The current status of the global secondary index:</p> <ul> <li> <p> <code>CREATING</code> - The index is being created.</p> </li> <li> <p> <code>UPDATING</code> - The index is being updated.</p> </li> <li> <p> <code>DELETING</code> - The index is being deleted.</p> </li> <li> <p> <code>ACTIVE</code> - The index is ready for use.</p> </li> </ul> </li> <li> <p> <code>ItemCount</code> - The number of items in the global secondary index. DynamoDB updates this value approximately every six hours. Recent changes might not be reflected in this value. </p> </li> <li> <p> <code>KeySchema</code> - Specifies the complete index key schema. The attribute names in the key schema must be between 1 and 255 characters (inclusive). The key schema must begin with the same partition key as the table.</p> </li> <li> <p> <code>Projection</code> - Specifies attributes that are copied (projected) from the table into the index. These are in addition to the primary key attributes and index key attributes, which are automatically projected. Each attribute specification is composed of:</p> <ul> <li> <p> <code>ProjectionType</code> - One of the following:</p> <ul> <li> <p> <code>KEYS_ONLY</code> - Only the index and primary keys are projected into the index.</p> </li> <li> <p> <code>INCLUDE</code> - Only the specified table attributes are projected into the index. The list of projected attributes is in <code>NonKeyAttributes</code>.</p> </li> <li> <p> <code>ALL</code> - All of the table attributes are projected into the index.</p> </li> </ul> </li> <li> <p> <code>NonKeyAttributes</code> - A list of one or more non-key attribute names that are projected into the secondary index. The total count of attributes provided in <code>NonKeyAttributes</code>, summed across all of the secondary indexes, must not exceed 20. If you project the same attribute into two different indexes, this counts as two distinct attributes when determining the total.</p> </li> </ul> </li> <li> <p> <code>ProvisionedThroughput</code> - The provisioned throughput settings for the global secondary index, consisting of read and write capacity units, along with data about increases and decreases. </p> </li> </ul> <p>If the table is in the <code>DELETING</code> state, no information about indexes will be returned.</p>"
         },
         "StreamSpecification":{
           "shape":"StreamSpecification",
@@ -3766,12 +4311,20 @@
         },
         "LatestStreamLabel":{
           "shape":"String",
-          "documentation":"<p>A timestamp, in ISO 8601 format, for this stream.</p> <p>Note that <code>LatestStreamLabel</code> is not a unique identifier for the stream, because it is possible that a stream from another table might have the same timestamp. However, the combination of the following three elements is guaranteed to be unique:</p> <ul> <li> <p>the AWS customer ID.</p> </li> <li> <p>the table name.</p> </li> <li> <p>the <code>StreamLabel</code>.</p> </li> </ul>"
+          "documentation":"<p>A timestamp, in ISO 8601 format, for this stream.</p> <p>Note that <code>LatestStreamLabel</code> is not a unique identifier for the stream, because it is possible that a stream from another table might have the same timestamp. However, the combination of the following three elements is guaranteed to be unique:</p> <ul> <li> <p>AWS customer ID</p> </li> <li> <p>Table name</p> </li> <li> <p> <code>StreamLabel</code> </p> </li> </ul>"
         },
         "LatestStreamArn":{
           "shape":"StreamArn",
           "documentation":"<p>The Amazon Resource Name (ARN) that uniquely identifies the latest stream for this table.</p>"
         },
+        "GlobalTableVersion":{
+          "shape":"String",
+          "documentation":"<p>Represents the version of <a href=\"https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/GlobalTables.html\">global tables</a> in use, if the table is replicated across AWS Regions.</p>"
+        },
+        "Replicas":{
+          "shape":"ReplicaDescriptionList",
+          "documentation":"<p>Represents replicas of the table.</p>"
+        },
         "RestoreSummary":{
           "shape":"RestoreSummary",
           "documentation":"<p>Contains details for the restore.</p>"
@@ -3779,6 +4332,10 @@
         "SSEDescription":{
           "shape":"SSEDescription",
           "documentation":"<p>The description of the server-side encryption status on the specified table.</p>"
+        },
+        "ArchivalSummary":{
+          "shape":"ArchivalSummary",
+          "documentation":"<p>Contains information about the table archive.</p>"
         }
       },
       "documentation":"<p>Represents the properties of a table.</p>"
@@ -3819,7 +4376,10 @@
         "CREATING",
         "UPDATING",
         "DELETING",
-        "ACTIVE"
+        "ACTIVE",
+        "INACCESSIBLE_ENCRYPTION_CREDENTIALS",
+        "ARCHIVING",
+        "ARCHIVED"
       ]
     },
     "Tag":{
@@ -3938,7 +4498,7 @@
     "TransactGetItemList":{
       "type":"list",
       "member":{"shape":"TransactGetItem"},
-      "max":10,
+      "max":25,
       "min":1
     },
     "TransactGetItemsInput":{
@@ -3993,7 +4553,7 @@
     "TransactWriteItemList":{
       "type":"list",
       "member":{"shape":"TransactWriteItem"},
-      "max":10,
+      "max":25,
       "min":1
     },
     "TransactWriteItemsInput":{
@@ -4038,7 +4598,7 @@
           "documentation":"<p>A list of cancellation reasons.</p>"
         }
       },
-      "documentation":"<p>The entire transaction request was canceled.</p> <p>DynamoDB cancels a <code>TransactWriteItems</code> request under the following circumstances:</p> <ul> <li> <p>A condition in one of the condition expressions is not met.</p> </li> <li> <p>A table in the <code>TransactWriteItems</code> request is in a different account or region.</p> </li> <li> <p>More than one action in the <code>TransactWriteItems</code> operation targets the same item.</p> </li> <li> <p>There is insufficient provisioned capacity for the transaction to be completed.</p> </li> <li> <p>An item size becomes too large (larger than 400 KB), or a local secondary index (LSI) becomes too large, or a similar validation error occurs because of changes made by the transaction.</p> </li> <li> <p>The aggregate size of the items in the transaction exceeds 4 MBs.</p> </li> <li> <p>There is a user error, such as an invalid data format.</p> </li> </ul> <p>DynamoDB cancels a <code>TransactGetItems</code> request under the following circumstances:</p> <ul> <li> <p>There is an ongoing <code>TransactGetItems</code> operation that conflicts with a concurrent <code>PutItem</code>, <code>UpdateItem</code>, <code>DeleteItem</code> or <code>TransactWriteItems</code> request. In this case the <code>TransactGetItems</code> operation fails with a <code>TransactionCanceledException</code>.</p> </li> <li> <p>A table in the <code>TransactGetItems</code> request is in a different account or region.</p> </li> <li> <p>There is insufficient provisioned capacity for the transaction to be completed.</p> </li> <li> <p>The aggregate size of the items in the transaction exceeds 4 MBs.</p> </li> <li> <p>There is a user error, such as an invalid data format.</p> </li> </ul> <note> <p>If using Java, DynamoDB lists the cancellation reasons on the <code>CancellationReasons</code> property. This property is not set for other languages. Transaction cancellation reasons are ordered in the order of requested items, if an item has no error it will have <code>NONE</code> code and <code>Null</code> message.</p> </note> <p>Cancellation reason codes and possible error messages:</p> <ul> <li> <p>No Errors:</p> <ul> <li> <p>Code: <code>NONE</code> </p> </li> <li> <p>Message: <code>null</code> </p> </li> </ul> </li> <li> <p>Conditional Check Failed:</p> <ul> <li> <p>Code: <code>ConditionalCheckFailed</code> </p> </li> <li> <p>Message: The conditional request failed. </p> </li> </ul> </li> <li> <p>Item Collection Size Limit Exceeded:</p> <ul> <li> <p>Code: <code>ItemCollectionSizeLimitExceeded</code> </p> </li> <li> <p>Message: Collection size exceeded.</p> </li> </ul> </li> <li> <p>Transaction Conflict:</p> <ul> <li> <p>Code: <code>TransactionConflict</code> </p> </li> <li> <p>Message: Transaction is ongoing for the item.</p> </li> </ul> </li> <li> <p>Provisioned Throughput Exceeded:</p> <ul> <li> <p>Code: <code>ProvisionedThroughputExceeded</code> </p> </li> <li> <p>Messages: </p> <ul> <li> <p>The level of configured provisioned throughput for the table was exceeded. Consider increasing your provisioning level with the UpdateTable API.</p> <note> <p>This Message is received when provisioned throughput is exceeded is on a provisioned DynamoDB table.</p> </note> </li> <li> <p>The level of configured provisioned throughput for one or more global secondary indexes of the table was exceeded. Consider increasing your provisioning level for the under-provisioned global secondary indexes with the UpdateTable API.</p> <note> <p>This message is returned when provisioned throughput is exceeded is on a provisioned GSI.</p> </note> </li> </ul> </li> </ul> </li> <li> <p>Throttling Error:</p> <ul> <li> <p>Code: <code>ThrottlingError</code> </p> </li> <li> <p>Messages: </p> <ul> <li> <p>Throughput exceeds the current capacity of your table or index. DynamoDB is automatically scaling your table or index so please try again shortly. If exceptions persist, check if you have a hot key: https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/bp-partition-key-design.html.</p> <note> <p>This message is returned when writes get throttled on an On-Demand table as DynamoDB is automatically scaling the table.</p> </note> </li> <li> <p>Throughput exceeds the current capacity for one or more global secondary indexes. DynamoDB is automatically scaling your index so please try again shortly.</p> <note> <p>This message is returned when when writes get throttled on an On-Demand GSI as DynamoDB is automatically scaling the GSI.</p> </note> </li> </ul> </li> </ul> </li> <li> <p>Validation Error:</p> <ul> <li> <p>Code: <code>ValidationError</code> </p> </li> <li> <p>Messages: </p> <ul> <li> <p>One or more parameter values were invalid.</p> </li> <li> <p>The update expression attempted to update the secondary index key beyond allowed size limits.</p> </li> <li> <p>The update expression attempted to update the secondary index key to unsupported type.</p> </li> <li> <p>An operand in the update expression has an incorrect data type.</p> </li> <li> <p>Item size to update has exceeded the maximum allowed size.</p> </li> <li> <p>Number overflow. Attempting to store a number with magnitude larger than supported range.</p> </li> <li> <p>Type mismatch for attribute to update.</p> </li> <li> <p>Nesting Levels have exceeded supported limits.</p> </li> <li> <p>The document path provided in the update expression is invalid for update.</p> </li> <li> <p>The provided expression refers to an attribute that does not exist in the item.</p> </li> </ul> </li> </ul> </li> </ul>",
+      "documentation":"<p>The entire transaction request was canceled.</p> <p>DynamoDB cancels a <code>TransactWriteItems</code> request under the following circumstances:</p> <ul> <li> <p>A condition in one of the condition expressions is not met.</p> </li> <li> <p>A table in the <code>TransactWriteItems</code> request is in a different account or region.</p> </li> <li> <p>More than one action in the <code>TransactWriteItems</code> operation targets the same item.</p> </li> <li> <p>There is insufficient provisioned capacity for the transaction to be completed.</p> </li> <li> <p>An item size becomes too large (larger than 400 KB), or a local secondary index (LSI) becomes too large, or a similar validation error occurs because of changes made by the transaction.</p> </li> <li> <p>There is a user error, such as an invalid data format.</p> </li> </ul> <p>DynamoDB cancels a <code>TransactGetItems</code> request under the following circumstances:</p> <ul> <li> <p>There is an ongoing <code>TransactGetItems</code> operation that conflicts with a concurrent <code>PutItem</code>, <code>UpdateItem</code>, <code>DeleteItem</code> or <code>TransactWriteItems</code> request. In this case the <code>TransactGetItems</code> operation fails with a <code>TransactionCanceledException</code>.</p> </li> <li> <p>A table in the <code>TransactGetItems</code> request is in a different account or region.</p> </li> <li> <p>There is insufficient provisioned capacity for the transaction to be completed.</p> </li> <li> <p>There is a user error, such as an invalid data format.</p> </li> </ul> <note> <p>If using Java, DynamoDB lists the cancellation reasons on the <code>CancellationReasons</code> property. This property is not set for other languages. Transaction cancellation reasons are ordered in the order of requested items, if an item has no error it will have <code>NONE</code> code and <code>Null</code> message.</p> </note> <p>Cancellation reason codes and possible error messages:</p> <ul> <li> <p>No Errors:</p> <ul> <li> <p>Code: <code>NONE</code> </p> </li> <li> <p>Message: <code>null</code> </p> </li> </ul> </li> <li> <p>Conditional Check Failed:</p> <ul> <li> <p>Code: <code>ConditionalCheckFailed</code> </p> </li> <li> <p>Message: The conditional request failed. </p> </li> </ul> </li> <li> <p>Item Collection Size Limit Exceeded:</p> <ul> <li> <p>Code: <code>ItemCollectionSizeLimitExceeded</code> </p> </li> <li> <p>Message: Collection size exceeded.</p> </li> </ul> </li> <li> <p>Transaction Conflict:</p> <ul> <li> <p>Code: <code>TransactionConflict</code> </p> </li> <li> <p>Message: Transaction is ongoing for the item.</p> </li> </ul> </li> <li> <p>Provisioned Throughput Exceeded:</p> <ul> <li> <p>Code: <code>ProvisionedThroughputExceeded</code> </p> </li> <li> <p>Messages: </p> <ul> <li> <p>The level of configured provisioned throughput for the table was exceeded. Consider increasing your provisioning level with the UpdateTable API.</p> <note> <p>This Message is received when provisioned throughput is exceeded is on a provisioned DynamoDB table.</p> </note> </li> <li> <p>The level of configured provisioned throughput for one or more global secondary indexes of the table was exceeded. Consider increasing your provisioning level for the under-provisioned global secondary indexes with the UpdateTable API.</p> <note> <p>This message is returned when provisioned throughput is exceeded is on a provisioned GSI.</p> </note> </li> </ul> </li> </ul> </li> <li> <p>Throttling Error:</p> <ul> <li> <p>Code: <code>ThrottlingError</code> </p> </li> <li> <p>Messages: </p> <ul> <li> <p>Throughput exceeds the current capacity of your table or index. DynamoDB is automatically scaling your table or index so please try again shortly. If exceptions persist, check if you have a hot key: https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/bp-partition-key-design.html.</p> <note> <p>This message is returned when writes get throttled on an On-Demand table as DynamoDB is automatically scaling the table.</p> </note> </li> <li> <p>Throughput exceeds the current capacity for one or more global secondary indexes. DynamoDB is automatically scaling your index so please try again shortly.</p> <note> <p>This message is returned when when writes get throttled on an On-Demand GSI as DynamoDB is automatically scaling the GSI.</p> </note> </li> </ul> </li> </ul> </li> <li> <p>Validation Error:</p> <ul> <li> <p>Code: <code>ValidationError</code> </p> </li> <li> <p>Messages: </p> <ul> <li> <p>One or more parameter values were invalid.</p> </li> <li> <p>The update expression attempted to update the secondary index key beyond allowed size limits.</p> </li> <li> <p>The update expression attempted to update the secondary index key to unsupported type.</p> </li> <li> <p>An operand in the update expression has an incorrect data type.</p> </li> <li> <p>Item size to update has exceeded the maximum allowed size.</p> </li> <li> <p>Number overflow. Attempting to store a number with magnitude larger than supported range.</p> </li> <li> <p>Type mismatch for attribute to update.</p> </li> <li> <p>Nesting Levels have exceeded supported limits.</p> </li> <li> <p>The document path provided in the update expression is invalid for update.</p> </li> <li> <p>The provided expression refers to an attribute that does not exist in the item.</p> </li> </ul> </li> </ul> </li> </ul>",
       "exception":true
     },
     "TransactionConflictException":{
@@ -4139,6 +4699,44 @@
         }
       }
     },
+    "UpdateContributorInsightsInput":{
+      "type":"structure",
+      "required":[
+        "TableName",
+        "ContributorInsightsAction"
+      ],
+      "members":{
+        "TableName":{
+          "shape":"TableName",
+          "documentation":"<p>The name of the table.</p>"
+        },
+        "IndexName":{
+          "shape":"IndexName",
+          "documentation":"<p>The global secondary index name, if applicable.</p>"
+        },
+        "ContributorInsightsAction":{
+          "shape":"ContributorInsightsAction",
+          "documentation":"<p>Represents the contributor insights action.</p>"
+        }
+      }
+    },
+    "UpdateContributorInsightsOutput":{
+      "type":"structure",
+      "members":{
+        "TableName":{
+          "shape":"TableName",
+          "documentation":"<p>The name of the table.</p>"
+        },
+        "IndexName":{
+          "shape":"IndexName",
+          "documentation":"<p>The name of the global secondary index, if applicable.</p>"
+        },
+        "ContributorInsightsStatus":{
+          "shape":"ContributorInsightsStatus",
+          "documentation":"<p>The status of contributor insights</p>"
+        }
+      }
+    },
     "UpdateExpression":{"type":"string"},
     "UpdateGlobalSecondaryIndexAction":{
       "type":"structure",
@@ -4194,7 +4792,7 @@
         },
         "GlobalTableBillingMode":{
           "shape":"BillingMode",
-          "documentation":"<p>The billing mode of the global table. If <code>GlobalTableBillingMode</code> is not specified, the global table defaults to <code>PROVISIONED</code> capacity billing mode.</p>"
+          "documentation":"<p>The billing mode of the global table. If <code>GlobalTableBillingMode</code> is not specified, the global table defaults to <code>PROVISIONED</code> capacity billing mode.</p> <ul> <li> <p> <code>PROVISIONED</code> - We recommend using <code>PROVISIONED</code> for predictable workloads. <code>PROVISIONED</code> sets the billing mode to <a href=\"https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/HowItWorks.ReadWriteCapacityMode.html#HowItWorks.ProvisionedThroughput.Manual\">Provisioned Mode</a>.</p> </li> <li> <p> <code>PAY_PER_REQUEST</code> - We recommend using <code>PAY_PER_REQUEST</code> for unpredictable workloads. <code>PAY_PER_REQUEST</code> sets the billing mode to <a href=\"https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/HowItWorks.ReadWriteCapacityMode.html#HowItWorks.OnDemand\">On-Demand Mode</a>. </p> </li> </ul>"
         },
         "GlobalTableProvisionedWriteCapacityUnits":{
           "shape":"PositiveLongObject",
@@ -4300,6 +4898,29 @@
       },
       "documentation":"<p>Represents the output of an <code>UpdateItem</code> operation.</p>"
     },
+    "UpdateReplicationGroupMemberAction":{
+      "type":"structure",
+      "required":["RegionName"],
+      "members":{
+        "RegionName":{
+          "shape":"RegionName",
+          "documentation":"<p>The Region where the replica exists.</p>"
+        },
+        "KMSMasterKeyId":{
+          "shape":"KMSMasterKeyId",
+          "documentation":"<p>The AWS KMS customer master key (CMK) of the replica that should be used for AWS KMS encryption. To specify a CMK, use its key ID, Amazon Resource Name (ARN), alias name, or alias ARN. Note that you should only provide this parameter if the key is different from the default DynamoDB KMS master key alias/aws/dynamodb.</p>"
+        },
+        "ProvisionedThroughputOverride":{
+          "shape":"ProvisionedThroughputOverride",
+          "documentation":"<p>Replica-specific provisioned throughput. If not specified, uses the source table's provisioned throughput settings.</p>"
+        },
+        "GlobalSecondaryIndexes":{
+          "shape":"ReplicaGlobalSecondaryIndexList",
+          "documentation":"<p>Replica-specific global secondary index settings.</p>"
+        }
+      },
+      "documentation":"<p>Represents a replica to be modified.</p>"
+    },
     "UpdateTableInput":{
       "type":"structure",
       "required":["TableName"],
@@ -4314,7 +4935,7 @@
         },
         "BillingMode":{
           "shape":"BillingMode",
-          "documentation":"<p>Controls how you are charged for read and write throughput and how you manage capacity. When switching from pay-per-request to provisioned capacity, initial provisioned capacity values must be set. The initial provisioned capacity values are estimated based on the consumed read and write capacity of your table and global secondary indexes over the past 30 minutes.</p> <ul> <li> <p> <code>PROVISIONED</code> - Sets the billing mode to <code>PROVISIONED</code>. We recommend using <code>PROVISIONED</code> for predictable workloads.</p> </li> <li> <p> <code>PAY_PER_REQUEST</code> - Sets the billing mode to <code>PAY_PER_REQUEST</code>. We recommend using <code>PAY_PER_REQUEST</code> for unpredictable workloads. </p> </li> </ul>"
+          "documentation":"<p>Controls how you are charged for read and write throughput and how you manage capacity. When switching from pay-per-request to provisioned capacity, initial provisioned capacity values must be set. The initial provisioned capacity values are estimated based on the consumed read and write capacity of your table and global secondary indexes over the past 30 minutes.</p> <ul> <li> <p> <code>PROVISIONED</code> - We recommend using <code>PROVISIONED</code> for predictable workloads. <code>PROVISIONED</code> sets the billing mode to <a href=\"https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/HowItWorks.ReadWriteCapacityMode.html#HowItWorks.ProvisionedThroughput.Manual\">Provisioned Mode</a>.</p> </li> <li> <p> <code>PAY_PER_REQUEST</code> - We recommend using <code>PAY_PER_REQUEST</code> for unpredictable workloads. <code>PAY_PER_REQUEST</code> sets the billing mode to <a href=\"https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/HowItWorks.ReadWriteCapacityMode.html#HowItWorks.OnDemand\">On-Demand Mode</a>. </p> </li> </ul>"
         },
         "ProvisionedThroughput":{
           "shape":"ProvisionedThroughput",
@@ -4322,7 +4943,7 @@
         },
         "GlobalSecondaryIndexUpdates":{
           "shape":"GlobalSecondaryIndexUpdateList",
-          "documentation":"<p>An array of one or more global secondary indexes for the table. For each index in the array, you can request one action:</p> <ul> <li> <p> <code>Create</code> - add a new global secondary index to the table.</p> </li> <li> <p> <code>Update</code> - modify the provisioned throughput settings of an existing global secondary index.</p> </li> <li> <p> <code>Delete</code> - remove a global secondary index from the table.</p> </li> </ul> <p>For more information, see <a href=\"https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/GSI.OnlineOps.html\">Managing Global Secondary Indexes</a> in the <i>Amazon DynamoDB Developer Guide</i>. </p>"
+          "documentation":"<p>An array of one or more global secondary indexes for the table. For each index in the array, you can request one action:</p> <ul> <li> <p> <code>Create</code> - add a new global secondary index to the table.</p> </li> <li> <p> <code>Update</code> - modify the provisioned throughput settings of an existing global secondary index.</p> </li> <li> <p> <code>Delete</code> - remove a global secondary index from the table.</p> </li> </ul> <p>You can create or delete only one global secondary index per <code>UpdateTable</code> operation.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/GSI.OnlineOps.html\">Managing Global Secondary Indexes</a> in the <i>Amazon DynamoDB Developer Guide</i>. </p>"
         },
         "StreamSpecification":{
           "shape":"StreamSpecification",
@@ -4331,6 +4952,10 @@
         "SSESpecification":{
           "shape":"SSESpecification",
           "documentation":"<p>The new server-side encryption settings for the specified table.</p>"
+        },
+        "ReplicaUpdates":{
+          "shape":"ReplicationGroupUpdateList",
+          "documentation":"<p>A list of replica update actions (create, delete, or update) for the table.</p> <note> <p>This property only applies to <a href=\"https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/globaltables.V2.html\">Version 2019.11.21</a> of global tables.</p> </note>"
         }
       },
       "documentation":"<p>Represents the input of an <code>UpdateTable</code> operation.</p>"
@@ -4345,6 +4970,34 @@
       },
       "documentation":"<p>Represents the output of an <code>UpdateTable</code> operation.</p>"
     },
+    "UpdateTableReplicaAutoScalingInput":{
+      "type":"structure",
+      "required":["TableName"],
+      "members":{
+        "GlobalSecondaryIndexUpdates":{
+          "shape":"GlobalSecondaryIndexAutoScalingUpdateList",
+          "documentation":"<p>Represents the auto scaling settings of the global secondary indexes of the replica to be updated.</p>"
+        },
+        "TableName":{
+          "shape":"TableName",
+          "documentation":"<p>The name of the global table to be updated.</p>"
+        },
+        "ProvisionedWriteCapacityAutoScalingUpdate":{"shape":"AutoScalingSettingsUpdate"},
+        "ReplicaUpdates":{
+          "shape":"ReplicaAutoScalingUpdateList",
+          "documentation":"<p>Represents the auto scaling settings of replicas of the table that will be modified.</p>"
+        }
+      }
+    },
+    "UpdateTableReplicaAutoScalingOutput":{
+      "type":"structure",
+      "members":{
+        "TableAutoScalingDescription":{
+          "shape":"TableAutoScalingDescription",
+          "documentation":"<p>Returns information about the auto scaling settings of a table with replicas.</p>"
+        }
+      }
+    },
     "UpdateTimeToLiveInput":{
       "type":"structure",
       "required":[
@@ -4384,7 +5037,7 @@
           "documentation":"<p>A request to perform a <code>DeleteItem</code> operation.</p>"
         }
       },
-      "documentation":"<p>Represents an operation to perform - either <code>DeleteItem</code> or <code>PutItem</code>. You can only request one of these operations, not both, in a single <code>WriteRequest</code>. If you do need to perform both of these operations, you will need to provide two separate <code>WriteRequest</code> objects.</p>"
+      "documentation":"<p>Represents an operation to perform - either <code>DeleteItem</code> or <code>PutItem</code>. You can only request one of these operations, not both, in a single <code>WriteRequest</code>. If you do need to perform both of these operations, you need to provide two separate <code>WriteRequest</code> objects.</p>"
     },
     "WriteRequests":{
       "type":"list",
diff --git a/services/dynamodb/src/test/java/software/amazon/awssdk/global/handlers/TestGlobalExecutionInterceptor.java b/services/dynamodb/src/test/java/software/amazon/awssdk/global/handlers/TestGlobalExecutionInterceptor.java
index 897e20222a98..6b44c40562b4 100644
--- a/services/dynamodb/src/test/java/software/amazon/awssdk/global/handlers/TestGlobalExecutionInterceptor.java
+++ b/services/dynamodb/src/test/java/software/amazon/awssdk/global/handlers/TestGlobalExecutionInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/dynamodb/src/test/java/software/amazon/awssdk/services/dynamodb/EndpointDiscoveryTest.java b/services/dynamodb/src/test/java/software/amazon/awssdk/services/dynamodb/EndpointDiscoveryTest.java
new file mode 100644
index 000000000000..7faf2d75338b
--- /dev/null
+++ b/services/dynamodb/src/test/java/software/amazon/awssdk/services/dynamodb/EndpointDiscoveryTest.java
@@ -0,0 +1,77 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.services.dynamodb;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.atLeastOnce;
+
+import org.junit.Test;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mockito;
+import software.amazon.awssdk.auth.credentials.AnonymousCredentialsProvider;
+import software.amazon.awssdk.core.exception.SdkException;
+import software.amazon.awssdk.core.interceptor.Context;
+import software.amazon.awssdk.core.interceptor.ExecutionInterceptor;
+import software.amazon.awssdk.profiles.ProfileFile;
+import software.amazon.awssdk.regions.Region;
+import software.amazon.awssdk.utils.StringInputStream;
+
+public class EndpointDiscoveryTest {
+    @Test(timeout = 10_000)
+    public void canBeEnabledViaProfileOnOverrideConfiguration() throws InterruptedException {
+        ExecutionInterceptor interceptor = Mockito.spy(AbstractExecutionInterceptor.class);
+
+        String profileFileContent =
+            "[default]\n" +
+            "aws_endpoint_discovery_enabled = true";
+
+        ProfileFile profileFile = ProfileFile.builder()
+                                             .type(ProfileFile.Type.CONFIGURATION)
+                                             .content(new StringInputStream(profileFileContent))
+                                             .build();
+
+        DynamoDbClient dynamoDb = DynamoDbClient.builder()
+                                                .region(Region.US_WEST_2)
+                                                .credentialsProvider(AnonymousCredentialsProvider.create())
+                                                .overrideConfiguration(c -> c.defaultProfileFile(profileFile)
+                                                                             .defaultProfileName("default")
+                                                                             .addExecutionInterceptor(interceptor)
+                                                                             .retryPolicy(r -> r.numRetries(0)))
+                                                .build();
+
+        assertThatThrownBy(dynamoDb::listTables).isInstanceOf(SdkException.class);
+
+        ArgumentCaptor<Context.BeforeTransmission> context;
+
+        do {
+            Thread.sleep(1);
+            context = ArgumentCaptor.forClass(Context.BeforeTransmission.class);
+            Mockito.verify(interceptor, atLeastOnce()).beforeTransmission(context.capture(), any());
+        } while (context.getAllValues().size() < 2);
+
+        assertThat(context.getAllValues()
+                          .stream()
+                          .anyMatch(v -> v.httpRequest()
+                                          .firstMatchingHeader("X-Amz-Target")
+                                          .map(h -> h.equals("DynamoDB_20120810.DescribeEndpoints"))
+                                          .orElse(false)))
+            .isTrue();
+    }
+
+    public static abstract class AbstractExecutionInterceptor implements ExecutionInterceptor {}
+}
diff --git a/services/dynamodb/src/test/java/software/amazon/awssdk/services/dynamodb/GlobalRequestHandlerTest.java b/services/dynamodb/src/test/java/software/amazon/awssdk/services/dynamodb/GlobalRequestHandlerTest.java
index 44304408af48..e9a05226f543 100644
--- a/services/dynamodb/src/test/java/software/amazon/awssdk/services/dynamodb/GlobalRequestHandlerTest.java
+++ b/services/dynamodb/src/test/java/software/amazon/awssdk/services/dynamodb/GlobalRequestHandlerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/dynamodb/src/test/java/software/amazon/awssdk/services/dynamodb/PaginatorInUserAgentTest.java b/services/dynamodb/src/test/java/software/amazon/awssdk/services/dynamodb/PaginatorInUserAgentTest.java
index d232579c338e..3e5ce2ea94ca 100644
--- a/services/dynamodb/src/test/java/software/amazon/awssdk/services/dynamodb/PaginatorInUserAgentTest.java
+++ b/services/dynamodb/src/test/java/software/amazon/awssdk/services/dynamodb/PaginatorInUserAgentTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/dynamodb/src/test/java/software/amazon/awssdk/services/dynamodb/PutItemRequestMarshallerTest.java b/services/dynamodb/src/test/java/software/amazon/awssdk/services/dynamodb/PutItemRequestMarshallerTest.java
index 8f66f9c7f3bb..ef288dfa569d 100644
--- a/services/dynamodb/src/test/java/software/amazon/awssdk/services/dynamodb/PutItemRequestMarshallerTest.java
+++ b/services/dynamodb/src/test/java/software/amazon/awssdk/services/dynamodb/PutItemRequestMarshallerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -27,6 +27,7 @@
 import software.amazon.awssdk.core.client.config.SdkClientConfiguration;
 import software.amazon.awssdk.core.client.config.SdkClientOption;
 import software.amazon.awssdk.http.SdkHttpFullRequest;
+import software.amazon.awssdk.protocols.json.AwsJsonProtocol;
 import software.amazon.awssdk.protocols.json.AwsJsonProtocolFactory;
 import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
 import software.amazon.awssdk.services.dynamodb.model.PutItemRequest;
@@ -44,6 +45,7 @@ public class PutItemRequestMarshallerTest {
                                                         .option(SdkClientOption.ENDPOINT, URI.create("http://localhost"))
                                                         .build())
                               .protocolVersion("1.1")
+                              .protocol(AwsJsonProtocol.AWS_JSON)
                               .build());
 
     /**l
diff --git a/services/dynamodb/src/test/java/utils/resources/RequiredResources.java b/services/dynamodb/src/test/java/utils/resources/RequiredResources.java
index 71d3f3f6434f..8edb135cabda 100644
--- a/services/dynamodb/src/test/java/utils/resources/RequiredResources.java
+++ b/services/dynamodb/src/test/java/utils/resources/RequiredResources.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/dynamodb/src/test/java/utils/resources/ResourceCentricBlockJUnit4ClassRunner.java b/services/dynamodb/src/test/java/utils/resources/ResourceCentricBlockJUnit4ClassRunner.java
index 0cb576b15a18..79cc0f82214a 100644
--- a/services/dynamodb/src/test/java/utils/resources/ResourceCentricBlockJUnit4ClassRunner.java
+++ b/services/dynamodb/src/test/java/utils/resources/ResourceCentricBlockJUnit4ClassRunner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/dynamodb/src/test/java/utils/resources/TestResource.java b/services/dynamodb/src/test/java/utils/resources/TestResource.java
index 98736d15a401..434d79c7c7b0 100644
--- a/services/dynamodb/src/test/java/utils/resources/TestResource.java
+++ b/services/dynamodb/src/test/java/utils/resources/TestResource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/dynamodb/src/test/java/utils/resources/TestResourceUtils.java b/services/dynamodb/src/test/java/utils/resources/TestResourceUtils.java
index d7ad04e3cd73..c154cd105917 100644
--- a/services/dynamodb/src/test/java/utils/resources/TestResourceUtils.java
+++ b/services/dynamodb/src/test/java/utils/resources/TestResourceUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/dynamodb/src/test/java/utils/resources/tables/BasicTempTable.java b/services/dynamodb/src/test/java/utils/resources/tables/BasicTempTable.java
index 979df80e14a2..cbb252f19936 100644
--- a/services/dynamodb/src/test/java/utils/resources/tables/BasicTempTable.java
+++ b/services/dynamodb/src/test/java/utils/resources/tables/BasicTempTable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/dynamodb/src/test/java/utils/resources/tables/BasicTempTableWithLowThroughput.java b/services/dynamodb/src/test/java/utils/resources/tables/BasicTempTableWithLowThroughput.java
index e5bfbe2ee97f..0a5a2e7c95bb 100644
--- a/services/dynamodb/src/test/java/utils/resources/tables/BasicTempTableWithLowThroughput.java
+++ b/services/dynamodb/src/test/java/utils/resources/tables/BasicTempTableWithLowThroughput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/dynamodb/src/test/java/utils/resources/tables/TempTableWithBinaryKey.java b/services/dynamodb/src/test/java/utils/resources/tables/TempTableWithBinaryKey.java
index 1e1c38d58629..616c51492475 100644
--- a/services/dynamodb/src/test/java/utils/resources/tables/TempTableWithBinaryKey.java
+++ b/services/dynamodb/src/test/java/utils/resources/tables/TempTableWithBinaryKey.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/dynamodb/src/test/java/utils/resources/tables/TempTableWithSecondaryIndexes.java b/services/dynamodb/src/test/java/utils/resources/tables/TempTableWithSecondaryIndexes.java
index 07d827c164db..1e71067b96fc 100644
--- a/services/dynamodb/src/test/java/utils/resources/tables/TempTableWithSecondaryIndexes.java
+++ b/services/dynamodb/src/test/java/utils/resources/tables/TempTableWithSecondaryIndexes.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/dynamodb/src/test/java/utils/resources/tables/TestTableForParallelScan.java b/services/dynamodb/src/test/java/utils/resources/tables/TestTableForParallelScan.java
index e35c885e225f..1802b668c57b 100644
--- a/services/dynamodb/src/test/java/utils/resources/tables/TestTableForParallelScan.java
+++ b/services/dynamodb/src/test/java/utils/resources/tables/TestTableForParallelScan.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/dynamodb/src/test/java/utils/test/resources/DynamoDBTableResource.java b/services/dynamodb/src/test/java/utils/test/resources/DynamoDBTableResource.java
index bf65130bb5f5..fe91a4da3c15 100644
--- a/services/dynamodb/src/test/java/utils/test/resources/DynamoDBTableResource.java
+++ b/services/dynamodb/src/test/java/utils/test/resources/DynamoDBTableResource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/dynamodb/src/test/java/utils/test/util/DynamoDBIntegrationTestBase.java b/services/dynamodb/src/test/java/utils/test/util/DynamoDBIntegrationTestBase.java
index 80c6c8565ab5..0adff9b7ffaf 100644
--- a/services/dynamodb/src/test/java/utils/test/util/DynamoDBIntegrationTestBase.java
+++ b/services/dynamodb/src/test/java/utils/test/util/DynamoDBIntegrationTestBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/dynamodb/src/test/java/utils/test/util/DynamoDBTestBase.java b/services/dynamodb/src/test/java/utils/test/util/DynamoDBTestBase.java
index c5a4d2266cf7..70058d71b4e3 100644
--- a/services/dynamodb/src/test/java/utils/test/util/DynamoDBTestBase.java
+++ b/services/dynamodb/src/test/java/utils/test/util/DynamoDBTestBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/dynamodb/src/test/java/utils/test/util/TableUtils.java b/services/dynamodb/src/test/java/utils/test/util/TableUtils.java
index 965fac31bddb..c994d14cb32c 100644
--- a/services/dynamodb/src/test/java/utils/test/util/TableUtils.java
+++ b/services/dynamodb/src/test/java/utils/test/util/TableUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/dynamodb/src/test/resources/cucumber.properties b/services/dynamodb/src/test/resources/cucumber.properties
index 1be991075f8e..ec178959aabe 100644
--- a/services/dynamodb/src/test/resources/cucumber.properties
+++ b/services/dynamodb/src/test/resources/cucumber.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/dynamodb/src/test/resources/log4j.properties b/services/dynamodb/src/test/resources/log4j.properties
index d199e82bedd4..72ee36f7383b 100644
--- a/services/dynamodb/src/test/resources/log4j.properties
+++ b/services/dynamodb/src/test/resources/log4j.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/ebs/pom.xml b/services/ebs/pom.xml
new file mode 100644
index 000000000000..1a62c1d09d88
--- /dev/null
+++ b/services/ebs/pom.xml
@@ -0,0 +1,60 @@
+<?xml version="1.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.
+  -->
+
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>software.amazon.awssdk</groupId>
+        <artifactId>services</artifactId>
+        <version>2.11.8-SNAPSHOT</version>
+    </parent>
+    <artifactId>ebs</artifactId>
+    <name>AWS Java SDK :: Services :: EBS</name>
+    <description>The AWS Java SDK for EBS module holds the client classes that are used for
+        communicating with EBS.
+    </description>
+    <url>https://aws.amazon.com/sdkforjava</url>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifestEntries>
+                            <Automatic-Module-Name>software.amazon.awssdk.services.ebs</Automatic-Module-Name>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>protocol-core</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>aws-json-protocol</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/services/ebs/src/main/resources/codegen-resources/paginators-1.json b/services/ebs/src/main/resources/codegen-resources/paginators-1.json
new file mode 100644
index 000000000000..e8595e4f3c15
--- /dev/null
+++ b/services/ebs/src/main/resources/codegen-resources/paginators-1.json
@@ -0,0 +1,14 @@
+{
+  "pagination": {
+    "ListChangedBlocks": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "MaxResults"
+    },
+    "ListSnapshotBlocks": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "MaxResults"
+    }
+  }
+}
diff --git a/services/ebs/src/main/resources/codegen-resources/service-2.json b/services/ebs/src/main/resources/codegen-resources/service-2.json
new file mode 100644
index 000000000000..c562c9fbbe7a
--- /dev/null
+++ b/services/ebs/src/main/resources/codegen-resources/service-2.json
@@ -0,0 +1,351 @@
+{
+  "version":"2.0",
+  "metadata":{
+    "apiVersion":"2019-11-02",
+    "endpointPrefix":"ebs",
+    "jsonVersion":"1.1",
+    "protocol":"rest-json",
+    "serviceAbbreviation":"Amazon EBS",
+    "serviceFullName":"Amazon Elastic Block Store",
+    "serviceId":"EBS",
+    "signatureVersion":"v4",
+    "uid":"ebs-2019-11-02"
+  },
+  "operations":{
+    "GetSnapshotBlock":{
+      "name":"GetSnapshotBlock",
+      "http":{
+        "method":"GET",
+        "requestUri":"/snapshots/{snapshotId}/blocks/{blockIndex}"
+      },
+      "input":{"shape":"GetSnapshotBlockRequest"},
+      "output":{"shape":"GetSnapshotBlockResponse"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"ResourceNotFoundException"}
+      ],
+      "documentation":"<p>Returns the data in a block in an Amazon Elastic Block Store snapshot.</p>"
+    },
+    "ListChangedBlocks":{
+      "name":"ListChangedBlocks",
+      "http":{
+        "method":"GET",
+        "requestUri":"/snapshots/{secondSnapshotId}/changedblocks"
+      },
+      "input":{"shape":"ListChangedBlocksRequest"},
+      "output":{"shape":"ListChangedBlocksResponse"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"ResourceNotFoundException"}
+      ],
+      "documentation":"<p>Returns the block indexes and block tokens for blocks that are different between two Amazon Elastic Block Store snapshots of the same volume/snapshot lineage.</p>"
+    },
+    "ListSnapshotBlocks":{
+      "name":"ListSnapshotBlocks",
+      "http":{
+        "method":"GET",
+        "requestUri":"/snapshots/{snapshotId}/blocks"
+      },
+      "input":{"shape":"ListSnapshotBlocksRequest"},
+      "output":{"shape":"ListSnapshotBlocksResponse"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"ResourceNotFoundException"}
+      ],
+      "documentation":"<p>Returns the block indexes and block tokens for blocks in an Amazon Elastic Block Store snapshot.</p>"
+    }
+  },
+  "shapes":{
+    "Block":{
+      "type":"structure",
+      "members":{
+        "BlockIndex":{
+          "shape":"BlockIndex",
+          "documentation":"<p>The block index.</p>"
+        },
+        "BlockToken":{
+          "shape":"BlockToken",
+          "documentation":"<p>The block token for the block index.</p>"
+        }
+      },
+      "documentation":"<p>A block of data in an Amazon Elastic Block Store snapshot.</p>"
+    },
+    "BlockData":{
+      "type":"blob",
+      "sensitive":true,
+      "streaming":true
+    },
+    "BlockIndex":{"type":"integer"},
+    "BlockSize":{"type":"integer"},
+    "BlockToken":{
+      "type":"string",
+      "max":256,
+      "pattern":"^[A-Za-z0-9+/=]+$"
+    },
+    "Blocks":{
+      "type":"list",
+      "member":{"shape":"Block"},
+      "sensitive":true
+    },
+    "ChangedBlock":{
+      "type":"structure",
+      "members":{
+        "BlockIndex":{
+          "shape":"BlockIndex",
+          "documentation":"<p>The block index.</p>"
+        },
+        "FirstBlockToken":{
+          "shape":"BlockToken",
+          "documentation":"<p>The block token for the block index of the <code>FirstSnapshotId</code> specified in the <code>ListChangedBlocks</code> operation. This value is absent if the first snapshot does not have the changed block that is on the second snapshot.</p>"
+        },
+        "SecondBlockToken":{
+          "shape":"BlockToken",
+          "documentation":"<p>The block token for the block index of the <code>SecondSnapshotId</code> specified in the <code>ListChangedBlocks</code> operation.</p>"
+        }
+      },
+      "documentation":"<p>A block of data in an Amazon Elastic Block Store snapshot that is different from another snapshot of the same volume/snapshot lineage.</p>",
+      "sensitive":true
+    },
+    "ChangedBlocks":{
+      "type":"list",
+      "member":{"shape":"ChangedBlock"}
+    },
+    "Checksum":{
+      "type":"string",
+      "max":64
+    },
+    "ChecksumAlgorithm":{
+      "type":"string",
+      "enum":["SHA256"],
+      "max":32
+    },
+    "DataLength":{"type":"integer"},
+    "ErrorMessage":{
+      "type":"string",
+      "max":256
+    },
+    "GetSnapshotBlockRequest":{
+      "type":"structure",
+      "required":[
+        "SnapshotId",
+        "BlockIndex",
+        "BlockToken"
+      ],
+      "members":{
+        "SnapshotId":{
+          "shape":"SnapshotId",
+          "documentation":"<p>The ID of the snapshot containing the block from which to get data.</p>",
+          "location":"uri",
+          "locationName":"snapshotId"
+        },
+        "BlockIndex":{
+          "shape":"BlockIndex",
+          "documentation":"<p>The block index of the block from which to get data.</p> <p>Obtain the <code>BlockIndex</code> by running the <code>ListChangedBlocks</code> or <code>ListSnapshotBlocks</code> operations.</p>",
+          "location":"uri",
+          "locationName":"blockIndex"
+        },
+        "BlockToken":{
+          "shape":"BlockToken",
+          "documentation":"<p>The block token of the block from which to get data.</p> <p>Obtain the <code>BlockToken</code> by running the <code>ListChangedBlocks</code> or <code>ListSnapshotBlocks</code> operations.</p>",
+          "location":"querystring",
+          "locationName":"blockToken"
+        }
+      }
+    },
+    "GetSnapshotBlockResponse":{
+      "type":"structure",
+      "members":{
+        "DataLength":{
+          "shape":"DataLength",
+          "documentation":"<p>The size of the data in the block.</p>",
+          "location":"header",
+          "locationName":"x-amz-Data-Length"
+        },
+        "BlockData":{
+          "shape":"BlockData",
+          "documentation":"<p>The data content of the block.</p>"
+        },
+        "Checksum":{
+          "shape":"Checksum",
+          "documentation":"<p>The checksum generated for the block, which is Base64 encoded.</p>",
+          "location":"header",
+          "locationName":"x-amz-Checksum"
+        },
+        "ChecksumAlgorithm":{
+          "shape":"ChecksumAlgorithm",
+          "documentation":"<p>The algorithm used to generate the checksum for the block, such as SHA256.</p>",
+          "location":"header",
+          "locationName":"x-amz-Checksum-Algorithm"
+        }
+      },
+      "payload":"BlockData"
+    },
+    "ListChangedBlocksRequest":{
+      "type":"structure",
+      "required":["SecondSnapshotId"],
+      "members":{
+        "FirstSnapshotId":{
+          "shape":"SnapshotId",
+          "documentation":"<p>The ID of the first snapshot to use for the comparison.</p> <important> <p>The <code>FirstSnapshotID</code> parameter must be specified with a <code>SecondSnapshotId</code> parameter; otherwise, an error occurs.</p> </important>",
+          "location":"querystring",
+          "locationName":"firstSnapshotId"
+        },
+        "SecondSnapshotId":{
+          "shape":"SnapshotId",
+          "documentation":"<p>The ID of the second snapshot to use for the comparison.</p> <important> <p>The <code>SecondSnapshotId</code> parameter must be specified with a <code>FirstSnapshotID</code> parameter; otherwise, an error occurs.</p> </important>",
+          "location":"uri",
+          "locationName":"secondSnapshotId"
+        },
+        "NextToken":{
+          "shape":"PageToken",
+          "documentation":"<p>The token to request the next page of results.</p>",
+          "location":"querystring",
+          "locationName":"pageToken"
+        },
+        "MaxResults":{
+          "shape":"MaxResults",
+          "documentation":"<p>The number of results to return.</p>",
+          "location":"querystring",
+          "locationName":"maxResults"
+        },
+        "StartingBlockIndex":{
+          "shape":"BlockIndex",
+          "documentation":"<p>The block index from which the comparison should start.</p> <p>The list in the response will start from this block index or the next valid block index in the snapshots.</p>",
+          "location":"querystring",
+          "locationName":"startingBlockIndex"
+        }
+      }
+    },
+    "ListChangedBlocksResponse":{
+      "type":"structure",
+      "members":{
+        "ChangedBlocks":{
+          "shape":"ChangedBlocks",
+          "documentation":"<p>An array of objects containing information about the changed blocks.</p>"
+        },
+        "ExpiryTime":{
+          "shape":"TimeStamp",
+          "documentation":"<p>The time when the <code>BlockToken</code> expires.</p>"
+        },
+        "VolumeSize":{
+          "shape":"VolumeSize",
+          "documentation":"<p>The size of the volume in GB.</p>"
+        },
+        "BlockSize":{
+          "shape":"BlockSize",
+          "documentation":"<p>The size of the block.</p>"
+        },
+        "NextToken":{
+          "shape":"PageToken",
+          "documentation":"<p>The token to use to retrieve the next page of results. This value is null when there are no more results to return.</p>"
+        }
+      }
+    },
+    "ListSnapshotBlocksRequest":{
+      "type":"structure",
+      "required":["SnapshotId"],
+      "members":{
+        "SnapshotId":{
+          "shape":"SnapshotId",
+          "documentation":"<p>The ID of the snapshot from which to get block indexes and block tokens.</p>",
+          "location":"uri",
+          "locationName":"snapshotId"
+        },
+        "NextToken":{
+          "shape":"PageToken",
+          "documentation":"<p>The token to request the next page of results.</p>",
+          "location":"querystring",
+          "locationName":"pageToken"
+        },
+        "MaxResults":{
+          "shape":"MaxResults",
+          "documentation":"<p>The number of results to return.</p>",
+          "location":"querystring",
+          "locationName":"maxResults"
+        },
+        "StartingBlockIndex":{
+          "shape":"BlockIndex",
+          "documentation":"<p>The block index from which the list should start. The list in the response will start from this block index or the next valid block index in the snapshot.</p>",
+          "location":"querystring",
+          "locationName":"startingBlockIndex"
+        }
+      }
+    },
+    "ListSnapshotBlocksResponse":{
+      "type":"structure",
+      "members":{
+        "Blocks":{
+          "shape":"Blocks",
+          "documentation":"<p>An array of objects containing information about the blocks.</p>"
+        },
+        "ExpiryTime":{
+          "shape":"TimeStamp",
+          "documentation":"<p>The time when the <code>BlockToken</code> expires.</p>"
+        },
+        "VolumeSize":{
+          "shape":"VolumeSize",
+          "documentation":"<p>The size of the volume in GB.</p>"
+        },
+        "BlockSize":{
+          "shape":"BlockSize",
+          "documentation":"<p>The size of the block.</p>"
+        },
+        "NextToken":{
+          "shape":"PageToken",
+          "documentation":"<p>The token to use to retrieve the next page of results. This value is null when there are no more results to return.</p>"
+        }
+      }
+    },
+    "MaxResults":{
+      "type":"integer",
+      "max":10000,
+      "min":100
+    },
+    "PageToken":{
+      "type":"string",
+      "max":256,
+      "pattern":"^[A-Za-z0-9+/=]+$"
+    },
+    "ResourceNotFoundException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p>The specified resource does not exist.</p>",
+      "error":{"httpStatusCode":404},
+      "exception":true
+    },
+    "SnapshotId":{
+      "type":"string",
+      "max":64,
+      "min":1,
+      "pattern":"^snap-[0-9a-f]+$"
+    },
+    "TimeStamp":{"type":"timestamp"},
+    "ValidationException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"ErrorMessage"},
+        "Reason":{
+          "shape":"ValidationExceptionReason",
+          "documentation":"<p>The reason for the validation exception.</p>"
+        }
+      },
+      "documentation":"<p>The input fails to satisfy the constraints of the EBS direct APIs.</p>",
+      "error":{"httpStatusCode":400},
+      "exception":true
+    },
+    "ValidationExceptionReason":{
+      "type":"string",
+      "enum":[
+        "INVALID_CUSTOMER_KEY",
+        "INVALID_PAGE_TOKEN",
+        "INVALID_BLOCK_TOKEN",
+        "INVALID_SNAPSHOT_ID",
+        "UNRELATED_SNAPSHOTS"
+      ]
+    },
+    "VolumeSize":{"type":"long"}
+  },
+  "documentation":"<p>You can use the Amazon Elastic Block Store (EBS) direct APIs to directly read the data on your EBS snapshots, and identify the difference between two snapshots. You can view the details of blocks in an EBS snapshot, compare the block difference between two snapshots, and directly access the data in a snapshot. If you’re an independent software vendor (ISV) who offers backup services for EBS, the EBS direct APIs make it easier and more cost-effective to track incremental changes on your EBS volumes via EBS snapshots. This can be done without having to create new volumes from EBS snapshots.</p> <p>This API reference provides detailed information about the actions, data types, parameters, and errors of the EBS direct APIs. For more information about the elements that make up the EBS direct APIs, and examples of how to use them effectively, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ebs-accessing-snapshot.html\">Accessing the Contents of an EBS Snapshot</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>. For more information about the supported AWS Regions, endpoints, and service quotas for the EBS direct APIs, see <a href=\"https://docs.aws.amazon.com/general/latest/gr/ebs-service.html\">Amazon Elastic Block Store Endpoints and Quotas</a> in the <i>AWS General Reference</i>.</p>"
+}
diff --git a/services/ec2/build.properties b/services/ec2/build.properties
index ecf2dae6fcb1..15ec2da1fc71 100644
--- a/services/ec2/build.properties
+++ b/services/ec2/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/ec2/pom.xml b/services/ec2/pom.xml
index ecab67b20c97..9220edd2b98f 100644
--- a/services/ec2/pom.xml
+++ b/services/ec2/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>ec2</artifactId>
     <name>AWS Java SDK :: Services :: Amazon EC2</name>
diff --git a/services/ec2/src/main/java/software/amazon/awssdk/services/ec2/transform/internal/GeneratePreSignUrlInterceptor.java b/services/ec2/src/main/java/software/amazon/awssdk/services/ec2/transform/internal/GeneratePreSignUrlInterceptor.java
index a3954245d8ef..02389a622594 100644
--- a/services/ec2/src/main/java/software/amazon/awssdk/services/ec2/transform/internal/GeneratePreSignUrlInterceptor.java
+++ b/services/ec2/src/main/java/software/amazon/awssdk/services/ec2/transform/internal/GeneratePreSignUrlInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -18,7 +18,9 @@
 import static software.amazon.awssdk.auth.signer.AwsSignerExecutionAttribute.AWS_CREDENTIALS;
 
 import java.net.URI;
+import java.time.Clock;
 import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.SdkTestInternalApi;
 import software.amazon.awssdk.auth.signer.Aws4Signer;
 import software.amazon.awssdk.auth.signer.params.Aws4PresignerParams;
 import software.amazon.awssdk.awscore.util.AwsHostNameUtils;
@@ -40,21 +42,33 @@
 
 /**
  * ExecutionInterceptor that generates a pre-signed URL for copying encrypted snapshots
- * TODO: Is this actually right? What if a different interceptor modifies the message? Should this be treated as a signer?
  */
 @SdkInternalApi
 public final class GeneratePreSignUrlInterceptor implements ExecutionInterceptor {
 
+    private static final URI CUSTOM_ENDPOINT_LOCALHOST = URI.create("http://localhost");
+
     private static final AwsEc2ProtocolFactory PROTOCOL_FACTORY = AwsEc2ProtocolFactory
         .builder()
         // Need an endpoint to marshall but this will be overwritten in modifyHttpRequest
         .clientConfiguration(SdkClientConfiguration.builder()
-                                                   .option(SdkClientOption.ENDPOINT, URI.create("http://localhost"))
+                                                   .option(SdkClientOption.ENDPOINT, CUSTOM_ENDPOINT_LOCALHOST)
                                                    .build())
         .build();
 
     private static final CopySnapshotRequestMarshaller MARSHALLER = new CopySnapshotRequestMarshaller(PROTOCOL_FACTORY);
 
+    private final Clock testClock; // for testing only
+
+    public GeneratePreSignUrlInterceptor() {
+        testClock = null;
+    }
+
+    @SdkTestInternalApi
+    GeneratePreSignUrlInterceptor(Clock testClock) {
+        this.testClock = testClock;
+    }
+
     @Override
     public SdkHttpRequest modifyHttpRequest(Context.ModifyHttpRequest context, ExecutionAttributes executionAttributes) {
         SdkHttpRequest request = context.httpRequest();
@@ -120,6 +134,7 @@ private Aws4PresignerParams getPresignerParams(ExecutionAttributes attributes, S
                                   .signingRegion(Region.of(signingRegion))
                                   .signingName(signingName)
                                   .awsCredentials(attributes.getAttribute(AWS_CREDENTIALS))
+                                  .signingClockOverride(testClock)
                                   .build();
     }
 
@@ -150,6 +165,10 @@ private URI createEndpoint(String regionName, String serviceName) {
                                     .build();
         }
 
-        return Ec2Client.serviceMetadata().endpointFor(region);
+        URI endpoint = Ec2Client.serviceMetadata().endpointFor(region);
+        if (endpoint.getScheme() == null) {
+            return URI.create("https://" + endpoint);
+        }
+        return endpoint;
     }
 }
diff --git a/services/ec2/src/main/java/software/amazon/awssdk/services/ec2/transform/internal/TimestampFormatInterceptor.java b/services/ec2/src/main/java/software/amazon/awssdk/services/ec2/transform/internal/TimestampFormatInterceptor.java
index 8f5a30c09984..0adef4441bc5 100644
--- a/services/ec2/src/main/java/software/amazon/awssdk/services/ec2/transform/internal/TimestampFormatInterceptor.java
+++ b/services/ec2/src/main/java/software/amazon/awssdk/services/ec2/transform/internal/TimestampFormatInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/ec2/src/main/resources/codegen-resources/paginators-1.json b/services/ec2/src/main/resources/codegen-resources/paginators-1.json
index 9789e391180f..c6fa9c83291c 100755
--- a/services/ec2/src/main/resources/codegen-resources/paginators-1.json
+++ b/services/ec2/src/main/resources/codegen-resources/paginators-1.json
@@ -60,6 +60,12 @@
       "output_token": "NextToken",
       "result_key": "ClientVpnTargetNetworks"
     },
+    "DescribeCoipPools": {
+      "input_token": "NextToken",
+      "limit_key": "MaxResults",
+      "output_token": "NextToken",
+      "result_key": "CoipPools"
+    },
     "DescribeConversionTasks": {
       "result_key": "ConversionTasks"
     },
@@ -78,9 +84,21 @@
       "output_token": "NextToken",
       "result_key": "EgressOnlyInternetGateways"
     },
+    "DescribeExportImageTasks": {
+      "input_token": "NextToken",
+      "limit_key": "MaxResults",
+      "output_token": "NextToken",
+      "result_key": "ExportImageTasks"
+    },
     "DescribeExportTasks": {
       "result_key": "ExportTasks"
     },
+    "DescribeFastSnapshotRestores": {
+      "input_token": "NextToken",
+      "limit_key": "MaxResults",
+      "output_token": "NextToken",
+      "result_key": "FastSnapshotRestores"
+    },
     "DescribeFleets": {
       "input_token": "NextToken",
       "limit_key": "MaxResults",
@@ -150,6 +168,18 @@
       "output_token": "NextToken",
       "result_key": "InstanceStatuses"
     },
+    "DescribeInstanceTypeOfferings": {
+      "input_token": "NextToken",
+      "limit_key": "MaxResults",
+      "output_token": "NextToken",
+      "result_key": "InstanceTypeOfferings"
+    },
+    "DescribeInstanceTypes": {
+      "input_token": "NextToken",
+      "limit_key": "MaxResults",
+      "output_token": "NextToken",
+      "result_key": "InstanceTypes"
+    },
     "DescribeInstances": {
       "input_token": "NextToken",
       "limit_key": "MaxResults",
@@ -162,6 +192,12 @@
       "output_token": "NextToken",
       "result_key": "InternetGateways"
     },
+    "DescribeIpv6Pools": {
+      "input_token": "NextToken",
+      "limit_key": "MaxResults",
+      "output_token": "NextToken",
+      "result_key": "Ipv6Pools"
+    },
     "DescribeKeyPairs": {
       "result_key": "KeyPairs"
     },
@@ -177,6 +213,42 @@
       "output_token": "NextToken",
       "result_key": "LaunchTemplates"
     },
+    "DescribeLocalGatewayRouteTableVirtualInterfaceGroupAssociations": {
+      "input_token": "NextToken",
+      "limit_key": "MaxResults",
+      "output_token": "NextToken",
+      "result_key": "LocalGatewayRouteTableVirtualInterfaceGroupAssociations"
+    },
+    "DescribeLocalGatewayRouteTableVpcAssociations": {
+      "input_token": "NextToken",
+      "limit_key": "MaxResults",
+      "output_token": "NextToken",
+      "result_key": "LocalGatewayRouteTableVpcAssociations"
+    },
+    "DescribeLocalGatewayRouteTables": {
+      "input_token": "NextToken",
+      "limit_key": "MaxResults",
+      "output_token": "NextToken",
+      "result_key": "LocalGatewayRouteTables"
+    },
+    "DescribeLocalGatewayVirtualInterfaceGroups": {
+      "input_token": "NextToken",
+      "limit_key": "MaxResults",
+      "output_token": "NextToken",
+      "result_key": "LocalGatewayVirtualInterfaceGroups"
+    },
+    "DescribeLocalGatewayVirtualInterfaces": {
+      "input_token": "NextToken",
+      "limit_key": "MaxResults",
+      "output_token": "NextToken",
+      "result_key": "LocalGatewayVirtualInterfaces"
+    },
+    "DescribeLocalGateways": {
+      "input_token": "NextToken",
+      "limit_key": "MaxResults",
+      "output_token": "NextToken",
+      "result_key": "LocalGateways"
+    },
     "DescribeMovingAddresses": {
       "input_token": "NextToken",
       "limit_key": "MaxResults",
@@ -338,6 +410,18 @@
       "output_token": "NextToken",
       "result_key": "TransitGatewayAttachments"
     },
+    "DescribeTransitGatewayMulticastDomains": {
+      "input_token": "NextToken",
+      "limit_key": "MaxResults",
+      "output_token": "NextToken",
+      "result_key": "TransitGatewayMulticastDomains"
+    },
+    "DescribeTransitGatewayPeeringAttachments": {
+      "input_token": "NextToken",
+      "limit_key": "MaxResults",
+      "output_token": "NextToken",
+      "result_key": "TransitGatewayPeeringAttachments"
+    },
     "DescribeTransitGatewayRouteTables": {
       "input_token": "NextToken",
       "limit_key": "MaxResults",
@@ -428,12 +512,24 @@
     "DescribeVpnGateways": {
       "result_key": "VpnGateways"
     },
+    "GetAssociatedIpv6PoolCidrs": {
+      "input_token": "NextToken",
+      "limit_key": "MaxResults",
+      "output_token": "NextToken",
+      "result_key": "Ipv6CidrAssociations"
+    },
     "GetTransitGatewayAttachmentPropagations": {
       "input_token": "NextToken",
       "limit_key": "MaxResults",
       "output_token": "NextToken",
       "result_key": "TransitGatewayAttachmentPropagations"
     },
+    "GetTransitGatewayMulticastDomainAssociations": {
+      "input_token": "NextToken",
+      "limit_key": "MaxResults",
+      "output_token": "NextToken",
+      "result_key": "MulticastDomainAssociations"
+    },
     "GetTransitGatewayRouteTableAssociations": {
       "input_token": "NextToken",
       "limit_key": "MaxResults",
@@ -445,6 +541,18 @@
       "limit_key": "MaxResults",
       "output_token": "NextToken",
       "result_key": "TransitGatewayRouteTablePropagations"
+    },
+    "SearchLocalGatewayRoutes": {
+      "input_token": "NextToken",
+      "limit_key": "MaxResults",
+      "output_token": "NextToken",
+      "result_key": "Routes"
+    },
+    "SearchTransitGatewayMulticastGroups": {
+      "input_token": "NextToken",
+      "limit_key": "MaxResults",
+      "output_token": "NextToken",
+      "result_key": "MulticastGroups"
     }
   }
 }
\ No newline at end of file
diff --git a/services/ec2/src/main/resources/codegen-resources/service-2.json b/services/ec2/src/main/resources/codegen-resources/service-2.json
index 2b0c870224a9..21b7803c1fdf 100755
--- a/services/ec2/src/main/resources/codegen-resources/service-2.json
+++ b/services/ec2/src/main/resources/codegen-resources/service-2.json
@@ -22,6 +22,16 @@
       "output":{"shape":"AcceptReservedInstancesExchangeQuoteResult"},
       "documentation":"<p>Accepts the Convertible Reserved Instance exchange quote described in the <a>GetReservedInstancesExchangeQuote</a> call.</p>"
     },
+    "AcceptTransitGatewayPeeringAttachment":{
+      "name":"AcceptTransitGatewayPeeringAttachment",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"AcceptTransitGatewayPeeringAttachmentRequest"},
+      "output":{"shape":"AcceptTransitGatewayPeeringAttachmentResult"},
+      "documentation":"<p>Accepts a transit gateway peering attachment request. The peering attachment must be in the <code>pendingAcceptance</code> state.</p>"
+    },
     "AcceptTransitGatewayVpcAttachment":{
       "name":"AcceptTransitGatewayVpcAttachment",
       "http":{
@@ -60,7 +70,7 @@
       },
       "input":{"shape":"AdvertiseByoipCidrRequest"},
       "output":{"shape":"AdvertiseByoipCidrResult"},
-      "documentation":"<p>Advertises an IPv4 address range that is provisioned for use with your AWS resources through bring your own IP addresses (BYOIP).</p> <p>You can perform this operation at most once every 10 seconds, even if you specify different address ranges each time.</p> <p>We recommend that you stop advertising the BYOIP CIDR from other locations when you advertise it from AWS. To minimize down time, you can configure your AWS resources to use an address from a BYOIP CIDR before it is advertised, and then simultaneously stop advertising it from the current location and start advertising it through AWS.</p> <p>It can take a few minutes before traffic to the specified addresses starts routing to AWS because of BGP propagation delays.</p> <p>To stop advertising the BYOIP CIDR, use <a>WithdrawByoipCidr</a>.</p>"
+      "documentation":"<p>Advertises an IPv4 or IPv6 address range that is provisioned for use with your AWS resources through bring your own IP addresses (BYOIP).</p> <p>You can perform this operation at most once every 10 seconds, even if you specify different address ranges each time.</p> <p>We recommend that you stop advertising the BYOIP CIDR from other locations when you advertise it from AWS. To minimize down time, you can configure your AWS resources to use an address from a BYOIP CIDR before it is advertised, and then simultaneously stop advertising it from the current location and start advertising it through AWS.</p> <p>It can take a few minutes before traffic to the specified addresses starts routing to AWS because of BGP propagation delays.</p> <p>To stop advertising the BYOIP CIDR, use <a>WithdrawByoipCidr</a>.</p>"
     },
     "AllocateAddress":{
       "name":"AllocateAddress",
@@ -80,7 +90,7 @@
       },
       "input":{"shape":"AllocateHostsRequest"},
       "output":{"shape":"AllocateHostsResult"},
-      "documentation":"<p>Allocates a Dedicated Host to your account. At a minimum, specify the instance size type, Availability Zone, and quantity of hosts to allocate.</p>"
+      "documentation":"<p>Allocates a Dedicated Host to your account. At a minimum, specify the supported instance type or instance family, the Availability Zone in which to allocate the host, and the number of hosts to allocate.</p>"
     },
     "ApplySecurityGroupsToClientVpnTargetNetwork":{
       "name":"ApplySecurityGroupsToClientVpnTargetNetwork",
@@ -100,7 +110,7 @@
       },
       "input":{"shape":"AssignIpv6AddressesRequest"},
       "output":{"shape":"AssignIpv6AddressesResult"},
-      "documentation":"<p>Assigns one or more IPv6 addresses to the specified network interface. You can specify one or more specific IPv6 addresses, or you can specify the number of IPv6 addresses to be automatically assigned from within the subnet's IPv6 CIDR block range. You can assign as many IPv6 addresses to a network interface as you can assign private IPv4 addresses, and the limit varies per instance type. For information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-eni.html#AvailableIpPerENI\">IP Addresses Per Network Interface Per Instance Type</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>.</p>"
+      "documentation":"<p>Assigns one or more IPv6 addresses to the specified network interface. You can specify one or more specific IPv6 addresses, or you can specify the number of IPv6 addresses to be automatically assigned from within the subnet's IPv6 CIDR block range. You can assign as many IPv6 addresses to a network interface as you can assign private IPv4 addresses, and the limit varies per instance type. For information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-eni.html#AvailableIpPerENI\">IP Addresses Per Network Interface Per Instance Type</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>.</p> <p>You must specify either the IPv6 addresses or the IPv6 address count in the request.</p>"
     },
     "AssignPrivateIpAddresses":{
       "name":"AssignPrivateIpAddresses",
@@ -110,7 +120,7 @@
       },
       "input":{"shape":"AssignPrivateIpAddressesRequest"},
       "output":{"shape":"AssignPrivateIpAddressesResult"},
-      "documentation":"<p>Assigns one or more secondary private IP addresses to the specified network interface.</p> <p>You can specify one or more specific secondary IP addresses, or you can specify the number of secondary IP addresses to be automatically assigned within the subnet's CIDR block range. The number of secondary IP addresses that you can assign to an instance varies by instance type. For information about instance types, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/instance-types.html\">Instance Types</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>. For more information about Elastic IP addresses, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/elastic-ip-addresses-eip.html\">Elastic IP Addresses</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>.</p> <p>When you move a secondary private IP address to another network interface, any Elastic IP address that is associated with the IP address is also moved.</p> <p>Remapping an IP address is an asynchronous operation. When you move an IP address from one network interface to another, check <code>network/interfaces/macs/mac/local-ipv4s</code> in the instance metadata to confirm that the remapping is complete.</p>"
+      "documentation":"<p>Assigns one or more secondary private IP addresses to the specified network interface.</p> <p>You can specify one or more specific secondary IP addresses, or you can specify the number of secondary IP addresses to be automatically assigned within the subnet's CIDR block range. The number of secondary IP addresses that you can assign to an instance varies by instance type. For information about instance types, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/instance-types.html\">Instance Types</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>. For more information about Elastic IP addresses, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/elastic-ip-addresses-eip.html\">Elastic IP Addresses</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>.</p> <p>When you move a secondary private IP address to another network interface, any Elastic IP address that is associated with the IP address is also moved.</p> <p>Remapping an IP address is an asynchronous operation. When you move an IP address from one network interface to another, check <code>network/interfaces/macs/mac/local-ipv4s</code> in the instance metadata to confirm that the remapping is complete.</p> <p>You must specify either the IP addresses or the IP address count in the request.</p>"
     },
     "AssociateAddress":{
       "name":"AssociateAddress",
@@ -120,7 +130,7 @@
       },
       "input":{"shape":"AssociateAddressRequest"},
       "output":{"shape":"AssociateAddressResult"},
-      "documentation":"<p>Associates an Elastic IP address with an instance or a network interface. Before you can use an Elastic IP address, you must allocate it to your account.</p> <p>An Elastic IP address is for use in either the EC2-Classic platform or in a VPC. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/elastic-ip-addresses-eip.html\">Elastic IP Addresses</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>.</p> <p>[EC2-Classic, VPC in an EC2-VPC-only account] If the Elastic IP address is already associated with a different instance, it is disassociated from that instance and associated with the specified instance. If you associate an Elastic IP address with an instance that has an existing Elastic IP address, the existing address is disassociated from the instance, but remains allocated to your account.</p> <p>[VPC in an EC2-Classic account] If you don't specify a private IP address, the Elastic IP address is associated with the primary IP address. If the Elastic IP address is already associated with a different instance or a network interface, you get an error unless you allow reassociation. You cannot associate an Elastic IP address with an instance or network interface that has an existing Elastic IP address.</p> <important> <p>This is an idempotent operation. If you perform the operation more than once, Amazon EC2 doesn't return an error, and you may be charged for each time the Elastic IP address is remapped to the same instance. For more information, see the <i>Elastic IP Addresses</i> section of <a href=\"http://aws.amazon.com/ec2/pricing/\">Amazon EC2 Pricing</a>.</p> </important>"
+      "documentation":"<p>Associates an Elastic IP address with an instance or a network interface. Before you can use an Elastic IP address, you must allocate it to your account.</p> <p>An Elastic IP address is for use in either the EC2-Classic platform or in a VPC. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/elastic-ip-addresses-eip.html\">Elastic IP Addresses</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>.</p> <p>[EC2-Classic, VPC in an EC2-VPC-only account] If the Elastic IP address is already associated with a different instance, it is disassociated from that instance and associated with the specified instance. If you associate an Elastic IP address with an instance that has an existing Elastic IP address, the existing address is disassociated from the instance, but remains allocated to your account.</p> <p>[VPC in an EC2-Classic account] If you don't specify a private IP address, the Elastic IP address is associated with the primary IP address. If the Elastic IP address is already associated with a different instance or a network interface, you get an error unless you allow reassociation. You cannot associate an Elastic IP address with an instance or network interface that has an existing Elastic IP address.</p> <p>You cannot associate an Elastic IP address with an interface in a different network border group.</p> <important> <p>This is an idempotent operation. If you perform the operation more than once, Amazon EC2 doesn't return an error, and you may be charged for each time the Elastic IP address is remapped to the same instance. For more information, see the <i>Elastic IP Addresses</i> section of <a href=\"http://aws.amazon.com/ec2/pricing/\">Amazon EC2 Pricing</a>.</p> </important>"
     },
     "AssociateClientVpnTargetNetwork":{
       "name":"AssociateClientVpnTargetNetwork",
@@ -130,7 +140,7 @@
       },
       "input":{"shape":"AssociateClientVpnTargetNetworkRequest"},
       "output":{"shape":"AssociateClientVpnTargetNetworkResult"},
-      "documentation":"<p>Associates a target network with a Client VPN endpoint. A target network is a subnet in a VPC. You can associate multiple subnets from the same VPC with a Client VPN endpoint. You can associate only one subnet in each Availability Zone. We recommend that you associate at least two subnets to provide Availability Zone redundancy.</p>"
+      "documentation":"<p>Associates a target network with a Client VPN endpoint. A target network is a subnet in a VPC. You can associate multiple subnets from the same VPC with a Client VPN endpoint. You can associate only one subnet in each Availability Zone. We recommend that you associate at least two subnets to provide Availability Zone redundancy.</p> <p>If you specified a VPC when you created the Client VPN endpoint or if you have previous subnet associations, the specified subnet must be in the same VPC. To specify a subnet that's in a different VPC, you must first modify the Client VPN endpoint (<a>ModifyClientVpnEndpoint</a>) and change the VPC that's associated with it.</p>"
     },
     "AssociateDhcpOptions":{
       "name":"AssociateDhcpOptions",
@@ -159,7 +169,7 @@
       },
       "input":{"shape":"AssociateRouteTableRequest"},
       "output":{"shape":"AssociateRouteTableResult"},
-      "documentation":"<p>Associates a subnet with a route table. The subnet and route table must be in the same VPC. This association causes traffic originating from the subnet to be routed according to the routes in the route table. The action returns an association ID, which you need in order to disassociate the route table from the subnet later. A route table can be associated with multiple subnets.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/vpc/latest/userguide/VPC_Route_Tables.html\">Route Tables</a> in the <i>Amazon Virtual Private Cloud User Guide</i>.</p>"
+      "documentation":"<p>Associates a subnet in your VPC or an internet gateway or virtual private gateway attached to your VPC with a route table in your VPC. This association causes traffic from the subnet or gateway to be routed according to the routes in the route table. The action returns an association ID, which you need in order to disassociate the route table later. A route table can be associated with multiple subnets.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/vpc/latest/userguide/VPC_Route_Tables.html\">Route Tables</a> in the <i>Amazon Virtual Private Cloud User Guide</i>.</p>"
     },
     "AssociateSubnetCidrBlock":{
       "name":"AssociateSubnetCidrBlock",
@@ -171,6 +181,16 @@
       "output":{"shape":"AssociateSubnetCidrBlockResult"},
       "documentation":"<p>Associates a CIDR block with your subnet. You can only associate a single IPv6 CIDR block with your subnet. An IPv6 CIDR block must have a prefix length of /64.</p>"
     },
+    "AssociateTransitGatewayMulticastDomain":{
+      "name":"AssociateTransitGatewayMulticastDomain",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"AssociateTransitGatewayMulticastDomainRequest"},
+      "output":{"shape":"AssociateTransitGatewayMulticastDomainResult"},
+      "documentation":"<p>Associates the specified subnets and transit gateway attachments with the specified transit gateway multicast domain.</p> <p>The transit gateway attachment must be in the available state before you can add a resource. Use <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_DescribeTransitGatewayAttachments.html\">DescribeTransitGatewayAttachments</a> to see the state of the attachment.</p>"
+    },
     "AssociateTransitGatewayRouteTable":{
       "name":"AssociateTransitGatewayRouteTable",
       "http":{
@@ -189,7 +209,7 @@
       },
       "input":{"shape":"AssociateVpcCidrBlockRequest"},
       "output":{"shape":"AssociateVpcCidrBlockResult"},
-      "documentation":"<p>Associates a CIDR block with your VPC. You can associate a secondary IPv4 CIDR block, or you can associate an Amazon-provided IPv6 CIDR block. The IPv6 CIDR block size is fixed at /56.</p> <p>For more information about associating CIDR blocks with your VPC and applicable restrictions, see <a href=\"https://docs.aws.amazon.com/vpc/latest/userguide/VPC_Subnets.html#VPC_Sizing\">VPC and Subnet Sizing</a> in the <i>Amazon Virtual Private Cloud User Guide</i>.</p>"
+      "documentation":"<p>Associates a CIDR block with your VPC. You can associate a secondary IPv4 CIDR block, an Amazon-provided IPv6 CIDR block, or an IPv6 CIDR block from an IPv6 address pool that you provisioned through bring your own IP addresses (<a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-byoip.html\">BYOIP</a>). The IPv6 CIDR block size is fixed at /56.</p> <p>You must specify one of the following in the request: an IPv4 CIDR block, an IPv6 pool, or an Amazon-provided IPv6 CIDR block.</p> <p>For more information about associating CIDR blocks with your VPC and applicable restrictions, see <a href=\"https://docs.aws.amazon.com/vpc/latest/userguide/VPC_Subnets.html#VPC_Sizing\">VPC and Subnet Sizing</a> in the <i>Amazon Virtual Private Cloud User Guide</i>.</p>"
     },
     "AttachClassicLinkVpc":{
       "name":"AttachClassicLinkVpc",
@@ -208,7 +228,7 @@
         "requestUri":"/"
       },
       "input":{"shape":"AttachInternetGatewayRequest"},
-      "documentation":"<p>Attaches an internet gateway to a VPC, enabling connectivity between the internet and the VPC. For more information about your VPC and internet gateway, see the <a href=\"https://docs.aws.amazon.com/vpc/latest/userguide/\">Amazon Virtual Private Cloud User Guide</a>.</p>"
+      "documentation":"<p>Attaches an internet gateway or a virtual private gateway to a VPC, enabling connectivity between the internet and the VPC. For more information about your VPC and internet gateway, see the <a href=\"https://docs.aws.amazon.com/vpc/latest/userguide/\">Amazon Virtual Private Cloud User Guide</a>.</p>"
     },
     "AttachNetworkInterface":{
       "name":"AttachNetworkInterface",
@@ -434,7 +454,7 @@
       },
       "input":{"shape":"CreateCustomerGatewayRequest"},
       "output":{"shape":"CreateCustomerGatewayResult"},
-      "documentation":"<p>Provides information to AWS about your VPN customer gateway device. The customer gateway is the appliance at your end of the VPN connection. (The device on the AWS side of the VPN connection is the virtual private gateway.) You must provide the Internet-routable IP address of the customer gateway's external interface. The IP address must be static and can be behind a device performing network address translation (NAT).</p> <p>For devices that use Border Gateway Protocol (BGP), you can also provide the device's BGP Autonomous System Number (ASN). You can use an existing ASN assigned to your network. If you don't have an ASN already, you can use a private ASN (in the 64512 - 65534 range).</p> <note> <p>Amazon EC2 supports all 2-byte ASN numbers in the range of 1 - 65534, with the exception of 7224, which is reserved in the <code>us-east-1</code> Region, and 9059, which is reserved in the <code>eu-west-1</code> Region.</p> </note> <p>For more information, see <a href=\"https://docs.aws.amazon.com/vpn/latest/s2svpn/VPC_VPN.html\">AWS Site-to-Site VPN</a> in the <i>AWS Site-to-Site VPN User Guide</i>.</p> <important> <p>You cannot create more than one customer gateway with the same VPN type, IP address, and BGP ASN parameter values. If you run an identical request more than one time, the first request creates the customer gateway, and subsequent requests return information about the existing customer gateway. The subsequent requests do not create new customer gateway resources.</p> </important>"
+      "documentation":"<p>Provides information to AWS about your VPN customer gateway device. The customer gateway is the appliance at your end of the VPN connection. (The device on the AWS side of the VPN connection is the virtual private gateway.) You must provide the Internet-routable IP address of the customer gateway's external interface. The IP address must be static and can be behind a device performing network address translation (NAT).</p> <p>For devices that use Border Gateway Protocol (BGP), you can also provide the device's BGP Autonomous System Number (ASN). You can use an existing ASN assigned to your network. If you don't have an ASN already, you can use a private ASN (in the 64512 - 65534 range).</p> <note> <p>Amazon EC2 supports all 2-byte ASN numbers in the range of 1 - 65534, with the exception of 7224, which is reserved in the <code>us-east-1</code> Region, and 9059, which is reserved in the <code>eu-west-1</code> Region.</p> </note> <p>For more information, see <a href=\"https://docs.aws.amazon.com/vpn/latest/s2svpn/VPC_VPN.html\">AWS Site-to-Site VPN</a> in the <i>AWS Site-to-Site VPN User Guide</i>.</p> <important> <p>To create more than one customer gateway with the same VPN type, IP address, and BGP ASN, specify a unique device name for each customer gateway. Identical requests return information about the existing customer gateway and do not create new customer gateways.</p> </important>"
     },
     "CreateDefaultSubnet":{
       "name":"CreateDefaultSubnet",
@@ -566,6 +586,26 @@
       "output":{"shape":"CreateLaunchTemplateVersionResult"},
       "documentation":"<p>Creates a new version for a launch template. You can specify an existing version of launch template from which to base the new version.</p> <p>Launch template versions are numbered in the order in which they are created. You cannot specify, change, or replace the numbering of launch template versions.</p>"
     },
+    "CreateLocalGatewayRoute":{
+      "name":"CreateLocalGatewayRoute",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"CreateLocalGatewayRouteRequest"},
+      "output":{"shape":"CreateLocalGatewayRouteResult"},
+      "documentation":"<p>Creates a static route for the specified local gateway route table.</p>"
+    },
+    "CreateLocalGatewayRouteTableVpcAssociation":{
+      "name":"CreateLocalGatewayRouteTableVpcAssociation",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"CreateLocalGatewayRouteTableVpcAssociationRequest"},
+      "output":{"shape":"CreateLocalGatewayRouteTableVpcAssociationResult"},
+      "documentation":"<p>Associates the specified VPC with the specified local gateway route table.</p>"
+    },
     "CreateNatGateway":{
       "name":"CreateNatGateway",
       "http":{
@@ -642,7 +682,7 @@
       },
       "input":{"shape":"CreateRouteRequest"},
       "output":{"shape":"CreateRouteResult"},
-      "documentation":"<p>Creates a route in a route table within a VPC.</p> <p>You must specify one of the following targets: internet gateway or virtual private gateway, NAT instance, NAT gateway, VPC peering connection, network interface, or egress-only internet gateway.</p> <p>When determining how to route traffic, we use the route with the most specific match. For example, traffic is destined for the IPv4 address <code>192.0.2.3</code>, and the route table includes the following two IPv4 routes:</p> <ul> <li> <p> <code>192.0.2.0/24</code> (goes to some target A)</p> </li> <li> <p> <code>192.0.2.0/28</code> (goes to some target B)</p> </li> </ul> <p>Both routes apply to the traffic destined for <code>192.0.2.3</code>. However, the second route in the list covers a smaller number of IP addresses and is therefore more specific, so we use that route to determine where to target the traffic.</p> <p>For more information about route tables, see <a href=\"https://docs.aws.amazon.com/vpc/latest/userguide/VPC_Route_Tables.html\">Route Tables</a> in the <i>Amazon Virtual Private Cloud User Guide</i>.</p>"
+      "documentation":"<p>Creates a route in a route table within a VPC.</p> <p>You must specify one of the following targets: internet gateway or virtual private gateway, NAT instance, NAT gateway, VPC peering connection, network interface, egress-only internet gateway, or transit gateway.</p> <p>When determining how to route traffic, we use the route with the most specific match. For example, traffic is destined for the IPv4 address <code>192.0.2.3</code>, and the route table includes the following two IPv4 routes:</p> <ul> <li> <p> <code>192.0.2.0/24</code> (goes to some target A)</p> </li> <li> <p> <code>192.0.2.0/28</code> (goes to some target B)</p> </li> </ul> <p>Both routes apply to the traffic destined for <code>192.0.2.3</code>. However, the second route in the list covers a smaller number of IP addresses and is therefore more specific, so we use that route to determine where to target the traffic.</p> <p>For more information about route tables, see <a href=\"https://docs.aws.amazon.com/vpc/latest/userguide/VPC_Route_Tables.html\">Route Tables</a> in the <i>Amazon Virtual Private Cloud User Guide</i>.</p>"
     },
     "CreateRouteTable":{
       "name":"CreateRouteTable",
@@ -682,7 +722,7 @@
       },
       "input":{"shape":"CreateSnapshotsRequest"},
       "output":{"shape":"CreateSnapshotsResult"},
-      "documentation":"<p>Creates crash-consistent snapshots of multiple EBS volumes and stores the data in S3. Volumes are chosen by specifying an instance. Any attached volumes will produce one snapshot each that is crash-consistent across the instance. Boot volumes can be excluded by changing the paramaters. </p>"
+      "documentation":"<p>Creates crash-consistent snapshots of multiple EBS volumes and stores the data in S3. Volumes are chosen by specifying an instance. Any attached volumes will produce one snapshot each that is crash-consistent across the instance. Boot volumes can be excluded by changing the parameters. </p>"
     },
     "CreateSpotDatafeedSubscription":{
       "name":"CreateSpotDatafeedSubscription",
@@ -721,7 +761,7 @@
       },
       "input":{"shape":"CreateTrafficMirrorFilterRequest"},
       "output":{"shape":"CreateTrafficMirrorFilterResult"},
-      "documentation":"<p>Creates a Traffic Mirror filter.</p> <p>A Traffic Mirror filter is a set of rules that defines the traffic to mirror.</p> <p>By default, no traffic is mirrored. To mirror traffic, use <a>CreateTrafficMirrorFilterRule</a> to add Traffic Mirror rules to the filter. The rules you add define what traffic gets mirrored. You can also use <a>ModifyTrafficMirrorFilterNetworkServices</a> to mirror supported network services.</p>"
+      "documentation":"<p>Creates a Traffic Mirror filter.</p> <p>A Traffic Mirror filter is a set of rules that defines the traffic to mirror.</p> <p>By default, no traffic is mirrored. To mirror traffic, use <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CreateTrafficMirrorFilterRule.htm\">CreateTrafficMirrorFilterRule</a> to add Traffic Mirror rules to the filter. The rules you add define what traffic gets mirrored. You can also use <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_ModifyTrafficMirrorFilterNetworkServices.html\">ModifyTrafficMirrorFilterNetworkServices</a> to mirror supported network services.</p>"
     },
     "CreateTrafficMirrorFilterRule":{
       "name":"CreateTrafficMirrorFilterRule",
@@ -731,7 +771,7 @@
       },
       "input":{"shape":"CreateTrafficMirrorFilterRuleRequest"},
       "output":{"shape":"CreateTrafficMirrorFilterRuleResult"},
-      "documentation":"<p>Creates a Traffic Mirror rule. </p> <p>A Traffic Mirror rule defines the Traffic Mirror source traffic to mirror.</p> <p>You need the Traffic Mirror filter ID when you create the rule.</p>"
+      "documentation":"<p>Creates a Traffic Mirror filter rule. </p> <p>A Traffic Mirror rule defines the Traffic Mirror source traffic to mirror.</p> <p>You need the Traffic Mirror filter ID when you create the rule.</p>"
     },
     "CreateTrafficMirrorSession":{
       "name":"CreateTrafficMirrorSession",
@@ -741,7 +781,7 @@
       },
       "input":{"shape":"CreateTrafficMirrorSessionRequest"},
       "output":{"shape":"CreateTrafficMirrorSessionResult"},
-      "documentation":"<p>Creates a Traffic Mirror session.</p> <p>A Traffic Mirror session actively copies packets from a Traffic Mirror source to a Traffic Mirror target. Create a filter, and then assign it to the session to define a subset of the traffic to mirror, for example all TCP traffic.</p> <p>The Traffic Mirror source and the Traffic Mirror target (monitoring appliances) can be in the same VPC, or in a different VPC connected via VPC peering or a transit gateway. </p> <p>By default, no traffic is mirrored. Use <a>CreateTrafficMirrorFilter</a> to create filter rules that specify the traffic to mirror.</p>"
+      "documentation":"<p>Creates a Traffic Mirror session.</p> <p>A Traffic Mirror session actively copies packets from a Traffic Mirror source to a Traffic Mirror target. Create a filter, and then assign it to the session to define a subset of the traffic to mirror, for example all TCP traffic.</p> <p>The Traffic Mirror source and the Traffic Mirror target (monitoring appliances) can be in the same VPC, or in a different VPC connected via VPC peering or a transit gateway. </p> <p>By default, no traffic is mirrored. Use <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CreateTrafficMirrorFilter.htm\">CreateTrafficMirrorFilter</a> to create filter rules that specify the traffic to mirror.</p>"
     },
     "CreateTrafficMirrorTarget":{
       "name":"CreateTrafficMirrorTarget",
@@ -751,7 +791,7 @@
       },
       "input":{"shape":"CreateTrafficMirrorTargetRequest"},
       "output":{"shape":"CreateTrafficMirrorTargetResult"},
-      "documentation":"<p>Creates a target for your Traffic Mirror session.</p> <p>A Traffic Mirror target is the destination for mirrored traffic. The Traffic Mirror source and the Traffic Mirror target (monitoring appliances) can be in the same VPC, or in different VPCs connected via VPC peering or a transit gateway.</p> <p>A Traffic Mirror target can be a network interface, or a Network Load Balancer.</p> <p>To use the target in a Traffic Mirror session, use <a>CreateTrafficMirrorSession</a>.</p>"
+      "documentation":"<p>Creates a target for your Traffic Mirror session.</p> <p>A Traffic Mirror target is the destination for mirrored traffic. The Traffic Mirror source and the Traffic Mirror target (monitoring appliances) can be in the same VPC, or in different VPCs connected via VPC peering or a transit gateway.</p> <p>A Traffic Mirror target can be a network interface, or a Network Load Balancer.</p> <p>To use the target in a Traffic Mirror session, use <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CreateTrafficMirrorSession.htm\">CreateTrafficMirrorSession</a>.</p>"
     },
     "CreateTransitGateway":{
       "name":"CreateTransitGateway",
@@ -763,6 +803,26 @@
       "output":{"shape":"CreateTransitGatewayResult"},
       "documentation":"<p>Creates a transit gateway.</p> <p>You can use a transit gateway to interconnect your virtual private clouds (VPC) and on-premises networks. After the transit gateway enters the <code>available</code> state, you can attach your VPCs and VPN connections to the transit gateway.</p> <p>To attach your VPCs, use <a>CreateTransitGatewayVpcAttachment</a>.</p> <p>To attach a VPN connection, use <a>CreateCustomerGateway</a> to create a customer gateway and specify the ID of the customer gateway and the ID of the transit gateway in a call to <a>CreateVpnConnection</a>.</p> <p>When you create a transit gateway, we create a default transit gateway route table and use it as the default association route table and the default propagation route table. You can use <a>CreateTransitGatewayRouteTable</a> to create additional transit gateway route tables. If you disable automatic route propagation, we do not create a default transit gateway route table. You can use <a>EnableTransitGatewayRouteTablePropagation</a> to propagate routes from a resource attachment to a transit gateway route table. If you disable automatic associations, you can use <a>AssociateTransitGatewayRouteTable</a> to associate a resource attachment with a transit gateway route table.</p>"
     },
+    "CreateTransitGatewayMulticastDomain":{
+      "name":"CreateTransitGatewayMulticastDomain",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"CreateTransitGatewayMulticastDomainRequest"},
+      "output":{"shape":"CreateTransitGatewayMulticastDomainResult"},
+      "documentation":"<p>Creates a multicast domain using the specified transit gateway.</p> <p>The transit gateway must be in the available state before you create a domain. Use <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_DescribeTransitGateways.html\">DescribeTransitGateways</a> to see the state of transit gateway.</p>"
+    },
+    "CreateTransitGatewayPeeringAttachment":{
+      "name":"CreateTransitGatewayPeeringAttachment",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"CreateTransitGatewayPeeringAttachmentRequest"},
+      "output":{"shape":"CreateTransitGatewayPeeringAttachmentResult"},
+      "documentation":"<p>Requests a transit gateway peering attachment between the specified transit gateway (requester) and a peer transit gateway (accepter). The transit gateways must be in different Regions. The peer transit gateway can be in your account or a different AWS account. </p> <p>After you create the peering attachment, the owner of the accepter transit gateway must accept the attachment request.</p>"
+    },
     "CreateTransitGatewayRoute":{
       "name":"CreateTransitGatewayRoute",
       "http":{
@@ -811,7 +871,7 @@
       },
       "input":{"shape":"CreateVpcRequest"},
       "output":{"shape":"CreateVpcResult"},
-      "documentation":"<p>Creates a VPC with the specified IPv4 CIDR block. The smallest VPC you can create uses a /28 netmask (16 IPv4 addresses), and the largest uses a /16 netmask (65,536 IPv4 addresses). For more information about how large to make your VPC, see <a href=\"https://docs.aws.amazon.com/vpc/latest/userguide/VPC_Subnets.html\">Your VPC and Subnets</a> in the <i>Amazon Virtual Private Cloud User Guide</i>.</p> <p>You can optionally request an Amazon-provided IPv6 CIDR block for the VPC. The IPv6 CIDR block uses a /56 prefix length, and is allocated from Amazon's pool of IPv6 addresses. You cannot choose the IPv6 range for your VPC.</p> <p>By default, each instance you launch in the VPC has the default DHCP options, which include only a default DNS server that we provide (AmazonProvidedDNS). For more information, see <a href=\"https://docs.aws.amazon.com/vpc/latest/userguide/VPC_DHCP_Options.html\">DHCP Options Sets</a> in the <i>Amazon Virtual Private Cloud User Guide</i>.</p> <p>You can specify the instance tenancy value for the VPC when you create it. You can't change this value for the VPC after you create it. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/dedicated-instance.html\">Dedicated Instances</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>.</p>"
+      "documentation":"<p>Creates a VPC with the specified IPv4 CIDR block. The smallest VPC you can create uses a /28 netmask (16 IPv4 addresses), and the largest uses a /16 netmask (65,536 IPv4 addresses). For more information about how large to make your VPC, see <a href=\"https://docs.aws.amazon.com/vpc/latest/userguide/VPC_Subnets.html\">Your VPC and Subnets</a> in the <i>Amazon Virtual Private Cloud User Guide</i>.</p> <p>You can optionally request an IPv6 CIDR block for the VPC. You can request an Amazon-provided IPv6 CIDR block from Amazon's pool of IPv6 addresses, or an IPv6 CIDR block from an IPv6 address pool that you provisioned through bring your own IP addresses (<a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-byoip.html\">BYOIP</a>).</p> <p>By default, each instance you launch in the VPC has the default DHCP options, which include only a default DNS server that we provide (AmazonProvidedDNS). For more information, see <a href=\"https://docs.aws.amazon.com/vpc/latest/userguide/VPC_DHCP_Options.html\">DHCP Options Sets</a> in the <i>Amazon Virtual Private Cloud User Guide</i>.</p> <p>You can specify the instance tenancy value for the VPC when you create it. You can't change this value for the VPC after you create it. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/dedicated-instance.html\">Dedicated Instances</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>.</p>"
     },
     "CreateVpcEndpoint":{
       "name":"CreateVpcEndpoint",
@@ -821,7 +881,7 @@
       },
       "input":{"shape":"CreateVpcEndpointRequest"},
       "output":{"shape":"CreateVpcEndpointResult"},
-      "documentation":"<p>Creates a VPC endpoint for a specified service. An endpoint enables you to create a private connection between your VPC and the service. The service may be provided by AWS, an AWS Marketplace partner, or another AWS account. For more information, see <a href=\"https://docs.aws.amazon.com/vpc/latest/userguide/vpc-endpoints.html\">VPC Endpoints</a> in the <i>Amazon Virtual Private Cloud User Guide</i>.</p> <p>A <code>gateway</code> endpoint serves as a target for a route in your route table for traffic destined for the AWS service. You can specify an endpoint policy to attach to the endpoint that will control access to the service from your VPC. You can also specify the VPC route tables that use the endpoint.</p> <p>An <code>interface</code> endpoint is a network interface in your subnet that serves as an endpoint for communicating with the specified service. You can specify the subnets in which to create an endpoint, and the security groups to associate with the endpoint network interface.</p> <p>Use <a>DescribeVpcEndpointServices</a> to get a list of supported services.</p>"
+      "documentation":"<p>Creates a VPC endpoint for a specified service. An endpoint enables you to create a private connection between your VPC and the service. The service may be provided by AWS, an AWS Marketplace Partner, or another AWS account. For more information, see <a href=\"https://docs.aws.amazon.com/vpc/latest/userguide/vpc-endpoints.html\">VPC Endpoints</a> in the <i>Amazon Virtual Private Cloud User Guide</i>.</p> <p>A <code>gateway</code> endpoint serves as a target for a route in your route table for traffic destined for the AWS service. You can specify an endpoint policy to attach to the endpoint, which will control access to the service from your VPC. You can also specify the VPC route tables that use the endpoint.</p> <p>An <code>interface</code> endpoint is a network interface in your subnet that serves as an endpoint for communicating with the specified service. You can specify the subnets in which to create an endpoint, and the security groups to associate with the endpoint network interface.</p> <p>Use <a>DescribeVpcEndpointServices</a> to get a list of supported services.</p>"
     },
     "CreateVpcEndpointConnectionNotification":{
       "name":"CreateVpcEndpointConnectionNotification",
@@ -841,7 +901,7 @@
       },
       "input":{"shape":"CreateVpcEndpointServiceConfigurationRequest"},
       "output":{"shape":"CreateVpcEndpointServiceConfigurationResult"},
-      "documentation":"<p>Creates a VPC endpoint service configuration to which service consumers (AWS accounts, IAM users, and IAM roles) can connect. Service consumers can create an interface VPC endpoint to connect to your service.</p> <p>To create an endpoint service configuration, you must first create a Network Load Balancer for your service. For more information, see <a href=\"https://docs.aws.amazon.com/vpc/latest/userguide/endpoint-service.html\">VPC Endpoint Services</a> in the <i>Amazon Virtual Private Cloud User Guide</i>. </p>"
+      "documentation":"<p>Creates a VPC endpoint service configuration to which service consumers (AWS accounts, IAM users, and IAM roles) can connect. Service consumers can create an interface VPC endpoint to connect to your service.</p> <p>To create an endpoint service configuration, you must first create a Network Load Balancer for your service. For more information, see <a href=\"https://docs.aws.amazon.com/vpc/latest/userguide/endpoint-service.html\">VPC Endpoint Services</a> in the <i>Amazon Virtual Private Cloud User Guide</i>. </p> <p>If you set the private DNS name, you must prove that you own the private DNS domain name. For more information, see <a href=\"https://docs.aws.amazon.com/vpc/latest/userguide/endpoint-services-dns-validation.html\">VPC Endpoint Service Private DNS Name Verification</a> in the <i>Amazon Virtual Private Cloud User Guide</i>.</p>"
     },
     "CreateVpcPeeringConnection":{
       "name":"CreateVpcPeeringConnection",
@@ -998,6 +1058,26 @@
       "output":{"shape":"DeleteLaunchTemplateVersionsResult"},
       "documentation":"<p>Deletes one or more versions of a launch template. You cannot delete the default version of a launch template; you must first assign a different version as the default. If the default version is the only version for the launch template, you must delete the entire launch template using <a>DeleteLaunchTemplate</a>.</p>"
     },
+    "DeleteLocalGatewayRoute":{
+      "name":"DeleteLocalGatewayRoute",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DeleteLocalGatewayRouteRequest"},
+      "output":{"shape":"DeleteLocalGatewayRouteResult"},
+      "documentation":"<p>Deletes the specified route from the specified local gateway route table.</p>"
+    },
+    "DeleteLocalGatewayRouteTableVpcAssociation":{
+      "name":"DeleteLocalGatewayRouteTableVpcAssociation",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DeleteLocalGatewayRouteTableVpcAssociationRequest"},
+      "output":{"shape":"DeleteLocalGatewayRouteTableVpcAssociationResult"},
+      "documentation":"<p>Deletes the specified association between a VPC and local gateway route table.</p>"
+    },
     "DeleteNatGateway":{
       "name":"DeleteNatGateway",
       "http":{
@@ -1177,6 +1257,26 @@
       "output":{"shape":"DeleteTransitGatewayResult"},
       "documentation":"<p>Deletes the specified transit gateway.</p>"
     },
+    "DeleteTransitGatewayMulticastDomain":{
+      "name":"DeleteTransitGatewayMulticastDomain",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DeleteTransitGatewayMulticastDomainRequest"},
+      "output":{"shape":"DeleteTransitGatewayMulticastDomainResult"},
+      "documentation":"<p>Deletes the specified transit gateway multicast domain.</p>"
+    },
+    "DeleteTransitGatewayPeeringAttachment":{
+      "name":"DeleteTransitGatewayPeeringAttachment",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DeleteTransitGatewayPeeringAttachmentRequest"},
+      "output":{"shape":"DeleteTransitGatewayPeeringAttachmentResult"},
+      "documentation":"<p>Deletes a transit gateway peering attachment.</p>"
+    },
     "DeleteTransitGatewayRoute":{
       "name":"DeleteTransitGatewayRoute",
       "http":{
@@ -1290,7 +1390,7 @@
         "requestUri":"/"
       },
       "input":{"shape":"DeleteVpnGatewayRequest"},
-      "documentation":"<p>Deletes the specified virtual private gateway. We recommend that before you delete a virtual private gateway, you detach it from the VPC and delete the VPN connection. Note that you don't need to delete the virtual private gateway if you plan to delete and recreate the VPN connection between your VPC and your network.</p>"
+      "documentation":"<p>Deletes the specified virtual private gateway. You must first detach the virtual private gateway from the VPC. Note that you don't need to delete the virtual private gateway if you plan to delete and recreate the VPN connection between your VPC and your network.</p>"
     },
     "DeprovisionByoipCidr":{
       "name":"DeprovisionByoipCidr",
@@ -1311,6 +1411,26 @@
       "input":{"shape":"DeregisterImageRequest"},
       "documentation":"<p>Deregisters the specified AMI. After you deregister an AMI, it can't be used to launch new instances; however, it doesn't affect any instances that you've already launched from the AMI. You'll continue to incur usage costs for those instances until you terminate them.</p> <p>When you deregister an Amazon EBS-backed AMI, it doesn't affect the snapshot that was created for the root volume of the instance during the AMI creation process. When you deregister an instance store-backed AMI, it doesn't affect the files that you uploaded to Amazon S3 when you created the AMI.</p>"
     },
+    "DeregisterTransitGatewayMulticastGroupMembers":{
+      "name":"DeregisterTransitGatewayMulticastGroupMembers",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DeregisterTransitGatewayMulticastGroupMembersRequest"},
+      "output":{"shape":"DeregisterTransitGatewayMulticastGroupMembersResult"},
+      "documentation":"<p>Deregisters the specified members (network interfaces) from the transit gateway multicast group.</p>"
+    },
+    "DeregisterTransitGatewayMulticastGroupSources":{
+      "name":"DeregisterTransitGatewayMulticastGroupSources",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DeregisterTransitGatewayMulticastGroupSourcesRequest"},
+      "output":{"shape":"DeregisterTransitGatewayMulticastGroupSourcesResult"},
+      "documentation":"<p>Deregisters the specified sources (network interfaces) from the transit gateway multicast group.</p>"
+    },
     "DescribeAccountAttributes":{
       "name":"DescribeAccountAttributes",
       "http":{
@@ -1319,7 +1439,7 @@
       },
       "input":{"shape":"DescribeAccountAttributesRequest"},
       "output":{"shape":"DescribeAccountAttributesResult"},
-      "documentation":"<p>Describes attributes of your AWS account. The following are the supported account attributes:</p> <ul> <li> <p> <code>supported-platforms</code>: Indicates whether your account can launch instances into EC2-Classic and EC2-VPC, or only into EC2-VPC.</p> </li> <li> <p> <code>default-vpc</code>: The ID of the default VPC for your account, or <code>none</code>.</p> </li> <li> <p> <code>max-instances</code>: The maximum number of On-Demand Instances that you can run.</p> </li> <li> <p> <code>vpc-max-security-groups-per-interface</code>: The maximum number of security groups that you can assign to a network interface.</p> </li> <li> <p> <code>max-elastic-ips</code>: The maximum number of Elastic IP addresses that you can allocate for use with EC2-Classic. </p> </li> <li> <p> <code>vpc-max-elastic-ips</code>: The maximum number of Elastic IP addresses that you can allocate for use with EC2-VPC.</p> </li> </ul>"
+      "documentation":"<p>Describes attributes of your AWS account. The following are the supported account attributes:</p> <ul> <li> <p> <code>supported-platforms</code>: Indicates whether your account can launch instances into EC2-Classic and EC2-VPC, or only into EC2-VPC.</p> </li> <li> <p> <code>default-vpc</code>: The ID of the default VPC for your account, or <code>none</code>.</p> </li> <li> <p> <code>max-instances</code>: This attribute is no longer supported. The returned value does not reflect your actual vCPU limit for running On-Demand Instances. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-on-demand-instances.html#ec2-on-demand-instances-limits\">On-Demand Instance Limits</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>.</p> </li> <li> <p> <code>vpc-max-security-groups-per-interface</code>: The maximum number of security groups that you can assign to a network interface.</p> </li> <li> <p> <code>max-elastic-ips</code>: The maximum number of Elastic IP addresses that you can allocate for use with EC2-Classic. </p> </li> <li> <p> <code>vpc-max-elastic-ips</code>: The maximum number of Elastic IP addresses that you can allocate for use with EC2-VPC.</p> </li> </ul>"
     },
     "DescribeAddresses":{
       "name":"DescribeAddresses",
@@ -1349,7 +1469,7 @@
       },
       "input":{"shape":"DescribeAvailabilityZonesRequest"},
       "output":{"shape":"DescribeAvailabilityZonesResult"},
-      "documentation":"<p>Describes the Availability Zones that are available to you. The results include zones only for the Region you're currently using. If there is an event impacting an Availability Zone, you can use this request to view the state and any provided message for that Availability Zone.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-regions-availability-zones.html\">Regions and Availability Zones</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>.</p>"
+      "documentation":"<p>Describes the Availability Zones and Local Zones that are available to you. If there is an event impacting an Availability Zone or Local Zone, you can use this request to view the state and any provided messages for that Availability Zone or Local Zone.</p> <p>For more information about Availability Zones and Local Zones, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-regions-availability-zones.html\">Regions and Availability Zones</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>.</p>"
     },
     "DescribeBundleTasks":{
       "name":"DescribeBundleTasks",
@@ -1369,7 +1489,7 @@
       },
       "input":{"shape":"DescribeByoipCidrsRequest"},
       "output":{"shape":"DescribeByoipCidrsResult"},
-      "documentation":"<p>Describes the IP address ranges that were specified in calls to <a>ProvisionByoipCidr</a>.</p> <p>To describe the address pools that were created when you provisioned the address ranges, use <a>DescribePublicIpv4Pools</a>.</p>"
+      "documentation":"<p>Describes the IP address ranges that were specified in calls to <a>ProvisionByoipCidr</a>.</p> <p>To describe the address pools that were created when you provisioned the address ranges, use <a>DescribePublicIpv4Pools</a> or <a>DescribeIpv6Pools</a>.</p>"
     },
     "DescribeCapacityReservations":{
       "name":"DescribeCapacityReservations",
@@ -1441,6 +1561,16 @@
       "output":{"shape":"DescribeClientVpnTargetNetworksResult"},
       "documentation":"<p>Describes the target networks associated with the specified Client VPN endpoint.</p>"
     },
+    "DescribeCoipPools":{
+      "name":"DescribeCoipPools",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DescribeCoipPoolsRequest"},
+      "output":{"shape":"DescribeCoipPoolsResult"},
+      "documentation":"<p>Describes the specified customer-owned address pools or all of your customer-owned address pools.</p>"
+    },
     "DescribeConversionTasks":{
       "name":"DescribeConversionTasks",
       "http":{
@@ -1511,6 +1641,16 @@
       "output":{"shape":"DescribeExportTasksResult"},
       "documentation":"<p>Describes the specified export instance tasks or all your export instance tasks.</p>"
     },
+    "DescribeFastSnapshotRestores":{
+      "name":"DescribeFastSnapshotRestores",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DescribeFastSnapshotRestoresRequest"},
+      "output":{"shape":"DescribeFastSnapshotRestoresResult"},
+      "documentation":"<p>Describes the state of fast snapshot restores for your snapshots.</p>"
+    },
     "DescribeFleetHistory":{
       "name":"DescribeFleetHistory",
       "http":{
@@ -1519,7 +1659,7 @@
       },
       "input":{"shape":"DescribeFleetHistoryRequest"},
       "output":{"shape":"DescribeFleetHistoryResult"},
-      "documentation":"<p>Describes the events for the specified EC2 Fleet during the specified time.</p>"
+      "documentation":"<p>Describes the events for the specified EC2 Fleet during the specified time.</p> <p>EC2 Fleet events are delayed by up to 30 seconds before they can be described. This ensures that you can query by the last evaluated time and not miss a recorded event. EC2 Fleet events are available for 48 hours.</p>"
     },
     "DescribeFleetInstances":{
       "name":"DescribeFleetInstances",
@@ -1539,7 +1679,7 @@
       },
       "input":{"shape":"DescribeFleetsRequest"},
       "output":{"shape":"DescribeFleetsResult"},
-      "documentation":"<p>Describes the specified EC2 Fleets or all your EC2 Fleets.</p>"
+      "documentation":"<p>Describes the specified EC2 Fleets or all of your EC2 Fleets.</p>"
     },
     "DescribeFlowLogs":{
       "name":"DescribeFlowLogs",
@@ -1579,7 +1719,7 @@
       },
       "input":{"shape":"DescribeHostReservationOfferingsRequest"},
       "output":{"shape":"DescribeHostReservationOfferingsResult"},
-      "documentation":"<p>Describes the Dedicated Host reservations that are available to purchase.</p> <p>The results describe all the Dedicated Host reservation offerings, including offerings that may not match the instance family and Region of your Dedicated Hosts. When purchasing an offering, ensure that the instance family and Region of the offering matches that of the Dedicated Hosts with which it is to be associated. For more information about supported instance types, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/dedicated-hosts-overview.html\">Dedicated Hosts Overview</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>. </p>"
+      "documentation":"<p>Describes the Dedicated Host reservations that are available to purchase.</p> <p>The results describe all of the Dedicated Host reservation offerings, including offerings that might not match the instance family and Region of your Dedicated Hosts. When purchasing an offering, ensure that the instance family and Region of the offering matches that of the Dedicated Hosts with which it is to be associated. For more information about supported instance types, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/dedicated-hosts-overview.html\">Dedicated Hosts Overview</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>. </p>"
     },
     "DescribeHostReservations":{
       "name":"DescribeHostReservations",
@@ -1689,7 +1829,7 @@
       },
       "input":{"shape":"DescribeInstanceCreditSpecificationsRequest"},
       "output":{"shape":"DescribeInstanceCreditSpecificationsResult"},
-      "documentation":"<p>Describes the credit option for CPU usage of the specified T2 or T3 instances. The credit options are <code>standard</code> and <code>unlimited</code>.</p> <p>If you do not specify an instance ID, Amazon EC2 returns T2 and T3 instances with the <code>unlimited</code> credit option, as well as instances that were previously configured as T2 or T3 with the <code>unlimited</code> credit option. For example, if you resize a T2 instance, while it is configured as <code>unlimited</code>, to an M4 instance, Amazon EC2 returns the M4 instance.</p> <p>If you specify one or more instance IDs, Amazon EC2 returns the credit option (<code>standard</code> or <code>unlimited</code>) of those instances. If you specify an instance ID that is not valid, such as an instance that is not a T2 or T3 instance, an error is returned.</p> <p>Recently terminated instances might appear in the returned results. This interval is usually less than one hour.</p> <p>If an Availability Zone is experiencing a service disruption and you specify instance IDs in the affected zone, or do not specify any instance IDs at all, the call fails. If you specify only instance IDs in an unaffected zone, the call works normally.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/burstable-performance-instances.html\">Burstable Performance Instances</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>.</p>"
+      "documentation":"<p>Describes the credit option for CPU usage of the specified burstable performance instances. The credit options are <code>standard</code> and <code>unlimited</code>.</p> <p>If you do not specify an instance ID, Amazon EC2 returns burstable performance instances with the <code>unlimited</code> credit option, as well as instances that were previously configured as T2, T3, and T3a with the <code>unlimited</code> credit option. For example, if you resize a T2 instance, while it is configured as <code>unlimited</code>, to an M4 instance, Amazon EC2 returns the M4 instance.</p> <p>If you specify one or more instance IDs, Amazon EC2 returns the credit option (<code>standard</code> or <code>unlimited</code>) of those instances. If you specify an instance ID that is not valid, such as an instance that is not a burstable performance instance, an error is returned.</p> <p>Recently terminated instances might appear in the returned results. This interval is usually less than one hour.</p> <p>If an Availability Zone is experiencing a service disruption and you specify instance IDs in the affected zone, or do not specify any instance IDs at all, the call fails. If you specify only instance IDs in an unaffected zone, the call works normally.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/burstable-performance-instances.html\">Burstable Performance Instances</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>.</p>"
     },
     "DescribeInstanceStatus":{
       "name":"DescribeInstanceStatus",
@@ -1701,6 +1841,26 @@
       "output":{"shape":"DescribeInstanceStatusResult"},
       "documentation":"<p>Describes the status of the specified instances or all of your instances. By default, only running instances are described, unless you specifically indicate to return the status of all instances.</p> <p>Instance status includes the following components:</p> <ul> <li> <p> <b>Status checks</b> - Amazon EC2 performs status checks on running EC2 instances to identify hardware and software issues. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/monitoring-system-instance-status-check.html\">Status Checks for Your Instances</a> and <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/TroubleshootingInstances.html\">Troubleshooting Instances with Failed Status Checks</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>.</p> </li> <li> <p> <b>Scheduled events</b> - Amazon EC2 can schedule events (such as reboot, stop, or terminate) for your instances related to hardware issues, software updates, or system maintenance. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/monitoring-instances-status-check_sched.html\">Scheduled Events for Your Instances</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>.</p> </li> <li> <p> <b>Instance state</b> - You can manage your instances from the moment you launch them through their termination. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-instance-lifecycle.html\">Instance Lifecycle</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>.</p> </li> </ul>"
     },
+    "DescribeInstanceTypeOfferings":{
+      "name":"DescribeInstanceTypeOfferings",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DescribeInstanceTypeOfferingsRequest"},
+      "output":{"shape":"DescribeInstanceTypeOfferingsResult"},
+      "documentation":"<p>Returns a list of all instance types offered. The results can be filtered by location (Region or Availability Zone). If no location is specified, the instance types offered in the current Region are returned.</p>"
+    },
+    "DescribeInstanceTypes":{
+      "name":"DescribeInstanceTypes",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DescribeInstanceTypesRequest"},
+      "output":{"shape":"DescribeInstanceTypesResult"},
+      "documentation":"<p>Returns a list of all instance types offered in your current AWS Region. The results can be filtered by the attributes of the instance types.</p>"
+    },
     "DescribeInstances":{
       "name":"DescribeInstances",
       "http":{
@@ -1721,6 +1881,16 @@
       "output":{"shape":"DescribeInternetGatewaysResult"},
       "documentation":"<p>Describes one or more of your internet gateways.</p>"
     },
+    "DescribeIpv6Pools":{
+      "name":"DescribeIpv6Pools",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DescribeIpv6PoolsRequest"},
+      "output":{"shape":"DescribeIpv6PoolsResult"},
+      "documentation":"<p>Describes your IPv6 address pools.</p>"
+    },
     "DescribeKeyPairs":{
       "name":"DescribeKeyPairs",
       "http":{
@@ -1751,6 +1921,66 @@
       "output":{"shape":"DescribeLaunchTemplatesResult"},
       "documentation":"<p>Describes one or more launch templates.</p>"
     },
+    "DescribeLocalGatewayRouteTableVirtualInterfaceGroupAssociations":{
+      "name":"DescribeLocalGatewayRouteTableVirtualInterfaceGroupAssociations",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DescribeLocalGatewayRouteTableVirtualInterfaceGroupAssociationsRequest"},
+      "output":{"shape":"DescribeLocalGatewayRouteTableVirtualInterfaceGroupAssociationsResult"},
+      "documentation":"<p>Describes the associations between virtual interface groups and local gateway route tables.</p>"
+    },
+    "DescribeLocalGatewayRouteTableVpcAssociations":{
+      "name":"DescribeLocalGatewayRouteTableVpcAssociations",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DescribeLocalGatewayRouteTableVpcAssociationsRequest"},
+      "output":{"shape":"DescribeLocalGatewayRouteTableVpcAssociationsResult"},
+      "documentation":"<p>Describes the specified associations between VPCs and local gateway route tables.</p>"
+    },
+    "DescribeLocalGatewayRouteTables":{
+      "name":"DescribeLocalGatewayRouteTables",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DescribeLocalGatewayRouteTablesRequest"},
+      "output":{"shape":"DescribeLocalGatewayRouteTablesResult"},
+      "documentation":"<p>Describes one or more local gateway route tables. By default, all local gateway route tables are described. Alternatively, you can filter the results.</p>"
+    },
+    "DescribeLocalGatewayVirtualInterfaceGroups":{
+      "name":"DescribeLocalGatewayVirtualInterfaceGroups",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DescribeLocalGatewayVirtualInterfaceGroupsRequest"},
+      "output":{"shape":"DescribeLocalGatewayVirtualInterfaceGroupsResult"},
+      "documentation":"<p>Describes the specified local gateway virtual interface groups.</p>"
+    },
+    "DescribeLocalGatewayVirtualInterfaces":{
+      "name":"DescribeLocalGatewayVirtualInterfaces",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DescribeLocalGatewayVirtualInterfacesRequest"},
+      "output":{"shape":"DescribeLocalGatewayVirtualInterfacesResult"},
+      "documentation":"<p>Describes the specified local gateway virtual interfaces.</p>"
+    },
+    "DescribeLocalGateways":{
+      "name":"DescribeLocalGateways",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DescribeLocalGatewaysRequest"},
+      "output":{"shape":"DescribeLocalGatewaysResult"},
+      "documentation":"<p>Describes one or more local gateways. By default, all local gateways are described. Alternatively, you can filter the results.</p>"
+    },
     "DescribeMovingAddresses":{
       "name":"DescribeMovingAddresses",
       "http":{
@@ -1969,7 +2199,7 @@
       },
       "input":{"shape":"DescribeSnapshotsRequest"},
       "output":{"shape":"DescribeSnapshotsResult"},
-      "documentation":"<p>Describes the specified EBS snapshots available to you or all of the EBS snapshots available to you.</p> <p>The snapshots available to you include public snapshots, private snapshots that you own, and private snapshots owned by other AWS accounts for which you have explicit create volume permissions.</p> <p>The create volume permissions fall into the following categories:</p> <ul> <li> <p> <i>public</i>: The owner of the snapshot granted create volume permissions for the snapshot to the <code>all</code> group. All AWS accounts have create volume permissions for these snapshots.</p> </li> <li> <p> <i>explicit</i>: The owner of the snapshot granted create volume permissions to a specific AWS account.</p> </li> <li> <p> <i>implicit</i>: An AWS account has implicit create volume permissions for all snapshots it owns.</p> </li> </ul> <p>The list of snapshots returned can be modified by specifying snapshot IDs, snapshot owners, or AWS accounts with create volume permissions. If no options are specified, Amazon EC2 returns all snapshots for which you have create volume permissions.</p> <p>If you specify one or more snapshot IDs, only snapshots that have the specified IDs are returned. If you specify an invalid snapshot ID, an error is returned. If you specify a snapshot ID for which you do not have access, it is not included in the returned results.</p> <p>If you specify one or more snapshot owners using the <code>OwnerIds</code> option, only snapshots from the specified owners and for which you have access are returned. The results can include the AWS account IDs of the specified owners, <code>amazon</code> for snapshots owned by Amazon, or <code>self</code> for snapshots that you own.</p> <p>If you specify a list of restorable users, only snapshots with create snapshot permissions for those users are returned. You can specify AWS account IDs (if you own the snapshots), <code>self</code> for snapshots for which you own or have explicit permissions, or <code>all</code> for public snapshots.</p> <p>If you are describing a long list of snapshots, you can paginate the output to make the list more manageable. The <code>MaxResults</code> parameter sets the maximum number of results returned in a single page. If the list of results exceeds your <code>MaxResults</code> value, then that number of results is returned along with a <code>NextToken</code> value that can be passed to a subsequent <code>DescribeSnapshots</code> request to retrieve the remaining results.</p> <p>For more information about EBS snapshots, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSSnapshots.html\">Amazon EBS Snapshots</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>.</p>"
+      "documentation":"<p>Describes the specified EBS snapshots available to you or all of the EBS snapshots available to you.</p> <p>The snapshots available to you include public snapshots, private snapshots that you own, and private snapshots owned by other AWS accounts for which you have explicit create volume permissions.</p> <p>The create volume permissions fall into the following categories:</p> <ul> <li> <p> <i>public</i>: The owner of the snapshot granted create volume permissions for the snapshot to the <code>all</code> group. All AWS accounts have create volume permissions for these snapshots.</p> </li> <li> <p> <i>explicit</i>: The owner of the snapshot granted create volume permissions to a specific AWS account.</p> </li> <li> <p> <i>implicit</i>: An AWS account has implicit create volume permissions for all snapshots it owns.</p> </li> </ul> <p>The list of snapshots returned can be filtered by specifying snapshot IDs, snapshot owners, or AWS accounts with create volume permissions. If no options are specified, Amazon EC2 returns all snapshots for which you have create volume permissions.</p> <p>If you specify one or more snapshot IDs, only snapshots that have the specified IDs are returned. If you specify an invalid snapshot ID, an error is returned. If you specify a snapshot ID for which you do not have access, it is not included in the returned results.</p> <p>If you specify one or more snapshot owners using the <code>OwnerIds</code> option, only snapshots from the specified owners and for which you have access are returned. The results can include the AWS account IDs of the specified owners, <code>amazon</code> for snapshots owned by Amazon, or <code>self</code> for snapshots that you own.</p> <p>If you specify a list of restorable users, only snapshots with create snapshot permissions for those users are returned. You can specify AWS account IDs (if you own the snapshots), <code>self</code> for snapshots for which you own or have explicit permissions, or <code>all</code> for public snapshots.</p> <p>If you are describing a long list of snapshots, you can paginate the output to make the list more manageable. The <code>MaxResults</code> parameter sets the maximum number of results returned in a single page. If the list of results exceeds your <code>MaxResults</code> value, then that number of results is returned along with a <code>NextToken</code> value that can be passed to a subsequent <code>DescribeSnapshots</code> request to retrieve the remaining results.</p> <p>To get the state of fast snapshot restores for a snapshot, use <a>DescribeFastSnapshotRestores</a>.</p> <p>For more information about EBS snapshots, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSSnapshots.html\">Amazon EBS Snapshots</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>.</p>"
     },
     "DescribeSpotDatafeedSubscription":{
       "name":"DescribeSpotDatafeedSubscription",
@@ -2101,6 +2331,26 @@
       "output":{"shape":"DescribeTransitGatewayAttachmentsResult"},
       "documentation":"<p>Describes one or more attachments between resources and transit gateways. By default, all attachments are described. Alternatively, you can filter the results by attachment ID, attachment state, resource ID, or resource owner.</p>"
     },
+    "DescribeTransitGatewayMulticastDomains":{
+      "name":"DescribeTransitGatewayMulticastDomains",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DescribeTransitGatewayMulticastDomainsRequest"},
+      "output":{"shape":"DescribeTransitGatewayMulticastDomainsResult"},
+      "documentation":"<p>Describes one or more transit gateway multicast domains.</p>"
+    },
+    "DescribeTransitGatewayPeeringAttachments":{
+      "name":"DescribeTransitGatewayPeeringAttachments",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DescribeTransitGatewayPeeringAttachmentsRequest"},
+      "output":{"shape":"DescribeTransitGatewayPeeringAttachmentsResult"},
+      "documentation":"<p>Describes your transit gateway peering attachments.</p>"
+    },
     "DescribeTransitGatewayRouteTables":{
       "name":"DescribeTransitGatewayRouteTables",
       "http":{
@@ -2358,6 +2608,16 @@
       "output":{"shape":"DisableEbsEncryptionByDefaultResult"},
       "documentation":"<p>Disables EBS encryption by default for your account in the current Region.</p> <p>After you disable encryption by default, you can still create encrypted volumes by enabling encryption when you create each volume.</p> <p>Disabling encryption by default does not change the encryption status of your existing volumes.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSEncryption.html\">Amazon EBS Encryption</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>.</p>"
     },
+    "DisableFastSnapshotRestores":{
+      "name":"DisableFastSnapshotRestores",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DisableFastSnapshotRestoresRequest"},
+      "output":{"shape":"DisableFastSnapshotRestoresResult"},
+      "documentation":"<p>Disables fast snapshot restores for the specified snapshots in the specified Availability Zones.</p>"
+    },
     "DisableTransitGatewayRouteTablePropagation":{
       "name":"DisableTransitGatewayRouteTablePropagation",
       "http":{
@@ -2445,6 +2705,16 @@
       "output":{"shape":"DisassociateSubnetCidrBlockResult"},
       "documentation":"<p>Disassociates a CIDR block from a subnet. Currently, you can disassociate an IPv6 CIDR block only. You must detach or delete all gateways and resources that are associated with the CIDR block before you can disassociate it. </p>"
     },
+    "DisassociateTransitGatewayMulticastDomain":{
+      "name":"DisassociateTransitGatewayMulticastDomain",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DisassociateTransitGatewayMulticastDomainRequest"},
+      "output":{"shape":"DisassociateTransitGatewayMulticastDomainResult"},
+      "documentation":"<p>Disassociates the specified subnets from the transit gateway multicast domain. </p>"
+    },
     "DisassociateTransitGatewayRouteTable":{
       "name":"DisassociateTransitGatewayRouteTable",
       "http":{
@@ -2475,6 +2745,16 @@
       "output":{"shape":"EnableEbsEncryptionByDefaultResult"},
       "documentation":"<p>Enables EBS encryption by default for your account in the current Region.</p> <p>After you enable encryption by default, the EBS volumes that you create are are always encrypted, either using the default CMK or the CMK that you specified when you created each volume. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSEncryption.html\">Amazon EBS Encryption</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>.</p> <p>You can specify the default CMK for encryption by default using <a>ModifyEbsDefaultKmsKeyId</a> or <a>ResetEbsDefaultKmsKeyId</a>.</p> <p>Enabling encryption by default has no effect on the encryption status of your existing volumes.</p> <p>After you enable encryption by default, you can no longer launch instances using instance types that do not support encryption. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSEncryption.html#EBSEncryption_supported_instances\">Supported Instance Types</a>.</p>"
     },
+    "EnableFastSnapshotRestores":{
+      "name":"EnableFastSnapshotRestores",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"EnableFastSnapshotRestoresRequest"},
+      "output":{"shape":"EnableFastSnapshotRestoresResult"},
+      "documentation":"<p>Enables fast snapshot restores for the specified snapshots in the specified Availability Zones.</p> <p>You get the full benefit of fast snapshot restores after they enter the <code>enabled</code> state. To get the current state of fast snapshot restores, use <a>DescribeFastSnapshotRestores</a>. To disable fast snapshot restores, use <a>DisableFastSnapshotRestores</a>.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ebs-fast-snapshot-restore.html\">Amazon EBS Fast Snapshot Restore</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>.</p>"
+    },
     "EnableTransitGatewayRouteTablePropagation":{
       "name":"EnableTransitGatewayRouteTablePropagation",
       "http":{
@@ -2561,7 +2841,17 @@
       },
       "input":{"shape":"ExportTransitGatewayRoutesRequest"},
       "output":{"shape":"ExportTransitGatewayRoutesResult"},
-      "documentation":"<p>Exports routes from the specified transit gateway route table to the specified S3 bucket. By default, all routes are exported. Alternatively, you can filter by CIDR range.</p>"
+      "documentation":"<p>Exports routes from the specified transit gateway route table to the specified S3 bucket. By default, all routes are exported. Alternatively, you can filter by CIDR range.</p> <p>The routes are saved to the specified bucket in a JSON file. For more information, see <a href=\"https://docs.aws.amazon.com/vpc/latest/tgw/tgw-route-tables.html#tgw-export-route-tables\">Export Route Tables to Amazon S3</a> in <i>Transit Gateways</i>.</p>"
+    },
+    "GetAssociatedIpv6PoolCidrs":{
+      "name":"GetAssociatedIpv6PoolCidrs",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"GetAssociatedIpv6PoolCidrsRequest"},
+      "output":{"shape":"GetAssociatedIpv6PoolCidrsResult"},
+      "documentation":"<p>Gets information about the IPv6 CIDR block associations for a specified IPv6 address pool.</p>"
     },
     "GetCapacityReservationUsage":{
       "name":"GetCapacityReservationUsage",
@@ -2573,6 +2863,16 @@
       "output":{"shape":"GetCapacityReservationUsageResult"},
       "documentation":"<p>Gets usage information about a Capacity Reservation. If the Capacity Reservation is shared, it shows usage information for the Capacity Reservation owner and each AWS account that is currently using the shared capacity. If the Capacity Reservation is not shared, it shows only the Capacity Reservation owner's usage.</p>"
     },
+    "GetCoipPoolUsage":{
+      "name":"GetCoipPoolUsage",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"GetCoipPoolUsageRequest"},
+      "output":{"shape":"GetCoipPoolUsageResult"},
+      "documentation":"<p>Describes the allocations from the specified customer-owned address pool.</p>"
+    },
     "GetConsoleOutput":{
       "name":"GetConsoleOutput",
       "http":{
@@ -2593,6 +2893,16 @@
       "output":{"shape":"GetConsoleScreenshotResult"},
       "documentation":"<p>Retrieve a JPG-format screenshot of a running instance to help with troubleshooting.</p> <p>The returned content is Base64-encoded.</p>"
     },
+    "GetDefaultCreditSpecification":{
+      "name":"GetDefaultCreditSpecification",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"GetDefaultCreditSpecificationRequest"},
+      "output":{"shape":"GetDefaultCreditSpecificationResult"},
+      "documentation":"<p>Describes the default credit option for CPU usage of a burstable performance instance family.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/burstable-performance-instances.html\">Burstable Performance Instances</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>.</p>"
+    },
     "GetEbsDefaultKmsKeyId":{
       "name":"GetEbsDefaultKmsKeyId",
       "http":{
@@ -2663,6 +2973,16 @@
       "output":{"shape":"GetTransitGatewayAttachmentPropagationsResult"},
       "documentation":"<p>Lists the route tables to which the specified resource attachment propagates routes.</p>"
     },
+    "GetTransitGatewayMulticastDomainAssociations":{
+      "name":"GetTransitGatewayMulticastDomainAssociations",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"GetTransitGatewayMulticastDomainAssociationsRequest"},
+      "output":{"shape":"GetTransitGatewayMulticastDomainAssociationsResult"},
+      "documentation":"<p>Gets information about the associations for the transit gateway multicast domain.</p>"
+    },
     "GetTransitGatewayRouteTableAssociations":{
       "name":"GetTransitGatewayRouteTableAssociations",
       "http":{
@@ -2743,6 +3063,16 @@
       "output":{"shape":"ImportVolumeResult"},
       "documentation":"<p>Creates an import volume task using metadata from the specified disk image.For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/CommandLineReference/importing-your-volumes-into-amazon-ebs.html\">Importing Disks to Amazon EBS</a>.</p> <p>For information about the import manifest referenced by this API action, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/manifest.html\">VM Import Manifest</a>.</p>"
     },
+    "ModifyAvailabilityZoneGroup":{
+      "name":"ModifyAvailabilityZoneGroup",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"ModifyAvailabilityZoneGroupRequest"},
+      "output":{"shape":"ModifyAvailabilityZoneGroupResult"},
+      "documentation":"<p>Enables or disables an Availability Zone group for your account.</p> <p>Use <a href=\"https://docs.aws.amazon.com/AWSEC2ApiDocReef/build/server-root/AWSEC2/latest/APIReference/API_DescribeAvailabilityZones.html\">describe-availability-zones</a> to view the value for <code>GroupName</code>.</p>"
+    },
     "ModifyCapacityReservation":{
       "name":"ModifyCapacityReservation",
       "http":{
@@ -2761,7 +3091,17 @@
       },
       "input":{"shape":"ModifyClientVpnEndpointRequest"},
       "output":{"shape":"ModifyClientVpnEndpointResult"},
-      "documentation":"<p>Modifies the specified Client VPN endpoint. You can only modify an endpoint's server certificate information, client connection logging information, DNS server, and description. Modifying the DNS server resets existing client connections.</p>"
+      "documentation":"<p>Modifies the specified Client VPN endpoint. Modifying the DNS server resets existing client connections.</p>"
+    },
+    "ModifyDefaultCreditSpecification":{
+      "name":"ModifyDefaultCreditSpecification",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"ModifyDefaultCreditSpecificationRequest"},
+      "output":{"shape":"ModifyDefaultCreditSpecificationResult"},
+      "documentation":"<p>Modifies the default credit option for CPU usage of burstable performance instances. The default credit option is set at the account level per AWS Region, and is specified per instance family. All new burstable performance instances in the account launch using the default credit option.</p> <p> <code>ModifyDefaultCreditSpecification</code> is an asynchronous operation, which works at an AWS Region level and modifies the credit option for each Availability Zone. All zones in a Region are updated within five minutes. But if instances are launched during this operation, they might not get the new credit option until the zone is updated. To verify whether the update has occurred, you can call <code>GetDefaultCreditSpecification</code> and check <code>DefaultCreditSpecification</code> for updates.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/burstable-performance-instances.html\">Burstable Performance Instances</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>.</p>"
     },
     "ModifyEbsDefaultKmsKeyId":{
       "name":"ModifyEbsDefaultKmsKeyId",
@@ -2771,7 +3111,7 @@
       },
       "input":{"shape":"ModifyEbsDefaultKmsKeyIdRequest"},
       "output":{"shape":"ModifyEbsDefaultKmsKeyIdResult"},
-      "documentation":"<p>Changes the default customer master key (CMK) for EBS encryption by default for your account in this Region.</p> <p>AWS creates a unique AWS managed CMK in each Region for use with encryption by default. If you change the default CMK to a customer managed CMK, it is used instead of the AWS managed CMK. To reset the default CMK to the AWS managed CMK for EBS, use <a>ResetEbsDefaultKmsKeyId</a>.</p> <p>If you delete or disable the customer managed CMK that you specified for use with encryption by default, your instances will fail to launch.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSEncryption.html\">Amazon EBS Encryption</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>.</p>"
+      "documentation":"<p>Changes the default customer master key (CMK) for EBS encryption by default for your account in this Region.</p> <p>AWS creates a unique AWS managed CMK in each Region for use with encryption by default. If you change the default CMK to a symmetric customer managed CMK, it is used instead of the AWS managed CMK. To reset the default CMK to the AWS managed CMK for EBS, use <a>ResetEbsDefaultKmsKeyId</a>. Amazon EBS does not support asymmetric CMKs.</p> <p>If you delete or disable the customer managed CMK that you specified for use with encryption by default, your instances will fail to launch.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSEncryption.html\">Amazon EBS Encryption</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>.</p>"
     },
     "ModifyFleet":{
       "name":"ModifyFleet",
@@ -2781,7 +3121,7 @@
       },
       "input":{"shape":"ModifyFleetRequest"},
       "output":{"shape":"ModifyFleetResult"},
-      "documentation":"<p>Modifies the specified EC2 Fleet.</p> <p>You can only modify an EC2 Fleet request of type <code>maintain</code>.</p> <p>While the EC2 Fleet is being modified, it is in the <code>modifying</code> state.</p> <p>To scale up your EC2 Fleet, increase its target capacity. The EC2 Fleet launches the additional Spot Instances according to the allocation strategy for the EC2 Fleet request. If the allocation strategy is <code>lowestPrice</code>, the EC2 Fleet launches instances using the Spot Instance pool with the lowest price. If the allocation strategy is <code>diversified</code>, the EC2 Fleet distributes the instances across the Spot Instance pools. If the allocation strategy is <code>capacityOptimized</code>, EC2 Fleet launches instances from Spot Instance pools with optimal capacity for the number of instances that are launching.</p> <p>To scale down your EC2 Fleet, decrease its target capacity. First, the EC2 Fleet cancels any open requests that exceed the new target capacity. You can request that the EC2 Fleet terminate Spot Instances until the size of the fleet no longer exceeds the new target capacity. If the allocation strategy is <code>lowestPrice</code>, the EC2 Fleet terminates the instances with the highest price per unit. If the allocation strategy is <code>capacityOptimized</code>, the EC2 Fleet terminates the instances in the Spot Instance pools that have the least available Spot Instance capacity. If the allocation strategy is <code>diversified</code>, the EC2 Fleet terminates instances across the Spot Instance pools. Alternatively, you can request that the EC2 Fleet keep the fleet at its current size, but not replace any Spot Instances that are interrupted or that you terminate manually.</p> <p>If you are finished with your EC2 Fleet for now, but will use it again later, you can set the target capacity to 0.</p>"
+      "documentation":"<p>Modifies the specified EC2 Fleet.</p> <p>You can only modify an EC2 Fleet request of type <code>maintain</code>.</p> <p>While the EC2 Fleet is being modified, it is in the <code>modifying</code> state.</p> <p>To scale up your EC2 Fleet, increase its target capacity. The EC2 Fleet launches the additional Spot Instances according to the allocation strategy for the EC2 Fleet request. If the allocation strategy is <code>lowest-price</code>, the EC2 Fleet launches instances using the Spot Instance pool with the lowest price. If the allocation strategy is <code>diversified</code>, the EC2 Fleet distributes the instances across the Spot Instance pools. If the allocation strategy is <code>capacity-optimized</code>, EC2 Fleet launches instances from Spot Instance pools with optimal capacity for the number of instances that are launching.</p> <p>To scale down your EC2 Fleet, decrease its target capacity. First, the EC2 Fleet cancels any open requests that exceed the new target capacity. You can request that the EC2 Fleet terminate Spot Instances until the size of the fleet no longer exceeds the new target capacity. If the allocation strategy is <code>lowest-price</code>, the EC2 Fleet terminates the instances with the highest price per unit. If the allocation strategy is <code>capacity-optimized</code>, the EC2 Fleet terminates the instances in the Spot Instance pools that have the least available Spot Instance capacity. If the allocation strategy is <code>diversified</code>, the EC2 Fleet terminates instances across the Spot Instance pools. Alternatively, you can request that the EC2 Fleet keep the fleet at its current size, but not replace any Spot Instances that are interrupted or that you terminate manually.</p> <p>If you are finished with your EC2 Fleet for now, but will use it again later, you can set the target capacity to 0.</p>"
     },
     "ModifyFpgaImageAttribute":{
       "name":"ModifyFpgaImageAttribute",
@@ -2801,7 +3141,7 @@
       },
       "input":{"shape":"ModifyHostsRequest"},
       "output":{"shape":"ModifyHostsResult"},
-      "documentation":"<p>Modify the auto-placement setting of a Dedicated Host. When auto-placement is enabled, any instances that you launch with a tenancy of <code>host</code> but without a specific host ID are placed onto any available Dedicated Host in your account that has auto-placement enabled. When auto-placement is disabled, you need to provide a host ID to have the instance launch onto a specific host. If no host ID is provided, the instance is launched onto a suitable host with auto-placement enabled.</p>"
+      "documentation":"<p>Modify the auto-placement setting of a Dedicated Host. When auto-placement is enabled, any instances that you launch with a tenancy of <code>host</code> but without a specific host ID are placed onto any available Dedicated Host in your account that has auto-placement enabled. When auto-placement is disabled, you need to provide a host ID to have the instance launch onto a specific host. If no host ID is provided, the instance is launched onto a suitable host with auto-placement enabled.</p> <p>You can also use this API action to modify a Dedicated Host to support either multiple instance types in an instance family, or to support a specific instance type only.</p>"
     },
     "ModifyIdFormat":{
       "name":"ModifyIdFormat",
@@ -2857,7 +3197,7 @@
       },
       "input":{"shape":"ModifyInstanceCreditSpecificationRequest"},
       "output":{"shape":"ModifyInstanceCreditSpecificationResult"},
-      "documentation":"<p>Modifies the credit option for CPU usage on a running or stopped T2 or T3 instance. The credit options are <code>standard</code> and <code>unlimited</code>.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/burstable-performance-instances.html\">Burstable Performance Instances</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>.</p>"
+      "documentation":"<p>Modifies the credit option for CPU usage on a running or stopped burstable performance instance. The credit options are <code>standard</code> and <code>unlimited</code>.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/burstable-performance-instances.html\">Burstable Performance Instances</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>.</p>"
     },
     "ModifyInstanceEventStartTime":{
       "name":"ModifyInstanceEventStartTime",
@@ -2869,6 +3209,16 @@
       "output":{"shape":"ModifyInstanceEventStartTimeResult"},
       "documentation":"<p>Modifies the start time for a scheduled Amazon EC2 instance event.</p>"
     },
+    "ModifyInstanceMetadataOptions":{
+      "name":"ModifyInstanceMetadataOptions",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"ModifyInstanceMetadataOptionsRequest"},
+      "output":{"shape":"ModifyInstanceMetadataOptionsResult"},
+      "documentation":"<p>Modify the instance metadata parameters on a running or stopped instance. When you modify the parameters on a stopped instance, they are applied when the instance is started. When you modify the parameters on a running instance, the API responds with a state of “pending”. After the parameter modifications are successfully applied to the instance, the state of the modifications changes from “pending” to “applied” in subsequent describe-instances API calls. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-instance-metadata.html\">Instance Metadata and User Data</a>.</p>"
+    },
     "ModifyInstancePlacement":{
       "name":"ModifyInstancePlacement",
       "http":{
@@ -2944,7 +3294,7 @@
       },
       "input":{"shape":"ModifyTrafficMirrorFilterNetworkServicesRequest"},
       "output":{"shape":"ModifyTrafficMirrorFilterNetworkServicesResult"},
-      "documentation":"<p>Allows or restricts mirroring network services.</p> <p> By default, Amazon DNS network services are not eligible for Traffic Mirror. Use <code>AddNetworkServices</code> to add network services to a Traffic Mirror filter. When a network service is added to the Traffic Mirror filter, all traffic related to that network service will be mirrored. When you no longer want to mirror network services, use <code>RemoveNetworkServices</code> to remove the network services from the Traffic Mirror filter. </p> <p>FFor information about filter rule properties, see <a href=\"https://docs.aws.amazon.com/vpc/latest/mirroring/traffic-mirroring-considerations.html#traffic-mirroring-network-services\">Network Services</a> in the <i>Traffic Mirroring User Guide </i>.</p>"
+      "documentation":"<p>Allows or restricts mirroring network services.</p> <p> By default, Amazon DNS network services are not eligible for Traffic Mirror. Use <code>AddNetworkServices</code> to add network services to a Traffic Mirror filter. When a network service is added to the Traffic Mirror filter, all traffic related to that network service will be mirrored. When you no longer want to mirror network services, use <code>RemoveNetworkServices</code> to remove the network services from the Traffic Mirror filter. </p> <p>For information about filter rule properties, see <a href=\"https://docs.aws.amazon.com/vpc/latest/mirroring/traffic-mirroring-considerations.html\">Network Services</a> in the <i>Traffic Mirroring User Guide </i>.</p>"
     },
     "ModifyTrafficMirrorFilterRule":{
       "name":"ModifyTrafficMirrorFilterRule",
@@ -3032,7 +3382,7 @@
       },
       "input":{"shape":"ModifyVpcEndpointServiceConfigurationRequest"},
       "output":{"shape":"ModifyVpcEndpointServiceConfigurationResult"},
-      "documentation":"<p>Modifies the attributes of your VPC endpoint service configuration. You can change the Network Load Balancers for your service, and you can specify whether acceptance is required for requests to connect to your endpoint service through an interface VPC endpoint.</p>"
+      "documentation":"<p>Modifies the attributes of your VPC endpoint service configuration. You can change the Network Load Balancers for your service, and you can specify whether acceptance is required for requests to connect to your endpoint service through an interface VPC endpoint.</p> <p>If you set or modify the private DNS name, you must prove that you own the private DNS domain name. For more information, see <a href=\"https://docs.aws.amazon.com/vpc/latest/userguide/endpoint-services-dns-validation.html\">VPC Endpoint Service Private DNS Name Verification</a> in the <i>Amazon Virtual Private Cloud User Guide</i>.</p>"
     },
     "ModifyVpcEndpointServicePermissions":{
       "name":"ModifyVpcEndpointServicePermissions",
@@ -3072,7 +3422,7 @@
       },
       "input":{"shape":"ModifyVpnConnectionRequest"},
       "output":{"shape":"ModifyVpnConnectionResult"},
-      "documentation":"<p>Modifies the target gateway of an AWS Site-to-Site VPN connection. The following migration options are available:</p> <ul> <li> <p>An existing virtual private gateway to a new virtual private gateway</p> </li> <li> <p>An existing virtual private gateway to a transit gateway</p> </li> <li> <p>An existing transit gateway to a new transit gateway</p> </li> <li> <p>An existing transit gateway to a virtual private gateway</p> </li> </ul> <p>Before you perform the migration to the new gateway, you must configure the new gateway. Use <a>CreateVpnGateway</a> to create a virtual private gateway, or <a>CreateTransitGateway</a> to create a transit gateway.</p> <p>This step is required when you migrate from a virtual private gateway with static routes to a transit gateway. </p> <p>You must delete the static routes before you migrate to the new gateway.</p> <p>Keep a copy of the static route before you delete it. You will need to add back these routes to the transit gateway after the VPN connection migration is complete.</p> <p>After you migrate to the new gateway, you might need to modify your VPC route table. Use <a>CreateRoute</a> and <a>DeleteRoute</a> to make the changes described in <a href=\"https://docs.aws.amazon.com/vpn/latest/s2svpn/modify-vpn-target.html#step-update-routing\">VPN Gateway Target Modification Required VPC Route Table Updates</a> in the <i>AWS Site-to-Site VPN User Guide</i>.</p> <p> When the new gateway is a transit gateway, modify the transit gateway route table to allow traffic between the VPC and the AWS Site-to-Site VPN connection. Use <a>CreateTransitGatewayRoute</a> to add the routes.</p> <p> If you deleted VPN static routes, you must add the static routes to the transit gateway route table.</p> <p>After you perform this operation, the AWS VPN endpoint's IP addresses on the AWS side and the tunnel options remain intact. Your s2slong; connection will be temporarily unavailable for approximately 10 minutes while we provision the new endpoints </p>"
+      "documentation":"<p>Modifies the target gateway of an AWS Site-to-Site VPN connection. The following migration options are available:</p> <ul> <li> <p>An existing virtual private gateway to a new virtual private gateway</p> </li> <li> <p>An existing virtual private gateway to a transit gateway</p> </li> <li> <p>An existing transit gateway to a new transit gateway</p> </li> <li> <p>An existing transit gateway to a virtual private gateway</p> </li> </ul> <p>Before you perform the migration to the new gateway, you must configure the new gateway. Use <a>CreateVpnGateway</a> to create a virtual private gateway, or <a>CreateTransitGateway</a> to create a transit gateway.</p> <p>This step is required when you migrate from a virtual private gateway with static routes to a transit gateway. </p> <p>You must delete the static routes before you migrate to the new gateway.</p> <p>Keep a copy of the static route before you delete it. You will need to add back these routes to the transit gateway after the VPN connection migration is complete.</p> <p>After you migrate to the new gateway, you might need to modify your VPC route table. Use <a>CreateRoute</a> and <a>DeleteRoute</a> to make the changes described in <a href=\"https://docs.aws.amazon.com/vpn/latest/s2svpn/modify-vpn-target.html#step-update-routing\">VPN Gateway Target Modification Required VPC Route Table Updates</a> in the <i>AWS Site-to-Site VPN User Guide</i>.</p> <p> When the new gateway is a transit gateway, modify the transit gateway route table to allow traffic between the VPC and the AWS Site-to-Site VPN connection. Use <a>CreateTransitGatewayRoute</a> to add the routes.</p> <p> If you deleted VPN static routes, you must add the static routes to the transit gateway route table.</p> <p>After you perform this operation, the AWS VPN endpoint's IP addresses on the AWS side and the tunnel options remain intact. Your AWS Site-to-Site VPN connection will be temporarily unavailable for a brief period while we provision the new endpoints.</p>"
     },
     "ModifyVpnTunnelCertificate":{
       "name":"ModifyVpnTunnelCertificate",
@@ -3122,7 +3472,7 @@
       },
       "input":{"shape":"ProvisionByoipCidrRequest"},
       "output":{"shape":"ProvisionByoipCidrResult"},
-      "documentation":"<p>Provisions an address range for use with your AWS resources through bring your own IP addresses (BYOIP) and creates a corresponding address pool. After the address range is provisioned, it is ready to be advertised using <a>AdvertiseByoipCidr</a>.</p> <p>AWS verifies that you own the address range and are authorized to advertise it. You must ensure that the address range is registered to you and that you created an RPKI ROA to authorize Amazon ASNs 16509 and 14618 to advertise the address range. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-byoip.html\">Bring Your Own IP Addresses (BYOIP)</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>.</p> <p>Provisioning an address range is an asynchronous operation, so the call returns immediately, but the address range is not ready to use until its status changes from <code>pending-provision</code> to <code>provisioned</code>. To monitor the status of an address range, use <a>DescribeByoipCidrs</a>. To allocate an Elastic IP address from your address pool, use <a>AllocateAddress</a> with either the specific address from the address pool or the ID of the address pool.</p>"
+      "documentation":"<p>Provisions an IPv4 or IPv6 address range for use with your AWS resources through bring your own IP addresses (BYOIP) and creates a corresponding address pool. After the address range is provisioned, it is ready to be advertised using <a>AdvertiseByoipCidr</a>.</p> <p>AWS verifies that you own the address range and are authorized to advertise it. You must ensure that the address range is registered to you and that you created an RPKI ROA to authorize Amazon ASNs 16509 and 14618 to advertise the address range. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-byoip.html\">Bring Your Own IP Addresses (BYOIP)</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>.</p> <p>Provisioning an address range is an asynchronous operation, so the call returns immediately, but the address range is not ready to use until its status changes from <code>pending-provision</code> to <code>provisioned</code>. To monitor the status of an address range, use <a>DescribeByoipCidrs</a>. To allocate an Elastic IP address from your IPv4 address pool, use <a>AllocateAddress</a> with either the specific address from the address pool or the ID of the address pool.</p>"
     },
     "PurchaseHostReservation":{
       "name":"PurchaseHostReservation",
@@ -3171,7 +3521,37 @@
       },
       "input":{"shape":"RegisterImageRequest"},
       "output":{"shape":"RegisterImageResult"},
-      "documentation":"<p>Registers an AMI. When you're creating an AMI, this is the final step you must complete before you can launch an instance from the AMI. For more information about creating AMIs, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/creating-an-ami.html\">Creating Your Own AMIs</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>.</p> <note> <p>For Amazon EBS-backed instances, <a>CreateImage</a> creates and registers the AMI in a single request, so you don't have to register the AMI yourself.</p> </note> <p>You can also use <code>RegisterImage</code> to create an Amazon EBS-backed Linux AMI from a snapshot of a root device volume. You specify the snapshot using the block device mapping. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/instance-launch-snapshot.html\">Launching a Linux Instance from a Backup</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>.</p> <p>You can't register an image where a secondary (non-root) snapshot has AWS Marketplace product codes.</p> <p>Windows and some Linux distributions, such as Red Hat Enterprise Linux (RHEL) and SUSE Linux Enterprise Server (SLES), use the EC2 billing product code associated with an AMI to verify the subscription status for package updates. To create a new AMI for operating systems that require a billing product code, do the following:</p> <ol> <li> <p>Launch an instance from an existing AMI with that billing product code.</p> </li> <li> <p>Customize the instance.</p> </li> <li> <p>Create a new AMI from the instance using <a>CreateImage</a> to preserve the billing product code association.</p> </li> </ol> <p>If you purchase a Reserved Instance to apply to an On-Demand Instance that was launched from an AMI with a billing product code, make sure that the Reserved Instance has the matching billing product code. If you purchase a Reserved Instance without the matching billing product code, the Reserved Instance will not be applied to the On-Demand Instance. </p> <p>If needed, you can deregister an AMI at any time. Any modifications you make to an AMI backed by an instance store volume invalidates its registration. If you make changes to an image, deregister the previous image and register the new image.</p>"
+      "documentation":"<p>Registers an AMI. When you're creating an AMI, this is the final step you must complete before you can launch an instance from the AMI. For more information about creating AMIs, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/creating-an-ami.html\">Creating Your Own AMIs</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>.</p> <note> <p>For Amazon EBS-backed instances, <a>CreateImage</a> creates and registers the AMI in a single request, so you don't have to register the AMI yourself.</p> </note> <p>You can also use <code>RegisterImage</code> to create an Amazon EBS-backed Linux AMI from a snapshot of a root device volume. You specify the snapshot using the block device mapping. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/instance-launch-snapshot.html\">Launching a Linux Instance from a Backup</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>.</p> <p>You can't register an image where a secondary (non-root) snapshot has AWS Marketplace product codes.</p> <p>Windows and some Linux distributions, such as Red Hat Enterprise Linux (RHEL) and SUSE Linux Enterprise Server (SLES), use the EC2 billing product code associated with an AMI to verify the subscription status for package updates. To create a new AMI for operating systems that require a billing product code, instead of registering the AMI, do the following to preserve the billing product code association:</p> <ol> <li> <p>Launch an instance from an existing AMI with that billing product code.</p> </li> <li> <p>Customize the instance.</p> </li> <li> <p>Create an AMI from the instance using <a>CreateImage</a>.</p> </li> </ol> <p>If you purchase a Reserved Instance to apply to an On-Demand Instance that was launched from an AMI with a billing product code, make sure that the Reserved Instance has the matching billing product code. If you purchase a Reserved Instance without the matching billing product code, the Reserved Instance will not be applied to the On-Demand Instance. For information about how to obtain the platform details and billing information of an AMI, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ami-billing-info.html\">Obtaining Billing Information</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>.</p> <p>If needed, you can deregister an AMI at any time. Any modifications you make to an AMI backed by an instance store volume invalidates its registration. If you make changes to an image, deregister the previous image and register the new image.</p>"
+    },
+    "RegisterTransitGatewayMulticastGroupMembers":{
+      "name":"RegisterTransitGatewayMulticastGroupMembers",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"RegisterTransitGatewayMulticastGroupMembersRequest"},
+      "output":{"shape":"RegisterTransitGatewayMulticastGroupMembersResult"},
+      "documentation":"<p>Registers members (network interfaces) with the transit gateway multicast group. A member is a network interface associated with a supported EC2 instance that receives multicast traffic. For information about supported instances, see <a href=\"https://docs.aws.amazon.com/vpc/latest/tgw/transit-gateway-limits.html#multicast-limits\">Multicast Consideration</a> in <i>Amazon VPC Transit Gateways</i>.</p> <p>After you add the members, use <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_SearchTransitGatewayMulticastGroups.html\">SearchTransitGatewayMulticastGroups</a> to verify that the members were added to the transit gateway multicast group.</p>"
+    },
+    "RegisterTransitGatewayMulticastGroupSources":{
+      "name":"RegisterTransitGatewayMulticastGroupSources",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"RegisterTransitGatewayMulticastGroupSourcesRequest"},
+      "output":{"shape":"RegisterTransitGatewayMulticastGroupSourcesResult"},
+      "documentation":"<p>Registers sources (network interfaces) with the specified transit gateway multicast group.</p> <p>A multicast source is a network interface attached to a supported instance that sends multicast traffic. For information about supported instances, see <a href=\"https://docs.aws.amazon.com/vpc/latest/tgw/transit-gateway-limits.html#multicast-limits\">Multicast Considerations</a> in <i>Amazon VPC Transit Gateways</i>.</p> <p>After you add the source, use <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_SearchTransitGatewayMulticastGroups.html\">SearchTransitGatewayMulticastGroups</a> to verify that the source was added to the multicast group.</p>"
+    },
+    "RejectTransitGatewayPeeringAttachment":{
+      "name":"RejectTransitGatewayPeeringAttachment",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"RejectTransitGatewayPeeringAttachmentRequest"},
+      "output":{"shape":"RejectTransitGatewayPeeringAttachmentResult"},
+      "documentation":"<p>Rejects a transit gateway peering attachment request.</p>"
     },
     "RejectTransitGatewayVpcAttachment":{
       "name":"RejectTransitGatewayVpcAttachment",
@@ -3258,7 +3638,7 @@
         "requestUri":"/"
       },
       "input":{"shape":"ReplaceRouteRequest"},
-      "documentation":"<p>Replaces an existing route within a route table in a VPC. You must provide only one of the following: internet gateway or virtual private gateway, NAT instance, NAT gateway, VPC peering connection, network interface, or egress-only internet gateway.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/vpc/latest/userguide/VPC_Route_Tables.html\">Route Tables</a> in the <i>Amazon Virtual Private Cloud User Guide</i>.</p>"
+      "documentation":"<p>Replaces an existing route within a route table in a VPC. You must provide only one of the following: internet gateway, virtual private gateway, NAT instance, NAT gateway, VPC peering connection, network interface, egress-only internet gateway, or transit gateway.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/vpc/latest/userguide/VPC_Route_Tables.html\">Route Tables</a> in the <i>Amazon Virtual Private Cloud User Guide</i>.</p>"
     },
     "ReplaceRouteTableAssociation":{
       "name":"ReplaceRouteTableAssociation",
@@ -3268,7 +3648,7 @@
       },
       "input":{"shape":"ReplaceRouteTableAssociationRequest"},
       "output":{"shape":"ReplaceRouteTableAssociationResult"},
-      "documentation":"<p>Changes the route table associated with a given subnet in a VPC. After the operation completes, the subnet uses the routes in the new route table it's associated with. For more information about route tables, see <a href=\"https://docs.aws.amazon.com/vpc/latest/userguide/VPC_Route_Tables.html\">Route Tables</a> in the <i>Amazon Virtual Private Cloud User Guide</i>.</p> <p>You can also use ReplaceRouteTableAssociation to change which table is the main route table in the VPC. You just specify the main route table's association ID and the route table to be the new main route table.</p>"
+      "documentation":"<p>Changes the route table associated with a given subnet, internet gateway, or virtual private gateway in a VPC. After the operation completes, the subnet or gateway uses the routes in the new route table. For more information about route tables, see <a href=\"https://docs.aws.amazon.com/vpc/latest/userguide/VPC_Route_Tables.html\">Route Tables</a> in the <i>Amazon Virtual Private Cloud User Guide</i>.</p> <p>You can also use this operation to change which table is the main route table in the VPC. Specify the main route table's association ID and the route table ID of the new main route table.</p>"
     },
     "ReplaceTransitGatewayRoute":{
       "name":"ReplaceTransitGatewayRoute",
@@ -3297,7 +3677,7 @@
       },
       "input":{"shape":"RequestSpotFleetRequest"},
       "output":{"shape":"RequestSpotFleetResponse"},
-      "documentation":"<p>Creates a Spot Fleet request.</p> <p>The Spot Fleet request specifies the total target capacity and the On-Demand target capacity. Amazon EC2 calculates the difference between the total capacity and On-Demand capacity, and launches the difference as Spot capacity.</p> <p>You can submit a single request that includes multiple launch specifications that vary by instance type, AMI, Availability Zone, or subnet.</p> <p>By default, the Spot Fleet requests Spot Instances in the Spot Instance pool where the price per unit is the lowest. Each launch specification can include its own instance weighting that reflects the value of the instance type to your application workload.</p> <p>Alternatively, you can specify that the Spot Fleet distribute the target capacity across the Spot pools included in its launch specifications. By ensuring that the Spot Instances in your Spot Fleet are in different Spot pools, you can improve the availability of your fleet.</p> <p>You can specify tags for the Spot Instances. You cannot tag other resource types in a Spot Fleet request because only the <code>instance</code> resource type is supported.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/spot-fleet-requests.html\">Spot Fleet Requests</a> in the <i>Amazon EC2 User Guide for Linux Instances</i>.</p>"
+      "documentation":"<p>Creates a Spot Fleet request.</p> <p>The Spot Fleet request specifies the total target capacity and the On-Demand target capacity. Amazon EC2 calculates the difference between the total capacity and On-Demand capacity, and launches the difference as Spot capacity.</p> <p>You can submit a single request that includes multiple launch specifications that vary by instance type, AMI, Availability Zone, or subnet.</p> <p>By default, the Spot Fleet requests Spot Instances in the Spot Instance pool where the price per unit is the lowest. Each launch specification can include its own instance weighting that reflects the value of the instance type to your application workload.</p> <p>Alternatively, you can specify that the Spot Fleet distribute the target capacity across the Spot pools included in its launch specifications. By ensuring that the Spot Instances in your Spot Fleet are in different Spot pools, you can improve the availability of your fleet.</p> <p>You can specify tags for the Spot Fleet request and instances launched by the fleet. You cannot tag other resource types in a Spot Fleet request because only the <code>spot-fleet-request</code> and <code>instance</code> resource types are supported.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/spot-fleet-requests.html\">Spot Fleet Requests</a> in the <i>Amazon EC2 User Guide for Linux Instances</i>.</p>"
     },
     "RequestSpotInstances":{
       "name":"RequestSpotInstances",
@@ -3423,6 +3803,26 @@
       "output":{"shape":"RunScheduledInstancesResult"},
       "documentation":"<p>Launches the specified Scheduled Instances.</p> <p>Before you can launch a Scheduled Instance, you must purchase it and obtain an identifier using <a>PurchaseScheduledInstances</a>.</p> <p>You must launch a Scheduled Instance during its scheduled time period. You can't stop or reboot a Scheduled Instance, but you can terminate it as needed. If you terminate a Scheduled Instance before the current scheduled time period ends, you can launch it again after a few minutes. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-scheduled-instances.html\">Scheduled Instances</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>.</p>"
     },
+    "SearchLocalGatewayRoutes":{
+      "name":"SearchLocalGatewayRoutes",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"SearchLocalGatewayRoutesRequest"},
+      "output":{"shape":"SearchLocalGatewayRoutesResult"},
+      "documentation":"<p>Searches for routes in the specified local gateway route table.</p>"
+    },
+    "SearchTransitGatewayMulticastGroups":{
+      "name":"SearchTransitGatewayMulticastGroups",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"SearchTransitGatewayMulticastGroupsRequest"},
+      "output":{"shape":"SearchTransitGatewayMulticastGroupsResult"},
+      "documentation":"<p>Searches one or more transit gateway multicast groups and returns the group membership information.</p>"
+    },
     "SearchTransitGatewayRoutes":{
       "name":"SearchTransitGatewayRoutes",
       "http":{
@@ -3452,6 +3852,16 @@
       "output":{"shape":"StartInstancesResult"},
       "documentation":"<p>Starts an Amazon EBS-backed instance that you've previously stopped.</p> <p>Instances that use Amazon EBS volumes as their root devices can be quickly stopped and started. When an instance is stopped, the compute resources are released and you are not billed for instance usage. However, your root partition Amazon EBS volume remains and continues to persist your data, and you are charged for Amazon EBS volume usage. You can restart your instance at any time. Every time you start your Windows instance, Amazon EC2 charges you for a full instance hour. If you stop and restart your Windows instance, a new instance hour begins and Amazon EC2 charges you for another full instance hour even if you are still within the same 60-minute period when it was stopped. Every time you start your Linux instance, Amazon EC2 charges a one-minute minimum for instance usage, and thereafter charges per second for instance usage.</p> <p>Before stopping an instance, make sure it is in a state from which it can be restarted. Stopping an instance does not preserve data stored in RAM.</p> <p>Performing this operation on an instance that uses an instance store as its root device returns an error.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Stop_Start.html\">Stopping Instances</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>.</p>"
     },
+    "StartVpcEndpointServicePrivateDnsVerification":{
+      "name":"StartVpcEndpointServicePrivateDnsVerification",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"StartVpcEndpointServicePrivateDnsVerificationRequest"},
+      "output":{"shape":"StartVpcEndpointServicePrivateDnsVerificationResult"},
+      "documentation":"<p>Initiates the verification process to prove that the service provider owns the private DNS name domain for the endpoint service.</p> <p>The service provider must successfully perform the verification before the consumer can use the name to access the service.</p> <p>Before the service provider runs this command, they must add a record to the DNS server. For more information, see <a href=\"https://docs.aws.amazon.com/vpc/latest/userguide/ndpoint-services-dns-validation.html#add-dns-txt-record\">Adding a TXT Record to Your Domain's DNS Server </a> in the <i>Amazon VPC User Guide</i>.</p>"
+    },
     "StopInstances":{
       "name":"StopInstances",
       "http":{
@@ -3460,7 +3870,7 @@
       },
       "input":{"shape":"StopInstancesRequest"},
       "output":{"shape":"StopInstancesResult"},
-      "documentation":"<p>Stops an Amazon EBS-backed instance.</p> <p>You can use the Stop action to hibernate an instance if the instance is <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Hibernate.html#enabling-hibernation\">enabled for hibernation</a> and it meets the <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Hibernate.html#hibernating-prerequisites\">hibernation prerequisites</a>. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Hibernate.html\">Hibernate Your Instance</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>.</p> <p>We don't charge usage for a stopped instance, or data transfer fees; however, your root partition Amazon EBS volume remains and continues to persist your data, and you are charged for Amazon EBS volume usage. Every time you start your Windows instance, Amazon EC2 charges you for a full instance hour. If you stop and restart your Windows instance, a new instance hour begins and Amazon EC2 charges you for another full instance hour even if you are still within the same 60-minute period when it was stopped. Every time you start your Linux instance, Amazon EC2 charges a one-minute minimum for instance usage, and thereafter charges per second for instance usage.</p> <p>You can't start, stop, or hibernate Spot Instances, and you can't stop or hibernate instance store-backed instances. For information about using hibernation for Spot Instances, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/spot-interruptions.html#hibernate-spot-instances\">Hibernating Interrupted Spot Instances</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>.</p> <p>When you stop or hibernate an instance, we shut it down. You can restart your instance at any time. Before stopping or hibernating an instance, make sure it is in a state from which it can be restarted. Stopping an instance does not preserve data stored in RAM, but hibernating an instance does preserve data stored in RAM. If an instance cannot hibernate successfully, a normal shutdown occurs.</p> <p>Stopping and hibernating an instance is different to rebooting or terminating it. For example, when you stop or hibernate an instance, the root device and any other devices attached to the instance persist. When you terminate an instance, the root device and any other devices attached during the instance launch are automatically deleted. For more information about the differences between rebooting, stopping, hibernating, and terminating instances, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-instance-lifecycle.html\">Instance Lifecycle</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>.</p> <p>When you stop an instance, we attempt to shut it down forcibly after a short while. If your instance appears stuck in the stopping state after a period of time, there may be an issue with the underlying host computer. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/TroubleshootingInstancesStopping.html\">Troubleshooting Stopping Your Instance</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>.</p>"
+      "documentation":"<p>Stops an Amazon EBS-backed instance.</p> <p>You can use the Stop action to hibernate an instance if the instance is <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Hibernate.html#enabling-hibernation\">enabled for hibernation</a> and it meets the <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Hibernate.html#hibernating-prerequisites\">hibernation prerequisites</a>. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Hibernate.html\">Hibernate Your Instance</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>.</p> <p>We don't charge usage for a stopped instance, or data transfer fees; however, your root partition Amazon EBS volume remains and continues to persist your data, and you are charged for Amazon EBS volume usage. Every time you start your Windows instance, Amazon EC2 charges you for a full instance hour. If you stop and restart your Windows instance, a new instance hour begins and Amazon EC2 charges you for another full instance hour even if you are still within the same 60-minute period when it was stopped. Every time you start your Linux instance, Amazon EC2 charges a one-minute minimum for instance usage, and thereafter charges per second for instance usage.</p> <p>You can't stop or hibernate instance store-backed instances. You can't use the Stop action to hibernate Spot Instances, but you can specify that Amazon EC2 should hibernate Spot Instances when they are interrupted. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/spot-interruptions.html#hibernate-spot-instances\">Hibernating Interrupted Spot Instances</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>.</p> <p>When you stop or hibernate an instance, we shut it down. You can restart your instance at any time. Before stopping or hibernating an instance, make sure it is in a state from which it can be restarted. Stopping an instance does not preserve data stored in RAM, but hibernating an instance does preserve data stored in RAM. If an instance cannot hibernate successfully, a normal shutdown occurs.</p> <p>Stopping and hibernating an instance is different to rebooting or terminating it. For example, when you stop or hibernate an instance, the root device and any other devices attached to the instance persist. When you terminate an instance, the root device and any other devices attached during the instance launch are automatically deleted. For more information about the differences between rebooting, stopping, hibernating, and terminating instances, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-instance-lifecycle.html\">Instance Lifecycle</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>.</p> <p>When you stop an instance, we attempt to shut it down forcibly after a short while. If your instance appears stuck in the stopping state after a period of time, there may be an issue with the underlying host computer. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/TroubleshootingInstancesStopping.html\">Troubleshooting Stopping Your Instance</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>.</p>"
     },
     "TerminateClientVpnConnections":{
       "name":"TerminateClientVpnConnections",
@@ -3539,7 +3949,7 @@
       },
       "input":{"shape":"WithdrawByoipCidrRequest"},
       "output":{"shape":"WithdrawByoipCidrResult"},
-      "documentation":"<p>Stops advertising an IPv4 address range that is provisioned as an address pool.</p> <p>You can perform this operation at most once every 10 seconds, even if you specify different address ranges each time.</p> <p>It can take a few minutes before traffic to the specified addresses stops routing to AWS because of BGP propagation delays.</p>"
+      "documentation":"<p>Stops advertising an address range that is provisioned as an address pool.</p> <p>You can perform this operation at most once every 10 seconds, even if you specify different address ranges each time.</p> <p>It can take a few minutes before traffic to the specified addresses stops routing to AWS because of BGP propagation delays.</p>"
     }
   },
   "shapes":{
@@ -3575,12 +3985,36 @@
       },
       "documentation":"<p>The result of the exchange and whether it was <code>successful</code>.</p>"
     },
+    "AcceptTransitGatewayPeeringAttachmentRequest":{
+      "type":"structure",
+      "required":["TransitGatewayAttachmentId"],
+      "members":{
+        "TransitGatewayAttachmentId":{
+          "shape":"TransitGatewayAttachmentId",
+          "documentation":"<p>The ID of the transit gateway attachment.</p>"
+        },
+        "DryRun":{
+          "shape":"Boolean",
+          "documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>"
+        }
+      }
+    },
+    "AcceptTransitGatewayPeeringAttachmentResult":{
+      "type":"structure",
+      "members":{
+        "TransitGatewayPeeringAttachment":{
+          "shape":"TransitGatewayPeeringAttachment",
+          "documentation":"<p>The transit gateway peering attachment.</p>",
+          "locationName":"transitGatewayPeeringAttachment"
+        }
+      }
+    },
     "AcceptTransitGatewayVpcAttachmentRequest":{
       "type":"structure",
       "required":["TransitGatewayAttachmentId"],
       "members":{
         "TransitGatewayAttachmentId":{
-          "shape":"String",
+          "shape":"TransitGatewayAttachmentId",
           "documentation":"<p>The ID of the attachment.</p>"
         },
         "DryRun":{
@@ -3611,11 +4045,11 @@
           "documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>"
         },
         "ServiceId":{
-          "shape":"String",
-          "documentation":"<p>The ID of the endpoint service.</p>"
+          "shape":"VpcEndpointServiceId",
+          "documentation":"<p>The ID of the VPC endpoint service.</p>"
         },
         "VpcEndpointIds":{
-          "shape":"ValueStringList",
+          "shape":"VpcEndpointIdList",
           "documentation":"<p>The IDs of one or more interface VPC endpoints.</p>",
           "locationName":"VpcEndpointId"
         }
@@ -3640,7 +4074,7 @@
           "locationName":"dryRun"
         },
         "VpcPeeringConnectionId":{
-          "shape":"String",
+          "shape":"VpcPeeringConnectionId",
           "documentation":"<p>The ID of the VPC peering connection. You must specify this parameter in the request.</p>",
           "locationName":"vpcPeeringConnectionId"
         }
@@ -3805,6 +4239,21 @@
           "shape":"String",
           "documentation":"<p>The ID of an address pool.</p>",
           "locationName":"publicIpv4Pool"
+        },
+        "NetworkBorderGroup":{
+          "shape":"String",
+          "documentation":"<p>The name of the location from which the IP address is advertised.</p>",
+          "locationName":"networkBorderGroup"
+        },
+        "CustomerOwnedIp":{
+          "shape":"String",
+          "documentation":"<p>The customer-owned IP address.</p>",
+          "locationName":"customerOwnedIp"
+        },
+        "CustomerOwnedIpv4Pool":{
+          "shape":"String",
+          "documentation":"<p>The ID of the customer-owned address pool.</p>",
+          "locationName":"customerOwnedIpv4Pool"
         }
       },
       "documentation":"<p>Describes an Elastic IP address.</p>"
@@ -3822,7 +4271,7 @@
       "members":{
         "Cidr":{
           "shape":"String",
-          "documentation":"<p>The IPv4 address range, in CIDR notation. This must be the exact range that you provisioned. You can't advertise only a portion of the provisioned range.</p>"
+          "documentation":"<p>The address range, in CIDR notation. This must be the exact range that you provisioned. You can't advertise only a portion of the provisioned range.</p>"
         },
         "DryRun":{
           "shape":"Boolean",
@@ -3862,6 +4311,14 @@
           "shape":"String",
           "documentation":"<p>The ID of an address pool that you own. Use this parameter to let Amazon EC2 select an address from the address pool. To specify a specific address from the address pool, use the <code>Address</code> parameter instead.</p>"
         },
+        "NetworkBorderGroup":{
+          "shape":"String",
+          "documentation":"<p>The location from which the IP address is advertised. Use this parameter to limit the address to this location.</p> <p>A network border group is a unique set of Availability Zones or Local Zones from where AWS advertises IP addresses and limits the addresses to the group. IP addresses cannot move between network border groups.</p> <p>Use <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_DescribeAvailabilityZones.html\">DescribeAvailabilityZones</a> to view the network border groups.</p> <note> <p>You cannot use a network border group with EC2 Classic. If you attempt this operation on EC2 classic, you will receive an <code>InvalidParameterCombination</code> error. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/errors-overview.html\">Error Codes</a>.</p> </note>"
+        },
+        "CustomerOwnedIpv4Pool":{
+          "shape":"String",
+          "documentation":"<p>The ID of a customer-owned address pool. Use this parameter to let Amazon EC2 select an address from the address pool. Alternatively, specify a specific address from the address pool.</p>"
+        },
         "DryRun":{
           "shape":"Boolean",
           "documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>",
@@ -3887,10 +4344,25 @@
           "documentation":"<p>The ID of an address pool.</p>",
           "locationName":"publicIpv4Pool"
         },
+        "NetworkBorderGroup":{
+          "shape":"String",
+          "documentation":"<p>The location from which the IP address is advertised.</p>",
+          "locationName":"networkBorderGroup"
+        },
         "Domain":{
           "shape":"DomainType",
           "documentation":"<p>Indicates whether this Elastic IP address is for use with instances in EC2-Classic (<code>standard</code>) or instances in a VPC (<code>vpc</code>).</p>",
           "locationName":"domain"
+        },
+        "CustomerOwnedIp":{
+          "shape":"String",
+          "documentation":"<p>The customer-owned IP address.</p>",
+          "locationName":"customerOwnedIp"
+        },
+        "CustomerOwnedIpv4Pool":{
+          "shape":"String",
+          "documentation":"<p>The ID of the customer-owned address pool.</p>",
+          "locationName":"customerOwnedIpv4Pool"
         }
       }
     },
@@ -3898,7 +4370,6 @@
       "type":"structure",
       "required":[
         "AvailabilityZone",
-        "InstanceType",
         "Quantity"
       ],
       "members":{
@@ -3919,9 +4390,13 @@
         },
         "InstanceType":{
           "shape":"String",
-          "documentation":"<p>Specifies the instance type for which to configure your Dedicated Hosts. When you specify the instance type, that is the only instance type that you can launch onto that host.</p>",
+          "documentation":"<p>Specifies the instance type to be supported by the Dedicated Hosts. If you specify an instance type, the Dedicated Hosts support instances of the specified instance type only.</p> <p>If you want the Dedicated Hosts to support multiple instance types in a specific instance family, omit this parameter and specify <b>InstanceFamily</b> instead. You cannot specify <b>InstanceType</b> and <b>InstanceFamily</b> in the same request.</p>",
           "locationName":"instanceType"
         },
+        "InstanceFamily":{
+          "shape":"String",
+          "documentation":"<p>Specifies the instance family to be supported by the Dedicated Hosts. If you specify an instance family, the Dedicated Hosts support multiple instance types within that instance family.</p> <p>If you want the Dedicated Hosts to support a specific instance type only, omit this parameter and specify <b>InstanceType</b> instead. You cannot specify <b>InstanceFamily</b> and <b>InstanceType</b> in the same request.</p>"
+        },
         "Quantity":{
           "shape":"Integer",
           "documentation":"<p>The number of Dedicated Hosts to allocate to your account with these parameters.</p>",
@@ -3949,10 +4424,11 @@
       },
       "documentation":"<p>Contains the output of AllocateHosts.</p>"
     },
+    "AllocationId":{"type":"string"},
     "AllocationIdList":{
       "type":"list",
       "member":{
-        "shape":"String",
+        "shape":"AllocationId",
         "locationName":"AllocationId"
       }
     },
@@ -3998,6 +4474,13 @@
         "locationName":"item"
       }
     },
+    "AllowsMultipleInstanceTypes":{
+      "type":"string",
+      "enum":[
+        "on",
+        "off"
+      ]
+    },
     "ApplySecurityGroupsToClientVpnTargetNetworkRequest":{
       "type":"structure",
       "required":[
@@ -4007,11 +4490,11 @@
       ],
       "members":{
         "ClientVpnEndpointId":{
-          "shape":"String",
+          "shape":"ClientVpnEndpointId",
           "documentation":"<p>The ID of the Client VPN endpoint.</p>"
         },
         "VpcId":{
-          "shape":"String",
+          "shape":"VpcId",
           "documentation":"<p>The ID of the VPC in which the associated target network is located.</p>"
         },
         "SecurityGroupIds":{
@@ -4035,6 +4518,21 @@
         }
       }
     },
+    "ArchitectureType":{
+      "type":"string",
+      "enum":[
+        "i386",
+        "x86_64",
+        "arm64"
+      ]
+    },
+    "ArchitectureTypeList":{
+      "type":"list",
+      "member":{
+        "shape":"ArchitectureType",
+        "locationName":"item"
+      }
+    },
     "ArchitectureValues":{
       "type":"string",
       "enum":[
@@ -4058,7 +4556,7 @@
           "locationName":"ipv6Addresses"
         },
         "NetworkInterfaceId":{
-          "shape":"String",
+          "shape":"NetworkInterfaceId",
           "documentation":"<p>The ID of the network interface.</p>",
           "locationName":"networkInterfaceId"
         }
@@ -4089,7 +4587,7 @@
           "locationName":"allowReassignment"
         },
         "NetworkInterfaceId":{
-          "shape":"String",
+          "shape":"NetworkInterfaceId",
           "documentation":"<p>The ID of the network interface.</p>",
           "locationName":"networkInterfaceId"
         },
@@ -4143,11 +4641,11 @@
       "type":"structure",
       "members":{
         "AllocationId":{
-          "shape":"String",
+          "shape":"AllocationId",
           "documentation":"<p>[EC2-VPC] The allocation ID. This is required for EC2-VPC.</p>"
         },
         "InstanceId":{
-          "shape":"String",
+          "shape":"InstanceId",
           "documentation":"<p>The ID of the instance. This is required for EC2-Classic. For EC2-VPC, you can specify either the instance ID or the network interface ID, but not both. The operation fails if you specify an instance ID unless exactly one network interface is attached.</p>"
         },
         "PublicIp":{
@@ -4165,7 +4663,7 @@
           "locationName":"dryRun"
         },
         "NetworkInterfaceId":{
-          "shape":"String",
+          "shape":"NetworkInterfaceId",
           "documentation":"<p>[EC2-VPC] The ID of the network interface. If the instance has more than one network interface, you must specify a network interface ID.</p> <p>For EC2-VPC, you can specify either the instance ID or the network interface ID, but not both. </p>",
           "locationName":"networkInterfaceId"
         },
@@ -4194,11 +4692,11 @@
       ],
       "members":{
         "ClientVpnEndpointId":{
-          "shape":"String",
+          "shape":"ClientVpnEndpointId",
           "documentation":"<p>The ID of the Client VPN endpoint.</p>"
         },
         "SubnetId":{
-          "shape":"String",
+          "shape":"SubnetId",
           "documentation":"<p>The ID of the subnet to associate with the Client VPN endpoint.</p>"
         },
         "ClientToken":{
@@ -4235,11 +4733,11 @@
       ],
       "members":{
         "DhcpOptionsId":{
-          "shape":"String",
+          "shape":"DefaultingDhcpOptionsId",
           "documentation":"<p>The ID of the DHCP options set, or <code>default</code> to associate no DHCP options with the VPC.</p>"
         },
         "VpcId":{
-          "shape":"String",
+          "shape":"VpcId",
           "documentation":"<p>The ID of the VPC.</p>"
         },
         "DryRun":{
@@ -4261,7 +4759,7 @@
           "documentation":"<p>The IAM instance profile.</p>"
         },
         "InstanceId":{
-          "shape":"String",
+          "shape":"InstanceId",
           "documentation":"<p>The ID of the instance.</p>"
         }
       }
@@ -4278,10 +4776,7 @@
     },
     "AssociateRouteTableRequest":{
       "type":"structure",
-      "required":[
-        "RouteTableId",
-        "SubnetId"
-      ],
+      "required":["RouteTableId"],
       "members":{
         "DryRun":{
           "shape":"Boolean",
@@ -4289,14 +4784,18 @@
           "locationName":"dryRun"
         },
         "RouteTableId":{
-          "shape":"String",
+          "shape":"RouteTableId",
           "documentation":"<p>The ID of the route table.</p>",
           "locationName":"routeTableId"
         },
         "SubnetId":{
-          "shape":"String",
+          "shape":"SubnetId",
           "documentation":"<p>The ID of the subnet.</p>",
           "locationName":"subnetId"
+        },
+        "GatewayId":{
+          "shape":"RouteGatewayId",
+          "documentation":"<p>The ID of the internet gateway or virtual private gateway.</p>"
         }
       }
     },
@@ -4307,6 +4806,11 @@
           "shape":"String",
           "documentation":"<p>The route table association ID. This ID is required for disassociating the route table.</p>",
           "locationName":"associationId"
+        },
+        "AssociationState":{
+          "shape":"RouteTableAssociationState",
+          "documentation":"<p>The state of the association.</p>",
+          "locationName":"associationState"
         }
       }
     },
@@ -4323,7 +4827,7 @@
           "locationName":"ipv6CidrBlock"
         },
         "SubnetId":{
-          "shape":"String",
+          "shape":"SubnetId",
           "documentation":"<p>The ID of your subnet.</p>",
           "locationName":"subnetId"
         }
@@ -4344,6 +4848,37 @@
         }
       }
     },
+    "AssociateTransitGatewayMulticastDomainRequest":{
+      "type":"structure",
+      "members":{
+        "TransitGatewayMulticastDomainId":{
+          "shape":"TransitGatewayMulticastDomainId",
+          "documentation":"<p>The ID of the transit gateway multicast domain.</p>"
+        },
+        "TransitGatewayAttachmentId":{
+          "shape":"TransitGatewayAttachmentId",
+          "documentation":"<p>The ID of the transit gateway attachment to associate with the transit gateway multicast domain.</p>"
+        },
+        "SubnetIds":{
+          "shape":"ValueStringList",
+          "documentation":"<p>The IDs of the subnets to associate with the transit gateway multicast domain.</p>"
+        },
+        "DryRun":{
+          "shape":"Boolean",
+          "documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>"
+        }
+      }
+    },
+    "AssociateTransitGatewayMulticastDomainResult":{
+      "type":"structure",
+      "members":{
+        "Associations":{
+          "shape":"TransitGatewayMulticastDomainAssociations",
+          "documentation":"<p>Information about the transit gateway multicast domain associations.</p>",
+          "locationName":"associations"
+        }
+      }
+    },
     "AssociateTransitGatewayRouteTableRequest":{
       "type":"structure",
       "required":[
@@ -4352,11 +4887,11 @@
       ],
       "members":{
         "TransitGatewayRouteTableId":{
-          "shape":"String",
+          "shape":"TransitGatewayRouteTableId",
           "documentation":"<p>The ID of the transit gateway route table.</p>"
         },
         "TransitGatewayAttachmentId":{
-          "shape":"String",
+          "shape":"TransitGatewayAttachmentId",
           "documentation":"<p>The ID of the attachment.</p>"
         },
         "DryRun":{
@@ -4389,9 +4924,21 @@
           "documentation":"<p>An IPv4 CIDR block to associate with the VPC.</p>"
         },
         "VpcId":{
-          "shape":"String",
+          "shape":"VpcId",
           "documentation":"<p>The ID of the VPC.</p>",
           "locationName":"vpcId"
+        },
+        "Ipv6CidrBlockNetworkBorderGroup":{
+          "shape":"String",
+          "documentation":"<p>The name of the location from which we advertise the IPV6 CIDR block. Use this parameter to limit the CiDR block to this location.</p> <p> You must set <code>AmazonProvidedIpv6CidrBlock</code> to <code>true</code> to use this parameter.</p> <p> You can have one IPv6 CIDR block association per network border group.</p>"
+        },
+        "Ipv6Pool":{
+          "shape":"Ipv6PoolEc2Id",
+          "documentation":"<p>The ID of an IPv6 address pool from which to allocate the IPv6 CIDR block.</p>"
+        },
+        "Ipv6CidrBlock":{
+          "shape":"String",
+          "documentation":"<p>An IPv6 CIDR block from the IPv6 address pool. You must also specify <code>Ipv6Pool</code> in the request.</p> <p>To let Amazon choose the IPv6 CIDR block for you, omit this parameter.</p>"
         }
       }
     },
@@ -4445,7 +4992,7 @@
     "AssociationIdList":{
       "type":"list",
       "member":{
-        "shape":"String",
+        "shape":"IamInstanceProfileAssociationId",
         "locationName":"AssociationId"
       }
     },
@@ -4494,12 +5041,12 @@
           "locationName":"SecurityGroupId"
         },
         "InstanceId":{
-          "shape":"String",
+          "shape":"InstanceId",
           "documentation":"<p>The ID of an EC2-Classic instance to link to the ClassicLink-enabled VPC.</p>",
           "locationName":"instanceId"
         },
         "VpcId":{
-          "shape":"String",
+          "shape":"VpcId",
           "documentation":"<p>The ID of a ClassicLink-enabled VPC.</p>",
           "locationName":"vpcId"
         }
@@ -4528,12 +5075,12 @@
           "locationName":"dryRun"
         },
         "InternetGatewayId":{
-          "shape":"String",
+          "shape":"InternetGatewayId",
           "documentation":"<p>The ID of the internet gateway.</p>",
           "locationName":"internetGatewayId"
         },
         "VpcId":{
-          "shape":"String",
+          "shape":"VpcId",
           "documentation":"<p>The ID of the VPC.</p>",
           "locationName":"vpcId"
         }
@@ -4558,12 +5105,12 @@
           "locationName":"dryRun"
         },
         "InstanceId":{
-          "shape":"String",
+          "shape":"InstanceId",
           "documentation":"<p>The ID of the instance.</p>",
           "locationName":"instanceId"
         },
         "NetworkInterfaceId":{
-          "shape":"String",
+          "shape":"NetworkInterfaceId",
           "documentation":"<p>The ID of the network interface.</p>",
           "locationName":"networkInterfaceId"
         }
@@ -4594,11 +5141,11 @@
           "documentation":"<p>The device name (for example, <code>/dev/sdh</code> or <code>xvdh</code>).</p>"
         },
         "InstanceId":{
-          "shape":"String",
+          "shape":"InstanceId",
           "documentation":"<p>The ID of the instance.</p>"
         },
         "VolumeId":{
-          "shape":"String",
+          "shape":"VolumeId",
           "documentation":"<p>The ID of the EBS volume. The volume and instance must be within the same Availability Zone.</p>"
         },
         "DryRun":{
@@ -4606,8 +5153,7 @@
           "documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>",
           "locationName":"dryRun"
         }
-      },
-      "documentation":"<p>Contains the parameters for AttachVolume.</p>"
+      }
     },
     "AttachVpnGatewayRequest":{
       "type":"structure",
@@ -4617,11 +5163,11 @@
       ],
       "members":{
         "VpcId":{
-          "shape":"String",
+          "shape":"VpcId",
           "documentation":"<p>The ID of the VPC.</p>"
         },
         "VpnGatewayId":{
-          "shape":"String",
+          "shape":"VpnGatewayId",
           "documentation":"<p>The ID of the virtual private gateway.</p>"
         },
         "DryRun":{
@@ -4725,7 +5271,7 @@
       ],
       "members":{
         "ClientVpnEndpointId":{
-          "shape":"String",
+          "shape":"ClientVpnEndpointId",
           "documentation":"<p>The ID of the Client VPN endpoint.</p>"
         },
         "TargetNetworkCidr":{
@@ -4775,7 +5321,7 @@
           "locationName":"dryRun"
         },
         "GroupId":{
-          "shape":"String",
+          "shape":"SecurityGroupId",
           "documentation":"<p>The ID of the security group.</p>",
           "locationName":"groupId"
         },
@@ -4828,11 +5374,11 @@
           "documentation":"<p>The start of port range for the TCP and UDP protocols, or an ICMP type number. For the ICMP type number, use <code>-1</code> to specify all types. If you specify all ICMP types, you must specify all codes.</p> <p>Alternatively, use a set of IP permissions to specify multiple rules and a description for the rule.</p>"
         },
         "GroupId":{
-          "shape":"String",
+          "shape":"SecurityGroupId",
           "documentation":"<p>The ID of the security group. You must specify either the security group ID or the security group name in the request. For security groups in a nondefault VPC, you must specify the security group ID.</p>"
         },
         "GroupName":{
-          "shape":"String",
+          "shape":"SecurityGroupName",
           "documentation":"<p>[EC2-Classic, default VPC] The name of the security group. You must specify either the security group ID or the security group name in the request.</p>"
         },
         "IpPermissions":{
@@ -4876,17 +5422,23 @@
         "off"
       ]
     },
+    "AutoRecoveryFlag":{"type":"boolean"},
     "AvailabilityZone":{
       "type":"structure",
       "members":{
         "State":{
           "shape":"AvailabilityZoneState",
-          "documentation":"<p>The state of the Availability Zone.</p>",
+          "documentation":"<p>The state of the Availability Zone or Local Zone.</p>",
           "locationName":"zoneState"
         },
+        "OptInStatus":{
+          "shape":"AvailabilityZoneOptInStatus",
+          "documentation":"<p> For Availability Zones, this parameter always has the value of <code>opt-in-not-required</code>.</p> <p>For Local Zones, this parameter is the opt in status. The possible values are <code>opted-in</code>, and <code>not-opted-in</code>.</p>",
+          "locationName":"optInStatus"
+        },
         "Messages":{
           "shape":"AvailabilityZoneMessageList",
-          "documentation":"<p>Any messages about the Availability Zone.</p>",
+          "documentation":"<p>Any messages about the Availability Zone or Local Zone.</p>",
           "locationName":"messageSet"
         },
         "RegionName":{
@@ -4896,16 +5448,26 @@
         },
         "ZoneName":{
           "shape":"String",
-          "documentation":"<p>The name of the Availability Zone.</p>",
+          "documentation":"<p>The name of the Availability Zone or Local Zone.</p>",
           "locationName":"zoneName"
         },
         "ZoneId":{
           "shape":"String",
-          "documentation":"<p>The ID of the Availability Zone.</p>",
+          "documentation":"<p>The ID of the Availability Zone or Local Zone.</p>",
           "locationName":"zoneId"
+        },
+        "GroupName":{
+          "shape":"String",
+          "documentation":"<p> For Availability Zones, this parameter has the same value as the Region name.</p> <p>For Local Zones, the name of the associated group, for example <code>us-west-2-lax-1</code>.</p>",
+          "locationName":"groupName"
+        },
+        "NetworkBorderGroup":{
+          "shape":"String",
+          "documentation":"<p>The name of the location from which the address is advertised.</p>",
+          "locationName":"networkBorderGroup"
         }
       },
-      "documentation":"<p>Describes an Availability Zone.</p>"
+      "documentation":"<p>Describes an Availability Zone or Local Zone.</p>"
     },
     "AvailabilityZoneList":{
       "type":"list",
@@ -4919,11 +5481,11 @@
       "members":{
         "Message":{
           "shape":"String",
-          "documentation":"<p>The message about the Availability Zone.</p>",
+          "documentation":"<p>The message about the Availability Zone or Local Zone.</p>",
           "locationName":"message"
         }
       },
-      "documentation":"<p>Describes a message about an Availability Zone.</p>"
+      "documentation":"<p>Describes a message about an Availability Zone or Local Zone.</p>"
     },
     "AvailabilityZoneMessageList":{
       "type":"list",
@@ -4932,6 +5494,14 @@
         "locationName":"item"
       }
     },
+    "AvailabilityZoneOptInStatus":{
+      "type":"string",
+      "enum":[
+        "opt-in-not-required",
+        "opted-in",
+        "not-opted-in"
+      ]
+    },
     "AvailabilityZoneState":{
       "type":"string",
       "enum":[
@@ -4941,21 +5511,28 @@
         "unavailable"
       ]
     },
+    "AvailabilityZoneStringList":{
+      "type":"list",
+      "member":{
+        "shape":"String",
+        "locationName":"AvailabilityZone"
+      }
+    },
     "AvailableCapacity":{
       "type":"structure",
       "members":{
         "AvailableInstanceCapacity":{
           "shape":"AvailableInstanceCapacityList",
-          "documentation":"<p>The total number of instances supported by the Dedicated Host.</p>",
+          "documentation":"<p>The number of instances that can be launched onto the Dedicated Host depending on the host's available capacity. For Dedicated Hosts that support multiple instance types, this parameter represents the number of instances for each instance size that is supported on the host.</p>",
           "locationName":"availableInstanceCapacity"
         },
         "AvailableVCpus":{
           "shape":"Integer",
-          "documentation":"<p>The number of vCPUs available on the Dedicated Host.</p>",
+          "documentation":"<p>The number of vCPUs available for launching instances onto the Dedicated Host.</p>",
           "locationName":"availableVCpus"
         }
       },
-      "documentation":"<p>The capacity information for instances launched onto the Dedicated Host.</p>"
+      "documentation":"<p>The capacity information for instances that can be launched onto the Dedicated Host. </p>"
     },
     "AvailableInstanceCapacityList":{
       "type":"list",
@@ -4964,6 +5541,7 @@
         "locationName":"item"
       }
     },
+    "BareMetalFlag":{"type":"boolean"},
     "BatchState":{
       "type":"string",
       "enum":[
@@ -5034,10 +5612,11 @@
       }
     },
     "Boolean":{"type":"boolean"},
+    "BundleId":{"type":"string"},
     "BundleIdStringList":{
       "type":"list",
       "member":{
-        "shape":"String",
+        "shape":"BundleId",
         "locationName":"BundleId"
       }
     },
@@ -5049,7 +5628,7 @@
       ],
       "members":{
         "InstanceId":{
-          "shape":"String",
+          "shape":"InstanceId",
           "documentation":"<p>The ID of the instance to bundle.</p> <p>Type: String</p> <p>Default: None</p> <p>Required: Yes</p>"
         },
         "Storage":{
@@ -5156,12 +5735,13 @@
         "failed"
       ]
     },
+    "BurstablePerformanceFlag":{"type":"boolean"},
     "ByoipCidr":{
       "type":"structure",
       "members":{
         "Cidr":{
           "shape":"String",
-          "documentation":"<p>The public IPv4 address range, in CIDR notation.</p>",
+          "documentation":"<p>The address range, in CIDR notation.</p>",
           "locationName":"cidr"
         },
         "Description":{
@@ -5198,7 +5778,8 @@
         "failed-provision",
         "pending-deprovision",
         "pending-provision",
-        "provisioned"
+        "provisioned",
+        "provisioned-not-publicly-advertisable"
       ]
     },
     "CancelBatchErrorCode":{
@@ -5215,7 +5796,7 @@
       "required":["BundleId"],
       "members":{
         "BundleId":{
-          "shape":"String",
+          "shape":"BundleId",
           "documentation":"<p>The ID of the bundle task.</p>"
         },
         "DryRun":{
@@ -5242,7 +5823,7 @@
       "required":["CapacityReservationId"],
       "members":{
         "CapacityReservationId":{
-          "shape":"String",
+          "shape":"CapacityReservationId",
           "documentation":"<p>The ID of the Capacity Reservation to be cancelled.</p>"
         },
         "DryRun":{
@@ -5266,7 +5847,7 @@
       "required":["ConversionTaskId"],
       "members":{
         "ConversionTaskId":{
-          "shape":"String",
+          "shape":"ConversionTaskId",
           "documentation":"<p>The ID of the conversion task.</p>",
           "locationName":"conversionTaskId"
         },
@@ -5287,7 +5868,7 @@
       "required":["ExportTaskId"],
       "members":{
         "ExportTaskId":{
-          "shape":"String",
+          "shape":"ExportVmTaskId",
           "documentation":"<p>The ID of the export task. This is the ID returned by <code>CreateInstanceExportTask</code>.</p>",
           "locationName":"exportTaskId"
         }
@@ -5305,7 +5886,7 @@
           "documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>"
         },
         "ImportTaskId":{
-          "shape":"String",
+          "shape":"ImportTaskId",
           "documentation":"<p>The ID of the import image or import snapshot task to be canceled.</p>"
         }
       }
@@ -5335,7 +5916,7 @@
       "required":["ReservedInstancesListingId"],
       "members":{
         "ReservedInstancesListingId":{
-          "shape":"String",
+          "shape":"ReservedInstancesListingId",
           "documentation":"<p>The ID of the Reserved Instance listing.</p>",
           "locationName":"reservedInstancesListingId"
         }
@@ -5405,7 +5986,7 @@
           "locationName":"dryRun"
         },
         "SpotFleetRequestIds":{
-          "shape":"ValueStringList",
+          "shape":"SpotFleetRequestIdList",
           "documentation":"<p>The IDs of the Spot Fleet requests.</p>",
           "locationName":"spotFleetRequestId"
         },
@@ -5618,10 +6199,11 @@
       },
       "documentation":"<p>Describes a Capacity Reservation.</p>"
     },
+    "CapacityReservationId":{"type":"string"},
     "CapacityReservationIdSet":{
       "type":"list",
       "member":{
-        "shape":"String",
+        "shape":"CapacityReservationId",
         "locationName":"item"
       }
     },
@@ -5641,6 +6223,27 @@
         "Linux with SQL Server Enterprise"
       ]
     },
+    "CapacityReservationOptions":{
+      "type":"structure",
+      "members":{
+        "UsageStrategy":{
+          "shape":"FleetCapacityReservationUsageStrategy",
+          "documentation":"<p>Indicates whether to use unused Capacity Reservations for fulfilling On-Demand capacity.</p> <p>If you specify <code>use-capacity-reservations-first</code>, the fleet uses unused Capacity Reservations to fulfill On-Demand capacity up to the target On-Demand capacity. If multiple instance pools have unused Capacity Reservations, the On-Demand allocation strategy (<code>lowest-price</code> or <code>prioritized</code>) is applied. If the number of unused Capacity Reservations is less than the On-Demand target capacity, the remaining On-Demand target capacity is launched according to the On-Demand allocation strategy (<code>lowest-price</code> or <code>prioritized</code>).</p> <p>If you do not specify a value, the fleet fulfils the On-Demand capacity according to the chosen On-Demand allocation strategy.</p>",
+          "locationName":"usageStrategy"
+        }
+      },
+      "documentation":"<p>Describes the strategy for using unused Capacity Reservations for fulfilling On-Demand capacity.</p> <note> <p>This strategy can only be used if the EC2 Fleet is of type <code>instant</code>.</p> </note> <p>For more information about Capacity Reservations, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-capacity-reservations.html\">On-Demand Capacity Reservations</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>. For examples of using Capacity Reservations in an EC2 Fleet, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-fleet-examples.html\">EC2 Fleet Example Configurations</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>.</p>"
+    },
+    "CapacityReservationOptionsRequest":{
+      "type":"structure",
+      "members":{
+        "UsageStrategy":{
+          "shape":"FleetCapacityReservationUsageStrategy",
+          "documentation":"<p>Indicates whether to use unused Capacity Reservations for fulfilling On-Demand capacity.</p> <p>If you specify <code>use-capacity-reservations-first</code>, the fleet uses unused Capacity Reservations to fulfill On-Demand capacity up to the target On-Demand capacity. If multiple instance pools have unused Capacity Reservations, the On-Demand allocation strategy (<code>lowest-price</code> or <code>prioritized</code>) is applied. If the number of unused Capacity Reservations is less than the On-Demand target capacity, the remaining On-Demand target capacity is launched according to the On-Demand allocation strategy (<code>lowest-price</code> or <code>prioritized</code>).</p> <p>If you do not specify a value, the fleet fulfils the On-Demand capacity according to the chosen On-Demand allocation strategy.</p>"
+        }
+      },
+      "documentation":"<p>Describes the strategy for using unused Capacity Reservations for fulfilling On-Demand capacity.</p> <note> <p>This strategy can only be used if the EC2 Fleet is of type <code>instant</code>.</p> </note> <p>For more information about Capacity Reservations, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-capacity-reservations.html\">On-Demand Capacity Reservations</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>. For examples of using Capacity Reservations in an EC2 Fleet, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-fleet-examples.html\">EC2 Fleet Example Configurations</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>.</p>"
+    },
     "CapacityReservationPreference":{
       "type":"string",
       "enum":[
@@ -5699,7 +6302,7 @@
       "type":"structure",
       "members":{
         "CapacityReservationId":{
-          "shape":"String",
+          "shape":"CapacityReservationId",
           "documentation":"<p>The ID of the Capacity Reservation.</p>"
         }
       },
@@ -5912,6 +6515,7 @@
       },
       "documentation":"<p>Describes the client-specific data.</p>"
     },
+    "ClientVpnAssociationId":{"type":"string"},
     "ClientVpnAuthentication":{
       "type":"structure",
       "members":{
@@ -6155,6 +6759,11 @@
           "documentation":"<p>The transport protocol used by the Client VPN endpoint.</p>",
           "locationName":"transportProtocol"
         },
+        "VpnPort":{
+          "shape":"Integer",
+          "documentation":"<p>The port number for the Client VPN endpoint.</p>",
+          "locationName":"vpnPort"
+        },
         "AssociatedTargetNetworks":{
           "shape":"AssociatedTargetNetworkSet",
           "documentation":"<p>Information about the associated target networks. A target network is a subnet in a VPC.</p>",
@@ -6181,10 +6790,28 @@
           "shape":"TagList",
           "documentation":"<p>Any tags assigned to the Client VPN endpoint.</p>",
           "locationName":"tagSet"
+        },
+        "SecurityGroupIds":{
+          "shape":"ClientVpnSecurityGroupIdSet",
+          "documentation":"<p>The IDs of the security groups for the target network.</p>",
+          "locationName":"securityGroupIdSet"
+        },
+        "VpcId":{
+          "shape":"VpcId",
+          "documentation":"<p>The ID of the VPC.</p>",
+          "locationName":"vpcId"
         }
       },
       "documentation":"<p>Describes a Client VPN endpoint.</p>"
     },
+    "ClientVpnEndpointId":{"type":"string"},
+    "ClientVpnEndpointIdList":{
+      "type":"list",
+      "member":{
+        "shape":"ClientVpnEndpointId",
+        "locationName":"item"
+      }
+    },
     "ClientVpnEndpointStatus":{
       "type":"structure",
       "members":{
@@ -6286,7 +6913,86 @@
     "ClientVpnSecurityGroupIdSet":{
       "type":"list",
       "member":{
-        "shape":"String",
+        "shape":"SecurityGroupId",
+        "locationName":"item"
+      }
+    },
+    "CoipAddressUsage":{
+      "type":"structure",
+      "members":{
+        "AllocationId":{
+          "shape":"String",
+          "documentation":"<p>The allocation ID of the address.</p>",
+          "locationName":"allocationId"
+        },
+        "AwsAccountId":{
+          "shape":"String",
+          "documentation":"<p>The AWS account ID.</p>",
+          "locationName":"awsAccountId"
+        },
+        "AwsService":{
+          "shape":"String",
+          "documentation":"<p>The AWS service.</p>",
+          "locationName":"awsService"
+        },
+        "CoIp":{
+          "shape":"String",
+          "documentation":"<p>The customer-owned IP address.</p>",
+          "locationName":"coIp"
+        }
+      },
+      "documentation":"<p>Describes address usage for a customer-owned address pool.</p>"
+    },
+    "CoipAddressUsageSet":{
+      "type":"list",
+      "member":{
+        "shape":"CoipAddressUsage",
+        "locationName":"item"
+      }
+    },
+    "CoipPool":{
+      "type":"structure",
+      "members":{
+        "PoolId":{
+          "shape":"CoipPoolId",
+          "documentation":"<p>The ID of the address pool.</p>",
+          "locationName":"poolId"
+        },
+        "PoolCidrs":{
+          "shape":"ValueStringList",
+          "documentation":"<p>The address ranges of the address pool.</p>",
+          "locationName":"poolCidrSet"
+        },
+        "LocalGatewayRouteTableId":{
+          "shape":"LocalGatewayRoutetableId",
+          "documentation":"<p>The ID of the local gateway route table.</p>",
+          "locationName":"localGatewayRouteTableId"
+        },
+        "Tags":{
+          "shape":"TagList",
+          "documentation":"<p>The tags.</p>",
+          "locationName":"tagSet"
+        }
+      },
+      "documentation":"<p>Describes a customer-owned address pool.</p>"
+    },
+    "CoipPoolId":{"type":"string"},
+    "CoipPoolIdSet":{
+      "type":"list",
+      "member":{
+        "shape":"CoipPoolId",
+        "locationName":"item"
+      }
+    },
+    "CoipPoolMaxResults":{
+      "type":"integer",
+      "max":1000,
+      "min":5
+    },
+    "CoipPoolSet":{
+      "type":"list",
+      "member":{
+        "shape":"CoipPool",
         "locationName":"item"
       }
     },
@@ -6298,7 +7004,7 @@
       ],
       "members":{
         "InstanceId":{
-          "shape":"String",
+          "shape":"InstanceId",
           "documentation":"<p>The ID of the instance.</p>"
         },
         "ProductCode":{
@@ -6404,6 +7110,7 @@
       },
       "documentation":"<p>Describes a connection notification for a VPC endpoint or VPC endpoint service.</p>"
     },
+    "ConnectionNotificationId":{"type":"string"},
     "ConnectionNotificationSet":{
       "type":"list",
       "member":{
@@ -6429,7 +7136,7 @@
     "ConversionIdStringList":{
       "type":"list",
       "member":{
-        "shape":"String",
+        "shape":"ConversionTaskId",
         "locationName":"item"
       }
     },
@@ -6474,6 +7181,7 @@
       },
       "documentation":"<p>Describes a conversion task.</p>"
     },
+    "ConversionTaskId":{"type":"string"},
     "ConversionTaskState":{
       "type":"string",
       "enum":[
@@ -6495,7 +7203,7 @@
           "documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>"
         },
         "SourceFpgaImageId":{
-          "shape":"String",
+          "shape":"FpgaImageId",
           "documentation":"<p>The ID of the source AFI.</p>"
         },
         "Description":{
@@ -6548,8 +7256,8 @@
           "locationName":"encrypted"
         },
         "KmsKeyId":{
-          "shape":"String",
-          "documentation":"<p>An identifier for the AWS Key Management Service (AWS KMS) customer master key (CMK) to use when creating the encrypted volume. This parameter is only required if you want to use a non-default CMK; if this parameter is not specified, the default CMK for EBS is used. If a <code>KmsKeyId</code> is specified, the <code>Encrypted</code> flag must also be set. </p> <p>To specify a CMK, use its key ID, Amazon Resource Name (ARN), alias name, or alias ARN. When using an alias name, prefix it with \"alias/\". For example:</p> <ul> <li> <p>Key ID: <code>1234abcd-12ab-34cd-56ef-1234567890ab</code> </p> </li> <li> <p>Key ARN: <code>arn:aws:kms:us-east-2:111122223333:key/1234abcd-12ab-34cd-56ef-1234567890ab</code> </p> </li> <li> <p>Alias name: <code>alias/ExampleAlias</code> </p> </li> <li> <p>Alias ARN: <code>arn:aws:kms:us-east-2:111122223333:alias/ExampleAlias</code> </p> </li> </ul> <p>AWS parses <code>KmsKeyId</code> asynchronously, meaning that the action you call may appear to complete even though you provided an invalid identifier. This action will eventually report failure. </p> <p>The specified CMK must exist in the Region that the snapshot is being copied to. </p>",
+          "shape":"KmsKeyId",
+          "documentation":"<p>An identifier for the symmetric AWS Key Management Service (AWS KMS) customer master key (CMK) to use when creating the encrypted volume. This parameter is only required if you want to use a non-default CMK; if this parameter is not specified, the default CMK for EBS is used. If a <code>KmsKeyId</code> is specified, the <code>Encrypted</code> flag must also be set. </p> <p>To specify a CMK, use its key ID, Amazon Resource Name (ARN), alias name, or alias ARN. When using an alias name, prefix it with \"alias/\". For example:</p> <ul> <li> <p>Key ID: <code>1234abcd-12ab-34cd-56ef-1234567890ab</code> </p> </li> <li> <p>Key ARN: <code>arn:aws:kms:us-east-2:111122223333:key/1234abcd-12ab-34cd-56ef-1234567890ab</code> </p> </li> <li> <p>Alias name: <code>alias/ExampleAlias</code> </p> </li> <li> <p>Alias ARN: <code>arn:aws:kms:us-east-2:111122223333:alias/ExampleAlias</code> </p> </li> </ul> <p>AWS parses <code>KmsKeyId</code> asynchronously, meaning that the action you call may appear to complete even though you provided an invalid identifier. This action will eventually report failure. </p> <p>The specified CMK must exist in the Region that the snapshot is being copied to. </p> <p>Amazon EBS does not support asymmetric CMKs.</p>",
           "locationName":"kmsKeyId"
         },
         "Name":{
@@ -6605,7 +7313,7 @@
           "locationName":"encrypted"
         },
         "KmsKeyId":{
-          "shape":"String",
+          "shape":"KmsKeyId",
           "documentation":"<p>The identifier of the AWS Key Management Service (AWS KMS) customer master key (CMK) to use for Amazon EBS encryption. If this parameter is not specified, your AWS managed CMK for EBS is used. If <code>KmsKeyId</code> is specified, the encrypted state must be <code>true</code>.</p> <p>You can specify the CMK using any of the following:</p> <ul> <li> <p>Key ID. For example, key/1234abcd-12ab-34cd-56ef-1234567890ab.</p> </li> <li> <p>Key alias. For example, alias/ExampleAlias.</p> </li> <li> <p>Key ARN. For example, arn:aws:kms:<i>us-east-1</i>:<i>012345678910</i>:key/<i>abcd1234-a123-456a-a12b-a123b4cd56ef</i>.</p> </li> <li> <p>Alias ARN. For example, arn:aws:kms:<i>us-east-1</i>:<i>012345678910</i>:alias/<i>ExampleAlias</i>.</p> </li> </ul> <p>AWS authenticates the CMK asynchronously. Therefore, if you specify an ID, alias, or ARN that is not valid, the action can appear to complete, but eventually fails.</p>",
           "locationName":"kmsKeyId"
         },
@@ -6622,13 +7330,17 @@
           "shape":"String",
           "documentation":"<p>The ID of the EBS snapshot to copy.</p>"
         },
+        "TagSpecifications":{
+          "shape":"TagSpecificationList",
+          "documentation":"<p>The tags to apply to the new snapshot.</p>",
+          "locationName":"TagSpecification"
+        },
         "DryRun":{
           "shape":"Boolean",
           "documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>",
           "locationName":"dryRun"
         }
-      },
-      "documentation":"<p>Contains the parameters for CopySnapshot.</p>"
+      }
     },
     "CopySnapshotResult":{
       "type":"structure",
@@ -6637,14 +7349,26 @@
           "shape":"String",
           "documentation":"<p>The ID of the new snapshot.</p>",
           "locationName":"snapshotId"
+        },
+        "Tags":{
+          "shape":"TagList",
+          "documentation":"<p>Any tags applied to the new snapshot.</p>",
+          "locationName":"tagSet"
         }
-      },
-      "documentation":"<p>Contains the output of CopySnapshot.</p>"
+      }
     },
     "CopyTagsFromSource":{
       "type":"string",
       "enum":["volume"]
     },
+    "CoreCount":{"type":"integer"},
+    "CoreCountList":{
+      "type":"list",
+      "member":{
+        "shape":"CoreCount",
+        "locationName":"item"
+      }
+    },
     "CpuOptions":{
       "type":"structure",
       "members":{
@@ -6785,6 +7509,10 @@
           "shape":"TransportProtocol",
           "documentation":"<p>The transport protocol to be used by the VPN session.</p> <p>Default value: <code>udp</code> </p>"
         },
+        "VpnPort":{
+          "shape":"Integer",
+          "documentation":"<p>The port number to assign to the Client VPN endpoint for TCP and UDP traffic.</p> <p>Valid Values: <code>443</code> | <code>1194</code> </p> <p>Default Value: <code>443</code> </p>"
+        },
         "Description":{
           "shape":"String",
           "documentation":"<p>A brief description of the Client VPN endpoint.</p>"
@@ -6806,6 +7534,15 @@
           "shape":"TagSpecificationList",
           "documentation":"<p>The tags to apply to the Client VPN endpoint during creation.</p>",
           "locationName":"TagSpecification"
+        },
+        "SecurityGroupIds":{
+          "shape":"ClientVpnSecurityGroupIdSet",
+          "documentation":"<p>The IDs of one or more security groups to apply to the target network. You must also specify the ID of the VPC that contains the security groups.</p>",
+          "locationName":"SecurityGroupId"
+        },
+        "VpcId":{
+          "shape":"VpcId",
+          "documentation":"<p>The ID of the VPC to associate with the Client VPN endpoint. If no security group IDs are specified in the request, the default security group for the VPC is applied.</p>"
         }
       }
     },
@@ -6838,7 +7575,7 @@
       ],
       "members":{
         "ClientVpnEndpointId":{
-          "shape":"String",
+          "shape":"ClientVpnEndpointId",
           "documentation":"<p>The ID of the Client VPN endpoint to which to add the route.</p>"
         },
         "DestinationCidrBlock":{
@@ -6846,7 +7583,7 @@
           "documentation":"<p>The IPv4 address range, in CIDR notation, of the route destination. For example:</p> <ul> <li> <p>To add a route for Internet access, enter <code>0.0.0.0/0</code> </p> </li> <li> <p>To add a route for a peered VPC, enter the peered VPC's IPv4 CIDR range</p> </li> <li> <p>To add a route for an on-premises network, enter the AWS Site-to-Site VPN connection's IPv4 CIDR range</p> </li> </ul> <p>Route address ranges cannot overlap with the CIDR range specified for client allocation.</p>"
         },
         "TargetVpcSubnetId":{
-          "shape":"String",
+          "shape":"SubnetId",
           "documentation":"<p>The ID of the subnet through which you want to route traffic. The specified subnet must be an existing target network of the Client VPN endpoint.</p>"
         },
         "Description":{
@@ -6898,6 +7635,10 @@
           "shape":"GatewayType",
           "documentation":"<p>The type of VPN connection that this customer gateway supports (<code>ipsec.1</code>).</p>"
         },
+        "DeviceName":{
+          "shape":"String",
+          "documentation":"<p>A name for the customer gateway device.</p> <p>Length Constraints: Up to 255 characters.</p>"
+        },
         "DryRun":{
           "shape":"Boolean",
           "documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>",
@@ -6999,7 +7740,7 @@
           "documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>"
         },
         "VpcId":{
-          "shape":"String",
+          "shape":"VpcId",
           "documentation":"<p>The ID of the VPC for which to create the egress-only internet gateway.</p>"
         }
       }
@@ -7024,7 +7765,7 @@
       "members":{
         "LaunchTemplateAndOverrides":{
           "shape":"LaunchTemplateAndOverridesResponse",
-          "documentation":"<p>The launch templates and overrides that were used for launching the instances. Any parameters that you specify in the Overrides override the same parameters in the launch template.</p>",
+          "documentation":"<p>The launch templates and overrides that were used for launching the instances. The values that you specify in the Overrides replace the values in the launch template.</p>",
           "locationName":"launchTemplateAndOverrides"
         },
         "Lifecycle":{
@@ -7039,7 +7780,7 @@
         },
         "ErrorMessage":{
           "shape":"String",
-          "documentation":"<p>The error message that describes why the instance could not be launched. For more information about error messages, see ee <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/errors-overview.html.html\">Error Codes</a>.</p>",
+          "documentation":"<p>The error message that describes why the instance could not be launched. For more information about error messages, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/errors-overview.html.html\">Error Codes</a>.</p>",
           "locationName":"errorMessage"
         }
       },
@@ -7057,7 +7798,7 @@
       "members":{
         "LaunchTemplateAndOverrides":{
           "shape":"LaunchTemplateAndOverridesResponse",
-          "documentation":"<p>The launch templates and overrides that were used for launching the instances. Any parameters that you specify in the Overrides override the same parameters in the launch template.</p>",
+          "documentation":"<p>The launch templates and overrides that were used for launching the instances. The values that you specify in the Overrides replace the values in the launch template.</p>",
           "locationName":"launchTemplateAndOverrides"
         },
         "Lifecycle":{
@@ -7077,7 +7818,7 @@
         },
         "Platform":{
           "shape":"PlatformValues",
-          "documentation":"<p>The value is <code>Windows</code> for Windows instances; otherwise blank.</p>",
+          "documentation":"<p>The value is <code>Windows</code> for Windows instances. Otherwise, the value is blank.</p>",
           "locationName":"platform"
         }
       },
@@ -7103,7 +7844,7 @@
         },
         "ClientToken":{
           "shape":"String",
-          "documentation":"<p>Unique, case-sensitive identifier you provide to ensure the idempotency of the request. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/Run_Instance_Idempotency.html\">Ensuring Idempotency</a>.</p>"
+          "documentation":"<p>Unique, case-sensitive identifier that you provide to ensure the idempotency of the request. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/Run_Instance_Idempotency.html\">Ensuring Idempotency</a>.</p>"
         },
         "SpotOptions":{
           "shape":"SpotOptionsRequest",
@@ -7156,7 +7897,7 @@
       "type":"structure",
       "members":{
         "FleetId":{
-          "shape":"FleetIdentifier",
+          "shape":"FleetId",
           "documentation":"<p>The ID of the EC2 Fleet.</p>",
           "locationName":"fleetId"
         },
@@ -7197,7 +7938,7 @@
           "documentation":"<p>The name of a new or existing CloudWatch Logs log group where Amazon EC2 publishes your flow logs.</p> <p>If you specify <code>LogDestinationType</code> as <code>s3</code>, do not specify <code>DeliverLogsPermissionArn</code> or <code>LogGroupName</code>.</p>"
         },
         "ResourceIds":{
-          "shape":"ValueStringList",
+          "shape":"FlowLogResourceIds",
           "documentation":"<p>The ID of the subnet, network interface, or VPC for which you want to create a flow log.</p> <p>Constraints: Maximum of 1000 resources</p>",
           "locationName":"ResourceId"
         },
@@ -7215,11 +7956,20 @@
         },
         "LogDestination":{
           "shape":"String",
-          "documentation":"<p>Specifies the destination to which the flow log data is to be published. Flow log data can be published to a CloudWatch Logs log group or an Amazon S3 bucket. The value specified for this parameter depends on the value specified for <code>LogDestinationType</code>.</p> <p>If LogDestinationType is not specified or <code>cloud-watch-logs</code>, specify the Amazon Resource Name (ARN) of the CloudWatch Logs log group.</p> <p>If LogDestinationType is <code>s3</code>, specify the ARN of the Amazon S3 bucket. You can also specify a subfolder in the bucket. To specify a subfolder in the bucket, use the following ARN format: <code>bucket_ARN/subfolder_name/</code>. For example, to specify a subfolder named <code>my-logs</code> in a bucket named <code>my-bucket</code>, use the following ARN: <code>arn:aws:s3:::my-bucket/my-logs/</code>. You cannot use <code>AWSLogs</code> as a subfolder name. This is a reserved term.</p>"
+          "documentation":"<p>Specifies the destination to which the flow log data is to be published. Flow log data can be published to a CloudWatch Logs log group or an Amazon S3 bucket. The value specified for this parameter depends on the value specified for <code>LogDestinationType</code>.</p> <p>If <code>LogDestinationType</code> is not specified or <code>cloud-watch-logs</code>, specify the Amazon Resource Name (ARN) of the CloudWatch Logs log group. For example, to publish to a log group called <code>my-logs</code>, specify <code>arn:aws:logs:us-east-1:123456789012:log-group:my-logs</code>. Alternatively, use <code>LogGroupName</code> instead.</p> <p>If LogDestinationType is <code>s3</code>, specify the ARN of the Amazon S3 bucket. You can also specify a subfolder in the bucket. To specify a subfolder in the bucket, use the following ARN format: <code>bucket_ARN/subfolder_name/</code>. For example, to specify a subfolder named <code>my-logs</code> in a bucket named <code>my-bucket</code>, use the following ARN: <code>arn:aws:s3:::my-bucket/my-logs/</code>. You cannot use <code>AWSLogs</code> as a subfolder name. This is a reserved term.</p>"
         },
         "LogFormat":{
           "shape":"String",
           "documentation":"<p>The fields to include in the flow log record, in the order in which they should appear. For a list of available fields, see <a href=\"https://docs.aws.amazon.com/vpc/latest/userguide/flow-logs.html#flow-log-records\">Flow Log Records</a>. If you omit this parameter, the flow log is created using the default format. If you specify this parameter, you must specify at least one field.</p> <p>Specify the fields using the <code>${field-id}</code> format, separated by spaces. For the AWS CLI, use single quotation marks (' ') to surround the parameter value.</p> <p>Only applicable to flow logs that are published to an Amazon S3 bucket.</p>"
+        },
+        "TagSpecifications":{
+          "shape":"TagSpecificationList",
+          "documentation":"<p>The tags to apply to the flow logs.</p>",
+          "locationName":"TagSpecification"
+        },
+        "MaxAggregationInterval":{
+          "shape":"Integer",
+          "documentation":"<p>The maximum interval of time during which a flow of packets is captured and aggregated into a flow log record. You can specify 60 seconds (1 minute) or 600 seconds (10 minutes).</p> <p>When a network interface is attached to a <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/instance-types.html#ec2-nitro-instances\">Nitro-based instance</a>, the aggregation interval is always 60 seconds or less, regardless of the value that you specify.</p> <p>Default: 600</p>"
         }
       }
     },
@@ -7316,7 +8066,7 @@
           "locationName":"dryRun"
         },
         "InstanceId":{
-          "shape":"String",
+          "shape":"InstanceId",
           "documentation":"<p>The ID of the instance.</p>",
           "locationName":"instanceId"
         },
@@ -7357,7 +8107,7 @@
           "locationName":"exportToS3"
         },
         "InstanceId":{
-          "shape":"String",
+          "shape":"InstanceId",
           "documentation":"<p>The ID of the instance.</p>",
           "locationName":"instanceId"
         },
@@ -7470,7 +8220,7 @@
           "documentation":"<p>Unique, case-sensitive identifier you provide to ensure the idempotency of the request. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/Run_Instance_Idempotency.html\">Ensuring Idempotency</a>.</p> <p>Constraint: Maximum 128 ASCII characters.</p>"
         },
         "LaunchTemplateId":{
-          "shape":"String",
+          "shape":"LaunchTemplateId",
           "documentation":"<p>The ID of the launch template. You must specify either the launch template ID or launch template name in the request.</p>"
         },
         "LaunchTemplateName":{
@@ -7501,6 +8251,73 @@
         }
       }
     },
+    "CreateLocalGatewayRouteRequest":{
+      "type":"structure",
+      "required":[
+        "DestinationCidrBlock",
+        "LocalGatewayRouteTableId",
+        "LocalGatewayVirtualInterfaceGroupId"
+      ],
+      "members":{
+        "DestinationCidrBlock":{
+          "shape":"String",
+          "documentation":"<p>The CIDR range used for destination matches. Routing decisions are based on the most specific match.</p>"
+        },
+        "LocalGatewayRouteTableId":{
+          "shape":"LocalGatewayRoutetableId",
+          "documentation":"<p>The ID of the local gateway route table.</p>"
+        },
+        "LocalGatewayVirtualInterfaceGroupId":{
+          "shape":"LocalGatewayVirtualInterfaceGroupId",
+          "documentation":"<p>The ID of the virtual interface group.</p>"
+        },
+        "DryRun":{
+          "shape":"Boolean",
+          "documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>"
+        }
+      }
+    },
+    "CreateLocalGatewayRouteResult":{
+      "type":"structure",
+      "members":{
+        "Route":{
+          "shape":"LocalGatewayRoute",
+          "documentation":"<p>Information about the route.</p>",
+          "locationName":"route"
+        }
+      }
+    },
+    "CreateLocalGatewayRouteTableVpcAssociationRequest":{
+      "type":"structure",
+      "required":[
+        "LocalGatewayRouteTableId",
+        "VpcId"
+      ],
+      "members":{
+        "LocalGatewayRouteTableId":{
+          "shape":"LocalGatewayRoutetableId",
+          "documentation":"<p>The ID of the local gateway route table.</p>"
+        },
+        "VpcId":{
+          "shape":"VpcId",
+          "documentation":"<p>The ID of the VPC.</p>"
+        },
+        "DryRun":{
+          "shape":"Boolean",
+          "documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>"
+        }
+      }
+    },
+    "CreateLocalGatewayRouteTableVpcAssociationResult":{
+      "type":"structure",
+      "members":{
+        "LocalGatewayRouteTableVpcAssociation":{
+          "shape":"LocalGatewayRouteTableVpcAssociation",
+          "documentation":"<p>Information about the association.</p>",
+          "locationName":"localGatewayRouteTableVpcAssociation"
+        }
+      }
+    },
     "CreateNatGatewayRequest":{
       "type":"structure",
       "required":[
@@ -7509,16 +8326,26 @@
       ],
       "members":{
         "AllocationId":{
-          "shape":"String",
+          "shape":"AllocationId",
           "documentation":"<p>The allocation ID of an Elastic IP address to associate with the NAT gateway. If the Elastic IP address is associated with another resource, you must first disassociate it.</p>"
         },
         "ClientToken":{
           "shape":"String",
-          "documentation":"<p>Unique, case-sensitive identifier that you provide to ensure the idempotency of the request. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/Run_Instance_Idempotency.html\">How to Ensure Idempotency</a>.</p> <p>Constraint: Maximum 64 ASCII characters.</p>"
+          "documentation":"<p>Unique, case-sensitive identifier that you provide to ensure the idempotency of the request. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/Run_Instance_Idempotency.html\">How to Ensure Idempotency</a>.</p> <p>Constraint: Maximum 64 ASCII characters.</p>",
+          "idempotencyToken":true
+        },
+        "DryRun":{
+          "shape":"Boolean",
+          "documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>"
         },
         "SubnetId":{
-          "shape":"String",
+          "shape":"SubnetId",
           "documentation":"<p>The subnet in which to create the NAT gateway.</p>"
+        },
+        "TagSpecifications":{
+          "shape":"TagSpecificationList",
+          "documentation":"<p>The tags to assign to the NAT gateway.</p>",
+          "locationName":"TagSpecification"
         }
       }
     },
@@ -7573,7 +8400,7 @@
           "locationName":"ipv6CidrBlock"
         },
         "NetworkAclId":{
-          "shape":"String",
+          "shape":"NetworkAclId",
           "documentation":"<p>The ID of the network ACL.</p>",
           "locationName":"networkAclId"
         },
@@ -7609,7 +8436,7 @@
           "locationName":"dryRun"
         },
         "VpcId":{
-          "shape":"String",
+          "shape":"VpcId",
           "documentation":"<p>The ID of the VPC.</p>",
           "locationName":"vpcId"
         }
@@ -7633,7 +8460,7 @@
       ],
       "members":{
         "NetworkInterfaceId":{
-          "shape":"String",
+          "shape":"NetworkInterfaceId",
           "documentation":"<p>The ID of the network interface.</p>"
         },
         "AwsAccountId":{
@@ -7715,7 +8542,7 @@
           "documentation":"<p>Indicates the type of network interface. To create an Elastic Fabric Adapter (EFA), specify <code>efa</code>. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/efa.html\"> Elastic Fabric Adapter</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>.</p>"
         },
         "SubnetId":{
-          "shape":"String",
+          "shape":"SubnetId",
           "documentation":"<p>The ID of the subnet to associate with the network interface.</p>",
           "locationName":"subnetId"
         }
@@ -7782,7 +8609,7 @@
           "locationName":"priceSchedules"
         },
         "ReservedInstancesId":{
-          "shape":"String",
+          "shape":"ReservationId",
           "documentation":"<p>The ID of the active Standard Reserved Instance.</p>",
           "locationName":"reservedInstancesId"
         }
@@ -7820,41 +8647,45 @@
           "locationName":"dryRun"
         },
         "EgressOnlyInternetGatewayId":{
-          "shape":"String",
+          "shape":"EgressOnlyInternetGatewayId",
           "documentation":"<p>[IPv6 traffic only] The ID of an egress-only internet gateway.</p>",
           "locationName":"egressOnlyInternetGatewayId"
         },
         "GatewayId":{
-          "shape":"String",
+          "shape":"RouteGatewayId",
           "documentation":"<p>The ID of an internet gateway or virtual private gateway attached to your VPC.</p>",
           "locationName":"gatewayId"
         },
         "InstanceId":{
-          "shape":"String",
+          "shape":"InstanceId",
           "documentation":"<p>The ID of a NAT instance in your VPC. The operation fails if you specify an instance ID unless exactly one network interface is attached.</p>",
           "locationName":"instanceId"
         },
         "NatGatewayId":{
-          "shape":"String",
+          "shape":"NatGatewayId",
           "documentation":"<p>[IPv4 traffic only] The ID of a NAT gateway.</p>",
           "locationName":"natGatewayId"
         },
         "TransitGatewayId":{
-          "shape":"String",
+          "shape":"TransitGatewayId",
           "documentation":"<p>The ID of a transit gateway.</p>"
         },
+        "LocalGatewayId":{
+          "shape":"LocalGatewayId",
+          "documentation":"<p>The ID of the local gateway.</p>"
+        },
         "NetworkInterfaceId":{
-          "shape":"String",
+          "shape":"NetworkInterfaceId",
           "documentation":"<p>The ID of a network interface.</p>",
           "locationName":"networkInterfaceId"
         },
         "RouteTableId":{
-          "shape":"String",
+          "shape":"RouteTableId",
           "documentation":"<p>The ID of the route table for the route.</p>",
           "locationName":"routeTableId"
         },
         "VpcPeeringConnectionId":{
-          "shape":"String",
+          "shape":"VpcPeeringConnectionId",
           "documentation":"<p>The ID of a VPC peering connection.</p>",
           "locationName":"vpcPeeringConnectionId"
         }
@@ -7880,7 +8711,7 @@
           "locationName":"dryRun"
         },
         "VpcId":{
-          "shape":"String",
+          "shape":"VpcId",
           "documentation":"<p>The ID of the VPC.</p>",
           "locationName":"vpcId"
         }
@@ -7913,7 +8744,7 @@
           "documentation":"<p>The name of the security group.</p> <p>Constraints: Up to 255 characters in length. Cannot start with <code>sg-</code>.</p> <p>Constraints for EC2-Classic: ASCII characters</p> <p>Constraints for EC2-VPC: a-z, A-Z, 0-9, spaces, and ._-:/()#,@[]+=&amp;;{}!$*</p>"
         },
         "VpcId":{
-          "shape":"String",
+          "shape":"VpcId",
           "documentation":"<p>[EC2-VPC] The ID of the VPC. Required for EC2-VPC.</p>"
         },
         "DryRun":{
@@ -7942,7 +8773,7 @@
           "documentation":"<p>A description for the snapshot.</p>"
         },
         "VolumeId":{
-          "shape":"String",
+          "shape":"VolumeId",
           "documentation":"<p>The ID of the EBS volume.</p>"
         },
         "TagSpecifications":{
@@ -7955,8 +8786,7 @@
           "documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>",
           "locationName":"dryRun"
         }
-      },
-      "documentation":"<p>Contains the parameters for CreateSnapshot.</p>"
+      }
     },
     "CreateSnapshotsRequest":{
       "type":"structure",
@@ -7977,7 +8807,7 @@
         },
         "DryRun":{
           "shape":"Boolean",
-          "documentation":"<p>Checks whether you have the required permissions for the action without actually making the request. Provides an error response. If you have the required permissions, the error response is DryRunOperation. Otherwise, it is UnauthorizedOperation.</p>"
+          "documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>"
         },
         "CopyTagsFromSource":{
           "shape":"CopyTagsFromSource",
@@ -8037,11 +8867,11 @@
       "members":{
         "AvailabilityZone":{
           "shape":"String",
-          "documentation":"<p>The Availability Zone for the subnet.</p> <p>Default: AWS selects one for you. If you create more than one subnet in your VPC, we may not necessarily select a different zone for each subnet.</p>"
+          "documentation":"<p>The Availability Zone or Local Zone for the subnet.</p> <p>Default: AWS selects one for you. If you create more than one subnet in your VPC, we do not necessarily select a different zone for each subnet.</p> <p>To create a subnet in a Local Zone, set this value to the Local Zone ID, for example <code>us-west-2-lax-1a</code>. For information about the Regions that support Local Zones, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-regions-availability-zones.html#concepts-available-regions\">Available Regions</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>.</p>"
         },
         "AvailabilityZoneId":{
           "shape":"String",
-          "documentation":"<p>The AZ ID of the subnet.</p>"
+          "documentation":"<p>The AZ ID or the Local Zone ID of the subnet.</p>"
         },
         "CidrBlock":{
           "shape":"String",
@@ -8051,8 +8881,12 @@
           "shape":"String",
           "documentation":"<p>The IPv6 network range for the subnet, in CIDR notation. The subnet size must use a /64 prefix length.</p>"
         },
-        "VpcId":{
+        "OutpostArn":{
           "shape":"String",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the Outpost.</p>"
+        },
+        "VpcId":{
+          "shape":"VpcId",
           "documentation":"<p>The ID of the VPC.</p>"
         },
         "DryRun":{
@@ -8146,7 +8980,7 @@
       ],
       "members":{
         "TrafficMirrorFilterId":{
-          "shape":"String",
+          "shape":"TrafficMirrorFilterId",
           "documentation":"<p>The ID of the filter that this rule is associated with.</p>"
         },
         "TrafficDirection":{
@@ -8221,20 +9055,20 @@
       ],
       "members":{
         "NetworkInterfaceId":{
-          "shape":"String",
+          "shape":"NetworkInterfaceId",
           "documentation":"<p>The ID of the source network interface.</p>"
         },
         "TrafficMirrorTargetId":{
-          "shape":"String",
+          "shape":"TrafficMirrorTargetId",
           "documentation":"<p>The ID of the Traffic Mirror target.</p>"
         },
         "TrafficMirrorFilterId":{
-          "shape":"String",
+          "shape":"TrafficMirrorFilterId",
           "documentation":"<p>The ID of the Traffic Mirror filter.</p>"
         },
         "PacketLength":{
           "shape":"Integer",
-          "documentation":"<p>The number of bytes in each packet to mirror. These are bytes after the VXLAN header. Do not specify this parameter when you want to mirror the entire packet. To mirror a subset of the packet, set this to the length (in bytes) that you want to mirror. For example, if you set this value to 1network0, then the first 100 bytes that meet the filter criteria are copied to the target.</p> <p>If you do not want to mirror the entire packet, use the <code>PacketLength</code> parameter to specify the number of bytes in each packet to mirror.</p>"
+          "documentation":"<p>The number of bytes in each packet to mirror. These are bytes after the VXLAN header. Do not specify this parameter when you want to mirror the entire packet. To mirror a subset of the packet, set this to the length (in bytes) that you want to mirror. For example, if you set this value to 100, then the first 100 bytes that meet the filter criteria are copied to the target.</p> <p>If you do not want to mirror the entire packet, use the <code>PacketLength</code> parameter to specify the number of bytes in each packet to mirror.</p>"
         },
         "SessionNumber":{
           "shape":"Integer",
@@ -8283,7 +9117,7 @@
       "type":"structure",
       "members":{
         "NetworkInterfaceId":{
-          "shape":"String",
+          "shape":"NetworkInterfaceId",
           "documentation":"<p>The network interface ID that is associated with the target.</p>"
         },
         "NetworkLoadBalancerArn":{
@@ -8325,6 +9159,81 @@
         }
       }
     },
+    "CreateTransitGatewayMulticastDomainRequest":{
+      "type":"structure",
+      "required":["TransitGatewayId"],
+      "members":{
+        "TransitGatewayId":{
+          "shape":"TransitGatewayId",
+          "documentation":"<p>The ID of the transit gateway.</p>"
+        },
+        "TagSpecifications":{
+          "shape":"TagSpecificationList",
+          "documentation":"<p>The tags for the transit gateway multicast domain.</p>",
+          "locationName":"TagSpecification"
+        },
+        "DryRun":{
+          "shape":"Boolean",
+          "documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>"
+        }
+      }
+    },
+    "CreateTransitGatewayMulticastDomainResult":{
+      "type":"structure",
+      "members":{
+        "TransitGatewayMulticastDomain":{
+          "shape":"TransitGatewayMulticastDomain",
+          "documentation":"<p>Information about the transit gateway multicast domain.</p>",
+          "locationName":"transitGatewayMulticastDomain"
+        }
+      }
+    },
+    "CreateTransitGatewayPeeringAttachmentRequest":{
+      "type":"structure",
+      "required":[
+        "TransitGatewayId",
+        "PeerTransitGatewayId",
+        "PeerAccountId",
+        "PeerRegion"
+      ],
+      "members":{
+        "TransitGatewayId":{
+          "shape":"TransitGatewayId",
+          "documentation":"<p>The ID of the transit gateway.</p>"
+        },
+        "PeerTransitGatewayId":{
+          "shape":"TransitAssociationGatewayId",
+          "documentation":"<p>The ID of the peer transit gateway with which to create the peering attachment.</p>"
+        },
+        "PeerAccountId":{
+          "shape":"String",
+          "documentation":"<p>The AWS account ID of the owner of the peer transit gateway.</p>"
+        },
+        "PeerRegion":{
+          "shape":"String",
+          "documentation":"<p>The Region where the peer transit gateway is located.</p>"
+        },
+        "TagSpecifications":{
+          "shape":"TagSpecificationList",
+          "documentation":"<p>The tags to apply to the transit gateway peering attachment.</p>",
+          "locationName":"TagSpecification"
+        },
+        "DryRun":{
+          "shape":"Boolean",
+          "documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>"
+        }
+      }
+    },
+    "CreateTransitGatewayPeeringAttachmentResult":{
+      "type":"structure",
+      "members":{
+        "TransitGatewayPeeringAttachment":{
+          "shape":"TransitGatewayPeeringAttachment",
+          "documentation":"<p>The transit gateway peering attachment.</p>",
+          "locationName":"transitGatewayPeeringAttachment"
+        }
+      }
+    },
     "CreateTransitGatewayRequest":{
       "type":"structure",
       "members":{
@@ -8369,11 +9278,11 @@
           "documentation":"<p>The CIDR range used for destination matches. Routing decisions are based on the most specific match.</p>"
         },
         "TransitGatewayRouteTableId":{
-          "shape":"String",
+          "shape":"TransitGatewayRouteTableId",
           "documentation":"<p>The ID of the transit gateway route table.</p>"
         },
         "TransitGatewayAttachmentId":{
-          "shape":"String",
+          "shape":"TransitGatewayAttachmentId",
           "documentation":"<p>The ID of the attachment.</p>"
         },
         "Blackhole":{
@@ -8401,7 +9310,7 @@
       "required":["TransitGatewayId"],
       "members":{
         "TransitGatewayId":{
-          "shape":"String",
+          "shape":"TransitGatewayId",
           "documentation":"<p>The ID of the transit gateway.</p>"
         },
         "TagSpecifications":{
@@ -8433,15 +9342,15 @@
       ],
       "members":{
         "TransitGatewayId":{
-          "shape":"String",
+          "shape":"TransitGatewayId",
           "documentation":"<p>The ID of the transit gateway.</p>"
         },
         "VpcId":{
-          "shape":"String",
+          "shape":"VpcId",
           "documentation":"<p>The ID of the VPC.</p>"
         },
         "SubnetIds":{
-          "shape":"ValueStringList",
+          "shape":"TransitGatewaySubnetIdList",
           "documentation":"<p>The IDs of one or more subnets. You can specify only one subnet per Availability Zone. You must specify at least one subnet, but we recommend that you specify two subnets for better availability. The transit gateway uses one IP address from each specified subnet.</p>"
         },
         "Options":{
@@ -8537,16 +9446,20 @@
           "documentation":"<p>The number of I/O operations per second (IOPS) to provision for the volume, with a maximum ratio of 50 IOPS/GiB. Range is 100 to 64,000 IOPS for volumes in most Regions. Maximum IOPS of 64,000 is guaranteed only on <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/instance-types.html#ec2-nitro-instances\">Nitro-based instances</a>. Other instance families guarantee performance up to 32,000 IOPS. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSVolumeTypes.html\">Amazon EBS Volume Types</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>.</p> <p>This parameter is valid only for Provisioned IOPS SSD (io1) volumes.</p>"
         },
         "KmsKeyId":{
-          "shape":"String",
+          "shape":"KmsKeyId",
           "documentation":"<p>The identifier of the AWS Key Management Service (AWS KMS) customer master key (CMK) to use for Amazon EBS encryption. If this parameter is not specified, your AWS managed CMK for EBS is used. If <code>KmsKeyId</code> is specified, the encrypted state must be <code>true</code>.</p> <p>You can specify the CMK using any of the following:</p> <ul> <li> <p>Key ID. For example, key/1234abcd-12ab-34cd-56ef-1234567890ab.</p> </li> <li> <p>Key alias. For example, alias/ExampleAlias.</p> </li> <li> <p>Key ARN. For example, arn:aws:kms:<i>us-east-1</i>:<i>012345678910</i>:key/<i>abcd1234-a123-456a-a12b-a123b4cd56ef</i>.</p> </li> <li> <p>Alias ARN. For example, arn:aws:kms:<i>us-east-1</i>:<i>012345678910</i>:alias/<i>ExampleAlias</i>.</p> </li> </ul> <p>AWS authenticates the CMK asynchronously. Therefore, if you specify an ID, alias, or ARN that is not valid, the action can appear to complete, but eventually fails.</p>"
         },
+        "OutpostArn":{
+          "shape":"String",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the Outpost.</p>"
+        },
         "Size":{
           "shape":"Integer",
-          "documentation":"<p>The size of the volume, in GiBs.</p> <p>Constraints: 1-16,384 for <code>gp2</code>, 4-16,384 for <code>io1</code>, 500-16,384 for <code>st1</code>, 500-16,384 for <code>sc1</code>, and 1-1,024 for <code>standard</code>. If you specify a snapshot, the volume size must be equal to or larger than the snapshot size.</p> <p>Default: If you're creating the volume from a snapshot and don't specify a volume size, the default is the snapshot size.</p> <note> <p>At least one of Size or SnapshotId is required.</p> </note>"
+          "documentation":"<p>The size of the volume, in GiBs. You must specify either a snapshot ID or a volume size.</p> <p>Constraints: 1-16,384 for <code>gp2</code>, 4-16,384 for <code>io1</code>, 500-16,384 for <code>st1</code>, 500-16,384 for <code>sc1</code>, and 1-1,024 for <code>standard</code>. If you specify a snapshot, the volume size must be equal to or larger than the snapshot size.</p> <p>Default: If you're creating the volume from a snapshot and don't specify a volume size, the default is the snapshot size.</p>"
         },
         "SnapshotId":{
-          "shape":"String",
-          "documentation":"<p>The snapshot from which to create the volume.</p> <note> <p>At least one of Size or SnapshotId are required.</p> </note>"
+          "shape":"SnapshotId",
+          "documentation":"<p>The snapshot from which to create the volume. You must specify either a snapshot ID or a volume size.</p>"
         },
         "VolumeType":{
           "shape":"VolumeType",
@@ -8561,9 +9474,12 @@
           "shape":"TagSpecificationList",
           "documentation":"<p>The tags to apply to the volume during creation.</p>",
           "locationName":"TagSpecification"
+        },
+        "MultiAttachEnabled":{
+          "shape":"Boolean",
+          "documentation":"<p>Specifies whether to enable Amazon EBS Multi-Attach. If you enable Multi-Attach, you can attach the volume to up to 16 <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/instance-types.html#ec2-nitro-instances\">Nitro-based instances</a> in the same Availability Zone. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ebs-volumes-multi.html\"> Amazon EBS Multi-Attach</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>.</p>"
         }
-      },
-      "documentation":"<p>Contains the parameters for CreateVolume.</p>"
+      }
     },
     "CreateVpcEndpointConnectionNotificationRequest":{
       "type":"structure",
@@ -8577,12 +9493,12 @@
           "documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>"
         },
         "ServiceId":{
-          "shape":"String",
+          "shape":"VpcEndpointServiceId",
           "documentation":"<p>The ID of the endpoint service.</p>"
         },
         "VpcEndpointId":{
-          "shape":"String",
-          "documentation":"<p>The ID of the endpoint. </p>"
+          "shape":"VpcEndpointId",
+          "documentation":"<p>The ID of the endpoint.</p>"
         },
         "ConnectionNotificationArn":{
           "shape":"String",
@@ -8594,7 +9510,7 @@
         },
         "ClientToken":{
           "shape":"String",
-          "documentation":"<p>Unique, case-sensitive identifier you provide to ensure the idempotency of the request. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/Run_Instance_Idempotency.html\">How to Ensure Idempotency</a>.</p>"
+          "documentation":"<p>Unique, case-sensitive identifier that you provide to ensure the idempotency of the request. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/Run_Instance_Idempotency.html\">How to Ensure Idempotency</a>.</p>"
         }
       }
     },
@@ -8608,7 +9524,7 @@
         },
         "ClientToken":{
           "shape":"String",
-          "documentation":"<p>Unique, case-sensitive identifier you provide to ensure the idempotency of the request.</p>",
+          "documentation":"<p>Unique, case-sensitive identifier that you provide to ensure the idempotency of the request.</p>",
           "locationName":"clientToken"
         }
       }
@@ -8629,7 +9545,7 @@
           "documentation":"<p>The type of endpoint.</p> <p>Default: Gateway</p>"
         },
         "VpcId":{
-          "shape":"String",
+          "shape":"VpcId",
           "documentation":"<p>The ID of the VPC in which the endpoint will be used.</p>"
         },
         "ServiceName":{
@@ -8641,27 +9557,32 @@
           "documentation":"<p>A policy to attach to the endpoint that controls access to the service. The policy must be in valid JSON format. If this parameter is not specified, we attach a default policy that allows full access to the service.</p>"
         },
         "RouteTableIds":{
-          "shape":"ValueStringList",
+          "shape":"VpcEndpointRouteTableIdList",
           "documentation":"<p>(Gateway endpoint) One or more route table IDs.</p>",
           "locationName":"RouteTableId"
         },
         "SubnetIds":{
-          "shape":"ValueStringList",
+          "shape":"VpcEndpointSubnetIdList",
           "documentation":"<p>(Interface endpoint) The ID of one or more subnets in which to create an endpoint network interface.</p>",
           "locationName":"SubnetId"
         },
         "SecurityGroupIds":{
-          "shape":"ValueStringList",
+          "shape":"VpcEndpointSecurityGroupIdList",
           "documentation":"<p>(Interface endpoint) The ID of one or more security groups to associate with the endpoint network interface.</p>",
           "locationName":"SecurityGroupId"
         },
         "ClientToken":{
           "shape":"String",
-          "documentation":"<p>Unique, case-sensitive identifier you provide to ensure the idempotency of the request. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/Run_Instance_Idempotency.html\">How to Ensure Idempotency</a>.</p>"
+          "documentation":"<p>Unique, case-sensitive identifier that you provide to ensure the idempotency of the request. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/Run_Instance_Idempotency.html\">How to Ensure Idempotency</a>.</p>"
         },
         "PrivateDnsEnabled":{
           "shape":"Boolean",
-          "documentation":"<p>(Interface endpoint) Indicate whether to associate a private hosted zone with the specified VPC. The private hosted zone contains a record set for the default public DNS name for the service for the Region (for example, <code>kinesis.us-east-1.amazonaws.com</code>) which resolves to the private IP addresses of the endpoint network interfaces in the VPC. This enables you to make requests to the default public DNS name for the service instead of the public DNS names that are automatically generated by the VPC endpoint service.</p> <p>To use a private hosted zone, you must set the following VPC attributes to <code>true</code>: <code>enableDnsHostnames</code> and <code>enableDnsSupport</code>. Use <a>ModifyVpcAttribute</a> to set the VPC attributes.</p> <p>Default: <code>true</code> </p>"
+          "documentation":"<p>(Interface endpoint) Indicates whether to associate a private hosted zone with the specified VPC. The private hosted zone contains a record set for the default public DNS name for the service for the Region (for example, <code>kinesis.us-east-1.amazonaws.com</code>), which resolves to the private IP addresses of the endpoint network interfaces in the VPC. This enables you to make requests to the default public DNS name for the service instead of the public DNS names that are automatically generated by the VPC endpoint service.</p> <p>To use a private hosted zone, you must set the following VPC attributes to <code>true</code>: <code>enableDnsHostnames</code> and <code>enableDnsSupport</code>. Use <a>ModifyVpcAttribute</a> to set the VPC attributes.</p> <p>Default: <code>true</code> </p>"
+        },
+        "TagSpecifications":{
+          "shape":"TagSpecificationList",
+          "documentation":"<p>The tags to associate with the endpoint.</p>",
+          "locationName":"TagSpecification"
         }
       },
       "documentation":"<p>Contains the parameters for CreateVpcEndpoint.</p>"
@@ -8676,7 +9597,7 @@
         },
         "ClientToken":{
           "shape":"String",
-          "documentation":"<p>Unique, case-sensitive identifier you provide to ensure the idempotency of the request.</p>",
+          "documentation":"<p>Unique, case-sensitive identifier that you provide to ensure the idempotency of the request.</p>",
           "locationName":"clientToken"
         }
       },
@@ -8692,7 +9613,11 @@
         },
         "AcceptanceRequired":{
           "shape":"Boolean",
-          "documentation":"<p>Indicate whether requests from service consumers to create an endpoint to your service must be accepted. To accept a request, use <a>AcceptVpcEndpointConnections</a>.</p>"
+          "documentation":"<p>Indicates whether requests from service consumers to create an endpoint to your service must be accepted. To accept a request, use <a>AcceptVpcEndpointConnections</a>.</p>"
+        },
+        "PrivateDnsName":{
+          "shape":"String",
+          "documentation":"<p>The private DNS name to assign to the VPC endpoint service.</p>"
         },
         "NetworkLoadBalancerArns":{
           "shape":"ValueStringList",
@@ -8701,7 +9626,12 @@
         },
         "ClientToken":{
           "shape":"String",
-          "documentation":"<p>Unique, case-sensitive identifier you provide to ensure the idempotency of the request. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Run_Instance_Idempotency.html\">How to Ensure Idempotency</a>.</p>"
+          "documentation":"<p>Unique, case-sensitive identifier that you provide to ensure the idempotency of the request. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Run_Instance_Idempotency.html\">How to Ensure Idempotency</a>.</p>"
+        },
+        "TagSpecifications":{
+          "shape":"TagSpecificationList",
+          "documentation":"<p>The tags to associate with the service.</p>",
+          "locationName":"TagSpecification"
         }
       }
     },
@@ -8715,7 +9645,7 @@
         },
         "ClientToken":{
           "shape":"String",
-          "documentation":"<p>Unique, case-sensitive identifier you provide to ensure the idempotency of the request.</p>",
+          "documentation":"<p>Unique, case-sensitive identifier that you provide to ensure the idempotency of the request.</p>",
           "locationName":"clientToken"
         }
       }
@@ -8739,7 +9669,7 @@
           "locationName":"peerVpcId"
         },
         "VpcId":{
-          "shape":"String",
+          "shape":"VpcId",
           "documentation":"<p>The ID of the requester VPC. You must specify this parameter in the request.</p>",
           "locationName":"vpcId"
         },
@@ -8772,6 +9702,14 @@
           "documentation":"<p>Requests an Amazon-provided IPv6 CIDR block with a /56 prefix length for the VPC. You cannot specify the range of IP addresses, or the size of the CIDR block.</p>",
           "locationName":"amazonProvidedIpv6CidrBlock"
         },
+        "Ipv6Pool":{
+          "shape":"Ipv6PoolEc2Id",
+          "documentation":"<p>The ID of an IPv6 address pool from which to allocate the IPv6 CIDR block.</p>"
+        },
+        "Ipv6CidrBlock":{
+          "shape":"String",
+          "documentation":"<p>The IPv6 CIDR block from the IPv6 address pool. You must also specify <code>Ipv6Pool</code> in the request.</p> <p>To let Amazon choose the IPv6 CIDR block for you, omit this parameter.</p>"
+        },
         "DryRun":{
           "shape":"Boolean",
           "documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>",
@@ -8781,6 +9719,10 @@
           "shape":"Tenancy",
           "documentation":"<p>The tenancy options for instances launched into the VPC. For <code>default</code>, instances are launched with shared tenancy by default. You can launch instances with any tenancy into a shared tenancy VPC. For <code>dedicated</code>, instances are launched as dedicated tenancy instances by default. You can only launch instances with a tenancy of <code>dedicated</code> or <code>host</code> into a dedicated tenancy VPC. </p> <p> <b>Important:</b> The <code>host</code> value cannot be used with this parameter. Use the <code>default</code> or <code>dedicated</code> values only.</p> <p>Default: <code>default</code> </p>",
           "locationName":"instanceTenancy"
+        },
+        "Ipv6CidrBlockNetworkBorderGroup":{
+          "shape":"String",
+          "documentation":"<p>The name of the location from which we advertise the IPV6 CIDR block. Use this parameter to limit the address to this location.</p> <p> You must set <code>AmazonProvidedIpv6CidrBlock</code> to <code>true</code> to use this parameter.</p>"
         }
       }
     },
@@ -8802,7 +9744,7 @@
       ],
       "members":{
         "CustomerGatewayId":{
-          "shape":"String",
+          "shape":"CustomerGatewayId",
           "documentation":"<p>The ID of the customer gateway.</p>"
         },
         "Type":{
@@ -8810,11 +9752,11 @@
           "documentation":"<p>The type of VPN connection (<code>ipsec.1</code>).</p>"
         },
         "VpnGatewayId":{
-          "shape":"String",
+          "shape":"VpnGatewayId",
           "documentation":"<p>The ID of the virtual private gateway. If you specify a virtual private gateway, you cannot specify a transit gateway.</p>"
         },
         "TransitGatewayId":{
-          "shape":"String",
+          "shape":"TransitGatewayId",
           "documentation":"<p>The ID of the transit gateway. If you specify a transit gateway, you cannot specify a virtual private gateway.</p>"
         },
         "DryRun":{
@@ -8853,7 +9795,7 @@
           "documentation":"<p>The CIDR block associated with the local subnet of the customer network.</p>"
         },
         "VpnConnectionId":{
-          "shape":"String",
+          "shape":"VpnConnectionId",
           "documentation":"<p>The ID of the VPN connection.</p>"
         }
       },
@@ -8920,6 +9862,7 @@
       "type":"string",
       "enum":["USD"]
     },
+    "CurrentGenerationFlag":{"type":"boolean"},
     "CustomerGateway":{
       "type":"structure",
       "members":{
@@ -8953,6 +9896,11 @@
           "documentation":"<p>The type of VPN connection the customer gateway supports (<code>ipsec.1</code>).</p>",
           "locationName":"type"
         },
+        "DeviceName":{
+          "shape":"String",
+          "documentation":"<p>The name of customer gateway device.</p>",
+          "locationName":"deviceName"
+        },
         "Tags":{
           "shape":"TagList",
           "documentation":"<p>Any tags assigned to the customer gateway.</p>",
@@ -8961,10 +9909,11 @@
       },
       "documentation":"<p>Describes a customer gateway.</p>"
     },
+    "CustomerGatewayId":{"type":"string"},
     "CustomerGatewayIdStringList":{
       "type":"list",
       "member":{
-        "shape":"String",
+        "shape":"CustomerGatewayId",
         "locationName":"CustomerGatewayId"
       }
     },
@@ -8975,6 +9924,16 @@
         "locationName":"item"
       }
     },
+    "DITMaxResults":{
+      "type":"integer",
+      "max":100,
+      "min":5
+    },
+    "DITOMaxResults":{
+      "type":"integer",
+      "max":1000,
+      "min":5
+    },
     "DatafeedSubscriptionState":{
       "type":"string",
       "enum":[
@@ -8983,6 +9942,8 @@
       ]
     },
     "DateTime":{"type":"timestamp"},
+    "DedicatedHostFlag":{"type":"boolean"},
+    "DedicatedHostId":{"type":"string"},
     "DefaultRouteTableAssociationValue":{
       "type":"string",
       "enum":[
@@ -9004,12 +9965,13 @@
         "on-demand"
       ]
     },
+    "DefaultingDhcpOptionsId":{"type":"string"},
     "DeleteClientVpnEndpointRequest":{
       "type":"structure",
       "required":["ClientVpnEndpointId"],
       "members":{
         "ClientVpnEndpointId":{
-          "shape":"String",
+          "shape":"ClientVpnEndpointId",
           "documentation":"<p>The ID of the Client VPN to be deleted.</p>"
         },
         "DryRun":{
@@ -9036,11 +9998,11 @@
       ],
       "members":{
         "ClientVpnEndpointId":{
-          "shape":"String",
+          "shape":"ClientVpnEndpointId",
           "documentation":"<p>The ID of the Client VPN endpoint from which the route is to be deleted.</p>"
         },
         "TargetVpcSubnetId":{
-          "shape":"String",
+          "shape":"SubnetId",
           "documentation":"<p>The ID of the target subnet used by the route.</p>"
         },
         "DestinationCidrBlock":{
@@ -9068,7 +10030,7 @@
       "required":["CustomerGatewayId"],
       "members":{
         "CustomerGatewayId":{
-          "shape":"String",
+          "shape":"CustomerGatewayId",
           "documentation":"<p>The ID of the customer gateway.</p>"
         },
         "DryRun":{
@@ -9084,7 +10046,7 @@
       "required":["DhcpOptionsId"],
       "members":{
         "DhcpOptionsId":{
-          "shape":"String",
+          "shape":"DhcpOptionsId",
           "documentation":"<p>The ID of the DHCP options set.</p>"
         },
         "DryRun":{
@@ -9152,7 +10114,7 @@
           "locationName":"error"
         },
         "FleetId":{
-          "shape":"FleetIdentifier",
+          "shape":"FleetId",
           "documentation":"<p>The ID of the EC2 Fleet.</p>",
           "locationName":"fleetId"
         }
@@ -9180,7 +10142,7 @@
           "locationName":"previousFleetState"
         },
         "FleetId":{
-          "shape":"FleetIdentifier",
+          "shape":"FleetId",
           "documentation":"<p>The ID of the EC2 Fleet.</p>",
           "locationName":"fleetId"
         }
@@ -9240,7 +10202,7 @@
           "documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>"
         },
         "FlowLogIds":{
-          "shape":"ValueStringList",
+          "shape":"FlowLogIdList",
           "documentation":"<p>One or more flow log IDs.</p> <p>Constraint: Maximum of 1000 flow log IDs.</p>",
           "locationName":"FlowLogId"
         }
@@ -9265,7 +10227,7 @@
           "documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>"
         },
         "FpgaImageId":{
-          "shape":"String",
+          "shape":"FpgaImageId",
           "documentation":"<p>The ID of the AFI.</p>"
         }
       }
@@ -9290,7 +10252,7 @@
           "locationName":"dryRun"
         },
         "InternetGatewayId":{
-          "shape":"String",
+          "shape":"InternetGatewayId",
           "documentation":"<p>The ID of the internet gateway.</p>",
           "locationName":"internetGatewayId"
         }
@@ -9301,7 +10263,7 @@
       "required":["KeyName"],
       "members":{
         "KeyName":{
-          "shape":"String",
+          "shape":"KeyPairName",
           "documentation":"<p>The name of the key pair.</p>"
         },
         "DryRun":{
@@ -9319,7 +10281,7 @@
           "documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>"
         },
         "LaunchTemplateId":{
-          "shape":"String",
+          "shape":"LaunchTemplateId",
           "documentation":"<p>The ID of the launch template. You must specify either the launch template ID or launch template name in the request.</p>"
         },
         "LaunchTemplateName":{
@@ -9347,7 +10309,7 @@
           "documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>"
         },
         "LaunchTemplateId":{
-          "shape":"String",
+          "shape":"LaunchTemplateId",
           "documentation":"<p>The ID of the launch template. You must specify either the launch template ID or launch template name in the request.</p>"
         },
         "LaunchTemplateName":{
@@ -9437,12 +10399,71 @@
         }
       }
     },
+    "DeleteLocalGatewayRouteRequest":{
+      "type":"structure",
+      "required":[
+        "DestinationCidrBlock",
+        "LocalGatewayRouteTableId"
+      ],
+      "members":{
+        "DestinationCidrBlock":{
+          "shape":"String",
+          "documentation":"<p>The CIDR range for the route. This must match the CIDR for the route exactly.</p>"
+        },
+        "LocalGatewayRouteTableId":{
+          "shape":"LocalGatewayRoutetableId",
+          "documentation":"<p>The ID of the local gateway route table.</p>"
+        },
+        "DryRun":{
+          "shape":"Boolean",
+          "documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>"
+        }
+      }
+    },
+    "DeleteLocalGatewayRouteResult":{
+      "type":"structure",
+      "members":{
+        "Route":{
+          "shape":"LocalGatewayRoute",
+          "documentation":"<p>Information about the route.</p>",
+          "locationName":"route"
+        }
+      }
+    },
+    "DeleteLocalGatewayRouteTableVpcAssociationRequest":{
+      "type":"structure",
+      "required":["LocalGatewayRouteTableVpcAssociationId"],
+      "members":{
+        "LocalGatewayRouteTableVpcAssociationId":{
+          "shape":"LocalGatewayRouteTableVpcAssociationId",
+          "documentation":"<p>The ID of the association.</p>"
+        },
+        "DryRun":{
+          "shape":"Boolean",
+          "documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>"
+        }
+      }
+    },
+    "DeleteLocalGatewayRouteTableVpcAssociationResult":{
+      "type":"structure",
+      "members":{
+        "LocalGatewayRouteTableVpcAssociation":{
+          "shape":"LocalGatewayRouteTableVpcAssociation",
+          "documentation":"<p>Information about the association.</p>",
+          "locationName":"localGatewayRouteTableVpcAssociation"
+        }
+      }
+    },
     "DeleteNatGatewayRequest":{
       "type":"structure",
       "required":["NatGatewayId"],
       "members":{
+        "DryRun":{
+          "shape":"Boolean",
+          "documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>"
+        },
         "NatGatewayId":{
-          "shape":"String",
+          "shape":"NatGatewayId",
           "documentation":"<p>The ID of the NAT gateway.</p>"
         }
       }
@@ -9476,7 +10497,7 @@
           "locationName":"egress"
         },
         "NetworkAclId":{
-          "shape":"String",
+          "shape":"NetworkAclId",
           "documentation":"<p>The ID of the network ACL.</p>",
           "locationName":"networkAclId"
         },
@@ -9497,7 +10518,7 @@
           "locationName":"dryRun"
         },
         "NetworkAclId":{
-          "shape":"String",
+          "shape":"NetworkAclId",
           "documentation":"<p>The ID of the network ACL.</p>",
           "locationName":"networkAclId"
         }
@@ -9508,7 +10529,7 @@
       "required":["NetworkInterfacePermissionId"],
       "members":{
         "NetworkInterfacePermissionId":{
-          "shape":"String",
+          "shape":"NetworkInterfacePermissionId",
           "documentation":"<p>The ID of the network interface permission.</p>"
         },
         "Force":{
@@ -9543,7 +10564,7 @@
           "locationName":"dryRun"
         },
         "NetworkInterfaceId":{
-          "shape":"String",
+          "shape":"NetworkInterfaceId",
           "documentation":"<p>The ID of the network interface.</p>",
           "locationName":"networkInterfaceId"
         }
@@ -9560,7 +10581,7 @@
           "locationName":"dryRun"
         },
         "GroupName":{
-          "shape":"String",
+          "shape":"PlacementGroupName",
           "documentation":"<p>The name of the placement group.</p>",
           "locationName":"groupName"
         }
@@ -9593,7 +10614,7 @@
     "DeleteQueuedReservedInstancesIdList":{
       "type":"list",
       "member":{
-        "shape":"String",
+        "shape":"ReservationId",
         "locationName":"item"
       },
       "max":100,
@@ -9649,7 +10670,7 @@
           "locationName":"dryRun"
         },
         "RouteTableId":{
-          "shape":"String",
+          "shape":"RouteTableId",
           "documentation":"<p>The ID of the route table.</p>",
           "locationName":"routeTableId"
         }
@@ -9665,7 +10686,7 @@
           "locationName":"dryRun"
         },
         "RouteTableId":{
-          "shape":"String",
+          "shape":"RouteTableId",
           "documentation":"<p>The ID of the route table.</p>",
           "locationName":"routeTableId"
         }
@@ -9675,11 +10696,11 @@
       "type":"structure",
       "members":{
         "GroupId":{
-          "shape":"String",
+          "shape":"SecurityGroupId",
           "documentation":"<p>The ID of the security group. Required for a nondefault VPC.</p>"
         },
         "GroupName":{
-          "shape":"String",
+          "shape":"SecurityGroupName",
           "documentation":"<p>[EC2-Classic, default VPC] The name of the security group. You can specify either the security group name or the security group ID.</p>"
         },
         "DryRun":{
@@ -9694,7 +10715,7 @@
       "required":["SnapshotId"],
       "members":{
         "SnapshotId":{
-          "shape":"String",
+          "shape":"SnapshotId",
           "documentation":"<p>The ID of the EBS snapshot.</p>"
         },
         "DryRun":{
@@ -9702,8 +10723,7 @@
           "documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>",
           "locationName":"dryRun"
         }
-      },
-      "documentation":"<p>Contains the parameters for DeleteSnapshot.</p>"
+      }
     },
     "DeleteSpotDatafeedSubscriptionRequest":{
       "type":"structure",
@@ -9721,7 +10741,7 @@
       "required":["SubnetId"],
       "members":{
         "SubnetId":{
-          "shape":"String",
+          "shape":"SubnetId",
           "documentation":"<p>The ID of the subnet.</p>"
         },
         "DryRun":{
@@ -9757,7 +10777,7 @@
       "required":["TrafficMirrorFilterId"],
       "members":{
         "TrafficMirrorFilterId":{
-          "shape":"String",
+          "shape":"TrafficMirrorFilterId",
           "documentation":"<p>The ID of the Traffic Mirror filter.</p>"
         },
         "DryRun":{
@@ -9781,7 +10801,7 @@
       "required":["TrafficMirrorFilterRuleId"],
       "members":{
         "TrafficMirrorFilterRuleId":{
-          "shape":"String",
+          "shape":"TrafficMirrorFilterRuleId",
           "documentation":"<p>The ID of the Traffic Mirror rule.</p>"
         },
         "DryRun":{
@@ -9805,7 +10825,7 @@
       "required":["TrafficMirrorSessionId"],
       "members":{
         "TrafficMirrorSessionId":{
-          "shape":"String",
+          "shape":"TrafficMirrorSessionId",
           "documentation":"<p>The ID of the Traffic Mirror session.</p>"
         },
         "DryRun":{
@@ -9829,7 +10849,7 @@
       "required":["TrafficMirrorTargetId"],
       "members":{
         "TrafficMirrorTargetId":{
-          "shape":"String",
+          "shape":"TrafficMirrorTargetId",
           "documentation":"<p>The ID of the Traffic Mirror target.</p>"
         },
         "DryRun":{
@@ -9848,12 +10868,60 @@
         }
       }
     },
+    "DeleteTransitGatewayMulticastDomainRequest":{
+      "type":"structure",
+      "required":["TransitGatewayMulticastDomainId"],
+      "members":{
+        "TransitGatewayMulticastDomainId":{
+          "shape":"TransitGatewayMulticastDomainId",
+          "documentation":"<p>The ID of the transit gateway multicast domain.</p>"
+        },
+        "DryRun":{
+          "shape":"Boolean",
+          "documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>"
+        }
+      }
+    },
+    "DeleteTransitGatewayMulticastDomainResult":{
+      "type":"structure",
+      "members":{
+        "TransitGatewayMulticastDomain":{
+          "shape":"TransitGatewayMulticastDomain",
+          "documentation":"<p>Information about the deleted transit gateway multicast domain.</p>",
+          "locationName":"transitGatewayMulticastDomain"
+        }
+      }
+    },
+    "DeleteTransitGatewayPeeringAttachmentRequest":{
+      "type":"structure",
+      "required":["TransitGatewayAttachmentId"],
+      "members":{
+        "TransitGatewayAttachmentId":{
+          "shape":"TransitGatewayAttachmentId",
+          "documentation":"<p>The ID of the transit gateway peering attachment.</p>"
+        },
+        "DryRun":{
+          "shape":"Boolean",
+          "documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>"
+        }
+      }
+    },
+    "DeleteTransitGatewayPeeringAttachmentResult":{
+      "type":"structure",
+      "members":{
+        "TransitGatewayPeeringAttachment":{
+          "shape":"TransitGatewayPeeringAttachment",
+          "documentation":"<p>The transit gateway peering attachment.</p>",
+          "locationName":"transitGatewayPeeringAttachment"
+        }
+      }
+    },
     "DeleteTransitGatewayRequest":{
       "type":"structure",
       "required":["TransitGatewayId"],
       "members":{
         "TransitGatewayId":{
-          "shape":"String",
+          "shape":"TransitGatewayId",
           "documentation":"<p>The ID of the transit gateway.</p>"
         },
         "DryRun":{
@@ -9880,7 +10948,7 @@
       ],
       "members":{
         "TransitGatewayRouteTableId":{
-          "shape":"String",
+          "shape":"TransitGatewayRouteTableId",
           "documentation":"<p>The ID of the transit gateway route table.</p>"
         },
         "DestinationCidrBlock":{
@@ -9908,7 +10976,7 @@
       "required":["TransitGatewayRouteTableId"],
       "members":{
         "TransitGatewayRouteTableId":{
-          "shape":"String",
+          "shape":"TransitGatewayRouteTableId",
           "documentation":"<p>The ID of the transit gateway route table.</p>"
         },
         "DryRun":{
@@ -9932,7 +11000,7 @@
       "required":["TransitGatewayAttachmentId"],
       "members":{
         "TransitGatewayAttachmentId":{
-          "shape":"String",
+          "shape":"TransitGatewayAttachmentId",
           "documentation":"<p>The ID of the attachment.</p>"
         },
         "DryRun":{
@@ -9956,7 +11024,7 @@
       "required":["VolumeId"],
       "members":{
         "VolumeId":{
-          "shape":"String",
+          "shape":"VolumeId",
           "documentation":"<p>The ID of the volume.</p>"
         },
         "DryRun":{
@@ -9964,8 +11032,7 @@
           "documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>",
           "locationName":"dryRun"
         }
-      },
-      "documentation":"<p>Contains the parameters for DeleteVolume.</p>"
+      }
     },
     "DeleteVpcEndpointConnectionNotificationsRequest":{
       "type":"structure",
@@ -10001,7 +11068,7 @@
           "documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>"
         },
         "ServiceIds":{
-          "shape":"ValueStringList",
+          "shape":"VpcEndpointServiceIdList",
           "documentation":"<p>The IDs of one or more services.</p>",
           "locationName":"ServiceId"
         }
@@ -10026,7 +11093,7 @@
           "documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>"
         },
         "VpcEndpointIds":{
-          "shape":"ValueStringList",
+          "shape":"VpcEndpointIdList",
           "documentation":"<p>One or more VPC endpoint IDs.</p>",
           "locationName":"VpcEndpointId"
         }
@@ -10054,7 +11121,7 @@
           "locationName":"dryRun"
         },
         "VpcPeeringConnectionId":{
-          "shape":"String",
+          "shape":"VpcPeeringConnectionId",
           "documentation":"<p>The ID of the VPC peering connection.</p>",
           "locationName":"vpcPeeringConnectionId"
         }
@@ -10075,7 +11142,7 @@
       "required":["VpcId"],
       "members":{
         "VpcId":{
-          "shape":"String",
+          "shape":"VpcId",
           "documentation":"<p>The ID of the VPC.</p>"
         },
         "DryRun":{
@@ -10090,7 +11157,7 @@
       "required":["VpnConnectionId"],
       "members":{
         "VpnConnectionId":{
-          "shape":"String",
+          "shape":"VpnConnectionId",
           "documentation":"<p>The ID of the VPN connection.</p>"
         },
         "DryRun":{
@@ -10113,7 +11180,7 @@
           "documentation":"<p>The CIDR block associated with the local subnet of the customer network.</p>"
         },
         "VpnConnectionId":{
-          "shape":"String",
+          "shape":"VpnConnectionId",
           "documentation":"<p>The ID of the VPN connection.</p>"
         }
       },
@@ -10124,7 +11191,7 @@
       "required":["VpnGatewayId"],
       "members":{
         "VpnGatewayId":{
-          "shape":"String",
+          "shape":"VpnGatewayId",
           "documentation":"<p>The ID of the virtual private gateway.</p>"
         },
         "DryRun":{
@@ -10141,7 +11208,7 @@
       "members":{
         "Cidr":{
           "shape":"String",
-          "documentation":"<p>The public IPv4 address range, in CIDR notation. The prefix must be the same prefix that you specified when you provisioned the address range.</p>"
+          "documentation":"<p>The address range, in CIDR notation. The prefix must be the same prefix that you specified when you provisioned the address range.</p>"
         },
         "DryRun":{
           "shape":"Boolean",
@@ -10164,7 +11231,7 @@
       "required":["ImageId"],
       "members":{
         "ImageId":{
-          "shape":"String",
+          "shape":"ImageId",
           "documentation":"<p>The ID of the AMI.</p>"
         },
         "DryRun":{
@@ -10175,6 +11242,68 @@
       },
       "documentation":"<p>Contains the parameters for DeregisterImage.</p>"
     },
+    "DeregisterTransitGatewayMulticastGroupMembersRequest":{
+      "type":"structure",
+      "members":{
+        "TransitGatewayMulticastDomainId":{
+          "shape":"TransitGatewayMulticastDomainId",
+          "documentation":"<p>The ID of the transit gateway multicast domain.</p>"
+        },
+        "GroupIpAddress":{
+          "shape":"String",
+          "documentation":"<p>The IP address assigned to the transit gateway multicast group.</p>"
+        },
+        "NetworkInterfaceIds":{
+          "shape":"TransitGatewayNetworkInterfaceIdList",
+          "documentation":"<p>The IDs of the group members' network interfaces.</p>"
+        },
+        "DryRun":{
+          "shape":"Boolean",
+          "documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>"
+        }
+      }
+    },
+    "DeregisterTransitGatewayMulticastGroupMembersResult":{
+      "type":"structure",
+      "members":{
+        "DeregisteredMulticastGroupMembers":{
+          "shape":"TransitGatewayMulticastDeregisteredGroupMembers",
+          "documentation":"<p>Information about the deregistered members.</p>",
+          "locationName":"deregisteredMulticastGroupMembers"
+        }
+      }
+    },
+    "DeregisterTransitGatewayMulticastGroupSourcesRequest":{
+      "type":"structure",
+      "members":{
+        "TransitGatewayMulticastDomainId":{
+          "shape":"TransitGatewayMulticastDomainId",
+          "documentation":"<p>The ID of the transit gateway multicast domain.</p>"
+        },
+        "GroupIpAddress":{
+          "shape":"String",
+          "documentation":"<p>The IP address assigned to the transit gateway multicast group.</p>"
+        },
+        "NetworkInterfaceIds":{
+          "shape":"TransitGatewayNetworkInterfaceIdList",
+          "documentation":"<p>The IDs of the group sources' network interfaces.</p>"
+        },
+        "DryRun":{
+          "shape":"Boolean",
+          "documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>"
+        }
+      }
+    },
+    "DeregisterTransitGatewayMulticastGroupSourcesResult":{
+      "type":"structure",
+      "members":{
+        "DeregisteredMulticastGroupSources":{
+          "shape":"TransitGatewayMulticastDeregisteredGroupSources",
+          "documentation":"<p>Information about the deregistered group sources.</p>",
+          "locationName":"deregisteredMulticastGroupSources"
+        }
+      }
+    },
     "DescribeAccountAttributesRequest":{
       "type":"structure",
       "members":{
@@ -10205,7 +11334,7 @@
       "members":{
         "Filters":{
           "shape":"FilterList",
-          "documentation":"<p>One or more filters. Filter names and values are case-sensitive.</p> <ul> <li> <p> <code>allocation-id</code> - [EC2-VPC] The allocation ID for the address.</p> </li> <li> <p> <code>association-id</code> - [EC2-VPC] The association ID for the address.</p> </li> <li> <p> <code>domain</code> - Indicates whether the address is for use in EC2-Classic (<code>standard</code>) or in a VPC (<code>vpc</code>).</p> </li> <li> <p> <code>instance-id</code> - The ID of the instance the address is associated with, if any.</p> </li> <li> <p> <code>network-interface-id</code> - [EC2-VPC] The ID of the network interface that the address is associated with, if any.</p> </li> <li> <p> <code>network-interface-owner-id</code> - The AWS account ID of the owner.</p> </li> <li> <p> <code>private-ip-address</code> - [EC2-VPC] The private IP address associated with the Elastic IP address.</p> </li> <li> <p> <code>public-ip</code> - The Elastic IP address.</p> </li> <li> <p> <code>tag</code>:&lt;key&gt; - The key/value combination of a tag assigned to the resource. Use the tag key in the filter name and the tag value as the filter value. For example, to find all resources that have a tag with the key <code>Owner</code> and the value <code>TeamA</code>, specify <code>tag:Owner</code> for the filter name and <code>TeamA</code> for the filter value.</p> </li> <li> <p> <code>tag-key</code> - The key of a tag assigned to the resource. Use this filter to find all resources assigned a tag with a specific key, regardless of the tag value.</p> </li> </ul>",
+          "documentation":"<p>One or more filters. Filter names and values are case-sensitive.</p> <ul> <li> <p> <code>allocation-id</code> - [EC2-VPC] The allocation ID for the address.</p> </li> <li> <p> <code>association-id</code> - [EC2-VPC] The association ID for the address.</p> </li> <li> <p> <code>domain</code> - Indicates whether the address is for use in EC2-Classic (<code>standard</code>) or in a VPC (<code>vpc</code>).</p> </li> <li> <p> <code>instance-id</code> - The ID of the instance the address is associated with, if any.</p> </li> <li> <p> <code>network-border-group</code> - The location from where the IP address is advertised.</p> </li> <li> <p> <code>network-interface-id</code> - [EC2-VPC] The ID of the network interface that the address is associated with, if any.</p> </li> <li> <p> <code>network-interface-owner-id</code> - The AWS account ID of the owner.</p> </li> <li> <p> <code>private-ip-address</code> - [EC2-VPC] The private IP address associated with the Elastic IP address.</p> </li> <li> <p> <code>public-ip</code> - The Elastic IP address.</p> </li> <li> <p> <code>tag</code>:&lt;key&gt; - The key/value combination of a tag assigned to the resource. Use the tag key in the filter name and the tag value as the filter value. For example, to find all resources that have a tag with the key <code>Owner</code> and the value <code>TeamA</code>, specify <code>tag:Owner</code> for the filter name and <code>TeamA</code> for the filter value.</p> </li> <li> <p> <code>tag-key</code> - The key of a tag assigned to the resource. Use this filter to find all resources assigned a tag with a specific key, regardless of the tag value.</p> </li> </ul>",
           "locationName":"Filter"
         },
         "PublicIps":{
@@ -10264,19 +11393,23 @@
       "members":{
         "Filters":{
           "shape":"FilterList",
-          "documentation":"<p>The filters.</p> <ul> <li> <p> <code>message</code> - Information about the Availability Zone.</p> </li> <li> <p> <code>region-name</code> - The name of the Region for the Availability Zone (for example, <code>us-east-1</code>).</p> </li> <li> <p> <code>state</code> - The state of the Availability Zone (<code>available</code> | <code>information</code> | <code>impaired</code> | <code>unavailable</code>).</p> </li> <li> <p> <code>zone-id</code> - The ID of the Availability Zone (for example, <code>use1-az1</code>).</p> </li> <li> <p> <code>zone-name</code> - The name of the Availability Zone (for example, <code>us-east-1a</code>).</p> </li> </ul>",
+          "documentation":"<p>The filters.</p> <ul> <li> <p> <code>group-name</code> - For Availability Zones, use the Region name. For Local Zones, use the name of the group associated with the Local Zone (for example, <code>us-west-2-lax-1</code>).</p> </li> <li> <p> <code>message</code> - The Availability Zone or Local Zone message.</p> </li> <li> <p> <code>opt-in-status</code> - The opt in status (<code>opted-in</code>, and <code>not-opted-in</code> | <code>opt-in-not-required</code>).</p> </li> <li> <p> <code>region-name</code> - The name of the Region for the Availability Zone or Local Zone (for example, <code>us-east-1</code>).</p> </li> <li> <p> <code>state</code> - The state of the Availability Zone or Local Zone (<code>available</code> | <code>information</code> | <code>impaired</code> | <code>unavailable</code>).</p> </li> <li> <p> <code>zone-id</code> - The ID of the Availability Zone (for example, <code>use1-az1</code>) or the Local Zone (for example, use <code>usw2-lax1-az1</code>).</p> </li> <li> <p> <code>zone-name</code> - The name of the Availability Zone (for example, <code>us-east-1a</code>) or the Local Zone (for example, use <code>us-west-2-lax-1a</code>).</p> </li> </ul>",
           "locationName":"Filter"
         },
         "ZoneNames":{
           "shape":"ZoneNameStringList",
-          "documentation":"<p>The names of the Availability Zones.</p>",
+          "documentation":"<p>The names of the Availability Zones and Local Zones.</p>",
           "locationName":"ZoneName"
         },
         "ZoneIds":{
           "shape":"ZoneIdStringList",
-          "documentation":"<p>The IDs of the Availability Zones.</p>",
+          "documentation":"<p>The IDs of the Availability Zones and Local Zones.</p>",
           "locationName":"ZoneId"
         },
+        "AllAvailabilityZones":{
+          "shape":"Boolean",
+          "documentation":"<p>Include all Availability Zones and Local Zones regardless of your opt in status.</p> <p>If you do not use this parameter, the results include only the zones for the Regions where you have chosen the option to opt in.</p>"
+        },
         "DryRun":{
           "shape":"Boolean",
           "documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>",
@@ -10289,7 +11422,7 @@
       "members":{
         "AvailabilityZones":{
           "shape":"AvailabilityZoneList",
-          "documentation":"<p>Information about the Availability Zones.</p>",
+          "documentation":"<p>Information about the Availability Zones and Local Zones.</p>",
           "locationName":"availabilityZoneInfo"
         }
       }
@@ -10385,7 +11518,7 @@
         },
         "Filters":{
           "shape":"FilterList",
-          "documentation":"<p>One or more filters.</p>",
+          "documentation":"<p>One or more filters.</p> <ul> <li> <p> <code>instance-type</code> - The type of instance for which the Capacity Reservation reserves capacity.</p> </li> <li> <p> <code>owner-id</code> - The ID of the AWS account that owns the Capacity Reservation.</p> </li> <li> <p> <code>availability-zone-id</code> - The Availability Zone ID of the Capacity Reservation.</p> </li> <li> <p> <code>instance-platform</code> - The type of operating system for which the Capacity Reservation reserves capacity.</p> </li> <li> <p> <code>availability-zone</code> - The Availability Zone ID of the Capacity Reservation.</p> </li> <li> <p> <code>tenancy</code> - Indicates the tenancy of the Capacity Reservation. A Capacity Reservation can have one of the following tenancy settings:</p> <ul> <li> <p> <code>default</code> - The Capacity Reservation is created on hardware that is shared with other AWS accounts.</p> </li> <li> <p> <code>dedicated</code> - The Capacity Reservation is created on single-tenant hardware that is dedicated to a single AWS account.</p> </li> </ul> </li> <li> <p> <code>state</code> - The current state of the Capacity Reservation. A Capacity Reservation can be in one of the following states:</p> <ul> <li> <p> <code>active</code>- The Capacity Reservation is active and the capacity is available for your use.</p> </li> <li> <p> <code>expired</code> - The Capacity Reservation expired automatically at the date and time specified in your request. The reserved capacity is no longer available for your use.</p> </li> <li> <p> <code>cancelled</code> - The Capacity Reservation was manually cancelled. The reserved capacity is no longer available for your use.</p> </li> <li> <p> <code>pending</code> - The Capacity Reservation request was successful but the capacity provisioning is still pending.</p> </li> <li> <p> <code>failed</code> - The Capacity Reservation request has failed. A request might fail due to invalid request parameters, capacity constraints, or instance limit constraints. Failed requests are retained for 60 minutes.</p> </li> </ul> </li> <li> <p> <code>end-date</code> - The date and time at which the Capacity Reservation expires. When a Capacity Reservation expires, the reserved capacity is released and you can no longer launch instances into it. The Capacity Reservation's state changes to expired when it reaches its end date and time.</p> </li> <li> <p> <code>end-date-type</code> - Indicates the way in which the Capacity Reservation ends. A Capacity Reservation can have one of the following end types:</p> <ul> <li> <p> <code>unlimited</code> - The Capacity Reservation remains active until you explicitly cancel it.</p> </li> <li> <p> <code>limited</code> - The Capacity Reservation expires automatically at a specified date and time.</p> </li> </ul> </li> <li> <p> <code>instance-match-criteria</code> - Indicates the type of instance launches that the Capacity Reservation accepts. The options include:</p> <ul> <li> <p> <code>open</code> - The Capacity Reservation accepts all instances that have matching attributes (instance type, platform, and Availability Zone). Instances that have matching attributes launch into the Capacity Reservation automatically without specifying any additional parameters.</p> </li> <li> <p> <code>targeted</code> - The Capacity Reservation only accepts instances that have matching attributes (instance type, platform, and Availability Zone), and explicitly target the Capacity Reservation. This ensures that only permitted instances can use the reserved capacity.</p> </li> </ul> </li> </ul>",
           "locationName":"Filter"
         },
         "DryRun":{
@@ -10469,7 +11602,7 @@
       "required":["ClientVpnEndpointId"],
       "members":{
         "ClientVpnEndpointId":{
-          "shape":"String",
+          "shape":"ClientVpnEndpointId",
           "documentation":"<p>The ID of the Client VPN endpoint.</p>"
         },
         "DryRun":{
@@ -10482,7 +11615,7 @@
         },
         "Filters":{
           "shape":"FilterList",
-          "documentation":"<p>One or more filters. Filter names and values are case-sensitive.</p>",
+          "documentation":"<p>One or more filters. Filter names and values are case-sensitive.</p> <ul> <li> <p> <code>description</code> - The description of the authorization rule.</p> </li> <li> <p> <code>destination-cidr</code> - The CIDR of the network to which the authorization rule applies.</p> </li> <li> <p> <code>group-id</code> - The ID of the Active Directory group to which the authorization rule grants access.</p> </li> </ul>",
           "locationName":"Filter"
         },
         "MaxResults":{
@@ -10516,12 +11649,12 @@
       "required":["ClientVpnEndpointId"],
       "members":{
         "ClientVpnEndpointId":{
-          "shape":"String",
+          "shape":"ClientVpnEndpointId",
           "documentation":"<p>The ID of the Client VPN endpoint.</p>"
         },
         "Filters":{
           "shape":"FilterList",
-          "documentation":"<p>One or more filters. Filter names and values are case-sensitive.</p>",
+          "documentation":"<p>One or more filters. Filter names and values are case-sensitive.</p> <ul> <li> <p> <code>connection-id</code> - The ID of the connection.</p> </li> <li> <p> <code>username</code> - For Active Directory client authentication, the user name of the client who established the client connection.</p> </li> </ul>",
           "locationName":"Filter"
         },
         "NextToken":{
@@ -10562,7 +11695,7 @@
       "type":"structure",
       "members":{
         "ClientVpnEndpointIds":{
-          "shape":"ValueStringList",
+          "shape":"ClientVpnEndpointIdList",
           "documentation":"<p>The ID of the Client VPN endpoint.</p>",
           "locationName":"ClientVpnEndpointId"
         },
@@ -10576,7 +11709,7 @@
         },
         "Filters":{
           "shape":"FilterList",
-          "documentation":"<p>One or more filters. Filter names and values are case-sensitive.</p>",
+          "documentation":"<p>One or more filters. Filter names and values are case-sensitive.</p> <ul> <li> <p> <code>endpoint-id</code> - The ID of the Client VPN endpoint.</p> </li> <li> <p> <code>transport-protocol</code> - The transport protocol (<code>tcp</code> | <code>udp</code>).</p> </li> </ul>",
           "locationName":"Filter"
         },
         "DryRun":{
@@ -10610,12 +11743,12 @@
       "required":["ClientVpnEndpointId"],
       "members":{
         "ClientVpnEndpointId":{
-          "shape":"String",
+          "shape":"ClientVpnEndpointId",
           "documentation":"<p>The ID of the Client VPN endpoint.</p>"
         },
         "Filters":{
           "shape":"FilterList",
-          "documentation":"<p>One or more filters. Filter names and values are case-sensitive.</p>",
+          "documentation":"<p>One or more filters. Filter names and values are case-sensitive.</p> <ul> <li> <p> <code>destination-cidr</code> - The CIDR of the route destination.</p> </li> <li> <p> <code>origin</code> - How the route was associated with the Client VPN endpoint (<code>associate</code> | <code>add-route</code>).</p> </li> <li> <p> <code>target-subnet</code> - The ID of the subnet through which traffic is routed.</p> </li> </ul>",
           "locationName":"Filter"
         },
         "MaxResults":{
@@ -10657,7 +11790,7 @@
       "required":["ClientVpnEndpointId"],
       "members":{
         "ClientVpnEndpointId":{
-          "shape":"String",
+          "shape":"ClientVpnEndpointId",
           "documentation":"<p>The ID of the Client VPN endpoint.</p>"
         },
         "AssociationIds":{
@@ -10674,7 +11807,7 @@
         },
         "Filters":{
           "shape":"FilterList",
-          "documentation":"<p>One or more filters. Filter names and values are case-sensitive.</p>",
+          "documentation":"<p>One or more filters. Filter names and values are case-sensitive.</p> <ul> <li> <p> <code>association-id</code> - The ID of the association.</p> </li> <li> <p> <code>target-network-id</code> - The ID of the subnet specified as the target network.</p> </li> <li> <p> <code>vpc-id</code> - The ID of the VPC in which the target network is located.</p> </li> </ul>",
           "locationName":"Filter"
         },
         "DryRun":{
@@ -10698,6 +11831,48 @@
         }
       }
     },
+    "DescribeCoipPoolsRequest":{
+      "type":"structure",
+      "members":{
+        "PoolIds":{
+          "shape":"CoipPoolIdSet",
+          "documentation":"<p>The IDs of the address pools.</p>",
+          "locationName":"PoolId"
+        },
+        "Filters":{
+          "shape":"FilterList",
+          "documentation":"<p>The filters. The following are the possible values:</p> <ul> <li> <p> <code>coip-pool.pool-id</code> </p> </li> </ul> <ul> <li> <p> <code>coip-pool.local-gateway-route-table-id</code> </p> </li> </ul>",
+          "locationName":"Filter"
+        },
+        "MaxResults":{
+          "shape":"CoipPoolMaxResults",
+          "documentation":"<p>The maximum number of results to return with a single call. To retrieve the remaining results, make another call with the returned <code>nextToken</code> value.</p>"
+        },
+        "NextToken":{
+          "shape":"String",
+          "documentation":"<p>The token for the next page of results.</p>"
+        },
+        "DryRun":{
+          "shape":"Boolean",
+          "documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>"
+        }
+      }
+    },
+    "DescribeCoipPoolsResult":{
+      "type":"structure",
+      "members":{
+        "CoipPools":{
+          "shape":"CoipPoolSet",
+          "documentation":"<p>Information about the address pools.</p>",
+          "locationName":"coipPoolSet"
+        },
+        "NextToken":{
+          "shape":"String",
+          "documentation":"<p>The token to use to retrieve the next page of results. This value is <code>null</code> when there are no more results to return.</p>",
+          "locationName":"nextToken"
+        }
+      }
+    },
     "DescribeConversionTaskList":{
       "type":"list",
       "member":{
@@ -10834,6 +12009,11 @@
         "NextToken":{
           "shape":"String",
           "documentation":"<p>The token for the next page of results.</p>"
+        },
+        "Filters":{
+          "shape":"FilterList",
+          "documentation":"<p>One or more filters.</p> <ul> <li> <p> <code>tag</code>:&lt;key&gt; - The key/value combination of a tag assigned to the resource. Use the tag key in the filter name and the tag value as the filter value. For example, to find all resources that have a tag with the key <code>Owner</code> and the value <code>TeamA</code>, specify <code>tag:Owner</code> for the filter name and <code>TeamA</code> for the filter value.</p> </li> <li> <p> <code>tag-key</code> - The key of a tag assigned to the resource. Use this filter to find all resources assigned a tag with a specific key, regardless of the tag value.</p> </li> </ul>",
+          "locationName":"Filter"
         }
       }
     },
@@ -10958,6 +12138,11 @@
           "shape":"ExportTaskIdStringList",
           "documentation":"<p>The export task IDs.</p>",
           "locationName":"exportTaskId"
+        },
+        "Filters":{
+          "shape":"FilterList",
+          "documentation":"<p>the filters for the export tasks.</p>",
+          "locationName":"Filter"
         }
       }
     },
@@ -10971,12 +12156,122 @@
         }
       }
     },
+    "DescribeFastSnapshotRestoreSuccessItem":{
+      "type":"structure",
+      "members":{
+        "SnapshotId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the snapshot.</p>",
+          "locationName":"snapshotId"
+        },
+        "AvailabilityZone":{
+          "shape":"String",
+          "documentation":"<p>The Availability Zone.</p>",
+          "locationName":"availabilityZone"
+        },
+        "State":{
+          "shape":"FastSnapshotRestoreStateCode",
+          "documentation":"<p>The state of fast snapshot restores.</p>",
+          "locationName":"state"
+        },
+        "StateTransitionReason":{
+          "shape":"String",
+          "documentation":"<p>The reason for the state transition. The possible values are as follows:</p> <ul> <li> <p> <code>Client.UserInitiated</code> - The state successfully transitioned to <code>enabling</code> or <code>disabling</code>.</p> </li> <li> <p> <code>Client.UserInitiated - Lifecycle state transition</code> - The state successfully transitioned to <code>optimizing</code>, <code>enabled</code>, or <code>disabled</code>.</p> </li> </ul>",
+          "locationName":"stateTransitionReason"
+        },
+        "OwnerId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the AWS account that owns the snapshot.</p>",
+          "locationName":"ownerId"
+        },
+        "OwnerAlias":{
+          "shape":"String",
+          "documentation":"<p>The alias of the snapshot owner.</p>",
+          "locationName":"ownerAlias"
+        },
+        "EnablingTime":{
+          "shape":"MillisecondDateTime",
+          "documentation":"<p>The time at which fast snapshot restores entered the <code>enabling</code> state.</p>",
+          "locationName":"enablingTime"
+        },
+        "OptimizingTime":{
+          "shape":"MillisecondDateTime",
+          "documentation":"<p>The time at which fast snapshot restores entered the <code>optimizing</code> state.</p>",
+          "locationName":"optimizingTime"
+        },
+        "EnabledTime":{
+          "shape":"MillisecondDateTime",
+          "documentation":"<p>The time at which fast snapshot restores entered the <code>enabled</code> state.</p>",
+          "locationName":"enabledTime"
+        },
+        "DisablingTime":{
+          "shape":"MillisecondDateTime",
+          "documentation":"<p>The time at which fast snapshot restores entered the <code>disabling</code> state.</p>",
+          "locationName":"disablingTime"
+        },
+        "DisabledTime":{
+          "shape":"MillisecondDateTime",
+          "documentation":"<p>The time at which fast snapshot restores entered the <code>disabled</code> state.</p>",
+          "locationName":"disabledTime"
+        }
+      },
+      "documentation":"<p>Describes fast snapshot restores for a snapshot.</p>"
+    },
+    "DescribeFastSnapshotRestoreSuccessSet":{
+      "type":"list",
+      "member":{
+        "shape":"DescribeFastSnapshotRestoreSuccessItem",
+        "locationName":"item"
+      }
+    },
+    "DescribeFastSnapshotRestoresMaxResults":{
+      "type":"integer",
+      "max":200,
+      "min":0
+    },
+    "DescribeFastSnapshotRestoresRequest":{
+      "type":"structure",
+      "members":{
+        "Filters":{
+          "shape":"FilterList",
+          "documentation":"<p>The filters. The possible values are:</p> <ul> <li> <p> <code>availability-zone</code>: The Availability Zone of the snapshot.</p> </li> <li> <p> <code>owner-id</code>: The ID of the AWS account that owns the snapshot.</p> </li> <li> <p> <code>snapshot-id</code>: The ID of the snapshot.</p> </li> <li> <p> <code>state</code>: The state of fast snapshot restores for the snapshot (<code>enabling</code> | <code>optimizing</code> | <code>enabled</code> | <code>disabling</code> | <code>disabled</code>).</p> </li> </ul>",
+          "locationName":"Filter"
+        },
+        "MaxResults":{
+          "shape":"DescribeFastSnapshotRestoresMaxResults",
+          "documentation":"<p>The maximum number of results to return with a single call. To retrieve the remaining results, make another call with the returned <code>nextToken</code> value.</p>"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>The token for the next page of results.</p>"
+        },
+        "DryRun":{
+          "shape":"Boolean",
+          "documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>"
+        }
+      }
+    },
+    "DescribeFastSnapshotRestoresResult":{
+      "type":"structure",
+      "members":{
+        "FastSnapshotRestores":{
+          "shape":"DescribeFastSnapshotRestoreSuccessSet",
+          "documentation":"<p>Information about the state of fast snapshot restores.</p>",
+          "locationName":"fastSnapshotRestoreSet"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>The token to use to retrieve the next page of results. This value is <code>null</code> when there are no more results to return.</p>",
+          "locationName":"nextToken"
+        }
+      }
+    },
     "DescribeFleetError":{
       "type":"structure",
       "members":{
         "LaunchTemplateAndOverrides":{
           "shape":"LaunchTemplateAndOverridesResponse",
-          "documentation":"<p>The launch templates and overrides that were used for launching the instances. Any parameters that you specify in the Overrides override the same parameters in the launch template.</p>",
+          "documentation":"<p>The launch templates and overrides that were used for launching the instances. The values that you specify in the Overrides replace the values in the launch template.</p>",
           "locationName":"launchTemplateAndOverrides"
         },
         "Lifecycle":{
@@ -10991,7 +12286,7 @@
         },
         "ErrorMessage":{
           "shape":"String",
-          "documentation":"<p>The error message that describes why the instance could not be launched. For more information about error messages, see ee <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/errors-overview.html.html\">Error Codes</a>.</p>",
+          "documentation":"<p>The error message that describes why the instance could not be launched. For more information about error messages, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/errors-overview.html.html\">Error Codes</a>.</p>",
           "locationName":"errorMessage"
         }
       },
@@ -11021,7 +12316,7 @@
           "documentation":"<p>The token for the next set of results.</p>"
         },
         "FleetId":{
-          "shape":"FleetIdentifier",
+          "shape":"FleetId",
           "documentation":"<p>The ID of the EC2 Fleet.</p>"
         },
         "StartTime":{
@@ -11049,7 +12344,7 @@
           "locationName":"nextToken"
         },
         "FleetId":{
-          "shape":"FleetIdentifier",
+          "shape":"FleetId",
           "documentation":"<p>The ID of the EC Fleet.</p>",
           "locationName":"fleetId"
         },
@@ -11077,7 +12372,7 @@
           "documentation":"<p>The token for the next set of results.</p>"
         },
         "FleetId":{
-          "shape":"FleetIdentifier",
+          "shape":"FleetId",
           "documentation":"<p>The ID of the EC2 Fleet.</p>"
         },
         "Filters":{
@@ -11101,7 +12396,7 @@
           "locationName":"nextToken"
         },
         "FleetId":{
-          "shape":"FleetIdentifier",
+          "shape":"FleetId",
           "documentation":"<p>The ID of the EC2 Fleet.</p>",
           "locationName":"fleetId"
         }
@@ -11119,7 +12414,7 @@
       "members":{
         "LaunchTemplateAndOverrides":{
           "shape":"LaunchTemplateAndOverridesResponse",
-          "documentation":"<p>The launch templates and overrides that were used for launching the instances. Any parameters that you specify in the Overrides override the same parameters in the launch template.</p>",
+          "documentation":"<p>The launch templates and overrides that were used for launching the instances. The values that you specify in the Overrides replace the values in the launch template.</p>",
           "locationName":"launchTemplateAndOverrides"
         },
         "Lifecycle":{
@@ -11139,7 +12434,7 @@
         },
         "Platform":{
           "shape":"PlatformValues",
-          "documentation":"<p>The value is <code>Windows</code> for Windows instances; otherwise blank.</p>",
+          "documentation":"<p>The value is <code>Windows</code> for Windows instances. Otherwise, the value is blank.</p>",
           "locationName":"platform"
         }
       },
@@ -11203,10 +12498,10 @@
         },
         "Filter":{
           "shape":"FilterList",
-          "documentation":"<p>One or more filters.</p> <ul> <li> <p> <code>deliver-log-status</code> - The status of the logs delivery (<code>SUCCESS</code> | <code>FAILED</code>).</p> </li> <li> <p> <code>log-destination-type</code> - The type of destination to which the flow log publishes data. Possible destination types include <code>cloud-watch-logs</code> and <code>S3</code>.</p> </li> <li> <p> <code>flow-log-id</code> - The ID of the flow log.</p> </li> <li> <p> <code>log-group-name</code> - The name of the log group.</p> </li> <li> <p> <code>resource-id</code> - The ID of the VPC, subnet, or network interface.</p> </li> <li> <p> <code>traffic-type</code> - The type of traffic (<code>ACCEPT</code> | <code>REJECT</code> | <code>ALL</code>).</p> </li> </ul>"
+          "documentation":"<p>One or more filters.</p> <ul> <li> <p> <code>deliver-log-status</code> - The status of the logs delivery (<code>SUCCESS</code> | <code>FAILED</code>).</p> </li> <li> <p> <code>log-destination-type</code> - The type of destination to which the flow log publishes data. Possible destination types include <code>cloud-watch-logs</code> and <code>S3</code>.</p> </li> <li> <p> <code>flow-log-id</code> - The ID of the flow log.</p> </li> <li> <p> <code>log-group-name</code> - The name of the log group.</p> </li> <li> <p> <code>resource-id</code> - The ID of the VPC, subnet, or network interface.</p> </li> <li> <p> <code>traffic-type</code> - The type of traffic (<code>ACCEPT</code> | <code>REJECT</code> | <code>ALL</code>).</p> </li> <li> <p> <code>tag</code>:&lt;key&gt; - The key/value combination of a tag assigned to the resource. Use the tag key in the filter name and the tag value as the filter value. For example, to find all resources that have a tag with the key <code>Owner</code> and the value <code>TeamA</code>, specify <code>tag:Owner</code> for the filter name and <code>TeamA</code> for the filter value.</p> </li> <li> <p> <code>tag-key</code> - The key of a tag assigned to the resource. Use this filter to find all resources assigned a tag with a specific key, regardless of the tag value.</p> </li> </ul>"
         },
         "FlowLogIds":{
-          "shape":"ValueStringList",
+          "shape":"FlowLogIdList",
           "documentation":"<p>One or more flow log IDs.</p> <p>Constraint: Maximum of 1000 flow log IDs.</p>",
           "locationName":"FlowLogId"
         },
@@ -11247,7 +12542,7 @@
           "documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>"
         },
         "FpgaImageId":{
-          "shape":"String",
+          "shape":"FpgaImageId",
           "documentation":"<p>The ID of the AFI.</p>"
         },
         "Attribute":{
@@ -11342,7 +12637,7 @@
           "documentation":"<p>The token to use to retrieve the next page of results.</p>"
         },
         "OfferingId":{
-          "shape":"String",
+          "shape":"OfferingId",
           "documentation":"<p>The ID of the reservation offering.</p>"
         }
       }
@@ -11543,7 +12838,7 @@
           "documentation":"<p>The AMI attribute.</p> <p> <b>Note</b>: Depending on your account privileges, the <code>blockDeviceMapping</code> attribute may return a <code>Client.AuthFailure</code> error. If this happens, use <a>DescribeImages</a> to get information about the block device mapping for the AMI.</p>"
         },
         "ImageId":{
-          "shape":"String",
+          "shape":"ImageId",
           "documentation":"<p>The ID of the AMI.</p>"
         },
         "DryRun":{
@@ -11647,7 +12942,7 @@
           "documentation":"<p>The filters.</p>"
         },
         "ImportTaskIds":{
-          "shape":"ImportTaskIdList",
+          "shape":"ImportSnapshotTaskIdList",
           "documentation":"<p>A list of import snapshot task IDs.</p>",
           "locationName":"ImportTaskId"
         },
@@ -11694,7 +12989,7 @@
           "locationName":"dryRun"
         },
         "InstanceId":{
-          "shape":"String",
+          "shape":"InstanceId",
           "documentation":"<p>The ID of the instance.</p>",
           "locationName":"instanceId"
         }
@@ -11795,12 +13090,95 @@
         }
       }
     },
+    "DescribeInstanceTypeOfferingsRequest":{
+      "type":"structure",
+      "members":{
+        "DryRun":{
+          "shape":"Boolean",
+          "documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>"
+        },
+        "LocationType":{
+          "shape":"LocationType",
+          "documentation":"<p>The location type.</p>"
+        },
+        "Filters":{
+          "shape":"FilterList",
+          "documentation":"<p>One or more filters. Filter names and values are case-sensitive.</p> <ul> <li> <p> <code>location</code> - This depends on the location type. For example, if the location type is <code>region</code> (default), the location is the Region code (for example, <code>us-east-2</code>.)</p> </li> <li> <p> <code>instance-type</code> - The instance type.</p> </li> </ul>",
+          "locationName":"Filter"
+        },
+        "MaxResults":{
+          "shape":"DITOMaxResults",
+          "documentation":"<p>The maximum number of results to return for the request in a single page. The remaining results can be seen by sending another request with the next token value.</p>"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>The token to retrieve the next page of results.</p>"
+        }
+      }
+    },
+    "DescribeInstanceTypeOfferingsResult":{
+      "type":"structure",
+      "members":{
+        "InstanceTypeOfferings":{
+          "shape":"InstanceTypeOfferingsList",
+          "documentation":"<p>The instance types offered.</p>",
+          "locationName":"instanceTypeOfferingSet"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>The token to use to retrieve the next page of results. This value is <code>null</code> when there are no more results to return.</p>",
+          "locationName":"nextToken"
+        }
+      }
+    },
+    "DescribeInstanceTypesRequest":{
+      "type":"structure",
+      "members":{
+        "DryRun":{
+          "shape":"Boolean",
+          "documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>"
+        },
+        "InstanceTypes":{
+          "shape":"RequestInstanceTypeList",
+          "documentation":"<p>The instance types. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/instance-types.html\">Instance Types</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>.</p>",
+          "locationName":"InstanceType"
+        },
+        "Filters":{
+          "shape":"FilterList",
+          "documentation":"<p>One or more filters. Filter names and values are case-sensitive.</p> <ul> <li> <p> <code>auto-recovery-supported</code> - Indicates whether auto recovery is supported. (<code>true</code> | <code>false</code>)</p> </li> <li> <p> <code>bare-metal</code> - Indicates whether it is a bare metal instance type. (<code>true</code> | <code>false</code>)</p> </li> <li> <p> <code>burstable-performance-supported</code> - Indicates whether it is a burstable performance instance type. (<code>true</code> | <code>false</code>)</p> </li> <li> <p> <code>current-generation</code> - Indicates whether this instance type is the latest generation instance type of an instance family. (<code>true</code> | <code>false</code>)</p> </li> <li> <p> <code>ebs-info.ebs-optimized-support</code> - Indicates whether the instance type is EBS-optimized. (<code>supported</code> | <code>unsupported</code> | <code>default</code>)</p> </li> <li> <p> <code>ebs-info.encryption-support</code> - Indicates whether EBS encryption is supported. (<code>supported</code> | <code>unsupported</code>)</p> </li> <li> <p> <code>free-tier-eligible</code> - Indicates whether the instance type is eligible to use in the free tier. (<code>true</code> | <code>false</code>)</p> </li> <li> <p> <code>hibernation-supported</code> - Indicates whether On-Demand hibernation is supported. (<code>true</code> | <code>false</code>)</p> </li> <li> <p> <code>hypervisor</code> - The hypervisor used. (<code>nitro</code> | <code>xen</code>)</p> </li> <li> <p> <code>instance-storage-info.disk.count</code> - The number of local disks.</p> </li> <li> <p> <code>instance-storage-info.disk.size-in-gb</code> - The storage size of each instance storage disk, in GB.</p> </li> <li> <p> <code>instance-storage-info.disk.type</code> - The storage technology for the local instance storage disks. (<code>hdd</code> | <code>ssd</code>)</p> </li> <li> <p> <code>instance-storage-info.total-size-in-gb</code> - The total amount of storage available from all local instance storage, in GB.</p> </li> <li> <p> <code>instance-storage-supported</code> - Indicates whether the instance type has local instance storage. (<code>true</code> | <code>false</code>)</p> </li> <li> <p> <code>memory-info.size-in-mib</code> - The memory size.</p> </li> <li> <p> <code>network-info.ena-support</code> - Indicates whether Elastic Network Adapter (ENA) is supported or required. (<code>required</code> | <code>supported</code> | <code>unsupported</code>)</p> </li> <li> <p> <code>network-info.ipv4-addresses-per-interface</code> - The maximum number of private IPv4 addresses per network interface.</p> </li> <li> <p> <code>network-info.ipv6-addresses-per-interface</code> - The maximum number of private IPv6 addresses per network interface.</p> </li> <li> <p> <code>network-info.ipv6-supported</code> - Indicates whether the instance type supports IPv6. (<code>true</code> | <code>false</code>)</p> </li> <li> <p> <code>network-info.maximum-network-interfaces</code> - The maximum number of network interfaces per instance.</p> </li> <li> <p> <code>network-info.network-performance</code> - Describes the network performance.</p> </li> <li> <p> <code>processor-info.sustained-clock-speed-in-ghz</code> - The CPU clock speed, in GHz.</p> </li> <li> <p> <code>vcpu-info.default-cores</code> - The default number of cores for the instance type.</p> </li> <li> <p> <code>vcpu-info.default-threads-per-core</code> - The default number of threads per core for the instance type.</p> </li> <li> <p> <code>vcpu-info.default-vcpus</code> - The default number of vCPUs for the instance type.</p> </li> </ul>",
+          "locationName":"Filter"
+        },
+        "MaxResults":{
+          "shape":"DITMaxResults",
+          "documentation":"<p>The maximum number of results to return for the request in a single page. The remaining results can be seen by sending another request with the next token value.</p>"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>The token to retrieve the next page of results.</p>"
+        }
+      }
+    },
+    "DescribeInstanceTypesResult":{
+      "type":"structure",
+      "members":{
+        "InstanceTypes":{
+          "shape":"InstanceTypeInfoList",
+          "documentation":"<p>The instance type. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/instance-types.html\">Instance Types</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>.</p>",
+          "locationName":"instanceTypeSet"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>The token to use to retrieve the next page of results. This value is <code>null</code> when there are no more results to return.</p>",
+          "locationName":"nextToken"
+        }
+      }
+    },
     "DescribeInstancesRequest":{
       "type":"structure",
       "members":{
         "Filters":{
           "shape":"FilterList",
-          "documentation":"<p>The filters.</p> <ul> <li> <p> <code>affinity</code> - The affinity setting for an instance running on a Dedicated Host (<code>default</code> | <code>host</code>).</p> </li> <li> <p> <code>architecture</code> - The instance architecture (<code>i386</code> | <code>x86_64</code> | <code>arm64</code>).</p> </li> <li> <p> <code>availability-zone</code> - The Availability Zone of the instance.</p> </li> <li> <p> <code>block-device-mapping.attach-time</code> - The attach time for an EBS volume mapped to the instance, for example, <code>2010-09-15T17:15:20.000Z</code>.</p> </li> <li> <p> <code>block-device-mapping.delete-on-termination</code> - A Boolean that indicates whether the EBS volume is deleted on instance termination.</p> </li> <li> <p> <code>block-device-mapping.device-name</code> - The device name specified in the block device mapping (for example, <code>/dev/sdh</code> or <code>xvdh</code>).</p> </li> <li> <p> <code>block-device-mapping.status</code> - The status for the EBS volume (<code>attaching</code> | <code>attached</code> | <code>detaching</code> | <code>detached</code>).</p> </li> <li> <p> <code>block-device-mapping.volume-id</code> - The volume ID of the EBS volume.</p> </li> <li> <p> <code>client-token</code> - The idempotency token you provided when you launched the instance.</p> </li> <li> <p> <code>dns-name</code> - The public DNS name of the instance.</p> </li> <li> <p> <code>group-id</code> - The ID of the security group for the instance. EC2-Classic only.</p> </li> <li> <p> <code>group-name</code> - The name of the security group for the instance. EC2-Classic only.</p> </li> <li> <p> <code>hibernation-options.configured</code> - A Boolean that indicates whether the instance is enabled for hibernation. A value of <code>true</code> means that the instance is enabled for hibernation. </p> </li> <li> <p> <code>host-id</code> - The ID of the Dedicated Host on which the instance is running, if applicable.</p> </li> <li> <p> <code>hypervisor</code> - The hypervisor type of the instance (<code>ovm</code> | <code>xen</code>).</p> </li> <li> <p> <code>iam-instance-profile.arn</code> - The instance profile associated with the instance. Specified as an ARN.</p> </li> <li> <p> <code>image-id</code> - The ID of the image used to launch the instance.</p> </li> <li> <p> <code>instance-id</code> - The ID of the instance.</p> </li> <li> <p> <code>instance-lifecycle</code> - Indicates whether this is a Spot Instance or a Scheduled Instance (<code>spot</code> | <code>scheduled</code>).</p> </li> <li> <p> <code>instance-state-code</code> - The state of the instance, as a 16-bit unsigned integer. The high byte is used for internal purposes and should be ignored. The low byte is set based on the state represented. The valid values are: 0 (pending), 16 (running), 32 (shutting-down), 48 (terminated), 64 (stopping), and 80 (stopped).</p> </li> <li> <p> <code>instance-state-name</code> - The state of the instance (<code>pending</code> | <code>running</code> | <code>shutting-down</code> | <code>terminated</code> | <code>stopping</code> | <code>stopped</code>).</p> </li> <li> <p> <code>instance-type</code> - The type of instance (for example, <code>t2.micro</code>).</p> </li> <li> <p> <code>instance.group-id</code> - The ID of the security group for the instance. </p> </li> <li> <p> <code>instance.group-name</code> - The name of the security group for the instance. </p> </li> <li> <p> <code>ip-address</code> - The public IPv4 address of the instance.</p> </li> <li> <p> <code>kernel-id</code> - The kernel ID.</p> </li> <li> <p> <code>key-name</code> - The name of the key pair used when the instance was launched.</p> </li> <li> <p> <code>launch-index</code> - When launching multiple instances, this is the index for the instance in the launch group (for example, 0, 1, 2, and so on). </p> </li> <li> <p> <code>launch-time</code> - The time when the instance was launched.</p> </li> <li> <p> <code>monitoring-state</code> - Indicates whether detailed monitoring is enabled (<code>disabled</code> | <code>enabled</code>).</p> </li> <li> <p> <code>network-interface.addresses.private-ip-address</code> - The private IPv4 address associated with the network interface.</p> </li> <li> <p> <code>network-interface.addresses.primary</code> - Specifies whether the IPv4 address of the network interface is the primary private IPv4 address.</p> </li> <li> <p> <code>network-interface.addresses.association.public-ip</code> - The ID of the association of an Elastic IP address (IPv4) with a network interface.</p> </li> <li> <p> <code>network-interface.addresses.association.ip-owner-id</code> - The owner ID of the private IPv4 address associated with the network interface.</p> </li> <li> <p> <code>network-interface.association.public-ip</code> - The address of the Elastic IP address (IPv4) bound to the network interface.</p> </li> <li> <p> <code>network-interface.association.ip-owner-id</code> - The owner of the Elastic IP address (IPv4) associated with the network interface.</p> </li> <li> <p> <code>network-interface.association.allocation-id</code> - The allocation ID returned when you allocated the Elastic IP address (IPv4) for your network interface.</p> </li> <li> <p> <code>network-interface.association.association-id</code> - The association ID returned when the network interface was associated with an IPv4 address.</p> </li> <li> <p> <code>network-interface.attachment.attachment-id</code> - The ID of the interface attachment.</p> </li> <li> <p> <code>network-interface.attachment.instance-id</code> - The ID of the instance to which the network interface is attached.</p> </li> <li> <p> <code>network-interface.attachment.instance-owner-id</code> - The owner ID of the instance to which the network interface is attached.</p> </li> <li> <p> <code>network-interface.attachment.device-index</code> - The device index to which the network interface is attached.</p> </li> <li> <p> <code>network-interface.attachment.status</code> - The status of the attachment (<code>attaching</code> | <code>attached</code> | <code>detaching</code> | <code>detached</code>).</p> </li> <li> <p> <code>network-interface.attachment.attach-time</code> - The time that the network interface was attached to an instance.</p> </li> <li> <p> <code>network-interface.attachment.delete-on-termination</code> - Specifies whether the attachment is deleted when an instance is terminated.</p> </li> <li> <p> <code>network-interface.availability-zone</code> - The Availability Zone for the network interface.</p> </li> <li> <p> <code>network-interface.description</code> - The description of the network interface.</p> </li> <li> <p> <code>network-interface.group-id</code> - The ID of a security group associated with the network interface.</p> </li> <li> <p> <code>network-interface.group-name</code> - The name of a security group associated with the network interface.</p> </li> <li> <p> <code>network-interface.ipv6-addresses.ipv6-address</code> - The IPv6 address associated with the network interface.</p> </li> <li> <p> <code>network-interface.mac-address</code> - The MAC address of the network interface.</p> </li> <li> <p> <code>network-interface.network-interface-id</code> - The ID of the network interface.</p> </li> <li> <p> <code>network-interface.owner-id</code> - The ID of the owner of the network interface.</p> </li> <li> <p> <code>network-interface.private-dns-name</code> - The private DNS name of the network interface.</p> </li> <li> <p> <code>network-interface.requester-id</code> - The requester ID for the network interface.</p> </li> <li> <p> <code>network-interface.requester-managed</code> - Indicates whether the network interface is being managed by AWS.</p> </li> <li> <p> <code>network-interface.status</code> - The status of the network interface (<code>available</code>) | <code>in-use</code>).</p> </li> <li> <p> <code>network-interface.source-dest-check</code> - Whether the network interface performs source/destination checking. A value of <code>true</code> means that checking is enabled, and <code>false</code> means that checking is disabled. The value must be <code>false</code> for the network interface to perform network address translation (NAT) in your VPC.</p> </li> <li> <p> <code>network-interface.subnet-id</code> - The ID of the subnet for the network interface.</p> </li> <li> <p> <code>network-interface.vpc-id</code> - The ID of the VPC for the network interface.</p> </li> <li> <p> <code>owner-id</code> - The AWS account ID of the instance owner.</p> </li> <li> <p> <code>placement-group-name</code> - The name of the placement group for the instance.</p> </li> <li> <p> <code>placement-partition-number</code> - The partition in which the instance is located.</p> </li> <li> <p> <code>platform</code> - The platform. To list only Windows instances, use <code>windows</code>.</p> </li> <li> <p> <code>private-dns-name</code> - The private IPv4 DNS name of the instance.</p> </li> <li> <p> <code>private-ip-address</code> - The private IPv4 address of the instance.</p> </li> <li> <p> <code>product-code</code> - The product code associated with the AMI used to launch the instance.</p> </li> <li> <p> <code>product-code.type</code> - The type of product code (<code>devpay</code> | <code>marketplace</code>).</p> </li> <li> <p> <code>ramdisk-id</code> - The RAM disk ID.</p> </li> <li> <p> <code>reason</code> - The reason for the current state of the instance (for example, shows \"User Initiated [date]\" when you stop or terminate the instance). Similar to the state-reason-code filter.</p> </li> <li> <p> <code>requester-id</code> - The ID of the entity that launched the instance on your behalf (for example, AWS Management Console, Auto Scaling, and so on).</p> </li> <li> <p> <code>reservation-id</code> - The ID of the instance's reservation. A reservation ID is created any time you launch an instance. A reservation ID has a one-to-one relationship with an instance launch request, but can be associated with more than one instance if you launch multiple instances using the same launch request. For example, if you launch one instance, you get one reservation ID. If you launch ten instances using the same launch request, you also get one reservation ID.</p> </li> <li> <p> <code>root-device-name</code> - The device name of the root device volume (for example, <code>/dev/sda1</code>).</p> </li> <li> <p> <code>root-device-type</code> - The type of the root device volume (<code>ebs</code> | <code>instance-store</code>).</p> </li> <li> <p> <code>source-dest-check</code> - Indicates whether the instance performs source/destination checking. A value of <code>true</code> means that checking is enabled, and <code>false</code> means that checking is disabled. The value must be <code>false</code> for the instance to perform network address translation (NAT) in your VPC. </p> </li> <li> <p> <code>spot-instance-request-id</code> - The ID of the Spot Instance request.</p> </li> <li> <p> <code>state-reason-code</code> - The reason code for the state change.</p> </li> <li> <p> <code>state-reason-message</code> - A message that describes the state change.</p> </li> <li> <p> <code>subnet-id</code> - The ID of the subnet for the instance.</p> </li> <li> <p> <code>tag</code>:&lt;key&gt; - The key/value combination of a tag assigned to the resource. Use the tag key in the filter name and the tag value as the filter value. For example, to find all resources that have a tag with the key <code>Owner</code> and the value <code>TeamA</code>, specify <code>tag:Owner</code> for the filter name and <code>TeamA</code> for the filter value.</p> </li> <li> <p> <code>tag-key</code> - The key of a tag assigned to the resource. Use this filter to find all resources that have a tag with a specific key, regardless of the tag value.</p> </li> <li> <p> <code>tenancy</code> - The tenancy of an instance (<code>dedicated</code> | <code>default</code> | <code>host</code>).</p> </li> <li> <p> <code>virtualization-type</code> - The virtualization type of the instance (<code>paravirtual</code> | <code>hvm</code>).</p> </li> <li> <p> <code>vpc-id</code> - The ID of the VPC that the instance is running in.</p> </li> </ul>",
+          "documentation":"<p>The filters.</p> <ul> <li> <p> <code>affinity</code> - The affinity setting for an instance running on a Dedicated Host (<code>default</code> | <code>host</code>).</p> </li> <li> <p> <code>architecture</code> - The instance architecture (<code>i386</code> | <code>x86_64</code> | <code>arm64</code>).</p> </li> <li> <p> <code>availability-zone</code> - The Availability Zone of the instance.</p> </li> <li> <p> <code>block-device-mapping.attach-time</code> - The attach time for an EBS volume mapped to the instance, for example, <code>2010-09-15T17:15:20.000Z</code>.</p> </li> <li> <p> <code>block-device-mapping.delete-on-termination</code> - A Boolean that indicates whether the EBS volume is deleted on instance termination.</p> </li> <li> <p> <code>block-device-mapping.device-name</code> - The device name specified in the block device mapping (for example, <code>/dev/sdh</code> or <code>xvdh</code>).</p> </li> <li> <p> <code>block-device-mapping.status</code> - The status for the EBS volume (<code>attaching</code> | <code>attached</code> | <code>detaching</code> | <code>detached</code>).</p> </li> <li> <p> <code>block-device-mapping.volume-id</code> - The volume ID of the EBS volume.</p> </li> <li> <p> <code>client-token</code> - The idempotency token you provided when you launched the instance.</p> </li> <li> <p> <code>dns-name</code> - The public DNS name of the instance.</p> </li> <li> <p> <code>group-id</code> - The ID of the security group for the instance. EC2-Classic only.</p> </li> <li> <p> <code>group-name</code> - The name of the security group for the instance. EC2-Classic only.</p> </li> <li> <p> <code>hibernation-options.configured</code> - A Boolean that indicates whether the instance is enabled for hibernation. A value of <code>true</code> means that the instance is enabled for hibernation. </p> </li> <li> <p> <code>host-id</code> - The ID of the Dedicated Host on which the instance is running, if applicable.</p> </li> <li> <p> <code>hypervisor</code> - The hypervisor type of the instance (<code>ovm</code> | <code>xen</code>). The value <code>xen</code> is used for both Xen and Nitro hypervisors.</p> </li> <li> <p> <code>iam-instance-profile.arn</code> - The instance profile associated with the instance. Specified as an ARN.</p> </li> <li> <p> <code>image-id</code> - The ID of the image used to launch the instance.</p> </li> <li> <p> <code>instance-id</code> - The ID of the instance.</p> </li> <li> <p> <code>instance-lifecycle</code> - Indicates whether this is a Spot Instance or a Scheduled Instance (<code>spot</code> | <code>scheduled</code>).</p> </li> <li> <p> <code>instance-state-code</code> - The state of the instance, as a 16-bit unsigned integer. The high byte is used for internal purposes and should be ignored. The low byte is set based on the state represented. The valid values are: 0 (pending), 16 (running), 32 (shutting-down), 48 (terminated), 64 (stopping), and 80 (stopped).</p> </li> <li> <p> <code>instance-state-name</code> - The state of the instance (<code>pending</code> | <code>running</code> | <code>shutting-down</code> | <code>terminated</code> | <code>stopping</code> | <code>stopped</code>).</p> </li> <li> <p> <code>instance-type</code> - The type of instance (for example, <code>t2.micro</code>).</p> </li> <li> <p> <code>instance.group-id</code> - The ID of the security group for the instance. </p> </li> <li> <p> <code>instance.group-name</code> - The name of the security group for the instance. </p> </li> <li> <p> <code>ip-address</code> - The public IPv4 address of the instance.</p> </li> <li> <p> <code>kernel-id</code> - The kernel ID.</p> </li> <li> <p> <code>key-name</code> - The name of the key pair used when the instance was launched.</p> </li> <li> <p> <code>launch-index</code> - When launching multiple instances, this is the index for the instance in the launch group (for example, 0, 1, 2, and so on). </p> </li> <li> <p> <code>launch-time</code> - The time when the instance was launched.</p> </li> <li> <p> <code>metadata-options.http-tokens</code> - The metadata request authorization state (<code>optional</code> | <code>required</code>)</p> </li> <li> <p> <code>metadata-options.http-put-response-hop-limit</code> - The http metadata request put response hop limit (integer, possible values <code>1</code> to <code>64</code>)</p> </li> <li> <p> <code>metadata-options.http-endpoint</code> - Enable or disable metadata access on http endpoint (<code>enabled</code> | <code>disabled</code>)</p> </li> <li> <p> <code>monitoring-state</code> - Indicates whether detailed monitoring is enabled (<code>disabled</code> | <code>enabled</code>).</p> </li> <li> <p> <code>network-interface.addresses.private-ip-address</code> - The private IPv4 address associated with the network interface.</p> </li> <li> <p> <code>network-interface.addresses.primary</code> - Specifies whether the IPv4 address of the network interface is the primary private IPv4 address.</p> </li> <li> <p> <code>network-interface.addresses.association.public-ip</code> - The ID of the association of an Elastic IP address (IPv4) with a network interface.</p> </li> <li> <p> <code>network-interface.addresses.association.ip-owner-id</code> - The owner ID of the private IPv4 address associated with the network interface.</p> </li> <li> <p> <code>network-interface.association.public-ip</code> - The address of the Elastic IP address (IPv4) bound to the network interface.</p> </li> <li> <p> <code>network-interface.association.ip-owner-id</code> - The owner of the Elastic IP address (IPv4) associated with the network interface.</p> </li> <li> <p> <code>network-interface.association.allocation-id</code> - The allocation ID returned when you allocated the Elastic IP address (IPv4) for your network interface.</p> </li> <li> <p> <code>network-interface.association.association-id</code> - The association ID returned when the network interface was associated with an IPv4 address.</p> </li> <li> <p> <code>network-interface.attachment.attachment-id</code> - The ID of the interface attachment.</p> </li> <li> <p> <code>network-interface.attachment.instance-id</code> - The ID of the instance to which the network interface is attached.</p> </li> <li> <p> <code>network-interface.attachment.instance-owner-id</code> - The owner ID of the instance to which the network interface is attached.</p> </li> <li> <p> <code>network-interface.attachment.device-index</code> - The device index to which the network interface is attached.</p> </li> <li> <p> <code>network-interface.attachment.status</code> - The status of the attachment (<code>attaching</code> | <code>attached</code> | <code>detaching</code> | <code>detached</code>).</p> </li> <li> <p> <code>network-interface.attachment.attach-time</code> - The time that the network interface was attached to an instance.</p> </li> <li> <p> <code>network-interface.attachment.delete-on-termination</code> - Specifies whether the attachment is deleted when an instance is terminated.</p> </li> <li> <p> <code>network-interface.availability-zone</code> - The Availability Zone for the network interface.</p> </li> <li> <p> <code>network-interface.description</code> - The description of the network interface.</p> </li> <li> <p> <code>network-interface.group-id</code> - The ID of a security group associated with the network interface.</p> </li> <li> <p> <code>network-interface.group-name</code> - The name of a security group associated with the network interface.</p> </li> <li> <p> <code>network-interface.ipv6-addresses.ipv6-address</code> - The IPv6 address associated with the network interface.</p> </li> <li> <p> <code>network-interface.mac-address</code> - The MAC address of the network interface.</p> </li> <li> <p> <code>network-interface.network-interface-id</code> - The ID of the network interface.</p> </li> <li> <p> <code>network-interface.owner-id</code> - The ID of the owner of the network interface.</p> </li> <li> <p> <code>network-interface.private-dns-name</code> - The private DNS name of the network interface.</p> </li> <li> <p> <code>network-interface.requester-id</code> - The requester ID for the network interface.</p> </li> <li> <p> <code>network-interface.requester-managed</code> - Indicates whether the network interface is being managed by AWS.</p> </li> <li> <p> <code>network-interface.status</code> - The status of the network interface (<code>available</code>) | <code>in-use</code>).</p> </li> <li> <p> <code>network-interface.source-dest-check</code> - Whether the network interface performs source/destination checking. A value of <code>true</code> means that checking is enabled, and <code>false</code> means that checking is disabled. The value must be <code>false</code> for the network interface to perform network address translation (NAT) in your VPC.</p> </li> <li> <p> <code>network-interface.subnet-id</code> - The ID of the subnet for the network interface.</p> </li> <li> <p> <code>network-interface.vpc-id</code> - The ID of the VPC for the network interface.</p> </li> <li> <p> <code>owner-id</code> - The AWS account ID of the instance owner.</p> </li> <li> <p> <code>placement-group-name</code> - The name of the placement group for the instance.</p> </li> <li> <p> <code>placement-partition-number</code> - The partition in which the instance is located.</p> </li> <li> <p> <code>platform</code> - The platform. To list only Windows instances, use <code>windows</code>.</p> </li> <li> <p> <code>private-dns-name</code> - The private IPv4 DNS name of the instance.</p> </li> <li> <p> <code>private-ip-address</code> - The private IPv4 address of the instance.</p> </li> <li> <p> <code>product-code</code> - The product code associated with the AMI used to launch the instance.</p> </li> <li> <p> <code>product-code.type</code> - The type of product code (<code>devpay</code> | <code>marketplace</code>).</p> </li> <li> <p> <code>ramdisk-id</code> - The RAM disk ID.</p> </li> <li> <p> <code>reason</code> - The reason for the current state of the instance (for example, shows \"User Initiated [date]\" when you stop or terminate the instance). Similar to the state-reason-code filter.</p> </li> <li> <p> <code>requester-id</code> - The ID of the entity that launched the instance on your behalf (for example, AWS Management Console, Auto Scaling, and so on).</p> </li> <li> <p> <code>reservation-id</code> - The ID of the instance's reservation. A reservation ID is created any time you launch an instance. A reservation ID has a one-to-one relationship with an instance launch request, but can be associated with more than one instance if you launch multiple instances using the same launch request. For example, if you launch one instance, you get one reservation ID. If you launch ten instances using the same launch request, you also get one reservation ID.</p> </li> <li> <p> <code>root-device-name</code> - The device name of the root device volume (for example, <code>/dev/sda1</code>).</p> </li> <li> <p> <code>root-device-type</code> - The type of the root device volume (<code>ebs</code> | <code>instance-store</code>).</p> </li> <li> <p> <code>source-dest-check</code> - Indicates whether the instance performs source/destination checking. A value of <code>true</code> means that checking is enabled, and <code>false</code> means that checking is disabled. The value must be <code>false</code> for the instance to perform network address translation (NAT) in your VPC. </p> </li> <li> <p> <code>spot-instance-request-id</code> - The ID of the Spot Instance request.</p> </li> <li> <p> <code>state-reason-code</code> - The reason code for the state change.</p> </li> <li> <p> <code>state-reason-message</code> - A message that describes the state change.</p> </li> <li> <p> <code>subnet-id</code> - The ID of the subnet for the instance.</p> </li> <li> <p> <code>tag</code>:&lt;key&gt; - The key/value combination of a tag assigned to the resource. Use the tag key in the filter name and the tag value as the filter value. For example, to find all resources that have a tag with the key <code>Owner</code> and the value <code>TeamA</code>, specify <code>tag:Owner</code> for the filter name and <code>TeamA</code> for the filter value.</p> </li> <li> <p> <code>tag-key</code> - The key of a tag assigned to the resource. Use this filter to find all resources that have a tag with a specific key, regardless of the tag value.</p> </li> <li> <p> <code>tenancy</code> - The tenancy of an instance (<code>dedicated</code> | <code>default</code> | <code>host</code>).</p> </li> <li> <p> <code>virtualization-type</code> - The virtualization type of the instance (<code>paravirtual</code> | <code>hvm</code>).</p> </li> <li> <p> <code>vpc-id</code> - The ID of the VPC that the instance is running in.</p> </li> </ul>",
           "locationName":"Filter"
         },
         "InstanceIds":{
@@ -11859,7 +13237,7 @@
           "locationName":"dryRun"
         },
         "InternetGatewayIds":{
-          "shape":"ValueStringList",
+          "shape":"InternetGatewayIdList",
           "documentation":"<p>One or more internet gateway IDs.</p> <p>Default: Describes all your internet gateways.</p>",
           "locationName":"internetGatewayId"
         },
@@ -11888,6 +13266,48 @@
         }
       }
     },
+    "DescribeIpv6PoolsRequest":{
+      "type":"structure",
+      "members":{
+        "PoolIds":{
+          "shape":"Ipv6PoolIdList",
+          "documentation":"<p>The IDs of the IPv6 address pools.</p>",
+          "locationName":"PoolId"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>The token for the next page of results.</p>"
+        },
+        "MaxResults":{
+          "shape":"Ipv6PoolMaxResults",
+          "documentation":"<p>The maximum number of results to return with a single call. To retrieve the remaining results, make another call with the returned <code>nextToken</code> value.</p>"
+        },
+        "DryRun":{
+          "shape":"Boolean",
+          "documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>"
+        },
+        "Filters":{
+          "shape":"FilterList",
+          "documentation":"<p>One or more filters.</p> <ul> <li> <p> <code>tag</code>:&lt;key&gt; - The key/value combination of a tag assigned to the resource. Use the tag key in the filter name and the tag value as the filter value. For example, to find all resources that have a tag with the key <code>Owner</code> and the value <code>TeamA</code>, specify <code>tag:Owner</code> for the filter name and <code>TeamA</code> for the filter value.</p> </li> <li> <p> <code>tag-key</code> - The key of a tag assigned to the resource. Use this filter to find all resources assigned a tag with a specific key, regardless of the tag value.</p> </li> </ul>",
+          "locationName":"Filter"
+        }
+      }
+    },
+    "DescribeIpv6PoolsResult":{
+      "type":"structure",
+      "members":{
+        "Ipv6Pools":{
+          "shape":"Ipv6PoolSet",
+          "documentation":"<p>Information about the IPv6 address pools.</p>",
+          "locationName":"ipv6PoolSet"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>The token to use to retrieve the next page of results. This value is <code>null</code> when there are no more results to return.</p>",
+          "locationName":"nextToken"
+        }
+      }
+    },
     "DescribeKeyPairsRequest":{
       "type":"structure",
       "members":{
@@ -11901,6 +13321,11 @@
           "documentation":"<p>The key pair names.</p> <p>Default: Describes all your key pairs.</p>",
           "locationName":"KeyName"
         },
+        "KeyPairIds":{
+          "shape":"KeyPairIdStringList",
+          "documentation":"<p>The IDs of the key pairs.</p>",
+          "locationName":"KeyPairId"
+        },
         "DryRun":{
           "shape":"Boolean",
           "documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>",
@@ -11926,7 +13351,7 @@
           "documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>"
         },
         "LaunchTemplateId":{
-          "shape":"String",
+          "shape":"LaunchTemplateId",
           "documentation":"<p>The ID of the launch template. You must specify either the launch template ID or launch template name in the request.</p>"
         },
         "LaunchTemplateName":{
@@ -11989,7 +13414,7 @@
           "documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>"
         },
         "LaunchTemplateIds":{
-          "shape":"ValueStringList",
+          "shape":"LaunchTemplateIdStringList",
           "documentation":"<p>One or more launch template IDs.</p>",
           "locationName":"LaunchTemplateId"
         },
@@ -12028,6 +13453,258 @@
         }
       }
     },
+    "DescribeLocalGatewayRouteTableVirtualInterfaceGroupAssociationsRequest":{
+      "type":"structure",
+      "members":{
+        "LocalGatewayRouteTableVirtualInterfaceGroupAssociationIds":{
+          "shape":"LocalGatewayRouteTableVirtualInterfaceGroupAssociationIdSet",
+          "documentation":"<p>The IDs of the associations.</p>",
+          "locationName":"LocalGatewayRouteTableVirtualInterfaceGroupAssociationId"
+        },
+        "Filters":{
+          "shape":"FilterList",
+          "documentation":"<p>One or more filters.</p>",
+          "locationName":"Filter"
+        },
+        "MaxResults":{
+          "shape":"LocalGatewayMaxResults",
+          "documentation":"<p>The maximum number of results to return with a single call. To retrieve the remaining results, make another call with the returned <code>nextToken</code> value.</p>"
+        },
+        "NextToken":{
+          "shape":"String",
+          "documentation":"<p>The token for the next page of results.</p>"
+        },
+        "DryRun":{
+          "shape":"Boolean",
+          "documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>"
+        }
+      }
+    },
+    "DescribeLocalGatewayRouteTableVirtualInterfaceGroupAssociationsResult":{
+      "type":"structure",
+      "members":{
+        "LocalGatewayRouteTableVirtualInterfaceGroupAssociations":{
+          "shape":"LocalGatewayRouteTableVirtualInterfaceGroupAssociationSet",
+          "documentation":"<p>Information about the associations.</p>",
+          "locationName":"localGatewayRouteTableVirtualInterfaceGroupAssociationSet"
+        },
+        "NextToken":{
+          "shape":"String",
+          "documentation":"<p>The token to use to retrieve the next page of results. This value is <code>null</code> when there are no more results to return.</p>",
+          "locationName":"nextToken"
+        }
+      }
+    },
+    "DescribeLocalGatewayRouteTableVpcAssociationsRequest":{
+      "type":"structure",
+      "members":{
+        "LocalGatewayRouteTableVpcAssociationIds":{
+          "shape":"LocalGatewayRouteTableVpcAssociationIdSet",
+          "documentation":"<p>The IDs of the associations.</p>",
+          "locationName":"LocalGatewayRouteTableVpcAssociationId"
+        },
+        "Filters":{
+          "shape":"FilterList",
+          "documentation":"<p>One or more filters.</p>",
+          "locationName":"Filter"
+        },
+        "MaxResults":{
+          "shape":"LocalGatewayMaxResults",
+          "documentation":"<p>The maximum number of results to return with a single call. To retrieve the remaining results, make another call with the returned <code>nextToken</code> value.</p>"
+        },
+        "NextToken":{
+          "shape":"String",
+          "documentation":"<p>The token for the next page of results.</p>"
+        },
+        "DryRun":{
+          "shape":"Boolean",
+          "documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>"
+        }
+      }
+    },
+    "DescribeLocalGatewayRouteTableVpcAssociationsResult":{
+      "type":"structure",
+      "members":{
+        "LocalGatewayRouteTableVpcAssociations":{
+          "shape":"LocalGatewayRouteTableVpcAssociationSet",
+          "documentation":"<p>Information about the associations.</p>",
+          "locationName":"localGatewayRouteTableVpcAssociationSet"
+        },
+        "NextToken":{
+          "shape":"String",
+          "documentation":"<p>The token to use to retrieve the next page of results. This value is <code>null</code> when there are no more results to return.</p>",
+          "locationName":"nextToken"
+        }
+      }
+    },
+    "DescribeLocalGatewayRouteTablesRequest":{
+      "type":"structure",
+      "members":{
+        "LocalGatewayRouteTableIds":{
+          "shape":"LocalGatewayRouteTableIdSet",
+          "documentation":"<p>The IDs of the local gateway route tables.</p>",
+          "locationName":"LocalGatewayRouteTableId"
+        },
+        "Filters":{
+          "shape":"FilterList",
+          "documentation":"<p>One or more filters.</p>",
+          "locationName":"Filter"
+        },
+        "MaxResults":{
+          "shape":"LocalGatewayMaxResults",
+          "documentation":"<p>The maximum number of results to return with a single call. To retrieve the remaining results, make another call with the returned <code>nextToken</code> value.</p>"
+        },
+        "NextToken":{
+          "shape":"String",
+          "documentation":"<p>The token for the next page of results.</p>"
+        },
+        "DryRun":{
+          "shape":"Boolean",
+          "documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>"
+        }
+      }
+    },
+    "DescribeLocalGatewayRouteTablesResult":{
+      "type":"structure",
+      "members":{
+        "LocalGatewayRouteTables":{
+          "shape":"LocalGatewayRouteTableSet",
+          "documentation":"<p>Information about the local gateway route tables.</p>",
+          "locationName":"localGatewayRouteTableSet"
+        },
+        "NextToken":{
+          "shape":"String",
+          "documentation":"<p>The token to use to retrieve the next page of results. This value is <code>null</code> when there are no more results to return.</p>",
+          "locationName":"nextToken"
+        }
+      }
+    },
+    "DescribeLocalGatewayVirtualInterfaceGroupsRequest":{
+      "type":"structure",
+      "members":{
+        "LocalGatewayVirtualInterfaceGroupIds":{
+          "shape":"LocalGatewayVirtualInterfaceGroupIdSet",
+          "documentation":"<p>The IDs of the virtual interface groups.</p>",
+          "locationName":"LocalGatewayVirtualInterfaceGroupId"
+        },
+        "Filters":{
+          "shape":"FilterList",
+          "documentation":"<p>One or more filters.</p>",
+          "locationName":"Filter"
+        },
+        "MaxResults":{
+          "shape":"LocalGatewayMaxResults",
+          "documentation":"<p>The maximum number of results to return with a single call. To retrieve the remaining results, make another call with the returned <code>nextToken</code> value.</p>"
+        },
+        "NextToken":{
+          "shape":"String",
+          "documentation":"<p>The token for the next page of results.</p>"
+        },
+        "DryRun":{
+          "shape":"Boolean",
+          "documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>"
+        }
+      }
+    },
+    "DescribeLocalGatewayVirtualInterfaceGroupsResult":{
+      "type":"structure",
+      "members":{
+        "LocalGatewayVirtualInterfaceGroups":{
+          "shape":"LocalGatewayVirtualInterfaceGroupSet",
+          "documentation":"<p>The virtual interface groups.</p>",
+          "locationName":"localGatewayVirtualInterfaceGroupSet"
+        },
+        "NextToken":{
+          "shape":"String",
+          "documentation":"<p>The token to use to retrieve the next page of results. This value is <code>null</code> when there are no more results to return.</p>",
+          "locationName":"nextToken"
+        }
+      }
+    },
+    "DescribeLocalGatewayVirtualInterfacesRequest":{
+      "type":"structure",
+      "members":{
+        "LocalGatewayVirtualInterfaceIds":{
+          "shape":"LocalGatewayVirtualInterfaceIdSet",
+          "documentation":"<p>The IDs of the virtual interfaces.</p>",
+          "locationName":"LocalGatewayVirtualInterfaceId"
+        },
+        "Filters":{
+          "shape":"FilterList",
+          "documentation":"<p>One or more filters.</p>",
+          "locationName":"Filter"
+        },
+        "MaxResults":{
+          "shape":"LocalGatewayMaxResults",
+          "documentation":"<p>The maximum number of results to return with a single call. To retrieve the remaining results, make another call with the returned <code>nextToken</code> value.</p>"
+        },
+        "NextToken":{
+          "shape":"String",
+          "documentation":"<p>The token for the next page of results.</p>"
+        },
+        "DryRun":{
+          "shape":"Boolean",
+          "documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>"
+        }
+      }
+    },
+    "DescribeLocalGatewayVirtualInterfacesResult":{
+      "type":"structure",
+      "members":{
+        "LocalGatewayVirtualInterfaces":{
+          "shape":"LocalGatewayVirtualInterfaceSet",
+          "documentation":"<p>Information about the virtual interfaces.</p>",
+          "locationName":"localGatewayVirtualInterfaceSet"
+        },
+        "NextToken":{
+          "shape":"String",
+          "documentation":"<p>The token to use to retrieve the next page of results. This value is <code>null</code> when there are no more results to return.</p>",
+          "locationName":"nextToken"
+        }
+      }
+    },
+    "DescribeLocalGatewaysRequest":{
+      "type":"structure",
+      "members":{
+        "LocalGatewayIds":{
+          "shape":"LocalGatewayIdSet",
+          "documentation":"<p>The IDs of the local gateways.</p>",
+          "locationName":"LocalGatewayId"
+        },
+        "Filters":{
+          "shape":"FilterList",
+          "documentation":"<p>One or more filters.</p>",
+          "locationName":"Filter"
+        },
+        "MaxResults":{
+          "shape":"LocalGatewayMaxResults",
+          "documentation":"<p>The maximum number of results to return with a single call. To retrieve the remaining results, make another call with the returned <code>nextToken</code> value.</p>"
+        },
+        "NextToken":{
+          "shape":"String",
+          "documentation":"<p>The token for the next page of results.</p>"
+        },
+        "DryRun":{
+          "shape":"Boolean",
+          "documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>"
+        }
+      }
+    },
+    "DescribeLocalGatewaysResult":{
+      "type":"structure",
+      "members":{
+        "LocalGateways":{
+          "shape":"LocalGatewaySet",
+          "documentation":"<p>Information about the local gateways.</p>",
+          "locationName":"localGatewaySet"
+        },
+        "NextToken":{
+          "shape":"String",
+          "documentation":"<p>The token to use to retrieve the next page of results. This value is <code>null</code> when there are no more results to return.</p>",
+          "locationName":"nextToken"
+        }
+      }
+    },
     "DescribeMovingAddressesMaxResults":{
       "type":"integer",
       "max":1000,
@@ -12086,6 +13763,10 @@
     "DescribeNatGatewaysRequest":{
       "type":"structure",
       "members":{
+        "DryRun":{
+          "shape":"Boolean",
+          "documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>"
+        },
         "Filter":{
           "shape":"FilterList",
           "documentation":"<p>One or more filters.</p> <ul> <li> <p> <code>nat-gateway-id</code> - The ID of the NAT gateway.</p> </li> <li> <p> <code>state</code> - The state of the NAT gateway (<code>pending</code> | <code>failed</code> | <code>available</code> | <code>deleting</code> | <code>deleted</code>).</p> </li> <li> <p> <code>subnet-id</code> - The ID of the subnet in which the NAT gateway resides.</p> </li> <li> <p> <code>tag</code>:&lt;key&gt; - The key/value combination of a tag assigned to the resource. Use the tag key in the filter name and the tag value as the filter value. For example, to find all resources that have a tag with the key <code>Owner</code> and the value <code>TeamA</code>, specify <code>tag:Owner</code> for the filter name and <code>TeamA</code> for the filter value.</p> </li> <li> <p> <code>tag-key</code> - The key of a tag assigned to the resource. Use this filter to find all resources assigned a tag with a specific key, regardless of the tag value.</p> </li> <li> <p> <code>vpc-id</code> - The ID of the VPC in which the NAT gateway resides.</p> </li> </ul>"
@@ -12095,7 +13776,7 @@
           "documentation":"<p>The maximum number of results to return with a single call. To retrieve the remaining results, make another call with the returned <code>nextToken</code> value.</p>"
         },
         "NatGatewayIds":{
-          "shape":"ValueStringList",
+          "shape":"NatGatewayIdStringList",
           "documentation":"<p>One or more NAT gateway IDs.</p>",
           "locationName":"NatGatewayId"
         },
@@ -12139,7 +13820,7 @@
           "locationName":"dryRun"
         },
         "NetworkAclIds":{
-          "shape":"ValueStringList",
+          "shape":"NetworkAclIdStringList",
           "documentation":"<p>One or more network ACL IDs.</p> <p>Default: Describes all your network ACLs.</p>",
           "locationName":"NetworkAclId"
         },
@@ -12183,7 +13864,7 @@
           "locationName":"dryRun"
         },
         "NetworkInterfaceId":{
-          "shape":"String",
+          "shape":"NetworkInterfaceId",
           "documentation":"<p>The ID of the network interface.</p>",
           "locationName":"networkInterfaceId"
         }
@@ -12295,7 +13976,7 @@
         },
         "MaxResults":{
           "shape":"DescribeNetworkInterfacesMaxResults",
-          "documentation":"<p>The maximum number of items to return for this request. The request returns a token that you can specify in a subsequent call to get the next set of results.</p>"
+          "documentation":"<p>The maximum number of items to return for this request. The request returns a token that you can specify in a subsequent call to get the next set of results. You cannot specify this parameter and the network interface IDs parameter in the same request.</p>"
         }
       },
       "documentation":"<p>Contains the parameters for DescribeNetworkInterfaces.</p>"
@@ -12333,6 +14014,11 @@
           "shape":"PlacementGroupStringList",
           "documentation":"<p>The names of the placement groups.</p> <p>Default: Describes all your placement groups, or only those otherwise specified.</p>",
           "locationName":"groupName"
+        },
+        "GroupIds":{
+          "shape":"PlacementGroupIdStringList",
+          "documentation":"<p>The IDs of the placement groups.</p>",
+          "locationName":"GroupId"
         }
       }
     },
@@ -12367,7 +14053,7 @@
           "documentation":"<p>The token for the next page of results.</p>"
         },
         "PrefixListIds":{
-          "shape":"ValueStringList",
+          "shape":"PrefixListResourceIdStringList",
           "documentation":"<p>One or more prefix list IDs.</p>",
           "locationName":"PrefixListId"
         }
@@ -12434,7 +14120,7 @@
       "type":"structure",
       "members":{
         "PoolIds":{
-          "shape":"ValueStringList",
+          "shape":"PublicIpv4PoolIdStringList",
           "documentation":"<p>The IDs of the address pools.</p>",
           "locationName":"PoolId"
         },
@@ -12445,6 +14131,11 @@
         "MaxResults":{
           "shape":"PoolMaxResults",
           "documentation":"<p>The maximum number of results to return with a single call. To retrieve the remaining results, make another call with the returned <code>nextToken</code> value.</p>"
+        },
+        "Filters":{
+          "shape":"FilterList",
+          "documentation":"<p>One or more filters.</p> <ul> <li> <p> <code>tag</code>:&lt;key&gt; - The key/value combination of a tag assigned to the resource. Use the tag key in the filter name and the tag value as the filter value. For example, to find all resources that have a tag with the key <code>Owner</code> and the value <code>TeamA</code>, specify <code>tag:Owner</code> for the filter name and <code>TeamA</code> for the filter value.</p> </li> <li> <p> <code>tag-key</code> - The key of a tag assigned to the resource. Use this filter to find all resources assigned a tag with a specific key, regardless of the tag value.</p> </li> </ul>",
+          "locationName":"Filter"
         }
       }
     },
@@ -12506,12 +14197,12 @@
           "locationName":"Filter"
         },
         "ReservedInstancesId":{
-          "shape":"String",
+          "shape":"ReservationId",
           "documentation":"<p>One or more Reserved Instance IDs.</p>",
           "locationName":"reservedInstancesId"
         },
         "ReservedInstancesListingId":{
-          "shape":"String",
+          "shape":"ReservedInstancesListingId",
           "documentation":"<p>One or more Reserved Instance listing IDs.</p>",
           "locationName":"reservedInstancesListingId"
         }
@@ -12715,7 +14406,7 @@
           "locationName":"dryRun"
         },
         "RouteTableIds":{
-          "shape":"ValueStringList",
+          "shape":"RouteTableIdStringList",
           "documentation":"<p>One or more route table IDs.</p> <p>Default: Describes all your route tables.</p>",
           "locationName":"RouteTableId"
         },
@@ -12946,7 +14637,7 @@
           "documentation":"<p>The snapshot attribute you would like to view.</p>"
         },
         "SnapshotId":{
-          "shape":"String",
+          "shape":"SnapshotId",
           "documentation":"<p>The ID of the EBS snapshot.</p>"
         },
         "DryRun":{
@@ -12954,8 +14645,7 @@
           "documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>",
           "locationName":"dryRun"
         }
-      },
-      "documentation":"<p>Contains the parameters for DescribeSnapshotAttribute.</p>"
+      }
     },
     "DescribeSnapshotAttributeResult":{
       "type":"structure",
@@ -12975,8 +14665,7 @@
           "documentation":"<p>The ID of the EBS snapshot.</p>",
           "locationName":"snapshotId"
         }
-      },
-      "documentation":"<p>Contains the output of DescribeSnapshotAttribute.</p>"
+      }
     },
     "DescribeSnapshotsRequest":{
       "type":"structure",
@@ -13078,7 +14767,7 @@
           "locationName":"nextToken"
         },
         "SpotFleetRequestId":{
-          "shape":"String",
+          "shape":"SpotFleetRequestId",
           "documentation":"<p>The ID of the Spot Fleet request.</p>",
           "locationName":"spotFleetRequestId"
         }
@@ -13139,7 +14828,7 @@
           "locationName":"nextToken"
         },
         "SpotFleetRequestId":{
-          "shape":"String",
+          "shape":"SpotFleetRequestId",
           "documentation":"<p>The ID of the Spot Fleet request.</p>",
           "locationName":"spotFleetRequestId"
         },
@@ -13201,7 +14890,7 @@
           "locationName":"nextToken"
         },
         "SpotFleetRequestIds":{
-          "shape":"ValueStringList",
+          "shape":"SpotFleetRequestIdList",
           "documentation":"<p>The IDs of the Spot Fleet requests.</p>",
           "locationName":"spotFleetRequestId"
         }
@@ -13363,7 +15052,7 @@
           "documentation":"<p>The token for the next set of items to return. (You received this token from a prior call.)</p>"
         },
         "VpcId":{
-          "shape":"String",
+          "shape":"VpcId",
           "documentation":"<p>The ID of the VPC.</p>"
         }
       }
@@ -13441,7 +15130,7 @@
         },
         "Filters":{
           "shape":"FilterList",
-          "documentation":"<p>The filters.</p> <ul> <li> <p> <code>key</code> - The tag key.</p> </li> <li> <p> <code>resource-id</code> - The ID of the resource.</p> </li> <li> <p> <code>resource-type</code> - The resource type (<code>customer-gateway</code> | <code>dedicated-host</code> | <code>dhcp-options</code> | <code>elastic-ip</code> | <code>fleet</code> | <code>fpga-image</code> | <code>image</code> | <code>instance</code> | <code>host-reservation</code> | <code>internet-gateway</code> | <code>launch-template</code> | <code>natgateway</code> | <code>network-acl</code> | <code>network-interface</code> | <code>reserved-instances</code> | <code>route-table</code> | <code>security-group</code> | <code>snapshot</code> | <code>spot-instances-request</code> | <code>subnet</code> | <code>volume</code> | <code>vpc</code> | <code>vpc-peering-connection</code> | <code>vpn-connection</code> | <code>vpn-gateway</code>).</p> </li> <li> <p> <code>tag</code>:&lt;key&gt; - The key/value combination of the tag. For example, specify \"tag:Owner\" for the filter name and \"TeamA\" for the filter value to find resources with the tag \"Owner=TeamA\".</p> </li> <li> <p> <code>value</code> - The tag value.</p> </li> </ul>",
+          "documentation":"<p>The filters.</p> <ul> <li> <p> <code>key</code> - The tag key.</p> </li> <li> <p> <code>resource-id</code> - The ID of the resource.</p> </li> <li> <p> <code>resource-type</code> - The resource type (<code>customer-gateway</code> | <code>dedicated-host</code> | <code>dhcp-options</code> | <code>elastic-ip</code> | <code>fleet</code> | <code>fpga-image</code> | <code>image</code> | <code>instance</code> | <code>host-reservation</code> | <code>internet-gateway</code> | <code>launch-template</code> | <code>natgateway</code> | <code>network-acl</code> | <code>network-interface</code> | <code>placement-group</code> | <code>reserved-instances</code> | <code>route-table</code> | <code>security-group</code> | <code>snapshot</code> | <code>spot-instances-request</code> | <code>subnet</code> | <code>volume</code> | <code>vpc</code> | <code>vpc-endpoint</code> | <code>vpc-endpoint-service</code> | <code>vpc-peering-connection</code> | <code>vpn-connection</code> | <code>vpn-gateway</code>).</p> </li> <li> <p> <code>tag</code>:&lt;key&gt; - The key/value combination of the tag. For example, specify \"tag:Owner\" for the filter name and \"TeamA\" for the filter value to find resources with the tag \"Owner=TeamA\".</p> </li> <li> <p> <code>value</code> - The tag value.</p> </li> </ul>",
           "locationName":"Filter"
         },
         "MaxResults":{
@@ -13475,7 +15164,7 @@
       "type":"structure",
       "members":{
         "TrafficMirrorFilterIds":{
-          "shape":"ValueStringList",
+          "shape":"TrafficMirrorFilterIdList",
           "documentation":"<p>The ID of the Traffic Mirror filter.</p>",
           "locationName":"TrafficMirrorFilterId"
         },
@@ -13517,7 +15206,7 @@
       "type":"structure",
       "members":{
         "TrafficMirrorSessionIds":{
-          "shape":"ValueStringList",
+          "shape":"TrafficMirrorSessionIdList",
           "documentation":"<p>The ID of the Traffic Mirror session.</p>",
           "locationName":"TrafficMirrorSessionId"
         },
@@ -13559,7 +15248,7 @@
       "type":"structure",
       "members":{
         "TrafficMirrorTargetIds":{
-          "shape":"ValueStringList",
+          "shape":"TrafficMirrorTargetIdList",
           "documentation":"<p>The ID of the Traffic Mirror targets.</p>",
           "locationName":"TrafficMirrorTargetId"
         },
@@ -13638,6 +15327,88 @@
         }
       }
     },
+    "DescribeTransitGatewayMulticastDomainsRequest":{
+      "type":"structure",
+      "members":{
+        "TransitGatewayMulticastDomainIds":{
+          "shape":"TransitGatewayMulticastDomainIdStringList",
+          "documentation":"<p>The ID of the transit gateway multicast domain.</p>"
+        },
+        "Filters":{
+          "shape":"FilterList",
+          "documentation":"<p>One or more filters. The possible values are:</p> <ul> <li> <p> <code>state</code> - The state of the transit gateway multicast domain. Valid values are <code>pending</code> | <code>available</code> | <code>deleting</code> | <code>deleted</code>.</p> </li> <li> <p> <code>transit-gateway-id</code> - The ID of the transit gateway.</p> </li> <li> <p> <code>transit-gateway-multicast-domain-id</code> - The ID of the transit gateway multicast domain.</p> </li> </ul>",
+          "locationName":"Filter"
+        },
+        "MaxResults":{
+          "shape":"TransitGatewayMaxResults",
+          "documentation":"<p>The maximum number of results to return with a single call. To retrieve the remaining results, make another call with the returned <code>nextToken</code> value.</p>"
+        },
+        "NextToken":{
+          "shape":"String",
+          "documentation":"<p>The token for the next page of results.</p>"
+        },
+        "DryRun":{
+          "shape":"Boolean",
+          "documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>"
+        }
+      }
+    },
+    "DescribeTransitGatewayMulticastDomainsResult":{
+      "type":"structure",
+      "members":{
+        "TransitGatewayMulticastDomains":{
+          "shape":"TransitGatewayMulticastDomainList",
+          "documentation":"<p>Information about the transit gateway multicast domains.</p>",
+          "locationName":"transitGatewayMulticastDomains"
+        },
+        "NextToken":{
+          "shape":"String",
+          "documentation":"<p>The token to use to retrieve the next page of results. This value is <code>null</code> when there are no more results to return.</p>",
+          "locationName":"nextToken"
+        }
+      }
+    },
+    "DescribeTransitGatewayPeeringAttachmentsRequest":{
+      "type":"structure",
+      "members":{
+        "TransitGatewayAttachmentIds":{
+          "shape":"TransitGatewayAttachmentIdStringList",
+          "documentation":"<p>One or more IDs of the transit gateway peering attachments.</p>"
+        },
+        "Filters":{
+          "shape":"FilterList",
+          "documentation":"<p>One or more filters. The possible values are:</p> <ul> <li> <p> <code>transit-gateway-attachment-id</code> - The ID of the transit gateway attachment.</p> </li> <li> <p> <code>local-owner-id</code> - The ID of your AWS account.</p> </li> <li> <p> <code>remote-owner-id</code> - The ID of the AWS account in the remote Region that owns the transit gateway.</p> </li> <li> <p> <code>state</code> - The state of the peering attachment (<code>available</code> | <code>deleted</code> | <code>deleting</code> | <code>failed</code> | <code>modifying</code> | <code>pendingAcceptance</code> | <code>pending</code> | <code>rollingBack</code> | <code>rejected</code> | <code>rejecting</code>).</p> </li> <li> <p> <code>transit-gateway-id</code> - The ID of the transit gateway.</p> </li> </ul>",
+          "locationName":"Filter"
+        },
+        "MaxResults":{
+          "shape":"TransitGatewayMaxResults",
+          "documentation":"<p>The maximum number of results to return with a single call. To retrieve the remaining results, make another call with the returned <code>nextToken</code> value.</p>"
+        },
+        "NextToken":{
+          "shape":"String",
+          "documentation":"<p>The token for the next page of results.</p>"
+        },
+        "DryRun":{
+          "shape":"Boolean",
+          "documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>"
+        }
+      }
+    },
+    "DescribeTransitGatewayPeeringAttachmentsResult":{
+      "type":"structure",
+      "members":{
+        "TransitGatewayPeeringAttachments":{
+          "shape":"TransitGatewayPeeringAttachmentList",
+          "documentation":"<p>The transit gateway peering attachments.</p>",
+          "locationName":"transitGatewayPeeringAttachments"
+        },
+        "NextToken":{
+          "shape":"String",
+          "documentation":"<p>The token to use to retrieve the next page of results. This value is <code>null</code> when there are no more results to return.</p>",
+          "locationName":"nextToken"
+        }
+      }
+    },
     "DescribeTransitGatewayRouteTablesRequest":{
       "type":"structure",
       "members":{
@@ -13773,7 +15544,7 @@
           "documentation":"<p>The attribute of the volume. This parameter is required.</p>"
         },
         "VolumeId":{
-          "shape":"String",
+          "shape":"VolumeId",
           "documentation":"<p>The ID of the volume.</p>"
         },
         "DryRun":{
@@ -13781,8 +15552,7 @@
           "documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>",
           "locationName":"dryRun"
         }
-      },
-      "documentation":"<p>Contains the parameters for DescribeVolumeAttribute.</p>"
+      }
     },
     "DescribeVolumeAttributeResult":{
       "type":"structure",
@@ -13802,8 +15572,7 @@
           "documentation":"<p>The ID of the volume.</p>",
           "locationName":"volumeId"
         }
-      },
-      "documentation":"<p>Contains the output of DescribeVolumeAttribute.</p>"
+      }
     },
     "DescribeVolumeStatusRequest":{
       "type":"structure",
@@ -13862,7 +15631,7 @@
         },
         "Filters":{
           "shape":"FilterList",
-          "documentation":"<p>The filters. Supported filters: <code>volume-id</code>, <code>modification-state</code>, <code>target-size</code>, <code>target-iops</code>, <code>target-volume-type</code>, <code>original-size</code>, <code>original-iops</code>, <code>original-volume-type</code>, <code>start-time</code>. </p>",
+          "documentation":"<p>The filters. Supported filters: <code>volume-id</code> | <code>modification-state</code> | <code>target-size</code> | <code>target-iops</code> | <code>target-volume-type</code> | <code>original-size</code> | <code>original-iops</code> | <code>original-volume-type</code> | <code>start-time</code> | <code>originalMultiAttachEnabled</code> | <code>targetMultiAttachEnabled</code>. </p>",
           "locationName":"Filter"
         },
         "NextToken":{
@@ -13895,7 +15664,7 @@
       "members":{
         "Filters":{
           "shape":"FilterList",
-          "documentation":"<p>The filters.</p> <ul> <li> <p> <code>attachment.attach-time</code> - The time stamp when the attachment initiated.</p> </li> <li> <p> <code>attachment.delete-on-termination</code> - Whether the volume is deleted on instance termination.</p> </li> <li> <p> <code>attachment.device</code> - The device name specified in the block device mapping (for example, <code>/dev/sda1</code>).</p> </li> <li> <p> <code>attachment.instance-id</code> - The ID of the instance the volume is attached to.</p> </li> <li> <p> <code>attachment.status</code> - The attachment state (<code>attaching</code> | <code>attached</code> | <code>detaching</code>).</p> </li> <li> <p> <code>availability-zone</code> - The Availability Zone in which the volume was created.</p> </li> <li> <p> <code>create-time</code> - The time stamp when the volume was created.</p> </li> <li> <p> <code>encrypted</code> - Indicates whether the volume is encrypted (<code>true</code> | <code>false</code>)</p> </li> <li> <p> <code>size</code> - The size of the volume, in GiB.</p> </li> <li> <p> <code>snapshot-id</code> - The snapshot from which the volume was created.</p> </li> <li> <p> <code>status</code> - The status of the volume (<code>creating</code> | <code>available</code> | <code>in-use</code> | <code>deleting</code> | <code>deleted</code> | <code>error</code>).</p> </li> <li> <p> <code>tag</code>:&lt;key&gt; - The key/value combination of a tag assigned to the resource. Use the tag key in the filter name and the tag value as the filter value. For example, to find all resources that have a tag with the key <code>Owner</code> and the value <code>TeamA</code>, specify <code>tag:Owner</code> for the filter name and <code>TeamA</code> for the filter value.</p> </li> <li> <p> <code>tag-key</code> - The key of a tag assigned to the resource. Use this filter to find all resources assigned a tag with a specific key, regardless of the tag value.</p> </li> <li> <p> <code>volume-id</code> - The volume ID.</p> </li> <li> <p> <code>volume-type</code> - The Amazon EBS volume type. This can be <code>gp2</code> for General Purpose SSD, <code>io1</code> for Provisioned IOPS SSD, <code>st1</code> for Throughput Optimized HDD, <code>sc1</code> for Cold HDD, or <code>standard</code> for Magnetic volumes.</p> </li> </ul>",
+          "documentation":"<p>The filters.</p> <ul> <li> <p> <code>attachment.attach-time</code> - The time stamp when the attachment initiated.</p> </li> <li> <p> <code>attachment.delete-on-termination</code> - Whether the volume is deleted on instance termination.</p> </li> <li> <p> <code>attachment.device</code> - The device name specified in the block device mapping (for example, <code>/dev/sda1</code>).</p> </li> <li> <p> <code>attachment.instance-id</code> - The ID of the instance the volume is attached to.</p> </li> <li> <p> <code>attachment.status</code> - The attachment state (<code>attaching</code> | <code>attached</code> | <code>detaching</code>).</p> </li> <li> <p> <code>availability-zone</code> - The Availability Zone in which the volume was created.</p> </li> <li> <p> <code>create-time</code> - The time stamp when the volume was created.</p> </li> <li> <p> <code>encrypted</code> - Indicates whether the volume is encrypted (<code>true</code> | <code>false</code>)</p> </li> <li> <p> <code>multi-attach-enabled</code> - Indicates whether the volume is enabled for Multi-Attach (<code>true</code> | <code>false</code>)</p> </li> <li> <p> <code>fast-restored</code> - Indicates whether the volume was created from a snapshot that is enabled for fast snapshot restore (<code>true</code> | <code>false</code>).</p> </li> <li> <p> <code>size</code> - The size of the volume, in GiB.</p> </li> <li> <p> <code>snapshot-id</code> - The snapshot from which the volume was created.</p> </li> <li> <p> <code>status</code> - The status of the volume (<code>creating</code> | <code>available</code> | <code>in-use</code> | <code>deleting</code> | <code>deleted</code> | <code>error</code>).</p> </li> <li> <p> <code>tag</code>:&lt;key&gt; - The key/value combination of a tag assigned to the resource. Use the tag key in the filter name and the tag value as the filter value. For example, to find all resources that have a tag with the key <code>Owner</code> and the value <code>TeamA</code>, specify <code>tag:Owner</code> for the filter name and <code>TeamA</code> for the filter value.</p> </li> <li> <p> <code>tag-key</code> - The key of a tag assigned to the resource. Use this filter to find all resources assigned a tag with a specific key, regardless of the tag value.</p> </li> <li> <p> <code>volume-id</code> - The volume ID.</p> </li> <li> <p> <code>volume-type</code> - The Amazon EBS volume type. This can be <code>gp2</code> for General Purpose SSD, <code>io1</code> for Provisioned IOPS SSD, <code>st1</code> for Throughput Optimized HDD, <code>sc1</code> for Cold HDD, or <code>standard</code> for Magnetic volumes.</p> </li> </ul>",
           "locationName":"Filter"
         },
         "VolumeIds":{
@@ -13947,7 +15716,7 @@
           "documentation":"<p>The VPC attribute.</p>"
         },
         "VpcId":{
-          "shape":"String",
+          "shape":"VpcId",
           "documentation":"<p>The ID of the VPC.</p>"
         },
         "DryRun":{
@@ -14059,12 +15828,12 @@
           "documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>"
         },
         "ConnectionNotificationId":{
-          "shape":"String",
+          "shape":"ConnectionNotificationId",
           "documentation":"<p>The ID of the notification.</p>"
         },
         "Filters":{
           "shape":"FilterList",
-          "documentation":"<p>One or more filters.</p> <ul> <li> <p> <code>connection-notification-arn</code> - The ARN of SNS topic for the notification.</p> </li> <li> <p> <code>connection-notification-id</code> - The ID of the notification.</p> </li> <li> <p> <code>connection-notification-state</code> - The state of the notification (<code>Enabled</code> | <code>Disabled</code>).</p> </li> <li> <p> <code>connection-notification-type</code> - The type of notification (<code>Topic</code>).</p> </li> <li> <p> <code>service-id</code> - The ID of the endpoint service.</p> </li> <li> <p> <code>vpc-endpoint-id</code> - The ID of the VPC endpoint.</p> </li> </ul>",
+          "documentation":"<p>One or more filters.</p> <ul> <li> <p> <code>connection-notification-arn</code> - The ARN of the SNS topic for the notification.</p> </li> <li> <p> <code>connection-notification-id</code> - The ID of the notification.</p> </li> <li> <p> <code>connection-notification-state</code> - The state of the notification (<code>Enabled</code> | <code>Disabled</code>).</p> </li> <li> <p> <code>connection-notification-type</code> - The type of notification (<code>Topic</code>).</p> </li> <li> <p> <code>service-id</code> - The ID of the endpoint service.</p> </li> <li> <p> <code>vpc-endpoint-id</code> - The ID of the VPC endpoint.</p> </li> </ul>",
           "locationName":"Filter"
         },
         "MaxResults":{
@@ -14106,7 +15875,7 @@
         },
         "MaxResults":{
           "shape":"Integer",
-          "documentation":"<p>The maximum number of results to return for the request in a single page. The remaining results of the initial request can be seen by sending another request with the returned <code>NextToken</code> value. This value can be between 5 and 1000; if <code>MaxResults</code> is given a value larger than 1000, only 1000 results are returned.</p>"
+          "documentation":"<p>The maximum number of results to return for the request in a single page. The remaining results of the initial request can be seen by sending another request with the returned <code>NextToken</code> value. This value can be between 5 and 1,000; if <code>MaxResults</code> is given a value larger than 1,000, only 1,000 results are returned.</p>"
         },
         "NextToken":{
           "shape":"String",
@@ -14137,7 +15906,7 @@
           "documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>"
         },
         "ServiceIds":{
-          "shape":"ValueStringList",
+          "shape":"VpcEndpointServiceIdList",
           "documentation":"<p>The IDs of one or more services.</p>",
           "locationName":"ServiceId"
         },
@@ -14148,7 +15917,7 @@
         },
         "MaxResults":{
           "shape":"Integer",
-          "documentation":"<p>The maximum number of results to return for the request in a single page. The remaining results of the initial request can be seen by sending another request with the returned <code>NextToken</code> value. This value can be between 5 and 1000; if <code>MaxResults</code> is given a value larger than 1000, only 1000 results are returned.</p>"
+          "documentation":"<p>The maximum number of results to return for the request in a single page. The remaining results of the initial request can be seen by sending another request with the returned <code>NextToken</code> value. This value can be between 5 and 1,000; if <code>MaxResults</code> is given a value larger than 1,000, only 1,000 results are returned.</p>"
         },
         "NextToken":{
           "shape":"String",
@@ -14180,7 +15949,7 @@
           "documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>"
         },
         "ServiceId":{
-          "shape":"String",
+          "shape":"VpcEndpointServiceId",
           "documentation":"<p>The ID of the service.</p>"
         },
         "Filters":{
@@ -14190,7 +15959,7 @@
         },
         "MaxResults":{
           "shape":"Integer",
-          "documentation":"<p>The maximum number of results to return for the request in a single page. The remaining results of the initial request can be seen by sending another request with the returned <code>NextToken</code> value. This value can be between 5 and 1000; if <code>MaxResults</code> is given a value larger than 1000, only 1000 results are returned.</p>"
+          "documentation":"<p>The maximum number of results to return for the request in a single page. The remaining results of the initial request can be seen by sending another request with the returned <code>NextToken</code> value. This value can be between 5 and 1,000; if <code>MaxResults</code> is given a value larger than 1,000, only 1,000 results are returned.</p>"
         },
         "NextToken":{
           "shape":"String",
@@ -14227,12 +15996,12 @@
         },
         "Filters":{
           "shape":"FilterList",
-          "documentation":"<p>One or more filters.</p> <ul> <li> <p> <code>service-name</code>: The name of the service.</p> </li> <li> <p> <code>tag</code>:&lt;key&gt; - The key/value combination of a tag assigned to the resource. Use the tag key in the filter name and the tag value as the filter value. For example, to find all resources that have a tag with the key <code>Owner</code> and the value <code>TeamA</code>, specify <code>tag:Owner</code> for the filter name and <code>TeamA</code> for the filter value.</p> </li> <li> <p> <code>tag-key</code> - The key of a tag assigned to the resource. Use this filter to find all resources assigned a tag with a specific key, regardless of the tag value.</p> </li> </ul>",
+          "documentation":"<p>One or more filters.</p> <ul> <li> <p> <code>service-name</code> - The name of the service.</p> </li> <li> <p> <code>tag</code>:&lt;key&gt; - The key/value combination of a tag assigned to the resource. Use the tag key in the filter name and the tag value as the filter value. For example, to find all resources that have a tag with the key <code>Owner</code> and the value <code>TeamA</code>, specify <code>tag:Owner</code> for the filter name and <code>TeamA</code> for the filter value.</p> </li> <li> <p> <code>tag-key</code> - The key of a tag assigned to the resource. Use this filter to find all resources assigned a tag with a specific key, regardless of the tag value.</p> </li> </ul>",
           "locationName":"Filter"
         },
         "MaxResults":{
           "shape":"Integer",
-          "documentation":"<p>The maximum number of items to return for this request. The request returns a token that you can specify in a subsequent call to get the next set of results.</p> <p>Constraint: If the value is greater than 1000, we return only 1000 items.</p>"
+          "documentation":"<p>The maximum number of items to return for this request. The request returns a token that you can specify in a subsequent call to get the next set of results.</p> <p>Constraint: If the value is greater than 1,000, we return only 1,000 items.</p>"
         },
         "NextToken":{
           "shape":"String",
@@ -14270,18 +16039,18 @@
           "documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>"
         },
         "VpcEndpointIds":{
-          "shape":"ValueStringList",
+          "shape":"VpcEndpointIdList",
           "documentation":"<p>One or more endpoint IDs.</p>",
           "locationName":"VpcEndpointId"
         },
         "Filters":{
           "shape":"FilterList",
-          "documentation":"<p>One or more filters.</p> <ul> <li> <p> <code>service-name</code>: The name of the service.</p> </li> <li> <p> <code>vpc-id</code>: The ID of the VPC in which the endpoint resides.</p> </li> <li> <p> <code>vpc-endpoint-id</code>: The ID of the endpoint.</p> </li> <li> <p> <code>vpc-endpoint-state</code> - The state of the endpoint (<code>pendingAcceptance</code> | <code>pending</code> | <code>available</code> | <code>deleting</code> | <code>deleted</code> | <code>rejected</code> | <code>failed</code>).</p> </li> <li> <p> <code>tag</code>:&lt;key&gt; - The key/value combination of a tag assigned to the resource. Use the tag key in the filter name and the tag value as the filter value. For example, to find all resources that have a tag with the key <code>Owner</code> and the value <code>TeamA</code>, specify <code>tag:Owner</code> for the filter name and <code>TeamA</code> for the filter value.</p> </li> <li> <p> <code>tag-key</code> - The key of a tag assigned to the resource. Use this filter to find all resources assigned a tag with a specific key, regardless of the tag value.</p> </li> </ul>",
+          "documentation":"<p>One or more filters.</p> <ul> <li> <p> <code>service-name</code> - The name of the service.</p> </li> <li> <p> <code>vpc-id</code> - The ID of the VPC in which the endpoint resides.</p> </li> <li> <p> <code>vpc-endpoint-id</code> - The ID of the endpoint.</p> </li> <li> <p> <code>vpc-endpoint-state</code> - The state of the endpoint (<code>pendingAcceptance</code> | <code>pending</code> | <code>available</code> | <code>deleting</code> | <code>deleted</code> | <code>rejected</code> | <code>failed</code>).</p> </li> <li> <p> <code>tag</code>:&lt;key&gt; - The key/value combination of a tag assigned to the resource. Use the tag key in the filter name and the tag value as the filter value. For example, to find all resources that have a tag with the key <code>Owner</code> and the value <code>TeamA</code>, specify <code>tag:Owner</code> for the filter name and <code>TeamA</code> for the filter value.</p> </li> <li> <p> <code>tag-key</code> - The key of a tag assigned to the resource. Use this filter to find all resources assigned a tag with a specific key, regardless of the tag value.</p> </li> </ul>",
           "locationName":"Filter"
         },
         "MaxResults":{
           "shape":"Integer",
-          "documentation":"<p>The maximum number of items to return for this request. The request returns a token that you can specify in a subsequent call to get the next set of results.</p> <p>Constraint: If the value is greater than 1000, we return only 1000 items.</p>"
+          "documentation":"<p>The maximum number of items to return for this request. The request returns a token that you can specify in a subsequent call to get the next set of results.</p> <p>Constraint: If the value is greater than 1,000, we return only 1,000 items.</p>"
         },
         "NextToken":{
           "shape":"String",
@@ -14325,7 +16094,7 @@
           "locationName":"dryRun"
         },
         "VpcPeeringConnectionIds":{
-          "shape":"ValueStringList",
+          "shape":"VpcPeeringConnectionIdList",
           "documentation":"<p>One or more VPC peering connection IDs.</p> <p>Default: Describes all your VPC peering connections.</p>",
           "locationName":"VpcPeeringConnectionId"
         },
@@ -14364,7 +16133,7 @@
       "members":{
         "Filters":{
           "shape":"FilterList",
-          "documentation":"<p>One or more filters.</p> <ul> <li> <p> <code>cidr</code> - The primary IPv4 CIDR block of the VPC. The CIDR block you specify must exactly match the VPC's CIDR block for information to be returned for the VPC. Must contain the slash followed by one or two digits (for example, <code>/28</code>).</p> </li> <li> <p> <code>cidr-block-association.cidr-block</code> - An IPv4 CIDR block associated with the VPC.</p> </li> <li> <p> <code>cidr-block-association.association-id</code> - The association ID for an IPv4 CIDR block associated with the VPC.</p> </li> <li> <p> <code>cidr-block-association.state</code> - The state of an IPv4 CIDR block associated with the VPC.</p> </li> <li> <p> <code>dhcp-options-id</code> - The ID of a set of DHCP options.</p> </li> <li> <p> <code>ipv6-cidr-block-association.ipv6-cidr-block</code> - An IPv6 CIDR block associated with the VPC.</p> </li> <li> <p> <code>ipv6-cidr-block-association.association-id</code> - The association ID for an IPv6 CIDR block associated with the VPC.</p> </li> <li> <p> <code>ipv6-cidr-block-association.state</code> - The state of an IPv6 CIDR block associated with the VPC.</p> </li> <li> <p> <code>isDefault</code> - Indicates whether the VPC is the default VPC.</p> </li> <li> <p> <code>owner-id</code> - The ID of the AWS account that owns the VPC.</p> </li> <li> <p> <code>state</code> - The state of the VPC (<code>pending</code> | <code>available</code>).</p> </li> <li> <p> <code>tag</code>:&lt;key&gt; - The key/value combination of a tag assigned to the resource. Use the tag key in the filter name and the tag value as the filter value. For example, to find all resources that have a tag with the key <code>Owner</code> and the value <code>TeamA</code>, specify <code>tag:Owner</code> for the filter name and <code>TeamA</code> for the filter value.</p> </li> <li> <p> <code>tag-key</code> - The key of a tag assigned to the resource. Use this filter to find all resources assigned a tag with a specific key, regardless of the tag value.</p> </li> <li> <p> <code>vpc-id</code> - The ID of the VPC.</p> </li> </ul>",
+          "documentation":"<p>One or more filters.</p> <ul> <li> <p> <code>cidr</code> - The primary IPv4 CIDR block of the VPC. The CIDR block you specify must exactly match the VPC's CIDR block for information to be returned for the VPC. Must contain the slash followed by one or two digits (for example, <code>/28</code>).</p> </li> <li> <p> <code>cidr-block-association.cidr-block</code> - An IPv4 CIDR block associated with the VPC.</p> </li> <li> <p> <code>cidr-block-association.association-id</code> - The association ID for an IPv4 CIDR block associated with the VPC.</p> </li> <li> <p> <code>cidr-block-association.state</code> - The state of an IPv4 CIDR block associated with the VPC.</p> </li> <li> <p> <code>dhcp-options-id</code> - The ID of a set of DHCP options.</p> </li> <li> <p> <code>ipv6-cidr-block-association.ipv6-cidr-block</code> - An IPv6 CIDR block associated with the VPC.</p> </li> <li> <p> <code>ipv6-cidr-block-association.ipv6-pool</code> - The ID of the IPv6 address pool from which the IPv6 CIDR block is allocated.</p> </li> <li> <p> <code>ipv6-cidr-block-association.association-id</code> - The association ID for an IPv6 CIDR block associated with the VPC.</p> </li> <li> <p> <code>ipv6-cidr-block-association.state</code> - The state of an IPv6 CIDR block associated with the VPC.</p> </li> <li> <p> <code>isDefault</code> - Indicates whether the VPC is the default VPC.</p> </li> <li> <p> <code>owner-id</code> - The ID of the AWS account that owns the VPC.</p> </li> <li> <p> <code>state</code> - The state of the VPC (<code>pending</code> | <code>available</code>).</p> </li> <li> <p> <code>tag</code>:&lt;key&gt; - The key/value combination of a tag assigned to the resource. Use the tag key in the filter name and the tag value as the filter value. For example, to find all resources that have a tag with the key <code>Owner</code> and the value <code>TeamA</code>, specify <code>tag:Owner</code> for the filter name and <code>TeamA</code> for the filter value.</p> </li> <li> <p> <code>tag-key</code> - The key of a tag assigned to the resource. Use this filter to find all resources assigned a tag with a specific key, regardless of the tag value.</p> </li> <li> <p> <code>vpc-id</code> - The ID of the VPC.</p> </li> </ul>",
           "locationName":"Filter"
         },
         "VpcIds":{
@@ -14407,7 +16176,7 @@
       "members":{
         "Filters":{
           "shape":"FilterList",
-          "documentation":"<p>One or more filters.</p> <ul> <li> <p> <code>customer-gateway-configuration</code> - The configuration information for the customer gateway.</p> </li> <li> <p> <code>customer-gateway-id</code> - The ID of a customer gateway associated with the VPN connection.</p> </li> <li> <p> <code>state</code> - The state of the VPN connection (<code>pending</code> | <code>available</code> | <code>deleting</code> | <code>deleted</code>).</p> </li> <li> <p> <code>option.static-routes-only</code> - Indicates whether the connection has static routes only. Used for devices that do not support Border Gateway Protocol (BGP).</p> </li> <li> <p> <code>route.destination-cidr-block</code> - The destination CIDR block. This corresponds to the subnet used in a customer data center.</p> </li> <li> <p> <code>bgp-asn</code> - The BGP Autonomous System Number (ASN) associated with a BGP device.</p> </li> <li> <p> <code>tag</code>:&lt;key&gt; - The key/value combination of a tag assigned to the resource. Use the tag key in the filter name and the tag value as the filter value. For example, to find all resources that have a tag with the key <code>Owner</code> and the value <code>TeamA</code>, specify <code>tag:Owner</code> for the filter name and <code>TeamA</code> for the filter value.</p> </li> <li> <p> <code>tag-key</code> - The key of a tag assigned to the resource. Use this filter to find all resources assigned a tag with a specific key, regardless of the tag value.</p> </li> <li> <p> <code>type</code> - The type of VPN connection. Currently the only supported type is <code>ipsec.1</code>.</p> </li> <li> <p> <code>vpn-connection-id</code> - The ID of the VPN connection.</p> </li> <li> <p> <code>vpn-gateway-id</code> - The ID of a virtual private gateway associated with the VPN connection.</p> </li> </ul>",
+          "documentation":"<p>One or more filters.</p> <ul> <li> <p> <code>customer-gateway-configuration</code> - The configuration information for the customer gateway.</p> </li> <li> <p> <code>customer-gateway-id</code> - The ID of a customer gateway associated with the VPN connection.</p> </li> <li> <p> <code>state</code> - The state of the VPN connection (<code>pending</code> | <code>available</code> | <code>deleting</code> | <code>deleted</code>).</p> </li> <li> <p> <code>option.static-routes-only</code> - Indicates whether the connection has static routes only. Used for devices that do not support Border Gateway Protocol (BGP).</p> </li> <li> <p> <code>route.destination-cidr-block</code> - The destination CIDR block. This corresponds to the subnet used in a customer data center.</p> </li> <li> <p> <code>bgp-asn</code> - The BGP Autonomous System Number (ASN) associated with a BGP device.</p> </li> <li> <p> <code>tag</code>:&lt;key&gt; - The key/value combination of a tag assigned to the resource. Use the tag key in the filter name and the tag value as the filter value. For example, to find all resources that have a tag with the key <code>Owner</code> and the value <code>TeamA</code>, specify <code>tag:Owner</code> for the filter name and <code>TeamA</code> for the filter value.</p> </li> <li> <p> <code>tag-key</code> - The key of a tag assigned to the resource. Use this filter to find all resources assigned a tag with a specific key, regardless of the tag value.</p> </li> <li> <p> <code>type</code> - The type of VPN connection. Currently the only supported type is <code>ipsec.1</code>.</p> </li> <li> <p> <code>vpn-connection-id</code> - The ID of the VPN connection.</p> </li> <li> <p> <code>vpn-gateway-id</code> - The ID of a virtual private gateway associated with the VPN connection.</p> </li> <li> <p> <code>transit-gateway-id</code> - The ID of a transit gateway associated with the VPN connection.</p> </li> </ul>",
           "locationName":"Filter"
         },
         "VpnConnectionIds":{
@@ -14479,12 +16248,12 @@
           "locationName":"dryRun"
         },
         "InstanceId":{
-          "shape":"String",
+          "shape":"InstanceId",
           "documentation":"<p>The ID of the instance to unlink from the VPC.</p>",
           "locationName":"instanceId"
         },
         "VpcId":{
-          "shape":"String",
+          "shape":"VpcId",
           "documentation":"<p>The ID of the VPC to which the instance is linked.</p>",
           "locationName":"vpcId"
         }
@@ -14513,12 +16282,12 @@
           "locationName":"dryRun"
         },
         "InternetGatewayId":{
-          "shape":"String",
+          "shape":"InternetGatewayId",
           "documentation":"<p>The ID of the internet gateway.</p>",
           "locationName":"internetGatewayId"
         },
         "VpcId":{
-          "shape":"String",
+          "shape":"VpcId",
           "documentation":"<p>The ID of the VPC.</p>",
           "locationName":"vpcId"
         }
@@ -14529,7 +16298,7 @@
       "required":["AttachmentId"],
       "members":{
         "AttachmentId":{
-          "shape":"String",
+          "shape":"NetworkInterfaceAttachmentId",
           "documentation":"<p>The ID of the attachment.</p>",
           "locationName":"attachmentId"
         },
@@ -14559,11 +16328,11 @@
           "documentation":"<p>Forces detachment if the previous detachment attempt did not occur cleanly (for example, logging into an instance, unmounting the volume, and detaching normally). This option can lead to data loss or a corrupted file system. Use this option only as a last resort to detach a volume from a failed instance. The instance won't have an opportunity to flush file system caches or file system metadata. If you use this option, you must perform file system check and repair procedures.</p>"
         },
         "InstanceId":{
-          "shape":"String",
-          "documentation":"<p>The ID of the instance.</p>"
+          "shape":"InstanceId",
+          "documentation":"<p>The ID of the instance. If you are detaching a Multi-Attach enabled volume, you must specify an instance ID.</p>"
         },
         "VolumeId":{
-          "shape":"String",
+          "shape":"VolumeId",
           "documentation":"<p>The ID of the volume.</p>"
         },
         "DryRun":{
@@ -14571,8 +16340,7 @@
           "documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>",
           "locationName":"dryRun"
         }
-      },
-      "documentation":"<p>Contains the parameters for DetachVolume.</p>"
+      }
     },
     "DetachVpnGatewayRequest":{
       "type":"structure",
@@ -14582,11 +16350,11 @@
       ],
       "members":{
         "VpcId":{
-          "shape":"String",
+          "shape":"VpcId",
           "documentation":"<p>The ID of the VPC.</p>"
         },
         "VpnGatewayId":{
-          "shape":"String",
+          "shape":"VpnGatewayId",
           "documentation":"<p>The ID of the virtual private gateway.</p>"
         },
         "DryRun":{
@@ -14660,10 +16428,11 @@
       },
       "documentation":"<p>Describes a set of DHCP options.</p>"
     },
+    "DhcpOptionsId":{"type":"string"},
     "DhcpOptionsIdStringList":{
       "type":"list",
       "member":{
-        "shape":"String",
+        "shape":"DhcpOptionsId",
         "locationName":"DhcpOptionsId"
       }
     },
@@ -14700,7 +16469,7 @@
       "members":{
         "DryRun":{
           "shape":"Boolean",
-          "documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>. </p>"
+          "documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>"
         }
       }
     },
@@ -14714,6 +16483,174 @@
         }
       }
     },
+    "DisableFastSnapshotRestoreErrorItem":{
+      "type":"structure",
+      "members":{
+        "SnapshotId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the snapshot.</p>",
+          "locationName":"snapshotId"
+        },
+        "FastSnapshotRestoreStateErrors":{
+          "shape":"DisableFastSnapshotRestoreStateErrorSet",
+          "documentation":"<p>The errors.</p>",
+          "locationName":"fastSnapshotRestoreStateErrorSet"
+        }
+      },
+      "documentation":"<p>Contains information about the errors that occurred when disabling fast snapshot restores.</p>"
+    },
+    "DisableFastSnapshotRestoreErrorSet":{
+      "type":"list",
+      "member":{
+        "shape":"DisableFastSnapshotRestoreErrorItem",
+        "locationName":"item"
+      }
+    },
+    "DisableFastSnapshotRestoreStateError":{
+      "type":"structure",
+      "members":{
+        "Code":{
+          "shape":"String",
+          "documentation":"<p>The error code.</p>",
+          "locationName":"code"
+        },
+        "Message":{
+          "shape":"String",
+          "documentation":"<p>The error message.</p>",
+          "locationName":"message"
+        }
+      },
+      "documentation":"<p>Describes an error that occurred when disabling fast snapshot restores.</p>"
+    },
+    "DisableFastSnapshotRestoreStateErrorItem":{
+      "type":"structure",
+      "members":{
+        "AvailabilityZone":{
+          "shape":"String",
+          "documentation":"<p>The Availability Zone.</p>",
+          "locationName":"availabilityZone"
+        },
+        "Error":{
+          "shape":"DisableFastSnapshotRestoreStateError",
+          "documentation":"<p>The error.</p>",
+          "locationName":"error"
+        }
+      },
+      "documentation":"<p>Contains information about an error that occurred when disabling fast snapshot restores.</p>"
+    },
+    "DisableFastSnapshotRestoreStateErrorSet":{
+      "type":"list",
+      "member":{
+        "shape":"DisableFastSnapshotRestoreStateErrorItem",
+        "locationName":"item"
+      }
+    },
+    "DisableFastSnapshotRestoreSuccessItem":{
+      "type":"structure",
+      "members":{
+        "SnapshotId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the snapshot.</p>",
+          "locationName":"snapshotId"
+        },
+        "AvailabilityZone":{
+          "shape":"String",
+          "documentation":"<p>The Availability Zone.</p>",
+          "locationName":"availabilityZone"
+        },
+        "State":{
+          "shape":"FastSnapshotRestoreStateCode",
+          "documentation":"<p>The state of fast snapshot restores for the snapshot.</p>",
+          "locationName":"state"
+        },
+        "StateTransitionReason":{
+          "shape":"String",
+          "documentation":"<p>The reason for the state transition. The possible values are as follows:</p> <ul> <li> <p> <code>Client.UserInitiated</code> - The state successfully transitioned to <code>enabling</code> or <code>disabling</code>.</p> </li> <li> <p> <code>Client.UserInitiated - Lifecycle state transition</code> - The state successfully transitioned to <code>optimizing</code>, <code>enabled</code>, or <code>disabled</code>.</p> </li> </ul>",
+          "locationName":"stateTransitionReason"
+        },
+        "OwnerId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the AWS account that owns the snapshot.</p>",
+          "locationName":"ownerId"
+        },
+        "OwnerAlias":{
+          "shape":"String",
+          "documentation":"<p>The alias of the snapshot owner.</p>",
+          "locationName":"ownerAlias"
+        },
+        "EnablingTime":{
+          "shape":"MillisecondDateTime",
+          "documentation":"<p>The time at which fast snapshot restores entered the <code>enabling</code> state.</p>",
+          "locationName":"enablingTime"
+        },
+        "OptimizingTime":{
+          "shape":"MillisecondDateTime",
+          "documentation":"<p>The time at which fast snapshot restores entered the <code>optimizing</code> state.</p>",
+          "locationName":"optimizingTime"
+        },
+        "EnabledTime":{
+          "shape":"MillisecondDateTime",
+          "documentation":"<p>The time at which fast snapshot restores entered the <code>enabled</code> state.</p>",
+          "locationName":"enabledTime"
+        },
+        "DisablingTime":{
+          "shape":"MillisecondDateTime",
+          "documentation":"<p>The time at which fast snapshot restores entered the <code>disabling</code> state.</p>",
+          "locationName":"disablingTime"
+        },
+        "DisabledTime":{
+          "shape":"MillisecondDateTime",
+          "documentation":"<p>The time at which fast snapshot restores entered the <code>disabled</code> state.</p>",
+          "locationName":"disabledTime"
+        }
+      },
+      "documentation":"<p>Describes fast snapshot restores that were successfully disabled.</p>"
+    },
+    "DisableFastSnapshotRestoreSuccessSet":{
+      "type":"list",
+      "member":{
+        "shape":"DisableFastSnapshotRestoreSuccessItem",
+        "locationName":"item"
+      }
+    },
+    "DisableFastSnapshotRestoresRequest":{
+      "type":"structure",
+      "required":[
+        "AvailabilityZones",
+        "SourceSnapshotIds"
+      ],
+      "members":{
+        "AvailabilityZones":{
+          "shape":"AvailabilityZoneStringList",
+          "documentation":"<p>One or more Availability Zones. For example, <code>us-east-2a</code>.</p>",
+          "locationName":"AvailabilityZone"
+        },
+        "SourceSnapshotIds":{
+          "shape":"SnapshotIdStringList",
+          "documentation":"<p>The IDs of one or more snapshots. For example, <code>snap-1234567890abcdef0</code>.</p>",
+          "locationName":"SourceSnapshotId"
+        },
+        "DryRun":{
+          "shape":"Boolean",
+          "documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>"
+        }
+      }
+    },
+    "DisableFastSnapshotRestoresResult":{
+      "type":"structure",
+      "members":{
+        "Successful":{
+          "shape":"DisableFastSnapshotRestoreSuccessSet",
+          "documentation":"<p>Information about the snapshots for which fast snapshot restores were successfully disabled.</p>",
+          "locationName":"successful"
+        },
+        "Unsuccessful":{
+          "shape":"DisableFastSnapshotRestoreErrorSet",
+          "documentation":"<p>Information about the snapshots for which fast snapshot restores could not be disabled.</p>",
+          "locationName":"unsuccessful"
+        }
+      }
+    },
     "DisableTransitGatewayRouteTablePropagationRequest":{
       "type":"structure",
       "required":[
@@ -14722,11 +16659,11 @@
       ],
       "members":{
         "TransitGatewayRouteTableId":{
-          "shape":"String",
+          "shape":"TransitGatewayRouteTableId",
           "documentation":"<p>The ID of the propagation route table.</p>"
         },
         "TransitGatewayAttachmentId":{
-          "shape":"String",
+          "shape":"TransitGatewayAttachmentId",
           "documentation":"<p>The ID of the attachment.</p>"
         },
         "DryRun":{
@@ -14753,12 +16690,16 @@
       ],
       "members":{
         "GatewayId":{
-          "shape":"String",
+          "shape":"VpnGatewayId",
           "documentation":"<p>The ID of the virtual private gateway.</p>"
         },
         "RouteTableId":{
-          "shape":"String",
+          "shape":"RouteTableId",
           "documentation":"<p>The ID of the route table.</p>"
+        },
+        "DryRun":{
+          "shape":"Boolean",
+          "documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>"
         }
       },
       "documentation":"<p>Contains the parameters for DisableVgwRoutePropagation.</p>"
@@ -14767,7 +16708,7 @@
       "type":"structure",
       "members":{
         "VpcId":{
-          "shape":"String",
+          "shape":"VpcId",
           "documentation":"<p>The ID of the VPC.</p>"
         }
       }
@@ -14792,7 +16733,7 @@
           "locationName":"dryRun"
         },
         "VpcId":{
-          "shape":"String",
+          "shape":"VpcId",
           "documentation":"<p>The ID of the VPC.</p>",
           "locationName":"vpcId"
         }
@@ -14812,7 +16753,7 @@
       "type":"structure",
       "members":{
         "AssociationId":{
-          "shape":"String",
+          "shape":"ElasticIpAssociationId",
           "documentation":"<p>[EC2-VPC] The association ID. Required for EC2-VPC.</p>"
         },
         "PublicIp":{
@@ -14834,11 +16775,11 @@
       ],
       "members":{
         "ClientVpnEndpointId":{
-          "shape":"String",
+          "shape":"ClientVpnEndpointId",
           "documentation":"<p>The ID of the Client VPN endpoint from which to disassociate the target network.</p>"
         },
         "AssociationId":{
-          "shape":"String",
+          "shape":"ClientVpnAssociationId",
           "documentation":"<p>The ID of the target network association.</p>"
         },
         "DryRun":{
@@ -14867,7 +16808,7 @@
       "required":["AssociationId"],
       "members":{
         "AssociationId":{
-          "shape":"String",
+          "shape":"IamInstanceProfileAssociationId",
           "documentation":"<p>The ID of the IAM instance profile association.</p>"
         }
       }
@@ -14887,7 +16828,7 @@
       "required":["AssociationId"],
       "members":{
         "AssociationId":{
-          "shape":"String",
+          "shape":"RouteTableAssociationId",
           "documentation":"<p>The association ID representing the current association between the route table and subnet.</p>",
           "locationName":"associationId"
         },
@@ -14903,7 +16844,7 @@
       "required":["AssociationId"],
       "members":{
         "AssociationId":{
-          "shape":"String",
+          "shape":"SubnetCidrAssociationId",
           "documentation":"<p>The association ID for the CIDR block.</p>",
           "locationName":"associationId"
         }
@@ -14924,6 +16865,37 @@
         }
       }
     },
+    "DisassociateTransitGatewayMulticastDomainRequest":{
+      "type":"structure",
+      "members":{
+        "TransitGatewayMulticastDomainId":{
+          "shape":"TransitGatewayMulticastDomainId",
+          "documentation":"<p>The ID of the transit gateway multicast domain.</p>"
+        },
+        "TransitGatewayAttachmentId":{
+          "shape":"TransitGatewayAttachmentId",
+          "documentation":"<p>The ID of the attachment.</p>"
+        },
+        "SubnetIds":{
+          "shape":"ValueStringList",
+          "documentation":"<p>The IDs of the subnets;</p>"
+        },
+        "DryRun":{
+          "shape":"Boolean",
+          "documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>"
+        }
+      }
+    },
+    "DisassociateTransitGatewayMulticastDomainResult":{
+      "type":"structure",
+      "members":{
+        "Associations":{
+          "shape":"TransitGatewayMulticastDomainAssociations",
+          "documentation":"<p>Information about the association.</p>",
+          "locationName":"associations"
+        }
+      }
+    },
     "DisassociateTransitGatewayRouteTableRequest":{
       "type":"structure",
       "required":[
@@ -14932,11 +16904,11 @@
       ],
       "members":{
         "TransitGatewayRouteTableId":{
-          "shape":"String",
+          "shape":"TransitGatewayRouteTableId",
           "documentation":"<p>The ID of the transit gateway route table.</p>"
         },
         "TransitGatewayAttachmentId":{
-          "shape":"String",
+          "shape":"TransitGatewayAttachmentId",
           "documentation":"<p>The ID of the attachment.</p>"
         },
         "DryRun":{
@@ -14960,7 +16932,7 @@
       "required":["AssociationId"],
       "members":{
         "AssociationId":{
-          "shape":"String",
+          "shape":"VpcCidrAssociationId",
           "documentation":"<p>The association ID for the CIDR block.</p>",
           "locationName":"associationId"
         }
@@ -14986,6 +16958,7 @@
         }
       }
     },
+    "DiskCount":{"type":"integer"},
     "DiskImage":{
       "type":"structure",
       "members":{
@@ -15084,6 +17057,42 @@
       },
       "documentation":"<p>Describes a disk image volume.</p>"
     },
+    "DiskInfo":{
+      "type":"structure",
+      "members":{
+        "SizeInGB":{
+          "shape":"DiskSize",
+          "documentation":"<p>The size of the disk in GB.</p>",
+          "locationName":"sizeInGB"
+        },
+        "Count":{
+          "shape":"DiskCount",
+          "documentation":"<p>The number of disks with this configuration.</p>",
+          "locationName":"count"
+        },
+        "Type":{
+          "shape":"DiskType",
+          "documentation":"<p>The type of disk.</p>",
+          "locationName":"type"
+        }
+      },
+      "documentation":"<p>Describes the disk.</p>"
+    },
+    "DiskInfoList":{
+      "type":"list",
+      "member":{
+        "shape":"DiskInfo",
+        "locationName":"item"
+      }
+    },
+    "DiskSize":{"type":"long"},
+    "DiskType":{
+      "type":"string",
+      "enum":[
+        "hdd",
+        "ssd"
+      ]
+    },
     "DnsEntry":{
       "type":"structure",
       "members":{
@@ -15107,6 +17116,14 @@
         "locationName":"item"
       }
     },
+    "DnsNameState":{
+      "type":"string",
+      "enum":[
+        "pendingVerification",
+        "verified",
+        "failed"
+      ]
+    },
     "DnsServersOptionsModifyStructure":{
       "type":"structure",
       "members":{
@@ -15161,21 +17178,44 @@
         },
         "VolumeType":{
           "shape":"VolumeType",
-          "documentation":"<p>The volume type. If you set the type to <code>io1</code>, you must also specify the IOPS that the volume supports.</p> <p>Default: <code>gp2</code> </p>",
+          "documentation":"<p>The volume type. If you set the type to <code>io1</code>, you must also specify the <b>Iops</b> parameter. If you set the type to <code>gp2</code>, <code>st1</code>, <code>sc1</code>, or <code>standard</code>, you must omit the <b>Iops</b> parameter.</p> <p>Default: <code>gp2</code> </p>",
           "locationName":"volumeType"
         },
-        "Encrypted":{
-          "shape":"Boolean",
-          "documentation":"<p>Indicates whether the encryption state of an EBS volume is changed while being restored from a backing snapshot. The effect of setting the encryption state to <code>true</code> depends on the volume origin (new or from a snapshot), starting encryption state, ownership, and whether encryption by default is enabled. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSEncryption.html#encryption-parameters\">Amazon EBS Encryption</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>.</p> <p>In no case can you remove encryption from an encrypted volume.</p> <p>Encrypted volumes can only be attached to instances that support Amazon EBS encryption. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSEncryption.html#EBSEncryption_supported_instances\">Supported Instance Types</a>.</p>",
-          "locationName":"encrypted"
-        },
         "KmsKeyId":{
           "shape":"String",
           "documentation":"<p>Identifier (key ID, key alias, ID ARN, or alias ARN) for a customer managed CMK under which the EBS volume is encrypted.</p> <p>This parameter is only supported on <code>BlockDeviceMapping</code> objects called by <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_RunInstances.html\">RunInstances</a>, <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_RequestSpotFleet.html\">RequestSpotFleet</a>, and <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_RequestSpotInstances.html\">RequestSpotInstances</a>.</p>"
+        },
+        "Encrypted":{
+          "shape":"Boolean",
+          "documentation":"<p>Indicates whether the encryption state of an EBS volume is changed while being restored from a backing snapshot. The effect of setting the encryption state to <code>true</code> depends on the volume origin (new or from a snapshot), starting encryption state, ownership, and whether encryption by default is enabled. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSEncryption.html#encryption-parameters\">Amazon EBS Encryption</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>.</p> <p>In no case can you remove encryption from an encrypted volume.</p> <p>Encrypted volumes can only be attached to instances that support Amazon EBS encryption. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSEncryption.html#EBSEncryption_supported_instances\">Supported Instance Types</a>.</p> <p>This parameter is not returned by .</p>",
+          "locationName":"encrypted"
         }
       },
       "documentation":"<p>Describes a block device for an EBS volume.</p>"
     },
+    "EbsEncryptionSupport":{
+      "type":"string",
+      "enum":[
+        "unsupported",
+        "supported"
+      ]
+    },
+    "EbsInfo":{
+      "type":"structure",
+      "members":{
+        "EbsOptimizedSupport":{
+          "shape":"EbsOptimizedSupport",
+          "documentation":"<p>Indicates that the instance type is Amazon EBS-optimized. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSOptimized.html\">Amazon EBS-Optimized Instances</a> in <i>Amazon EC2 User Guide for Linux Instances</i>.</p>",
+          "locationName":"ebsOptimizedSupport"
+        },
+        "EncryptionSupport":{
+          "shape":"EbsEncryptionSupport",
+          "documentation":"<p>Indicates whether Amazon EBS encryption is supported.</p>",
+          "locationName":"encryptionSupport"
+        }
+      },
+      "documentation":"<p>Describes the Amazon EBS features supported by the instance type.</p>"
+    },
     "EbsInstanceBlockDevice":{
       "type":"structure",
       "members":{
@@ -15211,13 +17251,21 @@
           "locationName":"deleteOnTermination"
         },
         "VolumeId":{
-          "shape":"String",
+          "shape":"VolumeId",
           "documentation":"<p>The ID of the EBS volume.</p>",
           "locationName":"volumeId"
         }
       },
       "documentation":"<p>Describes information used to set up an EBS volume specified in a block device mapping.</p>"
     },
+    "EbsOptimizedSupport":{
+      "type":"string",
+      "enum":[
+        "unsupported",
+        "supported",
+        "default"
+      ]
+    },
     "EgressOnlyInternetGateway":{
       "type":"structure",
       "members":{
@@ -15230,6 +17278,11 @@
           "shape":"EgressOnlyInternetGatewayId",
           "documentation":"<p>The ID of the egress-only internet gateway.</p>",
           "locationName":"egressOnlyInternetGatewayId"
+        },
+        "Tags":{
+          "shape":"TagList",
+          "documentation":"<p>The tags assigned to the egress-only internet gateway.</p>",
+          "locationName":"tagSet"
         }
       },
       "documentation":"<p>Describes an egress-only internet gateway.</p>"
@@ -15293,10 +17346,11 @@
       },
       "documentation":"<p>Describes the status of an Elastic Graphics accelerator.</p>"
     },
+    "ElasticGpuId":{"type":"string"},
     "ElasticGpuIdSet":{
       "type":"list",
       "member":{
-        "shape":"String",
+        "shape":"ElasticGpuId",
         "locationName":"item"
       }
     },
@@ -15313,7 +17367,7 @@
       "members":{
         "Type":{
           "shape":"String",
-          "documentation":"<p>The type of Elastic Graphics accelerator.</p>"
+          "documentation":"<p>The type of Elastic Graphics accelerator. For more information about the values to specify for <code>Type</code>, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/WindowsGuide/elastic-graphics.html#elastic-graphics-basics\">Elastic Graphics Basics</a>, specifically the Elastic Graphics accelerator column, in the <i>Amazon Elastic Compute Cloud User Guide for Windows Instances</i>.</p>"
         }
       },
       "documentation":"<p>A specification for an Elastic Graphics accelerator.</p>"
@@ -15393,6 +17447,11 @@
           "shape":"String",
           "documentation":"<p>The ID of the instance to which the Elastic Graphics accelerator is attached.</p>",
           "locationName":"instanceId"
+        },
+        "Tags":{
+          "shape":"TagList",
+          "documentation":"<p>The tags assigned to the Elastic Graphics accelerator.</p>",
+          "locationName":"tagSet"
         }
       },
       "documentation":"<p>Describes an Elastic Graphics accelerator.</p>"
@@ -15403,7 +17462,11 @@
       "members":{
         "Type":{
           "shape":"String",
-          "documentation":"<p> The type of elastic inference accelerator. The possible values are <code>eia1.small</code>, <code>eia1.medium</code>, and <code>eia1.large</code>. </p>"
+          "documentation":"<p> The type of elastic inference accelerator. The possible values are <code>eia1.medium</code>, <code>eia1.large</code>, and <code>eia1.xlarge</code>. </p>"
+        },
+        "Count":{
+          "shape":"ElasticInferenceAcceleratorCount",
+          "documentation":"<p> The number of elastic inference accelerators to attach to the instance. </p> <p>Default: 1</p>"
         }
       },
       "documentation":"<p> Describes an elastic inference accelerator. </p>"
@@ -15441,6 +17504,10 @@
         "locationName":"item"
       }
     },
+    "ElasticInferenceAcceleratorCount":{
+      "type":"integer",
+      "min":1
+    },
     "ElasticInferenceAccelerators":{
       "type":"list",
       "member":{
@@ -15448,12 +17515,21 @@
         "locationName":"item"
       }
     },
+    "ElasticIpAssociationId":{"type":"string"},
+    "EnaSupport":{
+      "type":"string",
+      "enum":[
+        "unsupported",
+        "supported",
+        "required"
+      ]
+    },
     "EnableEbsEncryptionByDefaultRequest":{
       "type":"structure",
       "members":{
         "DryRun":{
           "shape":"Boolean",
-          "documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>. </p>"
+          "documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>"
         }
       }
     },
@@ -15467,6 +17543,174 @@
         }
       }
     },
+    "EnableFastSnapshotRestoreErrorItem":{
+      "type":"structure",
+      "members":{
+        "SnapshotId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the snapshot.</p>",
+          "locationName":"snapshotId"
+        },
+        "FastSnapshotRestoreStateErrors":{
+          "shape":"EnableFastSnapshotRestoreStateErrorSet",
+          "documentation":"<p>The errors.</p>",
+          "locationName":"fastSnapshotRestoreStateErrorSet"
+        }
+      },
+      "documentation":"<p>Contains information about the errors that occurred when enabling fast snapshot restores.</p>"
+    },
+    "EnableFastSnapshotRestoreErrorSet":{
+      "type":"list",
+      "member":{
+        "shape":"EnableFastSnapshotRestoreErrorItem",
+        "locationName":"item"
+      }
+    },
+    "EnableFastSnapshotRestoreStateError":{
+      "type":"structure",
+      "members":{
+        "Code":{
+          "shape":"String",
+          "documentation":"<p>The error code.</p>",
+          "locationName":"code"
+        },
+        "Message":{
+          "shape":"String",
+          "documentation":"<p>The error message.</p>",
+          "locationName":"message"
+        }
+      },
+      "documentation":"<p>Describes an error that occurred when enabling fast snapshot restores.</p>"
+    },
+    "EnableFastSnapshotRestoreStateErrorItem":{
+      "type":"structure",
+      "members":{
+        "AvailabilityZone":{
+          "shape":"String",
+          "documentation":"<p>The Availability Zone.</p>",
+          "locationName":"availabilityZone"
+        },
+        "Error":{
+          "shape":"EnableFastSnapshotRestoreStateError",
+          "documentation":"<p>The error.</p>",
+          "locationName":"error"
+        }
+      },
+      "documentation":"<p>Contains information about an error that occurred when enabling fast snapshot restores.</p>"
+    },
+    "EnableFastSnapshotRestoreStateErrorSet":{
+      "type":"list",
+      "member":{
+        "shape":"EnableFastSnapshotRestoreStateErrorItem",
+        "locationName":"item"
+      }
+    },
+    "EnableFastSnapshotRestoreSuccessItem":{
+      "type":"structure",
+      "members":{
+        "SnapshotId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the snapshot.</p>",
+          "locationName":"snapshotId"
+        },
+        "AvailabilityZone":{
+          "shape":"String",
+          "documentation":"<p>The Availability Zone.</p>",
+          "locationName":"availabilityZone"
+        },
+        "State":{
+          "shape":"FastSnapshotRestoreStateCode",
+          "documentation":"<p>The state of fast snapshot restores.</p>",
+          "locationName":"state"
+        },
+        "StateTransitionReason":{
+          "shape":"String",
+          "documentation":"<p>The reason for the state transition. The possible values are as follows:</p> <ul> <li> <p> <code>Client.UserInitiated</code> - The state successfully transitioned to <code>enabling</code> or <code>disabling</code>.</p> </li> <li> <p> <code>Client.UserInitiated - Lifecycle state transition</code> - The state successfully transitioned to <code>optimizing</code>, <code>enabled</code>, or <code>disabled</code>.</p> </li> </ul>",
+          "locationName":"stateTransitionReason"
+        },
+        "OwnerId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the AWS account that owns the snapshot.</p>",
+          "locationName":"ownerId"
+        },
+        "OwnerAlias":{
+          "shape":"String",
+          "documentation":"<p>The alias of the snapshot owner.</p>",
+          "locationName":"ownerAlias"
+        },
+        "EnablingTime":{
+          "shape":"MillisecondDateTime",
+          "documentation":"<p>The time at which fast snapshot restores entered the <code>enabling</code> state.</p>",
+          "locationName":"enablingTime"
+        },
+        "OptimizingTime":{
+          "shape":"MillisecondDateTime",
+          "documentation":"<p>The time at which fast snapshot restores entered the <code>optimizing</code> state.</p>",
+          "locationName":"optimizingTime"
+        },
+        "EnabledTime":{
+          "shape":"MillisecondDateTime",
+          "documentation":"<p>The time at which fast snapshot restores entered the <code>enabled</code> state.</p>",
+          "locationName":"enabledTime"
+        },
+        "DisablingTime":{
+          "shape":"MillisecondDateTime",
+          "documentation":"<p>The time at which fast snapshot restores entered the <code>disabling</code> state.</p>",
+          "locationName":"disablingTime"
+        },
+        "DisabledTime":{
+          "shape":"MillisecondDateTime",
+          "documentation":"<p>The time at which fast snapshot restores entered the <code>disabled</code> state.</p>",
+          "locationName":"disabledTime"
+        }
+      },
+      "documentation":"<p>Describes fast snapshot restores that were successfully enabled.</p>"
+    },
+    "EnableFastSnapshotRestoreSuccessSet":{
+      "type":"list",
+      "member":{
+        "shape":"EnableFastSnapshotRestoreSuccessItem",
+        "locationName":"item"
+      }
+    },
+    "EnableFastSnapshotRestoresRequest":{
+      "type":"structure",
+      "required":[
+        "AvailabilityZones",
+        "SourceSnapshotIds"
+      ],
+      "members":{
+        "AvailabilityZones":{
+          "shape":"AvailabilityZoneStringList",
+          "documentation":"<p>One or more Availability Zones. For example, <code>us-east-2a</code>.</p>",
+          "locationName":"AvailabilityZone"
+        },
+        "SourceSnapshotIds":{
+          "shape":"SnapshotIdStringList",
+          "documentation":"<p>The IDs of one or more snapshots. For example, <code>snap-1234567890abcdef0</code>. You can specify a snapshot that was shared with you from another AWS account.</p>",
+          "locationName":"SourceSnapshotId"
+        },
+        "DryRun":{
+          "shape":"Boolean",
+          "documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>"
+        }
+      }
+    },
+    "EnableFastSnapshotRestoresResult":{
+      "type":"structure",
+      "members":{
+        "Successful":{
+          "shape":"EnableFastSnapshotRestoreSuccessSet",
+          "documentation":"<p>Information about the snapshots for which fast snapshot restores were successfully enabled.</p>",
+          "locationName":"successful"
+        },
+        "Unsuccessful":{
+          "shape":"EnableFastSnapshotRestoreErrorSet",
+          "documentation":"<p>Information about the snapshots for which fast snapshot restores could not be enabled.</p>",
+          "locationName":"unsuccessful"
+        }
+      }
+    },
     "EnableTransitGatewayRouteTablePropagationRequest":{
       "type":"structure",
       "required":[
@@ -15475,11 +17719,11 @@
       ],
       "members":{
         "TransitGatewayRouteTableId":{
-          "shape":"String",
+          "shape":"TransitGatewayRouteTableId",
           "documentation":"<p>The ID of the propagation route table.</p>"
         },
         "TransitGatewayAttachmentId":{
-          "shape":"String",
+          "shape":"TransitGatewayAttachmentId",
           "documentation":"<p>The ID of the attachment.</p>"
         },
         "DryRun":{
@@ -15506,12 +17750,16 @@
       ],
       "members":{
         "GatewayId":{
-          "shape":"String",
+          "shape":"VpnGatewayId",
           "documentation":"<p>The ID of the virtual private gateway that is attached to a VPC. The virtual private gateway must be attached to the same VPC that the routing tables are associated with. </p>"
         },
         "RouteTableId":{
-          "shape":"String",
+          "shape":"RouteTableId",
           "documentation":"<p>The ID of the route table. The routing table must be associated with the same VPC that the virtual private gateway is attached to. </p>"
+        },
+        "DryRun":{
+          "shape":"Boolean",
+          "documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>"
         }
       },
       "documentation":"<p>Contains the parameters for EnableVgwRoutePropagation.</p>"
@@ -15526,18 +17774,17 @@
           "locationName":"dryRun"
         },
         "VolumeId":{
-          "shape":"String",
+          "shape":"VolumeId",
           "documentation":"<p>The ID of the volume.</p>",
           "locationName":"volumeId"
         }
-      },
-      "documentation":"<p>Contains the parameters for EnableVolumeIO.</p>"
+      }
     },
     "EnableVpcClassicLinkDnsSupportRequest":{
       "type":"structure",
       "members":{
         "VpcId":{
-          "shape":"String",
+          "shape":"VpcId",
           "documentation":"<p>The ID of the VPC.</p>"
         }
       }
@@ -15562,7 +17809,7 @@
           "locationName":"dryRun"
         },
         "VpcId":{
-          "shape":"String",
+          "shape":"VpcId",
           "documentation":"<p>The ID of the VPC.</p>",
           "locationName":"vpcId"
         }
@@ -15651,7 +17898,7 @@
       "required":["ClientVpnEndpointId"],
       "members":{
         "ClientVpnEndpointId":{
-          "shape":"String",
+          "shape":"ClientVpnEndpointId",
           "documentation":"<p>The ID of the Client VPN endpoint.</p>"
         },
         "DryRun":{
@@ -15680,7 +17927,7 @@
       "required":["ClientVpnEndpointId"],
       "members":{
         "ClientVpnEndpointId":{
-          "shape":"String",
+          "shape":"ClientVpnEndpointId",
           "documentation":"<p>The ID of the Client VPN endpoint.</p>"
         },
         "DryRun":{
@@ -15733,7 +17980,7 @@
           "documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>"
         },
         "ImageId":{
-          "shape":"String",
+          "shape":"ImageId",
           "documentation":"<p>The ID of the image.</p>"
         },
         "S3ExportLocation":{
@@ -15837,10 +18084,11 @@
       },
       "documentation":"<p>Describes an export image task.</p>"
     },
+    "ExportImageTaskId":{"type":"string"},
     "ExportImageTaskIdList":{
       "type":"list",
       "member":{
-        "shape":"String",
+        "shape":"ExportImageTaskId",
         "locationName":"ExportImageTaskId"
       }
     },
@@ -15883,14 +18131,20 @@
           "shape":"String",
           "documentation":"<p>The status message related to the export task.</p>",
           "locationName":"statusMessage"
+        },
+        "Tags":{
+          "shape":"TagList",
+          "documentation":"<p>The tags for the export task.</p>",
+          "locationName":"tagSet"
         }
       },
       "documentation":"<p>Describes an instance export task.</p>"
     },
+    "ExportTaskId":{"type":"string"},
     "ExportTaskIdStringList":{
       "type":"list",
       "member":{
-        "shape":"String",
+        "shape":"ExportTaskId",
         "locationName":"ExportTaskId"
       }
     },
@@ -16001,7 +18255,7 @@
       ],
       "members":{
         "TransitGatewayRouteTableId":{
-          "shape":"String",
+          "shape":"TransitGatewayRouteTableId",
           "documentation":"<p>The ID of the route table.</p>"
         },
         "Filters":{
@@ -16029,6 +18283,7 @@
         }
       }
     },
+    "ExportVmTaskId":{"type":"string"},
     "FailedQueuedPurchaseDeletion":{
       "type":"structure",
       "members":{
@@ -16052,6 +18307,16 @@
         "locationName":"item"
       }
     },
+    "FastSnapshotRestoreStateCode":{
+      "type":"string",
+      "enum":[
+        "enabling",
+        "optimizing",
+        "enabled",
+        "disabling",
+        "disabled"
+      ]
+    },
     "Filter":{
       "type":"structure",
       "members":{
@@ -16083,6 +18348,10 @@
         "fulfilled"
       ]
     },
+    "FleetCapacityReservationUsageStrategy":{
+      "type":"string",
+      "enum":["use-capacity-reservations-first"]
+    },
     "FleetData":{
       "type":"structure",
       "members":{
@@ -16097,7 +18366,7 @@
           "locationName":"createTime"
         },
         "FleetId":{
-          "shape":"FleetIdentifier",
+          "shape":"FleetId",
           "documentation":"<p>The ID of the EC2 Fleet.</p>",
           "locationName":"fleetId"
         },
@@ -16108,7 +18377,7 @@
         },
         "ClientToken":{
           "shape":"String",
-          "documentation":"<p>Unique, case-sensitive identifier you provide to ensure the idempotency of the request. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/Run_Instance_Idempotency.html\">Ensuring Idempotency</a>.</p> <p>Constraints: Maximum 64 ASCII characters</p>",
+          "documentation":"<p>Unique, case-sensitive identifier that you provide to ensure the idempotency of the request. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/Run_Instance_Idempotency.html\">Ensuring Idempotency</a>.</p> <p>Constraints: Maximum 64 ASCII characters</p>",
           "locationName":"clientToken"
         },
         "ExcessCapacityTerminationPolicy":{
@@ -16143,7 +18412,7 @@
         },
         "Type":{
           "shape":"FleetType",
-          "documentation":"<p>The type of request. Indicates whether the EC2 Fleet only <code>requests</code> the target capacity, or also attempts to <code>maintain</code> it. If you request a certain target capacity, EC2 Fleet only places the required requests; it does not attempt to replenish instances if capacity is diminished, and does not submit requests in alternative capacity pools if capacity is unavailable. To maintain a certain target capacity, EC2 Fleet places the required requests to meet this target capacity. It also automatically replenishes any interrupted Spot Instances. Default: <code>maintain</code>.</p>",
+          "documentation":"<p>The type of request. Indicates whether the EC2 Fleet only <code>requests</code> the target capacity, or also attempts to <code>maintain</code> it. If you request a certain target capacity, EC2 Fleet only places the required requests; it does not attempt to replenish instances if capacity is diminished, and it does not submit requests in alternative capacity pools if capacity is unavailable. To maintain a certain target capacity, EC2 Fleet places the required requests to meet this target capacity. It also automatically replenishes any interrupted Spot Instances. Default: <code>maintain</code>.</p>",
           "locationName":"type"
         },
         "ValidFrom":{
@@ -16204,11 +18473,11 @@
         "termination"
       ]
     },
+    "FleetId":{"type":"string"},
     "FleetIdSet":{
       "type":"list",
-      "member":{"shape":"FleetIdentifier"}
+      "member":{"shape":"FleetId"}
     },
-    "FleetIdentifier":{"type":"string"},
     "FleetLaunchTemplateConfig":{
       "type":"structure",
       "members":{
@@ -16322,8 +18591,8 @@
           "documentation":"<p>The maximum price per unit hour that you are willing to pay for a Spot Instance.</p>"
         },
         "SubnetId":{
-          "shape":"String",
-          "documentation":"<p>The ID of the subnet in which to launch the instances.</p>"
+          "shape":"SubnetId",
+          "documentation":"<p>The IDs of the subnets in which to launch the instances. Separate multiple subnet IDs using commas (for example, <code>subnet-1234abcdeexample1, subnet-0987cdef6example2</code>). A request of type <code>instant</code> can have only one subnet ID.</p>"
         },
         "AvailabilityZone":{
           "shape":"String",
@@ -16369,7 +18638,7 @@
       "type":"structure",
       "members":{
         "LaunchTemplateId":{
-          "shape":"String",
+          "shape":"LaunchTemplateId",
           "documentation":"<p>The ID of the launch template.</p>"
         },
         "LaunchTemplateName":{
@@ -16422,7 +18691,7 @@
       "type":"structure",
       "members":{
         "CreationTime":{
-          "shape":"DateTime",
+          "shape":"MillisecondDateTime",
           "documentation":"<p>The date and time the flow log was created.</p>",
           "locationName":"creationTime"
         },
@@ -16480,10 +18749,35 @@
           "shape":"String",
           "documentation":"<p>The format of the flow log record.</p>",
           "locationName":"logFormat"
+        },
+        "Tags":{
+          "shape":"TagList",
+          "documentation":"<p>The tags for the flow log.</p>",
+          "locationName":"tagSet"
+        },
+        "MaxAggregationInterval":{
+          "shape":"Integer",
+          "documentation":"<p>The maximum interval of time, in seconds, during which a flow of packets is captured and aggregated into a flow log record.</p> <p>When a network interface is attached to a <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/instance-types.html#ec2-nitro-instances\">Nitro-based instance</a>, the aggregation interval is always 60 seconds (1 minute) or less, regardless of the specified value.</p> <p>Valid Values: <code>60</code> | <code>600</code> </p>",
+          "locationName":"maxAggregationInterval"
         }
       },
       "documentation":"<p>Describes a flow log.</p>"
     },
+    "FlowLogIdList":{
+      "type":"list",
+      "member":{
+        "shape":"VpcFlowLogId",
+        "locationName":"item"
+      }
+    },
+    "FlowLogResourceId":{"type":"string"},
+    "FlowLogResourceIds":{
+      "type":"list",
+      "member":{
+        "shape":"FlowLogResourceId",
+        "locationName":"item"
+      }
+    },
     "FlowLogSet":{
       "type":"list",
       "member":{
@@ -16499,6 +18793,54 @@
         "NetworkInterface"
       ]
     },
+    "FpgaDeviceCount":{"type":"integer"},
+    "FpgaDeviceInfo":{
+      "type":"structure",
+      "members":{
+        "Name":{
+          "shape":"FpgaDeviceName",
+          "documentation":"<p>The name of the FPGA accelerator.</p>",
+          "locationName":"name"
+        },
+        "Manufacturer":{
+          "shape":"FpgaDeviceManufacturerName",
+          "documentation":"<p>The manufacturer of the FPGA accelerator.</p>",
+          "locationName":"manufacturer"
+        },
+        "Count":{
+          "shape":"FpgaDeviceCount",
+          "documentation":"<p>The count of FPGA accelerators for the instance type.</p>",
+          "locationName":"count"
+        },
+        "MemoryInfo":{
+          "shape":"FpgaDeviceMemoryInfo",
+          "documentation":"<p>Describes the memory for the FPGA accelerator for the instance type.</p>",
+          "locationName":"memoryInfo"
+        }
+      },
+      "documentation":"<p>Describes the FPGA accelerator for the instance type.</p>"
+    },
+    "FpgaDeviceInfoList":{
+      "type":"list",
+      "member":{
+        "shape":"FpgaDeviceInfo",
+        "locationName":"item"
+      }
+    },
+    "FpgaDeviceManufacturerName":{"type":"string"},
+    "FpgaDeviceMemoryInfo":{
+      "type":"structure",
+      "members":{
+        "SizeInMiB":{
+          "shape":"FpgaDeviceMemorySize",
+          "documentation":"<p>The size (in MiB) for the memory available to the FPGA accelerator.</p>",
+          "locationName":"sizeInMiB"
+        }
+      },
+      "documentation":"<p>Describes the memory for the FPGA accelerator for the instance type.</p>"
+    },
+    "FpgaDeviceMemorySize":{"type":"integer"},
+    "FpgaDeviceName":{"type":"string"},
     "FpgaImage":{
       "type":"structure",
       "members":{
@@ -16620,10 +18962,11 @@
         "productCodes"
       ]
     },
+    "FpgaImageId":{"type":"string"},
     "FpgaImageIdList":{
       "type":"list",
       "member":{
-        "shape":"String",
+        "shape":"FpgaImageId",
         "locationName":"item"
       }
     },
@@ -16659,16 +19002,70 @@
         "unavailable"
       ]
     },
+    "FpgaInfo":{
+      "type":"structure",
+      "members":{
+        "Fpgas":{
+          "shape":"FpgaDeviceInfoList",
+          "documentation":"<p>Describes the FPGAs for the instance type.</p>",
+          "locationName":"fpgas"
+        },
+        "TotalFpgaMemoryInMiB":{
+          "shape":"totalFpgaMemory",
+          "documentation":"<p>The total memory of all FPGA accelerators for the instance type.</p>",
+          "locationName":"totalFpgaMemoryInMiB"
+        }
+      },
+      "documentation":"<p>Describes the FPGAs for the instance type.</p>"
+    },
+    "FreeTierEligibleFlag":{"type":"boolean"},
     "GatewayType":{
       "type":"string",
       "enum":["ipsec.1"]
     },
+    "GetAssociatedIpv6PoolCidrsRequest":{
+      "type":"structure",
+      "required":["PoolId"],
+      "members":{
+        "PoolId":{
+          "shape":"Ipv6PoolEc2Id",
+          "documentation":"<p>The ID of the IPv6 address pool.</p>"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>The token for the next page of results.</p>"
+        },
+        "MaxResults":{
+          "shape":"Ipv6PoolMaxResults",
+          "documentation":"<p>The maximum number of results to return with a single call. To retrieve the remaining results, make another call with the returned <code>nextToken</code> value.</p>"
+        },
+        "DryRun":{
+          "shape":"Boolean",
+          "documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>"
+        }
+      }
+    },
+    "GetAssociatedIpv6PoolCidrsResult":{
+      "type":"structure",
+      "members":{
+        "Ipv6CidrAssociations":{
+          "shape":"Ipv6CidrAssociationSet",
+          "documentation":"<p>Information about the IPv6 CIDR block associations.</p>",
+          "locationName":"ipv6CidrAssociationSet"
+        },
+        "NextToken":{
+          "shape":"String",
+          "documentation":"<p>The token to use to retrieve the next page of results. This value is <code>null</code> when there are no more results to return.</p>",
+          "locationName":"nextToken"
+        }
+      }
+    },
     "GetCapacityReservationUsageRequest":{
       "type":"structure",
       "required":["CapacityReservationId"],
       "members":{
         "CapacityReservationId":{
-          "shape":"String",
+          "shape":"CapacityReservationId",
           "documentation":"<p>The ID of the Capacity Reservation.</p>"
         },
         "NextToken":{
@@ -16730,12 +19127,59 @@
         }
       }
     },
+    "GetCoipPoolUsageRequest":{
+      "type":"structure",
+      "required":["PoolId"],
+      "members":{
+        "PoolId":{
+          "shape":"CoipPoolId",
+          "documentation":"<p>The ID of the address pool.</p>"
+        },
+        "Filters":{
+          "shape":"FilterList",
+          "documentation":"<p>The filters. The following are the possible values:</p> <ul> <li> <p> <code>coip-address-usage.allocation-id</code> </p> </li> </ul> <ul> <li> <p> <code>coip-address-usage.aws-account-id</code> </p> </li> </ul> <ul> <li> <p> <code>coip-address-usage.aws-service</code> </p> </li> </ul> <ul> <li> <p> <code>coip-address-usage.co-ip</code> </p> </li> </ul>",
+          "locationName":"Filter"
+        },
+        "MaxResults":{
+          "shape":"CoipPoolMaxResults",
+          "documentation":"<p>The maximum number of results to return with a single call. To retrieve the remaining results, make another call with the returned <code>nextToken</code> value.</p>"
+        },
+        "NextToken":{
+          "shape":"String",
+          "documentation":"<p>The token for the next page of results.</p>"
+        },
+        "DryRun":{
+          "shape":"Boolean",
+          "documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>"
+        }
+      }
+    },
+    "GetCoipPoolUsageResult":{
+      "type":"structure",
+      "members":{
+        "CoipPoolId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the customer-owned address pool.</p>",
+          "locationName":"coipPoolId"
+        },
+        "CoipAddressUsages":{
+          "shape":"CoipAddressUsageSet",
+          "documentation":"<p>Information about the address usage.</p>",
+          "locationName":"coipAddressUsageSet"
+        },
+        "LocalGatewayRouteTableId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the local gateway route table.</p>",
+          "locationName":"localGatewayRouteTableId"
+        }
+      }
+    },
     "GetConsoleOutputRequest":{
       "type":"structure",
       "required":["InstanceId"],
       "members":{
         "InstanceId":{
-          "shape":"String",
+          "shape":"InstanceId",
           "documentation":"<p>The ID of the instance.</p>"
         },
         "DryRun":{
@@ -16778,7 +19222,7 @@
           "documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>"
         },
         "InstanceId":{
-          "shape":"String",
+          "shape":"InstanceId",
           "documentation":"<p>The ID of the instance.</p>"
         },
         "WakeUp":{
@@ -16802,6 +19246,30 @@
         }
       }
     },
+    "GetDefaultCreditSpecificationRequest":{
+      "type":"structure",
+      "required":["InstanceFamily"],
+      "members":{
+        "DryRun":{
+          "shape":"Boolean",
+          "documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>"
+        },
+        "InstanceFamily":{
+          "shape":"UnlimitedSupportedInstanceFamily",
+          "documentation":"<p>The instance family.</p>"
+        }
+      }
+    },
+    "GetDefaultCreditSpecificationResult":{
+      "type":"structure",
+      "members":{
+        "InstanceFamilyCreditSpecification":{
+          "shape":"InstanceFamilyCreditSpecification",
+          "documentation":"<p>The default credit option for CPU usage of the instance family.</p>",
+          "locationName":"instanceFamilyCreditSpecification"
+        }
+      }
+    },
     "GetEbsDefaultKmsKeyIdRequest":{
       "type":"structure",
       "members":{
@@ -16852,7 +19320,7 @@
           "documentation":"<p>The IDs of the Dedicated Hosts with which the reservation is associated.</p>"
         },
         "OfferingId":{
-          "shape":"String",
+          "shape":"OfferingId",
           "documentation":"<p>The offering ID of the reservation.</p>"
         }
       }
@@ -16891,7 +19359,7 @@
           "documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>"
         },
         "InstanceId":{
-          "shape":"String",
+          "shape":"InstanceId",
           "documentation":"<p>The ID of the instance.</p>"
         }
       }
@@ -16911,7 +19379,7 @@
       "required":["InstanceId"],
       "members":{
         "InstanceId":{
-          "shape":"String",
+          "shape":"InstanceId",
           "documentation":"<p>The ID of the Windows instance.</p>"
         },
         "DryRun":{
@@ -17018,7 +19486,7 @@
       "required":["TransitGatewayAttachmentId"],
       "members":{
         "TransitGatewayAttachmentId":{
-          "shape":"String",
+          "shape":"TransitGatewayAttachmentId",
           "documentation":"<p>The ID of the attachment.</p>"
         },
         "Filters":{
@@ -17055,12 +19523,53 @@
         }
       }
     },
+    "GetTransitGatewayMulticastDomainAssociationsRequest":{
+      "type":"structure",
+      "members":{
+        "TransitGatewayMulticastDomainId":{
+          "shape":"TransitGatewayMulticastDomainId",
+          "documentation":"<p>The ID of the transit gateway multicast domain.</p>"
+        },
+        "Filters":{
+          "shape":"FilterList",
+          "documentation":"<p>One or more filters. The possible values are:</p> <ul> <li> <p> <code>resource-id</code> - The ID of the resource.</p> </li> <li> <p> <code>resource-type</code> - The type of resource. The valid value is: <code>vpc</code>.</p> </li> <li> <p> <code>state</code> - The state of the subnet association. Valid values are <code>associated</code> | <code>associating</code> | <code>disassociated</code> | <code>disassociating</code>.</p> </li> <li> <p> <code>subnet-id</code> - The ID of the subnet.</p> </li> <li> <p> <code>transit-gateway-attachment-id</code> - The id of the transit gateway attachment.</p> </li> </ul>",
+          "locationName":"Filter"
+        },
+        "MaxResults":{
+          "shape":"TransitGatewayMaxResults",
+          "documentation":"<p>The maximum number of results to return with a single call. To retrieve the remaining results, make another call with the returned <code>nextToken</code> value.</p>"
+        },
+        "NextToken":{
+          "shape":"String",
+          "documentation":"<p>The token for the next page of results.</p>"
+        },
+        "DryRun":{
+          "shape":"Boolean",
+          "documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>"
+        }
+      }
+    },
+    "GetTransitGatewayMulticastDomainAssociationsResult":{
+      "type":"structure",
+      "members":{
+        "MulticastDomainAssociations":{
+          "shape":"TransitGatewayMulticastDomainAssociationList",
+          "documentation":"<p>Information about the multicast domain associations.</p>",
+          "locationName":"multicastDomainAssociations"
+        },
+        "NextToken":{
+          "shape":"String",
+          "documentation":"<p>The token to use to retrieve the next page of results. This value is <code>null</code> when there are no more results to return.</p>",
+          "locationName":"nextToken"
+        }
+      }
+    },
     "GetTransitGatewayRouteTableAssociationsRequest":{
       "type":"structure",
       "required":["TransitGatewayRouteTableId"],
       "members":{
         "TransitGatewayRouteTableId":{
-          "shape":"String",
+          "shape":"TransitGatewayRouteTableId",
           "documentation":"<p>The ID of the transit gateway route table.</p>"
         },
         "Filters":{
@@ -17102,7 +19611,7 @@
       "required":["TransitGatewayRouteTableId"],
       "members":{
         "TransitGatewayRouteTableId":{
-          "shape":"String",
+          "shape":"TransitGatewayRouteTableId",
           "documentation":"<p>The ID of the transit gateway route table.</p>"
         },
         "Filters":{
@@ -17139,6 +19648,70 @@
         }
       }
     },
+    "GpuDeviceCount":{"type":"integer"},
+    "GpuDeviceInfo":{
+      "type":"structure",
+      "members":{
+        "Name":{
+          "shape":"GpuDeviceName",
+          "documentation":"<p>The name of the GPU accelerator.</p>",
+          "locationName":"name"
+        },
+        "Manufacturer":{
+          "shape":"GpuDeviceManufacturerName",
+          "documentation":"<p>The manufacturer of the GPU accelerator.</p>",
+          "locationName":"manufacturer"
+        },
+        "Count":{
+          "shape":"GpuDeviceCount",
+          "documentation":"<p>The number of GPUs for the instance type.</p>",
+          "locationName":"count"
+        },
+        "MemoryInfo":{
+          "shape":"GpuDeviceMemoryInfo",
+          "documentation":"<p>Describes the memory available to the GPU accelerator.</p>",
+          "locationName":"memoryInfo"
+        }
+      },
+      "documentation":"<p>Describes the GPU accelerators for the instance type.</p>"
+    },
+    "GpuDeviceInfoList":{
+      "type":"list",
+      "member":{
+        "shape":"GpuDeviceInfo",
+        "locationName":"item"
+      }
+    },
+    "GpuDeviceManufacturerName":{"type":"string"},
+    "GpuDeviceMemoryInfo":{
+      "type":"structure",
+      "members":{
+        "SizeInMiB":{
+          "shape":"GpuDeviceMemorySize",
+          "documentation":"<p>The size (in MiB) for the memory available to the GPU accelerator.</p>",
+          "locationName":"sizeInMiB"
+        }
+      },
+      "documentation":"<p>Describes the memory available to the GPU accelerator.</p>"
+    },
+    "GpuDeviceMemorySize":{"type":"integer"},
+    "GpuDeviceName":{"type":"string"},
+    "GpuInfo":{
+      "type":"structure",
+      "members":{
+        "Gpus":{
+          "shape":"GpuDeviceInfoList",
+          "documentation":"<p>Describes the GPU accelerators for the instance type.</p>",
+          "locationName":"gpus"
+        },
+        "TotalGpuMemoryInMiB":{
+          "shape":"totalGpuMemory",
+          "documentation":"<p>The total size of the memory for the GPU accelerators for the instance type.</p>",
+          "locationName":"totalGpuMemoryInMiB"
+        }
+      },
+      "documentation":"<p>Describes the GPU accelerators for the instance type.</p>"
+    },
     "GroupIdStringList":{
       "type":"list",
       "member":{
@@ -17179,17 +19752,18 @@
     "GroupIds":{
       "type":"list",
       "member":{
-        "shape":"String",
+        "shape":"SecurityGroupId",
         "locationName":"item"
       }
     },
     "GroupNameStringList":{
       "type":"list",
       "member":{
-        "shape":"String",
+        "shape":"SecurityGroupName",
         "locationName":"GroupName"
       }
     },
+    "HibernationFlag":{"type":"boolean"},
     "HibernationOptions":{
       "type":"structure",
       "members":{
@@ -17199,7 +19773,7 @@
           "locationName":"configured"
         }
       },
-      "documentation":"<p>Indicates whether your instance is configured for hibernation. This parameter is valid only if the instance meets the <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Hibernate.html#hibernating-prerequisites\">hibernation prerequisites</a>. Hibernation is currently supported only for Amazon Linux. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Hibernate.html\">Hibernate Your Instance</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>.</p>"
+      "documentation":"<p>Indicates whether your instance is configured for hibernation. This parameter is valid only if the instance meets the <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Hibernate.html#hibernating-prerequisites\">hibernation prerequisites</a>. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Hibernate.html\">Hibernate Your Instance</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>.</p>"
     },
     "HibernationOptionsRequest":{
       "type":"structure",
@@ -17209,7 +19783,7 @@
           "documentation":"<p>If you set this parameter to <code>true</code>, your instance is enabled for hibernation.</p> <p>Default: <code>false</code> </p>"
         }
       },
-      "documentation":"<p>Indicates whether your instance is configured for hibernation. This parameter is valid only if the instance meets the <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Hibernate.html#hibernating-prerequisites\">hibernation prerequisites</a>. Hibernation is currently supported only for Amazon Linux. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Hibernate.html\">Hibernate Your Instance</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>.</p>"
+      "documentation":"<p>Indicates whether your instance is configured for hibernation. This parameter is valid only if the instance meets the <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Hibernate.html#hibernating-prerequisites\">hibernation prerequisites</a>. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Hibernate.html\">Hibernate Your Instance</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>.</p>"
     },
     "HistoryRecord":{
       "type":"structure",
@@ -17282,7 +19856,7 @@
         },
         "AvailableCapacity":{
           "shape":"AvailableCapacity",
-          "documentation":"<p>The number of new instances that can be launched onto the Dedicated Host.</p>",
+          "documentation":"<p>Information about the instances running on the Dedicated Host.</p>",
           "locationName":"availableCapacity"
         },
         "ClientToken":{
@@ -17334,6 +19908,26 @@
           "shape":"HostRecovery",
           "documentation":"<p>Indicates whether host recovery is enabled or disabled for the Dedicated Host.</p>",
           "locationName":"hostRecovery"
+        },
+        "AllowsMultipleInstanceTypes":{
+          "shape":"AllowsMultipleInstanceTypes",
+          "documentation":"<p>Indicates whether the Dedicated Host supports multiple instance types of the same instance family, or a specific instance type only. <code>one</code> indicates that the Dedicated Host supports multiple instance types in the instance family. <code>off</code> indicates that the Dedicated Host supports a single instance type only.</p>",
+          "locationName":"allowsMultipleInstanceTypes"
+        },
+        "OwnerId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the AWS account that owns the Dedicated Host.</p>",
+          "locationName":"ownerId"
+        },
+        "AvailabilityZoneId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the Availability Zone in which the Dedicated Host is allocated.</p>",
+          "locationName":"availabilityZoneId"
+        },
+        "MemberOfServiceLinkedResourceGroup":{
+          "shape":"Boolean",
+          "documentation":"<p>Indicates whether the Dedicated Host is in a host resource group. If <b>memberOfServiceLinkedResourceGroup</b> is <code>true</code>, the host is in a host resource group; otherwise, it is not.</p>",
+          "locationName":"memberOfServiceLinkedResourceGroup"
         }
       },
       "documentation":"<p>Describes the properties of the Dedicated Host.</p>"
@@ -17343,13 +19937,18 @@
       "members":{
         "InstanceId":{
           "shape":"String",
-          "documentation":"<p>the IDs of instances that are running on the Dedicated Host.</p>",
+          "documentation":"<p>The ID of instance that is running on the Dedicated Host.</p>",
           "locationName":"instanceId"
         },
         "InstanceType":{
           "shape":"String",
-          "documentation":"<p>The instance type size (for example, <code>m3.medium</code>) of the running instance.</p>",
+          "documentation":"<p>The instance type (for example, <code>m3.medium</code>) of the running instance.</p>",
           "locationName":"instanceType"
+        },
+        "OwnerId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the AWS account that owns the instance.</p>",
+          "locationName":"ownerId"
         }
       },
       "documentation":"<p>Describes an instance running on a Dedicated Host.</p>"
@@ -17426,9 +20025,14 @@
         },
         "InstanceType":{
           "shape":"String",
-          "documentation":"<p>The instance type size that the Dedicated Host supports (for example, <code>m3.medium</code>).</p>",
+          "documentation":"<p>The instance type supported by the Dedicated Host. For example, <code>m5.large</code>. If the host supports multiple instance types, no <b>instanceType</b> is returned.</p>",
           "locationName":"instanceType"
         },
+        "InstanceFamily":{
+          "shape":"String",
+          "documentation":"<p>The instance family supported by the Dedicated Host. For example, <code>m5</code>.</p>",
+          "locationName":"instanceFamily"
+        },
         "Sockets":{
           "shape":"Integer",
           "documentation":"<p>The number of sockets on the Dedicated Host.</p>",
@@ -17436,11 +20040,11 @@
         },
         "TotalVCpus":{
           "shape":"Integer",
-          "documentation":"<p>The number of vCPUs on the Dedicated Host.</p>",
+          "documentation":"<p>The total number of vCPUs on the Dedicated Host.</p>",
           "locationName":"totalVCpus"
         }
       },
-      "documentation":"<p>Describes properties of a Dedicated Host.</p>"
+      "documentation":"<p>Describes the properties of a Dedicated Host.</p>"
     },
     "HostRecovery":{
       "type":"string",
@@ -17525,10 +20129,11 @@
       },
       "documentation":"<p>Details about the Dedicated Host Reservation and associated Dedicated Hosts.</p>"
     },
+    "HostReservationId":{"type":"string"},
     "HostReservationIdSet":{
       "type":"list",
       "member":{
-        "shape":"String",
+        "shape":"HostReservationId",
         "locationName":"item"
       }
     },
@@ -17546,6 +20151,13 @@
         "host"
       ]
     },
+    "HttpTokensState":{
+      "type":"string",
+      "enum":[
+        "optional",
+        "required"
+      ]
+    },
     "HypervisorType":{
       "type":"string",
       "enum":[
@@ -17635,6 +20247,7 @@
       },
       "documentation":"<p>Describes an association between an IAM instance profile and an instance.</p>"
     },
+    "IamInstanceProfileAssociationId":{"type":"string"},
     "IamInstanceProfileAssociationSet":{
       "type":"list",
       "member":{
@@ -17759,6 +20372,16 @@
           "documentation":"<p>This value is set to <code>windows</code> for Windows AMIs; otherwise, it is blank.</p>",
           "locationName":"platform"
         },
+        "PlatformDetails":{
+          "shape":"String",
+          "documentation":"<p>The platform details associated with the billing code of the AMI. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ami-billing-info.html\">Obtaining Billing Information</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>.</p>",
+          "locationName":"platformDetails"
+        },
+        "UsageOperation":{
+          "shape":"String",
+          "documentation":"<p>The operation of the Amazon EC2 instance and the billing code that is associated with the AMI. <code>usageOperation</code> corresponds to the <a href=\"https://docs.aws.amazon.com/cur/latest/userguide/Lineitem-columns.html#Lineitem-details-O-Operation\">lineitem/Operation</a> column on your AWS Cost and Usage Report and in the <a href=\"https://docs.aws.amazon.com/awsaccountbilling/latest/aboutv2/price-changes.html\">AWS Price List API</a>. For the list of <code>UsageOperation</code> codes, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ami-billing-info.html#billing-info\">Platform Details and Usage Operation Billing Codes</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>.</p>",
+          "locationName":"usageOperation"
+        },
         "ProductCodes":{
           "shape":"ProductCodeList",
           "documentation":"<p>Any product codes associated with the AMI.</p>",
@@ -17911,7 +20534,7 @@
           "documentation":"<p>The format of the disk image being imported.</p> <p>Valid values: <code>VHD</code> | <code>VMDK</code> | <code>OVA</code> </p>"
         },
         "SnapshotId":{
-          "shape":"String",
+          "shape":"SnapshotId",
           "documentation":"<p>The ID of the EBS snapshot to be used for importing the snapshot.</p>"
         },
         "Url":{
@@ -17932,10 +20555,11 @@
         "locationName":"item"
       }
     },
+    "ImageId":{"type":"string"},
     "ImageIdStringList":{
       "type":"list",
       "member":{
-        "shape":"String",
+        "shape":"ImageId",
         "locationName":"ImageId"
       }
     },
@@ -17974,7 +20598,7 @@
       ],
       "members":{
         "ClientVpnEndpointId":{
-          "shape":"String",
+          "shape":"ClientVpnEndpointId",
           "documentation":"<p>The ID of the Client VPN endpoint to which the client certificate revocation list applies.</p>"
         },
         "CertificateRevocationList":{
@@ -17997,6 +20621,41 @@
         }
       }
     },
+    "ImportImageLicenseConfigurationRequest":{
+      "type":"structure",
+      "members":{
+        "LicenseConfigurationArn":{
+          "shape":"String",
+          "documentation":"<p>The ARN of a license configuration.</p>"
+        }
+      },
+      "documentation":"<p>The request information of license configurations.</p>"
+    },
+    "ImportImageLicenseConfigurationResponse":{
+      "type":"structure",
+      "members":{
+        "LicenseConfigurationArn":{
+          "shape":"String",
+          "documentation":"<p>The ARN of a license configuration.</p>",
+          "locationName":"licenseConfigurationArn"
+        }
+      },
+      "documentation":"<p> The response information for license configurations.</p>"
+    },
+    "ImportImageLicenseSpecificationListRequest":{
+      "type":"list",
+      "member":{
+        "shape":"ImportImageLicenseConfigurationRequest",
+        "locationName":"item"
+      }
+    },
+    "ImportImageLicenseSpecificationListResponse":{
+      "type":"list",
+      "member":{
+        "shape":"ImportImageLicenseConfigurationResponse",
+        "locationName":"item"
+      }
+    },
     "ImportImageRequest":{
       "type":"structure",
       "members":{
@@ -18034,8 +20693,8 @@
           "documentation":"<p>The target hypervisor platform.</p> <p>Valid values: <code>xen</code> </p>"
         },
         "KmsKeyId":{
-          "shape":"String",
-          "documentation":"<p>An identifier for the AWS Key Management Service (AWS KMS) customer master key (CMK) to use when creating the encrypted AMI. This parameter is only required if you want to use a non-default CMK; if this parameter is not specified, the default CMK for EBS is used. If a <code>KmsKeyId</code> is specified, the <code>Encrypted</code> flag must also be set. </p> <p>The CMK identifier may be provided in any of the following formats: </p> <ul> <li> <p>Key ID</p> </li> <li> <p>Key alias. The alias ARN contains the <code>arn:aws:kms</code> namespace, followed by the Region of the CMK, the AWS account ID of the CMK owner, the <code>alias</code> namespace, and then the CMK alias. For example, arn:aws:kms:<i>us-east-1</i>:<i>012345678910</i>:alias/<i>ExampleAlias</i>.</p> </li> <li> <p>ARN using key ID. The ID ARN contains the <code>arn:aws:kms</code> namespace, followed by the Region of the CMK, the AWS account ID of the CMK owner, the <code>key</code> namespace, and then the CMK ID. For example, arn:aws:kms:<i>us-east-1</i>:<i>012345678910</i>:key/<i>abcd1234-a123-456a-a12b-a123b4cd56ef</i>.</p> </li> <li> <p>ARN using key alias. The alias ARN contains the <code>arn:aws:kms</code> namespace, followed by the Region of the CMK, the AWS account ID of the CMK owner, the <code>alias</code> namespace, and then the CMK alias. For example, arn:aws:kms:<i>us-east-1</i>:<i>012345678910</i>:alias/<i>ExampleAlias</i>. </p> </li> </ul> <p>AWS parses <code>KmsKeyId</code> asynchronously, meaning that the action you call may appear to complete even though you provided an invalid identifier. This action will eventually report failure. </p> <p>The specified CMK must exist in the Region that the AMI is being copied to.</p>"
+          "shape":"KmsKeyId",
+          "documentation":"<p>An identifier for the symmetric AWS Key Management Service (AWS KMS) customer master key (CMK) to use when creating the encrypted AMI. This parameter is only required if you want to use a non-default CMK; if this parameter is not specified, the default CMK for EBS is used. If a <code>KmsKeyId</code> is specified, the <code>Encrypted</code> flag must also be set. </p> <p>The CMK identifier may be provided in any of the following formats: </p> <ul> <li> <p>Key ID</p> </li> <li> <p>Key alias. The alias ARN contains the <code>arn:aws:kms</code> namespace, followed by the Region of the CMK, the AWS account ID of the CMK owner, the <code>alias</code> namespace, and then the CMK alias. For example, arn:aws:kms:<i>us-east-1</i>:<i>012345678910</i>:alias/<i>ExampleAlias</i>.</p> </li> <li> <p>ARN using key ID. The ID ARN contains the <code>arn:aws:kms</code> namespace, followed by the Region of the CMK, the AWS account ID of the CMK owner, the <code>key</code> namespace, and then the CMK ID. For example, arn:aws:kms:<i>us-east-1</i>:<i>012345678910</i>:key/<i>abcd1234-a123-456a-a12b-a123b4cd56ef</i>.</p> </li> <li> <p>ARN using key alias. The alias ARN contains the <code>arn:aws:kms</code> namespace, followed by the Region of the CMK, the AWS account ID of the CMK owner, the <code>alias</code> namespace, and then the CMK alias. For example, arn:aws:kms:<i>us-east-1</i>:<i>012345678910</i>:alias/<i>ExampleAlias</i>. </p> </li> </ul> <p>AWS parses <code>KmsKeyId</code> asynchronously, meaning that the action you call may appear to complete even though you provided an invalid identifier. This action will eventually report failure. </p> <p>The specified CMK must exist in the Region that the AMI is being copied to.</p> <p>Amazon EBS does not support asymmetric CMKs.</p>"
         },
         "LicenseType":{
           "shape":"String",
@@ -18048,6 +20707,10 @@
         "RoleName":{
           "shape":"String",
           "documentation":"<p>The name of the role to use when not using the default role, 'vmimport'.</p>"
+        },
+        "LicenseSpecifications":{
+          "shape":"ImportImageLicenseSpecificationListRequest",
+          "documentation":"<p>The ARNs of the license configurations.</p>"
         }
       }
     },
@@ -18086,7 +20749,7 @@
         },
         "KmsKeyId":{
           "shape":"String",
-          "documentation":"<p>The identifier for the AWS Key Management Service (AWS KMS) customer master key (CMK) that was used to create the encrypted AMI.</p>",
+          "documentation":"<p>The identifier for the symmetric AWS Key Management Service (AWS KMS) customer master key (CMK) that was used to create the encrypted AMI.</p>",
           "locationName":"kmsKeyId"
         },
         "LicenseType":{
@@ -18118,6 +20781,11 @@
           "shape":"String",
           "documentation":"<p>A detailed status message of the import task.</p>",
           "locationName":"statusMessage"
+        },
+        "LicenseSpecifications":{
+          "shape":"ImportImageLicenseSpecificationListResponse",
+          "documentation":"<p>The ARNs of the license configurations.</p>",
+          "locationName":"licenseSpecifications"
         }
       }
     },
@@ -18188,10 +20856,21 @@
           "shape":"String",
           "documentation":"<p>A descriptive status message for the import image task.</p>",
           "locationName":"statusMessage"
+        },
+        "Tags":{
+          "shape":"TagList",
+          "documentation":"<p>The tags for the import image task.</p>",
+          "locationName":"tagSet"
+        },
+        "LicenseSpecifications":{
+          "shape":"ImportImageLicenseSpecificationListResponse",
+          "documentation":"<p>The ARNs of the license configurations that are associated with the import image task.</p>",
+          "locationName":"licenseSpecifications"
         }
       },
       "documentation":"<p>Describes an import image task.</p>"
     },
+    "ImportImageTaskId":{"type":"string"},
     "ImportImageTaskList":{
       "type":"list",
       "member":{
@@ -18248,7 +20927,7 @@
           "locationName":"privateIpAddress"
         },
         "SubnetId":{
-          "shape":"String",
+          "shape":"SubnetId",
           "documentation":"<p>[EC2-VPC] The ID of the subnet in which to launch the instance.</p>",
           "locationName":"subnetId"
         },
@@ -18442,8 +21121,8 @@
           "documentation":"<p>Specifies whether the destination snapshot of the imported image should be encrypted. The default CMK for EBS is used unless you specify a non-default AWS Key Management Service (AWS KMS) CMK using <code>KmsKeyId</code>. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSEncryption.html\">Amazon EBS Encryption</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>.</p>"
         },
         "KmsKeyId":{
-          "shape":"String",
-          "documentation":"<p>An identifier for the AWS Key Management Service (AWS KMS) customer master key (CMK) to use when creating the encrypted snapshot. This parameter is only required if you want to use a non-default CMK; if this parameter is not specified, the default CMK for EBS is used. If a <code>KmsKeyId</code> is specified, the <code>Encrypted</code> flag must also be set. </p> <p>The CMK identifier may be provided in any of the following formats: </p> <ul> <li> <p>Key ID</p> </li> <li> <p>Key alias. The alias ARN contains the <code>arn:aws:kms</code> namespace, followed by the Region of the CMK, the AWS account ID of the CMK owner, the <code>alias</code> namespace, and then the CMK alias. For example, arn:aws:kms:<i>us-east-1</i>:<i>012345678910</i>:alias/<i>ExampleAlias</i>.</p> </li> <li> <p>ARN using key ID. The ID ARN contains the <code>arn:aws:kms</code> namespace, followed by the Region of the CMK, the AWS account ID of the CMK owner, the <code>key</code> namespace, and then the CMK ID. For example, arn:aws:kms:<i>us-east-1</i>:<i>012345678910</i>:key/<i>abcd1234-a123-456a-a12b-a123b4cd56ef</i>.</p> </li> <li> <p>ARN using key alias. The alias ARN contains the <code>arn:aws:kms</code> namespace, followed by the Region of the CMK, the AWS account ID of the CMK owner, the <code>alias</code> namespace, and then the CMK alias. For example, arn:aws:kms:<i>us-east-1</i>:<i>012345678910</i>:alias/<i>ExampleAlias</i>. </p> </li> </ul> <p>AWS parses <code>KmsKeyId</code> asynchronously, meaning that the action you call may appear to complete even though you provided an invalid identifier. This action will eventually report failure. </p> <p>The specified CMK must exist in the Region that the snapshot is being copied to.</p>"
+          "shape":"KmsKeyId",
+          "documentation":"<p>An identifier for the symmetric AWS Key Management Service (AWS KMS) customer master key (CMK) to use when creating the encrypted snapshot. This parameter is only required if you want to use a non-default CMK; if this parameter is not specified, the default CMK for EBS is used. If a <code>KmsKeyId</code> is specified, the <code>Encrypted</code> flag must also be set. </p> <p>The CMK identifier may be provided in any of the following formats: </p> <ul> <li> <p>Key ID</p> </li> <li> <p>Key alias. The alias ARN contains the <code>arn:aws:kms</code> namespace, followed by the Region of the CMK, the AWS account ID of the CMK owner, the <code>alias</code> namespace, and then the CMK alias. For example, arn:aws:kms:<i>us-east-1</i>:<i>012345678910</i>:alias/<i>ExampleAlias</i>.</p> </li> <li> <p>ARN using key ID. The ID ARN contains the <code>arn:aws:kms</code> namespace, followed by the Region of the CMK, the AWS account ID of the CMK owner, the <code>key</code> namespace, and then the CMK ID. For example, arn:aws:kms:<i>us-east-1</i>:<i>012345678910</i>:key/<i>abcd1234-a123-456a-a12b-a123b4cd56ef</i>.</p> </li> <li> <p>ARN using key alias. The alias ARN contains the <code>arn:aws:kms</code> namespace, followed by the Region of the CMK, the AWS account ID of the CMK owner, the <code>alias</code> namespace, and then the CMK alias. For example, arn:aws:kms:<i>us-east-1</i>:<i>012345678910</i>:alias/<i>ExampleAlias</i>. </p> </li> </ul> <p>AWS parses <code>KmsKeyId</code> asynchronously, meaning that the action you call may appear to complete even though you provided an invalid identifier. This action will eventually report failure. </p> <p>The specified CMK must exist in the Region that the snapshot is being copied to.</p> <p>Amazon EBS does not support asymmetric CMKs.</p>"
         },
         "RoleName":{
           "shape":"String",
@@ -18488,10 +21167,23 @@
           "shape":"SnapshotTaskDetail",
           "documentation":"<p>Describes an import snapshot task.</p>",
           "locationName":"snapshotTaskDetail"
+        },
+        "Tags":{
+          "shape":"TagList",
+          "documentation":"<p>The tags for the import snapshot task.</p>",
+          "locationName":"tagSet"
         }
       },
       "documentation":"<p>Describes an import snapshot task.</p>"
     },
+    "ImportSnapshotTaskId":{"type":"string"},
+    "ImportSnapshotTaskIdList":{
+      "type":"list",
+      "member":{
+        "shape":"ImportSnapshotTaskId",
+        "locationName":"ImportTaskId"
+      }
+    },
     "ImportSnapshotTaskList":{
       "type":"list",
       "member":{
@@ -18499,10 +21191,11 @@
         "locationName":"item"
       }
     },
+    "ImportTaskId":{"type":"string"},
     "ImportTaskIdList":{
       "type":"list",
       "member":{
-        "shape":"String",
+        "shape":"ImportImageTaskId",
         "locationName":"ImportTaskId"
       }
     },
@@ -18582,6 +21275,46 @@
       },
       "documentation":"<p>Describes an import volume task.</p>"
     },
+    "InferenceAcceleratorInfo":{
+      "type":"structure",
+      "members":{
+        "Accelerators":{
+          "shape":"InferenceDeviceInfoList",
+          "documentation":"<p>Describes the Inference accelerators for the instance type.</p>",
+          "locationName":"accelerators"
+        }
+      },
+      "documentation":"<p>Describes the Inference accelerators for the instance type.</p>"
+    },
+    "InferenceDeviceCount":{"type":"integer"},
+    "InferenceDeviceInfo":{
+      "type":"structure",
+      "members":{
+        "Count":{
+          "shape":"InferenceDeviceCount",
+          "documentation":"<p>The number of Inference accelerators for the instance type.</p>",
+          "locationName":"count"
+        },
+        "Name":{
+          "shape":"InferenceDeviceName",
+          "documentation":"<p>The name of the Inference accelerator.</p>",
+          "locationName":"name"
+        },
+        "Manufacturer":{
+          "shape":"InferenceDeviceManufacturerName",
+          "documentation":"<p>The manufacturer of the Inference accelerator.</p>",
+          "locationName":"manufacturer"
+        }
+      },
+      "documentation":"<p>Describes the Inference accelerators for the instance type.</p>"
+    },
+    "InferenceDeviceInfoList":{
+      "type":"list",
+      "member":{"shape":"InferenceDeviceInfo"},
+      "locationName":"item"
+    },
+    "InferenceDeviceManufacturerName":{"type":"string"},
+    "InferenceDeviceName":{"type":"string"},
     "Instance":{
       "type":"structure",
       "members":{
@@ -18712,7 +21445,7 @@
         },
         "Hypervisor":{
           "shape":"HypervisorType",
-          "documentation":"<p>The hypervisor type of the instance.</p>",
+          "documentation":"<p>The hypervisor type of the instance. The value <code>xen</code> is used for both Xen and Nitro hypervisors.</p>",
           "locationName":"hypervisor"
         },
         "IamInstanceProfile":{
@@ -18732,7 +21465,7 @@
         },
         "ElasticInferenceAcceleratorAssociations":{
           "shape":"ElasticInferenceAcceleratorAssociationList",
-          "documentation":"<p> The elastic inference accelerator associated with the instance. </p>",
+          "documentation":"<p> The elastic inference accelerator associated with the instance.</p>",
           "locationName":"elasticInferenceAcceleratorAssociationSet"
         },
         "NetworkInterfaces":{
@@ -18740,6 +21473,11 @@
           "documentation":"<p>[EC2-VPC] The network interfaces for the instance.</p>",
           "locationName":"networkInterfaceSet"
         },
+        "OutpostArn":{
+          "shape":"String",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the Outpost.</p>",
+          "locationName":"outpostArn"
+        },
         "RootDeviceName":{
           "shape":"String",
           "documentation":"<p>The device name of the root device volume (for example, <code>/dev/sda1</code>).</p>",
@@ -18809,6 +21547,11 @@
           "shape":"LicenseList",
           "documentation":"<p>The license configurations.</p>",
           "locationName":"licenseSet"
+        },
+        "MetadataOptions":{
+          "shape":"InstanceMetadataOptionsResponse",
+          "documentation":"<p>The metadata options for the instance.</p>",
+          "locationName":"metadataOptions"
         }
       },
       "documentation":"<p>Describes an instance.</p>"
@@ -18974,21 +21717,21 @@
       "members":{
         "AvailableCapacity":{
           "shape":"Integer",
-          "documentation":"<p>The number of instances that can still be launched onto the Dedicated Host.</p>",
+          "documentation":"<p>The number of instances that can be launched onto the Dedicated Host based on the host's available capacity.</p>",
           "locationName":"availableCapacity"
         },
         "InstanceType":{
           "shape":"String",
-          "documentation":"<p>The instance type size supported by the Dedicated Host.</p>",
+          "documentation":"<p>The instance type supported by the Dedicated Host.</p>",
           "locationName":"instanceType"
         },
         "TotalCapacity":{
           "shape":"Integer",
-          "documentation":"<p>The total number of instances that can be launched onto the Dedicated Host.</p>",
+          "documentation":"<p>The total number of instances that can be launched onto the Dedicated Host if there are no instances running on it.</p>",
           "locationName":"totalCapacity"
         }
       },
-      "documentation":"<p>Information about the instance type that the Dedicated Host supports.</p>"
+      "documentation":"<p>Information about the number of instances that can be launched onto the Dedicated Host.</p>"
     },
     "InstanceCount":{
       "type":"structure",
@@ -19027,7 +21770,7 @@
           "locationName":"cpuCredits"
         }
       },
-      "documentation":"<p>Describes the credit option for CPU usage of a T2 or T3 instance. </p>"
+      "documentation":"<p>Describes the credit option for CPU usage of a burstable performance instance. </p>"
     },
     "InstanceCreditSpecificationList":{
       "type":"list",
@@ -19047,7 +21790,7 @@
       "type":"structure",
       "members":{
         "InstanceId":{
-          "shape":"String",
+          "shape":"InstanceId",
           "documentation":"<p>The ID of the instance.</p>"
         },
         "CpuCredits":{
@@ -19055,7 +21798,7 @@
           "documentation":"<p>The credit option for CPU usage of the instance. Valid values are <code>standard</code> and <code>unlimited</code>.</p>"
         }
       },
-      "documentation":"<p>Describes the credit option for CPU usage of a T2 or T3 instance.</p>"
+      "documentation":"<p>Describes the credit option for CPU usage of a burstable performance instance.</p>"
     },
     "InstanceEventId":{"type":"string"},
     "InstanceExportDetails":{
@@ -19074,6 +21817,22 @@
       },
       "documentation":"<p>Describes an instance to export.</p>"
     },
+    "InstanceFamilyCreditSpecification":{
+      "type":"structure",
+      "members":{
+        "InstanceFamily":{
+          "shape":"UnlimitedSupportedInstanceFamily",
+          "documentation":"<p>The instance family.</p>",
+          "locationName":"instanceFamily"
+        },
+        "CpuCredits":{
+          "shape":"String",
+          "documentation":"<p>The default credit option for CPU usage of the instance family. Valid values are <code>standard</code> and <code>unlimited</code>.</p>",
+          "locationName":"cpuCredits"
+        }
+      },
+      "documentation":"<p>Describes the default credit option for CPU usage of a burstable performance instance family.</p>"
+    },
     "InstanceHealthStatus":{
       "type":"string",
       "enum":[
@@ -19092,7 +21851,7 @@
     "InstanceIdStringList":{
       "type":"list",
       "member":{
-        "shape":"String",
+        "shape":"InstanceId",
         "locationName":"InstanceId"
       }
     },
@@ -19188,6 +21947,64 @@
         "targeted"
       ]
     },
+    "InstanceMetadataEndpointState":{
+      "type":"string",
+      "enum":[
+        "disabled",
+        "enabled"
+      ]
+    },
+    "InstanceMetadataOptionsRequest":{
+      "type":"structure",
+      "members":{
+        "HttpTokens":{
+          "shape":"HttpTokensState",
+          "documentation":"<p>The state of token usage for your instance metadata requests. If the parameter is not specified in the request, the default state is <code>optional</code>.</p> <p>If the state is <code>optional</code>, you can choose to retrieve instance metadata with or without a signed token header on your request. If you retrieve the IAM role credentials without a token, the version 1.0 role credentials are returned. If you retrieve the IAM role credentials using a valid signed token, the version 2.0 role credentials are returned.</p> <p>If the state is <code>required</code>, you must send a signed token header with any instance metadata retrieval requests. In this state, retrieving the IAM role credentials always returns the version 2.0 credentials; the version 1.0 credentials are not available.</p>"
+        },
+        "HttpPutResponseHopLimit":{
+          "shape":"Integer",
+          "documentation":"<p>The desired HTTP PUT response hop limit for instance metadata requests. The larger the number, the further instance metadata requests can travel.</p> <p>Default: 1</p> <p>Possible values: Integers from 1 to 64</p>"
+        },
+        "HttpEndpoint":{
+          "shape":"InstanceMetadataEndpointState",
+          "documentation":"<p>This parameter enables or disables the HTTP metadata endpoint on your instances. If the parameter is not specified, the default state is <code>enabled</code>.</p> <note> <p>If you specify a value of <code>disabled</code>, you will not be able to access your instance metadata.</p> </note>"
+        }
+      },
+      "documentation":"<p>The metadata options for the instance.</p>"
+    },
+    "InstanceMetadataOptionsResponse":{
+      "type":"structure",
+      "members":{
+        "State":{
+          "shape":"InstanceMetadataOptionsState",
+          "documentation":"<p>The state of the metadata option changes.</p> <p> <code>pending</code> - The metadata options are being updated and the instance is not ready to process metadata traffic with the new selection.</p> <p> <code>applied</code> - The metadata options have been successfully applied on the instance.</p>",
+          "locationName":"state"
+        },
+        "HttpTokens":{
+          "shape":"HttpTokensState",
+          "documentation":"<p>The state of token usage for your instance metadata requests. If the parameter is not specified in the request, the default state is <code>optional</code>.</p> <p>If the state is <code>optional</code>, you can choose to retrieve instance metadata with or without a signed token header on your request. If you retrieve the IAM role credentials without a token, the version 1.0 role credentials are returned. If you retrieve the IAM role credentials using a valid signed token, the version 2.0 role credentials are returned.</p> <p>If the state is <code>required</code>, you must send a signed token header with any instance metadata retrieval requests. In this state, retrieving the IAM role credential always returns the version 2.0 credentials; the version 1.0 credentials are not available.</p>",
+          "locationName":"httpTokens"
+        },
+        "HttpPutResponseHopLimit":{
+          "shape":"Integer",
+          "documentation":"<p>The desired HTTP PUT response hop limit for instance metadata requests. The larger the number, the further instance metadata requests can travel.</p> <p>Default: 1</p> <p>Possible values: Integers from 1 to 64</p>",
+          "locationName":"httpPutResponseHopLimit"
+        },
+        "HttpEndpoint":{
+          "shape":"InstanceMetadataEndpointState",
+          "documentation":"<p>This parameter enables or disables the HTTP metadata endpoint on your instances. If the parameter is not specified, the default state is <code>enabled</code>.</p> <note> <p>If you specify a value of <code>disabled</code>, you will not be able to access your instance metadata.</p> </note>",
+          "locationName":"httpEndpoint"
+        }
+      },
+      "documentation":"<p>The metadata options for the instance.</p>"
+    },
+    "InstanceMetadataOptionsState":{
+      "type":"string",
+      "enum":[
+        "pending",
+        "applied"
+      ]
+    },
     "InstanceMonitoring":{
       "type":"structure",
       "members":{
@@ -19397,7 +22214,7 @@
         },
         "NetworkInterfaceId":{
           "shape":"String",
-          "documentation":"<p>The ID of the network interface.</p>",
+          "documentation":"<p>The ID of the network interface.</p> <p>If you are creating a Spot Fleet, omit this parameter because you can’t specify a network interface ID in a launch specification.</p>",
           "locationName":"networkInterfaceId"
         },
         "PrivateIpAddress":{
@@ -19472,7 +22289,7 @@
       "type":"structure",
       "members":{
         "InstanceId":{
-          "shape":"String",
+          "shape":"InstanceId",
           "documentation":"<p>The instance to specify which volumes should be snapshotted.</p>"
         },
         "ExcludeBootVolume":{
@@ -19545,6 +22362,11 @@
           "documentation":"<p>The Availability Zone of the instance.</p>",
           "locationName":"availabilityZone"
         },
+        "OutpostArn":{
+          "shape":"String",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the Outpost.</p>",
+          "locationName":"outpostArn"
+        },
         "Events":{
           "shape":"InstanceStatusEventList",
           "documentation":"<p>Any scheduled events associated with the instance.</p>",
@@ -19667,6 +22489,23 @@
       },
       "documentation":"<p>Describes the status of an instance.</p>"
     },
+    "InstanceStorageFlag":{"type":"boolean"},
+    "InstanceStorageInfo":{
+      "type":"structure",
+      "members":{
+        "TotalSizeInGB":{
+          "shape":"DiskSize",
+          "documentation":"<p>The total size of the disks, in GB.</p>",
+          "locationName":"totalSizeInGB"
+        },
+        "Disks":{
+          "shape":"DiskInfoList",
+          "documentation":"<p>Array describing the disks that are available for the instance type.</p>",
+          "locationName":"disks"
+        }
+      },
+      "documentation":"<p>Describes the disks that are available for the instance type.</p>"
+    },
     "InstanceType":{
       "type":"string",
       "enum":[
@@ -19810,7 +22649,10 @@
         "c5d.2xlarge",
         "c5d.4xlarge",
         "c5d.9xlarge",
+        "c5d.12xlarge",
         "c5d.18xlarge",
+        "c5d.24xlarge",
+        "c5d.metal",
         "c5n.large",
         "c5n.xlarge",
         "c5n.2xlarge",
@@ -19894,6 +22736,8 @@
         "u-6tb1.metal",
         "u-9tb1.metal",
         "u-12tb1.metal",
+        "u-18tb1.metal",
+        "u-24tb1.metal",
         "a1.medium",
         "a1.large",
         "a1.xlarge",
@@ -19931,13 +22775,175 @@
         "r5n.8xlarge",
         "r5n.12xlarge",
         "r5n.16xlarge",
-        "r5n.24xlarge"
+        "r5n.24xlarge",
+        "inf1.xlarge",
+        "inf1.2xlarge",
+        "inf1.6xlarge",
+        "inf1.24xlarge"
       ]
     },
+    "InstanceTypeHypervisor":{
+      "type":"string",
+      "enum":[
+        "nitro",
+        "xen"
+      ]
+    },
+    "InstanceTypeInfo":{
+      "type":"structure",
+      "members":{
+        "InstanceType":{
+          "shape":"InstanceType",
+          "documentation":"<p>The instance type. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/instance-types.html\">Instance Types</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>.</p>",
+          "locationName":"instanceType"
+        },
+        "CurrentGeneration":{
+          "shape":"CurrentGenerationFlag",
+          "documentation":"<p>Indicates whether the instance type is a current generation.</p>",
+          "locationName":"currentGeneration"
+        },
+        "FreeTierEligible":{
+          "shape":"FreeTierEligibleFlag",
+          "documentation":"<p>Indicates whether the instance type is eligible for the free tier.</p>",
+          "locationName":"freeTierEligible"
+        },
+        "SupportedUsageClasses":{
+          "shape":"UsageClassTypeList",
+          "documentation":"<p>Indicates whether the instance type is offered for spot or On-Demand.</p>",
+          "locationName":"supportedUsageClasses"
+        },
+        "SupportedRootDeviceTypes":{
+          "shape":"RootDeviceTypeList",
+          "documentation":"<p>Indicates the supported root device types.</p>",
+          "locationName":"supportedRootDeviceTypes"
+        },
+        "BareMetal":{
+          "shape":"BareMetalFlag",
+          "documentation":"<p>Indicates whether the instance is bare metal.</p>",
+          "locationName":"bareMetal"
+        },
+        "Hypervisor":{
+          "shape":"InstanceTypeHypervisor",
+          "documentation":"<p>Indicates the hypervisor used for the instance type.</p>",
+          "locationName":"hypervisor"
+        },
+        "ProcessorInfo":{
+          "shape":"ProcessorInfo",
+          "documentation":"<p>Describes the processor.</p>",
+          "locationName":"processorInfo"
+        },
+        "VCpuInfo":{
+          "shape":"VCpuInfo",
+          "documentation":"<p>Describes the vCPU configurations for the instance type.</p>",
+          "locationName":"vCpuInfo"
+        },
+        "MemoryInfo":{
+          "shape":"MemoryInfo",
+          "documentation":"<p>Describes the memory for the instance type.</p>",
+          "locationName":"memoryInfo"
+        },
+        "InstanceStorageSupported":{
+          "shape":"InstanceStorageFlag",
+          "documentation":"<p>Indicates whether instance storage is supported.</p>",
+          "locationName":"instanceStorageSupported"
+        },
+        "InstanceStorageInfo":{
+          "shape":"InstanceStorageInfo",
+          "documentation":"<p>Describes the disks for the instance type.</p>",
+          "locationName":"instanceStorageInfo"
+        },
+        "EbsInfo":{
+          "shape":"EbsInfo",
+          "documentation":"<p>Describes the Amazon EBS settings for the instance type.</p>",
+          "locationName":"ebsInfo"
+        },
+        "NetworkInfo":{
+          "shape":"NetworkInfo",
+          "documentation":"<p>Describes the network settings for the instance type.</p>",
+          "locationName":"networkInfo"
+        },
+        "GpuInfo":{
+          "shape":"GpuInfo",
+          "documentation":"<p>Describes the GPU accelerator settings for the instance type.</p>",
+          "locationName":"gpuInfo"
+        },
+        "FpgaInfo":{
+          "shape":"FpgaInfo",
+          "documentation":"<p>Describes the FPGA accelerator settings for the instance type.</p>",
+          "locationName":"fpgaInfo"
+        },
+        "PlacementGroupInfo":{
+          "shape":"PlacementGroupInfo",
+          "documentation":"<p>Describes the placement group settings for the instance type.</p>",
+          "locationName":"placementGroupInfo"
+        },
+        "InferenceAcceleratorInfo":{
+          "shape":"InferenceAcceleratorInfo",
+          "documentation":"<p>Describes the Inference accelerator settings for the instance type.</p>",
+          "locationName":"inferenceAcceleratorInfo"
+        },
+        "HibernationSupported":{
+          "shape":"HibernationFlag",
+          "documentation":"<p>Indicates whether On-Demand hibernation is supported.</p>",
+          "locationName":"hibernationSupported"
+        },
+        "BurstablePerformanceSupported":{
+          "shape":"BurstablePerformanceFlag",
+          "documentation":"<p>Indicates whether the instance type is a burstable performance instance type.</p>",
+          "locationName":"burstablePerformanceSupported"
+        },
+        "DedicatedHostsSupported":{
+          "shape":"DedicatedHostFlag",
+          "documentation":"<p>Indicates whether Dedicated Hosts are supported on the instance type.</p>",
+          "locationName":"dedicatedHostsSupported"
+        },
+        "AutoRecoverySupported":{
+          "shape":"AutoRecoveryFlag",
+          "documentation":"<p>Indicates whether auto recovery is supported.</p>",
+          "locationName":"autoRecoverySupported"
+        }
+      },
+      "documentation":"<p>Describes the instance type.</p>"
+    },
+    "InstanceTypeInfoList":{
+      "type":"list",
+      "member":{
+        "shape":"InstanceTypeInfo",
+        "locationName":"item"
+      }
+    },
     "InstanceTypeList":{
       "type":"list",
       "member":{"shape":"InstanceType"}
     },
+    "InstanceTypeOffering":{
+      "type":"structure",
+      "members":{
+        "InstanceType":{
+          "shape":"InstanceType",
+          "documentation":"<p>The instance type. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/instance-types.html\">Instance Types</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>.</p>",
+          "locationName":"instanceType"
+        },
+        "LocationType":{
+          "shape":"LocationType",
+          "documentation":"<p>The location type.</p>",
+          "locationName":"locationType"
+        },
+        "Location":{
+          "shape":"Location",
+          "documentation":"<p>The identifier for the location. This depends on the location type. For example, if the location type is <code>region</code>, the location is the Region code (for example, <code>us-east-2</code>.)</p>",
+          "locationName":"location"
+        }
+      },
+      "documentation":"<p>The instance types offered.</p>"
+    },
+    "InstanceTypeOfferingsList":{
+      "type":"list",
+      "member":{
+        "shape":"InstanceTypeOffering",
+        "locationName":"item"
+      }
+    },
     "InstanceUsage":{
       "type":"structure",
       "members":{
@@ -20018,6 +23024,14 @@
         "locationName":"item"
       }
     },
+    "InternetGatewayId":{"type":"string"},
+    "InternetGatewayIdList":{
+      "type":"list",
+      "member":{
+        "shape":"InternetGatewayId",
+        "locationName":"item"
+      }
+    },
     "InternetGatewayList":{
       "type":"list",
       "member":{
@@ -20083,7 +23097,7 @@
         },
         "Description":{
           "shape":"String",
-          "documentation":"<p>A description for the security group rule that references this IPv4 address range.</p> <p>Constraints: Up to 255 characters in length. Allowed characters are a-z, A-Z, 0-9, spaces, and ._-:/()#,@[]+=;{}!$*</p>",
+          "documentation":"<p>A description for the security group rule that references this IPv4 address range.</p> <p>Constraints: Up to 255 characters in length. Allowed characters are a-z, A-Z, 0-9, spaces, and ._-:/()#,@[]+=&amp;;{}!$*</p>",
           "locationName":"description"
         }
       },
@@ -20103,6 +23117,7 @@
         "locationName":"item"
       }
     },
+    "Ipv4PoolEc2Id":{"type":"string"},
     "Ipv6Address":{"type":"string"},
     "Ipv6AddressList":{
       "type":"list",
@@ -20111,6 +23126,29 @@
         "locationName":"item"
       }
     },
+    "Ipv6CidrAssociation":{
+      "type":"structure",
+      "members":{
+        "Ipv6Cidr":{
+          "shape":"String",
+          "documentation":"<p>The IPv6 CIDR block.</p>",
+          "locationName":"ipv6Cidr"
+        },
+        "AssociatedResource":{
+          "shape":"String",
+          "documentation":"<p>The resource that's associated with the IPv6 CIDR block.</p>",
+          "locationName":"associatedResource"
+        }
+      },
+      "documentation":"<p>Describes an IPv6 CIDR block association.</p>"
+    },
+    "Ipv6CidrAssociationSet":{
+      "type":"list",
+      "member":{
+        "shape":"Ipv6CidrAssociation",
+        "locationName":"item"
+      }
+    },
     "Ipv6CidrBlock":{
       "type":"structure",
       "members":{
@@ -20129,6 +23167,53 @@
         "locationName":"item"
       }
     },
+    "Ipv6Flag":{"type":"boolean"},
+    "Ipv6Pool":{
+      "type":"structure",
+      "members":{
+        "PoolId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the address pool.</p>",
+          "locationName":"poolId"
+        },
+        "Description":{
+          "shape":"String",
+          "documentation":"<p>The description for the address pool.</p>",
+          "locationName":"description"
+        },
+        "PoolCidrBlocks":{
+          "shape":"PoolCidrBlocksSet",
+          "documentation":"<p>The CIDR blocks for the address pool.</p>",
+          "locationName":"poolCidrBlockSet"
+        },
+        "Tags":{
+          "shape":"TagList",
+          "documentation":"<p>Any tags for the address pool.</p>",
+          "locationName":"tagSet"
+        }
+      },
+      "documentation":"<p>Describes an IPv6 address pool.</p>"
+    },
+    "Ipv6PoolEc2Id":{"type":"string"},
+    "Ipv6PoolIdList":{
+      "type":"list",
+      "member":{
+        "shape":"Ipv6PoolEc2Id",
+        "locationName":"item"
+      }
+    },
+    "Ipv6PoolMaxResults":{
+      "type":"integer",
+      "max":1000,
+      "min":1
+    },
+    "Ipv6PoolSet":{
+      "type":"list",
+      "member":{
+        "shape":"Ipv6Pool",
+        "locationName":"item"
+      }
+    },
     "Ipv6Range":{
       "type":"structure",
       "members":{
@@ -20139,7 +23224,7 @@
         },
         "Description":{
           "shape":"String",
-          "documentation":"<p>A description for the security group rule that references this IPv6 address range.</p> <p>Constraints: Up to 255 characters in length. Allowed characters are a-z, A-Z, 0-9, spaces, and ._-:/()#,@[]+=;{}!$*</p>",
+          "documentation":"<p>A description for the security group rule that references this IPv6 address range.</p> <p>Constraints: Up to 255 characters in length. Allowed characters are a-z, A-Z, 0-9, spaces, and ._-:/()#,@[]+=&amp;;{}!$*</p>",
           "locationName":"description"
         }
       },
@@ -20159,10 +23244,11 @@
         "disable"
       ]
     },
+    "KernelId":{"type":"string"},
     "KeyNameStringList":{
       "type":"list",
       "member":{
-        "shape":"String",
+        "shape":"KeyPairName",
         "locationName":"KeyName"
       }
     },
@@ -20175,7 +23261,7 @@
           "locationName":"keyFingerprint"
         },
         "KeyMaterial":{
-          "shape":"String",
+          "shape":"SensitiveUserData",
           "documentation":"<p>An unencrypted PEM encoded RSA private key.</p>",
           "locationName":"keyMaterial"
         },
@@ -20183,13 +23269,31 @@
           "shape":"String",
           "documentation":"<p>The name of the key pair.</p>",
           "locationName":"keyName"
+        },
+        "KeyPairId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the key pair.</p>",
+          "locationName":"keyPairId"
         }
       },
       "documentation":"<p>Describes a key pair.</p>"
     },
+    "KeyPairId":{"type":"string"},
+    "KeyPairIdStringList":{
+      "type":"list",
+      "member":{
+        "shape":"KeyPairId",
+        "locationName":"KeyPairId"
+      }
+    },
     "KeyPairInfo":{
       "type":"structure",
       "members":{
+        "KeyPairId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the key pair.</p>",
+          "locationName":"keyPairId"
+        },
         "KeyFingerprint":{
           "shape":"String",
           "documentation":"<p>If you used <a>CreateKeyPair</a> to create the key pair, this is the SHA-1 digest of the DER encoded private key. If you used <a>ImportKeyPair</a> to provide AWS the public key, this is the MD5 public key fingerprint as specified in section 4 of RFC4716.</p>",
@@ -20199,6 +23303,11 @@
           "shape":"String",
           "documentation":"<p>The name of the key pair.</p>",
           "locationName":"keyName"
+        },
+        "Tags":{
+          "shape":"TagList",
+          "documentation":"<p>Any tags applied to the key pair.</p>",
+          "locationName":"tagSet"
         }
       },
       "documentation":"<p>Describes a key pair.</p>"
@@ -20210,6 +23319,24 @@
         "locationName":"item"
       }
     },
+    "KeyPairName":{"type":"string"},
+    "KmsKeyId":{"type":"string"},
+    "LastError":{
+      "type":"structure",
+      "members":{
+        "Message":{
+          "shape":"String",
+          "documentation":"<p>The error message for the VPC endpoint error.</p>",
+          "locationName":"message"
+        },
+        "Code":{
+          "shape":"String",
+          "documentation":"<p>The error code for the VPC endpoint error.</p>",
+          "locationName":"code"
+        }
+      },
+      "documentation":"<p>The last error that occurred for a VPC endpoint.</p>"
+    },
     "LaunchPermission":{
       "type":"structure",
       "members":{
@@ -20555,12 +23682,12 @@
           "locationName":"iops"
         },
         "KmsKeyId":{
-          "shape":"String",
+          "shape":"KmsKeyId",
           "documentation":"<p>The ARN of the AWS Key Management Service (AWS KMS) CMK used for encryption.</p>",
           "locationName":"kmsKeyId"
         },
         "SnapshotId":{
-          "shape":"String",
+          "shape":"SnapshotId",
           "documentation":"<p>The ID of the snapshot.</p>",
           "locationName":"snapshotId"
         },
@@ -20593,11 +23720,11 @@
           "documentation":"<p>The number of I/O operations per second (IOPS) that the volume supports. For io1, this represents the number of IOPS that are provisioned for the volume. For gp2, this represents the baseline performance of the volume and the rate at which the volume accumulates I/O credits for bursting. For more information about General Purpose SSD baseline performance, I/O credits, and bursting, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSVolumeTypes.html\">Amazon EBS Volume Types</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>.</p> <p>Condition: This parameter is required for requests to create io1 volumes; it is not used in requests to create gp2, st1, sc1, or standard volumes.</p>"
         },
         "KmsKeyId":{
-          "shape":"String",
-          "documentation":"<p>The ARN of the AWS Key Management Service (AWS KMS) CMK used for encryption.</p>"
+          "shape":"KmsKeyId",
+          "documentation":"<p>The ARN of the symmetric AWS Key Management Service (AWS KMS) CMK used for encryption.</p>"
         },
         "SnapshotId":{
-          "shape":"String",
+          "shape":"SnapshotId",
           "documentation":"<p>The ID of the snapshot.</p>"
         },
         "VolumeSize":{
@@ -20618,10 +23745,18 @@
         "Type":{
           "shape":"String",
           "documentation":"<p> The type of elastic inference accelerator. The possible values are eia1.medium, eia1.large, and eia1.xlarge. </p>"
+        },
+        "Count":{
+          "shape":"LaunchTemplateElasticInferenceAcceleratorCount",
+          "documentation":"<p> The number of elastic inference accelerators to attach to the instance. </p> <p>Default: 1</p>"
         }
       },
       "documentation":"<p> Describes an elastic inference accelerator. </p>"
     },
+    "LaunchTemplateElasticInferenceAcceleratorCount":{
+      "type":"integer",
+      "min":1
+    },
     "LaunchTemplateElasticInferenceAcceleratorList":{
       "type":"list",
       "member":{
@@ -20636,6 +23771,11 @@
           "shape":"String",
           "documentation":"<p> The type of elastic inference accelerator. The possible values are eia1.medium, eia1.large, and eia1.xlarge. </p>",
           "locationName":"type"
+        },
+        "Count":{
+          "shape":"Integer",
+          "documentation":"<p> The number of elastic inference accelerators to attach to the instance. </p> <p>Default: 1</p>",
+          "locationName":"count"
         }
       },
       "documentation":"<p> Describes an elastic inference accelerator. </p>"
@@ -20677,7 +23817,14 @@
           "documentation":"<p>If you set this parameter to <code>true</code>, the instance is enabled for hibernation.</p> <p>Default: <code>false</code> </p>"
         }
       },
-      "documentation":"<p>Indicates whether the instance is configured for hibernation. This parameter is valid only if the instance meets the <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Hibernate.html#hibernating-prerequisites\">hibernation prerequisites</a>. Hibernation is currently supported only for Amazon Linux.</p>"
+      "documentation":"<p>Indicates whether the instance is configured for hibernation. This parameter is valid only if the instance meets the <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Hibernate.html#hibernating-prerequisites\">hibernation prerequisites</a>.</p>"
+    },
+    "LaunchTemplateHttpTokensState":{
+      "type":"string",
+      "enum":[
+        "optional",
+        "required"
+      ]
     },
     "LaunchTemplateIamInstanceProfileSpecification":{
       "type":"structure",
@@ -20709,6 +23856,14 @@
       },
       "documentation":"<p>An IAM instance profile.</p>"
     },
+    "LaunchTemplateId":{"type":"string"},
+    "LaunchTemplateIdStringList":{
+      "type":"list",
+      "member":{
+        "shape":"LaunchTemplateId",
+        "locationName":"item"
+      }
+    },
     "LaunchTemplateInstanceMarketOptions":{
       "type":"structure",
       "members":{
@@ -20739,6 +23894,64 @@
       },
       "documentation":"<p>The market (purchasing) option for the instances.</p>"
     },
+    "LaunchTemplateInstanceMetadataEndpointState":{
+      "type":"string",
+      "enum":[
+        "disabled",
+        "enabled"
+      ]
+    },
+    "LaunchTemplateInstanceMetadataOptions":{
+      "type":"structure",
+      "members":{
+        "State":{
+          "shape":"LaunchTemplateInstanceMetadataOptionsState",
+          "documentation":"<p>The state of the metadata option changes.</p> <p> <code>pending</code> - The metadata options are being updated and the instance is not ready to process metadata traffic with the new selection.</p> <p> <code>applied</code> - The metadata options have been successfully applied on the instance.</p>",
+          "locationName":"state"
+        },
+        "HttpTokens":{
+          "shape":"LaunchTemplateHttpTokensState",
+          "documentation":"<p>The state of token usage for your instance metadata requests. If the parameter is not specified in the request, the default state is <code>optional</code>.</p> <p>If the state is <code>optional</code>, you can choose to retrieve instance metadata with or without a signed token header on your request. If you retrieve the IAM role credentials without a token, the version 1.0 role credentials are returned. If you retrieve the IAM role credentials using a valid signed token, the version 2.0 role credentials are returned.</p> <p>If the state is <code>required</code>, you must send a signed token header with any instance metadata retrieval requests. In this state, retrieving the IAM role credentials always returns the version 2.0 credentials; the version 1.0 credentials are not available.</p>",
+          "locationName":"httpTokens"
+        },
+        "HttpPutResponseHopLimit":{
+          "shape":"Integer",
+          "documentation":"<p>The desired HTTP PUT response hop limit for instance metadata requests. The larger the number, the further instance metadata requests can travel.</p> <p>Default: 1</p> <p>Possible values: Integers from 1 to 64</p>",
+          "locationName":"httpPutResponseHopLimit"
+        },
+        "HttpEndpoint":{
+          "shape":"LaunchTemplateInstanceMetadataEndpointState",
+          "documentation":"<p>This parameter enables or disables the HTTP metadata endpoint on your instances. If the parameter is not specified, the default state is <code>enabled</code>.</p> <note> <p>If you specify a value of <code>disabled</code>, you will not be able to access your instance metadata. </p> </note>",
+          "locationName":"httpEndpoint"
+        }
+      },
+      "documentation":"<p>The metadata options for the instance. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-instance-metadata.html\">Instance Metadata and User Data</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>.</p>"
+    },
+    "LaunchTemplateInstanceMetadataOptionsRequest":{
+      "type":"structure",
+      "members":{
+        "HttpTokens":{
+          "shape":"LaunchTemplateHttpTokensState",
+          "documentation":"<p>The state of token usage for your instance metadata requests. If the parameter is not specified in the request, the default state is <code>optional</code>.</p> <p>If the state is <code>optional</code>, you can choose to retrieve instance metadata with or without a signed token header on your request. If you retrieve the IAM role credentials without a token, the version 1.0 role credentials are returned. If you retrieve the IAM role credentials using a valid signed token, the version 2.0 role credentials are returned.</p> <p>If the state is <code>required</code>, you must send a signed token header with any instance metadata retrieval requests. In this state, retrieving the IAM role credentials always returns the version 2.0 credentials; the version 1.0 credentials are not available.</p>"
+        },
+        "HttpPutResponseHopLimit":{
+          "shape":"Integer",
+          "documentation":"<p>The desired HTTP PUT response hop limit for instance metadata requests. The larger the number, the further instance metadata requests can travel.</p> <p>Default: 1</p> <p>Possible values: Integers from 1 to 64</p>"
+        },
+        "HttpEndpoint":{
+          "shape":"LaunchTemplateInstanceMetadataEndpointState",
+          "documentation":"<p>This parameter enables or disables the HTTP metadata endpoint on your instances. If the parameter is not specified, the default state is <code>enabled</code>.</p> <note> <p>If you specify a value of <code>disabled</code>, you will not be able to access your instance metadata. </p> </note>"
+        }
+      },
+      "documentation":"<p>The metadata options for the instance. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-instance-metadata.html\">Instance Metadata and User Data</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>.</p>"
+    },
+    "LaunchTemplateInstanceMetadataOptionsState":{
+      "type":"string",
+      "enum":[
+        "pending",
+        "applied"
+      ]
+    },
     "LaunchTemplateInstanceNetworkInterfaceSpecification":{
       "type":"structure",
       "members":{
@@ -20783,7 +23996,7 @@
           "locationName":"ipv6AddressesSet"
         },
         "NetworkInterfaceId":{
-          "shape":"String",
+          "shape":"NetworkInterfaceId",
           "documentation":"<p>The ID of the network interface.</p>",
           "locationName":"networkInterfaceId"
         },
@@ -20803,7 +24016,7 @@
           "locationName":"secondaryPrivateIpAddressCount"
         },
         "SubnetId":{
-          "shape":"String",
+          "shape":"SubnetId",
           "documentation":"<p>The ID of the subnet for the network interface.</p>",
           "locationName":"subnetId"
         }
@@ -20854,7 +24067,7 @@
           "documentation":"<p>One or more specific IPv6 addresses from the IPv6 CIDR block range of your subnet. You can't use this option if you're specifying a number of IPv6 addresses.</p>"
         },
         "NetworkInterfaceId":{
-          "shape":"String",
+          "shape":"NetworkInterfaceId",
           "documentation":"<p>The ID of the network interface.</p>"
         },
         "PrivateIpAddress":{
@@ -20870,7 +24083,7 @@
           "documentation":"<p>The number of secondary private IPv4 addresses to assign to a network interface.</p>"
         },
         "SubnetId":{
-          "shape":"String",
+          "shape":"SubnetId",
           "documentation":"<p>The ID of the subnet for the network interface.</p>"
         }
       },
@@ -21006,6 +24219,16 @@
           "shape":"String",
           "documentation":"<p>Reserved for future use.</p>",
           "locationName":"spreadDomain"
+        },
+        "HostResourceGroupArn":{
+          "shape":"String",
+          "documentation":"<p>The ARN of the host resource group in which to launch the instances. </p>",
+          "locationName":"hostResourceGroupArn"
+        },
+        "PartitionNumber":{
+          "shape":"Integer",
+          "documentation":"<p>The number of the partition the instance should launch in. Valid only if the placement group strategy is set to <code>partition</code>.</p>",
+          "locationName":"partitionNumber"
         }
       },
       "documentation":"<p>Describes the placement of an instance.</p>"
@@ -21022,11 +24245,11 @@
           "documentation":"<p>The affinity setting for an instance on a Dedicated Host.</p>"
         },
         "GroupName":{
-          "shape":"String",
+          "shape":"PlacementGroupName",
           "documentation":"<p>The name of the placement group for the instance.</p>"
         },
         "HostId":{
-          "shape":"String",
+          "shape":"DedicatedHostId",
           "documentation":"<p>The ID of the Dedicated Host for the instance.</p>"
         },
         "Tenancy":{
@@ -21036,6 +24259,14 @@
         "SpreadDomain":{
           "shape":"String",
           "documentation":"<p>Reserved for future use.</p>"
+        },
+        "HostResourceGroupArn":{
+          "shape":"String",
+          "documentation":"<p>The ARN of the host resource group in which to launch the instances. If you specify a host resource group ARN, omit the <b>Tenancy</b> parameter or set it to <code>host</code>.</p>"
+        },
+        "PartitionNumber":{
+          "shape":"Integer",
+          "documentation":"<p>The number of the partition the instance should launch in. Valid only if the placement group strategy is set to <code>partition</code>.</p>"
         }
       },
       "documentation":"<p>Describes the placement of an instance.</p>"
@@ -21051,7 +24282,7 @@
       "type":"structure",
       "members":{
         "LaunchTemplateId":{
-          "shape":"String",
+          "shape":"LaunchTemplateId",
           "documentation":"<p>The ID of the launch template.</p>"
         },
         "LaunchTemplateName":{
@@ -21368,6 +24599,371 @@
       },
       "documentation":"<p>Describes a load permission.</p>"
     },
+    "LocalGateway":{
+      "type":"structure",
+      "members":{
+        "LocalGatewayId":{
+          "shape":"LocalGatewayId",
+          "documentation":"<p>The ID of the local gateway.</p>",
+          "locationName":"localGatewayId"
+        },
+        "OutpostArn":{
+          "shape":"String",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the Outpost.</p>",
+          "locationName":"outpostArn"
+        },
+        "OwnerId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the AWS account ID that owns the local gateway.</p>",
+          "locationName":"ownerId"
+        },
+        "State":{
+          "shape":"String",
+          "documentation":"<p>The state of the local gateway.</p>",
+          "locationName":"state"
+        },
+        "Tags":{
+          "shape":"TagList",
+          "documentation":"<p>The tags assigned to the local gateway.</p>",
+          "locationName":"tagSet"
+        }
+      },
+      "documentation":"<p>Describes a local gateway.</p>"
+    },
+    "LocalGatewayId":{"type":"string"},
+    "LocalGatewayIdSet":{
+      "type":"list",
+      "member":{
+        "shape":"LocalGatewayId",
+        "locationName":"item"
+      }
+    },
+    "LocalGatewayMaxResults":{
+      "type":"integer",
+      "max":1000,
+      "min":5
+    },
+    "LocalGatewayRoute":{
+      "type":"structure",
+      "members":{
+        "DestinationCidrBlock":{
+          "shape":"String",
+          "documentation":"<p>The CIDR block used for destination matches.</p>",
+          "locationName":"destinationCidrBlock"
+        },
+        "LocalGatewayVirtualInterfaceGroupId":{
+          "shape":"LocalGatewayVirtualInterfaceGroupId",
+          "documentation":"<p>The ID of the virtual interface group.</p>",
+          "locationName":"localGatewayVirtualInterfaceGroupId"
+        },
+        "Type":{
+          "shape":"LocalGatewayRouteType",
+          "documentation":"<p>The route type.</p>",
+          "locationName":"type"
+        },
+        "State":{
+          "shape":"LocalGatewayRouteState",
+          "documentation":"<p>The state of the route.</p>",
+          "locationName":"state"
+        },
+        "LocalGatewayRouteTableId":{
+          "shape":"LocalGatewayRoutetableId",
+          "documentation":"<p>The ID of the local gateway route table.</p>",
+          "locationName":"localGatewayRouteTableId"
+        }
+      },
+      "documentation":"<p>Describes a route for a local gateway route table.</p>"
+    },
+    "LocalGatewayRouteList":{
+      "type":"list",
+      "member":{
+        "shape":"LocalGatewayRoute",
+        "locationName":"item"
+      }
+    },
+    "LocalGatewayRouteState":{
+      "type":"string",
+      "enum":[
+        "pending",
+        "active",
+        "blackhole",
+        "deleting",
+        "deleted"
+      ]
+    },
+    "LocalGatewayRouteTable":{
+      "type":"structure",
+      "members":{
+        "LocalGatewayRouteTableId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the local gateway route table.</p>",
+          "locationName":"localGatewayRouteTableId"
+        },
+        "LocalGatewayId":{
+          "shape":"LocalGatewayId",
+          "documentation":"<p>The ID of the local gateway.</p>",
+          "locationName":"localGatewayId"
+        },
+        "OutpostArn":{
+          "shape":"String",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the Outpost.</p>",
+          "locationName":"outpostArn"
+        },
+        "State":{
+          "shape":"String",
+          "documentation":"<p>The state of the local gateway route table.</p>",
+          "locationName":"state"
+        },
+        "Tags":{
+          "shape":"TagList",
+          "documentation":"<p>The tags assigned to the local gateway route table.</p>",
+          "locationName":"tagSet"
+        }
+      },
+      "documentation":"<p>Describes a local gateway route table.</p>"
+    },
+    "LocalGatewayRouteTableIdSet":{
+      "type":"list",
+      "member":{
+        "shape":"LocalGatewayRoutetableId",
+        "locationName":"item"
+      }
+    },
+    "LocalGatewayRouteTableSet":{
+      "type":"list",
+      "member":{
+        "shape":"LocalGatewayRouteTable",
+        "locationName":"item"
+      }
+    },
+    "LocalGatewayRouteTableVirtualInterfaceGroupAssociation":{
+      "type":"structure",
+      "members":{
+        "LocalGatewayRouteTableVirtualInterfaceGroupAssociationId":{
+          "shape":"LocalGatewayRouteTableVirtualInterfaceGroupAssociationId",
+          "documentation":"<p>The ID of the association.</p>",
+          "locationName":"localGatewayRouteTableVirtualInterfaceGroupAssociationId"
+        },
+        "LocalGatewayVirtualInterfaceGroupId":{
+          "shape":"LocalGatewayVirtualInterfaceGroupId",
+          "documentation":"<p>The ID of the virtual interface group.</p>",
+          "locationName":"localGatewayVirtualInterfaceGroupId"
+        },
+        "LocalGatewayId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the local gateway.</p>",
+          "locationName":"localGatewayId"
+        },
+        "LocalGatewayRouteTableId":{
+          "shape":"LocalGatewayId",
+          "documentation":"<p>The ID of the local gateway route table.</p>",
+          "locationName":"localGatewayRouteTableId"
+        },
+        "State":{
+          "shape":"String",
+          "documentation":"<p>The state of the association.</p>",
+          "locationName":"state"
+        },
+        "Tags":{
+          "shape":"TagList",
+          "documentation":"<p>The tags assigned to the association.</p>",
+          "locationName":"tagSet"
+        }
+      },
+      "documentation":"<p>Describes an association between a local gateway route table and a virtual interface group.</p>"
+    },
+    "LocalGatewayRouteTableVirtualInterfaceGroupAssociationId":{"type":"string"},
+    "LocalGatewayRouteTableVirtualInterfaceGroupAssociationIdSet":{
+      "type":"list",
+      "member":{
+        "shape":"LocalGatewayRouteTableVirtualInterfaceGroupAssociationId",
+        "locationName":"item"
+      }
+    },
+    "LocalGatewayRouteTableVirtualInterfaceGroupAssociationSet":{
+      "type":"list",
+      "member":{
+        "shape":"LocalGatewayRouteTableVirtualInterfaceGroupAssociation",
+        "locationName":"item"
+      }
+    },
+    "LocalGatewayRouteTableVpcAssociation":{
+      "type":"structure",
+      "members":{
+        "LocalGatewayRouteTableVpcAssociationId":{
+          "shape":"LocalGatewayRouteTableVpcAssociationId",
+          "documentation":"<p>The ID of the association.</p>",
+          "locationName":"localGatewayRouteTableVpcAssociationId"
+        },
+        "LocalGatewayRouteTableId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the local gateway route table.</p>",
+          "locationName":"localGatewayRouteTableId"
+        },
+        "LocalGatewayId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the local gateway.</p>",
+          "locationName":"localGatewayId"
+        },
+        "VpcId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the VPC.</p>",
+          "locationName":"vpcId"
+        },
+        "State":{
+          "shape":"String",
+          "documentation":"<p>The state of the association.</p>",
+          "locationName":"state"
+        },
+        "Tags":{
+          "shape":"TagList",
+          "documentation":"<p>The tags assigned to the association.</p>",
+          "locationName":"tagSet"
+        }
+      },
+      "documentation":"<p>Describes an association between a local gateway route table and a VPC.</p>"
+    },
+    "LocalGatewayRouteTableVpcAssociationId":{"type":"string"},
+    "LocalGatewayRouteTableVpcAssociationIdSet":{
+      "type":"list",
+      "member":{
+        "shape":"LocalGatewayRouteTableVpcAssociationId",
+        "locationName":"item"
+      }
+    },
+    "LocalGatewayRouteTableVpcAssociationSet":{
+      "type":"list",
+      "member":{
+        "shape":"LocalGatewayRouteTableVpcAssociation",
+        "locationName":"item"
+      }
+    },
+    "LocalGatewayRouteType":{
+      "type":"string",
+      "enum":[
+        "static",
+        "propagated"
+      ]
+    },
+    "LocalGatewayRoutetableId":{"type":"string"},
+    "LocalGatewaySet":{
+      "type":"list",
+      "member":{
+        "shape":"LocalGateway",
+        "locationName":"item"
+      }
+    },
+    "LocalGatewayVirtualInterface":{
+      "type":"structure",
+      "members":{
+        "LocalGatewayVirtualInterfaceId":{
+          "shape":"LocalGatewayVirtualInterfaceId",
+          "documentation":"<p>The ID of the virtual interface.</p>",
+          "locationName":"localGatewayVirtualInterfaceId"
+        },
+        "LocalGatewayId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the local gateway.</p>",
+          "locationName":"localGatewayId"
+        },
+        "Vlan":{
+          "shape":"Integer",
+          "documentation":"<p>The ID of the VLAN.</p>",
+          "locationName":"vlan"
+        },
+        "LocalAddress":{
+          "shape":"String",
+          "documentation":"<p>The local address.</p>",
+          "locationName":"localAddress"
+        },
+        "PeerAddress":{
+          "shape":"String",
+          "documentation":"<p>The peer address.</p>",
+          "locationName":"peerAddress"
+        },
+        "LocalBgpAsn":{
+          "shape":"Integer",
+          "documentation":"<p>The Border Gateway Protocol (BGP) Autonomous System Number (ASN) of the local gateway.</p>",
+          "locationName":"localBgpAsn"
+        },
+        "PeerBgpAsn":{
+          "shape":"Integer",
+          "documentation":"<p>The peer BGP ASN.</p>",
+          "locationName":"peerBgpAsn"
+        },
+        "Tags":{
+          "shape":"TagList",
+          "documentation":"<p>The tags assigned to the virtual interface.</p>",
+          "locationName":"tagSet"
+        }
+      },
+      "documentation":"<p>Describes a local gateway virtual interface.</p>"
+    },
+    "LocalGatewayVirtualInterfaceGroup":{
+      "type":"structure",
+      "members":{
+        "LocalGatewayVirtualInterfaceGroupId":{
+          "shape":"LocalGatewayVirtualInterfaceGroupId",
+          "documentation":"<p>The ID of the virtual interface group.</p>",
+          "locationName":"localGatewayVirtualInterfaceGroupId"
+        },
+        "LocalGatewayVirtualInterfaceIds":{
+          "shape":"LocalGatewayVirtualInterfaceIdSet",
+          "documentation":"<p>The IDs of the virtual interfaces.</p>",
+          "locationName":"localGatewayVirtualInterfaceIdSet"
+        },
+        "LocalGatewayId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the local gateway.</p>",
+          "locationName":"localGatewayId"
+        },
+        "Tags":{
+          "shape":"TagList",
+          "documentation":"<p>The tags assigned to the virtual interface group.</p>",
+          "locationName":"tagSet"
+        }
+      },
+      "documentation":"<p>Describes a local gateway virtual interface group.</p>"
+    },
+    "LocalGatewayVirtualInterfaceGroupId":{"type":"string"},
+    "LocalGatewayVirtualInterfaceGroupIdSet":{
+      "type":"list",
+      "member":{
+        "shape":"LocalGatewayVirtualInterfaceGroupId",
+        "locationName":"item"
+      }
+    },
+    "LocalGatewayVirtualInterfaceGroupSet":{
+      "type":"list",
+      "member":{
+        "shape":"LocalGatewayVirtualInterfaceGroup",
+        "locationName":"item"
+      }
+    },
+    "LocalGatewayVirtualInterfaceId":{"type":"string"},
+    "LocalGatewayVirtualInterfaceIdSet":{
+      "type":"list",
+      "member":{
+        "shape":"LocalGatewayVirtualInterfaceId",
+        "locationName":"item"
+      }
+    },
+    "LocalGatewayVirtualInterfaceSet":{
+      "type":"list",
+      "member":{
+        "shape":"LocalGatewayVirtualInterface",
+        "locationName":"item"
+      }
+    },
+    "Location":{"type":"string"},
+    "LocationType":{
+      "type":"string",
+      "enum":[
+        "region",
+        "availability-zone",
+        "availability-zone-id"
+      ]
+    },
     "LogDestinationType":{
       "type":"string",
       "enum":[
@@ -21380,13 +24976,74 @@
       "type":"string",
       "enum":["spot"]
     },
+    "MaxIpv4AddrPerInterface":{"type":"integer"},
+    "MaxIpv6AddrPerInterface":{"type":"integer"},
+    "MaxNetworkInterfaces":{"type":"integer"},
+    "MaxResults":{"type":"integer"},
+    "MembershipType":{
+      "type":"string",
+      "enum":[
+        "static",
+        "igmp"
+      ]
+    },
+    "MemoryInfo":{
+      "type":"structure",
+      "members":{
+        "SizeInMiB":{
+          "shape":"MemorySize",
+          "documentation":"<p>Size of the memory, in MiB.</p>",
+          "locationName":"sizeInMiB"
+        }
+      },
+      "documentation":"<p>Describes the memory for the instance type.</p>"
+    },
+    "MemorySize":{"type":"long"},
     "MillisecondDateTime":{"type":"timestamp"},
+    "ModifyAvailabilityZoneGroupRequest":{
+      "type":"structure",
+      "required":[
+        "GroupName",
+        "OptInStatus"
+      ],
+      "members":{
+        "GroupName":{
+          "shape":"String",
+          "documentation":"<p>The name of the Availability Zone Group.</p>"
+        },
+        "OptInStatus":{
+          "shape":"ModifyAvailabilityZoneOptInStatus",
+          "documentation":"<p>Indicates whether to enable or disable membership. The valid values are <code>opted-in</code>. You must contact <a href=\"https://console.aws.amazon.com/support/home#/case/create%3FissueType=customer-service%26serviceCode=general-info%26getting-started%26categoryCode=using-aws%26services\">AWS Support</a> to disable an Availability Zone group.</p>"
+        },
+        "DryRun":{
+          "shape":"Boolean",
+          "documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>"
+        }
+      }
+    },
+    "ModifyAvailabilityZoneGroupResult":{
+      "type":"structure",
+      "members":{
+        "Return":{
+          "shape":"Boolean",
+          "documentation":"<p>Is <code>true</code> if the request succeeds, and an error otherwise.</p>",
+          "locationName":"return"
+        }
+      }
+    },
+    "ModifyAvailabilityZoneOptInStatus":{
+      "type":"string",
+      "enum":[
+        "opted-in",
+        "not-opted-in"
+      ]
+    },
     "ModifyCapacityReservationRequest":{
       "type":"structure",
       "required":["CapacityReservationId"],
       "members":{
         "CapacityReservationId":{
-          "shape":"String",
+          "shape":"CapacityReservationId",
           "documentation":"<p>The ID of the Capacity Reservation.</p>"
         },
         "InstanceCount":{
@@ -21422,7 +25079,7 @@
       "required":["ClientVpnEndpointId"],
       "members":{
         "ClientVpnEndpointId":{
-          "shape":"String",
+          "shape":"ClientVpnEndpointId",
           "documentation":"<p>The ID of the Client VPN endpoint to modify.</p>"
         },
         "ServerCertificateArn":{
@@ -21437,6 +25094,10 @@
           "shape":"DnsServersOptionsModifyStructure",
           "documentation":"<p>Information about the DNS servers to be used by Client VPN connections. A Client VPN endpoint can have up to two DNS servers.</p>"
         },
+        "VpnPort":{
+          "shape":"Integer",
+          "documentation":"<p>The port number to assign to the Client VPN endpoint for TCP and UDP traffic.</p> <p>Valid Values: <code>443</code> | <code>1194</code> </p> <p>Default Value: <code>443</code> </p>"
+        },
         "Description":{
           "shape":"String",
           "documentation":"<p>A brief description of the Client VPN endpoint.</p>"
@@ -21448,6 +25109,15 @@
         "DryRun":{
           "shape":"Boolean",
           "documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>"
+        },
+        "SecurityGroupIds":{
+          "shape":"ClientVpnSecurityGroupIdSet",
+          "documentation":"<p>The IDs of one or more security groups to apply to the target network.</p>",
+          "locationName":"SecurityGroupId"
+        },
+        "VpcId":{
+          "shape":"VpcId",
+          "documentation":"<p>The ID of the VPC to associate with the Client VPN endpoint.</p>"
         }
       }
     },
@@ -21461,13 +25131,44 @@
         }
       }
     },
+    "ModifyDefaultCreditSpecificationRequest":{
+      "type":"structure",
+      "required":[
+        "InstanceFamily",
+        "CpuCredits"
+      ],
+      "members":{
+        "DryRun":{
+          "shape":"Boolean",
+          "documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>"
+        },
+        "InstanceFamily":{
+          "shape":"UnlimitedSupportedInstanceFamily",
+          "documentation":"<p>The instance family.</p>"
+        },
+        "CpuCredits":{
+          "shape":"String",
+          "documentation":"<p>The credit option for CPU usage of the instance family.</p> <p>Valid Values: <code>standard</code> | <code>unlimited</code> </p>"
+        }
+      }
+    },
+    "ModifyDefaultCreditSpecificationResult":{
+      "type":"structure",
+      "members":{
+        "InstanceFamilyCreditSpecification":{
+          "shape":"InstanceFamilyCreditSpecification",
+          "documentation":"<p>The default credit option for CPU usage of the instance family.</p>",
+          "locationName":"instanceFamilyCreditSpecification"
+        }
+      }
+    },
     "ModifyEbsDefaultKmsKeyIdRequest":{
       "type":"structure",
       "required":["KmsKeyId"],
       "members":{
         "KmsKeyId":{
-          "shape":"String",
-          "documentation":"<p>The identifier of the AWS Key Management Service (AWS KMS) customer master key (CMK) to use for Amazon EBS encryption. If this parameter is not specified, your AWS managed CMK for EBS is used. If <code>KmsKeyId</code> is specified, the encrypted state must be <code>true</code>.</p> <p>You can specify the CMK using any of the following:</p> <ul> <li> <p>Key ID. For example, key/1234abcd-12ab-34cd-56ef-1234567890ab.</p> </li> <li> <p>Key alias. For example, alias/ExampleAlias.</p> </li> <li> <p>Key ARN. For example, arn:aws:kms:<i>us-east-1</i>:<i>012345678910</i>:key/<i>abcd1234-a123-456a-a12b-a123b4cd56ef</i>.</p> </li> <li> <p>Alias ARN. For example, arn:aws:kms:<i>us-east-1</i>:<i>012345678910</i>:alias/<i>ExampleAlias</i>.</p> </li> </ul> <p>AWS authenticates the CMK asynchronously. Therefore, if you specify an ID, alias, or ARN that is not valid, the action can appear to complete, but eventually fails.</p>"
+          "shape":"KmsKeyId",
+          "documentation":"<p>The identifier of the AWS Key Management Service (AWS KMS) customer master key (CMK) to use for Amazon EBS encryption. If this parameter is not specified, your AWS managed CMK for EBS is used. If <code>KmsKeyId</code> is specified, the encrypted state must be <code>true</code>.</p> <p>You can specify the CMK using any of the following:</p> <ul> <li> <p>Key ID. For example, key/1234abcd-12ab-34cd-56ef-1234567890ab.</p> </li> <li> <p>Key alias. For example, alias/ExampleAlias.</p> </li> <li> <p>Key ARN. For example, arn:aws:kms:<i>us-east-1</i>:<i>012345678910</i>:key/<i>abcd1234-a123-456a-a12b-a123b4cd56ef</i>.</p> </li> <li> <p>Alias ARN. For example, arn:aws:kms:<i>us-east-1</i>:<i>012345678910</i>:alias/<i>ExampleAlias</i>.</p> </li> </ul> <p>AWS authenticates the CMK asynchronously. Therefore, if you specify an ID, alias, or ARN that is not valid, the action can appear to complete, but eventually fails.</p> <p>Amazon EBS does not support asymmetric CMKs.</p>"
         },
         "DryRun":{
           "shape":"Boolean",
@@ -21501,7 +25202,7 @@
           "documentation":"<p>Indicates whether running instances should be terminated if the total target capacity of the EC2 Fleet is decreased below the current size of the EC2 Fleet.</p>"
         },
         "FleetId":{
-          "shape":"FleetIdentifier",
+          "shape":"FleetId",
           "documentation":"<p>The ID of the EC2 Fleet.</p>"
         },
         "TargetCapacitySpecification":{
@@ -21529,7 +25230,7 @@
           "documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>"
         },
         "FpgaImageId":{
-          "shape":"String",
+          "shape":"FpgaImageId",
           "documentation":"<p>The ID of the AFI.</p>"
         },
         "Attribute":{
@@ -21596,6 +25297,14 @@
         "HostRecovery":{
           "shape":"HostRecovery",
           "documentation":"<p>Indicates whether to enable or disable host recovery for the Dedicated Host. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/dedicated-hosts-recovery.html\"> Host Recovery</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>.</p>"
+        },
+        "InstanceType":{
+          "shape":"String",
+          "documentation":"<p>Specifies the instance type to be supported by the Dedicated Host. Specify this parameter to modify a Dedicated Host to support only a specific instance type.</p> <p>If you want to modify a Dedicated Host to support multiple instance types in its current instance family, omit this parameter and specify <b>InstanceFamily</b> instead. You cannot specify <b>InstanceType</b> and <b>InstanceFamily</b> in the same request.</p>"
+        },
+        "InstanceFamily":{
+          "shape":"String",
+          "documentation":"<p>Specifies the instance family to be supported by the Dedicated Host. Specify this parameter to modify a Dedicated Host to support multiple instance types within its current instance family.</p> <p>If you want to modify a Dedicated Host to support a specific instance type only, omit this parameter and specify <b>InstanceType</b> instead. You cannot specify <b>InstanceFamily</b> and <b>InstanceType</b> in the same request.</p>"
         }
       }
     },
@@ -21669,7 +25378,7 @@
           "documentation":"<p>A new description for the AMI.</p>"
         },
         "ImageId":{
-          "shape":"String",
+          "shape":"ImageId",
           "documentation":"<p>The ID of the AMI.</p>"
         },
         "LaunchPermission":{
@@ -21751,7 +25460,7 @@
           "locationName":"GroupId"
         },
         "InstanceId":{
-          "shape":"String",
+          "shape":"InstanceId",
           "documentation":"<p>The ID of the instance.</p>",
           "locationName":"instanceId"
         },
@@ -21800,7 +25509,7 @@
       ],
       "members":{
         "InstanceId":{
-          "shape":"String",
+          "shape":"InstanceId",
           "documentation":"<p>The ID of the instance to be modified.</p>"
         },
         "CapacityReservationSpecification":{
@@ -21870,7 +25579,7 @@
           "documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>"
         },
         "InstanceId":{
-          "shape":"String",
+          "shape":"InstanceId",
           "documentation":"<p>The ID of the instance with the scheduled event.</p>"
         },
         "InstanceEventId":{
@@ -21892,6 +25601,47 @@
         }
       }
     },
+    "ModifyInstanceMetadataOptionsRequest":{
+      "type":"structure",
+      "required":["InstanceId"],
+      "members":{
+        "InstanceId":{
+          "shape":"InstanceId",
+          "documentation":"<p>The ID of the instance.</p>"
+        },
+        "HttpTokens":{
+          "shape":"HttpTokensState",
+          "documentation":"<p>The state of token usage for your instance metadata requests. If the parameter is not specified in the request, the default state is <code>optional</code>.</p> <p>If the state is <code>optional</code>, you can choose to retrieve instance metadata with or without a signed token header on your request. If you retrieve the IAM role credentials without a token, the version 1.0 role credentials are returned. If you retrieve the IAM role credentials using a valid signed token, the version 2.0 role credentials are returned.</p> <p>If the state is <code>required</code>, you must send a signed token header with any instance metadata retrieval requests. In this state, retrieving the IAM role credential always returns the version 2.0 credentials; the version 1.0 credentials are not available.</p>"
+        },
+        "HttpPutResponseHopLimit":{
+          "shape":"Integer",
+          "documentation":"<p>The desired HTTP PUT response hop limit for instance metadata requests. The larger the number, the further instance metadata requests can travel. If no parameter is specified, the existing state is maintained.</p> <p>Possible values: Integers from 1 to 64</p>"
+        },
+        "HttpEndpoint":{
+          "shape":"InstanceMetadataEndpointState",
+          "documentation":"<p>This parameter enables or disables the HTTP metadata endpoint on your instances. If the parameter is not specified, the existing state is maintained.</p> <note> <p>If you specify a value of <code>disabled</code>, you will not be able to access your instance metadata.</p> </note>"
+        },
+        "DryRun":{
+          "shape":"Boolean",
+          "documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>"
+        }
+      }
+    },
+    "ModifyInstanceMetadataOptionsResult":{
+      "type":"structure",
+      "members":{
+        "InstanceId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the instance.</p>",
+          "locationName":"instanceId"
+        },
+        "InstanceMetadataOptions":{
+          "shape":"InstanceMetadataOptionsResponse",
+          "documentation":"<p>The metadata options for the instance.</p>",
+          "locationName":"instanceMetadataOptions"
+        }
+      }
+    },
     "ModifyInstancePlacementRequest":{
       "type":"structure",
       "required":["InstanceId"],
@@ -21902,16 +25652,16 @@
           "locationName":"affinity"
         },
         "GroupName":{
-          "shape":"String",
+          "shape":"PlacementGroupName",
           "documentation":"<p>The name of the placement group in which to place the instance. For spread placement groups, the instance must have a tenancy of <code>default</code>. For cluster and partition placement groups, the instance must have a tenancy of <code>default</code> or <code>dedicated</code>.</p> <p>To remove an instance from a placement group, specify an empty string (\"\").</p>"
         },
         "HostId":{
-          "shape":"String",
+          "shape":"DedicatedHostId",
           "documentation":"<p>The ID of the Dedicated Host with which to associate the instance.</p>",
           "locationName":"hostId"
         },
         "InstanceId":{
-          "shape":"String",
+          "shape":"InstanceId",
           "documentation":"<p>The ID of the instance that you are modifying.</p>",
           "locationName":"instanceId"
         },
@@ -21923,6 +25673,10 @@
         "PartitionNumber":{
           "shape":"Integer",
           "documentation":"<p>Reserved for future use.</p>"
+        },
+        "HostResourceGroupArn":{
+          "shape":"String",
+          "documentation":"<p>The ARN of the host resource group in which to place the instance.</p>"
         }
       }
     },
@@ -21948,7 +25702,7 @@
           "documentation":"<p>Unique, case-sensitive identifier you provide to ensure the idempotency of the request. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/Run_Instance_Idempotency.html\">Ensuring Idempotency</a>.</p> <p>Constraint: Maximum 128 ASCII characters.</p>"
         },
         "LaunchTemplateId":{
-          "shape":"String",
+          "shape":"LaunchTemplateId",
           "documentation":"<p>The ID of the launch template. You must specify either the launch template ID or launch template name in the request.</p>"
         },
         "LaunchTemplateName":{
@@ -21997,7 +25751,7 @@
           "locationName":"SecurityGroupId"
         },
         "NetworkInterfaceId":{
-          "shape":"String",
+          "shape":"NetworkInterfaceId",
           "documentation":"<p>The ID of the network interface.</p>",
           "locationName":"networkInterfaceId"
         },
@@ -22067,7 +25821,7 @@
           "documentation":"<p>The type of operation to perform to the attribute.</p>"
         },
         "SnapshotId":{
-          "shape":"String",
+          "shape":"SnapshotId",
           "documentation":"<p>The ID of the snapshot.</p>"
         },
         "UserIds":{
@@ -22080,8 +25834,7 @@
           "documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>",
           "locationName":"dryRun"
         }
-      },
-      "documentation":"<p>Contains the parameters for ModifySnapshotAttribute.</p>"
+      }
     },
     "ModifySpotFleetRequestRequest":{
       "type":"structure",
@@ -22093,7 +25846,7 @@
           "locationName":"excessCapacityTerminationPolicy"
         },
         "SpotFleetRequestId":{
-          "shape":"String",
+          "shape":"SpotFleetRequestId",
           "documentation":"<p>The ID of the Spot Fleet request.</p>",
           "locationName":"spotFleetRequestId"
         },
@@ -22133,7 +25886,7 @@
           "documentation":"<p>Specify <code>true</code> to indicate that ENIs attached to instances created in the specified subnet should be assigned a public IPv4 address.</p>"
         },
         "SubnetId":{
-          "shape":"String",
+          "shape":"SubnetId",
           "documentation":"<p>The ID of the subnet.</p>",
           "locationName":"subnetId"
         }
@@ -22144,7 +25897,7 @@
       "required":["TrafficMirrorFilterId"],
       "members":{
         "TrafficMirrorFilterId":{
-          "shape":"String",
+          "shape":"TrafficMirrorFilterId",
           "documentation":"<p>The ID of the Traffic Mirror filter.</p>"
         },
         "AddNetworkServices":{
@@ -22178,7 +25931,7 @@
       "required":["TrafficMirrorFilterRuleId"],
       "members":{
         "TrafficMirrorFilterRuleId":{
-          "shape":"String",
+          "shape":"TrafficMirrorFilterRuleId",
           "documentation":"<p>The ID of the Traffic Mirror rule.</p>"
         },
         "TrafficDirection":{
@@ -22243,15 +25996,15 @@
       "required":["TrafficMirrorSessionId"],
       "members":{
         "TrafficMirrorSessionId":{
-          "shape":"String",
+          "shape":"TrafficMirrorSessionId",
           "documentation":"<p>The ID of the Traffic Mirror session.</p>"
         },
         "TrafficMirrorTargetId":{
-          "shape":"String",
+          "shape":"TrafficMirrorTargetId",
           "documentation":"<p>The Traffic Mirror target. The target must be in the same VPC as the source, or have a VPC peering connection with the source.</p>"
         },
         "TrafficMirrorFilterId":{
-          "shape":"String",
+          "shape":"TrafficMirrorFilterId",
           "documentation":"<p>The ID of the Traffic Mirror filter.</p>"
         },
         "PacketLength":{
@@ -22296,20 +26049,20 @@
       "required":["TransitGatewayAttachmentId"],
       "members":{
         "TransitGatewayAttachmentId":{
-          "shape":"String",
+          "shape":"TransitGatewayAttachmentId",
           "documentation":"<p>The ID of the attachment.</p>"
         },
         "AddSubnetIds":{
-          "shape":"ValueStringList",
+          "shape":"TransitGatewaySubnetIdList",
           "documentation":"<p>The IDs of one or more subnets to add. You can specify at most one subnet per Availability Zone.</p>"
         },
         "RemoveSubnetIds":{
-          "shape":"ValueStringList",
+          "shape":"TransitGatewaySubnetIdList",
           "documentation":"<p>The IDs of one or more subnets to remove.</p>"
         },
         "Options":{
           "shape":"ModifyTransitGatewayVpcAttachmentRequestOptions",
-          "documentation":"<p>The new VPC attachment options.</p>"
+          "documentation":"<p>The new VPC attachment options.</p> <note> <p>You cannot modify the IPv6 options.</p> </note>"
         },
         "DryRun":{
           "shape":"Boolean",
@@ -22350,7 +26103,7 @@
           "documentation":"<p>Indicates whether the volume should be auto-enabled for I/O operations.</p>"
         },
         "VolumeId":{
-          "shape":"String",
+          "shape":"VolumeId",
           "documentation":"<p>The ID of the volume.</p>"
         },
         "DryRun":{
@@ -22358,8 +26111,7 @@
           "documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>",
           "locationName":"dryRun"
         }
-      },
-      "documentation":"<p>Contains the parameters for ModifyVolumeAttribute.</p>"
+      }
     },
     "ModifyVolumeRequest":{
       "type":"structure",
@@ -22370,7 +26122,7 @@
           "documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>"
         },
         "VolumeId":{
-          "shape":"String",
+          "shape":"VolumeId",
           "documentation":"<p>The ID of the volume.</p>"
         },
         "Size":{
@@ -22410,7 +26162,7 @@
           "documentation":"<p>Indicates whether the DNS resolution is supported for the VPC. If enabled, queries to the Amazon provided DNS server at the 169.254.169.253 IP address, or the reserved IP address at the base of the VPC network range \"plus two\" succeed. If disabled, the Amazon provided DNS service in the VPC that resolves public DNS hostnames to IP addresses is not enabled.</p> <p>You cannot modify the DNS resolution and DNS hostnames attributes in the same request. Use separate requests for each attribute.</p>"
         },
         "VpcId":{
-          "shape":"String",
+          "shape":"VpcId",
           "documentation":"<p>The ID of the VPC.</p>",
           "locationName":"vpcId"
         }
@@ -22425,7 +26177,7 @@
           "documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>"
         },
         "ConnectionNotificationId":{
-          "shape":"String",
+          "shape":"ConnectionNotificationId",
           "documentation":"<p>The ID of the notification.</p>"
         },
         "ConnectionNotificationArn":{
@@ -22457,7 +26209,7 @@
           "documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>"
         },
         "VpcEndpointId":{
-          "shape":"String",
+          "shape":"VpcEndpointId",
           "documentation":"<p>The ID of the endpoint.</p>"
         },
         "ResetPolicy":{
@@ -22469,38 +26221,38 @@
           "documentation":"<p>A policy to attach to the endpoint that controls access to the service. The policy must be in valid JSON format.</p>"
         },
         "AddRouteTableIds":{
-          "shape":"ValueStringList",
+          "shape":"VpcEndpointRouteTableIdList",
           "documentation":"<p>(Gateway endpoint) One or more route tables IDs to associate with the endpoint.</p>",
           "locationName":"AddRouteTableId"
         },
         "RemoveRouteTableIds":{
-          "shape":"ValueStringList",
+          "shape":"VpcEndpointRouteTableIdList",
           "documentation":"<p>(Gateway endpoint) One or more route table IDs to disassociate from the endpoint.</p>",
           "locationName":"RemoveRouteTableId"
         },
         "AddSubnetIds":{
-          "shape":"ValueStringList",
+          "shape":"VpcEndpointSubnetIdList",
           "documentation":"<p>(Interface endpoint) One or more subnet IDs in which to serve the endpoint.</p>",
           "locationName":"AddSubnetId"
         },
         "RemoveSubnetIds":{
-          "shape":"ValueStringList",
+          "shape":"VpcEndpointSubnetIdList",
           "documentation":"<p>(Interface endpoint) One or more subnets IDs in which to remove the endpoint.</p>",
           "locationName":"RemoveSubnetId"
         },
         "AddSecurityGroupIds":{
-          "shape":"ValueStringList",
+          "shape":"VpcEndpointSecurityGroupIdList",
           "documentation":"<p>(Interface endpoint) One or more security group IDs to associate with the network interface.</p>",
           "locationName":"AddSecurityGroupId"
         },
         "RemoveSecurityGroupIds":{
-          "shape":"ValueStringList",
+          "shape":"VpcEndpointSecurityGroupIdList",
           "documentation":"<p>(Interface endpoint) One or more security group IDs to disassociate from the network interface.</p>",
           "locationName":"RemoveSecurityGroupId"
         },
         "PrivateDnsEnabled":{
           "shape":"Boolean",
-          "documentation":"<p>(Interface endpoint) Indicate whether a private hosted zone is associated with the VPC.</p>"
+          "documentation":"<p>(Interface endpoint) Indicates whether a private hosted zone is associated with the VPC.</p>"
         }
       },
       "documentation":"<p>Contains the parameters for ModifyVpcEndpoint.</p>"
@@ -22524,12 +26276,20 @@
           "documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>"
         },
         "ServiceId":{
-          "shape":"String",
+          "shape":"VpcEndpointServiceId",
           "documentation":"<p>The ID of the service.</p>"
         },
+        "PrivateDnsName":{
+          "shape":"String",
+          "documentation":"<p>The private DNS name to assign to the endpoint service.</p>"
+        },
+        "RemovePrivateDnsName":{
+          "shape":"Boolean",
+          "documentation":"<p>Removes the private DNS name of the endpoint service.</p>"
+        },
         "AcceptanceRequired":{
           "shape":"Boolean",
-          "documentation":"<p>Indicate whether requests to create an endpoint to your service must be accepted.</p>"
+          "documentation":"<p>Indicates whether requests to create an endpoint to your service must be accepted.</p>"
         },
         "AddNetworkLoadBalancerArns":{
           "shape":"ValueStringList",
@@ -22562,7 +26322,7 @@
           "documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>"
         },
         "ServiceId":{
-          "shape":"String",
+          "shape":"VpcEndpointServiceId",
           "documentation":"<p>The ID of the service.</p>"
         },
         "AddAllowedPrincipals":{
@@ -22602,7 +26362,7 @@
           "documentation":"<p>The VPC peering connection options for the requester VPC.</p>"
         },
         "VpcPeeringConnectionId":{
-          "shape":"String",
+          "shape":"VpcPeeringConnectionId",
           "documentation":"<p>The ID of the VPC peering connection.</p>"
         }
       }
@@ -22630,7 +26390,7 @@
       ],
       "members":{
         "VpcId":{
-          "shape":"String",
+          "shape":"VpcId",
           "documentation":"<p>The ID of the VPC.</p>"
         },
         "InstanceTenancy":{
@@ -22658,19 +26418,19 @@
       "required":["VpnConnectionId"],
       "members":{
         "VpnConnectionId":{
-          "shape":"String",
+          "shape":"VpnConnectionId",
           "documentation":"<p>The ID of the VPN connection.</p>"
         },
         "TransitGatewayId":{
-          "shape":"String",
+          "shape":"TransitGatewayId",
           "documentation":"<p>The ID of the transit gateway.</p>"
         },
         "CustomerGatewayId":{
-          "shape":"String",
+          "shape":"CustomerGatewayId",
           "documentation":"<p>The ID of the customer gateway at your end of the VPN connection.</p>"
         },
         "VpnGatewayId":{
-          "shape":"String",
+          "shape":"VpnGatewayId",
           "documentation":"<p>The ID of the virtual private gateway at the AWS side of the VPN connection.</p>"
         },
         "DryRun":{
@@ -22696,7 +26456,7 @@
       ],
       "members":{
         "VpnConnectionId":{
-          "shape":"String",
+          "shape":"VpnConnectionId",
           "documentation":"<p>The ID of the AWS Site-to-Site VPN connection.</p>"
         },
         "VpnTunnelOutsideIpAddress":{
@@ -22727,7 +26487,7 @@
       ],
       "members":{
         "VpnConnectionId":{
-          "shape":"String",
+          "shape":"VpnConnectionId",
           "documentation":"<p>The ID of the AWS Site-to-Site VPN connection.</p>"
         },
         "VpnTunnelOutsideIpAddress":{
@@ -22933,6 +26693,13 @@
         "locationName":"item"
       }
     },
+    "MulticastSupportValue":{
+      "type":"string",
+      "enum":[
+        "enable",
+        "disable"
+      ]
+    },
     "NatGateway":{
       "type":"structure",
       "members":{
@@ -23027,6 +26794,14 @@
         "locationName":"item"
       }
     },
+    "NatGatewayId":{"type":"string"},
+    "NatGatewayIdStringList":{
+      "type":"list",
+      "member":{
+        "shape":"NatGatewayId",
+        "locationName":"item"
+      }
+    },
     "NatGatewayList":{
       "type":"list",
       "member":{
@@ -23106,6 +26881,7 @@
       },
       "documentation":"<p>Describes an association between a network ACL and a subnet.</p>"
     },
+    "NetworkAclAssociationId":{"type":"string"},
     "NetworkAclAssociationList":{
       "type":"list",
       "member":{
@@ -23166,6 +26942,14 @@
         "locationName":"item"
       }
     },
+    "NetworkAclId":{"type":"string"},
+    "NetworkAclIdStringList":{
+      "type":"list",
+      "member":{
+        "shape":"NetworkAclId",
+        "locationName":"item"
+      }
+    },
     "NetworkAclList":{
       "type":"list",
       "member":{
@@ -23173,6 +26957,42 @@
         "locationName":"item"
       }
     },
+    "NetworkInfo":{
+      "type":"structure",
+      "members":{
+        "NetworkPerformance":{
+          "shape":"NetworkPerformance",
+          "documentation":"<p>Describes the network performance.</p>",
+          "locationName":"networkPerformance"
+        },
+        "MaximumNetworkInterfaces":{
+          "shape":"MaxNetworkInterfaces",
+          "documentation":"<p>The maximum number of network interfaces for the instance type.</p>",
+          "locationName":"maximumNetworkInterfaces"
+        },
+        "Ipv4AddressesPerInterface":{
+          "shape":"MaxIpv4AddrPerInterface",
+          "documentation":"<p>The maximum number of IPv4 addresses per network interface.</p>",
+          "locationName":"ipv4AddressesPerInterface"
+        },
+        "Ipv6AddressesPerInterface":{
+          "shape":"MaxIpv6AddrPerInterface",
+          "documentation":"<p>The maximum number of IPv6 addresses per network interface.</p>",
+          "locationName":"ipv6AddressesPerInterface"
+        },
+        "Ipv6Supported":{
+          "shape":"Ipv6Flag",
+          "documentation":"<p>Indicates whether IPv6 is supported.</p>",
+          "locationName":"ipv6Supported"
+        },
+        "EnaSupport":{
+          "shape":"EnaSupport",
+          "documentation":"<p>Indicates whether Elastic Network Adapter (ENA) is supported.</p>",
+          "locationName":"enaSupport"
+        }
+      },
+      "documentation":"<p>Describes the networking features of the instance type.</p>"
+    },
     "NetworkInterface":{
       "type":"structure",
       "members":{
@@ -23221,6 +27041,11 @@
           "documentation":"<p>The ID of the network interface.</p>",
           "locationName":"networkInterfaceId"
         },
+        "OutpostArn":{
+          "shape":"String",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the Outpost.</p>",
+          "locationName":"outpostArn"
+        },
         "OwnerId":{
           "shape":"String",
           "documentation":"<p>The AWS account ID of the owner of the network interface.</p>",
@@ -23355,7 +27180,7 @@
       "type":"structure",
       "members":{
         "AttachmentId":{
-          "shape":"String",
+          "shape":"NetworkInterfaceAttachmentId",
           "documentation":"<p>The ID of the network interface attachment.</p>",
           "locationName":"attachmentId"
         },
@@ -23367,6 +27192,7 @@
       },
       "documentation":"<p>Describes an attachment change.</p>"
     },
+    "NetworkInterfaceAttachmentId":{"type":"string"},
     "NetworkInterfaceAttribute":{
       "type":"string",
       "enum":[
@@ -23380,10 +27206,11 @@
       "type":"string",
       "enum":["efa"]
     },
+    "NetworkInterfaceId":{"type":"string"},
     "NetworkInterfaceIdList":{
       "type":"list",
       "member":{
-        "shape":"String",
+        "shape":"NetworkInterfaceId",
         "locationName":"item"
       }
     },
@@ -23448,9 +27275,10 @@
       },
       "documentation":"<p>Describes a permission for a network interface.</p>"
     },
+    "NetworkInterfacePermissionId":{"type":"string"},
     "NetworkInterfacePermissionIdList":{
       "type":"list",
-      "member":{"shape":"String"}
+      "member":{"shape":"NetworkInterfacePermissionId"}
     },
     "NetworkInterfacePermissionList":{
       "type":"list",
@@ -23535,6 +27363,7 @@
         "efa"
       ]
     },
+    "NetworkPerformance":{"type":"string"},
     "NewDhcpConfiguration":{
       "type":"structure",
       "members":{
@@ -23577,6 +27406,7 @@
         "convertible"
       ]
     },
+    "OfferingId":{"type":"string"},
     "OfferingTypeValues":{
       "type":"string",
       "enum":[
@@ -23603,14 +27433,19 @@
           "documentation":"<p>The order of the launch template overrides to use in fulfilling On-Demand capacity. If you specify <code>lowest-price</code>, EC2 Fleet uses price to determine the order, launching the lowest price first. If you specify <code>prioritized</code>, EC2 Fleet uses the priority that you assigned to each launch template override, launching the highest priority first. If you do not specify a value, EC2 Fleet defaults to <code>lowest-price</code>.</p>",
           "locationName":"allocationStrategy"
         },
+        "CapacityReservationOptions":{
+          "shape":"CapacityReservationOptions",
+          "documentation":"<p>The strategy for using unused Capacity Reservations for fulfilling On-Demand capacity. Supported only for fleets of type <code>instant</code>.</p>",
+          "locationName":"capacityReservationOptions"
+        },
         "SingleInstanceType":{
           "shape":"Boolean",
-          "documentation":"<p>Indicates that the fleet uses a single instance type to launch all On-Demand Instances in the fleet.</p>",
+          "documentation":"<p>Indicates that the fleet uses a single instance type to launch all On-Demand Instances in the fleet. Supported only for fleets of type <code>instant</code>.</p>",
           "locationName":"singleInstanceType"
         },
         "SingleAvailabilityZone":{
           "shape":"Boolean",
-          "documentation":"<p>Indicates that the fleet launches all On-Demand Instances into a single Availability Zone.</p>",
+          "documentation":"<p>Indicates that the fleet launches all On-Demand Instances into a single Availability Zone. Supported only for fleets of type <code>instant</code>.</p>",
           "locationName":"singleAvailabilityZone"
         },
         "MinTargetCapacity":{
@@ -23633,13 +27468,17 @@
           "shape":"FleetOnDemandAllocationStrategy",
           "documentation":"<p>The order of the launch template overrides to use in fulfilling On-Demand capacity. If you specify <code>lowest-price</code>, EC2 Fleet uses price to determine the order, launching the lowest price first. If you specify <code>prioritized</code>, EC2 Fleet uses the priority that you assigned to each launch template override, launching the highest priority first. If you do not specify a value, EC2 Fleet defaults to <code>lowest-price</code>.</p>"
         },
+        "CapacityReservationOptions":{
+          "shape":"CapacityReservationOptionsRequest",
+          "documentation":"<p>The strategy for using unused Capacity Reservations for fulfilling On-Demand capacity. Supported only for fleets of type <code>instant</code>.</p>"
+        },
         "SingleInstanceType":{
           "shape":"Boolean",
-          "documentation":"<p>Indicates that the fleet uses a single instance type to launch all On-Demand Instances in the fleet.</p>"
+          "documentation":"<p>Indicates that the fleet uses a single instance type to launch all On-Demand Instances in the fleet. Supported only for fleets of type <code>instant</code>.</p>"
         },
         "SingleAvailabilityZone":{
           "shape":"Boolean",
-          "documentation":"<p>Indicates that the fleet launches all On-Demand Instances into a single Availability Zone.</p>"
+          "documentation":"<p>Indicates that the fleet launches all On-Demand Instances into a single Availability Zone. Supported only for fleets of type <code>instant</code>.</p>"
         },
         "MinTargetCapacity":{
           "shape":"Integer",
@@ -23696,6 +27535,22 @@
       },
       "documentation":"<p>Describes the data that identifies an Amazon FPGA image (AFI) on the PCI bus.</p>"
     },
+    "PeeringAttachmentStatus":{
+      "type":"structure",
+      "members":{
+        "Code":{
+          "shape":"String",
+          "documentation":"<p>The status code.</p>",
+          "locationName":"code"
+        },
+        "Message":{
+          "shape":"String",
+          "documentation":"<p>The status message, if applicable.</p>",
+          "locationName":"message"
+        }
+      },
+      "documentation":"<p>The status of the transit gateway peering attachment.</p>"
+    },
     "PeeringConnectionOptions":{
       "type":"structure",
       "members":{
@@ -23735,6 +27590,27 @@
       },
       "documentation":"<p>The VPC peering connection options.</p>"
     },
+    "PeeringTgwInfo":{
+      "type":"structure",
+      "members":{
+        "TransitGatewayId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the transit gateway.</p>",
+          "locationName":"transitGatewayId"
+        },
+        "OwnerId":{
+          "shape":"String",
+          "documentation":"<p>The AWS account ID of the owner of the transit gateway.</p>",
+          "locationName":"ownerId"
+        },
+        "Region":{
+          "shape":"String",
+          "documentation":"<p>The Region of the transit gateway.</p>",
+          "locationName":"region"
+        }
+      },
+      "documentation":"<p>Information about the transit gateway in the peering attachment.</p>"
+    },
     "PermissionGroup":{
       "type":"string",
       "enum":["all"]
@@ -23954,12 +27830,12 @@
       "members":{
         "AvailabilityZone":{
           "shape":"String",
-          "documentation":"<p>The Availability Zone of the instance.</p> <p>If not specified, an Availability Zone will be automatically chosen for you based on the load balancing criteria for the Region.</p>",
+          "documentation":"<p>The Availability Zone of the instance.</p> <p>If not specified, an Availability Zone will be automatically chosen for you based on the load balancing criteria for the Region.</p> <p>This parameter is not supported by .</p>",
           "locationName":"availabilityZone"
         },
         "Affinity":{
           "shape":"String",
-          "documentation":"<p>The affinity setting for the instance on the Dedicated Host. This parameter is not supported for the <a>ImportInstance</a> command.</p>",
+          "documentation":"<p>The affinity setting for the instance on the Dedicated Host. This parameter is not supported for the <a>ImportInstance</a> command.</p> <p>This parameter is not supported by .</p>",
           "locationName":"affinity"
         },
         "GroupName":{
@@ -23969,23 +27845,28 @@
         },
         "PartitionNumber":{
           "shape":"Integer",
-          "documentation":"<p>The number of the partition the instance is in. Valid only if the placement group strategy is set to <code>partition</code>.</p>",
+          "documentation":"<p>The number of the partition the instance is in. Valid only if the placement group strategy is set to <code>partition</code>.</p> <p>This parameter is not supported by .</p>",
           "locationName":"partitionNumber"
         },
         "HostId":{
           "shape":"String",
-          "documentation":"<p>The ID of the Dedicated Host on which the instance resides. This parameter is not supported for the <a>ImportInstance</a> command.</p>",
+          "documentation":"<p>The ID of the Dedicated Host on which the instance resides. This parameter is not supported for the <a>ImportInstance</a> command.</p> <p>This parameter is not supported by .</p>",
           "locationName":"hostId"
         },
         "Tenancy":{
           "shape":"Tenancy",
-          "documentation":"<p>The tenancy of the instance (if the instance is running in a VPC). An instance with a tenancy of <code>dedicated</code> runs on single-tenant hardware. The <code>host</code> tenancy is not supported for the <a>ImportInstance</a> command.</p>",
+          "documentation":"<p>The tenancy of the instance (if the instance is running in a VPC). An instance with a tenancy of <code>dedicated</code> runs on single-tenant hardware. The <code>host</code> tenancy is not supported for the <a>ImportInstance</a> command.</p> <p>This parameter is not supported by .</p>",
           "locationName":"tenancy"
         },
         "SpreadDomain":{
           "shape":"String",
-          "documentation":"<p>Reserved for future use.</p>",
+          "documentation":"<p>Reserved for future use.</p> <p>This parameter is not supported by .</p>",
           "locationName":"spreadDomain"
+        },
+        "HostResourceGroupArn":{
+          "shape":"String",
+          "documentation":"<p>The ARN of the host resource group in which to launch the instances. If you specify a host resource group ARN, omit the <b>Tenancy</b> parameter or set it to <code>host</code>.</p> <p>This parameter is not supported by .</p>",
+          "locationName":"hostResourceGroupArn"
         }
       },
       "documentation":"<p>Describes the placement of an instance.</p>"
@@ -24012,10 +27893,39 @@
           "shape":"Integer",
           "documentation":"<p>The number of partitions. Valid only if <b>strategy</b> is set to <code>partition</code>.</p>",
           "locationName":"partitionCount"
+        },
+        "GroupId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the placement group.</p>",
+          "locationName":"groupId"
+        },
+        "Tags":{
+          "shape":"TagList",
+          "documentation":"<p>Any tags applied to the placement group.</p>",
+          "locationName":"tagSet"
         }
       },
       "documentation":"<p>Describes a placement group.</p>"
     },
+    "PlacementGroupId":{"type":"string"},
+    "PlacementGroupIdStringList":{
+      "type":"list",
+      "member":{
+        "shape":"PlacementGroupId",
+        "locationName":"GroupId"
+      }
+    },
+    "PlacementGroupInfo":{
+      "type":"structure",
+      "members":{
+        "SupportedStrategies":{
+          "shape":"PlacementGroupStrategyList",
+          "documentation":"<p>A list of supported placement groups types.</p>",
+          "locationName":"supportedStrategies"
+        }
+      },
+      "documentation":"<p>Describes the placement group support of the instance type.</p>"
+    },
     "PlacementGroupList":{
       "type":"list",
       "member":{
@@ -24023,6 +27933,7 @@
         "locationName":"item"
       }
     },
+    "PlacementGroupName":{"type":"string"},
     "PlacementGroupState":{
       "type":"string",
       "enum":[
@@ -24032,16 +27943,31 @@
         "deleted"
       ]
     },
+    "PlacementGroupStrategy":{
+      "type":"string",
+      "enum":[
+        "cluster",
+        "partition",
+        "spread"
+      ]
+    },
+    "PlacementGroupStrategyList":{
+      "type":"list",
+      "member":{
+        "shape":"PlacementGroupStrategy",
+        "locationName":"item"
+      }
+    },
     "PlacementGroupStringList":{
       "type":"list",
-      "member":{"shape":"String"}
+      "member":{"shape":"PlacementGroupName"}
     },
     "PlacementResponse":{
       "type":"structure",
       "members":{
         "GroupName":{
           "shape":"String",
-          "documentation":"<p>The name of the placement group the instance is in.</p>",
+          "documentation":"<p>The name of the placement group that the instance is in.</p>",
           "locationName":"groupName"
         }
       },
@@ -24059,6 +27985,24 @@
       "type":"string",
       "enum":["Windows"]
     },
+    "PoolCidrBlock":{
+      "type":"structure",
+      "members":{
+        "Cidr":{
+          "shape":"String",
+          "documentation":"<p>The CIDR block.</p>",
+          "locationName":"poolCidrBlock"
+        }
+      },
+      "documentation":"<p>Describes a CIDR block for an address pool.</p>"
+    },
+    "PoolCidrBlocksSet":{
+      "type":"list",
+      "member":{
+        "shape":"PoolCidrBlock",
+        "locationName":"item"
+      }
+    },
     "PoolMaxResults":{
       "type":"integer",
       "max":10,
@@ -24131,6 +28075,14 @@
         "locationName":"item"
       }
     },
+    "PrefixListResourceId":{"type":"string"},
+    "PrefixListResourceIdStringList":{
+      "type":"list",
+      "member":{
+        "shape":"PrefixListResourceId",
+        "locationName":"item"
+      }
+    },
     "PrefixListSet":{
       "type":"list",
       "member":{
@@ -24256,6 +28208,32 @@
         "Role"
       ]
     },
+    "PrivateDnsNameConfiguration":{
+      "type":"structure",
+      "members":{
+        "State":{
+          "shape":"DnsNameState",
+          "documentation":"<p>The verification state of the VPC endpoint service.</p> <p>&gt;Consumers of the endpoint service can use the private name only when the state is <code>verified</code>.</p>",
+          "locationName":"state"
+        },
+        "Type":{
+          "shape":"String",
+          "documentation":"<p>The endpoint service verification type, for example TXT.</p>",
+          "locationName":"type"
+        },
+        "Value":{
+          "shape":"String",
+          "documentation":"<p>The value the service provider adds to the private DNS name domain record before verification.</p>",
+          "locationName":"value"
+        },
+        "Name":{
+          "shape":"String",
+          "documentation":"<p>The name of the record subdomain the service provider needs to create. The service provider adds the <code>value</code> text to the <code>name</code>.</p>",
+          "locationName":"name"
+        }
+      },
+      "documentation":"<p>Information about the private DNS name for the service endpoint. For more information about these parameters, see <a href=\"https://docs.aws.amazon.com/vpc/latest/userguide/ndpoint-services-dns-validation.html\">VPC Endpoint Service Private DNS Name Verification</a> in the <i>Amazon Virtual Private Cloud User Guide</i>.</p>"
+    },
     "PrivateIpAddressConfigSet":{
       "type":"list",
       "member":{
@@ -24293,6 +28271,23 @@
         "locationName":"PrivateIpAddress"
       }
     },
+    "ProcessorInfo":{
+      "type":"structure",
+      "members":{
+        "SupportedArchitectures":{
+          "shape":"ArchitectureTypeList",
+          "documentation":"<p>A list of architectures supported by the instance type.</p>",
+          "locationName":"supportedArchitectures"
+        },
+        "SustainedClockSpeedInGhz":{
+          "shape":"ProcessorSustainedClockSpeed",
+          "documentation":"<p>The speed of the processor, in GHz.</p>",
+          "locationName":"sustainedClockSpeedInGhz"
+        }
+      },
+      "documentation":"<p>Describes the processor used by the instance type.</p>"
+    },
+    "ProcessorSustainedClockSpeed":{"type":"double"},
     "ProductCode":{
       "type":"structure",
       "members":{
@@ -24358,12 +28353,16 @@
       "members":{
         "Cidr":{
           "shape":"String",
-          "documentation":"<p>The public IPv4 address range, in CIDR notation. The most specific prefix that you can specify is /24. The address range cannot overlap with another address range that you've brought to this or another Region.</p>"
+          "documentation":"<p>The public IPv4 or IPv6 address range, in CIDR notation. The most specific IPv4 prefix that you can specify is /24. The most specific IPv6 prefix you can specify is /56. The address range cannot overlap with another address range that you've brought to this or another Region.</p>"
         },
         "CidrAuthorizationContext":{
           "shape":"CidrAuthorizationContext",
           "documentation":"<p>A signed document that proves that you are authorized to bring the specified IP address range to Amazon using BYOIP.</p>"
         },
+        "PubliclyAdvertisable":{
+          "shape":"Boolean",
+          "documentation":"<p>(IPv6 only) Indicate whether the address range will be publicly advertised to the internet.</p> <p>Default: true</p>"
+        },
         "Description":{
           "shape":"String",
           "documentation":"<p>A description for the address range and the address pool.</p>"
@@ -24379,7 +28378,7 @@
       "members":{
         "ByoipCidr":{
           "shape":"ByoipCidr",
-          "documentation":"<p>Information about the address pool.</p>",
+          "documentation":"<p>Information about the address range.</p>",
           "locationName":"byoipCidr"
         }
       }
@@ -24427,7 +28426,7 @@
       "members":{
         "PoolId":{
           "shape":"String",
-          "documentation":"<p>The ID of the IPv4 address pool.</p>",
+          "documentation":"<p>The ID of the address pool.</p>",
           "locationName":"poolId"
         },
         "Description":{
@@ -24449,9 +28448,21 @@
           "shape":"Integer",
           "documentation":"<p>The total number of available addresses.</p>",
           "locationName":"totalAvailableAddressCount"
+        },
+        "Tags":{
+          "shape":"TagList",
+          "documentation":"<p>Any tags for the address pool.</p>",
+          "locationName":"tagSet"
         }
       },
-      "documentation":"<p>Describes an address pool.</p>"
+      "documentation":"<p>Describes an IPv4 address pool.</p>"
+    },
+    "PublicIpv4PoolIdStringList":{
+      "type":"list",
+      "member":{
+        "shape":"Ipv4PoolEc2Id",
+        "locationName":"item"
+      }
     },
     "PublicIpv4PoolRange":{
       "type":"structure",
@@ -24563,7 +28574,7 @@
           "documentation":"<p>The specified limit is checked against the total upfront cost of the reservation (calculated as the offering's upfront cost multiplied by the host count). If the total upfront cost is greater than the specified price limit, the request fails. This is used to ensure that the purchase does not exceed the expected upfront cost of the purchase. At this time, the only supported currency is <code>USD</code>. For example, to indicate a limit price of USD 100, specify 100.00.</p>"
         },
         "OfferingId":{
-          "shape":"String",
+          "shape":"OfferingId",
           "documentation":"<p>The ID of the offering.</p>"
         }
       }
@@ -24636,7 +28647,7 @@
           "documentation":"<p>The number of Reserved Instances to purchase.</p>"
         },
         "ReservedInstancesOfferingId":{
-          "shape":"String",
+          "shape":"ReservedInstancesOfferingId",
           "documentation":"<p>The ID of the Reserved Instance offering to purchase.</p>"
         },
         "DryRun":{
@@ -24651,7 +28662,7 @@
         },
         "PurchaseTime":{
           "shape":"DateTime",
-          "documentation":"<p>The time at which to purchase the Reserved Instance.</p>"
+          "documentation":"<p>The time at which to purchase the Reserved Instance, in UTC format (for example, <i>YYYY</i>-<i>MM</i>-<i>DD</i>T<i>HH</i>:<i>MM</i>:<i>SS</i>Z).</p>"
         }
       },
       "documentation":"<p>Contains the parameters for PurchaseReservedInstancesOffering.</p>"
@@ -24722,6 +28733,7 @@
         "Windows (Amazon VPC)"
       ]
     },
+    "RamdiskId":{"type":"string"},
     "ReasonCodesList":{
       "type":"list",
       "member":{
@@ -24841,7 +28853,7 @@
           "locationName":"enaSupport"
         },
         "KernelId":{
-          "shape":"String",
+          "shape":"KernelId",
           "documentation":"<p>The ID of the kernel.</p>",
           "locationName":"kernelId"
         },
@@ -24856,7 +28868,7 @@
           "locationName":"BillingProduct"
         },
         "RamdiskId":{
-          "shape":"String",
+          "shape":"RamdiskId",
           "documentation":"<p>The ID of the RAM disk.</p>",
           "locationName":"ramdiskId"
         },
@@ -24889,12 +28901,98 @@
       },
       "documentation":"<p>Contains the output of RegisterImage.</p>"
     },
+    "RegisterTransitGatewayMulticastGroupMembersRequest":{
+      "type":"structure",
+      "members":{
+        "TransitGatewayMulticastDomainId":{
+          "shape":"TransitGatewayMulticastDomainId",
+          "documentation":"<p>The ID of the transit gateway multicast domain.</p>"
+        },
+        "GroupIpAddress":{
+          "shape":"String",
+          "documentation":"<p>The IP address assigned to the transit gateway multicast group.</p>"
+        },
+        "NetworkInterfaceIds":{
+          "shape":"TransitGatewayNetworkInterfaceIdList",
+          "documentation":"<p>The group members' network interface IDs to register with the transit gateway multicast group.</p>"
+        },
+        "DryRun":{
+          "shape":"Boolean",
+          "documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>"
+        }
+      }
+    },
+    "RegisterTransitGatewayMulticastGroupMembersResult":{
+      "type":"structure",
+      "members":{
+        "RegisteredMulticastGroupMembers":{
+          "shape":"TransitGatewayMulticastRegisteredGroupMembers",
+          "documentation":"<p>Information about the registered transit gateway multicast group members.</p>",
+          "locationName":"registeredMulticastGroupMembers"
+        }
+      }
+    },
+    "RegisterTransitGatewayMulticastGroupSourcesRequest":{
+      "type":"structure",
+      "members":{
+        "TransitGatewayMulticastDomainId":{
+          "shape":"TransitGatewayMulticastDomainId",
+          "documentation":"<p>The ID of the transit gateway multicast domain.</p>"
+        },
+        "GroupIpAddress":{
+          "shape":"String",
+          "documentation":"<p>The IP address assigned to the transit gateway multicast group.</p>"
+        },
+        "NetworkInterfaceIds":{
+          "shape":"TransitGatewayNetworkInterfaceIdList",
+          "documentation":"<p>The group sources' network interface IDs to register with the transit gateway multicast group.</p>"
+        },
+        "DryRun":{
+          "shape":"Boolean",
+          "documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>"
+        }
+      }
+    },
+    "RegisterTransitGatewayMulticastGroupSourcesResult":{
+      "type":"structure",
+      "members":{
+        "RegisteredMulticastGroupSources":{
+          "shape":"TransitGatewayMulticastRegisteredGroupSources",
+          "documentation":"<p>Information about the transit gateway multicast group sources.</p>",
+          "locationName":"registeredMulticastGroupSources"
+        }
+      }
+    },
+    "RejectTransitGatewayPeeringAttachmentRequest":{
+      "type":"structure",
+      "required":["TransitGatewayAttachmentId"],
+      "members":{
+        "TransitGatewayAttachmentId":{
+          "shape":"TransitGatewayAttachmentId",
+          "documentation":"<p>The ID of the transit gateway peering attachment.</p>"
+        },
+        "DryRun":{
+          "shape":"Boolean",
+          "documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>"
+        }
+      }
+    },
+    "RejectTransitGatewayPeeringAttachmentResult":{
+      "type":"structure",
+      "members":{
+        "TransitGatewayPeeringAttachment":{
+          "shape":"TransitGatewayPeeringAttachment",
+          "documentation":"<p>The transit gateway peering attachment.</p>",
+          "locationName":"transitGatewayPeeringAttachment"
+        }
+      }
+    },
     "RejectTransitGatewayVpcAttachmentRequest":{
       "type":"structure",
       "required":["TransitGatewayAttachmentId"],
       "members":{
         "TransitGatewayAttachmentId":{
-          "shape":"String",
+          "shape":"TransitGatewayAttachmentId",
           "documentation":"<p>The ID of the attachment.</p>"
         },
         "DryRun":{
@@ -24925,11 +29023,11 @@
           "documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>"
         },
         "ServiceId":{
-          "shape":"String",
+          "shape":"VpcEndpointServiceId",
           "documentation":"<p>The ID of the service.</p>"
         },
         "VpcEndpointIds":{
-          "shape":"ValueStringList",
+          "shape":"VpcEndpointIdList",
           "documentation":"<p>The IDs of one or more VPC endpoints.</p>",
           "locationName":"VpcEndpointId"
         }
@@ -24955,7 +29053,7 @@
           "locationName":"dryRun"
         },
         "VpcPeeringConnectionId":{
-          "shape":"String",
+          "shape":"VpcPeeringConnectionId",
           "documentation":"<p>The ID of the VPC peering connection.</p>",
           "locationName":"vpcPeeringConnectionId"
         }
@@ -24975,13 +29073,17 @@
       "type":"structure",
       "members":{
         "AllocationId":{
-          "shape":"String",
+          "shape":"AllocationId",
           "documentation":"<p>[EC2-VPC] The allocation ID. Required for EC2-VPC.</p>"
         },
         "PublicIp":{
           "shape":"String",
           "documentation":"<p>[EC2-Classic] The Elastic IP address. Required for EC2-Classic.</p>"
         },
+        "NetworkBorderGroup":{
+          "shape":"String",
+          "documentation":"<p>The location that the IP address is released from.</p> <p>If you provide an incorrect network border group, you will receive an <code>InvalidAddress.NotFound</code> error. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/errors-overview.html\">Error Codes</a>.</p> <note> <p>You cannot use a network border group with EC2 Classic. If you attempt this operation on EC2 classic, you will receive an <code>InvalidParameterCombination</code> error. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/errors-overview.html\">Error Codes</a>.</p> </note>"
+        },
         "DryRun":{
           "shape":"Boolean",
           "documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>",
@@ -25027,7 +29129,7 @@
           "documentation":"<p>The IAM instance profile.</p>"
         },
         "AssociationId":{
-          "shape":"String",
+          "shape":"IamInstanceProfileAssociationId",
           "documentation":"<p>The ID of the existing IAM instance profile association.</p>"
         }
       }
@@ -25050,7 +29152,7 @@
       ],
       "members":{
         "AssociationId":{
-          "shape":"String",
+          "shape":"NetworkAclAssociationId",
           "documentation":"<p>The ID of the current association between the original network ACL and the subnet.</p>",
           "locationName":"associationId"
         },
@@ -25060,7 +29162,7 @@
           "locationName":"dryRun"
         },
         "NetworkAclId":{
-          "shape":"String",
+          "shape":"NetworkAclId",
           "documentation":"<p>The ID of the new network ACL to associate with the subnet.</p>",
           "locationName":"networkAclId"
         }
@@ -25112,7 +29214,7 @@
           "locationName":"ipv6CidrBlock"
         },
         "NetworkAclId":{
-          "shape":"String",
+          "shape":"NetworkAclId",
           "documentation":"<p>The ID of the ACL.</p>",
           "locationName":"networkAclId"
         },
@@ -25158,41 +29260,49 @@
           "locationName":"dryRun"
         },
         "EgressOnlyInternetGatewayId":{
-          "shape":"String",
+          "shape":"EgressOnlyInternetGatewayId",
           "documentation":"<p>[IPv6 traffic only] The ID of an egress-only internet gateway.</p>",
           "locationName":"egressOnlyInternetGatewayId"
         },
         "GatewayId":{
-          "shape":"String",
+          "shape":"RouteGatewayId",
           "documentation":"<p>The ID of an internet gateway or virtual private gateway.</p>",
           "locationName":"gatewayId"
         },
         "InstanceId":{
-          "shape":"String",
+          "shape":"InstanceId",
           "documentation":"<p>The ID of a NAT instance in your VPC.</p>",
           "locationName":"instanceId"
         },
+        "LocalTarget":{
+          "shape":"Boolean",
+          "documentation":"<p>Specifies whether to reset the local route to its default target (<code>local</code>).</p>"
+        },
         "NatGatewayId":{
-          "shape":"String",
+          "shape":"NatGatewayId",
           "documentation":"<p>[IPv4 traffic only] The ID of a NAT gateway.</p>",
           "locationName":"natGatewayId"
         },
         "TransitGatewayId":{
-          "shape":"String",
+          "shape":"TransitGatewayId",
           "documentation":"<p>The ID of a transit gateway.</p>"
         },
+        "LocalGatewayId":{
+          "shape":"LocalGatewayId",
+          "documentation":"<p>The ID of the local gateway.</p>"
+        },
         "NetworkInterfaceId":{
-          "shape":"String",
+          "shape":"NetworkInterfaceId",
           "documentation":"<p>The ID of a network interface.</p>",
           "locationName":"networkInterfaceId"
         },
         "RouteTableId":{
-          "shape":"String",
+          "shape":"RouteTableId",
           "documentation":"<p>The ID of the route table.</p>",
           "locationName":"routeTableId"
         },
         "VpcPeeringConnectionId":{
-          "shape":"String",
+          "shape":"VpcPeeringConnectionId",
           "documentation":"<p>The ID of a VPC peering connection.</p>",
           "locationName":"vpcPeeringConnectionId"
         }
@@ -25206,7 +29316,7 @@
       ],
       "members":{
         "AssociationId":{
-          "shape":"String",
+          "shape":"RouteTableAssociationId",
           "documentation":"<p>The association ID.</p>",
           "locationName":"associationId"
         },
@@ -25216,7 +29326,7 @@
           "locationName":"dryRun"
         },
         "RouteTableId":{
-          "shape":"String",
+          "shape":"RouteTableId",
           "documentation":"<p>The ID of the new route table to associate with the subnet.</p>",
           "locationName":"routeTableId"
         }
@@ -25229,6 +29339,11 @@
           "shape":"String",
           "documentation":"<p>The ID of the new association.</p>",
           "locationName":"newAssociationId"
+        },
+        "AssociationState":{
+          "shape":"RouteTableAssociationState",
+          "documentation":"<p>The state of the association.</p>",
+          "locationName":"associationState"
         }
       }
     },
@@ -25244,11 +29359,11 @@
           "documentation":"<p>The CIDR range used for the destination match. Routing decisions are based on the most specific match.</p>"
         },
         "TransitGatewayRouteTableId":{
-          "shape":"String",
+          "shape":"TransitGatewayRouteTableId",
           "documentation":"<p>The ID of the route table.</p>"
         },
         "TransitGatewayAttachmentId":{
-          "shape":"String",
+          "shape":"TransitGatewayAttachmentId",
           "documentation":"<p>The ID of the attachment.</p>"
         },
         "Blackhole":{
@@ -25340,22 +29455,28 @@
     "RequestHostIdList":{
       "type":"list",
       "member":{
-        "shape":"String",
+        "shape":"DedicatedHostId",
         "locationName":"item"
       }
     },
     "RequestHostIdSet":{
       "type":"list",
       "member":{
-        "shape":"String",
+        "shape":"DedicatedHostId",
         "locationName":"item"
       }
     },
+    "RequestInstanceTypeList":{
+      "type":"list",
+      "member":{"shape":"InstanceType"},
+      "locationName":"InstanceType",
+      "max":100
+    },
     "RequestLaunchTemplateData":{
       "type":"structure",
       "members":{
         "KernelId":{
-          "shape":"String",
+          "shape":"KernelId",
           "documentation":"<p>The ID of the kernel.</p> <important> <p>We recommend that you use PV-GRUB instead of kernels and RAM disks. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/UserProvidedkernels.html\">User Provided Kernels</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>.</p> </important>"
         },
         "EbsOptimized":{
@@ -25368,7 +29489,7 @@
         },
         "BlockDeviceMappings":{
           "shape":"LaunchTemplateBlockDeviceMappingRequestList",
-          "documentation":"<p>The block device mapping.</p> <important> <p>Supplying both a snapshot ID and an encryption value as arguments for block-device mapping results in an error. This is because only blank volumes can be encrypted on start, and these are not created from a snapshot. If a snapshot is the basis for the volume, it contains data by definition and its encryption status cannot be changed using this action.</p> </important>",
+          "documentation":"<p>The block device mapping.</p>",
           "locationName":"BlockDeviceMapping"
         },
         "NetworkInterfaces":{
@@ -25377,7 +29498,7 @@
           "locationName":"NetworkInterface"
         },
         "ImageId":{
-          "shape":"String",
+          "shape":"ImageId",
           "documentation":"<p>The ID of the AMI.</p>"
         },
         "InstanceType":{
@@ -25385,7 +29506,7 @@
           "documentation":"<p>The instance type. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/instance-types.html\">Instance Types</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>.</p>"
         },
         "KeyName":{
-          "shape":"String",
+          "shape":"KeyPairName",
           "documentation":"<p>The name of the key pair. You can create a key pair using <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CreateKeyPair.html\">CreateKeyPair</a> or <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_ImportKeyPair.html\">ImportKeyPair</a>.</p> <important> <p>If you do not specify a key pair, you can't connect to the instance unless you choose an AMI that is configured to allow users another way to log in.</p> </important>"
         },
         "Monitoring":{
@@ -25397,7 +29518,7 @@
           "documentation":"<p>The placement for the instance.</p>"
         },
         "RamDiskId":{
-          "shape":"String",
+          "shape":"RamdiskId",
           "documentation":"<p>The ID of the RAM disk.</p> <important> <p>We recommend that you use PV-GRUB instead of kernels and RAM disks. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/UserProvidedkernels.html\">User Provided Kernels</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>.</p> </important>"
         },
         "DisableApiTermination":{
@@ -25460,7 +29581,11 @@
         },
         "HibernationOptions":{
           "shape":"LaunchTemplateHibernationOptionsRequest",
-          "documentation":"<p>Indicates whether an instance is enabled for hibernation. This parameter is valid only if the instance meets the <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Hibernate.html#hibernating-prerequisites\">hibernation prerequisites</a>. Hibernation is currently supported only for Amazon Linux. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Hibernate.html\">Hibernate Your Instance</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>.</p>"
+          "documentation":"<p>Indicates whether an instance is enabled for hibernation. This parameter is valid only if the instance meets the <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Hibernate.html#hibernating-prerequisites\">hibernation prerequisites</a>. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Hibernate.html\">Hibernate Your Instance</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>.</p>"
+        },
+        "MetadataOptions":{
+          "shape":"LaunchTemplateInstanceMetadataOptionsRequest",
+          "documentation":"<p>The metadata options for the instance. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-instance-metadata.html\">Instance Metadata and User Data</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>.</p>"
         }
       },
       "documentation":"<p>The information to include in the launch template.</p>"
@@ -25572,12 +29697,12 @@
       "type":"structure",
       "members":{
         "SecurityGroupIds":{
-          "shape":"ValueStringList",
+          "shape":"RequestSpotLaunchSpecificationSecurityGroupIdList",
           "documentation":"<p>One or more security group IDs.</p>",
           "locationName":"SecurityGroupId"
         },
         "SecurityGroups":{
-          "shape":"ValueStringList",
+          "shape":"RequestSpotLaunchSpecificationSecurityGroupList",
           "documentation":"<p>One or more security groups. When requesting instances in a VPC, you must specify the IDs of the security groups. When requesting instances in EC2-Classic, you can specify the names or the IDs of the security groups.</p>",
           "locationName":"SecurityGroup"
         },
@@ -25602,7 +29727,7 @@
           "locationName":"iamInstanceProfile"
         },
         "ImageId":{
-          "shape":"String",
+          "shape":"ImageId",
           "documentation":"<p>The ID of the AMI.</p>",
           "locationName":"imageId"
         },
@@ -25612,12 +29737,12 @@
           "locationName":"instanceType"
         },
         "KernelId":{
-          "shape":"String",
+          "shape":"KernelId",
           "documentation":"<p>The ID of the kernel.</p>",
           "locationName":"kernelId"
         },
         "KeyName":{
-          "shape":"String",
+          "shape":"KeyPairName",
           "documentation":"<p>The name of the key pair.</p>",
           "locationName":"keyName"
         },
@@ -25637,12 +29762,12 @@
           "locationName":"placement"
         },
         "RamdiskId":{
-          "shape":"String",
+          "shape":"RamdiskId",
           "documentation":"<p>The ID of the RAM disk.</p>",
           "locationName":"ramdiskId"
         },
         "SubnetId":{
-          "shape":"String",
+          "shape":"SubnetId",
           "documentation":"<p>The IDs of the subnets in which to launch the instance. To specify multiple subnets, separate them using commas; for example, \"subnet-1234abcdeexample1, subnet-0987cdef6example2\".</p>",
           "locationName":"subnetId"
         },
@@ -25654,6 +29779,20 @@
       },
       "documentation":"<p>Describes the launch specification for an instance.</p>"
     },
+    "RequestSpotLaunchSpecificationSecurityGroupIdList":{
+      "type":"list",
+      "member":{
+        "shape":"SecurityGroupId",
+        "locationName":"item"
+      }
+    },
+    "RequestSpotLaunchSpecificationSecurityGroupList":{
+      "type":"list",
+      "member":{
+        "shape":"SecurityGroupName",
+        "locationName":"item"
+      }
+    },
     "Reservation":{
       "type":"structure",
       "members":{
@@ -25685,6 +29824,7 @@
       },
       "documentation":"<p>Describes a reservation.</p>"
     },
+    "ReservationId":{"type":"string"},
     "ReservationList":{
       "type":"list",
       "member":{
@@ -25725,7 +29865,7 @@
     "ReservedInstanceIdSet":{
       "type":"list",
       "member":{
-        "shape":"String",
+        "shape":"ReservationId",
         "locationName":"ReservedInstanceId"
       }
     },
@@ -25927,7 +30067,7 @@
     "ReservedInstancesIdStringList":{
       "type":"list",
       "member":{
-        "shape":"String",
+        "shape":"ReservationId",
         "locationName":"ReservedInstancesId"
       }
     },
@@ -25994,6 +30134,7 @@
       },
       "documentation":"<p>Describes a Reserved Instance listing.</p>"
     },
+    "ReservedInstancesListingId":{"type":"string"},
     "ReservedInstancesListingList":{
       "type":"list",
       "member":{
@@ -26052,10 +30193,11 @@
       },
       "documentation":"<p>Describes a Reserved Instance modification.</p>"
     },
+    "ReservedInstancesModificationId":{"type":"string"},
     "ReservedInstancesModificationIdStringList":{
       "type":"list",
       "member":{
-        "shape":"String",
+        "shape":"ReservedInstancesModificationId",
         "locationName":"ReservedInstancesModificationId"
       }
     },
@@ -26170,9 +30312,10 @@
       },
       "documentation":"<p>Describes a Reserved Instance offering.</p>"
     },
+    "ReservedInstancesOfferingId":{"type":"string"},
     "ReservedInstancesOfferingIdStringList":{
       "type":"list",
-      "member":{"shape":"String"}
+      "member":{"shape":"ReservedInstancesOfferingId"}
     },
     "ReservedInstancesOfferingList":{
       "type":"list",
@@ -26220,7 +30363,7 @@
           "documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>"
         },
         "FpgaImageId":{
-          "shape":"String",
+          "shape":"FpgaImageId",
           "documentation":"<p>The ID of the AFI.</p>"
         },
         "Attribute":{
@@ -26255,7 +30398,7 @@
           "documentation":"<p>The attribute to reset (currently you can only reset the launch permission attribute).</p>"
         },
         "ImageId":{
-          "shape":"String",
+          "shape":"ImageId",
           "documentation":"<p>The ID of the AMI.</p>"
         },
         "DryRun":{
@@ -26284,7 +30427,7 @@
           "locationName":"dryRun"
         },
         "InstanceId":{
-          "shape":"String",
+          "shape":"InstanceId",
           "documentation":"<p>The ID of the instance.</p>",
           "locationName":"instanceId"
         }
@@ -26300,7 +30443,7 @@
           "locationName":"dryRun"
         },
         "NetworkInterfaceId":{
-          "shape":"String",
+          "shape":"NetworkInterfaceId",
           "documentation":"<p>The ID of the network interface.</p>",
           "locationName":"networkInterfaceId"
         },
@@ -26324,7 +30467,7 @@
           "documentation":"<p>The attribute to reset. Currently, only the attribute for permission to create volumes can be reset.</p>"
         },
         "SnapshotId":{
-          "shape":"String",
+          "shape":"SnapshotId",
           "documentation":"<p>The ID of the snapshot.</p>"
         },
         "DryRun":{
@@ -26332,12 +30475,11 @@
           "documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>",
           "locationName":"dryRun"
         }
-      },
-      "documentation":"<p>Contains the parameters for ResetSnapshotAttribute.</p>"
+      }
     },
     "ResourceIdList":{
       "type":"list",
-      "member":{"shape":"String"}
+      "member":{"shape":"TaggableResourceId"}
     },
     "ResourceList":{
       "type":"list",
@@ -26360,14 +30502,17 @@
         "image",
         "instance",
         "internet-gateway",
+        "key-pair",
         "launch-template",
         "natgateway",
         "network-acl",
         "network-interface",
+        "placement-group",
         "reserved-instances",
         "route-table",
         "security-group",
         "snapshot",
+        "spot-fleet-request",
         "spot-instances-request",
         "subnet",
         "traffic-mirror-filter",
@@ -26375,12 +30520,14 @@
         "traffic-mirror-target",
         "transit-gateway",
         "transit-gateway-attachment",
+        "transit-gateway-multicast-domain",
         "transit-gateway-route-table",
         "volume",
         "vpc",
         "vpc-peering-connection",
         "vpn-connection",
-        "vpn-gateway"
+        "vpn-gateway",
+        "vpc-flow-log"
       ]
     },
     "ResponseError":{
@@ -26540,6 +30687,11 @@
           "shape":"LaunchTemplateHibernationOptions",
           "documentation":"<p>Indicates whether an instance is configured for hibernation. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Hibernate.html\">Hibernate Your Instance</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>.</p>",
           "locationName":"hibernationOptions"
+        },
+        "MetadataOptions":{
+          "shape":"LaunchTemplateInstanceMetadataOptions",
+          "documentation":"<p>The metadata options for the instance. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-instance-metadata.html\">Instance Metadata and User Data</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>.</p>",
+          "locationName":"metadataOptions"
         }
       },
       "documentation":"<p>The information for a launch template. </p>"
@@ -26587,7 +30739,7 @@
       ],
       "members":{
         "ClientVpnEndpointId":{
-          "shape":"String",
+          "shape":"ClientVpnEndpointId",
           "documentation":"<p>The ID of the Client VPN endpoint with which the authorization rule is associated.</p>"
         },
         "TargetNetworkCidr":{
@@ -26628,7 +30780,7 @@
           "locationName":"dryRun"
         },
         "GroupId":{
-          "shape":"String",
+          "shape":"SecurityGroupId",
           "documentation":"<p>The ID of the security group.</p>",
           "locationName":"groupId"
         },
@@ -26681,11 +30833,11 @@
           "documentation":"<p>The start of port range for the TCP and UDP protocols, or an ICMP type number. For the ICMP type number, use <code>-1</code> to specify all ICMP types.</p>"
         },
         "GroupId":{
-          "shape":"String",
+          "shape":"SecurityGroupId",
           "documentation":"<p>The ID of the security group. You must specify either the security group ID or the security group name in the request. For security groups in a nondefault VPC, you must specify the security group ID.</p>"
         },
         "GroupName":{
-          "shape":"String",
+          "shape":"SecurityGroupName",
           "documentation":"<p>[EC2-Classic, default VPC] The name of the security group. You must specify either the security group ID or the security group name in the request.</p>"
         },
         "IpPermissions":{
@@ -26715,6 +30867,20 @@
         }
       }
     },
+    "RootDeviceType":{
+      "type":"string",
+      "enum":[
+        "ebs",
+        "instance-store"
+      ]
+    },
+    "RootDeviceTypeList":{
+      "type":"list",
+      "member":{
+        "shape":"RootDeviceType",
+        "locationName":"item"
+      }
+    },
     "Route":{
       "type":"structure",
       "members":{
@@ -26763,6 +30929,11 @@
           "documentation":"<p>The ID of a transit gateway.</p>",
           "locationName":"transitGatewayId"
         },
+        "LocalGatewayId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the local gateway.</p>",
+          "locationName":"localGatewayId"
+        },
         "NetworkInterfaceId":{
           "shape":"String",
           "documentation":"<p>The ID of the network interface.</p>",
@@ -26786,6 +30957,7 @@
       },
       "documentation":"<p>Describes a route in a route table.</p>"
     },
+    "RouteGatewayId":{"type":"string"},
     "RouteList":{
       "type":"list",
       "member":{
@@ -26813,7 +30985,7 @@
       "members":{
         "Associations":{
           "shape":"RouteTableAssociationList",
-          "documentation":"<p>The associations between the route table and one or more subnets.</p>",
+          "documentation":"<p>The associations between the route table and one or more subnets or a gateway.</p>",
           "locationName":"associationSet"
         },
         "PropagatingVgws":{
@@ -26859,7 +31031,7 @@
         },
         "RouteTableAssociationId":{
           "shape":"String",
-          "documentation":"<p>The ID of the association between a route table and a subnet.</p>",
+          "documentation":"<p>The ID of the association.</p>",
           "locationName":"routeTableAssociationId"
         },
         "RouteTableId":{
@@ -26871,10 +31043,21 @@
           "shape":"String",
           "documentation":"<p>The ID of the subnet. A subnet ID is not returned for an implicit association.</p>",
           "locationName":"subnetId"
+        },
+        "GatewayId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the internet gateway or virtual private gateway.</p>",
+          "locationName":"gatewayId"
+        },
+        "AssociationState":{
+          "shape":"RouteTableAssociationState",
+          "documentation":"<p>The state of the association.</p>",
+          "locationName":"associationState"
         }
       },
-      "documentation":"<p>Describes an association between a route table and a subnet.</p>"
+      "documentation":"<p>Describes an association between a route table and a subnet or gateway.</p>"
     },
+    "RouteTableAssociationId":{"type":"string"},
     "RouteTableAssociationList":{
       "type":"list",
       "member":{
@@ -26882,6 +31065,40 @@
         "locationName":"item"
       }
     },
+    "RouteTableAssociationState":{
+      "type":"structure",
+      "members":{
+        "State":{
+          "shape":"RouteTableAssociationStateCode",
+          "documentation":"<p>The state of the association.</p>",
+          "locationName":"state"
+        },
+        "StatusMessage":{
+          "shape":"String",
+          "documentation":"<p>The status message, if applicable.</p>",
+          "locationName":"statusMessage"
+        }
+      },
+      "documentation":"<p>Describes the state of an association between a route table and a subnet or gateway.</p>"
+    },
+    "RouteTableAssociationStateCode":{
+      "type":"string",
+      "enum":[
+        "associating",
+        "associated",
+        "disassociating",
+        "disassociated",
+        "failed"
+      ]
+    },
+    "RouteTableId":{"type":"string"},
+    "RouteTableIdStringList":{
+      "type":"list",
+      "member":{
+        "shape":"RouteTableId",
+        "locationName":"item"
+      }
+    },
     "RouteTableList":{
       "type":"list",
       "member":{
@@ -26921,7 +31138,7 @@
           "locationName":"BlockDeviceMapping"
         },
         "ImageId":{
-          "shape":"String",
+          "shape":"ImageId",
           "documentation":"<p>The ID of the AMI. An AMI ID is required to launch an instance and must be specified here or in a launch template.</p>"
         },
         "InstanceType":{
@@ -26938,11 +31155,11 @@
           "locationName":"Ipv6Address"
         },
         "KernelId":{
-          "shape":"String",
+          "shape":"KernelId",
           "documentation":"<p>The ID of the kernel.</p> <important> <p>We recommend that you use PV-GRUB instead of kernels and RAM disks. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/UserProvidedkernels.html\"> PV-GRUB</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>.</p> </important>"
         },
         "KeyName":{
-          "shape":"String",
+          "shape":"KeyPairName",
           "documentation":"<p>The name of the key pair. You can create a key pair using <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CreateKeyPair.html\">CreateKeyPair</a> or <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_ImportKeyPair.html\">ImportKeyPair</a>.</p> <important> <p>If you do not specify a key pair, you can't connect to the instance unless you choose an AMI that is configured to allow users another way to log in.</p> </important>"
         },
         "MaxCount":{
@@ -26962,7 +31179,7 @@
           "documentation":"<p>The placement for the instance.</p>"
         },
         "RamdiskId":{
-          "shape":"String",
+          "shape":"RamdiskId",
           "documentation":"<p>The ID of the RAM disk to select. Some kernels require additional drivers at launch. Check the kernel requirements for information about whether you need to specify a RAM disk. To find kernel requirements, go to the AWS Resource Center and search for the kernel ID.</p> <important> <p>We recommend that you use PV-GRUB instead of kernels and RAM disks. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/UserProvidedkernels.html\"> PV-GRUB</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>.</p> </important>"
         },
         "SecurityGroupIds":{
@@ -26976,7 +31193,7 @@
           "locationName":"SecurityGroup"
         },
         "SubnetId":{
-          "shape":"String",
+          "shape":"SubnetId",
           "documentation":"<p>[EC2-VPC] The ID of the subnet to launch the instance into.</p> <p>If you specify a network interface, you must specify any subnets as part of the network interface.</p>"
         },
         "UserData":{
@@ -26990,7 +31207,7 @@
         },
         "ClientToken":{
           "shape":"String",
-          "documentation":"<p>Unique, case-sensitive identifier you provide to ensure the idempotency of the request. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/Run_Instance_Idempotency.html\">Ensuring Idempotency</a>.</p> <p>Constraints: Maximum 64 ASCII characters</p>",
+          "documentation":"<p>Unique, case-sensitive identifier you provide to ensure the idempotency of the request. If you do not specify a client token, a randomly generated token is used for the request to ensure idempotency.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/Run_Instance_Idempotency.html\">Ensuring Idempotency</a>.</p> <p>Constraints: Maximum 64 ASCII characters</p>",
           "locationName":"clientToken"
         },
         "DisableApiTermination":{
@@ -27052,7 +31269,7 @@
         },
         "CreditSpecification":{
           "shape":"CreditSpecificationRequest",
-          "documentation":"<p>The credit option for CPU usage of the T2 or T3 instance. Valid values are <code>standard</code> and <code>unlimited</code>. To change this attribute after launch, use <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_ModifyInstanceCreditSpecification.html\"> ModifyInstanceCreditSpecification</a>. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/burstable-performance-instances.html\">Burstable Performance Instances</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>.</p> <p>Default: <code>standard</code> (T2 instances) or <code>unlimited</code> (T3 instances)</p>"
+          "documentation":"<p>The credit option for CPU usage of the burstable performance instance. Valid values are <code>standard</code> and <code>unlimited</code>. To change this attribute after launch, use <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_ModifyInstanceCreditSpecification.html\"> ModifyInstanceCreditSpecification</a>. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/burstable-performance-instances.html\">Burstable Performance Instances</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>.</p> <p>Default: <code>standard</code> (T2 instances) or <code>unlimited</code> (T3/T3a instances)</p>"
         },
         "CpuOptions":{
           "shape":"CpuOptionsRequest",
@@ -27070,6 +31287,10 @@
           "shape":"LicenseSpecificationListRequest",
           "documentation":"<p>The license configurations.</p>",
           "locationName":"LicenseSpecification"
+        },
+        "MetadataOptions":{
+          "shape":"InstanceMetadataOptionsRequest",
+          "documentation":"<p>The metadata options for the instance. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-instance-metadata.html\">Instance Metadata and User Data</a>.</p>"
         }
       }
     },
@@ -27098,7 +31319,7 @@
           "documentation":"<p>The launch specification. You must match the instance type, Availability Zone, network, and platform of the schedule that you purchased.</p>"
         },
         "ScheduledInstanceId":{
-          "shape":"String",
+          "shape":"ScheduledInstanceId",
           "documentation":"<p>The Scheduled Instance ID.</p>"
         }
       },
@@ -27304,10 +31525,11 @@
         "locationName":"item"
       }
     },
+    "ScheduledInstanceId":{"type":"string"},
     "ScheduledInstanceIdRequestSet":{
       "type":"list",
       "member":{
-        "shape":"String",
+        "shape":"ScheduledInstanceId",
         "locationName":"ScheduledInstanceId"
       }
     },
@@ -27421,7 +31643,7 @@
           "documentation":"<p>The number of I/O operations per second (IOPS) that the volume supports. For io1 volumes, this represents the number of IOPS that are provisioned for the volume. For <code>gp2</code> volumes, this represents the baseline performance of the volume and the rate at which the volume accumulates I/O credits for bursting. For more information about <code>gp2</code> baseline performance, I/O credits, and bursting, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSVolumeTypes.html\">Amazon EBS Volume Types</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>.</p> <p>Constraint: Range is 100-20000 IOPS for <code>io1</code> volumes and 100-10000 IOPS for <code>gp2</code> volumes.</p> <p>Condition: This parameter is required for requests to create <code>io1</code>volumes; it is not used in requests to create <code>gp2</code>, <code>st1</code>, <code>sc1</code>, or <code>standard</code> volumes.</p>"
         },
         "SnapshotId":{
-          "shape":"String",
+          "shape":"SnapshotId",
           "documentation":"<p>The ID of the snapshot.</p>"
         },
         "VolumeSize":{
@@ -27484,7 +31706,7 @@
           "documentation":"<p>The IAM instance profile.</p>"
         },
         "ImageId":{
-          "shape":"String",
+          "shape":"ImageId",
           "documentation":"<p>The ID of the Amazon Machine Image (AMI).</p>"
         },
         "InstanceType":{
@@ -27492,11 +31714,11 @@
           "documentation":"<p>The instance type.</p>"
         },
         "KernelId":{
-          "shape":"String",
+          "shape":"KernelId",
           "documentation":"<p>The ID of the kernel.</p>"
         },
         "KeyName":{
-          "shape":"String",
+          "shape":"KeyPairName",
           "documentation":"<p>The name of the key pair.</p>"
         },
         "Monitoring":{
@@ -27513,7 +31735,7 @@
           "documentation":"<p>The placement information.</p>"
         },
         "RamdiskId":{
-          "shape":"String",
+          "shape":"RamdiskId",
           "documentation":"<p>The ID of the RAM disk.</p>"
         },
         "SecurityGroupIds":{
@@ -27522,7 +31744,7 @@
           "locationName":"SecurityGroupId"
         },
         "SubnetId":{
-          "shape":"String",
+          "shape":"SubnetId",
           "documentation":"<p>The ID of the subnet in which to launch the instances.</p>"
         },
         "UserData":{
@@ -27576,7 +31798,7 @@
           "locationName":"Ipv6Address"
         },
         "NetworkInterfaceId":{
-          "shape":"String",
+          "shape":"NetworkInterfaceId",
           "documentation":"<p>The ID of the network interface.</p>"
         },
         "PrivateIpAddress":{
@@ -27593,7 +31815,7 @@
           "documentation":"<p>The number of secondary private IPv4 addresses.</p>"
         },
         "SubnetId":{
-          "shape":"String",
+          "shape":"SubnetId",
           "documentation":"<p>The ID of the subnet.</p>"
         }
       },
@@ -27614,7 +31836,7 @@
           "documentation":"<p>The Availability Zone.</p>"
         },
         "GroupName":{
-          "shape":"String",
+          "shape":"PlacementGroupName",
           "documentation":"<p>The name of the placement group.</p>"
         }
       },
@@ -27637,10 +31859,96 @@
     "ScheduledInstancesSecurityGroupIdSet":{
       "type":"list",
       "member":{
-        "shape":"String",
+        "shape":"SecurityGroupId",
         "locationName":"SecurityGroupId"
       }
     },
+    "SearchLocalGatewayRoutesRequest":{
+      "type":"structure",
+      "required":[
+        "LocalGatewayRouteTableId",
+        "Filters"
+      ],
+      "members":{
+        "LocalGatewayRouteTableId":{
+          "shape":"LocalGatewayRoutetableId",
+          "documentation":"<p>The ID of the local gateway route table.</p>"
+        },
+        "Filters":{
+          "shape":"FilterList",
+          "documentation":"<p>One or more filters.</p>",
+          "locationName":"Filter"
+        },
+        "MaxResults":{
+          "shape":"MaxResults",
+          "documentation":"<p>The maximum number of results to return with a single call. To retrieve the remaining results, make another call with the returned <code>nextToken</code> value.</p>"
+        },
+        "NextToken":{
+          "shape":"String",
+          "documentation":"<p>The token for the next page of results.</p>"
+        },
+        "DryRun":{
+          "shape":"Boolean",
+          "documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>"
+        }
+      }
+    },
+    "SearchLocalGatewayRoutesResult":{
+      "type":"structure",
+      "members":{
+        "Routes":{
+          "shape":"LocalGatewayRouteList",
+          "documentation":"<p>Information about the routes.</p>",
+          "locationName":"routeSet"
+        },
+        "NextToken":{
+          "shape":"String",
+          "documentation":"<p>The token to use to retrieve the next page of results. This value is <code>null</code> when there are no more results to return.</p>",
+          "locationName":"nextToken"
+        }
+      }
+    },
+    "SearchTransitGatewayMulticastGroupsRequest":{
+      "type":"structure",
+      "members":{
+        "TransitGatewayMulticastDomainId":{
+          "shape":"TransitGatewayMulticastDomainId",
+          "documentation":"<p>The ID of the transit gateway multicast domain.</p>"
+        },
+        "Filters":{
+          "shape":"FilterList",
+          "documentation":"<p>One or more filters. The possible values are:</p> <ul> <li> <p> <code>group-ip-address</code> - The IP address of the transit gateway multicast group.</p> </li> <li> <p> <code>is-group-member</code> - The resource is a group member. Valid values are <code>true</code> | <code>false</code>.</p> </li> <li> <p> <code>is-group-source</code> - The resource is a group source. Valid values are <code>true</code> | <code>false</code>.</p> </li> <li> <p> <code>member-type</code> - The member type. Valid values are <code>igmp</code> | <code>static</code>.</p> </li> <li> <p> <code>resource-id</code> - The ID of the resource.</p> </li> <li> <p> <code>resource-type</code> - The type of resource. Valid values are <code>vpc</code> | <code>vpn</code> | <code>direct-connect-gateway</code> | <code>tgw-peering</code>.</p> </li> <li> <p> <code>source-type</code> - The source type. Valid values are <code>igmp</code> | <code>static</code>.</p> </li> <li> <p> <code>state</code> - The state of the subnet association. Valid values are <code>associated</code> | <code>associated</code> | <code>disassociated</code> | <code>disassociating</code>.</p> </li> <li> <p> <code>subnet-id</code> - The ID of the subnet.</p> </li> <li> <p> <code>transit-gateway-attachment-id</code> - The id of the transit gateway attachment.</p> </li> </ul>",
+          "locationName":"Filter"
+        },
+        "MaxResults":{
+          "shape":"TransitGatewayMaxResults",
+          "documentation":"<p>The maximum number of results to return with a single call. To retrieve the remaining results, make another call with the returned <code>nextToken</code> value.</p>"
+        },
+        "NextToken":{
+          "shape":"String",
+          "documentation":"<p>The token for the next page of results.</p>"
+        },
+        "DryRun":{
+          "shape":"Boolean",
+          "documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>"
+        }
+      }
+    },
+    "SearchTransitGatewayMulticastGroupsResult":{
+      "type":"structure",
+      "members":{
+        "MulticastGroups":{
+          "shape":"TransitGatewayMulticastGroupList",
+          "documentation":"<p>Information about the transit gateway multicast group.</p>",
+          "locationName":"multicastGroups"
+        },
+        "NextToken":{
+          "shape":"String",
+          "documentation":"<p>The token to use to retrieve the next page of results. This value is <code>null</code> when there are no more results to return.</p>",
+          "locationName":"nextToken"
+        }
+      }
+    },
     "SearchTransitGatewayRoutesRequest":{
       "type":"structure",
       "required":[
@@ -27649,7 +31957,7 @@
       ],
       "members":{
         "TransitGatewayRouteTableId":{
-          "shape":"String",
+          "shape":"TransitGatewayRouteTableId",
           "documentation":"<p>The ID of the transit gateway route table.</p>"
         },
         "Filters":{
@@ -27728,10 +32036,11 @@
       },
       "documentation":"<p>Describes a security group</p>"
     },
+    "SecurityGroupId":{"type":"string"},
     "SecurityGroupIdStringList":{
       "type":"list",
       "member":{
-        "shape":"String",
+        "shape":"SecurityGroupId",
         "locationName":"SecurityGroupId"
       }
     },
@@ -27758,6 +32067,7 @@
         "locationName":"item"
       }
     },
+    "SecurityGroupName":{"type":"string"},
     "SecurityGroupReference":{
       "type":"structure",
       "members":{
@@ -27789,7 +32099,7 @@
     "SecurityGroupStringList":{
       "type":"list",
       "member":{
-        "shape":"String",
+        "shape":"SecurityGroupName",
         "locationName":"SecurityGroup"
       }
     },
@@ -27798,7 +32108,7 @@
       "required":["InstanceId"],
       "members":{
         "InstanceId":{
-          "shape":"String",
+          "shape":"InstanceId",
           "documentation":"<p>The ID of the instance.</p>"
         },
         "DryRun":{
@@ -27807,6 +32117,10 @@
         }
       }
     },
+    "SensitiveUserData":{
+      "type":"string",
+      "sensitive":true
+    },
     "ServiceConfiguration":{
       "type":"structure",
       "members":{
@@ -27832,7 +32146,7 @@
         },
         "AvailabilityZones":{
           "shape":"ValueStringList",
-          "documentation":"<p>In the Availability Zones in which the service is available.</p>",
+          "documentation":"<p>The Availability Zones in which the service is available.</p>",
           "locationName":"availabilityZoneSet"
         },
         "AcceptanceRequired":{
@@ -27842,7 +32156,7 @@
         },
         "ManagesVpcEndpoints":{
           "shape":"Boolean",
-          "documentation":"<p>Indicates whether the service manages it's VPC endpoints. Management of the service VPC endpoints using the VPC endpoint API is restricted.</p>",
+          "documentation":"<p>Indicates whether the service manages its VPC endpoints. Management of the service VPC endpoints using the VPC endpoint API is restricted.</p>",
           "locationName":"managesVpcEndpoints"
         },
         "NetworkLoadBalancerArns":{
@@ -27860,6 +32174,11 @@
           "documentation":"<p>The private DNS name for the service.</p>",
           "locationName":"privateDnsName"
         },
+        "PrivateDnsNameConfiguration":{
+          "shape":"PrivateDnsNameConfiguration",
+          "documentation":"<p>Information about the endpoint service private DNS name configuration.</p>",
+          "locationName":"privateDnsNameConfiguration"
+        },
         "Tags":{
           "shape":"TagList",
           "documentation":"<p>Any tags assigned to the service.</p>",
@@ -27925,13 +32244,18 @@
         },
         "ManagesVpcEndpoints":{
           "shape":"Boolean",
-          "documentation":"<p>Indicates whether the service manages it's VPC endpoints. Management of the service VPC endpoints using the VPC endpoint API is restricted.</p>",
+          "documentation":"<p>Indicates whether the service manages its VPC endpoints. Management of the service VPC endpoints using the VPC endpoint API is restricted.</p>",
           "locationName":"managesVpcEndpoints"
         },
         "Tags":{
           "shape":"TagList",
           "documentation":"<p>Any tags assigned to the service.</p>",
           "locationName":"tagSet"
+        },
+        "PrivateDnsNameVerificationState":{
+          "shape":"DnsNameState",
+          "documentation":"<p>The verification state of the VPC endpoint service.</p> <p>Consumers of the endpoint service cannot use the private name when the state is not <code>verified</code>.</p>",
+          "locationName":"privateDnsNameVerificationState"
         }
       },
       "documentation":"<p>Describes a VPC endpoint service.</p>"
@@ -28185,10 +32509,11 @@
       },
       "documentation":"<p>The disk container object for the import snapshot request.</p>"
     },
+    "SnapshotId":{"type":"string"},
     "SnapshotIdStringList":{
       "type":"list",
       "member":{
-        "shape":"String",
+        "shape":"SnapshotId",
         "locationName":"SnapshotId"
       }
     },
@@ -28486,7 +32811,7 @@
           "locationName":"activityStatus"
         },
         "CreateTime":{
-          "shape":"DateTime",
+          "shape":"MillisecondDateTime",
           "documentation":"<p>The creation date and time of the request.</p>",
           "locationName":"createTime"
         },
@@ -28504,6 +32829,11 @@
           "shape":"BatchState",
           "documentation":"<p>The state of the Spot Fleet request.</p>",
           "locationName":"spotFleetRequestState"
+        },
+        "Tags":{
+          "shape":"TagList",
+          "documentation":"<p>The tags for a Spot Fleet resource.</p>",
+          "locationName":"tagSet"
         }
       },
       "documentation":"<p>Describes a Spot Fleet request.</p>"
@@ -28624,6 +32954,11 @@
           "shape":"Integer",
           "documentation":"<p>The number of Spot pools across which to allocate your target Spot capacity. Valid only when Spot <b>AllocationStrategy</b> is set to <code>lowest-price</code>. Spot Fleet selects the cheapest Spot pools and evenly allocates your target Spot capacity across the number of Spot pools that you specify.</p>",
           "locationName":"instancePoolsToUseCount"
+        },
+        "TagSpecifications":{
+          "shape":"TagSpecificationList",
+          "documentation":"<p>The key-value pair for tagging the Spot Fleet request on creation. The value for <code>ResourceType</code> must be <code>spot-fleet-request</code>, otherwise the Spot Fleet request fails. To tag instances at launch, specify the tags in the <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-launch-templates.html#create-launch-template\">launch template</a> (valid only if you use <code>LaunchTemplateConfigs</code>) or in the <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_SpotFleetTagSpecification.html\"> <code>SpotFleetTagSpecification</code> </a> (valid only if you use <code>LaunchSpecifications</code>). For information about tagging after launch, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Using_Tags.html#tag-resources\">Tagging Your Resources</a>.</p>",
+          "locationName":"TagSpecification"
         }
       },
       "documentation":"<p>Describes the configuration of a Spot Fleet request.</p>"
@@ -28635,12 +32970,20 @@
         "locationName":"item"
       }
     },
+    "SpotFleetRequestId":{"type":"string"},
+    "SpotFleetRequestIdList":{
+      "type":"list",
+      "member":{
+        "shape":"SpotFleetRequestId",
+        "locationName":"item"
+      }
+    },
     "SpotFleetTagSpecification":{
       "type":"structure",
       "members":{
         "ResourceType":{
           "shape":"ResourceType",
-          "documentation":"<p>The type of resource. Currently, the only resource type that is supported is <code>instance</code>.</p>",
+          "documentation":"<p>The type of resource. Currently, the only resource type that is supported is <code>instance</code>. To tag the Spot Fleet request on creation, use the <code>TagSpecifications</code> parameter in <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_SpotFleetRequestConfigData.html\"> <code>SpotFleetRequestConfigData</code> </a>.</p>",
           "locationName":"resourceType"
         },
         "Tags":{
@@ -28695,7 +33038,7 @@
           "locationName":"fault"
         },
         "InstanceId":{
-          "shape":"String",
+          "shape":"InstanceId",
           "documentation":"<p>The instance ID, if an instance has been launched to fulfill the Spot Instance request.</p>",
           "locationName":"instanceId"
         },
@@ -28767,10 +33110,11 @@
       },
       "documentation":"<p>Describes a Spot Instance request.</p>"
     },
+    "SpotInstanceRequestId":{"type":"string"},
     "SpotInstanceRequestIdList":{
       "type":"list",
       "member":{
-        "shape":"String",
+        "shape":"SpotInstanceRequestId",
         "locationName":"SpotInstanceRequestId"
       }
     },
@@ -28866,7 +33210,7 @@
       "members":{
         "AllocationStrategy":{
           "shape":"SpotAllocationStrategy",
-          "documentation":"<p>Indicates how to allocate the target Spot Instance capacity across the Spot Instance pools specified by the EC2 Fleet.</p> <p>If the allocation strategy is <code>lowestPrice</code>, EC2 Fleet launches instances from the Spot Instance pools with the lowest price. This is the default allocation strategy.</p> <p>If the allocation strategy is <code>diversified</code>, EC2 Fleet launches instances from all the Spot Instance pools that you specify.</p> <p>If the allocation strategy is <code>capacityOptimized</code>, EC2 Fleet launches instances from Spot Instance pools with optimal capacity for the number of instances that are launching.</p>",
+          "documentation":"<p>Indicates how to allocate the target Spot Instance capacity across the Spot Instance pools specified by the EC2 Fleet.</p> <p>If the allocation strategy is <code>lowest-price</code>, EC2 Fleet launches instances from the Spot Instance pools with the lowest price. This is the default allocation strategy.</p> <p>If the allocation strategy is <code>diversified</code>, EC2 Fleet launches instances from all of the Spot Instance pools that you specify.</p> <p>If the allocation strategy is <code>capacity-optimized</code>, EC2 Fleet launches instances from Spot Instance pools with optimal capacity for the number of instances that are launching.</p>",
           "locationName":"allocationStrategy"
         },
         "InstanceInterruptionBehavior":{
@@ -28876,17 +33220,17 @@
         },
         "InstancePoolsToUseCount":{
           "shape":"Integer",
-          "documentation":"<p>The number of Spot pools across which to allocate your target Spot capacity. Valid only when <b>AllocationStrategy</b> is set to <code>lowestPrice</code>. EC2 Fleet selects the cheapest Spot pools and evenly allocates your target Spot capacity across the number of Spot pools that you specify.</p>",
+          "documentation":"<p>The number of Spot pools across which to allocate your target Spot capacity. Valid only when <b>AllocationStrategy</b> is set to <code>lowest-price</code>. EC2 Fleet selects the cheapest Spot pools and evenly allocates your target Spot capacity across the number of Spot pools that you specify.</p>",
           "locationName":"instancePoolsToUseCount"
         },
         "SingleInstanceType":{
           "shape":"Boolean",
-          "documentation":"<p>Indicates that the fleet uses a single instance type to launch all Spot Instances in the fleet.</p>",
+          "documentation":"<p>Indicates that the fleet uses a single instance type to launch all Spot Instances in the fleet. Supported only for fleets of type <code>instant</code>.</p>",
           "locationName":"singleInstanceType"
         },
         "SingleAvailabilityZone":{
           "shape":"Boolean",
-          "documentation":"<p>Indicates that the fleet launches all Spot Instances into a single Availability Zone.</p>",
+          "documentation":"<p>Indicates that the fleet launches all Spot Instances into a single Availability Zone. Supported only for fleets of type <code>instant</code>.</p>",
           "locationName":"singleAvailabilityZone"
         },
         "MinTargetCapacity":{
@@ -28907,7 +33251,7 @@
       "members":{
         "AllocationStrategy":{
           "shape":"SpotAllocationStrategy",
-          "documentation":"<p>Indicates how to allocate the target Spot Instance capacity across the Spot Instance pools specified by the EC2 Fleet.</p> <p>If the allocation strategy is <code>lowestPrice</code>, EC2 Fleet launches instances from the Spot Instance pools with the lowest price. This is the default allocation strategy.</p> <p>If the allocation strategy is <code>diversified</code>, EC2 Fleet launches instances from all the Spot Instance pools that you specify.</p> <p>If the allocation strategy is <code>capacityOptimized</code>, EC2 Fleet launches instances from Spot Instance pools with optimal capacity for the number of instances that are launching.</p>"
+          "documentation":"<p>Indicates how to allocate the target Spot Instance capacity across the Spot Instance pools specified by the EC2 Fleet.</p> <p>If the allocation strategy is <code>lowest-price</code>, EC2 Fleet launches instances from the Spot Instance pools with the lowest price. This is the default allocation strategy.</p> <p>If the allocation strategy is <code>diversified</code>, EC2 Fleet launches instances from all of the Spot Instance pools that you specify.</p> <p>If the allocation strategy is <code>capacity-optimized</code>, EC2 Fleet launches instances from Spot Instance pools with optimal capacity for the number of instances that are launching.</p>"
         },
         "InstanceInterruptionBehavior":{
           "shape":"SpotInstanceInterruptionBehavior",
@@ -28919,11 +33263,11 @@
         },
         "SingleInstanceType":{
           "shape":"Boolean",
-          "documentation":"<p>Indicates that the fleet uses a single instance type to launch all Spot Instances in the fleet.</p>"
+          "documentation":"<p>Indicates that the fleet uses a single instance type to launch all Spot Instances in the fleet. Supported only for fleets of type <code>instant</code>.</p>"
         },
         "SingleAvailabilityZone":{
           "shape":"Boolean",
-          "documentation":"<p>Indicates that the fleet launches all Spot Instances into a single Availability Zone.</p>"
+          "documentation":"<p>Indicates that the fleet launches all Spot Instances into a single Availability Zone. Supported only for fleets of type <code>instant</code>.</p>"
         },
         "MinTargetCapacity":{
           "shape":"Integer",
@@ -29112,6 +33456,30 @@
         }
       }
     },
+    "StartVpcEndpointServicePrivateDnsVerificationRequest":{
+      "type":"structure",
+      "required":["ServiceId"],
+      "members":{
+        "DryRun":{
+          "shape":"Boolean",
+          "documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>"
+        },
+        "ServiceId":{
+          "shape":"VpcEndpointServiceId",
+          "documentation":"<p>The ID of the endpoint service.</p>"
+        }
+      }
+    },
+    "StartVpcEndpointServicePrivateDnsVerificationResult":{
+      "type":"structure",
+      "members":{
+        "ReturnValue":{
+          "shape":"Boolean",
+          "documentation":"<p>Returns <code>true</code> if the request succeeds; otherwise, it returns an error.</p>",
+          "locationName":"return"
+        }
+      }
+    },
     "State":{
       "type":"string",
       "enum":[
@@ -29294,10 +33662,39 @@
           "shape":"String",
           "documentation":"<p>The Amazon Resource Name (ARN) of the subnet.</p>",
           "locationName":"subnetArn"
+        },
+        "OutpostArn":{
+          "shape":"String",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the Outpost.</p>",
+          "locationName":"outpostArn"
         }
       },
       "documentation":"<p>Describes a subnet.</p>"
     },
+    "SubnetAssociation":{
+      "type":"structure",
+      "members":{
+        "SubnetId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the subnet.</p>",
+          "locationName":"subnetId"
+        },
+        "State":{
+          "shape":"TransitGatewayMulitcastDomainAssociationState",
+          "documentation":"<p>The state of the subnet association.</p>",
+          "locationName":"state"
+        }
+      },
+      "documentation":"<p>Describes the subnet association with the transit gateway multicast domain.</p>"
+    },
+    "SubnetAssociationList":{
+      "type":"list",
+      "member":{
+        "shape":"SubnetAssociation",
+        "locationName":"item"
+      }
+    },
+    "SubnetCidrAssociationId":{"type":"string"},
     "SubnetCidrBlockState":{
       "type":"structure",
       "members":{
@@ -29325,10 +33722,11 @@
         "failed"
       ]
     },
+    "SubnetId":{"type":"string"},
     "SubnetIdStringList":{
       "type":"list",
       "member":{
-        "shape":"String",
+        "shape":"SubnetId",
         "locationName":"SubnetId"
       }
     },
@@ -29383,7 +33781,7 @@
           "locationName":"instanceId"
         }
       },
-      "documentation":"<p>Describes the T2 or T3 instance whose credit option for CPU usage was successfully modified.</p>"
+      "documentation":"<p>Describes the burstable performance instance whose credit option for CPU usage was successfully modified.</p>"
     },
     "SuccessfulInstanceCreditSpecificationSet":{
       "type":"list",
@@ -29481,7 +33879,7 @@
       "members":{
         "ResourceType":{
           "shape":"ResourceType",
-          "documentation":"<p>The type of resource to tag. Currently, the resource types that support tagging on creation are: <code>capacity-reservation</code> | <code>client-vpn-endpoint</code> | <code>dedicated-host</code> | <code>fleet</code> | <code>fpga-image</code> | <code>instance</code> | <code>launch-template</code> | <code>snapshot</code> | <code>traffic-mirror-filter</code> | <code>traffic-mirror-session</code> | <code>traffic-mirror-target</code> | <code>transit-gateway</code> | <code>transit-gateway-attachment</code> | <code>transit-gateway-route-table</code> | <code>volume</code>.</p> <p>To tag a resource after it has been created, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CreateTags.html\">CreateTags</a>.</p>",
+          "documentation":"<p>The type of resource to tag. Currently, the resource types that support tagging on creation are: <code>capacity-reservation</code> | <code>client-vpn-endpoint</code> | <code>dedicated-host</code> | <code>fleet</code> | <code>fpga-image</code> | <code>instance</code> | <code>key-pair</code> | <code>launch-template</code> | | <code>natgateway</code> | <code>spot-fleet-request</code> | <code>placement-group</code> | <code>snapshot</code> | <code>traffic-mirror-filter</code> | <code>traffic-mirror-session</code> | <code>traffic-mirror-target</code> | <code>transit-gateway</code> | <code>transit-gateway-attachment</code> | <code>transit-gateway-route-table</code> | <code>vpc-endpoint</code> (for interface VPC endpoints)| <code>vpc-endpoint-service</code> (for gateway VPC endpoints) | <code>volume</code> | <code>vpc-flow-log</code>.</p> <p>To tag a resource after it has been created, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CreateTags.html\">CreateTags</a>.</p>",
           "locationName":"resourceType"
         },
         "Tags":{
@@ -29499,6 +33897,7 @@
         "locationName":"item"
       }
     },
+    "TaggableResourceId":{"type":"string"},
     "TargetCapacitySpecification":{
       "type":"structure",
       "members":{
@@ -29523,7 +33922,7 @@
           "locationName":"defaultTargetCapacityType"
         }
       },
-      "documentation":"<p>The number of units to request. You can choose to set the target capacity in terms of instances or a performance characteristic that is important to your application workload, such as vCPUs, memory, or I/O. If the request type is <code>maintain</code>, you can specify a target capacity of 0 and add capacity later.</p> <p>You can use the On-Demand Instance <code>MaxTotalPrice</code> parameter, the Spot Instance <code>MaxTotalPrice</code>, or both to ensure your fleet cost does not exceed your budget. If you set a maximum price per hour for the On-Demand Instances and Spot Instances in your request, EC2 Fleet will launch instances until it reaches the maximum amount you're willing to pay. When the maximum amount you're willing to pay is reached, the fleet stops launching instances even if it hasn’t met the target capacity. The <code>MaxTotalPrice</code> parameters are located in and </p>"
+      "documentation":"<p>The number of units to request. You can choose to set the target capacity in terms of instances or a performance characteristic that is important to your application workload, such as vCPUs, memory, or I/O. If the request type is <code>maintain</code>, you can specify a target capacity of 0 and add capacity later.</p> <p>You can use the On-Demand Instance <code>MaxTotalPrice</code> parameter, the Spot Instance <code>MaxTotalPrice</code>, or both to ensure that your fleet cost does not exceed your budget. If you set a maximum price per hour for the On-Demand Instances and Spot Instances in your request, EC2 Fleet will launch instances until it reaches the maximum amount that you're willing to pay. When the maximum amount you're willing to pay is reached, the fleet stops launching instances even if it hasn’t met the target capacity. The <code>MaxTotalPrice</code> parameters are located in and </p>"
     },
     "TargetCapacitySpecificationRequest":{
       "type":"structure",
@@ -29546,7 +33945,7 @@
           "documentation":"<p>The default <code>TotalTargetCapacity</code>, which is either <code>Spot</code> or <code>On-Demand</code>.</p>"
         }
       },
-      "documentation":"<p>The number of units to request. You can choose to set the target capacity as the number of instances. Or you can set the target capacity to a performance characteristic that is important to your application workload, such as vCPUs, memory, or I/O. If the request type is <code>maintain</code>, you can specify a target capacity of 0 and add capacity later.</p> <p>You can use the On-Demand Instance <code>MaxTotalPrice</code> parameter, the Spot Instance <code>MaxTotalPrice</code> parameter, or both parameters to ensure that your fleet cost does not exceed your budget. If you set a maximum price per hour for the On-Demand Instances and Spot Instances in your request, EC2 Fleet will launch instances until it reaches the maximum amount you're willing to pay. When the maximum amount you're willing to pay is reached, the fleet stops launching instances even if it hasn’t met the target capacity. The <code>MaxTotalPrice</code> parameters are located in and .</p>"
+      "documentation":"<p>The number of units to request. You can choose to set the target capacity as the number of instances. Or you can set the target capacity to a performance characteristic that is important to your application workload, such as vCPUs, memory, or I/O. If the request type is <code>maintain</code>, you can specify a target capacity of 0 and add capacity later.</p> <p>You can use the On-Demand Instance <code>MaxTotalPrice</code> parameter, the Spot Instance <code>MaxTotalPrice</code> parameter, or both parameters to ensure that your fleet cost does not exceed your budget. If you set a maximum price per hour for the On-Demand Instances and Spot Instances in your request, EC2 Fleet will launch instances until it reaches the maximum amount that you're willing to pay. When the maximum amount you're willing to pay is reached, the fleet stops launching instances even if it hasn’t met the target capacity. The <code>MaxTotalPrice</code> parameters are located in and .</p>"
     },
     "TargetConfiguration":{
       "type":"structure",
@@ -29573,7 +33972,7 @@
           "documentation":"<p>The number of instances the Covertible Reserved Instance offering can be applied to. This parameter is reserved and cannot be specified in a request</p>"
         },
         "OfferingId":{
-          "shape":"String",
+          "shape":"ReservedInstancesOfferingId",
           "documentation":"<p>The Convertible Reserved Instance offering ID.</p>"
         }
       },
@@ -29703,11 +34102,11 @@
       "required":["ClientVpnEndpointId"],
       "members":{
         "ClientVpnEndpointId":{
-          "shape":"String",
+          "shape":"ClientVpnEndpointId",
           "documentation":"<p>The ID of the Client VPN endpoint to which the client is connected.</p>"
         },
         "ConnectionId":{
-          "shape":"String",
+          "shape":"VpnConnectionId",
           "documentation":"<p>The ID of the client connection to be terminated.</p>"
         },
         "Username":{
@@ -29794,6 +34193,14 @@
         }
       }
     },
+    "ThreadsPerCore":{"type":"integer"},
+    "ThreadsPerCoreList":{
+      "type":"list",
+      "member":{
+        "shape":"ThreadsPerCore",
+        "locationName":"item"
+      }
+    },
     "TrafficDirection":{
       "type":"string",
       "enum":[
@@ -29837,6 +34244,14 @@
       },
       "documentation":"<p>Describes the Traffic Mirror filter.</p>"
     },
+    "TrafficMirrorFilterId":{"type":"string"},
+    "TrafficMirrorFilterIdList":{
+      "type":"list",
+      "member":{
+        "shape":"TrafficMirrorFilterId",
+        "locationName":"item"
+      }
+    },
     "TrafficMirrorFilterRule":{
       "type":"structure",
       "members":{
@@ -29911,6 +34326,7 @@
       "type":"list",
       "member":{"shape":"TrafficMirrorFilterRuleField"}
     },
+    "TrafficMirrorFilterRuleId":{"type":"string"},
     "TrafficMirrorFilterRuleList":{
       "type":"list",
       "member":{
@@ -30041,6 +34457,14 @@
       "type":"list",
       "member":{"shape":"TrafficMirrorSessionField"}
     },
+    "TrafficMirrorSessionId":{"type":"string"},
+    "TrafficMirrorSessionIdList":{
+      "type":"list",
+      "member":{
+        "shape":"TrafficMirrorSessionId",
+        "locationName":"item"
+      }
+    },
     "TrafficMirrorSessionSet":{
       "type":"list",
       "member":{
@@ -30089,6 +34513,14 @@
       },
       "documentation":"<p>Describes a Traffic Mirror target.</p>"
     },
+    "TrafficMirrorTargetId":{"type":"string"},
+    "TrafficMirrorTargetIdList":{
+      "type":"list",
+      "member":{
+        "shape":"TrafficMirrorTargetId",
+        "locationName":"item"
+      }
+    },
     "TrafficMirrorTargetSet":{
       "type":"list",
       "member":{
@@ -30116,6 +34548,7 @@
         "ALL"
       ]
     },
+    "TransitAssociationGatewayId":{"type":"string"},
     "TransitGateway":{
       "type":"structure",
       "members":{
@@ -30166,12 +34599,12 @@
       "type":"structure",
       "members":{
         "TransitGatewayRouteTableId":{
-          "shape":"String",
+          "shape":"TransitGatewayRouteTableId",
           "documentation":"<p>The ID of the transit gateway route table.</p>",
           "locationName":"transitGatewayRouteTableId"
         },
         "TransitGatewayAttachmentId":{
-          "shape":"String",
+          "shape":"TransitGatewayAttachmentId",
           "documentation":"<p>The ID of the attachment.</p>",
           "locationName":"transitGatewayAttachmentId"
         },
@@ -30274,9 +34707,10 @@
       },
       "documentation":"<p>Describes an association.</p>"
     },
+    "TransitGatewayAttachmentId":{"type":"string"},
     "TransitGatewayAttachmentIdStringList":{
       "type":"list",
-      "member":{"shape":"String"}
+      "member":{"shape":"TransitGatewayAttachmentId"}
     },
     "TransitGatewayAttachmentList":{
       "type":"list",
@@ -30313,12 +34747,14 @@
       "enum":[
         "vpc",
         "vpn",
-        "direct-connect-gateway"
+        "direct-connect-gateway",
+        "tgw-peering"
       ]
     },
     "TransitGatewayAttachmentState":{
       "type":"string",
       "enum":[
+        "initiating",
         "pendingAcceptance",
         "rollingBack",
         "pending",
@@ -30332,10 +34768,11 @@
         "failing"
       ]
     },
+    "TransitGatewayId":{"type":"string"},
     "TransitGatewayIdStringList":{
       "type":"list",
       "member":{
-        "shape":"String",
+        "shape":"TransitGatewayId",
         "locationName":"item"
       }
     },
@@ -30351,6 +34788,288 @@
       "max":1000,
       "min":5
     },
+    "TransitGatewayMulitcastDomainAssociationState":{
+      "type":"string",
+      "enum":[
+        "associating",
+        "associated",
+        "disassociating",
+        "disassociated"
+      ]
+    },
+    "TransitGatewayMulticastDeregisteredGroupMembers":{
+      "type":"structure",
+      "members":{
+        "TransitGatewayMulticastDomainId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the transit gateway multicast domain.</p>",
+          "locationName":"transitGatewayMulticastDomainId"
+        },
+        "DeregisteredNetworkInterfaceIds":{
+          "shape":"ValueStringList",
+          "documentation":"<p>The network interface IDs of the deregistered members.</p>",
+          "locationName":"deregisteredNetworkInterfaceIds"
+        },
+        "GroupIpAddress":{
+          "shape":"String",
+          "documentation":"<p>The IP address assigned to the transit gateway multicast group.</p>",
+          "locationName":"groupIpAddress"
+        }
+      },
+      "documentation":"<p>Describes the deregistered transit gateway multicast group members.</p>"
+    },
+    "TransitGatewayMulticastDeregisteredGroupSources":{
+      "type":"structure",
+      "members":{
+        "TransitGatewayMulticastDomainId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the transit gateway multicast domain.</p>",
+          "locationName":"transitGatewayMulticastDomainId"
+        },
+        "DeregisteredNetworkInterfaceIds":{
+          "shape":"ValueStringList",
+          "documentation":"<p>The network interface IDs of the non-registered members.</p>",
+          "locationName":"deregisteredNetworkInterfaceIds"
+        },
+        "GroupIpAddress":{
+          "shape":"String",
+          "documentation":"<p>The IP address assigned to the transit gateway multicast group.</p>",
+          "locationName":"groupIpAddress"
+        }
+      },
+      "documentation":"<p>Describes the deregistered transit gateway multicast group sources.</p>"
+    },
+    "TransitGatewayMulticastDomain":{
+      "type":"structure",
+      "members":{
+        "TransitGatewayMulticastDomainId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the transit gateway multicast domain.</p>",
+          "locationName":"transitGatewayMulticastDomainId"
+        },
+        "TransitGatewayId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the transit gateway.</p>",
+          "locationName":"transitGatewayId"
+        },
+        "State":{
+          "shape":"TransitGatewayMulticastDomainState",
+          "documentation":"<p>The state of the transit gateway multicast domain.</p>",
+          "locationName":"state"
+        },
+        "CreationTime":{
+          "shape":"DateTime",
+          "documentation":"<p>The time the transit gateway multicast domain was created.</p>",
+          "locationName":"creationTime"
+        },
+        "Tags":{
+          "shape":"TagList",
+          "documentation":"<p>The tags for the transit gateway multicast domain.</p>",
+          "locationName":"tagSet"
+        }
+      },
+      "documentation":"<p>Describes the transit gateway multicast domain.</p>"
+    },
+    "TransitGatewayMulticastDomainAssociation":{
+      "type":"structure",
+      "members":{
+        "TransitGatewayAttachmentId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the transit gateway attachment.</p>",
+          "locationName":"transitGatewayAttachmentId"
+        },
+        "ResourceId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the resource.</p>",
+          "locationName":"resourceId"
+        },
+        "ResourceType":{
+          "shape":"TransitGatewayAttachmentResourceType",
+          "documentation":"<p>The type of resource, for example a VPC attachment.</p>",
+          "locationName":"resourceType"
+        },
+        "Subnet":{
+          "shape":"SubnetAssociation",
+          "documentation":"<p>The subnet associated with the transit gateway multicast domain.</p>",
+          "locationName":"subnet"
+        }
+      },
+      "documentation":"<p>Describes the resources associated with the transit gateway multicast domain.</p>"
+    },
+    "TransitGatewayMulticastDomainAssociationList":{
+      "type":"list",
+      "member":{
+        "shape":"TransitGatewayMulticastDomainAssociation",
+        "locationName":"item"
+      }
+    },
+    "TransitGatewayMulticastDomainAssociations":{
+      "type":"structure",
+      "members":{
+        "TransitGatewayMulticastDomainId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the transit gateway multicast domain.</p>",
+          "locationName":"transitGatewayMulticastDomainId"
+        },
+        "TransitGatewayAttachmentId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the transit gateway attachment.</p>",
+          "locationName":"transitGatewayAttachmentId"
+        },
+        "ResourceId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the resource.</p>",
+          "locationName":"resourceId"
+        },
+        "ResourceType":{
+          "shape":"TransitGatewayAttachmentResourceType",
+          "documentation":"<p>The type of resource, for example a VPC attachment.</p>",
+          "locationName":"resourceType"
+        },
+        "Subnets":{
+          "shape":"SubnetAssociationList",
+          "documentation":"<p>The subnets associated with the multicast domain.</p>",
+          "locationName":"subnets"
+        }
+      },
+      "documentation":"<p>Describes the multicast domain associations.</p>"
+    },
+    "TransitGatewayMulticastDomainId":{"type":"string"},
+    "TransitGatewayMulticastDomainIdStringList":{
+      "type":"list",
+      "member":{
+        "shape":"TransitGatewayMulticastDomainId",
+        "locationName":"item"
+      }
+    },
+    "TransitGatewayMulticastDomainList":{
+      "type":"list",
+      "member":{
+        "shape":"TransitGatewayMulticastDomain",
+        "locationName":"item"
+      }
+    },
+    "TransitGatewayMulticastDomainState":{
+      "type":"string",
+      "enum":[
+        "pending",
+        "available",
+        "deleting",
+        "deleted"
+      ]
+    },
+    "TransitGatewayMulticastGroup":{
+      "type":"structure",
+      "members":{
+        "GroupIpAddress":{
+          "shape":"String",
+          "documentation":"<p>The IP address assigned to the transit gateway multicast group.</p>",
+          "locationName":"groupIpAddress"
+        },
+        "TransitGatewayAttachmentId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the transit gateway attachment.</p>",
+          "locationName":"transitGatewayAttachmentId"
+        },
+        "SubnetId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the subnet.</p>",
+          "locationName":"subnetId"
+        },
+        "ResourceId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the resource.</p>",
+          "locationName":"resourceId"
+        },
+        "ResourceType":{
+          "shape":"TransitGatewayAttachmentResourceType",
+          "documentation":"<p>The type of resource, for example a VPC attachment.</p>",
+          "locationName":"resourceType"
+        },
+        "NetworkInterfaceId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the transit gateway attachment.</p>",
+          "locationName":"networkInterfaceId"
+        },
+        "GroupMember":{
+          "shape":"Boolean",
+          "documentation":"<p>Indicates that the resource is a transit gateway multicast group member.</p>",
+          "locationName":"groupMember"
+        },
+        "GroupSource":{
+          "shape":"Boolean",
+          "documentation":"<p>Indicates that the resource is a transit gateway multicast group member.</p>",
+          "locationName":"groupSource"
+        },
+        "MemberType":{
+          "shape":"MembershipType",
+          "documentation":"<p>The member type (for example, <code>static</code>).</p>",
+          "locationName":"memberType"
+        },
+        "SourceType":{
+          "shape":"MembershipType",
+          "documentation":"<p>The source type.</p>",
+          "locationName":"sourceType"
+        }
+      },
+      "documentation":"<p>Describes the transit gateway multicast group resources.</p>"
+    },
+    "TransitGatewayMulticastGroupList":{
+      "type":"list",
+      "member":{
+        "shape":"TransitGatewayMulticastGroup",
+        "locationName":"item"
+      }
+    },
+    "TransitGatewayMulticastRegisteredGroupMembers":{
+      "type":"structure",
+      "members":{
+        "TransitGatewayMulticastDomainId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the transit gateway multicast domain.</p>",
+          "locationName":"transitGatewayMulticastDomainId"
+        },
+        "RegisteredNetworkInterfaceIds":{
+          "shape":"ValueStringList",
+          "documentation":"<p>The ID of the registered network interfaces.</p>",
+          "locationName":"registeredNetworkInterfaceIds"
+        },
+        "GroupIpAddress":{
+          "shape":"String",
+          "documentation":"<p>The IP address assigned to the transit gateway multicast group.</p>",
+          "locationName":"groupIpAddress"
+        }
+      },
+      "documentation":"<p>Describes the registered transit gateway multicast group members.</p>"
+    },
+    "TransitGatewayMulticastRegisteredGroupSources":{
+      "type":"structure",
+      "members":{
+        "TransitGatewayMulticastDomainId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the transit gateway multicast domain.</p>",
+          "locationName":"transitGatewayMulticastDomainId"
+        },
+        "RegisteredNetworkInterfaceIds":{
+          "shape":"ValueStringList",
+          "documentation":"<p>The IDs of the network interfaces members registered with the transit gateway multicast group.</p>",
+          "locationName":"registeredNetworkInterfaceIds"
+        },
+        "GroupIpAddress":{
+          "shape":"String",
+          "documentation":"<p>The IP address assigned to the transit gateway multicast group.</p>",
+          "locationName":"groupIpAddress"
+        }
+      },
+      "documentation":"<p>Describes the members registered with the transit gateway multicast group.</p>"
+    },
+    "TransitGatewayNetworkInterfaceIdList":{
+      "type":"list",
+      "member":{
+        "shape":"NetworkInterfaceId",
+        "locationName":"item"
+      }
+    },
     "TransitGatewayOptions":{
       "type":"structure",
       "members":{
@@ -30393,15 +35112,68 @@
           "shape":"DnsSupportValue",
           "documentation":"<p>Indicates whether DNS support is enabled.</p>",
           "locationName":"dnsSupport"
+        },
+        "MulticastSupport":{
+          "shape":"MulticastSupportValue",
+          "documentation":"<p>Indicates whether multicast is enabled on the transit gateway</p>",
+          "locationName":"multicastSupport"
         }
       },
       "documentation":"<p>Describes the options for a transit gateway.</p>"
     },
-    "TransitGatewayPropagation":{
+    "TransitGatewayPeeringAttachment":{
       "type":"structure",
       "members":{
         "TransitGatewayAttachmentId":{
           "shape":"String",
+          "documentation":"<p>The ID of the transit gateway peering attachment.</p>",
+          "locationName":"transitGatewayAttachmentId"
+        },
+        "RequesterTgwInfo":{
+          "shape":"PeeringTgwInfo",
+          "documentation":"<p>Information about the requester transit gateway.</p>",
+          "locationName":"requesterTgwInfo"
+        },
+        "AccepterTgwInfo":{
+          "shape":"PeeringTgwInfo",
+          "documentation":"<p>Information about the accepter transit gateway.</p>",
+          "locationName":"accepterTgwInfo"
+        },
+        "Status":{
+          "shape":"PeeringAttachmentStatus",
+          "documentation":"<p>The status of the transit gateway peering attachment.</p>",
+          "locationName":"status"
+        },
+        "State":{
+          "shape":"TransitGatewayAttachmentState",
+          "documentation":"<p>The state of the transit gateway peering attachment.</p>",
+          "locationName":"state"
+        },
+        "CreationTime":{
+          "shape":"DateTime",
+          "documentation":"<p>The time the transit gateway peering attachment was created.</p>",
+          "locationName":"creationTime"
+        },
+        "Tags":{
+          "shape":"TagList",
+          "documentation":"<p>The tags for the transit gateway peering attachment.</p>",
+          "locationName":"tagSet"
+        }
+      },
+      "documentation":"<p>Describes the transit gateway peering attachment.</p>"
+    },
+    "TransitGatewayPeeringAttachmentList":{
+      "type":"list",
+      "member":{
+        "shape":"TransitGatewayPeeringAttachment",
+        "locationName":"item"
+      }
+    },
+    "TransitGatewayPropagation":{
+      "type":"structure",
+      "members":{
+        "TransitGatewayAttachmentId":{
+          "shape":"TransitGatewayAttachmentId",
           "documentation":"<p>The ID of the attachment.</p>",
           "locationName":"transitGatewayAttachmentId"
         },
@@ -30463,6 +35235,10 @@
         "DnsSupport":{
           "shape":"DnsSupportValue",
           "documentation":"<p>Enable or disable DNS support.</p>"
+        },
+        "MulticastSupport":{
+          "shape":"MulticastSupportValue",
+          "documentation":"<p>Indicates whether multicast is enabled on the transit gateway</p>"
         }
       },
       "documentation":"<p>Describes the options for a transit gateway.</p>"
@@ -30612,10 +35388,11 @@
         "locationName":"item"
       }
     },
+    "TransitGatewayRouteTableId":{"type":"string"},
     "TransitGatewayRouteTableIdStringList":{
       "type":"list",
       "member":{
-        "shape":"String",
+        "shape":"TransitGatewayRouteTableId",
         "locationName":"item"
       }
     },
@@ -30685,6 +35462,13 @@
         "deleted"
       ]
     },
+    "TransitGatewaySubnetIdList":{
+      "type":"list",
+      "member":{
+        "shape":"SubnetId",
+        "locationName":"item"
+      }
+    },
     "TransitGatewayVpcAttachment":{
       "type":"structure",
       "members":{
@@ -30753,7 +35537,7 @@
         },
         "Ipv6Support":{
           "shape":"Ipv6SupportValue",
-          "documentation":"<p>Indicates whether IPv6 support is enabled.</p>",
+          "documentation":"<p>Indicates whether IPv6 support is disabled.</p>",
           "locationName":"ipv6Support"
         }
       },
@@ -30872,7 +35656,7 @@
           "locationName":"ipv6Addresses"
         },
         "NetworkInterfaceId":{
-          "shape":"String",
+          "shape":"NetworkInterfaceId",
           "documentation":"<p>The ID of the network interface.</p>",
           "locationName":"networkInterfaceId"
         }
@@ -30901,7 +35685,7 @@
       ],
       "members":{
         "NetworkInterfaceId":{
-          "shape":"String",
+          "shape":"NetworkInterfaceId",
           "documentation":"<p>The ID of the network interface.</p>",
           "locationName":"networkInterfaceId"
         },
@@ -30913,6 +35697,14 @@
       },
       "documentation":"<p>Contains the parameters for UnassignPrivateIpAddresses.</p>"
     },
+    "UnlimitedSupportedInstanceFamily":{
+      "type":"string",
+      "enum":[
+        "t2",
+        "t3",
+        "t3a"
+      ]
+    },
     "UnmonitorInstancesRequest":{
       "type":"structure",
       "required":["InstanceIds"],
@@ -30958,11 +35750,11 @@
         },
         "Error":{
           "shape":"UnsuccessfulInstanceCreditSpecificationItemError",
-          "documentation":"<p>The applicable error for the T2 or T3 instance whose credit option for CPU usage was not modified.</p>",
+          "documentation":"<p>The applicable error for the burstable performance instance whose credit option for CPU usage was not modified.</p>",
           "locationName":"error"
         }
       },
-      "documentation":"<p>Describes the T2 or T3 instance whose credit option for CPU usage was not modified.</p>"
+      "documentation":"<p>Describes the burstable performance instance whose credit option for CPU usage was not modified.</p>"
     },
     "UnsuccessfulInstanceCreditSpecificationItemError":{
       "type":"structure",
@@ -30978,7 +35770,7 @@
           "locationName":"message"
         }
       },
-      "documentation":"<p>Information about the error for the T2 or T3 instance whose credit option for CPU usage was not modified.</p>"
+      "documentation":"<p>Information about the error for the burstable performance instance whose credit option for CPU usage was not modified.</p>"
     },
     "UnsuccessfulInstanceCreditSpecificationSet":{
       "type":"list",
@@ -31042,11 +35834,11 @@
           "documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>"
         },
         "GroupId":{
-          "shape":"String",
+          "shape":"SecurityGroupId",
           "documentation":"<p>The ID of the security group. You must specify either the security group ID or the security group name in the request. For security groups in a nondefault VPC, you must specify the security group ID.</p>"
         },
         "GroupName":{
-          "shape":"String",
+          "shape":"SecurityGroupName",
           "documentation":"<p>[Default VPC] The name of the security group. You must specify either the security group ID or the security group name in the request.</p>"
         },
         "IpPermissions":{
@@ -31074,11 +35866,11 @@
           "documentation":"<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>"
         },
         "GroupId":{
-          "shape":"String",
+          "shape":"SecurityGroupId",
           "documentation":"<p>The ID of the security group. You must specify either the security group ID or the security group name in the request. For security groups in a nondefault VPC, you must specify the security group ID.</p>"
         },
         "GroupName":{
-          "shape":"String",
+          "shape":"SecurityGroupName",
           "documentation":"<p>[EC2-Classic, default VPC] The name of the security group. You must specify either the security group ID or the security group name in the request.</p>"
         },
         "IpPermissions":{
@@ -31097,6 +35889,20 @@
         }
       }
     },
+    "UsageClassType":{
+      "type":"string",
+      "enum":[
+        "spot",
+        "on-demand"
+      ]
+    },
+    "UsageClassTypeList":{
+      "type":"list",
+      "member":{
+        "shape":"UsageClassType",
+        "locationName":"item"
+      }
+    },
     "UserBucket":{
       "type":"structure",
       "members":{
@@ -31136,7 +35942,8 @@
           "locationName":"data"
         }
       },
-      "documentation":"<p>Describes the user data for an instance.</p>"
+      "documentation":"<p>Describes the user data for an instance.</p>",
+      "sensitive":true
     },
     "UserGroupStringList":{
       "type":"list",
@@ -31207,6 +36014,38 @@
         "locationName":"UserId"
       }
     },
+    "VCpuCount":{"type":"integer"},
+    "VCpuInfo":{
+      "type":"structure",
+      "members":{
+        "DefaultVCpus":{
+          "shape":"VCpuCount",
+          "documentation":"<p>The default number of vCPUs for the instance type.</p>",
+          "locationName":"defaultVCpus"
+        },
+        "DefaultCores":{
+          "shape":"CoreCount",
+          "documentation":"<p>The default number of cores for the instance type.</p>",
+          "locationName":"defaultCores"
+        },
+        "DefaultThreadsPerCore":{
+          "shape":"ThreadsPerCore",
+          "documentation":"<p>The default number of threads per core for the instance type.</p>",
+          "locationName":"defaultThreadsPerCore"
+        },
+        "ValidCores":{
+          "shape":"CoreCountList",
+          "documentation":"<p>List of the valid number of cores that can be configured for the instance type.</p>",
+          "locationName":"validCores"
+        },
+        "ValidThreadsPerCore":{
+          "shape":"ThreadsPerCoreList",
+          "documentation":"<p>List of the valid number of threads per core that can be configured for the instance type. </p>",
+          "locationName":"validThreadsPerCore"
+        }
+      },
+      "documentation":"<p>Describes the vCPU configurations for the instance type.</p>"
+    },
     "ValueStringList":{
       "type":"list",
       "member":{
@@ -31303,6 +36142,11 @@
           "documentation":"<p>The Amazon Resource Name (ARN) of the AWS Key Management Service (AWS KMS) customer master key (CMK) that was used to protect the volume encryption key for the volume.</p>",
           "locationName":"kmsKeyId"
         },
+        "OutpostArn":{
+          "shape":"String",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the Outpost.</p>",
+          "locationName":"outpostArn"
+        },
         "Size":{
           "shape":"Integer",
           "documentation":"<p>The size of the volume, in GiBs.</p>",
@@ -31337,6 +36181,16 @@
           "shape":"VolumeType",
           "documentation":"<p>The volume type. This can be <code>gp2</code> for General Purpose SSD, <code>io1</code> for Provisioned IOPS SSD, <code>st1</code> for Throughput Optimized HDD, <code>sc1</code> for Cold HDD, or <code>standard</code> for Magnetic volumes.</p>",
           "locationName":"volumeType"
+        },
+        "FastRestored":{
+          "shape":"Boolean",
+          "documentation":"<p>Indicates whether the volume was created using fast snapshot restore.</p>",
+          "locationName":"fastRestored"
+        },
+        "MultiAttachEnabled":{
+          "shape":"Boolean",
+          "documentation":"<p>Indicates whether Amazon EBS Multi-Attach is enabled.</p>",
+          "locationName":"multiAttachEnabled"
         }
       },
       "documentation":"<p>Describes a volume.</p>"
@@ -31413,10 +36267,11 @@
       },
       "documentation":"<p>Describes an EBS volume.</p>"
     },
+    "VolumeId":{"type":"string"},
     "VolumeIdStringList":{
       "type":"list",
       "member":{
-        "shape":"String",
+        "shape":"VolumeId",
         "locationName":"VolumeId"
       }
     },
@@ -31553,6 +36408,29 @@
         "locationName":"item"
       }
     },
+    "VolumeStatusAttachmentStatus":{
+      "type":"structure",
+      "members":{
+        "IoPerformance":{
+          "shape":"String",
+          "documentation":"<p>The maximum IOPS supported by the attached instance.</p>",
+          "locationName":"ioPerformance"
+        },
+        "InstanceId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the attached instance.</p>",
+          "locationName":"instanceId"
+        }
+      },
+      "documentation":"<p>Information about the instances to which the volume is attached.</p>"
+    },
+    "VolumeStatusAttachmentStatusList":{
+      "type":"list",
+      "member":{
+        "shape":"VolumeStatusAttachmentStatus",
+        "locationName":"item"
+      }
+    },
     "VolumeStatusDetails":{
       "type":"structure",
       "members":{
@@ -31595,14 +36473,19 @@
           "locationName":"eventType"
         },
         "NotAfter":{
-          "shape":"DateTime",
+          "shape":"MillisecondDateTime",
           "documentation":"<p>The latest end time of the event.</p>",
           "locationName":"notAfter"
         },
         "NotBefore":{
-          "shape":"DateTime",
+          "shape":"MillisecondDateTime",
           "documentation":"<p>The earliest start time of the event.</p>",
           "locationName":"notBefore"
+        },
+        "InstanceId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the instance associated with the event.</p>",
+          "locationName":"instanceId"
         }
       },
       "documentation":"<p>Describes a volume status event.</p>"
@@ -31651,6 +36534,11 @@
           "documentation":"<p>The Availability Zone of the volume.</p>",
           "locationName":"availabilityZone"
         },
+        "OutpostArn":{
+          "shape":"String",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the Outpost.</p>",
+          "locationName":"outpostArn"
+        },
         "Events":{
           "shape":"VolumeStatusEventsList",
           "documentation":"<p>A list of events associated with the volume.</p>",
@@ -31665,6 +36553,11 @@
           "shape":"VolumeStatusInfo",
           "documentation":"<p>The volume status.</p>",
           "locationName":"volumeStatus"
+        },
+        "AttachmentStatuses":{
+          "shape":"VolumeStatusAttachmentStatusList",
+          "documentation":"<p>Information about the instances to which the volume is attached.</p>",
+          "locationName":"attachmentStatuses"
         }
       },
       "documentation":"<p>Describes the volume status.</p>"
@@ -31779,6 +36672,7 @@
         "enableDnsHostnames"
       ]
     },
+    "VpcCidrAssociationId":{"type":"string"},
     "VpcCidrBlockAssociation":{
       "type":"structure",
       "members":{
@@ -31858,7 +36752,7 @@
     "VpcClassicLinkIdList":{
       "type":"list",
       "member":{
-        "shape":"String",
+        "shape":"VpcId",
         "locationName":"VpcId"
       }
     },
@@ -31914,7 +36808,7 @@
         },
         "Groups":{
           "shape":"GroupIdentifierSet",
-          "documentation":"<p>(Interface endpoint) Information about the security groups associated with the network interface.</p>",
+          "documentation":"<p>(Interface endpoint) Information about the security groups that are associated with the network interface.</p>",
           "locationName":"groupSet"
         },
         "PrivateDnsEnabled":{
@@ -31939,7 +36833,7 @@
         },
         "CreationTimestamp":{
           "shape":"MillisecondDateTime",
-          "documentation":"<p>The date and time the VPC endpoint was created.</p>",
+          "documentation":"<p>The date and time that the VPC endpoint was created.</p>",
           "locationName":"creationTimestamp"
         },
         "Tags":{
@@ -31951,6 +36845,11 @@
           "shape":"String",
           "documentation":"<p>The ID of the AWS account that owns the VPC endpoint.</p>",
           "locationName":"ownerId"
+        },
+        "LastError":{
+          "shape":"LastError",
+          "documentation":"<p>The last error that occurred for VPC endpoint.</p>",
+          "locationName":"lastError"
         }
       },
       "documentation":"<p>Describes a VPC endpoint.</p>"
@@ -31980,7 +36879,7 @@
         },
         "CreationTimestamp":{
           "shape":"MillisecondDateTime",
-          "documentation":"<p>The date and time the VPC endpoint was created.</p>",
+          "documentation":"<p>The date and time that the VPC endpoint was created.</p>",
           "locationName":"creationTimestamp"
         },
         "DnsEntries":{
@@ -32003,6 +36902,36 @@
         "locationName":"item"
       }
     },
+    "VpcEndpointId":{"type":"string"},
+    "VpcEndpointIdList":{
+      "type":"list",
+      "member":{
+        "shape":"VpcEndpointId",
+        "locationName":"item"
+      }
+    },
+    "VpcEndpointRouteTableIdList":{
+      "type":"list",
+      "member":{
+        "shape":"RouteTableId",
+        "locationName":"item"
+      }
+    },
+    "VpcEndpointSecurityGroupIdList":{
+      "type":"list",
+      "member":{
+        "shape":"SecurityGroupId",
+        "locationName":"item"
+      }
+    },
+    "VpcEndpointServiceId":{"type":"string"},
+    "VpcEndpointServiceIdList":{
+      "type":"list",
+      "member":{
+        "shape":"VpcEndpointServiceId",
+        "locationName":"item"
+      }
+    },
     "VpcEndpointSet":{
       "type":"list",
       "member":{
@@ -32010,6 +36939,13 @@
         "locationName":"item"
       }
     },
+    "VpcEndpointSubnetIdList":{
+      "type":"list",
+      "member":{
+        "shape":"SubnetId",
+        "locationName":"item"
+      }
+    },
     "VpcEndpointType":{
       "type":"string",
       "enum":[
@@ -32017,10 +36953,12 @@
         "Gateway"
       ]
     },
+    "VpcFlowLogId":{"type":"string"},
+    "VpcId":{"type":"string"},
     "VpcIdStringList":{
       "type":"list",
       "member":{
-        "shape":"String",
+        "shape":"VpcId",
         "locationName":"VpcId"
       }
     },
@@ -32041,6 +36979,16 @@
           "shape":"VpcCidrBlockState",
           "documentation":"<p>Information about the state of the CIDR block.</p>",
           "locationName":"ipv6CidrBlockState"
+        },
+        "NetworkBorderGroup":{
+          "shape":"String",
+          "documentation":"<p>The name of the location from which we advertise the IPV6 CIDR block.</p>",
+          "locationName":"networkBorderGroup"
+        },
+        "Ipv6Pool":{
+          "shape":"String",
+          "documentation":"<p>The ID of the IPv6 address pool from which the IPv6 CIDR block is allocated.</p>",
+          "locationName":"ipv6Pool"
         }
       },
       "documentation":"<p>Describes an IPv6 CIDR block associated with a VPC.</p>"
@@ -32095,6 +37043,14 @@
       },
       "documentation":"<p>Describes a VPC peering connection.</p>"
     },
+    "VpcPeeringConnectionId":{"type":"string"},
+    "VpcPeeringConnectionIdList":{
+      "type":"list",
+      "member":{
+        "shape":"VpcPeeringConnectionId",
+        "locationName":"item"
+      }
+    },
     "VpcPeeringConnectionList":{
       "type":"list",
       "member":{
@@ -32271,10 +37227,11 @@
       },
       "documentation":"<p>Describes a VPN connection.</p>"
     },
+    "VpnConnectionId":{"type":"string"},
     "VpnConnectionIdStringList":{
       "type":"list",
       "member":{
-        "shape":"String",
+        "shape":"VpnConnectionId",
         "locationName":"VpnConnectionId"
       }
     },
@@ -32288,6 +37245,11 @@
     "VpnConnectionOptions":{
       "type":"structure",
       "members":{
+        "EnableAcceleration":{
+          "shape":"Boolean",
+          "documentation":"<p>Indicates whether acceleration is enabled for the VPN connection.</p>",
+          "locationName":"enableAcceleration"
+        },
         "StaticRoutesOnly":{
           "shape":"Boolean",
           "documentation":"<p>Indicates whether the VPN connection uses static routes only. Static routes must be used for devices that don't support BGP.</p>",
@@ -32304,6 +37266,10 @@
     "VpnConnectionOptionsSpecification":{
       "type":"structure",
       "members":{
+        "EnableAcceleration":{
+          "shape":"Boolean",
+          "documentation":"<p>Indicate whether to enable acceleration for the VPN connection.</p> <p>Default: <code>false</code> </p>"
+        },
         "StaticRoutesOnly":{
           "shape":"Boolean",
           "documentation":"<p>Indicate whether the VPN connection uses static routes only. If you are creating a VPN connection for a device that does not support BGP, you must specify <code>true</code>. Use <a>CreateVpnConnectionRoute</a> to create a static route.</p> <p>Default: <code>false</code> </p>",
@@ -32364,10 +37330,11 @@
       },
       "documentation":"<p>Describes a virtual private gateway.</p>"
     },
+    "VpnGatewayId":{"type":"string"},
     "VpnGatewayIdStringList":{
       "type":"list",
       "member":{
-        "shape":"String",
+        "shape":"VpnGatewayId",
         "locationName":"VpnGatewayId"
       }
     },
@@ -32494,7 +37461,7 @@
           "locationName":"IKEVersion"
         }
       },
-      "documentation":"<p>The tunnel options for a VPN connection.</p>"
+      "documentation":"<p>The tunnel options for a single VPN tunnel.</p>"
     },
     "VpnTunnelOptionsSpecificationsList":{
       "type":"list",
@@ -32506,7 +37473,7 @@
       "members":{
         "Cidr":{
           "shape":"String",
-          "documentation":"<p>The public IPv4 address range, in CIDR notation.</p>"
+          "documentation":"<p>The address range, in CIDR notation.</p>"
         },
         "DryRun":{
           "shape":"Boolean",
@@ -32544,7 +37511,9 @@
         "Availability Zone",
         "Region"
       ]
-    }
+    },
+    "totalFpgaMemory":{"type":"integer"},
+    "totalGpuMemory":{"type":"integer"}
   },
   "documentation":"<fullname>Amazon Elastic Compute Cloud</fullname> <p>Amazon Elastic Compute Cloud (Amazon EC2) provides secure and resizable computing capacity in the AWS cloud. Using Amazon EC2 eliminates the need to invest in hardware up front, so you can develop and deploy applications faster.</p> <p>To learn more, see the following resources:</p> <ul> <li> <p>Amazon EC2: <a href=\"http://aws.amazon.com/ec2\">AmazonEC2 product page</a>, <a href=\"http://aws.amazon.com/documentation/ec2\">Amazon EC2 documentation</a> </p> </li> <li> <p>Amazon EBS: <a href=\"http://aws.amazon.com/ebs\">Amazon EBS product page</a>, <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/AmazonEBS.html\">Amazon EBS documentation</a> </p> </li> <li> <p>Amazon VPC: <a href=\"http://aws.amazon.com/vpc\">Amazon VPC product page</a>, <a href=\"http://aws.amazon.com/documentation/vpc\">Amazon VPC documentation</a> </p> </li> <li> <p>AWS VPN: <a href=\"http://aws.amazon.com/vpn\">AWS VPN product page</a>, <a href=\"http://aws.amazon.com/documentation/vpn\">AWS VPN documentation</a> </p> </li> </ul>"
 }
diff --git a/services/ec2/src/main/resources/codegen-resources/waiters-2.json b/services/ec2/src/main/resources/codegen-resources/waiters-2.json
index 33ea7b047164..31c1513e3c8e 100755
--- a/services/ec2/src/main/resources/codegen-resources/waiters-2.json
+++ b/services/ec2/src/main/resources/codegen-resources/waiters-2.json
@@ -379,6 +379,24 @@
         }
       ]
     },
+    "SecurityGroupExists": {
+      "operation": "DescribeSecurityGroups",
+      "delay": 5,
+      "maxAttempts": 6,
+      "acceptors": [
+        {
+          "expected": true,
+          "matcher": "path",
+          "state": "success",
+          "argument": "length(SecurityGroups[].GroupId) > `0`"
+        },
+        {
+          "expected": "InvalidGroupNotFound",
+          "matcher": "error",
+          "state": "retry"
+        }
+      ]
+    },
     "SpotInstanceRequestFulfilled": {
       "operation": "DescribeSpotInstanceRequests",
       "maxAttempts": 40,
diff --git a/services/ec2/src/test/java/software/amazon/awssdk/services/ec2/Ec2AutoPaginatorIntegrationTest.java b/services/ec2/src/test/java/software/amazon/awssdk/services/ec2/Ec2AutoPaginatorIntegrationTest.java
index 89667b7972ea..292b3008a004 100644
--- a/services/ec2/src/test/java/software/amazon/awssdk/services/ec2/Ec2AutoPaginatorIntegrationTest.java
+++ b/services/ec2/src/test/java/software/amazon/awssdk/services/ec2/Ec2AutoPaginatorIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/ec2/src/test/java/software/amazon/awssdk/services/ec2/Ec2ResponseMetadataIntegrationTest.java b/services/ec2/src/test/java/software/amazon/awssdk/services/ec2/Ec2ResponseMetadataIntegrationTest.java
index 5f6b9acc59b8..12bb0b420299 100644
--- a/services/ec2/src/test/java/software/amazon/awssdk/services/ec2/Ec2ResponseMetadataIntegrationTest.java
+++ b/services/ec2/src/test/java/software/amazon/awssdk/services/ec2/Ec2ResponseMetadataIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/ec2/src/test/java/software/amazon/awssdk/services/ec2/transform/internal/GeneratePreSignUrlInterceptorTest.java b/services/ec2/src/test/java/software/amazon/awssdk/services/ec2/transform/internal/GeneratePreSignUrlInterceptorTest.java
new file mode 100644
index 000000000000..f7c25287a02e
--- /dev/null
+++ b/services/ec2/src/test/java/software/amazon/awssdk/services/ec2/transform/internal/GeneratePreSignUrlInterceptorTest.java
@@ -0,0 +1,121 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.services.ec2.transform.internal;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.when;
+import static software.amazon.awssdk.auth.signer.AwsSignerExecutionAttribute.AWS_CREDENTIALS;
+import java.net.URI;
+import java.time.Clock;
+import java.time.Instant;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
+import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
+import software.amazon.awssdk.core.interceptor.Context;
+import software.amazon.awssdk.core.interceptor.ExecutionAttributes;
+import software.amazon.awssdk.http.SdkHttpFullRequest;
+import software.amazon.awssdk.http.SdkHttpMethod;
+import software.amazon.awssdk.http.SdkHttpRequest;
+import software.amazon.awssdk.services.ec2.model.CopySnapshotRequest;
+
+@RunWith(MockitoJUnitRunner.class)
+public class GeneratePreSignUrlInterceptorTest {
+    private static final GeneratePreSignUrlInterceptor INTERCEPTOR = new GeneratePreSignUrlInterceptor();
+
+    @Mock
+    private Context.ModifyHttpRequest mockContext;
+
+    @Test
+    public void copySnapshotRequest_httpsProtocolAddedToEndpoint() {
+        SdkHttpFullRequest request = SdkHttpFullRequest.builder()
+                .uri(URI.create("https://ec2.us-west-2.amazonaws.com"))
+                .method(SdkHttpMethod.POST)
+                .build();
+
+        CopySnapshotRequest ec2Request = CopySnapshotRequest.builder()
+                .sourceRegion("us-west-2")
+                .destinationRegion("us-east-2")
+                .build();
+
+        when(mockContext.httpRequest()).thenReturn(request);
+        when(mockContext.request()).thenReturn(ec2Request);
+
+        ExecutionAttributes attrs = new ExecutionAttributes();
+        attrs.putAttribute(AWS_CREDENTIALS, AwsBasicCredentials.create("foo", "bar"));
+
+        SdkHttpRequest modifiedRequest = INTERCEPTOR.modifyHttpRequest(mockContext, attrs);
+
+        String presignedUrl = modifiedRequest.rawQueryParameters().get("PresignedUrl").get(0);
+
+        assertThat(presignedUrl).startsWith("https://");
+    }
+
+    @Test
+    public void copySnapshotRequest_generatesCorrectPresignedUrl() {
+        // Expected URL was derived by first making a request to EC2 using
+        // valid credentials and a KMS encrypted snapshot and verifying that
+        // the snapshot was copied to the destination region, also encrypted.
+        // Then the same code was used to make a second request, changing only
+        // the credentials and snapshot ID.
+        String expectedPresignedUrl = "https://ec2.us-west-2.amazonaws.com?Action=CopySnapshot" +
+                "&Version=2016-11-15" +
+                "&DestinationRegion=us-east-1" +
+                "&SourceRegion=us-west-2" +
+                "&SourceSnapshotId=SNAPSHOT_ID" +
+                "&X-Amz-Algorithm=AWS4-HMAC-SHA256" +
+                "&X-Amz-Date=20200107T205609Z" +
+                "&X-Amz-SignedHeaders=host" +
+                "&X-Amz-Expires=604800" +
+                "&X-Amz-Credential=akid%2F20200107%2Fus-west-2%2Fec2%2Faws4_request" +
+                "&X-Amz-Signature=c1f5e34834292a86ff2b46b5e97cebaf2967b09641b4e2e60a382a37d137a03b";
+
+        ZoneId utcZone = ZoneId.of("UTC").normalized();
+
+        // Same signing date as the one used for the request above
+        Instant signingInstant = ZonedDateTime.of(2020, 1, 7, 20, 56, 9, 0, utcZone).toInstant();
+        Clock signingClock = Clock.fixed(signingInstant, utcZone);
+
+        GeneratePreSignUrlInterceptor interceptor = new GeneratePreSignUrlInterceptor(signingClock);
+
+        // These details don't really affect the test as they're not used in generating the signed URL
+        SdkHttpFullRequest request = SdkHttpFullRequest.builder()
+                .uri(URI.create("https://ec2.us-west-2.amazonaws.com"))
+                .method(SdkHttpMethod.POST)
+                .build();
+
+        CopySnapshotRequest ec2Request = CopySnapshotRequest.builder()
+                .sourceRegion("us-west-2")
+                .destinationRegion("us-east-1")
+                .sourceSnapshotId("SNAPSHOT_ID")
+                .build();
+
+        when(mockContext.httpRequest()).thenReturn(request);
+        when(mockContext.request()).thenReturn(ec2Request);
+
+        ExecutionAttributes attrs = new ExecutionAttributes();
+        attrs.putAttribute(AWS_CREDENTIALS, AwsBasicCredentials.create("akid", "skid"));
+
+        SdkHttpRequest modifiedRequest = interceptor.modifyHttpRequest(mockContext, attrs);
+
+        String generatedPresignedUrl = modifiedRequest.rawQueryParameters().get("PresignedUrl").get(0);
+
+        assertThat(generatedPresignedUrl).isEqualTo(expectedPresignedUrl);
+    }
+}
diff --git a/services/ec2instanceconnect/pom.xml b/services/ec2instanceconnect/pom.xml
index 8c8bd72c5fc7..35ad580c4d23 100644
--- a/services/ec2instanceconnect/pom.xml
+++ b/services/ec2instanceconnect/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>ec2instanceconnect</artifactId>
     <name>AWS Java SDK :: Services :: EC2 Instance Connect</name>
diff --git a/services/ecr/build.properties b/services/ecr/build.properties
index ecf2dae6fcb1..15ec2da1fc71 100644
--- a/services/ecr/build.properties
+++ b/services/ecr/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/ecr/pom.xml b/services/ecr/pom.xml
index 1f244083d748..a72e16e2c36b 100644
--- a/services/ecr/pom.xml
+++ b/services/ecr/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>ecr</artifactId>
     <name>AWS Java SDK :: Services :: Amazon EC2 Container Registry</name>
diff --git a/services/ecr/src/it/java/software/amazon/awssdk/services/ecr/EcrIntegrationTest.java b/services/ecr/src/it/java/software/amazon/awssdk/services/ecr/EcrIntegrationTest.java
index e3523689cce6..1d3d08684012 100644
--- a/services/ecr/src/it/java/software/amazon/awssdk/services/ecr/EcrIntegrationTest.java
+++ b/services/ecr/src/it/java/software/amazon/awssdk/services/ecr/EcrIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/ecr/src/main/resources/codegen-resources/service-2.json b/services/ecr/src/main/resources/codegen-resources/service-2.json
index 9f4a831089a1..182d8f8641e9 100755
--- a/services/ecr/src/main/resources/codegen-resources/service-2.json
+++ b/services/ecr/src/main/resources/codegen-resources/service-2.json
@@ -27,7 +27,7 @@
         {"shape":"InvalidParameterException"},
         {"shape":"ServerException"}
       ],
-      "documentation":"<p>Check the availability of multiple image layers in a specified registry and repository.</p> <note> <p>This operation is used by the Amazon ECR proxy, and it is not intended for general use by customers for pulling and pushing images. In most cases, you should use the <code>docker</code> CLI to pull, tag, and push images.</p> </note>"
+      "documentation":"<p>Checks the availability of one or more image layers in a repository.</p> <p>When an image is pushed to a repository, each image layer is checked to verify if it has been uploaded before. If it is, then the image layer is skipped.</p> <p>When an image is pulled from a repository, each image layer is checked once to verify it is available to be pulled.</p> <note> <p>This operation is used by the Amazon ECR proxy, and it is not intended for general use by customers for pulling and pushing images. In most cases, you should use the <code>docker</code> CLI to pull, tag, and push images.</p> </note>"
     },
     "BatchDeleteImage":{
       "name":"BatchDeleteImage",
@@ -42,7 +42,7 @@
         {"shape":"InvalidParameterException"},
         {"shape":"RepositoryNotFoundException"}
       ],
-      "documentation":"<p>Deletes a list of specified images within a specified repository. Images are specified with either <code>imageTag</code> or <code>imageDigest</code>.</p> <p>You can remove a tag from an image by specifying the image's tag in your request. When you remove the last tag from an image, the image is deleted from your repository.</p> <p>You can completely delete an image (and all of its tags) by specifying the image's digest in your request.</p>"
+      "documentation":"<p>Deletes a list of specified images within a repository. Images are specified with either an <code>imageTag</code> or <code>imageDigest</code>.</p> <p>You can remove a tag from an image by specifying the image's tag in your request. When you remove the last tag from an image, the image is deleted from your repository.</p> <p>You can completely delete an image (and all of its tags) by specifying the image's digest in your request.</p>"
     },
     "BatchGetImage":{
       "name":"BatchGetImage",
@@ -57,7 +57,7 @@
         {"shape":"InvalidParameterException"},
         {"shape":"RepositoryNotFoundException"}
       ],
-      "documentation":"<p>Gets detailed information for specified images within a specified repository. Images are specified with either <code>imageTag</code> or <code>imageDigest</code>.</p>"
+      "documentation":"<p>Gets detailed information for an image. Images are specified with either an <code>imageTag</code> or <code>imageDigest</code>.</p> <p>When an image is pulled, the BatchGetImage API is called once to retrieve the image manifest.</p>"
     },
     "CompleteLayerUpload":{
       "name":"CompleteLayerUpload",
@@ -77,7 +77,7 @@
         {"shape":"LayerAlreadyExistsException"},
         {"shape":"EmptyUploadException"}
       ],
-      "documentation":"<p>Informs Amazon ECR that the image layer upload has completed for a specified registry, repository name, and upload ID. You can optionally provide a <code>sha256</code> digest of the image layer for data validation purposes.</p> <note> <p>This operation is used by the Amazon ECR proxy, and it is not intended for general use by customers for pulling and pushing images. In most cases, you should use the <code>docker</code> CLI to pull, tag, and push images.</p> </note>"
+      "documentation":"<p>Informs Amazon ECR that the image layer upload has completed for a specified registry, repository name, and upload ID. You can optionally provide a <code>sha256</code> digest of the image layer for data validation purposes.</p> <p>When an image is pushed, the CompleteLayerUpload API is called once per each new image layer to verify that the upload has completed.</p> <note> <p>This operation is used by the Amazon ECR proxy, and it is not intended for general use by customers for pulling and pushing images. In most cases, you should use the <code>docker</code> CLI to pull, tag, and push images.</p> </note>"
     },
     "CreateRepository":{
       "name":"CreateRepository",
@@ -95,7 +95,7 @@
         {"shape":"RepositoryAlreadyExistsException"},
         {"shape":"LimitExceededException"}
       ],
-      "documentation":"<p>Creates an Amazon Elastic Container Registry (Amazon ECR) repository, where users can push and pull Docker images. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonECR/latest/userguide/Repositories.html\">Amazon ECR Repositories</a> in the <i>Amazon Elastic Container Registry User Guide</i>.</p>"
+      "documentation":"<p>Creates a repository. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonECR/latest/userguide/Repositories.html\">Amazon ECR Repositories</a> in the <i>Amazon Elastic Container Registry User Guide</i>.</p>"
     },
     "DeleteLifecyclePolicy":{
       "name":"DeleteLifecyclePolicy",
@@ -111,7 +111,7 @@
         {"shape":"RepositoryNotFoundException"},
         {"shape":"LifecyclePolicyNotFoundException"}
       ],
-      "documentation":"<p>Deletes the specified lifecycle policy.</p>"
+      "documentation":"<p>Deletes the lifecycle policy associated with the specified repository.</p>"
     },
     "DeleteRepository":{
       "name":"DeleteRepository",
@@ -127,7 +127,7 @@
         {"shape":"RepositoryNotFoundException"},
         {"shape":"RepositoryNotEmptyException"}
       ],
-      "documentation":"<p>Deletes an existing image repository. If a repository contains images, you must use the <code>force</code> option to delete it.</p>"
+      "documentation":"<p>Deletes a repository. If the repository contains images, you must either delete all images in the repository or use the <code>force</code> option to delete the repository.</p>"
     },
     "DeleteRepositoryPolicy":{
       "name":"DeleteRepositoryPolicy",
@@ -143,7 +143,7 @@
         {"shape":"RepositoryNotFoundException"},
         {"shape":"RepositoryPolicyNotFoundException"}
       ],
-      "documentation":"<p>Deletes the repository policy from a specified repository.</p>"
+      "documentation":"<p>Deletes the repository policy associated with the specified repository.</p>"
     },
     "DescribeImageScanFindings":{
       "name":"DescribeImageScanFindings",
@@ -160,7 +160,7 @@
         {"shape":"ImageNotFoundException"},
         {"shape":"ScanNotFoundException"}
       ],
-      "documentation":"<p>Describes the image scan findings for the specified image.</p>"
+      "documentation":"<p>Returns the scan findings for the specified image.</p>"
     },
     "DescribeImages":{
       "name":"DescribeImages",
@@ -176,7 +176,7 @@
         {"shape":"RepositoryNotFoundException"},
         {"shape":"ImageNotFoundException"}
       ],
-      "documentation":"<p>Returns metadata about the images in a repository, including image size, image tags, and creation date.</p> <note> <p>Beginning with Docker version 1.9, the Docker client compresses image layers before pushing them to a V2 Docker registry. The output of the <code>docker images</code> command shows the uncompressed image size, so it may return a larger image size than the image sizes returned by <a>DescribeImages</a>.</p> </note>"
+      "documentation":"<p>Returns metadata about the images in a repository.</p> <note> <p>Beginning with Docker version 1.9, the Docker client compresses image layers before pushing them to a V2 Docker registry. The output of the <code>docker images</code> command shows the uncompressed image size, so it may return a larger image size than the image sizes returned by <a>DescribeImages</a>.</p> </note>"
     },
     "DescribeRepositories":{
       "name":"DescribeRepositories",
@@ -205,7 +205,7 @@
         {"shape":"ServerException"},
         {"shape":"InvalidParameterException"}
       ],
-      "documentation":"<p>Retrieves a token that is valid for a specified registry for 12 hours. This command allows you to use the <code>docker</code> CLI to push and pull images with Amazon ECR. If you do not specify a registry, the default registry is assumed.</p> <p>The <code>authorizationToken</code> returned for each registry specified is a base64 encoded string that can be decoded and used in a <code>docker login</code> command to authenticate to a registry. The AWS CLI offers an <code>aws ecr get-login</code> command that simplifies the login process.</p>"
+      "documentation":"<p>Retrieves an authorization token. An authorization token represents your IAM authentication credentials and can be used to access any Amazon ECR registry that your IAM principal has access to. The authorization token is valid for 12 hours.</p> <p>The <code>authorizationToken</code> returned is a base64 encoded string that can be decoded and used in a <code>docker login</code> command to authenticate to a registry. The AWS CLI offers an <code>get-login-password</code> command that simplifies the login process. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonECR/latest/userguide/Registries.html#registry_auth\">Registry Authentication</a> in the <i>Amazon Elastic Container Registry User Guide</i>.</p>"
     },
     "GetDownloadUrlForLayer":{
       "name":"GetDownloadUrlForLayer",
@@ -222,7 +222,7 @@
         {"shape":"LayerInaccessibleException"},
         {"shape":"RepositoryNotFoundException"}
       ],
-      "documentation":"<p>Retrieves the pre-signed Amazon S3 download URL corresponding to an image layer. You can only get URLs for image layers that are referenced in an image.</p> <note> <p>This operation is used by the Amazon ECR proxy, and it is not intended for general use by customers for pulling and pushing images. In most cases, you should use the <code>docker</code> CLI to pull, tag, and push images.</p> </note>"
+      "documentation":"<p>Retrieves the pre-signed Amazon S3 download URL corresponding to an image layer. You can only get URLs for image layers that are referenced in an image.</p> <p>When an image is pulled, the GetDownloadUrlForLayer API is called once per image layer.</p> <note> <p>This operation is used by the Amazon ECR proxy, and it is not intended for general use by customers for pulling and pushing images. In most cases, you should use the <code>docker</code> CLI to pull, tag, and push images.</p> </note>"
     },
     "GetLifecyclePolicy":{
       "name":"GetLifecyclePolicy",
@@ -238,7 +238,7 @@
         {"shape":"RepositoryNotFoundException"},
         {"shape":"LifecyclePolicyNotFoundException"}
       ],
-      "documentation":"<p>Retrieves the specified lifecycle policy.</p>"
+      "documentation":"<p>Retrieves the lifecycle policy for the specified repository.</p>"
     },
     "GetLifecyclePolicyPreview":{
       "name":"GetLifecyclePolicyPreview",
@@ -254,7 +254,7 @@
         {"shape":"RepositoryNotFoundException"},
         {"shape":"LifecyclePolicyPreviewNotFoundException"}
       ],
-      "documentation":"<p>Retrieves the results of the specified lifecycle policy preview request.</p>"
+      "documentation":"<p>Retrieves the results of the lifecycle policy preview request for the specified repository.</p>"
     },
     "GetRepositoryPolicy":{
       "name":"GetRepositoryPolicy",
@@ -270,7 +270,7 @@
         {"shape":"RepositoryNotFoundException"},
         {"shape":"RepositoryPolicyNotFoundException"}
       ],
-      "documentation":"<p>Retrieves the repository policy for a specified repository.</p>"
+      "documentation":"<p>Retrieves the repository policy for the specified repository.</p>"
     },
     "InitiateLayerUpload":{
       "name":"InitiateLayerUpload",
@@ -285,7 +285,7 @@
         {"shape":"InvalidParameterException"},
         {"shape":"RepositoryNotFoundException"}
       ],
-      "documentation":"<p>Notify Amazon ECR that you intend to upload an image layer.</p> <note> <p>This operation is used by the Amazon ECR proxy, and it is not intended for general use by customers for pulling and pushing images. In most cases, you should use the <code>docker</code> CLI to pull, tag, and push images.</p> </note>"
+      "documentation":"<p>Notifies Amazon ECR that you intend to upload an image layer.</p> <p>When an image is pushed, the InitiateLayerUpload API is called once per image layer that has not already been uploaded. Whether an image layer has been uploaded before is determined by the <a>BatchCheckLayerAvailability</a> API action.</p> <note> <p>This operation is used by the Amazon ECR proxy, and it is not intended for general use by customers for pulling and pushing images. In most cases, you should use the <code>docker</code> CLI to pull, tag, and push images.</p> </note>"
     },
     "ListImages":{
       "name":"ListImages",
@@ -300,7 +300,7 @@
         {"shape":"InvalidParameterException"},
         {"shape":"RepositoryNotFoundException"}
       ],
-      "documentation":"<p>Lists all the image IDs for a given repository.</p> <p>You can filter images based on whether or not they are tagged by setting the <code>tagStatus</code> parameter to <code>TAGGED</code> or <code>UNTAGGED</code>. For example, you can filter your results to return only <code>UNTAGGED</code> images and then pipe that result to a <a>BatchDeleteImage</a> operation to delete them. Or, you can filter your results to return only <code>TAGGED</code> images to list all of the tags in your repository.</p>"
+      "documentation":"<p>Lists all the image IDs for the specified repository.</p> <p>You can filter images based on whether or not they are tagged by using the <code>tagStatus</code> filter and specifying either <code>TAGGED</code>, <code>UNTAGGED</code> or <code>ANY</code>. For example, you can filter your results to return only <code>UNTAGGED</code> images and then pipe that result to a <a>BatchDeleteImage</a> operation to delete them. Or, you can filter your results to return only <code>TAGGED</code> images to list all of the tags in your repository.</p>"
     },
     "ListTagsForResource":{
       "name":"ListTagsForResource",
@@ -334,7 +334,7 @@
         {"shape":"LimitExceededException"},
         {"shape":"ImageTagAlreadyExistsException"}
       ],
-      "documentation":"<p>Creates or updates the image manifest and tags associated with an image.</p> <note> <p>This operation is used by the Amazon ECR proxy, and it is not intended for general use by customers for pulling and pushing images. In most cases, you should use the <code>docker</code> CLI to pull, tag, and push images.</p> </note>"
+      "documentation":"<p>Creates or updates the image manifest and tags associated with an image.</p> <p>When an image is pushed and all new image layers have been uploaded, the PutImage API is called once to create or update the image manifest and tags associated with the image.</p> <note> <p>This operation is used by the Amazon ECR proxy, and it is not intended for general use by customers for pulling and pushing images. In most cases, you should use the <code>docker</code> CLI to pull, tag, and push images.</p> </note>"
     },
     "PutImageScanningConfiguration":{
       "name":"PutImageScanningConfiguration",
@@ -349,7 +349,7 @@
         {"shape":"InvalidParameterException"},
         {"shape":"RepositoryNotFoundException"}
       ],
-      "documentation":"<p>Updates the image scanning configuration for a repository.</p>"
+      "documentation":"<p>Updates the image scanning configuration for the specified repository.</p>"
     },
     "PutImageTagMutability":{
       "name":"PutImageTagMutability",
@@ -364,7 +364,7 @@
         {"shape":"InvalidParameterException"},
         {"shape":"RepositoryNotFoundException"}
       ],
-      "documentation":"<p>Updates the image tag mutability settings for a repository.</p>"
+      "documentation":"<p>Updates the image tag mutability settings for the specified repository. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonECR/latest/userguide/image-tag-mutability.html\">Image Tag Mutability</a> in the <i>Amazon Elastic Container Registry User Guide</i>.</p>"
     },
     "PutLifecyclePolicy":{
       "name":"PutLifecyclePolicy",
@@ -379,7 +379,7 @@
         {"shape":"InvalidParameterException"},
         {"shape":"RepositoryNotFoundException"}
       ],
-      "documentation":"<p>Creates or updates a lifecycle policy. For information about lifecycle policy syntax, see <a href=\"https://docs.aws.amazon.com/AmazonECR/latest/userguide/LifecyclePolicies.html\">Lifecycle Policy Template</a>.</p>"
+      "documentation":"<p>Creates or updates the lifecycle policy for the specified repository. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonECR/latest/userguide/LifecyclePolicies.html\">Lifecycle Policy Template</a>.</p>"
     },
     "SetRepositoryPolicy":{
       "name":"SetRepositoryPolicy",
@@ -394,7 +394,7 @@
         {"shape":"InvalidParameterException"},
         {"shape":"RepositoryNotFoundException"}
       ],
-      "documentation":"<p>Applies a repository policy on a specified repository to control access permissions. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonECR/latest/userguide/RepositoryPolicies.html\">Amazon ECR Repository Policies</a> in the <i>Amazon Elastic Container Registry User Guide</i>.</p>"
+      "documentation":"<p>Applies a repository policy to the specified repository to control access permissions. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonECR/latest/userguide/RepositoryPolicies.html\">Amazon ECR Repository Policies</a> in the <i>Amazon Elastic Container Registry User Guide</i>.</p>"
     },
     "StartImageScan":{
       "name":"StartImageScan",
@@ -410,7 +410,7 @@
         {"shape":"RepositoryNotFoundException"},
         {"shape":"ImageNotFoundException"}
       ],
-      "documentation":"<p>Starts an image vulnerability scan.</p>"
+      "documentation":"<p>Starts an image vulnerability scan. An image scan can only be started once per day on an individual image. This limit includes if an image was scanned on initial push. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonECR/latest/userguide/image-scanning.html\">Image Scanning</a> in the <i>Amazon Elastic Container Registry User Guide</i>.</p>"
     },
     "StartLifecyclePolicyPreview":{
       "name":"StartLifecyclePolicyPreview",
@@ -427,7 +427,7 @@
         {"shape":"LifecyclePolicyNotFoundException"},
         {"shape":"LifecyclePolicyPreviewInProgressException"}
       ],
-      "documentation":"<p>Starts a preview of the specified lifecycle policy. This allows you to see the results before creating the lifecycle policy.</p>"
+      "documentation":"<p>Starts a preview of a lifecycle policy for the specified repository. This allows you to see the results before associating the lifecycle policy with the repository.</p>"
     },
     "TagResource":{
       "name":"TagResource",
@@ -479,7 +479,7 @@
         {"shape":"UploadNotFoundException"},
         {"shape":"LimitExceededException"}
       ],
-      "documentation":"<p>Uploads an image layer part to Amazon ECR.</p> <note> <p>This operation is used by the Amazon ECR proxy, and it is not intended for general use by customers for pulling and pushing images. In most cases, you should use the <code>docker</code> CLI to pull, tag, and push images.</p> </note>"
+      "documentation":"<p>Uploads an image layer part to Amazon ECR.</p> <p>When an image is pushed, each new image layer is uploaded in parts. The maximum size of each image layer part can be 20971520 bytes (or about 20MB). The UploadLayerPart API is called once per each new image layer part.</p> <note> <p>This operation is used by the Amazon ECR proxy, and it is not intended for general use by customers for pulling and pushing images. In most cases, you should use the <code>docker</code> CLI to pull, tag, and push images.</p> </note>"
     }
   },
   "shapes":{
@@ -1014,7 +1014,7 @@
       "members":{
         "registryIds":{
           "shape":"GetAuthorizationTokenRegistryIdList",
-          "documentation":"<p>A list of AWS account IDs that are associated with the registries for which to get authorization tokens. If you do not specify a registry, the default registry is assumed.</p>"
+          "documentation":"<p>A list of AWS account IDs that are associated with the registries for which to get AuthorizationData objects. If you do not specify a registry, the default registry is assumed.</p>"
         }
       }
     },
diff --git a/services/ecr/src/main/resources/codegen-resources/waiters-2.json b/services/ecr/src/main/resources/codegen-resources/waiters-2.json
new file mode 100644
index 000000000000..9ef9608fda4e
--- /dev/null
+++ b/services/ecr/src/main/resources/codegen-resources/waiters-2.json
@@ -0,0 +1,45 @@
+{
+    "version": 2,
+    "waiters": {
+        "ImageScanComplete": {
+            "description": "Wait until an image scan is complete and findings can be accessed",
+            "operation": "DescribeImageScanFindings",
+            "delay": 5,
+            "maxAttempts": 60,
+            "acceptors": [
+                {
+                    "state": "success",
+                    "matcher": "path",
+                    "argument": "imageScanStatus.status",
+                    "expected": "COMPLETE"
+                },
+                {
+                    "state": "failure",
+                    "matcher": "path",
+                    "argument": "imageScanStatus.status",
+                    "expected": "FAILED"
+                }
+            ]
+        },
+        "LifecyclePolicyPreviewComplete": {
+            "description": "Wait until a lifecycle policy preview request is complete and results can be accessed",
+            "operation": "GetLifecyclePolicyPreview",
+            "delay": 5,
+            "maxAttempts": 20,
+            "acceptors": [
+                {
+                    "state": "success",
+                    "matcher": "path",
+                    "argument": "status",
+                    "expected": "COMPLETE"
+                },
+                {
+                    "state": "failure",
+                    "matcher": "path",
+                    "argument": "status",
+                    "expected": "FAILED"
+                }
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/services/ecr/src/test/resources/cucumber.properties b/services/ecr/src/test/resources/cucumber.properties
index 96c5cbec6454..830c9fdfd106 100644
--- a/services/ecr/src/test/resources/cucumber.properties
+++ b/services/ecr/src/test/resources/cucumber.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/ecs/build.properties b/services/ecs/build.properties
index ecf2dae6fcb1..15ec2da1fc71 100644
--- a/services/ecs/build.properties
+++ b/services/ecs/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/ecs/pom.xml b/services/ecs/pom.xml
index 3c8a629b9b1a..abed9f26db1f 100644
--- a/services/ecs/pom.xml
+++ b/services/ecs/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>ecs</artifactId>
     <name>AWS Java SDK :: Services :: Amazon EC2 Container Service</name>
diff --git a/services/ecs/src/it/java/software/amazon/awssdk/services/ecs/EC2ContainerServiceIntegrationTest.java b/services/ecs/src/it/java/software/amazon/awssdk/services/ecs/EC2ContainerServiceIntegrationTest.java
index c68c2576f3ab..991709b04d31 100644
--- a/services/ecs/src/it/java/software/amazon/awssdk/services/ecs/EC2ContainerServiceIntegrationTest.java
+++ b/services/ecs/src/it/java/software/amazon/awssdk/services/ecs/EC2ContainerServiceIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/ecs/src/main/resources/codegen-resources/paginators-1.json b/services/ecs/src/main/resources/codegen-resources/paginators-1.json
index 46cea2a6f402..16fa7ccaba45 100644
--- a/services/ecs/src/main/resources/codegen-resources/paginators-1.json
+++ b/services/ecs/src/main/resources/codegen-resources/paginators-1.json
@@ -1,5 +1,17 @@
 {
   "pagination": {
+    "ListAccountSettings": {
+      "input_token": "nextToken",
+      "limit_key": "maxResults",
+      "output_token": "nextToken",
+      "result_key": "settings"
+    },
+    "ListAttributes": {
+      "input_token": "nextToken",
+      "limit_key": "maxResults",
+      "output_token": "nextToken",
+      "result_key": "attributes"
+    },
     "ListClusters": {
       "input_token": "nextToken",
       "limit_key": "maxResults",
diff --git a/services/ecs/src/main/resources/codegen-resources/service-2.json b/services/ecs/src/main/resources/codegen-resources/service-2.json
index 5ddac9b7d9ae..b4b62e39dd42 100644
--- a/services/ecs/src/main/resources/codegen-resources/service-2.json
+++ b/services/ecs/src/main/resources/codegen-resources/service-2.json
@@ -13,6 +13,22 @@
     "uid":"ecs-2014-11-13"
   },
   "operations":{
+    "CreateCapacityProvider":{
+      "name":"CreateCapacityProvider",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"CreateCapacityProviderRequest"},
+      "output":{"shape":"CreateCapacityProviderResponse"},
+      "errors":[
+        {"shape":"ServerException"},
+        {"shape":"ClientException"},
+        {"shape":"InvalidParameterException"},
+        {"shape":"LimitExceededException"}
+      ],
+      "documentation":"<p>Creates a new capacity provider. Capacity providers are associated with an Amazon ECS cluster and are used in capacity provider strategies to facilitate cluster auto scaling.</p> <p>Only capacity providers using an Auto Scaling group can be created. Amazon ECS tasks on AWS Fargate use the <code>FARGATE</code> and <code>FARGATE_SPOT</code> capacity providers which are already created and available to all accounts in Regions supported by AWS Fargate.</p>"
+    },
     "CreateCluster":{
       "name":"CreateCluster",
       "http":{
@@ -26,7 +42,7 @@
         {"shape":"ClientException"},
         {"shape":"InvalidParameterException"}
       ],
-      "documentation":"<p>Creates a new Amazon ECS cluster. By default, your account receives a <code>default</code> cluster when you launch your first container instance. However, you can create your own cluster with a unique name with the <code>CreateCluster</code> action.</p> <note> <p>When you call the <a>CreateCluster</a> API operation, Amazon ECS attempts to create the service-linked role for your account so that required resources in other AWS services can be managed on your behalf. However, if the IAM user that makes the call does not have permissions to create the service-linked role, it is not created. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/using-service-linked-roles.html\">Using Service-Linked Roles for Amazon ECS</a> in the <i>Amazon Elastic Container Service Developer Guide</i>.</p> </note>"
+      "documentation":"<p>Creates a new Amazon ECS cluster. By default, your account receives a <code>default</code> cluster when you launch your first container instance. However, you can create your own cluster with a unique name with the <code>CreateCluster</code> action.</p> <note> <p>When you call the <a>CreateCluster</a> API operation, Amazon ECS attempts to create the Amazon ECS service-linked role for your account so that required resources in other AWS services can be managed on your behalf. However, if the IAM user that makes the call does not have permissions to create the service-linked role, it is not created. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/using-service-linked-roles.html\">Using Service-Linked Roles for Amazon ECS</a> in the <i>Amazon Elastic Container Service Developer Guide</i>.</p> </note>"
     },
     "CreateService":{
       "name":"CreateService",
@@ -46,7 +62,7 @@
         {"shape":"PlatformTaskDefinitionIncompatibilityException"},
         {"shape":"AccessDeniedException"}
       ],
-      "documentation":"<p>Runs and maintains a desired number of tasks from a specified task definition. If the number of tasks running in a service drops below the <code>desiredCount</code>, Amazon ECS runs another copy of the task in the specified cluster. To update an existing service, see <a>UpdateService</a>.</p> <p>In addition to maintaining the desired count of tasks in your service, you can optionally run your service behind one or more load balancers. The load balancers distribute traffic across the tasks that are associated with the service. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/service-load-balancing.html\">Service Load Balancing</a> in the <i>Amazon Elastic Container Service Developer Guide</i>.</p> <p>Tasks for services that <i>do not</i> use a load balancer are considered healthy if they're in the <code>RUNNING</code> state. Tasks for services that <i>do</i> use a load balancer are considered healthy if they're in the <code>RUNNING</code> state and the container instance that they're hosted on is reported as healthy by the load balancer.</p> <p>There are two service scheduler strategies available:</p> <ul> <li> <p> <code>REPLICA</code> - The replica scheduling strategy places and maintains the desired number of tasks across your cluster. By default, the service scheduler spreads tasks across Availability Zones. You can use task placement strategies and constraints to customize task placement decisions. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs_services.html\">Service Scheduler Concepts</a> in the <i>Amazon Elastic Container Service Developer Guide</i>.</p> </li> <li> <p> <code>DAEMON</code> - The daemon scheduling strategy deploys exactly one task on each active container instance that meets all of the task placement constraints that you specify in your cluster. When using this strategy, you don't need to specify a desired number of tasks, a task placement strategy, or use Service Auto Scaling policies. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs_services.html\">Service Scheduler Concepts</a> in the <i>Amazon Elastic Container Service Developer Guide</i>.</p> </li> </ul> <p>You can optionally specify a deployment configuration for your service. The deployment is triggered by changing properties, such as the task definition or the desired count of a service, with an <a>UpdateService</a> operation. The default value for a replica service for <code>minimumHealthyPercent</code> is 100%. The default value for a daemon service for <code>minimumHealthyPercent</code> is 0%.</p> <p>If a service is using the <code>ECS</code> deployment controller, the minimum healthy percent represents a lower limit on the number of tasks in a service that must remain in the <code>RUNNING</code> state during a deployment, as a percentage of the desired number of tasks (rounded up to the nearest integer), and while any container instances are in the <code>DRAINING</code> state if the service contains tasks using the EC2 launch type. This parameter enables you to deploy without using additional cluster capacity. For example, if your service has a desired number of four tasks and a minimum healthy percent of 50%, the scheduler might stop two existing tasks to free up cluster capacity before starting two new tasks. Tasks for services that <i>do not</i> use a load balancer are considered healthy if they're in the <code>RUNNING</code> state. Tasks for services that <i>do</i> use a load balancer are considered healthy if they're in the <code>RUNNING</code> state and they're reported as healthy by the load balancer. The default value for minimum healthy percent is 100%.</p> <p>If a service is using the <code>ECS</code> deployment controller, the <b>maximum percent</b> parameter represents an upper limit on the number of tasks in a service that are allowed in the <code>RUNNING</code> or <code>PENDING</code> state during a deployment, as a percentage of the desired number of tasks (rounded down to the nearest integer), and while any container instances are in the <code>DRAINING</code> state if the service contains tasks using the EC2 launch type. This parameter enables you to define the deployment batch size. For example, if your service has a desired number of four tasks and a maximum percent value of 200%, the scheduler may start four new tasks before stopping the four older tasks (provided that the cluster resources required to do this are available). The default value for maximum percent is 200%.</p> <p>If a service is using either the <code>CODE_DEPLOY</code> or <code>EXTERNAL</code> deployment controller types and tasks that use the EC2 launch type, the <b>minimum healthy percent</b> and <b>maximum percent</b> values are used only to define the lower and upper limit on the number of the tasks in the service that remain in the <code>RUNNING</code> state while the container instances are in the <code>DRAINING</code> state. If the tasks in the service use the Fargate launch type, the minimum healthy percent and maximum percent values aren't used, although they're currently visible when describing your service.</p> <p>When creating a service that uses the <code>EXTERNAL</code> deployment controller, you can specify only parameters that aren't controlled at the task set level. The only required parameter is the service name. You control your services using the <a>CreateTaskSet</a> operation. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/deployment-types.html\">Amazon ECS Deployment Types</a> in the <i>Amazon Elastic Container Service Developer Guide</i>.</p> <p>When the service scheduler launches new tasks, it determines task placement in your cluster using the following logic:</p> <ul> <li> <p>Determine which of the container instances in your cluster can support your service's task definition (for example, they have the required CPU, memory, ports, and container instance attributes).</p> </li> <li> <p>By default, the service scheduler attempts to balance tasks across Availability Zones in this manner (although you can choose a different placement strategy) with the <code>placementStrategy</code> parameter):</p> <ul> <li> <p>Sort the valid container instances, giving priority to instances that have the fewest number of running tasks for this service in their respective Availability Zone. For example, if zone A has one running service task and zones B and C each have zero, valid container instances in either zone B or C are considered optimal for placement.</p> </li> <li> <p>Place the new service task on a valid container instance in an optimal Availability Zone (based on the previous steps), favoring container instances with the fewest number of running tasks for this service.</p> </li> </ul> </li> </ul>"
+      "documentation":"<p>Runs and maintains a desired number of tasks from a specified task definition. If the number of tasks running in a service drops below the <code>desiredCount</code>, Amazon ECS runs another copy of the task in the specified cluster. To update an existing service, see the UpdateService action.</p> <p>In addition to maintaining the desired count of tasks in your service, you can optionally run your service behind one or more load balancers. The load balancers distribute traffic across the tasks that are associated with the service. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/service-load-balancing.html\">Service Load Balancing</a> in the <i>Amazon Elastic Container Service Developer Guide</i>.</p> <p>Tasks for services that <i>do not</i> use a load balancer are considered healthy if they're in the <code>RUNNING</code> state. Tasks for services that <i>do</i> use a load balancer are considered healthy if they're in the <code>RUNNING</code> state and the container instance that they're hosted on is reported as healthy by the load balancer.</p> <p>There are two service scheduler strategies available:</p> <ul> <li> <p> <code>REPLICA</code> - The replica scheduling strategy places and maintains the desired number of tasks across your cluster. By default, the service scheduler spreads tasks across Availability Zones. You can use task placement strategies and constraints to customize task placement decisions. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs_services.html\">Service Scheduler Concepts</a> in the <i>Amazon Elastic Container Service Developer Guide</i>.</p> </li> <li> <p> <code>DAEMON</code> - The daemon scheduling strategy deploys exactly one task on each active container instance that meets all of the task placement constraints that you specify in your cluster. When using this strategy, you don't need to specify a desired number of tasks, a task placement strategy, or use Service Auto Scaling policies. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs_services.html\">Service Scheduler Concepts</a> in the <i>Amazon Elastic Container Service Developer Guide</i>.</p> </li> </ul> <p>You can optionally specify a deployment configuration for your service. The deployment is triggered by changing properties, such as the task definition or the desired count of a service, with an <a>UpdateService</a> operation. The default value for a replica service for <code>minimumHealthyPercent</code> is 100%. The default value for a daemon service for <code>minimumHealthyPercent</code> is 0%.</p> <p>If a service is using the <code>ECS</code> deployment controller, the minimum healthy percent represents a lower limit on the number of tasks in a service that must remain in the <code>RUNNING</code> state during a deployment, as a percentage of the desired number of tasks (rounded up to the nearest integer), and while any container instances are in the <code>DRAINING</code> state if the service contains tasks using the EC2 launch type. This parameter enables you to deploy without using additional cluster capacity. For example, if your service has a desired number of four tasks and a minimum healthy percent of 50%, the scheduler might stop two existing tasks to free up cluster capacity before starting two new tasks. Tasks for services that <i>do not</i> use a load balancer are considered healthy if they're in the <code>RUNNING</code> state. Tasks for services that <i>do</i> use a load balancer are considered healthy if they're in the <code>RUNNING</code> state and they're reported as healthy by the load balancer. The default value for minimum healthy percent is 100%.</p> <p>If a service is using the <code>ECS</code> deployment controller, the <b>maximum percent</b> parameter represents an upper limit on the number of tasks in a service that are allowed in the <code>RUNNING</code> or <code>PENDING</code> state during a deployment, as a percentage of the desired number of tasks (rounded down to the nearest integer), and while any container instances are in the <code>DRAINING</code> state if the service contains tasks using the EC2 launch type. This parameter enables you to define the deployment batch size. For example, if your service has a desired number of four tasks and a maximum percent value of 200%, the scheduler may start four new tasks before stopping the four older tasks (provided that the cluster resources required to do this are available). The default value for maximum percent is 200%.</p> <p>If a service is using either the <code>CODE_DEPLOY</code> or <code>EXTERNAL</code> deployment controller types and tasks that use the EC2 launch type, the <b>minimum healthy percent</b> and <b>maximum percent</b> values are used only to define the lower and upper limit on the number of the tasks in the service that remain in the <code>RUNNING</code> state while the container instances are in the <code>DRAINING</code> state. If the tasks in the service use the Fargate launch type, the minimum healthy percent and maximum percent values aren't used, although they're currently visible when describing your service.</p> <p>When creating a service that uses the <code>EXTERNAL</code> deployment controller, you can specify only parameters that aren't controlled at the task set level. The only required parameter is the service name. You control your services using the <a>CreateTaskSet</a> operation. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/deployment-types.html\">Amazon ECS Deployment Types</a> in the <i>Amazon Elastic Container Service Developer Guide</i>.</p> <p>When the service scheduler launches new tasks, it determines task placement in your cluster using the following logic:</p> <ul> <li> <p>Determine which of the container instances in your cluster can support your service's task definition (for example, they have the required CPU, memory, ports, and container instance attributes).</p> </li> <li> <p>By default, the service scheduler attempts to balance tasks across Availability Zones in this manner (although you can choose a different placement strategy) with the <code>placementStrategy</code> parameter):</p> <ul> <li> <p>Sort the valid container instances, giving priority to instances that have the fewest number of running tasks for this service in their respective Availability Zone. For example, if zone A has one running service task and zones B and C each have zero, valid container instances in either zone B or C are considered optimal for placement.</p> </li> <li> <p>Place the new service task on a valid container instance in an optimal Availability Zone (based on the previous steps), favoring container instances with the fewest number of running tasks for this service.</p> </li> </ul> </li> </ul>"
     },
     "CreateTaskSet":{
       "name":"CreateTaskSet",
@@ -115,9 +131,10 @@
         {"shape":"ClusterNotFoundException"},
         {"shape":"ClusterContainsContainerInstancesException"},
         {"shape":"ClusterContainsServicesException"},
-        {"shape":"ClusterContainsTasksException"}
+        {"shape":"ClusterContainsTasksException"},
+        {"shape":"UpdateInProgressException"}
       ],
-      "documentation":"<p>Deletes the specified cluster. You must deregister all container instances from this cluster before you may delete it. You can list the container instances in a cluster with <a>ListContainerInstances</a> and deregister them with <a>DeregisterContainerInstance</a>.</p>"
+      "documentation":"<p>Deletes the specified cluster. The cluster will transition to the <code>INACTIVE</code> state. Clusters with an <code>INACTIVE</code> status may remain discoverable in your account for a period of time. However, this behavior is subject to change in the future, so you should not rely on <code>INACTIVE</code> clusters persisting.</p> <p>You must deregister all container instances from this cluster before you may delete it. You can list the container instances in a cluster with <a>ListContainerInstances</a> and deregister them with <a>DeregisterContainerInstance</a>.</p>"
     },
     "DeleteService":{
       "name":"DeleteService",
@@ -188,6 +205,21 @@
       ],
       "documentation":"<p>Deregisters the specified task definition by family and revision. Upon deregistration, the task definition is marked as <code>INACTIVE</code>. Existing tasks and services that reference an <code>INACTIVE</code> task definition continue to run without disruption. Existing services that reference an <code>INACTIVE</code> task definition can still scale up or down by modifying the service's desired count.</p> <p>You cannot use an <code>INACTIVE</code> task definition to run new tasks or create new services, and you cannot update an existing service to reference an <code>INACTIVE</code> task definition. However, there may be up to a 10-minute window following deregistration where these restrictions have not yet taken effect.</p> <note> <p>At this time, <code>INACTIVE</code> task definitions remain discoverable in your account indefinitely. However, this behavior is subject to change in the future, so you should not rely on <code>INACTIVE</code> task definitions persisting beyond the lifecycle of any associated tasks and services.</p> </note>"
     },
+    "DescribeCapacityProviders":{
+      "name":"DescribeCapacityProviders",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DescribeCapacityProvidersRequest"},
+      "output":{"shape":"DescribeCapacityProvidersResponse"},
+      "errors":[
+        {"shape":"ServerException"},
+        {"shape":"ClientException"},
+        {"shape":"InvalidParameterException"}
+      ],
+      "documentation":"<p>Describes one or more of your capacity providers.</p>"
+    },
     "DescribeClusters":{
       "name":"DescribeClusters",
       "http":{
@@ -485,6 +517,24 @@
       ],
       "documentation":"<p>Create or update an attribute on an Amazon ECS resource. If the attribute does not exist, it is created. If the attribute exists, its value is replaced with the specified value. To delete an attribute, use <a>DeleteAttributes</a>. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/task-placement-constraints.html#attributes\">Attributes</a> in the <i>Amazon Elastic Container Service Developer Guide</i>.</p>"
     },
+    "PutClusterCapacityProviders":{
+      "name":"PutClusterCapacityProviders",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"PutClusterCapacityProvidersRequest"},
+      "output":{"shape":"PutClusterCapacityProvidersResponse"},
+      "errors":[
+        {"shape":"ServerException"},
+        {"shape":"ClientException"},
+        {"shape":"InvalidParameterException"},
+        {"shape":"ClusterNotFoundException"},
+        {"shape":"ResourceInUseException"},
+        {"shape":"UpdateInProgressException"}
+      ],
+      "documentation":"<p>Modifies the available capacity providers and the default capacity provider strategy for a cluster.</p> <p>You must specify both the available capacity providers and a default capacity provider strategy for the cluster. If the specified cluster has existing capacity providers associated with it, you must specify all existing capacity providers in addition to any new ones you want to add. Any existing capacity providers associated with a cluster that are omitted from a <a>PutClusterCapacityProviders</a> API call will be disassociated with the cluster. You can only disassociate an existing capacity provider from a cluster if it's not being used by any existing tasks.</p> <p>When creating a service or running a task on a cluster, if no capacity provider or launch type is specified, then the cluster's default capacity provider strategy is used. It is recommended to define a default capacity provider strategy for your cluster, however you may specify an empty array (<code>[]</code>) to bypass defining a default strategy.</p>"
+    },
     "RegisterContainerInstance":{
       "name":"RegisterContainerInstance",
       "http":{
@@ -735,7 +785,6 @@
         {"shape":"InvalidParameterException"},
         {"shape":"ClusterNotFoundException"},
         {"shape":"UnsupportedFeatureException"},
-        {"shape":"AccessDeniedException"},
         {"shape":"ServiceNotFoundException"},
         {"shape":"ServiceNotActiveException"},
         {"shape":"TaskSetNotFoundException"},
@@ -877,6 +926,25 @@
       "type":"list",
       "member":{"shape":"Attribute"}
     },
+    "AutoScalingGroupProvider":{
+      "type":"structure",
+      "required":["autoScalingGroupArn"],
+      "members":{
+        "autoScalingGroupArn":{
+          "shape":"String",
+          "documentation":"<p>The Amazon Resource Name (ARN) that identifies the Auto Scaling group.</p>"
+        },
+        "managedScaling":{
+          "shape":"ManagedScaling",
+          "documentation":"<p>The managed scaling settings for the Auto Scaling group capacity provider.</p>"
+        },
+        "managedTerminationProtection":{
+          "shape":"ManagedTerminationProtection",
+          "documentation":"<p>The managed termination protection setting to use for the Auto Scaling group capacity provider. This determines whether the Auto Scaling group has managed termination protection.</p> <important> <p>When using managed termination protection, managed scaling must also be used otherwise managed termination protection will not work.</p> </important> <p>When managed termination protection is enabled, Amazon ECS prevents the Amazon EC2 instances in an Auto Scaling group that contain tasks from being terminated during a scale-in action. The Auto Scaling group and each instance in the Auto Scaling group must have instance protection from scale-in actions enabled as well. For more information, see <a href=\"https://docs.aws.amazon.com/autoscaling/ec2/userguide/as-instance-termination.html#instance-protection\">Instance Protection</a> in the <i>AWS Auto Scaling User Guide</i>.</p> <p>When managed termination protection is disabled, your Amazon EC2 instances are not protected from termination when the Auto Scaling group scales in.</p>"
+        }
+      },
+      "documentation":"<p>The details of the Auto Scaling group for the capacity provider.</p>"
+    },
     "AwsVpcConfiguration":{
       "type":"structure",
       "required":["subnets"],
@@ -912,6 +980,81 @@
       "type":"integer",
       "box":true
     },
+    "CapacityProvider":{
+      "type":"structure",
+      "members":{
+        "capacityProviderArn":{
+          "shape":"String",
+          "documentation":"<p>The Amazon Resource Name (ARN) that identifies the capacity provider.</p>"
+        },
+        "name":{
+          "shape":"String",
+          "documentation":"<p>The name of the capacity provider.</p>"
+        },
+        "status":{
+          "shape":"CapacityProviderStatus",
+          "documentation":"<p>The current status of the capacity provider. Only capacity providers in an <code>ACTIVE</code> state can be used in a cluster.</p>"
+        },
+        "autoScalingGroupProvider":{
+          "shape":"AutoScalingGroupProvider",
+          "documentation":"<p>The Auto Scaling group settings for the capacity provider.</p>"
+        },
+        "tags":{
+          "shape":"Tags",
+          "documentation":"<p>The metadata that you apply to the capacity provider to help you categorize and organize it. Each tag consists of a key and an optional value, both of which you define.</p> <p>The following basic restrictions apply to tags:</p> <ul> <li> <p>Maximum number of tags per resource - 50</p> </li> <li> <p>For each resource, each tag key must be unique, and each tag key can have only one value.</p> </li> <li> <p>Maximum key length - 128 Unicode characters in UTF-8</p> </li> <li> <p>Maximum value length - 256 Unicode characters in UTF-8</p> </li> <li> <p>If your tagging schema is used across multiple services and resources, remember that other services may have restrictions on allowed characters. Generally allowed characters are: letters, numbers, and spaces representable in UTF-8, and the following characters: + - = . _ : / @.</p> </li> <li> <p>Tag keys and values are case-sensitive.</p> </li> <li> <p>Do not use <code>aws:</code>, <code>AWS:</code>, or any upper or lowercase combination of such as a prefix for either keys or values as it is reserved for AWS use. You cannot edit or delete tag keys or values with this prefix. Tags with this prefix do not count against your tags per resource limit.</p> </li> </ul>"
+        }
+      },
+      "documentation":"<p>The details of a capacity provider.</p>"
+    },
+    "CapacityProviderField":{
+      "type":"string",
+      "enum":["TAGS"]
+    },
+    "CapacityProviderFieldList":{
+      "type":"list",
+      "member":{"shape":"CapacityProviderField"}
+    },
+    "CapacityProviderStatus":{
+      "type":"string",
+      "enum":["ACTIVE"]
+    },
+    "CapacityProviderStrategy":{
+      "type":"list",
+      "member":{"shape":"CapacityProviderStrategyItem"}
+    },
+    "CapacityProviderStrategyItem":{
+      "type":"structure",
+      "required":["capacityProvider"],
+      "members":{
+        "capacityProvider":{
+          "shape":"String",
+          "documentation":"<p>The short name or full Amazon Resource Name (ARN) of the capacity provider.</p>"
+        },
+        "weight":{
+          "shape":"CapacityProviderStrategyItemWeight",
+          "documentation":"<p>The <i>weight</i> value designates the relative percentage of the total number of tasks launched that should use the specified capacity provider.</p> <p>For example, if you have a strategy that contains two capacity providers and both have a weight of <code>1</code>, then when the <code>base</code> is satisfied, the tasks will be split evenly across the two capacity providers. Using that same logic, if you specify a weight of <code>1</code> for <i>capacityProviderA</i> and a weight of <code>4</code> for <i>capacityProviderB</i>, then for every one task that is run using <i>capacityProviderA</i>, four tasks would use <i>capacityProviderB</i>.</p>"
+        },
+        "base":{
+          "shape":"CapacityProviderStrategyItemBase",
+          "documentation":"<p>The <i>base</i> value designates how many tasks, at a minimum, to run on the specified capacity provider. Only one capacity provider in a capacity provider strategy can have a <i>base</i> defined.</p>"
+        }
+      },
+      "documentation":"<p>The details of a capacity provider strategy.</p>"
+    },
+    "CapacityProviderStrategyItemBase":{
+      "type":"integer",
+      "max":100000,
+      "min":0
+    },
+    "CapacityProviderStrategyItemWeight":{
+      "type":"integer",
+      "max":1000,
+      "min":0
+    },
+    "CapacityProviders":{
+      "type":"list",
+      "member":{"shape":"CapacityProvider"}
+    },
     "ClientException":{
       "type":"structure",
       "members":{
@@ -933,7 +1076,7 @@
         },
         "status":{
           "shape":"String",
-          "documentation":"<p>The status of the cluster. The valid values are <code>ACTIVE</code> or <code>INACTIVE</code>. <code>ACTIVE</code> indicates that you can register container instances with the cluster and the associated instances can accept tasks.</p>"
+          "documentation":"<p>The status of the cluster. The following are the possible states that will be returned.</p> <dl> <dt>ACTIVE</dt> <dd> <p>The cluster is ready to accept tasks and if applicable you can register container instances with the cluster.</p> </dd> <dt>PROVISIONING</dt> <dd> <p>The cluster has capacity providers associated with it and the resources needed for the capacity provider are being created.</p> </dd> <dt>DEPROVISIONING</dt> <dd> <p>The cluster has capacity providers associated with it and the resources needed for the capacity provider are being deleted.</p> </dd> <dt>FAILED</dt> <dd> <p>The cluster has capacity providers associated with it and the resources needed for the capacity provider have failed to create.</p> </dd> <dt>INACTIVE</dt> <dd> <p>The cluster has been deleted. Clusters with an <code>INACTIVE</code> status may remain discoverable in your account for a period of time. However, this behavior is subject to change in the future, so you should not rely on <code>INACTIVE</code> clusters persisting.</p> </dd> </dl>"
         },
         "registeredContainerInstancesCount":{
           "shape":"Integer",
@@ -962,6 +1105,22 @@
         "settings":{
           "shape":"ClusterSettings",
           "documentation":"<p>The settings for the cluster. This parameter indicates whether CloudWatch Container Insights is enabled or disabled for a cluster.</p>"
+        },
+        "capacityProviders":{
+          "shape":"StringList",
+          "documentation":"<p>The capacity providers associated with the cluster.</p>"
+        },
+        "defaultCapacityProviderStrategy":{
+          "shape":"CapacityProviderStrategy",
+          "documentation":"<p>The default capacity provider strategy for the cluster. When services or tasks are run in the cluster with no launch type or capacity provider strategy specified, the default capacity provider strategy is used.</p>"
+        },
+        "attachments":{
+          "shape":"Attachments",
+          "documentation":"<p>The resources attached to a cluster. When using a capacity provider with a cluster, the Auto Scaling plan that is created will be returned as a cluster attachment.</p>"
+        },
+        "attachmentsStatus":{
+          "shape":"String",
+          "documentation":"<p>The status of the capacity providers associated with the cluster. The following are the states that will be returned:</p> <dl> <dt>UPDATE_IN_PROGRESS</dt> <dd> <p>The available capacity providers for the cluster are updating. This occurs when the Auto Scaling plan is provisioning or deprovisioning.</p> </dd> <dt>UPDATE_COMPLETE</dt> <dd> <p>The capacity providers have successfully updated.</p> </dd> <dt>UPDATE_FAILED</dt> <dd> <p>The capacity provider updates failed.</p> </dd> </dl>"
         }
       },
       "documentation":"<p>A regional grouping of one or more container instances on which you can run task requests. Each account receives a default cluster the first time you use the Amazon ECS service, but you may also create other clusters. Clusters may contain more than one instance type simultaneously.</p>"
@@ -990,6 +1149,8 @@
     "ClusterField":{
       "type":"string",
       "enum":[
+        "ATTACHMENTS",
+        "SETTINGS",
         "STATISTICS",
         "TAGS"
       ]
@@ -1145,7 +1306,7 @@
         },
         "cpu":{
           "shape":"Integer",
-          "documentation":"<p>The number of <code>cpu</code> units reserved for the container. This parameter maps to <code>CpuShares</code> in the <a href=\"https://docs.docker.com/engine/api/v1.35/#operation/ContainerCreate\">Create a container</a> section of the <a href=\"https://docs.docker.com/engine/api/v1.35/\">Docker Remote API</a> and the <code>--cpu-shares</code> option to <a href=\"https://docs.docker.com/engine/reference/run/\">docker run</a>.</p> <p>This field is optional for tasks using the Fargate launch type, and the only requirement is that the total amount of CPU reserved for all containers within a task be lower than the task-level <code>cpu</code> value.</p> <note> <p>You can determine the number of CPU units that are available per EC2 instance type by multiplying the vCPUs listed for that instance type on the <a href=\"http://aws.amazon.com/ec2/instance-types/\">Amazon EC2 Instances</a> detail page by 1,024.</p> </note> <p>For example, if you run a single-container task on a single-core instance type with 512 CPU units specified for that container, and that is the only task running on the container instance, that container could use the full 1,024 CPU unit share at any given time. However, if you launched another copy of the same task on that container instance, each task would be guaranteed a minimum of 512 CPU units when needed, and each container could float to higher CPU usage if the other container was not using it, but if both tasks were 100% active all of the time, they would be limited to 512 CPU units.</p> <p>Linux containers share unallocated CPU units with other containers on the container instance with the same ratio as their allocated amount. For example, if you run a single-container task on a single-core instance type with 512 CPU units specified for that container, and that is the only task running on the container instance, that container could use the full 1,024 CPU unit share at any given time. However, if you launched another copy of the same task on that container instance, each task would be guaranteed a minimum of 512 CPU units when needed, and each container could float to higher CPU usage if the other container was not using it, but if both tasks were 100% active all of the time, they would be limited to 512 CPU units.</p> <p>On Linux container instances, the Docker daemon on the container instance uses the CPU value to calculate the relative CPU share ratios for running containers. For more information, see <a href=\"https://docs.docker.com/engine/reference/run/#cpu-share-constraint\">CPU share constraint</a> in the Docker documentation. The minimum valid CPU share value that the Linux kernel allows is 2. However, the CPU parameter is not required, and you can use CPU values below 2 in your container definitions. For CPU values below 2 (including null), the behavior varies based on your Amazon ECS container agent version:</p> <ul> <li> <p> <b>Agent versions less than or equal to 1.1.0:</b> Null and zero CPU values are passed to Docker as 0, which Docker then converts to 1,024 CPU shares. CPU values of 1 are passed to Docker as 1, which the Linux kernel converts to two CPU shares.</p> </li> <li> <p> <b>Agent versions greater than or equal to 1.2.0:</b> Null, zero, and CPU values of 1 are passed to Docker as 2.</p> </li> </ul> <p>On Windows container instances, the CPU limit is enforced as an absolute limit, or a quota. Windows containers only have access to the specified amount of CPU that is described in the task definition.</p>"
+          "documentation":"<p>The number of <code>cpu</code> units reserved for the container. This parameter maps to <code>CpuShares</code> in the <a href=\"https://docs.docker.com/engine/api/v1.35/#operation/ContainerCreate\">Create a container</a> section of the <a href=\"https://docs.docker.com/engine/api/v1.35/\">Docker Remote API</a> and the <code>--cpu-shares</code> option to <a href=\"https://docs.docker.com/engine/reference/run/\">docker run</a>.</p> <p>This field is optional for tasks using the Fargate launch type, and the only requirement is that the total amount of CPU reserved for all containers within a task be lower than the task-level <code>cpu</code> value.</p> <note> <p>You can determine the number of CPU units that are available per EC2 instance type by multiplying the vCPUs listed for that instance type on the <a href=\"http://aws.amazon.com/ec2/instance-types/\">Amazon EC2 Instances</a> detail page by 1,024.</p> </note> <p>Linux containers share unallocated CPU units with other containers on the container instance with the same ratio as their allocated amount. For example, if you run a single-container task on a single-core instance type with 512 CPU units specified for that container, and that is the only task running on the container instance, that container could use the full 1,024 CPU unit share at any given time. However, if you launched another copy of the same task on that container instance, each task would be guaranteed a minimum of 512 CPU units when needed, and each container could float to higher CPU usage if the other container was not using it, but if both tasks were 100% active all of the time, they would be limited to 512 CPU units.</p> <p>On Linux container instances, the Docker daemon on the container instance uses the CPU value to calculate the relative CPU share ratios for running containers. For more information, see <a href=\"https://docs.docker.com/engine/reference/run/#cpu-share-constraint\">CPU share constraint</a> in the Docker documentation. The minimum valid CPU share value that the Linux kernel allows is 2. However, the CPU parameter is not required, and you can use CPU values below 2 in your container definitions. For CPU values below 2 (including null), the behavior varies based on your Amazon ECS container agent version:</p> <ul> <li> <p> <b>Agent versions less than or equal to 1.1.0:</b> Null and zero CPU values are passed to Docker as 0, which Docker then converts to 1,024 CPU shares. CPU values of 1 are passed to Docker as 1, which the Linux kernel converts to two CPU shares.</p> </li> <li> <p> <b>Agent versions greater than or equal to 1.2.0:</b> Null, zero, and CPU values of 1 are passed to Docker as 2.</p> </li> </ul> <p>On Windows container instances, the CPU limit is enforced as an absolute limit, or a quota. Windows containers only have access to the specified amount of CPU that is described in the task definition.</p>"
         },
         "memory":{
           "shape":"BoxedInteger",
@@ -1197,15 +1358,15 @@
         },
         "dependsOn":{
           "shape":"ContainerDependencies",
-          "documentation":"<p>The dependencies defined for container startup and shutdown. A container can contain multiple dependencies. When a dependency is defined for container startup, for container shutdown it is reversed.</p> <p>For tasks using the EC2 launch type, the container instances require at least version 1.26.0 of the container agent to enable container dependencies. However, we recommend using the latest container agent version. For information about checking your agent version and updating to the latest version, see <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs-agent-update.html\">Updating the Amazon ECS Container Agent</a> in the <i>Amazon Elastic Container Service Developer Guide</i>. If you are using an Amazon ECS-optimized Linux AMI, your instance needs at least version 1.26.0-1 of the <code>ecs-init</code> package. If your container instances are launched from version <code>20190301</code> or later, then they contain the required versions of the container agent and <code>ecs-init</code>. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs-optimized_AMI.html\">Amazon ECS-optimized Linux AMI</a> in the <i>Amazon Elastic Container Service Developer Guide</i>.</p> <p>This parameter is available for tasks using the Fargate launch type in the Ohio (us-east-2) region only and the task or service requires platform version 1.3.0 or later.</p>"
+          "documentation":"<p>The dependencies defined for container startup and shutdown. A container can contain multiple dependencies. When a dependency is defined for container startup, for container shutdown it is reversed.</p> <p>For tasks using the EC2 launch type, the container instances require at least version 1.26.0 of the container agent to enable container dependencies. However, we recommend using the latest container agent version. For information about checking your agent version and updating to the latest version, see <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs-agent-update.html\">Updating the Amazon ECS Container Agent</a> in the <i>Amazon Elastic Container Service Developer Guide</i>. If you are using an Amazon ECS-optimized Linux AMI, your instance needs at least version 1.26.0-1 of the <code>ecs-init</code> package. If your container instances are launched from version <code>20190301</code> or later, then they contain the required versions of the container agent and <code>ecs-init</code>. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs-optimized_AMI.html\">Amazon ECS-optimized Linux AMI</a> in the <i>Amazon Elastic Container Service Developer Guide</i>.</p> <p>For tasks using the Fargate launch type, the task or service requires platform version <code>1.3.0</code> or later.</p>"
         },
         "startTimeout":{
           "shape":"BoxedInteger",
-          "documentation":"<p>Time duration (in seconds) to wait before giving up on resolving dependencies for a container. For example, you specify two containers in a task definition with containerA having a dependency on containerB reaching a <code>COMPLETE</code>, <code>SUCCESS</code>, or <code>HEALTHY</code> status. If a <code>startTimeout</code> value is specified for containerB and it does not reach the desired status within that time then containerA will give up and not start. This results in the task transitioning to a <code>STOPPED</code> state.</p> <p>For tasks using the EC2 launch type, the container instances require at least version 1.26.0 of the container agent to enable a container start timeout value. However, we recommend using the latest container agent version. For information about checking your agent version and updating to the latest version, see <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs-agent-update.html\">Updating the Amazon ECS Container Agent</a> in the <i>Amazon Elastic Container Service Developer Guide</i>. If you are using an Amazon ECS-optimized Linux AMI, your instance needs at least version 1.26.0-1 of the <code>ecs-init</code> package. If your container instances are launched from version <code>20190301</code> or later, then they contain the required versions of the container agent and <code>ecs-init</code>. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs-optimized_AMI.html\">Amazon ECS-optimized Linux AMI</a> in the <i>Amazon Elastic Container Service Developer Guide</i>.</p> <p>This parameter is available for tasks using the Fargate launch type in the Ohio (us-east-2) region only and the task or service requires platform version 1.3.0 or later.</p>"
+          "documentation":"<p>Time duration (in seconds) to wait before giving up on resolving dependencies for a container. For example, you specify two containers in a task definition with containerA having a dependency on containerB reaching a <code>COMPLETE</code>, <code>SUCCESS</code>, or <code>HEALTHY</code> status. If a <code>startTimeout</code> value is specified for containerB and it does not reach the desired status within that time then containerA will give up and not start. This results in the task transitioning to a <code>STOPPED</code> state.</p> <p>For tasks using the Fargate launch type, this parameter requires that the task or service uses platform version 1.3.0 or later. If this parameter is not specified, the default value of 3 minutes is used.</p> <p>For tasks using the EC2 launch type, if the <code>startTimeout</code> parameter is not specified, the value set for the Amazon ECS container agent configuration variable <code>ECS_CONTAINER_START_TIMEOUT</code> is used by default. If neither the <code>startTimeout</code> parameter or the <code>ECS_CONTAINER_START_TIMEOUT</code> agent configuration variable are set, then the default values of 3 minutes for Linux containers and 8 minutes on Windows containers are used. Your container instances require at least version 1.26.0 of the container agent to enable a container start timeout value. However, we recommend using the latest container agent version. For information about checking your agent version and updating to the latest version, see <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs-agent-update.html\">Updating the Amazon ECS Container Agent</a> in the <i>Amazon Elastic Container Service Developer Guide</i>. If you are using an Amazon ECS-optimized Linux AMI, your instance needs at least version 1.26.0-1 of the <code>ecs-init</code> package. If your container instances are launched from version <code>20190301</code> or later, then they contain the required versions of the container agent and <code>ecs-init</code>. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs-optimized_AMI.html\">Amazon ECS-optimized Linux AMI</a> in the <i>Amazon Elastic Container Service Developer Guide</i>.</p>"
         },
         "stopTimeout":{
           "shape":"BoxedInteger",
-          "documentation":"<p>Time duration (in seconds) to wait before the container is forcefully killed if it doesn't exit normally on its own. For tasks using the Fargate launch type, the max <code>stopTimeout</code> value is 2 minutes. This parameter is available for tasks using the Fargate launch type in the Ohio (us-east-2) region only and the task or service requires platform version 1.3.0 or later.</p> <p>For tasks using the EC2 launch type, the stop timeout value for the container takes precedence over the <code>ECS_CONTAINER_STOP_TIMEOUT</code> container agent configuration parameter, if used. Container instances require at least version 1.26.0 of the container agent to enable a container stop timeout value. However, we recommend using the latest container agent version. For information about checking your agent version and updating to the latest version, see <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs-agent-update.html\">Updating the Amazon ECS Container Agent</a> in the <i>Amazon Elastic Container Service Developer Guide</i>. If you are using an Amazon ECS-optimized Linux AMI, your instance needs at least version 1.26.0-1 of the <code>ecs-init</code> package. If your container instances are launched from version <code>20190301</code> or later, then they contain the required versions of the container agent and <code>ecs-init</code>. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs-optimized_AMI.html\">Amazon ECS-optimized Linux AMI</a> in the <i>Amazon Elastic Container Service Developer Guide</i>.</p>"
+          "documentation":"<p>Time duration (in seconds) to wait before the container is forcefully killed if it doesn't exit normally on its own.</p> <p>For tasks using the Fargate launch type, the task or service requires platform version 1.3.0 or later. The max stop timeout value is 120 seconds and if the parameter is not specified, the default value of 30 seconds is used.</p> <p>For tasks using the EC2 launch type, if the <code>stopTimeout</code> parameter is not specified, the value set for the Amazon ECS container agent configuration variable <code>ECS_CONTAINER_STOP_TIMEOUT</code> is used by default. If neither the <code>stopTimeout</code> parameter or the <code>ECS_CONTAINER_STOP_TIMEOUT</code> agent configuration variable are set, then the default values of 30 seconds for Linux containers and 30 seconds on Windows containers are used. Your container instances require at least version 1.26.0 of the container agent to enable a container stop timeout value. However, we recommend using the latest container agent version. For information about checking your agent version and updating to the latest version, see <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs-agent-update.html\">Updating the Amazon ECS Container Agent</a> in the <i>Amazon Elastic Container Service Developer Guide</i>. If you are using an Amazon ECS-optimized Linux AMI, your instance needs at least version 1.26.0-1 of the <code>ecs-init</code> package. If your container instances are launched from version <code>20190301</code> or later, then they contain the required versions of the container agent and <code>ecs-init</code>. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs-optimized_AMI.html\">Amazon ECS-optimized Linux AMI</a> in the <i>Amazon Elastic Container Service Developer Guide</i>.</p>"
         },
         "hostname":{
           "shape":"String",
@@ -1245,7 +1406,7 @@
         },
         "dockerSecurityOptions":{
           "shape":"StringList",
-          "documentation":"<p>A list of strings to provide custom labels for SELinux and AppArmor multi-level security systems. This field is not valid for containers in tasks using the Fargate launch type.</p> <p>This parameter maps to <code>SecurityOpt</code> in the <a href=\"https://docs.docker.com/engine/api/v1.35/#operation/ContainerCreate\">Create a container</a> section of the <a href=\"https://docs.docker.com/engine/api/v1.35/\">Docker Remote API</a> and the <code>--security-opt</code> option to <a href=\"https://docs.docker.com/engine/reference/run/\">docker run</a>.</p> <note> <p>The Amazon ECS container agent running on a container instance must register with the <code>ECS_SELINUX_CAPABLE=true</code> or <code>ECS_APPARMOR_CAPABLE=true</code> environment variables before containers placed on that instance can use these security options. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs-agent-config.html\">Amazon ECS Container Agent Configuration</a> in the <i>Amazon Elastic Container Service Developer Guide</i>.</p> </note> <note> <p>This parameter is not supported for Windows containers.</p> </note>"
+          "documentation":"<p>A list of strings to provide custom labels for SELinux and AppArmor multi-level security systems. This field is not valid for containers in tasks using the Fargate launch type.</p> <p>With Windows containers, this parameter can be used to reference a credential spec file when configuring a container for Active Directory authentication. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/windows-gmsa.html\">Using gMSAs for Windows Containers</a> in the <i>Amazon Elastic Container Service Developer Guide</i>.</p> <p>This parameter maps to <code>SecurityOpt</code> in the <a href=\"https://docs.docker.com/engine/api/v1.35/#operation/ContainerCreate\">Create a container</a> section of the <a href=\"https://docs.docker.com/engine/api/v1.35/\">Docker Remote API</a> and the <code>--security-opt</code> option to <a href=\"https://docs.docker.com/engine/reference/run/\">docker run</a>.</p> <note> <p>The Amazon ECS container agent running on a container instance must register with the <code>ECS_SELINUX_CAPABLE=true</code> or <code>ECS_APPARMOR_CAPABLE=true</code> environment variables before containers placed on that instance can use these security options. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs-agent-config.html\">Amazon ECS Container Agent Configuration</a> in the <i>Amazon Elastic Container Service Developer Guide</i>.</p> </note>"
         },
         "interactive":{
           "shape":"BoxedBoolean",
@@ -1310,7 +1471,7 @@
           "documentation":"<p>The dependency condition of the container. The following are the available conditions and their behavior:</p> <ul> <li> <p> <code>START</code> - This condition emulates the behavior of links and volumes today. It validates that a dependent container is started before permitting other containers to start.</p> </li> <li> <p> <code>COMPLETE</code> - This condition validates that a dependent container runs to completion (exits) before permitting other containers to start. This can be useful for nonessential containers that run a script and then exit.</p> </li> <li> <p> <code>SUCCESS</code> - This condition is the same as <code>COMPLETE</code>, but it also requires that the container exits with a <code>zero</code> status.</p> </li> <li> <p> <code>HEALTHY</code> - This condition validates that the dependent container passes its Docker health check before permitting other containers to start. This requires that the dependent container has health checks configured. This condition is confirmed only at task startup.</p> </li> </ul>"
         }
       },
-      "documentation":"<p>The dependencies defined for container startup and shutdown. A container can contain multiple dependencies. When a dependency is defined for container startup, for container shutdown it is reversed.</p> <p>Your Amazon ECS container instances require at least version 1.26.0 of the container agent to enable container dependencies. However, we recommend using the latest container agent version. For information about checking your agent version and updating to the latest version, see <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs-agent-update.html\">Updating the Amazon ECS Container Agent</a> in the <i>Amazon Elastic Container Service Developer Guide</i>. If you are using an Amazon ECS-optimized Linux AMI, your instance needs at least version 1.26.0-1 of the <code>ecs-init</code> package. If your container instances are launched from version <code>20190301</code> or later, then they contain the required versions of the container agent and <code>ecs-init</code>. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs-optimized_AMI.html\">Amazon ECS-optimized Linux AMI</a> in the <i>Amazon Elastic Container Service Developer Guide</i>.</p> <note> <p>If you are using tasks that use the Fargate launch type, container dependency parameters are not supported.</p> </note>"
+      "documentation":"<p>The dependencies defined for container startup and shutdown. A container can contain multiple dependencies. When a dependency is defined for container startup, for container shutdown it is reversed.</p> <p>Your Amazon ECS container instances require at least version 1.26.0 of the container agent to enable container dependencies. However, we recommend using the latest container agent version. For information about checking your agent version and updating to the latest version, see <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs-agent-update.html\">Updating the Amazon ECS Container Agent</a> in the <i>Amazon Elastic Container Service Developer Guide</i>. If you are using an Amazon ECS-optimized Linux AMI, your instance needs at least version 1.26.0-1 of the <code>ecs-init</code> package. If your container instances are launched from version <code>20190301</code> or later, then they contain the required versions of the container agent and <code>ecs-init</code>. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs-optimized_AMI.html\">Amazon ECS-optimized Linux AMI</a> in the <i>Amazon Elastic Container Service Developer Guide</i>.</p> <note> <p>For tasks using the Fargate launch type, this parameter requires that the task or service uses platform version 1.3.0 or later.</p> </note>"
     },
     "ContainerInstance":{
       "type":"structure",
@@ -1323,6 +1484,10 @@
           "shape":"String",
           "documentation":"<p>The EC2 instance ID of the container instance.</p>"
         },
+        "capacityProviderName":{
+          "shape":"String",
+          "documentation":"<p>The capacity provider associated with the container instance.</p>"
+        },
         "version":{
           "shape":"Long",
           "documentation":"<p>The version counter for the container instance. Every time a container instance experiences a change that triggers a CloudWatch event, the version counter is incremented. If you are replicating your Amazon ECS container instance state with CloudWatch Events, you can compare the version of a container instance reported by the Amazon ECS APIs with the version reported in CloudWatch Events for the container instance (inside the <code>detail</code> object) to verify that the version in your event stream is current.</p>"
@@ -1484,6 +1649,36 @@
       "type":"list",
       "member":{"shape":"Container"}
     },
+    "CreateCapacityProviderRequest":{
+      "type":"structure",
+      "required":[
+        "name",
+        "autoScalingGroupProvider"
+      ],
+      "members":{
+        "name":{
+          "shape":"String",
+          "documentation":"<p>The name of the capacity provider. Up to 255 characters are allowed, including letters (upper and lowercase), numbers, underscores, and hyphens. The name cannot be prefixed with \"<code>aws</code>\", \"<code>ecs</code>\", or \"<code>fargate</code>\".</p>"
+        },
+        "autoScalingGroupProvider":{
+          "shape":"AutoScalingGroupProvider",
+          "documentation":"<p>The details of the Auto Scaling group for the capacity provider.</p>"
+        },
+        "tags":{
+          "shape":"Tags",
+          "documentation":"<p>The metadata that you apply to the capacity provider to help you categorize and organize them. Each tag consists of a key and an optional value, both of which you define.</p> <p>The following basic restrictions apply to tags:</p> <ul> <li> <p>Maximum number of tags per resource - 50</p> </li> <li> <p>For each resource, each tag key must be unique, and each tag key can have only one value.</p> </li> <li> <p>Maximum key length - 128 Unicode characters in UTF-8</p> </li> <li> <p>Maximum value length - 256 Unicode characters in UTF-8</p> </li> <li> <p>If your tagging schema is used across multiple services and resources, remember that other services may have restrictions on allowed characters. Generally allowed characters are: letters, numbers, and spaces representable in UTF-8, and the following characters: + - = . _ : / @.</p> </li> <li> <p>Tag keys and values are case-sensitive.</p> </li> <li> <p>Do not use <code>aws:</code>, <code>AWS:</code>, or any upper or lowercase combination of such as a prefix for either keys or values as it is reserved for AWS use. You cannot edit or delete tag keys or values with this prefix. Tags with this prefix do not count against your tags per resource limit.</p> </li> </ul>"
+        }
+      }
+    },
+    "CreateCapacityProviderResponse":{
+      "type":"structure",
+      "members":{
+        "capacityProvider":{
+          "shape":"CapacityProvider",
+          "documentation":"<p>The full description of the new capacity provider.</p>"
+        }
+      }
+    },
     "CreateClusterRequest":{
       "type":"structure",
       "members":{
@@ -1498,6 +1693,14 @@
         "settings":{
           "shape":"ClusterSettings",
           "documentation":"<p>The setting to use when creating a cluster. This parameter is used to enable CloudWatch Container Insights for a cluster. If this value is specified, it will override the <code>containerInsights</code> value set with <a>PutAccountSetting</a> or <a>PutAccountSettingDefault</a>.</p>"
+        },
+        "capacityProviders":{
+          "shape":"StringList",
+          "documentation":"<p>The short name or full Amazon Resource Name (ARN) of one or more capacity providers to associate with the cluster.</p> <p>If specifying a capacity provider that uses an Auto Scaling group, the capacity provider must already be created and not already associated with another cluster. New capacity providers can be created with the <a>CreateCapacityProvider</a> API operation.</p> <p>To use a AWS Fargate capacity provider, specify either the <code>FARGATE</code> or <code>FARGATE_SPOT</code> capacity providers. The AWS Fargate capacity providers are available to all accounts and only need to be associated with a cluster to be used.</p> <p>The <a>PutClusterCapacityProviders</a> API operation is used to update the list of available capacity providers for a cluster after the cluster is created.</p>"
+        },
+        "defaultCapacityProviderStrategy":{
+          "shape":"CapacityProviderStrategy",
+          "documentation":"<p>The capacity provider strategy to use by default for the cluster.</p> <p>When creating a service or running a task on a cluster, if no capacity provider or launch type is specified then the default capacity provider strategy for the cluster is used.</p> <p>A capacity provider strategy consists of one or more capacity providers along with the <code>base</code> and <code>weight</code> to assign to them. A capacity provider must be associated with the cluster to be used in a capacity provider strategy. The <a>PutClusterCapacityProviders</a> API is used to associate a capacity provider with a cluster. Only capacity providers with an <code>ACTIVE</code> or <code>UPDATING</code> status can be used.</p> <p>If specifying a capacity provider that uses an Auto Scaling group, the capacity provider must already be created. New capacity providers can be created with the <a>CreateCapacityProvider</a> API operation.</p> <p>To use a AWS Fargate capacity provider, specify either the <code>FARGATE</code> or <code>FARGATE_SPOT</code> capacity providers. The AWS Fargate capacity providers are available to all accounts and only need to be associated with a cluster to be used.</p> <p>If a default capacity provider strategy is not defined for a cluster during creation, it can be defined later with the <a>PutClusterCapacityProviders</a> API operation.</p>"
         }
       }
     },
@@ -1544,7 +1747,11 @@
         },
         "launchType":{
           "shape":"LaunchType",
-          "documentation":"<p>The launch type on which to run your service. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/launch_types.html\">Amazon ECS Launch Types</a> in the <i>Amazon Elastic Container Service Developer Guide</i>.</p>"
+          "documentation":"<p>The launch type on which to run your service. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/launch_types.html\">Amazon ECS Launch Types</a> in the <i>Amazon Elastic Container Service Developer Guide</i>.</p> <p>If a <code>launchType</code> is specified, the <code>capacityProviderStrategy</code> parameter must be omitted.</p>"
+        },
+        "capacityProviderStrategy":{
+          "shape":"CapacityProviderStrategy",
+          "documentation":"<p>The capacity provider strategy to use for the service.</p> <p>A capacity provider strategy consists of one or more capacity providers along with the <code>base</code> and <code>weight</code> to assign to them. A capacity provider must be associated with the cluster to be used in a capacity provider strategy. The <a>PutClusterCapacityProviders</a> API is used to associate a capacity provider with a cluster. Only capacity providers with an <code>ACTIVE</code> or <code>UPDATING</code> status can be used.</p> <p>If a <code>capacityProviderStrategy</code> is specified, the <code>launchType</code> parameter must be omitted. If no <code>capacityProviderStrategy</code> or <code>launchType</code> is specified, the <code>defaultCapacityProviderStrategy</code> for the cluster is used.</p> <p>If specifying a capacity provider that uses an Auto Scaling group, the capacity provider must already be created. New capacity providers can be created with the <a>CreateCapacityProvider</a> API operation.</p> <p>To use a AWS Fargate capacity provider, specify either the <code>FARGATE</code> or <code>FARGATE_SPOT</code> capacity providers. The AWS Fargate capacity providers are available to all accounts and only need to be associated with a cluster to be used.</p> <p>The <a>PutClusterCapacityProviders</a> API operation is used to update the list of available capacity providers for a cluster after the cluster is created.</p>"
         },
         "platformVersion":{
           "shape":"String",
@@ -1552,7 +1759,7 @@
         },
         "role":{
           "shape":"String",
-          "documentation":"<p>The name or full Amazon Resource Name (ARN) of the IAM role that allows Amazon ECS to make calls to your load balancer on your behalf. This parameter is only permitted if you are using a load balancer with your service and your task definition does not use the <code>awsvpc</code> network mode. If you specify the <code>role</code> parameter, you must also specify a load balancer object with the <code>loadBalancers</code> parameter.</p> <important> <p>If your account has already created the Amazon ECS service-linked role, that role is used by default for your service unless you specify a role here. The service-linked role is required if your task definition uses the <code>awsvpc</code> network mode or if the service is configured to use service discovery, an external deployment controller, or multiple target groups in which case you should not specify a role here. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/using-service-linked-roles.html\">Using Service-Linked Roles for Amazon ECS</a> in the <i>Amazon Elastic Container Service Developer Guide</i>.</p> </important> <p>If your specified role has a path other than <code>/</code>, then you must either specify the full role ARN (this is recommended) or prefix the role name with the path. For example, if a role with the name <code>bar</code> has a path of <code>/foo/</code> then you would specify <code>/foo/bar</code> as the role name. For more information, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/reference_identifiers.html#identifiers-friendly-names\">Friendly Names and Paths</a> in the <i>IAM User Guide</i>.</p>"
+          "documentation":"<p>The name or full Amazon Resource Name (ARN) of the IAM role that allows Amazon ECS to make calls to your load balancer on your behalf. This parameter is only permitted if you are using a load balancer with your service and your task definition does not use the <code>awsvpc</code> network mode. If you specify the <code>role</code> parameter, you must also specify a load balancer object with the <code>loadBalancers</code> parameter.</p> <important> <p>If your account has already created the Amazon ECS service-linked role, that role is used by default for your service unless you specify a role here. The service-linked role is required if your task definition uses the <code>awsvpc</code> network mode or if the service is configured to use service discovery, an external deployment controller, multiple target groups, or Elastic Inference accelerators in which case you should not specify a role here. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/using-service-linked-roles.html\">Using Service-Linked Roles for Amazon ECS</a> in the <i>Amazon Elastic Container Service Developer Guide</i>.</p> </important> <p>If your specified role has a path other than <code>/</code>, then you must either specify the full role ARN (this is recommended) or prefix the role name with the path. For example, if a role with the name <code>bar</code> has a path of <code>/foo/</code> then you would specify <code>/foo/bar</code> as the role name. For more information, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/reference_identifiers.html#identifiers-friendly-names\">Friendly Names and Paths</a> in the <i>IAM User Guide</i>.</p>"
         },
         "deploymentConfiguration":{
           "shape":"DeploymentConfiguration",
@@ -1572,7 +1779,7 @@
         },
         "healthCheckGracePeriodSeconds":{
           "shape":"BoxedInteger",
-          "documentation":"<p>The period of time, in seconds, that the Amazon ECS service scheduler should ignore unhealthy Elastic Load Balancing target health checks after a task has first started. This is only valid if your service is configured to use a load balancer. If your service's tasks take a while to start and respond to Elastic Load Balancing health checks, you can specify a health check grace period of up to 2,147,483,647 seconds. During that time, the ECS service scheduler ignores health check status. This grace period can prevent the ECS service scheduler from marking tasks as unhealthy and stopping them before they have time to come up.</p>"
+          "documentation":"<p>The period of time, in seconds, that the Amazon ECS service scheduler should ignore unhealthy Elastic Load Balancing target health checks after a task has first started. This is only used when your service is configured to use a load balancer. If your service has a load balancer defined and you don't specify a health check grace period value, the default value of <code>0</code> is used.</p> <p>If your service's tasks take a while to start and respond to Elastic Load Balancing health checks, you can specify a health check grace period of up to 2,147,483,647 seconds. During that time, the Amazon ECS service scheduler ignores health check status. This grace period can prevent the service scheduler from marking tasks as unhealthy and stopping them before they have time to come up.</p>"
         },
         "schedulingStrategy":{
           "shape":"SchedulingStrategy",
@@ -1640,7 +1847,11 @@
         },
         "launchType":{
           "shape":"LaunchType",
-          "documentation":"<p>The launch type that new tasks in the task set will use. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/launch_types.html\">Amazon ECS Launch Types</a> in the <i>Amazon Elastic Container Service Developer Guide</i>.</p>"
+          "documentation":"<p>The launch type that new tasks in the task set will use. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/launch_types.html\">Amazon ECS Launch Types</a> in the <i>Amazon Elastic Container Service Developer Guide</i>.</p> <p>If a <code>launchType</code> is specified, the <code>capacityProviderStrategy</code> parameter must be omitted.</p>"
+        },
+        "capacityProviderStrategy":{
+          "shape":"CapacityProviderStrategy",
+          "documentation":"<p>The capacity provider strategy to use for the task set.</p> <p>A capacity provider strategy consists of one or more capacity providers along with the <code>base</code> and <code>weight</code> to assign to them. A capacity provider must be associated with the cluster to be used in a capacity provider strategy. The <a>PutClusterCapacityProviders</a> API is used to associate a capacity provider with a cluster. Only capacity providers with an <code>ACTIVE</code> or <code>UPDATING</code> status can be used.</p> <p>If a <code>capacityProviderStrategy</code> is specified, the <code>launchType</code> parameter must be omitted. If no <code>capacityProviderStrategy</code> or <code>launchType</code> is specified, the <code>defaultCapacityProviderStrategy</code> for the cluster is used.</p> <p>If specifying a capacity provider that uses an Auto Scaling group, the capacity provider must already be created. New capacity providers can be created with the <a>CreateCapacityProvider</a> API operation.</p> <p>To use a AWS Fargate capacity provider, specify either the <code>FARGATE</code> or <code>FARGATE_SPOT</code> capacity providers. The AWS Fargate capacity providers are available to all accounts and only need to be associated with a cluster to be used.</p> <p>The <a>PutClusterCapacityProviders</a> API operation is used to update the list of available capacity providers for a cluster after the cluster is created.</p>"
         },
         "platformVersion":{
           "shape":"String",
@@ -1650,6 +1861,10 @@
         "clientToken":{
           "shape":"String",
           "documentation":"<p>Unique, case-sensitive identifier that you provide to ensure the idempotency of the request. Up to 32 ASCII characters are allowed.</p>"
+        },
+        "tags":{
+          "shape":"Tags",
+          "documentation":"<p>The metadata that you apply to the task set to help you categorize and organize them. Each tag consists of a key and an optional value, both of which you define. When a service is deleted, the tags are deleted as well.</p> <p>The following basic restrictions apply to tags:</p> <ul> <li> <p>Maximum number of tags per resource - 50</p> </li> <li> <p>For each resource, each tag key must be unique, and each tag key can have only one value.</p> </li> <li> <p>Maximum key length - 128 Unicode characters in UTF-8</p> </li> <li> <p>Maximum value length - 256 Unicode characters in UTF-8</p> </li> <li> <p>If your tagging schema is used across multiple services and resources, remember that other services may have restrictions on allowed characters. Generally allowed characters are: letters, numbers, and spaces representable in UTF-8, and the following characters: + - = . _ : / @.</p> </li> <li> <p>Tag keys and values are case-sensitive.</p> </li> <li> <p>Do not use <code>aws:</code>, <code>AWS:</code>, or any upper or lowercase combination of such as a prefix for either keys or values as it is reserved for AWS use. You cannot edit or delete tag keys or values with this prefix. Tags with this prefix do not count against your tags per resource limit.</p> </li> </ul>"
         }
       }
     },
@@ -1818,6 +2033,10 @@
           "shape":"Timestamp",
           "documentation":"<p>The Unix timestamp for when the service deployment was last updated.</p>"
         },
+        "capacityProviderStrategy":{
+          "shape":"CapacityProviderStrategy",
+          "documentation":"<p>The capacity provider strategy that the deployment is using.</p>"
+        },
         "launchType":{
           "shape":"LaunchType",
           "documentation":"<p>The launch type the tasks in the service are using. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/launch_types.html\">Amazon ECS Launch Types</a> in the <i>Amazon Elastic Container Service Developer Guide</i>.</p>"
@@ -1916,6 +2135,44 @@
         }
       }
     },
+    "DescribeCapacityProvidersRequest":{
+      "type":"structure",
+      "members":{
+        "capacityProviders":{
+          "shape":"StringList",
+          "documentation":"<p>The short name or full Amazon Resource Name (ARN) of one or more capacity providers. Up to <code>100</code> capacity providers can be described in an action.</p>"
+        },
+        "include":{
+          "shape":"CapacityProviderFieldList",
+          "documentation":"<p>Specifies whether or not you want to see the resource tags for the capacity provider. If <code>TAGS</code> is specified, the tags are included in the response. If this field is omitted, tags are not included in the response.</p>"
+        },
+        "maxResults":{
+          "shape":"BoxedInteger",
+          "documentation":"<p>The maximum number of account setting results returned by <code>DescribeCapacityProviders</code> in paginated output. When this parameter is used, <code>DescribeCapacityProviders</code> only returns <code>maxResults</code> results in a single page along with a <code>nextToken</code> response element. The remaining results of the initial request can be seen by sending another <code>DescribeCapacityProviders</code> request with the returned <code>nextToken</code> value. This value can be between 1 and 10. If this parameter is not used, then <code>DescribeCapacityProviders</code> returns up to 10 results and a <code>nextToken</code> value if applicable.</p>"
+        },
+        "nextToken":{
+          "shape":"String",
+          "documentation":"<p>The <code>nextToken</code> value returned from a previous paginated <code>DescribeCapacityProviders</code> request where <code>maxResults</code> was used and the results exceeded the value of that parameter. Pagination continues from the end of the previous results that returned the <code>nextToken</code> value.</p> <note> <p>This token should be treated as an opaque identifier that is only used to retrieve the next items in a list and not for other programmatic purposes.</p> </note>"
+        }
+      }
+    },
+    "DescribeCapacityProvidersResponse":{
+      "type":"structure",
+      "members":{
+        "capacityProviders":{
+          "shape":"CapacityProviders",
+          "documentation":"<p>The list of capacity providers.</p>"
+        },
+        "failures":{
+          "shape":"Failures",
+          "documentation":"<p>Any failures associated with the call.</p>"
+        },
+        "nextToken":{
+          "shape":"String",
+          "documentation":"<p>The <code>nextToken</code> value to include in a future <code>DescribeCapacityProviders</code> request. When the results of a <code>DescribeCapacityProviders</code> request exceed <code>maxResults</code>, this value can be used to retrieve the next page of results. This value is <code>null</code> when there are no more results to return.</p>"
+        }
+      }
+    },
     "DescribeClustersRequest":{
       "type":"structure",
       "members":{
@@ -1925,7 +2182,7 @@
         },
         "include":{
           "shape":"ClusterFieldList",
-          "documentation":"<p>Additional information about your clusters to be separated by launch type, including:</p> <ul> <li> <p>runningEC2TasksCount</p> </li> <li> <p>runningFargateTasksCount</p> </li> <li> <p>pendingEC2TasksCount</p> </li> <li> <p>pendingFargateTasksCount</p> </li> <li> <p>activeEC2ServiceCount</p> </li> <li> <p>activeFargateServiceCount</p> </li> <li> <p>drainingEC2ServiceCount</p> </li> <li> <p>drainingFargateServiceCount</p> </li> </ul>"
+          "documentation":"<p>Whether to include additional information about your clusters in the response. If this field is omitted, the attachments, statistics, and tags are not included.</p> <p>If <code>ATTACHMENTS</code> is specified, the attachments for the container instances or tasks within the cluster are included.</p> <p>If <code>SETTINGS</code> is specified, the settings for the cluster are included.</p> <p>If <code>STATISTICS</code> is specified, the following additional information, separated by launch type, is included:</p> <ul> <li> <p>runningEC2TasksCount</p> </li> <li> <p>runningFargateTasksCount</p> </li> <li> <p>pendingEC2TasksCount</p> </li> <li> <p>pendingFargateTasksCount</p> </li> <li> <p>activeEC2ServiceCount</p> </li> <li> <p>activeFargateServiceCount</p> </li> <li> <p>drainingEC2ServiceCount</p> </li> <li> <p>drainingFargateServiceCount</p> </li> </ul> <p>If <code>TAGS</code> is specified, the metadata tags associated with the cluster are included.</p>"
         }
       }
     },
@@ -2049,6 +2306,10 @@
         "taskSets":{
           "shape":"StringList",
           "documentation":"<p>The ID or full Amazon Resource Name (ARN) of task sets to describe.</p>"
+        },
+        "include":{
+          "shape":"TaskSetFieldList",
+          "documentation":"<p>Specifies whether to see the resource tags for the task set. If <code>TAGS</code> is specified, the tags are included in the response. If this field is omitted, tags are not included in the response.</p>"
         }
       }
     },
@@ -2197,6 +2458,21 @@
       "documentation":"<p>This parameter is specified when you are using Docker volumes. Docker volumes are only supported when you are using the EC2 launch type. Windows containers only support the use of the <code>local</code> driver. To use bind mounts, specify a <code>host</code> instead.</p>"
     },
     "Double":{"type":"double"},
+    "EFSVolumeConfiguration":{
+      "type":"structure",
+      "required":["fileSystemId"],
+      "members":{
+        "fileSystemId":{
+          "shape":"String",
+          "documentation":"<p>The Amazon EFS file system ID to use.</p>"
+        },
+        "rootDirectory":{
+          "shape":"String",
+          "documentation":"<p>The directory within the Amazon EFS file system to mount as the root directory inside the host.</p>"
+        }
+      },
+      "documentation":"<p>This parameter is specified when you are using an Amazon Elastic File System (Amazon EFS) file storage. Amazon EFS file systems are only supported when you are using the EC2 launch type.</p> <important> <p> <code>EFSVolumeConfiguration</code> remains in preview and is a Beta Service as defined by and subject to the Beta Service Participation Service Terms located at <a href=\"https://aws.amazon.com/service-terms\">https://aws.amazon.com/service-terms</a> (\"Beta Terms\"). These Beta Terms apply to your participation in this preview of <code>EFSVolumeConfiguration</code>.</p> </important>"
+    },
     "EnvironmentVariables":{
       "type":"list",
       "member":{"shape":"KeyValuePair"}
@@ -2211,6 +2487,10 @@
         "reason":{
           "shape":"String",
           "documentation":"<p>The reason for the failure.</p>"
+        },
+        "detail":{
+          "shape":"String",
+          "documentation":"<p>The details of the failure.</p>"
         }
       },
       "documentation":"<p>A failed resource.</p>"
@@ -2229,7 +2509,7 @@
         },
         "options":{
           "shape":"FirelensConfigurationOptionsMap",
-          "documentation":"<p>The options to use when configuring the log router. This field is optional and can be used to add additional metadata, such as the task, task definition, cluster, and container instance details to the log event. If specified, the syntax to use is <code>\"options\":{\"enable-ecs-log-metadata\":\"true|false\"}</code>.</p>"
+          "documentation":"<p>The options to use when configuring the log router. This field is optional and can be used to specify a custom configuration file or to add additional metadata, such as the task, task definition, cluster, and container instance details to the log event. If specified, the syntax to use is <code>\"options\":{\"enable-ecs-log-metadata\":\"true|false\",\"config-file-type:\"s3|file\",\"config-file-value\":\"arn:aws:s3:::mybucket/fluent.conf|filepath\"}</code>. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/using_firelens.html#firelens-taskdef\">Creating a Task Definition that Uses a FireLens Configuration</a> in the <i>Amazon Elastic Container Service Developer Guide</i>.</p>"
         }
       },
       "documentation":"<p>The FireLens configuration for the container. This is used to specify and configure a log router for container logs. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/using_firelens.html\">Custom Log Routing</a> in the <i>Amazon Elastic Container Service Developer Guide</i>.</p>"
@@ -2408,6 +2688,13 @@
         "FARGATE"
       ]
     },
+    "LimitExceededException":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>The limit for the resource has been exceeded.</p>",
+      "exception":true
+    },
     "LinuxParameters":{
       "type":"structure",
       "members":{
@@ -2463,7 +2750,7 @@
         },
         "nextToken":{
           "shape":"String",
-          "documentation":"<p>The <code>nextToken</code> value returned from a previous paginated <code>ListAccountSettings</code> request where <code>maxResults</code> was used and the results exceeded the value of that parameter. Pagination continues from the end of the previous results that returned the <code>nextToken</code> value.</p> <note> <p>This token should be treated as an opaque identifier that is only used to retrieve the next items in a list and not for other programmatic purposes.</p> </note>"
+          "documentation":"<p>The <code>nextToken</code> value returned from a <code>ListAccountSettings</code> request indicating that more results are available to fulfill the request and further calls will be needed. If <code>maxResults</code> was provided, it is possible the number of results to be fewer than <code>maxResults</code>.</p> <note> <p>This token should be treated as an opaque identifier that is only used to retrieve the next items in a list and not for other programmatic purposes.</p> </note>"
         },
         "maxResults":{
           "shape":"Integer",
@@ -2506,7 +2793,7 @@
         },
         "nextToken":{
           "shape":"String",
-          "documentation":"<p>The <code>nextToken</code> value returned from a previous paginated <code>ListAttributes</code> request where <code>maxResults</code> was used and the results exceeded the value of that parameter. Pagination continues from the end of the previous results that returned the <code>nextToken</code> value.</p> <note> <p>This token should be treated as an opaque identifier that is only used to retrieve the next items in a list and not for other programmatic purposes.</p> </note>"
+          "documentation":"<p>The <code>nextToken</code> value returned from a <code>ListAttributes</code> request indicating that more results are available to fulfill the request and further calls will be needed. If <code>maxResults</code> was provided, it is possible the number of results to be fewer than <code>maxResults</code>.</p> <note> <p>This token should be treated as an opaque identifier that is only used to retrieve the next items in a list and not for other programmatic purposes.</p> </note>"
         },
         "maxResults":{
           "shape":"BoxedInteger",
@@ -2532,7 +2819,7 @@
       "members":{
         "nextToken":{
           "shape":"String",
-          "documentation":"<p>The <code>nextToken</code> value returned from a previous paginated <code>ListClusters</code> request where <code>maxResults</code> was used and the results exceeded the value of that parameter. Pagination continues from the end of the previous results that returned the <code>nextToken</code> value.</p> <note> <p>This token should be treated as an opaque identifier that is only used to retrieve the next items in a list and not for other programmatic purposes.</p> </note>"
+          "documentation":"<p>The <code>nextToken</code> value returned from a <code>ListClusters</code> request indicating that more results are available to fulfill the request and further calls will be needed. If <code>maxResults</code> was provided, it is possible the number of results to be fewer than <code>maxResults</code>.</p> <note> <p>This token should be treated as an opaque identifier that is only used to retrieve the next items in a list and not for other programmatic purposes.</p> </note>"
         },
         "maxResults":{
           "shape":"BoxedInteger",
@@ -2566,7 +2853,7 @@
         },
         "nextToken":{
           "shape":"String",
-          "documentation":"<p>The <code>nextToken</code> value returned from a previous paginated <code>ListContainerInstances</code> request where <code>maxResults</code> was used and the results exceeded the value of that parameter. Pagination continues from the end of the previous results that returned the <code>nextToken</code> value.</p> <note> <p>This token should be treated as an opaque identifier that is only used to retrieve the next items in a list and not for other programmatic purposes.</p> </note>"
+          "documentation":"<p>The <code>nextToken</code> value returned from a <code>ListContainerInstances</code> request indicating that more results are available to fulfill the request and further calls will be needed. If <code>maxResults</code> was provided, it is possible the number of results to be fewer than <code>maxResults</code>.</p> <note> <p>This token should be treated as an opaque identifier that is only used to retrieve the next items in a list and not for other programmatic purposes.</p> </note>"
         },
         "maxResults":{
           "shape":"BoxedInteger",
@@ -2600,7 +2887,7 @@
         },
         "nextToken":{
           "shape":"String",
-          "documentation":"<p>The <code>nextToken</code> value returned from a previous paginated <code>ListServices</code> request where <code>maxResults</code> was used and the results exceeded the value of that parameter. Pagination continues from the end of the previous results that returned the <code>nextToken</code> value.</p> <note> <p>This token should be treated as an opaque identifier that is only used to retrieve the next items in a list and not for other programmatic purposes.</p> </note>"
+          "documentation":"<p>The <code>nextToken</code> value returned from a <code>ListServices</code> request indicating that more results are available to fulfill the request and further calls will be needed. If <code>maxResults</code> was provided, it is possible the number of results to be fewer than <code>maxResults</code>.</p> <note> <p>This token should be treated as an opaque identifier that is only used to retrieve the next items in a list and not for other programmatic purposes.</p> </note>"
         },
         "maxResults":{
           "shape":"BoxedInteger",
@@ -2661,7 +2948,7 @@
         },
         "nextToken":{
           "shape":"String",
-          "documentation":"<p>The <code>nextToken</code> value returned from a previous paginated <code>ListTaskDefinitionFamilies</code> request where <code>maxResults</code> was used and the results exceeded the value of that parameter. Pagination continues from the end of the previous results that returned the <code>nextToken</code> value.</p> <note> <p>This token should be treated as an opaque identifier that is only used to retrieve the next items in a list and not for other programmatic purposes.</p> </note>"
+          "documentation":"<p>The <code>nextToken</code> value returned from a <code>ListTaskDefinitionFamilies</code> request indicating that more results are available to fulfill the request and further calls will be needed. If <code>maxResults</code> was provided, it is possible the number of results to be fewer than <code>maxResults</code>.</p> <note> <p>This token should be treated as an opaque identifier that is only used to retrieve the next items in a list and not for other programmatic purposes.</p> </note>"
         },
         "maxResults":{
           "shape":"BoxedInteger",
@@ -2699,7 +2986,7 @@
         },
         "nextToken":{
           "shape":"String",
-          "documentation":"<p>The <code>nextToken</code> value returned from a previous paginated <code>ListTaskDefinitions</code> request where <code>maxResults</code> was used and the results exceeded the value of that parameter. Pagination continues from the end of the previous results that returned the <code>nextToken</code> value.</p> <note> <p>This token should be treated as an opaque identifier that is only used to retrieve the next items in a list and not for other programmatic purposes.</p> </note>"
+          "documentation":"<p>The <code>nextToken</code> value returned from a <code>ListTaskDefinitions</code> request indicating that more results are available to fulfill the request and further calls will be needed. If <code>maxResults</code> was provided, it is possible the number of results to be fewer than <code>maxResults</code>.</p> <note> <p>This token should be treated as an opaque identifier that is only used to retrieve the next items in a list and not for other programmatic purposes.</p> </note>"
         },
         "maxResults":{
           "shape":"BoxedInteger",
@@ -2737,7 +3024,7 @@
         },
         "nextToken":{
           "shape":"String",
-          "documentation":"<p>The <code>nextToken</code> value returned from a previous paginated <code>ListTasks</code> request where <code>maxResults</code> was used and the results exceeded the value of that parameter. Pagination continues from the end of the previous results that returned the <code>nextToken</code> value.</p> <note> <p>This token should be treated as an opaque identifier that is only used to retrieve the next items in a list and not for other programmatic purposes.</p> </note>"
+          "documentation":"<p>The <code>nextToken</code> value returned from a <code>ListTasks</code> request indicating that more results are available to fulfill the request and further calls will be needed. If <code>maxResults</code> was provided, it is possible the number of results to be fewer than <code>maxResults</code>.</p> <note> <p>This token should be treated as an opaque identifier that is only used to retrieve the next items in a list and not for other programmatic purposes.</p> </note>"
         },
         "maxResults":{
           "shape":"BoxedInteger",
@@ -2779,11 +3066,11 @@
       "members":{
         "targetGroupArn":{
           "shape":"String",
-          "documentation":"<p>The full Amazon Resource Name (ARN) of the Elastic Load Balancing target group or groups associated with a service or task set.</p> <p>A target group ARN is only specified when using an Application Load Balancer or Network Load Balancer. If you are using a Classic Load Balancer this should be omitted.</p> <p>For services using the <code>ECS</code> deployment controller, you can specify one or multiple target groups. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/register-multiple-targetgroups.html\">Registering Multiple Target Groups with a Service</a> in the <i>Amazon Elastic Container Service Developer Guide</i>.</p> <p>For services using the <code>CODE_DEPLOY</code> deployment controller, you are required to define two target groups for the load balancer. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/deployment-type-bluegreen.html\">Blue/Green Deployment with CodeDeploy</a> in the <i>Amazon Elastic Container Service Developer Guide</i>.</p> <important> <p>If your service's task definition uses the <code>awsvpc</code> network mode (which is required for the Fargate launch type), you must choose <code>ip</code> as the target type, not <code>instance</code>, when creating your target groups because tasks that use the <code>awsvpc</code> network mode are associated with an elastic network interface, not an Amazon EC2 instance.</p> </important>"
+          "documentation":"<p>The full Amazon Resource Name (ARN) of the Elastic Load Balancing target group or groups associated with a service or task set.</p> <p>A target group ARN is only specified when using an Application Load Balancer or Network Load Balancer. If you are using a Classic Load Balancer the target group ARN should be omitted.</p> <p>For services using the <code>ECS</code> deployment controller, you can specify one or multiple target groups. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/register-multiple-targetgroups.html\">Registering Multiple Target Groups with a Service</a> in the <i>Amazon Elastic Container Service Developer Guide</i>.</p> <p>For services using the <code>CODE_DEPLOY</code> deployment controller, you are required to define two target groups for the load balancer. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/deployment-type-bluegreen.html\">Blue/Green Deployment with CodeDeploy</a> in the <i>Amazon Elastic Container Service Developer Guide</i>.</p> <important> <p>If your service's task definition uses the <code>awsvpc</code> network mode (which is required for the Fargate launch type), you must choose <code>ip</code> as the target type, not <code>instance</code>, when creating your target groups because tasks that use the <code>awsvpc</code> network mode are associated with an elastic network interface, not an Amazon EC2 instance.</p> </important>"
         },
         "loadBalancerName":{
           "shape":"String",
-          "documentation":"<p>The name of the load balancer to associate with the Amazon ECS service or task set.</p> <p>A load balancer name is only specified when using a Classic Load Balancer. If you are using an Application Load Balancer or a Network Load Balancer this should be omitted.</p>"
+          "documentation":"<p>The name of the load balancer to associate with the Amazon ECS service or task set.</p> <p>A load balancer name is only specified when using a Classic Load Balancer. If you are using an Application Load Balancer or a Network Load Balancer the load balancer name parameter should be omitted.</p>"
         },
         "containerName":{
           "shape":"String",
@@ -2794,7 +3081,7 @@
           "documentation":"<p>The port on the container to associate with the load balancer. This port must correspond to a <code>containerPort</code> in the task definition the tasks in the service are using. For tasks that use the EC2 launch type, the container instance they are launched on must allow ingress traffic on the <code>hostPort</code> of the port mapping.</p>"
         }
       },
-      "documentation":"<p>Details on the load balancer or load balancers to use with a service or task set.</p>"
+      "documentation":"<p>The load balancer configuration to use with a service or task set.</p> <p>For specific notes and restrictions regarding the use of load balancers with services and task sets, see the CreateService and CreateTaskSet actions.</p>"
     },
     "LoadBalancers":{
       "type":"list",
@@ -2806,7 +3093,7 @@
       "members":{
         "logDriver":{
           "shape":"LogDriver",
-          "documentation":"<p>The log driver to use for the container. The valid values listed for this parameter are log drivers that the Amazon ECS container agent can communicate with by default.</p> <p>For tasks using the Fargate launch type, the supported log drivers are <code>awslogs</code>, <code>splunk</code>, and <code>awsfirelens</code>.</p> <p>For tasks using the EC2 launch type, the supported log drivers are <code>awslogs</code>, <code>fluentd</code>, <code>gelf</code>, <code>json-file</code>, <code>journald</code>, <code>logentries</code>, <code>syslog</code>, <code>splunk</code>, and <code>awsfirelens</code>.</p> <p>For more information about using the <code>awslogs</code> log driver, see <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/using_awslogs.html\">Using the awslogs Log Driver</a> in the <i>Amazon Elastic Container Service Developer Guide</i>.</p> <p>For more information about using the <code>awsfirelens</code> log driver, see <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/using_firelens.html\">Custom Log Routing</a> in the <i>Amazon Elastic Container Service Developer Guide</i>.</p> <note> <p>If you have a custom driver that is not listed above that you would like to work with the Amazon ECS container agent, you can fork the Amazon ECS container agent project that is <a href=\"https://github.com/aws/amazon-ecs-agent\">available on GitHub</a> and customize it to work with that driver. We encourage you to submit pull requests for changes that you would like to have included. However, Amazon Web Services does not currently support running modified copies of this software.</p> </note> <p>This parameter requires version 1.18 of the Docker Remote API or greater on your container instance. To check the Docker Remote API version on your container instance, log in to your container instance and run the following command: <code>sudo docker version --format '{{.Server.APIVersion}}'</code> </p>"
+          "documentation":"<p>The log driver to use for the container. The valid values listed earlier are log drivers that the Amazon ECS container agent can communicate with by default.</p> <p>For tasks using the Fargate launch type, the supported log drivers are <code>awslogs</code>, <code>splunk</code>, and <code>awsfirelens</code>.</p> <p>For tasks using the EC2 launch type, the supported log drivers are <code>awslogs</code>, <code>fluentd</code>, <code>gelf</code>, <code>json-file</code>, <code>journald</code>, <code>logentries</code>,<code>syslog</code>, <code>splunk</code>, and <code>awsfirelens</code>.</p> <p>For more information about using the <code>awslogs</code> log driver, see <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/using_awslogs.html\">Using the awslogs Log Driver</a> in the <i>Amazon Elastic Container Service Developer Guide</i>.</p> <p>For more information about using the <code>awsfirelens</code> log driver, see <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/using_firelens.html\">Custom Log Routing</a> in the <i>Amazon Elastic Container Service Developer Guide</i>.</p> <note> <p>If you have a custom driver that is not listed, you can fork the Amazon ECS container agent project that is <a href=\"https://github.com/aws/amazon-ecs-agent\">available on GitHub</a> and customize it to work with that driver. We encourage you to submit pull requests for changes that you would like to have included. However, we do not currently provide support for running modified copies of this software.</p> </note>"
         },
         "options":{
           "shape":"LogConfigurationOptionsMap",
@@ -2817,7 +3104,7 @@
           "documentation":"<p>The secrets to pass to the log configuration. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/specifying-sensitive-data.html\">Specifying Sensitive Data</a> in the <i>Amazon Elastic Container Service Developer Guide</i>.</p>"
         }
       },
-      "documentation":"<p>Log configuration options to send to a custom log driver for the container.</p>"
+      "documentation":"<p>The log configuration specification for the container.</p> <p>This parameter maps to <code>LogConfig</code> in the <a href=\"https://docs.docker.com/engine/api/v1.35/#operation/ContainerCreate\">Create a container</a> section of the <a href=\"https://docs.docker.com/engine/api/v1.35/\">Docker Remote API</a> and the <code>--log-driver</code> option to <a href=\"https://docs.docker.com/engine/reference/commandline/run/\"> <code>docker run</code> </a>. By default, containers use the same logging driver that the Docker daemon uses; however the container may use a different logging driver than the Docker daemon by specifying a log driver with this parameter in the container definition. To use a different logging driver for a container, the log system must be configured properly on the container instance (or on a different log server for remote logging options). For more information on the options for different supported log drivers, see <a href=\"https://docs.docker.com/engine/admin/logging/overview/\">Configure logging drivers</a> in the Docker documentation.</p> <p>The following should be noted when specifying a log configuration for your containers:</p> <ul> <li> <p>Amazon ECS currently supports a subset of the logging drivers available to the Docker daemon (shown in the valid values below). Additional log drivers may be available in future releases of the Amazon ECS container agent.</p> </li> <li> <p>This parameter requires version 1.18 of the Docker Remote API or greater on your container instance.</p> </li> <li> <p>For tasks using the EC2 launch type, the Amazon ECS container agent running on a container instance must register the logging drivers available on that instance with the <code>ECS_AVAILABLE_LOGGING_DRIVERS</code> environment variable before containers placed on that instance can use these log configuration options. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs-agent-config.html\">Amazon ECS Container Agent Configuration</a> in the <i>Amazon Elastic Container Service Developer Guide</i>.</p> </li> <li> <p>For tasks using the Fargate launch type, because you do not have access to the underlying infrastructure your tasks are hosted on, any additional software needed will have to be installed outside of the task. For example, the Fluentd output aggregators or a remote host running Logstash to send Gelf logs to.</p> </li> </ul>"
     },
     "LogConfigurationOptionsMap":{
       "type":"map",
@@ -2838,6 +3125,52 @@
       ]
     },
     "Long":{"type":"long"},
+    "ManagedScaling":{
+      "type":"structure",
+      "members":{
+        "status":{
+          "shape":"ManagedScalingStatus",
+          "documentation":"<p>Whether or not to enable managed scaling for the capacity provider.</p>"
+        },
+        "targetCapacity":{
+          "shape":"ManagedScalingTargetCapacity",
+          "documentation":"<p>The target capacity value for the capacity provider. The specified value must be greater than <code>0</code> and less than or equal to <code>100</code>. A value of <code>100</code> will result in the Amazon EC2 instances in your Auto Scaling group being completely utilized.</p>"
+        },
+        "minimumScalingStepSize":{
+          "shape":"ManagedScalingStepSize",
+          "documentation":"<p>The minimum number of container instances that Amazon ECS will scale in or scale out at one time. If this parameter is omitted, the default value of <code>1</code> is used.</p>"
+        },
+        "maximumScalingStepSize":{
+          "shape":"ManagedScalingStepSize",
+          "documentation":"<p>The maximum number of container instances that Amazon ECS will scale in or scale out at one time. If this parameter is omitted, the default value of <code>10000</code> is used.</p>"
+        }
+      },
+      "documentation":"<p>The managed scaling settings for the Auto Scaling group capacity provider.</p> <p>When managed scaling is enabled, Amazon ECS manages the scale-in and scale-out actions of the Auto Scaling group. Amazon ECS manages a target tracking scaling policy using an Amazon ECS-managed CloudWatch metric with the specified <code>targetCapacity</code> value as the target value for the metric. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/asg-capacity-providers.html#asg-capacity-providers-managed-scaling\">Using Managed Scaling</a> in the <i>Amazon Elastic Container Service Developer Guide</i>.</p> <p>If managed scaling is disabled, the user must manage the scaling of the Auto Scaling group.</p>"
+    },
+    "ManagedScalingStatus":{
+      "type":"string",
+      "enum":[
+        "ENABLED",
+        "DISABLED"
+      ]
+    },
+    "ManagedScalingStepSize":{
+      "type":"integer",
+      "max":10000,
+      "min":1
+    },
+    "ManagedScalingTargetCapacity":{
+      "type":"integer",
+      "max":100,
+      "min":1
+    },
+    "ManagedTerminationProtection":{
+      "type":"string",
+      "enum":[
+        "ENABLED",
+        "DISABLED"
+      ]
+    },
     "MissingVersionException":{
       "type":"structure",
       "members":{
@@ -3171,6 +3504,34 @@
         }
       }
     },
+    "PutClusterCapacityProvidersRequest":{
+      "type":"structure",
+      "required":[
+        "cluster",
+        "capacityProviders",
+        "defaultCapacityProviderStrategy"
+      ],
+      "members":{
+        "cluster":{
+          "shape":"String",
+          "documentation":"<p>The short name or full Amazon Resource Name (ARN) of the cluster to modify the capacity provider settings for. If you do not specify a cluster, the default cluster is assumed.</p>"
+        },
+        "capacityProviders":{
+          "shape":"StringList",
+          "documentation":"<p>The name of one or more capacity providers to associate with the cluster.</p> <p>If specifying a capacity provider that uses an Auto Scaling group, the capacity provider must already be created. New capacity providers can be created with the <a>CreateCapacityProvider</a> API operation.</p> <p>To use a AWS Fargate capacity provider, specify either the <code>FARGATE</code> or <code>FARGATE_SPOT</code> capacity providers. The AWS Fargate capacity providers are available to all accounts and only need to be associated with a cluster to be used.</p>"
+        },
+        "defaultCapacityProviderStrategy":{
+          "shape":"CapacityProviderStrategy",
+          "documentation":"<p>The capacity provider strategy to use by default for the cluster.</p> <p>When creating a service or running a task on a cluster, if no capacity provider or launch type is specified then the default capacity provider strategy for the cluster is used.</p> <p>A capacity provider strategy consists of one or more capacity providers along with the <code>base</code> and <code>weight</code> to assign to them. A capacity provider must be associated with the cluster to be used in a capacity provider strategy. The <a>PutClusterCapacityProviders</a> API is used to associate a capacity provider with a cluster. Only capacity providers with an <code>ACTIVE</code> or <code>UPDATING</code> status can be used.</p> <p>If specifying a capacity provider that uses an Auto Scaling group, the capacity provider must already be created. New capacity providers can be created with the <a>CreateCapacityProvider</a> API operation.</p> <p>To use a AWS Fargate capacity provider, specify either the <code>FARGATE</code> or <code>FARGATE_SPOT</code> capacity providers. The AWS Fargate capacity providers are available to all accounts and only need to be associated with a cluster to be used.</p>"
+        }
+      }
+    },
+    "PutClusterCapacityProvidersResponse":{
+      "type":"structure",
+      "members":{
+        "cluster":{"shape":"Cluster"}
+      }
+    },
     "RegisterContainerInstanceRequest":{
       "type":"structure",
       "members":{
@@ -3345,6 +3706,13 @@
       },
       "documentation":"<p>Describes the resources available for a container instance.</p>"
     },
+    "ResourceInUseException":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>The specified resource is in-use and cannot be removed.</p>",
+      "exception":true
+    },
     "ResourceNotFoundException":{
       "type":"structure",
       "members":{
@@ -3389,30 +3757,38 @@
       "type":"structure",
       "required":["taskDefinition"],
       "members":{
+        "capacityProviderStrategy":{
+          "shape":"CapacityProviderStrategy",
+          "documentation":"<p>The capacity provider strategy to use for the task.</p> <p>A capacity provider strategy consists of one or more capacity providers along with the <code>base</code> and <code>weight</code> to assign to them. A capacity provider must be associated with the cluster to be used in a capacity provider strategy. The <a>PutClusterCapacityProviders</a> API is used to associate a capacity provider with a cluster. Only capacity providers with an <code>ACTIVE</code> or <code>UPDATING</code> status can be used.</p> <p>If a <code>capacityProviderStrategy</code> is specified, the <code>launchType</code> parameter must be omitted. If no <code>capacityProviderStrategy</code> or <code>launchType</code> is specified, the <code>defaultCapacityProviderStrategy</code> for the cluster is used.</p> <p>If specifying a capacity provider that uses an Auto Scaling group, the capacity provider must already be created. New capacity providers can be created with the <a>CreateCapacityProvider</a> API operation.</p> <p>To use a AWS Fargate capacity provider, specify either the <code>FARGATE</code> or <code>FARGATE_SPOT</code> capacity providers. The AWS Fargate capacity providers are available to all accounts and only need to be associated with a cluster to be used.</p> <p>The <a>PutClusterCapacityProviders</a> API operation is used to update the list of available capacity providers for a cluster after the cluster is created.</p>"
+        },
         "cluster":{
           "shape":"String",
           "documentation":"<p>The short name or full Amazon Resource Name (ARN) of the cluster on which to run your task. If you do not specify a cluster, the default cluster is assumed.</p>"
         },
-        "taskDefinition":{
-          "shape":"String",
-          "documentation":"<p>The <code>family</code> and <code>revision</code> (<code>family:revision</code>) or full ARN of the task definition to run. If a <code>revision</code> is not specified, the latest <code>ACTIVE</code> revision is used.</p>"
-        },
-        "overrides":{
-          "shape":"TaskOverride",
-          "documentation":"<p>A list of container overrides in JSON format that specify the name of a container in the specified task definition and the overrides it should receive. You can override the default command for a container (that is specified in the task definition or Docker image) with a <code>command</code> override. You can also override existing environment variables (that are specified in the task definition or Docker image) on a container or add new environment variables to it with an <code>environment</code> override.</p> <note> <p>A total of 8192 characters are allowed for overrides. This limit includes the JSON formatting characters of the override structure.</p> </note>"
-        },
         "count":{
           "shape":"BoxedInteger",
           "documentation":"<p>The number of instantiations of the specified task to place on your cluster. You can specify up to 10 tasks per call.</p>"
         },
-        "startedBy":{
-          "shape":"String",
-          "documentation":"<p>An optional tag specified when a task is started. For example, if you automatically trigger a task to run a batch process job, you could apply a unique identifier for that job to your task with the <code>startedBy</code> parameter. You can then identify which tasks belong to that job by filtering the results of a <a>ListTasks</a> call with the <code>startedBy</code> value. Up to 36 letters (uppercase and lowercase), numbers, hyphens, and underscores are allowed.</p> <p>If a task is started by an Amazon ECS service, then the <code>startedBy</code> parameter contains the deployment ID of the service that starts it.</p>"
+        "enableECSManagedTags":{
+          "shape":"Boolean",
+          "documentation":"<p>Specifies whether to enable Amazon ECS managed tags for the task. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs-using-tags.html\">Tagging Your Amazon ECS Resources</a> in the <i>Amazon Elastic Container Service Developer Guide</i>.</p>"
         },
         "group":{
           "shape":"String",
           "documentation":"<p>The name of the task group to associate with the task. The default value is the family name of the task definition (for example, family:my-family-name).</p>"
         },
+        "launchType":{
+          "shape":"LaunchType",
+          "documentation":"<p>The launch type on which to run your task. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/launch_types.html\">Amazon ECS Launch Types</a> in the <i>Amazon Elastic Container Service Developer Guide</i>.</p> <p>If a <code>launchType</code> is specified, the <code>capacityProviderStrategy</code> parameter must be omitted.</p>"
+        },
+        "networkConfiguration":{
+          "shape":"NetworkConfiguration",
+          "documentation":"<p>The network configuration for the task. This parameter is required for task definitions that use the <code>awsvpc</code> network mode to receive their own elastic network interface, and it is not supported for other network modes. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/task-networking.html\">Task Networking</a> in the <i>Amazon Elastic Container Service Developer Guide</i>.</p>"
+        },
+        "overrides":{
+          "shape":"TaskOverride",
+          "documentation":"<p>A list of container overrides in JSON format that specify the name of a container in the specified task definition and the overrides it should receive. You can override the default command for a container (that is specified in the task definition or Docker image) with a <code>command</code> override. You can also override existing environment variables (that are specified in the task definition or Docker image) on a container or add new environment variables to it with an <code>environment</code> override.</p> <note> <p>A total of 8192 characters are allowed for overrides. This limit includes the JSON formatting characters of the override structure.</p> </note>"
+        },
         "placementConstraints":{
           "shape":"PlacementConstraints",
           "documentation":"<p>An array of placement constraint objects to use for the task. You can specify up to 10 constraints per task (including constraints in the task definition and those specified at runtime).</p>"
@@ -3421,29 +3797,29 @@
           "shape":"PlacementStrategies",
           "documentation":"<p>The placement strategy objects to use for the task. You can specify a maximum of five strategy rules per task.</p>"
         },
-        "launchType":{
-          "shape":"LaunchType",
-          "documentation":"<p>The launch type on which to run your task. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/launch_types.html\">Amazon ECS Launch Types</a> in the <i>Amazon Elastic Container Service Developer Guide</i>.</p>"
-        },
         "platformVersion":{
           "shape":"String",
           "documentation":"<p>The platform version the task should run. A platform version is only specified for tasks using the Fargate launch type. If one is not specified, the <code>LATEST</code> platform version is used by default. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/platform_versions.html\">AWS Fargate Platform Versions</a> in the <i>Amazon Elastic Container Service Developer Guide</i>.</p>"
         },
-        "networkConfiguration":{
-          "shape":"NetworkConfiguration",
-          "documentation":"<p>The network configuration for the task. This parameter is required for task definitions that use the <code>awsvpc</code> network mode to receive their own elastic network interface, and it is not supported for other network modes. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/task-networking.html\">Task Networking</a> in the <i>Amazon Elastic Container Service Developer Guide</i>.</p>"
+        "propagateTags":{
+          "shape":"PropagateTags",
+          "documentation":"<p>Specifies whether to propagate the tags from the task definition to the task. If no value is specified, the tags are not propagated. Tags can only be propagated to the task during task creation. To add tags to a task after task creation, use the <a>TagResource</a> API action.</p> <note> <p>An error will be received if you specify the <code>SERVICE</code> option when running a task.</p> </note>"
+        },
+        "referenceId":{
+          "shape":"String",
+          "documentation":"<p>The reference ID to use for the task.</p>"
+        },
+        "startedBy":{
+          "shape":"String",
+          "documentation":"<p>An optional tag specified when a task is started. For example, if you automatically trigger a task to run a batch process job, you could apply a unique identifier for that job to your task with the <code>startedBy</code> parameter. You can then identify which tasks belong to that job by filtering the results of a <a>ListTasks</a> call with the <code>startedBy</code> value. Up to 36 letters (uppercase and lowercase), numbers, hyphens, and underscores are allowed.</p> <p>If a task is started by an Amazon ECS service, then the <code>startedBy</code> parameter contains the deployment ID of the service that starts it.</p>"
         },
         "tags":{
           "shape":"Tags",
           "documentation":"<p>The metadata that you apply to the task to help you categorize and organize them. Each tag consists of a key and an optional value, both of which you define.</p> <p>The following basic restrictions apply to tags:</p> <ul> <li> <p>Maximum number of tags per resource - 50</p> </li> <li> <p>For each resource, each tag key must be unique, and each tag key can have only one value.</p> </li> <li> <p>Maximum key length - 128 Unicode characters in UTF-8</p> </li> <li> <p>Maximum value length - 256 Unicode characters in UTF-8</p> </li> <li> <p>If your tagging schema is used across multiple services and resources, remember that other services may have restrictions on allowed characters. Generally allowed characters are: letters, numbers, and spaces representable in UTF-8, and the following characters: + - = . _ : / @.</p> </li> <li> <p>Tag keys and values are case-sensitive.</p> </li> <li> <p>Do not use <code>aws:</code>, <code>AWS:</code>, or any upper or lowercase combination of such as a prefix for either keys or values as it is reserved for AWS use. You cannot edit or delete tag keys or values with this prefix. Tags with this prefix do not count against your tags per resource limit.</p> </li> </ul>"
         },
-        "enableECSManagedTags":{
-          "shape":"Boolean",
-          "documentation":"<p>Specifies whether to enable Amazon ECS managed tags for the task. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs-using-tags.html\">Tagging Your Amazon ECS Resources</a> in the <i>Amazon Elastic Container Service Developer Guide</i>.</p>"
-        },
-        "propagateTags":{
-          "shape":"PropagateTags",
-          "documentation":"<p>Specifies whether to propagate the tags from the task definition to the task. If no value is specified, the tags are not propagated. Tags can only be propagated to the task during task creation. To add tags to a task after task creation, use the <a>TagResource</a> API action.</p> <note> <p>An error will be received if you specify the <code>SERVICE</code> option when running a task.</p> </note>"
+        "taskDefinition":{
+          "shape":"String",
+          "documentation":"<p>The <code>family</code> and <code>revision</code> (<code>family:revision</code>) or full ARN of the task definition to run. If a <code>revision</code> is not specified, the latest <code>ACTIVE</code> revision is used.</p>"
         }
       }
     },
@@ -3566,6 +3942,10 @@
           "shape":"LaunchType",
           "documentation":"<p>The launch type on which your service is running. If no value is specified, it will default to <code>EC2</code>. Valid values include <code>EC2</code> and <code>FARGATE</code>. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/launch_types.html\">Amazon ECS Launch Types</a> in the <i>Amazon Elastic Container Service Developer Guide</i>.</p>"
         },
+        "capacityProviderStrategy":{
+          "shape":"CapacityProviderStrategy",
+          "documentation":"<p>The capacity provider strategy associated with the service.</p>"
+        },
         "platformVersion":{
           "shape":"String",
           "documentation":"<p>The platform version on which to run your service. A platform version is only specified for tasks using the Fargate launch type. If one is not specified, the <code>LATEST</code> platform version is used by default. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/platform_versions.html\">AWS Fargate Platform Versions</a> in the <i>Amazon Elastic Container Service Developer Guide</i>.</p>"
@@ -3764,29 +4144,21 @@
     "StartTaskRequest":{
       "type":"structure",
       "required":[
-        "taskDefinition",
-        "containerInstances"
+        "containerInstances",
+        "taskDefinition"
       ],
       "members":{
         "cluster":{
           "shape":"String",
           "documentation":"<p>The short name or full Amazon Resource Name (ARN) of the cluster on which to start your task. If you do not specify a cluster, the default cluster is assumed.</p>"
         },
-        "taskDefinition":{
-          "shape":"String",
-          "documentation":"<p>The <code>family</code> and <code>revision</code> (<code>family:revision</code>) or full ARN of the task definition to start. If a <code>revision</code> is not specified, the latest <code>ACTIVE</code> revision is used.</p>"
-        },
-        "overrides":{
-          "shape":"TaskOverride",
-          "documentation":"<p>A list of container overrides in JSON format that specify the name of a container in the specified task definition and the overrides it should receive. You can override the default command for a container (that is specified in the task definition or Docker image) with a <code>command</code> override. You can also override existing environment variables (that are specified in the task definition or Docker image) on a container or add new environment variables to it with an <code>environment</code> override.</p> <note> <p>A total of 8192 characters are allowed for overrides. This limit includes the JSON formatting characters of the override structure.</p> </note>"
-        },
         "containerInstances":{
           "shape":"StringList",
           "documentation":"<p>The container instance IDs or full ARN entries for the container instances on which you would like to place your task. You can specify up to 10 container instances.</p>"
         },
-        "startedBy":{
-          "shape":"String",
-          "documentation":"<p>An optional tag specified when a task is started. For example, if you automatically trigger a task to run a batch process job, you could apply a unique identifier for that job to your task with the <code>startedBy</code> parameter. You can then identify which tasks belong to that job by filtering the results of a <a>ListTasks</a> call with the <code>startedBy</code> value. Up to 36 letters (uppercase and lowercase), numbers, hyphens, and underscores are allowed.</p> <p>If a task is started by an Amazon ECS service, then the <code>startedBy</code> parameter contains the deployment ID of the service that starts it.</p>"
+        "enableECSManagedTags":{
+          "shape":"Boolean",
+          "documentation":"<p>Specifies whether to enable Amazon ECS managed tags for the task. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs-using-tags.html\">Tagging Your Amazon ECS Resources</a> in the <i>Amazon Elastic Container Service Developer Guide</i>.</p>"
         },
         "group":{
           "shape":"String",
@@ -3796,17 +4168,29 @@
           "shape":"NetworkConfiguration",
           "documentation":"<p>The VPC subnet and security group configuration for tasks that receive their own elastic network interface by using the <code>awsvpc</code> networking mode.</p>"
         },
-        "tags":{
-          "shape":"Tags",
-          "documentation":"<p>The metadata that you apply to the task to help you categorize and organize them. Each tag consists of a key and an optional value, both of which you define.</p> <p>The following basic restrictions apply to tags:</p> <ul> <li> <p>Maximum number of tags per resource - 50</p> </li> <li> <p>For each resource, each tag key must be unique, and each tag key can have only one value.</p> </li> <li> <p>Maximum key length - 128 Unicode characters in UTF-8</p> </li> <li> <p>Maximum value length - 256 Unicode characters in UTF-8</p> </li> <li> <p>If your tagging schema is used across multiple services and resources, remember that other services may have restrictions on allowed characters. Generally allowed characters are: letters, numbers, and spaces representable in UTF-8, and the following characters: + - = . _ : / @.</p> </li> <li> <p>Tag keys and values are case-sensitive.</p> </li> <li> <p>Do not use <code>aws:</code>, <code>AWS:</code>, or any upper or lowercase combination of such as a prefix for either keys or values as it is reserved for AWS use. You cannot edit or delete tag keys or values with this prefix. Tags with this prefix do not count against your tags per resource limit.</p> </li> </ul>"
-        },
-        "enableECSManagedTags":{
-          "shape":"Boolean",
-          "documentation":"<p>Specifies whether to enable Amazon ECS managed tags for the task. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs-using-tags.html\">Tagging Your Amazon ECS Resources</a> in the <i>Amazon Elastic Container Service Developer Guide</i>.</p>"
+        "overrides":{
+          "shape":"TaskOverride",
+          "documentation":"<p>A list of container overrides in JSON format that specify the name of a container in the specified task definition and the overrides it should receive. You can override the default command for a container (that is specified in the task definition or Docker image) with a <code>command</code> override. You can also override existing environment variables (that are specified in the task definition or Docker image) on a container or add new environment variables to it with an <code>environment</code> override.</p> <note> <p>A total of 8192 characters are allowed for overrides. This limit includes the JSON formatting characters of the override structure.</p> </note>"
         },
         "propagateTags":{
           "shape":"PropagateTags",
           "documentation":"<p>Specifies whether to propagate the tags from the task definition or the service to the task. If no value is specified, the tags are not propagated.</p>"
+        },
+        "referenceId":{
+          "shape":"String",
+          "documentation":"<p>The reference ID to use for the task.</p>"
+        },
+        "startedBy":{
+          "shape":"String",
+          "documentation":"<p>An optional tag specified when a task is started. For example, if you automatically trigger a task to run a batch process job, you could apply a unique identifier for that job to your task with the <code>startedBy</code> parameter. You can then identify which tasks belong to that job by filtering the results of a <a>ListTasks</a> call with the <code>startedBy</code> value. Up to 36 letters (uppercase and lowercase), numbers, hyphens, and underscores are allowed.</p> <p>If a task is started by an Amazon ECS service, then the <code>startedBy</code> parameter contains the deployment ID of the service that starts it.</p>"
+        },
+        "tags":{
+          "shape":"Tags",
+          "documentation":"<p>The metadata that you apply to the task to help you categorize and organize them. Each tag consists of a key and an optional value, both of which you define.</p> <p>The following basic restrictions apply to tags:</p> <ul> <li> <p>Maximum number of tags per resource - 50</p> </li> <li> <p>For each resource, each tag key must be unique, and each tag key can have only one value.</p> </li> <li> <p>Maximum key length - 128 Unicode characters in UTF-8</p> </li> <li> <p>Maximum value length - 256 Unicode characters in UTF-8</p> </li> <li> <p>If your tagging schema is used across multiple services and resources, remember that other services may have restrictions on allowed characters. Generally allowed characters are: letters, numbers, and spaces representable in UTF-8, and the following characters: + - = . _ : / @.</p> </li> <li> <p>Tag keys and values are case-sensitive.</p> </li> <li> <p>Do not use <code>aws:</code>, <code>AWS:</code>, or any upper or lowercase combination of such as a prefix for either keys or values as it is reserved for AWS use. You cannot edit or delete tag keys or values with this prefix. Tags with this prefix do not count against your tags per resource limit.</p> </li> </ul>"
+        },
+        "taskDefinition":{
+          "shape":"String",
+          "documentation":"<p>The <code>family</code> and <code>revision</code> (<code>family:revision</code>) or full ARN of the task definition to start. If a <code>revision</code> is not specified, the latest <code>ACTIVE</code> revision is used.</p>"
         }
       }
     },
@@ -4034,7 +4418,7 @@
       "members":{
         "resourceArn":{
           "shape":"String",
-          "documentation":"<p>The Amazon Resource Name (ARN) of the resource to which to add tags. Currently, the supported resources are Amazon ECS tasks, services, task definitions, clusters, and container instances.</p>"
+          "documentation":"<p>The Amazon Resource Name (ARN) of the resource to which to add tags. Currently, the supported resources are Amazon ECS capacity providers, tasks, services, task definitions, clusters, and container instances.</p>"
         },
         "tags":{
           "shape":"Tags",
@@ -4073,69 +4457,89 @@
     "Task":{
       "type":"structure",
       "members":{
-        "taskArn":{
+        "attachments":{
+          "shape":"Attachments",
+          "documentation":"<p>The Elastic Network Adapter associated with the task if the task uses the <code>awsvpc</code> network mode.</p>"
+        },
+        "attributes":{
+          "shape":"Attributes",
+          "documentation":"<p>The attributes of the task</p>"
+        },
+        "availabilityZone":{
           "shape":"String",
-          "documentation":"<p>The Amazon Resource Name (ARN) of the task.</p>"
+          "documentation":"<p>The availability zone of the task.</p>"
+        },
+        "capacityProviderName":{
+          "shape":"String",
+          "documentation":"<p>The capacity provider associated with the task.</p>"
         },
         "clusterArn":{
           "shape":"String",
           "documentation":"<p>The ARN of the cluster that hosts the task.</p>"
         },
-        "taskDefinitionArn":{
-          "shape":"String",
-          "documentation":"<p>The ARN of the task definition that creates the task.</p>"
+        "connectivity":{
+          "shape":"Connectivity",
+          "documentation":"<p>The connectivity status of a task.</p>"
+        },
+        "connectivityAt":{
+          "shape":"Timestamp",
+          "documentation":"<p>The Unix timestamp for when the task last went into <code>CONNECTED</code> status.</p>"
         },
         "containerInstanceArn":{
           "shape":"String",
           "documentation":"<p>The ARN of the container instances that host the task.</p>"
         },
-        "overrides":{
-          "shape":"TaskOverride",
-          "documentation":"<p>One or more container overrides.</p>"
+        "containers":{
+          "shape":"Containers",
+          "documentation":"<p>The containers associated with the task.</p>"
         },
-        "lastStatus":{
+        "cpu":{
           "shape":"String",
-          "documentation":"<p>The last known status of the task. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/task-lifecycle.html\">Task Lifecycle</a>.</p>"
+          "documentation":"<p>The number of CPU units used by the task as expressed in a task definition. It can be expressed as an integer using CPU units, for example <code>1024</code>. It can also be expressed as a string using vCPUs, for example <code>1 vCPU</code> or <code>1 vcpu</code>. String values are converted to an integer indicating the CPU units when the task definition is registered.</p> <p>If you are using the EC2 launch type, this field is optional. Supported values are between <code>128</code> CPU units (<code>0.125</code> vCPUs) and <code>10240</code> CPU units (<code>10</code> vCPUs).</p> <p>If you are using the Fargate launch type, this field is required and you must use one of the following values, which determines your range of supported values for the <code>memory</code> parameter:</p> <ul> <li> <p>256 (.25 vCPU) - Available <code>memory</code> values: 512 (0.5 GB), 1024 (1 GB), 2048 (2 GB)</p> </li> <li> <p>512 (.5 vCPU) - Available <code>memory</code> values: 1024 (1 GB), 2048 (2 GB), 3072 (3 GB), 4096 (4 GB)</p> </li> <li> <p>1024 (1 vCPU) - Available <code>memory</code> values: 2048 (2 GB), 3072 (3 GB), 4096 (4 GB), 5120 (5 GB), 6144 (6 GB), 7168 (7 GB), 8192 (8 GB)</p> </li> <li> <p>2048 (2 vCPU) - Available <code>memory</code> values: Between 4096 (4 GB) and 16384 (16 GB) in increments of 1024 (1 GB)</p> </li> <li> <p>4096 (4 vCPU) - Available <code>memory</code> values: Between 8192 (8 GB) and 30720 (30 GB) in increments of 1024 (1 GB)</p> </li> </ul>"
+        },
+        "createdAt":{
+          "shape":"Timestamp",
+          "documentation":"<p>The Unix timestamp for when the task was created (the task entered the <code>PENDING</code> state).</p>"
         },
         "desiredStatus":{
           "shape":"String",
           "documentation":"<p>The desired status of the task. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/task-lifecycle.html\">Task Lifecycle</a>.</p>"
         },
-        "cpu":{
-          "shape":"String",
-          "documentation":"<p>The number of CPU units used by the task as expressed in a task definition. It can be expressed as an integer using CPU units, for example <code>1024</code>. It can also be expressed as a string using vCPUs, for example <code>1 vCPU</code> or <code>1 vcpu</code>. String values are converted to an integer indicating the CPU units when the task definition is registered.</p> <p>If you are using the EC2 launch type, this field is optional. Supported values are between <code>128</code> CPU units (<code>0.125</code> vCPUs) and <code>10240</code> CPU units (<code>10</code> vCPUs).</p> <p>If you are using the Fargate launch type, this field is required and you must use one of the following values, which determines your range of supported values for the <code>memory</code> parameter:</p> <ul> <li> <p>256 (.25 vCPU) - Available <code>memory</code> values: 512 (0.5 GB), 1024 (1 GB), 2048 (2 GB)</p> </li> <li> <p>512 (.5 vCPU) - Available <code>memory</code> values: 1024 (1 GB), 2048 (2 GB), 3072 (3 GB), 4096 (4 GB)</p> </li> <li> <p>1024 (1 vCPU) - Available <code>memory</code> values: 2048 (2 GB), 3072 (3 GB), 4096 (4 GB), 5120 (5 GB), 6144 (6 GB), 7168 (7 GB), 8192 (8 GB)</p> </li> <li> <p>2048 (2 vCPU) - Available <code>memory</code> values: Between 4096 (4 GB) and 16384 (16 GB) in increments of 1024 (1 GB)</p> </li> <li> <p>4096 (4 vCPU) - Available <code>memory</code> values: Between 8192 (8 GB) and 30720 (30 GB) in increments of 1024 (1 GB)</p> </li> </ul>"
+        "executionStoppedAt":{
+          "shape":"Timestamp",
+          "documentation":"<p>The Unix timestamp for when the task execution stopped.</p>"
         },
-        "memory":{
+        "group":{
           "shape":"String",
-          "documentation":"<p>The amount of memory (in MiB) used by the task as expressed in a task definition. It can be expressed as an integer using MiB, for example <code>1024</code>. It can also be expressed as a string using GB, for example <code>1GB</code> or <code>1 GB</code>. String values are converted to an integer indicating the MiB when the task definition is registered.</p> <p>If you are using the EC2 launch type, this field is optional.</p> <p>If you are using the Fargate launch type, this field is required and you must use one of the following values, which determines your range of supported values for the <code>cpu</code> parameter:</p> <ul> <li> <p>512 (0.5 GB), 1024 (1 GB), 2048 (2 GB) - Available <code>cpu</code> values: 256 (.25 vCPU)</p> </li> <li> <p>1024 (1 GB), 2048 (2 GB), 3072 (3 GB), 4096 (4 GB) - Available <code>cpu</code> values: 512 (.5 vCPU)</p> </li> <li> <p>2048 (2 GB), 3072 (3 GB), 4096 (4 GB), 5120 (5 GB), 6144 (6 GB), 7168 (7 GB), 8192 (8 GB) - Available <code>cpu</code> values: 1024 (1 vCPU)</p> </li> <li> <p>Between 4096 (4 GB) and 16384 (16 GB) in increments of 1024 (1 GB) - Available <code>cpu</code> values: 2048 (2 vCPU)</p> </li> <li> <p>Between 8192 (8 GB) and 30720 (30 GB) in increments of 1024 (1 GB) - Available <code>cpu</code> values: 4096 (4 vCPU)</p> </li> </ul>"
+          "documentation":"<p>The name of the task group associated with the task.</p>"
         },
-        "containers":{
-          "shape":"Containers",
-          "documentation":"<p>The containers associated with the task.</p>"
+        "healthStatus":{
+          "shape":"HealthStatus",
+          "documentation":"<p>The health status for the task, which is determined by the health of the essential containers in the task. If all essential containers in the task are reporting as <code>HEALTHY</code>, then the task status also reports as <code>HEALTHY</code>. If any essential containers in the task are reporting as <code>UNHEALTHY</code> or <code>UNKNOWN</code>, then the task status also reports as <code>UNHEALTHY</code> or <code>UNKNOWN</code>, accordingly.</p> <note> <p>The Amazon ECS container agent does not monitor or report on Docker health checks that are embedded in a container image (such as those specified in a parent image or from the image's Dockerfile) and not specified in the container definition. Health check parameters that are specified in a container definition override any Docker health checks that exist in the container image.</p> </note>"
         },
-        "startedBy":{
+        "inferenceAccelerators":{
+          "shape":"InferenceAccelerators",
+          "documentation":"<p>The Elastic Inference accelerator associated with the task.</p>"
+        },
+        "lastStatus":{
           "shape":"String",
-          "documentation":"<p>The tag specified when a task is started. If the task is started by an Amazon ECS service, then the <code>startedBy</code> parameter contains the deployment ID of the service that starts it.</p>"
+          "documentation":"<p>The last known status of the task. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/task-lifecycle.html\">Task Lifecycle</a>.</p>"
         },
-        "version":{
-          "shape":"Long",
-          "documentation":"<p>The version counter for the task. Every time a task experiences a change that triggers a CloudWatch event, the version counter is incremented. If you are replicating your Amazon ECS task state with CloudWatch Events, you can compare the version of a task reported by the Amazon ECS API actions with the version reported in CloudWatch Events for the task (inside the <code>detail</code> object) to verify that the version in your event stream is current.</p>"
+        "launchType":{
+          "shape":"LaunchType",
+          "documentation":"<p>The launch type on which your task is running. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/launch_types.html\">Amazon ECS Launch Types</a> in the <i>Amazon Elastic Container Service Developer Guide</i>.</p>"
         },
-        "stoppedReason":{
+        "memory":{
           "shape":"String",
-          "documentation":"<p>The reason that the task was stopped.</p>"
-        },
-        "stopCode":{
-          "shape":"TaskStopCode",
-          "documentation":"<p>The stop code indicating why a task was stopped. The <code>stoppedReason</code> may contain additional details.</p>"
+          "documentation":"<p>The amount of memory (in MiB) used by the task as expressed in a task definition. It can be expressed as an integer using MiB, for example <code>1024</code>. It can also be expressed as a string using GB, for example <code>1GB</code> or <code>1 GB</code>. String values are converted to an integer indicating the MiB when the task definition is registered.</p> <p>If you are using the EC2 launch type, this field is optional.</p> <p>If you are using the Fargate launch type, this field is required and you must use one of the following values, which determines your range of supported values for the <code>cpu</code> parameter:</p> <ul> <li> <p>512 (0.5 GB), 1024 (1 GB), 2048 (2 GB) - Available <code>cpu</code> values: 256 (.25 vCPU)</p> </li> <li> <p>1024 (1 GB), 2048 (2 GB), 3072 (3 GB), 4096 (4 GB) - Available <code>cpu</code> values: 512 (.5 vCPU)</p> </li> <li> <p>2048 (2 GB), 3072 (3 GB), 4096 (4 GB), 5120 (5 GB), 6144 (6 GB), 7168 (7 GB), 8192 (8 GB) - Available <code>cpu</code> values: 1024 (1 vCPU)</p> </li> <li> <p>Between 4096 (4 GB) and 16384 (16 GB) in increments of 1024 (1 GB) - Available <code>cpu</code> values: 2048 (2 vCPU)</p> </li> <li> <p>Between 8192 (8 GB) and 30720 (30 GB) in increments of 1024 (1 GB) - Available <code>cpu</code> values: 4096 (4 vCPU)</p> </li> </ul>"
         },
-        "connectivity":{
-          "shape":"Connectivity",
-          "documentation":"<p>The connectivity status of a task.</p>"
+        "overrides":{
+          "shape":"TaskOverride",
+          "documentation":"<p>One or more container overrides.</p>"
         },
-        "connectivityAt":{
-          "shape":"Timestamp",
-          "documentation":"<p>The Unix timestamp for when the task last went into <code>CONNECTED</code> status.</p>"
+        "platformVersion":{
+          "shape":"String",
+          "documentation":"<p>The platform version on which your task is running. A platform version is only specified for tasks using the Fargate launch type. If one is not specified, the <code>LATEST</code> platform version is used by default. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/platform_versions.html\">AWS Fargate Platform Versions</a> in the <i>Amazon Elastic Container Service Developer Guide</i>.</p>"
         },
         "pullStartedAt":{
           "shape":"Timestamp",
@@ -4145,53 +4549,45 @@
           "shape":"Timestamp",
           "documentation":"<p>The Unix timestamp for when the container image pull completed.</p>"
         },
-        "executionStoppedAt":{
-          "shape":"Timestamp",
-          "documentation":"<p>The Unix timestamp for when the task execution stopped.</p>"
-        },
-        "createdAt":{
-          "shape":"Timestamp",
-          "documentation":"<p>The Unix timestamp for when the task was created (the task entered the <code>PENDING</code> state).</p>"
-        },
         "startedAt":{
           "shape":"Timestamp",
           "documentation":"<p>The Unix timestamp for when the task started (the task transitioned from the <code>PENDING</code> state to the <code>RUNNING</code> state).</p>"
         },
-        "stoppingAt":{
-          "shape":"Timestamp",
-          "documentation":"<p>The Unix timestamp for when the task stops (transitions from the <code>RUNNING</code> state to <code>STOPPED</code>).</p>"
+        "startedBy":{
+          "shape":"String",
+          "documentation":"<p>The tag specified when a task is started. If the task is started by an Amazon ECS service, then the <code>startedBy</code> parameter contains the deployment ID of the service that starts it.</p>"
+        },
+        "stopCode":{
+          "shape":"TaskStopCode",
+          "documentation":"<p>The stop code indicating why a task was stopped. The <code>stoppedReason</code> may contain additional details.</p>"
         },
         "stoppedAt":{
           "shape":"Timestamp",
           "documentation":"<p>The Unix timestamp for when the task was stopped (the task transitioned from the <code>RUNNING</code> state to the <code>STOPPED</code> state).</p>"
         },
-        "group":{
-          "shape":"String",
-          "documentation":"<p>The name of the task group associated with the task.</p>"
-        },
-        "launchType":{
-          "shape":"LaunchType",
-          "documentation":"<p>The launch type on which your task is running. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/launch_types.html\">Amazon ECS Launch Types</a> in the <i>Amazon Elastic Container Service Developer Guide</i>.</p>"
-        },
-        "platformVersion":{
+        "stoppedReason":{
           "shape":"String",
-          "documentation":"<p>The platform version on which your task is running. A platform version is only specified for tasks using the Fargate launch type. If one is not specified, the <code>LATEST</code> platform version is used by default. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/platform_versions.html\">AWS Fargate Platform Versions</a> in the <i>Amazon Elastic Container Service Developer Guide</i>.</p>"
-        },
-        "attachments":{
-          "shape":"Attachments",
-          "documentation":"<p>The Elastic Network Adapter associated with the task if the task uses the <code>awsvpc</code> network mode.</p>"
+          "documentation":"<p>The reason that the task was stopped.</p>"
         },
-        "healthStatus":{
-          "shape":"HealthStatus",
-          "documentation":"<p>The health status for the task, which is determined by the health of the essential containers in the task. If all essential containers in the task are reporting as <code>HEALTHY</code>, then the task status also reports as <code>HEALTHY</code>. If any essential containers in the task are reporting as <code>UNHEALTHY</code> or <code>UNKNOWN</code>, then the task status also reports as <code>UNHEALTHY</code> or <code>UNKNOWN</code>, accordingly.</p> <note> <p>The Amazon ECS container agent does not monitor or report on Docker health checks that are embedded in a container image (such as those specified in a parent image or from the image's Dockerfile) and not specified in the container definition. Health check parameters that are specified in a container definition override any Docker health checks that exist in the container image.</p> </note>"
+        "stoppingAt":{
+          "shape":"Timestamp",
+          "documentation":"<p>The Unix timestamp for when the task stops (transitions from the <code>RUNNING</code> state to <code>STOPPED</code>).</p>"
         },
         "tags":{
           "shape":"Tags",
           "documentation":"<p>The metadata that you apply to the task to help you categorize and organize them. Each tag consists of a key and an optional value, both of which you define.</p> <p>The following basic restrictions apply to tags:</p> <ul> <li> <p>Maximum number of tags per resource - 50</p> </li> <li> <p>For each resource, each tag key must be unique, and each tag key can have only one value.</p> </li> <li> <p>Maximum key length - 128 Unicode characters in UTF-8</p> </li> <li> <p>Maximum value length - 256 Unicode characters in UTF-8</p> </li> <li> <p>If your tagging schema is used across multiple services and resources, remember that other services may have restrictions on allowed characters. Generally allowed characters are: letters, numbers, and spaces representable in UTF-8, and the following characters: + - = . _ : / @.</p> </li> <li> <p>Tag keys and values are case-sensitive.</p> </li> <li> <p>Do not use <code>aws:</code>, <code>AWS:</code>, or any upper or lowercase combination of such as a prefix for either keys or values as it is reserved for AWS use. You cannot edit or delete tag keys or values with this prefix. Tags with this prefix do not count against your tags per resource limit.</p> </li> </ul>"
         },
-        "inferenceAccelerators":{
-          "shape":"InferenceAccelerators",
-          "documentation":"<p>The Elastic Inference accelerator associated with the task.</p>"
+        "taskArn":{
+          "shape":"String",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the task.</p>"
+        },
+        "taskDefinitionArn":{
+          "shape":"String",
+          "documentation":"<p>The ARN of the task definition that creates the task.</p>"
+        },
+        "version":{
+          "shape":"Long",
+          "documentation":"<p>The version counter for the task. Every time a task experiences a change that triggers a CloudWatch event, the version counter is incremented. If you are replicating your Amazon ECS task state with CloudWatch Events, you can compare the version of a task reported by the Amazon ECS API actions with the version reported in CloudWatch Events for the task (inside the <code>detail</code> object) to verify that the version in your event stream is current.</p>"
         }
       },
       "documentation":"<p>Details on a task in a cluster.</p>"
@@ -4209,7 +4605,7 @@
         },
         "family":{
           "shape":"String",
-          "documentation":"<p>The name of a family that this task definition is registered to. A family groups multiple versions of a task definition. Amazon ECS gives the first task definition that you registered to a family a revision number of 1. Amazon ECS gives sequential revision numbers to each task definition that you add.</p>"
+          "documentation":"<p>The name of a family that this task definition is registered to. Up to 255 letters (uppercase and lowercase), numbers, hyphens, and underscores are allowed.</p> <p>A family groups multiple versions of a task definition. Amazon ECS gives the first task definition that you registered to a family a revision number of 1. Amazon ECS gives sequential revision numbers to each task definition that you add.</p>"
         },
         "taskRoleArn":{
           "shape":"String",
@@ -4259,6 +4655,10 @@
           "shape":"String",
           "documentation":"<p>The amount (in MiB) of memory used by the task.</p> <p>If using the EC2 launch type, this field is optional and any value can be used. If a task-level memory value is specified then the container-level memory value is optional.</p> <p>If using the Fargate launch type, this field is required and you must use one of the following values, which determines your range of valid values for the <code>cpu</code> parameter:</p> <ul> <li> <p>512 (0.5 GB), 1024 (1 GB), 2048 (2 GB) - Available <code>cpu</code> values: 256 (.25 vCPU)</p> </li> <li> <p>1024 (1 GB), 2048 (2 GB), 3072 (3 GB), 4096 (4 GB) - Available <code>cpu</code> values: 512 (.5 vCPU)</p> </li> <li> <p>2048 (2 GB), 3072 (3 GB), 4096 (4 GB), 5120 (5 GB), 6144 (6 GB), 7168 (7 GB), 8192 (8 GB) - Available <code>cpu</code> values: 1024 (1 vCPU)</p> </li> <li> <p>Between 4096 (4 GB) and 16384 (16 GB) in increments of 1024 (1 GB) - Available <code>cpu</code> values: 2048 (2 vCPU)</p> </li> <li> <p>Between 8192 (8 GB) and 30720 (30 GB) in increments of 1024 (1 GB) - Available <code>cpu</code> values: 4096 (4 vCPU)</p> </li> </ul>"
         },
+        "inferenceAccelerators":{
+          "shape":"InferenceAccelerators",
+          "documentation":"<p>The Elastic Inference accelerator associated with the task.</p>"
+        },
         "pidMode":{
           "shape":"PidMode",
           "documentation":"<p>The process namespace to use for the containers in the task. The valid values are <code>host</code> or <code>task</code>. If <code>host</code> is specified, then all containers within the tasks that specified the <code>host</code> PID mode on the same container instance share the same process namespace with the host Amazon EC2 instance. If <code>task</code> is specified, all containers within the specified task share the same process namespace. If no value is specified, the default is a private namespace. For more information, see <a href=\"https://docs.docker.com/engine/reference/run/#pid-settings---pid\">PID settings</a> in the <i>Docker run reference</i>.</p> <p>If the <code>host</code> PID mode is used, be aware that there is a heightened risk of undesired process namespace expose. For more information, see <a href=\"https://docs.docker.com/engine/security/security/\">Docker security</a>.</p> <note> <p>This parameter is not supported for Windows containers or tasks using the Fargate launch type.</p> </note>"
@@ -4334,17 +4734,25 @@
           "shape":"ContainerOverrides",
           "documentation":"<p>One or more container overrides sent to a task.</p>"
         },
+        "cpu":{
+          "shape":"String",
+          "documentation":"<p>The cpu override for the task.</p>"
+        },
         "inferenceAcceleratorOverrides":{
           "shape":"InferenceAcceleratorOverrides",
           "documentation":"<p>The Elastic Inference accelerator override for the task.</p>"
         },
-        "taskRoleArn":{
-          "shape":"String",
-          "documentation":"<p>The Amazon Resource Name (ARN) of the IAM role that containers in this task can assume. All containers in this task are granted the permissions that are specified in this role.</p>"
-        },
         "executionRoleArn":{
           "shape":"String",
           "documentation":"<p>The Amazon Resource Name (ARN) of the task execution role that the Amazon ECS container agent and the Docker daemon can assume.</p>"
+        },
+        "memory":{
+          "shape":"String",
+          "documentation":"<p>The memory override for the task.</p>"
+        },
+        "taskRoleArn":{
+          "shape":"String",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the IAM role that containers in this task can assume. All containers in this task are granted the permissions that are specified in this role.</p>"
         }
       },
       "documentation":"<p>The overrides associated with a task.</p>"
@@ -4408,6 +4816,10 @@
           "shape":"LaunchType",
           "documentation":"<p>The launch type the tasks in the task set are using. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/launch_types.html\">Amazon ECS Launch Types</a> in the <i>Amazon Elastic Container Service Developer Guide</i>.</p>"
         },
+        "capacityProviderStrategy":{
+          "shape":"CapacityProviderStrategy",
+          "documentation":"<p>The capacity provider strategy associated with the task set.</p>"
+        },
         "platformVersion":{
           "shape":"String",
           "documentation":"<p>The platform version on which the tasks in the task set are running. A platform version is only specified for tasks using the Fargate launch type. If one is not specified, the <code>LATEST</code> platform version is used by default. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/platform_versions.html\">AWS Fargate Platform Versions</a> in the <i>Amazon Elastic Container Service Developer Guide</i>.</p>"
@@ -4435,15 +4847,27 @@
         "stabilityStatusAt":{
           "shape":"Timestamp",
           "documentation":"<p>The Unix timestamp for when the task set stability status was retrieved.</p>"
+        },
+        "tags":{
+          "shape":"Tags",
+          "documentation":"<p>The metadata that you apply to the task set to help you categorize and organize them. Each tag consists of a key and an optional value, both of which you define.</p> <p>The following basic restrictions apply to tags:</p> <ul> <li> <p>Maximum number of tags per resource - 50</p> </li> <li> <p>For each resource, each tag key must be unique, and each tag key can have only one value.</p> </li> <li> <p>Maximum key length - 128 Unicode characters in UTF-8</p> </li> <li> <p>Maximum value length - 256 Unicode characters in UTF-8</p> </li> <li> <p>If your tagging schema is used across multiple services and resources, remember that other services may have restrictions on allowed characters. Generally allowed characters are: letters, numbers, and spaces representable in UTF-8, and the following characters: + - = . _ : / @.</p> </li> <li> <p>Tag keys and values are case-sensitive.</p> </li> <li> <p>Do not use <code>aws:</code>, <code>AWS:</code>, or any upper or lowercase combination of such as a prefix for either keys or values as it is reserved for AWS use. You cannot edit or delete tag keys or values with this prefix. Tags with this prefix do not count against your tags per resource limit.</p> </li> </ul>"
         }
       },
       "documentation":"<p>Information about a set of Amazon ECS tasks in either an AWS CodeDeploy or an <code>EXTERNAL</code> deployment. An Amazon ECS task set includes details such as the desired number of tasks, how many tasks are running, and whether the task set serves production traffic.</p>"
     },
+    "TaskSetField":{
+      "type":"string",
+      "enum":["TAGS"]
+    },
+    "TaskSetFieldList":{
+      "type":"list",
+      "member":{"shape":"TaskSetField"}
+    },
     "TaskSetNotFoundException":{
       "type":"structure",
       "members":{
       },
-      "documentation":"<p>The specified task set could not be found. You can view your available container instances with <a>DescribeTaskSets</a>. Task sets are specific to each cluster, service and Region.</p>",
+      "documentation":"<p>The specified task set could not be found. You can view your available task sets with <a>DescribeTaskSets</a>. Task sets are specific to each cluster, service and Region.</p>",
       "exception":true
     },
     "TaskSets":{
@@ -4559,7 +4983,7 @@
       "members":{
         "resourceArn":{
           "shape":"String",
-          "documentation":"<p>The Amazon Resource Name (ARN) of the resource from which to delete tags. Currently, the supported resources are Amazon ECS tasks, services, task definitions, clusters, and container instances.</p>"
+          "documentation":"<p>The Amazon Resource Name (ARN) of the resource from which to delete tags. Currently, the supported resources are Amazon ECS capacity providers, tasks, services, task definitions, clusters, and container instances.</p>"
         },
         "tagKeys":{
           "shape":"TagKeys",
@@ -4707,17 +5131,26 @@
           "shape":"String",
           "documentation":"<p>The <code>family</code> and <code>revision</code> (<code>family:revision</code>) or full ARN of the task definition to run in your service. If a <code>revision</code> is not specified, the latest <code>ACTIVE</code> revision is used. If you modify the task definition with <code>UpdateService</code>, Amazon ECS spawns a task with the new version of the task definition and then stops an old task after the new version is running.</p>"
         },
+        "capacityProviderStrategy":{
+          "shape":"CapacityProviderStrategy",
+          "documentation":"<p>The capacity provider strategy to update the service to use.</p> <p>If the service is using the default capacity provider strategy for the cluster, the service can be updated to use one or more capacity providers. However, when a service is using a non-default capacity provider strategy, the service cannot be updated to use the cluster's default capacity provider strategy.</p> <p/>"
+        },
         "deploymentConfiguration":{
           "shape":"DeploymentConfiguration",
           "documentation":"<p>Optional deployment parameters that control how many tasks run during the deployment and the ordering of stopping and starting tasks.</p>"
         },
-        "networkConfiguration":{
-          "shape":"NetworkConfiguration",
-          "documentation":"<p>The network configuration for the service. This parameter is required for task definitions that use the <code>awsvpc</code> network mode to receive their own elastic network interface, and it is not supported for other network modes. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/task-networking.html\">Task Networking</a> in the <i>Amazon Elastic Container Service Developer Guide</i>.</p> <note> <p>Updating a service to add a subnet to a list of existing subnets does not trigger a service deployment. For example, if your network configuration change is to keep the existing subnets and simply add another subnet to the network configuration, this does not trigger a new service deployment.</p> </note>"
+        "networkConfiguration":{"shape":"NetworkConfiguration"},
+        "placementConstraints":{
+          "shape":"PlacementConstraints",
+          "documentation":"<p>An array of task placement constraint objects to update the service to use. If no value is specified, the existing placement constraints for the service will remain unchanged. If this value is specified, it will override any existing placement constraints defined for the service. To remove all existing placement constraints, specify an empty array.</p> <p>You can specify a maximum of 10 constraints per task (this limit includes constraints in the task definition and those specified at runtime).</p>"
+        },
+        "placementStrategy":{
+          "shape":"PlacementStrategies",
+          "documentation":"<p>The task placement strategy objects to update the service to use. If no value is specified, the existing placement strategy for the service will remain unchanged. If this value is specified, it will override the existing placement strategy defined for the service. To remove an existing placement strategy, specify an empty object.</p> <p>You can specify a maximum of five strategy rules per service.</p>"
         },
         "platformVersion":{
           "shape":"String",
-          "documentation":"<p>The platform version on which your tasks in the service are running. A platform version is only specified for tasks using the Fargate launch type. If one is not specified, the <code>LATEST</code> platform version is used by default. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/platform_versions.html\">AWS Fargate Platform Versions</a> in the <i>Amazon Elastic Container Service Developer Guide</i>.</p>"
+          "documentation":"<p>The platform version on which your tasks in the service are running. A platform version is only specified for tasks using the Fargate launch type. If a platform version is not specified, the <code>LATEST</code> platform version is used by default. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/platform_versions.html\">AWS Fargate Platform Versions</a> in the <i>Amazon Elastic Container Service Developer Guide</i>.</p>"
         },
         "forceNewDeployment":{
           "shape":"Boolean",
@@ -4725,7 +5158,7 @@
         },
         "healthCheckGracePeriodSeconds":{
           "shape":"BoxedInteger",
-          "documentation":"<p>The period of time, in seconds, that the Amazon ECS service scheduler should ignore unhealthy Elastic Load Balancing target health checks after a task has first started. This is only valid if your service is configured to use a load balancer. If your service's tasks take a while to start and respond to Elastic Load Balancing health checks, you can specify a health check grace period of up to 2,147,483,647 seconds. During that time, the ECS service scheduler ignores the Elastic Load Balancing health check status. This grace period can prevent the ECS service scheduler from marking tasks as unhealthy and stopping them before they have time to come up.</p>"
+          "documentation":"<p>The period of time, in seconds, that the Amazon ECS service scheduler should ignore unhealthy Elastic Load Balancing target health checks after a task has first started. This is only valid if your service is configured to use a load balancer. If your service's tasks take a while to start and respond to Elastic Load Balancing health checks, you can specify a health check grace period of up to 2,147,483,647 seconds. During that time, the Amazon ECS service scheduler ignores the Elastic Load Balancing health check status. This grace period can prevent the ECS service scheduler from marking tasks as unhealthy and stopping them before they have time to come up.</p>"
         }
       }
     },
@@ -4799,7 +5232,11 @@
         },
         "dockerVolumeConfiguration":{
           "shape":"DockerVolumeConfiguration",
-          "documentation":"<p>This parameter is specified when you are using Docker volumes. Docker volumes are only supported when you are using the EC2 launch type. Windows containers only support the use of the <code>local</code> driver. To use bind mounts, specify a <code>host</code> instead.</p>"
+          "documentation":"<p>This parameter is specified when you are using Docker volumes. Docker volumes are only supported when you are using the EC2 launch type. Windows containers only support the use of the <code>local</code> driver. To use bind mounts, specify the <code>host</code> parameter instead.</p>"
+        },
+        "efsVolumeConfiguration":{
+          "shape":"EFSVolumeConfiguration",
+          "documentation":"<p>This parameter is specified when you are using an Amazon Elastic File System (Amazon EFS) file storage. Amazon EFS file systems are only supported when you are using the EC2 launch type.</p> <important> <p> <code>EFSVolumeConfiguration</code> remains in preview and is a Beta Service as defined by and subject to the Beta Service Participation Service Terms located at <a href=\"https://aws.amazon.com/service-terms\">https://aws.amazon.com/service-terms</a> (\"Beta Terms\"). These Beta Terms apply to your participation in this preview of <code>EFSVolumeConfiguration</code>.</p> </important>"
         }
       },
       "documentation":"<p>A data volume used in a task definition. For tasks that use a Docker volume, specify a <code>DockerVolumeConfiguration</code>. For tasks that use a bind mount host volume, specify a <code>host</code> and optional <code>sourcePath</code>. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/using_data_volumes.html\">Using Data Volumes in Tasks</a>.</p>"
diff --git a/services/ecs/src/test/resources/cucumber.properties b/services/ecs/src/test/resources/cucumber.properties
index 5d02a75f01e8..a38c01df8eae 100644
--- a/services/ecs/src/test/resources/cucumber.properties
+++ b/services/ecs/src/test/resources/cucumber.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/efs/build.properties b/services/efs/build.properties
index ecf2dae6fcb1..15ec2da1fc71 100644
--- a/services/efs/build.properties
+++ b/services/efs/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/efs/pom.xml b/services/efs/pom.xml
index 85f2d1380c35..9186a188c4e1 100644
--- a/services/efs/pom.xml
+++ b/services/efs/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>efs</artifactId>
     <name>AWS Java SDK :: Services :: Amazon Elastic File System</name>
diff --git a/services/efs/src/it/java/software/amazon/awssdk/services/efs/ElasticFileSystemIntegrationTest.java b/services/efs/src/it/java/software/amazon/awssdk/services/efs/ElasticFileSystemIntegrationTest.java
index bb997796d448..640f63fd945e 100644
--- a/services/efs/src/it/java/software/amazon/awssdk/services/efs/ElasticFileSystemIntegrationTest.java
+++ b/services/efs/src/it/java/software/amazon/awssdk/services/efs/ElasticFileSystemIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/efs/src/main/resources/codegen-resources/paginators-1.json b/services/efs/src/main/resources/codegen-resources/paginators-1.json
index 5677bd8e4a2d..418186d345b0 100644
--- a/services/efs/src/main/resources/codegen-resources/paginators-1.json
+++ b/services/efs/src/main/resources/codegen-resources/paginators-1.json
@@ -1,4 +1,24 @@
 {
   "pagination": {
+    "DescribeAccessPoints": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "MaxResults"
+    },
+    "DescribeFileSystems": {
+      "input_token": "Marker",
+      "output_token": "NextMarker",
+      "limit_key": "MaxItems"
+    },
+    "DescribeTags": {
+      "input_token": "Marker",
+      "output_token": "NextMarker",
+      "limit_key": "MaxItems"
+    },
+    "ListTagsForResource": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "MaxResults"
+    }
   }
 }
diff --git a/services/efs/src/main/resources/codegen-resources/service-2.json b/services/efs/src/main/resources/codegen-resources/service-2.json
index 48970d28e419..68374320effc 100644
--- a/services/efs/src/main/resources/codegen-resources/service-2.json
+++ b/services/efs/src/main/resources/codegen-resources/service-2.json
@@ -11,6 +11,24 @@
     "uid":"elasticfilesystem-2015-02-01"
   },
   "operations":{
+    "CreateAccessPoint":{
+      "name":"CreateAccessPoint",
+      "http":{
+        "method":"POST",
+        "requestUri":"/2015-02-01/access-points",
+        "responseCode":200
+      },
+      "input":{"shape":"CreateAccessPointRequest"},
+      "output":{"shape":"AccessPointDescription"},
+      "errors":[
+        {"shape":"BadRequest"},
+        {"shape":"AccessPointAlreadyExists"},
+        {"shape":"InternalServerError"},
+        {"shape":"FileSystemNotFound"},
+        {"shape":"AccessPointLimitExceeded"}
+      ],
+      "documentation":"<p>Creates an EFS access point. An access point is an application-specific view into an EFS file system that applies an operating system user and group, and a file system path, to any file system request made through the access point. The operating system user and group override any identity information provided by the NFS client. The file system path is exposed as the access point's root directory. Applications using the access point can only access data in its own directory and below. To learn more, see <a href=\"https://docs.aws.amazon.com/efs/latest/ug/efs-access-points.html\">Mounting a File System Using EFS Access Points</a>.</p> <p>This operation requires permissions for the <code>elasticfilesystem:CreateAccessPoint</code> action.</p>"
+    },
     "CreateFileSystem":{
       "name":"CreateFileSystem",
       "http":{
@@ -68,7 +86,24 @@
         {"shape":"InternalServerError"},
         {"shape":"FileSystemNotFound"}
       ],
-      "documentation":"<p>Creates or overwrites tags associated with a file system. Each tag is a key-value pair. If a tag key specified in the request already exists on the file system, this operation overwrites its value with the value provided in the request. If you add the <code>Name</code> tag to your file system, Amazon EFS returns it in the response to the <a>DescribeFileSystems</a> operation. </p> <p>This operation requires permission for the <code>elasticfilesystem:CreateTags</code> action.</p>"
+      "documentation":"<p>Creates or overwrites tags associated with a file system. Each tag is a key-value pair. If a tag key specified in the request already exists on the file system, this operation overwrites its value with the value provided in the request. If you add the <code>Name</code> tag to your file system, Amazon EFS returns it in the response to the <a>DescribeFileSystems</a> operation. </p> <p>This operation requires permission for the <code>elasticfilesystem:CreateTags</code> action.</p>",
+      "deprecated":true,
+      "deprecatedMessage":"Use TagResource."
+    },
+    "DeleteAccessPoint":{
+      "name":"DeleteAccessPoint",
+      "http":{
+        "method":"DELETE",
+        "requestUri":"/2015-02-01/access-points/{AccessPointId}",
+        "responseCode":204
+      },
+      "input":{"shape":"DeleteAccessPointRequest"},
+      "errors":[
+        {"shape":"BadRequest"},
+        {"shape":"InternalServerError"},
+        {"shape":"AccessPointNotFound"}
+      ],
+      "documentation":"<p>Deletes the specified access point. After deletion is complete, new clients can no longer connect to the access points. Clients connected to the access point at the time of deletion will continue to function until they terminate their connection.</p> <p>This operation requires permissions for the <code>elasticfilesystem:DeleteAccessPoint</code> action.</p>"
     },
     "DeleteFileSystem":{
       "name":"DeleteFileSystem",
@@ -86,6 +121,21 @@
       ],
       "documentation":"<p>Deletes a file system, permanently severing access to its contents. Upon return, the file system no longer exists and you can't access any contents of the deleted file system.</p> <p> You can't delete a file system that is in use. That is, if the file system has any mount targets, you must first delete them. For more information, see <a>DescribeMountTargets</a> and <a>DeleteMountTarget</a>. </p> <note> <p>The <code>DeleteFileSystem</code> call returns while the file system state is still <code>deleting</code>. You can check the file system deletion status by calling the <a>DescribeFileSystems</a> operation, which returns a list of file systems in your account. If you pass file system ID or creation token for the deleted file system, the <a>DescribeFileSystems</a> returns a <code>404 FileSystemNotFound</code> error.</p> </note> <p>This operation requires permissions for the <code>elasticfilesystem:DeleteFileSystem</code> action.</p>"
     },
+    "DeleteFileSystemPolicy":{
+      "name":"DeleteFileSystemPolicy",
+      "http":{
+        "method":"DELETE",
+        "requestUri":"/2015-02-01/file-systems/{FileSystemId}/policy",
+        "responseCode":200
+      },
+      "input":{"shape":"DeleteFileSystemPolicyRequest"},
+      "errors":[
+        {"shape":"InternalServerError"},
+        {"shape":"FileSystemNotFound"},
+        {"shape":"IncorrectFileSystemLifeCycleState"}
+      ],
+      "documentation":"<p>Deletes the <code>FileSystemPolicy</code> for the specified file system. The default <code>FileSystemPolicy</code> goes into effect once the existing policy is deleted. For more information about the default file system policy, see <a href=\"https://docs.aws.amazon.com/efs/latest/ug/res-based-policies-efs.html\">Using Resource-based Policies with EFS</a>.</p> <p>This operation requires permissions for the <code>elasticfilesystem:DeleteFileSystemPolicy</code> action.</p>"
+    },
     "DeleteMountTarget":{
       "name":"DeleteMountTarget",
       "http":{
@@ -115,7 +165,42 @@
         {"shape":"InternalServerError"},
         {"shape":"FileSystemNotFound"}
       ],
-      "documentation":"<p>Deletes the specified tags from a file system. If the <code>DeleteTags</code> request includes a tag key that doesn't exist, Amazon EFS ignores it and doesn't cause an error. For more information about tags and related restrictions, see <a href=\"https://docs.aws.amazon.com/awsaccountbilling/latest/aboutv2/cost-alloc-tags.html\">Tag Restrictions</a> in the <i>AWS Billing and Cost Management User Guide</i>.</p> <p>This operation requires permissions for the <code>elasticfilesystem:DeleteTags</code> action.</p>"
+      "documentation":"<p>Deletes the specified tags from a file system. If the <code>DeleteTags</code> request includes a tag key that doesn't exist, Amazon EFS ignores it and doesn't cause an error. For more information about tags and related restrictions, see <a href=\"https://docs.aws.amazon.com/awsaccountbilling/latest/aboutv2/cost-alloc-tags.html\">Tag Restrictions</a> in the <i>AWS Billing and Cost Management User Guide</i>.</p> <p>This operation requires permissions for the <code>elasticfilesystem:DeleteTags</code> action.</p>",
+      "deprecated":true,
+      "deprecatedMessage":"Use UntagResource."
+    },
+    "DescribeAccessPoints":{
+      "name":"DescribeAccessPoints",
+      "http":{
+        "method":"GET",
+        "requestUri":"/2015-02-01/access-points",
+        "responseCode":200
+      },
+      "input":{"shape":"DescribeAccessPointsRequest"},
+      "output":{"shape":"DescribeAccessPointsResponse"},
+      "errors":[
+        {"shape":"BadRequest"},
+        {"shape":"InternalServerError"},
+        {"shape":"FileSystemNotFound"},
+        {"shape":"AccessPointNotFound"}
+      ],
+      "documentation":"<p>Returns the description of a specific Amazon EFS access point if the <code>AccessPointId</code> is provided. If you provide an EFS <code>FileSystemId</code>, it returns descriptions of all access points for that file system. You can provide either an <code>AccessPointId</code> or a <code>FileSystemId</code> in the request, but not both. </p> <p>This operation requires permissions for the <code>elasticfilesystem:DescribeAccessPoints</code> action.</p>"
+    },
+    "DescribeFileSystemPolicy":{
+      "name":"DescribeFileSystemPolicy",
+      "http":{
+        "method":"GET",
+        "requestUri":"/2015-02-01/file-systems/{FileSystemId}/policy",
+        "responseCode":200
+      },
+      "input":{"shape":"DescribeFileSystemPolicyRequest"},
+      "output":{"shape":"FileSystemPolicyDescription"},
+      "errors":[
+        {"shape":"InternalServerError"},
+        {"shape":"FileSystemNotFound"},
+        {"shape":"PolicyNotFound"}
+      ],
+      "documentation":"<p>Returns the <code>FileSystemPolicy</code> for the specified EFS file system.</p> <p>This operation requires permissions for the <code>elasticfilesystem:DescribeFileSystemPolicy</code> action.</p>"
     },
     "DescribeFileSystems":{
       "name":"DescribeFileSystems",
@@ -179,7 +264,8 @@
         {"shape":"BadRequest"},
         {"shape":"InternalServerError"},
         {"shape":"FileSystemNotFound"},
-        {"shape":"MountTargetNotFound"}
+        {"shape":"MountTargetNotFound"},
+        {"shape":"AccessPointNotFound"}
       ],
       "documentation":"<p>Returns the descriptions of all the current mount targets, or a specific mount target, for a file system. When requesting all of the current mount targets, the order of mount targets returned in the response is unspecified.</p> <p>This operation requires permissions for the <code>elasticfilesystem:DescribeMountTargets</code> action, on either the file system ID that you specify in <code>FileSystemId</code>, or on the file system of the mount target that you specify in <code>MountTargetId</code>.</p>"
     },
@@ -197,7 +283,26 @@
         {"shape":"InternalServerError"},
         {"shape":"FileSystemNotFound"}
       ],
-      "documentation":"<p>Returns the tags associated with a file system. The order of tags returned in the response of one <code>DescribeTags</code> call and the order of tags returned across the responses of a multiple-call iteration (when using pagination) is unspecified. </p> <p> This operation requires permissions for the <code>elasticfilesystem:DescribeTags</code> action. </p>"
+      "documentation":"<p>Returns the tags associated with a file system. The order of tags returned in the response of one <code>DescribeTags</code> call and the order of tags returned across the responses of a multiple-call iteration (when using pagination) is unspecified. </p> <p> This operation requires permissions for the <code>elasticfilesystem:DescribeTags</code> action. </p>",
+      "deprecated":true,
+      "deprecatedMessage":"Use ListTagsForResource."
+    },
+    "ListTagsForResource":{
+      "name":"ListTagsForResource",
+      "http":{
+        "method":"GET",
+        "requestUri":"/2015-02-01/resource-tags/{ResourceId}",
+        "responseCode":200
+      },
+      "input":{"shape":"ListTagsForResourceRequest"},
+      "output":{"shape":"ListTagsForResourceResponse"},
+      "errors":[
+        {"shape":"BadRequest"},
+        {"shape":"InternalServerError"},
+        {"shape":"FileSystemNotFound"},
+        {"shape":"AccessPointNotFound"}
+      ],
+      "documentation":"<p>Lists all tags for a top-level EFS resource. You must provide the ID of the resource that you want to retrieve the tags for.</p> <p>This operation requires permissions for the <code>elasticfilesystem:DescribeAccessPoints</code> action.</p>"
     },
     "ModifyMountTargetSecurityGroups":{
       "name":"ModifyMountTargetSecurityGroups",
@@ -217,6 +322,23 @@
       ],
       "documentation":"<p>Modifies the set of security groups in effect for a mount target.</p> <p>When you create a mount target, Amazon EFS also creates a new network interface. For more information, see <a>CreateMountTarget</a>. This operation replaces the security groups in effect for the network interface associated with a mount target, with the <code>SecurityGroups</code> provided in the request. This operation requires that the network interface of the mount target has been created and the lifecycle state of the mount target is not <code>deleted</code>. </p> <p>The operation requires permissions for the following actions:</p> <ul> <li> <p> <code>elasticfilesystem:ModifyMountTargetSecurityGroups</code> action on the mount target's file system. </p> </li> <li> <p> <code>ec2:ModifyNetworkInterfaceAttribute</code> action on the mount target's network interface. </p> </li> </ul>"
     },
+    "PutFileSystemPolicy":{
+      "name":"PutFileSystemPolicy",
+      "http":{
+        "method":"PUT",
+        "requestUri":"/2015-02-01/file-systems/{FileSystemId}/policy",
+        "responseCode":200
+      },
+      "input":{"shape":"PutFileSystemPolicyRequest"},
+      "output":{"shape":"FileSystemPolicyDescription"},
+      "errors":[
+        {"shape":"InternalServerError"},
+        {"shape":"FileSystemNotFound"},
+        {"shape":"InvalidPolicyException"},
+        {"shape":"IncorrectFileSystemLifeCycleState"}
+      ],
+      "documentation":"<p>Applies an Amazon EFS <code>FileSystemPolicy</code> to an Amazon EFS file system. A file system policy is an IAM resource-based policy and can contain multiple policy statements. A file system always has exactly one file system policy, which can be the default policy or an explicit policy set or updated using this API operation. When an explicit policy is set, it overrides the default policy. For more information about the default file system policy, see <a href=\"https://docs.aws.amazon.com/efs/latest/ug/iam-access-control-nfs-efs.html#default-filesystempolicy\">Default EFS File System Policy</a>. </p> <p>This operation requires permissions for the <code>elasticfilesystem:PutFileSystemPolicy</code> action.</p>"
+    },
     "PutLifecycleConfiguration":{
       "name":"PutLifecycleConfiguration",
       "http":{
@@ -234,6 +356,38 @@
       ],
       "documentation":"<p>Enables lifecycle management by creating a new <code>LifecycleConfiguration</code> object. A <code>LifecycleConfiguration</code> object defines when files in an Amazon EFS file system are automatically transitioned to the lower-cost EFS Infrequent Access (IA) storage class. A <code>LifecycleConfiguration</code> applies to all files in a file system.</p> <p>Each Amazon EFS file system supports one lifecycle configuration, which applies to all files in the file system. If a <code>LifecycleConfiguration</code> object already exists for the specified file system, a <code>PutLifecycleConfiguration</code> call modifies the existing configuration. A <code>PutLifecycleConfiguration</code> call with an empty <code>LifecyclePolicies</code> array in the request body deletes any existing <code>LifecycleConfiguration</code> and disables lifecycle management.</p> <p>In the request, specify the following: </p> <ul> <li> <p>The ID for the file system for which you are enabling, disabling, or modifying lifecycle management.</p> </li> <li> <p>A <code>LifecyclePolicies</code> array of <code>LifecyclePolicy</code> objects that define when files are moved to the IA storage class. The array can contain only one <code>LifecyclePolicy</code> item.</p> </li> </ul> <p>This operation requires permissions for the <code>elasticfilesystem:PutLifecycleConfiguration</code> operation.</p> <p>To apply a <code>LifecycleConfiguration</code> object to an encrypted file system, you need the same AWS Key Management Service (AWS KMS) permissions as when you created the encrypted file system. </p>"
     },
+    "TagResource":{
+      "name":"TagResource",
+      "http":{
+        "method":"POST",
+        "requestUri":"/2015-02-01/resource-tags/{ResourceId}",
+        "responseCode":200
+      },
+      "input":{"shape":"TagResourceRequest"},
+      "errors":[
+        {"shape":"BadRequest"},
+        {"shape":"InternalServerError"},
+        {"shape":"FileSystemNotFound"},
+        {"shape":"AccessPointNotFound"}
+      ],
+      "documentation":"<p>Creates a tag for an EFS resource. You can create tags for EFS file systems and access points using this API operation.</p> <p>This operation requires permissions for the <code>elasticfilesystem:TagResource</code> action.</p>"
+    },
+    "UntagResource":{
+      "name":"UntagResource",
+      "http":{
+        "method":"DELETE",
+        "requestUri":"/2015-02-01/resource-tags/{ResourceId}",
+        "responseCode":200
+      },
+      "input":{"shape":"UntagResourceRequest"},
+      "errors":[
+        {"shape":"BadRequest"},
+        {"shape":"InternalServerError"},
+        {"shape":"FileSystemNotFound"},
+        {"shape":"AccessPointNotFound"}
+      ],
+      "documentation":"<p>Removes tags from an EFS resource. You can remove tags from EFS file systems and access points using this API operation.</p> <p>This operation requires permissions for the <code>elasticfilesystem:UntagResource</code> action.</p>"
+    },
     "UpdateFileSystem":{
       "name":"UpdateFileSystem",
       "http":{
@@ -256,6 +410,97 @@
     }
   },
   "shapes":{
+    "AccessPointAlreadyExists":{
+      "type":"structure",
+      "required":[
+        "ErrorCode",
+        "AccessPointId"
+      ],
+      "members":{
+        "ErrorCode":{"shape":"ErrorCode"},
+        "Message":{"shape":"ErrorMessage"},
+        "AccessPointId":{"shape":"AccessPointId"}
+      },
+      "documentation":"<p>Returned if the access point you are trying to create already exists, with the creation token you provided in the request.</p>",
+      "error":{"httpStatusCode":409},
+      "exception":true
+    },
+    "AccessPointArn":{"type":"string"},
+    "AccessPointDescription":{
+      "type":"structure",
+      "members":{
+        "ClientToken":{
+          "shape":"ClientToken",
+          "documentation":"<p>The opaque string specified in the request to ensure idempotent creation.</p>"
+        },
+        "Name":{
+          "shape":"Name",
+          "documentation":"<p>The name of the access point. This is the value of the <code>Name</code> tag.</p>"
+        },
+        "Tags":{
+          "shape":"Tags",
+          "documentation":"<p>The tags associated with the access point, presented as an array of Tag objects.</p>"
+        },
+        "AccessPointId":{
+          "shape":"AccessPointId",
+          "documentation":"<p>The ID of the access point, assigned by Amazon EFS.</p>"
+        },
+        "AccessPointArn":{
+          "shape":"AccessPointArn",
+          "documentation":"<p>The unique Amazon Resource Name (ARN) associated with the access point.</p>"
+        },
+        "FileSystemId":{
+          "shape":"FileSystemId",
+          "documentation":"<p>The ID of the EFS file system that the access point applies to.</p>"
+        },
+        "PosixUser":{
+          "shape":"PosixUser",
+          "documentation":"<p>The full POSIX identity, including the user ID, group ID, and secondary group IDs on the access point that is used for all file operations by NFS clients using the access point.</p>"
+        },
+        "RootDirectory":{
+          "shape":"RootDirectory",
+          "documentation":"<p>The directory on the Amazon EFS file system that the access point exposes as the root directory to NFS clients using the access point.</p>"
+        },
+        "OwnerId":{
+          "shape":"AwsAccountId",
+          "documentation":"<p>Identified the AWS account that owns the access point resource.</p>"
+        },
+        "LifeCycleState":{
+          "shape":"LifeCycleState",
+          "documentation":"<p>Identifies the lifecycle phase of the access point.</p>"
+        }
+      },
+      "documentation":"<p>Provides a description of an EFS file system access point.</p>"
+    },
+    "AccessPointDescriptions":{
+      "type":"list",
+      "member":{"shape":"AccessPointDescription"}
+    },
+    "AccessPointId":{"type":"string"},
+    "AccessPointLimitExceeded":{
+      "type":"structure",
+      "required":["ErrorCode"],
+      "members":{
+        "ErrorCode":{"shape":"ErrorCode"},
+        "Message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p>Returned if the AWS account has already created the maximum number of access points allowed per file system.</p>",
+      "error":{"httpStatusCode":403},
+      "exception":true
+    },
+    "AccessPointNotFound":{
+      "type":"structure",
+      "required":["ErrorCode"],
+      "members":{
+        "ErrorCode":{"shape":"ErrorCode"},
+        "Message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p>Returned if the specified <code>AccessPointId</code> value doesn't exist in the requester's AWS account.</p>",
+      "error":{"httpStatusCode":404},
+      "exception":true
+    },
+    "AvailabilityZoneId":{"type":"string"},
+    "AvailabilityZoneName":{"type":"string"},
     "AwsAccountId":{"type":"string"},
     "BadRequest":{
       "type":"structure",
@@ -268,13 +513,50 @@
       "error":{"httpStatusCode":400},
       "exception":true
     },
+    "BypassPolicyLockoutSafetyCheck":{"type":"boolean"},
+    "ClientToken":{
+      "type":"string",
+      "max":64,
+      "min":1
+    },
+    "CreateAccessPointRequest":{
+      "type":"structure",
+      "required":[
+        "ClientToken",
+        "FileSystemId"
+      ],
+      "members":{
+        "ClientToken":{
+          "shape":"ClientToken",
+          "documentation":"<p>A string of up to 64 ASCII characters that Amazon EFS uses to ensure idempotent creation.</p>",
+          "idempotencyToken":true
+        },
+        "Tags":{
+          "shape":"Tags",
+          "documentation":"<p>Creates tags associated with the access point. Each tag is a key-value pair.</p>"
+        },
+        "FileSystemId":{
+          "shape":"FileSystemId",
+          "documentation":"<p>The ID of the EFS file system that the access point provides access to.</p>"
+        },
+        "PosixUser":{
+          "shape":"PosixUser",
+          "documentation":"<p>The operating system user and group applied to all file system requests made using the access point.</p>"
+        },
+        "RootDirectory":{
+          "shape":"RootDirectory",
+          "documentation":"<p>Specifies the directory on the Amazon EFS file system that the access point exposes as the root directory of your file system to NFS clients using the access point. The clients using the access point can only access the root directory and below. If the <code>RootDirectory</code> &gt; <code>Path</code> specified does not exist, EFS creates it and applies the <code>CreationInfo</code> settings when a client connects to an access point. When specifying a <code>RootDirectory</code>, you need to provide the <code>Path</code>, and the <code>CreationInfo</code> is optional.</p>"
+        }
+      }
+    },
     "CreateFileSystemRequest":{
       "type":"structure",
       "required":["CreationToken"],
       "members":{
         "CreationToken":{
           "shape":"CreationToken",
-          "documentation":"<p>A string of up to 64 ASCII characters. Amazon EFS uses this to ensure idempotent creation.</p>"
+          "documentation":"<p>A string of up to 64 ASCII characters. Amazon EFS uses this to ensure idempotent creation.</p>",
+          "idempotencyToken":true
         },
         "PerformanceMode":{
           "shape":"PerformanceMode",
@@ -286,7 +568,7 @@
         },
         "KmsKeyId":{
           "shape":"KmsKeyId",
-          "documentation":"<p>The ID of the AWS KMS CMK to be used to protect the encrypted file system. This parameter is only required if you want to use a nondefault CMK. If this parameter is not specified, the default CMK for Amazon EFS is used. This ID can be in one of the following formats:</p> <ul> <li> <p>Key ID - A unique identifier of the key, for example <code>1234abcd-12ab-34cd-56ef-1234567890ab</code>.</p> </li> <li> <p>ARN - An Amazon Resource Name (ARN) for the key, for example <code>arn:aws:kms:us-west-2:111122223333:key/1234abcd-12ab-34cd-56ef-1234567890ab</code>.</p> </li> <li> <p>Key alias - A previously created display name for a key, for example <code>alias/projectKey1</code>.</p> </li> <li> <p>Key alias ARN - An ARN for a key alias, for example <code>arn:aws:kms:us-west-2:444455556666:alias/projectKey1</code>.</p> </li> </ul> <p>If <code>KmsKeyId</code> is specified, the <a>CreateFileSystemRequest$Encrypted</a> parameter must be set to true.</p>"
+          "documentation":"<p>The ID of the AWS KMS CMK to be used to protect the encrypted file system. This parameter is only required if you want to use a nondefault CMK. If this parameter is not specified, the default CMK for Amazon EFS is used. This ID can be in one of the following formats:</p> <ul> <li> <p>Key ID - A unique identifier of the key, for example <code>1234abcd-12ab-34cd-56ef-1234567890ab</code>.</p> </li> <li> <p>ARN - An Amazon Resource Name (ARN) for the key, for example <code>arn:aws:kms:us-west-2:111122223333:key/1234abcd-12ab-34cd-56ef-1234567890ab</code>.</p> </li> <li> <p>Key alias - A previously created display name for a key, for example <code>alias/projectKey1</code>.</p> </li> <li> <p>Key alias ARN - An ARN for a key alias, for example <code>arn:aws:kms:us-west-2:444455556666:alias/projectKey1</code>.</p> </li> </ul> <p>If <code>KmsKeyId</code> is specified, the <a>CreateFileSystemRequest$Encrypted</a> parameter must be set to true.</p> <important> <p>EFS accepts only symmetric CMKs. You cannot use asymmetric CMKs with EFS file systems.</p> </important>"
         },
         "ThroughputMode":{
           "shape":"ThroughputMode",
@@ -348,11 +630,58 @@
       },
       "documentation":"<p/>"
     },
+    "CreationInfo":{
+      "type":"structure",
+      "required":[
+        "OwnerUid",
+        "OwnerGid",
+        "Permissions"
+      ],
+      "members":{
+        "OwnerUid":{
+          "shape":"OwnerUid",
+          "documentation":"<p>Specifies the POSIX user ID to apply to the <code>RootDirectory</code>. Accepts values from 0 to 2^32 (4294967295).</p>"
+        },
+        "OwnerGid":{
+          "shape":"OwnerGid",
+          "documentation":"<p>Specifies the POSIX group ID to apply to the <code>RootDirectory</code>. Accepts values from 0 to 2^32 (4294967295).</p>"
+        },
+        "Permissions":{
+          "shape":"Permissions",
+          "documentation":"<p>Specifies the POSIX permissions to apply to the <code>RootDirectory</code>, in the format of an octal number representing the file's mode bits.</p>"
+        }
+      },
+      "documentation":"<p>Required if the <code>RootDirectory</code> &gt; <code>Path</code> specified does not exist. Specifies the POSIX IDs and permissions to apply to the access point's <code>RootDirectory</code> &gt; <code>Path</code>. If the access point root directory does not exist, EFS creates it with these settings when a client connects to the access point. When specifying <code>CreationInfo</code>, you must include values for all properties. </p> <important> <p>If you do not provide <code>CreationInfo</code> and the specified <code>RootDirectory</code> does not exist, attempts to mount the file system using the access point will fail.</p> </important>"
+    },
     "CreationToken":{
       "type":"string",
       "max":64,
       "min":1
     },
+    "DeleteAccessPointRequest":{
+      "type":"structure",
+      "required":["AccessPointId"],
+      "members":{
+        "AccessPointId":{
+          "shape":"AccessPointId",
+          "documentation":"<p>The ID of the access point that you want to delete.</p>",
+          "location":"uri",
+          "locationName":"AccessPointId"
+        }
+      }
+    },
+    "DeleteFileSystemPolicyRequest":{
+      "type":"structure",
+      "required":["FileSystemId"],
+      "members":{
+        "FileSystemId":{
+          "shape":"FileSystemId",
+          "documentation":"<p>Specifies the EFS file system for which to delete the <code>FileSystemPolicy</code>.</p>",
+          "location":"uri",
+          "locationName":"FileSystemId"
+        }
+      }
+    },
     "DeleteFileSystemRequest":{
       "type":"structure",
       "required":["FileSystemId"],
@@ -410,12 +739,66 @@
       "error":{"httpStatusCode":504},
       "exception":true
     },
+    "DescribeAccessPointsRequest":{
+      "type":"structure",
+      "members":{
+        "MaxResults":{
+          "shape":"MaxResults",
+          "documentation":"<p>(Optional) When retrieving all access points for a file system, you can optionally specify the <code>MaxItems</code> parameter to limit the number of objects returned in a response. The default value is 100. </p>",
+          "location":"querystring",
+          "locationName":"MaxResults"
+        },
+        "NextToken":{
+          "shape":"Token",
+          "documentation":"<p> <code>NextToken</code> is present if the response is paginated. You can use <code>NextMarker</code> in the subsequent request to fetch the next page of access point descriptions.</p>",
+          "location":"querystring",
+          "locationName":"NextToken"
+        },
+        "AccessPointId":{
+          "shape":"AccessPointId",
+          "documentation":"<p>(Optional) Specifies an EFS access point to describe in the response; mutually exclusive with <code>FileSystemId</code>.</p>",
+          "location":"querystring",
+          "locationName":"AccessPointId"
+        },
+        "FileSystemId":{
+          "shape":"FileSystemId",
+          "documentation":"<p>(Optional) If you provide a <code>FileSystemId</code>, EFS returns all access points for that file system; mutually exclusive with <code>AccessPointId</code>.</p>",
+          "location":"querystring",
+          "locationName":"FileSystemId"
+        }
+      }
+    },
+    "DescribeAccessPointsResponse":{
+      "type":"structure",
+      "members":{
+        "AccessPoints":{
+          "shape":"AccessPointDescriptions",
+          "documentation":"<p>An array of access point descriptions.</p>"
+        },
+        "NextToken":{
+          "shape":"Token",
+          "documentation":"<p>Present if there are more access points than returned in the response. You can use the NextMarker in the subsequent request to fetch the additional descriptions.</p>"
+        }
+      }
+    },
+    "DescribeFileSystemPolicyRequest":{
+      "type":"structure",
+      "required":["FileSystemId"],
+      "members":{
+        "FileSystemId":{
+          "shape":"FileSystemId",
+          "documentation":"<p>Specifies which EFS file system to retrieve the <code>FileSystemPolicy</code> for.</p>",
+          "location":"uri",
+          "locationName":"FileSystemId"
+        }
+      }
+    },
     "DescribeFileSystemsRequest":{
       "type":"structure",
       "members":{
         "MaxItems":{
           "shape":"MaxItems",
-          "documentation":"<p>(Optional) Specifies the maximum number of file systems to return in the response (integer). Currently, this number is automatically set to 10, and other values are ignored. The response is paginated at 10 per page if you have more than 10 file systems. </p>",
+          "documentation":"<p>(Optional) Specifies the maximum number of file systems to return in the response (integer). This number is automatically set to 100. The response is paginated at 100 per page if you have more than 100 file systems. </p>",
           "location":"querystring",
           "locationName":"MaxItems"
         },
@@ -497,7 +880,7 @@
       "members":{
         "MaxItems":{
           "shape":"MaxItems",
-          "documentation":"<p>(Optional) Maximum number of mount targets to return in the response. Currently, this number is automatically set to 10, and other values are ignored. The response is paginated at 10 per page if you have more than 10 mount targets.</p>",
+          "documentation":"<p>(Optional) Maximum number of mount targets to return in the response. Currently, this number is automatically set to 10, and other values are ignored. The response is paginated at 100 per page if you have more than 100 mount targets.</p>",
           "location":"querystring",
           "locationName":"MaxItems"
         },
@@ -509,15 +892,21 @@
         },
         "FileSystemId":{
           "shape":"FileSystemId",
-          "documentation":"<p>(Optional) ID of the file system whose mount targets you want to list (String). It must be included in your request if <code>MountTargetId</code> is not included.</p>",
+          "documentation":"<p>(Optional) ID of the file system whose mount targets you want to list (String). It must be included in your request if an <code>AccessPointId</code> or <code>MountTargetId</code> is not included. Accepts either a file system ID or ARN as input.</p>",
           "location":"querystring",
           "locationName":"FileSystemId"
         },
         "MountTargetId":{
           "shape":"MountTargetId",
-          "documentation":"<p>(Optional) ID of the mount target that you want to have described (String). It must be included in your request if <code>FileSystemId</code> is not included.</p>",
+          "documentation":"<p>(Optional) ID of the mount target that you want to have described (String). It must be included in your request if <code>FileSystemId</code> is not included. Accepts either a mount target ID or ARN as input.</p>",
           "location":"querystring",
           "locationName":"MountTargetId"
+        },
+        "AccessPointId":{
+          "shape":"AccessPointId",
+          "documentation":"<p>(Optional) The ID of the access point whose mount targets that you want to list. It must be included in your request if a <code>FileSystemId</code> or <code>MountTargetId</code> is not included in your request. Accepts either an access point ID or ARN as input.</p>",
+          "location":"querystring",
+          "locationName":"AccessPointId"
         }
       },
       "documentation":"<p/>"
@@ -546,7 +935,7 @@
       "members":{
         "MaxItems":{
           "shape":"MaxItems",
-          "documentation":"<p>(Optional) The maximum number of file system tags to return in the response. Currently, this number is automatically set to 10, and other values are ignored. The response is paginated at 10 per page if you have more than 10 tags.</p>",
+          "documentation":"<p>(Optional) The maximum number of file system tags to return in the response. Currently, this number is automatically set to 100, and other values are ignored. The response is paginated at 100 per page if you have more than 100 tags.</p>",
           "location":"querystring",
           "locationName":"MaxItems"
         },
@@ -720,6 +1109,19 @@
       "type":"long",
       "min":0
     },
+    "FileSystemPolicyDescription":{
+      "type":"structure",
+      "members":{
+        "FileSystemId":{
+          "shape":"FileSystemId",
+          "documentation":"<p>Specifies the EFS file system to which the <code>FileSystemPolicy</code> applies.</p>"
+        },
+        "Policy":{
+          "shape":"Policy",
+          "documentation":"<p>The JSON formatted <code>FileSystemPolicy</code> for the EFS file system.</p>"
+        }
+      }
+    },
     "FileSystemSize":{
       "type":"structure",
       "required":["Value"],
@@ -747,6 +1149,11 @@
       "type":"long",
       "min":0
     },
+    "Gid":{
+      "type":"long",
+      "max":4294967295,
+      "min":0
+    },
     "IncorrectFileSystemLifeCycleState":{
       "type":"structure",
       "required":["ErrorCode"],
@@ -791,6 +1198,16 @@
       "error":{"httpStatusCode":500},
       "exception":true
     },
+    "InvalidPolicyException":{
+      "type":"structure",
+      "members":{
+        "ErrorCode":{"shape":"ErrorCode"},
+        "Message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p>Returned if the <code>FileSystemPolicy</code> is is malformed or contains an error such as an invalid parameter value or a missing required parameter. Returned in the case of a policy lockout safety check error.</p>",
+      "error":{"httpStatusCode":400},
+      "exception":true
+    },
     "IpAddress":{"type":"string"},
     "IpAddressInUse":{
       "type":"structure",
@@ -841,11 +1258,52 @@
       },
       "documentation":"<p>Describes a policy used by EFS lifecycle management to transition files to the Infrequent Access (IA) storage class.</p>"
     },
+    "ListTagsForResourceRequest":{
+      "type":"structure",
+      "required":["ResourceId"],
+      "members":{
+        "ResourceId":{
+          "shape":"ResourceId",
+          "documentation":"<p>Specifies the EFS resource you want to retrieve tags for. You can retrieve tags for EFS file systems and access points using this API endpoint.</p>",
+          "location":"uri",
+          "locationName":"ResourceId"
+        },
+        "MaxResults":{
+          "shape":"MaxResults",
+          "documentation":"<p>(Optional) Specifies the maximum number of tag objects to return in the response. The default value is 100.</p>",
+          "location":"querystring",
+          "locationName":"MaxResults"
+        },
+        "NextToken":{
+          "shape":"Token",
+          "documentation":"<p>You can use <code>NextToken</code> in a subsequent request to fetch the next page of access point descriptions if the response payload was paginated.</p>",
+          "location":"querystring",
+          "locationName":"NextToken"
+        }
+      }
+    },
+    "ListTagsForResourceResponse":{
+      "type":"structure",
+      "members":{
+        "Tags":{
+          "shape":"Tags",
+          "documentation":"<p>An array of the tags for the specified EFS resource.</p>"
+        },
+        "NextToken":{
+          "shape":"Token",
+          "documentation":"<p> <code>NextToken</code> is present if the response payload is paginated. You can use <code>NextToken</code> in a subsequent request to fetch the next page of access point descriptions.</p>"
+        }
+      }
+    },
     "Marker":{"type":"string"},
     "MaxItems":{
       "type":"integer",
       "min":1
     },
+    "MaxResults":{
+      "type":"integer",
+      "min":1
+    },
     "ModifyMountTargetSecurityGroupsRequest":{
       "type":"structure",
       "required":["MountTargetId"],
@@ -914,6 +1372,14 @@
         "NetworkInterfaceId":{
           "shape":"NetworkInterfaceId",
           "documentation":"<p>The ID of the network interface that Amazon EFS created when it created the mount target.</p>"
+        },
+        "AvailabilityZoneId":{
+          "shape":"AvailabilityZoneId",
+          "documentation":"<p>The unique and consistent identifier of the Availability Zone (AZ) that the mount target resides in. For example, <code>use1-az1</code> is an AZ ID for the us-east-1 Region and it has the same location in every AWS account.</p>"
+        },
+        "AvailabilityZoneName":{
+          "shape":"AvailabilityZoneName",
+          "documentation":"<p>The name of the Availability Zone (AZ) that the mount target resides in. AZs are independently mapped to names for each AWS account. For example, the Availability Zone <code>us-east-1a</code> for your AWS account might not be the same location as <code>us-east-1a</code> for another AWS account.</p>"
         }
       },
       "documentation":"<p>Provides a description of a mount target.</p>"
@@ -934,6 +1400,7 @@
       "error":{"httpStatusCode":404},
       "exception":true
     },
+    "Name":{"type":"string"},
     "NetworkInterfaceId":{"type":"string"},
     "NetworkInterfaceLimitExceeded":{
       "type":"structure",
@@ -957,6 +1424,21 @@
       "error":{"httpStatusCode":409},
       "exception":true
     },
+    "OwnerGid":{
+      "type":"long",
+      "max":4294967295,
+      "min":0
+    },
+    "OwnerUid":{
+      "type":"long",
+      "max":4294967295,
+      "min":0
+    },
+    "Path":{
+      "type":"string",
+      "max":100,
+      "min":1
+    },
     "PerformanceMode":{
       "type":"string",
       "enum":[
@@ -964,10 +1446,70 @@
         "maxIO"
       ]
     },
+    "Permissions":{
+      "type":"string",
+      "pattern":"^[0-7]{3,4}$"
+    },
+    "Policy":{"type":"string"},
+    "PolicyNotFound":{
+      "type":"structure",
+      "members":{
+        "ErrorCode":{"shape":"ErrorCode"},
+        "Message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p>Returned if the default file system policy is in effect for the EFS file system specified.</p>",
+      "error":{"httpStatusCode":404},
+      "exception":true
+    },
+    "PosixUser":{
+      "type":"structure",
+      "required":[
+        "Uid",
+        "Gid"
+      ],
+      "members":{
+        "Uid":{
+          "shape":"Uid",
+          "documentation":"<p>The POSIX user ID used for all file system operations using this access point.</p>"
+        },
+        "Gid":{
+          "shape":"Gid",
+          "documentation":"<p>The POSIX group ID used for all file system operations using this access point.</p>"
+        },
+        "SecondaryGids":{
+          "shape":"SecondaryGids",
+          "documentation":"<p>Secondary POSIX group IDs used for all file system operations using this access point.</p>"
+        }
+      },
+      "documentation":"<p>The full POSIX identity, including the user ID, group ID, and any secondary group IDs, on the access point that is used for all file system operations performed by NFS clients using the access point.</p>"
+    },
     "ProvisionedThroughputInMibps":{
       "type":"double",
       "min":1.0
     },
+    "PutFileSystemPolicyRequest":{
+      "type":"structure",
+      "required":[
+        "FileSystemId",
+        "Policy"
+      ],
+      "members":{
+        "FileSystemId":{
+          "shape":"FileSystemId",
+          "documentation":"<p>The ID of the EFS file system that you want to create or update the <code>FileSystemPolicy</code> for.</p>",
+          "location":"uri",
+          "locationName":"FileSystemId"
+        },
+        "Policy":{
+          "shape":"Policy",
+          "documentation":"<p>The <code>FileSystemPolicy</code> that you're creating. Accepts a JSON formatted policy definition. To find out more about the elements that make up a file system policy, see <a href=\"https://docs.aws.amazon.com/efs/latest/ug/access-control-overview.html#access-control-manage-access-intro-resource-policies\">EFS Resource-based Policies</a>. </p>"
+        },
+        "BypassPolicyLockoutSafetyCheck":{
+          "shape":"BypassPolicyLockoutSafetyCheck",
+          "documentation":"<p>(Optional) A flag to indicate whether to bypass the <code>FileSystemPolicy</code> lockout safety check. The policy lockout safety check determines whether the policy in the request will prevent the principal making the request will be locked out from making future <code>PutFileSystemPolicy</code> requests on the file system. Set <code>BypassPolicyLockoutSafetyCheck</code> to <code>True</code> only when you intend to prevent the principal that is making the request from making a subsequent <code>PutFileSystemPolicy</code> request on the file system. The default value is False. </p>"
+        }
+      }
+    },
     "PutLifecycleConfigurationRequest":{
       "type":"structure",
       "required":[
@@ -987,6 +1529,27 @@
         }
       }
     },
+    "ResourceId":{"type":"string"},
+    "RootDirectory":{
+      "type":"structure",
+      "members":{
+        "Path":{
+          "shape":"Path",
+          "documentation":"<p>Specifies the path on the EFS file system to expose as the root directory to NFS clients using the access point to access the EFS file system. A path can have up to four subdirectories. If the specified path does not exist, you are required to provide the <code>CreationInfo</code>.</p>"
+        },
+        "CreationInfo":{
+          "shape":"CreationInfo",
+          "documentation":"<p>(Optional) Specifies the POSIX IDs and permissions to apply to the access point's <code>RootDirectory</code>. If the <code>RootDirectory</code> &gt; <code>Path</code> specified does not exist, EFS creates the root directory using the <code>CreationInfo</code> settings when a client connects to an access point. When specifying the <code>CreationInfo</code>, you must provide values for all properties. </p> <important> <p>If you do not provide <code>CreationInfo</code> and the specified <code>RootDirectory</code> &gt; <code>Path</code> does not exist, attempts to mount the file system using the access point will fail.</p> </important>"
+        }
+      },
+      "documentation":"<p>Specifies the directory on the Amazon EFS file system that the access point provides access to. The access point exposes the specified file system path as the root directory of your file system to applications using the access point. NFS clients using the access point can only access data in the access point's <code>RootDirectory</code> and it's subdirectories.</p>"
+    },
+    "SecondaryGids":{
+      "type":"list",
+      "member":{"shape":"Gid"},
+      "max":16,
+      "min":0
+    },
     "SecurityGroup":{"type":"string"},
     "SecurityGroupLimitExceeded":{
       "type":"structure",
@@ -1052,7 +1615,28 @@
     },
     "TagKeys":{
       "type":"list",
-      "member":{"shape":"TagKey"}
+      "member":{"shape":"TagKey"},
+      "max":50,
+      "min":1
+    },
+    "TagResourceRequest":{
+      "type":"structure",
+      "required":[
+        "ResourceId",
+        "Tags"
+      ],
+      "members":{
+        "ResourceId":{
+          "shape":"ResourceId",
+          "documentation":"<p>The ID specifying the EFS resource that you want to create a tag for. </p>",
+          "location":"uri",
+          "locationName":"ResourceId"
+        },
+        "Tags":{
+          "shape":"Tags",
+          "documentation":"<p/>"
+        }
+      }
     },
     "TagValue":{
       "type":"string",
@@ -1081,6 +1665,7 @@
       ]
     },
     "Timestamp":{"type":"timestamp"},
+    "Token":{"type":"string"},
     "TooManyRequests":{
       "type":"structure",
       "required":["ErrorCode"],
@@ -1095,12 +1680,18 @@
     "TransitionToIARules":{
       "type":"string",
       "enum":[
+        "AFTER_7_DAYS",
         "AFTER_14_DAYS",
         "AFTER_30_DAYS",
         "AFTER_60_DAYS",
         "AFTER_90_DAYS"
       ]
     },
+    "Uid":{
+      "type":"long",
+      "max":4294967295,
+      "min":0
+    },
     "UnsupportedAvailabilityZone":{
       "type":"structure",
       "required":["ErrorCode"],
@@ -1112,6 +1703,22 @@
       "error":{"httpStatusCode":400},
       "exception":true
     },
+    "UntagResourceRequest":{
+      "type":"structure",
+      "required":["ResourceId"],
+      "members":{
+        "ResourceId":{
+          "shape":"ResourceId",
+          "documentation":"<p>Specifies the EFS resource that you want to remove tags from.</p>",
+          "location":"uri",
+          "locationName":"ResourceId"
+        },
+        "TagKeys":{
+          "shape":"TagKeys",
+          "documentation":"<p>The keys of the key:value tag pairs that you want to remove from the specified EFS resource.</p>"
+        }
+      }
+    },
     "UpdateFileSystemRequest":{
       "type":"structure",
       "required":["FileSystemId"],
diff --git a/services/efs/src/test/resources/cucumber.properties b/services/efs/src/test/resources/cucumber.properties
index e053de12273b..1f7615da654c 100644
--- a/services/efs/src/test/resources/cucumber.properties
+++ b/services/efs/src/test/resources/cucumber.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/eks/pom.xml b/services/eks/pom.xml
index f4f36af2198b..9ae62292257f 100644
--- a/services/eks/pom.xml
+++ b/services/eks/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>eks</artifactId>
     <name>AWS Java SDK :: Services :: EKS</name>
diff --git a/services/eks/src/main/resources/codegen-resources/paginators-1.json b/services/eks/src/main/resources/codegen-resources/paginators-1.json
index abd2c6bdec92..6d1c327dc5be 100644
--- a/services/eks/src/main/resources/codegen-resources/paginators-1.json
+++ b/services/eks/src/main/resources/codegen-resources/paginators-1.json
@@ -6,6 +6,18 @@
       "output_token": "nextToken",
       "result_key": "clusters"
     },
+    "ListFargateProfiles": {
+      "input_token": "nextToken",
+      "limit_key": "maxResults",
+      "output_token": "nextToken",
+      "result_key": "fargateProfileNames"
+    },
+    "ListNodegroups": {
+      "input_token": "nextToken",
+      "limit_key": "maxResults",
+      "output_token": "nextToken",
+      "result_key": "nodegroups"
+    },
     "ListUpdates": {
       "input_token": "nextToken",
       "limit_key": "maxResults",
diff --git a/services/eks/src/main/resources/codegen-resources/service-2.json b/services/eks/src/main/resources/codegen-resources/service-2.json
index 02c24a91d507..5286eb5b9b78 100644
--- a/services/eks/src/main/resources/codegen-resources/service-2.json
+++ b/services/eks/src/main/resources/codegen-resources/service-2.json
@@ -32,6 +32,43 @@
       ],
       "documentation":"<p>Creates an Amazon EKS control plane. </p> <p>The Amazon EKS control plane consists of control plane instances that run the Kubernetes software, such as <code>etcd</code> and the API server. The control plane runs in an account managed by AWS, and the Kubernetes API is exposed via the Amazon EKS API server endpoint. Each Amazon EKS cluster control plane is single-tenant and unique and runs on its own set of Amazon EC2 instances.</p> <p>The cluster control plane is provisioned across multiple Availability Zones and fronted by an Elastic Load Balancing Network Load Balancer. Amazon EKS also provisions elastic network interfaces in your VPC subnets to provide connectivity from the control plane instances to the worker nodes (for example, to support <code>kubectl exec</code>, <code>logs</code>, and <code>proxy</code> data flows).</p> <p>Amazon EKS worker nodes run in your AWS account and connect to your cluster's control plane via the Kubernetes API server endpoint and a certificate file that is created for your cluster.</p> <p>You can use the <code>endpointPublicAccess</code> and <code>endpointPrivateAccess</code> parameters to enable or disable public and private access to your cluster's Kubernetes API server endpoint. By default, public access is enabled, and private access is disabled. For more information, see <a href=\"https://docs.aws.amazon.com/eks/latest/userguide/cluster-endpoint.html\">Amazon EKS Cluster Endpoint Access Control</a> in the <i> <i>Amazon EKS User Guide</i> </i>. </p> <p>You can use the <code>logging</code> parameter to enable or disable exporting the Kubernetes control plane logs for your cluster to CloudWatch Logs. By default, cluster control plane logs aren't exported to CloudWatch Logs. For more information, see <a href=\"https://docs.aws.amazon.com/eks/latest/userguide/control-plane-logs.html\">Amazon EKS Cluster Control Plane Logs</a> in the <i> <i>Amazon EKS User Guide</i> </i>.</p> <note> <p>CloudWatch Logs ingestion, archive storage, and data scanning rates apply to exported control plane logs. For more information, see <a href=\"http://aws.amazon.com/cloudwatch/pricing/\">Amazon CloudWatch Pricing</a>.</p> </note> <p>Cluster creation typically takes between 10 and 15 minutes. After you create an Amazon EKS cluster, you must configure your Kubernetes tooling to communicate with the API server and launch worker nodes into your cluster. For more information, see <a href=\"https://docs.aws.amazon.com/eks/latest/userguide/managing-auth.html\">Managing Cluster Authentication</a> and <a href=\"https://docs.aws.amazon.com/eks/latest/userguide/launch-workers.html\">Launching Amazon EKS Worker Nodes</a> in the <i>Amazon EKS User Guide</i>.</p>"
     },
+    "CreateFargateProfile":{
+      "name":"CreateFargateProfile",
+      "http":{
+        "method":"POST",
+        "requestUri":"/clusters/{name}/fargate-profiles"
+      },
+      "input":{"shape":"CreateFargateProfileRequest"},
+      "output":{"shape":"CreateFargateProfileResponse"},
+      "errors":[
+        {"shape":"InvalidParameterException"},
+        {"shape":"InvalidRequestException"},
+        {"shape":"ClientException"},
+        {"shape":"ServerException"},
+        {"shape":"ResourceLimitExceededException"},
+        {"shape":"UnsupportedAvailabilityZoneException"}
+      ],
+      "documentation":"<p>Creates an AWS Fargate profile for your Amazon EKS cluster. You must have at least one Fargate profile in a cluster to be able to run pods on Fargate.</p> <p>The Fargate profile allows an administrator to declare which pods run on Fargate and specify which pods run on which Fargate profile. This declaration is done through the profile’s selectors. Each profile can have up to five selectors that contain a namespace and labels. A namespace is required for every selector. The label field consists of multiple optional key-value pairs. Pods that match the selectors are scheduled on Fargate. If a to-be-scheduled pod matches any of the selectors in the Fargate profile, then that pod is run on Fargate.</p> <p>When you create a Fargate profile, you must specify a pod execution role to use with the pods that are scheduled with the profile. This role is added to the cluster's Kubernetes <a href=\"https://kubernetes.io/docs/admin/authorization/rbac/\">Role Based Access Control</a> (RBAC) for authorization so that the <code>kubelet</code> that is running on the Fargate infrastructure can register with your Amazon EKS cluster so that it can appear in your cluster as a node. The pod execution role also provides IAM permissions to the Fargate infrastructure to allow read access to Amazon ECR image repositories. For more information, see <a href=\"https://docs.aws.amazon.com/eks/latest/userguide/pod-execution-role.html\">Pod Execution Role</a> in the <i>Amazon EKS User Guide</i>.</p> <p>Fargate profiles are immutable. However, you can create a new updated profile to replace an existing profile and then delete the original after the updated profile has finished creating.</p> <p>If any Fargate profiles in a cluster are in the <code>DELETING</code> status, you must wait for that Fargate profile to finish deleting before you can create any other profiles in that cluster.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/eks/latest/userguide/fargate-profile.html\">AWS Fargate Profile</a> in the <i>Amazon EKS User Guide</i>.</p>"
+    },
+    "CreateNodegroup":{
+      "name":"CreateNodegroup",
+      "http":{
+        "method":"POST",
+        "requestUri":"/clusters/{name}/node-groups"
+      },
+      "input":{"shape":"CreateNodegroupRequest"},
+      "output":{"shape":"CreateNodegroupResponse"},
+      "errors":[
+        {"shape":"ResourceInUseException"},
+        {"shape":"ResourceLimitExceededException"},
+        {"shape":"InvalidRequestException"},
+        {"shape":"InvalidParameterException"},
+        {"shape":"ClientException"},
+        {"shape":"ServerException"},
+        {"shape":"ServiceUnavailableException"}
+      ],
+      "documentation":"<p>Creates a managed worker node group for an Amazon EKS cluster. You can only create a node group for your cluster that is equal to the current Kubernetes version for the cluster. All node groups are created with the latest AMI release version for the respective minor Kubernetes version of the cluster.</p> <p>An Amazon EKS managed node group is an Amazon EC2 Auto Scaling group and associated Amazon EC2 instances that are managed by AWS for an Amazon EKS cluster. Each node group uses a version of the Amazon EKS-optimized Amazon Linux 2 AMI. For more information, see <a href=\"https://docs.aws.amazon.com/eks/latest/userguide/managed-node-groups.html\">Managed Node Groups</a> in the <i>Amazon EKS User Guide</i>. </p>"
+    },
     "DeleteCluster":{
       "name":"DeleteCluster",
       "http":{
@@ -47,7 +84,41 @@
         {"shape":"ServerException"},
         {"shape":"ServiceUnavailableException"}
       ],
-      "documentation":"<p>Deletes the Amazon EKS cluster control plane. </p> <note> <p>If you have active services in your cluster that are associated with a load balancer, you must delete those services before deleting the cluster so that the load balancers are deleted properly. Otherwise, you can have orphaned resources in your VPC that prevent you from being able to delete the VPC. For more information, see <a href=\"https://docs.aws.amazon.com/eks/latest/userguide/delete-cluster.html\">Deleting a Cluster</a> in the <i>Amazon EKS User Guide</i>.</p> </note>"
+      "documentation":"<p>Deletes the Amazon EKS cluster control plane.</p> <p>If you have active services in your cluster that are associated with a load balancer, you must delete those services before deleting the cluster so that the load balancers are deleted properly. Otherwise, you can have orphaned resources in your VPC that prevent you from being able to delete the VPC. For more information, see <a href=\"https://docs.aws.amazon.com/eks/latest/userguide/delete-cluster.html\">Deleting a Cluster</a> in the <i>Amazon EKS User Guide</i>.</p> <p>If you have managed node groups or Fargate profiles attached to the cluster, you must delete them first. For more information, see <a>DeleteNodegroup</a> and <a>DeleteFargateProfile</a>.</p>"
+    },
+    "DeleteFargateProfile":{
+      "name":"DeleteFargateProfile",
+      "http":{
+        "method":"DELETE",
+        "requestUri":"/clusters/{name}/fargate-profiles/{fargateProfileName}"
+      },
+      "input":{"shape":"DeleteFargateProfileRequest"},
+      "output":{"shape":"DeleteFargateProfileResponse"},
+      "errors":[
+        {"shape":"InvalidParameterException"},
+        {"shape":"ClientException"},
+        {"shape":"ServerException"},
+        {"shape":"ResourceNotFoundException"}
+      ],
+      "documentation":"<p>Deletes an AWS Fargate profile.</p> <p>When you delete a Fargate profile, any pods running on Fargate that were created with the profile are deleted. If those pods match another Fargate profile, then they are scheduled on Fargate with that profile. If they no longer match any Fargate profiles, then they are not scheduled on Fargate and they may remain in a pending state.</p> <p>Only one Fargate profile in a cluster can be in the <code>DELETING</code> status at a time. You must wait for a Fargate profile to finish deleting before you can delete any other profiles in that cluster.</p>"
+    },
+    "DeleteNodegroup":{
+      "name":"DeleteNodegroup",
+      "http":{
+        "method":"DELETE",
+        "requestUri":"/clusters/{name}/node-groups/{nodegroupName}"
+      },
+      "input":{"shape":"DeleteNodegroupRequest"},
+      "output":{"shape":"DeleteNodegroupResponse"},
+      "errors":[
+        {"shape":"ResourceInUseException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InvalidParameterException"},
+        {"shape":"ClientException"},
+        {"shape":"ServerException"},
+        {"shape":"ServiceUnavailableException"}
+      ],
+      "documentation":"<p>Deletes an Amazon EKS node group for a cluster.</p>"
     },
     "DescribeCluster":{
       "name":"DescribeCluster",
@@ -65,6 +136,39 @@
       ],
       "documentation":"<p>Returns descriptive information about an Amazon EKS cluster.</p> <p>The API server endpoint and certificate authority data returned by this operation are required for <code>kubelet</code> and <code>kubectl</code> to communicate with your Kubernetes API server. For more information, see <a href=\"https://docs.aws.amazon.com/eks/latest/userguide/create-kubeconfig.html\">Create a kubeconfig for Amazon EKS</a>.</p> <note> <p>The API server endpoint and certificate authority data aren't available until the cluster reaches the <code>ACTIVE</code> state.</p> </note>"
     },
+    "DescribeFargateProfile":{
+      "name":"DescribeFargateProfile",
+      "http":{
+        "method":"GET",
+        "requestUri":"/clusters/{name}/fargate-profiles/{fargateProfileName}"
+      },
+      "input":{"shape":"DescribeFargateProfileRequest"},
+      "output":{"shape":"DescribeFargateProfileResponse"},
+      "errors":[
+        {"shape":"InvalidParameterException"},
+        {"shape":"ClientException"},
+        {"shape":"ServerException"},
+        {"shape":"ResourceNotFoundException"}
+      ],
+      "documentation":"<p>Returns descriptive information about an AWS Fargate profile.</p>"
+    },
+    "DescribeNodegroup":{
+      "name":"DescribeNodegroup",
+      "http":{
+        "method":"GET",
+        "requestUri":"/clusters/{name}/node-groups/{nodegroupName}"
+      },
+      "input":{"shape":"DescribeNodegroupRequest"},
+      "output":{"shape":"DescribeNodegroupResponse"},
+      "errors":[
+        {"shape":"InvalidParameterException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ClientException"},
+        {"shape":"ServerException"},
+        {"shape":"ServiceUnavailableException"}
+      ],
+      "documentation":"<p>Returns descriptive information about an Amazon EKS node group.</p>"
+    },
     "DescribeUpdate":{
       "name":"DescribeUpdate",
       "http":{
@@ -79,7 +183,7 @@
         {"shape":"ServerException"},
         {"shape":"ResourceNotFoundException"}
       ],
-      "documentation":"<p>Returns descriptive information about an update against your Amazon EKS cluster.</p> <p>When the status of the update is <code>Succeeded</code>, the update is complete. If an update fails, the status is <code>Failed</code>, and an error detail explains the reason for the failure.</p>"
+      "documentation":"<p>Returns descriptive information about an update against your Amazon EKS cluster or associated managed node group.</p> <p>When the status of the update is <code>Succeeded</code>, the update is complete. If an update fails, the status is <code>Failed</code>, and an error detail explains the reason for the failure.</p>"
     },
     "ListClusters":{
       "name":"ListClusters",
@@ -97,6 +201,39 @@
       ],
       "documentation":"<p>Lists the Amazon EKS clusters in your AWS account in the specified Region.</p>"
     },
+    "ListFargateProfiles":{
+      "name":"ListFargateProfiles",
+      "http":{
+        "method":"GET",
+        "requestUri":"/clusters/{name}/fargate-profiles"
+      },
+      "input":{"shape":"ListFargateProfilesRequest"},
+      "output":{"shape":"ListFargateProfilesResponse"},
+      "errors":[
+        {"shape":"InvalidParameterException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ClientException"},
+        {"shape":"ServerException"}
+      ],
+      "documentation":"<p>Lists the AWS Fargate profiles associated with the specified cluster in your AWS account in the specified Region.</p>"
+    },
+    "ListNodegroups":{
+      "name":"ListNodegroups",
+      "http":{
+        "method":"GET",
+        "requestUri":"/clusters/{name}/node-groups"
+      },
+      "input":{"shape":"ListNodegroupsRequest"},
+      "output":{"shape":"ListNodegroupsResponse"},
+      "errors":[
+        {"shape":"InvalidParameterException"},
+        {"shape":"ClientException"},
+        {"shape":"ServerException"},
+        {"shape":"ServiceUnavailableException"},
+        {"shape":"ResourceNotFoundException"}
+      ],
+      "documentation":"<p>Lists the Amazon EKS managed node groups associated with the specified cluster in your AWS account in the specified Region. Self-managed node groups are not listed.</p>"
+    },
     "ListTagsForResource":{
       "name":"ListTagsForResource",
       "http":{
@@ -125,7 +262,7 @@
         {"shape":"ServerException"},
         {"shape":"ResourceNotFoundException"}
       ],
-      "documentation":"<p>Lists the updates associated with an Amazon EKS cluster in your AWS account, in the specified Region.</p>"
+      "documentation":"<p>Lists the updates associated with an Amazon EKS cluster or managed node group in your AWS account, in the specified Region.</p>"
     },
     "TagResource":{
       "name":"TagResource",
@@ -139,7 +276,7 @@
         {"shape":"BadRequestException"},
         {"shape":"NotFoundException"}
       ],
-      "documentation":"<p>Associates the specified tags to a resource with the specified <code>resourceArn</code>. If existing tags on a resource are not specified in the request parameters, they are not changed. When a resource is deleted, the tags associated with that resource are deleted as well.</p>"
+      "documentation":"<p>Associates the specified tags to a resource with the specified <code>resourceArn</code>. If existing tags on a resource are not specified in the request parameters, they are not changed. When a resource is deleted, the tags associated with that resource are deleted as well. Tags that you create for Amazon EKS resources do not propagate to any other resources associated with the cluster. For example, if you tag a cluster with this operation, that tag does not automatically propagate to the subnets and worker nodes associated with the cluster.</p>"
     },
     "UntagResource":{
       "name":"UntagResource",
@@ -189,10 +326,67 @@
         {"shape":"ResourceNotFoundException"},
         {"shape":"InvalidRequestException"}
       ],
-      "documentation":"<p>Updates an Amazon EKS cluster to the specified Kubernetes version. Your cluster continues to function during the update. The response output includes an update ID that you can use to track the status of your cluster update with the <a>DescribeUpdate</a> API operation.</p> <p>Cluster updates are asynchronous, and they should finish within a few minutes. During an update, the cluster status moves to <code>UPDATING</code> (this status transition is eventually consistent). When the update is complete (either <code>Failed</code> or <code>Successful</code>), the cluster status moves to <code>Active</code>.</p>"
+      "documentation":"<p>Updates an Amazon EKS cluster to the specified Kubernetes version. Your cluster continues to function during the update. The response output includes an update ID that you can use to track the status of your cluster update with the <a>DescribeUpdate</a> API operation.</p> <p>Cluster updates are asynchronous, and they should finish within a few minutes. During an update, the cluster status moves to <code>UPDATING</code> (this status transition is eventually consistent). When the update is complete (either <code>Failed</code> or <code>Successful</code>), the cluster status moves to <code>Active</code>.</p> <p>If your cluster has managed node groups attached to it, all of your node groups’ Kubernetes versions must match the cluster’s Kubernetes version in order to update the cluster to a new Kubernetes version.</p>"
+    },
+    "UpdateNodegroupConfig":{
+      "name":"UpdateNodegroupConfig",
+      "http":{
+        "method":"POST",
+        "requestUri":"/clusters/{name}/node-groups/{nodegroupName}/update-config"
+      },
+      "input":{"shape":"UpdateNodegroupConfigRequest"},
+      "output":{"shape":"UpdateNodegroupConfigResponse"},
+      "errors":[
+        {"shape":"InvalidParameterException"},
+        {"shape":"ClientException"},
+        {"shape":"ServerException"},
+        {"shape":"ResourceInUseException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InvalidRequestException"}
+      ],
+      "documentation":"<p>Updates an Amazon EKS managed node group configuration. Your node group continues to function during the update. The response output includes an update ID that you can use to track the status of your node group update with the <a>DescribeUpdate</a> API operation. Currently you can update the Kubernetes labels for a node group or the scaling configuration.</p>"
+    },
+    "UpdateNodegroupVersion":{
+      "name":"UpdateNodegroupVersion",
+      "http":{
+        "method":"POST",
+        "requestUri":"/clusters/{name}/node-groups/{nodegroupName}/update-version"
+      },
+      "input":{"shape":"UpdateNodegroupVersionRequest"},
+      "output":{"shape":"UpdateNodegroupVersionResponse"},
+      "errors":[
+        {"shape":"InvalidParameterException"},
+        {"shape":"ClientException"},
+        {"shape":"ServerException"},
+        {"shape":"ResourceInUseException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InvalidRequestException"}
+      ],
+      "documentation":"<p>Updates the Kubernetes version or AMI version of an Amazon EKS managed node group.</p> <p>You can update to the latest available AMI version of a node group's current Kubernetes version by not specifying a Kubernetes version in the request. You can update to the latest AMI version of your cluster's current Kubernetes version by specifying your cluster's Kubernetes version in the request. For more information, see <a href=\"https://docs.aws.amazon.com/eks/latest/userguide/eks-linux-ami-versions.html\">Amazon EKS-Optimized Linux AMI Versions</a> in the <i>Amazon EKS User Guide</i>.</p> <p>You cannot roll back a node group to an earlier Kubernetes version or AMI version.</p> <p>When a node in a managed node group is terminated due to a scaling action or update, the pods in that node are drained first. Amazon EKS attempts to drain the nodes gracefully and will fail if it is unable to do so. You can <code>force</code> the update if Amazon EKS is unable to drain the nodes as a result of a pod disruption budget issue.</p>"
     }
   },
   "shapes":{
+    "AMITypes":{
+      "type":"string",
+      "enum":[
+        "AL2_x86_64",
+        "AL2_x86_64_GPU"
+      ]
+    },
+    "AutoScalingGroup":{
+      "type":"structure",
+      "members":{
+        "name":{
+          "shape":"String",
+          "documentation":"<p>The name of the Auto Scaling group associated with an Amazon EKS managed node group.</p>"
+        }
+      },
+      "documentation":"<p>An Auto Scaling group that is associated with an Amazon EKS managed node group.</p>"
+    },
+    "AutoScalingGroupList":{
+      "type":"list",
+      "member":{"shape":"AutoScalingGroup"}
+    },
     "BadRequestException":{
       "type":"structure",
       "members":{
@@ -207,6 +401,15 @@
       "type":"boolean",
       "box":true
     },
+    "BoxedInteger":{
+      "type":"integer",
+      "box":true
+    },
+    "Capacity":{
+      "type":"integer",
+      "box":true,
+      "min":1
+    },
     "Certificate":{
       "type":"structure",
       "members":{
@@ -224,6 +427,10 @@
           "shape":"String",
           "documentation":"<p>The Amazon EKS cluster associated with the exception.</p>"
         },
+        "nodegroupName":{
+          "shape":"String",
+          "documentation":"<p>The Amazon EKS managed node group associated with the exception.</p>"
+        },
         "message":{"shape":"String"}
       },
       "documentation":"<p>These errors are usually caused by a client action. Actions can include using an action or resource on behalf of a user that doesn't have permissions to use the action or resource or specifying an identifier that is not valid.</p>",
@@ -287,7 +494,11 @@
         },
         "tags":{
           "shape":"TagMap",
-          "documentation":"<p>The metadata that you apply to the cluster to assist with categorization and organization. Each tag consists of a key and an optional value, both of which you define.</p>"
+          "documentation":"<p>The metadata that you apply to the cluster to assist with categorization and organization. Each tag consists of a key and an optional value, both of which you define. Cluster tags do not propagate to any other resources associated with the cluster. </p>"
+        },
+        "encryptionConfig":{
+          "shape":"EncryptionConfigList",
+          "documentation":"<p>The encryption configuration for the cluster.</p>"
         }
       },
       "documentation":"<p>An object representing an Amazon EKS cluster.</p>"
@@ -304,7 +515,8 @@
         "CREATING",
         "ACTIVE",
         "DELETING",
-        "FAILED"
+        "FAILED",
+        "UPDATING"
       ]
     },
     "CreateClusterRequest":{
@@ -343,6 +555,10 @@
         "tags":{
           "shape":"TagMap",
           "documentation":"<p>The metadata to apply to the cluster to assist with categorization and organization. Each tag consists of a key and an optional value, both of which you define.</p>"
+        },
+        "encryptionConfig":{
+          "shape":"EncryptionConfigList",
+          "documentation":"<p>The encryption configuration for the cluster.</p>"
         }
       }
     },
@@ -355,6 +571,135 @@
         }
       }
     },
+    "CreateFargateProfileRequest":{
+      "type":"structure",
+      "required":[
+        "fargateProfileName",
+        "clusterName",
+        "podExecutionRoleArn"
+      ],
+      "members":{
+        "fargateProfileName":{
+          "shape":"String",
+          "documentation":"<p>The name of the Fargate profile.</p>"
+        },
+        "clusterName":{
+          "shape":"String",
+          "documentation":"<p>The name of the Amazon EKS cluster to apply the Fargate profile to.</p>",
+          "location":"uri",
+          "locationName":"name"
+        },
+        "podExecutionRoleArn":{
+          "shape":"String",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the pod execution role to use for pods that match the selectors in the Fargate profile. The pod execution role allows Fargate infrastructure to register with your cluster as a node, and it provides read access to Amazon ECR image repositories. For more information, see <a href=\"https://docs.aws.amazon.com/eks/latest/userguide/pod-execution-role.html\">Pod Execution Role</a> in the <i>Amazon EKS User Guide</i>.</p>"
+        },
+        "subnets":{
+          "shape":"StringList",
+          "documentation":"<p>The IDs of subnets to launch your pods into. At this time, pods running on Fargate are not assigned public IP addresses, so only private subnets (with no direct route to an Internet Gateway) are accepted for this parameter.</p>"
+        },
+        "selectors":{
+          "shape":"FargateProfileSelectors",
+          "documentation":"<p>The selectors to match for pods to use this Fargate profile. Each selector must have an associated namespace. Optionally, you can also specify labels for a namespace. You may specify up to five selectors in a Fargate profile.</p>"
+        },
+        "clientRequestToken":{
+          "shape":"String",
+          "documentation":"<p>Unique, case-sensitive identifier that you provide to ensure the idempotency of the request.</p>",
+          "idempotencyToken":true
+        },
+        "tags":{
+          "shape":"TagMap",
+          "documentation":"<p>The metadata to apply to the Fargate profile to assist with categorization and organization. Each tag consists of a key and an optional value, both of which you define. Fargate profile tags do not propagate to any other resources associated with the Fargate profile, such as the pods that are scheduled with it.</p>"
+        }
+      }
+    },
+    "CreateFargateProfileResponse":{
+      "type":"structure",
+      "members":{
+        "fargateProfile":{
+          "shape":"FargateProfile",
+          "documentation":"<p>The full description of your new Fargate profile.</p>"
+        }
+      }
+    },
+    "CreateNodegroupRequest":{
+      "type":"structure",
+      "required":[
+        "clusterName",
+        "nodegroupName",
+        "subnets",
+        "nodeRole"
+      ],
+      "members":{
+        "clusterName":{
+          "shape":"String",
+          "documentation":"<p>The name of the cluster to create the node group in.</p>",
+          "location":"uri",
+          "locationName":"name"
+        },
+        "nodegroupName":{
+          "shape":"String",
+          "documentation":"<p>The unique name to give your node group.</p>"
+        },
+        "scalingConfig":{
+          "shape":"NodegroupScalingConfig",
+          "documentation":"<p>The scaling configuration details for the Auto Scaling group that is created for your node group.</p>"
+        },
+        "diskSize":{
+          "shape":"BoxedInteger",
+          "documentation":"<p>The root device disk size (in GiB) for your node group instances. The default disk size is 20 GiB.</p>"
+        },
+        "subnets":{
+          "shape":"StringList",
+          "documentation":"<p>The subnets to use for the Auto Scaling group that is created for your node group. These subnets must have the tag key <code>kubernetes.io/cluster/CLUSTER_NAME</code> with a value of <code>shared</code>, where <code>CLUSTER_NAME</code> is replaced with the name of your cluster.</p>"
+        },
+        "instanceTypes":{
+          "shape":"StringList",
+          "documentation":"<p>The instance type to use for your node group. Currently, you can specify a single instance type for a node group. The default value for this parameter is <code>t3.medium</code>. If you choose a GPU instance type, be sure to specify the <code>AL2_x86_64_GPU</code> with the <code>amiType</code> parameter.</p>"
+        },
+        "amiType":{
+          "shape":"AMITypes",
+          "documentation":"<p>The AMI type for your node group. GPU instance types should use the <code>AL2_x86_64_GPU</code> AMI type, which uses the Amazon EKS-optimized Linux AMI with GPU support. Non-GPU instances should use the <code>AL2_x86_64</code> AMI type, which uses the Amazon EKS-optimized Linux AMI.</p>"
+        },
+        "remoteAccess":{
+          "shape":"RemoteAccessConfig",
+          "documentation":"<p>The remote access (SSH) configuration to use with your node group.</p>"
+        },
+        "nodeRole":{
+          "shape":"String",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the IAM role to associate with your node group. The Amazon EKS worker node <code>kubelet</code> daemon makes calls to AWS APIs on your behalf. Worker nodes receive permissions for these API calls through an IAM instance profile and associated policies. Before you can launch worker nodes and register them into a cluster, you must create an IAM role for those worker nodes to use when they are launched. For more information, see <a href=\"https://docs.aws.amazon.com/eks/latest/userguide/worker_node_IAM_role.html\">Amazon EKS Worker Node IAM Role</a> in the <i> <i>Amazon EKS User Guide</i> </i>.</p>"
+        },
+        "labels":{
+          "shape":"labelsMap",
+          "documentation":"<p>The Kubernetes labels to be applied to the nodes in the node group when they are created.</p>"
+        },
+        "tags":{
+          "shape":"TagMap",
+          "documentation":"<p>The metadata to apply to the node group to assist with categorization and organization. Each tag consists of a key and an optional value, both of which you define. Node group tags do not propagate to any other resources associated with the node group, such as the Amazon EC2 instances or subnets.</p>"
+        },
+        "clientRequestToken":{
+          "shape":"String",
+          "documentation":"<p>Unique, case-sensitive identifier that you provide to ensure the idempotency of the request.</p>",
+          "idempotencyToken":true
+        },
+        "version":{
+          "shape":"String",
+          "documentation":"<p>The Kubernetes version to use for your managed nodes. By default, the Kubernetes version of the cluster is used, and this is the only accepted specified value.</p>"
+        },
+        "releaseVersion":{
+          "shape":"String",
+          "documentation":"<p>The AMI version of the Amazon EKS-optimized AMI to use with your node group. By default, the latest available AMI version for the node group's current Kubernetes version is used. For more information, see <a href=\"https://docs.aws.amazon.com/eks/latest/userguide/eks-linux-ami-versions.html\">Amazon EKS-Optimized Linux AMI Versions</a> in the <i>Amazon EKS User Guide</i>.</p>"
+        }
+      }
+    },
+    "CreateNodegroupResponse":{
+      "type":"structure",
+      "members":{
+        "nodegroup":{
+          "shape":"Nodegroup",
+          "documentation":"<p>The full description of your new node group.</p>"
+        }
+      }
+    },
     "DeleteClusterRequest":{
       "type":"structure",
       "required":["name"],
@@ -376,6 +721,66 @@
         }
       }
     },
+    "DeleteFargateProfileRequest":{
+      "type":"structure",
+      "required":[
+        "clusterName",
+        "fargateProfileName"
+      ],
+      "members":{
+        "clusterName":{
+          "shape":"String",
+          "documentation":"<p>The name of the Amazon EKS cluster associated with the Fargate profile to delete.</p>",
+          "location":"uri",
+          "locationName":"name"
+        },
+        "fargateProfileName":{
+          "shape":"String",
+          "documentation":"<p>The name of the Fargate profile to delete.</p>",
+          "location":"uri",
+          "locationName":"fargateProfileName"
+        }
+      }
+    },
+    "DeleteFargateProfileResponse":{
+      "type":"structure",
+      "members":{
+        "fargateProfile":{
+          "shape":"FargateProfile",
+          "documentation":"<p>The deleted Fargate profile.</p>"
+        }
+      }
+    },
+    "DeleteNodegroupRequest":{
+      "type":"structure",
+      "required":[
+        "clusterName",
+        "nodegroupName"
+      ],
+      "members":{
+        "clusterName":{
+          "shape":"String",
+          "documentation":"<p>The name of the Amazon EKS cluster that is associated with your node group.</p>",
+          "location":"uri",
+          "locationName":"name"
+        },
+        "nodegroupName":{
+          "shape":"String",
+          "documentation":"<p>The name of the node group to delete.</p>",
+          "location":"uri",
+          "locationName":"nodegroupName"
+        }
+      }
+    },
+    "DeleteNodegroupResponse":{
+      "type":"structure",
+      "members":{
+        "nodegroup":{
+          "shape":"Nodegroup",
+          "documentation":"<p>The full description of your deleted node group.</p>"
+        }
+      }
+    },
     "DescribeClusterRequest":{
       "type":"structure",
       "required":["name"],
@@ -397,6 +802,66 @@
         }
       }
     },
+    "DescribeFargateProfileRequest":{
+      "type":"structure",
+      "required":[
+        "clusterName",
+        "fargateProfileName"
+      ],
+      "members":{
+        "clusterName":{
+          "shape":"String",
+          "documentation":"<p>The name of the Amazon EKS cluster associated with the Fargate profile.</p>",
+          "location":"uri",
+          "locationName":"name"
+        },
+        "fargateProfileName":{
+          "shape":"String",
+          "documentation":"<p>The name of the Fargate profile to describe.</p>",
+          "location":"uri",
+          "locationName":"fargateProfileName"
+        }
+      }
+    },
+    "DescribeFargateProfileResponse":{
+      "type":"structure",
+      "members":{
+        "fargateProfile":{
+          "shape":"FargateProfile",
+          "documentation":"<p>The full description of your Fargate profile.</p>"
+        }
+      }
+    },
+    "DescribeNodegroupRequest":{
+      "type":"structure",
+      "required":[
+        "clusterName",
+        "nodegroupName"
+      ],
+      "members":{
+        "clusterName":{
+          "shape":"String",
+          "documentation":"<p>The name of the Amazon EKS cluster associated with the node group.</p>",
+          "location":"uri",
+          "locationName":"name"
+        },
+        "nodegroupName":{
+          "shape":"String",
+          "documentation":"<p>The name of the node group to describe.</p>",
+          "location":"uri",
+          "locationName":"nodegroupName"
+        }
+      }
+    },
+    "DescribeNodegroupResponse":{
+      "type":"structure",
+      "members":{
+        "nodegroup":{
+          "shape":"Nodegroup",
+          "documentation":"<p>The full description of your node group.</p>"
+        }
+      }
+    },
     "DescribeUpdateRequest":{
       "type":"structure",
       "required":[
@@ -406,7 +871,7 @@
       "members":{
         "name":{
           "shape":"String",
-          "documentation":"<p>The name of the Amazon EKS cluster to update.</p>",
+          "documentation":"<p>The name of the Amazon EKS cluster associated with the update.</p>",
           "location":"uri",
           "locationName":"name"
         },
@@ -415,6 +880,12 @@
           "documentation":"<p>The ID of the update to describe.</p>",
           "location":"uri",
           "locationName":"updateId"
+        },
+        "nodegroupName":{
+          "shape":"String",
+          "documentation":"<p>The name of the Amazon EKS node group associated with the update.</p>",
+          "location":"querystring",
+          "locationName":"nodegroupName"
         }
       }
     },
@@ -427,6 +898,25 @@
         }
       }
     },
+    "EncryptionConfig":{
+      "type":"structure",
+      "members":{
+        "resources":{
+          "shape":"StringList",
+          "documentation":"<p>Specifies the resources to be encrypted. The only supported value is \"secrets\".</p>"
+        },
+        "provider":{
+          "shape":"Provider",
+          "documentation":"<p>AWS Key Management Service (AWS KMS) customer master key (CMK). Either the ARN or the alias can be used.</p>"
+        }
+      },
+      "documentation":"<p>The encryption configuration for the cluster.</p>"
+    },
+    "EncryptionConfigList":{
+      "type":"list",
+      "member":{"shape":"EncryptionConfig"},
+      "max":1
+    },
     "ErrorCode":{
       "type":"string",
       "enum":[
@@ -437,7 +927,10 @@
         "AccessDenied",
         "OperationNotPermitted",
         "VpcIdNotFound",
-        "Unknown"
+        "Unknown",
+        "NodeCreationFailure",
+        "PodEvictionFailure",
+        "InsufficientFreeAddresses"
       ]
     },
     "ErrorDetail":{
@@ -462,6 +955,87 @@
       "type":"list",
       "member":{"shape":"ErrorDetail"}
     },
+    "FargateProfile":{
+      "type":"structure",
+      "members":{
+        "fargateProfileName":{
+          "shape":"String",
+          "documentation":"<p>The name of the Fargate profile.</p>"
+        },
+        "fargateProfileArn":{
+          "shape":"String",
+          "documentation":"<p>The full Amazon Resource Name (ARN) of the Fargate profile.</p>"
+        },
+        "clusterName":{
+          "shape":"String",
+          "documentation":"<p>The name of the Amazon EKS cluster that the Fargate profile belongs to.</p>"
+        },
+        "createdAt":{
+          "shape":"Timestamp",
+          "documentation":"<p>The Unix epoch timestamp in seconds for when the Fargate profile was created.</p>"
+        },
+        "podExecutionRoleArn":{
+          "shape":"String",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the pod execution role to use for pods that match the selectors in the Fargate profile. For more information, see <a href=\"https://docs.aws.amazon.com/eks/latest/userguide/pod-execution-role.html\">Pod Execution Role</a> in the <i>Amazon EKS User Guide</i>.</p>"
+        },
+        "subnets":{
+          "shape":"StringList",
+          "documentation":"<p>The IDs of subnets to launch pods into.</p>"
+        },
+        "selectors":{
+          "shape":"FargateProfileSelectors",
+          "documentation":"<p>The selectors to match for pods to use this Fargate profile.</p>"
+        },
+        "status":{
+          "shape":"FargateProfileStatus",
+          "documentation":"<p>The current status of the Fargate profile.</p>"
+        },
+        "tags":{
+          "shape":"TagMap",
+          "documentation":"<p>The metadata applied to the Fargate profile to assist with categorization and organization. Each tag consists of a key and an optional value, both of which you define. Fargate profile tags do not propagate to any other resources associated with the Fargate profile, such as the pods that are scheduled with it.</p>"
+        }
+      },
+      "documentation":"<p>An object representing an AWS Fargate profile.</p>"
+    },
+    "FargateProfileLabel":{
+      "type":"map",
+      "key":{"shape":"String"},
+      "value":{"shape":"String"}
+    },
+    "FargateProfileSelector":{
+      "type":"structure",
+      "members":{
+        "namespace":{
+          "shape":"String",
+          "documentation":"<p>The Kubernetes namespace that the selector should match.</p>"
+        },
+        "labels":{
+          "shape":"FargateProfileLabel",
+          "documentation":"<p>The Kubernetes labels that the selector should match. A pod must contain all of the labels that are specified in the selector for it to be considered a match.</p>"
+        }
+      },
+      "documentation":"<p>An object representing an AWS Fargate profile selector.</p>"
+    },
+    "FargateProfileSelectors":{
+      "type":"list",
+      "member":{"shape":"FargateProfileSelector"}
+    },
+    "FargateProfileStatus":{
+      "type":"string",
+      "enum":[
+        "CREATING",
+        "ACTIVE",
+        "DELETING",
+        "CREATE_FAILED",
+        "DELETE_FAILED"
+      ]
+    },
+    "FargateProfilesRequestMaxResults":{
+      "type":"integer",
+      "box":true,
+      "max":100,
+      "min":1
+    },
     "Identity":{
       "type":"structure",
       "members":{
@@ -479,6 +1053,14 @@
           "shape":"String",
           "documentation":"<p>The Amazon EKS cluster associated with the exception.</p>"
         },
+        "nodegroupName":{
+          "shape":"String",
+          "documentation":"<p>The Amazon EKS managed node group associated with the exception.</p>"
+        },
+        "fargateProfileName":{
+          "shape":"String",
+          "documentation":"<p>The Fargate profile associated with the exception.</p>"
+        },
         "message":{"shape":"String"}
       },
       "documentation":"<p>The specified parameter is invalid. Review the available parameters for the API request.</p>",
@@ -492,12 +1074,38 @@
           "shape":"String",
           "documentation":"<p>The Amazon EKS cluster associated with the exception.</p>"
         },
+        "nodegroupName":{
+          "shape":"String",
+          "documentation":"<p>The Amazon EKS managed node group associated with the exception.</p>"
+        },
         "message":{"shape":"String"}
       },
       "documentation":"<p>The request is invalid given the state of the cluster. Check the state of the cluster and the associated operations.</p>",
       "error":{"httpStatusCode":400},
       "exception":true
     },
+    "Issue":{
+      "type":"structure",
+      "members":{
+        "code":{
+          "shape":"NodegroupIssueCode",
+          "documentation":"<p>A brief description of the error.</p> <ul> <li> <p> <b>AutoScalingGroupNotFound</b>: We couldn't find the Auto Scaling group associated with the managed node group. You may be able to recreate an Auto Scaling group with the same settings to recover.</p> </li> <li> <p> <b>Ec2SecurityGroupNotFound</b>: We couldn't find the cluster security group for the cluster. You must recreate your cluster.</p> </li> <li> <p> <b>Ec2SecurityGroupDeletionFailure</b>: We could not delete the remote access security group for your managed node group. Remove any dependencies from the security group.</p> </li> <li> <p> <b>Ec2LaunchTemplateNotFound</b>: We couldn't find the Amazon EC2 launch template for your managed node group. You may be able to recreate a launch template with the same settings to recover.</p> </li> <li> <p> <b>Ec2LaunchTemplateVersionMismatch</b>: The Amazon EC2 launch template version for your managed node group does not match the version that Amazon EKS created. You may be able to revert to the version that Amazon EKS created to recover.</p> </li> <li> <p> <b>IamInstanceProfileNotFound</b>: We couldn't find the IAM instance profile for your managed node group. You may be able to recreate an instance profile with the same settings to recover.</p> </li> <li> <p> <b>IamNodeRoleNotFound</b>: We couldn't find the IAM role for your managed node group. You may be able to recreate an IAM role with the same settings to recover.</p> </li> <li> <p> <b>AsgInstanceLaunchFailures</b>: Your Auto Scaling group is experiencing failures while attempting to launch instances.</p> </li> <li> <p> <b>NodeCreationFailure</b>: Your launched instances are unable to register with your Amazon EKS cluster. Common causes of this failure are insufficient <a href=\"https://docs.aws.amazon.com/eks/latest/userguide/worker_node_IAM_role.html\">worker node IAM role</a> permissions or lack of outbound internet access for the nodes. </p> </li> <li> <p> <b>InstanceLimitExceeded</b>: Your AWS account is unable to launch any more instances of the specified instance type. You may be able to request an Amazon EC2 instance limit increase to recover.</p> </li> <li> <p> <b>InsufficientFreeAddresses</b>: One or more of the subnets associated with your managed node group does not have enough available IP addresses for new nodes.</p> </li> <li> <p> <b>AccessDenied</b>: Amazon EKS or one or more of your managed nodes is unable to communicate with your cluster API server.</p> </li> <li> <p> <b>InternalFailure</b>: These errors are usually caused by an Amazon EKS server-side issue.</p> </li> </ul>"
+        },
+        "message":{
+          "shape":"String",
+          "documentation":"<p>The error message associated with the issue.</p>"
+        },
+        "resourceIds":{
+          "shape":"StringList",
+          "documentation":"<p>The AWS resources that are afflicted by this issue.</p>"
+        }
+      },
+      "documentation":"<p>An object representing an issue with an Amazon EKS resource.</p>"
+    },
+    "IssueList":{
+      "type":"list",
+      "member":{"shape":"Issue"}
+    },
     "ListClustersRequest":{
       "type":"structure",
       "members":{
@@ -534,13 +1142,93 @@
         }
       }
     },
+    "ListFargateProfilesRequest":{
+      "type":"structure",
+      "required":["clusterName"],
+      "members":{
+        "clusterName":{
+          "shape":"String",
+          "documentation":"<p>The name of the Amazon EKS cluster that you would like to listFargate profiles in.</p>",
+          "location":"uri",
+          "locationName":"name"
+        },
+        "maxResults":{
+          "shape":"FargateProfilesRequestMaxResults",
+          "documentation":"<p>The maximum number of Fargate profile results returned by <code>ListFargateProfiles</code> in paginated output. When you use this parameter, <code>ListFargateProfiles</code> returns only <code>maxResults</code> results in a single page along with a <code>nextToken</code> response element. You can see the remaining results of the initial request by sending another <code>ListFargateProfiles</code> request with the returned <code>nextToken</code> value. This value can be between 1 and 100. If you don't use this parameter, <code>ListFargateProfiles</code> returns up to 100 results and a <code>nextToken</code> value if applicable.</p>",
+          "location":"querystring",
+          "locationName":"maxResults"
+        },
+        "nextToken":{
+          "shape":"String",
+          "documentation":"<p>The <code>nextToken</code> value returned from a previous paginated <code>ListFargateProfiles</code> request where <code>maxResults</code> was used and the results exceeded the value of that parameter. Pagination continues from the end of the previous results that returned the <code>nextToken</code> value.</p>",
+          "location":"querystring",
+          "locationName":"nextToken"
+        }
+      }
+    },
+    "ListFargateProfilesResponse":{
+      "type":"structure",
+      "members":{
+        "fargateProfileNames":{
+          "shape":"StringList",
+          "documentation":"<p>A list of all of the Fargate profiles associated with the specified cluster.</p>"
+        },
+        "nextToken":{
+          "shape":"String",
+          "documentation":"<p>The <code>nextToken</code> value to include in a future <code>ListFargateProfiles</code> request. When the results of a <code>ListFargateProfiles</code> request exceed <code>maxResults</code>, you can use this value to retrieve the next page of results. This value is <code>null</code> when there are no more results to return.</p>"
+        }
+      }
+    },
+    "ListNodegroupsRequest":{
+      "type":"structure",
+      "required":["clusterName"],
+      "members":{
+        "clusterName":{
+          "shape":"String",
+          "documentation":"<p>The name of the Amazon EKS cluster that you would like to list node groups in.</p>",
+          "location":"uri",
+          "locationName":"name"
+        },
+        "maxResults":{
+          "shape":"ListNodegroupsRequestMaxResults",
+          "documentation":"<p>The maximum number of node group results returned by <code>ListNodegroups</code> in paginated output. When you use this parameter, <code>ListNodegroups</code> returns only <code>maxResults</code> results in a single page along with a <code>nextToken</code> response element. You can see the remaining results of the initial request by sending another <code>ListNodegroups</code> request with the returned <code>nextToken</code> value. This value can be between 1 and 100. If you don't use this parameter, <code>ListNodegroups</code> returns up to 100 results and a <code>nextToken</code> value if applicable.</p>",
+          "location":"querystring",
+          "locationName":"maxResults"
+        },
+        "nextToken":{
+          "shape":"String",
+          "documentation":"<p>The <code>nextToken</code> value returned from a previous paginated <code>ListNodegroups</code> request where <code>maxResults</code> was used and the results exceeded the value of that parameter. Pagination continues from the end of the previous results that returned the <code>nextToken</code> value.</p>",
+          "location":"querystring",
+          "locationName":"nextToken"
+        }
+      }
+    },
+    "ListNodegroupsRequestMaxResults":{
+      "type":"integer",
+      "box":true,
+      "max":100,
+      "min":1
+    },
+    "ListNodegroupsResponse":{
+      "type":"structure",
+      "members":{
+        "nodegroups":{
+          "shape":"StringList",
+          "documentation":"<p>A list of all of the node groups associated with the specified cluster.</p>"
+        },
+        "nextToken":{
+          "shape":"String",
+          "documentation":"<p>The <code>nextToken</code> value to include in a future <code>ListNodegroups</code> request. When the results of a <code>ListNodegroups</code> request exceed <code>maxResults</code>, you can use this value to retrieve the next page of results. This value is <code>null</code> when there are no more results to return.</p>"
+        }
+      }
+    },
     "ListTagsForResourceRequest":{
       "type":"structure",
       "required":["resourceArn"],
       "members":{
         "resourceArn":{
           "shape":"String",
-          "documentation":"<p>The Amazon Resource Name (ARN) that identifies the resource for which to list the tags. Currently, the supported resources are Amazon EKS clusters.</p>",
+          "documentation":"<p>The Amazon Resource Name (ARN) that identifies the resource for which to list the tags. Currently, the supported resources are Amazon EKS clusters and managed node groups.</p>",
           "location":"uri",
           "locationName":"resourceArn"
         }
@@ -565,6 +1253,12 @@
           "location":"uri",
           "locationName":"name"
         },
+        "nodegroupName":{
+          "shape":"String",
+          "documentation":"<p>The name of the Amazon EKS managed node group to list updates for.</p>",
+          "location":"querystring",
+          "locationName":"nodegroupName"
+        },
         "nextToken":{
           "shape":"String",
           "documentation":"<p>The <code>nextToken</code> value returned from a previous paginated <code>ListUpdates</code> request where <code>maxResults</code> was used and the results exceeded the value of that parameter. Pagination continues from the end of the previous results that returned the <code>nextToken</code> value.</p>",
@@ -640,6 +1334,164 @@
       },
       "documentation":"<p>An object representing the logging configuration for resources in your cluster.</p>"
     },
+    "Nodegroup":{
+      "type":"structure",
+      "members":{
+        "nodegroupName":{
+          "shape":"String",
+          "documentation":"<p>The name associated with an Amazon EKS managed node group.</p>"
+        },
+        "nodegroupArn":{
+          "shape":"String",
+          "documentation":"<p>The Amazon Resource Name (ARN) associated with the managed node group.</p>"
+        },
+        "clusterName":{
+          "shape":"String",
+          "documentation":"<p>The name of the cluster that the managed node group resides in.</p>"
+        },
+        "version":{
+          "shape":"String",
+          "documentation":"<p>The Kubernetes version of the managed node group.</p>"
+        },
+        "releaseVersion":{
+          "shape":"String",
+          "documentation":"<p>The AMI version of the managed node group. For more information, see <a href=\"https://docs.aws.amazon.com/eks/latest/userguide/eks-linux-ami-versions.html\">Amazon EKS-Optimized Linux AMI Versions </a> in the <i>Amazon EKS User Guide</i>.</p>"
+        },
+        "createdAt":{
+          "shape":"Timestamp",
+          "documentation":"<p>The Unix epoch timestamp in seconds for when the managed node group was created.</p>"
+        },
+        "modifiedAt":{
+          "shape":"Timestamp",
+          "documentation":"<p>The Unix epoch timestamp in seconds for when the managed node group was last modified.</p>"
+        },
+        "status":{
+          "shape":"NodegroupStatus",
+          "documentation":"<p>The current status of the managed node group.</p>"
+        },
+        "scalingConfig":{
+          "shape":"NodegroupScalingConfig",
+          "documentation":"<p>The scaling configuration details for the Auto Scaling group that is associated with your node group.</p>"
+        },
+        "instanceTypes":{
+          "shape":"StringList",
+          "documentation":"<p>The instance types associated with your node group.</p>"
+        },
+        "subnets":{
+          "shape":"StringList",
+          "documentation":"<p>The subnets allowed for the Auto Scaling group that is associated with your node group. These subnets must have the following tag: <code>kubernetes.io/cluster/CLUSTER_NAME</code>, where <code>CLUSTER_NAME</code> is replaced with the name of your cluster.</p>"
+        },
+        "remoteAccess":{
+          "shape":"RemoteAccessConfig",
+          "documentation":"<p>The remote access (SSH) configuration that is associated with the node group.</p>"
+        },
+        "amiType":{
+          "shape":"AMITypes",
+          "documentation":"<p>The AMI type associated with your node group. GPU instance types should use the <code>AL2_x86_64_GPU</code> AMI type, which uses the Amazon EKS-optimized Linux AMI with GPU support. Non-GPU instances should use the <code>AL2_x86_64</code> AMI type, which uses the Amazon EKS-optimized Linux AMI.</p>"
+        },
+        "nodeRole":{
+          "shape":"String",
+          "documentation":"<p>The IAM role associated with your node group. The Amazon EKS worker node <code>kubelet</code> daemon makes calls to AWS APIs on your behalf. Worker nodes receive permissions for these API calls through an IAM instance profile and associated policies. Before you can launch worker nodes and register them into a cluster, you must create an IAM role for those worker nodes to use when they are launched. For more information, see <a href=\"https://docs.aws.amazon.com/eks/latest/userguide/worker_node_IAM_role.html\">Amazon EKS Worker Node IAM Role</a> in the <i> <i>Amazon EKS User Guide</i> </i>.</p>"
+        },
+        "labels":{
+          "shape":"labelsMap",
+          "documentation":"<p>The Kubernetes labels applied to the nodes in the node group.</p> <note> <p>Only labels that are applied with the Amazon EKS API are shown here. There may be other Kubernetes labels applied to the nodes in this group.</p> </note>"
+        },
+        "resources":{
+          "shape":"NodegroupResources",
+          "documentation":"<p>The resources associated with the node group, such as Auto Scaling groups and security groups for remote access.</p>"
+        },
+        "diskSize":{
+          "shape":"BoxedInteger",
+          "documentation":"<p>The root device disk size (in GiB) for your node group instances. The default disk size is 20 GiB.</p>"
+        },
+        "health":{
+          "shape":"NodegroupHealth",
+          "documentation":"<p>The health status of the node group. If there are issues with your node group's health, they are listed here.</p>"
+        },
+        "tags":{
+          "shape":"TagMap",
+          "documentation":"<p>The metadata applied to the node group to assist with categorization and organization. Each tag consists of a key and an optional value, both of which you define. Node group tags do not propagate to any other resources associated with the node group, such as the Amazon EC2 instances or subnets. </p>"
+        }
+      },
+      "documentation":"<p>An object representing an Amazon EKS managed node group.</p>"
+    },
+    "NodegroupHealth":{
+      "type":"structure",
+      "members":{
+        "issues":{
+          "shape":"IssueList",
+          "documentation":"<p>Any issues that are associated with the node group. </p>"
+        }
+      },
+      "documentation":"<p>An object representing the health status of the node group.</p>"
+    },
+    "NodegroupIssueCode":{
+      "type":"string",
+      "enum":[
+        "AutoScalingGroupNotFound",
+        "AutoScalingGroupInvalidConfiguration",
+        "Ec2SecurityGroupNotFound",
+        "Ec2SecurityGroupDeletionFailure",
+        "Ec2LaunchTemplateNotFound",
+        "Ec2LaunchTemplateVersionMismatch",
+        "Ec2SubnetNotFound",
+        "Ec2SubnetInvalidConfiguration",
+        "IamInstanceProfileNotFound",
+        "IamLimitExceeded",
+        "IamNodeRoleNotFound",
+        "NodeCreationFailure",
+        "AsgInstanceLaunchFailures",
+        "InstanceLimitExceeded",
+        "InsufficientFreeAddresses",
+        "AccessDenied",
+        "InternalFailure"
+      ]
+    },
+    "NodegroupResources":{
+      "type":"structure",
+      "members":{
+        "autoScalingGroups":{
+          "shape":"AutoScalingGroupList",
+          "documentation":"<p>The Auto Scaling groups associated with the node group.</p>"
+        },
+        "remoteAccessSecurityGroup":{
+          "shape":"String",
+          "documentation":"<p>The remote access security group associated with the node group. This security group controls SSH access to the worker nodes.</p>"
+        }
+      },
+      "documentation":"<p>An object representing the resources associated with the node group, such as Auto Scaling groups and security groups for remote access.</p>"
+    },
+    "NodegroupScalingConfig":{
+      "type":"structure",
+      "members":{
+        "minSize":{
+          "shape":"Capacity",
+          "documentation":"<p>The minimum number of worker nodes that the managed node group can scale in to. This number must be greater than zero.</p>"
+        },
+        "maxSize":{
+          "shape":"Capacity",
+          "documentation":"<p>The maximum number of worker nodes that the managed node group can scale out to. Managed node groups can support up to 100 nodes by default.</p>"
+        },
+        "desiredSize":{
+          "shape":"Capacity",
+          "documentation":"<p>The current number of worker nodes that the managed node group should maintain.</p>"
+        }
+      },
+      "documentation":"<p>An object representing the scaling configuration details for the Auto Scaling group that is associated with your node group.</p>"
+    },
+    "NodegroupStatus":{
+      "type":"string",
+      "enum":[
+        "CREATING",
+        "ACTIVE",
+        "UPDATING",
+        "DELETING",
+        "CREATE_FAILED",
+        "DELETE_FAILED",
+        "DEGRADED"
+      ]
+    },
     "NotFoundException":{
       "type":"structure",
       "members":{
@@ -659,6 +1511,30 @@
       },
       "documentation":"<p>An object representing the <a href=\"https://openid.net/connect/\">OpenID Connect</a> identity provider information for the cluster.</p>"
     },
+    "Provider":{
+      "type":"structure",
+      "members":{
+        "keyArn":{
+          "shape":"String",
+          "documentation":"<p>Amazon Resource Name (ARN) or alias of the customer master key (CMK). The CMK must be symmetric, created in the same region as the cluster, and if the CMK was created in a different account, the user must have access to the CMK. For more information, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/key-policy-modifying-external-accounts.html\">Allowing Users in Other Accounts to Use a CMK</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
+        }
+      },
+      "documentation":"<p>Identifies the AWS Key Management Service (AWS KMS) customer master key (CMK) used to encrypt the secrets.</p>"
+    },
+    "RemoteAccessConfig":{
+      "type":"structure",
+      "members":{
+        "ec2SshKey":{
+          "shape":"String",
+          "documentation":"<p>The Amazon EC2 SSH key that provides access for SSH communication with the worker nodes in the managed node group. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-key-pairs.html\">Amazon EC2 Key Pairs</a> in the <i>Amazon Elastic Compute Cloud User Guide for Linux Instances</i>.</p>"
+        },
+        "sourceSecurityGroups":{
+          "shape":"StringList",
+          "documentation":"<p>The security groups that are allowed SSH access (port 22) to the worker nodes. If you specify an Amazon EC2 SSH key but do not specify a source security group when you create a managed node group, then port 22 on the worker nodes is opened to the internet (0.0.0.0/0). For more information, see <a href=\"https://docs.aws.amazon.com/vpc/latest/userguide/VPC_SecurityGroups.html\">Security Groups for Your VPC</a> in the <i>Amazon Virtual Private Cloud User Guide</i>.</p>"
+        }
+      },
+      "documentation":"<p>An object representing the remote access configuration for the managed node group.</p>"
+    },
     "ResourceInUseException":{
       "type":"structure",
       "members":{
@@ -666,6 +1542,10 @@
           "shape":"String",
           "documentation":"<p>The Amazon EKS cluster associated with the exception.</p>"
         },
+        "nodegroupName":{
+          "shape":"String",
+          "documentation":"<p>The Amazon EKS managed node group associated with the exception.</p>"
+        },
         "message":{"shape":"String"}
       },
       "documentation":"<p>The specified resource is in use.</p>",
@@ -679,6 +1559,10 @@
           "shape":"String",
           "documentation":"<p>The Amazon EKS cluster associated with the exception.</p>"
         },
+        "nodegroupName":{
+          "shape":"String",
+          "documentation":"<p>The Amazon EKS managed node group associated with the exception.</p>"
+        },
         "message":{"shape":"String"}
       },
       "documentation":"<p>You have encountered a service limit on the specified resource.</p>",
@@ -692,9 +1576,17 @@
           "shape":"String",
           "documentation":"<p>The Amazon EKS cluster associated with the exception.</p>"
         },
+        "nodegroupName":{
+          "shape":"String",
+          "documentation":"<p>The Amazon EKS managed node group associated with the exception.</p>"
+        },
+        "fargateProfileName":{
+          "shape":"String",
+          "documentation":"<p>The Fargate profile associated with the exception.</p>"
+        },
         "message":{"shape":"String"}
       },
-      "documentation":"<p>The specified resource could not be found. You can view your available clusters with <a>ListClusters</a>. Amazon EKS clusters are Region-specific.</p>",
+      "documentation":"<p>The specified resource could not be found. You can view your available clusters with <a>ListClusters</a>. You can view your available managed node groups with <a>ListNodegroups</a>. Amazon EKS clusters and node groups are Region-specific.</p>",
       "error":{"httpStatusCode":404},
       "exception":true
     },
@@ -705,6 +1597,10 @@
           "shape":"String",
           "documentation":"<p>The Amazon EKS cluster associated with the exception.</p>"
         },
+        "nodegroupName":{
+          "shape":"String",
+          "documentation":"<p>The Amazon EKS managed node group associated with the exception.</p>"
+        },
         "message":{"shape":"String"}
       },
       "documentation":"<p>These errors are usually caused by a server-side issue.</p>",
@@ -754,7 +1650,7 @@
       "members":{
         "resourceArn":{
           "shape":"String",
-          "documentation":"<p>The Amazon Resource Name (ARN) of the resource to which to add tags. Currently, the supported resources are Amazon EKS clusters.</p>",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the resource to which to add tags. Currently, the supported resources are Amazon EKS clusters and managed node groups.</p>",
           "location":"uri",
           "locationName":"resourceArn"
         },
@@ -782,6 +1678,10 @@
           "shape":"String",
           "documentation":"<p>The Amazon EKS cluster associated with the exception.</p>"
         },
+        "nodegroupName":{
+          "shape":"String",
+          "documentation":"<p>The Amazon EKS managed node group associated with the exception.</p>"
+        },
         "validZones":{
           "shape":"StringList",
           "documentation":"<p>The supported Availability Zones for your account. Choose subnets in these Availability Zones for your cluster.</p>"
@@ -800,7 +1700,7 @@
       "members":{
         "resourceArn":{
           "shape":"String",
-          "documentation":"<p>The Amazon Resource Name (ARN) of the resource from which to delete tags. Currently, the supported resources are Amazon EKS clusters.</p>",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the resource from which to delete tags. Currently, the supported resources are Amazon EKS clusters and managed node groups.</p>",
           "location":"uri",
           "locationName":"resourceArn"
         },
@@ -908,6 +1808,104 @@
         }
       }
     },
+    "UpdateLabelsPayload":{
+      "type":"structure",
+      "members":{
+        "addOrUpdateLabels":{
+          "shape":"labelsMap",
+          "documentation":"<p>Kubernetes labels to be added or updated.</p>"
+        },
+        "removeLabels":{
+          "shape":"labelsKeyList",
+          "documentation":"<p>Kubernetes labels to be removed.</p>"
+        }
+      },
+      "documentation":"<p>An object representing a Kubernetes label change for a managed node group.</p>"
+    },
+    "UpdateNodegroupConfigRequest":{
+      "type":"structure",
+      "required":[
+        "clusterName",
+        "nodegroupName"
+      ],
+      "members":{
+        "clusterName":{
+          "shape":"String",
+          "documentation":"<p>The name of the Amazon EKS cluster that the managed node group resides in.</p>",
+          "location":"uri",
+          "locationName":"name"
+        },
+        "nodegroupName":{
+          "shape":"String",
+          "documentation":"<p>The name of the managed node group to update.</p>",
+          "location":"uri",
+          "locationName":"nodegroupName"
+        },
+        "labels":{
+          "shape":"UpdateLabelsPayload",
+          "documentation":"<p>The Kubernetes labels to be applied to the nodes in the node group after the update.</p>"
+        },
+        "scalingConfig":{
+          "shape":"NodegroupScalingConfig",
+          "documentation":"<p>The scaling configuration details for the Auto Scaling group after the update.</p>"
+        },
+        "clientRequestToken":{
+          "shape":"String",
+          "documentation":"<p>Unique, case-sensitive identifier that you provide to ensure the idempotency of the request.</p>",
+          "idempotencyToken":true
+        }
+      }
+    },
+    "UpdateNodegroupConfigResponse":{
+      "type":"structure",
+      "members":{
+        "update":{"shape":"Update"}
+      }
+    },
+    "UpdateNodegroupVersionRequest":{
+      "type":"structure",
+      "required":[
+        "clusterName",
+        "nodegroupName"
+      ],
+      "members":{
+        "clusterName":{
+          "shape":"String",
+          "documentation":"<p>The name of the Amazon EKS cluster that is associated with the managed node group to update.</p>",
+          "location":"uri",
+          "locationName":"name"
+        },
+        "nodegroupName":{
+          "shape":"String",
+          "documentation":"<p>The name of the managed node group to update.</p>",
+          "location":"uri",
+          "locationName":"nodegroupName"
+        },
+        "version":{
+          "shape":"String",
+          "documentation":"<p>The Kubernetes version to update to. If no version is specified, then the Kubernetes version of the node group does not change. You can specify the Kubernetes version of the cluster to update the node group to the latest AMI version of the cluster's Kubernetes version.</p>"
+        },
+        "releaseVersion":{
+          "shape":"String",
+          "documentation":"<p>The AMI version of the Amazon EKS-optimized AMI to use for the update. By default, the latest available AMI version for the node group's Kubernetes version is used. For more information, see <a href=\"https://docs.aws.amazon.com/eks/latest/userguide/eks-linux-ami-versions.html\">Amazon EKS-Optimized Linux AMI Versions </a> in the <i>Amazon EKS User Guide</i>.</p>"
+        },
+        "force":{
+          "shape":"Boolean",
+          "documentation":"<p>Force the update if the existing node group's pods are unable to be drained due to a pod disruption budget issue. If an update fails because pods could not be drained, you can force the update after it fails to terminate the old node whether or not any pods are running on the node.</p>"
+        },
+        "clientRequestToken":{
+          "shape":"String",
+          "documentation":"<p>Unique, case-sensitive identifier that you provide to ensure the idempotency of the request.</p>",
+          "idempotencyToken":true
+        }
+      }
+    },
+    "UpdateNodegroupVersionResponse":{
+      "type":"structure",
+      "members":{
+        "update":{"shape":"Update"}
+      }
+    },
     "UpdateParam":{
       "type":"structure",
       "members":{
@@ -929,7 +1927,14 @@
         "PlatformVersion",
         "EndpointPrivateAccess",
         "EndpointPublicAccess",
-        "ClusterLogging"
+        "ClusterLogging",
+        "DesiredSize",
+        "LabelsToAdd",
+        "LabelsToRemove",
+        "MaxSize",
+        "MinSize",
+        "ReleaseVersion",
+        "PublicAccessCidrs"
       ]
     },
     "UpdateParams":{
@@ -950,7 +1955,8 @@
       "enum":[
         "VersionUpdate",
         "EndpointAccessUpdate",
-        "LoggingUpdate"
+        "LoggingUpdate",
+        "ConfigUpdate"
       ]
     },
     "VpcConfigRequest":{
@@ -966,11 +1972,15 @@
         },
         "endpointPublicAccess":{
           "shape":"BoxedBoolean",
-          "documentation":"<p>Set this value to <code>false</code> to disable public access for your cluster's Kubernetes API server endpoint. If you disable public access, your cluster's Kubernetes API server can receive only requests from within the cluster VPC. The default value for this parameter is <code>true</code>, which enables public access for your Kubernetes API server. For more information, see <a href=\"https://docs.aws.amazon.com/eks/latest/userguide/cluster-endpoint.html\">Amazon EKS Cluster Endpoint Access Control</a> in the <i> <i>Amazon EKS User Guide</i> </i>.</p>"
+          "documentation":"<p>Set this value to <code>false</code> to disable public access to your cluster's Kubernetes API server endpoint. If you disable public access, your cluster's Kubernetes API server can only receive requests from within the cluster VPC. The default value for this parameter is <code>true</code>, which enables public access for your Kubernetes API server. For more information, see <a href=\"https://docs.aws.amazon.com/eks/latest/userguide/cluster-endpoint.html\">Amazon EKS Cluster Endpoint Access Control</a> in the <i> <i>Amazon EKS User Guide</i> </i>.</p>"
         },
         "endpointPrivateAccess":{
           "shape":"BoxedBoolean",
-          "documentation":"<p>Set this value to <code>true</code> to enable private access for your cluster's Kubernetes API server endpoint. If you enable private access, Kubernetes API requests from within your cluster's VPC use the private VPC endpoint. The default value for this parameter is <code>false</code>, which disables private access for your Kubernetes API server. For more information, see <a href=\"https://docs.aws.amazon.com/eks/latest/userguide/cluster-endpoint.html\">Amazon EKS Cluster Endpoint Access Control</a> in the <i> <i>Amazon EKS User Guide</i> </i>.</p>"
+          "documentation":"<p>Set this value to <code>true</code> to enable private access for your cluster's Kubernetes API server endpoint. If you enable private access, Kubernetes API requests from within your cluster's VPC use the private VPC endpoint. The default value for this parameter is <code>false</code>, which disables private access for your Kubernetes API server. If you disable private access and you have worker nodes or AWS Fargate pods in the cluster, then ensure that <code>publicAccessCidrs</code> includes the necessary CIDR blocks for communication with the worker nodes or Fargate pods. For more information, see <a href=\"https://docs.aws.amazon.com/eks/latest/userguide/cluster-endpoint.html\">Amazon EKS Cluster Endpoint Access Control</a> in the <i> <i>Amazon EKS User Guide</i> </i>.</p>"
+        },
+        "publicAccessCidrs":{
+          "shape":"StringList",
+          "documentation":"<p>The CIDR blocks that are allowed access to your cluster's public Kubernetes API server endpoint. Communication to the endpoint from addresses outside of the CIDR blocks that you specify is denied. The default value is <code>0.0.0.0/0</code>. If you've disabled private endpoint access and you have worker nodes or AWS Fargate pods in the cluster, then ensure that you specify the necessary CIDR blocks. For more information, see <a href=\"https://docs.aws.amazon.com/eks/latest/userguide/cluster-endpoint.html\">Amazon EKS Cluster Endpoint Access Control</a> in the <i> <i>Amazon EKS User Guide</i> </i>.</p>"
         }
       },
       "documentation":"<p>An object representing the VPC configuration to use for an Amazon EKS cluster.</p>"
@@ -986,20 +1996,47 @@
           "shape":"StringList",
           "documentation":"<p>The security groups associated with the cross-account elastic network interfaces that are used to allow communication between your worker nodes and the Kubernetes control plane.</p>"
         },
+        "clusterSecurityGroupId":{
+          "shape":"String",
+          "documentation":"<p>The cluster security group that was created by Amazon EKS for the cluster. Managed node groups use this security group for control-plane-to-data-plane communication.</p>"
+        },
         "vpcId":{
           "shape":"String",
           "documentation":"<p>The VPC associated with your cluster.</p>"
         },
         "endpointPublicAccess":{
           "shape":"Boolean",
-          "documentation":"<p>This parameter indicates whether the Amazon EKS public API server endpoint is enabled. If the Amazon EKS public API server endpoint is disabled, your cluster's Kubernetes API server can receive only requests that originate from within the cluster VPC. </p>"
+          "documentation":"<p>This parameter indicates whether the Amazon EKS public API server endpoint is enabled. If the Amazon EKS public API server endpoint is disabled, your cluster's Kubernetes API server can only receive requests that originate from within the cluster VPC.</p>"
         },
         "endpointPrivateAccess":{
           "shape":"Boolean",
-          "documentation":"<p>This parameter indicates whether the Amazon EKS private API server endpoint is enabled. If the Amazon EKS private API server endpoint is enabled, Kubernetes API requests that originate from within your cluster's VPC use the private VPC endpoint instead of traversing the internet.</p>"
+          "documentation":"<p>This parameter indicates whether the Amazon EKS private API server endpoint is enabled. If the Amazon EKS private API server endpoint is enabled, Kubernetes API requests that originate from within your cluster's VPC use the private VPC endpoint instead of traversing the internet. If this value is disabled and you have worker nodes or AWS Fargate pods in the cluster, then ensure that <code>publicAccessCidrs</code> includes the necessary CIDR blocks for communication with the worker nodes or Fargate pods. For more information, see <a href=\"https://docs.aws.amazon.com/eks/latest/userguide/cluster-endpoint.html\">Amazon EKS Cluster Endpoint Access Control</a> in the <i> <i>Amazon EKS User Guide</i> </i>.</p>"
+        },
+        "publicAccessCidrs":{
+          "shape":"StringList",
+          "documentation":"<p>The CIDR blocks that are allowed access to your cluster's public Kubernetes API server endpoint. Communication to the endpoint from addresses outside of the listed CIDR blocks is denied. The default value is <code>0.0.0.0/0</code>. If you've disabled private endpoint access and you have worker nodes or AWS Fargate pods in the cluster, then ensure that the necessary CIDR blocks are listed. For more information, see <a href=\"https://docs.aws.amazon.com/eks/latest/userguide/cluster-endpoint.html\">Amazon EKS Cluster Endpoint Access Control</a> in the <i> <i>Amazon EKS User Guide</i> </i>.</p>"
         }
       },
       "documentation":"<p>An object representing an Amazon EKS cluster VPC configuration response.</p>"
+    },
+    "labelKey":{
+      "type":"string",
+      "max":63,
+      "min":1
+    },
+    "labelValue":{
+      "type":"string",
+      "max":253,
+      "min":1
+    },
+    "labelsKeyList":{
+      "type":"list",
+      "member":{"shape":"String"}
+    },
+    "labelsMap":{
+      "type":"map",
+      "key":{"shape":"labelKey"},
+      "value":{"shape":"labelValue"}
     }
   },
   "documentation":"<p>Amazon Elastic Kubernetes Service (Amazon EKS) is a managed service that makes it easy for you to run Kubernetes on AWS without needing to stand up or maintain your own Kubernetes control plane. Kubernetes is an open-source system for automating the deployment, scaling, and management of containerized applications. </p> <p>Amazon EKS runs up-to-date versions of the open-source Kubernetes software, so you can use all the existing plugins and tooling from the Kubernetes community. Applications running on Amazon EKS are fully compatible with applications running on any standard Kubernetes environment, whether running in on-premises data centers or public clouds. This means that you can easily migrate any standard Kubernetes application to Amazon EKS without any code modification required.</p>"
diff --git a/services/eks/src/main/resources/codegen-resources/waiters-2.json b/services/eks/src/main/resources/codegen-resources/waiters-2.json
index c325e521f599..449d2296c391 100644
--- a/services/eks/src/main/resources/codegen-resources/waiters-2.json
+++ b/services/eks/src/main/resources/codegen-resources/waiters-2.json
@@ -49,6 +49,43 @@
           "state": "success"
         }
       ]
+    },
+    "NodegroupActive": {
+      "delay": 30,
+      "operation": "DescribeNodegroup",
+      "maxAttempts": 80,
+      "acceptors": [
+        {
+          "expected": "CREATE_FAILED",
+          "matcher": "path",
+          "state": "failure",
+          "argument": "nodegroup.status"
+        },
+        {
+          "expected": "ACTIVE",
+          "matcher": "path",
+          "state": "success",
+          "argument": "nodegroup.status"
+        }
+      ]
+    },
+    "NodegroupDeleted": {
+      "delay": 30,
+      "operation": "DescribeNodegroup",
+      "maxAttempts": 40,
+      "acceptors": [
+        {
+          "expected": "DELETE_FAILED",
+          "matcher": "path",
+          "state": "failure",
+          "argument": "nodegroup.status"
+        },
+        {
+          "expected": "ResourceNotFoundException",
+          "matcher": "error",
+          "state": "success"
+        }
+      ]
     }
   }
 }
diff --git a/services/elasticache/build.properties b/services/elasticache/build.properties
index ecf2dae6fcb1..15ec2da1fc71 100644
--- a/services/elasticache/build.properties
+++ b/services/elasticache/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/elasticache/pom.xml b/services/elasticache/pom.xml
index c97d58df219c..7c44e6b86d83 100644
--- a/services/elasticache/pom.xml
+++ b/services/elasticache/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>elasticache</artifactId>
     <name>AWS Java SDK :: Services :: Amazon ElastiCache</name>
diff --git a/services/elasticache/src/it/java/software/amazon/awssdk/services/elasticache/ElastiCacheIntegrationTestBase.java b/services/elasticache/src/it/java/software/amazon/awssdk/services/elasticache/ElastiCacheIntegrationTestBase.java
index d99eceae655e..fe9f93eb2087 100644
--- a/services/elasticache/src/it/java/software/amazon/awssdk/services/elasticache/ElastiCacheIntegrationTestBase.java
+++ b/services/elasticache/src/it/java/software/amazon/awssdk/services/elasticache/ElastiCacheIntegrationTestBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/elasticache/src/it/java/software/amazon/awssdk/services/elasticache/ParameterGroupsIntegrationTest.java b/services/elasticache/src/it/java/software/amazon/awssdk/services/elasticache/ParameterGroupsIntegrationTest.java
index f3eafa8418c9..a77d3a5c54f5 100644
--- a/services/elasticache/src/it/java/software/amazon/awssdk/services/elasticache/ParameterGroupsIntegrationTest.java
+++ b/services/elasticache/src/it/java/software/amazon/awssdk/services/elasticache/ParameterGroupsIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/elasticache/src/main/resources/codegen-resources/paginators-1.json b/services/elasticache/src/main/resources/codegen-resources/paginators-1.json
index 43995d3c4314..47e5404c9357 100644
--- a/services/elasticache/src/main/resources/codegen-resources/paginators-1.json
+++ b/services/elasticache/src/main/resources/codegen-resources/paginators-1.json
@@ -48,6 +48,12 @@
       "output_token": "Marker",
       "result_key": "Events"
     },
+    "DescribeGlobalReplicationGroups": {
+      "input_token": "Marker",
+      "limit_key": "MaxRecords",
+      "output_token": "Marker",
+      "result_key": "GlobalReplicationGroups"
+    },
     "DescribeReplicationGroups": {
       "input_token": "Marker",
       "limit_key": "MaxRecords",
diff --git a/services/elasticache/src/main/resources/codegen-resources/service-2.json b/services/elasticache/src/main/resources/codegen-resources/service-2.json
index 43631a56364c..9ac469cc78a8 100644
--- a/services/elasticache/src/main/resources/codegen-resources/service-2.json
+++ b/services/elasticache/src/main/resources/codegen-resources/service-2.json
@@ -210,6 +210,26 @@
       ],
       "documentation":"<p>Creates a new cache subnet group.</p> <p>Use this parameter only when you are creating a cluster in an Amazon Virtual Private Cloud (Amazon VPC).</p>"
     },
+    "CreateGlobalReplicationGroup":{
+      "name":"CreateGlobalReplicationGroup",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"CreateGlobalReplicationGroupMessage"},
+      "output":{
+        "shape":"CreateGlobalReplicationGroupResult",
+        "resultWrapper":"CreateGlobalReplicationGroupResult"
+      },
+      "errors":[
+        {"shape":"ReplicationGroupNotFoundFault"},
+        {"shape":"InvalidReplicationGroupStateFault"},
+        {"shape":"GlobalReplicationGroupAlreadyExistsFault"},
+        {"shape":"ServiceLinkedRoleNotFoundFault"},
+        {"shape":"InvalidParameterValueException"}
+      ],
+      "documentation":"<p>Global Datastore for Redis offers fully managed, fast, reliable and secure cross-region replication. Using Global Datastore for Redis, you can create cross-region read replica clusters for ElastiCache for Redis to enable low-latency reads and disaster recovery across regions. For more information, see <a href=\"/AmazonElastiCache/latest/red-ug/Redis-Global-Clusters.html\">Replication Across Regions Using Global Datastore</a>. </p> <ul> <li> <p>The <b>GlobalReplicationGroupId</b> is the name of the Global Datastore.</p> </li> <li> <p>The <b>PrimaryReplicationGroupId</b> represents the name of the primary cluster that accepts writes and will replicate updates to the secondary cluster.</p> </li> </ul>"
+    },
     "CreateReplicationGroup":{
       "name":"CreateReplicationGroup",
       "http":{
@@ -235,10 +255,12 @@
         {"shape":"InvalidVPCNetworkStateFault"},
         {"shape":"TagQuotaPerResourceExceeded"},
         {"shape":"NodeGroupsPerReplicationGroupQuotaExceededFault"},
+        {"shape":"GlobalReplicationGroupNotFoundFault"},
+        {"shape":"InvalidGlobalReplicationGroupStateFault"},
         {"shape":"InvalidParameterValueException"},
         {"shape":"InvalidParameterCombinationException"}
       ],
-      "documentation":"<p>Creates a Redis (cluster mode disabled) or a Redis (cluster mode enabled) replication group.</p> <p>A Redis (cluster mode disabled) replication group is a collection of clusters, where one of the clusters is a read/write primary and the others are read-only replicas. Writes to the primary are asynchronously propagated to the replicas.</p> <p>A Redis (cluster mode enabled) replication group is a collection of 1 to 90 node groups (shards). Each node group (shard) has one read/write primary node and up to 5 read-only replica nodes. Writes to the primary are asynchronously propagated to the replicas. Redis (cluster mode enabled) replication groups partition the data across node groups (shards).</p> <p>When a Redis (cluster mode disabled) replication group has been successfully created, you can add one or more read replicas to it, up to a total of 5 read replicas. You cannot alter a Redis (cluster mode enabled) replication group after it has been created. However, if you need to increase or decrease the number of node groups (console: shards), you can avail yourself of ElastiCache for Redis' enhanced backup and restore. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonElastiCache/latest/red-ug/backups-restoring.html\">Restoring From a Backup with Cluster Resizing</a> in the <i>ElastiCache User Guide</i>.</p> <note> <p>This operation is valid for Redis only.</p> </note>"
+      "documentation":"<p>Creates a Redis (cluster mode disabled) or a Redis (cluster mode enabled) replication group.</p> <p>This API can be used to create a standalone regional replication group or a secondary replication group associated with a Global Datastore.</p> <p>A Redis (cluster mode disabled) replication group is a collection of clusters, where one of the clusters is a read/write primary and the others are read-only replicas. Writes to the primary are asynchronously propagated to the replicas.</p> <p>A Redis (cluster mode enabled) replication group is a collection of 1 to 90 node groups (shards). Each node group (shard) has one read/write primary node and up to 5 read-only replica nodes. Writes to the primary are asynchronously propagated to the replicas. Redis (cluster mode enabled) replication groups partition the data across node groups (shards).</p> <p>When a Redis (cluster mode disabled) replication group has been successfully created, you can add one or more read replicas to it, up to a total of 5 read replicas. You cannot alter a Redis (cluster mode enabled) replication group after it has been created. However, if you need to increase or decrease the number of node groups (console: shards), you can avail yourself of ElastiCache for Redis' enhanced backup and restore. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonElastiCache/latest/red-ug/backups-restoring.html\">Restoring From a Backup with Cluster Resizing</a> in the <i>ElastiCache User Guide</i>.</p> <note> <p>This operation is valid for Redis only.</p> </note>"
     },
     "CreateSnapshot":{
       "name":"CreateSnapshot",
@@ -264,6 +286,25 @@
       ],
       "documentation":"<p>Creates a copy of an entire cluster or replication group at a specific moment in time.</p> <note> <p>This operation is valid for Redis only.</p> </note>"
     },
+    "DecreaseNodeGroupsInGlobalReplicationGroup":{
+      "name":"DecreaseNodeGroupsInGlobalReplicationGroup",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DecreaseNodeGroupsInGlobalReplicationGroupMessage"},
+      "output":{
+        "shape":"DecreaseNodeGroupsInGlobalReplicationGroupResult",
+        "resultWrapper":"DecreaseNodeGroupsInGlobalReplicationGroupResult"
+      },
+      "errors":[
+        {"shape":"GlobalReplicationGroupNotFoundFault"},
+        {"shape":"InvalidGlobalReplicationGroupStateFault"},
+        {"shape":"InvalidParameterValueException"},
+        {"shape":"InvalidParameterCombinationException"}
+      ],
+      "documentation":"<p>Decreases the number of node groups in a Global Datastore</p>"
+    },
     "DecreaseReplicaCount":{
       "name":"DecreaseReplicaCount",
       "http":{
@@ -289,7 +330,7 @@
         {"shape":"InvalidParameterValueException"},
         {"shape":"InvalidParameterCombinationException"}
       ],
-      "documentation":"<p>Dynamically decreases the number of replics in a Redis (cluster mode disabled) replication group or the number of replica nodes in one or more node groups (shards) of a Redis (cluster mode enabled) replication group. This operation is performed with no cluster down time.</p>"
+      "documentation":"<p>Dynamically decreases the number of replicas in a Redis (cluster mode disabled) replication group or the number of replica nodes in one or more node groups (shards) of a Redis (cluster mode enabled) replication group. This operation is performed with no cluster down time.</p>"
     },
     "DeleteCacheCluster":{
       "name":"DeleteCacheCluster",
@@ -356,6 +397,24 @@
       ],
       "documentation":"<p>Deletes a cache subnet group.</p> <note> <p>You cannot delete a cache subnet group if it is associated with any clusters.</p> </note>"
     },
+    "DeleteGlobalReplicationGroup":{
+      "name":"DeleteGlobalReplicationGroup",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DeleteGlobalReplicationGroupMessage"},
+      "output":{
+        "shape":"DeleteGlobalReplicationGroupResult",
+        "resultWrapper":"DeleteGlobalReplicationGroupResult"
+      },
+      "errors":[
+        {"shape":"GlobalReplicationGroupNotFoundFault"},
+        {"shape":"InvalidGlobalReplicationGroupStateFault"},
+        {"shape":"InvalidParameterValueException"}
+      ],
+      "documentation":"<p>Deleting a Global Datastore is a two-step process: </p> <ul> <li> <p>First, you must <a>DisassociateGlobalReplicationGroup</a> to remove the secondary clusters in the Global Datastore.</p> </li> <li> <p>Once the Global Datastore contains only the primary cluster, you can use DeleteGlobalReplicationGroup API to delete the Global Datastore while retainining the primary cluster using Retain…= true.</p> </li> </ul> <p>Since the Global Datastore has only a primary cluster, you can delete the Global Datastore while retaining the primary by setting <code>RetainPrimaryCluster=true</code>.</p> <p>When you receive a successful response from this operation, Amazon ElastiCache immediately begins deleting the selected resources; you cannot cancel or revert this operation.</p> <note> <p>This operation is valid for Redis only.</p> </note>"
+    },
     "DeleteReplicationGroup":{
       "name":"DeleteReplicationGroup",
       "http":{
@@ -532,6 +591,24 @@
       ],
       "documentation":"<p>Returns events related to clusters, cache security groups, and cache parameter groups. You can obtain events specific to a particular cluster, cache security group, or cache parameter group by providing the name as a parameter.</p> <p>By default, only the events occurring within the last hour are returned; however, you can retrieve up to 14 days' worth of events if necessary.</p>"
     },
+    "DescribeGlobalReplicationGroups":{
+      "name":"DescribeGlobalReplicationGroups",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DescribeGlobalReplicationGroupsMessage"},
+      "output":{
+        "shape":"DescribeGlobalReplicationGroupsResult",
+        "resultWrapper":"DescribeGlobalReplicationGroupsResult"
+      },
+      "errors":[
+        {"shape":"GlobalReplicationGroupNotFoundFault"},
+        {"shape":"InvalidParameterValueException"},
+        {"shape":"InvalidParameterCombinationException"}
+      ],
+      "documentation":"<p>Returns information about a particular global replication group. If no identifier is specified, returns information about all Global Datastores. </p>"
+    },
     "DescribeReplicationGroups":{
       "name":"DescribeReplicationGroups",
       "http":{
@@ -640,6 +717,62 @@
       ],
       "documentation":"<p>Returns details of the update actions </p>"
     },
+    "DisassociateGlobalReplicationGroup":{
+      "name":"DisassociateGlobalReplicationGroup",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DisassociateGlobalReplicationGroupMessage"},
+      "output":{
+        "shape":"DisassociateGlobalReplicationGroupResult",
+        "resultWrapper":"DisassociateGlobalReplicationGroupResult"
+      },
+      "errors":[
+        {"shape":"GlobalReplicationGroupNotFoundFault"},
+        {"shape":"InvalidGlobalReplicationGroupStateFault"},
+        {"shape":"InvalidParameterValueException"},
+        {"shape":"InvalidParameterCombinationException"}
+      ],
+      "documentation":"<p>Remove a secondary cluster from the Global Datastore using the Global Datastore name. The secondary cluster will no longer receive updates from the primary cluster, but will remain as a standalone cluster in that AWS region.</p>"
+    },
+    "FailoverGlobalReplicationGroup":{
+      "name":"FailoverGlobalReplicationGroup",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"FailoverGlobalReplicationGroupMessage"},
+      "output":{
+        "shape":"FailoverGlobalReplicationGroupResult",
+        "resultWrapper":"FailoverGlobalReplicationGroupResult"
+      },
+      "errors":[
+        {"shape":"GlobalReplicationGroupNotFoundFault"},
+        {"shape":"InvalidGlobalReplicationGroupStateFault"},
+        {"shape":"InvalidParameterValueException"},
+        {"shape":"InvalidParameterCombinationException"}
+      ],
+      "documentation":"<p>Used to failover the primary region to a selected secondary region.</p>"
+    },
+    "IncreaseNodeGroupsInGlobalReplicationGroup":{
+      "name":"IncreaseNodeGroupsInGlobalReplicationGroup",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"IncreaseNodeGroupsInGlobalReplicationGroupMessage"},
+      "output":{
+        "shape":"IncreaseNodeGroupsInGlobalReplicationGroupResult",
+        "resultWrapper":"IncreaseNodeGroupsInGlobalReplicationGroupResult"
+      },
+      "errors":[
+        {"shape":"GlobalReplicationGroupNotFoundFault"},
+        {"shape":"InvalidGlobalReplicationGroupStateFault"},
+        {"shape":"InvalidParameterValueException"}
+      ],
+      "documentation":"<p>Increase the number of node groups in the Global Datastore</p>"
+    },
     "IncreaseReplicaCount":{
       "name":"IncreaseReplicaCount",
       "http":{
@@ -745,7 +878,8 @@
         {"shape":"CacheParameterGroupNotFoundFault"},
         {"shape":"InvalidCacheParameterGroupStateFault"},
         {"shape":"InvalidParameterValueException"},
-        {"shape":"InvalidParameterCombinationException"}
+        {"shape":"InvalidParameterCombinationException"},
+        {"shape":"InvalidGlobalReplicationGroupStateFault"}
       ],
       "documentation":"<p>Modifies the parameters of a cache parameter group. You can modify up to 20 parameters in a single request by submitting a list parameter name and value pairs.</p>"
     },
@@ -768,6 +902,24 @@
       ],
       "documentation":"<p>Modifies an existing cache subnet group.</p>"
     },
+    "ModifyGlobalReplicationGroup":{
+      "name":"ModifyGlobalReplicationGroup",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"ModifyGlobalReplicationGroupMessage"},
+      "output":{
+        "shape":"ModifyGlobalReplicationGroupResult",
+        "resultWrapper":"ModifyGlobalReplicationGroupResult"
+      },
+      "errors":[
+        {"shape":"GlobalReplicationGroupNotFoundFault"},
+        {"shape":"InvalidGlobalReplicationGroupStateFault"},
+        {"shape":"InvalidParameterValueException"}
+      ],
+      "documentation":"<p>Modifies the settings for a Global Datastore.</p>"
+    },
     "ModifyReplicationGroup":{
       "name":"ModifyReplicationGroup",
       "http":{
@@ -842,6 +994,24 @@
       ],
       "documentation":"<p>Allows you to purchase a reserved cache node offering.</p>"
     },
+    "RebalanceSlotsInGlobalReplicationGroup":{
+      "name":"RebalanceSlotsInGlobalReplicationGroup",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"RebalanceSlotsInGlobalReplicationGroupMessage"},
+      "output":{
+        "shape":"RebalanceSlotsInGlobalReplicationGroupResult",
+        "resultWrapper":"RebalanceSlotsInGlobalReplicationGroupResult"
+      },
+      "errors":[
+        {"shape":"GlobalReplicationGroupNotFoundFault"},
+        {"shape":"InvalidGlobalReplicationGroupStateFault"},
+        {"shape":"InvalidParameterValueException"}
+      ],
+      "documentation":"<p>Redistribute slots to ensure unifirom distribution across existing shards in the cluster.</p>"
+    },
     "RebootCacheCluster":{
       "name":"RebootCacheCluster",
       "http":{
@@ -893,7 +1063,8 @@
         {"shape":"InvalidCacheParameterGroupStateFault"},
         {"shape":"CacheParameterGroupNotFoundFault"},
         {"shape":"InvalidParameterValueException"},
-        {"shape":"InvalidParameterCombinationException"}
+        {"shape":"InvalidParameterCombinationException"},
+        {"shape":"InvalidGlobalReplicationGroupStateFault"}
       ],
       "documentation":"<p>Modifies the parameters of a cache parameter group to the engine or system default value. You can reset specific parameters by submitting a list of parameter names. To reset the entire cache parameter group, specify the <code>ResetAllParameters</code> and <code>CacheParameterGroupName</code> parameters.</p>"
     },
@@ -1014,7 +1185,7 @@
         },
         "ScaleDownModifications":{
           "shape":"NodeTypeList",
-          "documentation":"<p>A string list, each element of which specifies a cache node type which you can use to scale your cluster or replication group.</p> <p>When scaling down on a Redis cluster or replication group using <code>ModifyCacheCluster</code> or <code>ModifyReplicationGroup</code>, use a value from this list for the <code>CacheNodeType</code> parameter.</p>"
+          "documentation":"<p>A string list, each element of which specifies a cache node type which you can use to scale your cluster or replication group. When scaling down a Redis cluster or replication group using ModifyCacheCluster or ModifyReplicationGroup, use a value from this list for the CacheNodeType parameter. </p>"
         }
       },
       "documentation":"<p>Represents the allowed node types you can use to modify your cluster or replication group.</p>"
@@ -1169,7 +1340,7 @@
         },
         "CacheNodeType":{
           "shape":"String",
-          "documentation":"<p>The name of the compute and memory capacity node type for the cluster.</p> <p>The following node types are supported by ElastiCache. Generally speaking, the current generation types provide more memory and computational power at lower cost when compared to their equivalent previous generation counterparts.</p> <ul> <li> <p>General purpose:</p> <ul> <li> <p>Current generation: </p> <p> <b>M5 node types:</b> <code>cache.m5.large</code>, <code>cache.m5.xlarge</code>, <code>cache.m5.2xlarge</code>, <code>cache.m5.4xlarge</code>, <code>cache.m5.12xlarge</code>, <code>cache.m5.24xlarge</code> </p> <p> <b>M4 node types:</b> <code>cache.m4.large</code>, <code>cache.m4.xlarge</code>, <code>cache.m4.2xlarge</code>, <code>cache.m4.4xlarge</code>, <code>cache.m4.10xlarge</code> </p> <p> <b>T2 node types:</b> <code>cache.t2.micro</code>, <code>cache.t2.small</code>, <code>cache.t2.medium</code> </p> </li> <li> <p>Previous generation: (not recommended)</p> <p> <b>T1 node types:</b> <code>cache.t1.micro</code> </p> <p> <b>M1 node types:</b> <code>cache.m1.small</code>, <code>cache.m1.medium</code>, <code>cache.m1.large</code>, <code>cache.m1.xlarge</code> </p> <p> <b>M3 node types:</b> <code>cache.m3.medium</code>, <code>cache.m3.large</code>, <code>cache.m3.xlarge</code>, <code>cache.m3.2xlarge</code> </p> </li> </ul> </li> <li> <p>Compute optimized:</p> <ul> <li> <p>Previous generation: (not recommended)</p> <p> <b>C1 node types:</b> <code>cache.c1.xlarge</code> </p> </li> </ul> </li> <li> <p>Memory optimized:</p> <ul> <li> <p>Current generation: </p> <p> <b>R5 node types:</b> <code>cache.r5.large</code>, <code>cache.r5.xlarge</code>, <code>cache.r5.2xlarge</code>, <code>cache.r5.4xlarge</code>, <code>cache.r5.12xlarge</code>, <code>cache.r5.24xlarge</code> </p> <p> <b>R4 node types:</b> <code>cache.r4.large</code>, <code>cache.r4.xlarge</code>, <code>cache.r4.2xlarge</code>, <code>cache.r4.4xlarge</code>, <code>cache.r4.8xlarge</code>, <code>cache.r4.16xlarge</code> </p> </li> <li> <p>Previous generation: (not recommended)</p> <p> <b>M2 node types:</b> <code>cache.m2.xlarge</code>, <code>cache.m2.2xlarge</code>, <code>cache.m2.4xlarge</code> </p> <p> <b>R3 node types:</b> <code>cache.r3.large</code>, <code>cache.r3.xlarge</code>, <code>cache.r3.2xlarge</code>, <code>cache.r3.4xlarge</code>, <code>cache.r3.8xlarge</code> </p> </li> </ul> </li> </ul> <p> <b>Additional node type info</b> </p> <ul> <li> <p>All current generation instance types are created in Amazon VPC by default.</p> </li> <li> <p>Redis append-only files (AOF) are not supported for T1 or T2 instances.</p> </li> <li> <p>Redis Multi-AZ with automatic failover is not supported on T1 instances.</p> </li> <li> <p>Redis configuration variables <code>appendonly</code> and <code>appendfsync</code> are not supported on Redis version 2.8.22 and later.</p> </li> </ul>"
+          "documentation":"<p>The name of the compute and memory capacity node type for the cluster.</p> <p>The following node types are supported by ElastiCache. Generally speaking, the current generation types provide more memory and computational power at lower cost when compared to their equivalent previous generation counterparts.</p> <ul> <li> <p>General purpose:</p> <ul> <li> <p>Current generation: </p> <p> <b>M5 node types:</b> <code>cache.m5.large</code>, <code>cache.m5.xlarge</code>, <code>cache.m5.2xlarge</code>, <code>cache.m5.4xlarge</code>, <code>cache.m5.12xlarge</code>, <code>cache.m5.24xlarge</code> </p> <p> <b>M4 node types:</b> <code>cache.m4.large</code>, <code>cache.m4.xlarge</code>, <code>cache.m4.2xlarge</code>, <code>cache.m4.4xlarge</code>, <code>cache.m4.10xlarge</code> </p> <p> <b>T3 node types:</b> <code>cache.t3.micro</code>, <code>cache.t3.small</code>, <code>cache.t3.medium</code> </p> <p> <b>T2 node types:</b> <code>cache.t2.micro</code>, <code>cache.t2.small</code>, <code>cache.t2.medium</code> </p> </li> <li> <p>Previous generation: (not recommended)</p> <p> <b>T1 node types:</b> <code>cache.t1.micro</code> </p> <p> <b>M1 node types:</b> <code>cache.m1.small</code>, <code>cache.m1.medium</code>, <code>cache.m1.large</code>, <code>cache.m1.xlarge</code> </p> <p> <b>M3 node types:</b> <code>cache.m3.medium</code>, <code>cache.m3.large</code>, <code>cache.m3.xlarge</code>, <code>cache.m3.2xlarge</code> </p> </li> </ul> </li> <li> <p>Compute optimized:</p> <ul> <li> <p>Previous generation: (not recommended)</p> <p> <b>C1 node types:</b> <code>cache.c1.xlarge</code> </p> </li> </ul> </li> <li> <p>Memory optimized:</p> <ul> <li> <p>Current generation: </p> <p> <b>R5 node types:</b> <code>cache.r5.large</code>, <code>cache.r5.xlarge</code>, <code>cache.r5.2xlarge</code>, <code>cache.r5.4xlarge</code>, <code>cache.r5.12xlarge</code>, <code>cache.r5.24xlarge</code> </p> <p> <b>R4 node types:</b> <code>cache.r4.large</code>, <code>cache.r4.xlarge</code>, <code>cache.r4.2xlarge</code>, <code>cache.r4.4xlarge</code>, <code>cache.r4.8xlarge</code>, <code>cache.r4.16xlarge</code> </p> </li> <li> <p>Previous generation: (not recommended)</p> <p> <b>M2 node types:</b> <code>cache.m2.xlarge</code>, <code>cache.m2.2xlarge</code>, <code>cache.m2.4xlarge</code> </p> <p> <b>R3 node types:</b> <code>cache.r3.large</code>, <code>cache.r3.xlarge</code>, <code>cache.r3.2xlarge</code>, <code>cache.r3.4xlarge</code>, <code>cache.r3.8xlarge</code> </p> </li> </ul> </li> </ul> <p> <b>Additional node type info</b> </p> <ul> <li> <p>All current generation instance types are created in Amazon VPC by default.</p> </li> <li> <p>Redis append-only files (AOF) are not supported for T1 or T2 instances.</p> </li> <li> <p>Redis Multi-AZ with automatic failover is not supported on T1 instances.</p> </li> <li> <p>Redis configuration variables <code>appendonly</code> and <code>appendfsync</code> are not supported on Redis version 2.8.22 and later.</p> </li> </ul>"
         },
         "Engine":{
           "shape":"String",
@@ -1366,7 +1537,7 @@
         },
         "CacheNodeStatus":{
           "shape":"String",
-          "documentation":"<p>The current state of this cache node.</p>"
+          "documentation":"<p>The current state of this cache node, one of the following values: <code>available</code>, <code>creating</code>, <code>rebooting</code>, or <code>deleting</code>.</p>"
         },
         "CacheNodeCreateTime":{
           "shape":"TStamp",
@@ -1389,7 +1560,7 @@
           "documentation":"<p>The Availability Zone where this node was created and now resides.</p>"
         }
       },
-      "documentation":"<p>Represents an individual cache node within a cluster. Each cache node runs its own instance of the cluster's protocol-compliant caching software - either Memcached or Redis.</p> <p>The following node types are supported by ElastiCache. Generally speaking, the current generation types provide more memory and computational power at lower cost when compared to their equivalent previous generation counterparts.</p> <ul> <li> <p>General purpose:</p> <ul> <li> <p>Current generation: </p> <p> <b>M5 node types:</b> <code>cache.m5.large</code>, <code>cache.m5.xlarge</code>, <code>cache.m5.2xlarge</code>, <code>cache.m5.4xlarge</code>, <code>cache.m5.12xlarge</code>, <code>cache.m5.24xlarge</code> </p> <p> <b>M4 node types:</b> <code>cache.m4.large</code>, <code>cache.m4.xlarge</code>, <code>cache.m4.2xlarge</code>, <code>cache.m4.4xlarge</code>, <code>cache.m4.10xlarge</code> </p> <p> <b>T2 node types:</b> <code>cache.t2.micro</code>, <code>cache.t2.small</code>, <code>cache.t2.medium</code> </p> </li> <li> <p>Previous generation: (not recommended)</p> <p> <b>T1 node types:</b> <code>cache.t1.micro</code> </p> <p> <b>M1 node types:</b> <code>cache.m1.small</code>, <code>cache.m1.medium</code>, <code>cache.m1.large</code>, <code>cache.m1.xlarge</code> </p> <p> <b>M3 node types:</b> <code>cache.m3.medium</code>, <code>cache.m3.large</code>, <code>cache.m3.xlarge</code>, <code>cache.m3.2xlarge</code> </p> </li> </ul> </li> <li> <p>Compute optimized:</p> <ul> <li> <p>Previous generation: (not recommended)</p> <p> <b>C1 node types:</b> <code>cache.c1.xlarge</code> </p> </li> </ul> </li> <li> <p>Memory optimized:</p> <ul> <li> <p>Current generation: </p> <p> <b>R5 node types:</b> <code>cache.r5.large</code>, <code>cache.r5.xlarge</code>, <code>cache.r5.2xlarge</code>, <code>cache.r5.4xlarge</code>, <code>cache.r5.12xlarge</code>, <code>cache.r5.24xlarge</code> </p> <p> <b>R4 node types:</b> <code>cache.r4.large</code>, <code>cache.r4.xlarge</code>, <code>cache.r4.2xlarge</code>, <code>cache.r4.4xlarge</code>, <code>cache.r4.8xlarge</code>, <code>cache.r4.16xlarge</code> </p> </li> <li> <p>Previous generation: (not recommended)</p> <p> <b>M2 node types:</b> <code>cache.m2.xlarge</code>, <code>cache.m2.2xlarge</code>, <code>cache.m2.4xlarge</code> </p> <p> <b>R3 node types:</b> <code>cache.r3.large</code>, <code>cache.r3.xlarge</code>, <code>cache.r3.2xlarge</code>, <code>cache.r3.4xlarge</code>, <code>cache.r3.8xlarge</code> </p> </li> </ul> </li> </ul> <p> <b>Additional node type info</b> </p> <ul> <li> <p>All current generation instance types are created in Amazon VPC by default.</p> </li> <li> <p>Redis append-only files (AOF) are not supported for T1 or T2 instances.</p> </li> <li> <p>Redis Multi-AZ with automatic failover is not supported on T1 instances.</p> </li> <li> <p>Redis configuration variables <code>appendonly</code> and <code>appendfsync</code> are not supported on Redis version 2.8.22 and later.</p> </li> </ul>"
+      "documentation":"<p>Represents an individual cache node within a cluster. Each cache node runs its own instance of the cluster's protocol-compliant caching software - either Memcached or Redis.</p> <p>The following node types are supported by ElastiCache. Generally speaking, the current generation types provide more memory and computational power at lower cost when compared to their equivalent previous generation counterparts.</p> <ul> <li> <p>General purpose:</p> <ul> <li> <p>Current generation: </p> <p> <b>M5 node types:</b> <code>cache.m5.large</code>, <code>cache.m5.xlarge</code>, <code>cache.m5.2xlarge</code>, <code>cache.m5.4xlarge</code>, <code>cache.m5.12xlarge</code>, <code>cache.m5.24xlarge</code> </p> <p> <b>M4 node types:</b> <code>cache.m4.large</code>, <code>cache.m4.xlarge</code>, <code>cache.m4.2xlarge</code>, <code>cache.m4.4xlarge</code>, <code>cache.m4.10xlarge</code> </p> <p> <b>T3 node types:</b> <code>cache.t3.micro</code>, <code>cache.t3.small</code>, <code>cache.t3.medium</code> </p> <p> <b>T2 node types:</b> <code>cache.t2.micro</code>, <code>cache.t2.small</code>, <code>cache.t2.medium</code> </p> </li> <li> <p>Previous generation: (not recommended)</p> <p> <b>T1 node types:</b> <code>cache.t1.micro</code> </p> <p> <b>M1 node types:</b> <code>cache.m1.small</code>, <code>cache.m1.medium</code>, <code>cache.m1.large</code>, <code>cache.m1.xlarge</code> </p> <p> <b>M3 node types:</b> <code>cache.m3.medium</code>, <code>cache.m3.large</code>, <code>cache.m3.xlarge</code>, <code>cache.m3.2xlarge</code> </p> </li> </ul> </li> <li> <p>Compute optimized:</p> <ul> <li> <p>Previous generation: (not recommended)</p> <p> <b>C1 node types:</b> <code>cache.c1.xlarge</code> </p> </li> </ul> </li> <li> <p>Memory optimized:</p> <ul> <li> <p>Current generation: </p> <p> <b>R5 node types:</b> <code>cache.r5.large</code>, <code>cache.r5.xlarge</code>, <code>cache.r5.2xlarge</code>, <code>cache.r5.4xlarge</code>, <code>cache.r5.12xlarge</code>, <code>cache.r5.24xlarge</code> </p> <p> <b>R4 node types:</b> <code>cache.r4.large</code>, <code>cache.r4.xlarge</code>, <code>cache.r4.2xlarge</code>, <code>cache.r4.4xlarge</code>, <code>cache.r4.8xlarge</code>, <code>cache.r4.16xlarge</code> </p> </li> <li> <p>Previous generation: (not recommended)</p> <p> <b>M2 node types:</b> <code>cache.m2.xlarge</code>, <code>cache.m2.2xlarge</code>, <code>cache.m2.4xlarge</code> </p> <p> <b>R3 node types:</b> <code>cache.r3.large</code>, <code>cache.r3.xlarge</code>, <code>cache.r3.2xlarge</code>, <code>cache.r3.4xlarge</code>, <code>cache.r3.8xlarge</code> </p> </li> </ul> </li> </ul> <p> <b>Additional node type info</b> </p> <ul> <li> <p>All current generation instance types are created in Amazon VPC by default.</p> </li> <li> <p>Redis append-only files (AOF) are not supported for T1 or T2 instances.</p> </li> <li> <p>Redis Multi-AZ with automatic failover is not supported on T1 instances.</p> </li> <li> <p>Redis configuration variables <code>appendonly</code> and <code>appendfsync</code> are not supported on Redis version 2.8.22 and later.</p> </li> </ul>"
     },
     "CacheNodeIdsList":{
       "type":"list",
@@ -1534,6 +1705,10 @@
         "Description":{
           "shape":"String",
           "documentation":"<p>The description for this cache parameter group.</p>"
+        },
+        "IsGlobal":{
+          "shape":"Boolean",
+          "documentation":"<p>Indicates whether the parameter group is associated with a Global Datastore</p>"
         }
       },
       "documentation":"<p>Represents the output of a <code>CreateCacheParameterGroup</code> operation.</p>",
@@ -1984,7 +2159,7 @@
         },
         "CacheNodeType":{
           "shape":"String",
-          "documentation":"<p>The compute and memory capacity of the nodes in the node group (shard).</p> <p>The following node types are supported by ElastiCache. Generally speaking, the current generation types provide more memory and computational power at lower cost when compared to their equivalent previous generation counterparts.</p> <ul> <li> <p>General purpose:</p> <ul> <li> <p>Current generation: </p> <p> <b>M5 node types:</b> <code>cache.m5.large</code>, <code>cache.m5.xlarge</code>, <code>cache.m5.2xlarge</code>, <code>cache.m5.4xlarge</code>, <code>cache.m5.12xlarge</code>, <code>cache.m5.24xlarge</code> </p> <p> <b>M4 node types:</b> <code>cache.m4.large</code>, <code>cache.m4.xlarge</code>, <code>cache.m4.2xlarge</code>, <code>cache.m4.4xlarge</code>, <code>cache.m4.10xlarge</code> </p> <p> <b>T2 node types:</b> <code>cache.t2.micro</code>, <code>cache.t2.small</code>, <code>cache.t2.medium</code> </p> </li> <li> <p>Previous generation: (not recommended)</p> <p> <b>T1 node types:</b> <code>cache.t1.micro</code> </p> <p> <b>M1 node types:</b> <code>cache.m1.small</code>, <code>cache.m1.medium</code>, <code>cache.m1.large</code>, <code>cache.m1.xlarge</code> </p> <p> <b>M3 node types:</b> <code>cache.m3.medium</code>, <code>cache.m3.large</code>, <code>cache.m3.xlarge</code>, <code>cache.m3.2xlarge</code> </p> </li> </ul> </li> <li> <p>Compute optimized:</p> <ul> <li> <p>Previous generation: (not recommended)</p> <p> <b>C1 node types:</b> <code>cache.c1.xlarge</code> </p> </li> </ul> </li> <li> <p>Memory optimized:</p> <ul> <li> <p>Current generation: </p> <p> <b>R5 node types:</b> <code>cache.r5.large</code>, <code>cache.r5.xlarge</code>, <code>cache.r5.2xlarge</code>, <code>cache.r5.4xlarge</code>, <code>cache.r5.12xlarge</code>, <code>cache.r5.24xlarge</code> </p> <p> <b>R4 node types:</b> <code>cache.r4.large</code>, <code>cache.r4.xlarge</code>, <code>cache.r4.2xlarge</code>, <code>cache.r4.4xlarge</code>, <code>cache.r4.8xlarge</code>, <code>cache.r4.16xlarge</code> </p> </li> <li> <p>Previous generation: (not recommended)</p> <p> <b>M2 node types:</b> <code>cache.m2.xlarge</code>, <code>cache.m2.2xlarge</code>, <code>cache.m2.4xlarge</code> </p> <p> <b>R3 node types:</b> <code>cache.r3.large</code>, <code>cache.r3.xlarge</code>, <code>cache.r3.2xlarge</code>, <code>cache.r3.4xlarge</code>, <code>cache.r3.8xlarge</code> </p> </li> </ul> </li> </ul> <p> <b>Additional node type info</b> </p> <ul> <li> <p>All current generation instance types are created in Amazon VPC by default.</p> </li> <li> <p>Redis append-only files (AOF) are not supported for T1 or T2 instances.</p> </li> <li> <p>Redis Multi-AZ with automatic failover is not supported on T1 instances.</p> </li> <li> <p>Redis configuration variables <code>appendonly</code> and <code>appendfsync</code> are not supported on Redis version 2.8.22 and later.</p> </li> </ul>"
+          "documentation":"<p>The compute and memory capacity of the nodes in the node group (shard).</p> <p>The following node types are supported by ElastiCache. Generally speaking, the current generation types provide more memory and computational power at lower cost when compared to their equivalent previous generation counterparts.</p> <ul> <li> <p>General purpose:</p> <ul> <li> <p>Current generation: </p> <p> <b>M5 node types:</b> <code>cache.m5.large</code>, <code>cache.m5.xlarge</code>, <code>cache.m5.2xlarge</code>, <code>cache.m5.4xlarge</code>, <code>cache.m5.12xlarge</code>, <code>cache.m5.24xlarge</code> </p> <p> <b>M4 node types:</b> <code>cache.m4.large</code>, <code>cache.m4.xlarge</code>, <code>cache.m4.2xlarge</code>, <code>cache.m4.4xlarge</code>, <code>cache.m4.10xlarge</code> </p> <p> <b>T3 node types:</b> <code>cache.t3.micro</code>, <code>cache.t3.small</code>, <code>cache.t3.medium</code> </p> <p> <b>T2 node types:</b> <code>cache.t2.micro</code>, <code>cache.t2.small</code>, <code>cache.t2.medium</code> </p> </li> <li> <p>Previous generation: (not recommended)</p> <p> <b>T1 node types:</b> <code>cache.t1.micro</code> </p> <p> <b>M1 node types:</b> <code>cache.m1.small</code>, <code>cache.m1.medium</code>, <code>cache.m1.large</code>, <code>cache.m1.xlarge</code> </p> <p> <b>M3 node types:</b> <code>cache.m3.medium</code>, <code>cache.m3.large</code>, <code>cache.m3.xlarge</code>, <code>cache.m3.2xlarge</code> </p> </li> </ul> </li> <li> <p>Compute optimized:</p> <ul> <li> <p>Previous generation: (not recommended)</p> <p> <b>C1 node types:</b> <code>cache.c1.xlarge</code> </p> </li> </ul> </li> <li> <p>Memory optimized:</p> <ul> <li> <p>Current generation: </p> <p> <b>R5 node types:</b> <code>cache.r5.large</code>, <code>cache.r5.xlarge</code>, <code>cache.r5.2xlarge</code>, <code>cache.r5.4xlarge</code>, <code>cache.r5.12xlarge</code>, <code>cache.r5.24xlarge</code> </p> <p> <b>R4 node types:</b> <code>cache.r4.large</code>, <code>cache.r4.xlarge</code>, <code>cache.r4.2xlarge</code>, <code>cache.r4.4xlarge</code>, <code>cache.r4.8xlarge</code>, <code>cache.r4.16xlarge</code> </p> </li> <li> <p>Previous generation: (not recommended)</p> <p> <b>M2 node types:</b> <code>cache.m2.xlarge</code>, <code>cache.m2.2xlarge</code>, <code>cache.m2.4xlarge</code> </p> <p> <b>R3 node types:</b> <code>cache.r3.large</code>, <code>cache.r3.xlarge</code>, <code>cache.r3.2xlarge</code>, <code>cache.r3.4xlarge</code>, <code>cache.r3.8xlarge</code> </p> </li> </ul> </li> </ul> <p> <b>Additional node type info</b> </p> <ul> <li> <p>All current generation instance types are created in Amazon VPC by default.</p> </li> <li> <p>Redis append-only files (AOF) are not supported for T1 or T2 instances.</p> </li> <li> <p>Redis Multi-AZ with automatic failover is not supported on T1 instances.</p> </li> <li> <p>Redis configuration variables <code>appendonly</code> and <code>appendfsync</code> are not supported on Redis version 2.8.22 and later.</p> </li> </ul>"
         },
         "Engine":{
           "shape":"String",
@@ -2141,6 +2316,33 @@
         "CacheSubnetGroup":{"shape":"CacheSubnetGroup"}
       }
     },
+    "CreateGlobalReplicationGroupMessage":{
+      "type":"structure",
+      "required":[
+        "GlobalReplicationGroupIdSuffix",
+        "PrimaryReplicationGroupId"
+      ],
+      "members":{
+        "GlobalReplicationGroupIdSuffix":{
+          "shape":"String",
+          "documentation":"<p>The suffix for name of a Global Datastore. The suffix guarantees uniqueness of the Global Datastore name across multiple regions.</p>"
+        },
+        "GlobalReplicationGroupDescription":{
+          "shape":"String",
+          "documentation":"<p>Provides details of the Global Datastore</p>"
+        },
+        "PrimaryReplicationGroupId":{
+          "shape":"String",
+          "documentation":"<p>The name of the primary cluster that accepts writes and will replicate updates to the secondary cluster.</p>"
+        }
+      }
+    },
+    "CreateGlobalReplicationGroupResult":{
+      "type":"structure",
+      "members":{
+        "GlobalReplicationGroup":{"shape":"GlobalReplicationGroup"}
+      }
+    },
     "CreateReplicationGroupMessage":{
       "type":"structure",
       "required":[
@@ -2156,6 +2358,10 @@
           "shape":"String",
           "documentation":"<p>A user-created description for the replication group.</p>"
         },
+        "GlobalReplicationGroupId":{
+          "shape":"String",
+          "documentation":"<p>The name of the Global Datastore</p>"
+        },
         "PrimaryClusterId":{
           "shape":"String",
           "documentation":"<p>The identifier of the cluster that serves as the primary for this replication group. This cluster must already exist and have a status of <code>available</code>.</p> <p>This parameter is not required if <code>NumCacheClusters</code>, <code>NumNodeGroups</code>, or <code>ReplicasPerNodeGroup</code> is specified.</p>"
@@ -2186,7 +2392,7 @@
         },
         "CacheNodeType":{
           "shape":"String",
-          "documentation":"<p>The compute and memory capacity of the nodes in the node group (shard).</p> <p>The following node types are supported by ElastiCache. Generally speaking, the current generation types provide more memory and computational power at lower cost when compared to their equivalent previous generation counterparts.</p> <ul> <li> <p>General purpose:</p> <ul> <li> <p>Current generation: </p> <p> <b>M5 node types:</b> <code>cache.m5.large</code>, <code>cache.m5.xlarge</code>, <code>cache.m5.2xlarge</code>, <code>cache.m5.4xlarge</code>, <code>cache.m5.12xlarge</code>, <code>cache.m5.24xlarge</code> </p> <p> <b>M4 node types:</b> <code>cache.m4.large</code>, <code>cache.m4.xlarge</code>, <code>cache.m4.2xlarge</code>, <code>cache.m4.4xlarge</code>, <code>cache.m4.10xlarge</code> </p> <p> <b>T2 node types:</b> <code>cache.t2.micro</code>, <code>cache.t2.small</code>, <code>cache.t2.medium</code> </p> </li> <li> <p>Previous generation: (not recommended)</p> <p> <b>T1 node types:</b> <code>cache.t1.micro</code> </p> <p> <b>M1 node types:</b> <code>cache.m1.small</code>, <code>cache.m1.medium</code>, <code>cache.m1.large</code>, <code>cache.m1.xlarge</code> </p> <p> <b>M3 node types:</b> <code>cache.m3.medium</code>, <code>cache.m3.large</code>, <code>cache.m3.xlarge</code>, <code>cache.m3.2xlarge</code> </p> </li> </ul> </li> <li> <p>Compute optimized:</p> <ul> <li> <p>Previous generation: (not recommended)</p> <p> <b>C1 node types:</b> <code>cache.c1.xlarge</code> </p> </li> </ul> </li> <li> <p>Memory optimized:</p> <ul> <li> <p>Current generation: </p> <p> <b>R5 node types:</b> <code>cache.r5.large</code>, <code>cache.r5.xlarge</code>, <code>cache.r5.2xlarge</code>, <code>cache.r5.4xlarge</code>, <code>cache.r5.12xlarge</code>, <code>cache.r5.24xlarge</code> </p> <p> <b>R4 node types:</b> <code>cache.r4.large</code>, <code>cache.r4.xlarge</code>, <code>cache.r4.2xlarge</code>, <code>cache.r4.4xlarge</code>, <code>cache.r4.8xlarge</code>, <code>cache.r4.16xlarge</code> </p> </li> <li> <p>Previous generation: (not recommended)</p> <p> <b>M2 node types:</b> <code>cache.m2.xlarge</code>, <code>cache.m2.2xlarge</code>, <code>cache.m2.4xlarge</code> </p> <p> <b>R3 node types:</b> <code>cache.r3.large</code>, <code>cache.r3.xlarge</code>, <code>cache.r3.2xlarge</code>, <code>cache.r3.4xlarge</code>, <code>cache.r3.8xlarge</code> </p> </li> </ul> </li> </ul> <p> <b>Additional node type info</b> </p> <ul> <li> <p>All current generation instance types are created in Amazon VPC by default.</p> </li> <li> <p>Redis append-only files (AOF) are not supported for T1 or T2 instances.</p> </li> <li> <p>Redis Multi-AZ with automatic failover is not supported on T1 instances.</p> </li> <li> <p>Redis configuration variables <code>appendonly</code> and <code>appendfsync</code> are not supported on Redis version 2.8.22 and later.</p> </li> </ul>"
+          "documentation":"<p>The compute and memory capacity of the nodes in the node group (shard).</p> <p>The following node types are supported by ElastiCache. Generally speaking, the current generation types provide more memory and computational power at lower cost when compared to their equivalent previous generation counterparts.</p> <ul> <li> <p>General purpose:</p> <ul> <li> <p>Current generation: </p> <p> <b>M5 node types:</b> <code>cache.m5.large</code>, <code>cache.m5.xlarge</code>, <code>cache.m5.2xlarge</code>, <code>cache.m5.4xlarge</code>, <code>cache.m5.12xlarge</code>, <code>cache.m5.24xlarge</code> </p> <p> <b>M4 node types:</b> <code>cache.m4.large</code>, <code>cache.m4.xlarge</code>, <code>cache.m4.2xlarge</code>, <code>cache.m4.4xlarge</code>, <code>cache.m4.10xlarge</code> </p> <p> <b>T3 node types:</b> <code>cache.t3.micro</code>, <code>cache.t3.small</code>, <code>cache.t3.medium</code> </p> <p> <b>T2 node types:</b> <code>cache.t2.micro</code>, <code>cache.t2.small</code>, <code>cache.t2.medium</code> </p> </li> <li> <p>Previous generation: (not recommended)</p> <p> <b>T1 node types:</b> <code>cache.t1.micro</code> </p> <p> <b>M1 node types:</b> <code>cache.m1.small</code>, <code>cache.m1.medium</code>, <code>cache.m1.large</code>, <code>cache.m1.xlarge</code> </p> <p> <b>M3 node types:</b> <code>cache.m3.medium</code>, <code>cache.m3.large</code>, <code>cache.m3.xlarge</code>, <code>cache.m3.2xlarge</code> </p> </li> </ul> </li> <li> <p>Compute optimized:</p> <ul> <li> <p>Previous generation: (not recommended)</p> <p> <b>C1 node types:</b> <code>cache.c1.xlarge</code> </p> </li> </ul> </li> <li> <p>Memory optimized:</p> <ul> <li> <p>Current generation: </p> <p> <b>R5 node types:</b> <code>cache.r5.large</code>, <code>cache.r5.xlarge</code>, <code>cache.r5.2xlarge</code>, <code>cache.r5.4xlarge</code>, <code>cache.r5.12xlarge</code>, <code>cache.r5.24xlarge</code> </p> <p> <b>R4 node types:</b> <code>cache.r4.large</code>, <code>cache.r4.xlarge</code>, <code>cache.r4.2xlarge</code>, <code>cache.r4.4xlarge</code>, <code>cache.r4.8xlarge</code>, <code>cache.r4.16xlarge</code> </p> </li> <li> <p>Previous generation: (not recommended)</p> <p> <b>M2 node types:</b> <code>cache.m2.xlarge</code>, <code>cache.m2.2xlarge</code>, <code>cache.m2.4xlarge</code> </p> <p> <b>R3 node types:</b> <code>cache.r3.large</code>, <code>cache.r3.xlarge</code>, <code>cache.r3.2xlarge</code>, <code>cache.r3.4xlarge</code>, <code>cache.r3.8xlarge</code> </p> </li> </ul> </li> </ul> <p> <b>Additional node type info</b> </p> <ul> <li> <p>All current generation instance types are created in Amazon VPC by default.</p> </li> <li> <p>Redis append-only files (AOF) are not supported for T1 or T2 instances.</p> </li> <li> <p>Redis Multi-AZ with automatic failover is not supported on T1 instances.</p> </li> <li> <p>Redis configuration variables <code>appendonly</code> and <code>appendfsync</code> are not supported on Redis version 2.8.22 and later.</p> </li> </ul>"
         },
         "Engine":{
           "shape":"String",
@@ -2262,7 +2468,7 @@
         },
         "KmsKeyId":{
           "shape":"String",
-          "documentation":"<p>The ID of the KMS key used to encrypt the disk on the cluster.</p>"
+          "documentation":"<p>The ID of the KMS key used to encrypt the disk in the cluster.</p>"
         }
       },
       "documentation":"<p>Represents the input of a <code>CreateReplicationGroup</code> operation.</p>"
@@ -2320,6 +2526,42 @@
       "type":"list",
       "member":{"shape":"CustomerNodeEndpoint"}
     },
+    "DecreaseNodeGroupsInGlobalReplicationGroupMessage":{
+      "type":"structure",
+      "required":[
+        "GlobalReplicationGroupId",
+        "NodeGroupCount",
+        "ApplyImmediately"
+      ],
+      "members":{
+        "GlobalReplicationGroupId":{
+          "shape":"String",
+          "documentation":"<p>The name of the Global Datastore</p>"
+        },
+        "NodeGroupCount":{
+          "shape":"Integer",
+          "documentation":"<p>The number of node groups (shards) that results from the modification of the shard configuration</p>"
+        },
+        "GlobalNodeGroupsToRemove":{
+          "shape":"GlobalNodeGroupIdList",
+          "documentation":"<p>If the value of NodeGroupCount is less than the current number of node groups (shards), then either NodeGroupsToRemove or NodeGroupsToRetain is required. NodeGroupsToRemove is a list of NodeGroupIds to remove from the cluster. ElastiCache for Redis will attempt to remove all node groups listed by NodeGroupsToRemove from the cluster. </p>"
+        },
+        "GlobalNodeGroupsToRetain":{
+          "shape":"GlobalNodeGroupIdList",
+          "documentation":"<p>If the value of NodeGroupCount is less than the current number of node groups (shards), then either NodeGroupsToRemove or NodeGroupsToRetain is required. NodeGroupsToRemove is a list of NodeGroupIds to remove from the cluster. ElastiCache for Redis will attempt to remove all node groups listed by NodeGroupsToRemove from the cluster. </p>"
+        },
+        "ApplyImmediately":{
+          "shape":"Boolean",
+          "documentation":"<p>Indicates that the shard reconfiguration process begins immediately. At present, the only permitted value for this parameter is true. </p>"
+        }
+      }
+    },
+    "DecreaseNodeGroupsInGlobalReplicationGroupResult":{
+      "type":"structure",
+      "members":{
+        "GlobalReplicationGroup":{"shape":"GlobalReplicationGroup"}
+      }
+    },
     "DecreaseReplicaCountMessage":{
       "type":"structure",
       "required":[
@@ -2409,6 +2651,29 @@
       },
       "documentation":"<p>Represents the input of a <code>DeleteCacheSubnetGroup</code> operation.</p>"
     },
+    "DeleteGlobalReplicationGroupMessage":{
+      "type":"structure",
+      "required":[
+        "GlobalReplicationGroupId",
+        "RetainPrimaryReplicationGroup"
+      ],
+      "members":{
+        "GlobalReplicationGroupId":{
+          "shape":"String",
+          "documentation":"<p>The name of the Global Datastore</p>"
+        },
+        "RetainPrimaryReplicationGroup":{
+          "shape":"Boolean",
+          "documentation":"<p>If set to <code>true</code>, the primary replication is retained as a standalone replication group. </p>"
+        }
+      }
+    },
+    "DeleteGlobalReplicationGroupResult":{
+      "type":"structure",
+      "members":{
+        "GlobalReplicationGroup":{"shape":"GlobalReplicationGroup"}
+      }
+    },
     "DeleteReplicationGroupMessage":{
       "type":"structure",
       "required":["ReplicationGroupId"],
@@ -2643,6 +2908,40 @@
       },
       "documentation":"<p>Represents the input of a <code>DescribeEvents</code> operation.</p>"
     },
+    "DescribeGlobalReplicationGroupsMessage":{
+      "type":"structure",
+      "members":{
+        "GlobalReplicationGroupId":{
+          "shape":"String",
+          "documentation":"<p>The name of the Global Datastore</p>"
+        },
+        "MaxRecords":{
+          "shape":"IntegerOptional",
+          "documentation":"<p>The maximum number of records to include in the response. If more records exist than the specified MaxRecords value, a marker is included in the response so that the remaining results can be retrieved. </p>"
+        },
+        "Marker":{
+          "shape":"String",
+          "documentation":"<p>An optional marker returned from a prior request. Use this marker for pagination of results from this operation. If this parameter is specified, the response includes only records beyond the marker, up to the value specified by <code>MaxRecords</code>. </p>"
+        },
+        "ShowMemberInfo":{
+          "shape":"BooleanOptional",
+          "documentation":"<p>Returns the list of members that comprise the Global Datastore.</p>"
+        }
+      }
+    },
+    "DescribeGlobalReplicationGroupsResult":{
+      "type":"structure",
+      "members":{
+        "Marker":{
+          "shape":"String",
+          "documentation":"<p>An optional marker returned from a prior request. Use this marker for pagination of results from this operation. If this parameter is specified, the response includes only records beyond the marker, up to the value specified by MaxRecords. &gt;</p>"
+        },
+        "GlobalReplicationGroups":{
+          "shape":"GlobalReplicationGroupList",
+          "documentation":"<p>Indicates the slot configuration and global identifier for each slice group.</p>"
+        }
+      }
+    },
     "DescribeReplicationGroupsMessage":{
       "type":"structure",
       "members":{
@@ -2674,7 +2973,7 @@
         },
         "CacheNodeType":{
           "shape":"String",
-          "documentation":"<p>The cache node type filter value. Use this parameter to show only those reservations matching the specified cache node type.</p> <p>The following node types are supported by ElastiCache. Generally speaking, the current generation types provide more memory and computational power at lower cost when compared to their equivalent previous generation counterparts.</p> <ul> <li> <p>General purpose:</p> <ul> <li> <p>Current generation: </p> <p> <b>M5 node types:</b> <code>cache.m5.large</code>, <code>cache.m5.xlarge</code>, <code>cache.m5.2xlarge</code>, <code>cache.m5.4xlarge</code>, <code>cache.m5.12xlarge</code>, <code>cache.m5.24xlarge</code> </p> <p> <b>M4 node types:</b> <code>cache.m4.large</code>, <code>cache.m4.xlarge</code>, <code>cache.m4.2xlarge</code>, <code>cache.m4.4xlarge</code>, <code>cache.m4.10xlarge</code> </p> <p> <b>T2 node types:</b> <code>cache.t2.micro</code>, <code>cache.t2.small</code>, <code>cache.t2.medium</code> </p> </li> <li> <p>Previous generation: (not recommended)</p> <p> <b>T1 node types:</b> <code>cache.t1.micro</code> </p> <p> <b>M1 node types:</b> <code>cache.m1.small</code>, <code>cache.m1.medium</code>, <code>cache.m1.large</code>, <code>cache.m1.xlarge</code> </p> <p> <b>M3 node types:</b> <code>cache.m3.medium</code>, <code>cache.m3.large</code>, <code>cache.m3.xlarge</code>, <code>cache.m3.2xlarge</code> </p> </li> </ul> </li> <li> <p>Compute optimized:</p> <ul> <li> <p>Previous generation: (not recommended)</p> <p> <b>C1 node types:</b> <code>cache.c1.xlarge</code> </p> </li> </ul> </li> <li> <p>Memory optimized:</p> <ul> <li> <p>Current generation: </p> <p> <b>R5 node types:</b> <code>cache.r5.large</code>, <code>cache.r5.xlarge</code>, <code>cache.r5.2xlarge</code>, <code>cache.r5.4xlarge</code>, <code>cache.r5.12xlarge</code>, <code>cache.r5.24xlarge</code> </p> <p> <b>R4 node types:</b> <code>cache.r4.large</code>, <code>cache.r4.xlarge</code>, <code>cache.r4.2xlarge</code>, <code>cache.r4.4xlarge</code>, <code>cache.r4.8xlarge</code>, <code>cache.r4.16xlarge</code> </p> </li> <li> <p>Previous generation: (not recommended)</p> <p> <b>M2 node types:</b> <code>cache.m2.xlarge</code>, <code>cache.m2.2xlarge</code>, <code>cache.m2.4xlarge</code> </p> <p> <b>R3 node types:</b> <code>cache.r3.large</code>, <code>cache.r3.xlarge</code>, <code>cache.r3.2xlarge</code>, <code>cache.r3.4xlarge</code>, <code>cache.r3.8xlarge</code> </p> </li> </ul> </li> </ul> <p> <b>Additional node type info</b> </p> <ul> <li> <p>All current generation instance types are created in Amazon VPC by default.</p> </li> <li> <p>Redis append-only files (AOF) are not supported for T1 or T2 instances.</p> </li> <li> <p>Redis Multi-AZ with automatic failover is not supported on T1 instances.</p> </li> <li> <p>Redis configuration variables <code>appendonly</code> and <code>appendfsync</code> are not supported on Redis version 2.8.22 and later.</p> </li> </ul>"
+          "documentation":"<p>The cache node type filter value. Use this parameter to show only those reservations matching the specified cache node type.</p> <p>The following node types are supported by ElastiCache. Generally speaking, the current generation types provide more memory and computational power at lower cost when compared to their equivalent previous generation counterparts.</p> <ul> <li> <p>General purpose:</p> <ul> <li> <p>Current generation: </p> <p> <b>M5 node types:</b> <code>cache.m5.large</code>, <code>cache.m5.xlarge</code>, <code>cache.m5.2xlarge</code>, <code>cache.m5.4xlarge</code>, <code>cache.m5.12xlarge</code>, <code>cache.m5.24xlarge</code> </p> <p> <b>M4 node types:</b> <code>cache.m4.large</code>, <code>cache.m4.xlarge</code>, <code>cache.m4.2xlarge</code>, <code>cache.m4.4xlarge</code>, <code>cache.m4.10xlarge</code> </p> <p> <b>T3 node types:</b> <code>cache.t3.micro</code>, <code>cache.t3.small</code>, <code>cache.t3.medium</code> </p> <p> <b>T2 node types:</b> <code>cache.t2.micro</code>, <code>cache.t2.small</code>, <code>cache.t2.medium</code> </p> </li> <li> <p>Previous generation: (not recommended)</p> <p> <b>T1 node types:</b> <code>cache.t1.micro</code> </p> <p> <b>M1 node types:</b> <code>cache.m1.small</code>, <code>cache.m1.medium</code>, <code>cache.m1.large</code>, <code>cache.m1.xlarge</code> </p> <p> <b>M3 node types:</b> <code>cache.m3.medium</code>, <code>cache.m3.large</code>, <code>cache.m3.xlarge</code>, <code>cache.m3.2xlarge</code> </p> </li> </ul> </li> <li> <p>Compute optimized:</p> <ul> <li> <p>Previous generation: (not recommended)</p> <p> <b>C1 node types:</b> <code>cache.c1.xlarge</code> </p> </li> </ul> </li> <li> <p>Memory optimized:</p> <ul> <li> <p>Current generation: </p> <p> <b>R5 node types:</b> <code>cache.r5.large</code>, <code>cache.r5.xlarge</code>, <code>cache.r5.2xlarge</code>, <code>cache.r5.4xlarge</code>, <code>cache.r5.12xlarge</code>, <code>cache.r5.24xlarge</code> </p> <p> <b>R4 node types:</b> <code>cache.r4.large</code>, <code>cache.r4.xlarge</code>, <code>cache.r4.2xlarge</code>, <code>cache.r4.4xlarge</code>, <code>cache.r4.8xlarge</code>, <code>cache.r4.16xlarge</code> </p> </li> <li> <p>Previous generation: (not recommended)</p> <p> <b>M2 node types:</b> <code>cache.m2.xlarge</code>, <code>cache.m2.2xlarge</code>, <code>cache.m2.4xlarge</code> </p> <p> <b>R3 node types:</b> <code>cache.r3.large</code>, <code>cache.r3.xlarge</code>, <code>cache.r3.2xlarge</code>, <code>cache.r3.4xlarge</code>, <code>cache.r3.8xlarge</code> </p> </li> </ul> </li> </ul> <p> <b>Additional node type info</b> </p> <ul> <li> <p>All current generation instance types are created in Amazon VPC by default.</p> </li> <li> <p>Redis append-only files (AOF) are not supported for T1 or T2 instances.</p> </li> <li> <p>Redis Multi-AZ with automatic failover is not supported on T1 instances.</p> </li> <li> <p>Redis configuration variables <code>appendonly</code> and <code>appendfsync</code> are not supported on Redis version 2.8.22 and later.</p> </li> </ul>"
         },
         "Duration":{
           "shape":"String",
@@ -2708,7 +3007,7 @@
         },
         "CacheNodeType":{
           "shape":"String",
-          "documentation":"<p>The cache node type filter value. Use this parameter to show only the available offerings matching the specified cache node type.</p> <p>The following node types are supported by ElastiCache. Generally speaking, the current generation types provide more memory and computational power at lower cost when compared to their equivalent previous generation counterparts.</p> <ul> <li> <p>General purpose:</p> <ul> <li> <p>Current generation: </p> <p> <b>M5 node types:</b> <code>cache.m5.large</code>, <code>cache.m5.xlarge</code>, <code>cache.m5.2xlarge</code>, <code>cache.m5.4xlarge</code>, <code>cache.m5.12xlarge</code>, <code>cache.m5.24xlarge</code> </p> <p> <b>M4 node types:</b> <code>cache.m4.large</code>, <code>cache.m4.xlarge</code>, <code>cache.m4.2xlarge</code>, <code>cache.m4.4xlarge</code>, <code>cache.m4.10xlarge</code> </p> <p> <b>T2 node types:</b> <code>cache.t2.micro</code>, <code>cache.t2.small</code>, <code>cache.t2.medium</code> </p> </li> <li> <p>Previous generation: (not recommended)</p> <p> <b>T1 node types:</b> <code>cache.t1.micro</code> </p> <p> <b>M1 node types:</b> <code>cache.m1.small</code>, <code>cache.m1.medium</code>, <code>cache.m1.large</code>, <code>cache.m1.xlarge</code> </p> <p> <b>M3 node types:</b> <code>cache.m3.medium</code>, <code>cache.m3.large</code>, <code>cache.m3.xlarge</code>, <code>cache.m3.2xlarge</code> </p> </li> </ul> </li> <li> <p>Compute optimized:</p> <ul> <li> <p>Previous generation: (not recommended)</p> <p> <b>C1 node types:</b> <code>cache.c1.xlarge</code> </p> </li> </ul> </li> <li> <p>Memory optimized:</p> <ul> <li> <p>Current generation: </p> <p> <b>R5 node types:</b> <code>cache.r5.large</code>, <code>cache.r5.xlarge</code>, <code>cache.r5.2xlarge</code>, <code>cache.r5.4xlarge</code>, <code>cache.r5.12xlarge</code>, <code>cache.r5.24xlarge</code> </p> <p> <b>R4 node types:</b> <code>cache.r4.large</code>, <code>cache.r4.xlarge</code>, <code>cache.r4.2xlarge</code>, <code>cache.r4.4xlarge</code>, <code>cache.r4.8xlarge</code>, <code>cache.r4.16xlarge</code> </p> </li> <li> <p>Previous generation: (not recommended)</p> <p> <b>M2 node types:</b> <code>cache.m2.xlarge</code>, <code>cache.m2.2xlarge</code>, <code>cache.m2.4xlarge</code> </p> <p> <b>R3 node types:</b> <code>cache.r3.large</code>, <code>cache.r3.xlarge</code>, <code>cache.r3.2xlarge</code>, <code>cache.r3.4xlarge</code>, <code>cache.r3.8xlarge</code> </p> </li> </ul> </li> </ul> <p> <b>Additional node type info</b> </p> <ul> <li> <p>All current generation instance types are created in Amazon VPC by default.</p> </li> <li> <p>Redis append-only files (AOF) are not supported for T1 or T2 instances.</p> </li> <li> <p>Redis Multi-AZ with automatic failover is not supported on T1 instances.</p> </li> <li> <p>Redis configuration variables <code>appendonly</code> and <code>appendfsync</code> are not supported on Redis version 2.8.22 and later.</p> </li> </ul>"
+          "documentation":"<p>The cache node type filter value. Use this parameter to show only the available offerings matching the specified cache node type.</p> <p>The following node types are supported by ElastiCache. Generally speaking, the current generation types provide more memory and computational power at lower cost when compared to their equivalent previous generation counterparts.</p> <ul> <li> <p>General purpose:</p> <ul> <li> <p>Current generation: </p> <p> <b>M5 node types:</b> <code>cache.m5.large</code>, <code>cache.m5.xlarge</code>, <code>cache.m5.2xlarge</code>, <code>cache.m5.4xlarge</code>, <code>cache.m5.12xlarge</code>, <code>cache.m5.24xlarge</code> </p> <p> <b>M4 node types:</b> <code>cache.m4.large</code>, <code>cache.m4.xlarge</code>, <code>cache.m4.2xlarge</code>, <code>cache.m4.4xlarge</code>, <code>cache.m4.10xlarge</code> </p> <p> <b>T3 node types:</b> <code>cache.t3.micro</code>, <code>cache.t3.small</code>, <code>cache.t3.medium</code> </p> <p> <b>T2 node types:</b> <code>cache.t2.micro</code>, <code>cache.t2.small</code>, <code>cache.t2.medium</code> </p> </li> <li> <p>Previous generation: (not recommended)</p> <p> <b>T1 node types:</b> <code>cache.t1.micro</code> </p> <p> <b>M1 node types:</b> <code>cache.m1.small</code>, <code>cache.m1.medium</code>, <code>cache.m1.large</code>, <code>cache.m1.xlarge</code> </p> <p> <b>M3 node types:</b> <code>cache.m3.medium</code>, <code>cache.m3.large</code>, <code>cache.m3.xlarge</code>, <code>cache.m3.2xlarge</code> </p> </li> </ul> </li> <li> <p>Compute optimized:</p> <ul> <li> <p>Previous generation: (not recommended)</p> <p> <b>C1 node types:</b> <code>cache.c1.xlarge</code> </p> </li> </ul> </li> <li> <p>Memory optimized:</p> <ul> <li> <p>Current generation: </p> <p> <b>R5 node types:</b> <code>cache.r5.large</code>, <code>cache.r5.xlarge</code>, <code>cache.r5.2xlarge</code>, <code>cache.r5.4xlarge</code>, <code>cache.r5.12xlarge</code>, <code>cache.r5.24xlarge</code> </p> <p> <b>R4 node types:</b> <code>cache.r4.large</code>, <code>cache.r4.xlarge</code>, <code>cache.r4.2xlarge</code>, <code>cache.r4.4xlarge</code>, <code>cache.r4.8xlarge</code>, <code>cache.r4.16xlarge</code> </p> </li> <li> <p>Previous generation: (not recommended)</p> <p> <b>M2 node types:</b> <code>cache.m2.xlarge</code>, <code>cache.m2.2xlarge</code>, <code>cache.m2.4xlarge</code> </p> <p> <b>R3 node types:</b> <code>cache.r3.large</code>, <code>cache.r3.xlarge</code>, <code>cache.r3.2xlarge</code>, <code>cache.r3.4xlarge</code>, <code>cache.r3.8xlarge</code> </p> </li> </ul> </li> </ul> <p> <b>Additional node type info</b> </p> <ul> <li> <p>All current generation instance types are created in Amazon VPC by default.</p> </li> <li> <p>Redis append-only files (AOF) are not supported for T1 or T2 instances.</p> </li> <li> <p>Redis Multi-AZ with automatic failover is not supported on T1 instances.</p> </li> <li> <p>Redis configuration variables <code>appendonly</code> and <code>appendfsync</code> are not supported on Redis version 2.8.22 and later.</p> </li> </ul>"
         },
         "Duration":{
           "shape":"String",
@@ -2847,6 +3146,34 @@
         }
       }
     },
+    "DisassociateGlobalReplicationGroupMessage":{
+      "type":"structure",
+      "required":[
+        "GlobalReplicationGroupId",
+        "ReplicationGroupId",
+        "ReplicationGroupRegion"
+      ],
+      "members":{
+        "GlobalReplicationGroupId":{
+          "shape":"String",
+          "documentation":"<p>The name of the Global Datastore</p>"
+        },
+        "ReplicationGroupId":{
+          "shape":"String",
+          "documentation":"<p>The name of the secondary cluster you wish to remove from the Global Datastore</p>"
+        },
+        "ReplicationGroupRegion":{
+          "shape":"String",
+          "documentation":"<p>The AWS region of secondary cluster you wish to remove from the Global Datastore</p>"
+        }
+      }
+    },
+    "DisassociateGlobalReplicationGroupResult":{
+      "type":"structure",
+      "members":{
+        "GlobalReplicationGroup":{"shape":"GlobalReplicationGroup"}
+      }
+    },
     "Double":{"type":"double"},
     "EC2SecurityGroup":{
       "type":"structure",
@@ -2953,6 +3280,228 @@
       },
       "documentation":"<p>Represents the output of a <code>DescribeEvents</code> operation.</p>"
     },
+    "FailoverGlobalReplicationGroupMessage":{
+      "type":"structure",
+      "required":[
+        "GlobalReplicationGroupId",
+        "PrimaryRegion",
+        "PrimaryReplicationGroupId"
+      ],
+      "members":{
+        "GlobalReplicationGroupId":{
+          "shape":"String",
+          "documentation":"<p>The name of the Global Datastore</p>"
+        },
+        "PrimaryRegion":{
+          "shape":"String",
+          "documentation":"<p>The AWS region of the primary cluster of the Global Datastore</p>"
+        },
+        "PrimaryReplicationGroupId":{
+          "shape":"String",
+          "documentation":"<p>The name of the primary replication group</p>"
+        }
+      }
+    },
+    "FailoverGlobalReplicationGroupResult":{
+      "type":"structure",
+      "members":{
+        "GlobalReplicationGroup":{"shape":"GlobalReplicationGroup"}
+      }
+    },
+    "GlobalNodeGroup":{
+      "type":"structure",
+      "members":{
+        "GlobalNodeGroupId":{
+          "shape":"String",
+          "documentation":"<p>The name of the global node group</p>"
+        },
+        "Slots":{
+          "shape":"String",
+          "documentation":"<p>The keyspace for this node group</p>"
+        }
+      },
+      "documentation":"<p>Indicates the slot configuration and global identifier for a slice group.</p>"
+    },
+    "GlobalNodeGroupIdList":{
+      "type":"list",
+      "member":{
+        "shape":"String",
+        "locationName":"GlobalNodeGroupId"
+      }
+    },
+    "GlobalNodeGroupList":{
+      "type":"list",
+      "member":{
+        "shape":"GlobalNodeGroup",
+        "locationName":"GlobalNodeGroup"
+      }
+    },
+    "GlobalReplicationGroup":{
+      "type":"structure",
+      "members":{
+        "GlobalReplicationGroupId":{
+          "shape":"String",
+          "documentation":"<p>The name of the Global Datastore</p>"
+        },
+        "GlobalReplicationGroupDescription":{
+          "shape":"String",
+          "documentation":"<p>The optional description of the Global Datastore</p>"
+        },
+        "Status":{
+          "shape":"String",
+          "documentation":"<p>The status of the Global Datastore</p>"
+        },
+        "CacheNodeType":{
+          "shape":"String",
+          "documentation":"<p>The cache node type of the Global Datastore</p>"
+        },
+        "Engine":{
+          "shape":"String",
+          "documentation":"<p>The Elasticache engine. For preview, it is Redis only.</p>"
+        },
+        "EngineVersion":{
+          "shape":"String",
+          "documentation":"<p>The Elasticache Redis engine version. For preview, it is Redis version 5.0.5 only.</p>"
+        },
+        "Members":{
+          "shape":"GlobalReplicationGroupMemberList",
+          "documentation":"<p>The replication groups that comprise the Global Datastore.</p>"
+        },
+        "ClusterEnabled":{
+          "shape":"BooleanOptional",
+          "documentation":"<p>A flag that indicates whether the Global Datastore is cluster enabled.</p>"
+        },
+        "GlobalNodeGroups":{
+          "shape":"GlobalNodeGroupList",
+          "documentation":"<p>Indicates the slot configuration and global identifier for each slice group.</p>"
+        },
+        "AuthTokenEnabled":{
+          "shape":"BooleanOptional",
+          "documentation":"<p>A flag that enables using an <code>AuthToken</code> (password) when issuing Redis commands.</p> <p>Default: <code>false</code> </p>"
+        },
+        "TransitEncryptionEnabled":{
+          "shape":"BooleanOptional",
+          "documentation":"<p>A flag that enables in-transit encryption when set to true. You cannot modify the value of <code>TransitEncryptionEnabled</code> after the cluster is created. To enable in-transit encryption on a cluster you must set <code>TransitEncryptionEnabled</code> to true when you create a cluster. </p>"
+        },
+        "AtRestEncryptionEnabled":{
+          "shape":"BooleanOptional",
+          "documentation":"<p>A flag that enables encryption at rest when set to <code>true</code>.</p> <p>You cannot modify the value of <code>AtRestEncryptionEnabled</code> after the replication group is created. To enable encryption at rest on a replication group you must set <code>AtRestEncryptionEnabled</code> to <code>true</code> when you create the replication group. </p> <p> <b>Required:</b> Only available when creating a replication group in an Amazon VPC using redis version <code>3.2.6</code>, <code>4.x</code> or later.</p>"
+        }
+      },
+      "documentation":"<p>Consists of a primary cluster that accepts writes and an associated secondary cluster that resides in a different AWS region. The secondary cluster accepts only reads. The primary cluster automatically replicates updates to the secondary cluster.</p> <ul> <li> <p>The <b>GlobalReplicationGroupId</b> represents the name of the Global Datastore, which is what you use to associate a secondary cluster.</p> </li> </ul>",
+      "wrapper":true
+    },
+    "GlobalReplicationGroupAlreadyExistsFault":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>The Global Datastore name already exists.</p>",
+      "error":{
+        "code":"GlobalReplicationGroupAlreadyExistsFault",
+        "httpStatusCode":400,
+        "senderFault":true
+      },
+      "exception":true
+    },
+    "GlobalReplicationGroupInfo":{
+      "type":"structure",
+      "members":{
+        "GlobalReplicationGroupId":{
+          "shape":"String",
+          "documentation":"<p>The name of the Global Datastore</p>"
+        },
+        "GlobalReplicationGroupMemberRole":{
+          "shape":"String",
+          "documentation":"<p>The role of the replication group in a Global Datastore. Can be primary or secondary.</p>"
+        }
+      },
+      "documentation":"<p>The name of the Global Datastore and role of this replication group in the Global Datastore.</p>"
+    },
+    "GlobalReplicationGroupList":{
+      "type":"list",
+      "member":{
+        "shape":"GlobalReplicationGroup",
+        "locationName":"GlobalReplicationGroup"
+      }
+    },
+    "GlobalReplicationGroupMember":{
+      "type":"structure",
+      "members":{
+        "ReplicationGroupId":{
+          "shape":"String",
+          "documentation":"<p>The replication group id of the Global Datastore member.</p>"
+        },
+        "ReplicationGroupRegion":{
+          "shape":"String",
+          "documentation":"<p>The AWS region of the Global Datastore member.</p>"
+        },
+        "Role":{
+          "shape":"String",
+          "documentation":"<p>Indicates the role of the replication group, primary or secondary.</p>"
+        },
+        "AutomaticFailover":{
+          "shape":"AutomaticFailoverStatus",
+          "documentation":"<p>Indicates whether automatic failover is enabled for the replication group.</p>"
+        },
+        "Status":{
+          "shape":"String",
+          "documentation":"<p>The status of the membership of the replication group.</p>"
+        }
+      },
+      "documentation":"<p>A member of a Global Datastore. It contains the Replication Group Id, the AWS region and the role of the replication group. </p>",
+      "wrapper":true
+    },
+    "GlobalReplicationGroupMemberList":{
+      "type":"list",
+      "member":{
+        "shape":"GlobalReplicationGroupMember",
+        "locationName":"GlobalReplicationGroupMember"
+      }
+    },
+    "GlobalReplicationGroupNotFoundFault":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>The Global Datastore does not exist</p>",
+      "error":{
+        "code":"GlobalReplicationGroupNotFoundFault",
+        "httpStatusCode":404,
+        "senderFault":true
+      },
+      "exception":true
+    },
+    "IncreaseNodeGroupsInGlobalReplicationGroupMessage":{
+      "type":"structure",
+      "required":[
+        "GlobalReplicationGroupId",
+        "NodeGroupCount",
+        "ApplyImmediately"
+      ],
+      "members":{
+        "GlobalReplicationGroupId":{
+          "shape":"String",
+          "documentation":"<p>The name of the Global Datastore</p>"
+        },
+        "NodeGroupCount":{
+          "shape":"Integer",
+          "documentation":"<p>The number of node groups you wish to add</p>"
+        },
+        "RegionalConfigurations":{
+          "shape":"RegionalConfigurationList",
+          "documentation":"<p>Describes the replication group IDs, the AWS regions where they are stored and the shard configuration for each that comprise the Global Datastore</p>"
+        },
+        "ApplyImmediately":{
+          "shape":"Boolean",
+          "documentation":"<p>Indicates that the process begins immediately. At present, the only permitted value for this parameter is true.</p>"
+        }
+      }
+    },
+    "IncreaseNodeGroupsInGlobalReplicationGroupResult":{
+      "type":"structure",
+      "members":{
+        "GlobalReplicationGroup":{"shape":"GlobalReplicationGroup"}
+      }
+    },
     "IncreaseReplicaCountMessage":{
       "type":"structure",
       "required":[
@@ -3046,6 +3595,18 @@
       },
       "exception":true
     },
+    "InvalidGlobalReplicationGroupStateFault":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>The Global Datastore is not available</p>",
+      "error":{
+        "code":"InvalidGlobalReplicationGroupState",
+        "httpStatusCode":400,
+        "senderFault":true
+      },
+      "exception":true
+    },
     "InvalidKMSKeyFault":{
       "type":"structure",
       "members":{
@@ -3301,6 +3862,45 @@
         "CacheSubnetGroup":{"shape":"CacheSubnetGroup"}
       }
     },
+    "ModifyGlobalReplicationGroupMessage":{
+      "type":"structure",
+      "required":[
+        "GlobalReplicationGroupId",
+        "ApplyImmediately"
+      ],
+      "members":{
+        "GlobalReplicationGroupId":{
+          "shape":"String",
+          "documentation":"<p>The name of the Global Datastore</p>"
+        },
+        "ApplyImmediately":{
+          "shape":"Boolean",
+          "documentation":"<p>If true, this parameter causes the modifications in this request and any pending modifications to be applied, asynchronously and as soon as possible, regardless of the PreferredMaintenanceWindow setting for the replication group. If false, changes to the nodes in the replication group are applied on the next maintenance reboot, or the next failure reboot, whichever occurs first. </p>"
+        },
+        "CacheNodeType":{
+          "shape":"String",
+          "documentation":"<p>A valid cache node type that you want to scale this Global Datastore to.</p>"
+        },
+        "EngineVersion":{
+          "shape":"String",
+          "documentation":"<p>The upgraded version of the cache engine to be run on the clusters in the Global Datastore. </p>"
+        },
+        "GlobalReplicationGroupDescription":{
+          "shape":"String",
+          "documentation":"<p>A description of the Global Datastore</p>"
+        },
+        "AutomaticFailoverEnabled":{
+          "shape":"BooleanOptional",
+          "documentation":"<p>Determines whether a read replica is automatically promoted to read/write primary if the existing primary encounters a failure. </p>"
+        }
+      }
+    },
+    "ModifyGlobalReplicationGroupResult":{
+      "type":"structure",
+      "members":{
+        "GlobalReplicationGroup":{"shape":"GlobalReplicationGroup"}
+      }
+    },
     "ModifyReplicationGroupMessage":{
       "type":"structure",
       "required":["ReplicationGroupId"],
@@ -3925,6 +4525,29 @@
         "ReservedCacheNode":{"shape":"ReservedCacheNode"}
       }
     },
+    "RebalanceSlotsInGlobalReplicationGroupMessage":{
+      "type":"structure",
+      "required":[
+        "GlobalReplicationGroupId",
+        "ApplyImmediately"
+      ],
+      "members":{
+        "GlobalReplicationGroupId":{
+          "shape":"String",
+          "documentation":"<p>The name of the Global Datastore</p>"
+        },
+        "ApplyImmediately":{
+          "shape":"Boolean",
+          "documentation":"<p>If <code>True</code>, redistribution is applied immediately.</p>"
+        }
+      }
+    },
+    "RebalanceSlotsInGlobalReplicationGroupResult":{
+      "type":"structure",
+      "members":{
+        "GlobalReplicationGroup":{"shape":"GlobalReplicationGroup"}
+      }
+    },
     "RebootCacheClusterMessage":{
       "type":"structure",
       "required":[
@@ -3971,6 +4594,36 @@
         "locationName":"RecurringCharge"
       }
     },
+    "RegionalConfiguration":{
+      "type":"structure",
+      "required":[
+        "ReplicationGroupId",
+        "ReplicationGroupRegion",
+        "ReshardingConfiguration"
+      ],
+      "members":{
+        "ReplicationGroupId":{
+          "shape":"String",
+          "documentation":"<p>The name of the secondary cluster</p>"
+        },
+        "ReplicationGroupRegion":{
+          "shape":"String",
+          "documentation":"<p>The AWS region where the cluster is stored</p>"
+        },
+        "ReshardingConfiguration":{
+          "shape":"ReshardingConfigurationList",
+          "documentation":"<p>A list of <code>PreferredAvailabilityZones</code> objects that specifies the configuration of a node group in the resharded cluster. </p>"
+        }
+      },
+      "documentation":"<p>A list of the replication groups </p>"
+    },
+    "RegionalConfigurationList":{
+      "type":"list",
+      "member":{
+        "shape":"RegionalConfiguration",
+        "locationName":"RegionalConfiguration"
+      }
+    },
     "RemoveReplicasList":{
       "type":"list",
       "member":{"shape":"String"}
@@ -4011,6 +4664,10 @@
           "shape":"String",
           "documentation":"<p>The user supplied description of the replication group.</p>"
         },
+        "GlobalReplicationGroupInfo":{
+          "shape":"GlobalReplicationGroupInfo",
+          "documentation":"<p>The name of the Global Datastore and role of this replication group in the Global Datastore.</p>"
+        },
         "Status":{
           "shape":"String",
           "documentation":"<p>The current state of this replication group - <code>creating</code>, <code>available</code>, <code>modifying</code>, <code>deleting</code>, <code>create-failed</code>, <code>snapshotting</code>.</p>"
@@ -4188,7 +4845,7 @@
         },
         "CacheNodeType":{
           "shape":"String",
-          "documentation":"<p>The cache node type for the reserved cache nodes.</p> <p>The following node types are supported by ElastiCache. Generally speaking, the current generation types provide more memory and computational power at lower cost when compared to their equivalent previous generation counterparts.</p> <ul> <li> <p>General purpose:</p> <ul> <li> <p>Current generation: </p> <p> <b>M5 node types:</b> <code>cache.m5.large</code>, <code>cache.m5.xlarge</code>, <code>cache.m5.2xlarge</code>, <code>cache.m5.4xlarge</code>, <code>cache.m5.12xlarge</code>, <code>cache.m5.24xlarge</code> </p> <p> <b>M4 node types:</b> <code>cache.m4.large</code>, <code>cache.m4.xlarge</code>, <code>cache.m4.2xlarge</code>, <code>cache.m4.4xlarge</code>, <code>cache.m4.10xlarge</code> </p> <p> <b>T2 node types:</b> <code>cache.t2.micro</code>, <code>cache.t2.small</code>, <code>cache.t2.medium</code> </p> </li> <li> <p>Previous generation: (not recommended)</p> <p> <b>T1 node types:</b> <code>cache.t1.micro</code> </p> <p> <b>M1 node types:</b> <code>cache.m1.small</code>, <code>cache.m1.medium</code>, <code>cache.m1.large</code>, <code>cache.m1.xlarge</code> </p> <p> <b>M3 node types:</b> <code>cache.m3.medium</code>, <code>cache.m3.large</code>, <code>cache.m3.xlarge</code>, <code>cache.m3.2xlarge</code> </p> </li> </ul> </li> <li> <p>Compute optimized:</p> <ul> <li> <p>Previous generation: (not recommended)</p> <p> <b>C1 node types:</b> <code>cache.c1.xlarge</code> </p> </li> </ul> </li> <li> <p>Memory optimized:</p> <ul> <li> <p>Current generation: </p> <p> <b>R5 node types:</b> <code>cache.r5.large</code>, <code>cache.r5.xlarge</code>, <code>cache.r5.2xlarge</code>, <code>cache.r5.4xlarge</code>, <code>cache.r5.12xlarge</code>, <code>cache.r5.24xlarge</code> </p> <p> <b>R4 node types:</b> <code>cache.r4.large</code>, <code>cache.r4.xlarge</code>, <code>cache.r4.2xlarge</code>, <code>cache.r4.4xlarge</code>, <code>cache.r4.8xlarge</code>, <code>cache.r4.16xlarge</code> </p> </li> <li> <p>Previous generation: (not recommended)</p> <p> <b>M2 node types:</b> <code>cache.m2.xlarge</code>, <code>cache.m2.2xlarge</code>, <code>cache.m2.4xlarge</code> </p> <p> <b>R3 node types:</b> <code>cache.r3.large</code>, <code>cache.r3.xlarge</code>, <code>cache.r3.2xlarge</code>, <code>cache.r3.4xlarge</code>, <code>cache.r3.8xlarge</code> </p> </li> </ul> </li> </ul> <p> <b>Additional node type info</b> </p> <ul> <li> <p>All current generation instance types are created in Amazon VPC by default.</p> </li> <li> <p>Redis append-only files (AOF) are not supported for T1 or T2 instances.</p> </li> <li> <p>Redis Multi-AZ with automatic failover is not supported on T1 instances.</p> </li> <li> <p>Redis configuration variables <code>appendonly</code> and <code>appendfsync</code> are not supported on Redis version 2.8.22 and later.</p> </li> </ul>"
+          "documentation":"<p>The cache node type for the reserved cache nodes.</p> <p>The following node types are supported by ElastiCache. Generally speaking, the current generation types provide more memory and computational power at lower cost when compared to their equivalent previous generation counterparts.</p> <ul> <li> <p>General purpose:</p> <ul> <li> <p>Current generation: </p> <p> <b>M5 node types:</b> <code>cache.m5.large</code>, <code>cache.m5.xlarge</code>, <code>cache.m5.2xlarge</code>, <code>cache.m5.4xlarge</code>, <code>cache.m5.12xlarge</code>, <code>cache.m5.24xlarge</code> </p> <p> <b>M4 node types:</b> <code>cache.m4.large</code>, <code>cache.m4.xlarge</code>, <code>cache.m4.2xlarge</code>, <code>cache.m4.4xlarge</code>, <code>cache.m4.10xlarge</code> </p> <p> <b>T3 node types:</b> <code>cache.t3.micro</code>, <code>cache.t3.small</code>, <code>cache.t3.medium</code> </p> <p> <b>T2 node types:</b> <code>cache.t2.micro</code>, <code>cache.t2.small</code>, <code>cache.t2.medium</code> </p> </li> <li> <p>Previous generation: (not recommended)</p> <p> <b>T1 node types:</b> <code>cache.t1.micro</code> </p> <p> <b>M1 node types:</b> <code>cache.m1.small</code>, <code>cache.m1.medium</code>, <code>cache.m1.large</code>, <code>cache.m1.xlarge</code> </p> <p> <b>M3 node types:</b> <code>cache.m3.medium</code>, <code>cache.m3.large</code>, <code>cache.m3.xlarge</code>, <code>cache.m3.2xlarge</code> </p> </li> </ul> </li> <li> <p>Compute optimized:</p> <ul> <li> <p>Previous generation: (not recommended)</p> <p> <b>C1 node types:</b> <code>cache.c1.xlarge</code> </p> </li> </ul> </li> <li> <p>Memory optimized:</p> <ul> <li> <p>Current generation: </p> <p> <b>R5 node types:</b> <code>cache.r5.large</code>, <code>cache.r5.xlarge</code>, <code>cache.r5.2xlarge</code>, <code>cache.r5.4xlarge</code>, <code>cache.r5.12xlarge</code>, <code>cache.r5.24xlarge</code> </p> <p> <b>R4 node types:</b> <code>cache.r4.large</code>, <code>cache.r4.xlarge</code>, <code>cache.r4.2xlarge</code>, <code>cache.r4.4xlarge</code>, <code>cache.r4.8xlarge</code>, <code>cache.r4.16xlarge</code> </p> </li> <li> <p>Previous generation: (not recommended)</p> <p> <b>M2 node types:</b> <code>cache.m2.xlarge</code>, <code>cache.m2.2xlarge</code>, <code>cache.m2.4xlarge</code> </p> <p> <b>R3 node types:</b> <code>cache.r3.large</code>, <code>cache.r3.xlarge</code>, <code>cache.r3.2xlarge</code>, <code>cache.r3.4xlarge</code>, <code>cache.r3.8xlarge</code> </p> </li> </ul> </li> </ul> <p> <b>Additional node type info</b> </p> <ul> <li> <p>All current generation instance types are created in Amazon VPC by default.</p> </li> <li> <p>Redis append-only files (AOF) are not supported for T1 or T2 instances.</p> </li> <li> <p>Redis Multi-AZ with automatic failover is not supported on T1 instances.</p> </li> <li> <p>Redis configuration variables <code>appendonly</code> and <code>appendfsync</code> are not supported on Redis version 2.8.22 and later.</p> </li> </ul>"
         },
         "StartTime":{
           "shape":"TStamp",
@@ -4300,7 +4957,7 @@
         },
         "CacheNodeType":{
           "shape":"String",
-          "documentation":"<p>The cache node type for the reserved cache node.</p> <p>The following node types are supported by ElastiCache. Generally speaking, the current generation types provide more memory and computational power at lower cost when compared to their equivalent previous generation counterparts.</p> <ul> <li> <p>General purpose:</p> <ul> <li> <p>Current generation: </p> <p> <b>M5 node types:</b> <code>cache.m5.large</code>, <code>cache.m5.xlarge</code>, <code>cache.m5.2xlarge</code>, <code>cache.m5.4xlarge</code>, <code>cache.m5.12xlarge</code>, <code>cache.m5.24xlarge</code> </p> <p> <b>M4 node types:</b> <code>cache.m4.large</code>, <code>cache.m4.xlarge</code>, <code>cache.m4.2xlarge</code>, <code>cache.m4.4xlarge</code>, <code>cache.m4.10xlarge</code> </p> <p> <b>T2 node types:</b> <code>cache.t2.micro</code>, <code>cache.t2.small</code>, <code>cache.t2.medium</code> </p> </li> <li> <p>Previous generation: (not recommended)</p> <p> <b>T1 node types:</b> <code>cache.t1.micro</code> </p> <p> <b>M1 node types:</b> <code>cache.m1.small</code>, <code>cache.m1.medium</code>, <code>cache.m1.large</code>, <code>cache.m1.xlarge</code> </p> <p> <b>M3 node types:</b> <code>cache.m3.medium</code>, <code>cache.m3.large</code>, <code>cache.m3.xlarge</code>, <code>cache.m3.2xlarge</code> </p> </li> </ul> </li> <li> <p>Compute optimized:</p> <ul> <li> <p>Previous generation: (not recommended)</p> <p> <b>C1 node types:</b> <code>cache.c1.xlarge</code> </p> </li> </ul> </li> <li> <p>Memory optimized:</p> <ul> <li> <p>Current generation: </p> <p> <b>R5 node types:</b> <code>cache.r5.large</code>, <code>cache.r5.xlarge</code>, <code>cache.r5.2xlarge</code>, <code>cache.r5.4xlarge</code>, <code>cache.r5.12xlarge</code>, <code>cache.r5.24xlarge</code> </p> <p> <b>R4 node types:</b> <code>cache.r4.large</code>, <code>cache.r4.xlarge</code>, <code>cache.r4.2xlarge</code>, <code>cache.r4.4xlarge</code>, <code>cache.r4.8xlarge</code>, <code>cache.r4.16xlarge</code> </p> </li> <li> <p>Previous generation: (not recommended)</p> <p> <b>M2 node types:</b> <code>cache.m2.xlarge</code>, <code>cache.m2.2xlarge</code>, <code>cache.m2.4xlarge</code> </p> <p> <b>R3 node types:</b> <code>cache.r3.large</code>, <code>cache.r3.xlarge</code>, <code>cache.r3.2xlarge</code>, <code>cache.r3.4xlarge</code>, <code>cache.r3.8xlarge</code> </p> </li> </ul> </li> </ul> <p> <b>Additional node type info</b> </p> <ul> <li> <p>All current generation instance types are created in Amazon VPC by default.</p> </li> <li> <p>Redis append-only files (AOF) are not supported for T1 or T2 instances.</p> </li> <li> <p>Redis Multi-AZ with automatic failover is not supported on T1 instances.</p> </li> <li> <p>Redis configuration variables <code>appendonly</code> and <code>appendfsync</code> are not supported on Redis version 2.8.22 and later.</p> </li> </ul>"
+          "documentation":"<p>The cache node type for the reserved cache node.</p> <p>The following node types are supported by ElastiCache. Generally speaking, the current generation types provide more memory and computational power at lower cost when compared to their equivalent previous generation counterparts.</p> <ul> <li> <p>General purpose:</p> <ul> <li> <p>Current generation: </p> <p> <b>M5 node types:</b> <code>cache.m5.large</code>, <code>cache.m5.xlarge</code>, <code>cache.m5.2xlarge</code>, <code>cache.m5.4xlarge</code>, <code>cache.m5.12xlarge</code>, <code>cache.m5.24xlarge</code> </p> <p> <b>M4 node types:</b> <code>cache.m4.large</code>, <code>cache.m4.xlarge</code>, <code>cache.m4.2xlarge</code>, <code>cache.m4.4xlarge</code>, <code>cache.m4.10xlarge</code> </p> <p> <b>T3 node types:</b> <code>cache.t3.micro</code>, <code>cache.t3.small</code>, <code>cache.t3.medium</code> </p> <p> <b>T2 node types:</b> <code>cache.t2.micro</code>, <code>cache.t2.small</code>, <code>cache.t2.medium</code> </p> </li> <li> <p>Previous generation: (not recommended)</p> <p> <b>T1 node types:</b> <code>cache.t1.micro</code> </p> <p> <b>M1 node types:</b> <code>cache.m1.small</code>, <code>cache.m1.medium</code>, <code>cache.m1.large</code>, <code>cache.m1.xlarge</code> </p> <p> <b>M3 node types:</b> <code>cache.m3.medium</code>, <code>cache.m3.large</code>, <code>cache.m3.xlarge</code>, <code>cache.m3.2xlarge</code> </p> </li> </ul> </li> <li> <p>Compute optimized:</p> <ul> <li> <p>Previous generation: (not recommended)</p> <p> <b>C1 node types:</b> <code>cache.c1.xlarge</code> </p> </li> </ul> </li> <li> <p>Memory optimized:</p> <ul> <li> <p>Current generation: </p> <p> <b>R5 node types:</b> <code>cache.r5.large</code>, <code>cache.r5.xlarge</code>, <code>cache.r5.2xlarge</code>, <code>cache.r5.4xlarge</code>, <code>cache.r5.12xlarge</code>, <code>cache.r5.24xlarge</code> </p> <p> <b>R4 node types:</b> <code>cache.r4.large</code>, <code>cache.r4.xlarge</code>, <code>cache.r4.2xlarge</code>, <code>cache.r4.4xlarge</code>, <code>cache.r4.8xlarge</code>, <code>cache.r4.16xlarge</code> </p> </li> <li> <p>Previous generation: (not recommended)</p> <p> <b>M2 node types:</b> <code>cache.m2.xlarge</code>, <code>cache.m2.2xlarge</code>, <code>cache.m2.4xlarge</code> </p> <p> <b>R3 node types:</b> <code>cache.r3.large</code>, <code>cache.r3.xlarge</code>, <code>cache.r3.2xlarge</code>, <code>cache.r3.4xlarge</code>, <code>cache.r3.8xlarge</code> </p> </li> </ul> </li> </ul> <p> <b>Additional node type info</b> </p> <ul> <li> <p>All current generation instance types are created in Amazon VPC by default.</p> </li> <li> <p>Redis append-only files (AOF) are not supported for T1 or T2 instances.</p> </li> <li> <p>Redis Multi-AZ with automatic failover is not supported on T1 instances.</p> </li> <li> <p>Redis configuration variables <code>appendonly</code> and <code>appendfsync</code> are not supported on Redis version 2.8.22 and later.</p> </li> </ul>"
         },
         "Duration":{
           "shape":"Integer",
@@ -4638,7 +5295,7 @@
         },
         "CacheNodeType":{
           "shape":"String",
-          "documentation":"<p>The name of the compute and memory capacity node type for the source cluster.</p> <p>The following node types are supported by ElastiCache. Generally speaking, the current generation types provide more memory and computational power at lower cost when compared to their equivalent previous generation counterparts.</p> <ul> <li> <p>General purpose:</p> <ul> <li> <p>Current generation: </p> <p> <b>M5 node types:</b> <code>cache.m5.large</code>, <code>cache.m5.xlarge</code>, <code>cache.m5.2xlarge</code>, <code>cache.m5.4xlarge</code>, <code>cache.m5.12xlarge</code>, <code>cache.m5.24xlarge</code> </p> <p> <b>M4 node types:</b> <code>cache.m4.large</code>, <code>cache.m4.xlarge</code>, <code>cache.m4.2xlarge</code>, <code>cache.m4.4xlarge</code>, <code>cache.m4.10xlarge</code> </p> <p> <b>T2 node types:</b> <code>cache.t2.micro</code>, <code>cache.t2.small</code>, <code>cache.t2.medium</code> </p> </li> <li> <p>Previous generation: (not recommended)</p> <p> <b>T1 node types:</b> <code>cache.t1.micro</code> </p> <p> <b>M1 node types:</b> <code>cache.m1.small</code>, <code>cache.m1.medium</code>, <code>cache.m1.large</code>, <code>cache.m1.xlarge</code> </p> <p> <b>M3 node types:</b> <code>cache.m3.medium</code>, <code>cache.m3.large</code>, <code>cache.m3.xlarge</code>, <code>cache.m3.2xlarge</code> </p> </li> </ul> </li> <li> <p>Compute optimized:</p> <ul> <li> <p>Previous generation: (not recommended)</p> <p> <b>C1 node types:</b> <code>cache.c1.xlarge</code> </p> </li> </ul> </li> <li> <p>Memory optimized:</p> <ul> <li> <p>Current generation: </p> <p> <b>R5 node types:</b> <code>cache.r5.large</code>, <code>cache.r5.xlarge</code>, <code>cache.r5.2xlarge</code>, <code>cache.r5.4xlarge</code>, <code>cache.r5.12xlarge</code>, <code>cache.r5.24xlarge</code> </p> <p> <b>R4 node types:</b> <code>cache.r4.large</code>, <code>cache.r4.xlarge</code>, <code>cache.r4.2xlarge</code>, <code>cache.r4.4xlarge</code>, <code>cache.r4.8xlarge</code>, <code>cache.r4.16xlarge</code> </p> </li> <li> <p>Previous generation: (not recommended)</p> <p> <b>M2 node types:</b> <code>cache.m2.xlarge</code>, <code>cache.m2.2xlarge</code>, <code>cache.m2.4xlarge</code> </p> <p> <b>R3 node types:</b> <code>cache.r3.large</code>, <code>cache.r3.xlarge</code>, <code>cache.r3.2xlarge</code>, <code>cache.r3.4xlarge</code>, <code>cache.r3.8xlarge</code> </p> </li> </ul> </li> </ul> <p> <b>Additional node type info</b> </p> <ul> <li> <p>All current generation instance types are created in Amazon VPC by default.</p> </li> <li> <p>Redis append-only files (AOF) are not supported for T1 or T2 instances.</p> </li> <li> <p>Redis Multi-AZ with automatic failover is not supported on T1 instances.</p> </li> <li> <p>Redis configuration variables <code>appendonly</code> and <code>appendfsync</code> are not supported on Redis version 2.8.22 and later.</p> </li> </ul>"
+          "documentation":"<p>The name of the compute and memory capacity node type for the source cluster.</p> <p>The following node types are supported by ElastiCache. Generally speaking, the current generation types provide more memory and computational power at lower cost when compared to their equivalent previous generation counterparts.</p> <ul> <li> <p>General purpose:</p> <ul> <li> <p>Current generation: </p> <p> <b>M5 node types:</b> <code>cache.m5.large</code>, <code>cache.m5.xlarge</code>, <code>cache.m5.2xlarge</code>, <code>cache.m5.4xlarge</code>, <code>cache.m5.12xlarge</code>, <code>cache.m5.24xlarge</code> </p> <p> <b>M4 node types:</b> <code>cache.m4.large</code>, <code>cache.m4.xlarge</code>, <code>cache.m4.2xlarge</code>, <code>cache.m4.4xlarge</code>, <code>cache.m4.10xlarge</code> </p> <p> <b>T3 node types:</b> <code>cache.t3.micro</code>, <code>cache.t3.small</code>, <code>cache.t3.medium</code> </p> <p> <b>T2 node types:</b> <code>cache.t2.micro</code>, <code>cache.t2.small</code>, <code>cache.t2.medium</code> </p> </li> <li> <p>Previous generation: (not recommended)</p> <p> <b>T1 node types:</b> <code>cache.t1.micro</code> </p> <p> <b>M1 node types:</b> <code>cache.m1.small</code>, <code>cache.m1.medium</code>, <code>cache.m1.large</code>, <code>cache.m1.xlarge</code> </p> <p> <b>M3 node types:</b> <code>cache.m3.medium</code>, <code>cache.m3.large</code>, <code>cache.m3.xlarge</code>, <code>cache.m3.2xlarge</code> </p> </li> </ul> </li> <li> <p>Compute optimized:</p> <ul> <li> <p>Previous generation: (not recommended)</p> <p> <b>C1 node types:</b> <code>cache.c1.xlarge</code> </p> </li> </ul> </li> <li> <p>Memory optimized:</p> <ul> <li> <p>Current generation: </p> <p> <b>R5 node types:</b> <code>cache.r5.large</code>, <code>cache.r5.xlarge</code>, <code>cache.r5.2xlarge</code>, <code>cache.r5.4xlarge</code>, <code>cache.r5.12xlarge</code>, <code>cache.r5.24xlarge</code> </p> <p> <b>R4 node types:</b> <code>cache.r4.large</code>, <code>cache.r4.xlarge</code>, <code>cache.r4.2xlarge</code>, <code>cache.r4.4xlarge</code>, <code>cache.r4.8xlarge</code>, <code>cache.r4.16xlarge</code> </p> </li> <li> <p>Previous generation: (not recommended)</p> <p> <b>M2 node types:</b> <code>cache.m2.xlarge</code>, <code>cache.m2.2xlarge</code>, <code>cache.m2.4xlarge</code> </p> <p> <b>R3 node types:</b> <code>cache.r3.large</code>, <code>cache.r3.xlarge</code>, <code>cache.r3.2xlarge</code>, <code>cache.r3.4xlarge</code>, <code>cache.r3.8xlarge</code> </p> </li> </ul> </li> </ul> <p> <b>Additional node type info</b> </p> <ul> <li> <p>All current generation instance types are created in Amazon VPC by default.</p> </li> <li> <p>Redis append-only files (AOF) are not supported for T1 or T2 instances.</p> </li> <li> <p>Redis Multi-AZ with automatic failover is not supported on T1 instances.</p> </li> <li> <p>Redis configuration variables <code>appendonly</code> and <code>appendfsync</code> are not supported on Redis version 2.8.22 and later.</p> </li> </ul>"
         },
         "Engine":{
           "shape":"String",
diff --git a/services/elasticache/src/test/resources/cucumber.properties b/services/elasticache/src/test/resources/cucumber.properties
index e7b7823f5a8b..b84626b86f4f 100644
--- a/services/elasticache/src/test/resources/cucumber.properties
+++ b/services/elasticache/src/test/resources/cucumber.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/elasticbeanstalk/build.properties b/services/elasticbeanstalk/build.properties
index ecf2dae6fcb1..15ec2da1fc71 100644
--- a/services/elasticbeanstalk/build.properties
+++ b/services/elasticbeanstalk/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/elasticbeanstalk/pom.xml b/services/elasticbeanstalk/pom.xml
index 4f0d5384293a..cb1c88c8763f 100644
--- a/services/elasticbeanstalk/pom.xml
+++ b/services/elasticbeanstalk/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>elasticbeanstalk</artifactId>
     <name>AWS Java SDK :: Services :: AWS Elastic Beanstalk</name>
diff --git a/services/elasticbeanstalk/src/it/java/software/amazon/awssdk/services/elasticbeanstalk/ElasticBeanstalkIntegrationTest.java b/services/elasticbeanstalk/src/it/java/software/amazon/awssdk/services/elasticbeanstalk/ElasticBeanstalkIntegrationTest.java
index 1a848391feb1..fdda9c221be3 100644
--- a/services/elasticbeanstalk/src/it/java/software/amazon/awssdk/services/elasticbeanstalk/ElasticBeanstalkIntegrationTest.java
+++ b/services/elasticbeanstalk/src/it/java/software/amazon/awssdk/services/elasticbeanstalk/ElasticBeanstalkIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/elasticbeanstalk/src/it/java/software/amazon/awssdk/services/elasticbeanstalk/ElasticBeanstalkIntegrationTestBase.java b/services/elasticbeanstalk/src/it/java/software/amazon/awssdk/services/elasticbeanstalk/ElasticBeanstalkIntegrationTestBase.java
index a162a679dd7a..df8e0a82387a 100644
--- a/services/elasticbeanstalk/src/it/java/software/amazon/awssdk/services/elasticbeanstalk/ElasticBeanstalkIntegrationTestBase.java
+++ b/services/elasticbeanstalk/src/it/java/software/amazon/awssdk/services/elasticbeanstalk/ElasticBeanstalkIntegrationTestBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/elasticbeanstalk/src/test/resources/cucumber.properties b/services/elasticbeanstalk/src/test/resources/cucumber.properties
index 842e6f4355ab..f231279a8a8e 100644
--- a/services/elasticbeanstalk/src/test/resources/cucumber.properties
+++ b/services/elasticbeanstalk/src/test/resources/cucumber.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/elasticinference/pom.xml b/services/elasticinference/pom.xml
new file mode 100644
index 000000000000..f607db29eb37
--- /dev/null
+++ b/services/elasticinference/pom.xml
@@ -0,0 +1,60 @@
+<?xml version="1.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.
+  -->
+
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>software.amazon.awssdk</groupId>
+        <artifactId>services</artifactId>
+        <version>2.11.8-SNAPSHOT</version>
+    </parent>
+    <artifactId>elasticinference</artifactId>
+    <name>AWS Java SDK :: Services :: Elastic Inference</name>
+    <description>The AWS Java SDK for Elastic Inference module holds the client classes that are used for
+        communicating with Elastic Inference.
+    </description>
+    <url>https://aws.amazon.com/sdkforjava</url>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifestEntries>
+                            <Automatic-Module-Name>software.amazon.awssdk.services.elasticinference</Automatic-Module-Name>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>protocol-core</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>aws-json-protocol</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/services/elasticinference/src/main/resources/codegen-resources/paginators-1.json b/services/elasticinference/src/main/resources/codegen-resources/paginators-1.json
new file mode 100644
index 000000000000..5677bd8e4a2d
--- /dev/null
+++ b/services/elasticinference/src/main/resources/codegen-resources/paginators-1.json
@@ -0,0 +1,4 @@
+{
+  "pagination": {
+  }
+}
diff --git a/services/elasticinference/src/main/resources/codegen-resources/service-2.json b/services/elasticinference/src/main/resources/codegen-resources/service-2.json
new file mode 100644
index 000000000000..b01d8ea368df
--- /dev/null
+++ b/services/elasticinference/src/main/resources/codegen-resources/service-2.json
@@ -0,0 +1,191 @@
+{
+  "version":"2.0",
+  "metadata":{
+    "apiVersion":"2017-07-25",
+    "endpointPrefix":"elastic-inference",
+    "jsonVersion":"1.1",
+    "protocol":"rest-json",
+    "serviceAbbreviation":"Amazon Elastic Inference",
+    "serviceFullName":"Amazon Elastic  Inference",
+    "serviceId":"Elastic Inference",
+    "signatureVersion":"v4",
+    "signingName":"elastic-inference",
+    "uid":"elastic-inference-2017-07-25"
+  },
+  "operations":{
+    "ListTagsForResource":{
+      "name":"ListTagsForResource",
+      "http":{
+        "method":"GET",
+        "requestUri":"/tags/{resourceArn}"
+      },
+      "input":{"shape":"ListTagsForResourceRequest"},
+      "output":{"shape":"ListTagsForResourceResult"},
+      "errors":[
+        {"shape":"BadRequestException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"Returns all tags of an Elastic Inference Accelerator."
+    },
+    "TagResource":{
+      "name":"TagResource",
+      "http":{
+        "method":"POST",
+        "requestUri":"/tags/{resourceArn}"
+      },
+      "input":{"shape":"TagResourceRequest"},
+      "output":{"shape":"TagResourceResult"},
+      "errors":[
+        {"shape":"BadRequestException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"Adds the specified tag(s) to an Elastic Inference Accelerator."
+    },
+    "UntagResource":{
+      "name":"UntagResource",
+      "http":{
+        "method":"DELETE",
+        "requestUri":"/tags/{resourceArn}"
+      },
+      "input":{"shape":"UntagResourceRequest"},
+      "output":{"shape":"UntagResourceResult"},
+      "errors":[
+        {"shape":"BadRequestException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"Removes the specified tag(s) from an Elastic Inference Accelerator."
+    }
+  },
+  "shapes":{
+    "BadRequestException":{
+      "type":"structure",
+      "members":{
+        "message":{"shape":"String"}
+      },
+      "documentation":"Raised when a malformed input has been provided to the API.",
+      "error":{"httpStatusCode":400},
+      "exception":true
+    },
+    "InternalServerException":{
+      "type":"structure",
+      "members":{
+        "message":{"shape":"String"}
+      },
+      "documentation":"Raised when an unexpected error occurred during request processing.",
+      "error":{"httpStatusCode":500},
+      "exception":true
+    },
+    "ListTagsForResourceRequest":{
+      "type":"structure",
+      "required":["resourceArn"],
+      "members":{
+        "resourceArn":{
+          "shape":"ResourceARN",
+          "documentation":"The ARN of the Elastic Inference Accelerator to list the tags for.",
+          "location":"uri",
+          "locationName":"resourceArn"
+        }
+      }
+    },
+    "ListTagsForResourceResult":{
+      "type":"structure",
+      "members":{
+        "tags":{
+          "shape":"TagMap",
+          "documentation":"The tags of the Elastic Inference Accelerator."
+        }
+      }
+    },
+    "ResourceARN":{
+      "type":"string",
+      "max":1011,
+      "min":1
+    },
+    "ResourceNotFoundException":{
+      "type":"structure",
+      "members":{
+        "message":{"shape":"String"}
+      },
+      "documentation":"Raised when the requested resource cannot be found.",
+      "error":{"httpStatusCode":404},
+      "exception":true
+    },
+    "String":{"type":"string"},
+    "TagKey":{
+      "type":"string",
+      "max":128,
+      "min":1
+    },
+    "TagKeyList":{
+      "type":"list",
+      "member":{"shape":"TagKey"},
+      "max":50,
+      "min":1
+    },
+    "TagMap":{
+      "type":"map",
+      "key":{"shape":"TagKey"},
+      "value":{"shape":"TagValue"},
+      "max":50,
+      "min":1
+    },
+    "TagResourceRequest":{
+      "type":"structure",
+      "required":[
+        "resourceArn",
+        "tags"
+      ],
+      "members":{
+        "resourceArn":{
+          "shape":"ResourceARN",
+          "documentation":"The ARN of the Elastic Inference Accelerator to tag.",
+          "location":"uri",
+          "locationName":"resourceArn"
+        },
+        "tags":{
+          "shape":"TagMap",
+          "documentation":"The tags to add to the Elastic Inference Accelerator."
+        }
+      }
+    },
+    "TagResourceResult":{
+      "type":"structure",
+      "members":{
+      }
+    },
+    "TagValue":{
+      "type":"string",
+      "max":256
+    },
+    "UntagResourceRequest":{
+      "type":"structure",
+      "required":[
+        "resourceArn",
+        "tagKeys"
+      ],
+      "members":{
+        "resourceArn":{
+          "shape":"ResourceARN",
+          "documentation":"The ARN of the Elastic Inference Accelerator to untag.",
+          "location":"uri",
+          "locationName":"resourceArn"
+        },
+        "tagKeys":{
+          "shape":"TagKeyList",
+          "documentation":"The list of tags to remove from the Elastic Inference Accelerator.",
+          "location":"querystring",
+          "locationName":"tagKeys"
+        }
+      }
+    },
+    "UntagResourceResult":{
+      "type":"structure",
+      "members":{
+      }
+    }
+  },
+  "documentation":"Elastic Inference public APIs."
+}
diff --git a/services/elasticloadbalancing/build.properties b/services/elasticloadbalancing/build.properties
index ecf2dae6fcb1..15ec2da1fc71 100644
--- a/services/elasticloadbalancing/build.properties
+++ b/services/elasticloadbalancing/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/elasticloadbalancing/pom.xml b/services/elasticloadbalancing/pom.xml
index 7595031aeb58..61d2f5301b79 100644
--- a/services/elasticloadbalancing/pom.xml
+++ b/services/elasticloadbalancing/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>elasticloadbalancing</artifactId>
     <name>AWS Java SDK :: Services :: Elastic Load Balancing</name>
diff --git a/services/elasticloadbalancing/src/it/java/software/amazon/awssdk/services/elasticloadbalancing/ElbIntegrationTest.java b/services/elasticloadbalancing/src/it/java/software/amazon/awssdk/services/elasticloadbalancing/ElbIntegrationTest.java
index cc50687d6fd9..71c93a78fcd6 100644
--- a/services/elasticloadbalancing/src/it/java/software/amazon/awssdk/services/elasticloadbalancing/ElbIntegrationTest.java
+++ b/services/elasticloadbalancing/src/it/java/software/amazon/awssdk/services/elasticloadbalancing/ElbIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/elasticloadbalancing/src/test/resources/cucumber.properties b/services/elasticloadbalancing/src/test/resources/cucumber.properties
index 13bdfe683a38..5045d10862ea 100644
--- a/services/elasticloadbalancing/src/test/resources/cucumber.properties
+++ b/services/elasticloadbalancing/src/test/resources/cucumber.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/elasticloadbalancingv2/build.properties b/services/elasticloadbalancingv2/build.properties
index ecf2dae6fcb1..15ec2da1fc71 100644
--- a/services/elasticloadbalancingv2/build.properties
+++ b/services/elasticloadbalancingv2/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/elasticloadbalancingv2/pom.xml b/services/elasticloadbalancingv2/pom.xml
index d7769d5df6a3..1e53f152a57d 100644
--- a/services/elasticloadbalancingv2/pom.xml
+++ b/services/elasticloadbalancingv2/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>elasticloadbalancingv2</artifactId>
     <name>AWS Java SDK :: Services :: Elastic Load Balancing V2</name>
diff --git a/services/elasticloadbalancingv2/src/main/resources/codegen-resources/service-2.json b/services/elasticloadbalancingv2/src/main/resources/codegen-resources/service-2.json
index b94c58a7818d..52c0ab9d3511 100644
--- a/services/elasticloadbalancingv2/src/main/resources/codegen-resources/service-2.json
+++ b/services/elasticloadbalancingv2/src/main/resources/codegen-resources/service-2.json
@@ -75,7 +75,8 @@
         {"shape":"TooManyRegistrationsForTargetIdException"},
         {"shape":"TooManyTargetsException"},
         {"shape":"TooManyActionsException"},
-        {"shape":"InvalidLoadBalancerActionException"}
+        {"shape":"InvalidLoadBalancerActionException"},
+        {"shape":"TooManyUniqueTargetGroupsPerLoadBalancerException"}
       ],
       "documentation":"<p>Creates a listener for the specified Application Load Balancer or Network Load Balancer.</p> <p>To update a listener, use <a>ModifyListener</a>. When you are finished with a listener, you can delete it using <a>DeleteListener</a>. If you are finished with both the listener and the load balancer, you can delete them both using <a>DeleteLoadBalancer</a>.</p> <p>This operation is idempotent, which means that it completes at most one time. If you attempt to create multiple listeners with the same settings, each call succeeds.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/elasticloadbalancing/latest/application/load-balancer-listeners.html\">Listeners for Your Application Load Balancers</a> in the <i>Application Load Balancers Guide</i> and <a href=\"https://docs.aws.amazon.com/elasticloadbalancing/latest/network/load-balancer-listeners.html\">Listeners for Your Network Load Balancers</a> in the <i>Network Load Balancers Guide</i>.</p>"
     },
@@ -131,7 +132,8 @@
         {"shape":"TooManyTargetsException"},
         {"shape":"UnsupportedProtocolException"},
         {"shape":"TooManyActionsException"},
-        {"shape":"InvalidLoadBalancerActionException"}
+        {"shape":"InvalidLoadBalancerActionException"},
+        {"shape":"TooManyUniqueTargetGroupsPerLoadBalancerException"}
       ],
       "documentation":"<p>Creates a rule for the specified listener. The listener must be associated with an Application Load Balancer.</p> <p>Rules are evaluated in priority order, from the lowest value to the highest value. When the conditions for a rule are met, its actions are performed. If the conditions for no rules are met, the actions for the default rule are performed. For more information, see <a href=\"https://docs.aws.amazon.com/elasticloadbalancing/latest/application/load-balancer-listeners.html#listener-rules\">Listener Rules</a> in the <i>Application Load Balancers Guide</i>.</p> <p>To view your current rules, use <a>DescribeRules</a>. To update a rule, use <a>ModifyRule</a>. To set the priorities of your rules, use <a>SetRulePriorities</a>. To delete a rule, use <a>DeleteRule</a>.</p>"
     },
@@ -446,9 +448,10 @@
         {"shape":"TooManyRegistrationsForTargetIdException"},
         {"shape":"TooManyTargetsException"},
         {"shape":"TooManyActionsException"},
-        {"shape":"InvalidLoadBalancerActionException"}
+        {"shape":"InvalidLoadBalancerActionException"},
+        {"shape":"TooManyUniqueTargetGroupsPerLoadBalancerException"}
       ],
-      "documentation":"<p>Modifies the specified properties of the specified listener.</p> <p>Any properties that you do not specify retain their current values. However, changing the protocol from HTTPS to HTTP, or from TLS to TCP, removes the security policy and default certificate properties. If you change the protocol from HTTP to HTTPS, or from TCP to TLS, you must add the security policy and default certificate properties.</p>"
+      "documentation":"<p>Replaces the specified properties of the specified listener. Any properties that you do not specify remain unchanged.</p> <p>Changing the protocol from HTTPS to HTTP, or from TLS to TCP, removes the security policy and default certificate properties. If you change the protocol from HTTP to HTTPS, or from TCP to TLS, you must add the security policy and default certificate properties.</p> <p>To add an item to a list, remove an item from a list, or update an item in a list, you must provide the entire list. For example, to add an action, specify a list with the current actions plus the new action.</p>"
     },
     "ModifyLoadBalancerAttributes":{
       "name":"ModifyLoadBalancerAttributes",
@@ -488,9 +491,10 @@
         {"shape":"TargetGroupNotFoundException"},
         {"shape":"UnsupportedProtocolException"},
         {"shape":"TooManyActionsException"},
-        {"shape":"InvalidLoadBalancerActionException"}
+        {"shape":"InvalidLoadBalancerActionException"},
+        {"shape":"TooManyUniqueTargetGroupsPerLoadBalancerException"}
       ],
-      "documentation":"<p>Modifies the specified rule.</p> <p>Any existing properties that you do not modify retain their current values.</p> <p>To modify the actions for the default rule, use <a>ModifyListener</a>.</p>"
+      "documentation":"<p>Replaces the specified properties of the specified rule. Any properties that you do not specify are unchanged.</p> <p>To add an item to a list, remove an item from a list, or update an item in a list, you must provide the entire list. For example, to add an action, specify a list with the current actions plus the new action.</p> <p>To modify the actions for the default rule, use <a>ModifyListener</a>.</p>"
     },
     "ModifyTargetGroup":{
       "name":"ModifyTargetGroup",
@@ -655,7 +659,7 @@
         {"shape":"AllocationIdNotFoundException"},
         {"shape":"AvailabilityZoneNotSupportedException"}
       ],
-      "documentation":"<p>Enables the Availability Zone for the specified public subnets for the specified Application Load Balancer. The specified subnets replace the previously enabled subnets.</p> <p>You can't change the subnets for a Network Load Balancer.</p>"
+      "documentation":"<p>Enables the Availability Zones for the specified public subnets for the specified load balancer. The specified subnets replace the previously enabled subnets.</p> <p>When you specify subnets for a Network Load Balancer, you must include all subnets that were enabled previously, with their existing configurations, plus any additional subnets.</p>"
     }
   },
   "shapes":{
@@ -665,11 +669,11 @@
       "members":{
         "Type":{
           "shape":"ActionTypeEnum",
-          "documentation":"<p>The type of action. Each rule must include exactly one of the following types of actions: <code>forward</code>, <code>fixed-response</code>, or <code>redirect</code>.</p>"
+          "documentation":"<p>The type of action.</p>"
         },
         "TargetGroupArn":{
           "shape":"TargetGroupArn",
-          "documentation":"<p>The Amazon Resource Name (ARN) of the target group. Specify only when <code>Type</code> is <code>forward</code>.</p>"
+          "documentation":"<p>The Amazon Resource Name (ARN) of the target group. Specify only when <code>Type</code> is <code>forward</code> and you want to route to a single target group. To route to one or more target groups, use <code>ForwardConfig</code> instead.</p>"
         },
         "AuthenticateOidcConfig":{
           "shape":"AuthenticateOidcActionConfig",
@@ -681,7 +685,7 @@
         },
         "Order":{
           "shape":"ActionOrder",
-          "documentation":"<p>The order for the action. This value is required for rules with multiple actions. The action with the lowest value for order is performed first. The final action to be performed must be a <code>forward</code> or a <code>fixed-response</code> action.</p>"
+          "documentation":"<p>The order for the action. This value is required for rules with multiple actions. The action with the lowest value for order is performed first. The last action to be performed must be one of the following types of actions: a <code>forward</code>, <code>fixed-response</code>, or <code>redirect</code>.</p>"
         },
         "RedirectConfig":{
           "shape":"RedirectActionConfig",
@@ -690,6 +694,10 @@
         "FixedResponseConfig":{
           "shape":"FixedResponseActionConfig",
           "documentation":"<p>[Application Load Balancer] Information for creating an action that returns a custom HTTP response. Specify only when <code>Type</code> is <code>fixed-response</code>.</p>"
+        },
+        "ForwardConfig":{
+          "shape":"ForwardActionConfig",
+          "documentation":"<p>Information for creating an action that distributes requests among one or more target groups. For Network Load Balancers, you can specify a single target group. Specify only when <code>Type</code> is <code>forward</code>. If you specify both <code>ForwardConfig</code> and <code>TargetGroupArn</code>, you can specify only one target group using <code>ForwardConfig</code> and it must be the same target group specified in <code>TargetGroupArn</code>.</p>"
         }
       },
       "documentation":"<p>Information about an action.</p>"
@@ -752,7 +760,7 @@
         },
         "Tags":{
           "shape":"TagList",
-          "documentation":"<p>The tags. Each resource can have a maximum of 10 tags.</p>"
+          "documentation":"<p>The tags.</p>"
         }
       }
     },
@@ -937,7 +945,7 @@
         },
         "LoadBalancerAddresses":{
           "shape":"LoadBalancerAddresses",
-          "documentation":"<p>[Network Load Balancers] If you need static IP addresses for your load balancer, you can specify one Elastic IP address per Availability Zone when you create the load balancer.</p>"
+          "documentation":"<p>[Network Load Balancers] If you need static IP addresses for your load balancer, you can specify one Elastic IP address per Availability Zone when you create an internal-facing load balancer. For internal load balancers, you can specify a private IP address from the IPv4 range of the subnet.</p>"
         }
       },
       "documentation":"<p>Information about an Availability Zone.</p>"
@@ -1037,7 +1045,7 @@
         },
         "SslPolicy":{
           "shape":"SslPolicyName",
-          "documentation":"<p>[HTTPS and TLS listeners] The security policy that defines which ciphers and protocols are supported. The default is the current predefined security policy.</p>"
+          "documentation":"<p>[HTTPS and TLS listeners] The security policy that defines which protocols and ciphers are supported. The following are the possible values:</p> <ul> <li> <p> <code>ELBSecurityPolicy-2016-08</code> </p> </li> <li> <p> <code>ELBSecurityPolicy-TLS-1-0-2015-04</code> </p> </li> <li> <p> <code>ELBSecurityPolicy-TLS-1-1-2017-01</code> </p> </li> <li> <p> <code>ELBSecurityPolicy-TLS-1-2-2017-01</code> </p> </li> <li> <p> <code>ELBSecurityPolicy-TLS-1-2-Ext-2018-06</code> </p> </li> <li> <p> <code>ELBSecurityPolicy-FS-2018-06</code> </p> </li> <li> <p> <code>ELBSecurityPolicy-FS-1-1-2019-08</code> </p> </li> <li> <p> <code>ELBSecurityPolicy-FS-1-2-2019-08</code> </p> </li> <li> <p> <code>ELBSecurityPolicy-FS-1-2-Res-2019-08</code> </p> </li> </ul> <p>For more information, see <a href=\"https://docs.aws.amazon.com/elasticloadbalancing/latest/application/create-https-listener.html#describe-ssl-policies\">Security Policies</a> in the <i>Application Load Balancers Guide</i> and <a href=\"https://docs.aws.amazon.com/elasticloadbalancing/latest/network/create-tls-listener.html#describe-ssl-policies\">Security Policies</a> in the <i>Network Load Balancers Guide</i>.</p>"
         },
         "Certificates":{
           "shape":"CertificateList",
@@ -1045,7 +1053,7 @@
         },
         "DefaultActions":{
           "shape":"Actions",
-          "documentation":"<p>The actions for the default rule. The rule must include one forward action or one or more fixed-response actions.</p> <p>If the action type is <code>forward</code>, you specify a target group. The protocol of the target group must be HTTP or HTTPS for an Application Load Balancer. The protocol of the target group must be TCP, TLS, UDP, or TCP_UDP for a Network Load Balancer.</p> <p>[HTTPS listeners] If the action type is <code>authenticate-oidc</code>, you authenticate users through an identity provider that is OpenID Connect (OIDC) compliant.</p> <p>[HTTPS listeners] If the action type is <code>authenticate-cognito</code>, you authenticate users through the user pools supported by Amazon Cognito.</p> <p>[Application Load Balancer] If the action type is <code>redirect</code>, you redirect specified client requests from one URL to another.</p> <p>[Application Load Balancer] If the action type is <code>fixed-response</code>, you drop specified client requests and return a custom HTTP response.</p>"
+          "documentation":"<p>The actions for the default rule. The rule must include one forward action or one or more fixed-response actions.</p> <p>If the action type is <code>forward</code>, you specify one or more target groups. The protocol of the target group must be HTTP or HTTPS for an Application Load Balancer. The protocol of the target group must be TCP, TLS, UDP, or TCP_UDP for a Network Load Balancer.</p> <p>[HTTPS listeners] If the action type is <code>authenticate-oidc</code>, you authenticate users through an identity provider that is OpenID Connect (OIDC) compliant.</p> <p>[HTTPS listeners] If the action type is <code>authenticate-cognito</code>, you authenticate users through the user pools supported by Amazon Cognito.</p> <p>[Application Load Balancer] If the action type is <code>redirect</code>, you redirect specified client requests from one URL to another.</p> <p>[Application Load Balancer] If the action type is <code>fixed-response</code>, you drop specified client requests and return a custom HTTP response.</p>"
         }
       }
     },
@@ -1072,7 +1080,7 @@
         },
         "SubnetMappings":{
           "shape":"SubnetMappings",
-          "documentation":"<p>The IDs of the public subnets. You can specify only one subnet per Availability Zone. You must specify either subnets or subnet mappings.</p> <p>[Application Load Balancers] You must specify subnets from at least two Availability Zones. You cannot specify Elastic IP addresses for your subnets.</p> <p>[Network Load Balancers] You can specify subnets from one or more Availability Zones. You can specify one Elastic IP address per subnet if you need static IP addresses for your load balancer.</p>"
+          "documentation":"<p>The IDs of the public subnets. You can specify only one subnet per Availability Zone. You must specify either subnets or subnet mappings.</p> <p>[Application Load Balancers] You must specify subnets from at least two Availability Zones. You cannot specify Elastic IP addresses for your subnets.</p> <p>[Network Load Balancers] You can specify subnets from one or more Availability Zones. You can specify one Elastic IP address per subnet if you need static IP addresses for your internet-facing load balancer. For internal load balancers, you can specify one private IP address per subnet from the IPv4 range of the subnet.</p>"
         },
         "SecurityGroups":{
           "shape":"SecurityGroups",
@@ -1080,7 +1088,7 @@
         },
         "Scheme":{
           "shape":"LoadBalancerSchemeEnum",
-          "documentation":"<p>The nodes of an Internet-facing load balancer have public IP addresses. The DNS name of an Internet-facing load balancer is publicly resolvable to the public IP addresses of the nodes. Therefore, Internet-facing load balancers can route requests from clients over the internet.</p> <p>The nodes of an internal load balancer have only private IP addresses. The DNS name of an internal load balancer is publicly resolvable to the private IP addresses of the nodes. Therefore, internal load balancers can only route requests from clients with access to the VPC for the load balancer.</p> <p>The default is an Internet-facing load balancer.</p>"
+          "documentation":"<p>The nodes of an Internet-facing load balancer have public IP addresses. The DNS name of an Internet-facing load balancer is publicly resolvable to the public IP addresses of the nodes. Therefore, Internet-facing load balancers can route requests from clients over the internet.</p> <p>The nodes of an internal load balancer have only private IP addresses. The DNS name of an internal load balancer is publicly resolvable to the private IP addresses of the nodes. Therefore, internal load balancers can route requests only from clients with access to the VPC for the load balancer.</p> <p>The default is an Internet-facing load balancer.</p>"
         },
         "Tags":{
           "shape":"TagList",
@@ -1128,7 +1136,7 @@
         },
         "Actions":{
           "shape":"Actions",
-          "documentation":"<p>The actions. Each rule must include exactly one of the following types of actions: <code>forward</code>, <code>fixed-response</code>, or <code>redirect</code>.</p> <p>If the action type is <code>forward</code>, you specify a target group. The protocol of the target group must be HTTP or HTTPS for an Application Load Balancer. The protocol of the target group must be TCP, TLS, UDP, or TCP_UDP for a Network Load Balancer.</p> <p>[HTTPS listeners] If the action type is <code>authenticate-oidc</code>, you authenticate users through an identity provider that is OpenID Connect (OIDC) compliant.</p> <p>[HTTPS listeners] If the action type is <code>authenticate-cognito</code>, you authenticate users through the user pools supported by Amazon Cognito.</p> <p>[Application Load Balancer] If the action type is <code>redirect</code>, you redirect specified client requests from one URL to another.</p> <p>[Application Load Balancer] If the action type is <code>fixed-response</code>, you drop specified client requests and return a custom HTTP response.</p>"
+          "documentation":"<p>The actions. Each rule must include exactly one of the following types of actions: <code>forward</code>, <code>fixed-response</code>, or <code>redirect</code>, and it must be the last action to be performed.</p> <p>If the action type is <code>forward</code>, you specify one or more target groups. The protocol of the target group must be HTTP or HTTPS for an Application Load Balancer. The protocol of the target group must be TCP, TLS, UDP, or TCP_UDP for a Network Load Balancer.</p> <p>[HTTPS listeners] If the action type is <code>authenticate-oidc</code>, you authenticate users through an identity provider that is OpenID Connect (OIDC) compliant.</p> <p>[HTTPS listeners] If the action type is <code>authenticate-cognito</code>, you authenticate users through the user pools supported by Amazon Cognito.</p> <p>[Application Load Balancer] If the action type is <code>redirect</code>, you redirect specified client requests from one URL to another.</p> <p>[Application Load Balancer] If the action type is <code>fixed-response</code>, you drop specified client requests and return a custom HTTP response.</p>"
         }
       }
     },
@@ -1497,7 +1505,7 @@
       "members":{
         "SslPolicies":{
           "shape":"SslPolicies",
-          "documentation":"<p>Information about the policies.</p>"
+          "documentation":"<p>Information about the security policies.</p>"
         },
         "NextMarker":{
           "shape":"Marker",
@@ -1511,7 +1519,7 @@
       "members":{
         "ResourceArns":{
           "shape":"ResourceArns",
-          "documentation":"<p>The Amazon Resource Names (ARN) of the resources.</p>"
+          "documentation":"<p>The Amazon Resource Names (ARN) of the resources. You can specify up to 20 resources in a single call.</p>"
         }
       }
     },
@@ -1686,6 +1694,20 @@
       "type":"string",
       "pattern":"^(2|4|5)\\d\\d$"
     },
+    "ForwardActionConfig":{
+      "type":"structure",
+      "members":{
+        "TargetGroups":{
+          "shape":"TargetGroupList",
+          "documentation":"<p>One or more target groups. For Network Load Balancers, you can specify a single target group.</p>"
+        },
+        "TargetGroupStickinessConfig":{
+          "shape":"TargetGroupStickinessConfig",
+          "documentation":"<p>The target group stickiness for the rule.</p>"
+        }
+      },
+      "documentation":"<p>Information about a forward action.</p>"
+    },
     "HealthCheckEnabled":{"type":"boolean"},
     "HealthCheckIntervalSeconds":{
       "type":"integer",
@@ -1848,7 +1870,7 @@
       "members":{
         "Name":{
           "shape":"Name",
-          "documentation":"<p>The name of the limit. The possible values are:</p> <ul> <li> <p>application-load-balancers</p> </li> <li> <p>listeners-per-application-load-balancer</p> </li> <li> <p>listeners-per-network-load-balancer</p> </li> <li> <p>network-load-balancers</p> </li> <li> <p>rules-per-application-load-balancer</p> </li> <li> <p>target-groups</p> </li> <li> <p>targets-per-application-load-balancer</p> </li> <li> <p>targets-per-availability-zone-per-network-load-balancer</p> </li> <li> <p>targets-per-network-load-balancer</p> </li> </ul>"
+          "documentation":"<p>The name of the limit. The possible values are:</p> <ul> <li> <p>application-load-balancers</p> </li> <li> <p>listeners-per-application-load-balancer</p> </li> <li> <p>listeners-per-network-load-balancer</p> </li> <li> <p>network-load-balancers</p> </li> <li> <p>rules-per-application-load-balancer</p> </li> <li> <p>target-groups</p> </li> <li> <p>target-groups-per-action-on-application-load-balancer</p> </li> <li> <p>target-groups-per-action-on-network-load-balancer</p> </li> <li> <p>target-groups-per-application-load-balancer</p> </li> <li> <p>targets-per-application-load-balancer</p> </li> <li> <p>targets-per-availability-zone-per-network-load-balancer</p> </li> <li> <p>targets-per-network-load-balancer</p> </li> </ul>"
         },
         "Max":{
           "shape":"Max",
@@ -1890,7 +1912,7 @@
         },
         "SslPolicy":{
           "shape":"SslPolicyName",
-          "documentation":"<p>[HTTPS or TLS listener] The security policy that defines which ciphers and protocols are supported. The default is the current predefined security policy.</p>"
+          "documentation":"<p>[HTTPS or TLS listener] The security policy that defines which protocols and ciphers are supported.</p>"
         },
         "DefaultActions":{
           "shape":"Actions",
@@ -1945,7 +1967,7 @@
         },
         "Scheme":{
           "shape":"LoadBalancerSchemeEnum",
-          "documentation":"<p>The nodes of an Internet-facing load balancer have public IP addresses. The DNS name of an Internet-facing load balancer is publicly resolvable to the public IP addresses of the nodes. Therefore, Internet-facing load balancers can route requests from clients over the internet.</p> <p>The nodes of an internal load balancer have only private IP addresses. The DNS name of an internal load balancer is publicly resolvable to the private IP addresses of the nodes. Therefore, internal load balancers can only route requests from clients with access to the VPC for the load balancer.</p>"
+          "documentation":"<p>The nodes of an Internet-facing load balancer have public IP addresses. The DNS name of an Internet-facing load balancer is publicly resolvable to the public IP addresses of the nodes. Therefore, Internet-facing load balancers can route requests from clients over the internet.</p> <p>The nodes of an internal load balancer have only private IP addresses. The DNS name of an internal load balancer is publicly resolvable to the private IP addresses of the nodes. Therefore, internal load balancers can route requests only from clients with access to the VPC for the load balancer.</p>"
         },
         "VpcId":{
           "shape":"VpcId",
@@ -1983,7 +2005,11 @@
         },
         "AllocationId":{
           "shape":"AllocationId",
-          "documentation":"<p>[Network Load Balancers] The allocation ID of the Elastic IP address.</p>"
+          "documentation":"<p>[Network Load Balancers] The allocation ID of the Elastic IP address for an internal-facing load balancer.</p>"
+        },
+        "PrivateIPv4Address":{
+          "shape":"PrivateIPv4Address",
+          "documentation":"<p>[Network Load Balancers] The private IPv4 address for an internal load balancer.</p>"
         }
       },
       "documentation":"<p>Information about a static IP address for a load balancer.</p>"
@@ -2002,7 +2028,7 @@
       "members":{
         "Key":{
           "shape":"LoadBalancerAttributeKey",
-          "documentation":"<p>The name of the attribute.</p> <p>The following attributes are supported by both Application Load Balancers and Network Load Balancers:</p> <ul> <li> <p> <code>access_logs.s3.enabled</code> - Indicates whether access logs are enabled. The value is <code>true</code> or <code>false</code>. The default is <code>false</code>.</p> </li> <li> <p> <code>access_logs.s3.bucket</code> - The name of the S3 bucket for the access logs. This attribute is required if access logs are enabled. The bucket must exist in the same region as the load balancer and have a bucket policy that grants Elastic Load Balancing permissions to write to the bucket.</p> </li> <li> <p> <code>access_logs.s3.prefix</code> - The prefix for the location in the S3 bucket for the access logs.</p> </li> <li> <p> <code>deletion_protection.enabled</code> - Indicates whether deletion protection is enabled. The value is <code>true</code> or <code>false</code>. The default is <code>false</code>.</p> </li> </ul> <p>The following attributes are supported by only Application Load Balancers:</p> <ul> <li> <p> <code>idle_timeout.timeout_seconds</code> - The idle timeout value, in seconds. The valid range is 1-4000 seconds. The default is 60 seconds.</p> </li> <li> <p> <code>routing.http2.enabled</code> - Indicates whether HTTP/2 is enabled. The value is <code>true</code> or <code>false</code>. The default is <code>true</code>.</p> </li> </ul> <p>The following attributes are supported by only Network Load Balancers:</p> <ul> <li> <p> <code>load_balancing.cross_zone.enabled</code> - Indicates whether cross-zone load balancing is enabled. The value is <code>true</code> or <code>false</code>. The default is <code>false</code>.</p> </li> </ul>"
+          "documentation":"<p>The name of the attribute.</p> <p>The following attributes are supported by both Application Load Balancers and Network Load Balancers:</p> <ul> <li> <p> <code>access_logs.s3.enabled</code> - Indicates whether access logs are enabled. The value is <code>true</code> or <code>false</code>. The default is <code>false</code>.</p> </li> <li> <p> <code>access_logs.s3.bucket</code> - The name of the S3 bucket for the access logs. This attribute is required if access logs are enabled. The bucket must exist in the same region as the load balancer and have a bucket policy that grants Elastic Load Balancing permissions to write to the bucket.</p> </li> <li> <p> <code>access_logs.s3.prefix</code> - The prefix for the location in the S3 bucket for the access logs.</p> </li> <li> <p> <code>deletion_protection.enabled</code> - Indicates whether deletion protection is enabled. The value is <code>true</code> or <code>false</code>. The default is <code>false</code>.</p> </li> </ul> <p>The following attributes are supported by only Application Load Balancers:</p> <ul> <li> <p> <code>idle_timeout.timeout_seconds</code> - The idle timeout value, in seconds. The valid range is 1-4000 seconds. The default is 60 seconds.</p> </li> <li> <p> <code>routing.http.drop_invalid_header_fields.enabled</code> - Indicates whether HTTP headers with invalid header fields are removed by the load balancer (<code>true</code>) or routed to targets (<code>false</code>). The default is <code>false</code>.</p> </li> <li> <p> <code>routing.http2.enabled</code> - Indicates whether HTTP/2 is enabled. The value is <code>true</code> or <code>false</code>. The default is <code>true</code>. Elastic Load Balancing requires that message header names contain only alphanumeric characters and hyphens.</p> </li> </ul> <p>The following attributes are supported by only Network Load Balancers:</p> <ul> <li> <p> <code>load_balancing.cross_zone.enabled</code> - Indicates whether cross-zone load balancing is enabled. The value is <code>true</code> or <code>false</code>. The default is <code>false</code>.</p> </li> </ul>"
         },
         "Value":{
           "shape":"LoadBalancerAttributeValue",
@@ -2114,7 +2140,7 @@
         },
         "SslPolicy":{
           "shape":"SslPolicyName",
-          "documentation":"<p>[HTTPS and TLS listeners] The security policy that defines which protocols and ciphers are supported. For more information, see <a href=\"https://docs.aws.amazon.com/elasticloadbalancing/latest/application/create-https-listener.html#describe-ssl-policies\">Security Policies</a> in the <i>Application Load Balancers Guide</i>.</p>"
+          "documentation":"<p>[HTTPS and TLS listeners] The security policy that defines which protocols and ciphers are supported. The following are the possible values:</p> <ul> <li> <p> <code>ELBSecurityPolicy-2016-08</code> </p> </li> <li> <p> <code>ELBSecurityPolicy-TLS-1-0-2015-04</code> </p> </li> <li> <p> <code>ELBSecurityPolicy-TLS-1-1-2017-01</code> </p> </li> <li> <p> <code>ELBSecurityPolicy-TLS-1-2-2017-01</code> </p> </li> <li> <p> <code>ELBSecurityPolicy-TLS-1-2-Ext-2018-06</code> </p> </li> <li> <p> <code>ELBSecurityPolicy-FS-2018-06</code> </p> </li> <li> <p> <code>ELBSecurityPolicy-FS-1-1-2019-08</code> </p> </li> <li> <p> <code>ELBSecurityPolicy-FS-1-2-2019-08</code> </p> </li> <li> <p> <code>ELBSecurityPolicy-FS-1-2-Res-2019-08</code> </p> </li> </ul> <p>For more information, see <a href=\"https://docs.aws.amazon.com/elasticloadbalancing/latest/application/create-https-listener.html#describe-ssl-policies\">Security Policies</a> in the <i>Application Load Balancers Guide</i> and <a href=\"https://docs.aws.amazon.com/elasticloadbalancing/latest/network/create-tls-listener.html#describe-ssl-policies\">Security Policies</a> in the <i>Network Load Balancers Guide</i>.</p>"
         },
         "Certificates":{
           "shape":"CertificateList",
@@ -2122,7 +2148,7 @@
         },
         "DefaultActions":{
           "shape":"Actions",
-          "documentation":"<p>The actions for the default rule. The rule must include one forward action or one or more fixed-response actions.</p> <p>If the action type is <code>forward</code>, you specify a target group. The protocol of the target group must be HTTP or HTTPS for an Application Load Balancer. The protocol of the target group must be TCP, TLS, UDP, or TCP_UDP for a Network Load Balancer.</p> <p>[HTTPS listeners] If the action type is <code>authenticate-oidc</code>, you authenticate users through an identity provider that is OpenID Connect (OIDC) compliant.</p> <p>[HTTPS listeners] If the action type is <code>authenticate-cognito</code>, you authenticate users through the user pools supported by Amazon Cognito.</p> <p>[Application Load Balancer] If the action type is <code>redirect</code>, you redirect specified client requests from one URL to another.</p> <p>[Application Load Balancer] If the action type is <code>fixed-response</code>, you drop specified client requests and return a custom HTTP response.</p>"
+          "documentation":"<p>The actions for the default rule. The rule must include one forward action or one or more fixed-response actions.</p> <p>If the action type is <code>forward</code>, you specify one or more target groups. The protocol of the target group must be HTTP or HTTPS for an Application Load Balancer. The protocol of the target group must be TCP, TLS, UDP, or TCP_UDP for a Network Load Balancer.</p> <p>[HTTPS listeners] If the action type is <code>authenticate-oidc</code>, you authenticate users through an identity provider that is OpenID Connect (OIDC) compliant.</p> <p>[HTTPS listeners] If the action type is <code>authenticate-cognito</code>, you authenticate users through the user pools supported by Amazon Cognito.</p> <p>[Application Load Balancer] If the action type is <code>redirect</code>, you redirect specified client requests from one URL to another.</p> <p>[Application Load Balancer] If the action type is <code>fixed-response</code>, you drop specified client requests and return a custom HTTP response.</p>"
         }
       }
     },
@@ -2175,7 +2201,7 @@
         },
         "Actions":{
           "shape":"Actions",
-          "documentation":"<p>The actions. Each rule must include exactly one of the following types of actions: <code>forward</code>, <code>fixed-response</code>, or <code>redirect</code>.</p> <p>If the action type is <code>forward</code>, you specify a target group. The protocol of the target group must be HTTP or HTTPS for an Application Load Balancer. The protocol of the target group must be TCP, TLS, UDP, or TCP_UDP for a Network Load Balancer.</p> <p>[HTTPS listeners] If the action type is <code>authenticate-oidc</code>, you authenticate users through an identity provider that is OpenID Connect (OIDC) compliant.</p> <p>[HTTPS listeners] If the action type is <code>authenticate-cognito</code>, you authenticate users through the user pools supported by Amazon Cognito.</p> <p>[Application Load Balancer] If the action type is <code>redirect</code>, you redirect specified client requests from one URL to another.</p> <p>[Application Load Balancer] If the action type is <code>fixed-response</code>, you drop specified client requests and return a custom HTTP response.</p>"
+          "documentation":"<p>The actions. Each rule must include exactly one of the following types of actions: <code>forward</code>, <code>fixed-response</code>, or <code>redirect</code>, and it must be the last action to be performed.</p> <p>If the action type is <code>forward</code>, you specify one or more target groups. The protocol of the target group must be HTTP or HTTPS for an Application Load Balancer. The protocol of the target group must be TCP, TLS, UDP, or TCP_UDP for a Network Load Balancer.</p> <p>[HTTPS listeners] If the action type is <code>authenticate-oidc</code>, you authenticate users through an identity provider that is OpenID Connect (OIDC) compliant.</p> <p>[HTTPS listeners] If the action type is <code>authenticate-cognito</code>, you authenticate users through the user pools supported by Amazon Cognito.</p> <p>[Application Load Balancer] If the action type is <code>redirect</code>, you redirect specified client requests from one URL to another.</p> <p>[Application Load Balancer] If the action type is <code>fixed-response</code>, you drop specified client requests and return a custom HTTP response.</p>"
         }
       }
     },
@@ -2224,7 +2250,7 @@
         },
         "HealthCheckProtocol":{
           "shape":"ProtocolEnum",
-          "documentation":"<p>The protocol the load balancer uses when performing health checks on targets. The TCP protocol is supported for health checks only if the protocol of the target group is TCP, TLS, UDP, or TCP_UDP. The TLS, UDP, and TCP_UDP protocols are not supported for health checks.</p> <p>If the protocol of the target group is TCP, you can't modify this setting.</p>"
+          "documentation":"<p>The protocol the load balancer uses when performing health checks on targets. The TCP protocol is supported for health checks only if the protocol of the target group is TCP, TLS, UDP, or TCP_UDP. The TLS, UDP, and TCP_UDP protocols are not supported for health checks.</p> <p>With Network Load Balancers, you can't modify this setting.</p>"
         },
         "HealthCheckPort":{
           "shape":"HealthCheckPort",
@@ -2240,11 +2266,11 @@
         },
         "HealthCheckIntervalSeconds":{
           "shape":"HealthCheckIntervalSeconds",
-          "documentation":"<p>The approximate amount of time, in seconds, between health checks of an individual target. For Application Load Balancers, the range is 5 to 300 seconds. For Network Load Balancers, the supported values are 10 or 30 seconds.</p> <p>If the protocol of the target group is TCP, you can't modify this setting.</p>"
+          "documentation":"<p>The approximate amount of time, in seconds, between health checks of an individual target. For Application Load Balancers, the range is 5 to 300 seconds. For Network Load Balancers, the supported values are 10 or 30 seconds.</p> <p>With Network Load Balancers, you can't modify this setting.</p>"
         },
         "HealthCheckTimeoutSeconds":{
           "shape":"HealthCheckTimeoutSeconds",
-          "documentation":"<p>[HTTP/HTTPS health checks] The amount of time, in seconds, during which no response means a failed health check.</p> <p>If the protocol of the target group is TCP, you can't modify this setting.</p>"
+          "documentation":"<p>[HTTP/HTTPS health checks] The amount of time, in seconds, during which no response means a failed health check.</p> <p>With Network Load Balancers, you can't modify this setting.</p>"
         },
         "HealthyThresholdCount":{
           "shape":"HealthCheckThresholdCount",
@@ -2256,7 +2282,7 @@
         },
         "Matcher":{
           "shape":"Matcher",
-          "documentation":"<p>[HTTP/HTTPS health checks] The HTTP codes to use when checking for a successful response from a target.</p> <p>If the protocol of the target group is TCP, you can't modify this setting.</p>"
+          "documentation":"<p>[HTTP/HTTPS health checks] The HTTP codes to use when checking for a successful response from a target.</p> <p>With Network Load Balancers, you can't modify this setting.</p>"
         }
       }
     },
@@ -2319,6 +2345,7 @@
       },
       "exception":true
     },
+    "PrivateIPv4Address":{"type":"string"},
     "ProtocolEnum":{
       "type":"string",
       "enum":[
@@ -2713,7 +2740,7 @@
         },
         "SubnetMappings":{
           "shape":"SubnetMappings",
-          "documentation":"<p>The IDs of the public subnets. You must specify subnets from at least two Availability Zones. You can specify only one subnet per Availability Zone. You must specify either subnets or subnet mappings.</p> <p>You cannot specify Elastic IP addresses for your subnets.</p>"
+          "documentation":"<p>The IDs of the public subnets. You can specify only one subnet per Availability Zone. You must specify either subnets or subnet mappings.</p> <p>[Application Load Balancers] You must specify subnets from at least two Availability Zones. You cannot specify Elastic IP addresses for your subnets.</p> <p>[Network Load Balancers] You can specify subnets from one or more Availability Zones. If you need static IP addresses for your internet-facing load balancer, you can specify one Elastic IP address per subnet. For internal load balancers, you can specify one private IP address per subnet from the IPv4 range of the subnet.</p>"
         }
       }
     },
@@ -2781,7 +2808,11 @@
         },
         "AllocationId":{
           "shape":"AllocationId",
-          "documentation":"<p>[Network Load Balancers] The allocation ID of the Elastic IP address.</p>"
+          "documentation":"<p>[Network Load Balancers] The allocation ID of the Elastic IP address for an internet-facing load balancer.</p>"
+        },
+        "PrivateIPv4Address":{
+          "shape":"PrivateIPv4Address",
+          "documentation":"<p>[Network Load Balancers] The private IPv4 address for an internal load balancer.</p>"
         }
       },
       "documentation":"<p>Information about a subnet mapping.</p>"
@@ -2870,7 +2901,7 @@
         },
         "Port":{
           "shape":"Port",
-          "documentation":"<p>The port on which the target is listening.</p>"
+          "documentation":"<p>The port on which the target is listening. Not used if the target is a Lambda function.</p>"
         },
         "AvailabilityZone":{
           "shape":"ZoneName",
@@ -2900,7 +2931,7 @@
         },
         "Port":{
           "shape":"Port",
-          "documentation":"<p>The port on which the targets are listening.</p>"
+          "documentation":"<p>The port on which the targets are listening. Not used if the target is a Lambda function.</p>"
         },
         "VpcId":{
           "shape":"VpcId",
@@ -2975,7 +3006,7 @@
       "members":{
         "Key":{
           "shape":"TargetGroupAttributeKey",
-          "documentation":"<p>The name of the attribute.</p> <p>The following attribute is supported by both Application Load Balancers and Network Load Balancers:</p> <ul> <li> <p> <code>deregistration_delay.timeout_seconds</code> - The amount of time, in seconds, for Elastic Load Balancing to wait before changing the state of a deregistering target from <code>draining</code> to <code>unused</code>. The range is 0-3600 seconds. The default value is 300 seconds. If the target is a Lambda function, this attribute is not supported.</p> </li> </ul> <p>The following attributes are supported by Application Load Balancers if the target is not a Lambda function:</p> <ul> <li> <p> <code>slow_start.duration_seconds</code> - The time period, in seconds, during which a newly registered target receives a linearly increasing share of the traffic to the target group. After this time period ends, the target receives its full share of traffic. The range is 30-900 seconds (15 minutes). Slow start mode is disabled by default.</p> </li> <li> <p> <code>stickiness.enabled</code> - Indicates whether sticky sessions are enabled. The value is <code>true</code> or <code>false</code>. The default is <code>false</code>.</p> </li> <li> <p> <code>stickiness.type</code> - The type of sticky sessions. The possible value is <code>lb_cookie</code>.</p> </li> <li> <p> <code>stickiness.lb_cookie.duration_seconds</code> - The time period, in seconds, during which requests from a client should be routed to the same target. After this time period expires, the load balancer-generated cookie is considered stale. The range is 1 second to 1 week (604800 seconds). The default value is 1 day (86400 seconds).</p> </li> </ul> <p>The following attribute is supported only if the target is a Lambda function.</p> <ul> <li> <p> <code>lambda.multi_value_headers.enabled</code> - Indicates whether the request and response headers exchanged between the load balancer and the Lambda function include arrays of values or strings. The value is <code>true</code> or <code>false</code>. The default is <code>false</code>. If the value is <code>false</code> and the request contains a duplicate header field name or query parameter key, the load balancer uses the last value sent by the client.</p> </li> </ul> <p>The following attribute is supported only by Network Load Balancers:</p> <ul> <li> <p> <code>proxy_protocol_v2.enabled</code> - Indicates whether Proxy Protocol version 2 is enabled. The value is <code>true</code> or <code>false</code>. The default is <code>false</code>.</p> </li> </ul>"
+          "documentation":"<p>The name of the attribute.</p> <p>The following attributes are supported by both Application Load Balancers and Network Load Balancers:</p> <ul> <li> <p> <code>deregistration_delay.timeout_seconds</code> - The amount of time, in seconds, for Elastic Load Balancing to wait before changing the state of a deregistering target from <code>draining</code> to <code>unused</code>. The range is 0-3600 seconds. The default value is 300 seconds. If the target is a Lambda function, this attribute is not supported.</p> </li> <li> <p> <code>stickiness.enabled</code> - Indicates whether sticky sessions are enabled. The value is <code>true</code> or <code>false</code>. The default is <code>false</code>.</p> </li> <li> <p> <code>stickiness.type</code> - The type of sticky sessions. The possible values are <code>lb_cookie</code> for Application Load Balancers or <code>source_ip</code> for Network Load Balancers.</p> </li> </ul> <p>The following attributes are supported by Application Load Balancers if the target is not a Lambda function:</p> <ul> <li> <p> <code>load_balancing.algorithm.type</code> - The load balancing algorithm determines how the load balancer selects targets when routing requests. The value is <code>round_robin</code> or <code>least_outstanding_requests</code>. The default is <code>round_robin</code>.</p> </li> <li> <p> <code>slow_start.duration_seconds</code> - The time period, in seconds, during which a newly registered target receives a linearly increasing share of the traffic to the target group. After this time period ends, the target receives its full share of traffic. The range is 30-900 seconds (15 minutes). Slow start mode is disabled by default.</p> </li> <li> <p> <code>stickiness.lb_cookie.duration_seconds</code> - The time period, in seconds, during which requests from a client should be routed to the same target. After this time period expires, the load balancer-generated cookie is considered stale. The range is 1 second to 1 week (604800 seconds). The default value is 1 day (86400 seconds).</p> </li> </ul> <p>The following attribute is supported only if the target is a Lambda function.</p> <ul> <li> <p> <code>lambda.multi_value_headers.enabled</code> - Indicates whether the request and response headers exchanged between the load balancer and the Lambda function include arrays of values or strings. The value is <code>true</code> or <code>false</code>. The default is <code>false</code>. If the value is <code>false</code> and the request contains a duplicate header field name or query parameter key, the load balancer uses the last value sent by the client.</p> </li> </ul> <p>The following attribute is supported only by Network Load Balancers:</p> <ul> <li> <p> <code>proxy_protocol_v2.enabled</code> - Indicates whether Proxy Protocol version 2 is enabled. The value is <code>true</code> or <code>false</code>. The default is <code>false</code>.</p> </li> </ul>"
         },
         "Value":{
           "shape":"TargetGroupAttributeValue",
@@ -2994,6 +3025,10 @@
       "type":"list",
       "member":{"shape":"TargetGroupAttribute"}
     },
+    "TargetGroupList":{
+      "type":"list",
+      "member":{"shape":"TargetGroupTuple"}
+    },
     "TargetGroupName":{"type":"string"},
     "TargetGroupNames":{
       "type":"list",
@@ -3011,6 +3046,37 @@
       },
       "exception":true
     },
+    "TargetGroupStickinessConfig":{
+      "type":"structure",
+      "members":{
+        "Enabled":{
+          "shape":"TargetGroupStickinessEnabled",
+          "documentation":"<p>Indicates whether target group stickiness is enabled.</p>"
+        },
+        "DurationSeconds":{
+          "shape":"TargetGroupStickinessDurationSeconds",
+          "documentation":"<p>The time period, in seconds, during which requests from a client should be routed to the same target group. The range is 1-604800 seconds (7 days).</p>"
+        }
+      },
+      "documentation":"<p>Information about the target group stickiness for a rule.</p>"
+    },
+    "TargetGroupStickinessDurationSeconds":{"type":"integer"},
+    "TargetGroupStickinessEnabled":{"type":"boolean"},
+    "TargetGroupTuple":{
+      "type":"structure",
+      "members":{
+        "TargetGroupArn":{
+          "shape":"TargetGroupArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the target group.</p>"
+        },
+        "Weight":{
+          "shape":"TargetGroupWeight",
+          "documentation":"<p>The weight. The range is 0 to 999.</p>"
+        }
+      },
+      "documentation":"<p>Information about how traffic will be distributed between multiple target groups in a forward rule.</p>"
+    },
+    "TargetGroupWeight":{"type":"integer"},
     "TargetGroups":{
       "type":"list",
       "member":{"shape":"TargetGroup"}
@@ -3024,7 +3090,7 @@
         },
         "Reason":{
           "shape":"TargetHealthReasonEnum",
-          "documentation":"<p>The reason code.</p> <p>If the target state is <code>healthy</code>, a reason code is not provided.</p> <p>If the target state is <code>initial</code>, the reason code can be one of the following values:</p> <ul> <li> <p> <code>Elb.RegistrationInProgress</code> - The target is in the process of being registered with the load balancer.</p> </li> <li> <p> <code>Elb.InitialHealthChecking</code> - The load balancer is still sending the target the minimum number of health checks required to determine its health status.</p> </li> </ul> <p>If the target state is <code>unhealthy</code>, the reason code can be one of the following values:</p> <ul> <li> <p> <code>Target.ResponseCodeMismatch</code> - The health checks did not return an expected HTTP code.</p> </li> <li> <p> <code>Target.Timeout</code> - The health check requests timed out.</p> </li> <li> <p> <code>Target.FailedHealthChecks</code> - The load balancer received an error while establishing a connection to the target or the target response was malformed.</p> </li> <li> <p> <code>Elb.InternalError</code> - The health checks failed due to an internal error.</p> </li> </ul> <p>If the target state is <code>unused</code>, the reason code can be one of the following values:</p> <ul> <li> <p> <code>Target.NotRegistered</code> - The target is not registered with the target group.</p> </li> <li> <p> <code>Target.NotInUse</code> - The target group is not used by any load balancer or the target is in an Availability Zone that is not enabled for its load balancer.</p> </li> <li> <p> <code>Target.IpUnusable</code> - The target IP address is reserved for use by a load balancer.</p> </li> <li> <p> <code>Target.InvalidState</code> - The target is in the stopped or terminated state.</p> </li> </ul> <p>If the target state is <code>draining</code>, the reason code can be the following value:</p> <ul> <li> <p> <code>Target.DeregistrationInProgress</code> - The target is in the process of being deregistered and the deregistration delay period has not expired.</p> </li> </ul> <p>If the target state is <code>unavailable</code>, the reason code can be the following value:</p> <ul> <li> <p> <code>Target.HealthCheckDisabled</code> - Health checks are disabled for the target group.</p> </li> </ul>"
+          "documentation":"<p>The reason code.</p> <p>If the target state is <code>healthy</code>, a reason code is not provided.</p> <p>If the target state is <code>initial</code>, the reason code can be one of the following values:</p> <ul> <li> <p> <code>Elb.RegistrationInProgress</code> - The target is in the process of being registered with the load balancer.</p> </li> <li> <p> <code>Elb.InitialHealthChecking</code> - The load balancer is still sending the target the minimum number of health checks required to determine its health status.</p> </li> </ul> <p>If the target state is <code>unhealthy</code>, the reason code can be one of the following values:</p> <ul> <li> <p> <code>Target.ResponseCodeMismatch</code> - The health checks did not return an expected HTTP code. Applies only to Application Load Balancers.</p> </li> <li> <p> <code>Target.Timeout</code> - The health check requests timed out. Applies only to Application Load Balancers.</p> </li> <li> <p> <code>Target.FailedHealthChecks</code> - The load balancer received an error while establishing a connection to the target or the target response was malformed.</p> </li> <li> <p> <code>Elb.InternalError</code> - The health checks failed due to an internal error. Applies only to Application Load Balancers.</p> </li> </ul> <p>If the target state is <code>unused</code>, the reason code can be one of the following values:</p> <ul> <li> <p> <code>Target.NotRegistered</code> - The target is not registered with the target group.</p> </li> <li> <p> <code>Target.NotInUse</code> - The target group is not used by any load balancer or the target is in an Availability Zone that is not enabled for its load balancer.</p> </li> <li> <p> <code>Target.InvalidState</code> - The target is in the stopped or terminated state.</p> </li> <li> <p> <code>Target.IpUnusable</code> - The target IP address is reserved for use by a load balancer.</p> </li> </ul> <p>If the target state is <code>draining</code>, the reason code can be the following value:</p> <ul> <li> <p> <code>Target.DeregistrationInProgress</code> - The target is in the process of being deregistered and the deregistration delay period has not expired.</p> </li> </ul> <p>If the target state is <code>unavailable</code>, the reason code can be the following value:</p> <ul> <li> <p> <code>Target.HealthCheckDisabled</code> - Health checks are disabled for the target group. Applies only to Application Load Balancers.</p> </li> <li> <p> <code>Elb.InternalError</code> - Target health is unavailable due to an internal error. Applies only to Network Load Balancers.</p> </li> </ul>"
         },
         "Description":{
           "shape":"Description",
@@ -3200,6 +3266,18 @@
       },
       "exception":true
     },
+    "TooManyUniqueTargetGroupsPerLoadBalancerException":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>You've reached the limit on the number of unique target groups per load balancer across all listeners. If a target group is used by multiple actions for a load balancer, it is counted as only one use.</p>",
+      "error":{
+        "code":"TooManyUniqueTargetGroupsPerLoadBalancer",
+        "httpStatusCode":400,
+        "senderFault":true
+      },
+      "exception":true
+    },
     "UnsupportedProtocolException":{
       "type":"structure",
       "members":{
diff --git a/services/elasticloadbalancingv2/src/test/resources/cucumber.properties b/services/elasticloadbalancingv2/src/test/resources/cucumber.properties
index 2853ec6dc1a1..ca87c9e49021 100644
--- a/services/elasticloadbalancingv2/src/test/resources/cucumber.properties
+++ b/services/elasticloadbalancingv2/src/test/resources/cucumber.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/elasticsearch/build.properties b/services/elasticsearch/build.properties
index ecf2dae6fcb1..15ec2da1fc71 100644
--- a/services/elasticsearch/build.properties
+++ b/services/elasticsearch/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/elasticsearch/pom.xml b/services/elasticsearch/pom.xml
index 902f73bee817..c212cec9b8b9 100644
--- a/services/elasticsearch/pom.xml
+++ b/services/elasticsearch/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>elasticsearch</artifactId>
     <name>AWS Java SDK :: Services :: Amazon Elasticsearch Service</name>
diff --git a/services/elasticsearch/src/it/java/software/amazon/awssdk/services/elasticsearch/ServiceIntegrationTest.java b/services/elasticsearch/src/it/java/software/amazon/awssdk/services/elasticsearch/ServiceIntegrationTest.java
index 62e0089fe4b9..9a960a29d3fe 100644
--- a/services/elasticsearch/src/it/java/software/amazon/awssdk/services/elasticsearch/ServiceIntegrationTest.java
+++ b/services/elasticsearch/src/it/java/software/amazon/awssdk/services/elasticsearch/ServiceIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/elasticsearch/src/main/resources/codegen-resources/paginators-1.json b/services/elasticsearch/src/main/resources/codegen-resources/paginators-1.json
index a8442e1eb5fc..e360c36eb9ac 100755
--- a/services/elasticsearch/src/main/resources/codegen-resources/paginators-1.json
+++ b/services/elasticsearch/src/main/resources/codegen-resources/paginators-1.json
@@ -1,5 +1,10 @@
 {
   "pagination": {
+    "DescribePackages": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "MaxResults"
+    },
     "DescribeReservedElasticsearchInstanceOfferings": {
       "input_token": "NextToken",
       "output_token": "NextToken",
@@ -15,6 +20,11 @@
       "output_token": "NextToken",
       "limit_key": "MaxResults"
     },
+    "ListDomainsForPackage": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "MaxResults"
+    },
     "ListElasticsearchInstanceTypes": {
       "input_token": "NextToken",
       "output_token": "NextToken",
@@ -24,6 +34,11 @@
       "input_token": "NextToken",
       "output_token": "NextToken",
       "limit_key": "MaxResults"
+    },
+    "ListPackagesForDomain": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "MaxResults"
     }
   }
 }
diff --git a/services/elasticsearch/src/main/resources/codegen-resources/service-2.json b/services/elasticsearch/src/main/resources/codegen-resources/service-2.json
index f3ce05306ab1..5bd871c9a7ee 100644
--- a/services/elasticsearch/src/main/resources/codegen-resources/service-2.json
+++ b/services/elasticsearch/src/main/resources/codegen-resources/service-2.json
@@ -25,6 +25,24 @@
       ],
       "documentation":"<p>Attaches tags to an existing Elasticsearch domain. Tags are a set of case-sensitive key value pairs. An Elasticsearch domain may have up to 10 tags. See <a href=\"http://docs.aws.amazon.com/elasticsearch-service/latest/developerguide/es-managedomains.html#es-managedomains-awsresorcetagging\" target=\"_blank\"> Tagging Amazon Elasticsearch Service Domains for more information.</a></p>"
     },
+    "AssociatePackage":{
+      "name":"AssociatePackage",
+      "http":{
+        "method":"POST",
+        "requestUri":"/2015-01-01/packages/associate/{PackageID}/{DomainName}"
+      },
+      "input":{"shape":"AssociatePackageRequest"},
+      "output":{"shape":"AssociatePackageResponse"},
+      "errors":[
+        {"shape":"BaseException"},
+        {"shape":"InternalException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"ValidationException"},
+        {"shape":"ConflictException"}
+      ],
+      "documentation":"<p>Associates a package with an Amazon ES domain.</p>"
+    },
     "CancelElasticsearchServiceSoftwareUpdate":{
       "name":"CancelElasticsearchServiceSoftwareUpdate",
       "http":{
@@ -60,6 +78,25 @@
       ],
       "documentation":"<p>Creates a new Elasticsearch domain. For more information, see <a href=\"http://docs.aws.amazon.com/elasticsearch-service/latest/developerguide/es-createupdatedomains.html#es-createdomains\" target=\"_blank\">Creating Elasticsearch Domains</a> in the <i>Amazon Elasticsearch Service Developer Guide</i>.</p>"
     },
+    "CreatePackage":{
+      "name":"CreatePackage",
+      "http":{
+        "method":"POST",
+        "requestUri":"/2015-01-01/packages"
+      },
+      "input":{"shape":"CreatePackageRequest"},
+      "output":{"shape":"CreatePackageResponse"},
+      "errors":[
+        {"shape":"BaseException"},
+        {"shape":"InternalException"},
+        {"shape":"LimitExceededException"},
+        {"shape":"InvalidTypeException"},
+        {"shape":"ResourceAlreadyExistsException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"ValidationException"}
+      ],
+      "documentation":"<p>Create a package for use with Amazon ES domains.</p>"
+    },
     "DeleteElasticsearchDomain":{
       "name":"DeleteElasticsearchDomain",
       "http":{
@@ -89,6 +126,24 @@
       ],
       "documentation":"<p>Deletes the service-linked role that Elasticsearch Service uses to manage and maintain VPC domains. Role deletion will fail if any existing VPC domains use the role. You must delete any such Elasticsearch domains before deleting the role. See <a href=\"http://docs.aws.amazon.com/elasticsearch-service/latest/developerguide/es-vpc.html#es-enabling-slr\" target=\"_blank\">Deleting Elasticsearch Service Role</a> in <i>VPC Endpoints for Amazon Elasticsearch Service Domains</i>.</p>"
     },
+    "DeletePackage":{
+      "name":"DeletePackage",
+      "http":{
+        "method":"DELETE",
+        "requestUri":"/2015-01-01/packages/{PackageID}"
+      },
+      "input":{"shape":"DeletePackageRequest"},
+      "output":{"shape":"DeletePackageResponse"},
+      "errors":[
+        {"shape":"BaseException"},
+        {"shape":"InternalException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"ValidationException"},
+        {"shape":"ConflictException"}
+      ],
+      "documentation":"<p>Delete the package.</p>"
+    },
     "DescribeElasticsearchDomain":{
       "name":"DescribeElasticsearchDomain",
       "http":{
@@ -154,6 +209,23 @@
       ],
       "documentation":"<p> Describe Elasticsearch Limits for a given InstanceType and ElasticsearchVersion. When modifying existing Domain, specify the <code> <a>DomainName</a> </code> to know what Limits are supported for modifying. </p>"
     },
+    "DescribePackages":{
+      "name":"DescribePackages",
+      "http":{
+        "method":"POST",
+        "requestUri":"/2015-01-01/packages/describe"
+      },
+      "input":{"shape":"DescribePackagesRequest"},
+      "output":{"shape":"DescribePackagesResponse"},
+      "errors":[
+        {"shape":"BaseException"},
+        {"shape":"InternalException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"ValidationException"}
+      ],
+      "documentation":"<p>Describes all packages available to Amazon ES. Includes options for filtering, limiting the number of results, and pagination.</p>"
+    },
     "DescribeReservedElasticsearchInstanceOfferings":{
       "name":"DescribeReservedElasticsearchInstanceOfferings",
       "http":{
@@ -186,6 +258,24 @@
       ],
       "documentation":"<p>Returns information about reserved Elasticsearch instances for this account.</p>"
     },
+    "DissociatePackage":{
+      "name":"DissociatePackage",
+      "http":{
+        "method":"POST",
+        "requestUri":"/2015-01-01/packages/dissociate/{PackageID}/{DomainName}"
+      },
+      "input":{"shape":"DissociatePackageRequest"},
+      "output":{"shape":"DissociatePackageResponse"},
+      "errors":[
+        {"shape":"BaseException"},
+        {"shape":"InternalException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"ValidationException"},
+        {"shape":"ConflictException"}
+      ],
+      "documentation":"<p>Dissociates a package from the Amazon ES domain.</p>"
+    },
     "GetCompatibleElasticsearchVersions":{
       "name":"GetCompatibleElasticsearchVersions",
       "http":{
@@ -250,6 +340,23 @@
       ],
       "documentation":"<p>Returns the name of all Elasticsearch domains owned by the current user's account. </p>"
     },
+    "ListDomainsForPackage":{
+      "name":"ListDomainsForPackage",
+      "http":{
+        "method":"GET",
+        "requestUri":"/2015-01-01/packages/{PackageID}/domains"
+      },
+      "input":{"shape":"ListDomainsForPackageRequest"},
+      "output":{"shape":"ListDomainsForPackageResponse"},
+      "errors":[
+        {"shape":"BaseException"},
+        {"shape":"InternalException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"ValidationException"}
+      ],
+      "documentation":"<p>Lists all Amazon ES domains associated with the package.</p>"
+    },
     "ListElasticsearchInstanceTypes":{
       "name":"ListElasticsearchInstanceTypes",
       "http":{
@@ -282,6 +389,23 @@
       ],
       "documentation":"<p>List all supported Elasticsearch versions</p>"
     },
+    "ListPackagesForDomain":{
+      "name":"ListPackagesForDomain",
+      "http":{
+        "method":"GET",
+        "requestUri":"/2015-01-01/domain/{DomainName}/packages"
+      },
+      "input":{"shape":"ListPackagesForDomainRequest"},
+      "output":{"shape":"ListPackagesForDomainResponse"},
+      "errors":[
+        {"shape":"BaseException"},
+        {"shape":"InternalException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"ValidationException"}
+      ],
+      "documentation":"<p>Lists all packages associated with the Amazon ES domain.</p>"
+    },
     "ListTags":{
       "name":"ListTags",
       "http":{
@@ -388,6 +512,14 @@
       "type":"string",
       "documentation":"<p>The Amazon Resource Name (ARN) of the Elasticsearch domain. See <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/index.html?Using_Identifiers.html\" target=\"_blank\">Identifiers for IAM Entities</a> in <i>Using AWS Identity and Access Management</i> for more information.</p>"
     },
+    "AccessDeniedException":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>An error occurred because user does not have permissions to access the resource. Returns HTTP status code 403.</p>",
+      "error":{"httpStatusCode":403},
+      "exception":true
+    },
     "AccessPoliciesStatus":{
       "type":"structure",
       "required":[
@@ -466,6 +598,88 @@
       },
       "documentation":"<p> Status of the advanced options for the specified Elasticsearch domain. Currently, the following advanced options are available:</p> <ul> <li>Option to allow references to indices in an HTTP request body. Must be <code>false</code> when configuring access to individual sub-resources. By default, the value is <code>true</code>. See <a href=\"http://docs.aws.amazon.com/elasticsearch-service/latest/developerguide/es-createupdatedomains.html#es-createdomain-configure-advanced-options\" target=\"_blank\">Configuration Advanced Options</a> for more information.</li> <li>Option to specify the percentage of heap space that is allocated to field data. By default, this setting is unbounded.</li> </ul> <p>For more information, see <a href=\"http://docs.aws.amazon.com/elasticsearch-service/latest/developerguide/es-createupdatedomains.html#es-createdomain-configure-advanced-options\">Configuring Advanced Options</a>.</p>"
     },
+    "AdvancedSecurityOptions":{
+      "type":"structure",
+      "members":{
+        "Enabled":{
+          "shape":"Boolean",
+          "documentation":"<p>True if advanced security is enabled.</p>"
+        },
+        "InternalUserDatabaseEnabled":{
+          "shape":"Boolean",
+          "documentation":"<p>True if the internal user database is enabled.</p>"
+        }
+      },
+      "documentation":"<p>Specifies the advanced security configuration: whether advanced security is enabled, whether the internal database option is enabled.</p>"
+    },
+    "AdvancedSecurityOptionsInput":{
+      "type":"structure",
+      "members":{
+        "Enabled":{
+          "shape":"Boolean",
+          "documentation":"<p>True if advanced security is enabled.</p>"
+        },
+        "InternalUserDatabaseEnabled":{
+          "shape":"Boolean",
+          "documentation":"<p>True if the internal user database is enabled.</p>"
+        },
+        "MasterUserOptions":{
+          "shape":"MasterUserOptions",
+          "documentation":"<p>Credentials for the master user: username and password, ARN, or both.</p>"
+        }
+      },
+      "documentation":"<p>Specifies the advanced security configuration: whether advanced security is enabled, whether the internal database option is enabled, master username and password (if internal database is enabled), and master user ARN (if IAM is enabled).</p>"
+    },
+    "AdvancedSecurityOptionsStatus":{
+      "type":"structure",
+      "required":[
+        "Options",
+        "Status"
+      ],
+      "members":{
+        "Options":{
+          "shape":"AdvancedSecurityOptions",
+          "documentation":"<p> Specifies advanced security options for the specified Elasticsearch domain.</p>"
+        },
+        "Status":{
+          "shape":"OptionStatus",
+          "documentation":"<p> Status of the advanced security options for the specified Elasticsearch domain.</p>"
+        }
+      },
+      "documentation":"<p> Specifies the status of advanced security options for the specified Elasticsearch domain.</p>"
+    },
+    "AssociatePackageRequest":{
+      "type":"structure",
+      "required":[
+        "PackageID",
+        "DomainName"
+      ],
+      "members":{
+        "PackageID":{
+          "shape":"PackageID",
+          "documentation":"<p>Internal ID of the package that you want to associate with a domain. Use <code>DescribePackages</code> to find this value.</p>",
+          "location":"uri",
+          "locationName":"PackageID"
+        },
+        "DomainName":{
+          "shape":"DomainName",
+          "documentation":"<p>Name of the domain that you want to associate the package with.</p>",
+          "location":"uri",
+          "locationName":"DomainName"
+        }
+      },
+      "documentation":"<p> Container for request parameters to <code> <a>AssociatePackage</a> </code> operation. </p>"
+    },
+    "AssociatePackageResponse":{
+      "type":"structure",
+      "members":{
+        "DomainPackageDetails":{
+          "shape":"DomainPackageDetails",
+          "documentation":"<p><code>DomainPackageDetails</code></p>"
+        }
+      },
+      "documentation":"<p> Container for response returned by <code> <a>AssociatePackage</a> </code> operation. </p>"
+    },
     "BaseException":{
       "type":"structure",
       "members":{
@@ -558,6 +772,14 @@
       },
       "documentation":"<p> A map from an <code> <a>ElasticsearchVersion</a> </code> to a list of compatible <code> <a>ElasticsearchVersion</a> </code> s to which the domain can be upgraded. </p>"
     },
+    "ConflictException":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>An error occurred because the client attempts to remove a resource that is currently in use. Returns HTTP status code 409.</p>",
+      "error":{"httpStatusCode":409},
+      "exception":true
+    },
     "CreateElasticsearchDomainRequest":{
       "type":"structure",
       "required":["DomainName"],
@@ -613,6 +835,10 @@
         "DomainEndpointOptions":{
           "shape":"DomainEndpointOptions",
           "documentation":"<p>Options to specify configuration that will be applied to the domain endpoint.</p>"
+        },
+        "AdvancedSecurityOptions":{
+          "shape":"AdvancedSecurityOptionsInput",
+          "documentation":"<p>Specifies advanced security options.</p>"
         }
       }
     },
@@ -626,6 +852,44 @@
       },
       "documentation":"<p>The result of a <code>CreateElasticsearchDomain</code> operation. Contains the status of the newly created Elasticsearch domain.</p>"
     },
+    "CreatePackageRequest":{
+      "type":"structure",
+      "required":[
+        "PackageName",
+        "PackageType",
+        "PackageSource"
+      ],
+      "members":{
+        "PackageName":{
+          "shape":"PackageName",
+          "documentation":"<p>Unique identifier for the package.</p>"
+        },
+        "PackageType":{
+          "shape":"PackageType",
+          "documentation":"<p>Type of package. Currently supports only TXT-DICTIONARY.</p>"
+        },
+        "PackageDescription":{
+          "shape":"PackageDescription",
+          "documentation":"<p>Description of the package.</p>"
+        },
+        "PackageSource":{
+          "shape":"PackageSource",
+          "documentation":"<p>The customer S3 location <code>PackageSource</code> for importing the package.</p>"
+        }
+      },
+      "documentation":"<p> Container for request parameters to <code> <a>CreatePackage</a> </code> operation. </p>"
+    },
+    "CreatePackageResponse":{
+      "type":"structure",
+      "members":{
+        "PackageDetails":{
+          "shape":"PackageDetails",
+          "documentation":"<p>Information about the package <code>PackageDetails</code>.</p>"
+        }
+      },
+      "documentation":"<p> Container for response returned by <code> <a>CreatePackage</a> </code> operation. </p>"
+    },
+    "CreatedAt":{"type":"timestamp"},
     "DeleteElasticsearchDomainRequest":{
       "type":"structure",
       "required":["DomainName"],
@@ -649,6 +913,29 @@
       },
       "documentation":"<p>The result of a <code>DeleteElasticsearchDomain</code> request. Contains the status of the pending deletion, or no status if the domain and all of its resources have been deleted.</p>"
     },
+    "DeletePackageRequest":{
+      "type":"structure",
+      "required":["PackageID"],
+      "members":{
+        "PackageID":{
+          "shape":"PackageID",
+          "documentation":"<p>Internal ID of the package that you want to delete. Use <code>DescribePackages</code> to find this value.</p>",
+          "location":"uri",
+          "locationName":"PackageID"
+        }
+      },
+      "documentation":"<p> Container for request parameters to <code> <a>DeletePackage</a> </code> operation. </p>"
+    },
+    "DeletePackageResponse":{
+      "type":"structure",
+      "members":{
+        "PackageDetails":{
+          "shape":"PackageDetails",
+          "documentation":"<p><code>PackageDetails</code></p>"
+        }
+      },
+      "documentation":"<p> Container for response parameters to <code> <a>DeletePackage</a> </code> operation. </p>"
+    },
     "DeploymentCloseDateTimeStamp":{"type":"timestamp"},
     "DeploymentStatus":{
       "type":"string",
@@ -765,6 +1052,70 @@
       },
       "documentation":"<p> Container for the parameters received from <code> <a>DescribeElasticsearchInstanceTypeLimits</a> </code> operation. </p>"
     },
+    "DescribePackagesFilter":{
+      "type":"structure",
+      "members":{
+        "Name":{
+          "shape":"DescribePackagesFilterName",
+          "documentation":"<p>Any field from <code>PackageDetails</code>.</p>"
+        },
+        "Value":{
+          "shape":"DescribePackagesFilterValues",
+          "documentation":"<p>A list of values for the specified field.</p>"
+        }
+      },
+      "documentation":"<p>Filter to apply in <code>DescribePackage</code> response.</p>"
+    },
+    "DescribePackagesFilterList":{
+      "type":"list",
+      "member":{"shape":"DescribePackagesFilter"},
+      "documentation":"<p>A list of <code>DescribePackagesFilter</code> to filter the packages included in a <code>DescribePackages</code> response.</p>"
+    },
+    "DescribePackagesFilterName":{
+      "type":"string",
+      "enum":[
+        "PackageID",
+        "PackageName",
+        "PackageStatus"
+      ]
+    },
+    "DescribePackagesFilterValue":{
+      "type":"string",
+      "pattern":"^[0-9a-zA-Z\\*\\.\\\\/\\?-]*$"
+    },
+    "DescribePackagesFilterValues":{
+      "type":"list",
+      "member":{"shape":"DescribePackagesFilterValue"}
+    },
+    "DescribePackagesRequest":{
+      "type":"structure",
+      "members":{
+        "Filters":{
+          "shape":"DescribePackagesFilterList",
+          "documentation":"<p>Only returns packages that match the <code>DescribePackagesFilterList</code> values.</p>"
+        },
+        "MaxResults":{
+          "shape":"MaxResults",
+          "documentation":"<p>Limits results to a maximum number of packages.</p>"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>Used for pagination. Only necessary if a previous API call includes a non-null NextToken value. If provided, returns results for the next page.</p>"
+        }
+      },
+      "documentation":"<p> Container for request parameters to <code> <a>DescribePackage</a> </code> operation. </p>"
+    },
+    "DescribePackagesResponse":{
+      "type":"structure",
+      "members":{
+        "PackageDetailsList":{
+          "shape":"PackageDetailsList",
+          "documentation":"<p>List of <code>PackageDetails</code> objects.</p>"
+        },
+        "NextToken":{"shape":"String"}
+      },
+      "documentation":"<p> Container for response returned by <code> <a>DescribePackages</a> </code> operation. </p>"
+    },
     "DescribeReservedElasticsearchInstanceOfferingsRequest":{
       "type":"structure",
       "members":{
@@ -849,6 +1200,38 @@
       "error":{"httpStatusCode":409},
       "exception":true
     },
+    "DissociatePackageRequest":{
+      "type":"structure",
+      "required":[
+        "PackageID",
+        "DomainName"
+      ],
+      "members":{
+        "PackageID":{
+          "shape":"PackageID",
+          "documentation":"<p>Internal ID of the package that you want to associate with a domain. Use <code>DescribePackages</code> to find this value.</p>",
+          "location":"uri",
+          "locationName":"PackageID"
+        },
+        "DomainName":{
+          "shape":"DomainName",
+          "documentation":"<p>Name of the domain that you want to associate the package with.</p>",
+          "location":"uri",
+          "locationName":"DomainName"
+        }
+      },
+      "documentation":"<p> Container for request parameters to <code> <a>DissociatePackage</a> </code> operation. </p>"
+    },
+    "DissociatePackageResponse":{
+      "type":"structure",
+      "members":{
+        "DomainPackageDetails":{
+          "shape":"DomainPackageDetails",
+          "documentation":"<p><code>DomainPackageDetails</code></p>"
+        }
+      },
+      "documentation":"<p> Container for response returned by <code> <a>DissociatePackage</a> </code> operation. </p>"
+    },
     "DomainEndpointOptions":{
       "type":"structure",
       "members":{
@@ -913,6 +1296,58 @@
       "member":{"shape":"DomainName"},
       "documentation":"<p>A list of Elasticsearch domain names.</p>"
     },
+    "DomainPackageDetails":{
+      "type":"structure",
+      "members":{
+        "PackageID":{
+          "shape":"PackageID",
+          "documentation":"<p>Internal ID of the package.</p>"
+        },
+        "PackageName":{
+          "shape":"PackageName",
+          "documentation":"<p>User specified name of the package.</p>"
+        },
+        "PackageType":{
+          "shape":"PackageType",
+          "documentation":"<p>Currently supports only TXT-DICTIONARY.</p>"
+        },
+        "LastUpdated":{
+          "shape":"LastUpdated",
+          "documentation":"<p>Timestamp of the most-recent update to the association status.</p>"
+        },
+        "DomainName":{
+          "shape":"DomainName",
+          "documentation":"<p>Name of the domain you've associated a package with.</p>"
+        },
+        "DomainPackageStatus":{
+          "shape":"DomainPackageStatus",
+          "documentation":"<p>State of the association. Values are ASSOCIATING/ASSOCIATION_FAILED/ACTIVE/DISSOCIATING/DISSOCIATION_FAILED.</p>"
+        },
+        "ReferencePath":{
+          "shape":"ReferencePath",
+          "documentation":"<p>The relative path on Amazon ES nodes, which can be used as synonym_path when the package is synonym file.</p>"
+        },
+        "ErrorDetails":{
+          "shape":"ErrorDetails",
+          "documentation":"<p>Additional information if the package is in an error state. Null otherwise.</p>"
+        }
+      },
+      "documentation":"<p>Information on a package that is associated with a domain.</p>"
+    },
+    "DomainPackageDetailsList":{
+      "type":"list",
+      "member":{"shape":"DomainPackageDetails"}
+    },
+    "DomainPackageStatus":{
+      "type":"string",
+      "enum":[
+        "ASSOCIATING",
+        "ASSOCIATION_FAILED",
+        "ACTIVE",
+        "DISSOCIATING",
+        "DISSOCIATION_FAILED"
+      ]
+    },
     "Double":{"type":"double"},
     "EBSOptions":{
       "type":"structure",
@@ -982,6 +1417,8 @@
         "c5.4xlarge.elasticsearch",
         "c5.9xlarge.elasticsearch",
         "c5.18xlarge.elasticsearch",
+        "ultrawarm1.medium.elasticsearch",
+        "ultrawarm1.large.elasticsearch",
         "t2.micro.elasticsearch",
         "t2.small.elasticsearch",
         "t2.medium.elasticsearch",
@@ -1015,12 +1452,19 @@
         "i3.16xlarge.elasticsearch"
       ]
     },
+    "ESWarmPartitionInstanceType":{
+      "type":"string",
+      "enum":[
+        "ultrawarm1.medium.elasticsearch",
+        "ultrawarm1.large.elasticsearch"
+      ]
+    },
     "ElasticsearchClusterConfig":{
       "type":"structure",
       "members":{
         "InstanceType":{
           "shape":"ESPartitionInstanceType",
-          "documentation":"<p>The instance type for an Elasticsearch cluster.</p>"
+          "documentation":"<p>The instance type for an Elasticsearch cluster. UltraWarm instance types are not supported for data instances.</p>"
         },
         "InstanceCount":{
           "shape":"IntegerClass",
@@ -1045,6 +1489,18 @@
         "DedicatedMasterCount":{
           "shape":"IntegerClass",
           "documentation":"<p>Total number of dedicated master nodes, active and on standby, for the cluster.</p>"
+        },
+        "WarmEnabled":{
+          "shape":"Boolean",
+          "documentation":"<p>True to enable warm storage.</p>"
+        },
+        "WarmType":{
+          "shape":"ESWarmPartitionInstanceType",
+          "documentation":"<p>The instance type for the Elasticsearch cluster's warm nodes.</p>"
+        },
+        "WarmCount":{
+          "shape":"IntegerClass",
+          "documentation":"<p>The number of warm nodes in the cluster.</p>"
         }
       },
       "documentation":"<p>Specifies the configuration for the domain cluster, such as the type and number of instances.</p>"
@@ -1117,6 +1573,10 @@
         "DomainEndpointOptions":{
           "shape":"DomainEndpointOptionsStatus",
           "documentation":"<p>Specifies the <code>DomainEndpointOptions</code> for the Elasticsearch domain.</p>"
+        },
+        "AdvancedSecurityOptions":{
+          "shape":"AdvancedSecurityOptionsStatus",
+          "documentation":"<p>Specifies <code>AdvancedSecurityOptions</code> for the domain. </p>"
         }
       },
       "documentation":"<p>The configuration of an Elasticsearch domain.</p>"
@@ -1214,6 +1674,10 @@
         "DomainEndpointOptions":{
           "shape":"DomainEndpointOptions",
           "documentation":"<p>The current status of the Elasticsearch domain's endpoint options.</p>"
+        },
+        "AdvancedSecurityOptions":{
+          "shape":"AdvancedSecurityOptions",
+          "documentation":"<p>The current status of the Elasticsearch domain's advanced security options.</p>"
         }
       },
       "documentation":"<p>The current status of an Elasticsearch domain.</p>"
@@ -1289,7 +1753,15 @@
       "key":{"shape":"String"},
       "value":{"shape":"ServiceUrl"}
     },
+    "ErrorDetails":{
+      "type":"structure",
+      "members":{
+        "ErrorType":{"shape":"ErrorType"},
+        "ErrorMessage":{"shape":"ErrorMessage"}
+      }
+    },
     "ErrorMessage":{"type":"string"},
+    "ErrorType":{"type":"string"},
     "GUID":{
       "type":"string",
       "pattern":"\\p{XDigit}{8}-\\p{XDigit}{4}-\\p{XDigit}{4}-\\p{XDigit}{4}-\\p{XDigit}{12}"
@@ -1436,6 +1908,7 @@
       "max":500,
       "min":1
     },
+    "LastUpdated":{"type":"timestamp"},
     "LimitExceededException":{
       "type":"structure",
       "members":{
@@ -1469,7 +1942,7 @@
       "type":"map",
       "key":{"shape":"InstanceRole"},
       "value":{"shape":"Limits"},
-      "documentation":"<p> Map of Role of the Instance and Limits that are applicable. Role performed by given Instance in Elasticsearch can be one of the following: <ul> <li>Data: If the given InstanceType is used as Data node</li> <li>Master: If the given InstanceType is used as Master node</li> </ul> </p>"
+      "documentation":"<p> Map of Role of the Instance and Limits that are applicable. Role performed by given Instance in Elasticsearch can be one of the following: <ul> <li>data: If the given InstanceType is used as data node</li> <li>master: If the given InstanceType is used as master node</li> <li>ultra_warm: If the given InstanceType is used as warm node</li> </ul> </p>"
     },
     "ListDomainNamesResponse":{
       "type":"structure",
@@ -1481,6 +1954,42 @@
       },
       "documentation":"<p>The result of a <code>ListDomainNames</code> operation. Contains the names of all Elasticsearch domains owned by this account.</p>"
     },
+    "ListDomainsForPackageRequest":{
+      "type":"structure",
+      "required":["PackageID"],
+      "members":{
+        "PackageID":{
+          "shape":"PackageID",
+          "documentation":"<p>The package for which to list domains.</p>",
+          "location":"uri",
+          "locationName":"PackageID"
+        },
+        "MaxResults":{
+          "shape":"MaxResults",
+          "documentation":"<p>Limits results to a maximum number of domains.</p>",
+          "location":"querystring",
+          "locationName":"maxResults"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>Used for pagination. Only necessary if a previous API call includes a non-null NextToken value. If provided, returns results for the next page.</p>",
+          "location":"querystring",
+          "locationName":"nextToken"
+        }
+      },
+      "documentation":"<p> Container for request parameters to <code> <a>ListDomainsForPackage</a> </code> operation. </p>"
+    },
+    "ListDomainsForPackageResponse":{
+      "type":"structure",
+      "members":{
+        "DomainPackageDetailsList":{
+          "shape":"DomainPackageDetailsList",
+          "documentation":"<p>List of <code>DomainPackageDetails</code> objects.</p>"
+        },
+        "NextToken":{"shape":"String"}
+      },
+      "documentation":"<p> Container for response parameters to <code> <a>ListDomainsForPackage</a> </code> operation. </p>"
+    },
     "ListElasticsearchInstanceTypesRequest":{
       "type":"structure",
       "required":["ElasticsearchVersion"],
@@ -1551,6 +2060,45 @@
       },
       "documentation":"<p> Container for the parameters for response received from <code> <a>ListElasticsearchVersions</a> </code> operation. </p>"
     },
+    "ListPackagesForDomainRequest":{
+      "type":"structure",
+      "required":["DomainName"],
+      "members":{
+        "DomainName":{
+          "shape":"DomainName",
+          "documentation":"<p>The name of the domain for which you want to list associated packages.</p>",
+          "location":"uri",
+          "locationName":"DomainName"
+        },
+        "MaxResults":{
+          "shape":"MaxResults",
+          "documentation":"<p>Limits results to a maximum number of packages.</p>",
+          "location":"querystring",
+          "locationName":"maxResults"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>Used for pagination. Only necessary if a previous API call includes a non-null NextToken value. If provided, returns results for the next page.</p>",
+          "location":"querystring",
+          "locationName":"nextToken"
+        }
+      },
+      "documentation":"<p> Container for request parameters to <code> <a>ListPackagesForDomain</a> </code> operation. </p>"
+    },
+    "ListPackagesForDomainResponse":{
+      "type":"structure",
+      "members":{
+        "DomainPackageDetailsList":{
+          "shape":"DomainPackageDetailsList",
+          "documentation":"<p>List of <code>DomainPackageDetails</code> objects.</p>"
+        },
+        "NextToken":{
+          "shape":"String",
+          "documentation":"<p>Pagination token that needs to be supplied to the next call to get the next page of results.</p>"
+        }
+      },
+      "documentation":"<p> Container for response parameters to <code> <a>ListPackagesForDomain</a> </code> operation. </p>"
+    },
     "ListTagsRequest":{
       "type":"structure",
       "required":["ARN"],
@@ -1613,6 +2161,24 @@
         "ES_APPLICATION_LOGS"
       ]
     },
+    "MasterUserOptions":{
+      "type":"structure",
+      "members":{
+        "MasterUserARN":{
+          "shape":"ARN",
+          "documentation":"<p>ARN for the master user (if IAM is enabled).</p>"
+        },
+        "MasterUserName":{
+          "shape":"Username",
+          "documentation":"<p>The master user's username, which is stored in the Amazon Elasticsearch Service domain's internal database.</p>"
+        },
+        "MasterUserPassword":{
+          "shape":"Password",
+          "documentation":"<p>The master user's password, which is stored in the Amazon Elasticsearch Service domain's internal database.</p>"
+        }
+      },
+      "documentation":"<p>Credentials for the master user: username and password, ARN, or both.</p>"
+    },
     "MaxResults":{
       "type":"integer",
       "documentation":"<p> Set this value to limit the number of results returned. </p>",
@@ -1698,6 +2264,91 @@
       },
       "documentation":"<p>Provides the current status of the entity.</p>"
     },
+    "PackageDescription":{
+      "type":"string",
+      "max":1024
+    },
+    "PackageDetails":{
+      "type":"structure",
+      "members":{
+        "PackageID":{
+          "shape":"PackageID",
+          "documentation":"<p>Internal ID of the package.</p>"
+        },
+        "PackageName":{
+          "shape":"PackageName",
+          "documentation":"<p>User specified name of the package.</p>"
+        },
+        "PackageType":{
+          "shape":"PackageType",
+          "documentation":"<p>Currently supports only TXT-DICTIONARY.</p>"
+        },
+        "PackageDescription":{
+          "shape":"PackageDescription",
+          "documentation":"<p>User-specified description of the package.</p>"
+        },
+        "PackageStatus":{
+          "shape":"PackageStatus",
+          "documentation":"<p>Current state of the package. Values are COPYING/COPY_FAILED/AVAILABLE/DELETING/DELETE_FAILED</p>"
+        },
+        "CreatedAt":{
+          "shape":"CreatedAt",
+          "documentation":"<p>Timestamp which tells creation date of the package.</p>"
+        },
+        "ErrorDetails":{
+          "shape":"ErrorDetails",
+          "documentation":"<p>Additional information if the package is in an error state. Null otherwise.</p>"
+        }
+      },
+      "documentation":"<p>Basic information about a package.</p>"
+    },
+    "PackageDetailsList":{
+      "type":"list",
+      "member":{"shape":"PackageDetails"}
+    },
+    "PackageID":{"type":"string"},
+    "PackageName":{
+      "type":"string",
+      "max":28,
+      "min":3,
+      "pattern":"[a-z][a-z0-9\\-]+"
+    },
+    "PackageSource":{
+      "type":"structure",
+      "members":{
+        "S3BucketName":{
+          "shape":"S3BucketName",
+          "documentation":"<p>Name of the bucket containing the package.</p>"
+        },
+        "S3Key":{
+          "shape":"S3Key",
+          "documentation":"<p>Key (file name) of the package.</p>"
+        }
+      },
+      "documentation":"<p>The S3 location for importing the package specified as <code>S3BucketName</code> and <code>S3Key</code></p>"
+    },
+    "PackageStatus":{
+      "type":"string",
+      "enum":[
+        "COPYING",
+        "COPY_FAILED",
+        "VALIDATING",
+        "VALIDATION_FAILED",
+        "AVAILABLE",
+        "DELETING",
+        "DELETED",
+        "DELETE_FAILED"
+      ]
+    },
+    "PackageType":{
+      "type":"string",
+      "enum":["TXT-DICTIONARY"]
+    },
+    "Password":{
+      "type":"string",
+      "min":8,
+      "sensitive":true
+    },
     "PolicyDocument":{
       "type":"string",
       "documentation":"<p>Access policy rules for an Elasticsearch domain service endpoints. For more information, see <a href=\"http://docs.aws.amazon.com/elasticsearch-service/latest/developerguide/es-createupdatedomains.html#es-createdomain-configure-access-policies\" target=\"_blank\">Configuring Access Policies</a> in the <i>Amazon Elasticsearch Service Developer Guide</i>. The maximum size of a policy document is 100 KB.</p>"
@@ -1756,6 +2407,7 @@
       "type":"list",
       "member":{"shape":"RecurringCharge"}
     },
+    "ReferencePath":{"type":"string"},
     "RemoveTagsRequest":{
       "type":"structure",
       "required":[
@@ -1912,6 +2564,12 @@
       "max":2048,
       "min":20
     },
+    "S3BucketName":{
+      "type":"string",
+      "max":63,
+      "min":3
+    },
+    "S3Key":{"type":"string"},
     "ServiceSoftwareOptions":{
       "type":"structure",
       "members":{
@@ -2138,6 +2796,10 @@
         "DomainEndpointOptions":{
           "shape":"DomainEndpointOptions",
           "documentation":"<p>Options to specify configuration that will be applied to the domain endpoint.</p>"
+        },
+        "AdvancedSecurityOptions":{
+          "shape":"AdvancedSecurityOptionsInput",
+          "documentation":"<p>Specifies advanced security options.</p>"
         }
       },
       "documentation":"<p>Container for the parameters to the <code><a>UpdateElasticsearchDomain</a></code> operation. Specifies the type and number of instances in the domain cluster.</p>"
@@ -2264,6 +2926,11 @@
       "min":1,
       "pattern":"[\\w-]+_[0-9a-zA-Z]+"
     },
+    "Username":{
+      "type":"string",
+      "min":1,
+      "sensitive":true
+    },
     "VPCDerivedInfo":{
       "type":"structure",
       "members":{
diff --git a/services/elasticsearch/src/test/resources/cucumber.properties b/services/elasticsearch/src/test/resources/cucumber.properties
index d637d26ab37a..831a26388824 100644
--- a/services/elasticsearch/src/test/resources/cucumber.properties
+++ b/services/elasticsearch/src/test/resources/cucumber.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/elasticsearch/src/test/resources/log4j.properties b/services/elasticsearch/src/test/resources/log4j.properties
index 5490f648a7ba..ad13ebd09f11 100644
--- a/services/elasticsearch/src/test/resources/log4j.properties
+++ b/services/elasticsearch/src/test/resources/log4j.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/elastictranscoder/build.properties b/services/elastictranscoder/build.properties
index ecf2dae6fcb1..15ec2da1fc71 100644
--- a/services/elastictranscoder/build.properties
+++ b/services/elastictranscoder/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/elastictranscoder/pom.xml b/services/elastictranscoder/pom.xml
index 1b5ed22e5cd0..813748b1ef59 100644
--- a/services/elastictranscoder/pom.xml
+++ b/services/elastictranscoder/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>elastictranscoder</artifactId>
     <name>AWS Java SDK :: Services :: Amazon Elastic Transcoder</name>
diff --git a/services/elastictranscoder/src/test/resources/cucumber.properties b/services/elastictranscoder/src/test/resources/cucumber.properties
index c9e170f4bcde..0d466a65ed3c 100644
--- a/services/elastictranscoder/src/test/resources/cucumber.properties
+++ b/services/elastictranscoder/src/test/resources/cucumber.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/emr/build.properties b/services/emr/build.properties
index ecf2dae6fcb1..15ec2da1fc71 100644
--- a/services/emr/build.properties
+++ b/services/emr/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/emr/pom.xml b/services/emr/pom.xml
index 80f92d370cb2..eb98755cc4da 100644
--- a/services/emr/pom.xml
+++ b/services/emr/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>emr</artifactId>
     <name>AWS Java SDK :: Services :: Amazon EMR</name>
diff --git a/services/emr/src/it/java/software/amazon/awssdk/services/emr/EMRIntegrationTest.java b/services/emr/src/it/java/software/amazon/awssdk/services/emr/EMRIntegrationTest.java
index 4e5d99a81106..a2771e9c531a 100644
--- a/services/emr/src/it/java/software/amazon/awssdk/services/emr/EMRIntegrationTest.java
+++ b/services/emr/src/it/java/software/amazon/awssdk/services/emr/EMRIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/emr/src/it/java/software/amazon/awssdk/services/emr/IntegrationTestBase.java b/services/emr/src/it/java/software/amazon/awssdk/services/emr/IntegrationTestBase.java
index dc2c59538c38..f11fa56af4c0 100644
--- a/services/emr/src/it/java/software/amazon/awssdk/services/emr/IntegrationTestBase.java
+++ b/services/emr/src/it/java/software/amazon/awssdk/services/emr/IntegrationTestBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/emr/src/main/resources/codegen-resources/service-2.json b/services/emr/src/main/resources/codegen-resources/service-2.json
index f31c32c7b88e..8a42b4f5b625 100644
--- a/services/emr/src/main/resources/codegen-resources/service-2.json
+++ b/services/emr/src/main/resources/codegen-resources/service-2.json
@@ -275,7 +275,21 @@
         {"shape":"InternalServerException"},
         {"shape":"InvalidRequestException"}
       ],
-      "documentation":"<p>Provides a list of steps for the cluster in reverse order unless you specify stepIds with the request.</p>"
+      "documentation":"<p>Provides a list of steps for the cluster in reverse order unless you specify <code>stepIds</code> with the request of filter by <code>StepStates</code>. You can specify a maximum of ten <code>stepIDs</code>.</p>"
+    },
+    "ModifyCluster":{
+      "name":"ModifyCluster",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"ModifyClusterInput"},
+      "output":{"shape":"ModifyClusterOutput"},
+      "errors":[
+        {"shape":"InternalServerError"},
+        {"shape":"InvalidRequestException"}
+      ],
+      "documentation":"<p>Modifies the number of steps that can be executed concurrently for the cluster specified using ClusterID.</p>"
     },
     "ModifyInstanceFleet":{
       "name":"ModifyInstanceFleet",
@@ -385,7 +399,7 @@
       "errors":[
         {"shape":"InternalServerError"}
       ],
-      "documentation":"<p> <i>This member will be deprecated.</i> </p> <p>Sets whether all AWS Identity and Access Management (IAM) users under your account can access the specified clusters (job flows). This action works on running clusters. You can also set the visibility of a cluster when you launch it using the <code>VisibleToAllUsers</code> parameter of <a>RunJobFlow</a>. The SetVisibleToAllUsers action can be called only by an IAM user who created the cluster or the AWS account that owns the cluster.</p>"
+      "documentation":"<p>Sets the <a>Cluster$VisibleToAllUsers</a> value, which determines whether the cluster is visible to all IAM users of the AWS account associated with the cluster. Only the IAM user who created the cluster or the AWS account root user can call this action. The default value, <code>true</code>, indicates that all IAM users in the AWS account can perform cluster actions if they have the proper IAM policy permissions. If set to <code>false</code>, only the IAM user that created the cluster can perform actions. This action works on running clusters. You can override the default <code>true</code> setting when you create a cluster by using the <code>VisibleToAllUsers</code> parameter with <code>RunJobFlow</code>.</p>"
     },
     "TerminateJobFlows":{
       "name":"TerminateJobFlows",
@@ -437,6 +451,10 @@
         "InstanceFleetId":{
           "shape":"InstanceFleetId",
           "documentation":"<p>The unique identifier of the instance fleet.</p>"
+        },
+        "ClusterArn":{
+          "shape":"ArnType",
+          "documentation":"<p>The Amazon Resource Name of the cluster.</p>"
         }
       }
     },
@@ -468,6 +486,10 @@
         "InstanceGroupIds":{
           "shape":"InstanceGroupIdsList",
           "documentation":"<p>Instance group IDs of the newly created instance groups.</p>"
+        },
+        "ClusterArn":{
+          "shape":"ArnType",
+          "documentation":"<p>The Amazon Resource Name of the cluster.</p>"
         }
       },
       "documentation":"<p>Output from an AddInstanceGroups call.</p>"
@@ -741,6 +763,10 @@
     },
     "CancelStepsInput":{
       "type":"structure",
+      "required":[
+        "ClusterId",
+        "StepIds"
+      ],
       "members":{
         "ClusterId":{
           "shape":"XmlStringMaxLen256",
@@ -749,6 +775,10 @@
         "StepIds":{
           "shape":"StepIdsList",
           "documentation":"<p>The list of <code>StepIDs</code> to cancel. Use <a>ListSteps</a> to get steps and their states for the specified cluster.</p>"
+        },
+        "StepCancellationOption":{
+          "shape":"StepCancellationOption",
+          "documentation":"<p>The option to choose for cancelling <code>RUNNING</code> steps. By default, the value is <code>SEND_INTERRUPT</code>.</p>"
         }
       },
       "documentation":"<p>The input argument to the <a>CancelSteps</a> operation.</p>"
@@ -785,7 +815,7 @@
         },
         "EvaluationPeriods":{
           "shape":"Integer",
-          "documentation":"<p>The number of periods, expressed in seconds using <code>Period</code>, during which the alarm condition must exist before the alarm triggers automatic scaling activity. The default value is <code>1</code>.</p>"
+          "documentation":"<p>The number of periods, in five-minute increments, during which the alarm condition must exist before the alarm triggers automatic scaling activity. The default value is <code>1</code>.</p>"
         },
         "MetricName":{
           "shape":"String",
@@ -867,7 +897,7 @@
         },
         "VisibleToAllUsers":{
           "shape":"Boolean",
-          "documentation":"<p> <i>This member will be deprecated.</i> </p> <p>Indicates whether the cluster is visible to all IAM users of the AWS account associated with the cluster. If this value is set to <code>true</code>, all IAM users of that AWS account can view and manage the cluster if they have the proper policy permissions set. If this value is <code>false</code>, only the IAM user that created the cluster can view and manage it. This value can be changed using the <a>SetVisibleToAllUsers</a> action.</p>"
+          "documentation":"<p>Indicates whether the cluster is visible to all IAM users of the AWS account associated with the cluster. The default value, <code>true</code>, indicates that all IAM users in the AWS account can perform cluster actions if they have the proper IAM policy permissions. If this value is <code>false</code>, only the IAM user that created the cluster can perform actions. This value can be changed on a running cluster by using the <a>SetVisibleToAllUsers</a> action. You can override the default value of <code>true</code> when you create a cluster by using the <code>VisibleToAllUsers</code> parameter of the <code>RunJobFlow</code> action.</p>"
         },
         "Applications":{
           "shape":"ApplicationList",
@@ -920,6 +950,18 @@
         "KerberosAttributes":{
           "shape":"KerberosAttributes",
           "documentation":"<p>Attributes for Kerberos configuration when Kerberos authentication is enabled using a security configuration. For more information see <a href=\"https://docs.aws.amazon.com/emr/latest/ManagementGuide/emr-kerberos.html\">Use Kerberos Authentication</a> in the <i>EMR Management Guide</i>.</p>"
+        },
+        "ClusterArn":{
+          "shape":"ArnType",
+          "documentation":"<p>The Amazon Resource Name of the cluster.</p>"
+        },
+        "StepConcurrencyLevel":{
+          "shape":"Integer",
+          "documentation":"<p>Specifies the number of steps that can be executed concurrently.</p>"
+        },
+        "OutpostArn":{
+          "shape":"OptionalArnType",
+          "documentation":"<p> The Amazon Resource Name (ARN) of the Outpost where the cluster is launched. </p>"
         }
       },
       "documentation":"<p>The detailed description of the cluster.</p>"
@@ -1004,6 +1046,14 @@
         "NormalizedInstanceHours":{
           "shape":"Integer",
           "documentation":"<p>An approximation of the cost of the cluster, represented in m1.small/hours. This value is incremented one time for every hour an m1.small instance runs. Larger instances are weighted more, so an EC2 instance that is roughly four times more expensive would result in the normalized instance hours being incremented by four. This result is only an approximation and does not reflect the actual billing rate.</p>"
+        },
+        "ClusterArn":{
+          "shape":"ArnType",
+          "documentation":"<p>The Amazon Resource Name of the cluster.</p>"
+        },
+        "OutpostArn":{
+          "shape":"OptionalArnType",
+          "documentation":"<p> The Amazon Resource Name (ARN) of the Outpost where the cluster is launched. </p>"
         }
       },
       "documentation":"<p>The summary description of the cluster.</p>"
@@ -1736,7 +1786,7 @@
         },
         "BidPrice":{
           "shape":"String",
-          "documentation":"<p>The maximum Spot price your are willing to pay for EC2 instances.</p> <p>An optional, nullable field that applies if the <code>MarketType</code> for the instance group is specified as <code>SPOT</code>. Specify the maximum spot price in USD. If the value is NULL and <code>SPOT</code> is specified, the maximum Spot price is set equal to the On-Demand price.</p>"
+          "documentation":"<p>The bid price for each EC2 Spot instance type as defined by <code>InstanceType</code>. Expressed in USD. If neither <code>BidPrice</code> nor <code>BidPriceAsPercentageOfOnDemandPrice</code> is provided, <code>BidPriceAsPercentageOfOnDemandPrice</code> defaults to 100%.</p>"
         },
         "InstanceType":{
           "shape":"InstanceType",
@@ -1811,7 +1861,7 @@
         },
         "BidPrice":{
           "shape":"XmlStringMaxLen256",
-          "documentation":"<p>The maximum Spot price your are willing to pay for EC2 instances.</p> <p>An optional, nullable field that applies if the <code>MarketType</code> for the instance group is specified as <code>SPOT</code>. Specify the maximum spot price in USD. If the value is NULL and <code>SPOT</code> is specified, the maximum Spot price is set equal to the On-Demand price.</p>"
+          "documentation":"<p>The bid price for each EC2 Spot instance type as defined by <code>InstanceType</code>. Expressed in USD. If neither <code>BidPrice</code> nor <code>BidPriceAsPercentageOfOnDemandPrice</code> is provided, <code>BidPriceAsPercentageOfOnDemandPrice</code> defaults to 100%.</p>"
         },
         "InstanceType":{
           "shape":"InstanceType",
@@ -1870,7 +1920,7 @@
         },
         "BidPrice":{
           "shape":"XmlStringMaxLen256",
-          "documentation":"<p>The maximum Spot price your are willing to pay for EC2 instances.</p> <p>An optional, nullable field that applies if the <code>MarketType</code> for the instance group is specified as <code>SPOT</code>. Specified in USD. If the value is NULL and <code>SPOT</code> is specified, the maximum Spot price is set equal to the On-Demand price.</p>"
+          "documentation":"<p>The bid price for each EC2 Spot instance type as defined by <code>InstanceType</code>. Expressed in USD. If neither <code>BidPrice</code> nor <code>BidPriceAsPercentageOfOnDemandPrice</code> is provided, <code>BidPriceAsPercentageOfOnDemandPrice</code> defaults to 100%.</p>"
         },
         "InstanceType":{
           "shape":"InstanceType",
@@ -2308,7 +2358,7 @@
         },
         "VisibleToAllUsers":{
           "shape":"Boolean",
-          "documentation":"<p> <i>This member will be deprecated.</i> </p> <p>Specifies whether the cluster is visible to all IAM users of the AWS account associated with the cluster. If this value is set to <code>true</code>, all IAM users of that AWS account can view and (if they have the proper policy permissions set) manage the cluster. If it is set to <code>false</code>, only the IAM user that created the cluster can view and manage it. This value can be changed using the <a>SetVisibleToAllUsers</a> action.</p>"
+          "documentation":"<p>Indicates whether the cluster is visible to all IAM users of the AWS account associated with the cluster. The default value, <code>true</code>, indicates that all IAM users in the AWS account can perform cluster actions if they have the proper IAM policy permissions. If this value is <code>false</code>, only the IAM user that created the cluster can perform actions. This value can be changed on a running cluster by using the <a>SetVisibleToAllUsers</a> action. You can override the default value of <code>true</code> when you create a cluster by using the <code>VisibleToAllUsers</code> parameter of the <code>RunJobFlow</code> action.</p>"
         },
         "JobFlowRole":{
           "shape":"XmlString",
@@ -2776,7 +2826,7 @@
         },
         "StepIds":{
           "shape":"XmlStringList",
-          "documentation":"<p>The filter to limit the step list based on the identifier of the steps.</p>"
+          "documentation":"<p>The filter to limit the step list based on the identifier of the steps. You can specify a maximum of ten Step IDs. The character constraint applies to the overall length of the array.</p>"
         },
         "Marker":{
           "shape":"Marker",
@@ -2826,6 +2876,29 @@
       "type":"list",
       "member":{"shape":"MetricDimension"}
     },
+    "ModifyClusterInput":{
+      "type":"structure",
+      "required":["ClusterId"],
+      "members":{
+        "ClusterId":{
+          "shape":"String",
+          "documentation":"<p>The unique identifier of the cluster.</p>"
+        },
+        "StepConcurrencyLevel":{
+          "shape":"Integer",
+          "documentation":"<p>The number of steps that can be executed concurrently. You can specify a maximum of 256 steps. </p>"
+        }
+      }
+    },
+    "ModifyClusterOutput":{
+      "type":"structure",
+      "members":{
+        "StepConcurrencyLevel":{
+          "shape":"Integer",
+          "documentation":"<p>The number of steps that can be executed concurrently.</p>"
+        }
+      }
+    },
     "ModifyInstanceFleetInput":{
       "type":"structure",
       "required":[
@@ -2865,6 +2938,11 @@
       "type":"double",
       "min":0.0
     },
+    "OptionalArnType":{
+      "type":"string",
+      "max":2048,
+      "min":0
+    },
     "PlacementType":{
       "type":"structure",
       "members":{
@@ -2939,6 +3017,10 @@
         "AutoScalingPolicy":{
           "shape":"AutoScalingPolicyDescription",
           "documentation":"<p>The automatic scaling policy definition.</p>"
+        },
+        "ClusterArn":{
+          "shape":"ArnType",
+          "documentation":"<p>The Amazon Resource Name of the cluster.</p>"
         }
       }
     },
@@ -3068,7 +3150,7 @@
         },
         "VisibleToAllUsers":{
           "shape":"Boolean",
-          "documentation":"<p> <i>This member will be deprecated.</i> </p> <p>Whether the cluster is visible to all IAM users of the AWS account associated with the cluster. If this value is set to <code>true</code>, all IAM users of that AWS account can view and (if they have the proper policy permissions set) manage the cluster. If it is set to <code>false</code>, only the IAM user that created the cluster can view and manage it.</p>"
+          "documentation":"<p>A value of <code>true</code> indicates that all IAM users in the AWS account can perform cluster actions if they have the proper IAM policy permissions. This is the default. A value of <code>false</code> indicates that only the IAM user who created the cluster can perform actions.</p>"
         },
         "JobFlowRole":{
           "shape":"XmlString",
@@ -3109,6 +3191,10 @@
         "KerberosAttributes":{
           "shape":"KerberosAttributes",
           "documentation":"<p>Attributes for Kerberos configuration when Kerberos authentication is enabled using a security configuration. For more information see <a href=\"https://docs.aws.amazon.com/emr/latest/ManagementGuide/emr-kerberos.html\">Use Kerberos Authentication</a> in the <i>EMR Management Guide</i>.</p>"
+        },
+        "StepConcurrencyLevel":{
+          "shape":"Integer",
+          "documentation":"<p>Specifies the number of steps that can be executed concurrently. The default value is <code>1</code>. The maximum value is <code>256</code>.</p>"
         }
       },
       "documentation":"<p> Input to the <a>RunJobFlow</a> operation. </p>"
@@ -3119,6 +3205,10 @@
         "JobFlowId":{
           "shape":"XmlStringMaxLen256",
           "documentation":"<p>An unique identifier for the job flow.</p>"
+        },
+        "ClusterArn":{
+          "shape":"ArnType",
+          "documentation":"<p>The Amazon Resource Name of the cluster.</p>"
         }
       },
       "documentation":"<p> The result of the <a>RunJobFlow</a> operation. </p>"
@@ -3269,14 +3359,14 @@
       "members":{
         "JobFlowIds":{
           "shape":"XmlStringList",
-          "documentation":"<p>Identifiers of the job flows to receive the new visibility setting.</p>"
+          "documentation":"<p>The unique identifier of the job flow (cluster).</p>"
         },
         "VisibleToAllUsers":{
           "shape":"Boolean",
-          "documentation":"<p> <i>This member will be deprecated.</i> </p> <p>Whether the specified clusters are visible to all IAM users of the AWS account associated with the cluster. If this value is set to True, all IAM users of that AWS account can view and, if they have the proper IAM policy permissions set, manage the clusters. If it is set to False, only the IAM user that created a cluster can view and manage it.</p>"
+          "documentation":"<p>A value of <code>true</code> indicates that all IAM users in the AWS account can perform cluster actions if they have the proper IAM policy permissions. This is the default. A value of <code>false</code> indicates that only the IAM user who created the cluster can perform actions.</p>"
         }
       },
-      "documentation":"<p> <i>This member will be deprecated.</i> </p> <p>The input to the SetVisibleToAllUsers action.</p>"
+      "documentation":"<p>The input to the SetVisibleToAllUsers action.</p>"
     },
     "ShrinkPolicy":{
       "type":"structure",
@@ -3376,6 +3466,13 @@
       },
       "documentation":"<p>This represents a step in a cluster.</p>"
     },
+    "StepCancellationOption":{
+      "type":"string",
+      "enum":[
+        "SEND_INTERRUPT",
+        "TERMINATE_PROCESS"
+      ]
+    },
     "StepConfig":{
       "type":"structure",
       "required":[
diff --git a/services/eventbridge/pom.xml b/services/eventbridge/pom.xml
index a9a3bdcdbaea..4b4c60dd9d72 100644
--- a/services/eventbridge/pom.xml
+++ b/services/eventbridge/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>eventbridge</artifactId>
     <name>AWS Java SDK :: Services :: EventBridge</name>
diff --git a/services/eventbridge/src/main/resources/codegen-resources/service-2.json b/services/eventbridge/src/main/resources/codegen-resources/service-2.json
index 5ca6e23b1890..0b9fa71561a4 100644
--- a/services/eventbridge/src/main/resources/codegen-resources/service-2.json
+++ b/services/eventbridge/src/main/resources/codegen-resources/service-2.json
@@ -21,10 +21,11 @@
       "input":{"shape":"ActivateEventSourceRequest"},
       "errors":[
         {"shape":"ResourceNotFoundException"},
+        {"shape":"ConcurrentModificationException"},
         {"shape":"InvalidStateException"},
         {"shape":"InternalException"}
       ],
-      "documentation":"<p>Activates a partner event source that has been deactivated. Once activated, your matching event bus will start receiving events from the event source.</p> <note> <p>This operation is performed by AWS customers, not by SaaS partners.</p> </note>"
+      "documentation":"<p>Activates a partner event source that has been deactivated. Once activated, your matching event bus will start receiving events from the event source.</p>"
     },
     "CreateEventBus":{
       "name":"CreateEventBus",
@@ -42,7 +43,7 @@
         {"shape":"ConcurrentModificationException"},
         {"shape":"LimitExceededException"}
       ],
-      "documentation":"<p>Creates a new event bus within your account. This can be a custom event bus which you can use to receive events from your own custom applications and services, or it can be a partner event bus which can be matched to a partner event source.</p> <note> <p>This operation is used by AWS customers, not by SaaS partners.</p> </note>"
+      "documentation":"<p>Creates a new event bus within your account. This can be a custom event bus which you can use to receive events from your custom applications and services, or it can be a partner event bus which can be matched to a partner event source.</p>"
     },
     "CreatePartnerEventSource":{
       "name":"CreatePartnerEventSource",
@@ -58,7 +59,7 @@
         {"shape":"ConcurrentModificationException"},
         {"shape":"LimitExceededException"}
       ],
-      "documentation":"<p>Called by an SaaS partner to create a partner event source.</p> <note> <p>This operation is not used by AWS customers.</p> </note> <p>Each partner event source can be used by one AWS account to create a matching partner event bus in that AWS account. A SaaS partner must create one partner event source for each AWS account that wants to receive those event types. </p> <p>A partner event source creates events based on resources in the SaaS partner's service or application.</p> <p>An AWS account that creates a partner event bus that matches the partner event source can use that event bus to receive events from the partner, and then process them using AWS Events rules and targets.</p> <p>Partner event source names follow this format:</p> <p> <code>aws.partner/<i>partner_name</i>/<i>event_namespace</i>/<i>event_name</i> </code> </p> <ul> <li> <p> <i>partner_name</i> is determined during partner registration and identifies the partner to AWS customers.</p> </li> <li> <p>For <i>event_namespace</i>, we recommend that partners use a string that identifies the AWS customer within the partner's system. This should not be the customer's AWS account ID.</p> </li> <li> <p> <i>event_name</i> is determined by the partner, and should uniquely identify an event-generating resource within the partner system. This should help AWS customers decide whether to create an event bus to receive these events.</p> </li> </ul>"
+      "documentation":"<p>Called by an SaaS partner to create a partner event source. This operation is not used by AWS customers.</p> <p>Each partner event source can be used by one AWS account to create a matching partner event bus in that AWS account. A SaaS partner must create one partner event source for each AWS account that wants to receive those event types. </p> <p>A partner event source creates events based on resources within the SaaS partner's service or application.</p> <p>An AWS account that creates a partner event bus that matches the partner event source can use that event bus to receive events from the partner, and then process them using AWS Events rules and targets.</p> <p>Partner event source names follow this format:</p> <p> <code> <i>partner_name</i>/<i>event_namespace</i>/<i>event_name</i> </code> </p> <p> <i>partner_name</i> is determined during partner registration and identifies the partner to AWS customers. <i>event_namespace</i> is determined by the partner and is a way for the partner to categorize their events. <i>event_name</i> is determined by the partner, and should uniquely identify an event-generating resource within the partner system. The combination of <i>event_namespace</i> and <i>event_name</i> should help AWS customers decide whether to create an event bus to receive these events.</p>"
     },
     "DeactivateEventSource":{
       "name":"DeactivateEventSource",
@@ -69,10 +70,11 @@
       "input":{"shape":"DeactivateEventSourceRequest"},
       "errors":[
         {"shape":"ResourceNotFoundException"},
+        {"shape":"ConcurrentModificationException"},
         {"shape":"InvalidStateException"},
         {"shape":"InternalException"}
       ],
-      "documentation":"<p>An AWS customer uses this operation to temporarily stop receiving events from the specified partner event source. The matching event bus isn't deleted. </p> <p>When you deactivate a partner event source, the source goes into <code>PENDING</code> state. If it remains in <code>PENDING</code> state for more than two weeks, it's deleted.</p> <p>To activate a deactivated partner event source, use <a>ActivateEventSource</a>.</p>"
+      "documentation":"<p>You can use this operation to temporarily stop receiving events from the specified partner event source. The matching event bus is not deleted. </p> <p>When you deactivate a partner event source, the source goes into PENDING state. If it remains in PENDING state for more than two weeks, it is deleted.</p> <p>To activate a deactivated partner event source, use <a>ActivateEventSource</a>.</p>"
     },
     "DeleteEventBus":{
       "name":"DeleteEventBus",
@@ -82,9 +84,10 @@
       },
       "input":{"shape":"DeleteEventBusRequest"},
       "errors":[
-        {"shape":"InternalException"}
+        {"shape":"InternalException"},
+        {"shape":"ConcurrentModificationException"}
       ],
-      "documentation":"<p>Deletes the specified custom event bus or partner event bus. All rules associated with this event bus are also deleted. You can't delete your account's default event bus.</p> <note> <p>This operation is performed by AWS customers, not by SaaS partners.</p> </note>"
+      "documentation":"<p>Deletes the specified custom event bus or partner event bus. All rules associated with this event bus need to be deleted. You can't delete your account's default event bus.</p>"
     },
     "DeletePartnerEventSource":{
       "name":"DeletePartnerEventSource",
@@ -94,9 +97,10 @@
       },
       "input":{"shape":"DeletePartnerEventSourceRequest"},
       "errors":[
-        {"shape":"InternalException"}
+        {"shape":"InternalException"},
+        {"shape":"ConcurrentModificationException"}
       ],
-      "documentation":"<p>This operation is used by SaaS partners to delete a partner event source. AWS customers don't use this operation.</p> <p>When you delete an event source, the status of the corresponding partner event bus in the AWS customer account becomes <code>DELETED</code>.</p>"
+      "documentation":"<p>This operation is used by SaaS partners to delete a partner event source. This operation is not used by AWS customers.</p> <p>When you delete an event source, the status of the corresponding partner event bus in the AWS customer account becomes DELETED.</p> <p/>"
     },
     "DeleteRule":{
       "name":"DeleteRule",
@@ -111,7 +115,7 @@
         {"shape":"InternalException"},
         {"shape":"ResourceNotFoundException"}
       ],
-      "documentation":"<p>Deletes the specified rule.</p> <p>Before you can delete the rule, you must remove all targets, using <a>RemoveTargets</a>.</p> <p>When you delete a rule, incoming events might continue to match to the deleted rule. Allow a short period of time for changes to take effect.</p> <p>Managed rules are rules created and managed by another AWS service on your behalf. These rules are created by those other AWS services to support functionality in those services. You can delete these rules using the <code>Force</code> option, but you should do so only if you're sure that the other service isn't still using that rule.</p>"
+      "documentation":"<p>Deletes the specified rule.</p> <p>Before you can delete the rule, you must remove all targets, using <a>RemoveTargets</a>.</p> <p>When you delete a rule, incoming events might continue to match to the deleted rule. Allow a short period of time for changes to take effect.</p> <p>Managed rules are rules created and managed by another AWS service on your behalf. These rules are created by those other AWS services to support functionality in those services. You can delete these rules using the <code>Force</code> option, but you should do so only if you are sure the other service is not still using that rule.</p>"
     },
     "DescribeEventBus":{
       "name":"DescribeEventBus",
@@ -139,7 +143,7 @@
         {"shape":"ResourceNotFoundException"},
         {"shape":"InternalException"}
       ],
-      "documentation":"<p>This operation lists details about a partner event source that is shared with your account.</p> <note> <p>This operation is run by AWS customers, not by SaaS partners.</p> </note>"
+      "documentation":"<p>This operation lists details about a partner event source that is shared with your account.</p>"
     },
     "DescribePartnerEventSource":{
       "name":"DescribePartnerEventSource",
@@ -153,7 +157,7 @@
         {"shape":"ResourceNotFoundException"},
         {"shape":"InternalException"}
       ],
-      "documentation":"<p>An SaaS partner can use this operation to list details about a partner event source that they have created.</p> <note> <p>AWS customers do not use this operation. Instead, AWS customers can use <a>DescribeEventSource</a> to see details about a partner event source that is shared with them.</p> </note>"
+      "documentation":"<p>An SaaS partner can use this operation to list details about a partner event source that they have created. AWS customers do not use this operation. Instead, AWS customers can use <a>DescribeEventSource</a> to see details about a partner event source that is shared with them.</p>"
     },
     "DescribeRule":{
       "name":"DescribeRule",
@@ -167,7 +171,7 @@
         {"shape":"ResourceNotFoundException"},
         {"shape":"InternalException"}
       ],
-      "documentation":"<p>Describes the specified rule.</p> <p> <code>DescribeRule</code> doesn't list the targets of a rule. To see the targets associated with a rule, use <a>ListTargetsByRule</a>.</p>"
+      "documentation":"<p>Describes the specified rule.</p> <p>DescribeRule does not list the targets of a rule. To see the targets associated with a rule, use <a>ListTargetsByRule</a>.</p>"
     },
     "DisableRule":{
       "name":"DisableRule",
@@ -182,7 +186,7 @@
         {"shape":"ManagedRuleException"},
         {"shape":"InternalException"}
       ],
-      "documentation":"<p>Disables the specified rule. A disabled rule won't match any events and won't self-trigger if it has a schedule expression.</p> <p>When you disable a rule, incoming events might continue to match to the disabled rule. Allow a short period of time for changes to take effect.</p>"
+      "documentation":"<p>Disables the specified rule. A disabled rule won't match any events, and won't self-trigger if it has a schedule expression.</p> <p>When you disable a rule, incoming events might continue to match to the disabled rule. Allow a short period of time for changes to take effect.</p>"
     },
     "EnableRule":{
       "name":"EnableRule",
@@ -197,7 +201,7 @@
         {"shape":"ManagedRuleException"},
         {"shape":"InternalException"}
       ],
-      "documentation":"<p>Enables the specified rule. If the rule doesn't exist, the operation fails.</p> <p>When you enable a rule, incoming events might not immediately start matching to a newly enabled rule. Allow a short period of time for changes to take effect.</p>"
+      "documentation":"<p>Enables the specified rule. If the rule does not exist, the operation fails.</p> <p>When you enable a rule, incoming events might not immediately start matching to a newly enabled rule. Allow a short period of time for changes to take effect.</p>"
     },
     "ListEventBuses":{
       "name":"ListEventBuses",
@@ -210,7 +214,7 @@
       "errors":[
         {"shape":"InternalException"}
       ],
-      "documentation":"<p>Lists all the event buses in your account, including the default event bus, custom event buses, and partner event buses.</p> <note> <p>This operation is run by AWS customers, not by SaaS partners.</p> </note>"
+      "documentation":"<p>Lists all the event buses in your account, including the default event bus, custom event buses, and partner event buses.</p>"
     },
     "ListEventSources":{
       "name":"ListEventSources",
@@ -223,7 +227,7 @@
       "errors":[
         {"shape":"InternalException"}
       ],
-      "documentation":"<p>You can use this to see all the partner event sources that have been shared with your AWS account. For more information about partner event sources, see <a>CreateEventBus</a>.</p> <note> <p>This operation is run by AWS customers, not by SaaS partners.</p> </note>"
+      "documentation":"<p>You can use this to see all the partner event sources that have been shared with your AWS account. For more information about partner event sources, see <a>CreateEventBus</a>.</p>"
     },
     "ListPartnerEventSourceAccounts":{
       "name":"ListPartnerEventSourceAccounts",
@@ -237,7 +241,7 @@
         {"shape":"ResourceNotFoundException"},
         {"shape":"InternalException"}
       ],
-      "documentation":"<p>An SaaS partner can use this operation to display the AWS account ID that a particular partner event source name is associated with.</p> <note> <p>This operation is used by SaaS partners, not by AWS customers.</p> </note>"
+      "documentation":"<p>An SaaS partner can use this operation to display the AWS account ID that a particular partner event source name is associated with. This operation is not used by AWS customers.</p>"
     },
     "ListPartnerEventSources":{
       "name":"ListPartnerEventSources",
@@ -250,7 +254,7 @@
       "errors":[
         {"shape":"InternalException"}
       ],
-      "documentation":"<p>An SaaS partner can use this operation to list all the partner event source names that they have created.</p> <note> <p>This operation is not used by AWS customers.</p> </note>"
+      "documentation":"<p>An SaaS partner can use this operation to list all the partner event source names that they have created. This operation is not used by AWS customers.</p>"
     },
     "ListRuleNamesByTarget":{
       "name":"ListRuleNamesByTarget",
@@ -264,7 +268,7 @@
         {"shape":"InternalException"},
         {"shape":"ResourceNotFoundException"}
       ],
-      "documentation":"<p>Lists the rules for the specified target. You can see which rules can invoke a specific target in your account.</p>"
+      "documentation":"<p>Lists the rules for the specified target. You can see which of the rules in Amazon EventBridge can invoke a specific target in your account.</p>"
     },
     "ListRules":{
       "name":"ListRules",
@@ -278,7 +282,7 @@
         {"shape":"InternalException"},
         {"shape":"ResourceNotFoundException"}
       ],
-      "documentation":"<p>Lists your EventBridge rules. You can either list all the rules or provide a prefix to match to the rule names.</p> <p> <code>ListRules</code> doesn't list the targets of a rule. To see the targets associated with a rule, use <a>ListTargetsByRule</a>.</p>"
+      "documentation":"<p>Lists your Amazon EventBridge rules. You can either list all the rules or you can provide a prefix to match to the rule names.</p> <p>ListRules does not list the targets of a rule. To see the targets associated with a rule, use <a>ListTargetsByRule</a>.</p>"
     },
     "ListTagsForResource":{
       "name":"ListTagsForResource",
@@ -292,7 +296,7 @@
         {"shape":"ResourceNotFoundException"},
         {"shape":"InternalException"}
       ],
-      "documentation":"<p>Displays the tags associated with an EventBridge resource. In EventBridge, rules can be tagged.</p>"
+      "documentation":"<p>Displays the tags associated with an EventBridge resource. In EventBridge, rules and event buses can be tagged.</p>"
     },
     "ListTargetsByRule":{
       "name":"ListTargetsByRule",
@@ -319,7 +323,7 @@
       "errors":[
         {"shape":"InternalException"}
       ],
-      "documentation":"<p>Sends custom events to EventBridge so that they can be matched to rules. These events can be from your custom applications and services.</p>"
+      "documentation":"<p>Sends custom events to Amazon EventBridge so that they can be matched to rules.</p>"
     },
     "PutPartnerEvents":{
       "name":"PutPartnerEvents",
@@ -332,7 +336,7 @@
       "errors":[
         {"shape":"InternalException"}
       ],
-      "documentation":"<p>This is used by SaaS partners to write events to a customer's partner event bus.</p> <note> <p>AWS customers do not use this operation. Instead, AWS customers can use <a>PutEvents</a> to write custom events from their own applications to an event bus.</p> </note>"
+      "documentation":"<p>This is used by SaaS partners to write events to a customer's partner event bus. AWS customers do not use this operation.</p>"
     },
     "PutPermission":{
       "name":"PutPermission",
@@ -347,7 +351,7 @@
         {"shape":"InternalException"},
         {"shape":"ConcurrentModificationException"}
       ],
-      "documentation":"<p>Running <code>PutPermission</code> permits the specified AWS account or AWS organization to put events to the specified <i>event bus</i>. Rules in your account are triggered by these events arriving to an event bus in your account. </p> <p>For another account to send events to your account, that external account must have a rule with your account's event bus as a target.</p> <p>To enable multiple AWS accounts to put events to an event bus, run <code>PutPermission</code> once for each of these accounts. Or, if all the accounts are members of the same AWS organization, you can run <code>PutPermission</code> once specifying <code>Principal</code> as \"*\" and specifying the AWS organization ID in <code>Condition</code>, to grant permissions to all accounts in that organization.</p> <p>If you grant permissions using an organization, then accounts in that organization must specify a <code>RoleArn</code> with proper permissions when they use <code>PutTarget</code> to add your account's event bus as a target. For more information, see <a href=\"https://docs.aws.amazon.com/eventbridge/latest/userguide/eventbridge-cross-account-event-delivery.html\">Sending and Receiving Events Between AWS Accounts</a> in the <i>Amazon EventBridge User Guide</i>.</p> <p>The permission policy on an event bus can't exceed 10 KB in size.</p>"
+      "documentation":"<p>Running <code>PutPermission</code> permits the specified AWS account or AWS organization to put events to the specified <i>event bus</i>. CloudWatch Events rules in your account are triggered by these events arriving to an event bus in your account. </p> <p>For another account to send events to your account, that external account must have an EventBridge rule with your account's event bus as a target.</p> <p>To enable multiple AWS accounts to put events to your event bus, run <code>PutPermission</code> once for each of these accounts. Or, if all the accounts are members of the same AWS organization, you can run <code>PutPermission</code> once specifying <code>Principal</code> as \"*\" and specifying the AWS organization ID in <code>Condition</code>, to grant permissions to all accounts in that organization.</p> <p>If you grant permissions using an organization, then accounts in that organization must specify a <code>RoleArn</code> with proper permissions when they use <code>PutTarget</code> to add your account's event bus as a target. For more information, see <a href=\"https://docs.aws.amazon.com/eventbridge/latest/userguide/eventbridge-cross-account-event-delivery.html\">Sending and Receiving Events Between AWS Accounts</a> in the <i>Amazon EventBridge User Guide</i>.</p> <p>The permission policy on the default event bus cannot exceed 10 KB in size.</p>"
     },
     "PutRule":{
       "name":"PutRule",
@@ -365,7 +369,7 @@
         {"shape":"InternalException"},
         {"shape":"ResourceNotFoundException"}
       ],
-      "documentation":"<p>Creates or updates the specified rule. Rules are enabled by default or based on value of the state. You can disable a rule using <a>DisableRule</a>.</p> <p>A single rule watches for events from a single event bus. Events generated by AWS services go to your account's default event bus. Events generated by SaaS partner services or applications go to the matching partner event bus. If you have custom applications or services, you can specify whether their events go to your default event bus or a custom event bus that you have created. For more information, see <a>CreateEventBus</a>.</p> <p>If you're updating an existing rule, the rule is replaced with what you specify in this <code>PutRule</code> command. If you omit arguments in <code>PutRule</code>, the old values for those arguments aren't kept. Instead, they're replaced with null values.</p> <p>When you create or update a rule, incoming events might not immediately start matching to new or updated rules. Allow a short period of time for changes to take effect.</p> <p>A rule must contain at least an <code>EventPattern</code> or <code>ScheduleExpression</code>. Rules with <code>EventPatterns</code> are triggered when a matching event is observed. Rules with <code>ScheduleExpressions</code> self-trigger based on the given schedule. A rule can have both an <code>EventPattern</code> and a <code>ScheduleExpression</code>, in which case the rule triggers on matching events as well as on a schedule.</p> <p>When you initially create a rule, you can optionally assign one or more tags to the rule. Tags can help you organize and categorize your resources. You can also use them to scope user permissions, by granting a user permission to access or change only rules with certain tag values. To use the <code>PutRule</code> operation and assign tags, you must have both the <code>events:PutRule</code> and <code>events:TagResource</code> permissions.</p> <p>If you are updating an existing rule, any tags you specify in the <code>PutRule</code> operation are ignored. To update the tags of an existing rule, use <a>TagResource</a> and <a>UntagResource</a>.</p> <p>Most services in AWS treat <code>:</code> or <code>/</code> as the same character in Amazon Resource Names (ARNs). However, EventBridge uses an exact match in event patterns and rules. Be sure to use the correct ARN characters when creating event patterns so that they match the ARN syntax in the event that you want to match.</p> <p>In EventBridge, you could create rules that lead to infinite loops, where a rule is fired repeatedly. For example, a rule might detect that ACLs have changed on an S3 bucket, and trigger software to change them to the desired state. If you don't write the rule carefully, the subsequent change to the ACLs fires the rule again, creating an infinite loop.</p> <p>To prevent this, write the rules so that the triggered actions don't refire the same rule. For example, your rule could fire only if ACLs are found to be in a bad state, instead of after any change. </p> <p>An infinite loop can quickly cause higher than expected charges. We recommend that you use budgeting, which alerts you when charges exceed your specified limit. For more information, see <a href=\"https://docs.aws.amazon.com/awsaccountbilling/latest/aboutv2/budgets-managing-costs.html\">Managing Your Costs with Budgets</a>.</p>"
+      "documentation":"<p>Creates or updates the specified rule. Rules are enabled by default, or based on value of the state. You can disable a rule using <a>DisableRule</a>.</p> <p>A single rule watches for events from a single event bus. Events generated by AWS services go to your account's default event bus. Events generated by SaaS partner services or applications go to the matching partner event bus. If you have custom applications or services, you can specify whether their events go to your default event bus or a custom event bus that you have created. For more information, see <a>CreateEventBus</a>.</p> <p>If you are updating an existing rule, the rule is replaced with what you specify in this <code>PutRule</code> command. If you omit arguments in <code>PutRule</code>, the old values for those arguments are not kept. Instead, they are replaced with null values.</p> <p>When you create or update a rule, incoming events might not immediately start matching to new or updated rules. Allow a short period of time for changes to take effect.</p> <p>A rule must contain at least an EventPattern or ScheduleExpression. Rules with EventPatterns are triggered when a matching event is observed. Rules with ScheduleExpressions self-trigger based on the given schedule. A rule can have both an EventPattern and a ScheduleExpression, in which case the rule triggers on matching events as well as on a schedule.</p> <p>When you initially create a rule, you can optionally assign one or more tags to the rule. Tags can help you organize and categorize your resources. You can also use them to scope user permissions, by granting a user permission to access or change only rules with certain tag values. To use the <code>PutRule</code> operation and assign tags, you must have both the <code>events:PutRule</code> and <code>events:TagResource</code> permissions.</p> <p>If you are updating an existing rule, any tags you specify in the <code>PutRule</code> operation are ignored. To update the tags of an existing rule, use <a>TagResource</a> and <a>UntagResource</a>.</p> <p>Most services in AWS treat : or / as the same character in Amazon Resource Names (ARNs). However, EventBridge uses an exact match in event patterns and rules. Be sure to use the correct ARN characters when creating event patterns so that they match the ARN syntax in the event you want to match.</p> <p>In EventBridge, it is possible to create rules that lead to infinite loops, where a rule is fired repeatedly. For example, a rule might detect that ACLs have changed on an S3 bucket, and trigger software to change them to the desired state. If the rule is not written carefully, the subsequent change to the ACLs fires the rule again, creating an infinite loop.</p> <p>To prevent this, write the rules so that the triggered actions do not re-fire the same rule. For example, your rule could fire only if ACLs are found to be in a bad state, instead of after any change. </p> <p>An infinite loop can quickly cause higher than expected charges. We recommend that you use budgeting, which alerts you when charges exceed your specified limit. For more information, see <a href=\"https://docs.aws.amazon.com/awsaccountbilling/latest/aboutv2/budgets-managing-costs.html\">Managing Your Costs with Budgets</a>.</p>"
     },
     "PutTargets":{
       "name":"PutTargets",
@@ -382,7 +386,7 @@
         {"shape":"ManagedRuleException"},
         {"shape":"InternalException"}
       ],
-      "documentation":"<p>Adds the specified targets to the specified rule, or updates the targets if they're already associated with the rule.</p> <p>Targets are the resources that are invoked when a rule is triggered.</p> <p>You can configure the following as targets in EventBridge:</p> <ul> <li> <p>EC2 instances</p> </li> <li> <p>SSM Run Command</p> </li> <li> <p>SSM Automation</p> </li> <li> <p>AWS Lambda functions</p> </li> <li> <p>Data streams in Amazon Kinesis Data Streams</p> </li> <li> <p>Data delivery streams in Amazon Kinesis Data Firehose</p> </li> <li> <p>Amazon ECS tasks</p> </li> <li> <p>AWS Step Functions state machines</p> </li> <li> <p>AWS Batch jobs</p> </li> <li> <p>AWS CodeBuild projects</p> </li> <li> <p>Pipelines in AWS CodePipeline</p> </li> <li> <p>Amazon Inspector assessment templates</p> </li> <li> <p>Amazon SNS topics</p> </li> <li> <p>Amazon SQS queues, including FIFO queues</p> </li> <li> <p>The default event bus of another AWS account</p> </li> </ul> <p>Creating rules with built-in targets is supported only on the AWS Management Console. The built-in targets are <code>EC2 CreateSnapshot API call</code>, <code>EC2 RebootInstances API call</code>, <code>EC2 StopInstances API call</code>, and <code>EC2 TerminateInstances API call</code>. </p> <p>For some target types, <code>PutTargets</code> provides target-specific parameters. If the target is a Kinesis data stream, you can optionally specify which shard the event goes to by using the <code>KinesisParameters</code> argument. To invoke a command on multiple EC2 instances with one rule, you can use the <code>RunCommandParameters</code> field.</p> <p>To be able to make API calls against the resources that you own, Amazon EventBridge needs the appropriate permissions. For AWS Lambda and Amazon SNS resources, EventBridge relies on resource-based policies. For EC2 instances, Kinesis data streams, and AWS Step Functions state machines, EventBridge relies on IAM roles that you specify in the <code>RoleARN</code> argument in <code>PutTargets</code>. For more information, see <a href=\"https://docs.aws.amazon.com/eventbridge/latest/userguide/auth-and-access-control-eventbridge.html\">Authentication and Access Control</a> in the <i>Amazon EventBridge User Guide</i>.</p> <p>If another AWS account is in the same Region and has granted you permission (using <code>PutPermission</code>), you can send events to that account. Set that account's event bus as a target of the rules in your account. To send the matched events to the other account, specify that account's event bus as the <code>Arn</code> value when you run <code>PutTargets</code>. If your account sends events to another account, your account is charged for each sent event. Each event sent to another account is charged as a custom event. The account receiving the event isn't charged. For more information, see <a href=\"https://aws.amazon.com/eventbridge/pricing/\">Amazon EventBridge Pricing</a>.</p> <p>If you're setting an event bus in another account as the target and that account granted permission to your account through an organization instead of directly by the account ID, you must specify a <code>RoleArn</code> with proper permissions in the <code>Target</code> structure. For more information, see <a href=\"https://docs.aws.amazon.com/eventbridge/latest/userguide/eventbridge-cross-account-event-delivery.html\">Sending and Receiving Events Between AWS Accounts</a> in the <i>Amazon EventBridge User Guide</i>.</p> <p>For more information about enabling cross-account events, see <a>PutPermission</a>.</p> <p> <code>Input</code>, <code>InputPath</code>, and <code>InputTransformer</code> are mutually exclusive and optional parameters of a target. When a rule is triggered due to a matched event:</p> <ul> <li> <p>If none of the following arguments are specified for a target, the entire event is passed to the target in JSON format (unless the target is Amazon EC2 Run Command or Amazon ECS task, in which case nothing from the event is passed to the target).</p> </li> <li> <p>If <code>Input</code> is specified in the form of valid JSON, then the matched event is overridden with this constant.</p> </li> <li> <p>If <code>InputPath</code> is specified in the form of JSONPath (for example, <code>$.detail</code>), only the part of the event specified in the path is passed to the target (for example, only the detail part of the event is passed).</p> </li> <li> <p>If <code>InputTransformer</code> is specified, one or more specified JSONPaths are extracted from the event and used as values in a template that you specify as the input to the target.</p> </li> </ul> <p>When you specify <code>InputPath</code> or <code>InputTransformer</code>, you must use JSON dot notation, not bracket notation.</p> <p>When you add targets to a rule and the associated rule triggers soon after, new or updated targets might not be immediately invoked. Allow a short period of time for changes to take effect.</p> <p>This action can partially fail if too many requests are made at the same time. If that happens, <code>FailedEntryCount</code> is nonzero in the response, and each entry in <code>FailedEntries</code> provides the ID of the failed target and the error code.</p>"
+      "documentation":"<p>Adds the specified targets to the specified rule, or updates the targets if they are already associated with the rule.</p> <p>Targets are the resources that are invoked when a rule is triggered.</p> <p>You can configure the following as targets for Events:</p> <ul> <li> <p>EC2 instances</p> </li> <li> <p>SSM Run Command</p> </li> <li> <p>SSM Automation</p> </li> <li> <p>AWS Lambda functions</p> </li> <li> <p>Data streams in Amazon Kinesis Data Streams</p> </li> <li> <p>Data delivery streams in Amazon Kinesis Data Firehose</p> </li> <li> <p>Amazon ECS tasks</p> </li> <li> <p>AWS Step Functions state machines</p> </li> <li> <p>AWS Batch jobs</p> </li> <li> <p>AWS CodeBuild projects</p> </li> <li> <p>Pipelines in AWS CodePipeline</p> </li> <li> <p>Amazon Inspector assessment templates</p> </li> <li> <p>Amazon SNS topics</p> </li> <li> <p>Amazon SQS queues, including FIFO queues</p> </li> <li> <p>The default event bus of another AWS account</p> </li> </ul> <p>Creating rules with built-in targets is supported only in the AWS Management Console. The built-in targets are <code>EC2 CreateSnapshot API call</code>, <code>EC2 RebootInstances API call</code>, <code>EC2 StopInstances API call</code>, and <code>EC2 TerminateInstances API call</code>. </p> <p>For some target types, <code>PutTargets</code> provides target-specific parameters. If the target is a Kinesis data stream, you can optionally specify which shard the event goes to by using the <code>KinesisParameters</code> argument. To invoke a command on multiple EC2 instances with one rule, you can use the <code>RunCommandParameters</code> field.</p> <p>To be able to make API calls against the resources that you own, Amazon CloudWatch Events needs the appropriate permissions. For AWS Lambda and Amazon SNS resources, EventBridge relies on resource-based policies. For EC2 instances, Kinesis data streams, and AWS Step Functions state machines, EventBridge relies on IAM roles that you specify in the <code>RoleARN</code> argument in <code>PutTargets</code>. For more information, see <a href=\"https://docs.aws.amazon.com/eventbridge/latest/userguide/auth-and-access-control-eventbridge.html\">Authentication and Access Control</a> in the <i>Amazon EventBridge User Guide</i>.</p> <p>If another AWS account is in the same region and has granted you permission (using <code>PutPermission</code>), you can send events to that account. Set that account's event bus as a target of the rules in your account. To send the matched events to the other account, specify that account's event bus as the <code>Arn</code> value when you run <code>PutTargets</code>. If your account sends events to another account, your account is charged for each sent event. Each event sent to another account is charged as a custom event. The account receiving the event is not charged. For more information, see <a href=\"https://aws.amazon.com/cloudwatch/pricing/\">Amazon CloudWatch Pricing</a>.</p> <note> <p> <code>Input</code>, <code>InputPath</code>, and <code>InputTransformer</code> are not available with <code>PutTarget</code> if the target is an event bus of a different AWS account.</p> </note> <p>If you are setting the event bus of another account as the target, and that account granted permission to your account through an organization instead of directly by the account ID, then you must specify a <code>RoleArn</code> with proper permissions in the <code>Target</code> structure. For more information, see <a href=\"https://docs.aws.amazon.com/eventbridge/latest/userguide/eventbridge-cross-account-event-delivery.html\">Sending and Receiving Events Between AWS Accounts</a> in the <i>Amazon EventBridge User Guide</i>.</p> <p>For more information about enabling cross-account events, see <a>PutPermission</a>.</p> <p> <b>Input</b>, <b>InputPath</b>, and <b>InputTransformer</b> are mutually exclusive and optional parameters of a target. When a rule is triggered due to a matched event:</p> <ul> <li> <p>If none of the following arguments are specified for a target, then the entire event is passed to the target in JSON format (unless the target is Amazon EC2 Run Command or Amazon ECS task, in which case nothing from the event is passed to the target).</p> </li> <li> <p>If <b>Input</b> is specified in the form of valid JSON, then the matched event is overridden with this constant.</p> </li> <li> <p>If <b>InputPath</b> is specified in the form of JSONPath (for example, <code>$.detail</code>), then only the part of the event specified in the path is passed to the target (for example, only the detail part of the event is passed).</p> </li> <li> <p>If <b>InputTransformer</b> is specified, then one or more specified JSONPaths are extracted from the event and used as values in a template that you specify as the input to the target.</p> </li> </ul> <p>When you specify <code>InputPath</code> or <code>InputTransformer</code>, you must use JSON dot notation, not bracket notation.</p> <p>When you add targets to a rule and the associated rule triggers soon after, new or updated targets might not be immediately invoked. Allow a short period of time for changes to take effect.</p> <p>This action can partially fail if too many requests are made at the same time. If that happens, <code>FailedEntryCount</code> is non-zero in the response and each entry in <code>FailedEntries</code> provides the ID of the failed target and the error code.</p>"
     },
     "RemovePermission":{
       "name":"RemovePermission",
@@ -428,7 +432,7 @@
         {"shape":"InternalException"},
         {"shape":"ManagedRuleException"}
       ],
-      "documentation":"<p>Assigns one or more tags (key-value pairs) to the specified EventBridge resource. Tags can help you organize and categorize your resources. You can also use them to scope user permissions by granting a user permission to access or change only resources with certain tag values. In EventBridge, rules can be tagged.</p> <p>Tags don't have any semantic meaning to AWS and are interpreted strictly as strings of characters.</p> <p>You can use the <code>TagResource</code> action with a rule that already has tags. If you specify a new tag key for the rule, this tag is appended to the list of tags associated with the rule. If you specify a tag key that is already associated with the rule, the new tag value that you specify replaces the previous value for that tag.</p> <p>You can associate as many as 50 tags with a resource.</p>"
+      "documentation":"<p>Assigns one or more tags (key-value pairs) to the specified EventBridge resource. Tags can help you organize and categorize your resources. You can also use them to scope user permissions by granting a user permission to access or change only resources with certain tag values. In EventBridge, rules and event buses can be tagged.</p> <p>Tags don't have any semantic meaning to AWS and are interpreted strictly as strings of characters.</p> <p>You can use the <code>TagResource</code> action with a resource that already has tags. If you specify a new tag key, this tag is appended to the list of tags associated with the resource. If you specify a tag key that is already associated with the resource, the new tag value that you specify replaces the previous value for that tag.</p> <p>You can associate as many as 50 tags with a resource.</p>"
     },
     "TestEventPattern":{
       "name":"TestEventPattern",
@@ -442,7 +446,7 @@
         {"shape":"InvalidEventPatternException"},
         {"shape":"InternalException"}
       ],
-      "documentation":"<p>Tests whether the specified event pattern matches the provided event.</p> <p>Most services in AWS treat <code>:</code> or <code>/</code> as the same character in Amazon Resource Names (ARNs). However, EventBridge uses an exact match in event patterns and rules. Be sure to use the correct ARN characters when creating event patterns so that they match the ARN syntax in the event that you want to match.</p>"
+      "documentation":"<p>Tests whether the specified event pattern matches the provided event.</p> <p>Most services in AWS treat : or / as the same character in Amazon Resource Names (ARNs). However, EventBridge uses an exact match in event patterns and rules. Be sure to use the correct ARN characters when creating event patterns so that they match the ARN syntax in the event you want to match.</p>"
     },
     "UntagResource":{
       "name":"UntagResource",
@@ -458,7 +462,7 @@
         {"shape":"ConcurrentModificationException"},
         {"shape":"ManagedRuleException"}
       ],
-      "documentation":"<p>Removes one or more tags from the specified EventBridge resource. In EventBridge, rules can be tagged.</p>"
+      "documentation":"<p>Removes one or more tags from the specified EventBridge resource. In CloudWatch Events, rules and event buses can be tagged.</p>"
     }
   },
   "shapes":{
@@ -506,14 +510,14 @@
         },
         "SecurityGroups":{
           "shape":"StringList",
-          "documentation":"<p>Specifies the security groups associated with the task. These security groups must all be in the same VPC. You can specify as many as five security groups. If you don't specify a security group, the default security group for the VPC is used.</p>"
+          "documentation":"<p>Specifies the security groups associated with the task. These security groups must all be in the same VPC. You can specify as many as five security groups. If you do not specify a security group, the default security group for the VPC is used.</p>"
         },
         "AssignPublicIp":{
           "shape":"AssignPublicIp",
           "documentation":"<p>Specifies whether the task's elastic network interface receives a public IP address. You can specify <code>ENABLED</code> only when <code>LaunchType</code> in <code>EcsParameters</code> is set to <code>FARGATE</code>.</p>"
         }
       },
-      "documentation":"<p>This structure specifies the VPC subnets and security groups for the task and whether a public IP address is to be used. This structure is relevant only for ECS tasks that use the <code>awsvpc</code> network mode.</p>"
+      "documentation":"<p>This structure specifies the VPC subnets and security groups for the task, and whether a public IP address is to be used. This structure is relevant only for ECS tasks that use the <code>awsvpc</code> network mode.</p>"
     },
     "BatchArrayProperties":{
       "type":"structure",
@@ -546,7 +550,7 @@
         },
         "RetryStrategy":{
           "shape":"BatchRetryStrategy",
-          "documentation":"<p>The retry strategy to use for failed jobs if the target is an AWS Batch job. The retry strategy is the number of times to retry the failed job execution. Valid values are 1–10. When you specify a retry strategy here, it overrides the retry strategy defined in the job definition.</p>"
+          "documentation":"<p>The retry strategy to use for failed jobs, if the target is an AWS Batch job. The retry strategy is the number of times to retry the failed job execution. Valid values are 1–10. When you specify a retry strategy here, it overrides the retry strategy defined in the job definition.</p>"
         }
       },
       "documentation":"<p>The custom parameters to be used when the target is an AWS Batch job.</p>"
@@ -559,14 +563,14 @@
           "documentation":"<p>The number of times to attempt to retry, if the job fails. Valid values are 1–10.</p>"
         }
       },
-      "documentation":"<p>The retry strategy to use for failed jobs if the target is an AWS Batch job. If you specify a retry strategy here, it overrides the retry strategy defined in the job definition.</p>"
+      "documentation":"<p>The retry strategy to use for failed jobs, if the target is an AWS Batch job. If you specify a retry strategy here, it overrides the retry strategy defined in the job definition.</p>"
     },
     "Boolean":{"type":"boolean"},
     "ConcurrentModificationException":{
       "type":"structure",
       "members":{
       },
-      "documentation":"<p>There is concurrent modification on a resource.</p>",
+      "documentation":"<p>There is concurrent modification on a rule or target.</p>",
       "exception":true
     },
     "Condition":{
@@ -579,18 +583,18 @@
       "members":{
         "Type":{
           "shape":"String",
-          "documentation":"<p>The type of condition. Currently, the only supported value is <code>StringEquals</code>.</p>"
+          "documentation":"<p>Specifies the type of condition. Currently the only supported value is <code>StringEquals</code>.</p>"
         },
         "Key":{
           "shape":"String",
-          "documentation":"<p>The key for the condition. Currently, the only supported key is <code>aws:PrincipalOrgID</code>.</p>"
+          "documentation":"<p>Specifies the key for the condition. Currently the only supported key is <code>aws:PrincipalOrgID</code>.</p>"
         },
         "Value":{
           "shape":"String",
-          "documentation":"<p>The value for the key. Currently, this must be the ID of the organization.</p>"
+          "documentation":"<p>Specifies the value for the key. Currently, this must be the ID of the organization.</p>"
         }
       },
-      "documentation":"<p>A JSON string that you can use to limit the event bus permissions that you're granting to only accounts that fulfill the condition. Currently, the only supported condition is membership in a certain AWS organization. The string must contain <code>Type</code>, <code>Key</code>, and <code>Value</code> fields. The <code>Value</code> field specifies the ID of the AWS organization. The following is an example value for <code>Condition</code>:</p> <p> <code>'{\"Type\" : \"StringEquals\", \"Key\": \"aws:PrincipalOrgID\", \"Value\": \"o-1234567890\"}'</code> </p>"
+      "documentation":"<p>A JSON string which you can use to limit the event bus permissions you are granting to only accounts that fulfill the condition. Currently, the only supported condition is membership in a certain AWS organization. The string must contain <code>Type</code>, <code>Key</code>, and <code>Value</code> fields. The <code>Value</code> field specifies the ID of the AWS organization. Following is an example value for <code>Condition</code>:</p> <p> <code>'{\"Type\" : \"StringEquals\", \"Key\": \"aws:PrincipalOrgID\", \"Value\": \"o-1234567890\"}'</code> </p>"
     },
     "CreateEventBusRequest":{
       "type":"structure",
@@ -598,11 +602,15 @@
       "members":{
         "Name":{
           "shape":"EventBusName",
-          "documentation":"<p>The name of the new event bus. </p> <p>The names of custom event buses can't contain the <code>/</code> character. You can't use the name <code>default</code> for a custom event bus because this name is already used for your account's default event bus.</p> <p>If this is a partner event bus, the name must exactly match the name of the partner event source that this event bus is matched to. This name will include the <code>/</code> character.</p>"
+          "documentation":"<p>The name of the new event bus. </p> <p>Event bus names cannot contain the / character. You can't use the name <code>default</code> for a custom event bus, as this name is already used for your account's default event bus.</p> <p>If this is a partner event bus, the name must exactly match the name of the partner event source that this event bus is matched to.</p>"
         },
         "EventSourceName":{
           "shape":"EventSourceName",
-          "documentation":"<p>If you're creating a partner event bus, this specifies the partner event source that the new event bus will be matched with.</p>"
+          "documentation":"<p>If you are creating a partner event bus, this specifies the partner event source that the new event bus will be matched with.</p>"
+        },
+        "Tags":{
+          "shape":"TagList",
+          "documentation":"<p>Tags to associate with the event bus.</p>"
         }
       }
     },
@@ -628,7 +636,7 @@
         },
         "Account":{
           "shape":"AccountId",
-          "documentation":"<p>The AWS account ID of the customer who is permitted to create a matching partner event bus for this partner event source.</p>"
+          "documentation":"<p>The AWS account ID that is permitted to create a matching partner event bus for this partner event source.</p>"
         }
       }
     },
@@ -749,7 +757,7 @@
         },
         "ExpirationTime":{
           "shape":"Timestamp",
-          "documentation":"<p>The date and time that the event source will expire if you don't create a matching event bus.</p>"
+          "documentation":"<p>The date and time that the event source will expire if you do not create a matching event bus.</p>"
         },
         "Name":{
           "shape":"String",
@@ -757,7 +765,7 @@
         },
         "State":{
           "shape":"EventSourceState",
-          "documentation":"<p>The state of the event source. If it's <code>ACTIVE</code>, you have already created a matching event bus for this event source, and that event bus is active. If it's <code>PENDING</code>, either you haven't yet created a matching event bus, or that event bus is deactivated. If it's <code>DELETED</code>, you have created a matching event bus, but the event source has since been deleted.</p>"
+          "documentation":"<p>The state of the event source. If it is ACTIVE, you have already created a matching event bus for this event source, and that event bus is active. If it is PENDING, either you haven't yet created a matching event bus, or that event bus is deactivated. If it is DELETED, you have created a matching event bus, but the event source has since been deleted.</p>"
         }
       }
     },
@@ -811,11 +819,11 @@
         },
         "EventPattern":{
           "shape":"EventPattern",
-          "documentation":"<p>The event pattern. For more information, see <a href=\"https://docs.aws.amazon.com/eventbridge/latest/userguide/eventbridge-and-event-patterns.html\">Event Patterns</a> in the <i>Amazon EventBridge User Guide</i>.</p>"
+          "documentation":"<p>The event pattern. For more information, see <a href=\"https://docs.aws.amazon.com/eventbridge/latest/userguide/eventbridge-and-event-patterns.html\">Events and Event Patterns</a> in the <i>Amazon EventBridge User Guide</i>.</p>"
         },
         "ScheduleExpression":{
           "shape":"ScheduleExpression",
-          "documentation":"<p>The scheduling expression: for example, <code>\"cron(0 20 * * ? *)\"</code> or <code>\"rate(5 minutes)\"</code>.</p>"
+          "documentation":"<p>The scheduling expression. For example, \"cron(0 20 * * ? *)\", \"rate(5 minutes)\".</p>"
         },
         "State":{
           "shape":"RuleState",
@@ -871,7 +879,7 @@
         },
         "NetworkConfiguration":{
           "shape":"NetworkConfiguration",
-          "documentation":"<p>Use this structure if the ECS task uses the <code>awsvpc</code> network mode. This structure specifies the VPC subnets and security groups associated with the task and whether a public IP address is to be used. This structure is required if <code>LaunchType</code> is <code>FARGATE</code> because the <code>awsvpc</code> mode is required for Fargate tasks.</p> <p>If you specify <code>NetworkConfiguration</code> when the target ECS task doesn't use the <code>awsvpc</code> network mode, the task fails.</p>"
+          "documentation":"<p>Use this structure if the ECS task uses the <code>awsvpc</code> network mode. This structure specifies the VPC subnets and security groups associated with the task, and whether a public IP address is to be used. This structure is required if <code>LaunchType</code> is <code>FARGATE</code> because the <code>awsvpc</code> mode is required for Fargate tasks.</p> <p>If you specify <code>NetworkConfiguration</code> when the target ECS task does not use the <code>awsvpc</code> network mode, the task fails.</p>"
         },
         "PlatformVersion":{
           "shape":"String",
@@ -948,11 +956,11 @@
         },
         "CreationTime":{
           "shape":"Timestamp",
-          "documentation":"<p>The date and time when the event source was created.</p>"
+          "documentation":"<p>The date and time the event source was created.</p>"
         },
         "ExpirationTime":{
           "shape":"Timestamp",
-          "documentation":"<p>The date and time when the event source will expire if the AWS account doesn't create a matching event bus for it.</p>"
+          "documentation":"<p>The date and time that the event source will expire, if the AWS account doesn't create a matching event bus for it.</p>"
         },
         "Name":{
           "shape":"String",
@@ -960,7 +968,7 @@
         },
         "State":{
           "shape":"EventSourceState",
-          "documentation":"<p>The state of the event source. If it's <code>ACTIVE</code>, you have already created a matching event bus for this event source, and that event bus is active. If it's <code>PENDING</code>, either you haven't yet created a matching event bus, or that event bus is deactivated. If it's <code>DELETED</code>, you have created a matching event bus, but the event source has since been deleted.</p>"
+          "documentation":"<p>The state of the event source. If it is ACTIVE, you have already created a matching event bus for this event source, and that event bus is active. If it is PENDING, either you haven't yet created a matching event bus, or that event bus is deactivated. If it is DELETED, you have created a matching event bus, but the event source has since been deleted.</p>"
         }
       },
       "documentation":"<p>A partner event source is created by an SaaS partner. If a customer creates a partner event bus that matches this event source, that AWS account can receive events from the partner's applications or services.</p>"
@@ -996,11 +1004,11 @@
       "members":{
         "InputPathsMap":{
           "shape":"TransformerPaths",
-          "documentation":"<p>Map of JSON paths to be extracted from the event. You can then insert these in the template in <code>InputTemplate</code> to produce the output to be sent to the target.</p> <p> <code>InputPathsMap</code> is an array key-value pairs, where each value is a valid JSON path. You can have as many as 10 key-value pairs. You must use JSON dot notation, not bracket notation.</p> <p>The keys can't start with <code>\"AWS\"</code>.</p>"
+          "documentation":"<p>Map of JSON paths to be extracted from the event. You can then insert these in the template in <code>InputTemplate</code> to produce the output you want to be sent to the target.</p> <p> <code>InputPathsMap</code> is an array key-value pairs, where each value is a valid JSON path. You can have as many as 10 key-value pairs. You must use JSON dot notation, not bracket notation.</p> <p>The keys cannot start with \"AWS.\" </p>"
         },
         "InputTemplate":{
           "shape":"TransformerInput",
-          "documentation":"<p>Input template where you specify placeholders that will be filled with the values of the keys from <code>InputPathsMap</code> to customize the data sent to the target. Enclose each <code>InputPathsMaps</code> value in brackets: &lt;<i>value</i>&gt;. The InputTemplate must be valid JSON.</p> <p>If <code>InputTemplate</code> is a JSON object (surrounded by curly braces), the following restrictions apply:</p> <ul> <li> <p>The placeholder can't be used as an object key</p> </li> <li> <p>Object values can't include quote marks</p> </li> </ul> <p>The following example shows the syntax for using <code>InputPathsMap</code> and <code>InputTemplate</code>.</p> <p> <code> \"InputTransformer\":</code> </p> <p> <code>{</code> </p> <p> <code>\"InputPathsMap\": {\"instance\": \"$.detail.instance\",\"status\": \"$.detail.status\"},</code> </p> <p> <code>\"InputTemplate\": \"&lt;instance&gt; is in state &lt;status&gt;\"</code> </p> <p> <code>}</code> </p> <p>To have the <code>InputTemplate</code> include quote marks within a JSON string, escape each quote marks with a slash, as in the following example:</p> <p> <code> \"InputTransformer\":</code> </p> <p> <code>{</code> </p> <p> <code>\"InputPathsMap\": {\"instance\": \"$.detail.instance\",\"status\": \"$.detail.status\"},</code> </p> <p> <code>\"InputTemplate\": \"&lt;instance&gt; is in state \\\"&lt;status&gt;\\\"\"</code> </p> <p> <code>}</code> </p>"
+          "documentation":"<p>Input template where you specify placeholders that will be filled with the values of the keys from <code>InputPathsMap</code> to customize the data sent to the target. Enclose each <code>InputPathsMaps</code> value in brackets: &lt;<i>value</i>&gt; The InputTemplate must be valid JSON.</p> <p>If <code>InputTemplate</code> is a JSON object (surrounded by curly braces), the following restrictions apply:</p> <ul> <li> <p>The placeholder cannot be used as an object key.</p> </li> <li> <p>Object values cannot include quote marks.</p> </li> </ul> <p>The following example shows the syntax for using <code>InputPathsMap</code> and <code>InputTemplate</code>.</p> <p> <code> \"InputTransformer\":</code> </p> <p> <code>{</code> </p> <p> <code>\"InputPathsMap\": {\"instance\": \"$.detail.instance\",\"status\": \"$.detail.status\"},</code> </p> <p> <code>\"InputTemplate\": \"&lt;instance&gt; is in state &lt;status&gt;\"</code> </p> <p> <code>}</code> </p> <p>To have the <code>InputTemplate</code> include quote marks within a JSON string, escape each quote marks with a slash, as in the following example:</p> <p> <code> \"InputTransformer\":</code> </p> <p> <code>{</code> </p> <p> <code>\"InputPathsMap\": {\"instance\": \"$.detail.instance\",\"status\": \"$.detail.status\"},</code> </p> <p> <code>\"InputTemplate\": \"&lt;instance&gt; is in state \\\"&lt;status&gt;\\\"\"</code> </p> <p> <code>}</code> </p>"
         }
       },
       "documentation":"<p>Contains the parameters needed for you to provide custom input to a target based on one or more pieces of data extracted from the event.</p>"
@@ -1024,14 +1032,14 @@
       "type":"structure",
       "members":{
       },
-      "documentation":"<p>The event pattern isn't valid.</p>",
+      "documentation":"<p>The event pattern is not valid.</p>",
       "exception":true
     },
     "InvalidStateException":{
       "type":"structure",
       "members":{
       },
-      "documentation":"<p>The specified state isn't a valid state for an event source.</p>",
+      "documentation":"<p>The specified state is not a valid state for an event source.</p>",
       "exception":true
     },
     "KinesisParameters":{
@@ -1043,7 +1051,7 @@
           "documentation":"<p>The JSON path to be extracted from the event and used as the partition key. For more information, see <a href=\"https://docs.aws.amazon.com/streams/latest/dev/key-concepts.html#partition-key\">Amazon Kinesis Streams Key Concepts</a> in the <i>Amazon Kinesis Streams Developer Guide</i>.</p>"
         }
       },
-      "documentation":"<p>This object enables you to specify a JSON path to extract from the event and use as the partition key for the Amazon Kinesis data stream so that you can control the shard that the event goes to. If you don't include this parameter, the default is to use the <code>eventId</code> as the partition key.</p>"
+      "documentation":"<p>This object enables you to specify a JSON path to extract from the event and use as the partition key for the Amazon Kinesis data stream, so that you can control the shard to which the event goes. If you do not include this parameter, the default is to use the <code>eventId</code> as the partition key.</p>"
     },
     "LaunchType":{
       "type":"string",
@@ -1056,7 +1064,7 @@
       "type":"structure",
       "members":{
       },
-      "documentation":"<p>You tried to create more resources than is allowed.</p>",
+      "documentation":"<p>You tried to create more rules or add more targets to a rule than is allowed.</p>",
       "exception":true
     },
     "LimitMax100":{
@@ -1081,7 +1089,7 @@
         },
         "Limit":{
           "shape":"LimitMax100",
-          "documentation":"<p>Specifying this limits the number of results returned by this operation. The operation also returns a <code>NextToken</code> that you can use in a subsequent operation to retrieve the next set of results.</p>"
+          "documentation":"<p>Specifying this limits the number of results returned by this operation. The operation also returns a NextToken which you can use in a subsequent operation to retrieve the next set of results.</p>"
         }
       }
     },
@@ -1111,7 +1119,7 @@
         },
         "Limit":{
           "shape":"LimitMax100",
-          "documentation":"<p>Specifying this limits the number of results returned by this operation. The operation also returns a <code>NextToken</code> that you can use in a subsequent operation to retrieve the next set of results.</p>"
+          "documentation":"<p>Specifying this limits the number of results returned by this operation. The operation also returns a NextToken which you can use in a subsequent operation to retrieve the next set of results.</p>"
         }
       }
     },
@@ -1142,7 +1150,7 @@
         },
         "Limit":{
           "shape":"LimitMax100",
-          "documentation":"<p>Specifying this limits the number of results returned by this operation. The operation also returns a <code>NextToken</code> that you can use in a subsequent operation to retrieve the next set of results.</p>"
+          "documentation":"<p>Specifying this limits the number of results returned by this operation. The operation also returns a NextToken which you can use in a subsequent operation to retrieve the next set of results.</p>"
         }
       }
     },
@@ -1173,7 +1181,7 @@
         },
         "Limit":{
           "shape":"LimitMax100",
-          "documentation":"<p>pecifying this limits the number of results returned by this operation. The operation also returns a <code>NextToken</code> that you can use in a subsequent operation to retrieve the next set of results.</p>"
+          "documentation":"<p>pecifying this limits the number of results returned by this operation. The operation also returns a NextToken which you can use in a subsequent operation to retrieve the next set of results.</p>"
         }
       }
     },
@@ -1265,7 +1273,7 @@
       "members":{
         "ResourceARN":{
           "shape":"Arn",
-          "documentation":"<p>The ARN of the rule for which you want to view tags.</p>"
+          "documentation":"<p>The ARN of the EventBridge resource for which you want to view tags.</p>"
         }
       }
     },
@@ -1274,7 +1282,7 @@
       "members":{
         "Tags":{
           "shape":"TagList",
-          "documentation":"<p>The list of tag keys and values associated with the rule that you specified.</p>"
+          "documentation":"<p>The list of tag keys and values associated with the resource you specified</p>"
         }
       }
     },
@@ -1322,7 +1330,7 @@
       "type":"structure",
       "members":{
       },
-      "documentation":"<p>An AWS service created this rule on behalf of your account. That service manages it. If you see this error in response to <code>DeleteRule</code> or <code>RemoveTargets</code>, you can use the <code>Force</code> parameter in those calls to delete the rule or remove targets from the rule. You can't modify these managed rules by using <code>DisableRule</code>, <code>EnableRule</code>, <code>PutTargets</code>, <code>PutRule</code>, <code>TagResource</code>, or <code>UntagResource</code>. </p>",
+      "documentation":"<p>This rule was created by an AWS service on behalf of your account. It is managed by that service. If you see this error in response to <code>DeleteRule</code> or <code>RemoveTargets</code>, you can use the <code>Force</code> parameter in those calls to delete the rule or remove targets from the rule. You cannot modify these managed rules by using <code>DisableRule</code>, <code>EnableRule</code>, <code>PutTargets</code>, <code>PutRule</code>, <code>TagResource</code>, or <code>UntagResource</code>. </p>",
       "exception":true
     },
     "MessageGroupId":{"type":"string"},
@@ -1331,7 +1339,7 @@
       "members":{
         "awsvpcConfiguration":{
           "shape":"AwsVpcConfiguration",
-          "documentation":"<p>Use this structure to specify the VPC subnets and security groups for the task and whether a public IP address is to be used. This structure is relevant only for ECS tasks that use the <code>awsvpc</code> network mode.</p>"
+          "documentation":"<p>Use this structure to specify the VPC subnets and security groups for the task, and whether a public IP address is to be used. This structure is relevant only for ECS tasks that use the <code>awsvpc</code> network mode.</p>"
         }
       },
       "documentation":"<p>This structure specifies the network configuration for an ECS task.</p>"
@@ -1370,15 +1378,15 @@
         },
         "CreationTime":{
           "shape":"Timestamp",
-          "documentation":"<p>The date and time when the event source was created.</p>"
+          "documentation":"<p>The date and time the event source was created.</p>"
         },
         "ExpirationTime":{
           "shape":"Timestamp",
-          "documentation":"<p>The date and time when the event source will expire if the AWS account doesn't create a matching event bus for it.</p>"
+          "documentation":"<p>The date and time that the event source will expire, if the AWS account doesn't create a matching event bus for it.</p>"
         },
         "State":{
           "shape":"EventSourceState",
-          "documentation":"<p>The state of the event source. If it's <code>ACTIVE</code>, you have already created a matching event bus for this event source, and that event bus is active. If it's <code>PENDING</code>, either you haven't yet created a matching event bus, or that event bus is deactivated. If it's <code>DELETED</code>, you have created a matching event bus, but the event source has since been deleted.</p>"
+          "documentation":"<p>The state of the event source. If it is ACTIVE, you have already created a matching event bus for this event source, and that event bus is active. If it is PENDING, either you haven't yet created a matching event bus, or that event bus is deactivated. If it is DELETED, you have created a matching event bus, but the event source has since been deleted.</p>"
         }
       },
       "documentation":"<p>The AWS account that a partner event source has been offered to.</p>"
@@ -1425,27 +1433,27 @@
       "members":{
         "Time":{
           "shape":"EventTime",
-          "documentation":"<p>The timestamp of the event, per <a href=\"https://www.rfc-editor.org/rfc/rfc3339.txt\">RFC3339</a>. If no timestamp is provided, the timestamp of the <a>PutEvents</a> call is used.</p>"
+          "documentation":"<p>The time stamp of the event, per <a href=\"https://www.rfc-editor.org/rfc/rfc3339.txt\">RFC3339</a>. If no time stamp is provided, the time stamp of the <a>PutEvents</a> call is used.</p>"
         },
         "Source":{
           "shape":"String",
-          "documentation":"<p>The source of the event. This field is required.</p>"
+          "documentation":"<p>The source of the event.</p>"
         },
         "Resources":{
           "shape":"EventResourceList",
-          "documentation":"<p>AWS resources, identified by Amazon Resource Name (ARN), that the event primarily concerns. Any number, including zero, can be present.</p>"
+          "documentation":"<p>AWS resources, identified by Amazon Resource Name (ARN), which the event primarily concerns. Any number, including zero, may be present.</p>"
         },
         "DetailType":{
           "shape":"String",
-          "documentation":"<p>Free-form string used to decide which fields to expect in the event detail. This field is required.</p>"
+          "documentation":"<p>Free-form string used to decide what fields to expect in the event detail.</p>"
         },
         "Detail":{
           "shape":"String",
-          "documentation":"<p>A valid JSON object. There is no other schema imposed. The JSON object can contain fields and nested subobjects.</p> <p>This field is required.</p>"
+          "documentation":"<p>A valid JSON string. There is no other schema imposed. The JSON string may contain fields and nested subobjects.</p>"
         },
         "EventBusName":{
           "shape":"NonPartnerEventBusName",
-          "documentation":"<p>The event bus that will receive the event. Only the rules that are associated with this event bus can match the event.</p>"
+          "documentation":"<p>The event bus that will receive the event. Only the rules that are associated with this event bus will be able to match the event.</p>"
         }
       },
       "documentation":"<p>Represents an event to be submitted.</p>"
@@ -1509,20 +1517,20 @@
           "documentation":"<p>The date and time of the event.</p>"
         },
         "Source":{
-          "shape":"String",
-          "documentation":"<p>The event source that is generating the evntry. This field is required.</p>"
+          "shape":"EventSourceName",
+          "documentation":"<p>The event source that is generating the evntry.</p>"
         },
         "Resources":{
           "shape":"EventResourceList",
-          "documentation":"<p>AWS resources, identified by Amazon Resource Name (ARN), that the event primarily concerns. Any number, including zero, can be present.</p>"
+          "documentation":"<p>AWS resources, identified by Amazon Resource Name (ARN), which the event primarily concerns. Any number, including zero, may be present.</p>"
         },
         "DetailType":{
           "shape":"String",
-          "documentation":"<p>A free-form string used to decide which fields to expect in the event detail. This field is required.</p>"
+          "documentation":"<p>A free-form string used to decide what fields to expect in the event detail.</p>"
         },
         "Detail":{
           "shape":"String",
-          "documentation":"<p>A valid JSON object. There is no other schema imposed. The JSON object can contain fields and nested subobjects. This field is required.</p>"
+          "documentation":"<p>A valid JSON string. There is no other schema imposed. The JSON string may contain fields and nested subobjects.</p>"
         }
       },
       "documentation":"<p>The details about an event generated by an SaaS partner.</p>"
@@ -1538,7 +1546,7 @@
       "members":{
         "FailedEntryCount":{
           "shape":"Integer",
-          "documentation":"<p>The number of events from this operation that couldn't be written to the partner event bus.</p>"
+          "documentation":"<p>The number of events from this operation that could not be written to the partner event bus.</p>"
         },
         "Entries":{
           "shape":"PutPartnerEventsResultEntryList",
@@ -1562,7 +1570,7 @@
           "documentation":"<p>The error message that explains why the event submission failed.</p>"
         }
       },
-      "documentation":"<p>Represents an event that a partner tried to generate but failed.</p>"
+      "documentation":"<p>Represents an event that a partner tried to generate, but failed.</p>"
     },
     "PutPartnerEventsResultEntryList":{
       "type":"list",
@@ -1582,19 +1590,19 @@
         },
         "Action":{
           "shape":"Action",
-          "documentation":"<p>The action that you're enabling the other account to perform. Currently, this must be <code>events:PutEvents</code>.</p>"
+          "documentation":"<p>The action that you are enabling the other account to perform. Currently, this must be <code>events:PutEvents</code>.</p>"
         },
         "Principal":{
           "shape":"Principal",
-          "documentation":"<p>The 12-digit AWS account ID that you are permitting to put events to your default event bus. Specify \"*\" to permit any account to put events to your default event bus.</p> <p>If you specify \"*\" without specifying <code>Condition</code>, avoid creating rules that might match undesirable events. To create more secure rules, make sure that the event pattern for each rule contains an <code>account</code> field with a specific account ID to receive events from. Rules that have an account field match events sent only from accounts that are listed in the rule's <code>account</code> field.</p>"
+          "documentation":"<p>The 12-digit AWS account ID that you are permitting to put events to your default event bus. Specify \"*\" to permit any account to put events to your default event bus.</p> <p>If you specify \"*\" without specifying <code>Condition</code>, avoid creating rules that may match undesirable events. To create more secure rules, make sure that the event pattern for each rule contains an <code>account</code> field with a specific account ID from which to receive events. Rules with an account field do not match any events sent from other accounts.</p>"
         },
         "StatementId":{
           "shape":"StatementId",
-          "documentation":"<p>An identifier string for the external account that you're granting permissions to. If you later want to revoke the permission for this external account, specify this <code>StatementId</code> when you run <a>RemovePermission</a>.</p>"
+          "documentation":"<p>An identifier string for the external account that you are granting permissions to. If you later want to revoke the permission for this external account, specify this <code>StatementId</code> when you run <a>RemovePermission</a>.</p>"
         },
         "Condition":{
           "shape":"Condition",
-          "documentation":"<p>This parameter enables you to limit the permission to accounts that fulfill a certain condition, such as being a member of a certain AWS organization. For more information about AWS Organizations, see <a href=\"https://docs.aws.amazon.com/organizations/latest/userguide/orgs_introduction.html\">What Is AWS Organizations?</a> in the <i>AWS Organizations User Guide</i>.</p> <p>If you specify <code>Condition</code> with an AWS organization ID and specify \"*\" as the value for <code>Principal</code>, you grant permission to all the accounts in the named organization.</p> <p>The <code>Condition</code> is a JSON string that must contain <code>Type</code>, <code>Key</code>, and <code>Value</code> fields.</p>"
+          "documentation":"<p>This parameter enables you to limit the permission to accounts that fulfill a certain condition, such as being a member of a certain AWS organization. For more information about AWS Organizations, see <a href=\"https://docs.aws.amazon.com/organizations/latest/userguide/orgs_introduction.html\">What Is AWS Organizations</a> in the <i>AWS Organizations User Guide</i>.</p> <p>If you specify <code>Condition</code> with an AWS organization ID, and specify \"*\" as the value for <code>Principal</code>, you grant permission to all the accounts in the named organization.</p> <p>The <code>Condition</code> is a JSON string which must contain <code>Type</code>, <code>Key</code>, and <code>Value</code> fields.</p>"
         }
       }
     },
@@ -1604,15 +1612,15 @@
       "members":{
         "Name":{
           "shape":"RuleName",
-          "documentation":"<p>The name of the rule that you're creating or updating.</p> <p>A rule can't have the same name as another rule in the same Region or on the same event bus.</p>"
+          "documentation":"<p>The name of the rule that you are creating or updating.</p>"
         },
         "ScheduleExpression":{
           "shape":"ScheduleExpression",
-          "documentation":"<p>The scheduling expression: for example, <code>\"cron(0 20 * * ? *)\"</code> or <code>\"rate(5 minutes)\"</code>.</p>"
+          "documentation":"<p>The scheduling expression. For example, \"cron(0 20 * * ? *)\" or \"rate(5 minutes)\".</p>"
         },
         "EventPattern":{
           "shape":"EventPattern",
-          "documentation":"<p>The event pattern. For more information, see <a href=\"https://docs.aws.amazon.com/eventbridge/latest/userguide/eventbridge-and-event-patterns.html\">Event Patterns</a> in the <i>Amazon EventBridge User Guide</i>.</p>"
+          "documentation":"<p>The event pattern. For more information, see <a href=\"https://docs.aws.amazon.com/eventbridge/latest/userguide/eventbridge-and-event-patterns.html\">Events and Event Patterns</a> in the <i>Amazon EventBridge User Guide</i>.</p>"
         },
         "State":{
           "shape":"RuleState",
@@ -1736,7 +1744,7 @@
         },
         "Force":{
           "shape":"Boolean",
-          "documentation":"<p>If this is a managed rule created by an AWS service on your behalf, you must specify <code>Force</code> as <code>True</code> to remove targets. This parameter is ignored for rules that aren't managed rules. You can check whether a rule is a managed rule by using <code>DescribeRule</code> or <code>ListRules</code> and checking the <code>ManagedBy</code> field of the response.</p>"
+          "documentation":"<p>If this is a managed rule, created by an AWS service on your behalf, you must specify <code>Force</code> as <code>True</code> to remove targets. This parameter is ignored for rules that are not managed rules. You can check whether a rule is a managed rule by using <code>DescribeRule</code> or <code>ListRules</code> and checking the <code>ManagedBy</code> field of the response.</p>"
         }
       }
     },
@@ -1779,14 +1787,14 @@
       "type":"structure",
       "members":{
       },
-      "documentation":"<p>The resource that you're trying to create already exists.</p>",
+      "documentation":"<p>The resource you are trying to create already exists.</p>",
       "exception":true
     },
     "ResourceNotFoundException":{
       "type":"structure",
       "members":{
       },
-      "documentation":"<p>An entity that you specified doesn't exist.</p>",
+      "documentation":"<p>An entity that you specified does not exist.</p>",
       "exception":true
     },
     "RoleArn":{
@@ -1807,7 +1815,7 @@
         },
         "EventPattern":{
           "shape":"EventPattern",
-          "documentation":"<p>The event pattern of the rule. For more information, see <a href=\"https://docs.aws.amazon.com/eventbridge/latest/userguide/eventbridge-and-event-patterns.html\">Event Patterns</a> in the <i>Amazon EventBridge User Guide</i>.</p>"
+          "documentation":"<p>The event pattern of the rule. For more information, see <a href=\"https://docs.aws.amazon.com/eventbridge/latest/userguide/eventbridge-and-event-patterns.html\">Events and Event Patterns</a> in the <i>Amazon EventBridge User Guide</i>.</p>"
         },
         "State":{
           "shape":"RuleState",
@@ -1819,7 +1827,7 @@
         },
         "ScheduleExpression":{
           "shape":"ScheduleExpression",
-          "documentation":"<p>The scheduling expression: for example, <code>\"cron(0 20 * * ? *)\"</code> or <code>\"rate(5 minutes)\"</code>.</p>"
+          "documentation":"<p>The scheduling expression. For example, \"cron(0 20 * * ? *)\", \"rate(5 minutes)\".</p>"
         },
         "RoleArn":{
           "shape":"RoleArn",
@@ -1827,7 +1835,7 @@
         },
         "ManagedBy":{
           "shape":"ManagedBy",
-          "documentation":"<p>If an AWS service created the rule on behalf of your account, this field displays the principal name of the service that created the rule.</p>"
+          "documentation":"<p>If the rule was created on behalf of your account by an AWS service, this field displays the principal name of the service that created the rule.</p>"
         },
         "EventBusName":{
           "shape":"EventBusName",
@@ -1872,10 +1880,10 @@
       "members":{
         "RunCommandTargets":{
           "shape":"RunCommandTargets",
-          "documentation":"<p>Currently, we support including only one <code>RunCommandTarget</code> block, which specifies either an array of <code>InstanceIds</code> or a tag.</p>"
+          "documentation":"<p>Currently, we support including only one RunCommandTarget block, which specifies either an array of InstanceIds or a tag.</p>"
         }
       },
-      "documentation":"<p>This parameter contains the criteria (either <code>InstanceIds</code> or a tag) used to specify which EC2 instances are to be sent the command. </p>"
+      "documentation":"<p>This parameter contains the criteria (either InstanceIds or a tag) used to specify which EC2 instances are to be sent the command. </p>"
     },
     "RunCommandTarget":{
       "type":"structure",
@@ -1893,7 +1901,7 @@
           "documentation":"<p>If <code>Key</code> is <code>tag:</code> <i>tag-key</i>, <code>Values</code> is a list of tag values. If <code>Key</code> is <code>InstanceIds</code>, <code>Values</code> is a list of Amazon EC2 instance IDs.</p>"
         }
       },
-      "documentation":"<p>Information about the EC2 instances that are to be sent the command, specified as key-value pairs. Each <code>RunCommandTarget</code> block can include only one key, but this key can specify multiple values.</p>"
+      "documentation":"<p>Information about the EC2 instances that are to be sent the command, specified as key-value pairs. Each <code>RunCommandTarget</code> block can include only one key, but this key may specify multiple values.</p>"
     },
     "RunCommandTargetKey":{
       "type":"string",
@@ -1952,14 +1960,14 @@
       "members":{
         "Key":{
           "shape":"TagKey",
-          "documentation":"<p>A string that you can use to assign a value. The combination of tag keys and values can help you organize and categorize your resources.</p>"
+          "documentation":"<p>A string you can use to assign a value. The combination of tag keys and values can help you organize and categorize your resources.</p>"
         },
         "Value":{
           "shape":"TagValue",
           "documentation":"<p>The value for the specified tag key.</p>"
         }
       },
-      "documentation":"<p>A key-value pair associated with an AWS resource. In EventBridge, rules support tagging.</p>"
+      "documentation":"<p>A key-value pair associated with an AWS resource. In EventBridge, rules and event buses support tagging.</p>"
     },
     "TagKey":{
       "type":"string",
@@ -1983,11 +1991,11 @@
       "members":{
         "ResourceARN":{
           "shape":"Arn",
-          "documentation":"<p>The ARN of the rule that you're adding tags to.</p>"
+          "documentation":"<p>The ARN of the EventBridge resource that you're adding tags to.</p>"
         },
         "Tags":{
           "shape":"TagList",
-          "documentation":"<p>The list of key-value pairs to associate with the rule.</p>"
+          "documentation":"<p>The list of key-value pairs to associate with the resource.</p>"
         }
       }
     },
@@ -2010,7 +2018,7 @@
       "members":{
         "Id":{
           "shape":"TargetId",
-          "documentation":"<p>A name for the target. Use a string that will help you identify the target. Each target associated with a rule must have an <code>Id</code> unique for that rule.</p>"
+          "documentation":"<p>The ID of the target.</p>"
         },
         "Arn":{
           "shape":"TargetArn",
@@ -2034,7 +2042,7 @@
         },
         "KinesisParameters":{
           "shape":"KinesisParameters",
-          "documentation":"<p>The custom parameter that you can use to control the shard assignment when the target is a Kinesis data stream. If you don't include this parameter, the default is to use the <code>eventId</code> as the partition key.</p>"
+          "documentation":"<p>The custom parameter you can use to control the shard assignment, when the target is a Kinesis data stream. If you do not include this parameter, the default is to use the <code>eventId</code> as the partition key.</p>"
         },
         "RunCommandParameters":{
           "shape":"RunCommandParameters",
@@ -2042,7 +2050,7 @@
         },
         "EcsParameters":{
           "shape":"EcsParameters",
-          "documentation":"<p>Contains the Amazon ECS task definition and task count to be used if the event target is an Amazon ECS task. For more information about Amazon ECS tasks, see <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/task_defintions.html\">Task Definitions </a> in the <i>Amazon EC2 Container Service Developer Guide</i>.</p>"
+          "documentation":"<p>Contains the Amazon ECS task definition and task count to be used, if the event target is an Amazon ECS task. For more information about Amazon ECS tasks, see <a href=\"https://docs.aws.amazon.com/AmazonECS/latest/developerguide/task_defintions.html\">Task Definitions </a> in the <i>Amazon EC2 Container Service Developer Guide</i>.</p>"
         },
         "BatchParameters":{
           "shape":"BatchParameters",
@@ -2053,7 +2061,7 @@
           "documentation":"<p>Contains the message group ID to use when the target is a FIFO queue.</p> <p>If you specify an SQS FIFO queue as a target, the queue must have content-based deduplication enabled.</p>"
         }
       },
-      "documentation":"<p>Targets are the resources to be invoked when a rule is triggered. For a complete list of services and resources that can be set as a target, see <a>PutTargets</a>.</p> <p>If you're setting the event bus of another account as the target and that account granted permission to your account through an organization instead of directly by the account ID, you must specify a <code>RoleArn</code> with proper permissions in the <code>Target</code> structure. For more information, see <a href=\"https://docs.aws.amazon.com/eventbridge/latest/userguide/eventbridge-cross-account-event-delivery.html\">Sending and Receiving Events Between AWS Accounts</a> in the <i>Amazon EventBridge User Guide</i>.</p>"
+      "documentation":"<p>Targets are the resources to be invoked when a rule is triggered. For a complete list of services and resources that can be set as a target, see <a>PutTargets</a>.</p> <p>If you are setting the event bus of another account as the target, and that account granted permission to your account through an organization instead of directly by the account ID, then you must specify a <code>RoleArn</code> with proper permissions in the <code>Target</code> structure. For more information, see <a href=\"https://docs.aws.amazon.com/eventbridge/latest/userguide/eventbridge-cross-account-event-delivery.html\">Sending and Receiving Events Between AWS Accounts</a> in the <i>Amazon EventBridge User Guide</i>.</p>"
     },
     "TargetArn":{
       "type":"string",
@@ -2099,7 +2107,7 @@
       "members":{
         "EventPattern":{
           "shape":"EventPattern",
-          "documentation":"<p>The event pattern. For more information, see <a href=\"https://docs.aws.amazon.com/eventbridge/latest/userguide/eventbridge-and-event-patterns.html\">Event Patterns</a> in the <i>Amazon EventBridge User Guide</i>.</p>"
+          "documentation":"<p>The event pattern. For more information, see <a href=\"https://docs.aws.amazon.com/eventbridge/latest/userguide/eventbridge-and-event-patterns.html\">Events and Event Patterns</a> in the <i>Amazon EventBridge User Guide</i>.</p>"
         },
         "Event":{
           "shape":"String",
@@ -2137,7 +2145,7 @@
       "members":{
         "ResourceARN":{
           "shape":"Arn",
-          "documentation":"<p>The ARN of the rule that you're removing tags from.</p>"
+          "documentation":"<p>The ARN of the EventBridge resource from which you are removing tags.</p>"
         },
         "TagKeys":{
           "shape":"TagKeyList",
@@ -2151,5 +2159,5 @@
       }
     }
   },
-  "documentation":"<p>Amazon EventBridge helps you to respond to state changes in your AWS resources. When your resources change state, they automatically send events into an event stream. You can create rules that match selected events in the stream and route them to targets to take action. You can also use rules to take action on a predetermined schedule. For example, you can configure rules to:</p> <ul> <li> <p>Automatically invoke an AWS Lambda function to update DNS entries when an event notifies you that Amazon EC2 instance enters the running state</p> </li> <li> <p>Direct specific API records from AWS CloudTrail to an Amazon Kinesis data stream for detailed analysis of potential security or availability risks</p> </li> <li> <p>Periodically invoke a built-in target to create a snapshot of an Amazon EBS volume</p> </li> </ul> <p>For more information about the features of Amazon EventBridge, see the <a href=\"https://docs.aws.amazon.com/eventbridge/latest/userguide/\">Amazon EventBridge User Guide</a>.</p>"
+  "documentation":"<p>Amazon EventBridge helps you to respond to state changes in your AWS resources. When your resources change state, they automatically send events into an event stream. You can create rules that match selected events in the stream and route them to targets to take action. You can also use rules to take action on a predetermined schedule. For example, you can configure rules to:</p> <ul> <li> <p>Automatically invoke an AWS Lambda function to update DNS entries when an event notifies you that Amazon EC2 instance enters the running state.</p> </li> <li> <p>Direct specific API records from AWS CloudTrail to an Amazon Kinesis data stream for detailed analysis of potential security or availability risks.</p> </li> <li> <p>Periodically invoke a built-in target to create a snapshot of an Amazon EBS volume.</p> </li> </ul> <p>For more information about the features of Amazon EventBridge, see the <a href=\"https://docs.aws.amazon.com/eventbridge/latest/userguide\">Amazon EventBridge User Guide</a>.</p>"
 }
diff --git a/services/firehose/pom.xml b/services/firehose/pom.xml
index eaae84e6a0fd..3dae8d3f41f4 100644
--- a/services/firehose/pom.xml
+++ b/services/firehose/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -22,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>firehose</artifactId>
     <name>AWS Java SDK :: Services :: Amazon Kinesis Firehose</name>
diff --git a/services/firehose/src/it/java/software/amazon/awssdk/services/firehose/ServiceIntegrationTest.java b/services/firehose/src/it/java/software/amazon/awssdk/services/firehose/ServiceIntegrationTest.java
index 431ac158916c..95277110d059 100644
--- a/services/firehose/src/it/java/software/amazon/awssdk/services/firehose/ServiceIntegrationTest.java
+++ b/services/firehose/src/it/java/software/amazon/awssdk/services/firehose/ServiceIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/firehose/src/main/resources/codegen-resources/service-2.json b/services/firehose/src/main/resources/codegen-resources/service-2.json
index 7b7e372094fa..b7d343d18f7a 100644
--- a/services/firehose/src/main/resources/codegen-resources/service-2.json
+++ b/services/firehose/src/main/resources/codegen-resources/service-2.json
@@ -24,9 +24,10 @@
       "errors":[
         {"shape":"InvalidArgumentException"},
         {"shape":"LimitExceededException"},
-        {"shape":"ResourceInUseException"}
+        {"shape":"ResourceInUseException"},
+        {"shape":"InvalidKMSResourceException"}
       ],
-      "documentation":"<p>Creates a Kinesis Data Firehose delivery stream.</p> <p>By default, you can create up to 50 delivery streams per AWS Region.</p> <p>This is an asynchronous operation that immediately returns. The initial status of the delivery stream is <code>CREATING</code>. After the delivery stream is created, its status is <code>ACTIVE</code> and it now accepts data. Attempts to send data to a delivery stream that is not in the <code>ACTIVE</code> state cause an exception. To check the state of a delivery stream, use <a>DescribeDeliveryStream</a>.</p> <p>A Kinesis Data Firehose delivery stream can be configured to receive records directly from providers using <a>PutRecord</a> or <a>PutRecordBatch</a>, or it can be configured to use an existing Kinesis stream as its source. To specify a Kinesis data stream as input, set the <code>DeliveryStreamType</code> parameter to <code>KinesisStreamAsSource</code>, and provide the Kinesis stream Amazon Resource Name (ARN) and role ARN in the <code>KinesisStreamSourceConfiguration</code> parameter.</p> <p>A delivery stream is configured with a single destination: Amazon S3, Amazon ES, Amazon Redshift, or Splunk. You must specify only one of the following destination configuration parameters: <code>ExtendedS3DestinationConfiguration</code>, <code>S3DestinationConfiguration</code>, <code>ElasticsearchDestinationConfiguration</code>, <code>RedshiftDestinationConfiguration</code>, or <code>SplunkDestinationConfiguration</code>.</p> <p>When you specify <code>S3DestinationConfiguration</code>, you can also provide the following optional values: BufferingHints, <code>EncryptionConfiguration</code>, and <code>CompressionFormat</code>. By default, if no <code>BufferingHints</code> value is provided, Kinesis Data Firehose buffers data up to 5 MB or for 5 minutes, whichever condition is satisfied first. <code>BufferingHints</code> is a hint, so there are some cases where the service cannot adhere to these conditions strictly. For example, record boundaries might be such that the size is a little over or under the configured buffering size. By default, no encryption is performed. We strongly recommend that you enable encryption to ensure secure data storage in Amazon S3.</p> <p>A few notes about Amazon Redshift as a destination:</p> <ul> <li> <p>An Amazon Redshift destination requires an S3 bucket as intermediate location. Kinesis Data Firehose first delivers data to Amazon S3 and then uses <code>COPY</code> syntax to load data into an Amazon Redshift table. This is specified in the <code>RedshiftDestinationConfiguration.S3Configuration</code> parameter.</p> </li> <li> <p>The compression formats <code>SNAPPY</code> or <code>ZIP</code> cannot be specified in <code>RedshiftDestinationConfiguration.S3Configuration</code> because the Amazon Redshift <code>COPY</code> operation that reads from the S3 bucket doesn't support these compression formats.</p> </li> <li> <p>We strongly recommend that you use the user name and password you provide exclusively with Kinesis Data Firehose, and that the permissions for the account are restricted for Amazon Redshift <code>INSERT</code> permissions.</p> </li> </ul> <p>Kinesis Data Firehose assumes the IAM role that is configured as part of the destination. The role should allow the Kinesis Data Firehose principal to assume the role, and the role should have permissions that allow the service to deliver the data. For more information, see <a href=\"https://docs.aws.amazon.com/firehose/latest/dev/controlling-access.html#using-iam-s3\">Grant Kinesis Data Firehose Access to an Amazon S3 Destination</a> in the <i>Amazon Kinesis Data Firehose Developer Guide</i>.</p>"
+      "documentation":"<p>Creates a Kinesis Data Firehose delivery stream.</p> <p>By default, you can create up to 50 delivery streams per AWS Region.</p> <p>This is an asynchronous operation that immediately returns. The initial status of the delivery stream is <code>CREATING</code>. After the delivery stream is created, its status is <code>ACTIVE</code> and it now accepts data. If the delivery stream creation fails, the status transitions to <code>CREATING_FAILED</code>. Attempts to send data to a delivery stream that is not in the <code>ACTIVE</code> state cause an exception. To check the state of a delivery stream, use <a>DescribeDeliveryStream</a>.</p> <p>If the status of a delivery stream is <code>CREATING_FAILED</code>, this status doesn't change, and you can't invoke <code>CreateDeliveryStream</code> again on it. However, you can invoke the <a>DeleteDeliveryStream</a> operation to delete it.</p> <p>A Kinesis Data Firehose delivery stream can be configured to receive records directly from providers using <a>PutRecord</a> or <a>PutRecordBatch</a>, or it can be configured to use an existing Kinesis stream as its source. To specify a Kinesis data stream as input, set the <code>DeliveryStreamType</code> parameter to <code>KinesisStreamAsSource</code>, and provide the Kinesis stream Amazon Resource Name (ARN) and role ARN in the <code>KinesisStreamSourceConfiguration</code> parameter.</p> <p>To create a delivery stream with server-side encryption (SSE) enabled, include <a>DeliveryStreamEncryptionConfigurationInput</a> in your request. This is optional. You can also invoke <a>StartDeliveryStreamEncryption</a> to turn on SSE for an existing delivery stream that doesn't have SSE enabled.</p> <p>A delivery stream is configured with a single destination: Amazon S3, Amazon ES, Amazon Redshift, or Splunk. You must specify only one of the following destination configuration parameters: <code>ExtendedS3DestinationConfiguration</code>, <code>S3DestinationConfiguration</code>, <code>ElasticsearchDestinationConfiguration</code>, <code>RedshiftDestinationConfiguration</code>, or <code>SplunkDestinationConfiguration</code>.</p> <p>When you specify <code>S3DestinationConfiguration</code>, you can also provide the following optional values: BufferingHints, <code>EncryptionConfiguration</code>, and <code>CompressionFormat</code>. By default, if no <code>BufferingHints</code> value is provided, Kinesis Data Firehose buffers data up to 5 MB or for 5 minutes, whichever condition is satisfied first. <code>BufferingHints</code> is a hint, so there are some cases where the service cannot adhere to these conditions strictly. For example, record boundaries might be such that the size is a little over or under the configured buffering size. By default, no encryption is performed. We strongly recommend that you enable encryption to ensure secure data storage in Amazon S3.</p> <p>A few notes about Amazon Redshift as a destination:</p> <ul> <li> <p>An Amazon Redshift destination requires an S3 bucket as intermediate location. Kinesis Data Firehose first delivers data to Amazon S3 and then uses <code>COPY</code> syntax to load data into an Amazon Redshift table. This is specified in the <code>RedshiftDestinationConfiguration.S3Configuration</code> parameter.</p> </li> <li> <p>The compression formats <code>SNAPPY</code> or <code>ZIP</code> cannot be specified in <code>RedshiftDestinationConfiguration.S3Configuration</code> because the Amazon Redshift <code>COPY</code> operation that reads from the S3 bucket doesn't support these compression formats.</p> </li> <li> <p>We strongly recommend that you use the user name and password you provide exclusively with Kinesis Data Firehose, and that the permissions for the account are restricted for Amazon Redshift <code>INSERT</code> permissions.</p> </li> </ul> <p>Kinesis Data Firehose assumes the IAM role that is configured as part of the destination. The role should allow the Kinesis Data Firehose principal to assume the role, and the role should have permissions that allow the service to deliver the data. For more information, see <a href=\"https://docs.aws.amazon.com/firehose/latest/dev/controlling-access.html#using-iam-s3\">Grant Kinesis Data Firehose Access to an Amazon S3 Destination</a> in the <i>Amazon Kinesis Data Firehose Developer Guide</i>.</p>"
     },
     "DeleteDeliveryStream":{
       "name":"DeleteDeliveryStream",
@@ -40,7 +41,7 @@
         {"shape":"ResourceInUseException"},
         {"shape":"ResourceNotFoundException"}
       ],
-      "documentation":"<p>Deletes a delivery stream and its data.</p> <p>You can delete a delivery stream only if it is in <code>ACTIVE</code> or <code>DELETING</code> state, and not in the <code>CREATING</code> state. While the deletion request is in process, the delivery stream is in the <code>DELETING</code> state.</p> <p>To check the state of a delivery stream, use <a>DescribeDeliveryStream</a>.</p> <p>While the delivery stream is <code>DELETING</code> state, the service might continue to accept the records, but it doesn't make any guarantees with respect to delivering the data. Therefore, as a best practice, you should first stop any applications that are sending records before deleting a delivery stream.</p>"
+      "documentation":"<p>Deletes a delivery stream and its data.</p> <p>To check the state of a delivery stream, use <a>DescribeDeliveryStream</a>. You can delete a delivery stream only if it is in one of the following states: <code>ACTIVE</code>, <code>DELETING</code>, <code>CREATING_FAILED</code>, or <code>DELETING_FAILED</code>. You can't delete a delivery stream that is in the <code>CREATING</code> state. While the deletion request is in process, the delivery stream is in the <code>DELETING</code> state.</p> <p>While the delivery stream is in the <code>DELETING</code> state, the service might continue to accept records, but it doesn't make any guarantees with respect to delivering the data. Therefore, as a best practice, first stop any applications that are sending records before you delete a delivery stream.</p>"
     },
     "DescribeDeliveryStream":{
       "name":"DescribeDeliveryStream",
@@ -53,7 +54,7 @@
       "errors":[
         {"shape":"ResourceNotFoundException"}
       ],
-      "documentation":"<p>Describes the specified delivery stream and gets the status. For example, after your delivery stream is created, call <code>DescribeDeliveryStream</code> to see whether the delivery stream is <code>ACTIVE</code> and therefore ready for data to be sent to it.</p>"
+      "documentation":"<p>Describes the specified delivery stream and its status. For example, after your delivery stream is created, call <code>DescribeDeliveryStream</code> to see whether the delivery stream is <code>ACTIVE</code> and therefore ready for data to be sent to it. </p> <p>If the status of a delivery stream is <code>CREATING_FAILED</code>, this status doesn't change, and you can't invoke <a>CreateDeliveryStream</a> again on it. However, you can invoke the <a>DeleteDeliveryStream</a> operation to delete it. If the status is <code>DELETING_FAILED</code>, you can force deletion by invoking <a>DeleteDeliveryStream</a> again but with <a>DeleteDeliveryStreamInput$AllowForceDelete</a> set to true.</p>"
     },
     "ListDeliveryStreams":{
       "name":"ListDeliveryStreams",
@@ -91,6 +92,7 @@
       "errors":[
         {"shape":"ResourceNotFoundException"},
         {"shape":"InvalidArgumentException"},
+        {"shape":"InvalidKMSResourceException"},
         {"shape":"ServiceUnavailableException"}
       ],
       "documentation":"<p>Writes a single data record into an Amazon Kinesis Data Firehose delivery stream. To write multiple data records into a delivery stream, use <a>PutRecordBatch</a>. Applications using these operations are referred to as producers.</p> <p>By default, each delivery stream can take in up to 2,000 transactions per second, 5,000 records per second, or 5 MB per second. If you use <a>PutRecord</a> and <a>PutRecordBatch</a>, the limits are an aggregate across these two operations for each delivery stream. For more information about limits and how to request an increase, see <a href=\"https://docs.aws.amazon.com/firehose/latest/dev/limits.html\">Amazon Kinesis Data Firehose Limits</a>. </p> <p>You must specify the name of the delivery stream and the data record when using <a>PutRecord</a>. The data record consists of a data blob that can be up to 1,000 KB in size, and any kind of data. For example, it can be a segment from a log file, geographic location data, website clickstream data, and so on.</p> <p>Kinesis Data Firehose buffers records before delivering them to the destination. To disambiguate the data blobs at the destination, a common solution is to use delimiters in the data, such as a newline (<code>\\n</code>) or some other character unique within the data. This allows the consumer application to parse individual data items when reading the data from the destination.</p> <p>The <code>PutRecord</code> operation returns a <code>RecordId</code>, which is a unique string assigned to each record. Producer applications can use this ID for purposes such as auditability and investigation.</p> <p>If the <code>PutRecord</code> operation throws a <code>ServiceUnavailableException</code>, back off and retry. If the exception persists, it is possible that the throughput limits have been exceeded for the delivery stream. </p> <p>Data records sent to Kinesis Data Firehose are stored for 24 hours from the time they are added to a delivery stream as it tries to send the records to the destination. If the destination is unreachable for more than 24 hours, the data is no longer available.</p> <important> <p>Don't concatenate two or more base64 strings to form the data fields of your records. Instead, concatenate the raw data, then perform base64 encoding.</p> </important>"
@@ -106,6 +108,7 @@
       "errors":[
         {"shape":"ResourceNotFoundException"},
         {"shape":"InvalidArgumentException"},
+        {"shape":"InvalidKMSResourceException"},
         {"shape":"ServiceUnavailableException"}
       ],
       "documentation":"<p>Writes multiple data records into a delivery stream in a single call, which can achieve higher throughput per producer than when writing single records. To write single data records into a delivery stream, use <a>PutRecord</a>. Applications using these operations are referred to as producers.</p> <p>By default, each delivery stream can take in up to 2,000 transactions per second, 5,000 records per second, or 5 MB per second. If you use <a>PutRecord</a> and <a>PutRecordBatch</a>, the limits are an aggregate across these two operations for each delivery stream. For more information about limits, see <a href=\"https://docs.aws.amazon.com/firehose/latest/dev/limits.html\">Amazon Kinesis Data Firehose Limits</a>.</p> <p>Each <a>PutRecordBatch</a> request supports up to 500 records. Each record in the request can be as large as 1,000 KB (before 64-bit encoding), up to a limit of 4 MB for the entire request. These limits cannot be changed.</p> <p>You must specify the name of the delivery stream and the data record when using <a>PutRecord</a>. The data record consists of a data blob that can be up to 1,000 KB in size, and any kind of data. For example, it could be a segment from a log file, geographic location data, website clickstream data, and so on.</p> <p>Kinesis Data Firehose buffers records before delivering them to the destination. To disambiguate the data blobs at the destination, a common solution is to use delimiters in the data, such as a newline (<code>\\n</code>) or some other character unique within the data. This allows the consumer application to parse individual data items when reading the data from the destination.</p> <p>The <a>PutRecordBatch</a> response includes a count of failed records, <code>FailedPutCount</code>, and an array of responses, <code>RequestResponses</code>. Even if the <a>PutRecordBatch</a> call succeeds, the value of <code>FailedPutCount</code> may be greater than 0, indicating that there are records for which the operation didn't succeed. Each entry in the <code>RequestResponses</code> array provides additional information about the processed record. It directly correlates with a record in the request array using the same ordering, from the top to the bottom. The response array always includes the same number of records as the request array. <code>RequestResponses</code> includes both successfully and unsuccessfully processed records. Kinesis Data Firehose tries to process all records in each <a>PutRecordBatch</a> request. A single record failure does not stop the processing of subsequent records. </p> <p>A successfully processed record includes a <code>RecordId</code> value, which is unique for the record. An unsuccessfully processed record includes <code>ErrorCode</code> and <code>ErrorMessage</code> values. <code>ErrorCode</code> reflects the type of error, and is one of the following values: <code>ServiceUnavailableException</code> or <code>InternalFailure</code>. <code>ErrorMessage</code> provides more detailed information about the error.</p> <p>If there is an internal server error or a timeout, the write might have completed or it might have failed. If <code>FailedPutCount</code> is greater than 0, retry the request, resending only those records that might have failed processing. This minimizes the possible duplicate records and also reduces the total bytes sent (and corresponding charges). We recommend that you handle any duplicates at the destination.</p> <p>If <a>PutRecordBatch</a> throws <code>ServiceUnavailableException</code>, back off and retry. If the exception persists, it is possible that the throughput limits have been exceeded for the delivery stream.</p> <p>Data records sent to Kinesis Data Firehose are stored for 24 hours from the time they are added to a delivery stream as it attempts to send the records to the destination. If the destination is unreachable for more than 24 hours, the data is no longer available.</p> <important> <p>Don't concatenate two or more base64 strings to form the data fields of your records. Instead, concatenate the raw data, then perform base64 encoding.</p> </important>"
@@ -122,9 +125,10 @@
         {"shape":"ResourceNotFoundException"},
         {"shape":"ResourceInUseException"},
         {"shape":"InvalidArgumentException"},
-        {"shape":"LimitExceededException"}
+        {"shape":"LimitExceededException"},
+        {"shape":"InvalidKMSResourceException"}
       ],
-      "documentation":"<p>Enables server-side encryption (SSE) for the delivery stream. </p> <p>This operation is asynchronous. It returns immediately. When you invoke it, Kinesis Data Firehose first sets the status of the stream to <code>ENABLING</code>, and then to <code>ENABLED</code>. You can continue to read and write data to your stream while its status is <code>ENABLING</code>, but the data is not encrypted. It can take up to 5 seconds after the encryption status changes to <code>ENABLED</code> before all records written to the delivery stream are encrypted. To find out whether a record or a batch of records was encrypted, check the response elements <a>PutRecordOutput$Encrypted</a> and <a>PutRecordBatchOutput$Encrypted</a>, respectively.</p> <p>To check the encryption state of a delivery stream, use <a>DescribeDeliveryStream</a>.</p> <p>You can only enable SSE for a delivery stream that uses <code>DirectPut</code> as its source. </p> <p>The <code>StartDeliveryStreamEncryption</code> and <code>StopDeliveryStreamEncryption</code> operations have a combined limit of 25 calls per delivery stream per 24 hours. For example, you reach the limit if you call <code>StartDeliveryStreamEncryption</code> 13 times and <code>StopDeliveryStreamEncryption</code> 12 times for the same delivery stream in a 24-hour period.</p>"
+      "documentation":"<p>Enables server-side encryption (SSE) for the delivery stream. </p> <p>This operation is asynchronous. It returns immediately. When you invoke it, Kinesis Data Firehose first sets the encryption status of the stream to <code>ENABLING</code>, and then to <code>ENABLED</code>. The encryption status of a delivery stream is the <code>Status</code> property in <a>DeliveryStreamEncryptionConfiguration</a>. If the operation fails, the encryption status changes to <code>ENABLING_FAILED</code>. You can continue to read and write data to your delivery stream while the encryption status is <code>ENABLING</code>, but the data is not encrypted. It can take up to 5 seconds after the encryption status changes to <code>ENABLED</code> before all records written to the delivery stream are encrypted. To find out whether a record or a batch of records was encrypted, check the response elements <a>PutRecordOutput$Encrypted</a> and <a>PutRecordBatchOutput$Encrypted</a>, respectively.</p> <p>To check the encryption status of a delivery stream, use <a>DescribeDeliveryStream</a>.</p> <p>Even if encryption is currently enabled for a delivery stream, you can still invoke this operation on it to change the ARN of the CMK or both its type and ARN. In this case, Kinesis Data Firehose schedules the grant it had on the old CMK for retirement and creates a grant that enables it to use the new CMK to encrypt and decrypt data and to manage the grant.</p> <p>If a delivery stream already has encryption enabled and then you invoke this operation to change the ARN of the CMK or both its type and ARN and you get <code>ENABLING_FAILED</code>, this only means that the attempt to change the CMK failed. In this case, encryption remains enabled with the old CMK.</p> <p>If the encryption status of your delivery stream is <code>ENABLING_FAILED</code>, you can invoke this operation again. </p> <p>You can only enable SSE for a delivery stream that uses <code>DirectPut</code> as its source. </p> <p>The <code>StartDeliveryStreamEncryption</code> and <code>StopDeliveryStreamEncryption</code> operations have a combined limit of 25 calls per delivery stream per 24 hours. For example, you reach the limit if you call <code>StartDeliveryStreamEncryption</code> 13 times and <code>StopDeliveryStreamEncryption</code> 12 times for the same delivery stream in a 24-hour period.</p>"
     },
     "StopDeliveryStreamEncryption":{
       "name":"StopDeliveryStreamEncryption",
@@ -140,7 +144,7 @@
         {"shape":"InvalidArgumentException"},
         {"shape":"LimitExceededException"}
       ],
-      "documentation":"<p>Disables server-side encryption (SSE) for the delivery stream. </p> <p>This operation is asynchronous. It returns immediately. When you invoke it, Kinesis Data Firehose first sets the status of the stream to <code>DISABLING</code>, and then to <code>DISABLED</code>. You can continue to read and write data to your stream while its status is <code>DISABLING</code>. It can take up to 5 seconds after the encryption status changes to <code>DISABLED</code> before all records written to the delivery stream are no longer subject to encryption. To find out whether a record or a batch of records was encrypted, check the response elements <a>PutRecordOutput$Encrypted</a> and <a>PutRecordBatchOutput$Encrypted</a>, respectively.</p> <p>To check the encryption state of a delivery stream, use <a>DescribeDeliveryStream</a>. </p> <p>The <code>StartDeliveryStreamEncryption</code> and <code>StopDeliveryStreamEncryption</code> operations have a combined limit of 25 calls per delivery stream per 24 hours. For example, you reach the limit if you call <code>StartDeliveryStreamEncryption</code> 13 times and <code>StopDeliveryStreamEncryption</code> 12 times for the same delivery stream in a 24-hour period.</p>"
+      "documentation":"<p>Disables server-side encryption (SSE) for the delivery stream. </p> <p>This operation is asynchronous. It returns immediately. When you invoke it, Kinesis Data Firehose first sets the encryption status of the stream to <code>DISABLING</code>, and then to <code>DISABLED</code>. You can continue to read and write data to your stream while its status is <code>DISABLING</code>. It can take up to 5 seconds after the encryption status changes to <code>DISABLED</code> before all records written to the delivery stream are no longer subject to encryption. To find out whether a record or a batch of records was encrypted, check the response elements <a>PutRecordOutput$Encrypted</a> and <a>PutRecordBatchOutput$Encrypted</a>, respectively.</p> <p>To check the encryption state of a delivery stream, use <a>DescribeDeliveryStream</a>. </p> <p>If SSE is enabled using a customer managed CMK and then you invoke <code>StopDeliveryStreamEncryption</code>, Kinesis Data Firehose schedules the related KMS grant for retirement and then retires it after it ensures that it is finished delivering records to the destination.</p> <p>The <code>StartDeliveryStreamEncryption</code> and <code>StopDeliveryStreamEncryption</code> operations have a combined limit of 25 calls per delivery stream per 24 hours. For example, you reach the limit if you call <code>StartDeliveryStreamEncryption</code> 13 times and <code>StopDeliveryStreamEncryption</code> 12 times for the same delivery stream in a 24-hour period.</p>"
     },
     "TagDeliveryStream":{
       "name":"TagDeliveryStream",
@@ -307,6 +311,10 @@
           "shape":"KinesisStreamSourceConfiguration",
           "documentation":"<p>When a Kinesis data stream is used as the source for the delivery stream, a <a>KinesisStreamSourceConfiguration</a> containing the Kinesis data stream Amazon Resource Name (ARN) and the role ARN for the source stream.</p>"
         },
+        "DeliveryStreamEncryptionConfigurationInput":{
+          "shape":"DeliveryStreamEncryptionConfigurationInput",
+          "documentation":"<p>Used to specify the type and Amazon Resource Name (ARN) of the KMS key needed for Server-Side Encryption (SSE).</p>"
+        },
         "S3DestinationConfiguration":{
           "shape":"S3DestinationConfiguration",
           "documentation":"<p>[Deprecated] The destination in Amazon S3. You can specify only one destination.</p>",
@@ -382,6 +390,10 @@
         "DeliveryStreamName":{
           "shape":"DeliveryStreamName",
           "documentation":"<p>The name of the delivery stream.</p>"
+        },
+        "AllowForceDelete":{
+          "shape":"BooleanObject",
+          "documentation":"<p>Set this to true if you want to delete the delivery stream even if Kinesis Data Firehose is unable to retire the grant for the CMK. Kinesis Data Firehose might be unable to retire the grant due to a customer error, such as when the CMK or the grant are in an invalid state. If you force deletion, you can then use the <a href=\"https://docs.aws.amazon.com/kms/latest/APIReference/API_RevokeGrant.html\">RevokeGrant</a> operation to revoke the grant you gave to Kinesis Data Firehose. If a failure to retire the grant happens due to an AWS KMS issue, Kinesis Data Firehose keeps retrying the delete operation.</p> <p>The default value is false.</p>"
         }
       }
     },
@@ -419,7 +431,11 @@
         },
         "DeliveryStreamStatus":{
           "shape":"DeliveryStreamStatus",
-          "documentation":"<p>The status of the delivery stream.</p>"
+          "documentation":"<p>The status of the delivery stream. If the status of a delivery stream is <code>CREATING_FAILED</code>, this status doesn't change, and you can't invoke <code>CreateDeliveryStream</code> again on it. However, you can invoke the <a>DeleteDeliveryStream</a> operation to delete it.</p>"
+        },
+        "FailureDescription":{
+          "shape":"FailureDescription",
+          "documentation":"<p>Provides details in case one of the following operations fails due to an error related to KMS: <a>CreateDeliveryStream</a>, <a>DeleteDeliveryStream</a>, <a>StartDeliveryStreamEncryption</a>, <a>StopDeliveryStreamEncryption</a>.</p>"
         },
         "DeliveryStreamEncryptionConfiguration":{
           "shape":"DeliveryStreamEncryptionConfiguration",
@@ -459,20 +475,62 @@
     "DeliveryStreamEncryptionConfiguration":{
       "type":"structure",
       "members":{
+        "KeyARN":{
+          "shape":"AWSKMSKeyARN",
+          "documentation":"<p>If <code>KeyType</code> is <code>CUSTOMER_MANAGED_CMK</code>, this field contains the ARN of the customer managed CMK. If <code>KeyType</code> is <code>AWS_OWNED_CMK</code>, <code>DeliveryStreamEncryptionConfiguration</code> doesn't contain a value for <code>KeyARN</code>.</p>"
+        },
+        "KeyType":{
+          "shape":"KeyType",
+          "documentation":"<p>Indicates the type of customer master key (CMK) that is used for encryption. The default setting is <code>AWS_OWNED_CMK</code>. For more information about CMKs, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#master_keys\">Customer Master Keys (CMKs)</a>.</p>"
+        },
         "Status":{
           "shape":"DeliveryStreamEncryptionStatus",
-          "documentation":"<p>For a full description of the different values of this status, see <a>StartDeliveryStreamEncryption</a> and <a>StopDeliveryStreamEncryption</a>.</p>"
+          "documentation":"<p>This is the server-side encryption (SSE) status for the delivery stream. For a full description of the different values of this status, see <a>StartDeliveryStreamEncryption</a> and <a>StopDeliveryStreamEncryption</a>. If this status is <code>ENABLING_FAILED</code> or <code>DISABLING_FAILED</code>, it is the status of the most recent attempt to enable or disable SSE, respectively.</p>"
+        },
+        "FailureDescription":{
+          "shape":"FailureDescription",
+          "documentation":"<p>Provides details in case one of the following operations fails due to an error related to KMS: <a>CreateDeliveryStream</a>, <a>DeleteDeliveryStream</a>, <a>StartDeliveryStreamEncryption</a>, <a>StopDeliveryStreamEncryption</a>.</p>"
         }
       },
-      "documentation":"<p>Indicates the server-side encryption (SSE) status for the delivery stream.</p>"
+      "documentation":"<p>Contains information about the server-side encryption (SSE) status for the delivery stream, the type customer master key (CMK) in use, if any, and the ARN of the CMK. You can get <code>DeliveryStreamEncryptionConfiguration</code> by invoking the <a>DescribeDeliveryStream</a> operation. </p>"
+    },
+    "DeliveryStreamEncryptionConfigurationInput":{
+      "type":"structure",
+      "required":["KeyType"],
+      "members":{
+        "KeyARN":{
+          "shape":"AWSKMSKeyARN",
+          "documentation":"<p>If you set <code>KeyType</code> to <code>CUSTOMER_MANAGED_CMK</code>, you must specify the Amazon Resource Name (ARN) of the CMK. If you set <code>KeyType</code> to <code>AWS_OWNED_CMK</code>, Kinesis Data Firehose uses a service-account CMK.</p>"
+        },
+        "KeyType":{
+          "shape":"KeyType",
+          "documentation":"<p>Indicates the type of customer master key (CMK) to use for encryption. The default setting is <code>AWS_OWNED_CMK</code>. For more information about CMKs, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#master_keys\">Customer Master Keys (CMKs)</a>. When you invoke <a>CreateDeliveryStream</a> or <a>StartDeliveryStreamEncryption</a> with <code>KeyType</code> set to CUSTOMER_MANAGED_CMK, Kinesis Data Firehose invokes the Amazon KMS operation <a href=\"https://docs.aws.amazon.com/kms/latest/APIReference/API_CreateGrant.html\">CreateGrant</a> to create a grant that allows the Kinesis Data Firehose service to use the customer managed CMK to perform encryption and decryption. Kinesis Data Firehose manages that grant. </p> <p>When you invoke <a>StartDeliveryStreamEncryption</a> to change the CMK for a delivery stream that is already encrypted with a customer managed CMK, Kinesis Data Firehose schedules the grant it had on the old CMK for retirement.</p>"
+        }
+      },
+      "documentation":"<p>Used to specify the type and Amazon Resource Name (ARN) of the CMK needed for Server-Side Encryption (SSE). </p>"
     },
     "DeliveryStreamEncryptionStatus":{
       "type":"string",
       "enum":[
         "ENABLED",
         "ENABLING",
+        "ENABLING_FAILED",
         "DISABLED",
-        "DISABLING"
+        "DISABLING",
+        "DISABLING_FAILED"
+      ]
+    },
+    "DeliveryStreamFailureType":{
+      "type":"string",
+      "enum":[
+        "RETIRE_KMS_GRANT_FAILED",
+        "CREATE_KMS_GRANT_FAILED",
+        "KMS_ACCESS_DENIED",
+        "DISABLED_KMS_KEY",
+        "INVALID_KMS_KEY",
+        "KMS_KEY_NOT_FOUND",
+        "KMS_OPT_IN_REQUIRED",
+        "UNKNOWN_ERROR"
       ]
     },
     "DeliveryStreamName":{
@@ -489,7 +547,9 @@
       "type":"string",
       "enum":[
         "CREATING",
+        "CREATING_FAILED",
         "DELETING",
+        "DELETING_FAILED",
         "ACTIVE"
       ]
     },
@@ -1024,6 +1084,24 @@
       },
       "documentation":"<p>Describes an update for a destination in Amazon S3.</p>"
     },
+    "FailureDescription":{
+      "type":"structure",
+      "required":[
+        "Type",
+        "Details"
+      ],
+      "members":{
+        "Type":{
+          "shape":"DeliveryStreamFailureType",
+          "documentation":"<p>The type of error that caused the failure.</p>"
+        },
+        "Details":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>A message providing details about the error that caused the failure.</p>"
+        }
+      },
+      "documentation":"<p>Provides details in case one of the following operations fails due to an error related to KMS: <a>CreateDeliveryStream</a>, <a>DeleteDeliveryStream</a>, <a>StartDeliveryStreamEncryption</a>, <a>StopDeliveryStreamEncryption</a>.</p>"
+    },
     "HECAcknowledgmentTimeoutInSeconds":{
       "type":"integer",
       "max":600,
@@ -1074,6 +1152,15 @@
       "documentation":"<p>The specified input parameter has a value that is not valid.</p>",
       "exception":true
     },
+    "InvalidKMSResourceException":{
+      "type":"structure",
+      "members":{
+        "code":{"shape":"ErrorCode"},
+        "message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p>Kinesis Data Firehose throws this exception when an attempt to put records or to start or stop delivery stream encryption fails. This happens when the KMS service throws one of the following exception types: <code>AccessDeniedException</code>, <code>InvalidStateException</code>, <code>DisabledException</code>, or <code>NotFoundException</code>.</p>",
+      "exception":true
+    },
     "KMSEncryptionConfig":{
       "type":"structure",
       "required":["AWSKMSKeyARN"],
@@ -1085,6 +1172,13 @@
       },
       "documentation":"<p>Describes an encryption key for a destination in Amazon S3.</p>"
     },
+    "KeyType":{
+      "type":"string",
+      "enum":[
+        "AWS_OWNED_CMK",
+        "CUSTOMER_MANAGED_CMK"
+      ]
+    },
     "KinesisStreamARN":{
       "type":"string",
       "max":512,
@@ -1371,7 +1465,7 @@
         },
         "Compression":{
           "shape":"ParquetCompression",
-          "documentation":"<p>The compression code to use over data blocks. The possible values are <code>UNCOMPRESSED</code>, <code>SNAPPY</code>, and <code>GZIP</code>, with the default being <code>SNAPPY</code>. Use <code>SNAPPY</code> for higher decompression speed. Use <code>GZIP</code> if the compression ration is more important than speed.</p>"
+          "documentation":"<p>The compression code to use over data blocks. The possible values are <code>UNCOMPRESSED</code>, <code>SNAPPY</code>, and <code>GZIP</code>, with the default being <code>SNAPPY</code>. Use <code>SNAPPY</code> for higher decompression speed. Use <code>GZIP</code> if the compression ratio is more important than speed.</p>"
         },
         "EnableDictionaryCompression":{
           "shape":"BooleanObject",
@@ -2169,6 +2263,10 @@
         "DeliveryStreamName":{
           "shape":"DeliveryStreamName",
           "documentation":"<p>The name of the delivery stream for which you want to enable server-side encryption (SSE).</p>"
+        },
+        "DeliveryStreamEncryptionConfigurationInput":{
+          "shape":"DeliveryStreamEncryptionConfigurationInput",
+          "documentation":"<p>Used to specify the type and Amazon Resource Name (ARN) of the KMS key needed for Server-Side Encryption (SSE).</p>"
         }
       }
     },
diff --git a/services/fms/pom.xml b/services/fms/pom.xml
index 065540ab1dfc..c5d1bae55689 100644
--- a/services/fms/pom.xml
+++ b/services/fms/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>fms</artifactId>
     <name>AWS Java SDK :: Services :: FMS</name>
diff --git a/services/fms/src/main/resources/codegen-resources/service-2.json b/services/fms/src/main/resources/codegen-resources/service-2.json
index fb1368c83de0..0d894abebcd4 100644
--- a/services/fms/src/main/resources/codegen-resources/service-2.json
+++ b/services/fms/src/main/resources/codegen-resources/service-2.json
@@ -189,6 +189,22 @@
       ],
       "documentation":"<p>Returns an array of <code>PolicySummary</code> objects in the response.</p>"
     },
+    "ListTagsForResource":{
+      "name":"ListTagsForResource",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"ListTagsForResourceRequest"},
+      "output":{"shape":"ListTagsForResourceResponse"},
+      "errors":[
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InvalidOperationException"},
+        {"shape":"InternalErrorException"},
+        {"shape":"InvalidInputException"}
+      ],
+      "documentation":"<p>Retrieves the list of tags for the specified AWS resource. </p>"
+    },
     "PutNotificationChannel":{
       "name":"PutNotificationChannel",
       "http":{
@@ -220,6 +236,39 @@
         {"shape":"InvalidTypeException"}
       ],
       "documentation":"<p>Creates an AWS Firewall Manager policy.</p> <p>Firewall Manager provides the following types of policies: </p> <ul> <li> <p>A Shield Advanced policy, which applies Shield Advanced protection to specified accounts and resources</p> </li> <li> <p>An AWS WAF policy, which contains a rule group and defines which resources are to be protected by that rule group</p> </li> <li> <p>A security group policy, which manages VPC security groups across your AWS organization. </p> </li> </ul> <p>Each policy is specific to one of the three types. If you want to enforce more than one policy type across accounts, you can create multiple policies. You can create multiple policies for each type.</p> <p>You must be subscribed to Shield Advanced to create a Shield Advanced policy. For more information about subscribing to Shield Advanced, see <a href=\"https://docs.aws.amazon.com/waf/latest/DDOSAPIReference/API_CreateSubscription.html\">CreateSubscription</a>.</p>"
+    },
+    "TagResource":{
+      "name":"TagResource",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"TagResourceRequest"},
+      "output":{"shape":"TagResourceResponse"},
+      "errors":[
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InvalidOperationException"},
+        {"shape":"InternalErrorException"},
+        {"shape":"InvalidInputException"},
+        {"shape":"LimitExceededException"}
+      ],
+      "documentation":"<p>Adds one or more tags to an AWS resource.</p>"
+    },
+    "UntagResource":{
+      "name":"UntagResource",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"UntagResourceRequest"},
+      "output":{"shape":"UntagResourceResponse"},
+      "errors":[
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InvalidOperationException"},
+        {"shape":"InternalErrorException"},
+        {"shape":"InvalidInputException"}
+      ],
+      "documentation":"<p>Removes one or more tags from an AWS resource.</p>"
     }
   },
   "shapes":{
@@ -245,7 +294,7 @@
       "members":{
         "AdminAccount":{
           "shape":"AWSAccountId",
-          "documentation":"<p>The AWS account ID to associate with AWS Firewall Manager as the AWS Firewall Manager administrator account. This can be an AWS Organizations master account or a member account. For more information about AWS Organizations and master accounts, see <a href=\"https://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts.html\">Managing the AWS Accounts in Your Organization</a>.</p>"
+          "documentation":"<p>The AWS account ID to associate with AWS Firewall Manager as the AWS Firewall Manager administrator account. This can be an AWS Organizations master account or a member account. For more information about AWS Organizations and master accounts, see <a href=\"https://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts.html\">Managing the AWS Accounts in Your Organization</a>. </p>"
         }
       }
     },
@@ -617,10 +666,30 @@
         }
       }
     },
+    "ListTagsForResourceRequest":{
+      "type":"structure",
+      "required":["ResourceArn"],
+      "members":{
+        "ResourceArn":{
+          "shape":"ResourceArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the resource to return tags for. The Firewall Manager policy is the only AWS resource that supports tagging, so this ARN is a policy ARN..</p>"
+        }
+      }
+    },
+    "ListTagsForResourceResponse":{
+      "type":"structure",
+      "members":{
+        "TagList":{
+          "shape":"TagList",
+          "documentation":"<p>The tags associated with the resource.</p>"
+        }
+      }
+    },
     "ManagedServiceData":{
       "type":"string",
-      "max":1024,
-      "min":1
+      "max":4096,
+      "min":1,
+      "pattern":".*"
     },
     "MemberAccounts":{
       "type":"list",
@@ -633,6 +702,7 @@
     },
     "PaginationToken":{
       "type":"string",
+      "max":4096,
       "min":1,
       "pattern":"^([\\p{L}\\p{Z}\\p{N}_.:/=+\\-@]*)$"
     },
@@ -843,6 +913,10 @@
         "Policy":{
           "shape":"Policy",
           "documentation":"<p>The details of the AWS Firewall Manager policy to be created.</p>"
+        },
+        "TagList":{
+          "shape":"TagList",
+          "documentation":"<p>The tags to add to the AWS resource.</p>"
         }
       }
     },
@@ -894,16 +968,27 @@
       "required":["Key"],
       "members":{
         "Key":{
-          "shape":"TagKey",
+          "shape":"ResourceTagKey",
           "documentation":"<p>The resource tag key.</p>"
         },
         "Value":{
-          "shape":"TagValue",
+          "shape":"ResourceTagValue",
           "documentation":"<p>The resource tag value.</p>"
         }
       },
       "documentation":"<p>The resource tags that AWS Firewall Manager uses to determine if a particular resource should be included or excluded from the AWS Firewall Manager policy. Tags enable you to categorize your AWS resources in different ways, for example, by purpose, owner, or environment. Each tag consists of a key and an optional value. Firewall Manager combines the tags with \"AND\" so that, if you add more than one tag to a policy scope, a resource must have all the specified tags to be included or excluded. For more information, see <a href=\"https://docs.aws.amazon.com/awsconsolehelpdocs/latest/gsg/tag-editor.html\">Working with Tag Editor</a>.</p>"
     },
+    "ResourceTagKey":{
+      "type":"string",
+      "max":128,
+      "min":1,
+      "pattern":"^([\\p{L}\\p{Z}\\p{N}_.:/=+\\-@]*)$"
+    },
+    "ResourceTagValue":{
+      "type":"string",
+      "max":256,
+      "pattern":"^([\\p{L}\\p{Z}\\p{N}_.:/=+\\-@]*)$"
+    },
     "ResourceTags":{
       "type":"list",
       "member":{"shape":"ResourceTag"},
@@ -930,7 +1015,7 @@
         },
         "ManagedServiceData":{
           "shape":"ManagedServiceData",
-          "documentation":"<p>Details about the service that are specific to the service type, in JSON format. For service type <code>SHIELD_ADVANCED</code>, this is an empty string.</p> <ul> <li> <p>Example: <code>WAF</code> </p> <p> <code>ManagedServiceData\": \"{\\\"type\\\": \\\"WAF\\\", \\\"ruleGroups\\\": [{\\\"id\\\": \\\"12345678-1bcd-9012-efga-0987654321ab\\\", \\\"overrideAction\\\" : {\\\"type\\\": \\\"COUNT\\\"}}], \\\"defaultAction\\\": {\\\"type\\\": \\\"BLOCK\\\"}}</code> </p> </li> <li> <p>Example: <code>SECURITY_GROUPS_COMMON</code> </p> <p> <code>\"SecurityServicePolicyData\":{\"Type\":\"SECURITY_GROUPS_COMMON\",\"ManagedServiceData\":\"{\\\"type\\\":\\\"SECURITY_GROUPS_COMMON\\\",\\\"revertManualSecurityGroupChanges\\\":false,\\\"exclusiveResourceSecurityGroupManagement\\\":false,\\\"securityGroups\\\":[{\\\"id\\\":\\\" sg-000e55995d61a06bd\\\"}]}\"},\"RemediationEnabled\":false,\"ResourceType\":\"AWS::EC2::NetworkInterface\"}</code> </p> </li> <li> <p>Example: <code>SECURITY_GROUPS_CONTENT_AUDIT</code> </p> <p> <code>\"SecurityServicePolicyData\":{\"Type\":\"SECURITY_GROUPS_CONTENT_AUDIT\",\"ManagedServiceData\":\"{\\\"type\\\":\\\"SECURITY_GROUPS_CONTENT_AUDIT\\\",\\\"securityGroups\\\":[{\\\"id\\\":\\\" sg-000e55995d61a06bd \\\"}],\\\"securityGroupAction\\\":{\\\"type\\\":\\\"ALLOW\\\"}}\"},\"RemediationEnabled\":false,\"ResourceType\":\"AWS::EC2::NetworkInterface\"}</code> </p> <p>The security group action for content audit can be <code>ALLOW</code> or <code>DENY</code>. For <code>ALLOW</code>, all in-scope security group rules must be within the allowed range of the policy's security group rules. For <code>DENY</code>, all in-scope security group rules must not contain a value or a range that matches a rule value or range in the policy security group.</p> </li> <li> <p>Example: <code>SECURITY_GROUPS_USAGE_AUDIT</code> </p> <p> <code>\"SecurityServicePolicyData\":{\"Type\":\"SECURITY_GROUPS_USAGE_AUDIT\",\"ManagedServiceData\":\"{\\\"type\\\":\\\"SECURITY_GROUPS_USAGE_AUDIT\\\",\\\"deleteUnusedSecurityGroups\\\":true,\\\"coalesceRedundantSecurityGroups\\\":true}\"},\"RemediationEnabled\":false,\"Resou rceType\":\"AWS::EC2::SecurityGroup\"}</code> </p> </li> </ul>"
+          "documentation":"<p>Details about the service that are specific to the service type, in JSON format. For service type <code>SHIELD_ADVANCED</code>, this is an empty string.</p> <ul> <li> <p>Example: <code>WAFV2</code> </p> <p> <code>\"SecurityServicePolicyData\": \"{ \\\"type\\\": \\\"WAFV2\\\", \\\"postProcessRuleGroups\\\": [ { \\\"managedRuleGroupIdentifier\\\": { \\\"managedRuleGroupName\\\": \\\"AWSManagedRulesAdminProtectionRuleSet\\\", \\\"vendor\\\": \\\"AWS\\\" } \\\"ruleGroupARN\\\": \\\"rule group arn\", \\\"overrideAction\\\": { \\\"type\\\": \\\"COUNT|\\\" }, \\\"excludedRules\\\": [ { \\\"name\\\" : \\\"EntityName\\\" } ], \\\"type\\\": \\\"ManagedRuleGroup|RuleGroup\\\" } ], \\\"preProcessRuleGroups\\\": [ { \\\"managedRuleGroupIdentifier\\\": { \\\"managedRuleGroupName\\\": \\\"AWSManagedRulesAdminProtectionRuleSet\\\", \\\"vendor\\\": \\\"AWS\\\" } \\\"ruleGroupARN\\\": \\\"rule group arn\\\", \\\"overrideAction\\\": { \\\"type\\\": \\\"COUNT\\\" }, \\\"excludedRules\\\": [ { \\\"name\\\" : \\\"EntityName\\\" } ], \\\"type\\\": \\\"ManagedRuleGroup|RuleGroup\\\" } ], \\\"defaultAction\\\": { \\\"type\\\": \\\"BLOCK\\\" }}\" </code> </p> </li> <li> <p>Example: <code>WAF</code> </p> <p> <code>\"ManagedServiceData\": \"{\\\"type\\\": \\\"WAF\\\", \\\"ruleGroups\\\": [{\\\"id\\\": \\\"12345678-1bcd-9012-efga-0987654321ab\\\", \\\"overrideAction\\\" : {\\\"type\\\": \\\"COUNT\\\"}}], \\\"defaultAction\\\": {\\\"type\\\": \\\"BLOCK\\\"}}</code> </p> </li> <li> <p>Example: <code>SECURITY_GROUPS_COMMON</code> </p> <p> <code>\"SecurityServicePolicyData\":{\"Type\":\"SECURITY_GROUPS_COMMON\",\"ManagedServiceData\":\"{\\\"type\\\":\\\"SECURITY_GROUPS_COMMON\\\",\\\"revertManualSecurityGroupChanges\\\":false,\\\"exclusiveResourceSecurityGroupManagement\\\":false,\\\"securityGroups\\\":[{\\\"id\\\":\\\" sg-000e55995d61a06bd\\\"}]}\"},\"RemediationEnabled\":false,\"ResourceType\":\"AWS::EC2::NetworkInterface\"}</code> </p> </li> <li> <p>Example: <code>SECURITY_GROUPS_CONTENT_AUDIT</code> </p> <p> <code>\"SecurityServicePolicyData\":{\"Type\":\"SECURITY_GROUPS_CONTENT_AUDIT\",\"ManagedServiceData\":\"{\\\"type\\\":\\\"SECURITY_GROUPS_CONTENT_AUDIT\\\",\\\"securityGroups\\\":[{\\\"id\\\":\\\" sg-000e55995d61a06bd \\\"}],\\\"securityGroupAction\\\":{\\\"type\\\":\\\"ALLOW\\\"}}\"},\"RemediationEnabled\":false,\"ResourceType\":\"AWS::EC2::NetworkInterface\"}</code> </p> <p>The security group action for content audit can be <code>ALLOW</code> or <code>DENY</code>. For <code>ALLOW</code>, all in-scope security group rules must be within the allowed range of the policy's security group rules. For <code>DENY</code>, all in-scope security group rules must not contain a value or a range that matches a rule value or range in the policy security group.</p> </li> <li> <p>Example: <code>SECURITY_GROUPS_USAGE_AUDIT</code> </p> <p> <code>\"SecurityServicePolicyData\":{\"Type\":\"SECURITY_GROUPS_USAGE_AUDIT\",\"ManagedServiceData\":\"{\\\"type\\\":\\\"SECURITY_GROUPS_USAGE_AUDIT\\\",\\\"deleteUnusedSecurityGroups\\\":true,\\\"coalesceRedundantSecurityGroups\\\":true}\"},\"RemediationEnabled\":false,\"Resou rceType\":\"AWS::EC2::SecurityGroup\"}</code> </p> </li> </ul>"
         }
       },
       "documentation":"<p>Details about the security service that is being used to protect the resources.</p>"
@@ -939,24 +1024,100 @@
       "type":"string",
       "enum":[
         "WAF",
+        "WAFV2",
         "SHIELD_ADVANCED",
         "SECURITY_GROUPS_COMMON",
         "SECURITY_GROUPS_CONTENT_AUDIT",
         "SECURITY_GROUPS_USAGE_AUDIT"
       ]
     },
+    "Tag":{
+      "type":"structure",
+      "required":[
+        "Key",
+        "Value"
+      ],
+      "members":{
+        "Key":{
+          "shape":"TagKey",
+          "documentation":"<p>Part of the key:value pair that defines a tag. You can use a tag key to describe a category of information, such as \"customer.\" Tag keys are case-sensitive.</p>"
+        },
+        "Value":{
+          "shape":"TagValue",
+          "documentation":"<p>Part of the key:value pair that defines a tag. You can use a tag value to describe a specific value within a category, such as \"companyA\" or \"companyB.\" Tag values are case-sensitive. </p>"
+        }
+      },
+      "documentation":"<p>A collection of key:value pairs associated with an AWS resource. The key:value pair can be anything you define. Typically, the tag key represents a category (such as \"environment\") and the tag value represents a specific value within that category (such as \"test,\" \"development,\" or \"production\"). You can add up to 50 tags to each AWS resource. </p>"
+    },
     "TagKey":{
       "type":"string",
       "max":128,
       "min":1,
       "pattern":"^([\\p{L}\\p{Z}\\p{N}_.:/=+\\-@]*)$"
     },
+    "TagKeyList":{
+      "type":"list",
+      "member":{"shape":"TagKey"},
+      "max":200,
+      "min":0
+    },
+    "TagList":{
+      "type":"list",
+      "member":{"shape":"Tag"},
+      "max":200,
+      "min":0
+    },
+    "TagResourceRequest":{
+      "type":"structure",
+      "required":[
+        "ResourceArn",
+        "TagList"
+      ],
+      "members":{
+        "ResourceArn":{
+          "shape":"ResourceArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the resource. The Firewall Manager policy is the only AWS resource that supports tagging, so this ARN is a policy ARN.</p>"
+        },
+        "TagList":{
+          "shape":"TagList",
+          "documentation":"<p>The tags to add to the resource.</p>"
+        }
+      }
+    },
+    "TagResourceResponse":{
+      "type":"structure",
+      "members":{
+      }
+    },
     "TagValue":{
       "type":"string",
       "max":256,
+      "min":0,
       "pattern":"^([\\p{L}\\p{Z}\\p{N}_.:/=+\\-@]*)$"
     },
     "TimeStamp":{"type":"timestamp"},
+    "UntagResourceRequest":{
+      "type":"structure",
+      "required":[
+        "ResourceArn",
+        "TagKeys"
+      ],
+      "members":{
+        "ResourceArn":{
+          "shape":"ResourceArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the resource. The Firewall Manager policy is the only AWS resource that supports tagging, so this ARN is a policy ARN.</p>"
+        },
+        "TagKeys":{
+          "shape":"TagKeyList",
+          "documentation":"<p>The keys of the tags to remove from the resource. </p>"
+        }
+      }
+    },
+    "UntagResourceResponse":{
+      "type":"structure",
+      "members":{
+      }
+    },
     "ViolationReason":{
       "type":"string",
       "enum":[
diff --git a/services/forecast/pom.xml b/services/forecast/pom.xml
index 9146fa425906..3b0b15de70f8 100644
--- a/services/forecast/pom.xml
+++ b/services/forecast/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,12 +21,12 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>forecast</artifactId>
-    <name>AWS Java SDK :: Services :: forecast</name>
-    <description>The AWS Java SDK for forecast module holds the client classes that are used for
-        communicating with forecast.
+    <name>AWS Java SDK :: Services :: Forecast</name>
+    <description>The AWS Java SDK for Forecast module holds the client classes that are used for
+        communicating with Forecast.
     </description>
     <url>https://aws.amazon.com/sdkforjava</url>
     <build>
diff --git a/services/forecast/src/main/resources/codegen-resources/service-2.json b/services/forecast/src/main/resources/codegen-resources/service-2.json
index b1dc0fd37c0a..0290ea5eb381 100644
--- a/services/forecast/src/main/resources/codegen-resources/service-2.json
+++ b/services/forecast/src/main/resources/codegen-resources/service-2.json
@@ -26,7 +26,7 @@
         {"shape":"ResourceAlreadyExistsException"},
         {"shape":"LimitExceededException"}
       ],
-      "documentation":"<p>Creates an Amazon Forecast dataset. The information about the dataset that you provide helps Forecast understand how to consume the data for model training. This includes the following:</p> <ul> <li> <p> <i> <code>DataFrequency</code> </i> - How frequently your historical time-series data is collected. Amazon Forecast uses this information when training the model and generating a forecast.</p> </li> <li> <p> <i> <code>Domain</code> </i> and <i> <code>DatasetType</code> </i> - Each dataset has an associated dataset domain and a type within the domain. Amazon Forecast provides a list of predefined domains and types within each domain. For each unique dataset domain and type within the domain, Amazon Forecast requires your data to include a minimum set of predefined fields.</p> </li> <li> <p> <i> <code>Schema</code> </i> - A schema specifies the fields of the dataset, including the field name and data type.</p> </li> </ul> <p>After creating a dataset, you import your training data into the dataset and add the dataset to a dataset group. You then use the dataset group to create a predictor. For more information, see <a>howitworks-datasets-groups</a>.</p> <p>To get a list of all your datasets, use the <a>ListDatasets</a> operation.</p> <note> <p>The <code>Status</code> of a dataset must be <code>ACTIVE</code> before you can import training data. Use the <a>DescribeDataset</a> operation to get the status.</p> </note>"
+      "documentation":"<p>Creates an Amazon Forecast dataset. The information about the dataset that you provide helps Forecast understand how to consume the data for model training. This includes the following:</p> <ul> <li> <p> <i> <code>DataFrequency</code> </i> - How frequently your historical time-series data is collected.</p> </li> <li> <p> <i> <code>Domain</code> </i> and <i> <code>DatasetType</code> </i> - Each dataset has an associated dataset domain and a type within the domain. Amazon Forecast provides a list of predefined domains and types within each domain. For each unique dataset domain and type within the domain, Amazon Forecast requires your data to include a minimum set of predefined fields.</p> </li> <li> <p> <i> <code>Schema</code> </i> - A schema specifies the fields in the dataset, including the field name and data type.</p> </li> </ul> <p>After creating a dataset, you import your training data into it and add the dataset to a dataset group. You use the dataset group to create a predictor. For more information, see <a>howitworks-datasets-groups</a>.</p> <p>To get a list of all your datasets, use the <a>ListDatasets</a> operation.</p> <p>For example Forecast datasets, see the <a href=\"https://github.com/aws-samples/amazon-forecast-samples/tree/master/data\">Amazon Forecast Sample GitHub repository</a>.</p> <note> <p>The <code>Status</code> of a dataset must be <code>ACTIVE</code> before you can import training data. Use the <a>DescribeDataset</a> operation to get the status.</p> </note>"
     },
     "CreateDatasetGroup":{
       "name":"CreateDatasetGroup",
@@ -43,7 +43,7 @@
         {"shape":"ResourceInUseException"},
         {"shape":"LimitExceededException"}
       ],
-      "documentation":"<p>Creates an Amazon Forecast dataset group, which holds a collection of related datasets. You can add datasets to the dataset group when you create the dataset group, or you can add datasets later with the <a>UpdateDatasetGroup</a> operation.</p> <p>After creating a dataset group and adding datasets, you use the dataset group when you create a predictor. For more information, see <a>howitworks-datasets-groups</a>.</p> <p>To get a list of all your datasets groups, use the <a>ListDatasetGroups</a> operation.</p> <note> <p>The <code>Status</code> of a dataset group must be <code>ACTIVE</code> before you can create a predictor using the dataset group. Use the <a>DescribeDatasetGroup</a> operation to get the status.</p> </note>"
+      "documentation":"<p>Creates a dataset group, which holds a collection of related datasets. You can add datasets to the dataset group when you create the dataset group, or later by using the <a>UpdateDatasetGroup</a> operation.</p> <p>After creating a dataset group and adding datasets, you use the dataset group when you create a predictor. For more information, see <a>howitworks-datasets-groups</a>.</p> <p>To get a list of all your datasets groups, use the <a>ListDatasetGroups</a> operation.</p> <note> <p>The <code>Status</code> of a dataset group must be <code>ACTIVE</code> before you can create use the dataset group to create a predictor. To get the status, use the <a>DescribeDatasetGroup</a> operation.</p> </note>"
     },
     "CreateDatasetImportJob":{
       "name":"CreateDatasetImportJob",
@@ -60,7 +60,7 @@
         {"shape":"ResourceInUseException"},
         {"shape":"LimitExceededException"}
       ],
-      "documentation":"<p>Imports your training data to an Amazon Forecast dataset. You provide the location of your training data in an Amazon Simple Storage Service (Amazon S3) bucket and the Amazon Resource Name (ARN) of the dataset that you want to import the data to.</p> <p>You must specify a <a>DataSource</a> object that includes an AWS Identity and Access Management (IAM) role that Amazon Forecast can assume to access the data. For more information, see <a>aws-forecast-iam-roles</a>.</p> <p>Two properties of the training data are optionally specified:</p> <ul> <li> <p>The delimiter that separates the data fields.</p> <p>The default delimiter is a comma (,), which is the only supported delimiter in this release.</p> </li> <li> <p>The format of timestamps.</p> <p>If the format is not specified, Amazon Forecast expects the format to be \"yyyy-MM-dd HH:mm:ss\".</p> </li> </ul> <p>When Amazon Forecast uploads your training data, it verifies that the data was collected at the <code>DataFrequency</code> specified when the target dataset was created. For more information, see <a>CreateDataset</a> and <a>howitworks-datasets-groups</a>. Amazon Forecast also verifies the delimiter and timestamp format.</p> <p>You can use the <a>ListDatasetImportJobs</a> operation to get a list of all your dataset import jobs, filtered by specified criteria.</p> <p>To get a list of all your dataset import jobs, filtered by the specified criteria, use the <a>ListDatasetGroups</a> operation.</p>"
+      "documentation":"<p>Imports your training data to an Amazon Forecast dataset. You provide the location of your training data in an Amazon Simple Storage Service (Amazon S3) bucket and the Amazon Resource Name (ARN) of the dataset that you want to import the data to.</p> <p>You must specify a <a>DataSource</a> object that includes an AWS Identity and Access Management (IAM) role that Amazon Forecast can assume to access the data. For more information, see <a>aws-forecast-iam-roles</a>.</p> <p>The training data must be in CSV format. The delimiter must be a comma (,).</p> <p>You can specify the path to a specific CSV file, the S3 bucket, or to a folder in the S3 bucket. For the latter two cases, Amazon Forecast imports all files up to the limit of 10,000 files.</p> <p>To get a list of all your dataset import jobs, filtered by specified criteria, use the <a>ListDatasetImportJobs</a> operation.</p>"
     },
     "CreateForecast":{
       "name":"CreateForecast",
@@ -77,7 +77,7 @@
         {"shape":"ResourceInUseException"},
         {"shape":"LimitExceededException"}
       ],
-      "documentation":"<p>Creates a forecast for each item in the <code>TARGET_TIME_SERIES</code> dataset that was used to train the predictor. This is known as inference. To retrieve the forecast for a single item at low latency, use the operation. To export the complete forecast into your Amazon Simple Storage Service (Amazon S3), use the <a>CreateForecastExportJob</a> operation.</p> <p>The range of the forecast is determined by the <code>ForecastHorizon</code>, specified in the <a>CreatePredictor</a> request, multiplied by the <code>DataFrequency</code>, specified in the <a>CreateDataset</a> request. When you query a forecast, you can request a specific date range within the complete forecast.</p> <p>To get a list of all your forecasts, use the <a>ListForecasts</a> operation.</p> <note> <p>The forecasts generated by Amazon Forecast are in the same timezone as the dataset that was used to create the predictor.</p> </note> <p>For more information, see <a>howitworks-forecast</a>.</p> <note> <p>The <code>Status</code> of the forecast must be <code>ACTIVE</code> before you can query or export the forecast. Use the <a>DescribeForecast</a> operation to get the status.</p> </note>"
+      "documentation":"<p>Creates a forecast for each item in the <code>TARGET_TIME_SERIES</code> dataset that was used to train the predictor. This is known as inference. To retrieve the forecast for a single item at low latency, use the operation. To export the complete forecast into your Amazon Simple Storage Service (Amazon S3) bucket, use the <a>CreateForecastExportJob</a> operation.</p> <p>The range of the forecast is determined by the <code>ForecastHorizon</code> value, which you specify in the <a>CreatePredictor</a> request, multiplied by the <code>DataFrequency</code> value, which you specify in the <a>CreateDataset</a> request. When you query a forecast, you can request a specific date range within the forecast.</p> <p>To get a list of all your forecasts, use the <a>ListForecasts</a> operation.</p> <note> <p>The forecasts generated by Amazon Forecast are in the same time zone as the dataset that was used to create the predictor.</p> </note> <p>For more information, see <a>howitworks-forecast</a>.</p> <note> <p>The <code>Status</code> of the forecast must be <code>ACTIVE</code> before you can query or export the forecast. Use the <a>DescribeForecast</a> operation to get the status.</p> </note>"
     },
     "CreateForecastExportJob":{
       "name":"CreateForecastExportJob",
@@ -94,7 +94,7 @@
         {"shape":"ResourceInUseException"},
         {"shape":"LimitExceededException"}
       ],
-      "documentation":"<p>Exports a forecast created by the <a>CreateForecast</a> operation to your Amazon Simple Storage Service (Amazon S3) bucket.</p> <p>You must specify a <a>DataDestination</a> object that includes an AWS Identity and Access Management (IAM) role that Amazon Forecast can assume to access the Amazon S3 bucket. For more information, see <a>aws-forecast-iam-roles</a>.</p> <p>For more information, see <a>howitworks-forecast</a>.</p> <p>To get a list of all your forecast export jobs, use the <a>ListForecastExportJobs</a> operation.</p> <note> <p>The <code>Status</code> of the forecast export job must be <code>ACTIVE</code> before you can access the forecast in your Amazon S3 bucket. Use the <a>DescribeForecastExportJob</a> operation to get the status.</p> </note>"
+      "documentation":"<p>Exports a forecast created by the <a>CreateForecast</a> operation to your Amazon Simple Storage Service (Amazon S3) bucket. The forecast file name will match the following conventions:</p> <p>&lt;ForecastExportJobName&gt;_&lt;ExportTimestamp&gt;_&lt;PageNumber&gt;</p> <p>where the &lt;ExportTimestamp&gt; component is in Java SimpleDateFormat (yyyy-MM-ddTHH-mm-ssZ).</p> <p>You must specify a <a>DataDestination</a> object that includes an AWS Identity and Access Management (IAM) role that Amazon Forecast can assume to access the Amazon S3 bucket. For more information, see <a>aws-forecast-iam-roles</a>.</p> <p>For more information, see <a>howitworks-forecast</a>.</p> <p>To get a list of all your forecast export jobs, use the <a>ListForecastExportJobs</a> operation.</p> <note> <p>The <code>Status</code> of the forecast export job must be <code>ACTIVE</code> before you can access the forecast in your Amazon S3 bucket. To get the status, use the <a>DescribeForecastExportJob</a> operation.</p> </note>"
     },
     "CreatePredictor":{
       "name":"CreatePredictor",
@@ -111,7 +111,7 @@
         {"shape":"ResourceInUseException"},
         {"shape":"LimitExceededException"}
       ],
-      "documentation":"<p>Creates an Amazon Forecast predictor.</p> <p>In the request, you provide a dataset group and either specify an algorithm or let Amazon Forecast choose the algorithm for you using AutoML. If you specify an algorithm, you also can override algorithm-specific hyperparameters.</p> <p>Amazon Forecast uses the chosen algorithm to train a model using the latest version of the datasets in the specified dataset group. The result is called a predictor. You then generate a forecast using the <a>CreateForecast</a> operation.</p> <p>After training a model, the <code>CreatePredictor</code> operation also evaluates it. To see the evaluation metrics, use the <a>GetAccuracyMetrics</a> operation. Always review the evaluation metrics before deciding to use the predictor to generate a forecast.</p> <p>Optionally, you can specify a featurization configuration to fill and aggragate the data fields in the <code>TARGET_TIME_SERIES</code> dataset to improve model training. For more information, see <a>FeaturizationConfig</a>.</p> <p> <b>AutoML</b> </p> <p>If you set <code>PerformAutoML</code> to <code>true</code>, Amazon Forecast evaluates each algorithm and chooses the one that minimizes the <code>objective function</code>. The <code>objective function</code> is defined as the mean of the weighted p10, p50, and p90 quantile losses. For more information, see <a>EvaluationResult</a>.</p> <p>When AutoML is enabled, the following properties are disallowed:</p> <ul> <li> <p> <code>AlgorithmArn</code> </p> </li> <li> <p> <code>HPOConfig</code> </p> </li> <li> <p> <code>PerformHPO</code> </p> </li> <li> <p> <code>TrainingParameters</code> </p> </li> </ul> <p>To get a list of all your predictors, use the <a>ListPredictors</a> operation.</p> <note> <p>The <code>Status</code> of the predictor must be <code>ACTIVE</code>, signifying that training has completed, before you can use the predictor to create a forecast. Use the <a>DescribePredictor</a> operation to get the status.</p> </note>"
+      "documentation":"<p>Creates an Amazon Forecast predictor.</p> <p>In the request, you provide a dataset group and either specify an algorithm or let Amazon Forecast choose the algorithm for you using AutoML. If you specify an algorithm, you also can override algorithm-specific hyperparameters.</p> <p>Amazon Forecast uses the chosen algorithm to train a model using the latest version of the datasets in the specified dataset group. The result is called a predictor. You then generate a forecast using the <a>CreateForecast</a> operation.</p> <p>After training a model, the <code>CreatePredictor</code> operation also evaluates it. To see the evaluation metrics, use the <a>GetAccuracyMetrics</a> operation. Always review the evaluation metrics before deciding to use the predictor to generate a forecast.</p> <p>Optionally, you can specify a featurization configuration to fill and aggregate the data fields in the <code>TARGET_TIME_SERIES</code> dataset to improve model training. For more information, see <a>FeaturizationConfig</a>.</p> <p>For RELATED_TIME_SERIES datasets, <code>CreatePredictor</code> verifies that the <code>DataFrequency</code> specified when the dataset was created matches the <code>ForecastFrequency</code>. TARGET_TIME_SERIES datasets don't have this restriction. Amazon Forecast also verifies the delimiter and timestamp format. For more information, see <a>howitworks-datasets-groups</a>.</p> <p> <b>AutoML</b> </p> <p>If you want Amazon Forecast to evaluate each algorithm and choose the one that minimizes the <code>objective function</code>, set <code>PerformAutoML</code> to <code>true</code>. The <code>objective function</code> is defined as the mean of the weighted p10, p50, and p90 quantile losses. For more information, see <a>EvaluationResult</a>.</p> <p>When AutoML is enabled, the following properties are disallowed:</p> <ul> <li> <p> <code>AlgorithmArn</code> </p> </li> <li> <p> <code>HPOConfig</code> </p> </li> <li> <p> <code>PerformHPO</code> </p> </li> <li> <p> <code>TrainingParameters</code> </p> </li> </ul> <p>To get a list of all of your predictors, use the <a>ListPredictors</a> operation.</p> <note> <p>Before you can use the predictor to create a forecast, the <code>Status</code> of the predictor must be <code>ACTIVE</code>, signifying that training has completed. To get the status, use the <a>DescribePredictor</a> operation.</p> </note>"
     },
     "DeleteDataset":{
       "name":"DeleteDataset",
@@ -125,7 +125,7 @@
         {"shape":"ResourceNotFoundException"},
         {"shape":"ResourceInUseException"}
       ],
-      "documentation":"<p>Deletes an Amazon Forecast dataset created using the <a>CreateDataset</a> operation. To be deleted, the dataset must have a status of <code>ACTIVE</code> or <code>CREATE_FAILED</code>. Use the <a>DescribeDataset</a> operation to get the status.</p>",
+      "documentation":"<p>Deletes an Amazon Forecast dataset that was created using the <a>CreateDataset</a> operation. You can only delete datasets that have a status of <code>ACTIVE</code> or <code>CREATE_FAILED</code>. To get the status use the <a>DescribeDataset</a> operation.</p>",
       "idempotent":true
     },
     "DeleteDatasetGroup":{
@@ -140,7 +140,7 @@
         {"shape":"ResourceNotFoundException"},
         {"shape":"ResourceInUseException"}
       ],
-      "documentation":"<p>Deletes a dataset group created using the <a>CreateDatasetGroup</a> operation. To be deleted, the dataset group must have a status of <code>ACTIVE</code>, <code>CREATE_FAILED</code>, or <code>UPDATE_FAILED</code>. Use the <a>DescribeDatasetGroup</a> operation to get the status.</p> <p>The operation deletes only the dataset group, not the datasets in the group.</p>",
+      "documentation":"<p>Deletes a dataset group created using the <a>CreateDatasetGroup</a> operation. You can only delete dataset groups that have a status of <code>ACTIVE</code>, <code>CREATE_FAILED</code>, or <code>UPDATE_FAILED</code>. To get the status, use the <a>DescribeDatasetGroup</a> operation.</p> <p>This operation deletes only the dataset group, not the datasets in the group.</p>",
       "idempotent":true
     },
     "DeleteDatasetImportJob":{
@@ -155,7 +155,7 @@
         {"shape":"ResourceNotFoundException"},
         {"shape":"ResourceInUseException"}
       ],
-      "documentation":"<p>Deletes a dataset import job created using the <a>CreateDatasetImportJob</a> operation. To be deleted, the import job must have a status of <code>ACTIVE</code> or <code>CREATE_FAILED</code>. Use the <a>DescribeDatasetImportJob</a> operation to get the status.</p>",
+      "documentation":"<p>Deletes a dataset import job created using the <a>CreateDatasetImportJob</a> operation. You can delete only dataset import jobs that have a status of <code>ACTIVE</code> or <code>CREATE_FAILED</code>. To get the status, use the <a>DescribeDatasetImportJob</a> operation.</p>",
       "idempotent":true
     },
     "DeleteForecast":{
@@ -170,7 +170,7 @@
         {"shape":"ResourceNotFoundException"},
         {"shape":"ResourceInUseException"}
       ],
-      "documentation":"<p>Deletes a forecast created using the <a>CreateForecast</a> operation. To be deleted, the forecast must have a status of <code>ACTIVE</code> or <code>CREATE_FAILED</code>. Use the <a>DescribeForecast</a> operation to get the status.</p> <p>You can't delete a forecast while it is being exported.</p>",
+      "documentation":"<p>Deletes a forecast created using the <a>CreateForecast</a> operation. You can delete only forecasts that have a status of <code>ACTIVE</code> or <code>CREATE_FAILED</code>. To get the status, use the <a>DescribeForecast</a> operation.</p> <p>You can't delete a forecast while it is being exported. After a forecast is deleted, you can no longer query the forecast.</p>",
       "idempotent":true
     },
     "DeleteForecastExportJob":{
@@ -185,7 +185,7 @@
         {"shape":"ResourceNotFoundException"},
         {"shape":"ResourceInUseException"}
       ],
-      "documentation":"<p>Deletes a forecast export job created using the <a>CreateForecastExportJob</a> operation. To be deleted, the export job must have a status of <code>ACTIVE</code> or <code>CREATE_FAILED</code>. Use the <a>DescribeForecastExportJob</a> operation to get the status.</p>",
+      "documentation":"<p>Deletes a forecast export job created using the <a>CreateForecastExportJob</a> operation. You can delete only export jobs that have a status of <code>ACTIVE</code> or <code>CREATE_FAILED</code>. To get the status, use the <a>DescribeForecastExportJob</a> operation.</p>",
       "idempotent":true
     },
     "DeletePredictor":{
@@ -200,7 +200,7 @@
         {"shape":"ResourceNotFoundException"},
         {"shape":"ResourceInUseException"}
       ],
-      "documentation":"<p>Deletes a predictor created using the <a>CreatePredictor</a> operation. To be deleted, the predictor must have a status of <code>ACTIVE</code> or <code>CREATE_FAILED</code>. Use the <a>DescribePredictor</a> operation to get the status.</p> <p>Any forecasts generated by the predictor will no longer be available.</p>",
+      "documentation":"<p>Deletes a predictor created using the <a>CreatePredictor</a> operation. You can delete only predictor that have a status of <code>ACTIVE</code> or <code>CREATE_FAILED</code>. To get the status, use the <a>DescribePredictor</a> operation.</p>",
       "idempotent":true
     },
     "DescribeDataset":{
@@ -215,7 +215,7 @@
         {"shape":"InvalidInputException"},
         {"shape":"ResourceNotFoundException"}
       ],
-      "documentation":"<p>Describes an Amazon Forecast dataset created using the <a>CreateDataset</a> operation.</p> <p>In addition to listing the properties provided by the user in the <code>CreateDataset</code> request, this operation includes the following properties:</p> <ul> <li> <p> <code>CreationTime</code> </p> </li> <li> <p> <code>LastModificationTime</code> </p> </li> <li> <p> <code>Status</code> </p> </li> </ul>",
+      "documentation":"<p>Describes an Amazon Forecast dataset created using the <a>CreateDataset</a> operation.</p> <p>In addition to listing the parameters specified in the <code>CreateDataset</code> request, this operation includes the following dataset properties:</p> <ul> <li> <p> <code>CreationTime</code> </p> </li> <li> <p> <code>LastModificationTime</code> </p> </li> <li> <p> <code>Status</code> </p> </li> </ul>",
       "idempotent":true
     },
     "DescribeDatasetGroup":{
@@ -230,7 +230,7 @@
         {"shape":"InvalidInputException"},
         {"shape":"ResourceNotFoundException"}
       ],
-      "documentation":"<p>Describes a dataset group created using the <a>CreateDatasetGroup</a> operation.</p> <p>In addition to listing the properties provided by the user in the <code>CreateDatasetGroup</code> request, this operation includes the following properties:</p> <ul> <li> <p> <code>DatasetArns</code> - The datasets belonging to the group.</p> </li> <li> <p> <code>CreationTime</code> </p> </li> <li> <p> <code>LastModificationTime</code> </p> </li> <li> <p> <code>Status</code> </p> </li> </ul>",
+      "documentation":"<p>Describes a dataset group created using the <a>CreateDatasetGroup</a> operation.</p> <p>In addition to listing the parameters provided in the <code>CreateDatasetGroup</code> request, this operation includes the following properties:</p> <ul> <li> <p> <code>DatasetArns</code> - The datasets belonging to the group.</p> </li> <li> <p> <code>CreationTime</code> </p> </li> <li> <p> <code>LastModificationTime</code> </p> </li> <li> <p> <code>Status</code> </p> </li> </ul>",
       "idempotent":true
     },
     "DescribeDatasetImportJob":{
@@ -245,7 +245,7 @@
         {"shape":"InvalidInputException"},
         {"shape":"ResourceNotFoundException"}
       ],
-      "documentation":"<p>Describes a dataset import job created using the <a>CreateDatasetImportJob</a> operation.</p> <p>In addition to listing the properties provided by the user in the <code>CreateDatasetImportJob</code> request, this operation includes the following properties:</p> <ul> <li> <p> <code>CreationTime</code> </p> </li> <li> <p> <code>LastModificationTime</code> </p> </li> <li> <p> <code>DataSize</code> </p> </li> <li> <p> <code>FieldStatistics</code> </p> </li> <li> <p> <code>Status</code> </p> </li> <li> <p> <code>Message</code> - If an error occurred, information about the error.</p> </li> </ul>",
+      "documentation":"<p>Describes a dataset import job created using the <a>CreateDatasetImportJob</a> operation.</p> <p>In addition to listing the parameters provided in the <code>CreateDatasetImportJob</code> request, this operation includes the following properties:</p> <ul> <li> <p> <code>CreationTime</code> </p> </li> <li> <p> <code>LastModificationTime</code> </p> </li> <li> <p> <code>DataSize</code> </p> </li> <li> <p> <code>FieldStatistics</code> </p> </li> <li> <p> <code>Status</code> </p> </li> <li> <p> <code>Message</code> - If an error occurred, information about the error.</p> </li> </ul>",
       "idempotent":true
     },
     "DescribeForecast":{
@@ -260,7 +260,7 @@
         {"shape":"InvalidInputException"},
         {"shape":"ResourceNotFoundException"}
       ],
-      "documentation":"<p>Describes a forecast created using the <a>CreateForecast</a> operation.</p> <p>In addition to listing the properties provided by the user in the <code>CreateForecast</code> request, this operation includes the following properties:</p> <ul> <li> <p> <code>DatasetGroupArn</code> - The dataset group that provided the training data.</p> </li> <li> <p> <code>CreationTime</code> </p> </li> <li> <p> <code>LastModificationTime</code> </p> </li> <li> <p> <code>Status</code> </p> </li> <li> <p> <code>Message</code> - If an error occurred, information about the error.</p> </li> </ul>",
+      "documentation":"<p>Describes a forecast created using the <a>CreateForecast</a> operation.</p> <p>In addition to listing the properties provided in the <code>CreateForecast</code> request, this operation lists the following properties:</p> <ul> <li> <p> <code>DatasetGroupArn</code> - The dataset group that provided the training data.</p> </li> <li> <p> <code>CreationTime</code> </p> </li> <li> <p> <code>LastModificationTime</code> </p> </li> <li> <p> <code>Status</code> </p> </li> <li> <p> <code>Message</code> - If an error occurred, information about the error.</p> </li> </ul>",
       "idempotent":true
     },
     "DescribeForecastExportJob":{
@@ -275,7 +275,7 @@
         {"shape":"InvalidInputException"},
         {"shape":"ResourceNotFoundException"}
       ],
-      "documentation":"<p>Describes a forecast export job created using the <a>CreateForecastExportJob</a> operation.</p> <p>In addition to listing the properties provided by the user in the <code>CreateForecastExportJob</code> request, this operation includes the following properties:</p> <ul> <li> <p> <code>CreationTime</code> </p> </li> <li> <p> <code>LastModificationTime</code> </p> </li> <li> <p> <code>Status</code> </p> </li> <li> <p> <code>Message</code> - If an error occurred, information about the error.</p> </li> </ul>",
+      "documentation":"<p>Describes a forecast export job created using the <a>CreateForecastExportJob</a> operation.</p> <p>In addition to listing the properties provided by the user in the <code>CreateForecastExportJob</code> request, this operation lists the following properties:</p> <ul> <li> <p> <code>CreationTime</code> </p> </li> <li> <p> <code>LastModificationTime</code> </p> </li> <li> <p> <code>Status</code> </p> </li> <li> <p> <code>Message</code> - If an error occurred, information about the error.</p> </li> </ul>",
       "idempotent":true
     },
     "DescribePredictor":{
@@ -290,7 +290,7 @@
         {"shape":"InvalidInputException"},
         {"shape":"ResourceNotFoundException"}
       ],
-      "documentation":"<p>Describes a predictor created using the <a>CreatePredictor</a> operation.</p> <p>In addition to listing the properties provided by the user in the <code>CreatePredictor</code> request, this operation includes the following properties:</p> <ul> <li> <p> <code>DatasetImportJobArns</code> - The dataset import jobs used to import training data.</p> </li> <li> <p> <code>AutoMLAlgorithmArns</code> - If AutoML is performed, the algorithms evaluated.</p> </li> <li> <p> <code>CreationTime</code> </p> </li> <li> <p> <code>LastModificationTime</code> </p> </li> <li> <p> <code>Status</code> </p> </li> <li> <p> <code>Message</code> - If an error occurred, information about the error.</p> </li> </ul>",
+      "documentation":"<p>Describes a predictor created using the <a>CreatePredictor</a> operation.</p> <p>In addition to listing the properties provided in the <code>CreatePredictor</code> request, this operation lists the following properties:</p> <ul> <li> <p> <code>DatasetImportJobArns</code> - The dataset import jobs used to import training data.</p> </li> <li> <p> <code>AutoMLAlgorithmArns</code> - If AutoML is performed, the algorithms that were evaluated.</p> </li> <li> <p> <code>CreationTime</code> </p> </li> <li> <p> <code>LastModificationTime</code> </p> </li> <li> <p> <code>Status</code> </p> </li> <li> <p> <code>Message</code> - If an error occurred, information about the error.</p> </li> </ul>",
       "idempotent":true
     },
     "GetAccuracyMetrics":{
@@ -306,7 +306,7 @@
         {"shape":"ResourceNotFoundException"},
         {"shape":"ResourceInUseException"}
       ],
-      "documentation":"<p>Provides metrics on the accuracy of the models that were trained by the <a>CreatePredictor</a> operation. Use metrics to see how well the model performed and to decide whether to use the predictor to generate a forecast.</p> <p>Metrics are generated for each backtest window evaluated. For more information, see <a>EvaluationParameters</a>.</p> <p>The parameters of the <code>filling</code> method determine which items contribute to the metrics. If <code>zero</code> is specified, all items contribute. If <code>nan</code> is specified, only those items that have complete data in the range being evaluated contribute. For more information, see <a>FeaturizationMethod</a>.</p> <p>For an example of how to train a model and review metrics, see <a>getting-started</a>.</p>",
+      "documentation":"<p>Provides metrics on the accuracy of the models that were trained by the <a>CreatePredictor</a> operation. Use metrics to see how well the model performed and to decide whether to use the predictor to generate a forecast. For more information, see <a>metrics</a>.</p> <p>This operation generates metrics for each backtest window that was evaluated. The number of backtest windows (<code>NumberOfBacktestWindows</code>) is specified using the <a>EvaluationParameters</a> object, which is optionally included in the <code>CreatePredictor</code> request. If <code>NumberOfBacktestWindows</code> isn't specified, the number defaults to one.</p> <p>The parameters of the <code>filling</code> method determine which items contribute to the metrics. If you want all items to contribute, specify <code>zero</code>. If you want only those items that have complete data in the range being evaluated to contribute, specify <code>nan</code>. For more information, see <a>FeaturizationMethod</a>.</p> <note> <p>Before you can get accuracy metrics, the <code>Status</code> of the predictor must be <code>ACTIVE</code>, signifying that training has completed. To get the status, use the <a>DescribePredictor</a> operation.</p> </note>",
       "idempotent":true
     },
     "ListDatasetGroups":{
@@ -320,7 +320,7 @@
       "errors":[
         {"shape":"InvalidNextTokenException"}
       ],
-      "documentation":"<p>Returns a list of dataset groups created using the <a>CreateDatasetGroup</a> operation. For each dataset group, a summary of its properties, including its Amazon Resource Name (ARN), is returned. You can retrieve the complete set of properties by using the ARN with the <a>DescribeDatasetGroup</a> operation.</p>",
+      "documentation":"<p>Returns a list of dataset groups created using the <a>CreateDatasetGroup</a> operation. For each dataset group, this operation returns a summary of its properties, including its Amazon Resource Name (ARN). You can retrieve the complete set of properties by using the dataset group ARN with the <a>DescribeDatasetGroup</a> operation.</p>",
       "idempotent":true
     },
     "ListDatasetImportJobs":{
@@ -335,7 +335,7 @@
         {"shape":"InvalidNextTokenException"},
         {"shape":"InvalidInputException"}
       ],
-      "documentation":"<p>Returns a list of dataset import jobs created using the <a>CreateDatasetImportJob</a> operation. For each import job, a summary of its properties, including its Amazon Resource Name (ARN), is returned. You can retrieve the complete set of properties by using the ARN with the <a>DescribeDatasetImportJob</a> operation. You can filter the list by providing an array of <a>Filter</a> objects.</p>",
+      "documentation":"<p>Returns a list of dataset import jobs created using the <a>CreateDatasetImportJob</a> operation. For each import job, this operation returns a summary of its properties, including its Amazon Resource Name (ARN). You can retrieve the complete set of properties by using the ARN with the <a>DescribeDatasetImportJob</a> operation. You can filter the list by providing an array of <a>Filter</a> objects.</p>",
       "idempotent":true
     },
     "ListDatasets":{
@@ -349,7 +349,7 @@
       "errors":[
         {"shape":"InvalidNextTokenException"}
       ],
-      "documentation":"<p>Returns a list of datasets created using the <a>CreateDataset</a> operation. For each dataset, a summary of its properties, including its Amazon Resource Name (ARN), is returned. You can retrieve the complete set of properties by using the ARN with the <a>DescribeDataset</a> operation.</p>",
+      "documentation":"<p>Returns a list of datasets created using the <a>CreateDataset</a> operation. For each dataset, a summary of its properties, including its Amazon Resource Name (ARN), is returned. To retrieve the complete set of properties, use the ARN with the <a>DescribeDataset</a> operation.</p>",
       "idempotent":true
     },
     "ListForecastExportJobs":{
@@ -364,7 +364,7 @@
         {"shape":"InvalidNextTokenException"},
         {"shape":"InvalidInputException"}
       ],
-      "documentation":"<p>Returns a list of forecast export jobs created using the <a>CreateForecastExportJob</a> operation. For each forecast export job, a summary of its properties, including its Amazon Resource Name (ARN), is returned. You can retrieve the complete set of properties by using the ARN with the <a>DescribeForecastExportJob</a> operation. The list can be filtered using an array of <a>Filter</a> objects.</p>",
+      "documentation":"<p>Returns a list of forecast export jobs created using the <a>CreateForecastExportJob</a> operation. For each forecast export job, this operation returns a summary of its properties, including its Amazon Resource Name (ARN). To retrieve the complete set of properties, use the ARN with the <a>DescribeForecastExportJob</a> operation. You can filter the list using an array of <a>Filter</a> objects.</p>",
       "idempotent":true
     },
     "ListForecasts":{
@@ -379,7 +379,7 @@
         {"shape":"InvalidNextTokenException"},
         {"shape":"InvalidInputException"}
       ],
-      "documentation":"<p>Returns a list of forecasts created using the <a>CreateForecast</a> operation. For each forecast, a summary of its properties, including its Amazon Resource Name (ARN), is returned. You can retrieve the complete set of properties by using the ARN with the <a>DescribeForecast</a> operation. The list can be filtered using an array of <a>Filter</a> objects.</p>",
+      "documentation":"<p>Returns a list of forecasts created using the <a>CreateForecast</a> operation. For each forecast, this operation returns a summary of its properties, including its Amazon Resource Name (ARN). To retrieve the complete set of properties, specify the ARN with the <a>DescribeForecast</a> operation. You can filter the list using an array of <a>Filter</a> objects.</p>",
       "idempotent":true
     },
     "ListPredictors":{
@@ -394,7 +394,7 @@
         {"shape":"InvalidNextTokenException"},
         {"shape":"InvalidInputException"}
       ],
-      "documentation":"<p>Returns a list of predictors created using the <a>CreatePredictor</a> operation. For each predictor, a summary of its properties, including its Amazon Resource Name (ARN), is returned. You can retrieve the complete set of properties by using the ARN with the <a>DescribePredictor</a> operation. The list can be filtered using an array of <a>Filter</a> objects.</p>",
+      "documentation":"<p>Returns a list of predictors created using the <a>CreatePredictor</a> operation. For each predictor, this operation returns a summary of its properties, including its Amazon Resource Name (ARN). You can retrieve the complete set of properties by using the ARN with the <a>DescribePredictor</a> operation. You can filter the list using an array of <a>Filter</a> objects.</p>",
       "idempotent":true
     },
     "UpdateDatasetGroup":{
@@ -410,7 +410,7 @@
         {"shape":"ResourceNotFoundException"},
         {"shape":"ResourceInUseException"}
       ],
-      "documentation":"<p>Replaces any existing datasets in the dataset group with the specified datasets.</p> <note> <p>The <code>Status</code> of the dataset group must be <code>ACTIVE</code> before creating a predictor using the dataset group. Use the <a>DescribeDatasetGroup</a> operation to get the status.</p> </note>",
+      "documentation":"<p>Replaces the datasets in a dataset group with the specified datasets.</p> <note> <p>The <code>Status</code> of the dataset group must be <code>ACTIVE</code> before you can use the dataset group to create a predictor. Use the <a>DescribeDatasetGroup</a> operation to get the status.</p> </note>",
       "idempotent":true
     }
   },
@@ -480,7 +480,7 @@
         },
         "ScalingType":{
           "shape":"ScalingType",
-          "documentation":"<p>The scale that hyperparameter tuning uses to search the hyperparameter range. For information about choosing a hyperparameter scale, see <a href=\"http://docs.aws.amazon.com/sagemaker/latest/dg/automatic-model-tuning-define-ranges.html#scaling-type\">Hyperparameter Scaling</a>. One of the following values:</p> <dl> <dt>Auto</dt> <dd> <p>Amazon Forecast hyperparameter tuning chooses the best scale for the hyperparameter.</p> </dd> <dt>Linear</dt> <dd> <p>Hyperparameter tuning searches the values in the hyperparameter range by using a linear scale.</p> </dd> <dt>Logarithmic</dt> <dd> <p>Hyperparameter tuning searches the values in the hyperparameter range by using a logarithmic scale.</p> <p>Logarithmic scaling works only for ranges that have only values greater than 0.</p> </dd> <dt>ReverseLogarithmic</dt> <dd> <p>Hyperparemeter tuning searches the values in the hyperparameter range by using a reverse logarithmic scale.</p> <p>Reverse logarithmic scaling works only for ranges that are entirely within the range 0 &lt;= x &lt; 1.0.</p> </dd> </dl>"
+          "documentation":"<p>The scale that hyperparameter tuning uses to search the hyperparameter range. Valid values:</p> <dl> <dt>Auto</dt> <dd> <p>Amazon Forecast hyperparameter tuning chooses the best scale for the hyperparameter.</p> </dd> <dt>Linear</dt> <dd> <p>Hyperparameter tuning searches the values in the hyperparameter range by using a linear scale.</p> </dd> <dt>Logarithmic</dt> <dd> <p>Hyperparameter tuning searches the values in the hyperparameter range by using a logarithmic scale.</p> <p>Logarithmic scaling works only for ranges that have values greater than 0.</p> </dd> <dt>ReverseLogarithmic</dt> <dd> <p>hyperparameter tuning searches the values in the hyperparameter range by using a reverse logarithmic scale.</p> <p>Reverse logarithmic scaling works only for ranges that are entirely within the range 0 &lt;= x &lt; 1.0.</p> </dd> </dl> <p>For information about choosing a hyperparameter scale, see <a href=\"http://docs.aws.amazon.com/sagemaker/latest/dg/automatic-model-tuning-define-ranges.html#scaling-type\">Hyperparameter Scaling</a>. One of the following values:</p>"
         }
       },
       "documentation":"<p>Specifies a continuous hyperparameter and it's range of tunable values. This object is part of the <a>ParameterRanges</a> object.</p>"
@@ -504,7 +504,7 @@
         },
         "Domain":{
           "shape":"Domain",
-          "documentation":"<p>The domain associated with the dataset group. The <code>Domain</code> and <code>DatasetType</code> that you choose determine the fields that must be present in the training data that you import to the dataset. For example, if you choose the <code>RETAIL</code> domain and <code>TARGET_TIME_SERIES</code> as the <code>DatasetType</code>, Amazon Forecast requires <code>item_id</code>, <code>timestamp</code>, and <code>demand</code> fields to be present in your data. For more information, see <a>howitworks-datasets-groups</a>.</p>"
+          "documentation":"<p>The domain associated with the dataset group. When you add a dataset to a dataset group, this value and the value specified for the <code>Domain</code> parameter of the <a>CreateDataset</a> operation must match.</p> <p>The <code>Domain</code> and <code>DatasetType</code> that you choose determine the fields that must be present in training data that you import to a dataset. For example, if you choose the <code>RETAIL</code> domain and <code>TARGET_TIME_SERIES</code> as the <code>DatasetType</code>, Amazon Forecast requires that <code>item_id</code>, <code>timestamp</code>, and <code>demand</code> fields are present in your data. For more information, see <a>howitworks-datasets-groups</a>.</p>"
         },
         "DatasetArns":{
           "shape":"ArnList",
@@ -531,7 +531,7 @@
       "members":{
         "DatasetImportJobName":{
           "shape":"Name",
-          "documentation":"<p>The name for the dataset import job. It is recommended to include the current timestamp in the name to guard against getting a <code>ResourceAlreadyExistsException</code> exception, for example, <code>20190721DatasetImport</code>.</p>"
+          "documentation":"<p>The name for the dataset import job. We recommend including the current timestamp in the name, for example, <code>20190721DatasetImport</code>. This can help you avoid getting a <code>ResourceAlreadyExistsException</code> exception.</p>"
         },
         "DatasetArn":{
           "shape":"Arn",
@@ -539,11 +539,11 @@
         },
         "DataSource":{
           "shape":"DataSource",
-          "documentation":"<p>The location of the training data to import and an AWS Identity and Access Management (IAM) role that Amazon Forecast can assume to access the data.</p>"
+          "documentation":"<p>The location of the training data to import and an AWS Identity and Access Management (IAM) role that Amazon Forecast can assume to access the data. The training data must be stored in an Amazon S3 bucket.</p> <p>If encryption is used, <code>DataSource</code> must include an AWS Key Management Service (KMS) key and the IAM role must allow Amazon Forecast permission to access the key. The KMS key and IAM role must match those specified in the <code>EncryptionConfig</code> parameter of the <a>CreateDataset</a> operation.</p>"
         },
         "TimestampFormat":{
           "shape":"TimestampFormat",
-          "documentation":"<p>The format of timestamps in the dataset. Two formats are supported, dependent on the <code>DataFrequency</code> specified when the dataset was created.</p> <ul> <li> <p>\"yyyy-MM-dd\"</p> <p>For data frequencies: Y, M, W, and D</p> </li> <li> <p>\"yyyy-MM-dd HH:mm:ss\"</p> <p>For data frequencies: H, 30min, 15min, and 1min; and optionally, for: Y, M, W, and D</p> </li> </ul>"
+          "documentation":"<p>The format of timestamps in the dataset. The format that you specify depends on the <code>DataFrequency</code> specified when the dataset was created. The following formats are supported</p> <ul> <li> <p>\"yyyy-MM-dd\"</p> <p>For the following data frequencies: Y, M, W, and D</p> </li> <li> <p>\"yyyy-MM-dd HH:mm:ss\"</p> <p>For the following data frequencies: H, 30min, 15min, and 1min; and optionally, for: Y, M, W, and D</p> </li> </ul> <p>If the format isn't specified, Amazon Forecast expects the format to be \"yyyy-MM-dd HH:mm:ss\".</p>"
         }
       }
     },
@@ -571,7 +571,7 @@
         },
         "Domain":{
           "shape":"Domain",
-          "documentation":"<p>The domain associated with the dataset. The <code>Domain</code> and <code>DatasetType</code> that you choose determine the fields that must be present in the training data that you import to the dataset. For example, if you choose the <code>RETAIL</code> domain and <code>TARGET_TIME_SERIES</code> as the <code>DatasetType</code>, Amazon Forecast requires <code>item_id</code>, <code>timestamp</code>, and <code>demand</code> fields to be present in your data. For more information, see <a>howitworks-datasets-groups</a>.</p>"
+          "documentation":"<p>The domain associated with the dataset. When you add a dataset to a dataset group, this value and the value specified for the <code>Domain</code> parameter of the <a>CreateDatasetGroup</a> operation must match.</p> <p>The <code>Domain</code> and <code>DatasetType</code> that you choose determine the fields that must be present in the training data that you import to the dataset. For example, if you choose the <code>RETAIL</code> domain and <code>TARGET_TIME_SERIES</code> as the <code>DatasetType</code>, Amazon Forecast requires <code>item_id</code>, <code>timestamp</code>, and <code>demand</code> fields to be present in your data. For more information, see <a>howitworks-datasets-groups</a>.</p>"
         },
         "DatasetType":{
           "shape":"DatasetType",
@@ -579,7 +579,7 @@
         },
         "DataFrequency":{
           "shape":"Frequency",
-          "documentation":"<p>The frequency of data collection.</p> <p>Valid intervals are Y (Year), M (Month), W (Week), D (Day), H (Hour), 30min (30 minutes), 15min (15 minutes), 10min (10 minutes), 5min (5 minutes), and 1min (1 minute). For example, \"D\" indicates every day and \"15min\" indicates every 15 minutes.</p>"
+          "documentation":"<p>The frequency of data collection. This parameter is required for RELATED_TIME_SERIES datasets.</p> <p>Valid intervals are Y (Year), M (Month), W (Week), D (Day), H (Hour), 30min (30 minutes), 15min (15 minutes), 10min (10 minutes), 5min (5 minutes), and 1min (1 minute). For example, \"D\" indicates every day and \"15min\" indicates every 15 minutes.</p>"
         },
         "Schema":{
           "shape":"Schema",
@@ -618,7 +618,7 @@
         },
         "Destination":{
           "shape":"DataDestination",
-          "documentation":"<p>The path to the Amazon S3 bucket where you want to save the forecast and an AWS Identity and Access Management (IAM) role that Amazon Forecast can assume to access the bucket.</p>"
+          "documentation":"<p>The location where you want to save the forecast and an AWS Identity and Access Management (IAM) role that Amazon Forecast can assume to access the location. The forecast must be exported to an Amazon S3 bucket.</p> <p>If encryption is used, <code>Destination</code> must include an AWS Key Management Service (KMS) key. The IAM role must allow Amazon Forecast permission to access the key.</p>"
         }
       }
     },
@@ -640,11 +640,15 @@
       "members":{
         "ForecastName":{
           "shape":"Name",
-          "documentation":"<p>The name for the forecast.</p>"
+          "documentation":"<p>A name for the forecast.</p>"
         },
         "PredictorArn":{
           "shape":"Arn",
           "documentation":"<p>The Amazon Resource Name (ARN) of the predictor to use to generate the forecast.</p>"
+        },
+        "ForecastTypes":{
+          "shape":"ForecastTypes",
+          "documentation":"<p>The quantiles at which probabilistic forecasts are generated. You can specify up to 5 quantiles per forecast. Accepted values include <code>0.01 to 0.99</code> (increments of .01 only) and <code>mean</code>. The mean forecast is different from the median (0.50) when the distribution is not symmetric (e.g. Beta, Negative Binomial). The default value is <code>[\"0.1\", \"0.5\", \"0.9\"]</code>.</p>"
         }
       }
     },
@@ -672,23 +676,23 @@
         },
         "AlgorithmArn":{
           "shape":"Arn",
-          "documentation":"<p>The Amazon Resource Name (ARN) of the algorithm to use for model training. Required if <code>PerformAutoML</code> is not set to <code>true</code>.</p> <p class=\"title\"> <b>Supported algorithms</b> </p> <ul> <li> <p> <code>arn:aws:forecast:::algorithm/ARIMA</code> </p> </li> <li> <p> <code>arn:aws:forecast:::algorithm/Deep_AR_Plus</code> </p> <p> <code>- supports hyperparameter optimization (HPO)</code> </p> </li> <li> <p> <code>arn:aws:forecast:::algorithm/ETS</code> </p> </li> <li> <p> <code>arn:aws:forecast:::algorithm/NPTS</code> </p> </li> <li> <p> <code>arn:aws:forecast:::algorithm/Prophet</code> </p> </li> </ul>"
+          "documentation":"<p>The Amazon Resource Name (ARN) of the algorithm to use for model training. Required if <code>PerformAutoML</code> is not set to <code>true</code>.</p> <p class=\"title\"> <b>Supported algorithms:</b> </p> <ul> <li> <p> <code>arn:aws:forecast:::algorithm/ARIMA</code> </p> </li> <li> <p> <code>arn:aws:forecast:::algorithm/Deep_AR_Plus</code> </p> <p>Supports hyperparameter optimization (HPO)</p> </li> <li> <p> <code>arn:aws:forecast:::algorithm/ETS</code> </p> </li> <li> <p> <code>arn:aws:forecast:::algorithm/NPTS</code> </p> </li> <li> <p> <code>arn:aws:forecast:::algorithm/Prophet</code> </p> </li> </ul>"
         },
         "ForecastHorizon":{
           "shape":"Integer",
-          "documentation":"<p>Specifies the number of time-steps that the model is trained to predict. The forecast horizon is also called the prediction length.</p> <p>For example, if you configure a dataset for daily data collection (using the <code>DataFrequency</code> parameter of the <a>CreateDataset</a> operation) and set the forecast horizon to 10, the model returns predictions for 10 days.</p>"
+          "documentation":"<p>Specifies the number of time-steps that the model is trained to predict. The forecast horizon is also called the prediction length.</p> <p>For example, if you configure a dataset for daily data collection (using the <code>DataFrequency</code> parameter of the <a>CreateDataset</a> operation) and set the forecast horizon to 10, the model returns predictions for 10 days.</p> <p>The maximum forecast horizon is the lesser of 500 time-steps or 1/3 of the TARGET_TIME_SERIES dataset length.</p>"
         },
         "PerformAutoML":{
           "shape":"Boolean",
-          "documentation":"<p>Whether to perform AutoML. The default value is <code>false</code>. In this case, you are required to specify an algorithm.</p> <p>If you want Amazon Forecast to evaluate the algorithms it provides and choose the best algorithm and configuration for your training dataset, set <code>PerformAutoML</code> to <code>true</code>. This is a good option if you aren't sure which algorithm is suitable for your application.</p>"
+          "documentation":"<p>Whether to perform AutoML. When Amazon Forecast performs AutoML, it evaluates the algorithms it provides and chooses the best algorithm and configuration for your training dataset.</p> <p>The default value is <code>false</code>. In this case, you are required to specify an algorithm.</p> <p>Set <code>PerformAutoML</code> to <code>true</code> to have Amazon Forecast perform AutoML. This is a good option if you aren't sure which algorithm is suitable for your training data. In this case, <code>PerformHPO</code> must be false.</p>"
         },
         "PerformHPO":{
           "shape":"Boolean",
-          "documentation":"<p>Whether to perform hyperparameter optimization (HPO). HPO finds optimal hyperparameter values for your training data. The process of performing HPO is known as a hyperparameter tuning job.</p> <p>The default value is <code>false</code>. In this case, Amazon Forecast uses default hyperparameter values from the chosen algorithm.</p> <p>To override the default values, set <code>PerformHPO</code> to <code>true</code> and supply the <a>HyperParameterTuningJobConfig</a> object. The tuning job specifies an objective metric, the hyperparameters to optimize, and the valid range for each hyperparameter.</p> <p>The following algorithms support HPO:</p> <ul> <li> <p>DeepAR+</p> </li> </ul>"
+          "documentation":"<p>Whether to perform hyperparameter optimization (HPO). HPO finds optimal hyperparameter values for your training data. The process of performing HPO is known as running a hyperparameter tuning job.</p> <p>The default value is <code>false</code>. In this case, Amazon Forecast uses default hyperparameter values from the chosen algorithm.</p> <p>To override the default values, set <code>PerformHPO</code> to <code>true</code> and, optionally, supply the <a>HyperParameterTuningJobConfig</a> object. The tuning job specifies a metric to optimize, which hyperparameters participate in tuning, and the valid range for each tunable hyperparameter. In this case, you are required to specify an algorithm and <code>PerformAutoML</code> must be false.</p> <p>The following algorithm supports HPO:</p> <ul> <li> <p>DeepAR+</p> </li> </ul>"
         },
         "TrainingParameters":{
           "shape":"TrainingParameters",
-          "documentation":"<p>The training parameters to override for model training. The parameters that you can override are listed in the individual algorithms in <a>aws-forecast-choosing-recipes</a>.</p>"
+          "documentation":"<p>The hyperparameters to override for model training. The hyperparameters that you can override are listed in the individual algorithms. For the list of supported algorithms, see <a>aws-forecast-choosing-recipes</a>.</p>"
         },
         "EvaluationParameters":{
           "shape":"EvaluationParameters",
@@ -696,7 +700,7 @@
         },
         "HPOConfig":{
           "shape":"HyperParameterTuningJobConfig",
-          "documentation":"<p>Provides hyperparameter override values for the algorithm. If you don't provide this parameter, Amazon Forecast uses default values. The individual algorithms specify which hyperparameters support hyperparameter optimization (HPO). For more information, see <a>aws-forecast-choosing-recipes</a>.</p>"
+          "documentation":"<p>Provides hyperparameter override values for the algorithm. If you don't provide this parameter, Amazon Forecast uses default values. The individual algorithms specify which hyperparameters support hyperparameter optimization (HPO). For more information, see <a>aws-forecast-choosing-recipes</a>.</p> <p>If you included the <code>HPOConfig</code> object, you must set <code>PerformHPO</code> to true.</p>"
         },
         "InputDataConfig":{
           "shape":"InputDataConfig",
@@ -730,7 +734,7 @@
           "documentation":"<p>The path to an Amazon Simple Storage Service (Amazon S3) bucket along with the credentials to access the bucket.</p>"
         }
       },
-      "documentation":"<p>The destination of an exported forecast and credentials to access the location. This object is submitted in the <a>CreateForecastExportJob</a> request.</p>"
+      "documentation":"<p>The destination for an exported forecast, an AWS Identity and Access Management (IAM) role that allows Amazon Forecast to access the location and, optionally, an AWS Key Management Service (KMS) key. This object is submitted in the <a>CreateForecastExportJob</a> request.</p>"
     },
     "DataSource":{
       "type":"structure",
@@ -741,7 +745,7 @@
           "documentation":"<p>The path to the training data stored in an Amazon Simple Storage Service (Amazon S3) bucket along with the credentials to access the data.</p>"
         }
       },
-      "documentation":"<p>The source of your training data and credentials to access the data. This object is submitted in the <a>CreateDatasetImportJob</a> request.</p>"
+      "documentation":"<p>The source of your training data, an AWS Identity and Access Management (IAM) role that allows Amazon Forecast to access the data and, optionally, an AWS Key Management Service (KMS) key. This object is submitted in the <a>CreateDatasetImportJob</a> request.</p>"
     },
     "DatasetGroupSummary":{
       "type":"structure",
@@ -756,14 +760,14 @@
         },
         "CreationTime":{
           "shape":"Timestamp",
-          "documentation":"<p>When the datase group was created.</p>"
+          "documentation":"<p>When the dataset group was created.</p>"
         },
         "LastModificationTime":{
           "shape":"Timestamp",
-          "documentation":"<p>When the dataset group was created or last updated from a call to the <a>UpdateDatasetGroup</a> operation. While the dataset group is being updated, <code>LastModificationTime</code> is the current query time.</p>"
+          "documentation":"<p>When the dataset group was created or last updated from a call to the <a>UpdateDatasetGroup</a> operation. While the dataset group is being updated, <code>LastModificationTime</code> is the current time of the <code>ListDatasetGroups</code> call.</p>"
         }
       },
-      "documentation":"<p>Provides a summary of the dataset group properties used in the <a>ListDatasetGroups</a> operation. To get the complete set of properties, call the <a>DescribeDatasetGroup</a> operation, and provide the listed <code>DatasetGroupArn</code>.</p>"
+      "documentation":"<p>Provides a summary of the dataset group properties used in the <a>ListDatasetGroups</a> operation. To get the complete set of properties, call the <a>DescribeDatasetGroup</a> operation, and provide the <code>DatasetGroupArn</code>.</p>"
     },
     "DatasetGroups":{
       "type":"list",
@@ -782,7 +786,7 @@
         },
         "DataSource":{
           "shape":"DataSource",
-          "documentation":"<p>The location of the Amazon S3 bucket that contains the training data.</p>"
+          "documentation":"<p>The location of the training data to import and an AWS Identity and Access Management (IAM) role that Amazon Forecast can assume to access the data. The training data must be stored in an Amazon S3 bucket.</p> <p>If encryption is used, <code>DataSource</code> includes an AWS Key Management Service (KMS) key.</p>"
         },
         "Status":{
           "shape":"Status",
@@ -798,10 +802,10 @@
         },
         "LastModificationTime":{
           "shape":"Timestamp",
-          "documentation":"<p>Dependent on the status as follows:</p> <ul> <li> <p> <code>CREATE_PENDING</code> - same as <code>CreationTime</code> </p> </li> <li> <p> <code>CREATE_IN_PROGRESS</code> - the current timestamp</p> </li> <li> <p> <code>ACTIVE</code> or <code>CREATE_FAILED</code> - when the job finished or failed</p> </li> </ul>"
+          "documentation":"<p>The last time that the dataset was modified. The time depends on the status of the job, as follows:</p> <ul> <li> <p> <code>CREATE_PENDING</code> - The same time as <code>CreationTime</code>.</p> </li> <li> <p> <code>CREATE_IN_PROGRESS</code> - The current timestamp.</p> </li> <li> <p> <code>ACTIVE</code> or <code>CREATE_FAILED</code> - When the job finished or failed.</p> </li> </ul>"
         }
       },
-      "documentation":"<p>Provides a summary of the dataset import job properties used in the <a>ListDatasetImportJobs</a> operation. To get the complete set of properties, call the <a>DescribeDatasetImportJob</a> operation, and provide the listed <code>DatasetImportJobArn</code>.</p>"
+      "documentation":"<p>Provides a summary of the dataset import job properties used in the <a>ListDatasetImportJobs</a> operation. To get the complete set of properties, call the <a>DescribeDatasetImportJob</a> operation, and provide the <code>DatasetImportJobArn</code>.</p>"
     },
     "DatasetImportJobs":{
       "type":"list",
@@ -832,10 +836,10 @@
         },
         "LastModificationTime":{
           "shape":"Timestamp",
-          "documentation":"<p>When the dataset is created, <code>LastModificationTime</code> is the same as <code>CreationTime</code>. After a <a>CreateDatasetImportJob</a> operation is called, <code>LastModificationTime</code> is when the import job finished or failed. While data is being imported to the dataset, <code>LastModificationTime</code> is the current query time.</p>"
+          "documentation":"<p>When you create a dataset, <code>LastModificationTime</code> is the same as <code>CreationTime</code>. While data is being imported to the dataset, <code>LastModificationTime</code> is the current time of the <code>ListDatasets</code> call. After a <a>CreateDatasetImportJob</a> operation has finished, <code>LastModificationTime</code> is when the import job completed or failed.</p>"
         }
       },
-      "documentation":"<p>Provides a summary of the dataset properties used in the <a>ListDatasets</a> operation. To get the complete set of properties, call the <a>DescribeDataset</a> operation, and provide the listed <code>DatasetArn</code>.</p>"
+      "documentation":"<p>Provides a summary of the dataset properties used in the <a>ListDatasets</a> operation. To get the complete set of properties, call the <a>DescribeDataset</a> operation, and provide the <code>DatasetArn</code>.</p>"
     },
     "DatasetType":{
       "type":"string",
@@ -936,11 +940,11 @@
         },
         "Domain":{
           "shape":"Domain",
-          "documentation":"<p>The domain associated with the dataset group. The <code>Domain</code> and <code>DatasetType</code> that you choose determine the fields that must be present in the training data that you import to the dataset. For example, if you choose the <code>RETAIL</code> domain and <code>TARGET_TIME_SERIES</code> as the <code>DatasetType</code>, Amazon Forecast requires <code>item_id</code>, <code>timestamp</code>, and <code>demand</code> fields to be present in your data. For more information, see <a>howitworks-datasets-groups</a>.</p>"
+          "documentation":"<p>The domain associated with the dataset group.</p>"
         },
         "Status":{
           "shape":"Status",
-          "documentation":"<p>The status of the dataset group. States include:</p> <ul> <li> <p> <code>ACTIVE</code> </p> </li> <li> <p> <code>CREATE_PENDING</code>, <code>CREATE_IN_PROGRESS</code>, <code>CREATE_FAILED</code> </p> </li> <li> <p> <code>DELETE_PENDING</code>, <code>DELETE_IN_PROGRESS</code>, <code>DELETE_FAILED</code> </p> </li> <li> <p> <code>UPDATE_PENDING</code>, <code>UPDATE_IN_PROGRESS</code>, <code>UPDATE_FAILED</code> </p> </li> </ul> <p>The <code>UPDATE</code> states apply when the <a>UpdateDatasetGroup</a> operation is called.</p> <note> <p>The <code>Status</code> of the dataset group must be <code>ACTIVE</code> before creating a predictor using the dataset group.</p> </note>"
+          "documentation":"<p>The status of the dataset group. States include:</p> <ul> <li> <p> <code>ACTIVE</code> </p> </li> <li> <p> <code>CREATE_PENDING</code>, <code>CREATE_IN_PROGRESS</code>, <code>CREATE_FAILED</code> </p> </li> <li> <p> <code>DELETE_PENDING</code>, <code>DELETE_IN_PROGRESS</code>, <code>DELETE_FAILED</code> </p> </li> <li> <p> <code>UPDATE_PENDING</code>, <code>UPDATE_IN_PROGRESS</code>, <code>UPDATE_FAILED</code> </p> </li> </ul> <p>The <code>UPDATE</code> states apply when you call the <a>UpdateDatasetGroup</a> operation.</p> <note> <p>The <code>Status</code> of the dataset group must be <code>ACTIVE</code> before you can use the dataset group to create a predictor.</p> </note>"
         },
         "CreationTime":{
           "shape":"Timestamp",
@@ -948,7 +952,7 @@
         },
         "LastModificationTime":{
           "shape":"Timestamp",
-          "documentation":"<p>When the dataset group was created or last updated from a call to the <a>UpdateDatasetGroup</a> operation. While the dataset group is being updated, <code>LastModificationTime</code> is the current query time.</p>"
+          "documentation":"<p>When the dataset group was created or last updated from a call to the <a>UpdateDatasetGroup</a> operation. While the dataset group is being updated, <code>LastModificationTime</code> is the current time of the <code>DescribeDatasetGroup</code> call.</p>"
         }
       }
     },
@@ -979,11 +983,11 @@
         },
         "TimestampFormat":{
           "shape":"TimestampFormat",
-          "documentation":"<p>The format of timestamps in the dataset. Two formats are supported dependent on the <code>DataFrequency</code> specified when the dataset was created.</p> <ul> <li> <p>\"yyyy-MM-dd\"</p> <p>For data frequencies: Y, M, W, and D</p> </li> <li> <p>\"yyyy-MM-dd HH:mm:ss\"</p> <p>For data frequencies: H, 30min, 15min, and 1min; and optionally, for: Y, M, W, and D</p> </li> </ul>"
+          "documentation":"<p>The format of timestamps in the dataset. The format that you specify depends on the <code>DataFrequency</code> specified when the dataset was created. The following formats are supported</p> <ul> <li> <p>\"yyyy-MM-dd\"</p> <p>For the following data frequencies: Y, M, W, and D</p> </li> <li> <p>\"yyyy-MM-dd HH:mm:ss\"</p> <p>For the following data frequencies: H, 30min, 15min, and 1min; and optionally, for: Y, M, W, and D</p> </li> </ul>"
         },
         "DataSource":{
           "shape":"DataSource",
-          "documentation":"<p>The location of the training data to import. The training data must be stored in an Amazon S3 bucket.</p>"
+          "documentation":"<p>The location of the training data to import and an AWS Identity and Access Management (IAM) role that Amazon Forecast can assume to access the data.</p> <p>If encryption is used, <code>DataSource</code> includes an AWS Key Management Service (KMS) key.</p>"
         },
         "FieldStatistics":{
           "shape":"FieldStatistics",
@@ -991,7 +995,7 @@
         },
         "DataSize":{
           "shape":"Double",
-          "documentation":"<p>The size of the dataset in gigabytes (GB) after completion of the import job.</p>"
+          "documentation":"<p>The size of the dataset in gigabytes (GB) after the import job has finished.</p>"
         },
         "Status":{
           "shape":"Status",
@@ -1007,7 +1011,7 @@
         },
         "LastModificationTime":{
           "shape":"Timestamp",
-          "documentation":"<p>Dependent on the status as follows:</p> <ul> <li> <p> <code>CREATE_PENDING</code> - same as <code>CreationTime</code> </p> </li> <li> <p> <code>CREATE_IN_PROGRESS</code> - the current timestamp</p> </li> <li> <p> <code>ACTIVE</code> or <code>CREATE_FAILED</code> - when the job finished or failed</p> </li> </ul>"
+          "documentation":"<p>The last time that the dataset was modified. The time depends on the status of the job, as follows:</p> <ul> <li> <p> <code>CREATE_PENDING</code> - The same time as <code>CreationTime</code>.</p> </li> <li> <p> <code>CREATE_IN_PROGRESS</code> - The current timestamp.</p> </li> <li> <p> <code>ACTIVE</code> or <code>CREATE_FAILED</code> - When the job finished or failed.</p> </li> </ul>"
         }
       }
     },
@@ -1034,7 +1038,7 @@
         },
         "Domain":{
           "shape":"Domain",
-          "documentation":"<p>The dataset domain.</p>"
+          "documentation":"<p>The domain associated with the dataset.</p>"
         },
         "DatasetType":{
           "shape":"DatasetType",
@@ -1050,11 +1054,11 @@
         },
         "EncryptionConfig":{
           "shape":"EncryptionConfig",
-          "documentation":"<p>An AWS Key Management Service (KMS) key and the AWS Identity and Access Management (IAM) role that Amazon Forecast can assume to access the key.</p>"
+          "documentation":"<p>The AWS Key Management Service (KMS) key and the AWS Identity and Access Management (IAM) role that Amazon Forecast can assume to access the key.</p>"
         },
         "Status":{
           "shape":"Status",
-          "documentation":"<p>The status of the dataset. States include:</p> <ul> <li> <p> <code>ACTIVE</code> </p> </li> <li> <p> <code>CREATE_PENDING</code>, <code>CREATE_IN_PROGRESS</code>, <code>CREATE_FAILED</code> </p> </li> <li> <p> <code>DELETE_PENDING</code>, <code>DELETE_IN_PROGRESS</code>, <code>DELETE_FAILED</code> </p> </li> <li> <p> <code>UPDATE_PENDING</code>, <code>UPDATE_IN_PROGRESS</code>, <code>UPDATE_FAILED</code> </p> </li> </ul> <p>The <code>UPDATE</code> states apply while data is imported to the dataset from a call to the <a>CreateDatasetImportJob</a> operation. During this time, the status reflects the status of the dataset import job. For example, when the import job status is <code>CREATE_IN_PROGRESS</code>, the status of the dataset is <code>UPDATE_IN_PROGRESS</code>.</p> <note> <p>The <code>Status</code> of the dataset must be <code>ACTIVE</code> before you can import training data.</p> </note>"
+          "documentation":"<p>The status of the dataset. States include:</p> <ul> <li> <p> <code>ACTIVE</code> </p> </li> <li> <p> <code>CREATE_PENDING</code>, <code>CREATE_IN_PROGRESS</code>, <code>CREATE_FAILED</code> </p> </li> <li> <p> <code>DELETE_PENDING</code>, <code>DELETE_IN_PROGRESS</code>, <code>DELETE_FAILED</code> </p> </li> <li> <p> <code>UPDATE_PENDING</code>, <code>UPDATE_IN_PROGRESS</code>, <code>UPDATE_FAILED</code> </p> </li> </ul> <p>The <code>UPDATE</code> states apply while data is imported to the dataset from a call to the <a>CreateDatasetImportJob</a> operation and reflect the status of the dataset import job. For example, when the import job status is <code>CREATE_IN_PROGRESS</code>, the status of the dataset is <code>UPDATE_IN_PROGRESS</code>.</p> <note> <p>The <code>Status</code> of the dataset must be <code>ACTIVE</code> before you can import training data.</p> </note>"
         },
         "CreationTime":{
           "shape":"Timestamp",
@@ -1062,7 +1066,7 @@
         },
         "LastModificationTime":{
           "shape":"Timestamp",
-          "documentation":"<p>When the dataset is created, <code>LastModificationTime</code> is the same as <code>CreationTime</code>. After a <a>CreateDatasetImportJob</a> operation is called, <code>LastModificationTime</code> is when the import job finished or failed. While data is being imported to the dataset, <code>LastModificationTime</code> is the current query time.</p>"
+          "documentation":"<p>When you create a dataset, <code>LastModificationTime</code> is the same as <code>CreationTime</code>. While data is being imported to the dataset, <code>LastModificationTime</code> is the current time of the <code>DescribeDataset</code> call. After a <a>CreateDatasetImportJob</a> operation has finished, <code>LastModificationTime</code> is when the import job completed or failed.</p>"
         }
       }
     },
@@ -1093,7 +1097,7 @@
         },
         "Destination":{
           "shape":"DataDestination",
-          "documentation":"<p>The path to the AWS S3 bucket where the forecast is exported.</p>"
+          "documentation":"<p>The path to the Amazon Simple Storage Service (Amazon S3) bucket where the forecast is exported.</p>"
         },
         "Message":{
           "shape":"Message",
@@ -1101,7 +1105,7 @@
         },
         "Status":{
           "shape":"Status",
-          "documentation":"<p>The status of the forecast export job. One of the following states:</p> <ul> <li> <p> <code>ACTIVE</code> </p> </li> <li> <p> <code>CREATE_PENDING</code>, <code>CREATE_IN_PROGRESS</code>, <code>CREATE_FAILED</code> </p> </li> <li> <p> <code>DELETE_PENDING</code>, <code>DELETE_IN_PROGRESS</code>, <code>DELETE_FAILED</code> </p> </li> </ul> <note> <p>The <code>Status</code> of the forecast export job must be <code>ACTIVE</code> before you can access the forecast in your Amazon S3 bucket.</p> </note>"
+          "documentation":"<p>The status of the forecast export job. States include:</p> <ul> <li> <p> <code>ACTIVE</code> </p> </li> <li> <p> <code>CREATE_PENDING</code>, <code>CREATE_IN_PROGRESS</code>, <code>CREATE_FAILED</code> </p> </li> <li> <p> <code>DELETE_PENDING</code>, <code>DELETE_IN_PROGRESS</code>, <code>DELETE_FAILED</code> </p> </li> </ul> <note> <p>The <code>Status</code> of the forecast export job must be <code>ACTIVE</code> before you can access the forecast in your S3 bucket.</p> </note>"
         },
         "CreationTime":{
           "shape":"Timestamp",
@@ -1128,12 +1132,16 @@
       "members":{
         "ForecastArn":{
           "shape":"Arn",
-          "documentation":"<p>The same forecast ARN as given in the request.</p>"
+          "documentation":"<p>The forecast ARN as specified in the request.</p>"
         },
         "ForecastName":{
           "shape":"Name",
           "documentation":"<p>The name of the forecast.</p>"
         },
+        "ForecastTypes":{
+          "shape":"ForecastTypes",
+          "documentation":"<p>The quantiles at which proababilistic forecasts were generated.</p>"
+        },
         "PredictorArn":{
           "shape":"Arn",
           "documentation":"<p>The ARN of the predictor used to generate the forecast.</p>"
@@ -1195,11 +1203,11 @@
         },
         "PerformHPO":{
           "shape":"Boolean",
-          "documentation":"<p>Whether the predictor is set to perform HPO.</p>"
+          "documentation":"<p>Whether the predictor is set to perform hyperparameter optimization (HPO).</p>"
         },
         "TrainingParameters":{
           "shape":"TrainingParameters",
-          "documentation":"<p>The training parameters to override for model training. The parameters that you can override are listed in the individual algorithms in <a>aws-forecast-choosing-recipes</a>.</p>"
+          "documentation":"<p>The default training parameters or overrides selected during model training. If using the AutoML algorithm or if HPO is turned on while using the DeepAR+ algorithms, the optimized values for the chosen hyperparameters are returned. For more information, see <a>aws-forecast-choosing-recipes</a>.</p>"
         },
         "EvaluationParameters":{
           "shape":"EvaluationParameters",
@@ -1221,9 +1229,13 @@
           "shape":"EncryptionConfig",
           "documentation":"<p>An AWS Key Management Service (KMS) key and the AWS Identity and Access Management (IAM) role that Amazon Forecast can assume to access the key.</p>"
         },
+        "PredictorExecutionDetails":{
+          "shape":"PredictorExecutionDetails",
+          "documentation":"<p>Details on the the status and results of the backtests performed to evaluate the accuracy of the predictor. You specify the number of backtests to perform when you call the operation.</p>"
+        },
         "DatasetImportJobArns":{
           "shape":"ArnList",
-          "documentation":"<p>An array of ARNs of the dataset import jobs used to import training data for the predictor.</p>"
+          "documentation":"<p>An array of the ARNs of the dataset import jobs used to import training data for the predictor.</p>"
         },
         "AutoMLAlgorithmArns":{
           "shape":"ArnList",
@@ -1231,7 +1243,7 @@
         },
         "Status":{
           "shape":"Status",
-          "documentation":"<p>The status of the predictor. States include:</p> <ul> <li> <p> <code>ACTIVE</code> </p> </li> <li> <p> <code>CREATE_PENDING</code>, <code>CREATE_IN_PROGRESS</code>, <code>CREATE_FAILED</code> </p> </li> <li> <p> <code>DELETE_PENDING</code>, <code>DELETE_IN_PROGRESS</code>, <code>DELETE_FAILED</code> </p> </li> <li> <p> <code>UPDATE_PENDING</code>, <code>UPDATE_IN_PROGRESS</code>, <code>UPDATE_FAILED</code> </p> </li> </ul> <note> <p>The <code>Status</code> of the predictor must be <code>ACTIVE</code> before using the predictor to create a forecast.</p> </note>"
+          "documentation":"<p>The status of the predictor. States include:</p> <ul> <li> <p> <code>ACTIVE</code> </p> </li> <li> <p> <code>CREATE_PENDING</code>, <code>CREATE_IN_PROGRESS</code>, <code>CREATE_FAILED</code> </p> </li> <li> <p> <code>DELETE_PENDING</code>, <code>DELETE_IN_PROGRESS</code>, <code>DELETE_FAILED</code> </p> </li> <li> <p> <code>UPDATE_PENDING</code>, <code>UPDATE_IN_PROGRESS</code>, <code>UPDATE_FAILED</code> </p> </li> </ul> <note> <p>The <code>Status</code> of the predictor must be <code>ACTIVE</code> before you can use the predictor to create a forecast.</p> </note>"
         },
         "Message":{
           "shape":"Message",
@@ -1243,7 +1255,7 @@
         },
         "LastModificationTime":{
           "shape":"Timestamp",
-          "documentation":"<p>Initially, the same as <code>CreationTime</code> (status is <code>CREATE_PENDING</code>). Updated when training starts (status changed to <code>CREATE_IN_PROGRESS</code>), and when training is complete (status changed to <code>ACTIVE</code>) or fails (status changed to <code>CREATE_FAILED</code>).</p>"
+          "documentation":"<p>Initially, the same as <code>CreationTime</code> (when the status is <code>CREATE_PENDING</code>). This value is updated when training starts (when the status changes to <code>CREATE_IN_PROGRESS</code>), and when training has completed (when the status changes to <code>ACTIVE</code>) or fails (when the status changes to <code>CREATE_FAILED</code>).</p>"
         }
       }
     },
@@ -1269,14 +1281,14 @@
       "members":{
         "RoleArn":{
           "shape":"Arn",
-          "documentation":"<p>The ARN of the AWS Identity and Access Management (IAM) role that Amazon Forecast can assume to access the AWS KMS key.</p> <p>Cross-account pass role is not allowed. If you pass a role that doesn't belong to your account, an <code>InvalidInputException</code> is thrown.</p>"
+          "documentation":"<p>The ARN of the IAM role that Amazon Forecast can assume to access the AWS KMS key.</p> <p>Passing a role across AWS accounts is not allowed. If you pass a role that isn't in your account, you get an <code>InvalidInputException</code> error.</p>"
         },
         "KMSKeyArn":{
           "shape":"KMSKeyArn",
-          "documentation":"<p>The Amazon Resource Name (ARN) of an AWS Key Management Service (KMS) key.</p>"
+          "documentation":"<p>The Amazon Resource Name (ARN) of the KMS key.</p>"
         }
       },
-      "documentation":"<p>An AWS Key Management Service (KMS) key and an AWS Identity and Access Management (IAM) role that Amazon Forecast can assume to access the key. This object is optionally submitted in the <a>CreateDataset</a> and <a>CreatePredictor</a> requests.</p>"
+      "documentation":"<p>An AWS Key Management Service (KMS) key and an AWS Identity and Access Management (IAM) role that Amazon Forecast can assume to access the key. You can specify this optional object in the <a>CreateDataset</a> and <a>CreatePredictor</a> requests.</p>"
     },
     "ErrorMessage":{"type":"string"},
     "EvaluationParameters":{
@@ -1284,14 +1296,14 @@
       "members":{
         "NumberOfBacktestWindows":{
           "shape":"Integer",
-          "documentation":"<p>The number of times to split the input data. The default is 1. The range is 1 through 5.</p>"
+          "documentation":"<p>The number of times to split the input data. The default is 1. Valid values are 1 through 5.</p>"
         },
         "BackTestWindowOffset":{
           "shape":"Integer",
-          "documentation":"<p>The point from the end of the dataset where you want to split the data for model training and evaluation. The value is specified as the number of data points.</p>"
+          "documentation":"<p>The point from the end of the dataset where you want to split the data for model training and testing (evaluation). Specify the value as the number of data points. The default is the value of the forecast horizon. <code>BackTestWindowOffset</code> can be used to mimic a past virtual forecast start date. This value must be greater than or equal to the forecast horizon and less than half of the TARGET_TIME_SERIES dataset length.</p> <p> <code>ForecastHorizon</code> &lt;= <code>BackTestWindowOffset</code> &lt; 1/2 * TARGET_TIME_SERIES dataset length</p>"
         }
       },
-      "documentation":"<p>Parameters that define how to split a dataset into training data and testing data, and the number of iterations to perform. These parameters are specified in the predefined algorithms and can be overridden in the <a>CreatePredictor</a> request.</p> <p>For example, suppose that you have a dataset with data collection frequency set to every day and you have 200 days worth of data (that is, 200 data points). Now suppose that you set the <code>NumberOfBacktestWindows</code> to 2 and the <code>BackTestWindowOffset</code> parameter to 20. The algorithm splits the data twice. The first time, the algorithm trains the model using the first 180 data points and uses the last 20 data points for evaluation. The second time, the algorithm trains the model using the first 160 data points and uses the last 40 data points for evaluation.</p>"
+      "documentation":"<p>Parameters that define how to split a dataset into training data and testing data, and the number of iterations to perform. These parameters are specified in the predefined algorithms but you can override them in the <a>CreatePredictor</a> request.</p>"
     },
     "EvaluationResult":{
       "type":"structure",
@@ -1320,11 +1332,11 @@
       "members":{
         "AttributeName":{
           "shape":"Name",
-          "documentation":"<p>The name of the schema attribute specifying the data field to be featurized. In this release, only the <code>target</code> field of the <code>TARGET_TIME_SERIES</code> dataset type is supported. For example, for the <code>RETAIL</code> domain, the target is <code>demand</code>, and for the <code>CUSTOM</code> domain, the target is <code>target_value</code>.</p>"
+          "documentation":"<p>The name of the schema attribute that specifies the data field to be featurized. Only the <code>target</code> field of the <code>TARGET_TIME_SERIES</code> dataset type is supported. For example, for the <code>RETAIL</code> domain, the target is <code>demand</code>, and for the <code>CUSTOM</code> domain, the target is <code>target_value</code>.</p>"
         },
         "FeaturizationPipeline":{
           "shape":"FeaturizationPipeline",
-          "documentation":"<p>An array <code>FeaturizationMethod</code> objects that specifies the feature transformation methods. For this release, the number of methods is limited to one.</p>"
+          "documentation":"<p>An array of one <code>FeaturizationMethod</code> object that specifies the feature transformation method.</p>"
         }
       },
       "documentation":"<p>Provides featurization (transformation) information for a dataset field. This object is part of the <a>FeaturizationConfig</a> object.</p> <p>For example:</p> <p> <code>{</code> </p> <p> <code>\"AttributeName\": \"demand\",</code> </p> <p> <code>FeaturizationPipeline [ {</code> </p> <p> <code>\"FeaturizationMethodName\": \"filling\",</code> </p> <p> <code>\"FeaturizationMethodParameters\": {\"aggregation\": \"avg\", \"backfill\": \"nan\"}</code> </p> <p> <code>} ]</code> </p> <p> <code>}</code> </p>"
@@ -1335,18 +1347,18 @@
       "members":{
         "ForecastFrequency":{
           "shape":"Frequency",
-          "documentation":"<p>The frequency of predictions in a forecast.</p> <p>Valid intervals are Y (Year), M (Month), W (Week), D (Day), H (Hour), 30min (30 minutes), 15min (15 minutes), 10min (10 minutes), 5min (5 minutes), and 1min (1 minute). For example, \"Y\" indicates every year and \"5min\" indicates every five minutes.</p>"
+          "documentation":"<p>The frequency of predictions in a forecast.</p> <p>Valid intervals are Y (Year), M (Month), W (Week), D (Day), H (Hour), 30min (30 minutes), 15min (15 minutes), 10min (10 minutes), 5min (5 minutes), and 1min (1 minute). For example, \"Y\" indicates every year and \"5min\" indicates every five minutes.</p> <p>The frequency must be greater than or equal to the TARGET_TIME_SERIES dataset frequency.</p> <p>When a RELATED_TIME_SERIES dataset is provided, the frequency must be equal to the RELATED_TIME_SERIES dataset frequency.</p>"
         },
         "ForecastDimensions":{
           "shape":"ForecastDimensions",
-          "documentation":"<p>An array of dimension (field) names that specify how to group the generated forecast.</p> <p>For example, suppose that you are generating a forecast for item sales across all of your stores, and your dataset contains a <code>store_id</code> field. If you want the sales forecast for each item by store, you would specify <code>store_id</code> as the dimension.</p>"
+          "documentation":"<p>An array of dimension (field) names that specify how to group the generated forecast.</p> <p>For example, suppose that you are generating a forecast for item sales across all of your stores, and your dataset contains a <code>store_id</code> field. If you want the sales forecast for each item by store, you would specify <code>store_id</code> as the dimension.</p> <p>All forecast dimensions specified in the <code>TARGET_TIME_SERIES</code> dataset don't need to be specified in the <code>CreatePredictor</code> request. All forecast dimensions specified in the <code>RELATED_TIME_SERIES</code> dataset must be specified in the <code>CreatePredictor</code> request.</p>"
         },
         "Featurizations":{
           "shape":"Featurizations",
-          "documentation":"<p>An array of featurization (transformation) information for the fields of a dataset. In this release, only a single featurization is supported.</p>"
+          "documentation":"<p>An array of featurization (transformation) information for the fields of a dataset. Only a single featurization is supported.</p>"
         }
       },
-      "documentation":"<p>In a <a>CreatePredictor</a> operation, the specified algorithm trains a model using the specified dataset group. You can optionally tell the operation to modify data fields prior to training a model. These modifications are referred to as <i>featurization</i>.</p> <p>You define featurization using the <code>FeaturizationConfig</code> object. You specify an array of transformations, one for each field that you want to featurize. You then include the <code>FeaturizationConfig</code> in your <code>CreatePredictor</code> request. Amazon Forecast applies the featurization to the <code>TARGET_TIME_SERIES</code> dataset before model training.</p> <p>You can create multiple featurization configurations. For example, you might call the <code>CreatePredictor</code> operation twice by specifying different featurization configurations.</p>"
+      "documentation":"<p>In a <a>CreatePredictor</a> operation, the specified algorithm trains a model using the specified dataset group. You can optionally tell the operation to modify data fields prior to training a model. These modifications are referred to as <i>featurization</i>.</p> <p>You define featurization using the <code>FeaturizationConfig</code> object. You specify an array of transformations, one for each field that you want to featurize. You then include the <code>FeaturizationConfig</code> object in your <code>CreatePredictor</code> request. Amazon Forecast applies the featurization to the <code>TARGET_TIME_SERIES</code> dataset before model training.</p> <p>You can create multiple featurization configurations. For example, you might call the <code>CreatePredictor</code> operation twice by specifying different featurization configurations.</p>"
     },
     "FeaturizationMethod":{
       "type":"structure",
@@ -1354,14 +1366,14 @@
       "members":{
         "FeaturizationMethodName":{
           "shape":"FeaturizationMethodName",
-          "documentation":"<p>The name of the method. In this release, \"filling\" is the only supported method.</p>"
+          "documentation":"<p>The name of the method. The \"filling\" method is the only supported method.</p>"
         },
         "FeaturizationMethodParameters":{
           "shape":"FeaturizationMethodParameters",
-          "documentation":"<p>The method parameters (key-value pairs). Specify these to override the default values. The following list shows the parameters and their valid values. Bold signifies the default value.</p> <ul> <li> <p> <code>aggregation</code>: <b>sum</b>, <code>avg</code>, <code>first</code>, <code>min</code>, <code>max</code> </p> </li> <li> <p> <code>frontfill</code>: <b>none</b> </p> </li> <li> <p> <code>middlefill</code>: <b>zero</b>, <code>nan</code> (not a number)</p> </li> <li> <p> <code>backfill</code>: <b>zero</b>, <code>nan</code> </p> </li> </ul>"
+          "documentation":"<p>The method parameters (key-value pairs). Specify these parameters to override the default values. The following list shows the parameters and their valid values. Bold signifies the default value.</p> <ul> <li> <p> <code>aggregation</code>: <b>sum</b>, <code>avg</code>, <code>first</code>, <code>min</code>, <code>max</code> </p> </li> <li> <p> <code>frontfill</code>: <b>none</b> </p> </li> <li> <p> <code>middlefill</code>: <b>zero</b>, <code>nan</code> (not a number)</p> </li> <li> <p> <code>backfill</code>: <b>zero</b>, <code>nan</code> </p> </li> </ul>"
         }
       },
-      "documentation":"<p>Provides information about a method that featurizes (transforms) a dataset field. The method is part of the <code>FeaturizationPipeline</code> of the <a>Featurization</a> object. If <code>FeaturizationMethodParameters</code> isn't specified, Amazon Forecast uses default parameters.</p> <p>For example:</p> <p> <code>{</code> </p> <p> <code>\"FeaturizationMethodName\": \"filling\",</code> </p> <p> <code>\"FeaturizationMethodParameters\": {\"aggregation\": \"avg\", \"backfill\": \"nan\"}</code> </p> <p> <code>}</code> </p>"
+      "documentation":"<p>Provides information about the method that featurizes (transforms) a dataset field. The method is part of the <code>FeaturizationPipeline</code> of the <a>Featurization</a> object. If you don't specify <code>FeaturizationMethodParameters</code>, Amazon Forecast uses default parameters.</p> <p>The following is an example of how you specify a <code>FeaturizationMethod</code> object.</p> <p> <code>{</code> </p> <p> <code>\"FeaturizationMethodName\": \"filling\",</code> </p> <p> <code>\"FeaturizationMethodParameters\": {\"aggregation\": \"avg\", \"backfill\": \"nan\"}</code> </p> <p> <code>}</code> </p>"
     },
     "FeaturizationMethodName":{
       "type":"string",
@@ -1405,14 +1417,14 @@
         },
         "Value":{
           "shape":"Arn",
-          "documentation":"<p>A valid value for <code>Key</code>.</p>"
+          "documentation":"<p>The value to match.</p>"
         },
         "Condition":{
           "shape":"FilterConditionString",
-          "documentation":"<p>The condition to apply.</p>"
+          "documentation":"<p>The condition to apply. To include the objects that match the statement, specify <code>IS</code>. To exclude matching objects, specify <code>IS_NOT</code>.</p>"
         }
       },
-      "documentation":"<p>Describes a filter for choosing a subset of objects. Each filter consists of a condition and a match statement. The condition is either <code>IS</code> or <code>IS_NOT</code>, which specifies whether to include or exclude, respectively, the objects that match the statement. The match statement consists of a key and a value.</p>"
+      "documentation":"<p>Describes a filter for choosing a subset of objects. Each filter consists of a condition and a match statement. The condition is either <code>IS</code> or <code>IS_NOT</code>, which specifies whether to include or exclude the objects that match the statement, respectively. The match statement consists of a key and a value.</p>"
     },
     "FilterConditionString":{
       "type":"string",
@@ -1444,11 +1456,11 @@
         },
         "Destination":{
           "shape":"DataDestination",
-          "documentation":"<p>The path to the S3 bucket where the forecast is stored.</p>"
+          "documentation":"<p>The path to the Amazon Simple Storage Service (Amazon S3) bucket where the forecast is exported.</p>"
         },
         "Status":{
           "shape":"Status",
-          "documentation":"<p>The status of the forecast export job. One of the following states:</p> <ul> <li> <p> <code>ACTIVE</code> </p> </li> <li> <p> <code>CREATE_PENDING</code>, <code>CREATE_IN_PROGRESS</code>, <code>CREATE_FAILED</code> </p> </li> <li> <p> <code>DELETE_PENDING</code>, <code>DELETE_IN_PROGRESS</code>, <code>DELETE_FAILED</code> </p> </li> </ul> <note> <p>The <code>Status</code> of the forecast export job must be <code>ACTIVE</code> before you can access the forecast in your Amazon S3 bucket.</p> </note>"
+          "documentation":"<p>The status of the forecast export job. States include:</p> <ul> <li> <p> <code>ACTIVE</code> </p> </li> <li> <p> <code>CREATE_PENDING</code>, <code>CREATE_IN_PROGRESS</code>, <code>CREATE_FAILED</code> </p> </li> <li> <p> <code>DELETE_PENDING</code>, <code>DELETE_IN_PROGRESS</code>, <code>DELETE_FAILED</code> </p> </li> </ul> <note> <p>The <code>Status</code> of the forecast export job must be <code>ACTIVE</code> before you can access the forecast in your S3 bucket.</p> </note>"
         },
         "Message":{
           "shape":"ErrorMessage",
@@ -1505,7 +1517,17 @@
           "documentation":"<p>Initially, the same as <code>CreationTime</code> (status is <code>CREATE_PENDING</code>). Updated when inference (creating the forecast) starts (status changed to <code>CREATE_IN_PROGRESS</code>), and when inference is complete (status changed to <code>ACTIVE</code>) or fails (status changed to <code>CREATE_FAILED</code>).</p>"
         }
       },
-      "documentation":"<p>Provides a summary of the forecast properties used in the <a>ListForecasts</a> operation. To get the complete set of properties, call the <a>DescribeForecast</a> operation, and provide the listed <code>ForecastArn</code>.</p>"
+      "documentation":"<p>Provides a summary of the forecast properties used in the <a>ListForecasts</a> operation. To get the complete set of properties, call the <a>DescribeForecast</a> operation, and provide the <code>ForecastArn</code> that is listed in the summary.</p>"
+    },
+    "ForecastType":{
+      "type":"string",
+      "pattern":"(^0?\\.\\d\\d?$|^mean$)"
+    },
+    "ForecastTypes":{
+      "type":"list",
+      "member":{"shape":"ForecastType"},
+      "max":20,
+      "min":1
     },
     "Forecasts":{
       "type":"list",
@@ -1542,7 +1564,7 @@
           "documentation":"<p>Specifies the ranges of valid values for the hyperparameters.</p>"
         }
       },
-      "documentation":"<p>Configuration information for a hyperparameter tuning job. This object is specified in the <a>CreatePredictor</a> request.</p> <p>A hyperparameter is a parameter that governs the model training process and is set before training starts. This is as opposed to a model parameter that is determined during training. The values of the hyperparameters have an effect on the chosen model parameters.</p> <p>A hyperparameter tuning job is the process of choosing the optimum set of hyperparameter values that optimize a specified metric. This is accomplished by running many training jobs over a range of hyperparameter values. The optimum set of values is dependent on the algorithm, the training data, and the given metric objective.</p>"
+      "documentation":"<p>Configuration information for a hyperparameter tuning job. You specify this object in the <a>CreatePredictor</a> request.</p> <p>A <i>hyperparameter</i> is a parameter that governs the model training process. You set hyperparameters before training starts, unlike model parameters, which are determined during training. The values of the hyperparameters effect which values are chosen for the model parameters.</p> <p>In a <i>hyperparameter tuning job</i>, Amazon Forecast chooses the set of hyperparameter values that optimize a specified metric. Forecast accomplishes this by running many training jobs over a range of hyperparameter values. The optimum set of values depends on the algorithm, the training data, and the specified metric objective.</p>"
     },
     "InputDataConfig":{
       "type":"structure",
@@ -1554,10 +1576,10 @@
         },
         "SupplementaryFeatures":{
           "shape":"SupplementaryFeatures",
-          "documentation":"<p>An array of supplementary features. For this release, the only supported feature is a holiday calendar.</p>"
+          "documentation":"<p>An array of supplementary features. The only supported feature is a holiday calendar.</p>"
         }
       },
-      "documentation":"<p>The data used to train a predictor. The data includes a dataset group and any supplementary features. This object is specified in the <a>CreatePredictor</a> request.</p>"
+      "documentation":"<p>The data used to train a predictor. The data includes a dataset group and any supplementary features. You specify this object in the <a>CreatePredictor</a> request.</p>"
     },
     "Integer":{"type":"integer"},
     "IntegerParameterRange":{
@@ -1582,7 +1604,7 @@
         },
         "ScalingType":{
           "shape":"ScalingType",
-          "documentation":"<p>The scale that hyperparameter tuning uses to search the hyperparameter range. For information about choosing a hyperparameter scale, see <a href=\"http://docs.aws.amazon.com/sagemaker/latest/dg/automatic-model-tuning-define-ranges.html#scaling-type\">Hyperparameter Scaling</a>. One of the following values:</p> <dl> <dt>Auto</dt> <dd> <p>Amazon Forecast hyperparameter tuning chooses the best scale for the hyperparameter.</p> </dd> <dt>Linear</dt> <dd> <p>Hyperparameter tuning searches the values in the hyperparameter range by using a linear scale.</p> </dd> <dt>Logarithmic</dt> <dd> <p>Hyperparameter tuning searches the values in the hyperparameter range by using a logarithmic scale.</p> <p>Logarithmic scaling works only for ranges that have only values greater than 0.</p> </dd> <dt>ReverseLogarithmic</dt> <dd> <p>Not supported for <code>IntegerParameterRange</code>.</p> <p>Reverse logarithmic scaling works only for ranges that are entirely within the range 0 &lt;= x &lt; 1.0.</p> </dd> </dl>"
+          "documentation":"<p>The scale that hyperparameter tuning uses to search the hyperparameter range. Valid values:</p> <dl> <dt>Auto</dt> <dd> <p>Amazon Forecast hyperparameter tuning chooses the best scale for the hyperparameter.</p> </dd> <dt>Linear</dt> <dd> <p>Hyperparameter tuning searches the values in the hyperparameter range by using a linear scale.</p> </dd> <dt>Logarithmic</dt> <dd> <p>Hyperparameter tuning searches the values in the hyperparameter range by using a logarithmic scale.</p> <p>Logarithmic scaling works only for ranges that have values greater than 0.</p> </dd> <dt>ReverseLogarithmic</dt> <dd> <p>Not supported for <code>IntegerParameterRange</code>.</p> <p>Reverse logarithmic scaling works only for ranges that are entirely within the range 0 &lt;= x &lt; 1.0.</p> </dd> </dl> <p>For information about choosing a hyperparameter scale, see <a href=\"http://docs.aws.amazon.com/sagemaker/latest/dg/automatic-model-tuning-define-ranges.html#scaling-type\">Hyperparameter Scaling</a>. One of the following values:</p>"
         }
       },
       "documentation":"<p>Specifies an integer hyperparameter and it's range of tunable values. This object is part of the <a>ParameterRanges</a> object.</p>"
@@ -1619,7 +1641,7 @@
       "members":{
         "Message":{"shape":"ErrorMessage"}
       },
-      "documentation":"<p>The limit on the number of requests per second has been exceeded.</p>",
+      "documentation":"<p>The limit on the number of resources per account has been exceeded.</p>",
       "exception":true
     },
     "ListDatasetGroupsRequest":{
@@ -1661,7 +1683,7 @@
         },
         "Filters":{
           "shape":"Filters",
-          "documentation":"<p>An array of filters. For each filter, you provide a condition and a match statement. The condition is either <code>IS</code> or <code>IS_NOT</code>, which specifies whether to include or exclude, respectively, from the list, the predictors that match the statement. The match statement consists of a key and a value. In this release, <code>Name</code> is the only valid key, which filters on the <code>DatasetImportJobName</code> property.</p> <ul> <li> <p> <code>Condition</code> - <code>IS</code> or <code>IS_NOT</code> </p> </li> <li> <p> <code>Key</code> - <code>Name</code> </p> </li> <li> <p> <code>Value</code> - the value to match</p> </li> </ul> <p>For example, to list all dataset import jobs named <i>my_dataset_import_job</i>, you would specify:</p> <p> <code>\"Filters\": [ { \"Condition\": \"IS\", \"Key\": \"Name\", \"Value\": \"my_dataset_import_job\" } ]</code> </p>"
+          "documentation":"<p>An array of filters. For each filter, you provide a condition and a match statement. The condition is either <code>IS</code> or <code>IS_NOT</code>, which specifies whether to include or exclude the datasets that match the statement from the list, respectively. The match statement consists of a key and a value.</p> <p> <b>Filter properties</b> </p> <ul> <li> <p> <code>Condition</code> - The condition to apply. Valid values are <code>IS</code> and <code>IS_NOT</code>. To include the datasets that match the statement, specify <code>IS</code>. To exclude matching datasets, specify <code>IS_NOT</code>.</p> </li> <li> <p> <code>Key</code> - The name of the parameter to filter on. Valid values are <code>DatasetArn</code> and <code>Status</code>.</p> </li> <li> <p> <code>Value</code> - The value to match.</p> </li> </ul> <p>For example, to list all dataset import jobs whose status is ACTIVE, you specify the following filter:</p> <p> <code>\"Filters\": [ { \"Condition\": \"IS\", \"Key\": \"Status\", \"Value\": \"ACTIVE\" } ]</code> </p>"
         }
       }
     },
@@ -1717,7 +1739,7 @@
         },
         "Filters":{
           "shape":"Filters",
-          "documentation":"<p>An array of filters. For each filter, you provide a condition and a match statement. The condition is either <code>IS</code> or <code>IS_NOT</code>, which specifies whether to include or exclude, respectively, from the list, the predictors that match the statement. The match statement consists of a key and a value. In this release, <code>Name</code> is the only valid key, which filters on the <code>ForecastExportJobName</code> property.</p> <ul> <li> <p> <code>Condition</code> - <code>IS</code> or <code>IS_NOT</code> </p> </li> <li> <p> <code>Key</code> - <code>Name</code> </p> </li> <li> <p> <code>Value</code> - the value to match</p> </li> </ul> <p>For example, to list all forecast export jobs named <i>my_forecast_export_job</i>, you would specify:</p> <p> <code>\"Filters\": [ { \"Condition\": \"IS\", \"Key\": \"Name\", \"Value\": \"my_forecast_export_job\" } ]</code> </p>"
+          "documentation":"<p>An array of filters. For each filter, you provide a condition and a match statement. The condition is either <code>IS</code> or <code>IS_NOT</code>, which specifies whether to include or exclude the forecast export jobs that match the statement from the list, respectively. The match statement consists of a key and a value.</p> <p> <b>Filter properties</b> </p> <ul> <li> <p> <code>Condition</code> - The condition to apply. Valid values are <code>IS</code> and <code>IS_NOT</code>. To include the forecast export jobs that match the statement, specify <code>IS</code>. To exclude matching forecast export jobs, specify <code>IS_NOT</code>.</p> </li> <li> <p> <code>Key</code> - The name of the parameter to filter on. Valid values are <code>ForecastArn</code> and <code>Status</code>.</p> </li> <li> <p> <code>Value</code> - The value to match.</p> </li> </ul> <p>For example, to list all jobs that export a forecast named <i>electricityforecast</i>, specify the following filter:</p> <p> <code>\"Filters\": [ { \"Condition\": \"IS\", \"Key\": \"ForecastArn\", \"Value\": \"arn:aws:forecast:us-west-2:&lt;acct-id&gt;:forecast/electricityforecast\" } ]</code> </p>"
         }
       }
     },
@@ -1747,7 +1769,7 @@
         },
         "Filters":{
           "shape":"Filters",
-          "documentation":"<p>An array of filters. For each filter, you provide a condition and a match statement. The condition is either <code>IS</code> or <code>IS_NOT</code>, which specifies whether to include or exclude, respectively, from the list, the predictors that match the statement. The match statement consists of a key and a value. In this release, <code>Name</code> is the only valid key, which filters on the <code>ForecastName</code> property.</p> <ul> <li> <p> <code>Condition</code> - <code>IS</code> or <code>IS_NOT</code> </p> </li> <li> <p> <code>Key</code> - <code>Name</code> </p> </li> <li> <p> <code>Value</code> - the value to match</p> </li> </ul> <p>For example, to list all forecasts named <i>my_forecast</i>, you would specify:</p> <p> <code>\"Filters\": [ { \"Condition\": \"IS\", \"Key\": \"Name\", \"Value\": \"my_forecast\" } ]</code> </p>"
+          "documentation":"<p>An array of filters. For each filter, you provide a condition and a match statement. The condition is either <code>IS</code> or <code>IS_NOT</code>, which specifies whether to include or exclude the forecasts that match the statement from the list, respectively. The match statement consists of a key and a value.</p> <p> <b>Filter properties</b> </p> <ul> <li> <p> <code>Condition</code> - The condition to apply. Valid values are <code>IS</code> and <code>IS_NOT</code>. To include the forecasts that match the statement, specify <code>IS</code>. To exclude matching forecasts, specify <code>IS_NOT</code>.</p> </li> <li> <p> <code>Key</code> - The name of the parameter to filter on. Valid values are <code>DatasetGroupArn</code>, <code>PredictorArn</code>, and <code>Status</code>.</p> </li> <li> <p> <code>Value</code> - The value to match.</p> </li> </ul> <p>For example, to list all forecasts whose status is not ACTIVE, you would specify:</p> <p> <code>\"Filters\": [ { \"Condition\": \"IS_NOT\", \"Key\": \"Status\", \"Value\": \"ACTIVE\" } ]</code> </p>"
         }
       }
     },
@@ -1777,7 +1799,7 @@
         },
         "Filters":{
           "shape":"Filters",
-          "documentation":"<p>An array of filters. For each filter, you provide a condition and a match statement. The condition is either <code>IS</code> or <code>IS_NOT</code>, which specifies whether to include or exclude, respectively, from the list, the predictors that match the statement. The match statement consists of a key and a value. In this release, <code>Name</code> is the only valid key, which filters on the <code>PredictorName</code> property.</p> <ul> <li> <p> <code>Condition</code> - <code>IS</code> or <code>IS_NOT</code> </p> </li> <li> <p> <code>Key</code> - <code>Name</code> </p> </li> <li> <p> <code>Value</code> - the value to match</p> </li> </ul> <p>For example, to list all predictors named <i>my_predictor</i>, you would specify:</p> <p> <code>\"Filters\": [ { \"Condition\": \"IS\", \"Key\": \"Name\", \"Value\": \"my_predictor\" } ]</code> </p>"
+          "documentation":"<p>An array of filters. For each filter, you provide a condition and a match statement. The condition is either <code>IS</code> or <code>IS_NOT</code>, which specifies whether to include or exclude the predictors that match the statement from the list, respectively. The match statement consists of a key and a value.</p> <p> <b>Filter properties</b> </p> <ul> <li> <p> <code>Condition</code> - The condition to apply. Valid values are <code>IS</code> and <code>IS_NOT</code>. To include the predictors that match the statement, specify <code>IS</code>. To exclude matching predictors, specify <code>IS_NOT</code>.</p> </li> <li> <p> <code>Key</code> - The name of the parameter to filter on. Valid values are <code>DatasetGroupArn</code> and <code>Status</code>.</p> </li> <li> <p> <code>Value</code> - The value to match.</p> </li> </ul> <p>For example, to list all predictors whose status is ACTIVE, you would specify:</p> <p> <code>\"Filters\": [ { \"Condition\": \"IS\", \"Key\": \"Status\", \"Value\": \"ACTIVE\" } ]</code> </p>"
         }
       }
     },
@@ -1812,13 +1834,13 @@
           "documentation":"<p>An array of weighted quantile losses. Quantiles divide a probability distribution into regions of equal probability. The distribution in this case is the loss function.</p>"
         }
       },
-      "documentation":"<p>Provides metrics used to evaluate the performance of a predictor. This object is part of the <a>WindowSummary</a> object.</p>"
+      "documentation":"<p>Provides metrics that are used to evaluate the performance of a predictor. This object is part of the <a>WindowSummary</a> object.</p>"
     },
     "Name":{
       "type":"string",
       "max":63,
       "min":1,
-      "pattern":"^[a-zA-Z0-9][a-zA-Z0-9_]*"
+      "pattern":"^[a-zA-Z][a-zA-Z0-9_]*"
     },
     "NextToken":{
       "type":"string",
@@ -1857,6 +1879,36 @@
       "type":"list",
       "member":{"shape":"EvaluationResult"}
     },
+    "PredictorExecution":{
+      "type":"structure",
+      "members":{
+        "AlgorithmArn":{
+          "shape":"Arn",
+          "documentation":"<p>The ARN of the algorithm used to test the predictor.</p>"
+        },
+        "TestWindows":{
+          "shape":"TestWindowDetails",
+          "documentation":"<p>An array of test windows used to evaluate the algorithm. The <code>NumberOfBacktestWindows</code> from the object determines the number of windows in the array.</p>"
+        }
+      },
+      "documentation":"<p>The algorithm used to perform a backtest and the status of those tests.</p>"
+    },
+    "PredictorExecutionDetails":{
+      "type":"structure",
+      "members":{
+        "PredictorExecutions":{
+          "shape":"PredictorExecutions",
+          "documentation":"<p>An array of the backtests performed to evaluate the accuracy of the predictor against a particular algorithm. The <code>NumberOfBacktestWindows</code> from the object determines the number of windows in the array.</p>"
+        }
+      },
+      "documentation":"<p>Contains details on the backtests performed to evaluate the accuracy of the predictor. The tests are returned in descending order of accuracy, with the most accurate backtest appearing first. You specify the number of backtests to perform when you call the operation.</p>"
+    },
+    "PredictorExecutions":{
+      "type":"list",
+      "member":{"shape":"PredictorExecution"},
+      "max":5,
+      "min":1
+    },
     "PredictorSummary":{
       "type":"structure",
       "members":{
@@ -1874,7 +1926,7 @@
         },
         "Status":{
           "shape":"Status",
-          "documentation":"<p>The status of the predictor. States include:</p> <ul> <li> <p> <code>ACTIVE</code> </p> </li> <li> <p> <code>CREATE_PENDING</code>, <code>CREATE_IN_PROGRESS</code>, <code>CREATE_FAILED</code> </p> </li> <li> <p> <code>DELETE_PENDING</code>, <code>DELETE_IN_PROGRESS</code>, <code>DELETE_FAILED</code> </p> </li> <li> <p> <code>UPDATE_PENDING</code>, <code>UPDATE_IN_PROGRESS</code>, <code>UPDATE_FAILED</code> </p> </li> </ul> <note> <p>The <code>Status</code> of the predictor must be <code>ACTIVE</code> before using the predictor to create a forecast.</p> </note>"
+          "documentation":"<p>The status of the predictor. States include:</p> <ul> <li> <p> <code>ACTIVE</code> </p> </li> <li> <p> <code>CREATE_PENDING</code>, <code>CREATE_IN_PROGRESS</code>, <code>CREATE_FAILED</code> </p> </li> <li> <p> <code>DELETE_PENDING</code>, <code>DELETE_IN_PROGRESS</code>, <code>DELETE_FAILED</code> </p> </li> <li> <p> <code>UPDATE_PENDING</code>, <code>UPDATE_IN_PROGRESS</code>, <code>UPDATE_FAILED</code> </p> </li> </ul> <note> <p>The <code>Status</code> of the predictor must be <code>ACTIVE</code> before you can use the predictor to create a forecast.</p> </note>"
         },
         "Message":{
           "shape":"ErrorMessage",
@@ -1889,7 +1941,7 @@
           "documentation":"<p>Initially, the same as <code>CreationTime</code> (status is <code>CREATE_PENDING</code>). Updated when training starts (status changed to <code>CREATE_IN_PROGRESS</code>), and when training is complete (status changed to <code>ACTIVE</code>) or fails (status changed to <code>CREATE_FAILED</code>).</p>"
         }
       },
-      "documentation":"<p>Provides a summary of the predictor properties used in the <a>ListPredictors</a> operation. To get the complete set of properties, call the <a>DescribePredictor</a> operation, and provide the listed <code>PredictorArn</code>.</p>"
+      "documentation":"<p>Provides a summary of the predictor properties that are used in the <a>ListPredictors</a> operation. To get the complete set of properties, call the <a>DescribePredictor</a> operation, and provide the listed <code>PredictorArn</code>.</p>"
     },
     "Predictors":{
       "type":"list",
@@ -1900,7 +1952,7 @@
       "members":{
         "Message":{"shape":"ErrorMessage"}
       },
-      "documentation":"<p>There is already a resource with that Amazon Resource Name (ARN). Try again with a different ARN.</p>",
+      "documentation":"<p>There is already a resource with this name. Try again with a different name.</p>",
       "exception":true
     },
     "ResourceInUseException":{
@@ -1932,18 +1984,18 @@
         },
         "RoleArn":{
           "shape":"Arn",
-          "documentation":"<p>The ARN of the AWS Identity and Access Management (IAM) role that Amazon Forecast can assume to access the Amazon S3 bucket or file(s).</p> <p>Cross-account pass role is not allowed. If you pass a role that doesn't belong to your account, an <code>InvalidInputException</code> is thrown.</p>"
+          "documentation":"<p>The ARN of the AWS Identity and Access Management (IAM) role that Amazon Forecast can assume to access the Amazon S3 bucket or files. If you provide a value for the <code>KMSKeyArn</code> key, the role must allow access to the key.</p> <p>Passing a role across AWS accounts is not allowed. If you pass a role that isn't in your account, you get an <code>InvalidInputException</code> error.</p>"
         },
         "KMSKeyArn":{
           "shape":"KMSKeyArn",
           "documentation":"<p>The Amazon Resource Name (ARN) of an AWS Key Management Service (KMS) key.</p>"
         }
       },
-      "documentation":"<p>The path to the file(s) in an Amazon Simple Storage Service (Amazon S3) bucket, and an AWS Identity and Access Management (IAM) role that Amazon Forecast can assume to access the file(s). Optionally, includes an AWS Key Management Service (KMS) key. This object is submitted in the <a>CreateDatasetImportJob</a> and <a>CreateForecastExportJob</a> requests.</p>"
+      "documentation":"<p>The path to the file(s) in an Amazon Simple Storage Service (Amazon S3) bucket, and an AWS Identity and Access Management (IAM) role that Amazon Forecast can assume to access the file(s). Optionally, includes an AWS Key Management Service (KMS) key. This object is part of the <a>DataSource</a> object that is submitted in the <a>CreateDatasetImportJob</a> request, and part of the <a>DataDestination</a> object that is submitted in the <a>CreateForecastExportJob</a> request.</p>"
     },
     "S3Path":{
       "type":"string",
-      "pattern":"^s3://.+$"
+      "pattern":"^s3://[a-z0-9].+$"
     },
     "ScalingType":{
       "type":"string",
@@ -1962,7 +2014,7 @@
           "documentation":"<p>An array of attributes specifying the name and type of each field in a dataset.</p>"
         }
       },
-      "documentation":"<p>Defines the fields of a dataset. This object is specified in the <a>CreateDataset</a> request.</p>"
+      "documentation":"<p>Defines the fields of a dataset. You specify this object in the <a>CreateDataset</a> request.</p>"
     },
     "SchemaAttribute":{
       "type":"structure",
@@ -1976,7 +2028,7 @@
           "documentation":"<p>The data type of the field.</p>"
         }
       },
-      "documentation":"<p>An attribute of a schema, which defines a field of a dataset. A schema attribute is required for every field in a dataset. The <a>Schema</a> object contains an array of <code>SchemaAttribute</code> objects.</p>"
+      "documentation":"<p>An attribute of a schema, which defines a dataset field. A schema attribute is required for every field in a dataset. The <a>Schema</a> object contains an array of <code>SchemaAttribute</code> objects.</p>"
     },
     "SchemaAttributes":{
       "type":"list",
@@ -2018,7 +2070,7 @@
           "documentation":"<p>For a numeric field, the standard deviation.</p>"
         }
       },
-      "documentation":"<p>Provides statistics for each data field imported to an Amazon Forecast dataset with the <a>CreateDatasetImportJob</a> operation.</p>"
+      "documentation":"<p>Provides statistics for each data field imported into to an Amazon Forecast dataset with the <a>CreateDatasetImportJob</a> operation.</p>"
     },
     "Status":{
       "type":"string",
@@ -2045,7 +2097,7 @@
           "documentation":"<p>One of the following 2 letter country codes:</p> <ul> <li> <p>\"AU\" - AUSTRALIA</p> </li> <li> <p>\"DE\" - GERMANY</p> </li> <li> <p>\"JP\" - JAPAN</p> </li> <li> <p>\"US\" - UNITED_STATES</p> </li> <li> <p>\"UK\" - UNITED_KINGDOM</p> </li> </ul>"
         }
       },
-      "documentation":"<p>Describes a supplementary feature of a dataset group. This object is part of the <a>InputDataConfig</a> object.</p> <p>For this release, the only supported feature is a holiday calendar. If the calendar is used, all data should belong to the same country as the calendar. For the calendar data, see <a href=\"http://jollyday.sourceforge.net/data.html\">http://jollyday.sourceforge.net/data.html</a>.</p>"
+      "documentation":"<p>Describes a supplementary feature of a dataset group. This object is part of the <a>InputDataConfig</a> object.</p> <p>The only supported feature is a holiday calendar. If you use the calendar, all data in the datasets should belong to the same country as the calendar. For the holiday calendar data, see the <a href=\"http://jollyday.sourceforge.net/data.html\">Jollyday</a> web site.</p>"
     },
     "SupplementaryFeatures":{
       "type":"list",
@@ -2053,6 +2105,32 @@
       "max":1,
       "min":1
     },
+    "TestWindowDetails":{
+      "type":"list",
+      "member":{"shape":"TestWindowSummary"}
+    },
+    "TestWindowSummary":{
+      "type":"structure",
+      "members":{
+        "TestWindowStart":{
+          "shape":"Timestamp",
+          "documentation":"<p>The time at which the test began.</p>"
+        },
+        "TestWindowEnd":{
+          "shape":"Timestamp",
+          "documentation":"<p>The time at which the test ended.</p>"
+        },
+        "Status":{
+          "shape":"Status",
+          "documentation":"<p>The status of the test. Possible status values are:</p> <ul> <li> <p> <code>ACTIVE</code> </p> </li> <li> <p> <code>CREATE_IN_PROGRESS</code> </p> </li> <li> <p> <code>CREATE_FAILED</code> </p> </li> </ul>"
+        },
+        "Message":{
+          "shape":"ErrorMessage",
+          "documentation":"<p>If the test failed, the reason why it failed.</p>"
+        }
+      },
+      "documentation":"<p>The status, start time, and end time of a backtest, as well as a failure reason if applicable.</p>"
+    },
     "TestWindows":{
       "type":"list",
       "member":{"shape":"WindowSummary"}
@@ -2083,7 +2161,7 @@
         },
         "DatasetArns":{
           "shape":"ArnList",
-          "documentation":"<p>An array of Amazon Resource Names (ARNs) of the datasets to add to the dataset group.</p>"
+          "documentation":"<p>An array of the Amazon Resource Names (ARNs) of the datasets to add to the dataset group.</p>"
         }
       }
     },
@@ -2112,7 +2190,7 @@
         },
         "LossValue":{
           "shape":"Double",
-          "documentation":"<p>The difference between the predicted value and actual value over the quantile, weighted (normalized) by dividing by the sum over all quantiles.</p>"
+          "documentation":"<p>The difference between the predicted value and the actual value over the quantile, weighted (normalized) by dividing by the sum over all quantiles.</p>"
         }
       },
       "documentation":"<p>The weighted loss value for a quantile. This object is part of the <a>Metrics</a> object.</p>"
@@ -2140,7 +2218,10 @@
           "shape":"EvaluationType",
           "documentation":"<p>The type of evaluation.</p> <ul> <li> <p> <code>SUMMARY</code> - The average metrics across all windows.</p> </li> <li> <p> <code>COMPUTED</code> - The metrics for the specified window.</p> </li> </ul>"
         },
-        "Metrics":{"shape":"Metrics"}
+        "Metrics":{
+          "shape":"Metrics",
+          "documentation":"<p>Provides metrics used to evaluate the performance of a predictor.</p>"
+        }
       },
       "documentation":"<p>The metrics for a time range within the evaluation portion of a dataset. This object is part of the <a>EvaluationResult</a> object.</p> <p>The <code>TestWindowStart</code> and <code>TestWindowEnd</code> parameters are determined by the <code>BackTestWindowOffset</code> parameter of the <a>EvaluationParameters</a> object.</p>"
     }
diff --git a/services/forecastquery/pom.xml b/services/forecastquery/pom.xml
index baa380df9fd3..5fa73209279e 100644
--- a/services/forecastquery/pom.xml
+++ b/services/forecastquery/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,12 +21,12 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>forecastquery</artifactId>
-    <name>AWS Java SDK :: Services :: forecastquery</name>
-    <description>The AWS Java SDK for forecastquery module holds the client classes that are used for
-        communicating with forecastquery.
+    <name>AWS Java SDK :: Services :: Forecastquery</name>
+    <description>The AWS Java SDK for Forecastquery module holds the client classes that are used for
+        communicating with Forecastquery.
     </description>
     <url>https://aws.amazon.com/sdkforjava</url>
     <build>
diff --git a/services/forecastquery/src/main/resources/codegen-resources/service-2.json b/services/forecastquery/src/main/resources/codegen-resources/service-2.json
index 94aac8e5c23c..67f3c0cb6ee0 100644
--- a/services/forecastquery/src/main/resources/codegen-resources/service-2.json
+++ b/services/forecastquery/src/main/resources/codegen-resources/service-2.json
@@ -28,7 +28,7 @@
         {"shape":"LimitExceededException"},
         {"shape":"InvalidNextTokenException"}
       ],
-      "documentation":"<p>Retrieves a forecast filtered by the supplied criteria.</p> <p>The criteria is a key-value pair. The key is either <code>item_id</code> (or the equivalent non-timestamp, non-target field) from the <code>TARGET_TIME_SERIES</code> dataset, or one of the forecast dimensions specified as part of the <code>FeaturizationConfig</code> object.</p> <p>By default, the complete date range of the filtered forecast is returned. Optionally, you can request a specific date range within the forecast.</p> <note> <p>The forecasts generated by Amazon Forecast are in the same timezone as the dataset that was used to create the predictor.</p> </note>"
+      "documentation":"<p>Retrieves a forecast for a single item, filtered by the supplied criteria.</p> <p>The criteria is a key-value pair. The key is either <code>item_id</code> (or the equivalent non-timestamp, non-target field) from the <code>TARGET_TIME_SERIES</code> dataset, or one of the forecast dimensions specified as part of the <code>FeaturizationConfig</code> object.</p> <p>By default, <code>QueryForecast</code> returns the complete date range for the filtered forecast. You can request a specific date range.</p> <p>To get the full forecast, use the <a href=\"https://docs.aws.amazon.com/en_us/forecast/latest/dg/API_CreateForecastExportJob.html\">CreateForecastExportJob</a> operation.</p> <note> <p>The forecasts generated by Amazon Forecast are in the same timezone as the dataset that was used to create the predictor.</p> </note>"
     }
   },
   "shapes":{
@@ -60,11 +60,7 @@
       },
       "documentation":"<p>The forecast value for a specific date. Part of the <a>Forecast</a> object.</p>"
     },
-    "DateTime":{
-      "type":"string",
-      "max":20,
-      "pattern":"^\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}Z$"
-    },
+    "DateTime":{"type":"string"},
     "Double":{"type":"double"},
     "ErrorMessage":{"type":"string"},
     "Filters":{
@@ -79,7 +75,7 @@
       "members":{
         "Predictions":{
           "shape":"Predictions",
-          "documentation":"<p>The forecast.</p> <p>The <i>string</i> of the string to array map is one of the following values:</p> <ul> <li> <p>mean</p> </li> <li> <p>p10</p> </li> <li> <p>p50</p> </li> <li> <p>p90</p> </li> </ul>"
+          "documentation":"<p>The forecast.</p> <p>The <i>string</i> of the string-to-array map is one of the following values:</p> <ul> <li> <p>p10</p> </li> <li> <p>p50</p> </li> <li> <p>p90</p> </li> </ul>"
         }
       },
       "documentation":"<p>Provides information about a forecast. Returned as part of the <a>QueryForecast</a> response.</p>"
@@ -89,7 +85,7 @@
       "members":{
         "Message":{"shape":"ErrorMessage"}
       },
-      "documentation":"<p>The value that you provided was invalid or too long.</p>",
+      "documentation":"<p>The value is invalid or is too long.</p>",
       "exception":true
     },
     "InvalidNextTokenException":{
@@ -131,15 +127,15 @@
         },
         "StartDate":{
           "shape":"DateTime",
-          "documentation":"<p>The start date for the forecast. Specify the date using this format: yyyy-MM-dd'T'HH:mm:ss'Z' (ISO 8601 format) For example, \"1970-01-01T00:00:00Z.\"</p>"
+          "documentation":"<p>The start date for the forecast. Specify the date using this format: yyyy-MM-dd'T'HH:mm:ss (ISO 8601 format). For example, 2015-01-01T08:00:00.</p>"
         },
         "EndDate":{
           "shape":"DateTime",
-          "documentation":"<p>The end date for the forecast. Specify the date using this format: yyyy-MM-dd'T'HH:mm:ss'Z' (ISO 8601 format). For example, \"1970-01-01T00:00:00Z.\" </p>"
+          "documentation":"<p>The end date for the forecast. Specify the date using this format: yyyy-MM-dd'T'HH:mm:ss (ISO 8601 format). For example, 2015-01-01T20:00:00. </p>"
         },
         "Filters":{
           "shape":"Filters",
-          "documentation":"<p>The filtering criteria to apply when retrieving the forecast. For example:</p> <ul> <li> <p>To get a forecast for a specific item specify the following:</p> <p> <code>{\"item_id\" : \"client_1\"}</code> </p> </li> </ul> <ul> <li> <p>To get a forecast for a specific item sold in a specific location, specify the following:</p> <p> <code>{\"item_id\" : \"client_1\", \"location\" : \"ny\"}</code> </p> </li> </ul> <ul> <li> <p>To get a forecast for all blue items sold in a specific location, specify the following:</p> <p> <code>{ \"location\" : \"ny\", \"color\":\"blue\"}</code> </p> </li> </ul> <p>To get the full forecast, use the operation.</p>"
+          "documentation":"<p>The filtering criteria to apply when retrieving the forecast. For example, to get the forecast for <code>client_21</code> in the electricity usage dataset, specify the following:</p> <p> <code>{\"item_id\" : \"client_21\"}</code> </p> <p>To get the full forecast, use the <a href=\"https://docs.aws.amazon.com/en_us/forecast/latest/dg/API_CreateForecastExportJob.html\">CreateForecastExportJob</a> operation.</p>"
         },
         "NextToken":{
           "shape":"NextToken",
@@ -180,11 +176,7 @@
       "type":"list",
       "member":{"shape":"DataPoint"}
     },
-    "Timestamp":{
-      "type":"string",
-      "max":20,
-      "pattern":"^\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}Z$"
-    }
+    "Timestamp":{"type":"string"}
   },
   "documentation":"<p>Provides APIs for creating and managing Amazon Forecast resources.</p>"
 }
diff --git a/services/frauddetector/pom.xml b/services/frauddetector/pom.xml
new file mode 100644
index 000000000000..a0d8f08205f5
--- /dev/null
+++ b/services/frauddetector/pom.xml
@@ -0,0 +1,60 @@
+<?xml version="1.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.
+  -->
+
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>software.amazon.awssdk</groupId>
+        <artifactId>services</artifactId>
+        <version>2.11.8-SNAPSHOT</version>
+    </parent>
+    <artifactId>frauddetector</artifactId>
+    <name>AWS Java SDK :: Services :: FraudDetector</name>
+    <description>The AWS Java SDK for FraudDetector module holds the client classes that are used for
+        communicating with FraudDetector.
+    </description>
+    <url>https://aws.amazon.com/sdkforjava</url>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifestEntries>
+                            <Automatic-Module-Name>software.amazon.awssdk.services.frauddetector</Automatic-Module-Name>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>protocol-core</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>aws-json-protocol</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/services/frauddetector/src/main/resources/codegen-resources/paginators-1.json b/services/frauddetector/src/main/resources/codegen-resources/paginators-1.json
new file mode 100644
index 000000000000..b66f8459ad2e
--- /dev/null
+++ b/services/frauddetector/src/main/resources/codegen-resources/paginators-1.json
@@ -0,0 +1,39 @@
+{
+  "pagination": {
+    "DescribeModelVersions": {
+      "input_token": "nextToken",
+      "output_token": "nextToken",
+      "limit_key": "maxResults"
+    },
+    "GetDetectors": {
+      "input_token": "nextToken",
+      "output_token": "nextToken",
+      "limit_key": "maxResults"
+    },
+    "GetExternalModels": {
+      "input_token": "nextToken",
+      "output_token": "nextToken",
+      "limit_key": "maxResults"
+    },
+    "GetModels": {
+      "input_token": "nextToken",
+      "output_token": "nextToken",
+      "limit_key": "maxResults"
+    },
+    "GetOutcomes": {
+      "input_token": "nextToken",
+      "output_token": "nextToken",
+      "limit_key": "maxResults"
+    },
+    "GetRules": {
+      "input_token": "nextToken",
+      "output_token": "nextToken",
+      "limit_key": "maxResults"
+    },
+    "GetVariables": {
+      "input_token": "nextToken",
+      "output_token": "nextToken",
+      "limit_key": "maxResults"
+    }
+  }
+}
diff --git a/services/frauddetector/src/main/resources/codegen-resources/service-2.json b/services/frauddetector/src/main/resources/codegen-resources/service-2.json
new file mode 100644
index 000000000000..225f69e1a344
--- /dev/null
+++ b/services/frauddetector/src/main/resources/codegen-resources/service-2.json
@@ -0,0 +1,2338 @@
+{
+  "version":"2.0",
+  "metadata":{
+    "apiVersion":"2019-11-15",
+    "endpointPrefix":"frauddetector",
+    "jsonVersion":"1.1",
+    "protocol":"json",
+    "serviceFullName":"Amazon Fraud Detector",
+    "serviceId":"FraudDetector",
+    "signatureVersion":"v4",
+    "targetPrefix":"AWSHawksNestServiceFacade",
+    "uid":"frauddetector-2019-11-15"
+  },
+  "operations":{
+    "BatchCreateVariable":{
+      "name":"BatchCreateVariable",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"BatchCreateVariableRequest"},
+      "output":{"shape":"BatchCreateVariableResult"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"InternalServerException"},
+        {"shape":"ThrottlingException"}
+      ],
+      "documentation":"<p>Creates a batch of variables.</p>"
+    },
+    "BatchGetVariable":{
+      "name":"BatchGetVariable",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"BatchGetVariableRequest"},
+      "output":{"shape":"BatchGetVariableResult"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"InternalServerException"},
+        {"shape":"ThrottlingException"}
+      ],
+      "documentation":"<p>Gets a batch of variables.</p>"
+    },
+    "CreateDetectorVersion":{
+      "name":"CreateDetectorVersion",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"CreateDetectorVersionRequest"},
+      "output":{"shape":"CreateDetectorVersionResult"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InternalServerException"},
+        {"shape":"ThrottlingException"}
+      ],
+      "documentation":"<p>Creates a detector version. The detector version starts in a <code>DRAFT</code> status.</p>"
+    },
+    "CreateModelVersion":{
+      "name":"CreateModelVersion",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"CreateModelVersionRequest"},
+      "output":{"shape":"CreateModelVersionResult"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"InternalServerException"},
+        {"shape":"ThrottlingException"}
+      ],
+      "documentation":"<p>Creates a version of the model using the specified model type. </p>"
+    },
+    "CreateRule":{
+      "name":"CreateRule",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"CreateRuleRequest"},
+      "output":{"shape":"CreateRuleResult"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"InternalServerException"},
+        {"shape":"ThrottlingException"}
+      ],
+      "documentation":"<p>Creates a rule for use with the specified detector. </p>"
+    },
+    "CreateVariable":{
+      "name":"CreateVariable",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"CreateVariableRequest"},
+      "output":{"shape":"CreateVariableResult"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"InternalServerException"},
+        {"shape":"ThrottlingException"}
+      ],
+      "documentation":"<p>Creates a variable.</p>"
+    },
+    "DeleteDetectorVersion":{
+      "name":"DeleteDetectorVersion",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DeleteDetectorVersionRequest"},
+      "output":{"shape":"DeleteDetectorVersionResult"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InternalServerException"},
+        {"shape":"ThrottlingException"}
+      ],
+      "documentation":"<p>Deletes the detector version.</p>"
+    },
+    "DeleteEvent":{
+      "name":"DeleteEvent",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DeleteEventRequest"},
+      "output":{"shape":"DeleteEventResult"},
+      "errors":[
+        {"shape":"InternalServerException"},
+        {"shape":"ThrottlingException"}
+      ],
+      "documentation":"<p>Deletes the specified event.</p>"
+    },
+    "DescribeDetector":{
+      "name":"DescribeDetector",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DescribeDetectorRequest"},
+      "output":{"shape":"DescribeDetectorResult"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InternalServerException"},
+        {"shape":"ThrottlingException"}
+      ],
+      "documentation":"<p>Gets all versions for a specified detector.</p>"
+    },
+    "DescribeModelVersions":{
+      "name":"DescribeModelVersions",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DescribeModelVersionsRequest"},
+      "output":{"shape":"DescribeModelVersionsResult"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InternalServerException"},
+        {"shape":"ThrottlingException"}
+      ],
+      "documentation":"<p>Gets all of the model versions for the specified model type or for the specified model type and model ID. You can also get details for a single, specified model version. </p>"
+    },
+    "GetDetectorVersion":{
+      "name":"GetDetectorVersion",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"GetDetectorVersionRequest"},
+      "output":{"shape":"GetDetectorVersionResult"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InternalServerException"},
+        {"shape":"ThrottlingException"}
+      ],
+      "documentation":"<p>Gets a particular detector version. </p>"
+    },
+    "GetDetectors":{
+      "name":"GetDetectors",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"GetDetectorsRequest"},
+      "output":{"shape":"GetDetectorsResult"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InternalServerException"},
+        {"shape":"ThrottlingException"}
+      ],
+      "documentation":"<p>Gets all of detectors. This is a paginated API. If you provide a null <code>maxSizePerPage</code>, this actions retrieves a maximum of 10 records per page. If you provide a <code>maxSizePerPage</code>, the value must be between 5 and 10. To get the next page results, provide the pagination token from the <code>GetEventTypesResponse</code> as part of your request. A null pagination token fetches the records from the beginning. </p>"
+    },
+    "GetExternalModels":{
+      "name":"GetExternalModels",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"GetExternalModelsRequest"},
+      "output":{"shape":"GetExternalModelsResult"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InternalServerException"},
+        {"shape":"ThrottlingException"}
+      ],
+      "documentation":"<p>Gets the details for one or more Amazon SageMaker models that have been imported into the service. This is a paginated API. If you provide a null <code>maxSizePerPage</code>, this actions retrieves a maximum of 10 records per page. If you provide a <code>maxSizePerPage</code>, the value must be between 5 and 10. To get the next page results, provide the pagination token from the <code>GetExternalModelsResult</code> as part of your request. A null pagination token fetches the records from the beginning. </p>"
+    },
+    "GetModelVersion":{
+      "name":"GetModelVersion",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"GetModelVersionRequest"},
+      "output":{"shape":"GetModelVersionResult"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InternalServerException"},
+        {"shape":"ThrottlingException"}
+      ],
+      "documentation":"<p>Gets a model version. </p>"
+    },
+    "GetModels":{
+      "name":"GetModels",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"GetModelsRequest"},
+      "output":{"shape":"GetModelsResult"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InternalServerException"},
+        {"shape":"ThrottlingException"}
+      ],
+      "documentation":"<p>Gets all of the models for the AWS account, or the specified model type, or gets a single model for the specified model type, model ID combination. </p>"
+    },
+    "GetOutcomes":{
+      "name":"GetOutcomes",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"GetOutcomesRequest"},
+      "output":{"shape":"GetOutcomesResult"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InternalServerException"},
+        {"shape":"ThrottlingException"}
+      ],
+      "documentation":"<p>Gets one or more outcomes. This is a paginated API. If you provide a null <code>maxSizePerPage</code>, this actions retrieves a maximum of 10 records per page. If you provide a <code>maxSizePerPage</code>, the value must be between 50 and 100. To get the next page results, provide the pagination token from the <code>GetOutcomesResult</code> as part of your request. A null pagination token fetches the records from the beginning. </p>"
+    },
+    "GetPrediction":{
+      "name":"GetPrediction",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"GetPredictionRequest"},
+      "output":{"shape":"GetPredictionResult"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InternalServerException"},
+        {"shape":"ThrottlingException"}
+      ],
+      "documentation":"<p>Evaluates an event against a detector version. If a version ID is not provided, the detector’s (<code>ACTIVE</code>) version is used. </p>"
+    },
+    "GetRules":{
+      "name":"GetRules",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"GetRulesRequest"},
+      "output":{"shape":"GetRulesResult"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InternalServerException"},
+        {"shape":"ThrottlingException"}
+      ],
+      "documentation":"<p>Gets all rules available for the specified detector.</p>"
+    },
+    "GetVariables":{
+      "name":"GetVariables",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"GetVariablesRequest"},
+      "output":{"shape":"GetVariablesResult"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InternalServerException"},
+        {"shape":"ThrottlingException"}
+      ],
+      "documentation":"<p>Gets all of the variables or the specific variable. This is a paginated API. Providing null <code>maxSizePerPage</code> results in retrieving maximum of 100 records per page. If you provide <code>maxSizePerPage</code> the value must be between 50 and 100. To get the next page result, a provide a pagination token from <code>GetVariablesResult</code> as part of your request. Null pagination token fetches the records from the beginning. </p>"
+    },
+    "PutDetector":{
+      "name":"PutDetector",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"PutDetectorRequest"},
+      "output":{"shape":"PutDetectorResult"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"InternalServerException"},
+        {"shape":"ThrottlingException"}
+      ],
+      "documentation":"<p>Creates or updates a detector. </p>"
+    },
+    "PutExternalModel":{
+      "name":"PutExternalModel",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"PutExternalModelRequest"},
+      "output":{"shape":"PutExternalModelResult"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"InternalServerException"},
+        {"shape":"ThrottlingException"}
+      ],
+      "documentation":"<p>Creates or updates an Amazon SageMaker model endpoint. You can also use this action to update the configuration of the model endpoint, including the IAM role and/or the mapped variables. </p>"
+    },
+    "PutModel":{
+      "name":"PutModel",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"PutModelRequest"},
+      "output":{"shape":"PutModelResult"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"InternalServerException"},
+        {"shape":"ThrottlingException"}
+      ],
+      "documentation":"<p>Creates or updates a model. </p>"
+    },
+    "PutOutcome":{
+      "name":"PutOutcome",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"PutOutcomeRequest"},
+      "output":{"shape":"PutOutcomeResult"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"InternalServerException"},
+        {"shape":"ThrottlingException"}
+      ],
+      "documentation":"<p>Creates or updates an outcome. </p>"
+    },
+    "UpdateDetectorVersion":{
+      "name":"UpdateDetectorVersion",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"UpdateDetectorVersionRequest"},
+      "output":{"shape":"UpdateDetectorVersionResult"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InternalServerException"},
+        {"shape":"ThrottlingException"}
+      ],
+      "documentation":"<p> Updates a detector version. The detector version attributes that you can update include models, external model endpoints, rules, and description. You can only update a <code>DRAFT</code> detector version.</p>"
+    },
+    "UpdateDetectorVersionMetadata":{
+      "name":"UpdateDetectorVersionMetadata",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"UpdateDetectorVersionMetadataRequest"},
+      "output":{"shape":"UpdateDetectorVersionMetadataResult"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"InternalServerException"},
+        {"shape":"ThrottlingException"}
+      ],
+      "documentation":"<p>Updates the detector version's description. You can update the metadata for any detector version (<code>DRAFT, ACTIVE,</code> or <code>INACTIVE</code>). </p>"
+    },
+    "UpdateDetectorVersionStatus":{
+      "name":"UpdateDetectorVersionStatus",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"UpdateDetectorVersionStatusRequest"},
+      "output":{"shape":"UpdateDetectorVersionStatusResult"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InternalServerException"},
+        {"shape":"ThrottlingException"}
+      ],
+      "documentation":"<p>Updates the detector version’s status. You can perform the following promotions or demotions using <code>UpdateDetectorVersionStatus</code>: <code>DRAFT</code> to <code>ACTIVE</code>, <code>ACTIVE</code> to <code>INACTIVE</code>, and <code>INACTIVE</code> to <code>ACTIVE</code>.</p>"
+    },
+    "UpdateModelVersion":{
+      "name":"UpdateModelVersion",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"UpdateModelVersionRequest"},
+      "output":{"shape":"UpdateModelVersionResult"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InternalServerException"},
+        {"shape":"ThrottlingException"}
+      ],
+      "documentation":"<p>Updates a model version. You can update the description and status attributes using this action. You can perform the following status updates: </p> <ol> <li> <p>Change the <code>TRAINING_COMPLETE</code> status to <code>ACTIVE</code> </p> </li> <li> <p>Change <code>ACTIVE</code> back to <code>TRAINING_COMPLETE</code> </p> </li> </ol>"
+    },
+    "UpdateRuleMetadata":{
+      "name":"UpdateRuleMetadata",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"UpdateRuleMetadataRequest"},
+      "output":{"shape":"UpdateRuleMetadataResult"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InternalServerException"},
+        {"shape":"ThrottlingException"}
+      ],
+      "documentation":"<p>Updates a rule's metadata. </p>"
+    },
+    "UpdateRuleVersion":{
+      "name":"UpdateRuleVersion",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"UpdateRuleVersionRequest"},
+      "output":{"shape":"UpdateRuleVersionResult"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InternalServerException"},
+        {"shape":"ThrottlingException"}
+      ],
+      "documentation":"<p>Updates a rule version resulting in a new rule version. </p>"
+    },
+    "UpdateVariable":{
+      "name":"UpdateVariable",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"UpdateVariableRequest"},
+      "output":{"shape":"UpdateVariableResult"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InternalServerException"},
+        {"shape":"ThrottlingException"}
+      ],
+      "documentation":"<p>Updates a variable.</p>"
+    }
+  },
+  "shapes":{
+    "BatchCreateVariableError":{
+      "type":"structure",
+      "members":{
+        "name":{
+          "shape":"string",
+          "documentation":"<p>The name.</p>"
+        },
+        "code":{
+          "shape":"integer",
+          "documentation":"<p>The error code. </p>"
+        },
+        "message":{
+          "shape":"string",
+          "documentation":"<p>The error message.</p>"
+        }
+      },
+      "documentation":"<p>Provides the error of the batch create variable API.</p>"
+    },
+    "BatchCreateVariableErrorList":{
+      "type":"list",
+      "member":{"shape":"BatchCreateVariableError"}
+    },
+    "BatchCreateVariableRequest":{
+      "type":"structure",
+      "required":["variableEntries"],
+      "members":{
+        "variableEntries":{
+          "shape":"VariableEntryList",
+          "documentation":"<p>The list of variables for the batch create variable request.</p>"
+        }
+      }
+    },
+    "BatchCreateVariableResult":{
+      "type":"structure",
+      "members":{
+        "errors":{
+          "shape":"BatchCreateVariableErrorList",
+          "documentation":"<p>Provides the errors for the <code>BatchCreateVariable</code> request.</p>"
+        }
+      }
+    },
+    "BatchGetVariableError":{
+      "type":"structure",
+      "members":{
+        "name":{
+          "shape":"string",
+          "documentation":"<p>The error name. </p>"
+        },
+        "code":{
+          "shape":"integer",
+          "documentation":"<p>The error code. </p>"
+        },
+        "message":{
+          "shape":"string",
+          "documentation":"<p>The error message.</p>"
+        }
+      },
+      "documentation":"<p>Provides the error of the batch get variable API.</p>"
+    },
+    "BatchGetVariableErrorList":{
+      "type":"list",
+      "member":{"shape":"BatchGetVariableError"}
+    },
+    "BatchGetVariableRequest":{
+      "type":"structure",
+      "required":["names"],
+      "members":{
+        "names":{
+          "shape":"NameList",
+          "documentation":"<p>The list of variable names to get.</p>"
+        }
+      }
+    },
+    "BatchGetVariableResult":{
+      "type":"structure",
+      "members":{
+        "variables":{
+          "shape":"VariableList",
+          "documentation":"<p>The returned variables.</p>"
+        },
+        "errors":{
+          "shape":"BatchGetVariableErrorList",
+          "documentation":"<p>The errors from the request.</p>"
+        }
+      }
+    },
+    "CreateDetectorVersionRequest":{
+      "type":"structure",
+      "required":[
+        "detectorId",
+        "rules"
+      ],
+      "members":{
+        "detectorId":{
+          "shape":"identifier",
+          "documentation":"<p>The ID of the detector under which you want to create a new version.</p>"
+        },
+        "description":{
+          "shape":"description",
+          "documentation":"<p>The description of the detector version.</p>"
+        },
+        "externalModelEndpoints":{
+          "shape":"ListOfStrings",
+          "documentation":"<p>The Amazon Sagemaker model endpoints to include in the detector version.</p>"
+        },
+        "rules":{
+          "shape":"RuleList",
+          "documentation":"<p>The rules to include in the detector version.</p>"
+        },
+        "modelVersions":{
+          "shape":"ListOfModelVersions",
+          "documentation":"<p>The model versions to include in the detector version.</p>"
+        }
+      }
+    },
+    "CreateDetectorVersionResult":{
+      "type":"structure",
+      "members":{
+        "detectorId":{
+          "shape":"identifier",
+          "documentation":"<p>The ID for the created version's parent detector.</p>"
+        },
+        "detectorVersionId":{
+          "shape":"nonEmptyString",
+          "documentation":"<p>The ID for the created detector. </p>"
+        },
+        "status":{
+          "shape":"DetectorVersionStatus",
+          "documentation":"<p>The status of the detector version.</p>"
+        }
+      }
+    },
+    "CreateModelVersionRequest":{
+      "type":"structure",
+      "required":[
+        "modelId",
+        "modelType"
+      ],
+      "members":{
+        "modelId":{
+          "shape":"identifier",
+          "documentation":"<p>The model ID. </p>"
+        },
+        "modelType":{
+          "shape":"ModelTypeEnum",
+          "documentation":"<p>The model type.</p>"
+        },
+        "description":{
+          "shape":"description",
+          "documentation":"<p>The model version description.</p>"
+        }
+      }
+    },
+    "CreateModelVersionResult":{
+      "type":"structure",
+      "members":{
+        "modelId":{
+          "shape":"identifier",
+          "documentation":"<p>The model ID. </p>"
+        },
+        "modelType":{
+          "shape":"ModelTypeEnum",
+          "documentation":"<p>The model type.</p>"
+        },
+        "modelVersionNumber":{
+          "shape":"nonEmptyString",
+          "documentation":"<p>The version of the model. </p>"
+        },
+        "status":{
+          "shape":"string",
+          "documentation":"<p>The model version status. </p>"
+        }
+      }
+    },
+    "CreateRuleRequest":{
+      "type":"structure",
+      "required":[
+        "ruleId",
+        "detectorId",
+        "expression",
+        "language",
+        "outcomes"
+      ],
+      "members":{
+        "ruleId":{
+          "shape":"identifier",
+          "documentation":"<p>The rule ID.</p>"
+        },
+        "detectorId":{
+          "shape":"identifier",
+          "documentation":"<p>The detector ID for the rule's parent detector.</p>"
+        },
+        "description":{
+          "shape":"description",
+          "documentation":"<p>The rule description.</p>"
+        },
+        "expression":{
+          "shape":"ruleExpression",
+          "documentation":"<p>The rule expression.</p>"
+        },
+        "language":{
+          "shape":"Language",
+          "documentation":"<p>The language of the rule.</p>"
+        },
+        "outcomes":{
+          "shape":"NonEmptyListOfStrings",
+          "documentation":"<p>The outcome or outcomes returned when the rule expression matches.</p>"
+        }
+      }
+    },
+    "CreateRuleResult":{
+      "type":"structure",
+      "members":{
+        "rule":{
+          "shape":"Rule",
+          "documentation":"<p>The created rule.</p>"
+        }
+      }
+    },
+    "CreateVariableRequest":{
+      "type":"structure",
+      "required":[
+        "name",
+        "dataType",
+        "dataSource",
+        "defaultValue"
+      ],
+      "members":{
+        "name":{
+          "shape":"string",
+          "documentation":"<p>The name of the variable.</p>"
+        },
+        "dataType":{
+          "shape":"DataType",
+          "documentation":"<p>The data type.</p>"
+        },
+        "dataSource":{
+          "shape":"DataSource",
+          "documentation":"<p>The source of the data.</p>"
+        },
+        "defaultValue":{
+          "shape":"string",
+          "documentation":"<p>The default value for the variable when no value is received.</p>"
+        },
+        "description":{
+          "shape":"string",
+          "documentation":"<p>The description.</p>"
+        },
+        "variableType":{
+          "shape":"string",
+          "documentation":"<p>The variable type.</p>"
+        }
+      }
+    },
+    "CreateVariableResult":{
+      "type":"structure",
+      "members":{
+      }
+    },
+    "CsvIndexToVariableMap":{
+      "type":"map",
+      "key":{"shape":"string"},
+      "value":{"shape":"string"}
+    },
+    "DataSource":{
+      "type":"string",
+      "enum":[
+        "EVENT",
+        "MODEL_SCORE",
+        "EXTERNAL_MODEL_SCORE"
+      ]
+    },
+    "DataType":{
+      "type":"string",
+      "enum":[
+        "STRING",
+        "INTEGER",
+        "FLOAT",
+        "BOOLEAN"
+      ]
+    },
+    "DeleteDetectorVersionRequest":{
+      "type":"structure",
+      "required":[
+        "detectorId",
+        "detectorVersionId"
+      ],
+      "members":{
+        "detectorId":{
+          "shape":"identifier",
+          "documentation":"<p>The ID of the parent detector for the detector version to delete.</p>"
+        },
+        "detectorVersionId":{
+          "shape":"nonEmptyString",
+          "documentation":"<p>The ID of the detector version to delete.</p>"
+        }
+      }
+    },
+    "DeleteDetectorVersionResult":{
+      "type":"structure",
+      "members":{
+      }
+    },
+    "DeleteEventRequest":{
+      "type":"structure",
+      "required":["eventId"],
+      "members":{
+        "eventId":{
+          "shape":"string",
+          "documentation":"<p>The ID of the event to delete.</p>"
+        }
+      }
+    },
+    "DeleteEventResult":{
+      "type":"structure",
+      "members":{
+      }
+    },
+    "DescribeDetectorRequest":{
+      "type":"structure",
+      "required":["detectorId"],
+      "members":{
+        "detectorId":{
+          "shape":"identifier",
+          "documentation":"<p>The detector ID.</p>"
+        },
+        "nextToken":{
+          "shape":"string",
+          "documentation":"<p>The next token from the previous response.</p>"
+        },
+        "maxResults":{
+          "shape":"DetectorVersionMaxResults",
+          "documentation":"<p>The maximum number of results to return for the request.</p>"
+        }
+      }
+    },
+    "DescribeDetectorResult":{
+      "type":"structure",
+      "members":{
+        "detectorId":{
+          "shape":"identifier",
+          "documentation":"<p>The detector ID.</p>"
+        },
+        "detectorVersionSummaries":{
+          "shape":"DetectorVersionSummaryList",
+          "documentation":"<p>The status and description for each detector version.</p>"
+        },
+        "nextToken":{
+          "shape":"string",
+          "documentation":"<p>The next token to be used for subsequent requests.</p>"
+        }
+      }
+    },
+    "DescribeModelVersionsRequest":{
+      "type":"structure",
+      "members":{
+        "modelId":{
+          "shape":"identifier",
+          "documentation":"<p>The model ID.</p>"
+        },
+        "modelVersionNumber":{
+          "shape":"nonEmptyString",
+          "documentation":"<p>The model version. </p>"
+        },
+        "modelType":{
+          "shape":"ModelTypeEnum",
+          "documentation":"<p>The model type.</p>"
+        },
+        "nextToken":{
+          "shape":"string",
+          "documentation":"<p>The next token from the previous results.</p>"
+        },
+        "maxResults":{
+          "shape":"MaxResults",
+          "documentation":"<p>The maximum number of results to return.</p>"
+        }
+      }
+    },
+    "DescribeModelVersionsResult":{
+      "type":"structure",
+      "members":{
+        "modelVersionDetails":{
+          "shape":"ModelVersionDetailList",
+          "documentation":"<p>The model version details.</p>"
+        },
+        "nextToken":{
+          "shape":"string",
+          "documentation":"<p>The next token.</p>"
+        }
+      }
+    },
+    "Detector":{
+      "type":"structure",
+      "members":{
+        "detectorId":{
+          "shape":"identifier",
+          "documentation":"<p>The detector ID.</p>"
+        },
+        "description":{
+          "shape":"description",
+          "documentation":"<p>The detector description.</p>"
+        },
+        "lastUpdatedTime":{
+          "shape":"time",
+          "documentation":"<p>Timestamp of when the detector was last updated.</p>"
+        },
+        "createdTime":{
+          "shape":"time",
+          "documentation":"<p>Timestamp of when the detector was created.</p>"
+        }
+      },
+      "documentation":"<p>The detector.</p>"
+    },
+    "DetectorList":{
+      "type":"list",
+      "member":{"shape":"Detector"}
+    },
+    "DetectorVersionMaxResults":{
+      "type":"integer",
+      "box":true,
+      "max":2500,
+      "min":1000
+    },
+    "DetectorVersionStatus":{
+      "type":"string",
+      "enum":[
+        "DRAFT",
+        "ACTIVE",
+        "INACTIVE"
+      ]
+    },
+    "DetectorVersionSummary":{
+      "type":"structure",
+      "members":{
+        "detectorVersionId":{
+          "shape":"nonEmptyString",
+          "documentation":"<p>The detector version ID. </p>"
+        },
+        "status":{
+          "shape":"DetectorVersionStatus",
+          "documentation":"<p>The detector version status. </p>"
+        },
+        "description":{
+          "shape":"description",
+          "documentation":"<p>The detector version description. </p>"
+        },
+        "lastUpdatedTime":{
+          "shape":"time",
+          "documentation":"<p>Timestamp of when the detector version was last updated.</p>"
+        }
+      },
+      "documentation":"<p>The summary of the detector version.</p>"
+    },
+    "DetectorVersionSummaryList":{
+      "type":"list",
+      "member":{"shape":"DetectorVersionSummary"}
+    },
+    "DetectorsMaxResults":{
+      "type":"integer",
+      "box":true,
+      "max":10,
+      "min":5
+    },
+    "EventAttributeMap":{
+      "type":"map",
+      "key":{"shape":"attributeKey"},
+      "value":{"shape":"attributeValue"}
+    },
+    "ExternalModel":{
+      "type":"structure",
+      "members":{
+        "modelEndpoint":{
+          "shape":"string",
+          "documentation":"<p>The Amazon SageMaker model endpoints.</p>"
+        },
+        "modelSource":{
+          "shape":"ModelSource",
+          "documentation":"<p>The source of the model.</p>"
+        },
+        "role":{
+          "shape":"Role",
+          "documentation":"<p>The role used to invoke the model. </p>"
+        },
+        "inputConfiguration":{
+          "shape":"ModelInputConfiguration",
+          "documentation":"<p>The input configuration.</p>"
+        },
+        "outputConfiguration":{
+          "shape":"ModelOutputConfiguration",
+          "documentation":"<p>The output configuration.</p>"
+        },
+        "modelEndpointStatus":{
+          "shape":"ModelEndpointStatus",
+          "documentation":"<p>The Amazon Fraud Detector status for the external model endpoint</p>"
+        },
+        "lastUpdatedTime":{
+          "shape":"time",
+          "documentation":"<p>Timestamp of when the model was last updated.</p>"
+        },
+        "createdTime":{
+          "shape":"time",
+          "documentation":"<p>Timestamp of when the model was last created.</p>"
+        }
+      },
+      "documentation":"<p>The Amazon SageMaker model.</p>"
+    },
+    "ExternalModelEndpointDataBlobMap":{
+      "type":"map",
+      "key":{"shape":"string"},
+      "value":{"shape":"ModelEndpointDataBlob"},
+      "sensitive":true
+    },
+    "ExternalModelList":{
+      "type":"list",
+      "member":{"shape":"ExternalModel"}
+    },
+    "ExternalModelsMaxResults":{
+      "type":"integer",
+      "box":true,
+      "max":10,
+      "min":5
+    },
+    "GetDetectorVersionRequest":{
+      "type":"structure",
+      "required":[
+        "detectorId",
+        "detectorVersionId"
+      ],
+      "members":{
+        "detectorId":{
+          "shape":"identifier",
+          "documentation":"<p>The detector ID.</p>"
+        },
+        "detectorVersionId":{
+          "shape":"nonEmptyString",
+          "documentation":"<p>The detector version ID.</p>"
+        }
+      }
+    },
+    "GetDetectorVersionResult":{
+      "type":"structure",
+      "members":{
+        "detectorId":{
+          "shape":"identifier",
+          "documentation":"<p>The detector ID.</p>"
+        },
+        "detectorVersionId":{
+          "shape":"nonEmptyString",
+          "documentation":"<p>The detector version ID.</p>"
+        },
+        "description":{
+          "shape":"description",
+          "documentation":"<p>The detector version description.</p>"
+        },
+        "externalModelEndpoints":{
+          "shape":"ListOfStrings",
+          "documentation":"<p>The Amazon SageMaker model endpoints included in the detector version.</p>"
+        },
+        "modelVersions":{
+          "shape":"ListOfModelVersions",
+          "documentation":"<p>The model versions included in the detector version. </p>"
+        },
+        "rules":{
+          "shape":"RuleList",
+          "documentation":"<p>The rules included in the detector version.</p>"
+        },
+        "status":{
+          "shape":"DetectorVersionStatus",
+          "documentation":"<p>The status of the detector version.</p>"
+        },
+        "lastUpdatedTime":{
+          "shape":"time",
+          "documentation":"<p>The timestamp when the detector version was last updated. </p>"
+        },
+        "createdTime":{
+          "shape":"time",
+          "documentation":"<p>The timestamp when the detector version was created. </p>"
+        }
+      }
+    },
+    "GetDetectorsRequest":{
+      "type":"structure",
+      "members":{
+        "detectorId":{
+          "shape":"identifier",
+          "documentation":"<p>The detector ID.</p>"
+        },
+        "nextToken":{
+          "shape":"string",
+          "documentation":"<p>The next token for the subsequent request.</p>"
+        },
+        "maxResults":{
+          "shape":"DetectorsMaxResults",
+          "documentation":"<p>The maximum number of objects to return for the request.</p>"
+        }
+      }
+    },
+    "GetDetectorsResult":{
+      "type":"structure",
+      "members":{
+        "detectors":{
+          "shape":"DetectorList",
+          "documentation":"<p>The detectors.</p>"
+        },
+        "nextToken":{
+          "shape":"string",
+          "documentation":"<p>The next page token.</p>"
+        }
+      }
+    },
+    "GetExternalModelsRequest":{
+      "type":"structure",
+      "members":{
+        "modelEndpoint":{
+          "shape":"string",
+          "documentation":"<p>The Amazon SageMaker model endpoint.</p>"
+        },
+        "nextToken":{
+          "shape":"string",
+          "documentation":"<p>The next page token for the request.</p>"
+        },
+        "maxResults":{
+          "shape":"ExternalModelsMaxResults",
+          "documentation":"<p>The maximum number of objects to return for the request.</p>"
+        }
+      }
+    },
+    "GetExternalModelsResult":{
+      "type":"structure",
+      "members":{
+        "externalModels":{
+          "shape":"ExternalModelList",
+          "documentation":"<p>Gets the Amazon SageMaker models.</p>"
+        },
+        "nextToken":{
+          "shape":"string",
+          "documentation":"<p>The next page token to be used in subsequent requests.</p>"
+        }
+      }
+    },
+    "GetModelVersionRequest":{
+      "type":"structure",
+      "required":[
+        "modelId",
+        "modelType",
+        "modelVersionNumber"
+      ],
+      "members":{
+        "modelId":{
+          "shape":"identifier",
+          "documentation":"<p>The model ID. </p>"
+        },
+        "modelType":{
+          "shape":"ModelTypeEnum",
+          "documentation":"<p>The model type. </p>"
+        },
+        "modelVersionNumber":{
+          "shape":"nonEmptyString",
+          "documentation":"<p>The model version. </p>"
+        }
+      }
+    },
+    "GetModelVersionResult":{
+      "type":"structure",
+      "members":{
+        "modelId":{
+          "shape":"identifier",
+          "documentation":"<p>The model ID. </p>"
+        },
+        "modelType":{
+          "shape":"ModelTypeEnum",
+          "documentation":"<p>The model type. </p>"
+        },
+        "modelVersionNumber":{
+          "shape":"nonEmptyString",
+          "documentation":"<p>The model version. </p>"
+        },
+        "description":{
+          "shape":"description",
+          "documentation":"<p>The model version description.</p>"
+        },
+        "status":{
+          "shape":"string",
+          "documentation":"<p>The model version status. </p>"
+        }
+      }
+    },
+    "GetModelsRequest":{
+      "type":"structure",
+      "members":{
+        "modelType":{
+          "shape":"ModelTypeEnum",
+          "documentation":"<p>The model type.</p>"
+        },
+        "modelId":{
+          "shape":"identifier",
+          "documentation":"<p>The model ID.</p>"
+        },
+        "nextToken":{
+          "shape":"string",
+          "documentation":"<p>The next token for the request.</p>"
+        },
+        "maxResults":{
+          "shape":"MaxResults",
+          "documentation":"<p>The maximum results to return for the request.</p>"
+        }
+      }
+    },
+    "GetModelsResult":{
+      "type":"structure",
+      "members":{
+        "nextToken":{
+          "shape":"string",
+          "documentation":"<p>The next token for subsequent requests. </p>"
+        },
+        "models":{
+          "shape":"ModelList",
+          "documentation":"<p>The returned models. </p>"
+        }
+      }
+    },
+    "GetOutcomesRequest":{
+      "type":"structure",
+      "members":{
+        "name":{
+          "shape":"identifier",
+          "documentation":"<p>The name of the outcome or outcomes to get.</p>"
+        },
+        "nextToken":{
+          "shape":"string",
+          "documentation":"<p>The next page token for the request. </p>"
+        },
+        "maxResults":{
+          "shape":"OutcomesMaxResults",
+          "documentation":"<p>The maximum number of objects to return for the request. </p>"
+        }
+      }
+    },
+    "GetOutcomesResult":{
+      "type":"structure",
+      "members":{
+        "outcomes":{
+          "shape":"OutcomeList",
+          "documentation":"<p>The outcomes. </p>"
+        },
+        "nextToken":{
+          "shape":"string",
+          "documentation":"<p>The next page token for subsequent requests.</p>"
+        }
+      }
+    },
+    "GetPredictionRequest":{
+      "type":"structure",
+      "required":[
+        "detectorId",
+        "eventId"
+      ],
+      "members":{
+        "detectorId":{
+          "shape":"string",
+          "documentation":"<p>The detector ID. </p>"
+        },
+        "detectorVersionId":{
+          "shape":"string",
+          "documentation":"<p>The detector version ID.</p>"
+        },
+        "eventId":{
+          "shape":"string",
+          "documentation":"<p>The unique ID used to identify the event.</p>"
+        },
+        "eventAttributes":{
+          "shape":"EventAttributeMap",
+          "documentation":"<p>Names of variables you defined in Amazon Fraud Detector to represent event data elements and their corresponding values for the event you are sending for evaluation.</p>"
+        },
+        "externalModelEndpointDataBlobs":{
+          "shape":"ExternalModelEndpointDataBlobMap",
+          "documentation":"<p>The Amazon SageMaker model endpoint input data blobs.</p>"
+        }
+      }
+    },
+    "GetPredictionResult":{
+      "type":"structure",
+      "members":{
+        "outcomes":{
+          "shape":"ListOfStrings",
+          "documentation":"<p>The prediction outcomes.</p>"
+        },
+        "modelScores":{
+          "shape":"ListOfModelScores",
+          "documentation":"<p>The model scores for models used in the detector version.</p>"
+        }
+      }
+    },
+    "GetRulesRequest":{
+      "type":"structure",
+      "required":["detectorId"],
+      "members":{
+        "ruleId":{
+          "shape":"identifier",
+          "documentation":"<p>The rule ID.</p>"
+        },
+        "detectorId":{
+          "shape":"identifier",
+          "documentation":"<p>The detector ID.</p>"
+        },
+        "ruleVersion":{
+          "shape":"nonEmptyString",
+          "documentation":"<p>The rule version.</p>"
+        },
+        "nextToken":{
+          "shape":"string",
+          "documentation":"<p>The next page token.</p>"
+        },
+        "maxResults":{
+          "shape":"RulesMaxResults",
+          "documentation":"<p>The maximum number of rules to return for the request.</p>"
+        }
+      }
+    },
+    "GetRulesResult":{
+      "type":"structure",
+      "members":{
+        "ruleDetails":{
+          "shape":"RuleDetailList",
+          "documentation":"<p>The details of the requested rule.</p>"
+        },
+        "nextToken":{
+          "shape":"string",
+          "documentation":"<p>The next page token to be used in subsequent requests.</p>"
+        }
+      }
+    },
+    "GetVariablesRequest":{
+      "type":"structure",
+      "members":{
+        "name":{
+          "shape":"string",
+          "documentation":"<p>The name of the variable. </p>"
+        },
+        "nextToken":{
+          "shape":"string",
+          "documentation":"<p>The next page token of the get variable request. </p>"
+        },
+        "maxResults":{
+          "shape":"VariablesMaxResults",
+          "documentation":"<p>The max size per page determined for the get variable request. </p>"
+        }
+      }
+    },
+    "GetVariablesResult":{
+      "type":"structure",
+      "members":{
+        "variables":{
+          "shape":"VariableList",
+          "documentation":"<p>The names of the variables returned. </p>"
+        },
+        "nextToken":{
+          "shape":"string",
+          "documentation":"<p>The next page token to be used in subsequent requests. </p>"
+        }
+      }
+    },
+    "InternalServerException":{
+      "type":"structure",
+      "required":["message"],
+      "members":{
+        "message":{"shape":"string"}
+      },
+      "documentation":"<p>An exception indicating an internal server error.</p>",
+      "exception":true,
+      "fault":true
+    },
+    "IsOpaque":{"type":"boolean"},
+    "JsonKeyToVariableMap":{
+      "type":"map",
+      "key":{"shape":"string"},
+      "value":{"shape":"string"}
+    },
+    "LabelMapper":{
+      "type":"map",
+      "key":{"shape":"string"},
+      "value":{"shape":"ListOfStrings"}
+    },
+    "LabelSchema":{
+      "type":"structure",
+      "required":[
+        "labelKey",
+        "labelMapper"
+      ],
+      "members":{
+        "labelKey":{
+          "shape":"string",
+          "documentation":"<p>The label key.</p>"
+        },
+        "labelMapper":{
+          "shape":"LabelMapper",
+          "documentation":"<p>The label mapper maps the Amazon Fraud Detector supported label to the appropriate source labels. For example, if <code>\"FRAUD\"</code> and <code>\"LEGIT\"</code> are Amazon Fraud Detector supported labels, this mapper could be: <code>{\"FRAUD\" =&gt; [\"0\"]</code>, \"LEGIT\" =&gt; [\"1\"]} or <code>{\"FRAUD\" =&gt; [\"false\"], \"LEGIT\" =&gt; [\"true\"]}</code> or <code>{\"FRAUD\" =&gt; [\"fraud\", \"abuse\"], \"LEGIT\" =&gt; [\"legit\", \"safe\"]}</code>. The value part of the mapper is a list, because you may have multiple variants for a single Amazon Fraud Detector label. </p>"
+        }
+      },
+      "documentation":"<p>The label schema.</p>"
+    },
+    "Language":{
+      "type":"string",
+      "enum":["DETECTORPL"]
+    },
+    "ListOfModelScores":{
+      "type":"list",
+      "member":{"shape":"ModelScores"}
+    },
+    "ListOfModelVersions":{
+      "type":"list",
+      "member":{"shape":"ModelVersion"}
+    },
+    "ListOfStrings":{
+      "type":"list",
+      "member":{"shape":"string"}
+    },
+    "MaxResults":{
+      "type":"integer",
+      "box":true,
+      "max":10,
+      "min":1
+    },
+    "MetricsMap":{
+      "type":"map",
+      "key":{"shape":"string"},
+      "value":{"shape":"string"}
+    },
+    "Model":{
+      "type":"structure",
+      "members":{
+        "modelId":{
+          "shape":"identifier",
+          "documentation":"<p>The model ID.</p>"
+        },
+        "modelType":{
+          "shape":"ModelTypeEnum",
+          "documentation":"<p>The model type.</p>"
+        },
+        "description":{
+          "shape":"description",
+          "documentation":"<p>The model description.</p>"
+        },
+        "trainingDataSource":{
+          "shape":"TrainingDataSource",
+          "documentation":"<p>The model training data source in Amazon S3.</p>"
+        },
+        "modelVariables":{
+          "shape":"ModelVariablesList",
+          "documentation":"<p>The model input variables.</p>"
+        },
+        "labelSchema":{
+          "shape":"LabelSchema",
+          "documentation":"<p>The model label schema.</p>"
+        },
+        "lastUpdatedTime":{
+          "shape":"time",
+          "documentation":"<p>Timestamp of last time the model was updated.</p>"
+        },
+        "createdTime":{
+          "shape":"time",
+          "documentation":"<p>Timestamp of when the model was created.</p>"
+        }
+      },
+      "documentation":"<p>The model.</p>"
+    },
+    "ModelEndpointDataBlob":{
+      "type":"structure",
+      "members":{
+        "byteBuffer":{
+          "shape":"blob",
+          "documentation":"<p>The byte buffer of the Amazon SageMaker model endpoint input data blob.</p>"
+        },
+        "contentType":{
+          "shape":"contentType",
+          "documentation":"<p>The content type of the Amazon SageMaker model endpoint input data blob. </p>"
+        }
+      },
+      "documentation":"<p>A pre-formed Amazon SageMaker model input you can include if your detector version includes an imported Amazon SageMaker model endpoint with pass-through input configuration.</p>"
+    },
+    "ModelEndpointStatus":{
+      "type":"string",
+      "enum":[
+        "ASSOCIATED",
+        "DISSOCIATED"
+      ]
+    },
+    "ModelInputConfiguration":{
+      "type":"structure",
+      "required":["isOpaque"],
+      "members":{
+        "format":{
+          "shape":"ModelInputDataFormat",
+          "documentation":"<p> The format of the model input configuration. The format differs depending on if it is passed through to SageMaker or constructed by Amazon Fraud Detector.</p>"
+        },
+        "isOpaque":{
+          "shape":"IsOpaque",
+          "documentation":"<p> For an opaque-model, the input to the model will be a ByteBuffer blob provided in the getPrediction request, and will be passed to SageMaker as-is. For non-opaque models, the input will be constructed by Amazon Fraud Detector based on the model-configuration. </p>"
+        },
+        "jsonInputTemplate":{
+          "shape":"string",
+          "documentation":"<p> Template for constructing the JSON input-data sent to SageMaker. At event-evaluation, the placeholders for variable names in the template will be replaced with the variable values before being sent to SageMaker. </p>"
+        },
+        "csvInputTemplate":{
+          "shape":"string",
+          "documentation":"<p> Template for constructing the CSV input-data sent to SageMaker. At event-evaluation, the placeholders for variable-names in the template will be replaced with the variable values before being sent to SageMaker. </p>"
+        }
+      },
+      "documentation":"<p>The model input configuration.</p>"
+    },
+    "ModelInputDataFormat":{
+      "type":"string",
+      "enum":[
+        "TEXT_CSV",
+        "APPLICATION_JSON"
+      ]
+    },
+    "ModelList":{
+      "type":"list",
+      "member":{"shape":"Model"}
+    },
+    "ModelOutputConfiguration":{
+      "type":"structure",
+      "required":["format"],
+      "members":{
+        "format":{
+          "shape":"ModelOutputDataFormat",
+          "documentation":"<p>The format of the model output configuration.</p>"
+        },
+        "jsonKeyToVariableMap":{
+          "shape":"JsonKeyToVariableMap",
+          "documentation":"<p>A map of JSON keys in response from SageMaker to the Amazon Fraud Detector variables. </p>"
+        },
+        "csvIndexToVariableMap":{
+          "shape":"CsvIndexToVariableMap",
+          "documentation":"<p>A map of CSV index values in the SageMaker response to the Amazon Fraud Detector variables. </p>"
+        }
+      },
+      "documentation":"<p>Provides the model output configuration.</p>"
+    },
+    "ModelOutputDataFormat":{
+      "type":"string",
+      "enum":[
+        "TEXT_CSV",
+        "APPLICATION_JSONLINES"
+      ]
+    },
+    "ModelPredictionMap":{
+      "type":"map",
+      "key":{"shape":"string"},
+      "value":{"shape":"float"}
+    },
+    "ModelScores":{
+      "type":"structure",
+      "members":{
+        "modelVersion":{
+          "shape":"ModelVersion",
+          "documentation":"<p>The model version.</p>"
+        },
+        "scores":{
+          "shape":"ModelPredictionMap",
+          "documentation":"<p>The model's fraud prediction scores.</p>"
+        }
+      },
+      "documentation":"<p>The fraud prediction scores.</p>"
+    },
+    "ModelSource":{
+      "type":"string",
+      "enum":["SAGEMAKER"]
+    },
+    "ModelTypeEnum":{
+      "type":"string",
+      "enum":["ONLINE_FRAUD_INSIGHTS"]
+    },
+    "ModelVariable":{
+      "type":"structure",
+      "required":["name"],
+      "members":{
+        "name":{
+          "shape":"string",
+          "documentation":"<p>The model variable's name.&gt;</p>"
+        },
+        "index":{
+          "shape":"ModelVariableIndex",
+          "documentation":"<p>The model variable's index.&gt;</p>"
+        }
+      },
+      "documentation":"<p>The model variable.&gt;</p>"
+    },
+    "ModelVariableIndex":{"type":"integer"},
+    "ModelVariablesList":{
+      "type":"list",
+      "member":{"shape":"ModelVariable"}
+    },
+    "ModelVersion":{
+      "type":"structure",
+      "required":[
+        "modelId",
+        "modelType",
+        "modelVersionNumber"
+      ],
+      "members":{
+        "modelId":{
+          "shape":"identifier",
+          "documentation":"<p>The parent model ID.</p>"
+        },
+        "modelType":{
+          "shape":"ModelTypeEnum",
+          "documentation":"<p>The model type.</p>"
+        },
+        "modelVersionNumber":{
+          "shape":"nonEmptyString",
+          "documentation":"<p>The model version.</p>"
+        }
+      },
+      "documentation":"<p>The model version.</p>"
+    },
+    "ModelVersionDetail":{
+      "type":"structure",
+      "members":{
+        "modelId":{
+          "shape":"identifier",
+          "documentation":"<p>The model ID.</p>"
+        },
+        "modelType":{
+          "shape":"ModelTypeEnum",
+          "documentation":"<p>The model type.</p>"
+        },
+        "modelVersionNumber":{
+          "shape":"nonEmptyString",
+          "documentation":"<p>The model version.</p>"
+        },
+        "description":{
+          "shape":"description",
+          "documentation":"<p>The model description.</p>"
+        },
+        "status":{
+          "shape":"string",
+          "documentation":"<p>The model status.</p>"
+        },
+        "trainingDataSource":{
+          "shape":"TrainingDataSource",
+          "documentation":"<p>The model training data source.</p>"
+        },
+        "modelVariables":{
+          "shape":"ModelVariablesList",
+          "documentation":"<p>The model variables.</p>"
+        },
+        "labelSchema":{
+          "shape":"LabelSchema",
+          "documentation":"<p>The model label schema.</p>"
+        },
+        "validationMetrics":{
+          "shape":"MetricsMap",
+          "documentation":"<p>The model validation metrics.</p>"
+        },
+        "trainingMetrics":{
+          "shape":"MetricsMap",
+          "documentation":"<p>The model training metrics.</p>"
+        },
+        "lastUpdatedTime":{
+          "shape":"time",
+          "documentation":"<p>The timestamp when the model was last updated.</p>"
+        },
+        "createdTime":{
+          "shape":"time",
+          "documentation":"<p>The timestamp when the model was created.</p>"
+        }
+      },
+      "documentation":"<p>Provides the model version details. </p>"
+    },
+    "ModelVersionDetailList":{
+      "type":"list",
+      "member":{"shape":"ModelVersionDetail"}
+    },
+    "ModelVersionStatus":{
+      "type":"string",
+      "enum":[
+        "TRAINING_IN_PROGRESS",
+        "TRAINING_COMPLETE",
+        "ACTIVATE_REQUESTED",
+        "ACTIVATE_IN_PROGRESS",
+        "ACTIVE",
+        "INACTIVATE_IN_PROGRESS",
+        "INACTIVE",
+        "ERROR"
+      ]
+    },
+    "NameList":{
+      "type":"list",
+      "member":{"shape":"string"},
+      "max":100,
+      "min":1
+    },
+    "NonEmptyListOfStrings":{
+      "type":"list",
+      "member":{"shape":"string"},
+      "min":1
+    },
+    "Outcome":{
+      "type":"structure",
+      "members":{
+        "name":{
+          "shape":"identifier",
+          "documentation":"<p>The outcome name.</p>"
+        },
+        "description":{
+          "shape":"description",
+          "documentation":"<p>The outcome description.</p>"
+        },
+        "lastUpdatedTime":{
+          "shape":"time",
+          "documentation":"<p>The timestamp when the outcome was last updated.</p>"
+        },
+        "createdTime":{
+          "shape":"time",
+          "documentation":"<p>The timestamp when the outcome was created.</p>"
+        }
+      },
+      "documentation":"<p>The outcome.</p>"
+    },
+    "OutcomeList":{
+      "type":"list",
+      "member":{"shape":"Outcome"}
+    },
+    "OutcomesMaxResults":{
+      "type":"integer",
+      "box":true,
+      "max":100,
+      "min":50
+    },
+    "PutDetectorRequest":{
+      "type":"structure",
+      "required":["detectorId"],
+      "members":{
+        "detectorId":{
+          "shape":"identifier",
+          "documentation":"<p>The detector ID. </p>"
+        },
+        "description":{
+          "shape":"description",
+          "documentation":"<p>The description of the detector.</p>"
+        }
+      }
+    },
+    "PutDetectorResult":{
+      "type":"structure",
+      "members":{
+      }
+    },
+    "PutExternalModelRequest":{
+      "type":"structure",
+      "required":[
+        "modelEndpoint",
+        "modelSource",
+        "role",
+        "inputConfiguration",
+        "outputConfiguration",
+        "modelEndpointStatus"
+      ],
+      "members":{
+        "modelEndpoint":{
+          "shape":"string",
+          "documentation":"<p>The model endpoints name.</p>"
+        },
+        "modelSource":{
+          "shape":"ModelSource",
+          "documentation":"<p>The source of the model.</p>"
+        },
+        "role":{
+          "shape":"Role",
+          "documentation":"<p>The IAM role used to invoke the model endpoint.</p>"
+        },
+        "inputConfiguration":{
+          "shape":"ModelInputConfiguration",
+          "documentation":"<p>The model endpoint input configuration.</p>"
+        },
+        "outputConfiguration":{
+          "shape":"ModelOutputConfiguration",
+          "documentation":"<p>The model endpoint output configuration.</p>"
+        },
+        "modelEndpointStatus":{
+          "shape":"ModelEndpointStatus",
+          "documentation":"<p>The model endpoint’s status in Amazon Fraud Detector.</p>"
+        }
+      }
+    },
+    "PutExternalModelResult":{
+      "type":"structure",
+      "members":{
+      }
+    },
+    "PutModelRequest":{
+      "type":"structure",
+      "required":[
+        "modelId",
+        "modelType",
+        "trainingDataSource",
+        "modelVariables",
+        "labelSchema"
+      ],
+      "members":{
+        "modelId":{
+          "shape":"identifier",
+          "documentation":"<p>The model ID.</p>"
+        },
+        "modelType":{
+          "shape":"ModelTypeEnum",
+          "documentation":"<p>The model type. </p>"
+        },
+        "description":{
+          "shape":"description",
+          "documentation":"<p>The model description. </p>"
+        },
+        "trainingDataSource":{
+          "shape":"TrainingDataSource",
+          "documentation":"<p>The training data source location in Amazon S3. </p>"
+        },
+        "modelVariables":{
+          "shape":"ModelVariablesList",
+          "documentation":"<p>The model input variables.</p>"
+        },
+        "labelSchema":{
+          "shape":"LabelSchema",
+          "documentation":"<p>The label schema.</p>"
+        }
+      }
+    },
+    "PutModelResult":{
+      "type":"structure",
+      "members":{
+      }
+    },
+    "PutOutcomeRequest":{
+      "type":"structure",
+      "required":["name"],
+      "members":{
+        "name":{
+          "shape":"identifier",
+          "documentation":"<p>The name of the outcome.</p>"
+        },
+        "description":{
+          "shape":"description",
+          "documentation":"<p>The outcome description.</p>"
+        }
+      }
+    },
+    "PutOutcomeResult":{
+      "type":"structure",
+      "members":{
+      }
+    },
+    "ResourceNotFoundException":{
+      "type":"structure",
+      "required":["message"],
+      "members":{
+        "message":{"shape":"string"}
+      },
+      "documentation":"<p>An exception indicating the specified resource was not found.</p>",
+      "exception":true
+    },
+    "Role":{
+      "type":"structure",
+      "required":[
+        "arn",
+        "name"
+      ],
+      "members":{
+        "arn":{
+          "shape":"string",
+          "documentation":"<p>The role ARN.</p>"
+        },
+        "name":{
+          "shape":"string",
+          "documentation":"<p>The role name.</p>"
+        }
+      },
+      "documentation":"<p>The role used to invoke external model endpoints.</p>"
+    },
+    "Rule":{
+      "type":"structure",
+      "required":[
+        "detectorId",
+        "ruleId",
+        "ruleVersion"
+      ],
+      "members":{
+        "detectorId":{
+          "shape":"identifier",
+          "documentation":"<p>The detector for which the rule is associated.</p>"
+        },
+        "ruleId":{
+          "shape":"identifier",
+          "documentation":"<p>The rule ID.</p>"
+        },
+        "ruleVersion":{
+          "shape":"nonEmptyString",
+          "documentation":"<p>The rule version.</p>"
+        }
+      },
+      "documentation":"<p>A rule.</p>"
+    },
+    "RuleDetail":{
+      "type":"structure",
+      "members":{
+        "ruleId":{
+          "shape":"identifier",
+          "documentation":"<p>The rule ID.</p>"
+        },
+        "description":{
+          "shape":"description",
+          "documentation":"<p>The rule description.</p>"
+        },
+        "detectorId":{
+          "shape":"identifier",
+          "documentation":"<p>The detector for which the rule is associated.</p>"
+        },
+        "ruleVersion":{
+          "shape":"nonEmptyString",
+          "documentation":"<p>The rule version.</p>"
+        },
+        "expression":{
+          "shape":"ruleExpression",
+          "documentation":"<p>The rule expression.</p>"
+        },
+        "language":{
+          "shape":"Language",
+          "documentation":"<p>The rule language.</p>"
+        },
+        "outcomes":{
+          "shape":"NonEmptyListOfStrings",
+          "documentation":"<p>The rule outcomes.</p>"
+        },
+        "lastUpdatedTime":{
+          "shape":"time",
+          "documentation":"<p>Timestamp of the last time the rule was updated.</p>"
+        },
+        "createdTime":{
+          "shape":"time",
+          "documentation":"<p>The timestamp of when the rule was created.</p>"
+        }
+      },
+      "documentation":"<p>The details of the rule.</p>"
+    },
+    "RuleDetailList":{
+      "type":"list",
+      "member":{"shape":"RuleDetail"}
+    },
+    "RuleList":{
+      "type":"list",
+      "member":{"shape":"Rule"}
+    },
+    "RulesMaxResults":{
+      "type":"integer",
+      "box":true,
+      "max":100,
+      "min":50
+    },
+    "ThrottlingException":{
+      "type":"structure",
+      "required":["message"],
+      "members":{
+        "message":{"shape":"string"}
+      },
+      "documentation":"<p>An exception indicating a throttling error.</p>",
+      "exception":true
+    },
+    "TrainingDataSource":{
+      "type":"structure",
+      "required":[
+        "dataLocation",
+        "dataAccessRoleArn"
+      ],
+      "members":{
+        "dataLocation":{
+          "shape":"s3BucketLocation",
+          "documentation":"<p>The data location of the training data source.</p>"
+        },
+        "dataAccessRoleArn":{
+          "shape":"iamRoleArn",
+          "documentation":"<p>The data access role ARN for the training data source.</p>"
+        }
+      },
+      "documentation":"<p>The training data source.</p>"
+    },
+    "UpdateDetectorVersionMetadataRequest":{
+      "type":"structure",
+      "required":[
+        "detectorId",
+        "detectorVersionId",
+        "description"
+      ],
+      "members":{
+        "detectorId":{
+          "shape":"identifier",
+          "documentation":"<p>The detector ID.</p>"
+        },
+        "detectorVersionId":{
+          "shape":"nonEmptyString",
+          "documentation":"<p>The detector version ID. </p>"
+        },
+        "description":{
+          "shape":"description",
+          "documentation":"<p>The description.</p>"
+        }
+      }
+    },
+    "UpdateDetectorVersionMetadataResult":{
+      "type":"structure",
+      "members":{
+      }
+    },
+    "UpdateDetectorVersionRequest":{
+      "type":"structure",
+      "required":[
+        "detectorId",
+        "detectorVersionId",
+        "externalModelEndpoints",
+        "rules"
+      ],
+      "members":{
+        "detectorId":{
+          "shape":"identifier",
+          "documentation":"<p>The parent detector ID for the detector version you want to update.</p>"
+        },
+        "detectorVersionId":{
+          "shape":"nonEmptyString",
+          "documentation":"<p>The detector version ID. </p>"
+        },
+        "externalModelEndpoints":{
+          "shape":"ListOfStrings",
+          "documentation":"<p>The Amazon SageMaker model endpoints to include in the detector version.</p>"
+        },
+        "rules":{
+          "shape":"RuleList",
+          "documentation":"<p>The rules to include in the detector version.</p>"
+        },
+        "description":{
+          "shape":"description",
+          "documentation":"<p>The detector version description. </p>"
+        },
+        "modelVersions":{
+          "shape":"ListOfModelVersions",
+          "documentation":"<p>The model versions to include in the detector version.</p>"
+        }
+      }
+    },
+    "UpdateDetectorVersionResult":{
+      "type":"structure",
+      "members":{
+      }
+    },
+    "UpdateDetectorVersionStatusRequest":{
+      "type":"structure",
+      "required":[
+        "detectorId",
+        "detectorVersionId",
+        "status"
+      ],
+      "members":{
+        "detectorId":{
+          "shape":"identifier",
+          "documentation":"<p>The detector ID. </p>"
+        },
+        "detectorVersionId":{
+          "shape":"nonEmptyString",
+          "documentation":"<p>The detector version ID. </p>"
+        },
+        "status":{
+          "shape":"DetectorVersionStatus",
+          "documentation":"<p>The new status.</p>"
+        }
+      }
+    },
+    "UpdateDetectorVersionStatusResult":{
+      "type":"structure",
+      "members":{
+      }
+    },
+    "UpdateModelVersionRequest":{
+      "type":"structure",
+      "required":[
+        "modelId",
+        "modelType",
+        "modelVersionNumber",
+        "description",
+        "status"
+      ],
+      "members":{
+        "modelId":{
+          "shape":"identifier",
+          "documentation":"<p>The model ID.</p>"
+        },
+        "modelType":{
+          "shape":"ModelTypeEnum",
+          "documentation":"<p>The model type.</p>"
+        },
+        "modelVersionNumber":{
+          "shape":"nonEmptyString",
+          "documentation":"<p>The model version.</p>"
+        },
+        "description":{
+          "shape":"description",
+          "documentation":"<p>The model description.</p>"
+        },
+        "status":{
+          "shape":"ModelVersionStatus",
+          "documentation":"<p>The new model status.</p>"
+        }
+      }
+    },
+    "UpdateModelVersionResult":{
+      "type":"structure",
+      "members":{
+      }
+    },
+    "UpdateRuleMetadataRequest":{
+      "type":"structure",
+      "required":[
+        "rule",
+        "description"
+      ],
+      "members":{
+        "rule":{
+          "shape":"Rule",
+          "documentation":"<p>The rule to update.</p>"
+        },
+        "description":{
+          "shape":"description",
+          "documentation":"<p>The rule description.</p>"
+        }
+      }
+    },
+    "UpdateRuleMetadataResult":{
+      "type":"structure",
+      "members":{
+      }
+    },
+    "UpdateRuleVersionRequest":{
+      "type":"structure",
+      "required":[
+        "rule",
+        "expression",
+        "language",
+        "outcomes"
+      ],
+      "members":{
+        "rule":{
+          "shape":"Rule",
+          "documentation":"<p>The rule to update.</p>"
+        },
+        "description":{
+          "shape":"description",
+          "documentation":"<p>The description.</p>"
+        },
+        "expression":{
+          "shape":"ruleExpression",
+          "documentation":"<p>The rule expression.</p>"
+        },
+        "language":{
+          "shape":"Language",
+          "documentation":"<p>The language.</p>"
+        },
+        "outcomes":{
+          "shape":"NonEmptyListOfStrings",
+          "documentation":"<p>The outcomes.</p>"
+        }
+      }
+    },
+    "UpdateRuleVersionResult":{
+      "type":"structure",
+      "members":{
+        "rule":{
+          "shape":"Rule",
+          "documentation":"<p>The new rule version that was created.</p>"
+        }
+      }
+    },
+    "UpdateVariableRequest":{
+      "type":"structure",
+      "required":["name"],
+      "members":{
+        "name":{
+          "shape":"string",
+          "documentation":"<p>The name of the variable.</p>"
+        },
+        "defaultValue":{
+          "shape":"string",
+          "documentation":"<p>The new default value of the variable.</p>"
+        },
+        "description":{
+          "shape":"string",
+          "documentation":"<p>The new description.</p>"
+        },
+        "variableType":{
+          "shape":"string",
+          "documentation":"<p>The variable type.</p>"
+        }
+      }
+    },
+    "UpdateVariableResult":{
+      "type":"structure",
+      "members":{
+      }
+    },
+    "ValidationException":{
+      "type":"structure",
+      "required":["message"],
+      "members":{
+        "message":{"shape":"string"}
+      },
+      "documentation":"<p>An exception indicating a specified value is not allowed.</p>",
+      "exception":true
+    },
+    "Variable":{
+      "type":"structure",
+      "members":{
+        "name":{
+          "shape":"string",
+          "documentation":"<p>The name of the variable.</p>"
+        },
+        "dataType":{
+          "shape":"DataType",
+          "documentation":"<p>The data type of the variable.</p>"
+        },
+        "dataSource":{
+          "shape":"DataSource",
+          "documentation":"<p>The data source of the variable.</p>"
+        },
+        "defaultValue":{
+          "shape":"string",
+          "documentation":"<p>The default value of the variable.</p>"
+        },
+        "description":{
+          "shape":"string",
+          "documentation":"<p>The description of the variable. </p>"
+        },
+        "variableType":{
+          "shape":"string",
+          "documentation":"<p>The variable type of the variable.</p>"
+        },
+        "lastUpdatedTime":{
+          "shape":"time",
+          "documentation":"<p>The time when variable was last updated.</p>"
+        },
+        "createdTime":{
+          "shape":"time",
+          "documentation":"<p>The time when the variable was created.</p>"
+        }
+      },
+      "documentation":"<p>The variable.</p>"
+    },
+    "VariableEntry":{
+      "type":"structure",
+      "members":{
+        "name":{
+          "shape":"string",
+          "documentation":"<p>The name of the variable entry.</p>"
+        },
+        "dataType":{
+          "shape":"string",
+          "documentation":"<p>The data type of the variable entry.</p>"
+        },
+        "dataSource":{
+          "shape":"string",
+          "documentation":"<p>The data source of the variable entry.</p>"
+        },
+        "defaultValue":{
+          "shape":"string",
+          "documentation":"<p>The default value of the variable entry.</p>"
+        },
+        "description":{
+          "shape":"string",
+          "documentation":"<p>The description of the variable entry.</p>"
+        },
+        "variableType":{
+          "shape":"string",
+          "documentation":"<p>The type of the variable entry.</p>"
+        }
+      },
+      "documentation":"<p>The variable entry in a list.</p>"
+    },
+    "VariableEntryList":{
+      "type":"list",
+      "member":{"shape":"VariableEntry"},
+      "max":25,
+      "min":1
+    },
+    "VariableList":{
+      "type":"list",
+      "member":{"shape":"Variable"}
+    },
+    "VariablesMaxResults":{
+      "type":"integer",
+      "box":true,
+      "max":100,
+      "min":50
+    },
+    "attributeKey":{
+      "type":"string",
+      "max":64,
+      "min":1
+    },
+    "attributeValue":{
+      "type":"string",
+      "max":256,
+      "min":1,
+      "sensitive":true
+    },
+    "blob":{"type":"blob"},
+    "contentType":{
+      "type":"string",
+      "max":1024,
+      "min":1
+    },
+    "description":{
+      "type":"string",
+      "max":128,
+      "min":1
+    },
+    "float":{"type":"float"},
+    "iamRoleArn":{
+      "type":"string",
+      "max":256,
+      "min":1,
+      "pattern":"^arn\\:aws\\:iam\\:\\:[0-9]{12}\\:role\\/[^\\s]{2,64}$"
+    },
+    "identifier":{
+      "type":"string",
+      "max":64,
+      "min":1,
+      "pattern":"^[0-9a-z_-]+$"
+    },
+    "integer":{"type":"integer"},
+    "nonEmptyString":{
+      "type":"string",
+      "min":1
+    },
+    "ruleExpression":{
+      "type":"string",
+      "max":4096,
+      "min":1
+    },
+    "s3BucketLocation":{
+      "type":"string",
+      "max":512,
+      "min":1,
+      "pattern":"^s3:\\/\\/[^\\s]+$"
+    },
+    "string":{"type":"string"},
+    "time":{"type":"string"}
+  },
+  "documentation":"<p>This is the Amazon Fraud Detector API Reference. This guide is for developers who need detailed information about Amazon Fraud Detector API actions, data types, and errors. For more information about Amazon Fraud Detector features, see the <a href=\"https://docs.aws.amazon.com/frauddetector/latest/ug/\">Amazon Fraud Detector User Guide</a>.</p>"
+}
diff --git a/services/fsx/pom.xml b/services/fsx/pom.xml
index 19fdac722eda..35d5c5767b33 100644
--- a/services/fsx/pom.xml
+++ b/services/fsx/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>fsx</artifactId>
     <name>AWS Java SDK :: Services :: FSx</name>
diff --git a/services/fsx/src/main/resources/codegen-resources/paginators-1.json b/services/fsx/src/main/resources/codegen-resources/paginators-1.json
index 912e2f2de20c..43df3a5f3a7a 100644
--- a/services/fsx/src/main/resources/codegen-resources/paginators-1.json
+++ b/services/fsx/src/main/resources/codegen-resources/paginators-1.json
@@ -5,6 +5,11 @@
       "output_token": "NextToken",
       "limit_key": "MaxResults"
     },
+    "DescribeDataRepositoryTasks": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "MaxResults"
+    },
     "DescribeFileSystems": {
       "input_token": "NextToken",
       "output_token": "NextToken",
diff --git a/services/fsx/src/main/resources/codegen-resources/service-2.json b/services/fsx/src/main/resources/codegen-resources/service-2.json
index 79834835d430..ced5ee83164f 100644
--- a/services/fsx/src/main/resources/codegen-resources/service-2.json
+++ b/services/fsx/src/main/resources/codegen-resources/service-2.json
@@ -8,10 +8,29 @@
     "serviceFullName":"Amazon FSx",
     "serviceId":"FSx",
     "signatureVersion":"v4",
+    "signingName":"fsx",
     "targetPrefix":"AWSSimbaAPIService_v20180301",
     "uid":"fsx-2018-03-01"
   },
   "operations":{
+    "CancelDataRepositoryTask":{
+      "name":"CancelDataRepositoryTask",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"CancelDataRepositoryTaskRequest"},
+      "output":{"shape":"CancelDataRepositoryTaskResponse"},
+      "errors":[
+        {"shape":"BadRequest"},
+        {"shape":"UnsupportedOperation"},
+        {"shape":"DataRepositoryTaskNotFound"},
+        {"shape":"DataRepositoryTaskEnded"},
+        {"shape":"InternalServerError"}
+      ],
+      "documentation":"<p>Cancels an existing Amazon FSx for Lustre data repository task if that task is in either the <code>PENDING</code> or <code>EXECUTING</code> state. When you cancel a task, Amazon FSx does the following.</p> <ul> <li> <p>Any files that FSx has already exported are not reverted.</p> </li> <li> <p>FSx continues to export any files that are \"in-flight\" when the cancel operation is received.</p> </li> <li> <p>FSx does not export any files that have not yet been exported.</p> </li> </ul>",
+      "idempotent":true
+    },
     "CreateBackup":{
       "name":"CreateBackup",
       "http":{
@@ -32,6 +51,26 @@
       "documentation":"<p>Creates a backup of an existing Amazon FSx for Windows File Server file system. Creating regular backups for your file system is a best practice that complements the replication that Amazon FSx for Windows File Server performs for your file system. It also enables you to restore from user modification of data.</p> <p>If a backup with the specified client request token exists, and the parameters match, this operation returns the description of the existing backup. If a backup specified client request token exists, and the parameters don't match, this operation returns <code>IncompatibleParameterError</code>. If a backup with the specified client request token doesn't exist, <code>CreateBackup</code> does the following: </p> <ul> <li> <p>Creates a new Amazon FSx backup with an assigned ID, and an initial lifecycle state of <code>CREATING</code>.</p> </li> <li> <p>Returns the description of the backup.</p> </li> </ul> <p>By using the idempotent operation, you can retry a <code>CreateBackup</code> operation without the risk of creating an extra backup. This approach can be useful when an initial call fails in a way that makes it unclear whether a backup was created. If you use the same client request token and the initial call created a backup, the operation returns a successful result because all the parameters are the same.</p> <p>The <code>CreateFileSystem</code> operation returns while the backup's lifecycle state is still <code>CREATING</code>. You can check the file system creation status by calling the <a>DescribeBackups</a> operation, which returns the backup state along with other information.</p> <note> <p/> </note>",
       "idempotent":true
     },
+    "CreateDataRepositoryTask":{
+      "name":"CreateDataRepositoryTask",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"CreateDataRepositoryTaskRequest"},
+      "output":{"shape":"CreateDataRepositoryTaskResponse"},
+      "errors":[
+        {"shape":"BadRequest"},
+        {"shape":"UnsupportedOperation"},
+        {"shape":"FileSystemNotFound"},
+        {"shape":"IncompatibleParameterError"},
+        {"shape":"ServiceLimitExceeded"},
+        {"shape":"InternalServerError"},
+        {"shape":"DataRepositoryTaskExecuting"}
+      ],
+      "documentation":"<p>Creates an Amazon FSx for Lustre data repository task. You use data repository tasks to perform bulk operations between your Amazon FSx file system and its linked data repository. An example of a data repository task is exporting any data and metadata changes, including POSIX metadata, to files, directories, and symbolic links (symlinks) from your FSx file system to its linked data repository. A <code>CreateDataRepositoryTask</code> operation will fail if a data repository is not linked to the FSx file system. To learn more about data repository tasks, see <a href=\"https://docs.aws.amazon.com/fsx/latest/LustreGuide/data-repository-tasks.html\">Using Data Repository Tasks</a>. To learn more about linking a data repository to your file system, see <a href=\"https://docs.aws.amazon.com/fsx/latest/LustreGuide/export-data-repository.html#export-prefix\">Setting the Export Prefix</a>.</p>",
+      "idempotent":true
+    },
     "CreateFileSystem":{
       "name":"CreateFileSystem",
       "http":{
@@ -47,6 +86,7 @@
         {"shape":"InvalidImportPath"},
         {"shape":"InvalidExportPath"},
         {"shape":"InvalidNetworkSettings"},
+        {"shape":"InvalidPerUnitStorageThroughput"},
         {"shape":"ServiceLimitExceeded"},
         {"shape":"InternalServerError"},
         {"shape":"MissingFileSystemConfiguration"}
@@ -107,7 +147,7 @@
         {"shape":"ServiceLimitExceeded"},
         {"shape":"InternalServerError"}
       ],
-      "documentation":"<p>Deletes a file system, deleting its contents. After deletion, the file system no longer exists, and its data is gone. Any existing automatic backups will also be deleted.</p> <p>By default, when you delete an Amazon FSx for Windows File Server file system, a final backup is created upon deletion. This final backup is not subject to the file system's retention policy, and must be manually deleted.</p> <p>The <code>DeleteFileSystem</code> action returns while the file system has the <code>DELETING</code> status. You can check the file system deletion status by calling the <a>DescribeFileSystems</a> action, which returns a list of file systems in your account. If you pass the file system ID for a deleted file system, the <a>DescribeFileSystems</a> returns a <code>FileSystemNotFound</code> error.</p> <important> <p>The data in a deleted file system is also deleted and can't be recovered by any means.</p> </important>",
+      "documentation":"<p>Deletes a file system, deleting its contents. After deletion, the file system no longer exists, and its data is gone. Any existing automatic backups will also be deleted.</p> <p>By default, when you delete an Amazon FSx for Windows File Server file system, a final backup is created upon deletion. This final backup is not subject to the file system's retention policy, and must be manually deleted.</p> <p>The <code>DeleteFileSystem</code> action returns while the file system has the <code>DELETING</code> status. You can check the file system deletion status by calling the <a>DescribeFileSystems</a> action, which returns a list of file systems in your account. If you pass the file system ID for a deleted file system, the <a>DescribeFileSystems</a> returns a <code>FileSystemNotFound</code> error.</p> <note> <p>Deleting an Amazon FSx for Lustre file system will fail with a 400 BadRequest if a data repository task is in a <code>PENDING</code> or <code>EXECUTING</code> state.</p> </note> <important> <p>The data in a deleted file system is also deleted and can't be recovered by any means.</p> </important>",
       "idempotent":true
     },
     "DescribeBackups":{
@@ -126,6 +166,22 @@
       ],
       "documentation":"<p>Returns the description of specific Amazon FSx for Windows File Server backups, if a <code>BackupIds</code> value is provided for that backup. Otherwise, it returns all backups owned by your AWS account in the AWS Region of the endpoint that you're calling.</p> <p>When retrieving all backups, you can optionally specify the <code>MaxResults</code> parameter to limit the number of backups in a response. If more backups remain, Amazon FSx returns a <code>NextToken</code> value in the response. In this case, send a later request with the <code>NextToken</code> request parameter set to the value of <code>NextToken</code> from the last response.</p> <p>This action is used in an iterative process to retrieve a list of your backups. <code>DescribeBackups</code> is called first without a <code>NextToken</code>value. Then the action continues to be called with the <code>NextToken</code> parameter set to the value of the last <code>NextToken</code> value until a response has no <code>NextToken</code>.</p> <p>When using this action, keep the following in mind:</p> <ul> <li> <p>The implementation might return fewer than <code>MaxResults</code> file system descriptions while still including a <code>NextToken</code> value.</p> </li> <li> <p>The order of backups returned in the response of one <code>DescribeBackups</code> call and the order of backups returned across the responses of a multi-call iteration is unspecified.</p> </li> </ul>"
     },
+    "DescribeDataRepositoryTasks":{
+      "name":"DescribeDataRepositoryTasks",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DescribeDataRepositoryTasksRequest"},
+      "output":{"shape":"DescribeDataRepositoryTasksResponse"},
+      "errors":[
+        {"shape":"BadRequest"},
+        {"shape":"FileSystemNotFound"},
+        {"shape":"DataRepositoryTaskNotFound"},
+        {"shape":"InternalServerError"}
+      ],
+      "documentation":"<p>Returns the description of specific Amazon FSx for Lustre data repository tasks, if one or more <code>TaskIds</code> values are provided in the request, or if filters are used in the request. You can use filters to narrow the response to include just tasks for specific file systems, or tasks in a specific lifecycle state. Otherwise, it returns all data repository tasks owned by your AWS account in the AWS Region of the endpoint that you're calling.</p> <p>When retrieving all tasks, you can paginate the response by using the optional <code>MaxResults</code> parameter to limit the number of tasks returned in a response. If more tasks remain, Amazon FSx returns a <code>NextToken</code> value in the response. In this case, send a later request with the <code>NextToken</code> request parameter set to the value of <code>NextToken</code> from the last response.</p>"
+    },
     "DescribeFileSystems":{
       "name":"DescribeFileSystems",
       "http":{
@@ -262,11 +318,17 @@
         "INVALID_DOMAIN_STAGE"
       ]
     },
-    "ActiveDirectoryFullyQualifiedName":{"type":"string"},
+    "ActiveDirectoryFullyQualifiedName":{
+      "type":"string",
+      "max":255,
+      "min":1,
+      "pattern":"^.{1,255}$"
+    },
     "ArchivePath":{
       "type":"string",
       "max":900,
-      "min":3
+      "min":3,
+      "pattern":"^.{3,900}$"
     },
     "AutomaticBackupRetentionDays":{
       "type":"integer",
@@ -307,7 +369,7 @@
         },
         "KmsKeyId":{
           "shape":"KmsKeyId",
-          "documentation":"<p>The ID of the AWS Key Management Service (AWS KMS) key used to encrypt this backup's data.</p>"
+          "documentation":"<p>The ID of the AWS Key Management Service (AWS KMS) key used to encrypt this backup of the Amazon FSx for Windows file system's data at rest. Amazon FSx for Lustre does not support KMS encryption.</p>"
         },
         "ResourceARN":{
           "shape":"ResourceARN",
@@ -411,12 +473,59 @@
       "documentation":"<p>A generic error indicating a failure with a client request.</p>",
       "exception":true
     },
+    "CancelDataRepositoryTaskRequest":{
+      "type":"structure",
+      "required":["TaskId"],
+      "members":{
+        "TaskId":{
+          "shape":"TaskId",
+          "documentation":"<p>Specifies the data repository task to cancel.</p>"
+        }
+      },
+      "documentation":"<p>Cancels a data repository task.</p>"
+    },
+    "CancelDataRepositoryTaskResponse":{
+      "type":"structure",
+      "members":{
+        "Lifecycle":{
+          "shape":"DataRepositoryTaskLifecycle",
+          "documentation":"<p>The lifecycle status of the data repository task, as follows:</p> <ul> <li> <p> <code>PENDING</code> - Amazon FSx has not started the task.</p> </li> <li> <p> <code>EXECUTING</code> - Amazon FSx is processing the task.</p> </li> <li> <p> <code>FAILED</code> - Amazon FSx was not able to complete the task. For example, there may be files the task failed to process. The <a>DataRepositoryTaskFailureDetails</a> property provides more information about task failures.</p> </li> <li> <p> <code>SUCCEEDED</code> - FSx completed the task successfully.</p> </li> <li> <p> <code>CANCELED</code> - Amazon FSx canceled the task and it did not complete.</p> </li> <li> <p> <code>CANCELING</code> - FSx is in process of canceling the task.</p> </li> </ul>"
+        },
+        "TaskId":{
+          "shape":"TaskId",
+          "documentation":"<p>The ID of the task being canceled.</p>"
+        }
+      }
+    },
     "ClientRequestToken":{
       "type":"string",
       "documentation":"<p>(Optional) An idempotency token for resource creation, in a string of up to 64 ASCII characters. This token is automatically filled on your behalf when you use the AWS Command Line Interface (AWS CLI) or an AWS SDK.</p>",
-      "max":255,
+      "max":63,
       "min":1,
-      "pattern":"[A-za-z0-9_.-]{0,255}$"
+      "pattern":"[A-za-z0-9_.-]{0,63}$"
+    },
+    "CompletionReport":{
+      "type":"structure",
+      "required":["Enabled"],
+      "members":{
+        "Enabled":{
+          "shape":"Flag",
+          "documentation":"<p>Set <code>Enabled</code> to <code>True</code> to generate a <code>CompletionReport</code> when the task completes. If set to <code>true</code>, then you need to provide a report <code>Scope</code>, <code>Path</code>, and <code>Format</code>. Set <code>Enabled</code> to <code>False</code> if you do not want a <code>CompletionReport</code> generated when the task completes.</p>"
+        },
+        "Path":{
+          "shape":"ArchivePath",
+          "documentation":"<p>Required if <code>Enabled</code> is set to <code>true</code>. Specifies the location of the report on the file system's linked S3 data repository. An absolute path that defines where the completion report will be stored in the destination location. The <code>Path</code> you provide must be located within the file system’s ExportPath. An example <code>Path</code> value is \"s3://myBucket/myExportPath/optionalPrefix\". The report provides the following information for each file in the report: FilePath, FileStatus, and ErrorCode. To learn more about a file system's <code>ExportPath</code>, see . </p>"
+        },
+        "Format":{
+          "shape":"ReportFormat",
+          "documentation":"<p>Required if <code>Enabled</code> is set to <code>true</code>. Specifies the format of the <code>CompletionReport</code>. <code>REPORT_CSV_20191124</code> is the only format currently supported. When <code>Format</code> is set to <code>REPORT_CSV_20191124</code>, the <code>CompletionReport</code> is provided in CSV format, and is delivered to <code>{path}/task-{id}/failures.csv</code>. </p>"
+        },
+        "Scope":{
+          "shape":"ReportScope",
+          "documentation":"<p>Required if <code>Enabled</code> is set to <code>true</code>. Specifies the scope of the <code>CompletionReport</code>; <code>FAILED_FILES_ONLY</code> is the only scope currently supported. When <code>Scope</code> is set to <code>FAILED_FILES_ONLY</code>, the <code>CompletionReport</code> only contains information about files that the data repository task failed to process.</p>"
+        }
+      },
+      "documentation":"<p>Provides a report detailing the data repository task results of the files processed that match the criteria specified in the report <code>Scope</code> parameter. FSx delivers the report to the file system's linked data repository in Amazon S3, using the path specified in the report <code>Path</code> parameter. You can specify whether or not a report gets generated for a task using the <code>Enabled</code> parameter.</p>"
     },
     "CreateBackupRequest":{
       "type":"structure",
@@ -448,6 +557,43 @@
       },
       "documentation":"<p>The response object for the <code>CreateBackup</code> operation.</p>"
     },
+    "CreateDataRepositoryTaskRequest":{
+      "type":"structure",
+      "required":[
+        "Type",
+        "FileSystemId",
+        "Report"
+      ],
+      "members":{
+        "Type":{
+          "shape":"DataRepositoryTaskType",
+          "documentation":"<p>Specifies the type of data repository task to create.</p>"
+        },
+        "Paths":{
+          "shape":"DataRepositoryTaskPaths",
+          "documentation":"<p>(Optional) The path or paths on the Amazon FSx file system to use when the data repository task is processed. The default path is the file system root directory. The paths you provide need to be relative to the mount point of the file system. If the mount point is <code>/mnt/fsx</code> and <code>/mnt/fsx/path1</code> is a directory or file on the file system you want to export, then the path to provide is <code>path1</code>. If a path that you provide isn't valid, the task fails.</p>"
+        },
+        "FileSystemId":{"shape":"FileSystemId"},
+        "Report":{
+          "shape":"CompletionReport",
+          "documentation":"<p>Defines whether or not Amazon FSx provides a CompletionReport once the task has completed. A CompletionReport provides a detailed report on the files that Amazon FSx processed that meet the criteria specified by the <code>Scope</code> parameter. For more information, see <a href=\"https://docs.aws.amazon.com/fsx/latest/LustreGuide/task-completion-report.html\">Working with Task Completion Reports</a>.</p>"
+        },
+        "ClientRequestToken":{
+          "shape":"ClientRequestToken",
+          "idempotencyToken":true
+        },
+        "Tags":{"shape":"Tags"}
+      }
+    },
+    "CreateDataRepositoryTaskResponse":{
+      "type":"structure",
+      "members":{
+        "DataRepositoryTask":{
+          "shape":"DataRepositoryTask",
+          "documentation":"<p>The description of the data repository task that you just created.</p>"
+        }
+      }
+    },
     "CreateFileSystemFromBackupRequest":{
       "type":"structure",
       "required":[
@@ -463,11 +609,11 @@
         },
         "SubnetIds":{
           "shape":"SubnetIds",
-          "documentation":"<p>A list of IDs for the subnets that the file system will be accessible from. Currently, you can specify only one subnet. The file server is also launched in that subnet's Availability Zone.</p>"
+          "documentation":"<p>Specifies the IDs of the subnets that the file system will be accessible from. For Windows <code>MULTI_AZ_1</code> file system deployment types, provide exactly two subnet IDs, one for the preferred file server and one for the standby file server. You specify one of these subnets as the preferred subnet using the <code>WindowsConfiguration &gt; PreferredSubnetID</code> property.</p> <p>For Windows <code>SINGLE_AZ_1</code> and <code>SINGLE_AZ_2</code> deployment types and Lustre file systems, provide exactly one subnet ID. The file server is launched in that subnet's Availability Zone.</p>"
         },
         "SecurityGroupIds":{
           "shape":"SecurityGroupIds",
-          "documentation":"<p>A list of IDs for the security groups that apply to the specified network interfaces created for file system access. These security groups apply to all network interfaces. This value isn't returned in later describe requests.</p>"
+          "documentation":"<p>A list of IDs for the security groups that apply to the specified network interfaces created for file system access. These security groups apply to all network interfaces. This value isn't returned in later DescribeFileSystem requests.</p>"
         },
         "Tags":{
           "shape":"Tags",
@@ -476,6 +622,10 @@
         "WindowsConfiguration":{
           "shape":"CreateFileSystemWindowsConfiguration",
           "documentation":"<p>The configuration for this Microsoft Windows file system.</p>"
+        },
+        "StorageType":{
+          "shape":"StorageType",
+          "documentation":"<p>Sets the storage type for the Windows file system you're creating from a backup. Valid values are <code>SSD</code> and <code>HDD</code>.</p> <ul> <li> <p>Set to <code>SSD</code> to use solid state drive storage. Supported on all Windows deployment types.</p> </li> <li> <p>Set to <code>HDD</code> to use hard disk drive storage. Supported on <code>SINGLE_AZ_2</code> and <code>MULTI_AZ_1</code> Windows file system deployment types. </p> </li> </ul> <p> Default value is <code>SSD</code>. </p> <note> <p>HDD and SSD storage types have different minimum storage capacity requirements. A restored file system's storage capacity is tied to the file system that was backed up. You can create a file system that uses HDD storage from a backup of a file system that used SSD storage only if the original SSD file system had a storage capacity of at least 2000 GiB. </p> </note>"
         }
       },
       "documentation":"<p>The request object for the <code>CreateFileSystemFromBackup</code> operation.</p>"
@@ -507,10 +657,18 @@
         },
         "ImportedFileChunkSize":{
           "shape":"Megabytes",
-          "documentation":"<p>(Optional) For files imported from a data repository, this value determines the stripe count and maximum amount of data per file (in MiB) stored on a single physical disk. The maximum number of disks that a single file can be striped across is limited by the total number of disks that make up the file system.</p> <p>The chunk size default is 1,024 MiB (1 GiB) and can go as high as 512,000 MiB (500 GiB). Amazon S3 objects have a maximum size of 5 TB.</p>"
+          "documentation":"<p>(Optional) For files imported from a data repository, this value determines the stripe count and maximum amount of data per file (in MiB) stored on a single physical disk. The maximum number of disks that a single file can be striped across is limited by the total number of disks that make up the file system.</p> <p>The default chunk size is 1,024 MiB (1 GiB) and can go as high as 512,000 MiB (500 GiB). Amazon S3 objects have a maximum size of 5 TB.</p>"
+        },
+        "DeploymentType":{
+          "shape":"LustreDeploymentType",
+          "documentation":"<p>(Optional) Choose <code>SCRATCH_1</code> and <code>SCRATCH_2</code> deployment types when you need temporary storage and shorter-term processing of data. The <code>SCRATCH_2</code> deployment type provides in-transit encryption of data and higher burst throughput capacity than <code>SCRATCH_1</code>.</p> <p>Choose <code>PERSISTENT_1</code> deployment type for longer-term storage and workloads and encryption of data in transit. To learn more about deployment types, see <a href=\"https://docs.aws.amazon.com/fsx/latest/LustreGuide/lustre-deployment-types.html\"> FSx for Lustre Deployment Options</a>.</p> <p>Encryption of data in-transit is automatically enabled when you access a <code>SCRATCH_2</code> or <code>PERSISTENT_1</code> file system from Amazon EC2 instances that <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/data- protection.html\">support this feature</a>. (Default = <code>SCRATCH_1</code>) </p> <p>Encryption of data in-transit for <code>SCRATCH_2</code> and <code>PERSISTENT_1</code> deployment types is supported when accessed from supported instance types in supported AWS Regions. To learn more, <a href=\"https://docs.aws.amazon.com/fsx/latest/LustreGuide/encryption-in-transit-fsxl.html\">Encrypting Data in Transit</a>.</p>"
+        },
+        "PerUnitStorageThroughput":{
+          "shape":"PerUnitStorageThroughput",
+          "documentation":"<p> Required for the <code>PERSISTENT_1</code> deployment type, describes the amount of read and write throughput for each 1 tebibyte of storage, in MB/s/TiB. File system throughput capacity is calculated by multiplying file system storage capacity (TiB) by the PerUnitStorageThroughput (MB/s/TiB). For a 2.4 TiB file system, provisioning 50 MB/s/TiB of PerUnitStorageThroughput yields 117 MB/s of file system throughput. You pay for the amount of throughput that you provision. </p> <p>Valid values are 50, 100, 200.</p>"
         }
       },
-      "documentation":"<p>The Lustre configuration for the file system being created. This value is required if <code>FileSystemType</code> is set to <code>LUSTRE</code>.</p>"
+      "documentation":"<p>The Lustre configuration for the file system being created. </p>"
     },
     "CreateFileSystemRequest":{
       "type":"structure",
@@ -527,15 +685,19 @@
         },
         "FileSystemType":{
           "shape":"FileSystemType",
-          "documentation":"<p>The type of Amazon FSx file system to create.</p>"
+          "documentation":"<p>The type of Amazon FSx file system to create, either <code>WINDOWS</code> or <code>LUSTRE</code>.</p>"
         },
         "StorageCapacity":{
           "shape":"StorageCapacity",
-          "documentation":"<p>The storage capacity of the file system being created.</p> <p>For Windows file systems, the storage capacity has a minimum of 300 GiB, and a maximum of 65,536 GiB.</p> <p>For Lustre file systems, the storage capacity has a minimum of 3,600 GiB. Storage capacity is provisioned in increments of 3,600 GiB.</p>"
+          "documentation":"<p>Sets the storage capacity of the file system that you're creating.</p> <p>For Lustre file systems:</p> <ul> <li> <p>For <code>SCRATCH_2</code> and <code>PERSISTENT_1</code> deployment types, valid values are 1.2, 2.4, and increments of 2.4 TiB.</p> </li> <li> <p>For <code>SCRATCH_1</code> deployment type, valid values are 1.2, 2.4, and increments of 3.6 TiB.</p> </li> </ul> <p>For Windows file systems:</p> <ul> <li> <p>If <code>StorageType=SSD</code>, valid values are 32 GiB - 65,536 GiB (64 TiB).</p> </li> <li> <p>If <code>StorageType=HDD</code>, valid values are 2000 GiB - 65,536 GiB (64 TiB).</p> </li> </ul>"
+        },
+        "StorageType":{
+          "shape":"StorageType",
+          "documentation":"<p>Sets the storage type for the Amazon FSx for Windows file system you're creating. Valid values are <code>SSD</code> and <code>HDD</code>.</p> <ul> <li> <p>Set to <code>SSD</code> to use solid state drive storage. SSD is supported on all Windows deployment types.</p> </li> <li> <p>Set to <code>HDD</code> to use hard disk drive storage. HDD is supported on <code>SINGLE_AZ_2</code> and <code>MULTI_AZ_1</code> Windows file system deployment types. </p> </li> </ul> <p> Default value is <code>SSD</code>. For more information, see <a href=\"https://docs.aws.amazon.com/fsx/latest/WindowsGuide/optimize-fsx-tco.html#saz-maz-storage-type\"> Storage Type Options</a> in the <i>Amazon FSx for Windows User Guide</i>. </p>"
         },
         "SubnetIds":{
           "shape":"SubnetIds",
-          "documentation":"<p>The IDs of the subnets that the file system will be accessible from. File systems support only one subnet. The file server is also launched in that subnet's Availability Zone.</p>"
+          "documentation":"<p>Specifies the IDs of the subnets that the file system will be accessible from. For Windows <code>MULTI_AZ_1</code> file system deployment types, provide exactly two subnet IDs, one for the preferred file server and one for the standby file server. You specify one of these subnets as the preferred subnet using the <code>WindowsConfiguration &gt; PreferredSubnetID</code> property.</p> <p>For Windows <code>SINGLE_AZ_1</code> and <code>SINGLE_AZ_2</code> file system deployment types and Lustre file systems, provide exactly one subnet ID. The file server is launched in that subnet's Availability Zone.</p>"
         },
         "SecurityGroupIds":{
           "shape":"SecurityGroupIds",
@@ -548,7 +710,7 @@
         "KmsKeyId":{"shape":"KmsKeyId"},
         "WindowsConfiguration":{
           "shape":"CreateFileSystemWindowsConfiguration",
-          "documentation":"<p>The Microsoft Windows configuration for the file system being created. This value is required if <code>FileSystemType</code> is set to <code>WINDOWS</code>.</p>"
+          "documentation":"<p>The Microsoft Windows configuration for the file system being created. </p>"
         },
         "LustreConfiguration":{"shape":"CreateFileSystemLustreConfiguration"}
       },
@@ -573,6 +735,14 @@
           "documentation":"<p>The ID for an existing AWS Managed Microsoft Active Directory (AD) instance that the file system should join when it's created.</p>"
         },
         "SelfManagedActiveDirectoryConfiguration":{"shape":"SelfManagedActiveDirectoryConfiguration"},
+        "DeploymentType":{
+          "shape":"WindowsDeploymentType",
+          "documentation":"<p>Specifies the file system deployment type, valid values are the following:</p> <ul> <li> <p> <code>MULTI_AZ_1</code> - Deploys a high availability file system that is configured for Multi-AZ redundancy to tolerate temporary Availability Zone (AZ) unavailability. You can only deploy a Multi-AZ file system in AWS Regions that have a minimum of three Availability Zones. Also supports HDD storage type</p> </li> <li> <p> <code>SINGLE_AZ_1</code> - (Default) Choose to deploy a file system that is configured for single AZ redundancy.</p> </li> <li> <p> <code>SINGLE_AZ_2</code> - The latest generation Single AZ file system. Specifies a file system that is configured for single AZ redundancy and supports HDD storage type.</p> </li> </ul> <p>For more information, see <a href=\"https://docs.aws.amazon.com/fsx/latest/WindowsGuide/high-availability-multiAZ.html\"> Availability and Durability: Single-AZ and Multi-AZ File Systems</a>.</p>"
+        },
+        "PreferredSubnetId":{
+          "shape":"SubnetId",
+          "documentation":"<p>Required when <code>DeploymentType</code> is set to <code>MULTI_AZ_1</code>. This specifies the subnet in which you want the preferred file server to be located. For in-AWS applications, we recommend that you launch your clients in the same Availability Zone (AZ) as your preferred file server to reduce cross-AZ data transfer costs and minimize latency. </p>"
+        },
         "ThroughputCapacity":{
           "shape":"MegabytesPerSecond",
           "documentation":"<p>The throughput of an Amazon FSx file system, measured in megabytes per second, in 2 to the <i>n</i>th increments, between 2^3 (8) and 2^11 (2048).</p>"
@@ -591,7 +761,7 @@
         },
         "CopyTagsToBackups":{
           "shape":"Flag",
-          "documentation":"<p>A boolean flag indicating whether tags for the file system should be copied to backups. This value defaults to false. If it's set to true, all tags for the file system are copied to all automatic and user-initiated backups where the user doesn't specify tags. If this value is true, and you specify one or more tags, only the specified tags are copied to backups.</p>"
+          "documentation":"<p>A boolean flag indicating whether tags for the file system should be copied to backups. This value defaults to false. If it's set to true, all tags for the file system are copied to all automatic and user-initiated backups where the user doesn't specify tags. If this value is true, and you specify one or more tags, only the specified tags are copied to backups. If you specify one or more tags when creating a user-initiated backup, no tags are copied from the file system, regardless of this value.</p>"
         }
       },
       "documentation":"<p>The configuration object for the Microsoft Windows file system used in <code>CreateFileSystem</code> and <code>CreateFileSystemFromBackup</code> operations.</p>"
@@ -632,6 +802,177 @@
       },
       "documentation":"<p>The data repository configuration object for Lustre file systems returned in the response of the <code>CreateFileSystem</code> operation.</p>"
     },
+    "DataRepositoryTask":{
+      "type":"structure",
+      "required":[
+        "TaskId",
+        "Lifecycle",
+        "Type",
+        "CreationTime",
+        "FileSystemId"
+      ],
+      "members":{
+        "TaskId":{
+          "shape":"TaskId",
+          "documentation":"<p>The system-generated, unique 17-digit ID of the data repository task.</p>"
+        },
+        "Lifecycle":{
+          "shape":"DataRepositoryTaskLifecycle",
+          "documentation":"<p>The lifecycle status of the data repository task, as follows:</p> <ul> <li> <p> <code>PENDING</code> - Amazon FSx has not started the task.</p> </li> <li> <p> <code>EXECUTING</code> - Amazon FSx is processing the task.</p> </li> <li> <p> <code>FAILED</code> - Amazon FSx was not able to complete the task. For example, there may be files the task failed to process. The <a>DataRepositoryTaskFailureDetails</a> property provides more information about task failures.</p> </li> <li> <p> <code>SUCCEEDED</code> - FSx completed the task successfully.</p> </li> <li> <p> <code>CANCELED</code> - Amazon FSx canceled the task and it did not complete.</p> </li> <li> <p> <code>CANCELING</code> - FSx is in process of canceling the task.</p> </li> </ul> <note> <p>You cannot delete an FSx for Lustre file system if there are data repository tasks for the file system in the <code>PENDING</code> or <code>EXECUTING</code> states. Please retry when the data repository task is finished (with a status of <code>CANCELED</code>, <code>SUCCEEDED</code>, or <code>FAILED</code>). You can use the DescribeDataRepositoryTask action to monitor the task status. Contact the FSx team if you need to delete your file system immediately.</p> </note>"
+        },
+        "Type":{
+          "shape":"DataRepositoryTaskType",
+          "documentation":"<p>The type of data repository task; EXPORT_TO_REPOSITORY is the only type currently supported.</p>"
+        },
+        "CreationTime":{"shape":"CreationTime"},
+        "StartTime":{
+          "shape":"StartTime",
+          "documentation":"<p>The time that Amazon FSx began processing the task.</p>"
+        },
+        "EndTime":{
+          "shape":"EndTime",
+          "documentation":"<p>The time that Amazon FSx completed processing the task, populated after the task is complete.</p>"
+        },
+        "ResourceARN":{"shape":"ResourceARN"},
+        "Tags":{"shape":"Tags"},
+        "FileSystemId":{"shape":"FileSystemId"},
+        "Paths":{
+          "shape":"DataRepositoryTaskPaths",
+          "documentation":"<p>An array of paths on the Amazon FSx for Lustre file system that specify the data for the data repository task to process. For example, in an EXPORT_TO_REPOSITORY task, the paths specify which data to export to the linked data repository.</p> <p>(Default) If <code>Paths</code> is not specified, Amazon FSx uses the file system root directory.</p>"
+        },
+        "FailureDetails":{
+          "shape":"DataRepositoryTaskFailureDetails",
+          "documentation":"<p>Failure message describing why the task failed, it is populated only when <code>Lifecycle</code> is set to <code>FAILED</code>.</p>"
+        },
+        "Status":{
+          "shape":"DataRepositoryTaskStatus",
+          "documentation":"<p>Provides the status of the number of files that the task has processed successfully and failed to process.</p>"
+        },
+        "Report":{"shape":"CompletionReport"}
+      },
+      "documentation":"<p>A description of the data repository task. You use data repository tasks to perform bulk transfer operations between your Amazon FSx file system and its linked data repository.</p>"
+    },
+    "DataRepositoryTaskEnded":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p>The data repository task could not be canceled because the task has already ended.</p>",
+      "exception":true
+    },
+    "DataRepositoryTaskExecuting":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p>An existing data repository task is currently executing on the file system. Wait until the existing task has completed, then create the new task.</p>",
+      "exception":true
+    },
+    "DataRepositoryTaskFailureDetails":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p>Provides information about why a data repository task failed. Only populated when the task <code>Lifecycle</code> is set to <code>FAILED</code>.</p>"
+    },
+    "DataRepositoryTaskFilter":{
+      "type":"structure",
+      "members":{
+        "Name":{
+          "shape":"DataRepositoryTaskFilterName",
+          "documentation":"<p>Name of the task property to use in filtering the tasks returned in the response.</p> <ul> <li> <p>Use <code>file-system-id</code> to retrieve data repository tasks for specific file systems.</p> </li> <li> <p>Use <code>task-lifecycle</code> to retrieve data repository tasks with one or more specific lifecycle states, as follows: CANCELED, EXECUTING, FAILED, PENDING, and SUCCEEDED.</p> </li> </ul>"
+        },
+        "Values":{
+          "shape":"DataRepositoryTaskFilterValues",
+          "documentation":"<p>Use Values to include the specific file system IDs and task lifecycle states for the filters you are using.</p>"
+        }
+      },
+      "documentation":"<p>(Optional) An array of filter objects you can use to filter the response of data repository tasks you will see in the the response. You can filter the tasks returned in the response by one or more file system IDs, task lifecycles, and by task type. A filter object consists of a filter <code>Name</code>, and one or more <code>Values</code> for the filter.</p>"
+    },
+    "DataRepositoryTaskFilterName":{
+      "type":"string",
+      "enum":[
+        "file-system-id",
+        "task-lifecycle"
+      ]
+    },
+    "DataRepositoryTaskFilterValue":{
+      "type":"string",
+      "max":128,
+      "min":1,
+      "pattern":"^[0-9a-zA-Z\\*\\.\\\\/\\?\\-\\_]*$"
+    },
+    "DataRepositoryTaskFilterValues":{
+      "type":"list",
+      "member":{"shape":"DataRepositoryTaskFilterValue"},
+      "max":20
+    },
+    "DataRepositoryTaskFilters":{
+      "type":"list",
+      "member":{"shape":"DataRepositoryTaskFilter"},
+      "max":3
+    },
+    "DataRepositoryTaskLifecycle":{
+      "type":"string",
+      "enum":[
+        "PENDING",
+        "EXECUTING",
+        "FAILED",
+        "SUCCEEDED",
+        "CANCELED",
+        "CANCELING"
+      ]
+    },
+    "DataRepositoryTaskNotFound":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p>The data repository task or tasks you specified could not be found.</p>",
+      "exception":true
+    },
+    "DataRepositoryTaskPath":{
+      "type":"string",
+      "max":4096,
+      "min":0,
+      "pattern":"^.{0,4096}$"
+    },
+    "DataRepositoryTaskPaths":{
+      "type":"list",
+      "member":{"shape":"DataRepositoryTaskPath"},
+      "max":100
+    },
+    "DataRepositoryTaskStatus":{
+      "type":"structure",
+      "members":{
+        "TotalCount":{
+          "shape":"TotalCount",
+          "documentation":"<p>The total number of files that the task will process. While a task is executing, the sum of <code>SucceededCount</code> plus <code>FailedCount</code> may not equal <code>TotalCount</code>. When the task is complete, <code>TotalCount</code> equals the sum of <code>SucceededCount</code> plus <code>FailedCount</code>.</p>"
+        },
+        "SucceededCount":{
+          "shape":"SucceededCount",
+          "documentation":"<p>A running total of the number of files that the task has successfully processed.</p>"
+        },
+        "FailedCount":{
+          "shape":"FailedCount",
+          "documentation":"<p>A running total of the number of files that the task failed to process.</p>"
+        },
+        "LastUpdatedTime":{
+          "shape":"LastUpdatedTime",
+          "documentation":"<p>The time at which the task status was last updated.</p>"
+        }
+      },
+      "documentation":"<p>Provides the task status showing a running total of the total number of files to be processed, the number successfully processed, and the number of files the task failed to process.</p>"
+    },
+    "DataRepositoryTaskType":{
+      "type":"string",
+      "enum":["EXPORT_TO_REPOSITORY"]
+    },
+    "DataRepositoryTasks":{
+      "type":"list",
+      "member":{"shape":"DataRepositoryTask"},
+      "max":50
+    },
     "DeleteBackupRequest":{
       "type":"structure",
       "required":["BackupId"],
@@ -758,6 +1099,31 @@
       },
       "documentation":"<p>Response object for <code>DescribeBackups</code> operation.</p>"
     },
+    "DescribeDataRepositoryTasksRequest":{
+      "type":"structure",
+      "members":{
+        "TaskIds":{
+          "shape":"TaskIds",
+          "documentation":"<p>(Optional) IDs of the tasks whose descriptions you want to retrieve (String).</p>"
+        },
+        "Filters":{
+          "shape":"DataRepositoryTaskFilters",
+          "documentation":"<p>(Optional) You can use filters to narrow the <code>DescribeDataRepositoryTasks</code> response to include just tasks for specific file systems, or tasks in a specific lifecycle state.</p>"
+        },
+        "MaxResults":{"shape":"MaxResults"},
+        "NextToken":{"shape":"NextToken"}
+      }
+    },
+    "DescribeDataRepositoryTasksResponse":{
+      "type":"structure",
+      "members":{
+        "DataRepositoryTasks":{
+          "shape":"DataRepositoryTasks",
+          "documentation":"<p>The collection of data repository task descriptions returned.</p>"
+        },
+        "NextToken":{"shape":"NextToken"}
+      }
+    },
     "DescribeFileSystemsRequest":{
       "type":"structure",
       "members":{
@@ -800,12 +1166,14 @@
       "type":"string",
       "max":256,
       "min":1,
+      "pattern":"^.{1,256}$",
       "sensitive":true
     },
     "DirectoryUserName":{
       "type":"string",
       "max":256,
-      "min":1
+      "min":1,
+      "pattern":"^.{1,256}$"
     },
     "DnsIps":{
       "type":"list",
@@ -813,12 +1181,14 @@
       "max":2,
       "min":1
     },
+    "EndTime":{"type":"timestamp"},
     "ErrorMessage":{
       "type":"string",
       "documentation":"<p>A detailed error message.</p>",
       "max":256,
       "min":1
     },
+    "FailedCount":{"type":"long"},
     "FileSystem":{
       "type":"structure",
       "members":{
@@ -840,20 +1210,24 @@
         },
         "Lifecycle":{
           "shape":"FileSystemLifecycle",
-          "documentation":"<p>The lifecycle status of the file system:</p> <ul> <li> <p> <code>AVAILABLE</code> indicates that the file system is reachable and available for use.</p> </li> <li> <p> <code>CREATING</code> indicates that Amazon FSx is in the process of creating the new file system.</p> </li> <li> <p> <code>DELETING</code> indicates that Amazon FSx is in the process of deleting the file system.</p> </li> <li> <p> <code>FAILED</code> indicates that Amazon FSx was not able to create the file system.</p> </li> <li> <p> <code>MISCONFIGURED</code> indicates that the file system is in a failed but recoverable state.</p> </li> <li> <p> <code>UPDATING</code> indicates that the file system is undergoing a customer initiated update.</p> </li> </ul>"
+          "documentation":"<p>The lifecycle status of the file system, following are the possible values and what they mean:</p> <ul> <li> <p> <code>AVAILABLE</code> - The file system is in a healthy state, and is reachable and available for use.</p> </li> <li> <p> <code>CREATING</code> - Amazon FSx is creating the new file system.</p> </li> <li> <p> <code>DELETING</code> - Amazon FSx is deleting an existing file system.</p> </li> <li> <p> <code>FAILED</code> - An existing file system has experienced an unrecoverable failure. When creating a new file system, Amazon FSx was unable to create the file system.</p> </li> <li> <p> <code>MISCONFIGURED</code> indicates that the file system is in a failed but recoverable state.</p> </li> <li> <p> <code>UPDATING</code> indicates that the file system is undergoing a customer initiated update.</p> </li> </ul>"
         },
         "FailureDetails":{"shape":"FileSystemFailureDetails"},
         "StorageCapacity":{
           "shape":"StorageCapacity",
           "documentation":"<p>The storage capacity of the file system in gigabytes (GB).</p>"
         },
+        "StorageType":{
+          "shape":"StorageType",
+          "documentation":"<p>The storage type of the file system. Valid values are <code>SSD</code> and <code>HDD</code>. If set to <code>SSD</code>, the file system uses solid state drive storage. If set to <code>HDD</code>, the file system uses hard disk drive storage. </p>"
+        },
         "VpcId":{
           "shape":"VpcId",
           "documentation":"<p>The ID of the primary VPC for the file system.</p>"
         },
         "SubnetIds":{
           "shape":"SubnetIds",
-          "documentation":"<p>The ID of the subnet to contain the endpoint for the file system. One and only one is supported. The file system is launched in the Availability Zone associated with this subnet.</p>"
+          "documentation":"<p>Specifies the IDs of the subnets that the file system is accessible from. For Windows <code>MULTI_AZ_1</code> file system deployment type, there are two subnet IDs, one for the preferred file server and one for the standby file server. The preferred file server subnet identified in the <code>PreferredSubnetID</code> property. All other file systems have only one subnet ID.</p> <p>For Lustre file systems, and Single-AZ Windows file systems, this is the ID of the subnet that contains the endpoint for the file system. For <code>MULTI_AZ_1</code> Windows file systems, the endpoint for the file system is available in the <code>PreferredSubnetID</code>.</p>"
         },
         "NetworkInterfaceIds":{
           "shape":"NetworkInterfaceIds",
@@ -865,7 +1239,7 @@
         },
         "KmsKeyId":{
           "shape":"KmsKeyId",
-          "documentation":"<p>The ID of the AWS Key Management Service (AWS KMS) key used to encrypt the file system's data for an Amazon FSx for Windows File Server file system.</p>"
+          "documentation":"<p>The ID of the AWS Key Management Service (AWS KMS) key used to encrypt the file system's data for Amazon FSx for Windows File Server file systems and persistent Amazon FSx for Lustre file systems at rest. In either case, if not specified, the Amazon FSx managed key is used. The scratch Amazon FSx for Lustre file systems are always encrypted at rest using Amazon FSx managed keys. For more information, see <a href=\"https://docs.aws.amazon.com/kms/latest/APIReference/API_Encrypt.html\">Encrypt</a> in the <i>AWS Key Management Service API Reference</i>.</p>"
         },
         "ResourceARN":{
           "shape":"ResourceARN",
@@ -886,7 +1260,8 @@
     "FileSystemAdministratorsGroupName":{
       "type":"string",
       "max":256,
-      "min":1
+      "min":1,
+      "pattern":"^.{1,256}$"
     },
     "FileSystemFailureDetails":{
       "type":"structure",
@@ -1049,17 +1424,28 @@
       "documentation":"<p>One or more network settings specified in the request are invalid. <code>InvalidVpcId</code> means that the ID passed for the virtual private cloud (VPC) is invalid. <code>InvalidSubnetIds</code> returns the list of IDs for subnets that are either invalid or not part of the VPC specified. <code>InvalidSecurityGroupIds</code> returns the list of IDs for security groups that are either invalid or not part of the VPC specified.</p>",
       "exception":true
     },
+    "InvalidPerUnitStorageThroughput":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p>An invalid value for <code>PerUnitStorageThroughput</code> was provided. Please create your file system again, using a valid value.</p>",
+      "exception":true
+    },
     "IpAddress":{
       "type":"string",
+      "max":15,
+      "min":7,
       "pattern":"^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$"
     },
     "KmsKeyId":{
       "type":"string",
-      "documentation":"<p>The ID of your AWS Key Management Service (AWS KMS) key. This ID is used to encrypt the data in your file system at rest. For more information, see <a href=\"https://docs.aws.amazon.com/kms/latest/APIReference/API_Encrypt.html\">Encrypt</a> in the <i>AWS Key Management Service API Reference</i>.</p>",
+      "documentation":"<p>The ID of the AWS Key Management Service (AWS KMS) key used to encrypt the file system's data for Amazon FSx for Windows File Server file systems and Amazon FSx for Lustre <code>PERSISTENT_1</code> file systems at rest. In either case, if not specified, the Amazon FSx managed key is used. The Amazon FSx for Lustre <code>SCRATCH_1</code> and <code>SCRATCH_2</code> file systems are always encrypted at rest using Amazon FSx managed keys. For more information, see <a href=\"https://docs.aws.amazon.com/kms/latest/APIReference/API_Encrypt.html\">Encrypt</a> in the <i>AWS Key Management Service API Reference</i>.</p>",
       "max":2048,
       "min":1,
-      "pattern":"^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-4[a-fA-F0-9]{3}-[89aAbB][a-fA-F0-9]{3}-[a-fA-F0-9]{12}|arn:aws[a-z-]{0,7}:kms:[a-z]{2}-[a-z-]{4,}-\\d+:\\d{12}:(key|alias)\\/([a-fA-F0-9]{8}-[a-fA-F0-9]{4}-4[a-fA-F0-9]{3}-[89aAbB][a-fA-F0-9]{3}-[a-fA-F0-9]{12}|[a-zA-Z0-9:\\/_-]+)|alias\\/[a-zA-Z0-9:\\/_-]+$"
+      "pattern":"^.{1,2048}$"
     },
+    "LastUpdatedTime":{"type":"timestamp"},
     "ListTagsForResourceRequest":{
       "type":"structure",
       "required":["ResourceARN"],
@@ -1093,6 +1479,14 @@
       },
       "documentation":"<p>The response object for <code>ListTagsForResource</code> operation.</p>"
     },
+    "LustreDeploymentType":{
+      "type":"string",
+      "enum":[
+        "SCRATCH_1",
+        "SCRATCH_2",
+        "PERSISTENT_1"
+      ]
+    },
     "LustreFileSystemConfiguration":{
       "type":"structure",
       "members":{
@@ -1100,10 +1494,28 @@
           "shape":"WeeklyTime",
           "documentation":"<p>The UTC time that you want to begin your weekly maintenance window.</p>"
         },
-        "DataRepositoryConfiguration":{"shape":"DataRepositoryConfiguration"}
+        "DataRepositoryConfiguration":{"shape":"DataRepositoryConfiguration"},
+        "DeploymentType":{
+          "shape":"LustreDeploymentType",
+          "documentation":"<p>The deployment type of the FSX for Lustre file system.</p>"
+        },
+        "PerUnitStorageThroughput":{
+          "shape":"PerUnitStorageThroughput",
+          "documentation":"<p> Per unit storage throughput represents the megabytes per second of read or write throughput per 1 tebibyte of storage provisioned. File system throughput capacity is equal to Storage capacity (TiB) * PerUnitStorageThroughput (MB/s/TiB). This option is only valid for <code>PERSISTENT_1</code> deployment types. Valid values are 50, 100, 200. </p>"
+        },
+        "MountName":{
+          "shape":"LustreFileSystemMountName",
+          "documentation":"<p>You use the <code>MountName</code> value when mounting the file system.</p> <p>For the <code>SCRATCH_1</code> deployment type, this value is always \"<code>fsx</code>\". For <code>SCRATCH_2</code> and <code>PERSISTENT_1</code> deployment types, this value is a string that is unique within an AWS Region. </p>"
+        }
       },
       "documentation":"<p>The configuration for the Amazon FSx for Lustre file system.</p>"
     },
+    "LustreFileSystemMountName":{
+      "type":"string",
+      "max":8,
+      "min":1,
+      "pattern":"^([A-Za-z0-9_-]{1,8})$"
+    },
     "MaxResults":{
       "type":"integer",
       "documentation":"<p>The maximum number of resources to return in the response. This value must be an integer greater than zero.</p>",
@@ -1125,7 +1537,7 @@
       "members":{
         "Message":{"shape":"ErrorMessage"}
       },
-      "documentation":"<p>File system configuration is required for this operation.</p>",
+      "documentation":"<p>A file system configuration is required for this operation.</p>",
       "exception":true
     },
     "NetworkInterfaceId":{
@@ -1164,25 +1576,39 @@
     "OrganizationalUnitDistinguishedName":{
       "type":"string",
       "max":2000,
-      "min":1
+      "min":1,
+      "pattern":"^.{1,2000}$"
     },
     "Parameter":{
       "type":"string",
       "documentation":"<p>The name of a parameter for the request. Parameter names are returned in PascalCase.</p>",
       "min":1
     },
+    "PerUnitStorageThroughput":{
+      "type":"integer",
+      "max":200,
+      "min":50
+    },
     "ProgressPercent":{
       "type":"integer",
       "documentation":"<p>The current percent of progress of an asynchronous task.</p>",
       "max":100,
       "min":0
     },
+    "ReportFormat":{
+      "type":"string",
+      "enum":["REPORT_CSV_20191124"]
+    },
+    "ReportScope":{
+      "type":"string",
+      "enum":["FAILED_FILES_ONLY"]
+    },
     "ResourceARN":{
       "type":"string",
       "documentation":"<p>The Amazon Resource Name (ARN) for a given resource. ARNs uniquely identify AWS resources. We require an ARN when you need to specify a resource unambiguously across all of AWS. For more information, see <a href=\"https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html\">Amazon Resource Names (ARNs) and AWS Service Namespaces</a> in the <i>AWS General Reference</i>.</p>",
       "max":512,
       "min":8,
-      "pattern":"^arn:aws[a-z-]{0,7}:[A-Za-z0-9][A-za-z0-9_/.-]{0,62}:[A-za-z0-9_/.-]{0,63}:[A-za-z0-9_/.-]{0,63}:[A-Za-z0-9][A-za-z0-9_/.-]{0,127}$"
+      "pattern":"^arn:(?=[^:]+:fsx:[^:]+:\\d{12}:)((|(?=[a-z0-9-.]{1,63})(?!\\d{1,3}(\\.\\d{1,3}){3})(?![^:]*-{2})(?![^:]*-\\.)(?![^:]*\\.-)[a-z0-9].*(?<!-)):){4}(?!/).{0,1024}$"
     },
     "ResourceDoesNotSupportTagging":{
       "type":"structure",
@@ -1268,7 +1694,7 @@
         },
         "FileSystemAdministratorsGroup":{
           "shape":"FileSystemAdministratorsGroupName",
-          "documentation":"<p>(Optional) The name of the domain group whose members are granted administrative privileges for the file system. Administrative privileges include taking ownership of files and folders, and setting audit controls (audit ACLs) on files and folders. The group that you specify must already exist in your domain. If you don't provide one, your AD domain's Domain Admins group is used.</p>"
+          "documentation":"<p>(Optional) The name of the domain group whose members are granted administrative privileges for the file system. Administrative privileges include taking ownership of files and folders, setting audit controls (audit ACLs) on files and folders, and administering the file system remotely by using the FSx Remote PowerShell. The group that you specify must already exist in your domain. If you don't provide one, your AD domain's Domain Admins group is used.</p>"
         },
         "UserName":{
           "shape":"DirectoryUserName",
@@ -1280,7 +1706,7 @@
         },
         "DnsIps":{
           "shape":"DnsIps",
-          "documentation":"<p>A list of up to two IP addresses of DNS servers or domain controllers in the self-managed AD directory. The IP addresses need to be either in the same VPC CIDR range as the one in which your Amazon FSx file system is being created, or in the private IP version 4 (Iv4) address ranges, as specified in <a href=\"http://www.faqs.org/rfcs/rfc1918.html\">RFC 1918</a>:</p> <ul> <li> <p>10.0.0.0 - 10.255.255.255 (10/8 prefix)</p> </li> <li> <p>172.16.0.0 - 172.31.255.255 (172.16/12 prefix)</p> </li> <li> <p>192.168.0.0 - 192.168.255.255 (192.168/16 prefix)</p> </li> </ul>"
+          "documentation":"<p>A list of up to two IP addresses of DNS servers or domain controllers in the self-managed AD directory. The IP addresses need to be either in the same VPC CIDR range as the one in which your Amazon FSx file system is being created, or in the private IP version 4 (IPv4) address ranges, as specified in <a href=\"http://www.faqs.org/rfcs/rfc1918.html\">RFC 1918</a>:</p> <ul> <li> <p>10.0.0.0 - 10.255.255.255 (10/8 prefix)</p> </li> <li> <p>172.16.0.0 - 172.31.255.255 (172.16/12 prefix)</p> </li> <li> <p>192.168.0.0 - 192.168.255.255 (192.168/16 prefix)</p> </li> </ul>"
         }
       },
       "documentation":"<p>The configuration that Amazon FSx uses to join the Windows File Server instance to your self-managed (including on-premises) Microsoft Active Directory (AD) directory.</p>"
@@ -1326,10 +1752,19 @@
       "documentation":"<p>An error indicating that a particular service limit was exceeded. You can increase some service limits by contacting AWS Support. </p>",
       "exception":true
     },
+    "StartTime":{"type":"timestamp"},
     "StorageCapacity":{
       "type":"integer",
       "documentation":"<p>The storage capacity for your Amazon FSx file system, in gibibytes.</p>",
-      "min":1
+      "min":0
+    },
+    "StorageType":{
+      "type":"string",
+      "documentation":"<p>The storage type for your Amazon FSx file system.</p>",
+      "enum":[
+        "SSD",
+        "HDD"
+      ]
     },
     "SubnetId":{
       "type":"string",
@@ -1344,6 +1779,7 @@
       "documentation":"<p>A list of subnet IDs. Currently, you can specify only one subnet ID in a call to the <code>CreateFileSystem</code> operation.</p>",
       "max":50
     },
+    "SucceededCount":{"type":"long"},
     "Tag":{
       "type":"structure",
       "members":{
@@ -1362,7 +1798,8 @@
       "type":"string",
       "documentation":"<p>A string of 1 to 128 characters that specifies the key for a tag. Tag keys must be unique for the resource to which they are attached.</p>",
       "max":128,
-      "min":1
+      "min":1,
+      "pattern":"^([\\p{L}\\p{Z}\\p{N}_.:/=+\\-@]*)$"
     },
     "TagKeys":{
       "type":"list",
@@ -1399,7 +1836,8 @@
       "type":"string",
       "documentation":"<p>A string of 0 to 256 characters that specifies the value for a tag. Tag values can be null and don't have to be unique in a tag set.</p>",
       "max":256,
-      "min":0
+      "min":0,
+      "pattern":"^([\\p{L}\\p{Z}\\p{N}_.:/=+\\-@]*)$"
     },
     "Tags":{
       "type":"list",
@@ -1408,12 +1846,24 @@
       "max":50,
       "min":1
     },
+    "TaskId":{
+      "type":"string",
+      "max":128,
+      "min":12,
+      "pattern":"^(task-[0-9a-f]{17,})$"
+    },
+    "TaskIds":{
+      "type":"list",
+      "member":{"shape":"TaskId"},
+      "max":50
+    },
+    "TotalCount":{"type":"long"},
     "UnsupportedOperation":{
       "type":"structure",
       "members":{
         "Message":{"shape":"ErrorMessage"}
       },
-      "documentation":"<p>An error occured.</p>",
+      "documentation":"<p>The requested operation is not supported for this resource or API.</p>",
       "exception":true
     },
     "UntagResourceRequest":{
@@ -1514,6 +1964,14 @@
       "min":7,
       "pattern":"^[1-7]:([01]\\d|2[0-3]):?([0-5]\\d)$"
     },
+    "WindowsDeploymentType":{
+      "type":"string",
+      "enum":[
+        "MULTI_AZ_1",
+        "SINGLE_AZ_1",
+        "SINGLE_AZ_2"
+      ]
+    },
     "WindowsFileSystemConfiguration":{
       "type":"structure",
       "members":{
@@ -1522,6 +1980,22 @@
           "documentation":"<p>The ID for an existing Microsoft Active Directory instance that the file system should join when it's created.</p>"
         },
         "SelfManagedActiveDirectoryConfiguration":{"shape":"SelfManagedActiveDirectoryAttributes"},
+        "DeploymentType":{
+          "shape":"WindowsDeploymentType",
+          "documentation":"<p>Specifies the file system deployment type, valid values are the following:</p> <ul> <li> <p> <code>MULTI_AZ_1</code> - Specifies a high availability file system that is configured for Multi-AZ redundancy to tolerate temporary Availability Zone (AZ) unavailability, and supports SSD and HDD storage.</p> </li> <li> <p> <code>SINGLE_AZ_1</code> - (Default) Specifies a file system that is configured for single AZ redundancy, only supports SSD storage.</p> </li> <li> <p> <code>SINGLE_AZ_2</code> - Latest generation Single AZ file system. Specifies a file system that is configured for single AZ redundancy and supports SSD and HDD storage.</p> </li> </ul> <p>For more information, see <a href=\"https://docs.aws.amazon.com/fsx/latest/WindowsGuide/high-availability-multiAZ.html\">Single-AZ and Multi-AZ File Systems</a>.</p>"
+        },
+        "RemoteAdministrationEndpoint":{
+          "shape":"DNSName",
+          "documentation":"<p>For <code>MULTI_AZ_1</code> deployment types, use this endpoint when performing administrative tasks on the file system using Amazon FSx Remote PowerShell.</p> <p>For <code>SINGLE_AZ_1</code> and <code>SINGLE_AZ_2</code> deployment types, this is the DNS name of the file system.</p> <p>This endpoint is temporarily unavailable when the file system is undergoing maintenance.</p>"
+        },
+        "PreferredSubnetId":{
+          "shape":"SubnetId",
+          "documentation":"<p>For <code>MULTI_AZ_1</code> deployment types, it specifies the ID of the subnet where the preferred file server is located. Must be one of the two subnet IDs specified in <code>SubnetIds</code> property. Amazon FSx serves traffic from this subnet except in the event of a failover to the secondary file server.</p> <p>For <code>SINGLE_AZ_1</code> and <code>SINGLE_AZ_2</code> deployment types, this value is the same as that for <code>SubnetIDs</code>. For more information, see <a href=\"https://docs.aws.amazon.com/fsx/latest/WindowsGuide/high-availability-multiAZ.html#single-multi-az-resources\">Availability and Durability: Single-AZ and Multi-AZ File Systems</a> </p>"
+        },
+        "PreferredFileServerIp":{
+          "shape":"IpAddress",
+          "documentation":"<p>For <code>MULTI_AZ_1</code> deployment types, the IP address of the primary, or preferred, file server.</p> <p>Use this IP address when mounting the file system on Linux SMB clients or Windows SMB clients that are not joined to a Microsoft Active Directory. Applicable for all Windows file system deployment types. This IP address is temporarily unavailable when the file system is undergoing maintenance. For Linux and Windows SMB clients that are joined to an Active Directory, use the file system's DNSName instead. For more information on mapping and mounting file shares, see <a href=\"https://docs.aws.amazon.com/fsx/latest/WindowsGuide/accessing-file-shares.html\">Accessing File Shares</a>.</p>"
+        },
         "ThroughputCapacity":{
           "shape":"MegabytesPerSecond",
           "documentation":"<p>The throughput of an Amazon FSx file system, measured in megabytes per second.</p>"
@@ -1544,7 +2018,7 @@
         },
         "CopyTagsToBackups":{
           "shape":"Flag",
-          "documentation":"<p>A boolean flag indicating whether tags on the file system should be copied to backups. This value defaults to false. If it's set to true, all tags on the file system are copied to all automatic backups and any user-initiated backups where the user doesn't specify any tags. If this value is true, and you specify one or more tags, only the specified tags are copied to backups.</p>"
+          "documentation":"<p>A boolean flag indicating whether tags on the file system should be copied to backups. This value defaults to false. If it's set to true, all tags on the file system are copied to all automatic backups and any user-initiated backups where the user doesn't specify any tags. If this value is true, and you specify one or more tags, only the specified tags are copied to backups. If you specify one or more tags when creating a user-initiated backup, no tags are copied from the file system, regardless of this value.</p>"
         }
       },
       "documentation":"<p>The configuration for this Microsoft Windows file system.</p>"
diff --git a/services/gamelift/build.properties b/services/gamelift/build.properties
index ecf2dae6fcb1..15ec2da1fc71 100644
--- a/services/gamelift/build.properties
+++ b/services/gamelift/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/gamelift/pom.xml b/services/gamelift/pom.xml
index 84e9d9560439..cb869b2b7b8c 100644
--- a/services/gamelift/pom.xml
+++ b/services/gamelift/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>gamelift</artifactId>
     <name>AWS Java SDK :: Services :: AWS GameLift</name>
diff --git a/services/gamelift/src/it/java/software/amazon/awssdk/services/gamelift/ServiceIntegrationTest.java b/services/gamelift/src/it/java/software/amazon/awssdk/services/gamelift/ServiceIntegrationTest.java
index 2b9b08b22ac8..3072603c91c2 100644
--- a/services/gamelift/src/it/java/software/amazon/awssdk/services/gamelift/ServiceIntegrationTest.java
+++ b/services/gamelift/src/it/java/software/amazon/awssdk/services/gamelift/ServiceIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/gamelift/src/main/resources/codegen-resources/service-2.json b/services/gamelift/src/main/resources/codegen-resources/service-2.json
index 77649c76a193..1f0ff2d45fc3 100755
--- a/services/gamelift/src/main/resources/codegen-resources/service-2.json
+++ b/services/gamelift/src/main/resources/codegen-resources/service-2.json
@@ -41,9 +41,10 @@
         {"shape":"InvalidRequestException"},
         {"shape":"ConflictException"},
         {"shape":"InternalServiceException"},
-        {"shape":"LimitExceededException"}
+        {"shape":"LimitExceededException"},
+        {"shape":"TaggingFailedException"}
       ],
-      "documentation":"<p>Creates an alias for a fleet. In most situations, you can use an alias ID in place of a fleet ID. By using a fleet alias instead of a specific fleet ID, you can switch gameplay and players to a new fleet without changing your game client or other game components. For example, for games in production, using an alias allows you to seamlessly redirect your player base to a new game server update. </p> <p>Amazon GameLift supports two types of routing strategies for aliases: simple and terminal. A simple alias points to an active fleet. A terminal alias is used to display messaging or link to a URL instead of routing players to an active fleet. For example, you might use a terminal alias when a game version is no longer supported and you want to direct players to an upgrade site. </p> <p>To create a fleet alias, specify an alias name, routing strategy, and optional description. Each simple alias can point to only one fleet, but a fleet can have multiple aliases. If successful, a new alias record is returned, including an alias ID, which you can reference when creating a game session. You can reassign an alias to another fleet by calling <code>UpdateAlias</code>.</p> <ul> <li> <p> <a>CreateAlias</a> </p> </li> <li> <p> <a>ListAliases</a> </p> </li> <li> <p> <a>DescribeAlias</a> </p> </li> <li> <p> <a>UpdateAlias</a> </p> </li> <li> <p> <a>DeleteAlias</a> </p> </li> <li> <p> <a>ResolveAlias</a> </p> </li> </ul>"
+      "documentation":"<p>Creates an alias for a fleet. In most situations, you can use an alias ID in place of a fleet ID. An alias provides a level of abstraction for a fleet that is useful when redirecting player traffic from one fleet to another, such as when updating your game build. </p> <p>Amazon GameLift supports two types of routing strategies for aliases: simple and terminal. A simple alias points to an active fleet. A terminal alias is used to display messaging or link to a URL instead of routing players to an active fleet. For example, you might use a terminal alias when a game version is no longer supported and you want to direct players to an upgrade site. </p> <p>To create a fleet alias, specify an alias name, routing strategy, and optional description. Each simple alias can point to only one fleet, but a fleet can have multiple aliases. If successful, a new alias record is returned, including an alias ID and an ARN. You can reassign an alias to another fleet by calling <code>UpdateAlias</code>.</p> <ul> <li> <p> <a>CreateAlias</a> </p> </li> <li> <p> <a>ListAliases</a> </p> </li> <li> <p> <a>DescribeAlias</a> </p> </li> <li> <p> <a>UpdateAlias</a> </p> </li> <li> <p> <a>DeleteAlias</a> </p> </li> <li> <p> <a>ResolveAlias</a> </p> </li> </ul>"
     },
     "CreateBuild":{
       "name":"CreateBuild",
@@ -57,9 +58,10 @@
         {"shape":"UnauthorizedException"},
         {"shape":"InvalidRequestException"},
         {"shape":"ConflictException"},
+        {"shape":"TaggingFailedException"},
         {"shape":"InternalServiceException"}
       ],
-      "documentation":"<p>Creates a new Amazon GameLift build record for your game server binary files and points to the location of your game server build files in an Amazon Simple Storage Service (Amazon S3) location. </p> <p>Game server binaries must be combined into a <code>.zip</code> file for use with Amazon GameLift. </p> <important> <p>To create new builds quickly and easily, use the AWS CLI command <b> <a href=\"https://docs.aws.amazon.com/cli/latest/reference/gamelift/upload-build.html\">upload-build</a> </b>. This helper command uploads your build and creates a new build record in one step, and automatically handles the necessary permissions. </p> </important> <p>The <code>CreateBuild</code> operation should be used only when you need to manually upload your build files, as in the following scenarios:</p> <ul> <li> <p>Store a build file in an Amazon S3 bucket under your own AWS account. To use this option, you must first give Amazon GameLift access to that Amazon S3 bucket. To create a new build record using files in your Amazon S3 bucket, call <code>CreateBuild</code> and specify a build name, operating system, and the storage location of your game build.</p> </li> <li> <p>Upload a build file directly to Amazon GameLift's Amazon S3 account. To use this option, you first call <code>CreateBuild</code> with a build name and operating system. This action creates a new build record and returns an Amazon S3 storage location (bucket and key only) and temporary access credentials. Use the credentials to manually upload your build file to the storage location (see the Amazon S3 topic <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/UploadingObjects.html\">Uploading Objects</a>). You can upload files to a location only once. </p> </li> </ul> <p>If successful, this operation creates a new build record with a unique build ID and places it in <code>INITIALIZED</code> status. You can use <a>DescribeBuild</a> to check the status of your build. A build must be in <code>READY</code> status before it can be used to create fleets.</p> <p> <b>Learn more</b> </p> <p> <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/gamelift-build-intro.html\">Uploading Your Game</a> </p> <p> <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/gamelift-build-cli-uploading.html#gamelift-build-cli-uploading-create-build\"> Create a Build with Files in Amazon S3</a> </p> <p> <b>Related operations</b> </p> <ul> <li> <p> <a>CreateBuild</a> </p> </li> <li> <p> <a>ListBuilds</a> </p> </li> <li> <p> <a>DescribeBuild</a> </p> </li> <li> <p> <a>UpdateBuild</a> </p> </li> <li> <p> <a>DeleteBuild</a> </p> </li> </ul>"
+      "documentation":"<p>Creates a new Amazon GameLift build record for your game server binary files and points to the location of your game server build files in an Amazon Simple Storage Service (Amazon S3) location. </p> <p>Game server binaries must be combined into a zip file for use with Amazon GameLift. </p> <important> <p>To create new builds directly from a file directory, use the AWS CLI command <b> <a href=\"https://docs.aws.amazon.com/cli/latest/reference/gamelift/upload-build.html\">upload-build</a> </b>. This helper command uploads build files and creates a new build record in one step, and automatically handles the necessary permissions. </p> </important> <p>The <code>CreateBuild</code> operation should be used only in the following scenarios:</p> <ul> <li> <p>To create a new game build with build files that are in an Amazon S3 bucket under your own AWS account. To use this option, you must first give Amazon GameLift access to that Amazon S3 bucket. Then call <code>CreateBuild</code> and specify a build name, operating system, and the Amazon S3 storage location of your game build.</p> </li> <li> <p>To upload build files directly to Amazon GameLift's Amazon S3 account. To use this option, first call <code>CreateBuild</code> and specify a build name and operating system. This action creates a new build record and returns an Amazon S3 storage location (bucket and key only) and temporary access credentials. Use the credentials to manually upload your build file to the provided storage location (see the Amazon S3 topic <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/UploadingObjects.html\">Uploading Objects</a>). You can upload build files to the GameLift Amazon S3 location only once. </p> </li> </ul> <p>If successful, this operation creates a new build record with a unique build ID and places it in <code>INITIALIZED</code> status. You can use <a>DescribeBuild</a> to check the status of your build. A build must be in <code>READY</code> status before it can be used to create fleets.</p> <p> <b>Learn more</b> </p> <p> <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/gamelift-build-intro.html\">Uploading Your Game</a> <a href=\"https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html\">https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html</a> </p> <p> <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/gamelift-build-cli-uploading.html#gamelift-build-cli-uploading-create-build\"> Create a Build with Files in Amazon S3</a> </p> <p> <b>Related operations</b> </p> <ul> <li> <p> <a>CreateBuild</a> </p> </li> <li> <p> <a>ListBuilds</a> </p> </li> <li> <p> <a>DescribeBuild</a> </p> </li> <li> <p> <a>UpdateBuild</a> </p> </li> <li> <p> <a>DeleteBuild</a> </p> </li> </ul>"
     },
     "CreateFleet":{
       "name":"CreateFleet",
@@ -75,9 +77,10 @@
         {"shape":"ConflictException"},
         {"shape":"LimitExceededException"},
         {"shape":"InvalidRequestException"},
-        {"shape":"UnauthorizedException"}
+        {"shape":"UnauthorizedException"},
+        {"shape":"TaggingFailedException"}
       ],
-      "documentation":"<p>Creates a new fleet to run your game servers. whether they are custom game builds or Realtime Servers with game-specific script. A fleet is a set of Amazon Elastic Compute Cloud (Amazon EC2) instances, each of which can host multiple game sessions. When creating a fleet, you choose the hardware specifications, set some configuration options, and specify the game server to deploy on the new fleet. </p> <p>To create a new fleet, you must provide the following: (1) a fleet name, (2) an EC2 instance type and fleet type (spot or on-demand), (3) the build ID for your game build or script ID if using Realtime Servers, and (4) a run-time configuration, which determines how game servers will run on each instance in the fleet. </p> <note> <p>When creating a Realtime Servers fleet, we recommend using a minimal version of the Realtime script (see this <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/realtime-script.html#realtime-script-examples\"> working code example </a>). This will make it much easier to troubleshoot any fleet creation issues. Once the fleet is active, you can update your Realtime script as needed.</p> </note> <p>If the <code>CreateFleet</code> call is successful, Amazon GameLift performs the following tasks. You can track the process of a fleet by checking the fleet status or by monitoring fleet creation events:</p> <ul> <li> <p>Creates a fleet record. Status: <code>NEW</code>.</p> </li> <li> <p>Begins writing events to the fleet event log, which can be accessed in the Amazon GameLift console.</p> <p>Sets the fleet's target capacity to 1 (desired instances), which triggers Amazon GameLift to start one new EC2 instance.</p> </li> <li> <p>Downloads the game build or Realtime script to the new instance and installs it. Statuses: <code>DOWNLOADING</code>, <code>VALIDATING</code>, <code>BUILDING</code>. </p> </li> <li> <p>Starts launching server processes on the instance. If the fleet is configured to run multiple server processes per instance, Amazon GameLift staggers each launch by a few seconds. Status: <code>ACTIVATING</code>.</p> </li> <li> <p>Sets the fleet's status to <code>ACTIVE</code> as soon as one server process is ready to host a game session.</p> </li> </ul> <p> <b>Learn more</b> </p> <p> <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/fleets-intro.html\"> Working with Fleets</a> </p> <p> <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/fleets-creating-debug.html\"> Debug Fleet Creation Issues</a> </p> <p> <b>Related operations</b> </p> <ul> <li> <p> <a>CreateFleet</a> </p> </li> <li> <p> <a>ListFleets</a> </p> </li> <li> <p> <a>DeleteFleet</a> </p> </li> <li> <p>Describe fleets:</p> <ul> <li> <p> <a>DescribeFleetAttributes</a> </p> </li> <li> <p> <a>DescribeFleetCapacity</a> </p> </li> <li> <p> <a>DescribeFleetPortSettings</a> </p> </li> <li> <p> <a>DescribeFleetUtilization</a> </p> </li> <li> <p> <a>DescribeRuntimeConfiguration</a> </p> </li> <li> <p> <a>DescribeEC2InstanceLimits</a> </p> </li> <li> <p> <a>DescribeFleetEvents</a> </p> </li> </ul> </li> <li> <p>Update fleets:</p> <ul> <li> <p> <a>UpdateFleetAttributes</a> </p> </li> <li> <p> <a>UpdateFleetCapacity</a> </p> </li> <li> <p> <a>UpdateFleetPortSettings</a> </p> </li> <li> <p> <a>UpdateRuntimeConfiguration</a> </p> </li> </ul> </li> <li> <p>Manage fleet actions:</p> <ul> <li> <p> <a>StartFleetActions</a> </p> </li> <li> <p> <a>StopFleetActions</a> </p> </li> </ul> </li> </ul>"
+      "documentation":"<p>Creates a new fleet to run your game servers. whether they are custom game builds or Realtime Servers with game-specific script. A fleet is a set of Amazon Elastic Compute Cloud (Amazon EC2) instances, each of which can host multiple game sessions. When creating a fleet, you choose the hardware specifications, set some configuration options, and specify the game server to deploy on the new fleet. </p> <p>To create a new fleet, you must provide the following: (1) a fleet name, (2) an EC2 instance type and fleet type (spot or on-demand), (3) the build ID for your game build or script ID if using Realtime Servers, and (4) a runtime configuration, which determines how game servers will run on each instance in the fleet. </p> <p>If the <code>CreateFleet</code> call is successful, Amazon GameLift performs the following tasks. You can track the process of a fleet by checking the fleet status or by monitoring fleet creation events:</p> <ul> <li> <p>Creates a fleet record. Status: <code>NEW</code>.</p> </li> <li> <p>Begins writing events to the fleet event log, which can be accessed in the Amazon GameLift console.</p> </li> <li> <p>Sets the fleet's target capacity to 1 (desired instances), which triggers Amazon GameLift to start one new EC2 instance.</p> </li> <li> <p>Downloads the game build or Realtime script to the new instance and installs it. Statuses: <code>DOWNLOADING</code>, <code>VALIDATING</code>, <code>BUILDING</code>. </p> </li> <li> <p>Starts launching server processes on the instance. If the fleet is configured to run multiple server processes per instance, Amazon GameLift staggers each process launch by a few seconds. Status: <code>ACTIVATING</code>.</p> </li> <li> <p>Sets the fleet's status to <code>ACTIVE</code> as soon as one server process is ready to host a game session.</p> </li> </ul> <p> <b>Learn more</b> </p> <p> <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/fleets-intro.html\"> Setting Up Fleets</a> </p> <p> <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/fleets-creating-debug.html#fleets-creating-debug-creation\"> Debug Fleet Creation Issues</a> </p> <p> <b>Related operations</b> </p> <ul> <li> <p> <a>CreateFleet</a> </p> </li> <li> <p> <a>ListFleets</a> </p> </li> <li> <p> <a>DeleteFleet</a> </p> </li> <li> <p> <a>DescribeFleetAttributes</a> </p> </li> <li> <p> <a>UpdateFleetAttributes</a> </p> </li> <li> <p>Manage fleet actions:</p> <ul> <li> <p> <a>StartFleetActions</a> </p> </li> <li> <p> <a>StopFleetActions</a> </p> </li> </ul> </li> </ul>"
     },
     "CreateGameSession":{
       "name":"CreateGameSession",
@@ -113,9 +116,10 @@
         {"shape":"InternalServiceException"},
         {"shape":"InvalidRequestException"},
         {"shape":"UnauthorizedException"},
-        {"shape":"LimitExceededException"}
+        {"shape":"LimitExceededException"},
+        {"shape":"TaggingFailedException"}
       ],
-      "documentation":"<p>Establishes a new queue for processing requests to place new game sessions. A queue identifies where new game sessions can be hosted -- by specifying a list of destinations (fleets or aliases) -- and how long requests can wait in the queue before timing out. You can set up a queue to try to place game sessions on fleets in multiple regions. To add placement requests to a queue, call <a>StartGameSessionPlacement</a> and reference the queue name.</p> <p> <b>Destination order.</b> When processing a request for a game session, Amazon GameLift tries each destination in order until it finds one with available resources to host the new game session. A queue's default order is determined by how destinations are listed. The default order is overridden when a game session placement request provides player latency information. Player latency information enables Amazon GameLift to prioritize destinations where players report the lowest average latency, as a result placing the new game session where the majority of players will have the best possible gameplay experience.</p> <p> <b>Player latency policies.</b> For placement requests containing player latency information, use player latency policies to protect individual players from very high latencies. With a latency cap, even when a destination can deliver a low latency for most players, the game is not placed where any individual player is reporting latency higher than a policy's maximum. A queue can have multiple latency policies, which are enforced consecutively starting with the policy with the lowest latency cap. Use multiple policies to gradually relax latency controls; for example, you might set a policy with a low latency cap for the first 60 seconds, a second policy with a higher cap for the next 60 seconds, etc. </p> <p>To create a new queue, provide a name, timeout value, a list of destinations and, if desired, a set of latency policies. If successful, a new queue object is returned.</p> <ul> <li> <p> <a>CreateGameSessionQueue</a> </p> </li> <li> <p> <a>DescribeGameSessionQueues</a> </p> </li> <li> <p> <a>UpdateGameSessionQueue</a> </p> </li> <li> <p> <a>DeleteGameSessionQueue</a> </p> </li> </ul>"
+      "documentation":"<p>Establishes a new queue for processing requests to place new game sessions. A queue identifies where new game sessions can be hosted -- by specifying a list of destinations (fleets or aliases) -- and how long requests can wait in the queue before timing out. You can set up a queue to try to place game sessions on fleets in multiple Regions. To add placement requests to a queue, call <a>StartGameSessionPlacement</a> and reference the queue name.</p> <p> <b>Destination order.</b> When processing a request for a game session, Amazon GameLift tries each destination in order until it finds one with available resources to host the new game session. A queue's default order is determined by how destinations are listed. The default order is overridden when a game session placement request provides player latency information. Player latency information enables Amazon GameLift to prioritize destinations where players report the lowest average latency, as a result placing the new game session where the majority of players will have the best possible gameplay experience.</p> <p> <b>Player latency policies.</b> For placement requests containing player latency information, use player latency policies to protect individual players from very high latencies. With a latency cap, even when a destination can deliver a low latency for most players, the game is not placed where any individual player is reporting latency higher than a policy's maximum. A queue can have multiple latency policies, which are enforced consecutively starting with the policy with the lowest latency cap. Use multiple policies to gradually relax latency controls; for example, you might set a policy with a low latency cap for the first 60 seconds, a second policy with a higher cap for the next 60 seconds, etc. </p> <p>To create a new queue, provide a name, timeout value, a list of destinations and, if desired, a set of latency policies. If successful, a new queue object is returned.</p> <ul> <li> <p> <a>CreateGameSessionQueue</a> </p> </li> <li> <p> <a>DescribeGameSessionQueues</a> </p> </li> <li> <p> <a>UpdateGameSessionQueue</a> </p> </li> <li> <p> <a>DeleteGameSessionQueue</a> </p> </li> </ul>"
     },
     "CreateMatchmakingConfiguration":{
       "name":"CreateMatchmakingConfiguration",
@@ -130,7 +134,8 @@
         {"shape":"LimitExceededException"},
         {"shape":"NotFoundException"},
         {"shape":"InternalServiceException"},
-        {"shape":"UnsupportedRegionException"}
+        {"shape":"UnsupportedRegionException"},
+        {"shape":"TaggingFailedException"}
       ],
       "documentation":"<p>Defines a new matchmaking configuration for use with FlexMatch. A matchmaking configuration sets out guidelines for matching players and getting the matches into games. You can set up multiple matchmaking configurations to handle the scenarios needed for your game. Each matchmaking ticket (<a>StartMatchmaking</a> or <a>StartMatchBackfill</a>) specifies a configuration for the match and provides player attributes to support the configuration being used. </p> <p>To create a matchmaking configuration, at a minimum you must specify the following: configuration name; a rule set that governs how to evaluate players and find acceptable matches; a game session queue to use when placing a new game session for the match; and the maximum time allowed for a matchmaking attempt.</p> <p>There are two ways to track the progress of matchmaking tickets: (1) polling ticket status with <a>DescribeMatchmaking</a>; or (2) receiving notifications with Amazon Simple Notification Service (SNS). To use notifications, you first need to set up an SNS topic to receive the notifications, and provide the topic ARN in the matchmaking configuration. Since notifications promise only \"best effort\" delivery, we recommend calling <code>DescribeMatchmaking</code> if no notifications are received within 30 seconds.</p> <p> <b>Learn more</b> </p> <p> <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/match-configuration.html\"> Design a FlexMatch Matchmaker</a> </p> <p> <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/match-notification.html\"> Setting up Notifications for Matchmaking</a> </p> <p> <b>Related operations</b> </p> <ul> <li> <p> <a>CreateMatchmakingConfiguration</a> </p> </li> <li> <p> <a>DescribeMatchmakingConfigurations</a> </p> </li> <li> <p> <a>UpdateMatchmakingConfiguration</a> </p> </li> <li> <p> <a>DeleteMatchmakingConfiguration</a> </p> </li> <li> <p> <a>CreateMatchmakingRuleSet</a> </p> </li> <li> <p> <a>DescribeMatchmakingRuleSets</a> </p> </li> <li> <p> <a>ValidateMatchmakingRuleSet</a> </p> </li> <li> <p> <a>DeleteMatchmakingRuleSet</a> </p> </li> </ul>"
     },
@@ -145,9 +150,10 @@
       "errors":[
         {"shape":"InvalidRequestException"},
         {"shape":"InternalServiceException"},
-        {"shape":"UnsupportedRegionException"}
+        {"shape":"UnsupportedRegionException"},
+        {"shape":"TaggingFailedException"}
       ],
-      "documentation":"<p>Creates a new rule set for FlexMatch matchmaking. A rule set describes the type of match to create, such as the number and size of teams, and sets the parameters for acceptable player matches, such as minimum skill level or character type. A rule set is used by a <a>MatchmakingConfiguration</a>. </p> <p>To create a matchmaking rule set, provide unique rule set name and the rule set body in JSON format. Rule sets must be defined in the same region as the matchmaking configuration they are used with.</p> <p>Since matchmaking rule sets cannot be edited, it is a good idea to check the rule set syntax using <a>ValidateMatchmakingRuleSet</a> before creating a new rule set.</p> <p> <b>Learn more</b> </p> <ul> <li> <p> <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/match-rulesets.html\">Build a Rule Set</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/match-configuration.html\">Design a Matchmaker</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/match-intro.html\">Matchmaking with FlexMatch</a> </p> </li> </ul> <p> <b>Related operations</b> </p> <ul> <li> <p> <a>CreateMatchmakingConfiguration</a> </p> </li> <li> <p> <a>DescribeMatchmakingConfigurations</a> </p> </li> <li> <p> <a>UpdateMatchmakingConfiguration</a> </p> </li> <li> <p> <a>DeleteMatchmakingConfiguration</a> </p> </li> <li> <p> <a>CreateMatchmakingRuleSet</a> </p> </li> <li> <p> <a>DescribeMatchmakingRuleSets</a> </p> </li> <li> <p> <a>ValidateMatchmakingRuleSet</a> </p> </li> <li> <p> <a>DeleteMatchmakingRuleSet</a> </p> </li> </ul>"
+      "documentation":"<p>Creates a new rule set for FlexMatch matchmaking. A rule set describes the type of match to create, such as the number and size of teams. It also sets the parameters for acceptable player matches, such as minimum skill level or character type. A rule set is used by a <a>MatchmakingConfiguration</a>. </p> <p>To create a matchmaking rule set, provide unique rule set name and the rule set body in JSON format. Rule sets must be defined in the same Region as the matchmaking configuration they are used with.</p> <p>Since matchmaking rule sets cannot be edited, it is a good idea to check the rule set syntax using <a>ValidateMatchmakingRuleSet</a> before creating a new rule set.</p> <p> <b>Learn more</b> </p> <ul> <li> <p> <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/match-rulesets.html\">Build a Rule Set</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/match-configuration.html\">Design a Matchmaker</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/match-intro.html\">Matchmaking with FlexMatch</a> </p> </li> </ul> <p> <b>Related operations</b> </p> <ul> <li> <p> <a>CreateMatchmakingConfiguration</a> </p> </li> <li> <p> <a>DescribeMatchmakingConfigurations</a> </p> </li> <li> <p> <a>UpdateMatchmakingConfiguration</a> </p> </li> <li> <p> <a>DeleteMatchmakingConfiguration</a> </p> </li> <li> <p> <a>CreateMatchmakingRuleSet</a> </p> </li> <li> <p> <a>DescribeMatchmakingRuleSets</a> </p> </li> <li> <p> <a>ValidateMatchmakingRuleSet</a> </p> </li> <li> <p> <a>DeleteMatchmakingRuleSet</a> </p> </li> </ul>"
     },
     "CreatePlayerSession":{
       "name":"CreatePlayerSession",
@@ -199,6 +205,7 @@
         {"shape":"UnauthorizedException"},
         {"shape":"InvalidRequestException"},
         {"shape":"ConflictException"},
+        {"shape":"TaggingFailedException"},
         {"shape":"InternalServiceException"}
       ],
       "documentation":"<p>Creates a new script record for your Realtime Servers script. Realtime scripts are JavaScript that provide configuration settings and optional custom game logic for your game. The script is deployed when you create a Realtime Servers fleet to host your game sessions. Script logic is executed during an active game session. </p> <p>To create a new script record, specify a script name and provide the script file(s). The script files and all dependencies must be zipped into a single file. You can pull the zip file from either of these locations: </p> <ul> <li> <p>A locally available directory. Use the <i>ZipFile</i> parameter for this option.</p> </li> <li> <p>An Amazon Simple Storage Service (Amazon S3) bucket under your AWS account. Use the <i>StorageLocation</i> parameter for this option. You'll need to have an Identity Access Management (IAM) role that allows the Amazon GameLift service to access your S3 bucket. </p> </li> </ul> <p>If the call is successful, a new script record is created with a unique script ID. If the script file is provided as a local file, the file is uploaded to an Amazon GameLift-owned S3 bucket and the script record's storage location reflects this location. If the script file is provided as an S3 bucket, Amazon GameLift accesses the file at this storage location as needed for deployment.</p> <p> <b>Learn more</b> </p> <p> <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/realtime-intro.html\">Amazon GameLift Realtime Servers</a> </p> <p> <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/setting-up-role.html\">Set Up a Role for Amazon GameLift Access</a> </p> <p> <b>Related operations</b> </p> <ul> <li> <p> <a>CreateScript</a> </p> </li> <li> <p> <a>ListScripts</a> </p> </li> <li> <p> <a>DescribeScript</a> </p> </li> <li> <p> <a>UpdateScript</a> </p> </li> <li> <p> <a>DeleteScript</a> </p> </li> </ul>"
@@ -217,7 +224,7 @@
         {"shape":"NotFoundException"},
         {"shape":"InternalServiceException"}
       ],
-      "documentation":"<p>Requests authorization to create or delete a peer connection between the VPC for your Amazon GameLift fleet and a virtual private cloud (VPC) in your AWS account. VPC peering enables the game servers on your fleet to communicate directly with other AWS resources. Once you've received authorization, call <a>CreateVpcPeeringConnection</a> to establish the peering connection. For more information, see <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/vpc-peering.html\">VPC Peering with Amazon GameLift Fleets</a>.</p> <p>You can peer with VPCs that are owned by any AWS account you have access to, including the account that you use to manage your Amazon GameLift fleets. You cannot peer with VPCs that are in different regions.</p> <p>To request authorization to create a connection, call this operation from the AWS account with the VPC that you want to peer to your Amazon GameLift fleet. For example, to enable your game servers to retrieve data from a DynamoDB table, use the account that manages that DynamoDB resource. Identify the following values: (1) The ID of the VPC that you want to peer with, and (2) the ID of the AWS account that you use to manage Amazon GameLift. If successful, VPC peering is authorized for the specified VPC. </p> <p>To request authorization to delete a connection, call this operation from the AWS account with the VPC that is peered with your Amazon GameLift fleet. Identify the following values: (1) VPC ID that you want to delete the peering connection for, and (2) ID of the AWS account that you use to manage Amazon GameLift. </p> <p>The authorization remains valid for 24 hours unless it is canceled by a call to <a>DeleteVpcPeeringAuthorization</a>. You must create or delete the peering connection while the authorization is valid. </p> <ul> <li> <p> <a>CreateVpcPeeringAuthorization</a> </p> </li> <li> <p> <a>DescribeVpcPeeringAuthorizations</a> </p> </li> <li> <p> <a>DeleteVpcPeeringAuthorization</a> </p> </li> <li> <p> <a>CreateVpcPeeringConnection</a> </p> </li> <li> <p> <a>DescribeVpcPeeringConnections</a> </p> </li> <li> <p> <a>DeleteVpcPeeringConnection</a> </p> </li> </ul>"
+      "documentation":"<p>Requests authorization to create or delete a peer connection between the VPC for your Amazon GameLift fleet and a virtual private cloud (VPC) in your AWS account. VPC peering enables the game servers on your fleet to communicate directly with other AWS resources. Once you've received authorization, call <a>CreateVpcPeeringConnection</a> to establish the peering connection. For more information, see <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/vpc-peering.html\">VPC Peering with Amazon GameLift Fleets</a>.</p> <p>You can peer with VPCs that are owned by any AWS account you have access to, including the account that you use to manage your Amazon GameLift fleets. You cannot peer with VPCs that are in different Regions.</p> <p>To request authorization to create a connection, call this operation from the AWS account with the VPC that you want to peer to your Amazon GameLift fleet. For example, to enable your game servers to retrieve data from a DynamoDB table, use the account that manages that DynamoDB resource. Identify the following values: (1) The ID of the VPC that you want to peer with, and (2) the ID of the AWS account that you use to manage Amazon GameLift. If successful, VPC peering is authorized for the specified VPC. </p> <p>To request authorization to delete a connection, call this operation from the AWS account with the VPC that is peered with your Amazon GameLift fleet. Identify the following values: (1) VPC ID that you want to delete the peering connection for, and (2) ID of the AWS account that you use to manage Amazon GameLift. </p> <p>The authorization remains valid for 24 hours unless it is canceled by a call to <a>DeleteVpcPeeringAuthorization</a>. You must create or delete the peering connection while the authorization is valid. </p> <ul> <li> <p> <a>CreateVpcPeeringAuthorization</a> </p> </li> <li> <p> <a>DescribeVpcPeeringAuthorizations</a> </p> </li> <li> <p> <a>DeleteVpcPeeringAuthorization</a> </p> </li> <li> <p> <a>CreateVpcPeeringConnection</a> </p> </li> <li> <p> <a>DescribeVpcPeeringConnections</a> </p> </li> <li> <p> <a>DeleteVpcPeeringConnection</a> </p> </li> </ul>"
     },
     "CreateVpcPeeringConnection":{
       "name":"CreateVpcPeeringConnection",
@@ -233,7 +240,7 @@
         {"shape":"NotFoundException"},
         {"shape":"InternalServiceException"}
       ],
-      "documentation":"<p>Establishes a VPC peering connection between a virtual private cloud (VPC) in an AWS account with the VPC for your Amazon GameLift fleet. VPC peering enables the game servers on your fleet to communicate directly with other AWS resources. You can peer with VPCs in any AWS account that you have access to, including the account that you use to manage your Amazon GameLift fleets. You cannot peer with VPCs that are in different regions. For more information, see <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/vpc-peering.html\">VPC Peering with Amazon GameLift Fleets</a>.</p> <p>Before calling this operation to establish the peering connection, you first need to call <a>CreateVpcPeeringAuthorization</a> and identify the VPC you want to peer with. Once the authorization for the specified VPC is issued, you have 24 hours to establish the connection. These two operations handle all tasks necessary to peer the two VPCs, including acceptance, updating routing tables, etc. </p> <p>To establish the connection, call this operation from the AWS account that is used to manage the Amazon GameLift fleets. Identify the following values: (1) The ID of the fleet you want to be enable a VPC peering connection for; (2) The AWS account with the VPC that you want to peer with; and (3) The ID of the VPC you want to peer with. This operation is asynchronous. If successful, a <a>VpcPeeringConnection</a> request is created. You can use continuous polling to track the request's status using <a>DescribeVpcPeeringConnections</a>, or by monitoring fleet events for success or failure using <a>DescribeFleetEvents</a>. </p> <ul> <li> <p> <a>CreateVpcPeeringAuthorization</a> </p> </li> <li> <p> <a>DescribeVpcPeeringAuthorizations</a> </p> </li> <li> <p> <a>DeleteVpcPeeringAuthorization</a> </p> </li> <li> <p> <a>CreateVpcPeeringConnection</a> </p> </li> <li> <p> <a>DescribeVpcPeeringConnections</a> </p> </li> <li> <p> <a>DeleteVpcPeeringConnection</a> </p> </li> </ul>"
+      "documentation":"<p>Establishes a VPC peering connection between a virtual private cloud (VPC) in an AWS account with the VPC for your Amazon GameLift fleet. VPC peering enables the game servers on your fleet to communicate directly with other AWS resources. You can peer with VPCs in any AWS account that you have access to, including the account that you use to manage your Amazon GameLift fleets. You cannot peer with VPCs that are in different Regions. For more information, see <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/vpc-peering.html\">VPC Peering with Amazon GameLift Fleets</a>.</p> <p>Before calling this operation to establish the peering connection, you first need to call <a>CreateVpcPeeringAuthorization</a> and identify the VPC you want to peer with. Once the authorization for the specified VPC is issued, you have 24 hours to establish the connection. These two operations handle all tasks necessary to peer the two VPCs, including acceptance, updating routing tables, etc. </p> <p>To establish the connection, call this operation from the AWS account that is used to manage the Amazon GameLift fleets. Identify the following values: (1) The ID of the fleet you want to be enable a VPC peering connection for; (2) The AWS account with the VPC that you want to peer with; and (3) The ID of the VPC you want to peer with. This operation is asynchronous. If successful, a <a>VpcPeeringConnection</a> request is created. You can use continuous polling to track the request's status using <a>DescribeVpcPeeringConnections</a>, or by monitoring fleet events for success or failure using <a>DescribeFleetEvents</a>. </p> <ul> <li> <p> <a>CreateVpcPeeringAuthorization</a> </p> </li> <li> <p> <a>DescribeVpcPeeringAuthorizations</a> </p> </li> <li> <p> <a>DeleteVpcPeeringAuthorization</a> </p> </li> <li> <p> <a>CreateVpcPeeringConnection</a> </p> </li> <li> <p> <a>DescribeVpcPeeringConnections</a> </p> </li> <li> <p> <a>DeleteVpcPeeringConnection</a> </p> </li> </ul>"
     },
     "DeleteAlias":{
       "name":"DeleteAlias",
@@ -246,6 +253,7 @@
         {"shape":"UnauthorizedException"},
         {"shape":"NotFoundException"},
         {"shape":"InvalidRequestException"},
+        {"shape":"TaggingFailedException"},
         {"shape":"InternalServiceException"}
       ],
       "documentation":"<p>Deletes an alias. This action removes all record of the alias. Game clients attempting to access a server process using the deleted alias receive an error. To delete an alias, specify the alias ID to be deleted.</p> <ul> <li> <p> <a>CreateAlias</a> </p> </li> <li> <p> <a>ListAliases</a> </p> </li> <li> <p> <a>DescribeAlias</a> </p> </li> <li> <p> <a>UpdateAlias</a> </p> </li> <li> <p> <a>DeleteAlias</a> </p> </li> <li> <p> <a>ResolveAlias</a> </p> </li> </ul>"
@@ -261,6 +269,7 @@
         {"shape":"UnauthorizedException"},
         {"shape":"NotFoundException"},
         {"shape":"InternalServiceException"},
+        {"shape":"TaggingFailedException"},
         {"shape":"InvalidRequestException"}
       ],
       "documentation":"<p>Deletes a build. This action permanently deletes the build record and any uploaded build files.</p> <p>To delete a build, specify its ID. Deleting a build does not affect the status of any active fleets using the build, but you can no longer create new fleets with the deleted build.</p> <p> <b>Learn more</b> </p> <p> <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/build-intro.html\"> Working with Builds</a> </p> <p> <b>Related operations</b> </p> <ul> <li> <p> <a>CreateBuild</a> </p> </li> <li> <p> <a>ListBuilds</a> </p> </li> <li> <p> <a>DescribeBuild</a> </p> </li> <li> <p> <a>UpdateBuild</a> </p> </li> <li> <p> <a>DeleteBuild</a> </p> </li> </ul>"
@@ -277,9 +286,10 @@
         {"shape":"InternalServiceException"},
         {"shape":"InvalidFleetStatusException"},
         {"shape":"UnauthorizedException"},
-        {"shape":"InvalidRequestException"}
+        {"shape":"InvalidRequestException"},
+        {"shape":"TaggingFailedException"}
       ],
-      "documentation":"<p>Deletes everything related to a fleet. Before deleting a fleet, you must set the fleet's desired capacity to zero. See <a>UpdateFleetCapacity</a>.</p> <p>If the fleet being deleted has a VPC peering connection, you first need to get a valid authorization (good for 24 hours) by calling <a>CreateVpcPeeringAuthorization</a>. You do not need to explicitly delete the VPC peering connection--this is done as part of the delete fleet process.</p> <p>This action removes the fleet's resources and the fleet record. Once a fleet is deleted, you can no longer use that fleet.</p> <p> <b>Learn more</b> </p> <p> <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/fleets-intro.html\"> Working with Fleets</a>.</p> <p> <b>Related operations</b> </p> <ul> <li> <p> <a>CreateFleet</a> </p> </li> <li> <p> <a>ListFleets</a> </p> </li> <li> <p> <a>DeleteFleet</a> </p> </li> <li> <p>Describe fleets:</p> <ul> <li> <p> <a>DescribeFleetAttributes</a> </p> </li> <li> <p> <a>DescribeFleetCapacity</a> </p> </li> <li> <p> <a>DescribeFleetPortSettings</a> </p> </li> <li> <p> <a>DescribeFleetUtilization</a> </p> </li> <li> <p> <a>DescribeRuntimeConfiguration</a> </p> </li> <li> <p> <a>DescribeEC2InstanceLimits</a> </p> </li> <li> <p> <a>DescribeFleetEvents</a> </p> </li> </ul> </li> <li> <p>Update fleets:</p> <ul> <li> <p> <a>UpdateFleetAttributes</a> </p> </li> <li> <p> <a>UpdateFleetCapacity</a> </p> </li> <li> <p> <a>UpdateFleetPortSettings</a> </p> </li> <li> <p> <a>UpdateRuntimeConfiguration</a> </p> </li> </ul> </li> <li> <p>Manage fleet actions:</p> <ul> <li> <p> <a>StartFleetActions</a> </p> </li> <li> <p> <a>StopFleetActions</a> </p> </li> </ul> </li> </ul>"
+      "documentation":"<p>Deletes everything related to a fleet. Before deleting a fleet, you must set the fleet's desired capacity to zero. See <a>UpdateFleetCapacity</a>.</p> <p>If the fleet being deleted has a VPC peering connection, you first need to get a valid authorization (good for 24 hours) by calling <a>CreateVpcPeeringAuthorization</a>. You do not need to explicitly delete the VPC peering connection--this is done as part of the delete fleet process.</p> <p>This action removes the fleet's resources and the fleet record. Once a fleet is deleted, you can no longer use that fleet.</p> <p> <b>Learn more</b> </p> <p> <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/fleets-intro.html\"> Working with Fleets</a>.</p> <p> <b>Related operations</b> </p> <ul> <li> <p> <a>CreateFleet</a> </p> </li> <li> <p> <a>ListFleets</a> </p> </li> <li> <p> <a>DeleteFleet</a> </p> </li> <li> <p> <a>DescribeFleetAttributes</a> </p> </li> <li> <p> <a>UpdateFleetAttributes</a> </p> </li> <li> <p>Manage fleet actions:</p> <ul> <li> <p> <a>StartFleetActions</a> </p> </li> <li> <p> <a>StopFleetActions</a> </p> </li> </ul> </li> </ul>"
     },
     "DeleteGameSessionQueue":{
       "name":"DeleteGameSessionQueue",
@@ -293,7 +303,8 @@
         {"shape":"InternalServiceException"},
         {"shape":"InvalidRequestException"},
         {"shape":"NotFoundException"},
-        {"shape":"UnauthorizedException"}
+        {"shape":"UnauthorizedException"},
+        {"shape":"TaggingFailedException"}
       ],
       "documentation":"<p>Deletes a game session queue. This action means that any <a>StartGameSessionPlacement</a> requests that reference this queue will fail. To delete a queue, specify the queue name.</p> <ul> <li> <p> <a>CreateGameSessionQueue</a> </p> </li> <li> <p> <a>DescribeGameSessionQueues</a> </p> </li> <li> <p> <a>UpdateGameSessionQueue</a> </p> </li> <li> <p> <a>DeleteGameSessionQueue</a> </p> </li> </ul>"
     },
@@ -309,7 +320,8 @@
         {"shape":"InvalidRequestException"},
         {"shape":"NotFoundException"},
         {"shape":"InternalServiceException"},
-        {"shape":"UnsupportedRegionException"}
+        {"shape":"UnsupportedRegionException"},
+        {"shape":"TaggingFailedException"}
       ],
       "documentation":"<p>Permanently removes a FlexMatch matchmaking configuration. To delete, specify the configuration name. A matchmaking configuration cannot be deleted if it is being used in any active matchmaking tickets.</p> <p> <b>Related operations</b> </p> <ul> <li> <p> <a>CreateMatchmakingConfiguration</a> </p> </li> <li> <p> <a>DescribeMatchmakingConfigurations</a> </p> </li> <li> <p> <a>UpdateMatchmakingConfiguration</a> </p> </li> <li> <p> <a>DeleteMatchmakingConfiguration</a> </p> </li> <li> <p> <a>CreateMatchmakingRuleSet</a> </p> </li> <li> <p> <a>DescribeMatchmakingRuleSets</a> </p> </li> <li> <p> <a>ValidateMatchmakingRuleSet</a> </p> </li> <li> <p> <a>DeleteMatchmakingRuleSet</a> </p> </li> </ul>"
     },
@@ -325,7 +337,8 @@
         {"shape":"InvalidRequestException"},
         {"shape":"InternalServiceException"},
         {"shape":"UnsupportedRegionException"},
-        {"shape":"NotFoundException"}
+        {"shape":"NotFoundException"},
+        {"shape":"TaggingFailedException"}
       ],
       "documentation":"<p>Deletes an existing matchmaking rule set. To delete the rule set, provide the rule set name. Rule sets cannot be deleted if they are currently being used by a matchmaking configuration. </p> <p> <b>Learn more</b> </p> <ul> <li> <p> <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/match-rulesets.html\">Build a Rule Set</a> </p> </li> </ul> <p> <b>Related operations</b> </p> <ul> <li> <p> <a>CreateMatchmakingConfiguration</a> </p> </li> <li> <p> <a>DescribeMatchmakingConfigurations</a> </p> </li> <li> <p> <a>UpdateMatchmakingConfiguration</a> </p> </li> <li> <p> <a>DeleteMatchmakingConfiguration</a> </p> </li> <li> <p> <a>CreateMatchmakingRuleSet</a> </p> </li> <li> <p> <a>DescribeMatchmakingRuleSets</a> </p> </li> <li> <p> <a>ValidateMatchmakingRuleSet</a> </p> </li> <li> <p> <a>DeleteMatchmakingRuleSet</a> </p> </li> </ul>"
     },
@@ -355,6 +368,7 @@
         {"shape":"InvalidRequestException"},
         {"shape":"UnauthorizedException"},
         {"shape":"NotFoundException"},
+        {"shape":"TaggingFailedException"},
         {"shape":"InternalServiceException"}
       ],
       "documentation":"<p>Deletes a Realtime script. This action permanently deletes the script record. If script files were uploaded, they are also deleted (files stored in an S3 bucket are not deleted). </p> <p>To delete a script, specify the script ID. Before deleting a script, be sure to terminate all fleets that are deployed with the script being deleted. Fleet instances periodically check for script updates, and if the script record no longer exists, the instance will go into an error state and be unable to host game sessions.</p> <p> <b>Learn more</b> </p> <p> <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/realtime-intro.html\">Amazon GameLift Realtime Servers</a> </p> <p> <b>Related operations</b> </p> <ul> <li> <p> <a>CreateScript</a> </p> </li> <li> <p> <a>ListScripts</a> </p> </li> <li> <p> <a>DescribeScript</a> </p> </li> <li> <p> <a>UpdateScript</a> </p> </li> <li> <p> <a>DeleteScript</a> </p> </li> </ul>"
@@ -436,7 +450,7 @@
         {"shape":"InternalServiceException"},
         {"shape":"UnauthorizedException"}
       ],
-      "documentation":"<p>Retrieves the following information for the specified EC2 instance type:</p> <ul> <li> <p>maximum number of instances allowed per AWS account (service limit)</p> </li> <li> <p>current usage level for the AWS account</p> </li> </ul> <p>Service limits vary depending on region. Available regions for Amazon GameLift can be found in the AWS Management Console for Amazon GameLift (see the drop-down list in the upper right corner).</p> <p> <b>Learn more</b> </p> <p> <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/fleets-intro.html\"> Working with Fleets</a>.</p> <p> <b>Related operations</b> </p> <ul> <li> <p> <a>CreateFleet</a> </p> </li> <li> <p> <a>ListFleets</a> </p> </li> <li> <p> <a>DeleteFleet</a> </p> </li> <li> <p>Describe fleets:</p> <ul> <li> <p> <a>DescribeFleetAttributes</a> </p> </li> <li> <p> <a>DescribeFleetCapacity</a> </p> </li> <li> <p> <a>DescribeFleetPortSettings</a> </p> </li> <li> <p> <a>DescribeFleetUtilization</a> </p> </li> <li> <p> <a>DescribeRuntimeConfiguration</a> </p> </li> <li> <p> <a>DescribeEC2InstanceLimits</a> </p> </li> <li> <p> <a>DescribeFleetEvents</a> </p> </li> </ul> </li> <li> <p>Update fleets:</p> <ul> <li> <p> <a>UpdateFleetAttributes</a> </p> </li> <li> <p> <a>UpdateFleetCapacity</a> </p> </li> <li> <p> <a>UpdateFleetPortSettings</a> </p> </li> <li> <p> <a>UpdateRuntimeConfiguration</a> </p> </li> </ul> </li> <li> <p>Manage fleet actions:</p> <ul> <li> <p> <a>StartFleetActions</a> </p> </li> <li> <p> <a>StopFleetActions</a> </p> </li> </ul> </li> </ul>"
+      "documentation":"<p>Retrieves the following information for the specified EC2 instance type:</p> <ul> <li> <p>maximum number of instances allowed per AWS account (service limit)</p> </li> <li> <p>current usage level for the AWS account</p> </li> </ul> <p>Service limits vary depending on Region. Available Regions for Amazon GameLift can be found in the AWS Management Console for Amazon GameLift (see the drop-down list in the upper right corner).</p> <p> <b>Learn more</b> </p> <p> <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/fleets-intro.html\"> Working with Fleets</a>.</p> <p> <b>Related operations</b> </p> <ul> <li> <p> <a>CreateFleet</a> </p> </li> <li> <p> <a>ListFleets</a> </p> </li> <li> <p> <a>DeleteFleet</a> </p> </li> <li> <p>Describe fleets:</p> <ul> <li> <p> <a>DescribeFleetAttributes</a> </p> </li> <li> <p> <a>DescribeFleetCapacity</a> </p> </li> <li> <p> <a>DescribeFleetPortSettings</a> </p> </li> <li> <p> <a>DescribeFleetUtilization</a> </p> </li> <li> <p> <a>DescribeRuntimeConfiguration</a> </p> </li> <li> <p> <a>DescribeEC2InstanceLimits</a> </p> </li> <li> <p> <a>DescribeFleetEvents</a> </p> </li> </ul> </li> <li> <p>Update fleets:</p> <ul> <li> <p> <a>UpdateFleetAttributes</a> </p> </li> <li> <p> <a>UpdateFleetCapacity</a> </p> </li> <li> <p> <a>UpdateFleetPortSettings</a> </p> </li> <li> <p> <a>UpdateRuntimeConfiguration</a> </p> </li> </ul> </li> <li> <p>Manage fleet actions:</p> <ul> <li> <p> <a>StartFleetActions</a> </p> </li> <li> <p> <a>StopFleetActions</a> </p> </li> </ul> </li> </ul>"
     },
     "DescribeFleetAttributes":{
       "name":"DescribeFleetAttributes",
@@ -452,7 +466,7 @@
         {"shape":"InvalidRequestException"},
         {"shape":"UnauthorizedException"}
       ],
-      "documentation":"<p>Retrieves fleet properties, including metadata, status, and configuration, for one or more fleets. You can request attributes for all fleets, or specify a list of one or more fleet IDs. When requesting multiple fleets, use the pagination parameters to retrieve results as a set of sequential pages. If successful, a <a>FleetAttributes</a> object is returned for each requested fleet ID. When specifying a list of fleet IDs, attribute objects are returned only for fleets that currently exist. </p> <note> <p>Some API actions may limit the number of fleet IDs allowed in one request. If a request exceeds this limit, the request fails and the error message includes the maximum allowed.</p> </note> <p> <b>Learn more</b> </p> <p> <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/fleets-intro.html\"> Working with Fleets</a>.</p> <p> <b>Related operations</b> </p> <ul> <li> <p> <a>CreateFleet</a> </p> </li> <li> <p> <a>ListFleets</a> </p> </li> <li> <p> <a>DeleteFleet</a> </p> </li> <li> <p>Describe fleets:</p> <ul> <li> <p> <a>DescribeFleetAttributes</a> </p> </li> <li> <p> <a>DescribeFleetCapacity</a> </p> </li> <li> <p> <a>DescribeFleetPortSettings</a> </p> </li> <li> <p> <a>DescribeFleetUtilization</a> </p> </li> <li> <p> <a>DescribeRuntimeConfiguration</a> </p> </li> <li> <p> <a>DescribeEC2InstanceLimits</a> </p> </li> <li> <p> <a>DescribeFleetEvents</a> </p> </li> </ul> </li> <li> <p>Update fleets:</p> <ul> <li> <p> <a>UpdateFleetAttributes</a> </p> </li> <li> <p> <a>UpdateFleetCapacity</a> </p> </li> <li> <p> <a>UpdateFleetPortSettings</a> </p> </li> <li> <p> <a>UpdateRuntimeConfiguration</a> </p> </li> </ul> </li> <li> <p>Manage fleet actions:</p> <ul> <li> <p> <a>StartFleetActions</a> </p> </li> <li> <p> <a>StopFleetActions</a> </p> </li> </ul> </li> </ul>"
+      "documentation":"<p>Retrieves fleet properties, including metadata, status, and configuration, for one or more fleets. You can request attributes for all fleets, or specify a list of one or more fleet IDs. When requesting multiple fleets, use the pagination parameters to retrieve results as a set of sequential pages. If successful, a <a>FleetAttributes</a> object is returned for each requested fleet ID. When specifying a list of fleet IDs, attribute objects are returned only for fleets that currently exist. </p> <note> <p>Some API actions may limit the number of fleet IDs allowed in one request. If a request exceeds this limit, the request fails and the error message includes the maximum allowed.</p> </note> <p> <b>Learn more</b> </p> <p> <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/fleets-intro.html\"> Working with Fleets</a>.</p> <p> <b>Related operations</b> </p> <ul> <li> <p> <a>CreateFleet</a> </p> </li> <li> <p> <a>ListFleets</a> </p> </li> <li> <p> <a>DeleteFleet</a> </p> </li> <li> <p>Describe fleets:</p> <ul> <li> <p> <a>DescribeFleetAttributes</a> </p> </li> <li> <p> <a>DescribeFleetCapacity</a> </p> </li> <li> <p> <a>DescribeFleetPortSettings</a> </p> </li> <li> <p> <a>DescribeFleetUtilization</a> </p> </li> <li> <p> <a>DescribeRuntimeConfiguration</a> </p> </li> <li> <p> <a>DescribeEC2InstanceLimits</a> </p> </li> <li> <p> <a>DescribeFleetEvents</a> </p> </li> </ul> </li> <li> <p> <a>UpdateFleetAttributes</a> </p> </li> <li> <p>Manage fleet actions:</p> <ul> <li> <p> <a>StartFleetActions</a> </p> </li> <li> <p> <a>StopFleetActions</a> </p> </li> </ul> </li> </ul>"
     },
     "DescribeFleetCapacity":{
       "name":"DescribeFleetCapacity",
@@ -468,7 +482,7 @@
         {"shape":"InvalidRequestException"},
         {"shape":"UnauthorizedException"}
       ],
-      "documentation":"<p>Retrieves the current status of fleet capacity for one or more fleets. This information includes the number of instances that have been requested for the fleet and the number currently active. You can request capacity for all fleets, or specify a list of one or more fleet IDs. When requesting multiple fleets, use the pagination parameters to retrieve results as a set of sequential pages. If successful, a <a>FleetCapacity</a> object is returned for each requested fleet ID. When specifying a list of fleet IDs, attribute objects are returned only for fleets that currently exist. </p> <note> <p>Some API actions may limit the number of fleet IDs allowed in one request. If a request exceeds this limit, the request fails and the error message includes the maximum allowed.</p> </note> <p> <b>Learn more</b> </p> <p> <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/fleets-intro.html\"> Working with Fleets</a>.</p> <p> <b>Related operations</b> </p> <ul> <li> <p> <a>CreateFleet</a> </p> </li> <li> <p> <a>ListFleets</a> </p> </li> <li> <p> <a>DeleteFleet</a> </p> </li> <li> <p>Describe fleets:</p> <ul> <li> <p> <a>DescribeFleetAttributes</a> </p> </li> <li> <p> <a>DescribeFleetCapacity</a> </p> </li> <li> <p> <a>DescribeFleetPortSettings</a> </p> </li> <li> <p> <a>DescribeFleetUtilization</a> </p> </li> <li> <p> <a>DescribeRuntimeConfiguration</a> </p> </li> <li> <p> <a>DescribeEC2InstanceLimits</a> </p> </li> <li> <p> <a>DescribeFleetEvents</a> </p> </li> </ul> </li> <li> <p>Update fleets:</p> <ul> <li> <p> <a>UpdateFleetAttributes</a> </p> </li> <li> <p> <a>UpdateFleetCapacity</a> </p> </li> <li> <p> <a>UpdateFleetPortSettings</a> </p> </li> <li> <p> <a>UpdateRuntimeConfiguration</a> </p> </li> </ul> </li> <li> <p>Manage fleet actions:</p> <ul> <li> <p> <a>StartFleetActions</a> </p> </li> <li> <p> <a>StopFleetActions</a> </p> </li> </ul> </li> </ul>"
+      "documentation":"<p>Retrieves the current status of fleet capacity for one or more fleets. This information includes the number of instances that have been requested for the fleet and the number currently active. You can request capacity for all fleets, or specify a list of one or more fleet IDs. When requesting multiple fleets, use the pagination parameters to retrieve results as a set of sequential pages. If successful, a <a>FleetCapacity</a> object is returned for each requested fleet ID. When specifying a list of fleet IDs, attribute objects are returned only for fleets that currently exist. </p> <note> <p>Some API actions may limit the number of fleet IDs allowed in one request. If a request exceeds this limit, the request fails and the error message includes the maximum allowed.</p> </note> <p> <b>Learn more</b> </p> <p> <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/fleets-intro.html\"> Working with Fleets</a>.</p> <p> <b>Related operations</b> </p> <ul> <li> <p> <a>CreateFleet</a> </p> </li> <li> <p> <a>ListFleets</a> </p> </li> <li> <p> <a>DeleteFleet</a> </p> </li> <li> <p>Describe fleets:</p> <ul> <li> <p> <a>DescribeFleetAttributes</a> </p> </li> <li> <p> <a>DescribeFleetCapacity</a> </p> </li> <li> <p> <a>DescribeFleetPortSettings</a> </p> </li> <li> <p> <a>DescribeFleetUtilization</a> </p> </li> <li> <p> <a>DescribeRuntimeConfiguration</a> </p> </li> <li> <p> <a>DescribeEC2InstanceLimits</a> </p> </li> <li> <p> <a>DescribeFleetEvents</a> </p> </li> </ul> </li> <li> <p> <a>UpdateFleetAttributes</a> </p> </li> <li> <p>Manage fleet actions:</p> <ul> <li> <p> <a>StartFleetActions</a> </p> </li> <li> <p> <a>StopFleetActions</a> </p> </li> </ul> </li> </ul>"
     },
     "DescribeFleetEvents":{
       "name":"DescribeFleetEvents",
@@ -484,7 +498,7 @@
         {"shape":"UnauthorizedException"},
         {"shape":"InvalidRequestException"}
       ],
-      "documentation":"<p>Retrieves entries from the specified fleet's event log. You can specify a time range to limit the result set. Use the pagination parameters to retrieve results as a set of sequential pages. If successful, a collection of event log entries matching the request are returned.</p> <p> <b>Learn more</b> </p> <p> <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/fleets-intro.html\"> Working with Fleets</a>.</p> <p> <b>Related operations</b> </p> <ul> <li> <p> <a>CreateFleet</a> </p> </li> <li> <p> <a>ListFleets</a> </p> </li> <li> <p> <a>DeleteFleet</a> </p> </li> <li> <p>Describe fleets:</p> <ul> <li> <p> <a>DescribeFleetAttributes</a> </p> </li> <li> <p> <a>DescribeFleetCapacity</a> </p> </li> <li> <p> <a>DescribeFleetPortSettings</a> </p> </li> <li> <p> <a>DescribeFleetUtilization</a> </p> </li> <li> <p> <a>DescribeRuntimeConfiguration</a> </p> </li> <li> <p> <a>DescribeEC2InstanceLimits</a> </p> </li> <li> <p> <a>DescribeFleetEvents</a> </p> </li> </ul> </li> <li> <p>Update fleets:</p> <ul> <li> <p> <a>UpdateFleetAttributes</a> </p> </li> <li> <p> <a>UpdateFleetCapacity</a> </p> </li> <li> <p> <a>UpdateFleetPortSettings</a> </p> </li> <li> <p> <a>UpdateRuntimeConfiguration</a> </p> </li> </ul> </li> <li> <p>Manage fleet actions:</p> <ul> <li> <p> <a>StartFleetActions</a> </p> </li> <li> <p> <a>StopFleetActions</a> </p> </li> </ul> </li> </ul>"
+      "documentation":"<p>Retrieves entries from the specified fleet's event log. You can specify a time range to limit the result set. Use the pagination parameters to retrieve results as a set of sequential pages. If successful, a collection of event log entries matching the request are returned.</p> <p> <b>Learn more</b> </p> <p> <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/fleets-intro.html\"> Working with Fleets</a>.</p> <p> <b>Related operations</b> </p> <ul> <li> <p> <a>CreateFleet</a> </p> </li> <li> <p> <a>ListFleets</a> </p> </li> <li> <p> <a>DeleteFleet</a> </p> </li> <li> <p>Describe fleets:</p> <ul> <li> <p> <a>DescribeFleetAttributes</a> </p> </li> <li> <p> <a>DescribeFleetCapacity</a> </p> </li> <li> <p> <a>DescribeFleetPortSettings</a> </p> </li> <li> <p> <a>DescribeFleetUtilization</a> </p> </li> <li> <p> <a>DescribeRuntimeConfiguration</a> </p> </li> <li> <p> <a>DescribeEC2InstanceLimits</a> </p> </li> <li> <p> <a>DescribeFleetEvents</a> </p> </li> </ul> </li> <li> <p> <a>UpdateFleetAttributes</a> </p> </li> <li> <p>Manage fleet actions:</p> <ul> <li> <p> <a>StartFleetActions</a> </p> </li> <li> <p> <a>StopFleetActions</a> </p> </li> </ul> </li> </ul>"
     },
     "DescribeFleetPortSettings":{
       "name":"DescribeFleetPortSettings",
@@ -500,7 +514,7 @@
         {"shape":"InvalidRequestException"},
         {"shape":"UnauthorizedException"}
       ],
-      "documentation":"<p>Retrieves the inbound connection permissions for a fleet. Connection permissions include a range of IP addresses and port settings that incoming traffic can use to access server processes in the fleet. To get a fleet's inbound connection permissions, specify a fleet ID. If successful, a collection of <a>IpPermission</a> objects is returned for the requested fleet ID. If the requested fleet has been deleted, the result set is empty.</p> <p> <b>Learn more</b> </p> <p> <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/fleets-intro.html\"> Working with Fleets</a>.</p> <p> <b>Related operations</b> </p> <ul> <li> <p> <a>CreateFleet</a> </p> </li> <li> <p> <a>ListFleets</a> </p> </li> <li> <p> <a>DeleteFleet</a> </p> </li> <li> <p>Describe fleets:</p> <ul> <li> <p> <a>DescribeFleetAttributes</a> </p> </li> <li> <p> <a>DescribeFleetCapacity</a> </p> </li> <li> <p> <a>DescribeFleetPortSettings</a> </p> </li> <li> <p> <a>DescribeFleetUtilization</a> </p> </li> <li> <p> <a>DescribeRuntimeConfiguration</a> </p> </li> <li> <p> <a>DescribeEC2InstanceLimits</a> </p> </li> <li> <p> <a>DescribeFleetEvents</a> </p> </li> </ul> </li> <li> <p>Update fleets:</p> <ul> <li> <p> <a>UpdateFleetAttributes</a> </p> </li> <li> <p> <a>UpdateFleetCapacity</a> </p> </li> <li> <p> <a>UpdateFleetPortSettings</a> </p> </li> <li> <p> <a>UpdateRuntimeConfiguration</a> </p> </li> </ul> </li> <li> <p>Manage fleet actions:</p> <ul> <li> <p> <a>StartFleetActions</a> </p> </li> <li> <p> <a>StopFleetActions</a> </p> </li> </ul> </li> </ul>"
+      "documentation":"<p>Retrieves the inbound connection permissions for a fleet. Connection permissions include a range of IP addresses and port settings that incoming traffic can use to access server processes in the fleet. To get a fleet's inbound connection permissions, specify a fleet ID. If successful, a collection of <a>IpPermission</a> objects is returned for the requested fleet ID. If the requested fleet has been deleted, the result set is empty.</p> <p> <b>Learn more</b> </p> <p> <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/fleets-intro.html\"> Working with Fleets</a>.</p> <p> <b>Related operations</b> </p> <ul> <li> <p> <a>CreateFleet</a> </p> </li> <li> <p> <a>ListFleets</a> </p> </li> <li> <p> <a>DeleteFleet</a> </p> </li> <li> <p>Describe fleets:</p> <ul> <li> <p> <a>DescribeFleetAttributes</a> </p> </li> <li> <p> <a>DescribeFleetCapacity</a> </p> </li> <li> <p> <a>DescribeFleetPortSettings</a> </p> </li> <li> <p> <a>DescribeFleetUtilization</a> </p> </li> <li> <p> <a>DescribeRuntimeConfiguration</a> </p> </li> <li> <p> <a>DescribeEC2InstanceLimits</a> </p> </li> <li> <p> <a>DescribeFleetEvents</a> </p> </li> </ul> </li> <li> <p> <a>UpdateFleetAttributes</a> </p> </li> <li> <p>Manage fleet actions:</p> <ul> <li> <p> <a>StartFleetActions</a> </p> </li> <li> <p> <a>StopFleetActions</a> </p> </li> </ul> </li> </ul>"
     },
     "DescribeFleetUtilization":{
       "name":"DescribeFleetUtilization",
@@ -516,7 +530,7 @@
         {"shape":"InvalidRequestException"},
         {"shape":"UnauthorizedException"}
       ],
-      "documentation":"<p>Retrieves utilization statistics for one or more fleets. You can request utilization data for all fleets, or specify a list of one or more fleet IDs. When requesting multiple fleets, use the pagination parameters to retrieve results as a set of sequential pages. If successful, a <a>FleetUtilization</a> object is returned for each requested fleet ID. When specifying a list of fleet IDs, utilization objects are returned only for fleets that currently exist. </p> <note> <p>Some API actions may limit the number of fleet IDs allowed in one request. If a request exceeds this limit, the request fails and the error message includes the maximum allowed.</p> </note> <p> <b>Learn more</b> </p> <p> <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/fleets-intro.html\"> Working with Fleets</a>.</p> <p> <b>Related operations</b> </p> <ul> <li> <p> <a>CreateFleet</a> </p> </li> <li> <p> <a>ListFleets</a> </p> </li> <li> <p> <a>DeleteFleet</a> </p> </li> <li> <p>Describe fleets:</p> <ul> <li> <p> <a>DescribeFleetAttributes</a> </p> </li> <li> <p> <a>DescribeFleetCapacity</a> </p> </li> <li> <p> <a>DescribeFleetPortSettings</a> </p> </li> <li> <p> <a>DescribeFleetUtilization</a> </p> </li> <li> <p> <a>DescribeRuntimeConfiguration</a> </p> </li> <li> <p> <a>DescribeEC2InstanceLimits</a> </p> </li> <li> <p> <a>DescribeFleetEvents</a> </p> </li> </ul> </li> <li> <p>Update fleets:</p> <ul> <li> <p> <a>UpdateFleetAttributes</a> </p> </li> <li> <p> <a>UpdateFleetCapacity</a> </p> </li> <li> <p> <a>UpdateFleetPortSettings</a> </p> </li> <li> <p> <a>UpdateRuntimeConfiguration</a> </p> </li> </ul> </li> <li> <p>Manage fleet actions:</p> <ul> <li> <p> <a>StartFleetActions</a> </p> </li> <li> <p> <a>StopFleetActions</a> </p> </li> </ul> </li> </ul>"
+      "documentation":"<p>Retrieves utilization statistics for one or more fleets. You can request utilization data for all fleets, or specify a list of one or more fleet IDs. When requesting multiple fleets, use the pagination parameters to retrieve results as a set of sequential pages. If successful, a <a>FleetUtilization</a> object is returned for each requested fleet ID. When specifying a list of fleet IDs, utilization objects are returned only for fleets that currently exist. </p> <note> <p>Some API actions may limit the number of fleet IDs allowed in one request. If a request exceeds this limit, the request fails and the error message includes the maximum allowed.</p> </note> <p> <b>Learn more</b> </p> <p> <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/fleets-intro.html\"> Working with Fleets</a>.</p> <p> <b>Related operations</b> </p> <ul> <li> <p> <a>CreateFleet</a> </p> </li> <li> <p> <a>ListFleets</a> </p> </li> <li> <p> <a>DeleteFleet</a> </p> </li> <li> <p>Describe fleets:</p> <ul> <li> <p> <a>DescribeFleetAttributes</a> </p> </li> <li> <p> <a>DescribeFleetCapacity</a> </p> </li> <li> <p> <a>DescribeFleetPortSettings</a> </p> </li> <li> <p> <a>DescribeFleetUtilization</a> </p> </li> <li> <p> <a>DescribeRuntimeConfiguration</a> </p> </li> <li> <p> <a>DescribeEC2InstanceLimits</a> </p> </li> <li> <p> <a>DescribeFleetEvents</a> </p> </li> </ul> </li> <li> <p> <a>UpdateFleetAttributes</a> </p> </li> <li> <p>Manage fleet actions:</p> <ul> <li> <p> <a>StartFleetActions</a> </p> </li> <li> <p> <a>StopFleetActions</a> </p> </li> </ul> </li> </ul>"
     },
     "DescribeGameSessionDetails":{
       "name":"DescribeGameSessionDetails",
@@ -565,7 +579,7 @@
         {"shape":"NotFoundException"},
         {"shape":"UnauthorizedException"}
       ],
-      "documentation":"<p>Retrieves the properties for one or more game session queues. When requesting multiple queues, use the pagination parameters to retrieve results as a set of sequential pages. If successful, a <a>GameSessionQueue</a> object is returned for each requested queue. When specifying a list of queues, objects are returned only for queues that currently exist in the region.</p> <ul> <li> <p> <a>CreateGameSessionQueue</a> </p> </li> <li> <p> <a>DescribeGameSessionQueues</a> </p> </li> <li> <p> <a>UpdateGameSessionQueue</a> </p> </li> <li> <p> <a>DeleteGameSessionQueue</a> </p> </li> </ul>"
+      "documentation":"<p>Retrieves the properties for one or more game session queues. When requesting multiple queues, use the pagination parameters to retrieve results as a set of sequential pages. If successful, a <a>GameSessionQueue</a> object is returned for each requested queue. When specifying a list of queues, objects are returned only for queues that currently exist in the Region.</p> <ul> <li> <p> <a>CreateGameSessionQueue</a> </p> </li> <li> <p> <a>DescribeGameSessionQueues</a> </p> </li> <li> <p> <a>UpdateGameSessionQueue</a> </p> </li> <li> <p> <a>DeleteGameSessionQueue</a> </p> </li> </ul>"
     },
     "DescribeGameSessions":{
       "name":"DescribeGameSessions",
@@ -613,7 +627,7 @@
         {"shape":"InternalServiceException"},
         {"shape":"UnsupportedRegionException"}
       ],
-      "documentation":"<p>Retrieves one or more matchmaking tickets. Use this operation to retrieve ticket information, including status and--once a successful match is made--acquire connection information for the resulting new game session. </p> <p>You can use this operation to track the progress of matchmaking requests (through polling) as an alternative to using event notifications. See more details on tracking matchmaking requests through polling or notifications in <a>StartMatchmaking</a>. </p> <p>To request matchmaking tickets, provide a list of up to 10 ticket IDs. If the request is successful, a ticket object is returned for each requested ID that currently exists.</p> <p> <b>Learn more</b> </p> <p> <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/match-client.html\"> Add FlexMatch to a Game Client</a> </p> <p> <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguidematch-notification.html\"> Set Up FlexMatch Event Notification</a> </p> <p> <b>Related operations</b> </p> <ul> <li> <p> <a>StartMatchmaking</a> </p> </li> <li> <p> <a>DescribeMatchmaking</a> </p> </li> <li> <p> <a>StopMatchmaking</a> </p> </li> <li> <p> <a>AcceptMatch</a> </p> </li> <li> <p> <a>StartMatchBackfill</a> </p> </li> </ul>"
+      "documentation":"<p>Retrieves one or more matchmaking tickets. Use this operation to retrieve ticket information, including status and--once a successful match is made--acquire connection information for the resulting new game session. </p> <p>You can use this operation to track the progress of matchmaking requests (through polling) as an alternative to using event notifications. See more details on tracking matchmaking requests through polling or notifications in <a>StartMatchmaking</a>. </p> <p>To request matchmaking tickets, provide a list of up to 10 ticket IDs. If the request is successful, a ticket object is returned for each requested ID that currently exists.</p> <p> <b>Learn more</b> </p> <p> <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/match-client.html\"> Add FlexMatch to a Game Client</a> </p> <p> <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/match-notification.html\"> Set Up FlexMatch Event Notification</a> </p> <p> <b>Related operations</b> </p> <ul> <li> <p> <a>StartMatchmaking</a> </p> </li> <li> <p> <a>DescribeMatchmaking</a> </p> </li> <li> <p> <a>StopMatchmaking</a> </p> </li> <li> <p> <a>AcceptMatch</a> </p> </li> <li> <p> <a>StartMatchBackfill</a> </p> </li> </ul>"
     },
     "DescribeMatchmakingConfigurations":{
       "name":"DescribeMatchmakingConfigurations",
@@ -644,7 +658,7 @@
         {"shape":"NotFoundException"},
         {"shape":"UnsupportedRegionException"}
       ],
-      "documentation":"<p>Retrieves the details for FlexMatch matchmaking rule sets. You can request all existing rule sets for the region, or provide a list of one or more rule set names. When requesting multiple items, use the pagination parameters to retrieve results as a set of sequential pages. If successful, a rule set is returned for each requested name. </p> <p> <b>Learn more</b> </p> <ul> <li> <p> <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/match-rulesets.html\">Build a Rule Set</a> </p> </li> </ul> <p> <b>Related operations</b> </p> <ul> <li> <p> <a>CreateMatchmakingConfiguration</a> </p> </li> <li> <p> <a>DescribeMatchmakingConfigurations</a> </p> </li> <li> <p> <a>UpdateMatchmakingConfiguration</a> </p> </li> <li> <p> <a>DeleteMatchmakingConfiguration</a> </p> </li> <li> <p> <a>CreateMatchmakingRuleSet</a> </p> </li> <li> <p> <a>DescribeMatchmakingRuleSets</a> </p> </li> <li> <p> <a>ValidateMatchmakingRuleSet</a> </p> </li> <li> <p> <a>DeleteMatchmakingRuleSet</a> </p> </li> </ul>"
+      "documentation":"<p>Retrieves the details for FlexMatch matchmaking rule sets. You can request all existing rule sets for the Region, or provide a list of one or more rule set names. When requesting multiple items, use the pagination parameters to retrieve results as a set of sequential pages. If successful, a rule set is returned for each requested name. </p> <p> <b>Learn more</b> </p> <ul> <li> <p> <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/match-rulesets.html\">Build a Rule Set</a> </p> </li> </ul> <p> <b>Related operations</b> </p> <ul> <li> <p> <a>CreateMatchmakingConfiguration</a> </p> </li> <li> <p> <a>DescribeMatchmakingConfigurations</a> </p> </li> <li> <p> <a>UpdateMatchmakingConfiguration</a> </p> </li> <li> <p> <a>DeleteMatchmakingConfiguration</a> </p> </li> <li> <p> <a>CreateMatchmakingRuleSet</a> </p> </li> <li> <p> <a>DescribeMatchmakingRuleSets</a> </p> </li> <li> <p> <a>ValidateMatchmakingRuleSet</a> </p> </li> <li> <p> <a>DeleteMatchmakingRuleSet</a> </p> </li> </ul>"
     },
     "DescribePlayerSessions":{
       "name":"DescribePlayerSessions",
@@ -676,7 +690,7 @@
         {"shape":"InternalServiceException"},
         {"shape":"InvalidRequestException"}
       ],
-      "documentation":"<p>Retrieves the current run-time configuration for the specified fleet. The run-time configuration tells Amazon GameLift how to launch server processes on instances in the fleet.</p> <p> <b>Learn more</b> </p> <p> <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/fleets-intro.html\"> Working with Fleets</a>.</p> <p> <b>Related operations</b> </p> <ul> <li> <p> <a>CreateFleet</a> </p> </li> <li> <p> <a>ListFleets</a> </p> </li> <li> <p> <a>DeleteFleet</a> </p> </li> <li> <p>Describe fleets:</p> <ul> <li> <p> <a>DescribeFleetAttributes</a> </p> </li> <li> <p> <a>DescribeFleetCapacity</a> </p> </li> <li> <p> <a>DescribeFleetPortSettings</a> </p> </li> <li> <p> <a>DescribeFleetUtilization</a> </p> </li> <li> <p> <a>DescribeRuntimeConfiguration</a> </p> </li> <li> <p> <a>DescribeEC2InstanceLimits</a> </p> </li> <li> <p> <a>DescribeFleetEvents</a> </p> </li> </ul> </li> <li> <p>Update fleets:</p> <ul> <li> <p> <a>UpdateFleetAttributes</a> </p> </li> <li> <p> <a>UpdateFleetCapacity</a> </p> </li> <li> <p> <a>UpdateFleetPortSettings</a> </p> </li> <li> <p> <a>UpdateRuntimeConfiguration</a> </p> </li> </ul> </li> <li> <p>Manage fleet actions:</p> <ul> <li> <p> <a>StartFleetActions</a> </p> </li> <li> <p> <a>StopFleetActions</a> </p> </li> </ul> </li> </ul>"
+      "documentation":"<p>Retrieves the current runtime configuration for the specified fleet. The runtime configuration tells Amazon GameLift how to launch server processes on instances in the fleet.</p> <p> <b>Learn more</b> </p> <p> <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/fleets-intro.html\"> Working with Fleets</a>.</p> <p> <b>Related operations</b> </p> <ul> <li> <p> <a>CreateFleet</a> </p> </li> <li> <p> <a>ListFleets</a> </p> </li> <li> <p> <a>DeleteFleet</a> </p> </li> <li> <p>Describe fleets:</p> <ul> <li> <p> <a>DescribeFleetAttributes</a> </p> </li> <li> <p> <a>DescribeFleetCapacity</a> </p> </li> <li> <p> <a>DescribeFleetPortSettings</a> </p> </li> <li> <p> <a>DescribeFleetUtilization</a> </p> </li> <li> <p> <a>DescribeRuntimeConfiguration</a> </p> </li> <li> <p> <a>DescribeEC2InstanceLimits</a> </p> </li> <li> <p> <a>DescribeFleetEvents</a> </p> </li> </ul> </li> <li> <p> <a>UpdateFleetAttributes</a> </p> </li> <li> <p>Manage fleet actions:</p> <ul> <li> <p> <a>StartFleetActions</a> </p> </li> <li> <p> <a>StopFleetActions</a> </p> </li> </ul> </li> </ul>"
     },
     "DescribeScalingPolicies":{
       "name":"DescribeScalingPolicies",
@@ -817,7 +831,7 @@
         {"shape":"InvalidRequestException"},
         {"shape":"UnauthorizedException"}
       ],
-      "documentation":"<p>Retrieves a collection of fleet records for this AWS account. You can filter the result set to find only those fleets that are deployed with a specific build or script. Use the pagination parameters to retrieve results in sequential pages.</p> <note> <p>Fleet records are not listed in a particular order.</p> </note> <p> <b>Learn more</b> </p> <p> <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/fleets-intro.html\"> Set Up Fleets</a>.</p> <p> <b>Related operations</b> </p> <ul> <li> <p> <a>CreateFleet</a> </p> </li> <li> <p> <a>ListFleets</a> </p> </li> <li> <p> <a>DeleteFleet</a> </p> </li> <li> <p>Describe fleets:</p> <ul> <li> <p> <a>DescribeFleetAttributes</a> </p> </li> <li> <p> <a>DescribeFleetCapacity</a> </p> </li> <li> <p> <a>DescribeFleetPortSettings</a> </p> </li> <li> <p> <a>DescribeFleetUtilization</a> </p> </li> <li> <p> <a>DescribeRuntimeConfiguration</a> </p> </li> <li> <p> <a>DescribeEC2InstanceLimits</a> </p> </li> <li> <p> <a>DescribeFleetEvents</a> </p> </li> </ul> </li> <li> <p>Update fleets:</p> <ul> <li> <p> <a>UpdateFleetAttributes</a> </p> </li> <li> <p> <a>UpdateFleetCapacity</a> </p> </li> <li> <p> <a>UpdateFleetPortSettings</a> </p> </li> <li> <p> <a>UpdateRuntimeConfiguration</a> </p> </li> </ul> </li> <li> <p>Manage fleet actions:</p> <ul> <li> <p> <a>StartFleetActions</a> </p> </li> <li> <p> <a>StopFleetActions</a> </p> </li> </ul> </li> </ul>"
+      "documentation":"<p>Retrieves a collection of fleet records for this AWS account. You can filter the result set to find only those fleets that are deployed with a specific build or script. Use the pagination parameters to retrieve results in sequential pages.</p> <note> <p>Fleet records are not listed in a particular order.</p> </note> <p> <b>Learn more</b> </p> <p> <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/fleets-intro.html\"> Set Up Fleets</a>.</p> <p> <b>Related operations</b> </p> <ul> <li> <p> <a>CreateFleet</a> </p> </li> <li> <p> <a>ListFleets</a> </p> </li> <li> <p> <a>DeleteFleet</a> </p> </li> <li> <p> <a>DescribeFleetAttributes</a> </p> </li> <li> <p> <a>UpdateFleetAttributes</a> </p> </li> <li> <p>Manage fleet actions:</p> <ul> <li> <p> <a>StartFleetActions</a> </p> </li> <li> <p> <a>StopFleetActions</a> </p> </li> </ul> </li> </ul>"
     },
     "ListScripts":{
       "name":"ListScripts",
@@ -834,6 +848,22 @@
       ],
       "documentation":"<p>Retrieves script records for all Realtime scripts that are associated with the AWS account in use. </p> <p> <b>Learn more</b> </p> <p> <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/realtime-intro.html\">Amazon GameLift Realtime Servers</a> </p> <p> <b>Related operations</b> </p> <ul> <li> <p> <a>CreateScript</a> </p> </li> <li> <p> <a>ListScripts</a> </p> </li> <li> <p> <a>DescribeScript</a> </p> </li> <li> <p> <a>UpdateScript</a> </p> </li> <li> <p> <a>DeleteScript</a> </p> </li> </ul>"
     },
+    "ListTagsForResource":{
+      "name":"ListTagsForResource",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"ListTagsForResourceRequest"},
+      "output":{"shape":"ListTagsForResourceResponse"},
+      "errors":[
+        {"shape":"NotFoundException"},
+        {"shape":"InvalidRequestException"},
+        {"shape":"TaggingFailedException"},
+        {"shape":"InternalServiceException"}
+      ],
+      "documentation":"<p> Retrieves all tags that are assigned to a GameLift resource. Resource tags are used to organize AWS resources for a range of purposes. This action handles the permissions necessary to manage tags for the following GameLift resource types:</p> <ul> <li> <p>Build</p> </li> <li> <p>Script</p> </li> <li> <p>Fleet</p> </li> <li> <p>Alias</p> </li> <li> <p>GameSessionQueue</p> </li> <li> <p>MatchmakingConfiguration</p> </li> <li> <p>MatchmakingRuleSet</p> </li> </ul> <p>To list tags for a resource, specify the unique ARN value for the resource.</p> <p> <b>Learn more</b> </p> <p> <a href=\"https://docs.aws.amazon.com/general/latest/gr/aws_tagging.html\">Tagging AWS Resources</a> in the <i>AWS General Reference</i> </p> <p> <a href=\"http://aws.amazon.com/answers/account-management/aws-tagging-strategies/\"> AWS Tagging Strategies</a> </p> <p> <b>Related operations</b> </p> <ul> <li> <p> <a>TagResource</a> </p> </li> <li> <p> <a>UntagResource</a> </p> </li> <li> <p> <a>ListTagsForResource</a> </p> </li> </ul>"
+    },
     "PutScalingPolicy":{
       "name":"PutScalingPolicy",
       "http":{
@@ -881,7 +911,7 @@
         {"shape":"TerminalRoutingStrategyException"},
         {"shape":"InternalServiceException"}
       ],
-      "documentation":"<p>Retrieves the fleet ID that a specified alias is currently pointing to.</p> <ul> <li> <p> <a>CreateAlias</a> </p> </li> <li> <p> <a>ListAliases</a> </p> </li> <li> <p> <a>DescribeAlias</a> </p> </li> <li> <p> <a>UpdateAlias</a> </p> </li> <li> <p> <a>DeleteAlias</a> </p> </li> <li> <p> <a>ResolveAlias</a> </p> </li> </ul>"
+      "documentation":"<p>Retrieves the fleet ID that an alias is currently pointing to.</p> <ul> <li> <p> <a>CreateAlias</a> </p> </li> <li> <p> <a>ListAliases</a> </p> </li> <li> <p> <a>DescribeAlias</a> </p> </li> <li> <p> <a>UpdateAlias</a> </p> </li> <li> <p> <a>DeleteAlias</a> </p> </li> <li> <p> <a>ResolveAlias</a> </p> </li> </ul>"
     },
     "SearchGameSessions":{
       "name":"SearchGameSessions",
@@ -898,7 +928,7 @@
         {"shape":"UnauthorizedException"},
         {"shape":"TerminalRoutingStrategyException"}
       ],
-      "documentation":"<p>Retrieves all active game sessions that match a set of search criteria and sorts them in a specified order. You can search or sort by the following game session attributes:</p> <ul> <li> <p> <b>gameSessionId</b> -- Unique identifier for the game session. You can use either a <code>GameSessionId</code> or <code>GameSessionArn</code> value. </p> </li> <li> <p> <b>gameSessionName</b> -- Name assigned to a game session. This value is set when requesting a new game session with <a>CreateGameSession</a> or updating with <a>UpdateGameSession</a>. Game session names do not need to be unique to a game session.</p> </li> <li> <p> <b>gameSessionProperties</b> -- Custom data defined in a game session's <code>GameProperty</code> parameter. <code>GameProperty</code> values are stored as key:value pairs; the filter expression must indicate the key and a string to search the data values for. For example, to search for game sessions with custom data containing the key:value pair \"gameMode:brawl\", specify the following: <code>gameSessionProperties.gameMode = \"brawl\"</code>. All custom data values are searched as strings.</p> </li> <li> <p> <b>maximumSessions</b> -- Maximum number of player sessions allowed for a game session. This value is set when requesting a new game session with <a>CreateGameSession</a> or updating with <a>UpdateGameSession</a>.</p> </li> <li> <p> <b>creationTimeMillis</b> -- Value indicating when a game session was created. It is expressed in Unix time as milliseconds.</p> </li> <li> <p> <b>playerSessionCount</b> -- Number of players currently connected to a game session. This value changes rapidly as players join the session or drop out.</p> </li> <li> <p> <b>hasAvailablePlayerSessions</b> -- Boolean value indicating whether a game session has reached its maximum number of players. It is highly recommended that all search requests include this filter attribute to optimize search performance and return only sessions that players can join. </p> </li> </ul> <note> <p>Returned values for <code>playerSessionCount</code> and <code>hasAvailablePlayerSessions</code> change quickly as players join sessions and others drop out. Results should be considered a snapshot in time. Be sure to refresh search results often, and handle sessions that fill up before a player can join. </p> </note> <p>To search or sort, specify either a fleet ID or an alias ID, and provide a search filter expression, a sort expression, or both. If successful, a collection of <a>GameSession</a> objects matching the request is returned. Use the pagination parameters to retrieve results as a set of sequential pages. </p> <p>You can search for game sessions one fleet at a time only. To find game sessions across multiple fleets, you must search each fleet separately and combine the results. This search feature finds only game sessions that are in <code>ACTIVE</code> status. To locate games in statuses other than active, use <a>DescribeGameSessionDetails</a>.</p> <ul> <li> <p> <a>CreateGameSession</a> </p> </li> <li> <p> <a>DescribeGameSessions</a> </p> </li> <li> <p> <a>DescribeGameSessionDetails</a> </p> </li> <li> <p> <a>SearchGameSessions</a> </p> </li> <li> <p> <a>UpdateGameSession</a> </p> </li> <li> <p> <a>GetGameSessionLogUrl</a> </p> </li> <li> <p>Game session placements</p> <ul> <li> <p> <a>StartGameSessionPlacement</a> </p> </li> <li> <p> <a>DescribeGameSessionPlacement</a> </p> </li> <li> <p> <a>StopGameSessionPlacement</a> </p> </li> </ul> </li> </ul>"
+      "documentation":"<p>Retrieves all active game sessions that match a set of search criteria and sorts them in a specified order. You can search or sort by the following game session attributes:</p> <ul> <li> <p> <b>gameSessionId</b> -- A unique identifier for the game session. You can use either a <code>GameSessionId</code> or <code>GameSessionArn</code> value. </p> </li> <li> <p> <b>gameSessionName</b> -- Name assigned to a game session. This value is set when requesting a new game session with <a>CreateGameSession</a> or updating with <a>UpdateGameSession</a>. Game session names do not need to be unique to a game session.</p> </li> <li> <p> <b>gameSessionProperties</b> -- Custom data defined in a game session's <code>GameProperty</code> parameter. <code>GameProperty</code> values are stored as key:value pairs; the filter expression must indicate the key and a string to search the data values for. For example, to search for game sessions with custom data containing the key:value pair \"gameMode:brawl\", specify the following: <code>gameSessionProperties.gameMode = \"brawl\"</code>. All custom data values are searched as strings.</p> </li> <li> <p> <b>maximumSessions</b> -- Maximum number of player sessions allowed for a game session. This value is set when requesting a new game session with <a>CreateGameSession</a> or updating with <a>UpdateGameSession</a>.</p> </li> <li> <p> <b>creationTimeMillis</b> -- Value indicating when a game session was created. It is expressed in Unix time as milliseconds.</p> </li> <li> <p> <b>playerSessionCount</b> -- Number of players currently connected to a game session. This value changes rapidly as players join the session or drop out.</p> </li> <li> <p> <b>hasAvailablePlayerSessions</b> -- Boolean value indicating whether a game session has reached its maximum number of players. It is highly recommended that all search requests include this filter attribute to optimize search performance and return only sessions that players can join. </p> </li> </ul> <note> <p>Returned values for <code>playerSessionCount</code> and <code>hasAvailablePlayerSessions</code> change quickly as players join sessions and others drop out. Results should be considered a snapshot in time. Be sure to refresh search results often, and handle sessions that fill up before a player can join. </p> </note> <p>To search or sort, specify either a fleet ID or an alias ID, and provide a search filter expression, a sort expression, or both. If successful, a collection of <a>GameSession</a> objects matching the request is returned. Use the pagination parameters to retrieve results as a set of sequential pages. </p> <p>You can search for game sessions one fleet at a time only. To find game sessions across multiple fleets, you must search each fleet separately and combine the results. This search feature finds only game sessions that are in <code>ACTIVE</code> status. To locate games in statuses other than active, use <a>DescribeGameSessionDetails</a>.</p> <ul> <li> <p> <a>CreateGameSession</a> </p> </li> <li> <p> <a>DescribeGameSessions</a> </p> </li> <li> <p> <a>DescribeGameSessionDetails</a> </p> </li> <li> <p> <a>SearchGameSessions</a> </p> </li> <li> <p> <a>UpdateGameSession</a> </p> </li> <li> <p> <a>GetGameSessionLogUrl</a> </p> </li> <li> <p>Game session placements</p> <ul> <li> <p> <a>StartGameSessionPlacement</a> </p> </li> <li> <p> <a>DescribeGameSessionPlacement</a> </p> </li> <li> <p> <a>StopGameSessionPlacement</a> </p> </li> </ul> </li> </ul>"
     },
     "StartFleetActions":{
       "name":"StartFleetActions",
@@ -930,7 +960,7 @@
         {"shape":"NotFoundException"},
         {"shape":"UnauthorizedException"}
       ],
-      "documentation":"<p>Places a request for a new game session in a queue (see <a>CreateGameSessionQueue</a>). When processing a placement request, Amazon GameLift searches for available resources on the queue's destinations, scanning each until it finds resources or the placement request times out.</p> <p>A game session placement request can also request player sessions. When a new game session is successfully created, Amazon GameLift creates a player session for each player included in the request.</p> <p>When placing a game session, by default Amazon GameLift tries each fleet in the order they are listed in the queue configuration. Ideally, a queue's destinations are listed in preference order.</p> <p>Alternatively, when requesting a game session with players, you can also provide latency data for each player in relevant regions. Latency data indicates the performance lag a player experiences when connected to a fleet in the region. Amazon GameLift uses latency data to reorder the list of destinations to place the game session in a region with minimal lag. If latency data is provided for multiple players, Amazon GameLift calculates each region's average lag for all players and reorders to get the best game play across all players. </p> <p>To place a new game session request, specify the following:</p> <ul> <li> <p>The queue name and a set of game session properties and settings</p> </li> <li> <p>A unique ID (such as a UUID) for the placement. You use this ID to track the status of the placement request</p> </li> <li> <p>(Optional) A set of player data and a unique player ID for each player that you are joining to the new game session (player data is optional, but if you include it, you must also provide a unique ID for each player)</p> </li> <li> <p>Latency data for all players (if you want to optimize game play for the players)</p> </li> </ul> <p>If successful, a new game session placement is created.</p> <p>To track the status of a placement request, call <a>DescribeGameSessionPlacement</a> and check the request's status. If the status is <code>FULFILLED</code>, a new game session has been created and a game session ARN and region are referenced. If the placement request times out, you can resubmit the request or retry it with a different queue. </p> <ul> <li> <p> <a>CreateGameSession</a> </p> </li> <li> <p> <a>DescribeGameSessions</a> </p> </li> <li> <p> <a>DescribeGameSessionDetails</a> </p> </li> <li> <p> <a>SearchGameSessions</a> </p> </li> <li> <p> <a>UpdateGameSession</a> </p> </li> <li> <p> <a>GetGameSessionLogUrl</a> </p> </li> <li> <p>Game session placements</p> <ul> <li> <p> <a>StartGameSessionPlacement</a> </p> </li> <li> <p> <a>DescribeGameSessionPlacement</a> </p> </li> <li> <p> <a>StopGameSessionPlacement</a> </p> </li> </ul> </li> </ul>"
+      "documentation":"<p>Places a request for a new game session in a queue (see <a>CreateGameSessionQueue</a>). When processing a placement request, Amazon GameLift searches for available resources on the queue's destinations, scanning each until it finds resources or the placement request times out.</p> <p>A game session placement request can also request player sessions. When a new game session is successfully created, Amazon GameLift creates a player session for each player included in the request.</p> <p>When placing a game session, by default Amazon GameLift tries each fleet in the order they are listed in the queue configuration. Ideally, a queue's destinations are listed in preference order.</p> <p>Alternatively, when requesting a game session with players, you can also provide latency data for each player in relevant Regions. Latency data indicates the performance lag a player experiences when connected to a fleet in the Region. Amazon GameLift uses latency data to reorder the list of destinations to place the game session in a Region with minimal lag. If latency data is provided for multiple players, Amazon GameLift calculates each Region's average lag for all players and reorders to get the best game play across all players. </p> <p>To place a new game session request, specify the following:</p> <ul> <li> <p>The queue name and a set of game session properties and settings</p> </li> <li> <p>A unique ID (such as a UUID) for the placement. You use this ID to track the status of the placement request</p> </li> <li> <p>(Optional) A set of player data and a unique player ID for each player that you are joining to the new game session (player data is optional, but if you include it, you must also provide a unique ID for each player)</p> </li> <li> <p>Latency data for all players (if you want to optimize game play for the players)</p> </li> </ul> <p>If successful, a new game session placement is created.</p> <p>To track the status of a placement request, call <a>DescribeGameSessionPlacement</a> and check the request's status. If the status is <code>FULFILLED</code>, a new game session has been created and a game session ARN and Region are referenced. If the placement request times out, you can resubmit the request or retry it with a different queue. </p> <ul> <li> <p> <a>CreateGameSession</a> </p> </li> <li> <p> <a>DescribeGameSessions</a> </p> </li> <li> <p> <a>DescribeGameSessionDetails</a> </p> </li> <li> <p> <a>SearchGameSessions</a> </p> </li> <li> <p> <a>UpdateGameSession</a> </p> </li> <li> <p> <a>GetGameSessionLogUrl</a> </p> </li> <li> <p>Game session placements</p> <ul> <li> <p> <a>StartGameSessionPlacement</a> </p> </li> <li> <p> <a>DescribeGameSessionPlacement</a> </p> </li> <li> <p> <a>StopGameSessionPlacement</a> </p> </li> </ul> </li> </ul>"
     },
     "StartMatchBackfill":{
       "name":"StartMatchBackfill",
@@ -1012,6 +1042,38 @@
       ],
       "documentation":"<p>Cancels a matchmaking ticket or match backfill ticket that is currently being processed. To stop the matchmaking operation, specify the ticket ID. If successful, work on the ticket is stopped, and the ticket status is changed to <code>CANCELLED</code>.</p> <p>This call is also used to turn off automatic backfill for an individual game session. This is for game sessions that are created with a matchmaking configuration that has automatic backfill enabled. The ticket ID is included in the <code>MatchmakerData</code> of an updated game session object, which is provided to the game server.</p> <note> <p>If the action is successful, the service sends back an empty JSON struct with the HTTP 200 response (not an empty HTTP body).</p> </note> <p> <b>Learn more</b> </p> <p> <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/match-client.html\"> Add FlexMatch to a Game Client</a> </p> <p> <b>Related operations</b> </p> <ul> <li> <p> <a>StartMatchmaking</a> </p> </li> <li> <p> <a>DescribeMatchmaking</a> </p> </li> <li> <p> <a>StopMatchmaking</a> </p> </li> <li> <p> <a>AcceptMatch</a> </p> </li> <li> <p> <a>StartMatchBackfill</a> </p> </li> </ul>"
     },
+    "TagResource":{
+      "name":"TagResource",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"TagResourceRequest"},
+      "output":{"shape":"TagResourceResponse"},
+      "errors":[
+        {"shape":"NotFoundException"},
+        {"shape":"InvalidRequestException"},
+        {"shape":"TaggingFailedException"},
+        {"shape":"InternalServiceException"}
+      ],
+      "documentation":"<p> Assigns a tag to a GameLift resource. AWS resource tags provide an additional management tool set. You can use tags to organize resources, create IAM permissions policies to manage access to groups of resources, customize AWS cost breakdowns, etc. This action handles the permissions necessary to manage tags for the following GameLift resource types:</p> <ul> <li> <p>Build</p> </li> <li> <p>Script</p> </li> <li> <p>Fleet</p> </li> <li> <p>Alias</p> </li> <li> <p>GameSessionQueue</p> </li> <li> <p>MatchmakingConfiguration</p> </li> <li> <p>MatchmakingRuleSet</p> </li> </ul> <p>To add a tag to a resource, specify the unique ARN value for the resource and provide a trig list containing one or more tags. The operation succeeds even if the list includes tags that are already assigned to the specified resource. </p> <p> <b>Learn more</b> </p> <p> <a href=\"https://docs.aws.amazon.com/general/latest/gr/aws_tagging.html\">Tagging AWS Resources</a> in the <i>AWS General Reference</i> </p> <p> <a href=\"http://aws.amazon.com/answers/account-management/aws-tagging-strategies/\"> AWS Tagging Strategies</a> </p> <p> <b>Related operations</b> </p> <ul> <li> <p> <a>TagResource</a> </p> </li> <li> <p> <a>UntagResource</a> </p> </li> <li> <p> <a>ListTagsForResource</a> </p> </li> </ul>"
+    },
+    "UntagResource":{
+      "name":"UntagResource",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"UntagResourceRequest"},
+      "output":{"shape":"UntagResourceResponse"},
+      "errors":[
+        {"shape":"NotFoundException"},
+        {"shape":"InvalidRequestException"},
+        {"shape":"TaggingFailedException"},
+        {"shape":"InternalServiceException"}
+      ],
+      "documentation":"<p>Removes a tag that is assigned to a GameLift resource. Resource tags are used to organize AWS resources for a range of purposes. This action handles the permissions necessary to manage tags for the following GameLift resource types:</p> <ul> <li> <p>Build</p> </li> <li> <p>Script</p> </li> <li> <p>Fleet</p> </li> <li> <p>Alias</p> </li> <li> <p>GameSessionQueue</p> </li> <li> <p>MatchmakingConfiguration</p> </li> <li> <p>MatchmakingRuleSet</p> </li> </ul> <p>To remove a tag from a resource, specify the unique ARN value for the resource and provide a string list containing one or more tags to be removed. This action succeeds even if the list includes tags that are not currently assigned to the specified resource.</p> <p> <b>Learn more</b> </p> <p> <a href=\"https://docs.aws.amazon.com/general/latest/gr/aws_tagging.html\">Tagging AWS Resources</a> in the <i>AWS General Reference</i> </p> <p> <a href=\"http://aws.amazon.com/answers/account-management/aws-tagging-strategies/\"> AWS Tagging Strategies</a> </p> <p> <b>Related operations</b> </p> <ul> <li> <p> <a>TagResource</a> </p> </li> <li> <p> <a>UntagResource</a> </p> </li> <li> <p> <a>ListTagsForResource</a> </p> </li> </ul>"
+    },
     "UpdateAlias":{
       "name":"UpdateAlias",
       "http":{
@@ -1061,7 +1123,7 @@
         {"shape":"InvalidRequestException"},
         {"shape":"UnauthorizedException"}
       ],
-      "documentation":"<p>Updates fleet properties, including name and description, for a fleet. To update metadata, specify the fleet ID and the property values that you want to change. If successful, the fleet ID for the updated fleet is returned.</p> <p> <b>Learn more</b> </p> <p> <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/fleets-intro.html\"> Working with Fleets</a>.</p> <p> <b>Related operations</b> </p> <ul> <li> <p> <a>CreateFleet</a> </p> </li> <li> <p> <a>ListFleets</a> </p> </li> <li> <p> <a>DeleteFleet</a> </p> </li> <li> <p>Describe fleets:</p> <ul> <li> <p> <a>DescribeFleetAttributes</a> </p> </li> <li> <p> <a>DescribeFleetCapacity</a> </p> </li> <li> <p> <a>DescribeFleetPortSettings</a> </p> </li> <li> <p> <a>DescribeFleetUtilization</a> </p> </li> <li> <p> <a>DescribeRuntimeConfiguration</a> </p> </li> <li> <p> <a>DescribeEC2InstanceLimits</a> </p> </li> <li> <p> <a>DescribeFleetEvents</a> </p> </li> </ul> </li> <li> <p>Update fleets:</p> <ul> <li> <p> <a>UpdateFleetAttributes</a> </p> </li> <li> <p> <a>UpdateFleetCapacity</a> </p> </li> <li> <p> <a>UpdateFleetPortSettings</a> </p> </li> <li> <p> <a>UpdateRuntimeConfiguration</a> </p> </li> </ul> </li> <li> <p>Manage fleet actions:</p> <ul> <li> <p> <a>StartFleetActions</a> </p> </li> <li> <p> <a>StopFleetActions</a> </p> </li> </ul> </li> </ul>"
+      "documentation":"<p>Updates fleet properties, including name and description, for a fleet. To update metadata, specify the fleet ID and the property values that you want to change. If successful, the fleet ID for the updated fleet is returned.</p> <p> <b>Learn more</b> </p> <p> <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/fleets-intro.html\"> Working with Fleets</a>.</p> <p> <b>Related operations</b> </p> <ul> <li> <p> <a>CreateFleet</a> </p> </li> <li> <p> <a>ListFleets</a> </p> </li> <li> <p> <a>DeleteFleet</a> </p> </li> <li> <p> <a>DescribeFleetAttributes</a> </p> </li> <li> <p>Update fleets:</p> <ul> <li> <p> <a>UpdateFleetAttributes</a> </p> </li> <li> <p> <a>UpdateFleetCapacity</a> </p> </li> <li> <p> <a>UpdateFleetPortSettings</a> </p> </li> <li> <p> <a>UpdateRuntimeConfiguration</a> </p> </li> </ul> </li> <li> <p>Manage fleet actions:</p> <ul> <li> <p> <a>StartFleetActions</a> </p> </li> <li> <p> <a>StopFleetActions</a> </p> </li> </ul> </li> </ul>"
     },
     "UpdateFleetCapacity":{
       "name":"UpdateFleetCapacity",
@@ -1080,7 +1142,7 @@
         {"shape":"InvalidRequestException"},
         {"shape":"UnauthorizedException"}
       ],
-      "documentation":"<p>Updates capacity settings for a fleet. Use this action to specify the number of EC2 instances (hosts) that you want this fleet to contain. Before calling this action, you may want to call <a>DescribeEC2InstanceLimits</a> to get the maximum capacity based on the fleet's EC2 instance type.</p> <p>Specify minimum and maximum number of instances. Amazon GameLift will not change fleet capacity to values fall outside of this range. This is particularly important when using auto-scaling (see <a>PutScalingPolicy</a>) to allow capacity to adjust based on player demand while imposing limits on automatic adjustments.</p> <p>To update fleet capacity, specify the fleet ID and the number of instances you want the fleet to host. If successful, Amazon GameLift starts or terminates instances so that the fleet's active instance count matches the desired instance count. You can view a fleet's current capacity information by calling <a>DescribeFleetCapacity</a>. If the desired instance count is higher than the instance type's limit, the \"Limit Exceeded\" exception occurs.</p> <p> <b>Learn more</b> </p> <p> <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/fleets-intro.html\"> Working with Fleets</a>.</p> <p> <b>Related operations</b> </p> <ul> <li> <p> <a>CreateFleet</a> </p> </li> <li> <p> <a>ListFleets</a> </p> </li> <li> <p> <a>DeleteFleet</a> </p> </li> <li> <p>Describe fleets:</p> <ul> <li> <p> <a>DescribeFleetAttributes</a> </p> </li> <li> <p> <a>DescribeFleetCapacity</a> </p> </li> <li> <p> <a>DescribeFleetPortSettings</a> </p> </li> <li> <p> <a>DescribeFleetUtilization</a> </p> </li> <li> <p> <a>DescribeRuntimeConfiguration</a> </p> </li> <li> <p> <a>DescribeEC2InstanceLimits</a> </p> </li> <li> <p> <a>DescribeFleetEvents</a> </p> </li> </ul> </li> <li> <p>Update fleets:</p> <ul> <li> <p> <a>UpdateFleetAttributes</a> </p> </li> <li> <p> <a>UpdateFleetCapacity</a> </p> </li> <li> <p> <a>UpdateFleetPortSettings</a> </p> </li> <li> <p> <a>UpdateRuntimeConfiguration</a> </p> </li> </ul> </li> <li> <p>Manage fleet actions:</p> <ul> <li> <p> <a>StartFleetActions</a> </p> </li> <li> <p> <a>StopFleetActions</a> </p> </li> </ul> </li> </ul>"
+      "documentation":"<p>Updates capacity settings for a fleet. Use this action to specify the number of EC2 instances (hosts) that you want this fleet to contain. Before calling this action, you may want to call <a>DescribeEC2InstanceLimits</a> to get the maximum capacity based on the fleet's EC2 instance type.</p> <p>Specify minimum and maximum number of instances. Amazon GameLift will not change fleet capacity to values fall outside of this range. This is particularly important when using auto-scaling (see <a>PutScalingPolicy</a>) to allow capacity to adjust based on player demand while imposing limits on automatic adjustments.</p> <p>To update fleet capacity, specify the fleet ID and the number of instances you want the fleet to host. If successful, Amazon GameLift starts or terminates instances so that the fleet's active instance count matches the desired instance count. You can view a fleet's current capacity information by calling <a>DescribeFleetCapacity</a>. If the desired instance count is higher than the instance type's limit, the \"Limit Exceeded\" exception occurs.</p> <p> <b>Learn more</b> </p> <p> <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/fleets-intro.html\"> Working with Fleets</a>.</p> <p> <b>Related operations</b> </p> <ul> <li> <p> <a>CreateFleet</a> </p> </li> <li> <p> <a>ListFleets</a> </p> </li> <li> <p> <a>DeleteFleet</a> </p> </li> <li> <p> <a>DescribeFleetAttributes</a> </p> </li> <li> <p>Update fleets:</p> <ul> <li> <p> <a>UpdateFleetAttributes</a> </p> </li> <li> <p> <a>UpdateFleetCapacity</a> </p> </li> <li> <p> <a>UpdateFleetPortSettings</a> </p> </li> <li> <p> <a>UpdateRuntimeConfiguration</a> </p> </li> </ul> </li> <li> <p>Manage fleet actions:</p> <ul> <li> <p> <a>StartFleetActions</a> </p> </li> <li> <p> <a>StopFleetActions</a> </p> </li> </ul> </li> </ul>"
     },
     "UpdateFleetPortSettings":{
       "name":"UpdateFleetPortSettings",
@@ -1099,7 +1161,7 @@
         {"shape":"InvalidRequestException"},
         {"shape":"UnauthorizedException"}
       ],
-      "documentation":"<p>Updates port settings for a fleet. To update settings, specify the fleet ID to be updated and list the permissions you want to update. List the permissions you want to add in <code>InboundPermissionAuthorizations</code>, and permissions you want to remove in <code>InboundPermissionRevocations</code>. Permissions to be removed must match existing fleet permissions. If successful, the fleet ID for the updated fleet is returned.</p> <p> <b>Learn more</b> </p> <p> <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/fleets-intro.html\"> Working with Fleets</a>.</p> <p> <b>Related operations</b> </p> <ul> <li> <p> <a>CreateFleet</a> </p> </li> <li> <p> <a>ListFleets</a> </p> </li> <li> <p> <a>DeleteFleet</a> </p> </li> <li> <p>Describe fleets:</p> <ul> <li> <p> <a>DescribeFleetAttributes</a> </p> </li> <li> <p> <a>DescribeFleetCapacity</a> </p> </li> <li> <p> <a>DescribeFleetPortSettings</a> </p> </li> <li> <p> <a>DescribeFleetUtilization</a> </p> </li> <li> <p> <a>DescribeRuntimeConfiguration</a> </p> </li> <li> <p> <a>DescribeEC2InstanceLimits</a> </p> </li> <li> <p> <a>DescribeFleetEvents</a> </p> </li> </ul> </li> <li> <p>Update fleets:</p> <ul> <li> <p> <a>UpdateFleetAttributes</a> </p> </li> <li> <p> <a>UpdateFleetCapacity</a> </p> </li> <li> <p> <a>UpdateFleetPortSettings</a> </p> </li> <li> <p> <a>UpdateRuntimeConfiguration</a> </p> </li> </ul> </li> <li> <p>Manage fleet actions:</p> <ul> <li> <p> <a>StartFleetActions</a> </p> </li> <li> <p> <a>StopFleetActions</a> </p> </li> </ul> </li> </ul>"
+      "documentation":"<p>Updates port settings for a fleet. To update settings, specify the fleet ID to be updated and list the permissions you want to update. List the permissions you want to add in <code>InboundPermissionAuthorizations</code>, and permissions you want to remove in <code>InboundPermissionRevocations</code>. Permissions to be removed must match existing fleet permissions. If successful, the fleet ID for the updated fleet is returned.</p> <p> <b>Learn more</b> </p> <p> <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/fleets-intro.html\"> Working with Fleets</a>.</p> <p> <b>Related operations</b> </p> <ul> <li> <p> <a>CreateFleet</a> </p> </li> <li> <p> <a>ListFleets</a> </p> </li> <li> <p> <a>DeleteFleet</a> </p> </li> <li> <p> <a>DescribeFleetAttributes</a> </p> </li> <li> <p>Update fleets:</p> <ul> <li> <p> <a>UpdateFleetAttributes</a> </p> </li> <li> <p> <a>UpdateFleetCapacity</a> </p> </li> <li> <p> <a>UpdateFleetPortSettings</a> </p> </li> <li> <p> <a>UpdateRuntimeConfiguration</a> </p> </li> </ul> </li> <li> <p>Manage fleet actions:</p> <ul> <li> <p> <a>StartFleetActions</a> </p> </li> <li> <p> <a>StopFleetActions</a> </p> </li> </ul> </li> </ul>"
     },
     "UpdateGameSession":{
       "name":"UpdateGameSession",
@@ -1166,7 +1228,7 @@
         {"shape":"InvalidRequestException"},
         {"shape":"InvalidFleetStatusException"}
       ],
-      "documentation":"<p>Updates the current run-time configuration for the specified fleet, which tells Amazon GameLift how to launch server processes on instances in the fleet. You can update a fleet's run-time configuration at any time after the fleet is created; it does not need to be in an <code>ACTIVE</code> status.</p> <p>To update run-time configuration, specify the fleet ID and provide a <code>RuntimeConfiguration</code> object with an updated set of server process configurations.</p> <p>Each instance in a Amazon GameLift fleet checks regularly for an updated run-time configuration and changes how it launches server processes to comply with the latest version. Existing server processes are not affected by the update; run-time configuration changes are applied gradually as existing processes shut down and new processes are launched during Amazon GameLift's normal process recycling activity.</p> <p> <b>Learn more</b> </p> <p> <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/fleets-intro.html\"> Working with Fleets</a>.</p> <p> <b>Related operations</b> </p> <ul> <li> <p> <a>CreateFleet</a> </p> </li> <li> <p> <a>ListFleets</a> </p> </li> <li> <p> <a>DeleteFleet</a> </p> </li> <li> <p>Describe fleets:</p> <ul> <li> <p> <a>DescribeFleetAttributes</a> </p> </li> <li> <p> <a>DescribeFleetCapacity</a> </p> </li> <li> <p> <a>DescribeFleetPortSettings</a> </p> </li> <li> <p> <a>DescribeFleetUtilization</a> </p> </li> <li> <p> <a>DescribeRuntimeConfiguration</a> </p> </li> <li> <p> <a>DescribeEC2InstanceLimits</a> </p> </li> <li> <p> <a>DescribeFleetEvents</a> </p> </li> </ul> </li> <li> <p>Update fleets:</p> <ul> <li> <p> <a>UpdateFleetAttributes</a> </p> </li> <li> <p> <a>UpdateFleetCapacity</a> </p> </li> <li> <p> <a>UpdateFleetPortSettings</a> </p> </li> <li> <p> <a>UpdateRuntimeConfiguration</a> </p> </li> </ul> </li> <li> <p>Manage fleet actions:</p> <ul> <li> <p> <a>StartFleetActions</a> </p> </li> <li> <p> <a>StopFleetActions</a> </p> </li> </ul> </li> </ul>"
+      "documentation":"<p>Updates the current runtime configuration for the specified fleet, which tells Amazon GameLift how to launch server processes on instances in the fleet. You can update a fleet's runtime configuration at any time after the fleet is created; it does not need to be in an <code>ACTIVE</code> status.</p> <p>To update runtime configuration, specify the fleet ID and provide a <code>RuntimeConfiguration</code> object with an updated set of server process configurations.</p> <p>Each instance in a Amazon GameLift fleet checks regularly for an updated runtime configuration and changes how it launches server processes to comply with the latest version. Existing server processes are not affected by the update; runtime configuration changes are applied gradually as existing processes shut down and new processes are launched during Amazon GameLift's normal process recycling activity.</p> <p> <b>Learn more</b> </p> <p> <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/fleets-intro.html\"> Working with Fleets</a>.</p> <p> <b>Related operations</b> </p> <ul> <li> <p> <a>CreateFleet</a> </p> </li> <li> <p> <a>ListFleets</a> </p> </li> <li> <p> <a>DeleteFleet</a> </p> </li> <li> <p> <a>DescribeFleetAttributes</a> </p> </li> <li> <p>Update fleets:</p> <ul> <li> <p> <a>UpdateFleetAttributes</a> </p> </li> <li> <p> <a>UpdateFleetCapacity</a> </p> </li> <li> <p> <a>UpdateFleetPortSettings</a> </p> </li> <li> <p> <a>UpdateRuntimeConfiguration</a> </p> </li> </ul> </li> <li> <p>Manage fleet actions:</p> <ul> <li> <p> <a>StartFleetActions</a> </p> </li> <li> <p> <a>StopFleetActions</a> </p> </li> </ul> </li> </ul>"
     },
     "UpdateScript":{
       "name":"UpdateScript",
@@ -1211,11 +1273,11 @@
       "members":{
         "TicketId":{
           "shape":"MatchmakingIdStringModel",
-          "documentation":"<p>Unique identifier for a matchmaking ticket. The ticket must be in status <code>REQUIRES_ACCEPTANCE</code>; otherwise this request will fail.</p>"
+          "documentation":"<p>A unique identifier for a matchmaking ticket. The ticket must be in status <code>REQUIRES_ACCEPTANCE</code>; otherwise this request will fail.</p>"
         },
         "PlayerIds":{
           "shape":"StringList",
-          "documentation":"<p>Unique identifier for a player delivering the response. This parameter can include one or multiple player IDs.</p>"
+          "documentation":"<p>A unique identifier for a player delivering the response. This parameter can include one or multiple player IDs.</p>"
         },
         "AcceptanceType":{
           "shape":"AcceptanceType",
@@ -1241,43 +1303,48 @@
       "members":{
         "AliasId":{
           "shape":"AliasId",
-          "documentation":"<p>Unique identifier for an alias; alias IDs are unique within a region.</p>"
+          "documentation":"<p>A unique identifier for an alias. Alias IDs are unique within a Region.</p>"
         },
         "Name":{
           "shape":"NonBlankAndLengthConstraintString",
-          "documentation":"<p>Descriptive label that is associated with an alias. Alias names do not need to be unique.</p>"
+          "documentation":"<p>A descriptive label that is associated with an alias. Alias names do not need to be unique.</p>"
         },
         "AliasArn":{
           "shape":"ArnStringModel",
-          "documentation":"<p>Unique identifier for an alias; alias ARNs are unique across all regions.</p>"
+          "documentation":"<p>Amazon Resource Name (<a href=\"https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html\">ARN</a>) that is assigned to a GameLift alias resource and uniquely identifies it. ARNs are unique across all Regions.. In a GameLift alias ARN, the resource ID matches the alias ID value.</p>"
         },
         "Description":{
           "shape":"FreeText",
-          "documentation":"<p>Human-readable description of an alias.</p>"
+          "documentation":"<p>A human-readable description of an alias.</p>"
         },
         "RoutingStrategy":{
           "shape":"RoutingStrategy",
-          "documentation":"<p>Alias configuration for the alias, including routing type and settings.</p>"
+          "documentation":"<p>The routing configuration, including routing type and fleet target, for the alias. </p>"
         },
         "CreationTime":{
           "shape":"Timestamp",
-          "documentation":"<p>Time stamp indicating when this data object was created. Format is a number expressed in Unix time as milliseconds (for example \"1469498468.057\").</p>"
+          "documentation":"<p>A time stamp indicating when this data object was created. Format is a number expressed in Unix time as milliseconds (for example \"1469498468.057\").</p>"
         },
         "LastUpdatedTime":{
           "shape":"Timestamp",
-          "documentation":"<p>Time stamp indicating when this data object was last modified. Format is a number expressed in Unix time as milliseconds (for example \"1469498468.057\").</p>"
+          "documentation":"<p>The time that this data object was last modified. Format is a number expressed in Unix time as milliseconds (for example \"1469498468.057\").</p>"
         }
       },
-      "documentation":"<p>Properties describing a fleet alias.</p> <ul> <li> <p> <a>CreateAlias</a> </p> </li> <li> <p> <a>ListAliases</a> </p> </li> <li> <p> <a>DescribeAlias</a> </p> </li> <li> <p> <a>UpdateAlias</a> </p> </li> <li> <p> <a>DeleteAlias</a> </p> </li> <li> <p> <a>ResolveAlias</a> </p> </li> </ul>"
+      "documentation":"<p>Properties that describe an alias resource.</p> <ul> <li> <p> <a>CreateAlias</a> </p> </li> <li> <p> <a>ListAliases</a> </p> </li> <li> <p> <a>DescribeAlias</a> </p> </li> <li> <p> <a>UpdateAlias</a> </p> </li> <li> <p> <a>DeleteAlias</a> </p> </li> <li> <p> <a>ResolveAlias</a> </p> </li> </ul>"
     },
     "AliasId":{
       "type":"string",
-      "pattern":"^alias-\\S+"
+      "pattern":"^alias-\\S+|^arn:.*:alias\\/alias-\\S+"
     },
     "AliasList":{
       "type":"list",
       "member":{"shape":"Alias"}
     },
+    "AmazonResourceName":{
+      "type":"string",
+      "max":1011,
+      "min":1
+    },
     "ArnStringModel":{
       "type":"string",
       "max":256,
@@ -1304,7 +1371,7 @@
           "documentation":"<p>For a map of up to 10 data type:value pairs. Maximum length for each string value is 100 characters. </p>"
         }
       },
-      "documentation":"<p>Values for use in <a>Player</a> attribute key:value pairs. This object lets you specify an attribute value using any of the valid data types: string, number, string array, or data map. Each <code>AttributeValue</code> object can use only one of the available properties.</p>"
+      "documentation":"<p>Values for use in <a>Player</a> attribute key-value pairs. This object lets you specify an attribute value using any of the valid data types: string, number, string array, or data map. Each <code>AttributeValue</code> object can use only one of the available properties.</p>"
     },
     "AwsCredentials":{
       "type":"structure",
@@ -1338,15 +1405,19 @@
       "members":{
         "BuildId":{
           "shape":"BuildId",
-          "documentation":"<p>Unique identifier for a build.</p>"
+          "documentation":"<p>A unique identifier for a build.</p>"
+        },
+        "BuildArn":{
+          "shape":"BuildArn",
+          "documentation":"<p>Amazon Resource Name (<a href=\"https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html\">ARN</a>) that is assigned to a GameLift build resource and uniquely identifies it. ARNs are unique across all Regions. In a GameLift build ARN, the resource ID matches the <i>BuildId</i> value.</p>"
         },
         "Name":{
           "shape":"FreeText",
-          "documentation":"<p>Descriptive label that is associated with a build. Build names do not need to be unique. It can be set using <a>CreateBuild</a> or <a>UpdateBuild</a>.</p>"
+          "documentation":"<p>A descriptive label that is associated with a build. Build names do not need to be unique. It can be set using <a>CreateBuild</a> or <a>UpdateBuild</a>.</p>"
         },
         "Version":{
           "shape":"FreeText",
-          "documentation":"<p>Version that is associated with a build or script. Version strings do not need to be unique. This value can be set using <a>CreateBuild</a> or <a>UpdateBuild</a>.</p>"
+          "documentation":"<p>Version information that is associated with a build or script. Version strings do not need to be unique. This value can be set using <a>CreateBuild</a> or <a>UpdateBuild</a>.</p>"
         },
         "Status":{
           "shape":"BuildStatus",
@@ -1367,9 +1438,13 @@
       },
       "documentation":"<p>Properties describing a custom game build.</p> <p> <b>Related operations</b> </p> <ul> <li> <p> <a>CreateBuild</a> </p> </li> <li> <p> <a>ListBuilds</a> </p> </li> <li> <p> <a>DescribeBuild</a> </p> </li> <li> <p> <a>UpdateBuild</a> </p> </li> <li> <p> <a>DeleteBuild</a> </p> </li> </ul>"
     },
+    "BuildArn":{
+      "type":"string",
+      "pattern":"^arn:.*:build\\/build-\\S+"
+    },
     "BuildId":{
       "type":"string",
-      "pattern":"^build-\\S+"
+      "pattern":"^build-\\S+|^arn:.*:build\\/build-\\S+"
     },
     "BuildList":{
       "type":"list",
@@ -1387,8 +1462,12 @@
       "type":"structure",
       "required":["CertificateType"],
       "members":{
-        "CertificateType":{"shape":"CertificateType"}
-      }
+        "CertificateType":{
+          "shape":"CertificateType",
+          "documentation":"<p>Indicates whether a TLS/SSL certificate was generated for a fleet. </p> <p> </p> <p> </p>"
+        }
+      },
+      "documentation":"<p>Information about the use of a TLS/SSL certificate for a fleet. TLS certificate generation is enabled at the fleet level, with one certificate generated for the fleet. When this feature is enabled, the certificate can be retrieved using the <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/reference-serversdk.html\">GameLift Server SDK</a> call <code>GetInstanceCertificate</code>. All instances in a fleet share the same certificate.</p>"
     },
     "CertificateType":{
       "type":"string",
@@ -1423,15 +1502,19 @@
       "members":{
         "Name":{
           "shape":"NonBlankAndLengthConstraintString",
-          "documentation":"<p>Descriptive label that is associated with an alias. Alias names do not need to be unique.</p>"
+          "documentation":"<p>A descriptive label that is associated with an alias. Alias names do not need to be unique.</p>"
         },
         "Description":{
           "shape":"NonZeroAndMaxString",
-          "documentation":"<p>Human-readable description of an alias.</p>"
+          "documentation":"<p>A human-readable description of the alias.</p>"
         },
         "RoutingStrategy":{
           "shape":"RoutingStrategy",
-          "documentation":"<p>Object that specifies the fleet and routing type to use for the alias.</p>"
+          "documentation":"<p>The routing configuration, including routing type and fleet target, for the alias. </p>"
+        },
+        "Tags":{
+          "shape":"TagList",
+          "documentation":"<p>A list of labels to assign to the new alias resource. Tags are developer-defined key-value pairs. Tagging AWS resources are useful for resource management, access management and cost allocation. For more information, see <a href=\"https://docs.aws.amazon.com/general/latest/gr/aws_tagging.html\"> Tagging AWS Resources</a> in the <i>AWS General Reference</i>. Once the resource is created, you can use <a>TagResource</a>, <a>UntagResource</a>, and <a>ListTagsForResource</a> to add, remove, and view tags. The maximum tag limit may be lower than stated. See the AWS General Reference for actual tagging limits.</p>"
         }
       },
       "documentation":"<p>Represents the input for a request action.</p>"
@@ -1441,7 +1524,7 @@
       "members":{
         "Alias":{
           "shape":"Alias",
-          "documentation":"<p>Object that describes the newly created alias record.</p>"
+          "documentation":"<p>The newly created alias resource.</p>"
         }
       },
       "documentation":"<p>Represents the returned data in response to a request action.</p>"
@@ -1451,19 +1534,23 @@
       "members":{
         "Name":{
           "shape":"NonZeroAndMaxString",
-          "documentation":"<p>Descriptive label that is associated with a build. Build names do not need to be unique. You can use <a>UpdateBuild</a> to change this value later. </p>"
+          "documentation":"<p>A descriptive label that is associated with a build. Build names do not need to be unique. You can use <a>UpdateBuild</a> to change this value later. </p>"
         },
         "Version":{
           "shape":"NonZeroAndMaxString",
-          "documentation":"<p>Version that is associated with a build or script. Version strings do not need to be unique. You can use <a>UpdateBuild</a> to change this value later. </p>"
+          "documentation":"<p>Version information that is associated with a build or script. Version strings do not need to be unique. You can use <a>UpdateBuild</a> to change this value later. </p>"
         },
         "StorageLocation":{
           "shape":"S3Location",
-          "documentation":"<p>Information indicating where your game build files are stored. Use this parameter only when creating a build with files stored in an Amazon S3 bucket that you own. The storage location must specify an Amazon S3 bucket name and key, as well as a the ARN for a role that you set up to allow Amazon GameLift to access your Amazon S3 bucket. The S3 bucket must be in the same region that you want to create a new build in.</p>"
+          "documentation":"<p>Information indicating where your game build files are stored. Use this parameter only when creating a build with files stored in an Amazon S3 bucket that you own. The storage location must specify an Amazon S3 bucket name and key. The location must also specify a role ARN that you set up to allow Amazon GameLift to access your Amazon S3 bucket. The S3 bucket and your new build must be in the same Region.</p>"
         },
         "OperatingSystem":{
           "shape":"OperatingSystem",
-          "documentation":"<p>Operating system that the game server binaries are built to run on. This value determines the type of fleet resources that you can use for this build. If your game build contains multiple executables, they all must run on the same operating system. If an operating system is not specified when creating a build, Amazon GameLift uses the default value (WINDOWS_2012). This value cannot be changed later.</p>"
+          "documentation":"<p>The operating system that the game server binaries are built to run on. This value determines the type of fleet resources that you can use for this build. If your game build contains multiple executables, they all must run on the same operating system. If an operating system is not specified when creating a build, Amazon GameLift uses the default value (WINDOWS_2012). This value cannot be changed later.</p>"
+        },
+        "Tags":{
+          "shape":"TagList",
+          "documentation":"<p>A list of labels to assign to the new build resource. Tags are developer-defined key-value pairs. Tagging AWS resources are useful for resource management, access management and cost allocation. For more information, see <a href=\"https://docs.aws.amazon.com/general/latest/gr/aws_tagging.html\"> Tagging AWS Resources</a> in the <i>AWS General Reference</i>. Once the resource is created, you can use <a>TagResource</a>, <a>UntagResource</a>, and <a>ListTagsForResource</a> to add, remove, and view tags. The maximum tag limit may be lower than stated. See the AWS General Reference for actual tagging limits.</p>"
         }
       },
       "documentation":"<p>Represents the input for a request action.</p>"
@@ -1473,7 +1560,7 @@
       "members":{
         "Build":{
           "shape":"Build",
-          "documentation":"<p>The newly created build record, including a unique build ID and status. </p>"
+          "documentation":"<p>The newly created build record, including a unique build IDs and status. </p>"
         },
         "UploadCredentials":{
           "shape":"AwsCredentials",
@@ -1495,27 +1582,27 @@
       "members":{
         "Name":{
           "shape":"NonZeroAndMaxString",
-          "documentation":"<p>Descriptive label that is associated with a fleet. Fleet names do not need to be unique.</p>"
+          "documentation":"<p>A descriptive label that is associated with a fleet. Fleet names do not need to be unique.</p>"
         },
         "Description":{
           "shape":"NonZeroAndMaxString",
-          "documentation":"<p>Human-readable description of a fleet.</p>"
+          "documentation":"<p>A human-readable description of a fleet.</p>"
         },
         "BuildId":{
           "shape":"BuildId",
-          "documentation":"<p>Unique identifier for a build to be deployed on the new fleet. The custom game server build must have been successfully uploaded to Amazon GameLift and be in a <code>READY</code> status. This fleet setting cannot be changed once the fleet is created.</p>"
+          "documentation":"<p>A unique identifier for a build to be deployed on the new fleet. You can use either the build ID or ARN value. The custom game server build must have been successfully uploaded to Amazon GameLift and be in a <code>READY</code> status. This fleet setting cannot be changed once the fleet is created. </p>"
         },
         "ScriptId":{
           "shape":"ScriptId",
-          "documentation":"<p>Unique identifier for a Realtime script to be deployed on the new fleet. The Realtime script must have been successfully uploaded to Amazon GameLift. This fleet setting cannot be changed once the fleet is created.</p>"
+          "documentation":"<p>A unique identifier for a Realtime script to be deployed on the new fleet. You can use either the script ID or ARN value. The Realtime script must have been successfully uploaded to Amazon GameLift. This fleet setting cannot be changed once the fleet is created.</p>"
         },
         "ServerLaunchPath":{
           "shape":"NonZeroAndMaxString",
-          "documentation":"<p>This parameter is no longer used. Instead, specify a server launch path using the <code>RuntimeConfiguration</code> parameter. (Requests that specify a server launch path and launch parameters instead of a run-time configuration will continue to work.)</p>"
+          "documentation":"<p>This parameter is no longer used. Instead, specify a server launch path using the <code>RuntimeConfiguration</code> parameter. Requests that specify a server launch path and launch parameters instead of a runtime configuration will continue to work.</p>"
         },
         "ServerLaunchParameters":{
           "shape":"NonZeroAndMaxString",
-          "documentation":"<p>This parameter is no longer used. Instead, specify server launch parameters in the <code>RuntimeConfiguration</code> parameter. (Requests that specify a server launch path and launch parameters instead of a run-time configuration will continue to work.)</p>"
+          "documentation":"<p>This parameter is no longer used. Instead, specify server launch parameters in the <code>RuntimeConfiguration</code> parameter. (Requests that specify a server launch path and launch parameters instead of a runtime configuration will continue to work.)</p>"
         },
         "LogPaths":{
           "shape":"StringList",
@@ -1523,45 +1610,52 @@
         },
         "EC2InstanceType":{
           "shape":"EC2InstanceType",
-          "documentation":"<p>Name of an EC2 instance type that is supported in Amazon GameLift. A fleet instance type determines the computing resources of each instance in the fleet, including CPU, memory, storage, and networking capacity. Amazon GameLift supports the following EC2 instance types. See <a href=\"http://aws.amazon.com/ec2/instance-types/\">Amazon EC2 Instance Types</a> for detailed descriptions.</p>"
+          "documentation":"<p>The name of an EC2 instance type that is supported in Amazon GameLift. A fleet instance type determines the computing resources of each instance in the fleet, including CPU, memory, storage, and networking capacity. Amazon GameLift supports the following EC2 instance types. See <a href=\"http://aws.amazon.com/ec2/instance-types/\">Amazon EC2 Instance Types</a> for detailed descriptions.</p>"
         },
         "EC2InboundPermissions":{
           "shape":"IpPermissionsList",
-          "documentation":"<p>Range of IP addresses and port settings that permit inbound traffic to access game sessions that running on the fleet. For fleets using a custom game build, this parameter is required before game sessions running on the fleet can accept connections. For Realtime Servers fleets, Amazon GameLift automatically sets TCP and UDP ranges for use by the Realtime servers. You can specify multiple permission settings or add more by updating the fleet.</p>"
+          "documentation":"<p>Range of IP addresses and port settings that permit inbound traffic to access game sessions that are running on the fleet. For fleets using a custom game build, this parameter is required before game sessions running on the fleet can accept connections. For Realtime Servers fleets, Amazon GameLift automatically sets TCP and UDP ranges for use by the Realtime servers. You can specify multiple permission settings or add more by updating the fleet.</p>"
         },
         "NewGameSessionProtectionPolicy":{
           "shape":"ProtectionPolicy",
-          "documentation":"<p>Game session protection policy to apply to all instances in this fleet. If this parameter is not set, instances in this fleet default to no protection. You can change a fleet's protection policy using <a>UpdateFleetAttributes</a>, but this change will only affect sessions created after the policy change. You can also set protection for individual instances using <a>UpdateGameSession</a>.</p> <ul> <li> <p> <b>NoProtection</b> -- The game session can be terminated during a scale-down event.</p> </li> <li> <p> <b>FullProtection</b> -- If the game session is in an <code>ACTIVE</code> status, it cannot be terminated during a scale-down event.</p> </li> </ul>"
+          "documentation":"<p>A game session protection policy to apply to all instances in this fleet. If this parameter is not set, instances in this fleet default to no protection. You can change a fleet's protection policy using <a>UpdateFleetAttributes</a>, but this change will only affect sessions created after the policy change. You can also set protection for individual instances using <a>UpdateGameSession</a>.</p> <ul> <li> <p> <b>NoProtection</b> - The game session can be terminated during a scale-down event.</p> </li> <li> <p> <b>FullProtection</b> - If the game session is in an <code>ACTIVE</code> status, it cannot be terminated during a scale-down event.</p> </li> </ul>"
         },
         "RuntimeConfiguration":{
           "shape":"RuntimeConfiguration",
-          "documentation":"<p>Instructions for launching server processes on each instance in the fleet. Server processes run either a custom game build executable or a Realtime Servers script. The run-time configuration lists the types of server processes to run on an instance and includes the following configuration settings: the server executable or launch script file, launch parameters, and the number of processes to run concurrently on each instance. A CreateFleet request must include a run-time configuration with at least one server process configuration.</p>"
+          "documentation":"<p>Instructions for launching server processes on each instance in the fleet. Server processes run either a custom game build executable or a Realtime script. The runtime configuration defines the server executables or launch script file, launch parameters, and the number of processes to run concurrently on each instance. When creating a fleet, the runtime configuration must have at least one server process configuration; otherwise the request fails with an invalid request exception. (This parameter replaces the parameters <code>ServerLaunchPath</code> and <code>ServerLaunchParameters</code>, although requests that contain values for these parameters instead of a runtime configuration will continue to work.) This parameter is required unless the parameters <code>ServerLaunchPath</code> and <code>ServerLaunchParameters</code> are defined. Runtime configuration replaced these parameters, but fleets that use them will continue to work. </p>"
         },
         "ResourceCreationLimitPolicy":{
           "shape":"ResourceCreationLimitPolicy",
-          "documentation":"<p>Policy that limits the number of game sessions an individual player can create over a span of time for this fleet.</p>"
+          "documentation":"<p>A policy that limits the number of game sessions an individual player can create over a span of time for this fleet.</p>"
         },
         "MetricGroups":{
           "shape":"MetricGroupList",
-          "documentation":"<p>Name of an Amazon CloudWatch metric group to add this fleet to. A metric group aggregates the metrics for all fleets in the group. Specify an existing metric group name, or provide a new name to create a new metric group. A fleet can only be included in one metric group at a time. </p>"
+          "documentation":"<p>The name of an Amazon CloudWatch metric group to add this fleet to. A metric group aggregates the metrics for all fleets in the group. Specify an existing metric group name, or provide a new name to create a new metric group. A fleet can only be included in one metric group at a time. </p>"
         },
         "PeerVpcAwsAccountId":{
           "shape":"NonZeroAndMaxString",
-          "documentation":"<p>Unique identifier for the AWS account with the VPC that you want to peer your Amazon GameLift fleet with. You can find your Account ID in the AWS Management Console under account settings. </p>"
+          "documentation":"<p>A unique identifier for the AWS account with the VPC that you want to peer your Amazon GameLift fleet with. You can find your account ID in the AWS Management Console under account settings. </p>"
         },
         "PeerVpcId":{
           "shape":"NonZeroAndMaxString",
-          "documentation":"<p>Unique identifier for a VPC with resources to be accessed by your Amazon GameLift fleet. The VPC must be in the same region where your fleet is deployed. Look up a VPC ID using the <a href=\"https://console.aws.amazon.com/vpc/\">VPC Dashboard</a> in the AWS Management Console. Learn more about VPC peering in <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/vpc-peering.html\">VPC Peering with Amazon GameLift Fleets</a>. </p>"
+          "documentation":"<p>A unique identifier for a VPC with resources to be accessed by your Amazon GameLift fleet. The VPC must be in the same Region as your fleet. To look up a VPC ID, use the <a href=\"https://console.aws.amazon.com/vpc/\">VPC Dashboard</a> in the AWS Management Console. Learn more about VPC peering in <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/vpc-peering.html\">VPC Peering with Amazon GameLift Fleets</a>. </p>"
         },
         "FleetType":{
           "shape":"FleetType",
-          "documentation":"<p>Indicates whether to use on-demand instances or spot instances for this fleet. If empty, the default is ON_DEMAND. Both categories of instances use identical hardware and configurations based on the instance type selected for this fleet. Learn more about <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/gamelift-ec2-instances.html#gamelift-ec2-instances-spot\"> On-Demand versus Spot Instances</a>. </p>"
+          "documentation":"<p>Indicates whether to use On-Demand instances or Spot instances for this fleet. If empty, the default is <code>ON_DEMAND</code>. Both categories of instances use identical hardware and configurations based on the instance type selected for this fleet. Learn more about <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/gamelift-ec2-instances.html#gamelift-ec2-instances-spot\"> On-Demand versus Spot Instances</a>. </p>"
         },
         "InstanceRoleArn":{
           "shape":"NonEmptyString",
-          "documentation":"<p>Unique identifier for an AWS IAM role that manages access to your AWS services. With an instance role ARN set, any application that runs on an instance in this fleet can assume the role, including install scripts, server processes, daemons (background processes). Create a role or look up a role's ARN using the <a href=\"https://console.aws.amazon.com/iam/\">IAM dashboard</a> in the AWS Management Console. Learn more about using on-box credentials for your game servers at <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/gamelift-sdk-server-resources.html\"> Access external resources from a game server</a>.</p>"
+          "documentation":"<p>A unique identifier for an AWS IAM role that manages access to your AWS services. With an instance role ARN set, any application that runs on an instance in this fleet can assume the role, including install scripts, server processes, and daemons (background processes). Create a role or look up a role's ARN from the <a href=\"https://console.aws.amazon.com/iam/\">IAM dashboard</a> in the AWS Management Console. Learn more about using on-box credentials for your game servers at <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/gamelift-sdk-server-resources.html\"> Access external resources from a game server</a>.</p>"
         },
-        "CertificateConfiguration":{"shape":"CertificateConfiguration"}
+        "CertificateConfiguration":{
+          "shape":"CertificateConfiguration",
+          "documentation":"<p>Indicates whether to generate a TLS/SSL certificate for the new fleet. TLS certificates are used for encrypting traffic between game clients and game servers running on GameLift. If this parameter is not specified, the default value, DISABLED, is used. This fleet setting cannot be changed once the fleet is created. Learn more at <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/gamelift-howitworks.html#gamelift-howitworks-security\">Securing Client/Server Communication</a>. </p> <p>Note: This feature requires the AWS Certificate Manager (ACM) service, which is available in the AWS global partition but not in all other partitions. When working in a partition that does not support this feature, a request for a new fleet with certificate generation results fails with a 4xx unsupported Region error.</p> <p>Valid values include: </p> <ul> <li> <p> <b>GENERATED</b> - Generate a TLS/SSL certificate for this fleet.</p> </li> <li> <p> <b>DISABLED</b> - (default) Do not generate a TLS/SSL certificate for this fleet.</p> </li> </ul>"
+        },
+        "Tags":{
+          "shape":"TagList",
+          "documentation":"<p>A list of labels to assign to the new fleet resource. Tags are developer-defined key-value pairs. Tagging AWS resources are useful for resource management, access management and cost allocation. For more information, see <a href=\"https://docs.aws.amazon.com/general/latest/gr/aws_tagging.html\"> Tagging AWS Resources</a> in the <i>AWS General Reference</i>. Once the resource is created, you can use <a>TagResource</a>, <a>UntagResource</a>, and <a>ListTagsForResource</a> to add, remove, and view tags. The maximum tag limit may be lower than stated. See the AWS General Reference for actual tagging limits.</p>"
+        }
       },
       "documentation":"<p>Represents the input for a request action.</p>"
     },
@@ -1581,19 +1675,19 @@
       "members":{
         "FleetId":{
           "shape":"FleetId",
-          "documentation":"<p>Unique identifier for a fleet to create a game session in. Each request must reference either a fleet ID or alias ID, but not both.</p>"
+          "documentation":"<p>A unique identifier for a fleet to create a game session in. You can use either the fleet ID or ARN value. Each request must reference either a fleet ID or alias ID, but not both.</p>"
         },
         "AliasId":{
           "shape":"AliasId",
-          "documentation":"<p>Unique identifier for an alias associated with the fleet to create a game session in. Each request must reference either a fleet ID or alias ID, but not both.</p>"
+          "documentation":"<p>A unique identifier for an alias associated with the fleet to create a game session in. You can use either the alias ID or ARN value. Each request must reference either a fleet ID or alias ID, but not both.</p>"
         },
         "MaximumPlayerSessionCount":{
           "shape":"WholeNumber",
-          "documentation":"<p>Maximum number of players that can be connected simultaneously to the game session.</p>"
+          "documentation":"<p>The maximum number of players that can be connected simultaneously to the game session.</p>"
         },
         "Name":{
           "shape":"NonZeroAndMaxString",
-          "documentation":"<p>Descriptive label that is associated with a game session. Session names do not need to be unique.</p>"
+          "documentation":"<p>A descriptive label that is associated with a game session. Session names do not need to be unique.</p>"
         },
         "GameProperties":{
           "shape":"GamePropertyList",
@@ -1601,7 +1695,7 @@
         },
         "CreatorId":{
           "shape":"NonZeroAndMaxString",
-          "documentation":"<p>Unique identifier for a player or entity creating the game session. This ID is used to enforce a resource protection policy (if one exists) that limits the number of concurrent active game sessions one player can have.</p>"
+          "documentation":"<p>A unique identifier for a player or entity creating the game session. This ID is used to enforce a resource protection policy (if one exists) that limits the number of concurrent active game sessions one player can have.</p>"
         },
         "GameSessionId":{
           "shape":"IdStringModel",
@@ -1634,19 +1728,23 @@
       "members":{
         "Name":{
           "shape":"GameSessionQueueName",
-          "documentation":"<p>Descriptive label that is associated with game session queue. Queue names must be unique within each region.</p>"
+          "documentation":"<p>A descriptive label that is associated with game session queue. Queue names must be unique within each Region.</p>"
         },
         "TimeoutInSeconds":{
           "shape":"WholeNumber",
-          "documentation":"<p>Maximum time, in seconds, that a new game session placement request remains in the queue. When a request exceeds this time, the game session placement changes to a <code>TIMED_OUT</code> status.</p>"
+          "documentation":"<p>The maximum time, in seconds, that a new game session placement request remains in the queue. When a request exceeds this time, the game session placement changes to a <code>TIMED_OUT</code> status.</p>"
         },
         "PlayerLatencyPolicies":{
           "shape":"PlayerLatencyPolicyList",
-          "documentation":"<p>Collection of latency policies to apply when processing game sessions placement requests with player latency information. Multiple policies are evaluated in order of the maximum latency value, starting with the lowest latency values. With just one policy, it is enforced at the start of the game session placement for the duration period. With multiple policies, each policy is enforced consecutively for its duration period. For example, a queue might enforce a 60-second policy followed by a 120-second policy, and then no policy for the remainder of the placement. A player latency policy must set a value for MaximumIndividualPlayerLatencyMilliseconds; if none is set, this API requests will fail.</p>"
+          "documentation":"<p>A collection of latency policies to apply when processing game sessions placement requests with player latency information. Multiple policies are evaluated in order of the maximum latency value, starting with the lowest latency values. With just one policy, the policy is enforced at the start of the game session placement for the duration period. With multiple policies, each policy is enforced consecutively for its duration period. For example, a queue might enforce a 60-second policy followed by a 120-second policy, and then no policy for the remainder of the placement. A player latency policy must set a value for <code>MaximumIndividualPlayerLatencyMilliseconds</code>. If none is set, this API request fails.</p>"
         },
         "Destinations":{
           "shape":"GameSessionQueueDestinationList",
-          "documentation":"<p>List of fleets that can be used to fulfill game session placement requests in the queue. Fleets are identified by either a fleet ARN or a fleet alias ARN. Destinations are listed in default preference order.</p>"
+          "documentation":"<p>A list of fleets that can be used to fulfill game session placement requests in the queue. Fleets are identified by either a fleet ARN or a fleet alias ARN. Destinations are listed in default preference order.</p>"
+        },
+        "Tags":{
+          "shape":"TagList",
+          "documentation":"<p>A list of labels to assign to the new game session queue resource. Tags are developer-defined key-value pairs. Tagging AWS resources are useful for resource management, access management and cost allocation. For more information, see <a href=\"https://docs.aws.amazon.com/general/latest/gr/aws_tagging.html\"> Tagging AWS Resources</a> in the <i>AWS General Reference</i>. Once the resource is created, you can use <a>TagResource</a>, <a>UntagResource</a>, and <a>ListTagsForResource</a> to add, remove, and view tags. The maximum tag limit may be lower than stated. See the AWS General Reference for actual tagging limits.</p>"
         }
       },
       "documentation":"<p>Represents the input for a request action.</p>"
@@ -1656,7 +1754,7 @@
       "members":{
         "GameSessionQueue":{
           "shape":"GameSessionQueue",
-          "documentation":"<p>Object that describes the newly created game session queue.</p>"
+          "documentation":"<p>An object that describes the newly created game session queue.</p>"
         }
       },
       "documentation":"<p>Represents the returned data in response to a request action.</p>"
@@ -1673,39 +1771,39 @@
       "members":{
         "Name":{
           "shape":"MatchmakingIdStringModel",
-          "documentation":"<p>Unique identifier for a matchmaking configuration. This name is used to identify the configuration associated with a matchmaking request or ticket.</p>"
+          "documentation":"<p>A unique identifier for a matchmaking configuration. This name is used to identify the configuration associated with a matchmaking request or ticket.</p>"
         },
         "Description":{
           "shape":"NonZeroAndMaxString",
-          "documentation":"<p>Meaningful description of the matchmaking configuration. </p>"
+          "documentation":"<p>A human-readable description of the matchmaking configuration. </p>"
         },
         "GameSessionQueueArns":{
           "shape":"QueueArnsList",
-          "documentation":"<p>Amazon Resource Name (<a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/s3-arn-format.html\">ARN</a>) that is assigned to a game session queue and uniquely identifies it. Format is <code>arn:aws:gamelift:&lt;region&gt;:&lt;aws account&gt;:gamesessionqueue/&lt;queue name&gt;</code>. These queues are used when placing game sessions for matches that are created with this matchmaking configuration. Queues can be located in any region.</p>"
+          "documentation":"<p>Amazon Resource Name (<a href=\"https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html\">ARN</a>) that is assigned to a GameLift game session queue resource and uniquely identifies it. ARNs are unique across all Regions. These queues are used when placing game sessions for matches that are created with this matchmaking configuration. Queues can be located in any Region.</p>"
         },
         "RequestTimeoutSeconds":{
           "shape":"MatchmakingRequestTimeoutInteger",
-          "documentation":"<p>Maximum duration, in seconds, that a matchmaking ticket can remain in process before timing out. Requests that fail due to timing out can be resubmitted as needed.</p>"
+          "documentation":"<p>The maximum duration, in seconds, that a matchmaking ticket can remain in process before timing out. Requests that fail due to timing out can be resubmitted as needed.</p>"
         },
         "AcceptanceTimeoutSeconds":{
           "shape":"MatchmakingAcceptanceTimeoutInteger",
-          "documentation":"<p>Length of time (in seconds) to wait for players to accept a proposed match. If any player rejects the match or fails to accept before the timeout, the ticket continues to look for an acceptable match.</p>"
+          "documentation":"<p>The length of time (in seconds) to wait for players to accept a proposed match. If any player rejects the match or fails to accept before the timeout, the ticket continues to look for an acceptable match.</p>"
         },
         "AcceptanceRequired":{
           "shape":"BooleanModel",
-          "documentation":"<p>Flag that determines whether a match that was created with this configuration must be accepted by the matched players. To require acceptance, set to TRUE.</p>"
+          "documentation":"<p>A flag that determines whether a match that was created with this configuration must be accepted by the matched players. To require acceptance, set to <code>TRUE</code>.</p>"
         },
         "RuleSetName":{
-          "shape":"MatchmakingIdStringModel",
-          "documentation":"<p>Unique identifier for a matchmaking rule set to use with this configuration. A matchmaking configuration can only use rule sets that are defined in the same region.</p>"
+          "shape":"MatchmakingRuleSetName",
+          "documentation":"<p>A unique identifier for a matchmaking rule set to use with this configuration. You can use either the rule set name or ARN value. A matchmaking configuration can only use rule sets that are defined in the same Region.</p>"
         },
         "NotificationTarget":{
           "shape":"SnsArnStringModel",
-          "documentation":"<p>SNS topic ARN that is set up to receive matchmaking notifications.</p>"
+          "documentation":"<p>An SNS topic ARN that is set up to receive matchmaking notifications.</p>"
         },
         "AdditionalPlayerCount":{
           "shape":"WholeNumber",
-          "documentation":"<p>Number of player slots in a match to keep open for future players. For example, if the configuration's rule set specifies a match for a single 12-person team, and the additional player count is set to 2, only 10 players are selected for the match.</p>"
+          "documentation":"<p>The number of player slots in a match to keep open for future players. For example, assume that the configuration's rule set specifies a match for a single 12-person team. If the additional player count is set to 2, only 10 players are initially selected for the match.</p>"
         },
         "CustomEventData":{
           "shape":"CustomEventData",
@@ -1713,15 +1811,19 @@
         },
         "GameProperties":{
           "shape":"GamePropertyList",
-          "documentation":"<p>Set of custom properties for a game session, formatted as key:value pairs. These properties are passed to a game server process in the <a>GameSession</a> object with a request to start a new game session (see <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/gamelift-sdk-server-api.html#gamelift-sdk-server-startsession\">Start a Game Session</a>). This information is added to the new <a>GameSession</a> object that is created for a successful match. </p>"
+          "documentation":"<p>A set of custom properties for a game session, formatted as key-value pairs. These properties are passed to a game server process in the <a>GameSession</a> object with a request to start a new game session (see <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/gamelift-sdk-server-api.html#gamelift-sdk-server-startsession\">Start a Game Session</a>). This information is added to the new <a>GameSession</a> object that is created for a successful match. </p>"
         },
         "GameSessionData":{
           "shape":"GameSessionData",
-          "documentation":"<p>Set of custom game session properties, formatted as a single string value. This data is passed to a game server process in the <a>GameSession</a> object with a request to start a new game session (see <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/gamelift-sdk-server-api.html#gamelift-sdk-server-startsession\">Start a Game Session</a>). This information is added to the new <a>GameSession</a> object that is created for a successful match.</p>"
+          "documentation":"<p>A set of custom game session properties, formatted as a single string value. This data is passed to a game server process in the <a>GameSession</a> object with a request to start a new game session (see <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/gamelift-sdk-server-api.html#gamelift-sdk-server-startsession\">Start a Game Session</a>). This information is added to the new <a>GameSession</a> object that is created for a successful match.</p>"
         },
         "BackfillMode":{
           "shape":"BackfillMode",
-          "documentation":"<p>Method used to backfill game sessions created with this matchmaking configuration. Specify MANUAL when your game manages backfill requests manually or does not use the match backfill feature. Specify AUTOMATIC to have GameLift create a <a>StartMatchBackfill</a> request whenever a game session has one or more open slots. Learn more about manual and automatic backfill in <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/match-backfill.html\"> Backfill Existing Games with FlexMatch</a>. </p>"
+          "documentation":"<p>The method used to backfill game sessions that are created with this matchmaking configuration. Specify <code>MANUAL</code> when your game manages backfill requests manually or does not use the match backfill feature. Specify <code>AUTOMATIC</code> to have GameLift create a <a>StartMatchBackfill</a> request whenever a game session has one or more open slots. Learn more about manual and automatic backfill in <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/match-backfill.html\"> Backfill Existing Games with FlexMatch</a>. </p>"
+        },
+        "Tags":{
+          "shape":"TagList",
+          "documentation":"<p>A list of labels to assign to the new matchmaking configuration resource. Tags are developer-defined key-value pairs. Tagging AWS resources are useful for resource management, access management and cost allocation. For more information, see <a href=\"https://docs.aws.amazon.com/general/latest/gr/aws_tagging.html\"> Tagging AWS Resources</a> in the <i>AWS General Reference</i>. Once the resource is created, you can use <a>TagResource</a>, <a>UntagResource</a>, and <a>ListTagsForResource</a> to add, remove, and view tags. The maximum tag limit may be lower than stated. See the AWS General Reference for actual tagging limits.</p>"
         }
       },
       "documentation":"<p>Represents the input for a request action.</p>"
@@ -1745,11 +1847,15 @@
       "members":{
         "Name":{
           "shape":"MatchmakingIdStringModel",
-          "documentation":"<p>Unique identifier for a matchmaking rule set. A matchmaking configuration identifies the rule set it uses by this name value. (Note: The rule set name is different from the optional \"name\" field in the rule set body.) </p>"
+          "documentation":"<p>A unique identifier for a matchmaking rule set. A matchmaking configuration identifies the rule set it uses by this name value. Note that the rule set name is different from the optional <code>name</code> field in the rule set body.</p>"
         },
         "RuleSetBody":{
           "shape":"RuleSetBody",
-          "documentation":"<p>Collection of matchmaking rules, formatted as a JSON string. Comments are not allowed in JSON, but most elements support a description field.</p>"
+          "documentation":"<p>A collection of matchmaking rules, formatted as a JSON string. Comments are not allowed in JSON, but most elements support a description field.</p>"
+        },
+        "Tags":{
+          "shape":"TagList",
+          "documentation":"<p>A list of labels to assign to the new matchmaking rule set resource. Tags are developer-defined key-value pairs. Tagging AWS resources are useful for resource management, access management and cost allocation. For more information, see <a href=\"https://docs.aws.amazon.com/general/latest/gr/aws_tagging.html\"> Tagging AWS Resources</a> in the <i>AWS General Reference</i>. Once the resource is created, you can use <a>TagResource</a>, <a>UntagResource</a>, and <a>ListTagsForResource</a> to add, remove, and view tags. The maximum tag limit may be lower than stated. See the AWS General Reference for actual tagging limits.</p>"
         }
       },
       "documentation":"<p>Represents the input for a request action.</p>"
@@ -1760,7 +1866,7 @@
       "members":{
         "RuleSet":{
           "shape":"MatchmakingRuleSet",
-          "documentation":"<p>Object that describes the newly created matchmaking rule set.</p>"
+          "documentation":"<p>The newly created matchmaking rule set.</p>"
         }
       },
       "documentation":"<p>Represents the returned data in response to a request action.</p>"
@@ -1774,11 +1880,11 @@
       "members":{
         "GameSessionId":{
           "shape":"ArnStringModel",
-          "documentation":"<p>Unique identifier for the game session to add a player to.</p>"
+          "documentation":"<p>A unique identifier for the game session to add a player to.</p>"
         },
         "PlayerId":{
           "shape":"NonZeroAndMaxString",
-          "documentation":"<p>Unique identifier for a player. Player IDs are developer-defined.</p>"
+          "documentation":"<p>A unique identifier for a player. Player IDs are developer-defined.</p>"
         },
         "PlayerData":{
           "shape":"PlayerData",
@@ -1806,7 +1912,7 @@
       "members":{
         "GameSessionId":{
           "shape":"ArnStringModel",
-          "documentation":"<p>Unique identifier for the game session to add players to.</p>"
+          "documentation":"<p>A unique identifier for the game session to add players to.</p>"
         },
         "PlayerIds":{
           "shape":"PlayerIdList",
@@ -1824,7 +1930,7 @@
       "members":{
         "PlayerSessions":{
           "shape":"PlayerSessionList",
-          "documentation":"<p>Collection of player session objects created for the added players.</p>"
+          "documentation":"<p>A collection of player session objects created for the added players.</p>"
         }
       },
       "documentation":"<p>Represents the returned data in response to a request action.</p>"
@@ -1834,19 +1940,23 @@
       "members":{
         "Name":{
           "shape":"NonZeroAndMaxString",
-          "documentation":"<p>Descriptive label that is associated with a script. Script names do not need to be unique. You can use <a>UpdateScript</a> to change this value later. </p>"
+          "documentation":"<p>A descriptive label that is associated with a script. Script names do not need to be unique. You can use <a>UpdateScript</a> to change this value later. </p>"
         },
         "Version":{
           "shape":"NonZeroAndMaxString",
-          "documentation":"<p>Version that is associated with a build or script. Version strings do not need to be unique. You can use <a>UpdateScript</a> to change this value later. </p>"
+          "documentation":"<p>The version that is associated with a build or script. Version strings do not need to be unique. You can use <a>UpdateScript</a> to change this value later. </p>"
         },
         "StorageLocation":{
           "shape":"S3Location",
-          "documentation":"<p>Location of the Amazon S3 bucket where a zipped file containing your Realtime scripts is stored. The storage location must specify the Amazon S3 bucket name, the zip file name (the \"key\"), and a role ARN that allows Amazon GameLift to access the Amazon S3 storage location. The S3 bucket must be in the same region where you want to create a new script. By default, Amazon GameLift uploads the latest version of the zip file; if you have S3 object versioning turned on, you can use the <code>ObjectVersion</code> parameter to specify an earlier version. </p>"
+          "documentation":"<p>The location of the Amazon S3 bucket where a zipped file containing your Realtime scripts is stored. The storage location must specify the Amazon S3 bucket name, the zip file name (the \"key\"), and a role ARN that allows Amazon GameLift to access the Amazon S3 storage location. The S3 bucket must be in the same Region where you want to create a new script. By default, Amazon GameLift uploads the latest version of the zip file; if you have S3 object versioning turned on, you can use the <code>ObjectVersion</code> parameter to specify an earlier version. </p>"
         },
         "ZipFile":{
           "shape":"ZipBlob",
-          "documentation":"<p>Data object containing your Realtime scripts and dependencies as a zip file. The zip file can have one or multiple files. Maximum size of a zip file is 5 MB.</p> <p>When using the AWS CLI tool to create a script, this parameter is set to the zip file name. It must be prepended with the string \"fileb://\" to indicate that the file data is a binary object. For example: <code>--zip-file fileb://myRealtimeScript.zip</code>.</p>"
+          "documentation":"<p>A data object containing your Realtime scripts and dependencies as a zip file. The zip file can have one or multiple files. Maximum size of a zip file is 5 MB.</p> <p>When using the AWS CLI tool to create a script, this parameter is set to the zip file name. It must be prepended with the string \"fileb://\" to indicate that the file data is a binary object. For example: <code>--zip-file fileb://myRealtimeScript.zip</code>.</p>"
+        },
+        "Tags":{
+          "shape":"TagList",
+          "documentation":"<p>A list of labels to assign to the new script resource. Tags are developer-defined key-value pairs. Tagging AWS resources are useful for resource management, access management and cost allocation. For more information, see <a href=\"https://docs.aws.amazon.com/general/latest/gr/aws_tagging.html\"> Tagging AWS Resources</a> in the <i>AWS General Reference</i>. Once the resource is created, you can use <a>TagResource</a>, <a>UntagResource</a>, and <a>ListTagsForResource</a> to add, remove, and view tags. The maximum tag limit may be lower than stated. See the AWS General Reference for actual tagging limits.</p>"
         }
       }
     },
@@ -1855,7 +1965,7 @@
       "members":{
         "Script":{
           "shape":"Script",
-          "documentation":"<p>The newly created script record with a unique script ID. The new script's storage location reflects an Amazon S3 location: (1) If the script was uploaded from an S3 bucket under your account, the storage location reflects the information that was provided in the <i>CreateScript</i> request; (2) If the script file was uploaded from a local zip file, the storage location reflects an S3 location controls by the Amazon GameLift service.</p>"
+          "documentation":"<p>The newly created script record with a unique script ID and ARN. The new script's storage location reflects an Amazon S3 location: (1) If the script was uploaded from an S3 bucket under your account, the storage location reflects the information that was provided in the <i>CreateScript</i> request; (2) If the script file was uploaded from a local zip file, the storage location reflects an S3 location controls by the Amazon GameLift service.</p>"
         }
       }
     },
@@ -1868,11 +1978,11 @@
       "members":{
         "GameLiftAwsAccountId":{
           "shape":"NonZeroAndMaxString",
-          "documentation":"<p>Unique identifier for the AWS account that you use to manage your Amazon GameLift fleet. You can find your Account ID in the AWS Management Console under account settings.</p>"
+          "documentation":"<p>A unique identifier for the AWS account that you use to manage your Amazon GameLift fleet. You can find your Account ID in the AWS Management Console under account settings.</p>"
         },
         "PeerVpcId":{
           "shape":"NonZeroAndMaxString",
-          "documentation":"<p>Unique identifier for a VPC with resources to be accessed by your Amazon GameLift fleet. The VPC must be in the same region where your fleet is deployed. Look up a VPC ID using the <a href=\"https://console.aws.amazon.com/vpc/\">VPC Dashboard</a> in the AWS Management Console. Learn more about VPC peering in <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/vpc-peering.html\">VPC Peering with Amazon GameLift Fleets</a>.</p>"
+          "documentation":"<p>A unique identifier for a VPC with resources to be accessed by your Amazon GameLift fleet. The VPC must be in the same Region where your fleet is deployed. Look up a VPC ID using the <a href=\"https://console.aws.amazon.com/vpc/\">VPC Dashboard</a> in the AWS Management Console. Learn more about VPC peering in <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/vpc-peering.html\">VPC Peering with Amazon GameLift Fleets</a>.</p>"
         }
       },
       "documentation":"<p>Represents the input for a request action.</p>"
@@ -1897,15 +2007,15 @@
       "members":{
         "FleetId":{
           "shape":"FleetId",
-          "documentation":"<p>Unique identifier for a fleet. This tells Amazon GameLift which GameLift VPC to peer with. </p>"
+          "documentation":"<p>A unique identifier for a fleet. You can use either the fleet ID or ARN value. This tells Amazon GameLift which GameLift VPC to peer with. </p>"
         },
         "PeerVpcAwsAccountId":{
           "shape":"NonZeroAndMaxString",
-          "documentation":"<p>Unique identifier for the AWS account with the VPC that you want to peer your Amazon GameLift fleet with. You can find your Account ID in the AWS Management Console under account settings.</p>"
+          "documentation":"<p>A unique identifier for the AWS account with the VPC that you want to peer your Amazon GameLift fleet with. You can find your Account ID in the AWS Management Console under account settings.</p>"
         },
         "PeerVpcId":{
           "shape":"NonZeroAndMaxString",
-          "documentation":"<p>Unique identifier for a VPC with resources to be accessed by your Amazon GameLift fleet. The VPC must be in the same region where your fleet is deployed. Look up a VPC ID using the <a href=\"https://console.aws.amazon.com/vpc/\">VPC Dashboard</a> in the AWS Management Console. Learn more about VPC peering in <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/vpc-peering.html\">VPC Peering with Amazon GameLift Fleets</a>.</p>"
+          "documentation":"<p>A unique identifier for a VPC with resources to be accessed by your Amazon GameLift fleet. The VPC must be in the same Region where your fleet is deployed. Look up a VPC ID using the <a href=\"https://console.aws.amazon.com/vpc/\">VPC Dashboard</a> in the AWS Management Console. Learn more about VPC peering in <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/vpc-peering.html\">VPC Peering with Amazon GameLift Fleets</a>.</p>"
         }
       },
       "documentation":"<p>Represents the input for a request action.</p>"
@@ -1926,7 +2036,7 @@
       "members":{
         "AliasId":{
           "shape":"AliasId",
-          "documentation":"<p>Unique identifier for a fleet alias. Specify the alias you want to delete.</p>"
+          "documentation":"<p>A unique identifier of the alias that you want to delete. You can use either the alias ID or ARN value.</p>"
         }
       },
       "documentation":"<p>Represents the input for a request action.</p>"
@@ -1937,7 +2047,7 @@
       "members":{
         "BuildId":{
           "shape":"BuildId",
-          "documentation":"<p>Unique identifier for a build to delete.</p>"
+          "documentation":"<p>A unique identifier for a build to delete. You can use either the build ID or ARN value. </p>"
         }
       },
       "documentation":"<p>Represents the input for a request action.</p>"
@@ -1948,7 +2058,7 @@
       "members":{
         "FleetId":{
           "shape":"FleetId",
-          "documentation":"<p>Unique identifier for a fleet to be deleted.</p>"
+          "documentation":"<p>A unique identifier for a fleet to be deleted. You can use either the fleet ID or ARN value.</p>"
         }
       },
       "documentation":"<p>Represents the input for a request action.</p>"
@@ -1959,10 +2069,10 @@
       "members":{
         "Name":{
           "shape":"GameSessionQueueName",
-          "documentation":"<p>Descriptive label that is associated with game session queue. Queue names must be unique within each region.</p>"
+          "documentation":"<p>A descriptive label that is associated with game session queue. Queue names must be unique within each Region. You can use either the queue ID or ARN value. </p>"
         }
       },
-      "documentation":"<p>Represents the input for a request action.</p>"
+      "documentation":"<p>Represents the input for a request action. </p>"
     },
     "DeleteGameSessionQueueOutput":{
       "type":"structure",
@@ -1974,8 +2084,8 @@
       "required":["Name"],
       "members":{
         "Name":{
-          "shape":"MatchmakingIdStringModel",
-          "documentation":"<p>Unique identifier for a matchmaking configuration</p>"
+          "shape":"MatchmakingConfigurationName",
+          "documentation":"<p>A unique identifier for a matchmaking configuration. You can use either the configuration name or ARN value.</p>"
         }
       },
       "documentation":"<p>Represents the input for a request action.</p>"
@@ -1990,8 +2100,8 @@
       "required":["Name"],
       "members":{
         "Name":{
-          "shape":"MatchmakingIdStringModel",
-          "documentation":"<p>Unique identifier for a matchmaking rule set to be deleted. (Note: The rule set name is different from the optional \"name\" field in the rule set body.) </p>"
+          "shape":"MatchmakingRuleSetName",
+          "documentation":"<p>A unique identifier for a matchmaking rule set to be deleted. (Note: The rule set name is different from the optional \"name\" field in the rule set body.) You can use either the rule set name or ARN value.</p>"
         }
       },
       "documentation":"<p>Represents the input for a request action.</p>"
@@ -2011,11 +2121,11 @@
       "members":{
         "Name":{
           "shape":"NonZeroAndMaxString",
-          "documentation":"<p>Descriptive label that is associated with a scaling policy. Policy names do not need to be unique.</p>"
+          "documentation":"<p>A descriptive label that is associated with a scaling policy. Policy names do not need to be unique.</p>"
         },
         "FleetId":{
           "shape":"FleetId",
-          "documentation":"<p>Unique identifier for a fleet to be deleted.</p>"
+          "documentation":"<p>A unique identifier for a fleet to be deleted. You can use either the fleet ID or ARN value.</p>"
         }
       },
       "documentation":"<p>Represents the input for a request action.</p>"
@@ -2026,7 +2136,7 @@
       "members":{
         "ScriptId":{
           "shape":"ScriptId",
-          "documentation":"<p>Unique identifier for a Realtime script to delete.</p>"
+          "documentation":"<p>A unique identifier for a Realtime script to delete. You can use either the script ID or ARN value.</p>"
         }
       }
     },
@@ -2039,11 +2149,11 @@
       "members":{
         "GameLiftAwsAccountId":{
           "shape":"NonZeroAndMaxString",
-          "documentation":"<p>Unique identifier for the AWS account that you use to manage your Amazon GameLift fleet. You can find your Account ID in the AWS Management Console under account settings.</p>"
+          "documentation":"<p>A unique identifier for the AWS account that you use to manage your Amazon GameLift fleet. You can find your Account ID in the AWS Management Console under account settings.</p>"
         },
         "PeerVpcId":{
           "shape":"NonZeroAndMaxString",
-          "documentation":"<p>Unique identifier for a VPC with resources to be accessed by your Amazon GameLift fleet. The VPC must be in the same region where your fleet is deployed. Look up a VPC ID using the <a href=\"https://console.aws.amazon.com/vpc/\">VPC Dashboard</a> in the AWS Management Console. Learn more about VPC peering in <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/vpc-peering.html\">VPC Peering with Amazon GameLift Fleets</a>.</p>"
+          "documentation":"<p>A unique identifier for a VPC with resources to be accessed by your Amazon GameLift fleet. The VPC must be in the same Region where your fleet is deployed. Look up a VPC ID using the <a href=\"https://console.aws.amazon.com/vpc/\">VPC Dashboard</a> in the AWS Management Console. Learn more about VPC peering in <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/vpc-peering.html\">VPC Peering with Amazon GameLift Fleets</a>.</p>"
         }
       },
       "documentation":"<p>Represents the input for a request action.</p>"
@@ -2062,11 +2172,11 @@
       "members":{
         "FleetId":{
           "shape":"FleetId",
-          "documentation":"<p>Unique identifier for a fleet. This value must match the fleet ID referenced in the VPC peering connection record.</p>"
+          "documentation":"<p>A unique identifier for a fleet. This fleet specified must match the fleet referenced in the VPC peering connection record. You can use either the fleet ID or ARN value.</p>"
         },
         "VpcPeeringConnectionId":{
           "shape":"NonZeroAndMaxString",
-          "documentation":"<p>Unique identifier for a VPC peering connection. This value is included in the <a>VpcPeeringConnection</a> object, which can be retrieved by calling <a>DescribeVpcPeeringConnections</a>.</p>"
+          "documentation":"<p>A unique identifier for a VPC peering connection. This value is included in the <a>VpcPeeringConnection</a> object, which can be retrieved by calling <a>DescribeVpcPeeringConnections</a>.</p>"
         }
       },
       "documentation":"<p>Represents the input for a request action.</p>"
@@ -2082,7 +2192,7 @@
       "members":{
         "AliasId":{
           "shape":"AliasId",
-          "documentation":"<p>Unique identifier for a fleet alias. Specify the alias you want to retrieve.</p>"
+          "documentation":"<p>The unique identifier for the fleet alias that you want to retrieve. You can use either the alias ID or ARN value. </p>"
         }
       },
       "documentation":"<p>Represents the input for a request action.</p>"
@@ -2092,7 +2202,7 @@
       "members":{
         "Alias":{
           "shape":"Alias",
-          "documentation":"<p>Object that contains the requested alias.</p>"
+          "documentation":"<p>The requested alias resource.</p>"
         }
       },
       "documentation":"<p>Represents the returned data in response to a request action.</p>"
@@ -2103,7 +2213,7 @@
       "members":{
         "BuildId":{
           "shape":"BuildId",
-          "documentation":"<p>Unique identifier for a build to retrieve properties for.</p>"
+          "documentation":"<p>A unique identifier for a build to retrieve properties for. You can use either the build ID or ARN value. </p>"
         }
       },
       "documentation":"<p>Represents the input for a request action.</p>"
@@ -2133,7 +2243,7 @@
       "members":{
         "EC2InstanceLimits":{
           "shape":"EC2InstanceLimitList",
-          "documentation":"<p>Object that contains the maximum number of instances for the specified instance type.</p>"
+          "documentation":"<p>The maximum number of instances for the specified instance type.</p>"
         }
       },
       "documentation":"<p>Represents the returned data in response to a request action.</p>"
@@ -2143,11 +2253,11 @@
       "members":{
         "FleetIds":{
           "shape":"FleetIdList",
-          "documentation":"<p>Unique identifier for a fleet(s) to retrieve attributes for. To request attributes for all fleets, leave this parameter empty.</p>"
+          "documentation":"<p>A unique identifier for a fleet(s) to retrieve attributes for. You can use either the fleet ID or ARN value.</p>"
         },
         "Limit":{
           "shape":"PositiveInteger",
-          "documentation":"<p>Maximum number of results to return. Use this parameter with <code>NextToken</code> to get results as a set of sequential pages. This parameter is ignored when the request specifies one or a list of fleet IDs.</p>"
+          "documentation":"<p>The maximum number of results to return. Use this parameter with <code>NextToken</code> to get results as a set of sequential pages. This parameter is ignored when the request specifies one or a list of fleet IDs.</p>"
         },
         "NextToken":{
           "shape":"NonZeroAndMaxString",
@@ -2161,7 +2271,7 @@
       "members":{
         "FleetAttributes":{
           "shape":"FleetAttributesList",
-          "documentation":"<p>Collection of objects containing attribute metadata for each requested fleet ID.</p>"
+          "documentation":"<p>A collection of objects containing attribute metadata for each requested fleet ID.</p>"
         },
         "NextToken":{
           "shape":"NonZeroAndMaxString",
@@ -2175,11 +2285,11 @@
       "members":{
         "FleetIds":{
           "shape":"FleetIdList",
-          "documentation":"<p>Unique identifier for a fleet(s) to retrieve capacity information for. To request capacity information for all fleets, leave this parameter empty.</p>"
+          "documentation":"<p>A unique identifier for a fleet(s) to retrieve capacity information for. You can use either the fleet ID or ARN value.</p>"
         },
         "Limit":{
           "shape":"PositiveInteger",
-          "documentation":"<p>Maximum number of results to return. Use this parameter with <code>NextToken</code> to get results as a set of sequential pages. This parameter is ignored when the request specifies one or a list of fleet IDs.</p>"
+          "documentation":"<p>The maximum number of results to return. Use this parameter with <code>NextToken</code> to get results as a set of sequential pages. This parameter is ignored when the request specifies one or a list of fleet IDs.</p>"
         },
         "NextToken":{
           "shape":"NonZeroAndMaxString",
@@ -2193,7 +2303,7 @@
       "members":{
         "FleetCapacity":{
           "shape":"FleetCapacityList",
-          "documentation":"<p>Collection of objects containing capacity information for each requested fleet ID. Leave this parameter empty to retrieve capacity information for all fleets.</p>"
+          "documentation":"<p>A collection of objects containing capacity information for each requested fleet ID. Leave this parameter empty to retrieve capacity information for all fleets.</p>"
         },
         "NextToken":{
           "shape":"NonZeroAndMaxString",
@@ -2208,7 +2318,7 @@
       "members":{
         "FleetId":{
           "shape":"FleetId",
-          "documentation":"<p>Unique identifier for a fleet to get event logs for.</p>"
+          "documentation":"<p>A unique identifier for a fleet to get event logs for. You can use either the fleet ID or ARN value.</p>"
         },
         "StartTime":{
           "shape":"Timestamp",
@@ -2220,7 +2330,7 @@
         },
         "Limit":{
           "shape":"PositiveInteger",
-          "documentation":"<p>Maximum number of results to return. Use this parameter with <code>NextToken</code> to get results as a set of sequential pages.</p>"
+          "documentation":"<p>The maximum number of results to return. Use this parameter with <code>NextToken</code> to get results as a set of sequential pages.</p>"
         },
         "NextToken":{
           "shape":"NonZeroAndMaxString",
@@ -2234,7 +2344,7 @@
       "members":{
         "Events":{
           "shape":"EventList",
-          "documentation":"<p>Collection of objects containing event log entries for the specified fleet.</p>"
+          "documentation":"<p>A collection of objects containing event log entries for the specified fleet.</p>"
         },
         "NextToken":{
           "shape":"NonZeroAndMaxString",
@@ -2249,7 +2359,7 @@
       "members":{
         "FleetId":{
           "shape":"FleetId",
-          "documentation":"<p>Unique identifier for a fleet to retrieve port settings for.</p>"
+          "documentation":"<p>A unique identifier for a fleet to retrieve port settings for. You can use either the fleet ID or ARN value.</p>"
         }
       },
       "documentation":"<p>Represents the input for a request action.</p>"
@@ -2259,7 +2369,7 @@
       "members":{
         "InboundPermissions":{
           "shape":"IpPermissionsList",
-          "documentation":"<p>Object that contains port settings for the requested fleet ID.</p>"
+          "documentation":"<p>The port settings for the requested fleet ID.</p>"
         }
       },
       "documentation":"<p>Represents the returned data in response to a request action.</p>"
@@ -2269,11 +2379,11 @@
       "members":{
         "FleetIds":{
           "shape":"FleetIdList",
-          "documentation":"<p>Unique identifier for a fleet(s) to retrieve utilization data for. To request utilization data for all fleets, leave this parameter empty.</p>"
+          "documentation":"<p>A unique identifier for a fleet(s) to retrieve utilization data for. You can use either the fleet ID or ARN value.</p>"
         },
         "Limit":{
           "shape":"PositiveInteger",
-          "documentation":"<p>Maximum number of results to return. Use this parameter with <code>NextToken</code> to get results as a set of sequential pages. This parameter is ignored when the request specifies one or a list of fleet IDs.</p>"
+          "documentation":"<p>The maximum number of results to return. Use this parameter with <code>NextToken</code> to get results as a set of sequential pages. This parameter is ignored when the request specifies one or a list of fleet IDs.</p>"
         },
         "NextToken":{
           "shape":"NonZeroAndMaxString",
@@ -2287,7 +2397,7 @@
       "members":{
         "FleetUtilization":{
           "shape":"FleetUtilizationList",
-          "documentation":"<p>Collection of objects containing utilization information for each requested fleet ID.</p>"
+          "documentation":"<p>A collection of objects containing utilization information for each requested fleet ID.</p>"
         },
         "NextToken":{
           "shape":"NonZeroAndMaxString",
@@ -2301,15 +2411,15 @@
       "members":{
         "FleetId":{
           "shape":"FleetId",
-          "documentation":"<p>Unique identifier for a fleet to retrieve all game sessions active on the fleet.</p>"
+          "documentation":"<p>A unique identifier for a fleet to retrieve all game sessions active on the fleet. You can use either the fleet ID or ARN value.</p>"
         },
         "GameSessionId":{
           "shape":"ArnStringModel",
-          "documentation":"<p>Unique identifier for the game session to retrieve.</p>"
+          "documentation":"<p>A unique identifier for the game session to retrieve. </p>"
         },
         "AliasId":{
           "shape":"AliasId",
-          "documentation":"<p>Unique identifier for an alias associated with the fleet to retrieve all game sessions for.</p>"
+          "documentation":"<p>A unique identifier for an alias associated with the fleet to retrieve all game sessions for. You can use either the alias ID or ARN value.</p>"
         },
         "StatusFilter":{
           "shape":"NonZeroAndMaxString",
@@ -2317,7 +2427,7 @@
         },
         "Limit":{
           "shape":"PositiveInteger",
-          "documentation":"<p>Maximum number of results to return. Use this parameter with <code>NextToken</code> to get results as a set of sequential pages.</p>"
+          "documentation":"<p>The maximum number of results to return. Use this parameter with <code>NextToken</code> to get results as a set of sequential pages.</p>"
         },
         "NextToken":{
           "shape":"NonZeroAndMaxString",
@@ -2331,7 +2441,7 @@
       "members":{
         "GameSessionDetails":{
           "shape":"GameSessionDetailList",
-          "documentation":"<p>Collection of objects containing game session properties and the protection policy currently in force for each session matching the request.</p>"
+          "documentation":"<p>A collection of objects containing game session properties and the protection policy currently in force for each session matching the request.</p>"
         },
         "NextToken":{
           "shape":"NonZeroAndMaxString",
@@ -2346,7 +2456,7 @@
       "members":{
         "PlacementId":{
           "shape":"IdStringModel",
-          "documentation":"<p>Unique identifier for a game session placement to retrieve.</p>"
+          "documentation":"<p>A unique identifier for a game session placement to retrieve.</p>"
         }
       },
       "documentation":"<p>Represents the input for a request action.</p>"
@@ -2366,15 +2476,15 @@
       "members":{
         "Names":{
           "shape":"GameSessionQueueNameList",
-          "documentation":"<p>List of queue names to retrieve information for. To request settings for all queues, leave this parameter empty.</p>"
+          "documentation":"<p>A list of queue names to retrieve information for. You can use either the queue ID or ARN value. To request settings for all queues, leave this parameter empty. </p>"
         },
         "Limit":{
           "shape":"PositiveInteger",
-          "documentation":"<p>Maximum number of results to return. Use this parameter with <code>NextToken</code> to get results as a set of sequential pages.</p>"
+          "documentation":"<p>The maximum number of results to return. Use this parameter with <code>NextToken</code> to get results as a set of sequential pages.</p>"
         },
         "NextToken":{
           "shape":"NonZeroAndMaxString",
-          "documentation":"<p>Token that indicates the start of the next sequential page of results. Use the token that is returned with a previous call to this action. To start at the beginning of the result set, do not specify a value.</p>"
+          "documentation":"<p>A token that indicates the start of the next sequential page of results. Use the token that is returned with a previous call to this action. To start at the beginning of the result set, do not specify a value.</p>"
         }
       },
       "documentation":"<p>Represents the input for a request action.</p>"
@@ -2384,11 +2494,11 @@
       "members":{
         "GameSessionQueues":{
           "shape":"GameSessionQueueList",
-          "documentation":"<p>Collection of objects that describes the requested game session queues.</p>"
+          "documentation":"<p>A collection of objects that describe the requested game session queues.</p>"
         },
         "NextToken":{
           "shape":"NonZeroAndMaxString",
-          "documentation":"<p>Token that indicates where to resume retrieving results on the next call to this action. If no token is returned, these results represent the end of the list.</p>"
+          "documentation":"<p>A token that indicates where to resume retrieving results on the next call to this action. If no token is returned, these results represent the end of the list.</p>"
         }
       },
       "documentation":"<p>Represents the returned data in response to a request action.</p>"
@@ -2398,15 +2508,15 @@
       "members":{
         "FleetId":{
           "shape":"FleetId",
-          "documentation":"<p>Unique identifier for a fleet to retrieve all game sessions for.</p>"
+          "documentation":"<p>A unique identifier for a fleet to retrieve all game sessions for. You can use either the fleet ID or ARN value. </p>"
         },
         "GameSessionId":{
           "shape":"ArnStringModel",
-          "documentation":"<p>Unique identifier for the game session to retrieve. You can use either a <code>GameSessionId</code> or <code>GameSessionArn</code> value. </p>"
+          "documentation":"<p>A unique identifier for the game session to retrieve. </p>"
         },
         "AliasId":{
           "shape":"AliasId",
-          "documentation":"<p>Unique identifier for an alias associated with the fleet to retrieve all game sessions for. </p>"
+          "documentation":"<p>A unique identifier for an alias associated with the fleet to retrieve all game sessions for. You can use either the alias ID or ARN value.</p>"
         },
         "StatusFilter":{
           "shape":"NonZeroAndMaxString",
@@ -2414,7 +2524,7 @@
         },
         "Limit":{
           "shape":"PositiveInteger",
-          "documentation":"<p>Maximum number of results to return. Use this parameter with <code>NextToken</code> to get results as a set of sequential pages.</p>"
+          "documentation":"<p>The maximum number of results to return. Use this parameter with <code>NextToken</code> to get results as a set of sequential pages.</p>"
         },
         "NextToken":{
           "shape":"NonZeroAndMaxString",
@@ -2428,7 +2538,7 @@
       "members":{
         "GameSessions":{
           "shape":"GameSessionList",
-          "documentation":"<p>Collection of objects containing game session properties for each session matching the request.</p>"
+          "documentation":"<p>A collection of objects containing game session properties for each session matching the request.</p>"
         },
         "NextToken":{
           "shape":"NonZeroAndMaxString",
@@ -2443,15 +2553,15 @@
       "members":{
         "FleetId":{
           "shape":"FleetId",
-          "documentation":"<p>Unique identifier for a fleet to retrieve instance information for.</p>"
+          "documentation":"<p>A unique identifier for a fleet to retrieve instance information for. You can use either the fleet ID or ARN value.</p>"
         },
         "InstanceId":{
           "shape":"InstanceId",
-          "documentation":"<p>Unique identifier for an instance to retrieve. Specify an instance ID or leave blank to retrieve all instances in the fleet.</p>"
+          "documentation":"<p>A unique identifier for an instance to retrieve. Specify an instance ID or leave blank to retrieve all instances in the fleet.</p>"
         },
         "Limit":{
           "shape":"PositiveInteger",
-          "documentation":"<p>Maximum number of results to return. Use this parameter with <code>NextToken</code> to get results as a set of sequential pages.</p>"
+          "documentation":"<p>The maximum number of results to return. Use this parameter with <code>NextToken</code> to get results as a set of sequential pages.</p>"
         },
         "NextToken":{
           "shape":"NonZeroAndMaxString",
@@ -2465,7 +2575,7 @@
       "members":{
         "Instances":{
           "shape":"InstanceList",
-          "documentation":"<p>Collection of objects containing properties for each instance returned.</p>"
+          "documentation":"<p>A collection of objects containing properties for each instance returned.</p>"
         },
         "NextToken":{
           "shape":"NonZeroAndMaxString",
@@ -2478,20 +2588,20 @@
       "type":"structure",
       "members":{
         "Names":{
-          "shape":"MatchmakingIdList",
-          "documentation":"<p>Unique identifier for a matchmaking configuration(s) to retrieve. To request all existing configurations, leave this parameter empty.</p>"
+          "shape":"MatchmakingConfigurationNameList",
+          "documentation":"<p>A unique identifier for a matchmaking configuration(s) to retrieve. You can use either the configuration name or ARN value. To request all existing configurations, leave this parameter empty.</p>"
         },
         "RuleSetName":{
-          "shape":"MatchmakingIdStringModel",
-          "documentation":"<p>Unique identifier for a matchmaking rule set. Use this parameter to retrieve all matchmaking configurations that use this rule set.</p>"
+          "shape":"MatchmakingRuleSetName",
+          "documentation":"<p>A unique identifier for a matchmaking rule set. You can use either the rule set name or ARN value. Use this parameter to retrieve all matchmaking configurations that use this rule set.</p>"
         },
         "Limit":{
           "shape":"PositiveInteger",
-          "documentation":"<p>Maximum number of results to return. Use this parameter with <code>NextToken</code> to get results as a set of sequential pages. This parameter is limited to 10.</p>"
+          "documentation":"<p>The maximum number of results to return. Use this parameter with <code>NextToken</code> to get results as a set of sequential pages. This parameter is limited to 10.</p>"
         },
         "NextToken":{
           "shape":"NonZeroAndMaxString",
-          "documentation":"<p>Token that indicates the start of the next sequential page of results. Use the token that is returned with a previous call to this action. To start at the beginning of the result set, do not specify a value.</p>"
+          "documentation":"<p>A token that indicates the start of the next sequential page of results. Use the token that is returned with a previous call to this action. To start at the beginning of the result set, do not specify a value.</p>"
         }
       },
       "documentation":"<p>Represents the input for a request action.</p>"
@@ -2501,11 +2611,11 @@
       "members":{
         "Configurations":{
           "shape":"MatchmakingConfigurationList",
-          "documentation":"<p>Collection of requested matchmaking configuration objects.</p>"
+          "documentation":"<p>A collection of requested matchmaking configurations.</p>"
         },
         "NextToken":{
           "shape":"NonZeroAndMaxString",
-          "documentation":"<p>Token that indicates where to resume retrieving results on the next call to this action. If no token is returned, these results represent the end of the list.</p>"
+          "documentation":"<p>A token that indicates where to resume retrieving results on the next call to this action. If no token is returned, these results represent the end of the list.</p>"
         }
       },
       "documentation":"<p>Represents the returned data in response to a request action.</p>"
@@ -2516,7 +2626,7 @@
       "members":{
         "TicketIds":{
           "shape":"MatchmakingIdList",
-          "documentation":"<p>Unique identifier for a matchmaking ticket. You can include up to 10 ID values. </p>"
+          "documentation":"<p>A unique identifier for a matchmaking ticket. You can include up to 10 ID values. </p>"
         }
       },
       "documentation":"<p>Represents the input for a request action.</p>"
@@ -2526,7 +2636,7 @@
       "members":{
         "TicketList":{
           "shape":"MatchmakingTicketList",
-          "documentation":"<p>Collection of existing matchmaking ticket objects matching the request.</p>"
+          "documentation":"<p>A collection of existing matchmaking ticket objects matching the request.</p>"
         }
       },
       "documentation":"<p>Represents the returned data in response to a request action.</p>"
@@ -2536,15 +2646,15 @@
       "members":{
         "Names":{
           "shape":"MatchmakingRuleSetNameList",
-          "documentation":"<p>List of one or more matchmaking rule set names to retrieve details for. (Note: The rule set name is different from the optional \"name\" field in the rule set body.) </p>"
+          "documentation":"<p>A list of one or more matchmaking rule set names to retrieve details for. (Note: The rule set name is different from the optional \"name\" field in the rule set body.) You can use either the rule set name or ARN value. </p>"
         },
         "Limit":{
           "shape":"RuleSetLimit",
-          "documentation":"<p>Maximum number of results to return. Use this parameter with <code>NextToken</code> to get results as a set of sequential pages.</p>"
+          "documentation":"<p>The maximum number of results to return. Use this parameter with <code>NextToken</code> to get results as a set of sequential pages.</p>"
         },
         "NextToken":{
           "shape":"NonZeroAndMaxString",
-          "documentation":"<p>Token that indicates the start of the next sequential page of results. Use the token that is returned with a previous call to this action. To start at the beginning of the result set, do not specify a value.</p>"
+          "documentation":"<p>A token that indicates the start of the next sequential page of results. Use the token that is returned with a previous call to this action. To start at the beginning of the result set, do not specify a value.</p>"
         }
       },
       "documentation":"<p>Represents the input for a request action.</p>"
@@ -2555,11 +2665,11 @@
       "members":{
         "RuleSets":{
           "shape":"MatchmakingRuleSetList",
-          "documentation":"<p>Collection of requested matchmaking rule set objects. </p>"
+          "documentation":"<p>A collection of requested matchmaking rule set objects. </p>"
         },
         "NextToken":{
           "shape":"NonZeroAndMaxString",
-          "documentation":"<p>Token that indicates where to resume retrieving results on the next call to this action. If no token is returned, these results represent the end of the list.</p>"
+          "documentation":"<p>A token that indicates where to resume retrieving results on the next call to this action. If no token is returned, these results represent the end of the list.</p>"
         }
       },
       "documentation":"<p>Represents the returned data in response to a request action.</p>"
@@ -2569,15 +2679,15 @@
       "members":{
         "GameSessionId":{
           "shape":"ArnStringModel",
-          "documentation":"<p>Unique identifier for the game session to retrieve player sessions for.</p>"
+          "documentation":"<p>A unique identifier for the game session to retrieve player sessions for.</p>"
         },
         "PlayerId":{
           "shape":"NonZeroAndMaxString",
-          "documentation":"<p>Unique identifier for a player to retrieve player sessions for.</p>"
+          "documentation":"<p>A unique identifier for a player to retrieve player sessions for.</p>"
         },
         "PlayerSessionId":{
           "shape":"PlayerSessionId",
-          "documentation":"<p>Unique identifier for a player session to retrieve.</p>"
+          "documentation":"<p>A unique identifier for a player session to retrieve.</p>"
         },
         "PlayerSessionStatusFilter":{
           "shape":"NonZeroAndMaxString",
@@ -2585,7 +2695,7 @@
         },
         "Limit":{
           "shape":"PositiveInteger",
-          "documentation":"<p>Maximum number of results to return. Use this parameter with <code>NextToken</code> to get results as a set of sequential pages. If a player session ID is specified, this parameter is ignored.</p>"
+          "documentation":"<p>The maximum number of results to return. Use this parameter with <code>NextToken</code> to get results as a set of sequential pages. If a player session ID is specified, this parameter is ignored.</p>"
         },
         "NextToken":{
           "shape":"NonZeroAndMaxString",
@@ -2599,7 +2709,7 @@
       "members":{
         "PlayerSessions":{
           "shape":"PlayerSessionList",
-          "documentation":"<p>Collection of objects containing properties for each player session that matches the request.</p>"
+          "documentation":"<p>A collection of objects containing properties for each player session that matches the request.</p>"
         },
         "NextToken":{
           "shape":"NonZeroAndMaxString",
@@ -2614,7 +2724,7 @@
       "members":{
         "FleetId":{
           "shape":"FleetId",
-          "documentation":"<p>Unique identifier for a fleet to get the run-time configuration for.</p>"
+          "documentation":"<p>A unique identifier for a fleet to get the runtime configuration for. You can use either the fleet ID or ARN value.</p>"
         }
       },
       "documentation":"<p>Represents the input for a request action.</p>"
@@ -2635,7 +2745,7 @@
       "members":{
         "FleetId":{
           "shape":"FleetId",
-          "documentation":"<p>Unique identifier for a fleet to retrieve scaling policies for.</p>"
+          "documentation":"<p>A unique identifier for a fleet to retrieve scaling policies for. You can use either the fleet ID or ARN value.</p>"
         },
         "StatusFilter":{
           "shape":"ScalingStatusType",
@@ -2643,7 +2753,7 @@
         },
         "Limit":{
           "shape":"PositiveInteger",
-          "documentation":"<p>Maximum number of results to return. Use this parameter with <code>NextToken</code> to get results as a set of sequential pages.</p>"
+          "documentation":"<p>The maximum number of results to return. Use this parameter with <code>NextToken</code> to get results as a set of sequential pages.</p>"
         },
         "NextToken":{
           "shape":"NonZeroAndMaxString",
@@ -2657,7 +2767,7 @@
       "members":{
         "ScalingPolicies":{
           "shape":"ScalingPolicyList",
-          "documentation":"<p>Collection of objects containing the scaling policies matching the request.</p>"
+          "documentation":"<p>A collection of objects containing the scaling policies matching the request.</p>"
         },
         "NextToken":{
           "shape":"NonZeroAndMaxString",
@@ -2672,7 +2782,7 @@
       "members":{
         "ScriptId":{
           "shape":"ScriptId",
-          "documentation":"<p>Unique identifier for a Realtime script to retrieve properties for.</p>"
+          "documentation":"<p>A unique identifier for a Realtime script to retrieve properties for. You can use either the script ID or ARN value.</p>"
         }
       }
     },
@@ -2681,7 +2791,7 @@
       "members":{
         "Script":{
           "shape":"Script",
-          "documentation":"<p>Set of properties describing the requested script.</p>"
+          "documentation":"<p>A set of properties describing the requested script.</p>"
         }
       }
     },
@@ -2695,7 +2805,7 @@
       "members":{
         "VpcPeeringAuthorizations":{
           "shape":"VpcPeeringAuthorizationList",
-          "documentation":"<p>Collection of objects that describe all valid VPC peering operations for the current AWS account.</p>"
+          "documentation":"<p>A collection of objects that describe all valid VPC peering operations for the current AWS account.</p>"
         }
       }
     },
@@ -2704,7 +2814,7 @@
       "members":{
         "FleetId":{
           "shape":"FleetId",
-          "documentation":"<p>Unique identifier for a fleet.</p>"
+          "documentation":"<p>A unique identifier for a fleet. You can use either the fleet ID or ARN value.</p>"
         }
       },
       "documentation":"<p>Represents the input for a request action.</p>"
@@ -2714,7 +2824,7 @@
       "members":{
         "VpcPeeringConnections":{
           "shape":"VpcPeeringConnectionList",
-          "documentation":"<p>Collection of VPC peering connection records that match the request.</p>"
+          "documentation":"<p>A collection of VPC peering connection records that match the request.</p>"
         }
       },
       "documentation":"<p>Represents the returned data in response to a request action.</p>"
@@ -2724,7 +2834,7 @@
       "members":{
         "PlayerId":{
           "shape":"NonZeroAndMaxString",
-          "documentation":"<p>Unique identifier for a player to associate with the player session.</p>"
+          "documentation":"<p>A unique identifier for a player to associate with the player session.</p>"
         },
         "PlayerData":{
           "shape":"PlayerData",
@@ -2749,11 +2859,11 @@
         },
         "MINIMUM":{
           "shape":"WholeNumber",
-          "documentation":"<p>Minimum value allowed for the fleet's instance count.</p>"
+          "documentation":"<p>The minimum value allowed for the fleet's instance count.</p>"
         },
         "MAXIMUM":{
           "shape":"WholeNumber",
-          "documentation":"<p>Maximum value allowed for the fleet's instance count.</p>"
+          "documentation":"<p>The maximum value allowed for the fleet's instance count.</p>"
         },
         "PENDING":{
           "shape":"WholeNumber",
@@ -2772,7 +2882,7 @@
           "documentation":"<p>Number of instances in the fleet that are no longer active but haven't yet been terminated.</p>"
         }
       },
-      "documentation":"<p>Current status of fleet capacity. The number of active instances should match or be in the process of matching the number of desired instances. Pending and terminating counts are non-zero only if fleet capacity is adjusting to an <a>UpdateFleetCapacity</a> request, or if access to resources is temporarily affected.</p> <ul> <li> <p> <a>CreateFleet</a> </p> </li> <li> <p> <a>ListFleets</a> </p> </li> <li> <p> <a>DeleteFleet</a> </p> </li> <li> <p>Describe fleets:</p> <ul> <li> <p> <a>DescribeFleetAttributes</a> </p> </li> <li> <p> <a>DescribeFleetCapacity</a> </p> </li> <li> <p> <a>DescribeFleetPortSettings</a> </p> </li> <li> <p> <a>DescribeFleetUtilization</a> </p> </li> <li> <p> <a>DescribeRuntimeConfiguration</a> </p> </li> <li> <p> <a>DescribeEC2InstanceLimits</a> </p> </li> <li> <p> <a>DescribeFleetEvents</a> </p> </li> </ul> </li> <li> <p>Update fleets:</p> <ul> <li> <p> <a>UpdateFleetAttributes</a> </p> </li> <li> <p> <a>UpdateFleetCapacity</a> </p> </li> <li> <p> <a>UpdateFleetPortSettings</a> </p> </li> <li> <p> <a>UpdateRuntimeConfiguration</a> </p> </li> </ul> </li> <li> <p>Manage fleet actions:</p> <ul> <li> <p> <a>StartFleetActions</a> </p> </li> <li> <p> <a>StopFleetActions</a> </p> </li> </ul> </li> </ul>"
+      "documentation":"<p>Current status of fleet capacity. The number of active instances should match or be in the process of matching the number of desired instances. Pending and terminating counts are non-zero only if fleet capacity is adjusting to an <a>UpdateFleetCapacity</a> request, or if access to resources is temporarily affected.</p> <ul> <li> <p> <a>CreateFleet</a> </p> </li> <li> <p> <a>ListFleets</a> </p> </li> <li> <p> <a>DeleteFleet</a> </p> </li> <li> <p> <a>DescribeFleetAttributes</a> </p> </li> <li> <p> <a>UpdateFleetAttributes</a> </p> </li> <li> <p>Manage fleet actions:</p> <ul> <li> <p> <a>StartFleetActions</a> </p> </li> <li> <p> <a>StopFleetActions</a> </p> </li> </ul> </li> </ul>"
     },
     "EC2InstanceLimit":{
       "type":"structure",
@@ -2790,7 +2900,7 @@
           "documentation":"<p>Number of instances allowed.</p>"
         }
       },
-      "documentation":"<p>Maximum number of instances allowed based on the Amazon Elastic Compute Cloud (Amazon EC2) instance type. Instance limits can be retrieved by calling <a>DescribeEC2InstanceLimits</a>.</p>"
+      "documentation":"<p>The maximum number of instances allowed based on the Amazon Elastic Compute Cloud (Amazon EC2) instance type. Instance limits can be retrieved by calling <a>DescribeEC2InstanceLimits</a>.</p>"
     },
     "EC2InstanceLimitList":{
       "type":"list",
@@ -2864,15 +2974,15 @@
       "members":{
         "EventId":{
           "shape":"NonZeroAndMaxString",
-          "documentation":"<p>Unique identifier for a fleet event.</p>"
+          "documentation":"<p>A unique identifier for a fleet event.</p>"
         },
         "ResourceId":{
           "shape":"NonZeroAndMaxString",
-          "documentation":"<p>Unique identifier for an event resource, such as a fleet ID.</p>"
+          "documentation":"<p>A unique identifier for an event resource, such as a fleet ID.</p>"
         },
         "EventCode":{
           "shape":"EventCode",
-          "documentation":"<p>Type of event being logged. The following events are currently in use:</p> <p> <b>Fleet creation events:</b> </p> <ul> <li> <p>FLEET_CREATED -- A fleet record was successfully created with a status of <code>NEW</code>. Event messaging includes the fleet ID.</p> </li> <li> <p>FLEET_STATE_DOWNLOADING -- Fleet status changed from <code>NEW</code> to <code>DOWNLOADING</code>. The compressed build has started downloading to a fleet instance for installation.</p> </li> <li> <p> FLEET_BINARY_DOWNLOAD_FAILED -- The build failed to download to the fleet instance.</p> </li> <li> <p>FLEET_CREATION_EXTRACTING_BUILD – The game server build was successfully downloaded to an instance, and the build files are now being extracted from the uploaded build and saved to an instance. Failure at this stage prevents a fleet from moving to <code>ACTIVE</code> status. Logs for this stage display a list of the files that are extracted and saved on the instance. Access the logs by using the URL in <i>PreSignedLogUrl</i>.</p> </li> <li> <p>FLEET_CREATION_RUNNING_INSTALLER – The game server build files were successfully extracted, and the Amazon GameLift is now running the build's install script (if one is included). Failure in this stage prevents a fleet from moving to <code>ACTIVE</code> status. Logs for this stage list the installation steps and whether or not the install completed successfully. Access the logs by using the URL in <i>PreSignedLogUrl</i>. </p> </li> <li> <p>FLEET_CREATION_VALIDATING_RUNTIME_CONFIG -- The build process was successful, and the Amazon GameLift is now verifying that the game server launch paths, which are specified in the fleet's run-time configuration, exist. If any listed launch path exists, Amazon GameLift tries to launch a game server process and waits for the process to report ready. Failures in this stage prevent a fleet from moving to <code>ACTIVE</code> status. Logs for this stage list the launch paths in the run-time configuration and indicate whether each is found. Access the logs by using the URL in <i>PreSignedLogUrl</i>. </p> </li> <li> <p>FLEET_STATE_VALIDATING -- Fleet status changed from <code>DOWNLOADING</code> to <code>VALIDATING</code>.</p> </li> <li> <p> FLEET_VALIDATION_LAUNCH_PATH_NOT_FOUND -- Validation of the run-time configuration failed because the executable specified in a launch path does not exist on the instance.</p> </li> <li> <p>FLEET_STATE_BUILDING -- Fleet status changed from <code>VALIDATING</code> to <code>BUILDING</code>.</p> </li> <li> <p>FLEET_VALIDATION_EXECUTABLE_RUNTIME_FAILURE -- Validation of the run-time configuration failed because the executable specified in a launch path failed to run on the fleet instance.</p> </li> <li> <p>FLEET_STATE_ACTIVATING -- Fleet status changed from <code>BUILDING</code> to <code>ACTIVATING</code>. </p> </li> <li> <p> FLEET_ACTIVATION_FAILED - The fleet failed to successfully complete one of the steps in the fleet activation process. This event code indicates that the game build was successfully downloaded to a fleet instance, built, and validated, but was not able to start a server process. A possible reason for failure is that the game server is not reporting \"process ready\" to the Amazon GameLift service.</p> </li> <li> <p>FLEET_STATE_ACTIVE -- The fleet's status changed from <code>ACTIVATING</code> to <code>ACTIVE</code>. The fleet is now ready to host game sessions.</p> </li> </ul> <p> <b>VPC peering events:</b> </p> <ul> <li> <p>FLEET_VPC_PEERING_SUCCEEDED -- A VPC peering connection has been established between the VPC for an Amazon GameLift fleet and a VPC in your AWS account.</p> </li> <li> <p>FLEET_VPC_PEERING_FAILED -- A requested VPC peering connection has failed. Event details and status information (see <a>DescribeVpcPeeringConnections</a>) provide additional detail. A common reason for peering failure is that the two VPCs have overlapping CIDR blocks of IPv4 addresses. To resolve this, change the CIDR block for the VPC in your AWS account. For more information on VPC peering failures, see <a href=\"https://docs.aws.amazon.com/AmazonVPC/latest/PeeringGuide/invalid-peering-configurations.html\">https://docs.aws.amazon.com/AmazonVPC/latest/PeeringGuide/invalid-peering-configurations.html</a> </p> </li> <li> <p>FLEET_VPC_PEERING_DELETED -- A VPC peering connection has been successfully deleted.</p> </li> </ul> <p> <b>Spot instance events:</b> </p> <ul> <li> <p> INSTANCE_INTERRUPTED -- A spot instance was interrupted by EC2 with a two-minute notification.</p> </li> </ul> <p> <b>Other fleet events:</b> </p> <ul> <li> <p>FLEET_SCALING_EVENT -- A change was made to the fleet's capacity settings (desired instances, minimum/maximum scaling limits). Event messaging includes the new capacity settings.</p> </li> <li> <p>FLEET_NEW_GAME_SESSION_PROTECTION_POLICY_UPDATED -- A change was made to the fleet's game session protection policy setting. Event messaging includes both the old and new policy setting. </p> </li> <li> <p>FLEET_DELETED -- A request to delete a fleet was initiated.</p> </li> <li> <p> GENERIC_EVENT -- An unspecified event has occurred.</p> </li> </ul>"
+          "documentation":"<p>The type of event being logged. </p> <p> <b>Fleet creation events (ordered by fleet creation activity):</b> </p> <ul> <li> <p>FLEET_CREATED -- A fleet record was successfully created with a status of <code>NEW</code>. Event messaging includes the fleet ID.</p> </li> <li> <p>FLEET_STATE_DOWNLOADING -- Fleet status changed from <code>NEW</code> to <code>DOWNLOADING</code>. The compressed build has started downloading to a fleet instance for installation.</p> </li> <li> <p> FLEET_BINARY_DOWNLOAD_FAILED -- The build failed to download to the fleet instance.</p> </li> <li> <p>FLEET_CREATION_EXTRACTING_BUILD – The game server build was successfully downloaded to an instance, and the build files are now being extracted from the uploaded build and saved to an instance. Failure at this stage prevents a fleet from moving to <code>ACTIVE</code> status. Logs for this stage display a list of the files that are extracted and saved on the instance. Access the logs by using the URL in <i>PreSignedLogUrl</i>.</p> </li> <li> <p>FLEET_CREATION_RUNNING_INSTALLER – The game server build files were successfully extracted, and the Amazon GameLift is now running the build's install script (if one is included). Failure in this stage prevents a fleet from moving to <code>ACTIVE</code> status. Logs for this stage list the installation steps and whether or not the install completed successfully. Access the logs by using the URL in <i>PreSignedLogUrl</i>. </p> </li> <li> <p>FLEET_CREATION_VALIDATING_RUNTIME_CONFIG -- The build process was successful, and the Amazon GameLift is now verifying that the game server launch paths, which are specified in the fleet's runtime configuration, exist. If any listed launch path exists, Amazon GameLift tries to launch a game server process and waits for the process to report ready. Failures in this stage prevent a fleet from moving to <code>ACTIVE</code> status. Logs for this stage list the launch paths in the runtime configuration and indicate whether each is found. Access the logs by using the URL in <i>PreSignedLogUrl</i>. </p> </li> <li> <p>FLEET_STATE_VALIDATING -- Fleet status changed from <code>DOWNLOADING</code> to <code>VALIDATING</code>.</p> </li> <li> <p> FLEET_VALIDATION_LAUNCH_PATH_NOT_FOUND -- Validation of the runtime configuration failed because the executable specified in a launch path does not exist on the instance.</p> </li> <li> <p>FLEET_STATE_BUILDING -- Fleet status changed from <code>VALIDATING</code> to <code>BUILDING</code>.</p> </li> <li> <p>FLEET_VALIDATION_EXECUTABLE_RUNTIME_FAILURE -- Validation of the runtime configuration failed because the executable specified in a launch path failed to run on the fleet instance.</p> </li> <li> <p>FLEET_STATE_ACTIVATING -- Fleet status changed from <code>BUILDING</code> to <code>ACTIVATING</code>. </p> </li> <li> <p> FLEET_ACTIVATION_FAILED - The fleet failed to successfully complete one of the steps in the fleet activation process. This event code indicates that the game build was successfully downloaded to a fleet instance, built, and validated, but was not able to start a server process. Learn more at <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/fleets-creating-debug.html#fleets-creating-debug-creation\"> Debug Fleet Creation Issues</a> </p> </li> <li> <p>FLEET_STATE_ACTIVE -- The fleet's status changed from <code>ACTIVATING</code> to <code>ACTIVE</code>. The fleet is now ready to host game sessions.</p> </li> </ul> <p> <b>VPC peering events:</b> </p> <ul> <li> <p>FLEET_VPC_PEERING_SUCCEEDED -- A VPC peering connection has been established between the VPC for an Amazon GameLift fleet and a VPC in your AWS account.</p> </li> <li> <p>FLEET_VPC_PEERING_FAILED -- A requested VPC peering connection has failed. Event details and status information (see <a>DescribeVpcPeeringConnections</a>) provide additional detail. A common reason for peering failure is that the two VPCs have overlapping CIDR blocks of IPv4 addresses. To resolve this, change the CIDR block for the VPC in your AWS account. For more information on VPC peering failures, see <a href=\"https://docs.aws.amazon.com/AmazonVPC/latest/PeeringGuide/invalid-peering-configurations.html\">https://docs.aws.amazon.com/AmazonVPC/latest/PeeringGuide/invalid-peering-configurations.html</a> </p> </li> <li> <p>FLEET_VPC_PEERING_DELETED -- A VPC peering connection has been successfully deleted.</p> </li> </ul> <p> <b>Spot instance events:</b> </p> <ul> <li> <p> INSTANCE_INTERRUPTED -- A spot instance was interrupted by EC2 with a two-minute notification.</p> </li> </ul> <p> <b>Other fleet events:</b> </p> <ul> <li> <p>FLEET_SCALING_EVENT -- A change was made to the fleet's capacity settings (desired instances, minimum/maximum scaling limits). Event messaging includes the new capacity settings.</p> </li> <li> <p>FLEET_NEW_GAME_SESSION_PROTECTION_POLICY_UPDATED -- A change was made to the fleet's game session protection policy setting. Event messaging includes both the old and new policy setting. </p> </li> <li> <p>FLEET_DELETED -- A request to delete a fleet was initiated.</p> </li> <li> <p> GENERIC_EVENT -- An unspecified event has occurred.</p> </li> </ul>"
         },
         "Message":{
           "shape":"NonEmptyString",
@@ -2946,11 +3056,11 @@
       "members":{
         "FleetId":{
           "shape":"FleetId",
-          "documentation":"<p>Unique identifier for a fleet.</p>"
+          "documentation":"<p>A unique identifier for a fleet.</p>"
         },
         "FleetArn":{
           "shape":"ArnStringModel",
-          "documentation":"<p>Identifier for a fleet that is unique across all regions.</p>"
+          "documentation":"<p>The Amazon Resource Name (<a href=\"https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html\">ARN</a>) that is assigned to a GameLift fleet resource and uniquely identifies it. ARNs are unique across all Regions. In a GameLift fleet ARN, the resource ID matches the <i>FleetId</i> value.</p>"
         },
         "FleetType":{
           "shape":"FleetType",
@@ -2966,7 +3076,7 @@
         },
         "Name":{
           "shape":"NonZeroAndMaxString",
-          "documentation":"<p>Descriptive label that is associated with a fleet. Fleet names do not need to be unique.</p>"
+          "documentation":"<p>A descriptive label that is associated with a fleet. Fleet names do not need to be unique.</p>"
         },
         "CreationTime":{
           "shape":"Timestamp",
@@ -2982,11 +3092,19 @@
         },
         "BuildId":{
           "shape":"BuildId",
-          "documentation":"<p>Unique identifier for a build.</p>"
+          "documentation":"<p>A unique identifier for a build.</p>"
+        },
+        "BuildArn":{
+          "shape":"BuildArn",
+          "documentation":"<p> The Amazon Resource Name (<a href=\"https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html\">ARN</a>) associated with the GameLift build resource that is deployed on instances in this fleet. In a GameLift build ARN, the resource ID matches the <i>BuildId</i> value.</p>"
         },
         "ScriptId":{
           "shape":"ScriptId",
-          "documentation":"<p>Unique identifier for a Realtime script.</p>"
+          "documentation":"<p>A unique identifier for a Realtime script.</p>"
+        },
+        "ScriptArn":{
+          "shape":"ScriptArn",
+          "documentation":"<p> The Amazon Resource Name (<a href=\"https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html\">ARN</a>) associated with the GameLift script resource that is deployed on instances in this fleet. In a GameLift script ARN, the resource ID matches the <i>ScriptId</i> value.</p>"
         },
         "ServerLaunchPath":{
           "shape":"NonZeroAndMaxString",
@@ -3002,7 +3120,7 @@
         },
         "NewGameSessionProtectionPolicy":{
           "shape":"ProtectionPolicy",
-          "documentation":"<p>Type of game session protection to set for all new instances started in the fleet.</p> <ul> <li> <p> <b>NoProtection</b> -- The game session can be terminated during a scale-down event.</p> </li> <li> <p> <b>FullProtection</b> -- If the game session is in an <code>ACTIVE</code> status, it cannot be terminated during a scale-down event.</p> </li> </ul>"
+          "documentation":"<p>The type of game session protection to set for all new instances started in the fleet.</p> <ul> <li> <p> <b>NoProtection</b> -- The game session can be terminated during a scale-down event.</p> </li> <li> <p> <b>FullProtection</b> -- If the game session is in an <code>ACTIVE</code> status, it cannot be terminated during a scale-down event.</p> </li> </ul>"
         },
         "OperatingSystem":{
           "shape":"OperatingSystem",
@@ -3022,11 +3140,14 @@
         },
         "InstanceRoleArn":{
           "shape":"NonEmptyString",
-          "documentation":"<p>Unique identifier for an AWS IAM role that manages access to your AWS services. With an instance role ARN set, any application that runs on an instance in this fleet can assume the role, including install scripts, server processes, daemons (background processes). Create a role or look up a role's ARN using the <a href=\"https://console.aws.amazon.com/iam/\">IAM dashboard</a> in the AWS Management Console. Learn more about using on-box credentials for your game servers at <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/gamelift-sdk-server-resources.html\"> Access external resources from a game server</a>.</p>"
+          "documentation":"<p>A unique identifier for an AWS IAM role that manages access to your AWS services. With an instance role ARN set, any application that runs on an instance in this fleet can assume the role, including install scripts, server processes, and daemons (background processes). Create a role or look up a role's ARN from the <a href=\"https://console.aws.amazon.com/iam/\">IAM dashboard</a> in the AWS Management Console. Learn more about using on-box credentials for your game servers at <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/gamelift-sdk-server-resources.html\"> Access external resources from a game server</a>.</p>"
         },
-        "CertificateConfiguration":{"shape":"CertificateConfiguration"}
+        "CertificateConfiguration":{
+          "shape":"CertificateConfiguration",
+          "documentation":"<p>Indicates whether a TLS/SSL certificate was generated for the fleet. </p>"
+        }
       },
-      "documentation":"<p>General properties describing a fleet.</p> <ul> <li> <p> <a>CreateFleet</a> </p> </li> <li> <p> <a>ListFleets</a> </p> </li> <li> <p> <a>DeleteFleet</a> </p> </li> <li> <p>Describe fleets:</p> <ul> <li> <p> <a>DescribeFleetAttributes</a> </p> </li> <li> <p> <a>DescribeFleetCapacity</a> </p> </li> <li> <p> <a>DescribeFleetPortSettings</a> </p> </li> <li> <p> <a>DescribeFleetUtilization</a> </p> </li> <li> <p> <a>DescribeRuntimeConfiguration</a> </p> </li> <li> <p> <a>DescribeEC2InstanceLimits</a> </p> </li> <li> <p> <a>DescribeFleetEvents</a> </p> </li> </ul> </li> <li> <p>Update fleets:</p> <ul> <li> <p> <a>UpdateFleetAttributes</a> </p> </li> <li> <p> <a>UpdateFleetCapacity</a> </p> </li> <li> <p> <a>UpdateFleetPortSettings</a> </p> </li> <li> <p> <a>UpdateRuntimeConfiguration</a> </p> </li> </ul> </li> <li> <p>Manage fleet actions:</p> <ul> <li> <p> <a>StartFleetActions</a> </p> </li> <li> <p> <a>StopFleetActions</a> </p> </li> </ul> </li> </ul>"
+      "documentation":"<p>General properties describing a fleet.</p> <ul> <li> <p> <a>CreateFleet</a> </p> </li> <li> <p> <a>ListFleets</a> </p> </li> <li> <p> <a>DeleteFleet</a> </p> </li> <li> <p> <a>DescribeFleetAttributes</a> </p> </li> <li> <p> <a>UpdateFleetAttributes</a> </p> </li> <li> <p>Manage fleet actions:</p> <ul> <li> <p> <a>StartFleetActions</a> </p> </li> <li> <p> <a>StopFleetActions</a> </p> </li> </ul> </li> </ul>"
     },
     "FleetAttributesList":{
       "type":"list",
@@ -3037,7 +3158,7 @@
       "members":{
         "FleetId":{
           "shape":"FleetId",
-          "documentation":"<p>Unique identifier for a fleet.</p>"
+          "documentation":"<p>A unique identifier for a fleet.</p>"
         },
         "InstanceType":{
           "shape":"EC2InstanceType",
@@ -3048,7 +3169,7 @@
           "documentation":"<p>Current status of fleet capacity.</p>"
         }
       },
-      "documentation":"<p>Information about the fleet's capacity. Fleet capacity is measured in EC2 instances. By default, new fleets have a capacity of one instance, but can be updated as needed. The maximum number of instances for a fleet is determined by the fleet's instance type.</p> <ul> <li> <p> <a>CreateFleet</a> </p> </li> <li> <p> <a>ListFleets</a> </p> </li> <li> <p> <a>DeleteFleet</a> </p> </li> <li> <p>Describe fleets:</p> <ul> <li> <p> <a>DescribeFleetAttributes</a> </p> </li> <li> <p> <a>DescribeFleetCapacity</a> </p> </li> <li> <p> <a>DescribeFleetPortSettings</a> </p> </li> <li> <p> <a>DescribeFleetUtilization</a> </p> </li> <li> <p> <a>DescribeRuntimeConfiguration</a> </p> </li> <li> <p> <a>DescribeEC2InstanceLimits</a> </p> </li> <li> <p> <a>DescribeFleetEvents</a> </p> </li> </ul> </li> <li> <p>Update fleets:</p> <ul> <li> <p> <a>UpdateFleetAttributes</a> </p> </li> <li> <p> <a>UpdateFleetCapacity</a> </p> </li> <li> <p> <a>UpdateFleetPortSettings</a> </p> </li> <li> <p> <a>UpdateRuntimeConfiguration</a> </p> </li> </ul> </li> <li> <p>Manage fleet actions:</p> <ul> <li> <p> <a>StartFleetActions</a> </p> </li> <li> <p> <a>StopFleetActions</a> </p> </li> </ul> </li> </ul>"
+      "documentation":"<p>Information about the fleet's capacity. Fleet capacity is measured in EC2 instances. By default, new fleets have a capacity of one instance, but can be updated as needed. The maximum number of instances for a fleet is determined by the fleet's instance type.</p> <ul> <li> <p> <a>CreateFleet</a> </p> </li> <li> <p> <a>ListFleets</a> </p> </li> <li> <p> <a>DeleteFleet</a> </p> </li> <li> <p> <a>DescribeFleetAttributes</a> </p> </li> <li> <p> <a>UpdateFleetAttributes</a> </p> </li> <li> <p>Manage fleet actions:</p> <ul> <li> <p> <a>StartFleetActions</a> </p> </li> <li> <p> <a>StopFleetActions</a> </p> </li> </ul> </li> </ul>"
     },
     "FleetCapacityExceededException":{
       "type":"structure",
@@ -3064,7 +3185,7 @@
     },
     "FleetId":{
       "type":"string",
-      "pattern":"^fleet-\\S+"
+      "pattern":"^fleet-\\S+|^arn:.*:fleet\\/fleet-\\S+"
     },
     "FleetIdList":{
       "type":"list",
@@ -3097,7 +3218,7 @@
       "members":{
         "FleetId":{
           "shape":"FleetId",
-          "documentation":"<p>Unique identifier for a fleet.</p>"
+          "documentation":"<p>A unique identifier for a fleet.</p>"
         },
         "ActiveServerProcessCount":{
           "shape":"WholeNumber",
@@ -3113,10 +3234,10 @@
         },
         "MaximumPlayerSessionCount":{
           "shape":"WholeNumber",
-          "documentation":"<p>Maximum players allowed across all game sessions currently being hosted on all instances in the fleet.</p>"
+          "documentation":"<p>The maximum number of players allowed across all game sessions currently being hosted on all instances in the fleet.</p>"
         }
       },
-      "documentation":"<p>Current status of fleet utilization, including the number of game and player sessions being hosted.</p> <ul> <li> <p> <a>CreateFleet</a> </p> </li> <li> <p> <a>ListFleets</a> </p> </li> <li> <p> <a>DeleteFleet</a> </p> </li> <li> <p>Describe fleets:</p> <ul> <li> <p> <a>DescribeFleetAttributes</a> </p> </li> <li> <p> <a>DescribeFleetCapacity</a> </p> </li> <li> <p> <a>DescribeFleetPortSettings</a> </p> </li> <li> <p> <a>DescribeFleetUtilization</a> </p> </li> <li> <p> <a>DescribeRuntimeConfiguration</a> </p> </li> <li> <p> <a>DescribeEC2InstanceLimits</a> </p> </li> <li> <p> <a>DescribeFleetEvents</a> </p> </li> </ul> </li> <li> <p>Update fleets:</p> <ul> <li> <p> <a>UpdateFleetAttributes</a> </p> </li> <li> <p> <a>UpdateFleetCapacity</a> </p> </li> <li> <p> <a>UpdateFleetPortSettings</a> </p> </li> <li> <p> <a>UpdateRuntimeConfiguration</a> </p> </li> </ul> </li> <li> <p>Manage fleet actions:</p> <ul> <li> <p> <a>StartFleetActions</a> </p> </li> <li> <p> <a>StopFleetActions</a> </p> </li> </ul> </li> </ul>"
+      "documentation":"<p>Current status of fleet utilization, including the number of game and player sessions being hosted.</p> <ul> <li> <p> <a>CreateFleet</a> </p> </li> <li> <p> <a>ListFleets</a> </p> </li> <li> <p> <a>DeleteFleet</a> </p> </li> <li> <p> <a>DescribeFleetAttributes</a> </p> </li> <li> <p> <a>UpdateFleetAttributes</a> </p> </li> <li> <p>Manage fleet actions:</p> <ul> <li> <p> <a>StartFleetActions</a> </p> </li> <li> <p> <a>StopFleetActions</a> </p> </li> </ul> </li> </ul>"
     },
     "FleetUtilizationList":{
       "type":"list",
@@ -3133,14 +3254,14 @@
       "members":{
         "Key":{
           "shape":"GamePropertyKey",
-          "documentation":"<p>Game property identifier.</p>"
+          "documentation":"<p>The game property identifier.</p>"
         },
         "Value":{
           "shape":"GamePropertyValue",
-          "documentation":"<p>Game property value.</p>"
+          "documentation":"<p>The game property value.</p>"
         }
       },
-      "documentation":"<p>Set of key-value pairs that contain information about a game session. When included in a game session request, these properties communicate details to be used when setting up the new game session, such as to specify a game mode, level, or map. Game properties are passed to the game server process when initiating a new game session; the server process uses the properties as appropriate. For more information, see the <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/gamelift-sdk-client-api.html#gamelift-sdk-client-api-create\"> Amazon GameLift Developer Guide</a>.</p>"
+      "documentation":"<p>Set of key-value pairs that contain information about a game session. When included in a game session request, these properties communicate details to be used when setting up the new game session. For example, a game property might specify a game mode, level, or map. Game properties are passed to the game server process when initiating a new game session. For more information, see the <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/gamelift-sdk-client-api.html#gamelift-sdk-client-api-create\"> Amazon GameLift Developer Guide</a>.</p>"
     },
     "GamePropertyKey":{
       "type":"string",
@@ -3160,15 +3281,19 @@
       "members":{
         "GameSessionId":{
           "shape":"NonZeroAndMaxString",
-          "documentation":"<p>Unique identifier for the game session. A game session ARN has the following format: <code>arn:aws:gamelift:&lt;region&gt;::gamesession/&lt;fleet ID&gt;/&lt;custom ID string or idempotency token&gt;</code>.</p>"
+          "documentation":"<p>A unique identifier for the game session. A game session ARN has the following format: <code>arn:aws:gamelift:&lt;region&gt;::gamesession/&lt;fleet ID&gt;/&lt;custom ID string or idempotency token&gt;</code>.</p>"
         },
         "Name":{
           "shape":"NonZeroAndMaxString",
-          "documentation":"<p>Descriptive label that is associated with a game session. Session names do not need to be unique.</p>"
+          "documentation":"<p>A descriptive label that is associated with a game session. Session names do not need to be unique.</p>"
         },
         "FleetId":{
           "shape":"FleetId",
-          "documentation":"<p>Unique identifier for a fleet that the game session is running on.</p>"
+          "documentation":"<p>A unique identifier for a fleet that the game session is running on.</p>"
+        },
+        "FleetArn":{
+          "shape":"ArnStringModel",
+          "documentation":"<p> The Amazon Resource Name (<a href=\"https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html\">ARN</a>) associated with the GameLift fleet that this game session is running on. </p>"
         },
         "CreationTime":{
           "shape":"Timestamp",
@@ -3184,7 +3309,7 @@
         },
         "MaximumPlayerSessionCount":{
           "shape":"WholeNumber",
-          "documentation":"<p>Maximum number of players that can be connected simultaneously to the game session.</p>"
+          "documentation":"<p>The maximum number of players that can be connected simultaneously to the game session.</p>"
         },
         "Status":{
           "shape":"GameSessionStatus",
@@ -3200,9 +3325,12 @@
         },
         "IpAddress":{
           "shape":"IpAddress",
-          "documentation":"<p>IP address of the game session. To connect to a Amazon GameLift game server, an app needs both the IP address and port number.</p>"
+          "documentation":"<p>IP address of the instance that is running the game session. When connecting to a Amazon GameLift game server, a client needs to reference an IP address (or DNS name) and port number.</p>"
+        },
+        "DnsName":{
+          "shape":"DnsName",
+          "documentation":"<p>DNS identifier assigned to the instance that is running the game session. Values have the following format:</p> <ul> <li> <p>TLS-enabled fleets: <code>&lt;unique identifier&gt;.&lt;region identifier&gt;.amazongamelift.com</code>.</p> </li> <li> <p>Non-TLS-enabled fleets: <code>ec2-&lt;unique identifier&gt;.compute.amazonaws.com</code>. (See <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-instance-addressing.html#concepts-public-addresses\">Amazon EC2 Instance IP Addressing</a>.)</p> </li> </ul> <p>When connecting to a game session that is running on a TLS-enabled fleet, you must use the DNS name, not the IP address.</p>"
         },
-        "DnsName":{"shape":"DnsName"},
         "Port":{
           "shape":"PortNumber",
           "documentation":"<p>Port number for the game session. To connect to a Amazon GameLift game server, an app needs both the IP address and port number.</p>"
@@ -3213,7 +3341,7 @@
         },
         "CreatorId":{
           "shape":"NonZeroAndMaxString",
-          "documentation":"<p>Unique identifier for a player. This ID is used to enforce a resource protection policy (if one exists), that limits the number of game sessions a player can create.</p>"
+          "documentation":"<p>A unique identifier for a player. This ID is used to enforce a resource protection policy (if one exists), that limits the number of game sessions a player can create.</p>"
         },
         "GameSessionData":{
           "shape":"GameSessionData",
@@ -3236,20 +3364,23 @@
       "members":{
         "GameSessionArn":{
           "shape":"ArnStringModel",
-          "documentation":"<p>Amazon Resource Name (<a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/s3-arn-format.html\">ARN</a>) that is assigned to a game session and uniquely identifies it.</p>"
+          "documentation":"<p>Amazon Resource Name (<a href=\"https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html\">ARN</a>) that is assigned to a game session and uniquely identifies it.</p>"
         },
         "IpAddress":{
           "shape":"StringModel",
-          "documentation":"<p>IP address of the game session. To connect to a Amazon GameLift game server, an app needs both the IP address and port number.</p>"
+          "documentation":"<p>IP address of the instance that is running the game session. When connecting to a Amazon GameLift game server, a client needs to reference an IP address (or DNS name) and port number.</p>"
+        },
+        "DnsName":{
+          "shape":"DnsName",
+          "documentation":"<p>DNS identifier assigned to the instance that is running the game session. Values have the following format:</p> <ul> <li> <p>TLS-enabled fleets: <code>&lt;unique identifier&gt;.&lt;region identifier&gt;.amazongamelift.com</code>.</p> </li> <li> <p>Non-TLS-enabled fleets: <code>ec2-&lt;unique identifier&gt;.compute.amazonaws.com</code>. (See <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-instance-addressing.html#concepts-public-addresses\">Amazon EC2 Instance IP Addressing</a>.)</p> </li> </ul> <p>When connecting to a game session that is running on a TLS-enabled fleet, you must use the DNS name, not the IP address.</p>"
         },
-        "DnsName":{"shape":"DnsName"},
         "Port":{
           "shape":"PositiveInteger",
           "documentation":"<p>Port number for the game session. To connect to a Amazon GameLift game server, an app needs both the IP address and port number.</p>"
         },
         "MatchedPlayerSessions":{
           "shape":"MatchedPlayerSessionList",
-          "documentation":"<p>Collection of player session IDs, one for each player ID that was included in the original matchmaking request. </p>"
+          "documentation":"<p>A collection of player session IDs, one for each player ID that was included in the original matchmaking request. </p>"
         }
       },
       "documentation":"<p>Connection information for the new game session that is created with matchmaking. (with <a>StartMatchmaking</a>). Once a match is set, the FlexMatch engine places the match and creates a new game session for it. This information, including the game session endpoint and player sessions for each player in the original matchmaking request, is added to the <a>MatchmakingTicket</a>, which can be retrieved by calling <a>DescribeMatchmaking</a>.</p>"
@@ -3294,15 +3425,15 @@
       "members":{
         "PlacementId":{
           "shape":"IdStringModel",
-          "documentation":"<p>Unique identifier for a game session placement.</p>"
+          "documentation":"<p>A unique identifier for a game session placement.</p>"
         },
         "GameSessionQueueName":{
           "shape":"GameSessionQueueName",
-          "documentation":"<p>Descriptive label that is associated with game session queue. Queue names must be unique within each region.</p>"
+          "documentation":"<p>A descriptive label that is associated with game session queue. Queue names must be unique within each Region.</p>"
         },
         "Status":{
           "shape":"GameSessionPlacementState",
-          "documentation":"<p>Current status of the game session placement request.</p> <ul> <li> <p> <b>PENDING</b> -- The placement request is currently in the queue waiting to be processed.</p> </li> <li> <p> <b>FULFILLED</b> -- A new game session and player sessions (if requested) have been successfully created. Values for <i>GameSessionArn</i> and <i>GameSessionRegion</i> are available. </p> </li> <li> <p> <b>CANCELLED</b> -- The placement request was canceled with a call to <a>StopGameSessionPlacement</a>.</p> </li> <li> <p> <b>TIMED_OUT</b> -- A new game session was not successfully created before the time limit expired. You can resubmit the placement request as needed.</p> </li> </ul>"
+          "documentation":"<p>Current status of the game session placement request.</p> <ul> <li> <p> <b>PENDING</b> -- The placement request is currently in the queue waiting to be processed.</p> </li> <li> <p> <b>FULFILLED</b> -- A new game session and player sessions (if requested) have been successfully created. Values for <i>GameSessionArn</i> and <i>GameSessionRegion</i> are available. </p> </li> <li> <p> <b>CANCELLED</b> -- The placement request was canceled with a call to <a>StopGameSessionPlacement</a>.</p> </li> <li> <p> <b>TIMED_OUT</b> -- A new game session was not successfully created before the time limit expired. You can resubmit the placement request as needed.</p> </li> <li> <p> <b>FAILED</b> -- GameLift is not able to complete the process of placing the game session. Common reasons are the game session terminated before the placement process was completed, or an unexpected internal error.</p> </li> </ul>"
         },
         "GameProperties":{
           "shape":"GamePropertyList",
@@ -3310,27 +3441,27 @@
         },
         "MaximumPlayerSessionCount":{
           "shape":"WholeNumber",
-          "documentation":"<p>Maximum number of players that can be connected simultaneously to the game session.</p>"
+          "documentation":"<p>The maximum number of players that can be connected simultaneously to the game session.</p>"
         },
         "GameSessionName":{
           "shape":"NonZeroAndMaxString",
-          "documentation":"<p>Descriptive label that is associated with a game session. Session names do not need to be unique.</p>"
+          "documentation":"<p>A descriptive label that is associated with a game session. Session names do not need to be unique.</p>"
         },
         "GameSessionId":{
           "shape":"NonZeroAndMaxString",
-          "documentation":"<p>Unique identifier for the game session. This value is set once the new game session is placed (placement status is <code>FULFILLED</code>).</p>"
+          "documentation":"<p>A unique identifier for the game session. This value is set once the new game session is placed (placement status is <code>FULFILLED</code>).</p>"
         },
         "GameSessionArn":{
           "shape":"NonZeroAndMaxString",
-          "documentation":"<p>Identifier for the game session created by this placement request. This value is set once the new game session is placed (placement status is <code>FULFILLED</code>). This identifier is unique across all regions. You can use this value as a <code>GameSessionId</code> value as needed.</p>"
+          "documentation":"<p>Identifier for the game session created by this placement request. This value is set once the new game session is placed (placement status is <code>FULFILLED</code>). This identifier is unique across all Regions. You can use this value as a <code>GameSessionId</code> value as needed.</p>"
         },
         "GameSessionRegion":{
           "shape":"NonZeroAndMaxString",
-          "documentation":"<p>Name of the region where the game session created by this placement request is running. This value is set once the new game session is placed (placement status is <code>FULFILLED</code>).</p>"
+          "documentation":"<p>Name of the Region where the game session created by this placement request is running. This value is set once the new game session is placed (placement status is <code>FULFILLED</code>).</p>"
         },
         "PlayerLatencies":{
           "shape":"PlayerLatencyList",
-          "documentation":"<p>Set of values, expressed in milliseconds, indicating the amount of latency that a player experiences when connected to AWS regions.</p>"
+          "documentation":"<p>Set of values, expressed in milliseconds, indicating the amount of latency that a player experiences when connected to AWS Regions.</p>"
         },
         "StartTime":{
           "shape":"Timestamp",
@@ -3342,16 +3473,19 @@
         },
         "IpAddress":{
           "shape":"IpAddress",
-          "documentation":"<p>IP address of the game session. To connect to a Amazon GameLift game server, an app needs both the IP address and port number. This value is set once the new game session is placed (placement status is <code>FULFILLED</code>). </p>"
+          "documentation":"<p>IP address of the instance that is running the game session. When connecting to a Amazon GameLift game server, a client needs to reference an IP address (or DNS name) and port number. This value is set once the new game session is placed (placement status is <code>FULFILLED</code>). </p>"
+        },
+        "DnsName":{
+          "shape":"DnsName",
+          "documentation":"<p>DNS identifier assigned to the instance that is running the game session. Values have the following format:</p> <ul> <li> <p>TLS-enabled fleets: <code>&lt;unique identifier&gt;.&lt;region identifier&gt;.amazongamelift.com</code>.</p> </li> <li> <p>Non-TLS-enabled fleets: <code>ec2-&lt;unique identifier&gt;.compute.amazonaws.com</code>. (See <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-instance-addressing.html#concepts-public-addresses\">Amazon EC2 Instance IP Addressing</a>.)</p> </li> </ul> <p>When connecting to a game session that is running on a TLS-enabled fleet, you must use the DNS name, not the IP address.</p>"
         },
-        "DnsName":{"shape":"DnsName"},
         "Port":{
           "shape":"PortNumber",
           "documentation":"<p>Port number for the game session. To connect to a Amazon GameLift game server, an app needs both the IP address and port number. This value is set once the new game session is placed (placement status is <code>FULFILLED</code>).</p>"
         },
         "PlacedPlayerSessions":{
           "shape":"PlacedPlayerSessionList",
-          "documentation":"<p>Collection of information on player sessions created in response to the game session placement request. These player sessions are created only once a new game session is successfully placed (placement status is <code>FULFILLED</code>). This information includes the player ID (as provided in the placement request) and the corresponding player session ID. Retrieve full player sessions by calling <a>DescribePlayerSessions</a> with the player session ID.</p>"
+          "documentation":"<p>A collection of information on player sessions created in response to the game session placement request. These player sessions are created only once a new game session is successfully placed (placement status is <code>FULFILLED</code>). This information includes the player ID (as provided in the placement request) and the corresponding player session ID. Retrieve full player sessions by calling <a>DescribePlayerSessions</a> with the player session ID.</p>"
         },
         "GameSessionData":{
           "shape":"GameSessionData",
@@ -3379,23 +3513,23 @@
       "members":{
         "Name":{
           "shape":"GameSessionQueueName",
-          "documentation":"<p>Descriptive label that is associated with game session queue. Queue names must be unique within each region.</p>"
+          "documentation":"<p>A descriptive label that is associated with game session queue. Queue names must be unique within each Region.</p>"
         },
         "GameSessionQueueArn":{
           "shape":"ArnStringModel",
-          "documentation":"<p>Amazon Resource Name (<a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/s3-arn-format.html\">ARN</a>) that is assigned to a game session queue and uniquely identifies it. Format is <code>arn:aws:gamelift:&lt;region&gt;:&lt;aws account&gt;:gamesessionqueue/&lt;queue name&gt;</code>.</p>"
+          "documentation":"<p>Amazon Resource Name (<a href=\"https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html\">ARN</a>) that is assigned to a GameLift game session queue resource and uniquely identifies it. ARNs are unique across all Regions. In a GameLift game session queue ARN, the resource ID matches the <i>Name</i> value.</p>"
         },
         "TimeoutInSeconds":{
           "shape":"WholeNumber",
-          "documentation":"<p>Maximum time, in seconds, that a new game session placement request remains in the queue. When a request exceeds this time, the game session placement changes to a <code>TIMED_OUT</code> status.</p>"
+          "documentation":"<p>The maximum time, in seconds, that a new game session placement request remains in the queue. When a request exceeds this time, the game session placement changes to a <code>TIMED_OUT</code> status.</p>"
         },
         "PlayerLatencyPolicies":{
           "shape":"PlayerLatencyPolicyList",
-          "documentation":"<p>Collection of latency policies to apply when processing game sessions placement requests with player latency information. Multiple policies are evaluated in order of the maximum latency value, starting with the lowest latency values. With just one policy, it is enforced at the start of the game session placement for the duration period. With multiple policies, each policy is enforced consecutively for its duration period. For example, a queue might enforce a 60-second policy followed by a 120-second policy, and then no policy for the remainder of the placement. </p>"
+          "documentation":"<p>A collection of latency policies to apply when processing game sessions placement requests with player latency information. Multiple policies are evaluated in order of the maximum latency value, starting with the lowest latency values. With just one policy, the policy is enforced at the start of the game session placement for the duration period. With multiple policies, each policy is enforced consecutively for its duration period. For example, a queue might enforce a 60-second policy followed by a 120-second policy, and then no policy for the remainder of the placement. </p>"
         },
         "Destinations":{
           "shape":"GameSessionQueueDestinationList",
-          "documentation":"<p>List of fleets that can be used to fulfill game session placement requests in the queue. Fleets are identified by either a fleet ARN or a fleet alias ARN. Destinations are listed in default preference order.</p>"
+          "documentation":"<p>A list of fleets that can be used to fulfill game session placement requests in the queue. Fleets are identified by either a fleet ARN or a fleet alias ARN. Destinations are listed in default preference order.</p>"
         }
       },
       "documentation":"<p>Configuration of a queue that is used to process game session placement requests. The queue configuration identifies several game features:</p> <ul> <li> <p>The destinations where a new game session can potentially be hosted. Amazon GameLift tries these destinations in an order based on either the queue's default order or player latency information, if provided in a placement request. With latency information, Amazon GameLift can place game sessions where the majority of players are reporting the lowest possible latency. </p> </li> <li> <p>The length of time that placement requests can wait in the queue before timing out. </p> </li> <li> <p>A set of optional latency policies that protect individual players from high latencies, preventing game sessions from being placed where any individual player is reporting latency higher than a policy's maximum.</p> </li> </ul> <ul> <li> <p> <a>CreateGameSessionQueue</a> </p> </li> <li> <p> <a>DescribeGameSessionQueues</a> </p> </li> <li> <p> <a>UpdateGameSessionQueue</a> </p> </li> <li> <p> <a>DeleteGameSessionQueue</a> </p> </li> </ul>"
@@ -3405,10 +3539,10 @@
       "members":{
         "DestinationArn":{
           "shape":"ArnStringModel",
-          "documentation":"<p>Amazon Resource Name (ARN) assigned to fleet or fleet alias. ARNs, which include a fleet ID or alias ID and a region name, provide a unique identifier across all regions. </p>"
+          "documentation":"<p>The Amazon Resource Name (ARN) that is assigned to fleet or fleet alias. ARNs, which include a fleet ID or alias ID and a Region name, provide a unique identifier across all Regions. </p>"
         }
       },
-      "documentation":"<p>Fleet designated in a game session queue. Requests for new game sessions in the queue are fulfilled by starting a new game session on any destination configured for a queue. </p> <ul> <li> <p> <a>CreateGameSessionQueue</a> </p> </li> <li> <p> <a>DescribeGameSessionQueues</a> </p> </li> <li> <p> <a>UpdateGameSessionQueue</a> </p> </li> <li> <p> <a>DeleteGameSessionQueue</a> </p> </li> </ul>"
+      "documentation":"<p>Fleet designated in a game session queue. Requests for new game sessions in the queue are fulfilled by starting a new game session on any destination that is configured for a queue. </p> <ul> <li> <p> <a>CreateGameSessionQueue</a> </p> </li> <li> <p> <a>DescribeGameSessionQueues</a> </p> </li> <li> <p> <a>UpdateGameSessionQueue</a> </p> </li> <li> <p> <a>DeleteGameSessionQueue</a> </p> </li> </ul>"
     },
     "GameSessionQueueDestinationList":{
       "type":"list",
@@ -3420,9 +3554,9 @@
     },
     "GameSessionQueueName":{
       "type":"string",
-      "max":128,
+      "max":256,
       "min":1,
-      "pattern":"[a-zA-Z0-9-]+"
+      "pattern":"[a-zA-Z0-9-]+|^arn:.*:gamesessionqueue\\/[a-zA-Z0-9-]+"
     },
     "GameSessionQueueNameList":{
       "type":"list",
@@ -3448,7 +3582,7 @@
       "members":{
         "GameSessionId":{
           "shape":"ArnStringModel",
-          "documentation":"<p>Unique identifier for the game session to get logs for.</p>"
+          "documentation":"<p>A unique identifier for the game session to get logs for. </p>"
         }
       },
       "documentation":"<p>Represents the input for a request action.</p>"
@@ -3472,11 +3606,11 @@
       "members":{
         "FleetId":{
           "shape":"FleetId",
-          "documentation":"<p>Unique identifier for a fleet that contains the instance you want access to. The fleet can be in any of the following statuses: <code>ACTIVATING</code>, <code>ACTIVE</code>, or <code>ERROR</code>. Fleets with an <code>ERROR</code> status may be accessible for a short time before they are deleted.</p>"
+          "documentation":"<p>A unique identifier for a fleet that contains the instance you want access to. You can use either the fleet ID or ARN value. The fleet can be in any of the following statuses: <code>ACTIVATING</code>, <code>ACTIVE</code>, or <code>ERROR</code>. Fleets with an <code>ERROR</code> status may be accessible for a short time before they are deleted.</p>"
         },
         "InstanceId":{
           "shape":"InstanceId",
-          "documentation":"<p>Unique identifier for an instance you want to get access to. You can access an instance in any status.</p>"
+          "documentation":"<p>A unique identifier for an instance you want to get access to. You can access an instance in any status.</p>"
         }
       },
       "documentation":"<p>Represents the input for a request action.</p>"
@@ -3486,7 +3620,7 @@
       "members":{
         "InstanceAccess":{
           "shape":"InstanceAccess",
-          "documentation":"<p>Object that contains connection information for a fleet instance, including IP address and access credentials.</p>"
+          "documentation":"<p>The connection information for a fleet instance, including IP address and access credentials.</p>"
         }
       },
       "documentation":"<p>Represents the returned data in response to a request action.</p>"
@@ -3510,17 +3644,20 @@
       "members":{
         "FleetId":{
           "shape":"FleetId",
-          "documentation":"<p>Unique identifier for a fleet that the instance is in.</p>"
+          "documentation":"<p>A unique identifier for a fleet that the instance is in.</p>"
         },
         "InstanceId":{
           "shape":"InstanceId",
-          "documentation":"<p>Unique identifier for an instance.</p>"
+          "documentation":"<p>A unique identifier for an instance.</p>"
         },
         "IpAddress":{
           "shape":"IpAddress",
-          "documentation":"<p>IP address assigned to the instance.</p>"
+          "documentation":"<p>IP address that is assigned to the instance.</p>"
+        },
+        "DnsName":{
+          "shape":"DnsName",
+          "documentation":"<p>DNS identifier assigned to the instance that is running the game session. Values have the following format:</p> <ul> <li> <p>TLS-enabled fleets: <code>&lt;unique identifier&gt;.&lt;region identifier&gt;.amazongamelift.com</code>.</p> </li> <li> <p>Non-TLS-enabled fleets: <code>ec2-&lt;unique identifier&gt;.compute.amazonaws.com</code>. (See <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-instance-addressing.html#concepts-public-addresses\">Amazon EC2 Instance IP Addressing</a>.)</p> </li> </ul> <p>When connecting to a game session that is running on a TLS-enabled fleet, you must use the DNS name, not the IP address.</p>"
         },
-        "DnsName":{"shape":"DnsName"},
         "OperatingSystem":{
           "shape":"OperatingSystem",
           "documentation":"<p>Operating system that is running on this instance. </p>"
@@ -3545,15 +3682,15 @@
       "members":{
         "FleetId":{
           "shape":"FleetId",
-          "documentation":"<p>Unique identifier for a fleet containing the instance being accessed.</p>"
+          "documentation":"<p>A unique identifier for a fleet containing the instance being accessed.</p>"
         },
         "InstanceId":{
           "shape":"InstanceId",
-          "documentation":"<p>Unique identifier for an instance being accessed.</p>"
+          "documentation":"<p>A unique identifier for an instance being accessed.</p>"
         },
         "IpAddress":{
           "shape":"IpAddress",
-          "documentation":"<p>IP address assigned to the instance.</p>"
+          "documentation":"<p>IP address that is assigned to the instance.</p>"
         },
         "OperatingSystem":{
           "shape":"OperatingSystem",
@@ -3643,22 +3780,22 @@
       "members":{
         "FromPort":{
           "shape":"PortNumber",
-          "documentation":"<p>Starting value for a range of allowed port numbers.</p>"
+          "documentation":"<p>A starting value for a range of allowed port numbers.</p>"
         },
         "ToPort":{
           "shape":"PortNumber",
-          "documentation":"<p>Ending value for a range of allowed port numbers. Port numbers are end-inclusive. This value must be higher than <code>FromPort</code>.</p>"
+          "documentation":"<p>An ending value for a range of allowed port numbers. Port numbers are end-inclusive. This value must be higher than <code>FromPort</code>.</p>"
         },
         "IpRange":{
           "shape":"NonBlankString",
-          "documentation":"<p>Range of allowed IP addresses. This value must be expressed in CIDR notation. Example: \"<code>000.000.000.000/[subnet mask]</code>\" or optionally the shortened version \"<code>0.0.0.0/[subnet mask]</code>\".</p>"
+          "documentation":"<p>A range of allowed IP addresses. This value must be expressed in CIDR notation. Example: \"<code>000.000.000.000/[subnet mask]</code>\" or optionally the shortened version \"<code>0.0.0.0/[subnet mask]</code>\".</p>"
         },
         "Protocol":{
           "shape":"IpProtocol",
-          "documentation":"<p>Network communication protocol used by the fleet.</p>"
+          "documentation":"<p>The network communication protocol used by the fleet.</p>"
         }
       },
-      "documentation":"<p>A range of IP addresses and port settings that allow inbound traffic to connect to server processes on an Amazon GameLift. New game sessions that are started on the fleet are assigned an IP address/port number combination, which must fall into the fleet's allowed ranges. For fleets created with a custom game server, the ranges reflect the server's game session assignments. For Realtime Servers fleets, Amazon GameLift automatically opens two port ranges, one for TCP messaging and one for UDP for use by the Realtime servers.</p>"
+      "documentation":"<p>A range of IP addresses and port settings that allow inbound traffic to connect to server processes on an Amazon GameLift hosting resource. New game sessions that are started on the fleet are assigned an IP address/port number combination, which must fall into the fleet's allowed ranges. For fleets created with a custom game server, the ranges reflect the server's game session assignments. For Realtime Servers fleets, Amazon GameLift automatically opens two port ranges, one for TCP messaging and one for UDP for use by the Realtime servers.</p>"
     },
     "IpPermissionsList":{
       "type":"list",
@@ -3690,19 +3827,19 @@
       "members":{
         "RoutingStrategyType":{
           "shape":"RoutingStrategyType",
-          "documentation":"<p>Type of routing to filter results on. Use this parameter to retrieve only aliases of a certain type. To retrieve all aliases, leave this parameter empty.</p> <p>Possible routing types include the following:</p> <ul> <li> <p> <b>SIMPLE</b> -- The alias resolves to one specific fleet. Use this type when routing to active fleets.</p> </li> <li> <p> <b>TERMINAL</b> -- The alias does not resolve to a fleet but instead can be used to display a message to the user. A terminal alias throws a TerminalRoutingStrategyException with the <a>RoutingStrategy</a> message embedded.</p> </li> </ul>"
+          "documentation":"<p>The routing type to filter results on. Use this parameter to retrieve only aliases with a certain routing type. To retrieve all aliases, leave this parameter empty.</p> <p>Possible routing types include the following:</p> <ul> <li> <p> <b>SIMPLE</b> -- The alias resolves to one specific fleet. Use this type when routing to active fleets.</p> </li> <li> <p> <b>TERMINAL</b> -- The alias does not resolve to a fleet but instead can be used to display a message to the user. A terminal alias throws a TerminalRoutingStrategyException with the <a>RoutingStrategy</a> message embedded.</p> </li> </ul>"
         },
         "Name":{
           "shape":"NonEmptyString",
-          "documentation":"<p>Descriptive label that is associated with an alias. Alias names do not need to be unique.</p>"
+          "documentation":"<p>A descriptive label that is associated with an alias. Alias names do not need to be unique.</p>"
         },
         "Limit":{
           "shape":"PositiveInteger",
-          "documentation":"<p>Maximum number of results to return. Use this parameter with <code>NextToken</code> to get results as a set of sequential pages.</p>"
+          "documentation":"<p>The maximum number of results to return. Use this parameter with <code>NextToken</code> to get results as a set of sequential pages.</p>"
         },
         "NextToken":{
           "shape":"NonEmptyString",
-          "documentation":"<p>Token that indicates the start of the next sequential page of results. Use the token that is returned with a previous call to this action. To start at the beginning of the result set, do not specify a value.</p>"
+          "documentation":"<p>A token that indicates the start of the next sequential page of results. Use the token that is returned with a previous call to this action. To start at the beginning of the result set, do not specify a value.</p>"
         }
       },
       "documentation":"<p>Represents the input for a request action.</p>"
@@ -3712,11 +3849,11 @@
       "members":{
         "Aliases":{
           "shape":"AliasList",
-          "documentation":"<p>Collection of alias records that match the list request.</p>"
+          "documentation":"<p>A collection of alias resources that match the request parameters.</p>"
         },
         "NextToken":{
           "shape":"NonEmptyString",
-          "documentation":"<p>Token that indicates where to resume retrieving results on the next call to this action. If no token is returned, these results represent the end of the list.</p>"
+          "documentation":"<p>A token that indicates where to resume retrieving results on the next call to this action. If no token is returned, these results represent the end of the list.</p>"
         }
       },
       "documentation":"<p>Represents the returned data in response to a request action.</p>"
@@ -3730,7 +3867,7 @@
         },
         "Limit":{
           "shape":"PositiveInteger",
-          "documentation":"<p>Maximum number of results to return. Use this parameter with <code>NextToken</code> to get results as a set of sequential pages.</p>"
+          "documentation":"<p>The maximum number of results to return. Use this parameter with <code>NextToken</code> to get results as a set of sequential pages.</p>"
         },
         "NextToken":{
           "shape":"NonEmptyString",
@@ -3744,7 +3881,7 @@
       "members":{
         "Builds":{
           "shape":"BuildList",
-          "documentation":"<p>Collection of build records that match the request.</p>"
+          "documentation":"<p>A collection of build records that match the request.</p>"
         },
         "NextToken":{
           "shape":"NonEmptyString",
@@ -3758,15 +3895,15 @@
       "members":{
         "BuildId":{
           "shape":"BuildId",
-          "documentation":"<p>Unique identifier for a build to return fleets for. Use this parameter to return only fleets using the specified build. To retrieve all fleets, leave this parameter empty.</p>"
+          "documentation":"<p>A unique identifier for a build to return fleets for. Use this parameter to return only fleets using the specified build. Use either the build ID or ARN value.To retrieve all fleets, leave this parameter empty.</p>"
         },
         "ScriptId":{
           "shape":"ScriptId",
-          "documentation":"<p>Unique identifier for a Realtime script to return fleets for. Use this parameter to return only fleets using the specified script. To retrieve all fleets, leave this parameter empty.</p>"
+          "documentation":"<p>A unique identifier for a Realtime script to return fleets for. Use this parameter to return only fleets using the specified script. Use either the script ID or ARN value.To retrieve all fleets, leave this parameter empty.</p>"
         },
         "Limit":{
           "shape":"PositiveInteger",
-          "documentation":"<p>Maximum number of results to return. Use this parameter with <code>NextToken</code> to get results as a set of sequential pages.</p>"
+          "documentation":"<p>The maximum number of results to return. Use this parameter with <code>NextToken</code> to get results as a set of sequential pages.</p>"
         },
         "NextToken":{
           "shape":"NonZeroAndMaxString",
@@ -3794,11 +3931,11 @@
       "members":{
         "Limit":{
           "shape":"PositiveInteger",
-          "documentation":"<p>Maximum number of results to return. Use this parameter with <code>NextToken</code> to get results as a set of sequential pages.</p>"
+          "documentation":"<p>The maximum number of results to return. Use this parameter with <code>NextToken</code> to get results as a set of sequential pages.</p>"
         },
         "NextToken":{
           "shape":"NonEmptyString",
-          "documentation":"<p>Token that indicates the start of the next sequential page of results. Use the token that is returned with a previous call to this action. To start at the beginning of the result set, do not specify a value.</p>"
+          "documentation":"<p>A token that indicates the start of the next sequential page of results. Use the token that is returned with a previous call to this action. To start at the beginning of the result set, do not specify a value.</p>"
         }
       }
     },
@@ -3807,11 +3944,30 @@
       "members":{
         "Scripts":{
           "shape":"ScriptList",
-          "documentation":"<p>Set of properties describing the requested script.</p>"
+          "documentation":"<p>A set of properties describing the requested script.</p>"
         },
         "NextToken":{
           "shape":"NonEmptyString",
-          "documentation":"<p>Token that indicates where to resume retrieving results on the next call to this action. If no token is returned, these results represent the end of the list.</p>"
+          "documentation":"<p>A token that indicates where to resume retrieving results on the next call to this action. If no token is returned, these results represent the end of the list.</p>"
+        }
+      }
+    },
+    "ListTagsForResourceRequest":{
+      "type":"structure",
+      "required":["ResourceARN"],
+      "members":{
+        "ResourceARN":{
+          "shape":"AmazonResourceName",
+          "documentation":"<p> The Amazon Resource Name (<a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/s3-arn-format.html\">ARN</a>) that is assigned to and uniquely identifies the GameLift resource that you want to retrieve tags for. GameLift resource ARNs are included in the data object for the resource, which can be retrieved by calling a List or Describe action for the resource type. </p>"
+        }
+      }
+    },
+    "ListTagsForResourceResponse":{
+      "type":"structure",
+      "members":{
+        "Tags":{
+          "shape":"TagList",
+          "documentation":"<p> The collection of tags that have been assigned to the specified resource. </p>"
         }
       }
     },
@@ -3820,11 +3976,11 @@
       "members":{
         "PlayerId":{
           "shape":"NonZeroAndMaxString",
-          "documentation":"<p>Unique identifier for a player </p>"
+          "documentation":"<p>A unique identifier for a player </p>"
         },
         "PlayerSessionId":{
           "shape":"PlayerSessionId",
-          "documentation":"<p>Unique identifier for a player session</p>"
+          "documentation":"<p>A unique identifier for a player session</p>"
         }
       },
       "documentation":"<p>Represents a new player session that is created as a result of a successful FlexMatch match. A successful match automatically creates new player sessions for every player ID in the original matchmaking request. </p> <p>When players connect to the match's game session, they must include both player ID and player session ID in order to claim their assigned player slot.</p>"
@@ -3848,39 +4004,47 @@
       "members":{
         "Name":{
           "shape":"MatchmakingIdStringModel",
-          "documentation":"<p>Unique identifier for a matchmaking configuration. This name is used to identify the configuration associated with a matchmaking request or ticket.</p>"
+          "documentation":"<p>A unique identifier for a matchmaking configuration. This name is used to identify the configuration associated with a matchmaking request or ticket.</p>"
+        },
+        "ConfigurationArn":{
+          "shape":"MatchmakingConfigurationArn",
+          "documentation":"<p>Amazon Resource Name (<a href=\"https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html\">ARN</a>) that is assigned to a GameLift matchmaking configuration resource and uniquely identifies it. ARNs are unique across all Regions. In a GameLift configuration ARN, the resource ID matches the <i>Name</i> value.</p>"
         },
         "Description":{
           "shape":"NonZeroAndMaxString",
-          "documentation":"<p>Descriptive label that is associated with matchmaking configuration.</p>"
+          "documentation":"<p>A descriptive label that is associated with matchmaking configuration.</p>"
         },
         "GameSessionQueueArns":{
           "shape":"QueueArnsList",
-          "documentation":"<p>Amazon Resource Name (<a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/s3-arn-format.html\">ARN</a>) that is assigned to a game session queue and uniquely identifies it. Format is <code>arn:aws:gamelift:&lt;region&gt;:&lt;aws account&gt;:gamesessionqueue/&lt;queue name&gt;</code>. These queues are used when placing game sessions for matches that are created with this matchmaking configuration. Queues can be located in any region.</p>"
+          "documentation":"<p>Amazon Resource Name (<a href=\"https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html\">ARN</a>) that is assigned to a GameLift game session queue resource and uniquely identifies it. ARNs are unique across all Regions. GameLift uses the listed queues when placing game sessions for matches that are created with this matchmaking configuration. Queues can be located in any Region.</p>"
         },
         "RequestTimeoutSeconds":{
           "shape":"MatchmakingRequestTimeoutInteger",
-          "documentation":"<p>Maximum duration, in seconds, that a matchmaking ticket can remain in process before timing out. Requests that fail due to timing out can be resubmitted as needed.</p>"
+          "documentation":"<p>The maximum duration, in seconds, that a matchmaking ticket can remain in process before timing out. Requests that fail due to timing out can be resubmitted as needed.</p>"
         },
         "AcceptanceTimeoutSeconds":{
           "shape":"MatchmakingAcceptanceTimeoutInteger",
-          "documentation":"<p>Length of time (in seconds) to wait for players to accept a proposed match. If any player rejects the match or fails to accept before the timeout, the ticket continues to look for an acceptable match.</p>"
+          "documentation":"<p>The length of time (in seconds) to wait for players to accept a proposed match. If any player rejects the match or fails to accept before the timeout, the ticket continues to look for an acceptable match.</p>"
         },
         "AcceptanceRequired":{
           "shape":"BooleanModel",
-          "documentation":"<p>Flag that determines whether a match that was created with this configuration must be accepted by the matched players. To require acceptance, set to TRUE.</p>"
+          "documentation":"<p>A flag that indicates whether a match that was created with this configuration must be accepted by the matched players. To require acceptance, set to TRUE.</p>"
         },
         "RuleSetName":{
           "shape":"MatchmakingIdStringModel",
-          "documentation":"<p>Unique identifier for a matchmaking rule set to use with this configuration. A matchmaking configuration can only use rule sets that are defined in the same region.</p>"
+          "documentation":"<p>A unique identifier for a matchmaking rule set to use with this configuration. A matchmaking configuration can only use rule sets that are defined in the same Region.</p>"
+        },
+        "RuleSetArn":{
+          "shape":"MatchmakingRuleSetArn",
+          "documentation":"<p>The Amazon Resource Name (<a href=\"https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html\">ARN</a>) associated with the GameLift matchmaking rule set resource that this configuration uses.</p>"
         },
         "NotificationTarget":{
           "shape":"SnsArnStringModel",
-          "documentation":"<p>SNS topic ARN that is set up to receive matchmaking notifications.</p>"
+          "documentation":"<p>An SNS topic ARN that is set up to receive matchmaking notifications.</p>"
         },
         "AdditionalPlayerCount":{
           "shape":"WholeNumber",
-          "documentation":"<p>Number of player slots in a match to keep open for future players. For example, if the configuration's rule set specifies a match for a single 12-person team, and the additional player count is set to 2, only 10 players are selected for the match.</p>"
+          "documentation":"<p>The number of player slots in a match to keep open for future players. For example, assume that the configuration's rule set specifies a match for a single 12-person team. If the additional player count is set to 2, only 10 players are initially selected for the match.</p>"
         },
         "CustomEventData":{
           "shape":"CustomEventData",
@@ -3888,27 +4052,42 @@
         },
         "CreationTime":{
           "shape":"Timestamp",
-          "documentation":"<p>Time stamp indicating when this data object was created. Format is a number expressed in Unix time as milliseconds (for example \"1469498468.057\").</p>"
+          "documentation":"<p>The time stamp indicating when this data object was created. The format is a number expressed in Unix time as milliseconds (for example \"1469498468.057\").</p>"
         },
         "GameProperties":{
           "shape":"GamePropertyList",
-          "documentation":"<p>Set of custom properties for a game session, formatted as key:value pairs. These properties are passed to a game server process in the <a>GameSession</a> object with a request to start a new game session (see <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/gamelift-sdk-server-api.html#gamelift-sdk-server-startsession\">Start a Game Session</a>). This information is added to the new <a>GameSession</a> object that is created for a successful match. </p>"
+          "documentation":"<p>A set of custom properties for a game session, formatted as key-value pairs. These properties are passed to a game server process in the <a>GameSession</a> object with a request to start a new game session (see <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/gamelift-sdk-server-api.html#gamelift-sdk-server-startsession\">Start a Game Session</a>). This information is added to the new <a>GameSession</a> object that is created for a successful match. </p>"
         },
         "GameSessionData":{
           "shape":"GameSessionData",
-          "documentation":"<p>Set of custom game session properties, formatted as a single string value. This data is passed to a game server process in the <a>GameSession</a> object with a request to start a new game session (see <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/gamelift-sdk-server-api.html#gamelift-sdk-server-startsession\">Start a Game Session</a>). This information is added to the new <a>GameSession</a> object that is created for a successful match. </p>"
+          "documentation":"<p>A set of custom game session properties, formatted as a single string value. This data is passed to a game server process in the <a>GameSession</a> object with a request to start a new game session (see <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/gamelift-sdk-server-api.html#gamelift-sdk-server-startsession\">Start a Game Session</a>). This information is added to the new <a>GameSession</a> object that is created for a successful match. </p>"
         },
         "BackfillMode":{
           "shape":"BackfillMode",
-          "documentation":"<p>Method used to backfill game sessions created with this matchmaking configuration. MANUAL indicates that the game makes backfill requests or does not use the match backfill feature. AUTOMATIC indicates that GameLift creates <a>StartMatchBackfill</a> requests whenever a game session has one or more open slots. Learn more about manual and automatic backfill in <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/match-backfill.html\">Backfill Existing Games with FlexMatch</a>.</p>"
+          "documentation":"<p>The method used to backfill game sessions created with this matchmaking configuration. MANUAL indicates that the game makes backfill requests or does not use the match backfill feature. AUTOMATIC indicates that GameLift creates <a>StartMatchBackfill</a> requests whenever a game session has one or more open slots. Learn more about manual and automatic backfill in <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/match-backfill.html\">Backfill Existing Games with FlexMatch</a>.</p>"
         }
       },
       "documentation":"<p>Guidelines for use with FlexMatch to match players into games. All matchmaking requests must specify a matchmaking configuration.</p>"
     },
+    "MatchmakingConfigurationArn":{
+      "type":"string",
+      "documentation":"Data type used for Matchmaking Configuration ARN.",
+      "pattern":"^arn:.*:matchmakingconfiguration\\/[a-zA-Z0-9-\\.]*"
+    },
     "MatchmakingConfigurationList":{
       "type":"list",
       "member":{"shape":"MatchmakingConfiguration"}
     },
+    "MatchmakingConfigurationName":{
+      "type":"string",
+      "max":256,
+      "min":1,
+      "pattern":"[a-zA-Z0-9-\\.]*|^arn:.*:matchmakingconfiguration\\/[a-zA-Z0-9-\\.]*"
+    },
+    "MatchmakingConfigurationNameList":{
+      "type":"list",
+      "member":{"shape":"MatchmakingConfigurationName"}
+    },
     "MatchmakingConfigurationStatus":{
       "type":"string",
       "enum":[
@@ -3942,26 +4121,41 @@
       "members":{
         "RuleSetName":{
           "shape":"MatchmakingIdStringModel",
-          "documentation":"<p>Unique identifier for a matchmaking rule set</p>"
+          "documentation":"<p>A unique identifier for a matchmaking rule set</p>"
+        },
+        "RuleSetArn":{
+          "shape":"MatchmakingRuleSetArn",
+          "documentation":"<p>Amazon Resource Name (<a href=\"https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html\">ARN</a>) that is assigned to a GameLift matchmaking rule set resource and uniquely identifies it. ARNs are unique across all Regions. In a GameLift rule set ARN, the resource ID matches the <i>RuleSetName</i> value.</p>"
         },
         "RuleSetBody":{
           "shape":"RuleSetBody",
-          "documentation":"<p>Collection of matchmaking rules, formatted as a JSON string. Comments are not allowed in JSON, but most elements support a description field.</p>"
+          "documentation":"<p>A collection of matchmaking rules, formatted as a JSON string. Comments are not allowed in JSON, but most elements support a description field.</p>"
         },
         "CreationTime":{
           "shape":"Timestamp",
-          "documentation":"<p>Time stamp indicating when this data object was created. Format is a number expressed in Unix time as milliseconds (for example \"1469498468.057\").</p>"
+          "documentation":"<p>The time stamp indicating when this data object was created. The format is a number expressed in Unix time as milliseconds (for example \"1469498468.057\").</p>"
         }
       },
       "documentation":"<p>Set of rule statements, used with FlexMatch, that determine how to build your player matches. Each rule set describes a type of group to be created and defines the parameters for acceptable player matches. Rule sets are used in <a>MatchmakingConfiguration</a> objects.</p> <p>A rule set may define the following elements for a match. For detailed information and examples showing how to construct a rule set, see <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/match-rulesets.html\">Build a FlexMatch Rule Set</a>. </p> <ul> <li> <p>Teams -- Required. A rule set must define one or multiple teams for the match and set minimum and maximum team sizes. For example, a rule set might describe a 4x4 match that requires all eight slots to be filled. </p> </li> <li> <p>Player attributes -- Optional. These attributes specify a set of player characteristics to evaluate when looking for a match. Matchmaking requests that use a rule set with player attributes must provide the corresponding attribute values. For example, an attribute might specify a player's skill or level.</p> </li> <li> <p>Rules -- Optional. Rules define how to evaluate potential players for a match based on player attributes. A rule might specify minimum requirements for individual players, teams, or entire matches. For example, a rule might require each player to meet a certain skill level, each team to have at least one player in a certain role, or the match to have a minimum average skill level. or may describe an entire group--such as all teams must be evenly matched or have at least one player in a certain role. </p> </li> <li> <p>Expansions -- Optional. Expansions allow you to relax the rules after a period of time when no acceptable matches are found. This feature lets you balance getting players into games in a reasonable amount of time instead of making them wait indefinitely for the best possible match. For example, you might use an expansion to increase the maximum skill variance between players after 30 seconds.</p> </li> </ul>"
     },
+    "MatchmakingRuleSetArn":{
+      "type":"string",
+      "documentation":"Data type used for Matchmaking RuleSet ARN.",
+      "pattern":"^arn:.*:matchmakingruleset\\/[a-zA-Z0-9-\\.]*"
+    },
     "MatchmakingRuleSetList":{
       "type":"list",
       "member":{"shape":"MatchmakingRuleSet"}
     },
+    "MatchmakingRuleSetName":{
+      "type":"string",
+      "max":256,
+      "min":1,
+      "pattern":"[a-zA-Z0-9-\\.]*|^arn:.*:matchmakingruleset\\/[a-zA-Z0-9-\\.]*"
+    },
     "MatchmakingRuleSetNameList":{
       "type":"list",
-      "member":{"shape":"MatchmakingIdStringModel"},
+      "member":{"shape":"MatchmakingRuleSetName"},
       "max":10,
       "min":1
     },
@@ -3970,12 +4164,16 @@
       "members":{
         "TicketId":{
           "shape":"MatchmakingIdStringModel",
-          "documentation":"<p>Unique identifier for a matchmaking ticket.</p>"
+          "documentation":"<p>A unique identifier for a matchmaking ticket.</p>"
         },
         "ConfigurationName":{
           "shape":"MatchmakingIdStringModel",
           "documentation":"<p>Name of the <a>MatchmakingConfiguration</a> that is used with this ticket. Matchmaking configurations determine how players are grouped into a match and how a new game session is created for the match.</p>"
         },
+        "ConfigurationArn":{
+          "shape":"MatchmakingConfigurationArn",
+          "documentation":"<p>The Amazon Resource Name (<a href=\"https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html\">ARN</a>) associated with the GameLift matchmaking configuration resource that is used with this ticket.</p>"
+        },
         "Status":{
           "shape":"MatchmakingConfigurationStatus",
           "documentation":"<p>Current status of the matchmaking request.</p> <ul> <li> <p> <b>QUEUED</b> -- The matchmaking request has been received and is currently waiting to be processed.</p> </li> <li> <p> <b>SEARCHING</b> -- The matchmaking request is currently being processed. </p> </li> <li> <p> <b>REQUIRES_ACCEPTANCE</b> -- A match has been proposed and the players must accept the match (see <a>AcceptMatch</a>). This status is used only with requests that use a matchmaking configuration with a player acceptance requirement.</p> </li> <li> <p> <b>PLACING</b> -- The FlexMatch engine has matched players and is in the process of placing a new game session for the match.</p> </li> <li> <p> <b>COMPLETED</b> -- Players have been matched and a game session is ready to host the players. A ticket in this state contains the necessary connection information for players.</p> </li> <li> <p> <b>FAILED</b> -- The matchmaking request was not completed.</p> </li> <li> <p> <b>CANCELLED</b> -- The matchmaking request was canceled. This may be the result of a call to <a>StopMatchmaking</a> or a proposed match that one or more players failed to accept.</p> </li> <li> <p> <b>TIMED_OUT</b> -- The matchmaking request was not successful within the duration specified in the matchmaking configuration. </p> </li> </ul> <note> <p>Matchmaking requests that fail to successfully complete (statuses FAILED, CANCELLED, TIMED_OUT) can be resubmitted as new requests with new ticket IDs.</p> </note>"
@@ -4086,11 +4284,11 @@
       "members":{
         "PlayerId":{
           "shape":"NonZeroAndMaxString",
-          "documentation":"<p>Unique identifier for a player that is associated with this player session.</p>"
+          "documentation":"<p>A unique identifier for a player that is associated with this player session.</p>"
         },
         "PlayerSessionId":{
           "shape":"PlayerSessionId",
-          "documentation":"<p>Unique identifier for a player session.</p>"
+          "documentation":"<p>A unique identifier for a player session.</p>"
         }
       },
       "documentation":"<p>Information about a player session that was created as part of a <a>StartGameSessionPlacement</a> request. This object contains only the player ID and player session ID. To retrieve full details on a player session, call <a>DescribePlayerSessions</a> with the player session ID.</p> <ul> <li> <p> <a>CreatePlayerSession</a> </p> </li> <li> <p> <a>CreatePlayerSessions</a> </p> </li> <li> <p> <a>DescribePlayerSessions</a> </p> </li> <li> <p>Game session placements</p> <ul> <li> <p> <a>StartGameSessionPlacement</a> </p> </li> <li> <p> <a>DescribeGameSessionPlacement</a> </p> </li> <li> <p> <a>StopGameSessionPlacement</a> </p> </li> </ul> </li> </ul>"
@@ -4104,11 +4302,11 @@
       "members":{
         "PlayerId":{
           "shape":"NonZeroAndMaxString",
-          "documentation":"<p>Unique identifier for a player</p>"
+          "documentation":"<p>A unique identifier for a player</p>"
         },
         "PlayerAttributes":{
           "shape":"PlayerAttributeMap",
-          "documentation":"<p>Collection of key:value pairs containing player information for use in matchmaking. Player attribute keys must match the <i>playerAttributes</i> used in a matchmaking rule set. Example: <code>\"PlayerAttributes\": {\"skill\": {\"N\": \"23\"}, \"gameMode\": {\"S\": \"deathmatch\"}}</code>.</p>"
+          "documentation":"<p>A collection of key:value pairs containing player information for use in matchmaking. Player attribute keys must match the <i>playerAttributes</i> used in a matchmaking rule set. Example: <code>\"PlayerAttributes\": {\"skill\": {\"N\": \"23\"}, \"gameMode\": {\"S\": \"deathmatch\"}}</code>.</p>"
         },
         "Team":{
           "shape":"NonZeroAndMaxString",
@@ -4116,7 +4314,7 @@
         },
         "LatencyInMs":{
           "shape":"LatencyMap",
-          "documentation":"<p>Set of values, expressed in milliseconds, indicating the amount of latency that a player experiences when connected to AWS regions. If this property is present, FlexMatch considers placing the match only in regions for which latency is reported. </p> <p>If a matchmaker has a rule that evaluates player latency, players must report latency in order to be matched. If no latency is reported in this scenario, FlexMatch assumes that no regions are available to the player and the ticket is not matchable. </p>"
+          "documentation":"<p>Set of values, expressed in milliseconds, indicating the amount of latency that a player experiences when connected to AWS Regions. If this property is present, FlexMatch considers placing the match only in Regions for which latency is reported. </p> <p>If a matchmaker has a rule that evaluates player latency, players must report latency in order to be matched. If no latency is reported in this scenario, FlexMatch assumes that no Regions are available to the player and the ticket is not matchable. </p>"
         }
       },
       "documentation":"<p>Represents a player in matchmaking. When starting a matchmaking request, a player has a player ID, attributes, and may have latency data. Team information is added after a match has been successfully completed.</p>"
@@ -4147,18 +4345,18 @@
       "members":{
         "PlayerId":{
           "shape":"NonZeroAndMaxString",
-          "documentation":"<p>Unique identifier for a player associated with the latency data.</p>"
+          "documentation":"<p>A unique identifier for a player associated with the latency data.</p>"
         },
         "RegionIdentifier":{
           "shape":"NonZeroAndMaxString",
-          "documentation":"<p>Name of the region that is associated with the latency value.</p>"
+          "documentation":"<p>Name of the Region that is associated with the latency value.</p>"
         },
         "LatencyInMilliseconds":{
           "shape":"Float",
-          "documentation":"<p>Amount of time that represents the time lag experienced by the player when connected to the specified region.</p>"
+          "documentation":"<p>Amount of time that represents the time lag experienced by the player when connected to the specified Region.</p>"
         }
       },
-      "documentation":"<p>Regional latency information for a player, used when requesting a new game session with <a>StartGameSessionPlacement</a>. This value indicates the amount of time lag that exists when the player is connected to a fleet in the specified region. The relative difference between a player's latency values for multiple regions are used to determine which fleets are best suited to place a new game session for the player. </p>"
+      "documentation":"<p>Regional latency information for a player, used when requesting a new game session with <a>StartGameSessionPlacement</a>. This value indicates the amount of time lag that exists when the player is connected to a fleet in the specified Region. The relative difference between a player's latency values for multiple Regions are used to determine which fleets are best suited to place a new game session for the player. </p>"
     },
     "PlayerLatencyList":{
       "type":"list",
@@ -4176,7 +4374,7 @@
           "documentation":"<p>The length of time, in seconds, that the policy is enforced while placing a new game session. A null value for this property means that the policy is enforced until the queue times out.</p>"
         }
       },
-      "documentation":"<p>Queue setting that determines the highest latency allowed for individual players when placing a game session. When a latency policy is in force, a game session cannot be placed at any destination in a region where a player is reporting latency higher than the cap. Latency policies are only enforced when the placement request contains player latency information.</p> <ul> <li> <p> <a>CreateGameSessionQueue</a> </p> </li> <li> <p> <a>DescribeGameSessionQueues</a> </p> </li> <li> <p> <a>UpdateGameSessionQueue</a> </p> </li> <li> <p> <a>DeleteGameSessionQueue</a> </p> </li> </ul>"
+      "documentation":"<p>Queue setting that determines the highest latency allowed for individual players when placing a game session. When a latency policy is in force, a game session cannot be placed with any fleet in a Region where a player reports latency higher than the cap. Latency policies are only enforced when the placement request contains player latency information.</p> <ul> <li> <p> <a>CreateGameSessionQueue</a> </p> </li> <li> <p> <a>DescribeGameSessionQueues</a> </p> </li> <li> <p> <a>UpdateGameSessionQueue</a> </p> </li> <li> <p> <a>DeleteGameSessionQueue</a> </p> </li> </ul>"
     },
     "PlayerLatencyPolicyList":{
       "type":"list",
@@ -4191,19 +4389,23 @@
       "members":{
         "PlayerSessionId":{
           "shape":"PlayerSessionId",
-          "documentation":"<p>Unique identifier for a player session.</p>"
+          "documentation":"<p>A unique identifier for a player session.</p>"
         },
         "PlayerId":{
           "shape":"NonZeroAndMaxString",
-          "documentation":"<p>Unique identifier for a player that is associated with this player session.</p>"
+          "documentation":"<p>A unique identifier for a player that is associated with this player session.</p>"
         },
         "GameSessionId":{
           "shape":"NonZeroAndMaxString",
-          "documentation":"<p>Unique identifier for the game session that the player session is connected to.</p>"
+          "documentation":"<p>A unique identifier for the game session that the player session is connected to.</p>"
         },
         "FleetId":{
           "shape":"FleetId",
-          "documentation":"<p>Unique identifier for a fleet that the player's game session is running on.</p>"
+          "documentation":"<p>A unique identifier for a fleet that the player's game session is running on.</p>"
+        },
+        "FleetArn":{
+          "shape":"ArnStringModel",
+          "documentation":"<p> The Amazon Resource Name (<a href=\"https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html\">ARN</a>) associated with the GameLift fleet that the player's game session is running on. </p>"
         },
         "CreationTime":{
           "shape":"Timestamp",
@@ -4219,9 +4421,12 @@
         },
         "IpAddress":{
           "shape":"IpAddress",
-          "documentation":"<p>IP address of the game session. To connect to a Amazon GameLift game server, an app needs both the IP address and port number.</p>"
+          "documentation":"<p>IP address of the instance that is running the game session. When connecting to a Amazon GameLift game server, a client needs to reference an IP address (or DNS name) and port number.</p>"
+        },
+        "DnsName":{
+          "shape":"DnsName",
+          "documentation":"<p>DNS identifier assigned to the instance that is running the game session. Values have the following format:</p> <ul> <li> <p>TLS-enabled fleets: <code>&lt;unique identifier&gt;.&lt;region identifier&gt;.amazongamelift.com</code>.</p> </li> <li> <p>Non-TLS-enabled fleets: <code>ec2-&lt;unique identifier&gt;.compute.amazonaws.com</code>. (See <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-instance-addressing.html#concepts-public-addresses\">Amazon EC2 Instance IP Addressing</a>.)</p> </li> </ul> <p>When connecting to a game session that is running on a TLS-enabled fleet, you must use the DNS name, not the IP address.</p>"
         },
-        "DnsName":{"shape":"DnsName"},
         "Port":{
           "shape":"PortNumber",
           "documentation":"<p>Port number for the game session. To connect to a Amazon GameLift server process, an app needs both the IP address and port number.</p>"
@@ -4294,11 +4499,11 @@
       "members":{
         "Name":{
           "shape":"NonZeroAndMaxString",
-          "documentation":"<p>Descriptive label that is associated with a scaling policy. Policy names do not need to be unique. A fleet can have only one scaling policy with the same name.</p>"
+          "documentation":"<p>A descriptive label that is associated with a scaling policy. Policy names do not need to be unique. A fleet can have only one scaling policy with the same name.</p>"
         },
         "FleetId":{
           "shape":"FleetId",
-          "documentation":"<p>Unique identifier for a fleet to apply this policy to. The fleet cannot be in any of the following statuses: ERROR or DELETING.</p>"
+          "documentation":"<p>A unique identifier for a fleet to apply this policy to. You can use either the fleet ID or ARN value. The fleet cannot be in any of the following statuses: ERROR or DELETING.</p>"
         },
         "ScalingAdjustment":{
           "shape":"Integer",
@@ -4306,7 +4511,7 @@
         },
         "ScalingAdjustmentType":{
           "shape":"ScalingAdjustmentType",
-          "documentation":"<p>Type of adjustment to make to a fleet's instance count (see <a>FleetCapacity</a>):</p> <ul> <li> <p> <b>ChangeInCapacity</b> -- add (or subtract) the scaling adjustment value from the current instance count. Positive values scale up while negative values scale down.</p> </li> <li> <p> <b>ExactCapacity</b> -- set the instance count to the scaling adjustment value.</p> </li> <li> <p> <b>PercentChangeInCapacity</b> -- increase or reduce the current instance count by the scaling adjustment, read as a percentage. Positive values scale up while negative values scale down; for example, a value of \"-10\" scales the fleet down by 10%.</p> </li> </ul>"
+          "documentation":"<p>The type of adjustment to make to a fleet's instance count (see <a>FleetCapacity</a>):</p> <ul> <li> <p> <b>ChangeInCapacity</b> -- add (or subtract) the scaling adjustment value from the current instance count. Positive values scale up while negative values scale down.</p> </li> <li> <p> <b>ExactCapacity</b> -- set the instance count to the scaling adjustment value.</p> </li> <li> <p> <b>PercentChangeInCapacity</b> -- increase or reduce the current instance count by the scaling adjustment, read as a percentage. Positive values scale up while negative values scale down; for example, a value of \"-10\" scales the fleet down by 10%.</p> </li> </ul>"
         },
         "Threshold":{
           "shape":"Double",
@@ -4326,11 +4531,11 @@
         },
         "PolicyType":{
           "shape":"PolicyType",
-          "documentation":"<p>Type of scaling policy to create. For a target-based policy, set the parameter <i>MetricName</i> to 'PercentAvailableGameSessions' and specify a <i>TargetConfiguration</i>. For a rule-based policy set the following parameters: <i>MetricName</i>, <i>ComparisonOperator</i>, <i>Threshold</i>, <i>EvaluationPeriods</i>, <i>ScalingAdjustmentType</i>, and <i>ScalingAdjustment</i>.</p>"
+          "documentation":"<p>The type of scaling policy to create. For a target-based policy, set the parameter <i>MetricName</i> to 'PercentAvailableGameSessions' and specify a <i>TargetConfiguration</i>. For a rule-based policy set the following parameters: <i>MetricName</i>, <i>ComparisonOperator</i>, <i>Threshold</i>, <i>EvaluationPeriods</i>, <i>ScalingAdjustmentType</i>, and <i>ScalingAdjustment</i>.</p>"
         },
         "TargetConfiguration":{
           "shape":"TargetConfiguration",
-          "documentation":"<p>Object that contains settings for a target-based scaling policy.</p>"
+          "documentation":"<p>The settings for a target-based scaling policy.</p>"
         }
       },
       "documentation":"<p>Represents the input for a request action.</p>"
@@ -4340,7 +4545,7 @@
       "members":{
         "Name":{
           "shape":"NonZeroAndMaxString",
-          "documentation":"<p>Descriptive label that is associated with a scaling policy. Policy names do not need to be unique.</p>"
+          "documentation":"<p>A descriptive label that is associated with a scaling policy. Policy names do not need to be unique.</p>"
         }
       },
       "documentation":"<p>Represents the returned data in response to a request action.</p>"
@@ -4355,7 +4560,7 @@
       "members":{
         "BuildId":{
           "shape":"BuildId",
-          "documentation":"<p>Unique identifier for a build to get credentials for.</p>"
+          "documentation":"<p>A unique identifier for a build to get credentials for. You can use either the build ID or ARN value. </p>"
         }
       },
       "documentation":"<p>Represents the input for a request action.</p>"
@@ -4380,7 +4585,7 @@
       "members":{
         "AliasId":{
           "shape":"AliasId",
-          "documentation":"<p>Unique identifier for the alias you want to resolve.</p>"
+          "documentation":"<p>The unique identifier of the alias that you want to retrieve a fleet ID for. You can use either the alias ID or ARN value.</p>"
         }
       },
       "documentation":"<p>Represents the input for a request action.</p>"
@@ -4390,7 +4595,11 @@
       "members":{
         "FleetId":{
           "shape":"FleetId",
-          "documentation":"<p>Fleet identifier that is associated with the requested alias.</p>"
+          "documentation":"<p>The fleet identifier that the alias is pointing to.</p>"
+        },
+        "FleetArn":{
+          "shape":"ArnStringModel",
+          "documentation":"<p> The Amazon Resource Name (<a href=\"https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html\">ARN</a>) associated with the GameLift fleet resource that this alias points to. </p>"
         }
       },
       "documentation":"<p>Represents the returned data in response to a request action.</p>"
@@ -4400,32 +4609,32 @@
       "members":{
         "NewGameSessionsPerCreator":{
           "shape":"WholeNumber",
-          "documentation":"<p>Maximum number of game sessions that an individual can create during the policy period. </p>"
+          "documentation":"<p>The maximum number of game sessions that an individual can create during the policy period. </p>"
         },
         "PolicyPeriodInMinutes":{
           "shape":"WholeNumber",
-          "documentation":"<p>Time span used in evaluating the resource creation limit policy. </p>"
+          "documentation":"<p>The time span used in evaluating the resource creation limit policy. </p>"
         }
       },
-      "documentation":"<p>Policy that limits the number of game sessions a player can create on the same fleet. This optional policy gives game owners control over how players can consume available game server resources. A resource creation policy makes the following statement: \"An individual player can create a maximum number of new game sessions within a specified time period\".</p> <p>The policy is evaluated when a player tries to create a new game session. For example, with a policy of 10 new game sessions and a time period of 60 minutes, on receiving a <code>CreateGameSession</code> request, Amazon GameLift checks that the player (identified by <code>CreatorId</code>) has created fewer than 10 game sessions in the past 60 minutes.</p>"
+      "documentation":"<p>A policy that limits the number of game sessions a player can create on the same fleet. This optional policy gives game owners control over how players can consume available game server resources. A resource creation policy makes the following statement: \"An individual player can create a maximum number of new game sessions within a specified time period\".</p> <p>The policy is evaluated when a player tries to create a new game session. For example: Assume you have a policy of 10 new game sessions and a time period of 60 minutes. On receiving a <code>CreateGameSession</code> request, Amazon GameLift checks that the player (identified by <code>CreatorId</code>) has created fewer than 10 game sessions in the past 60 minutes.</p>"
     },
     "RoutingStrategy":{
       "type":"structure",
       "members":{
         "Type":{
           "shape":"RoutingStrategyType",
-          "documentation":"<p>Type of routing strategy.</p> <p>Possible routing types include the following:</p> <ul> <li> <p> <b>SIMPLE</b> -- The alias resolves to one specific fleet. Use this type when routing to active fleets.</p> </li> <li> <p> <b>TERMINAL</b> -- The alias does not resolve to a fleet but instead can be used to display a message to the user. A terminal alias throws a TerminalRoutingStrategyException with the <a>RoutingStrategy</a> message embedded.</p> </li> </ul>"
+          "documentation":"<p>The type of routing strategy for the alias.</p> <p>Possible routing types include the following:</p> <ul> <li> <p> <b>SIMPLE</b> - The alias resolves to one specific fleet. Use this type when routing to active fleets.</p> </li> <li> <p> <b>TERMINAL</b> - The alias does not resolve to a fleet but instead can be used to display a message to the user. A terminal alias throws a TerminalRoutingStrategyException with the <a>RoutingStrategy</a> message embedded.</p> </li> </ul>"
         },
         "FleetId":{
           "shape":"FleetId",
-          "documentation":"<p>Unique identifier for a fleet that the alias points to.</p>"
+          "documentation":"<p>The unique identifier for a fleet that the alias points to. This value is the fleet ID, not the fleet ARN.</p>"
         },
         "Message":{
           "shape":"FreeText",
-          "documentation":"<p>Message text to be used with a terminal routing strategy.</p>"
+          "documentation":"<p>The message text to be used with a terminal routing strategy.</p>"
         }
       },
-      "documentation":"<p>Routing configuration for a fleet alias.</p> <ul> <li> <p> <a>CreateAlias</a> </p> </li> <li> <p> <a>ListAliases</a> </p> </li> <li> <p> <a>DescribeAlias</a> </p> </li> <li> <p> <a>UpdateAlias</a> </p> </li> <li> <p> <a>DeleteAlias</a> </p> </li> <li> <p> <a>ResolveAlias</a> </p> </li> </ul>"
+      "documentation":"<p>The routing configuration for a fleet alias.</p> <ul> <li> <p> <a>CreateAlias</a> </p> </li> <li> <p> <a>ListAliases</a> </p> </li> <li> <p> <a>DescribeAlias</a> </p> </li> <li> <p> <a>UpdateAlias</a> </p> </li> <li> <p> <a>DeleteAlias</a> </p> </li> <li> <p> <a>ResolveAlias</a> </p> </li> </ul>"
     },
     "RoutingStrategyType":{
       "type":"string",
@@ -4449,40 +4658,40 @@
       "members":{
         "ServerProcesses":{
           "shape":"ServerProcessList",
-          "documentation":"<p>Collection of server process configurations that describe which server processes to run on each instance in a fleet.</p>"
+          "documentation":"<p>A collection of server process configurations that describe which server processes to run on each instance in a fleet.</p>"
         },
         "MaxConcurrentGameSessionActivations":{
           "shape":"MaxConcurrentGameSessionActivations",
-          "documentation":"<p>Maximum number of game sessions with status <code>ACTIVATING</code> to allow on an instance simultaneously. This setting limits the amount of instance resources that can be used for new game activations at any one time.</p>"
+          "documentation":"<p>The maximum number of game sessions with status <code>ACTIVATING</code> to allow on an instance simultaneously. This setting limits the amount of instance resources that can be used for new game activations at any one time.</p>"
         },
         "GameSessionActivationTimeoutSeconds":{
           "shape":"GameSessionActivationTimeoutSeconds",
-          "documentation":"<p>Maximum amount of time (in seconds) that a game session can remain in status <code>ACTIVATING</code>. If the game session is not active before the timeout, activation is terminated and the game session status is changed to <code>TERMINATED</code>.</p>"
+          "documentation":"<p>The maximum amount of time (in seconds) that a game session can remain in status <code>ACTIVATING</code>. If the game session is not active before the timeout, activation is terminated and the game session status is changed to <code>TERMINATED</code>.</p>"
         }
       },
-      "documentation":"<p>A collection of server process configurations that describe what processes to run on each instance in a fleet. Server processes run either a custom game build executable or a Realtime Servers script. Each instance in the fleet starts the specified server processes and continues to start new processes as existing processes end. An instance regularly checks for an updated run-time configuration. </p> <p>The run-time configuration enables the instances in a fleet to run multiple processes simultaneously. Learn more about <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/fleets-multiprocess.html\"> Running Multiple Processes on a Fleet </a>.</p> <p>A Amazon GameLift instance is limited to 50 processes running simultaneously. To calculate the total number of processes in a run-time configuration, add the values of the <code>ConcurrentExecutions</code> parameter for each <a>ServerProcess</a> object.</p> <ul> <li> <p> <a>CreateFleet</a> </p> </li> <li> <p> <a>ListFleets</a> </p> </li> <li> <p> <a>DeleteFleet</a> </p> </li> <li> <p>Describe fleets:</p> <ul> <li> <p> <a>DescribeFleetAttributes</a> </p> </li> <li> <p> <a>DescribeFleetCapacity</a> </p> </li> <li> <p> <a>DescribeFleetPortSettings</a> </p> </li> <li> <p> <a>DescribeFleetUtilization</a> </p> </li> <li> <p> <a>DescribeRuntimeConfiguration</a> </p> </li> <li> <p> <a>DescribeEC2InstanceLimits</a> </p> </li> <li> <p> <a>DescribeFleetEvents</a> </p> </li> </ul> </li> <li> <p>Update fleets:</p> <ul> <li> <p> <a>UpdateFleetAttributes</a> </p> </li> <li> <p> <a>UpdateFleetCapacity</a> </p> </li> <li> <p> <a>UpdateFleetPortSettings</a> </p> </li> <li> <p> <a>UpdateRuntimeConfiguration</a> </p> </li> </ul> </li> <li> <p>Manage fleet actions:</p> <ul> <li> <p> <a>StartFleetActions</a> </p> </li> <li> <p> <a>StopFleetActions</a> </p> </li> </ul> </li> </ul>"
+      "documentation":"<p>A collection of server process configurations that describe what processes to run on each instance in a fleet. Server processes run either a custom game build executable or a Realtime Servers script. Each instance in the fleet starts the specified server processes and continues to start new processes as existing processes end. Each instance regularly checks for an updated runtime configuration. </p> <p>The runtime configuration enables the instances in a fleet to run multiple processes simultaneously. Learn more about <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/fleets-multiprocess.html\"> Running Multiple Processes on a Fleet </a>.</p> <p>A Amazon GameLift instance is limited to 50 processes running simultaneously. To calculate the total number of processes in a runtime configuration, add the values of the <code>ConcurrentExecutions</code> parameter for each <a>ServerProcess</a> object.</p> <ul> <li> <p> <a>CreateFleet</a> </p> </li> <li> <p> <a>ListFleets</a> </p> </li> <li> <p> <a>DeleteFleet</a> </p> </li> <li> <p> <a>DescribeFleetAttributes</a> </p> </li> <li> <p> <a>UpdateFleetAttributes</a> </p> </li> <li> <p>Manage fleet actions:</p> <ul> <li> <p> <a>StartFleetActions</a> </p> </li> <li> <p> <a>StopFleetActions</a> </p> </li> </ul> </li> </ul>"
     },
     "S3Location":{
       "type":"structure",
       "members":{
         "Bucket":{
           "shape":"NonEmptyString",
-          "documentation":"<p>Amazon S3 bucket identifier. This is the name of the S3 bucket.</p>"
+          "documentation":"<p>An Amazon S3 bucket identifier. This is the name of the S3 bucket.</p>"
         },
         "Key":{
           "shape":"NonEmptyString",
-          "documentation":"<p>Name of the zip file containing the build files or script files. </p>"
+          "documentation":"<p>The name of the zip file that contains the build files or script files. </p>"
         },
         "RoleArn":{
           "shape":"NonEmptyString",
-          "documentation":"<p>Amazon Resource Name (<a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/s3-arn-format.html\">ARN</a>) for an IAM role that allows Amazon GameLift to access the S3 bucket.</p>"
+          "documentation":"<p>The Amazon Resource Name (<a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/s3-arn-format.html\">ARN</a>) for an IAM role that allows Amazon GameLift to access the S3 bucket.</p>"
         },
         "ObjectVersion":{
           "shape":"NonEmptyString",
-          "documentation":"<p>Version of the file, if object versioning is turned on for the bucket. Amazon GameLift uses this information when retrieving files from an S3 bucket that you own. Use this parameter to specify a specific version of the file; if not set, the latest version of the file is retrieved. </p>"
+          "documentation":"<p>The version of the file, if object versioning is turned on for the bucket. Amazon GameLift uses this information when retrieving files from an S3 bucket that you own. Use this parameter to specify a specific version of the file. If not set, the latest version of the file is retrieved. </p>"
         }
       },
-      "documentation":"<p>Location in Amazon Simple Storage Service (Amazon S3) where build or script files are stored for access by Amazon GameLift. This location is specified in <a>CreateBuild</a>, <a>CreateScript</a>, and <a>UpdateScript</a> requests. </p>"
+      "documentation":"<p>The location in Amazon S3 where build or script files are stored for access by Amazon GameLift. This location is specified in <a>CreateBuild</a>, <a>CreateScript</a>, and <a>UpdateScript</a> requests. </p>"
     },
     "ScalingAdjustmentType":{
       "type":"string",
@@ -4497,11 +4706,11 @@
       "members":{
         "FleetId":{
           "shape":"FleetId",
-          "documentation":"<p>Unique identifier for a fleet that is associated with this scaling policy.</p>"
+          "documentation":"<p>A unique identifier for a fleet that is associated with this scaling policy.</p>"
         },
         "Name":{
           "shape":"NonZeroAndMaxString",
-          "documentation":"<p>Descriptive label that is associated with a scaling policy. Policy names do not need to be unique.</p>"
+          "documentation":"<p>A descriptive label that is associated with a scaling policy. Policy names do not need to be unique.</p>"
         },
         "Status":{
           "shape":"ScalingStatusType",
@@ -4513,7 +4722,7 @@
         },
         "ScalingAdjustmentType":{
           "shape":"ScalingAdjustmentType",
-          "documentation":"<p>Type of adjustment to make to a fleet's instance count (see <a>FleetCapacity</a>):</p> <ul> <li> <p> <b>ChangeInCapacity</b> -- add (or subtract) the scaling adjustment value from the current instance count. Positive values scale up while negative values scale down.</p> </li> <li> <p> <b>ExactCapacity</b> -- set the instance count to the scaling adjustment value.</p> </li> <li> <p> <b>PercentChangeInCapacity</b> -- increase or reduce the current instance count by the scaling adjustment, read as a percentage. Positive values scale up while negative values scale down.</p> </li> </ul>"
+          "documentation":"<p>The type of adjustment to make to a fleet's instance count (see <a>FleetCapacity</a>):</p> <ul> <li> <p> <b>ChangeInCapacity</b> -- add (or subtract) the scaling adjustment value from the current instance count. Positive values scale up while negative values scale down.</p> </li> <li> <p> <b>ExactCapacity</b> -- set the instance count to the scaling adjustment value.</p> </li> <li> <p> <b>PercentChangeInCapacity</b> -- increase or reduce the current instance count by the scaling adjustment, read as a percentage. Positive values scale up while negative values scale down.</p> </li> </ul>"
         },
         "ComparisonOperator":{
           "shape":"ComparisonOperatorType",
@@ -4533,11 +4742,11 @@
         },
         "PolicyType":{
           "shape":"PolicyType",
-          "documentation":"<p>Type of scaling policy to create. For a target-based policy, set the parameter <i>MetricName</i> to 'PercentAvailableGameSessions' and specify a <i>TargetConfiguration</i>. For a rule-based policy set the following parameters: <i>MetricName</i>, <i>ComparisonOperator</i>, <i>Threshold</i>, <i>EvaluationPeriods</i>, <i>ScalingAdjustmentType</i>, and <i>ScalingAdjustment</i>.</p>"
+          "documentation":"<p>The type of scaling policy to create. For a target-based policy, set the parameter <i>MetricName</i> to 'PercentAvailableGameSessions' and specify a <i>TargetConfiguration</i>. For a rule-based policy set the following parameters: <i>MetricName</i>, <i>ComparisonOperator</i>, <i>Threshold</i>, <i>EvaluationPeriods</i>, <i>ScalingAdjustmentType</i>, and <i>ScalingAdjustment</i>.</p>"
         },
         "TargetConfiguration":{
           "shape":"TargetConfiguration",
-          "documentation":"<p>Object that contains settings for a target-based scaling policy.</p>"
+          "documentation":"<p>The settings for a target-based scaling policy.</p>"
         }
       },
       "documentation":"<p>Rule that controls how a fleet is scaled. Scaling policies are uniquely identified by the combination of name and fleet ID.</p> <ul> <li> <p> <a>DescribeFleetCapacity</a> </p> </li> <li> <p> <a>UpdateFleetCapacity</a> </p> </li> <li> <p> <a>DescribeEC2InstanceLimits</a> </p> </li> <li> <p>Manage scaling policies:</p> <ul> <li> <p> <a>PutScalingPolicy</a> (auto-scaling)</p> </li> <li> <p> <a>DescribeScalingPolicies</a> (auto-scaling)</p> </li> <li> <p> <a>DeleteScalingPolicy</a> (auto-scaling)</p> </li> </ul> </li> <li> <p>Manage fleet actions:</p> <ul> <li> <p> <a>StartFleetActions</a> </p> </li> <li> <p> <a>StopFleetActions</a> </p> </li> </ul> </li> </ul>"
@@ -4563,31 +4772,39 @@
       "members":{
         "ScriptId":{
           "shape":"ScriptId",
-          "documentation":"<p>Unique identifier for a Realtime script</p>"
+          "documentation":"<p>A unique identifier for a Realtime script</p>"
+        },
+        "ScriptArn":{
+          "shape":"ScriptArn",
+          "documentation":"<p>Amazon Resource Name (<a href=\"https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html\">ARN</a>) that is assigned to a GameLift script resource and uniquely identifies it. ARNs are unique across all Regions. In a GameLift script ARN, the resource ID matches the <i>ScriptId</i> value.</p>"
         },
         "Name":{
           "shape":"NonZeroAndMaxString",
-          "documentation":"<p>Descriptive label that is associated with a script. Script names do not need to be unique.</p>"
+          "documentation":"<p>A descriptive label that is associated with a script. Script names do not need to be unique.</p>"
         },
         "Version":{
           "shape":"NonZeroAndMaxString",
-          "documentation":"<p>Version that is associated with a build or script. Version strings do not need to be unique.</p>"
+          "documentation":"<p>The version that is associated with a build or script. Version strings do not need to be unique.</p>"
         },
         "SizeOnDisk":{
           "shape":"PositiveLong",
-          "documentation":"<p>File size of the uploaded Realtime script, expressed in bytes. When files are uploaded from an S3 location, this value remains at \"0\".</p>"
+          "documentation":"<p>The file size of the uploaded Realtime script, expressed in bytes. When files are uploaded from an S3 location, this value remains at \"0\".</p>"
         },
         "CreationTime":{
           "shape":"Timestamp",
-          "documentation":"<p>Time stamp indicating when this data object was created. Format is a number expressed in Unix time as milliseconds (for example \"1469498468.057\").</p>"
+          "documentation":"<p>A time stamp indicating when this data object was created. The format is a number expressed in Unix time as milliseconds (for example \"1469498468.057\").</p>"
         },
         "StorageLocation":{"shape":"S3Location"}
       },
       "documentation":"<p>Properties describing a Realtime script.</p> <p> <b>Related operations</b> </p> <ul> <li> <p> <a>CreateScript</a> </p> </li> <li> <p> <a>ListScripts</a> </p> </li> <li> <p> <a>DescribeScript</a> </p> </li> <li> <p> <a>UpdateScript</a> </p> </li> <li> <p> <a>DeleteScript</a> </p> </li> </ul>"
     },
+    "ScriptArn":{
+      "type":"string",
+      "pattern":"^arn:.*:script\\/script-\\S+"
+    },
     "ScriptId":{
       "type":"string",
-      "pattern":"^script-\\S+|^arn:.*script-\\S+"
+      "pattern":"^script-\\S+|^arn:.*:script\\/script-\\S+"
     },
     "ScriptList":{
       "type":"list",
@@ -4598,11 +4815,11 @@
       "members":{
         "FleetId":{
           "shape":"FleetId",
-          "documentation":"<p>Unique identifier for a fleet to search for active game sessions. Each request must reference either a fleet ID or alias ID, but not both.</p>"
+          "documentation":"<p>A unique identifier for a fleet to search for active game sessions. You can use either the fleet ID or ARN value. Each request must reference either a fleet ID or alias ID, but not both.</p>"
         },
         "AliasId":{
           "shape":"AliasId",
-          "documentation":"<p>Unique identifier for an alias associated with the fleet to search for active game sessions. Each request must reference either a fleet ID or alias ID, but not both.</p>"
+          "documentation":"<p>A unique identifier for an alias associated with the fleet to search for active game sessions. You can use either the alias ID or ARN value. Each request must reference either a fleet ID or alias ID, but not both.</p>"
         },
         "FilterExpression":{
           "shape":"NonZeroAndMaxString",
@@ -4614,7 +4831,7 @@
         },
         "Limit":{
           "shape":"PositiveInteger",
-          "documentation":"<p>Maximum number of results to return. Use this parameter with <code>NextToken</code> to get results as a set of sequential pages. The maximum number of results returned is 20, even if this value is not set or is set higher than 20. </p>"
+          "documentation":"<p>The maximum number of results to return. Use this parameter with <code>NextToken</code> to get results as a set of sequential pages. The maximum number of results returned is 20, even if this value is not set or is set higher than 20. </p>"
         },
         "NextToken":{
           "shape":"NonZeroAndMaxString",
@@ -4628,7 +4845,7 @@
       "members":{
         "GameSessions":{
           "shape":"GameSessionList",
-          "documentation":"<p>Collection of objects containing game session properties for each session matching the request.</p>"
+          "documentation":"<p>A collection of objects containing game session properties for each session matching the request.</p>"
         },
         "NextToken":{
           "shape":"NonZeroAndMaxString",
@@ -4646,15 +4863,15 @@
       "members":{
         "LaunchPath":{
           "shape":"NonZeroAndMaxString",
-          "documentation":"<p>Location of the server executable in a custom game build or the name of the Realtime script file that contains the <code>Init()</code> function. Game builds and Realtime scripts are installed on instances at the root: </p> <ul> <li> <p>Windows (for custom game builds only): <code>C:\\game</code>. Example: \"<code>C:\\game\\MyGame\\server.exe</code>\" </p> </li> <li> <p>Linux: <code>/local/game</code>. Examples: \"<code>/local/game/MyGame/server.exe</code>\" or \"<code>/local/game/MyRealtimeScript.js</code>\"</p> </li> </ul>"
+          "documentation":"<p>The location of the server executable in a custom game build or the name of the Realtime script file that contains the <code>Init()</code> function. Game builds and Realtime scripts are installed on instances at the root: </p> <ul> <li> <p>Windows (for custom game builds only): <code>C:\\game</code>. Example: \"<code>C:\\game\\MyGame\\server.exe</code>\" </p> </li> <li> <p>Linux: <code>/local/game</code>. Examples: \"<code>/local/game/MyGame/server.exe</code>\" or \"<code>/local/game/MyRealtimeScript.js</code>\"</p> </li> </ul>"
         },
         "Parameters":{
           "shape":"NonZeroAndMaxString",
-          "documentation":"<p>Optional list of parameters to pass to the server executable or Realtime script on launch.</p>"
+          "documentation":"<p>An optional list of parameters to pass to the server executable or Realtime script on launch.</p>"
         },
         "ConcurrentExecutions":{
           "shape":"PositiveInteger",
-          "documentation":"<p>Number of server processes using this configuration to run concurrently on an instance.</p>"
+          "documentation":"<p>The number of server processes that use this configuration to run concurrently on an instance.</p>"
         }
       },
       "documentation":"<p>A set of instructions for launching server processes on each instance in a fleet. Server processes run either a custom game build executable or a Realtime Servers script. Each instruction set identifies the location of the custom game build executable or Realtime launch script, optional launch parameters, and the number of server processes with this configuration to maintain concurrently on the instance. Server process configurations make up a fleet's <code> <a>RuntimeConfiguration</a> </code>.</p>"
@@ -4680,7 +4897,7 @@
       "members":{
         "FleetId":{
           "shape":"FleetId",
-          "documentation":"<p>Unique identifier for a fleet</p>"
+          "documentation":"<p>A unique identifier for a fleet to start actions on. You can use either the fleet ID or ARN value.</p>"
         },
         "Actions":{
           "shape":"FleetActionList",
@@ -4703,11 +4920,11 @@
       "members":{
         "PlacementId":{
           "shape":"IdStringModel",
-          "documentation":"<p>Unique identifier to assign to the new game session placement. This value is developer-defined. The value must be unique across all regions and cannot be reused unless you are resubmitting a canceled or timed-out placement request.</p>"
+          "documentation":"<p>A unique identifier to assign to the new game session placement. This value is developer-defined. The value must be unique across all Regions and cannot be reused unless you are resubmitting a canceled or timed-out placement request.</p>"
         },
         "GameSessionQueueName":{
           "shape":"GameSessionQueueName",
-          "documentation":"<p>Name of the queue to use to place the new game session.</p>"
+          "documentation":"<p>Name of the queue to use to place the new game session. You can use either the qieue name or ARN value. </p>"
         },
         "GameProperties":{
           "shape":"GamePropertyList",
@@ -4715,15 +4932,15 @@
         },
         "MaximumPlayerSessionCount":{
           "shape":"WholeNumber",
-          "documentation":"<p>Maximum number of players that can be connected simultaneously to the game session.</p>"
+          "documentation":"<p>The maximum number of players that can be connected simultaneously to the game session.</p>"
         },
         "GameSessionName":{
           "shape":"NonZeroAndMaxString",
-          "documentation":"<p>Descriptive label that is associated with a game session. Session names do not need to be unique.</p>"
+          "documentation":"<p>A descriptive label that is associated with a game session. Session names do not need to be unique.</p>"
         },
         "PlayerLatencies":{
           "shape":"PlayerLatencyList",
-          "documentation":"<p>Set of values, expressed in milliseconds, indicating the amount of latency that a player experiences when connected to AWS regions. This information is used to try to place the new game session where it can offer the best possible gameplay experience for the players. </p>"
+          "documentation":"<p>Set of values, expressed in milliseconds, indicating the amount of latency that a player experiences when connected to AWS Regions. This information is used to try to place the new game session where it can offer the best possible gameplay experience for the players. </p>"
         },
         "DesiredPlayerSessions":{
           "shape":"DesiredPlayerSessionList",
@@ -4756,19 +4973,19 @@
       "members":{
         "TicketId":{
           "shape":"MatchmakingIdStringModel",
-          "documentation":"<p>Unique identifier for a matchmaking ticket. If no ticket ID is specified here, Amazon GameLift will generate one in the form of a UUID. Use this identifier to track the match backfill ticket status and retrieve match results.</p>"
+          "documentation":"<p>A unique identifier for a matchmaking ticket. If no ticket ID is specified here, Amazon GameLift will generate one in the form of a UUID. Use this identifier to track the match backfill ticket status and retrieve match results.</p>"
         },
         "ConfigurationName":{
-          "shape":"MatchmakingIdStringModel",
-          "documentation":"<p>Name of the matchmaker to use for this request. The name of the matchmaker that was used with the original game session is listed in the <a>GameSession</a> object, <code>MatchmakerData</code> property. This property contains a matchmaking configuration ARN value, which includes the matchmaker name. (In the ARN value \"arn:aws:gamelift:us-west-2:111122223333:matchmakingconfiguration/MM-4v4\", the matchmaking configuration name is \"MM-4v4\".) Use only the name for this parameter.</p>"
+          "shape":"MatchmakingConfigurationName",
+          "documentation":"<p>Name of the matchmaker to use for this request. You can use either the configuration name or ARN value. The ARN of the matchmaker that was used with the original game session is listed in the <a>GameSession</a> object, <code>MatchmakerData</code> property.</p>"
         },
         "GameSessionArn":{
           "shape":"ArnStringModel",
-          "documentation":"<p>Amazon Resource Name (<a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/s3-arn-format.html\">ARN</a>) that is assigned to a game session and uniquely identifies it. </p>"
+          "documentation":"<p>Amazon Resource Name (<a href=\"https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html\">ARN</a>) that is assigned to a game session and uniquely identifies it. This is the same as the game session ID.</p>"
         },
         "Players":{
           "shape":"PlayerList",
-          "documentation":"<p>Match information on all players that are currently assigned to the game session. This information is used by the matchmaker to find new players and add them to the existing game.</p> <ul> <li> <p>PlayerID, PlayerAttributes, Team -\\\\- This information is maintained in the <a>GameSession</a> object, <code>MatchmakerData</code> property, for all players who are currently assigned to the game session. The matchmaker data is in JSON syntax, formatted as a string. For more details, see <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/match-server.html#match-server-data\"> Match Data</a>. </p> </li> <li> <p>LatencyInMs -\\\\- If the matchmaker uses player latency, include a latency value, in milliseconds, for the region that the game session is currently in. Do not include latency values for any other region.</p> </li> </ul>"
+          "documentation":"<p>Match information on all players that are currently assigned to the game session. This information is used by the matchmaker to find new players and add them to the existing game.</p> <ul> <li> <p>PlayerID, PlayerAttributes, Team -\\\\- This information is maintained in the <a>GameSession</a> object, <code>MatchmakerData</code> property, for all players who are currently assigned to the game session. The matchmaker data is in JSON syntax, formatted as a string. For more details, see <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/match-server.html#match-server-data\"> Match Data</a>. </p> </li> <li> <p>LatencyInMs -\\\\- If the matchmaker uses player latency, include a latency value, in milliseconds, for the Region that the game session is currently in. Do not include latency values for any other Region.</p> </li> </ul>"
         }
       },
       "documentation":"<p>Represents the input for a request action.</p>"
@@ -4792,11 +5009,11 @@
       "members":{
         "TicketId":{
           "shape":"MatchmakingIdStringModel",
-          "documentation":"<p>Unique identifier for a matchmaking ticket. If no ticket ID is specified here, Amazon GameLift will generate one in the form of a UUID. Use this identifier to track the matchmaking ticket status and retrieve match results.</p>"
+          "documentation":"<p>A unique identifier for a matchmaking ticket. If no ticket ID is specified here, Amazon GameLift will generate one in the form of a UUID. Use this identifier to track the matchmaking ticket status and retrieve match results.</p>"
         },
         "ConfigurationName":{
-          "shape":"MatchmakingIdStringModel",
-          "documentation":"<p>Name of the matchmaking configuration to use for this request. Matchmaking configurations must exist in the same region as this request.</p>"
+          "shape":"MatchmakingConfigurationName",
+          "documentation":"<p>Name of the matchmaking configuration to use for this request. Matchmaking configurations must exist in the same Region as this request. You can use either the configuration name or ARN value.</p>"
         },
         "Players":{
           "shape":"PlayerList",
@@ -4824,7 +5041,7 @@
       "members":{
         "FleetId":{
           "shape":"FleetId",
-          "documentation":"<p>Unique identifier for a fleet</p>"
+          "documentation":"<p>A unique identifier for a fleet to stop actions on. You can use either the fleet ID or ARN value.</p>"
         },
         "Actions":{
           "shape":"FleetActionList",
@@ -4843,7 +5060,7 @@
       "members":{
         "PlacementId":{
           "shape":"IdStringModel",
-          "documentation":"<p>Unique identifier for a game session placement to cancel.</p>"
+          "documentation":"<p>A unique identifier for a game session placement to cancel.</p>"
         }
       },
       "documentation":"<p>Represents the input for a request action.</p>"
@@ -4864,7 +5081,7 @@
       "members":{
         "TicketId":{
           "shape":"MatchmakingIdStringModel",
-          "documentation":"<p>Unique identifier for a matchmaking ticket.</p>"
+          "documentation":"<p>A unique identifier for a matchmaking ticket.</p>"
         }
       },
       "documentation":"<p>Represents the input for a request action.</p>"
@@ -4884,6 +5101,76 @@
       "member":{"shape":"NonZeroAndMaxString"}
     },
     "StringModel":{"type":"string"},
+    "Tag":{
+      "type":"structure",
+      "required":[
+        "Key",
+        "Value"
+      ],
+      "members":{
+        "Key":{
+          "shape":"TagKey",
+          "documentation":"<p> The key for a developer-defined key:value pair for tagging an AWS resource. </p>"
+        },
+        "Value":{
+          "shape":"TagValue",
+          "documentation":"<p> The value for a developer-defined key:value pair for tagging an AWS resource. </p>"
+        }
+      },
+      "documentation":"<p> A label that can be assigned to a GameLift resource. </p> <p> <b>Learn more</b> </p> <p> <a href=\"https://docs.aws.amazon.com/general/latest/gr/aws_tagging.html\">Tagging AWS Resources</a> in the <i>AWS General Reference</i> </p> <p> <a href=\"http://aws.amazon.com/answers/account-management/aws-tagging-strategies/\"> AWS Tagging Strategies</a> </p> <p> <b>Related operations</b> </p> <ul> <li> <p> <a>TagResource</a> </p> </li> <li> <p> <a>UntagResource</a> </p> </li> <li> <p> <a>ListTagsForResource</a> </p> </li> </ul>"
+    },
+    "TagKey":{
+      "type":"string",
+      "max":128,
+      "min":1
+    },
+    "TagKeyList":{
+      "type":"list",
+      "member":{"shape":"TagKey"},
+      "max":200,
+      "min":0
+    },
+    "TagList":{
+      "type":"list",
+      "member":{"shape":"Tag"},
+      "max":200,
+      "min":0
+    },
+    "TagResourceRequest":{
+      "type":"structure",
+      "required":[
+        "ResourceARN",
+        "Tags"
+      ],
+      "members":{
+        "ResourceARN":{
+          "shape":"AmazonResourceName",
+          "documentation":"<p> The Amazon Resource Name (<a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/s3-arn-format.html\">ARN</a>) that is assigned to and uniquely identifies the GameLift resource that you want to assign tags to. GameLift resource ARNs are included in the data object for the resource, which can be retrieved by calling a List or Describe action for the resource type. </p>"
+        },
+        "Tags":{
+          "shape":"TagList",
+          "documentation":"<p>A list of one or more tags to assign to the specified GameLift resource. Tags are developer-defined and structured as key-value pairs. The maximum tag limit may be lower than stated. See <a href=\"https://docs.aws.amazon.com/general/latest/gr/aws_tagging.html\"> Tagging AWS Resources</a> for actual tagging limits.</p>"
+        }
+      }
+    },
+    "TagResourceResponse":{
+      "type":"structure",
+      "members":{
+      }
+    },
+    "TagValue":{
+      "type":"string",
+      "max":256,
+      "min":0
+    },
+    "TaggingFailedException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"NonEmptyString"}
+      },
+      "documentation":"<p> The requested tagging operation did not succeed. This may be due to invalid tag format or the maximum tag limit may have been exceeded. Resolve the issue before retrying. </p>",
+      "exception":true
+    },
     "TargetConfiguration":{
       "type":"structure",
       "required":["TargetValue"],
@@ -4917,28 +5204,50 @@
       "members":{
         "Message":{"shape":"NonEmptyString"}
       },
-      "documentation":"<p>The requested operation is not supported in the region specified.</p>",
+      "documentation":"<p>The requested operation is not supported in the Region specified.</p>",
       "exception":true
     },
+    "UntagResourceRequest":{
+      "type":"structure",
+      "required":[
+        "ResourceARN",
+        "TagKeys"
+      ],
+      "members":{
+        "ResourceARN":{
+          "shape":"AmazonResourceName",
+          "documentation":"<p> The Amazon Resource Name (<a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/s3-arn-format.html\">ARN</a>) that is assigned to and uniquely identifies the GameLift resource that you want to remove tags from. GameLift resource ARNs are included in the data object for the resource, which can be retrieved by calling a List or Describe action for the resource type. </p>"
+        },
+        "TagKeys":{
+          "shape":"TagKeyList",
+          "documentation":"<p>A list of one or more tags to remove from the specified GameLift resource. Tags are developer-defined and structured as key-value pairs.</p>"
+        }
+      }
+    },
+    "UntagResourceResponse":{
+      "type":"structure",
+      "members":{
+      }
+    },
     "UpdateAliasInput":{
       "type":"structure",
       "required":["AliasId"],
       "members":{
         "AliasId":{
           "shape":"AliasId",
-          "documentation":"<p>Unique identifier for a fleet alias. Specify the alias you want to update.</p>"
+          "documentation":"<p>A unique identifier for the alias that you want to update. You can use either the alias ID or ARN value.</p>"
         },
         "Name":{
           "shape":"NonBlankAndLengthConstraintString",
-          "documentation":"<p>Descriptive label that is associated with an alias. Alias names do not need to be unique.</p>"
+          "documentation":"<p>A descriptive label that is associated with an alias. Alias names do not need to be unique.</p>"
         },
         "Description":{
           "shape":"NonZeroAndMaxString",
-          "documentation":"<p>Human-readable description of an alias.</p>"
+          "documentation":"<p>A human-readable description of the alias.</p>"
         },
         "RoutingStrategy":{
           "shape":"RoutingStrategy",
-          "documentation":"<p>Object that specifies the fleet and routing type to use for the alias.</p>"
+          "documentation":"<p>The routing configuration, including routing type and fleet target, for the alias.</p>"
         }
       },
       "documentation":"<p>Represents the input for a request action.</p>"
@@ -4948,7 +5257,7 @@
       "members":{
         "Alias":{
           "shape":"Alias",
-          "documentation":"<p>Object that contains the updated alias configuration.</p>"
+          "documentation":"<p>The updated alias resource.</p>"
         }
       },
       "documentation":"<p>Represents the returned data in response to a request action.</p>"
@@ -4959,15 +5268,15 @@
       "members":{
         "BuildId":{
           "shape":"BuildId",
-          "documentation":"<p>Unique identifier for a build to update.</p>"
+          "documentation":"<p>A unique identifier for a build to update. You can use either the build ID or ARN value. </p>"
         },
         "Name":{
           "shape":"NonZeroAndMaxString",
-          "documentation":"<p>Descriptive label that is associated with a build. Build names do not need to be unique. </p>"
+          "documentation":"<p>A descriptive label that is associated with a build. Build names do not need to be unique. </p>"
         },
         "Version":{
           "shape":"NonZeroAndMaxString",
-          "documentation":"<p>Version that is associated with a build or script. Version strings do not need to be unique.</p>"
+          "documentation":"<p>Version information that is associated with a build or script. Version strings do not need to be unique.</p>"
         }
       },
       "documentation":"<p>Represents the input for a request action.</p>"
@@ -4977,7 +5286,7 @@
       "members":{
         "Build":{
           "shape":"Build",
-          "documentation":"<p>Object that contains the updated build record.</p>"
+          "documentation":"<p>The updated build record.</p>"
         }
       },
       "documentation":"<p>Represents the returned data in response to a request action.</p>"
@@ -4988,11 +5297,11 @@
       "members":{
         "FleetId":{
           "shape":"FleetId",
-          "documentation":"<p>Unique identifier for a fleet to update attribute metadata for.</p>"
+          "documentation":"<p>A unique identifier for a fleet to update attribute metadata for. You can use either the fleet ID or ARN value.</p>"
         },
         "Name":{
           "shape":"NonZeroAndMaxString",
-          "documentation":"<p>Descriptive label that is associated with a fleet. Fleet names do not need to be unique.</p>"
+          "documentation":"<p>A descriptive label that is associated with a fleet. Fleet names do not need to be unique.</p>"
         },
         "Description":{
           "shape":"NonZeroAndMaxString",
@@ -5018,7 +5327,7 @@
       "members":{
         "FleetId":{
           "shape":"FleetId",
-          "documentation":"<p>Unique identifier for a fleet that was updated.</p>"
+          "documentation":"<p>A unique identifier for a fleet that was updated. Use either the fleet ID or ARN value.</p>"
         }
       },
       "documentation":"<p>Represents the returned data in response to a request action.</p>"
@@ -5029,7 +5338,7 @@
       "members":{
         "FleetId":{
           "shape":"FleetId",
-          "documentation":"<p>Unique identifier for a fleet to update capacity for.</p>"
+          "documentation":"<p>A unique identifier for a fleet to update capacity for. You can use either the fleet ID or ARN value.</p>"
         },
         "DesiredInstances":{
           "shape":"WholeNumber",
@@ -5037,11 +5346,11 @@
         },
         "MinSize":{
           "shape":"WholeNumber",
-          "documentation":"<p>Minimum value allowed for the fleet's instance count. Default if not set is 0.</p>"
+          "documentation":"<p>The minimum value allowed for the fleet's instance count. Default if not set is 0.</p>"
         },
         "MaxSize":{
           "shape":"WholeNumber",
-          "documentation":"<p>Maximum value allowed for the fleet's instance count. Default if not set is 1.</p>"
+          "documentation":"<p>The maximum value allowed for the fleet's instance count. Default if not set is 1.</p>"
         }
       },
       "documentation":"<p>Represents the input for a request action.</p>"
@@ -5051,7 +5360,7 @@
       "members":{
         "FleetId":{
           "shape":"FleetId",
-          "documentation":"<p>Unique identifier for a fleet that was updated.</p>"
+          "documentation":"<p>A unique identifier for a fleet that was updated.</p>"
         }
       },
       "documentation":"<p>Represents the returned data in response to a request action.</p>"
@@ -5062,15 +5371,15 @@
       "members":{
         "FleetId":{
           "shape":"FleetId",
-          "documentation":"<p>Unique identifier for a fleet to update port settings for.</p>"
+          "documentation":"<p>A unique identifier for a fleet to update port settings for. You can use either the fleet ID or ARN value.</p>"
         },
         "InboundPermissionAuthorizations":{
           "shape":"IpPermissionsList",
-          "documentation":"<p>Collection of port settings to be added to the fleet record.</p>"
+          "documentation":"<p>A collection of port settings to be added to the fleet record.</p>"
         },
         "InboundPermissionRevocations":{
           "shape":"IpPermissionsList",
-          "documentation":"<p>Collection of port settings to be removed from the fleet record.</p>"
+          "documentation":"<p>A collection of port settings to be removed from the fleet record.</p>"
         }
       },
       "documentation":"<p>Represents the input for a request action.</p>"
@@ -5080,7 +5389,7 @@
       "members":{
         "FleetId":{
           "shape":"FleetId",
-          "documentation":"<p>Unique identifier for a fleet that was updated.</p>"
+          "documentation":"<p>A unique identifier for a fleet that was updated.</p>"
         }
       },
       "documentation":"<p>Represents the returned data in response to a request action.</p>"
@@ -5091,15 +5400,15 @@
       "members":{
         "GameSessionId":{
           "shape":"ArnStringModel",
-          "documentation":"<p>Unique identifier for the game session to update.</p>"
+          "documentation":"<p>A unique identifier for the game session to update. </p>"
         },
         "MaximumPlayerSessionCount":{
           "shape":"WholeNumber",
-          "documentation":"<p>Maximum number of players that can be connected simultaneously to the game session.</p>"
+          "documentation":"<p>The maximum number of players that can be connected simultaneously to the game session.</p>"
         },
         "Name":{
           "shape":"NonZeroAndMaxString",
-          "documentation":"<p>Descriptive label that is associated with a game session. Session names do not need to be unique.</p>"
+          "documentation":"<p>A descriptive label that is associated with a game session. Session names do not need to be unique.</p>"
         },
         "PlayerSessionCreationPolicy":{
           "shape":"PlayerSessionCreationPolicy",
@@ -5117,7 +5426,7 @@
       "members":{
         "GameSession":{
           "shape":"GameSession",
-          "documentation":"<p>Object that contains the updated game session metadata.</p>"
+          "documentation":"<p>The updated game session metadata.</p>"
         }
       },
       "documentation":"<p>Represents the returned data in response to a request action.</p>"
@@ -5128,19 +5437,19 @@
       "members":{
         "Name":{
           "shape":"GameSessionQueueName",
-          "documentation":"<p>Descriptive label that is associated with game session queue. Queue names must be unique within each region.</p>"
+          "documentation":"<p>A descriptive label that is associated with game session queue. Queue names must be unique within each Region. You can use either the queue ID or ARN value. </p>"
         },
         "TimeoutInSeconds":{
           "shape":"WholeNumber",
-          "documentation":"<p>Maximum time, in seconds, that a new game session placement request remains in the queue. When a request exceeds this time, the game session placement changes to a <code>TIMED_OUT</code> status.</p>"
+          "documentation":"<p>The maximum time, in seconds, that a new game session placement request remains in the queue. When a request exceeds this time, the game session placement changes to a <code>TIMED_OUT</code> status.</p>"
         },
         "PlayerLatencyPolicies":{
           "shape":"PlayerLatencyPolicyList",
-          "documentation":"<p>Collection of latency policies to apply when processing game sessions placement requests with player latency information. Multiple policies are evaluated in order of the maximum latency value, starting with the lowest latency values. With just one policy, it is enforced at the start of the game session placement for the duration period. With multiple policies, each policy is enforced consecutively for its duration period. For example, a queue might enforce a 60-second policy followed by a 120-second policy, and then no policy for the remainder of the placement. When updating policies, provide a complete collection of policies.</p>"
+          "documentation":"<p>A collection of latency policies to apply when processing game sessions placement requests with player latency information. Multiple policies are evaluated in order of the maximum latency value, starting with the lowest latency values. With just one policy, the policy is enforced at the start of the game session placement for the duration period. With multiple policies, each policy is enforced consecutively for its duration period. For example, a queue might enforce a 60-second policy followed by a 120-second policy, and then no policy for the remainder of the placement. When updating policies, provide a complete collection of policies.</p>"
         },
         "Destinations":{
           "shape":"GameSessionQueueDestinationList",
-          "documentation":"<p>List of fleets that can be used to fulfill game session placement requests in the queue. Fleets are identified by either a fleet ARN or a fleet alias ARN. Destinations are listed in default preference order. When updating this list, provide a complete list of destinations.</p>"
+          "documentation":"<p>A list of fleets that can be used to fulfill game session placement requests in the queue. Fleets are identified by either a fleet ARN or a fleet alias ARN. Destinations are listed in default preference order. When updating this list, provide a complete list of destinations.</p>"
         }
       },
       "documentation":"<p>Represents the input for a request action.</p>"
@@ -5150,7 +5459,7 @@
       "members":{
         "GameSessionQueue":{
           "shape":"GameSessionQueue",
-          "documentation":"<p>Object that describes the newly updated game session queue.</p>"
+          "documentation":"<p>An object that describes the newly updated game session queue.</p>"
         }
       },
       "documentation":"<p>Represents the returned data in response to a request action.</p>"
@@ -5160,40 +5469,40 @@
       "required":["Name"],
       "members":{
         "Name":{
-          "shape":"MatchmakingIdStringModel",
-          "documentation":"<p>Unique identifier for a matchmaking configuration to update.</p>"
+          "shape":"MatchmakingConfigurationName",
+          "documentation":"<p>A unique identifier for a matchmaking configuration to update. You can use either the configuration name or ARN value. </p>"
         },
         "Description":{
           "shape":"NonZeroAndMaxString",
-          "documentation":"<p>Descriptive label that is associated with matchmaking configuration.</p>"
+          "documentation":"<p>A descriptive label that is associated with matchmaking configuration.</p>"
         },
         "GameSessionQueueArns":{
           "shape":"QueueArnsList",
-          "documentation":"<p>Amazon Resource Name (<a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/s3-arn-format.html\">ARN</a>) that is assigned to a game session queue and uniquely identifies it. Format is <code>arn:aws:gamelift:&lt;region&gt;:&lt;aws account&gt;:gamesessionqueue/&lt;queue name&gt;</code>. These queues are used when placing game sessions for matches that are created with this matchmaking configuration. Queues can be located in any region.</p>"
+          "documentation":"<p>Amazon Resource Name (<a href=\"https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html\">ARN</a>) that is assigned to a GameLift game session queue resource and uniquely identifies it. ARNs are unique across all Regions. These queues are used when placing game sessions for matches that are created with this matchmaking configuration. Queues can be located in any Region.</p>"
         },
         "RequestTimeoutSeconds":{
           "shape":"MatchmakingRequestTimeoutInteger",
-          "documentation":"<p>Maximum duration, in seconds, that a matchmaking ticket can remain in process before timing out. Requests that fail due to timing out can be resubmitted as needed.</p>"
+          "documentation":"<p>The maximum duration, in seconds, that a matchmaking ticket can remain in process before timing out. Requests that fail due to timing out can be resubmitted as needed.</p>"
         },
         "AcceptanceTimeoutSeconds":{
           "shape":"MatchmakingAcceptanceTimeoutInteger",
-          "documentation":"<p>Length of time (in seconds) to wait for players to accept a proposed match. If any player rejects the match or fails to accept before the timeout, the ticket continues to look for an acceptable match.</p>"
+          "documentation":"<p>The length of time (in seconds) to wait for players to accept a proposed match. If any player rejects the match or fails to accept before the timeout, the ticket continues to look for an acceptable match.</p>"
         },
         "AcceptanceRequired":{
           "shape":"BooleanModel",
-          "documentation":"<p>Flag that determines whether a match that was created with this configuration must be accepted by the matched players. To require acceptance, set to TRUE.</p>"
+          "documentation":"<p>A flag that indicates whether a match that was created with this configuration must be accepted by the matched players. To require acceptance, set to TRUE.</p>"
         },
         "RuleSetName":{
-          "shape":"MatchmakingIdStringModel",
-          "documentation":"<p>Unique identifier for a matchmaking rule set to use with this configuration. A matchmaking configuration can only use rule sets that are defined in the same region.</p>"
+          "shape":"MatchmakingRuleSetName",
+          "documentation":"<p>A unique identifier for a matchmaking rule set to use with this configuration. You can use either the rule set name or ARN value. A matchmaking configuration can only use rule sets that are defined in the same Region.</p>"
         },
         "NotificationTarget":{
           "shape":"SnsArnStringModel",
-          "documentation":"<p>SNS topic ARN that is set up to receive matchmaking notifications. See <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/match-notification.html\"> Setting up Notifications for Matchmaking</a> for more information.</p>"
+          "documentation":"<p>An SNS topic ARN that is set up to receive matchmaking notifications. See <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/match-notification.html\"> Setting up Notifications for Matchmaking</a> for more information.</p>"
         },
         "AdditionalPlayerCount":{
           "shape":"WholeNumber",
-          "documentation":"<p>Number of player slots in a match to keep open for future players. For example, if the configuration's rule set specifies a match for a single 12-person team, and the additional player count is set to 2, only 10 players are selected for the match.</p>"
+          "documentation":"<p>The number of player slots in a match to keep open for future players. For example, assume that the configuration's rule set specifies a match for a single 12-person team. If the additional player count is set to 2, only 10 players are initially selected for the match.</p>"
         },
         "CustomEventData":{
           "shape":"CustomEventData",
@@ -5201,15 +5510,15 @@
         },
         "GameProperties":{
           "shape":"GamePropertyList",
-          "documentation":"<p>Set of custom properties for a game session, formatted as key:value pairs. These properties are passed to a game server process in the <a>GameSession</a> object with a request to start a new game session (see <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/gamelift-sdk-server-api.html#gamelift-sdk-server-startsession\">Start a Game Session</a>). This information is added to the new <a>GameSession</a> object that is created for a successful match. </p>"
+          "documentation":"<p>A set of custom properties for a game session, formatted as key-value pairs. These properties are passed to a game server process in the <a>GameSession</a> object with a request to start a new game session (see <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/gamelift-sdk-server-api.html#gamelift-sdk-server-startsession\">Start a Game Session</a>). This information is added to the new <a>GameSession</a> object that is created for a successful match. </p>"
         },
         "GameSessionData":{
           "shape":"GameSessionData",
-          "documentation":"<p>Set of custom game session properties, formatted as a single string value. This data is passed to a game server process in the <a>GameSession</a> object with a request to start a new game session (see <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/gamelift-sdk-server-api.html#gamelift-sdk-server-startsession\">Start a Game Session</a>). This information is added to the new <a>GameSession</a> object that is created for a successful match. </p>"
+          "documentation":"<p>A set of custom game session properties, formatted as a single string value. This data is passed to a game server process in the <a>GameSession</a> object with a request to start a new game session (see <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/gamelift-sdk-server-api.html#gamelift-sdk-server-startsession\">Start a Game Session</a>). This information is added to the new <a>GameSession</a> object that is created for a successful match. </p>"
         },
         "BackfillMode":{
           "shape":"BackfillMode",
-          "documentation":"<p>Method used to backfill game sessions created with this matchmaking configuration. Specify MANUAL when your game manages backfill requests manually or does not use the match backfill feature. Specify AUTOMATIC to have GameLift create a <a>StartMatchBackfill</a> request whenever a game session has one or more open slots. Learn more about manual and automatic backfill in <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/match-backfill.html\">Backfill Existing Games with FlexMatch</a>.</p>"
+          "documentation":"<p>The method that is used to backfill game sessions created with this matchmaking configuration. Specify MANUAL when your game manages backfill requests manually or does not use the match backfill feature. Specify AUTOMATIC to have GameLift create a <a>StartMatchBackfill</a> request whenever a game session has one or more open slots. Learn more about manual and automatic backfill in <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/match-backfill.html\">Backfill Existing Games with FlexMatch</a>.</p>"
         }
       },
       "documentation":"<p>Represents the input for a request action.</p>"
@@ -5219,7 +5528,7 @@
       "members":{
         "Configuration":{
           "shape":"MatchmakingConfiguration",
-          "documentation":"<p>Object that describes the updated matchmaking configuration.</p>"
+          "documentation":"<p>The updated matchmaking configuration.</p>"
         }
       },
       "documentation":"<p>Represents the returned data in response to a request action.</p>"
@@ -5233,11 +5542,11 @@
       "members":{
         "FleetId":{
           "shape":"FleetId",
-          "documentation":"<p>Unique identifier for a fleet to update run-time configuration for.</p>"
+          "documentation":"<p>A unique identifier for a fleet to update runtime configuration for. You can use either the fleet ID or ARN value.</p>"
         },
         "RuntimeConfiguration":{
           "shape":"RuntimeConfiguration",
-          "documentation":"<p>Instructions for launching server processes on each instance in the fleet. Server processes run either a custom game build executable or a Realtime Servers script. The run-time configuration lists the types of server processes to run on an instance and includes the following configuration settings: the server executable or launch script file, launch parameters, and the number of processes to run concurrently on each instance. A CreateFleet request must include a run-time configuration with at least one server process configuration.</p>"
+          "documentation":"<p>Instructions for launching server processes on each instance in the fleet. Server processes run either a custom game build executable or a Realtime Servers script. The runtime configuration lists the types of server processes to run on an instance and includes the following configuration settings: the server executable or launch script file, launch parameters, and the number of processes to run concurrently on each instance. A CreateFleet request must include a runtime configuration with at least one server process configuration.</p>"
         }
       },
       "documentation":"<p>Represents the input for a request action.</p>"
@@ -5247,7 +5556,7 @@
       "members":{
         "RuntimeConfiguration":{
           "shape":"RuntimeConfiguration",
-          "documentation":"<p>The run-time configuration currently in force. If the update was successful, this object matches the one in the request.</p>"
+          "documentation":"<p>The runtime configuration currently in force. If the update was successful, this object matches the one in the request.</p>"
         }
       },
       "documentation":"<p>Represents the returned data in response to a request action.</p>"
@@ -5258,23 +5567,23 @@
       "members":{
         "ScriptId":{
           "shape":"ScriptId",
-          "documentation":"<p>Unique identifier for a Realtime script to update.</p>"
+          "documentation":"<p>A unique identifier for a Realtime script to update. You can use either the script ID or ARN value.</p>"
         },
         "Name":{
           "shape":"NonZeroAndMaxString",
-          "documentation":"<p>Descriptive label that is associated with a script. Script names do not need to be unique.</p>"
+          "documentation":"<p>A descriptive label that is associated with a script. Script names do not need to be unique.</p>"
         },
         "Version":{
           "shape":"NonZeroAndMaxString",
-          "documentation":"<p>Version that is associated with a build or script. Version strings do not need to be unique.</p>"
+          "documentation":"<p>The version that is associated with a build or script. Version strings do not need to be unique.</p>"
         },
         "StorageLocation":{
           "shape":"S3Location",
-          "documentation":"<p>Location of the Amazon S3 bucket where a zipped file containing your Realtime scripts is stored. The storage location must specify the Amazon S3 bucket name, the zip file name (the \"key\"), and a role ARN that allows Amazon GameLift to access the Amazon S3 storage location. The S3 bucket must be in the same region where you want to create a new script. By default, Amazon GameLift uploads the latest version of the zip file; if you have S3 object versioning turned on, you can use the <code>ObjectVersion</code> parameter to specify an earlier version. </p>"
+          "documentation":"<p>The location of the Amazon S3 bucket where a zipped file containing your Realtime scripts is stored. The storage location must specify the Amazon S3 bucket name, the zip file name (the \"key\"), and a role ARN that allows Amazon GameLift to access the Amazon S3 storage location. The S3 bucket must be in the same Region where you want to create a new script. By default, Amazon GameLift uploads the latest version of the zip file; if you have S3 object versioning turned on, you can use the <code>ObjectVersion</code> parameter to specify an earlier version. </p>"
         },
         "ZipFile":{
           "shape":"ZipBlob",
-          "documentation":"<p>Data object containing your Realtime scripts and dependencies as a zip file. The zip file can have one or multiple files. Maximum size of a zip file is 5 MB.</p> <p>When using the AWS CLI tool to create a script, this parameter is set to the zip file name. It must be prepended with the string \"fileb://\" to indicate that the file data is a binary object. For example: <code>--zip-file fileb://myRealtimeScript.zip</code>.</p>"
+          "documentation":"<p>A data object containing your Realtime scripts and dependencies as a zip file. The zip file can have one or multiple files. Maximum size of a zip file is 5 MB.</p> <p>When using the AWS CLI tool to create a script, this parameter is set to the zip file name. It must be prepended with the string \"fileb://\" to indicate that the file data is a binary object. For example: <code>--zip-file fileb://myRealtimeScript.zip</code>.</p>"
         }
       }
     },
@@ -5293,7 +5602,7 @@
       "members":{
         "RuleSetBody":{
           "shape":"RuleSetBody",
-          "documentation":"<p>Collection of matchmaking rules to validate, formatted as a JSON string.</p>"
+          "documentation":"<p>A collection of matchmaking rules to validate, formatted as a JSON string.</p>"
         }
       },
       "documentation":"<p>Represents the input for a request action.</p>"
@@ -5303,7 +5612,7 @@
       "members":{
         "Valid":{
           "shape":"BooleanModel",
-          "documentation":"<p>Response indicating whether the rule set is valid.</p>"
+          "documentation":"<p>A response indicating whether the rule set is valid.</p>"
         }
       },
       "documentation":"<p>Represents the returned data in response to a request action.</p>"
@@ -5313,7 +5622,7 @@
       "members":{
         "GameLiftAwsAccountId":{
           "shape":"NonZeroAndMaxString",
-          "documentation":"<p>Unique identifier for the AWS account that you use to manage your Amazon GameLift fleet. You can find your Account ID in the AWS Management Console under account settings.</p>"
+          "documentation":"<p>A unique identifier for the AWS account that you use to manage your Amazon GameLift fleet. You can find your Account ID in the AWS Management Console under account settings.</p>"
         },
         "PeerVpcAwsAccountId":{
           "shape":"NonZeroAndMaxString",
@@ -5321,7 +5630,7 @@
         },
         "PeerVpcId":{
           "shape":"NonZeroAndMaxString",
-          "documentation":"<p>Unique identifier for a VPC with resources to be accessed by your Amazon GameLift fleet. The VPC must be in the same region where your fleet is deployed. Look up a VPC ID using the <a href=\"https://console.aws.amazon.com/vpc/\">VPC Dashboard</a> in the AWS Management Console. Learn more about VPC peering in <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/vpc-peering.html\">VPC Peering with Amazon GameLift Fleets</a>.</p>"
+          "documentation":"<p>A unique identifier for a VPC with resources to be accessed by your Amazon GameLift fleet. The VPC must be in the same Region where your fleet is deployed. Look up a VPC ID using the <a href=\"https://console.aws.amazon.com/vpc/\">VPC Dashboard</a> in the AWS Management Console. Learn more about VPC peering in <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/vpc-peering.html\">VPC Peering with Amazon GameLift Fleets</a>.</p>"
         },
         "CreationTime":{
           "shape":"Timestamp",
@@ -5343,7 +5652,11 @@
       "members":{
         "FleetId":{
           "shape":"FleetId",
-          "documentation":"<p>Unique identifier for a fleet. This ID determines the ID of the Amazon GameLift VPC for your fleet.</p>"
+          "documentation":"<p>A unique identifier for a fleet. This ID determines the ID of the Amazon GameLift VPC for your fleet.</p>"
+        },
+        "FleetArn":{
+          "shape":"ArnStringModel",
+          "documentation":"<p> The Amazon Resource Name (<a href=\"https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html\">ARN</a>) associated with the GameLift fleet resource for this connection. </p>"
         },
         "IpV4CidrBlock":{
           "shape":"NonZeroAndMaxString",
@@ -5351,19 +5664,19 @@
         },
         "VpcPeeringConnectionId":{
           "shape":"NonZeroAndMaxString",
-          "documentation":"<p>Unique identifier that is automatically assigned to the connection record. This ID is referenced in VPC peering connection events, and is used when deleting a connection with <a>DeleteVpcPeeringConnection</a>. </p>"
+          "documentation":"<p>A unique identifier that is automatically assigned to the connection record. This ID is referenced in VPC peering connection events, and is used when deleting a connection with <a>DeleteVpcPeeringConnection</a>. </p>"
         },
         "Status":{
           "shape":"VpcPeeringConnectionStatus",
-          "documentation":"<p>Object that contains status information about the connection. Status indicates if a connection is pending, successful, or failed.</p>"
+          "documentation":"<p>The status information about the connection. Status indicates if a connection is pending, successful, or failed.</p>"
         },
         "PeerVpcId":{
           "shape":"NonZeroAndMaxString",
-          "documentation":"<p>Unique identifier for a VPC with resources to be accessed by your Amazon GameLift fleet. The VPC must be in the same region where your fleet is deployed. Look up a VPC ID using the <a href=\"https://console.aws.amazon.com/vpc/\">VPC Dashboard</a> in the AWS Management Console. Learn more about VPC peering in <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/vpc-peering.html\">VPC Peering with Amazon GameLift Fleets</a>.</p>"
+          "documentation":"<p>A unique identifier for a VPC with resources to be accessed by your Amazon GameLift fleet. The VPC must be in the same Region where your fleet is deployed. Look up a VPC ID using the <a href=\"https://console.aws.amazon.com/vpc/\">VPC Dashboard</a> in the AWS Management Console. Learn more about VPC peering in <a href=\"https://docs.aws.amazon.com/gamelift/latest/developerguide/vpc-peering.html\">VPC Peering with Amazon GameLift Fleets</a>.</p>"
         },
         "GameLiftVpcId":{
           "shape":"NonZeroAndMaxString",
-          "documentation":"<p>Unique identifier for the VPC that contains the Amazon GameLift fleet for this connection. This VPC is managed by Amazon GameLift and does not appear in your AWS account. </p>"
+          "documentation":"<p>A unique identifier for the VPC that contains the Amazon GameLift fleet for this connection. This VPC is managed by Amazon GameLift and does not appear in your AWS account. </p>"
         }
       },
       "documentation":"<p>Represents a peering connection between a VPC on one of your AWS accounts and the VPC for your Amazon GameLift fleets. This record may be for an active peering connection or a pending connection that has not yet been established.</p> <ul> <li> <p> <a>CreateVpcPeeringAuthorization</a> </p> </li> <li> <p> <a>DescribeVpcPeeringAuthorizations</a> </p> </li> <li> <p> <a>DeleteVpcPeeringAuthorization</a> </p> </li> <li> <p> <a>CreateVpcPeeringConnection</a> </p> </li> <li> <p> <a>DescribeVpcPeeringConnections</a> </p> </li> <li> <p> <a>DeleteVpcPeeringConnection</a> </p> </li> </ul>"
diff --git a/services/gamelift/src/test/resources/cucumber.properties b/services/gamelift/src/test/resources/cucumber.properties
index 1b74783e495b..cd80b3c9e159 100644
--- a/services/gamelift/src/test/resources/cucumber.properties
+++ b/services/gamelift/src/test/resources/cucumber.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/glacier/build.properties b/services/glacier/build.properties
index ecf2dae6fcb1..15ec2da1fc71 100644
--- a/services/glacier/build.properties
+++ b/services/glacier/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/glacier/pom.xml b/services/glacier/pom.xml
index 32277b281b6d..1326e1202d25 100644
--- a/services/glacier/pom.xml
+++ b/services/glacier/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>glacier</artifactId>
     <name>AWS Java SDK :: Services :: Amazon Glacier</name>
diff --git a/services/glacier/src/it/java/software/amazon/awssdk/services/glacier/ServiceIntegrationTest.java b/services/glacier/src/it/java/software/amazon/awssdk/services/glacier/ServiceIntegrationTest.java
index bf90ce2a6d52..b952809005f1 100644
--- a/services/glacier/src/it/java/software/amazon/awssdk/services/glacier/ServiceIntegrationTest.java
+++ b/services/glacier/src/it/java/software/amazon/awssdk/services/glacier/ServiceIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/glacier/src/main/java/software/amazon/awssdk/services/glacier/internal/AcceptJsonInterceptor.java b/services/glacier/src/main/java/software/amazon/awssdk/services/glacier/internal/AcceptJsonInterceptor.java
index d5f3f318bfcc..5fe332801647 100644
--- a/services/glacier/src/main/java/software/amazon/awssdk/services/glacier/internal/AcceptJsonInterceptor.java
+++ b/services/glacier/src/main/java/software/amazon/awssdk/services/glacier/internal/AcceptJsonInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/glacier/src/main/java/software/amazon/awssdk/services/glacier/internal/GlacierExecutionInterceptor.java b/services/glacier/src/main/java/software/amazon/awssdk/services/glacier/internal/GlacierExecutionInterceptor.java
index 3be21df78009..263e5c8bbbed 100644
--- a/services/glacier/src/main/java/software/amazon/awssdk/services/glacier/internal/GlacierExecutionInterceptor.java
+++ b/services/glacier/src/main/java/software/amazon/awssdk/services/glacier/internal/GlacierExecutionInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/glacier/src/main/java/software/amazon/awssdk/services/glacier/transform/DefaultAccountIdSupplier.java b/services/glacier/src/main/java/software/amazon/awssdk/services/glacier/transform/DefaultAccountIdSupplier.java
index 5acce82033f0..890df681b6fb 100644
--- a/services/glacier/src/main/java/software/amazon/awssdk/services/glacier/transform/DefaultAccountIdSupplier.java
+++ b/services/glacier/src/main/java/software/amazon/awssdk/services/glacier/transform/DefaultAccountIdSupplier.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/glacier/src/test/java/software/amazon/awssdk/services/glacier/AccountIdDefaultValueTest.java b/services/glacier/src/test/java/software/amazon/awssdk/services/glacier/AccountIdDefaultValueTest.java
index 3e94f8151230..ae90ad624162 100644
--- a/services/glacier/src/test/java/software/amazon/awssdk/services/glacier/AccountIdDefaultValueTest.java
+++ b/services/glacier/src/test/java/software/amazon/awssdk/services/glacier/AccountIdDefaultValueTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/glacier/src/test/java/software/amazon/awssdk/services/glacier/UploadArchiveHeaderTest.java b/services/glacier/src/test/java/software/amazon/awssdk/services/glacier/UploadArchiveHeaderTest.java
index 71d11cbb4a50..6786273f3811 100644
--- a/services/glacier/src/test/java/software/amazon/awssdk/services/glacier/UploadArchiveHeaderTest.java
+++ b/services/glacier/src/test/java/software/amazon/awssdk/services/glacier/UploadArchiveHeaderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/glacier/src/test/resources/cucumber.properties b/services/glacier/src/test/resources/cucumber.properties
index 347d9d7eb130..7287526b85a1 100644
--- a/services/glacier/src/test/resources/cucumber.properties
+++ b/services/glacier/src/test/resources/cucumber.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/glacier/src/test/resources/log4j.properties b/services/glacier/src/test/resources/log4j.properties
index 7be1b008142e..b11d39afe3ae 100644
--- a/services/glacier/src/test/resources/log4j.properties
+++ b/services/glacier/src/test/resources/log4j.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/globalaccelerator/pom.xml b/services/globalaccelerator/pom.xml
index af7ddb5a16da..ef5c51813291 100644
--- a/services/globalaccelerator/pom.xml
+++ b/services/globalaccelerator/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>globalaccelerator</artifactId>
     <name>AWS Java SDK :: Services :: Global Accelerator</name>
diff --git a/services/globalaccelerator/src/main/resources/codegen-resources/service-2.json b/services/globalaccelerator/src/main/resources/codegen-resources/service-2.json
index 2ebe607c0c78..e3a362e971ba 100644
--- a/services/globalaccelerator/src/main/resources/codegen-resources/service-2.json
+++ b/services/globalaccelerator/src/main/resources/codegen-resources/service-2.json
@@ -13,6 +13,23 @@
     "uid":"globalaccelerator-2018-08-08"
   },
   "operations":{
+    "AdvertiseByoipCidr":{
+      "name":"AdvertiseByoipCidr",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"AdvertiseByoipCidrRequest"},
+      "output":{"shape":"AdvertiseByoipCidrResponse"},
+      "errors":[
+        {"shape":"InternalServiceErrorException"},
+        {"shape":"InvalidArgumentException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"ByoipCidrNotFoundException"},
+        {"shape":"IncorrectCidrStateException"}
+      ],
+      "documentation":"<p>Advertises an IPv4 address range that is provisioned for use with your AWS resources through bring your own IP addresses (BYOIP). It can take a few minutes before traffic to the specified addresses starts routing to AWS because of propagation delays. To see an AWS CLI example of advertising an address range, scroll down to <b>Example</b>.</p> <p>To stop advertising the BYOIP address range, use <a href=\"https://docs.aws.amazon.com/global-accelerator/latest/api/WithdrawByoipCidr.html\"> WithdrawByoipCidr</a>.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/global-accelerator/latest/dg/using-byoip.html\">Bring Your Own IP Addresses (BYOIP)</a> in the <i>AWS Global Accelerator Developer Guide</i>.</p>"
+    },
     "CreateAccelerator":{
       "name":"CreateAccelerator",
       "http":{
@@ -26,7 +43,7 @@
         {"shape":"InvalidArgumentException"},
         {"shape":"LimitExceededException"}
       ],
-      "documentation":"<p>Create an accelerator. An accelerator includes one or more listeners that process inbound connections and direct traffic to one or more endpoint groups, each of which includes endpoints, such as Network Load Balancers. To see an AWS CLI example of creating an accelerator, scroll down to <b>Example</b>.</p> <important> <p>You must specify the US-West-2 (Oregon) Region to create or update accelerators.</p> </important>"
+      "documentation":"<p>Create an accelerator. An accelerator includes one or more listeners that process inbound connections and direct traffic to one or more endpoint groups, each of which includes endpoints, such as Network Load Balancers. To see an AWS CLI example of creating an accelerator, scroll down to <b>Example</b>.</p> <p>If you bring your own IP address ranges to AWS Global Accelerator (BYOIP), you can assign IP addresses from your own pool to your accelerator as the static IP address entry points. Only one IP address from each of your IP address ranges can be used for each accelerator.</p> <important> <p>You must specify the US West (Oregon) Region to create or update accelerators.</p> </important>"
     },
     "CreateEndpointGroup":{
       "name":"CreateEndpointGroup",
@@ -78,7 +95,7 @@
         {"shape":"InternalServiceErrorException"},
         {"shape":"InvalidArgumentException"}
       ],
-      "documentation":"<p>Delete an accelerator. Note: before you can delete an accelerator, you must disable it and remove all dependent resources (listeners and endpoint groups).</p>"
+      "documentation":"<p>Delete an accelerator. Before you can delete an accelerator, you must disable it and remove all dependent resources (listeners and endpoint groups). To disable the accelerator, update the accelerator to set <code>Enabled</code> to false.</p> <important> <p>When you create an accelerator, by default, Global Accelerator provides you with a set of two static IP addresses. Alternatively, you can bring your own IP address ranges to Global Accelerator and assign IP addresses from those ranges. </p> <p>The IP addresses are assigned to your accelerator for as long as it exists, even if you disable the accelerator and it no longer accepts or routes traffic. However, when you <i>delete</i> an accelerator, you lose the static IP addresses that are assigned to the accelerator, so you can no longer route traffic by using them. As a best practice, ensure that you have permissions in place to avoid inadvertently deleting accelerators. You can use IAM policies with Global Accelerator to limit the users who have permissions to delete an accelerator. For more information, see <a href=\"https://docs.aws.amazon.com/global-accelerator/latest/dg/auth-and-access-control.html\">Authentication and Access Control</a> in the <i>AWS Global Accelerator Developer Guide</i>.</p> </important>"
     },
     "DeleteEndpointGroup":{
       "name":"DeleteEndpointGroup",
@@ -109,6 +126,23 @@
       ],
       "documentation":"<p>Delete a listener from an accelerator.</p>"
     },
+    "DeprovisionByoipCidr":{
+      "name":"DeprovisionByoipCidr",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DeprovisionByoipCidrRequest"},
+      "output":{"shape":"DeprovisionByoipCidrResponse"},
+      "errors":[
+        {"shape":"InternalServiceErrorException"},
+        {"shape":"InvalidArgumentException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"ByoipCidrNotFoundException"},
+        {"shape":"IncorrectCidrStateException"}
+      ],
+      "documentation":"<p>Releases the specified address range that you provisioned to use with your AWS resources through bring your own IP addresses (BYOIP) and deletes the corresponding address pool. To see an AWS CLI example of deprovisioning an address range, scroll down to <b>Example</b>.</p> <p>Before you can release an address range, you must stop advertising it by using <a href=\"https://docs.aws.amazon.com/global-accelerator/latest/api/WithdrawByoipCidr.html\">WithdrawByoipCidr</a> and you must not have any accelerators that are using static IP addresses allocated from its address range. </p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/global-accelerator/latest/dg/using-byoip.html\">Bring Your Own IP Addresses (BYOIP)</a> in the <i>AWS Global Accelerator Developer Guide</i>.</p>"
+    },
     "DescribeAccelerator":{
       "name":"DescribeAccelerator",
       "http":{
@@ -137,7 +171,7 @@
         {"shape":"InternalServiceErrorException"},
         {"shape":"InvalidArgumentException"}
       ],
-      "documentation":"<p>Describe the attributes of an accelerator.</p>"
+      "documentation":"<p>Describe the attributes of an accelerator. To see an AWS CLI example of describing the attributes of an accelerator, scroll down to <b>Example</b>.</p>"
     },
     "DescribeEndpointGroup":{
       "name":"DescribeEndpointGroup",
@@ -152,7 +186,7 @@
         {"shape":"EndpointGroupNotFoundException"},
         {"shape":"InternalServiceErrorException"}
       ],
-      "documentation":"<p>Describe an endpoint group.</p>"
+      "documentation":"<p>Describe an endpoint group. To see an AWS CLI example of describing an endpoint group, scroll down to <b>Example</b>.</p>"
     },
     "DescribeListener":{
       "name":"DescribeListener",
@@ -167,7 +201,7 @@
         {"shape":"ListenerNotFoundException"},
         {"shape":"InternalServiceErrorException"}
       ],
-      "documentation":"<p>Describe a listener.</p>"
+      "documentation":"<p>Describe a listener. To see an AWS CLI example of describing a listener, scroll down to <b>Example</b>.</p>"
     },
     "ListAccelerators":{
       "name":"ListAccelerators",
@@ -182,7 +216,23 @@
         {"shape":"InvalidNextTokenException"},
         {"shape":"InternalServiceErrorException"}
       ],
-      "documentation":"<p>List the accelerators for an AWS account.</p>"
+      "documentation":"<p>List the accelerators for an AWS account. To see an AWS CLI example of listing the accelerators for an AWS account, scroll down to <b>Example</b>.</p>"
+    },
+    "ListByoipCidrs":{
+      "name":"ListByoipCidrs",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"ListByoipCidrsRequest"},
+      "output":{"shape":"ListByoipCidrsResponse"},
+      "errors":[
+        {"shape":"InternalServiceErrorException"},
+        {"shape":"InvalidArgumentException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"InvalidNextTokenException"}
+      ],
+      "documentation":"<p>Lists the IP address ranges that were specified in calls to <a href=\"https://docs.aws.amazon.com/global-accelerator/latest/api/ProvisionByoipCidr.html\">ProvisionByoipCidr</a>, including the current state and a history of state changes.</p> <p>To see an AWS CLI example of listing BYOIP CIDR addresses, scroll down to <b>Example</b>.</p>"
     },
     "ListEndpointGroups":{
       "name":"ListEndpointGroups",
@@ -198,7 +248,7 @@
         {"shape":"InvalidArgumentException"},
         {"shape":"InternalServiceErrorException"}
       ],
-      "documentation":"<p>List the endpoint groups that are associated with a listener.</p>"
+      "documentation":"<p>List the endpoint groups that are associated with a listener. To see an AWS CLI example of listing the endpoint groups for listener, scroll down to <b>Example</b>.</p>"
     },
     "ListListeners":{
       "name":"ListListeners",
@@ -214,7 +264,69 @@
         {"shape":"InvalidNextTokenException"},
         {"shape":"InternalServiceErrorException"}
       ],
-      "documentation":"<p>List the listeners for an accelerator.</p>"
+      "documentation":"<p>List the listeners for an accelerator. To see an AWS CLI example of listing the listeners for an accelerator, scroll down to <b>Example</b>.</p>"
+    },
+    "ListTagsForResource":{
+      "name":"ListTagsForResource",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"ListTagsForResourceRequest"},
+      "output":{"shape":"ListTagsForResourceResponse"},
+      "errors":[
+        {"shape":"AcceleratorNotFoundException"},
+        {"shape":"InternalServiceErrorException"},
+        {"shape":"InvalidArgumentException"}
+      ],
+      "documentation":"<p>List all tags for an accelerator. To see an AWS CLI example of listing tags for an accelerator, scroll down to <b>Example</b>.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/global-accelerator/latest/dg/tagging-in-global-accelerator.html\">Tagging in AWS Global Accelerator</a> in the <i>AWS Global Accelerator Developer Guide</i>. </p>"
+    },
+    "ProvisionByoipCidr":{
+      "name":"ProvisionByoipCidr",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"ProvisionByoipCidrRequest"},
+      "output":{"shape":"ProvisionByoipCidrResponse"},
+      "errors":[
+        {"shape":"InternalServiceErrorException"},
+        {"shape":"InvalidArgumentException"},
+        {"shape":"LimitExceededException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"IncorrectCidrStateException"}
+      ],
+      "documentation":"<p>Provisions an IP address range to use with your AWS resources through bring your own IP addresses (BYOIP) and creates a corresponding address pool. After the address range is provisioned, it is ready to be advertised using <a href=\"https://docs.aws.amazon.com/global-accelerator/latest/api/AdvertiseByoipCidr.html\"> AdvertiseByoipCidr</a>.</p> <p>To see an AWS CLI example of provisioning an address range for BYOIP, scroll down to <b>Example</b>.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/global-accelerator/latest/dg/using-byoip.html\">Bring Your Own IP Addresses (BYOIP)</a> in the <i>AWS Global Accelerator Developer Guide</i>.</p>"
+    },
+    "TagResource":{
+      "name":"TagResource",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"TagResourceRequest"},
+      "output":{"shape":"TagResourceResponse"},
+      "errors":[
+        {"shape":"AcceleratorNotFoundException"},
+        {"shape":"InternalServiceErrorException"},
+        {"shape":"InvalidArgumentException"}
+      ],
+      "documentation":"<p>Add tags to an accelerator resource. To see an AWS CLI example of adding tags to an accelerator, scroll down to <b>Example</b>.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/global-accelerator/latest/dg/tagging-in-global-accelerator.html\">Tagging in AWS Global Accelerator</a> in the <i>AWS Global Accelerator Developer Guide</i>. </p>"
+    },
+    "UntagResource":{
+      "name":"UntagResource",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"UntagResourceRequest"},
+      "output":{"shape":"UntagResourceResponse"},
+      "errors":[
+        {"shape":"AcceleratorNotFoundException"},
+        {"shape":"InternalServiceErrorException"},
+        {"shape":"InvalidArgumentException"}
+      ],
+      "documentation":"<p>Remove tags from a Global Accelerator resource. When you specify a tag key, the action removes both that key and its associated value. To see an AWS CLI example of removing tags from an accelerator, scroll down to <b>Example</b>. The operation succeeds even if you attempt to remove tags from an accelerator that was already removed.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/global-accelerator/latest/dg/tagging-in-global-accelerator.html\">Tagging in AWS Global Accelerator</a> in the <i>AWS Global Accelerator Developer Guide</i>.</p>"
     },
     "UpdateAccelerator":{
       "name":"UpdateAccelerator",
@@ -229,7 +341,7 @@
         {"shape":"InternalServiceErrorException"},
         {"shape":"InvalidArgumentException"}
       ],
-      "documentation":"<p>Update an accelerator. To see an AWS CLI example of updating an accelerator, scroll down to <b>Example</b>.</p> <important> <p>You must specify the US-West-2 (Oregon) Region to create or update accelerators.</p> </important>"
+      "documentation":"<p>Update an accelerator. To see an AWS CLI example of updating an accelerator, scroll down to <b>Example</b>.</p> <important> <p>You must specify the US West (Oregon) Region to create or update accelerators.</p> </important>"
     },
     "UpdateAcceleratorAttributes":{
       "name":"UpdateAcceleratorAttributes",
@@ -279,7 +391,24 @@
         {"shape":"InternalServiceErrorException"},
         {"shape":"LimitExceededException"}
       ],
-      "documentation":"<p>Update a listener.</p>"
+      "documentation":"<p>Update a listener. To see an AWS CLI example of updating listener, scroll down to <b>Example</b>.</p>"
+    },
+    "WithdrawByoipCidr":{
+      "name":"WithdrawByoipCidr",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"WithdrawByoipCidrRequest"},
+      "output":{"shape":"WithdrawByoipCidrResponse"},
+      "errors":[
+        {"shape":"InternalServiceErrorException"},
+        {"shape":"InvalidArgumentException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"ByoipCidrNotFoundException"},
+        {"shape":"IncorrectCidrStateException"}
+      ],
+      "documentation":"<p>Stops advertising an address range that is provisioned as an address pool. You can perform this operation at most once every 10 seconds, even if you specify different address ranges each time. To see an AWS CLI example of withdrawing an address range for BYOIP so it will no longer be advertised by AWS, scroll down to <b>Example</b>.</p> <p>It can take a few minutes before traffic to the specified addresses stops routing to AWS because of propagation delays.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/global-accelerator/latest/dg/using-byoip.html\">Bring Your Own IP Addresses (BYOIP)</a> in the <i>AWS Global Accelerator Developer Guide</i>.</p>"
     }
   },
   "shapes":{
@@ -308,7 +437,7 @@
         },
         "DnsName":{
           "shape":"GenericString",
-          "documentation":"<p>The Domain Name System (DNS) name that Global Accelerator creates that points to your accelerator's static IP addresses. </p> <p>The naming convention for the DNS name is: a lower case letter a, followed by a 16-bit random hex string, followed by .awsglobalaccelerator.com. For example: a1234567890abcdef.awsglobalaccelerator.com.</p> <p>For more information about the default DNS name, see <a href=\"https://docs.aws.amazon.com/global-accelerator/latest/dg/about-accelerators.html#about-accelerators.dns-addressing\">Support for DNS Addressing in Global Accelerator</a> in the <i>AWS Global Accelerator Developer Guide</i>.</p>"
+          "documentation":"<p>The Domain Name System (DNS) name that Global Accelerator creates that points to your accelerator's static IP addresses. </p> <p>The naming convention for the DNS name is the following: A lowercase letter a, followed by a 16-bit random hex string, followed by .awsglobalaccelerator.com. For example: a1234567890abcdef.awsglobalaccelerator.com.</p> <p>For more information about the default DNS name, see <a href=\"https://docs.aws.amazon.com/global-accelerator/latest/dg/about-accelerators.html#about-accelerators.dns-addressing\"> Support for DNS Addressing in Global Accelerator</a> in the <i>AWS Global Accelerator Developer Guide</i>.</p>"
         },
         "Status":{
           "shape":"AcceleratorStatus",
@@ -338,7 +467,7 @@
         },
         "FlowLogsS3Prefix":{
           "shape":"GenericString",
-          "documentation":"<p>The prefix for the location in the Amazon S3 bucket for the flow logs. Attribute is required if <code>FlowLogsEnabled</code> is <code>true</code>. If you don’t specify a prefix, the flow logs are stored in the root of the bucket.</p>"
+          "documentation":"<p>The prefix for the location in the Amazon S3 bucket for the flow logs. Attribute is required if <code>FlowLogsEnabled</code> is <code>true</code>.</p> <p>If you don’t specify a prefix, the flow logs are stored in the root of the bucket. If you specify slash (/) for the S3 bucket prefix, the log file bucket folder structure will include a double slash (//), like the following:</p> <p>s3-bucket_name//AWSLogs/aws_account_id</p>"
         }
       },
       "documentation":"<p>Attributes of an accelerator.</p>"
@@ -378,6 +507,25 @@
       "documentation":"<p>You don't have access permission.</p>",
       "exception":true
     },
+    "AdvertiseByoipCidrRequest":{
+      "type":"structure",
+      "required":["Cidr"],
+      "members":{
+        "Cidr":{
+          "shape":"GenericString",
+          "documentation":"<p>The address range, in CIDR notation. This must be the exact range that you provisioned. You can't advertise only a portion of the provisioned range.</p>"
+        }
+      }
+    },
+    "AdvertiseByoipCidrResponse":{
+      "type":"structure",
+      "members":{
+        "ByoipCidr":{
+          "shape":"ByoipCidr",
+          "documentation":"<p>Information about the address range.</p>"
+        }
+      }
+    },
     "AssociatedEndpointGroupFoundException":{
       "type":"structure",
       "members":{
@@ -394,6 +542,88 @@
       "documentation":"<p>The accelerator that you specified has a listener associated with it. You must remove all dependent resources from an accelerator before you can delete it.</p>",
       "exception":true
     },
+    "ByoipCidr":{
+      "type":"structure",
+      "members":{
+        "Cidr":{
+          "shape":"GenericString",
+          "documentation":"<p>The address range, in CIDR notation.</p>"
+        },
+        "State":{
+          "shape":"ByoipCidrState",
+          "documentation":"<p>The state of the address pool.</p>"
+        },
+        "Events":{
+          "shape":"ByoipCidrEvents",
+          "documentation":"<p>A history of status changes for an IP address range that that you bring to AWS Global Accelerator through bring your own IP address (BYOIP).</p>"
+        }
+      },
+      "documentation":"<p>Information about an IP address range that is provisioned for use with your AWS resources through bring your own IP address (BYOIP).</p> <p>The following describes each BYOIP <code>State</code> that your IP address range can be in.</p> <ul> <li> <p> <b>PENDING_PROVISIONING</b> — You’ve submitted a request to provision an IP address range but it is not yet provisioned with AWS Global Accelerator.</p> </li> <li> <p> <b>READY</b> — The address range is provisioned with AWS Global Accelerator and can be advertised.</p> </li> <li> <p> <b>PENDING_ADVERTISING</b> — You’ve submitted a request for AWS Global Accelerator to advertise an address range but it is not yet being advertised.</p> </li> <li> <p> <b>ADVERTISING</b> — The address range is being advertised by AWS Global Accelerator.</p> </li> <li> <p> <b>PENDING_WITHDRAWING</b> — You’ve submitted a request to withdraw an address range from being advertised but it is still being advertised by AWS Global Accelerator.</p> </li> <li> <p> <b>PENDING_DEPROVISIONING</b> — You’ve submitted a request to deprovision an address range from AWS Global Accelerator but it is still provisioned.</p> </li> <li> <p> <b>DEPROVISIONED</b> — The address range is deprovisioned from AWS Global Accelerator.</p> </li> <li> <p> <b>FAILED_PROVISION </b> — The request to provision the address range from AWS Global Accelerator was not successful. Please make sure that you provide all of the correct information, and try again. If the request fails a second time, contact AWS support.</p> </li> <li> <p> <b>FAILED_ADVERTISING</b> — The request for AWS Global Accelerator to advertise the address range was not successful. Please make sure that you provide all of the correct information, and try again. If the request fails a second time, contact AWS support.</p> </li> <li> <p> <b>FAILED_WITHDRAW</b> — The request to withdraw the address range from advertising by AWS Global Accelerator was not successful. Please make sure that you provide all of the correct information, and try again. If the request fails a second time, contact AWS support.</p> </li> <li> <p> <b>FAILED_DEPROVISION </b> — The request to deprovision the address range from AWS Global Accelerator was not successful. Please make sure that you provide all of the correct information, and try again. If the request fails a second time, contact AWS support.</p> </li> </ul>"
+    },
+    "ByoipCidrEvent":{
+      "type":"structure",
+      "members":{
+        "Message":{
+          "shape":"GenericString",
+          "documentation":"<p>A string that contains an <code>Event</code> message describing changes that you make in the status of an IP address range that you bring to AWS Global Accelerator through bring your own IP address (BYOIP).</p>"
+        },
+        "Timestamp":{
+          "shape":"Timestamp",
+          "documentation":"<p>A timestamp when you make a status change for an IP address range that you bring to AWS Global Accelerator through bring your own IP address (BYOIP).</p>"
+        }
+      },
+      "documentation":"<p>A complex type that contains a <code>Message</code> and a <code>Timestamp</code> value for changes that you make in the status an IP address range that you bring to AWS Global Accelerator through bring your own IP address (BYOIP).</p>"
+    },
+    "ByoipCidrEvents":{
+      "type":"list",
+      "member":{"shape":"ByoipCidrEvent"}
+    },
+    "ByoipCidrNotFoundException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p>The CIDR that you specified was not found or is incorrect.</p>",
+      "exception":true
+    },
+    "ByoipCidrState":{
+      "type":"string",
+      "enum":[
+        "PENDING_PROVISIONING",
+        "READY",
+        "PENDING_ADVERTISING",
+        "ADVERTISING",
+        "PENDING_WITHDRAWING",
+        "PENDING_DEPROVISIONING",
+        "DEPROVISIONED",
+        "FAILED_PROVISION",
+        "FAILED_ADVERTISING",
+        "FAILED_WITHDRAW",
+        "FAILED_DEPROVISION"
+      ]
+    },
+    "ByoipCidrs":{
+      "type":"list",
+      "member":{"shape":"ByoipCidr"}
+    },
+    "CidrAuthorizationContext":{
+      "type":"structure",
+      "required":[
+        "Message",
+        "Signature"
+      ],
+      "members":{
+        "Message":{
+          "shape":"GenericString",
+          "documentation":"<p>The plain-text authorization message for the prefix and account.</p>"
+        },
+        "Signature":{
+          "shape":"GenericString",
+          "documentation":"<p>The signed authorization message for the prefix and account.</p>"
+        }
+      },
+      "documentation":"<p>Provides authorization for Amazon to bring a specific IP address range to a specific AWS account using bring your own IP addresses (BYOIP). </p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/global-accelerator/latest/dg/using-byoip.html\">Bring Your Own IP Addresses (BYOIP)</a> in the <i>AWS Global Accelerator Developer Guide</i>.</p>"
+    },
     "ClientAffinity":{
       "type":"string",
       "enum":[
@@ -416,13 +646,22 @@
           "shape":"IpAddressType",
           "documentation":"<p>The value for the address type must be IPv4. </p>"
         },
+        "IpAddresses":{
+          "shape":"IpAddresses",
+          "documentation":"<p>Optionally, if you've added your own IP address pool to Global Accelerator, you can choose IP addresses from your own pool to use for the accelerator's static IP addresses. You can specify one or two addresses, separated by a comma. Do not include the /32 suffix.</p> <p>If you specify only one IP address from your IP address range, Global Accelerator assigns a second static IP address for the accelerator from the AWS IP address pool.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/global-accelerator/latest/dg/using-byoip.html\">Bring Your Own IP Addresses (BYOIP)</a> in the <i>AWS Global Accelerator Developer Guide</i>.</p>"
+        },
         "Enabled":{
           "shape":"GenericBoolean",
           "documentation":"<p>Indicates whether an accelerator is enabled. The value is true or false. The default value is true. </p> <p>If the value is set to true, an accelerator cannot be deleted. If set to false, the accelerator can be deleted.</p>"
         },
         "IdempotencyToken":{
           "shape":"IdempotencyToken",
-          "documentation":"<p>A unique, case-sensitive identifier that you provide to ensure the idempotency—that is, the uniqueness—of an accelerator.</p>"
+          "documentation":"<p>A unique, case-sensitive identifier that you provide to ensure the idempotency—that is, the uniqueness—of an accelerator.</p>",
+          "idempotencyToken":true
+        },
+        "Tags":{
+          "shape":"Tags",
+          "documentation":"<p>Create tags for an accelerator.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/global-accelerator/latest/dg/tagging-in-global-accelerator.html\">Tagging in AWS Global Accelerator</a> in the <i>AWS Global Accelerator Developer Guide</i>.</p>"
         }
       }
     },
@@ -481,7 +720,8 @@
         },
         "IdempotencyToken":{
           "shape":"IdempotencyToken",
-          "documentation":"<p>A unique, case-sensitive identifier that you provide to ensure the idempotency—that is, the uniqueness—of the request.</p>"
+          "documentation":"<p>A unique, case-sensitive identifier that you provide to ensure the idempotency—that is, the uniqueness—of the request.</p>",
+          "idempotencyToken":true
         }
       }
     },
@@ -521,7 +761,8 @@
         },
         "IdempotencyToken":{
           "shape":"IdempotencyToken",
-          "documentation":"<p>A unique, case-sensitive identifier that you provide to ensure the idempotency—that is, the uniqueness—of the request.</p>"
+          "documentation":"<p>A unique, case-sensitive identifier that you provide to ensure the idempotency—that is, the uniqueness—of the request.</p>",
+          "idempotencyToken":true
         }
       }
     },
@@ -564,6 +805,25 @@
         }
       }
     },
+    "DeprovisionByoipCidrRequest":{
+      "type":"structure",
+      "required":["Cidr"],
+      "members":{
+        "Cidr":{
+          "shape":"GenericString",
+          "documentation":"<p>The address range, in CIDR notation. The prefix must be the same prefix that you specified when you provisioned the address range.</p>"
+        }
+      }
+    },
+    "DeprovisionByoipCidrResponse":{
+      "type":"structure",
+      "members":{
+        "ByoipCidr":{
+          "shape":"ByoipCidr",
+          "documentation":"<p>Information about the address range.</p>"
+        }
+      }
+    },
     "DescribeAcceleratorAttributesRequest":{
       "type":"structure",
       "required":["AcceleratorArn"],
@@ -645,7 +905,7 @@
       "members":{
         "EndpointId":{
           "shape":"GenericString",
-          "documentation":"<p>An ID for the endpoint. If the endpoint is a Network Load Balancer or Application Load Balancer, this is the Amazon Resource Name (ARN) of the resource. If the endpoint is an Elastic IP address, this is the Elastic IP address allocation ID.</p>"
+          "documentation":"<p>An ID for the endpoint. If the endpoint is a Network Load Balancer or Application Load Balancer, this is the Amazon Resource Name (ARN) of the resource. If the endpoint is an Elastic IP address, this is the Elastic IP address allocation ID. For EC2 instances, this is the EC2 instance ID. </p> <p>An Application Load Balancer can be either internal or internet-facing.</p>"
         },
         "Weight":{
           "shape":"EndpointWeight",
@@ -653,7 +913,7 @@
         },
         "ClientIPPreservationEnabled":{
           "shape":"GenericBoolean",
-          "documentation":"<p>Indicates whether client IP address preservation is enabled for an Application Load Balancer endpoint. The value is true or false. The default value is true for new accelerators. </p> <p>If the value is set to true, the client's IP address is preserved in the <code>X-Forwarded-For</code> request header as traffic travels to applications on the Application Load Balancer endpoint fronted by the accelerator.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/global-accelerator/latest/dg/introduction-how-it-works-client-ip.html\"> Viewing Client IP Addresses in AWS Global Accelerator</a> in the <i>AWS Global Accelerator Developer Guide</i>.</p>"
+          "documentation":"<p>Indicates whether client IP address preservation is enabled for an Application Load Balancer endpoint. The value is true or false. The default value is true for new accelerators. </p> <p>If the value is set to true, the client's IP address is preserved in the <code>X-Forwarded-For</code> request header as traffic travels to applications on the Application Load Balancer endpoint fronted by the accelerator.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/global-accelerator/latest/dg/preserve-client-ip-address.html\"> Preserve Client IP Addresses in AWS Global Accelerator</a> in the <i>AWS Global Accelerator Developer Guide</i>.</p>"
         }
       },
       "documentation":"<p>A complex type for endpoints.</p>"
@@ -669,7 +929,7 @@
       "members":{
         "EndpointId":{
           "shape":"GenericString",
-          "documentation":"<p>An ID for the endpoint. If the endpoint is a Network Load Balancer or Application Load Balancer, this is the Amazon Resource Name (ARN) of the resource. If the endpoint is an Elastic IP address, this is the Elastic IP address allocation ID. An Application Load Balancer can be either internal or internet-facing.</p>"
+          "documentation":"<p>An ID for the endpoint. If the endpoint is a Network Load Balancer or Application Load Balancer, this is the Amazon Resource Name (ARN) of the resource. If the endpoint is an Elastic IP address, this is the Elastic IP address allocation ID. For EC2 instances, this is the EC2 instance ID. </p> <p>An Application Load Balancer can be either internal or internet-facing.</p>"
         },
         "Weight":{
           "shape":"EndpointWeight",
@@ -797,6 +1057,14 @@
       "type":"string",
       "max":255
     },
+    "IncorrectCidrStateException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p>The CIDR that you specified is not valid for this action. For example, the state of the CIDR might be incorrect for this action.</p>",
+      "exception":true
+    },
     "InternalServiceErrorException":{
       "type":"structure",
       "members":{
@@ -892,6 +1160,32 @@
         }
       }
     },
+    "ListByoipCidrsRequest":{
+      "type":"structure",
+      "members":{
+        "MaxResults":{
+          "shape":"MaxResults",
+          "documentation":"<p>The maximum number of results to return with a single call. To retrieve the remaining results, make another call with the returned <code>nextToken</code> value.</p>"
+        },
+        "NextToken":{
+          "shape":"GenericString",
+          "documentation":"<p>The token for the next page of results.</p>"
+        }
+      }
+    },
+    "ListByoipCidrsResponse":{
+      "type":"structure",
+      "members":{
+        "ByoipCidrs":{
+          "shape":"ByoipCidrs",
+          "documentation":"<p>Information about your address ranges.</p>"
+        },
+        "NextToken":{
+          "shape":"GenericString",
+          "documentation":"<p>The token for the next page of results.</p>"
+        }
+      }
+    },
     "ListEndpointGroupsRequest":{
       "type":"structure",
       "required":["ListenerArn"],
@@ -954,6 +1248,25 @@
         }
       }
     },
+    "ListTagsForResourceRequest":{
+      "type":"structure",
+      "required":["ResourceArn"],
+      "members":{
+        "ResourceArn":{
+          "shape":"ResourceArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the accelerator to list tags for. An ARN uniquely identifies an accelerator.</p>"
+        }
+      }
+    },
+    "ListTagsForResourceResponse":{
+      "type":"structure",
+      "members":{
+        "Tags":{
+          "shape":"Tags",
+          "documentation":"<p>Root level tag for the Tags parameters.</p>"
+        }
+      }
+    },
     "Listener":{
       "type":"structure",
       "members":{
@@ -1025,6 +1338,97 @@
         "UDP"
       ]
     },
+    "ProvisionByoipCidrRequest":{
+      "type":"structure",
+      "required":[
+        "Cidr",
+        "CidrAuthorizationContext"
+      ],
+      "members":{
+        "Cidr":{
+          "shape":"GenericString",
+          "documentation":"<p>The public IPv4 address range, in CIDR notation. The most specific IP prefix that you can specify is /24. The address range cannot overlap with another address range that you've brought to this or another Region.</p>"
+        },
+        "CidrAuthorizationContext":{
+          "shape":"CidrAuthorizationContext",
+          "documentation":"<p>A signed document that proves that you are authorized to bring the specified IP address range to Amazon using BYOIP. </p>"
+        }
+      }
+    },
+    "ProvisionByoipCidrResponse":{
+      "type":"structure",
+      "members":{
+        "ByoipCidr":{
+          "shape":"ByoipCidr",
+          "documentation":"<p>Information about the address range.</p>"
+        }
+      }
+    },
+    "ResourceArn":{
+      "type":"string",
+      "max":1011,
+      "min":1
+    },
+    "Tag":{
+      "type":"structure",
+      "required":[
+        "Key",
+        "Value"
+      ],
+      "members":{
+        "Key":{
+          "shape":"TagKey",
+          "documentation":"<p>A string that contains a <code>Tag</code> key.</p>"
+        },
+        "Value":{
+          "shape":"TagValue",
+          "documentation":"<p>A string that contains a <code>Tag</code> value.</p>"
+        }
+      },
+      "documentation":"<p>A complex type that contains a <code>Tag</code> key and <code>Tag</code> value.</p>"
+    },
+    "TagKey":{
+      "type":"string",
+      "max":128,
+      "min":1
+    },
+    "TagKeys":{
+      "type":"list",
+      "member":{"shape":"TagKey"},
+      "max":200,
+      "min":0
+    },
+    "TagResourceRequest":{
+      "type":"structure",
+      "required":[
+        "ResourceArn",
+        "Tags"
+      ],
+      "members":{
+        "ResourceArn":{
+          "shape":"ResourceArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the Global Accelerator resource to add tags to. An ARN uniquely identifies a resource.</p>"
+        },
+        "Tags":{
+          "shape":"Tags",
+          "documentation":"<p>The tags to add to a resource. A tag consists of a key and a value that you define.</p>"
+        }
+      }
+    },
+    "TagResourceResponse":{
+      "type":"structure",
+      "members":{
+      }
+    },
+    "TagValue":{
+      "type":"string",
+      "max":256,
+      "min":0
+    },
+    "Tags":{
+      "type":"list",
+      "member":{"shape":"Tag"}
+    },
     "ThresholdCount":{
       "type":"integer",
       "max":10,
@@ -1036,6 +1440,28 @@
       "max":100,
       "min":0
     },
+    "UntagResourceRequest":{
+      "type":"structure",
+      "required":[
+        "ResourceArn",
+        "TagKeys"
+      ],
+      "members":{
+        "ResourceArn":{
+          "shape":"ResourceArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the Global Accelerator resource to remove tags from. An ARN uniquely identifies a resource.</p>"
+        },
+        "TagKeys":{
+          "shape":"TagKeys",
+          "documentation":"<p>The tag key pairs that you want to remove from the specified resources.</p>"
+        }
+      }
+    },
+    "UntagResourceResponse":{
+      "type":"structure",
+      "members":{
+      }
+    },
     "UpdateAcceleratorAttributesRequest":{
       "type":"structure",
       "required":["AcceleratorArn"],
@@ -1054,7 +1480,7 @@
         },
         "FlowLogsS3Prefix":{
           "shape":"GenericString",
-          "documentation":"<p>Update the prefix for the location in the Amazon S3 bucket for the flow logs. Attribute is required if <code>FlowLogsEnabled</code> is <code>true</code>. If you don’t specify a prefix, the flow logs are stored in the root of the bucket.</p>"
+          "documentation":"<p>Update the prefix for the location in the Amazon S3 bucket for the flow logs. Attribute is required if <code>FlowLogsEnabled</code> is <code>true</code>. </p> <p>If you don’t specify a prefix, the flow logs are stored in the root of the bucket. If you specify slash (/) for the S3 bucket prefix, the log file bucket folder structure will include a double slash (//), like the following:</p> <p>s3-bucket_name//AWSLogs/aws_account_id</p>"
         }
       }
     },
@@ -1175,7 +1601,26 @@
           "documentation":"<p>Information for the updated listener.</p>"
         }
       }
+    },
+    "WithdrawByoipCidrRequest":{
+      "type":"structure",
+      "required":["Cidr"],
+      "members":{
+        "Cidr":{
+          "shape":"GenericString",
+          "documentation":"<p>The address range, in CIDR notation.</p>"
+        }
+      }
+    },
+    "WithdrawByoipCidrResponse":{
+      "type":"structure",
+      "members":{
+        "ByoipCidr":{
+          "shape":"ByoipCidr",
+          "documentation":"<p>Information about the address pool.</p>"
+        }
+      }
     }
   },
-  "documentation":"<fullname>AWS Global Accelerator</fullname> <p>This is the <i>AWS Global Accelerator API Reference</i>. This guide is for developers who need detailed information about AWS Global Accelerator API actions, data types, and errors. For more information about Global Accelerator features, see the <a href=\"https://docs.aws.amazon.com/global-accelerator/latest/dg/Welcome.html\">AWS Global Accelerator Developer Guide</a>. </p> <p>AWS Global Accelerator is a network layer service in which you create accelerators to improve availability and performance for internet applications used by a global audience. </p> <important> <p>You must specify the US-West-2 (Oregon) Region to create or update accelerators.</p> </important> <p>Global Accelerator provides you with static IP addresses that you associate with your accelerator. These IP addresses are anycast from the AWS edge network and distribute incoming application traffic across multiple endpoint resources in multiple AWS Regions, which increases the availability of your applications. Endpoints can be Elastic IP addresses, Network Load Balancers, and Application Load Balancers that are located in one AWS Region or multiple Regions.</p> <p>Global Accelerator uses the AWS global network to route traffic to the optimal regional endpoint based on health, client location, and policies that you configure. The service reacts instantly to changes in health or configuration to ensure that internet traffic from clients is directed to only healthy endpoints.</p> <p>Global Accelerator includes components that work together to help you improve performance and availability for your applications:</p> <dl> <dt>Static IP address</dt> <dd> <p>AWS Global Accelerator provides you with a set of static IP addresses which are anycast from the AWS edge network and serve as the single fixed entry points for your clients. If you already have Elastic Load Balancing or Elastic IP address resources set up for your applications, you can easily add those to Global Accelerator to allow the resources to be accessed by a Global Accelerator static IP address.</p> </dd> <dt>Accelerator</dt> <dd> <p>An accelerator directs traffic to optimal endpoints over the AWS global network to improve availability and performance for your internet applications that have a global audience. Each accelerator includes one or more listeners.</p> </dd> <dt>Network zone</dt> <dd> <p>A network zone services the static IP addresses for your accelerator from a unique IP subnet. Similar to an AWS Availability Zone, a network zone is an isolated unit with its own set of physical infrastructure. When you configure an accelerator, Global Accelerator allocates two IPv4 addresses for it. If one IP address from a network zone becomes unavailable due to IP address blocking by certain client networks, or network disruptions, then client applications can retry on the healthy static IP address from the other isolated network zone.</p> </dd> <dt>Listener</dt> <dd> <p>A listener processes inbound connections from clients to Global Accelerator, based on the protocol and port that you configure. Each listener has one or more endpoint groups associated with it, and traffic is forwarded to endpoints in one of the groups. You associate endpoint groups with listeners by specifying the Regions that you want to distribute traffic to. Traffic is distributed to optimal endpoints within the endpoint groups associated with a listener.</p> </dd> <dt>Endpoint group</dt> <dd> <p>Each endpoint group is associated with a specific AWS Region. Endpoint groups include one or more endpoints in the Region. You can increase or reduce the percentage of traffic that would be otherwise directed to an endpoint group by adjusting a setting called a <i>traffic dial</i>. The traffic dial lets you easily do performance testing or blue/green deployment testing for new releases across different AWS Regions, for example. </p> </dd> <dt>Endpoint</dt> <dd> <p>An endpoint is an Elastic IP address, Network Load Balancer, or Application Load Balancer. Traffic is routed to endpoints based on several factors, including the geo-proximity to the user, the health of the endpoint, and the configuration options that you choose, such as endpoint weights. For each endpoint, you can configure weights, which are numbers that you can use to specify the proportion of traffic to route to each one. This can be useful, for example, to do performance testing within a Region.</p> </dd> </dl>"
+  "documentation":"<fullname>AWS Global Accelerator</fullname> <p>This is the <i>AWS Global Accelerator API Reference</i>. This guide is for developers who need detailed information about AWS Global Accelerator API actions, data types, and errors. For more information about Global Accelerator features, see the <a href=\"https://docs.aws.amazon.com/global-accelerator/latest/dg/Welcome.html\">AWS Global Accelerator Developer Guide</a>. </p> <p>AWS Global Accelerator is a service in which you create accelerators to improve availability and performance of your applications for local and global users. </p> <important> <p>You must specify the US West (Oregon) Region to create or update accelerators.</p> </important> <p>By default, Global Accelerator provides you with static IP addresses that you associate with your accelerator. (Instead of using the IP addresses that Global Accelerator provides, you can configure these entry points to be IPv4 addresses from your own IP address ranges that you bring to Global Accelerator.) The static IP addresses are anycast from the AWS edge network and distribute incoming application traffic across multiple endpoint resources in multiple AWS Regions, which increases the availability of your applications. Endpoints can be Network Load Balancers, Application Load Balancers, EC2 instances, or Elastic IP addresses that are located in one AWS Region or multiple Regions.</p> <p>Global Accelerator uses the AWS global network to route traffic to the optimal regional endpoint based on health, client location, and policies that you configure. The service reacts instantly to changes in health or configuration to ensure that internet traffic from clients is directed to only healthy endpoints.</p> <p>Global Accelerator includes components that work together to help you improve performance and availability for your applications:</p> <dl> <dt>Static IP address</dt> <dd> <p>By default, AWS Global Accelerator provides you with a set of static IP addresses that are anycast from the AWS edge network and serve as the single fixed entry points for your clients. Or you can configure these entry points to be IPv4 addresses from your own IP address ranges that you bring to Global Accelerator (BYOIP). For more information, see <a href=\"https://docs.aws.amazon.com/global-accelerator/latest/dg/using-byoip.html\">Bring Your Own IP Addresses (BYOIP)</a> in the <i>AWS Global Accelerator Developer Guide</i>. If you already have load balancers, EC2 instances, or Elastic IP addresses set up for your applications, you can easily add those to Global Accelerator to allow the resources to be accessed by the static IP addresses.</p> <important> <p>The static IP addresses remain assigned to your accelerator for as long as it exists, even if you disable the accelerator and it no longer accepts or routes traffic. However, when you <i>delete</i> an accelerator, you lose the static IP addresses that are assigned to it, so you can no longer route traffic by using them. You can use IAM policies with Global Accelerator to limit the users who have permissions to delete an accelerator. For more information, see <a href=\"https://docs.aws.amazon.com/global-accelerator/latest/dg/auth-and-access-control.html\">Authentication and Access Control</a> in the <i>AWS Global Accelerator Developer Guide</i>. </p> </important> </dd> <dt>Accelerator</dt> <dd> <p>An accelerator directs traffic to optimal endpoints over the AWS global network to improve availability and performance for your internet applications that have a global audience. Each accelerator includes one or more listeners.</p> </dd> <dt>DNS name</dt> <dd> <p>Global Accelerator assigns each accelerator a default Domain Name System (DNS) name, similar to <code>a1234567890abcdef.awsglobalaccelerator.com</code>, that points to your Global Accelerator static IP addresses. Depending on the use case, you can use your accelerator's static IP addresses or DNS name to route traffic to your accelerator, or set up DNS records to route traffic using your own custom domain name.</p> </dd> <dt>Network zone</dt> <dd> <p>A network zone services the static IP addresses for your accelerator from a unique IP subnet. Similar to an AWS Availability Zone, a network zone is an isolated unit with its own set of physical infrastructure. When you configure an accelerator, by default, Global Accelerator allocates two IPv4 addresses for it. If one IP address from a network zone becomes unavailable due to IP address blocking by certain client networks, or network disruptions, then client applications can retry on the healthy static IP address from the other isolated network zone.</p> </dd> <dt>Listener</dt> <dd> <p>A listener processes inbound connections from clients to Global Accelerator, based on the protocol and port that you configure. Each listener has one or more endpoint groups associated with it, and traffic is forwarded to endpoints in one of the groups. You associate endpoint groups with listeners by specifying the Regions that you want to distribute traffic to. Traffic is distributed to optimal endpoints within the endpoint groups associated with a listener.</p> </dd> <dt>Endpoint group</dt> <dd> <p>Each endpoint group is associated with a specific AWS Region. Endpoint groups include one or more endpoints in the Region. You can increase or reduce the percentage of traffic that would be otherwise directed to an endpoint group by adjusting a setting called a <i>traffic dial</i>. The traffic dial lets you easily do performance testing or blue/green deployment testing for new releases across different AWS Regions, for example. </p> </dd> <dt>Endpoint</dt> <dd> <p>An endpoint is a Network Load Balancer, Application Load Balancer, EC2 instance, or Elastic IP address. Traffic is routed to endpoints based on several factors, including the geo-proximity to the user, the health of the endpoint, and the configuration options that you choose, such as endpoint weights. For each endpoint, you can configure weights, which are numbers that you can use to specify the proportion of traffic to route to each one. This can be useful, for example, to do performance testing within a Region.</p> </dd> </dl>"
 }
diff --git a/services/glue/pom.xml b/services/glue/pom.xml
index ce82ded8ed64..4149748d6163 100644
--- a/services/glue/pom.xml
+++ b/services/glue/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>services</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>glue</artifactId>
diff --git a/services/glue/src/main/resources/codegen-resources/paginators-1.json b/services/glue/src/main/resources/codegen-resources/paginators-1.json
index dcd26900a8e8..db2863e1a530 100644
--- a/services/glue/src/main/resources/codegen-resources/paginators-1.json
+++ b/services/glue/src/main/resources/codegen-resources/paginators-1.json
@@ -101,6 +101,11 @@
       "limit_key": "MaxResults",
       "output_token": "NextToken"
     },
+    "ListMLTransforms": {
+      "input_token": "NextToken",
+      "limit_key": "MaxResults",
+      "output_token": "NextToken"
+    },
     "ListTriggers": {
       "input_token": "NextToken",
       "limit_key": "MaxResults",
diff --git a/services/glue/src/main/resources/codegen-resources/service-2.json b/services/glue/src/main/resources/codegen-resources/service-2.json
index 25704c657aae..52737c774680 100644
--- a/services/glue/src/main/resources/codegen-resources/service-2.json
+++ b/services/glue/src/main/resources/codegen-resources/service-2.json
@@ -1442,6 +1442,22 @@
       ],
       "documentation":"<p>Retrieves the names of all job resources in this AWS account, or the resources with the specified tag. This operation allows you to see which resources are available in your account, and their names.</p> <p>This operation takes the optional <code>Tags</code> field, which you can use as a filter on the response so that tagged resources can be retrieved as a group. If you choose to use tags filtering, only resources with the tag are retrieved.</p>"
     },
+    "ListMLTransforms":{
+      "name":"ListMLTransforms",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"ListMLTransformsRequest"},
+      "output":{"shape":"ListMLTransformsResponse"},
+      "errors":[
+        {"shape":"EntityNotFoundException"},
+        {"shape":"InvalidInputException"},
+        {"shape":"OperationTimeoutException"},
+        {"shape":"InternalServiceException"}
+      ],
+      "documentation":"<p> Retrieves a sortable, filterable list of existing AWS Glue machine learning transforms in this AWS account, or the resources with the specified tag. This operation takes the optional <code>Tags</code> field, which you can use as a filter of the responses so that tagged resources can be retrieved as a group. If you choose to use tag filtering, only resources with the tags are retrieved. </p>"
+    },
     "ListTriggers":{
       "name":"ListTriggers",
       "http":{
@@ -2918,7 +2934,7 @@
         },
         "ConnectionProperties":{
           "shape":"ConnectionProperties",
-          "documentation":"<p>These key-value pairs define parameters for the connection:</p> <ul> <li> <p> <code>HOST</code> - The host URI: either the fully qualified domain name (FQDN) or the IPv4 address of the database host.</p> </li> <li> <p> <code>PORT</code> - The port number, between 1024 and 65535, of the port on which the database host is listening for database connections.</p> </li> <li> <p> <code>USER_NAME</code> - The name under which to log in to the database. The value string for <code>USER_NAME</code> is \"<code>USERNAME</code>\".</p> </li> <li> <p> <code>PASSWORD</code> - A password, if one is used, for the user name.</p> </li> <li> <p> <code>ENCRYPTED_PASSWORD</code> - When you enable connection password protection by setting <code>ConnectionPasswordEncryption</code> in the Data Catalog encryption settings, this field stores the encrypted password.</p> </li> <li> <p> <code>JDBC_DRIVER_JAR_URI</code> - The Amazon Simple Storage Service (Amazon S3) path of the JAR file that contains the JDBC driver to use.</p> </li> <li> <p> <code>JDBC_DRIVER_CLASS_NAME</code> - The class name of the JDBC driver to use.</p> </li> <li> <p> <code>JDBC_ENGINE</code> - The name of the JDBC engine to use.</p> </li> <li> <p> <code>JDBC_ENGINE_VERSION</code> - The version of the JDBC engine to use.</p> </li> <li> <p> <code>CONFIG_FILES</code> - (Reserved for future use.)</p> </li> <li> <p> <code>INSTANCE_ID</code> - The instance ID to use.</p> </li> <li> <p> <code>JDBC_CONNECTION_URL</code> - The URL for the JDBC connection.</p> </li> <li> <p> <code>JDBC_ENFORCE_SSL</code> - A Boolean string (true, false) specifying whether Secure Sockets Layer (SSL) with hostname matching is enforced for the JDBC connection on the client. The default is false.</p> </li> <li> <p> <code>CUSTOM_JDBC_CERT</code> - An Amazon S3 location specifying the customer's root certificate. AWS Glue uses this root certificate to validate the customer’s certificate when connecting to the customer database. AWS Glue only handles X.509 certificates. The certificate provided must be DER-encoded and supplied in Base64 encoding PEM format.</p> </li> <li> <p> <code>SKIP_CUSTOM_JDBC_CERT_VALIDATION</code> - By default, this is <code>false</code>. AWS Glue validates the Signature algorithm and Subject Public Key Algorithm for the customer certificate. The only permitted algorithms for the Signature algorithm are SHA256withRSA, SHA384withRSA or SHA512withRSA. For the Subject Public Key Algorithm, the key length must be at least 2048. You can set the value of this property to <code>true</code> to skip AWS Glue’s validation of the customer certificate.</p> </li> <li> <p> <code>CUSTOM_JDBC_CERT_STRING</code> - A custom JDBC certificate string which is used for domain match or distinguished name match to prevent a man-in-the-middle attack. In Oracle database, this is used as the <code>SSL_SERVER_CERT_DN</code>; in Microsoft SQL Server, this is used as the <code>hostNameInCertificate</code>.</p> </li> </ul>"
+          "documentation":"<p>These key-value pairs define parameters for the connection:</p> <ul> <li> <p> <code>HOST</code> - The host URI: either the fully qualified domain name (FQDN) or the IPv4 address of the database host.</p> </li> <li> <p> <code>PORT</code> - The port number, between 1024 and 65535, of the port on which the database host is listening for database connections.</p> </li> <li> <p> <code>USER_NAME</code> - The name under which to log in to the database. The value string for <code>USER_NAME</code> is \"<code>USERNAME</code>\".</p> </li> <li> <p> <code>PASSWORD</code> - A password, if one is used, for the user name.</p> </li> <li> <p> <code>ENCRYPTED_PASSWORD</code> - When you enable connection password protection by setting <code>ConnectionPasswordEncryption</code> in the Data Catalog encryption settings, this field stores the encrypted password.</p> </li> <li> <p> <code>JDBC_DRIVER_JAR_URI</code> - The Amazon Simple Storage Service (Amazon S3) path of the JAR file that contains the JDBC driver to use.</p> </li> <li> <p> <code>JDBC_DRIVER_CLASS_NAME</code> - The class name of the JDBC driver to use.</p> </li> <li> <p> <code>JDBC_ENGINE</code> - The name of the JDBC engine to use.</p> </li> <li> <p> <code>JDBC_ENGINE_VERSION</code> - The version of the JDBC engine to use.</p> </li> <li> <p> <code>CONFIG_FILES</code> - (Reserved for future use.)</p> </li> <li> <p> <code>INSTANCE_ID</code> - The instance ID to use.</p> </li> <li> <p> <code>JDBC_CONNECTION_URL</code> - The URL for connecting to a JDBC data source.</p> </li> <li> <p> <code>JDBC_ENFORCE_SSL</code> - A Boolean string (true, false) specifying whether Secure Sockets Layer (SSL) with hostname matching is enforced for the JDBC connection on the client. The default is false.</p> </li> <li> <p> <code>CUSTOM_JDBC_CERT</code> - An Amazon S3 location specifying the customer's root certificate. AWS Glue uses this root certificate to validate the customer’s certificate when connecting to the customer database. AWS Glue only handles X.509 certificates. The certificate provided must be DER-encoded and supplied in Base64 encoding PEM format.</p> </li> <li> <p> <code>SKIP_CUSTOM_JDBC_CERT_VALIDATION</code> - By default, this is <code>false</code>. AWS Glue validates the Signature algorithm and Subject Public Key Algorithm for the customer certificate. The only permitted algorithms for the Signature algorithm are SHA256withRSA, SHA384withRSA or SHA512withRSA. For the Subject Public Key Algorithm, the key length must be at least 2048. You can set the value of this property to <code>true</code> to skip AWS Glue’s validation of the customer certificate.</p> </li> <li> <p> <code>CUSTOM_JDBC_CERT_STRING</code> - A custom JDBC certificate string which is used for domain match or distinguished name match to prevent a man-in-the-middle attack. In Oracle database, this is used as the <code>SSL_SERVER_CERT_DN</code>; in Microsoft SQL Server, this is used as the <code>hostNameInCertificate</code>.</p> </li> <li> <p> <code>CONNECTION_URL</code> - The URL for connecting to a general (non-JDBC) data source.</p> </li> </ul>"
         },
         "PhysicalConnectionRequirements":{
           "shape":"PhysicalConnectionRequirements",
@@ -2957,7 +2973,7 @@
         },
         "ConnectionType":{
           "shape":"ConnectionType",
-          "documentation":"<p>The type of the connection. Currently, only JDBC is supported; SFTP is not supported.</p>"
+          "documentation":"<p>The type of the connection. Currently, these types are supported:</p> <ul> <li> <p> <code>JDBC</code> - Designates a connection to a database through Java Database Connectivity (JDBC).</p> </li> <li> <p> <code>MONGODB</code> - Designates a connection to a MongoDB document database.</p> </li> </ul> <p>SFTP is not supported.</p>"
         },
         "MatchCriteria":{
           "shape":"MatchCriteria",
@@ -3019,14 +3035,16 @@
         "JDBC_ENFORCE_SSL",
         "CUSTOM_JDBC_CERT",
         "SKIP_CUSTOM_JDBC_CERT_VALIDATION",
-        "CUSTOM_JDBC_CERT_STRING"
+        "CUSTOM_JDBC_CERT_STRING",
+        "CONNECTION_URL"
       ]
     },
     "ConnectionType":{
       "type":"string",
       "enum":[
         "JDBC",
-        "SFTP"
+        "SFTP",
+        "MONGODB"
       ]
     },
     "ConnectionsList":{
@@ -3662,6 +3680,10 @@
           "shape":"GenericMap",
           "documentation":"<p>The default arguments for this job.</p> <p>You can specify arguments here that your own job-execution script consumes, as well as arguments that AWS Glue itself consumes.</p> <p>For information about how to specify and consume your own Job arguments, see the <a href=\"https://docs.aws.amazon.com/glue/latest/dg/aws-glue-programming-python-calling.html\">Calling AWS Glue APIs in Python</a> topic in the developer guide.</p> <p>For information about the key-value pairs that AWS Glue consumes to set up your job, see the <a href=\"https://docs.aws.amazon.com/glue/latest/dg/aws-glue-programming-etl-glue-arguments.html\">Special Parameters Used by AWS Glue</a> topic in the developer guide.</p>"
         },
+        "NonOverridableArguments":{
+          "shape":"GenericMap",
+          "documentation":"<p>Non-overridable arguments for this job, specified as name-value pairs.</p>"
+        },
         "Connections":{
           "shape":"ConnectionsList",
           "documentation":"<p>The connections used for this job.</p>"
@@ -3764,19 +3786,23 @@
         },
         "Role":{
           "shape":"RoleString",
-          "documentation":"<p>The name or Amazon Resource Name (ARN) of the IAM role with the required permissions. Ensure that this role has permission to your Amazon Simple Storage Service (Amazon S3) sources, targets, temporary directory, scripts, and any libraries that are used by the task run for this transform.</p>"
+          "documentation":"<p>The name or Amazon Resource Name (ARN) of the IAM role with the required permissions. The required permissions include both AWS Glue service role permissions to AWS Glue resources, and Amazon S3 permissions required by the transform. </p> <ul> <li> <p>This role needs AWS Glue service role permissions to allow access to resources in AWS Glue. See <a href=\"https://docs.aws.amazon.com/glue/latest/dg/attach-policy-iam-user.html\">Attach a Policy to IAM Users That Access AWS Glue</a>.</p> </li> <li> <p>This role needs permission to your Amazon Simple Storage Service (Amazon S3) sources, targets, temporary directory, scripts, and any libraries used by the task run for this transform.</p> </li> </ul>"
+        },
+        "GlueVersion":{
+          "shape":"GlueVersionString",
+          "documentation":"<p>This value determines which version of AWS Glue this machine learning transform is compatible with. Glue 1.0 is recommended for most customers. If the value is not set, the Glue compatibility defaults to Glue 0.9. For more information, see <a href=\"https://docs.aws.amazon.com/glue/latest/dg/release-notes.html#release-notes-versions\">AWS Glue Versions</a> in the developer guide.</p>"
         },
         "MaxCapacity":{
           "shape":"NullableDouble",
-          "documentation":"<p>The number of AWS Glue data processing units (DPUs) that are allocated to task runs for this transform. You can allocate from 2 to 100 DPUs; the default is 10. A DPU is a relative measure of processing power that consists of 4 vCPUs of compute capacity and 16 GB of memory. For more information, see the <a href=\"https://aws.amazon.com/glue/pricing/\">AWS Glue pricing page</a>. </p> <p>When the <code>WorkerType</code> field is set to a value other than <code>Standard</code>, the <code>MaxCapacity</code> field is set automatically and becomes read-only.</p>"
+          "documentation":"<p>The number of AWS Glue data processing units (DPUs) that are allocated to task runs for this transform. You can allocate from 2 to 100 DPUs; the default is 10. A DPU is a relative measure of processing power that consists of 4 vCPUs of compute capacity and 16 GB of memory. For more information, see the <a href=\"https://aws.amazon.com/glue/pricing/\">AWS Glue pricing page</a>. </p> <p> <code>MaxCapacity</code> is a mutually exclusive option with <code>NumberOfWorkers</code> and <code>WorkerType</code>.</p> <ul> <li> <p>If either <code>NumberOfWorkers</code> or <code>WorkerType</code> is set, then <code>MaxCapacity</code> cannot be set.</p> </li> <li> <p>If <code>MaxCapacity</code> is set then neither <code>NumberOfWorkers</code> or <code>WorkerType</code> can be set.</p> </li> <li> <p>If <code>WorkerType</code> is set, then <code>NumberOfWorkers</code> is required (and vice versa).</p> </li> <li> <p> <code>MaxCapacity</code> and <code>NumberOfWorkers</code> must both be at least 1.</p> </li> </ul> <p>When the <code>WorkerType</code> field is set to a value other than <code>Standard</code>, the <code>MaxCapacity</code> field is set automatically and becomes read-only.</p> <p>When the <code>WorkerType</code> field is set to a value other than <code>Standard</code>, the <code>MaxCapacity</code> field is set automatically and becomes read-only.</p>"
         },
         "WorkerType":{
           "shape":"WorkerType",
-          "documentation":"<p>The type of predefined worker that is allocated when this task runs. Accepts a value of Standard, G.1X, or G.2X.</p> <ul> <li> <p>For the <code>Standard</code> worker type, each worker provides 4 vCPU, 16 GB of memory and a 50GB disk, and 2 executors per worker.</p> </li> <li> <p>For the <code>G.1X</code> worker type, each worker provides 4 vCPU, 16 GB of memory and a 64GB disk, and 1 executor per worker.</p> </li> <li> <p>For the <code>G.2X</code> worker type, each worker provides 8 vCPU, 32 GB of memory and a 128GB disk, and 1 executor per worker.</p> </li> </ul>"
+          "documentation":"<p>The type of predefined worker that is allocated when this task runs. Accepts a value of Standard, G.1X, or G.2X.</p> <ul> <li> <p>For the <code>Standard</code> worker type, each worker provides 4 vCPU, 16 GB of memory and a 50GB disk, and 2 executors per worker.</p> </li> <li> <p>For the <code>G.1X</code> worker type, each worker provides 4 vCPU, 16 GB of memory and a 64GB disk, and 1 executor per worker.</p> </li> <li> <p>For the <code>G.2X</code> worker type, each worker provides 8 vCPU, 32 GB of memory and a 128GB disk, and 1 executor per worker.</p> </li> </ul> <p> <code>MaxCapacity</code> is a mutually exclusive option with <code>NumberOfWorkers</code> and <code>WorkerType</code>.</p> <ul> <li> <p>If either <code>NumberOfWorkers</code> or <code>WorkerType</code> is set, then <code>MaxCapacity</code> cannot be set.</p> </li> <li> <p>If <code>MaxCapacity</code> is set then neither <code>NumberOfWorkers</code> or <code>WorkerType</code> can be set.</p> </li> <li> <p>If <code>WorkerType</code> is set, then <code>NumberOfWorkers</code> is required (and vice versa).</p> </li> <li> <p> <code>MaxCapacity</code> and <code>NumberOfWorkers</code> must both be at least 1.</p> </li> </ul>"
         },
         "NumberOfWorkers":{
           "shape":"NullableInteger",
-          "documentation":"<p>The number of workers of a defined <code>workerType</code> that are allocated when this task runs.</p>"
+          "documentation":"<p>The number of workers of a defined <code>workerType</code> that are allocated when this task runs.</p> <p>If <code>WorkerType</code> is set, then <code>NumberOfWorkers</code> is required (and vice versa).</p>"
         },
         "Timeout":{
           "shape":"Timeout",
@@ -3785,6 +3811,10 @@
         "MaxRetries":{
           "shape":"NullableInteger",
           "documentation":"<p>The maximum number of times to retry a task for this transform after a task run fails.</p>"
+        },
+        "Tags":{
+          "shape":"TagsMap",
+          "documentation":"<p>The tags to use with this machine learning transform. You may use tags to limit access to the machine learning transform. For more information about tags in AWS Glue, see <a href=\"https://docs.aws.amazon.com/glue/latest/dg/monitor-tags.html\">AWS Tags in AWS Glue</a> in the developer guide.</p>"
         }
       }
     },
@@ -5565,6 +5595,10 @@
           "shape":"RoleString",
           "documentation":"<p>The name or Amazon Resource Name (ARN) of the IAM role with the required permissions.</p>"
         },
+        "GlueVersion":{
+          "shape":"GlueVersionString",
+          "documentation":"<p>This value determines which version of AWS Glue this machine learning transform is compatible with. Glue 1.0 is recommended for most customers. If the value is not set, the Glue compatibility defaults to Glue 0.9. For more information, see <a href=\"https://docs.aws.amazon.com/glue/latest/dg/release-notes.html#release-notes-versions\">AWS Glue Versions</a> in the developer guide.</p>"
+        },
         "MaxCapacity":{
           "shape":"NullableDouble",
           "documentation":"<p>The number of AWS Glue data processing units (DPUs) that are allocated to task runs for this transform. You can allocate from 2 to 100 DPUs; the default is 10. A DPU is a relative measure of processing power that consists of 4 vCPUs of compute capacity and 16 GB of memory. For more information, see the <a href=\"https://aws.amazon.com/glue/pricing/\">AWS Glue pricing page</a>. </p> <p>When the <code>WorkerType</code> field is set to a value other than <code>Standard</code>, the <code>MaxCapacity</code> field is set automatically and becomes read-only.</p>"
@@ -6493,6 +6527,10 @@
           "shape":"GenericMap",
           "documentation":"<p>The default arguments for this job, specified as name-value pairs.</p> <p>You can specify arguments here that your own job-execution script consumes, as well as arguments that AWS Glue itself consumes.</p> <p>For information about how to specify and consume your own Job arguments, see the <a href=\"https://docs.aws.amazon.com/glue/latest/dg/aws-glue-programming-python-calling.html\">Calling AWS Glue APIs in Python</a> topic in the developer guide.</p> <p>For information about the key-value pairs that AWS Glue consumes to set up your job, see the <a href=\"https://docs.aws.amazon.com/glue/latest/dg/aws-glue-programming-etl-glue-arguments.html\">Special Parameters Used by AWS Glue</a> topic in the developer guide.</p>"
         },
+        "NonOverridableArguments":{
+          "shape":"GenericMap",
+          "documentation":"<p>Non-overridable arguments for this job, specified as name-value pairs.</p>"
+        },
         "Connections":{
           "shape":"ConnectionsList",
           "documentation":"<p>The connections used for this job.</p>"
@@ -6769,6 +6807,10 @@
           "shape":"GenericMap",
           "documentation":"<p>The default arguments for this job.</p> <p>You can specify arguments here that your own job-execution script consumes, as well as arguments that AWS Glue itself consumes.</p> <p>For information about how to specify and consume your own Job arguments, see the <a href=\"https://docs.aws.amazon.com/glue/latest/dg/aws-glue-programming-python-calling.html\">Calling AWS Glue APIs in Python</a> topic in the developer guide.</p> <p>For information about the key-value pairs that AWS Glue consumes to set up your job, see the <a href=\"https://docs.aws.amazon.com/glue/latest/dg/aws-glue-programming-etl-glue-arguments.html\">Special Parameters Used by AWS Glue</a> topic in the developer guide.</p>"
         },
+        "NonOverridableArguments":{
+          "shape":"GenericMap",
+          "documentation":"<p>Non-overridable arguments for this job, specified as name-value pairs.</p>"
+        },
         "Connections":{
           "shape":"ConnectionsList",
           "documentation":"<p>The connections used for this job.</p>"
@@ -7002,6 +7044,45 @@
         }
       }
     },
+    "ListMLTransformsRequest":{
+      "type":"structure",
+      "members":{
+        "NextToken":{
+          "shape":"PaginationToken",
+          "documentation":"<p>A continuation token, if this is a continuation request.</p>"
+        },
+        "MaxResults":{
+          "shape":"PageSize",
+          "documentation":"<p>The maximum size of a list to return.</p>"
+        },
+        "Filter":{
+          "shape":"TransformFilterCriteria",
+          "documentation":"<p>A <code>TransformFilterCriteria</code> used to filter the machine learning transforms.</p>"
+        },
+        "Sort":{
+          "shape":"TransformSortCriteria",
+          "documentation":"<p>A <code>TransformSortCriteria</code> used to sort the machine learning transforms.</p>"
+        },
+        "Tags":{
+          "shape":"TagsMap",
+          "documentation":"<p>Specifies to return only these tagged resources.</p>"
+        }
+      }
+    },
+    "ListMLTransformsResponse":{
+      "type":"structure",
+      "required":["TransformIds"],
+      "members":{
+        "TransformIds":{
+          "shape":"TransformIdList",
+          "documentation":"<p>The identifiers of all the machine learning transforms in the account, or the machine learning transforms with the specified tags.</p>"
+        },
+        "NextToken":{
+          "shape":"PaginationToken",
+          "documentation":"<p>A continuation token, if the returned list does not contain the last metric available.</p>"
+        }
+      }
+    },
     "ListTriggersRequest":{
       "type":"structure",
       "members":{
@@ -7162,19 +7243,23 @@
         },
         "Role":{
           "shape":"RoleString",
-          "documentation":"<p>The name or Amazon Resource Name (ARN) of the IAM role with the required permissions. This role needs permission to your Amazon Simple Storage Service (Amazon S3) sources, targets, temporary directory, scripts, and any libraries used by the task run for this transform.</p>"
+          "documentation":"<p>The name or Amazon Resource Name (ARN) of the IAM role with the required permissions. The required permissions include both AWS Glue service role permissions to AWS Glue resources, and Amazon S3 permissions required by the transform. </p> <ul> <li> <p>This role needs AWS Glue service role permissions to allow access to resources in AWS Glue. See <a href=\"https://docs.aws.amazon.com/glue/latest/dg/attach-policy-iam-user.html\">Attach a Policy to IAM Users That Access AWS Glue</a>.</p> </li> <li> <p>This role needs permission to your Amazon Simple Storage Service (Amazon S3) sources, targets, temporary directory, scripts, and any libraries used by the task run for this transform.</p> </li> </ul>"
+        },
+        "GlueVersion":{
+          "shape":"GlueVersionString",
+          "documentation":"<p>This value determines which version of AWS Glue this machine learning transform is compatible with. Glue 1.0 is recommended for most customers. If the value is not set, the Glue compatibility defaults to Glue 0.9. For more information, see <a href=\"https://docs.aws.amazon.com/glue/latest/dg/release-notes.html#release-notes-versions\">AWS Glue Versions</a> in the developer guide.</p>"
         },
         "MaxCapacity":{
           "shape":"NullableDouble",
-          "documentation":"<p>The number of AWS Glue data processing units (DPUs) that are allocated to task runs for this transform. You can allocate from 2 to 100 DPUs; the default is 10. A DPU is a relative measure of processing power that consists of 4 vCPUs of compute capacity and 16 GB of memory. For more information, see the <a href=\"https://aws.amazon.com/glue/pricing/\">AWS Glue pricing page</a>. </p> <p>When the <code>WorkerType</code> field is set to a value other than <code>Standard</code>, the <code>MaxCapacity</code> field is set automatically and becomes read-only.</p>"
+          "documentation":"<p>The number of AWS Glue data processing units (DPUs) that are allocated to task runs for this transform. You can allocate from 2 to 100 DPUs; the default is 10. A DPU is a relative measure of processing power that consists of 4 vCPUs of compute capacity and 16 GB of memory. For more information, see the <a href=\"http://aws.amazon.com/glue/pricing/\">AWS Glue pricing page</a>. </p> <p> <code>MaxCapacity</code> is a mutually exclusive option with <code>NumberOfWorkers</code> and <code>WorkerType</code>.</p> <ul> <li> <p>If either <code>NumberOfWorkers</code> or <code>WorkerType</code> is set, then <code>MaxCapacity</code> cannot be set.</p> </li> <li> <p>If <code>MaxCapacity</code> is set then neither <code>NumberOfWorkers</code> or <code>WorkerType</code> can be set.</p> </li> <li> <p>If <code>WorkerType</code> is set, then <code>NumberOfWorkers</code> is required (and vice versa).</p> </li> <li> <p> <code>MaxCapacity</code> and <code>NumberOfWorkers</code> must both be at least 1.</p> </li> </ul> <p>When the <code>WorkerType</code> field is set to a value other than <code>Standard</code>, the <code>MaxCapacity</code> field is set automatically and becomes read-only.</p>"
         },
         "WorkerType":{
           "shape":"WorkerType",
-          "documentation":"<p>The type of predefined worker that is allocated when a task of this transform runs. Accepts a value of Standard, G.1X, or G.2X.</p> <ul> <li> <p>For the <code>Standard</code> worker type, each worker provides 4 vCPU, 16 GB of memory and a 50GB disk, and 2 executors per worker.</p> </li> <li> <p>For the <code>G.1X</code> worker type, each worker provides 4 vCPU, 16 GB of memory and a 64GB disk, and 1 executor per worker.</p> </li> <li> <p>For the <code>G.2X</code> worker type, each worker provides 8 vCPU, 32 GB of memory and a 128GB disk, and 1 executor per worker.</p> </li> </ul>"
+          "documentation":"<p>The type of predefined worker that is allocated when a task of this transform runs. Accepts a value of Standard, G.1X, or G.2X.</p> <ul> <li> <p>For the <code>Standard</code> worker type, each worker provides 4 vCPU, 16 GB of memory and a 50GB disk, and 2 executors per worker.</p> </li> <li> <p>For the <code>G.1X</code> worker type, each worker provides 4 vCPU, 16 GB of memory and a 64GB disk, and 1 executor per worker.</p> </li> <li> <p>For the <code>G.2X</code> worker type, each worker provides 8 vCPU, 32 GB of memory and a 128GB disk, and 1 executor per worker.</p> </li> </ul> <p> <code>MaxCapacity</code> is a mutually exclusive option with <code>NumberOfWorkers</code> and <code>WorkerType</code>.</p> <ul> <li> <p>If either <code>NumberOfWorkers</code> or <code>WorkerType</code> is set, then <code>MaxCapacity</code> cannot be set.</p> </li> <li> <p>If <code>MaxCapacity</code> is set then neither <code>NumberOfWorkers</code> or <code>WorkerType</code> can be set.</p> </li> <li> <p>If <code>WorkerType</code> is set, then <code>NumberOfWorkers</code> is required (and vice versa).</p> </li> <li> <p> <code>MaxCapacity</code> and <code>NumberOfWorkers</code> must both be at least 1.</p> </li> </ul>"
         },
         "NumberOfWorkers":{
           "shape":"NullableInteger",
-          "documentation":"<p>The number of workers of a defined <code>workerType</code> that are allocated when a task of the transform runs.</p>"
+          "documentation":"<p>The number of workers of a defined <code>workerType</code> that are allocated when a task of the transform runs.</p> <p>If <code>WorkerType</code> is set, then <code>NumberOfWorkers</code> is required (and vice versa).</p>"
         },
         "Timeout":{
           "shape":"Timeout",
@@ -8837,6 +8922,10 @@
           "shape":"TransformStatusType",
           "documentation":"<p>Filters the list of machine learning transforms by the last known status of the transforms (to indicate whether a transform can be used or not). One of \"NOT_READY\", \"READY\", or \"DELETING\".</p>"
         },
+        "GlueVersion":{
+          "shape":"GlueVersionString",
+          "documentation":"<p>This value determines which version of AWS Glue this machine learning transform is compatible with. Glue 1.0 is recommended for most customers. If the value is not set, the Glue compatibility defaults to Glue 0.9. For more information, see <a href=\"https://docs.aws.amazon.com/glue/latest/dg/release-notes.html#release-notes-versions\">AWS Glue Versions</a> in the developer guide.</p>"
+        },
         "CreatedBefore":{
           "shape":"Timestamp",
           "documentation":"<p>The time and date before which the transforms were created.</p>"
@@ -8860,6 +8949,10 @@
       },
       "documentation":"<p>The criteria used to filter the machine learning transforms.</p>"
     },
+    "TransformIdList":{
+      "type":"list",
+      "member":{"shape":"HashString"}
+    },
     "TransformList":{
       "type":"list",
       "member":{"shape":"MLTransform"}
@@ -9384,6 +9477,10 @@
           "shape":"RoleString",
           "documentation":"<p>The name or Amazon Resource Name (ARN) of the IAM role with the required permissions.</p>"
         },
+        "GlueVersion":{
+          "shape":"GlueVersionString",
+          "documentation":"<p>This value determines which version of AWS Glue this machine learning transform is compatible with. Glue 1.0 is recommended for most customers. If the value is not set, the Glue compatibility defaults to Glue 0.9. For more information, see <a href=\"https://docs.aws.amazon.com/glue/latest/dg/release-notes.html#release-notes-versions\">AWS Glue Versions</a> in the developer guide.</p>"
+        },
         "MaxCapacity":{
           "shape":"NullableDouble",
           "documentation":"<p>The number of AWS Glue data processing units (DPUs) that are allocated to task runs for this transform. You can allocate from 2 to 100 DPUs; the default is 10. A DPU is a relative measure of processing power that consists of 4 vCPUs of compute capacity and 16 GB of memory. For more information, see the <a href=\"https://aws.amazon.com/glue/pricing/\">AWS Glue pricing page</a>. </p> <p>When the <code>WorkerType</code> field is set to a value other than <code>Standard</code>, the <code>MaxCapacity</code> field is set automatically and becomes read-only.</p>"
diff --git a/services/greengrass/build.properties b/services/greengrass/build.properties
index ecf2dae6fcb1..15ec2da1fc71 100644
--- a/services/greengrass/build.properties
+++ b/services/greengrass/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/greengrass/pom.xml b/services/greengrass/pom.xml
index 0c33f5ae1950..ab3aa8a08373 100644
--- a/services/greengrass/pom.xml
+++ b/services/greengrass/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>greengrass</artifactId>
     <name>AWS Java SDK :: Services :: AWS Greengrass</name>
diff --git a/services/greengrass/src/main/resources/codegen-resources/service-2.json b/services/greengrass/src/main/resources/codegen-resources/service-2.json
index 8e0b88687415..785837e12e0e 100644
--- a/services/greengrass/src/main/resources/codegen-resources/service-2.json
+++ b/services/greengrass/src/main/resources/codegen-resources/service-2.json
@@ -2112,11 +2112,11 @@
         },
         "Id" : {
           "shape" : "__string",
-          "documentation" : "The ID of the version."
+          "documentation" : "The ID of the parent definition that the version is associated with."
         },
         "Version" : {
           "shape" : "__string",
-          "documentation" : "The unique ID of the version."
+          "documentation" : "The ID of the version."
         }
       }
     },
@@ -2212,11 +2212,11 @@
         },
         "Id" : {
           "shape" : "__string",
-          "documentation" : "The ID of the version."
+          "documentation" : "The ID of the parent definition that the version is associated with."
         },
         "Version" : {
           "shape" : "__string",
-          "documentation" : "The unique ID of the version."
+          "documentation" : "The ID of the version."
         }
       }
     },
@@ -2354,11 +2354,11 @@
         },
         "Id" : {
           "shape" : "__string",
-          "documentation" : "The ID of the version."
+          "documentation" : "The ID of the parent definition that the version is associated with."
         },
         "Version" : {
           "shape" : "__string",
-          "documentation" : "The unique ID of the version."
+          "documentation" : "The ID of the version."
         }
       }
     },
@@ -2458,11 +2458,11 @@
         },
         "Id" : {
           "shape" : "__string",
-          "documentation" : "The ID of the version."
+          "documentation" : "The ID of the parent definition that the version is associated with."
         },
         "Version" : {
           "shape" : "__string",
-          "documentation" : "The unique ID of the version."
+          "documentation" : "The ID of the version."
         }
       }
     },
@@ -2608,11 +2608,11 @@
         },
         "Id" : {
           "shape" : "__string",
-          "documentation" : "The ID of the version."
+          "documentation" : "The ID of the parent definition that the version is associated with."
         },
         "Version" : {
           "shape" : "__string",
-          "documentation" : "The unique ID of the version."
+          "documentation" : "The ID of the version."
         }
       }
     },
@@ -2707,11 +2707,11 @@
         },
         "Id" : {
           "shape" : "__string",
-          "documentation" : "The ID of the version."
+          "documentation" : "The ID of the parent definition that the version is associated with."
         },
         "Version" : {
           "shape" : "__string",
-          "documentation" : "The unique ID of the version."
+          "documentation" : "The ID of the version."
         }
       }
     },
@@ -2806,11 +2806,11 @@
         },
         "Id" : {
           "shape" : "__string",
-          "documentation" : "The ID of the version."
+          "documentation" : "The ID of the parent definition that the version is associated with."
         },
         "Version" : {
           "shape" : "__string",
-          "documentation" : "The unique ID of the version."
+          "documentation" : "The ID of the version."
         }
       }
     },
@@ -2952,11 +2952,11 @@
         },
         "Id" : {
           "shape" : "__string",
-          "documentation" : "The ID of the version."
+          "documentation" : "The ID of the parent definition that the version is associated with."
         },
         "Version" : {
           "shape" : "__string",
-          "documentation" : "The unique ID of the version."
+          "documentation" : "The ID of the version."
         }
       }
     },
@@ -5451,6 +5451,21 @@
       },
       "documentation" : "Information about a resource definition version."
     },
+    "ResourceDownloadOwnerSetting" : {
+      "type" : "structure",
+      "members" : {
+        "GroupOwner" : {
+          "shape" : "__string",
+          "documentation" : "The group owner of the resource. This is the name of an existing Linux OS group on the system or a GID. The group's permissions are added to the Lambda process."
+        },
+        "GroupPermission" : {
+          "shape" : "Permission",
+          "documentation" : "The permissions that the group owner has to the resource. Valid values are ''rw'' (read/write) or ''ro'' (read-only)."
+        }
+      },
+      "documentation" : "The owner setting for downloaded machine learning resources.",
+      "required" : [ "GroupOwner", "GroupPermission" ]
+    },
     "S3MachineLearningModelResourceData" : {
       "type" : "structure",
       "members" : {
@@ -5458,6 +5473,9 @@
           "shape" : "__string",
           "documentation" : "The absolute local path of the resource inside the Lambda environment."
         },
+        "OwnerSetting" : {
+          "shape" : "ResourceDownloadOwnerSetting"
+        },
         "S3Uri" : {
           "shape" : "__string",
           "documentation" : "The URI of the source model in an S3 bucket. The model package must be in tar.gz or .zip format."
@@ -5476,6 +5494,9 @@
           "shape" : "__string",
           "documentation" : "The absolute local path of the resource inside the Lambda environment."
         },
+        "OwnerSetting" : {
+          "shape" : "ResourceDownloadOwnerSetting"
+        },
         "SageMakerJobArn" : {
           "shape" : "__string",
           "documentation" : "The ARN of the Amazon SageMaker training job that represents the source model."
@@ -5871,12 +5892,12 @@
     "UpdateTargetsArchitecture" : {
       "type" : "string",
       "documentation" : "The architecture of the cores which are the targets of an update.",
-      "enum" : [ "armv6l", "armv7l", "x86_64", "aarch64", "openwrt" ]
+      "enum" : [ "armv6l", "armv7l", "x86_64", "aarch64" ]
     },
     "UpdateTargetsOperatingSystem" : {
       "type" : "string",
       "documentation" : "The operating system of the cores which are the targets of an update.",
-      "enum" : [ "ubuntu", "raspbian", "amazon_linux" ]
+      "enum" : [ "ubuntu", "raspbian", "amazon_linux", "openwrt" ]
     },
     "VersionInformation" : {
       "type" : "structure",
@@ -6018,4 +6039,4 @@
     }
   },
   "documentation" : "AWS IoT Greengrass seamlessly extends AWS onto physical devices so they can act locally on the data they generate, while still using the cloud for management, analytics, and durable storage. AWS IoT Greengrass ensures your devices can respond quickly to local events and operate with intermittent connectivity. AWS IoT Greengrass minimizes the cost of transmitting data to the cloud by allowing you to author AWS Lambda functions that execute locally."
-}
\ No newline at end of file
+}
diff --git a/services/groundstation/pom.xml b/services/groundstation/pom.xml
index 8fec24ccd10c..fdae2f01bca5 100644
--- a/services/groundstation/pom.xml
+++ b/services/groundstation/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>groundstation</artifactId>
     <name>AWS Java SDK :: Services :: GroundStation</name>
diff --git a/services/groundstation/src/main/resources/codegen-resources/paginators-1.json b/services/groundstation/src/main/resources/codegen-resources/paginators-1.json
index c9d1ca95baf9..373acccef58a 100644
--- a/services/groundstation/src/main/resources/codegen-resources/paginators-1.json
+++ b/services/groundstation/src/main/resources/codegen-resources/paginators-1.json
@@ -2,39 +2,39 @@
   "pagination": {
     "ListConfigs": {
       "input_token": "nextToken",
-      "limit_key": "maxResults",
       "output_token": "nextToken",
+      "limit_key": "maxResults",
       "result_key": "configList"
     },
     "ListContacts": {
       "input_token": "nextToken",
-      "limit_key": "maxResults",
       "output_token": "nextToken",
+      "limit_key": "maxResults",
       "result_key": "contactList"
     },
     "ListDataflowEndpointGroups": {
       "input_token": "nextToken",
-      "limit_key": "maxResults",
       "output_token": "nextToken",
+      "limit_key": "maxResults",
       "result_key": "dataflowEndpointGroupList"
     },
-    "ListMissionProfiles": {
+    "ListGroundStations": {
       "input_token": "nextToken",
-      "limit_key": "maxResults",
       "output_token": "nextToken",
-      "result_key": "missionProfileList"
+      "limit_key": "maxResults",
+      "result_key": "groundStationList"
     },
-    "ListGroundStations": {
+    "ListMissionProfiles": {
       "input_token": "nextToken",
-      "limit_key": "maxResults",
       "output_token": "nextToken",
-      "result_key": "groundStationList"
+      "limit_key": "maxResults",
+      "result_key": "missionProfileList"
     },
     "ListSatellites": {
       "input_token": "nextToken",
-      "limit_key": "maxResults",
       "output_token": "nextToken",
+      "limit_key": "maxResults",
       "result_key": "satellites"
     }
   }
-}
\ No newline at end of file
+}
diff --git a/services/groundstation/src/main/resources/codegen-resources/service-2.json b/services/groundstation/src/main/resources/codegen-resources/service-2.json
index e5d3cc13bc62..e3859e01946f 100644
--- a/services/groundstation/src/main/resources/codegen-resources/service-2.json
+++ b/services/groundstation/src/main/resources/codegen-resources/service-2.json
@@ -1,2355 +1,2056 @@
 {
-  "version": "2.0",
-  "metadata": {
-    "apiVersion": "2019-05-23",
-    "endpointPrefix": "groundstation",
-    "jsonVersion": "1.1",
-    "protocol": "rest-json",
-    "serviceFullName": "AWS Ground Station",
-    "serviceId": "GroundStation",
-    "signatureVersion": "v4",
-    "signingName": "groundstation",
-    "uid": "groundstation-2019-05-23"
+  "version":"2.0",
+  "metadata":{
+    "apiVersion":"2019-05-23",
+    "endpointPrefix":"groundstation",
+    "jsonVersion":"1.1",
+    "protocol":"rest-json",
+    "serviceFullName":"AWS Ground Station",
+    "serviceId":"GroundStation",
+    "signatureVersion":"v4",
+    "signingName":"groundstation",
+    "uid":"groundstation-2019-05-23"
   },
-  "documentation": "<p>Welcome to the AWS Ground Station API Reference. AWS Ground Station is a fully managed service that\n      enables you to control satellite communications, downlink and process satellite data, and\n      scale your satellite operations efficiently and cost-effectively without having\n      to build or manage your own ground station infrastructure.</p>",
-  "operations": {
-    "CancelContact": {
-      "name": "CancelContact",
-      "http": {
-        "method": "DELETE",
-        "requestUri": "/contact/{contactId}",
-        "responseCode": 200
-      },
-      "input": {
-        "shape": "CancelContactRequest"
-      },
-      "output": {
-        "shape": "ContactIdResponse"
-      },
-      "errors": [
-        {
-          "shape": "DependencyException"
-        },
-        {
-          "shape": "InvalidParameterException"
-        },
-        {
-          "shape": "ResourceNotFoundException"
-        }
+  "operations":{
+    "CancelContact":{
+      "name":"CancelContact",
+      "http":{
+        "method":"DELETE",
+        "requestUri":"/contact/{contactId}",
+        "responseCode":200
+      },
+      "input":{"shape":"CancelContactRequest"},
+      "output":{"shape":"ContactIdResponse"},
+      "errors":[
+        {"shape":"InvalidParameterException"},
+        {"shape":"DependencyException"},
+        {"shape":"ResourceNotFoundException"}
       ],
-      "documentation": "<p>Cancels a contact with a specified contact ID.</p>",
-      "idempotent": true
-    },
-    "CreateConfig": {
-      "name": "CreateConfig",
-      "http": {
-        "method": "POST",
-        "requestUri": "/config",
-        "responseCode": 200
-      },
-      "input": {
-        "shape": "CreateConfigRequest"
-      },
-      "output": {
-        "shape": "ConfigIdResponse"
-      },
-      "errors": [
-        {
-          "shape": "DependencyException"
-        },
-        {
-          "shape": "InvalidParameterException"
-        },
-        {
-          "shape": "ResourceNotFoundException"
-        }
+      "documentation":"<p>Cancels a contact with a specified contact ID.</p>",
+      "idempotent":true
+    },
+    "CreateConfig":{
+      "name":"CreateConfig",
+      "http":{
+        "method":"POST",
+        "requestUri":"/config",
+        "responseCode":200
+      },
+      "input":{"shape":"CreateConfigRequest"},
+      "output":{"shape":"ConfigIdResponse"},
+      "errors":[
+        {"shape":"InvalidParameterException"},
+        {"shape":"DependencyException"},
+        {"shape":"ResourceLimitExceededException"},
+        {"shape":"ResourceNotFoundException"}
       ],
-      "documentation": "<p>Creates a <code>Config</code> with the specified <code>configData</code> parameters.</p>\n         <p>Only one type of <code>configData</code> can be specified.</p>"
-    },
-    "CreateDataflowEndpointGroup": {
-      "name": "CreateDataflowEndpointGroup",
-      "http": {
-        "method": "POST",
-        "requestUri": "/dataflowEndpointGroup",
-        "responseCode": 200
-      },
-      "input": {
-        "shape": "CreateDataflowEndpointGroupRequest"
-      },
-      "output": {
-        "shape": "DataflowEndpointGroupIdResponse"
-      },
-      "errors": [
-        {
-          "shape": "DependencyException"
-        },
-        {
-          "shape": "InvalidParameterException"
-        },
-        {
-          "shape": "ResourceNotFoundException"
-        }
+      "documentation":"<p>Creates a <code>Config</code> with the specified <code>configData</code> parameters.</p> <p>Only one type of <code>configData</code> can be specified.</p>"
+    },
+    "CreateDataflowEndpointGroup":{
+      "name":"CreateDataflowEndpointGroup",
+      "http":{
+        "method":"POST",
+        "requestUri":"/dataflowEndpointGroup",
+        "responseCode":200
+      },
+      "input":{"shape":"CreateDataflowEndpointGroupRequest"},
+      "output":{"shape":"DataflowEndpointGroupIdResponse"},
+      "errors":[
+        {"shape":"InvalidParameterException"},
+        {"shape":"DependencyException"},
+        {"shape":"ResourceNotFoundException"}
       ],
-      "documentation": "<p>Creates a <code>DataflowEndpoint</code> group containing the specified list of <code>DataflowEndpoint</code> objects.</p>\n         <p>The <code>name</code> field in each endpoint is used in your mission profile <code>DataflowEndpointConfig</code> \n         to specify which endpoints to use during a contact.</p> \n         <p>When a contact uses multiple <code>DataflowEndpointConfig</code> objects, each <code>Config</code> \n         must match a <code>DataflowEndpoint</code> in the same group.</p>"
-    },
-    "CreateMissionProfile": {
-      "name": "CreateMissionProfile",
-      "http": {
-        "method": "POST",
-        "requestUri": "/missionprofile",
-        "responseCode": 200
-      },
-      "input": {
-        "shape": "CreateMissionProfileRequest"
-      },
-      "output": {
-        "shape": "MissionProfileIdResponse"
-      },
-      "errors": [
-        {
-          "shape": "DependencyException"
-        },
-        {
-          "shape": "InvalidParameterException"
-        },
-        {
-          "shape": "ResourceNotFoundException"
-        }
+      "documentation":"<p>Creates a <code>DataflowEndpoint</code> group containing the specified list of <code>DataflowEndpoint</code> objects.</p> <p>The <code>name</code> field in each endpoint is used in your mission profile <code>DataflowEndpointConfig</code> to specify which endpoints to use during a contact.</p> <p>When a contact uses multiple <code>DataflowEndpointConfig</code> objects, each <code>Config</code> must match a <code>DataflowEndpoint</code> in the same group.</p>"
+    },
+    "CreateMissionProfile":{
+      "name":"CreateMissionProfile",
+      "http":{
+        "method":"POST",
+        "requestUri":"/missionprofile",
+        "responseCode":200
+      },
+      "input":{"shape":"CreateMissionProfileRequest"},
+      "output":{"shape":"MissionProfileIdResponse"},
+      "errors":[
+        {"shape":"InvalidParameterException"},
+        {"shape":"DependencyException"},
+        {"shape":"ResourceNotFoundException"}
       ],
-      "documentation": "<p>Creates a mission profile.</p>\n         <p>\n            <code>dataflowEdges</code> is a list of lists of strings. Each lower level list of strings\n         has two elements: a <i>from ARN</i> and a <i>to ARN</i>.</p>"
-    },
-    "DeleteConfig": {
-      "name": "DeleteConfig",
-      "http": {
-        "method": "DELETE",
-        "requestUri": "/config/{configType}/{configId}",
-        "responseCode": 200
-      },
-      "input": {
-        "shape": "DeleteConfigRequest"
-      },
-      "output": {
-        "shape": "ConfigIdResponse"
-      },
-      "errors": [
-        {
-          "shape": "DependencyException"
-        },
-        {
-          "shape": "InvalidParameterException"
-        },
-        {
-          "shape": "ResourceNotFoundException"
-        }
+      "documentation":"<p>Creates a mission profile.</p> <p> <code>dataflowEdges</code> is a list of lists of strings. Each lower level list of strings has two elements: a <i>from</i> ARN and a <i>to</i> ARN.</p>"
+    },
+    "DeleteConfig":{
+      "name":"DeleteConfig",
+      "http":{
+        "method":"DELETE",
+        "requestUri":"/config/{configType}/{configId}",
+        "responseCode":200
+      },
+      "input":{"shape":"DeleteConfigRequest"},
+      "output":{"shape":"ConfigIdResponse"},
+      "errors":[
+        {"shape":"InvalidParameterException"},
+        {"shape":"DependencyException"},
+        {"shape":"ResourceNotFoundException"}
       ],
-      "documentation": "<p>Deletes a <code>Config</code>.</p>",
-      "idempotent": true
-    },
-    "DeleteDataflowEndpointGroup": {
-      "name": "DeleteDataflowEndpointGroup",
-      "http": {
-        "method": "DELETE",
-        "requestUri": "/dataflowEndpointGroup/{dataflowEndpointGroupId}",
-        "responseCode": 200
-      },
-      "input": {
-        "shape": "DeleteDataflowEndpointGroupRequest"
-      },
-      "output": {
-        "shape": "DataflowEndpointGroupIdResponse"
-      },
-      "errors": [
-        {
-          "shape": "DependencyException"
-        },
-        {
-          "shape": "InvalidParameterException"
-        },
-        {
-          "shape": "ResourceNotFoundException"
-        }
+      "documentation":"<p>Deletes a <code>Config</code>.</p>",
+      "idempotent":true
+    },
+    "DeleteDataflowEndpointGroup":{
+      "name":"DeleteDataflowEndpointGroup",
+      "http":{
+        "method":"DELETE",
+        "requestUri":"/dataflowEndpointGroup/{dataflowEndpointGroupId}",
+        "responseCode":200
+      },
+      "input":{"shape":"DeleteDataflowEndpointGroupRequest"},
+      "output":{"shape":"DataflowEndpointGroupIdResponse"},
+      "errors":[
+        {"shape":"InvalidParameterException"},
+        {"shape":"DependencyException"},
+        {"shape":"ResourceNotFoundException"}
       ],
-      "documentation": "<p>Deletes a dataflow endpoint group.</p>",
-      "idempotent": true
-    },
-    "DeleteMissionProfile": {
-      "name": "DeleteMissionProfile",
-      "http": {
-        "method": "DELETE",
-        "requestUri": "/missionprofile/{missionProfileId}",
-        "responseCode": 200
-      },
-      "input": {
-        "shape": "DeleteMissionProfileRequest"
-      },
-      "output": {
-        "shape": "MissionProfileIdResponse"
-      },
-      "errors": [
-        {
-          "shape": "DependencyException"
-        },
-        {
-          "shape": "InvalidParameterException"
-        },
-        {
-          "shape": "ResourceNotFoundException"
-        }
+      "documentation":"<p>Deletes a dataflow endpoint group.</p>",
+      "idempotent":true
+    },
+    "DeleteMissionProfile":{
+      "name":"DeleteMissionProfile",
+      "http":{
+        "method":"DELETE",
+        "requestUri":"/missionprofile/{missionProfileId}",
+        "responseCode":200
+      },
+      "input":{"shape":"DeleteMissionProfileRequest"},
+      "output":{"shape":"MissionProfileIdResponse"},
+      "errors":[
+        {"shape":"InvalidParameterException"},
+        {"shape":"DependencyException"},
+        {"shape":"ResourceNotFoundException"}
       ],
-      "documentation": "<p>Deletes a mission profile.</p>",
-      "idempotent": true
-    },
-    "DescribeContact": {
-      "name": "DescribeContact",
-      "http": {
-        "method": "GET",
-        "requestUri": "/contact/{contactId}",
-        "responseCode": 200
-      },
-      "input": {
-        "shape": "DescribeContactRequest"
-      },
-      "output": {
-        "shape": "DescribeContactResponse"
-      },
-      "errors": [
-        {
-          "shape": "DependencyException"
-        },
-        {
-          "shape": "InvalidParameterException"
-        },
-        {
-          "shape": "ResourceNotFoundException"
-        }
+      "documentation":"<p>Deletes a mission profile.</p>",
+      "idempotent":true
+    },
+    "DescribeContact":{
+      "name":"DescribeContact",
+      "http":{
+        "method":"GET",
+        "requestUri":"/contact/{contactId}",
+        "responseCode":200
+      },
+      "input":{"shape":"DescribeContactRequest"},
+      "output":{"shape":"DescribeContactResponse"},
+      "errors":[
+        {"shape":"InvalidParameterException"},
+        {"shape":"DependencyException"},
+        {"shape":"ResourceNotFoundException"}
       ],
-      "documentation": "<p>Describes an existing contact.</p>"
-    },
-    "GetConfig": {
-      "name": "GetConfig",
-      "http": {
-        "method": "GET",
-        "requestUri": "/config/{configType}/{configId}",
-        "responseCode": 200
-      },
-      "input": {
-        "shape": "GetConfigRequest"
-      },
-      "output": {
-        "shape": "GetConfigResponse"
-      },
-      "errors": [
-        {
-          "shape": "DependencyException"
-        },
-        {
-          "shape": "InvalidParameterException"
-        },
-        {
-          "shape": "ResourceNotFoundException"
-        }
+      "documentation":"<p>Describes an existing contact.</p>"
+    },
+    "GetConfig":{
+      "name":"GetConfig",
+      "http":{
+        "method":"GET",
+        "requestUri":"/config/{configType}/{configId}",
+        "responseCode":200
+      },
+      "input":{"shape":"GetConfigRequest"},
+      "output":{"shape":"GetConfigResponse"},
+      "errors":[
+        {"shape":"InvalidParameterException"},
+        {"shape":"DependencyException"},
+        {"shape":"ResourceNotFoundException"}
       ],
-      "documentation": "<p>Returns <code>Config</code> information.</p>\n         <p>Only one <code>Config</code> response can be returned.</p>"
-    },
-    "GetDataflowEndpointGroup": {
-      "name": "GetDataflowEndpointGroup",
-      "http": {
-        "method": "GET",
-        "requestUri": "/dataflowEndpointGroup/{dataflowEndpointGroupId}",
-        "responseCode": 200
-      },
-      "input": {
-        "shape": "GetDataflowEndpointGroupRequest"
-      },
-      "output": {
-        "shape": "GetDataflowEndpointGroupResponse"
-      },
-      "errors": [
-        {
-          "shape": "DependencyException"
-        },
-        {
-          "shape": "InvalidParameterException"
-        },
-        {
-          "shape": "ResourceNotFoundException"
-        }
+      "documentation":"<p>Returns <code>Config</code> information.</p> <p>Only one <code>Config</code> response can be returned.</p>"
+    },
+    "GetDataflowEndpointGroup":{
+      "name":"GetDataflowEndpointGroup",
+      "http":{
+        "method":"GET",
+        "requestUri":"/dataflowEndpointGroup/{dataflowEndpointGroupId}",
+        "responseCode":200
+      },
+      "input":{"shape":"GetDataflowEndpointGroupRequest"},
+      "output":{"shape":"GetDataflowEndpointGroupResponse"},
+      "errors":[
+        {"shape":"InvalidParameterException"},
+        {"shape":"DependencyException"},
+        {"shape":"ResourceNotFoundException"}
       ],
-      "documentation": "<p>Returns the dataflow endpoint group.</p>"
-    },
-    "GetMissionProfile": {
-      "name": "GetMissionProfile",
-      "http": {
-        "method": "GET",
-        "requestUri": "/missionprofile/{missionProfileId}",
-        "responseCode": 200
-      },
-      "input": {
-        "shape": "GetMissionProfileRequest"
-      },
-      "output": {
-        "shape": "GetMissionProfileResponse"
-      },
-      "errors": [
-        {
-          "shape": "DependencyException"
-        },
-        {
-          "shape": "InvalidParameterException"
-        },
-        {
-          "shape": "ResourceNotFoundException"
-        }
+      "documentation":"<p>Returns the dataflow endpoint group.</p>"
+    },
+    "GetMinuteUsage":{
+      "name":"GetMinuteUsage",
+      "http":{
+        "method":"POST",
+        "requestUri":"/minute-usage",
+        "responseCode":200
+      },
+      "input":{"shape":"GetMinuteUsageRequest"},
+      "output":{"shape":"GetMinuteUsageResponse"},
+      "errors":[
+        {"shape":"InvalidParameterException"},
+        {"shape":"DependencyException"},
+        {"shape":"ResourceNotFoundException"}
       ],
-      "documentation": "<p>Returns a mission profile.</p>"
-    },
-    "ListConfigs": {
-      "name": "ListConfigs",
-      "http": {
-        "method": "GET",
-        "requestUri": "/config",
-        "responseCode": 200
-      },
-      "input": {
-        "shape": "ListConfigsRequest"
-      },
-      "output": {
-        "shape": "ListConfigsResponse"
-      },
-      "errors": [
-        {
-          "shape": "DependencyException"
-        },
-        {
-          "shape": "InvalidParameterException"
-        },
-        {
-          "shape": "ResourceNotFoundException"
-        }
+      "documentation":"<p>Returns the number of minutes used by account.</p>"
+    },
+    "GetMissionProfile":{
+      "name":"GetMissionProfile",
+      "http":{
+        "method":"GET",
+        "requestUri":"/missionprofile/{missionProfileId}",
+        "responseCode":200
+      },
+      "input":{"shape":"GetMissionProfileRequest"},
+      "output":{"shape":"GetMissionProfileResponse"},
+      "errors":[
+        {"shape":"InvalidParameterException"},
+        {"shape":"DependencyException"},
+        {"shape":"ResourceNotFoundException"}
       ],
-      "documentation": "<p>Returns a list of <code>Config</code> objects.</p>"
-    },
-    "ListContacts": {
-      "name": "ListContacts",
-      "http": {
-        "method": "POST",
-        "requestUri": "/contacts",
-        "responseCode": 200
-      },
-      "input": {
-        "shape": "ListContactsRequest"
-      },
-      "output": {
-        "shape": "ListContactsResponse"
-      },
-      "errors": [
-        {
-          "shape": "DependencyException"
-        },
-        {
-          "shape": "InvalidParameterException"
-        },
-        {
-          "shape": "ResourceNotFoundException"
-        }
+      "documentation":"<p>Returns a mission profile.</p>"
+    },
+    "GetSatellite":{
+      "name":"GetSatellite",
+      "http":{
+        "method":"GET",
+        "requestUri":"/satellite/{satelliteId}",
+        "responseCode":200
+      },
+      "input":{"shape":"GetSatelliteRequest"},
+      "output":{"shape":"GetSatelliteResponse"},
+      "errors":[
+        {"shape":"InvalidParameterException"},
+        {"shape":"DependencyException"},
+        {"shape":"ResourceNotFoundException"}
       ],
-      "documentation": "<p>Returns a list of contacts.</p>\n         <p>If <code>statusList</code> contains AVAILABLE, the request must include\n      <code>groundstation</code>, <code>missionprofileArn</code>, and <code>satelliteArn</code>.\n      </p>"
-    },
-    "ListDataflowEndpointGroups": {
-      "name": "ListDataflowEndpointGroups",
-      "http": {
-        "method": "GET",
-        "requestUri": "/dataflowEndpointGroup",
-        "responseCode": 200
-      },
-      "input": {
-        "shape": "ListDataflowEndpointGroupsRequest"
-      },
-      "output": {
-        "shape": "ListDataflowEndpointGroupsResponse"
-      },
-      "errors": [
-        {
-          "shape": "DependencyException"
-        },
-        {
-          "shape": "InvalidParameterException"
-        },
-        {
-          "shape": "ResourceNotFoundException"
-        }
+      "documentation":"<p>Returns a satellite.</p>"
+    },
+    "ListConfigs":{
+      "name":"ListConfigs",
+      "http":{
+        "method":"GET",
+        "requestUri":"/config",
+        "responseCode":200
+      },
+      "input":{"shape":"ListConfigsRequest"},
+      "output":{"shape":"ListConfigsResponse"},
+      "errors":[
+        {"shape":"InvalidParameterException"},
+        {"shape":"DependencyException"},
+        {"shape":"ResourceNotFoundException"}
       ],
-      "documentation": "<p>Returns a list of <code>DataflowEndpoint</code> groups.</p>"
-    },
-    "ListMissionProfiles": {
-      "name": "ListMissionProfiles",
-      "http": {
-        "method": "GET",
-        "requestUri": "/missionprofile",
-        "responseCode": 200
-      },
-      "input": {
-        "shape": "ListMissionProfilesRequest"
-      },
-      "output": {
-        "shape": "ListMissionProfilesResponse"
-      },
-      "errors": [
-        {
-          "shape": "DependencyException"
-        },
-        {
-          "shape": "InvalidParameterException"
-        },
-        {
-          "shape": "ResourceNotFoundException"
-        }
+      "documentation":"<p>Returns a list of <code>Config</code> objects.</p>"
+    },
+    "ListContacts":{
+      "name":"ListContacts",
+      "http":{
+        "method":"POST",
+        "requestUri":"/contacts",
+        "responseCode":200
+      },
+      "input":{"shape":"ListContactsRequest"},
+      "output":{"shape":"ListContactsResponse"},
+      "errors":[
+        {"shape":"InvalidParameterException"},
+        {"shape":"DependencyException"},
+        {"shape":"ResourceNotFoundException"}
       ],
-      "documentation": "<p>Returns a list of mission profiles.</p>"
-    },
-    "ReserveContact": {
-      "name": "ReserveContact",
-      "http": {
-        "method": "POST",
-        "requestUri": "/contact",
-        "responseCode": 200
-      },
-      "input": {
-        "shape": "ReserveContactRequest"
-      },
-      "output": {
-        "shape": "ContactIdResponse"
-      },
-      "errors": [
-        {
-          "shape": "DependencyException"
-        },
-        {
-          "shape": "InvalidParameterException"
-        },
-        {
-          "shape": "ResourceNotFoundException"
-        }
+      "documentation":"<p>Returns a list of contacts.</p> <p>If <code>statusList</code> contains AVAILABLE, the request must include <code>groundStation</code>, <code>missionprofileArn</code>, and <code>satelliteArn</code>. </p>"
+    },
+    "ListDataflowEndpointGroups":{
+      "name":"ListDataflowEndpointGroups",
+      "http":{
+        "method":"GET",
+        "requestUri":"/dataflowEndpointGroup",
+        "responseCode":200
+      },
+      "input":{"shape":"ListDataflowEndpointGroupsRequest"},
+      "output":{"shape":"ListDataflowEndpointGroupsResponse"},
+      "errors":[
+        {"shape":"InvalidParameterException"},
+        {"shape":"DependencyException"},
+        {"shape":"ResourceNotFoundException"}
       ],
-      "documentation": "<p>Reserves a contact using specified parameters.</p>"
-    },
-    "UpdateConfig": {
-      "name": "UpdateConfig",
-      "http": {
-        "method": "PUT",
-        "requestUri": "/config/{configType}/{configId}",
-        "responseCode": 200
-      },
-      "input": {
-        "shape": "UpdateConfigRequest"
-      },
-      "output": {
-        "shape": "ConfigIdResponse"
-      },
-      "errors": [
-        {
-          "shape": "DependencyException"
-        },
-        {
-          "shape": "InvalidParameterException"
-        },
-        {
-          "shape": "ResourceNotFoundException"
-        }
+      "documentation":"<p>Returns a list of <code>DataflowEndpoint</code> groups.</p>"
+    },
+    "ListGroundStations":{
+      "name":"ListGroundStations",
+      "http":{
+        "method":"GET",
+        "requestUri":"/groundstation",
+        "responseCode":200
+      },
+      "input":{"shape":"ListGroundStationsRequest"},
+      "output":{"shape":"ListGroundStationsResponse"},
+      "errors":[
+        {"shape":"InvalidParameterException"},
+        {"shape":"DependencyException"},
+        {"shape":"ResourceNotFoundException"}
       ],
-      "documentation": "<p>Updates the <code>Config</code> used when scheduling contacts.</p>\n         <p>Updating a <code>Config</code> will not update the execution parameters\n         for existing future contacts scheduled with this <code>Config</code>.</p>",
-      "idempotent": true
-    },
-    "UpdateMissionProfile": {
-      "name": "UpdateMissionProfile",
-      "http": {
-        "method": "PUT",
-        "requestUri": "/missionprofile/{missionProfileId}",
-        "responseCode": 200
-      },
-      "input": {
-        "shape": "UpdateMissionProfileRequest"
-      },
-      "output": {
-        "shape": "MissionProfileIdResponse"
-      },
-      "errors": [
-        {
-          "shape": "DependencyException"
-        },
-        {
-          "shape": "InvalidParameterException"
-        },
-        {
-          "shape": "ResourceNotFoundException"
-        }
+      "documentation":"<p>Returns a list of ground stations. </p>"
+    },
+    "ListMissionProfiles":{
+      "name":"ListMissionProfiles",
+      "http":{
+        "method":"GET",
+        "requestUri":"/missionprofile",
+        "responseCode":200
+      },
+      "input":{"shape":"ListMissionProfilesRequest"},
+      "output":{"shape":"ListMissionProfilesResponse"},
+      "errors":[
+        {"shape":"InvalidParameterException"},
+        {"shape":"DependencyException"},
+        {"shape":"ResourceNotFoundException"}
+      ],
+      "documentation":"<p>Returns a list of mission profiles.</p>"
+    },
+    "ListSatellites":{
+      "name":"ListSatellites",
+      "http":{
+        "method":"GET",
+        "requestUri":"/satellite",
+        "responseCode":200
+      },
+      "input":{"shape":"ListSatellitesRequest"},
+      "output":{"shape":"ListSatellitesResponse"},
+      "errors":[
+        {"shape":"InvalidParameterException"},
+        {"shape":"DependencyException"},
+        {"shape":"ResourceNotFoundException"}
       ],
-      "documentation": "<p>Updates a mission profile.</p>\n         <p>Updating a mission profile will not update the execution parameters\n         for existing future contacts.</p>",
-      "idempotent": true
+      "documentation":"<p>Returns a list of satellites.</p>"
+    },
+    "ListTagsForResource":{
+      "name":"ListTagsForResource",
+      "http":{
+        "method":"GET",
+        "requestUri":"/tags/{resourceArn}",
+        "responseCode":200
+      },
+      "input":{"shape":"ListTagsForResourceRequest"},
+      "output":{"shape":"ListTagsForResourceResponse"},
+      "errors":[
+        {"shape":"InvalidParameterException"},
+        {"shape":"DependencyException"},
+        {"shape":"ResourceNotFoundException"}
+      ],
+      "documentation":"<p>Returns a list of tags for a specified resource.</p>"
+    },
+    "ReserveContact":{
+      "name":"ReserveContact",
+      "http":{
+        "method":"POST",
+        "requestUri":"/contact",
+        "responseCode":200
+      },
+      "input":{"shape":"ReserveContactRequest"},
+      "output":{"shape":"ContactIdResponse"},
+      "errors":[
+        {"shape":"InvalidParameterException"},
+        {"shape":"DependencyException"},
+        {"shape":"ResourceNotFoundException"}
+      ],
+      "documentation":"<p>Reserves a contact using specified parameters.</p>"
+    },
+    "TagResource":{
+      "name":"TagResource",
+      "http":{
+        "method":"POST",
+        "requestUri":"/tags/{resourceArn}",
+        "responseCode":200
+      },
+      "input":{"shape":"TagResourceRequest"},
+      "output":{"shape":"TagResourceResponse"},
+      "errors":[
+        {"shape":"InvalidParameterException"},
+        {"shape":"DependencyException"},
+        {"shape":"ResourceNotFoundException"}
+      ],
+      "documentation":"<p>Assigns a tag to a resource.</p>"
+    },
+    "UntagResource":{
+      "name":"UntagResource",
+      "http":{
+        "method":"DELETE",
+        "requestUri":"/tags/{resourceArn}",
+        "responseCode":200
+      },
+      "input":{"shape":"UntagResourceRequest"},
+      "output":{"shape":"UntagResourceResponse"},
+      "errors":[
+        {"shape":"InvalidParameterException"},
+        {"shape":"DependencyException"},
+        {"shape":"ResourceNotFoundException"}
+      ],
+      "documentation":"<p>Deassigns a resource tag.</p>",
+      "idempotent":true
+    },
+    "UpdateConfig":{
+      "name":"UpdateConfig",
+      "http":{
+        "method":"PUT",
+        "requestUri":"/config/{configType}/{configId}",
+        "responseCode":200
+      },
+      "input":{"shape":"UpdateConfigRequest"},
+      "output":{"shape":"ConfigIdResponse"},
+      "errors":[
+        {"shape":"InvalidParameterException"},
+        {"shape":"DependencyException"},
+        {"shape":"ResourceNotFoundException"}
+      ],
+      "documentation":"<p>Updates the <code>Config</code> used when scheduling contacts.</p> <p>Updating a <code>Config</code> will not update the execution parameters for existing future contacts scheduled with this <code>Config</code>.</p>",
+      "idempotent":true
+    },
+    "UpdateMissionProfile":{
+      "name":"UpdateMissionProfile",
+      "http":{
+        "method":"PUT",
+        "requestUri":"/missionprofile/{missionProfileId}",
+        "responseCode":200
+      },
+      "input":{"shape":"UpdateMissionProfileRequest"},
+      "output":{"shape":"MissionProfileIdResponse"},
+      "errors":[
+        {"shape":"InvalidParameterException"},
+        {"shape":"DependencyException"},
+        {"shape":"ResourceNotFoundException"}
+      ],
+      "documentation":"<p>Updates a mission profile.</p> <p>Updating a mission profile will not update the execution parameters for existing future contacts.</p>",
+      "idempotent":true
+    }
+  },
+  "shapes":{
+    "AngleUnits":{
+      "type":"string",
+      "enum":[
+        "DEGREE_ANGLE",
+        "RADIAN"
+      ]
     },
-    "GetMinuteUsage": {
-      "name": "GetMinuteUsage",
-      "http": {
-        "method": "POST",
-        "requestUri": "/minute-usage",
-        "responseCode": 200
-      },
-      "input": {
-        "shape": "GetMinuteUsageRequest"
-      },
-      "output": {
-        "shape": "GetMinuteUsageResponse"
+    "AntennaDownlinkConfig":{
+      "type":"structure",
+      "required":["spectrumConfig"],
+      "members":{
+        "spectrumConfig":{
+          "shape":"SpectrumConfig",
+          "documentation":"<p>Object that describes a spectral <code>Config</code>.</p>"
+        }
       },
-      "errors": [
-        {
-          "shape": "DependencyException"
+      "documentation":"<p>Information about how AWS Ground Station should configure an antenna for downlink during a contact.</p>"
+    },
+    "AntennaDownlinkDemodDecodeConfig":{
+      "type":"structure",
+      "required":[
+        "decodeConfig",
+        "demodulationConfig",
+        "spectrumConfig"
+      ],
+      "members":{
+        "decodeConfig":{
+          "shape":"DecodeConfig",
+          "documentation":"<p>Information about the decode <code>Config</code>.</p>"
         },
-        {
-          "shape": "InvalidParameterException"
+        "demodulationConfig":{
+          "shape":"DemodulationConfig",
+          "documentation":"<p>Information about the demodulation <code>Config</code>.</p>"
         },
-        {
-          "shape": "ResourceNotFoundException"
+        "spectrumConfig":{
+          "shape":"SpectrumConfig",
+          "documentation":"<p>Information about the spectral <code>Config</code>.</p>"
         }
-      ],
-      "documentation": "<p>Returns the number of minutes used by account.</p>"
-    },
-    "GetSatellite": {
-      "name": "GetSatellite",
-      "http": {
-        "method": "GET",
-        "requestUri": "/satellite/{satelliteId}",
-        "responseCode": 200
-      },
-      "input": {
-        "shape": "GetSatelliteRequest"
       },
-      "output": {
-        "shape": "GetSatelliteResponse"
-      },
-      "errors": [
-        {
-          "shape": "DependencyException"
-        },
-        {
-          "shape": "InvalidParameterException"
+      "documentation":"<p>Information about how AWS Ground Station should configure an antenna for downlink demod decode during a contact.</p>"
+    },
+    "AntennaUplinkConfig":{
+      "type":"structure",
+      "required":[
+        "spectrumConfig",
+        "targetEirp"
+      ],
+      "members":{
+        "spectrumConfig":{
+          "shape":"UplinkSpectrumConfig",
+          "documentation":"<p>Information about the uplink spectral <code>Config</code>.</p>"
         },
-        {
-          "shape": "ResourceNotFoundException"
+        "targetEirp":{
+          "shape":"Eirp",
+          "documentation":"<p>EIRP of the target.</p>"
         }
-      ],
-      "documentation": "<p>Returns a satellite.</p>"
-    },
-    "ListGroundStations": {
-      "name": "ListGroundStations",
-      "http": {
-        "method": "GET",
-        "requestUri": "/groundstation",
-        "responseCode": 200
-      },
-      "input": {
-        "shape": "ListGroundStationsRequest"
       },
-      "output": {
-        "shape": "ListGroundStationsResponse"
+      "documentation":"<p>Information about the uplink <code>Config</code> of an antenna.</p>"
+    },
+    "BandwidthUnits":{
+      "type":"string",
+      "enum":[
+        "GHz",
+        "MHz",
+        "kHz"
+      ]
+    },
+    "Boolean":{
+      "type":"boolean",
+      "box":true
+    },
+    "CancelContactRequest":{
+      "type":"structure",
+      "required":["contactId"],
+      "members":{
+        "contactId":{
+          "shape":"String",
+          "documentation":"<p>UUID of a contact.</p>",
+          "location":"uri",
+          "locationName":"contactId"
+        }
       },
-      "errors": [
-        {
-          "shape": "DependencyException"
+      "documentation":"<p/>"
+    },
+    "ConfigArn":{"type":"string"},
+    "ConfigCapabilityType":{
+      "type":"string",
+      "enum":[
+        "antenna-downlink",
+        "antenna-downlink-demod-decode",
+        "antenna-uplink",
+        "dataflow-endpoint",
+        "tracking",
+        "uplink-echo"
+      ]
+    },
+    "ConfigIdResponse":{
+      "type":"structure",
+      "members":{
+        "configArn":{
+          "shape":"ConfigArn",
+          "documentation":"<p>ARN of a <code>Config</code>.</p>"
         },
-        {
-          "shape": "InvalidParameterException"
+        "configId":{
+          "shape":"String",
+          "documentation":"<p>UUID of a <code>Config</code>.</p>"
         },
-        {
-          "shape": "ResourceNotFoundException"
+        "configType":{
+          "shape":"ConfigCapabilityType",
+          "documentation":"<p>Type of a <code>Config</code>.</p>"
         }
-      ],
-      "documentation": "<p>Returns a list of ground stations. </p>"
-    },
-    "ListSatellites": {
-      "name": "ListSatellites",
-      "http": {
-        "method": "GET",
-        "requestUri": "/satellite",
-        "responseCode": 200
-      },
-      "input": {
-        "shape": "ListSatellitesRequest"
       },
-      "output": {
-        "shape": "ListSatellitesResponse"
-      },
-      "errors": [
-        {
-          "shape": "DependencyException"
+      "documentation":"<p/>"
+    },
+    "ConfigList":{
+      "type":"list",
+      "member":{"shape":"ConfigListItem"}
+    },
+    "ConfigListItem":{
+      "type":"structure",
+      "members":{
+        "configArn":{
+          "shape":"ConfigArn",
+          "documentation":"<p>ARN of a <code>Config</code>.</p>"
+        },
+        "configId":{
+          "shape":"String",
+          "documentation":"<p>UUID of a <code>Config</code>.</p>"
         },
-        {
-          "shape": "InvalidParameterException"
+        "configType":{
+          "shape":"ConfigCapabilityType",
+          "documentation":"<p>Type of a <code>Config</code>.</p>"
         },
-        {
-          "shape": "ResourceNotFoundException"
+        "name":{
+          "shape":"String",
+          "documentation":"<p>Name of a <code>Config</code>.</p>"
         }
-      ],
-      "documentation": "<p>Returns a list of satellites.</p>"
-    },
-    "ListTagsForResource": {
-      "name": "ListTagsForResource",
-      "http": {
-        "method": "GET",
-        "requestUri": "/tags/{resourceArn}",
-        "responseCode": 200
-      },
-      "input": {
-        "shape": "ListTagsForResourceRequest"
       },
-      "output": {
-        "shape": "ListTagsForResourceResponse"
-      },
-      "errors": [
-        {
-          "shape": "DependencyException"
+      "documentation":"<p>An item in a list of <code>Config</code> objects.</p>"
+    },
+    "ConfigTypeData":{
+      "type":"structure",
+      "members":{
+        "antennaDownlinkConfig":{
+          "shape":"AntennaDownlinkConfig",
+          "documentation":"<p>Information about how AWS Ground Station should configure an antenna for downlink during a contact.</p>"
         },
-        {
-          "shape": "InvalidParameterException"
+        "antennaDownlinkDemodDecodeConfig":{
+          "shape":"AntennaDownlinkDemodDecodeConfig",
+          "documentation":"<p>Information about how AWS Ground Station should configure an antenna for downlink demod decode during a contact.</p>"
         },
-        {
-          "shape": "ResourceNotFoundException"
-        }
-      ],
-      "documentation": "<p>Returns a list of tags or a specified resource.</p>"
-    },
-    "TagResource": {
-      "name": "TagResource",
-      "http": {
-        "method": "POST",
-        "requestUri": "/tags/{resourceArn}",
-        "responseCode": 200
-      },
-      "input": {
-        "shape": "TagResourceRequest"
-      },
-      "output": {
-        "shape": "TagResourceResponse"
-      },
-      "errors": [
-        {
-          "shape": "DependencyException"
+        "antennaUplinkConfig":{
+          "shape":"AntennaUplinkConfig",
+          "documentation":"<p>Information about how AWS Ground Station should configure an antenna for uplink during a contact.</p>"
+        },
+        "dataflowEndpointConfig":{
+          "shape":"DataflowEndpointConfig",
+          "documentation":"<p>Information about the dataflow endpoint <code>Config</code>.</p>"
         },
-        {
-          "shape": "InvalidParameterException"
+        "trackingConfig":{
+          "shape":"TrackingConfig",
+          "documentation":"<p>Object that determines whether tracking should be used during a contact executed with this <code>Config</code> in the mission profile. </p>"
         },
-        {
-          "shape": "ResourceNotFoundException"
+        "uplinkEchoConfig":{
+          "shape":"UplinkEchoConfig",
+          "documentation":"<p>Information about an uplink echo <code>Config</code>.</p> <p>Parameters from the <code>AntennaUplinkConfig</code>, corresponding to the specified <code>AntennaUplinkConfigArn</code>, are used when this <code>UplinkEchoConfig</code> is used in a contact.</p>"
         }
-      ],
-      "documentation": "<p>Assigns a tag to a resource.</p>"
-    },
-    "UntagResource": {
-      "name": "UntagResource",
-      "http": {
-        "method": "DELETE",
-        "requestUri": "/tags/{resourceArn}",
-        "responseCode": 200
-      },
-      "input": {
-        "shape": "UntagResourceRequest"
-      },
-      "output": {
-        "shape": "UntagResourceResponse"
       },
-      "errors": [
-        {
-          "shape": "DependencyException"
+      "documentation":"<p>Object containing the parameters of a <code>Config</code>.</p> <p>See the subtype definitions for what each type of <code>Config</code> contains.</p>"
+    },
+    "ContactData":{
+      "type":"structure",
+      "members":{
+        "contactId":{
+          "shape":"String",
+          "documentation":"<p>UUID of a contact.</p>"
         },
-        {
-          "shape": "InvalidParameterException"
+        "contactStatus":{
+          "shape":"ContactStatus",
+          "documentation":"<p>Status of a contact.</p>"
         },
-        {
-          "shape": "ResourceNotFoundException"
-        }
-      ],
-      "documentation": "<p>Deassigns a resource tag.</p>",
-      "idempotent": true
-    }
-  },
-  "shapes": {
-    "UpdateConfigRequest": {
-      "type": "structure",
-      "required": [
-        "configData",
-        "configId",
-        "configType",
-        "name"
-      ],
-      "members": {
-        "configData": {
-          "shape": "ConfigTypeData",
-          "documentation": "<p>Parameters for a <code>Config</code>.</p>"
+        "endTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>End time of a contact.</p>"
         },
-        "configId": {
-          "shape": "String",
-          "documentation": "<p>UUID of a <code>Config</code>.</p>",
-          "location": "uri",
-          "locationName": "configId"
+        "errorMessage":{
+          "shape":"String",
+          "documentation":"<p>Error message of a contact.</p>"
         },
-        "configType": {
-          "shape": "ConfigCapabilityType",
-          "documentation": "<p>Type of a <code>Config</code>.</p>",
-          "location": "uri",
-          "locationName": "configType"
+        "groundStation":{
+          "shape":"String",
+          "documentation":"<p>Name of a ground station.</p>"
         },
-        "name": {
-          "shape": "SafeName",
-          "documentation": "<p>Name of a <code>Config</code>.</p>"
-        }
-      },
-      "documentation": "<p/>"
-    },
-    "ConfigTypeData": {
-      "type": "structure",
-      "members": {
-        "antennaDownlinkConfig": {
-          "shape": "AntennaDownlinkConfig",
-          "documentation": "<p>Information about how AWS Ground Station should configure an antenna for downlink during a contact.</p>"
+        "maximumElevation":{
+          "shape":"Elevation",
+          "documentation":"<p>Maximum elevation angle of a contact.</p>"
         },
-        "antennaDownlinkDemodDecodeConfig": {
-          "shape": "AntennaDownlinkDemodDecodeConfig",
-          "documentation": "<p>Information about how AWS Ground Station should configure an antenna for downlink demod decode during a contact.</p>"
+        "missionProfileArn":{
+          "shape":"MissionProfileArn",
+          "documentation":"<p>ARN of a mission profile.</p>"
         },
-        "antennaUplinkConfig": {
-          "shape": "AntennaUplinkConfig",
-          "documentation": "<p>Information about how AWS Ground Station should configure an antenna for uplink during a contact.</p>"
+        "postPassEndTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>Amount of time after a contact ends that you’d like to receive a CloudWatch event indicating the pass has finished.</p>"
         },
-        "dataflowEndpointConfig": {
-          "shape": "DataflowEndpointConfig",
-          "documentation": "<p>Information about the dataflow endpoint <code>Config</code>.</p>"
+        "prePassStartTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>Amount of time prior to contact start you’d like to receive a CloudWatch event indicating an upcoming pass.</p>"
         },
-        "trackingConfig": {
-          "shape": "TrackingConfig",
-          "documentation": "<p>Object that determines whether tracking should be used during a contact executed with this <code>Config</code> in the mission profile. </p>"
+        "region":{
+          "shape":"String",
+          "documentation":"<p>Region of a contact.</p>"
         },
-        "uplinkEchoConfig": {
-          "shape": "UplinkEchoConfig",
-          "documentation": "<p>Information about an uplink echo <code>Config</code>.</p>\n         <p>Parameters from the <code>AntennaUplinkConfig</code>, corresponding to the specified <code>AntennaUplinkConfigArn</code>, are used when this <code>UplinkEchoConfig</code> is used in a contact.</p>"
-        }
-      },
-      "documentation": "<p>Object containing the parameters for a <code>Config</code>.</p>\n         <p>See the subtype definitions for what each type of <code>Config</code> contains.</p>"
-    },
-    "noradSatelliteID": {
-      "type": "integer",
-      "min": 1,
-      "max": 99999
-    },
-    "GroundStationData": {
-      "type": "structure",
-      "members": {
-        "groundStationId": {
-          "shape": "String",
-          "documentation": "<p>ID of a ground station.</p>"
+        "satelliteArn":{
+          "shape":"satelliteArn",
+          "documentation":"<p>ARN of a satellite.</p>"
         },
-        "groundStationName": {
-          "shape": "String",
-          "documentation": "<p>Name of a ground station.</p>"
+        "startTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>Start time of a contact.</p>"
         },
-        "region": {
-          "shape": "String",
-          "documentation": "<p>Ground station Region.</p>"
+        "tags":{
+          "shape":"TagsMap",
+          "documentation":"<p>Tags assigned to a contact.</p>"
         }
       },
-      "documentation": "<p>Information about the ground station data.</p>"
+      "documentation":"<p>Data describing a contact.</p>"
     },
-    "GetConfigRequest": {
-      "type": "structure",
-      "required": [
-        "configId",
-        "configType"
-      ],
-      "members": {
-        "configId": {
-          "shape": "String",
-          "documentation": "<p>UUID of a <code>Config</code>.</p>",
-          "location": "uri",
-          "locationName": "configId"
-        },
-        "configType": {
-          "shape": "ConfigCapabilityType",
-          "documentation": "<p>Type of a <code>Config</code>.</p>",
-          "location": "uri",
-          "locationName": "configType"
+    "ContactIdResponse":{
+      "type":"structure",
+      "members":{
+        "contactId":{
+          "shape":"String",
+          "documentation":"<p>UUID of a contact.</p>"
         }
       },
-      "documentation": "<p/>"
+      "documentation":"<p/>"
     },
-    "GroundStationList": {
-      "type": "list",
-      "member": {
-        "shape": "GroundStationData"
-      }
+    "ContactList":{
+      "type":"list",
+      "member":{"shape":"ContactData"}
     },
-    "SecurityGroupIdList": {
-      "type": "list",
-      "member": {
-        "shape": "String"
-      }
+    "ContactStatus":{
+      "type":"string",
+      "enum":[
+        "AVAILABLE",
+        "AWS_CANCELLED",
+        "CANCELLED",
+        "CANCELLING",
+        "COMPLETED",
+        "FAILED",
+        "FAILED_TO_SCHEDULE",
+        "PASS",
+        "POSTPASS",
+        "PREPASS",
+        "SCHEDULED",
+        "SCHEDULING"
+      ]
     },
-    "EndpointDetails": {
-      "type": "structure",
-      "members": {
-        "endpoint": {
-          "shape": "DataflowEndpoint",
-          "documentation": "<p>A dataflow endpoint.</p>"
+    "CreateConfigRequest":{
+      "type":"structure",
+      "required":[
+        "configData",
+        "name"
+      ],
+      "members":{
+        "configData":{
+          "shape":"ConfigTypeData",
+          "documentation":"<p>Parameters of a <code>Config</code>.</p>"
         },
-        "securityDetails": {
-          "shape": "SecurityDetails",
-          "documentation": "<p>Endpoint security details.</p>"
+        "name":{
+          "shape":"SafeName",
+          "documentation":"<p>Name of a <code>Config</code>.</p>"
+        },
+        "tags":{
+          "shape":"TagsMap",
+          "documentation":"<p>Tags assigned to a <code>Config</code>.</p>"
         }
       },
-      "documentation": "<p>Information about the endpoint details.</p>"
-    },
-    "DataflowEndpointGroupArn": {
-      "type": "string"
+      "documentation":"<p/>"
     },
-    "GetMinuteUsageResponse": {
-      "type": "structure",
-      "members": {
-        "estimatedMinutesRemaining": {
-          "shape": "Integer",
-          "documentation": "<p>Estimated number of minutes remaining for an account, specific to the month being requested.</p>"
-        },
-        "isReservedMinutesCustomer": {
-          "shape": "Boolean",
-          "documentation": "<p>Returns whether or not an account has signed up for the reserved minutes pricing plan, specific to the month being requested.</p>"
-        },
-        "totalReservedMinuteAllocation": {
-          "shape": "Integer",
-          "documentation": "<p>Total number of reserved minutes allocated, specific to the month being requested.</p>"
-        },
-        "totalScheduledMinutes": {
-          "shape": "Integer",
-          "documentation": "<p>Total scheduled minutes for an account, specific to the month being requested.</p>"
+    "CreateDataflowEndpointGroupRequest":{
+      "type":"structure",
+      "required":["endpointDetails"],
+      "members":{
+        "endpointDetails":{
+          "shape":"EndpointDetailsList",
+          "documentation":"<p>Endpoint details of each endpoint in the dataflow endpoint group.</p>"
         },
-        "upcomingMinutesScheduled": {
-          "shape": "Integer",
-          "documentation": "<p>Upcoming minutes scheduled for an account, specific to the month being requested.</p>"
+        "tags":{
+          "shape":"TagsMap",
+          "documentation":"<p>Tags of a dataflow endpoint group.</p>"
         }
       },
-      "documentation": "<p/>"
+      "documentation":"<p/>"
     },
-    "MissionProfileListItem": {
-      "type": "structure",
-      "members": {
-        "missionProfileArn": {
-          "shape": "MissionProfileArn",
-          "documentation": "<p>ARN of a mission profile.</p>"
+    "CreateMissionProfileRequest":{
+      "type":"structure",
+      "required":[
+        "dataflowEdges",
+        "minimumViableContactDurationSeconds",
+        "name",
+        "trackingConfigArn"
+      ],
+      "members":{
+        "contactPostPassDurationSeconds":{
+          "shape":"DurationInSeconds",
+          "documentation":"<p>Amount of time after a contact ends that you’d like to receive a CloudWatch event indicating the pass has finished.</p>"
         },
-        "missionProfileId": {
-          "shape": "String",
-          "documentation": "<p>ID of a mission profile.</p>"
+        "contactPrePassDurationSeconds":{
+          "shape":"DurationInSeconds",
+          "documentation":"<p>Amount of time prior to contact start you’d like to receive a CloudWatch event indicating an upcoming pass.</p>"
         },
-        "name": {
-          "shape": "String",
-          "documentation": "<p>Name of a mission profile.</p>"
+        "dataflowEdges":{
+          "shape":"DataflowEdgeList",
+          "documentation":"<p>A list of lists of ARNs. Each list of ARNs is an edge, with a <i>from</i> <code>Config</code> and a <i>to</i> <code>Config</code>.</p>"
         },
-        "region": {
-          "shape": "String",
-          "documentation": "<p>Region of a mission profile.</p>"
-        }
-      },
-      "documentation": "<p>Item in a list of mission profiles.</p>"
-    },
-    "SatelliteList": {
-      "type": "list",
-      "member": {
-        "shape": "SatelliteListItem"
-      }
-    },
-    "ListDataflowEndpointGroupsResponse": {
-      "type": "structure",
-      "members": {
-        "dataflowEndpointGroupList": {
-          "shape": "DataflowEndpointGroupList",
-          "documentation": "<p>A list of dataflow endpoint groups.</p>"
+        "minimumViableContactDurationSeconds":{
+          "shape":"DurationInSeconds",
+          "documentation":"<p>Smallest amount of time in seconds that you’d like to see for an available contact. AWS Ground Station will not present you with contacts shorter than this duration.</p>"
         },
-        "nextToken": {
-          "shape": "String",
-          "documentation": "<p>Next token returned in the response of a previous <code>ListDataflowEndpointGroups</code> call. Used to get the next page of results.</p>"
-        }
-      },
-      "documentation": "<p/>"
-    },
-    "AntennaDownlinkDemodDecodeConfig": {
-      "type": "structure",
-      "required": [
-        "decodeConfig",
-        "demodulationConfig",
-        "spectrumConfig"
-      ],
-      "members": {
-        "decodeConfig": {
-          "shape": "DecodeConfig",
-          "documentation": "<p>Information about the decode <code>Config</code>.</p>"
+        "name":{
+          "shape":"SafeName",
+          "documentation":"<p>Name of a mission profile.</p>"
         },
-        "demodulationConfig": {
-          "shape": "DemodulationConfig",
-          "documentation": "<p>Information about the demodulation <code>Config</code>.</p>"
+        "tags":{
+          "shape":"TagsMap",
+          "documentation":"<p>Tags assigned to a mission profile.</p>"
         },
-        "spectrumConfig": {
-          "shape": "SpectrumConfig",
-          "documentation": "<p>Information about the spectral <code>Config</code>.</p>"
+        "trackingConfigArn":{
+          "shape":"ConfigArn",
+          "documentation":"<p>ARN of a tracking <code>Config</code>.</p>"
         }
       },
-      "documentation": "<p>Information about how AWS Ground Station should configure an antenna for downlink demod decode during a contact.</p>"
+      "documentation":"<p/>"
     },
-    "MissionProfileIdResponse": {
-      "type": "structure",
-      "members": {
-        "missionProfileId": {
-          "shape": "String",
-          "documentation": "<p>ID of a mission profile.</p>"
-        }
-      },
-      "documentation": "<p/>"
-    },
-    "SubnetList": {
-      "type": "list",
-      "member": {
-        "shape": "String"
-      }
-    },
-    "Polarization": {
-      "type": "string",
-      "enum": [
-        "LEFT_HAND",
-        "NONE",
-        "RIGHT_HAND"
+    "Criticality":{
+      "type":"string",
+      "enum":[
+        "PREFERRED",
+        "REMOVED",
+        "REQUIRED"
       ]
     },
-    "ConfigList": {
-      "type": "list",
-      "member": {
-        "shape": "ConfigListItem"
-      }
+    "DataflowEdge":{
+      "type":"list",
+      "member":{"shape":"ConfigArn"},
+      "max":2,
+      "min":2
     },
-    "AntennaUplinkConfig": {
-      "type": "structure",
-      "required": [
-        "spectrumConfig",
-        "targetEirp"
-      ],
-      "members": {
-        "spectrumConfig": {
-          "shape": "UplinkSpectrumConfig",
-          "documentation": "<p>Information about the uplink spectral <code>Config</code>.</p>"
-        },
-        "targetEirp": {
-          "shape": "Eirp",
-          "documentation": "<p>EIRP of the target.</p>"
-        }
-      },
-      "documentation": "<p>Information about the uplink <code>Config</code> of an antenna.</p>"
-    },
-    "Integer": {
-      "type": "integer",
-      "box": true
+    "DataflowEdgeList":{
+      "type":"list",
+      "member":{"shape":"DataflowEdge"}
     },
-    "AntennaDownlinkConfig": {
-      "type": "structure",
-      "required": [
-        "spectrumConfig"
-      ],
-      "members": {
-        "spectrumConfig": {
-          "shape": "SpectrumConfig",
-          "documentation": "<p>Object that describes a spectral <code>Config</code>.</p>"
+    "DataflowEndpoint":{
+      "type":"structure",
+      "members":{
+        "address":{
+          "shape":"SocketAddress",
+          "documentation":"<p>Socket address of a dataflow endpoint.</p>"
+        },
+        "name":{
+          "shape":"SafeName",
+          "documentation":"<p>Name of a dataflow endpoint.</p>"
+        },
+        "status":{
+          "shape":"EndpointStatus",
+          "documentation":"<p>Status of a dataflow endpoint.</p>"
         }
       },
-      "documentation": "<p>Information about how AWS Ground Station should configure an\n         antenna for downlink during a contact.</p>"
-    },
-    "Boolean": {
-      "type": "boolean",
-      "box": true
+      "documentation":"<p>Information about a dataflow endpoint.</p>"
     },
-    "EndpointStatus": {
-      "type": "string",
-      "enum": [
-        "created",
-        "creating",
-        "deleted",
-        "deleting",
-        "failed"
-      ]
-    },
-    "UplinkEchoConfig": {
-      "type": "structure",
-      "required": [
-        "antennaUplinkConfigArn",
-        "enabled"
-      ],
-      "members": {
-        "antennaUplinkConfigArn": {
-          "shape": "ConfigArn",
-          "documentation": "<p>ARN of an uplink <code>Config</code>.</p>"
+    "DataflowEndpointConfig":{
+      "type":"structure",
+      "required":["dataflowEndpointName"],
+      "members":{
+        "dataflowEndpointName":{
+          "shape":"String",
+          "documentation":"<p>Name of a dataflow endpoint.</p>"
         },
-        "enabled": {
-          "shape": "Boolean",
-          "documentation": "<p>Whether or not an uplink <code>Config</code> is enabled.</p>"
+        "dataflowEndpointRegion":{
+          "shape":"String",
+          "documentation":"<p>Region of a dataflow endpoint.</p>"
         }
       },
-      "documentation": "<p>Information about an uplink echo <code>Config</code>.</p>\n         <p>Parameters from the <code>AntennaUplinkConfig</code>, corresponding to the \n         specified <code>AntennaUplinkConfigArn</code>, are used when this <code>UplinkEchoConfig</code> \n         is used in a contact.</p>"
+      "documentation":"<p>Information about the dataflow endpoint <code>Config</code>.</p>"
     },
-    "DecodeConfig": {
-      "type": "structure",
-      "required": [
-        "unvalidatedJSON"
-      ],
-      "members": {
-        "unvalidatedJSON": {
-          "shape": "JsonString",
-          "documentation": "<p>Unvalidated JSON of a decode <code>Config</code>.</p>"
+    "DataflowEndpointGroupArn":{"type":"string"},
+    "DataflowEndpointGroupIdResponse":{
+      "type":"structure",
+      "members":{
+        "dataflowEndpointGroupId":{
+          "shape":"String",
+          "documentation":"<p>UUID of a dataflow endpoint group.</p>"
         }
       },
-      "documentation": "<p>Information about the decode <code>Config</code>.</p>"
+      "documentation":"<p/>"
     },
-    "DeleteDataflowEndpointGroupRequest": {
-      "type": "structure",
-      "required": [
-        "dataflowEndpointGroupId"
-      ],
-      "members": {
-        "dataflowEndpointGroupId": {
-          "shape": "String",
-          "documentation": "<p>ID of a dataflow endpoint group.</p>",
-          "location": "uri",
-          "locationName": "dataflowEndpointGroupId"
+    "DataflowEndpointGroupList":{
+      "type":"list",
+      "member":{"shape":"DataflowEndpointListItem"}
+    },
+    "DataflowEndpointListItem":{
+      "type":"structure",
+      "members":{
+        "dataflowEndpointGroupArn":{
+          "shape":"DataflowEndpointGroupArn",
+          "documentation":"<p>ARN of a dataflow endpoint group.</p>"
+        },
+        "dataflowEndpointGroupId":{
+          "shape":"String",
+          "documentation":"<p>UUID of a dataflow endpoint group.</p>"
         }
       },
-      "documentation": "<p/>"
-    },
-    "ContactStatus": {
-      "type": "string",
-      "enum": [
-        "AVAILABLE",
-        "AWS_CANCELLED",
-        "CANCELLED",
-        "COMPLETED",
-        "FAILED",
-        "FAILED_TO_SCHEDULE",
-        "PASS",
-        "POSTPASS",
-        "PREPASS",
-        "SCHEDULED",
-        "SCHEDULING"
-      ]
+      "documentation":"<p>Item in a list of <code>DataflowEndpoint</code> groups.</p>"
     },
-    "MissionProfileList": {
-      "type": "list",
-      "member": {
-        "shape": "MissionProfileListItem"
-      }
+    "DecodeConfig":{
+      "type":"structure",
+      "required":["unvalidatedJSON"],
+      "members":{
+        "unvalidatedJSON":{
+          "shape":"JsonString",
+          "documentation":"<p>Unvalidated JSON of a decode <code>Config</code>.</p>"
+        }
+      },
+      "documentation":"<p>Information about the decode <code>Config</code>.</p>"
     },
-    "CreateConfigRequest": {
-      "type": "structure",
-      "required": [
-        "configData",
-        "name"
+    "DeleteConfigRequest":{
+      "type":"structure",
+      "required":[
+        "configId",
+        "configType"
       ],
-      "members": {
-        "configData": {
-          "shape": "ConfigTypeData",
-          "documentation": "<p>Parameters of a <code>Config</code>.</p>"
+      "members":{
+        "configId":{
+          "shape":"String",
+          "documentation":"<p>UUID of a <code>Config</code>.</p>",
+          "location":"uri",
+          "locationName":"configId"
+        },
+        "configType":{
+          "shape":"ConfigCapabilityType",
+          "documentation":"<p>Type of a <code>Config</code>.</p>",
+          "location":"uri",
+          "locationName":"configType"
+        }
+      },
+      "documentation":"<p/>"
+    },
+    "DeleteDataflowEndpointGroupRequest":{
+      "type":"structure",
+      "required":["dataflowEndpointGroupId"],
+      "members":{
+        "dataflowEndpointGroupId":{
+          "shape":"String",
+          "documentation":"<p>UUID of a dataflow endpoint group.</p>",
+          "location":"uri",
+          "locationName":"dataflowEndpointGroupId"
+        }
+      },
+      "documentation":"<p/>"
+    },
+    "DeleteMissionProfileRequest":{
+      "type":"structure",
+      "required":["missionProfileId"],
+      "members":{
+        "missionProfileId":{
+          "shape":"String",
+          "documentation":"<p>UUID of a mission profile.</p>",
+          "location":"uri",
+          "locationName":"missionProfileId"
+        }
+      },
+      "documentation":"<p/>"
+    },
+    "DemodulationConfig":{
+      "type":"structure",
+      "required":["unvalidatedJSON"],
+      "members":{
+        "unvalidatedJSON":{
+          "shape":"JsonString",
+          "documentation":"<p>Unvalidated JSON of a demodulation <code>Config</code>.</p>"
+        }
+      },
+      "documentation":"<p>Information about the demodulation <code>Config</code>.</p>"
+    },
+    "DependencyException":{
+      "type":"structure",
+      "members":{
+        "message":{"shape":"String"},
+        "parameterName":{
+          "shape":"String",
+          "documentation":"<p/>"
+        }
+      },
+      "documentation":"<p>Dependency encountered an error.</p>",
+      "error":{"httpStatusCode":531},
+      "exception":true,
+      "fault":true
+    },
+    "DescribeContactRequest":{
+      "type":"structure",
+      "required":["contactId"],
+      "members":{
+        "contactId":{
+          "shape":"String",
+          "documentation":"<p>UUID of a contact.</p>",
+          "location":"uri",
+          "locationName":"contactId"
+        }
+      },
+      "documentation":"<p/>"
+    },
+    "DescribeContactResponse":{
+      "type":"structure",
+      "members":{
+        "contactId":{
+          "shape":"String",
+          "documentation":"<p>UUID of a contact.</p>"
+        },
+        "contactStatus":{
+          "shape":"ContactStatus",
+          "documentation":"<p>Status of a contact.</p>"
+        },
+        "endTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>End time of a contact.</p>"
+        },
+        "errorMessage":{
+          "shape":"String",
+          "documentation":"<p>Error message for a contact.</p>"
+        },
+        "groundStation":{
+          "shape":"String",
+          "documentation":"<p>Ground station for a contact.</p>"
+        },
+        "maximumElevation":{
+          "shape":"Elevation",
+          "documentation":"<p>Maximum elevation angle of a contact.</p>"
+        },
+        "missionProfileArn":{
+          "shape":"MissionProfileArn",
+          "documentation":"<p>ARN of a mission profile.</p>"
         },
-        "name": {
-          "shape": "SafeName",
-          "documentation": "<p>Name of a <code>Config</code>.</p>"
+        "postPassEndTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>Amount of time after a contact ends that you’d like to receive a CloudWatch event indicating the pass has finished.</p>"
+        },
+        "prePassStartTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>Amount of time prior to contact start you’d like to receive a CloudWatch event indicating an upcoming pass.</p>"
+        },
+        "region":{
+          "shape":"String",
+          "documentation":"<p>Region of a contact.</p>"
         },
-        "tags": {
-          "shape": "TagsMap",
-          "documentation": "<p>Tags assigned to a <code>Config</code>.</p>"
+        "satelliteArn":{
+          "shape":"satelliteArn",
+          "documentation":"<p>ARN of a satellite.</p>"
+        },
+        "startTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>Start time of a contact.</p>"
+        },
+        "tags":{
+          "shape":"TagsMap",
+          "documentation":"<p>Tags assigned to a contact.</p>"
         }
       },
-      "documentation": "<p/>"
+      "documentation":"<p/>"
+    },
+    "Double":{
+      "type":"double",
+      "box":true
     },
-    "Frequency": {
-      "type": "structure",
-      "required": [
+    "DurationInSeconds":{
+      "type":"integer",
+      "max":21600,
+      "min":1
+    },
+    "Eirp":{
+      "type":"structure",
+      "required":[
         "units",
         "value"
       ],
-      "members": {
-        "units": {
-          "shape": "FrequencyUnits",
-          "documentation": "<p>Frequency units.</p>"
+      "members":{
+        "units":{
+          "shape":"EirpUnits",
+          "documentation":"<p>Units of an EIRP.</p>"
         },
-        "value": {
-          "shape": "Double",
-          "documentation": "<p>Frequency value.</p>"
+        "value":{
+          "shape":"Double",
+          "documentation":"<p>Value of an EIRP.</p>"
         }
       },
-      "documentation": "<p>Object that describes the frequency.</p>"
+      "documentation":"<p>Object that represents EIRP.</p>"
     },
-    "UntagResourceResponse": {
-      "type": "structure",
-      "members": { },
-      "documentation": "<p/>"
+    "EirpUnits":{
+      "type":"string",
+      "enum":["dBW"]
     },
-    "ConfigIdResponse": {
-      "type": "structure",
-      "members": {
-        "configArn": {
-          "shape": "ConfigArn",
-          "documentation": "<p>ARN of a <code>Config</code>.</p>"
-        },
-        "configId": {
-          "shape": "String",
-          "documentation": "<p>UUID of a <code>Config</code>.</p>"
+    "Elevation":{
+      "type":"structure",
+      "required":[
+        "unit",
+        "value"
+      ],
+      "members":{
+        "unit":{
+          "shape":"AngleUnits",
+          "documentation":"<p>Elevation angle units.</p>"
         },
-        "configType": {
-          "shape": "ConfigCapabilityType",
-          "documentation": "<p>Type of a <code>Config</code>.</p>"
+        "value":{
+          "shape":"Double",
+          "documentation":"<p>Elevation angle value.</p>"
         }
       },
-      "documentation": "<p/>"
+      "documentation":"<p>Elevation angle of the satellite in the sky during a contact.</p>"
     },
-    "SecurityDetails": {
-      "type": "structure",
-      "required": [
-        "roleArn",
-        "securityGroupIds",
-        "subnetIds"
-      ],
-      "members": {
-        "roleArn": {
-          "shape": "RoleArn",
-          "documentation": "<p>ARN to a role needed for connecting streams to your instances. </p>"
-        },
-        "securityGroupIds": {
-          "shape": "SecurityGroupIdList",
-          "documentation": "<p>The security groups to attach to the elastic network interfaces.</p>"
+    "EndpointDetails":{
+      "type":"structure",
+      "members":{
+        "endpoint":{
+          "shape":"DataflowEndpoint",
+          "documentation":"<p>A dataflow endpoint.</p>"
         },
-        "subnetIds": {
-          "shape": "SubnetList",
-          "documentation": "<p>A list of subnets where AWS Ground Station places elastic network interfaces to send streams to your instances.</p>"
+        "securityDetails":{
+          "shape":"SecurityDetails",
+          "documentation":"<p>Endpoint security details.</p>"
         }
       },
-      "documentation": "<p>Information about endpoints.</p>"
+      "documentation":"<p>Information about the endpoint details.</p>"
     },
-    "TrackingConfig": {
-      "type": "structure",
-      "required": [
-        "autotrack"
-      ],
-      "members": {
-        "autotrack": {
-          "shape": "Criticality",
-          "documentation": "<p>Current setting for autotrack.</p>"
-        }
-      },
-      "documentation": "<p>Object that determines whether tracking should be used during a contact\n         executed with this <code>Config</code> in the mission profile.</p>"
+    "EndpointDetailsList":{
+      "type":"list",
+      "member":{"shape":"EndpointDetails"}
+    },
+    "EndpointStatus":{
+      "type":"string",
+      "enum":[
+        "created",
+        "creating",
+        "deleted",
+        "deleting",
+        "failed"
+      ]
     },
-    "CreateDataflowEndpointGroupRequest": {
-      "type": "structure",
-      "required": [
-        "endpointDetails"
+    "Frequency":{
+      "type":"structure",
+      "required":[
+        "units",
+        "value"
       ],
-      "members": {
-        "endpointDetails": {
-          "shape": "EndpointDetailsList",
-          "documentation": "<p>Endpoint details of each endpoint in the dataflow endpoint group.</p>"
+      "members":{
+        "units":{
+          "shape":"FrequencyUnits",
+          "documentation":"<p>Frequency units.</p>"
         },
-        "tags": {
-          "shape": "TagsMap",
-          "documentation": "<p>Tags of a dataflow endpoint group.</p>"
+        "value":{
+          "shape":"Double",
+          "documentation":"<p>Frequency value.</p>"
         }
       },
-      "documentation": "<p/>"
+      "documentation":"<p>Object that describes the frequency.</p>"
     },
-    "Elevation": {
-      "type": "structure",
-      "required": [
-        "unit",
+    "FrequencyBandwidth":{
+      "type":"structure",
+      "required":[
+        "units",
         "value"
       ],
-      "members": {
-        "unit": {
-          "shape": "AngleUnits",
-          "documentation": "<p>Elevation angle units.</p>"
+      "members":{
+        "units":{
+          "shape":"BandwidthUnits",
+          "documentation":"<p>Frequency bandwidth units.</p>"
         },
-        "value": {
-          "shape": "Double",
-          "documentation": "<p>Elevation angle value.</p>"
+        "value":{
+          "shape":"Double",
+          "documentation":"<p>Frequency bandwidth value.</p>"
         }
       },
-      "documentation": "<p>Elevation angle of the satellite in the sky during a contact.</p>"
+      "documentation":"<p>Object that describes the frequency bandwidth.</p>"
     },
-    "JsonString": {
-      "type": "string",
-      "min": 2,
-      "max": 8192
+    "FrequencyUnits":{
+      "type":"string",
+      "enum":[
+        "GHz",
+        "MHz",
+        "kHz"
+      ]
     },
-    "GetSatelliteRequest": {
-      "type": "structure",
-      "required": [
-        "satelliteId"
+    "GetConfigRequest":{
+      "type":"structure",
+      "required":[
+        "configId",
+        "configType"
       ],
-      "members": {
-        "satelliteId": {
-          "shape": "String",
-          "documentation": "<p>UUID of a satellite.</p>",
-          "location": "uri",
-          "locationName": "satelliteId"
+      "members":{
+        "configId":{
+          "shape":"String",
+          "documentation":"<p>UUID of a <code>Config</code>.</p>",
+          "location":"uri",
+          "locationName":"configId"
+        },
+        "configType":{
+          "shape":"ConfigCapabilityType",
+          "documentation":"<p>Type of a <code>Config</code>.</p>",
+          "location":"uri",
+          "locationName":"configType"
         }
       },
-      "documentation": "<p/>"
+      "documentation":"<p/>"
     },
-    "CancelContactRequest": {
-      "type": "structure",
-      "required": [
-        "contactId"
+    "GetConfigResponse":{
+      "type":"structure",
+      "required":[
+        "configArn",
+        "configData",
+        "configId",
+        "name"
       ],
-      "members": {
-        "contactId": {
-          "shape": "String",
-          "documentation": "<p>UUID of a contact.</p>",
-          "location": "uri",
-          "locationName": "contactId"
+      "members":{
+        "configArn":{
+          "shape":"ConfigArn",
+          "documentation":"<p>ARN of a <code>Config</code> </p>"
+        },
+        "configData":{
+          "shape":"ConfigTypeData",
+          "documentation":"<p>Data elements in a <code>Config</code>.</p>"
+        },
+        "configId":{
+          "shape":"String",
+          "documentation":"<p>UUID of a <code>Config</code>.</p>"
+        },
+        "configType":{
+          "shape":"ConfigCapabilityType",
+          "documentation":"<p>Type of a <code>Config</code>.</p>"
+        },
+        "name":{
+          "shape":"String",
+          "documentation":"<p>Name of a <code>Config</code>.</p>"
+        },
+        "tags":{
+          "shape":"TagsMap",
+          "documentation":"<p>Tags assigned to a <code>Config</code>.</p>"
         }
       },
-      "documentation": "<p/>"
+      "documentation":"<p/>"
     },
-    "UplinkSpectrumConfig": {
-      "type": "structure",
-      "required": [
-        "centerFrequency"
-      ],
-      "members": {
-        "centerFrequency": {
-          "shape": "Frequency",
-          "documentation": "<p>Center frequency of an uplink spectral <code>Config</code>.</p>"
-        },
-        "polarization": {
-          "shape": "Polarization",
-          "documentation": "<p>Polarization of an uplink spectral <code>Config</code>.</p>"
+    "GetDataflowEndpointGroupRequest":{
+      "type":"structure",
+      "required":["dataflowEndpointGroupId"],
+      "members":{
+        "dataflowEndpointGroupId":{
+          "shape":"String",
+          "documentation":"<p>UUID of a dataflow endpoint group.</p>",
+          "location":"uri",
+          "locationName":"dataflowEndpointGroupId"
         }
       },
-      "documentation": "<p>Information about the uplink spectral <code>Config</code>.</p>"
+      "documentation":"<p/>"
     },
-    "UntagResourceRequest": {
-      "type": "structure",
-      "required": [
-        "resourceArn",
-        "tagKeys"
-      ],
-      "members": {
-        "resourceArn": {
-          "shape": "String",
-          "documentation": "<p>ARN of a resource.</p>",
-          "location": "uri",
-          "locationName": "resourceArn"
+    "GetDataflowEndpointGroupResponse":{
+      "type":"structure",
+      "members":{
+        "dataflowEndpointGroupArn":{
+          "shape":"DataflowEndpointGroupArn",
+          "documentation":"<p>ARN of a dataflow endpoint group.</p>"
+        },
+        "dataflowEndpointGroupId":{
+          "shape":"String",
+          "documentation":"<p>UUID of a dataflow endpoint group.</p>"
+        },
+        "endpointsDetails":{
+          "shape":"EndpointDetailsList",
+          "documentation":"<p>Details of a dataflow endpoint.</p>"
         },
-        "tagKeys": {
-          "shape": "TagKeys",
-          "documentation": "<p>Keys of a resource tag.</p>",
-          "location": "querystring",
-          "locationName": "tagKeys"
+        "tags":{
+          "shape":"TagsMap",
+          "documentation":"<p>Tags assigned to a dataflow endpoint group.</p>"
         }
       },
-      "documentation": "<p/>"
-    },
-    "satelliteArn": {
-      "type": "string"
+      "documentation":"<p/>"
     },
-    "GetMissionProfileResponse": {
-      "type": "structure",
-      "members": {
-        "contactPostPassDurationSeconds": {
-          "shape": "DurationInSeconds",
-          "documentation": "<p>Amount of time after a contact ends that you’d like to receive a CloudWatch event indicating the pass has finished.</p>"
-        },
-        "contactPrePassDurationSeconds": {
-          "shape": "DurationInSeconds",
-          "documentation": "<p>Amount of time prior to contact start you’d like to receive a CloudWatch event indicating an upcoming pass.</p>"
-        },
-        "dataflowEdges": {
-          "shape": "DataflowEdgeList",
-          "documentation": "<p>A list of lists of ARNs. Each list of ARNs is an edge, with a from <code>Config</code> and a to \n         <code>Config</code>.</p>"
-        },
-        "minimumViableContactDurationSeconds": {
-          "shape": "DurationInSeconds",
-          "documentation": "<p>Smallest amount of time in seconds that you’d like to see for an available contact. AWS Ground Station will not present you with contacts shorter than this duration.</p>"
-        },
-        "missionProfileArn": {
-          "shape": "MissionProfileArn",
-          "documentation": "<p>ARN of a mission profile.</p>"
-        },
-        "missionProfileId": {
-          "shape": "String",
-          "documentation": "<p>ID of a mission profile.</p>"
-        },
-        "name": {
-          "shape": "String",
-          "documentation": "<p>Name of a mission profile.</p>"
-        },
-        "region": {
-          "shape": "String",
-          "documentation": "<p>Region of a mission profile.</p>"
-        },
-        "tags": {
-          "shape": "TagsMap",
-          "documentation": "<p>Tags assigned to a mission profile.</p>"
-        },
-        "trackingConfigArn": {
-          "shape": "ConfigArn",
-          "documentation": "<p>ARN of a tracking <code>Config</code>.</p>"
-        }
-      },
-      "documentation": "<p/>"
-    },
-    "ContactIdResponse": {
-      "type": "structure",
-      "members": {
-        "contactId": {
-          "shape": "String",
-          "documentation": "<p>UUID of a contact.</p>"
-        }
-      },
-      "documentation": "<p/>"
-    },
-    "EndpointDetailsList": {
-      "type": "list",
-      "member": {
-        "shape": "EndpointDetails"
-      }
-    },
-    "ListGroundStationsRequest": {
-      "type": "structure",
-      "members": {
-        "maxResults": {
-          "shape": "Integer",
-          "documentation": "<p>Maximum number of ground stations returned.</p>",
-          "location": "querystring",
-          "locationName": "maxResults"
-        },
-        "nextToken": {
-          "shape": "String",
-          "documentation": "<p>Next token that can be supplied in the next call to get the next page of ground stations.</p>",
-          "location": "querystring",
-          "locationName": "nextToken"
-        }
-      },
-      "documentation": "<p/>"
-    },
-    "InvalidParameterException": {
-      "type": "structure",
-      "members": {
-        "message": {
-          "shape": "String"
-        },
-        "parameterName": {
-          "shape": "String",
-          "documentation": "<p/>"
-        }
-      },
-      "documentation": "<p>One or more parameters are not valid.</p>",
-      "exception": true,
-      "error": {
-        "code": "InvalidParameterException",
-        "httpStatusCode": 431,
-        "senderFault": true
-      }
-    },
-    "DependencyException": {
-      "type": "structure",
-      "members": {
-        "message": {
-          "shape": "String"
-        },
-        "parameterName": {
-          "shape": "String",
-          "documentation": "<p/>"
-        }
-      },
-      "documentation": "<p>Dependency encountered an error.</p>",
-      "exception": true,
-      "error": {
-        "code": "DependencyException",
-        "httpStatusCode": 531,
-        "fault": true
-      }
-    },
-    "DescribeContactRequest": {
-      "type": "structure",
-      "required": [
-        "contactId"
+    "GetMinuteUsageRequest":{
+      "type":"structure",
+      "required":[
+        "month",
+        "year"
       ],
-      "members": {
-        "contactId": {
-          "shape": "String",
-          "documentation": "<p>UUID of a contact.</p>",
-          "location": "uri",
-          "locationName": "contactId"
+      "members":{
+        "month":{
+          "shape":"Integer",
+          "documentation":"<p>The month being requested, with a value of 1-12.</p>"
+        },
+        "year":{
+          "shape":"Integer",
+          "documentation":"<p>The year being requested, in the format of YYYY.</p>"
         }
       },
-      "documentation": "<p/>"
+      "documentation":"<p/>"
     },
-    "ResourceNotFoundException": {
-      "type": "structure",
-      "members": {
-        "message": {
-          "shape": "String"
+    "GetMinuteUsageResponse":{
+      "type":"structure",
+      "members":{
+        "estimatedMinutesRemaining":{
+          "shape":"Integer",
+          "documentation":"<p>Estimated number of minutes remaining for an account, specific to the month being requested.</p>"
+        },
+        "isReservedMinutesCustomer":{
+          "shape":"Boolean",
+          "documentation":"<p>Returns whether or not an account has signed up for the reserved minutes pricing plan, specific to the month being requested.</p>"
+        },
+        "totalReservedMinuteAllocation":{
+          "shape":"Integer",
+          "documentation":"<p>Total number of reserved minutes allocated, specific to the month being requested.</p>"
+        },
+        "totalScheduledMinutes":{
+          "shape":"Integer",
+          "documentation":"<p>Total scheduled minutes for an account, specific to the month being requested.</p>"
+        },
+        "upcomingMinutesScheduled":{
+          "shape":"Integer",
+          "documentation":"<p>Upcoming minutes scheduled for an account, specific to the month being requested.</p>"
         }
       },
-      "documentation": "<p>Resource was not found.</p>",
-      "exception": true,
-      "error": {
-        "code": "ResourceNotFoundException",
-        "httpStatusCode": 434,
-        "senderFault": true
-      }
+      "documentation":"<p/>"
     },
-    "Timestamp": {
-      "type": "timestamp"
-    },
-    "DeleteConfigRequest": {
-      "type": "structure",
-      "required": [
-        "configId",
-        "configType"
-      ],
-      "members": {
-        "configId": {
-          "shape": "String",
-          "documentation": "<p>UUID of a <code>Config</code>.</p>",
-          "location": "uri",
-          "locationName": "configId"
-        },
-        "configType": {
-          "shape": "ConfigCapabilityType",
-          "documentation": "<p>Type of a <code>Config</code>.</p>",
-          "location": "uri",
-          "locationName": "configType"
+    "GetMissionProfileRequest":{
+      "type":"structure",
+      "required":["missionProfileId"],
+      "members":{
+        "missionProfileId":{
+          "shape":"String",
+          "documentation":"<p>UUID of a mission profile.</p>",
+          "location":"uri",
+          "locationName":"missionProfileId"
         }
       },
-      "documentation": "<p/>"
-    },
-    "BandwidthUnits": {
-      "type": "string",
-      "enum": [
-        "GHz",
-        "MHz",
-        "kHz"
-      ]
+      "documentation":"<p/>"
     },
-    "SpectrumConfig": {
-      "type": "structure",
-      "required": [
-        "bandwidth",
-        "centerFrequency"
-      ],
-      "members": {
-        "bandwidth": {
-          "shape": "FrequencyBandwidth",
-          "documentation": "<p>Bandwidth of a spectral <code>Config</code>.</p>"
+    "GetMissionProfileResponse":{
+      "type":"structure",
+      "members":{
+        "contactPostPassDurationSeconds":{
+          "shape":"DurationInSeconds",
+          "documentation":"<p>Amount of time after a contact ends that you’d like to receive a CloudWatch event indicating the pass has finished.</p>"
+        },
+        "contactPrePassDurationSeconds":{
+          "shape":"DurationInSeconds",
+          "documentation":"<p>Amount of time prior to contact start you’d like to receive a CloudWatch event indicating an upcoming pass.</p>"
+        },
+        "dataflowEdges":{
+          "shape":"DataflowEdgeList",
+          "documentation":"<p>A list of lists of ARNs. Each list of ARNs is an edge, with a <i>from</i> <code>Config</code> and a <i>to</i> <code>Config</code>.</p>"
+        },
+        "minimumViableContactDurationSeconds":{
+          "shape":"DurationInSeconds",
+          "documentation":"<p>Smallest amount of time in seconds that you’d like to see for an available contact. AWS Ground Station will not present you with contacts shorter than this duration.</p>"
+        },
+        "missionProfileArn":{
+          "shape":"MissionProfileArn",
+          "documentation":"<p>ARN of a mission profile.</p>"
+        },
+        "missionProfileId":{
+          "shape":"String",
+          "documentation":"<p>UUID of a mission profile.</p>"
+        },
+        "name":{
+          "shape":"String",
+          "documentation":"<p>Name of a mission profile.</p>"
+        },
+        "region":{
+          "shape":"String",
+          "documentation":"<p>Region of a mission profile.</p>"
         },
-        "centerFrequency": {
-          "shape": "Frequency",
-          "documentation": "<p>Center frequency of a spectral <code>Config</code>.</p>"
+        "tags":{
+          "shape":"TagsMap",
+          "documentation":"<p>Tags assigned to a mission profile.</p>"
         },
-        "polarization": {
-          "shape": "Polarization",
-          "documentation": "<p>Polarization of a spectral <code>Config</code>.</p>"
+        "trackingConfigArn":{
+          "shape":"ConfigArn",
+          "documentation":"<p>ARN of a tracking <code>Config</code>.</p>"
         }
       },
-      "documentation": "<p>Object that describes a spectral <code>Config</code>.</p>"
+      "documentation":"<p/>"
     },
-    "DemodulationConfig": {
-      "type": "structure",
-      "required": [
-        "unvalidatedJSON"
-      ],
-      "members": {
-        "unvalidatedJSON": {
-          "shape": "JsonString",
-          "documentation": "<p>Unvalidated JSON of a demodulation <code>Config</code>.</p>"
+    "GetSatelliteRequest":{
+      "type":"structure",
+      "required":["satelliteId"],
+      "members":{
+        "satelliteId":{
+          "shape":"String",
+          "documentation":"<p>UUID of a satellite.</p>",
+          "location":"uri",
+          "locationName":"satelliteId"
         }
       },
-      "documentation": "<p>Information about the demodulation <code>Config</code>.</p>"
+      "documentation":"<p/>"
     },
-    "ListMissionProfilesResponse": {
-      "type": "structure",
-      "members": {
-        "missionProfileList": {
-          "shape": "MissionProfileList",
-          "documentation": "<p>List of mission profiles</p>"
+    "GetSatelliteResponse":{
+      "type":"structure",
+      "members":{
+        "groundStations":{
+          "shape":"GroundStationIdList",
+          "documentation":"<p>A list of ground stations to which the satellite is on-boarded.</p>"
+        },
+        "noradSatelliteID":{
+          "shape":"noradSatelliteID",
+          "documentation":"<p>NORAD satellite ID number.</p>"
         },
-        "nextToken": {
-          "shape": "String",
-          "documentation": "<p>Next token returned in the response of a previous <code>ListMissionProfiles</code> call. Used to get the next page of results.</p>"
+        "satelliteArn":{
+          "shape":"satelliteArn",
+          "documentation":"<p>ARN of a satellite.</p>"
+        },
+        "satelliteId":{
+          "shape":"Uuid",
+          "documentation":"<p>UUID of a satellite.</p>"
         }
       },
-      "documentation": "<p/>"
+      "documentation":"<p/>"
     },
-    "ListConfigsResponse": {
-      "type": "structure",
-      "members": {
-        "configList": {
-          "shape": "ConfigList",
-          "documentation": "<p>List of <code>Config</code> items.</p>"
+    "GroundStationData":{
+      "type":"structure",
+      "members":{
+        "groundStationId":{
+          "shape":"String",
+          "documentation":"<p>UUID of a ground station.</p>"
+        },
+        "groundStationName":{
+          "shape":"String",
+          "documentation":"<p>Name of a ground station.</p>"
         },
-        "nextToken": {
-          "shape": "String",
-          "documentation": "<p>Next token returned in the response of a previous <code>ListConfigs</code> call. Used to get the next page of results.</p>"
+        "region":{
+          "shape":"String",
+          "documentation":"<p>Ground station Region.</p>"
         }
       },
-      "documentation": "<p/>"
+      "documentation":"<p>Information about the ground station data.</p>"
     },
-    "DataflowEdge": {
-      "type": "list",
-      "member": {
-        "shape": "ConfigArn"
-      },
-      "min": 2,
-      "max": 2
+    "GroundStationIdList":{
+      "type":"list",
+      "member":{"shape":"String"}
     },
-    "SafeName": {
-      "type": "string",
-      "min": 1,
-      "max": 256,
-      "pattern": "^[ a-zA-Z0-9_:-]+$"
+    "GroundStationList":{
+      "type":"list",
+      "member":{"shape":"GroundStationData"}
     },
-    "Eirp": {
-      "type": "structure",
-      "required": [
-        "units",
-        "value"
-      ],
-      "members": {
-        "units": {
-          "shape": "EirpUnits",
-          "documentation": "<p>Units of an EIRP.</p>"
-        },
-        "value": {
-          "shape": "Double",
-          "documentation": "<p>Value of an EIRP.</p>"
+    "Integer":{
+      "type":"integer",
+      "box":true
+    },
+    "InvalidParameterException":{
+      "type":"structure",
+      "members":{
+        "message":{"shape":"String"},
+        "parameterName":{
+          "shape":"String",
+          "documentation":"<p/>"
         }
       },
-      "documentation": "<p>Object that represents EIRP.</p>"
+      "documentation":"<p>One or more parameters are not valid.</p>",
+      "error":{
+        "httpStatusCode":431,
+        "senderFault":true
+      },
+      "exception":true
     },
-    "RoleArn": {
-      "type": "string"
+    "JsonString":{
+      "type":"string",
+      "max":8192,
+      "min":2,
+      "pattern":"^[{}\\[\\]:.,\"0-9A-z\\-_\\s]{2,8192}$"
     },
-    "ListMissionProfilesRequest": {
-      "type": "structure",
-      "members": {
-        "maxResults": {
-          "shape": "Integer",
-          "documentation": "<p>Maximum number of mission profiles returned.</p>",
-          "location": "querystring",
-          "locationName": "maxResults"
+    "ListConfigsRequest":{
+      "type":"structure",
+      "members":{
+        "maxResults":{
+          "shape":"Integer",
+          "documentation":"<p>Maximum number of <code>Configs</code> returned.</p>",
+          "location":"querystring",
+          "locationName":"maxResults"
         },
-        "nextToken": {
-          "shape": "String",
-          "documentation": "<p>Next token returned in the request of a previous <code>ListMissionProfiles</code> call. Used to get the next page of results.</p>",
-          "location": "querystring",
-          "locationName": "nextToken"
+        "nextToken":{
+          "shape":"String",
+          "documentation":"<p>Next token returned in the request of a previous <code>ListConfigs</code> call. Used to get the next page of results.</p>",
+          "location":"querystring",
+          "locationName":"nextToken"
         }
       },
-      "documentation": "<p/>"
+      "documentation":"<p/>"
     },
-    "GetSatelliteResponse": {
-      "type": "structure",
-      "members": {
-        "dateCreated": {
-          "shape": "Timestamp",
-          "documentation": "<p>When a satellite was created.</p>"
-        },
-        "lastUpdated": {
-          "shape": "Timestamp",
-          "documentation": "<p>When a satellite was last updated.</p>"
+    "ListConfigsResponse":{
+      "type":"structure",
+      "members":{
+        "configList":{
+          "shape":"ConfigList",
+          "documentation":"<p>List of <code>Config</code> items.</p>"
         },
-        "noradSatelliteID": {
-          "shape": "noradSatelliteID",
-          "documentation": "<p>NORAD satellite ID number.</p>"
-        },
-        "satelliteArn": {
-          "shape": "satelliteArn",
-          "documentation": "<p>ARN of a satellite.</p>"
-        },
-        "satelliteId": {
-          "shape": "Uuid",
-          "documentation": "<p>UUID of a satellite.</p>"
-        },
-        "tags": {
-          "shape": "TagsMap",
-          "documentation": "<p>Tags assigned to a satellite.</p>"
+        "nextToken":{
+          "shape":"String",
+          "documentation":"<p>Next token returned in the response of a previous <code>ListConfigs</code> call. Used to get the next page of results.</p>"
         }
       },
-      "documentation": "<p/>"
-    },
-    "StatusList": {
-      "type": "list",
-      "member": {
-        "shape": "ContactStatus"
-      }
+      "documentation":"<p/>"
     },
-    "ListContactsRequest": {
-      "type": "structure",
-      "required": [
+    "ListContactsRequest":{
+      "type":"structure",
+      "required":[
         "endTime",
         "startTime",
         "statusList"
       ],
-      "members": {
-        "endTime": {
-          "shape": "Timestamp",
-          "documentation": "<p>End time of a contact.</p>"
+      "members":{
+        "endTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>End time of a contact.</p>"
         },
-        "groundStation": {
-          "shape": "String",
-          "documentation": "<p>Name of a ground station.</p>"
+        "groundStation":{
+          "shape":"String",
+          "documentation":"<p>Name of a ground station.</p>"
         },
-        "maxResults": {
-          "shape": "Integer",
-          "documentation": "<p>Maximum number of contacts returned.</p>"
+        "maxResults":{
+          "shape":"Integer",
+          "documentation":"<p>Maximum number of contacts returned.</p>"
         },
-        "missionProfileArn": {
-          "shape": "MissionProfileArn",
-          "documentation": "<p>ARN of a mission profile.</p>"
+        "missionProfileArn":{
+          "shape":"MissionProfileArn",
+          "documentation":"<p>ARN of a mission profile.</p>"
         },
-        "nextToken": {
-          "shape": "String",
-          "documentation": "<p>Next token returned in the request of a previous <code>ListContacts</code> call. Used to get the next page of results.</p>"
+        "nextToken":{
+          "shape":"String",
+          "documentation":"<p>Next token returned in the request of a previous <code>ListContacts</code> call. Used to get the next page of results.</p>"
         },
-        "satelliteArn": {
-          "shape": "satelliteArn",
-          "documentation": "<p>ARN of a satellite.</p>"
+        "satelliteArn":{
+          "shape":"satelliteArn",
+          "documentation":"<p>ARN of a satellite.</p>"
         },
-        "startTime": {
-          "shape": "Timestamp",
-          "documentation": "<p>Start time of a contact.</p>"
+        "startTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>Start time of a contact.</p>"
         },
-        "statusList": {
-          "shape": "StatusList",
-          "documentation": "<p>Status of a contact reservation.</p>"
-        }
-      },
-      "documentation": "<p/>"
+        "statusList":{
+          "shape":"StatusList",
+          "documentation":"<p>Status of a contact reservation.</p>"
+        }
+      },
+      "documentation":"<p/>"
     },
-    "ContactData": {
-      "type": "structure",
-      "members": {
-        "contactId": {
-          "shape": "String",
-          "documentation": "<p>UUID of a contact.</p>"
-        },
-        "contactStatus": {
-          "shape": "ContactStatus",
-          "documentation": "<p>Status of a contact.</p>"
-        },
-        "endTime": {
-          "shape": "Timestamp",
-          "documentation": "<p>End time of a contact.</p>"
-        },
-        "errorMessage": {
-          "shape": "String",
-          "documentation": "<p>Error message of a contact.</p>"
-        },
-        "groundStation": {
-          "shape": "String",
-          "documentation": "<p>Name of a ground station.</p>"
-        },
-        "maximumElevation": {
-          "shape": "Elevation",
-          "documentation": "<p>Maximum elevation angle of a contact.</p>"
-        },
-        "missionProfileArn": {
-          "shape": "MissionProfileArn",
-          "documentation": "<p>ARN of a mission profile.</p>"
+    "ListContactsResponse":{
+      "type":"structure",
+      "members":{
+        "contactList":{
+          "shape":"ContactList",
+          "documentation":"<p>List of contacts.</p>"
         },
-        "postPassEndTime": {
-          "shape": "Timestamp",
-          "documentation": "<p>Amount of time after a contact ends that you’d like to receive a CloudWatch event indicating the pass has finished.</p>"
+        "nextToken":{
+          "shape":"String",
+          "documentation":"<p>Next token returned in the response of a previous <code>ListContacts</code> call. Used to get the next page of results.</p>"
+        }
+      },
+      "documentation":"<p/>"
+    },
+    "ListDataflowEndpointGroupsRequest":{
+      "type":"structure",
+      "members":{
+        "maxResults":{
+          "shape":"Integer",
+          "documentation":"<p>Maximum number of dataflow endpoint groups returned.</p>",
+          "location":"querystring",
+          "locationName":"maxResults"
         },
-        "prePassStartTime": {
-          "shape": "Timestamp",
-          "documentation": "<p>Amount of time prior to contact start you’d like to receive a CloudWatch event indicating an upcoming pass.</p>"
+        "nextToken":{
+          "shape":"String",
+          "documentation":"<p>Next token returned in the request of a previous <code>ListDataflowEndpointGroups</code> call. Used to get the next page of results.</p>",
+          "location":"querystring",
+          "locationName":"nextToken"
+        }
+      },
+      "documentation":"<p/>"
+    },
+    "ListDataflowEndpointGroupsResponse":{
+      "type":"structure",
+      "members":{
+        "dataflowEndpointGroupList":{
+          "shape":"DataflowEndpointGroupList",
+          "documentation":"<p>A list of dataflow endpoint groups.</p>"
         },
-        "satelliteArn": {
-          "shape": "satelliteArn",
-          "documentation": "<p>ARN of a satellite.</p>"
+        "nextToken":{
+          "shape":"String",
+          "documentation":"<p>Next token returned in the response of a previous <code>ListDataflowEndpointGroups</code> call. Used to get the next page of results.</p>"
+        }
+      },
+      "documentation":"<p/>"
+    },
+    "ListGroundStationsRequest":{
+      "type":"structure",
+      "members":{
+        "maxResults":{
+          "shape":"Integer",
+          "documentation":"<p>Maximum number of ground stations returned.</p>",
+          "location":"querystring",
+          "locationName":"maxResults"
         },
-        "startTime": {
-          "shape": "Timestamp",
-          "documentation": "<p>Start time of a contact.</p>"
+        "nextToken":{
+          "shape":"String",
+          "documentation":"<p>Next token that can be supplied in the next call to get the next page of ground stations.</p>",
+          "location":"querystring",
+          "locationName":"nextToken"
         },
-        "tags": {
-          "shape": "TagsMap",
-          "documentation": "<p>Tags assigned to a contact.</p>"
+        "satelliteId":{
+          "shape":"String",
+          "documentation":"<p>Satellite ID to retrieve on-boarded ground stations.</p>",
+          "location":"querystring",
+          "locationName":"satelliteId"
         }
       },
-      "documentation": "<p>Data describing a contact.</p>"
+      "documentation":"<p/>"
     },
-    "ListGroundStationsResponse": {
-      "type": "structure",
-      "members": {
-        "groundStationList": {
-          "shape": "GroundStationList",
-          "documentation": "<p>List of ground stations.</p>"
+    "ListGroundStationsResponse":{
+      "type":"structure",
+      "members":{
+        "groundStationList":{
+          "shape":"GroundStationList",
+          "documentation":"<p>List of ground stations.</p>"
         },
-        "nextToken": {
-          "shape": "String",
-          "documentation": "<p>Next token that can be supplied in the next call to get the next page of ground stations.</p>"
+        "nextToken":{
+          "shape":"String",
+          "documentation":"<p>Next token that can be supplied in the next call to get the next page of ground stations.</p>"
         }
       },
-      "documentation": "<p/>"
+      "documentation":"<p/>"
     },
-    "DataflowEndpoint": {
-      "type": "structure",
-      "members": {
-        "address": {
-          "shape": "SocketAddress",
-          "documentation": "<p>Socket address of a dataflow endpoint.</p>"
-        },
-        "name": {
-          "shape": "SafeName",
-          "documentation": "<p>Name of a dataflow endpoint.</p>"
+    "ListMissionProfilesRequest":{
+      "type":"structure",
+      "members":{
+        "maxResults":{
+          "shape":"Integer",
+          "documentation":"<p>Maximum number of mission profiles returned.</p>",
+          "location":"querystring",
+          "locationName":"maxResults"
         },
-        "status": {
-          "shape": "EndpointStatus",
-          "documentation": "<p>Status of a dataflow endpoint.</p>"
+        "nextToken":{
+          "shape":"String",
+          "documentation":"<p>Next token returned in the request of a previous <code>ListMissionProfiles</code> call. Used to get the next page of results.</p>",
+          "location":"querystring",
+          "locationName":"nextToken"
         }
       },
-      "documentation": "<p>Information about a dataflow endpoint.</p>"
+      "documentation":"<p/>"
     },
-    "ListConfigsRequest": {
-      "type": "structure",
-      "members": {
-        "maxResults": {
-          "shape": "Integer",
-          "documentation": "<p>Maximum number of <code>Configs</code> returned.</p>",
-          "location": "querystring",
-          "locationName": "maxResults"
+    "ListMissionProfilesResponse":{
+      "type":"structure",
+      "members":{
+        "missionProfileList":{
+          "shape":"MissionProfileList",
+          "documentation":"<p>List of mission profiles.</p>"
         },
-        "nextToken": {
-          "shape": "String",
-          "documentation": "<p>Next token returned in the request of a previous <code>ListConfigs</code> call. Used to get the next page of results.</p>",
-          "location": "querystring",
-          "locationName": "nextToken"
+        "nextToken":{
+          "shape":"String",
+          "documentation":"<p>Next token returned in the response of a previous <code>ListMissionProfiles</code> call. Used to get the next page of results.</p>"
         }
       },
-      "documentation": "<p/>"
+      "documentation":"<p/>"
     },
-    "SocketAddress": {
-      "type": "structure",
-      "required": [
-        "name",
-        "port"
-      ],
-      "members": {
-        "name": {
-          "shape": "String",
-          "documentation": "<p>Name of a socket address.</p>"
+    "ListSatellitesRequest":{
+      "type":"structure",
+      "members":{
+        "maxResults":{
+          "shape":"Integer",
+          "documentation":"<p>Maximum number of satellites returned.</p>",
+          "location":"querystring",
+          "locationName":"maxResults"
         },
-        "port": {
-          "shape": "Integer",
-          "documentation": "<p>Port of a socket address.</p>"
+        "nextToken":{
+          "shape":"String",
+          "documentation":"<p>Next token that can be supplied in the next call to get the next page of satellites.</p>",
+          "location":"querystring",
+          "locationName":"nextToken"
         }
       },
-      "documentation": "<p>Information about the socket address.</p>"
+      "documentation":"<p/>"
     },
-    "GetConfigResponse": {
-      "type": "structure",
-      "required": [
-        "configArn",
-        "configData",
-        "configId",
-        "name"
-      ],
-      "members": {
-        "configArn": {
-          "shape": "ConfigArn",
-          "documentation": "<p>ARN of a <code>Config</code>\n         </p>"
-        },
-        "configData": {
-          "shape": "ConfigTypeData",
-          "documentation": "<p>Data elements in a <code>Config</code>.</p>"
-        },
-        "configId": {
-          "shape": "String",
-          "documentation": "<p>UUID of a <code>Config</code>.</p>"
+    "ListSatellitesResponse":{
+      "type":"structure",
+      "members":{
+        "nextToken":{
+          "shape":"String",
+          "documentation":"<p>Next token that can be supplied in the next call to get the next page of satellites.</p>"
         },
-        "configType": {
-          "shape": "ConfigCapabilityType",
-          "documentation": "<p>Type of a <code>Config</code>.</p>"
-        },
-        "name": {
-          "shape": "String",
-          "documentation": "<p>Name of a <code>Config</code>.</p>"
-        },
-        "tags": {
-          "shape": "TagsMap",
-          "documentation": "<p>Tags assigned to a <code>Config</code>.</p>"
+        "satellites":{
+          "shape":"SatelliteList",
+          "documentation":"<p>List of satellites.</p>"
         }
       },
-      "documentation": "<p/>"
+      "documentation":"<p/>"
     },
-    "TagsMap": {
-      "type": "map",
-      "key": {
-        "shape": "String"
+    "ListTagsForResourceRequest":{
+      "type":"structure",
+      "required":["resourceArn"],
+      "members":{
+        "resourceArn":{
+          "shape":"String",
+          "documentation":"<p>ARN of a resource.</p>",
+          "location":"uri",
+          "locationName":"resourceArn"
+        }
       },
-      "value": {
-        "shape": "String"
-      }
-    },
-    "TagResourceResponse": {
-      "type": "structure",
-      "members": { },
-      "documentation": "<p/>"
+      "documentation":"<p/>"
     },
-    "DeleteMissionProfileRequest": {
-      "type": "structure",
-      "required": [
-        "missionProfileId"
-      ],
-      "members": {
-        "missionProfileId": {
-          "shape": "String",
-          "documentation": "<p>UUID of a mission profile.</p>",
-          "location": "uri",
-          "locationName": "missionProfileId"
-        }
-      },
-      "documentation": "<p/>"
-    },
-    "DataflowEndpointGroupList": {
-      "type": "list",
-      "member": {
-        "shape": "DataflowEndpointListItem"
-      }
-    },
-    "ContactList": {
-      "type": "list",
-      "member": {
-        "shape": "ContactData"
-      }
-    },
-    "DurationInSeconds": {
-      "type": "integer",
-      "min": 1,
-      "max": 21600
-    },
-    "SatelliteListItem": {
-      "type": "structure",
-      "members": {
-        "noradSatelliteID": {
-          "shape": "noradSatelliteID",
-          "documentation": "<p>NORAD satellite ID number.</p>"
-        },
-        "satelliteArn": {
-          "shape": "satelliteArn",
-          "documentation": "<p>ARN of a satellite.</p>"
-        },
-        "satelliteId": {
-          "shape": "Uuid",
-          "documentation": "<p>ID of a satellite.</p>"
-        }
-      },
-      "documentation": "<p>Item in a list of satellites.</p>"
-    },
-    "GetMissionProfileRequest": {
-      "type": "structure",
-      "required": [
-        "missionProfileId"
-      ],
-      "members": {
-        "missionProfileId": {
-          "shape": "String",
-          "documentation": "<p>UUID of a mission profile.</p>",
-          "location": "uri",
-          "locationName": "missionProfileId"
+    "ListTagsForResourceResponse":{
+      "type":"structure",
+      "members":{
+        "tags":{
+          "shape":"TagsMap",
+          "documentation":"<p>Tags assigned to a resource.</p>"
         }
       },
-      "documentation": "<p/>"
+      "documentation":"<p/>"
     },
-    "Double": {
-      "type": "double",
-      "box": true
-    },
-    "ListSatellitesResponse": {
-      "type": "structure",
-      "members": {
-        "nextToken": {
-          "shape": "String",
-          "documentation": "<p>Next token that can be supplied in the next call to get the next page of satellites.</p>"
-        },
-        "satellites": {
-          "shape": "SatelliteList",
-          "documentation": "<p>List of satellites.</p>"
+    "MissionProfileArn":{"type":"string"},
+    "MissionProfileIdResponse":{
+      "type":"structure",
+      "members":{
+        "missionProfileId":{
+          "shape":"String",
+          "documentation":"<p>UUID of a mission profile.</p>"
         }
       },
-      "documentation": "<p/>"
+      "documentation":"<p/>"
     },
-    "CreateMissionProfileRequest": {
-      "type": "structure",
-      "required": [
-        "dataflowEdges",
-        "minimumViableContactDurationSeconds",
-        "name",
-        "trackingConfigArn"
-      ],
-      "members": {
-        "contactPostPassDurationSeconds": {
-          "shape": "DurationInSeconds",
-          "documentation": "<p>Amount of time after a contact ends that you’d like to receive a CloudWatch event indicating the pass has finished.</p>"
-        },
-        "contactPrePassDurationSeconds": {
-          "shape": "DurationInSeconds",
-          "documentation": "<p>Amount of time prior to contact start you’d like to receive a CloudWatch event indicating an upcoming pass.</p>"
-        },
-        "dataflowEdges": {
-          "shape": "DataflowEdgeList",
-          "documentation": "<p>A list of lists of ARNs. Each list of ARNs is an edge, with a from <code>Config</code> and a to \n         <code>Config</code>.</p>"
-        },
-        "minimumViableContactDurationSeconds": {
-          "shape": "DurationInSeconds",
-          "documentation": "<p>Smallest amount of time in seconds that you’d like to see for an available contact. AWS Ground Station will not present you with contacts shorter than this duration.</p>"
+    "MissionProfileList":{
+      "type":"list",
+      "member":{"shape":"MissionProfileListItem"}
+    },
+    "MissionProfileListItem":{
+      "type":"structure",
+      "members":{
+        "missionProfileArn":{
+          "shape":"MissionProfileArn",
+          "documentation":"<p>ARN of a mission profile.</p>"
         },
-        "name": {
-          "shape": "SafeName",
-          "documentation": "<p>Name of a mission profile.</p>"
+        "missionProfileId":{
+          "shape":"String",
+          "documentation":"<p>UUID of a mission profile.</p>"
         },
-        "tags": {
-          "shape": "TagsMap",
-          "documentation": "<p>Tags assigned to a mission profile.</p>"
+        "name":{
+          "shape":"String",
+          "documentation":"<p>Name of a mission profile.</p>"
         },
-        "trackingConfigArn": {
-          "shape": "ConfigArn",
-          "documentation": "<p>ARN of a tracking <code>Config</code>.</p>"
+        "region":{
+          "shape":"String",
+          "documentation":"<p>Region of a mission profile.</p>"
         }
       },
-      "documentation": "<p/>"
+      "documentation":"<p>Item in a list of mission profiles.</p>"
+    },
+    "Polarization":{
+      "type":"string",
+      "enum":[
+        "LEFT_HAND",
+        "NONE",
+        "RIGHT_HAND"
+      ]
     },
-    "ReserveContactRequest": {
-      "type": "structure",
-      "required": [
+    "ReserveContactRequest":{
+      "type":"structure",
+      "required":[
         "endTime",
         "groundStation",
         "missionProfileArn",
         "satelliteArn",
         "startTime"
       ],
-      "members": {
-        "endTime": {
-          "shape": "Timestamp",
-          "documentation": "<p>End time of a contact.</p>"
+      "members":{
+        "endTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>End time of a contact.</p>"
         },
-        "groundStation": {
-          "shape": "String",
-          "documentation": "<p>Name of a ground station.</p>"
+        "groundStation":{
+          "shape":"String",
+          "documentation":"<p>Name of a ground station.</p>"
         },
-        "missionProfileArn": {
-          "shape": "MissionProfileArn",
-          "documentation": "<p>ARN of a mission profile.</p>"
+        "missionProfileArn":{
+          "shape":"MissionProfileArn",
+          "documentation":"<p>ARN of a mission profile.</p>"
         },
-        "satelliteArn": {
-          "shape": "satelliteArn",
-          "documentation": "<p>ARN of a satellite</p>"
+        "satelliteArn":{
+          "shape":"satelliteArn",
+          "documentation":"<p>ARN of a satellite</p>"
         },
-        "startTime": {
-          "shape": "Timestamp",
-          "documentation": "<p>Start time of a contact.</p>"
+        "startTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>Start time of a contact.</p>"
         },
-        "tags": {
-          "shape": "TagsMap",
-          "documentation": "<p>Tags assigned to a contact.</p>"
+        "tags":{
+          "shape":"TagsMap",
+          "documentation":"<p>Tags assigned to a contact.</p>"
         }
       },
-      "documentation": "<p/>"
+      "documentation":"<p/>"
     },
-    "DataflowEndpointConfig": {
-      "type": "structure",
-      "required": [
-        "dataflowEndpointName"
-      ],
-      "members": {
-        "dataflowEndpointName": {
-          "shape": "String",
-          "documentation": "<p>Name of a dataflow endpoint.</p>"
+    "ResourceLimitExceededException":{
+      "type":"structure",
+      "members":{
+        "message":{"shape":"String"},
+        "parameterName":{
+          "shape":"String",
+          "documentation":"<p/>"
         }
       },
-      "documentation": "<p>Information about the dataflow endpoint <code>Config</code>.</p>"
-    },
-    "Uuid": {
-      "type": "string",
-      "min": 1,
-      "max": 128,
-      "pattern": "[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}"
-    },
-    "ListTagsForResourceResponse": {
-      "type": "structure",
-      "members": {
-        "tags": {
-          "shape": "TagsMap",
-          "documentation": "<p>Tags assigned to a resource.</p>"
-        }
+      "documentation":"<p>Account limits for this resource have been exceeded.</p>",
+      "error":{
+        "httpStatusCode":429,
+        "senderFault":true
       },
-      "documentation": "<p/>"
+      "exception":true
     },
-    "MissionProfileArn": {
-      "type": "string"
-    },
-    "ListContactsResponse": {
-      "type": "structure",
-      "members": {
-        "contactList": {
-          "shape": "ContactList",
-          "documentation": "<p>List of contacts.</p>"
-        },
-        "nextToken": {
-          "shape": "String",
-          "documentation": "<p>Next token returned in the response of a previous <code>ListContacts</code> call. Used to get the next page of results.</p>"
-        }
+    "ResourceNotFoundException":{
+      "type":"structure",
+      "members":{
+        "message":{"shape":"String"}
+      },
+      "documentation":"<p>Resource was not found.</p>",
+      "error":{
+        "httpStatusCode":434,
+        "senderFault":true
       },
-      "documentation": "<p/>"
+      "exception":true
     },
-    "DataflowEdgeList": {
-      "type": "list",
-      "member": {
-        "shape": "DataflowEdge"
-      }
+    "RoleArn":{"type":"string"},
+    "SafeName":{
+      "type":"string",
+      "max":256,
+      "min":1,
+      "pattern":"^[ a-zA-Z0-9_:-]{1,256}$"
     },
-    "DescribeContactResponse": {
-      "type": "structure",
-      "members": {
-        "contactId": {
-          "shape": "String",
-          "documentation": "<p>UUID of a contact.</p>"
-        },
-        "contactStatus": {
-          "shape": "ContactStatus",
-          "documentation": "<p>Status of a contact.</p>"
-        },
-        "endTime": {
-          "shape": "Timestamp",
-          "documentation": "<p>End time of a contact.</p>"
-        },
-        "errorMessage": {
-          "shape": "String",
-          "documentation": "<p>Error message for a contact.</p>"
-        },
-        "groundStation": {
-          "shape": "String",
-          "documentation": "<p>Ground station for a contact.</p>"
-        },
-        "maximumElevation": {
-          "shape": "Elevation",
-          "documentation": "<p>Maximum elevation angle of a contact.</p>"
-        },
-        "missionProfileArn": {
-          "shape": "MissionProfileArn",
-          "documentation": "<p>ARN of a mission profile.</p>"
-        },
-        "postPassEndTime": {
-          "shape": "Timestamp",
-          "documentation": "<p>Amount of time after a contact ends that you’d like to receive a CloudWatch event indicating the pass has finished.</p>"
-        },
-        "prePassStartTime": {
-          "shape": "Timestamp",
-          "documentation": "<p>Amount of time prior to contact start you’d like to receive a CloudWatch event indicating an upcoming pass.</p>"
-        },
-        "satelliteArn": {
-          "shape": "satelliteArn",
-          "documentation": "<p>ARN of a satellite.</p>"
-        },
-        "startTime": {
-          "shape": "Timestamp",
-          "documentation": "<p>Start time of a contact.</p>"
-        },
-        "tags": {
-          "shape": "TagsMap",
-          "documentation": "<p>Tags assigned to a contact.</p>"
-        }
-      },
-      "documentation": "<p/>"
+    "SatelliteList":{
+      "type":"list",
+      "member":{"shape":"SatelliteListItem"}
     },
-    "ConfigListItem": {
-      "type": "structure",
-      "members": {
-        "configArn": {
-          "shape": "ConfigArn",
-          "documentation": "<p>ARN of a <code>Config</code>.</p>"
+    "SatelliteListItem":{
+      "type":"structure",
+      "members":{
+        "groundStations":{
+          "shape":"GroundStationIdList",
+          "documentation":"<p>A list of ground stations to which the satellite is on-boarded.</p>"
         },
-        "configId": {
-          "shape": "String",
-          "documentation": "<p>UUID of a <code>Config</code>.</p>"
+        "noradSatelliteID":{
+          "shape":"noradSatelliteID",
+          "documentation":"<p>NORAD satellite ID number.</p>"
         },
-        "configType": {
-          "shape": "ConfigCapabilityType",
-          "documentation": "<p>Type of a <code>Config</code>.</p>"
+        "satelliteArn":{
+          "shape":"satelliteArn",
+          "documentation":"<p>ARN of a satellite.</p>"
         },
-        "name": {
-          "shape": "String",
-          "documentation": "<p>Name of a <code>Config</code>.</p>"
+        "satelliteId":{
+          "shape":"Uuid",
+          "documentation":"<p>UUID of a satellite.</p>"
         }
       },
-      "documentation": "<p>An item in a list of <code>Config</code> objects.</p>"
+      "documentation":"<p>Item in a list of satellites.</p>"
     },
-    "ListTagsForResourceRequest": {
-      "type": "structure",
-      "required": [
-        "resourceArn"
+    "SecurityDetails":{
+      "type":"structure",
+      "required":[
+        "roleArn",
+        "securityGroupIds",
+        "subnetIds"
       ],
-      "members": {
-        "resourceArn": {
-          "shape": "String",
-          "documentation": "<p>ARN of a resource.</p>",
-          "location": "uri",
-          "locationName": "resourceArn"
-        }
-      },
-      "documentation": "<p/>"
-    },
-    "ListDataflowEndpointGroupsRequest": {
-      "type": "structure",
-      "members": {
-        "maxResults": {
-          "shape": "Integer",
-          "documentation": "<p>Maximum number of dataflow endpoint groups returned.</p>",
-          "location": "querystring",
-          "locationName": "maxResults"
+      "members":{
+        "roleArn":{
+          "shape":"RoleArn",
+          "documentation":"<p>ARN to a role needed for connecting streams to your instances. </p>"
         },
-        "nextToken": {
-          "shape": "String",
-          "documentation": "<p>Next token returned in the request of a previous <code>ListDataflowEndpointGroups</code> call. Used to get the next page of results.</p>",
-          "location": "querystring",
-          "locationName": "nextToken"
-        }
-      },
-      "documentation": "<p/>"
-    },
-    "FrequencyBandwidth": {
-      "type": "structure",
-      "required": [
-        "units",
-        "value"
-      ],
-      "members": {
-        "units": {
-          "shape": "BandwidthUnits",
-          "documentation": "<p>Frequency bandwidth units.</p>"
+        "securityGroupIds":{
+          "shape":"SecurityGroupIdList",
+          "documentation":"<p>The security groups to attach to the elastic network interfaces.</p>"
         },
-        "value": {
-          "shape": "Double",
-          "documentation": "<p>Frequency bandwidth value.</p>"
+        "subnetIds":{
+          "shape":"SubnetList",
+          "documentation":"<p>A list of subnets where AWS Ground Station places elastic network interfaces to send streams to your instances.</p>"
         }
       },
-      "documentation": "<p>Object that describes the frequency bandwidth.</p>"
+      "documentation":"<p>Information about endpoints.</p>"
     },
-    "String": {
-      "type": "string"
+    "SecurityGroupIdList":{
+      "type":"list",
+      "member":{"shape":"String"}
     },
-    "ListSatellitesRequest": {
-      "type": "structure",
-      "members": {
-        "maxResults": {
-          "shape": "Integer",
-          "documentation": "<p>Maximum number of satellites returned.</p>",
-          "location": "querystring",
-          "locationName": "maxResults"
+    "SocketAddress":{
+      "type":"structure",
+      "required":[
+        "name",
+        "port"
+      ],
+      "members":{
+        "name":{
+          "shape":"String",
+          "documentation":"<p>Name of a socket address.</p>"
         },
-        "nextToken": {
-          "shape": "String",
-          "documentation": "<p>Next token that can be supplied in the next call to get the next page of satellites.</p>",
-          "location": "querystring",
-          "locationName": "nextToken"
+        "port":{
+          "shape":"Integer",
+          "documentation":"<p>Port of a socket address.</p>"
         }
       },
-      "documentation": "<p/>"
+      "documentation":"<p>Information about the socket address.</p>"
     },
-    "UpdateMissionProfileRequest": {
-      "type": "structure",
-      "required": [
-        "missionProfileId"
+    "SpectrumConfig":{
+      "type":"structure",
+      "required":[
+        "bandwidth",
+        "centerFrequency"
       ],
-      "members": {
-        "contactPostPassDurationSeconds": {
-          "shape": "DurationInSeconds",
-          "documentation": "<p>Amount of time after a contact ends that you’d like to receive a CloudWatch event indicating the pass has finished.</p>"
-        },
-        "contactPrePassDurationSeconds": {
-          "shape": "DurationInSeconds",
-          "documentation": "<p>Amount of time after a contact ends that you’d like to receive a CloudWatch event indicating the pass has finished.</p>"
-        },
-        "dataflowEdges": {
-          "shape": "DataflowEdgeList",
-          "documentation": "<p>A list of lists of ARNs. Each list of ARNs is an edge, with a from <code>Config</code> and a to \n         <code>Config</code>.</p>"
-        },
-        "minimumViableContactDurationSeconds": {
-          "shape": "DurationInSeconds",
-          "documentation": "<p>Smallest amount of time in seconds that you’d like to see for an available contact. AWS Ground Station will not present you with contacts shorter than this duration.</p>"
-        },
-        "missionProfileId": {
-          "shape": "String",
-          "documentation": "<p>ID of a mission profile.</p>",
-          "location": "uri",
-          "locationName": "missionProfileId"
+      "members":{
+        "bandwidth":{
+          "shape":"FrequencyBandwidth",
+          "documentation":"<p>Bandwidth of a spectral <code>Config</code>.</p>"
         },
-        "name": {
-          "shape": "SafeName",
-          "documentation": "<p>Name of a mission profile.</p>"
+        "centerFrequency":{
+          "shape":"Frequency",
+          "documentation":"<p>Center frequency of a spectral <code>Config</code>.</p>"
         },
-        "trackingConfigArn": {
-          "shape": "ConfigArn",
-          "documentation": "<p>ARN of a tracking <code>Config</code>.</p>"
+        "polarization":{
+          "shape":"Polarization",
+          "documentation":"<p>Polarization of a spectral <code>Config</code>.</p>"
         }
       },
-      "documentation": "<p/>"
+      "documentation":"<p>Object that describes a spectral <code>Config</code>.</p>"
     },
-    "FrequencyUnits": {
-      "type": "string",
-      "enum": [
-        "GHz",
-        "MHz",
-        "kHz"
-      ]
+    "StatusList":{
+      "type":"list",
+      "member":{"shape":"ContactStatus"}
     },
-    "TagResourceRequest": {
-      "type": "structure",
-      "required": [
-        "resourceArn"
+    "String":{"type":"string"},
+    "SubnetList":{
+      "type":"list",
+      "member":{"shape":"String"}
+    },
+    "TagKeys":{
+      "type":"list",
+      "member":{"shape":"String"}
+    },
+    "TagResourceRequest":{
+      "type":"structure",
+      "required":[
+        "resourceArn",
+        "tags"
       ],
-      "members": {
-        "resourceArn": {
-          "shape": "String",
-          "documentation": "<p>ARN of a resource tag.</p>",
-          "location": "uri",
-          "locationName": "resourceArn"
+      "members":{
+        "resourceArn":{
+          "shape":"String",
+          "documentation":"<p>ARN of a resource tag.</p>",
+          "location":"uri",
+          "locationName":"resourceArn"
         },
-        "tags": {
-          "shape": "TagsMap",
-          "documentation": "<p>Tags assigned to a resource.</p>"
+        "tags":{
+          "shape":"TagsMap",
+          "documentation":"<p>Tags assigned to a resource.</p>"
         }
       },
-      "documentation": "<p/>"
-    },
-    "Criticality": {
-      "type": "string",
-      "enum": [
-        "PREFERRED",
-        "REMOVED",
-        "REQUIRED"
-      ]
-    },
-    "ConfigCapabilityType": {
-      "type": "string",
-      "enum": [
-        "antenna-downlink",
-        "antenna-downlink-demod-decode",
-        "antenna-uplink",
-        "dataflow-endpoint",
-        "tracking",
-        "uplink-echo"
-      ]
+      "documentation":"<p/>"
     },
-    "TagKeys": {
-      "type": "list",
-      "member": {
-        "shape": "String"
-      }
+    "TagResourceResponse":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p/>"
     },
-    "AngleUnits": {
-      "type": "string",
-      "enum": [
-        "DEGREE_ANGLE",
-        "RADIAN"
-      ]
+    "TagsMap":{
+      "type":"map",
+      "key":{"shape":"String"},
+      "value":{"shape":"String"}
     },
-    "DataflowEndpointListItem": {
-      "type": "structure",
-      "members": {
-        "dataflowEndpointGroupArn": {
-          "shape": "DataflowEndpointGroupArn",
-          "documentation": "<p>ARN of a dataflow endpoint group.</p>"
-        },
-        "dataflowEndpointGroupId": {
-          "shape": "String",
-          "documentation": "<p>UUID of a dataflow endpoint group.</p>"
+    "Timestamp":{"type":"timestamp"},
+    "TrackingConfig":{
+      "type":"structure",
+      "required":["autotrack"],
+      "members":{
+        "autotrack":{
+          "shape":"Criticality",
+          "documentation":"<p>Current setting for autotrack.</p>"
         }
       },
-      "documentation": "<p>Item in a list of <code>DataflowEndpoint</code> groups.</p>"
+      "documentation":"<p>Object that determines whether tracking should be used during a contact executed with this <code>Config</code> in the mission profile.</p>"
     },
-    "GetDataflowEndpointGroupResponse": {
-      "type": "structure",
-      "members": {
-        "dataflowEndpointGroupArn": {
-          "shape": "DataflowEndpointGroupArn",
-          "documentation": "<p>ARN of a dataflow endpoint group.</p>"
-        },
-        "dataflowEndpointGroupId": {
-          "shape": "String",
-          "documentation": "<p>UUID of a dataflow endpoint group.</p>"
-        },
-        "endpointsDetails": {
-          "shape": "EndpointDetailsList",
-          "documentation": "<p>Details of a dataflow endpoint.</p>"
+    "UntagResourceRequest":{
+      "type":"structure",
+      "required":[
+        "resourceArn",
+        "tagKeys"
+      ],
+      "members":{
+        "resourceArn":{
+          "shape":"String",
+          "documentation":"<p>ARN of a resource.</p>",
+          "location":"uri",
+          "locationName":"resourceArn"
         },
-        "tags": {
-          "shape": "TagsMap",
-          "documentation": "<p>Tags assigned to a dataflow endpoint group.</p>"
+        "tagKeys":{
+          "shape":"TagKeys",
+          "documentation":"<p>Keys of a resource tag.</p>",
+          "location":"querystring",
+          "locationName":"tagKeys"
         }
       },
-      "documentation": "<p/>"
+      "documentation":"<p/>"
     },
-    "GetDataflowEndpointGroupRequest": {
-      "type": "structure",
-      "required": [
-        "dataflowEndpointGroupId"
-      ],
-      "members": {
-        "dataflowEndpointGroupId": {
-          "shape": "String",
-          "documentation": "<p>UUID of a dataflow endpoint group.</p>",
-          "location": "uri",
-          "locationName": "dataflowEndpointGroupId"
-        }
+    "UntagResourceResponse":{
+      "type":"structure",
+      "members":{
       },
-      "documentation": "<p/>"
+      "documentation":"<p/>"
     },
-    "ConfigArn": {
-      "type": "string"
-    },
-    "GetMinuteUsageRequest": {
-      "type": "structure",
-      "required": [
-        "month",
-        "year"
+    "UpdateConfigRequest":{
+      "type":"structure",
+      "required":[
+        "configData",
+        "configId",
+        "configType",
+        "name"
+      ],
+      "members":{
+        "configData":{
+          "shape":"ConfigTypeData",
+          "documentation":"<p>Parameters of a <code>Config</code>.</p>"
+        },
+        "configId":{
+          "shape":"String",
+          "documentation":"<p>UUID of a <code>Config</code>.</p>",
+          "location":"uri",
+          "locationName":"configId"
+        },
+        "configType":{
+          "shape":"ConfigCapabilityType",
+          "documentation":"<p>Type of a <code>Config</code>.</p>",
+          "location":"uri",
+          "locationName":"configType"
+        },
+        "name":{
+          "shape":"SafeName",
+          "documentation":"<p>Name of a <code>Config</code>.</p>"
+        }
+      },
+      "documentation":"<p/>"
+    },
+    "UpdateMissionProfileRequest":{
+      "type":"structure",
+      "required":["missionProfileId"],
+      "members":{
+        "contactPostPassDurationSeconds":{
+          "shape":"DurationInSeconds",
+          "documentation":"<p>Amount of time after a contact ends that you’d like to receive a CloudWatch event indicating the pass has finished.</p>"
+        },
+        "contactPrePassDurationSeconds":{
+          "shape":"DurationInSeconds",
+          "documentation":"<p>Amount of time after a contact ends that you’d like to receive a CloudWatch event indicating the pass has finished.</p>"
+        },
+        "dataflowEdges":{
+          "shape":"DataflowEdgeList",
+          "documentation":"<p>A list of lists of ARNs. Each list of ARNs is an edge, with a <i>from</i> <code>Config</code> and a <i>to</i> <code>Config</code>.</p>"
+        },
+        "minimumViableContactDurationSeconds":{
+          "shape":"DurationInSeconds",
+          "documentation":"<p>Smallest amount of time in seconds that you’d like to see for an available contact. AWS Ground Station will not present you with contacts shorter than this duration.</p>"
+        },
+        "missionProfileId":{
+          "shape":"String",
+          "documentation":"<p>UUID of a mission profile.</p>",
+          "location":"uri",
+          "locationName":"missionProfileId"
+        },
+        "name":{
+          "shape":"SafeName",
+          "documentation":"<p>Name of a mission profile.</p>"
+        },
+        "trackingConfigArn":{
+          "shape":"ConfigArn",
+          "documentation":"<p>ARN of a tracking <code>Config</code>.</p>"
+        }
+      },
+      "documentation":"<p/>"
+    },
+    "UplinkEchoConfig":{
+      "type":"structure",
+      "required":[
+        "antennaUplinkConfigArn",
+        "enabled"
       ],
-      "members": {
-        "month": {
-          "shape": "Integer",
-          "documentation": "<p>The month being requested, with a value of 1-12.</p>"
+      "members":{
+        "antennaUplinkConfigArn":{
+          "shape":"ConfigArn",
+          "documentation":"<p>ARN of an uplink <code>Config</code>.</p>"
         },
-        "year": {
-          "shape": "Integer",
-          "documentation": "<p>The year being requested, in the format of YYYY.</p>"
+        "enabled":{
+          "shape":"Boolean",
+          "documentation":"<p>Whether or not an uplink <code>Config</code> is enabled.</p>"
         }
       },
-      "documentation": "<p/>"
+      "documentation":"<p>Information about an uplink echo <code>Config</code>.</p> <p>Parameters from the <code>AntennaUplinkConfig</code>, corresponding to the specified <code>AntennaUplinkConfigArn</code>, are used when this <code>UplinkEchoConfig</code> is used in a contact.</p>"
     },
-    "DataflowEndpointGroupIdResponse": {
-      "type": "structure",
-      "members": {
-        "dataflowEndpointGroupId": {
-          "shape": "String",
-          "documentation": "<p>ID of a dataflow endpoint group.</p>"
+    "UplinkSpectrumConfig":{
+      "type":"structure",
+      "required":["centerFrequency"],
+      "members":{
+        "centerFrequency":{
+          "shape":"Frequency",
+          "documentation":"<p>Center frequency of an uplink spectral <code>Config</code>.</p>"
+        },
+        "polarization":{
+          "shape":"Polarization",
+          "documentation":"<p>Polarization of an uplink spectral <code>Config</code>.</p>"
         }
       },
-      "documentation": "<p/>"
+      "documentation":"<p>Information about the uplink spectral <code>Config</code>.</p>"
     },
-    "EirpUnits": {
-      "type": "string",
-      "enum": [
-        "dBW"
-      ]
-    }
-  }
+    "Uuid":{
+      "type":"string",
+      "max":128,
+      "min":1,
+      "pattern":"[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}"
+    },
+    "noradSatelliteID":{
+      "type":"integer",
+      "max":99999,
+      "min":1
+    },
+    "satelliteArn":{"type":"string"}
+  },
+  "documentation":"<p>Welcome to the AWS Ground Station API Reference. AWS Ground Station is a fully managed service that enables you to control satellite communications, downlink and process satellite data, and scale your satellite operations efficiently and cost-effectively without having to build or manage your own ground station infrastructure.</p>"
 }
diff --git a/services/guardduty/pom.xml b/services/guardduty/pom.xml
index 19e67436823b..fc3be6195fbe 100644
--- a/services/guardduty/pom.xml
+++ b/services/guardduty/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>services</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>guardduty</artifactId>
diff --git a/services/guardduty/src/main/resources/codegen-resources/paginators-1.json b/services/guardduty/src/main/resources/codegen-resources/paginators-1.json
index 1e70a2ccc09d..717e540366dd 100644
--- a/services/guardduty/src/main/resources/codegen-resources/paginators-1.json
+++ b/services/guardduty/src/main/resources/codegen-resources/paginators-1.json
@@ -36,6 +36,11 @@
       "limit_key": "MaxResults",
       "result_key": "Members"
     },
+    "ListPublishingDestinations": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "MaxResults"
+    },
     "ListThreatIntelSets": {
       "input_token": "NextToken",
       "output_token": "NextToken",
diff --git a/services/guardduty/src/main/resources/codegen-resources/service-2.json b/services/guardduty/src/main/resources/codegen-resources/service-2.json
index 222c5b91768d..a84dd0cda552 100644
--- a/services/guardduty/src/main/resources/codegen-resources/service-2.json
+++ b/services/guardduty/src/main/resources/codegen-resources/service-2.json
@@ -85,7 +85,7 @@
         {"shape":"BadRequestException"},
         {"shape":"InternalServerErrorException"}
       ],
-      "documentation":"<p>Creates a new IPSet - a list of trusted IP addresses that have been whitelisted for secure communication with AWS infrastructure and applications.</p>"
+      "documentation":"<p>Creates a new IPSet, called Trusted IP list in the consoler user interface. An IPSet is a list IP addresses trusted for secure communication with AWS infrastructure and applications. GuardDuty does not generate findings for IP addresses included in IPSets. Only users from the master account can use this operation.</p>"
     },
     "CreateMembers":{
       "name":"CreateMembers",
@@ -102,6 +102,21 @@
       ],
       "documentation":"<p>Creates member accounts of the current AWS account by specifying a list of AWS account IDs. The current AWS account can then invite these members to manage GuardDuty in their accounts.</p>"
     },
+    "CreatePublishingDestination":{
+      "name":"CreatePublishingDestination",
+      "http":{
+        "method":"POST",
+        "requestUri":"/detector/{detectorId}/publishingDestination",
+        "responseCode":200
+      },
+      "input":{"shape":"CreatePublishingDestinationRequest"},
+      "output":{"shape":"CreatePublishingDestinationResponse"},
+      "errors":[
+        {"shape":"BadRequestException"},
+        {"shape":"InternalServerErrorException"}
+      ],
+      "documentation":"<p>Creates a publishing destination to send findings to. The resource to send findings to must exist before you use this operation.</p>"
+    },
     "CreateSampleFindings":{
       "name":"CreateSampleFindings",
       "http":{
@@ -115,7 +130,7 @@
         {"shape":"BadRequestException"},
         {"shape":"InternalServerErrorException"}
       ],
-      "documentation":"<p>Generates example findings of types specified by the list of finding types. If 'NULL' is specified for findingTypes, the API generates example findings of all supported finding types.</p>"
+      "documentation":"<p>Generates example findings of types specified by the list of finding types. If 'NULL' is specified for <code>findingTypes</code>, the API generates example findings of all supported finding types.</p>"
     },
     "CreateThreatIntelSet":{
       "name":"CreateThreatIntelSet",
@@ -130,7 +145,7 @@
         {"shape":"BadRequestException"},
         {"shape":"InternalServerErrorException"}
       ],
-      "documentation":"<p>Create a new ThreatIntelSet. ThreatIntelSets consist of known malicious IP addresses. GuardDuty generates findings based on ThreatIntelSets.</p>"
+      "documentation":"<p>Create a new ThreatIntelSet. ThreatIntelSets consist of known malicious IP addresses. GuardDuty generates findings based on ThreatIntelSets. Only users of the master account can use this operation.</p>"
     },
     "DeclineInvitations":{
       "name":"DeclineInvitations",
@@ -190,7 +205,7 @@
         {"shape":"BadRequestException"},
         {"shape":"InternalServerErrorException"}
       ],
-      "documentation":"<p>Deletes the IPSet specified by the IPSet ID.</p>"
+      "documentation":"<p>Deletes the IPSet specified by the <code>ipSetId</code>. IPSets are called Trusted IP lists in the console user interface.</p>"
     },
     "DeleteInvitations":{
       "name":"DeleteInvitations",
@@ -222,6 +237,21 @@
       ],
       "documentation":"<p>Deletes GuardDuty member accounts (to the current GuardDuty master account) specified by the account IDs.</p>"
     },
+    "DeletePublishingDestination":{
+      "name":"DeletePublishingDestination",
+      "http":{
+        "method":"DELETE",
+        "requestUri":"/detector/{detectorId}/publishingDestination/{destinationId}",
+        "responseCode":200
+      },
+      "input":{"shape":"DeletePublishingDestinationRequest"},
+      "output":{"shape":"DeletePublishingDestinationResponse"},
+      "errors":[
+        {"shape":"BadRequestException"},
+        {"shape":"InternalServerErrorException"}
+      ],
+      "documentation":"<p>Deletes the publishing definition with the specified <code>destinationId</code>.</p>"
+    },
     "DeleteThreatIntelSet":{
       "name":"DeleteThreatIntelSet",
       "http":{
@@ -237,6 +267,21 @@
       ],
       "documentation":"<p>Deletes ThreatIntelSet specified by the ThreatIntelSet ID.</p>"
     },
+    "DescribePublishingDestination":{
+      "name":"DescribePublishingDestination",
+      "http":{
+        "method":"GET",
+        "requestUri":"/detector/{detectorId}/publishingDestination/{destinationId}",
+        "responseCode":200
+      },
+      "input":{"shape":"DescribePublishingDestinationRequest"},
+      "output":{"shape":"DescribePublishingDestinationResponse"},
+      "errors":[
+        {"shape":"BadRequestException"},
+        {"shape":"InternalServerErrorException"}
+      ],
+      "documentation":"<p>Returns information about the publishing destination specified by the provided <code>destinationId</code>.</p>"
+    },
     "DisassociateFromMasterAccount":{
       "name":"DisassociateFromMasterAccount",
       "http":{
@@ -340,7 +385,7 @@
         {"shape":"BadRequestException"},
         {"shape":"InternalServerErrorException"}
       ],
-      "documentation":"<p>Retrieves the IPSet specified by the IPSet ID.</p>"
+      "documentation":"<p>Retrieves the IPSet specified by the <code>ipSetId</code>.</p>"
     },
     "GetInvitationsCount":{
       "name":"GetInvitationsCount",
@@ -475,7 +520,7 @@
         {"shape":"BadRequestException"},
         {"shape":"InternalServerErrorException"}
       ],
-      "documentation":"<p>Lists the IPSets of the GuardDuty service specified by the detector ID.</p>"
+      "documentation":"<p>Lists the IPSets of the GuardDuty service specified by the detector ID. If you use this operation from a member account, the IPSets returned are the IPSets from the associated master account.</p>"
     },
     "ListInvitations":{
       "name":"ListInvitations",
@@ -507,6 +552,21 @@
       ],
       "documentation":"<p>Lists details about all member accounts for the current GuardDuty master account.</p>"
     },
+    "ListPublishingDestinations":{
+      "name":"ListPublishingDestinations",
+      "http":{
+        "method":"GET",
+        "requestUri":"/detector/{detectorId}/publishingDestination",
+        "responseCode":200
+      },
+      "input":{"shape":"ListPublishingDestinationsRequest"},
+      "output":{"shape":"ListPublishingDestinationsResponse"},
+      "errors":[
+        {"shape":"BadRequestException"},
+        {"shape":"InternalServerErrorException"}
+      ],
+      "documentation":"<p>Returns a list of publishing destinations associated with the specified <code>dectectorId</code>.</p>"
+    },
     "ListTagsForResource":{
       "name":"ListTagsForResource",
       "http":{
@@ -535,7 +595,7 @@
         {"shape":"BadRequestException"},
         {"shape":"InternalServerErrorException"}
       ],
-      "documentation":"<p>Lists the ThreatIntelSets of the GuardDuty service specified by the detector ID.</p>"
+      "documentation":"<p>Lists the ThreatIntelSets of the GuardDuty service specified by the detector ID. If you use this operation from a member account, the ThreatIntelSets associated with the master account are returned.</p>"
     },
     "StartMonitoringMembers":{
       "name":"StartMonitoringMembers",
@@ -550,7 +610,7 @@
         {"shape":"BadRequestException"},
         {"shape":"InternalServerErrorException"}
       ],
-      "documentation":"<p>Re-enables GuardDuty to monitor findings of the member accounts specified by the account IDs. A master GuardDuty account can run this command after disabling GuardDuty from monitoring these members' findings by running StopMonitoringMembers.</p>"
+      "documentation":"<p>Turns on GuardDuty monitoring of the specified member accounts. Use this operation to restart monitoring of accounts that you stopped monitoring with the <code>StopMonitoringMembers</code> operation.</p>"
     },
     "StopMonitoringMembers":{
       "name":"StopMonitoringMembers",
@@ -565,7 +625,7 @@
         {"shape":"BadRequestException"},
         {"shape":"InternalServerErrorException"}
       ],
-      "documentation":"<p>Disables GuardDuty from monitoring findings of the member accounts specified by the account IDs. After running this command, a master GuardDuty account can run StartMonitoringMembers to re-enable GuardDuty to monitor these members’ findings.</p>"
+      "documentation":"<p>Stops GuardDuty monitoring for the specified member accounnts. Use the <code>StartMonitoringMembers</code> to restart monitoring for those accounts.</p>"
     },
     "TagResource":{
       "name":"TagResource",
@@ -595,7 +655,7 @@
         {"shape":"BadRequestException"},
         {"shape":"InternalServerErrorException"}
       ],
-      "documentation":"<p>Unarchives Amazon GuardDuty findings specified by the list of finding IDs.</p>"
+      "documentation":"<p>Unarchives GuardDuty findings specified by the <code>findingIds</code>.</p>"
     },
     "UntagResource":{
       "name":"UntagResource",
@@ -625,7 +685,7 @@
         {"shape":"BadRequestException"},
         {"shape":"InternalServerErrorException"}
       ],
-      "documentation":"<p>Updates an Amazon GuardDuty detector specified by the detectorId.</p>"
+      "documentation":"<p>Updates the Amazon GuardDuty detector specified by the detectorId.</p>"
     },
     "UpdateFilter":{
       "name":"UpdateFilter",
@@ -655,7 +715,7 @@
         {"shape":"BadRequestException"},
         {"shape":"InternalServerErrorException"}
       ],
-      "documentation":"<p>Marks specified Amazon GuardDuty findings as useful or not useful.</p>"
+      "documentation":"<p>Marks the specified GuardDuty findings as useful or not useful.</p>"
     },
     "UpdateIPSet":{
       "name":"UpdateIPSet",
@@ -672,6 +732,21 @@
       ],
       "documentation":"<p>Updates the IPSet specified by the IPSet ID.</p>"
     },
+    "UpdatePublishingDestination":{
+      "name":"UpdatePublishingDestination",
+      "http":{
+        "method":"POST",
+        "requestUri":"/detector/{detectorId}/publishingDestination/{destinationId}",
+        "responseCode":200
+      },
+      "input":{"shape":"UpdatePublishingDestinationRequest"},
+      "output":{"shape":"UpdatePublishingDestinationResponse"},
+      "errors":[
+        {"shape":"BadRequestException"},
+        {"shape":"InternalServerErrorException"}
+      ],
+      "documentation":"<p>Updates information about the publishing destination specified by the <code>destinationId</code>.</p>"
+    },
     "UpdateThreatIntelSet":{
       "name":"UpdateThreatIntelSet",
       "http":{
@@ -910,37 +985,37 @@
       "members":{
         "Eq":{
           "shape":"Eq",
-          "documentation":"<p>Deprecated. Represents the equal condition to be applied to a single field when querying for findings.</p>",
+          "documentation":"<p>Represents the equal condition to be applied to a single field when querying for findings.</p>",
           "deprecated":true,
           "locationName":"eq"
         },
         "Neq":{
           "shape":"Neq",
-          "documentation":"<p>Deprecated. Represents the not equal condition to be applied to a single field when querying for findings.</p>",
+          "documentation":"<p>Represents the not equal condition to be applied to a single field when querying for findings.</p>",
           "deprecated":true,
           "locationName":"neq"
         },
         "Gt":{
           "shape":"Integer",
-          "documentation":"<p>Deprecated. Represents a greater than condition to be applied to a single field when querying for findings.</p>",
+          "documentation":"<p>Represents a greater than condition to be applied to a single field when querying for findings.</p>",
           "deprecated":true,
           "locationName":"gt"
         },
         "Gte":{
           "shape":"Integer",
-          "documentation":"<p>Deprecated. Represents a greater than equal condition to be applied to a single field when querying for findings.</p>",
+          "documentation":"<p>Represents a greater than equal condition to be applied to a single field when querying for findings.</p>",
           "deprecated":true,
           "locationName":"gte"
         },
         "Lt":{
           "shape":"Integer",
-          "documentation":"<p>Deprecated. Represents a less than condition to be applied to a single field when querying for findings.</p>",
+          "documentation":"<p>Represents a less than condition to be applied to a single field when querying for findings.</p>",
           "deprecated":true,
           "locationName":"lt"
         },
         "Lte":{
           "shape":"Integer",
-          "documentation":"<p>Deprecated. Represents a less than equal condition to be applied to a single field when querying for findings.</p>",
+          "documentation":"<p>Represents a less than equal condition to be applied to a single field when querying for findings.</p>",
           "deprecated":true,
           "locationName":"lte"
         },
@@ -996,7 +1071,7 @@
           "locationName":"countryName"
         }
       },
-      "documentation":"<p>Contains information about the country.</p>"
+      "documentation":"<p>Contains information about the country in which the remote IP address is located.</p>"
     },
     "CreateDetectorRequest":{
       "type":"structure",
@@ -1189,6 +1264,49 @@
         }
       }
     },
+    "CreatePublishingDestinationRequest":{
+      "type":"structure",
+      "required":[
+        "DetectorId",
+        "DestinationType",
+        "DestinationProperties"
+      ],
+      "members":{
+        "DetectorId":{
+          "shape":"DetectorId",
+          "documentation":"<p>The ID of the GuardDuty detector associated with the publishing destination.</p>",
+          "location":"uri",
+          "locationName":"detectorId"
+        },
+        "DestinationType":{
+          "shape":"DestinationType",
+          "documentation":"<p>The type of resource for the publishing destination. Currently only S3 is supported.</p>",
+          "locationName":"destinationType"
+        },
+        "DestinationProperties":{
+          "shape":"DestinationProperties",
+          "documentation":"<p>Properties of the publishing destination, including the ARNs for the destination and the KMS key used for encryption.</p>",
+          "locationName":"destinationProperties"
+        },
+        "ClientToken":{
+          "shape":"ClientToken",
+          "documentation":"<p>The idempotency token for the request.</p>",
+          "idempotencyToken":true,
+          "locationName":"clientToken"
+        }
+      }
+    },
+    "CreatePublishingDestinationResponse":{
+      "type":"structure",
+      "required":["DestinationId"],
+      "members":{
+        "DestinationId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the publishing destination created.</p>",
+          "locationName":"destinationId"
+        }
+      }
+    },
     "CreateSampleFindingsRequest":{
       "type":"structure",
       "required":["DetectorId"],
@@ -1201,7 +1319,7 @@
         },
         "FindingTypes":{
           "shape":"FindingTypes",
-          "documentation":"<p>Types of sample findings that you want to generate.</p>",
+          "documentation":"<p>Types of sample findings to generate.</p>",
           "locationName":"findingTypes"
         }
       }
@@ -1350,13 +1468,13 @@
       "members":{
         "DetectorId":{
           "shape":"DetectorId",
-          "documentation":"<p>The unique ID of the detector the ipSet is associated with.</p>",
+          "documentation":"<p>The unique ID of the detector associated with the IPSet.</p>",
           "location":"uri",
           "locationName":"detectorId"
         },
         "IpSetId":{
           "shape":"String",
-          "documentation":"<p>The unique ID of the ipSet you want to delete.</p>",
+          "documentation":"<p>The unique ID of the IPSet to delete.</p>",
           "location":"uri",
           "locationName":"ipSetId"
         }
@@ -1420,6 +1538,32 @@
         }
       }
     },
+    "DeletePublishingDestinationRequest":{
+      "type":"structure",
+      "required":[
+        "DetectorId",
+        "DestinationId"
+      ],
+      "members":{
+        "DetectorId":{
+          "shape":"DetectorId",
+          "documentation":"<p>The unique ID of the detector associated with the publishing destination to delete.</p>",
+          "location":"uri",
+          "locationName":"detectorId"
+        },
+        "DestinationId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the publishing destination to delete.</p>",
+          "location":"uri",
+          "locationName":"destinationId"
+        }
+      }
+    },
+    "DeletePublishingDestinationResponse":{
+      "type":"structure",
+      "members":{
+      }
+    },
     "DeleteThreatIntelSetRequest":{
       "type":"structure",
       "required":[
@@ -1446,6 +1590,116 @@
       "members":{
       }
     },
+    "DescribePublishingDestinationRequest":{
+      "type":"structure",
+      "required":[
+        "DetectorId",
+        "DestinationId"
+      ],
+      "members":{
+        "DetectorId":{
+          "shape":"DetectorId",
+          "documentation":"<p>The unique ID of the detector associated with the publishing destination to retrieve.</p>",
+          "location":"uri",
+          "locationName":"detectorId"
+        },
+        "DestinationId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the publishing destination to retrieve.</p>",
+          "location":"uri",
+          "locationName":"destinationId"
+        }
+      }
+    },
+    "DescribePublishingDestinationResponse":{
+      "type":"structure",
+      "required":[
+        "DestinationId",
+        "DestinationType",
+        "Status",
+        "PublishingFailureStartTimestamp",
+        "DestinationProperties"
+      ],
+      "members":{
+        "DestinationId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the publishing destination.</p>",
+          "locationName":"destinationId"
+        },
+        "DestinationType":{
+          "shape":"DestinationType",
+          "documentation":"<p>The type of the publishing destination. Currently, only S3 is supported.</p>",
+          "locationName":"destinationType"
+        },
+        "Status":{
+          "shape":"PublishingStatus",
+          "documentation":"<p>The status of the publishing destination.</p>",
+          "locationName":"status"
+        },
+        "PublishingFailureStartTimestamp":{
+          "shape":"Long",
+          "documentation":"<p>The time, in epoch millisecond format, at which GuardDuty was first unable to publish findings to the destination.</p>",
+          "locationName":"publishingFailureStartTimestamp"
+        },
+        "DestinationProperties":{
+          "shape":"DestinationProperties",
+          "documentation":"<p>A <code>DestinationProperties</code> object that includes the <code>DestinationArn</code> and <code>KmsKeyArn</code> of the publishing destination.</p>",
+          "locationName":"destinationProperties"
+        }
+      }
+    },
+    "Destination":{
+      "type":"structure",
+      "required":[
+        "DestinationId",
+        "DestinationType",
+        "Status"
+      ],
+      "members":{
+        "DestinationId":{
+          "shape":"String",
+          "documentation":"<p>The unique ID of the publishing destination.</p>",
+          "locationName":"destinationId"
+        },
+        "DestinationType":{
+          "shape":"DestinationType",
+          "documentation":"<p>The type of resource used for the publishing destination. Currently, only S3 is supported.</p>",
+          "locationName":"destinationType"
+        },
+        "Status":{
+          "shape":"PublishingStatus",
+          "documentation":"<p>The status of the publishing destination.</p>",
+          "locationName":"status"
+        }
+      },
+      "documentation":"<p>Contains information about a publishing destination, including the ID, type, and status.</p>"
+    },
+    "DestinationProperties":{
+      "type":"structure",
+      "members":{
+        "DestinationArn":{
+          "shape":"String",
+          "documentation":"<p>The ARN of the resource to publish to.</p>",
+          "locationName":"destinationArn"
+        },
+        "KmsKeyArn":{
+          "shape":"String",
+          "documentation":"<p>The ARN of the KMS key to use for encryption.</p>",
+          "locationName":"kmsKeyArn"
+        }
+      },
+      "documentation":"<p>Contains the ARN of the resource to publish to, such as an S3 bucket, and the ARN of the KMS key to use to encrypt published findings.</p>"
+    },
+    "DestinationType":{
+      "type":"string",
+      "enum":["S3"],
+      "max":300,
+      "min":1
+    },
+    "Destinations":{
+      "type":"list",
+      "member":{"shape":"Destination"}
+    },
     "DetectorId":{
       "type":"string",
       "max":300,
@@ -1519,11 +1773,11 @@
       "members":{
         "Domain":{
           "shape":"String",
-          "documentation":"<p>Domain information for the DNS request.</p>",
+          "documentation":"<p>Domain information for the API request.</p>",
           "locationName":"domain"
         }
       },
-      "documentation":"<p>Contains information about the DNS request.</p>"
+      "documentation":"<p>Contains information about the DNS_REQUEST action described in this finding.</p>"
     },
     "DomainDetails":{
       "type":"structure",
@@ -1687,7 +1941,7 @@
           "locationName":"updatedAt"
         }
       },
-      "documentation":"<p>Contains information about the finding.</p>"
+      "documentation":"<p>Contains information about the finding, which is generated when abnormal or suspicious activity is detected.</p>"
     },
     "FindingCriteria":{
       "type":"structure",
@@ -1698,7 +1952,7 @@
           "locationName":"criterion"
         }
       },
-      "documentation":"<p>Contains finding criteria information.</p>"
+      "documentation":"<p>Contains information about the criteria used for querying findings.</p>"
     },
     "FindingId":{
       "type":"string",
@@ -1771,7 +2025,7 @@
           "locationName":"lon"
         }
       },
-      "documentation":"<p>Contains information about the </p>"
+      "documentation":"<p>Contains information about the location of the remote IP address.</p>"
     },
     "GetDetectorRequest":{
       "type":"structure",
@@ -1972,7 +2226,7 @@
         },
         "IpSetId":{
           "shape":"String",
-          "documentation":"<p>The unique ID of the ipSet you want to get.</p>",
+          "documentation":"<p>The unique ID of the IPSet to retrieve.</p>",
           "location":"uri",
           "locationName":"ipSetId"
         }
@@ -1989,7 +2243,7 @@
       "members":{
         "Name":{
           "shape":"Name",
-          "documentation":"<p>The user friendly name to identify the IPSet. This name is displayed in all findings that are triggered by activity that involves IP addresses included in this IPSet.</p>",
+          "documentation":"<p>The user friendly name for the IPSet.</p>",
           "locationName":"name"
         },
         "Format":{
@@ -2166,7 +2420,7 @@
           "locationName":"id"
         }
       },
-      "documentation":"<p>Contains information about the instance profile.</p>"
+      "documentation":"<p>Contains information about the EC2 instance profile.</p>"
     },
     "InstanceDetails":{
       "type":"structure",
@@ -2206,6 +2460,11 @@
           "documentation":"<p>The type of the EC2 instance.</p>",
           "locationName":"instanceType"
         },
+        "OutpostArn":{
+          "shape":"String",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the AWS Outpost. Only applicable to AWS Outposts instances.</p>",
+          "locationName":"outpostArn"
+        },
         "LaunchTime":{
           "shape":"String",
           "documentation":"<p>The launch time of the EC2 instance.</p>",
@@ -2258,12 +2517,12 @@
       "members":{
         "AccountId":{
           "shape":"AccountId",
-          "documentation":"<p>Inviter account ID</p>",
+          "documentation":"<p>The ID of the account from which the invitations was sent.</p>",
           "locationName":"accountId"
         },
         "InvitationId":{
           "shape":"String",
-          "documentation":"<p>This value is used to validate the inviter account to the member account.</p>",
+          "documentation":"<p>The ID of the invitation. This value is used to validate the inviter account to the member account.</p>",
           "locationName":"invitationId"
         },
         "RelationshipStatus":{
@@ -2273,11 +2532,11 @@
         },
         "InvitedAt":{
           "shape":"String",
-          "documentation":"<p>Timestamp at which the invitation was sent</p>",
+          "documentation":"<p>Timestamp at which the invitation was sent.</p>",
           "locationName":"invitedAt"
         }
       },
-      "documentation":"<p>Contains information about the invitation.</p>"
+      "documentation":"<p>Contains information about the invitation to become a member account.</p>"
     },
     "Invitations":{
       "type":"list",
@@ -2448,7 +2707,7 @@
         },
         "FindingCriteria":{
           "shape":"FindingCriteria",
-          "documentation":"<p>Represents the criteria used for querying findings.</p>",
+          "documentation":"<p>Represents the criteria used for querying findings. Valid values include:</p> <ul> <li> <p>JSON field name</p> </li> <li> <p>accountId</p> </li> <li> <p>region</p> </li> <li> <p>confidence</p> </li> <li> <p>id</p> </li> <li> <p>resource.accessKeyDetails.accessKeyId</p> </li> <li> <p>resource.accessKeyDetails.principalId</p> </li> <li> <p>resource.accessKeyDetails.userName</p> </li> <li> <p>resource.accessKeyDetails.userType</p> </li> <li> <p>resource.instanceDetails.iamInstanceProfile.id</p> </li> <li> <p>resource.instanceDetails.imageId</p> </li> <li> <p>resource.instanceDetails.instanceId</p> </li> <li> <p>resource.instanceDetails.outpostArn</p> </li> <li> <p>resource.instanceDetails.networkInterfaces.ipv6Addresses</p> </li> <li> <p>resource.instanceDetails.networkInterfaces.privateIpAddresses.privateIpAddress</p> </li> <li> <p>resource.instanceDetails.networkInterfaces.publicDnsName</p> </li> <li> <p>resource.instanceDetails.networkInterfaces.publicIp</p> </li> <li> <p>resource.instanceDetails.networkInterfaces.securityGroups.groupId</p> </li> <li> <p>resource.instanceDetails.networkInterfaces.securityGroups.groupName</p> </li> <li> <p>resource.instanceDetails.networkInterfaces.subnetId</p> </li> <li> <p>resource.instanceDetails.networkInterfaces.vpcId</p> </li> <li> <p>resource.instanceDetails.tags.key</p> </li> <li> <p>resource.instanceDetails.tags.value</p> </li> <li> <p>resource.resourceType</p> </li> <li> <p>service.action.actionType</p> </li> <li> <p>service.action.awsApiCallAction.api</p> </li> <li> <p>service.action.awsApiCallAction.callerType</p> </li> <li> <p>service.action.awsApiCallAction.remoteIpDetails.city.cityName</p> </li> <li> <p>service.action.awsApiCallAction.remoteIpDetails.country.countryName</p> </li> <li> <p>service.action.awsApiCallAction.remoteIpDetails.ipAddressV4</p> </li> <li> <p>service.action.awsApiCallAction.remoteIpDetails.organization.asn</p> </li> <li> <p>service.action.awsApiCallAction.remoteIpDetails.organization.asnOrg</p> </li> <li> <p>service.action.awsApiCallAction.serviceName</p> </li> <li> <p>service.action.dnsRequestAction.domain</p> </li> <li> <p>service.action.networkConnectionAction.blocked</p> </li> <li> <p>service.action.networkConnectionAction.connectionDirection</p> </li> <li> <p>service.action.networkConnectionAction.localPortDetails.port</p> </li> <li> <p>service.action.networkConnectionAction.protocol</p> </li> <li> <p>service.action.networkConnectionAction.localIpDetails.ipAddressV4</p> </li> <li> <p>service.action.networkConnectionAction.remoteIpDetails.city.cityName</p> </li> <li> <p>service.action.networkConnectionAction.remoteIpDetails.country.countryName</p> </li> <li> <p>service.action.networkConnectionAction.remoteIpDetails.ipAddressV4</p> </li> <li> <p>service.action.networkConnectionAction.remoteIpDetails.organization.asn</p> </li> <li> <p>service.action.networkConnectionAction.remoteIpDetails.organization.asnOrg</p> </li> <li> <p>service.action.networkConnectionAction.remotePortDetails.port</p> </li> <li> <p>service.additionalInfo.threatListName</p> </li> <li> <p>service.archived</p> <p>When this attribute is set to 'true', only archived findings are listed. When it's set to 'false', only unarchived findings are listed. When this attribute is not set, all existing findings are listed.</p> </li> <li> <p>service.resourceRole</p> </li> <li> <p>severity</p> </li> <li> <p>type</p> </li> <li> <p>updatedAt</p> <p>Type: Timestamp in Unix Epoch millisecond format: 1486685375000</p> </li> </ul>",
           "locationName":"findingCriteria"
         },
         "SortCriteria":{
@@ -2601,6 +2860,46 @@
         }
       }
     },
+    "ListPublishingDestinationsRequest":{
+      "type":"structure",
+      "required":["DetectorId"],
+      "members":{
+        "DetectorId":{
+          "shape":"DetectorId",
+          "documentation":"<p>The ID of the detector to retrieve publishing destinations for.</p>",
+          "location":"uri",
+          "locationName":"detectorId"
+        },
+        "MaxResults":{
+          "shape":"MaxResults",
+          "documentation":"<p>The maximum number of results to return in the response.</p>",
+          "location":"querystring",
+          "locationName":"maxResults"
+        },
+        "NextToken":{
+          "shape":"String",
+          "documentation":"<p>A token to use for paginating results returned in the repsonse. Set the value of this parameter to null for the first request to a list action. For subsequent calls, use the <code>NextToken</code> value returned from the previous request to continue listing results after the first page.</p>",
+          "location":"querystring",
+          "locationName":"nextToken"
+        }
+      }
+    },
+    "ListPublishingDestinationsResponse":{
+      "type":"structure",
+      "required":["Destinations"],
+      "members":{
+        "Destinations":{
+          "shape":"Destinations",
+          "documentation":"<p>A <code>Destinations</code> obect that includes information about each publishing destination returned.</p>",
+          "locationName":"destinations"
+        },
+        "NextToken":{
+          "shape":"String",
+          "documentation":"<p>A token to use for paginating results returned in the repsonse. Set the value of this parameter to null for the first request to a list action. For subsequent calls, use the <code>NextToken</code> value returned from the previous request to continue listing results after the first page.</p>",
+          "locationName":"nextToken"
+        }
+      }
+    },
     "ListTagsForResourceRequest":{
       "type":"structure",
       "required":["ResourceArn"],
@@ -2641,7 +2940,7 @@
         },
         "NextToken":{
           "shape":"String",
-          "documentation":"<p>You can use this parameter when paginating results. Set the value of this parameter to null on your first call to the list action. For subsequent calls to the action fill nextToken in the request with the value of NextToken from the previous response to continue listing data.</p>",
+          "documentation":"<p>You can use this parameter to paginate results in the response. Set the value of this parameter to null on your first call to the list action. For subsequent calls to the action fill nextToken in the request with the value of NextToken from the previous response to continue listing data.</p>",
           "location":"querystring",
           "locationName":"nextToken"
         }
@@ -2663,6 +2962,17 @@
         }
       }
     },
+    "LocalIpDetails":{
+      "type":"structure",
+      "members":{
+        "IpAddressV4":{
+          "shape":"String",
+          "documentation":"<p>IPV4 remote address of the connection.</p>",
+          "locationName":"ipAddressV4"
+        }
+      },
+      "documentation":"<p>Contains information about the local IP address of the connection.</p>"
+    },
     "LocalPortDetails":{
       "type":"structure",
       "members":{
@@ -2802,6 +3112,11 @@
           "documentation":"<p>Network connection protocol.</p>",
           "locationName":"protocol"
         },
+        "LocalIpDetails":{
+          "shape":"LocalIpDetails",
+          "documentation":"<p>Local IP information of the connection.</p>",
+          "locationName":"localIpDetails"
+        },
         "RemoteIpDetails":{
           "shape":"RemoteIpDetails",
           "documentation":"<p>Remote IP information of the connection.</p>",
@@ -2813,7 +3128,7 @@
           "locationName":"remotePortDetails"
         }
       },
-      "documentation":"<p>Contains information about the network connection.</p>"
+      "documentation":"<p>Contains information about the NETWORK_CONNECTION action described in the finding.</p>"
     },
     "NetworkInterface":{
       "type":"structure",
@@ -2869,7 +3184,7 @@
           "locationName":"vpcId"
         }
       },
-      "documentation":"<p>Contains information about the network interface.</p>"
+      "documentation":"<p>Contains information about the network interface of the Ec2 instance.</p>"
     },
     "NetworkInterfaces":{
       "type":"list",
@@ -2910,7 +3225,7 @@
           "locationName":"org"
         }
       },
-      "documentation":"<p>Continas information about the organization.</p>"
+      "documentation":"<p>Continas information about the ISP organization of the remote IP address.</p>"
     },
     "PortProbeAction":{
       "type":"structure",
@@ -2926,7 +3241,7 @@
           "locationName":"portProbeDetails"
         }
       },
-      "documentation":"<p>Contains information about the port probe.</p>"
+      "documentation":"<p>Contains information about the PORT_PROBE action described in the finding.</p>"
     },
     "PortProbeDetail":{
       "type":"structure",
@@ -2936,6 +3251,11 @@
           "documentation":"<p>Local port information of the connection.</p>",
           "locationName":"localPortDetails"
         },
+        "LocalIpDetails":{
+          "shape":"LocalIpDetails",
+          "documentation":"<p>Local IP information of the connection.</p>",
+          "locationName":"localIpDetails"
+        },
         "RemoteIpDetails":{
           "shape":"RemoteIpDetails",
           "documentation":"<p>Remote IP information of the connection.</p>",
@@ -2962,7 +3282,7 @@
           "locationName":"privateIpAddress"
         }
       },
-      "documentation":"<p>Contains information about the private IP address.</p>"
+      "documentation":"<p>Contains other private IP address information of the EC2 instance.</p>"
     },
     "PrivateIpAddresses":{
       "type":"list",
@@ -2982,12 +3302,23 @@
           "locationName":"productType"
         }
       },
-      "documentation":"<p>Contains information about the product code.</p>"
+      "documentation":"<p>Contains information about the product code for the Ec2 instance.</p>"
     },
     "ProductCodes":{
       "type":"list",
       "member":{"shape":"ProductCode"}
     },
+    "PublishingStatus":{
+      "type":"string",
+      "enum":[
+        "PENDING_VERIFICATION",
+        "PUBLISHING",
+        "UNABLE_TO_PUBLISH_FIX_DESTINATION_PROPERTY",
+        "STOPPED"
+      ],
+      "max":300,
+      "min":1
+    },
     "RemoteIpDetails":{
       "type":"structure",
       "members":{
@@ -3017,7 +3348,7 @@
           "locationName":"organization"
         }
       },
-      "documentation":"<p>Continas information about the remote IP address.</p>"
+      "documentation":"<p>Continas information about the remote IP address of the connection.</p>"
     },
     "RemotePortDetails":{
       "type":"structure",
@@ -3054,7 +3385,7 @@
           "locationName":"resourceType"
         }
       },
-      "documentation":"<p>Contains information about the resource.</p>"
+      "documentation":"<p>Contains information about the AWS resource associated with the activity that prompted GuardDuty to generate a finding.</p>"
     },
     "SecurityGroup":{
       "type":"structure",
@@ -3070,7 +3401,7 @@
           "locationName":"groupName"
         }
       },
-      "documentation":"<p>Contains information about the security group.</p>"
+      "documentation":"<p>Contains information about the security groups associated with the EC2 instance.</p>"
     },
     "SecurityGroups":{
       "type":"list",
@@ -3130,7 +3461,7 @@
           "locationName":"userFeedback"
         }
       },
-      "documentation":"<p>Contains information about the service.</p>"
+      "documentation":"<p>Contains additional information about the generated finding.</p>"
     },
     "SortCriteria":{
       "type":"structure",
@@ -3146,7 +3477,7 @@
           "locationName":"orderBy"
         }
       },
-      "documentation":"<p>Contains information about the criteria for sorting.</p>"
+      "documentation":"<p>Contains information about the criteria used for sorting findings.</p>"
     },
     "StartMonitoringMembersRequest":{
       "type":"structure",
@@ -3157,13 +3488,13 @@
       "members":{
         "DetectorId":{
           "shape":"DetectorId",
-          "documentation":"<p>The unique ID of the detector of the GuardDuty account whom you want to re-enable to monitor members' findings.</p>",
+          "documentation":"<p>The unique ID of the detector of the GuardDuty master account associated with the member accounts to monitor.</p>",
           "location":"uri",
           "locationName":"detectorId"
         },
         "AccountIds":{
           "shape":"AccountIds",
-          "documentation":"<p>A list of account IDs of the GuardDuty member accounts whose findings you want the master account to monitor.</p>",
+          "documentation":"<p>A list of account IDs of the GuardDuty member accounts to start monitoring.</p>",
           "locationName":"accountIds"
         }
       }
@@ -3225,7 +3556,7 @@
           "locationName":"value"
         }
       },
-      "documentation":"<p>Contains information about the tag associated with the resource.</p>"
+      "documentation":"<p>Contains information about a tag associated with the Ec2 instance.</p>"
     },
     "TagKey":{
       "type":"string",
@@ -3255,7 +3586,7 @@
       "members":{
         "ResourceArn":{
           "shape":"GuardDutyArn",
-          "documentation":"<p>The Amazon Resource Name (ARN) for the given GuardDuty resource </p>",
+          "documentation":"<p>The Amazon Resource Name (ARN) for the GuardDuty resource to apply a tag to.</p>",
           "location":"uri",
           "locationName":"resourceArn"
         },
@@ -3345,13 +3676,13 @@
       "members":{
         "DetectorId":{
           "shape":"DetectorId",
-          "documentation":"<p>The ID of the detector that specifies the GuardDuty service whose findings you want to unarchive.</p>",
+          "documentation":"<p>The ID of the detector associated with the findings to unarchive.</p>",
           "location":"uri",
           "locationName":"detectorId"
         },
         "FindingIds":{
           "shape":"FindingIds",
-          "documentation":"<p>IDs of the findings that you want to unarchive.</p>",
+          "documentation":"<p>IDs of the findings to unarchive.</p>",
           "locationName":"findingIds"
         }
       }
@@ -3396,13 +3727,13 @@
       "members":{
         "ResourceArn":{
           "shape":"GuardDutyArn",
-          "documentation":"<p>The Amazon Resource Name (ARN) for the given GuardDuty resource </p>",
+          "documentation":"<p>The Amazon Resource Name (ARN) for the resource to remove tags from.</p>",
           "location":"uri",
           "locationName":"resourceArn"
         },
         "TagKeys":{
           "shape":"TagKeyList",
-          "documentation":"<p>The tag keys to remove from a resource.</p>",
+          "documentation":"<p>The tag keys to remove from the resource.</p>",
           "location":"querystring",
           "locationName":"tagKeys"
         }
@@ -3419,18 +3750,18 @@
       "members":{
         "DetectorId":{
           "shape":"DetectorId",
-          "documentation":"<p>The unique ID of the detector that you want to update.</p>",
+          "documentation":"<p>The unique ID of the detector to update.</p>",
           "location":"uri",
           "locationName":"detectorId"
         },
         "Enable":{
           "shape":"Boolean",
-          "documentation":"<p>Updated boolean value for the detector that specifies whether the detector is enabled.</p>",
+          "documentation":"<p>Specifies whether the detector is enabled or not enabled.</p>",
           "locationName":"enable"
         },
         "FindingPublishingFrequency":{
           "shape":"FindingPublishingFrequency",
-          "documentation":"<p>A enum value that specifies how frequently customer got Finding updates published.</p>",
+          "documentation":"<p>A enum value that specifies how frequently findings are exported, such as to CloudWatch Events.</p>",
           "locationName":"findingPublishingFrequency"
         }
       }
@@ -3502,7 +3833,7 @@
       "members":{
         "DetectorId":{
           "shape":"DetectorId",
-          "documentation":"<p>The ID of the detector that specifies the GuardDuty service whose findings you want to mark as useful or not useful.</p>",
+          "documentation":"<p>The ID of the detector associated with the findings to update feedback for.</p>",
           "location":"uri",
           "locationName":"detectorId"
         },
@@ -3513,7 +3844,7 @@
         },
         "Feedback":{
           "shape":"Feedback",
-          "documentation":"<p>Valid values: USEFUL | NOT_USEFUL</p>",
+          "documentation":"<p>The feedback for the finding.</p>",
           "locationName":"feedback"
         },
         "Comments":{
@@ -3569,6 +3900,37 @@
       "members":{
       }
     },
+    "UpdatePublishingDestinationRequest":{
+      "type":"structure",
+      "required":[
+        "DetectorId",
+        "DestinationId"
+      ],
+      "members":{
+        "DetectorId":{
+          "shape":"DetectorId",
+          "documentation":"<p>The ID of the </p>",
+          "location":"uri",
+          "locationName":"detectorId"
+        },
+        "DestinationId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the detector associated with the publishing destinations to update.</p>",
+          "location":"uri",
+          "locationName":"destinationId"
+        },
+        "DestinationProperties":{
+          "shape":"DestinationProperties",
+          "documentation":"<p>A <code>DestinationProperties</code> object that includes the <code>DestinationArn</code> and <code>KmsKeyArn</code> of the publishing destination.</p>",
+          "locationName":"destinationProperties"
+        }
+      }
+    },
+    "UpdatePublishingDestinationResponse":{
+      "type":"structure",
+      "members":{
+      }
+    },
     "UpdateThreatIntelSetRequest":{
       "type":"structure",
       "required":[
@@ -3611,5 +3973,5 @@
       }
     }
   },
-  "documentation":"<p>Amazon GuardDuty is a continuous security monitoring service that analyzes and processes the following data sources: VPC Flow Logs, AWS CloudTrail event logs, and DNS logs. It uses threat intelligence feeds, such as lists of malicious IPs and domains, and machine learning to identify unexpected and potentially unauthorized and malicious activity within your AWS environment. This can include issues like escalations of privileges, uses of exposed credentials, or communication with malicious IPs, URLs, or domains. For example, GuardDuty can detect compromised EC2 instances serving malware or mining bitcoin. It also monitors AWS account access behavior for signs of compromise, such as unauthorized infrastructure deployments, like instances deployed in a region that has never been used, or unusual API calls, like a password policy change to reduce password strength. GuardDuty informs you of the status of your AWS environment by producing security findings that you can view in the GuardDuty console or through Amazon CloudWatch events. For more information, see <a href=\"https://docs.aws.amazon.com/guardduty/latest/ug/what-is-guardduty.html\"> Amazon GuardDuty User Guide</a>. </p>"
+  "documentation":"<p>Amazon GuardDuty is a continuous security monitoring service that analyzes and processes the following data sources: VPC Flow Logs, AWS CloudTrail event logs, and DNS logs. It uses threat intelligence feeds, such as lists of malicious IPs and domains, and machine learning to identify unexpected and potentially unauthorized and malicious activity within your AWS environment. This can include issues like escalations of privileges, uses of exposed credentials, or communication with malicious IPs, URLs, or domains. For example, GuardDuty can detect compromised EC2 instances serving malware or mining bitcoin. It also monitors AWS account access behavior for signs of compromise, such as unauthorized infrastructure deployments, like instances deployed in a region that has never been used, or unusual API calls, like a password policy change to reduce password strength. GuardDuty informs you of the status of your AWS environment by producing security findings that you can view in the GuardDuty console or through Amazon CloudWatch events. For more information, see <a href=\"https://docs.aws.amazon.com/guardduty/latest/ug/what-is-guardduty.html\">Amazon GuardDuty User Guide</a>. </p>"
 }
diff --git a/services/health/build.properties b/services/health/build.properties
index ecf2dae6fcb1..15ec2da1fc71 100644
--- a/services/health/build.properties
+++ b/services/health/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/health/pom.xml b/services/health/pom.xml
index 9c56d47eb0df..61165e0dec15 100644
--- a/services/health/pom.xml
+++ b/services/health/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>health</artifactId>
     <name>AWS Java SDK :: Services :: AWS Health APIs and Notifications</name>
diff --git a/services/health/src/main/resources/codegen-resources/paginators-1.json b/services/health/src/main/resources/codegen-resources/paginators-1.json
index 3a30b0167141..e7e6c2ad8806 100644
--- a/services/health/src/main/resources/codegen-resources/paginators-1.json
+++ b/services/health/src/main/resources/codegen-resources/paginators-1.json
@@ -1,11 +1,26 @@
 {
   "pagination": {
+    "DescribeAffectedAccountsForOrganization": {
+      "input_token": "nextToken",
+      "limit_key": "maxResults",
+      "output_token": "nextToken",
+      "result_key": "affectedAccounts"
+    },
     "DescribeAffectedEntities": {
       "input_token": "nextToken",
       "limit_key": "maxResults",
       "output_token": "nextToken",
       "result_key": "entities"
     },
+    "DescribeAffectedEntitiesForOrganization": {
+      "input_token": "nextToken",
+      "limit_key": "maxResults",
+      "non_aggregate_keys": [
+        "failedSet"
+      ],
+      "output_token": "nextToken",
+      "result_key": "entities"
+    },
     "DescribeEntityAggregates": {
       "result_key": "entityAggregates"
     },
@@ -26,6 +41,12 @@
       "limit_key": "maxResults",
       "output_token": "nextToken",
       "result_key": "events"
+    },
+    "DescribeEventsForOrganization": {
+      "input_token": "nextToken",
+      "limit_key": "maxResults",
+      "output_token": "nextToken",
+      "result_key": "events"
     }
   }
 }
\ No newline at end of file
diff --git a/services/health/src/main/resources/codegen-resources/service-2.json b/services/health/src/main/resources/codegen-resources/service-2.json
index 00f4bbc4ea58..877c1145b80d 100644
--- a/services/health/src/main/resources/codegen-resources/service-2.json
+++ b/services/health/src/main/resources/codegen-resources/service-2.json
@@ -13,6 +13,20 @@
     "uid":"health-2016-08-04"
   },
   "operations":{
+    "DescribeAffectedAccountsForOrganization":{
+      "name":"DescribeAffectedAccountsForOrganization",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DescribeAffectedAccountsForOrganizationRequest"},
+      "output":{"shape":"DescribeAffectedAccountsForOrganizationResponse"},
+      "errors":[
+        {"shape":"InvalidPaginationToken"}
+      ],
+      "documentation":"<p>Returns a list of accounts in the organization from AWS Organizations that are affected by the provided event.</p> <p>Before you can call this operation, you must first enable AWS Health to work with AWS Organizations. To do this, call the <a>EnableHealthServiceAccessForOrganization</a> operation from your organization's master account.</p>",
+      "idempotent":true
+    },
     "DescribeAffectedEntities":{
       "name":"DescribeAffectedEntities",
       "http":{
@@ -28,6 +42,21 @@
       "documentation":"<p>Returns a list of entities that have been affected by the specified events, based on the specified filter criteria. Entities can refer to individual customer resources, groups of customer resources, or any other construct, depending on the AWS service. Events that have impact beyond that of the affected entities, or where the extent of impact is unknown, include at least one entity indicating this.</p> <p>At least one event ARN is required. Results are sorted by the <code>lastUpdatedTime</code> of the entity, starting with the most recent.</p>",
       "idempotent":true
     },
+    "DescribeAffectedEntitiesForOrganization":{
+      "name":"DescribeAffectedEntitiesForOrganization",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DescribeAffectedEntitiesForOrganizationRequest"},
+      "output":{"shape":"DescribeAffectedEntitiesForOrganizationResponse"},
+      "errors":[
+        {"shape":"InvalidPaginationToken"},
+        {"shape":"UnsupportedLocale"}
+      ],
+      "documentation":"<p>Returns a list of entities that have been affected by one or more events for one or more accounts in your organization in AWS Organizations, based on the filter criteria. Entities can refer to individual customer resources, groups of customer resources, or any other construct, depending on the AWS service.</p> <p>At least one event ARN and account ID are required. Results are sorted by the <code>lastUpdatedTime</code> of the entity, starting with the most recent.</p> <p>Before you can call this operation, you must first enable AWS Health to work with AWS Organizations. To do this, call the <a>EnableHealthServiceAccessForOrganization</a> operation from your organization's master account. </p>",
+      "idempotent":true
+    },
     "DescribeEntityAggregates":{
       "name":"DescribeEntityAggregates",
       "http":{
@@ -64,7 +93,21 @@
       "errors":[
         {"shape":"UnsupportedLocale"}
       ],
-      "documentation":"<p>Returns detailed information about one or more specified events. Information includes standard event data (region, service, etc., as returned by <a>DescribeEvents</a>), a detailed event description, and possible additional metadata that depends upon the nature of the event. Affected entities are not included; to retrieve those, use the <a>DescribeAffectedEntities</a> operation.</p> <p>If a specified event cannot be retrieved, an error message is returned for that event.</p>",
+      "documentation":"<p>Returns detailed information about one or more specified events. Information includes standard event data (region, service, and so on, as returned by <a>DescribeEvents</a>), a detailed event description, and possible additional metadata that depends upon the nature of the event. Affected entities are not included; to retrieve those, use the <a>DescribeAffectedEntities</a> operation.</p> <p>If a specified event cannot be retrieved, an error message is returned for that event.</p>",
+      "idempotent":true
+    },
+    "DescribeEventDetailsForOrganization":{
+      "name":"DescribeEventDetailsForOrganization",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DescribeEventDetailsForOrganizationRequest"},
+      "output":{"shape":"DescribeEventDetailsForOrganizationResponse"},
+      "errors":[
+        {"shape":"UnsupportedLocale"}
+      ],
+      "documentation":"<p>Returns detailed information about one or more specified events for one or more accounts in your organization. Information includes standard event data (Region, service, and so on, as returned by <a>DescribeEventsForOrganization</a>, a detailed event description, and possible additional metadata that depends upon the nature of the event. Affected entities are not included; to retrieve those, use the <a>DescribeAffectedEntitiesForOrganization</a> operation.</p> <p>Before you can call this operation, you must first enable AWS Health to work with AWS Organizations. To do this, call the <a>EnableHealthServiceAccessForOrganization</a> operation from your organization's master account.</p>",
       "idempotent":true
     },
     "DescribeEventTypes":{
@@ -96,6 +139,55 @@
       ],
       "documentation":"<p>Returns information about events that meet the specified filter criteria. Events are returned in a summary form and do not include the detailed description, any additional metadata that depends on the event type, or any affected resources. To retrieve that information, use the <a>DescribeEventDetails</a> and <a>DescribeAffectedEntities</a> operations.</p> <p>If no filter criteria are specified, all events are returned. Results are sorted by <code>lastModifiedTime</code>, starting with the most recent.</p>",
       "idempotent":true
+    },
+    "DescribeEventsForOrganization":{
+      "name":"DescribeEventsForOrganization",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DescribeEventsForOrganizationRequest"},
+      "output":{"shape":"DescribeEventsForOrganizationResponse"},
+      "errors":[
+        {"shape":"InvalidPaginationToken"},
+        {"shape":"UnsupportedLocale"}
+      ],
+      "documentation":"<p>Returns information about events across your organization in AWS Organizations, meeting the specified filter criteria. Events are returned in a summary form and do not include the accounts impacted, detailed description, any additional metadata that depends on the event type, or any affected resources. To retrieve that information, use the <a>DescribeAffectedAccountsForOrganization</a>, <a>DescribeEventDetailsForOrganization</a>, and <a>DescribeAffectedEntitiesForOrganization</a> operations.</p> <p>If no filter criteria are specified, all events across your organization are returned. Results are sorted by <code>lastModifiedTime</code>, starting with the most recent.</p> <p>Before you can call this operation, you must first enable Health to work with AWS Organizations. To do this, call the <a>EnableHealthServiceAccessForOrganization</a> operation from your organization's master account.</p>",
+      "idempotent":true
+    },
+    "DescribeHealthServiceStatusForOrganization":{
+      "name":"DescribeHealthServiceStatusForOrganization",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "output":{"shape":"DescribeHealthServiceStatusForOrganizationResponse"},
+      "documentation":"<p>This operation provides status information on enabling or disabling AWS Health to work with your organization. To call this operation, you must sign in as an IAM user, assume an IAM role, or sign in as the root user (not recommended) in the organization's master account.</p>",
+      "idempotent":true
+    },
+    "DisableHealthServiceAccessForOrganization":{
+      "name":"DisableHealthServiceAccessForOrganization",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "errors":[
+        {"shape":"ConcurrentModificationException"}
+      ],
+      "documentation":"<p>Calling this operation disables Health from working with AWS Organizations. This does not remove the Service Linked Role (SLR) from the the master account in your organization. Use the IAM console, API, or AWS CLI to remove the SLR if desired. To call this operation, you must sign in as an IAM user, assume an IAM role, or sign in as the root user (not recommended) in the organization's master account.</p>",
+      "idempotent":true
+    },
+    "EnableHealthServiceAccessForOrganization":{
+      "name":"EnableHealthServiceAccessForOrganization",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "errors":[
+        {"shape":"ConcurrentModificationException"}
+      ],
+      "documentation":"<p>Calling this operation enables AWS Health to work with AWS Organizations. This applies a Service Linked Role (SLR) to the master account in the organization. To learn more about the steps in this process, visit enabling service access for AWS Health in AWS Organizations. To call this operation, you must sign in as an IAM user, assume an IAM role, or sign in as the root user (not recommended) in the organization's master account.</p>",
+      "idempotent":true
     }
   },
   "shapes":{
@@ -114,7 +206,10 @@
           "shape":"entityValue",
           "documentation":"<p>The ID of the affected entity.</p>"
         },
-        "entityUrl":{"shape":"entityUrl"},
+        "entityUrl":{
+          "shape":"entityUrl",
+          "documentation":"<p>The URL of the affected entity.</p>"
+        },
         "awsAccountId":{
           "shape":"accountId",
           "documentation":"<p>The 12-digit AWS account number that contains the affected entity.</p>"
@@ -134,6 +229,14 @@
       },
       "documentation":"<p>Information about an entity that is affected by a Health event.</p>"
     },
+    "ConcurrentModificationException":{
+      "type":"structure",
+      "members":{
+        "message":{"shape":"string"}
+      },
+      "documentation":"<p> <a>EnableHealthServiceAccessForOrganization</a> is already in progress. Wait for the action to complete before trying again. To get the current status, use the <a>DescribeHealthServiceStatusForOrganization</a> operation.</p>",
+      "exception":true
+    },
     "DateTimeRange":{
       "type":"structure",
       "members":{
@@ -148,13 +251,87 @@
       },
       "documentation":"<p>A range of dates and times that is used by the <a>EventFilter</a> and <a>EntityFilter</a> objects. If <code>from</code> is set and <code>to</code> is set: match items where the timestamp (<code>startTime</code>, <code>endTime</code>, or <code>lastUpdatedTime</code>) is between <code>from</code> and <code>to</code> inclusive. If <code>from</code> is set and <code>to</code> is not set: match items where the timestamp value is equal to or after <code>from</code>. If <code>from</code> is not set and <code>to</code> is set: match items where the timestamp value is equal to or before <code>to</code>.</p>"
     },
+    "DescribeAffectedAccountsForOrganizationRequest":{
+      "type":"structure",
+      "required":["eventArn"],
+      "members":{
+        "eventArn":{
+          "shape":"eventArn",
+          "documentation":"<p>The unique identifier for the event. Format: <code>arn:aws:health:<i>event-region</i>::event/<i>SERVICE</i>/<i>EVENT_TYPE_CODE</i>/<i>EVENT_TYPE_PLUS_ID</i> </code>. Example: <code>Example: arn:aws:health:us-east-1::event/EC2/EC2_INSTANCE_RETIREMENT_SCHEDULED/EC2_INSTANCE_RETIREMENT_SCHEDULED_ABC123-DEF456</code> </p>"
+        },
+        "nextToken":{
+          "shape":"nextToken",
+          "documentation":"<p>If the results of a search are large, only a portion of the results are returned, and a <code>nextToken</code> pagination token is returned in the response. To retrieve the next batch of results, reissue the search request and include the returned token. When all results have been returned, the response does not contain a pagination token value.</p>"
+        },
+        "maxResults":{
+          "shape":"maxResults",
+          "documentation":"<p>The maximum number of items to return in one batch, between 10 and 100, inclusive.</p>"
+        }
+      }
+    },
+    "DescribeAffectedAccountsForOrganizationResponse":{
+      "type":"structure",
+      "members":{
+        "affectedAccounts":{
+          "shape":"affectedAccountsList",
+          "documentation":"<p>A JSON set of elements of the affected accounts.</p>"
+        },
+        "nextToken":{
+          "shape":"nextToken",
+          "documentation":"<p>If the results of a search are large, only a portion of the results are returned, and a <code>nextToken</code> pagination token is returned in the response. To retrieve the next batch of results, reissue the search request and include the returned token. When all results have been returned, the response does not contain a pagination token value.</p>"
+        }
+      }
+    },
+    "DescribeAffectedEntitiesForOrganizationFailedSet":{
+      "type":"list",
+      "member":{"shape":"OrganizationAffectedEntitiesErrorItem"}
+    },
+    "DescribeAffectedEntitiesForOrganizationRequest":{
+      "type":"structure",
+      "required":["organizationEntityFilters"],
+      "members":{
+        "organizationEntityFilters":{
+          "shape":"OrganizationEntityFiltersList",
+          "documentation":"<p>A JSON set of elements including the <code>awsAccountId</code> and the <code>eventArn</code>.</p>"
+        },
+        "locale":{
+          "shape":"locale",
+          "documentation":"<p>The locale (language) to return information in. English (en) is the default and the only supported value at this time.</p>"
+        },
+        "nextToken":{
+          "shape":"nextToken",
+          "documentation":"<p>If the results of a search are large, only a portion of the results are returned, and a <code>nextToken</code> pagination token is returned in the response. To retrieve the next batch of results, reissue the search request and include the returned token. When all results have been returned, the response does not contain a pagination token value.</p>"
+        },
+        "maxResults":{
+          "shape":"maxResults",
+          "documentation":"<p>The maximum number of items to return in one batch, between 10 and 100, inclusive.</p>"
+        }
+      }
+    },
+    "DescribeAffectedEntitiesForOrganizationResponse":{
+      "type":"structure",
+      "members":{
+        "entities":{
+          "shape":"EntityList",
+          "documentation":"<p>A JSON set of elements including the <code>awsAccountId</code> and its <code>entityArn</code>, <code>entityValue</code> and its <code>entityArn</code>, <code>lastUpdatedTime</code>, <code>statusCode</code>, and <code>tags</code>.</p>"
+        },
+        "failedSet":{
+          "shape":"DescribeAffectedEntitiesForOrganizationFailedSet",
+          "documentation":"<p>A JSON set of elements of the failed response, including the <code>awsAccountId</code>, <code>errorMessage</code>, <code>errorName</code>, and <code>eventArn</code>.</p>"
+        },
+        "nextToken":{
+          "shape":"nextToken",
+          "documentation":"<p>If the results of a search are large, only a portion of the results are returned, and a <code>nextToken</code> pagination token is returned in the response. To retrieve the next batch of results, reissue the search request and include the returned token. When all results have been returned, the response does not contain a pagination token value.</p>"
+        }
+      }
+    },
     "DescribeAffectedEntitiesRequest":{
       "type":"structure",
       "required":["filter"],
       "members":{
         "filter":{
           "shape":"EntityFilter",
-          "documentation":"<p>Values to narrow the results returned. At least one event ARN is required. </p>"
+          "documentation":"<p>Values to narrow the results returned. At least one event ARN is required.</p>"
         },
         "locale":{
           "shape":"locale",
@@ -240,6 +417,41 @@
       "type":"list",
       "member":{"shape":"EventDetailsErrorItem"}
     },
+    "DescribeEventDetailsForOrganizationFailedSet":{
+      "type":"list",
+      "member":{"shape":"OrganizationEventDetailsErrorItem"}
+    },
+    "DescribeEventDetailsForOrganizationRequest":{
+      "type":"structure",
+      "required":["organizationEventDetailFilters"],
+      "members":{
+        "organizationEventDetailFilters":{
+          "shape":"OrganizationEventDetailFiltersList",
+          "documentation":"<p>A set of JSON elements that includes the <code>awsAccountId</code> and the <code>eventArn</code>.</p>"
+        },
+        "locale":{
+          "shape":"locale",
+          "documentation":"<p>The locale (language) to return information in. English (en) is the default and the only supported value at this time.</p>"
+        }
+      }
+    },
+    "DescribeEventDetailsForOrganizationResponse":{
+      "type":"structure",
+      "members":{
+        "successfulSet":{
+          "shape":"DescribeEventDetailsForOrganizationSuccessfulSet",
+          "documentation":"<p>Information about the events that could be retrieved.</p>"
+        },
+        "failedSet":{
+          "shape":"DescribeEventDetailsForOrganizationFailedSet",
+          "documentation":"<p>Error messages for any events that could not be retrieved.</p>"
+        }
+      }
+    },
+    "DescribeEventDetailsForOrganizationSuccessfulSet":{
+      "type":"list",
+      "member":{"shape":"OrganizationEventDetails"}
+    },
     "DescribeEventDetailsRequest":{
       "type":"structure",
       "required":["eventArns"],
@@ -305,6 +517,40 @@
         }
       }
     },
+    "DescribeEventsForOrganizationRequest":{
+      "type":"structure",
+      "members":{
+        "filter":{
+          "shape":"OrganizationEventFilter",
+          "documentation":"<p>Values to narrow the results returned.</p>"
+        },
+        "nextToken":{
+          "shape":"nextToken",
+          "documentation":"<p>If the results of a search are large, only a portion of the results are returned, and a <code>nextToken</code> pagination token is returned in the response. To retrieve the next batch of results, reissue the search request and include the returned token. When all results have been returned, the response does not contain a pagination token value.</p>"
+        },
+        "maxResults":{
+          "shape":"maxResults",
+          "documentation":"<p>The maximum number of items to return in one batch, between 10 and 100, inclusive.</p>"
+        },
+        "locale":{
+          "shape":"locale",
+          "documentation":"<p>The locale (language) to return information in. English (en) is the default and the only supported value at this time.</p>"
+        }
+      }
+    },
+    "DescribeEventsForOrganizationResponse":{
+      "type":"structure",
+      "members":{
+        "events":{
+          "shape":"OrganizationEventList",
+          "documentation":"<p>The events that match the specified filter criteria.</p>"
+        },
+        "nextToken":{
+          "shape":"nextToken",
+          "documentation":"<p>If the results of a search are large, only a portion of the results are returned, and a <code>nextToken</code> pagination token is returned in the response. To retrieve the next batch of results, reissue the search request and include the returned token. When all results have been returned, the response does not contain a pagination token value.</p>"
+        }
+      }
+    },
     "DescribeEventsRequest":{
       "type":"structure",
       "members":{
@@ -339,6 +585,15 @@
         }
       }
     },
+    "DescribeHealthServiceStatusForOrganizationResponse":{
+      "type":"structure",
+      "members":{
+        "healthServiceAccessStatusForOrganization":{
+          "shape":"healthServiceAccessStatusForOrganization",
+          "documentation":"<p>Information about the status of enabling or disabling AWS Health Organizational View in your organization.</p> <p>Valid values are <code>ENABLED | DISABLED | PENDING</code>. </p>"
+        }
+      }
+    },
     "EntityAggregate":{
       "type":"structure",
       "members":{
@@ -436,7 +691,25 @@
           "documentation":"<p>The most recent status of the event. Possible values are <code>open</code>, <code>closed</code>, and <code>upcoming</code>.</p>"
         }
       },
-      "documentation":"<p>Summary information about an event, returned by the <a>DescribeEvents</a> operation. The <a>DescribeEventDetails</a> operation also returns this information, as well as the <a>EventDescription</a> and additional event metadata.</p>"
+      "documentation":"<p>Summary information about an AWS Health event.</p>"
+    },
+    "EventAccountFilter":{
+      "type":"structure",
+      "required":[
+        "eventArn",
+        "awsAccountId"
+      ],
+      "members":{
+        "eventArn":{
+          "shape":"eventArn",
+          "documentation":"<p>The unique identifier for the event. Format: <code>arn:aws:health:<i>event-region</i>::event/<i>SERVICE</i>/<i>EVENT_TYPE_CODE</i>/<i>EVENT_TYPE_PLUS_ID</i> </code>. Example: <code>Example: arn:aws:health:us-east-1::event/EC2/EC2_INSTANCE_RETIREMENT_SCHEDULED/EC2_INSTANCE_RETIREMENT_SCHEDULED_ABC123-DEF456</code> </p>"
+        },
+        "awsAccountId":{
+          "shape":"accountId",
+          "documentation":"<p>The 12-digit AWS account numbers that contains the affected entities.</p>"
+        }
+      },
+      "documentation":"<p>The values used to filter results from the <a>DescribeEventDetailsForOrganization</a> and <a>DescribeAffectedEntitiesForOrganization</a> operations.</p>"
     },
     "EventAggregate":{
       "type":"structure",
@@ -517,7 +790,7 @@
         },
         "eventTypeCodes":{
           "shape":"eventTypeList",
-          "documentation":"<p>A list of unique identifiers for event types. For example, <code>\"AWS_EC2_SYSTEM_MAINTENANCE_EVENT\",\"AWS_RDS_MAINTENANCE_SCHEDULED\"</code> </p>"
+          "documentation":"<p>A list of unique identifiers for event types. For example, <code>\"AWS_EC2_SYSTEM_MAINTENANCE_EVENT\",\"AWS_RDS_MAINTENANCE_SCHEDULED\".</code> </p>"
         },
         "services":{
           "shape":"serviceList",
@@ -630,6 +903,165 @@
       "documentation":"<p>The specified pagination token (<code>nextToken</code>) is not valid.</p>",
       "exception":true
     },
+    "OrganizationAffectedEntitiesErrorItem":{
+      "type":"structure",
+      "members":{
+        "awsAccountId":{
+          "shape":"accountId",
+          "documentation":"<p>The 12-digit AWS account numbers that contains the affected entities.</p>"
+        },
+        "eventArn":{
+          "shape":"eventArn",
+          "documentation":"<p>The unique identifier for the event. Format: <code>arn:aws:health:<i>event-region</i>::event/<i>SERVICE</i>/<i>EVENT_TYPE_CODE</i>/<i>EVENT_TYPE_PLUS_ID</i> </code>. Example: <code>Example: arn:aws:health:us-east-1::event/EC2/EC2_INSTANCE_RETIREMENT_SCHEDULED/EC2_INSTANCE_RETIREMENT_SCHEDULED_ABC123-DEF456</code> </p>"
+        },
+        "errorName":{
+          "shape":"string",
+          "documentation":"<p>The name of the error.</p>"
+        },
+        "errorMessage":{
+          "shape":"string",
+          "documentation":"<p>The unique identifier for the event type. The format is <code>AWS_SERVICE_DESCRIPTION</code>. For example, <code>AWS_EC2_SYSTEM_MAINTENANCE_EVENT</code>.</p>"
+        }
+      },
+      "documentation":"<p>Error information returned when a <a>DescribeAffectedEntitiesForOrganization</a> operation cannot find or process a specific entity.</p>"
+    },
+    "OrganizationEntityFiltersList":{
+      "type":"list",
+      "member":{"shape":"EventAccountFilter"},
+      "max":10,
+      "min":1
+    },
+    "OrganizationEvent":{
+      "type":"structure",
+      "members":{
+        "arn":{
+          "shape":"eventArn",
+          "documentation":"<p>The unique identifier for the event. Format: <code>arn:aws:health:<i>event-region</i>::event/<i>SERVICE</i>/<i>EVENT_TYPE_CODE</i>/<i>EVENT_TYPE_PLUS_ID</i> </code>. Example: <code>Example: arn:aws:health:us-east-1::event/EC2/EC2_INSTANCE_RETIREMENT_SCHEDULED/EC2_INSTANCE_RETIREMENT_SCHEDULED_ABC123-DEF456</code> </p>"
+        },
+        "service":{
+          "shape":"service",
+          "documentation":"<p>The AWS service that is affected by the event. For example, EC2, RDS.</p>"
+        },
+        "eventTypeCode":{
+          "shape":"eventTypeCode",
+          "documentation":"<p>The unique identifier for the event type. The format is <code>AWS_SERVICE_DESCRIPTION</code>. For example, <code>AWS_EC2_SYSTEM_MAINTENANCE_EVENT</code>.</p>"
+        },
+        "eventTypeCategory":{
+          "shape":"eventTypeCategory",
+          "documentation":"<p>The category of the event type.</p>"
+        },
+        "region":{
+          "shape":"region",
+          "documentation":"<p>The AWS Region name of the event.</p>"
+        },
+        "startTime":{
+          "shape":"timestamp",
+          "documentation":"<p>The date and time that the event began.</p>"
+        },
+        "endTime":{
+          "shape":"timestamp",
+          "documentation":"<p>The date and time that the event ended.</p>"
+        },
+        "lastUpdatedTime":{
+          "shape":"timestamp",
+          "documentation":"<p>The most recent date and time that the event was updated.</p>"
+        },
+        "statusCode":{
+          "shape":"eventStatusCode",
+          "documentation":"<p>The most recent status of the event. Possible values are <code>open</code>, <code>closed</code>, and <code>upcoming</code>.</p>"
+        }
+      },
+      "documentation":"<p>Summary information about an event, returned by the <a>DescribeEventsForOrganization</a> operation.</p>"
+    },
+    "OrganizationEventDetailFiltersList":{
+      "type":"list",
+      "member":{"shape":"EventAccountFilter"},
+      "max":10,
+      "min":1
+    },
+    "OrganizationEventDetails":{
+      "type":"structure",
+      "members":{
+        "awsAccountId":{
+          "shape":"accountId",
+          "documentation":"<p>The 12-digit AWS account numbers that contains the affected entities.</p>"
+        },
+        "event":{"shape":"Event"},
+        "eventDescription":{"shape":"EventDescription"},
+        "eventMetadata":{
+          "shape":"eventMetadata",
+          "documentation":"<p>Additional metadata about the event.</p>"
+        }
+      },
+      "documentation":"<p>Detailed information about an event. A combination of an <a>Event</a> object, an <a>EventDescription</a> object, and additional metadata about the event. Returned by the <a>DescribeEventDetailsForOrganization</a> operation.</p>"
+    },
+    "OrganizationEventDetailsErrorItem":{
+      "type":"structure",
+      "members":{
+        "awsAccountId":{
+          "shape":"accountId",
+          "documentation":"<p>Error information returned when a <a>DescribeEventDetailsForOrganization</a> operation cannot find a specified event.</p>"
+        },
+        "eventArn":{
+          "shape":"eventArn",
+          "documentation":"<p>The unique identifier for the event. Format: <code>arn:aws:health:<i>event-region</i>::event/<i>SERVICE</i>/<i>EVENT_TYPE_CODE</i>/<i>EVENT_TYPE_PLUS_ID</i> </code>. Example: <code>Example: arn:aws:health:us-east-1::event/EC2/EC2_INSTANCE_RETIREMENT_SCHEDULED/EC2_INSTANCE_RETIREMENT_SCHEDULED_ABC123-DEF456</code> </p>"
+        },
+        "errorName":{
+          "shape":"string",
+          "documentation":"<p>The name of the error.</p>"
+        },
+        "errorMessage":{
+          "shape":"string",
+          "documentation":"<p>A message that describes the error.</p>"
+        }
+      },
+      "documentation":"<p>Error information returned when a <a>DescribeEventDetailsForOrganization</a> operation cannot find a specified event.</p>"
+    },
+    "OrganizationEventFilter":{
+      "type":"structure",
+      "members":{
+        "eventTypeCodes":{
+          "shape":"eventTypeList",
+          "documentation":"<p>A list of unique identifiers for event types. For example, <code>\"AWS_EC2_SYSTEM_MAINTENANCE_EVENT\",\"AWS_RDS_MAINTENANCE_SCHEDULED\".</code> </p>"
+        },
+        "awsAccountIds":{
+          "shape":"awsAccountIdsList",
+          "documentation":"<p>A list of 12-digit AWS account numbers that contains the affected entities.</p>"
+        },
+        "services":{
+          "shape":"serviceList",
+          "documentation":"<p>The AWS services associated with the event. For example, <code>EC2</code>, <code>RDS</code>.</p>"
+        },
+        "regions":{
+          "shape":"regionList",
+          "documentation":"<p>A list of AWS Regions.</p>"
+        },
+        "startTime":{"shape":"DateTimeRange"},
+        "endTime":{"shape":"DateTimeRange"},
+        "lastUpdatedTime":{"shape":"DateTimeRange"},
+        "entityArns":{
+          "shape":"entityArnList",
+          "documentation":"<p>REPLACEME</p>"
+        },
+        "entityValues":{
+          "shape":"entityValueList",
+          "documentation":"<p>A list of entity identifiers, such as EC2 instance IDs (i-34ab692e) or EBS volumes (vol-426ab23e).</p>"
+        },
+        "eventTypeCategories":{
+          "shape":"eventTypeCategoryList",
+          "documentation":"<p>REPLACEME</p>"
+        },
+        "eventStatusCodes":{
+          "shape":"eventStatusCodeList",
+          "documentation":"<p>A list of event status codes.</p>"
+        }
+      },
+      "documentation":"<p>The values to filter results from the <a>DescribeEventsForOrganization</a> operation.</p>"
+    },
+    "OrganizationEventList":{
+      "type":"list",
+      "member":{"shape":"OrganizationEvent"}
+    },
     "UnsupportedLocale":{
       "type":"structure",
       "members":{
@@ -640,17 +1072,30 @@
     },
     "accountId":{
       "type":"string",
-      "pattern":"[0-9]{12}"
+      "max":12,
+      "pattern":"^\\S+$"
+    },
+    "affectedAccountsList":{
+      "type":"list",
+      "member":{"shape":"accountId"}
     },
     "aggregateValue":{"type":"string"},
     "availabilityZone":{
       "type":"string",
+      "max":18,
+      "min":6,
       "pattern":"[a-z]{2}\\-[0-9a-z\\-]{4,16}"
     },
     "availabilityZones":{
       "type":"list",
       "member":{"shape":"availabilityZone"}
     },
+    "awsAccountIdsList":{
+      "type":"list",
+      "member":{"shape":"accountId"},
+      "max":50,
+      "min":1
+    },
     "count":{"type":"integer"},
     "dateTimeRangeList":{
       "type":"list",
@@ -660,7 +1105,8 @@
     },
     "entityArn":{
       "type":"string",
-      "max":1600
+      "max":1600,
+      "pattern":".{0,1600}"
     },
     "entityArnList":{
       "type":"list",
@@ -682,13 +1128,11 @@
       "max":3,
       "min":1
     },
-    "entityUrl":{
-      "type":"string",
-      "pattern":"https?://.+\\.(amazon\\.com|amazonaws\\.com|amazonaws\\.cn|c2s\\.ic\\.gov|sc2s\\.sgov\\.gov|amazonaws-us-gov.com)/.*"
-    },
+    "entityUrl":{"type":"string"},
     "entityValue":{
       "type":"string",
-      "max":256
+      "max":256,
+      "pattern":".{0,256}"
     },
     "entityValueList":{
       "type":"list",
@@ -734,7 +1178,8 @@
     "eventType":{
       "type":"string",
       "max":100,
-      "min":3
+      "min":3,
+      "pattern":"[^:/]{3,100}"
     },
     "eventTypeCategory":{
       "type":"string",
@@ -756,7 +1201,8 @@
     "eventTypeCode":{
       "type":"string",
       "max":100,
-      "min":3
+      "min":3,
+      "pattern":"[a-zA-Z0-9\\_\\-]{3,100}"
     },
     "eventTypeList":{
       "type":"list",
@@ -764,10 +1210,12 @@
       "max":10,
       "min":1
     },
+    "healthServiceAccessStatusForOrganization":{"type":"string"},
     "locale":{
       "type":"string",
       "max":256,
-      "min":2
+      "min":2,
+      "pattern":".{2,256}"
     },
     "maxResults":{
       "type":"integer",
@@ -781,10 +1229,14 @@
     },
     "nextToken":{
       "type":"string",
-      "pattern":"[a-zA-Z0-9=/+_.-]{4,512}"
+      "max":10000,
+      "min":4,
+      "pattern":"[a-zA-Z0-9=/+_.-]{4,10000}"
     },
     "region":{
       "type":"string",
+      "max":25,
+      "min":2,
       "pattern":"[^:/]{2,25}"
     },
     "regionList":{
@@ -796,7 +1248,8 @@
     "service":{
       "type":"string",
       "max":30,
-      "min":2
+      "min":2,
+      "pattern":"[^:/]{2,30}"
     },
     "serviceList":{
       "type":"list",
@@ -812,7 +1265,8 @@
     },
     "tagKey":{
       "type":"string",
-      "max":127
+      "max":127,
+      "pattern":".{0,127}"
     },
     "tagSet":{
       "type":"map",
@@ -822,9 +1276,10 @@
     },
     "tagValue":{
       "type":"string",
-      "max":255
+      "max":255,
+      "pattern":".{0,255}"
     },
     "timestamp":{"type":"timestamp"}
   },
-  "documentation":"<fullname>AWS Health</fullname> <p>The AWS Health API provides programmatic access to the AWS Health information that is presented in the <a href=\"https://phd.aws.amazon.com/phd/home#/\">AWS Personal Health Dashboard</a>. You can get information about events that affect your AWS resources:</p> <ul> <li> <p> <a>DescribeEvents</a>: Summary information about events.</p> </li> <li> <p> <a>DescribeEventDetails</a>: Detailed information about one or more events.</p> </li> <li> <p> <a>DescribeAffectedEntities</a>: Information about AWS resources that are affected by one or more events.</p> </li> </ul> <p>In addition, these operations provide information about event types and summary counts of events or affected entities:</p> <ul> <li> <p> <a>DescribeEventTypes</a>: Information about the kinds of events that AWS Health tracks.</p> </li> <li> <p> <a>DescribeEventAggregates</a>: A count of the number of events that meet specified criteria.</p> </li> <li> <p> <a>DescribeEntityAggregates</a>: A count of the number of affected entities that meet specified criteria.</p> </li> </ul> <p>The Health API requires a Business or Enterprise support plan from <a href=\"http://aws.amazon.com/premiumsupport/\">AWS Support</a>. Calling the Health API from an account that does not have a Business or Enterprise support plan causes a <code>SubscriptionRequiredException</code>. </p> <p>For authentication of requests, AWS Health uses the <a href=\"https://docs.aws.amazon.com/general/latest/gr/signature-version-4.html\">Signature Version 4 Signing Process</a>.</p> <p>See the <a href=\"https://docs.aws.amazon.com/health/latest/ug/what-is-aws-health.html\">AWS Health User Guide</a> for information about how to use the API.</p> <p> <b>Service Endpoint</b> </p> <p>The HTTP endpoint for the AWS Health API is:</p> <ul> <li> <p>https://health.us-east-1.amazonaws.com </p> </li> </ul>"
+  "documentation":"<fullname>AWS Health</fullname> <p>The AWS Health API provides programmatic access to the AWS Health information that is presented in the <a href=\"https://phd.aws.amazon.com/phd/home#/\">AWS Personal Health Dashboard</a>. You can get information about events that affect your AWS resources:</p> <ul> <li> <p> <a>DescribeEvents</a>: Summary information about events.</p> </li> <li> <p> <a>DescribeEventDetails</a>: Detailed information about one or more events.</p> </li> <li> <p> <a>DescribeAffectedEntities</a>: Information about AWS resources that are affected by one or more events.</p> </li> </ul> <p>In addition, these operations provide information about event types and summary counts of events or affected entities:</p> <ul> <li> <p> <a>DescribeEventTypes</a>: Information about the kinds of events that AWS Health tracks.</p> </li> <li> <p> <a>DescribeEventAggregates</a>: A count of the number of events that meet specified criteria.</p> </li> <li> <p> <a>DescribeEntityAggregates</a>: A count of the number of affected entities that meet specified criteria.</p> </li> </ul> <p>AWS Health integrates with AWS Organizations to provide a centralized view of AWS Health events across all accounts in your organization.</p> <ul> <li> <p> <a>DescribeEventsForOrganization</a>: Summary information about events across the organization.</p> </li> <li> <p> <a>DescribeAffectedAccountsForOrganization</a>: List of accounts in your organization impacted by an event.</p> </li> <li> <p> <a>DescribeEventDetailsForOrganization</a>: Detailed information about events in your organization.</p> </li> <li> <p> <a>DescribeAffectedEntitiesForOrganization</a>: Information about AWS resources in your organization that are affected by events.</p> </li> </ul> <p>You can use the following operations to enable or disable AWS Health from working with AWS Organizations.</p> <ul> <li> <p> <a>EnableHealthServiceAccessForOrganization</a>: Enables AWS Health to work with AWS Organizations.</p> </li> <li> <p> <a>DisableHealthServiceAccessForOrganization</a>: Disables AWS Health from working with AWS Organizations.</p> </li> <li> <p> <a>DescribeHealthServiceStatusForOrganization</a>: Status information about enabling or disabling AWS Health from working with AWS Organizations.</p> </li> </ul> <p>The Health API requires a Business or Enterprise support plan from <a href=\"http://aws.amazon.com/premiumsupport/\">AWS Support</a>. Calling the Health API from an account that does not have a Business or Enterprise support plan causes a <code>SubscriptionRequiredException</code>.</p> <p>For authentication of requests, AWS Health uses the <a href=\"https://docs.aws.amazon.com/general/latest/gr/signature-version-4.html\">Signature Version 4 Signing Process</a>.</p> <p>See the <a href=\"https://docs.aws.amazon.com/health/latest/ug/what-is-aws-health.html\">AWS Health User Guide</a> for information about how to use the API.</p> <p> <b>Service Endpoint</b> </p> <p>The HTTP endpoint for the AWS Health API is:</p> <ul> <li> <p>https://health.us-east-1.amazonaws.com </p> </li> </ul>"
 }
diff --git a/services/iam/build.properties b/services/iam/build.properties
index ecf2dae6fcb1..15ec2da1fc71 100644
--- a/services/iam/build.properties
+++ b/services/iam/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/iam/pom.xml b/services/iam/pom.xml
index 89054b3bd468..338c41c0d735 100644
--- a/services/iam/pom.xml
+++ b/services/iam/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>iam</artifactId>
     <name>AWS Java SDK :: Services :: AWS IAM</name>
diff --git a/services/iam/src/it/java/software/amazon/awssdk/services/iam/ServiceIntegrationTest.java b/services/iam/src/it/java/software/amazon/awssdk/services/iam/ServiceIntegrationTest.java
index 0dd4b48cd403..dfd86831359d 100644
--- a/services/iam/src/it/java/software/amazon/awssdk/services/iam/ServiceIntegrationTest.java
+++ b/services/iam/src/it/java/software/amazon/awssdk/services/iam/ServiceIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/iam/src/main/resources/codegen-resources/service-2.json b/services/iam/src/main/resources/codegen-resources/service-2.json
index 34eaaf226ce1..8f3e7215513a 100644
--- a/services/iam/src/main/resources/codegen-resources/service-2.json
+++ b/services/iam/src/main/resources/codegen-resources/service-2.json
@@ -230,7 +230,7 @@
         {"shape":"LimitExceededException"},
         {"shape":"ServiceFailureException"}
       ],
-      "documentation":"<p>Creates an IAM entity to describe an identity provider (IdP) that supports <a href=\"http://openid.net/connect/\">OpenID Connect (OIDC)</a>.</p> <p>The OIDC provider that you create with this operation can be used as a principal in a role's trust policy. Such a policy establishes a trust relationship between AWS and the OIDC provider.</p> <p>When you create the IAM OIDC provider, you specify the following:</p> <ul> <li> <p>The URL of the OIDC identity provider (IdP) to trust</p> </li> <li> <p>A list of client IDs (also known as audiences) that identify the application or applications that are allowed to authenticate using the OIDC provider</p> </li> <li> <p>A list of thumbprints of the server certificate(s) that the IdP uses</p> </li> </ul> <p>You get all of this information from the OIDC IdP that you want to use to access AWS.</p> <note> <p>The trust for the OIDC provider is derived from the IAM provider that this operation creates. Therefore, it is best to limit access to the <a>CreateOpenIDConnectProvider</a> operation to highly privileged users.</p> </note>"
+      "documentation":"<p>Creates an IAM entity to describe an identity provider (IdP) that supports <a href=\"http://openid.net/connect/\">OpenID Connect (OIDC)</a>.</p> <p>The OIDC provider that you create with this operation can be used as a principal in a role's trust policy. Such a policy establishes a trust relationship between AWS and the OIDC provider.</p> <p>When you create the IAM OIDC provider, you specify the following:</p> <ul> <li> <p>The URL of the OIDC identity provider (IdP) to trust</p> </li> <li> <p>A list of client IDs (also known as audiences) that identify the application or applications that are allowed to authenticate using the OIDC provider</p> </li> <li> <p>A list of thumbprints of one or more server certificates that the IdP uses</p> </li> </ul> <p>You get all of this information from the OIDC IdP that you want to use to access AWS.</p> <note> <p>The trust for the OIDC provider is derived from the IAM provider that this operation creates. Therefore, it is best to limit access to the <a>CreateOpenIDConnectProvider</a> operation to highly privileged users.</p> </note>"
     },
     "CreatePolicy":{
       "name":"CreatePolicy",
@@ -1932,7 +1932,7 @@
         {"shape":"InvalidInputException"},
         {"shape":"PolicyEvaluationException"}
       ],
-      "documentation":"<p>Simulate how a set of IAM policies and optionally a resource-based policy works with a list of API operations and AWS resources to determine the policies' effective permissions. The policies are provided as strings.</p> <p>The simulation does not perform the API operations; it only checks the authorization to determine if the simulated policies allow or deny the operations.</p> <p>If you want to simulate existing policies attached to an IAM user, group, or role, use <a>SimulatePrincipalPolicy</a> instead.</p> <p>Context keys are variables maintained by AWS and its services that provide details about the context of an API query request. You can use the <code>Condition</code> element of an IAM policy to evaluate context keys. To get the list of context keys that the policies require for correct simulation, use <a>GetContextKeysForCustomPolicy</a>.</p> <p>If the output is long, you can use <code>MaxItems</code> and <code>Marker</code> parameters to paginate the results.</p>"
+      "documentation":"<p>Simulate how a set of IAM policies and optionally a resource-based policy works with a list of API operations and AWS resources to determine the policies' effective permissions. The policies are provided as strings.</p> <p>The simulation does not perform the API operations; it only checks the authorization to determine if the simulated policies allow or deny the operations.</p> <p>If you want to simulate existing policies that are attached to an IAM user, group, or role, use <a>SimulatePrincipalPolicy</a> instead.</p> <p>Context keys are variables that are maintained by AWS and its services and which provide details about the context of an API query request. You can use the <code>Condition</code> element of an IAM policy to evaluate context keys. To get the list of context keys that the policies require for correct simulation, use <a>GetContextKeysForCustomPolicy</a>.</p> <p>If the output is long, you can use <code>MaxItems</code> and <code>Marker</code> parameters to paginate the results.</p>"
     },
     "SimulatePrincipalPolicy":{
       "name":"SimulatePrincipalPolicy",
@@ -2544,7 +2544,7 @@
         },
         "PolicyArn":{"shape":"arnType"}
       },
-      "documentation":"<p>Contains information about an attached policy.</p> <p>An attached policy is a managed policy that has been attached to a user, group, or role. This data type is used as a response element in the <a>ListAttachedGroupPolicies</a>, <a>ListAttachedRolePolicies</a>, <a>ListAttachedUserPolicies</a>, and <a>GetAccountAuthorizationDetails</a> operations. </p> <p>For more information about managed policies, refer to <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/policies-managed-vs-inline.html\">Managed Policies and Inline Policies</a> in the <i>Using IAM</i> guide. </p>"
+      "documentation":"<p>Contains information about an attached policy.</p> <p>An attached policy is a managed policy that has been attached to a user, group, or role. This data type is used as a response element in the <a>ListAttachedGroupPolicies</a>, <a>ListAttachedRolePolicies</a>, <a>ListAttachedUserPolicies</a>, and <a>GetAccountAuthorizationDetails</a> operations. </p> <p>For more information about managed policies, refer to <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/policies-managed-vs-inline.html\">Managed Policies and Inline Policies</a> in the <i>IAM User Guide</i>. </p>"
     },
     "BootstrapDatum":{
       "type":"blob",
@@ -2563,7 +2563,7 @@
         },
         "NewPassword":{
           "shape":"passwordType",
-          "documentation":"<p>The new password. The new password must conform to the AWS account's password policy, if one exists.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> that is used to validate this parameter is a string of characters. That string can include almost any printable ASCII character from the space (\\u0020) through the end of the ASCII character range (\\u00FF). You can also include the tab (\\u0009), line feed (\\u000A), and carriage return (\\u000D) characters. Any of these characters are valid in a password. However, many tools, such as the AWS Management Console, might restrict the ability to type certain characters because they have special meaning within that tool.</p>"
+          "documentation":"<p>The new password. The new password must conform to the AWS account's password policy, if one exists.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> that is used to validate this parameter is a string of characters. That string can include almost any printable ASCII character from the space (<code>\\u0020</code>) through the end of the ASCII character range (<code>\\u00FF</code>). You can also include the tab (<code>\\u0009</code>), line feed (<code>\\u000A</code>), and carriage return (<code>\\u000D</code>) characters. Any of these characters are valid in a password. However, many tools, such as the AWS Management Console, might restrict the ability to type certain characters because they have special meaning within that tool.</p>"
         }
       }
     },
@@ -2671,7 +2671,7 @@
       "members":{
         "Path":{
           "shape":"pathType",
-          "documentation":"<p> The path to the group. For more information about paths, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html\">IAM Identifiers</a> in the <i>IAM User Guide</i>.</p> <p>This parameter is optional. If it is not included, it defaults to a slash (/).</p> <p>This parameter allows (through its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes. In addition, it can contain any ASCII character from the ! (\\u0021) through the DEL character (\\u007F), including most punctuation characters, digits, and upper and lowercased letters.</p>"
+          "documentation":"<p> The path to the group. For more information about paths, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html\">IAM Identifiers</a> in the <i>IAM User Guide</i>.</p> <p>This parameter is optional. If it is not included, it defaults to a slash (/).</p> <p>This parameter allows (through its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes. In addition, it can contain any ASCII character from the ! (<code>\\u0021</code>) through the DEL character (<code>\\u007F</code>), including most punctuation characters, digits, and upper and lowercased letters.</p>"
         },
         "GroupName":{
           "shape":"groupNameType",
@@ -2700,7 +2700,7 @@
         },
         "Path":{
           "shape":"pathType",
-          "documentation":"<p> The path to the instance profile. For more information about paths, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html\">IAM Identifiers</a> in the <i>IAM User Guide</i>.</p> <p>This parameter is optional. If it is not included, it defaults to a slash (/).</p> <p>This parameter allows (through its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes. In addition, it can contain any ASCII character from the ! (\\u0021) through the DEL character (\\u007F), including most punctuation characters, digits, and upper and lowercased letters.</p>"
+          "documentation":"<p> The path to the instance profile. For more information about paths, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html\">IAM Identifiers</a> in the <i>IAM User Guide</i>.</p> <p>This parameter is optional. If it is not included, it defaults to a slash (/).</p> <p>This parameter allows (through its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes. In addition, it can contain any ASCII character from the ! (<code>\\u0021</code>) through the DEL character (<code>\\u007F</code>), including most punctuation characters, digits, and upper and lowercased letters.</p>"
         }
       }
     },
@@ -2728,7 +2728,7 @@
         },
         "Password":{
           "shape":"passwordType",
-          "documentation":"<p>The new password for the user.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> that is used to validate this parameter is a string of characters. That string can include almost any printable ASCII character from the space (\\u0020) through the end of the ASCII character range (\\u00FF). You can also include the tab (\\u0009), line feed (\\u000A), and carriage return (\\u000D) characters. Any of these characters are valid in a password. However, many tools, such as the AWS Management Console, might restrict the ability to type certain characters because they have special meaning within that tool.</p>"
+          "documentation":"<p>The new password for the user.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> that is used to validate this parameter is a string of characters. That string can include almost any printable ASCII character from the space (<code>\\u0020</code>) through the end of the ASCII character range (<code>\\u00FF</code>). You can also include the tab (<code>\\u0009</code>), line feed (<code>\\u000A</code>), and carriage return (<code>\\u000D</code>) characters. Any of these characters are valid in a password. However, many tools, such as the AWS Management Console, might restrict the ability to type certain characters because they have special meaning within that tool.</p>"
         },
         "PasswordResetRequired":{
           "shape":"booleanType",
@@ -2791,11 +2791,11 @@
         },
         "Path":{
           "shape":"policyPathType",
-          "documentation":"<p>The path for the policy.</p> <p>For more information about paths, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html\">IAM Identifiers</a> in the <i>IAM User Guide</i>.</p> <p>This parameter is optional. If it is not included, it defaults to a slash (/).</p> <p>This parameter allows (through its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes. In addition, it can contain any ASCII character from the ! (\\u0021) through the DEL character (\\u007F), including most punctuation characters, digits, and upper and lowercased letters.</p>"
+          "documentation":"<p>The path for the policy.</p> <p>For more information about paths, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html\">IAM Identifiers</a> in the <i>IAM User Guide</i>.</p> <p>This parameter is optional. If it is not included, it defaults to a slash (/).</p> <p>This parameter allows (through its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes. In addition, it can contain any ASCII character from the ! (<code>\\u0021</code>) through the DEL character (<code>\\u007F</code>), including most punctuation characters, digits, and upper and lowercased letters.</p>"
         },
         "PolicyDocument":{
           "shape":"policyDocumentType",
-          "documentation":"<p>The JSON policy document that you want to use as the content for the new policy.</p> <p>You must provide policies in JSON format in IAM. However, for AWS CloudFormation templates formatted in YAML, you can provide the policy in JSON or YAML format. AWS CloudFormation always converts a YAML policy to JSON format before submitting it to IAM.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> used to validate this parameter is a string of characters consisting of the following:</p> <ul> <li> <p>Any printable ASCII character ranging from the space character (\\u0020) through the end of the ASCII character range</p> </li> <li> <p>The printable characters in the Basic Latin and Latin-1 Supplement character set (through \\u00FF)</p> </li> <li> <p>The special characters tab (\\u0009), line feed (\\u000A), and carriage return (\\u000D)</p> </li> </ul>"
+          "documentation":"<p>The JSON policy document that you want to use as the content for the new policy.</p> <p>You must provide policies in JSON format in IAM. However, for AWS CloudFormation templates formatted in YAML, you can provide the policy in JSON or YAML format. AWS CloudFormation always converts a YAML policy to JSON format before submitting it to IAM.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> used to validate this parameter is a string of characters consisting of the following:</p> <ul> <li> <p>Any printable ASCII character ranging from the space character (<code>\\u0020</code>) through the end of the ASCII character range</p> </li> <li> <p>The printable characters in the Basic Latin and Latin-1 Supplement character set (through <code>\\u00FF</code>)</p> </li> <li> <p>The special characters tab (<code>\\u0009</code>), line feed (<code>\\u000A</code>), and carriage return (<code>\\u000D</code>)</p> </li> </ul>"
         },
         "Description":{
           "shape":"policyDescriptionType",
@@ -2826,7 +2826,7 @@
         },
         "PolicyDocument":{
           "shape":"policyDocumentType",
-          "documentation":"<p>The JSON policy document that you want to use as the content for this new version of the policy.</p> <p>You must provide policies in JSON format in IAM. However, for AWS CloudFormation templates formatted in YAML, you can provide the policy in JSON or YAML format. AWS CloudFormation always converts a YAML policy to JSON format before submitting it to IAM.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> used to validate this parameter is a string of characters consisting of the following:</p> <ul> <li> <p>Any printable ASCII character ranging from the space character (\\u0020) through the end of the ASCII character range</p> </li> <li> <p>The printable characters in the Basic Latin and Latin-1 Supplement character set (through \\u00FF)</p> </li> <li> <p>The special characters tab (\\u0009), line feed (\\u000A), and carriage return (\\u000D)</p> </li> </ul>"
+          "documentation":"<p>The JSON policy document that you want to use as the content for this new version of the policy.</p> <p>You must provide policies in JSON format in IAM. However, for AWS CloudFormation templates formatted in YAML, you can provide the policy in JSON or YAML format. AWS CloudFormation always converts a YAML policy to JSON format before submitting it to IAM.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> used to validate this parameter is a string of characters consisting of the following:</p> <ul> <li> <p>Any printable ASCII character ranging from the space character (<code>\\u0020</code>) through the end of the ASCII character range</p> </li> <li> <p>The printable characters in the Basic Latin and Latin-1 Supplement character set (through <code>\\u00FF</code>)</p> </li> <li> <p>The special characters tab (<code>\\u0009</code>), line feed (<code>\\u000A</code>), and carriage return (<code>\\u000D</code>)</p> </li> </ul>"
         },
         "SetAsDefault":{
           "shape":"booleanType",
@@ -2853,7 +2853,7 @@
       "members":{
         "Path":{
           "shape":"pathType",
-          "documentation":"<p> The path to the role. For more information about paths, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html\">IAM Identifiers</a> in the <i>IAM User Guide</i>.</p> <p>This parameter is optional. If it is not included, it defaults to a slash (/).</p> <p>This parameter allows (through its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes. In addition, it can contain any ASCII character from the ! (\\u0021) through the DEL character (\\u007F), including most punctuation characters, digits, and upper and lowercased letters.</p>"
+          "documentation":"<p> The path to the role. For more information about paths, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html\">IAM Identifiers</a> in the <i>IAM User Guide</i>.</p> <p>This parameter is optional. If it is not included, it defaults to a slash (/).</p> <p>This parameter allows (through its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes. In addition, it can contain any ASCII character from the ! (<code>\\u0021</code>) through the DEL character (<code>\\u007F</code>), including most punctuation characters, digits, and upper and lowercased letters.</p>"
         },
         "RoleName":{
           "shape":"roleNameType",
@@ -2861,7 +2861,7 @@
         },
         "AssumeRolePolicyDocument":{
           "shape":"policyDocumentType",
-          "documentation":"<p>The trust relationship policy document that grants an entity permission to assume the role.</p> <p>In IAM, you must provide a JSON policy that has been converted to a string. However, for AWS CloudFormation templates formatted in YAML, you can provide the policy in JSON or YAML format. AWS CloudFormation always converts a YAML policy to JSON format before submitting it to IAM.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> used to validate this parameter is a string of characters consisting of the following:</p> <ul> <li> <p>Any printable ASCII character ranging from the space character (\\u0020) through the end of the ASCII character range</p> </li> <li> <p>The printable characters in the Basic Latin and Latin-1 Supplement character set (through \\u00FF)</p> </li> <li> <p>The special characters tab (\\u0009), line feed (\\u000A), and carriage return (\\u000D)</p> </li> </ul> <p> Upon success, the response includes the same trust policy in JSON format.</p>"
+          "documentation":"<p>The trust relationship policy document that grants an entity permission to assume the role.</p> <p>In IAM, you must provide a JSON policy that has been converted to a string. However, for AWS CloudFormation templates formatted in YAML, you can provide the policy in JSON or YAML format. AWS CloudFormation always converts a YAML policy to JSON format before submitting it to IAM.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> used to validate this parameter is a string of characters consisting of the following:</p> <ul> <li> <p>Any printable ASCII character ranging from the space character (<code>\\u0020</code>) through the end of the ASCII character range</p> </li> <li> <p>The printable characters in the Basic Latin and Latin-1 Supplement character set (through <code>\\u00FF</code>)</p> </li> <li> <p>The special characters tab (<code>\\u0009</code>), line feed (<code>\\u000A</code>), and carriage return (<code>\\u000D</code>)</p> </li> </ul> <p> Upon success, the response includes the same trust policy in JSON format.</p>"
         },
         "Description":{
           "shape":"roleDescriptionType",
@@ -2978,7 +2978,7 @@
       "members":{
         "Path":{
           "shape":"pathType",
-          "documentation":"<p> The path for the user name. For more information about paths, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html\">IAM Identifiers</a> in the <i>IAM User Guide</i>.</p> <p>This parameter is optional. If it is not included, it defaults to a slash (/).</p> <p>This parameter allows (through its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes. In addition, it can contain any ASCII character from the ! (\\u0021) through the DEL character (\\u007F), including most punctuation characters, digits, and upper and lowercased letters.</p>"
+          "documentation":"<p> The path for the user name. For more information about paths, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html\">IAM Identifiers</a> in the <i>IAM User Guide</i>.</p> <p>This parameter is optional. If it is not included, it defaults to a slash (/).</p> <p>This parameter allows (through its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes. In addition, it can contain any ASCII character from the ! (<code>\\u0021</code>) through the DEL character (<code>\\u007F</code>), including most punctuation characters, digits, and upper and lowercased letters.</p>"
         },
         "UserName":{
           "shape":"userNameType",
@@ -3010,7 +3010,7 @@
       "members":{
         "Path":{
           "shape":"pathType",
-          "documentation":"<p> The path for the virtual MFA device. For more information about paths, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html\">IAM Identifiers</a> in the <i>IAM User Guide</i>.</p> <p>This parameter is optional. If it is not included, it defaults to a slash (/).</p> <p>This parameter allows (through its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes. In addition, it can contain any ASCII character from the ! (\\u0021) through the DEL character (\\u007F), including most punctuation characters, digits, and upper and lowercased letters.</p>"
+          "documentation":"<p> The path for the virtual MFA device. For more information about paths, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html\">IAM Identifiers</a> in the <i>IAM User Guide</i>.</p> <p>This parameter is optional. If it is not included, it defaults to a slash (/).</p> <p>This parameter allows (through its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes. In addition, it can contain any ASCII character from the ! (<code>\\u0021</code>) through the DEL character (<code>\\u007F</code>), including most punctuation characters, digits, and upper and lowercased letters.</p>"
         },
         "VirtualMFADeviceName":{
           "shape":"virtualMFADeviceName",
@@ -3559,7 +3559,7 @@
         },
         "Path":{
           "shape":"pathType",
-          "documentation":"<p>The path to the entity (user or role). For more information about paths, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html\">IAM Identifiers</a> in the <i>Using IAM</i> guide. </p>"
+          "documentation":"<p>The path to the entity (user or role). For more information about paths, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html\">IAM Identifiers</a> in the <i>IAM User Guide</i>. </p>"
         }
       },
       "documentation":"<p>Contains details about the specified entity (user or role).</p> <p>This data type is an element of the <a>EntityDetails</a> object.</p>"
@@ -3646,9 +3646,13 @@
           "shape":"OrganizationsDecisionDetail",
           "documentation":"<p>A structure that details how Organizations and its service control policies affect the results of the simulation. Only applies if the simulated user's account is part of an organization.</p>"
         },
+        "PermissionsBoundaryDecisionDetail":{
+          "shape":"PermissionsBoundaryDecisionDetail",
+          "documentation":"<p>Contains information about the effect that a permissions boundary has on a policy simulation when the boundary is applied to an IAM entity.</p>"
+        },
         "EvalDecisionDetails":{
           "shape":"EvalDecisionDetailsType",
-          "documentation":"<p>Additional details about the results of the evaluation decision. When there are both IAM policies and resource policies, this parameter explains how each set of policies contributes to the final evaluation decision. When simulating cross-account access to a resource, both the resource-based policy and the caller's IAM policy must grant access. See <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_compare-resource-policies.html\">How IAM Roles Differ from Resource-based Policies</a> </p>"
+          "documentation":"<p>Additional details about the results of the cross-account evaluation decision. This parameter is populated for only cross-account simulations. It contains a brief summary of how each policy type contributes to the final evaluation decision.</p> <p>If the simulation evaluates policies within the same account and includes a resource ARN, then the parameter is present but the response is empty. If the simulation evaluates policies within the same account and specifies all resources (<code>*</code>), then the parameter is not returned.</p> <p>When you make a cross-account request, AWS evaluates the request in the trusting account and the trusted account. The request is allowed only if both evaluations return <code>true</code>. For more information about how policies are evaluated, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/reference_policies_evaluation-logic.html#policy-eval-basics\">Evaluating Policies Within a Single Account</a>.</p> <p>If an AWS Organizations SCP included in the evaluation denies access, the simulation ends. In this case, policy evaluation does not proceed any further and this parameter is not returned.</p>"
         },
         "ResourceSpecificResults":{
           "shape":"ResourceSpecificResultListType",
@@ -3815,7 +3819,7 @@
       "members":{
         "PolicyInputList":{
           "shape":"SimulationPolicyListType",
-          "documentation":"<p>A list of policies for which you want the list of context keys referenced in those policies. Each document is specified as a string containing the complete, valid JSON text of an IAM policy.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> used to validate this parameter is a string of characters consisting of the following:</p> <ul> <li> <p>Any printable ASCII character ranging from the space character (\\u0020) through the end of the ASCII character range</p> </li> <li> <p>The printable characters in the Basic Latin and Latin-1 Supplement character set (through \\u00FF)</p> </li> <li> <p>The special characters tab (\\u0009), line feed (\\u000A), and carriage return (\\u000D)</p> </li> </ul>"
+          "documentation":"<p>A list of policies for which you want the list of context keys referenced in those policies. Each document is specified as a string containing the complete, valid JSON text of an IAM policy.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> used to validate this parameter is a string of characters consisting of the following:</p> <ul> <li> <p>Any printable ASCII character ranging from the space character (<code>\\u0020</code>) through the end of the ASCII character range</p> </li> <li> <p>The printable characters in the Basic Latin and Latin-1 Supplement character set (through <code>\\u00FF</code>)</p> </li> <li> <p>The special characters tab (<code>\\u0009</code>), line feed (<code>\\u000A</code>), and carriage return (<code>\\u000D</code>)</p> </li> </ul>"
         }
       }
     },
@@ -3839,7 +3843,7 @@
         },
         "PolicyInputList":{
           "shape":"SimulationPolicyListType",
-          "documentation":"<p>An optional list of additional policies for which you want the list of context keys that are referenced.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> used to validate this parameter is a string of characters consisting of the following:</p> <ul> <li> <p>Any printable ASCII character ranging from the space character (\\u0020) through the end of the ASCII character range</p> </li> <li> <p>The printable characters in the Basic Latin and Latin-1 Supplement character set (through \\u00FF)</p> </li> <li> <p>The special characters tab (\\u0009), line feed (\\u000A), and carriage return (\\u000D)</p> </li> </ul>"
+          "documentation":"<p>An optional list of additional policies for which you want the list of context keys that are referenced.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> used to validate this parameter is a string of characters consisting of the following:</p> <ul> <li> <p>Any printable ASCII character ranging from the space character (<code>\\u0020</code>) through the end of the ASCII character range</p> </li> <li> <p>The printable characters in the Basic Latin and Latin-1 Supplement character set (through <code>\\u00FF</code>)</p> </li> <li> <p>The special characters tab (<code>\\u0009</code>), line feed (<code>\\u000A</code>), and carriage return (<code>\\u000D</code>)</p> </li> </ul>"
         }
       }
     },
@@ -4489,7 +4493,7 @@
       "members":{
         "Path":{
           "shape":"pathType",
-          "documentation":"<p>The path to the group. For more information about paths, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html\">IAM Identifiers</a> in the <i>Using IAM</i> guide. </p>"
+          "documentation":"<p>The path to the group. For more information about paths, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html\">IAM Identifiers</a> in the <i>IAM User Guide</i>. </p>"
         },
         "GroupName":{
           "shape":"groupNameType",
@@ -4497,11 +4501,11 @@
         },
         "GroupId":{
           "shape":"idType",
-          "documentation":"<p> The stable and unique string identifying the group. For more information about IDs, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html\">IAM Identifiers</a> in the <i>Using IAM</i> guide. </p>"
+          "documentation":"<p> The stable and unique string identifying the group. For more information about IDs, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html\">IAM Identifiers</a> in the <i>IAM User Guide</i>. </p>"
         },
         "Arn":{
           "shape":"arnType",
-          "documentation":"<p> The Amazon Resource Name (ARN) specifying the group. For more information about ARNs and how to use them in policies, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html\">IAM Identifiers</a> in the <i>Using IAM</i> guide. </p>"
+          "documentation":"<p> The Amazon Resource Name (ARN) specifying the group. For more information about ARNs and how to use them in policies, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html\">IAM Identifiers</a> in the <i>IAM User Guide</i>. </p>"
         },
         "CreateDate":{
           "shape":"dateType",
@@ -4515,7 +4519,7 @@
       "members":{
         "Path":{
           "shape":"pathType",
-          "documentation":"<p>The path to the group. For more information about paths, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html\">IAM Identifiers</a> in the <i>Using IAM</i> guide.</p>"
+          "documentation":"<p>The path to the group. For more information about paths, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html\">IAM Identifiers</a> in the <i>IAM User Guide</i>.</p>"
         },
         "GroupName":{
           "shape":"groupNameType",
@@ -4523,7 +4527,7 @@
         },
         "GroupId":{
           "shape":"idType",
-          "documentation":"<p>The stable and unique string identifying the group. For more information about IDs, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html\">IAM Identifiers</a> in the <i>Using IAM</i> guide.</p>"
+          "documentation":"<p>The stable and unique string identifying the group. For more information about IDs, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html\">IAM Identifiers</a> in the <i>IAM User Guide</i>.</p>"
         },
         "Arn":{"shape":"arnType"},
         "CreateDate":{
@@ -4554,7 +4558,7 @@
       "members":{
         "Path":{
           "shape":"pathType",
-          "documentation":"<p> The path to the instance profile. For more information about paths, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html\">IAM Identifiers</a> in the <i>Using IAM</i> guide. </p>"
+          "documentation":"<p> The path to the instance profile. For more information about paths, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html\">IAM Identifiers</a> in the <i>IAM User Guide</i>. </p>"
         },
         "InstanceProfileName":{
           "shape":"instanceProfileNameType",
@@ -4562,11 +4566,11 @@
         },
         "InstanceProfileId":{
           "shape":"idType",
-          "documentation":"<p> The stable and unique string identifying the instance profile. For more information about IDs, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html\">IAM Identifiers</a> in the <i>Using IAM</i> guide. </p>"
+          "documentation":"<p> The stable and unique string identifying the instance profile. For more information about IDs, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html\">IAM Identifiers</a> in the <i>IAM User Guide</i>. </p>"
         },
         "Arn":{
           "shape":"arnType",
-          "documentation":"<p> The Amazon Resource Name (ARN) specifying the instance profile. For more information about ARNs and how to use them in policies, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html\">IAM Identifiers</a> in the <i>Using IAM</i> guide. </p>"
+          "documentation":"<p> The Amazon Resource Name (ARN) specifying the instance profile. For more information about ARNs and how to use them in policies, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html\">IAM Identifiers</a> in the <i>IAM User Guide</i>. </p>"
         },
         "CreateDate":{
           "shape":"dateType",
@@ -4749,7 +4753,7 @@
         },
         "PathPrefix":{
           "shape":"policyPathType",
-          "documentation":"<p>The path prefix for filtering the results. This parameter is optional. If it is not included, it defaults to a slash (/), listing all policies.</p> <p>This parameter allows (through its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes. In addition, it can contain any ASCII character from the ! (\\u0021) through the DEL character (\\u007F), including most punctuation characters, digits, and upper and lowercased letters.</p>"
+          "documentation":"<p>The path prefix for filtering the results. This parameter is optional. If it is not included, it defaults to a slash (/), listing all policies.</p> <p>This parameter allows (through its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes. In addition, it can contain any ASCII character from the ! (<code>\\u0021</code>) through the DEL character (<code>\\u007F</code>), including most punctuation characters, digits, and upper and lowercased letters.</p>"
         },
         "Marker":{
           "shape":"markerType",
@@ -4789,7 +4793,7 @@
         },
         "PathPrefix":{
           "shape":"policyPathType",
-          "documentation":"<p>The path prefix for filtering the results. This parameter is optional. If it is not included, it defaults to a slash (/), listing all policies.</p> <p>This parameter allows (through its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes. In addition, it can contain any ASCII character from the ! (\\u0021) through the DEL character (\\u007F), including most punctuation characters, digits, and upper and lowercased letters.</p>"
+          "documentation":"<p>The path prefix for filtering the results. This parameter is optional. If it is not included, it defaults to a slash (/), listing all policies.</p> <p>This parameter allows (through its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes. In addition, it can contain any ASCII character from the ! (<code>\\u0021</code>) through the DEL character (<code>\\u007F</code>), including most punctuation characters, digits, and upper and lowercased letters.</p>"
         },
         "Marker":{
           "shape":"markerType",
@@ -4829,7 +4833,7 @@
         },
         "PathPrefix":{
           "shape":"policyPathType",
-          "documentation":"<p>The path prefix for filtering the results. This parameter is optional. If it is not included, it defaults to a slash (/), listing all policies.</p> <p>This parameter allows (through its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes. In addition, it can contain any ASCII character from the ! (\\u0021) through the DEL character (\\u007F), including most punctuation characters, digits, and upper and lowercased letters.</p>"
+          "documentation":"<p>The path prefix for filtering the results. This parameter is optional. If it is not included, it defaults to a slash (/), listing all policies.</p> <p>This parameter allows (through its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes. In addition, it can contain any ASCII character from the ! (<code>\\u0021</code>) through the DEL character (<code>\\u007F</code>), including most punctuation characters, digits, and upper and lowercased letters.</p>"
         },
         "Marker":{
           "shape":"markerType",
@@ -4873,7 +4877,7 @@
         },
         "PathPrefix":{
           "shape":"pathType",
-          "documentation":"<p>The path prefix for filtering the results. This parameter is optional. If it is not included, it defaults to a slash (/), listing all entities.</p> <p>This parameter allows (through its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes. In addition, it can contain any ASCII character from the ! (\\u0021) through the DEL character (\\u007F), including most punctuation characters, digits, and upper and lowercased letters.</p>"
+          "documentation":"<p>The path prefix for filtering the results. This parameter is optional. If it is not included, it defaults to a slash (/), listing all entities.</p> <p>This parameter allows (through its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes. In addition, it can contain any ASCII character from the ! (<code>\\u0021</code>) through the DEL character (<code>\\u007F</code>), including most punctuation characters, digits, and upper and lowercased letters.</p>"
         },
         "PolicyUsageFilter":{
           "shape":"PolicyUsageType",
@@ -4994,7 +4998,7 @@
       "members":{
         "PathPrefix":{
           "shape":"pathPrefixType",
-          "documentation":"<p> The path prefix for filtering the results. For example, the prefix <code>/division_abc/subdivision_xyz/</code> gets all groups whose path starts with <code>/division_abc/subdivision_xyz/</code>.</p> <p>This parameter is optional. If it is not included, it defaults to a slash (/), listing all groups. This parameter allows (through its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes. In addition, it can contain any ASCII character from the ! (\\u0021) through the DEL character (\\u007F), including most punctuation characters, digits, and upper and lowercased letters.</p>"
+          "documentation":"<p> The path prefix for filtering the results. For example, the prefix <code>/division_abc/subdivision_xyz/</code> gets all groups whose path starts with <code>/division_abc/subdivision_xyz/</code>.</p> <p>This parameter is optional. If it is not included, it defaults to a slash (/), listing all groups. This parameter allows (through its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes. In addition, it can contain any ASCII character from the ! (<code>\\u0021</code>) through the DEL character (<code>\\u007F</code>), including most punctuation characters, digits, and upper and lowercased letters.</p>"
         },
         "Marker":{
           "shape":"markerType",
@@ -5067,7 +5071,7 @@
       "members":{
         "PathPrefix":{
           "shape":"pathPrefixType",
-          "documentation":"<p> The path prefix for filtering the results. For example, the prefix <code>/application_abc/component_xyz/</code> gets all instance profiles whose path starts with <code>/application_abc/component_xyz/</code>.</p> <p>This parameter is optional. If it is not included, it defaults to a slash (/), listing all instance profiles. This parameter allows (through its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes. In addition, it can contain any ASCII character from the ! (\\u0021) through the DEL character (\\u007F), including most punctuation characters, digits, and upper and lowercased letters.</p>"
+          "documentation":"<p> The path prefix for filtering the results. For example, the prefix <code>/application_abc/component_xyz/</code> gets all instance profiles whose path starts with <code>/application_abc/component_xyz/</code>.</p> <p>This parameter is optional. If it is not included, it defaults to a slash (/), listing all instance profiles. This parameter allows (through its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes. In addition, it can contain any ASCII character from the ! (<code>\\u0021</code>) through the DEL character (<code>\\u007F</code>), including most punctuation characters, digits, and upper and lowercased letters.</p>"
         },
         "Marker":{
           "shape":"markerType",
@@ -5215,7 +5219,7 @@
         },
         "PathPrefix":{
           "shape":"policyPathType",
-          "documentation":"<p>The path prefix for filtering the results. This parameter is optional. If it is not included, it defaults to a slash (/), listing all policies. This parameter allows (through its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes. In addition, it can contain any ASCII character from the ! (\\u0021) through the DEL character (\\u007F), including most punctuation characters, digits, and upper and lowercased letters.</p>"
+          "documentation":"<p>The path prefix for filtering the results. This parameter is optional. If it is not included, it defaults to a slash (/), listing all policies. This parameter allows (through its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes. In addition, it can contain any ASCII character from the ! (<code>\\u0021</code>) through the DEL character (<code>\\u007F</code>), including most punctuation characters, digits, and upper and lowercased letters.</p>"
         },
         "PolicyUsageFilter":{
           "shape":"PolicyUsageType",
@@ -5363,7 +5367,7 @@
       "members":{
         "PathPrefix":{
           "shape":"pathPrefixType",
-          "documentation":"<p> The path prefix for filtering the results. For example, the prefix <code>/application_abc/component_xyz/</code> gets all roles whose path starts with <code>/application_abc/component_xyz/</code>.</p> <p>This parameter is optional. If it is not included, it defaults to a slash (/), listing all roles. This parameter allows (through its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes. In addition, it can contain any ASCII character from the ! (\\u0021) through the DEL character (\\u007F), including most punctuation characters, digits, and upper and lowercased letters.</p>"
+          "documentation":"<p> The path prefix for filtering the results. For example, the prefix <code>/application_abc/component_xyz/</code> gets all roles whose path starts with <code>/application_abc/component_xyz/</code>.</p> <p>This parameter is optional. If it is not included, it defaults to a slash (/), listing all roles. This parameter allows (through its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes. In addition, it can contain any ASCII character from the ! (<code>\\u0021</code>) through the DEL character (<code>\\u007F</code>), including most punctuation characters, digits, and upper and lowercased letters.</p>"
         },
         "Marker":{
           "shape":"markerType",
@@ -5449,7 +5453,7 @@
       "members":{
         "PathPrefix":{
           "shape":"pathPrefixType",
-          "documentation":"<p> The path prefix for filtering the results. For example: <code>/company/servercerts</code> would get all server certificates for which the path starts with <code>/company/servercerts</code>.</p> <p>This parameter is optional. If it is not included, it defaults to a slash (/), listing all server certificates. This parameter allows (through its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes. In addition, it can contain any ASCII character from the ! (\\u0021) through the DEL character (\\u007F), including most punctuation characters, digits, and upper and lowercased letters.</p>"
+          "documentation":"<p> The path prefix for filtering the results. For example: <code>/company/servercerts</code> would get all server certificates for which the path starts with <code>/company/servercerts</code>.</p> <p>This parameter is optional. If it is not included, it defaults to a slash (/), listing all server certificates. This parameter allows (through its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes. In addition, it can contain any ASCII character from the ! (<code>\\u0021</code>) through the DEL character (<code>\\u007F</code>), including most punctuation characters, digits, and upper and lowercased letters.</p>"
         },
         "Marker":{
           "shape":"markerType",
@@ -5616,7 +5620,7 @@
       "members":{
         "PathPrefix":{
           "shape":"pathPrefixType",
-          "documentation":"<p> The path prefix for filtering the results. For example: <code>/division_abc/subdivision_xyz/</code>, which would get all user names whose path starts with <code>/division_abc/subdivision_xyz/</code>.</p> <p>This parameter is optional. If it is not included, it defaults to a slash (/), listing all user names. This parameter allows (through its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes. In addition, it can contain any ASCII character from the ! (\\u0021) through the DEL character (\\u007F), including most punctuation characters, digits, and upper and lowercased letters.</p>"
+          "documentation":"<p> The path prefix for filtering the results. For example: <code>/division_abc/subdivision_xyz/</code>, which would get all user names whose path starts with <code>/division_abc/subdivision_xyz/</code>.</p> <p>This parameter is optional. If it is not included, it defaults to a slash (/), listing all user names. This parameter allows (through its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes. In addition, it can contain any ASCII character from the ! (<code>\\u0021</code>) through the DEL character (<code>\\u007F</code>), including most punctuation characters, digits, and upper and lowercased letters.</p>"
         },
         "Marker":{
           "shape":"markerType",
@@ -5763,16 +5767,16 @@
         },
         "PolicyId":{
           "shape":"idType",
-          "documentation":"<p>The stable and unique string identifying the policy.</p> <p>For more information about IDs, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html\">IAM Identifiers</a> in the <i>Using IAM</i> guide.</p>"
+          "documentation":"<p>The stable and unique string identifying the policy.</p> <p>For more information about IDs, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html\">IAM Identifiers</a> in the <i>IAM User Guide</i>.</p>"
         },
         "Arn":{"shape":"arnType"},
         "Path":{
           "shape":"policyPathType",
-          "documentation":"<p>The path to the policy.</p> <p>For more information about paths, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html\">IAM Identifiers</a> in the <i>Using IAM</i> guide.</p>"
+          "documentation":"<p>The path to the policy.</p> <p>For more information about paths, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html\">IAM Identifiers</a> in the <i>IAM User Guide</i>.</p>"
         },
         "DefaultVersionId":{
           "shape":"policyVersionIdType",
-          "documentation":"<p>The identifier for the version of the policy that is set as the default (operative) version.</p> <p>For more information about policy versions, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/policies-managed-versions.html\">Versioning for Managed Policies</a> in the <i>Using IAM</i> guide. </p>"
+          "documentation":"<p>The identifier for the version of the policy that is set as the default (operative) version.</p> <p>For more information about policy versions, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/policies-managed-versions.html\">Versioning for Managed Policies</a> in the <i>IAM User Guide</i>. </p>"
         },
         "AttachmentCount":{
           "shape":"attachmentCountType",
@@ -5803,7 +5807,7 @@
           "documentation":"<p>A list containing information about the versions of the policy.</p>"
         }
       },
-      "documentation":"<p>Contains information about a managed policy, including the policy's ARN, versions, and the number of principal entities (users, groups, and roles) that the policy is attached to.</p> <p>This data type is used as a response element in the <a>GetAccountAuthorizationDetails</a> operation.</p> <p>For more information about managed policies, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/policies-managed-vs-inline.html\">Managed Policies and Inline Policies</a> in the <i>Using IAM</i> guide. </p>"
+      "documentation":"<p>Contains information about a managed policy, including the policy's ARN, versions, and the number of principal entities (users, groups, and roles) that the policy is attached to.</p> <p>This data type is used as a response element in the <a>GetAccountAuthorizationDetails</a> operation.</p> <p>For more information about managed policies, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/policies-managed-vs-inline.html\">Managed Policies and Inline Policies</a> in the <i>IAM User Guide</i>. </p>"
     },
     "ManagedPolicyDetailListType":{
       "type":"list",
@@ -5913,6 +5917,16 @@
       "type":"string",
       "enum":["PermissionsBoundaryPolicy"]
     },
+    "PermissionsBoundaryDecisionDetail":{
+      "type":"structure",
+      "members":{
+        "AllowedByPermissionsBoundary":{
+          "shape":"booleanType",
+          "documentation":"<p>Specifies whether an action is allowed by a permissions boundary that is applied to an IAM entity (user or role). A value of <code>true</code> means that the permissions boundary does not deny the action. This means that the policy includes an <code>Allow</code> statement that matches the request. In this case, if an identity-based policy also allows the action, the request is allowed. A value of <code>false</code> means that either the requested action is not allowed (implicitly denied) or that the action is explicitly denied by the permissions boundary. In both of these cases, the action is not allowed, regardless of the identity-based policy.</p>"
+        }
+      },
+      "documentation":"<p>Contains information about the effect that a permissions boundary has on a policy simulation when the boundary is applied to an IAM entity.</p>"
+    },
     "Policy":{
       "type":"structure",
       "members":{
@@ -5922,12 +5936,12 @@
         },
         "PolicyId":{
           "shape":"idType",
-          "documentation":"<p>The stable and unique string identifying the policy.</p> <p>For more information about IDs, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html\">IAM Identifiers</a> in the <i>Using IAM</i> guide.</p>"
+          "documentation":"<p>The stable and unique string identifying the policy.</p> <p>For more information about IDs, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html\">IAM Identifiers</a> in the <i>IAM User Guide</i>.</p>"
         },
         "Arn":{"shape":"arnType"},
         "Path":{
           "shape":"policyPathType",
-          "documentation":"<p>The path to the policy.</p> <p>For more information about paths, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html\">IAM Identifiers</a> in the <i>Using IAM</i> guide.</p>"
+          "documentation":"<p>The path to the policy.</p> <p>For more information about paths, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html\">IAM Identifiers</a> in the <i>IAM User Guide</i>.</p>"
         },
         "DefaultVersionId":{
           "shape":"policyVersionIdType",
@@ -5958,7 +5972,7 @@
           "documentation":"<p>The date and time, in <a href=\"http://www.iso.org/iso/iso8601\">ISO 8601 date-time format</a>, when the policy was last updated.</p> <p>When a policy has only one version, this field contains the date and time when the policy was created. When a policy has more than one version, this field contains the date and time when the most recent policy version was created.</p>"
         }
       },
-      "documentation":"<p>Contains information about a managed policy.</p> <p>This data type is used as a response element in the <a>CreatePolicy</a>, <a>GetPolicy</a>, and <a>ListPolicies</a> operations. </p> <p>For more information about managed policies, refer to <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/policies-managed-vs-inline.html\">Managed Policies and Inline Policies</a> in the <i>Using IAM</i> guide. </p>"
+      "documentation":"<p>Contains information about a managed policy.</p> <p>This data type is used as a response element in the <a>CreatePolicy</a>, <a>GetPolicy</a>, and <a>ListPolicies</a> operations. </p> <p>For more information about managed policies, refer to <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/policies-managed-vs-inline.html\">Managed Policies and Inline Policies</a> in the <i>IAM User Guide</i>. </p>"
     },
     "PolicyDetail":{
       "type":"structure",
@@ -6033,7 +6047,7 @@
           "documentation":"<p>The stable and unique string identifying the group. For more information about IDs, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/reference_identifiers.html\">IAM Identifiers</a> in the <i>IAM User Guide</i>.</p>"
         }
       },
-      "documentation":"<p>Contains information about a group that a managed policy is attached to.</p> <p>This data type is used as a response element in the <a>ListEntitiesForPolicy</a> operation. </p> <p>For more information about managed policies, refer to <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/policies-managed-vs-inline.html\">Managed Policies and Inline Policies</a> in the <i>Using IAM</i> guide. </p>"
+      "documentation":"<p>Contains information about a group that a managed policy is attached to.</p> <p>This data type is used as a response element in the <a>ListEntitiesForPolicy</a> operation. </p> <p>For more information about managed policies, refer to <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/policies-managed-vs-inline.html\">Managed Policies and Inline Policies</a> in the <i>IAM User Guide</i>. </p>"
     },
     "PolicyGroupListType":{
       "type":"list",
@@ -6065,7 +6079,7 @@
           "documentation":"<p>The stable and unique string identifying the role. For more information about IDs, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/reference_identifiers.html\">IAM Identifiers</a> in the <i>IAM User Guide</i>.</p>"
         }
       },
-      "documentation":"<p>Contains information about a role that a managed policy is attached to.</p> <p>This data type is used as a response element in the <a>ListEntitiesForPolicy</a> operation. </p> <p>For more information about managed policies, refer to <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/policies-managed-vs-inline.html\">Managed Policies and Inline Policies</a> in the <i>Using IAM</i> guide. </p>"
+      "documentation":"<p>Contains information about a role that a managed policy is attached to.</p> <p>This data type is used as a response element in the <a>ListEntitiesForPolicy</a> operation. </p> <p>For more information about managed policies, refer to <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/policies-managed-vs-inline.html\">Managed Policies and Inline Policies</a> in the <i>IAM User Guide</i>. </p>"
     },
     "PolicyRoleListType":{
       "type":"list",
@@ -6103,7 +6117,7 @@
           "documentation":"<p>The stable and unique string identifying the user. For more information about IDs, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/reference_identifiers.html\">IAM Identifiers</a> in the <i>IAM User Guide</i>.</p>"
         }
       },
-      "documentation":"<p>Contains information about a user that a managed policy is attached to.</p> <p>This data type is used as a response element in the <a>ListEntitiesForPolicy</a> operation. </p> <p>For more information about managed policies, refer to <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/policies-managed-vs-inline.html\">Managed Policies and Inline Policies</a> in the <i>Using IAM</i> guide. </p>"
+      "documentation":"<p>Contains information about a user that a managed policy is attached to.</p> <p>This data type is used as a response element in the <a>ListEntitiesForPolicy</a> operation. </p> <p>For more information about managed policies, refer to <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/policies-managed-vs-inline.html\">Managed Policies and Inline Policies</a> in the <i>IAM User Guide</i>. </p>"
     },
     "PolicyUserListType":{
       "type":"list",
@@ -6129,7 +6143,7 @@
           "documentation":"<p>The date and time, in <a href=\"http://www.iso.org/iso/iso8601\">ISO 8601 date-time format</a>, when the policy version was created.</p>"
         }
       },
-      "documentation":"<p>Contains information about a version of a managed policy.</p> <p>This data type is used as a response element in the <a>CreatePolicyVersion</a>, <a>GetPolicyVersion</a>, <a>ListPolicyVersions</a>, and <a>GetAccountAuthorizationDetails</a> operations. </p> <p>For more information about managed policies, refer to <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/policies-managed-vs-inline.html\">Managed Policies and Inline Policies</a> in the <i>Using IAM</i> guide. </p>"
+      "documentation":"<p>Contains information about a version of a managed policy.</p> <p>This data type is used as a response element in the <a>CreatePolicyVersion</a>, <a>GetPolicyVersion</a>, <a>ListPolicyVersions</a>, and <a>GetAccountAuthorizationDetails</a> operations. </p> <p>For more information about managed policies, refer to <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/policies-managed-vs-inline.html\">Managed Policies and Inline Policies</a> in the <i>IAM User Guide</i>. </p>"
     },
     "Position":{
       "type":"structure",
@@ -6163,7 +6177,7 @@
         },
         "PolicyDocument":{
           "shape":"policyDocumentType",
-          "documentation":"<p>The policy document.</p> <p>You must provide policies in JSON format in IAM. However, for AWS CloudFormation templates formatted in YAML, you can provide the policy in JSON or YAML format. AWS CloudFormation always converts a YAML policy to JSON format before submitting it to IAM.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> used to validate this parameter is a string of characters consisting of the following:</p> <ul> <li> <p>Any printable ASCII character ranging from the space character (\\u0020) through the end of the ASCII character range</p> </li> <li> <p>The printable characters in the Basic Latin and Latin-1 Supplement character set (through \\u00FF)</p> </li> <li> <p>The special characters tab (\\u0009), line feed (\\u000A), and carriage return (\\u000D)</p> </li> </ul>"
+          "documentation":"<p>The policy document.</p> <p>You must provide policies in JSON format in IAM. However, for AWS CloudFormation templates formatted in YAML, you can provide the policy in JSON or YAML format. AWS CloudFormation always converts a YAML policy to JSON format before submitting it to IAM.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> used to validate this parameter is a string of characters consisting of the following:</p> <ul> <li> <p>Any printable ASCII character ranging from the space character (<code>\\u0020</code>) through the end of the ASCII character range</p> </li> <li> <p>The printable characters in the Basic Latin and Latin-1 Supplement character set (through <code>\\u00FF</code>)</p> </li> <li> <p>The special characters tab (<code>\\u0009</code>), line feed (<code>\\u000A</code>), and carriage return (<code>\\u000D</code>)</p> </li> </ul>"
         }
       }
     },
@@ -6202,7 +6216,7 @@
         },
         "PolicyDocument":{
           "shape":"policyDocumentType",
-          "documentation":"<p>The policy document.</p> <p>You must provide policies in JSON format in IAM. However, for AWS CloudFormation templates formatted in YAML, you can provide the policy in JSON or YAML format. AWS CloudFormation always converts a YAML policy to JSON format before submitting it to IAM.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> used to validate this parameter is a string of characters consisting of the following:</p> <ul> <li> <p>Any printable ASCII character ranging from the space character (\\u0020) through the end of the ASCII character range</p> </li> <li> <p>The printable characters in the Basic Latin and Latin-1 Supplement character set (through \\u00FF)</p> </li> <li> <p>The special characters tab (\\u0009), line feed (\\u000A), and carriage return (\\u000D)</p> </li> </ul>"
+          "documentation":"<p>The policy document.</p> <p>You must provide policies in JSON format in IAM. However, for AWS CloudFormation templates formatted in YAML, you can provide the policy in JSON or YAML format. AWS CloudFormation always converts a YAML policy to JSON format before submitting it to IAM.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> used to validate this parameter is a string of characters consisting of the following:</p> <ul> <li> <p>Any printable ASCII character ranging from the space character (<code>\\u0020</code>) through the end of the ASCII character range</p> </li> <li> <p>The printable characters in the Basic Latin and Latin-1 Supplement character set (through <code>\\u00FF</code>)</p> </li> <li> <p>The special characters tab (<code>\\u0009</code>), line feed (<code>\\u000A</code>), and carriage return (<code>\\u000D</code>)</p> </li> </ul>"
         }
       }
     },
@@ -6241,7 +6255,7 @@
         },
         "PolicyDocument":{
           "shape":"policyDocumentType",
-          "documentation":"<p>The policy document.</p> <p>You must provide policies in JSON format in IAM. However, for AWS CloudFormation templates formatted in YAML, you can provide the policy in JSON or YAML format. AWS CloudFormation always converts a YAML policy to JSON format before submitting it to IAM.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> used to validate this parameter is a string of characters consisting of the following:</p> <ul> <li> <p>Any printable ASCII character ranging from the space character (\\u0020) through the end of the ASCII character range</p> </li> <li> <p>The printable characters in the Basic Latin and Latin-1 Supplement character set (through \\u00FF)</p> </li> <li> <p>The special characters tab (\\u0009), line feed (\\u000A), and carriage return (\\u000D)</p> </li> </ul>"
+          "documentation":"<p>The policy document.</p> <p>You must provide policies in JSON format in IAM. However, for AWS CloudFormation templates formatted in YAML, you can provide the policy in JSON or YAML format. AWS CloudFormation always converts a YAML policy to JSON format before submitting it to IAM.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> used to validate this parameter is a string of characters consisting of the following:</p> <ul> <li> <p>Any printable ASCII character ranging from the space character (<code>\\u0020</code>) through the end of the ASCII character range</p> </li> <li> <p>The printable characters in the Basic Latin and Latin-1 Supplement character set (through <code>\\u00FF</code>)</p> </li> <li> <p>The special characters tab (<code>\\u0009</code>), line feed (<code>\\u000A</code>), and carriage return (<code>\\u000D</code>)</p> </li> </ul>"
         }
       }
     },
@@ -6394,7 +6408,11 @@
         },
         "EvalDecisionDetails":{
           "shape":"EvalDecisionDetailsType",
-          "documentation":"<p>Additional details about the results of the evaluation decision. When there are both IAM policies and resource policies, this parameter explains how each set of policies contributes to the final evaluation decision. When simulating cross-account access to a resource, both the resource-based policy and the caller's IAM policy must grant access.</p>"
+          "documentation":"<p>Additional details about the results of the evaluation decision on a single resource. This parameter is returned only for cross-account simulations. This parameter explains how each policy type contributes to the resource-specific evaluation decision.</p>"
+        },
+        "PermissionsBoundaryDecisionDetail":{
+          "shape":"PermissionsBoundaryDecisionDetail",
+          "documentation":"<p>Contains information about the effect that a permissions boundary has on a policy simulation when that boundary is applied to an IAM entity.</p>"
         }
       },
       "documentation":"<p>Contains the result of the simulation of a single API operation call on a single resource.</p> <p>This data type is used by a member of the <a>EvaluationResult</a> data type.</p>"
@@ -6442,7 +6460,7 @@
       "members":{
         "Path":{
           "shape":"pathType",
-          "documentation":"<p> The path to the role. For more information about paths, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html\">IAM Identifiers</a> in the <i>Using IAM</i> guide. </p>"
+          "documentation":"<p> The path to the role. For more information about paths, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html\">IAM Identifiers</a> in the <i>IAM User Guide</i>. </p>"
         },
         "RoleName":{
           "shape":"roleNameType",
@@ -6450,7 +6468,7 @@
         },
         "RoleId":{
           "shape":"idType",
-          "documentation":"<p> The stable and unique string identifying the role. For more information about IDs, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html\">IAM Identifiers</a> in the <i>Using IAM</i> guide. </p>"
+          "documentation":"<p> The stable and unique string identifying the role. For more information about IDs, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html\">IAM Identifiers</a> in the <i>IAM User Guide</i>. </p>"
         },
         "Arn":{
           "shape":"arnType",
@@ -6479,6 +6497,10 @@
         "Tags":{
           "shape":"tagListType",
           "documentation":"<p>A list of tags that are attached to the specified role. For more information about tagging, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/id_tags.html\">Tagging IAM Identities</a> in the <i>IAM User Guide</i>.</p>"
+        },
+        "RoleLastUsed":{
+          "shape":"RoleLastUsed",
+          "documentation":"<p>Contains information about the last time that an IAM role was used. This includes the date and time and the Region in which the role was last used. Activity is only reported for the trailing 400 days. This period can be shorter if your Region began supporting these features within the last year. The role might have been used more than 400 days ago. For more information, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/access_policies_access-advisor.html#access-advisor_tracking-period\">Regions Where Data Is Tracked</a> in the <i>IAM User Guide</i>.</p>"
         }
       },
       "documentation":"<p>Contains information about an IAM role. This structure is returned as a response element in several API operations that interact with roles.</p>"
@@ -6488,7 +6510,7 @@
       "members":{
         "Path":{
           "shape":"pathType",
-          "documentation":"<p>The path to the role. For more information about paths, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html\">IAM Identifiers</a> in the <i>Using IAM</i> guide.</p>"
+          "documentation":"<p>The path to the role. For more information about paths, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html\">IAM Identifiers</a> in the <i>IAM User Guide</i>.</p>"
         },
         "RoleName":{
           "shape":"roleNameType",
@@ -6496,7 +6518,7 @@
         },
         "RoleId":{
           "shape":"idType",
-          "documentation":"<p>The stable and unique string identifying the role. For more information about IDs, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html\">IAM Identifiers</a> in the <i>Using IAM</i> guide.</p>"
+          "documentation":"<p>The stable and unique string identifying the role. For more information about IDs, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html\">IAM Identifiers</a> in the <i>IAM User Guide</i>.</p>"
         },
         "Arn":{"shape":"arnType"},
         "CreateDate":{
@@ -6526,10 +6548,28 @@
         "Tags":{
           "shape":"tagListType",
           "documentation":"<p>A list of tags that are attached to the specified role. For more information about tagging, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/id_tags.html\">Tagging IAM Identities</a> in the <i>IAM User Guide</i>.</p>"
+        },
+        "RoleLastUsed":{
+          "shape":"RoleLastUsed",
+          "documentation":"<p>Contains information about the last time that an IAM role was used. This includes the date and time and the Region in which the role was last used. Activity is only reported for the trailing 400 days. This period can be shorter if your Region began supporting these features within the last year. The role might have been used more than 400 days ago. For more information, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/access_policies_access-advisor.html#access-advisor_tracking-period\">Regions Where Data Is Tracked</a> in the <i>IAM User Guide</i>.</p>"
         }
       },
       "documentation":"<p>Contains information about an IAM role, including all of the role's policies.</p> <p>This data type is used as a response element in the <a>GetAccountAuthorizationDetails</a> operation.</p>"
     },
+    "RoleLastUsed":{
+      "type":"structure",
+      "members":{
+        "LastUsedDate":{
+          "shape":"dateType",
+          "documentation":"<p>The date and time, in <a href=\"http://www.iso.org/iso/iso8601\">ISO 8601 date-time format</a> that the role was last used.</p> <p>This field is null if the role has not been used within the IAM tracking period. For more information about the tracking period, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/access_policies_access-advisor.html#access-advisor_tracking-period\">Regions Where Data Is Tracked</a> in the <i>IAM User Guide</i>. </p>"
+        },
+        "Region":{
+          "shape":"stringType",
+          "documentation":"<p>The name of the AWS Region in which the role was last used.</p>"
+        }
+      },
+      "documentation":"<p>Contains information about the last time that an IAM role was used. This includes the date and time and the Region in which the role was last used. Activity is only reported for the trailing 400 days. This period can be shorter if your Region began supporting these features within the last year. The role might have been used more than 400 days ago. For more information, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/access_policies_access-advisor.html#access-advisor_tracking-period\">Regions Where Data Is Tracked</a> in the <i>IAM User Guide</i>.</p> <p>This data type is returned as a response element in the <a>GetRole</a> and <a>GetAccountAuthorizationDetails</a> operations.</p>"
+    },
     "RoleUsageListType":{
       "type":"list",
       "member":{"shape":"RoleUsageType"}
@@ -6683,7 +6723,7 @@
       "members":{
         "Path":{
           "shape":"pathType",
-          "documentation":"<p> The path to the server certificate. For more information about paths, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html\">IAM Identifiers</a> in the <i>Using IAM</i> guide. </p>"
+          "documentation":"<p> The path to the server certificate. For more information about paths, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html\">IAM Identifiers</a> in the <i>IAM User Guide</i>. </p>"
         },
         "ServerCertificateName":{
           "shape":"serverCertificateNameType",
@@ -6691,11 +6731,11 @@
         },
         "ServerCertificateId":{
           "shape":"idType",
-          "documentation":"<p> The stable and unique string identifying the server certificate. For more information about IDs, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html\">IAM Identifiers</a> in the <i>Using IAM</i> guide. </p>"
+          "documentation":"<p> The stable and unique string identifying the server certificate. For more information about IDs, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html\">IAM Identifiers</a> in the <i>IAM User Guide</i>. </p>"
         },
         "Arn":{
           "shape":"arnType",
-          "documentation":"<p> The Amazon Resource Name (ARN) specifying the server certificate. For more information about ARNs and how to use them in policies, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html\">IAM Identifiers</a> in the <i>Using IAM</i> guide. </p>"
+          "documentation":"<p> The Amazon Resource Name (ARN) specifying the server certificate. For more information about ARNs and how to use them in policies, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html\">IAM Identifiers</a> in the <i>IAM User Guide</i>. </p>"
         },
         "UploadDate":{
           "shape":"dateType",
@@ -6920,7 +6960,11 @@
       "members":{
         "PolicyInputList":{
           "shape":"SimulationPolicyListType",
-          "documentation":"<p>A list of policy documents to include in the simulation. Each document is specified as a string containing the complete, valid JSON text of an IAM policy. Do not include any resource-based policies in this parameter. Any resource-based policy must be submitted with the <code>ResourcePolicy</code> parameter. The policies cannot be \"scope-down\" policies, such as you could include in a call to <a href=\"https://docs.aws.amazon.com/IAM/latest/APIReference/API_GetFederationToken.html\">GetFederationToken</a> or one of the <a href=\"https://docs.aws.amazon.com/IAM/latest/APIReference/API_AssumeRole.html\">AssumeRole</a> API operations. In other words, do not use policies designed to restrict what a user can do while using the temporary credentials.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> used to validate this parameter is a string of characters consisting of the following:</p> <ul> <li> <p>Any printable ASCII character ranging from the space character (\\u0020) through the end of the ASCII character range</p> </li> <li> <p>The printable characters in the Basic Latin and Latin-1 Supplement character set (through \\u00FF)</p> </li> <li> <p>The special characters tab (\\u0009), line feed (\\u000A), and carriage return (\\u000D)</p> </li> </ul>"
+          "documentation":"<p>A list of policy documents to include in the simulation. Each document is specified as a string containing the complete, valid JSON text of an IAM policy. Do not include any resource-based policies in this parameter. Any resource-based policy must be submitted with the <code>ResourcePolicy</code> parameter. The policies cannot be \"scope-down\" policies, such as you could include in a call to <a href=\"https://docs.aws.amazon.com/IAM/latest/APIReference/API_GetFederationToken.html\">GetFederationToken</a> or one of the <a href=\"https://docs.aws.amazon.com/IAM/latest/APIReference/API_AssumeRole.html\">AssumeRole</a> API operations. In other words, do not use policies designed to restrict what a user can do while using the temporary credentials.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> used to validate this parameter is a string of characters consisting of the following:</p> <ul> <li> <p>Any printable ASCII character ranging from the space character (<code>\\u0020</code>) through the end of the ASCII character range</p> </li> <li> <p>The printable characters in the Basic Latin and Latin-1 Supplement character set (through <code>\\u00FF</code>)</p> </li> <li> <p>The special characters tab (<code>\\u0009</code>), line feed (<code>\\u000A</code>), and carriage return (<code>\\u000D</code>)</p> </li> </ul>"
+        },
+        "PermissionsBoundaryPolicyInputList":{
+          "shape":"SimulationPolicyListType",
+          "documentation":"<p>The IAM permissions boundary policy to simulate. The permissions boundary sets the maximum permissions that an IAM entity can have. You can input only one permissions boundary when you pass a policy to this operation. For more information about permissions boundaries, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/access_policies_boundaries.html\">Permissions Boundaries for IAM Entities</a> in the <i>IAM User Guide</i>. The policy input is specified as a string that contains the complete, valid JSON text of a permissions boundary policy.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> used to validate this parameter is a string of characters consisting of the following:</p> <ul> <li> <p>Any printable ASCII character ranging from the space character (<code>\\u0020</code>) through the end of the ASCII character range</p> </li> <li> <p>The printable characters in the Basic Latin and Latin-1 Supplement character set (through <code>\\u00FF</code>)</p> </li> <li> <p>The special characters tab (<code>\\u0009</code>), line feed (<code>\\u000A</code>), and carriage return (<code>\\u000D</code>)</p> </li> </ul>"
         },
         "ActionNames":{
           "shape":"ActionNameListType",
@@ -6932,7 +6976,7 @@
         },
         "ResourcePolicy":{
           "shape":"policyDocumentType",
-          "documentation":"<p>A resource-based policy to include in the simulation provided as a string. Each resource in the simulation is treated as if it had this policy attached. You can include only one resource-based policy in a simulation.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> used to validate this parameter is a string of characters consisting of the following:</p> <ul> <li> <p>Any printable ASCII character ranging from the space character (\\u0020) through the end of the ASCII character range</p> </li> <li> <p>The printable characters in the Basic Latin and Latin-1 Supplement character set (through \\u00FF)</p> </li> <li> <p>The special characters tab (\\u0009), line feed (\\u000A), and carriage return (\\u000D)</p> </li> </ul>"
+          "documentation":"<p>A resource-based policy to include in the simulation provided as a string. Each resource in the simulation is treated as if it had this policy attached. You can include only one resource-based policy in a simulation.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> used to validate this parameter is a string of characters consisting of the following:</p> <ul> <li> <p>Any printable ASCII character ranging from the space character (<code>\\u0020</code>) through the end of the ASCII character range</p> </li> <li> <p>The printable characters in the Basic Latin and Latin-1 Supplement character set (through <code>\\u00FF</code>)</p> </li> <li> <p>The special characters tab (<code>\\u0009</code>), line feed (<code>\\u000A</code>), and carriage return (<code>\\u000D</code>)</p> </li> </ul>"
         },
         "ResourceOwner":{
           "shape":"ResourceNameType",
@@ -6991,7 +7035,11 @@
         },
         "PolicyInputList":{
           "shape":"SimulationPolicyListType",
-          "documentation":"<p>An optional list of additional policy documents to include in the simulation. Each document is specified as a string containing the complete, valid JSON text of an IAM policy.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> used to validate this parameter is a string of characters consisting of the following:</p> <ul> <li> <p>Any printable ASCII character ranging from the space character (\\u0020) through the end of the ASCII character range</p> </li> <li> <p>The printable characters in the Basic Latin and Latin-1 Supplement character set (through \\u00FF)</p> </li> <li> <p>The special characters tab (\\u0009), line feed (\\u000A), and carriage return (\\u000D)</p> </li> </ul>"
+          "documentation":"<p>An optional list of additional policy documents to include in the simulation. Each document is specified as a string containing the complete, valid JSON text of an IAM policy.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> used to validate this parameter is a string of characters consisting of the following:</p> <ul> <li> <p>Any printable ASCII character ranging from the space character (<code>\\u0020</code>) through the end of the ASCII character range</p> </li> <li> <p>The printable characters in the Basic Latin and Latin-1 Supplement character set (through <code>\\u00FF</code>)</p> </li> <li> <p>The special characters tab (<code>\\u0009</code>), line feed (<code>\\u000A</code>), and carriage return (<code>\\u000D</code>)</p> </li> </ul>"
+        },
+        "PermissionsBoundaryPolicyInputList":{
+          "shape":"SimulationPolicyListType",
+          "documentation":"<p>The IAM permissions boundary policy to simulate. The permissions boundary sets the maximum permissions that the entity can have. You can input only one permissions boundary when you pass a policy to this operation. An IAM entity can only have one permissions boundary in effect at a time. For example, if a permissions boundary is attached to an entity and you pass in a different permissions boundary policy using this parameter, then the new permission boundary policy is used for the simulation. For more information about permissions boundaries, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/access_policies_boundaries.html\">Permissions Boundaries for IAM Entities</a> in the <i>IAM User Guide</i>. The policy input is specified as a string containing the complete, valid JSON text of a permissions boundary policy.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> used to validate this parameter is a string of characters consisting of the following:</p> <ul> <li> <p>Any printable ASCII character ranging from the space character (<code>\\u0020</code>) through the end of the ASCII character range</p> </li> <li> <p>The printable characters in the Basic Latin and Latin-1 Supplement character set (through <code>\\u00FF</code>)</p> </li> <li> <p>The special characters tab (<code>\\u0009</code>), line feed (<code>\\u000A</code>), and carriage return (<code>\\u000D</code>)</p> </li> </ul>"
         },
         "ActionNames":{
           "shape":"ActionNameListType",
@@ -7003,7 +7051,7 @@
         },
         "ResourcePolicy":{
           "shape":"policyDocumentType",
-          "documentation":"<p>A resource-based policy to include in the simulation provided as a string. Each resource in the simulation is treated as if it had this policy attached. You can include only one resource-based policy in a simulation.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> used to validate this parameter is a string of characters consisting of the following:</p> <ul> <li> <p>Any printable ASCII character ranging from the space character (\\u0020) through the end of the ASCII character range</p> </li> <li> <p>The printable characters in the Basic Latin and Latin-1 Supplement character set (through \\u00FF)</p> </li> <li> <p>The special characters tab (\\u0009), line feed (\\u000A), and carriage return (\\u000D)</p> </li> </ul>"
+          "documentation":"<p>A resource-based policy to include in the simulation provided as a string. Each resource in the simulation is treated as if it had this policy attached. You can include only one resource-based policy in a simulation.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> used to validate this parameter is a string of characters consisting of the following:</p> <ul> <li> <p>Any printable ASCII character ranging from the space character (<code>\\u0020</code>) through the end of the ASCII character range</p> </li> <li> <p>The printable characters in the Basic Latin and Latin-1 Supplement character set (through <code>\\u00FF</code>)</p> </li> <li> <p>The special characters tab (<code>\\u0009</code>), line feed (<code>\\u000A</code>), and carriage return (<code>\\u000D</code>)</p> </li> </ul>"
         },
         "ResourceOwner":{
           "shape":"ResourceNameType",
@@ -7248,7 +7296,7 @@
         },
         "PolicyDocument":{
           "shape":"policyDocumentType",
-          "documentation":"<p>The policy that grants an entity permission to assume the role.</p> <p>You must provide policies in JSON format in IAM. However, for AWS CloudFormation templates formatted in YAML, you can provide the policy in JSON or YAML format. AWS CloudFormation always converts a YAML policy to JSON format before submitting it to IAM.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> used to validate this parameter is a string of characters consisting of the following:</p> <ul> <li> <p>Any printable ASCII character ranging from the space character (\\u0020) through the end of the ASCII character range</p> </li> <li> <p>The printable characters in the Basic Latin and Latin-1 Supplement character set (through \\u00FF)</p> </li> <li> <p>The special characters tab (\\u0009), line feed (\\u000A), and carriage return (\\u000D)</p> </li> </ul>"
+          "documentation":"<p>The policy that grants an entity permission to assume the role.</p> <p>You must provide policies in JSON format in IAM. However, for AWS CloudFormation templates formatted in YAML, you can provide the policy in JSON or YAML format. AWS CloudFormation always converts a YAML policy to JSON format before submitting it to IAM.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> used to validate this parameter is a string of characters consisting of the following:</p> <ul> <li> <p>Any printable ASCII character ranging from the space character (<code>\\u0020</code>) through the end of the ASCII character range</p> </li> <li> <p>The printable characters in the Basic Latin and Latin-1 Supplement character set (through <code>\\u00FF</code>)</p> </li> <li> <p>The special characters tab (<code>\\u0009</code>), line feed (<code>\\u000A</code>), and carriage return (<code>\\u000D</code>)</p> </li> </ul>"
         }
       }
     },
@@ -7262,7 +7310,7 @@
         },
         "NewPath":{
           "shape":"pathType",
-          "documentation":"<p>New path for the IAM group. Only include this if changing the group's path.</p> <p>This parameter allows (through its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes. In addition, it can contain any ASCII character from the ! (\\u0021) through the DEL character (\\u007F), including most punctuation characters, digits, and upper and lowercased letters.</p>"
+          "documentation":"<p>New path for the IAM group. Only include this if changing the group's path.</p> <p>This parameter allows (through its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes. In addition, it can contain any ASCII character from the ! (<code>\\u0021</code>) through the DEL character (<code>\\u007F</code>), including most punctuation characters, digits, and upper and lowercased letters.</p>"
         },
         "NewGroupName":{
           "shape":"groupNameType",
@@ -7280,7 +7328,7 @@
         },
         "Password":{
           "shape":"passwordType",
-          "documentation":"<p>The new password for the specified IAM user.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> used to validate this parameter is a string of characters consisting of the following:</p> <ul> <li> <p>Any printable ASCII character ranging from the space character (\\u0020) through the end of the ASCII character range</p> </li> <li> <p>The printable characters in the Basic Latin and Latin-1 Supplement character set (through \\u00FF)</p> </li> <li> <p>The special characters tab (\\u0009), line feed (\\u000A), and carriage return (\\u000D)</p> </li> </ul> <p>However, the format can be further restricted by the account administrator by setting a password policy on the AWS account. For more information, see <a>UpdateAccountPasswordPolicy</a>.</p>"
+          "documentation":"<p>The new password for the specified IAM user.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> used to validate this parameter is a string of characters consisting of the following:</p> <ul> <li> <p>Any printable ASCII character ranging from the space character (<code>\\u0020</code>) through the end of the ASCII character range</p> </li> <li> <p>The printable characters in the Basic Latin and Latin-1 Supplement character set (through <code>\\u00FF</code>)</p> </li> <li> <p>The special characters tab (<code>\\u0009</code>), line feed (<code>\\u000A</code>), and carriage return (<code>\\u000D</code>)</p> </li> </ul> <p>However, the format can be further restricted by the account administrator by setting a password policy on the AWS account. For more information, see <a>UpdateAccountPasswordPolicy</a>.</p>"
         },
         "PasswordResetRequired":{
           "shape":"booleanObjectType",
@@ -7413,7 +7461,7 @@
         },
         "NewPath":{
           "shape":"pathType",
-          "documentation":"<p>The new path for the server certificate. Include this only if you are updating the server certificate's path.</p> <p>This parameter allows (through its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes. In addition, it can contain any ASCII character from the ! (\\u0021) through the DEL character (\\u007F), including most punctuation characters, digits, and upper and lowercased letters.</p>"
+          "documentation":"<p>The new path for the server certificate. Include this only if you are updating the server certificate's path.</p> <p>This parameter allows (through its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes. In addition, it can contain any ASCII character from the ! (<code>\\u0021</code>) through the DEL character (<code>\\u007F</code>), including most punctuation characters, digits, and upper and lowercased letters.</p>"
         },
         "NewServerCertificateName":{
           "shape":"serverCertificateNameType",
@@ -7473,7 +7521,7 @@
         },
         "NewPath":{
           "shape":"pathType",
-          "documentation":"<p>New path for the IAM user. Include this parameter only if you're changing the user's path.</p> <p>This parameter allows (through its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes. In addition, it can contain any ASCII character from the ! (\\u0021) through the DEL character (\\u007F), including most punctuation characters, digits, and upper and lowercased letters.</p>"
+          "documentation":"<p>New path for the IAM user. Include this parameter only if you're changing the user's path.</p> <p>This parameter allows (through its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes. In addition, it can contain any ASCII character from the ! (<code>\\u0021</code>) through the DEL character (<code>\\u007F</code>), including most punctuation characters, digits, and upper and lowercased letters.</p>"
         },
         "NewUserName":{
           "shape":"userNameType",
@@ -7494,7 +7542,7 @@
         },
         "SSHPublicKeyBody":{
           "shape":"publicKeyMaterialType",
-          "documentation":"<p>The SSH public key. The public key must be encoded in ssh-rsa format or PEM format. The minimum bit-length of the public key is 2048 bits. For example, you can generate a 2048-bit key, and the resulting PEM file is 1679 bytes long.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> used to validate this parameter is a string of characters consisting of the following:</p> <ul> <li> <p>Any printable ASCII character ranging from the space character (\\u0020) through the end of the ASCII character range</p> </li> <li> <p>The printable characters in the Basic Latin and Latin-1 Supplement character set (through \\u00FF)</p> </li> <li> <p>The special characters tab (\\u0009), line feed (\\u000A), and carriage return (\\u000D)</p> </li> </ul>"
+          "documentation":"<p>The SSH public key. The public key must be encoded in ssh-rsa format or PEM format. The minimum bit-length of the public key is 2048 bits. For example, you can generate a 2048-bit key, and the resulting PEM file is 1679 bytes long.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> used to validate this parameter is a string of characters consisting of the following:</p> <ul> <li> <p>Any printable ASCII character ranging from the space character (<code>\\u0020</code>) through the end of the ASCII character range</p> </li> <li> <p>The printable characters in the Basic Latin and Latin-1 Supplement character set (through <code>\\u00FF</code>)</p> </li> <li> <p>The special characters tab (<code>\\u0009</code>), line feed (<code>\\u000A</code>), and carriage return (<code>\\u000D</code>)</p> </li> </ul>"
         }
       }
     },
@@ -7518,7 +7566,7 @@
       "members":{
         "Path":{
           "shape":"pathType",
-          "documentation":"<p>The path for the server certificate. For more information about paths, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html\">IAM Identifiers</a> in the <i>IAM User Guide</i>.</p> <p>This parameter is optional. If it is not included, it defaults to a slash (/). This parameter allows (through its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes. In addition, it can contain any ASCII character from the ! (\\u0021) through the DEL character (\\u007F), including most punctuation characters, digits, and upper and lowercased letters.</p> <note> <p> If you are uploading a server certificate specifically for use with Amazon CloudFront distributions, you must specify a path using the <code>path</code> parameter. The path must begin with <code>/cloudfront</code> and must include a trailing slash (for example, <code>/cloudfront/test/</code>).</p> </note>"
+          "documentation":"<p>The path for the server certificate. For more information about paths, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html\">IAM Identifiers</a> in the <i>IAM User Guide</i>.</p> <p>This parameter is optional. If it is not included, it defaults to a slash (/). This parameter allows (through its <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a>) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes. In addition, it can contain any ASCII character from the ! (<code>\\u0021</code>) through the DEL character (<code>\\u007F</code>), including most punctuation characters, digits, and upper and lowercased letters.</p> <note> <p> If you are uploading a server certificate specifically for use with Amazon CloudFront distributions, you must specify a path using the <code>path</code> parameter. The path must begin with <code>/cloudfront</code> and must include a trailing slash (for example, <code>/cloudfront/test/</code>).</p> </note>"
         },
         "ServerCertificateName":{
           "shape":"serverCertificateNameType",
@@ -7526,15 +7574,15 @@
         },
         "CertificateBody":{
           "shape":"certificateBodyType",
-          "documentation":"<p>The contents of the public key certificate in PEM-encoded format.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> used to validate this parameter is a string of characters consisting of the following:</p> <ul> <li> <p>Any printable ASCII character ranging from the space character (\\u0020) through the end of the ASCII character range</p> </li> <li> <p>The printable characters in the Basic Latin and Latin-1 Supplement character set (through \\u00FF)</p> </li> <li> <p>The special characters tab (\\u0009), line feed (\\u000A), and carriage return (\\u000D)</p> </li> </ul>"
+          "documentation":"<p>The contents of the public key certificate in PEM-encoded format.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> used to validate this parameter is a string of characters consisting of the following:</p> <ul> <li> <p>Any printable ASCII character ranging from the space character (<code>\\u0020</code>) through the end of the ASCII character range</p> </li> <li> <p>The printable characters in the Basic Latin and Latin-1 Supplement character set (through <code>\\u00FF</code>)</p> </li> <li> <p>The special characters tab (<code>\\u0009</code>), line feed (<code>\\u000A</code>), and carriage return (<code>\\u000D</code>)</p> </li> </ul>"
         },
         "PrivateKey":{
           "shape":"privateKeyType",
-          "documentation":"<p>The contents of the private key in PEM-encoded format.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> used to validate this parameter is a string of characters consisting of the following:</p> <ul> <li> <p>Any printable ASCII character ranging from the space character (\\u0020) through the end of the ASCII character range</p> </li> <li> <p>The printable characters in the Basic Latin and Latin-1 Supplement character set (through \\u00FF)</p> </li> <li> <p>The special characters tab (\\u0009), line feed (\\u000A), and carriage return (\\u000D)</p> </li> </ul>"
+          "documentation":"<p>The contents of the private key in PEM-encoded format.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> used to validate this parameter is a string of characters consisting of the following:</p> <ul> <li> <p>Any printable ASCII character ranging from the space character (<code>\\u0020</code>) through the end of the ASCII character range</p> </li> <li> <p>The printable characters in the Basic Latin and Latin-1 Supplement character set (through <code>\\u00FF</code>)</p> </li> <li> <p>The special characters tab (<code>\\u0009</code>), line feed (<code>\\u000A</code>), and carriage return (<code>\\u000D</code>)</p> </li> </ul>"
         },
         "CertificateChain":{
           "shape":"certificateChainType",
-          "documentation":"<p>The contents of the certificate chain. This is typically a concatenation of the PEM-encoded public key certificates of the chain.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> used to validate this parameter is a string of characters consisting of the following:</p> <ul> <li> <p>Any printable ASCII character ranging from the space character (\\u0020) through the end of the ASCII character range</p> </li> <li> <p>The printable characters in the Basic Latin and Latin-1 Supplement character set (through \\u00FF)</p> </li> <li> <p>The special characters tab (\\u0009), line feed (\\u000A), and carriage return (\\u000D)</p> </li> </ul>"
+          "documentation":"<p>The contents of the certificate chain. This is typically a concatenation of the PEM-encoded public key certificates of the chain.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> used to validate this parameter is a string of characters consisting of the following:</p> <ul> <li> <p>Any printable ASCII character ranging from the space character (<code>\\u0020</code>) through the end of the ASCII character range</p> </li> <li> <p>The printable characters in the Basic Latin and Latin-1 Supplement character set (through <code>\\u00FF</code>)</p> </li> <li> <p>The special characters tab (<code>\\u0009</code>), line feed (<code>\\u000A</code>), and carriage return (<code>\\u000D</code>)</p> </li> </ul>"
         }
       }
     },
@@ -7558,7 +7606,7 @@
         },
         "CertificateBody":{
           "shape":"certificateBodyType",
-          "documentation":"<p>The contents of the signing certificate.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> used to validate this parameter is a string of characters consisting of the following:</p> <ul> <li> <p>Any printable ASCII character ranging from the space character (\\u0020) through the end of the ASCII character range</p> </li> <li> <p>The printable characters in the Basic Latin and Latin-1 Supplement character set (through \\u00FF)</p> </li> <li> <p>The special characters tab (\\u0009), line feed (\\u000A), and carriage return (\\u000D)</p> </li> </ul>"
+          "documentation":"<p>The contents of the signing certificate.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> used to validate this parameter is a string of characters consisting of the following:</p> <ul> <li> <p>Any printable ASCII character ranging from the space character (<code>\\u0020</code>) through the end of the ASCII character range</p> </li> <li> <p>The printable characters in the Basic Latin and Latin-1 Supplement character set (through <code>\\u00FF</code>)</p> </li> <li> <p>The special characters tab (<code>\\u0009</code>), line feed (<code>\\u000A</code>), and carriage return (<code>\\u000D</code>)</p> </li> </ul>"
         }
       }
     },
@@ -7585,7 +7633,7 @@
       "members":{
         "Path":{
           "shape":"pathType",
-          "documentation":"<p>The path to the user. For more information about paths, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html\">IAM Identifiers</a> in the <i>Using IAM</i> guide.</p>"
+          "documentation":"<p>The path to the user. For more information about paths, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html\">IAM Identifiers</a> in the <i>IAM User Guide</i>.</p>"
         },
         "UserName":{
           "shape":"userNameType",
@@ -7593,11 +7641,11 @@
         },
         "UserId":{
           "shape":"idType",
-          "documentation":"<p>The stable and unique string identifying the user. For more information about IDs, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html\">IAM Identifiers</a> in the <i>Using IAM</i> guide.</p>"
+          "documentation":"<p>The stable and unique string identifying the user. For more information about IDs, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html\">IAM Identifiers</a> in the <i>IAM User Guide</i>.</p>"
         },
         "Arn":{
           "shape":"arnType",
-          "documentation":"<p>The Amazon Resource Name (ARN) that identifies the user. For more information about ARNs and how to use ARNs in policies, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html\">IAM Identifiers</a> in the <i>Using IAM</i> guide. </p>"
+          "documentation":"<p>The Amazon Resource Name (ARN) that identifies the user. For more information about ARNs and how to use ARNs in policies, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html\">IAM Identifiers</a> in the <i>IAM User Guide</i>. </p>"
         },
         "CreateDate":{
           "shape":"dateType",
@@ -7605,7 +7653,7 @@
         },
         "PasswordLastUsed":{
           "shape":"dateType",
-          "documentation":"<p>The date and time, in <a href=\"http://www.iso.org/iso/iso8601\">ISO 8601 date-time format</a>, when the user's password was last used to sign in to an AWS website. For a list of AWS websites that capture a user's last sign-in time, see the <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/credential-reports.html\">Credential Reports</a> topic in the <i>Using IAM</i> guide. If a password is used more than once in a five-minute span, only the first use is returned in this field. If the field is null (no value), then it indicates that they never signed in with a password. This can be because:</p> <ul> <li> <p>The user never had a password.</p> </li> <li> <p>A password exists but has not been used since IAM started tracking this information on October 20, 2014.</p> </li> </ul> <p>A null value does not mean that the user <i>never</i> had a password. Also, if the user does not currently have a password, but had one in the past, then this field contains the date and time the most recent password was used.</p> <p>This value is returned only in the <a>GetUser</a> and <a>ListUsers</a> operations. </p>"
+          "documentation":"<p>The date and time, in <a href=\"http://www.iso.org/iso/iso8601\">ISO 8601 date-time format</a>, when the user's password was last used to sign in to an AWS website. For a list of AWS websites that capture a user's last sign-in time, see the <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/credential-reports.html\">Credential Reports</a> topic in the <i>IAM User Guide</i>. If a password is used more than once in a five-minute span, only the first use is returned in this field. If the field is null (no value), then it indicates that they never signed in with a password. This can be because:</p> <ul> <li> <p>The user never had a password.</p> </li> <li> <p>A password exists but has not been used since IAM started tracking this information on October 20, 2014.</p> </li> </ul> <p>A null value does not mean that the user <i>never</i> had a password. Also, if the user does not currently have a password but had one in the past, then this field contains the date and time the most recent password was used.</p> <p>This value is returned only in the <a>GetUser</a> and <a>ListUsers</a> operations. </p>"
         },
         "PermissionsBoundary":{
           "shape":"AttachedPermissionsBoundary",
@@ -7623,7 +7671,7 @@
       "members":{
         "Path":{
           "shape":"pathType",
-          "documentation":"<p>The path to the user. For more information about paths, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html\">IAM Identifiers</a> in the <i>Using IAM</i> guide.</p>"
+          "documentation":"<p>The path to the user. For more information about paths, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html\">IAM Identifiers</a> in the <i>IAM User Guide</i>.</p>"
         },
         "UserName":{
           "shape":"userNameType",
@@ -7631,7 +7679,7 @@
         },
         "UserId":{
           "shape":"idType",
-          "documentation":"<p>The stable and unique string identifying the user. For more information about IDs, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html\">IAM Identifiers</a> in the <i>Using IAM</i> guide.</p>"
+          "documentation":"<p>The stable and unique string identifying the user. For more information about IDs, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html\">IAM Identifiers</a> in the <i>IAM User Guide</i>.</p>"
         },
         "Arn":{"shape":"arnType"},
         "CreateDate":{
@@ -8206,7 +8254,7 @@
     },
     "thumbprintType":{
       "type":"string",
-      "documentation":"<p>Contains a thumbprint for an identity provider's server certificate.</p> <p>The identity provider's server certificate thumbprint is the hex-encoded SHA-1 hash value of the self-signed X.509 certificate used by the domain where the OpenID Connect provider makes its keys available. It is always a 40-character string.</p>",
+      "documentation":"<p>Contains a thumbprint for an identity provider's server certificate.</p> <p>The identity provider's server certificate thumbprint is the hex-encoded SHA-1 hash value of the self-signed X.509 certificate. This thumbprint is used by the domain where the OpenID Connect provider makes its keys available. The thumbprint is always a 40-character string.</p>",
       "max":40,
       "min":40
     },
diff --git a/services/iam/src/test/resources/cucumber.properties b/services/iam/src/test/resources/cucumber.properties
index c8e178ac008b..d680b29979f2 100644
--- a/services/iam/src/test/resources/cucumber.properties
+++ b/services/iam/src/test/resources/cucumber.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/iam/src/test/resources/log4j.properties b/services/iam/src/test/resources/log4j.properties
index bc4d27704ba0..c9fbd72edb12 100644
--- a/services/iam/src/test/resources/log4j.properties
+++ b/services/iam/src/test/resources/log4j.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/imagebuilder/pom.xml b/services/imagebuilder/pom.xml
new file mode 100644
index 000000000000..4955aa7bf204
--- /dev/null
+++ b/services/imagebuilder/pom.xml
@@ -0,0 +1,60 @@
+<?xml version="1.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.
+  -->
+
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>software.amazon.awssdk</groupId>
+        <artifactId>services</artifactId>
+        <version>2.11.8-SNAPSHOT</version>
+    </parent>
+    <artifactId>imagebuilder</artifactId>
+    <name>AWS Java SDK :: Services :: Imagebuilder</name>
+    <description>The AWS Java SDK for Imagebuilder module holds the client classes that are used for
+        communicating with Imagebuilder.
+    </description>
+    <url>https://aws.amazon.com/sdkforjava</url>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifestEntries>
+                            <Automatic-Module-Name>software.amazon.awssdk.services.imagebuilder</Automatic-Module-Name>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>protocol-core</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>aws-json-protocol</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/services/imagebuilder/src/main/resources/codegen-resources/paginators-1.json b/services/imagebuilder/src/main/resources/codegen-resources/paginators-1.json
new file mode 100644
index 000000000000..f1aa23df30c9
--- /dev/null
+++ b/services/imagebuilder/src/main/resources/codegen-resources/paginators-1.json
@@ -0,0 +1,49 @@
+{
+  "pagination": {
+    "ListComponentBuildVersions": {
+      "input_token": "nextToken",
+      "output_token": "nextToken",
+      "limit_key": "maxResults"
+    },
+    "ListComponents": {
+      "input_token": "nextToken",
+      "output_token": "nextToken",
+      "limit_key": "maxResults"
+    },
+    "ListDistributionConfigurations": {
+      "input_token": "nextToken",
+      "output_token": "nextToken",
+      "limit_key": "maxResults"
+    },
+    "ListImageBuildVersions": {
+      "input_token": "nextToken",
+      "output_token": "nextToken",
+      "limit_key": "maxResults"
+    },
+    "ListImagePipelineImages": {
+      "input_token": "nextToken",
+      "output_token": "nextToken",
+      "limit_key": "maxResults"
+    },
+    "ListImagePipelines": {
+      "input_token": "nextToken",
+      "output_token": "nextToken",
+      "limit_key": "maxResults"
+    },
+    "ListImageRecipes": {
+      "input_token": "nextToken",
+      "output_token": "nextToken",
+      "limit_key": "maxResults"
+    },
+    "ListImages": {
+      "input_token": "nextToken",
+      "output_token": "nextToken",
+      "limit_key": "maxResults"
+    },
+    "ListInfrastructureConfigurations": {
+      "input_token": "nextToken",
+      "output_token": "nextToken",
+      "limit_key": "maxResults"
+    }
+  }
+}
diff --git a/services/imagebuilder/src/main/resources/codegen-resources/service-2.json b/services/imagebuilder/src/main/resources/codegen-resources/service-2.json
new file mode 100644
index 000000000000..ea6a897302f2
--- /dev/null
+++ b/services/imagebuilder/src/main/resources/codegen-resources/service-2.json
@@ -0,0 +1,3666 @@
+{
+  "version":"2.0",
+  "metadata":{
+    "apiVersion":"2019-12-02",
+    "endpointPrefix":"imagebuilder",
+    "jsonVersion":"1.1",
+    "protocol":"rest-json",
+    "serviceAbbreviation":"imagebuilder",
+    "serviceFullName":"EC2 Image Builder",
+    "serviceId":"imagebuilder",
+    "signatureVersion":"v4",
+    "signingName":"imagebuilder",
+    "uid":"imagebuilder-2019-12-02"
+  },
+  "operations":{
+    "CancelImageCreation":{
+      "name":"CancelImageCreation",
+      "http":{
+        "method":"PUT",
+        "requestUri":"/CancelImageCreation"
+      },
+      "input":{"shape":"CancelImageCreationRequest"},
+      "output":{"shape":"CancelImageCreationResponse"},
+      "errors":[
+        {"shape":"ServiceException"},
+        {"shape":"ClientException"},
+        {"shape":"ServiceUnavailableException"},
+        {"shape":"InvalidRequestException"},
+        {"shape":"IdempotentParameterMismatchException"},
+        {"shape":"ForbiddenException"},
+        {"shape":"CallRateLimitExceededException"},
+        {"shape":"ResourceInUseException"}
+      ],
+      "documentation":"<p>CancelImageCreation cancels the creation of Image. This operation can only be used on images in a non-terminal state.</p>"
+    },
+    "CreateComponent":{
+      "name":"CreateComponent",
+      "http":{
+        "method":"PUT",
+        "requestUri":"/CreateComponent"
+      },
+      "input":{"shape":"CreateComponentRequest"},
+      "output":{"shape":"CreateComponentResponse"},
+      "errors":[
+        {"shape":"ServiceException"},
+        {"shape":"ClientException"},
+        {"shape":"ServiceUnavailableException"},
+        {"shape":"InvalidRequestException"},
+        {"shape":"IdempotentParameterMismatchException"},
+        {"shape":"ForbiddenException"},
+        {"shape":"CallRateLimitExceededException"},
+        {"shape":"InvalidVersionNumberException"},
+        {"shape":"ResourceInUseException"},
+        {"shape":"InvalidParameterCombinationException"}
+      ],
+      "documentation":"<p>Creates a new component that can be used to build, validate, test, and assess your image.</p>"
+    },
+    "CreateDistributionConfiguration":{
+      "name":"CreateDistributionConfiguration",
+      "http":{
+        "method":"PUT",
+        "requestUri":"/CreateDistributionConfiguration"
+      },
+      "input":{"shape":"CreateDistributionConfigurationRequest"},
+      "output":{"shape":"CreateDistributionConfigurationResponse"},
+      "errors":[
+        {"shape":"ServiceException"},
+        {"shape":"ClientException"},
+        {"shape":"ServiceUnavailableException"},
+        {"shape":"InvalidRequestException"},
+        {"shape":"IdempotentParameterMismatchException"},
+        {"shape":"ForbiddenException"},
+        {"shape":"CallRateLimitExceededException"},
+        {"shape":"ResourceInUseException"},
+        {"shape":"ResourceAlreadyExistsException"},
+        {"shape":"InvalidParameterCombinationException"}
+      ],
+      "documentation":"<p>Creates a new distribution configuration. Distribution configurations define and configure the outputs of your pipeline. </p>"
+    },
+    "CreateImage":{
+      "name":"CreateImage",
+      "http":{
+        "method":"PUT",
+        "requestUri":"/CreateImage"
+      },
+      "input":{"shape":"CreateImageRequest"},
+      "output":{"shape":"CreateImageResponse"},
+      "errors":[
+        {"shape":"ServiceException"},
+        {"shape":"ClientException"},
+        {"shape":"ServiceUnavailableException"},
+        {"shape":"InvalidRequestException"},
+        {"shape":"IdempotentParameterMismatchException"},
+        {"shape":"ForbiddenException"},
+        {"shape":"CallRateLimitExceededException"},
+        {"shape":"ResourceInUseException"}
+      ],
+      "documentation":"<p> Creates a new image. This request will create a new image along with all of the configured output resources defined in the distribution configuration. </p>"
+    },
+    "CreateImagePipeline":{
+      "name":"CreateImagePipeline",
+      "http":{
+        "method":"PUT",
+        "requestUri":"/CreateImagePipeline"
+      },
+      "input":{"shape":"CreateImagePipelineRequest"},
+      "output":{"shape":"CreateImagePipelineResponse"},
+      "errors":[
+        {"shape":"ServiceException"},
+        {"shape":"ClientException"},
+        {"shape":"ServiceUnavailableException"},
+        {"shape":"InvalidRequestException"},
+        {"shape":"IdempotentParameterMismatchException"},
+        {"shape":"ForbiddenException"},
+        {"shape":"CallRateLimitExceededException"},
+        {"shape":"ResourceInUseException"},
+        {"shape":"ResourceAlreadyExistsException"}
+      ],
+      "documentation":"<p> Creates a new image pipeline. Image pipelines enable you to automate the creation and distribution of images. </p>"
+    },
+    "CreateImageRecipe":{
+      "name":"CreateImageRecipe",
+      "http":{
+        "method":"PUT",
+        "requestUri":"/CreateImageRecipe"
+      },
+      "input":{"shape":"CreateImageRecipeRequest"},
+      "output":{"shape":"CreateImageRecipeResponse"},
+      "errors":[
+        {"shape":"ServiceException"},
+        {"shape":"ClientException"},
+        {"shape":"ServiceUnavailableException"},
+        {"shape":"InvalidRequestException"},
+        {"shape":"IdempotentParameterMismatchException"},
+        {"shape":"ForbiddenException"},
+        {"shape":"CallRateLimitExceededException"},
+        {"shape":"InvalidVersionNumberException"},
+        {"shape":"ResourceInUseException"},
+        {"shape":"ResourceAlreadyExistsException"}
+      ],
+      "documentation":"<p> Creates a new image recipe. Image recipes define how images are configured, tested, and assessed. </p>"
+    },
+    "CreateInfrastructureConfiguration":{
+      "name":"CreateInfrastructureConfiguration",
+      "http":{
+        "method":"PUT",
+        "requestUri":"/CreateInfrastructureConfiguration"
+      },
+      "input":{"shape":"CreateInfrastructureConfigurationRequest"},
+      "output":{"shape":"CreateInfrastructureConfigurationResponse"},
+      "errors":[
+        {"shape":"ServiceException"},
+        {"shape":"ClientException"},
+        {"shape":"ServiceUnavailableException"},
+        {"shape":"InvalidRequestException"},
+        {"shape":"IdempotentParameterMismatchException"},
+        {"shape":"ForbiddenException"},
+        {"shape":"CallRateLimitExceededException"},
+        {"shape":"ResourceInUseException"},
+        {"shape":"ResourceAlreadyExistsException"}
+      ],
+      "documentation":"<p> Creates a new infrastructure configuration. An infrastructure configuration defines the environment in which your image will be built and tested. </p>"
+    },
+    "DeleteComponent":{
+      "name":"DeleteComponent",
+      "http":{
+        "method":"DELETE",
+        "requestUri":"/DeleteComponent"
+      },
+      "input":{"shape":"DeleteComponentRequest"},
+      "output":{"shape":"DeleteComponentResponse"},
+      "errors":[
+        {"shape":"ServiceException"},
+        {"shape":"ClientException"},
+        {"shape":"ServiceUnavailableException"},
+        {"shape":"InvalidRequestException"},
+        {"shape":"ForbiddenException"},
+        {"shape":"CallRateLimitExceededException"},
+        {"shape":"ResourceDependencyException"}
+      ],
+      "documentation":"<p> Deletes a component build version. </p>"
+    },
+    "DeleteDistributionConfiguration":{
+      "name":"DeleteDistributionConfiguration",
+      "http":{
+        "method":"DELETE",
+        "requestUri":"/DeleteDistributionConfiguration"
+      },
+      "input":{"shape":"DeleteDistributionConfigurationRequest"},
+      "output":{"shape":"DeleteDistributionConfigurationResponse"},
+      "errors":[
+        {"shape":"ServiceException"},
+        {"shape":"ClientException"},
+        {"shape":"InvalidRequestException"},
+        {"shape":"ServiceUnavailableException"},
+        {"shape":"ForbiddenException"},
+        {"shape":"CallRateLimitExceededException"},
+        {"shape":"ResourceDependencyException"}
+      ],
+      "documentation":"<p> Deletes a distribution configuration. </p>"
+    },
+    "DeleteImage":{
+      "name":"DeleteImage",
+      "http":{
+        "method":"DELETE",
+        "requestUri":"/DeleteImage"
+      },
+      "input":{"shape":"DeleteImageRequest"},
+      "output":{"shape":"DeleteImageResponse"},
+      "errors":[
+        {"shape":"ServiceException"},
+        {"shape":"ClientException"},
+        {"shape":"InvalidRequestException"},
+        {"shape":"ServiceUnavailableException"},
+        {"shape":"ForbiddenException"},
+        {"shape":"CallRateLimitExceededException"},
+        {"shape":"ResourceDependencyException"}
+      ],
+      "documentation":"<p> Deletes an image. </p>"
+    },
+    "DeleteImagePipeline":{
+      "name":"DeleteImagePipeline",
+      "http":{
+        "method":"DELETE",
+        "requestUri":"/DeleteImagePipeline"
+      },
+      "input":{"shape":"DeleteImagePipelineRequest"},
+      "output":{"shape":"DeleteImagePipelineResponse"},
+      "errors":[
+        {"shape":"ServiceException"},
+        {"shape":"ClientException"},
+        {"shape":"ServiceUnavailableException"},
+        {"shape":"InvalidRequestException"},
+        {"shape":"ForbiddenException"},
+        {"shape":"CallRateLimitExceededException"},
+        {"shape":"ResourceDependencyException"}
+      ],
+      "documentation":"<p> Deletes an image pipeline. </p>"
+    },
+    "DeleteImageRecipe":{
+      "name":"DeleteImageRecipe",
+      "http":{
+        "method":"DELETE",
+        "requestUri":"/DeleteImageRecipe"
+      },
+      "input":{"shape":"DeleteImageRecipeRequest"},
+      "output":{"shape":"DeleteImageRecipeResponse"},
+      "errors":[
+        {"shape":"ServiceException"},
+        {"shape":"ClientException"},
+        {"shape":"ServiceUnavailableException"},
+        {"shape":"InvalidRequestException"},
+        {"shape":"ForbiddenException"},
+        {"shape":"CallRateLimitExceededException"},
+        {"shape":"ResourceDependencyException"}
+      ],
+      "documentation":"<p> Deletes an image recipe. </p>"
+    },
+    "DeleteInfrastructureConfiguration":{
+      "name":"DeleteInfrastructureConfiguration",
+      "http":{
+        "method":"DELETE",
+        "requestUri":"/DeleteInfrastructureConfiguration"
+      },
+      "input":{"shape":"DeleteInfrastructureConfigurationRequest"},
+      "output":{"shape":"DeleteInfrastructureConfigurationResponse"},
+      "errors":[
+        {"shape":"ServiceException"},
+        {"shape":"ClientException"},
+        {"shape":"ServiceUnavailableException"},
+        {"shape":"InvalidRequestException"},
+        {"shape":"ForbiddenException"},
+        {"shape":"CallRateLimitExceededException"},
+        {"shape":"ResourceDependencyException"}
+      ],
+      "documentation":"<p> Deletes an infrastructure configuration. </p>"
+    },
+    "GetComponent":{
+      "name":"GetComponent",
+      "http":{
+        "method":"GET",
+        "requestUri":"/GetComponent"
+      },
+      "input":{"shape":"GetComponentRequest"},
+      "output":{"shape":"GetComponentResponse"},
+      "errors":[
+        {"shape":"ServiceException"},
+        {"shape":"ClientException"},
+        {"shape":"ServiceUnavailableException"},
+        {"shape":"InvalidRequestException"},
+        {"shape":"ForbiddenException"},
+        {"shape":"CallRateLimitExceededException"}
+      ],
+      "documentation":"<p> Gets a component object. </p>"
+    },
+    "GetComponentPolicy":{
+      "name":"GetComponentPolicy",
+      "http":{
+        "method":"GET",
+        "requestUri":"/GetComponentPolicy"
+      },
+      "input":{"shape":"GetComponentPolicyRequest"},
+      "output":{"shape":"GetComponentPolicyResponse"},
+      "errors":[
+        {"shape":"ServiceException"},
+        {"shape":"ServiceUnavailableException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InvalidRequestException"},
+        {"shape":"ForbiddenException"},
+        {"shape":"CallRateLimitExceededException"}
+      ],
+      "documentation":"<p> Gets a component policy. </p>"
+    },
+    "GetDistributionConfiguration":{
+      "name":"GetDistributionConfiguration",
+      "http":{
+        "method":"GET",
+        "requestUri":"/GetDistributionConfiguration"
+      },
+      "input":{"shape":"GetDistributionConfigurationRequest"},
+      "output":{"shape":"GetDistributionConfigurationResponse"},
+      "errors":[
+        {"shape":"ServiceException"},
+        {"shape":"ClientException"},
+        {"shape":"ServiceUnavailableException"},
+        {"shape":"InvalidRequestException"},
+        {"shape":"ForbiddenException"},
+        {"shape":"CallRateLimitExceededException"}
+      ],
+      "documentation":"<p> Gets a distribution configuration. </p>"
+    },
+    "GetImage":{
+      "name":"GetImage",
+      "http":{
+        "method":"GET",
+        "requestUri":"/GetImage"
+      },
+      "input":{"shape":"GetImageRequest"},
+      "output":{"shape":"GetImageResponse"},
+      "errors":[
+        {"shape":"ServiceException"},
+        {"shape":"ClientException"},
+        {"shape":"ServiceUnavailableException"},
+        {"shape":"InvalidRequestException"},
+        {"shape":"ForbiddenException"},
+        {"shape":"CallRateLimitExceededException"}
+      ],
+      "documentation":"<p> Gets an image. </p>"
+    },
+    "GetImagePipeline":{
+      "name":"GetImagePipeline",
+      "http":{
+        "method":"GET",
+        "requestUri":"/GetImagePipeline"
+      },
+      "input":{"shape":"GetImagePipelineRequest"},
+      "output":{"shape":"GetImagePipelineResponse"},
+      "errors":[
+        {"shape":"ServiceException"},
+        {"shape":"ClientException"},
+        {"shape":"ServiceUnavailableException"},
+        {"shape":"InvalidRequestException"},
+        {"shape":"ForbiddenException"},
+        {"shape":"CallRateLimitExceededException"}
+      ],
+      "documentation":"<p> Gets an image pipeline. </p>"
+    },
+    "GetImagePolicy":{
+      "name":"GetImagePolicy",
+      "http":{
+        "method":"GET",
+        "requestUri":"/GetImagePolicy"
+      },
+      "input":{"shape":"GetImagePolicyRequest"},
+      "output":{"shape":"GetImagePolicyResponse"},
+      "errors":[
+        {"shape":"ServiceException"},
+        {"shape":"ServiceUnavailableException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InvalidRequestException"},
+        {"shape":"ForbiddenException"},
+        {"shape":"CallRateLimitExceededException"}
+      ],
+      "documentation":"<p> Gets an image policy. </p>"
+    },
+    "GetImageRecipe":{
+      "name":"GetImageRecipe",
+      "http":{
+        "method":"GET",
+        "requestUri":"/GetImageRecipe"
+      },
+      "input":{"shape":"GetImageRecipeRequest"},
+      "output":{"shape":"GetImageRecipeResponse"},
+      "errors":[
+        {"shape":"ServiceException"},
+        {"shape":"ClientException"},
+        {"shape":"ServiceUnavailableException"},
+        {"shape":"InvalidRequestException"},
+        {"shape":"ForbiddenException"},
+        {"shape":"CallRateLimitExceededException"}
+      ],
+      "documentation":"<p> Gets an image recipe. </p>"
+    },
+    "GetImageRecipePolicy":{
+      "name":"GetImageRecipePolicy",
+      "http":{
+        "method":"GET",
+        "requestUri":"/GetImageRecipePolicy"
+      },
+      "input":{"shape":"GetImageRecipePolicyRequest"},
+      "output":{"shape":"GetImageRecipePolicyResponse"},
+      "errors":[
+        {"shape":"ServiceException"},
+        {"shape":"ServiceUnavailableException"},
+        {"shape":"InvalidRequestException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ForbiddenException"},
+        {"shape":"CallRateLimitExceededException"}
+      ],
+      "documentation":"<p> Gets an image recipe policy. </p>"
+    },
+    "GetInfrastructureConfiguration":{
+      "name":"GetInfrastructureConfiguration",
+      "http":{
+        "method":"GET",
+        "requestUri":"/GetInfrastructureConfiguration"
+      },
+      "input":{"shape":"GetInfrastructureConfigurationRequest"},
+      "output":{"shape":"GetInfrastructureConfigurationResponse"},
+      "errors":[
+        {"shape":"ServiceException"},
+        {"shape":"ClientException"},
+        {"shape":"ServiceUnavailableException"},
+        {"shape":"InvalidRequestException"},
+        {"shape":"ForbiddenException"},
+        {"shape":"CallRateLimitExceededException"}
+      ],
+      "documentation":"<p> Gets an infrastructure configuration. </p>"
+    },
+    "ImportComponent":{
+      "name":"ImportComponent",
+      "http":{
+        "method":"PUT",
+        "requestUri":"/ImportComponent"
+      },
+      "input":{"shape":"ImportComponentRequest"},
+      "output":{"shape":"ImportComponentResponse"},
+      "errors":[
+        {"shape":"ServiceException"},
+        {"shape":"ClientException"},
+        {"shape":"ServiceUnavailableException"},
+        {"shape":"InvalidRequestException"},
+        {"shape":"IdempotentParameterMismatchException"},
+        {"shape":"ForbiddenException"},
+        {"shape":"CallRateLimitExceededException"},
+        {"shape":"InvalidVersionNumberException"},
+        {"shape":"ResourceInUseException"},
+        {"shape":"InvalidParameterCombinationException"}
+      ],
+      "documentation":"<p>Imports a component and transforms its data into a component document. </p>"
+    },
+    "ListComponentBuildVersions":{
+      "name":"ListComponentBuildVersions",
+      "http":{
+        "method":"POST",
+        "requestUri":"/ListComponentBuildVersions"
+      },
+      "input":{"shape":"ListComponentBuildVersionsRequest"},
+      "output":{"shape":"ListComponentBuildVersionsResponse"},
+      "errors":[
+        {"shape":"ServiceException"},
+        {"shape":"ClientException"},
+        {"shape":"ServiceUnavailableException"},
+        {"shape":"InvalidRequestException"},
+        {"shape":"InvalidPaginationTokenException"},
+        {"shape":"ForbiddenException"},
+        {"shape":"CallRateLimitExceededException"}
+      ],
+      "documentation":"<p> Returns the list of component build versions for the specified semantic version. </p>"
+    },
+    "ListComponents":{
+      "name":"ListComponents",
+      "http":{
+        "method":"POST",
+        "requestUri":"/ListComponents"
+      },
+      "input":{"shape":"ListComponentsRequest"},
+      "output":{"shape":"ListComponentsResponse"},
+      "errors":[
+        {"shape":"ServiceException"},
+        {"shape":"ClientException"},
+        {"shape":"ServiceUnavailableException"},
+        {"shape":"InvalidRequestException"},
+        {"shape":"InvalidPaginationTokenException"},
+        {"shape":"ForbiddenException"},
+        {"shape":"CallRateLimitExceededException"}
+      ],
+      "documentation":"<p>Returns the list of component build versions for the specified semantic version. </p>"
+    },
+    "ListDistributionConfigurations":{
+      "name":"ListDistributionConfigurations",
+      "http":{
+        "method":"POST",
+        "requestUri":"/ListDistributionConfigurations"
+      },
+      "input":{"shape":"ListDistributionConfigurationsRequest"},
+      "output":{"shape":"ListDistributionConfigurationsResponse"},
+      "errors":[
+        {"shape":"ServiceException"},
+        {"shape":"ClientException"},
+        {"shape":"ServiceUnavailableException"},
+        {"shape":"InvalidRequestException"},
+        {"shape":"InvalidPaginationTokenException"},
+        {"shape":"ForbiddenException"},
+        {"shape":"CallRateLimitExceededException"}
+      ],
+      "documentation":"<p> Returns a list of distribution configurations. </p>"
+    },
+    "ListImageBuildVersions":{
+      "name":"ListImageBuildVersions",
+      "http":{
+        "method":"POST",
+        "requestUri":"/ListImageBuildVersions"
+      },
+      "input":{"shape":"ListImageBuildVersionsRequest"},
+      "output":{"shape":"ListImageBuildVersionsResponse"},
+      "errors":[
+        {"shape":"ServiceException"},
+        {"shape":"ClientException"},
+        {"shape":"ServiceUnavailableException"},
+        {"shape":"InvalidRequestException"},
+        {"shape":"InvalidPaginationTokenException"},
+        {"shape":"ForbiddenException"},
+        {"shape":"CallRateLimitExceededException"}
+      ],
+      "documentation":"<p> Returns a list of distribution configurations. </p>"
+    },
+    "ListImagePipelineImages":{
+      "name":"ListImagePipelineImages",
+      "http":{
+        "method":"POST",
+        "requestUri":"/ListImagePipelineImages"
+      },
+      "input":{"shape":"ListImagePipelineImagesRequest"},
+      "output":{"shape":"ListImagePipelineImagesResponse"},
+      "errors":[
+        {"shape":"ServiceException"},
+        {"shape":"ClientException"},
+        {"shape":"ServiceUnavailableException"},
+        {"shape":"InvalidRequestException"},
+        {"shape":"InvalidPaginationTokenException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ForbiddenException"},
+        {"shape":"CallRateLimitExceededException"}
+      ],
+      "documentation":"<p> Returns a list of images created by the specified pipeline. </p>"
+    },
+    "ListImagePipelines":{
+      "name":"ListImagePipelines",
+      "http":{
+        "method":"POST",
+        "requestUri":"/ListImagePipelines"
+      },
+      "input":{"shape":"ListImagePipelinesRequest"},
+      "output":{"shape":"ListImagePipelinesResponse"},
+      "errors":[
+        {"shape":"ServiceException"},
+        {"shape":"ClientException"},
+        {"shape":"ServiceUnavailableException"},
+        {"shape":"InvalidRequestException"},
+        {"shape":"InvalidPaginationTokenException"},
+        {"shape":"ForbiddenException"},
+        {"shape":"CallRateLimitExceededException"}
+      ],
+      "documentation":"<p>Returns a list of image pipelines. </p>"
+    },
+    "ListImageRecipes":{
+      "name":"ListImageRecipes",
+      "http":{
+        "method":"POST",
+        "requestUri":"/ListImageRecipes"
+      },
+      "input":{"shape":"ListImageRecipesRequest"},
+      "output":{"shape":"ListImageRecipesResponse"},
+      "errors":[
+        {"shape":"ServiceException"},
+        {"shape":"ClientException"},
+        {"shape":"ServiceUnavailableException"},
+        {"shape":"InvalidRequestException"},
+        {"shape":"InvalidPaginationTokenException"},
+        {"shape":"ForbiddenException"},
+        {"shape":"CallRateLimitExceededException"}
+      ],
+      "documentation":"<p> Returns a list of image recipes. </p>"
+    },
+    "ListImages":{
+      "name":"ListImages",
+      "http":{
+        "method":"POST",
+        "requestUri":"/ListImages"
+      },
+      "input":{"shape":"ListImagesRequest"},
+      "output":{"shape":"ListImagesResponse"},
+      "errors":[
+        {"shape":"ServiceException"},
+        {"shape":"ClientException"},
+        {"shape":"ServiceUnavailableException"},
+        {"shape":"InvalidRequestException"},
+        {"shape":"InvalidPaginationTokenException"},
+        {"shape":"ForbiddenException"},
+        {"shape":"CallRateLimitExceededException"}
+      ],
+      "documentation":"<p> Returns the list of image build versions for the specified semantic version. </p>"
+    },
+    "ListInfrastructureConfigurations":{
+      "name":"ListInfrastructureConfigurations",
+      "http":{
+        "method":"POST",
+        "requestUri":"/ListInfrastructureConfigurations"
+      },
+      "input":{"shape":"ListInfrastructureConfigurationsRequest"},
+      "output":{"shape":"ListInfrastructureConfigurationsResponse"},
+      "errors":[
+        {"shape":"ServiceException"},
+        {"shape":"ClientException"},
+        {"shape":"ServiceUnavailableException"},
+        {"shape":"InvalidRequestException"},
+        {"shape":"InvalidPaginationTokenException"},
+        {"shape":"ForbiddenException"},
+        {"shape":"CallRateLimitExceededException"}
+      ],
+      "documentation":"<p> Returns a list of infrastructure configurations. </p>"
+    },
+    "ListTagsForResource":{
+      "name":"ListTagsForResource",
+      "http":{
+        "method":"GET",
+        "requestUri":"/tags/{resourceArn}"
+      },
+      "input":{"shape":"ListTagsForResourceRequest"},
+      "output":{"shape":"ListTagsForResourceResponse"},
+      "errors":[
+        {"shape":"ServiceException"},
+        {"shape":"InvalidParameterException"},
+        {"shape":"ResourceNotFoundException"}
+      ],
+      "documentation":"<p> Returns the list of tags for the specified resource. </p>"
+    },
+    "PutComponentPolicy":{
+      "name":"PutComponentPolicy",
+      "http":{
+        "method":"PUT",
+        "requestUri":"/PutComponentPolicy"
+      },
+      "input":{"shape":"PutComponentPolicyRequest"},
+      "output":{"shape":"PutComponentPolicyResponse"},
+      "errors":[
+        {"shape":"ServiceException"},
+        {"shape":"ClientException"},
+        {"shape":"ServiceUnavailableException"},
+        {"shape":"InvalidRequestException"},
+        {"shape":"InvalidParameterValueException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ForbiddenException"},
+        {"shape":"CallRateLimitExceededException"}
+      ],
+      "documentation":"<p> Applies a policy to a component. </p>"
+    },
+    "PutImagePolicy":{
+      "name":"PutImagePolicy",
+      "http":{
+        "method":"PUT",
+        "requestUri":"/PutImagePolicy"
+      },
+      "input":{"shape":"PutImagePolicyRequest"},
+      "output":{"shape":"PutImagePolicyResponse"},
+      "errors":[
+        {"shape":"ServiceException"},
+        {"shape":"ClientException"},
+        {"shape":"ServiceUnavailableException"},
+        {"shape":"InvalidRequestException"},
+        {"shape":"InvalidParameterValueException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ForbiddenException"},
+        {"shape":"CallRateLimitExceededException"}
+      ],
+      "documentation":"<p> Applies a policy to an image. </p>"
+    },
+    "PutImageRecipePolicy":{
+      "name":"PutImageRecipePolicy",
+      "http":{
+        "method":"PUT",
+        "requestUri":"/PutImageRecipePolicy"
+      },
+      "input":{"shape":"PutImageRecipePolicyRequest"},
+      "output":{"shape":"PutImageRecipePolicyResponse"},
+      "errors":[
+        {"shape":"ServiceException"},
+        {"shape":"ClientException"},
+        {"shape":"ServiceUnavailableException"},
+        {"shape":"InvalidRequestException"},
+        {"shape":"InvalidParameterValueException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ForbiddenException"},
+        {"shape":"CallRateLimitExceededException"}
+      ],
+      "documentation":"<p> Applies a policy to an image recipe. </p>"
+    },
+    "StartImagePipelineExecution":{
+      "name":"StartImagePipelineExecution",
+      "http":{
+        "method":"PUT",
+        "requestUri":"/StartImagePipelineExecution"
+      },
+      "input":{"shape":"StartImagePipelineExecutionRequest"},
+      "output":{"shape":"StartImagePipelineExecutionResponse"},
+      "errors":[
+        {"shape":"ServiceException"},
+        {"shape":"ClientException"},
+        {"shape":"ServiceUnavailableException"},
+        {"shape":"InvalidRequestException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"IdempotentParameterMismatchException"},
+        {"shape":"ForbiddenException"},
+        {"shape":"CallRateLimitExceededException"},
+        {"shape":"ResourceInUseException"}
+      ],
+      "documentation":"<p> Manually triggers a pipeline to create an image. </p>"
+    },
+    "TagResource":{
+      "name":"TagResource",
+      "http":{
+        "method":"POST",
+        "requestUri":"/tags/{resourceArn}"
+      },
+      "input":{"shape":"TagResourceRequest"},
+      "output":{"shape":"TagResourceResponse"},
+      "errors":[
+        {"shape":"ServiceException"},
+        {"shape":"InvalidParameterException"},
+        {"shape":"ResourceNotFoundException"}
+      ],
+      "documentation":"<p> Adds a tag to a resource. </p>"
+    },
+    "UntagResource":{
+      "name":"UntagResource",
+      "http":{
+        "method":"DELETE",
+        "requestUri":"/tags/{resourceArn}"
+      },
+      "input":{"shape":"UntagResourceRequest"},
+      "output":{"shape":"UntagResourceResponse"},
+      "errors":[
+        {"shape":"ServiceException"},
+        {"shape":"InvalidParameterException"},
+        {"shape":"ResourceNotFoundException"}
+      ],
+      "documentation":"<p> Removes a tag from a resource. </p>"
+    },
+    "UpdateDistributionConfiguration":{
+      "name":"UpdateDistributionConfiguration",
+      "http":{
+        "method":"PUT",
+        "requestUri":"/UpdateDistributionConfiguration"
+      },
+      "input":{"shape":"UpdateDistributionConfigurationRequest"},
+      "output":{"shape":"UpdateDistributionConfigurationResponse"},
+      "errors":[
+        {"shape":"ServiceException"},
+        {"shape":"ClientException"},
+        {"shape":"ServiceUnavailableException"},
+        {"shape":"InvalidRequestException"},
+        {"shape":"IdempotentParameterMismatchException"},
+        {"shape":"ForbiddenException"},
+        {"shape":"CallRateLimitExceededException"},
+        {"shape":"ResourceInUseException"},
+        {"shape":"InvalidParameterCombinationException"}
+      ],
+      "documentation":"<p> Updates a new distribution configuration. Distribution configurations define and configure the outputs of your pipeline. </p>"
+    },
+    "UpdateImagePipeline":{
+      "name":"UpdateImagePipeline",
+      "http":{
+        "method":"PUT",
+        "requestUri":"/UpdateImagePipeline"
+      },
+      "input":{"shape":"UpdateImagePipelineRequest"},
+      "output":{"shape":"UpdateImagePipelineResponse"},
+      "errors":[
+        {"shape":"ServiceException"},
+        {"shape":"ClientException"},
+        {"shape":"ServiceUnavailableException"},
+        {"shape":"InvalidRequestException"},
+        {"shape":"IdempotentParameterMismatchException"},
+        {"shape":"ForbiddenException"},
+        {"shape":"CallRateLimitExceededException"},
+        {"shape":"ResourceInUseException"}
+      ],
+      "documentation":"<p> Updates a new image pipeline. Image pipelines enable you to automate the creation and distribution of images. </p>"
+    },
+    "UpdateInfrastructureConfiguration":{
+      "name":"UpdateInfrastructureConfiguration",
+      "http":{
+        "method":"PUT",
+        "requestUri":"/UpdateInfrastructureConfiguration"
+      },
+      "input":{"shape":"UpdateInfrastructureConfigurationRequest"},
+      "output":{"shape":"UpdateInfrastructureConfigurationResponse"},
+      "errors":[
+        {"shape":"ServiceException"},
+        {"shape":"ClientException"},
+        {"shape":"ServiceUnavailableException"},
+        {"shape":"InvalidRequestException"},
+        {"shape":"IdempotentParameterMismatchException"},
+        {"shape":"ForbiddenException"},
+        {"shape":"CallRateLimitExceededException"},
+        {"shape":"ResourceInUseException"}
+      ],
+      "documentation":"<p> Updates a new infrastructure configuration. An infrastructure configuration defines the environment in which your image will be built and tested. </p>"
+    }
+  },
+  "shapes":{
+    "AccountList":{
+      "type":"list",
+      "member":{"shape":"NonEmptyString"}
+    },
+    "Ami":{
+      "type":"structure",
+      "members":{
+        "region":{
+          "shape":"NonEmptyString",
+          "documentation":"<p> The AWS Region of the EC2 AMI. </p>"
+        },
+        "image":{
+          "shape":"NonEmptyString",
+          "documentation":"<p> The AMI ID of the EC2 AMI. </p>"
+        },
+        "name":{
+          "shape":"NonEmptyString",
+          "documentation":"<p> The name of the EC2 AMI. </p>"
+        },
+        "description":{
+          "shape":"NonEmptyString",
+          "documentation":"<p> The description of the EC2 AMI. </p>"
+        },
+        "state":{"shape":"ImageState"}
+      },
+      "documentation":"<p> Details of an EC2 AMI. </p>"
+    },
+    "AmiDistributionConfiguration":{
+      "type":"structure",
+      "members":{
+        "name":{
+          "shape":"AmiNameString",
+          "documentation":"<p> The name of the distribution configuration. </p>"
+        },
+        "description":{
+          "shape":"NonEmptyString",
+          "documentation":"<p> The description of the distribution configuration. </p>"
+        },
+        "amiTags":{
+          "shape":"TagMap",
+          "documentation":"<p> The tags to apply to AMIs distributed to this Region. </p>"
+        },
+        "launchPermission":{
+          "shape":"LaunchPermissionConfiguration",
+          "documentation":"<p> Launch permissions can be used to configure which AWS accounts can use the AMI to launch instances. </p>"
+        }
+      },
+      "documentation":"<p> Define and configure the output AMIs of the pipeline. </p>"
+    },
+    "AmiList":{
+      "type":"list",
+      "member":{"shape":"Ami"}
+    },
+    "AmiNameString":{
+      "type":"string",
+      "max":127,
+      "min":1,
+      "pattern":"^[-_A-Za-z0-9{][-_A-Za-z0-9\\s:{}]+[-_A-Za-z0-9}]$"
+    },
+    "Arn":{"type":"string"},
+    "ArnList":{
+      "type":"list",
+      "member":{"shape":"Arn"}
+    },
+    "CallRateLimitExceededException":{
+      "type":"structure",
+      "members":{
+        "message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p>You have exceeded the permitted request rate for the specific operation.</p>",
+      "error":{"httpStatusCode":429},
+      "exception":true
+    },
+    "CancelImageCreationRequest":{
+      "type":"structure",
+      "required":[
+        "imageBuildVersionArn",
+        "clientToken"
+      ],
+      "members":{
+        "imageBuildVersionArn":{
+          "shape":"ImageBuildVersionArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the image whose creation you want to cancel.</p>"
+        },
+        "clientToken":{
+          "shape":"ClientToken",
+          "documentation":"<p>The idempotency token used to make this request idempotent.</p>",
+          "idempotencyToken":true
+        }
+      }
+    },
+    "CancelImageCreationResponse":{
+      "type":"structure",
+      "members":{
+        "requestId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The request ID that uniquely identifies this request.</p>"
+        },
+        "clientToken":{
+          "shape":"ClientToken",
+          "documentation":"<p>The idempotency token used to make this request idempotent.</p>"
+        },
+        "imageBuildVersionArn":{
+          "shape":"ImageBuildVersionArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the image whose creation has been cancelled.</p>"
+        }
+      }
+    },
+    "ClientException":{
+      "type":"structure",
+      "members":{
+        "message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p>These errors are usually caused by a client action, such as using an action or resource on behalf of a user that doesn't have permissions to use the action or resource, or specifying an invalid resource identifier.</p>",
+      "error":{"httpStatusCode":400},
+      "exception":true
+    },
+    "ClientToken":{
+      "type":"string",
+      "max":36,
+      "min":1
+    },
+    "Component":{
+      "type":"structure",
+      "members":{
+        "arn":{
+          "shape":"ImageBuilderArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the component.</p>"
+        },
+        "name":{
+          "shape":"ResourceName",
+          "documentation":"<p>The name of the component.</p>"
+        },
+        "version":{
+          "shape":"VersionNumber",
+          "documentation":"<p>The version of the component.</p>"
+        },
+        "description":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The description of the component.</p>"
+        },
+        "changeDescription":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The change description of the component.</p>"
+        },
+        "type":{
+          "shape":"ComponentType",
+          "documentation":"<p>The type of the component denotes whether the component is used to build the image or only to test it.</p>"
+        },
+        "platform":{
+          "shape":"Platform",
+          "documentation":"<p>The platform of the component.</p>"
+        },
+        "owner":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The owner of the component.</p>"
+        },
+        "data":{
+          "shape":"ComponentData",
+          "documentation":"<p>The data of the component.</p>"
+        },
+        "kmsKeyId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The KMS key identifier used to encrypt the component.</p>"
+        },
+        "encrypted":{
+          "shape":"NullableBoolean",
+          "documentation":"<p>The encryption status of the component.</p>"
+        },
+        "dateCreated":{
+          "shape":"DateTime",
+          "documentation":"<p>The date that the component was created.</p>"
+        },
+        "tags":{
+          "shape":"TagMap",
+          "documentation":"<p>The tags associated with the component.</p>"
+        }
+      },
+      "documentation":"<p>A detailed view of a component.</p>"
+    },
+    "ComponentBuildVersionArn":{
+      "type":"string",
+      "pattern":"^arn:aws[^:]*:imagebuilder:[^:]+:(?:\\d{12}|aws):component/[a-z0-9-_]+/\\d+\\.\\d+\\.\\d+/\\d+$"
+    },
+    "ComponentConfiguration":{
+      "type":"structure",
+      "required":["componentArn"],
+      "members":{
+        "componentArn":{
+          "shape":"ComponentVersionArnOrBuildVersionArn",
+          "documentation":"<p> The Amazon Resource Name (ARN) of the component. </p>"
+        }
+      },
+      "documentation":"<p> Configuration details of the component. </p>"
+    },
+    "ComponentConfigurationList":{
+      "type":"list",
+      "member":{"shape":"ComponentConfiguration"},
+      "min":1
+    },
+    "ComponentData":{"type":"string"},
+    "ComponentFormat":{
+      "type":"string",
+      "enum":["SHELL"]
+    },
+    "ComponentSummary":{
+      "type":"structure",
+      "members":{
+        "arn":{
+          "shape":"ImageBuilderArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the component.</p>"
+        },
+        "name":{
+          "shape":"ResourceName",
+          "documentation":"<p>The name of the component.</p>"
+        },
+        "version":{
+          "shape":"VersionNumber",
+          "documentation":"<p>The version of the component.</p>"
+        },
+        "platform":{
+          "shape":"Platform",
+          "documentation":"<p>The platform of the component.</p>"
+        },
+        "type":{
+          "shape":"ComponentType",
+          "documentation":"<p>The type of the component denotes whether the component is used to build the image or only to test it.</p>"
+        },
+        "owner":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The owner of the component.</p>"
+        },
+        "description":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The description of the component.</p>"
+        },
+        "changeDescription":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The change description of the component.</p>"
+        },
+        "dateCreated":{
+          "shape":"DateTime",
+          "documentation":"<p>The date that the component was created.</p>"
+        },
+        "tags":{
+          "shape":"TagMap",
+          "documentation":"<p>The tags associated with the component.</p>"
+        }
+      },
+      "documentation":"<p>A high-level summary of a component.</p>"
+    },
+    "ComponentSummaryList":{
+      "type":"list",
+      "member":{"shape":"ComponentSummary"}
+    },
+    "ComponentType":{
+      "type":"string",
+      "enum":[
+        "BUILD",
+        "TEST"
+      ]
+    },
+    "ComponentVersion":{
+      "type":"structure",
+      "members":{
+        "arn":{
+          "shape":"ImageBuilderArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the component.</p>"
+        },
+        "name":{
+          "shape":"ResourceName",
+          "documentation":"<p>The name of the component.</p>"
+        },
+        "version":{
+          "shape":"VersionNumber",
+          "documentation":"<p>The semantic version of the component.</p>"
+        },
+        "description":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The description of the component.</p>"
+        },
+        "platform":{
+          "shape":"Platform",
+          "documentation":"<p>The platform of the component.</p>"
+        },
+        "type":{
+          "shape":"ComponentType",
+          "documentation":"<p>The type of the component denotes whether the component is used to build the image or only to test it.</p>"
+        },
+        "owner":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The owner of the component.</p>"
+        },
+        "dateCreated":{
+          "shape":"DateTime",
+          "documentation":"<p>The date that the component was created.</p>"
+        }
+      },
+      "documentation":"<p>A high-level overview of a component semantic version.</p>"
+    },
+    "ComponentVersionArn":{
+      "type":"string",
+      "pattern":"^arn:aws[^:]*:imagebuilder:[^:]+:(?:\\d{12}|aws):component/[a-z0-9-_]+/\\d+\\.\\d+\\.\\d+$"
+    },
+    "ComponentVersionArnOrBuildVersionArn":{
+      "type":"string",
+      "pattern":"^arn:aws[^:]*:imagebuilder:[^:]+:(?:\\d{12}|aws):component/[a-z0-9-_]+/(?:(?:(\\d+|x)\\.(\\d+|x)\\.(\\d+|x))|(?:\\d+\\.\\d+\\.\\d+/\\d+))$"
+    },
+    "ComponentVersionList":{
+      "type":"list",
+      "member":{"shape":"ComponentVersion"}
+    },
+    "CreateComponentRequest":{
+      "type":"structure",
+      "required":[
+        "name",
+        "semanticVersion",
+        "platform",
+        "clientToken"
+      ],
+      "members":{
+        "name":{
+          "shape":"ResourceName",
+          "documentation":"<p>The name of the component.</p>"
+        },
+        "semanticVersion":{
+          "shape":"VersionNumber",
+          "documentation":"<p>The semantic version of the component. This version follows the semantic version syntax. For example, major.minor.patch. This could be versioned like software (2.0.1) or like a date (2019.12.01).</p>"
+        },
+        "description":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The description of the component. Describes the contents of the component.</p>"
+        },
+        "changeDescription":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The change description of the component. Describes what change has been made in this version, or what makes this version different from other versions of this component.</p>"
+        },
+        "platform":{
+          "shape":"Platform",
+          "documentation":"<p>The platform of the component.</p>"
+        },
+        "data":{
+          "shape":"InlineComponentData",
+          "documentation":"<p>The data of the component. Used to specify the data inline. Either <code>data</code> or <code>uri</code> can be used to specify the data within the component.</p>"
+        },
+        "uri":{
+          "shape":"Uri",
+          "documentation":"<p>The uri of the component. Must be an S3 URL and the requester must have permission to access the S3 bucket. If you use S3, you can specify component content up to your service quota. Either <code>data</code> or <code>uri</code> can be used to specify the data within the component.</p>"
+        },
+        "kmsKeyId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The ID of the KMS key that should be used to encrypt this component.</p>"
+        },
+        "tags":{
+          "shape":"TagMap",
+          "documentation":"<p>The tags of the component.</p>"
+        },
+        "clientToken":{
+          "shape":"ClientToken",
+          "documentation":"<p>The idempotency token of the component.</p>",
+          "idempotencyToken":true
+        }
+      }
+    },
+    "CreateComponentResponse":{
+      "type":"structure",
+      "members":{
+        "requestId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The request ID that uniquely identifies this request.</p>"
+        },
+        "clientToken":{
+          "shape":"ClientToken",
+          "documentation":"<p>The idempotency token used to make this request idempotent.</p>"
+        },
+        "componentBuildVersionArn":{
+          "shape":"ComponentBuildVersionArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the component that was created by this request.</p>"
+        }
+      }
+    },
+    "CreateDistributionConfigurationRequest":{
+      "type":"structure",
+      "required":[
+        "name",
+        "distributions",
+        "clientToken"
+      ],
+      "members":{
+        "name":{
+          "shape":"ResourceName",
+          "documentation":"<p> The name of the distribution configuration. </p>"
+        },
+        "description":{
+          "shape":"NonEmptyString",
+          "documentation":"<p> The description of the distribution configuration. </p>"
+        },
+        "distributions":{
+          "shape":"DistributionList",
+          "documentation":"<p> The distributions of the distribution configuration. </p>"
+        },
+        "tags":{
+          "shape":"TagMap",
+          "documentation":"<p> The tags of the distribution configuration. </p>"
+        },
+        "clientToken":{
+          "shape":"ClientToken",
+          "documentation":"<p> The idempotency token of the distribution configuration. </p>",
+          "idempotencyToken":true
+        }
+      }
+    },
+    "CreateDistributionConfigurationResponse":{
+      "type":"structure",
+      "members":{
+        "requestId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p> The request ID that uniquely identifies this request. </p>"
+        },
+        "clientToken":{
+          "shape":"ClientToken",
+          "documentation":"<p> The idempotency token used to make this request idempotent. </p>"
+        },
+        "distributionConfigurationArn":{
+          "shape":"DistributionConfigurationArn",
+          "documentation":"<p> The Amazon Resource Name (ARN) of the distribution configuration that was created by this request. </p>"
+        }
+      }
+    },
+    "CreateImagePipelineRequest":{
+      "type":"structure",
+      "required":[
+        "name",
+        "imageRecipeArn",
+        "infrastructureConfigurationArn",
+        "clientToken"
+      ],
+      "members":{
+        "name":{
+          "shape":"ResourceName",
+          "documentation":"<p> The name of the image pipeline. </p>"
+        },
+        "description":{
+          "shape":"NonEmptyString",
+          "documentation":"<p> The description of the image pipeline. </p>"
+        },
+        "imageRecipeArn":{
+          "shape":"ImageRecipeArn",
+          "documentation":"<p> The Amazon Resource Name (ARN) of the image recipe that will be used to configure images created by this image pipeline. </p>"
+        },
+        "infrastructureConfigurationArn":{
+          "shape":"InfrastructureConfigurationArn",
+          "documentation":"<p> The Amazon Resource Name (ARN) of the infrastructure configuration that will be used to build images created by this image pipeline. </p>"
+        },
+        "distributionConfigurationArn":{
+          "shape":"DistributionConfigurationArn",
+          "documentation":"<p> The Amazon Resource Name (ARN) of the distribution configuration that will be used to configure and distribute images created by this image pipeline. </p>"
+        },
+        "imageTestsConfiguration":{
+          "shape":"ImageTestsConfiguration",
+          "documentation":"<p> The image test configuration of the image pipeline. </p>"
+        },
+        "schedule":{
+          "shape":"Schedule",
+          "documentation":"<p> The schedule of the image pipeline. </p>"
+        },
+        "status":{
+          "shape":"PipelineStatus",
+          "documentation":"<p> The status of the image pipeline. </p>"
+        },
+        "tags":{
+          "shape":"TagMap",
+          "documentation":"<p> The tags of the image pipeline. </p>"
+        },
+        "clientToken":{
+          "shape":"ClientToken",
+          "documentation":"<p> The idempotency token used to make this request idempotent. </p>",
+          "idempotencyToken":true
+        }
+      }
+    },
+    "CreateImagePipelineResponse":{
+      "type":"structure",
+      "members":{
+        "requestId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p> The request ID that uniquely identifies this request. </p>"
+        },
+        "clientToken":{
+          "shape":"ClientToken",
+          "documentation":"<p> The idempotency token used to make this request idempotent. </p>"
+        },
+        "imagePipelineArn":{
+          "shape":"ImagePipelineArn",
+          "documentation":"<p> The Amazon Resource Name (ARN) of the image pipeline that was created by this request. </p>"
+        }
+      }
+    },
+    "CreateImageRecipeRequest":{
+      "type":"structure",
+      "required":[
+        "name",
+        "semanticVersion",
+        "components",
+        "parentImage",
+        "clientToken"
+      ],
+      "members":{
+        "name":{
+          "shape":"ResourceName",
+          "documentation":"<p> The name of the image recipe. </p>"
+        },
+        "description":{
+          "shape":"NonEmptyString",
+          "documentation":"<p> The description of the image recipe. </p>"
+        },
+        "semanticVersion":{
+          "shape":"VersionNumber",
+          "documentation":"<p> The semantic version of the image recipe. </p>"
+        },
+        "components":{
+          "shape":"ComponentConfigurationList",
+          "documentation":"<p> The components of the image recipe. </p>"
+        },
+        "parentImage":{
+          "shape":"NonEmptyString",
+          "documentation":"<p> The parent image of the image recipe. </p>"
+        },
+        "blockDeviceMappings":{
+          "shape":"InstanceBlockDeviceMappings",
+          "documentation":"<p> The block device mappings of the image recipe. </p>"
+        },
+        "tags":{
+          "shape":"TagMap",
+          "documentation":"<p> The tags of the image recipe. </p>"
+        },
+        "clientToken":{
+          "shape":"ClientToken",
+          "documentation":"<p> The idempotency token used to make this request idempotent. </p>",
+          "idempotencyToken":true
+        }
+      }
+    },
+    "CreateImageRecipeResponse":{
+      "type":"structure",
+      "members":{
+        "requestId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p> The request ID that uniquely identifies this request. </p>"
+        },
+        "clientToken":{
+          "shape":"ClientToken",
+          "documentation":"<p> The idempotency token used to make this request idempotent. </p>"
+        },
+        "imageRecipeArn":{
+          "shape":"ImageRecipeArn",
+          "documentation":"<p> The Amazon Resource Name (ARN) of the image recipe that was created by this request. </p>"
+        }
+      }
+    },
+    "CreateImageRequest":{
+      "type":"structure",
+      "required":[
+        "imageRecipeArn",
+        "infrastructureConfigurationArn",
+        "clientToken"
+      ],
+      "members":{
+        "imageRecipeArn":{
+          "shape":"ImageRecipeArn",
+          "documentation":"<p> The Amazon Resource Name (ARN) of the image recipe that defines how images are configured, tested, and assessed. </p>"
+        },
+        "distributionConfigurationArn":{
+          "shape":"DistributionConfigurationArn",
+          "documentation":"<p> The Amazon Resource Name (ARN) of the distribution configuration that defines and configures the outputs of your pipeline. </p>"
+        },
+        "infrastructureConfigurationArn":{
+          "shape":"InfrastructureConfigurationArn",
+          "documentation":"<p> The Amazon Resource Name (ARN) of the infrastructure configuration that defines the environment in which your image will be built and tested. </p>"
+        },
+        "imageTestsConfiguration":{
+          "shape":"ImageTestsConfiguration",
+          "documentation":"<p> The image tests configuration of the image. </p>"
+        },
+        "tags":{
+          "shape":"TagMap",
+          "documentation":"<p> The tags of the image. </p>"
+        },
+        "clientToken":{
+          "shape":"ClientToken",
+          "documentation":"<p> The idempotency token used to make this request idempotent. </p>",
+          "idempotencyToken":true
+        }
+      }
+    },
+    "CreateImageResponse":{
+      "type":"structure",
+      "members":{
+        "requestId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p> The request ID that uniquely identifies this request. </p>"
+        },
+        "clientToken":{
+          "shape":"ClientToken",
+          "documentation":"<p> The idempotency token used to make this request idempotent. </p>"
+        },
+        "imageBuildVersionArn":{
+          "shape":"ImageBuildVersionArn",
+          "documentation":"<p> The Amazon Resource Name (ARN) of the image that was created by this request. </p>"
+        }
+      }
+    },
+    "CreateInfrastructureConfigurationRequest":{
+      "type":"structure",
+      "required":[
+        "name",
+        "instanceProfileName",
+        "clientToken"
+      ],
+      "members":{
+        "name":{
+          "shape":"ResourceName",
+          "documentation":"<p> The name of the infrastructure configuration. </p>"
+        },
+        "description":{
+          "shape":"NonEmptyString",
+          "documentation":"<p> The description of the infrastructure configuration. </p>"
+        },
+        "instanceTypes":{
+          "shape":"InstanceTypeList",
+          "documentation":"<p> The instance types of the infrastructure configuration. You can specify one or more instance types to use for this build. The service will pick one of these instance types based on availability. </p>"
+        },
+        "instanceProfileName":{
+          "shape":"NonEmptyString",
+          "documentation":"<p> The instance profile to associate with the instance used to customize your EC2 AMI. </p>"
+        },
+        "securityGroupIds":{
+          "shape":"SecurityGroupIds",
+          "documentation":"<p> The security group IDs to associate with the instance used to customize your EC2 AMI. </p>"
+        },
+        "subnetId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p> The subnet ID in which to place the instance used to customize your EC2 AMI. </p>"
+        },
+        "logging":{
+          "shape":"Logging",
+          "documentation":"<p> The logging configuration of the infrastructure configuration. </p>"
+        },
+        "keyPair":{
+          "shape":"NonEmptyString",
+          "documentation":"<p> The key pair of the infrastructure configuration. This can be used to log on to and debug the instance used to create your image. </p>"
+        },
+        "terminateInstanceOnFailure":{
+          "shape":"NullableBoolean",
+          "documentation":"<p> The terminate instance on failure setting of the infrastructure configuration. Set to false if you want Image Builder to retain the instance used to configure your AMI if the build or test phase of your workflow fails. </p>"
+        },
+        "snsTopicArn":{
+          "shape":"SnsTopicArn",
+          "documentation":"<p> The SNS topic on which to send image build events. </p>"
+        },
+        "tags":{
+          "shape":"TagMap",
+          "documentation":"<p> The tags of the infrastructure configuration. </p>"
+        },
+        "clientToken":{
+          "shape":"ClientToken",
+          "documentation":"<p> The idempotency token used to make this request idempotent. </p>",
+          "idempotencyToken":true
+        }
+      }
+    },
+    "CreateInfrastructureConfigurationResponse":{
+      "type":"structure",
+      "members":{
+        "requestId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p> The request ID that uniquely identifies this request. </p>"
+        },
+        "clientToken":{
+          "shape":"ClientToken",
+          "documentation":"<p> The idempotency token used to make this request idempotent. </p>"
+        },
+        "infrastructureConfigurationArn":{
+          "shape":"InfrastructureConfigurationArn",
+          "documentation":"<p> The Amazon Resource Name (ARN) of the infrastructure configuration that was created by this request. </p>"
+        }
+      }
+    },
+    "DateTime":{"type":"string"},
+    "DeleteComponentRequest":{
+      "type":"structure",
+      "required":["componentBuildVersionArn"],
+      "members":{
+        "componentBuildVersionArn":{
+          "shape":"ComponentBuildVersionArn",
+          "documentation":"<p> The Amazon Resource Name (ARN) of the component build version to delete. </p>",
+          "location":"querystring",
+          "locationName":"componentBuildVersionArn"
+        }
+      }
+    },
+    "DeleteComponentResponse":{
+      "type":"structure",
+      "members":{
+        "requestId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p> The request ID that uniquely identifies this request. </p>"
+        },
+        "componentBuildVersionArn":{
+          "shape":"ComponentBuildVersionArn",
+          "documentation":"<p> The Amazon Resource Name (ARN) of the component build version that was deleted. </p>"
+        }
+      }
+    },
+    "DeleteDistributionConfigurationRequest":{
+      "type":"structure",
+      "required":["distributionConfigurationArn"],
+      "members":{
+        "distributionConfigurationArn":{
+          "shape":"DistributionConfigurationArn",
+          "documentation":"<p> The Amazon Resource Name (ARN) of the distribution configuration to delete. </p>",
+          "location":"querystring",
+          "locationName":"distributionConfigurationArn"
+        }
+      }
+    },
+    "DeleteDistributionConfigurationResponse":{
+      "type":"structure",
+      "members":{
+        "requestId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p> The request ID that uniquely identifies this request. </p>"
+        },
+        "distributionConfigurationArn":{
+          "shape":"DistributionConfigurationArn",
+          "documentation":"<p> The Amazon Resource Name (ARN) of the distribution configuration that was deleted. </p>"
+        }
+      }
+    },
+    "DeleteImagePipelineRequest":{
+      "type":"structure",
+      "required":["imagePipelineArn"],
+      "members":{
+        "imagePipelineArn":{
+          "shape":"ImagePipelineArn",
+          "documentation":"<p> The Amazon Resource Name (ARN) of the image pipeline to delete. </p>",
+          "location":"querystring",
+          "locationName":"imagePipelineArn"
+        }
+      }
+    },
+    "DeleteImagePipelineResponse":{
+      "type":"structure",
+      "members":{
+        "requestId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p> The request ID that uniquely identifies this request. </p>"
+        },
+        "imagePipelineArn":{
+          "shape":"ImagePipelineArn",
+          "documentation":"<p> The Amazon Resource Name (ARN) of the image pipeline that was deleted. </p>"
+        }
+      }
+    },
+    "DeleteImageRecipeRequest":{
+      "type":"structure",
+      "required":["imageRecipeArn"],
+      "members":{
+        "imageRecipeArn":{
+          "shape":"ImageRecipeArn",
+          "documentation":"<p> The Amazon Resource Name (ARN) of the image recipe to delete. </p>",
+          "location":"querystring",
+          "locationName":"imageRecipeArn"
+        }
+      }
+    },
+    "DeleteImageRecipeResponse":{
+      "type":"structure",
+      "members":{
+        "requestId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p> The request ID that uniquely identifies this request. </p>"
+        },
+        "imageRecipeArn":{
+          "shape":"ImageRecipeArn",
+          "documentation":"<p> The Amazon Resource Name (ARN) of the image recipe that was deleted. </p>"
+        }
+      }
+    },
+    "DeleteImageRequest":{
+      "type":"structure",
+      "required":["imageBuildVersionArn"],
+      "members":{
+        "imageBuildVersionArn":{
+          "shape":"ImageBuildVersionArn",
+          "documentation":"<p> The Amazon Resource Name (ARN) of the image to delete. </p>",
+          "location":"querystring",
+          "locationName":"imageBuildVersionArn"
+        }
+      }
+    },
+    "DeleteImageResponse":{
+      "type":"structure",
+      "members":{
+        "requestId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p> The request ID that uniquely identifies this request. </p>"
+        },
+        "imageBuildVersionArn":{
+          "shape":"ImageBuildVersionArn",
+          "documentation":"<p> The Amazon Resource Name (ARN) of the image that was deleted. </p>"
+        }
+      }
+    },
+    "DeleteInfrastructureConfigurationRequest":{
+      "type":"structure",
+      "required":["infrastructureConfigurationArn"],
+      "members":{
+        "infrastructureConfigurationArn":{
+          "shape":"InfrastructureConfigurationArn",
+          "documentation":"<p> The Amazon Resource Name (ARN) of the infrastructure configuration to delete. </p>",
+          "location":"querystring",
+          "locationName":"infrastructureConfigurationArn"
+        }
+      }
+    },
+    "DeleteInfrastructureConfigurationResponse":{
+      "type":"structure",
+      "members":{
+        "requestId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p> The request ID that uniquely identifies this request. </p>"
+        },
+        "infrastructureConfigurationArn":{
+          "shape":"InfrastructureConfigurationArn",
+          "documentation":"<p> The Amazon Resource Name (ARN) of the infrastructure configuration that was deleted. </p>"
+        }
+      }
+    },
+    "Distribution":{
+      "type":"structure",
+      "required":["region"],
+      "members":{
+        "region":{
+          "shape":"NonEmptyString",
+          "documentation":"<p> The target Region. </p>"
+        },
+        "amiDistributionConfiguration":{
+          "shape":"AmiDistributionConfiguration",
+          "documentation":"<p> The specific AMI settings (for example, launch permissions, AMI tags). </p>"
+        },
+        "licenseConfigurationArns":{
+          "shape":"ArnList",
+          "documentation":"<p> The License Manager Configuration to associate with the AMI in the specified Region.</p>"
+        }
+      },
+      "documentation":"<p> Defines the settings for a specific Region. </p>"
+    },
+    "DistributionConfiguration":{
+      "type":"structure",
+      "required":["timeoutMinutes"],
+      "members":{
+        "arn":{
+          "shape":"ImageBuilderArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the distribution configuration.</p>"
+        },
+        "name":{
+          "shape":"ResourceName",
+          "documentation":"<p>The name of the distribution configuration.</p>"
+        },
+        "description":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The description of the distribution configuration.</p>"
+        },
+        "distributions":{
+          "shape":"DistributionList",
+          "documentation":"<p>The distributions of the distribution configuration.</p>"
+        },
+        "timeoutMinutes":{
+          "shape":"DistributionTimeoutMinutes",
+          "documentation":"<p>The maximum duration in minutes for this distribution configuration.</p>"
+        },
+        "dateCreated":{
+          "shape":"DateTime",
+          "documentation":"<p>The date on which this distribution configuration was created.</p>"
+        },
+        "dateUpdated":{
+          "shape":"DateTime",
+          "documentation":"<p>The date on which this distribution configuration was last updated.</p>"
+        },
+        "tags":{
+          "shape":"TagMap",
+          "documentation":"<p>The tags of the distribution configuration.</p>"
+        }
+      },
+      "documentation":"<p>A distribution configuration.</p>"
+    },
+    "DistributionConfigurationArn":{
+      "type":"string",
+      "pattern":"^arn:aws[^:]*:imagebuilder:[^:]+:(?:\\d{12}|aws):distribution-configuration/[a-z0-9-_]+$"
+    },
+    "DistributionConfigurationSummary":{
+      "type":"structure",
+      "members":{
+        "arn":{
+          "shape":"ImageBuilderArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the distribution configuration.</p>"
+        },
+        "name":{
+          "shape":"ResourceName",
+          "documentation":"<p>The name of the distribution configuration.</p>"
+        },
+        "description":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The description of the distribution configuration.</p>"
+        },
+        "dateCreated":{
+          "shape":"DateTime",
+          "documentation":"<p>The date on which the distribution configuration was created.</p>"
+        },
+        "dateUpdated":{
+          "shape":"DateTime",
+          "documentation":"<p>The date on which the distribution configuration was updated.</p>"
+        },
+        "tags":{
+          "shape":"TagMap",
+          "documentation":"<p>The tags associated with the distribution configuration.</p>"
+        }
+      },
+      "documentation":"<p>A high-level overview of a distribution configuration.</p>"
+    },
+    "DistributionConfigurationSummaryList":{
+      "type":"list",
+      "member":{"shape":"DistributionConfigurationSummary"}
+    },
+    "DistributionList":{
+      "type":"list",
+      "member":{"shape":"Distribution"}
+    },
+    "DistributionTimeoutMinutes":{
+      "type":"integer",
+      "max":720,
+      "min":30
+    },
+    "EbsInstanceBlockDeviceSpecification":{
+      "type":"structure",
+      "members":{
+        "encrypted":{
+          "shape":"NullableBoolean",
+          "documentation":"<p>Use to configure device encryption.</p>"
+        },
+        "deleteOnTermination":{
+          "shape":"NullableBoolean",
+          "documentation":"<p>Use to configure delete on termination of the associated device.</p>"
+        },
+        "iops":{
+          "shape":"EbsIopsInteger",
+          "documentation":"<p>Use to configure device IOPS.</p>"
+        },
+        "kmsKeyId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>Use to configure the KMS key to use when encrypting the device.</p>"
+        },
+        "snapshotId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The snapshot that defines the device contents.</p>"
+        },
+        "volumeSize":{
+          "shape":"EbsVolumeSizeInteger",
+          "documentation":"<p>Use to override the device's volume size.</p>"
+        },
+        "volumeType":{
+          "shape":"EbsVolumeType",
+          "documentation":"<p>Use to override the device's volume type.</p>"
+        }
+      },
+      "documentation":"<p>Amazon EBS-specific block device mapping specifications.</p>"
+    },
+    "EbsIopsInteger":{
+      "type":"integer",
+      "max":10000,
+      "min":100
+    },
+    "EbsVolumeSizeInteger":{
+      "type":"integer",
+      "max":16000,
+      "min":1
+    },
+    "EbsVolumeType":{
+      "type":"string",
+      "enum":[
+        "standard",
+        "io1",
+        "gp2",
+        "sc1",
+        "st1"
+      ]
+    },
+    "EmptyString":{
+      "type":"string",
+      "max":0,
+      "min":0
+    },
+    "ErrorMessage":{"type":"string"},
+    "Filter":{
+      "type":"structure",
+      "members":{
+        "name":{
+          "shape":"FilterName",
+          "documentation":"<p> The name of the filter. Filter names are case-sensitive. </p>"
+        },
+        "values":{
+          "shape":"FilterValues",
+          "documentation":"<p> The filter values. Filter values are case-sensitive. </p>"
+        }
+      },
+      "documentation":"<p> A filter name and value pair that is used to return a more specific list of results from a list operation. Filters can be used to match a set of resources by specific criteria, such as tags, attributes, or IDs. </p>"
+    },
+    "FilterList":{
+      "type":"list",
+      "member":{"shape":"Filter"},
+      "max":10,
+      "min":1
+    },
+    "FilterName":{
+      "type":"string",
+      "pattern":"^[a-zA-Z]{1,1024}$"
+    },
+    "FilterValue":{
+      "type":"string",
+      "pattern":"^[0-9a-zA-Z./_ :-]{1,1024}$"
+    },
+    "FilterValues":{
+      "type":"list",
+      "member":{"shape":"FilterValue"},
+      "max":10,
+      "min":1
+    },
+    "ForbiddenException":{
+      "type":"structure",
+      "members":{
+        "message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p>You are not authorized to perform the requested operation.</p>",
+      "error":{"httpStatusCode":403},
+      "exception":true
+    },
+    "GetComponentPolicyRequest":{
+      "type":"structure",
+      "required":["componentArn"],
+      "members":{
+        "componentArn":{
+          "shape":"ComponentBuildVersionArn",
+          "documentation":"<p> The Amazon Resource Name (ARN) of the component whose policy you want to retrieve. </p>",
+          "location":"querystring",
+          "locationName":"componentArn"
+        }
+      }
+    },
+    "GetComponentPolicyResponse":{
+      "type":"structure",
+      "members":{
+        "requestId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p> The request ID that uniquely identifies this request. </p>"
+        },
+        "policy":{
+          "shape":"ResourcePolicyDocument",
+          "documentation":"<p> The component policy. </p>"
+        }
+      }
+    },
+    "GetComponentRequest":{
+      "type":"structure",
+      "required":["componentBuildVersionArn"],
+      "members":{
+        "componentBuildVersionArn":{
+          "shape":"ComponentBuildVersionArn",
+          "documentation":"<p> The Amazon Resource Name (ARN) of the component that you want to retrieve. Regex requires \"/\\d+$\" suffix.</p>",
+          "location":"querystring",
+          "locationName":"componentBuildVersionArn"
+        }
+      }
+    },
+    "GetComponentResponse":{
+      "type":"structure",
+      "members":{
+        "requestId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p> The request ID that uniquely identifies this request. </p>"
+        },
+        "component":{
+          "shape":"Component",
+          "documentation":"<p> The component object associated with the specified ARN. </p>"
+        }
+      }
+    },
+    "GetDistributionConfigurationRequest":{
+      "type":"structure",
+      "required":["distributionConfigurationArn"],
+      "members":{
+        "distributionConfigurationArn":{
+          "shape":"DistributionConfigurationArn",
+          "documentation":"<p> The Amazon Resource Name (ARN) of the distribution configuration that you want to retrieve. </p>",
+          "location":"querystring",
+          "locationName":"distributionConfigurationArn"
+        }
+      }
+    },
+    "GetDistributionConfigurationResponse":{
+      "type":"structure",
+      "members":{
+        "requestId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p> The request ID that uniquely identifies this request. </p>"
+        },
+        "distributionConfiguration":{
+          "shape":"DistributionConfiguration",
+          "documentation":"<p> The distribution configuration object. </p>"
+        }
+      }
+    },
+    "GetImagePipelineRequest":{
+      "type":"structure",
+      "required":["imagePipelineArn"],
+      "members":{
+        "imagePipelineArn":{
+          "shape":"ImagePipelineArn",
+          "documentation":"<p> The Amazon Resource Name (ARN) of the image pipeline that you want to retrieve. </p>",
+          "location":"querystring",
+          "locationName":"imagePipelineArn"
+        }
+      }
+    },
+    "GetImagePipelineResponse":{
+      "type":"structure",
+      "members":{
+        "requestId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p> The request ID that uniquely identifies this request. </p>"
+        },
+        "imagePipeline":{
+          "shape":"ImagePipeline",
+          "documentation":"<p> The image pipeline object. </p>"
+        }
+      }
+    },
+    "GetImagePolicyRequest":{
+      "type":"structure",
+      "required":["imageArn"],
+      "members":{
+        "imageArn":{
+          "shape":"ImageBuildVersionArn",
+          "documentation":"<p> The Amazon Resource Name (ARN) of the image whose policy you want to retrieve. </p>",
+          "location":"querystring",
+          "locationName":"imageArn"
+        }
+      }
+    },
+    "GetImagePolicyResponse":{
+      "type":"structure",
+      "members":{
+        "requestId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p> The request ID that uniquely identifies this request. </p>"
+        },
+        "policy":{
+          "shape":"ResourcePolicyDocument",
+          "documentation":"<p> The image policy object. </p>"
+        }
+      }
+    },
+    "GetImageRecipePolicyRequest":{
+      "type":"structure",
+      "required":["imageRecipeArn"],
+      "members":{
+        "imageRecipeArn":{
+          "shape":"ImageRecipeArn",
+          "documentation":"<p> The Amazon Resource Name (ARN) of the image recipe whose policy you want to retrieve. </p>",
+          "location":"querystring",
+          "locationName":"imageRecipeArn"
+        }
+      }
+    },
+    "GetImageRecipePolicyResponse":{
+      "type":"structure",
+      "members":{
+        "requestId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p> The request ID that uniquely identifies this request. </p>"
+        },
+        "policy":{
+          "shape":"ResourcePolicyDocument",
+          "documentation":"<p> The image recipe policy object. </p>"
+        }
+      }
+    },
+    "GetImageRecipeRequest":{
+      "type":"structure",
+      "required":["imageRecipeArn"],
+      "members":{
+        "imageRecipeArn":{
+          "shape":"ImageRecipeArn",
+          "documentation":"<p> The Amazon Resource Name (ARN) of the image recipe that you want to retrieve. </p>",
+          "location":"querystring",
+          "locationName":"imageRecipeArn"
+        }
+      }
+    },
+    "GetImageRecipeResponse":{
+      "type":"structure",
+      "members":{
+        "requestId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p> The request ID that uniquely identifies this request. </p>"
+        },
+        "imageRecipe":{
+          "shape":"ImageRecipe",
+          "documentation":"<p> The image recipe object. </p>"
+        }
+      }
+    },
+    "GetImageRequest":{
+      "type":"structure",
+      "required":["imageBuildVersionArn"],
+      "members":{
+        "imageBuildVersionArn":{
+          "shape":"ImageBuildVersionArn",
+          "documentation":"<p> The Amazon Resource Name (ARN) of the image that you want to retrieve. </p>",
+          "location":"querystring",
+          "locationName":"imageBuildVersionArn"
+        }
+      }
+    },
+    "GetImageResponse":{
+      "type":"structure",
+      "members":{
+        "requestId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p> The request ID that uniquely identifies this request. </p>"
+        },
+        "image":{
+          "shape":"Image",
+          "documentation":"<p> The image object. </p>"
+        }
+      }
+    },
+    "GetInfrastructureConfigurationRequest":{
+      "type":"structure",
+      "required":["infrastructureConfigurationArn"],
+      "members":{
+        "infrastructureConfigurationArn":{
+          "shape":"InfrastructureConfigurationArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the infrastructure configuration that you want to retrieve. </p>",
+          "location":"querystring",
+          "locationName":"infrastructureConfigurationArn"
+        }
+      },
+      "documentation":"<p> GetInfrastructureConfiguration request object. </p>"
+    },
+    "GetInfrastructureConfigurationResponse":{
+      "type":"structure",
+      "members":{
+        "requestId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p> The request ID that uniquely identifies this request. </p>"
+        },
+        "infrastructureConfiguration":{
+          "shape":"InfrastructureConfiguration",
+          "documentation":"<p> The infrastructure configuration object. </p>"
+        }
+      },
+      "documentation":"<p>GetInfrastructureConfiguration response object. </p>"
+    },
+    "IdempotentParameterMismatchException":{
+      "type":"structure",
+      "members":{
+        "message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p>You have specified a client token for an operation using parameter values that differ from a previous request that used the same client token.</p>",
+      "error":{"httpStatusCode":400},
+      "exception":true
+    },
+    "Image":{
+      "type":"structure",
+      "members":{
+        "arn":{
+          "shape":"ImageBuilderArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the image.</p>"
+        },
+        "name":{
+          "shape":"ResourceName",
+          "documentation":"<p>The name of the image.</p>"
+        },
+        "version":{
+          "shape":"VersionNumber",
+          "documentation":"<p>The semantic version of the image.</p>"
+        },
+        "platform":{
+          "shape":"Platform",
+          "documentation":"<p>The platform of the image.</p>"
+        },
+        "state":{
+          "shape":"ImageState",
+          "documentation":"<p>The state of the image.</p>"
+        },
+        "imageRecipe":{
+          "shape":"ImageRecipe",
+          "documentation":"<p>The image recipe used when creating the image.</p>"
+        },
+        "sourcePipelineName":{
+          "shape":"ResourceName",
+          "documentation":"<p>The name of the image pipeline that created this image.</p>"
+        },
+        "sourcePipelineArn":{
+          "shape":"Arn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the image pipeline that created this image.</p>"
+        },
+        "infrastructureConfiguration":{
+          "shape":"InfrastructureConfiguration",
+          "documentation":"<p> The infrastructure used when creating this image.</p>"
+        },
+        "distributionConfiguration":{
+          "shape":"DistributionConfiguration",
+          "documentation":"<p>The distribution configuration used when creating this image.</p>"
+        },
+        "imageTestsConfiguration":{
+          "shape":"ImageTestsConfiguration",
+          "documentation":"<p>The image tests configuration used when creating this image.</p>"
+        },
+        "dateCreated":{
+          "shape":"DateTime",
+          "documentation":"<p>The date on which this image was created.</p>"
+        },
+        "outputResources":{
+          "shape":"OutputResources",
+          "documentation":"<p>The output resources produced when creating this image.</p>"
+        },
+        "tags":{
+          "shape":"TagMap",
+          "documentation":"<p>The tags of the image.</p>"
+        }
+      },
+      "documentation":"<p>An image build version.</p>"
+    },
+    "ImageBuildVersionArn":{
+      "type":"string",
+      "pattern":"^arn:aws[^:]*:imagebuilder:[^:]+:(?:\\d{12}|aws):image/[a-z0-9-_]+/\\d+\\.\\d+\\.\\d+/\\d+$"
+    },
+    "ImageBuilderArn":{
+      "type":"string",
+      "pattern":"^arn:aws[^:]*:imagebuilder:[^:]+:(?:\\d{12}|aws):(?:image-recipe|infrastructure-configuration|distribution-configuration|component|image|image-pipeline)/[a-z0-9-_]+(?:/(?:(?:x|\\d+)\\.(?:x|\\d+)\\.(?:x|\\d+))(?:/\\d+)?)?$"
+    },
+    "ImagePipeline":{
+      "type":"structure",
+      "members":{
+        "arn":{
+          "shape":"ImageBuilderArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the image pipeline.</p>"
+        },
+        "name":{
+          "shape":"ResourceName",
+          "documentation":"<p>The name of the image pipeline.</p>"
+        },
+        "description":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The description of the image pipeline.</p>"
+        },
+        "platform":{
+          "shape":"Platform",
+          "documentation":"<p>The platform of the image pipeline.</p>"
+        },
+        "imageRecipeArn":{
+          "shape":"Arn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the image recipe associated with this image pipeline.</p>"
+        },
+        "infrastructureConfigurationArn":{
+          "shape":"Arn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the infrastructure configuration associated with this image pipeline.</p>"
+        },
+        "distributionConfigurationArn":{
+          "shape":"Arn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the distribution configuration associated with this image pipeline.</p>"
+        },
+        "imageTestsConfiguration":{
+          "shape":"ImageTestsConfiguration",
+          "documentation":"<p>The image tests configuration of the image pipeline.</p>"
+        },
+        "schedule":{
+          "shape":"Schedule",
+          "documentation":"<p>The schedule of the image pipeline.</p>"
+        },
+        "status":{
+          "shape":"PipelineStatus",
+          "documentation":"<p>The status of the image pipeline.</p>"
+        },
+        "dateCreated":{
+          "shape":"DateTime",
+          "documentation":"<p>The date on which this image pipeline was created.</p>"
+        },
+        "dateUpdated":{
+          "shape":"DateTime",
+          "documentation":"<p>The date on which this image pipeline was last updated.</p>"
+        },
+        "dateLastRun":{
+          "shape":"DateTime",
+          "documentation":"<p>The date on which this image pipeline was last run.</p>"
+        },
+        "dateNextRun":{
+          "shape":"DateTime",
+          "documentation":"<p>The date on which this image pipeline will next be run.</p>"
+        },
+        "tags":{
+          "shape":"TagMap",
+          "documentation":"<p>The tags of this image pipeline.</p>"
+        }
+      },
+      "documentation":"<p>Details of an image pipeline.</p>"
+    },
+    "ImagePipelineArn":{
+      "type":"string",
+      "pattern":"^arn:aws[^:]*:imagebuilder:[^:]+:(?:\\d{12}|aws):image-pipeline/[a-z0-9-_]+$"
+    },
+    "ImagePipelineList":{
+      "type":"list",
+      "member":{"shape":"ImagePipeline"}
+    },
+    "ImageRecipe":{
+      "type":"structure",
+      "members":{
+        "arn":{
+          "shape":"ImageBuilderArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the image recipe.</p>"
+        },
+        "name":{
+          "shape":"ResourceName",
+          "documentation":"<p>The name of the image recipe.</p>"
+        },
+        "description":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The description of the image recipe.</p>"
+        },
+        "platform":{
+          "shape":"Platform",
+          "documentation":"<p>The platform of the image recipe.</p>"
+        },
+        "owner":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The owner of the image recipe.</p>"
+        },
+        "version":{
+          "shape":"VersionNumber",
+          "documentation":"<p>The version of the image recipe.</p>"
+        },
+        "components":{
+          "shape":"ComponentConfigurationList",
+          "documentation":"<p>The components of the image recipe.</p>"
+        },
+        "parentImage":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The parent image of the image recipe.</p>"
+        },
+        "blockDeviceMappings":{
+          "shape":"InstanceBlockDeviceMappings",
+          "documentation":"<p>The block device mappings to apply when creating images from this recipe.</p>"
+        },
+        "dateCreated":{
+          "shape":"DateTime",
+          "documentation":"<p>The date on which this image recipe was created.</p>"
+        },
+        "tags":{
+          "shape":"TagMap",
+          "documentation":"<p>The tags of the image recipe.</p>"
+        }
+      },
+      "documentation":"<p>An image recipe.</p>"
+    },
+    "ImageRecipeArn":{
+      "type":"string",
+      "pattern":"^arn:aws[^:]*:imagebuilder:[^:]+:(?:\\d{12}|aws):image-recipe/[a-z0-9-_]+/\\d+\\.\\d+\\.\\d+$"
+    },
+    "ImageRecipeSummary":{
+      "type":"structure",
+      "members":{
+        "arn":{
+          "shape":"ImageBuilderArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the image recipe.</p>"
+        },
+        "name":{
+          "shape":"ResourceName",
+          "documentation":"<p>The name of the image recipe.</p>"
+        },
+        "platform":{
+          "shape":"Platform",
+          "documentation":"<p>The platform of the image recipe.</p>"
+        },
+        "owner":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The owner of the image recipe.</p>"
+        },
+        "parentImage":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The parent image of the image recipe.</p>"
+        },
+        "dateCreated":{
+          "shape":"DateTime",
+          "documentation":"<p>The date on which this image recipe was created.</p>"
+        },
+        "tags":{
+          "shape":"TagMap",
+          "documentation":"<p>The tags of the image recipe.</p>"
+        }
+      },
+      "documentation":"<p>A summary of an image recipe.</p>"
+    },
+    "ImageRecipeSummaryList":{
+      "type":"list",
+      "member":{"shape":"ImageRecipeSummary"}
+    },
+    "ImageState":{
+      "type":"structure",
+      "members":{
+        "status":{
+          "shape":"ImageStatus",
+          "documentation":"<p> The status of the image. </p>"
+        },
+        "reason":{
+          "shape":"NonEmptyString",
+          "documentation":"<p> The reason for the image's status. </p>"
+        }
+      },
+      "documentation":"<p> Image state shows the image status and the reason for that status. </p>"
+    },
+    "ImageStatus":{
+      "type":"string",
+      "enum":[
+        "PENDING",
+        "CREATING",
+        "BUILDING",
+        "TESTING",
+        "DISTRIBUTING",
+        "INTEGRATING",
+        "AVAILABLE",
+        "CANCELLED",
+        "FAILED",
+        "DEPRECATED",
+        "DELETED"
+      ]
+    },
+    "ImageSummary":{
+      "type":"structure",
+      "members":{
+        "arn":{
+          "shape":"ImageBuilderArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the image.</p>"
+        },
+        "name":{
+          "shape":"ResourceName",
+          "documentation":"<p>The name of the image.</p>"
+        },
+        "version":{
+          "shape":"VersionNumber",
+          "documentation":"<p>The version of the image.</p>"
+        },
+        "platform":{
+          "shape":"Platform",
+          "documentation":"<p>The platform of the image.</p>"
+        },
+        "state":{
+          "shape":"ImageState",
+          "documentation":"<p>The state of the image.</p>"
+        },
+        "owner":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The owner of the image.</p>"
+        },
+        "dateCreated":{
+          "shape":"DateTime",
+          "documentation":"<p>The date on which this image was created.</p>"
+        },
+        "outputResources":{
+          "shape":"OutputResources",
+          "documentation":"<p>The output resources produced when creating this image.</p>"
+        },
+        "tags":{
+          "shape":"TagMap",
+          "documentation":"<p>The tags of the image.</p>"
+        }
+      },
+      "documentation":"<p>An image summary.</p>"
+    },
+    "ImageSummaryList":{
+      "type":"list",
+      "member":{"shape":"ImageSummary"}
+    },
+    "ImageTestsConfiguration":{
+      "type":"structure",
+      "members":{
+        "imageTestsEnabled":{
+          "shape":"NullableBoolean",
+          "documentation":"<p>Defines if tests should be executed when building this image.</p>"
+        },
+        "timeoutMinutes":{
+          "shape":"ImageTestsTimeoutMinutes",
+          "documentation":"<p>The maximum time in minutes that tests are permitted to run.</p>"
+        }
+      },
+      "documentation":"<p>Image tests configuration.</p>"
+    },
+    "ImageTestsTimeoutMinutes":{
+      "type":"integer",
+      "max":1440,
+      "min":60
+    },
+    "ImageVersion":{
+      "type":"structure",
+      "members":{
+        "arn":{
+          "shape":"ImageBuilderArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the image semantic version.</p>"
+        },
+        "name":{
+          "shape":"ResourceName",
+          "documentation":"<p>The name of the image semantic version.</p>"
+        },
+        "version":{
+          "shape":"VersionNumber",
+          "documentation":"<p>The semantic version of the image semantic version.</p>"
+        },
+        "platform":{
+          "shape":"Platform",
+          "documentation":"<p>The platform of the image semantic version.</p>"
+        },
+        "owner":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The owner of the image semantic version.</p>"
+        },
+        "dateCreated":{
+          "shape":"DateTime",
+          "documentation":"<p>The date at which this image semantic version was created.</p>"
+        }
+      },
+      "documentation":"<p>An image semantic version.</p>"
+    },
+    "ImageVersionArn":{
+      "type":"string",
+      "pattern":"^arn:aws[^:]*:imagebuilder:[^:]+:(?:\\d{12}|aws):image/[a-z0-9-_]+/\\d+\\.\\d+\\.\\d+$"
+    },
+    "ImageVersionList":{
+      "type":"list",
+      "member":{"shape":"ImageVersion"}
+    },
+    "ImportComponentRequest":{
+      "type":"structure",
+      "required":[
+        "name",
+        "semanticVersion",
+        "type",
+        "format",
+        "platform",
+        "clientToken"
+      ],
+      "members":{
+        "name":{
+          "shape":"ResourceName",
+          "documentation":"<p> The name of the component. </p>"
+        },
+        "semanticVersion":{
+          "shape":"VersionNumber",
+          "documentation":"<p>The semantic version of the component. This version follows the semantic version syntax. For example, major.minor.patch. This could be versioned like software (2.0.1) or like a date (2019.12.01).</p>"
+        },
+        "description":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The description of the component. Describes the contents of the component. </p>"
+        },
+        "changeDescription":{
+          "shape":"NonEmptyString",
+          "documentation":"<p> The change description of the component. Describes what change has been made in this version, or what makes this version different from other versions of this component. </p>"
+        },
+        "type":{
+          "shape":"ComponentType",
+          "documentation":"<p>The type of the component denotes whether the component is used to build the image or only to test it. </p>"
+        },
+        "format":{
+          "shape":"ComponentFormat",
+          "documentation":"<p> The format of the resource that you want to import as a component. </p>"
+        },
+        "platform":{
+          "shape":"Platform",
+          "documentation":"<p> The platform of the component. </p>"
+        },
+        "data":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The data of the component. Used to specify the data inline. Either <code>data</code> or <code>uri</code> can be used to specify the data within the component.</p>"
+        },
+        "uri":{
+          "shape":"Uri",
+          "documentation":"<p>The uri of the component. Must be an S3 URL and the requester must have permission to access the S3 bucket. If you use S3, you can specify component content up to your service quota. Either <code>data</code> or <code>uri</code> can be used to specify the data within the component. </p>"
+        },
+        "kmsKeyId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p> The ID of the KMS key that should be used to encrypt this component. </p>"
+        },
+        "tags":{
+          "shape":"TagMap",
+          "documentation":"<p> The tags of the component. </p>"
+        },
+        "clientToken":{
+          "shape":"ClientToken",
+          "documentation":"<p> The idempotency token of the component. </p>",
+          "idempotencyToken":true
+        }
+      }
+    },
+    "ImportComponentResponse":{
+      "type":"structure",
+      "members":{
+        "requestId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p> The request ID that uniquely identifies this request. </p>"
+        },
+        "clientToken":{
+          "shape":"ClientToken",
+          "documentation":"<p> The idempotency token used to make this request idempotent. </p>"
+        },
+        "componentBuildVersionArn":{
+          "shape":"ComponentBuildVersionArn",
+          "documentation":"<p> The Amazon Resource Name (ARN) of the imported component. </p>"
+        }
+      }
+    },
+    "InfrastructureConfiguration":{
+      "type":"structure",
+      "members":{
+        "arn":{
+          "shape":"ImageBuilderArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the infrastructure configuration.</p>"
+        },
+        "name":{
+          "shape":"ResourceName",
+          "documentation":"<p>The name of the infrastructure configuration.</p>"
+        },
+        "description":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The description of the infrastructure configuration.</p>"
+        },
+        "instanceTypes":{
+          "shape":"InstanceTypeList",
+          "documentation":"<p>The instance types of the infrastructure configuration.</p>"
+        },
+        "instanceProfileName":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The instance profile of the infrastructure configuration.</p>"
+        },
+        "securityGroupIds":{
+          "shape":"SecurityGroupIds",
+          "documentation":"<p>The security group IDs of the infrastructure configuration.</p>"
+        },
+        "subnetId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The subnet ID of the infrastructure configuration.</p>"
+        },
+        "logging":{
+          "shape":"Logging",
+          "documentation":"<p>The logging configuration of the infrastructure configuration.</p>"
+        },
+        "keyPair":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The EC2 key pair of the infrastructure configuration.</p>"
+        },
+        "terminateInstanceOnFailure":{
+          "shape":"NullableBoolean",
+          "documentation":"<p>The terminate instance on failure configuration of the infrastructure configuration.</p>"
+        },
+        "snsTopicArn":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The SNS topic Amazon Resource Name (ARN) of the infrastructure configuration.</p>"
+        },
+        "dateCreated":{
+          "shape":"DateTime",
+          "documentation":"<p>The date on which the infrastructure configuration was created.</p>"
+        },
+        "dateUpdated":{
+          "shape":"DateTime",
+          "documentation":"<p>The date on which the infrastructure configuration was last updated.</p>"
+        },
+        "tags":{
+          "shape":"TagMap",
+          "documentation":"<p>The tags of the infrastructure configuration.</p>"
+        }
+      },
+      "documentation":"<p>Details of the infrastructure configuration.</p>"
+    },
+    "InfrastructureConfigurationArn":{
+      "type":"string",
+      "pattern":"^arn:aws[^:]*:imagebuilder:[^:]+:(?:\\d{12}|aws):infrastructure-configuration/[a-z0-9-_]+$"
+    },
+    "InfrastructureConfigurationSummary":{
+      "type":"structure",
+      "members":{
+        "arn":{
+          "shape":"ImageBuilderArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the infrastructure configuration.</p>"
+        },
+        "name":{
+          "shape":"ResourceName",
+          "documentation":"<p>The name of the infrastructure configuration.</p>"
+        },
+        "description":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The description of the infrastructure configuration.</p>"
+        },
+        "dateCreated":{
+          "shape":"DateTime",
+          "documentation":"<p>The date on which the infrastructure configuration was created.</p>"
+        },
+        "dateUpdated":{
+          "shape":"DateTime",
+          "documentation":"<p>The date on which the infrastructure configuration was last updated.</p>"
+        },
+        "tags":{
+          "shape":"TagMap",
+          "documentation":"<p>The tags of the infrastructure configuration.</p>"
+        }
+      },
+      "documentation":"<p>The infrastructure used when building EC2 AMIs.</p>"
+    },
+    "InfrastructureConfigurationSummaryList":{
+      "type":"list",
+      "member":{"shape":"InfrastructureConfigurationSummary"}
+    },
+    "InlineComponentData":{
+      "type":"string",
+      "max":16000,
+      "min":1
+    },
+    "InstanceBlockDeviceMapping":{
+      "type":"structure",
+      "members":{
+        "deviceName":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The device to which these mappings apply.</p>"
+        },
+        "ebs":{
+          "shape":"EbsInstanceBlockDeviceSpecification",
+          "documentation":"<p>Use to manage Amazon EBS-specific configuration for this mapping.</p>"
+        },
+        "virtualName":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>Use to manage instance ephemeral devices.</p>"
+        },
+        "noDevice":{
+          "shape":"EmptyString",
+          "documentation":"<p>Use to remove a mapping from the parent image.</p>"
+        }
+      },
+      "documentation":"<p>Defines block device mappings for the instance used to configure your image.</p>"
+    },
+    "InstanceBlockDeviceMappings":{
+      "type":"list",
+      "member":{"shape":"InstanceBlockDeviceMapping"}
+    },
+    "InstanceType":{"type":"string"},
+    "InstanceTypeList":{
+      "type":"list",
+      "member":{"shape":"InstanceType"}
+    },
+    "InvalidPaginationTokenException":{
+      "type":"structure",
+      "members":{
+        "message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p>You have provided an invalid pagination token in your request.</p>",
+      "error":{"httpStatusCode":400},
+      "exception":true
+    },
+    "InvalidParameterCombinationException":{
+      "type":"structure",
+      "members":{
+        "message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p>You have specified two or more mutually exclusive parameters. Review the error message for details.</p>",
+      "error":{"httpStatusCode":400},
+      "exception":true
+    },
+    "InvalidParameterException":{
+      "type":"structure",
+      "members":{
+        "message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p>The specified parameter is invalid. Review the available parameters for the API request.</p>",
+      "error":{"httpStatusCode":400},
+      "exception":true
+    },
+    "InvalidParameterValueException":{
+      "type":"structure",
+      "members":{
+        "message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p>The value that you provided for the specified parameter is invalid.</p>",
+      "error":{"httpStatusCode":400},
+      "exception":true
+    },
+    "InvalidRequestException":{
+      "type":"structure",
+      "members":{
+        "message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p>You have made a request for an action that is not supported by the service.</p>",
+      "error":{"httpStatusCode":400},
+      "exception":true
+    },
+    "InvalidVersionNumberException":{
+      "type":"structure",
+      "members":{
+        "message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p>Your version number is out of bounds or does not follow the required syntax.</p>",
+      "error":{"httpStatusCode":400},
+      "exception":true
+    },
+    "LaunchPermissionConfiguration":{
+      "type":"structure",
+      "members":{
+        "userIds":{
+          "shape":"AccountList",
+          "documentation":"<p> The AWS account ID. </p>"
+        },
+        "userGroups":{
+          "shape":"StringList",
+          "documentation":"<p>The name of the group. </p>"
+        }
+      },
+      "documentation":"<p>Describes the configuration for a launch permission. The launch permission modification request is sent to the <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_ModifyImageAttribute.html\">EC2 ModifyImageAttribute</a> API on behalf of the user for each Region they have selected to distribute the AMI.</p>"
+    },
+    "ListComponentBuildVersionsRequest":{
+      "type":"structure",
+      "required":["componentVersionArn"],
+      "members":{
+        "componentVersionArn":{
+          "shape":"ComponentVersionArn",
+          "documentation":"<p> The component version Amazon Resource Name (ARN) whose versions you want to list. </p>"
+        },
+        "maxResults":{
+          "shape":"RestrictedInteger",
+          "documentation":"<p> The maximum items to return in a request. </p>",
+          "box":true
+        },
+        "nextToken":{
+          "shape":"NonEmptyString",
+          "documentation":"<p> A token to specify where to start paginating. This is the NextToken from a previously truncated response. </p>"
+        }
+      }
+    },
+    "ListComponentBuildVersionsResponse":{
+      "type":"structure",
+      "members":{
+        "requestId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p> The request ID that uniquely identifies this request. </p>"
+        },
+        "componentSummaryList":{
+          "shape":"ComponentSummaryList",
+          "documentation":"<p> The list of component summaries for the specified semantic version. </p>"
+        },
+        "nextToken":{
+          "shape":"NonEmptyString",
+          "documentation":"<p> The next token used for paginated responses. When this is not empty, there are additional elements that the service has not included in this request. Use this token with the next request to retrieve additional objects. </p>"
+        }
+      }
+    },
+    "ListComponentsRequest":{
+      "type":"structure",
+      "members":{
+        "owner":{
+          "shape":"Ownership",
+          "documentation":"<p> The owner defines which components you want to list. By default, this request will only show components owned by your account. You can use this field to specify if you want to view components owned by yourself, by Amazon, or those components that have been shared with you by other customers. </p>"
+        },
+        "filters":{
+          "shape":"FilterList",
+          "documentation":"<p> The filters. </p>"
+        },
+        "maxResults":{
+          "shape":"RestrictedInteger",
+          "documentation":"<p> The maximum items to return in a request. </p>",
+          "box":true
+        },
+        "nextToken":{
+          "shape":"NonEmptyString",
+          "documentation":"<p> A token to specify where to start paginating. This is the NextToken from a previously truncated response. </p>"
+        }
+      }
+    },
+    "ListComponentsResponse":{
+      "type":"structure",
+      "members":{
+        "requestId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p> The request ID that uniquely identifies this request. </p>"
+        },
+        "componentVersionList":{
+          "shape":"ComponentVersionList",
+          "documentation":"<p> The list of component semantic versions. </p>"
+        },
+        "nextToken":{
+          "shape":"NonEmptyString",
+          "documentation":"<p> The next token used for paginated responses. When this is not empty, there are additional elements that the service has not included in this request. Use this token with the next request to retrieve additional objects. </p>"
+        }
+      }
+    },
+    "ListDistributionConfigurationsRequest":{
+      "type":"structure",
+      "members":{
+        "filters":{
+          "shape":"FilterList",
+          "documentation":"<p> The filters. </p>"
+        },
+        "maxResults":{
+          "shape":"RestrictedInteger",
+          "documentation":"<p> The maximum items to return in a request. </p>",
+          "box":true
+        },
+        "nextToken":{
+          "shape":"NonEmptyString",
+          "documentation":"<p> A token to specify where to start paginating. This is the NextToken from a previously truncated response. </p>"
+        }
+      }
+    },
+    "ListDistributionConfigurationsResponse":{
+      "type":"structure",
+      "members":{
+        "requestId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p> The request ID that uniquely identifies this request. </p>"
+        },
+        "distributionConfigurationSummaryList":{
+          "shape":"DistributionConfigurationSummaryList",
+          "documentation":"<p> The list of distributions. </p>"
+        },
+        "nextToken":{
+          "shape":"NonEmptyString",
+          "documentation":"<p> The next token used for paginated responses. When this is not empty, there are additional elements that the service has not included in this request. Use this token with the next request to retrieve additional objects. </p>"
+        }
+      }
+    },
+    "ListImageBuildVersionsRequest":{
+      "type":"structure",
+      "required":["imageVersionArn"],
+      "members":{
+        "imageVersionArn":{
+          "shape":"ImageVersionArn",
+          "documentation":"<p> The Amazon Resource Name (ARN) of the image whose build versions you want to retrieve. </p>"
+        },
+        "filters":{
+          "shape":"FilterList",
+          "documentation":"<p> The filters. </p>"
+        },
+        "maxResults":{
+          "shape":"RestrictedInteger",
+          "documentation":"<p> The maximum items to return in a request. </p>",
+          "box":true
+        },
+        "nextToken":{
+          "shape":"NonEmptyString",
+          "documentation":"<p> A token to specify where to start paginating. This is the NextToken from a previously truncated response. </p>"
+        }
+      }
+    },
+    "ListImageBuildVersionsResponse":{
+      "type":"structure",
+      "members":{
+        "requestId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p> The request ID that uniquely identifies this request. </p>"
+        },
+        "imageSummaryList":{
+          "shape":"ImageSummaryList",
+          "documentation":"<p> The list of image build versions. </p>"
+        },
+        "nextToken":{
+          "shape":"NonEmptyString",
+          "documentation":"<p> The next token used for paginated responses. When this is not empty, there are additional elements that the service has not included in this request. Use this token with the next request to retrieve additional objects. </p>"
+        }
+      }
+    },
+    "ListImagePipelineImagesRequest":{
+      "type":"structure",
+      "required":["imagePipelineArn"],
+      "members":{
+        "imagePipelineArn":{
+          "shape":"ImagePipelineArn",
+          "documentation":"<p> The Amazon Resource Name (ARN) of the image pipeline whose images you want to view. </p>"
+        },
+        "filters":{
+          "shape":"FilterList",
+          "documentation":"<p> The filters. </p>"
+        },
+        "maxResults":{
+          "shape":"RestrictedInteger",
+          "documentation":"<p> The maximum items to return in a request. </p>",
+          "box":true
+        },
+        "nextToken":{
+          "shape":"NonEmptyString",
+          "documentation":"<p> A token to specify where to start paginating. This is the NextToken from a previously truncated response. </p>"
+        }
+      }
+    },
+    "ListImagePipelineImagesResponse":{
+      "type":"structure",
+      "members":{
+        "requestId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p> The request ID that uniquely identifies this request. </p>"
+        },
+        "imageSummaryList":{
+          "shape":"ImageSummaryList",
+          "documentation":"<p> The list of images built by this pipeline. </p>"
+        },
+        "nextToken":{
+          "shape":"NonEmptyString",
+          "documentation":"<p> The next token used for paginated responses. When this is not empty, there are additional elements that the service has not included in this request. Use this token with the next request to retrieve additional objects. </p>"
+        }
+      }
+    },
+    "ListImagePipelinesRequest":{
+      "type":"structure",
+      "members":{
+        "filters":{
+          "shape":"FilterList",
+          "documentation":"<p> The filters. </p>"
+        },
+        "maxResults":{
+          "shape":"RestrictedInteger",
+          "documentation":"<p> The maximum items to return in a request. </p>",
+          "box":true
+        },
+        "nextToken":{
+          "shape":"NonEmptyString",
+          "documentation":"<p> A token to specify where to start paginating. This is the NextToken from a previously truncated response. </p>"
+        }
+      }
+    },
+    "ListImagePipelinesResponse":{
+      "type":"structure",
+      "members":{
+        "requestId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p> The request ID that uniquely identifies this request. </p>"
+        },
+        "imagePipelineList":{
+          "shape":"ImagePipelineList",
+          "documentation":"<p> The list of image pipelines. </p>"
+        },
+        "nextToken":{
+          "shape":"NonEmptyString",
+          "documentation":"<p> The next token used for paginated responses. When this is not empty, there are additional elements that the service has not included in this request. Use this token with the next request to retrieve additional objects. </p>"
+        }
+      }
+    },
+    "ListImageRecipesRequest":{
+      "type":"structure",
+      "members":{
+        "owner":{
+          "shape":"Ownership",
+          "documentation":"<p> The owner defines which image recipes you want to list. By default, this request will only show image recipes owned by your account. You can use this field to specify if you want to view image recipes owned by yourself, by Amazon, or those image recipes that have been shared with you by other customers. </p>"
+        },
+        "filters":{
+          "shape":"FilterList",
+          "documentation":"<p> The filters. </p>"
+        },
+        "maxResults":{
+          "shape":"RestrictedInteger",
+          "documentation":"<p> The maximum items to return in a request. </p>",
+          "box":true
+        },
+        "nextToken":{
+          "shape":"NonEmptyString",
+          "documentation":"<p> A token to specify where to start paginating. This is the NextToken from a previously truncated response. </p>"
+        }
+      }
+    },
+    "ListImageRecipesResponse":{
+      "type":"structure",
+      "members":{
+        "requestId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p> The request ID that uniquely identifies this request. </p>"
+        },
+        "imageRecipeSummaryList":{
+          "shape":"ImageRecipeSummaryList",
+          "documentation":"<p> The list of image pipelines. </p>"
+        },
+        "nextToken":{
+          "shape":"NonEmptyString",
+          "documentation":"<p> The next token used for paginated responses. When this is not empty, there are additional elements that the service has not included in this request. Use this token with the next request to retrieve additional objects. </p>"
+        }
+      }
+    },
+    "ListImagesRequest":{
+      "type":"structure",
+      "members":{
+        "owner":{
+          "shape":"Ownership",
+          "documentation":"<p> The owner defines which images you want to list. By default, this request will only show images owned by your account. You can use this field to specify if you want to view images owned by yourself, by Amazon, or those images that have been shared with you by other customers. </p>"
+        },
+        "filters":{
+          "shape":"FilterList",
+          "documentation":"<p> The filters. </p>"
+        },
+        "maxResults":{
+          "shape":"RestrictedInteger",
+          "documentation":"<p> The maximum items to return in a request. </p>",
+          "box":true
+        },
+        "nextToken":{
+          "shape":"NonEmptyString",
+          "documentation":"<p> A token to specify where to start paginating. This is the NextToken from a previously truncated response. </p>"
+        }
+      }
+    },
+    "ListImagesResponse":{
+      "type":"structure",
+      "members":{
+        "requestId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p> The request ID that uniquely identifies this request. </p>"
+        },
+        "imageVersionList":{
+          "shape":"ImageVersionList",
+          "documentation":"<p> The list of image semantic versions. </p>"
+        },
+        "nextToken":{
+          "shape":"NonEmptyString",
+          "documentation":"<p> The next token used for paginated responses. When this is not empty, there are additional elements that the service has not included in this request. Use this token with the next request to retrieve additional objects. </p>"
+        }
+      }
+    },
+    "ListInfrastructureConfigurationsRequest":{
+      "type":"structure",
+      "members":{
+        "filters":{
+          "shape":"FilterList",
+          "documentation":"<p> The filters. </p>"
+        },
+        "maxResults":{
+          "shape":"RestrictedInteger",
+          "documentation":"<p> The maximum items to return in a request. </p>",
+          "box":true
+        },
+        "nextToken":{
+          "shape":"NonEmptyString",
+          "documentation":"<p> A token to specify where to start paginating. This is the NextToken from a previously truncated response. </p>"
+        }
+      }
+    },
+    "ListInfrastructureConfigurationsResponse":{
+      "type":"structure",
+      "members":{
+        "requestId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p> The request ID that uniquely identifies this request. </p>"
+        },
+        "infrastructureConfigurationSummaryList":{
+          "shape":"InfrastructureConfigurationSummaryList",
+          "documentation":"<p> The list of infrastructure configurations. </p>"
+        },
+        "nextToken":{
+          "shape":"NonEmptyString",
+          "documentation":"<p> The next token used for paginated responses. When this is not empty, there are additional elements that the service has not included in this request. Use this token with the next request to retrieve additional objects.</p>"
+        }
+      }
+    },
+    "ListTagsForResourceRequest":{
+      "type":"structure",
+      "required":["resourceArn"],
+      "members":{
+        "resourceArn":{
+          "shape":"ImageBuilderArn",
+          "documentation":"<p> The Amazon Resource Name (ARN) of the resource whose tags you want to retrieve. </p>",
+          "location":"uri",
+          "locationName":"resourceArn"
+        }
+      }
+    },
+    "ListTagsForResourceResponse":{
+      "type":"structure",
+      "members":{
+        "tags":{
+          "shape":"TagMap",
+          "documentation":"<p> The tags for the specified resource. </p>"
+        }
+      }
+    },
+    "Logging":{
+      "type":"structure",
+      "members":{
+        "s3Logs":{
+          "shape":"S3Logs",
+          "documentation":"<p>The Amazon S3 logging configuration.</p>"
+        }
+      },
+      "documentation":"<p>Logging configuration defines where Image Builder uploads your logs.</p>"
+    },
+    "NonEmptyString":{
+      "type":"string",
+      "max":1024,
+      "min":1
+    },
+    "NullableBoolean":{"type":"boolean"},
+    "OutputResources":{
+      "type":"structure",
+      "members":{
+        "amis":{
+          "shape":"AmiList",
+          "documentation":"<p>The EC2 AMIs created by this image. </p>"
+        }
+      },
+      "documentation":"<p>The resources produced by this image. </p>"
+    },
+    "Ownership":{
+      "type":"string",
+      "enum":[
+        "Self",
+        "Shared",
+        "Amazon"
+      ]
+    },
+    "PipelineExecutionStartCondition":{
+      "type":"string",
+      "enum":[
+        "EXPRESSION_MATCH_ONLY",
+        "EXPRESSION_MATCH_AND_DEPENDENCY_UPDATES_AVAILABLE"
+      ]
+    },
+    "PipelineStatus":{
+      "type":"string",
+      "enum":[
+        "DISABLED",
+        "ENABLED"
+      ]
+    },
+    "Platform":{
+      "type":"string",
+      "enum":[
+        "Windows",
+        "Linux"
+      ]
+    },
+    "PutComponentPolicyRequest":{
+      "type":"structure",
+      "required":[
+        "componentArn",
+        "policy"
+      ],
+      "members":{
+        "componentArn":{
+          "shape":"ComponentBuildVersionArn",
+          "documentation":"<p> The Amazon Resource Name (ARN) of the component that this policy should be applied to. </p>"
+        },
+        "policy":{
+          "shape":"ResourcePolicyDocument",
+          "documentation":"<p> The policy to apply. </p>"
+        }
+      }
+    },
+    "PutComponentPolicyResponse":{
+      "type":"structure",
+      "members":{
+        "requestId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p> The request ID that uniquely identifies this request. </p>"
+        },
+        "componentArn":{
+          "shape":"ComponentBuildVersionArn",
+          "documentation":"<p> The Amazon Resource Name (ARN) of the component that this policy was applied to. </p>"
+        }
+      }
+    },
+    "PutImagePolicyRequest":{
+      "type":"structure",
+      "required":[
+        "imageArn",
+        "policy"
+      ],
+      "members":{
+        "imageArn":{
+          "shape":"ImageBuildVersionArn",
+          "documentation":"<p> The Amazon Resource Name (ARN) of the image that this policy should be applied to. </p>"
+        },
+        "policy":{
+          "shape":"ResourcePolicyDocument",
+          "documentation":"<p> The policy to apply. </p>"
+        }
+      }
+    },
+    "PutImagePolicyResponse":{
+      "type":"structure",
+      "members":{
+        "requestId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p> The request ID that uniquely identifies this request. </p>"
+        },
+        "imageArn":{
+          "shape":"ImageBuildVersionArn",
+          "documentation":"<p> The Amazon Resource Name (ARN) of the image that this policy was applied to. </p>"
+        }
+      }
+    },
+    "PutImageRecipePolicyRequest":{
+      "type":"structure",
+      "required":[
+        "imageRecipeArn",
+        "policy"
+      ],
+      "members":{
+        "imageRecipeArn":{
+          "shape":"ImageRecipeArn",
+          "documentation":"<p> The Amazon Resource Name (ARN) of the image recipe that this policy should be applied to. </p>"
+        },
+        "policy":{
+          "shape":"ResourcePolicyDocument",
+          "documentation":"<p> The policy to apply. </p>"
+        }
+      }
+    },
+    "PutImageRecipePolicyResponse":{
+      "type":"structure",
+      "members":{
+        "requestId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p> The request ID that uniquely identifies this request. </p>"
+        },
+        "imageRecipeArn":{
+          "shape":"ImageRecipeArn",
+          "documentation":"<p> The Amazon Resource Name (ARN) of the image recipe that this policy was applied to. </p>"
+        }
+      }
+    },
+    "ResourceAlreadyExistsException":{
+      "type":"structure",
+      "members":{
+        "message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p>The resource that you are trying to create already exists.</p>",
+      "error":{"httpStatusCode":400},
+      "exception":true
+    },
+    "ResourceDependencyException":{
+      "type":"structure",
+      "members":{
+        "message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p>You have attempted to mutate or delete a resource with a dependency that prohibits this action. See the error message for more details.</p>",
+      "error":{"httpStatusCode":400},
+      "exception":true
+    },
+    "ResourceInUseException":{
+      "type":"structure",
+      "members":{
+        "message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p>The resource that you are trying to operate on is currently in use. Review the message details and retry later.</p>",
+      "error":{"httpStatusCode":400},
+      "exception":true
+    },
+    "ResourceName":{
+      "type":"string",
+      "pattern":"^[-_A-Za-z-0-9][-_A-Za-z0-9 ]{1,126}[-_A-Za-z-0-9]$"
+    },
+    "ResourceNotFoundException":{
+      "type":"structure",
+      "members":{
+        "message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p>At least one of the resources referenced by your request does not exist.</p>",
+      "error":{"httpStatusCode":404},
+      "exception":true
+    },
+    "ResourcePolicyDocument":{
+      "type":"string",
+      "max":30000,
+      "min":1
+    },
+    "RestrictedInteger":{
+      "type":"integer",
+      "max":25,
+      "min":1
+    },
+    "S3Logs":{
+      "type":"structure",
+      "members":{
+        "s3BucketName":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The Amazon S3 bucket in which to store the logs.</p>"
+        },
+        "s3KeyPrefix":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The Amazon S3 path in which to store the logs.</p>"
+        }
+      },
+      "documentation":"<p>Amazon S3 logging configuration.</p>"
+    },
+    "Schedule":{
+      "type":"structure",
+      "members":{
+        "scheduleExpression":{
+          "shape":"NonEmptyString",
+          "documentation":"<p> The expression determines how often EC2 Image Builder evaluates your <code>pipelineExecutionStartCondition</code>.</p>"
+        },
+        "pipelineExecutionStartCondition":{
+          "shape":"PipelineExecutionStartCondition",
+          "documentation":"<p> The condition configures when the pipeline should trigger a new image build. When the <code>pipelineExecutionStartCondition</code> is set to <code>EXPRESSION_MATCH_AND_DEPENDENCY_UPDATES_AVAILABLE</code>, EC2 Image Builder will build a new image only when there are known changes pending. When it is set to <code>EXPRESSION_MATCH_ONLY</code>, it will build a new image every time the CRON expression matches the current time.</p>"
+        }
+      },
+      "documentation":"<p> A schedule configures how often and when a pipeline will automatically create a new image. </p>"
+    },
+    "SecurityGroupIds":{
+      "type":"list",
+      "member":{"shape":"NonEmptyString"}
+    },
+    "ServiceException":{
+      "type":"structure",
+      "members":{
+        "message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p>This exception is thrown when the service encounters an unrecoverable exception.</p>",
+      "error":{"httpStatusCode":500},
+      "exception":true
+    },
+    "ServiceUnavailableException":{
+      "type":"structure",
+      "members":{
+        "message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p>The service is unable to process your request at this time.</p>",
+      "error":{"httpStatusCode":503},
+      "exception":true
+    },
+    "SnsTopicArn":{
+      "type":"string",
+      "pattern":"^arn:aws[^:]*:sns:[^:]+:\\d{12}:[a-zA-Z0-9-_]{1,256}$"
+    },
+    "StartImagePipelineExecutionRequest":{
+      "type":"structure",
+      "required":[
+        "imagePipelineArn",
+        "clientToken"
+      ],
+      "members":{
+        "imagePipelineArn":{
+          "shape":"ImagePipelineArn",
+          "documentation":"<p> The Amazon Resource Name (ARN) of the image pipeline that you want to manually invoke. </p>"
+        },
+        "clientToken":{
+          "shape":"ClientToken",
+          "documentation":"<p> The idempotency token used to make this request idempotent. </p>",
+          "idempotencyToken":true
+        }
+      }
+    },
+    "StartImagePipelineExecutionResponse":{
+      "type":"structure",
+      "members":{
+        "requestId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p> The request ID that uniquely identifies this request. </p>"
+        },
+        "clientToken":{
+          "shape":"ClientToken",
+          "documentation":"<p> The idempotency token used to make this request idempotent.</p>"
+        },
+        "imageBuildVersionArn":{
+          "shape":"ImageBuildVersionArn",
+          "documentation":"<p> The Amazon Resource Name (ARN) of the image that was created by this request.</p>"
+        }
+      }
+    },
+    "StringList":{
+      "type":"list",
+      "member":{"shape":"NonEmptyString"}
+    },
+    "TagKey":{
+      "type":"string",
+      "max":128,
+      "min":1,
+      "pattern":"^(?!aws:)[a-zA-Z+-=._:/]+$"
+    },
+    "TagKeyList":{
+      "type":"list",
+      "member":{"shape":"TagKey"},
+      "max":50,
+      "min":1
+    },
+    "TagMap":{
+      "type":"map",
+      "key":{"shape":"TagKey"},
+      "value":{"shape":"TagValue"},
+      "max":50,
+      "min":1
+    },
+    "TagResourceRequest":{
+      "type":"structure",
+      "required":[
+        "resourceArn",
+        "tags"
+      ],
+      "members":{
+        "resourceArn":{
+          "shape":"ImageBuilderArn",
+          "documentation":"<p> The Amazon Resource Name (ARN) of the resource that you want to tag. </p>",
+          "location":"uri",
+          "locationName":"resourceArn"
+        },
+        "tags":{
+          "shape":"TagMap",
+          "documentation":"<p> The tags to apply to the resource. </p>"
+        }
+      }
+    },
+    "TagResourceResponse":{
+      "type":"structure",
+      "members":{
+      }
+    },
+    "TagValue":{
+      "type":"string",
+      "max":256
+    },
+    "UntagResourceRequest":{
+      "type":"structure",
+      "required":[
+        "resourceArn",
+        "tagKeys"
+      ],
+      "members":{
+        "resourceArn":{
+          "shape":"ImageBuilderArn",
+          "documentation":"<p> The Amazon Resource Name (ARN) of the resource that you want to untag. </p>",
+          "location":"uri",
+          "locationName":"resourceArn"
+        },
+        "tagKeys":{
+          "shape":"TagKeyList",
+          "documentation":"<p> The tag keys to remove from the resource. </p>",
+          "location":"querystring",
+          "locationName":"tagKeys"
+        }
+      }
+    },
+    "UntagResourceResponse":{
+      "type":"structure",
+      "members":{
+      }
+    },
+    "UpdateDistributionConfigurationRequest":{
+      "type":"structure",
+      "required":[
+        "distributionConfigurationArn",
+        "distributions",
+        "clientToken"
+      ],
+      "members":{
+        "distributionConfigurationArn":{
+          "shape":"DistributionConfigurationArn",
+          "documentation":"<p> The Amazon Resource Name (ARN) of the distribution configuration that you want to update. </p>"
+        },
+        "description":{
+          "shape":"NonEmptyString",
+          "documentation":"<p> The description of the distribution configuration. </p>"
+        },
+        "distributions":{
+          "shape":"DistributionList",
+          "documentation":"<p> The distributions of the distribution configuration. </p>"
+        },
+        "clientToken":{
+          "shape":"ClientToken",
+          "documentation":"<p> The idempotency token of the distribution configuration. </p>",
+          "idempotencyToken":true
+        }
+      }
+    },
+    "UpdateDistributionConfigurationResponse":{
+      "type":"structure",
+      "members":{
+        "requestId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p> The request ID that uniquely identifies this request. </p>"
+        },
+        "clientToken":{
+          "shape":"ClientToken",
+          "documentation":"<p> The idempotency token used to make this request idempotent. </p>"
+        },
+        "distributionConfigurationArn":{
+          "shape":"DistributionConfigurationArn",
+          "documentation":"<p> The Amazon Resource Name (ARN) of the distribution configuration that was updated by this request. </p>"
+        }
+      }
+    },
+    "UpdateImagePipelineRequest":{
+      "type":"structure",
+      "required":[
+        "imagePipelineArn",
+        "imageRecipeArn",
+        "infrastructureConfigurationArn",
+        "clientToken"
+      ],
+      "members":{
+        "imagePipelineArn":{
+          "shape":"ImagePipelineArn",
+          "documentation":"<p> The Amazon Resource Name (ARN) of the image pipeline that you want to update. </p>"
+        },
+        "description":{
+          "shape":"NonEmptyString",
+          "documentation":"<p> The description of the image pipeline. </p>"
+        },
+        "imageRecipeArn":{
+          "shape":"ImageRecipeArn",
+          "documentation":"<p> The Amazon Resource Name (ARN) of the image recipe that will be used to configure images updated by this image pipeline. </p>"
+        },
+        "infrastructureConfigurationArn":{
+          "shape":"InfrastructureConfigurationArn",
+          "documentation":"<p> The Amazon Resource Name (ARN) of the infrastructure configuration that will be used to build images updated by this image pipeline. </p>"
+        },
+        "distributionConfigurationArn":{
+          "shape":"DistributionConfigurationArn",
+          "documentation":"<p> The Amazon Resource Name (ARN) of the distribution configuration that will be used to configure and distribute images updated by this image pipeline. </p>"
+        },
+        "imageTestsConfiguration":{
+          "shape":"ImageTestsConfiguration",
+          "documentation":"<p> The image test configuration of the image pipeline. </p>"
+        },
+        "schedule":{
+          "shape":"Schedule",
+          "documentation":"<p> The schedule of the image pipeline. </p>"
+        },
+        "status":{
+          "shape":"PipelineStatus",
+          "documentation":"<p> The status of the image pipeline. </p>"
+        },
+        "clientToken":{
+          "shape":"ClientToken",
+          "documentation":"<p> The idempotency token used to make this request idempotent. </p>",
+          "idempotencyToken":true
+        }
+      }
+    },
+    "UpdateImagePipelineResponse":{
+      "type":"structure",
+      "members":{
+        "requestId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p> The request ID that uniquely identifies this request. </p>"
+        },
+        "clientToken":{
+          "shape":"ClientToken",
+          "documentation":"<p> The idempotency token used to make this request idempotent. </p>"
+        },
+        "imagePipelineArn":{
+          "shape":"ImagePipelineArn",
+          "documentation":"<p> The Amazon Resource Name (ARN) of the image pipeline that was updated by this request. </p>"
+        }
+      }
+    },
+    "UpdateInfrastructureConfigurationRequest":{
+      "type":"structure",
+      "required":[
+        "infrastructureConfigurationArn",
+        "instanceProfileName",
+        "clientToken"
+      ],
+      "members":{
+        "infrastructureConfigurationArn":{
+          "shape":"InfrastructureConfigurationArn",
+          "documentation":"<p> The Amazon Resource Name (ARN) of the infrastructure configuration that you want to update. </p>"
+        },
+        "description":{
+          "shape":"NonEmptyString",
+          "documentation":"<p> The description of the infrastructure configuration. </p>"
+        },
+        "instanceTypes":{
+          "shape":"InstanceTypeList",
+          "documentation":"<p> The instance types of the infrastructure configuration. You can specify one or more instance types to use for this build. The service will pick one of these instance types based on availability. </p>"
+        },
+        "instanceProfileName":{
+          "shape":"NonEmptyString",
+          "documentation":"<p> The instance profile to associate with the instance used to customize your EC2 AMI. </p>"
+        },
+        "securityGroupIds":{
+          "shape":"SecurityGroupIds",
+          "documentation":"<p> The security group IDs to associate with the instance used to customize your EC2 AMI. </p>"
+        },
+        "subnetId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p> The subnet ID to place the instance used to customize your EC2 AMI in. </p>"
+        },
+        "logging":{
+          "shape":"Logging",
+          "documentation":"<p> The logging configuration of the infrastructure configuration. </p>"
+        },
+        "keyPair":{
+          "shape":"NonEmptyString",
+          "documentation":"<p> The key pair of the infrastructure configuration. This can be used to log on to and debug the instance used to create your image. </p>"
+        },
+        "terminateInstanceOnFailure":{
+          "shape":"NullableBoolean",
+          "documentation":"<p> The terminate instance on failure setting of the infrastructure configuration. Set to false if you want Image Builder to retain the instance used to configure your AMI if the build or test phase of your workflow fails. </p>"
+        },
+        "snsTopicArn":{
+          "shape":"SnsTopicArn",
+          "documentation":"<p> The SNS topic on which to send image build events. </p>"
+        },
+        "clientToken":{
+          "shape":"ClientToken",
+          "documentation":"<p> The idempotency token used to make this request idempotent. </p>",
+          "idempotencyToken":true
+        }
+      }
+    },
+    "UpdateInfrastructureConfigurationResponse":{
+      "type":"structure",
+      "members":{
+        "requestId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p> The request ID that uniquely identifies this request. </p>"
+        },
+        "clientToken":{
+          "shape":"ClientToken",
+          "documentation":"<p> The idempotency token used to make this request idempotent. </p>"
+        },
+        "infrastructureConfigurationArn":{
+          "shape":"InfrastructureConfigurationArn",
+          "documentation":"<p> The Amazon Resource Name (ARN) of the infrastructure configuration that was updated by this request. </p>"
+        }
+      }
+    },
+    "Uri":{"type":"string"},
+    "VersionNumber":{
+      "type":"string",
+      "pattern":"^[0-9]+\\.[0-9]+\\.[0-9]+$"
+    }
+  },
+  "documentation":"<p>EC2 Image Builder is a fully managed AWS service that makes it easier to automate the creation, management, and deployment of customized, secure, and up-to-date “golden” server images that are pre-installed and pre-configured with software and settings to meet specific IT standards.</p>"
+}
diff --git a/services/inspector/build.properties b/services/inspector/build.properties
index ecf2dae6fcb1..15ec2da1fc71 100644
--- a/services/inspector/build.properties
+++ b/services/inspector/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/inspector/pom.xml b/services/inspector/pom.xml
index a580d3a27cb0..1fac9dd35030 100644
--- a/services/inspector/pom.xml
+++ b/services/inspector/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>inspector</artifactId>
     <name>AWS Java SDK :: Services :: Amazon Inspector Service</name>
diff --git a/services/inspector/src/test/java/software/amazon/awssdk/services/inspector/InspectorErrorUnmarshallingTest.java b/services/inspector/src/test/java/software/amazon/awssdk/services/inspector/InspectorErrorUnmarshallingTest.java
index 38c8801ec0ea..9425629b2084 100644
--- a/services/inspector/src/test/java/software/amazon/awssdk/services/inspector/InspectorErrorUnmarshallingTest.java
+++ b/services/inspector/src/test/java/software/amazon/awssdk/services/inspector/InspectorErrorUnmarshallingTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/inspector/src/test/resources/cucumber.properties b/services/inspector/src/test/resources/cucumber.properties
index 55b128259ca0..0c53399198c8 100644
--- a/services/inspector/src/test/resources/cucumber.properties
+++ b/services/inspector/src/test/resources/cucumber.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/inspector/src/test/resources/log4j.properties b/services/inspector/src/test/resources/log4j.properties
index 5490f648a7ba..ad13ebd09f11 100644
--- a/services/inspector/src/test/resources/log4j.properties
+++ b/services/inspector/src/test/resources/log4j.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/iot/build.properties b/services/iot/build.properties
index ecf2dae6fcb1..15ec2da1fc71 100644
--- a/services/iot/build.properties
+++ b/services/iot/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/iot/pom.xml b/services/iot/pom.xml
index de6487cf4fd9..d455d51cfd06 100644
--- a/services/iot/pom.xml
+++ b/services/iot/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>iot</artifactId>
     <name>AWS Java SDK :: Services :: AWS IoT</name>
diff --git a/services/iot/src/it/java/software/amazon/awssdk/services/iot/IotControlPlaneIntegrationTest.java b/services/iot/src/it/java/software/amazon/awssdk/services/iot/IotControlPlaneIntegrationTest.java
index ee66f29f3b2d..58147ebe1137 100644
--- a/services/iot/src/it/java/software/amazon/awssdk/services/iot/IotControlPlaneIntegrationTest.java
+++ b/services/iot/src/it/java/software/amazon/awssdk/services/iot/IotControlPlaneIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/iot/src/main/resources/codegen-resources/service-2.json b/services/iot/src/main/resources/codegen-resources/service-2.json
index 40a69df8a578..c6676abb1da1 100644
--- a/services/iot/src/main/resources/codegen-resources/service-2.json
+++ b/services/iot/src/main/resources/codegen-resources/service-2.json
@@ -252,6 +252,23 @@
       ],
       "documentation":"<p>Clears the default authorizer.</p>"
     },
+    "ConfirmTopicRuleDestination":{
+      "name":"ConfirmTopicRuleDestination",
+      "http":{
+        "method":"GET",
+        "requestUri":"/confirmdestination/{confirmationToken+}"
+      },
+      "input":{"shape":"ConfirmTopicRuleDestinationRequest"},
+      "output":{"shape":"ConfirmTopicRuleDestinationResponse"},
+      "errors":[
+        {"shape":"InternalException"},
+        {"shape":"InvalidRequestException"},
+        {"shape":"ServiceUnavailableException"},
+        {"shape":"UnauthorizedException"},
+        {"shape":"ConflictingResourceUpdateException"}
+      ],
+      "documentation":"<p>Confirms a topic rule destination. When you create a rule requiring a destination, AWS IoT sends a confirmation message to the endpoint or base address you specify. The message includes a token which you pass back when calling <code>ConfirmTopicRuleDestination</code> to confirm that you own or have access to the endpoint.</p>"
+    },
     "CreateAuthorizer":{
       "name":"CreateAuthorizer",
       "http":{
@@ -304,6 +321,43 @@
       ],
       "documentation":"<p>Creates an X.509 certificate using the specified certificate signing request.</p> <p> <b>Note:</b> The CSR must include a public key that is either an RSA key with a length of at least 2048 bits or an ECC key from NIST P-256 or NIST P-384 curves. </p> <p> <b>Note:</b> Reusing the same certificate signing request (CSR) results in a distinct certificate.</p> <p>You can create multiple certificates in a batch by creating a directory, copying multiple .csr files into that directory, and then specifying that directory on the command line. The following commands show how to create a batch of certificates given a batch of CSRs.</p> <p>Assuming a set of CSRs are located inside of the directory my-csr-directory:</p> <p>On Linux and OS X, the command is:</p> <p>$ ls my-csr-directory/ | xargs -I {} aws iot create-certificate-from-csr --certificate-signing-request file://my-csr-directory/{}</p> <p>This command lists all of the CSRs in my-csr-directory and pipes each CSR file name to the aws iot create-certificate-from-csr AWS CLI command to create a certificate for the corresponding CSR.</p> <p>The aws iot create-certificate-from-csr part of the command can also be run in parallel to speed up the certificate creation process:</p> <p>$ ls my-csr-directory/ | xargs -P 10 -I {} aws iot create-certificate-from-csr --certificate-signing-request file://my-csr-directory/{}</p> <p>On Windows PowerShell, the command to create certificates for all CSRs in my-csr-directory is:</p> <p>&gt; ls -Name my-csr-directory | %{aws iot create-certificate-from-csr --certificate-signing-request file://my-csr-directory/$_}</p> <p>On a Windows command prompt, the command to create certificates for all CSRs in my-csr-directory is:</p> <p>&gt; forfiles /p my-csr-directory /c \"cmd /c aws iot create-certificate-from-csr --certificate-signing-request file://@path\"</p>"
     },
+    "CreateDimension":{
+      "name":"CreateDimension",
+      "http":{
+        "method":"POST",
+        "requestUri":"/dimensions/{name}"
+      },
+      "input":{"shape":"CreateDimensionRequest"},
+      "output":{"shape":"CreateDimensionResponse"},
+      "errors":[
+        {"shape":"InternalFailureException"},
+        {"shape":"InvalidRequestException"},
+        {"shape":"LimitExceededException"},
+        {"shape":"ResourceAlreadyExistsException"},
+        {"shape":"ThrottlingException"}
+      ],
+      "documentation":"<p>Create a dimension that you can use to limit the scope of a metric used in a security profile for AWS IoT Device Defender. For example, using a <code>TOPIC_FILTER</code> dimension, you can narrow down the scope of the metric only to MQTT topics whose name match the pattern specified in the dimension.</p>"
+    },
+    "CreateDomainConfiguration":{
+      "name":"CreateDomainConfiguration",
+      "http":{
+        "method":"POST",
+        "requestUri":"/domainConfigurations/{domainConfigurationName}"
+      },
+      "input":{"shape":"CreateDomainConfigurationRequest"},
+      "output":{"shape":"CreateDomainConfigurationResponse"},
+      "errors":[
+        {"shape":"LimitExceededException"},
+        {"shape":"CertificateValidationException"},
+        {"shape":"ResourceAlreadyExistsException"},
+        {"shape":"ServiceUnavailableException"},
+        {"shape":"InternalFailureException"},
+        {"shape":"InvalidRequestException"},
+        {"shape":"UnauthorizedException"},
+        {"shape":"ThrottlingException"}
+      ],
+      "documentation":"<p>Creates a domain configuration.</p> <note> <p>The domain configuration feature is in public preview and is subject to change.</p> </note>"
+    },
     "CreateDynamicThingGroup":{
       "name":"CreateDynamicThingGroup",
       "http":{
@@ -356,7 +410,7 @@
         {"shape":"ServiceUnavailableException"},
         {"shape":"InternalFailureException"}
       ],
-      "documentation":"<p>Creates a 2048-bit RSA key pair and issues an X.509 certificate using the issued public key.</p> <p> <b>Note</b> This is the only time AWS IoT issues the private key for this certificate, so it is important to keep it in a secure location.</p>"
+      "documentation":"<p>Creates a 2048-bit RSA key pair and issues an X.509 certificate using the issued public key. You can also call <code>CreateKeysAndCertificate</code> over MQTT from a device, for more information, see <a href=\"https://docs.aws.amazon.com/iot/latest/developerguide/provision-wo-cert.html#provision-mqtt-api\">Provisioning MQTT API</a>.</p> <p> <b>Note</b> This is the only time AWS IoT issues the private key for this certificate, so it is important to keep it in a secure location.</p>"
     },
     "CreateMitigationAction":{
       "name":"CreateMitigationAction",
@@ -434,6 +488,61 @@
       ],
       "documentation":"<p>Creates a new version of the specified AWS IoT policy. To update a policy, create a new policy version. A managed policy can have up to five versions. If the policy has five versions, you must use <a>DeletePolicyVersion</a> to delete an existing version before you create a new one.</p> <p>Optionally, you can set the new version as the policy's default version. The default version is the operative version (that is, the version that is in effect for the certificates to which the policy is attached).</p>"
     },
+    "CreateProvisioningClaim":{
+      "name":"CreateProvisioningClaim",
+      "http":{
+        "method":"POST",
+        "requestUri":"/provisioning-templates/{templateName}/provisioning-claim"
+      },
+      "input":{"shape":"CreateProvisioningClaimRequest"},
+      "output":{"shape":"CreateProvisioningClaimResponse"},
+      "errors":[
+        {"shape":"InvalidRequestException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"UnauthorizedException"},
+        {"shape":"ServiceUnavailableException"},
+        {"shape":"InternalFailureException"}
+      ],
+      "documentation":"<p>Creates a provisioning claim.</p>"
+    },
+    "CreateProvisioningTemplate":{
+      "name":"CreateProvisioningTemplate",
+      "http":{
+        "method":"POST",
+        "requestUri":"/provisioning-templates"
+      },
+      "input":{"shape":"CreateProvisioningTemplateRequest"},
+      "output":{"shape":"CreateProvisioningTemplateResponse"},
+      "errors":[
+        {"shape":"InternalFailureException"},
+        {"shape":"InvalidRequestException"},
+        {"shape":"LimitExceededException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"UnauthorizedException"},
+        {"shape":"ResourceAlreadyExistsException"}
+      ],
+      "documentation":"<p>Creates a fleet provisioning template.</p>"
+    },
+    "CreateProvisioningTemplateVersion":{
+      "name":"CreateProvisioningTemplateVersion",
+      "http":{
+        "method":"POST",
+        "requestUri":"/provisioning-templates/{templateName}/versions"
+      },
+      "input":{"shape":"CreateProvisioningTemplateVersionRequest"},
+      "output":{"shape":"CreateProvisioningTemplateVersionResponse"},
+      "errors":[
+        {"shape":"VersionsLimitExceededException"},
+        {"shape":"InternalFailureException"},
+        {"shape":"InvalidRequestException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"UnauthorizedException"},
+        {"shape":"ConflictingResourceUpdateException"}
+      ],
+      "documentation":"<p>Creates a new version of a fleet provisioning template.</p>"
+    },
     "CreateRoleAlias":{
       "name":"CreateRoleAlias",
       "http":{
@@ -504,7 +613,7 @@
         {"shape":"ServiceUnavailableException"},
         {"shape":"InternalFailureException"}
       ],
-      "documentation":"<p>Creates a stream for delivering one or more large files in chunks over MQTT. A stream transports data bytes in chunks or blocks packaged as MQTT messages from a source like S3. You can have one or more files associated with a stream. The total size of a file associated with the stream cannot exceed more than 2 MB. The stream will be created with version 0. If a stream is created with the same streamID as a stream that existed and was deleted within last 90 days, we will resurrect that old stream by incrementing the version by 1.</p>"
+      "documentation":"<p>Creates a stream for delivering one or more large files in chunks over MQTT. A stream transports data bytes in chunks or blocks packaged as MQTT messages from a source like S3. You can have one or more files associated with a stream.</p>"
     },
     "CreateThing":{
       "name":"CreateThing",
@@ -523,7 +632,7 @@
         {"shape":"ResourceAlreadyExistsException"},
         {"shape":"ResourceNotFoundException"}
       ],
-      "documentation":"<p>Creates a thing record in the registry. If this call is made multiple times using the same thing name and configuration, the call will succeed. If this call is made with the same thing name but different configuration a <code>ResourceAlreadyExistsException</code> is thrown.</p> <note> <p>This is a control plane operation. See <a href=\"https://docs.aws.amazon.com/iot/latest/developerguide/authorization.html\">Authorization</a> for information about authorizing control plane actions.</p> </note>"
+      "documentation":"<p>Creates a thing record in the registry. If this call is made multiple times using the same thing name and configuration, the call will succeed. If this call is made with the same thing name but different configuration a <code>ResourceAlreadyExistsException</code> is thrown.</p> <note> <p>This is a control plane operation. See <a href=\"https://docs.aws.amazon.com/iot/latest/developerguide/iot-authorization.html\">Authorization</a> for information about authorizing control plane actions.</p> </note>"
     },
     "CreateThingGroup":{
       "name":"CreateThingGroup",
@@ -539,7 +648,7 @@
         {"shape":"ThrottlingException"},
         {"shape":"InternalFailureException"}
       ],
-      "documentation":"<p>Create a thing group.</p> <note> <p>This is a control plane operation. See <a href=\"https://docs.aws.amazon.com/iot/latest/developerguide/authorization.html\">Authorization</a> for information about authorizing control plane actions.</p> </note>"
+      "documentation":"<p>Create a thing group.</p> <note> <p>This is a control plane operation. See <a href=\"https://docs.aws.amazon.com/iot/latest/developerguide/iot-authorization.html\">Authorization</a> for information about authorizing control plane actions.</p> </note>"
     },
     "CreateThingType":{
       "name":"CreateThingType",
@@ -576,6 +685,23 @@
       ],
       "documentation":"<p>Creates a rule. Creating rules is an administrator-level action. Any user who has permission to create rules will be able to access data processed by the rule.</p>"
     },
+    "CreateTopicRuleDestination":{
+      "name":"CreateTopicRuleDestination",
+      "http":{
+        "method":"POST",
+        "requestUri":"/destinations"
+      },
+      "input":{"shape":"CreateTopicRuleDestinationRequest"},
+      "output":{"shape":"CreateTopicRuleDestinationResponse"},
+      "errors":[
+        {"shape":"InternalException"},
+        {"shape":"InvalidRequestException"},
+        {"shape":"ResourceAlreadyExistsException"},
+        {"shape":"ServiceUnavailableException"},
+        {"shape":"ConflictingResourceUpdateException"}
+      ],
+      "documentation":"<p>Creates a topic rule destination. The destination must be confirmed prior to use.</p>"
+    },
     "DeleteAccountAuditConfiguration":{
       "name":"DeleteAccountAuditConfiguration",
       "http":{
@@ -665,6 +791,39 @@
       ],
       "documentation":"<p>Deletes the specified certificate.</p> <p>A certificate cannot be deleted if it has a policy or IoT thing attached to it or if its status is set to ACTIVE. To delete a certificate, first use the <a>DetachPrincipalPolicy</a> API to detach all policies. Next, use the <a>UpdateCertificate</a> API to set the certificate to the INACTIVE status.</p>"
     },
+    "DeleteDimension":{
+      "name":"DeleteDimension",
+      "http":{
+        "method":"DELETE",
+        "requestUri":"/dimensions/{name}"
+      },
+      "input":{"shape":"DeleteDimensionRequest"},
+      "output":{"shape":"DeleteDimensionResponse"},
+      "errors":[
+        {"shape":"InternalFailureException"},
+        {"shape":"InvalidRequestException"},
+        {"shape":"ThrottlingException"}
+      ],
+      "documentation":"<p>Removes the specified dimension from your AWS account.</p>"
+    },
+    "DeleteDomainConfiguration":{
+      "name":"DeleteDomainConfiguration",
+      "http":{
+        "method":"DELETE",
+        "requestUri":"/domainConfigurations/{domainConfigurationName}"
+      },
+      "input":{"shape":"DeleteDomainConfigurationRequest"},
+      "output":{"shape":"DeleteDomainConfigurationResponse"},
+      "errors":[
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"UnauthorizedException"},
+        {"shape":"ServiceUnavailableException"},
+        {"shape":"InternalFailureException"},
+        {"shape":"InvalidRequestException"}
+      ],
+      "documentation":"<p>Deletes the specified domain configuration.</p> <note> <p>The domain configuration feature is in public preview and is subject to change.</p> </note>"
+    },
     "DeleteDynamicThingGroup":{
       "name":"DeleteDynamicThingGroup",
       "http":{
@@ -784,6 +943,42 @@
       ],
       "documentation":"<p>Deletes the specified version of the specified policy. You cannot delete the default version of a policy using this API. To delete the default version of a policy, use <a>DeletePolicy</a>. To find out which version of a policy is marked as the default version, use ListPolicyVersions.</p>"
     },
+    "DeleteProvisioningTemplate":{
+      "name":"DeleteProvisioningTemplate",
+      "http":{
+        "method":"DELETE",
+        "requestUri":"/provisioning-templates/{templateName}"
+      },
+      "input":{"shape":"DeleteProvisioningTemplateRequest"},
+      "output":{"shape":"DeleteProvisioningTemplateResponse"},
+      "errors":[
+        {"shape":"InternalFailureException"},
+        {"shape":"InvalidRequestException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"DeleteConflictException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"UnauthorizedException"}
+      ],
+      "documentation":"<p>Deletes a fleet provisioning template.</p>"
+    },
+    "DeleteProvisioningTemplateVersion":{
+      "name":"DeleteProvisioningTemplateVersion",
+      "http":{
+        "method":"DELETE",
+        "requestUri":"/provisioning-templates/{templateName}/versions/{versionId}"
+      },
+      "input":{"shape":"DeleteProvisioningTemplateVersionRequest"},
+      "output":{"shape":"DeleteProvisioningTemplateVersionResponse"},
+      "errors":[
+        {"shape":"InternalFailureException"},
+        {"shape":"InvalidRequestException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"UnauthorizedException"},
+        {"shape":"DeleteConflictException"}
+      ],
+      "documentation":"<p>Deletes a fleet provisioning template version.</p>"
+    },
     "DeleteRegistrationCode":{
       "name":"DeleteRegistrationCode",
       "http":{
@@ -940,6 +1135,23 @@
       ],
       "documentation":"<p>Deletes the rule.</p>"
     },
+    "DeleteTopicRuleDestination":{
+      "name":"DeleteTopicRuleDestination",
+      "http":{
+        "method":"DELETE",
+        "requestUri":"/destinations/{arn+}"
+      },
+      "input":{"shape":"DeleteTopicRuleDestinationRequest"},
+      "output":{"shape":"DeleteTopicRuleDestinationResponse"},
+      "errors":[
+        {"shape":"InternalException"},
+        {"shape":"InvalidRequestException"},
+        {"shape":"ServiceUnavailableException"},
+        {"shape":"UnauthorizedException"},
+        {"shape":"ConflictingResourceUpdateException"}
+      ],
+      "documentation":"<p>Deletes a topic rule destination.</p>"
+    },
     "DeleteV2LoggingLevel":{
       "name":"DeleteV2LoggingLevel",
       "http":{
@@ -1122,6 +1334,39 @@
       ],
       "documentation":"<p>Describes the default authorizer.</p>"
     },
+    "DescribeDimension":{
+      "name":"DescribeDimension",
+      "http":{
+        "method":"GET",
+        "requestUri":"/dimensions/{name}"
+      },
+      "input":{"shape":"DescribeDimensionRequest"},
+      "output":{"shape":"DescribeDimensionResponse"},
+      "errors":[
+        {"shape":"InternalFailureException"},
+        {"shape":"InvalidRequestException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ThrottlingException"}
+      ],
+      "documentation":"<p>Provides details about a dimension that is defined in your AWS account.</p>"
+    },
+    "DescribeDomainConfiguration":{
+      "name":"DescribeDomainConfiguration",
+      "http":{
+        "method":"GET",
+        "requestUri":"/domainConfigurations/{domainConfigurationName}"
+      },
+      "input":{"shape":"DescribeDomainConfigurationRequest"},
+      "output":{"shape":"DescribeDomainConfigurationResponse"},
+      "errors":[
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"UnauthorizedException"},
+        {"shape":"ServiceUnavailableException"},
+        {"shape":"InternalFailureException"}
+      ],
+      "documentation":"<p>Gets summary information about a domain configuration.</p> <note> <p>The domain configuration feature is in public preview and is subject to change.</p> </note>"
+    },
     "DescribeEndpoint":{
       "name":"DescribeEndpoint",
       "http":{
@@ -1218,6 +1463,40 @@
       ],
       "documentation":"<p>Gets information about a mitigation action.</p>"
     },
+    "DescribeProvisioningTemplate":{
+      "name":"DescribeProvisioningTemplate",
+      "http":{
+        "method":"GET",
+        "requestUri":"/provisioning-templates/{templateName}"
+      },
+      "input":{"shape":"DescribeProvisioningTemplateRequest"},
+      "output":{"shape":"DescribeProvisioningTemplateResponse"},
+      "errors":[
+        {"shape":"InternalFailureException"},
+        {"shape":"InvalidRequestException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"UnauthorizedException"}
+      ],
+      "documentation":"<p>Returns information about a fleet provisioning template.</p>"
+    },
+    "DescribeProvisioningTemplateVersion":{
+      "name":"DescribeProvisioningTemplateVersion",
+      "http":{
+        "method":"GET",
+        "requestUri":"/provisioning-templates/{templateName}/versions/{versionId}"
+      },
+      "input":{"shape":"DescribeProvisioningTemplateVersionRequest"},
+      "output":{"shape":"DescribeProvisioningTemplateVersionResponse"},
+      "errors":[
+        {"shape":"InternalFailureException"},
+        {"shape":"InvalidRequestException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"UnauthorizedException"}
+      ],
+      "documentation":"<p>Returns information about a fleet provisioning template version.</p>"
+    },
     "DescribeRoleAlias":{
       "name":"DescribeRoleAlias",
       "http":{
@@ -1456,6 +1735,27 @@
       ],
       "documentation":"<p>Enables the rule.</p>"
     },
+    "GetCardinality":{
+      "name":"GetCardinality",
+      "http":{
+        "method":"POST",
+        "requestUri":"/indices/cardinality"
+      },
+      "input":{"shape":"GetCardinalityRequest"},
+      "output":{"shape":"GetCardinalityResponse"},
+      "errors":[
+        {"shape":"InvalidRequestException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"UnauthorizedException"},
+        {"shape":"ServiceUnavailableException"},
+        {"shape":"InternalFailureException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InvalidQueryException"},
+        {"shape":"InvalidAggregationException"},
+        {"shape":"IndexNotReadyException"}
+      ],
+      "documentation":"<p>Returns the approximate count of unique values that match the query.</p>"
+    },
     "GetEffectivePolicies":{
       "name":"GetEffectivePolicies",
       "http":{
@@ -1490,7 +1790,7 @@
         {"shape":"ServiceUnavailableException"},
         {"shape":"InternalFailureException"}
       ],
-      "documentation":"<p>Gets the search configuration.</p>"
+      "documentation":"<p>Gets the indexing configuration.</p>"
     },
     "GetJobDocument":{
       "name":"GetJobDocument",
@@ -1541,6 +1841,27 @@
       ],
       "documentation":"<p>Gets an OTA update.</p>"
     },
+    "GetPercentiles":{
+      "name":"GetPercentiles",
+      "http":{
+        "method":"POST",
+        "requestUri":"/indices/percentiles"
+      },
+      "input":{"shape":"GetPercentilesRequest"},
+      "output":{"shape":"GetPercentilesResponse"},
+      "errors":[
+        {"shape":"InvalidRequestException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"UnauthorizedException"},
+        {"shape":"ServiceUnavailableException"},
+        {"shape":"InternalFailureException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InvalidQueryException"},
+        {"shape":"InvalidAggregationException"},
+        {"shape":"IndexNotReadyException"}
+      ],
+      "documentation":"<p>Groups the aggregated values that match the query into percentile groupings. The default percentile groupings are: 1,5,25,50,75,95,99, although you can specify your own when you call <code>GetPercentiles</code>. This function returns a value for each percentile group specified (or the default percentile groupings). The percentile group \"1\" contains the aggregated field value that occurs in approximately one percent of the values that match the query. The percentile group \"5\" contains the aggregated field value that occurs in approximately five percent of the values that match the query, and so on. The result is an approximation, the more values that match the query, the more accurate the percentile values.</p>"
+    },
     "GetPolicy":{
       "name":"GetPolicy",
       "http":{
@@ -1613,7 +1934,7 @@
         {"shape":"InvalidAggregationException"},
         {"shape":"IndexNotReadyException"}
       ],
-      "documentation":"<p>Gets statistics about things that match the specified query.</p>"
+      "documentation":"<p>Returns the count, average, sum, minimum, maximum, sum of squares, variance, and standard deviation for the specified aggregated field. If the aggregation field is of type <code>String</code>, only the count statistic is returned.</p>"
     },
     "GetTopicRule":{
       "name":"GetTopicRule",
@@ -1631,6 +1952,22 @@
       ],
       "documentation":"<p>Gets information about the rule.</p>"
     },
+    "GetTopicRuleDestination":{
+      "name":"GetTopicRuleDestination",
+      "http":{
+        "method":"GET",
+        "requestUri":"/destinations/{arn+}"
+      },
+      "input":{"shape":"GetTopicRuleDestinationRequest"},
+      "output":{"shape":"GetTopicRuleDestinationResponse"},
+      "errors":[
+        {"shape":"InternalException"},
+        {"shape":"InvalidRequestException"},
+        {"shape":"ServiceUnavailableException"},
+        {"shape":"UnauthorizedException"}
+      ],
+      "documentation":"<p>Gets information about a topic rule destination.</p>"
+    },
     "GetV2LoggingOptions":{
       "name":"GetV2LoggingOptions",
       "http":{
@@ -1825,6 +2162,38 @@
       ],
       "documentation":"<p>List the device certificates signed by the specified CA certificate.</p>"
     },
+    "ListDimensions":{
+      "name":"ListDimensions",
+      "http":{
+        "method":"GET",
+        "requestUri":"/dimensions"
+      },
+      "input":{"shape":"ListDimensionsRequest"},
+      "output":{"shape":"ListDimensionsResponse"},
+      "errors":[
+        {"shape":"InternalFailureException"},
+        {"shape":"InvalidRequestException"},
+        {"shape":"ThrottlingException"}
+      ],
+      "documentation":"<p>List the set of dimensions that are defined for your AWS account.</p>"
+    },
+    "ListDomainConfigurations":{
+      "name":"ListDomainConfigurations",
+      "http":{
+        "method":"GET",
+        "requestUri":"/domainConfigurations"
+      },
+      "input":{"shape":"ListDomainConfigurationsRequest"},
+      "output":{"shape":"ListDomainConfigurationsResponse"},
+      "errors":[
+        {"shape":"InvalidRequestException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"UnauthorizedException"},
+        {"shape":"ServiceUnavailableException"},
+        {"shape":"InternalFailureException"}
+      ],
+      "documentation":"<p>Gets a list of domain configurations for the user. This list is sorted alphabetically by domain configuration name.</p> <note> <p>The domain configuration feature is in public preview and is subject to change.</p> </note>"
+    },
     "ListIndices":{
       "name":"ListIndices",
       "http":{
@@ -2030,25 +2399,58 @@
       ],
       "documentation":"<p>Lists the things associated with the specified principal. A principal can be X.509 certificates, IAM users, groups, and roles, Amazon Cognito identities or federated identities. </p>"
     },
-    "ListRoleAliases":{
-      "name":"ListRoleAliases",
+    "ListProvisioningTemplateVersions":{
+      "name":"ListProvisioningTemplateVersions",
       "http":{
         "method":"GET",
-        "requestUri":"/role-aliases"
+        "requestUri":"/provisioning-templates/{templateName}/versions"
       },
-      "input":{"shape":"ListRoleAliasesRequest"},
-      "output":{"shape":"ListRoleAliasesResponse"},
+      "input":{"shape":"ListProvisioningTemplateVersionsRequest"},
+      "output":{"shape":"ListProvisioningTemplateVersionsResponse"},
       "errors":[
+        {"shape":"InternalFailureException"},
         {"shape":"InvalidRequestException"},
         {"shape":"ThrottlingException"},
-        {"shape":"UnauthorizedException"},
-        {"shape":"ServiceUnavailableException"},
-        {"shape":"InternalFailureException"}
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"UnauthorizedException"}
       ],
-      "documentation":"<p>Lists the role aliases registered in your account.</p>"
+      "documentation":"<p>A list of fleet provisioning template versions.</p>"
     },
-    "ListScheduledAudits":{
-      "name":"ListScheduledAudits",
+    "ListProvisioningTemplates":{
+      "name":"ListProvisioningTemplates",
+      "http":{
+        "method":"GET",
+        "requestUri":"/provisioning-templates"
+      },
+      "input":{"shape":"ListProvisioningTemplatesRequest"},
+      "output":{"shape":"ListProvisioningTemplatesResponse"},
+      "errors":[
+        {"shape":"InternalFailureException"},
+        {"shape":"InvalidRequestException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"UnauthorizedException"}
+      ],
+      "documentation":"<p>Lists the fleet provisioning templates in your AWS account.</p>"
+    },
+    "ListRoleAliases":{
+      "name":"ListRoleAliases",
+      "http":{
+        "method":"GET",
+        "requestUri":"/role-aliases"
+      },
+      "input":{"shape":"ListRoleAliasesRequest"},
+      "output":{"shape":"ListRoleAliasesResponse"},
+      "errors":[
+        {"shape":"InvalidRequestException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"UnauthorizedException"},
+        {"shape":"ServiceUnavailableException"},
+        {"shape":"InternalFailureException"}
+      ],
+      "documentation":"<p>Lists the role aliases registered in your account.</p>"
+    },
+    "ListScheduledAudits":{
+      "name":"ListScheduledAudits",
       "http":{
         "method":"GET",
         "requestUri":"/audit/scheduledaudits"
@@ -2073,7 +2475,8 @@
       "errors":[
         {"shape":"InvalidRequestException"},
         {"shape":"ThrottlingException"},
-        {"shape":"InternalFailureException"}
+        {"shape":"InternalFailureException"},
+        {"shape":"ResourceNotFoundException"}
       ],
       "documentation":"<p>Lists the Device Defender security profiles you have created. You can use filters to list only those security profiles associated with a thing group or only those associated with your account.</p>"
     },
@@ -2306,6 +2709,22 @@
       ],
       "documentation":"<p>Lists the things in the specified group.</p>"
     },
+    "ListTopicRuleDestinations":{
+      "name":"ListTopicRuleDestinations",
+      "http":{
+        "method":"GET",
+        "requestUri":"/destinations"
+      },
+      "input":{"shape":"ListTopicRuleDestinationsRequest"},
+      "output":{"shape":"ListTopicRuleDestinationsResponse"},
+      "errors":[
+        {"shape":"InternalException"},
+        {"shape":"InvalidRequestException"},
+        {"shape":"ServiceUnavailableException"},
+        {"shape":"UnauthorizedException"}
+      ],
+      "documentation":"<p>Lists all the topic rule destinations in your AWS account.</p>"
+    },
     "ListTopicRules":{
       "name":"ListTopicRules",
       "http":{
@@ -2411,7 +2830,7 @@
         {"shape":"ConflictingResourceUpdateException"},
         {"shape":"ResourceRegistrationFailureException"}
       ],
-      "documentation":"<p>Provisions a thing.</p>"
+      "documentation":"<p>Provisions a thing in the device registry. RegisterThing calls other AWS IoT control plane APIs. These calls might exceed your account level <a href=\"https://docs.aws.amazon.com/general/latest/gr/aws_service_limits.html#limits_iot\"> AWS IoT Throttling Limits</a> and cause throttle errors. Please contact <a href=\"https://console.aws.amazon.com/support/home\">AWS Customer Support</a> to raise your throttling limits if necessary.</p>"
     },
     "RejectCertificateTransfer":{
       "name":"RejectCertificateTransfer",
@@ -2822,6 +3241,41 @@
       ],
       "documentation":"<p>Updates the status of the specified certificate. This operation is idempotent.</p> <p>Moving a certificate from the ACTIVE state (including REVOKED) will not disconnect currently connected devices, but these devices will be unable to reconnect.</p> <p>The ACTIVE state is required to authenticate devices connecting to AWS IoT using a certificate.</p>"
     },
+    "UpdateDimension":{
+      "name":"UpdateDimension",
+      "http":{
+        "method":"PATCH",
+        "requestUri":"/dimensions/{name}"
+      },
+      "input":{"shape":"UpdateDimensionRequest"},
+      "output":{"shape":"UpdateDimensionResponse"},
+      "errors":[
+        {"shape":"InternalFailureException"},
+        {"shape":"InvalidRequestException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ThrottlingException"}
+      ],
+      "documentation":"<p>Updates the definition for a dimension. You cannot change the type of a dimension after it is created (you can delete it and re-create it).</p>"
+    },
+    "UpdateDomainConfiguration":{
+      "name":"UpdateDomainConfiguration",
+      "http":{
+        "method":"PUT",
+        "requestUri":"/domainConfigurations/{domainConfigurationName}"
+      },
+      "input":{"shape":"UpdateDomainConfigurationRequest"},
+      "output":{"shape":"UpdateDomainConfigurationResponse"},
+      "errors":[
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"CertificateValidationException"},
+        {"shape":"InvalidRequestException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"UnauthorizedException"},
+        {"shape":"ServiceUnavailableException"},
+        {"shape":"InternalFailureException"}
+      ],
+      "documentation":"<p>Updates values stored in the domain configuration. Domain configurations for default endpoints can't be updated.</p> <note> <p>The domain configuration feature is in public preview and is subject to change.</p> </note>"
+    },
     "UpdateDynamicThingGroup":{
       "name":"UpdateDynamicThingGroup",
       "http":{
@@ -2903,6 +3357,23 @@
       ],
       "documentation":"<p>Updates the definition for the specified mitigation action.</p>"
     },
+    "UpdateProvisioningTemplate":{
+      "name":"UpdateProvisioningTemplate",
+      "http":{
+        "method":"PATCH",
+        "requestUri":"/provisioning-templates/{templateName}"
+      },
+      "input":{"shape":"UpdateProvisioningTemplateRequest"},
+      "output":{"shape":"UpdateProvisioningTemplateResponse"},
+      "errors":[
+        {"shape":"InternalFailureException"},
+        {"shape":"InvalidRequestException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"UnauthorizedException"},
+        {"shape":"ConflictingResourceUpdateException"}
+      ],
+      "documentation":"<p>Updates a fleet provisioning template.</p>"
+    },
     "UpdateRoleAlias":{
       "name":"UpdateRoleAlias",
       "http":{
@@ -3024,6 +3495,23 @@
       ],
       "documentation":"<p>Updates the groups to which the thing belongs.</p>"
     },
+    "UpdateTopicRuleDestination":{
+      "name":"UpdateTopicRuleDestination",
+      "http":{
+        "method":"PATCH",
+        "requestUri":"/destinations"
+      },
+      "input":{"shape":"UpdateTopicRuleDestinationRequest"},
+      "output":{"shape":"UpdateTopicRuleDestinationResponse"},
+      "errors":[
+        {"shape":"InternalException"},
+        {"shape":"InvalidRequestException"},
+        {"shape":"ServiceUnavailableException"},
+        {"shape":"UnauthorizedException"},
+        {"shape":"ConflictingResourceUpdateException"}
+      ],
+      "documentation":"<p>Updates a topic rule destination. You use this to change the status, endpoint URL, or confirmation URL of the destination.</p>"
+    },
     "ValidateSecurityProfileBehaviors":{
       "name":"ValidateSecurityProfileBehaviors",
       "http":{
@@ -3112,6 +3600,12 @@
       },
       "documentation":"<p>The input for the AcceptCertificateTransfer operation.</p>"
     },
+    "AcmCertificateArn":{
+      "type":"string",
+      "max":2048,
+      "min":1,
+      "pattern":"arn:aws:acm:[a-z]{2}-(gov-)?[a-z]{4,9}-\\d{1}:\\d{12}:certificate/?[a-zA-Z0-9/-]+"
+    },
     "Action":{
       "type":"structure",
       "members":{
@@ -3159,6 +3653,10 @@
           "shape":"CloudwatchAlarmAction",
           "documentation":"<p>Change the state of a CloudWatch alarm.</p>"
         },
+        "cloudwatchLogs":{
+          "shape":"CloudwatchLogsAction",
+          "documentation":"<p>Send data to CloudWatch Logs.</p>"
+        },
         "elasticsearch":{
           "shape":"ElasticsearchAction",
           "documentation":"<p>Write data to an Amazon Elasticsearch Service domain.</p>"
@@ -3175,9 +3673,17 @@
           "shape":"IotEventsAction",
           "documentation":"<p>Sends an input to an AWS IoT Events detector.</p>"
         },
+        "iotSiteWise":{
+          "shape":"IotSiteWiseAction",
+          "documentation":"<p>Sends data from the MQTT message that triggered the rule to AWS IoT SiteWise asset properties.</p>"
+        },
         "stepFunctions":{
           "shape":"StepFunctionsAction",
           "documentation":"<p>Starts execution of a Step Functions state machine.</p>"
+        },
+        "http":{
+          "shape":"HttpAction",
+          "documentation":"<p>Send data to an HTTPS endpoint.</p>"
         }
       },
       "documentation":"<p>Describes the actions associated with a rule.</p>"
@@ -3310,6 +3816,10 @@
       "type":"list",
       "member":{"shape":"BehaviorMetric"}
     },
+    "AdditionalMetricsToRetainV2List":{
+      "type":"list",
+      "member":{"shape":"MetricToRetain"}
+    },
     "AdditionalParameterMap":{
       "type":"map",
       "key":{"shape":"AttributeKey"},
@@ -3349,6 +3859,7 @@
       "key":{"shape":"AlertTargetType"},
       "value":{"shape":"AlertTarget"}
     },
+    "AllowAuthorizerOverride":{"type":"boolean"},
     "AllowAutoRegistration":{"type":"boolean"},
     "Allowed":{
       "type":"structure",
@@ -3362,6 +3873,89 @@
     },
     "ApproximateSecondsBeforeTimedOut":{"type":"long"},
     "AscendingOrder":{"type":"boolean"},
+    "AssetId":{"type":"string"},
+    "AssetPropertyAlias":{
+      "type":"string",
+      "max":2048,
+      "min":1
+    },
+    "AssetPropertyBooleanValue":{"type":"string"},
+    "AssetPropertyDoubleValue":{"type":"string"},
+    "AssetPropertyEntryId":{"type":"string"},
+    "AssetPropertyId":{"type":"string"},
+    "AssetPropertyIntegerValue":{"type":"string"},
+    "AssetPropertyOffsetInNanos":{"type":"string"},
+    "AssetPropertyQuality":{"type":"string"},
+    "AssetPropertyStringValue":{
+      "type":"string",
+      "max":1024,
+      "min":1
+    },
+    "AssetPropertyTimeInSeconds":{"type":"string"},
+    "AssetPropertyTimestamp":{
+      "type":"structure",
+      "required":["timeInSeconds"],
+      "members":{
+        "timeInSeconds":{
+          "shape":"AssetPropertyTimeInSeconds",
+          "documentation":"<p>A string that contains the time in seconds since epoch. Accepts substitution templates.</p>"
+        },
+        "offsetInNanos":{
+          "shape":"AssetPropertyOffsetInNanos",
+          "documentation":"<p>Optional. A string that contains the nanosecond time offset. Accepts substitution templates.</p>"
+        }
+      },
+      "documentation":"<p>An asset property timestamp entry containing the following information.</p>"
+    },
+    "AssetPropertyValue":{
+      "type":"structure",
+      "required":[
+        "value",
+        "timestamp"
+      ],
+      "members":{
+        "value":{
+          "shape":"AssetPropertyVariant",
+          "documentation":"<p>The value of the asset property.</p>"
+        },
+        "timestamp":{
+          "shape":"AssetPropertyTimestamp",
+          "documentation":"<p>The asset property value timestamp.</p>"
+        },
+        "quality":{
+          "shape":"AssetPropertyQuality",
+          "documentation":"<p>Optional. A string that describes the quality of the value. Accepts substitution templates. Must be <code>GOOD</code>, <code>BAD</code>, or <code>UNCERTAIN</code>.</p>"
+        }
+      },
+      "documentation":"<p>An asset property value entry containing the following information.</p>"
+    },
+    "AssetPropertyValueList":{
+      "type":"list",
+      "member":{"shape":"AssetPropertyValue"},
+      "min":1
+    },
+    "AssetPropertyVariant":{
+      "type":"structure",
+      "members":{
+        "stringValue":{
+          "shape":"AssetPropertyStringValue",
+          "documentation":"<p>Optional. The string value of the value entry. Accepts substitution templates.</p>"
+        },
+        "integerValue":{
+          "shape":"AssetPropertyIntegerValue",
+          "documentation":"<p>Optional. A string that contains the integer value of the value entry. Accepts substitution templates.</p>"
+        },
+        "doubleValue":{
+          "shape":"AssetPropertyDoubleValue",
+          "documentation":"<p>Optional. A string that contains the double value of the value entry. Accepts substitution templates.</p>"
+        },
+        "booleanValue":{
+          "shape":"AssetPropertyBooleanValue",
+          "documentation":"<p>Optional. A string that contains the boolean value (<code>true</code> or <code>false</code>) of the value entry. Accepts substitution templates.</p>"
+        }
+      },
+      "documentation":"<p>Contains an asset property value (of a single type).</p>"
+    },
     "AssociateTargetsWithJobRequest":{
       "type":"structure",
       "required":[
@@ -3484,7 +4078,7 @@
         },
         "principal":{
           "shape":"Principal",
-          "documentation":"<p>The principal, such as a certificate or other credential.</p>",
+          "documentation":"<p>The principal, which can be a certificate ARN (as returned from the CreateCertificate operation) or an Amazon Cognito ID.</p>",
           "location":"header",
           "locationName":"x-amzn-principal"
         }
@@ -3922,6 +4516,21 @@
       "member":{"shape":"AuthResult"}
     },
     "AuthorizerArn":{"type":"string"},
+    "AuthorizerConfig":{
+      "type":"structure",
+      "members":{
+        "defaultAuthorizerName":{
+          "shape":"AuthorizerName",
+          "documentation":"<p>The name of the authorization service for a domain configuration.</p>"
+        },
+        "allowAuthorizerOverride":{
+          "shape":"AllowAuthorizerOverride",
+          "documentation":"<p>A Boolean that specifies whether the domain configuration's authorization service can be overridden.</p>",
+          "box":true
+        }
+      },
+      "documentation":"<p>An object that specifies the authorization service for a domain.</p>"
+    },
     "AuthorizerDescription":{
       "type":"structure",
       "members":{
@@ -3956,6 +4565,10 @@
         "lastModifiedDate":{
           "shape":"DateType",
           "documentation":"<p>The UNIX timestamp of when the authorizer was last updated.</p>"
+        },
+        "signingDisabled":{
+          "shape":"BooleanKey",
+          "documentation":"<p>Specifies whether AWS IoT validates the token signature in an authorization request.</p>"
         }
       },
       "documentation":"<p>The authorizer description.</p>"
@@ -3999,6 +4612,7 @@
         "DISABLE"
       ]
     },
+    "Average":{"type":"double"},
     "AwsAccountId":{
       "type":"string",
       "max":12,
@@ -4019,6 +4633,16 @@
       },
       "documentation":"<p>Configuration for the rollout of OTA updates.</p>"
     },
+    "AwsJobPresignedUrlConfig":{
+      "type":"structure",
+      "members":{
+        "expiresInSec":{
+          "shape":"ExpiresInSeconds",
+          "documentation":"<p>How long (in seconds) pre-signed URLs are valid. Valid values are 60 - 3600, the default value is 1800 seconds. Pre-signed URLs are generated when a request for the job document is received.</p>"
+        }
+      },
+      "documentation":"<p>Configuration information for pre-signed URLs. Valid when <code>protocols</code> contains HTTP.</p>"
+    },
     "Behavior":{
       "type":"structure",
       "required":["name"],
@@ -4031,6 +4655,10 @@
           "shape":"BehaviorMetric",
           "documentation":"<p>What is measured by the behavior.</p>"
         },
+        "metricDimension":{
+          "shape":"MetricDimension",
+          "documentation":"<p>The dimension for a metric in your behavior. For example, using a <code>TOPIC_FILTER</code> dimension, you can narrow down the scope of the metric only to MQTT topics whose name match the pattern specified in the dimension.</p>"
+        },
         "criteria":{
           "shape":"BehaviorCriteria",
           "documentation":"<p>The criteria that determine if a device is behaving normally in regard to the <code>metric</code>.</p>"
@@ -4123,6 +4751,7 @@
       "documentation":"<p>The properties of a billing group.</p>"
     },
     "Boolean":{"type":"boolean"},
+    "BooleanKey":{"type":"boolean"},
     "BucketName":{"type":"string"},
     "CACertificate":{
       "type":"structure",
@@ -4573,6 +5202,24 @@
       },
       "documentation":"<p>Describes an action that updates a CloudWatch alarm.</p>"
     },
+    "CloudwatchLogsAction":{
+      "type":"structure",
+      "required":[
+        "roleArn",
+        "logGroupName"
+      ],
+      "members":{
+        "roleArn":{
+          "shape":"AwsArn",
+          "documentation":"<p>The IAM role that allows access to the CloudWatch log.</p>"
+        },
+        "logGroupName":{
+          "shape":"LogGroupName",
+          "documentation":"<p>The CloudWatch log group to which the action sends data.</p>"
+        }
+      },
+      "documentation":"<p>Describes an action that sends data to CloudWatch Logs.</p>"
+    },
     "CloudwatchMetricAction":{
       "type":"structure",
       "required":[
@@ -4683,6 +5330,28 @@
       },
       "documentation":"<p>Configuration.</p>"
     },
+    "ConfirmTopicRuleDestinationRequest":{
+      "type":"structure",
+      "required":["confirmationToken"],
+      "members":{
+        "confirmationToken":{
+          "shape":"ConfirmationToken",
+          "documentation":"<p>The token used to confirm ownership or access to the topic rule confirmation URL.</p>",
+          "location":"uri",
+          "locationName":"confirmationToken"
+        }
+      }
+    },
+    "ConfirmTopicRuleDestinationResponse":{
+      "type":"structure",
+      "members":{
+      }
+    },
+    "ConfirmationToken":{
+      "type":"string",
+      "max":2048,
+      "min":1
+    },
     "ConflictingResourceUpdateException":{
       "type":"structure",
       "members":{
@@ -4711,9 +5380,7 @@
       "type":"structure",
       "required":[
         "authorizerName",
-        "authorizerFunctionArn",
-        "tokenKeyName",
-        "tokenSigningPublicKeys"
+        "authorizerFunctionArn"
       ],
       "members":{
         "authorizerName":{
@@ -4737,6 +5404,10 @@
         "status":{
           "shape":"AuthorizerStatus",
           "documentation":"<p>The status of the create authorizer request.</p>"
+        },
+        "signingDisabled":{
+          "shape":"BooleanKey",
+          "documentation":"<p>Specifies whether AWS IoT validates the token signature in an authorization request.</p>"
         }
       }
     },
@@ -4825,6 +5496,98 @@
       },
       "documentation":"<p>The output from the CreateCertificateFromCsr operation.</p>"
     },
+    "CreateDimensionRequest":{
+      "type":"structure",
+      "required":[
+        "name",
+        "type",
+        "stringValues",
+        "clientRequestToken"
+      ],
+      "members":{
+        "name":{
+          "shape":"DimensionName",
+          "documentation":"<p>A unique identifier for the dimension. Choose something that describes the type and value to make it easy to remember what it does.</p>",
+          "location":"uri",
+          "locationName":"name"
+        },
+        "type":{
+          "shape":"DimensionType",
+          "documentation":"<p>Specifies the type of dimension. Supported types: <code>TOPIC_FILTER.</code> </p>"
+        },
+        "stringValues":{
+          "shape":"DimensionStringValues",
+          "documentation":"<p>Specifies the value or list of values for the dimension. For <code>TOPIC_FILTER</code> dimensions, this is a pattern used to match the MQTT topic (for example, \"admin/#\").</p>"
+        },
+        "tags":{
+          "shape":"TagList",
+          "documentation":"<p>Metadata that can be used to manage the dimension.</p>"
+        },
+        "clientRequestToken":{
+          "shape":"ClientRequestToken",
+          "documentation":"<p>Each dimension must have a unique client request token. If you try to create a new dimension with the same token as a dimension that already exists, an exception occurs. If you omit this value, AWS SDKs will automatically generate a unique client request.</p>",
+          "idempotencyToken":true
+        }
+      }
+    },
+    "CreateDimensionResponse":{
+      "type":"structure",
+      "members":{
+        "name":{
+          "shape":"DimensionName",
+          "documentation":"<p>A unique identifier for the dimension.</p>"
+        },
+        "arn":{
+          "shape":"DimensionArn",
+          "documentation":"<p>The ARN (Amazon resource name) of the created dimension.</p>"
+        }
+      }
+    },
+    "CreateDomainConfigurationRequest":{
+      "type":"structure",
+      "required":["domainConfigurationName"],
+      "members":{
+        "domainConfigurationName":{
+          "shape":"DomainConfigurationName",
+          "documentation":"<p>The name of the domain configuration. This value must be unique to a region.</p>",
+          "location":"uri",
+          "locationName":"domainConfigurationName"
+        },
+        "domainName":{
+          "shape":"DomainName",
+          "documentation":"<p>The name of the domain.</p>"
+        },
+        "serverCertificateArns":{
+          "shape":"ServerCertificateArns",
+          "documentation":"<p>The ARNs of the certificates that AWS IoT passes to the device during the TLS handshake. Currently you can specify only one certificate ARN. This value is not required for AWS-managed domains.</p>"
+        },
+        "validationCertificateArn":{
+          "shape":"AcmCertificateArn",
+          "documentation":"<p>The certificate used to validate the server certificate and prove domain name ownership. This certificate must be signed by a public certificate authority. This value is not required for AWS-managed domains.</p>"
+        },
+        "authorizerConfig":{
+          "shape":"AuthorizerConfig",
+          "documentation":"<p>An object that specifies the authorization service for a domain.</p>"
+        },
+        "serviceType":{
+          "shape":"ServiceType",
+          "documentation":"<p>The type of service delivered by the endpoint.</p>"
+        }
+      }
+    },
+    "CreateDomainConfigurationResponse":{
+      "type":"structure",
+      "members":{
+        "domainConfigurationName":{
+          "shape":"DomainConfigurationName",
+          "documentation":"<p>The name of the domain configuration.</p>"
+        },
+        "domainConfigurationArn":{
+          "shape":"DomainConfigurationArn",
+          "documentation":"<p>The ARN of the domain configuration.</p>"
+        }
+      }
+    },
     "CreateDynamicThingGroupRequest":{
       "type":"structure",
       "required":[
@@ -5059,6 +5822,10 @@
           "shape":"Targets",
           "documentation":"<p>The targeted devices to receive OTA updates.</p>"
         },
+        "protocols":{
+          "shape":"Protocols",
+          "documentation":"<p>The protocol used to transfer the OTA update image. Valid values are [HTTP], [MQTT], [HTTP, MQTT]. When both HTTP and MQTT are specified, the target device can choose the protocol.</p>"
+        },
         "targetSelection":{
           "shape":"TargetSelection",
           "documentation":"<p>Specifies whether the update will continue to run (CONTINUOUS), or will be complete after all the things specified as targets have completed the update (SNAPSHOT). If continuous, the update may also be run on a thing when a change is detected in a target. For example, an update will run on a thing when the thing is added to a target group, even after the update was completed by all things originally in the group. Valid values: CONTINUOUS | SNAPSHOT.</p>"
@@ -5067,6 +5834,10 @@
           "shape":"AwsJobExecutionsRolloutConfig",
           "documentation":"<p>Configuration for the rollout of OTA updates.</p>"
         },
+        "awsJobPresignedUrlConfig":{
+          "shape":"AwsJobPresignedUrlConfig",
+          "documentation":"<p>Configuration information for pre-signed URLs.</p>"
+        },
         "files":{
           "shape":"OTAUpdateFiles",
           "documentation":"<p>The files to be streamed by the OTA update.</p>"
@@ -5200,43 +5971,173 @@
       },
       "documentation":"<p>The output of the CreatePolicyVersion operation.</p>"
     },
-    "CreateRoleAliasRequest":{
+    "CreateProvisioningClaimRequest":{
       "type":"structure",
-      "required":[
-        "roleAlias",
-        "roleArn"
-      ],
+      "required":["templateName"],
       "members":{
-        "roleAlias":{
-          "shape":"RoleAlias",
-          "documentation":"<p>The role alias that points to a role ARN. This allows you to change the role without having to update the device.</p>",
+        "templateName":{
+          "shape":"TemplateName",
+          "documentation":"<p>The name of the provisioning template to use.</p>",
           "location":"uri",
-          "locationName":"roleAlias"
-        },
-        "roleArn":{
-          "shape":"RoleArn",
-          "documentation":"<p>The role ARN.</p>"
-        },
-        "credentialDurationSeconds":{
-          "shape":"CredentialDurationSeconds",
-          "documentation":"<p>How long (in seconds) the credentials will be valid.</p>"
+          "locationName":"templateName"
         }
       }
     },
-    "CreateRoleAliasResponse":{
+    "CreateProvisioningClaimResponse":{
       "type":"structure",
       "members":{
-        "roleAlias":{
-          "shape":"RoleAlias",
-          "documentation":"<p>The role alias.</p>"
+        "certificateId":{
+          "shape":"CertificateId",
+          "documentation":"<p>The ID of the certificate.</p>"
         },
-        "roleAliasArn":{
-          "shape":"RoleAliasArn",
-          "documentation":"<p>The role alias ARN.</p>"
-        }
-      }
-    },
-    "CreateScheduledAuditRequest":{
+        "certificatePem":{
+          "shape":"CertificatePem",
+          "documentation":"<p>The provisioning claim certificate.</p>"
+        },
+        "keyPair":{
+          "shape":"KeyPair",
+          "documentation":"<p>The provisioning claim key pair.</p>"
+        },
+        "expiration":{
+          "shape":"DateType",
+          "documentation":"<p>The provisioning claim expiration time.</p>"
+        }
+      }
+    },
+    "CreateProvisioningTemplateRequest":{
+      "type":"structure",
+      "required":[
+        "templateName",
+        "templateBody",
+        "provisioningRoleArn"
+      ],
+      "members":{
+        "templateName":{
+          "shape":"TemplateName",
+          "documentation":"<p>The name of the fleet provisioning template.</p>"
+        },
+        "description":{
+          "shape":"TemplateDescription",
+          "documentation":"<p>The description of the fleet provisioning template.</p>"
+        },
+        "templateBody":{
+          "shape":"TemplateBody",
+          "documentation":"<p>The JSON formatted contents of the fleet provisioning template.</p>"
+        },
+        "enabled":{
+          "shape":"Enabled",
+          "documentation":"<p>True to enable the fleet provisioning template, otherwise false.</p>"
+        },
+        "provisioningRoleArn":{
+          "shape":"RoleArn",
+          "documentation":"<p>The role ARN for the role associated with the fleet provisioning template. This IoT role grants permission to provision a device.</p>"
+        },
+        "tags":{
+          "shape":"TagList",
+          "documentation":"<p>Metadata which can be used to manage the fleet provisioning template.</p> <note> <p>For URI Request parameters use format: ...key1=value1&amp;key2=value2...</p> <p>For the CLI command-line parameter use format: &amp;&amp;tags \"key1=value1&amp;key2=value2...\"</p> <p>For the cli-input-json file use format: \"tags\": \"key1=value1&amp;key2=value2...\"</p> </note>"
+        }
+      }
+    },
+    "CreateProvisioningTemplateResponse":{
+      "type":"structure",
+      "members":{
+        "templateArn":{
+          "shape":"TemplateArn",
+          "documentation":"<p>The ARN that identifies the provisioning template.</p>"
+        },
+        "templateName":{
+          "shape":"TemplateName",
+          "documentation":"<p>The name of the fleet provisioning template.</p>"
+        },
+        "defaultVersionId":{
+          "shape":"TemplateVersionId",
+          "documentation":"<p>The default version of the fleet provisioning template.</p>"
+        }
+      }
+    },
+    "CreateProvisioningTemplateVersionRequest":{
+      "type":"structure",
+      "required":[
+        "templateName",
+        "templateBody"
+      ],
+      "members":{
+        "templateName":{
+          "shape":"TemplateName",
+          "documentation":"<p>The name of the fleet provisioning template.</p>",
+          "location":"uri",
+          "locationName":"templateName"
+        },
+        "templateBody":{
+          "shape":"TemplateBody",
+          "documentation":"<p>The JSON formatted contents of the fleet provisioning template.</p>"
+        },
+        "setAsDefault":{
+          "shape":"SetAsDefault",
+          "documentation":"<p>Sets a fleet provision template version as the default version.</p>",
+          "location":"querystring",
+          "locationName":"setAsDefault"
+        }
+      }
+    },
+    "CreateProvisioningTemplateVersionResponse":{
+      "type":"structure",
+      "members":{
+        "templateArn":{
+          "shape":"TemplateArn",
+          "documentation":"<p>The ARN that identifies the provisioning template.</p>"
+        },
+        "templateName":{
+          "shape":"TemplateName",
+          "documentation":"<p>The name of the fleet provisioning template.</p>"
+        },
+        "versionId":{
+          "shape":"TemplateVersionId",
+          "documentation":"<p>The version of the fleet provisioning template.</p>"
+        },
+        "isDefaultVersion":{
+          "shape":"IsDefaultVersion",
+          "documentation":"<p>True if the fleet provisioning template version is the default version, otherwise false.</p>"
+        }
+      }
+    },
+    "CreateRoleAliasRequest":{
+      "type":"structure",
+      "required":[
+        "roleAlias",
+        "roleArn"
+      ],
+      "members":{
+        "roleAlias":{
+          "shape":"RoleAlias",
+          "documentation":"<p>The role alias that points to a role ARN. This allows you to change the role without having to update the device.</p>",
+          "location":"uri",
+          "locationName":"roleAlias"
+        },
+        "roleArn":{
+          "shape":"RoleArn",
+          "documentation":"<p>The role ARN.</p>"
+        },
+        "credentialDurationSeconds":{
+          "shape":"CredentialDurationSeconds",
+          "documentation":"<p>How long (in seconds) the credentials will be valid.</p>"
+        }
+      }
+    },
+    "CreateRoleAliasResponse":{
+      "type":"structure",
+      "members":{
+        "roleAlias":{
+          "shape":"RoleAlias",
+          "documentation":"<p>The role alias.</p>"
+        },
+        "roleAliasArn":{
+          "shape":"RoleAliasArn",
+          "documentation":"<p>The role alias ARN.</p>"
+        }
+      }
+    },
+    "CreateScheduledAuditRequest":{
       "type":"structure",
       "required":[
         "frequency",
@@ -5305,6 +6206,12 @@
         },
         "additionalMetricsToRetain":{
           "shape":"AdditionalMetricsToRetainList",
+          "documentation":"<p>A list of metrics whose data is retained (stored). By default, data is retained for any metric used in the profile's <code>behaviors</code>, but it is also retained for any metric specified here.</p> <p> <b>Note:</b> This API field is deprecated. Please use <a>CreateSecurityProfileRequest$additionalMetricsToRetainV2</a> instead.</p>",
+          "deprecated":true,
+          "deprecatedMessage":"Use additionalMetricsToRetainV2."
+        },
+        "additionalMetricsToRetainV2":{
+          "shape":"AdditionalMetricsToRetainV2List",
           "documentation":"<p>A list of metrics whose data is retained (stored). By default, data is retained for any metric used in the profile's <code>behaviors</code>, but it is also retained for any metric specified here.</p>"
         },
         "tags":{
@@ -5502,6 +6409,25 @@
       },
       "documentation":"<p>The output of the CreateThingType operation.</p>"
     },
+    "CreateTopicRuleDestinationRequest":{
+      "type":"structure",
+      "required":["destinationConfiguration"],
+      "members":{
+        "destinationConfiguration":{
+          "shape":"TopicRuleDestinationConfiguration",
+          "documentation":"<p>The topic rule destination configuration.</p>"
+        }
+      }
+    },
+    "CreateTopicRuleDestinationResponse":{
+      "type":"structure",
+      "members":{
+        "topicRuleDestination":{
+          "shape":"TopicRuleDestination",
+          "documentation":"<p>The topic rule destination.</p>"
+        }
+      }
+    },
     "CreateTopicRuleRequest":{
       "type":"structure",
       "required":[
@@ -5688,6 +6614,40 @@
       "error":{"httpStatusCode":409},
       "exception":true
     },
+    "DeleteDimensionRequest":{
+      "type":"structure",
+      "required":["name"],
+      "members":{
+        "name":{
+          "shape":"DimensionName",
+          "documentation":"<p>The unique identifier for the dimension that you want to delete.</p>",
+          "location":"uri",
+          "locationName":"name"
+        }
+      }
+    },
+    "DeleteDimensionResponse":{
+      "type":"structure",
+      "members":{
+      }
+    },
+    "DeleteDomainConfigurationRequest":{
+      "type":"structure",
+      "required":["domainConfigurationName"],
+      "members":{
+        "domainConfigurationName":{
+          "shape":"DomainConfigurationName",
+          "documentation":"<p>The name of the domain configuration to be deleted.</p>",
+          "location":"uri",
+          "locationName":"domainConfigurationName"
+        }
+      }
+    },
+    "DeleteDomainConfigurationResponse":{
+      "type":"structure",
+      "members":{
+      }
+    },
     "DeleteDynamicThingGroupRequest":{
       "type":"structure",
       "required":["thingGroupName"],
@@ -5844,6 +6804,49 @@
       },
       "documentation":"<p>The input for the DeletePolicyVersion operation.</p>"
     },
+    "DeleteProvisioningTemplateRequest":{
+      "type":"structure",
+      "required":["templateName"],
+      "members":{
+        "templateName":{
+          "shape":"TemplateName",
+          "documentation":"<p>The name of the fleet provision template to delete.</p>",
+          "location":"uri",
+          "locationName":"templateName"
+        }
+      }
+    },
+    "DeleteProvisioningTemplateResponse":{
+      "type":"structure",
+      "members":{
+      }
+    },
+    "DeleteProvisioningTemplateVersionRequest":{
+      "type":"structure",
+      "required":[
+        "templateName",
+        "versionId"
+      ],
+      "members":{
+        "templateName":{
+          "shape":"TemplateName",
+          "documentation":"<p>The name of the fleet provisioning template version to delete.</p>",
+          "location":"uri",
+          "locationName":"templateName"
+        },
+        "versionId":{
+          "shape":"TemplateVersionId",
+          "documentation":"<p>The fleet provisioning template version ID to delete.</p>",
+          "location":"uri",
+          "locationName":"versionId"
+        }
+      }
+    },
+    "DeleteProvisioningTemplateVersionResponse":{
+      "type":"structure",
+      "members":{
+      }
+    },
     "DeleteRegistrationCodeRequest":{
       "type":"structure",
       "members":{
@@ -5999,6 +7002,23 @@
       },
       "documentation":"<p>The output for the DeleteThingType operation.</p>"
     },
+    "DeleteTopicRuleDestinationRequest":{
+      "type":"structure",
+      "required":["arn"],
+      "members":{
+        "arn":{
+          "shape":"AwsArn",
+          "documentation":"<p>The ARN of the topic rule destination to delete.</p>",
+          "location":"uri",
+          "locationName":"arn"
+        }
+      }
+    },
+    "DeleteTopicRuleDestinationResponse":{
+      "type":"structure",
+      "members":{
+      }
+    },
     "DeleteTopicRuleRequest":{
       "type":"structure",
       "required":["ruleName"],
@@ -6324,12 +7344,102 @@
         }
       }
     },
+    "DescribeDimensionRequest":{
+      "type":"structure",
+      "required":["name"],
+      "members":{
+        "name":{
+          "shape":"DimensionName",
+          "documentation":"<p>The unique identifier for the dimension.</p>",
+          "location":"uri",
+          "locationName":"name"
+        }
+      }
+    },
+    "DescribeDimensionResponse":{
+      "type":"structure",
+      "members":{
+        "name":{
+          "shape":"DimensionName",
+          "documentation":"<p>The unique identifier for the dimension.</p>"
+        },
+        "arn":{
+          "shape":"DimensionArn",
+          "documentation":"<p>The ARN (Amazon resource name) for the dimension.</p>"
+        },
+        "type":{
+          "shape":"DimensionType",
+          "documentation":"<p>The type of the dimension.</p>"
+        },
+        "stringValues":{
+          "shape":"DimensionStringValues",
+          "documentation":"<p>The value or list of values used to scope the dimension. For example, for topic filters, this is the pattern used to match the MQTT topic name.</p>"
+        },
+        "creationDate":{
+          "shape":"Timestamp",
+          "documentation":"<p>The date the dimension was created.</p>"
+        },
+        "lastModifiedDate":{
+          "shape":"Timestamp",
+          "documentation":"<p>The date the dimension was last modified.</p>"
+        }
+      }
+    },
+    "DescribeDomainConfigurationRequest":{
+      "type":"structure",
+      "required":["domainConfigurationName"],
+      "members":{
+        "domainConfigurationName":{
+          "shape":"ReservedDomainConfigurationName",
+          "documentation":"<p>The name of the domain configuration.</p>",
+          "location":"uri",
+          "locationName":"domainConfigurationName"
+        }
+      }
+    },
+    "DescribeDomainConfigurationResponse":{
+      "type":"structure",
+      "members":{
+        "domainConfigurationName":{
+          "shape":"ReservedDomainConfigurationName",
+          "documentation":"<p>The name of the domain configuration.</p>"
+        },
+        "domainConfigurationArn":{
+          "shape":"DomainConfigurationArn",
+          "documentation":"<p>The ARN of the domain configuration.</p>"
+        },
+        "domainName":{
+          "shape":"DomainName",
+          "documentation":"<p>The name of the domain.</p>"
+        },
+        "serverCertificates":{
+          "shape":"ServerCertificates",
+          "documentation":"<p>A list containing summary information about the server certificate included in the domain configuration.</p>"
+        },
+        "authorizerConfig":{
+          "shape":"AuthorizerConfig",
+          "documentation":"<p>An object that specifies the authorization service for a domain.</p>"
+        },
+        "domainConfigurationStatus":{
+          "shape":"DomainConfigurationStatus",
+          "documentation":"<p>A Boolean value that specifies the current state of the domain configuration.</p>"
+        },
+        "serviceType":{
+          "shape":"ServiceType",
+          "documentation":"<p>The type of service delivered by the endpoint.</p>"
+        },
+        "domainType":{
+          "shape":"DomainType",
+          "documentation":"<p>The type of the domain.</p>"
+        }
+      }
+    },
     "DescribeEndpointRequest":{
       "type":"structure",
       "members":{
         "endpointType":{
           "shape":"EndpointType",
-          "documentation":"<p>The endpoint type. Valid endpoint types include:</p> <ul> <li> <p> <code>iot:Data</code> - Returns a VeriSign signed data endpoint.</p> </li> </ul> <ul> <li> <p> <code>iot:Data-ATS</code> - Returns an ATS signed data endpoint.</p> </li> </ul> <ul> <li> <p> <code>iot:CredentialProvider</code> - Returns an AWS IoT credentials provider API endpoint.</p> </li> </ul> <ul> <li> <p> <code>iot:Jobs</code> - Returns an AWS IoT device management Jobs API endpoint.</p> </li> </ul>",
+          "documentation":"<p>The endpoint type. Valid endpoint types include:</p> <ul> <li> <p> <code>iot:Data</code> - Returns a VeriSign signed data endpoint.</p> </li> </ul> <ul> <li> <p> <code>iot:Data-ATS</code> - Returns an ATS signed data endpoint.</p> </li> </ul> <ul> <li> <p> <code>iot:CredentialProvider</code> - Returns an AWS IoT credentials provider API endpoint.</p> </li> </ul> <ul> <li> <p> <code>iot:Jobs</code> - Returns an AWS IoT device management Jobs API endpoint.</p> </li> </ul> <p>We strongly recommend that customers use the newer <code>iot:Data-ATS</code> endpoint type to avoid issues related to the widespread distrust of Symantec certificate authorities.</p>",
           "location":"querystring",
           "locationName":"endpointType"
         }
@@ -6507,6 +7617,101 @@
         }
       }
     },
+    "DescribeProvisioningTemplateRequest":{
+      "type":"structure",
+      "required":["templateName"],
+      "members":{
+        "templateName":{
+          "shape":"TemplateName",
+          "documentation":"<p>The name of the fleet provisioning template.</p>",
+          "location":"uri",
+          "locationName":"templateName"
+        }
+      }
+    },
+    "DescribeProvisioningTemplateResponse":{
+      "type":"structure",
+      "members":{
+        "templateArn":{
+          "shape":"TemplateArn",
+          "documentation":"<p>The ARN of the fleet provisioning template.</p>"
+        },
+        "templateName":{
+          "shape":"TemplateName",
+          "documentation":"<p>The name of the fleet provisioning template.</p>"
+        },
+        "description":{
+          "shape":"TemplateDescription",
+          "documentation":"<p>The description of the fleet provisioning template.</p>"
+        },
+        "creationDate":{
+          "shape":"DateType",
+          "documentation":"<p>The date when the fleet provisioning template was created.</p>"
+        },
+        "lastModifiedDate":{
+          "shape":"DateType",
+          "documentation":"<p>The date when the fleet provisioning template was last modified.</p>"
+        },
+        "defaultVersionId":{
+          "shape":"TemplateVersionId",
+          "documentation":"<p>The default fleet template version ID.</p>"
+        },
+        "templateBody":{
+          "shape":"TemplateBody",
+          "documentation":"<p>The JSON formatted contents of the fleet provisioning template.</p>"
+        },
+        "enabled":{
+          "shape":"Enabled",
+          "documentation":"<p>True if the fleet provisioning template is enabled, otherwise false.</p>"
+        },
+        "provisioningRoleArn":{
+          "shape":"RoleArn",
+          "documentation":"<p>The ARN of the role associated with the provisioning template. This IoT role grants permission to provision a device.</p>"
+        }
+      }
+    },
+    "DescribeProvisioningTemplateVersionRequest":{
+      "type":"structure",
+      "required":[
+        "templateName",
+        "versionId"
+      ],
+      "members":{
+        "templateName":{
+          "shape":"TemplateName",
+          "documentation":"<p>The template name.</p>",
+          "location":"uri",
+          "locationName":"templateName"
+        },
+        "versionId":{
+          "shape":"TemplateVersionId",
+          "documentation":"<p>The fleet provisioning template version ID.</p>",
+          "location":"uri",
+          "locationName":"versionId"
+        }
+      }
+    },
+    "DescribeProvisioningTemplateVersionResponse":{
+      "type":"structure",
+      "members":{
+        "versionId":{
+          "shape":"TemplateVersionId",
+          "documentation":"<p>The fleet provisioning template version ID.</p>"
+        },
+        "creationDate":{
+          "shape":"DateType",
+          "documentation":"<p>The date when the fleet provisioning template version was created.</p>"
+        },
+        "templateBody":{
+          "shape":"TemplateBody",
+          "documentation":"<p>The JSON formatted contents of the fleet provisioning template version.</p>"
+        },
+        "isDefaultVersion":{
+          "shape":"IsDefaultVersion",
+          "documentation":"<p>True if the fleet provisioning template version is the default version.</p>"
+        }
+      }
+    },
     "DescribeRoleAliasRequest":{
       "type":"structure",
       "required":["roleAlias"],
@@ -6606,7 +7811,13 @@
         },
         "additionalMetricsToRetain":{
           "shape":"AdditionalMetricsToRetainList",
-          "documentation":"<p>A list of metrics whose data is retained (stored). By default, data is retained for any metric used in the profile's <code>behaviors</code>, but it is also retained for any metric specified here.</p>"
+          "documentation":"<p>A list of metrics whose data is retained (stored). By default, data is retained for any metric used in the profile's <code>behaviors</code>, but it is also retained for any metric specified here.</p> <p> <b>Note:</b> This API field is deprecated. Please use <a>DescribeSecurityProfileResponse$additionalMetricsToRetainV2</a> instead.</p>",
+          "deprecated":true,
+          "deprecatedMessage":"Use additionalMetricsToRetainV2."
+        },
+        "additionalMetricsToRetainV2":{
+          "shape":"AdditionalMetricsToRetainV2List",
+          "documentation":"<p>A list of metrics whose data is retained (stored). By default, data is retained for any metric used in the profile's behaviors, but it is also retained for any metric specified here.</p>"
         },
         "version":{
           "shape":"Version",
@@ -6987,6 +8198,39 @@
       "max":128,
       "min":1
     },
+    "DimensionArn":{"type":"string"},
+    "DimensionName":{
+      "type":"string",
+      "max":128,
+      "min":1,
+      "pattern":"[a-zA-Z0-9:_-]+"
+    },
+    "DimensionNames":{
+      "type":"list",
+      "member":{"shape":"DimensionName"}
+    },
+    "DimensionStringValue":{
+      "type":"string",
+      "max":256,
+      "min":1
+    },
+    "DimensionStringValues":{
+      "type":"list",
+      "member":{"shape":"DimensionStringValue"},
+      "max":100,
+      "min":1
+    },
+    "DimensionType":{
+      "type":"string",
+      "enum":["TOPIC_FILTER"]
+    },
+    "DimensionValueOperator":{
+      "type":"string",
+      "enum":[
+        "IN",
+        "NOT_IN"
+      ]
+    },
     "DisableAllLogs":{"type":"boolean"},
     "DisableTopicRuleRequest":{
       "type":"structure",
@@ -7001,6 +8245,55 @@
       },
       "documentation":"<p>The input for the DisableTopicRuleRequest operation.</p>"
     },
+    "DomainConfigurationArn":{"type":"string"},
+    "DomainConfigurationName":{
+      "type":"string",
+      "max":128,
+      "min":1,
+      "pattern":"[\\w.-]+"
+    },
+    "DomainConfigurationStatus":{
+      "type":"string",
+      "enum":[
+        "ENABLED",
+        "DISABLED"
+      ]
+    },
+    "DomainConfigurationSummary":{
+      "type":"structure",
+      "members":{
+        "domainConfigurationName":{
+          "shape":"ReservedDomainConfigurationName",
+          "documentation":"<p>The name of the domain configuration. This value must be unique to a region.</p>"
+        },
+        "domainConfigurationArn":{
+          "shape":"DomainConfigurationArn",
+          "documentation":"<p>The ARN of the domain configuration.</p>"
+        },
+        "serviceType":{
+          "shape":"ServiceType",
+          "documentation":"<p>The type of service delivered by the endpoint.</p>"
+        }
+      },
+      "documentation":"<p>The summary of a domain configuration. A domain configuration specifies custom IoT-specific information about a domain. A domain configuration can be associated with an AWS-managed domain (for example, dbc123defghijk.iot.us-west-2.amazonaws.com), a customer managed domain, or a default endpoint.</p> <ul> <li> <p>Data</p> </li> <li> <p>Jobs</p> </li> <li> <p>CredentialProvider</p> </li> </ul> <note> <p>The domain configuration feature is in public preview and is subject to change.</p> </note>"
+    },
+    "DomainConfigurations":{
+      "type":"list",
+      "member":{"shape":"DomainConfigurationSummary"}
+    },
+    "DomainName":{
+      "type":"string",
+      "max":253,
+      "min":1
+    },
+    "DomainType":{
+      "type":"string",
+      "enum":[
+        "ENDPOINT",
+        "AWS_MANAGED",
+        "CUSTOMER_MANAGED"
+      ]
+    },
     "DurationSeconds":{"type":"integer"},
     "DynamicGroupStatus":{
       "type":"string",
@@ -7183,7 +8476,10 @@
     },
     "Enabled":{"type":"boolean"},
     "EndpointAddress":{"type":"string"},
-    "EndpointType":{"type":"string"},
+    "EndpointType":{
+      "type":"string",
+      "max":128
+    },
     "ErrorCode":{"type":"string"},
     "ErrorInfo":{
       "type":"structure",
@@ -7236,6 +8532,7 @@
       "max":3600,
       "min":60
     },
+    "ExpiresInSeconds":{"type":"long"},
     "ExplicitDeny":{
       "type":"structure",
       "members":{
@@ -7272,6 +8569,33 @@
     "FailedChecksCount":{"type":"integer"},
     "FailedFindingsCount":{"type":"long"},
     "FailedThings":{"type":"integer"},
+    "Field":{
+      "type":"structure",
+      "members":{
+        "name":{
+          "shape":"FieldName",
+          "documentation":"<p>The name of the field.</p>"
+        },
+        "type":{
+          "shape":"FieldType",
+          "documentation":"<p>The datatype of the field.</p>"
+        }
+      },
+      "documentation":"<p>Describes the name and data type at a field.</p>"
+    },
+    "FieldName":{"type":"string"},
+    "FieldType":{
+      "type":"string",
+      "enum":[
+        "Number",
+        "String",
+        "Boolean"
+      ]
+    },
+    "Fields":{
+      "type":"list",
+      "member":{"shape":"Field"}
+    },
     "FileId":{
       "type":"integer",
       "max":255,
@@ -7336,12 +8660,38 @@
     "ForceFlag":{"type":"boolean"},
     "Forced":{"type":"boolean"},
     "FunctionArn":{"type":"string"},
-    "GEMaxResults":{
-      "type":"integer",
-      "max":10000,
-      "min":1
-    },
     "GenerationId":{"type":"string"},
+    "GetCardinalityRequest":{
+      "type":"structure",
+      "required":["queryString"],
+      "members":{
+        "indexName":{
+          "shape":"IndexName",
+          "documentation":"<p>The name of the index to search.</p>"
+        },
+        "queryString":{
+          "shape":"QueryString",
+          "documentation":"<p>The search query.</p>"
+        },
+        "aggregationField":{
+          "shape":"AggregationField",
+          "documentation":"<p>The field to aggregate.</p>"
+        },
+        "queryVersion":{
+          "shape":"QueryVersion",
+          "documentation":"<p>The query version.</p>"
+        }
+      }
+    },
+    "GetCardinalityResponse":{
+      "type":"structure",
+      "members":{
+        "cardinality":{
+          "shape":"Count",
+          "documentation":"<p>The approximate count of unique values that match the query.</p>"
+        }
+      }
+    },
     "GetEffectivePoliciesRequest":{
       "type":"structure",
       "members":{
@@ -7450,6 +8800,41 @@
         }
       }
     },
+    "GetPercentilesRequest":{
+      "type":"structure",
+      "required":["queryString"],
+      "members":{
+        "indexName":{
+          "shape":"IndexName",
+          "documentation":"<p>The name of the index to search.</p>"
+        },
+        "queryString":{
+          "shape":"QueryString",
+          "documentation":"<p>The query string.</p>"
+        },
+        "aggregationField":{
+          "shape":"AggregationField",
+          "documentation":"<p>The field to aggregate.</p>"
+        },
+        "queryVersion":{
+          "shape":"QueryVersion",
+          "documentation":"<p>The query version.</p>"
+        },
+        "percents":{
+          "shape":"PercentList",
+          "documentation":"<p>The percentile groups returned.</p>"
+        }
+      }
+    },
+    "GetPercentilesResponse":{
+      "type":"structure",
+      "members":{
+        "percentiles":{
+          "shape":"Percentiles",
+          "documentation":"<p>The percentile values of the aggregated fields.</p>"
+        }
+      }
+    },
     "GetPolicyRequest":{
       "type":"structure",
       "required":["policyName"],
@@ -7544,11 +8929,11 @@
         },
         "creationDate":{
           "shape":"DateType",
-          "documentation":"<p>The date the policy version was created.</p>"
+          "documentation":"<p>The date the policy was created.</p>"
         },
         "lastModifiedDate":{
           "shape":"DateType",
-          "documentation":"<p>The date the policy version was last modified.</p>"
+          "documentation":"<p>The date the policy was last modified.</p>"
         },
         "generationId":{
           "shape":"GenerationId",
@@ -7587,7 +8972,7 @@
         },
         "aggregationField":{
           "shape":"AggregationField",
-          "documentation":"<p>The aggregation field name. Currently not supported.</p>"
+          "documentation":"<p>The aggregation field name.</p>"
         },
         "queryVersion":{
           "shape":"QueryVersion",
@@ -7604,6 +8989,27 @@
         }
       }
     },
+    "GetTopicRuleDestinationRequest":{
+      "type":"structure",
+      "required":["arn"],
+      "members":{
+        "arn":{
+          "shape":"AwsArn",
+          "documentation":"<p>The ARN of the topic rule destination.</p>",
+          "location":"uri",
+          "locationName":"arn"
+        }
+      }
+    },
+    "GetTopicRuleDestinationResponse":{
+      "type":"structure",
+      "members":{
+        "topicRuleDestination":{
+          "shape":"TopicRuleDestination",
+          "documentation":"<p>The topic rule destination.</p>"
+        }
+      }
+    },
     "GetTopicRuleRequest":{
       "type":"structure",
       "required":["ruleName"],
@@ -7651,25 +9057,153 @@
           "shape":"DisableAllLogs",
           "documentation":"<p>Disables all logs.</p>"
         }
-      }
+      }
+    },
+    "GroupNameAndArn":{
+      "type":"structure",
+      "members":{
+        "groupName":{
+          "shape":"ThingGroupName",
+          "documentation":"<p>The group name.</p>"
+        },
+        "groupArn":{
+          "shape":"ThingGroupArn",
+          "documentation":"<p>The group ARN.</p>"
+        }
+      },
+      "documentation":"<p>The name and ARN of a group.</p>"
+    },
+    "HashAlgorithm":{"type":"string"},
+    "HashKeyField":{"type":"string"},
+    "HashKeyValue":{"type":"string"},
+    "HeaderKey":{
+      "type":"string",
+      "max":256,
+      "min":1
+    },
+    "HeaderList":{
+      "type":"list",
+      "member":{"shape":"HttpActionHeader"},
+      "max":100,
+      "min":0
+    },
+    "HeaderValue":{"type":"string"},
+    "HttpAction":{
+      "type":"structure",
+      "required":["url"],
+      "members":{
+        "url":{
+          "shape":"Url",
+          "documentation":"<p>The endpoint URL. If substitution templates are used in the URL, you must also specify a <code>confirmationUrl</code>. If this is a new destination, a new <code>TopicRuleDestination</code> is created if possible.</p>"
+        },
+        "confirmationUrl":{
+          "shape":"Url",
+          "documentation":"<p>The URL to which AWS IoT sends a confirmation message. The value of the confirmation URL must be a prefix of the endpoint URL. If you do not specify a confirmation URL AWS IoT uses the endpoint URL as the confirmation URL. If you use substitution templates in the confirmationUrl, you must create and enable topic rule destinations that match each possible value of the substitution template before traffic is allowed to your endpoint URL.</p>"
+        },
+        "headers":{
+          "shape":"HeaderList",
+          "documentation":"<p>The HTTP headers to send with the message data.</p>"
+        },
+        "auth":{
+          "shape":"HttpAuthorization",
+          "documentation":"<p>The authentication method to use when sending data to an HTTPS endpoint.</p>"
+        }
+      },
+      "documentation":"<p>Send data to an HTTPS endpoint.</p>"
+    },
+    "HttpActionHeader":{
+      "type":"structure",
+      "required":[
+        "key",
+        "value"
+      ],
+      "members":{
+        "key":{
+          "shape":"HeaderKey",
+          "documentation":"<p>The HTTP header key.</p>"
+        },
+        "value":{
+          "shape":"HeaderValue",
+          "documentation":"<p>The HTTP header value. Substitution templates are supported.</p>"
+        }
+      },
+      "documentation":"<p>The HTTP action header.</p>"
+    },
+    "HttpAuthorization":{
+      "type":"structure",
+      "members":{
+        "sigv4":{
+          "shape":"SigV4Authorization",
+          "documentation":"<p>Use Sig V4 authorization. For more information, see <a href=\"https://docs.aws.amazon.com/general/latest/gr/signature-version-4.html\">Signature Version 4 Signing Process</a>.</p>"
+        }
+      },
+      "documentation":"<p>The authorization method used to send messages.</p>"
+    },
+    "HttpContext":{
+      "type":"structure",
+      "members":{
+        "headers":{
+          "shape":"HttpHeaders",
+          "documentation":"<p>The header keys and values in an HTTP authorization request.</p>"
+        },
+        "queryString":{
+          "shape":"HttpQueryString",
+          "documentation":"<p>The query string keys and values in an HTTP authorization request.</p>"
+        }
+      },
+      "documentation":"<p>Specifies the HTTP context to use for the test authorizer request.</p>"
+    },
+    "HttpHeaderName":{
+      "type":"string",
+      "max":8192,
+      "min":1
+    },
+    "HttpHeaderValue":{
+      "type":"string",
+      "max":8192,
+      "min":1
+    },
+    "HttpHeaders":{
+      "type":"map",
+      "key":{"shape":"HttpHeaderName"},
+      "value":{"shape":"HttpHeaderValue"}
+    },
+    "HttpQueryString":{
+      "type":"string",
+      "max":4096,
+      "min":1
+    },
+    "HttpUrlDestinationConfiguration":{
+      "type":"structure",
+      "required":["confirmationUrl"],
+      "members":{
+        "confirmationUrl":{
+          "shape":"Url",
+          "documentation":"<p>The URL AWS IoT uses to confirm ownership of or access to the topic rule destination URL.</p>"
+        }
+      },
+      "documentation":"<p>HTTP URL destination configuration used by the topic rule's HTTP action.</p>"
     },
-    "GroupNameAndArn":{
+    "HttpUrlDestinationProperties":{
       "type":"structure",
       "members":{
-        "groupName":{
-          "shape":"ThingGroupName",
-          "documentation":"<p>The group name.</p>"
-        },
-        "groupArn":{
-          "shape":"ThingGroupArn",
-          "documentation":"<p>The group ARN.</p>"
+        "confirmationUrl":{
+          "shape":"Url",
+          "documentation":"<p>The URL used to confirm the HTTP topic rule destination URL.</p>"
         }
       },
-      "documentation":"<p>The name and ARN of a group.</p>"
+      "documentation":"<p>HTTP URL destination properties.</p>"
+    },
+    "HttpUrlDestinationSummary":{
+      "type":"structure",
+      "members":{
+        "confirmationUrl":{
+          "shape":"Url",
+          "documentation":"<p>The URL used to confirm ownership of or access to the HTTP topic rule destination URL.</p>"
+        }
+      },
+      "documentation":"<p>Information about an HTTP URL destination.</p>"
     },
-    "HashAlgorithm":{"type":"string"},
-    "HashKeyField":{"type":"string"},
-    "HashKeyValue":{"type":"string"},
     "ImplicitDeny":{
       "type":"structure",
       "members":{
@@ -7848,6 +9382,24 @@
       },
       "documentation":"<p>Sends an input to an AWS IoT Events detector.</p>"
     },
+    "IotSiteWiseAction":{
+      "type":"structure",
+      "required":[
+        "putAssetPropertyValueEntries",
+        "roleArn"
+      ],
+      "members":{
+        "putAssetPropertyValueEntries":{
+          "shape":"PutAssetPropertyValueEntryList",
+          "documentation":"<p>A list of asset property value entries.</p>"
+        },
+        "roleArn":{
+          "shape":"AwsArn",
+          "documentation":"<p>The ARN of the role that grants AWS IoT permission to send an asset property value to AWS IoTSiteWise. (<code>\"Action\": \"iotsitewise:BatchPutAssetPropertyValue\"</code>). The trust policy can restrict access to specific asset hierarchy paths.</p>"
+        }
+      },
+      "documentation":"<p>Describes an action to send data from an MQTT message that triggered the rule to AWS IoT SiteWise asset properties.</p>"
+    },
     "IsAuthenticated":{"type":"boolean"},
     "IsDefaultVersion":{"type":"boolean"},
     "IsDisabled":{"type":"boolean"},
@@ -8783,12 +10335,78 @@
       },
       "documentation":"<p>The output of the ListCertificates operation.</p>"
     },
+    "ListDimensionsRequest":{
+      "type":"structure",
+      "members":{
+        "nextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>The token for the next set of results.</p>",
+          "location":"querystring",
+          "locationName":"nextToken"
+        },
+        "maxResults":{
+          "shape":"MaxResults",
+          "documentation":"<p>The maximum number of results to retrieve at one time.</p>",
+          "location":"querystring",
+          "locationName":"maxResults"
+        }
+      }
+    },
+    "ListDimensionsResponse":{
+      "type":"structure",
+      "members":{
+        "dimensionNames":{
+          "shape":"DimensionNames",
+          "documentation":"<p>A list of the names of the defined dimensions. Use <code>DescribeDimension</code> to get details for a dimension.</p>"
+        },
+        "nextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>A token that can be used to retrieve the next set of results, or <code>null</code> if there are no additional results.</p>"
+        }
+      }
+    },
+    "ListDomainConfigurationsRequest":{
+      "type":"structure",
+      "members":{
+        "marker":{
+          "shape":"Marker",
+          "documentation":"<p>The marker for the next set of results.</p>",
+          "location":"querystring",
+          "locationName":"marker"
+        },
+        "pageSize":{
+          "shape":"PageSize",
+          "documentation":"<p>The result page size.</p>",
+          "location":"querystring",
+          "locationName":"pageSize"
+        },
+        "serviceType":{
+          "shape":"ServiceType",
+          "documentation":"<p>The type of service delivered by the endpoint.</p>",
+          "location":"querystring",
+          "locationName":"serviceType"
+        }
+      }
+    },
+    "ListDomainConfigurationsResponse":{
+      "type":"structure",
+      "members":{
+        "domainConfigurations":{
+          "shape":"DomainConfigurations",
+          "documentation":"<p>A list of objects that contain summary information about the user's domain configurations.</p>"
+        },
+        "nextMarker":{
+          "shape":"Marker",
+          "documentation":"<p>The marker for the next set of results.</p>"
+        }
+      }
+    },
     "ListIndicesRequest":{
       "type":"structure",
       "members":{
         "nextToken":{
           "shape":"NextToken",
-          "documentation":"<p>The token used to get the next set of results, or null if there are no additional results.</p>",
+          "documentation":"<p>The token used to get the next set of results, or <code>null</code> if there are no additional results.</p>",
           "location":"querystring",
           "locationName":"nextToken"
         },
@@ -8809,7 +10427,7 @@
         },
         "nextToken":{
           "shape":"NextToken",
-          "documentation":"<p>The token used to get the next set of results, or null if there are no additional results.</p>"
+          "documentation":"<p>The token used to get the next set of results, or <code>null</code> if there are no additional results.</p>"
         }
       }
     },
@@ -9253,6 +10871,73 @@
       },
       "documentation":"<p>The output from the ListPrincipalThings operation.</p>"
     },
+    "ListProvisioningTemplateVersionsRequest":{
+      "type":"structure",
+      "required":["templateName"],
+      "members":{
+        "templateName":{
+          "shape":"TemplateName",
+          "documentation":"<p>The name of the fleet provisioning template.</p>",
+          "location":"uri",
+          "locationName":"templateName"
+        },
+        "maxResults":{
+          "shape":"MaxResults",
+          "documentation":"<p>The maximum number of results to return at one time.</p>",
+          "location":"querystring",
+          "locationName":"maxResults"
+        },
+        "nextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>A token to retrieve the next set of results.</p>",
+          "location":"querystring",
+          "locationName":"nextToken"
+        }
+      }
+    },
+    "ListProvisioningTemplateVersionsResponse":{
+      "type":"structure",
+      "members":{
+        "versions":{
+          "shape":"ProvisioningTemplateVersionListing",
+          "documentation":"<p>The list of fleet provisioning template versions.</p>"
+        },
+        "nextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>A token to retrieve the next set of results.</p>"
+        }
+      }
+    },
+    "ListProvisioningTemplatesRequest":{
+      "type":"structure",
+      "members":{
+        "maxResults":{
+          "shape":"MaxResults",
+          "documentation":"<p>The maximum number of results to return at one time.</p>",
+          "location":"querystring",
+          "locationName":"maxResults"
+        },
+        "nextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>A token to retrieve the next set of results.</p>",
+          "location":"querystring",
+          "locationName":"nextToken"
+        }
+      }
+    },
+    "ListProvisioningTemplatesResponse":{
+      "type":"structure",
+      "members":{
+        "templates":{
+          "shape":"ProvisioningTemplateListing",
+          "documentation":"<p>A list of fleet provisioning templates</p>"
+        },
+        "nextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>A token to retrieve the next set of results.</p>"
+        }
+      }
+    },
     "ListRoleAliasesRequest":{
       "type":"structure",
       "members":{
@@ -9376,6 +11061,12 @@
           "documentation":"<p>The maximum number of results to return at one time.</p>",
           "location":"querystring",
           "locationName":"maxResults"
+        },
+        "dimensionName":{
+          "shape":"DimensionName",
+          "documentation":"<p>A filter to limit results to the security profiles that use the defined dimension.</p>",
+          "location":"querystring",
+          "locationName":"dimensionName"
         }
       }
     },
@@ -9895,6 +11586,36 @@
       },
       "documentation":"<p>The output from the ListThings operation.</p>"
     },
+    "ListTopicRuleDestinationsRequest":{
+      "type":"structure",
+      "members":{
+        "maxResults":{
+          "shape":"TopicRuleDestinationMaxResults",
+          "documentation":"<p>The maximum number of results to return at one time.</p>",
+          "location":"querystring",
+          "locationName":"maxResults"
+        },
+        "nextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>The token to retrieve the next set of results.</p>",
+          "location":"querystring",
+          "locationName":"nextToken"
+        }
+      }
+    },
+    "ListTopicRuleDestinationsResponse":{
+      "type":"structure",
+      "members":{
+        "destinationSummaries":{
+          "shape":"TopicRuleDestinationSummaries",
+          "documentation":"<p>Information about a topic rule destination.</p>"
+        },
+        "nextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>The token to retrieve the next set of results.</p>"
+        }
+      }
+    },
     "ListTopicRulesRequest":{
       "type":"structure",
       "members":{
@@ -9905,7 +11626,7 @@
           "locationName":"topic"
         },
         "maxResults":{
-          "shape":"GEMaxResults",
+          "shape":"TopicRuleMaxResults",
           "documentation":"<p>The maximum number of results to return.</p>",
           "location":"querystring",
           "locationName":"maxResults"
@@ -10033,6 +11754,7 @@
         }
       }
     },
+    "LogGroupName":{"type":"string"},
     "LogLevel":{
       "type":"string",
       "enum":[
@@ -10124,6 +11846,7 @@
       "max":250,
       "min":1
     },
+    "Maximum":{"type":"double"},
     "MaximumPerMinute":{
       "type":"integer",
       "max":1000,
@@ -10144,6 +11867,36 @@
       "type":"string",
       "max":128
     },
+    "MetricDimension":{
+      "type":"structure",
+      "required":["dimensionName"],
+      "members":{
+        "dimensionName":{
+          "shape":"DimensionName",
+          "documentation":"<p>A unique identifier for the dimension.</p>"
+        },
+        "operator":{
+          "shape":"DimensionValueOperator",
+          "documentation":"<p>Defines how the <code>dimensionValues</code> of a dimension are interpreted. For example, for DimensionType TOPIC_FILTER, with <code>IN</code> operator, a message will be counted only if its topic matches one of the topic filters. With <code>NOT_IN</code> Operator, a message will be counted only if it doesn't match any of the topic filters. The operator is optional: if it's not provided (is <code>null</code>), it will be interpreted as <code>IN</code>.</p>"
+        }
+      },
+      "documentation":"<p>The dimension of a metric.</p>"
+    },
+    "MetricToRetain":{
+      "type":"structure",
+      "required":["metric"],
+      "members":{
+        "metric":{
+          "shape":"BehaviorMetric",
+          "documentation":"<p>What is measured by the behavior.</p>"
+        },
+        "metricDimension":{
+          "shape":"MetricDimension",
+          "documentation":"<p>The dimension of a metric.</p>"
+        }
+      },
+      "documentation":"<p>The metric you want to retain. Dimensions are optional.</p>"
+    },
     "MetricValue":{
       "type":"structure",
       "members":{
@@ -10162,6 +11915,7 @@
       },
       "documentation":"<p>The value to be compared with the <code>metric</code>.</p>"
     },
+    "Minimum":{"type":"double"},
     "MinimumNumberOfExecutedThings":{
       "type":"integer",
       "min":1
@@ -10273,6 +12027,39 @@
         "PUBLISH_FINDING_TO_SNS"
       ]
     },
+    "MqttClientId":{
+      "type":"string",
+      "max":65535,
+      "min":1
+    },
+    "MqttContext":{
+      "type":"structure",
+      "members":{
+        "username":{
+          "shape":"MqttUsername",
+          "documentation":"<p>The value of the <code>username</code> key in an MQTT authorization request.</p>"
+        },
+        "password":{
+          "shape":"MqttPassword",
+          "documentation":"<p>The value of the <code>password</code> key in an MQTT authorization request.</p>"
+        },
+        "clientId":{
+          "shape":"MqttClientId",
+          "documentation":"<p>The value of the <code>clientId</code> key in an MQTT authorization request.</p>"
+        }
+      },
+      "documentation":"<p>Specifies the MQTT context to use for the test authorizer request</p>"
+    },
+    "MqttPassword":{
+      "type":"blob",
+      "max":65535,
+      "min":1
+    },
+    "MqttUsername":{
+      "type":"string",
+      "max":65535,
+      "min":1
+    },
     "NextToken":{"type":"string"},
     "NonCompliantChecksCount":{"type":"integer"},
     "NonCompliantResource":{
@@ -10383,10 +12170,18 @@
           "shape":"Targets",
           "documentation":"<p>The targets of the OTA update.</p>"
         },
+        "protocols":{
+          "shape":"Protocols",
+          "documentation":"<p>The protocol used to transfer the OTA update image. Valid values are [HTTP], [MQTT], [HTTP, MQTT]. When both HTTP and MQTT are specified, the target device can choose the protocol.</p>"
+        },
         "awsJobExecutionsRolloutConfig":{
           "shape":"AwsJobExecutionsRolloutConfig",
           "documentation":"<p>Configuration for the rollout of OTA updates.</p>"
         },
+        "awsJobPresignedUrlConfig":{
+          "shape":"AwsJobPresignedUrlConfig",
+          "documentation":"<p>Configuration information for pre-signed URLs. Valid when <code>protocols</code> contains HTTP.</p>"
+        },
         "targetSelection":{
           "shape":"TargetSelection",
           "documentation":"<p>Specifies whether the OTA update will continue to run (CONTINUOUS), or will be complete after all those things specified as targets have completed the OTA update (SNAPSHOT). If continuous, the OTA update may also be run on a thing when a change is detected in a target. For example, an OTA update will run on a thing when the thing is added to a target group, even after the OTA update was completed by all things originally in the group. </p>"
@@ -10498,11 +12293,39 @@
     },
     "PartitionKey":{"type":"string"},
     "PayloadField":{"type":"string"},
+    "Percent":{
+      "type":"double",
+      "max":100,
+      "min":0
+    },
+    "PercentList":{
+      "type":"list",
+      "member":{"shape":"Percent"}
+    },
+    "PercentPair":{
+      "type":"structure",
+      "members":{
+        "percent":{
+          "shape":"Percent",
+          "documentation":"<p>The percentile.</p>"
+        },
+        "value":{
+          "shape":"PercentValue",
+          "documentation":"<p>The value of the percentile.</p>"
+        }
+      },
+      "documentation":"<p>Describes the percentile and percentile value.</p>"
+    },
+    "PercentValue":{"type":"double"},
     "Percentage":{
       "type":"integer",
       "max":100,
       "min":0
     },
+    "Percentiles":{
+      "type":"list",
+      "member":{"shape":"PercentPair"}
+    },
     "Platform":{"type":"string"},
     "Policies":{
       "type":"list",
@@ -10609,29 +12432,98 @@
           "documentation":"<p>How long (in seconds) pre-signed URLs are valid. Valid values are 60 - 3600, the default value is 3600 seconds. Pre-signed URLs are generated when Jobs receives an MQTT request for the job document.</p>"
         }
       },
-      "documentation":"<p>Configuration for pre-signed S3 URLs.</p>"
-    },
-    "Principal":{"type":"string"},
-    "PrincipalArn":{"type":"string"},
-    "PrincipalId":{
-      "type":"string",
-      "max":128,
-      "min":1,
-      "pattern":"[a-zA-Z0-9]+"
+      "documentation":"<p>Configuration for pre-signed S3 URLs.</p>"
+    },
+    "Principal":{"type":"string"},
+    "PrincipalArn":{"type":"string"},
+    "PrincipalId":{
+      "type":"string",
+      "max":128,
+      "min":1,
+      "pattern":"[a-zA-Z0-9]+"
+    },
+    "Principals":{
+      "type":"list",
+      "member":{"shape":"PrincipalArn"}
+    },
+    "PrivateKey":{
+      "type":"string",
+      "min":1,
+      "sensitive":true
+    },
+    "ProcessingTargetName":{"type":"string"},
+    "ProcessingTargetNameList":{
+      "type":"list",
+      "member":{"shape":"ProcessingTargetName"}
+    },
+    "Protocol":{
+      "type":"string",
+      "enum":[
+        "MQTT",
+        "HTTP"
+      ]
+    },
+    "Protocols":{
+      "type":"list",
+      "member":{"shape":"Protocol"},
+      "max":2,
+      "min":1
+    },
+    "ProvisioningTemplateListing":{
+      "type":"list",
+      "member":{"shape":"ProvisioningTemplateSummary"}
+    },
+    "ProvisioningTemplateSummary":{
+      "type":"structure",
+      "members":{
+        "templateArn":{
+          "shape":"TemplateArn",
+          "documentation":"<p>The ARN of the fleet provisioning template.</p>"
+        },
+        "templateName":{
+          "shape":"TemplateName",
+          "documentation":"<p>The name of the fleet provisioning template.</p>"
+        },
+        "description":{
+          "shape":"TemplateDescription",
+          "documentation":"<p>The description of the fleet provisioning template.</p>"
+        },
+        "creationDate":{
+          "shape":"DateType",
+          "documentation":"<p>The date when the fleet provisioning template summary was created.</p>"
+        },
+        "lastModifiedDate":{
+          "shape":"DateType",
+          "documentation":"<p>The date when the fleet provisioning template summary was last modified.</p>"
+        },
+        "enabled":{
+          "shape":"Enabled",
+          "documentation":"<p>True if the fleet provision template is enabled, otherwise false.</p>"
+        }
+      },
+      "documentation":"<p>A summary of information about a fleet provisioning template.</p>"
     },
-    "Principals":{
+    "ProvisioningTemplateVersionListing":{
       "type":"list",
-      "member":{"shape":"PrincipalArn"}
-    },
-    "PrivateKey":{
-      "type":"string",
-      "min":1,
-      "sensitive":true
+      "member":{"shape":"ProvisioningTemplateVersionSummary"}
     },
-    "ProcessingTargetName":{"type":"string"},
-    "ProcessingTargetNameList":{
-      "type":"list",
-      "member":{"shape":"ProcessingTargetName"}
+    "ProvisioningTemplateVersionSummary":{
+      "type":"structure",
+      "members":{
+        "versionId":{
+          "shape":"TemplateVersionId",
+          "documentation":"<p>The ID of the fleet privisioning template version.</p>"
+        },
+        "creationDate":{
+          "shape":"DateType",
+          "documentation":"<p>The date when the fleet provisioning template version was created</p>"
+        },
+        "isDefaultVersion":{
+          "shape":"IsDefaultVersion",
+          "documentation":"<p>True if the fleet provisioning template version is the default version, otherwise false.</p>"
+        }
+      },
+      "documentation":"<p>A summary of information about a fleet provision template version.</p>"
     },
     "PublicKey":{
       "type":"string",
@@ -10653,6 +12545,38 @@
       },
       "documentation":"<p>Parameters to define a mitigation action that publishes findings to Amazon SNS. You can implement your own custom actions in response to the Amazon SNS messages.</p>"
     },
+    "PutAssetPropertyValueEntry":{
+      "type":"structure",
+      "required":["propertyValues"],
+      "members":{
+        "entryId":{
+          "shape":"AssetPropertyEntryId",
+          "documentation":"<p>Optional. A unique identifier for this entry that you can define to better track which message caused an error in case of failure. Accepts substitution templates. Defaults to a new UUID.</p>"
+        },
+        "assetId":{
+          "shape":"AssetId",
+          "documentation":"<p>The ID of the AWS IoT SiteWise asset. You must specify either a <code>propertyAlias</code> or both an <code>aliasId</code> and a <code>propertyId</code>. Accepts substitution templates.</p>"
+        },
+        "propertyId":{
+          "shape":"AssetPropertyId",
+          "documentation":"<p>The ID of the asset's property. You must specify either a <code>propertyAlias</code> or both an <code>aliasId</code> and a <code>propertyId</code>. Accepts substitution templates.</p>"
+        },
+        "propertyAlias":{
+          "shape":"AssetPropertyAlias",
+          "documentation":"<p>The name of the property alias associated with your asset property. You must specify either a <code>propertyAlias</code> or both an <code>aliasId</code> and a <code>propertyId</code>. Accepts substitution templates.</p>"
+        },
+        "propertyValues":{
+          "shape":"AssetPropertyValueList",
+          "documentation":"<p>A list of property values to insert that each contain timestamp, quality, and value (TQV) information.</p>"
+        }
+      },
+      "documentation":"<p>An asset property value entry containing the following information.</p>"
+    },
+    "PutAssetPropertyValueEntryList":{
+      "type":"list",
+      "member":{"shape":"PutAssetPropertyValueEntry"},
+      "min":1
+    },
     "PutItemInput":{
       "type":"structure",
       "required":["tableName"],
@@ -10806,7 +12730,7 @@
       "members":{
         "templateBody":{
           "shape":"TemplateBody",
-          "documentation":"<p>The provisioning template. See <a href=\"https://docs.aws.amazon.com/iot/latest/developerguide/programmatic-provisioning.html\">Programmatic Provisioning</a> for more information.</p>"
+          "documentation":"<p>The provisioning template. See <a href=\"https://docs.aws.amazon.com/iot/latest/developerguide/provision-w-cert.html\">Provisioning Devices That Have Device Certificates</a> for more information.</p>"
         },
         "parameters":{
           "shape":"Parameters",
@@ -10916,6 +12840,7 @@
       "type":"list",
       "member":{"shape":"RelatedResource"}
     },
+    "RemoveAuthorizerConfig":{"type":"boolean"},
     "RemoveAutoRegistration":{"type":"boolean"},
     "RemoveThingFromBillingGroupRequest":{
       "type":"structure",
@@ -11027,11 +12952,17 @@
         },
         "qos":{
           "shape":"Qos",
-          "documentation":"<p>The Quality of Service (QoS) level to use when republishing messages.</p>"
+          "documentation":"<p>The Quality of Service (QoS) level to use when republishing messages. The default value is 0.</p>"
         }
       },
       "documentation":"<p>Describes an action to republish to another topic.</p>"
     },
+    "ReservedDomainConfigurationName":{
+      "type":"string",
+      "max":128,
+      "min":1,
+      "pattern":"[\\w.:-]+"
+    },
     "Resource":{"type":"string"},
     "ResourceAlreadyExistsException":{
       "type":"structure",
@@ -11085,6 +13016,14 @@
         "account":{
           "shape":"AwsAccountId",
           "documentation":"<p>The account with which the resource is associated.</p>"
+        },
+        "iamRoleArn":{
+          "shape":"RoleArn",
+          "documentation":"<p>The ARN of the IAM role that has overly permissive actions.</p>"
+        },
+        "roleAliasArn":{
+          "shape":"RoleAliasArn",
+          "documentation":"<p>The ARN of the role alias that has overly permissive actions.</p>"
         }
       },
       "documentation":"<p>Information that identifies the noncompliant resource.</p>"
@@ -11122,7 +13061,9 @@
         "IOT_POLICY",
         "COGNITO_IDENTITY_POOL",
         "CLIENT_ID",
-        "ACCOUNT_SETTINGS"
+        "ACCOUNT_SETTINGS",
+        "ROLE_ALIAS",
+        "IAM_ROLE"
       ]
     },
     "Resources":{
@@ -11135,7 +13076,11 @@
       "min":1,
       "pattern":"[\\w=,@-]+"
     },
-    "RoleAliasArn":{"type":"string"},
+    "RoleAliasArn":{
+      "type":"string",
+      "max":2048,
+      "min":1
+    },
     "RoleAliasDescription":{
       "type":"structure",
       "members":{
@@ -11346,7 +13291,7 @@
         },
         "nextToken":{
           "shape":"NextToken",
-          "documentation":"<p>The token used to get the next set of results, or null if there are no additional results.</p>"
+          "documentation":"<p>The token used to get the next set of results, or <code>null</code> if there are no additional results.</p>"
         },
         "maxResults":{
           "shape":"QueryMaxResults",
@@ -11363,7 +13308,7 @@
       "members":{
         "nextToken":{
           "shape":"NextToken",
-          "documentation":"<p>The token used to get the next set of results, or null if there are no additional results.</p>"
+          "documentation":"<p>The token used to get the next set of results, or <code>null</code> if there are no additional results.</p>"
         },
         "things":{
           "shape":"ThingDocumentList",
@@ -11448,6 +13393,56 @@
       "type":"list",
       "member":{"shape":"SecurityProfileTarget"}
     },
+    "ServerCertificateArns":{
+      "type":"list",
+      "member":{"shape":"AcmCertificateArn"},
+      "max":1,
+      "min":0
+    },
+    "ServerCertificateStatus":{
+      "type":"string",
+      "enum":[
+        "INVALID",
+        "VALID"
+      ]
+    },
+    "ServerCertificateStatusDetail":{"type":"string"},
+    "ServerCertificateSummary":{
+      "type":"structure",
+      "members":{
+        "serverCertificateArn":{
+          "shape":"AcmCertificateArn",
+          "documentation":"<p>The ARN of the server certificate.</p>"
+        },
+        "serverCertificateStatus":{
+          "shape":"ServerCertificateStatus",
+          "documentation":"<p>The status of the server certificate.</p>"
+        },
+        "serverCertificateStatusDetail":{
+          "shape":"ServerCertificateStatusDetail",
+          "documentation":"<p>Details that explain the status of the server certificate.</p>"
+        }
+      },
+      "documentation":"<p>An object that contains information about a server certificate.</p>"
+    },
+    "ServerCertificates":{
+      "type":"list",
+      "member":{"shape":"ServerCertificateSummary"}
+    },
+    "ServerName":{
+      "type":"string",
+      "max":253,
+      "min":1
+    },
+    "ServiceName":{"type":"string"},
+    "ServiceType":{
+      "type":"string",
+      "enum":[
+        "DATA",
+        "CREDENTIAL_PROVIDER",
+        "JOBS"
+      ]
+    },
     "ServiceUnavailableException":{
       "type":"structure",
       "members":{
@@ -11555,6 +13550,29 @@
         }
       }
     },
+    "SigV4Authorization":{
+      "type":"structure",
+      "required":[
+        "signingRegion",
+        "serviceName",
+        "roleArn"
+      ],
+      "members":{
+        "signingRegion":{
+          "shape":"SigningRegion",
+          "documentation":"<p>The signing region.</p>"
+        },
+        "serviceName":{
+          "shape":"ServiceName",
+          "documentation":"<p>The service name to use while signing with Sig V4.</p>"
+        },
+        "roleArn":{
+          "shape":"AwsArn",
+          "documentation":"<p>The ARN of the signing role.</p>"
+        }
+      },
+      "documentation":"<p>Use Sig V4 authorization.</p>"
+    },
     "Signature":{"type":"blob"},
     "SignatureAlgorithm":{"type":"string"},
     "SigningJobId":{"type":"string"},
@@ -11577,6 +13595,7 @@
       },
       "documentation":"<p>Describes the code-signing profile.</p>"
     },
+    "SigningRegion":{"type":"string"},
     "SkippedFindingsCount":{"type":"long"},
     "SkyfallMaxResults":{
       "type":"integer",
@@ -11774,6 +13793,41 @@
         "count":{
           "shape":"Count",
           "documentation":"<p>The count of things that match the query.</p>"
+        },
+        "average":{
+          "shape":"Average",
+          "documentation":"<p>The average of the aggregated field values.</p>",
+          "box":true
+        },
+        "sum":{
+          "shape":"Sum",
+          "documentation":"<p>The sum of the aggregated field values.</p>",
+          "box":true
+        },
+        "minimum":{
+          "shape":"Minimum",
+          "documentation":"<p>The minimum aggregated field value.</p>",
+          "box":true
+        },
+        "maximum":{
+          "shape":"Maximum",
+          "documentation":"<p>The maximum aggregated field value.</p>",
+          "box":true
+        },
+        "sumOfSquares":{
+          "shape":"SumOfSquares",
+          "documentation":"<p>The sum of the squares of the aggregated field values.</p>",
+          "box":true
+        },
+        "variance":{
+          "shape":"Variance",
+          "documentation":"<p>The variance of the aggregated field values.</p>",
+          "box":true
+        },
+        "stdDeviation":{
+          "shape":"StdDeviation",
+          "documentation":"<p>The standard deviation of the aggregated field values.</p>",
+          "box":true
         }
       },
       "documentation":"<p>A map of key-value pairs for all supported statistics. Currently, only count is supported.</p>"
@@ -11788,6 +13842,7 @@
         "Cancelling"
       ]
     },
+    "StdDeviation":{"type":"double"},
     "StepFunctionsAction":{
       "type":"structure",
       "required":[
@@ -11951,6 +14006,8 @@
     },
     "SucceededFindingsCount":{"type":"long"},
     "SucceededThings":{"type":"integer"},
+    "Sum":{"type":"double"},
+    "SumOfSquares":{"type":"double"},
     "TableName":{"type":"string"},
     "Tag":{
       "type":"structure",
@@ -12093,7 +14150,21 @@
       },
       "documentation":"<p>Provides summary counts of how many tasks for findings are in a particular state. This information is included in the response from DescribeAuditMitigationActionsTask.</p>"
     },
+    "TemplateArn":{"type":"string"},
     "TemplateBody":{"type":"string"},
+    "TemplateDescription":{
+      "type":"string",
+      "max":500,
+      "min":0,
+      "pattern":"[^\\p{C}]*"
+    },
+    "TemplateName":{
+      "type":"string",
+      "max":36,
+      "min":1,
+      "pattern":"^[0-9A-Za-z_-]+$"
+    },
+    "TemplateVersionId":{"type":"integer"},
     "TestAuthorizationRequest":{
       "type":"structure",
       "required":["authInfos"],
@@ -12137,11 +14208,7 @@
     },
     "TestInvokeAuthorizerRequest":{
       "type":"structure",
-      "required":[
-        "authorizerName",
-        "token",
-        "tokenSignature"
-      ],
+      "required":["authorizerName"],
       "members":{
         "authorizerName":{
           "shape":"AuthorizerName",
@@ -12156,6 +14223,18 @@
         "tokenSignature":{
           "shape":"TokenSignature",
           "documentation":"<p>The signature made with the token and your custom authentication service's private key.</p>"
+        },
+        "httpContext":{
+          "shape":"HttpContext",
+          "documentation":"<p>Specifies a test HTTP authorization request.</p>"
+        },
+        "mqttContext":{
+          "shape":"MqttContext",
+          "documentation":"<p>Specifies a test MQTT authorization request.</p>"
+        },
+        "tlsContext":{
+          "shape":"TlsContext",
+          "documentation":"<p>Specifies a test TLS authorization request.</p>"
         }
       }
     },
@@ -12323,6 +14402,14 @@
         "thingGroupIndexingMode":{
           "shape":"ThingGroupIndexingMode",
           "documentation":"<p>Thing group indexing mode.</p>"
+        },
+        "managedFields":{
+          "shape":"Fields",
+          "documentation":"<p>Contains fields that are indexed and whose types are already known by the Fleet Indexing service.</p>"
+        },
+        "customFields":{
+          "shape":"Fields",
+          "documentation":"<p>A list of thing group fields to index. This list cannot contain any managed fields. Use the GetIndexingConfiguration API to get a list of managed fields.</p> <p>Contains custom field names and their data type.</p>"
         }
       },
       "documentation":"<p>Thing group indexing configuration.</p>"
@@ -12402,6 +14489,14 @@
         "thingConnectivityIndexingMode":{
           "shape":"ThingConnectivityIndexingMode",
           "documentation":"<p>Thing connectivity indexing mode. Valid values are: </p> <ul> <li> <p>STATUS – Your thing index contains connectivity status. To enable thing connectivity indexing, thingIndexMode must not be set to OFF.</p> </li> <li> <p>OFF - Thing connectivity status indexing is disabled.</p> </li> </ul>"
+        },
+        "managedFields":{
+          "shape":"Fields",
+          "documentation":"<p>Contains fields that are indexed and whose types are already known by the Fleet Indexing service.</p>"
+        },
+        "customFields":{
+          "shape":"Fields",
+          "documentation":"<p>Contains custom field names and their data type.</p>"
         }
       },
       "documentation":"<p>The thing indexing configuration. For more information, see <a href=\"https://docs.aws.amazon.com/iot/latest/developerguide/managing-index.html\">Managing Thing Indexing</a>.</p>"
@@ -12504,7 +14599,7 @@
         }
       },
       "documentation":"<p>The rate exceeds the limit.</p>",
-      "error":{"httpStatusCode":429},
+      "error":{"httpStatusCode":400},
       "exception":true
     },
     "TimedOutThings":{"type":"integer"},
@@ -12519,6 +14614,16 @@
       "documentation":"<p>Specifies the amount of time each device has to finish its execution of the job. A timer is started when the job execution status is set to <code>IN_PROGRESS</code>. If the job execution status is not set to another terminal state before the timer expires, it will be automatically set to <code>TIMED_OUT</code>.</p>"
     },
     "Timestamp":{"type":"timestamp"},
+    "TlsContext":{
+      "type":"structure",
+      "members":{
+        "serverName":{
+          "shape":"ServerName",
+          "documentation":"<p>The value of the <code>serverName</code> key in a TLS authorization request.</p>"
+        }
+      },
+      "documentation":"<p>Specifies the TLS context to use for the test authorizer request.</p>"
+    },
     "Token":{
       "type":"string",
       "max":6144,
@@ -12576,6 +14681,78 @@
       },
       "documentation":"<p>Describes a rule.</p>"
     },
+    "TopicRuleDestination":{
+      "type":"structure",
+      "members":{
+        "arn":{
+          "shape":"AwsArn",
+          "documentation":"<p>The topic rule destination URL.</p>"
+        },
+        "status":{
+          "shape":"TopicRuleDestinationStatus",
+          "documentation":"<p>The status of the topic rule destination. Valid values are:</p> <dl> <dt>IN_PROGRESS</dt> <dd> <p>A topic rule destination was created but has not been confirmed. You can set <code>status</code> to <code>IN_PROGRESS</code> by calling <code>UpdateTopicRuleDestination</code>. Calling <code>UpdateTopicRuleDestination</code> causes a new confirmation challenge to be sent to your confirmation endpoint.</p> </dd> <dt>ENABLED</dt> <dd> <p>Confirmation was completed, and traffic to this destination is allowed. You can set <code>status</code> to <code>DISABLED</code> by calling <code>UpdateTopicRuleDestination</code>.</p> </dd> <dt>DISABLED</dt> <dd> <p>Confirmation was completed, and traffic to this destination is not allowed. You can set <code>status</code> to <code>ENABLED</code> by calling <code>UpdateTopicRuleDestination</code>.</p> </dd> <dt>ERROR</dt> <dd> <p>Confirmation could not be completed, for example if the confirmation timed out. You can call <code>GetTopicRuleDestination</code> for details about the error. You can set <code>status</code> to <code>IN_PROGRESS</code> by calling <code>UpdateTopicRuleDestination</code>. Calling <code>UpdateTopicRuleDestination</code> causes a new confirmation challenge to be sent to your confirmation endpoint.</p> </dd> </dl>"
+        },
+        "statusReason":{
+          "shape":"String",
+          "documentation":"<p>Additional details or reason why the topic rule destination is in the current status.</p>"
+        },
+        "httpUrlProperties":{
+          "shape":"HttpUrlDestinationProperties",
+          "documentation":"<p>Properties of the HTTP URL.</p>"
+        }
+      },
+      "documentation":"<p>A topic rule destination.</p>"
+    },
+    "TopicRuleDestinationConfiguration":{
+      "type":"structure",
+      "members":{
+        "httpUrlConfiguration":{
+          "shape":"HttpUrlDestinationConfiguration",
+          "documentation":"<p>Configuration of the HTTP URL.</p>"
+        }
+      },
+      "documentation":"<p>Configuration of the topic rule destination.</p>"
+    },
+    "TopicRuleDestinationMaxResults":{
+      "type":"integer",
+      "max":1000,
+      "min":1
+    },
+    "TopicRuleDestinationStatus":{
+      "type":"string",
+      "enum":[
+        "ENABLED",
+        "IN_PROGRESS",
+        "DISABLED",
+        "ERROR"
+      ]
+    },
+    "TopicRuleDestinationSummaries":{
+      "type":"list",
+      "member":{"shape":"TopicRuleDestinationSummary"}
+    },
+    "TopicRuleDestinationSummary":{
+      "type":"structure",
+      "members":{
+        "arn":{
+          "shape":"AwsArn",
+          "documentation":"<p>The topic rule destination ARN.</p>"
+        },
+        "status":{
+          "shape":"TopicRuleDestinationStatus",
+          "documentation":"<p>The status of the topic rule destination. Valid values are:</p> <dl> <dt>IN_PROGRESS</dt> <dd> <p>A topic rule destination was created but has not been confirmed. You can set <code>status</code> to <code>IN_PROGRESS</code> by calling <code>UpdateTopicRuleDestination</code>. Calling <code>UpdateTopicRuleDestination</code> causes a new confirmation challenge to be sent to your confirmation endpoint.</p> </dd> <dt>ENABLED</dt> <dd> <p>Confirmation was completed, and traffic to this destination is allowed. You can set <code>status</code> to <code>DISABLED</code> by calling <code>UpdateTopicRuleDestination</code>.</p> </dd> <dt>DISABLED</dt> <dd> <p>Confirmation was completed, and traffic to this destination is not allowed. You can set <code>status</code> to <code>ENABLED</code> by calling <code>UpdateTopicRuleDestination</code>.</p> </dd> <dt>ERROR</dt> <dd> <p>Confirmation could not be completed, for example if the confirmation timed out. You can call <code>GetTopicRuleDestination</code> for details about the error. You can set <code>status</code> to <code>IN_PROGRESS</code> by calling <code>UpdateTopicRuleDestination</code>. Calling <code>UpdateTopicRuleDestination</code> causes a new confirmation challenge to be sent to your confirmation endpoint.</p> </dd> </dl>"
+        },
+        "statusReason":{
+          "shape":"String",
+          "documentation":"<p>The reason the topic rule destination is in the current status.</p>"
+        },
+        "httpUrlSummary":{
+          "shape":"HttpUrlDestinationSummary",
+          "documentation":"<p>Information about the HTTP URL.</p>"
+        }
+      },
+      "documentation":"<p>Information about the topic rule destination.</p>"
+    },
     "TopicRuleList":{
       "type":"list",
       "member":{"shape":"TopicRuleListItem"}
@@ -12606,6 +14783,11 @@
       },
       "documentation":"<p>Describes a rule.</p>"
     },
+    "TopicRuleMaxResults":{
+      "type":"integer",
+      "max":10000,
+      "min":1
+    },
     "TopicRulePayload":{
       "type":"structure",
       "required":[
@@ -12922,7 +15104,7 @@
         },
         "newStatus":{
           "shape":"CertificateStatus",
-          "documentation":"<p>The new status.</p> <p> <b>Note:</b> Setting the status to PENDING_TRANSFER will result in an exception being thrown. PENDING_TRANSFER is a status used internally by AWS IoT. It is not intended for developer use.</p> <p> <b>Note:</b> The status value REGISTER_INACTIVE is deprecated and should not be used.</p>",
+          "documentation":"<p>The new status.</p> <p> <b>Note:</b> Setting the status to PENDING_TRANSFER or PENDING_ACTIVATION will result in an exception being thrown. PENDING_TRANSFER and PENDING_ACTIVATION are statuses used internally by AWS IoT. They are not intended for developer use.</p> <p> <b>Note:</b> The status value REGISTER_INACTIVE is deprecated and should not be used.</p>",
           "location":"querystring",
           "locationName":"newStatus"
         }
@@ -12940,6 +15122,91 @@
       },
       "documentation":"<p>Parameters to define a mitigation action that changes the state of the device certificate to inactive.</p>"
     },
+    "UpdateDimensionRequest":{
+      "type":"structure",
+      "required":[
+        "name",
+        "stringValues"
+      ],
+      "members":{
+        "name":{
+          "shape":"DimensionName",
+          "documentation":"<p>A unique identifier for the dimension. Choose something that describes the type and value to make it easy to remember what it does.</p>",
+          "location":"uri",
+          "locationName":"name"
+        },
+        "stringValues":{
+          "shape":"DimensionStringValues",
+          "documentation":"<p>Specifies the value or list of values for the dimension. For <code>TOPIC_FILTER</code> dimensions, this is a pattern used to match the MQTT topic (for example, \"admin/#\").</p>"
+        }
+      }
+    },
+    "UpdateDimensionResponse":{
+      "type":"structure",
+      "members":{
+        "name":{
+          "shape":"DimensionName",
+          "documentation":"<p>A unique identifier for the dimension.</p>"
+        },
+        "arn":{
+          "shape":"DimensionArn",
+          "documentation":"<p>The ARN (Amazon resource name) of the created dimension.</p>"
+        },
+        "type":{
+          "shape":"DimensionType",
+          "documentation":"<p>The type of the dimension.</p>"
+        },
+        "stringValues":{
+          "shape":"DimensionStringValues",
+          "documentation":"<p>The value or list of values used to scope the dimension. For example, for topic filters, this is the pattern used to match the MQTT topic name.</p>"
+        },
+        "creationDate":{
+          "shape":"Timestamp",
+          "documentation":"<p>The date and time, in milliseconds since epoch, when the dimension was initially created.</p>"
+        },
+        "lastModifiedDate":{
+          "shape":"Timestamp",
+          "documentation":"<p>The date and time, in milliseconds since epoch, when the dimension was most recently updated.</p>"
+        }
+      }
+    },
+    "UpdateDomainConfigurationRequest":{
+      "type":"structure",
+      "required":["domainConfigurationName"],
+      "members":{
+        "domainConfigurationName":{
+          "shape":"ReservedDomainConfigurationName",
+          "documentation":"<p>The name of the domain configuration to be updated.</p>",
+          "location":"uri",
+          "locationName":"domainConfigurationName"
+        },
+        "authorizerConfig":{
+          "shape":"AuthorizerConfig",
+          "documentation":"<p>An object that specifies the authorization service for a domain.</p>"
+        },
+        "domainConfigurationStatus":{
+          "shape":"DomainConfigurationStatus",
+          "documentation":"<p>The status to which the domain configuration should be updated.</p>"
+        },
+        "removeAuthorizerConfig":{
+          "shape":"RemoveAuthorizerConfig",
+          "documentation":"<p>Removes the authorization configuration from a domain.</p>"
+        }
+      }
+    },
+    "UpdateDomainConfigurationResponse":{
+      "type":"structure",
+      "members":{
+        "domainConfigurationName":{
+          "shape":"ReservedDomainConfigurationName",
+          "documentation":"<p>The name of the domain configuration that was updated.</p>"
+        },
+        "domainConfigurationArn":{
+          "shape":"DomainConfigurationArn",
+          "documentation":"<p>The ARN of the domain configuration that was updated.</p>"
+        }
+      }
+    },
     "UpdateDynamicThingGroupRequest":{
       "type":"structure",
       "required":[
@@ -13081,6 +15348,39 @@
         }
       }
     },
+    "UpdateProvisioningTemplateRequest":{
+      "type":"structure",
+      "required":["templateName"],
+      "members":{
+        "templateName":{
+          "shape":"TemplateName",
+          "documentation":"<p>The name of the fleet provisioning template.</p>",
+          "location":"uri",
+          "locationName":"templateName"
+        },
+        "description":{
+          "shape":"TemplateDescription",
+          "documentation":"<p>The description of the fleet provisioning template.</p>"
+        },
+        "enabled":{
+          "shape":"Enabled",
+          "documentation":"<p>True to enable the fleet provisioning template, otherwise false.</p>"
+        },
+        "defaultVersionId":{
+          "shape":"TemplateVersionId",
+          "documentation":"<p>The ID of the default provisioning template version.</p>"
+        },
+        "provisioningRoleArn":{
+          "shape":"RoleArn",
+          "documentation":"<p>The ARN of the role associated with the provisioning template. This IoT role grants permission to provision a device.</p>"
+        }
+      }
+    },
+    "UpdateProvisioningTemplateResponse":{
+      "type":"structure",
+      "members":{
+      }
+    },
     "UpdateRoleAliasRequest":{
       "type":"structure",
       "required":["roleAlias"],
@@ -13175,7 +15475,13 @@
         },
         "additionalMetricsToRetain":{
           "shape":"AdditionalMetricsToRetainList",
-          "documentation":"<p>A list of metrics whose data is retained (stored). By default, data is retained for any metric used in the profile's <code>behaviors</code>, but it is also retained for any metric specified here.</p>"
+          "documentation":"<p>A list of metrics whose data is retained (stored). By default, data is retained for any metric used in the profile's <code>behaviors</code>, but it is also retained for any metric specified here.</p> <p> <b>Note:</b> This API field is deprecated. Please use <a>UpdateSecurityProfileRequest$additionalMetricsToRetainV2</a> instead.</p>",
+          "deprecated":true,
+          "deprecatedMessage":"Use additionalMetricsToRetainV2."
+        },
+        "additionalMetricsToRetainV2":{
+          "shape":"AdditionalMetricsToRetainV2List",
+          "documentation":"<p>A list of metrics whose data is retained (stored). By default, data is retained for any metric used in the profile's behaviors, but it is also retained for any metric specified here.</p>"
         },
         "deleteBehaviors":{
           "shape":"DeleteBehaviors",
@@ -13222,7 +15528,13 @@
         },
         "additionalMetricsToRetain":{
           "shape":"AdditionalMetricsToRetainList",
-          "documentation":"<p>A list of metrics whose data is retained (stored). By default, data is retained for any metric used in the security profile's <code>behaviors</code>, but it is also retained for any metric specified here.</p>"
+          "documentation":"<p>A list of metrics whose data is retained (stored). By default, data is retained for any metric used in the security profile's <code>behaviors</code>, but it is also retained for any metric specified here.</p> <p> <b>Note:</b> This API field is deprecated. Please use <a>UpdateSecurityProfileResponse$additionalMetricsToRetainV2</a> instead.</p>",
+          "deprecated":true,
+          "deprecatedMessage":"Use additionalMetricsToRetainV2."
+        },
+        "additionalMetricsToRetainV2":{
+          "shape":"AdditionalMetricsToRetainV2List",
+          "documentation":"<p>A list of metrics whose data is retained (stored). By default, data is retained for any metric used in the profile's behaviors, but it is also retained for any metric specified here.</p>"
         },
         "version":{
           "shape":"Version",
@@ -13376,6 +15688,32 @@
       },
       "documentation":"<p>The output from the UpdateThing operation.</p>"
     },
+    "UpdateTopicRuleDestinationRequest":{
+      "type":"structure",
+      "required":[
+        "arn",
+        "status"
+      ],
+      "members":{
+        "arn":{
+          "shape":"AwsArn",
+          "documentation":"<p>The ARN of the topic rule destination.</p>"
+        },
+        "status":{
+          "shape":"TopicRuleDestinationStatus",
+          "documentation":"<p>The status of the topic rule destination. Valid values are:</p> <dl> <dt>IN_PROGRESS</dt> <dd> <p>A topic rule destination was created but has not been confirmed. You can set <code>status</code> to <code>IN_PROGRESS</code> by calling <code>UpdateTopicRuleDestination</code>. Calling <code>UpdateTopicRuleDestination</code> causes a new confirmation challenge to be sent to your confirmation endpoint.</p> </dd> <dt>ENABLED</dt> <dd> <p>Confirmation was completed, and traffic to this destination is allowed. You can set <code>status</code> to <code>DISABLED</code> by calling <code>UpdateTopicRuleDestination</code>.</p> </dd> <dt>DISABLED</dt> <dd> <p>Confirmation was completed, and traffic to this destination is not allowed. You can set <code>status</code> to <code>ENABLED</code> by calling <code>UpdateTopicRuleDestination</code>.</p> </dd> <dt>ERROR</dt> <dd> <p>Confirmation could not be completed, for example if the confirmation timed out. You can call <code>GetTopicRuleDestination</code> for details about the error. You can set <code>status</code> to <code>IN_PROGRESS</code> by calling <code>UpdateTopicRuleDestination</code>. Calling <code>UpdateTopicRuleDestination</code> causes a new confirmation challenge to be sent to your confirmation endpoint.</p> </dd> </dl>"
+        }
+      }
+    },
+    "UpdateTopicRuleDestinationResponse":{
+      "type":"structure",
+      "members":{
+      }
+    },
+    "Url":{
+      "type":"string",
+      "max":2000
+    },
     "UseBase64":{"type":"boolean"},
     "Valid":{"type":"boolean"},
     "ValidateSecurityProfileBehaviorsRequest":{
@@ -13416,6 +15754,7 @@
       "member":{"shape":"ValidationError"}
     },
     "Value":{"type":"string"},
+    "Variance":{"type":"double"},
     "Version":{"type":"long"},
     "VersionConflictException":{
       "type":"structure",
@@ -13499,5 +15838,5 @@
     "resourceArn":{"type":"string"},
     "resourceId":{"type":"string"}
   },
-  "documentation":"<fullname>AWS IoT</fullname> <p>AWS IoT provides secure, bi-directional communication between Internet-connected devices (such as sensors, actuators, embedded devices, or smart appliances) and the AWS cloud. You can discover your custom IoT-Data endpoint to communicate with, configure rules for data processing and integration with other services, organize resources associated with each device (Registry), configure logging, and create and manage policies and credentials to authenticate devices.</p> <p>For more information about how AWS IoT works, see the <a href=\"https://docs.aws.amazon.com/iot/latest/developerguide/aws-iot-how-it-works.html\">Developer Guide</a>.</p> <p>For information about how to use the credentials provider for AWS IoT, see <a href=\"https://docs.aws.amazon.com/iot/latest/developerguide/authorizing-direct-aws.html\">Authorizing Direct Calls to AWS Services</a>.</p>"
+  "documentation":"<fullname>AWS IoT</fullname> <p>AWS IoT provides secure, bi-directional communication between Internet-connected devices (such as sensors, actuators, embedded devices, or smart appliances) and the AWS cloud. You can discover your custom IoT-Data endpoint to communicate with, configure rules for data processing and integration with other services, organize resources associated with each device (Registry), configure logging, and create and manage policies and credentials to authenticate devices.</p> <p>The service endpoints that expose this API are listed in <a href=\"https://docs.aws.amazon.com/general/latest/gr/iot-core.html\">AWS IoT Core Endpoints and Quotas</a>. You must use the endpoint for the region that has the resources you want to access.</p> <p>The service name used by <a href=\"https://docs.aws.amazon.com/general/latest/gr/signature-version-4.html\">AWS Signature Version 4</a> to sign the request is: <i>execute-api</i>.</p> <p>For more information about how AWS IoT works, see the <a href=\"https://docs.aws.amazon.com/iot/latest/developerguide/aws-iot-how-it-works.html\">Developer Guide</a>.</p> <p>For information about how to use the credentials provider for AWS IoT, see <a href=\"https://docs.aws.amazon.com/iot/latest/developerguide/authorizing-direct-aws.html\">Authorizing Direct Calls to AWS Services</a>.</p>"
 }
diff --git a/services/iot/src/test/resources/cucumber.properties b/services/iot/src/test/resources/cucumber.properties
index 1a2a2cdec33f..40a43544be92 100644
--- a/services/iot/src/test/resources/cucumber.properties
+++ b/services/iot/src/test/resources/cucumber.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/iot1clickdevices/pom.xml b/services/iot1clickdevices/pom.xml
index bb676beefe14..3f6384a42db3 100644
--- a/services/iot1clickdevices/pom.xml
+++ b/services/iot1clickdevices/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>iot1clickdevices</artifactId>
     <name>AWS Java SDK :: Services :: IoT 1Click Devices Service</name>
diff --git a/services/iot1clickprojects/pom.xml b/services/iot1clickprojects/pom.xml
index 587bfe975080..fbbdf83f8506 100644
--- a/services/iot1clickprojects/pom.xml
+++ b/services/iot1clickprojects/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>iot1clickprojects</artifactId>
     <name>AWS Java SDK :: Services :: IoT 1Click Projects</name>
diff --git a/services/iotanalytics/pom.xml b/services/iotanalytics/pom.xml
index 270bf2948b20..9eda5f52136a 100644
--- a/services/iotanalytics/pom.xml
+++ b/services/iotanalytics/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>iotanalytics</artifactId>
     <name>AWS Java SDK :: Services :: IoTAnalytics</name>
diff --git a/services/iotdataplane/pom.xml b/services/iotdataplane/pom.xml
index 5377ed509a16..2f0b3ab5f977 100644
--- a/services/iotdataplane/pom.xml
+++ b/services/iotdataplane/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -22,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>iotdataplane</artifactId>
     <name>AWS Java SDK :: Services :: AWS IoT Data Plane</name>
diff --git a/services/iotdataplane/src/it/java/software/amazon/awssdk/services/iotdataplane/ServiceIntegrationTest.java b/services/iotdataplane/src/it/java/software/amazon/awssdk/services/iotdataplane/ServiceIntegrationTest.java
index 5669a34c832b..291a2ac145ee 100644
--- a/services/iotdataplane/src/it/java/software/amazon/awssdk/services/iotdataplane/ServiceIntegrationTest.java
+++ b/services/iotdataplane/src/it/java/software/amazon/awssdk/services/iotdataplane/ServiceIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/iotevents/pom.xml b/services/iotevents/pom.xml
index d712ff89d62e..fcbe0e01e59b 100644
--- a/services/iotevents/pom.xml
+++ b/services/iotevents/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>iotevents</artifactId>
     <name>AWS Java SDK :: Services :: IoT Events</name>
diff --git a/services/iotevents/src/main/resources/codegen-resources/service-2.json b/services/iotevents/src/main/resources/codegen-resources/service-2.json
index c33fc28f5e6a..58e834925d5f 100644
--- a/services/iotevents/src/main/resources/codegen-resources/service-2.json
+++ b/services/iotevents/src/main/resources/codegen-resources/service-2.json
@@ -100,7 +100,7 @@
         {"shape":"InternalFailureException"},
         {"shape":"ServiceUnavailableException"}
       ],
-      "documentation":"<p>Describes a detector model. If the <code>\"version\"</code> parameter is not specified, information about the latest version is returned.</p>"
+      "documentation":"<p>Describes a detector model. If the <code>version</code> parameter is not specified, information about the latest version is returned.</p>"
     },
     "DescribeInput":{
       "name":"DescribeInput",
@@ -218,7 +218,7 @@
         {"shape":"UnsupportedOperationException"},
         {"shape":"ResourceInUseException"}
       ],
-      "documentation":"<p>Sets or updates the AWS IoT Events logging options.</p> <p>If you update the value of any <code>\"loggingOptions\"</code> field, it takes up to one minute for the change to take effect. Also, if you change the policy attached to the role you specified in the <code>\"roleArn\"</code> field (for example, to correct an invalid policy) it takes up to five minutes for that change to take effect.</p>"
+      "documentation":"<p>Sets or updates the AWS IoT Events logging options.</p> <p>If you update the value of any <code>loggingOptions</code> field, it takes up to one minute for the change to take effect. If you change the policy attached to the role you specified in the <code>roleArn</code> field (for example, to correct an invalid policy), it takes up to five minutes for that change to take effect.</p>"
     },
     "TagResource":{
       "name":"TagResource",
@@ -322,22 +322,22 @@
         },
         "lambda":{
           "shape":"LambdaAction",
-          "documentation":"<p>Calls an AWS Lambda function, passing in information about the detector model instance and the event which triggered the action.</p>"
+          "documentation":"<p>Calls a Lambda function, passing in information about the detector model instance and the event that triggered the action.</p>"
         },
         "iotEvents":{
           "shape":"IotEventsAction",
-          "documentation":"<p>Sends an IoT Events input, passing in information about the detector model instance and the event which triggered the action.</p>"
+          "documentation":"<p>Sends an AWS IoT Events input, passing in information about the detector model instance and the event that triggered the action.</p>"
         },
         "sqs":{
           "shape":"SqsAction",
-          "documentation":"<p>Sends information about the detector model instance and the event which triggered the action to an Amazon SQS queue.</p>"
+          "documentation":"<p>Sends information about the detector model instance and the event that triggered the action to an Amazon SQS queue.</p>"
         },
         "firehose":{
           "shape":"FirehoseAction",
-          "documentation":"<p>Sends information about the detector model instance and the event which triggered the action to a Kinesis Data Firehose delivery stream.</p>"
+          "documentation":"<p>Sends information about the detector model instance and the event that triggered the action to an Amazon Kinesis Data Firehose delivery stream.</p>"
         }
       },
-      "documentation":"<p>An action to be performed when the <code>\"condition\"</code> is TRUE.</p>"
+      "documentation":"<p>An action to be performed when the <code>condition</code> is TRUE.</p>"
     },
     "Actions":{
       "type":"list",
@@ -354,10 +354,10 @@
       "members":{
         "jsonPath":{
           "shape":"AttributeJsonPath",
-          "documentation":"<p>An expression that specifies an attribute-value pair in a JSON structure. Use this to specify an attribute from the JSON payload that is made available by the input. Inputs are derived from messages sent to the AWS IoT Events system (<code>BatchPutMessage</code>). Each such message contains a JSON payload, and the attribute (and its paired value) specified here are available for use in the <code>\"condition\"</code> expressions used by detectors. </p> <p>Syntax: <code>&lt;field-name&gt;.&lt;field-name&gt;...</code> </p>"
+          "documentation":"<p>An expression that specifies an attribute-value pair in a JSON structure. Use this to specify an attribute from the JSON payload that is made available by the input. Inputs are derived from messages sent to AWS IoT Events (<code>BatchPutMessage</code>). Each such message contains a JSON payload. The attribute (and its paired value) specified here are available for use in the <code>condition</code> expressions used by detectors. </p> <p>Syntax: <code>&lt;field-name&gt;.&lt;field-name&gt;...</code> </p>"
         }
       },
-      "documentation":"<p>The attributes from the JSON payload that are made available by the input. Inputs are derived from messages sent to the AWS IoT Events system using <code>BatchPutMessage</code>. Each such message contains a JSON payload, and those attributes (and their paired values) specified here are available for use in the <code>condition</code> expressions used by detectors. </p>"
+      "documentation":"<p>The attributes from the JSON payload that are made available by the input. Inputs are derived from messages sent to the AWS IoT Events system using <code>BatchPutMessage</code>. Each such message contains a JSON payload. Those attributes (and their paired values) specified here are available for use in the <code>condition</code> expressions used by detectors. </p>"
     },
     "AttributeJsonPath":{
       "type":"string",
@@ -408,7 +408,7 @@
         },
         "key":{
           "shape":"AttributeJsonPath",
-          "documentation":"<p>The input attribute key used to identify a device or system to create a detector (an instance of the detector model) and then to route each input received to the appropriate detector (instance). This parameter uses a JSON-path expression to specify the attribute-value pair in the message payload of each input that is used to identify the device associated with the input.</p>"
+          "documentation":"<p>The input attribute key used to identify a device or system to create a detector (an instance of the detector model) and then to route each input received to the appropriate detector (instance). This parameter uses a JSON-path expression in the message payload of each input to specify the attribute-value pair that is used to identify the device associated with the input.</p>"
         },
         "roleArn":{
           "shape":"AmazonResourceName",
@@ -420,7 +420,7 @@
         },
         "evaluationMethod":{
           "shape":"EvaluationMethod",
-          "documentation":"<p>When set to <code>SERIAL</code>, variables are updated and event conditions evaluated in the order that the events are defined. When set to <code>BATCH</code>, variables are updated and events performed only after all event conditions are evaluated.</p>"
+          "documentation":"<p>Information about the order in which events are evaluated and how actions are executed. </p>"
         }
       }
     },
@@ -636,11 +636,11 @@
         },
         "key":{
           "shape":"AttributeJsonPath",
-          "documentation":"<p>The input attribute key used to identify a device or system to create a detector (an instance of the detector model) and then to route each input received to the appropriate detector (instance). This parameter uses a JSON-path expression to specify the attribute-value pair in the message payload of each input that is used to identify the device associated with the input.</p>"
+          "documentation":"<p>The input attribute key used to identify a device or system to create a detector (an instance of the detector model) and then to route each input received to the appropriate detector (instance). This parameter uses a JSON-path expression in the message payload of each input to specify the attribute-value pair that is used to identify the device associated with the input.</p>"
         },
         "evaluationMethod":{
           "shape":"EvaluationMethod",
-          "documentation":"<p>When set to <code>SERIAL</code>, variables are updated and event conditions evaluated in the order that the events are defined. When set to <code>BATCH</code>, variables are updated and events performed only after all event conditions are evaluated.</p>"
+          "documentation":"<p>Information about the order in which events are evaluated and how actions are executed. </p>"
         }
       },
       "documentation":"<p>Information about how the detector model is configured.</p>"
@@ -749,7 +749,7 @@
         },
         "evaluationMethod":{
           "shape":"EvaluationMethod",
-          "documentation":"<p>When set to <code>SERIAL</code>, variables are updated and event conditions evaluated in the order that the events are defined. When set to <code>BATCH</code>, variables are updated and events performed only after all event conditions are evaluated.</p>"
+          "documentation":"<p>Information about the order in which events are evaluated and how actions are executed. </p>"
         }
       },
       "documentation":"<p>Information about the detector model version.</p>"
@@ -771,14 +771,14 @@
         },
         "condition":{
           "shape":"Condition",
-          "documentation":"<p>[Optional] The Boolean expression that when TRUE causes the <code>\"actions\"</code> to be performed. If not present, the actions are performed (=TRUE); if the expression result is not a Boolean value, the actions are NOT performed (=FALSE).</p>"
+          "documentation":"<p>Optional. The Boolean expression that, when TRUE, causes the <code>actions</code> to be performed. If not present, the actions are performed (=TRUE). If the expression result is not a Boolean value, the actions are not performed (=FALSE).</p>"
         },
         "actions":{
           "shape":"Actions",
           "documentation":"<p>The actions to be performed.</p>"
         }
       },
-      "documentation":"<p>Specifies the <code>\"actions\"</code> to be performed when the <code>\"condition\"</code> evaluates to TRUE.</p>"
+      "documentation":"<p>Specifies the <code>actions</code> to be performed when the <code>condition</code> evaluates to TRUE.</p>"
     },
     "EventName":{
       "type":"string",
@@ -801,7 +801,7 @@
           "documentation":"<p>A character separator that is used to separate records written to the Kinesis Data Firehose delivery stream. Valid values are: '\\n' (newline), '\\t' (tab), '\\r\\n' (Windows newline), ',' (comma).</p>"
         }
       },
-      "documentation":"<p>Sends information about the detector model instance and the event which triggered the action to a Kinesis Data Firehose delivery stream.</p>"
+      "documentation":"<p>Sends information about the detector model instance and the event that triggered the action to an Amazon Kinesis Data Firehose delivery stream.</p>"
     },
     "FirehoseSeparator":{
       "type":"string",
@@ -865,7 +865,7 @@
       "members":{
         "attributes":{
           "shape":"Attributes",
-          "documentation":"<p>The attributes from the JSON payload that are made available by the input. Inputs are derived from messages sent to the AWS IoT Events system using <code>BatchPutMessage</code>. Each such message contains a JSON payload, and those attributes (and their paired values) specified here are available for use in the <code>\"condition\"</code> expressions used by detectors that monitor this input. </p>"
+          "documentation":"<p>The attributes from the JSON payload that are made available by the input. Inputs are derived from messages sent to the AWS IoT Events system using <code>BatchPutMessage</code>. Each such message contains a JSON payload, and those attributes (and their paired values) specified here are available for use in the <code>condition</code> expressions used by detectors that monitor this input. </p>"
         }
       },
       "documentation":"<p>The definition of the input.</p>"
@@ -957,7 +957,7 @@
           "documentation":"<p>The name of the AWS IoT Events input where the data is sent.</p>"
         }
       },
-      "documentation":"<p>Sends an IoT Events input, passing in information about the detector model instance and the event which triggered the action.</p>"
+      "documentation":"<p>Sends an AWS IoT Events input, passing in information about the detector model instance and the event that triggered the action.</p>"
     },
     "IotTopicPublishAction":{
       "type":"structure",
@@ -965,10 +965,10 @@
       "members":{
         "mqttTopic":{
           "shape":"MQTTTopic",
-          "documentation":"<p>The MQTT topic of the message.</p>"
+          "documentation":"<p>The MQTT topic of the message. You can use a string expression that includes variables (<code>$variable.&lt;variable-name&gt;</code>) and input values (<code>$input.&lt;input-name&gt;.&lt;path-to-datum&gt;</code>) as the topic string.</p>"
         }
       },
-      "documentation":"<p>Information required to publish the MQTT message via the AWS IoT message broker.</p>"
+      "documentation":"<p>Information required to publish the MQTT message through the AWS IoT message broker.</p>"
     },
     "KeyValue":{
       "type":"string",
@@ -982,10 +982,10 @@
       "members":{
         "functionArn":{
           "shape":"AmazonResourceName",
-          "documentation":"<p>The ARN of the AWS Lambda function which is executed.</p>"
+          "documentation":"<p>The ARN of the Lambda function that is executed.</p>"
         }
       },
-      "documentation":"<p>Calls an AWS Lambda function, passing in information about the detector model instance and the event which triggered the action.</p>"
+      "documentation":"<p>Calls a Lambda function, passing in information about the detector model instance and the event that triggered the action.</p>"
     },
     "LimitExceededException":{
       "type":"structure",
@@ -1169,7 +1169,7 @@
       "members":{
         "events":{
           "shape":"Events",
-          "documentation":"<p>Specifies the actions that are performed when the state is entered and the <code>\"condition\"</code> is TRUE.</p>"
+          "documentation":"<p>Specifies the actions that are performed when the state is entered and the <code>condition</code> is TRUE.</p>"
         }
       },
       "documentation":"<p>When entering this state, perform these <code>actions</code> if the <code>condition</code> is TRUE.</p>"
@@ -1179,24 +1179,24 @@
       "members":{
         "events":{
           "shape":"Events",
-          "documentation":"<p>Specifies the <code>\"actions\"</code> that are performed when the state is exited and the <code>\"condition\"</code> is TRUE.</p>"
+          "documentation":"<p>Specifies the <code>actions</code> that are performed when the state is exited and the <code>condition</code> is TRUE.</p>"
         }
       },
-      "documentation":"<p>When exiting this state, perform these <code>\"actions\"</code> if the specified <code>\"condition\"</code> is TRUE.</p>"
+      "documentation":"<p>When exiting this state, perform these <code>actions</code> if the specified <code>condition</code> is TRUE.</p>"
     },
     "OnInputLifecycle":{
       "type":"structure",
       "members":{
         "events":{
           "shape":"Events",
-          "documentation":"<p>Specifies the actions performed when the <code>\"condition\"</code> evaluates to TRUE.</p>"
+          "documentation":"<p>Specifies the actions performed when the <code>condition</code> evaluates to TRUE.</p>"
         },
         "transitionEvents":{
           "shape":"TransitionEvents",
-          "documentation":"<p>Specifies the actions performed, and the next state entered, when a <code>\"condition\"</code> evaluates to TRUE.</p>"
+          "documentation":"<p>Specifies the actions performed, and the next state entered, when a <code>condition</code> evaluates to TRUE.</p>"
         }
       },
-      "documentation":"<p>Specifies the actions performed when the <code>\"condition\"</code> evaluates to TRUE.</p>"
+      "documentation":"<p>Specifies the actions performed when the <code>condition</code> evaluates to TRUE.</p>"
     },
     "PutLoggingOptionsRequest":{
       "type":"structure",
@@ -1218,7 +1218,7 @@
           "documentation":"<p>The name of the timer to reset.</p>"
         }
       },
-      "documentation":"<p>Information needed to reset the timer.</p>"
+      "documentation":"<p>Information required to reset the timer. The timer is reset to the previously evaluated result of the duration. </p>"
     },
     "ResourceAlreadyExistsException":{
       "type":"structure",
@@ -1275,7 +1275,11 @@
       },
       "documentation":"<p>Information required to publish the Amazon SNS message.</p>"
     },
-    "Seconds":{"type":"integer"},
+    "Seconds":{
+      "type":"integer",
+      "max":31622400,
+      "min":1
+    },
     "ServiceUnavailableException":{
       "type":"structure",
       "members":{
@@ -1291,10 +1295,7 @@
     },
     "SetTimerAction":{
       "type":"structure",
-      "required":[
-        "timerName",
-        "seconds"
-      ],
+      "required":["timerName"],
       "members":{
         "timerName":{
           "shape":"TimerName",
@@ -1302,7 +1303,13 @@
         },
         "seconds":{
           "shape":"Seconds",
-          "documentation":"<p>The number of seconds until the timer expires. The minimum value is 60 seconds to ensure accuracy.</p>"
+          "documentation":"<p>The number of seconds until the timer expires. The minimum value is 60 seconds to ensure accuracy.</p>",
+          "deprecated":true,
+          "deprecatedMessage":"seconds is deprecated. You can use durationExpression for SetTimerAction. The value of seconds can be used as a string expression for durationExpression."
+        },
+        "durationExpression":{
+          "shape":"VariableValue",
+          "documentation":"<p>The duration of the timer, in seconds. You can use a string expression that includes numbers, variables (<code>$variable.&lt;variable-name&gt;</code>), and input values (<code>$input.&lt;input-name&gt;.&lt;path-to-datum&gt;</code>) as the duration. The range of the duration is 1-31622400 seconds. To ensure accuracy, the minimum duration is 60 seconds. The evaluated result of the duration is rounded down to the nearest whole number. </p>"
         }
       },
       "documentation":"<p>Information needed to set the timer.</p>"
@@ -1331,14 +1338,14 @@
       "members":{
         "queueUrl":{
           "shape":"QueueUrl",
-          "documentation":"<p>The URL of the Amazon SQS queue where the data is written.</p>"
+          "documentation":"<p>The URL of the SQS queue where the data is written.</p>"
         },
         "useBase64":{
           "shape":"UseBase64",
-          "documentation":"<p>Set this to TRUE if you want the data to be Base-64 encoded before it is written to the queue. Otherwise, set this to FALSE.</p>"
+          "documentation":"<p>Set this to TRUE if you want the data to be base-64 encoded before it is written to the queue.</p>"
         }
       },
-      "documentation":"<p>Sends information about the detector model instance and the event which triggered the action to an Amazon SQS queue.</p>"
+      "documentation":"<p>Sends information about the detector model instance and the event that triggered the action to an Amazon SQS queue.</p>"
     },
     "State":{
       "type":"structure",
@@ -1350,15 +1357,15 @@
         },
         "onInput":{
           "shape":"OnInputLifecycle",
-          "documentation":"<p>When an input is received and the <code>\"condition\"</code> is TRUE, perform the specified <code>\"actions\"</code>.</p>"
+          "documentation":"<p>When an input is received and the <code>condition</code> is TRUE, perform the specified <code>actions</code>.</p>"
         },
         "onEnter":{
           "shape":"OnEnterLifecycle",
-          "documentation":"<p>When entering this state, perform these <code>\"actions\"</code> if the <code>\"condition\"</code> is TRUE.</p>"
+          "documentation":"<p>When entering this state, perform these <code>actions</code> if the <code>condition</code> is TRUE.</p>"
         },
         "onExit":{
           "shape":"OnExitLifecycle",
-          "documentation":"<p>When exiting this state, perform these <code>\"actions\"</code> if the specified <code>\"condition\"</code> is TRUE.</p>"
+          "documentation":"<p>When exiting this state, perform these <code>actions</code> if the specified <code>condition</code> is TRUE.</p>"
         }
       },
       "documentation":"<p>Information that defines a state of a detector.</p>"
@@ -1465,7 +1472,7 @@
         },
         "condition":{
           "shape":"Condition",
-          "documentation":"<p>[Required] A Boolean expression that when TRUE causes the actions to be performed and the <code>\"nextState\"</code> to be entered.</p>"
+          "documentation":"<p>Required. A Boolean expression that when TRUE causes the actions to be performed and the <code>nextState</code> to be entered.</p>"
         },
         "actions":{
           "shape":"Actions",
@@ -1476,7 +1483,7 @@
           "documentation":"<p>The next state to enter.</p>"
         }
       },
-      "documentation":"<p>Specifies the actions performed and the next state entered when a <code>\"condition\"</code> evaluates to TRUE.</p>"
+      "documentation":"<p>Specifies the actions performed and the next state entered when a <code>condition</code> evaluates to TRUE.</p>"
     },
     "TransitionEvents":{
       "type":"list",
@@ -1549,7 +1556,7 @@
         },
         "evaluationMethod":{
           "shape":"EvaluationMethod",
-          "documentation":"<p>When set to <code>SERIAL</code>, variables are updated and event conditions evaluated in the order that the events are defined. When set to <code>BATCH</code>, variables are updated and events performed only after all event conditions are evaluated.</p>"
+          "documentation":"<p>Information about the order in which events are evaluated and how actions are executed. </p>"
         }
       }
     },
@@ -1610,5 +1617,5 @@
     "resourceArn":{"type":"string"},
     "resourceId":{"type":"string"}
   },
-  "documentation":"<p>AWS IoT Events monitors your equipment or device fleets for failures or changes in operation, and triggers actions when such events occur. AWS IoT Events API commands enable you to create, read, update and delete inputs and detector models, and to list their versions.</p>"
+  "documentation":"<p>AWS IoT Events monitors your equipment or device fleets for failures or changes in operation, and triggers actions when such events occur. You can use AWS IoT Events API commands to create, read, update, and delete inputs and detector models, and to list their versions.</p>"
 }
diff --git a/services/ioteventsdata/pom.xml b/services/ioteventsdata/pom.xml
index 9c64a7327b9e..9361a0305ee9 100644
--- a/services/ioteventsdata/pom.xml
+++ b/services/ioteventsdata/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>ioteventsdata</artifactId>
     <name>AWS Java SDK :: Services :: IoT Events Data</name>
diff --git a/services/iotjobsdataplane/pom.xml b/services/iotjobsdataplane/pom.xml
index 2e9aa31738da..508b3ebeb5dc 100644
--- a/services/iotjobsdataplane/pom.xml
+++ b/services/iotjobsdataplane/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>iotjobsdataplane</artifactId>
     <name>AWS Java SDK :: Services :: IoT Jobs Data Plane</name>
diff --git a/services/iotsecuretunneling/pom.xml b/services/iotsecuretunneling/pom.xml
new file mode 100644
index 000000000000..71412c0935f3
--- /dev/null
+++ b/services/iotsecuretunneling/pom.xml
@@ -0,0 +1,60 @@
+<?xml version="1.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.
+  -->
+
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>software.amazon.awssdk</groupId>
+        <artifactId>services</artifactId>
+        <version>2.11.8-SNAPSHOT</version>
+    </parent>
+    <artifactId>iotsecuretunneling</artifactId>
+    <name>AWS Java SDK :: Services :: IoTSecureTunneling</name>
+    <description>The AWS Java SDK for IoTSecureTunneling module holds the client classes that are used for
+        communicating with IoTSecureTunneling.
+    </description>
+    <url>https://aws.amazon.com/sdkforjava</url>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifestEntries>
+                            <Automatic-Module-Name>software.amazon.awssdk.services.iotsecuretunneling</Automatic-Module-Name>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>protocol-core</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>aws-json-protocol</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/services/iotsecuretunneling/src/main/resources/codegen-resources/paginators-1.json b/services/iotsecuretunneling/src/main/resources/codegen-resources/paginators-1.json
new file mode 100644
index 000000000000..cd36b9c69a85
--- /dev/null
+++ b/services/iotsecuretunneling/src/main/resources/codegen-resources/paginators-1.json
@@ -0,0 +1,9 @@
+{
+  "pagination": {
+    "ListTunnels": {
+      "input_token": "nextToken",
+      "output_token": "nextToken",
+      "limit_key": "maxResults"
+    }
+  }
+}
diff --git a/services/iotsecuretunneling/src/main/resources/codegen-resources/service-2.json b/services/iotsecuretunneling/src/main/resources/codegen-resources/service-2.json
new file mode 100644
index 000000000000..effc6f03149e
--- /dev/null
+++ b/services/iotsecuretunneling/src/main/resources/codegen-resources/service-2.json
@@ -0,0 +1,539 @@
+{
+  "version":"2.0",
+  "metadata":{
+    "apiVersion":"2018-10-05",
+    "endpointPrefix":"api.tunneling.iot",
+    "jsonVersion":"1.1",
+    "protocol":"json",
+    "serviceFullName":"AWS IoT Secure Tunneling",
+    "serviceId":"IoTSecureTunneling",
+    "signatureVersion":"v4",
+    "signingName":"IoTSecuredTunneling",
+    "targetPrefix":"IoTSecuredTunneling",
+    "uid":"iotsecuretunneling-2018-10-05"
+  },
+  "operations":{
+    "CloseTunnel":{
+      "name":"CloseTunnel",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"CloseTunnelRequest"},
+      "output":{"shape":"CloseTunnelResponse"},
+      "errors":[
+        {"shape":"ResourceNotFoundException"}
+      ],
+      "documentation":"<p>Closes a tunnel identified by the unique tunnel id. When a <code>CloseTunnel</code> request is received, we close the WebSocket connections between the client and proxy server so no data can be transmitted.</p>"
+    },
+    "DescribeTunnel":{
+      "name":"DescribeTunnel",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DescribeTunnelRequest"},
+      "output":{"shape":"DescribeTunnelResponse"},
+      "errors":[
+        {"shape":"ResourceNotFoundException"}
+      ],
+      "documentation":"<p>Gets information about a tunnel identified by the unique tunnel id.</p>"
+    },
+    "ListTagsForResource":{
+      "name":"ListTagsForResource",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"ListTagsForResourceRequest"},
+      "output":{"shape":"ListTagsForResourceResponse"},
+      "errors":[
+        {"shape":"ResourceNotFoundException"}
+      ],
+      "documentation":"<p>Lists the tags for the specified resource.</p>"
+    },
+    "ListTunnels":{
+      "name":"ListTunnels",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"ListTunnelsRequest"},
+      "output":{"shape":"ListTunnelsResponse"},
+      "documentation":"<p>List all tunnels for an AWS account. Tunnels are listed by creation time in descending order, newer tunnels will be listed before older tunnels.</p>"
+    },
+    "OpenTunnel":{
+      "name":"OpenTunnel",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"OpenTunnelRequest"},
+      "output":{"shape":"OpenTunnelResponse"},
+      "errors":[
+        {"shape":"LimitExceededException"}
+      ],
+      "documentation":"<p>Creates a new tunnel, and returns two client access tokens for clients to use to connect to the AWS IoT Secure Tunneling proxy server. .</p>"
+    },
+    "TagResource":{
+      "name":"TagResource",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"TagResourceRequest"},
+      "output":{"shape":"TagResourceResponse"},
+      "errors":[
+        {"shape":"ResourceNotFoundException"}
+      ],
+      "documentation":"<p>A resource tag.</p>"
+    },
+    "UntagResource":{
+      "name":"UntagResource",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"UntagResourceRequest"},
+      "output":{"shape":"UntagResourceResponse"},
+      "errors":[
+        {"shape":"ResourceNotFoundException"}
+      ],
+      "documentation":"<p>Removes a tag from a resource.</p>"
+    }
+  },
+  "shapes":{
+    "AmazonResourceName":{
+      "type":"string",
+      "max":1011,
+      "min":1
+    },
+    "ClientAccessToken":{
+      "type":"string",
+      "sensitive":true
+    },
+    "CloseTunnelRequest":{
+      "type":"structure",
+      "required":["tunnelId"],
+      "members":{
+        "tunnelId":{
+          "shape":"TunnelId",
+          "documentation":"<p>The ID of the tunnel to close.</p>"
+        },
+        "delete":{
+          "shape":"DeleteFlag",
+          "documentation":"<p>When set to true, AWS IoT Secure Tunneling deletes the tunnel data immediately.</p>",
+          "box":true
+        }
+      }
+    },
+    "CloseTunnelResponse":{
+      "type":"structure",
+      "members":{
+      }
+    },
+    "ConnectionState":{
+      "type":"structure",
+      "members":{
+        "status":{
+          "shape":"ConnectionStatus",
+          "documentation":"<p>The connection status of the tunnel. Valid values are <code>CONNECTED</code> and <code>DISCONNECTED</code>.</p>"
+        },
+        "lastUpdatedAt":{
+          "shape":"DateType",
+          "documentation":"<p>The last time the connection status was updated.</p>"
+        }
+      },
+      "documentation":"<p>The state of a connection.</p>"
+    },
+    "ConnectionStatus":{
+      "type":"string",
+      "enum":[
+        "CONNECTED",
+        "DISCONNECTED"
+      ]
+    },
+    "DateType":{"type":"timestamp"},
+    "DeleteFlag":{"type":"boolean"},
+    "DescribeTunnelRequest":{
+      "type":"structure",
+      "required":["tunnelId"],
+      "members":{
+        "tunnelId":{
+          "shape":"TunnelId",
+          "documentation":"<p>The tunnel to describe.</p>"
+        }
+      }
+    },
+    "DescribeTunnelResponse":{
+      "type":"structure",
+      "members":{
+        "tunnel":{
+          "shape":"Tunnel",
+          "documentation":"<p>The tunnel being described.</p>"
+        }
+      }
+    },
+    "Description":{
+      "type":"string",
+      "pattern":"[^\\p{C}]{1,2048}"
+    },
+    "DestinationConfig":{
+      "type":"structure",
+      "required":[
+        "thingName",
+        "services"
+      ],
+      "members":{
+        "thingName":{
+          "shape":"ThingName",
+          "documentation":"<p>The name of the IoT thing to which you want to connect.</p>"
+        },
+        "services":{
+          "shape":"ServiceList",
+          "documentation":"<p>A list of service names that identity the target application. Currently, you can only specify a single name. The AWS IoT client running on the destination device reads this value and uses it to look up a port or an IP address and a port. The AWS IoT client instantiates the local proxy which uses this information to connect to the destination application.</p>"
+        }
+      },
+      "documentation":"<p>The destination configuration.</p>"
+    },
+    "ErrorMessage":{"type":"string"},
+    "LimitExceededException":{
+      "type":"structure",
+      "members":{
+        "message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p>Thrown when a tunnel limit is exceeded.</p>",
+      "exception":true
+    },
+    "ListTagsForResourceRequest":{
+      "type":"structure",
+      "required":["resourceArn"],
+      "members":{
+        "resourceArn":{
+          "shape":"AmazonResourceName",
+          "documentation":"<p>The resource ARN.</p>"
+        }
+      }
+    },
+    "ListTagsForResourceResponse":{
+      "type":"structure",
+      "members":{
+        "tags":{
+          "shape":"TagList",
+          "documentation":"<p>The tags for the specified resource.</p>"
+        }
+      }
+    },
+    "ListTunnelsRequest":{
+      "type":"structure",
+      "members":{
+        "thingName":{
+          "shape":"ThingName",
+          "documentation":"<p>The name of the IoT thing associated with the destination device.</p>"
+        },
+        "maxResults":{
+          "shape":"MaxResults",
+          "documentation":"<p>The maximum number of results to return at once.</p>",
+          "box":true
+        },
+        "nextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>A token to retrieve the next set of results.</p>"
+        }
+      }
+    },
+    "ListTunnelsResponse":{
+      "type":"structure",
+      "members":{
+        "tunnelSummaries":{
+          "shape":"TunnelSummaryList",
+          "documentation":"<p>A short description of the tunnels in an AWS account.</p>"
+        },
+        "nextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>A token to used to retrieve the next set of results.</p>"
+        }
+      }
+    },
+    "MaxResults":{
+      "type":"integer",
+      "max":100,
+      "min":1
+    },
+    "NextToken":{
+      "type":"string",
+      "pattern":"[a-zA-Z0-9_=-]{1,4096}"
+    },
+    "OpenTunnelRequest":{
+      "type":"structure",
+      "members":{
+        "description":{
+          "shape":"Description",
+          "documentation":"<p>A short text description of the tunnel. </p>"
+        },
+        "tags":{
+          "shape":"TagList",
+          "documentation":"<p>A collection of tag metadata.</p>"
+        },
+        "destinationConfig":{
+          "shape":"DestinationConfig",
+          "documentation":"<p>The destination configuration for the OpenTunnel request.</p>"
+        },
+        "timeoutConfig":{
+          "shape":"TimeoutConfig",
+          "documentation":"<p>Timeout configuration for a tunnel.</p>"
+        }
+      }
+    },
+    "OpenTunnelResponse":{
+      "type":"structure",
+      "members":{
+        "tunnelId":{
+          "shape":"TunnelId",
+          "documentation":"<p>A unique alpha-numeric tunnel ID.</p>"
+        },
+        "tunnelArn":{
+          "shape":"TunnelArn",
+          "documentation":"<p>The Amazon Resource Name for the tunnel. The tunnel ARN format is <code>arn:aws:tunnel:&lt;region&gt;:&lt;account-id&gt;:tunnel/&lt;tunnel-id&gt;</code> </p>"
+        },
+        "sourceAccessToken":{
+          "shape":"ClientAccessToken",
+          "documentation":"<p>The access token the source local proxy uses to connect to AWS IoT Secure Tunneling.</p>"
+        },
+        "destinationAccessToken":{
+          "shape":"ClientAccessToken",
+          "documentation":"<p>The access token the destination local proxy uses to connect to AWS IoT Secure Tunneling.</p>"
+        }
+      }
+    },
+    "ResourceNotFoundException":{
+      "type":"structure",
+      "members":{
+        "message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p>Thrown when an operation is attempted on a resource that does not exist.</p>",
+      "exception":true
+    },
+    "Service":{
+      "type":"string",
+      "max":8,
+      "min":1,
+      "pattern":"[a-zA-Z0-9:_-]+"
+    },
+    "ServiceList":{
+      "type":"list",
+      "member":{"shape":"Service"},
+      "max":1,
+      "min":1
+    },
+    "Tag":{
+      "type":"structure",
+      "required":[
+        "key",
+        "value"
+      ],
+      "members":{
+        "key":{
+          "shape":"TagKey",
+          "documentation":"<p>The key of the tag.</p>"
+        },
+        "value":{
+          "shape":"TagValue",
+          "documentation":"<p>The value of the tag.</p>"
+        }
+      },
+      "documentation":"<p>An arbitary key/value pair used to add searchable metadata to secure tunnel resources.</p>"
+    },
+    "TagKey":{
+      "type":"string",
+      "max":128,
+      "min":1,
+      "pattern":"^([\\p{L}\\p{Z}\\p{N}_.:/=+\\-@]*)$"
+    },
+    "TagKeyList":{
+      "type":"list",
+      "member":{"shape":"TagKey"},
+      "max":200,
+      "min":0
+    },
+    "TagList":{
+      "type":"list",
+      "member":{"shape":"Tag"},
+      "max":200,
+      "min":1
+    },
+    "TagResourceRequest":{
+      "type":"structure",
+      "required":[
+        "resourceArn",
+        "tags"
+      ],
+      "members":{
+        "resourceArn":{
+          "shape":"AmazonResourceName",
+          "documentation":"<p>The ARN of the resource.</p>"
+        },
+        "tags":{
+          "shape":"TagList",
+          "documentation":"<p>The tags for the resource.</p>"
+        }
+      }
+    },
+    "TagResourceResponse":{
+      "type":"structure",
+      "members":{
+      }
+    },
+    "TagValue":{
+      "type":"string",
+      "max":256,
+      "min":0,
+      "pattern":"^([\\p{L}\\p{Z}\\p{N}_.:/=+\\-@]*)$"
+    },
+    "ThingName":{
+      "type":"string",
+      "max":128,
+      "min":1,
+      "pattern":"[a-zA-Z0-9:_-]+"
+    },
+    "TimeoutConfig":{
+      "type":"structure",
+      "members":{
+        "maxLifetimeTimeoutMinutes":{
+          "shape":"TimeoutInMin",
+          "documentation":"<p>The maximum amount of time (in minutes) a tunnel can remain open. If not specified, maxLifetimeTimeoutMinutes defaults to 720 minutes. Valid values are from 1 minute to 12 hours (720 minutes) </p>",
+          "box":true
+        }
+      },
+      "documentation":"<p>Tunnel timeout configuration.</p>"
+    },
+    "TimeoutInMin":{
+      "type":"integer",
+      "max":720,
+      "min":1
+    },
+    "Tunnel":{
+      "type":"structure",
+      "members":{
+        "tunnelId":{
+          "shape":"TunnelId",
+          "documentation":"<p>A unique alpha-numeric ID that identifies a tunnel.</p>"
+        },
+        "tunnelArn":{
+          "shape":"TunnelArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of a tunnel. The tunnel ARN format is <code>arn:aws:tunnel:&lt;region&gt;:&lt;account-id&gt;:tunnel/&lt;tunnel-id&gt;</code> </p>"
+        },
+        "status":{
+          "shape":"TunnelStatus",
+          "documentation":"<p>The status of a tunnel. Valid values are: Open and Closed.</p>"
+        },
+        "sourceConnectionState":{
+          "shape":"ConnectionState",
+          "documentation":"<p>The connection state of the source application.</p>"
+        },
+        "destinationConnectionState":{
+          "shape":"ConnectionState",
+          "documentation":"<p>The connection state of the destination application.</p>"
+        },
+        "description":{
+          "shape":"Description",
+          "documentation":"<p>A description of the tunnel.</p>"
+        },
+        "destinationConfig":{
+          "shape":"DestinationConfig",
+          "documentation":"<p>The destination configuration that specifies the thing name of the destination device and a service name that the local proxy uses to connect to the destination application.</p>"
+        },
+        "timeoutConfig":{
+          "shape":"TimeoutConfig",
+          "documentation":"<p>Timeout configuration for the tunnel.</p>"
+        },
+        "tags":{
+          "shape":"TagList",
+          "documentation":"<p>A list of tag metadata associated with the secure tunnel.</p>"
+        },
+        "createdAt":{
+          "shape":"DateType",
+          "documentation":"<p>The time when the tunnel was created.</p>"
+        },
+        "lastUpdatedAt":{
+          "shape":"DateType",
+          "documentation":"<p>The last time the tunnel was updated.</p>"
+        }
+      },
+      "documentation":"<p>A connection between a source computer and a destination device.</p>"
+    },
+    "TunnelArn":{
+      "type":"string",
+      "max":1600,
+      "min":1
+    },
+    "TunnelId":{
+      "type":"string",
+      "pattern":"[a-zA-Z0-9_\\-+=:]{1,128}"
+    },
+    "TunnelStatus":{
+      "type":"string",
+      "enum":[
+        "OPEN",
+        "CLOSED"
+      ]
+    },
+    "TunnelSummary":{
+      "type":"structure",
+      "members":{
+        "tunnelId":{
+          "shape":"TunnelId",
+          "documentation":"<p>The unique alpha-numeric identifier for the tunnel.</p>"
+        },
+        "tunnelArn":{
+          "shape":"TunnelArn",
+          "documentation":"<p>The Amazon Resource Name of the tunnel. The tunnel ARN format is <code>arn:aws:tunnel:&lt;region&gt;:&lt;account-id&gt;:tunnel/&lt;tunnel-id&gt;</code> </p>"
+        },
+        "status":{
+          "shape":"TunnelStatus",
+          "documentation":"<p>The status of a tunnel. Valid values are: Open and Closed.</p>"
+        },
+        "description":{
+          "shape":"Description",
+          "documentation":"<p>A description of the tunnel.</p>"
+        },
+        "createdAt":{
+          "shape":"DateType",
+          "documentation":"<p>The time the tunnel was created.</p>"
+        },
+        "lastUpdatedAt":{
+          "shape":"DateType",
+          "documentation":"<p>The time the tunnel was last updated.</p>"
+        }
+      },
+      "documentation":"<p>Information about the tunnel.</p>"
+    },
+    "TunnelSummaryList":{
+      "type":"list",
+      "member":{"shape":"TunnelSummary"}
+    },
+    "UntagResourceRequest":{
+      "type":"structure",
+      "required":[
+        "resourceArn",
+        "tagKeys"
+      ],
+      "members":{
+        "resourceArn":{
+          "shape":"AmazonResourceName",
+          "documentation":"<p>The resource ARN.</p>"
+        },
+        "tagKeys":{
+          "shape":"TagKeyList",
+          "documentation":"<p>The keys of the tags to remove.</p>"
+        }
+      }
+    },
+    "UntagResourceResponse":{
+      "type":"structure",
+      "members":{
+      }
+    }
+  },
+  "documentation":"<fullname>AWS IoT Secure Tunneling</fullname> <p>AWS IoT Secure Tunnling enables you to create remote connections to devices deployed in the field.</p> <p>For more information about how AWS IoT Secure Tunneling works, see the <a href=\"https://docs.aws.amazon.com/secure-tunneling/latest/ug/what-is-secure-tunneling.html\">User Guide</a>.</p>"
+}
diff --git a/services/iotthingsgraph/pom.xml b/services/iotthingsgraph/pom.xml
index 0160519dc901..81536ee4da43 100644
--- a/services/iotthingsgraph/pom.xml
+++ b/services/iotthingsgraph/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>iotthingsgraph</artifactId>
     <name>AWS Java SDK :: Services :: IoTThingsGraph</name>
diff --git a/services/kafka/pom.xml b/services/kafka/pom.xml
index c62e0cb811c7..61624343088c 100644
--- a/services/kafka/pom.xml
+++ b/services/kafka/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>kafka</artifactId>
     <name>AWS Java SDK :: Services :: Kafka</name>
diff --git a/services/kafka/src/main/resources/codegen-resources/paginators-1.json b/services/kafka/src/main/resources/codegen-resources/paginators-1.json
index 45be84ce5509..c49b23505749 100644
--- a/services/kafka/src/main/resources/codegen-resources/paginators-1.json
+++ b/services/kafka/src/main/resources/codegen-resources/paginators-1.json
@@ -12,6 +12,12 @@
       "limit_key": "MaxResults",
       "result_key": "Configurations"
     },
+    "ListKafkaVersions": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "MaxResults",
+      "result_key": "KafkaVersions"
+    },
     "ListNodes": {
       "input_token": "NextToken",
       "output_token": "NextToken",
diff --git a/services/kafka/src/main/resources/codegen-resources/service-2.json b/services/kafka/src/main/resources/codegen-resources/service-2.json
index c43cf454fbb1..b6d0617faecc 100644
--- a/services/kafka/src/main/resources/codegen-resources/service-2.json
+++ b/services/kafka/src/main/resources/codegen-resources/service-2.json
@@ -483,6 +483,39 @@
       ],
       "documentation": "\n            <p>Returns a list of all the MSK configurations in this Region.</p>\n         "
     },
+    "ListKafkaVersions": {
+      "name": "ListKafkaVersions",
+      "http": {
+        "method": "GET",
+        "requestUri": "/v1/kafka-versions",
+        "responseCode": 200
+      },
+      "input": {
+        "shape": "ListKafkaVersionsRequest"
+      },
+      "output": {
+        "shape": "ListKafkaVersionsResponse"
+      },
+      "errors": [
+        {
+          "shape": "BadRequestException",
+          "documentation": "\n            <p>The request isn't valid because the input is incorrect. Correct your input and then submit it again.</p>\n         "
+        },
+        {
+          "shape": "UnauthorizedException",
+          "documentation": "\n            <p>The request is not authorized. The provided credentials couldn't be validated.</p>\n         "
+        },
+        {
+          "shape": "InternalServerErrorException",
+          "documentation": "\n            <p>There was an unexpected internal server error. Retrying your request might resolve the issue.</p>\n         "
+        },
+        {
+          "shape": "ForbiddenException",
+          "documentation": "\n            <p>Access forbidden. Check your credentials and then retry your request.</p>\n         "
+        }
+      ],
+      "documentation": "\n            <p>Returns a list of Kafka versions.</p>\n         "
+    },
     "ListNodes": {
       "name": "ListNodes",
       "http": {
@@ -716,6 +749,38 @@
         }
       ],
       "documentation": "\n            <p>Updates the cluster with the configuration that is specified in the request body.</p>\n         "
+    },
+    "UpdateMonitoring" : {
+      "name" : "UpdateMonitoring",
+      "http" : {
+        "method" : "PUT",
+        "requestUri" : "/v1/clusters/{clusterArn}/monitoring",
+        "responseCode" : 200
+      },
+      "input" : {
+        "shape" : "UpdateMonitoringRequest"
+      },
+      "output" : {
+        "shape" : "UpdateMonitoringResponse",
+        "documentation" : "\n            <p>HTTP Status Code 200: OK.</p>\n         "
+      },
+      "errors" : [ {
+        "shape" : "ServiceUnavailableException",
+        "documentation" : "\n            <p>HTTP Status Code 503: Service Unavailable. Retrying your request in some time might resolve the issue.</p>\n         "
+      }, {
+        "shape" : "BadRequestException",
+        "documentation" : "\n            <p>HTTP Status Code 400: Bad request due to incorrect input. Correct your request and then retry it.</p>\n         "
+      }, {
+        "shape" : "UnauthorizedException",
+        "documentation" : "\n            <p>HTTP Status Code 401: Unauthorized request. The provided credentials couldn't be validated.</p>\n         "
+      }, {
+        "shape" : "InternalServerErrorException",
+        "documentation" : "\n            <p>HTTP Status Code 500: Unexpected internal server error. Retrying your request might resolve the issue.</p>\n         "
+      }, {
+        "shape" : "ForbiddenException",
+        "documentation" : "\n            <p>HTTP Status Code 403: Access forbidden. Correct your credentials and then retry your request.</p>\n         "
+      } ],
+      "documentation" : "\n            <p>Updates the monitoring settings for the cluster. You can use this operation to specify which Apache Kafka metrics you want Amazon MSK to send to Amazon CloudWatch. You can also specify settings for open monitoring with Prometheus.</p>\n         "
     }
   },
   "shapes": {
@@ -766,6 +831,23 @@
         "KafkaBrokerNodeId"
       ]
     },
+    "BrokerLogs": {
+      "type": "structure",
+      "members": {
+        "CloudWatchLogs": {
+          "shape": "CloudWatchLogs",
+          "locationName": "cloudWatchLogs"
+        },
+        "Firehose": {
+          "shape": "Firehose",
+          "locationName": "firehose"
+        },
+        "S3": {
+          "shape": "S3",
+          "locationName": "s3"
+        }
+      }
+    },
     "BrokerNodeGroupInfo": {
       "type": "structure",
       "members": {
@@ -878,6 +960,20 @@
         "PLAINTEXT"
       ]
     },
+    "CloudWatchLogs" : {
+      "type" : "structure",
+      "members" : {
+        "Enabled" : {
+          "shape" : "__boolean",
+          "locationName" : "enabled"
+        },
+        "LogGroup" : {
+          "shape" : "__string",
+          "locationName" : "logGroup"
+        }
+      },
+      "required" : [ "Enabled" ]
+    },
     "ClusterInfo": {
       "type": "structure",
       "members": {
@@ -931,6 +1027,15 @@
           "locationName": "enhancedMonitoring",
           "documentation": "\n            <p>Specifies which metrics are gathered for the MSK cluster. This property has three possible values: DEFAULT, PER_BROKER, and PER_TOPIC_PER_BROKER. For a list of the metrics associated with each of these three levels of monitoring, see <a href=\"https://docs.aws.amazon.com/msk/latest/developerguide/monitoring.html\">Monitoring</a>.</p>\n         "
         },
+        "OpenMonitoring" : {
+          "shape" : "OpenMonitoring",
+          "locationName" : "openMonitoring",
+          "documentation" : "\n            <p>Settings for open monitoring using Prometheus.</p>\n         "
+        },
+        "LoggingInfo": {
+          "shape": "LoggingInfo",
+          "locationName": "loggingInfo"
+         },
         "NumberOfBrokerNodes": {
           "shape": "__integer",
           "locationName": "numberOfBrokerNodes",
@@ -941,6 +1046,10 @@
           "locationName": "state",
           "documentation": "\n            <p>The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.</p>\n         "
         },
+        "StateInfo" : {
+          "shape" : "StateInfo",
+          "locationName" : "stateInfo"
+        },
         "Tags": {
           "shape": "__mapOf__string",
           "locationName": "tags",
@@ -1163,11 +1272,20 @@
           "locationName": "enhancedMonitoring",
           "documentation": "\n            <p>Specifies the level of monitoring for the MSK cluster. The possible values are DEFAULT, PER_BROKER, and PER_TOPIC_PER_BROKER.</p>\n         "
         },
+        "OpenMonitoring" : {
+          "shape" : "OpenMonitoringInfo",
+          "locationName" : "openMonitoring",
+          "documentation" : "\n            <p>The settings for open monitoring.</p>\n         "
+        },
         "KafkaVersion": {
           "shape": "__stringMin1Max128",
           "locationName": "kafkaVersion",
           "documentation": "\n            <p>The version of Apache Kafka.</p>\n         "
         },
+        "LoggingInfo": {
+          "shape": "LoggingInfo",
+          "locationName": "loggingInfo"
+         },
         "NumberOfBrokerNodes": {
           "shape": "__integerMin1Max15",
           "locationName": "numberOfBrokerNodes",
@@ -1542,6 +1660,20 @@
       },
       "documentation": "\n            <p>Returns information about an error state of the cluster.</p>\n         "
     },
+    "Firehose" : {
+      "type" : "structure",
+      "members" : {
+        "DeliveryStream" : {
+          "shape" : "__string",
+          "locationName" : "deliveryStream"
+        },
+        "Enabled" : {
+          "shape" : "__boolean",
+          "locationName" : "enabled"
+        }
+      },
+      "required" : [ "Enabled" ]
+    },
     "ForbiddenException": {
       "type": "structure",
       "members": {
@@ -1611,6 +1743,26 @@
         "httpStatusCode": 500
       }
     },
+    "KafkaVersion": {
+      "type": "structure",
+      "members": {
+        "Version": {
+          "shape": "__string",
+          "locationName": "version"
+        },
+        "Status": {
+          "shape": "KafkaVersionStatus",
+          "locationName": "status"
+        }
+      }
+    },
+    "KafkaVersionStatus": {
+      "type": "string",
+      "enum": [
+        "ACTIVE",
+        "DEPRECATED"
+      ]
+    },
     "ListClusterOperationsRequest": {
       "type": "structure",
       "members": {
@@ -1763,6 +1915,36 @@
         }
       }
     },
+    "ListKafkaVersionsRequest": {
+      "type": "structure",
+      "members": {
+        "MaxResults": {
+          "shape": "MaxResults",
+          "location": "querystring",
+          "locationName": "maxResults",
+          "documentation": "\n            <p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>"
+        },
+        "NextToken": {
+          "shape": "__string",
+          "location": "querystring",
+          "locationName": "nextToken",
+          "documentation": "\n            <p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. To get the next batch, provide this token in your next request.</p>"
+        }
+      }
+    },
+    "ListKafkaVersionsResponse": {
+      "type": "structure",
+      "members": {
+        "KafkaVersions": {
+          "shape": "__listOfKafkaVersion",
+          "locationName": "kafkaVersions"
+        },
+        "NextToken": {
+          "shape": "__string",
+          "locationName": "nextToken"
+        }
+      }
+    },
     "ListNodesRequest": {
       "type": "structure",
       "members": {
@@ -1833,6 +2015,16 @@
       "min": 1,
       "max": 100
     },
+    "LoggingInfo": {
+      "type": "structure",
+      "members": {
+        "BrokerLogs": {
+          "shape": "BrokerLogs",
+          "locationName": "brokerLogs"
+        }
+      },
+      "required": [ "BrokerLogs" ]
+    },
     "MutableClusterInfo": {
       "type": "structure",
       "members": {
@@ -1850,10 +2042,146 @@
           "shape": "__integer",
           "locationName": "numberOfBrokerNodes",
           "documentation": "\n            <p>The number of broker nodes in the cluster.</p>\n         "
-        }
+        },
+        "EnhancedMonitoring" : {
+          "shape" : "EnhancedMonitoring",
+          "locationName" : "enhancedMonitoring",
+          "documentation" : "\n            <p>Specifies which Apache Kafka metrics Amazon MSK gathers and sends to Amazon CloudWatch for this cluster.</p>\n         "
+        },
+        "OpenMonitoring" : {
+          "shape" : "OpenMonitoring",
+          "locationName" : "openMonitoring",
+          "documentation" : "\n            <p>The settings for open monitoring.</p>\n         "
+        },
+        "LoggingInfo": {
+          "shape": "LoggingInfo",
+          "locationName": "loggingInfo"
+         }
       },
       "documentation": "\n            <p>Information about cluster attributes that can be updated via update APIs.</p>\n         "
     },
+    "NodeExporter" : {
+      "type" : "structure",
+      "members" : {
+        "EnabledInBroker" : {
+          "shape" : "__boolean",
+          "locationName" : "enabledInBroker",
+          "documentation" : "\n            <p>Indicates whether you want to enable or disable the Node Exporter.</p>\n         "
+        }
+      },
+      "documentation" : "\n            <p>Indicates whether you want to enable or disable the Node Exporter.</p>\n         ",
+      "required" : [ "EnabledInBroker" ]
+    },
+    "NodeExporterInfo" : {
+      "type" : "structure",
+      "members" : {
+        "EnabledInBroker" : {
+          "shape" : "__boolean",
+          "locationName" : "enabledInBroker",
+          "documentation" : "\n            <p>Indicates whether you want to enable or disable the Node Exporter.</p>\n         "
+        }
+      },
+      "documentation" : "\n            <p>Indicates whether you want to enable or disable the Node Exporter.</p>\n         ",
+      "required" : [ "EnabledInBroker" ]
+    },
+    "JmxExporter" : {
+      "type" : "structure",
+      "members" : {
+        "EnabledInBroker" : {
+          "shape" : "__boolean",
+          "locationName" : "enabledInBroker",
+          "documentation" : "\n            <p>Indicates whether you want to enable or disable the JMX Exporter.</p>\n         "
+        }
+      },
+      "documentation" : "\n            <p>Indicates whether you want to enable or disable the JMX Exporter.</p>\n         ",
+      "required" : [ "EnabledInBroker" ]
+    },
+    "JmxExporterInfo" : {
+      "type" : "structure",
+      "members" : {
+        "EnabledInBroker" : {
+          "shape" : "__boolean",
+          "locationName" : "enabledInBroker",
+          "documentation" : "\n            <p>Indicates whether you want to enable or disable the JMX Exporter.</p>\n         "
+        }
+      },
+      "documentation" : "\n            <p>Indicates whether you want to enable or disable the JMX Exporter.</p>\n         ",
+      "required" : [ "EnabledInBroker" ]
+    },
+    "OpenMonitoring" : {
+      "type" : "structure",
+      "members" : {
+        "Prometheus" : {
+          "shape" : "Prometheus",
+          "locationName" : "prometheus",
+          "documentation" : "\n            <p>Prometheus settings.</p>\n         "
+        }
+      },
+      "documentation" : "\n            <p>JMX and Node monitoring for the MSK cluster.</p>\n         ",
+      "required" : [ "Prometheus" ]
+    },
+    "OpenMonitoringInfo" : {
+      "type" : "structure",
+      "members" : {
+        "Prometheus" : {
+          "shape" : "PrometheusInfo",
+          "locationName" : "prometheus",
+          "documentation" : "\n            <p>Prometheus settings.</p>\n         "
+        }
+      },
+      "documentation" : "\n            <p>JMX and Node monitoring for the MSK cluster.</p>\n         ",
+      "required" : [ "Prometheus" ]
+    },
+    "Prometheus" : {
+      "type" : "structure",
+      "members" : {
+        "JmxExporter" : {
+          "shape" : "JmxExporter",
+          "locationName" : "jmxExporter",
+          "documentation" : "\n            <p>Indicates whether you want to enable or disable the JMX Exporter.</p>\n         "
+        },
+        "NodeExporter" : {
+          "shape" : "NodeExporter",
+          "locationName" : "nodeExporter",
+          "documentation" : "\n            <p>Indicates whether you want to enable or disable the Node Exporter.</p>\n         "
+        }
+      },
+      "documentation" : "\n            <p>Prometheus settings.</p>\n         "
+    },
+    "PrometheusInfo" : {
+      "type" : "structure",
+      "members" : {
+        "JmxExporter" : {
+          "shape" : "JmxExporterInfo",
+          "locationName" : "jmxExporter",
+          "documentation" : "\n            <p>Indicates whether you want to enable or disable the JMX Exporter.</p>\n         "
+        },
+        "NodeExporter" : {
+          "shape" : "NodeExporterInfo",
+          "locationName" : "nodeExporter",
+          "documentation" : "\n            <p>Indicates whether you want to enable or disable the Node Exporter.</p>\n         "
+        }
+      },
+      "documentation" : "\n            <p>Prometheus settings.</p>\n         "
+    },
+    "S3" : {
+      "type" : "structure",
+      "members" : {
+        "Bucket" : {
+          "shape" : "__string",
+          "locationName" : "bucket"
+        },
+        "Enabled" : {
+          "shape" : "__boolean",
+          "locationName" : "enabled"
+        },
+        "Prefix" : {
+          "shape" : "__string",
+          "locationName" : "prefix"
+        }
+      },
+      "required" : [ "Enabled" ]
+    },
     "NodeInfo": {
       "type": "structure",
       "members": {
@@ -1937,6 +2265,19 @@
         "httpStatusCode": 503
       }
     },
+    "StateInfo" : {
+      "type" : "structure",
+      "members" : {
+        "Code" : {
+          "shape" : "__string",
+          "locationName" : "code"
+        },
+        "Message" : {
+          "shape" : "__string",
+          "locationName" : "message"
+        }
+      }
+    },
     "StorageInfo": {
       "type": "structure",
       "members": {
@@ -2163,6 +2504,53 @@
         }
       }
     },
+    "UpdateMonitoringRequest" : {
+      "type" : "structure",
+      "members" : {
+        "ClusterArn" : {
+          "shape" : "__string",
+          "location" : "uri",
+          "locationName" : "clusterArn",
+          "documentation" : "\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n         "
+        },
+        "CurrentVersion" : {
+          "shape" : "__string",
+          "locationName" : "currentVersion",
+          "documentation" : "\n            <p>The version of the MSK cluster to update. Cluster versions aren't simple numbers. You can describe an MSK cluster to find its version. When this update operation is successful, it generates a new cluster version.</p>\n         "
+        },
+        "EnhancedMonitoring" : {
+          "shape" : "EnhancedMonitoring",
+          "locationName" : "enhancedMonitoring",
+          "documentation" : "\n            <p>Specifies which Apache Kafka metrics Amazon MSK gathers and sends to Amazon CloudWatch for this cluster.</p>\n         "
+        },
+        "OpenMonitoring" : {
+          "shape" : "OpenMonitoringInfo",
+          "locationName" : "openMonitoring",
+          "documentation" : "\n            <p>The settings for open monitoring.</p>\n         "
+        },
+        "LoggingInfo": {
+          "shape": "LoggingInfo",
+          "locationName": "loggingInfo"
+        }
+      },
+      "documentation" : "Request body for UpdateMonitoring.",
+      "required" : [ "ClusterArn", "CurrentVersion" ]
+    },
+    "UpdateMonitoringResponse" : {
+      "type" : "structure",
+      "members" : {
+        "ClusterArn" : {
+          "shape" : "__string",
+          "locationName" : "clusterArn",
+          "documentation" : "\n            <p>The Amazon Resource Name (ARN) of the cluster.</p>\n         "
+        },
+        "ClusterOperationArn" : {
+          "shape" : "__string",
+          "locationName" : "clusterOperationArn",
+          "documentation" : "\n            <p>The Amazon Resource Name (ARN) of the cluster operation.</p>\n         "
+        }
+      }
+    },
     "ZookeeperNodeInfo": {
       "type": "structure",
       "members": {
@@ -2246,6 +2634,12 @@
         "shape": "ConfigurationRevision"
       }
     },
+    "__listOfKafkaVersion": {
+      "type": "list",
+      "member": {
+        "shape": "KafkaVersion"
+      }
+    },
     "__listOfNodeInfo": {
       "type": "list",
       "member": {
@@ -2294,4 +2688,4 @@
     }
   },
   "documentation": "\n               <p>The operations for managing an Amazon MSK cluster.</p>\n            "
-}
\ No newline at end of file
+}
diff --git a/services/kendra/pom.xml b/services/kendra/pom.xml
new file mode 100644
index 000000000000..1d612e145ac1
--- /dev/null
+++ b/services/kendra/pom.xml
@@ -0,0 +1,60 @@
+<?xml version="1.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.
+  -->
+
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>software.amazon.awssdk</groupId>
+        <artifactId>services</artifactId>
+        <version>2.11.8-SNAPSHOT</version>
+    </parent>
+    <artifactId>kendra</artifactId>
+    <name>AWS Java SDK :: Services :: Kendra</name>
+    <description>The AWS Java SDK for Kendra module holds the client classes that are used for
+        communicating with Kendra.
+    </description>
+    <url>https://aws.amazon.com/sdkforjava</url>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifestEntries>
+                            <Automatic-Module-Name>software.amazon.awssdk.services.kendra</Automatic-Module-Name>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>protocol-core</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>aws-json-protocol</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/services/kendra/src/main/resources/codegen-resources/paginators-1.json b/services/kendra/src/main/resources/codegen-resources/paginators-1.json
new file mode 100644
index 000000000000..2170bfc57ce1
--- /dev/null
+++ b/services/kendra/src/main/resources/codegen-resources/paginators-1.json
@@ -0,0 +1,19 @@
+{
+  "pagination": {
+    "ListDataSourceSyncJobs": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "MaxResults"
+    },
+    "ListDataSources": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "MaxResults"
+    },
+    "ListIndices": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "MaxResults"
+    }
+  }
+}
diff --git a/services/kendra/src/main/resources/codegen-resources/service-2.json b/services/kendra/src/main/resources/codegen-resources/service-2.json
new file mode 100644
index 000000000000..889b81c83d4d
--- /dev/null
+++ b/services/kendra/src/main/resources/codegen-resources/service-2.json
@@ -0,0 +1,2598 @@
+{
+  "version":"2.0",
+  "metadata":{
+    "apiVersion":"2019-02-03",
+    "endpointPrefix":"kendra",
+    "jsonVersion":"1.1",
+    "protocol":"json",
+    "serviceAbbreviation":"kendra",
+    "serviceFullName":"AWSKendraFrontendService",
+    "serviceId":"kendra",
+    "signatureVersion":"v4",
+    "signingName":"kendra",
+    "targetPrefix":"AWSKendraFrontendService",
+    "uid":"kendra-2019-02-03"
+  },
+  "operations":{
+    "BatchDeleteDocument":{
+      "name":"BatchDeleteDocument",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"BatchDeleteDocumentRequest"},
+      "output":{"shape":"BatchDeleteDocumentResponse"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"ConflictException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Removes one or more documents from an index. The documents must have been added with the <a>BatchPutDocument</a> operation.</p> <p>The documents are deleted asynchronously. You can see the progress of the deletion by using AWS CloudWatch. Any error messages releated to the processing of the batch are sent to you CloudWatch log.</p>"
+    },
+    "BatchPutDocument":{
+      "name":"BatchPutDocument",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"BatchPutDocumentRequest"},
+      "output":{"shape":"BatchPutDocumentResponse"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"ConflictException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"ServiceQuotaExceededException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Adds one or more documents to an index.</p> <p>The <code>BatchPutDocument</code> operation enables you to ingest inline documents or a set of documents stored in an Amazon S3 bucket. Use this operation to ingest your text and unstructured text into an index, add custom attributes to the documents, and to attach an access control list to the documents added to the index.</p> <p>The documents are indexed asynchronously. You can see the progress of the batch using AWS CloudWatch. Any error messages related to processing the batch are sent to your AWS CloudWatch log.</p>"
+    },
+    "CreateDataSource":{
+      "name":"CreateDataSource",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"CreateDataSourceRequest"},
+      "output":{"shape":"CreateDataSourceResponse"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"ConflictException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ResourceAlreadyExistException"},
+        {"shape":"ServiceQuotaExceededException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Creates a data source that you use to with an Amazon Kendra index. </p> <p>You specify a name, connector type and description for your data source. You can choose between an S3 connector, a SharePoint Online connector, and a database connector.</p> <p>You also specify configuration information such as document metadata (author, source URI, and so on) and user context information.</p> <p> <code>CreateDataSource</code> is a synchronous operation. The operation returns 200 if the data source was successfully created. Otherwise, an exception is raised.</p>"
+    },
+    "CreateFaq":{
+      "name":"CreateFaq",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"CreateFaqRequest"},
+      "output":{"shape":"CreateFaqResponse"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"ConflictException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"ServiceQuotaExceededException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Creates an new set of frequently asked question (FAQ) questions and answers.</p>"
+    },
+    "CreateIndex":{
+      "name":"CreateIndex",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"CreateIndexRequest"},
+      "output":{"shape":"CreateIndexResponse"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"ResourceAlreadyExistException"},
+        {"shape":"ServiceQuotaExceededException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"ConflictException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Creates a new Amazon Kendra index. Index creation is an asynchronous operation. To determine if index creation has completed, check the <code>Status</code> field returned from a call to . The <code>Status</code> field is set to <code>ACTIVE</code> when the index is ready to use.</p> <p>Once the index is active you can index your documents using the operation or using one of the supported data sources. </p>"
+    },
+    "DeleteFaq":{
+      "name":"DeleteFaq",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DeleteFaqRequest"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"ConflictException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Removes an FAQ from an index.</p>"
+    },
+    "DeleteIndex":{
+      "name":"DeleteIndex",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DeleteIndexRequest"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"ConflictException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Deletes an existing Amazon Kendra index. An exception is not thrown if the index is already being deleted. While the index is being deleted, the <code>Status</code> field returned by a call to the <a>DescribeIndex</a> operation is set to <code>DELETING</code>.</p>"
+    },
+    "DescribeDataSource":{
+      "name":"DescribeDataSource",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DescribeDataSourceRequest"},
+      "output":{"shape":"DescribeDataSourceResponse"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Gets information about a Amazon Kendra data source.</p>"
+    },
+    "DescribeFaq":{
+      "name":"DescribeFaq",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DescribeFaqRequest"},
+      "output":{"shape":"DescribeFaqResponse"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Gets information about an FAQ list.</p>"
+    },
+    "DescribeIndex":{
+      "name":"DescribeIndex",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DescribeIndexRequest"},
+      "output":{"shape":"DescribeIndexResponse"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Describes an existing Amazon Kendra index</p>"
+    },
+    "ListDataSourceSyncJobs":{
+      "name":"ListDataSourceSyncJobs",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"ListDataSourceSyncJobsRequest"},
+      "output":{"shape":"ListDataSourceSyncJobsResponse"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"ConflictException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Gets statistics about synchronizing Amazon Kendra with a data source.</p>"
+    },
+    "ListDataSources":{
+      "name":"ListDataSources",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"ListDataSourcesRequest"},
+      "output":{"shape":"ListDataSourcesResponse"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Lists the data sources that you have created.</p>"
+    },
+    "ListFaqs":{
+      "name":"ListFaqs",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"ListFaqsRequest"},
+      "output":{"shape":"ListFaqsResponse"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Gets a list of FAQ lists associated with an index.</p>"
+    },
+    "ListIndices":{
+      "name":"ListIndices",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"ListIndicesRequest"},
+      "output":{"shape":"ListIndicesResponse"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Lists the Amazon Kendra indexes that you have created.</p>"
+    },
+    "Query":{
+      "name":"Query",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"QueryRequest"},
+      "output":{"shape":"QueryResult"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"ConflictException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Searches an active index. Use this API to search your documents using query. The <code>Query</code> operation enables to do faceted search and to filter results based on document attributes.</p> <p>It also enables you to provide user context that Amazon Kendra uses to enforce document access control in the search results. </p> <p>Amazon Kendra searches your index for text content and question and answer (FAQ) content. By default the response contains three types of results.</p> <ul> <li> <p>Relevant passages</p> </li> <li> <p>Matching FAQs</p> </li> <li> <p>Relevant documents</p> </li> </ul> <p>You can specify that the query return only one type of result using the <code>QueryResultTypeConfig</code> parameter.</p>"
+    },
+    "StartDataSourceSyncJob":{
+      "name":"StartDataSourceSyncJob",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"StartDataSourceSyncJobRequest"},
+      "output":{"shape":"StartDataSourceSyncJobResponse"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ResourceInUseException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"ConflictException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Starts a synchronization job for a data source. If a synchronization job is already in progress, Amazon Kendra returns a <code>ResourceInUseException</code> exception.</p>"
+    },
+    "StopDataSourceSyncJob":{
+      "name":"StopDataSourceSyncJob",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"StopDataSourceSyncJobRequest"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Stops a running synchronization job. You can't stop a scheduled synchronization job.</p>"
+    },
+    "SubmitFeedback":{
+      "name":"SubmitFeedback",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"SubmitFeedbackRequest"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"ResourceUnavailableException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Enables you to provide feedback to Amazon Kendra to improve the performance of the service. </p>"
+    },
+    "UpdateDataSource":{
+      "name":"UpdateDataSource",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"UpdateDataSourceRequest"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"ConflictException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Updates an existing Amazon Kendra data source.</p>"
+    },
+    "UpdateIndex":{
+      "name":"UpdateIndex",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"UpdateIndexRequest"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"ConflictException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Updates an existing Amazon Kendra index.</p>"
+    }
+  },
+  "shapes":{
+    "AccessControlListConfiguration":{
+      "type":"structure",
+      "members":{
+        "KeyPath":{
+          "shape":"S3ObjectKey",
+          "documentation":"<p>Path to the AWS S3 bucket that contains the ACL files.</p>"
+        }
+      },
+      "documentation":"<p>Access Control List files for the documents in a data source.</p>"
+    },
+    "AccessDeniedException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p/>",
+      "exception":true
+    },
+    "AclConfiguration":{
+      "type":"structure",
+      "required":["AllowedGroupsColumnName"],
+      "members":{
+        "AllowedGroupsColumnName":{
+          "shape":"ColumnName",
+          "documentation":"<p>A list of groups, separated by semi-colons, that filters a query response based on user context. The document is only returned to users that are in one of the groups specified in the <code>UserContext</code> field of the <a>Query</a> operation.</p>"
+        }
+      },
+      "documentation":"<p>Provides information about the column that should be used for filtering the query response by groups.</p>"
+    },
+    "AdditionalResultAttribute":{
+      "type":"structure",
+      "required":[
+        "Key",
+        "ValueType",
+        "Value"
+      ],
+      "members":{
+        "Key":{
+          "shape":"String",
+          "documentation":"<p/>"
+        },
+        "ValueType":{
+          "shape":"AdditionalResultAttributeValueType",
+          "documentation":"<p/>"
+        },
+        "Value":{
+          "shape":"AdditionalResultAttributeValue",
+          "documentation":"<p/>"
+        }
+      },
+      "documentation":"<p/>"
+    },
+    "AdditionalResultAttributeList":{
+      "type":"list",
+      "member":{"shape":"AdditionalResultAttribute"}
+    },
+    "AdditionalResultAttributeValue":{
+      "type":"structure",
+      "members":{
+        "TextWithHighlightsValue":{
+          "shape":"TextWithHighlights",
+          "documentation":"<p>The text associated with the attribute and information about the highlight to apply to the text.</p>"
+        }
+      },
+      "documentation":"<p>An attribute returned with a document from a search.</p>"
+    },
+    "AdditionalResultAttributeValueType":{
+      "type":"string",
+      "enum":["TEXT_WITH_HIGHLIGHTS_VALUE"]
+    },
+    "AttributeFilter":{
+      "type":"structure",
+      "members":{
+        "AndAllFilters":{
+          "shape":"AttributeFilterList",
+          "documentation":"<p>Performs a logical <code>AND</code> operation on all supplied filters.</p>"
+        },
+        "OrAllFilters":{
+          "shape":"AttributeFilterList",
+          "documentation":"<p>Performs a logical <code>OR</code> operation on all supplied filters.</p>"
+        },
+        "NotFilter":{
+          "shape":"AttributeFilter",
+          "documentation":"<p>Performs a logical <code>NOT</code> operation on all supplied filters.</p>"
+        },
+        "EqualsTo":{
+          "shape":"DocumentAttribute",
+          "documentation":"<p>Performs an equals operation on two document attributes.</p>"
+        },
+        "ContainsAll":{
+          "shape":"DocumentAttribute",
+          "documentation":"<p>Returns true when a document contains all of the specified document attributes.</p>"
+        },
+        "ContainsAny":{
+          "shape":"DocumentAttribute",
+          "documentation":"<p>Returns true when a document contains any of the specified document attributes.</p>"
+        },
+        "GreaterThan":{
+          "shape":"DocumentAttribute",
+          "documentation":"<p>Performs a greater than operation on two document attributes. Use with a document attribute of type <code>Integer</code> or <code>Long</code>.</p>"
+        },
+        "GreaterThanOrEquals":{
+          "shape":"DocumentAttribute",
+          "documentation":"<p>Performs a greater or equals than operation on two document attributes. Use with a document attribute of type <code>Integer</code> or <code>Long</code>.</p>"
+        },
+        "LessThan":{
+          "shape":"DocumentAttribute",
+          "documentation":"<p>Performs a less than operation on two document attributes. Use with a document attribute of type <code>Integer</code> or <code>Long</code>.</p>"
+        },
+        "LessThanOrEquals":{
+          "shape":"DocumentAttribute",
+          "documentation":"<p>Performs a less than or equals operation on two document attributes. Use with a document attribute of type <code>Integer</code> or <code>Long</code>.</p>"
+        }
+      },
+      "documentation":"<p>Provides filtering the query results based on document attributes.</p> <p>When you use the <code>AndAllFilters</code> or <code>OrAllFilters</code>, filters you can use a total of 3 layers. For example, you can use:</p> <ol> <li> <p> <code>&lt;AndAllFilters&gt;</code> </p> </li> <li> <p> <code> &lt;OrAllFilters&gt;</code> </p> </li> <li> <p> <code> &lt;EqualTo&gt;</code> </p> </li> </ol>"
+    },
+    "AttributeFilterList":{
+      "type":"list",
+      "member":{"shape":"AttributeFilter"},
+      "max":5,
+      "min":1
+    },
+    "BatchDeleteDocumentRequest":{
+      "type":"structure",
+      "required":[
+        "IndexId",
+        "DocumentIdList"
+      ],
+      "members":{
+        "IndexId":{
+          "shape":"IndexId",
+          "documentation":"<p>The identifier of the index that contains the documents to delete.</p>"
+        },
+        "DocumentIdList":{
+          "shape":"DocumentIdList",
+          "documentation":"<p>One or more identifiers for documents to delete from the index.</p>"
+        }
+      }
+    },
+    "BatchDeleteDocumentResponse":{
+      "type":"structure",
+      "members":{
+        "FailedDocuments":{
+          "shape":"BatchDeleteDocumentResponseFailedDocuments",
+          "documentation":"<p>A list of documents that could not be removed from the index. Each entry contains an error message that indicates why the document couldn't be removed from the index.</p>"
+        }
+      }
+    },
+    "BatchDeleteDocumentResponseFailedDocument":{
+      "type":"structure",
+      "members":{
+        "Id":{
+          "shape":"DocumentId",
+          "documentation":"<p>The identifier of the document that couldn't be removed from the index.</p>"
+        },
+        "ErrorCode":{
+          "shape":"ErrorCode",
+          "documentation":"<p>The error code for why the document couldn't be removed from the index.</p>"
+        },
+        "ErrorMessage":{
+          "shape":"ErrorMessage",
+          "documentation":"<p>An explanation for why the document couldn't be removed from the index.</p>"
+        }
+      },
+      "documentation":"<p>Provides information about documents that could not be removed from an index by the <a>BatchDeleteDocument</a> operation.</p>"
+    },
+    "BatchDeleteDocumentResponseFailedDocuments":{
+      "type":"list",
+      "member":{"shape":"BatchDeleteDocumentResponseFailedDocument"}
+    },
+    "BatchPutDocumentRequest":{
+      "type":"structure",
+      "required":[
+        "IndexId",
+        "Documents"
+      ],
+      "members":{
+        "IndexId":{
+          "shape":"IndexId",
+          "documentation":"<p>The identifier of the index to add the documents to. You need to create the index first using the <a>CreateIndex</a> operation.</p>"
+        },
+        "RoleArn":{
+          "shape":"RoleArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of a role that is allowed to run the <code>BatchPutDocument</code> operation. For more information, see <a href=\"https://docs.aws.amazon.com/kendra/latest/dg/iam-roles.html\">IAM Roles for Amazon Kendra</a>.</p>"
+        },
+        "Documents":{
+          "shape":"DocumentList",
+          "documentation":"<p>One or more documents to add to the index. </p> <p>Each document is limited to 5 Mb, the total size of the list is limited to 50 Mb.</p>"
+        }
+      }
+    },
+    "BatchPutDocumentResponse":{
+      "type":"structure",
+      "members":{
+        "FailedDocuments":{
+          "shape":"BatchPutDocumentResponseFailedDocuments",
+          "documentation":"<p>A list of documents that were not added to the index because the document failed a validation check. Each document contains an error message that indicates why the document couldn't be added to the index.</p> <p>If there was an error adding a document to an index the error is reported in your AWS CloudWatch log.</p>"
+        }
+      }
+    },
+    "BatchPutDocumentResponseFailedDocument":{
+      "type":"structure",
+      "members":{
+        "Id":{
+          "shape":"DocumentId",
+          "documentation":"<p>The unique identifier of the document.</p>"
+        },
+        "ErrorCode":{
+          "shape":"ErrorCode",
+          "documentation":"<p>The type of error that caused the document to fail to be indexed.</p>"
+        },
+        "ErrorMessage":{
+          "shape":"ErrorMessage",
+          "documentation":"<p>A description of the reason why the document could not be indexed.</p>"
+        }
+      },
+      "documentation":"<p>Provides information about a document that could not be indexed.</p>"
+    },
+    "BatchPutDocumentResponseFailedDocuments":{
+      "type":"list",
+      "member":{"shape":"BatchPutDocumentResponseFailedDocument"}
+    },
+    "Blob":{
+      "type":"blob",
+      "max":153600,
+      "min":1
+    },
+    "Boolean":{"type":"boolean"},
+    "ChangeDetectingColumns":{
+      "type":"list",
+      "member":{"shape":"ColumnName"},
+      "max":5,
+      "min":1
+    },
+    "ClickFeedback":{
+      "type":"structure",
+      "required":[
+        "ResultId",
+        "ClickTime"
+      ],
+      "members":{
+        "ResultId":{
+          "shape":"ResultId",
+          "documentation":"<p>The unique identifier of the search result that was clicked.</p>"
+        },
+        "ClickTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>The Unix timestamp of the data and time that the result was clicked.</p>"
+        }
+      },
+      "documentation":"<p>Gathers information about when a particular result was clicked by a user. Your application uses the <a>SubmitFeedback</a> operation to provide click information.</p>"
+    },
+    "ClickFeedbackList":{
+      "type":"list",
+      "member":{"shape":"ClickFeedback"}
+    },
+    "ClientTokenName":{
+      "type":"string",
+      "max":100,
+      "min":1
+    },
+    "ColumnConfiguration":{
+      "type":"structure",
+      "required":[
+        "DocumentIdColumnName",
+        "DocumentDataColumnName",
+        "ChangeDetectingColumns"
+      ],
+      "members":{
+        "DocumentIdColumnName":{
+          "shape":"ColumnName",
+          "documentation":"<p>The column that provides the document's unique identifier.</p>"
+        },
+        "DocumentDataColumnName":{
+          "shape":"ColumnName",
+          "documentation":"<p>The column that contains the contents of the document.</p>"
+        },
+        "DocumentTitleColumnName":{
+          "shape":"ColumnName",
+          "documentation":"<p>The column that contains the title of the document.</p>"
+        },
+        "FieldMappings":{
+          "shape":"DataSourceToIndexFieldMappingList",
+          "documentation":"<p>An array of objects that map database column names to the corresponding fields in an index. You must first create the fields in the index using the <a>UpdateIndex</a> operation.</p>"
+        },
+        "ChangeDetectingColumns":{
+          "shape":"ChangeDetectingColumns",
+          "documentation":"<p>One to five columns that indicate when a document in the database has changed.</p>"
+        }
+      },
+      "documentation":"<p>Provides information about how Amazon Kendra should use the columns of a database in an index.</p>"
+    },
+    "ColumnName":{
+      "type":"string",
+      "max":100,
+      "min":1,
+      "pattern":"^[a-zA-Z][a-zA-Z0-9_]*$"
+    },
+    "ConflictException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p/>",
+      "exception":true
+    },
+    "ConnectionConfiguration":{
+      "type":"structure",
+      "required":[
+        "DatabaseHost",
+        "DatabasePort",
+        "DatabaseName",
+        "TableName",
+        "SecretArn"
+      ],
+      "members":{
+        "DatabaseHost":{
+          "shape":"DatabaseHost",
+          "documentation":"<p>The name of the host for the database. Can be either a string (host.subdomain.domain.tld) or an IPv4 or IPv6 address.</p>"
+        },
+        "DatabasePort":{
+          "shape":"DatabasePort",
+          "documentation":"<p>The port that the database uses for connections.</p>"
+        },
+        "DatabaseName":{
+          "shape":"DatabaseName",
+          "documentation":"<p>The name of the database containing the document data.</p>"
+        },
+        "TableName":{
+          "shape":"TableName",
+          "documentation":"<p>The name of the table that contains the document data.</p>"
+        },
+        "SecretArn":{
+          "shape":"SecretArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of credentials stored in AWS Secrets Manager. The credentials should be a user/password pair. For more information, see <a href=\"https://docs.aws.amazon.com/kendra/latest/dg/data-source-database.html\">Using a Database Data Source</a>. For more information about AWS Secrets Manager, see <a href=\"https://docs.aws.amazon.com/secretsmanager/latest/userguide/intro.html\"> What Is AWS Secrets Manager </a> in the <i>AWS Secrets Manager</i> user guide.</p>"
+        }
+      },
+      "documentation":"<p>Provides the information necessary to connect to a database.</p>"
+    },
+    "ContentType":{
+      "type":"string",
+      "enum":[
+        "PDF",
+        "HTML",
+        "MS_WORD",
+        "PLAIN_TEXT",
+        "PPT"
+      ]
+    },
+    "CreateDataSourceRequest":{
+      "type":"structure",
+      "required":[
+        "Name",
+        "IndexId",
+        "Type",
+        "Configuration",
+        "RoleArn"
+      ],
+      "members":{
+        "Name":{
+          "shape":"DataSourceName",
+          "documentation":"<p>A unique name for the data source. A data source name can't be changed without deleting and recreating the data source.</p>"
+        },
+        "IndexId":{
+          "shape":"IndexId",
+          "documentation":"<p>The identifier of the index that should be associated with this data source.</p>"
+        },
+        "Type":{
+          "shape":"DataSourceType",
+          "documentation":"<p>The type of repository that contains the data source.</p>"
+        },
+        "Configuration":{
+          "shape":"DataSourceConfiguration",
+          "documentation":"<p>The connector configuration information that is required to access the repository.</p>"
+        },
+        "Description":{
+          "shape":"Description",
+          "documentation":"<p>A description for the data source.</p>"
+        },
+        "Schedule":{
+          "shape":"ScanSchedule",
+          "documentation":"<p>Sets the frequency that Amazon Kendra will check the documents in your repository and update the index. If you don't set a schedule Amazon Kendra will not periodically update the index. You can call the <code>StartDataSourceSyncJob</code> operation to update the index.</p>"
+        },
+        "RoleArn":{
+          "shape":"RoleArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of a role with permission to access the data source. For more information, see <a href=\"https://docs.aws.amazon.com/kendra/latest/dg/iam-roles.html\">IAM Roles for Amazon Kendra</a>.</p>"
+        }
+      }
+    },
+    "CreateDataSourceResponse":{
+      "type":"structure",
+      "required":["Id"],
+      "members":{
+        "Id":{
+          "shape":"DataSourceId",
+          "documentation":"<p>A unique identifier for the data source.</p>"
+        }
+      }
+    },
+    "CreateFaqRequest":{
+      "type":"structure",
+      "required":[
+        "IndexId",
+        "Name",
+        "S3Path",
+        "RoleArn"
+      ],
+      "members":{
+        "IndexId":{
+          "shape":"IndexId",
+          "documentation":"<p>The identifier of the index that contains the FAQ.</p>"
+        },
+        "Name":{
+          "shape":"FaqName",
+          "documentation":"<p>The name that should be associated with the FAQ.</p>"
+        },
+        "Description":{
+          "shape":"Description",
+          "documentation":"<p>A description of the FAQ.</p>"
+        },
+        "S3Path":{
+          "shape":"S3Path",
+          "documentation":"<p>The S3 location of the FAQ input data.</p>"
+        },
+        "RoleArn":{
+          "shape":"RoleArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of a role with permission to access the S3 bucket that contains the FAQs. For more information, see <a href=\"https://docs.aws.amazon.com/kendra/latest/dg/iam-roles.html\">IAM Roles for Amazon Kendra</a>.</p>"
+        }
+      }
+    },
+    "CreateFaqResponse":{
+      "type":"structure",
+      "members":{
+        "Id":{
+          "shape":"FaqId",
+          "documentation":"<p>The unique identifier of the FAQ.</p>"
+        }
+      }
+    },
+    "CreateIndexRequest":{
+      "type":"structure",
+      "required":[
+        "Name",
+        "RoleArn"
+      ],
+      "members":{
+        "Name":{
+          "shape":"IndexName",
+          "documentation":"<p>The name for the new index.</p>"
+        },
+        "RoleArn":{
+          "shape":"RoleArn",
+          "documentation":"<p>An IAM role that gives Amazon Kendra permissions to access your Amazon CloudWatch logs and metrics. This is also the role used when you use the <code>BatchPutDocument</code> operation to index documents from an Amazon S3 bucket.</p>"
+        },
+        "ServerSideEncryptionConfiguration":{
+          "shape":"ServerSideEncryptionConfiguration",
+          "documentation":"<p>The identifier of the AWS KMS customer managed key (CMK) to use to encrypt data indexed by Amazon Kendra. Amazon Kendra doesn't support asymmetric CMKs.</p>"
+        },
+        "Description":{
+          "shape":"Description",
+          "documentation":"<p>A description for the index.</p>"
+        },
+        "ClientToken":{
+          "shape":"ClientTokenName",
+          "documentation":"<p>A token that you provide to identify the request to create an index. Multiple calls to the <code>CreateIndex</code> operation with the same client token will create only one index.”</p>",
+          "idempotencyToken":true
+        }
+      }
+    },
+    "CreateIndexResponse":{
+      "type":"structure",
+      "members":{
+        "Id":{
+          "shape":"IndexId",
+          "documentation":"<p>The unique identifier of the index. Use this identifier when you query an index, set up a data source, or index a document.</p>"
+        }
+      }
+    },
+    "DataSourceConfiguration":{
+      "type":"structure",
+      "members":{
+        "S3Configuration":{
+          "shape":"S3DataSourceConfiguration",
+          "documentation":"<p>Provides information to create a connector for a document repository in an Amazon S3 bucket.</p>"
+        },
+        "SharePointConfiguration":{
+          "shape":"SharePointConfiguration",
+          "documentation":"<p>Provides information necessary to create a connector for a Microsoft SharePoint site.</p>"
+        },
+        "DatabaseConfiguration":{
+          "shape":"DatabaseConfiguration",
+          "documentation":"<p>Provides information necessary to create a connector for a database.</p>"
+        }
+      },
+      "documentation":"<p>Configuration information for a Amazon Kendra data source.</p>"
+    },
+    "DataSourceDateFieldFormat":{
+      "type":"string",
+      "max":40,
+      "min":4
+    },
+    "DataSourceFieldName":{
+      "type":"string",
+      "max":100,
+      "min":1,
+      "pattern":"^[a-zA-Z][a-zA-Z0-9_.]*$"
+    },
+    "DataSourceId":{
+      "type":"string",
+      "max":100,
+      "min":1,
+      "pattern":"[a-zA-Z0-9][a-zA-Z0-9_-]*"
+    },
+    "DataSourceInclusionsExclusionsStrings":{
+      "type":"list",
+      "member":{"shape":"DataSourceInclusionsExclusionsStringsMember"},
+      "max":100,
+      "min":0
+    },
+    "DataSourceInclusionsExclusionsStringsMember":{
+      "type":"string",
+      "max":50,
+      "min":1
+    },
+    "DataSourceName":{
+      "type":"string",
+      "max":1000,
+      "min":1,
+      "pattern":"[a-zA-Z0-9][a-zA-Z0-9_-]*"
+    },
+    "DataSourceStatus":{
+      "type":"string",
+      "enum":[
+        "CREATING",
+        "DELETING",
+        "FAILED",
+        "UPDATING",
+        "ACTIVE"
+      ]
+    },
+    "DataSourceSummary":{
+      "type":"structure",
+      "members":{
+        "Name":{
+          "shape":"DataSourceName",
+          "documentation":"<p>The name of the data source.</p>"
+        },
+        "Id":{
+          "shape":"DataSourceId",
+          "documentation":"<p>The unique identifier for the data source.</p>"
+        },
+        "Type":{
+          "shape":"DataSourceType",
+          "documentation":"<p>The type of the data source.</p>"
+        },
+        "CreatedAt":{
+          "shape":"Timestamp",
+          "documentation":"<p>The UNIX datetime that the data source was created.</p>"
+        },
+        "UpdatedAt":{
+          "shape":"Timestamp",
+          "documentation":"<p>The UNIX datetime that the data source was lasted updated. </p>"
+        },
+        "Status":{
+          "shape":"DataSourceStatus",
+          "documentation":"<p>The status of the data source. When the status is <code>ATIVE</code> the data source is ready to use.</p>"
+        }
+      },
+      "documentation":"<p>Summary information for a Amazon Kendra data source. Returned in a call to .</p>"
+    },
+    "DataSourceSummaryList":{
+      "type":"list",
+      "member":{"shape":"DataSourceSummary"}
+    },
+    "DataSourceSyncJob":{
+      "type":"structure",
+      "members":{
+        "ExecutionId":{
+          "shape":"String",
+          "documentation":"<p>A unique identifier for the synchronization job.</p>"
+        },
+        "StartTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>The UNIX datetime that the synchronization job was started.</p>"
+        },
+        "EndTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>The UNIX datetime that the synchronization job was completed.</p>"
+        },
+        "Status":{
+          "shape":"DataSourceSyncJobStatus",
+          "documentation":"<p>The execution status of the synchronization job. When the <code>Status</code> field is set to <code>SUCCEEDED</code>, the synchronization job is done. If the status code is set to <code>FAILED</code>, the <code>ErrorCode</code> and <code>ErrorMessage</code> fields give you the reason for the failure.</p>"
+        },
+        "ErrorMessage":{
+          "shape":"ErrorMessage",
+          "documentation":"<p>If the <code>Status</code> field is set to <code>ERROR</code>, the <code>ErrorMessage</code> field contains a description of the error that caused the synchronization to fail.</p>"
+        },
+        "ErrorCode":{
+          "shape":"ErrorCode",
+          "documentation":"<p>If the <code>Status</code> field is set to <code>FAILED</code>, the <code>ErrorCode</code> field contains a the reason that the synchronization failed.</p>"
+        },
+        "DataSourceErrorCode":{
+          "shape":"String",
+          "documentation":"<p>If the reason that the synchronization failed is due to an error with the underlying data source, this field contains a code that identifies the error.</p>"
+        }
+      },
+      "documentation":"<p>Provides information about a synchronization job.</p>"
+    },
+    "DataSourceSyncJobHistoryList":{
+      "type":"list",
+      "member":{"shape":"DataSourceSyncJob"}
+    },
+    "DataSourceSyncJobStatus":{
+      "type":"string",
+      "enum":[
+        "FAILED",
+        "SUCCEEDED",
+        "SYNCING",
+        "INCOMPLETE",
+        "STOPPING",
+        "ABORTED"
+      ]
+    },
+    "DataSourceToIndexFieldMapping":{
+      "type":"structure",
+      "required":[
+        "DataSourceFieldName",
+        "IndexFieldName"
+      ],
+      "members":{
+        "DataSourceFieldName":{
+          "shape":"DataSourceFieldName",
+          "documentation":"<p>The name of the column or attribute in the data source.</p>"
+        },
+        "DateFieldFormat":{
+          "shape":"DataSourceDateFieldFormat",
+          "documentation":"<p>The type of data stored in the column or attribute.</p>"
+        },
+        "IndexFieldName":{
+          "shape":"IndexFieldName",
+          "documentation":"<p>The name of the field in the index.</p>"
+        }
+      },
+      "documentation":"<p>Maps a column or attribute in the data source to an index field. You must first create the fields in the index using the <a>UpdateIndex</a> operation.</p>"
+    },
+    "DataSourceToIndexFieldMappingList":{
+      "type":"list",
+      "member":{"shape":"DataSourceToIndexFieldMapping"},
+      "max":100,
+      "min":1
+    },
+    "DataSourceType":{
+      "type":"string",
+      "enum":[
+        "S3",
+        "SHAREPOINT",
+        "DATABASE"
+      ]
+    },
+    "DataSourceVpcConfiguration":{
+      "type":"structure",
+      "required":[
+        "SubnetIds",
+        "SecurityGroupIds"
+      ],
+      "members":{
+        "SubnetIds":{
+          "shape":"SubnetIdList",
+          "documentation":"<p>A list of identifiers for subnets within your Amazon VPC. The subnets should be able to connect to each other in the VPC, and they should have outgoing access to the Internet through a NAT device.</p>"
+        },
+        "SecurityGroupIds":{
+          "shape":"SecurityGroupIdList",
+          "documentation":"<p>A list of identifiers of security groups within your Amazon VPC. The security groups should enable Amazon Kendra to connect to the data source.</p>"
+        }
+      },
+      "documentation":"<p>Provides information for connecting to an Amazon VPC.</p>"
+    },
+    "DatabaseConfiguration":{
+      "type":"structure",
+      "required":[
+        "DatabaseEngineType",
+        "ConnectionConfiguration",
+        "ColumnConfiguration"
+      ],
+      "members":{
+        "DatabaseEngineType":{
+          "shape":"DatabaseEngineType",
+          "documentation":"<p>The type of database engine that runs the database.</p>"
+        },
+        "ConnectionConfiguration":{
+          "shape":"ConnectionConfiguration",
+          "documentation":"<p>The information necessary to connect to a database.</p>"
+        },
+        "VpcConfiguration":{"shape":"DataSourceVpcConfiguration"},
+        "ColumnConfiguration":{
+          "shape":"ColumnConfiguration",
+          "documentation":"<p>Information about where the index should get the document information from the database.</p>"
+        },
+        "AclConfiguration":{
+          "shape":"AclConfiguration",
+          "documentation":"<p>Information about the database column that provides information for user context filtering.</p>"
+        }
+      },
+      "documentation":"<p>Provides the information necessary to connect a database to an index. </p>"
+    },
+    "DatabaseEngineType":{
+      "type":"string",
+      "enum":[
+        "RDS_AURORA_MYSQL",
+        "RDS_AURORA_POSTGRESQL",
+        "RDS_MYSQL",
+        "RDS_POSTGRESQL"
+      ]
+    },
+    "DatabaseHost":{
+      "type":"string",
+      "max":253,
+      "min":1
+    },
+    "DatabaseName":{
+      "type":"string",
+      "max":100,
+      "min":1,
+      "pattern":"^[a-zA-Z][a-zA-Z0-9_]*$"
+    },
+    "DatabasePort":{
+      "type":"integer",
+      "max":65535,
+      "min":1
+    },
+    "DeleteFaqRequest":{
+      "type":"structure",
+      "required":[
+        "Id",
+        "IndexId"
+      ],
+      "members":{
+        "Id":{
+          "shape":"FaqId",
+          "documentation":"<p>The identifier of the FAQ to remove.</p>"
+        },
+        "IndexId":{
+          "shape":"IndexId",
+          "documentation":"<p>The index to remove the FAQ from.</p>"
+        }
+      }
+    },
+    "DeleteIndexRequest":{
+      "type":"structure",
+      "required":["Id"],
+      "members":{
+        "Id":{
+          "shape":"IndexId",
+          "documentation":"<p>The identifier of the index to delete.</p>"
+        }
+      }
+    },
+    "DescribeDataSourceRequest":{
+      "type":"structure",
+      "required":[
+        "Id",
+        "IndexId"
+      ],
+      "members":{
+        "Id":{
+          "shape":"DataSourceId",
+          "documentation":"<p>The unique identifier of the data source to describe.</p>"
+        },
+        "IndexId":{
+          "shape":"IndexId",
+          "documentation":"<p>The identifier of the index that contains the data source.</p>"
+        }
+      }
+    },
+    "DescribeDataSourceResponse":{
+      "type":"structure",
+      "members":{
+        "Id":{
+          "shape":"DataSourceId",
+          "documentation":"<p>The identifier of the data source.</p>"
+        },
+        "IndexId":{
+          "shape":"IndexId",
+          "documentation":"<p>The identifier of the index that contains the data source.</p>"
+        },
+        "Name":{
+          "shape":"DataSourceName",
+          "documentation":"<p>The name that you gave the data source when it was created.</p>"
+        },
+        "Type":{
+          "shape":"DataSourceType",
+          "documentation":"<p>The type of the data source.</p>"
+        },
+        "Configuration":{
+          "shape":"DataSourceConfiguration",
+          "documentation":"<p>Information that describes where the data source is located and how the data source is configured. The specific information in the description depends on the data source provider.</p>"
+        },
+        "CreatedAt":{
+          "shape":"Timestamp",
+          "documentation":"<p>The Unix timestamp of when the data source was created.</p>"
+        },
+        "UpdatedAt":{
+          "shape":"Timestamp",
+          "documentation":"<p>The Unix timestamp of when the data source was last updated.</p>"
+        },
+        "Description":{
+          "shape":"Description",
+          "documentation":"<p>The description of the data source.</p>"
+        },
+        "Status":{
+          "shape":"DataSourceStatus",
+          "documentation":"<p>The current status of the data source. When the status is <code>ACTIVE</code> the data source is ready to use. When the status is <code>FAILED</code>, the <code>ErrorMessage</code> field contains the reason that the data source failed.</p>"
+        },
+        "Schedule":{
+          "shape":"ScanSchedule",
+          "documentation":"<p>The schedule that Amazon Kendra will update the data source.</p>"
+        },
+        "RoleArn":{
+          "shape":"RoleArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the role that enables the data source to access its resources.</p>"
+        },
+        "ErrorMessage":{
+          "shape":"ErrorMessage",
+          "documentation":"<p>When the <code>Status</code> field value is <code>FAILED</code>, the <code>ErrorMessage</code> field contains a description of the error that caused the data source to fail.</p>"
+        }
+      }
+    },
+    "DescribeFaqRequest":{
+      "type":"structure",
+      "required":[
+        "Id",
+        "IndexId"
+      ],
+      "members":{
+        "Id":{
+          "shape":"FaqId",
+          "documentation":"<p>The unique identifier of the FAQ.</p>"
+        },
+        "IndexId":{
+          "shape":"IndexId",
+          "documentation":"<p>The identifier of the index that contains the FAQ.</p>"
+        }
+      }
+    },
+    "DescribeFaqResponse":{
+      "type":"structure",
+      "members":{
+        "Id":{
+          "shape":"FaqId",
+          "documentation":"<p>The identifier of the FAQ.</p>"
+        },
+        "IndexId":{
+          "shape":"IndexId",
+          "documentation":"<p>The identifier of the index that contains the FAQ.</p>"
+        },
+        "Name":{
+          "shape":"FaqName",
+          "documentation":"<p>The name that you gave the FAQ when it was created.</p>"
+        },
+        "Description":{
+          "shape":"Description",
+          "documentation":"<p>The description of the FAQ that you provided when it was created.</p>"
+        },
+        "CreatedAt":{
+          "shape":"Timestamp",
+          "documentation":"<p>The date and time that the FAQ was created.</p>"
+        },
+        "UpdatedAt":{
+          "shape":"Timestamp",
+          "documentation":"<p>The date and time that the FAQ was last updated.</p>"
+        },
+        "S3Path":{"shape":"S3Path"},
+        "Status":{
+          "shape":"FaqStatus",
+          "documentation":"<p>The status of the FAQ. It is ready to use when the status is <code>ACTIVE</code>.</p>"
+        },
+        "RoleArn":{
+          "shape":"RoleArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the role that provides access to the S3 bucket containing the input files for the FAQ.</p>"
+        },
+        "ErrorMessage":{
+          "shape":"ErrorMessage",
+          "documentation":"<p>If the <code>Status</code> field is <code>FAILED</code>, the <code>ErrorMessage</code> field contains the reason why the FAQ failed.</p>"
+        }
+      }
+    },
+    "DescribeIndexRequest":{
+      "type":"structure",
+      "required":["Id"],
+      "members":{
+        "Id":{
+          "shape":"IndexId",
+          "documentation":"<p>The name of the index to describe.</p>"
+        }
+      }
+    },
+    "DescribeIndexResponse":{
+      "type":"structure",
+      "members":{
+        "Name":{
+          "shape":"IndexName",
+          "documentation":"<p>The name of the index.</p>"
+        },
+        "Id":{
+          "shape":"IndexId",
+          "documentation":"<p>the name of the index.</p>"
+        },
+        "RoleArn":{
+          "shape":"RoleArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the IAM role that gives Amazon Kendra permission to write to your Amazon Cloudwatch logs.</p>"
+        },
+        "ServerSideEncryptionConfiguration":{
+          "shape":"ServerSideEncryptionConfiguration",
+          "documentation":"<p>The identifier of the AWS KMS customer master key (CMK) used to encrypt your data. Amazon Kendra doesn't support asymmetric CMKs.</p>"
+        },
+        "Status":{
+          "shape":"IndexStatus",
+          "documentation":"<p>The current status of the index. When the value is <code>ACTIVE</code>, the index is ready for use. If the <code>Status</code> field value is <code>FAILED</code>, the <code>ErrorMessage</code> field contains a message that explains why.</p>"
+        },
+        "Description":{
+          "shape":"Description",
+          "documentation":"<p>The description of the index.</p>"
+        },
+        "CreatedAt":{
+          "shape":"Timestamp",
+          "documentation":"<p>The Unix datetime that the index was created.</p>"
+        },
+        "UpdatedAt":{
+          "shape":"Timestamp",
+          "documentation":"<p>The Unix datetime that the index was last updated.</p>"
+        },
+        "DocumentMetadataConfigurations":{
+          "shape":"DocumentMetadataConfigurationList",
+          "documentation":"<p>Configuration settings for any metadata applied to the documents in the index.</p>"
+        },
+        "IndexStatistics":{
+          "shape":"IndexStatistics",
+          "documentation":"<p>Provides information about the number of FAQ questions and answers and the number of text documents indexed.</p>"
+        },
+        "ErrorMessage":{
+          "shape":"ErrorMessage",
+          "documentation":"<p>When th e<code>Status</code> field value is <code>FAILED</code>, the <code>ErrorMessage</code> field contains a message that explains why.</p>"
+        }
+      }
+    },
+    "Description":{
+      "type":"string",
+      "max":1000,
+      "min":1,
+      "pattern":"^\\P{C}*$"
+    },
+    "Document":{
+      "type":"structure",
+      "required":["Id"],
+      "members":{
+        "Id":{
+          "shape":"DocumentId",
+          "documentation":"<p>A unique identifier of the document in the index.</p>"
+        },
+        "Title":{
+          "shape":"Title",
+          "documentation":"<p>The title of the document.</p>"
+        },
+        "Blob":{
+          "shape":"Blob",
+          "documentation":"<p>The contents of the document. </p> <p>Documents passed to the <code>Blob</code> parameter must be base64 encoded. Your code might not need to encode the document file bytes if you're using an AWS SDK to call Amazon Kendra operations. If you are calling the Amazon Kendra endpoint directly using REST, you must base64 encode the contents before sending.</p>"
+        },
+        "S3Path":{"shape":"S3Path"},
+        "Attributes":{
+          "shape":"DocumentAttributeList",
+          "documentation":"<p>Custom attributes to apply to the document. Use the custom attributes to provide additional information for searching, to provide facets for refining searches, and to provide additional information in the query response.</p>"
+        },
+        "AccessControlList":{
+          "shape":"PrincipalList",
+          "documentation":"<p>Information to use for user context filtering.</p>"
+        },
+        "ContentType":{
+          "shape":"ContentType",
+          "documentation":"<p>The file type of the document in the <code>Blob</code> field.</p>"
+        }
+      },
+      "documentation":"<p>A document in an index.</p>"
+    },
+    "DocumentAttribute":{
+      "type":"structure",
+      "required":[
+        "Key",
+        "Value"
+      ],
+      "members":{
+        "Key":{
+          "shape":"DocumentAttributeKey",
+          "documentation":"<p>The identifier for the attribute.</p>"
+        },
+        "Value":{
+          "shape":"DocumentAttributeValue",
+          "documentation":"<p>The value of the attribute.</p>"
+        }
+      },
+      "documentation":"<p>A custom attribute value assigned to a document. </p>"
+    },
+    "DocumentAttributeKey":{
+      "type":"string",
+      "max":200,
+      "min":1,
+      "pattern":"[a-zA-Z0-9_][a-zA-Z0-9_-]*"
+    },
+    "DocumentAttributeKeyList":{
+      "type":"list",
+      "member":{"shape":"DocumentAttributeKey"},
+      "max":100,
+      "min":1
+    },
+    "DocumentAttributeList":{
+      "type":"list",
+      "member":{"shape":"DocumentAttribute"},
+      "max":100,
+      "min":1
+    },
+    "DocumentAttributeStringListValue":{
+      "type":"list",
+      "member":{"shape":"String"},
+      "max":5,
+      "min":1
+    },
+    "DocumentAttributeStringValue":{
+      "type":"string",
+      "max":2048,
+      "min":1
+    },
+    "DocumentAttributeValue":{
+      "type":"structure",
+      "members":{
+        "StringValue":{
+          "shape":"DocumentAttributeStringValue",
+          "documentation":"<p>A string, such as \"department\".</p>"
+        },
+        "StringListValue":{
+          "shape":"DocumentAttributeStringListValue",
+          "documentation":"<p>A list of strings. </p>"
+        },
+        "LongValue":{
+          "shape":"Long",
+          "documentation":"<p>A long integer value.</p>"
+        },
+        "DateValue":{
+          "shape":"Timestamp",
+          "documentation":"<p>A date value expressed as seconds from the Unix epoch.</p>"
+        }
+      },
+      "documentation":"<p>The value of a custom document attribute. You can only provide one value for a custom attribute.</p>"
+    },
+    "DocumentAttributeValueCountPair":{
+      "type":"structure",
+      "members":{
+        "DocumentAttributeValue":{
+          "shape":"DocumentAttributeValue",
+          "documentation":"<p>The value of the attribute. For example, \"HR.\"</p>"
+        },
+        "Count":{
+          "shape":"Integer",
+          "documentation":"<p>The number of documents in the response that have the attribute value for the key.</p>"
+        }
+      },
+      "documentation":"<p>Provides the count of documents that match a particular attribute when doing a faceted search.</p>"
+    },
+    "DocumentAttributeValueCountPairList":{
+      "type":"list",
+      "member":{"shape":"DocumentAttributeValueCountPair"}
+    },
+    "DocumentAttributeValueType":{
+      "type":"string",
+      "enum":[
+        "STRING_VALUE",
+        "STRING_LIST_VALUE",
+        "LONG_VALUE",
+        "DATE_VALUE"
+      ]
+    },
+    "DocumentId":{
+      "type":"string",
+      "max":2048,
+      "min":1
+    },
+    "DocumentIdList":{
+      "type":"list",
+      "member":{"shape":"DocumentId"},
+      "max":10,
+      "min":1
+    },
+    "DocumentList":{
+      "type":"list",
+      "member":{"shape":"Document"},
+      "max":10,
+      "min":1
+    },
+    "DocumentMetadataBoolean":{"type":"boolean"},
+    "DocumentMetadataConfiguration":{
+      "type":"structure",
+      "required":[
+        "Name",
+        "Type"
+      ],
+      "members":{
+        "Name":{
+          "shape":"DocumentMetadataConfigurationName",
+          "documentation":"<p>The name of the index field.</p>"
+        },
+        "Type":{
+          "shape":"DocumentAttributeValueType",
+          "documentation":"<p>The data type of the index field. </p>"
+        },
+        "Relevance":{
+          "shape":"Relevance",
+          "documentation":"<p>Provides manual tuning parameters to determine how the field affects the search results.</p>"
+        },
+        "Search":{
+          "shape":"Search",
+          "documentation":"<p>Provides information about how the field is used during a search.</p>"
+        }
+      },
+      "documentation":"<p>Specifies the properties of a custom index field.</p>"
+    },
+    "DocumentMetadataConfigurationList":{
+      "type":"list",
+      "member":{"shape":"DocumentMetadataConfiguration"},
+      "max":500,
+      "min":0
+    },
+    "DocumentMetadataConfigurationName":{
+      "type":"string",
+      "max":30,
+      "min":1
+    },
+    "DocumentsMetadataConfiguration":{
+      "type":"structure",
+      "members":{
+        "S3Prefix":{
+          "shape":"S3ObjectKey",
+          "documentation":"<p>A prefix used to filter metadata configuration files in the AWS S3 bucket. The S3 bucket might contain multiple metadata files. Use <code>S3Prefix</code> to include only the desired metadata files.</p>"
+        }
+      },
+      "documentation":"<p>Document metadata files that contain information such as the document access control information, source URI, document author, and custom attributes. Each metadata file contains metadata about a single document.</p>"
+    },
+    "Duration":{
+      "type":"string",
+      "max":10,
+      "min":1,
+      "pattern":"[0-9]+[s]"
+    },
+    "ErrorCode":{
+      "type":"string",
+      "enum":[
+        "InternalError",
+        "InvalidRequest"
+      ]
+    },
+    "ErrorMessage":{
+      "type":"string",
+      "max":2048,
+      "min":1,
+      "pattern":"^\\P{C}*$"
+    },
+    "Facet":{
+      "type":"structure",
+      "members":{
+        "DocumentAttributeKey":{
+          "shape":"DocumentAttributeKey",
+          "documentation":"<p>The unique key for the document attribute.</p>"
+        }
+      },
+      "documentation":"<p>Information a document attribute</p>"
+    },
+    "FacetList":{
+      "type":"list",
+      "member":{"shape":"Facet"}
+    },
+    "FacetResult":{
+      "type":"structure",
+      "members":{
+        "DocumentAttributeKey":{
+          "shape":"DocumentAttributeKey",
+          "documentation":"<p>The key for the facet values. This is the same as the <code>DocumentAttributeKey</code> provided in the query.</p>"
+        },
+        "DocumentAttributeValueCountPairs":{
+          "shape":"DocumentAttributeValueCountPairList",
+          "documentation":"<p>An array of key/value pairs, where the key is the value of the attribute and the count is the number of documents that share the key value.</p>"
+        }
+      },
+      "documentation":"<p>The facet values for the documents in the response.</p>"
+    },
+    "FacetResultList":{
+      "type":"list",
+      "member":{"shape":"FacetResult"}
+    },
+    "FaqId":{
+      "type":"string",
+      "max":100,
+      "min":1,
+      "pattern":"[a-zA-Z0-9][a-zA-Z0-9_-]*"
+    },
+    "FaqName":{
+      "type":"string",
+      "max":100,
+      "min":1,
+      "pattern":"[a-zA-Z0-9][a-zA-Z0-9_-]*"
+    },
+    "FaqStatistics":{
+      "type":"structure",
+      "required":["IndexedQuestionAnswersCount"],
+      "members":{
+        "IndexedQuestionAnswersCount":{
+          "shape":"IndexedQuestionAnswersCount",
+          "documentation":"<p>The total number of FAQ questions and answers contained in the index.</p>"
+        }
+      },
+      "documentation":"<p>Provides statistical information about the FAQ questions and answers contained in an index.</p>"
+    },
+    "FaqStatus":{
+      "type":"string",
+      "enum":[
+        "CREATING",
+        "UPDATING",
+        "ACTIVE",
+        "DELETING",
+        "FAILED"
+      ]
+    },
+    "FaqSummary":{
+      "type":"structure",
+      "members":{
+        "Id":{
+          "shape":"FaqId",
+          "documentation":"<p>The unique identifier of the FAQ.</p>"
+        },
+        "Name":{
+          "shape":"FaqName",
+          "documentation":"<p>The name that you assigned the FAQ when you created or updated the FAQ.</p>"
+        },
+        "Status":{
+          "shape":"FaqStatus",
+          "documentation":"<p>The current status of the FAQ. When the status is <code>ACTIVE</code> the FAQ is ready for use.</p>"
+        },
+        "CreatedAt":{
+          "shape":"Timestamp",
+          "documentation":"<p>The UNIX datetime that the FAQ was added to the index.</p>"
+        },
+        "UpdatedAt":{
+          "shape":"Timestamp",
+          "documentation":"<p>The UNIX datetime that the FAQ was last updated.</p>"
+        }
+      },
+      "documentation":"<p>Provides information about a frequently asked questions and answer contained in an index.</p>"
+    },
+    "FaqSummaryItems":{
+      "type":"list",
+      "member":{"shape":"FaqSummary"}
+    },
+    "Highlight":{
+      "type":"structure",
+      "required":[
+        "BeginOffset",
+        "EndOffset"
+      ],
+      "members":{
+        "BeginOffset":{
+          "shape":"Integer",
+          "documentation":"<p>The zero-based location in the response string where the highlight starts.</p>"
+        },
+        "EndOffset":{
+          "shape":"Integer",
+          "documentation":"<p>The zero-based location in the response string where the highlight ends.</p>"
+        },
+        "TopAnswer":{
+          "shape":"Boolean",
+          "documentation":"<p>Indicates whether the response is the best response. True if this is the best response; otherwise, false.</p>"
+        }
+      },
+      "documentation":"<p>Provides information that you can use to highlight a search result so that your users can quickly identify terms in the response.</p>"
+    },
+    "HighlightList":{
+      "type":"list",
+      "member":{"shape":"Highlight"}
+    },
+    "Importance":{
+      "type":"integer",
+      "max":10,
+      "min":1
+    },
+    "IndexConfigurationSummary":{
+      "type":"structure",
+      "required":[
+        "CreatedAt",
+        "UpdatedAt",
+        "Status"
+      ],
+      "members":{
+        "Name":{
+          "shape":"IndexName",
+          "documentation":"<p>The name of the index.</p>"
+        },
+        "Id":{
+          "shape":"IndexId",
+          "documentation":"<p>A unique identifier for the index. Use this to identify the index when you are using operations such as <code>Query</code>, <code>DescribeIndex</code>, <code>UpdateIndex</code>, and <code>DeleteIndex</code>.</p>"
+        },
+        "CreatedAt":{
+          "shape":"Timestamp",
+          "documentation":"<p>The Unix timestamp when the index was created.</p>"
+        },
+        "UpdatedAt":{
+          "shape":"Timestamp",
+          "documentation":"<p>The Unix timestamp when the index was last updated by the <code>UpdateIndex</code> operation.</p>"
+        },
+        "Status":{
+          "shape":"IndexStatus",
+          "documentation":"<p>The current status of the index. When the status is <code>ACTIVE</code>, the index is ready to search.</p>"
+        }
+      },
+      "documentation":"<p>A summary of information about an index.</p>"
+    },
+    "IndexConfigurationSummaryList":{
+      "type":"list",
+      "member":{"shape":"IndexConfigurationSummary"}
+    },
+    "IndexFieldName":{
+      "type":"string",
+      "max":30,
+      "min":1,
+      "pattern":"^\\P{C}*$"
+    },
+    "IndexId":{
+      "type":"string",
+      "max":36,
+      "min":36,
+      "pattern":"[a-zA-Z0-9][a-zA-Z0-9-]*"
+    },
+    "IndexName":{
+      "type":"string",
+      "max":1000,
+      "min":1,
+      "pattern":"[a-zA-Z0-9][a-zA-Z0-9_-]*"
+    },
+    "IndexStatistics":{
+      "type":"structure",
+      "required":[
+        "FaqStatistics",
+        "TextDocumentStatistics"
+      ],
+      "members":{
+        "FaqStatistics":{
+          "shape":"FaqStatistics",
+          "documentation":"<p>The number of question and answer topics in the index.</p>"
+        },
+        "TextDocumentStatistics":{
+          "shape":"TextDocumentStatistics",
+          "documentation":"<p>The number of text documents indexed.</p>"
+        }
+      },
+      "documentation":"<p>Provides information about the number of documents and the number of questions and answers in an index.</p>"
+    },
+    "IndexStatus":{
+      "type":"string",
+      "enum":[
+        "CREATING",
+        "ACTIVE",
+        "DELETING",
+        "FAILED",
+        "SYSTEM_UPDATING"
+      ]
+    },
+    "IndexedQuestionAnswersCount":{
+      "type":"integer",
+      "min":0
+    },
+    "IndexedTextDocumentsCount":{
+      "type":"integer",
+      "min":0
+    },
+    "Integer":{"type":"integer"},
+    "InternalServerException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p/>",
+      "exception":true,
+      "fault":true
+    },
+    "KmsKeyId":{
+      "type":"string",
+      "max":2048,
+      "min":1,
+      "sensitive":true
+    },
+    "ListDataSourceSyncJobsRequest":{
+      "type":"structure",
+      "required":[
+        "Id",
+        "IndexId"
+      ],
+      "members":{
+        "Id":{
+          "shape":"DataSourceId",
+          "documentation":"<p>The identifier of the data source.</p>"
+        },
+        "IndexId":{
+          "shape":"IndexId",
+          "documentation":"<p>The identifier of the index that contains the data source.</p>"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>If the result of the previous request to <code>GetDataSourceSyncJobHistory</code> was truncated, include the <code>NextToken</code> to fetch the next set of jobs.</p>"
+        },
+        "MaxResults":{
+          "shape":"MaxResultsIntegerForListDataSourceSyncJobsRequest",
+          "documentation":"<p>The maximum number of synchronization jobs to return in the response. If there are fewer results in the list, this response contains only the actual results.</p>"
+        },
+        "StartTimeFilter":{
+          "shape":"TimeRange",
+          "documentation":"<p>When specified, the synchronization jobs returned in the list are limited to jobs between the specified dates. </p>"
+        },
+        "StatusFilter":{
+          "shape":"DataSourceSyncJobStatus",
+          "documentation":"<p>When specified, only returns synchronization jobs with the <code>Status</code> field equal to the specified status.</p>"
+        }
+      }
+    },
+    "ListDataSourceSyncJobsResponse":{
+      "type":"structure",
+      "members":{
+        "History":{
+          "shape":"DataSourceSyncJobHistoryList",
+          "documentation":"<p>A history of synchronization jobs for the data source.</p>"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>The <code>GetDataSourceSyncJobHistory</code> operation returns a page of vocabularies at a time. The maximum size of the page is set by the <code>MaxResults</code> parameter. If there are more jobs in the list than the page size, Amazon Kendra returns the NextPage token. Include the token in the next request to the <code>GetDataSourceSyncJobHistory</code> operation to return in the next page of jobs.</p>"
+        }
+      }
+    },
+    "ListDataSourcesRequest":{
+      "type":"structure",
+      "required":["IndexId"],
+      "members":{
+        "IndexId":{
+          "shape":"IndexId",
+          "documentation":"<p>The identifier of the index that contains the data source.</p>"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>If the previous response was incomplete (because there is more data to retrieve), Amazon Kendra returns a pagination token in the response. You can use this pagination token to retrieve the next set of data sources (<code>DataSourceSummaryItems</code>). </p>"
+        },
+        "MaxResults":{
+          "shape":"MaxResultsIntegerForListDataSourcesRequest",
+          "documentation":"<p>The maximum number of data sources to return.</p>"
+        }
+      }
+    },
+    "ListDataSourcesResponse":{
+      "type":"structure",
+      "members":{
+        "SummaryItems":{
+          "shape":"DataSourceSummaryList",
+          "documentation":"<p>An array of summary information for one or more data sources.</p>"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>If the response is truncated, Amazon Kendra returns this token that you can use in the subsequent request to retrieve the next set of data sources. </p>"
+        }
+      }
+    },
+    "ListFaqsRequest":{
+      "type":"structure",
+      "required":["IndexId"],
+      "members":{
+        "IndexId":{
+          "shape":"IndexId",
+          "documentation":"<p>The index that contains the FAQ lists.</p>"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>If the result of the previous request to <code>ListFaqs</code> was truncated, include the <code>NextToken</code> to fetch the next set of FAQs.</p>"
+        },
+        "MaxResults":{
+          "shape":"MaxResultsIntegerForListFaqsRequest",
+          "documentation":"<p>The maximum number of FAQs to return in the response. If there are fewer results in the list, this response contains only the actual results.</p>"
+        }
+      }
+    },
+    "ListFaqsResponse":{
+      "type":"structure",
+      "members":{
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>The <code>ListFaqs</code> operation returns a page of FAQs at a time. The maximum size of the page is set by the <code>MaxResults</code> parameter. If there are more jobs in the list than the page size, Amazon Kendra returns the <code>NextPage</code> token. Include the token in the next request to the <code>ListFaqs</code> operation to return the next page of FAQs.</p>"
+        },
+        "FaqSummaryItems":{
+          "shape":"FaqSummaryItems",
+          "documentation":"<p>information about the FAQs associated with the specified index.</p>"
+        }
+      }
+    },
+    "ListIndicesRequest":{
+      "type":"structure",
+      "members":{
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>If the previous response was incomplete (because there is more data to retrieve), Amazon Kendra returns a pagination token in the response. You can use this pagination token to retrieve the next set of indexes (<code>DataSourceSummaryItems</code>). </p>"
+        },
+        "MaxResults":{
+          "shape":"MaxResultsIntegerForListIndicesRequest",
+          "documentation":"<p>The maximum number of data sources to return.</p>"
+        }
+      }
+    },
+    "ListIndicesResponse":{
+      "type":"structure",
+      "members":{
+        "IndexConfigurationSummaryItems":{
+          "shape":"IndexConfigurationSummaryList",
+          "documentation":"<p>An array of summary information for one or more indexes.</p>"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>If the response is truncated, Amazon Kendra returns this token that you can use in the subsequent request to retrieve the next set of indexes.</p>"
+        }
+      }
+    },
+    "Long":{"type":"long"},
+    "MaxResultsIntegerForListDataSourceSyncJobsRequest":{
+      "type":"integer",
+      "max":10,
+      "min":1
+    },
+    "MaxResultsIntegerForListDataSourcesRequest":{
+      "type":"integer",
+      "max":100,
+      "min":1
+    },
+    "MaxResultsIntegerForListFaqsRequest":{
+      "type":"integer",
+      "max":100,
+      "min":1
+    },
+    "MaxResultsIntegerForListIndicesRequest":{
+      "type":"integer",
+      "max":100,
+      "min":1
+    },
+    "NextToken":{
+      "type":"string",
+      "max":800,
+      "min":1
+    },
+    "Order":{
+      "type":"string",
+      "enum":[
+        "ASCENDING",
+        "DESCENDING"
+      ]
+    },
+    "Principal":{
+      "type":"structure",
+      "required":[
+        "Name",
+        "Type",
+        "Access"
+      ],
+      "members":{
+        "Name":{
+          "shape":"PrincipalName",
+          "documentation":"<p>The name of the user or group.</p>"
+        },
+        "Type":{
+          "shape":"PrincipalType",
+          "documentation":"<p>The type of principal.</p>"
+        },
+        "Access":{
+          "shape":"ReadAccessType",
+          "documentation":"<p>Whether to allow or deny access to the principal.</p>"
+        }
+      },
+      "documentation":"<p>Provides user and group information for document access filtering.</p>"
+    },
+    "PrincipalList":{
+      "type":"list",
+      "member":{"shape":"Principal"},
+      "max":200,
+      "min":1
+    },
+    "PrincipalName":{
+      "type":"string",
+      "max":200,
+      "min":1,
+      "pattern":"^\\P{C}*$"
+    },
+    "PrincipalType":{
+      "type":"string",
+      "enum":[
+        "USER",
+        "GROUP"
+      ]
+    },
+    "QueryId":{
+      "type":"string",
+      "max":36,
+      "min":1
+    },
+    "QueryRequest":{
+      "type":"structure",
+      "required":[
+        "IndexId",
+        "QueryText"
+      ],
+      "members":{
+        "IndexId":{
+          "shape":"IndexId",
+          "documentation":"<p>The unique identifier of the index to search. The identifier is returned in the response from the operation.</p>"
+        },
+        "QueryText":{
+          "shape":"QueryText",
+          "documentation":"<p>The text to search for.</p>"
+        },
+        "AttributeFilter":{
+          "shape":"AttributeFilter",
+          "documentation":"<p>Enables filtered searches based on document attributes. You can only provide one attribute filter; however, the <code>AndAllFilters</code>, <code>NotFilter</code>, and <code>OrAllFilters</code> parameters contain a list of other filters.</p> <p>The <code>AttributeFilter</code> parameter enables you to create a set of filtering rules that a document must satisfy to be included in the query results.</p>"
+        },
+        "Facets":{
+          "shape":"FacetList",
+          "documentation":"<p>An array of documents attributes. Amazon Kendra returns a count for each attribute key specified. You can use this information to help narrow the search for your user.</p>"
+        },
+        "RequestedDocumentAttributes":{
+          "shape":"DocumentAttributeKeyList",
+          "documentation":"<p>An array of document attributes to include in the response. No other document attributes are included in the response. By default all document attributes are included in the response. </p>"
+        },
+        "QueryResultTypeFilter":{
+          "shape":"QueryResultType",
+          "documentation":"<p>Sets the type of query. Only results for the specified query type are returned.</p>"
+        },
+        "PageNumber":{
+          "shape":"Integer",
+          "documentation":"<p>Query results are returned in pages the size of the <code>PageSize</code> parameter. By default, Amazon Kendra returns the first page of results. Use this parameter to get result pages after the first one.</p>"
+        },
+        "PageSize":{
+          "shape":"Integer",
+          "documentation":"<p>Sets the number of results that are returned in each page of results. The default page size is 100.</p>"
+        }
+      }
+    },
+    "QueryResult":{
+      "type":"structure",
+      "members":{
+        "QueryId":{
+          "shape":"QueryId",
+          "documentation":"<p>The unique identifier for the search. You use <code>QueryId</code> to identify the search when using the feedback API.</p>"
+        },
+        "ResultItems":{
+          "shape":"QueryResultItemList",
+          "documentation":"<p>The results of the search.</p>"
+        },
+        "FacetResults":{
+          "shape":"FacetResultList",
+          "documentation":"<p>Contains the facet results. A <code>FacetResult</code> contains the counts for each attribute key that was specified in the <code>Facets</code> input parameter.</p>"
+        },
+        "TotalNumberOfResults":{
+          "shape":"Integer",
+          "documentation":"<p>The number of items returned by the search. Use this to determine when you have requested the last set of results.</p>"
+        }
+      }
+    },
+    "QueryResultItem":{
+      "type":"structure",
+      "members":{
+        "Id":{
+          "shape":"ResultId",
+          "documentation":"<p>The unique identifier for the query result.</p>"
+        },
+        "Type":{
+          "shape":"QueryResultType",
+          "documentation":"<p>The type of document. </p>"
+        },
+        "AdditionalAttributes":{
+          "shape":"AdditionalResultAttributeList",
+          "documentation":"<p/>"
+        },
+        "DocumentId":{
+          "shape":"DocumentId",
+          "documentation":"<p>The unique identifier for the document.</p>"
+        },
+        "DocumentTitle":{
+          "shape":"TextWithHighlights",
+          "documentation":"<p>The title of the document. Contains the text of the title and information for highlighting the relevant terms in the title.</p>"
+        },
+        "DocumentExcerpt":{
+          "shape":"TextWithHighlights",
+          "documentation":"<p>An extract of the text in the document. Contains information about highlighting the relevant terms in the excerpt.</p>"
+        },
+        "DocumentURI":{
+          "shape":"Url",
+          "documentation":"<p>The URI of the original location of the document.</p>"
+        },
+        "DocumentAttributes":{
+          "shape":"DocumentAttributeList",
+          "documentation":"<p>An array of document attributes for the document that the query result maps to. For example, the document author (Author) or the source URI (SourceUri) of the document.</p>"
+        }
+      },
+      "documentation":"<p>A single query result.</p> <p>A query result contains information about a document returned by the query. This includes the original location of the document, a list of attributes assigned to the document, and relevant text from the document that satisfies the query.</p>"
+    },
+    "QueryResultItemList":{
+      "type":"list",
+      "member":{"shape":"QueryResultItem"}
+    },
+    "QueryResultType":{
+      "type":"string",
+      "enum":[
+        "DOCUMENT",
+        "QUESTION_ANSWER",
+        "ANSWER"
+      ]
+    },
+    "QueryText":{
+      "type":"string",
+      "max":1000,
+      "min":1,
+      "pattern":"^\\P{C}*$"
+    },
+    "ReadAccessType":{
+      "type":"string",
+      "enum":[
+        "ALLOW",
+        "DENY"
+      ]
+    },
+    "Relevance":{
+      "type":"structure",
+      "members":{
+        "Freshness":{
+          "shape":"DocumentMetadataBoolean",
+          "documentation":"<p>Indicates that this field determines how \"fresh\" a document is. For example, if document 1 was created on November 5, and document 2 was created on October 31, document 1 is \"fresher\" than document 2. You can only set the <code>Freshness</code> field on one <code>DATE</code> type field. Only applies to <code>DATE</code> fields.</p>"
+        },
+        "Importance":{
+          "shape":"Importance",
+          "documentation":"<p>The relative importance of the field in the search. Larger numbers provide more of a boost than smaller numbers.</p>"
+        },
+        "Duration":{
+          "shape":"Duration",
+          "documentation":"<p>Specifies the time period that the boost applies to. For example, to make the boost apply to documents with the field value within the last month, you would use \"2628000s\". Once the field value is beyond the specified range, the effect of the boost drops off. The higher the importance, the faster the effect drops off. If you don't specify a value, the default is 3 months. The value of the field is a numeric string followed by the character \"s\", for example \"86400s\" for one day, or \"604800s\" for one week. </p> <p>Only applies to <code>DATE</code> fields.</p>"
+        },
+        "RankOrder":{
+          "shape":"Order",
+          "documentation":"<p>Determines how values should be interpreted.</p> <p>When the <code>RankOrder</code> field is <code>ASCENDING</code>, higher numbers are better. For example, a document with a rating score of 10 is higher ranking than a document with a rating score of 1.</p> <p>When the <code>RankOrder</code> field is <code>DESCENDING</code>, lower numbers are better. For example, in a task tracking application, a priority 1 task is more important than a priority 5 task.</p> <p>Only applies to <code>LONG</code> and <code>DOUBLE</code> fields.</p>"
+        },
+        "ValueImportanceMap":{
+          "shape":"ValueImportanceMap",
+          "documentation":"<p>A list of values that should be given a different boost when they appear in the result list. For example, if you are boosting a field called \"department,\" query terms that match the department field are boosted in the result. However, you can add entries from the department field to boost documents with those values higher. </p> <p>For example, you can add entries to the map with names of departments. If you add \"HR\",5 and \"Legal\",3 those departments are given special attention when they appear in the metadata of a document. When those terms appear they are given the specified importance instead of the regular importance for the boost.</p>"
+        }
+      },
+      "documentation":"<p>Provides information for manually tuning the relevance of a field in a search. When a query includes terms that match the field, the results are given a boost in the response based on these tuning parameters.</p>"
+    },
+    "RelevanceFeedback":{
+      "type":"structure",
+      "required":[
+        "ResultId",
+        "RelevanceValue"
+      ],
+      "members":{
+        "ResultId":{
+          "shape":"ResultId",
+          "documentation":"<p>The unique identifier of the search result that the user provided relevance feedback for.</p>"
+        },
+        "RelevanceValue":{
+          "shape":"RelevanceType",
+          "documentation":"<p>Whether to document was relevant or not relevant to the search.</p>"
+        }
+      },
+      "documentation":"<p>Provides feedback on how relevant a document is to a search. Your application uses the <a>SubmitFeedback</a> operation to provide relevance information.</p>"
+    },
+    "RelevanceFeedbackList":{
+      "type":"list",
+      "member":{"shape":"RelevanceFeedback"}
+    },
+    "RelevanceType":{
+      "type":"string",
+      "enum":[
+        "RELEVANT",
+        "NOT_RELEVANT"
+      ]
+    },
+    "ResourceAlreadyExistException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p/>",
+      "exception":true
+    },
+    "ResourceInUseException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p/>",
+      "exception":true
+    },
+    "ResourceNotFoundException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p/>",
+      "exception":true
+    },
+    "ResourceUnavailableException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p/>",
+      "exception":true
+    },
+    "ResultId":{
+      "type":"string",
+      "max":73,
+      "min":1
+    },
+    "RoleArn":{
+      "type":"string",
+      "max":1284,
+      "min":1,
+      "pattern":"arn:[a-z0-9-\\.]{1,63}:[a-z0-9-\\.]{0,63}:[a-z0-9-\\.]{0,63}:[a-z0-9-\\.]{0,63}:[^/].{0,1023}"
+    },
+    "S3BucketName":{
+      "type":"string",
+      "max":63,
+      "min":3,
+      "pattern":"[a-z0-9][\\.\\-a-z0-9]{1,61}[a-z0-9]"
+    },
+    "S3DataSourceConfiguration":{
+      "type":"structure",
+      "required":["BucketName"],
+      "members":{
+        "BucketName":{
+          "shape":"S3BucketName",
+          "documentation":"<p>The name of the bucket that contains the documents.</p>"
+        },
+        "InclusionPrefixes":{
+          "shape":"DataSourceInclusionsExclusionsStrings",
+          "documentation":"<p>A list of S3 prefixes for the documents that should be included in the index.</p>"
+        },
+        "ExclusionPatterns":{
+          "shape":"DataSourceInclusionsExclusionsStrings",
+          "documentation":"<p>A list of glob patterns for documents that should not be indexed. If a document that matches an inclusion prefix also matches an exclusion pattern, the document is not indexed.</p> <p>For more information about glob patterns, see <a href=\"http://wikipedia.org/wiki/Glob_%28programming%29\">glob (programming)</a> in <i>Wikipedia</i>.</p>"
+        },
+        "DocumentsMetadataConfiguration":{"shape":"DocumentsMetadataConfiguration"},
+        "AccessControlListConfiguration":{
+          "shape":"AccessControlListConfiguration",
+          "documentation":"<p>Provides the path to the S3 bucket that contains the user context filtering files for the data source.</p>"
+        }
+      },
+      "documentation":"<p>Provides configuration information for a data source to index documents in an Amazon S3 bucket.</p>"
+    },
+    "S3ObjectKey":{
+      "type":"string",
+      "max":1024,
+      "min":1
+    },
+    "S3Path":{
+      "type":"structure",
+      "required":[
+        "Bucket",
+        "Key"
+      ],
+      "members":{
+        "Bucket":{
+          "shape":"S3BucketName",
+          "documentation":"<p>The name of the S3 bucket that contains the file.</p>"
+        },
+        "Key":{
+          "shape":"S3ObjectKey",
+          "documentation":"<p>The name of the file.</p>"
+        }
+      },
+      "documentation":"<p>Information required to find a specific file in an Amazon S3 bucket.</p>"
+    },
+    "ScanSchedule":{"type":"string"},
+    "Search":{
+      "type":"structure",
+      "members":{
+        "Facetable":{
+          "shape":"Boolean",
+          "documentation":"<p>Indicates that the field can be used to create search facets, a count of results for each value in the field. The default is <code>false</code> .</p>"
+        },
+        "Searchable":{
+          "shape":"Boolean",
+          "documentation":"<p>Determines whether the field is used in the search. If the <code>Searchable</code> field is <code>true</code>, you can use relevance tuning to manually tune how Amazon Kendra weights the field in the search. The default is <code>true</code> for string fields and <code>false</code> for number and date fields.</p>"
+        },
+        "Displayable":{
+          "shape":"Boolean",
+          "documentation":"<p>Determines whether the field is returned in the query response. The default is <code>true</code>.</p>"
+        }
+      },
+      "documentation":"<p>Provides information about how a custom index field is used during a search.</p>"
+    },
+    "SecretArn":{
+      "type":"string",
+      "max":1284,
+      "min":1,
+      "pattern":"arn:[a-z0-9-\\.]{1,63}:[a-z0-9-\\.]{0,63}:[a-z0-9-\\.]{0,63}:[a-z0-9-\\.]{0,63}:[^/].{0,1023}"
+    },
+    "SecurityGroupIdList":{
+      "type":"list",
+      "member":{"shape":"VpcSecurityGroupId"},
+      "max":10,
+      "min":1
+    },
+    "ServerSideEncryptionConfiguration":{
+      "type":"structure",
+      "members":{
+        "KmsKeyId":{
+          "shape":"KmsKeyId",
+          "documentation":"<p>The identifier of the AWS KMS customer master key (CMK). Amazon Kendra doesn't support asymmetric CMKs.</p>"
+        }
+      },
+      "documentation":"<p>Provides the identifier of the AWS KMS customer master key (CMK) used to encrypt data indexed by Amazon Kendra. Amazon Kendra doesn't support asymmetric CMKs.</p>"
+    },
+    "ServiceQuotaExceededException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p/>",
+      "exception":true
+    },
+    "SharePointConfiguration":{
+      "type":"structure",
+      "required":[
+        "SharePointVersion",
+        "Urls",
+        "SecretArn"
+      ],
+      "members":{
+        "SharePointVersion":{
+          "shape":"SharePointVersion",
+          "documentation":"<p>The version of Microsoft SharePoint that you are using as a data source.</p>"
+        },
+        "Urls":{
+          "shape":"SharePointUrlList",
+          "documentation":"<p>The URLs of the Microsoft SharePoint site that contains the documents that should be indexed.</p>"
+        },
+        "SecretArn":{
+          "shape":"SecretArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of credentials stored in AWS Secrets Manager. The credentials should be a user/password pair. For more information, see <a href=\"https://docs.aws.amazon.com/kendra/latest/dg/data-source-sharepoint.html\">Using a Microsoft SharePoint Data Source</a>. For more information about AWS Secrets Manager, see <a href=\"https://docs.aws.amazon.com/secretsmanager/latest/userguide/intro.html\"> What Is AWS Secrets Manager </a> in the <i>AWS Secrets Manager</i> user guide.</p>"
+        },
+        "CrawlAttachments":{
+          "shape":"Boolean",
+          "documentation":"<p> <code>TRUE</code> to include attachments to documents stored in your Microsoft SharePoint site in the index; otherwise, <code>FALSE</code>.</p>"
+        },
+        "UseChangeLog":{
+          "shape":"Boolean",
+          "documentation":"<p>Set to <code>TRUE</code> to use the Microsoft SharePoint change log to determine the documents that need to be updated in the index. Depending on the size of the SharePoint change log, it may take longer for Amazon Kendra to use the change log than it takes it to determine the changed documents using the Amazon Kendra document crawler.</p>"
+        },
+        "InclusionPatterns":{
+          "shape":"DataSourceInclusionsExclusionsStrings",
+          "documentation":"<p>A list of regular expression patterns. Documents that match the patterns are included in the index. Documents that don't match the patterns are excluded from the index. If a document matches both an inclusion pattern and an exclusion pattern, the document is not included in the index.</p> <p>The regex is applied to the display URL of the SharePoint document.</p>"
+        },
+        "ExclusionPatterns":{
+          "shape":"DataSourceInclusionsExclusionsStrings",
+          "documentation":"<p>A list of regular expression patterns. Documents that match the patterns are excluded from the index. Documents that don't match the patterns are included in the index. If a document matches both an exclusion pattern and an inclusion pattern, the document is not included in the index.</p> <p>The regex is applied to the display URL of the SharePoint document.</p>"
+        },
+        "VpcConfiguration":{"shape":"DataSourceVpcConfiguration"},
+        "FieldMappings":{
+          "shape":"DataSourceToIndexFieldMappingList",
+          "documentation":"<p>A list of <code>DataSourceToIndexFieldMapping</code> objects that map Microsoft SharePoint attributes to custom fields in the Amazon Kendra index. You must first create the index fields using the operation before you map SharePoint attributes. For more information, see <a href=\"https://docs.aws.amazon.com/kendra/latest/dg/field-mapping.html\">Mapping Data Source Fields</a>.</p>"
+        },
+        "DocumentTitleFieldName":{
+          "shape":"DataSourceFieldName",
+          "documentation":"<p>The Microsoft SharePoint attribute field that contains the title of the document.</p>"
+        }
+      },
+      "documentation":"<p>Provides configuration information for connecting to a Microsoft SharePoint data source.</p>"
+    },
+    "SharePointUrlList":{
+      "type":"list",
+      "member":{"shape":"Url"},
+      "max":100,
+      "min":1
+    },
+    "SharePointVersion":{
+      "type":"string",
+      "enum":["SHAREPOINT_ONLINE"]
+    },
+    "StartDataSourceSyncJobRequest":{
+      "type":"structure",
+      "required":[
+        "Id",
+        "IndexId"
+      ],
+      "members":{
+        "Id":{
+          "shape":"DataSourceId",
+          "documentation":"<p>The identifier of the data source to synchronize.</p>"
+        },
+        "IndexId":{
+          "shape":"IndexId",
+          "documentation":"<p>The identifier of the index that contains the data source.</p>"
+        }
+      }
+    },
+    "StartDataSourceSyncJobResponse":{
+      "type":"structure",
+      "members":{
+        "ExecutionId":{
+          "shape":"String",
+          "documentation":"<p>Identifies a particular synchronization job.</p>"
+        }
+      }
+    },
+    "StopDataSourceSyncJobRequest":{
+      "type":"structure",
+      "required":[
+        "Id",
+        "IndexId"
+      ],
+      "members":{
+        "Id":{
+          "shape":"DataSourceId",
+          "documentation":"<p>The identifier of the data source for which to stop the synchronization jobs.</p>"
+        },
+        "IndexId":{
+          "shape":"IndexId",
+          "documentation":"<p>The identifier of the index that contains the data source.</p>"
+        }
+      }
+    },
+    "String":{
+      "type":"string",
+      "max":2048,
+      "min":1
+    },
+    "SubmitFeedbackRequest":{
+      "type":"structure",
+      "required":[
+        "IndexId",
+        "QueryId"
+      ],
+      "members":{
+        "IndexId":{
+          "shape":"IndexId",
+          "documentation":"<p>The identifier of the index that was queried.</p>"
+        },
+        "QueryId":{
+          "shape":"QueryId",
+          "documentation":"<p>The identifier of the specific query for which you are submitting feedback. The query ID is returned in the response to the operation.</p>"
+        },
+        "ClickFeedbackItems":{
+          "shape":"ClickFeedbackList",
+          "documentation":"<p>Tells Amazon Kendra that a particular search result link was chosen by the user. </p>"
+        },
+        "RelevanceFeedbackItems":{
+          "shape":"RelevanceFeedbackList",
+          "documentation":"<p>Provides Amazon Kendra with relevant or not relevant feedback for whether a particular item was relevant to the search.</p>"
+        }
+      }
+    },
+    "SubnetId":{
+      "type":"string",
+      "max":200,
+      "min":1,
+      "pattern":"[\\-0-9a-zA-Z]+"
+    },
+    "SubnetIdList":{
+      "type":"list",
+      "member":{"shape":"SubnetId"},
+      "max":6,
+      "min":1
+    },
+    "TableName":{
+      "type":"string",
+      "max":100,
+      "min":1,
+      "pattern":"^[a-zA-Z][a-zA-Z0-9_]*$"
+    },
+    "TextDocumentStatistics":{
+      "type":"structure",
+      "required":["IndexedTextDocumentsCount"],
+      "members":{
+        "IndexedTextDocumentsCount":{
+          "shape":"IndexedTextDocumentsCount",
+          "documentation":"<p>The number of text documents indexed.</p>"
+        }
+      },
+      "documentation":"<p>Provides information about text documents indexed in an index.</p>"
+    },
+    "TextWithHighlights":{
+      "type":"structure",
+      "members":{
+        "Text":{
+          "shape":"String",
+          "documentation":"<p>The text to display to the user.</p>"
+        },
+        "Highlights":{
+          "shape":"HighlightList",
+          "documentation":"<p>The beginning and end of the text that should be highlighted.</p>"
+        }
+      },
+      "documentation":"<p>Provides text and information about where to highlight the text.</p>"
+    },
+    "ThrottlingException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p/>",
+      "exception":true
+    },
+    "TimeRange":{
+      "type":"structure",
+      "members":{
+        "StartTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>The UNIX datetime of the beginning of the time range.</p>"
+        },
+        "EndTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>The UNIX datetime of the end of the time range.</p>"
+        }
+      },
+      "documentation":"<p>Provides a range of time.</p>"
+    },
+    "Timestamp":{"type":"timestamp"},
+    "Title":{
+      "type":"string",
+      "max":1024,
+      "min":1
+    },
+    "UpdateDataSourceRequest":{
+      "type":"structure",
+      "required":[
+        "Id",
+        "IndexId"
+      ],
+      "members":{
+        "Id":{
+          "shape":"DataSourceId",
+          "documentation":"<p>The unique identifier of the data source to update.</p>"
+        },
+        "Name":{
+          "shape":"DataSourceName",
+          "documentation":"<p>The name of the data source to update. The name of the data source can't be updated. To rename a data source you must delete the data source and re-create it.</p>"
+        },
+        "IndexId":{
+          "shape":"IndexId",
+          "documentation":"<p>The identifier of the index that contains the data source to update.</p>"
+        },
+        "Configuration":{"shape":"DataSourceConfiguration"},
+        "Description":{
+          "shape":"Description",
+          "documentation":"<p>The new description for the data source.</p>"
+        },
+        "Schedule":{
+          "shape":"ScanSchedule",
+          "documentation":"<p>The new update schedule for the data source.</p>"
+        },
+        "RoleArn":{
+          "shape":"RoleArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the new role to use when the data source is accessing resources on your behalf.</p>"
+        }
+      }
+    },
+    "UpdateIndexRequest":{
+      "type":"structure",
+      "required":["Id"],
+      "members":{
+        "Id":{
+          "shape":"IndexId",
+          "documentation":"<p>The identifier of the index to update.</p>"
+        },
+        "Name":{
+          "shape":"IndexName",
+          "documentation":"<p>The name of the index to update.</p>"
+        },
+        "RoleArn":{
+          "shape":"RoleArn",
+          "documentation":"<p>A new IAM role that gives Amazon Kendra permission to access your Amazon CloudWatch logs.</p>"
+        },
+        "Description":{
+          "shape":"Description",
+          "documentation":"<p>A new description for the index.</p>"
+        },
+        "DocumentMetadataConfigurationUpdates":{
+          "shape":"DocumentMetadataConfigurationList",
+          "documentation":"<p>The document metadata to update. </p>"
+        }
+      }
+    },
+    "Url":{
+      "type":"string",
+      "max":2048,
+      "min":1,
+      "pattern":"^(https?|ftp|file):\\/\\/(.*)"
+    },
+    "ValidationException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p/>",
+      "exception":true
+    },
+    "ValueImportanceMap":{
+      "type":"map",
+      "key":{"shape":"ValueImportanceMapKey"},
+      "value":{"shape":"Importance"}
+    },
+    "ValueImportanceMapKey":{
+      "type":"string",
+      "max":50,
+      "min":1
+    },
+    "VpcSecurityGroupId":{
+      "type":"string",
+      "max":200,
+      "min":1,
+      "pattern":"[-0-9a-zA-Z]+"
+    }
+  },
+  "documentation":"<p>Amazon Kendra is a service for indexing large document sets.</p>"
+}
diff --git a/services/kinesis/build.properties b/services/kinesis/build.properties
index ecf2dae6fcb1..15ec2da1fc71 100644
--- a/services/kinesis/build.properties
+++ b/services/kinesis/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/kinesis/pom.xml b/services/kinesis/pom.xml
index 99ad9ededa8e..425b533b1a49 100644
--- a/services/kinesis/pom.xml
+++ b/services/kinesis/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>kinesis</artifactId>
     <name>AWS Java SDK :: Services :: Amazon Kinesis</name>
@@ -61,6 +61,11 @@
             <artifactId>protocol-core</artifactId>
             <version>${awsjavasdk.version}</version>
         </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>profiles</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
         <dependency>
             <groupId>software.amazon.eventstream</groupId>
             <artifactId>eventstream</artifactId>
diff --git a/services/kinesis/src/it/java/log4j.properties b/services/kinesis/src/it/java/log4j.properties
index 0c9e1292dc95..726709b548d9 100644
--- a/services/kinesis/src/it/java/log4j.properties
+++ b/services/kinesis/src/it/java/log4j.properties
@@ -1,9 +1,24 @@
+#
+# 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.
+#
+
 log4j.rootLogger=DEBUG, A1
 log4j.appender.A1=org.apache.log4j.ConsoleAppender
 log4j.appender.A1.layout=org.apache.log4j.PatternLayout
 
 # Print the date in ISO 8601 format
-log4j.appender.A1.layout.ConversionPattern=%d{HH:mm:ss,SSS} - %m%n%n
+log4j.appender.A1.layout.ConversionPattern=%d [%t] %-5p %c - %m%n
 
 # Adjust to see more / less logging
 #log4j.logger.com.amazonaws.ec2=DEBUG
diff --git a/services/kinesis/src/it/java/software/amazon/awssdk/services/kinesis/AbstractTestCase.java b/services/kinesis/src/it/java/software/amazon/awssdk/services/kinesis/AbstractTestCase.java
index bcbd2c536205..85a23f5ab49b 100644
--- a/services/kinesis/src/it/java/software/amazon/awssdk/services/kinesis/AbstractTestCase.java
+++ b/services/kinesis/src/it/java/software/amazon/awssdk/services/kinesis/AbstractTestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/kinesis/src/it/java/software/amazon/awssdk/services/kinesis/KinesisIntegrationTests.java b/services/kinesis/src/it/java/software/amazon/awssdk/services/kinesis/KinesisIntegrationTests.java
index 29ee56d45c2c..7a60993c2ae7 100644
--- a/services/kinesis/src/it/java/software/amazon/awssdk/services/kinesis/KinesisIntegrationTests.java
+++ b/services/kinesis/src/it/java/software/amazon/awssdk/services/kinesis/KinesisIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/kinesis/src/it/java/software/amazon/awssdk/services/kinesis/KinesisResponseMetadataIntegrationTest.java b/services/kinesis/src/it/java/software/amazon/awssdk/services/kinesis/KinesisResponseMetadataIntegrationTest.java
index 2ed459ef6774..7f835f6980eb 100644
--- a/services/kinesis/src/it/java/software/amazon/awssdk/services/kinesis/KinesisResponseMetadataIntegrationTest.java
+++ b/services/kinesis/src/it/java/software/amazon/awssdk/services/kinesis/KinesisResponseMetadataIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/kinesis/src/it/java/software/amazon/awssdk/services/kinesis/SubscribeToShardIntegrationTest.java b/services/kinesis/src/it/java/software/amazon/awssdk/services/kinesis/SubscribeToShardIntegrationTest.java
index 195e28eff6c9..66efc586453f 100644
--- a/services/kinesis/src/it/java/software/amazon/awssdk/services/kinesis/SubscribeToShardIntegrationTest.java
+++ b/services/kinesis/src/it/java/software/amazon/awssdk/services/kinesis/SubscribeToShardIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -16,21 +16,18 @@
 package software.amazon.awssdk.services.kinesis;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.fail;
 
+import io.reactivex.Flowable;
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 import java.util.UUID;
-import java.util.concurrent.CompletionException;
-import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Consumer;
-import java.util.function.Supplier;
 import java.util.stream.Collectors;
 import org.apache.commons.lang3.RandomUtils;
 import org.junit.After;
@@ -40,8 +37,9 @@
 import org.reactivestreams.Subscription;
 import software.amazon.awssdk.core.SdkBytes;
 import software.amazon.awssdk.core.async.SdkPublisher;
-import software.amazon.awssdk.http.SdkCancellationException;
 import software.amazon.awssdk.http.SdkHttpResponse;
+import software.amazon.awssdk.http.nio.netty.Http2Configuration;
+import software.amazon.awssdk.http.nio.netty.NettyNioAsyncHttpClient;
 import software.amazon.awssdk.services.kinesis.model.ConsumerStatus;
 import software.amazon.awssdk.services.kinesis.model.PutRecordRequest;
 import software.amazon.awssdk.services.kinesis.model.Record;
@@ -51,6 +49,7 @@
 import software.amazon.awssdk.services.kinesis.model.SubscribeToShardEventStream;
 import software.amazon.awssdk.services.kinesis.model.SubscribeToShardResponse;
 import software.amazon.awssdk.services.kinesis.model.SubscribeToShardResponseHandler;
+import software.amazon.awssdk.testutils.Waiter;
 
 public class SubscribeToShardIntegrationTest extends AbstractTestCase {
 
@@ -86,6 +85,38 @@ public void tearDown() {
                                        .enforceConsumerDeletion(true)).join();
     }
 
+    @Test
+    public void subscribeToShard_smallWindow_doesNotTimeOutReads() {
+        // We want sufficiently large records (relative to the initial window
+        // size we're choosing) so the client has to send multiple
+        // WINDOW_UPDATEs to receive them
+        for (int i = 0; i < 16; ++i) {
+            putRecord(64 * 1024);
+        }
+
+        KinesisAsyncClient smallWindowAsyncClient = KinesisAsyncClient.builder()
+                .credentialsProvider(CREDENTIALS_PROVIDER_CHAIN)
+                .httpClientBuilder(NettyNioAsyncHttpClient.builder()
+                    .http2Configuration(Http2Configuration.builder()
+                            .initialWindowSize(16384)
+                            .build()))
+                .build();
+
+        try {
+            smallWindowAsyncClient.subscribeToShard(r -> r.consumerARN(consumerArn)
+                            .shardId(shardId)
+                            .startingPosition(s -> s.type(ShardIteratorType.TRIM_HORIZON)),
+                    SubscribeToShardResponseHandler.builder()
+                            .onEventStream(es -> Flowable.fromPublisher(es).forEach(e -> {}))
+                            .onResponse(this::verifyHttpMetadata)
+                            .build())
+                    .join();
+
+        } finally {
+            smallWindowAsyncClient.close();
+        }
+    }
+
     @Test
     public void subscribeToShard_ReceivesAllData() {
         List<SdkBytes> producedData = new ArrayList<>();
@@ -170,33 +201,18 @@ public void complete() {
 
     }
 
-    private static void waitForConsumerToBeActive() throws InterruptedException {
-        waitUntilTrue(() -> ConsumerStatus.ACTIVE == asyncClient.describeStreamConsumer(r -> r.consumerARN(consumerArn))
-                                                                .join()
-                                                                .consumerDescription()
-                                                                .consumerStatus());
+    private static void waitForConsumerToBeActive() {
+        Waiter.run(() -> asyncClient.describeStreamConsumer(r -> r.consumerARN(consumerArn)).join())
+              .until(b -> b.consumerDescription().consumerStatus().equals(ConsumerStatus.ACTIVE))
+              .orFailAfter(Duration.ofMinutes(5));
     }
 
-    private void waitForStreamToBeActive() throws InterruptedException {
-        waitUntilTrue(() -> StreamStatus.ACTIVE == asyncClient.describeStream(r -> r.streamName(streamName))
-                                                              .join()
-                                                              .streamDescription()
-                                                              .streamStatus());
+    private void waitForStreamToBeActive() {
+        Waiter.run(() -> asyncClient.describeStream(r -> r.streamName(streamName)).join())
+              .until(b -> b.streamDescription().streamStatus().equals(StreamStatus.ACTIVE))
+              .orFailAfter(Duration.ofMinutes(5));
     }
 
-    private static void waitUntilTrue(Supplier<Boolean> state) throws InterruptedException {
-        int attempt = 0;
-        do {
-            if (attempt > 10) {
-                throw new IllegalStateException("State never transitioned");
-            }
-            Thread.sleep(5000);
-            attempt++;
-            if (state.get()) {
-                return;
-            }
-        } while (true);
-    }
 
     /**
      * Puts a random record to the stream.
@@ -204,8 +220,18 @@ private static void waitUntilTrue(Supplier<Boolean> state) throws InterruptedExc
      * @return Record data that was put.
      */
     private Optional<SdkBytes> putRecord() {
+        return putRecord(50);
+    }
+
+    /**
+     * Puts a random record to the stream.
+     *
+     * @param len The number of bytes to generate for the record.
+     * @return Record data that was put.
+     */
+    private Optional<SdkBytes> putRecord(int len) {
         try {
-            SdkBytes data = SdkBytes.fromByteArray(RandomUtils.nextBytes(50));
+            SdkBytes data = SdkBytes.fromByteArray(RandomUtils.nextBytes(len));
             asyncClient.putRecord(PutRecordRequest.builder()
                                                   .streamName(streamName)
                                                   .data(data)
diff --git a/services/kinesis/src/main/java/software/amazon/awssdk/services/kinesis/KinesisRetryPolicy.java b/services/kinesis/src/main/java/software/amazon/awssdk/services/kinesis/KinesisRetryPolicy.java
index 55af583316d9..0bbdbc5dcc89 100644
--- a/services/kinesis/src/main/java/software/amazon/awssdk/services/kinesis/KinesisRetryPolicy.java
+++ b/services/kinesis/src/main/java/software/amazon/awssdk/services/kinesis/KinesisRetryPolicy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -17,35 +17,57 @@
 
 import software.amazon.awssdk.annotations.SdkInternalApi;
 import software.amazon.awssdk.awscore.retry.AwsRetryPolicy;
+import software.amazon.awssdk.core.client.config.SdkClientConfiguration;
+import software.amazon.awssdk.core.client.config.SdkClientOption;
+import software.amazon.awssdk.core.retry.RetryMode;
 import software.amazon.awssdk.core.retry.RetryPolicy;
+import software.amazon.awssdk.core.retry.RetryPolicyContext;
 import software.amazon.awssdk.core.retry.conditions.AndRetryCondition;
 import software.amazon.awssdk.services.kinesis.model.SubscribeToShardRequest;
 
 /**
- * Default retry policy for the Kinesis Client.
+ * Default retry policy for the Kinesis Client. Disables retries on subscribe-to-shard.
  */
 @SdkInternalApi
 final class KinesisRetryPolicy {
+    private KinesisRetryPolicy() {
+    }
 
-    /**
-     * Default retry policy for Kinesis. Turns off retries for SubscribeToShard
-     */
-    private static final RetryPolicy DEFAULT =
-        AwsRetryPolicy.defaultRetryPolicy().toBuilder()
-                      .retryCondition(AndRetryCondition.create(
-                          c -> !(c.originalRequest() instanceof SubscribeToShardRequest),
-                          AwsRetryPolicy.defaultRetryCondition()))
-                      .build();
+    public static RetryPolicy resolveRetryPolicy(SdkClientConfiguration config) {
+        RetryPolicy configuredRetryPolicy = config.option(SdkClientOption.RETRY_POLICY);
+        if (configuredRetryPolicy != null) {
+            return addRetryConditions(configuredRetryPolicy);
+        }
 
-    private KinesisRetryPolicy() {
+        RetryMode retryMode = RetryMode.resolver()
+                                       .profileFile(() -> config.option(SdkClientOption.PROFILE_FILE))
+                                       .profileName(config.option(SdkClientOption.PROFILE_NAME))
+                                       .resolve();
+        return AwsRetryPolicy.forRetryMode(retryMode)
+                             .toBuilder()
+                             .applyMutation(KinesisRetryPolicy::addRetryConditions)
+                             .additionalRetryConditionsAllowed(false)
+                             .build();
+
+    }
+
+    public static RetryPolicy addRetryConditions(RetryPolicy policy) {
+        if (!policy.additionalRetryConditionsAllowed()) {
+            return policy;
+        }
+
+        return policy.toBuilder()
+                     .applyMutation(KinesisRetryPolicy::addRetryConditions)
+                     .build();
+    }
 
+    public static void addRetryConditions(RetryPolicy.Builder policy) {
+        policy.retryCondition(AndRetryCondition.create(KinesisRetryPolicy::isNotSubscribeToShard,
+                                                       policy.retryCondition()));
     }
 
-    /**
-     * @return Default retry policy used by Kinesis
-     */
-    public static RetryPolicy defaultPolicy() {
-        return DEFAULT;
+    private static boolean isNotSubscribeToShard(RetryPolicyContext context) {
+        return !(context.originalRequest() instanceof SubscribeToShardRequest);
     }
 }
 
diff --git a/services/kinesis/src/main/java/software/amazon/awssdk/services/kinesis/internal/KinesisHttpConfigurationOptions.java b/services/kinesis/src/main/java/software/amazon/awssdk/services/kinesis/internal/KinesisHttpConfigurationOptions.java
new file mode 100644
index 000000000000..c56661a4eb7e
--- /dev/null
+++ b/services/kinesis/src/main/java/software/amazon/awssdk/services/kinesis/internal/KinesisHttpConfigurationOptions.java
@@ -0,0 +1,40 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.services.kinesis.internal;
+
+import java.time.Duration;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.http.SdkHttpConfigurationOption;
+import software.amazon.awssdk.utils.AttributeMap;
+
+/**
+ * Kinesis specific http configurations
+ */
+@SdkInternalApi
+public final class KinesisHttpConfigurationOptions {
+    private static final AttributeMap OPTIONS = AttributeMap
+        .builder()
+        .put(SdkHttpConfigurationOption.READ_TIMEOUT, Duration.ofSeconds(10))
+        .put(SdkHttpConfigurationOption.WRITE_TIMEOUT, Duration.ofSeconds(10))
+        .build();
+
+    private KinesisHttpConfigurationOptions() {
+    }
+
+    public static AttributeMap defaultHttpConfig() {
+        return OPTIONS;
+    }
+}
diff --git a/services/kinesis/src/main/resources/codegen-resources/customization.config b/services/kinesis/src/main/resources/codegen-resources/customization.config
index 73cb86399b31..d0043e62e4db 100644
--- a/services/kinesis/src/main/resources/codegen-resources/customization.config
+++ b/services/kinesis/src/main/resources/codegen-resources/customization.config
@@ -14,5 +14,6 @@
   "customRetryPolicy": "software.amazon.awssdk.services.kinesis.KinesisRetryPolicy",
   "customResponseMetadata": {
     "EXTENDED_REQUEST_ID": "x-amz-id-2"
-  }
+  },
+  "serviceSpecificHttpConfig": "software.amazon.awssdk.services.kinesis.internal.KinesisHttpConfigurationOptions"
 }
diff --git a/services/kinesis/src/test/java/software/amazon/awssdk/services/kinesis/DateTimeUnmarshallingTest.java b/services/kinesis/src/test/java/software/amazon/awssdk/services/kinesis/DateTimeUnmarshallingTest.java
index f53bb7d5c8c5..42c0135440e8 100644
--- a/services/kinesis/src/test/java/software/amazon/awssdk/services/kinesis/DateTimeUnmarshallingTest.java
+++ b/services/kinesis/src/test/java/software/amazon/awssdk/services/kinesis/DateTimeUnmarshallingTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/kinesis/src/test/java/software/amazon/awssdk/services/kinesis/SubscribeToShardUnmarshallingTest.java b/services/kinesis/src/test/java/software/amazon/awssdk/services/kinesis/SubscribeToShardUnmarshallingTest.java
index 55eca588f07c..f1d20617c8aa 100644
--- a/services/kinesis/src/test/java/software/amazon/awssdk/services/kinesis/SubscribeToShardUnmarshallingTest.java
+++ b/services/kinesis/src/test/java/software/amazon/awssdk/services/kinesis/SubscribeToShardUnmarshallingTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/kinesis/src/test/resources/cucumber.properties b/services/kinesis/src/test/resources/cucumber.properties
index fd5a481f3c5e..2a421591f079 100644
--- a/services/kinesis/src/test/resources/cucumber.properties
+++ b/services/kinesis/src/test/resources/cucumber.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/kinesisanalytics/pom.xml b/services/kinesisanalytics/pom.xml
index ab30565f8dda..e01c46631d9e 100644
--- a/services/kinesisanalytics/pom.xml
+++ b/services/kinesisanalytics/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -22,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>kinesisanalytics</artifactId>
     <name>AWS Java SDK :: Services :: Amazon Kinesis Analytics</name>
diff --git a/services/kinesisanalyticsv2/pom.xml b/services/kinesisanalyticsv2/pom.xml
index 0022a425668d..8e5d70f5d652 100644
--- a/services/kinesisanalyticsv2/pom.xml
+++ b/services/kinesisanalyticsv2/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>kinesisanalyticsv2</artifactId>
     <name>AWS Java SDK :: Services :: Kinesis Analytics V2</name>
diff --git a/services/kinesisanalyticsv2/src/main/resources/codegen-resources/service-2.json b/services/kinesisanalyticsv2/src/main/resources/codegen-resources/service-2.json
index eaecff587c91..b4a17a61ec61 100644
--- a/services/kinesisanalyticsv2/src/main/resources/codegen-resources/service-2.json
+++ b/services/kinesisanalyticsv2/src/main/resources/codegen-resources/service-2.json
@@ -101,6 +101,22 @@
       ],
       "documentation":"<p>Adds a reference data source to an existing SQL-based Amazon Kinesis Data Analytics application.</p> <p>Kinesis Data Analytics reads reference data (that is, an Amazon S3 object) and creates an in-application table within your application. In the request, you provide the source (S3 bucket name and object key name), name of the in-application table to create, and the necessary mapping information that describes how data in an Amazon S3 object maps to columns in the resulting in-application table.</p>"
     },
+    "AddApplicationVpcConfiguration":{
+      "name":"AddApplicationVpcConfiguration",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"AddApplicationVpcConfigurationRequest"},
+      "output":{"shape":"AddApplicationVpcConfigurationResponse"},
+      "errors":[
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ResourceInUseException"},
+        {"shape":"InvalidArgumentException"},
+        {"shape":"ConcurrentModificationException"}
+      ],
+      "documentation":"<p>Adds a Virtual Private Cloud (VPC) configuration to the application. Applications can use VPCs to store and access resources securely.</p> <p>Note the following about VPC configurations for Kinesis Data Analytics applications:</p> <ul> <li> <p>VPC configurations are not supported for SQL applications.</p> </li> <li> <p>When a VPC is added to a Kinesis Data Analytics application, the application can no longer be accessed from the Internet directly. To enable Internet access to the application, add an Internet gateway to your VPC.</p> </li> </ul>"
+    },
     "CreateApplication":{
       "name":"CreateApplication",
       "http":{
@@ -242,6 +258,22 @@
       ],
       "documentation":"<p>Deletes a snapshot of application state.</p>"
     },
+    "DeleteApplicationVpcConfiguration":{
+      "name":"DeleteApplicationVpcConfiguration",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DeleteApplicationVpcConfigurationRequest"},
+      "output":{"shape":"DeleteApplicationVpcConfigurationResponse"},
+      "errors":[
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ResourceInUseException"},
+        {"shape":"InvalidArgumentException"},
+        {"shape":"ConcurrentModificationException"}
+      ],
+      "documentation":"<p>Removes a VPC configuration from a Kinesis Data Analytics application.</p>"
+    },
     "DescribeApplication":{
       "name":"DescribeApplication",
       "http":{
@@ -329,7 +361,7 @@
         {"shape":"InvalidArgumentException"},
         {"shape":"ConcurrentModificationException"}
       ],
-      "documentation":"<p>Retrieves the list of key-value tags assigned to the application.</p>"
+      "documentation":"<p>Retrieves the list of key-value tags assigned to the application. For more information, see <a href=\"https://docs.aws.amazon.com/kinesisanalytics/latest/java/how-tagging.html\">Using Tagging</a>.</p>"
     },
     "StartApplication":{
       "name":"StartApplication",
@@ -380,7 +412,7 @@
         {"shape":"InvalidArgumentException"},
         {"shape":"ConcurrentModificationException"}
       ],
-      "documentation":"<p>Adds one or more key-value tags to a Kinesis Analytics application. Note that the maximum number of application tags includes system tags. The maximum number of user-defined application tags is 50.</p>"
+      "documentation":"<p>Adds one or more key-value tags to a Kinesis Analytics application. Note that the maximum number of application tags includes system tags. The maximum number of user-defined application tags is 50. For more information, see <a href=\"https://docs.aws.amazon.com/kinesisanalytics/latest/java/how-tagging.html\">Using Tagging</a>.</p>"
     },
     "UntagResource":{
       "name":"UntagResource",
@@ -397,7 +429,7 @@
         {"shape":"InvalidArgumentException"},
         {"shape":"ConcurrentModificationException"}
       ],
-      "documentation":"<p>Removes one or more tags from a Kinesis Analytics application.</p>"
+      "documentation":"<p>Removes one or more tags from a Kinesis Analytics application. For more information, see <a href=\"https://docs.aws.amazon.com/kinesisanalytics/latest/java/how-tagging.html\">Using Tagging</a>.</p>"
     },
     "UpdateApplication":{
       "name":"UpdateApplication",
@@ -624,6 +656,45 @@
         }
       }
     },
+    "AddApplicationVpcConfigurationRequest":{
+      "type":"structure",
+      "required":[
+        "ApplicationName",
+        "CurrentApplicationVersionId",
+        "VpcConfiguration"
+      ],
+      "members":{
+        "ApplicationName":{
+          "shape":"ApplicationName",
+          "documentation":"<p>The name of an existing application.</p>"
+        },
+        "CurrentApplicationVersionId":{
+          "shape":"ApplicationVersionId",
+          "documentation":"<p>The version of the application to which you want to add the input processing configuration. You can use the <a>DescribeApplication</a> operation to get the current application version. If the version specified is not the current version, the <code>ConcurrentModificationException</code> is returned.</p>"
+        },
+        "VpcConfiguration":{
+          "shape":"VpcConfiguration",
+          "documentation":"<p>Description of the VPC to add to the application.</p>"
+        }
+      }
+    },
+    "AddApplicationVpcConfigurationResponse":{
+      "type":"structure",
+      "members":{
+        "ApplicationARN":{
+          "shape":"ResourceARN",
+          "documentation":"<p>The ARN of the application.</p>"
+        },
+        "ApplicationVersionId":{
+          "shape":"ApplicationVersionId",
+          "documentation":"<p>Provides the current application version. Kinesis Data Analytics updates the ApplicationVersionId each time you update the application. </p>"
+        },
+        "VpcConfigurationDescription":{
+          "shape":"VpcConfigurationDescription",
+          "documentation":"<p>The parameters of the new VPC configuration.</p>"
+        }
+      }
+    },
     "ApplicationCodeConfiguration":{
       "type":"structure",
       "required":["CodeContentType"],
@@ -691,6 +762,10 @@
         "ApplicationSnapshotConfiguration":{
           "shape":"ApplicationSnapshotConfiguration",
           "documentation":"<p>Describes whether snapshots are enabled for a Java-based Kinesis Data Analytics application.</p>"
+        },
+        "VpcConfigurations":{
+          "shape":"VpcConfigurations",
+          "documentation":"<p>The array of descriptions of VPC configurations available to the application.</p>"
         }
       },
       "documentation":"<p>Specifies the creation parameters for an Amazon Kinesis Data Analytics application.</p>"
@@ -721,6 +796,10 @@
         "ApplicationSnapshotConfigurationDescription":{
           "shape":"ApplicationSnapshotConfigurationDescription",
           "documentation":"<p>Describes whether snapshots are enabled for a Java-based Kinesis Data Analytics application.</p>"
+        },
+        "VpcConfigurationDescriptions":{
+          "shape":"VpcConfigurationDescriptions",
+          "documentation":"<p>The array of descriptions of VPC configurations available to the application.</p>"
         }
       },
       "documentation":"<p>Describes details about the application code and starting parameters for an Amazon Kinesis Data Analytics application.</p>"
@@ -747,6 +826,10 @@
         "ApplicationSnapshotConfigurationUpdate":{
           "shape":"ApplicationSnapshotConfigurationUpdate",
           "documentation":"<p>Describes whether snapshots are enabled for a Java-based Kinesis Data Analytics application.</p>"
+        },
+        "VpcConfigurationUpdates":{
+          "shape":"VpcConfigurationUpdates",
+          "documentation":"<p>Updates to the array of descriptions of VPC configurations available to the application.</p>"
         }
       },
       "documentation":"<p>Describes updates to an application's configuration.</p>"
@@ -959,19 +1042,19 @@
       "members":{
         "ConfigurationType":{
           "shape":"ConfigurationType",
-          "documentation":"<p>Describes whether the application uses Amazon Kinesis Data Analytics' default checkpointing behavior. </p>"
+          "documentation":"<p>Describes whether the application uses Amazon Kinesis Data Analytics' default checkpointing behavior. You must set this property to <code>CUSTOM</code> in order to set the <code>CheckpointingEnabled</code>, <code>CheckpointInterval</code>, or <code>MinPauseBetweenCheckpoints</code> parameters.</p> <note> <p>If this value is set to <code>DEFAULT</code>, the application will use the following values, even if they are set to other values using APIs or application code:</p> <ul> <li> <p> <b>CheckpointingEnabled:</b> true</p> </li> <li> <p> <b>CheckpointInterval:</b> 60000</p> </li> <li> <p> <b>MinPauseBetweenCheckpoints:</b> 5000</p> </li> </ul> </note>"
         },
         "CheckpointingEnabled":{
           "shape":"BooleanObject",
-          "documentation":"<p>Describes whether checkpointing is enabled for a Java-based Kinesis Data Analytics application.</p>"
+          "documentation":"<p>Describes whether checkpointing is enabled for a Java-based Kinesis Data Analytics application.</p> <note> <p>If <code>CheckpointConfiguration.ConfigurationType</code> is <code>DEFAULT</code>, the application will use a <code>CheckpointingEnabled</code> value of <code>true</code>, even if this value is set to another value using this API or in application code.</p> </note>"
         },
         "CheckpointInterval":{
           "shape":"CheckpointInterval",
-          "documentation":"<p>Describes the interval in milliseconds between checkpoint operations. </p>"
+          "documentation":"<p>Describes the interval in milliseconds between checkpoint operations. </p> <note> <p>If <code>CheckpointConfiguration.ConfigurationType</code> is <code>DEFAULT</code>, the application will use a <code>CheckpointInterval</code> vaue of 60000, even if this value is set to another value using this API or in application code.</p> </note>"
         },
         "MinPauseBetweenCheckpoints":{
           "shape":"MinPauseBetweenCheckpoints",
-          "documentation":"<p>Describes the minimum time in milliseconds after a checkpoint operation completes that a new checkpoint operation can start. If a checkpoint operation takes longer than the <code>CheckpointInterval</code>, the application otherwise performs continual checkpoint operations. For more information, see <a href=\"https://ci.apache.org/projects/flink/flink-docs-stable/ops/state/large_state_tuning.html#tuning-checkpointing\"> Tuning Checkpointing</a> in the <a href=\"https://ci.apache.org/projects/flink/flink-docs-release-1.6/\">Apache Flink Documentation</a>.</p>"
+          "documentation":"<p>Describes the minimum time in milliseconds after a checkpoint operation completes that a new checkpoint operation can start. If a checkpoint operation takes longer than the <code>CheckpointInterval</code>, the application otherwise performs continual checkpoint operations. For more information, see <a href=\"https://ci.apache.org/projects/flink/flink-docs-stable/ops/state/large_state_tuning.html#tuning-checkpointing\"> Tuning Checkpointing</a> in the <a href=\"https://ci.apache.org/projects/flink/flink-docs-release-1.6/\">Apache Flink Documentation</a>.</p> <note> <p>If <code>CheckpointConfiguration.ConfigurationType</code> is <code>DEFAULT</code>, the application will use a <code>MinPauseBetweenCheckpoints</code> value of 5000, even if this value is set using this API or in application code.</p> </note>"
         }
       },
       "documentation":"<p>Describes an application's checkpointing configuration. Checkpointing is the process of persisting application state for fault tolerance. For more information, see <a href=\"https://ci.apache.org/projects/flink/flink-docs-release-1.6/concepts/programming-model.html#checkpoints-for-fault-tolerance\"> Checkpoints for Fault Tolerance</a> in the <a href=\"https://ci.apache.org/projects/flink/flink-docs-release-1.6/\">Apache Flink Documentation</a>.</p>"
@@ -981,19 +1064,19 @@
       "members":{
         "ConfigurationType":{
           "shape":"ConfigurationType",
-          "documentation":"<p>Describes whether the application uses the default checkpointing behavior in Kinesis Data Analytics.</p>"
+          "documentation":"<p>Describes whether the application uses the default checkpointing behavior in Kinesis Data Analytics. </p> <note> <p>If this value is set to <code>DEFAULT</code>, the application will use the following values, even if they are set to other values using APIs or application code:</p> <ul> <li> <p> <b>CheckpointingEnabled:</b> true</p> </li> <li> <p> <b>CheckpointInterval:</b> 60000</p> </li> <li> <p> <b>MinPauseBetweenCheckpoints:</b> 5000</p> </li> </ul> </note>"
         },
         "CheckpointingEnabled":{
           "shape":"BooleanObject",
-          "documentation":"<p>Describes whether checkpointing is enabled for a Java-based Kinesis Data Analytics application.</p>"
+          "documentation":"<p>Describes whether checkpointing is enabled for a Java-based Kinesis Data Analytics application.</p> <note> <p>If <code>CheckpointConfiguration.ConfigurationType</code> is <code>DEFAULT</code>, the application will use a <code>CheckpointingEnabled</code> value of <code>true</code>, even if this value is set to another value using this API or in application code.</p> </note>"
         },
         "CheckpointInterval":{
           "shape":"CheckpointInterval",
-          "documentation":"<p>Describes the interval in milliseconds between checkpoint operations.</p>"
+          "documentation":"<p>Describes the interval in milliseconds between checkpoint operations. </p> <note> <p>If <code>CheckpointConfiguration.ConfigurationType</code> is <code>DEFAULT</code>, the application will use a <code>CheckpointInterval</code> vaue of 60000, even if this value is set to another value using this API or in application code.</p> </note>"
         },
         "MinPauseBetweenCheckpoints":{
           "shape":"MinPauseBetweenCheckpoints",
-          "documentation":"<p>Describes the minimum time in milliseconds after a checkpoint operation completes that a new checkpoint operation can start.</p>"
+          "documentation":"<p>Describes the minimum time in milliseconds after a checkpoint operation completes that a new checkpoint operation can start. </p> <note> <p>If <code>CheckpointConfiguration.ConfigurationType</code> is <code>DEFAULT</code>, the application will use a <code>MinPauseBetweenCheckpoints</code> value of 5000, even if this value is set using this API or in application code.</p> </note>"
         }
       },
       "documentation":"<p>Describes checkpointing parameters for a Java-based Amazon Kinesis Data Analytics application.</p>"
@@ -1003,26 +1086,26 @@
       "members":{
         "ConfigurationTypeUpdate":{
           "shape":"ConfigurationType",
-          "documentation":"<p>Describes updates to whether the application uses the default checkpointing behavior of Kinesis Data Analytics.</p>"
+          "documentation":"<p>Describes updates to whether the application uses the default checkpointing behavior of Kinesis Data Analytics. You must set this property to <code>CUSTOM</code> in order to set the <code>CheckpointingEnabled</code>, <code>CheckpointInterval</code>, or <code>MinPauseBetweenCheckpoints</code> parameters. </p> <note> <p>If this value is set to <code>DEFAULT</code>, the application will use the following values, even if they are set to other values using APIs or application code:</p> <ul> <li> <p> <b>CheckpointingEnabled:</b> true</p> </li> <li> <p> <b>CheckpointInterval:</b> 60000</p> </li> <li> <p> <b>MinPauseBetweenCheckpoints:</b> 5000</p> </li> </ul> </note>"
         },
         "CheckpointingEnabledUpdate":{
           "shape":"BooleanObject",
-          "documentation":"<p>Describes updates to whether checkpointing is enabled for an application.</p>"
+          "documentation":"<p>Describes updates to whether checkpointing is enabled for an application.</p> <note> <p>If <code>CheckpointConfiguration.ConfigurationType</code> is <code>DEFAULT</code>, the application will use a <code>CheckpointingEnabled</code> value of <code>true</code>, even if this value is set to another value using this API or in application code.</p> </note>"
         },
         "CheckpointIntervalUpdate":{
           "shape":"CheckpointInterval",
-          "documentation":"<p>Describes updates to the interval in milliseconds between checkpoint operations.</p>"
+          "documentation":"<p>Describes updates to the interval in milliseconds between checkpoint operations.</p> <note> <p>If <code>CheckpointConfiguration.ConfigurationType</code> is <code>DEFAULT</code>, the application will use a <code>CheckpointInterval</code> vaue of 60000, even if this value is set to another value using this API or in application code.</p> </note>"
         },
         "MinPauseBetweenCheckpointsUpdate":{
           "shape":"MinPauseBetweenCheckpoints",
-          "documentation":"<p>Describes updates to the minimum time in milliseconds after a checkpoint operation completes that a new checkpoint operation can start.</p>"
+          "documentation":"<p>Describes updates to the minimum time in milliseconds after a checkpoint operation completes that a new checkpoint operation can start.</p> <note> <p>If <code>CheckpointConfiguration.ConfigurationType</code> is <code>DEFAULT</code>, the application will use a <code>MinPauseBetweenCheckpoints</code> value of 5000, even if this value is set using this API or in application code.</p> </note>"
         }
       },
       "documentation":"<p>Describes updates to the checkpointing parameters for a Java-based Amazon Kinesis Data Analytics application.</p>"
     },
     "CheckpointInterval":{
       "type":"long",
-      "min":0
+      "min":1
     },
     "CloudWatchLoggingOption":{
       "type":"structure",
@@ -1213,7 +1296,7 @@
         },
         "Tags":{
           "shape":"Tags",
-          "documentation":"<p>A list of one or more tags to assign to the application. A tag is a key-value pair that identifies an application. Note that the maximum number of application tags includes system tags. The maximum number of user-defined application tags is 50. For more information, see <a href=\"https://docs.aws.amazon.com/awsaccountbilling/latest/aboutv2/cost-alloc-tags.html\">Using Cost Allocation Tags</a> in the <i>AWS Billing and Cost Management Guide</i>.</p>"
+          "documentation":"<p>A list of one or more tags to assign to the application. A tag is a key-value pair that identifies an application. Note that the maximum number of application tags includes system tags. The maximum number of user-defined application tags is 50. For more information, see <a href=\"https://docs.aws.amazon.com/kinesisanalytics/latest/java/how-tagging.html\">Using Tagging</a>.</p>"
         }
       }
     },
@@ -1442,6 +1525,41 @@
       "members":{
       }
     },
+    "DeleteApplicationVpcConfigurationRequest":{
+      "type":"structure",
+      "required":[
+        "ApplicationName",
+        "CurrentApplicationVersionId",
+        "VpcConfigurationId"
+      ],
+      "members":{
+        "ApplicationName":{
+          "shape":"ApplicationName",
+          "documentation":"<p>The name of an existing application.</p>"
+        },
+        "CurrentApplicationVersionId":{
+          "shape":"ApplicationVersionId",
+          "documentation":"<p>The current application version ID. You can retrieve the application version ID using <a>DescribeApplication</a>.</p>"
+        },
+        "VpcConfigurationId":{
+          "shape":"Id",
+          "documentation":"<p>The ID of the VPC configuration to delete.</p>"
+        }
+      }
+    },
+    "DeleteApplicationVpcConfigurationResponse":{
+      "type":"structure",
+      "members":{
+        "ApplicationARN":{
+          "shape":"ResourceARN",
+          "documentation":"<p>The ARN of the Kinesis Data Analytics application.</p>"
+        },
+        "ApplicationVersionId":{
+          "shape":"ApplicationVersionId",
+          "documentation":"<p>The updated version ID of the application.</p>"
+        }
+      }
+    },
     "DescribeApplicationRequest":{
       "type":"structure",
       "required":["ApplicationName"],
@@ -1647,6 +1765,16 @@
       },
       "documentation":"<p>Describes updates to the configuration parameters for a Java-based Amazon Kinesis Data Analytics application.</p>"
     },
+    "FlinkRunConfiguration":{
+      "type":"structure",
+      "members":{
+        "AllowNonRestoredState":{
+          "shape":"BooleanObject",
+          "documentation":"<p>When restoring from a savepoint, specifies whether the runtime is allowed to skip a state that cannot be mapped to the new program. This will happen if the program is updated between savepoints to remove stateful parameters, and state data in the savepoint no longer corresponds to valid application data. For more information, see <a href=\"https://ci.apache.org/projects/flink/flink-docs-release-1.8/ops/state/savepoints.html#allowing-non-restored-state\"> Allowing Non-Restored State</a> in the <a href=\"https://ci.apache.org/projects/flink/flink-docs-release-1.8/\">Apache Flink documentation</a>.</p>"
+        }
+      },
+      "documentation":"<p>Describes the starting parameters for an Apache Flink-based Kinesis Data Analytics application.</p>"
+    },
     "Id":{
       "type":"string",
       "max":50,
@@ -2291,7 +2419,7 @@
       "members":{
         "ConfigurationType":{
           "shape":"ConfigurationType",
-          "documentation":"<p>Describes whether to use the default CloudWatch logging configuration for an application.</p>"
+          "documentation":"<p>Describes whether to use the default CloudWatch logging configuration for an application. You must set this property to <code>CUSTOM</code> in order to set the <code>LogLevel</code> or <code>MetricsLevel</code> parameters.</p>"
         },
         "MetricsLevel":{
           "shape":"MetricsLevel",
@@ -2327,7 +2455,7 @@
       "members":{
         "ConfigurationTypeUpdate":{
           "shape":"ConfigurationType",
-          "documentation":"<p>Describes updates to whether to use the default CloudWatch logging configuration for an application.</p>"
+          "documentation":"<p>Describes updates to whether to use the default CloudWatch logging configuration for an application. You must set this property to <code>CUSTOM</code> in order to set the <code>LogLevel</code> or <code>MetricsLevel</code> parameters.</p>"
         },
         "MetricsLevelUpdate":{
           "shape":"MetricsLevel",
@@ -2459,11 +2587,11 @@
       "members":{
         "ConfigurationType":{
           "shape":"ConfigurationType",
-          "documentation":"<p>Describes whether the application uses the default parallelism for the Kinesis Data Analytics service.</p>"
+          "documentation":"<p>Describes whether the application uses the default parallelism for the Kinesis Data Analytics service. You must set this property to <code>CUSTOM</code> in order to change your application's <code>AutoScalingEnabled</code>, <code>Parallelism</code>, or <code>ParallelismPerKPU</code> properties.</p>"
         },
         "Parallelism":{
           "shape":"Parallelism",
-          "documentation":"<p>Describes the initial number of parallel tasks that a Java-based Kinesis Data Analytics application can perform. The Kinesis Data Analytics service can increase this number automatically if <a>ParallelismConfiguration$AutoScalingEnabled</a> is set to <code>true</code>.</p>"
+          "documentation":"<p>Describes the initial number of parallel tasks that a Java-based Kinesis Data Analytics application can perform. If <code>AutoScalingEnabled</code> is set to True, Kinesis Data Analytics increases the <code>CurrentParallelism</code> value in response to application load. The service can increase the <code>CurrentParallelism</code> value up to the maximum parallelism, which is <code>ParalellismPerKPU</code> times the maximum KPUs for the application. The maximum KPUs for an application is 32 by default, and can be increased by requesting a limit increase. If application load is reduced, the service can reduce the <code>CurrentParallelism</code> value down to the <code>Parallelism</code> setting.</p>"
         },
         "ParallelismPerKPU":{
           "shape":"ParallelismPerKPU",
@@ -2485,7 +2613,7 @@
         },
         "Parallelism":{
           "shape":"Parallelism",
-          "documentation":"<p>Describes the initial number of parallel tasks that a Java-based Kinesis Data Analytics application can perform. </p>"
+          "documentation":"<p>Describes the initial number of parallel tasks that a Java-based Kinesis Data Analytics application can perform. If <code>AutoScalingEnabled</code> is set to True, then Kinesis Data Analytics can increase the <code>CurrentParallelism</code> value in response to application load. The service can increase <code>CurrentParallelism</code> up to the maximum parallelism, which is <code>ParalellismPerKPU</code> times the maximum KPUs for the application. The maximum KPUs for an application is 32 by default, and can be increased by requesting a limit increase. If application load is reduced, the service can reduce the <code>CurrentParallelism</code> value down to the <code>Parallelism</code> setting.</p>"
         },
         "ParallelismPerKPU":{
           "shape":"ParallelismPerKPU",
@@ -2493,7 +2621,7 @@
         },
         "CurrentParallelism":{
           "shape":"Parallelism",
-          "documentation":"<p>Describes the current number of parallel tasks that a Java-based Kinesis Data Analytics application can perform.</p>"
+          "documentation":"<p>Describes the current number of parallel tasks that a Java-based Kinesis Data Analytics application can perform. If <code>AutoScalingEnabled</code> is set to True, Kinesis Data Analytics can increase this value in response to application load. The service can increase this value up to the maximum parallelism, which is <code>ParalellismPerKPU</code> times the maximum KPUs for the application. The maximum KPUs for an application is 32 by default, and can be increased by requesting a limit increase. If application load is reduced, the service can reduce the <code>CurrentParallelism</code> value down to the <code>Parallelism</code> setting.</p>"
         },
         "AutoScalingEnabled":{
           "shape":"BooleanObject",
@@ -2507,11 +2635,11 @@
       "members":{
         "ConfigurationTypeUpdate":{
           "shape":"ConfigurationType",
-          "documentation":"<p>Describes updates to whether the application uses the default parallelism for the Kinesis Data Analytics service, or if a custom parallelism is used.</p>"
+          "documentation":"<p>Describes updates to whether the application uses the default parallelism for the Kinesis Data Analytics service, or if a custom parallelism is used. You must set this property to <code>CUSTOM</code> in order to change your application's <code>AutoScalingEnabled</code>, <code>Parallelism</code>, or <code>ParallelismPerKPU</code> properties.</p>"
         },
         "ParallelismUpdate":{
           "shape":"Parallelism",
-          "documentation":"<p>Describes updates to the initial number of parallel tasks an application can perform.</p>"
+          "documentation":"<p>Describes updates to the initial number of parallel tasks an application can perform. If <code>AutoScalingEnabled</code> is set to True, then Kinesis Data Analytics can increase the <code>CurrentParallelism</code> value in response to application load. The service can increase <code>CurrentParallelism</code> up to the maximum parallelism, which is <code>ParalellismPerKPU</code> times the maximum KPUs for the application. The maximum KPUs for an application is 32 by default, and can be increased by requesting a limit increase. If application load is reduced, the service will reduce <code>CurrentParallelism</code> down to the <code>Parallelism</code> setting.</p>"
         },
         "ParallelismPerKPUUpdate":{
           "shape":"ParallelismPerKPU",
@@ -2782,6 +2910,10 @@
     "RunConfiguration":{
       "type":"structure",
       "members":{
+        "FlinkRunConfiguration":{
+          "shape":"FlinkRunConfiguration",
+          "documentation":"<p>Describes the starting parameters for an Apache Flink-based Kinesis Data Analytics application.</p>"
+        },
         "SqlRunConfigurations":{
           "shape":"SqlRunConfigurations",
           "documentation":"<p>Describes the starting parameters for an SQL-based Kinesis Data Analytics application.</p>"
@@ -2806,6 +2938,10 @@
     "RunConfigurationUpdate":{
       "type":"structure",
       "members":{
+        "FlinkRunConfiguration":{
+          "shape":"FlinkRunConfiguration",
+          "documentation":"<p>Describes the starting parameters for an Apache Flink-based Kinesis Data Analytics application.</p>"
+        },
         "ApplicationRestoreConfiguration":{
           "shape":"ApplicationRestoreConfiguration",
           "documentation":"<p>Describes updates to the restore behavior of a restarting application.</p>"
@@ -2817,7 +2953,8 @@
       "type":"string",
       "enum":[
         "SQL-1_0",
-        "FLINK-1_6"
+        "FLINK-1_6",
+        "FLINK-1_8"
       ]
     },
     "S3ApplicationCodeLocationDescription":{
@@ -2950,6 +3087,13 @@
       },
       "documentation":"<p>For an SQL-based Amazon Kinesis Data Analytics application, describes the Amazon S3 bucket name and object key name for an in-application reference table. </p>"
     },
+    "SecurityGroupId":{"type":"string"},
+    "SecurityGroupIds":{
+      "type":"list",
+      "member":{"shape":"SecurityGroupId"},
+      "max":5,
+      "min":1
+    },
     "ServiceUnavailableException":{
       "type":"structure",
       "members":{
@@ -2988,7 +3132,7 @@
     },
     "SnapshotName":{
       "type":"string",
-      "max":128,
+      "max":256,
       "min":1,
       "pattern":"[a-zA-Z0-9_.-]+"
     },
@@ -3140,6 +3284,13 @@
       "members":{
       }
     },
+    "SubnetId":{"type":"string"},
+    "SubnetIds":{
+      "type":"list",
+      "member":{"shape":"SubnetId"},
+      "max":16,
+      "min":1
+    },
     "Tag":{
       "type":"structure",
       "required":["Key"],
@@ -3153,7 +3304,7 @@
           "documentation":"<p>The value of the key-value tag. The value is optional.</p>"
         }
       },
-      "documentation":"<p>A key-value pair (the value is optional) that you can define and assign to AWS resources. If you specify a tag that already exists, the tag value is replaced with the value that you specify in the request. Note that the maximum number of application tags includes system tags. The maximum number of user-defined application tags is 50. For more information, see <a href=\"https://docs.aws.amazon.com/awsaccountbilling/latest/aboutv2/cost-alloc-tags.html\">Using Cost Allocation Tags</a> in the <i>AWS Billing and Cost Management Guide</i>.</p>"
+      "documentation":"<p>A key-value pair (the value is optional) that you can define and assign to AWS resources. If you specify a tag that already exists, the tag value is replaced with the value that you specify in the request. Note that the maximum number of application tags includes system tags. The maximum number of user-defined application tags is 50. For more information, see <a href=\"https://docs.aws.amazon.com/kinesisanalytics/latest/java/how-tagging.html\">Using Tagging</a>.</p>"
     },
     "TagKey":{
       "type":"string",
@@ -3302,6 +3453,84 @@
         }
       }
     },
+    "VpcConfiguration":{
+      "type":"structure",
+      "required":[
+        "SubnetIds",
+        "SecurityGroupIds"
+      ],
+      "members":{
+        "SubnetIds":{
+          "shape":"SubnetIds",
+          "documentation":"<p>The array of <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_Subnet.html\">Subnet</a> IDs used by the VPC configuration.</p>"
+        },
+        "SecurityGroupIds":{
+          "shape":"SecurityGroupIds",
+          "documentation":"<p>The array of <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_SecurityGroup.html\">SecurityGroup</a> IDs used by the VPC configuration.</p>"
+        }
+      },
+      "documentation":"<p>Describes the parameters of a VPC used by the application.</p>"
+    },
+    "VpcConfigurationDescription":{
+      "type":"structure",
+      "required":[
+        "VpcConfigurationId",
+        "VpcId",
+        "SubnetIds",
+        "SecurityGroupIds"
+      ],
+      "members":{
+        "VpcConfigurationId":{
+          "shape":"Id",
+          "documentation":"<p>The ID of the VPC configuration.</p>"
+        },
+        "VpcId":{
+          "shape":"VpcId",
+          "documentation":"<p>The ID of the associated VPC.</p>"
+        },
+        "SubnetIds":{
+          "shape":"SubnetIds",
+          "documentation":"<p>The array of <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_Subnet.html\">Subnet</a> IDs used by the VPC configuration.</p>"
+        },
+        "SecurityGroupIds":{
+          "shape":"SecurityGroupIds",
+          "documentation":"<p>The array of <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_SecurityGroup.html\">SecurityGroup</a> IDs used by the VPC configuration.</p>"
+        }
+      },
+      "documentation":"<p>Describes the parameters of a VPC used by the application.</p>"
+    },
+    "VpcConfigurationDescriptions":{
+      "type":"list",
+      "member":{"shape":"VpcConfigurationDescription"}
+    },
+    "VpcConfigurationUpdate":{
+      "type":"structure",
+      "required":["VpcConfigurationId"],
+      "members":{
+        "VpcConfigurationId":{
+          "shape":"Id",
+          "documentation":"<p>Describes an update to the ID of the VPC configuration.</p>"
+        },
+        "SubnetIdUpdates":{
+          "shape":"SubnetIds",
+          "documentation":"<p>Describes updates to the array of <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_Subnet.html\">Subnet</a> IDs used by the VPC configuration.</p>"
+        },
+        "SecurityGroupIdUpdates":{
+          "shape":"SecurityGroupIds",
+          "documentation":"<p>Describes updates to the array of <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_SecurityGroup.html\">SecurityGroup</a> IDs used by the VPC configuration.</p>"
+        }
+      },
+      "documentation":"<p>Describes updates to the VPC configuration used by the application.</p>"
+    },
+    "VpcConfigurationUpdates":{
+      "type":"list",
+      "member":{"shape":"VpcConfigurationUpdate"}
+    },
+    "VpcConfigurations":{
+      "type":"list",
+      "member":{"shape":"VpcConfiguration"}
+    },
+    "VpcId":{"type":"string"},
     "ZipFileContent":{
       "type":"blob",
       "max":52428800,
diff --git a/services/kinesisvideo/pom.xml b/services/kinesisvideo/pom.xml
index 35cfc29997be..75c2c6ae6f72 100644
--- a/services/kinesisvideo/pom.xml
+++ b/services/kinesisvideo/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>services</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>kinesisvideo</artifactId>
diff --git a/services/kinesisvideo/src/main/resources/codegen-resources/paginators-1.json b/services/kinesisvideo/src/main/resources/codegen-resources/paginators-1.json
index f2187862587f..a9b4dbb85a91 100644
--- a/services/kinesisvideo/src/main/resources/codegen-resources/paginators-1.json
+++ b/services/kinesisvideo/src/main/resources/codegen-resources/paginators-1.json
@@ -1,5 +1,11 @@
 {
   "pagination": {
+    "ListSignalingChannels": {
+      "input_token": "NextToken",
+      "limit_key": "MaxResults",
+      "output_token": "NextToken",
+      "result_key": "ChannelInfoList"
+    },
     "ListStreams": {
       "input_token": "NextToken",
       "limit_key": "MaxResults",
diff --git a/services/kinesisvideo/src/main/resources/codegen-resources/service-2.json b/services/kinesisvideo/src/main/resources/codegen-resources/service-2.json
index 88eb1acac98a..2e00208f0d61 100644
--- a/services/kinesisvideo/src/main/resources/codegen-resources/service-2.json
+++ b/services/kinesisvideo/src/main/resources/codegen-resources/service-2.json
@@ -11,6 +11,24 @@
     "uid":"kinesisvideo-2017-09-30"
   },
   "operations":{
+    "CreateSignalingChannel":{
+      "name":"CreateSignalingChannel",
+      "http":{
+        "method":"POST",
+        "requestUri":"/createSignalingChannel"
+      },
+      "input":{"shape":"CreateSignalingChannelInput"},
+      "output":{"shape":"CreateSignalingChannelOutput"},
+      "errors":[
+        {"shape":"InvalidArgumentException"},
+        {"shape":"ClientLimitExceededException"},
+        {"shape":"AccountChannelLimitExceededException"},
+        {"shape":"ResourceInUseException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"TagsPerResourceExceededLimitException"}
+      ],
+      "documentation":"<p>Creates a signaling channel. </p> <p> <code>CreateSignalingChannel</code> is an asynchronous operation.</p>"
+    },
     "CreateStream":{
       "name":"CreateStream",
       "http":{
@@ -30,6 +48,23 @@
       ],
       "documentation":"<p>Creates a new Kinesis video stream. </p> <p>When you create a new stream, Kinesis Video Streams assigns it a version number. When you change the stream's metadata, Kinesis Video Streams updates the version. </p> <p> <code>CreateStream</code> is an asynchronous operation.</p> <p>For information about how the service works, see <a href=\"https://docs.aws.amazon.com/kinesisvideostreams/latest/dg/how-it-works.html\">How it Works</a>. </p> <p>You must have permissions for the <code>KinesisVideo:CreateStream</code> action.</p>"
     },
+    "DeleteSignalingChannel":{
+      "name":"DeleteSignalingChannel",
+      "http":{
+        "method":"POST",
+        "requestUri":"/deleteSignalingChannel"
+      },
+      "input":{"shape":"DeleteSignalingChannelInput"},
+      "output":{"shape":"DeleteSignalingChannelOutput"},
+      "errors":[
+        {"shape":"InvalidArgumentException"},
+        {"shape":"ClientLimitExceededException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"VersionMismatchException"}
+      ],
+      "documentation":"<p>Deletes a specified signaling channel. <code>DeleteSignalingChannel</code> is an asynchronous operation. If you don't specify the channel's current version, the most recent version is deleted.</p>"
+    },
     "DeleteStream":{
       "name":"DeleteStream",
       "http":{
@@ -47,6 +82,22 @@
       ],
       "documentation":"<p>Deletes a Kinesis video stream and the data contained in the stream. </p> <p>This method marks the stream for deletion, and makes the data in the stream inaccessible immediately.</p> <p> </p> <p> To ensure that you have the latest version of the stream before deleting it, you can specify the stream version. Kinesis Video Streams assigns a version to each stream. When you update a stream, Kinesis Video Streams assigns a new version number. To get the latest stream version, use the <code>DescribeStream</code> API. </p> <p>This operation requires permission for the <code>KinesisVideo:DeleteStream</code> action.</p>"
     },
+    "DescribeSignalingChannel":{
+      "name":"DescribeSignalingChannel",
+      "http":{
+        "method":"POST",
+        "requestUri":"/describeSignalingChannel"
+      },
+      "input":{"shape":"DescribeSignalingChannelInput"},
+      "output":{"shape":"DescribeSignalingChannelOutput"},
+      "errors":[
+        {"shape":"InvalidArgumentException"},
+        {"shape":"ClientLimitExceededException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"AccessDeniedException"}
+      ],
+      "documentation":"<p>Returns the most current information about the signaling channel. You must specify either the name or the ARN of the channel that you want to describe.</p>"
+    },
     "DescribeStream":{
       "name":"DescribeStream",
       "http":{
@@ -79,6 +130,38 @@
       ],
       "documentation":"<p>Gets an endpoint for a specified stream for either reading or writing. Use this endpoint in your application to read from the specified stream (using the <code>GetMedia</code> or <code>GetMediaForFragmentList</code> operations) or write to it (using the <code>PutMedia</code> operation). </p> <note> <p>The returned endpoint does not have the API name appended. The client needs to add the API name to the returned endpoint.</p> </note> <p>In the request, specify the stream either by <code>StreamName</code> or <code>StreamARN</code>.</p>"
     },
+    "GetSignalingChannelEndpoint":{
+      "name":"GetSignalingChannelEndpoint",
+      "http":{
+        "method":"POST",
+        "requestUri":"/getSignalingChannelEndpoint"
+      },
+      "input":{"shape":"GetSignalingChannelEndpointInput"},
+      "output":{"shape":"GetSignalingChannelEndpointOutput"},
+      "errors":[
+        {"shape":"InvalidArgumentException"},
+        {"shape":"ClientLimitExceededException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ResourceInUseException"},
+        {"shape":"AccessDeniedException"}
+      ],
+      "documentation":"<p>Provides an endpoint for the specified signaling channel to send and receive messages. This API uses the <code>SingleMasterChannelEndpointConfiguration</code> input parameter, which consists of the <code>Protocols</code> and <code>Role</code> properties.</p> <p> <code>Protocols</code> is used to determine the communication mechanism. For example, specifying <code>WSS</code> as the protocol, results in this API producing a secure websocket endpoint, and specifying <code>HTTPS</code> as the protocol, results in this API generating an HTTPS endpoint. </p> <p> <code>Role</code> determines the messaging permissions. A <code>MASTER</code> role results in this API generating an endpoint that a client can use to communicate with any of the viewers on the channel. A <code>VIEWER</code> role results in this API generating an endpoint that a client can use to communicate only with a <code>MASTER</code>. </p>"
+    },
+    "ListSignalingChannels":{
+      "name":"ListSignalingChannels",
+      "http":{
+        "method":"POST",
+        "requestUri":"/listSignalingChannels"
+      },
+      "input":{"shape":"ListSignalingChannelsInput"},
+      "output":{"shape":"ListSignalingChannelsOutput"},
+      "errors":[
+        {"shape":"InvalidArgumentException"},
+        {"shape":"ClientLimitExceededException"},
+        {"shape":"AccessDeniedException"}
+      ],
+      "documentation":"<p>Returns an array of <code>ChannelInfo</code> objects. Each object describes a signaling channel. To retrieve only those channels that satisfy a specific condition, you can specify a <code>ChannelNameCondition</code>.</p>"
+    },
     "ListStreams":{
       "name":"ListStreams",
       "http":{
@@ -93,6 +176,22 @@
       ],
       "documentation":"<p>Returns an array of <code>StreamInfo</code> objects. Each object describes a stream. To retrieve only streams that satisfy a specific condition, you can specify a <code>StreamNameCondition</code>. </p>"
     },
+    "ListTagsForResource":{
+      "name":"ListTagsForResource",
+      "http":{
+        "method":"POST",
+        "requestUri":"/ListTagsForResource"
+      },
+      "input":{"shape":"ListTagsForResourceInput"},
+      "output":{"shape":"ListTagsForResourceOutput"},
+      "errors":[
+        {"shape":"InvalidArgumentException"},
+        {"shape":"ClientLimitExceededException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"AccessDeniedException"}
+      ],
+      "documentation":"<p>Returns a list of tags associated with the specified signaling channel.</p>"
+    },
     "ListTagsForStream":{
       "name":"ListTagsForStream",
       "http":{
@@ -110,6 +209,23 @@
       ],
       "documentation":"<p>Returns a list of tags associated with the specified stream.</p> <p>In the request, you must specify either the <code>StreamName</code> or the <code>StreamARN</code>. </p>"
     },
+    "TagResource":{
+      "name":"TagResource",
+      "http":{
+        "method":"POST",
+        "requestUri":"/TagResource"
+      },
+      "input":{"shape":"TagResourceInput"},
+      "output":{"shape":"TagResourceOutput"},
+      "errors":[
+        {"shape":"InvalidArgumentException"},
+        {"shape":"ClientLimitExceededException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"TagsPerResourceExceededLimitException"}
+      ],
+      "documentation":"<p>Adds one or more tags to a signaling channel. A <i>tag</i> is a key-value pair (the value is optional) that you can define and assign to AWS resources. If you specify a tag that already exists, the tag value is replaced with the value that you specify in the request. For more information, see <a href=\"https://docs.aws.amazon.com/awsaccountbilling/latest/aboutv2/cost-alloc-tags.html\">Using Cost Allocation Tags</a> in the <i>AWS Billing and Cost Management User Guide</i>.</p>"
+    },
     "TagStream":{
       "name":"TagStream",
       "http":{
@@ -128,6 +244,22 @@
       ],
       "documentation":"<p>Adds one or more tags to a stream. A <i>tag</i> is a key-value pair (the value is optional) that you can define and assign to AWS resources. If you specify a tag that already exists, the tag value is replaced with the value that you specify in the request. For more information, see <a href=\"https://docs.aws.amazon.com/awsaccountbilling/latest/aboutv2/cost-alloc-tags.html\">Using Cost Allocation Tags</a> in the <i>AWS Billing and Cost Management User Guide</i>. </p> <p>You must provide either the <code>StreamName</code> or the <code>StreamARN</code>.</p> <p>This operation requires permission for the <code>KinesisVideo:TagStream</code> action.</p> <p>Kinesis video streams support up to 50 tags.</p>"
     },
+    "UntagResource":{
+      "name":"UntagResource",
+      "http":{
+        "method":"POST",
+        "requestUri":"/UntagResource"
+      },
+      "input":{"shape":"UntagResourceInput"},
+      "output":{"shape":"UntagResourceOutput"},
+      "errors":[
+        {"shape":"InvalidArgumentException"},
+        {"shape":"ClientLimitExceededException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"AccessDeniedException"}
+      ],
+      "documentation":"<p>Removes one or more tags from a signaling channel. In the request, specify only a tag key or keys; don't specify the value. If you specify a tag key that does not exist, it's ignored.</p>"
+    },
     "UntagStream":{
       "name":"UntagStream",
       "http":{
@@ -163,6 +295,24 @@
       ],
       "documentation":"<p> Increases or decreases the stream's data retention period by the value that you specify. To indicate whether you want to increase or decrease the data retention period, specify the <code>Operation</code> parameter in the request body. In the request, you must specify either the <code>StreamName</code> or the <code>StreamARN</code>. </p> <note> <p>The retention period that you specify replaces the current value.</p> </note> <p>This operation requires permission for the <code>KinesisVideo:UpdateDataRetention</code> action.</p> <p>Changing the data retention period affects the data in the stream as follows:</p> <ul> <li> <p>If the data retention period is increased, existing data is retained for the new retention period. For example, if the data retention period is increased from one hour to seven hours, all existing data is retained for seven hours.</p> </li> <li> <p>If the data retention period is decreased, existing data is retained for the new retention period. For example, if the data retention period is decreased from seven hours to one hour, all existing data is retained for one hour, and any data older than one hour is deleted immediately.</p> </li> </ul>"
     },
+    "UpdateSignalingChannel":{
+      "name":"UpdateSignalingChannel",
+      "http":{
+        "method":"POST",
+        "requestUri":"/updateSignalingChannel"
+      },
+      "input":{"shape":"UpdateSignalingChannelInput"},
+      "output":{"shape":"UpdateSignalingChannelOutput"},
+      "errors":[
+        {"shape":"InvalidArgumentException"},
+        {"shape":"ClientLimitExceededException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ResourceInUseException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"VersionMismatchException"}
+      ],
+      "documentation":"<p>Updates the existing signaling channel. This is an asynchronous operation and takes time to complete. </p> <p>If the <code>MessageTtlSeconds</code> value is updated (either increased or reduced), then it only applies to new messages sent via this channel after it's been updated. Existing messages are still expire as per the previous <code>MessageTtlSeconds</code> value.</p>"
+    },
     "UpdateStream":{
       "name":"UpdateStream",
       "http":{
@@ -194,6 +344,24 @@
         "GET_DASH_STREAMING_SESSION_URL"
       ]
     },
+    "AccessDeniedException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p>You do not have required permissions to perform this operation.</p>",
+      "error":{"httpStatusCode":401},
+      "exception":true
+    },
+    "AccountChannelLimitExceededException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p>You have reached the maximum limit of active signaling channels for this AWS account in this region.</p>",
+      "error":{"httpStatusCode":400},
+      "exception":true
+    },
     "AccountStreamLimitExceededException":{
       "type":"structure",
       "members":{
@@ -203,6 +371,82 @@
       "error":{"httpStatusCode":400},
       "exception":true
     },
+    "ChannelInfo":{
+      "type":"structure",
+      "members":{
+        "ChannelName":{
+          "shape":"ChannelName",
+          "documentation":"<p>The name of the signaling channel.</p>"
+        },
+        "ChannelARN":{
+          "shape":"ResourceARN",
+          "documentation":"<p>The ARN of the signaling channel.</p>"
+        },
+        "ChannelType":{
+          "shape":"ChannelType",
+          "documentation":"<p>The type of the signaling channel.</p>"
+        },
+        "ChannelStatus":{
+          "shape":"Status",
+          "documentation":"<p>Current status of the signaling channel.</p>"
+        },
+        "CreationTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>The time at which the signaling channel was created.</p>"
+        },
+        "SingleMasterConfiguration":{
+          "shape":"SingleMasterConfiguration",
+          "documentation":"<p>A structure that contains the configuration for the <code>SINGLE_MASTER</code> channel type.</p>"
+        },
+        "Version":{
+          "shape":"Version",
+          "documentation":"<p>The current version of the signaling channel.</p>"
+        }
+      },
+      "documentation":"<p>A structure that encapsulates a signaling channel's metadata and properties.</p>"
+    },
+    "ChannelInfoList":{
+      "type":"list",
+      "member":{"shape":"ChannelInfo"}
+    },
+    "ChannelName":{
+      "type":"string",
+      "max":256,
+      "min":1,
+      "pattern":"[a-zA-Z0-9_.-]+"
+    },
+    "ChannelNameCondition":{
+      "type":"structure",
+      "members":{
+        "ComparisonOperator":{
+          "shape":"ComparisonOperator",
+          "documentation":"<p>A comparison operator. Currently, you can only specify the <code>BEGINS_WITH</code> operator, which finds signaling channels whose names begin with a given prefix.</p>"
+        },
+        "ComparisonValue":{
+          "shape":"ChannelName",
+          "documentation":"<p>A value to compare.</p>"
+        }
+      },
+      "documentation":"<p>An optional input parameter for the <code>ListSignalingChannels</code> API. When this parameter is specified while invoking <code>ListSignalingChannels</code>, the API returns only the channels that satisfy a condition specified in <code>ChannelNameCondition</code>.</p>"
+    },
+    "ChannelProtocol":{
+      "type":"string",
+      "enum":[
+        "WSS",
+        "HTTPS"
+      ]
+    },
+    "ChannelRole":{
+      "type":"string",
+      "enum":[
+        "MASTER",
+        "VIEWER"
+      ]
+    },
+    "ChannelType":{
+      "type":"string",
+      "enum":["SINGLE_MASTER"]
+    },
     "ClientLimitExceededException":{
       "type":"structure",
       "members":{
@@ -216,6 +460,37 @@
       "type":"string",
       "enum":["BEGINS_WITH"]
     },
+    "CreateSignalingChannelInput":{
+      "type":"structure",
+      "required":["ChannelName"],
+      "members":{
+        "ChannelName":{
+          "shape":"ChannelName",
+          "documentation":"<p>A name for the signaling channel that you are creating. It must be unique for each account and region.</p>"
+        },
+        "ChannelType":{
+          "shape":"ChannelType",
+          "documentation":"<p>A type of the signaling channel that you are creating. Currently, <code>SINGLE_MASTER</code> is the only supported channel type. </p>"
+        },
+        "SingleMasterConfiguration":{
+          "shape":"SingleMasterConfiguration",
+          "documentation":"<p>A structure containing the configuration for the <code>SINGLE_MASTER</code> channel type. </p>"
+        },
+        "Tags":{
+          "shape":"TagOnCreateList",
+          "documentation":"<p>A set of tags (key/value pairs) that you want to associate with this channel.</p>"
+        }
+      }
+    },
+    "CreateSignalingChannelOutput":{
+      "type":"structure",
+      "members":{
+        "ChannelARN":{
+          "shape":"ResourceARN",
+          "documentation":"<p>The ARN of the created channel.</p>"
+        }
+      }
+    },
     "CreateStreamInput":{
       "type":"structure",
       "required":["StreamName"],
@@ -230,7 +505,7 @@
         },
         "MediaType":{
           "shape":"MediaType",
-          "documentation":"<p>The media type of the stream. Consumers of the stream can use this information when processing the stream. For more information about media types, see <a href=\"http://www.iana.org/assignments/media-types/media-types.xhtml\">Media Types</a>. If you choose to specify the <code>MediaType</code>, see <a href=\"https://tools.ietf.org/html/rfc6838#section-4.2\">Naming Requirements</a> for guidelines.</p> <p>This parameter is optional; the default value is <code>null</code> (or empty in JSON).</p>"
+          "documentation":"<p>The media type of the stream. Consumers of the stream can use this information when processing the stream. For more information about media types, see <a href=\"http://www.iana.org/assignments/media-types/media-types.xhtml\">Media Types</a>. If you choose to specify the <code>MediaType</code>, see <a href=\"https://tools.ietf.org/html/rfc6838#section-4.2\">Naming Requirements</a> for guidelines.</p> <p>Example valid values include \"video/h264\" and \"video/h264,audio/aac\".</p> <p>This parameter is optional; the default value is <code>null</code> (or empty in JSON).</p>"
         },
         "KmsKeyId":{
           "shape":"KmsKeyId",
@@ -264,6 +539,25 @@
       "type":"integer",
       "min":0
     },
+    "DeleteSignalingChannelInput":{
+      "type":"structure",
+      "required":["ChannelARN"],
+      "members":{
+        "ChannelARN":{
+          "shape":"ResourceARN",
+          "documentation":"<p>The ARN of the signaling channel that you want to delete.</p>"
+        },
+        "CurrentVersion":{
+          "shape":"Version",
+          "documentation":"<p>The current version of the signaling channel that you want to delete. You can obtain the current version by invoking the <code>DescribeSignalingChannel</code> or <code>ListSignalingChannels</code> APIs.</p>"
+        }
+      }
+    },
+    "DeleteSignalingChannelOutput":{
+      "type":"structure",
+      "members":{
+      }
+    },
     "DeleteStreamInput":{
       "type":"structure",
       "required":["StreamARN"],
@@ -283,6 +577,28 @@
       "members":{
       }
     },
+    "DescribeSignalingChannelInput":{
+      "type":"structure",
+      "members":{
+        "ChannelName":{
+          "shape":"ChannelName",
+          "documentation":"<p>The name of the signaling channel that you want to describe.</p>"
+        },
+        "ChannelARN":{
+          "shape":"ResourceARN",
+          "documentation":"<p>The ARN of the signaling channel that you want to describe.</p>"
+        }
+      }
+    },
+    "DescribeSignalingChannelOutput":{
+      "type":"structure",
+      "members":{
+        "ChannelInfo":{
+          "shape":"ChannelInfo",
+          "documentation":"<p>A structure that encapsulates the specified signaling channel's metadata and properties.</p>"
+        }
+      }
+    },
     "DescribeStreamInput":{
       "type":"structure",
       "members":{
@@ -348,6 +664,29 @@
         }
       }
     },
+    "GetSignalingChannelEndpointInput":{
+      "type":"structure",
+      "required":["ChannelARN"],
+      "members":{
+        "ChannelARN":{
+          "shape":"ResourceARN",
+          "documentation":"<p>The ARN of the signalling channel for which you want to get an endpoint.</p>"
+        },
+        "SingleMasterChannelEndpointConfiguration":{
+          "shape":"SingleMasterChannelEndpointConfiguration",
+          "documentation":"<p>A structure containing the endpoint configuration for the <code>SINGLE_MASTER</code> channel type.</p>"
+        }
+      }
+    },
+    "GetSignalingChannelEndpointOutput":{
+      "type":"structure",
+      "members":{
+        "ResourceEndpointList":{
+          "shape":"ResourceEndpointList",
+          "documentation":"<p>A list of endpoints for the specified signaling channel.</p>"
+        }
+      }
+    },
     "InvalidArgumentException":{
       "type":"structure",
       "members":{
@@ -380,6 +719,42 @@
       "max":2048,
       "min":1
     },
+    "ListOfProtocols":{
+      "type":"list",
+      "member":{"shape":"ChannelProtocol"},
+      "max":5,
+      "min":1
+    },
+    "ListSignalingChannelsInput":{
+      "type":"structure",
+      "members":{
+        "MaxResults":{
+          "shape":"ListStreamsInputLimit",
+          "documentation":"<p>The maximum number of channels to return in the response. The default is 500.</p>"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>If you specify this parameter, when the result of a <code>ListSignalingChannels</code> operation is truncated, the call returns the <code>NextToken</code> in the response. To get another batch of channels, provide this token in your next request.</p>"
+        },
+        "ChannelNameCondition":{
+          "shape":"ChannelNameCondition",
+          "documentation":"<p>Optional: Returns only the channels that satisfy a specific condition.</p>"
+        }
+      }
+    },
+    "ListSignalingChannelsOutput":{
+      "type":"structure",
+      "members":{
+        "ChannelInfoList":{
+          "shape":"ChannelInfoList",
+          "documentation":"<p>An array of <code>ChannelInfo</code> objects.</p>"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>If the response is truncated, the call returns this element with a token. To get the next batch of streams, use this token in your next request.</p>"
+        }
+      }
+    },
     "ListStreamsInput":{
       "type":"structure",
       "members":{
@@ -415,6 +790,33 @@
         }
       }
     },
+    "ListTagsForResourceInput":{
+      "type":"structure",
+      "required":["ResourceARN"],
+      "members":{
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>If you specify this parameter and the result of a ListTagsForResource call is truncated, the response includes a token that you can use in the next request to fetch the next batch of tags. </p>"
+        },
+        "ResourceARN":{
+          "shape":"ResourceARN",
+          "documentation":"<p>The ARN of the signaling channel for which you want to list tags.</p>"
+        }
+      }
+    },
+    "ListTagsForResourceOutput":{
+      "type":"structure",
+      "members":{
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>If you specify this parameter and the result of a ListTagsForResource call is truncated, the response includes a token that you can use in the next request to fetch the next set of tags. </p>"
+        },
+        "Tags":{
+          "shape":"ResourceTags",
+          "documentation":"<p>A map of tag keys and values associated with the specified signaling channel.</p>"
+        }
+      }
+    },
     "ListTagsForStreamInput":{
       "type":"structure",
       "members":{
@@ -451,10 +853,16 @@
       "min":1,
       "pattern":"[\\w\\-\\.\\+]+/[\\w\\-\\.\\+]+(,[\\w\\-\\.\\+]+/[\\w\\-\\.\\+]+)*"
     },
+    "MessageTtlSeconds":{
+      "type":"integer",
+      "max":120,
+      "min":5
+    },
     "NextToken":{
       "type":"string",
       "max":512,
-      "min":0
+      "min":0,
+      "pattern":"[a-zA-Z0-9+/=]*"
     },
     "NotAuthorizedException":{
       "type":"structure",
@@ -471,6 +879,25 @@
       "min":1,
       "pattern":"arn:aws:kinesisvideo:[a-z0-9-]+:[0-9]+:[a-z]+/[a-zA-Z0-9_.-]+/[0-9]+"
     },
+    "ResourceEndpoint":{"type":"string"},
+    "ResourceEndpointList":{
+      "type":"list",
+      "member":{"shape":"ResourceEndpointListItem"}
+    },
+    "ResourceEndpointListItem":{
+      "type":"structure",
+      "members":{
+        "Protocol":{
+          "shape":"ChannelProtocol",
+          "documentation":"<p>The protocol of the signaling channel returned by the <code>GetSignalingChannelEndpoint</code> API.</p>"
+        },
+        "ResourceEndpoint":{
+          "shape":"ResourceEndpoint",
+          "documentation":"<p>The endpoint of the signaling channel returned by the <code>GetSignalingChannelEndpoint</code> API.</p>"
+        }
+      },
+      "documentation":"<p>An object that describes the endpoint of the signaling channel returned by the <code>GetSignalingChannelEndpoint</code> API.</p>"
+    },
     "ResourceInUseException":{
       "type":"structure",
       "members":{
@@ -496,6 +923,30 @@
       "max":50,
       "min":1
     },
+    "SingleMasterChannelEndpointConfiguration":{
+      "type":"structure",
+      "members":{
+        "Protocols":{
+          "shape":"ListOfProtocols",
+          "documentation":"<p>This property is used to determine the nature of communication over this <code>SINGLE_MASTER</code> signaling channel. If <code>WSS</code> is specified, this API returns a websocket endpoint. If <code>HTTPS</code> is specified, this API returns an <code>HTTPS</code> endpoint.</p>"
+        },
+        "Role":{
+          "shape":"ChannelRole",
+          "documentation":"<p>This property is used to determine messaging permissions in this <code>SINGLE_MASTER</code> signaling channel. If <code>MASTER</code> is specified, this API returns an endpoint that a client can use to receive offers from and send answers to any of the viewers on this signaling channel. If <code>VIEWER</code> is specified, this API returns an endpoint that a client can use only to send offers to another <code>MASTER</code> client on this signaling channel. </p>"
+        }
+      },
+      "documentation":"<p>An object that contains the endpoint configuration for the <code>SINGLE_MASTER</code> channel type. </p>"
+    },
+    "SingleMasterConfiguration":{
+      "type":"structure",
+      "members":{
+        "MessageTtlSeconds":{
+          "shape":"MessageTtlSeconds",
+          "documentation":"<p>The period of time a signaling channel retains underlivered messages before they are discarded.</p>"
+        }
+      },
+      "documentation":"<p>A structure that contains the configuration for the <code>SINGLE_MASTER</code> channel type.</p>"
+    },
     "Status":{
       "type":"string",
       "enum":[
@@ -571,10 +1022,29 @@
       },
       "documentation":"<p>Specifies the condition that streams must satisfy to be returned when you list streams (see the <code>ListStreams</code> API). A condition has a comparison operation and a value. Currently, you can specify only the <code>BEGINS_WITH</code> operator, which finds streams whose names start with a given prefix. </p>"
     },
+    "Tag":{
+      "type":"structure",
+      "required":[
+        "Key",
+        "Value"
+      ],
+      "members":{
+        "Key":{
+          "shape":"TagKey",
+          "documentation":"<p>The key of the tag that is associated with the specified signaling channel.</p>"
+        },
+        "Value":{
+          "shape":"TagValue",
+          "documentation":"<p>The value of the tag that is associated with the specified signaling channel.</p>"
+        }
+      },
+      "documentation":"<p>A key and value pair that is associated with the specified signaling channel.</p>"
+    },
     "TagKey":{
       "type":"string",
       "max":128,
-      "min":1
+      "min":1,
+      "pattern":"^([\\p{L}\\p{Z}\\p{N}_.:/=+\\-@]*)$"
     },
     "TagKeyList":{
       "type":"list",
@@ -582,6 +1052,40 @@
       "max":50,
       "min":1
     },
+    "TagList":{
+      "type":"list",
+      "member":{"shape":"Tag"},
+      "max":50,
+      "min":1
+    },
+    "TagOnCreateList":{
+      "type":"list",
+      "member":{"shape":"Tag"},
+      "max":50,
+      "min":0
+    },
+    "TagResourceInput":{
+      "type":"structure",
+      "required":[
+        "ResourceARN",
+        "Tags"
+      ],
+      "members":{
+        "ResourceARN":{
+          "shape":"ResourceARN",
+          "documentation":"<p>The ARN of the signaling channel to which you want to add tags.</p>"
+        },
+        "Tags":{
+          "shape":"TagList",
+          "documentation":"<p>A list of tags to associate with the specified signaling channel. Each tag is a key-value pair.</p>"
+        }
+      }
+    },
+    "TagResourceOutput":{
+      "type":"structure",
+      "members":{
+      }
+    },
     "TagStreamInput":{
       "type":"structure",
       "required":["Tags"],
@@ -608,7 +1112,8 @@
     "TagValue":{
       "type":"string",
       "max":256,
-      "min":0
+      "min":0,
+      "pattern":"[\\p{L}\\p{Z}\\p{N}_.:/=+\\-@]*"
     },
     "TagsPerResourceExceededLimitException":{
       "type":"structure",
@@ -620,6 +1125,28 @@
       "exception":true
     },
     "Timestamp":{"type":"timestamp"},
+    "UntagResourceInput":{
+      "type":"structure",
+      "required":[
+        "ResourceARN",
+        "TagKeyList"
+      ],
+      "members":{
+        "ResourceARN":{
+          "shape":"ResourceARN",
+          "documentation":"<p>The ARN of the signaling channel from which you want to remove tags.</p>"
+        },
+        "TagKeyList":{
+          "shape":"TagKeyList",
+          "documentation":"<p>A list of the keys of the tags that you want to remove.</p>"
+        }
+      }
+    },
+    "UntagResourceOutput":{
+      "type":"structure",
+      "members":{
+      }
+    },
     "UntagStreamInput":{
       "type":"structure",
       "required":["TagKeyList"],
@@ -685,6 +1212,32 @@
       "members":{
       }
     },
+    "UpdateSignalingChannelInput":{
+      "type":"structure",
+      "required":[
+        "ChannelARN",
+        "CurrentVersion"
+      ],
+      "members":{
+        "ChannelARN":{
+          "shape":"ResourceARN",
+          "documentation":"<p>The ARN of the signaling channel that you want to update.</p>"
+        },
+        "CurrentVersion":{
+          "shape":"Version",
+          "documentation":"<p>The current version of the signaling channel that you want to update.</p>"
+        },
+        "SingleMasterConfiguration":{
+          "shape":"SingleMasterConfiguration",
+          "documentation":"<p>The structure containing the configuration for the <code>SINGLE_MASTER</code> type of the signaling channel that you want to update. </p>"
+        }
+      }
+    },
+    "UpdateSignalingChannelOutput":{
+      "type":"structure",
+      "members":{
+      }
+    },
     "UpdateStreamInput":{
       "type":"structure",
       "required":["CurrentVersion"],
diff --git a/services/kinesisvideoarchivedmedia/pom.xml b/services/kinesisvideoarchivedmedia/pom.xml
index f1163b78345c..07033c819537 100644
--- a/services/kinesisvideoarchivedmedia/pom.xml
+++ b/services/kinesisvideoarchivedmedia/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>kinesisvideoarchivedmedia</artifactId>
     <name>AWS Java SDK :: Services :: Kinesis Video Archived Media</name>
diff --git a/services/kinesisvideomedia/pom.xml b/services/kinesisvideomedia/pom.xml
index be32cbc78725..ff8263f9200b 100644
--- a/services/kinesisvideomedia/pom.xml
+++ b/services/kinesisvideomedia/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>kinesisvideomedia</artifactId>
     <name>AWS Java SDK :: Services :: Kinesis Video Media</name>
diff --git a/services/kinesisvideosignaling/pom.xml b/services/kinesisvideosignaling/pom.xml
new file mode 100644
index 000000000000..11419292ae18
--- /dev/null
+++ b/services/kinesisvideosignaling/pom.xml
@@ -0,0 +1,60 @@
+<?xml version="1.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.
+  -->
+
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>software.amazon.awssdk</groupId>
+        <artifactId>services</artifactId>
+        <version>2.11.8-SNAPSHOT</version>
+    </parent>
+    <artifactId>kinesisvideosignaling</artifactId>
+    <name>AWS Java SDK :: Services :: Kinesis Video Signaling</name>
+    <description>The AWS Java SDK for Kinesis Video Signaling module holds the client classes that are used for
+        communicating with Kinesis Video Signaling.
+    </description>
+    <url>https://aws.amazon.com/sdkforjava</url>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifestEntries>
+                            <Automatic-Module-Name>software.amazon.awssdk.services.kinesisvideosignaling</Automatic-Module-Name>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>protocol-core</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>aws-json-protocol</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/services/kinesisvideosignaling/src/main/resources/codegen-resources/paginators-1.json b/services/kinesisvideosignaling/src/main/resources/codegen-resources/paginators-1.json
new file mode 100644
index 000000000000..5677bd8e4a2d
--- /dev/null
+++ b/services/kinesisvideosignaling/src/main/resources/codegen-resources/paginators-1.json
@@ -0,0 +1,4 @@
+{
+  "pagination": {
+  }
+}
diff --git a/services/kinesisvideosignaling/src/main/resources/codegen-resources/service-2.json b/services/kinesisvideosignaling/src/main/resources/codegen-resources/service-2.json
new file mode 100644
index 000000000000..9f6f60e216f1
--- /dev/null
+++ b/services/kinesisvideosignaling/src/main/resources/codegen-resources/service-2.json
@@ -0,0 +1,249 @@
+{
+  "version":"2.0",
+  "metadata":{
+    "apiVersion":"2019-12-04",
+    "endpointPrefix":"kinesisvideo",
+    "protocol":"rest-json",
+    "serviceAbbreviation":"Amazon Kinesis Video Signaling Channels",
+    "serviceFullName":"Amazon Kinesis Video Signaling Channels",
+    "serviceId":"Kinesis Video Signaling",
+    "signatureVersion":"v4",
+    "uid":"kinesis-video-signaling-2019-12-04"
+  },
+  "operations":{
+    "GetIceServerConfig":{
+      "name":"GetIceServerConfig",
+      "http":{
+        "method":"POST",
+        "requestUri":"/v1/get-ice-server-config"
+      },
+      "input":{"shape":"GetIceServerConfigRequest"},
+      "output":{"shape":"GetIceServerConfigResponse"},
+      "errors":[
+        {"shape":"InvalidClientException"},
+        {"shape":"SessionExpiredException"},
+        {"shape":"ClientLimitExceededException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InvalidArgumentException"},
+        {"shape":"NotAuthorizedException"}
+      ],
+      "documentation":"<p>Gets the Interactive Connectivity Establishment (ICE) server configuration information, including URIs, username, and password which can be used to configure the WebRTC connection. The ICE component uses this configuration information to setup the WebRTC connection, including authenticating with the Traversal Using Relays around NAT (TURN) relay server. </p> <p>TURN is a protocol that is used to improve the connectivity of peer-to-peer applications. By providing a cloud-based relay service, TURN ensures that a connection can be established even when one or more peers are incapable of a direct peer-to-peer connection. For more information, see <a href=\"https://tools.ietf.org/html/draft-uberti-rtcweb-turn-rest-00\">A REST API For Access To TURN Services</a>.</p> <p> You can invoke this API to establish a fallback mechanism in case either of the peers is unable to establish a direct peer-to-peer connection over a signaling channel. You must specify either a signaling channel ARN or the client ID in order to invoke this API.</p>"
+    },
+    "SendAlexaOfferToMaster":{
+      "name":"SendAlexaOfferToMaster",
+      "http":{
+        "method":"POST",
+        "requestUri":"/v1/send-alexa-offer-to-master"
+      },
+      "input":{"shape":"SendAlexaOfferToMasterRequest"},
+      "output":{"shape":"SendAlexaOfferToMasterResponse"},
+      "errors":[
+        {"shape":"ClientLimitExceededException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InvalidArgumentException"},
+        {"shape":"NotAuthorizedException"}
+      ],
+      "documentation":"<p>This API allows you to connect WebRTC-enabled devices with Alexa display devices. When invoked, it sends the Alexa Session Description Protocol (SDP) offer to the master peer. The offer is delivered as soon as the master is connected to the specified signaling channel. This API returns the SDP answer from the connected master. If the master is not connected to the signaling channel, redelivery requests are made until the message expires.</p>"
+    }
+  },
+  "shapes":{
+    "Answer":{
+      "type":"string",
+      "max":10000,
+      "min":1
+    },
+    "ClientId":{
+      "type":"string",
+      "max":256,
+      "min":1,
+      "pattern":"[a-zA-Z0-9_.-]+"
+    },
+    "ClientLimitExceededException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p>Your request was throttled because you have exceeded the limit of allowed client calls. Try making the call later.</p>",
+      "error":{"httpStatusCode":400},
+      "exception":true
+    },
+    "ErrorMessage":{"type":"string"},
+    "GetIceServerConfigRequest":{
+      "type":"structure",
+      "required":["ChannelARN"],
+      "members":{
+        "ChannelARN":{
+          "shape":"ResourceARN",
+          "documentation":"<p>The ARN of the signaling channel to be used for the peer-to-peer connection between configured peers. </p>"
+        },
+        "ClientId":{
+          "shape":"ClientId",
+          "documentation":"<p>Unique identifier for the viewer. Must be unique within the signaling channel.</p>"
+        },
+        "Service":{
+          "shape":"Service",
+          "documentation":"<p>Specifies the desired service. Currently, <code>TURN</code> is the only valid value.</p>"
+        },
+        "Username":{
+          "shape":"Username",
+          "documentation":"<p>An optional user ID to be associated with the credentials.</p>"
+        }
+      }
+    },
+    "GetIceServerConfigResponse":{
+      "type":"structure",
+      "members":{
+        "IceServerList":{
+          "shape":"IceServerList",
+          "documentation":"<p>The list of ICE server information objects.</p>"
+        }
+      }
+    },
+    "IceServer":{
+      "type":"structure",
+      "members":{
+        "Uris":{
+          "shape":"Uris",
+          "documentation":"<p>An array of URIs, in the form specified in the <a href=\"https://tools.ietf.org/html/draft-petithuguenin-behave-turn-uris-03\">I-D.petithuguenin-behave-turn-uris</a> spec. These URIs provide the different addresses and/or protocols that can be used to reach the TURN server.</p>"
+        },
+        "Username":{
+          "shape":"Username",
+          "documentation":"<p>A username to login to the ICE server.</p>"
+        },
+        "Password":{
+          "shape":"Password",
+          "documentation":"<p>A password to login to the ICE server.</p>"
+        },
+        "Ttl":{
+          "shape":"Ttl",
+          "documentation":"<p>The period of time, in seconds, during which the username and password are valid.</p>"
+        }
+      },
+      "documentation":"<p>A structure for the ICE server connection data.</p>"
+    },
+    "IceServerList":{
+      "type":"list",
+      "member":{"shape":"IceServer"}
+    },
+    "InvalidArgumentException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p>The value for this input parameter is invalid.</p>",
+      "error":{"httpStatusCode":400},
+      "exception":true
+    },
+    "InvalidClientException":{
+      "type":"structure",
+      "members":{
+        "message":{"shape":"errorMessage"}
+      },
+      "documentation":"<p>The specified client is invalid.</p>",
+      "error":{"httpStatusCode":400},
+      "exception":true
+    },
+    "MessagePayload":{
+      "type":"string",
+      "max":10000,
+      "min":1,
+      "pattern":"[a-zA-Z0-9+/=]+"
+    },
+    "NotAuthorizedException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p>The caller is not authorized to perform this operation.</p>",
+      "error":{"httpStatusCode":401},
+      "exception":true
+    },
+    "Password":{
+      "type":"string",
+      "max":256,
+      "min":1,
+      "pattern":"[a-zA-Z0-9_.-]+"
+    },
+    "ResourceARN":{
+      "type":"string",
+      "max":1024,
+      "min":1,
+      "pattern":"arn:aws:kinesisvideo:[a-z0-9-]+:[0-9]+:[a-z]+/[a-zA-Z0-9_.-]+/[0-9]+"
+    },
+    "ResourceNotFoundException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p>The specified resource is not found.</p>",
+      "error":{"httpStatusCode":404},
+      "exception":true
+    },
+    "SendAlexaOfferToMasterRequest":{
+      "type":"structure",
+      "required":[
+        "ChannelARN",
+        "SenderClientId",
+        "MessagePayload"
+      ],
+      "members":{
+        "ChannelARN":{
+          "shape":"ResourceARN",
+          "documentation":"<p>The ARN of the signaling channel by which Alexa and the master peer communicate.</p>"
+        },
+        "SenderClientId":{
+          "shape":"ClientId",
+          "documentation":"<p>The unique identifier for the sender client.</p>"
+        },
+        "MessagePayload":{
+          "shape":"MessagePayload",
+          "documentation":"<p>The base64-encoded SDP offer content.</p>"
+        }
+      }
+    },
+    "SendAlexaOfferToMasterResponse":{
+      "type":"structure",
+      "members":{
+        "Answer":{
+          "shape":"Answer",
+          "documentation":"<p>The base64-encoded SDP answer content.</p>"
+        }
+      }
+    },
+    "Service":{
+      "type":"string",
+      "enum":["TURN"]
+    },
+    "SessionExpiredException":{
+      "type":"structure",
+      "members":{
+        "message":{"shape":"errorMessage"}
+      },
+      "documentation":"<p>If the client session is expired. Once the client is connected, the session is valid for 45 minutes. Client should reconnect to the channel to continue sending/receiving messages.</p>",
+      "error":{"httpStatusCode":400},
+      "exception":true
+    },
+    "Ttl":{
+      "type":"integer",
+      "max":86400,
+      "min":30
+    },
+    "Uri":{
+      "type":"string",
+      "max":256,
+      "min":1
+    },
+    "Uris":{
+      "type":"list",
+      "member":{"shape":"Uri"}
+    },
+    "Username":{
+      "type":"string",
+      "max":256,
+      "min":1,
+      "pattern":"[a-zA-Z0-9_.-]+"
+    },
+    "errorMessage":{"type":"string"}
+  },
+  "documentation":"<p>Kinesis Video Streams Signaling Service is a intermediate service that establishes a communication channel for discovering peers, transmitting offers and answers in order to establish peer-to-peer connection in webRTC technology.</p>"
+}
diff --git a/services/kms/build.properties b/services/kms/build.properties
index ecf2dae6fcb1..15ec2da1fc71 100644
--- a/services/kms/build.properties
+++ b/services/kms/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/kms/pom.xml b/services/kms/pom.xml
index 7e8c1b62b9e5..9114e045a9e7 100644
--- a/services/kms/pom.xml
+++ b/services/kms/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>kms</artifactId>
     <name>AWS Java SDK :: Services :: AWS KMS</name>
diff --git a/services/kms/src/it/java/software/amazon/awssdk/services/kms/IntegrationTestBase.java b/services/kms/src/it/java/software/amazon/awssdk/services/kms/IntegrationTestBase.java
index db200ea991a1..508299cee80d 100644
--- a/services/kms/src/it/java/software/amazon/awssdk/services/kms/IntegrationTestBase.java
+++ b/services/kms/src/it/java/software/amazon/awssdk/services/kms/IntegrationTestBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/kms/src/it/java/software/amazon/awssdk/services/kms/ServiceIntegrationTest.java b/services/kms/src/it/java/software/amazon/awssdk/services/kms/ServiceIntegrationTest.java
index d4f822612960..eab337e4fd1e 100644
--- a/services/kms/src/it/java/software/amazon/awssdk/services/kms/ServiceIntegrationTest.java
+++ b/services/kms/src/it/java/software/amazon/awssdk/services/kms/ServiceIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/kms/src/main/resources/codegen-resources/service-2.json b/services/kms/src/main/resources/codegen-resources/service-2.json
index 715b236d2f0a..54d175e6c4ef 100755
--- a/services/kms/src/main/resources/codegen-resources/service-2.json
+++ b/services/kms/src/main/resources/codegen-resources/service-2.json
@@ -28,7 +28,7 @@
         {"shape":"KMSInternalException"},
         {"shape":"KMSInvalidStateException"}
       ],
-      "documentation":"<p>Cancels the deletion of a customer master key (CMK). When this operation is successful, the CMK is set to the <code>Disabled</code> state. To enable a CMK, use <a>EnableKey</a>. You cannot perform this operation on a CMK in a different AWS account.</p> <p>For more information about scheduling and canceling deletion of a CMK, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/deleting-keys.html\">Deleting Customer Master Keys</a> in the <i>AWS Key Management Service Developer Guide</i>.</p> <p>The result of this operation varies with the key state of the CMK. For details, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/key-state.html\">How Key State Affects Use of a Customer Master Key</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
+      "documentation":"<p>Cancels the deletion of a customer master key (CMK). When this operation succeeds, the key state of the CMK is <code>Disabled</code>. To enable the CMK, use <a>EnableKey</a>. You cannot perform this operation on a CMK in a different AWS account.</p> <p>For more information about scheduling and canceling deletion of a CMK, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/deleting-keys.html\">Deleting Customer Master Keys</a> in the <i>AWS Key Management Service Developer Guide</i>.</p> <p>The CMK that you use for this operation must be in a compatible key state. For details, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/key-state.html\">How Key State Affects Use of a Customer Master Key</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
     },
     "ConnectCustomKeyStore":{
       "name":"ConnectCustomKeyStore",
@@ -45,7 +45,7 @@
         {"shape":"KMSInternalException"},
         {"shape":"CloudHsmClusterInvalidConfigurationException"}
       ],
-      "documentation":"<p>Connects or reconnects a <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/custom-key-store-overview.html\">custom key store</a> to its associated AWS CloudHSM cluster.</p> <p>The custom key store must be connected before you can create customer master keys (CMKs) in the key store or use the CMKs it contains. You can disconnect and reconnect a custom key store at any time.</p> <p>To connect a custom key store, its associated AWS CloudHSM cluster must have at least one active HSM. To get the number of active HSMs in a cluster, use the <a href=\"https://docs.aws.amazon.com/cloudhsm/latest/APIReference/API_DescribeClusters.html\">DescribeClusters</a> operation. To add HSMs to the cluster, use the <a href=\"https://docs.aws.amazon.com/cloudhsm/latest/APIReference/API_CreateHsm.html\">CreateHsm</a> operation.</p> <p>The connection process can take an extended amount of time to complete; up to 20 minutes. This operation starts the connection process, but it does not wait for it to complete. When it succeeds, this operation quickly returns an HTTP 200 response and a JSON object with no properties. However, this response does not indicate that the custom key store is connected. To get the connection state of the custom key store, use the <a>DescribeCustomKeyStores</a> operation.</p> <p>During the connection process, AWS KMS finds the AWS CloudHSM cluster that is associated with the custom key store, creates the connection infrastructure, connects to the cluster, logs into the AWS CloudHSM client as the <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/key-store-concepts.html#concept-kmsuser\"> <code>kmsuser</code> crypto user</a> (CU), and rotates its password.</p> <p>The <code>ConnectCustomKeyStore</code> operation might fail for various reasons. To find the reason, use the <a>DescribeCustomKeyStores</a> operation and see the <code>ConnectionErrorCode</code> in the response. For help interpreting the <code>ConnectionErrorCode</code>, see <a>CustomKeyStoresListEntry</a>.</p> <p>To fix the failure, use the <a>DisconnectCustomKeyStore</a> operation to disconnect the custom key store, correct the error, use the <a>UpdateCustomKeyStore</a> operation if necessary, and then use <code>ConnectCustomKeyStore</code> again.</p> <p>If you are having trouble connecting or disconnecting a custom key store, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/fix-keystore.html\">Troubleshooting a Custom Key Store</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
+      "documentation":"<p>Connects or reconnects a <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/custom-key-store-overview.html\">custom key store</a> to its associated AWS CloudHSM cluster.</p> <p>The custom key store must be connected before you can create customer master keys (CMKs) in the key store or use the CMKs it contains. You can disconnect and reconnect a custom key store at any time.</p> <p>To connect a custom key store, its associated AWS CloudHSM cluster must have at least one active HSM. To get the number of active HSMs in a cluster, use the <a href=\"https://docs.aws.amazon.com/cloudhsm/latest/APIReference/API_DescribeClusters.html\">DescribeClusters</a> operation. To add HSMs to the cluster, use the <a href=\"https://docs.aws.amazon.com/cloudhsm/latest/APIReference/API_CreateHsm.html\">CreateHsm</a> operation. Also, the <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/key-store-concepts.html#concept-kmsuser\"> <code>kmsuser</code> crypto user</a> (CU) must not be logged into the cluster. This prevents AWS KMS from using this account to log in.</p> <p>The connection process can take an extended amount of time to complete; up to 20 minutes. This operation starts the connection process, but it does not wait for it to complete. When it succeeds, this operation quickly returns an HTTP 200 response and a JSON object with no properties. However, this response does not indicate that the custom key store is connected. To get the connection state of the custom key store, use the <a>DescribeCustomKeyStores</a> operation.</p> <p>During the connection process, AWS KMS finds the AWS CloudHSM cluster that is associated with the custom key store, creates the connection infrastructure, connects to the cluster, logs into the AWS CloudHSM client as the <code>kmsuser</code> CU, and rotates its password.</p> <p>The <code>ConnectCustomKeyStore</code> operation might fail for various reasons. To find the reason, use the <a>DescribeCustomKeyStores</a> operation and see the <code>ConnectionErrorCode</code> in the response. For help interpreting the <code>ConnectionErrorCode</code>, see <a>CustomKeyStoresListEntry</a>.</p> <p>To fix the failure, use the <a>DisconnectCustomKeyStore</a> operation to disconnect the custom key store, correct the error, use the <a>UpdateCustomKeyStore</a> operation if necessary, and then use <code>ConnectCustomKeyStore</code> again.</p> <p>If you are having trouble connecting or disconnecting a custom key store, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/fix-keystore.html\">Troubleshooting a Custom Key Store</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
     },
     "CreateAlias":{
       "name":"CreateAlias",
@@ -63,7 +63,7 @@
         {"shape":"LimitExceededException"},
         {"shape":"KMSInvalidStateException"}
       ],
-      "documentation":"<p>Creates a display name for a customer managed customer master key (CMK). You can use an alias to identify a CMK in selected operations, such as <a>Encrypt</a> and <a>GenerateDataKey</a>. </p> <p>Each CMK can have multiple aliases, but each alias points to only one CMK. The alias name must be unique in the AWS account and region. To simplify code that runs in multiple regions, use the same alias name, but point it to a different CMK in each region. </p> <p>Because an alias is not a property of a CMK, you can delete and change the aliases of a CMK without affecting the CMK. Also, aliases do not appear in the response from the <a>DescribeKey</a> operation. To get the aliases of all CMKs, use the <a>ListAliases</a> operation.</p> <p>The alias name must begin with <code>alias/</code> followed by a name, such as <code>alias/ExampleAlias</code>. It can contain only alphanumeric characters, forward slashes (/), underscores (_), and dashes (-). The alias name cannot begin with <code>alias/aws/</code>. The <code>alias/aws/</code> prefix is reserved for <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#aws-managed-cmk\">AWS managed CMKs</a>. </p> <p>The alias and the CMK it is mapped to must be in the same AWS account and the same region. You cannot perform this operation on an alias in a different AWS account.</p> <p>To map an existing alias to a different CMK, call <a>UpdateAlias</a>.</p> <p>The result of this operation varies with the key state of the CMK. For details, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/key-state.html\">How Key State Affects Use of a Customer Master Key</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
+      "documentation":"<p>Creates a display name for a customer managed customer master key (CMK). You can use an alias to identify a CMK in cryptographic operations, such as <a>Encrypt</a> and <a>GenerateDataKey</a>. You can change the CMK associated with the alias at any time.</p> <p>Aliases are easier to remember than key IDs. They can also help to simplify your applications. For example, if you use an alias in your code, you can change the CMK your code uses by associating a given alias with a different CMK. </p> <p>To run the same code in multiple AWS regions, use an alias in your code, such as <code>alias/ApplicationKey</code>. Then, in each AWS Region, create an <code>alias/ApplicationKey</code> alias that is associated with a CMK in that Region. When you run your code, it uses the <code>alias/ApplicationKey</code> CMK for that AWS Region without any Region-specific code.</p> <p>This operation does not return a response. To get the alias that you created, use the <a>ListAliases</a> operation.</p> <p>To use aliases successfully, be aware of the following information.</p> <ul> <li> <p>Each alias points to only one CMK at a time, although a single CMK can have multiple aliases. The alias and its associated CMK must be in the same AWS account and Region. </p> </li> <li> <p>You can associate an alias with any customer managed CMK in the same AWS account and Region. However, you do not have permission to associate an alias with an <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#aws-managed-cmk\">AWS managed CMK</a> or an <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#aws-owned-cmk\">AWS owned CMK</a>. </p> </li> <li> <p>To change the CMK associated with an alias, use the <a>UpdateAlias</a> operation. The current CMK and the new CMK must be the same type (both symmetric or both asymmetric) and they must have the same key usage (<code>ENCRYPT_DECRYPT</code> or <code>SIGN_VERIFY</code>). This restriction prevents cryptographic errors in code that uses aliases.</p> </li> <li> <p>The alias name must begin with <code>alias/</code> followed by a name, such as <code>alias/ExampleAlias</code>. It can contain only alphanumeric characters, forward slashes (/), underscores (_), and dashes (-). The alias name cannot begin with <code>alias/aws/</code>. The <code>alias/aws/</code> prefix is reserved for <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#aws-managed-cmk\">AWS managed CMKs</a>. </p> </li> <li> <p>The alias name must be unique within an AWS Region. However, you can use the same alias name in multiple Regions of the same AWS account. Each instance of the alias is associated with a CMK in its Region.</p> </li> <li> <p>After you create an alias, you cannot change its alias name. However, you can use the <a>DeleteAlias</a> operation to delete the alias and then create a new alias with the desired name.</p> </li> <li> <p>You can use an alias name or alias ARN to identify a CMK in AWS KMS cryptographic operations and in the <a>DescribeKey</a> operation. However, you cannot use alias names or alias ARNs in API operations that manage CMKs, such as <a>DisableKey</a> or <a>GetKeyPolicy</a>. For information about the valid CMK identifiers for each AWS KMS API operation, see the descriptions of the <code>KeyId</code> parameter in the API operation documentation.</p> </li> </ul> <p>Because an alias is not a property of a CMK, you can delete and change the aliases of a CMK without affecting the CMK. Also, aliases do not appear in the response from the <a>DescribeKey</a> operation. To get the aliases and alias ARNs of CMKs in each AWS account and Region, use the <a>ListAliases</a> operation.</p> <p>The CMK that you use for this operation must be in a compatible key state. For details, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/key-state.html\">How Key State Affects Use of a Customer Master Key</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
     },
     "CreateCustomKeyStore":{
       "name":"CreateCustomKeyStore",
@@ -102,7 +102,7 @@
         {"shape":"LimitExceededException"},
         {"shape":"KMSInvalidStateException"}
       ],
-      "documentation":"<p>Adds a grant to a customer master key (CMK). The grant allows the grantee principal to use the CMK when the conditions specified in the grant are met. When setting permissions, grants are an alternative to key policies. </p> <p>To create a grant that allows a cryptographic operation only when the encryption context in the operation request matches or includes a specified encryption context, use the <code>Constraints</code> parameter. For details, see <a>GrantConstraints</a>.</p> <p>To perform this operation on a CMK in a different AWS account, specify the key ARN in the value of the <code>KeyId</code> parameter. For more information about grants, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/grants.html\">Grants</a> in the <i> <i>AWS Key Management Service Developer Guide</i> </i>.</p> <p>The result of this operation varies with the key state of the CMK. For details, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/key-state.html\">How Key State Affects Use of a Customer Master Key</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
+      "documentation":"<p>Adds a grant to a customer master key (CMK). The grant allows the grantee principal to use the CMK when the conditions specified in the grant are met. When setting permissions, grants are an alternative to key policies. </p> <p>To create a grant that allows a cryptographic operation only when the request includes a particular <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#encrypt_context\">encryption context</a>, use the <code>Constraints</code> parameter. For details, see <a>GrantConstraints</a>.</p> <p>You can create grants on symmetric and asymmetric CMKs. However, if the grant allows an operation that the CMK does not support, <code>CreateGrant</code> fails with a <code>ValidationException</code>. </p> <ul> <li> <p>Grants for symmetric CMKs cannot allow operations that are not supported for symmetric CMKs, including <a>Sign</a>, <a>Verify</a>, and <a>GetPublicKey</a>. (There are limited exceptions to this rule for legacy operations, but you should not create a grant for an operation that AWS KMS does not support.)</p> </li> <li> <p>Grants for asymmetric CMKs cannot allow operations that are not supported for asymmetric CMKs, including operations that <a href=\"https://docs.aws.amazon.com/kms/latest/APIReference/API_GenerateDataKey\">generate data keys</a> or <a href=\"https://docs.aws.amazon.com/kms/latest/APIReference/API_GenerateDataKeyPair\">data key pairs</a>, or operations related to <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/rotate-keys.html\">automatic key rotation</a>, <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/importing-keys.html\">imported key material</a>, or CMKs in <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/custom-key-store-overview.html\">custom key stores</a>.</p> </li> <li> <p>Grants for asymmetric CMKs with a <code>KeyUsage</code> of <code>ENCRYPT_DECRYPT</code> cannot allow the <a>Sign</a> or <a>Verify</a> operations. Grants for asymmetric CMKs with a <code>KeyUsage</code> of <code>SIGN_VERIFY</code> cannot allow the <a>Encrypt</a> or <a>Decrypt</a> operations.</p> </li> <li> <p>Grants for asymmetric CMKs cannot include an encryption context grant constraint. An encryption context is not supported on asymmetric CMKs.</p> </li> </ul> <p>For information about symmetric and asymmetric CMKs, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/symmetric-asymmetric.html\">Using Symmetric and Asymmetric CMKs</a> in the <i>AWS Key Management Service Developer Guide</i>.</p> <p>To perform this operation on a CMK in a different AWS account, specify the key ARN in the value of the <code>KeyId</code> parameter. For more information about grants, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/grants.html\">Grants</a> in the <i> <i>AWS Key Management Service Developer Guide</i> </i>.</p> <p>The CMK that you use for this operation must be in a compatible key state. For details, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/key-state.html\">How Key State Affects Use of a Customer Master Key</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
     },
     "CreateKey":{
       "name":"CreateKey",
@@ -124,7 +124,7 @@
         {"shape":"CustomKeyStoreInvalidStateException"},
         {"shape":"CloudHsmClusterInvalidConfigurationException"}
       ],
-      "documentation":"<p>Creates a customer managed <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#master_keys\">customer master key</a> (CMK) in your AWS account.</p> <p>You can use a CMK to encrypt small amounts of data (up to 4096 bytes) directly. But CMKs are more commonly used to encrypt the <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#data-keys\">data keys</a> that are used to encrypt data.</p> <p>To create a CMK for imported key material, use the <code>Origin</code> parameter with a value of <code>EXTERNAL</code>.</p> <p>To create a CMK in a <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/custom-key-store-overview.html\">custom key store</a>, use the <code>CustomKeyStoreId</code> parameter to specify the custom key store. You must also use the <code>Origin</code> parameter with a value of <code>AWS_CLOUDHSM</code>. The AWS CloudHSM cluster that is associated with the custom key store must have at least two active HSMs in different Availability Zones in the AWS Region.</p> <p>You cannot use this operation to create a CMK in a different AWS account.</p>"
+      "documentation":"<p>Creates a unique customer managed <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#master-keys\">customer master key</a> (CMK) in your AWS account and Region. You cannot use this operation to create a CMK in a different AWS account.</p> <p>You can use the <code>CreateKey</code> operation to create symmetric or asymmetric CMKs.</p> <ul> <li> <p> <b>Symmetric CMKs</b> contain a 256-bit symmetric key that never leaves AWS KMS unencrypted. To use the CMK, you must call AWS KMS. You can use a symmetric CMK to encrypt and decrypt small amounts of data, but they are typically used to generate <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#data-keys\">data keys</a> and <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#data-key-pairs\">data keys pairs</a>. For details, see <a>GenerateDataKey</a> and <a>GenerateDataKeyPair</a>.</p> </li> <li> <p> <b>Asymmetric CMKs</b> can contain an RSA key pair or an Elliptic Curve (ECC) key pair. The private key in an asymmetric CMK never leaves AWS KMS unencrypted. However, you can use the <a>GetPublicKey</a> operation to download the public key so it can be used outside of AWS KMS. CMKs with RSA key pairs can be used to encrypt or decrypt data or sign and verify messages (but not both). CMKs with ECC key pairs can be used only to sign and verify messages.</p> </li> </ul> <p>For information about symmetric and asymmetric CMKs, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/symmetric-asymmetric.html\">Using Symmetric and Asymmetric CMKs</a> in the <i>AWS Key Management Service Developer Guide</i>.</p> <p>To create different types of CMKs, use the following guidance:</p> <dl> <dt>Asymmetric CMKs</dt> <dd> <p>To create an asymmetric CMK, use the <code>CustomerMasterKeySpec</code> parameter to specify the type of key material in the CMK. Then, use the <code>KeyUsage</code> parameter to determine whether the CMK will be used to encrypt and decrypt or sign and verify. You can't change these properties after the CMK is created.</p> <p> </p> </dd> <dt>Symmetric CMKs</dt> <dd> <p>When creating a symmetric CMK, you don't need to specify the <code>CustomerMasterKeySpec</code> or <code>KeyUsage</code> parameters. The default value for <code>CustomerMasterKeySpec</code>, <code>SYMMETRIC_DEFAULT</code>, and the default value for <code>KeyUsage</code>, <code>ENCRYPT_DECRYPT</code>, are the only valid values for symmetric CMKs. </p> <p> </p> </dd> <dt>Imported Key Material</dt> <dd> <p>To import your own key material, begin by creating a symmetric CMK with no key material. To do this, use the <code>Origin</code> parameter of <code>CreateKey</code> with a value of <code>EXTERNAL</code>. Next, use <a>GetParametersForImport</a> operation to get a public key and import token, and use the public key to encrypt your key material. Then, use <a>ImportKeyMaterial</a> with your import token to import the key material. For step-by-step instructions, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/importing-keys.html\">Importing Key Material</a> in the <i> <i>AWS Key Management Service Developer Guide</i> </i>. You cannot import the key material into an asymmetric CMK.</p> <p> </p> </dd> <dt>Custom Key Stores</dt> <dd> <p>To create a symmetric CMK in a <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/custom-key-store-overview.html\">custom key store</a>, use the <code>CustomKeyStoreId</code> parameter to specify the custom key store. You must also use the <code>Origin</code> parameter with a value of <code>AWS_CLOUDHSM</code>. The AWS CloudHSM cluster that is associated with the custom key store must have at least two active HSMs in different Availability Zones in the AWS Region. </p> <p>You cannot create an asymmetric CMK in a custom key store. For information about custom key stores in AWS KMS see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/custom-key-store-overview.html\">Using Custom Key Stores</a> in the <i> <i>AWS Key Management Service Developer Guide</i> </i>.</p> </dd> </dl>"
     },
     "Decrypt":{
       "name":"Decrypt",
@@ -139,12 +139,14 @@
         {"shape":"DisabledException"},
         {"shape":"InvalidCiphertextException"},
         {"shape":"KeyUnavailableException"},
+        {"shape":"IncorrectKeyException"},
+        {"shape":"InvalidKeyUsageException"},
         {"shape":"DependencyTimeoutException"},
         {"shape":"InvalidGrantTokenException"},
         {"shape":"KMSInternalException"},
         {"shape":"KMSInvalidStateException"}
       ],
-      "documentation":"<p>Decrypts ciphertext. Ciphertext is plaintext that has been previously encrypted by using any of the following operations:</p> <ul> <li> <p> <a>GenerateDataKey</a> </p> </li> <li> <p> <a>GenerateDataKeyWithoutPlaintext</a> </p> </li> <li> <p> <a>Encrypt</a> </p> </li> </ul> <p>Whenever possible, use key policies to give users permission to call the Decrypt operation on the CMK, instead of IAM policies. Otherwise, you might create an IAM user policy that gives the user Decrypt permission on all CMKs. This user could decrypt ciphertext that was encrypted by CMKs in other accounts if the key policy for the cross-account CMK permits it. If you must use an IAM policy for <code>Decrypt</code> permissions, limit the user to particular CMKs or particular trusted accounts.</p> <p>The result of this operation varies with the key state of the CMK. For details, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/key-state.html\">How Key State Affects Use of a Customer Master Key</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
+      "documentation":"<p>Decrypts ciphertext that was encrypted by a AWS KMS customer master key (CMK) using any of the following operations:</p> <ul> <li> <p> <a>Encrypt</a> </p> </li> <li> <p> <a>GenerateDataKey</a> </p> </li> <li> <p> <a>GenerateDataKeyPair</a> </p> </li> <li> <p> <a>GenerateDataKeyWithoutPlaintext</a> </p> </li> <li> <p> <a>GenerateDataKeyPairWithoutPlaintext</a> </p> </li> </ul> <p>You can use this operation to decrypt ciphertext that was encrypted under a symmetric or asymmetric CMK. When the CMK is asymmetric, you must specify the CMK and the encryption algorithm that was used to encrypt the ciphertext. For information about symmetric and asymmetric CMKs, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/symmetric-asymmetric.html\">Using Symmetric and Asymmetric CMKs</a> in the <i>AWS Key Management Service Developer Guide</i>.</p> <p>The Decrypt operation also decrypts ciphertext that was encrypted outside of AWS KMS by the public key in an AWS KMS asymmetric CMK. However, it cannot decrypt ciphertext produced by other libraries, such as the <a href=\"https://docs.aws.amazon.com/encryption-sdk/latest/developer-guide/\">AWS Encryption SDK</a> or <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/UsingClientSideEncryption.html\">Amazon S3 client-side encryption</a>. These libraries return a ciphertext format that is incompatible with AWS KMS.</p> <p>If the ciphertext was encrypted under a symmetric CMK, you do not need to specify the CMK or the encryption algorithm. AWS KMS can get this information from metadata that it adds to the symmetric ciphertext blob. However, if you prefer, you can specify the <code>KeyId</code> to ensure that a particular CMK is used to decrypt the ciphertext. If you specify a different CMK than the one used to encrypt the ciphertext, the <code>Decrypt</code> operation fails.</p> <p>Whenever possible, use key policies to give users permission to call the Decrypt operation on a particular CMK, instead of using IAM policies. Otherwise, you might create an IAM user policy that gives the user Decrypt permission on all CMKs. This user could decrypt ciphertext that was encrypted by CMKs in other accounts if the key policy for the cross-account CMK permits it. If you must use an IAM policy for <code>Decrypt</code> permissions, limit the user to particular CMKs or particular trusted accounts.</p> <p>The CMK that you use for this operation must be in a compatible key state. For details, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/key-state.html\">How Key State Affects Use of a Customer Master Key</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
     },
     "DeleteAlias":{
       "name":"DeleteAlias",
@@ -192,7 +194,7 @@
         {"shape":"KMSInternalException"},
         {"shape":"KMSInvalidStateException"}
       ],
-      "documentation":"<p>Deletes key material that you previously imported. This operation makes the specified customer master key (CMK) unusable. For more information about importing key material into AWS KMS, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/importing-keys.html\">Importing Key Material</a> in the <i>AWS Key Management Service Developer Guide</i>. You cannot perform this operation on a CMK in a different AWS account.</p> <p>When the specified CMK is in the <code>PendingDeletion</code> state, this operation does not change the CMK's state. Otherwise, it changes the CMK's state to <code>PendingImport</code>.</p> <p>After you delete key material, you can use <a>ImportKeyMaterial</a> to reimport the same key material into the CMK.</p> <p>The result of this operation varies with the key state of the CMK. For details, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/key-state.html\">How Key State Affects Use of a Customer Master Key</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
+      "documentation":"<p>Deletes key material that you previously imported. This operation makes the specified customer master key (CMK) unusable. For more information about importing key material into AWS KMS, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/importing-keys.html\">Importing Key Material</a> in the <i>AWS Key Management Service Developer Guide</i>. You cannot perform this operation on a CMK in a different AWS account.</p> <p>When the specified CMK is in the <code>PendingDeletion</code> state, this operation does not change the CMK's state. Otherwise, it changes the CMK's state to <code>PendingImport</code>.</p> <p>After you delete key material, you can use <a>ImportKeyMaterial</a> to reimport the same key material into the CMK.</p> <p>The CMK that you use for this operation must be in a compatible key state. For details, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/key-state.html\">How Key State Affects Use of a Customer Master Key</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
     },
     "DescribeCustomKeyStores":{
       "name":"DescribeCustomKeyStores",
@@ -222,7 +224,7 @@
         {"shape":"DependencyTimeoutException"},
         {"shape":"KMSInternalException"}
       ],
-      "documentation":"<p>Provides detailed information about the specified customer master key (CMK).</p> <p>You can use <code>DescribeKey</code> on a predefined AWS alias, that is, an AWS alias with no key ID. When you do, AWS KMS associates the alias with an <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#master_keys\">AWS managed CMK</a> and returns its <code>KeyId</code> and <code>Arn</code> in the response.</p> <p>To perform this operation on a CMK in a different AWS account, specify the key ARN or alias ARN in the value of the KeyId parameter.</p>"
+      "documentation":"<p>Provides detailed information about a customer master key (CMK). You can run <code>DescribeKey</code> on a <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#customer-cmk\">customer managed CMK</a> or an <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#aws-managed-cmk\">AWS managed CMK</a>.</p> <p>This detailed information includes the key ARN, creation date (and deletion date, if applicable), the key state, and the origin and expiration date (if any) of the key material. For CMKs in custom key stores, it includes information about the custom key store, such as the key store ID and the AWS CloudHSM cluster ID. It includes fields, like <code>KeySpec</code>, that help you distinguish symmetric from asymmetric CMKs. It also provides information that is particularly important to asymmetric CMKs, such as the key usage (encryption or signing) and the encryption algorithms or signing algorithms that the CMK supports.</p> <p> <code>DescribeKey</code> does not return the following information:</p> <ul> <li> <p>Aliases associated with the CMK. To get this information, use <a>ListAliases</a>.</p> </li> <li> <p>Whether automatic key rotation is enabled on the CMK. To get this information, use <a>GetKeyRotationStatus</a>. Also, some key states prevent a CMK from being automatically rotated. For details, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/rotate-keys.html#rotate-keys-how-it-works\">How Automatic Key Rotation Works</a> in <i>AWS Key Management Service Developer Guide</i>.</p> </li> <li> <p>Tags on the CMK. To get this information, use <a>ListResourceTags</a>.</p> </li> <li> <p>Key policies and grants on the CMK. To get this information, use <a>GetKeyPolicy</a> and <a>ListGrants</a>.</p> </li> </ul> <p>If you call the <code>DescribeKey</code> operation on a <i>predefined AWS alias</i>, that is, an AWS alias with no key ID, AWS KMS creates an <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#master_keys\">AWS managed CMK</a>. Then, it associates the alias with the new CMK, and returns the <code>KeyId</code> and <code>Arn</code> of the new CMK in the response.</p> <p>To perform this operation on a CMK in a different AWS account, specify the key ARN or alias ARN in the value of the KeyId parameter.</p>"
     },
     "DisableKey":{
       "name":"DisableKey",
@@ -238,7 +240,7 @@
         {"shape":"KMSInternalException"},
         {"shape":"KMSInvalidStateException"}
       ],
-      "documentation":"<p>Sets the state of a customer master key (CMK) to disabled, thereby preventing its use for cryptographic operations. You cannot perform this operation on a CMK in a different AWS account.</p> <p>For more information about how key state affects the use of a CMK, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/key-state.html\">How Key State Affects the Use of a Customer Master Key</a> in the <i> <i>AWS Key Management Service Developer Guide</i> </i>.</p> <p>The result of this operation varies with the key state of the CMK. For details, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/key-state.html\">How Key State Affects Use of a Customer Master Key</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
+      "documentation":"<p>Sets the state of a customer master key (CMK) to disabled, thereby preventing its use for cryptographic operations. You cannot perform this operation on a CMK in a different AWS account.</p> <p>For more information about how key state affects the use of a CMK, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/key-state.html\">How Key State Affects the Use of a Customer Master Key</a> in the <i> <i>AWS Key Management Service Developer Guide</i> </i>.</p> <p>The CMK that you use for this operation must be in a compatible key state. For details, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/key-state.html\">How Key State Affects Use of a Customer Master Key</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
     },
     "DisableKeyRotation":{
       "name":"DisableKeyRotation",
@@ -256,7 +258,7 @@
         {"shape":"KMSInvalidStateException"},
         {"shape":"UnsupportedOperationException"}
       ],
-      "documentation":"<p>Disables <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/rotate-keys.html\">automatic rotation of the key material</a> for the specified customer master key (CMK). You cannot perform this operation on a CMK in a different AWS account.</p> <p>The result of this operation varies with the key state of the CMK. For details, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/key-state.html\">How Key State Affects Use of a Customer Master Key</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
+      "documentation":"<p>Disables <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/rotate-keys.html\">automatic rotation of the key material</a> for the specified symmetric customer master key (CMK).</p> <p> You cannot enable automatic rotation of asymmetric CMKs, CMKs with imported key material, or CMKs in a <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/custom-key-store-overview.html\">custom key store</a>. You cannot perform this operation on a CMK in a different AWS account.</p> <p>The CMK that you use for this operation must be in a compatible key state. For details, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/key-state.html\">How Key State Affects Use of a Customer Master Key</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
     },
     "DisconnectCustomKeyStore":{
       "name":"DisconnectCustomKeyStore",
@@ -288,7 +290,7 @@
         {"shape":"LimitExceededException"},
         {"shape":"KMSInvalidStateException"}
       ],
-      "documentation":"<p>Sets the key state of a customer master key (CMK) to enabled. This allows you to use the CMK for cryptographic operations. You cannot perform this operation on a CMK in a different AWS account.</p> <p>The result of this operation varies with the key state of the CMK. For details, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/key-state.html\">How Key State Affects Use of a Customer Master Key</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
+      "documentation":"<p>Sets the key state of a customer master key (CMK) to enabled. This allows you to use the CMK for cryptographic operations. You cannot perform this operation on a CMK in a different AWS account.</p> <p>The CMK that you use for this operation must be in a compatible key state. For details, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/key-state.html\">How Key State Affects Use of a Customer Master Key</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
     },
     "EnableKeyRotation":{
       "name":"EnableKeyRotation",
@@ -306,7 +308,7 @@
         {"shape":"KMSInvalidStateException"},
         {"shape":"UnsupportedOperationException"}
       ],
-      "documentation":"<p>Enables <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/rotate-keys.html\">automatic rotation of the key material</a> for the specified customer master key (CMK). You cannot perform this operation on a CMK in a different AWS account.</p> <p>You cannot enable automatic rotation of CMKs with imported key material or CMKs in a <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/custom-key-store-overview.html\">custom key store</a>.</p> <p>The result of this operation varies with the key state of the CMK. For details, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/key-state.html\">How Key State Affects Use of a Customer Master Key</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
+      "documentation":"<p>Enables <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/rotate-keys.html\">automatic rotation of the key material</a> for the specified symmetric customer master key (CMK). You cannot perform this operation on a CMK in a different AWS account.</p> <p>You cannot enable automatic rotation of asymmetric CMKs, CMKs with imported key material, or CMKs in a <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/custom-key-store-overview.html\">custom key store</a>.</p> <p>The CMK that you use for this operation must be in a compatible key state. For details, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/key-state.html\">How Key State Affects Use of a Customer Master Key</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
     },
     "Encrypt":{
       "name":"Encrypt",
@@ -326,7 +328,7 @@
         {"shape":"KMSInternalException"},
         {"shape":"KMSInvalidStateException"}
       ],
-      "documentation":"<p>Encrypts plaintext into ciphertext by using a customer master key (CMK). The <code>Encrypt</code> operation has two primary use cases:</p> <ul> <li> <p>You can encrypt up to 4 kilobytes (4096 bytes) of arbitrary data such as an RSA key, a database password, or other sensitive information.</p> </li> <li> <p>You can use the <code>Encrypt</code> operation to move encrypted data from one AWS region to another. In the first region, generate a data key and use the plaintext key to encrypt the data. Then, in the new region, call the <code>Encrypt</code> method on same plaintext data key. Now, you can safely move the encrypted data and encrypted data key to the new region, and decrypt in the new region when necessary.</p> </li> </ul> <p>You don't need use this operation to encrypt a data key within a region. The <a>GenerateDataKey</a> and <a>GenerateDataKeyWithoutPlaintext</a> operations return an encrypted data key.</p> <p>Also, you don't need to use this operation to encrypt data in your application. You can use the plaintext and encrypted data keys that the <code>GenerateDataKey</code> operation returns.</p> <p>The result of this operation varies with the key state of the CMK. For details, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/key-state.html\">How Key State Affects Use of a Customer Master Key</a> in the <i>AWS Key Management Service Developer Guide</i>.</p> <p>To perform this operation on a CMK in a different AWS account, specify the key ARN or alias ARN in the value of the KeyId parameter.</p>"
+      "documentation":"<p>Encrypts plaintext into ciphertext by using a customer master key (CMK). The <code>Encrypt</code> operation has two primary use cases:</p> <ul> <li> <p>You can encrypt small amounts of arbitrary data, such as a personal identifier or database password, or other sensitive information. </p> </li> <li> <p>You can use the <code>Encrypt</code> operation to move encrypted data from one AWS region to another. In the first region, generate a data key and use the plaintext key to encrypt the data. Then, in the new region, call the <code>Encrypt</code> method on same plaintext data key. Now, you can safely move the encrypted data and encrypted data key to the new region, and decrypt in the new region when necessary.</p> </li> </ul> <p>You don't need to use the <code>Encrypt</code> operation to encrypt a data key. The <a>GenerateDataKey</a> and <a>GenerateDataKeyPair</a> operations return a plaintext data key and an encrypted copy of that data key.</p> <p>When you encrypt data, you must specify a symmetric or asymmetric CMK to use in the encryption operation. The CMK must have a <code>KeyUsage</code> value of <code>ENCRYPT_DECRYPT.</code> To find the <code>KeyUsage</code> of a CMK, use the <a>DescribeKey</a> operation. </p> <p>If you use a symmetric CMK, you can use an encryption context to add additional security to your encryption operation. If you specify an <code>EncryptionContext</code> when encrypting data, you must specify the same encryption context (a case-sensitive exact match) when decrypting the data. Otherwise, the request to decrypt fails with an <code>InvalidCiphertextException</code>. For more information, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#encrypt_context\">Encryption Context</a> in the <i>AWS Key Management Service Developer Guide</i>.</p> <p>If you specify an asymmetric CMK, you must also specify the encryption algorithm. The algorithm must be compatible with the CMK type.</p> <important> <p>When you use an asymmetric CMK to encrypt or reencrypt data, be sure to record the CMK and encryption algorithm that you choose. You will be required to provide the same CMK and encryption algorithm when you decrypt the data. If the CMK and algorithm do not match the values used to encrypt the data, the decrypt operation fails.</p> <p>You are not required to supply the CMK ID and encryption algorithm when you decrypt with symmetric CMKs because AWS KMS stores this information in the ciphertext blob. AWS KMS cannot store metadata in ciphertext generated with asymmetric keys. The standard format for asymmetric key ciphertext does not include configurable fields.</p> </important> <p>The maximum size of the data that you can encrypt varies with the type of CMK and the encryption algorithm that you choose.</p> <ul> <li> <p>Symmetric CMKs</p> <ul> <li> <p> <code>SYMMETRIC_DEFAULT</code>: 4096 bytes</p> </li> </ul> </li> <li> <p> <code>RSA_2048</code> </p> <ul> <li> <p> <code>RSAES_OAEP_SHA_1</code>: 214 bytes</p> </li> <li> <p> <code>RSAES_OAEP_SHA_256</code>: 190 bytes</p> </li> </ul> </li> <li> <p> <code>RSA_3072</code> </p> <ul> <li> <p> <code>RSAES_OAEP_SHA_1</code>: 342 bytes</p> </li> <li> <p> <code>RSAES_OAEP_SHA_256</code>: 318 bytes</p> </li> </ul> </li> <li> <p> <code>RSA_4096</code> </p> <ul> <li> <p> <code>RSAES_OAEP_SHA_1</code>: 470 bytes</p> </li> <li> <p> <code>RSAES_OAEP_SHA_256</code>: 446 bytes</p> </li> </ul> </li> </ul> <p>The CMK that you use for this operation must be in a compatible key state. For details, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/key-state.html\">How Key State Affects Use of a Customer Master Key</a> in the <i>AWS Key Management Service Developer Guide</i>.</p> <p>To perform this operation on a CMK in a different AWS account, specify the key ARN or alias ARN in the value of the KeyId parameter.</p>"
     },
     "GenerateDataKey":{
       "name":"GenerateDataKey",
@@ -346,7 +348,47 @@
         {"shape":"KMSInternalException"},
         {"shape":"KMSInvalidStateException"}
       ],
-      "documentation":"<p>Generates a unique data key. This operation returns a plaintext copy of the data key and a copy that is encrypted under a customer master key (CMK) that you specify. You can use the plaintext key to encrypt your data outside of KMS and store the encrypted data key with the encrypted data.</p> <p> <code>GenerateDataKey</code> returns a unique data key for each request. The bytes in the key are not related to the caller or CMK that is used to encrypt the data key.</p> <p>To generate a data key, you need to specify the customer master key (CMK) that will be used to encrypt the data key. You must also specify the length of the data key using either the <code>KeySpec</code> or <code>NumberOfBytes</code> field (but not both). For common key lengths (128-bit and 256-bit symmetric keys), we recommend that you use <code>KeySpec</code>. To perform this operation on a CMK in a different AWS account, specify the key ARN or alias ARN in the value of the KeyId parameter.</p> <p>You will find the plaintext copy of the data key in the <code>Plaintext</code> field of the response, and the encrypted copy of the data key in the <code>CiphertextBlob</code> field.</p> <p>We recommend that you use the following pattern to encrypt data locally in your application:</p> <ol> <li> <p>Use the <code>GenerateDataKey</code> operation to get a data encryption key.</p> </li> <li> <p>Use the plaintext data key (returned in the <code>Plaintext</code> field of the response) to encrypt data locally, then erase the plaintext data key from memory.</p> </li> <li> <p>Store the encrypted data key (returned in the <code>CiphertextBlob</code> field of the response) alongside the locally encrypted data.</p> </li> </ol> <p>To decrypt data locally:</p> <ol> <li> <p>Use the <a>Decrypt</a> operation to decrypt the encrypted data key. The operation returns a plaintext copy of the data key.</p> </li> <li> <p>Use the plaintext data key to decrypt data locally, then erase the plaintext data key from memory.</p> </li> </ol> <p>To get only an encrypted copy of the data key, use <a>GenerateDataKeyWithoutPlaintext</a>. To get a cryptographically secure random byte string, use <a>GenerateRandom</a>.</p> <p>You can use the optional encryption context to add additional security to your encryption operation. When you specify an <code>EncryptionContext</code> in the <code>GenerateDataKey</code> operation, you must specify the same encryption context (a case-sensitive exact match) in your request to <a>Decrypt</a> the data key. Otherwise, the request to decrypt fails with an <code>InvalidCiphertextException</code>. For more information, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#encrypt_context\">Encryption Context</a> in the <i> <i>AWS Key Management Service Developer Guide</i> </i>.</p> <p>The result of this operation varies with the key state of the CMK. For details, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/key-state.html\">How Key State Affects Use of a Customer Master Key</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
+      "documentation":"<p>Generates a unique symmetric data key. This operation returns a plaintext copy of the data key and a copy that is encrypted under a customer master key (CMK) that you specify. You can use the plaintext key to encrypt your data outside of AWS KMS and store the encrypted data key with the encrypted data.</p> <p> <code>GenerateDataKey</code> returns a unique data key for each request. The bytes in the key are not related to the caller or CMK that is used to encrypt the data key.</p> <p>To generate a data key, specify the symmetric CMK that will be used to encrypt the data key. You cannot use an asymmetric CMK to generate data keys. To get the type of your CMK, use the <a>DescribeKey</a> operation.</p> <p>You must also specify the length of the data key. Use either the <code>KeySpec</code> or <code>NumberOfBytes</code> parameters (but not both). For 128-bit and 256-bit data keys, use the <code>KeySpec</code> parameter. </p> <p>If the operation succeeds, the plaintext copy of the data key is in the <code>Plaintext</code> field of the response, and the encrypted copy of the data key in the <code>CiphertextBlob</code> field.</p> <p>To get only an encrypted copy of the data key, use <a>GenerateDataKeyWithoutPlaintext</a>. To generate an asymmetric data key pair, use the <a>GenerateDataKeyPair</a> or <a>GenerateDataKeyPairWithoutPlaintext</a> operation. To get a cryptographically secure random byte string, use <a>GenerateRandom</a>.</p> <p>You can use the optional encryption context to add additional security to the encryption operation. If you specify an <code>EncryptionContext</code>, you must specify the same encryption context (a case-sensitive exact match) when decrypting the encrypted data key. Otherwise, the request to decrypt fails with an InvalidCiphertextException. For more information, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#encrypt_context\">Encryption Context</a> in the <i>AWS Key Management Service Developer Guide</i>.</p> <p>The CMK that you use for this operation must be in a compatible key state. For details, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/key-state.html\">How Key State Affects Use of a Customer Master Key</a> in the <i>AWS Key Management Service Developer Guide</i>.</p> <p>We recommend that you use the following pattern to encrypt data locally in your application:</p> <ol> <li> <p>Use the <code>GenerateDataKey</code> operation to get a data encryption key.</p> </li> <li> <p>Use the plaintext data key (returned in the <code>Plaintext</code> field of the response) to encrypt data locally, then erase the plaintext data key from memory.</p> </li> <li> <p>Store the encrypted data key (returned in the <code>CiphertextBlob</code> field of the response) alongside the locally encrypted data.</p> </li> </ol> <p>To decrypt data locally:</p> <ol> <li> <p>Use the <a>Decrypt</a> operation to decrypt the encrypted data key. The operation returns a plaintext copy of the data key.</p> </li> <li> <p>Use the plaintext data key to decrypt data locally, then erase the plaintext data key from memory.</p> </li> </ol>"
+    },
+    "GenerateDataKeyPair":{
+      "name":"GenerateDataKeyPair",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"GenerateDataKeyPairRequest"},
+      "output":{"shape":"GenerateDataKeyPairResponse"},
+      "errors":[
+        {"shape":"NotFoundException"},
+        {"shape":"DisabledException"},
+        {"shape":"KeyUnavailableException"},
+        {"shape":"DependencyTimeoutException"},
+        {"shape":"InvalidKeyUsageException"},
+        {"shape":"InvalidGrantTokenException"},
+        {"shape":"KMSInternalException"},
+        {"shape":"KMSInvalidStateException"}
+      ],
+      "documentation":"<p>Generates a unique asymmetric data key pair. The <code>GenerateDataKeyPair</code> operation returns a plaintext public key, a plaintext private key, and a copy of the private key that is encrypted under the symmetric CMK you specify. You can use the data key pair to perform asymmetric cryptography outside of AWS KMS.</p> <p> <code>GenerateDataKeyPair</code> returns a unique data key pair for each request. The bytes in the keys are not related to the caller or the CMK that is used to encrypt the private key.</p> <p>You can use the public key that <code>GenerateDataKeyPair</code> returns to encrypt data or verify a signature outside of AWS KMS. Then, store the encrypted private key with the data. When you are ready to decrypt data or sign a message, you can use the <a>Decrypt</a> operation to decrypt the encrypted private key.</p> <p>To generate a data key pair, you must specify a symmetric customer master key (CMK) to encrypt the private key in a data key pair. You cannot use an asymmetric CMK. To get the type of your CMK, use the <a>DescribeKey</a> operation.</p> <p>If you are using the data key pair to encrypt data, or for any operation where you don't immediately need a private key, consider using the <a>GenerateDataKeyPairWithoutPlaintext</a> operation. <code>GenerateDataKeyPairWithoutPlaintext</code> returns a plaintext public key and an encrypted private key, but omits the plaintext private key that you need only to decrypt ciphertext or sign a message. Later, when you need to decrypt the data or sign a message, use the <a>Decrypt</a> operation to decrypt the encrypted private key in the data key pair.</p> <p>You can use the optional encryption context to add additional security to the encryption operation. If you specify an <code>EncryptionContext</code>, you must specify the same encryption context (a case-sensitive exact match) when decrypting the encrypted data key. Otherwise, the request to decrypt fails with an InvalidCiphertextException. For more information, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#encrypt_context\">Encryption Context</a> in the <i>AWS Key Management Service Developer Guide</i>.</p> <p>The CMK that you use for this operation must be in a compatible key state. For details, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/key-state.html\">How Key State Affects Use of a Customer Master Key</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
+    },
+    "GenerateDataKeyPairWithoutPlaintext":{
+      "name":"GenerateDataKeyPairWithoutPlaintext",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"GenerateDataKeyPairWithoutPlaintextRequest"},
+      "output":{"shape":"GenerateDataKeyPairWithoutPlaintextResponse"},
+      "errors":[
+        {"shape":"NotFoundException"},
+        {"shape":"DisabledException"},
+        {"shape":"KeyUnavailableException"},
+        {"shape":"DependencyTimeoutException"},
+        {"shape":"InvalidKeyUsageException"},
+        {"shape":"InvalidGrantTokenException"},
+        {"shape":"KMSInternalException"},
+        {"shape":"KMSInvalidStateException"}
+      ],
+      "documentation":"<p>Generates a unique asymmetric data key pair. The <code>GenerateDataKeyPairWithoutPlaintext</code> operation returns a plaintext public key and a copy of the private key that is encrypted under the symmetric CMK you specify. Unlike <a>GenerateDataKeyPair</a>, this operation does not return a plaintext private key. </p> <p>To generate a data key pair, you must specify a symmetric customer master key (CMK) to encrypt the private key in the data key pair. You cannot use an asymmetric CMK. To get the type of your CMK, use the <code>KeySpec</code> field in the <a>DescribeKey</a> response.</p> <p>You can use the public key that <code>GenerateDataKeyPairWithoutPlaintext</code> returns to encrypt data or verify a signature outside of AWS KMS. Then, store the encrypted private key with the data. When you are ready to decrypt data or sign a message, you can use the <a>Decrypt</a> operation to decrypt the encrypted private key.</p> <p> <code>GenerateDataKeyPairWithoutPlaintext</code> returns a unique data key pair for each request. The bytes in the key are not related to the caller or CMK that is used to encrypt the private key.</p> <p>You can use the optional encryption context to add additional security to the encryption operation. If you specify an <code>EncryptionContext</code>, you must specify the same encryption context (a case-sensitive exact match) when decrypting the encrypted data key. Otherwise, the request to decrypt fails with an InvalidCiphertextException. For more information, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#encrypt_context\">Encryption Context</a> in the <i>AWS Key Management Service Developer Guide</i>.</p> <p>The CMK that you use for this operation must be in a compatible key state. For details, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/key-state.html\">How Key State Affects Use of a Customer Master Key</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
     },
     "GenerateDataKeyWithoutPlaintext":{
       "name":"GenerateDataKeyWithoutPlaintext",
@@ -366,7 +408,7 @@
         {"shape":"KMSInternalException"},
         {"shape":"KMSInvalidStateException"}
       ],
-      "documentation":"<p>Generates a unique data key. This operation returns a data key that is encrypted under a customer master key (CMK) that you specify. <code>GenerateDataKeyWithoutPlaintext</code> is identical to <a>GenerateDataKey</a> except that returns only the encrypted copy of the data key.</p> <p>Like <code>GenerateDataKey</code>, <code>GenerateDataKeyWithoutPlaintext</code> returns a unique data key for each request. The bytes in the key are not related to the caller or CMK that is used to encrypt the data key.</p> <p>This operation is useful for systems that need to encrypt data at some point, but not immediately. When you need to encrypt the data, you call the <a>Decrypt</a> operation on the encrypted copy of the key.</p> <p>It's also useful in distributed systems with different levels of trust. For example, you might store encrypted data in containers. One component of your system creates new containers and stores an encrypted data key with each container. Then, a different component puts the data into the containers. That component first decrypts the data key, uses the plaintext data key to encrypt data, puts the encrypted data into the container, and then destroys the plaintext data key. In this system, the component that creates the containers never sees the plaintext data key.</p> <p>The result of this operation varies with the key state of the CMK. For details, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/key-state.html\">How Key State Affects Use of a Customer Master Key</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
+      "documentation":"<p>Generates a unique symmetric data key. This operation returns a data key that is encrypted under a customer master key (CMK) that you specify. To request an asymmetric data key pair, use the <a>GenerateDataKeyPair</a> or <a>GenerateDataKeyPairWithoutPlaintext</a> operations.</p> <p> <code>GenerateDataKeyWithoutPlaintext</code> is identical to the <a>GenerateDataKey</a> operation except that returns only the encrypted copy of the data key. This operation is useful for systems that need to encrypt data at some point, but not immediately. When you need to encrypt the data, you call the <a>Decrypt</a> operation on the encrypted copy of the key. </p> <p>It's also useful in distributed systems with different levels of trust. For example, you might store encrypted data in containers. One component of your system creates new containers and stores an encrypted data key with each container. Then, a different component puts the data into the containers. That component first decrypts the data key, uses the plaintext data key to encrypt data, puts the encrypted data into the container, and then destroys the plaintext data key. In this system, the component that creates the containers never sees the plaintext data key.</p> <p> <code>GenerateDataKeyWithoutPlaintext</code> returns a unique data key for each request. The bytes in the keys are not related to the caller or CMK that is used to encrypt the private key.</p> <p>To generate a data key, you must specify the symmetric customer master key (CMK) that is used to encrypt the data key. You cannot use an asymmetric CMK to generate a data key. To get the type of your CMK, use the <a>DescribeKey</a> operation.</p> <p>If the operation succeeds, you will find the encrypted copy of the data key in the <code>CiphertextBlob</code> field.</p> <p>You can use the optional encryption context to add additional security to the encryption operation. If you specify an <code>EncryptionContext</code>, you must specify the same encryption context (a case-sensitive exact match) when decrypting the encrypted data key. Otherwise, the request to decrypt fails with an InvalidCiphertextException. For more information, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#encrypt_context\">Encryption Context</a> in the <i>AWS Key Management Service Developer Guide</i>.</p> <p>The CMK that you use for this operation must be in a compatible key state. For details, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/key-state.html\">How Key State Affects Use of a Customer Master Key</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
     },
     "GenerateRandom":{
       "name":"GenerateRandom",
@@ -417,7 +459,7 @@
         {"shape":"KMSInvalidStateException"},
         {"shape":"UnsupportedOperationException"}
       ],
-      "documentation":"<p>Gets a Boolean value that indicates whether <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/rotate-keys.html\">automatic rotation of the key material</a> is enabled for the specified customer master key (CMK).</p> <p>The result of this operation varies with the key state of the CMK. For details, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/key-state.html\">How Key State Affects Use of a Customer Master Key</a> in the <i>AWS Key Management Service Developer Guide</i>.</p> <ul> <li> <p>Disabled: The key rotation status does not change when you disable a CMK. However, while the CMK is disabled, AWS KMS does not rotate the backing key.</p> </li> <li> <p>Pending deletion: While a CMK is pending deletion, its key rotation status is <code>false</code> and AWS KMS does not rotate the backing key. If you cancel the deletion, the original key rotation status is restored.</p> </li> </ul> <p>To perform this operation on a CMK in a different AWS account, specify the key ARN in the value of the <code>KeyId</code> parameter.</p>"
+      "documentation":"<p>Gets a Boolean value that indicates whether <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/rotate-keys.html\">automatic rotation of the key material</a> is enabled for the specified customer master key (CMK).</p> <p>You cannot enable automatic rotation of asymmetric CMKs, CMKs with imported key material, or CMKs in a <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/custom-key-store-overview.html\">custom key store</a>. The key rotation status for these CMKs is always <code>false</code>.</p> <p>The CMK that you use for this operation must be in a compatible key state. For details, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/key-state.html\">How Key State Affects Use of a Customer Master Key</a> in the <i>AWS Key Management Service Developer Guide</i>.</p> <ul> <li> <p>Disabled: The key rotation status does not change when you disable a CMK. However, while the CMK is disabled, AWS KMS does not rotate the backing key.</p> </li> <li> <p>Pending deletion: While a CMK is pending deletion, its key rotation status is <code>false</code> and AWS KMS does not rotate the backing key. If you cancel the deletion, the original key rotation status is restored.</p> </li> </ul> <p>To perform this operation on a CMK in a different AWS account, specify the key ARN in the value of the <code>KeyId</code> parameter.</p>"
     },
     "GetParametersForImport":{
       "name":"GetParametersForImport",
@@ -435,7 +477,29 @@
         {"shape":"KMSInternalException"},
         {"shape":"KMSInvalidStateException"}
       ],
-      "documentation":"<p>Returns the items you need in order to import key material into AWS KMS from your existing key management infrastructure. For more information about importing key material into AWS KMS, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/importing-keys.html\">Importing Key Material</a> in the <i>AWS Key Management Service Developer Guide</i>.</p> <p>You must specify the key ID of the customer master key (CMK) into which you will import key material. This CMK's <code>Origin</code> must be <code>EXTERNAL</code>. You must also specify the wrapping algorithm and type of wrapping key (public key) that you will use to encrypt the key material. You cannot perform this operation on a CMK in a different AWS account.</p> <p>This operation returns a public key and an import token. Use the public key to encrypt the key material. Store the import token to send with a subsequent <a>ImportKeyMaterial</a> request. The public key and import token from the same response must be used together. These items are valid for 24 hours. When they expire, they cannot be used for a subsequent <a>ImportKeyMaterial</a> request. To get new ones, send another <code>GetParametersForImport</code> request.</p> <p>The result of this operation varies with the key state of the CMK. For details, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/key-state.html\">How Key State Affects Use of a Customer Master Key</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
+      "documentation":"<p>Returns the items you need to import key material into a symmetric, customer managed customer master key (CMK). For more information about importing key material into AWS KMS, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/importing-keys.html\">Importing Key Material</a> in the <i>AWS Key Management Service Developer Guide</i>.</p> <p>This operation returns a public key and an import token. Use the public key to encrypt the symmetric key material. Store the import token to send with a subsequent <a>ImportKeyMaterial</a> request.</p> <p>You must specify the key ID of the symmetric CMK into which you will import key material. This CMK's <code>Origin</code> must be <code>EXTERNAL</code>. You must also specify the wrapping algorithm and type of wrapping key (public key) that you will use to encrypt the key material. You cannot perform this operation on an asymmetric CMK or on any CMK in a different AWS account.</p> <p>To import key material, you must use the public key and import token from the same response. These items are valid for 24 hours. The expiration date and time appear in the <code>GetParametersForImport</code> response. You cannot use an expired token in an <a>ImportKeyMaterial</a> request. If your key and token expire, send another <code>GetParametersForImport</code> request.</p> <p>The CMK that you use for this operation must be in a compatible key state. For details, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/key-state.html\">How Key State Affects Use of a Customer Master Key</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
+    },
+    "GetPublicKey":{
+      "name":"GetPublicKey",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"GetPublicKeyRequest"},
+      "output":{"shape":"GetPublicKeyResponse"},
+      "errors":[
+        {"shape":"NotFoundException"},
+        {"shape":"DisabledException"},
+        {"shape":"KeyUnavailableException"},
+        {"shape":"DependencyTimeoutException"},
+        {"shape":"UnsupportedOperationException"},
+        {"shape":"InvalidArnException"},
+        {"shape":"InvalidGrantTokenException"},
+        {"shape":"InvalidKeyUsageException"},
+        {"shape":"KMSInternalException"},
+        {"shape":"KMSInvalidStateException"}
+      ],
+      "documentation":"<p>Returns the public key of an asymmetric CMK. Unlike the private key of a asymmetric CMK, which never leaves AWS KMS unencrypted, callers with <code>kms:GetPublicKey</code> permission can download the public key of an asymmetric CMK. You can share the public key to allow others to encrypt messages and verify signatures outside of AWS KMS. For information about symmetric and asymmetric CMKs, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/symmetric-asymmetric.html\">Using Symmetric and Asymmetric CMKs</a> in the <i>AWS Key Management Service Developer Guide</i>.</p> <p>You do not need to download the public key. Instead, you can use the public key within AWS KMS by calling the <a>Encrypt</a>, <a>ReEncrypt</a>, or <a>Verify</a> operations with the identifier of an asymmetric CMK. When you use the public key within AWS KMS, you benefit from the authentication, authorization, and logging that are part of every AWS KMS operation. You also reduce of risk of encrypting data that cannot be decrypted. These features are not effective outside of AWS KMS. For details, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/download-public-key.html#download-public-key-considerations\">Special Considerations for Downloading Public Keys</a>.</p> <p>To help you use the public key safely outside of AWS KMS, <code>GetPublicKey</code> returns important information about the public key in the response, including:</p> <ul> <li> <p> <a href=\"https://docs.aws.amazon.com/kms/latest/APIReference/API_GetPublicKey.html#KMS-GetPublicKey-response-CustomerMasterKeySpec\">CustomerMasterKeySpec</a>: The type of key material in the public key, such as <code>RSA_4096</code> or <code>ECC_NIST_P521</code>.</p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/kms/latest/APIReference/API_GetPublicKey.html#KMS-GetPublicKey-response-KeyUsage\">KeyUsage</a>: Whether the key is used for encryption or signing.</p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/kms/latest/APIReference/API_GetPublicKey.html#KMS-GetPublicKey-response-EncryptionAlgorithms\">EncryptionAlgorithms</a> or <a href=\"https://docs.aws.amazon.com/kms/latest/APIReference/API_GetPublicKey.html#KMS-GetPublicKey-response-SigningAlgorithms\">SigningAlgorithms</a>: A list of the encryption algorithms or the signing algorithms for the key.</p> </li> </ul> <p>Although AWS KMS cannot enforce these restrictions on external operations, it is crucial that you use this information to prevent the public key from being used improperly. For example, you can prevent a public signing key from being used encrypt data, or prevent a public key from being used with an encryption algorithm that is not supported by AWS KMS. You can also avoid errors, such as using the wrong signing algorithm in a verification operation.</p> <p>The CMK that you use for this operation must be in a compatible key state. For details, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/key-state.html\">How Key State Affects Use of a Customer Master Key</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
     },
     "ImportKeyMaterial":{
       "name":"ImportKeyMaterial",
@@ -457,7 +521,7 @@
         {"shape":"ExpiredImportTokenException"},
         {"shape":"InvalidImportTokenException"}
       ],
-      "documentation":"<p>Imports key material into an existing AWS KMS customer master key (CMK) that was created without key material. You cannot perform this operation on a CMK in a different AWS account. For more information about creating CMKs with no key material and then importing key material, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/importing-keys.html\">Importing Key Material</a> in the <i>AWS Key Management Service Developer Guide</i>.</p> <p>Before using this operation, call <a>GetParametersForImport</a>. Its response includes a public key and an import token. Use the public key to encrypt the key material. Then, submit the import token from the same <code>GetParametersForImport</code> response.</p> <p>When calling this operation, you must specify the following values:</p> <ul> <li> <p>The key ID or key ARN of a CMK with no key material. Its <code>Origin</code> must be <code>EXTERNAL</code>.</p> <p>To create a CMK with no key material, call <a>CreateKey</a> and set the value of its <code>Origin</code> parameter to <code>EXTERNAL</code>. To get the <code>Origin</code> of a CMK, call <a>DescribeKey</a>.)</p> </li> <li> <p>The encrypted key material. To get the public key to encrypt the key material, call <a>GetParametersForImport</a>.</p> </li> <li> <p>The import token that <a>GetParametersForImport</a> returned. This token and the public key used to encrypt the key material must have come from the same response.</p> </li> <li> <p>Whether the key material expires and if so, when. If you set an expiration date, you can change it only by reimporting the same key material and specifying a new expiration date. If the key material expires, AWS KMS deletes the key material and the CMK becomes unusable. To use the CMK again, you must reimport the same key material.</p> </li> </ul> <p>When this operation is successful, the key state of the CMK changes from <code>PendingImport</code> to <code>Enabled</code>, and you can use the CMK. After you successfully import key material into a CMK, you can reimport the same key material into that CMK, but you cannot import different key material.</p> <p>The result of this operation varies with the key state of the CMK. For details, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/key-state.html\">How Key State Affects Use of a Customer Master Key</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
+      "documentation":"<p>Imports key material into an existing symmetric AWS KMS customer master key (CMK) that was created without key material. After you successfully import key material into a CMK, you can <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/importing-keys.html#reimport-key-material\">reimport the same key material</a> into that CMK, but you cannot import different key material.</p> <p>You cannot perform this operation on an asymmetric CMK or on any CMK in a different AWS account. For more information about creating CMKs with no key material and then importing key material, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/importing-keys.html\">Importing Key Material</a> in the <i>AWS Key Management Service Developer Guide</i>.</p> <p>Before using this operation, call <a>GetParametersForImport</a>. Its response includes a public key and an import token. Use the public key to encrypt the key material. Then, submit the import token from the same <code>GetParametersForImport</code> response.</p> <p>When calling this operation, you must specify the following values:</p> <ul> <li> <p>The key ID or key ARN of a CMK with no key material. Its <code>Origin</code> must be <code>EXTERNAL</code>.</p> <p>To create a CMK with no key material, call <a>CreateKey</a> and set the value of its <code>Origin</code> parameter to <code>EXTERNAL</code>. To get the <code>Origin</code> of a CMK, call <a>DescribeKey</a>.)</p> </li> <li> <p>The encrypted key material. To get the public key to encrypt the key material, call <a>GetParametersForImport</a>.</p> </li> <li> <p>The import token that <a>GetParametersForImport</a> returned. You must use a public key and token from the same <code>GetParametersForImport</code> response.</p> </li> <li> <p>Whether the key material expires and if so, when. If you set an expiration date, AWS KMS deletes the key material from the CMK on the specified date, and the CMK becomes unusable. To use the CMK again, you must reimport the same key material. The only way to change an expiration date is by reimporting the same key material and specifying a new expiration date. </p> </li> </ul> <p>When this operation is successful, the key state of the CMK changes from <code>PendingImport</code> to <code>Enabled</code>, and you can use the CMK.</p> <p>If this operation fails, use the exception to help determine the problem. If the error is related to the key material, the import token, or wrapping key, use <a>GetParametersForImport</a> to get a new public key and import token for the CMK and repeat the import procedure. For help, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/importing-keys.html#importing-keys-overview\">How To Import Key Material</a> in the <i>AWS Key Management Service Developer Guide</i>.</p> <p>The CMK that you use for this operation must be in a compatible key state. For details, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/key-state.html\">How Key State Affects Use of a Customer Master Key</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
     },
     "ListAliases":{
       "name":"ListAliases",
@@ -474,7 +538,7 @@
         {"shape":"InvalidArnException"},
         {"shape":"NotFoundException"}
       ],
-      "documentation":"<p>Gets a list of aliases in the caller's AWS account and region. You cannot list aliases in other accounts. For more information about aliases, see <a>CreateAlias</a>.</p> <p>By default, the ListAliases command returns all aliases in the account and region. To get only the aliases that point to a particular customer master key (CMK), use the <code>KeyId</code> parameter.</p> <p>The <code>ListAliases</code> response can include aliases that you created and associated with your customer managed CMKs, and aliases that AWS created and associated with AWS managed CMKs in your account. You can recognize AWS aliases because their names have the format <code>aws/&lt;service-name&gt;</code>, such as <code>aws/dynamodb</code>.</p> <p>The response might also include aliases that have no <code>TargetKeyId</code> field. These are predefined aliases that AWS has created but has not yet associated with a CMK. Aliases that AWS creates in your account, including predefined aliases, do not count against your <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/limits.html#aliases-limit\">AWS KMS aliases limit</a>.</p>"
+      "documentation":"<p>Gets a list of aliases in the caller's AWS account and region. You cannot list aliases in other accounts. For more information about aliases, see <a>CreateAlias</a>.</p> <p>By default, the ListAliases command returns all aliases in the account and region. To get only the aliases that point to a particular customer master key (CMK), use the <code>KeyId</code> parameter.</p> <p>The <code>ListAliases</code> response can include aliases that you created and associated with your customer managed CMKs, and aliases that AWS created and associated with AWS managed CMKs in your account. You can recognize AWS aliases because their names have the format <code>aws/&lt;service-name&gt;</code>, such as <code>aws/dynamodb</code>.</p> <p>The response might also include aliases that have no <code>TargetKeyId</code> field. These are predefined aliases that AWS has created but has not yet associated with a CMK. Aliases that AWS creates in your account, including predefined aliases, do not count against your <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/limits.html#aliases-limit\">AWS KMS aliases quota</a>.</p>"
     },
     "ListGrants":{
       "name":"ListGrants",
@@ -524,7 +588,7 @@
         {"shape":"KMSInternalException"},
         {"shape":"InvalidMarkerException"}
       ],
-      "documentation":"<p>Gets a list of all customer master keys (CMKs) in the caller's AWS account and region.</p>"
+      "documentation":"<p>Gets a list of all customer master keys (CMKs) in the caller's AWS account and Region.</p>"
     },
     "ListResourceTags":{
       "name":"ListResourceTags",
@@ -591,13 +655,14 @@
         {"shape":"DisabledException"},
         {"shape":"InvalidCiphertextException"},
         {"shape":"KeyUnavailableException"},
+        {"shape":"IncorrectKeyException"},
         {"shape":"DependencyTimeoutException"},
         {"shape":"InvalidKeyUsageException"},
         {"shape":"InvalidGrantTokenException"},
         {"shape":"KMSInternalException"},
         {"shape":"KMSInvalidStateException"}
       ],
-      "documentation":"<p>Encrypts data on the server side with a new customer master key (CMK) without exposing the plaintext of the data on the client side. The data is first decrypted and then reencrypted. You can also use this operation to change the encryption context of a ciphertext. </p> <p>You can reencrypt data using CMKs in different AWS accounts.</p> <p>Unlike other operations, <code>ReEncrypt</code> is authorized twice, once as <code>ReEncryptFrom</code> on the source CMK and once as <code>ReEncryptTo</code> on the destination CMK. We recommend that you include the <code>\"kms:ReEncrypt*\"</code> permission in your <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/key-policies.html\">key policies</a> to permit reencryption from or to the CMK. This permission is automatically included in the key policy when you create a CMK through the console. But you must include it manually when you create a CMK programmatically or when you set a key policy with the <a>PutKeyPolicy</a> operation.</p> <p>The result of this operation varies with the key state of the CMK. For details, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/key-state.html\">How Key State Affects Use of a Customer Master Key</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
+      "documentation":"<p>Decrypts ciphertext and then reencrypts it entirely within AWS KMS. You can use this operation to change the customer master key (CMK) under which data is encrypted, such as when you <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/rotate-keys.html#rotate-keys-manually\">manually rotate</a> a CMK or change the CMK that protects a ciphertext. You can also use it to reencrypt ciphertext under the same CMK, such as to change the encryption context of a ciphertext. </p> <p>The <code>ReEncrypt</code> operation can decrypt ciphertext that was encrypted by using an AWS KMS CMK in an AWS KMS operation, such as <a>Encrypt</a> or <a>GenerateDataKey</a>. It can also decrypt ciphertext that was encrypted by using the public key of an asymmetric CMK outside of AWS KMS. However, it cannot decrypt ciphertext produced by other libraries, such as the <a href=\"https://docs.aws.amazon.com/encryption-sdk/latest/developer-guide/\">AWS Encryption SDK</a> or <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/UsingClientSideEncryption.html\">Amazon S3 client-side encryption</a>. These libraries return a ciphertext format that is incompatible with AWS KMS.</p> <p>When you use the <code>ReEncrypt</code> operation, you need to provide information for the decrypt operation and the subsequent encrypt operation.</p> <ul> <li> <p>If your ciphertext was encrypted under an asymmetric CMK, you must identify the <i>source CMK</i>, that is, the CMK that encrypted the ciphertext. You must also supply the encryption algorithm that was used. This information is required to decrypt the data.</p> </li> <li> <p>It is optional, but you can specify a source CMK even when the ciphertext was encrypted under a symmetric CMK. This ensures that the ciphertext is decrypted only by using a particular CMK. If the CMK that you specify cannot decrypt the ciphertext, the <code>ReEncrypt</code> operation fails.</p> </li> <li> <p>To reencrypt the data, you must specify the <i>destination CMK</i>, that is, the CMK that re-encrypts the data after it is decrypted. You can select a symmetric or asymmetric CMK. If the destination CMK is an asymmetric CMK, you must also provide the encryption algorithm. The algorithm that you choose must be compatible with the CMK.</p> <important> <p>When you use an asymmetric CMK to encrypt or reencrypt data, be sure to record the CMK and encryption algorithm that you choose. You will be required to provide the same CMK and encryption algorithm when you decrypt the data. If the CMK and algorithm do not match the values used to encrypt the data, the decrypt operation fails.</p> <p>You are not required to supply the CMK ID and encryption algorithm when you decrypt with symmetric CMKs because AWS KMS stores this information in the ciphertext blob. AWS KMS cannot store metadata in ciphertext generated with asymmetric keys. The standard format for asymmetric key ciphertext does not include configurable fields.</p> </important> </li> </ul> <p>Unlike other AWS KMS API operations, <code>ReEncrypt</code> callers must have two permissions:</p> <ul> <li> <p> <code>kms:EncryptFrom</code> permission on the source CMK</p> </li> <li> <p> <code>kms:EncryptTo</code> permission on the destination CMK</p> </li> </ul> <p>To permit reencryption from</p> <p> or to a CMK, include the <code>\"kms:ReEncrypt*\"</code> permission in your <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/key-policies.html\">key policy</a>. This permission is automatically included in the key policy when you use the console to create a CMK. But you must include it manually when you create a CMK programmatically or when you use the <a>PutKeyPolicy</a> operation set a key policy.</p> <p>The CMK that you use for this operation must be in a compatible key state. For details, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/key-state.html\">How Key State Affects Use of a Customer Master Key</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
     },
     "RetireGrant":{
       "name":"RetireGrant",
@@ -649,7 +714,27 @@
         {"shape":"KMSInternalException"},
         {"shape":"KMSInvalidStateException"}
       ],
-      "documentation":"<p>Schedules the deletion of a customer master key (CMK). You may provide a waiting period, specified in days, before deletion occurs. If you do not provide a waiting period, the default period of 30 days is used. When this operation is successful, the key state of the CMK changes to <code>PendingDeletion</code>. Before the waiting period ends, you can use <a>CancelKeyDeletion</a> to cancel the deletion of the CMK. After the waiting period ends, AWS KMS deletes the CMK and all AWS KMS data associated with it, including all aliases that refer to it.</p> <important> <p>Deleting a CMK is a destructive and potentially dangerous operation. When a CMK is deleted, all data that was encrypted under the CMK is unrecoverable. To prevent the use of a CMK without deleting it, use <a>DisableKey</a>.</p> </important> <p>If you schedule deletion of a CMK from a <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/custom-key-store-overview.html\">custom key store</a>, when the waiting period expires, <code>ScheduleKeyDeletion</code> deletes the CMK from AWS KMS. Then AWS KMS makes a best effort to delete the key material from the associated AWS CloudHSM cluster. However, you might need to manually <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/fix-keystore.html#fix-keystore-orphaned-key\">delete the orphaned key material</a> from the cluster and its backups.</p> <p>You cannot perform this operation on a CMK in a different AWS account.</p> <p>For more information about scheduling a CMK for deletion, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/deleting-keys.html\">Deleting Customer Master Keys</a> in the <i>AWS Key Management Service Developer Guide</i>.</p> <p>The result of this operation varies with the key state of the CMK. For details, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/key-state.html\">How Key State Affects Use of a Customer Master Key</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
+      "documentation":"<p>Schedules the deletion of a customer master key (CMK). You may provide a waiting period, specified in days, before deletion occurs. If you do not provide a waiting period, the default period of 30 days is used. When this operation is successful, the key state of the CMK changes to <code>PendingDeletion</code>. Before the waiting period ends, you can use <a>CancelKeyDeletion</a> to cancel the deletion of the CMK. After the waiting period ends, AWS KMS deletes the CMK and all AWS KMS data associated with it, including all aliases that refer to it.</p> <important> <p>Deleting a CMK is a destructive and potentially dangerous operation. When a CMK is deleted, all data that was encrypted under the CMK is unrecoverable. To prevent the use of a CMK without deleting it, use <a>DisableKey</a>.</p> </important> <p>If you schedule deletion of a CMK from a <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/custom-key-store-overview.html\">custom key store</a>, when the waiting period expires, <code>ScheduleKeyDeletion</code> deletes the CMK from AWS KMS. Then AWS KMS makes a best effort to delete the key material from the associated AWS CloudHSM cluster. However, you might need to manually <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/fix-keystore.html#fix-keystore-orphaned-key\">delete the orphaned key material</a> from the cluster and its backups.</p> <p>You cannot perform this operation on a CMK in a different AWS account.</p> <p>For more information about scheduling a CMK for deletion, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/deleting-keys.html\">Deleting Customer Master Keys</a> in the <i>AWS Key Management Service Developer Guide</i>.</p> <p>The CMK that you use for this operation must be in a compatible key state. For details, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/key-state.html\">How Key State Affects Use of a Customer Master Key</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
+    },
+    "Sign":{
+      "name":"Sign",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"SignRequest"},
+      "output":{"shape":"SignResponse"},
+      "errors":[
+        {"shape":"NotFoundException"},
+        {"shape":"DisabledException"},
+        {"shape":"KeyUnavailableException"},
+        {"shape":"DependencyTimeoutException"},
+        {"shape":"InvalidKeyUsageException"},
+        {"shape":"InvalidGrantTokenException"},
+        {"shape":"KMSInternalException"},
+        {"shape":"KMSInvalidStateException"}
+      ],
+      "documentation":"<p>Creates a <a href=\"https://en.wikipedia.org/wiki/Digital_signature\">digital signature</a> for a message or message digest by using the private key in an asymmetric CMK. To verify the signature, use the <a>Verify</a> operation, or use the public key in the same asymmetric CMK outside of AWS KMS. For information about symmetric and asymmetric CMKs, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/symmetric-asymmetric.html\">Using Symmetric and Asymmetric CMKs</a> in the <i>AWS Key Management Service Developer Guide</i>.</p> <p>Digital signatures are generated and verified by using asymmetric key pair, such as an RSA or ECC pair that is represented by an asymmetric customer master key (CMK). The key owner (or an authorized user) uses their private key to sign a message. Anyone with the public key can verify that the message was signed with that particular private key and that the message hasn't changed since it was signed. </p> <p>To use the <code>Sign</code> operation, provide the following information:</p> <ul> <li> <p>Use the <code>KeyId</code> parameter to identify an asymmetric CMK with a <code>KeyUsage</code> value of <code>SIGN_VERIFY</code>. To get the <code>KeyUsage</code> value of a CMK, use the <a>DescribeKey</a> operation. The caller must have <code>kms:Sign</code> permission on the CMK.</p> </li> <li> <p>Use the <code>Message</code> parameter to specify the message or message digest to sign. You can submit messages of up to 4096 bytes. To sign a larger message, generate a hash digest of the message, and then provide the hash digest in the <code>Message</code> parameter. To indicate whether the message is a full message or a digest, use the <code>MessageType</code> parameter.</p> </li> <li> <p>Choose a signing algorithm that is compatible with the CMK. </p> </li> </ul> <important> <p>When signing a message, be sure to record the CMK and the signing algorithm. This information is required to verify the signature.</p> </important> <p>To verify the signature that this operation generates, use the <a>Verify</a> operation. Or use the <a>GetPublicKey</a> operation to download the public key and then use the public key to verify the signature outside of AWS KMS. </p> <p>The CMK that you use for this operation must be in a compatible key state. For details, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/key-state.html\">How Key State Affects Use of a Customer Master Key</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
     },
     "TagResource":{
       "name":"TagResource",
@@ -666,7 +751,7 @@
         {"shape":"LimitExceededException"},
         {"shape":"TagException"}
       ],
-      "documentation":"<p>Adds or edits tags for a customer master key (CMK). You cannot perform this operation on a CMK in a different AWS account.</p> <p>Each tag consists of a tag key and a tag value. Tag keys and tag values are both required, but tag values can be empty (null) strings.</p> <p>You can only use a tag key once for each CMK. If you use the tag key again, AWS KMS replaces the current tag value with the specified value.</p> <p>For information about the rules that apply to tag keys and tag values, see <a href=\"https://docs.aws.amazon.com/awsaccountbilling/latest/aboutv2/allocation-tag-restrictions.html\">User-Defined Tag Restrictions</a> in the <i>AWS Billing and Cost Management User Guide</i>.</p> <p>The result of this operation varies with the key state of the CMK. For details, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/key-state.html\">How Key State Affects Use of a Customer Master Key</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
+      "documentation":"<p>Adds or edits tags for a customer master key (CMK). You cannot perform this operation on a CMK in a different AWS account.</p> <p>Each tag consists of a tag key and a tag value. Tag keys and tag values are both required, but tag values can be empty (null) strings.</p> <p>You can only use a tag key once for each CMK. If you use the tag key again, AWS KMS replaces the current tag value with the specified value.</p> <p>For information about the rules that apply to tag keys and tag values, see <a href=\"https://docs.aws.amazon.com/awsaccountbilling/latest/aboutv2/allocation-tag-restrictions.html\">User-Defined Tag Restrictions</a> in the <i>AWS Billing and Cost Management User Guide</i>.</p> <p>The CMK that you use for this operation must be in a compatible key state. For details, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/key-state.html\">How Key State Affects Use of a Customer Master Key</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
     },
     "UntagResource":{
       "name":"UntagResource",
@@ -682,7 +767,7 @@
         {"shape":"KMSInvalidStateException"},
         {"shape":"TagException"}
       ],
-      "documentation":"<p>Removes the specified tags from the specified customer master key (CMK). You cannot perform this operation on a CMK in a different AWS account.</p> <p>To remove a tag, specify the tag key. To change the tag value of an existing tag key, use <a>TagResource</a>.</p> <p>The result of this operation varies with the key state of the CMK. For details, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/key-state.html\">How Key State Affects Use of a Customer Master Key</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
+      "documentation":"<p>Removes the specified tags from the specified customer master key (CMK). You cannot perform this operation on a CMK in a different AWS account.</p> <p>To remove a tag, specify the tag key. To change the tag value of an existing tag key, use <a>TagResource</a>.</p> <p>The CMK that you use for this operation must be in a compatible key state. For details, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/key-state.html\">How Key State Affects Use of a Customer Master Key</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
     },
     "UpdateAlias":{
       "name":"UpdateAlias",
@@ -697,7 +782,7 @@
         {"shape":"KMSInternalException"},
         {"shape":"KMSInvalidStateException"}
       ],
-      "documentation":"<p>Associates an existing alias with a different customer master key (CMK). Each CMK can have multiple aliases, but the aliases must be unique within the account and region. You cannot perform this operation on an alias in a different AWS account.</p> <p>This operation works only on existing aliases. To change the alias of a CMK to a new value, use <a>CreateAlias</a> to create a new alias and <a>DeleteAlias</a> to delete the old alias.</p> <p>Because an alias is not a property of a CMK, you can create, update, and delete the aliases of a CMK without affecting the CMK. Also, aliases do not appear in the response from the <a>DescribeKey</a> operation. To get the aliases of all CMKs in the account, use the <a>ListAliases</a> operation. </p> <p>The alias name must begin with <code>alias/</code> followed by a name, such as <code>alias/ExampleAlias</code>. It can contain only alphanumeric characters, forward slashes (/), underscores (_), and dashes (-). The alias name cannot begin with <code>alias/aws/</code>. The <code>alias/aws/</code> prefix is reserved for <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#aws-managed-cmk\">AWS managed CMKs</a>. </p> <p>The result of this operation varies with the key state of the CMK. For details, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/key-state.html\">How Key State Affects Use of a Customer Master Key</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
+      "documentation":"<p>Associates an existing AWS KMS alias with a different customer master key (CMK). Each alias is associated with only one CMK at a time, although a CMK can have multiple aliases. The alias and the CMK must be in the same AWS account and region. You cannot perform this operation on an alias in a different AWS account. </p> <p>The current and new CMK must be the same type (both symmetric or both asymmetric), and they must have the same key usage (<code>ENCRYPT_DECRYPT</code> or <code>SIGN_VERIFY</code>). This restriction prevents errors in code that uses aliases. If you must assign an alias to a different type of CMK, use <a>DeleteAlias</a> to delete the old alias and <a>CreateAlias</a> to create a new alias.</p> <p>You cannot use <code>UpdateAlias</code> to change an alias name. To change an alias name, use <a>DeleteAlias</a> to delete the old alias and <a>CreateAlias</a> to create a new alias.</p> <p>Because an alias is not a property of a CMK, you can create, update, and delete the aliases of a CMK without affecting the CMK. Also, aliases do not appear in the response from the <a>DescribeKey</a> operation. To get the aliases of all CMKs in the account, use the <a>ListAliases</a> operation. </p> <p>The CMK that you use for this operation must be in a compatible key state. For details, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/key-state.html\">How Key State Affects Use of a Customer Master Key</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
     },
     "UpdateCustomKeyStore":{
       "name":"UpdateCustomKeyStore",
@@ -709,6 +794,7 @@
       "output":{"shape":"UpdateCustomKeyStoreResponse"},
       "errors":[
         {"shape":"CustomKeyStoreNotFoundException"},
+        {"shape":"CustomKeyStoreNameInUseException"},
         {"shape":"CloudHsmClusterNotFoundException"},
         {"shape":"CloudHsmClusterNotRelatedException"},
         {"shape":"CustomKeyStoreInvalidStateException"},
@@ -732,7 +818,28 @@
         {"shape":"KMSInternalException"},
         {"shape":"KMSInvalidStateException"}
       ],
-      "documentation":"<p>Updates the description of a customer master key (CMK). To see the description of a CMK, use <a>DescribeKey</a>. </p> <p>You cannot perform this operation on a CMK in a different AWS account.</p> <p>The result of this operation varies with the key state of the CMK. For details, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/key-state.html\">How Key State Affects Use of a Customer Master Key</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
+      "documentation":"<p>Updates the description of a customer master key (CMK). To see the description of a CMK, use <a>DescribeKey</a>. </p> <p>You cannot perform this operation on a CMK in a different AWS account.</p> <p>The CMK that you use for this operation must be in a compatible key state. For details, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/key-state.html\">How Key State Affects Use of a Customer Master Key</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
+    },
+    "Verify":{
+      "name":"Verify",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"VerifyRequest"},
+      "output":{"shape":"VerifyResponse"},
+      "errors":[
+        {"shape":"NotFoundException"},
+        {"shape":"DisabledException"},
+        {"shape":"KeyUnavailableException"},
+        {"shape":"DependencyTimeoutException"},
+        {"shape":"InvalidKeyUsageException"},
+        {"shape":"InvalidGrantTokenException"},
+        {"shape":"KMSInternalException"},
+        {"shape":"KMSInvalidStateException"},
+        {"shape":"KMSInvalidSignatureException"}
+      ],
+      "documentation":"<p>Verifies a digital signature that was generated by the <a>Sign</a> operation. </p> <p/> <p>Verification confirms that an authorized user signed the message with the specified CMK and signing algorithm, and the message hasn't changed since it was signed. If the signature is verified, the value of the <code>SignatureValid</code> field in the response is <code>True</code>. If the signature verification fails, the <code>Verify</code> operation fails with an <code>KMSInvalidSignatureException</code> exception.</p> <p>A digital signature is generated by using the private key in an asymmetric CMK. The signature is verified by using the public key in the same asymmetric CMK. For information about symmetric and asymmetric CMKs, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/symmetric-asymmetric.html\">Using Symmetric and Asymmetric CMKs</a> in the <i>AWS Key Management Service Developer Guide</i>.</p> <p>To verify a digital signature, you can use the <code>Verify</code> operation. Specify the same asymmetric CMK, message, and signing algorithm that were used to produce the signature.</p> <p>You can also verify the digital signature by using the public key of the CMK outside of AWS KMS. Use the <a>GetPublicKey</a> operation to download the public key in the asymmetric CMK and then use the public key to verify the signature outside of AWS KMS. The advantage of using the <code>Verify</code> operation is that it is performed within AWS KMS. As a result, it's easy to call, the operation is performed within the FIPS boundary, it is logged in AWS CloudTrail, and you can use key policy and IAM policy to determine who is authorized to use the CMK to verify signatures.</p> <p>The CMK that you use for this operation must be in a compatible key state. For details, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/key-state.html\">How Key State Affects Use of a Customer Master Key</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
     }
   },
   "shapes":{
@@ -879,7 +986,10 @@
         "NETWORK_ERRORS",
         "INTERNAL_ERROR",
         "INSUFFICIENT_CLOUDHSM_HSMS",
-        "USER_LOCKED_OUT"
+        "USER_LOCKED_OUT",
+        "USER_NOT_FOUND",
+        "USER_LOGGED_IN",
+        "SUBNET_NOT_FOUND"
       ]
     },
     "ConnectionStateType":{
@@ -932,7 +1042,7 @@
         },
         "KeyStorePassword":{
           "shape":"KeyStorePasswordType",
-          "documentation":"<p>Enter the password of the <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/key-store-concepts.html#concept-kmsuser\"> <code>kmsuser</code> crypto user (CU) account</a> in the specified AWS CloudHSM cluster. AWS KMS logs into the cluster as this user to manage key material on your behalf.</p> <p>This parameter tells AWS KMS the <code>kmsuser</code> account password; it does not change the password in the AWS CloudHSM cluster.</p>"
+          "documentation":"<p>Enter the password of the <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/key-store-concepts.html#concept-kmsuser\"> <code>kmsuser</code> crypto user (CU) account</a> in the specified AWS CloudHSM cluster. AWS KMS logs into the cluster as this user to manage key material on your behalf.</p> <p>The password must be a string of 7 to 32 characters. Its value is case sensitive.</p> <p>This parameter tells AWS KMS the <code>kmsuser</code> account password; it does not change the password in the AWS CloudHSM cluster.</p>"
         }
       }
     },
@@ -1001,7 +1111,7 @@
       "members":{
         "Policy":{
           "shape":"PolicyType",
-          "documentation":"<p>The key policy to attach to the CMK.</p> <p>If you provide a key policy, it must meet the following criteria:</p> <ul> <li> <p>If you don't set <code>BypassPolicyLockoutSafetyCheck</code> to true, the key policy must allow the principal that is making the <code>CreateKey</code> request to make a subsequent <a>PutKeyPolicy</a> request on the CMK. This reduces the risk that the CMK becomes unmanageable. For more information, refer to the scenario in the <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/key-policies.html#key-policy-default-allow-root-enable-iam\">Default Key Policy</a> section of the <i> <i>AWS Key Management Service Developer Guide</i> </i>.</p> </li> <li> <p>Each statement in the key policy must contain one or more principals. The principals in the key policy must exist and be visible to AWS KMS. When you create a new AWS principal (for example, an IAM user or role), you might need to enforce a delay before including the new principal in a key policy because the new principal might not be immediately visible to AWS KMS. For more information, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/troubleshoot_general.html#troubleshoot_general_eventual-consistency\">Changes that I make are not always immediately visible</a> in the <i>AWS Identity and Access Management User Guide</i>.</p> </li> </ul> <p>If you do not provide a key policy, AWS KMS attaches a default key policy to the CMK. For more information, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/key-policies.html#key-policy-default\">Default Key Policy</a> in the <i>AWS Key Management Service Developer Guide</i>.</p> <p>The key policy size limit is 32 kilobytes (32768 bytes).</p>"
+          "documentation":"<p>The key policy to attach to the CMK.</p> <p>If you provide a key policy, it must meet the following criteria:</p> <ul> <li> <p>If you don't set <code>BypassPolicyLockoutSafetyCheck</code> to true, the key policy must allow the principal that is making the <code>CreateKey</code> request to make a subsequent <a>PutKeyPolicy</a> request on the CMK. This reduces the risk that the CMK becomes unmanageable. For more information, refer to the scenario in the <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/key-policies.html#key-policy-default-allow-root-enable-iam\">Default Key Policy</a> section of the <i> <i>AWS Key Management Service Developer Guide</i> </i>.</p> </li> <li> <p>Each statement in the key policy must contain one or more principals. The principals in the key policy must exist and be visible to AWS KMS. When you create a new AWS principal (for example, an IAM user or role), you might need to enforce a delay before including the new principal in a key policy because the new principal might not be immediately visible to AWS KMS. For more information, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/troubleshoot_general.html#troubleshoot_general_eventual-consistency\">Changes that I make are not always immediately visible</a> in the <i>AWS Identity and Access Management User Guide</i>.</p> </li> </ul> <p>If you do not provide a key policy, AWS KMS attaches a default key policy to the CMK. For more information, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/key-policies.html#key-policy-default\">Default Key Policy</a> in the <i>AWS Key Management Service Developer Guide</i>.</p> <p>The key policy size quota is 32 kilobytes (32768 bytes).</p>"
         },
         "Description":{
           "shape":"DescriptionType",
@@ -1009,15 +1119,19 @@
         },
         "KeyUsage":{
           "shape":"KeyUsageType",
-          "documentation":"<p>The cryptographic operations for which you can use the CMK. The only valid value is <code>ENCRYPT_DECRYPT</code>, which means you can use the CMK to encrypt and decrypt data.</p>"
+          "documentation":"<p>Determines the cryptographic operations for which you can use the CMK. The default value is <code>ENCRYPT_DECRYPT</code>. This parameter is required only for asymmetric CMKs. You can't change the <code>KeyUsage</code> value after the CMK is created.</p> <p>Select only one valid value.</p> <ul> <li> <p>For symmetric CMKs, omit the parameter or specify <code>ENCRYPT_DECRYPT</code>.</p> </li> <li> <p>For asymmetric CMKs with RSA key material, specify <code>ENCRYPT_DECRYPT</code> or <code>SIGN_VERIFY</code>.</p> </li> <li> <p>For asymmetric CMKs with ECC key material, specify <code>SIGN_VERIFY</code>.</p> </li> </ul>"
+        },
+        "CustomerMasterKeySpec":{
+          "shape":"CustomerMasterKeySpec",
+          "documentation":"<p>Specifies the type of CMK to create. The default value, <code>SYMMETRIC_DEFAULT</code>, creates a CMK with a 256-bit symmetric key for encryption and decryption. For help choosing a key spec for your CMK, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/symm-asymm-choose.html\">How to Choose Your CMK Configuration</a> in the <i>AWS Key Management Service Developer Guide</i>.</p> <p>The <code>CustomerMasterKeySpec</code> determines whether the CMK contains a symmetric key or an asymmetric key pair. It also determines the encryption algorithms or signing algorithms that the CMK supports. You can't change the <code>CustomerMasterKeySpec</code> after the CMK is created. To further restrict the algorithms that can be used with the CMK, use a condition key in its key policy or IAM policy. For more information, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/policy-conditions.html#conditions-kms-encryption-algorithm\">kms:EncryptionAlgorithm</a> or <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/policy-conditions.html#conditions-kms-signing-algorithm\">kms:Signing Algorithm</a> in the <i>AWS Key Management Service Developer Guide</i>.</p> <important> <p> <a href=\"http://aws.amazon.com/kms/features/#AWS_Service_Integration\">AWS services that are integrated with AWS KMS</a> use symmetric CMKs to protect your data. These services do not support asymmetric CMKs. For help determining whether a CMK is symmetric or asymmetric, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/find-symm-asymm.html\">Identifying Symmetric and Asymmetric CMKs</a> in the <i>AWS Key Management Service Developer Guide</i>.</p> </important> <p>AWS KMS supports the following key specs for CMKs:</p> <ul> <li> <p>Symmetric key (default)</p> <ul> <li> <p> <code>SYMMETRIC_DEFAULT</code> (AES-256-GCM)</p> </li> </ul> </li> <li> <p>Asymmetric RSA key pairs</p> <ul> <li> <p> <code>RSA_2048</code> </p> </li> <li> <p> <code>RSA_3072</code> </p> </li> <li> <p> <code>RSA_4096</code> </p> </li> </ul> </li> <li> <p>Asymmetric NIST-recommended elliptic curve key pairs</p> <ul> <li> <p> <code>ECC_NIST_P256</code> (secp256r1)</p> </li> <li> <p> <code>ECC_NIST_P384</code> (secp384r1)</p> </li> <li> <p> <code>ECC_NIST_P521</code> (secp521r1)</p> </li> </ul> </li> <li> <p>Other asymmetric elliptic curve key pairs</p> <ul> <li> <p> <code>ECC_SECG_P256K1</code> (secp256k1), commonly used for cryptocurrencies.</p> </li> </ul> </li> </ul>"
         },
         "Origin":{
           "shape":"OriginType",
-          "documentation":"<p>The source of the key material for the CMK. You cannot change the origin after you create the CMK.</p> <p>The default is <code>AWS_KMS</code>, which means AWS KMS creates the key material in its own key store.</p> <p>When the parameter value is <code>EXTERNAL</code>, AWS KMS creates a CMK without key material so that you can import key material from your existing key management infrastructure. For more information about importing key material into AWS KMS, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/importing-keys.html\">Importing Key Material</a> in the <i>AWS Key Management Service Developer Guide</i>.</p> <p>When the parameter value is <code>AWS_CLOUDHSM</code>, AWS KMS creates the CMK in an AWS KMS <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/custom-key-store-overview.html\">custom key store</a> and creates its key material in the associated AWS CloudHSM cluster. You must also use the <code>CustomKeyStoreId</code> parameter to identify the custom key store.</p>"
+          "documentation":"<p>The source of the key material for the CMK. You cannot change the origin after you create the CMK. The default is <code>AWS_KMS</code>, which means AWS KMS creates the key material.</p> <p>When the parameter value is <code>EXTERNAL</code>, AWS KMS creates a CMK without key material so that you can import key material from your existing key management infrastructure. For more information about importing key material into AWS KMS, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/importing-keys.html\">Importing Key Material</a> in the <i>AWS Key Management Service Developer Guide</i>. This value is valid only for symmetric CMKs.</p> <p>When the parameter value is <code>AWS_CLOUDHSM</code>, AWS KMS creates the CMK in an AWS KMS <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/custom-key-store-overview.html\">custom key store</a> and creates its key material in the associated AWS CloudHSM cluster. You must also use the <code>CustomKeyStoreId</code> parameter to identify the custom key store. This value is valid only for symmetric CMKs.</p>"
         },
         "CustomKeyStoreId":{
           "shape":"CustomKeyStoreIdType",
-          "documentation":"<p>Creates the CMK in the specified <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/custom-key-store-overview.html\">custom key store</a> and the key material in its associated AWS CloudHSM cluster. To create a CMK in a custom key store, you must also specify the <code>Origin</code> parameter with a value of <code>AWS_CLOUDHSM</code>. The AWS CloudHSM cluster that is associated with the custom key store must have at least two active HSMs, each in a different Availability Zone in the Region.</p> <p>To find the ID of a custom key store, use the <a>DescribeCustomKeyStores</a> operation.</p> <p>The response includes the custom key store ID and the ID of the AWS CloudHSM cluster.</p> <p>This operation is part of the <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/custom-key-store-overview.html\">Custom Key Store feature</a> feature in AWS KMS, which combines the convenience and extensive integration of AWS KMS with the isolation and control of a single-tenant key store.</p>"
+          "documentation":"<p>Creates the CMK in the specified <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/custom-key-store-overview.html\">custom key store</a> and the key material in its associated AWS CloudHSM cluster. To create a CMK in a custom key store, you must also specify the <code>Origin</code> parameter with a value of <code>AWS_CLOUDHSM</code>. The AWS CloudHSM cluster that is associated with the custom key store must have at least two active HSMs, each in a different Availability Zone in the Region.</p> <p>This parameter is valid only for symmetric CMKs. You cannot create an asymmetric CMK in a custom key store.</p> <p>To find the ID of a custom key store, use the <a>DescribeCustomKeyStores</a> operation.</p> <p>The response includes the custom key store ID and the ID of the AWS CloudHSM cluster.</p> <p>This operation is part of the <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/custom-key-store-overview.html\">Custom Key Store feature</a> feature in AWS KMS, which combines the convenience and extensive integration of AWS KMS with the isolation and control of a single-tenant key store.</p>"
         },
         "BypassPolicyLockoutSafetyCheck":{
           "shape":"BooleanType",
@@ -1025,7 +1139,7 @@
         },
         "Tags":{
           "shape":"TagList",
-          "documentation":"<p>One or more tags. Each tag consists of a tag key and a tag value. Tag keys and tag values are both required, but tag values can be empty (null) strings.</p> <p>Use this parameter to tag the CMK when it is created. Alternately, you can omit this parameter and instead tag the CMK after it is created using <a>TagResource</a>.</p>"
+          "documentation":"<p>One or more tags. Each tag consists of a tag key and a tag value. Both the tag key and the tag value are required, but the tag value can be an empty (null) string.</p> <p>When you add tags to an AWS resource, AWS generates a cost allocation report with usage and costs aggregated by tags. For information about adding, changing, deleting and listing tags for CMKs, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/tagging-keys.html\">Tagging Keys</a>.</p> <p>Use this parameter to tag the CMK when it is created. To add tags to an existing CMK, use the <a>TagResource</a> operation.</p>"
         }
       }
     },
@@ -1105,11 +1219,11 @@
         },
         "ConnectionState":{
           "shape":"ConnectionStateType",
-          "documentation":"<p>Indicates whether the custom key store is connected to its AWS CloudHSM cluster.</p> <p>You can create and use CMKs in your custom key stores only when its connection state is <code>CONNECTED</code>.</p> <p>The value is <code>DISCONNECTED</code> if the key store has never been connected or you use the <a>DisconnectCustomKeyStore</a> operation to disconnect it. If the value is <code>CONNECTED</code> but you are having trouble using the custom key store, make sure that its associated AWS CloudHSM cluster is active and contains at least one active HSM.</p> <p>A value of <code>FAILED</code> indicates that an attempt to connect was unsuccessful. For help resolving a connection failure, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/fix-keystore.html\">Troubleshooting a Custom Key Store</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
+          "documentation":"<p>Indicates whether the custom key store is connected to its AWS CloudHSM cluster.</p> <p>You can create and use CMKs in your custom key stores only when its connection state is <code>CONNECTED</code>.</p> <p>The value is <code>DISCONNECTED</code> if the key store has never been connected or you use the <a>DisconnectCustomKeyStore</a> operation to disconnect it. If the value is <code>CONNECTED</code> but you are having trouble using the custom key store, make sure that its associated AWS CloudHSM cluster is active and contains at least one active HSM.</p> <p>A value of <code>FAILED</code> indicates that an attempt to connect was unsuccessful. The <code>ConnectionErrorCode</code> field in the response indicates the cause of the failure. For help resolving a connection failure, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/fix-keystore.html\">Troubleshooting a Custom Key Store</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
         },
         "ConnectionErrorCode":{
           "shape":"ConnectionErrorCodeType",
-          "documentation":"<p>Describes the connection error. Valid values are:</p> <ul> <li> <p> <code>CLUSTER_NOT_FOUND</code> - AWS KMS cannot find the AWS CloudHSM cluster with the specified cluster ID.</p> </li> <li> <p> <code>INSUFFICIENT_CLOUDHSM_HSMS</code> - The associated AWS CloudHSM cluster does not contain any active HSMs. To connect a custom key store to its AWS CloudHSM cluster, the cluster must contain at least one active HSM.</p> </li> <li> <p> <code>INTERNAL_ERROR</code> - AWS KMS could not complete the request due to an internal error. Retry the request. For <code>ConnectCustomKeyStore</code> requests, disconnect the custom key store before trying to connect again.</p> </li> <li> <p> <code>INVALID_CREDENTIALS</code> - AWS KMS does not have the correct password for the <code>kmsuser</code> crypto user in the AWS CloudHSM cluster.</p> </li> <li> <p> <code>NETWORK_ERRORS</code> - Network errors are preventing AWS KMS from connecting to the custom key store.</p> </li> <li> <p> <code>USER_LOCKED_OUT</code> - The <code>kmsuser</code> CU account is locked out of the associated AWS CloudHSM cluster due to too many failed password attempts. Before you can connect your custom key store to its AWS CloudHSM cluster, you must change the <code>kmsuser</code> account password and update the password value for the custom key store.</p> </li> </ul> <p>For help with connection failures, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/fix-keystore.html\">Troubleshooting Custom Key Stores</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
+          "documentation":"<p>Describes the connection error. This field appears in the response only when the <code>ConnectionState</code> is <code>FAILED</code>. For help resolving these errors, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/fix-keystore.html#fix-keystore-failed\">How to Fix a Connection Failure</a> in <i>AWS Key Management Service Developer Guide</i>.</p> <p>Valid values are:</p> <ul> <li> <p> <code>CLUSTER_NOT_FOUND</code> - AWS KMS cannot find the AWS CloudHSM cluster with the specified cluster ID.</p> </li> <li> <p> <code>INSUFFICIENT_CLOUDHSM_HSMS</code> - The associated AWS CloudHSM cluster does not contain any active HSMs. To connect a custom key store to its AWS CloudHSM cluster, the cluster must contain at least one active HSM.</p> </li> <li> <p> <code>INTERNAL_ERROR</code> - AWS KMS could not complete the request due to an internal error. Retry the request. For <code>ConnectCustomKeyStore</code> requests, disconnect the custom key store before trying to connect again.</p> </li> <li> <p> <code>INVALID_CREDENTIALS</code> - AWS KMS does not have the correct password for the <code>kmsuser</code> crypto user in the AWS CloudHSM cluster. Before you can connect your custom key store to its AWS CloudHSM cluster, you must change the <code>kmsuser</code> account password and update the key store password value for the custom key store.</p> </li> <li> <p> <code>NETWORK_ERRORS</code> - Network errors are preventing AWS KMS from connecting to the custom key store.</p> </li> <li> <p> <code>SUBNET_NOT_FOUND</code> - A subnet in the AWS CloudHSM cluster configuration was deleted. If AWS KMS cannot find all of the subnets that were configured for the cluster when the custom key store was created, attempts to connect fail. To fix this error, create a cluster from a backup and associate it with your custom key store. This process includes selecting a VPC and subnets. For details, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/fix-keystore.html#fix-keystore-failed\">How to Fix a Connection Failure</a> in the <i>AWS Key Management Service Developer Guide</i>.</p> </li> <li> <p> <code>USER_LOCKED_OUT</code> - The <code>kmsuser</code> CU account is locked out of the associated AWS CloudHSM cluster due to too many failed password attempts. Before you can connect your custom key store to its AWS CloudHSM cluster, you must change the <code>kmsuser</code> account password and update the key store password value for the custom key store.</p> </li> <li> <p> <code>USER_LOGGED_IN</code> - The <code>kmsuser</code> CU account is logged into the the associated AWS CloudHSM cluster. This prevents AWS KMS from rotating the <code>kmsuser</code> account password and logging into the cluster. Before you can connect your custom key store to its AWS CloudHSM cluster, you must log the <code>kmsuser</code> CU out of the cluster. If you changed the <code>kmsuser</code> password to log into the cluster, you must also and update the key store password value for the custom key store. For help, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/fix-keystore.html#login-kmsuser-2\">How to Log Out and Reconnect</a> in the <i>AWS Key Management Service Developer Guide</i>.</p> </li> <li> <p> <code>USER_NOT_FOUND</code> - AWS KMS cannot find a <code>kmsuser</code> CU account in the associated AWS CloudHSM cluster. Before you can connect your custom key store to its AWS CloudHSM cluster, you must create a <code>kmsuser</code> CU account in the cluster, and then update the key store password value for the custom key store.</p> </li> </ul>"
         },
         "CreationDate":{
           "shape":"DateType",
@@ -1118,6 +1232,31 @@
       },
       "documentation":"<p>Contains information about each custom key store in the custom key store list.</p>"
     },
+    "CustomerMasterKeySpec":{
+      "type":"string",
+      "enum":[
+        "RSA_2048",
+        "RSA_3072",
+        "RSA_4096",
+        "ECC_NIST_P256",
+        "ECC_NIST_P384",
+        "ECC_NIST_P521",
+        "ECC_SECG_P256K1",
+        "SYMMETRIC_DEFAULT"
+      ]
+    },
+    "DataKeyPairSpec":{
+      "type":"string",
+      "enum":[
+        "RSA_2048",
+        "RSA_3072",
+        "RSA_4096",
+        "ECC_NIST_P256",
+        "ECC_NIST_P384",
+        "ECC_NIST_P521",
+        "ECC_SECG_P256K1"
+      ]
+    },
     "DataKeySpec":{
       "type":"string",
       "enum":[
@@ -1136,11 +1275,19 @@
         },
         "EncryptionContext":{
           "shape":"EncryptionContextType",
-          "documentation":"<p>The encryption context. If this was specified in the <a>Encrypt</a> function, it must be specified here or the decryption operation will fail. For more information, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#encrypt_context\">Encryption Context</a>.</p>"
+          "documentation":"<p>Specifies the encryption context to use when decrypting the data. An encryption context is valid only for cryptographic operations with a symmetric CMK. The standard asymmetric encryption algorithms that AWS KMS uses do not support an encryption context.</p> <p>An <i>encryption context</i> is a collection of non-secret key-value pairs that represents additional authenticated data. When you use an encryption context to encrypt data, you must specify the same (an exact case-sensitive match) encryption context to decrypt the data. An encryption context is optional when encrypting with a symmetric CMK, but it is highly recommended.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#encrypt_context\">Encryption Context</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
         },
         "GrantTokens":{
           "shape":"GrantTokenList",
           "documentation":"<p>A list of grant tokens.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#grant_token\">Grant Tokens</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
+        },
+        "KeyId":{
+          "shape":"KeyIdType",
+          "documentation":"<p>Specifies the customer master key (CMK) that AWS KMS will use to decrypt the ciphertext. Enter a key ID of the CMK that was used to encrypt the ciphertext.</p> <p>If you specify a <code>KeyId</code> value, the <code>Decrypt</code> operation succeeds only if the specified CMK was used to encrypt the ciphertext.</p> <p>This parameter is required only when the ciphertext was encrypted under an asymmetric CMK. Otherwise, AWS KMS uses the metadata that it adds to the ciphertext blob to determine which CMK was used to encrypt the ciphertext. However, you can use this parameter to ensure that a particular CMK (of any kind) is used to decrypt the ciphertext.</p> <p>To specify a CMK, use its key ID, Amazon Resource Name (ARN), alias name, or alias ARN. When using an alias name, prefix it with <code>\"alias/\"</code>.</p> <p>For example:</p> <ul> <li> <p>Key ID: <code>1234abcd-12ab-34cd-56ef-1234567890ab</code> </p> </li> <li> <p>Key ARN: <code>arn:aws:kms:us-east-2:111122223333:key/1234abcd-12ab-34cd-56ef-1234567890ab</code> </p> </li> <li> <p>Alias name: <code>alias/ExampleAlias</code> </p> </li> <li> <p>Alias ARN: <code>arn:aws:kms:us-east-2:111122223333:alias/ExampleAlias</code> </p> </li> </ul> <p>To get the key ID and key ARN for a CMK, use <a>ListKeys</a> or <a>DescribeKey</a>. To get the alias name and alias ARN, use <a>ListAliases</a>.</p>"
+        },
+        "EncryptionAlgorithm":{
+          "shape":"EncryptionAlgorithmSpec",
+          "documentation":"<p>Specifies the encryption algorithm that will be used to decrypt the ciphertext. Specify the same algorithm that was used to encrypt the data. If you specify a different algorithm, the <code>Decrypt</code> operation fails.</p> <p>This parameter is required only when the ciphertext was encrypted under an asymmetric CMK. The default value, <code>SYMMETRIC_DEFAULT</code>, represents the only supported algorithm that is valid for symmetric CMKs.</p>"
         }
       }
     },
@@ -1149,11 +1296,15 @@
       "members":{
         "KeyId":{
           "shape":"KeyIdType",
-          "documentation":"<p>ARN of the key used to perform the decryption. This value is returned if no errors are encountered during the operation.</p>"
+          "documentation":"<p>The ARN of the customer master key that was used to perform the decryption.</p>"
         },
         "Plaintext":{
           "shape":"PlaintextType",
-          "documentation":"<p>Decrypted plaintext data. When you use the HTTP API or the AWS CLI, the value is Base64-encoded. Otherwise, it is not encoded.</p>"
+          "documentation":"<p>Decrypted plaintext data. When you use the HTTP API or the AWS CLI, the value is Base64-encoded. Otherwise, it is not Base64-encoded.</p>"
+        },
+        "EncryptionAlgorithm":{
+          "shape":"EncryptionAlgorithmSpec",
+          "documentation":"<p>The encryption algorithm that was used to decrypt the ciphertext.</p>"
         }
       }
     },
@@ -1283,7 +1434,7 @@
       "members":{
         "KeyId":{
           "shape":"KeyIdType",
-          "documentation":"<p>A unique identifier for the customer master key (CMK).</p> <p>Specify the key ID or the Amazon Resource Name (ARN) of the CMK.</p> <p>For example:</p> <ul> <li> <p>Key ID: <code>1234abcd-12ab-34cd-56ef-1234567890ab</code> </p> </li> <li> <p>Key ARN: <code>arn:aws:kms:us-east-2:111122223333:key/1234abcd-12ab-34cd-56ef-1234567890ab</code> </p> </li> </ul> <p>To get the key ID and key ARN for a CMK, use <a>ListKeys</a> or <a>DescribeKey</a>.</p>"
+          "documentation":"<p>Identifies a symmetric customer master key (CMK). You cannot enable automatic rotation of <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/symmetric-asymmetric.html#asymmetric-cmks\">asymmetric CMKs</a>, CMKs with <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/importing-keys.html\">imported key material</a>, or CMKs in a <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/custom-key-store-overview.html\">custom key store</a>.</p> <p>Specify the key ID or the Amazon Resource Name (ARN) of the CMK.</p> <p>For example:</p> <ul> <li> <p>Key ID: <code>1234abcd-12ab-34cd-56ef-1234567890ab</code> </p> </li> <li> <p>Key ARN: <code>arn:aws:kms:us-east-2:111122223333:key/1234abcd-12ab-34cd-56ef-1234567890ab</code> </p> </li> </ul> <p>To get the key ID and key ARN for a CMK, use <a>ListKeys</a> or <a>DescribeKey</a>.</p>"
         }
       }
     },
@@ -1326,7 +1477,7 @@
       "members":{
         "KeyId":{
           "shape":"KeyIdType",
-          "documentation":"<p>A unique identifier for the customer master key (CMK).</p> <p>Specify the key ID or the Amazon Resource Name (ARN) of the CMK.</p> <p>For example:</p> <ul> <li> <p>Key ID: <code>1234abcd-12ab-34cd-56ef-1234567890ab</code> </p> </li> <li> <p>Key ARN: <code>arn:aws:kms:us-east-2:111122223333:key/1234abcd-12ab-34cd-56ef-1234567890ab</code> </p> </li> </ul> <p>To get the key ID and key ARN for a CMK, use <a>ListKeys</a> or <a>DescribeKey</a>.</p>"
+          "documentation":"<p>Identifies a symmetric customer master key (CMK). You cannot enable automatic rotation of asymmetric CMKs, CMKs with imported key material, or CMKs in a <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/custom-key-store-overview.html\">custom key store</a>.</p> <p>Specify the key ID or the Amazon Resource Name (ARN) of the CMK.</p> <p>For example:</p> <ul> <li> <p>Key ID: <code>1234abcd-12ab-34cd-56ef-1234567890ab</code> </p> </li> <li> <p>Key ARN: <code>arn:aws:kms:us-east-2:111122223333:key/1234abcd-12ab-34cd-56ef-1234567890ab</code> </p> </li> </ul> <p>To get the key ID and key ARN for a CMK, use <a>ListKeys</a> or <a>DescribeKey</a>.</p>"
         }
       }
     },
@@ -1347,11 +1498,15 @@
         },
         "EncryptionContext":{
           "shape":"EncryptionContextType",
-          "documentation":"<p>Name-value pair that specifies the encryption context to be used for authenticated encryption. If used here, the same value must be supplied to the <code>Decrypt</code> API or decryption will fail. For more information, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#encrypt_context\">Encryption Context</a>.</p>"
+          "documentation":"<p>Specifies the encryption context that will be used to encrypt the data. An encryption context is valid only for cryptographic operations with a symmetric CMK. The standard asymmetric encryption algorithms that AWS KMS uses do not support an encryption context. </p> <p>An <i>encryption context</i> is a collection of non-secret key-value pairs that represents additional authenticated data. When you use an encryption context to encrypt data, you must specify the same (an exact case-sensitive match) encryption context to decrypt the data. An encryption context is optional when encrypting with a symmetric CMK, but it is highly recommended.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#encrypt_context\">Encryption Context</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
         },
         "GrantTokens":{
           "shape":"GrantTokenList",
           "documentation":"<p>A list of grant tokens.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#grant_token\">Grant Tokens</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
+        },
+        "EncryptionAlgorithm":{
+          "shape":"EncryptionAlgorithmSpec",
+          "documentation":"<p>Specifies the encryption algorithm that AWS KMS will use to encrypt the plaintext message. The algorithm must be compatible with the CMK that you specify.</p> <p>This parameter is required only for asymmetric CMKs. The default value, <code>SYMMETRIC_DEFAULT</code>, is the algorithm used for symmetric CMKs. If you are using an asymmetric CMK, we recommend RSAES_OAEP_SHA_256.</p>"
         }
       }
     },
@@ -1360,14 +1515,30 @@
       "members":{
         "CiphertextBlob":{
           "shape":"CiphertextType",
-          "documentation":"<p>The encrypted plaintext. When you use the HTTP API or the AWS CLI, the value is Base64-encoded. Otherwise, it is not encoded.</p>"
+          "documentation":"<p>The encrypted plaintext. When you use the HTTP API or the AWS CLI, the value is Base64-encoded. Otherwise, it is not Base64-encoded.</p>"
         },
         "KeyId":{
           "shape":"KeyIdType",
           "documentation":"<p>The ID of the key used during encryption.</p>"
+        },
+        "EncryptionAlgorithm":{
+          "shape":"EncryptionAlgorithmSpec",
+          "documentation":"<p>The encryption algorithm that was used to encrypt the plaintext.</p>"
         }
       }
     },
+    "EncryptionAlgorithmSpec":{
+      "type":"string",
+      "enum":[
+        "SYMMETRIC_DEFAULT",
+        "RSAES_OAEP_SHA_1",
+        "RSAES_OAEP_SHA_256"
+      ]
+    },
+    "EncryptionAlgorithmSpecList":{
+      "type":"list",
+      "member":{"shape":"EncryptionAlgorithmSpec"}
+    },
     "EncryptionContextKey":{"type":"string"},
     "EncryptionContextType":{
       "type":"map",
@@ -1388,28 +1559,124 @@
       "members":{
         "message":{"shape":"ErrorMessageType"}
       },
-      "documentation":"<p>The request was rejected because the provided import token is expired. Use <a>GetParametersForImport</a> to get a new import token and public key, use the new public key to encrypt the key material, and then try the request again.</p>",
+      "documentation":"<p>The request was rejected because the specified import token is expired. Use <a>GetParametersForImport</a> to get a new import token and public key, use the new public key to encrypt the key material, and then try the request again.</p>",
       "exception":true
     },
+    "GenerateDataKeyPairRequest":{
+      "type":"structure",
+      "required":[
+        "KeyId",
+        "KeyPairSpec"
+      ],
+      "members":{
+        "EncryptionContext":{
+          "shape":"EncryptionContextType",
+          "documentation":"<p>Specifies the encryption context that will be used when encrypting the private key in the data key pair.</p> <p>An <i>encryption context</i> is a collection of non-secret key-value pairs that represents additional authenticated data. When you use an encryption context to encrypt data, you must specify the same (an exact case-sensitive match) encryption context to decrypt the data. An encryption context is optional when encrypting with a symmetric CMK, but it is highly recommended.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#encrypt_context\">Encryption Context</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
+        },
+        "KeyId":{
+          "shape":"KeyIdType",
+          "documentation":"<p>Specifies the symmetric CMK that encrypts the private key in the data key pair. You cannot specify an asymmetric CMKs.</p> <p>To specify a CMK, use its key ID, Amazon Resource Name (ARN), alias name, or alias ARN. When using an alias name, prefix it with <code>\"alias/\"</code>. To specify a CMK in a different AWS account, you must use the key ARN or alias ARN.</p> <p>For example:</p> <ul> <li> <p>Key ID: <code>1234abcd-12ab-34cd-56ef-1234567890ab</code> </p> </li> <li> <p>Key ARN: <code>arn:aws:kms:us-east-2:111122223333:key/1234abcd-12ab-34cd-56ef-1234567890ab</code> </p> </li> <li> <p>Alias name: <code>alias/ExampleAlias</code> </p> </li> <li> <p>Alias ARN: <code>arn:aws:kms:us-east-2:111122223333:alias/ExampleAlias</code> </p> </li> </ul> <p>To get the key ID and key ARN for a CMK, use <a>ListKeys</a> or <a>DescribeKey</a>. To get the alias name and alias ARN, use <a>ListAliases</a>.</p>"
+        },
+        "KeyPairSpec":{
+          "shape":"DataKeyPairSpec",
+          "documentation":"<p>Determines the type of data key pair that is generated. </p> <p>The AWS KMS rule that restricts the use of asymmetric RSA CMKs to encrypt and decrypt or to sign and verify (but not both), and the rule that permits you to use ECC CMKs only to sign and verify, are not effective outside of AWS KMS.</p>"
+        },
+        "GrantTokens":{
+          "shape":"GrantTokenList",
+          "documentation":"<p>A list of grant tokens.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#grant_token\">Grant Tokens</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
+        }
+      }
+    },
+    "GenerateDataKeyPairResponse":{
+      "type":"structure",
+      "members":{
+        "PrivateKeyCiphertextBlob":{
+          "shape":"CiphertextType",
+          "documentation":"<p>The encrypted copy of the private key. When you use the HTTP API or the AWS CLI, the value is Base64-encoded. Otherwise, it is not Base64-encoded.</p>"
+        },
+        "PrivateKeyPlaintext":{
+          "shape":"PlaintextType",
+          "documentation":"<p>The plaintext copy of the private key. When you use the HTTP API or the AWS CLI, the value is Base64-encoded. Otherwise, it is not Base64-encoded.</p>"
+        },
+        "PublicKey":{
+          "shape":"PublicKeyType",
+          "documentation":"<p>The public key (in plaintext).</p>"
+        },
+        "KeyId":{
+          "shape":"KeyIdType",
+          "documentation":"<p>The identifier of the CMK that encrypted the private key.</p>"
+        },
+        "KeyPairSpec":{
+          "shape":"DataKeyPairSpec",
+          "documentation":"<p>The type of data key pair that was generated.</p>"
+        }
+      }
+    },
+    "GenerateDataKeyPairWithoutPlaintextRequest":{
+      "type":"structure",
+      "required":[
+        "KeyId",
+        "KeyPairSpec"
+      ],
+      "members":{
+        "EncryptionContext":{
+          "shape":"EncryptionContextType",
+          "documentation":"<p>Specifies the encryption context that will be used when encrypting the private key in the data key pair.</p> <p>An <i>encryption context</i> is a collection of non-secret key-value pairs that represents additional authenticated data. When you use an encryption context to encrypt data, you must specify the same (an exact case-sensitive match) encryption context to decrypt the data. An encryption context is optional when encrypting with a symmetric CMK, but it is highly recommended.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#encrypt_context\">Encryption Context</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
+        },
+        "KeyId":{
+          "shape":"KeyIdType",
+          "documentation":"<p>Specifies the CMK that encrypts the private key in the data key pair. You must specify a symmetric CMK. You cannot use an asymmetric CMK. To get the type of your CMK, use the <a>DescribeKey</a> operation. </p> <p>To specify a CMK, use its key ID, Amazon Resource Name (ARN), alias name, or alias ARN. When using an alias name, prefix it with <code>\"alias/\"</code>.</p> <p>For example:</p> <ul> <li> <p>Key ID: <code>1234abcd-12ab-34cd-56ef-1234567890ab</code> </p> </li> <li> <p>Key ARN: <code>arn:aws:kms:us-east-2:111122223333:key/1234abcd-12ab-34cd-56ef-1234567890ab</code> </p> </li> <li> <p>Alias name: <code>alias/ExampleAlias</code> </p> </li> <li> <p>Alias ARN: <code>arn:aws:kms:us-east-2:111122223333:alias/ExampleAlias</code> </p> </li> </ul> <p>To get the key ID and key ARN for a CMK, use <a>ListKeys</a> or <a>DescribeKey</a>. To get the alias name and alias ARN, use <a>ListAliases</a>.</p>"
+        },
+        "KeyPairSpec":{
+          "shape":"DataKeyPairSpec",
+          "documentation":"<p>Determines the type of data key pair that is generated.</p> <p>The AWS KMS rule that restricts the use of asymmetric RSA CMKs to encrypt and decrypt or to sign and verify (but not both), and the rule that permits you to use ECC CMKs only to sign and verify, are not effective outside of AWS KMS.</p>"
+        },
+        "GrantTokens":{
+          "shape":"GrantTokenList",
+          "documentation":"<p>A list of grant tokens.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#grant_token\">Grant Tokens</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
+        }
+      }
+    },
+    "GenerateDataKeyPairWithoutPlaintextResponse":{
+      "type":"structure",
+      "members":{
+        "PrivateKeyCiphertextBlob":{
+          "shape":"CiphertextType",
+          "documentation":"<p>The encrypted copy of the private key. When you use the HTTP API or the AWS CLI, the value is Base64-encoded. Otherwise, it is not Base64-encoded.</p>"
+        },
+        "PublicKey":{
+          "shape":"PublicKeyType",
+          "documentation":"<p>The public key (in plaintext).</p>"
+        },
+        "KeyId":{
+          "shape":"KeyIdType",
+          "documentation":"<p>Specifies the CMK that encrypted the private key in the data key pair. You must specify a symmetric CMK. You cannot use an asymmetric CMK. To get the type of your CMK, use the <a>DescribeKey</a> operation.</p> <p>To specify a CMK, use its key ID, Amazon Resource Name (ARN), alias name, or alias ARN. When using an alias name, prefix it with <code>\"alias/\"</code>.</p> <p>For example:</p> <ul> <li> <p>Key ID: <code>1234abcd-12ab-34cd-56ef-1234567890ab</code> </p> </li> <li> <p>Key ARN: <code>arn:aws:kms:us-east-2:111122223333:key/1234abcd-12ab-34cd-56ef-1234567890ab</code> </p> </li> <li> <p>Alias name: <code>alias/ExampleAlias</code> </p> </li> <li> <p>Alias ARN: <code>arn:aws:kms:us-east-2:111122223333:alias/ExampleAlias</code> </p> </li> </ul> <p>To get the key ID and key ARN for a CMK, use <a>ListKeys</a> or <a>DescribeKey</a>. To get the alias name and alias ARN, use <a>ListAliases</a>.</p>"
+        },
+        "KeyPairSpec":{
+          "shape":"DataKeyPairSpec",
+          "documentation":"<p>The type of data key pair that was generated.</p>"
+        }
+      }
+    },
     "GenerateDataKeyRequest":{
       "type":"structure",
       "required":["KeyId"],
       "members":{
         "KeyId":{
           "shape":"KeyIdType",
-          "documentation":"<p>An identifier for the CMK that encrypts the data key.</p> <p>To specify a CMK, use its key ID, Amazon Resource Name (ARN), alias name, or alias ARN. When using an alias name, prefix it with <code>\"alias/\"</code>. To specify a CMK in a different AWS account, you must use the key ARN or alias ARN.</p> <p>For example:</p> <ul> <li> <p>Key ID: <code>1234abcd-12ab-34cd-56ef-1234567890ab</code> </p> </li> <li> <p>Key ARN: <code>arn:aws:kms:us-east-2:111122223333:key/1234abcd-12ab-34cd-56ef-1234567890ab</code> </p> </li> <li> <p>Alias name: <code>alias/ExampleAlias</code> </p> </li> <li> <p>Alias ARN: <code>arn:aws:kms:us-east-2:111122223333:alias/ExampleAlias</code> </p> </li> </ul> <p>To get the key ID and key ARN for a CMK, use <a>ListKeys</a> or <a>DescribeKey</a>. To get the alias name and alias ARN, use <a>ListAliases</a>.</p>"
+          "documentation":"<p>Identifies the symmetric CMK that encrypts the data key.</p> <p>To specify a CMK, use its key ID, Amazon Resource Name (ARN), alias name, or alias ARN. When using an alias name, prefix it with <code>\"alias/\"</code>. To specify a CMK in a different AWS account, you must use the key ARN or alias ARN.</p> <p>For example:</p> <ul> <li> <p>Key ID: <code>1234abcd-12ab-34cd-56ef-1234567890ab</code> </p> </li> <li> <p>Key ARN: <code>arn:aws:kms:us-east-2:111122223333:key/1234abcd-12ab-34cd-56ef-1234567890ab</code> </p> </li> <li> <p>Alias name: <code>alias/ExampleAlias</code> </p> </li> <li> <p>Alias ARN: <code>arn:aws:kms:us-east-2:111122223333:alias/ExampleAlias</code> </p> </li> </ul> <p>To get the key ID and key ARN for a CMK, use <a>ListKeys</a> or <a>DescribeKey</a>. To get the alias name and alias ARN, use <a>ListAliases</a>.</p>"
         },
         "EncryptionContext":{
           "shape":"EncryptionContextType",
-          "documentation":"<p>A set of key-value pairs that represents additional authenticated data.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#encrypt_context\">Encryption Context</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
+          "documentation":"<p>Specifies the encryption context that will be used when encrypting the data key.</p> <p>An <i>encryption context</i> is a collection of non-secret key-value pairs that represents additional authenticated data. When you use an encryption context to encrypt data, you must specify the same (an exact case-sensitive match) encryption context to decrypt the data. An encryption context is optional when encrypting with a symmetric CMK, but it is highly recommended.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#encrypt_context\">Encryption Context</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
         },
         "NumberOfBytes":{
           "shape":"NumberOfBytesType",
-          "documentation":"<p>The length of the data key in bytes. For example, use the value 64 to generate a 512-bit data key (64 bytes is 512 bits). For common key lengths (128-bit and 256-bit symmetric keys), we recommend that you use the <code>KeySpec</code> field instead of this one.</p>"
+          "documentation":"<p>Specifies the length of the data key in bytes. For example, use the value 64 to generate a 512-bit data key (64 bytes is 512 bits). For 128-bit (16-byte) and 256-bit (32-byte) data keys, use the <code>KeySpec</code> parameter.</p> <p>You must specify either the <code>KeySpec</code> or the <code>NumberOfBytes</code> parameter (but not both) in every <code>GenerateDataKey</code> request.</p>"
         },
         "KeySpec":{
           "shape":"DataKeySpec",
-          "documentation":"<p>The length of the data key. Use <code>AES_128</code> to generate a 128-bit symmetric key, or <code>AES_256</code> to generate a 256-bit symmetric key.</p>"
+          "documentation":"<p>Specifies the length of the data key. Use <code>AES_128</code> to generate a 128-bit symmetric key, or <code>AES_256</code> to generate a 256-bit symmetric key.</p> <p>You must specify either the <code>KeySpec</code> or the <code>NumberOfBytes</code> parameter (but not both) in every <code>GenerateDataKey</code> request.</p>"
         },
         "GrantTokens":{
           "shape":"GrantTokenList",
@@ -1422,11 +1689,11 @@
       "members":{
         "CiphertextBlob":{
           "shape":"CiphertextType",
-          "documentation":"<p>The encrypted copy of the data key. When you use the HTTP API or the AWS CLI, the value is Base64-encoded. Otherwise, it is not encoded.</p>"
+          "documentation":"<p>The encrypted copy of the data key. When you use the HTTP API or the AWS CLI, the value is Base64-encoded. Otherwise, it is not Base64-encoded.</p>"
         },
         "Plaintext":{
           "shape":"PlaintextType",
-          "documentation":"<p>The plaintext data key. When you use the HTTP API or the AWS CLI, the value is Base64-encoded. Otherwise, it is not encoded. Use this data key to encrypt your data outside of KMS. Then, remove it from memory as soon as possible.</p>"
+          "documentation":"<p>The plaintext data key. When you use the HTTP API or the AWS CLI, the value is Base64-encoded. Otherwise, it is not Base64-encoded. Use this data key to encrypt your data outside of KMS. Then, remove it from memory as soon as possible.</p>"
         },
         "KeyId":{
           "shape":"KeyIdType",
@@ -1440,11 +1707,11 @@
       "members":{
         "KeyId":{
           "shape":"KeyIdType",
-          "documentation":"<p>The identifier of the customer master key (CMK) that encrypts the data key.</p> <p>To specify a CMK, use its key ID, Amazon Resource Name (ARN), alias name, or alias ARN. When using an alias name, prefix it with <code>\"alias/\"</code>. To specify a CMK in a different AWS account, you must use the key ARN or alias ARN.</p> <p>For example:</p> <ul> <li> <p>Key ID: <code>1234abcd-12ab-34cd-56ef-1234567890ab</code> </p> </li> <li> <p>Key ARN: <code>arn:aws:kms:us-east-2:111122223333:key/1234abcd-12ab-34cd-56ef-1234567890ab</code> </p> </li> <li> <p>Alias name: <code>alias/ExampleAlias</code> </p> </li> <li> <p>Alias ARN: <code>arn:aws:kms:us-east-2:111122223333:alias/ExampleAlias</code> </p> </li> </ul> <p>To get the key ID and key ARN for a CMK, use <a>ListKeys</a> or <a>DescribeKey</a>. To get the alias name and alias ARN, use <a>ListAliases</a>.</p>"
+          "documentation":"<p>The identifier of the symmetric customer master key (CMK) that encrypts the data key.</p> <p>To specify a CMK, use its key ID, Amazon Resource Name (ARN), alias name, or alias ARN. When using an alias name, prefix it with <code>\"alias/\"</code>. To specify a CMK in a different AWS account, you must use the key ARN or alias ARN.</p> <p>For example:</p> <ul> <li> <p>Key ID: <code>1234abcd-12ab-34cd-56ef-1234567890ab</code> </p> </li> <li> <p>Key ARN: <code>arn:aws:kms:us-east-2:111122223333:key/1234abcd-12ab-34cd-56ef-1234567890ab</code> </p> </li> <li> <p>Alias name: <code>alias/ExampleAlias</code> </p> </li> <li> <p>Alias ARN: <code>arn:aws:kms:us-east-2:111122223333:alias/ExampleAlias</code> </p> </li> </ul> <p>To get the key ID and key ARN for a CMK, use <a>ListKeys</a> or <a>DescribeKey</a>. To get the alias name and alias ARN, use <a>ListAliases</a>.</p>"
         },
         "EncryptionContext":{
           "shape":"EncryptionContextType",
-          "documentation":"<p>A set of key-value pairs that represents additional authenticated data.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#encrypt_context\">Encryption Context</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
+          "documentation":"<p>Specifies the encryption context that will be used when encrypting the data key.</p> <p>An <i>encryption context</i> is a collection of non-secret key-value pairs that represents additional authenticated data. When you use an encryption context to encrypt data, you must specify the same (an exact case-sensitive match) encryption context to decrypt the data. An encryption context is optional when encrypting with a symmetric CMK, but it is highly recommended.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#encrypt_context\">Encryption Context</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
         },
         "KeySpec":{
           "shape":"DataKeySpec",
@@ -1465,7 +1732,7 @@
       "members":{
         "CiphertextBlob":{
           "shape":"CiphertextType",
-          "documentation":"<p>The encrypted data key. When you use the HTTP API or the AWS CLI, the value is Base64-encoded. Otherwise, it is not encoded.</p>"
+          "documentation":"<p>The encrypted data key. When you use the HTTP API or the AWS CLI, the value is Base64-encoded. Otherwise, it is not Base64-encoded.</p>"
         },
         "KeyId":{
           "shape":"KeyIdType",
@@ -1491,7 +1758,7 @@
       "members":{
         "Plaintext":{
           "shape":"PlaintextType",
-          "documentation":"<p>The random byte string. When you use the HTTP API or the AWS CLI, the value is Base64-encoded. Otherwise, it is not encoded.</p>"
+          "documentation":"<p>The random byte string. When you use the HTTP API or the AWS CLI, the value is Base64-encoded. Otherwise, it is not Base64-encoded.</p>"
         }
       }
     },
@@ -1550,7 +1817,7 @@
       "members":{
         "KeyId":{
           "shape":"KeyIdType",
-          "documentation":"<p>The identifier of the CMK into which you will import key material. The CMK's <code>Origin</code> must be <code>EXTERNAL</code>.</p> <p>Specify the key ID or the Amazon Resource Name (ARN) of the CMK.</p> <p>For example:</p> <ul> <li> <p>Key ID: <code>1234abcd-12ab-34cd-56ef-1234567890ab</code> </p> </li> <li> <p>Key ARN: <code>arn:aws:kms:us-east-2:111122223333:key/1234abcd-12ab-34cd-56ef-1234567890ab</code> </p> </li> </ul> <p>To get the key ID and key ARN for a CMK, use <a>ListKeys</a> or <a>DescribeKey</a>.</p>"
+          "documentation":"<p>The identifier of the symmetric CMK into which you will import key material. The <code>Origin</code> of the CMK must be <code>EXTERNAL</code>.</p> <p>Specify the key ID or the Amazon Resource Name (ARN) of the CMK.</p> <p>For example:</p> <ul> <li> <p>Key ID: <code>1234abcd-12ab-34cd-56ef-1234567890ab</code> </p> </li> <li> <p>Key ARN: <code>arn:aws:kms:us-east-2:111122223333:key/1234abcd-12ab-34cd-56ef-1234567890ab</code> </p> </li> </ul> <p>To get the key ID and key ARN for a CMK, use <a>ListKeys</a> or <a>DescribeKey</a>.</p>"
         },
         "WrappingAlgorithm":{
           "shape":"AlgorithmSpec",
@@ -1583,6 +1850,49 @@
         }
       }
     },
+    "GetPublicKeyRequest":{
+      "type":"structure",
+      "required":["KeyId"],
+      "members":{
+        "KeyId":{
+          "shape":"KeyIdType",
+          "documentation":"<p>Identifies the asymmetric CMK that includes the public key.</p> <p>To specify a CMK, use its key ID, Amazon Resource Name (ARN), alias name, or alias ARN. When using an alias name, prefix it with <code>\"alias/\"</code>. To specify a CMK in a different AWS account, you must use the key ARN or alias ARN.</p> <p>For example:</p> <ul> <li> <p>Key ID: <code>1234abcd-12ab-34cd-56ef-1234567890ab</code> </p> </li> <li> <p>Key ARN: <code>arn:aws:kms:us-east-2:111122223333:key/1234abcd-12ab-34cd-56ef-1234567890ab</code> </p> </li> <li> <p>Alias name: <code>alias/ExampleAlias</code> </p> </li> <li> <p>Alias ARN: <code>arn:aws:kms:us-east-2:111122223333:alias/ExampleAlias</code> </p> </li> </ul> <p>To get the key ID and key ARN for a CMK, use <a>ListKeys</a> or <a>DescribeKey</a>. To get the alias name and alias ARN, use <a>ListAliases</a>.</p>"
+        },
+        "GrantTokens":{
+          "shape":"GrantTokenList",
+          "documentation":"<p>A list of grant tokens.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#grant_token\">Grant Tokens</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
+        }
+      }
+    },
+    "GetPublicKeyResponse":{
+      "type":"structure",
+      "members":{
+        "KeyId":{
+          "shape":"KeyIdType",
+          "documentation":"<p>The identifier of the asymmetric CMK from which the public key was downloaded.</p>"
+        },
+        "PublicKey":{
+          "shape":"PublicKeyType",
+          "documentation":"<p>The exported public key. </p> <p>The value is a DER-encoded X.509 public key, also known as <code>SubjectPublicKeyInfo</code> (SPKI), as defined in <a href=\"https://tools.ietf.org/html/rfc5280\">RFC 5280</a>. When you use the HTTP API or the AWS CLI, the value is Base64-encoded. Otherwise, it is not Base64-encoded.</p> <p/>"
+        },
+        "CustomerMasterKeySpec":{
+          "shape":"CustomerMasterKeySpec",
+          "documentation":"<p>The type of the of the public key that was downloaded.</p>"
+        },
+        "KeyUsage":{
+          "shape":"KeyUsageType",
+          "documentation":"<p>The permitted use of the public key. Valid values are <code>ENCRYPT_DECRYPT</code> or <code>SIGN_VERIFY</code>. </p> <p>This information is critical. If a public key with <code>SIGN_VERIFY</code> key usage encrypts data outside of AWS KMS, the ciphertext cannot be decrypted. </p>"
+        },
+        "EncryptionAlgorithms":{
+          "shape":"EncryptionAlgorithmSpecList",
+          "documentation":"<p>The encryption algorithms that AWS KMS supports for this key. </p> <p>This information is critical. If a public key encrypts data outside of AWS KMS by using an unsupported encryption algorithm, the ciphertext cannot be decrypted. </p> <p>This field appears in the response only when the <code>KeyUsage</code> of the public key is <code>ENCRYPT_DECRYPT</code>.</p>"
+        },
+        "SigningAlgorithms":{
+          "shape":"SigningAlgorithmSpecList",
+          "documentation":"<p>The signing algorithms that AWS KMS supports for this key.</p> <p>This field appears in the response only when the <code>KeyUsage</code> of the public key is <code>SIGN_VERIFY</code>.</p>"
+        }
+      }
+    },
     "GrantConstraints":{
       "type":"structure",
       "members":{
@@ -1663,9 +1973,14 @@
         "GenerateDataKeyWithoutPlaintext",
         "ReEncryptFrom",
         "ReEncryptTo",
+        "Sign",
+        "Verify",
+        "GetPublicKey",
         "CreateGrant",
         "RetireGrant",
-        "DescribeKey"
+        "DescribeKey",
+        "GenerateDataKeyPair",
+        "GenerateDataKeyPairWithoutPlaintext"
       ]
     },
     "GrantOperationList":{
@@ -1693,7 +2008,7 @@
       "members":{
         "KeyId":{
           "shape":"KeyIdType",
-          "documentation":"<p>The identifier of the CMK to import the key material into. The CMK's <code>Origin</code> must be <code>EXTERNAL</code>.</p> <p>Specify the key ID or the Amazon Resource Name (ARN) of the CMK.</p> <p>For example:</p> <ul> <li> <p>Key ID: <code>1234abcd-12ab-34cd-56ef-1234567890ab</code> </p> </li> <li> <p>Key ARN: <code>arn:aws:kms:us-east-2:111122223333:key/1234abcd-12ab-34cd-56ef-1234567890ab</code> </p> </li> </ul> <p>To get the key ID and key ARN for a CMK, use <a>ListKeys</a> or <a>DescribeKey</a>.</p>"
+          "documentation":"<p>The identifier of the symmetric CMK that receives the imported key material. The CMK's <code>Origin</code> must be <code>EXTERNAL</code>. This must be the same CMK specified in the <code>KeyID</code> parameter of the corresponding <a>GetParametersForImport</a> request.</p> <p>Specify the key ID or the Amazon Resource Name (ARN) of the CMK.</p> <p>For example:</p> <ul> <li> <p>Key ID: <code>1234abcd-12ab-34cd-56ef-1234567890ab</code> </p> </li> <li> <p>Key ARN: <code>arn:aws:kms:us-east-2:111122223333:key/1234abcd-12ab-34cd-56ef-1234567890ab</code> </p> </li> </ul> <p>To get the key ID and key ARN for a CMK, use <a>ListKeys</a> or <a>DescribeKey</a>.</p>"
         },
         "ImportToken":{
           "shape":"CiphertextType",
@@ -1701,7 +2016,7 @@
         },
         "EncryptedKeyMaterial":{
           "shape":"CiphertextType",
-          "documentation":"<p>The encrypted key material to import. It must be encrypted with the public key that you received in the response to a previous <a>GetParametersForImport</a> request, using the wrapping algorithm that you specified in that request.</p>"
+          "documentation":"<p>The encrypted key material to import. The key material must be encrypted with the public wrapping key that <a>GetParametersForImport</a> returned, using the wrapping algorithm that you specified in the same <code>GetParametersForImport</code> request.</p>"
         },
         "ValidTo":{
           "shape":"DateType",
@@ -1718,12 +2033,20 @@
       "members":{
       }
     },
+    "IncorrectKeyException":{
+      "type":"structure",
+      "members":{
+        "message":{"shape":"ErrorMessageType"}
+      },
+      "documentation":"<p>The request was rejected because the specified CMK cannot decrypt the data. The <code>KeyId</code> in a <a>Decrypt</a> request and the <code>SourceKeyId</code> in a <a>ReEncrypt</a> request must identify the same CMK that was used to encrypt the ciphertext.</p>",
+      "exception":true
+    },
     "IncorrectKeyMaterialException":{
       "type":"structure",
       "members":{
         "message":{"shape":"ErrorMessageType"}
       },
-      "documentation":"<p>The request was rejected because the provided key material is invalid or is not the same key material that was previously imported into this customer master key (CMK).</p>",
+      "documentation":"<p>The request was rejected because the key material in the request is, expired, invalid, or is not the same key material that was previously imported into this customer master key (CMK).</p>",
       "exception":true
     },
     "IncorrectTrustAnchorException":{
@@ -1755,7 +2078,7 @@
       "members":{
         "message":{"shape":"ErrorMessageType"}
       },
-      "documentation":"<p>The request was rejected because the specified ciphertext, or additional authenticated data incorporated into the ciphertext, such as the encryption context, is corrupted, missing, or otherwise invalid.</p>",
+      "documentation":"<p>From the <a>Decrypt</a> or <a>ReEncrypt</a> operation, the request was rejected because the specified ciphertext, or additional authenticated data incorporated into the ciphertext, such as the encryption context, is corrupted, missing, or otherwise invalid.</p> <p>From the <a>ImportKeyMaterial</a> operation, the request was rejected because AWS KMS could not decrypt the encrypted (wrapped) key material. </p>",
       "exception":true
     },
     "InvalidGrantIdException":{
@@ -1787,7 +2110,7 @@
       "members":{
         "message":{"shape":"ErrorMessageType"}
       },
-      "documentation":"<p>The request was rejected because the specified <code>KeySpec</code> value is not valid.</p>",
+      "documentation":"<p>The request was rejected for one of the following reasons: </p> <ul> <li> <p>The <code>KeyUsage</code> value of the CMK is incompatible with the API operation.</p> </li> <li> <p>The encryption algorithm or signing algorithm specified for the operation is incompatible with the type of key material in the CMK <code>(CustomerMasterKeySpec</code>).</p> </li> </ul> <p>For encrypting, decrypting, re-encrypting, and generating data keys, the <code>KeyUsage</code> must be <code>ENCRYPT_DECRYPT</code>. For signing and verifying, the <code>KeyUsage</code> must be <code>SIGN_VERIFY</code>. To find the <code>KeyUsage</code> of a CMK, use the <a>DescribeKey</a> operation.</p> <p>To find the encryption or signing algorithms supported for a particular CMK, use the <a>DescribeKey</a> operation.</p>",
       "exception":true
     },
     "InvalidMarkerException":{
@@ -1807,12 +2130,20 @@
       "exception":true,
       "fault":true
     },
+    "KMSInvalidSignatureException":{
+      "type":"structure",
+      "members":{
+        "message":{"shape":"ErrorMessageType"}
+      },
+      "documentation":"<p>The request was rejected because the signature verification failed. Signature verification fails when it cannot confirm that signature was produced by signing the specified message with the specified CMK and signing algorithm.</p>",
+      "exception":true
+    },
     "KMSInvalidStateException":{
       "type":"structure",
       "members":{
         "message":{"shape":"ErrorMessageType"}
       },
-      "documentation":"<p>The request was rejected because the state of the specified resource is not valid for this request.</p> <p>For more information about how key state affects the use of a CMK, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/key-state.html\">How Key State Affects Use of a Customer Master Key</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>",
+      "documentation":"<p>The request was rejected because the state of the specified resource is not valid for this request.</p> <p>For more information about how key state affects the use of a CMK, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/key-state.html\">How Key State Affects Use of a Customer Master Key</a> in the <i> <i>AWS Key Management Service Developer Guide</i> </i>.</p>",
       "exception":true
     },
     "KeyIdType":{
@@ -1875,7 +2206,7 @@
         },
         "KeyUsage":{
           "shape":"KeyUsageType",
-          "documentation":"<p>The cryptographic operations for which you can use the CMK. The only valid value is <code>ENCRYPT_DECRYPT</code>, which means you can use the CMK to encrypt and decrypt data.</p>"
+          "documentation":"<p>The cryptographic operations for which you can use the CMK.</p>"
         },
         "KeyState":{
           "shape":"KeyState",
@@ -1908,6 +2239,18 @@
         "KeyManager":{
           "shape":"KeyManagerType",
           "documentation":"<p>The manager of the CMK. CMKs in your AWS account are either customer managed or AWS managed. For more information about the difference, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#master_keys\">Customer Master Keys</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
+        },
+        "CustomerMasterKeySpec":{
+          "shape":"CustomerMasterKeySpec",
+          "documentation":"<p>Describes the type of key material in the CMK.</p>"
+        },
+        "EncryptionAlgorithms":{
+          "shape":"EncryptionAlgorithmSpecList",
+          "documentation":"<p>A list of encryption algorithms that the CMK supports. You cannot use the CMK with other encryption algorithms within AWS KMS.</p> <p>This field appears only when the <code>KeyUsage</code> of the CMK is <code>ENCRYPT_DECRYPT</code>.</p>"
+        },
+        "SigningAlgorithms":{
+          "shape":"SigningAlgorithmSpecList",
+          "documentation":"<p>A list of signing algorithms that the CMK supports. You cannot use the CMK with other signing algorithms within AWS KMS.</p> <p>This field appears only when the <code>KeyUsage</code> of the CMK is <code>SIGN_VERIFY</code>.</p>"
         }
       },
       "documentation":"<p>Contains metadata about a customer master key (CMK).</p> <p>This data type is used as a response element for the <a>CreateKey</a> and <a>DescribeKey</a> operations.</p>"
@@ -1924,7 +2267,8 @@
     },
     "KeyStorePasswordType":{
       "type":"string",
-      "min":1,
+      "max":32,
+      "min":7,
       "sensitive":true
     },
     "KeyUnavailableException":{
@@ -1932,20 +2276,23 @@
       "members":{
         "message":{"shape":"ErrorMessageType"}
       },
-      "documentation":"<p>The request was rejected because the specified CMK was not available. The request can be retried.</p>",
+      "documentation":"<p>The request was rejected because the specified CMK was not available. You can retry the request.</p>",
       "exception":true,
       "fault":true
     },
     "KeyUsageType":{
       "type":"string",
-      "enum":["ENCRYPT_DECRYPT"]
+      "enum":[
+        "SIGN_VERIFY",
+        "ENCRYPT_DECRYPT"
+      ]
     },
     "LimitExceededException":{
       "type":"structure",
       "members":{
         "message":{"shape":"ErrorMessageType"}
       },
-      "documentation":"<p>The request was rejected because a limit was exceeded. For more information, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/limits.html\">Limits</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>",
+      "documentation":"<p>The request was rejected because a quota was exceeded. For more information, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/limits.html\">Quotas</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>",
       "exception":true
     },
     "LimitType":{
@@ -2154,6 +2501,13 @@
       "min":1,
       "pattern":"[\\u0020-\\u00FF]*"
     },
+    "MessageType":{
+      "type":"string",
+      "enum":[
+        "RAW",
+        "DIGEST"
+      ]
+    },
     "NotFoundException":{
       "type":"structure",
       "members":{
@@ -2208,6 +2562,11 @@
       "min":1,
       "pattern":"^[\\w+=,.@:/-]+$"
     },
+    "PublicKeyType":{
+      "type":"blob",
+      "max":8192,
+      "min":1
+    },
     "PutKeyPolicyRequest":{
       "type":"structure",
       "required":[
@@ -2226,7 +2585,7 @@
         },
         "Policy":{
           "shape":"PolicyType",
-          "documentation":"<p>The key policy to attach to the CMK.</p> <p>The key policy must meet the following criteria:</p> <ul> <li> <p>If you don't set <code>BypassPolicyLockoutSafetyCheck</code> to true, the key policy must allow the principal that is making the <code>PutKeyPolicy</code> request to make a subsequent <code>PutKeyPolicy</code> request on the CMK. This reduces the risk that the CMK becomes unmanageable. For more information, refer to the scenario in the <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/key-policies.html#key-policy-default-allow-root-enable-iam\">Default Key Policy</a> section of the <i>AWS Key Management Service Developer Guide</i>.</p> </li> <li> <p>Each statement in the key policy must contain one or more principals. The principals in the key policy must exist and be visible to AWS KMS. When you create a new AWS principal (for example, an IAM user or role), you might need to enforce a delay before including the new principal in a key policy because the new principal might not be immediately visible to AWS KMS. For more information, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/troubleshoot_general.html#troubleshoot_general_eventual-consistency\">Changes that I make are not always immediately visible</a> in the <i>AWS Identity and Access Management User Guide</i>.</p> </li> </ul> <p>The key policy size limit is 32 kilobytes (32768 bytes).</p>"
+          "documentation":"<p>The key policy to attach to the CMK.</p> <p>The key policy must meet the following criteria:</p> <ul> <li> <p>If you don't set <code>BypassPolicyLockoutSafetyCheck</code> to true, the key policy must allow the principal that is making the <code>PutKeyPolicy</code> request to make a subsequent <code>PutKeyPolicy</code> request on the CMK. This reduces the risk that the CMK becomes unmanageable. For more information, refer to the scenario in the <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/key-policies.html#key-policy-default-allow-root-enable-iam\">Default Key Policy</a> section of the <i>AWS Key Management Service Developer Guide</i>.</p> </li> <li> <p>Each statement in the key policy must contain one or more principals. The principals in the key policy must exist and be visible to AWS KMS. When you create a new AWS principal (for example, an IAM user or role), you might need to enforce a delay before including the new principal in a key policy because the new principal might not be immediately visible to AWS KMS. For more information, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/troubleshoot_general.html#troubleshoot_general_eventual-consistency\">Changes that I make are not always immediately visible</a> in the <i>AWS Identity and Access Management User Guide</i>.</p> </li> </ul> <p>The key policy cannot exceed 32 kilobytes (32768 bytes). For more information, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/resource-limits.html\">Resource Quotas</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
         },
         "BypassPolicyLockoutSafetyCheck":{
           "shape":"BooleanType",
@@ -2247,15 +2606,27 @@
         },
         "SourceEncryptionContext":{
           "shape":"EncryptionContextType",
-          "documentation":"<p>Encryption context used to encrypt and decrypt the data specified in the <code>CiphertextBlob</code> parameter.</p>"
+          "documentation":"<p>Specifies the encryption context to use to decrypt the ciphertext. Enter the same encryption context that was used to encrypt the ciphertext.</p> <p>An <i>encryption context</i> is a collection of non-secret key-value pairs that represents additional authenticated data. When you use an encryption context to encrypt data, you must specify the same (an exact case-sensitive match) encryption context to decrypt the data. An encryption context is optional when encrypting with a symmetric CMK, but it is highly recommended.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#encrypt_context\">Encryption Context</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
+        },
+        "SourceKeyId":{
+          "shape":"KeyIdType",
+          "documentation":"<p>A unique identifier for the CMK that is used to decrypt the ciphertext before it reencrypts it using the destination CMK.</p> <p>This parameter is required only when the ciphertext was encrypted under an asymmetric CMK. Otherwise, AWS KMS uses the metadata that it adds to the ciphertext blob to determine which CMK was used to encrypt the ciphertext. However, you can use this parameter to ensure that a particular CMK (of any kind) is used to decrypt the ciphertext before it is reencrypted.</p> <p>If you specify a <code>KeyId</code> value, the decrypt part of the <code>ReEncrypt</code> operation succeeds only if the specified CMK was used to encrypt the ciphertext.</p> <p>To specify a CMK, use its key ID, Amazon Resource Name (ARN), alias name, or alias ARN. When using an alias name, prefix it with <code>\"alias/\"</code>.</p> <p>For example:</p> <ul> <li> <p>Key ID: <code>1234abcd-12ab-34cd-56ef-1234567890ab</code> </p> </li> <li> <p>Key ARN: <code>arn:aws:kms:us-east-2:111122223333:key/1234abcd-12ab-34cd-56ef-1234567890ab</code> </p> </li> <li> <p>Alias name: <code>alias/ExampleAlias</code> </p> </li> <li> <p>Alias ARN: <code>arn:aws:kms:us-east-2:111122223333:alias/ExampleAlias</code> </p> </li> </ul> <p>To get the key ID and key ARN for a CMK, use <a>ListKeys</a> or <a>DescribeKey</a>. To get the alias name and alias ARN, use <a>ListAliases</a>.</p>"
         },
         "DestinationKeyId":{
           "shape":"KeyIdType",
-          "documentation":"<p>A unique identifier for the CMK that is used to reencrypt the data.</p> <p>To specify a CMK, use its key ID, Amazon Resource Name (ARN), alias name, or alias ARN. When using an alias name, prefix it with <code>\"alias/\"</code>. To specify a CMK in a different AWS account, you must use the key ARN or alias ARN.</p> <p>For example:</p> <ul> <li> <p>Key ID: <code>1234abcd-12ab-34cd-56ef-1234567890ab</code> </p> </li> <li> <p>Key ARN: <code>arn:aws:kms:us-east-2:111122223333:key/1234abcd-12ab-34cd-56ef-1234567890ab</code> </p> </li> <li> <p>Alias name: <code>alias/ExampleAlias</code> </p> </li> <li> <p>Alias ARN: <code>arn:aws:kms:us-east-2:111122223333:alias/ExampleAlias</code> </p> </li> </ul> <p>To get the key ID and key ARN for a CMK, use <a>ListKeys</a> or <a>DescribeKey</a>. To get the alias name and alias ARN, use <a>ListAliases</a>.</p>"
+          "documentation":"<p>A unique identifier for the CMK that is used to reencrypt the data. Specify a symmetric or asymmetric CMK with a <code>KeyUsage</code> value of <code>ENCRYPT_DECRYPT</code>. To find the <code>KeyUsage</code> value of a CMK, use the <a>DescribeKey</a> operation.</p> <p>To specify a CMK, use its key ID, Amazon Resource Name (ARN), alias name, or alias ARN. When using an alias name, prefix it with <code>\"alias/\"</code>. To specify a CMK in a different AWS account, you must use the key ARN or alias ARN.</p> <p>For example:</p> <ul> <li> <p>Key ID: <code>1234abcd-12ab-34cd-56ef-1234567890ab</code> </p> </li> <li> <p>Key ARN: <code>arn:aws:kms:us-east-2:111122223333:key/1234abcd-12ab-34cd-56ef-1234567890ab</code> </p> </li> <li> <p>Alias name: <code>alias/ExampleAlias</code> </p> </li> <li> <p>Alias ARN: <code>arn:aws:kms:us-east-2:111122223333:alias/ExampleAlias</code> </p> </li> </ul> <p>To get the key ID and key ARN for a CMK, use <a>ListKeys</a> or <a>DescribeKey</a>. To get the alias name and alias ARN, use <a>ListAliases</a>.</p>"
         },
         "DestinationEncryptionContext":{
           "shape":"EncryptionContextType",
-          "documentation":"<p>Encryption context to use when the data is reencrypted.</p>"
+          "documentation":"<p>Specifies that encryption context to use when the reencrypting the data.</p> <p>A destination encryption context is valid only when the destination CMK is a symmetric CMK. The standard ciphertext format for asymmetric CMKs does not include fields for metadata.</p> <p>An <i>encryption context</i> is a collection of non-secret key-value pairs that represents additional authenticated data. When you use an encryption context to encrypt data, you must specify the same (an exact case-sensitive match) encryption context to decrypt the data. An encryption context is optional when encrypting with a symmetric CMK, but it is highly recommended.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#encrypt_context\">Encryption Context</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
+        },
+        "SourceEncryptionAlgorithm":{
+          "shape":"EncryptionAlgorithmSpec",
+          "documentation":"<p>Specifies the encryption algorithm that AWS KMS will use to decrypt the ciphertext before it is reencrypted. The default value, <code>SYMMETRIC_DEFAULT</code>, represents the algorithm used for symmetric CMKs.</p> <p>Specify the same algorithm that was used to encrypt the ciphertext. If you specify a different algorithm, the decrypt attempt fails.</p> <p>This parameter is required only when the ciphertext was encrypted under an asymmetric CMK.</p>"
+        },
+        "DestinationEncryptionAlgorithm":{
+          "shape":"EncryptionAlgorithmSpec",
+          "documentation":"<p>Specifies the encryption algorithm that AWS KMS will use to reecrypt the data after it has decrypted it. The default value, <code>SYMMETRIC_DEFAULT</code>, represents the encryption algorithm used for symmetric CMKs.</p> <p>This parameter is required only when the destination CMK is an asymmetric CMK.</p>"
         },
         "GrantTokens":{
           "shape":"GrantTokenList",
@@ -2268,7 +2639,7 @@
       "members":{
         "CiphertextBlob":{
           "shape":"CiphertextType",
-          "documentation":"<p>The reencrypted data. When you use the HTTP API or the AWS CLI, the value is Base64-encoded. Otherwise, it is not encoded.</p>"
+          "documentation":"<p>The reencrypted data. When you use the HTTP API or the AWS CLI, the value is Base64-encoded. Otherwise, it is not Base64-encoded.</p>"
         },
         "SourceKeyId":{
           "shape":"KeyIdType",
@@ -2277,6 +2648,14 @@
         "KeyId":{
           "shape":"KeyIdType",
           "documentation":"<p>Unique identifier of the CMK used to reencrypt the data.</p>"
+        },
+        "SourceEncryptionAlgorithm":{
+          "shape":"EncryptionAlgorithmSpec",
+          "documentation":"<p>The encryption algorithm that was used to decrypt the ciphertext before it was reencrypted.</p>"
+        },
+        "DestinationEncryptionAlgorithm":{
+          "shape":"EncryptionAlgorithmSpec",
+          "documentation":"<p>The encryption algorithm that was used to reencrypt the data.</p>"
         }
       }
     },
@@ -2341,6 +2720,71 @@
         }
       }
     },
+    "SignRequest":{
+      "type":"structure",
+      "required":[
+        "KeyId",
+        "Message",
+        "SigningAlgorithm"
+      ],
+      "members":{
+        "KeyId":{
+          "shape":"KeyIdType",
+          "documentation":"<p>Identifies an asymmetric CMK. AWS KMS uses the private key in the asymmetric CMK to sign the message. The <code>KeyUsage</code> type of the CMK must be <code>SIGN_VERIFY</code>. To find the <code>KeyUsage</code> of a CMK, use the <a>DescribeKey</a> operation.</p> <p>To specify a CMK, use its key ID, Amazon Resource Name (ARN), alias name, or alias ARN. When using an alias name, prefix it with <code>\"alias/\"</code>. To specify a CMK in a different AWS account, you must use the key ARN or alias ARN.</p> <p>For example:</p> <ul> <li> <p>Key ID: <code>1234abcd-12ab-34cd-56ef-1234567890ab</code> </p> </li> <li> <p>Key ARN: <code>arn:aws:kms:us-east-2:111122223333:key/1234abcd-12ab-34cd-56ef-1234567890ab</code> </p> </li> <li> <p>Alias name: <code>alias/ExampleAlias</code> </p> </li> <li> <p>Alias ARN: <code>arn:aws:kms:us-east-2:111122223333:alias/ExampleAlias</code> </p> </li> </ul> <p>To get the key ID and key ARN for a CMK, use <a>ListKeys</a> or <a>DescribeKey</a>. To get the alias name and alias ARN, use <a>ListAliases</a>.</p>"
+        },
+        "Message":{
+          "shape":"PlaintextType",
+          "documentation":"<p>Specifies the message or message digest to sign. Messages can be 0-4096 bytes. To sign a larger message, provide the message digest.</p> <p>If you provide a message, AWS KMS generates a hash digest of the message and then signs it.</p>"
+        },
+        "MessageType":{
+          "shape":"MessageType",
+          "documentation":"<p>Tells AWS KMS whether the value of the <code>Message</code> parameter is a message or message digest. The default value, RAW, indicates a message. To indicate a message digest, enter <code>DIGEST</code>.</p>"
+        },
+        "GrantTokens":{
+          "shape":"GrantTokenList",
+          "documentation":"<p>A list of grant tokens.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#grant_token\">Grant Tokens</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
+        },
+        "SigningAlgorithm":{
+          "shape":"SigningAlgorithmSpec",
+          "documentation":"<p>Specifies the signing algorithm to use when signing the message. </p> <p>Choose an algorithm that is compatible with the type and size of the specified asymmetric CMK.</p>"
+        }
+      }
+    },
+    "SignResponse":{
+      "type":"structure",
+      "members":{
+        "KeyId":{
+          "shape":"KeyIdType",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the asymmetric CMK that was used to sign the message.</p>"
+        },
+        "Signature":{
+          "shape":"CiphertextType",
+          "documentation":"<p>The cryptographic signature that was generated for the message. </p> <ul> <li> <p>When used with the supported RSA signing algorithms, the encoding of this value is defined by <a href=\"https://tools.ietf.org/html/rfc8017\">PKCS #1 in RFC 8017</a>.</p> </li> <li> <p>When used with the <code>ECDSA_SHA_256</code>, <code>ECDSA_SHA_384</code>, or <code>ECDSA_SHA_512</code> signing algorithms, this value is a DER-encoded object as defined by ANS X9.62–2005 and <a href=\"https://tools.ietf.org/html/rfc3279#section-2.2.3\">RFC 3279 Section 2.2.3</a>. This is the most commonly used signature format and is appropriate for most uses. </p> </li> </ul> <p>When you use the HTTP API or the AWS CLI, the value is Base64-encoded. Otherwise, it is not Base64-encoded.</p>"
+        },
+        "SigningAlgorithm":{
+          "shape":"SigningAlgorithmSpec",
+          "documentation":"<p>The signing algorithm that was used to sign the message.</p>"
+        }
+      }
+    },
+    "SigningAlgorithmSpec":{
+      "type":"string",
+      "enum":[
+        "RSASSA_PSS_SHA_256",
+        "RSASSA_PSS_SHA_384",
+        "RSASSA_PSS_SHA_512",
+        "RSASSA_PKCS1_V1_5_SHA_256",
+        "RSASSA_PKCS1_V1_5_SHA_384",
+        "RSASSA_PKCS1_V1_5_SHA_512",
+        "ECDSA_SHA_256",
+        "ECDSA_SHA_384",
+        "ECDSA_SHA_512"
+      ]
+    },
+    "SigningAlgorithmSpecList":{
+      "type":"list",
+      "member":{"shape":"SigningAlgorithmSpec"}
+    },
     "Tag":{
       "type":"structure",
       "required":[
@@ -2441,11 +2885,11 @@
       "members":{
         "AliasName":{
           "shape":"AliasNameType",
-          "documentation":"<p>Specifies the name of the alias to change. This value must begin with <code>alias/</code> followed by the alias name, such as <code>alias/ExampleAlias</code>.</p>"
+          "documentation":"<p>Identifies the alias that is changing its CMK. This value must begin with <code>alias/</code> followed by the alias name, such as <code>alias/ExampleAlias</code>. You cannot use UpdateAlias to change the alias name.</p>"
         },
         "TargetKeyId":{
           "shape":"KeyIdType",
-          "documentation":"<p>Unique identifier of the customer master key (CMK) to be mapped to the alias. When the update operation completes, the alias will point to this CMK.</p> <p>Specify the key ID or the Amazon Resource Name (ARN) of the CMK.</p> <p>For example:</p> <ul> <li> <p>Key ID: <code>1234abcd-12ab-34cd-56ef-1234567890ab</code> </p> </li> <li> <p>Key ARN: <code>arn:aws:kms:us-east-2:111122223333:key/1234abcd-12ab-34cd-56ef-1234567890ab</code> </p> </li> </ul> <p>To get the key ID and key ARN for a CMK, use <a>ListKeys</a> or <a>DescribeKey</a>.</p> <p>To verify that the alias is mapped to the correct CMK, use <a>ListAliases</a>.</p>"
+          "documentation":"<p>Identifies the CMK to associate with the alias. When the update operation completes, the alias will point to this CMK. </p> <p>The CMK must be in the same AWS account and Region as the alias. Also, the new target CMK must be the same type as the current target CMK (both symmetric or both asymmetric) and they must have the same key usage. </p> <p>Specify the key ID or the Amazon Resource Name (ARN) of the CMK.</p> <p>For example:</p> <ul> <li> <p>Key ID: <code>1234abcd-12ab-34cd-56ef-1234567890ab</code> </p> </li> <li> <p>Key ARN: <code>arn:aws:kms:us-east-2:111122223333:key/1234abcd-12ab-34cd-56ef-1234567890ab</code> </p> </li> </ul> <p>To get the key ID and key ARN for a CMK, use <a>ListKeys</a> or <a>DescribeKey</a>.</p> <p>To verify that the alias is mapped to the correct CMK, use <a>ListAliases</a>.</p>"
         }
       }
     },
@@ -2493,6 +2937,58 @@
         }
       }
     },
+    "VerifyRequest":{
+      "type":"structure",
+      "required":[
+        "KeyId",
+        "Message",
+        "Signature",
+        "SigningAlgorithm"
+      ],
+      "members":{
+        "KeyId":{
+          "shape":"KeyIdType",
+          "documentation":"<p>Identifies the asymmetric CMK that will be used to verify the signature. This must be the same CMK that was used to generate the signature. If you specify a different CMK, the signature verification fails.</p> <p>To specify a CMK, use its key ID, Amazon Resource Name (ARN), alias name, or alias ARN. When using an alias name, prefix it with <code>\"alias/\"</code>. To specify a CMK in a different AWS account, you must use the key ARN or alias ARN.</p> <p>For example:</p> <ul> <li> <p>Key ID: <code>1234abcd-12ab-34cd-56ef-1234567890ab</code> </p> </li> <li> <p>Key ARN: <code>arn:aws:kms:us-east-2:111122223333:key/1234abcd-12ab-34cd-56ef-1234567890ab</code> </p> </li> <li> <p>Alias name: <code>alias/ExampleAlias</code> </p> </li> <li> <p>Alias ARN: <code>arn:aws:kms:us-east-2:111122223333:alias/ExampleAlias</code> </p> </li> </ul> <p>To get the key ID and key ARN for a CMK, use <a>ListKeys</a> or <a>DescribeKey</a>. To get the alias name and alias ARN, use <a>ListAliases</a>.</p>"
+        },
+        "Message":{
+          "shape":"PlaintextType",
+          "documentation":"<p>Specifies the message that was signed. You can submit a raw message of up to 4096 bytes, or a hash digest of the message. If you submit a digest, use the <code>MessageType</code> parameter with a value of <code>DIGEST</code>.</p> <p>If the message specified here is different from the message that was signed, the signature verification fails. A message and its hash digest are considered to be the same message.</p>"
+        },
+        "MessageType":{
+          "shape":"MessageType",
+          "documentation":"<p>Tells AWS KMS whether the value of the <code>Message</code> parameter is a message or message digest. The default value, RAW, indicates a message. To indicate a message digest, enter <code>DIGEST</code>.</p> <important> <p>Use the <code>DIGEST</code> value only when the value of the <code>Message</code> parameter is a message digest. If you use the <code>DIGEST</code> value with a raw message, the security of the verification operation can be compromised.</p> </important>"
+        },
+        "Signature":{
+          "shape":"CiphertextType",
+          "documentation":"<p>The signature that the <code>Sign</code> operation generated.</p>"
+        },
+        "SigningAlgorithm":{
+          "shape":"SigningAlgorithmSpec",
+          "documentation":"<p>The signing algorithm that was used to sign the message. If you submit a different algorithm, the signature verification fails.</p>"
+        },
+        "GrantTokens":{
+          "shape":"GrantTokenList",
+          "documentation":"<p>A list of grant tokens.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#grant_token\">Grant Tokens</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
+        }
+      }
+    },
+    "VerifyResponse":{
+      "type":"structure",
+      "members":{
+        "KeyId":{
+          "shape":"KeyIdType",
+          "documentation":"<p>The unique identifier for the asymmetric CMK that was used to verify the signature.</p>"
+        },
+        "SignatureValid":{
+          "shape":"BooleanType",
+          "documentation":"<p>A Boolean value that indicates whether the signature was verified. A value of <code>True</code> indicates that the <code>Signature</code> was produced by signing the <code>Message</code> with the specified <code>KeyID</code> and <code>SigningAlgorithm.</code> If the signature is not verified, the <code>Verify</code> operation fails with a <code>KMSInvalidSignatureException</code> exception. </p>"
+        },
+        "SigningAlgorithm":{
+          "shape":"SigningAlgorithmSpec",
+          "documentation":"<p>The signing algorithm that was used to verify the signature.</p>"
+        }
+      }
+    },
     "WrappingKeySpec":{
       "type":"string",
       "enum":["RSA_2048"]
diff --git a/services/kms/src/test/resources/cucumber.properties b/services/kms/src/test/resources/cucumber.properties
index e794abc7adf5..f2b703fe5abf 100644
--- a/services/kms/src/test/resources/cucumber.properties
+++ b/services/kms/src/test/resources/cucumber.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/lakeformation/pom.xml b/services/lakeformation/pom.xml
index 3004357baf44..ed8744417a04 100644
--- a/services/lakeformation/pom.xml
+++ b/services/lakeformation/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>lakeformation</artifactId>
     <name>AWS Java SDK :: Services :: LakeFormation</name>
diff --git a/services/lambda/build.properties b/services/lambda/build.properties
index ecf2dae6fcb1..15ec2da1fc71 100644
--- a/services/lambda/build.properties
+++ b/services/lambda/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/lambda/pom.xml b/services/lambda/pom.xml
index 54a66dea4e1f..17c02bee872f 100644
--- a/services/lambda/pom.xml
+++ b/services/lambda/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>lambda</artifactId>
     <name>AWS Java SDK :: Services :: AWS Lambda</name>
diff --git a/services/lambda/src/it/java/software/amazon/awssdk/services/lambda/IntegrationTestBase.java b/services/lambda/src/it/java/software/amazon/awssdk/services/lambda/IntegrationTestBase.java
index 5f04dbb1ae34..8f4637789f5e 100644
--- a/services/lambda/src/it/java/software/amazon/awssdk/services/lambda/IntegrationTestBase.java
+++ b/services/lambda/src/it/java/software/amazon/awssdk/services/lambda/IntegrationTestBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/lambda/src/it/java/software/amazon/awssdk/services/lambda/ServiceIntegrationTest.java b/services/lambda/src/it/java/software/amazon/awssdk/services/lambda/ServiceIntegrationTest.java
index 4ee0dfb7b615..c97b2badc95f 100644
--- a/services/lambda/src/it/java/software/amazon/awssdk/services/lambda/ServiceIntegrationTest.java
+++ b/services/lambda/src/it/java/software/amazon/awssdk/services/lambda/ServiceIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -75,7 +75,7 @@ public void uploadFunction() throws IOException {
                                                                     .code(FunctionCode.builder().zipFile(functionBits).build())
                                                                     .handler("helloworld.handler")
                                                                     .memorySize(128)
-                                                                    .runtime(Runtime.NODEJS8_10)
+                                                                    .runtime(Runtime.NODEJS12_X)
                                                                     .timeout(10)
                                                                     .role(lambdaServiceRoleArn)).join();
 
diff --git a/services/lambda/src/main/resources/codegen-resources/paginators-1.json b/services/lambda/src/main/resources/codegen-resources/paginators-1.json
index 70e843994f45..dd31bcb2ceea 100644
--- a/services/lambda/src/main/resources/codegen-resources/paginators-1.json
+++ b/services/lambda/src/main/resources/codegen-resources/paginators-1.json
@@ -12,6 +12,12 @@
       "output_token": "NextMarker",
       "result_key": "EventSourceMappings"
     },
+    "ListFunctionEventInvokeConfigs": {
+      "input_token": "Marker",
+      "limit_key": "MaxItems",
+      "output_token": "NextMarker",
+      "result_key": "FunctionEventInvokeConfigs"
+    },
     "ListFunctions": {
       "input_token": "Marker",
       "limit_key": "MaxItems",
@@ -30,6 +36,12 @@
       "output_token": "NextMarker",
       "result_key": "Layers"
     },
+    "ListProvisionedConcurrencyConfigs": {
+      "input_token": "Marker",
+      "limit_key": "MaxItems",
+      "output_token": "NextMarker",
+      "result_key": "ProvisionedConcurrencyConfigs"
+    },
     "ListVersionsByFunction": {
       "input_token": "Marker",
       "limit_key": "MaxItems",
diff --git a/services/lambda/src/main/resources/codegen-resources/service-2.json b/services/lambda/src/main/resources/codegen-resources/service-2.json
index 8301e2d9d280..d68c06d2f490 100644
--- a/services/lambda/src/main/resources/codegen-resources/service-2.json
+++ b/services/lambda/src/main/resources/codegen-resources/service-2.json
@@ -48,7 +48,7 @@
         {"shape":"TooManyRequestsException"},
         {"shape":"PreconditionFailedException"}
       ],
-      "documentation":"<p>Grants an AWS service or another account permission to use a function. You can apply the policy at the function level, or specify a qualifier to restrict access to a single version or alias. If you use a qualifier, the invoker must use the full Amazon Resource Name (ARN) of that version or alias to invoke the function.</p> <p>To grant permission to another account, specify the account ID as the <code>Principal</code>. For AWS services, the principal is a domain-style identifier defined by the service, like <code>s3.amazonaws.com</code> or <code>sns.amazonaws.com</code>. For AWS services, you can also specify the ARN or owning account of the associated resource as the <code>SourceArn</code> or <code>SourceAccount</code>. If you grant permission to a service principal without specifying the source, other accounts could potentially configure resources in their account to invoke your Lambda function.</p> <p>This action adds a statement to a resource-based permission policy for the function. For more information about function policies, see <a href=\"https://docs.aws.amazon.com/lambda/latest/dg/access-control-resource-based.html\">Lambda Function Policies</a>. </p>"
+      "documentation":"<p>Grants an AWS service or another account permission to use a function. You can apply the policy at the function level, or specify a qualifier to restrict access to a single version or alias. If you use a qualifier, the invoker must use the full Amazon Resource Name (ARN) of that version or alias to invoke the function.</p> <p>To grant permission to another account, specify the account ID as the <code>Principal</code>. For AWS services, the principal is a domain-style identifier defined by the service, like <code>s3.amazonaws.com</code> or <code>sns.amazonaws.com</code>. For AWS services, you can also specify the ARN of the associated resource as the <code>SourceArn</code>. If you grant permission to a service principal without specifying the source, other accounts could potentially configure resources in their account to invoke your Lambda function.</p> <p>This action adds a statement to a resource-based permissions policy for the function. For more information about function policies, see <a href=\"https://docs.aws.amazon.com/lambda/latest/dg/access-control-resource-based.html\">Lambda Function Policies</a>. </p>"
     },
     "CreateAlias":{
       "name":"CreateAlias",
@@ -84,7 +84,7 @@
         {"shape":"TooManyRequestsException"},
         {"shape":"ResourceNotFoundException"}
       ],
-      "documentation":"<p>Creates a mapping between an event source and an AWS Lambda function. Lambda reads items from the event source and triggers the function.</p> <p>For details about each event source type, see the following topics.</p> <ul> <li> <p> <a href=\"https://docs.aws.amazon.com/lambda/latest/dg/with-kinesis.html\">Using AWS Lambda with Amazon Kinesis</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/lambda/latest/dg/with-sqs.html\">Using AWS Lambda with Amazon SQS</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/lambda/latest/dg/with-ddb.html\">Using AWS Lambda with Amazon DynamoDB</a> </p> </li> </ul>"
+      "documentation":"<p>Creates a mapping between an event source and an AWS Lambda function. Lambda reads items from the event source and triggers the function.</p> <p>For details about each event source type, see the following topics.</p> <ul> <li> <p> <a href=\"https://docs.aws.amazon.com/lambda/latest/dg/with-ddb.html\">Using AWS Lambda with Amazon DynamoDB</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/lambda/latest/dg/with-kinesis.html\">Using AWS Lambda with Amazon Kinesis</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/lambda/latest/dg/with-sqs.html\">Using AWS Lambda with Amazon SQS</a> </p> </li> </ul> <p>The following error handling options are only available for stream sources (DynamoDB and Kinesis):</p> <ul> <li> <p> <code>BisectBatchOnFunctionError</code> - If the function returns an error, split the batch in two and retry.</p> </li> <li> <p> <code>DestinationConfig</code> - Send discarded records to an Amazon SQS queue or Amazon SNS topic.</p> </li> <li> <p> <code>MaximumRecordAgeInSeconds</code> - Discard records older than the specified age.</p> </li> <li> <p> <code>MaximumRetryAttempts</code> - Discard records after the specified number of retries.</p> </li> <li> <p> <code>ParallelizationFactor</code> - Process multiple batches from each shard concurrently.</p> </li> </ul>"
     },
     "CreateFunction":{
       "name":"CreateFunction",
@@ -103,7 +103,7 @@
         {"shape":"TooManyRequestsException"},
         {"shape":"CodeStorageExceededException"}
       ],
-      "documentation":"<p>Creates a Lambda function. To create a function, you need a <a href=\"https://docs.aws.amazon.com/lambda/latest/dg/deployment-package-v2.html\">deployment package</a> and an <a href=\"https://docs.aws.amazon.com/lambda/latest/dg/intro-permission-model.html#lambda-intro-execution-role\">execution role</a>. The deployment package contains your function code. The execution role grants the function permission to use AWS services, such as Amazon CloudWatch Logs for log streaming and AWS X-Ray for request tracing.</p> <p>A function has an unpublished version, and can have published versions and aliases. The unpublished version changes when you update your function's code and configuration. A published version is a snapshot of your function code and configuration that can't be changed. An alias is a named resource that maps to a version, and can be changed to map to a different version. Use the <code>Publish</code> parameter to create version <code>1</code> of your function from its initial configuration.</p> <p>The other parameters let you configure version-specific and function-level settings. You can modify version-specific settings later with <a>UpdateFunctionConfiguration</a>. Function-level settings apply to both the unpublished and published versions of the function, and include tags (<a>TagResource</a>) and per-function concurrency limits (<a>PutFunctionConcurrency</a>).</p> <p>If another account or an AWS service invokes your function, use <a>AddPermission</a> to grant permission by creating a resource-based IAM policy. You can grant permissions at the function level, on a version, or on an alias.</p> <p>To invoke your function directly, use <a>Invoke</a>. To invoke your function in response to events in other AWS services, create an event source mapping (<a>CreateEventSourceMapping</a>), or configure a function trigger in the other service. For more information, see <a href=\"https://docs.aws.amazon.com/lambda/latest/dg/invoking-lambda-functions.html\">Invoking Functions</a>.</p>"
+      "documentation":"<p>Creates a Lambda function. To create a function, you need a <a href=\"https://docs.aws.amazon.com/lambda/latest/dg/deployment-package-v2.html\">deployment package</a> and an <a href=\"https://docs.aws.amazon.com/lambda/latest/dg/intro-permission-model.html#lambda-intro-execution-role\">execution role</a>. The deployment package contains your function code. The execution role grants the function permission to use AWS services, such as Amazon CloudWatch Logs for log streaming and AWS X-Ray for request tracing.</p> <p>When you create a function, Lambda provisions an instance of the function and its supporting resources. If your function connects to a VPC, this process can take a minute or so. During this time, you can't invoke or modify the function. The <code>State</code>, <code>StateReason</code>, and <code>StateReasonCode</code> fields in the response from <a>GetFunctionConfiguration</a> indicate when the function is ready to invoke. For more information, see <a href=\"https://docs.aws.amazon.com/lambda/latest/dg/functions-states.html\">Function States</a>.</p> <p>A function has an unpublished version, and can have published versions and aliases. The unpublished version changes when you update your function's code and configuration. A published version is a snapshot of your function code and configuration that can't be changed. An alias is a named resource that maps to a version, and can be changed to map to a different version. Use the <code>Publish</code> parameter to create version <code>1</code> of your function from its initial configuration.</p> <p>The other parameters let you configure version-specific and function-level settings. You can modify version-specific settings later with <a>UpdateFunctionConfiguration</a>. Function-level settings apply to both the unpublished and published versions of the function, and include tags (<a>TagResource</a>) and per-function concurrency limits (<a>PutFunctionConcurrency</a>).</p> <p>If another account or an AWS service invokes your function, use <a>AddPermission</a> to grant permission by creating a resource-based IAM policy. You can grant permissions at the function level, on a version, or on an alias.</p> <p>To invoke your function directly, use <a>Invoke</a>. To invoke your function in response to events in other AWS services, create an event source mapping (<a>CreateEventSourceMapping</a>), or configure a function trigger in the other service. For more information, see <a href=\"https://docs.aws.amazon.com/lambda/latest/dg/lambda-invocation.html\">Invoking Functions</a>.</p>"
     },
     "DeleteAlias":{
       "name":"DeleteAlias",
@@ -116,6 +116,7 @@
       "errors":[
         {"shape":"ServiceException"},
         {"shape":"InvalidParameterValueException"},
+        {"shape":"ResourceConflictException"},
         {"shape":"TooManyRequestsException"}
       ],
       "documentation":"<p>Deletes a Lambda function <a href=\"https://docs.aws.amazon.com/lambda/latest/dg/versioning-aliases.html\">alias</a>.</p>"
@@ -136,7 +137,7 @@
         {"shape":"TooManyRequestsException"},
         {"shape":"ResourceInUseException"}
       ],
-      "documentation":"<p>Deletes an <a href=\"https://docs.aws.amazon.com/lambda/latest/dg/intro-invocation-modes.html\">event source mapping</a>. You can get the identifier of a mapping from the output of <a>ListEventSourceMappings</a>.</p>"
+      "documentation":"<p>Deletes an <a href=\"https://docs.aws.amazon.com/lambda/latest/dg/intro-invocation-modes.html\">event source mapping</a>. You can get the identifier of a mapping from the output of <a>ListEventSourceMappings</a>.</p> <p>When you delete an event source mapping, it enters a <code>Deleting</code> state and might not be completely deleted for several seconds.</p>"
     },
     "DeleteFunction":{
       "name":"DeleteFunction",
@@ -167,10 +168,27 @@
         {"shape":"ServiceException"},
         {"shape":"ResourceNotFoundException"},
         {"shape":"TooManyRequestsException"},
-        {"shape":"InvalidParameterValueException"}
+        {"shape":"InvalidParameterValueException"},
+        {"shape":"ResourceConflictException"}
       ],
       "documentation":"<p>Removes a concurrent execution limit from a function.</p>"
     },
+    "DeleteFunctionEventInvokeConfig":{
+      "name":"DeleteFunctionEventInvokeConfig",
+      "http":{
+        "method":"DELETE",
+        "requestUri":"/2019-09-25/functions/{FunctionName}/event-invoke-config",
+        "responseCode":204
+      },
+      "input":{"shape":"DeleteFunctionEventInvokeConfigRequest"},
+      "errors":[
+        {"shape":"ServiceException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InvalidParameterValueException"},
+        {"shape":"TooManyRequestsException"}
+      ],
+      "documentation":"<p>Deletes the configuration for asynchronous invocation for a function, version, or alias.</p> <p>To configure options for asynchronous invocation, use <a>PutFunctionEventInvokeConfig</a>.</p>"
+    },
     "DeleteLayerVersion":{
       "name":"DeleteLayerVersion",
       "http":{
@@ -185,6 +203,23 @@
       ],
       "documentation":"<p>Deletes a version of an <a href=\"https://docs.aws.amazon.com/lambda/latest/dg/configuration-layers.html\">AWS Lambda layer</a>. Deleted versions can no longer be viewed or added to functions. To avoid breaking functions, a copy of the version remains in Lambda until no functions refer to it.</p>"
     },
+    "DeleteProvisionedConcurrencyConfig":{
+      "name":"DeleteProvisionedConcurrencyConfig",
+      "http":{
+        "method":"DELETE",
+        "requestUri":"/2019-09-30/functions/{FunctionName}/provisioned-concurrency",
+        "responseCode":204
+      },
+      "input":{"shape":"DeleteProvisionedConcurrencyConfigRequest"},
+      "errors":[
+        {"shape":"InvalidParameterValueException"},
+        {"shape":"ResourceConflictException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"TooManyRequestsException"},
+        {"shape":"ServiceException"}
+      ],
+      "documentation":"<p>Deletes the provisioned concurrency configuration for a function.</p>"
+    },
     "GetAccountSettings":{
       "name":"GetAccountSettings",
       "http":{
@@ -251,6 +286,23 @@
       ],
       "documentation":"<p>Returns information about the function or function version, with a link to download the deployment package that's valid for 10 minutes. If you specify a function version, only details that are specific to that version are returned.</p>"
     },
+    "GetFunctionConcurrency":{
+      "name":"GetFunctionConcurrency",
+      "http":{
+        "method":"GET",
+        "requestUri":"/2019-09-30/functions/{FunctionName}/concurrency",
+        "responseCode":200
+      },
+      "input":{"shape":"GetFunctionConcurrencyRequest"},
+      "output":{"shape":"GetFunctionConcurrencyResponse"},
+      "errors":[
+        {"shape":"InvalidParameterValueException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"TooManyRequestsException"},
+        {"shape":"ServiceException"}
+      ],
+      "documentation":"<p>Returns details about the reserved concurrency configuration for a function. To set a concurrency limit for a function, use <a>PutFunctionConcurrency</a>.</p>"
+    },
     "GetFunctionConfiguration":{
       "name":"GetFunctionConfiguration",
       "http":{
@@ -268,6 +320,23 @@
       ],
       "documentation":"<p>Returns the version-specific settings of a Lambda function or version. The output includes only options that can vary between versions of a function. To modify these settings, use <a>UpdateFunctionConfiguration</a>.</p> <p>To get all of a function's details, including function-level settings, use <a>GetFunction</a>.</p>"
     },
+    "GetFunctionEventInvokeConfig":{
+      "name":"GetFunctionEventInvokeConfig",
+      "http":{
+        "method":"GET",
+        "requestUri":"/2019-09-25/functions/{FunctionName}/event-invoke-config",
+        "responseCode":200
+      },
+      "input":{"shape":"GetFunctionEventInvokeConfigRequest"},
+      "output":{"shape":"FunctionEventInvokeConfig"},
+      "errors":[
+        {"shape":"ServiceException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InvalidParameterValueException"},
+        {"shape":"TooManyRequestsException"}
+      ],
+      "documentation":"<p>Retrieves the configuration for asynchronous invocation for a function, version, or alias.</p> <p>To configure options for asynchronous invocation, use <a>PutFunctionEventInvokeConfig</a>.</p>"
+    },
     "GetLayerVersion":{
       "name":"GetLayerVersion",
       "http":{
@@ -336,6 +405,24 @@
       ],
       "documentation":"<p>Returns the <a href=\"https://docs.aws.amazon.com/lambda/latest/dg/access-control-resource-based.html\">resource-based IAM policy</a> for a function, version, or alias.</p>"
     },
+    "GetProvisionedConcurrencyConfig":{
+      "name":"GetProvisionedConcurrencyConfig",
+      "http":{
+        "method":"GET",
+        "requestUri":"/2019-09-30/functions/{FunctionName}/provisioned-concurrency",
+        "responseCode":200
+      },
+      "input":{"shape":"GetProvisionedConcurrencyConfigRequest"},
+      "output":{"shape":"GetProvisionedConcurrencyConfigResponse"},
+      "errors":[
+        {"shape":"InvalidParameterValueException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"TooManyRequestsException"},
+        {"shape":"ServiceException"},
+        {"shape":"ProvisionedConcurrencyConfigNotFoundException"}
+      ],
+      "documentation":"<p>Retrieves the provisioned concurrency configuration for a function's alias or version.</p>"
+    },
     "Invoke":{
       "name":"Invoke",
       "http":{
@@ -364,9 +451,11 @@
         {"shape":"KMSInvalidStateException"},
         {"shape":"KMSAccessDeniedException"},
         {"shape":"KMSNotFoundException"},
-        {"shape":"InvalidRuntimeException"}
+        {"shape":"InvalidRuntimeException"},
+        {"shape":"ResourceConflictException"},
+        {"shape":"ResourceNotReadyException"}
       ],
-      "documentation":"<p>Invokes a Lambda function. You can invoke a function synchronously (and wait for the response), or asynchronously. To invoke a function asynchronously, set <code>InvocationType</code> to <code>Event</code>.</p> <p>For synchronous invocation, details about the function response, including errors, are included in the response body and headers. For either invocation type, you can find more information in the <a href=\"https://docs.aws.amazon.com/lambda/latest/dg/monitoring-functions.html\">execution log</a> and <a href=\"https://docs.aws.amazon.com/lambda/latest/dg/dlq.html\">trace</a>. To record function errors for asynchronous invocations, configure your function with a <a href=\"https://docs.aws.amazon.com/lambda/latest/dg/dlq.html\">dead letter queue</a>.</p> <p>When an error occurs, your function may be invoked multiple times. Retry behavior varies by error type, client, event source, and invocation type. For example, if you invoke a function asynchronously and it returns an error, Lambda executes the function up to two more times. For more information, see <a href=\"https://docs.aws.amazon.com/lambda/latest/dg/retries-on-errors.html\">Retry Behavior</a>.</p> <p>The status code in the API response doesn't reflect function errors. Error codes are reserved for errors that prevent your function from executing, such as permissions errors, <a href=\"https://docs.aws.amazon.com/lambda/latest/dg/limits.html\">limit errors</a>, or issues with your function's code and configuration. For example, Lambda returns <code>TooManyRequestsException</code> if executing the function would cause you to exceed a concurrency limit at either the account level (<code>ConcurrentInvocationLimitExceeded</code>) or function level (<code>ReservedFunctionConcurrentInvocationLimitExceeded</code>).</p> <p>For functions with a long timeout, your client might be disconnected during synchronous invocation while it waits for a response. Configure your HTTP client, SDK, firewall, proxy, or operating system to allow for long connections with timeout or keep-alive settings.</p> <p>This operation requires permission for the <code>lambda:InvokeFunction</code> action.</p>"
+      "documentation":"<p>Invokes a Lambda function. You can invoke a function synchronously (and wait for the response), or asynchronously. To invoke a function asynchronously, set <code>InvocationType</code> to <code>Event</code>.</p> <p>For <a href=\"https://docs.aws.amazon.com/lambda/latest/dg/invocation-sync.html\">synchronous invocation</a>, details about the function response, including errors, are included in the response body and headers. For either invocation type, you can find more information in the <a href=\"https://docs.aws.amazon.com/lambda/latest/dg/monitoring-functions.html\">execution log</a> and <a href=\"https://docs.aws.amazon.com/lambda/latest/dg/lambda-x-ray.html\">trace</a>.</p> <p>When an error occurs, your function may be invoked multiple times. Retry behavior varies by error type, client, event source, and invocation type. For example, if you invoke a function asynchronously and it returns an error, Lambda executes the function up to two more times. For more information, see <a href=\"https://docs.aws.amazon.com/lambda/latest/dg/retries-on-errors.html\">Retry Behavior</a>.</p> <p>For <a href=\"https://docs.aws.amazon.com/lambda/latest/dg/invocation-async.html\">asynchronous invocation</a>, Lambda adds events to a queue before sending them to your function. If your function does not have enough capacity to keep up with the queue, events may be lost. Occasionally, your function may receive the same event multiple times, even if no error occurs. To retain events that were not processed, configure your function with a <a href=\"https://docs.aws.amazon.com/lambda/latest/dg/invocation-async.html#dlq\">dead-letter queue</a>.</p> <p>The status code in the API response doesn't reflect function errors. Error codes are reserved for errors that prevent your function from executing, such as permissions errors, <a href=\"https://docs.aws.amazon.com/lambda/latest/dg/limits.html\">limit errors</a>, or issues with your function's code and configuration. For example, Lambda returns <code>TooManyRequestsException</code> if executing the function would cause you to exceed a concurrency limit at either the account level (<code>ConcurrentInvocationLimitExceeded</code>) or function level (<code>ReservedFunctionConcurrentInvocationLimitExceeded</code>).</p> <p>For functions with a long timeout, your client might be disconnected during synchronous invocation while it waits for a response. Configure your HTTP client, SDK, firewall, proxy, or operating system to allow for long connections with timeout or keep-alive settings.</p> <p>This operation requires permission for the <code>lambda:InvokeFunction</code> action.</p>"
     },
     "InvokeAsync":{
       "name":"InvokeAsync",
@@ -381,7 +470,8 @@
         {"shape":"ServiceException"},
         {"shape":"ResourceNotFoundException"},
         {"shape":"InvalidRequestContentException"},
-        {"shape":"InvalidRuntimeException"}
+        {"shape":"InvalidRuntimeException"},
+        {"shape":"ResourceConflictException"}
       ],
       "documentation":"<important> <p>For asynchronous function invocation, use <a>Invoke</a>.</p> </important> <p>Invokes a function asynchronously.</p>",
       "deprecated":true
@@ -420,6 +510,23 @@
       ],
       "documentation":"<p>Lists event source mappings. Specify an <code>EventSourceArn</code> to only show event source mappings for a single event source.</p>"
     },
+    "ListFunctionEventInvokeConfigs":{
+      "name":"ListFunctionEventInvokeConfigs",
+      "http":{
+        "method":"GET",
+        "requestUri":"/2019-09-25/functions/{FunctionName}/event-invoke-config/list",
+        "responseCode":200
+      },
+      "input":{"shape":"ListFunctionEventInvokeConfigsRequest"},
+      "output":{"shape":"ListFunctionEventInvokeConfigsResponse"},
+      "errors":[
+        {"shape":"InvalidParameterValueException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"TooManyRequestsException"},
+        {"shape":"ServiceException"}
+      ],
+      "documentation":"<p>Retrieves a list of configurations for asynchronous invocation for a function.</p> <p>To configure options for asynchronous invocation, use <a>PutFunctionEventInvokeConfig</a>.</p>"
+    },
     "ListFunctions":{
       "name":"ListFunctions",
       "http":{
@@ -434,7 +541,7 @@
         {"shape":"TooManyRequestsException"},
         {"shape":"InvalidParameterValueException"}
       ],
-      "documentation":"<p>Returns a list of Lambda functions, with the version-specific configuration of each.</p> <p>Set <code>FunctionVersion</code> to <code>ALL</code> to include all published versions of each function in addition to the unpublished version. To get more information about a function or version, use <a>GetFunction</a>.</p>"
+      "documentation":"<p>Returns a list of Lambda functions, with the version-specific configuration of each. Lambda returns up to 50 functions per call.</p> <p>Set <code>FunctionVersion</code> to <code>ALL</code> to include all published versions of each function in addition to the unpublished version. To get more information about a function or version, use <a>GetFunction</a>.</p>"
     },
     "ListLayerVersions":{
       "name":"ListLayerVersions",
@@ -469,6 +576,23 @@
       ],
       "documentation":"<p>Lists <a href=\"https://docs.aws.amazon.com/lambda/latest/dg/configuration-layers.html\">AWS Lambda layers</a> and shows information about the latest version of each. Specify a <a href=\"https://docs.aws.amazon.com/lambda/latest/dg/lambda-runtimes.html\">runtime identifier</a> to list only layers that indicate that they're compatible with that runtime.</p>"
     },
+    "ListProvisionedConcurrencyConfigs":{
+      "name":"ListProvisionedConcurrencyConfigs",
+      "http":{
+        "method":"GET",
+        "requestUri":"/2019-09-30/functions/{FunctionName}/provisioned-concurrency?List=ALL",
+        "responseCode":200
+      },
+      "input":{"shape":"ListProvisionedConcurrencyConfigsRequest"},
+      "output":{"shape":"ListProvisionedConcurrencyConfigsResponse"},
+      "errors":[
+        {"shape":"InvalidParameterValueException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"TooManyRequestsException"},
+        {"shape":"ServiceException"}
+      ],
+      "documentation":"<p>Retrieves a list of provisioned concurrency configurations for a function.</p>"
+    },
     "ListTags":{
       "name":"ListTags",
       "http":{
@@ -500,7 +624,7 @@
         {"shape":"InvalidParameterValueException"},
         {"shape":"TooManyRequestsException"}
       ],
-      "documentation":"<p>Returns a list of <a href=\"https://docs.aws.amazon.com/lambda/latest/dg/versioning-aliases.html\">versions</a>, with the version-specific configuration of each. </p>"
+      "documentation":"<p>Returns a list of <a href=\"https://docs.aws.amazon.com/lambda/latest/dg/versioning-aliases.html\">versions</a>, with the version-specific configuration of each. Lambda returns up to 50 versions per call.</p>"
     },
     "PublishLayerVersion":{
       "name":"PublishLayerVersion",
@@ -518,7 +642,7 @@
         {"shape":"InvalidParameterValueException"},
         {"shape":"CodeStorageExceededException"}
       ],
-      "documentation":"<p>Creates an <a href=\"https://docs.aws.amazon.com/lambda/latest/dg/configuration-layers.html\">AWS Lambda layer</a> from a ZIP archive. Each time you call <code>PublishLayerVersion</code> with the same version name, a new version is created.</p> <p>Add layers to your function with <a>CreateFunction</a> or <a>UpdateFunctionConfiguration</a>.</p>"
+      "documentation":"<p>Creates an <a href=\"https://docs.aws.amazon.com/lambda/latest/dg/configuration-layers.html\">AWS Lambda layer</a> from a ZIP archive. Each time you call <code>PublishLayerVersion</code> with the same layer name, a new version is created.</p> <p>Add layers to your function with <a>CreateFunction</a> or <a>UpdateFunctionConfiguration</a>.</p>"
     },
     "PublishVersion":{
       "name":"PublishVersion",
@@ -535,7 +659,8 @@
         {"shape":"InvalidParameterValueException"},
         {"shape":"TooManyRequestsException"},
         {"shape":"CodeStorageExceededException"},
-        {"shape":"PreconditionFailedException"}
+        {"shape":"PreconditionFailedException"},
+        {"shape":"ResourceConflictException"}
       ],
       "documentation":"<p>Creates a <a href=\"https://docs.aws.amazon.com/lambda/latest/dg/versioning-aliases.html\">version</a> from the current code and configuration of a function. Use versions to create a snapshot of your function code and configuration that doesn't change.</p> <p>AWS Lambda doesn't publish a version if the function's configuration and code haven't changed since the last version. Use <a>UpdateFunctionCode</a> or <a>UpdateFunctionConfiguration</a> to update the function before publishing a version.</p> <p>Clients can invoke versions directly or with an alias. To create an alias, use <a>CreateAlias</a>.</p>"
     },
@@ -552,9 +677,45 @@
         {"shape":"ServiceException"},
         {"shape":"InvalidParameterValueException"},
         {"shape":"ResourceNotFoundException"},
+        {"shape":"TooManyRequestsException"},
+        {"shape":"ResourceConflictException"}
+      ],
+      "documentation":"<p>Sets the maximum number of simultaneous executions for a function, and reserves capacity for that concurrency level.</p> <p>Concurrency settings apply to the function as a whole, including all published versions and the unpublished version. Reserving concurrency both ensures that your function has capacity to process the specified number of events simultaneously, and prevents it from scaling beyond that level. Use <a>GetFunction</a> to see the current setting for a function.</p> <p>Use <a>GetAccountSettings</a> to see your Regional concurrency limit. You can reserve concurrency for as many functions as you like, as long as you leave at least 100 simultaneous executions unreserved for functions that aren't configured with a per-function limit. For more information, see <a href=\"https://docs.aws.amazon.com/lambda/latest/dg/concurrent-executions.html\">Managing Concurrency</a>.</p>"
+    },
+    "PutFunctionEventInvokeConfig":{
+      "name":"PutFunctionEventInvokeConfig",
+      "http":{
+        "method":"PUT",
+        "requestUri":"/2019-09-25/functions/{FunctionName}/event-invoke-config",
+        "responseCode":200
+      },
+      "input":{"shape":"PutFunctionEventInvokeConfigRequest"},
+      "output":{"shape":"FunctionEventInvokeConfig"},
+      "errors":[
+        {"shape":"ServiceException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InvalidParameterValueException"},
         {"shape":"TooManyRequestsException"}
       ],
-      "documentation":"<p>Sets the maximum number of simultaneous executions for a function, and reserves capacity for that concurrency level.</p> <p>Concurrency settings apply to the function as a whole, including all published versions and the unpublished version. Reserving concurrency both ensures that your function has capacity to process the specified number of events simultaneously, and prevents it from scaling beyond that level. Use <a>GetFunction</a> to see the current setting for a function.</p> <p>Use <a>GetAccountSettings</a> to see your regional concurrency limit. You can reserve concurrency for as many functions as you like, as long as you leave at least 100 simultaneous executions unreserved for functions that aren't configured with a per-function limit. For more information, see <a href=\"https://docs.aws.amazon.com/lambda/latest/dg/concurrent-executions.html\">Managing Concurrency</a>.</p>"
+      "documentation":"<p>Configures options for <a href=\"https://docs.aws.amazon.com/lambda/latest/dg/invocation-async.html\">asynchronous invocation</a> on a function, version, or alias. If a configuration already exists for a function, version, or alias, this operation overwrites it. If you exclude any settings, they are removed. To set one option without affecting existing settings for other options, use <a>PutFunctionEventInvokeConfig</a>.</p> <p>By default, Lambda retries an asynchronous invocation twice if the function returns an error. It retains events in a queue for up to six hours. When an event fails all processing attempts or stays in the asynchronous invocation queue for too long, Lambda discards it. To retain discarded events, configure a dead-letter queue with <a>UpdateFunctionConfiguration</a>.</p> <p>To send an invocation record to a queue, topic, function, or event bus, specify a <a href=\"https://docs.aws.amazon.com/lambda/latest/dg/invocation-async.html#invocation-async-destinations\">destination</a>. You can configure separate destinations for successful invocations (on-success) and events that fail all processing attempts (on-failure). You can configure destinations in addition to or instead of a dead-letter queue.</p>"
+    },
+    "PutProvisionedConcurrencyConfig":{
+      "name":"PutProvisionedConcurrencyConfig",
+      "http":{
+        "method":"PUT",
+        "requestUri":"/2019-09-30/functions/{FunctionName}/provisioned-concurrency",
+        "responseCode":202
+      },
+      "input":{"shape":"PutProvisionedConcurrencyConfigRequest"},
+      "output":{"shape":"PutProvisionedConcurrencyConfigResponse"},
+      "errors":[
+        {"shape":"InvalidParameterValueException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ResourceConflictException"},
+        {"shape":"TooManyRequestsException"},
+        {"shape":"ServiceException"}
+      ],
+      "documentation":"<p>Adds a provisioned concurrency configuration to a function's alias or version.</p>"
     },
     "RemoveLayerVersionPermission":{
       "name":"RemoveLayerVersionPermission",
@@ -602,7 +763,8 @@
         {"shape":"ServiceException"},
         {"shape":"ResourceNotFoundException"},
         {"shape":"InvalidParameterValueException"},
-        {"shape":"TooManyRequestsException"}
+        {"shape":"TooManyRequestsException"},
+        {"shape":"ResourceConflictException"}
       ],
       "documentation":"<p>Adds <a href=\"https://docs.aws.amazon.com/lambda/latest/dg/tagging.html\">tags</a> to a function.</p>"
     },
@@ -618,7 +780,8 @@
         {"shape":"ServiceException"},
         {"shape":"ResourceNotFoundException"},
         {"shape":"InvalidParameterValueException"},
-        {"shape":"TooManyRequestsException"}
+        {"shape":"TooManyRequestsException"},
+        {"shape":"ResourceConflictException"}
       ],
       "documentation":"<p>Removes <a href=\"https://docs.aws.amazon.com/lambda/latest/dg/tagging.html\">tags</a> from a function.</p>"
     },
@@ -636,7 +799,8 @@
         {"shape":"ResourceNotFoundException"},
         {"shape":"InvalidParameterValueException"},
         {"shape":"TooManyRequestsException"},
-        {"shape":"PreconditionFailedException"}
+        {"shape":"PreconditionFailedException"},
+        {"shape":"ResourceConflictException"}
       ],
       "documentation":"<p>Updates the configuration of a Lambda function <a href=\"https://docs.aws.amazon.com/lambda/latest/dg/versioning-aliases.html\">alias</a>.</p>"
     },
@@ -657,7 +821,7 @@
         {"shape":"ResourceConflictException"},
         {"shape":"ResourceInUseException"}
       ],
-      "documentation":"<p>Updates an event source mapping. You can change the function that AWS Lambda invokes, or pause invocation and resume later from the same location.</p>"
+      "documentation":"<p>Updates an event source mapping. You can change the function that AWS Lambda invokes, or pause invocation and resume later from the same location.</p> <p>The following error handling options are only available for stream sources (DynamoDB and Kinesis):</p> <ul> <li> <p> <code>BisectBatchOnFunctionError</code> - If the function returns an error, split the batch in two and retry.</p> </li> <li> <p> <code>DestinationConfig</code> - Send discarded records to an Amazon SQS queue or Amazon SNS topic.</p> </li> <li> <p> <code>MaximumRecordAgeInSeconds</code> - Discard records older than the specified age.</p> </li> <li> <p> <code>MaximumRetryAttempts</code> - Discard records after the specified number of retries.</p> </li> <li> <p> <code>ParallelizationFactor</code> - Process multiple batches from each shard concurrently.</p> </li> </ul>"
     },
     "UpdateFunctionCode":{
       "name":"UpdateFunctionCode",
@@ -674,7 +838,8 @@
         {"shape":"InvalidParameterValueException"},
         {"shape":"TooManyRequestsException"},
         {"shape":"CodeStorageExceededException"},
-        {"shape":"PreconditionFailedException"}
+        {"shape":"PreconditionFailedException"},
+        {"shape":"ResourceConflictException"}
       ],
       "documentation":"<p>Updates a Lambda function's code.</p> <p>The function's code is locked when you publish a version. You can't modify the code of a published version, only the unpublished version.</p>"
     },
@@ -695,7 +860,24 @@
         {"shape":"ResourceConflictException"},
         {"shape":"PreconditionFailedException"}
       ],
-      "documentation":"<p>Modify the version-specific settings of a Lambda function.</p> <p>These settings can vary between versions of a function and are locked when you publish a version. You can't modify the configuration of a published version, only the unpublished version.</p> <p>To configure function concurrency, use <a>PutFunctionConcurrency</a>. To grant invoke permissions to an account or AWS service, use <a>AddPermission</a>.</p>"
+      "documentation":"<p>Modify the version-specific settings of a Lambda function.</p> <p>When you update a function, Lambda provisions an instance of the function and its supporting resources. If your function connects to a VPC, this process can take a minute. During this time, you can't modify the function, but you can still invoke it. The <code>LastUpdateStatus</code>, <code>LastUpdateStatusReason</code>, and <code>LastUpdateStatusReasonCode</code> fields in the response from <a>GetFunctionConfiguration</a> indicate when the update is complete and the function is processing events with the new configuration. For more information, see <a href=\"https://docs.aws.amazon.com/lambda/latest/dg/functions-states.html\">Function States</a>.</p> <p>These settings can vary between versions of a function and are locked when you publish a version. You can't modify the configuration of a published version, only the unpublished version.</p> <p>To configure function concurrency, use <a>PutFunctionConcurrency</a>. To grant invoke permissions to an account or AWS service, use <a>AddPermission</a>.</p>"
+    },
+    "UpdateFunctionEventInvokeConfig":{
+      "name":"UpdateFunctionEventInvokeConfig",
+      "http":{
+        "method":"POST",
+        "requestUri":"/2019-09-25/functions/{FunctionName}/event-invoke-config",
+        "responseCode":200
+      },
+      "input":{"shape":"UpdateFunctionEventInvokeConfigRequest"},
+      "output":{"shape":"FunctionEventInvokeConfig"},
+      "errors":[
+        {"shape":"ServiceException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InvalidParameterValueException"},
+        {"shape":"TooManyRequestsException"}
+      ],
+      "documentation":"<p>Updates the configuration for asynchronous invocation for a function, version, or alias.</p> <p>To configure options for asynchronous invocation, use <a>PutFunctionEventInvokeConfig</a>.</p>"
     }
   },
   "shapes":{
@@ -708,7 +890,7 @@
         },
         "CodeSizeUnzipped":{
           "shape":"Long",
-          "documentation":"<p>The maximum size of your function's code and layers when they're extracted.</p>"
+          "documentation":"<p>The maximum size of a function's deployment package and layers when they're extracted.</p>"
         },
         "CodeSizeZipped":{
           "shape":"Long",
@@ -723,7 +905,7 @@
           "documentation":"<p>The maximum number of simultaneous function executions, minus the capacity that's reserved for individual functions with <a>PutFunctionConcurrency</a>.</p>"
         }
       },
-      "documentation":"<p>Limits that are related to concurrency and code storage. All file and storage sizes are in bytes.</p>"
+      "documentation":"<p>Limits that are related to concurrency and storage. All file and storage sizes are in bytes.</p>"
     },
     "AccountUsage":{
       "type":"structure",
@@ -835,7 +1017,7 @@
         },
         "SourceAccount":{
           "shape":"SourceOwner",
-          "documentation":"<p>For AWS services, the ID of the account that owns the resource. Use this instead of <code>SourceArn</code> to grant permission to resources that are owned by another account (for example, all of an account's Amazon S3 buckets). Or use it together with <code>SourceArn</code> to ensure that the resource is owned by the specified account. For example, an Amazon S3 bucket could be deleted by its owner and recreated by another account.</p>"
+          "documentation":"<p>For Amazon S3, the ID of the account that owns the resource. Use this together with <code>SourceArn</code> to ensure that the resource is owned by the specified account. It is possible for an Amazon S3 bucket to be deleted by its owner and recreated by another account.</p>"
         },
         "EventSourceToken":{
           "shape":"EventSourceToken",
@@ -932,6 +1114,7 @@
       "max":10000,
       "min":1
     },
+    "BisectBatchOnFunctionError":{"type":"boolean"},
     "Blob":{
       "type":"blob",
       "sensitive":true
@@ -1023,7 +1206,14 @@
           "shape":"BatchSize",
           "documentation":"<p>The maximum number of items to retrieve in a single batch.</p> <ul> <li> <p> <b>Amazon Kinesis</b> - Default 100. Max 10,000.</p> </li> <li> <p> <b>Amazon DynamoDB Streams</b> - Default 100. Max 1,000.</p> </li> <li> <p> <b>Amazon Simple Queue Service</b> - Default 10. Max 10.</p> </li> </ul>"
         },
-        "MaximumBatchingWindowInSeconds":{"shape":"MaximumBatchingWindowInSeconds"},
+        "MaximumBatchingWindowInSeconds":{
+          "shape":"MaximumBatchingWindowInSeconds",
+          "documentation":"<p>(Streams) The maximum amount of time to gather records before invoking the function, in seconds.</p>"
+        },
+        "ParallelizationFactor":{
+          "shape":"ParallelizationFactor",
+          "documentation":"<p>(Streams) The number of batches to process from each shard concurrently.</p>"
+        },
         "StartingPosition":{
           "shape":"EventSourcePosition",
           "documentation":"<p>The position in a stream from which to start reading. Required for Amazon Kinesis and Amazon DynamoDB Streams sources. <code>AT_TIMESTAMP</code> is only supported for Amazon Kinesis streams.</p>"
@@ -1031,6 +1221,22 @@
         "StartingPositionTimestamp":{
           "shape":"Date",
           "documentation":"<p>With <code>StartingPosition</code> set to <code>AT_TIMESTAMP</code>, the time from which to start reading.</p>"
+        },
+        "DestinationConfig":{
+          "shape":"DestinationConfig",
+          "documentation":"<p>(Streams) An Amazon SQS queue or Amazon SNS topic destination for discarded records.</p>"
+        },
+        "MaximumRecordAgeInSeconds":{
+          "shape":"MaximumRecordAgeInSeconds",
+          "documentation":"<p>(Streams) The maximum age of a record that Lambda sends to a function for processing.</p>"
+        },
+        "BisectBatchOnFunctionError":{
+          "shape":"BisectBatchOnFunctionError",
+          "documentation":"<p>(Streams) If the function returns an error, split the batch in two and retry.</p>"
+        },
+        "MaximumRetryAttempts":{
+          "shape":"MaximumRetryAttemptsEventSourceMapping",
+          "documentation":"<p>(Streams) The maximum number of times to retry when the function returns an error.</p>"
         }
       }
     },
@@ -1082,11 +1288,11 @@
         },
         "VpcConfig":{
           "shape":"VpcConfig",
-          "documentation":"<p>For network connectivity to AWS resources in a VPC, specify a list of security groups and subnets in the VPC. When you connect a function to a VPC, it can only access resources and the internet through that VPC. For more information, see <a href=\"https://docs.aws.amazon.com/lambda/latest/dg/vpc.html\">VPC Settings</a>.</p>"
+          "documentation":"<p>For network connectivity to AWS resources in a VPC, specify a list of security groups and subnets in the VPC. When you connect a function to a VPC, it can only access resources and the internet through that VPC. For more information, see <a href=\"https://docs.aws.amazon.com/lambda/latest/dg/configuration-vpc.html\">VPC Settings</a>.</p>"
         },
         "DeadLetterConfig":{
           "shape":"DeadLetterConfig",
-          "documentation":"<p>A dead letter queue configuration that specifies the queue or topic where Lambda sends asynchronous events when they fail processing. For more information, see <a href=\"https://docs.aws.amazon.com/lambda/latest/dg/dlq.html\">Dead Letter Queues</a>.</p>"
+          "documentation":"<p>A dead letter queue configuration that specifies the queue or topic where Lambda sends asynchronous events when they fail processing. For more information, see <a href=\"https://docs.aws.amazon.com/lambda/latest/dg/invocation-async.html#dlq\">Dead Letter Queues</a>.</p>"
         },
         "Environment":{
           "shape":"Environment",
@@ -1119,7 +1325,7 @@
           "documentation":"<p>The Amazon Resource Name (ARN) of an Amazon SQS queue or Amazon SNS topic.</p>"
         }
       },
-      "documentation":"<p>The <a href=\"https://docs.aws.amazon.com/lambda/latest/dg/dlq.html\">dead letter queue</a> for failed asynchronous invocations.</p>"
+      "documentation":"<p>The <a href=\"https://docs.aws.amazon.com/lambda/latest/dg/invocation-async.html#dlq\">dead-letter queue</a> for failed asynchronous invocations.</p>"
     },
     "DeleteAliasRequest":{
       "type":"structure",
@@ -1166,6 +1372,24 @@
         }
       }
     },
+    "DeleteFunctionEventInvokeConfigRequest":{
+      "type":"structure",
+      "required":["FunctionName"],
+      "members":{
+        "FunctionName":{
+          "shape":"FunctionName",
+          "documentation":"<p>The name of the Lambda function, version, or alias.</p> <p class=\"title\"> <b>Name formats</b> </p> <ul> <li> <p> <b>Function name</b> - <code>my-function</code> (name-only), <code>my-function:v1</code> (with alias).</p> </li> <li> <p> <b>Function ARN</b> - <code>arn:aws:lambda:us-west-2:123456789012:function:my-function</code>.</p> </li> <li> <p> <b>Partial ARN</b> - <code>123456789012:function:my-function</code>.</p> </li> </ul> <p>You can append a version number or alias to any of the formats. The length constraint applies only to the full ARN. If you specify only the function name, it is limited to 64 characters in length.</p>",
+          "location":"uri",
+          "locationName":"FunctionName"
+        },
+        "Qualifier":{
+          "shape":"Qualifier",
+          "documentation":"<p>A version number or alias name.</p>",
+          "location":"querystring",
+          "locationName":"Qualifier"
+        }
+      }
+    },
     "DeleteFunctionRequest":{
       "type":"structure",
       "required":["FunctionName"],
@@ -1205,11 +1429,52 @@
         }
       }
     },
+    "DeleteProvisionedConcurrencyConfigRequest":{
+      "type":"structure",
+      "required":[
+        "FunctionName",
+        "Qualifier"
+      ],
+      "members":{
+        "FunctionName":{
+          "shape":"FunctionName",
+          "documentation":"<p>The name of the Lambda function.</p> <p class=\"title\"> <b>Name formats</b> </p> <ul> <li> <p> <b>Function name</b> - <code>my-function</code>.</p> </li> <li> <p> <b>Function ARN</b> - <code>arn:aws:lambda:us-west-2:123456789012:function:my-function</code>.</p> </li> <li> <p> <b>Partial ARN</b> - <code>123456789012:function:my-function</code>.</p> </li> </ul> <p>The length constraint applies only to the full ARN. If you specify only the function name, it is limited to 64 characters in length.</p>",
+          "location":"uri",
+          "locationName":"FunctionName"
+        },
+        "Qualifier":{
+          "shape":"Qualifier",
+          "documentation":"<p>The version number or alias name.</p>",
+          "location":"querystring",
+          "locationName":"Qualifier"
+        }
+      }
+    },
     "Description":{
       "type":"string",
       "max":256,
       "min":0
     },
+    "DestinationArn":{
+      "type":"string",
+      "max":350,
+      "min":0,
+      "pattern":"^$|arn:(aws[a-zA-Z0-9-]*):([a-zA-Z0-9\\-])+:([a-z]{2}(-gov)?-[a-z]+-\\d{1})?:(\\d{12})?:(.*)"
+    },
+    "DestinationConfig":{
+      "type":"structure",
+      "members":{
+        "OnSuccess":{
+          "shape":"OnSuccess",
+          "documentation":"<p>The destination configuration for successful invocations.</p>"
+        },
+        "OnFailure":{
+          "shape":"OnFailure",
+          "documentation":"<p>The destination configuration for failed invocations.</p>"
+        }
+      },
+      "documentation":"<p>A configuration object that specifies the destination of an event after Lambda processes it.</p>"
+    },
     "EC2AccessDeniedException":{
       "type":"structure",
       "members":{
@@ -1247,7 +1512,7 @@
         "Type":{"shape":"String"},
         "Message":{"shape":"String"}
       },
-      "documentation":"<p>AWS Lambda was not able to create an Elastic Network Interface (ENI) in the VPC, specified as part of Lambda function configuration, because the limit for network interfaces has been reached.</p>",
+      "documentation":"<p>AWS Lambda was not able to create an elastic network interface in the VPC, specified as part of Lambda function configuration, because the limit for network interfaces has been reached.</p>",
       "error":{"httpStatusCode":502},
       "exception":true
     },
@@ -1288,7 +1553,7 @@
           "documentation":"<p>Error messages for environment variables that couldn't be applied.</p>"
         }
       },
-      "documentation":"<p>The results of a configuration update that applied environment variables.</p>"
+      "documentation":"<p>The results of an operation to update or read environment variables. If the operation is successful, the response contains the environment variables. If it failed, the response contains details about the error.</p>"
     },
     "EnvironmentVariableName":{
       "type":"string",
@@ -1316,7 +1581,14 @@
           "shape":"BatchSize",
           "documentation":"<p>The maximum number of items to retrieve in a single batch.</p>"
         },
-        "MaximumBatchingWindowInSeconds":{"shape":"MaximumBatchingWindowInSeconds"},
+        "MaximumBatchingWindowInSeconds":{
+          "shape":"MaximumBatchingWindowInSeconds",
+          "documentation":"<p>(Streams) The maximum amount of time to gather records before invoking the function, in seconds.</p>"
+        },
+        "ParallelizationFactor":{
+          "shape":"ParallelizationFactor",
+          "documentation":"<p>(Streams) The number of batches to process from each shard concurrently.</p>"
+        },
         "EventSourceArn":{
           "shape":"Arn",
           "documentation":"<p>The Amazon Resource Name (ARN) of the event source.</p>"
@@ -1327,7 +1599,7 @@
         },
         "LastModified":{
           "shape":"Date",
-          "documentation":"<p>The date that the event source mapping was last updated.</p>"
+          "documentation":"<p>The date that the event source mapping was last updated, or its state changed.</p>"
         },
         "LastProcessingResult":{
           "shape":"String",
@@ -1339,7 +1611,23 @@
         },
         "StateTransitionReason":{
           "shape":"String",
-          "documentation":"<p>The cause of the last state change, either <code>User initiated</code> or <code>Lambda initiated</code>.</p>"
+          "documentation":"<p>Indicates whether the last change to the event source mapping was made by a user, or by the Lambda service.</p>"
+        },
+        "DestinationConfig":{
+          "shape":"DestinationConfig",
+          "documentation":"<p>(Streams) An Amazon SQS queue or Amazon SNS topic destination for discarded records.</p>"
+        },
+        "MaximumRecordAgeInSeconds":{
+          "shape":"MaximumRecordAgeInSeconds",
+          "documentation":"<p>(Streams) The maximum age of a record that Lambda sends to a function for processing.</p>"
+        },
+        "BisectBatchOnFunctionError":{
+          "shape":"BisectBatchOnFunctionError",
+          "documentation":"<p>(Streams) If the function returns an error, split the batch in two and retry.</p>"
+        },
+        "MaximumRetryAttempts":{
+          "shape":"MaximumRetryAttemptsEventSourceMapping",
+          "documentation":"<p>(Streams) The maximum number of times to retry when the function returns an error.</p>"
         }
       },
       "documentation":"<p>A mapping between an AWS resource and an AWS Lambda function. See <a>CreateEventSourceMapping</a> for details.</p>"
@@ -1467,7 +1755,7 @@
         },
         "KMSKeyArn":{
           "shape":"KMSKeyArn",
-          "documentation":"<p>The KMS key that's used to encrypt the function's environment variables. This key is only returned if you've configured a customer-managed CMK.</p>"
+          "documentation":"<p>The KMS key that's used to encrypt the function's environment variables. This key is only returned if you've configured a customer managed CMK.</p>"
         },
         "TracingConfig":{
           "shape":"TracingConfigResponse",
@@ -1484,10 +1772,63 @@
         "Layers":{
           "shape":"LayersReferenceList",
           "documentation":"<p>The function's <a href=\"https://docs.aws.amazon.com/lambda/latest/dg/configuration-layers.html\"> layers</a>.</p>"
+        },
+        "State":{
+          "shape":"State",
+          "documentation":"<p>The current state of the function. When the state is <code>Inactive</code>, you can reactivate the function by invoking it.</p>"
+        },
+        "StateReason":{
+          "shape":"StateReason",
+          "documentation":"<p>The reason for the function's current state.</p>"
+        },
+        "StateReasonCode":{
+          "shape":"StateReasonCode",
+          "documentation":"<p>The reason code for the function's current state. When the code is <code>Creating</code>, you can't invoke or modify the function.</p>"
+        },
+        "LastUpdateStatus":{
+          "shape":"LastUpdateStatus",
+          "documentation":"<p>The status of the last update that was performed on the function. This is first set to <code>Successful</code> after function creation completes.</p>"
+        },
+        "LastUpdateStatusReason":{
+          "shape":"LastUpdateStatusReason",
+          "documentation":"<p>The reason for the last update that was performed on the function.</p>"
+        },
+        "LastUpdateStatusReasonCode":{
+          "shape":"LastUpdateStatusReasonCode",
+          "documentation":"<p>The reason code for the last update that was performed on the function.</p>"
         }
       },
       "documentation":"<p>Details about a function's configuration.</p>"
     },
+    "FunctionEventInvokeConfig":{
+      "type":"structure",
+      "members":{
+        "LastModified":{
+          "shape":"Date",
+          "documentation":"<p>The date and time that the configuration was last updated.</p>"
+        },
+        "FunctionArn":{
+          "shape":"FunctionArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the function.</p>"
+        },
+        "MaximumRetryAttempts":{
+          "shape":"MaximumRetryAttempts",
+          "documentation":"<p>The maximum number of times to retry when the function returns an error.</p>"
+        },
+        "MaximumEventAgeInSeconds":{
+          "shape":"MaximumEventAgeInSeconds",
+          "documentation":"<p>The maximum age of a request that Lambda sends to a function for processing.</p>"
+        },
+        "DestinationConfig":{
+          "shape":"DestinationConfig",
+          "documentation":"<p>A destination for events after they have been sent to a function for processing.</p> <p class=\"title\"> <b>Destinations</b> </p> <ul> <li> <p> <b>Function</b> - The Amazon Resource Name (ARN) of a Lambda function.</p> </li> <li> <p> <b>Queue</b> - The ARN of an SQS queue.</p> </li> <li> <p> <b>Topic</b> - The ARN of an SNS topic.</p> </li> <li> <p> <b>Event Bus</b> - The ARN of an Amazon EventBridge event bus.</p> </li> </ul>"
+        }
+      }
+    },
+    "FunctionEventInvokeConfigList":{
+      "type":"list",
+      "member":{"shape":"FunctionEventInvokeConfig"}
+    },
     "FunctionList":{
       "type":"list",
       "member":{"shape":"FunctionConfiguration"}
@@ -1553,6 +1894,27 @@
         }
       }
     },
+    "GetFunctionConcurrencyRequest":{
+      "type":"structure",
+      "required":["FunctionName"],
+      "members":{
+        "FunctionName":{
+          "shape":"FunctionName",
+          "documentation":"<p>The name of the Lambda function.</p> <p class=\"title\"> <b>Name formats</b> </p> <ul> <li> <p> <b>Function name</b> - <code>my-function</code>.</p> </li> <li> <p> <b>Function ARN</b> - <code>arn:aws:lambda:us-west-2:123456789012:function:my-function</code>.</p> </li> <li> <p> <b>Partial ARN</b> - <code>123456789012:function:my-function</code>.</p> </li> </ul> <p>The length constraint applies only to the full ARN. If you specify only the function name, it is limited to 64 characters in length.</p>",
+          "location":"uri",
+          "locationName":"FunctionName"
+        }
+      }
+    },
+    "GetFunctionConcurrencyResponse":{
+      "type":"structure",
+      "members":{
+        "ReservedConcurrentExecutions":{
+          "shape":"ReservedConcurrentExecutions",
+          "documentation":"<p>The number of simultaneous executions that are reserved for the function.</p>"
+        }
+      }
+    },
     "GetFunctionConfigurationRequest":{
       "type":"structure",
       "required":["FunctionName"],
@@ -1571,6 +1933,24 @@
         }
       }
     },
+    "GetFunctionEventInvokeConfigRequest":{
+      "type":"structure",
+      "required":["FunctionName"],
+      "members":{
+        "FunctionName":{
+          "shape":"FunctionName",
+          "documentation":"<p>The name of the Lambda function, version, or alias.</p> <p class=\"title\"> <b>Name formats</b> </p> <ul> <li> <p> <b>Function name</b> - <code>my-function</code> (name-only), <code>my-function:v1</code> (with alias).</p> </li> <li> <p> <b>Function ARN</b> - <code>arn:aws:lambda:us-west-2:123456789012:function:my-function</code>.</p> </li> <li> <p> <b>Partial ARN</b> - <code>123456789012:function:my-function</code>.</p> </li> </ul> <p>You can append a version number or alias to any of the formats. The length constraint applies only to the full ARN. If you specify only the function name, it is limited to 64 characters in length.</p>",
+          "location":"uri",
+          "locationName":"FunctionName"
+        },
+        "Qualifier":{
+          "shape":"Qualifier",
+          "documentation":"<p>A version number or alias name.</p>",
+          "location":"querystring",
+          "locationName":"Qualifier"
+        }
+      }
+    },
     "GetFunctionRequest":{
       "type":"structure",
       "required":["FunctionName"],
@@ -1745,26 +2125,76 @@
         }
       }
     },
-    "Handler":{
-      "type":"string",
-      "max":128,
-      "pattern":"[^\\s]+"
-    },
-    "HttpStatus":{"type":"integer"},
-    "Integer":{"type":"integer"},
-    "InvalidParameterValueException":{
+    "GetProvisionedConcurrencyConfigRequest":{
       "type":"structure",
+      "required":[
+        "FunctionName",
+        "Qualifier"
+      ],
       "members":{
-        "Type":{
-          "shape":"String",
-          "documentation":"<p>The exception type.</p>"
+        "FunctionName":{
+          "shape":"FunctionName",
+          "documentation":"<p>The name of the Lambda function.</p> <p class=\"title\"> <b>Name formats</b> </p> <ul> <li> <p> <b>Function name</b> - <code>my-function</code>.</p> </li> <li> <p> <b>Function ARN</b> - <code>arn:aws:lambda:us-west-2:123456789012:function:my-function</code>.</p> </li> <li> <p> <b>Partial ARN</b> - <code>123456789012:function:my-function</code>.</p> </li> </ul> <p>The length constraint applies only to the full ARN. If you specify only the function name, it is limited to 64 characters in length.</p>",
+          "location":"uri",
+          "locationName":"FunctionName"
+        },
+        "Qualifier":{
+          "shape":"Qualifier",
+          "documentation":"<p>The version number or alias name.</p>",
+          "location":"querystring",
+          "locationName":"Qualifier"
+        }
+      }
+    },
+    "GetProvisionedConcurrencyConfigResponse":{
+      "type":"structure",
+      "members":{
+        "RequestedProvisionedConcurrentExecutions":{
+          "shape":"PositiveInteger",
+          "documentation":"<p>The amount of provisioned concurrency requested.</p>"
+        },
+        "AvailableProvisionedConcurrentExecutions":{
+          "shape":"NonNegativeInteger",
+          "documentation":"<p>The amount of provisioned concurrency available.</p>"
+        },
+        "AllocatedProvisionedConcurrentExecutions":{
+          "shape":"NonNegativeInteger",
+          "documentation":"<p>The amount of provisioned concurrency allocated.</p>"
+        },
+        "Status":{
+          "shape":"ProvisionedConcurrencyStatusEnum",
+          "documentation":"<p>The status of the allocation process.</p>"
+        },
+        "StatusReason":{
+          "shape":"String",
+          "documentation":"<p>For failed allocations, the reason that provisioned concurrency could not be allocated.</p>"
+        },
+        "LastModified":{
+          "shape":"Timestamp",
+          "documentation":"<p>The date and time that a user last updated the configuration, in <a href=\"https://www.iso.org/iso-8601-date-and-time-format.html\">ISO 8601 format</a>.</p>"
+        }
+      }
+    },
+    "Handler":{
+      "type":"string",
+      "max":128,
+      "pattern":"[^\\s]+"
+    },
+    "HttpStatus":{"type":"integer"},
+    "Integer":{"type":"integer"},
+    "InvalidParameterValueException":{
+      "type":"structure",
+      "members":{
+        "Type":{
+          "shape":"String",
+          "documentation":"<p>The exception type.</p>"
         },
         "message":{
           "shape":"String",
           "documentation":"<p>The exception message.</p>"
         }
       },
-      "documentation":"<p>One of the parameters in the request is invalid. For example, if you provided an IAM role for AWS Lambda to assume in the <code>CreateFunction</code> or the <code>UpdateFunctionConfiguration</code> API, that AWS Lambda is unable to assume you will get this exception.</p>",
+      "documentation":"<p>One of the parameters in the request is invalid.</p>",
       "error":{"httpStatusCode":400},
       "exception":true
     },
@@ -1875,7 +2305,7 @@
         },
         "FunctionError":{
           "shape":"String",
-          "documentation":"<p>If present, indicates that an error occurred during function execution. Details about the error are included in the response payload.</p> <ul> <li> <p> <code>Handled</code> - The runtime caught an error thrown by the function and formatted it into a JSON document.</p> </li> <li> <p> <code>Unhandled</code> - The runtime didn't handle the error. For example, the function ran out of memory or timed out.</p> </li> </ul>",
+          "documentation":"<p>If present, indicates that an error occurred during function execution. Details about the error are included in the response payload.</p>",
           "location":"header",
           "locationName":"X-Amz-Function-Error"
         },
@@ -1983,6 +2413,27 @@
       "error":{"httpStatusCode":502},
       "exception":true
     },
+    "LastUpdateStatus":{
+      "type":"string",
+      "enum":[
+        "Successful",
+        "Failed",
+        "InProgress"
+      ]
+    },
+    "LastUpdateStatusReason":{"type":"string"},
+    "LastUpdateStatusReasonCode":{
+      "type":"string",
+      "enum":[
+        "EniLimitExceeded",
+        "InsufficientRolePermissions",
+        "InvalidConfiguration",
+        "InternalError",
+        "SubnetOutOfIPAddresses",
+        "InvalidSubnet",
+        "InvalidSecurityGroup"
+      ]
+    },
     "Layer":{
       "type":"structure",
       "members":{
@@ -2217,12 +2668,49 @@
         }
       }
     },
+    "ListFunctionEventInvokeConfigsRequest":{
+      "type":"structure",
+      "required":["FunctionName"],
+      "members":{
+        "FunctionName":{
+          "shape":"FunctionName",
+          "documentation":"<p>The name of the Lambda function.</p> <p class=\"title\"> <b>Name formats</b> </p> <ul> <li> <p> <b>Function name</b> - <code>my-function</code>.</p> </li> <li> <p> <b>Function ARN</b> - <code>arn:aws:lambda:us-west-2:123456789012:function:my-function</code>.</p> </li> <li> <p> <b>Partial ARN</b> - <code>123456789012:function:my-function</code>.</p> </li> </ul> <p>The length constraint applies only to the full ARN. If you specify only the function name, it is limited to 64 characters in length.</p>",
+          "location":"uri",
+          "locationName":"FunctionName"
+        },
+        "Marker":{
+          "shape":"String",
+          "documentation":"<p>Specify the pagination token that's returned by a previous request to retrieve the next page of results.</p>",
+          "location":"querystring",
+          "locationName":"Marker"
+        },
+        "MaxItems":{
+          "shape":"MaxFunctionEventInvokeConfigListItems",
+          "documentation":"<p>The maximum number of configurations to return.</p>",
+          "location":"querystring",
+          "locationName":"MaxItems"
+        }
+      }
+    },
+    "ListFunctionEventInvokeConfigsResponse":{
+      "type":"structure",
+      "members":{
+        "FunctionEventInvokeConfigs":{
+          "shape":"FunctionEventInvokeConfigList",
+          "documentation":"<p>A list of configurations.</p>"
+        },
+        "NextMarker":{
+          "shape":"String",
+          "documentation":"<p>The pagination token that's included if more results are available.</p>"
+        }
+      }
+    },
     "ListFunctionsRequest":{
       "type":"structure",
       "members":{
         "MasterRegion":{
           "shape":"MasterRegion",
-          "documentation":"<p>For Lambda@Edge functions, the AWS Region of the master function. For example, <code>us-east-2</code> or <code>ALL</code>. If specified, you must set <code>FunctionVersion</code> to <code>ALL</code>.</p>",
+          "documentation":"<p>For Lambda@Edge functions, the AWS Region of the master function. For example, <code>us-east-1</code> filters the list of functions to only include Lambda@Edge functions replicated from a master function in US East (N. Virginia). If specified, you must set <code>FunctionVersion</code> to <code>ALL</code>.</p>",
           "location":"querystring",
           "locationName":"MasterRegion"
         },
@@ -2240,7 +2728,7 @@
         },
         "MaxItems":{
           "shape":"MaxListItems",
-          "documentation":"<p>Specify a value between 1 and 50 to limit the number of functions in the response.</p>",
+          "documentation":"<p>The maximum number of functions to return.</p>",
           "location":"querystring",
           "locationName":"MaxItems"
         }
@@ -2339,6 +2827,43 @@
         }
       }
     },
+    "ListProvisionedConcurrencyConfigsRequest":{
+      "type":"structure",
+      "required":["FunctionName"],
+      "members":{
+        "FunctionName":{
+          "shape":"FunctionName",
+          "documentation":"<p>The name of the Lambda function.</p> <p class=\"title\"> <b>Name formats</b> </p> <ul> <li> <p> <b>Function name</b> - <code>my-function</code>.</p> </li> <li> <p> <b>Function ARN</b> - <code>arn:aws:lambda:us-west-2:123456789012:function:my-function</code>.</p> </li> <li> <p> <b>Partial ARN</b> - <code>123456789012:function:my-function</code>.</p> </li> </ul> <p>The length constraint applies only to the full ARN. If you specify only the function name, it is limited to 64 characters in length.</p>",
+          "location":"uri",
+          "locationName":"FunctionName"
+        },
+        "Marker":{
+          "shape":"String",
+          "documentation":"<p>Specify the pagination token that's returned by a previous request to retrieve the next page of results.</p>",
+          "location":"querystring",
+          "locationName":"Marker"
+        },
+        "MaxItems":{
+          "shape":"MaxProvisionedConcurrencyConfigListItems",
+          "documentation":"<p>Specify a number to limit the number of configurations returned.</p>",
+          "location":"querystring",
+          "locationName":"MaxItems"
+        }
+      }
+    },
+    "ListProvisionedConcurrencyConfigsResponse":{
+      "type":"structure",
+      "members":{
+        "ProvisionedConcurrencyConfigs":{
+          "shape":"ProvisionedConcurrencyConfigList",
+          "documentation":"<p>A list of provisioned concurrency configurations.</p>"
+        },
+        "NextMarker":{
+          "shape":"String",
+          "documentation":"<p>The pagination token that's included if more results are available.</p>"
+        }
+      }
+    },
     "ListTagsRequest":{
       "type":"structure",
       "required":["Resource"],
@@ -2378,7 +2903,7 @@
         },
         "MaxItems":{
           "shape":"MaxListItems",
-          "documentation":"<p>Limit the number of versions that are returned.</p>",
+          "documentation":"<p>The maximum number of versions to return.</p>",
           "location":"querystring",
           "locationName":"MaxItems"
         }
@@ -2409,6 +2934,11 @@
       "type":"string",
       "pattern":"ALL|[a-z]{2}(-gov)?-[a-z]+-\\d{1}"
     },
+    "MaxFunctionEventInvokeConfigListItems":{
+      "type":"integer",
+      "max":50,
+      "min":1
+    },
     "MaxLayerListItems":{
       "type":"integer",
       "max":50,
@@ -2419,11 +2949,36 @@
       "max":10000,
       "min":1
     },
+    "MaxProvisionedConcurrencyConfigListItems":{
+      "type":"integer",
+      "max":50,
+      "min":1
+    },
     "MaximumBatchingWindowInSeconds":{
       "type":"integer",
       "max":300,
       "min":0
     },
+    "MaximumEventAgeInSeconds":{
+      "type":"integer",
+      "max":21600,
+      "min":60
+    },
+    "MaximumRecordAgeInSeconds":{
+      "type":"integer",
+      "max":604800,
+      "min":60
+    },
+    "MaximumRetryAttempts":{
+      "type":"integer",
+      "max":2,
+      "min":0
+    },
+    "MaximumRetryAttemptsEventSourceMapping":{
+      "type":"integer",
+      "max":10000,
+      "min":0
+    },
     "MemorySize":{
       "type":"integer",
       "max":3008,
@@ -2445,10 +3000,39 @@
       "min":1,
       "pattern":"([a-zA-Z0-9-_.]+)"
     },
+    "NonNegativeInteger":{
+      "type":"integer",
+      "min":0
+    },
+    "OnFailure":{
+      "type":"structure",
+      "members":{
+        "Destination":{
+          "shape":"DestinationArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the destination resource.</p>"
+        }
+      },
+      "documentation":"<p>A destination for events that failed processing.</p>"
+    },
+    "OnSuccess":{
+      "type":"structure",
+      "members":{
+        "Destination":{
+          "shape":"DestinationArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the destination resource.</p>"
+        }
+      },
+      "documentation":"<p>A destination for events that were processed successfully.</p>"
+    },
     "OrganizationId":{
       "type":"string",
       "pattern":"o-[a-z0-9]{10,32}"
     },
+    "ParallelizationFactor":{
+      "type":"integer",
+      "max":10,
+      "min":1
+    },
     "PolicyLengthExceededException":{
       "type":"structure",
       "members":{
@@ -2459,6 +3043,10 @@
       "error":{"httpStatusCode":400},
       "exception":true
     },
+    "PositiveInteger":{
+      "type":"integer",
+      "min":1
+    },
     "PreconditionFailedException":{
       "type":"structure",
       "members":{
@@ -2479,6 +3067,62 @@
       "type":"string",
       "pattern":".*"
     },
+    "ProvisionedConcurrencyConfigList":{
+      "type":"list",
+      "member":{"shape":"ProvisionedConcurrencyConfigListItem"}
+    },
+    "ProvisionedConcurrencyConfigListItem":{
+      "type":"structure",
+      "members":{
+        "FunctionArn":{
+          "shape":"FunctionArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the alias or version.</p>"
+        },
+        "RequestedProvisionedConcurrentExecutions":{
+          "shape":"PositiveInteger",
+          "documentation":"<p>The amount of provisioned concurrency requested.</p>"
+        },
+        "AvailableProvisionedConcurrentExecutions":{
+          "shape":"NonNegativeInteger",
+          "documentation":"<p>The amount of provisioned concurrency available.</p>"
+        },
+        "AllocatedProvisionedConcurrentExecutions":{
+          "shape":"NonNegativeInteger",
+          "documentation":"<p>The amount of provisioned concurrency allocated.</p>"
+        },
+        "Status":{
+          "shape":"ProvisionedConcurrencyStatusEnum",
+          "documentation":"<p>The status of the allocation process.</p>"
+        },
+        "StatusReason":{
+          "shape":"String",
+          "documentation":"<p>For failed allocations, the reason that provisioned concurrency could not be allocated.</p>"
+        },
+        "LastModified":{
+          "shape":"Timestamp",
+          "documentation":"<p>The date and time that a user last updated the configuration, in <a href=\"https://www.iso.org/iso-8601-date-and-time-format.html\">ISO 8601 format</a>.</p>"
+        }
+      },
+      "documentation":"<p>Details about the provisioned concurrency configuration for a function alias or version.</p>"
+    },
+    "ProvisionedConcurrencyConfigNotFoundException":{
+      "type":"structure",
+      "members":{
+        "Type":{"shape":"String"},
+        "message":{"shape":"String"}
+      },
+      "documentation":"<p>The specified configuration does not exist.</p>",
+      "error":{"httpStatusCode":404},
+      "exception":true
+    },
+    "ProvisionedConcurrencyStatusEnum":{
+      "type":"string",
+      "enum":[
+        "IN_PROGRESS",
+        "READY",
+        "FAILED"
+      ]
+    },
     "PublishLayerVersionRequest":{
       "type":"structure",
       "required":[
@@ -2590,6 +3234,91 @@
         }
       }
     },
+    "PutFunctionEventInvokeConfigRequest":{
+      "type":"structure",
+      "required":["FunctionName"],
+      "members":{
+        "FunctionName":{
+          "shape":"FunctionName",
+          "documentation":"<p>The name of the Lambda function, version, or alias.</p> <p class=\"title\"> <b>Name formats</b> </p> <ul> <li> <p> <b>Function name</b> - <code>my-function</code> (name-only), <code>my-function:v1</code> (with alias).</p> </li> <li> <p> <b>Function ARN</b> - <code>arn:aws:lambda:us-west-2:123456789012:function:my-function</code>.</p> </li> <li> <p> <b>Partial ARN</b> - <code>123456789012:function:my-function</code>.</p> </li> </ul> <p>You can append a version number or alias to any of the formats. The length constraint applies only to the full ARN. If you specify only the function name, it is limited to 64 characters in length.</p>",
+          "location":"uri",
+          "locationName":"FunctionName"
+        },
+        "Qualifier":{
+          "shape":"Qualifier",
+          "documentation":"<p>A version number or alias name.</p>",
+          "location":"querystring",
+          "locationName":"Qualifier"
+        },
+        "MaximumRetryAttempts":{
+          "shape":"MaximumRetryAttempts",
+          "documentation":"<p>The maximum number of times to retry when the function returns an error.</p>"
+        },
+        "MaximumEventAgeInSeconds":{
+          "shape":"MaximumEventAgeInSeconds",
+          "documentation":"<p>The maximum age of a request that Lambda sends to a function for processing.</p>"
+        },
+        "DestinationConfig":{
+          "shape":"DestinationConfig",
+          "documentation":"<p>A destination for events after they have been sent to a function for processing.</p> <p class=\"title\"> <b>Destinations</b> </p> <ul> <li> <p> <b>Function</b> - The Amazon Resource Name (ARN) of a Lambda function.</p> </li> <li> <p> <b>Queue</b> - The ARN of an SQS queue.</p> </li> <li> <p> <b>Topic</b> - The ARN of an SNS topic.</p> </li> <li> <p> <b>Event Bus</b> - The ARN of an Amazon EventBridge event bus.</p> </li> </ul>"
+        }
+      }
+    },
+    "PutProvisionedConcurrencyConfigRequest":{
+      "type":"structure",
+      "required":[
+        "FunctionName",
+        "Qualifier",
+        "ProvisionedConcurrentExecutions"
+      ],
+      "members":{
+        "FunctionName":{
+          "shape":"FunctionName",
+          "documentation":"<p>The name of the Lambda function.</p> <p class=\"title\"> <b>Name formats</b> </p> <ul> <li> <p> <b>Function name</b> - <code>my-function</code>.</p> </li> <li> <p> <b>Function ARN</b> - <code>arn:aws:lambda:us-west-2:123456789012:function:my-function</code>.</p> </li> <li> <p> <b>Partial ARN</b> - <code>123456789012:function:my-function</code>.</p> </li> </ul> <p>The length constraint applies only to the full ARN. If you specify only the function name, it is limited to 64 characters in length.</p>",
+          "location":"uri",
+          "locationName":"FunctionName"
+        },
+        "Qualifier":{
+          "shape":"Qualifier",
+          "documentation":"<p>The version number or alias name.</p>",
+          "location":"querystring",
+          "locationName":"Qualifier"
+        },
+        "ProvisionedConcurrentExecutions":{
+          "shape":"PositiveInteger",
+          "documentation":"<p>The amount of provisioned concurrency to allocate for the version or alias.</p>"
+        }
+      }
+    },
+    "PutProvisionedConcurrencyConfigResponse":{
+      "type":"structure",
+      "members":{
+        "RequestedProvisionedConcurrentExecutions":{
+          "shape":"PositiveInteger",
+          "documentation":"<p>The amount of provisioned concurrency requested.</p>"
+        },
+        "AvailableProvisionedConcurrentExecutions":{
+          "shape":"NonNegativeInteger",
+          "documentation":"<p>The amount of provisioned concurrency available.</p>"
+        },
+        "AllocatedProvisionedConcurrentExecutions":{
+          "shape":"NonNegativeInteger",
+          "documentation":"<p>The amount of provisioned concurrency allocated.</p>"
+        },
+        "Status":{
+          "shape":"ProvisionedConcurrencyStatusEnum",
+          "documentation":"<p>The status of the allocation process.</p>"
+        },
+        "StatusReason":{
+          "shape":"String",
+          "documentation":"<p>For failed allocations, the reason that provisioned concurrency could not be allocated.</p>"
+        },
+        "LastModified":{
+          "shape":"Timestamp",
+          "documentation":"<p>The date and time that a user last updated the configuration, in <a href=\"https://www.iso.org/iso-8601-date-and-time-format.html\">ISO 8601 format</a>.</p>"
+        }
+      }
+    },
     "Qualifier":{
       "type":"string",
       "max":128,
@@ -2693,7 +3422,7 @@
           "documentation":"<p>The exception message.</p>"
         }
       },
-      "documentation":"<p>The resource already exists.</p>",
+      "documentation":"<p>The resource already exists, or another operation is in progress.</p>",
       "error":{"httpStatusCode":409},
       "exception":true
     },
@@ -2713,10 +3442,26 @@
         "Type":{"shape":"String"},
         "Message":{"shape":"String"}
       },
-      "documentation":"<p>The resource (for example, a Lambda function or access policy statement) specified in the request does not exist.</p>",
+      "documentation":"<p>The resource specified in the request does not exist.</p>",
       "error":{"httpStatusCode":404},
       "exception":true
     },
+    "ResourceNotReadyException":{
+      "type":"structure",
+      "members":{
+        "Type":{
+          "shape":"String",
+          "documentation":"<p>The exception type.</p>"
+        },
+        "message":{
+          "shape":"String",
+          "documentation":"<p>The exception message.</p>"
+        }
+      },
+      "documentation":"<p>The function is inactive and its VPC connection is no longer available. Wait for the VPC connection to reestablish and try again.</p>",
+      "error":{"httpStatusCode":502},
+      "exception":true
+    },
     "RoleArn":{
       "type":"string",
       "pattern":"arn:(aws[a-zA-Z-]*)?:iam::\\d{12}:role/?[a-zA-Z_0-9+=,.@\\-_/]+"
@@ -2729,16 +3474,21 @@
         "nodejs6.10",
         "nodejs8.10",
         "nodejs10.x",
+        "nodejs12.x",
         "java8",
+        "java11",
         "python2.7",
         "python3.6",
         "python3.7",
+        "python3.8",
         "dotnetcore1.0",
         "dotnetcore2.0",
         "dotnetcore2.1",
+        "dotnetcore3.1",
         "nodejs4.3-edge",
         "go1.x",
         "ruby2.5",
+        "ruby2.7",
         "provided"
       ]
     },
@@ -2782,6 +3532,31 @@
       "type":"string",
       "pattern":"\\d{12}"
     },
+    "State":{
+      "type":"string",
+      "enum":[
+        "Pending",
+        "Active",
+        "Inactive",
+        "Failed"
+      ]
+    },
+    "StateReason":{"type":"string"},
+    "StateReasonCode":{
+      "type":"string",
+      "enum":[
+        "Idle",
+        "Creating",
+        "Restoring",
+        "EniLimitExceeded",
+        "InsufficientRolePermissions",
+        "InvalidConfiguration",
+        "InternalError",
+        "SubnetOutOfIPAddresses",
+        "InvalidSubnet",
+        "InvalidSecurityGroup"
+      ]
+    },
     "StatementId":{
       "type":"string",
       "max":100,
@@ -2863,7 +3638,7 @@
         "message":{"shape":"String"},
         "Reason":{"shape":"ThrottleReason"}
       },
-      "documentation":"<p>Request throughput limit exceeded.</p>",
+      "documentation":"<p>The request throughput limit was exceeded.</p>",
       "error":{"httpStatusCode":429},
       "exception":true
     },
@@ -2875,7 +3650,7 @@
           "documentation":"<p>The tracing mode.</p>"
         }
       },
-      "documentation":"<p>The function's AWS X-Ray tracing configuration.</p>"
+      "documentation":"<p>The function's AWS X-Ray tracing configuration. To sample and record incoming requests, set <code>Mode</code> to <code>Active</code>.</p>"
     },
     "TracingConfigResponse":{
       "type":"structure",
@@ -2988,7 +3763,30 @@
           "shape":"BatchSize",
           "documentation":"<p>The maximum number of items to retrieve in a single batch.</p> <ul> <li> <p> <b>Amazon Kinesis</b> - Default 100. Max 10,000.</p> </li> <li> <p> <b>Amazon DynamoDB Streams</b> - Default 100. Max 1,000.</p> </li> <li> <p> <b>Amazon Simple Queue Service</b> - Default 10. Max 10.</p> </li> </ul>"
         },
-        "MaximumBatchingWindowInSeconds":{"shape":"MaximumBatchingWindowInSeconds"}
+        "MaximumBatchingWindowInSeconds":{
+          "shape":"MaximumBatchingWindowInSeconds",
+          "documentation":"<p>(Streams) The maximum amount of time to gather records before invoking the function, in seconds.</p>"
+        },
+        "DestinationConfig":{
+          "shape":"DestinationConfig",
+          "documentation":"<p>(Streams) An Amazon SQS queue or Amazon SNS topic destination for discarded records.</p>"
+        },
+        "MaximumRecordAgeInSeconds":{
+          "shape":"MaximumRecordAgeInSeconds",
+          "documentation":"<p>(Streams) The maximum age of a record that Lambda sends to a function for processing.</p>"
+        },
+        "BisectBatchOnFunctionError":{
+          "shape":"BisectBatchOnFunctionError",
+          "documentation":"<p>(Streams) If the function returns an error, split the batch in two and retry.</p>"
+        },
+        "MaximumRetryAttempts":{
+          "shape":"MaximumRetryAttemptsEventSourceMapping",
+          "documentation":"<p>(Streams) The maximum number of times to retry when the function returns an error.</p>"
+        },
+        "ParallelizationFactor":{
+          "shape":"ParallelizationFactor",
+          "documentation":"<p>(Streams) The number of batches to process from each shard concurrently.</p>"
+        }
       }
     },
     "UpdateFunctionCodeRequest":{
@@ -3063,7 +3861,7 @@
         },
         "VpcConfig":{
           "shape":"VpcConfig",
-          "documentation":"<p>For network connectivity to AWS resources in a VPC, specify a list of security groups and subnets in the VPC. When you connect a function to a VPC, it can only access resources and the internet through that VPC. For more information, see <a href=\"https://docs.aws.amazon.com/lambda/latest/dg/vpc.html\">VPC Settings</a>.</p>"
+          "documentation":"<p>For network connectivity to AWS resources in a VPC, specify a list of security groups and subnets in the VPC. When you connect a function to a VPC, it can only access resources and the internet through that VPC. For more information, see <a href=\"https://docs.aws.amazon.com/lambda/latest/dg/configuration-vpc.html\">VPC Settings</a>.</p>"
         },
         "Environment":{
           "shape":"Environment",
@@ -3075,7 +3873,7 @@
         },
         "DeadLetterConfig":{
           "shape":"DeadLetterConfig",
-          "documentation":"<p>A dead letter queue configuration that specifies the queue or topic where Lambda sends asynchronous events when they fail processing. For more information, see <a href=\"https://docs.aws.amazon.com/lambda/latest/dg/dlq.html\">Dead Letter Queues</a>.</p>"
+          "documentation":"<p>A dead letter queue configuration that specifies the queue or topic where Lambda sends asynchronous events when they fail processing. For more information, see <a href=\"https://docs.aws.amazon.com/lambda/latest/dg/invocation-async.html#dlq\">Dead Letter Queues</a>.</p>"
         },
         "KMSKeyArn":{
           "shape":"KMSKeyArn",
@@ -3095,6 +3893,36 @@
         }
       }
     },
+    "UpdateFunctionEventInvokeConfigRequest":{
+      "type":"structure",
+      "required":["FunctionName"],
+      "members":{
+        "FunctionName":{
+          "shape":"FunctionName",
+          "documentation":"<p>The name of the Lambda function, version, or alias.</p> <p class=\"title\"> <b>Name formats</b> </p> <ul> <li> <p> <b>Function name</b> - <code>my-function</code> (name-only), <code>my-function:v1</code> (with alias).</p> </li> <li> <p> <b>Function ARN</b> - <code>arn:aws:lambda:us-west-2:123456789012:function:my-function</code>.</p> </li> <li> <p> <b>Partial ARN</b> - <code>123456789012:function:my-function</code>.</p> </li> </ul> <p>You can append a version number or alias to any of the formats. The length constraint applies only to the full ARN. If you specify only the function name, it is limited to 64 characters in length.</p>",
+          "location":"uri",
+          "locationName":"FunctionName"
+        },
+        "Qualifier":{
+          "shape":"Qualifier",
+          "documentation":"<p>A version number or alias name.</p>",
+          "location":"querystring",
+          "locationName":"Qualifier"
+        },
+        "MaximumRetryAttempts":{
+          "shape":"MaximumRetryAttempts",
+          "documentation":"<p>The maximum number of times to retry when the function returns an error.</p>"
+        },
+        "MaximumEventAgeInSeconds":{
+          "shape":"MaximumEventAgeInSeconds",
+          "documentation":"<p>The maximum age of a request that Lambda sends to a function for processing.</p>"
+        },
+        "DestinationConfig":{
+          "shape":"DestinationConfig",
+          "documentation":"<p>A destination for events after they have been sent to a function for processing.</p> <p class=\"title\"> <b>Destinations</b> </p> <ul> <li> <p> <b>Function</b> - The Amazon Resource Name (ARN) of a Lambda function.</p> </li> <li> <p> <b>Queue</b> - The ARN of an SQS queue.</p> </li> <li> <p> <b>Topic</b> - The ARN of an SNS topic.</p> </li> <li> <p> <b>Event Bus</b> - The ARN of an Amazon EventBridge event bus.</p> </li> </ul>"
+        }
+      }
+    },
     "Version":{
       "type":"string",
       "max":1024,
@@ -3113,7 +3941,7 @@
           "documentation":"<p>A list of VPC security groups IDs.</p>"
         }
       },
-      "documentation":"<p>The VPC security groups and subnets that are attached to a Lambda function.</p>"
+      "documentation":"<p>The VPC security groups and subnets that are attached to a Lambda function. For more information, see <a href=\"https://docs.aws.amazon.com/lambda/latest/dg/configuration-vpc.html\">VPC Settings</a>.</p>"
     },
     "VpcConfigResponse":{
       "type":"structure",
diff --git a/services/lambda/src/main/resources/codegen-resources/waiters-2.json b/services/lambda/src/main/resources/codegen-resources/waiters-2.json
index 07d1ab253a5e..af39bfc169c4 100644
--- a/services/lambda/src/main/resources/codegen-resources/waiters-2.json
+++ b/services/lambda/src/main/resources/codegen-resources/waiters-2.json
@@ -17,6 +17,58 @@
           "expected": "ResourceNotFoundException"
         }
       ]
+    },
+    "FunctionActive": {
+      "delay": 5,
+      "maxAttempts": 60,
+      "operation": "GetFunctionConfiguration",
+      "description": "Waits for the function's State to be Active.",
+      "acceptors": [
+        {
+          "state": "success",
+          "matcher": "path",
+          "argument": "State",
+          "expected": "Active"
+        },
+        {
+          "state": "failure",
+          "matcher": "path",
+          "argument": "State",
+          "expected": "Failed"
+        },
+        {
+          "state": "retry",
+          "matcher": "path",
+          "argument": "State",
+          "expected": "Pending"
+        }
+      ]
+    },
+    "FunctionUpdated": {
+      "delay": 5,
+      "maxAttempts": 60,
+      "operation": "GetFunctionConfiguration",
+      "description": "Waits for the function's LastUpdateStatus to be Successful.",
+      "acceptors": [
+        {
+          "state": "success",
+          "matcher": "path",
+          "argument": "LastUpdateStatus",
+          "expected": "Successful"
+        },
+        {
+          "state": "failure",
+          "matcher": "path",
+          "argument": "LastUpdateStatus",
+          "expected": "Failed"
+        },
+        {
+          "state": "retry",
+          "matcher": "path",
+          "argument": "LastUpdateStatus",
+          "expected": "InProgress"
+        }
+      ]
     }
   }
 }
diff --git a/services/lambda/src/main/resources/software/amazon/awssdk/services/lambda/helloworld.js b/services/lambda/src/main/resources/software/amazon/awssdk/services/lambda/helloworld.js
index ad019c86b0fc..f205a2ccceeb 100644
--- a/services/lambda/src/main/resources/software/amazon/awssdk/services/lambda/helloworld.js
+++ b/services/lambda/src/main/resources/software/amazon/awssdk/services/lambda/helloworld.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/lambda/src/test/resources/cucumber.properties b/services/lambda/src/test/resources/cucumber.properties
index 33b610a223e6..fea6fdf593ed 100644
--- a/services/lambda/src/test/resources/cucumber.properties
+++ b/services/lambda/src/test/resources/cucumber.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/lambda/src/test/resources/log4j.properties b/services/lambda/src/test/resources/log4j.properties
index 6042fa021b9f..eeb88fce1ab3 100644
--- a/services/lambda/src/test/resources/log4j.properties
+++ b/services/lambda/src/test/resources/log4j.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/lambda/src/test/resources/software/amazon/awssdk/services/lambda/helloworld.js b/services/lambda/src/test/resources/software/amazon/awssdk/services/lambda/helloworld.js
index ad019c86b0fc..f205a2ccceeb 100644
--- a/services/lambda/src/test/resources/software/amazon/awssdk/services/lambda/helloworld.js
+++ b/services/lambda/src/test/resources/software/amazon/awssdk/services/lambda/helloworld.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/lexmodelbuilding/build.properties b/services/lexmodelbuilding/build.properties
index ecf2dae6fcb1..15ec2da1fc71 100644
--- a/services/lexmodelbuilding/build.properties
+++ b/services/lexmodelbuilding/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/lexmodelbuilding/pom.xml b/services/lexmodelbuilding/pom.xml
index bf84fa79adf0..a6f08df31d2b 100644
--- a/services/lexmodelbuilding/pom.xml
+++ b/services/lexmodelbuilding/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>lexmodelbuilding</artifactId>
     <name>AWS Java SDK :: Services :: Amazon Lex Model Building</name>
diff --git a/services/lexmodelbuilding/src/main/resources/codegen-resources/service-2.json b/services/lexmodelbuilding/src/main/resources/codegen-resources/service-2.json
index 63d4a0872f73..78808bbe7267 100644
--- a/services/lexmodelbuilding/src/main/resources/codegen-resources/service-2.json
+++ b/services/lexmodelbuilding/src/main/resources/codegen-resources/service-2.json
@@ -85,7 +85,7 @@
         {"shape":"BadRequestException"},
         {"shape":"ResourceInUseException"}
       ],
-      "documentation":"<p>Deletes all versions of the bot, including the <code>$LATEST</code> version. To delete a specific version of the bot, use the <a>DeleteBotVersion</a> operation.</p> <p>If a bot has an alias, you can't delete it. Instead, the <code>DeleteBot</code> operation returns a <code>ResourceInUseException</code> exception that includes a reference to the alias that refers to the bot. To remove the reference to the bot, delete the alias. If you get the same exception again, delete the referring alias until the <code>DeleteBot</code> operation is successful.</p> <p>This operation requires permissions for the <code>lex:DeleteBot</code> action.</p>"
+      "documentation":"<p>Deletes all versions of the bot, including the <code>$LATEST</code> version. To delete a specific version of the bot, use the <a>DeleteBotVersion</a> operation. The <code>DeleteBot</code> operation doesn't immediately remove the bot schema. Instead, it is marked for deletion and removed later.</p> <p>Amazon Lex stores utterances indefinitely for improving the ability of your bot to respond to user inputs. These utterances are not removed when the bot is deleted. To remove the utterances, use the <a>DeleteUtterances</a> operation.</p> <p>If a bot has an alias, you can't delete it. Instead, the <code>DeleteBot</code> operation returns a <code>ResourceInUseException</code> exception that includes a reference to the alias that refers to the bot. To remove the reference to the bot, delete the alias. If you get the same exception again, delete the referring alias until the <code>DeleteBot</code> operation is successful.</p> <p>This operation requires permissions for the <code>lex:DeleteBot</code> action.</p>"
     },
     "DeleteBotAlias":{
       "name":"DeleteBotAlias",
@@ -226,7 +226,7 @@
         {"shape":"InternalFailureException"},
         {"shape":"BadRequestException"}
       ],
-      "documentation":"<p>Deletes stored utterances.</p> <p>Amazon Lex stores the utterances that users send to your bot. Utterances are stored for 15 days for use with the <a>GetUtterancesView</a> operation, and then stored indefinitely for use in improving the ability of your bot to respond to user input.</p> <p>Use the <code>DeleteStoredUtterances</code> operation to manually delete stored utterances for a specific user.</p> <p>This operation requires permissions for the <code>lex:DeleteUtterances</code> action.</p>"
+      "documentation":"<p>Deletes stored utterances.</p> <p>Amazon Lex stores the utterances that users send to your bot. Utterances are stored for 15 days for use with the <a>GetUtterancesView</a> operation, and then stored indefinitely for use in improving the ability of your bot to respond to user input.</p> <p>Use the <code>DeleteUtterances</code> operation to manually delete stored utterances for a specific user. When you use the <code>DeleteUtterances</code> operation, utterances stored for improving your bot's ability to respond to user input are deleted immediately. Utterances stored for use with the <code>GetUtterancesView</code> operation are deleted after 15 days.</p> <p>This operation requires permissions for the <code>lex:DeleteUtterances</code> action.</p>"
     },
     "GetBot":{
       "name":"GetBot",
@@ -544,7 +544,24 @@
         {"shape":"InternalFailureException"},
         {"shape":"BadRequestException"}
       ],
-      "documentation":"<p>Use the <code>GetUtterancesView</code> operation to get information about the utterances that your users have made to your bot. You can use this list to tune the utterances that your bot responds to.</p> <p>For example, say that you have created a bot to order flowers. After your users have used your bot for a while, use the <code>GetUtterancesView</code> operation to see the requests that they have made and whether they have been successful. You might find that the utterance \"I want flowers\" is not being recognized. You could add this utterance to the <code>OrderFlowers</code> intent so that your bot recognizes that utterance.</p> <p>After you publish a new version of a bot, you can get information about the old version and the new so that you can compare the performance across the two versions. </p> <note> <p>Utterance statistics are generated once a day. Data is available for the last 15 days. You can request information for up to 5 versions in each request. The response contains information about a maximum of 100 utterances for each version.</p> </note> <p>This operation requires permissions for the <code>lex:GetUtterancesView</code> action.</p>"
+      "documentation":"<p>Use the <code>GetUtterancesView</code> operation to get information about the utterances that your users have made to your bot. You can use this list to tune the utterances that your bot responds to.</p> <p>For example, say that you have created a bot to order flowers. After your users have used your bot for a while, use the <code>GetUtterancesView</code> operation to see the requests that they have made and whether they have been successful. You might find that the utterance \"I want flowers\" is not being recognized. You could add this utterance to the <code>OrderFlowers</code> intent so that your bot recognizes that utterance.</p> <p>After you publish a new version of a bot, you can get information about the old version and the new so that you can compare the performance across the two versions. </p> <p>Utterance statistics are generated once a day. Data is available for the last 15 days. You can request information for up to 5 versions of your bot in each request. Amazon Lex returns the most frequent utterances received by the bot in the last 15 days. The response contains information about a maximum of 100 utterances for each version.</p> <p>If you set <code>childDirected</code> field to true when you created your bot, or if you opted out of participating in improving Amazon Lex, utterances are not available.</p> <p>This operation requires permissions for the <code>lex:GetUtterancesView</code> action.</p>"
+    },
+    "ListTagsForResource":{
+      "name":"ListTagsForResource",
+      "http":{
+        "method":"GET",
+        "requestUri":"/tags/{resourceArn}",
+        "responseCode":200
+      },
+      "input":{"shape":"ListTagsForResourceRequest"},
+      "output":{"shape":"ListTagsForResourceResponse"},
+      "errors":[
+        {"shape":"NotFoundException"},
+        {"shape":"BadRequestException"},
+        {"shape":"InternalFailureException"},
+        {"shape":"LimitExceededException"}
+      ],
+      "documentation":"<p>Gets a list of tags associated with the specified resource. Only bots, bot aliases, and bot channels can have tags associated with them.</p>"
     },
     "PutBot":{
       "name":"PutBot",
@@ -562,7 +579,7 @@
         {"shape":"BadRequestException"},
         {"shape":"PreconditionFailedException"}
       ],
-      "documentation":"<p>Creates an Amazon Lex conversational bot or replaces an existing bot. When you create or update a bot you are only required to specify a name, a locale, and whether the bot is directed toward children under age 13. You can use this to add intents later, or to remove intents from an existing bot. When you create a bot with the minimum information, the bot is created or updated but Amazon Lex returns the <code/> response <code>FAILED</code>. You can build the bot after you add one or more intents. For more information about Amazon Lex bots, see <a>how-it-works</a>. </p> <p>If you specify the name of an existing bot, the fields in the request replace the existing values in the <code>$LATEST</code> version of the bot. Amazon Lex removes any fields that you don't provide values for in the request, except for the <code>idleTTLInSeconds</code> and <code>privacySettings</code> fields, which are set to their default values. If you don't specify values for required fields, Amazon Lex throws an exception.</p> <p>This operation requires permissions for the <code>lex:PutBot</code> action. For more information, see <a>auth-and-access-control</a>.</p>"
+      "documentation":"<p>Creates an Amazon Lex conversational bot or replaces an existing bot. When you create or update a bot you are only required to specify a name, a locale, and whether the bot is directed toward children under age 13. You can use this to add intents later, or to remove intents from an existing bot. When you create a bot with the minimum information, the bot is created or updated but Amazon Lex returns the <code/> response <code>FAILED</code>. You can build the bot after you add one or more intents. For more information about Amazon Lex bots, see <a>how-it-works</a>. </p> <p>If you specify the name of an existing bot, the fields in the request replace the existing values in the <code>$LATEST</code> version of the bot. Amazon Lex removes any fields that you don't provide values for in the request, except for the <code>idleTTLInSeconds</code> and <code>privacySettings</code> fields, which are set to their default values. If you don't specify values for required fields, Amazon Lex throws an exception.</p> <p>This operation requires permissions for the <code>lex:PutBot</code> action. For more information, see <a>security-iam</a>.</p>"
     },
     "PutBotAlias":{
       "name":"PutBotAlias",
@@ -633,6 +650,42 @@
         {"shape":"BadRequestException"}
       ],
       "documentation":"<p>Starts a job to import a resource to Amazon Lex.</p>"
+    },
+    "TagResource":{
+      "name":"TagResource",
+      "http":{
+        "method":"POST",
+        "requestUri":"/tags/{resourceArn}",
+        "responseCode":204
+      },
+      "input":{"shape":"TagResourceRequest"},
+      "output":{"shape":"TagResourceResponse"},
+      "errors":[
+        {"shape":"NotFoundException"},
+        {"shape":"BadRequestException"},
+        {"shape":"ConflictException"},
+        {"shape":"InternalFailureException"},
+        {"shape":"LimitExceededException"}
+      ],
+      "documentation":"<p>Adds the specified tags to the specified resource. If a tag key already exists, the existing value is replaced with the new value.</p>"
+    },
+    "UntagResource":{
+      "name":"UntagResource",
+      "http":{
+        "method":"DELETE",
+        "requestUri":"/tags/{resourceArn}",
+        "responseCode":204
+      },
+      "input":{"shape":"UntagResourceRequest"},
+      "output":{"shape":"UntagResourceResponse"},
+      "errors":[
+        {"shape":"NotFoundException"},
+        {"shape":"BadRequestException"},
+        {"shape":"ConflictException"},
+        {"shape":"InternalFailureException"},
+        {"shape":"LimitExceededException"}
+      ],
+      "documentation":"<p>Removes tags from a bot, bot alias or bot channel.</p>"
     }
   },
   "shapes":{
@@ -648,6 +701,11 @@
       "min":1,
       "pattern":"^(-|^([A-Za-z]_?)+$)$"
     },
+    "AmazonResourceName":{
+      "type":"string",
+      "max":1011,
+      "min":1
+    },
     "BadRequestException":{
       "type":"structure",
       "members":{
@@ -689,6 +747,10 @@
         "checksum":{
           "shape":"String",
           "documentation":"<p>Checksum of the bot alias.</p>"
+        },
+        "conversationLogs":{
+          "shape":"ConversationLogsResponse",
+          "documentation":"<p>Settings that determine how Amazon Lex uses conversation logs for the alias.</p>"
         }
       },
       "documentation":"<p>Provides information about a bot alias.</p>"
@@ -912,6 +974,38 @@
         "CustomPayload"
       ]
     },
+    "ConversationLogsRequest":{
+      "type":"structure",
+      "required":[
+        "logSettings",
+        "iamRoleArn"
+      ],
+      "members":{
+        "logSettings":{
+          "shape":"LogSettingsRequestList",
+          "documentation":"<p>The settings for your conversation logs. You can log the conversation text, conversation audio, or both.</p>"
+        },
+        "iamRoleArn":{
+          "shape":"IamRoleArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of an IAM role with permission to write to your CloudWatch Logs for text logs and your S3 bucket for audio logs. If audio encryption is enabled, this role also provides access permission for the AWS KMS key used for encrypting audio logs. For more information, see <a href=\"https://docs.aws.amazon.com/lex/latest/dg/conversation-logs-role-and-policy.html\">Creating an IAM Role and Policy for Conversation Logs</a>.</p>"
+        }
+      },
+      "documentation":"<p>Provides the settings needed for conversation logs.</p>"
+    },
+    "ConversationLogsResponse":{
+      "type":"structure",
+      "members":{
+        "logSettings":{
+          "shape":"LogSettingsResponseList",
+          "documentation":"<p>The settings for your conversation logs. You can log text, audio, or both.</p>"
+        },
+        "iamRoleArn":{
+          "shape":"IamRoleArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the IAM role used to write your logs to CloudWatch Logs or an S3 bucket.</p>"
+        }
+      },
+      "documentation":"<p>Contains information about conversation log settings.</p>"
+    },
     "Count":{"type":"integer"},
     "CreateBotVersionRequest":{
       "type":"structure",
@@ -991,6 +1085,10 @@
         "childDirected":{
           "shape":"Boolean",
           "documentation":"<p>For each Amazon Lex bot created with the Amazon Lex Model Building Service, you must specify whether your use of Amazon Lex is related to a website, program, or other application that is directed or targeted, in whole or in part, to children under age 13 and subject to the Children's Online Privacy Protection Act (COPPA) by specifying <code>true</code> or <code>false</code> in the <code>childDirected</code> field. By specifying <code>true</code> in the <code>childDirected</code> field, you confirm that your use of Amazon Lex <b>is</b> related to a website, program, or other application that is directed or targeted, in whole or in part, to children under age 13 and subject to COPPA. By specifying <code>false</code> in the <code>childDirected</code> field, you confirm that your use of Amazon Lex <b>is not</b> related to a website, program, or other application that is directed or targeted, in whole or in part, to children under age 13 and subject to COPPA. You may not specify a default value for the <code>childDirected</code> field that does not accurately reflect whether your use of Amazon Lex is related to a website, program, or other application that is directed or targeted, in whole or in part, to children under age 13 and subject to COPPA.</p> <p>If your use of Amazon Lex relates to a website, program, or other application that is directed in whole or in part, to children under age 13, you must obtain any required verifiable parental consent under COPPA. For information regarding the use of Amazon Lex in connection with websites, programs, or other applications that are directed or targeted, in whole or in part, to children under age 13, see the <a href=\"https://aws.amazon.com/lex/faqs#data-security\">Amazon Lex FAQ.</a> </p>"
+        },
+        "detectSentiment":{
+          "shape":"Boolean",
+          "documentation":"<p>Indicates whether utterances entered by the user should be sent to Amazon Comprehend for sentiment analysis.</p>"
         }
       }
     },
@@ -1125,6 +1223,14 @@
         "valueSelectionStrategy":{
           "shape":"SlotValueSelectionStrategy",
           "documentation":"<p>The strategy that Amazon Lex uses to determine the value of the slot. For more information, see <a>PutSlotType</a>.</p>"
+        },
+        "parentSlotTypeSignature":{
+          "shape":"CustomOrBuiltinSlotTypeName",
+          "documentation":"<p>The built-in slot type used a the parent of the slot type.</p>"
+        },
+        "slotTypeConfigurations":{
+          "shape":"SlotTypeConfigurations",
+          "documentation":"<p>Configuration information that extends the parent built-in slot type.</p>"
         }
       }
     },
@@ -1308,6 +1414,13 @@
       "max":200,
       "min":0
     },
+    "Destination":{
+      "type":"string",
+      "enum":[
+        "CLOUDWATCH_LOGS",
+        "S3"
+      ]
+    },
     "EnumerationValue":{
       "type":"structure",
       "required":["value"],
@@ -1327,7 +1440,7 @@
       "type":"list",
       "member":{"shape":"EnumerationValue"},
       "max":10000,
-      "min":1
+      "min":0
     },
     "ExportStatus":{
       "type":"string",
@@ -1435,6 +1548,10 @@
         "checksum":{
           "shape":"String",
           "documentation":"<p>Checksum of the bot alias.</p>"
+        },
+        "conversationLogs":{
+          "shape":"ConversationLogsResponse",
+          "documentation":"<p>The settings that determine how Amazon Lex uses conversation logs for the alias.</p>"
         }
       }
     },
@@ -1648,7 +1765,7 @@
         },
         "status":{
           "shape":"Status",
-          "documentation":"<p>The status of the bot. If the bot is ready to run, the status is <code>READY</code>. If there was a problem with building the bot, the status is <code>FAILED</code> and the <code>failureReason</code> explains why the bot did not build. If the bot was saved but not built, the status is <code>NOT BUILT</code>.</p>"
+          "documentation":"<p>The status of the bot. </p> <p>When the status is <code>BUILDING</code> Amazon Lex is building the bot for testing and use.</p> <p>If the status of the bot is <code>READY_BASIC_TESTING</code>, you can test the bot using the exact utterances specified in the bot's intents. When the bot is ready for full testing or to run, the status is <code>READY</code>.</p> <p>If there was a problem with building the bot, the status is <code>FAILED</code> and the <code>failureReason</code> field explains why the bot did not build.</p> <p>If the bot was saved but not built, the status is <code>NOT_BUILT</code>.</p>"
         },
         "failureReason":{
           "shape":"String",
@@ -1685,6 +1802,10 @@
         "childDirected":{
           "shape":"Boolean",
           "documentation":"<p>For each Amazon Lex bot created with the Amazon Lex Model Building Service, you must specify whether your use of Amazon Lex is related to a website, program, or other application that is directed or targeted, in whole or in part, to children under age 13 and subject to the Children's Online Privacy Protection Act (COPPA) by specifying <code>true</code> or <code>false</code> in the <code>childDirected</code> field. By specifying <code>true</code> in the <code>childDirected</code> field, you confirm that your use of Amazon Lex <b>is</b> related to a website, program, or other application that is directed or targeted, in whole or in part, to children under age 13 and subject to COPPA. By specifying <code>false</code> in the <code>childDirected</code> field, you confirm that your use of Amazon Lex <b>is not</b> related to a website, program, or other application that is directed or targeted, in whole or in part, to children under age 13 and subject to COPPA. You may not specify a default value for the <code>childDirected</code> field that does not accurately reflect whether your use of Amazon Lex is related to a website, program, or other application that is directed or targeted, in whole or in part, to children under age 13 and subject to COPPA.</p> <p>If your use of Amazon Lex relates to a website, program, or other application that is directed in whole or in part, to children under age 13, you must obtain any required verifiable parental consent under COPPA. For information regarding the use of Amazon Lex in connection with websites, programs, or other applications that are directed or targeted, in whole or in part, to children under age 13, see the <a href=\"https://aws.amazon.com/lex/faqs#data-security\">Amazon Lex FAQ.</a> </p>"
+        },
+        "detectSentiment":{
+          "shape":"Boolean",
+          "documentation":"<p>Indicates whether user utterances should be sent to Amazon Comprehend for sentiment analysis.</p>"
         }
       }
     },
@@ -2201,6 +2322,14 @@
         "valueSelectionStrategy":{
           "shape":"SlotValueSelectionStrategy",
           "documentation":"<p>The strategy that Amazon Lex uses to determine the value of the slot. For more information, see <a>PutSlotType</a>.</p>"
+        },
+        "parentSlotTypeSignature":{
+          "shape":"CustomOrBuiltinSlotTypeName",
+          "documentation":"<p>The built-in slot type used as a parent for the slot type.</p>"
+        },
+        "slotTypeConfigurations":{
+          "shape":"SlotTypeConfigurations",
+          "documentation":"<p>Configuration information that extends the parent built-in slot type.</p>"
         }
       }
     },
@@ -2299,7 +2428,7 @@
         },
         "statusType":{
           "shape":"StatusType",
-          "documentation":"<p>To return utterances that were recognized and handled, use<code>Detected</code>. To return utterances that were not recognized, use <code>Missed</code>.</p>",
+          "documentation":"<p>To return utterances that were recognized and handled, use <code>Detected</code>. To return utterances that were not recognized, use <code>Missed</code>.</p>",
           "location":"querystring",
           "locationName":"status_type"
         }
@@ -2314,7 +2443,7 @@
         },
         "utterances":{
           "shape":"ListsOfUtterances",
-          "documentation":"<p>An array of <a>UtteranceList</a> objects, each containing a list of <a>UtteranceData</a> objects describing the utterances that were processed by your bot. The response contains a maximum of 100 <code>UtteranceData</code> objects for each version.</p>"
+          "documentation":"<p>An array of <a>UtteranceList</a> objects, each containing a list of <a>UtteranceData</a> objects describing the utterances that were processed by your bot. The response contains a maximum of 100 <code>UtteranceData</code> objects for each version. Amazon Lex returns the most frequent utterances received by the bot in the last 15 days.</p>"
         }
       }
     },
@@ -2324,6 +2453,12 @@
       "max":5,
       "min":1
     },
+    "IamRoleArn":{
+      "type":"string",
+      "max":2048,
+      "min":20,
+      "pattern":"^arn:[\\w\\-]+:iam::[\\d]{12}:role\\/[\\w+=,\\.@\\-]{1,64}$"
+    },
     "ImportStatus":{
       "type":"string",
       "enum":[
@@ -2406,6 +2541,12 @@
       "exception":true,
       "fault":true
     },
+    "KmsKeyArn":{
+      "type":"string",
+      "max":2048,
+      "min":20,
+      "pattern":"^arn:[\\w\\-]+:kms:[\\w\\-]+:[\\d]{12}:(?:key\\/[\\w\\-]+|alias\\/[a-zA-Z0-9:\\/_\\-]{1,256})$"
+    },
     "LambdaARN":{
       "type":"string",
       "max":2048,
@@ -2430,6 +2571,27 @@
       "type":"list",
       "member":{"shape":"UtteranceData"}
     },
+    "ListTagsForResourceRequest":{
+      "type":"structure",
+      "required":["resourceArn"],
+      "members":{
+        "resourceArn":{
+          "shape":"AmazonResourceName",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the resource to get a list of tags for.</p>",
+          "location":"uri",
+          "locationName":"resourceArn"
+        }
+      }
+    },
+    "ListTagsForResourceResponse":{
+      "type":"structure",
+      "members":{
+        "tags":{
+          "shape":"TagList",
+          "documentation":"<p>The tags associated with a resource.</p>"
+        }
+      }
+    },
     "ListsOfUtterances":{
       "type":"list",
       "member":{"shape":"UtteranceList"}
@@ -2446,6 +2608,74 @@
       "type":"list",
       "member":{"shape":"Locale"}
     },
+    "LogSettingsRequest":{
+      "type":"structure",
+      "required":[
+        "logType",
+        "destination",
+        "resourceArn"
+      ],
+      "members":{
+        "logType":{
+          "shape":"LogType",
+          "documentation":"<p>The type of logging to enable. Text logs are delivered to a CloudWatch Logs log group. Audio logs are delivered to an S3 bucket.</p>"
+        },
+        "destination":{
+          "shape":"Destination",
+          "documentation":"<p>Where the logs will be delivered. Text logs are delivered to a CloudWatch Logs log group. Audio logs are delivered to an S3 bucket.</p>"
+        },
+        "kmsKeyArn":{
+          "shape":"KmsKeyArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the AWS KMS customer managed key for encrypting audio logs delivered to an S3 bucket. The key does not apply to CloudWatch Logs and is optional for S3 buckets.</p>"
+        },
+        "resourceArn":{
+          "shape":"ResourceArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the CloudWatch Logs log group or S3 bucket where the logs should be delivered.</p>"
+        }
+      },
+      "documentation":"<p>Settings used to configure delivery mode and destination for conversation logs.</p>"
+    },
+    "LogSettingsRequestList":{
+      "type":"list",
+      "member":{"shape":"LogSettingsRequest"}
+    },
+    "LogSettingsResponse":{
+      "type":"structure",
+      "members":{
+        "logType":{
+          "shape":"LogType",
+          "documentation":"<p>The type of logging that is enabled.</p>"
+        },
+        "destination":{
+          "shape":"Destination",
+          "documentation":"<p>The destination where logs are delivered.</p>"
+        },
+        "kmsKeyArn":{
+          "shape":"KmsKeyArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the key used to encrypt audio logs in an S3 bucket.</p>"
+        },
+        "resourceArn":{
+          "shape":"ResourceArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the CloudWatch Logs log group or S3 bucket where the logs are delivered.</p>"
+        },
+        "resourcePrefix":{
+          "shape":"ResourcePrefix",
+          "documentation":"<p>The resource prefix is the first part of the S3 object key within the S3 bucket that you specified to contain audio logs. For CloudWatch Logs it is the prefix of the log stream name within the log group that you specified. </p>"
+        }
+      },
+      "documentation":"<p>The settings for conversation logs.</p>"
+    },
+    "LogSettingsResponseList":{
+      "type":"list",
+      "member":{"shape":"LogSettingsResponse"}
+    },
+    "LogType":{
+      "type":"string",
+      "enum":[
+        "AUDIO",
+        "TEXT"
+      ]
+    },
     "MaxResults":{
       "type":"integer",
       "box":true,
@@ -2514,6 +2744,13 @@
       "min":1,
       "pattern":"[0-9]+"
     },
+    "ObfuscationSetting":{
+      "type":"string",
+      "enum":[
+        "NONE",
+        "DEFAULT_OBFUSCATION"
+      ]
+    },
     "PreconditionFailedException":{
       "type":"structure",
       "members":{
@@ -2593,6 +2830,14 @@
         "checksum":{
           "shape":"String",
           "documentation":"<p>Identifies a specific revision of the <code>$LATEST</code> version.</p> <p>When you create a new bot alias, leave the <code>checksum</code> field blank. If you specify a checksum you get a <code>BadRequestException</code> exception.</p> <p>When you want to update a bot alias, set the <code>checksum</code> field to the checksum of the most recent revision of the <code>$LATEST</code> version. If you don't specify the <code> checksum</code> field, or if the checksum does not match the <code>$LATEST</code> version, you get a <code>PreconditionFailedException</code> exception.</p>"
+        },
+        "conversationLogs":{
+          "shape":"ConversationLogsRequest",
+          "documentation":"<p>Settings for conversation logs for the alias.</p>"
+        },
+        "tags":{
+          "shape":"TagList",
+          "documentation":"<p>A list of tags to add to the bot alias. You can only add tags when you create an alias, you can't use the <code>PutBotAlias</code> operation to update the tags on a bot alias. To update tags, use the <code>TagResource</code> operation.</p>"
         }
       }
     },
@@ -2626,6 +2871,14 @@
         "checksum":{
           "shape":"String",
           "documentation":"<p>The checksum for the current version of the alias.</p>"
+        },
+        "conversationLogs":{
+          "shape":"ConversationLogsResponse",
+          "documentation":"<p>The settings that determine how Amazon Lex uses conversation logs for the alias.</p>"
+        },
+        "tags":{
+          "shape":"TagList",
+          "documentation":"<p>A list of tags associated with a bot.</p>"
         }
       }
     },
@@ -2653,11 +2906,11 @@
         },
         "clarificationPrompt":{
           "shape":"Prompt",
-          "documentation":"<p>When Amazon Lex doesn't understand the user's intent, it uses this message to get clarification. To specify how many times Amazon Lex should repeate the clarification prompt, use the <code>maxAttempts</code> field. If Amazon Lex still doesn't understand, it sends the message in the <code>abortStatement</code> field. </p> <p>When you create a clarification prompt, make sure that it suggests the correct response from the user. for example, for a bot that orders pizza and drinks, you might create this clarification prompt: \"What would you like to do? You can say 'Order a pizza' or 'Order a drink.'\"</p>"
+          "documentation":"<p>When Amazon Lex doesn't understand the user's intent, it uses this message to get clarification. To specify how many times Amazon Lex should repeat the clarification prompt, use the <code>maxAttempts</code> field. If Amazon Lex still doesn't understand, it sends the message in the <code>abortStatement</code> field. </p> <p>When you create a clarification prompt, make sure that it suggests the correct response from the user. for example, for a bot that orders pizza and drinks, you might create this clarification prompt: \"What would you like to do? You can say 'Order a pizza' or 'Order a drink.'\"</p> <p>If you have defined a fallback intent, it will be invoked if the clarification prompt is repeated the number of times defined in the <code>maxAttempts</code> field. For more information, see <a href=\"https://docs.aws.amazon.com/lex/latest/dg/built-in-intent-fallback.html\"> AMAZON.FallbackIntent</a>.</p> <p>If you don't define a clarification prompt, at runtime Amazon Lex will return a 400 Bad Request exception in three cases: </p> <ul> <li> <p>Follow-up prompt - When the user responds to a follow-up prompt but does not provide an intent. For example, in response to a follow-up prompt that says \"Would you like anything else today?\" the user says \"Yes.\" Amazon Lex will return a 400 Bad Request exception because it does not have a clarification prompt to send to the user to get an intent.</p> </li> <li> <p>Lambda function - When using a Lambda function, you return an <code>ElicitIntent</code> dialog type. Since Amazon Lex does not have a clarification prompt to get an intent from the user, it returns a 400 Bad Request exception.</p> </li> <li> <p>PutSession operation - When using the <code>PutSession</code> operation, you send an <code>ElicitIntent</code> dialog type. Since Amazon Lex does not have a clarification prompt to get an intent from the user, it returns a 400 Bad Request exception.</p> </li> </ul>"
         },
         "abortStatement":{
           "shape":"Statement",
-          "documentation":"<p>When Amazon Lex can't understand the user's input in context, it tries to elicit the information a few times. After that, Amazon Lex sends the message defined in <code>abortStatement</code> to the user, and then aborts the conversation. To set the number of retries, use the <code>valueElicitationPrompt</code> field for the slot type. </p> <p>For example, in a pizza ordering bot, Amazon Lex might ask a user \"What type of crust would you like?\" If the user's response is not one of the expected responses (for example, \"thin crust, \"deep dish,\" etc.), Amazon Lex tries to elicit a correct response a few more times. </p> <p>For example, in a pizza ordering application, <code>OrderPizza</code> might be one of the intents. This intent might require the <code>CrustType</code> slot. You specify the <code>valueElicitationPrompt</code> field when you create the <code>CrustType</code> slot.</p>"
+          "documentation":"<p>When Amazon Lex can't understand the user's input in context, it tries to elicit the information a few times. After that, Amazon Lex sends the message defined in <code>abortStatement</code> to the user, and then aborts the conversation. To set the number of retries, use the <code>valueElicitationPrompt</code> field for the slot type. </p> <p>For example, in a pizza ordering bot, Amazon Lex might ask a user \"What type of crust would you like?\" If the user's response is not one of the expected responses (for example, \"thin crust, \"deep dish,\" etc.), Amazon Lex tries to elicit a correct response a few more times. </p> <p>For example, in a pizza ordering application, <code>OrderPizza</code> might be one of the intents. This intent might require the <code>CrustType</code> slot. You specify the <code>valueElicitationPrompt</code> field when you create the <code>CrustType</code> slot.</p> <p>If you have defined a fallback intent the abort statement will not be sent to the user, the fallback intent is used instead. For more information, see <a href=\"https://docs.aws.amazon.com/lex/latest/dg/built-in-intent-fallback.html\"> AMAZON.FallbackIntent</a>.</p>"
         },
         "idleSessionTTLInSeconds":{
           "shape":"SessionTTL",
@@ -2665,7 +2918,7 @@
         },
         "voiceId":{
           "shape":"String",
-          "documentation":"<p>The Amazon Polly voice ID that you want Amazon Lex to use for voice interactions with the user. The locale configured for the voice must match the locale of the bot. For more information, see <a href=\"http://docs.aws.amazon.com/polly/latest/dg/voicelist.html\">Available Voices</a> in the <i>Amazon Polly Developer Guide</i>.</p>"
+          "documentation":"<p>The Amazon Polly voice ID that you want Amazon Lex to use for voice interactions with the user. The locale configured for the voice must match the locale of the bot. For more information, see <a href=\"https://docs.aws.amazon.com/polly/latest/dg/voicelist.html\">Voices in Amazon Polly</a> in the <i>Amazon Polly Developer Guide</i>.</p>"
         },
         "checksum":{
           "shape":"String",
@@ -2683,7 +2936,18 @@
           "shape":"Boolean",
           "documentation":"<p>For each Amazon Lex bot created with the Amazon Lex Model Building Service, you must specify whether your use of Amazon Lex is related to a website, program, or other application that is directed or targeted, in whole or in part, to children under age 13 and subject to the Children's Online Privacy Protection Act (COPPA) by specifying <code>true</code> or <code>false</code> in the <code>childDirected</code> field. By specifying <code>true</code> in the <code>childDirected</code> field, you confirm that your use of Amazon Lex <b>is</b> related to a website, program, or other application that is directed or targeted, in whole or in part, to children under age 13 and subject to COPPA. By specifying <code>false</code> in the <code>childDirected</code> field, you confirm that your use of Amazon Lex <b>is not</b> related to a website, program, or other application that is directed or targeted, in whole or in part, to children under age 13 and subject to COPPA. You may not specify a default value for the <code>childDirected</code> field that does not accurately reflect whether your use of Amazon Lex is related to a website, program, or other application that is directed or targeted, in whole or in part, to children under age 13 and subject to COPPA.</p> <p>If your use of Amazon Lex relates to a website, program, or other application that is directed in whole or in part, to children under age 13, you must obtain any required verifiable parental consent under COPPA. For information regarding the use of Amazon Lex in connection with websites, programs, or other applications that are directed or targeted, in whole or in part, to children under age 13, see the <a href=\"https://aws.amazon.com/lex/faqs#data-security\">Amazon Lex FAQ.</a> </p>"
         },
-        "createVersion":{"shape":"Boolean"}
+        "detectSentiment":{
+          "shape":"Boolean",
+          "documentation":"<p>When set to <code>true</code> user utterances are sent to Amazon Comprehend for sentiment analysis. If you don't specify <code>detectSentiment</code>, the default is <code>false</code>.</p>"
+        },
+        "createVersion":{
+          "shape":"Boolean",
+          "documentation":"<p>When set to <code>true</code> a new numbered version of the bot is created. This is the same as calling the <code>CreateBotVersion</code> operation. If you don't specify <code>createVersion</code>, the default is <code>false</code>.</p>"
+        },
+        "tags":{
+          "shape":"TagList",
+          "documentation":"<p>A list of tags to add to the bot. You can only add tags when you create a bot, you can't use the <code>PutBot</code> operation to update the tags on a bot. To update tags, use the <code>TagResource</code> operation.</p>"
+        }
       }
     },
     "PutBotResponse":{
@@ -2711,7 +2975,7 @@
         },
         "status":{
           "shape":"Status",
-          "documentation":"<p> When you send a request to create a bot with <code>processBehavior</code> set to <code>BUILD</code>, Amazon Lex sets the <code>status</code> response element to <code>BUILDING</code>. After Amazon Lex builds the bot, it sets <code>status</code> to <code>READY</code>. If Amazon Lex can't build the bot, Amazon Lex sets <code>status</code> to <code>FAILED</code>. Amazon Lex returns the reason for the failure in the <code>failureReason</code> response element. </p> <p>When you set <code>processBehavior</code>to <code>SAVE</code>, Amazon Lex sets the status code to <code>NOT BUILT</code>.</p>"
+          "documentation":"<p> When you send a request to create a bot with <code>processBehavior</code> set to <code>BUILD</code>, Amazon Lex sets the <code>status</code> response element to <code>BUILDING</code>.</p> <p>In the <code>READY_BASIC_TESTING</code> state you can test the bot with user inputs that exactly match the utterances configured for the bot's intents and values in the slot types.</p> <p>If Amazon Lex can't build the bot, Amazon Lex sets <code>status</code> to <code>FAILED</code>. Amazon Lex returns the reason for the failure in the <code>failureReason</code> response element. </p> <p>When you set <code>processBehavior</code> to <code>SAVE</code>, Amazon Lex sets the status code to <code>NOT BUILT</code>.</p> <p>When the bot is in the <code>READY</code> state you can test and publish the bot.</p>"
         },
         "failureReason":{
           "shape":"String",
@@ -2749,7 +3013,18 @@
           "shape":"Boolean",
           "documentation":"<p>For each Amazon Lex bot created with the Amazon Lex Model Building Service, you must specify whether your use of Amazon Lex is related to a website, program, or other application that is directed or targeted, in whole or in part, to children under age 13 and subject to the Children's Online Privacy Protection Act (COPPA) by specifying <code>true</code> or <code>false</code> in the <code>childDirected</code> field. By specifying <code>true</code> in the <code>childDirected</code> field, you confirm that your use of Amazon Lex <b>is</b> related to a website, program, or other application that is directed or targeted, in whole or in part, to children under age 13 and subject to COPPA. By specifying <code>false</code> in the <code>childDirected</code> field, you confirm that your use of Amazon Lex <b>is not</b> related to a website, program, or other application that is directed or targeted, in whole or in part, to children under age 13 and subject to COPPA. You may not specify a default value for the <code>childDirected</code> field that does not accurately reflect whether your use of Amazon Lex is related to a website, program, or other application that is directed or targeted, in whole or in part, to children under age 13 and subject to COPPA.</p> <p>If your use of Amazon Lex relates to a website, program, or other application that is directed in whole or in part, to children under age 13, you must obtain any required verifiable parental consent under COPPA. For information regarding the use of Amazon Lex in connection with websites, programs, or other applications that are directed or targeted, in whole or in part, to children under age 13, see the <a href=\"https://aws.amazon.com/lex/faqs#data-security\">Amazon Lex FAQ.</a> </p>"
         },
-        "createVersion":{"shape":"Boolean"}
+        "createVersion":{
+          "shape":"Boolean",
+          "documentation":"<p> <code>True</code> if a new version of the bot was created. If the <code>createVersion</code> field was not specified in the request, the <code>createVersion</code> field is set to false in the response.</p>"
+        },
+        "detectSentiment":{
+          "shape":"Boolean",
+          "documentation":"<p> <code>true</code> if the bot is configured to send user utterances to Amazon Comprehend for sentiment analysis. If the <code>detectSentiment</code> field was not specified in the request, the <code>detectSentiment</code> field is <code>false</code> in the response.</p>"
+        },
+        "tags":{
+          "shape":"TagList",
+          "documentation":"<p>A list of tags associated with the bot.</p>"
+        }
       }
     },
     "PutIntentRequest":{
@@ -2806,7 +3081,10 @@
           "shape":"String",
           "documentation":"<p>Identifies a specific revision of the <code>$LATEST</code> version.</p> <p>When you create a new intent, leave the <code>checksum</code> field blank. If you specify a checksum you get a <code>BadRequestException</code> exception.</p> <p>When you want to update a intent, set the <code>checksum</code> field to the checksum of the most recent revision of the <code>$LATEST</code> version. If you don't specify the <code> checksum</code> field, or if the checksum does not match the <code>$LATEST</code> version, you get a <code>PreconditionFailedException</code> exception.</p>"
         },
-        "createVersion":{"shape":"Boolean"}
+        "createVersion":{
+          "shape":"Boolean",
+          "documentation":"<p>When set to <code>true</code> a new numbered version of the intent is created. This is the same as calling the <code>CreateIntentVersion</code> operation. If you do not specify <code>createVersion</code>, the default is <code>false</code>.</p>"
+        }
       }
     },
     "PutIntentResponse":{
@@ -2872,7 +3150,10 @@
           "shape":"String",
           "documentation":"<p>Checksum of the <code>$LATEST</code>version of the intent created or updated.</p>"
         },
-        "createVersion":{"shape":"Boolean"}
+        "createVersion":{
+          "shape":"Boolean",
+          "documentation":"<p> <code>True</code> if a new version of the intent was created. If the <code>createVersion</code> field was not specified in the request, the <code>createVersion</code> field is set to false in the response.</p>"
+        }
       }
     },
     "PutSlotTypeRequest":{
@@ -2901,7 +3182,18 @@
           "shape":"SlotValueSelectionStrategy",
           "documentation":"<p>Determines the slot resolution strategy that Amazon Lex uses to return slot type values. The field can be set to one of the following values:</p> <ul> <li> <p> <code>ORIGINAL_VALUE</code> - Returns the value entered by the user, if the user value is similar to the slot value.</p> </li> <li> <p> <code>TOP_RESOLUTION</code> - If there is a resolution list for the slot, return the first value in the resolution list as the slot type value. If there is no resolution list, null is returned.</p> </li> </ul> <p>If you don't specify the <code>valueSelectionStrategy</code>, the default is <code>ORIGINAL_VALUE</code>.</p>"
         },
-        "createVersion":{"shape":"Boolean"}
+        "createVersion":{
+          "shape":"Boolean",
+          "documentation":"<p>When set to <code>true</code> a new numbered version of the slot type is created. This is the same as calling the <code>CreateSlotTypeVersion</code> operation. If you do not specify <code>createVersion</code>, the default is <code>false</code>.</p>"
+        },
+        "parentSlotTypeSignature":{
+          "shape":"CustomOrBuiltinSlotTypeName",
+          "documentation":"<p>The built-in slot type used as the parent of the slot type. When you define a parent slot type, the new slot type has all of the same configuration as the parent.</p> <p>Only <code>AMAZON.AlphaNumeric</code> is supported.</p>"
+        },
+        "slotTypeConfigurations":{
+          "shape":"SlotTypeConfigurations",
+          "documentation":"<p>Configuration information that extends the parent built-in slot type. The configuration is added to the settings for the parent slot type.</p>"
+        }
       }
     },
     "PutSlotTypeResponse":{
@@ -2939,7 +3231,18 @@
           "shape":"SlotValueSelectionStrategy",
           "documentation":"<p>The slot resolution strategy that Amazon Lex uses to determine the value of the slot. For more information, see <a>PutSlotType</a>.</p>"
         },
-        "createVersion":{"shape":"Boolean"}
+        "createVersion":{
+          "shape":"Boolean",
+          "documentation":"<p> <code>True</code> if a new version of the slot type was created. If the <code>createVersion</code> field was not specified in the request, the <code>createVersion</code> field is set to false in the response.</p>"
+        },
+        "parentSlotTypeSignature":{
+          "shape":"CustomOrBuiltinSlotTypeName",
+          "documentation":"<p>The built-in slot type used as the parent of the slot type.</p>"
+        },
+        "slotTypeConfigurations":{
+          "shape":"SlotTypeConfigurations",
+          "documentation":"<p>Configuration information that extends the parent built-in slot type.</p>"
+        }
       }
     },
     "ReferenceType":{
@@ -2951,6 +3254,17 @@
         "BotChannel"
       ]
     },
+    "RegexPattern":{
+      "type":"string",
+      "max":100,
+      "min":1
+    },
+    "ResourceArn":{
+      "type":"string",
+      "max":2048,
+      "min":1,
+      "pattern":"^arn:[\\w\\-]+:(?:logs:[\\w\\-]+:[\\d]{12}:log-group:[\\.\\-_/#A-Za-z0-9]{1,512}(?::\\*)?|s3:::[a-z0-9][\\.\\-a-z0-9]{1,61}[a-z0-9])$"
+    },
     "ResourceInUseException":{
       "type":"structure",
       "members":{
@@ -2961,6 +3275,10 @@
       "error":{"httpStatusCode":400},
       "exception":true
     },
+    "ResourcePrefix":{
+      "type":"string",
+      "max":1024
+    },
     "ResourceReference":{
       "type":"structure",
       "members":{
@@ -3035,6 +3353,10 @@
         "responseCard":{
           "shape":"ResponseCard",
           "documentation":"<p> A set of possible responses for the slot type used by text-based clients. A user chooses an option from the response card, instead of using text to reply. </p>"
+        },
+        "obfuscationSetting":{
+          "shape":"ObfuscationSetting",
+          "documentation":"<p>Determines whether a slot is obfuscated in conversation logs and stored utterances. When you obfuscate a slot, the value is replaced by the slot name in curly braces ({}). For example, if the slot name is \"full_name\", obfuscated values are replaced with \"{full_name}\". For more information, see <a href=\"https://docs.aws.amazon.com/lex/latest/dg/how-obfuscate.html\"> Slot Obfuscation </a>. </p>"
         }
       },
       "documentation":"<p>Identifies the version of a specific slot.</p>"
@@ -3058,6 +3380,22 @@
       "min":1,
       "pattern":"^([A-Za-z](-|_|.)?)+$"
     },
+    "SlotTypeConfiguration":{
+      "type":"structure",
+      "members":{
+        "regexConfiguration":{
+          "shape":"SlotTypeRegexConfiguration",
+          "documentation":"<p>A regular expression used to validate the value of a slot.</p>"
+        }
+      },
+      "documentation":"<p>Provides configuration information for a slot type.</p>"
+    },
+    "SlotTypeConfigurations":{
+      "type":"list",
+      "member":{"shape":"SlotTypeConfiguration"},
+      "max":10,
+      "min":0
+    },
     "SlotTypeMetadata":{
       "type":"structure",
       "members":{
@@ -3094,6 +3432,17 @@
       "min":1,
       "pattern":"^([A-Za-z]_?)+$"
     },
+    "SlotTypeRegexConfiguration":{
+      "type":"structure",
+      "required":["pattern"],
+      "members":{
+        "pattern":{
+          "shape":"RegexPattern",
+          "documentation":"<p>A regular expression used to validate the value of a slot. </p> <p>Use a standard regular expression. Amazon Lex supports the following characters in the regular expression:</p> <ul> <li> <p>A-Z, a-z</p> </li> <li> <p>0-9</p> </li> <li> <p>Unicode characters (\"\\ u&lt;Unicode&gt;\")</p> </li> </ul> <p>Represent Unicode characters with four digits, for example \"\\u0041\" or \"\\u005A\".</p> <p>The following regular expression operators are not supported:</p> <ul> <li> <p>Infinite repeaters: *, +, or {x,} with no upper bound.</p> </li> <li> <p>Wild card (.)</p> </li> </ul>"
+        }
+      },
+      "documentation":"<p>Provides a regular expression used to validate the value of a slot.</p>"
+    },
     "SlotUtteranceList":{
       "type":"list",
       "member":{"shape":"Utterance"},
@@ -3126,6 +3475,10 @@
         "mergeStrategy":{
           "shape":"MergeStrategy",
           "documentation":"<p>Specifies the action that the <code>StartImport</code> operation should take when there is an existing resource with the same name.</p> <ul> <li> <p>FAIL_ON_CONFLICT - The import operation is stopped on the first conflict between a resource in the import file and an existing resource. The name of the resource causing the conflict is in the <code>failureReason</code> field of the response to the <code>GetImport</code> operation.</p> <p>OVERWRITE_LATEST - The import operation proceeds even if there is a conflict with an existing resource. The $LASTEST version of the existing resource is overwritten with the data from the import file.</p> </li> </ul>"
+        },
+        "tags":{
+          "shape":"TagList",
+          "documentation":"<p>A list of tags to add to the imported bot. You can only add tags when you import a bot, you can't add tags to an intent or slot type.</p>"
         }
       }
     },
@@ -3152,6 +3505,10 @@
           "shape":"ImportStatus",
           "documentation":"<p>The status of the import job. If the status is <code>FAILED</code>, you can get the reason for the failure using the <code>GetImport</code> operation.</p>"
         },
+        "tags":{
+          "shape":"TagList",
+          "documentation":"<p>A list of tags added to the imported bot.</p>"
+        },
         "createdDate":{
           "shape":"Timestamp",
           "documentation":"<p>A timestamp for the date and time that the import job was requested.</p>"
@@ -3199,7 +3556,97 @@
       "type":"list",
       "member":{"shape":"Value"}
     },
+    "Tag":{
+      "type":"structure",
+      "required":[
+        "key",
+        "value"
+      ],
+      "members":{
+        "key":{
+          "shape":"TagKey",
+          "documentation":"<p>The key for the tag. Keys are not case-sensitive and must be unique.</p>"
+        },
+        "value":{
+          "shape":"TagValue",
+          "documentation":"<p>The value associated with a key. The value may be an empty string but it can't be null.</p>"
+        }
+      },
+      "documentation":"<p>A list of key/value pairs that identify a bot, bot alias, or bot channel. Tag keys and values can consist of Unicode letters, digits, white space, and any of the following symbols: _ . : / = + - @. </p>"
+    },
+    "TagKey":{
+      "type":"string",
+      "max":128,
+      "min":1
+    },
+    "TagKeyList":{
+      "type":"list",
+      "member":{"shape":"TagKey"},
+      "max":200,
+      "min":0
+    },
+    "TagList":{
+      "type":"list",
+      "member":{"shape":"Tag"},
+      "max":200,
+      "min":0
+    },
+    "TagResourceRequest":{
+      "type":"structure",
+      "required":[
+        "resourceArn",
+        "tags"
+      ],
+      "members":{
+        "resourceArn":{
+          "shape":"AmazonResourceName",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the bot, bot alias, or bot channel to tag.</p>",
+          "location":"uri",
+          "locationName":"resourceArn"
+        },
+        "tags":{
+          "shape":"TagList",
+          "documentation":"<p>A list of tag keys to add to the resource. If a tag key already exists, the existing value is replaced with the new value.</p>"
+        }
+      }
+    },
+    "TagResourceResponse":{
+      "type":"structure",
+      "members":{
+      }
+    },
+    "TagValue":{
+      "type":"string",
+      "max":256,
+      "min":0
+    },
     "Timestamp":{"type":"timestamp"},
+    "UntagResourceRequest":{
+      "type":"structure",
+      "required":[
+        "resourceArn",
+        "tagKeys"
+      ],
+      "members":{
+        "resourceArn":{
+          "shape":"AmazonResourceName",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the resource to remove the tags from.</p>",
+          "location":"uri",
+          "locationName":"resourceArn"
+        },
+        "tagKeys":{
+          "shape":"TagKeyList",
+          "documentation":"<p>A list of tag keys to remove from the resource. If a tag key does not exist on the resource, it is ignored.</p>",
+          "location":"querystring",
+          "locationName":"tagKeys"
+        }
+      }
+    },
+    "UntagResourceResponse":{
+      "type":"structure",
+      "members":{
+      }
+    },
     "UserId":{
       "type":"string",
       "max":100,
diff --git a/services/lexruntime/pom.xml b/services/lexruntime/pom.xml
index 08c6f256a044..f5044e84ce11 100644
--- a/services/lexruntime/pom.xml
+++ b/services/lexruntime/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>lexruntime</artifactId>
     <name>AWS Java SDK :: Services :: Amazon Lex Runtime</name>
diff --git a/services/lexruntime/src/main/resources/codegen-resources/service-2.json b/services/lexruntime/src/main/resources/codegen-resources/service-2.json
index 7aeeee135237..5f097ad0c20b 100644
--- a/services/lexruntime/src/main/resources/codegen-resources/service-2.json
+++ b/services/lexruntime/src/main/resources/codegen-resources/service-2.json
@@ -592,6 +592,12 @@
           "location":"header",
           "locationName":"x-amz-lex-session-attributes"
         },
+        "sentimentResponse":{
+          "shape":"String",
+          "documentation":"<p>The sentiment expressed in and utterance.</p> <p>When the bot is configured to send utterances to Amazon Comprehend for sentiment analysis, this field contains the result of the analysis.</p>",
+          "location":"header",
+          "locationName":"x-amz-lex-sentiment"
+        },
         "message":{
           "shape":"Text",
           "documentation":"<p>The message to convey to the user. The message can come from the bot's configuration or from a Lambda function.</p> <p>If the intent is not configured with a Lambda function, or if the Lambda function returned <code>Delegate</code> as the <code>dialogAction.type</code> in its response, Amazon Lex decides on the next course of action and selects an appropriate message from the bot's configuration based on the current interaction context. For example, if Amazon Lex isn't able to understand user input, it uses a clarification prompt message.</p> <p>When you create an intent you can assign messages to groups. When messages are assigned to groups Amazon Lex returns one message from each group in the response. The message field is an escaped JSON string containing the messages. For more information about the structure of the JSON string returned, see <a>msg-prompts-formats</a>.</p> <p>If the Lambda function returns a message, Amazon Lex passes it to the client in its response.</p>",
@@ -625,6 +631,12 @@
         "audioStream":{
           "shape":"BlobStream",
           "documentation":"<p>The prompt (or statement) to convey to the user. This is based on the bot configuration and context. For example, if Amazon Lex did not understand the user intent, it sends the <code>clarificationPrompt</code> configured for the bot. If the intent requires confirmation before taking the fulfillment action, it sends the <code>confirmationPrompt</code>. Another example: Suppose that the Lambda function successfully fulfilled the intent, and sent a message to convey to the user. Then Amazon Lex sends that message in the response. </p>"
+        },
+        "sessionId":{
+          "shape":"String",
+          "documentation":"<p>The unique identifier for the session.</p>",
+          "location":"header",
+          "locationName":"x-amz-lex-session-id"
         }
       },
       "payload":"audioStream"
@@ -689,6 +701,10 @@
           "shape":"Text",
           "documentation":"<p>The message to convey to the user. The message can come from the bot's configuration or from a Lambda function.</p> <p>If the intent is not configured with a Lambda function, or if the Lambda function returned <code>Delegate</code> as the <code>dialogAction.type</code> its response, Amazon Lex decides on the next course of action and selects an appropriate message from the bot's configuration based on the current interaction context. For example, if Amazon Lex isn't able to understand user input, it uses a clarification prompt message.</p> <p>When you create an intent you can assign messages to groups. When messages are assigned to groups Amazon Lex returns one message from each group in the response. The message field is an escaped JSON string containing the messages. For more information about the structure of the JSON string returned, see <a>msg-prompts-formats</a>.</p> <p>If the Lambda function returns a message, Amazon Lex passes it to the client in its response.</p>"
         },
+        "sentimentResponse":{
+          "shape":"SentimentResponse",
+          "documentation":"<p>The sentiment expressed in and utterance.</p> <p>When the bot is configured to send utterances to Amazon Comprehend for sentiment analysis, this field contains the result of the analysis.</p>"
+        },
         "messageFormat":{
           "shape":"MessageFormatType",
           "documentation":"<p>The format of the response message. One of the following values:</p> <ul> <li> <p> <code>PlainText</code> - The message contains plain UTF-8 text.</p> </li> <li> <p> <code>CustomPayload</code> - The message is a custom format defined by the Lambda function.</p> </li> <li> <p> <code>SSML</code> - The message contains text formatted for voice output.</p> </li> <li> <p> <code>Composite</code> - The message contains an escaped JSON object containing one or more messages from the groups that messages were assigned to when the intent was created.</p> </li> </ul>"
@@ -704,6 +720,10 @@
         "responseCard":{
           "shape":"ResponseCard",
           "documentation":"<p>Represents the options that the user has to respond to the current prompt. Response Card can come from the bot configuration (in the Amazon Lex console, choose the settings button next to a slot) or from a code hook (Lambda function). </p>"
+        },
+        "sessionId":{
+          "shape":"String",
+          "documentation":"<p>A unique identifier for the session.</p>"
         }
       }
     },
@@ -846,6 +866,22 @@
       },
       "documentation":"<p>If you configure a response card when creating your bots, Amazon Lex substitutes the session attributes and slot values that are available, and then returns it. The response card can also come from a Lambda function ( <code>dialogCodeHook</code> and <code>fulfillmentActivity</code> on an intent).</p>"
     },
+    "SentimentLabel":{"type":"string"},
+    "SentimentResponse":{
+      "type":"structure",
+      "members":{
+        "sentimentLabel":{
+          "shape":"SentimentLabel",
+          "documentation":"<p>The inferred sentiment that Amazon Comprehend has the highest confidence in.</p>"
+        },
+        "sentimentScore":{
+          "shape":"SentimentScore",
+          "documentation":"<p>The likelihood that the sentiment was correctly inferred.</p>"
+        }
+      },
+      "documentation":"<p>The sentiment expressed in an utterance.</p> <p>When the bot is configured to send utterances to Amazon Comprehend for sentiment analysis, this field structure contains the result of the analysis.</p>"
+    },
+    "SentimentScore":{"type":"string"},
     "String":{"type":"string"},
     "StringMap":{
       "type":"map",
diff --git a/services/licensemanager/pom.xml b/services/licensemanager/pom.xml
index 59b535eebbf9..e367cf533e20 100644
--- a/services/licensemanager/pom.xml
+++ b/services/licensemanager/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>licensemanager</artifactId>
     <name>AWS Java SDK :: Services :: License Manager</name>
diff --git a/services/licensemanager/src/main/resources/codegen-resources/service-2.json b/services/licensemanager/src/main/resources/codegen-resources/service-2.json
index ec74e61ae85d..9f26ebc97570 100644
--- a/services/licensemanager/src/main/resources/codegen-resources/service-2.json
+++ b/services/licensemanager/src/main/resources/codegen-resources/service-2.json
@@ -28,7 +28,7 @@
         {"shape":"AccessDeniedException"},
         {"shape":"RateLimitExceededException"}
       ],
-      "documentation":"<p>Creates a new license configuration object. A license configuration is an abstraction of a customer license agreement that can be consumed and enforced by License Manager. Components include specifications for the license type (licensing by instance, socket, CPU, or VCPU), tenancy (shared tenancy, Amazon EC2 Dedicated Instance, Amazon EC2 Dedicated Host, or any of these), host affinity (how long a VM must be associated with a host), the number of licenses purchased and used.</p>"
+      "documentation":"<p>Creates a license configuration.</p> <p>A license configuration is an abstraction of a customer license agreement that can be consumed and enforced by License Manager. Components include specifications for the license type (licensing by instance, socket, CPU, or vCPU), allowed tenancy (shared tenancy, Dedicated Instance, Dedicated Host, or all of these), host affinity (how long a VM must be associated with a host), and the number of licenses purchased and used.</p>"
     },
     "DeleteLicenseConfiguration":{
       "name":"DeleteLicenseConfiguration",
@@ -45,7 +45,7 @@
         {"shape":"AccessDeniedException"},
         {"shape":"RateLimitExceededException"}
       ],
-      "documentation":"<p>Deletes an existing license configuration. This action fails if the configuration is in use.</p>"
+      "documentation":"<p>Deletes the specified license configuration.</p> <p>You cannot delete a license configuration that is in use.</p>"
     },
     "GetLicenseConfiguration":{
       "name":"GetLicenseConfiguration",
@@ -62,7 +62,7 @@
         {"shape":"AccessDeniedException"},
         {"shape":"RateLimitExceededException"}
       ],
-      "documentation":"<p>Returns a detailed description of a license configuration.</p>"
+      "documentation":"<p>Gets detailed information about the specified license configuration.</p>"
     },
     "GetServiceSettings":{
       "name":"GetServiceSettings",
@@ -78,7 +78,7 @@
         {"shape":"AccessDeniedException"},
         {"shape":"RateLimitExceededException"}
       ],
-      "documentation":"<p>Gets License Manager settings for a region. Exposes the configured S3 bucket, SNS topic, etc., for inspection. </p>"
+      "documentation":"<p>Gets the License Manager settings for the current Region.</p>"
     },
     "ListAssociationsForLicenseConfiguration":{
       "name":"ListAssociationsForLicenseConfiguration",
@@ -96,7 +96,24 @@
         {"shape":"AccessDeniedException"},
         {"shape":"RateLimitExceededException"}
       ],
-      "documentation":"<p>Lists the resource associations for a license configuration. Resource associations need not consume licenses from a license configuration. For example, an AMI or a stopped instance may not consume a license (depending on the license rules). Use this operation to find all resources associated with a license configuration.</p>"
+      "documentation":"<p>Lists the resource associations for the specified license configuration.</p> <p>Resource associations need not consume licenses from a license configuration. For example, an AMI or a stopped instance might not consume a license (depending on the license rules).</p>"
+    },
+    "ListFailuresForLicenseConfigurationOperations":{
+      "name":"ListFailuresForLicenseConfigurationOperations",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"ListFailuresForLicenseConfigurationOperationsRequest"},
+      "output":{"shape":"ListFailuresForLicenseConfigurationOperationsResponse"},
+      "errors":[
+        {"shape":"InvalidParameterValueException"},
+        {"shape":"ServerInternalException"},
+        {"shape":"AuthorizationException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"RateLimitExceededException"}
+      ],
+      "documentation":"<p>Lists the license configuration operations that failed.</p>"
     },
     "ListLicenseConfigurations":{
       "name":"ListLicenseConfigurations",
@@ -114,7 +131,7 @@
         {"shape":"AccessDeniedException"},
         {"shape":"RateLimitExceededException"}
       ],
-      "documentation":"<p>Lists license configuration objects for an account, each containing the name, description, license type, and other license terms modeled from a license agreement.</p>"
+      "documentation":"<p>Lists the license configurations for your account.</p>"
     },
     "ListLicenseSpecificationsForResource":{
       "name":"ListLicenseSpecificationsForResource",
@@ -131,7 +148,7 @@
         {"shape":"AccessDeniedException"},
         {"shape":"RateLimitExceededException"}
       ],
-      "documentation":"<p>Returns the license configuration for a resource.</p>"
+      "documentation":"<p>Describes the license configurations for the specified resource.</p>"
     },
     "ListResourceInventory":{
       "name":"ListResourceInventory",
@@ -150,7 +167,7 @@
         {"shape":"AccessDeniedException"},
         {"shape":"RateLimitExceededException"}
       ],
-      "documentation":"<p>Returns a detailed list of resources.</p>"
+      "documentation":"<p>Lists resources managed using Systems Manager inventory.</p>"
     },
     "ListTagsForResource":{
       "name":"ListTagsForResource",
@@ -167,7 +184,7 @@
         {"shape":"AccessDeniedException"},
         {"shape":"RateLimitExceededException"}
       ],
-      "documentation":"<p>Lists tags attached to a resource.</p>"
+      "documentation":"<p>Lists the tags for the specified license configuration.</p>"
     },
     "ListUsageForLicenseConfiguration":{
       "name":"ListUsageForLicenseConfiguration",
@@ -202,7 +219,7 @@
         {"shape":"AccessDeniedException"},
         {"shape":"RateLimitExceededException"}
       ],
-      "documentation":"<p>Attach one of more tags to any resource.</p>"
+      "documentation":"<p>Adds the specified tags to the specified license configuration.</p>"
     },
     "UntagResource":{
       "name":"UntagResource",
@@ -219,7 +236,7 @@
         {"shape":"AccessDeniedException"},
         {"shape":"RateLimitExceededException"}
       ],
-      "documentation":"<p>Remove tags from a resource.</p>"
+      "documentation":"<p>Removes the specified tags from the specified license configuration.</p>"
     },
     "UpdateLicenseConfiguration":{
       "name":"UpdateLicenseConfiguration",
@@ -236,7 +253,7 @@
         {"shape":"AccessDeniedException"},
         {"shape":"RateLimitExceededException"}
       ],
-      "documentation":"<p>Modifies the attributes of an existing license configuration object. A license configuration is an abstraction of a customer license agreement that can be consumed and enforced by License Manager. Components include specifications for the license type (Instances, cores, sockets, VCPUs), tenancy (shared or Dedicated Host), host affinity (how long a VM is associated with a host), the number of licenses purchased and used.</p>"
+      "documentation":"<p>Modifies the attributes of an existing license configuration.</p> <p>A license configuration is an abstraction of a customer license agreement that can be consumed and enforced by License Manager. Components include specifications for the license type (licensing by instance, socket, CPU, or vCPU), allowed tenancy (shared tenancy, Dedicated Instance, Dedicated Host, or all of these), host affinity (how long a VM must be associated with a host), and the number of licenses purchased and used.</p>"
     },
     "UpdateLicenseSpecificationsForResource":{
       "name":"UpdateLicenseSpecificationsForResource",
@@ -255,7 +272,7 @@
         {"shape":"AccessDeniedException"},
         {"shape":"RateLimitExceededException"}
       ],
-      "documentation":"<p>Adds or removes license configurations for a specified AWS resource. This operation currently supports updating the license specifications of AMIs, instances, and hosts. Launch templates and AWS CloudFormation templates are not managed from this operation as those resources send the license configurations directly to a resource creation operation, such as <code>RunInstances</code>.</p>"
+      "documentation":"<p>Adds or removes the specified license configurations for the specified AWS resource.</p> <p>You can update the license specifications of AMIs, instances, and hosts. You cannot update the license specifications for launch templates and AWS CloudFormation templates, as they send license configurations to the operation that creates the resource.</p>"
     },
     "UpdateServiceSettings":{
       "name":"UpdateServiceSettings",
@@ -272,7 +289,7 @@
         {"shape":"AccessDeniedException"},
         {"shape":"RateLimitExceededException"}
       ],
-      "documentation":"<p>Updates License Manager service settings.</p>"
+      "documentation":"<p>Updates License Manager settings for the current Region.</p>"
     }
   },
   "shapes":{
@@ -292,6 +309,16 @@
       "documentation":"<p>The AWS user account does not have permission to perform the action. Check the IAM policy associated with this account.</p>",
       "exception":true
     },
+    "AutomatedDiscoveryInformation":{
+      "type":"structure",
+      "members":{
+        "LastRunTime":{
+          "shape":"DateTime",
+          "documentation":"<p>Time that automated discovery last ran.</p>"
+        }
+      },
+      "documentation":"<p>Describes automated discovery.</p>"
+    },
     "Boolean":{"type":"boolean"},
     "BoxBoolean":{"type":"boolean"},
     "BoxInteger":{"type":"integer"},
@@ -301,11 +328,11 @@
       "members":{
         "ResourceType":{
           "shape":"ResourceType",
-          "documentation":"<p>Resource type of the resource consuming a license (instance, host, or AMI).</p>"
+          "documentation":"<p>Resource type of the resource consuming a license.</p>"
         },
         "ConsumedLicenses":{
           "shape":"BoxLong",
-          "documentation":"<p>Number of licenses consumed by a resource.</p>"
+          "documentation":"<p>Number of licenses consumed by the resource.</p>"
         }
       },
       "documentation":"<p>Details about license consumption.</p>"
@@ -327,11 +354,11 @@
         },
         "Description":{
           "shape":"String",
-          "documentation":"<p>Human-friendly description of the license configuration.</p>"
+          "documentation":"<p>Description of the license configuration.</p>"
         },
         "LicenseCountingType":{
           "shape":"LicenseCountingType",
-          "documentation":"<p>Dimension to use to track the license inventory.</p>"
+          "documentation":"<p>Dimension used to track the license inventory.</p>"
         },
         "LicenseCount":{
           "shape":"BoxLong",
@@ -339,15 +366,19 @@
         },
         "LicenseCountHardLimit":{
           "shape":"BoxBoolean",
-          "documentation":"<p>Flag indicating whether hard or soft license enforcement is used. Exceeding a hard limit results in the blocked deployment of new instances.</p>"
+          "documentation":"<p>Indicates whether hard or soft license enforcement is used. Exceeding a hard limit blocks the launch of new instances.</p>"
         },
         "LicenseRules":{
           "shape":"StringList",
-          "documentation":"<p>Array of configured License Manager rules.</p>"
+          "documentation":"<p>License rules. The syntax is #name=value (for example, #allowedTenancy=EC2-DedicatedHost). Available rules vary by dimension.</p> <ul> <li> <p> <code>Cores</code> dimension: <code>allowedTenancy</code> | <code>maximumCores</code> | <code>minimumCores</code> </p> </li> <li> <p> <code>Instances</code> dimension: <code>allowedTenancy</code> | <code>maximumCores</code> | <code>minimumCores</code> | <code>maximumSockets</code> | <code>minimumSockets</code> | <code>maximumVcpus</code> | <code>minimumVcpus</code> </p> </li> <li> <p> <code>Sockets</code> dimension: <code>allowedTenancy</code> | <code>maximumSockets</code> | <code>minimumSockets</code> </p> </li> <li> <p> <code>vCPUs</code> dimension: <code>allowedTenancy</code> | <code>honorVcpuOptimization</code> | <code>maximumVcpus</code> | <code>minimumVcpus</code> </p> </li> </ul>"
         },
         "Tags":{
           "shape":"TagList",
-          "documentation":"<p>The tags to apply to the resources during launch. You can only tag instances and volumes on launch. The specified tags are applied to all instances or volumes that are created during launch. To tag a resource after it has been created, see CreateTags .</p> <p/>"
+          "documentation":"<p>Tags to add to the license configuration.</p>"
+        },
+        "ProductInformationList":{
+          "shape":"ProductInformationList",
+          "documentation":"<p>Product information.</p>"
         }
       }
     },
@@ -356,7 +387,7 @@
       "members":{
         "LicenseConfigurationArn":{
           "shape":"String",
-          "documentation":"<p>ARN of the license configuration object after its creation.</p>"
+          "documentation":"<p>Amazon Resource Name (ARN) of the license configuration.</p>"
         }
       }
     },
@@ -367,7 +398,7 @@
       "members":{
         "LicenseConfigurationArn":{
           "shape":"String",
-          "documentation":"<p>Unique ID of the configuration object to delete.</p>"
+          "documentation":"<p>ID of the license configuration.</p>"
         }
       }
     },
@@ -382,8 +413,7 @@
         "Message":{"shape":"Message"}
       },
       "documentation":"<p>A dependency required to run the API is missing.</p>",
-      "exception":true,
-      "fault":true
+      "exception":true
     },
     "Filter":{
       "type":"structure",
@@ -394,10 +424,10 @@
         },
         "Values":{
           "shape":"FilterValues",
-          "documentation":"<p>One or more filter values. Filter values are case-sensitive.</p>"
+          "documentation":"<p>Filter values. Filter values are case-sensitive.</p>"
         }
       },
-      "documentation":"<p>A filter name and value pair that is used to return a more specific list of results from a describe operation. Filters can be used to match a set of resources by specific criteria, such as tags, attributes, or IDs. The filters supported by a <code>Describe</code> operation are documented with the <code>Describe</code> operation.</p>"
+      "documentation":"<p>A filter name and value pair that is used to return more specific results from a describe operation. Filters can be used to match a set of resources by specific criteria, such as tags, attributes, or IDs.</p>"
     },
     "FilterLimitExceededException":{
       "type":"structure",
@@ -423,7 +453,7 @@
       "members":{
         "LicenseConfigurationArn":{
           "shape":"String",
-          "documentation":"<p>ARN of the license configuration being requested.</p>"
+          "documentation":"<p>Amazon Resource Name (ARN) of the license configuration.</p>"
         }
       }
     },
@@ -436,7 +466,7 @@
         },
         "LicenseConfigurationArn":{
           "shape":"String",
-          "documentation":"<p>ARN of the license configuration requested.</p>"
+          "documentation":"<p>Amazon Resource Name (ARN) of the license configuration.</p>"
         },
         "Name":{
           "shape":"String",
@@ -448,11 +478,11 @@
         },
         "LicenseCountingType":{
           "shape":"LicenseCountingType",
-          "documentation":"<p>Dimension on which the licenses are counted (for example, instances, cores, sockets, or VCPUs).</p>"
+          "documentation":"<p>Dimension on which the licenses are counted.</p>"
         },
         "LicenseRules":{
           "shape":"StringList",
-          "documentation":"<p>List of flexible text strings designating license rules.</p>"
+          "documentation":"<p>License rules.</p>"
         },
         "LicenseCount":{
           "shape":"BoxLong",
@@ -468,23 +498,31 @@
         },
         "Status":{
           "shape":"String",
-          "documentation":"<p>License configuration status (active, etc.).</p>"
+          "documentation":"<p>License configuration status.</p>"
         },
         "OwnerAccountId":{
           "shape":"String",
-          "documentation":"<p>Owner account ID for the license configuration.</p>"
+          "documentation":"<p>Account ID of the owner of the license configuration.</p>"
         },
         "ConsumedLicenseSummaryList":{
           "shape":"ConsumedLicenseSummaryList",
-          "documentation":"<p>List of summaries for consumed licenses used by various resources.</p>"
+          "documentation":"<p>Summaries of the licenses consumed by resources.</p>"
         },
         "ManagedResourceSummaryList":{
           "shape":"ManagedResourceSummaryList",
-          "documentation":"<p>List of summaries of managed resources.</p>"
+          "documentation":"<p>Summaries of the managed resources.</p>"
         },
         "Tags":{
           "shape":"TagList",
-          "documentation":"<p>List of tags attached to the license configuration.</p>"
+          "documentation":"<p>Tags for the license configuration.</p>"
+        },
+        "ProductInformationList":{
+          "shape":"ProductInformationList",
+          "documentation":"<p>Product information.</p>"
+        },
+        "AutomatedDiscoveryInformation":{
+          "shape":"AutomatedDiscoveryInformation",
+          "documentation":"<p>Automated discovery information.</p>"
         }
       }
     },
@@ -498,7 +536,7 @@
       "members":{
         "S3BucketArn":{
           "shape":"String",
-          "documentation":"<p>Regional S3 bucket path for storing reports, license trail event data, discovery data, etc.</p>"
+          "documentation":"<p>Regional S3 bucket path for storing reports, license trail event data, discovery data, and so on.</p>"
         },
         "SnsTopicArn":{
           "shape":"String",
@@ -511,6 +549,10 @@
         "EnableCrossAccountsDiscovery":{
           "shape":"BoxBoolean",
           "documentation":"<p>Indicates whether cross-account discovery has been enabled.</p>"
+        },
+        "LicenseManagerResourceShareArn":{
+          "shape":"String",
+          "documentation":"<p>Amazon Resource Name (ARN) of the AWS resource share. The License Manager master account will provide member accounts with access to this share.</p>"
         }
       }
     },
@@ -540,18 +582,18 @@
       "members":{
         "Name":{
           "shape":"String",
-          "documentation":"<p>The name of the filter.</p>"
+          "documentation":"<p>Name of the filter.</p>"
         },
         "Condition":{
           "shape":"InventoryFilterCondition",
-          "documentation":"<p>The condition of the filter.</p>"
+          "documentation":"<p>Condition of the filter.</p>"
         },
         "Value":{
           "shape":"String",
           "documentation":"<p>Value of the filter.</p>"
         }
       },
-      "documentation":"<p>An inventory filter object.</p>"
+      "documentation":"<p>An inventory filter.</p>"
     },
     "InventoryFilterCondition":{
       "type":"string",
@@ -571,11 +613,11 @@
       "members":{
         "LicenseConfigurationId":{
           "shape":"String",
-          "documentation":"<p>Unique ID of the <code>LicenseConfiguration</code> object.</p>"
+          "documentation":"<p>Unique ID of the license configuration.</p>"
         },
         "LicenseConfigurationArn":{
           "shape":"String",
-          "documentation":"<p>ARN of the <code>LicenseConfiguration</code> object.</p>"
+          "documentation":"<p>Amazon Resource Name (ARN) of the license configuration.</p>"
         },
         "Name":{
           "shape":"String",
@@ -587,11 +629,11 @@
         },
         "LicenseCountingType":{
           "shape":"LicenseCountingType",
-          "documentation":"<p>Dimension to use to track license inventory.</p>"
+          "documentation":"<p>Dimension to use to track the license inventory.</p>"
         },
         "LicenseRules":{
           "shape":"StringList",
-          "documentation":"<p>Array of configured License Manager rules.</p>"
+          "documentation":"<p>License rules.</p>"
         },
         "LicenseCount":{
           "shape":"BoxLong",
@@ -599,7 +641,7 @@
         },
         "LicenseCountHardLimit":{
           "shape":"BoxBoolean",
-          "documentation":"<p>Sets the number of available licenses as a hard limit.</p>"
+          "documentation":"<p>Number of available licenses as a hard limit.</p>"
         },
         "ConsumedLicenses":{
           "shape":"BoxLong",
@@ -615,21 +657,29 @@
         },
         "ConsumedLicenseSummaryList":{
           "shape":"ConsumedLicenseSummaryList",
-          "documentation":"<p>List of summaries for licenses consumed by various resources.</p>"
+          "documentation":"<p>Summaries for licenses consumed by various resources.</p>"
         },
         "ManagedResourceSummaryList":{
           "shape":"ManagedResourceSummaryList",
-          "documentation":"<p>List of summaries for managed resources.</p>"
+          "documentation":"<p>Summaries for managed resources.</p>"
+        },
+        "ProductInformationList":{
+          "shape":"ProductInformationList",
+          "documentation":"<p>Product information.</p>"
+        },
+        "AutomatedDiscoveryInformation":{
+          "shape":"AutomatedDiscoveryInformation",
+          "documentation":"<p>Automated discovery information.</p>"
         }
       },
-      "documentation":"<p>A license configuration is an abstraction of a customer license agreement that can be consumed and enforced by License Manager. Components include specifications for the license type (licensing by instance, socket, CPU, or VCPU), tenancy (shared tenancy, Amazon EC2 Dedicated Instance, Amazon EC2 Dedicated Host, or any of these), host affinity (how long a VM must be associated with a host), the number of licenses purchased and used.</p>"
+      "documentation":"<p>A license configuration is an abstraction of a customer license agreement that can be consumed and enforced by License Manager. Components include specifications for the license type (licensing by instance, socket, CPU, or vCPU), allowed tenancy (shared tenancy, Dedicated Instance, Dedicated Host, or all of these), host affinity (how long a VM must be associated with a host), and the number of licenses purchased and used.</p>"
     },
     "LicenseConfigurationAssociation":{
       "type":"structure",
       "members":{
         "ResourceArn":{
           "shape":"String",
-          "documentation":"<p>ARN of the resource associated with the license configuration.</p>"
+          "documentation":"<p>Amazon Resource Name (ARN) of the resource.</p>"
         },
         "ResourceType":{
           "shape":"ResourceType",
@@ -644,7 +694,7 @@
           "documentation":"<p>Time when the license configuration was associated with the resource.</p>"
         }
       },
-      "documentation":"<p>Describes a server resource that is associated with a license configuration.</p>"
+      "documentation":"<p>Describes an association with a license configuration.</p>"
     },
     "LicenseConfigurationAssociations":{
       "type":"list",
@@ -662,30 +712,30 @@
       "members":{
         "ResourceArn":{
           "shape":"String",
-          "documentation":"<p>ARN of the resource associated with a license configuration.</p>"
+          "documentation":"<p>Amazon Resource Name (ARN) of the resource.</p>"
         },
         "ResourceType":{
           "shape":"ResourceType",
-          "documentation":"<p>Type of resource associated with athe license configuration.</p>"
+          "documentation":"<p>Type of resource.</p>"
         },
         "ResourceStatus":{
           "shape":"String",
-          "documentation":"<p>Status of a resource associated with the license configuration.</p>"
+          "documentation":"<p>Status of the resource.</p>"
         },
         "ResourceOwnerId":{
           "shape":"String",
-          "documentation":"<p>ID of the account that owns a resource that is associated with the license configuration.</p>"
+          "documentation":"<p>ID of the account that owns the resource.</p>"
         },
         "AssociationTime":{
           "shape":"DateTime",
-          "documentation":"<p>Time when the license configuration was initially associated with a resource.</p>"
+          "documentation":"<p>Time when the license configuration was initially associated with the resource.</p>"
         },
         "ConsumedLicenses":{
           "shape":"BoxLong",
-          "documentation":"<p>Number of licenses consumed out of the total provisioned in the license configuration.</p>"
+          "documentation":"<p>Number of licenses consumed by the resource.</p>"
         }
       },
-      "documentation":"<p>Contains details of the usage of each resource from the license pool.</p>"
+      "documentation":"<p>Details about the usage of a resource associated with a license configuration.</p>"
     },
     "LicenseConfigurationUsageList":{
       "type":"list",
@@ -704,16 +754,58 @@
         "Socket"
       ]
     },
+    "LicenseOperationFailure":{
+      "type":"structure",
+      "members":{
+        "ResourceArn":{
+          "shape":"String",
+          "documentation":"<p>Amazon Resource Name (ARN) of the resource.</p>"
+        },
+        "ResourceType":{
+          "shape":"ResourceType",
+          "documentation":"<p>Resource type.</p>"
+        },
+        "ErrorMessage":{
+          "shape":"String",
+          "documentation":"<p>Error message.</p>"
+        },
+        "FailureTime":{
+          "shape":"DateTime",
+          "documentation":"<p>Failure time.</p>"
+        },
+        "OperationName":{
+          "shape":"String",
+          "documentation":"<p>Name of the operation.</p>"
+        },
+        "ResourceOwnerId":{
+          "shape":"String",
+          "documentation":"<p>ID of the AWS account that owns the resource.</p>"
+        },
+        "OperationRequestedBy":{
+          "shape":"String",
+          "documentation":"<p>The requester is \"License Manager Automated Discovery\".</p>"
+        },
+        "MetadataList":{
+          "shape":"MetadataList",
+          "documentation":"<p>Reserved.</p>"
+        }
+      },
+      "documentation":"<p>Describes the failure of a license operation.</p>"
+    },
+    "LicenseOperationFailureList":{
+      "type":"list",
+      "member":{"shape":"LicenseOperationFailure"}
+    },
     "LicenseSpecification":{
       "type":"structure",
       "required":["LicenseConfigurationArn"],
       "members":{
         "LicenseConfigurationArn":{
           "shape":"String",
-          "documentation":"<p>ARN of the <code>LicenseConfiguration</code> object.</p>"
+          "documentation":"<p>Amazon Resource Name (ARN) of the license configuration.</p>"
         }
       },
-      "documentation":"<p>Object used for associating a license configuration with a resource.</p>"
+      "documentation":"<p>Details for associating a license configuration with a resource.</p>"
     },
     "LicenseSpecifications":{
       "type":"list",
@@ -733,11 +825,11 @@
       "members":{
         "LicenseConfigurationArn":{
           "shape":"String",
-          "documentation":"<p>ARN of a <code>LicenseConfiguration</code> object.</p>"
+          "documentation":"<p>Amazon Resource Name (ARN) of a license configuration.</p>"
         },
         "MaxResults":{
           "shape":"BoxInteger",
-          "documentation":"<p>Maximum number of results to return in a single call. To retrieve the remaining results, make another call with the returned <code>NextToken</code> value.</p>"
+          "documentation":"<p>Maximum number of results to return in a single call.</p>"
         },
         "NextToken":{
           "shape":"String",
@@ -750,7 +842,38 @@
       "members":{
         "LicenseConfigurationAssociations":{
           "shape":"LicenseConfigurationAssociations",
-          "documentation":"<p>Lists association objects for the license configuration, each containing the association time, number of consumed licenses, resource ARN, resource ID, account ID that owns the resource, resource size, and resource type.</p>"
+          "documentation":"<p>Information about the associations for the license configuration.</p>"
+        },
+        "NextToken":{
+          "shape":"String",
+          "documentation":"<p>Token for the next set of results.</p>"
+        }
+      }
+    },
+    "ListFailuresForLicenseConfigurationOperationsRequest":{
+      "type":"structure",
+      "required":["LicenseConfigurationArn"],
+      "members":{
+        "LicenseConfigurationArn":{
+          "shape":"String",
+          "documentation":"<p>Amazon Resource Name of the license configuration.</p>"
+        },
+        "MaxResults":{
+          "shape":"BoxInteger",
+          "documentation":"<p>Maximum number of results to return in a single call.</p>"
+        },
+        "NextToken":{
+          "shape":"String",
+          "documentation":"<p>Token for the next set of results.</p>"
+        }
+      }
+    },
+    "ListFailuresForLicenseConfigurationOperationsResponse":{
+      "type":"structure",
+      "members":{
+        "LicenseOperationFailureList":{
+          "shape":"LicenseOperationFailureList",
+          "documentation":"<p>License configuration operations that failed.</p>"
         },
         "NextToken":{
           "shape":"String",
@@ -763,11 +886,11 @@
       "members":{
         "LicenseConfigurationArns":{
           "shape":"StringList",
-          "documentation":"<p>An array of ARNs for the calling account’s license configurations.</p>"
+          "documentation":"<p>Amazon Resource Names (ARN) of the license configurations.</p>"
         },
         "MaxResults":{
           "shape":"BoxInteger",
-          "documentation":"<p>Maximum number of results to return in a single call. To retrieve the remaining results, make another call with the returned <code>NextToken</code> value.</p>"
+          "documentation":"<p>Maximum number of results to return in a single call.</p>"
         },
         "NextToken":{
           "shape":"String",
@@ -775,7 +898,7 @@
         },
         "Filters":{
           "shape":"Filters",
-          "documentation":"<p>One or more filters.</p>"
+          "documentation":"<p>Filters to scope the results. The following filters and logical operators are supported:</p> <ul> <li> <p> <code>licenseCountingType</code> - The dimension on which licenses are counted (vCPU). Logical operators are <code>EQUALS</code> | <code>NOT_EQUALS</code>.</p> </li> <li> <p> <code>enforceLicenseCount</code> - A Boolean value that indicates whether hard license enforcement is used. Logical operators are <code>EQUALS</code> | <code>NOT_EQUALS</code>.</p> </li> <li> <p> <code>usagelimitExceeded</code> - A Boolean value that indicates whether the available licenses have been exceeded. Logical operators are <code>EQUALS</code> | <code>NOT_EQUALS</code>.</p> </li> </ul>"
         }
       }
     },
@@ -784,7 +907,7 @@
       "members":{
         "LicenseConfigurations":{
           "shape":"LicenseConfigurations",
-          "documentation":"<p>Array of license configuration objects.</p>"
+          "documentation":"<p>Information about the license configurations.</p>"
         },
         "NextToken":{
           "shape":"String",
@@ -798,11 +921,11 @@
       "members":{
         "ResourceArn":{
           "shape":"String",
-          "documentation":"<p>ARN of an AMI or Amazon EC2 instance that has an associated license configuration.</p>"
+          "documentation":"<p>Amazon Resource Name (ARN) of a resource that has an associated license configuration.</p>"
         },
         "MaxResults":{
           "shape":"BoxInteger",
-          "documentation":"<p>Maximum number of results to return in a single call. To retrieve the remaining results, make another call with the returned <code>NextToken</code> value.</p>"
+          "documentation":"<p>Maximum number of results to return in a single call.</p>"
         },
         "NextToken":{
           "shape":"String",
@@ -828,7 +951,7 @@
       "members":{
         "MaxResults":{
           "shape":"BoxInteger",
-          "documentation":"<p>Maximum number of results to return in a single call. To retrieve the remaining results, make another call with the returned <code>NextToken</code> value.</p>"
+          "documentation":"<p>Maximum number of results to return in a single call.</p>"
         },
         "NextToken":{
           "shape":"String",
@@ -836,7 +959,7 @@
         },
         "Filters":{
           "shape":"InventoryFilterList",
-          "documentation":"<p>One or more filters.</p>"
+          "documentation":"<p>Filters to scope the results. The following filters and logical operators are supported:</p> <ul> <li> <p> <code>account_id</code> - The ID of the AWS account that owns the resource. Logical operators are <code>EQUALS</code> | <code>NOT_EQUALS</code>.</p> </li> <li> <p> <code>application_name</code> - The name of the application. Logical operators are <code>EQUALS</code> | <code>BEGINS_WITH</code>.</p> </li> <li> <p> <code>license_included</code> - The type of license included. Logical operators are <code>EQUALS</code> | <code>NOT_EQUALS</code>. Possible values are <code>sql-server-enterprise</code> | <code>sql-server-standard</code> | <code>sql-server-web</code> | <code>windows-server-datacenter</code>.</p> </li> <li> <p> <code>platform</code> - The platform of the resource. Logical operators are <code>EQUALS</code> | <code>BEGINS_WITH</code>.</p> </li> <li> <p> <code>resource_id</code> - The ID of the resource. Logical operators are <code>EQUALS</code> | <code>NOT_EQUALS</code>.</p> </li> </ul>"
         }
       }
     },
@@ -845,7 +968,7 @@
       "members":{
         "ResourceInventoryList":{
           "shape":"ResourceInventoryList",
-          "documentation":"<p>The detailed list of resources.</p>"
+          "documentation":"<p>Information about the resources.</p>"
         },
         "NextToken":{
           "shape":"String",
@@ -859,7 +982,7 @@
       "members":{
         "ResourceArn":{
           "shape":"String",
-          "documentation":"<p>ARN for the resource.</p>"
+          "documentation":"<p>Amazon Resource Name (ARN) of the license configuration.</p>"
         }
       }
     },
@@ -868,7 +991,7 @@
       "members":{
         "Tags":{
           "shape":"TagList",
-          "documentation":"<p>List of tags attached to the resource.</p>"
+          "documentation":"<p>Information about the tags.</p>"
         }
       }
     },
@@ -878,11 +1001,11 @@
       "members":{
         "LicenseConfigurationArn":{
           "shape":"String",
-          "documentation":"<p>ARN of the targeted <code>LicenseConfiguration</code> object.</p>"
+          "documentation":"<p>Amazon Resource Name (ARN) of the license configuration.</p>"
         },
         "MaxResults":{
           "shape":"BoxInteger",
-          "documentation":"<p>Maximum number of results to return in a single call. To retrieve the remaining results, make another call with the returned <code>NextToken</code> value.</p>"
+          "documentation":"<p>Maximum number of results to return in a single call.</p>"
         },
         "NextToken":{
           "shape":"String",
@@ -890,7 +1013,7 @@
         },
         "Filters":{
           "shape":"Filters",
-          "documentation":"<p>List of filters to apply.</p>"
+          "documentation":"<p>Filters to scope the results. The following filters and logical operators are supported:</p> <ul> <li> <p> <code>resourceArn</code> - The ARN of the license configuration resource. Logical operators are <code>EQUALS</code> | <code>NOT_EQUALS</code>.</p> </li> <li> <p> <code>resourceType</code> - The resource type (EC2_INSTANCE | EC2_HOST | EC2_AMI | SYSTEMS_MANAGER_MANAGED_INSTANCE). Logical operators are <code>EQUALS</code> | <code>NOT_EQUALS</code>.</p> </li> <li> <p> <code>resourceAccount</code> - The ID of the account that owns the resource. Logical operators are <code>EQUALS</code> | <code>NOT_EQUALS</code>.</p> </li> </ul>"
         }
       }
     },
@@ -899,7 +1022,7 @@
       "members":{
         "LicenseConfigurationUsageList":{
           "shape":"LicenseConfigurationUsageList",
-          "documentation":"<p>An array of <code>LicenseConfigurationUsage</code> objects.</p>"
+          "documentation":"<p>Information about the license configurations.</p>"
         },
         "NextToken":{
           "shape":"String",
@@ -912,30 +1035,97 @@
       "members":{
         "ResourceType":{
           "shape":"ResourceType",
-          "documentation":"<p>Type of resource associated with a license (instance, host, or AMI).</p>"
+          "documentation":"<p>Type of resource associated with a license.</p>"
         },
         "AssociationCount":{
           "shape":"BoxLong",
           "documentation":"<p>Number of resources associated with licenses.</p>"
         }
       },
-      "documentation":"<p>Summary for a resource.</p>"
+      "documentation":"<p>Summary information about a managed resource.</p>"
     },
     "ManagedResourceSummaryList":{
       "type":"list",
       "member":{"shape":"ManagedResourceSummary"}
     },
     "Message":{"type":"string"},
+    "Metadata":{
+      "type":"structure",
+      "members":{
+        "Name":{
+          "shape":"String",
+          "documentation":"<p>Reserved.</p>"
+        },
+        "Value":{
+          "shape":"String",
+          "documentation":"<p>Reserved.</p>"
+        }
+      },
+      "documentation":"<p>Reserved.</p>"
+    },
+    "MetadataList":{
+      "type":"list",
+      "member":{"shape":"Metadata"}
+    },
     "OrganizationConfiguration":{
       "type":"structure",
       "required":["EnableIntegration"],
       "members":{
         "EnableIntegration":{
           "shape":"Boolean",
-          "documentation":"<p>Flag to activate AWS Organization integration.</p>"
+          "documentation":"<p>Enables AWS Organization integration.</p>"
+        }
+      },
+      "documentation":"<p>Configuration information for AWS Organizations.</p>"
+    },
+    "ProductInformation":{
+      "type":"structure",
+      "required":[
+        "ResourceType",
+        "ProductInformationFilterList"
+      ],
+      "members":{
+        "ResourceType":{
+          "shape":"String",
+          "documentation":"<p>Resource type. The value is <code>SSM_MANAGED</code>.</p>"
+        },
+        "ProductInformationFilterList":{
+          "shape":"ProductInformationFilterList",
+          "documentation":"<p>Product information filters. The following filters and logical operators are supported:</p> <ul> <li> <p> <code>Application Name</code> - The name of the application. Logical operator is <code>EQUALS</code>.</p> </li> <li> <p> <code>Application Publisher</code> - The publisher of the application. Logical operator is <code>EQUALS</code>.</p> </li> <li> <p> <code>Application Version</code> - The version of the application. Logical operator is <code>EQUALS</code>.</p> </li> <li> <p> <code>Platform Name</code> - The name of the platform. Logical operator is <code>EQUALS</code>.</p> </li> <li> <p> <code>Platform Type</code> - The platform type. Logical operator is <code>EQUALS</code>.</p> </li> <li> <p> <code>License Included</code> - The type of license included. Logical operators are <code>EQUALS</code> and <code>NOT_EQUALS</code>. Possible values are <code>sql-server-enterprise</code> | <code>sql-server-standard</code> | <code>sql-server-web</code> | <code>windows-server-datacenter</code>.</p> </li> </ul>"
+        }
+      },
+      "documentation":"<p>Describes product information for a license configuration.</p>"
+    },
+    "ProductInformationFilter":{
+      "type":"structure",
+      "required":[
+        "ProductInformationFilterName",
+        "ProductInformationFilterValue",
+        "ProductInformationFilterComparator"
+      ],
+      "members":{
+        "ProductInformationFilterName":{
+          "shape":"String",
+          "documentation":"<p>Filter name.</p>"
+        },
+        "ProductInformationFilterValue":{
+          "shape":"StringList",
+          "documentation":"<p>Filter value.</p>"
+        },
+        "ProductInformationFilterComparator":{
+          "shape":"String",
+          "documentation":"<p>Logical operator.</p>"
         }
       },
-      "documentation":"<p>Object containing configuration information for AWS Organizations.</p>"
+      "documentation":"<p>Describes product information filters.</p>"
+    },
+    "ProductInformationFilterList":{
+      "type":"list",
+      "member":{"shape":"ProductInformationFilter"}
+    },
+    "ProductInformationList":{
+      "type":"list",
+      "member":{"shape":"ProductInformation"}
     },
     "RateLimitExceededException":{
       "type":"structure",
@@ -950,19 +1140,19 @@
       "members":{
         "ResourceId":{
           "shape":"String",
-          "documentation":"<p>Unique ID of the resource.</p>"
+          "documentation":"<p>ID of the resource.</p>"
         },
         "ResourceType":{
           "shape":"ResourceType",
-          "documentation":"<p>The type of resource.</p>"
+          "documentation":"<p>Type of resource.</p>"
         },
         "ResourceArn":{
           "shape":"String",
-          "documentation":"<p>The ARN of the resource.</p>"
+          "documentation":"<p>Amazon Resource Name (ARN) of the resource.</p>"
         },
         "Platform":{
           "shape":"String",
-          "documentation":"<p>The platform of the resource.</p>"
+          "documentation":"<p>Platform of the resource.</p>"
         },
         "PlatformVersion":{
           "shape":"String",
@@ -970,10 +1160,10 @@
         },
         "ResourceOwningAccountId":{
           "shape":"String",
-          "documentation":"<p>Unique ID of the account that owns the resource.</p>"
+          "documentation":"<p>ID of the account that owns the resource.</p>"
         }
       },
-      "documentation":"<p>A set of attributes that describe a resource.</p>"
+      "documentation":"<p>Details about a resource.</p>"
     },
     "ResourceInventoryList":{
       "type":"list",
@@ -992,7 +1182,9 @@
       "enum":[
         "EC2_INSTANCE",
         "EC2_HOST",
-        "EC2_AMI"
+        "EC2_AMI",
+        "RDS",
+        "SYSTEMS_MANAGER_MANAGED_INSTANCE"
       ]
     },
     "ServerInternalException":{
@@ -1014,14 +1206,14 @@
       "members":{
         "Key":{
           "shape":"String",
-          "documentation":"<p>Key for the resource tag.</p>"
+          "documentation":"<p>Tag key.</p>"
         },
         "Value":{
           "shape":"String",
-          "documentation":"<p>Value for the resource tag.</p>"
+          "documentation":"<p>Tag value.</p>"
         }
       },
-      "documentation":"<p>Tag for a resource in a key-value format.</p>"
+      "documentation":"<p>Details about a tag for a license configuration.</p>"
     },
     "TagKeyList":{
       "type":"list",
@@ -1040,11 +1232,11 @@
       "members":{
         "ResourceArn":{
           "shape":"String",
-          "documentation":"<p>Resource of the ARN to be tagged.</p>"
+          "documentation":"<p>Amazon Resource Name (ARN) of the license configuration.</p>"
         },
         "Tags":{
           "shape":"TagList",
-          "documentation":"<p>Names of the tags to attach to the resource.</p>"
+          "documentation":"<p>One or more tags.</p>"
         }
       }
     },
@@ -1062,11 +1254,11 @@
       "members":{
         "ResourceArn":{
           "shape":"String",
-          "documentation":"<p>ARN of the resource.</p>"
+          "documentation":"<p>Amazon Resource Name (ARN) of the license configuration.</p>"
         },
         "TagKeys":{
           "shape":"TagKeyList",
-          "documentation":"<p>List keys identifying tags to remove.</p>"
+          "documentation":"<p>Keys identifying the tags to remove.</p>"
         }
       }
     },
@@ -1081,15 +1273,15 @@
       "members":{
         "LicenseConfigurationArn":{
           "shape":"String",
-          "documentation":"<p>ARN for a license configuration.</p>"
+          "documentation":"<p>Amazon Resource Name (ARN) of the license configuration.</p>"
         },
         "LicenseConfigurationStatus":{
           "shape":"LicenseConfigurationStatus",
-          "documentation":"<p>New status of the license configuration (<code>ACTIVE</code> or <code>INACTIVE</code>).</p>"
+          "documentation":"<p>New status of the license configuration.</p>"
         },
         "LicenseRules":{
           "shape":"StringList",
-          "documentation":"<p>List of flexible text strings designating license rules.</p>"
+          "documentation":"<p>New license rules.</p>"
         },
         "LicenseCount":{
           "shape":"BoxLong",
@@ -1097,7 +1289,7 @@
         },
         "LicenseCountHardLimit":{
           "shape":"BoxBoolean",
-          "documentation":"<p>Sets the number of available licenses as a hard limit.</p>"
+          "documentation":"<p>New hard limit of the number of available licenses.</p>"
         },
         "Name":{
           "shape":"String",
@@ -1105,7 +1297,11 @@
         },
         "Description":{
           "shape":"String",
-          "documentation":"<p>New human-friendly description of the license configuration.</p>"
+          "documentation":"<p>New description of the license configuration.</p>"
+        },
+        "ProductInformationList":{
+          "shape":"ProductInformationList",
+          "documentation":"<p>New product information.</p>"
         }
       }
     },
@@ -1120,15 +1316,15 @@
       "members":{
         "ResourceArn":{
           "shape":"String",
-          "documentation":"<p>ARN for an AWS server resource.</p>"
+          "documentation":"<p>Amazon Resource Name (ARN) of the AWS resource.</p>"
         },
         "AddLicenseSpecifications":{
           "shape":"LicenseSpecifications",
-          "documentation":"<p>License configuration ARNs to be added to a resource.</p>"
+          "documentation":"<p>ARNs of the license configurations to add.</p>"
         },
         "RemoveLicenseSpecifications":{
           "shape":"LicenseSpecifications",
-          "documentation":"<p>License configuration ARNs to be removed from a resource.</p>"
+          "documentation":"<p>ARNs of the license configurations to remove.</p>"
         }
       }
     },
@@ -1142,15 +1338,15 @@
       "members":{
         "S3BucketArn":{
           "shape":"String",
-          "documentation":"<p>ARN of the Amazon S3 bucket where License Manager information is stored.</p>"
+          "documentation":"<p>Amazon Resource Name (ARN) of the Amazon S3 bucket where the License Manager information is stored.</p>"
         },
         "SnsTopicArn":{
           "shape":"String",
-          "documentation":"<p>ARN of the Amazon SNS topic used for License Manager alerts.</p>"
+          "documentation":"<p>Amazon Resource Name (ARN) of the Amazon SNS topic used for License Manager alerts.</p>"
         },
         "OrganizationConfiguration":{
           "shape":"OrganizationConfiguration",
-          "documentation":"<p>Integrates AWS Organizations with License Manager for cross-account discovery.</p>"
+          "documentation":"<p>Enables integration with AWS Organizations for cross-account discovery.</p>"
         },
         "EnableCrossAccountsDiscovery":{
           "shape":"BoxBoolean",
@@ -1164,5 +1360,5 @@
       }
     }
   },
-  "documentation":"<fullname> AWS License Manager </fullname> <p> <i>This is the AWS License Manager API Reference.</i> It provides descriptions, syntax, and usage examples for each of the actions and data types for License Manager. The topic for each action shows the Query API request parameters and the XML response. You can also view the XML request elements in the WSDL. </p> <p> Alternatively, you can use one of the AWS SDKs to access an API that's tailored to the programming language or platform that you're using. For more information, see <a href=\"http://aws.amazon.com/tools/#SDKs\">AWS SDKs</a>. </p>"
+  "documentation":"<fullname> AWS License Manager </fullname> <p>AWS License Manager makes it easier to manage licenses from software vendors across multiple AWS accounts and on-premises servers.</p>"
 }
diff --git a/services/lightsail/build.properties b/services/lightsail/build.properties
index ecf2dae6fcb1..15ec2da1fc71 100644
--- a/services/lightsail/build.properties
+++ b/services/lightsail/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/lightsail/pom.xml b/services/lightsail/pom.xml
index 0d4c4720c324..29a38f90bf7e 100644
--- a/services/lightsail/pom.xml
+++ b/services/lightsail/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>lightsail</artifactId>
     <name>AWS Java SDK :: Services :: Amazon Lightsail</name>
diff --git a/services/lightsail/src/main/resources/codegen-resources/service-2.json b/services/lightsail/src/main/resources/codegen-resources/service-2.json
index b0fa574922d1..3e8396af5806 100644
--- a/services/lightsail/src/main/resources/codegen-resources/service-2.json
+++ b/services/lightsail/src/main/resources/codegen-resources/service-2.json
@@ -86,7 +86,7 @@
         {"shape":"AccountSetupInProgressException"},
         {"shape":"UnauthenticatedException"}
       ],
-      "documentation":"<p>Attaches a Transport Layer Security (TLS) certificate to your load balancer. TLS is just an updated, more secure version of Secure Socket Layer (SSL).</p> <p>Once you create and validate your certificate, you can attach it to your load balancer. You can also use this API to rotate the certificates on your account. Use the <code>attach load balancer tls certificate</code> operation with the non-attached certificate, and it will replace the existing one and become the attached certificate.</p> <p>The <code>attach load balancer tls certificate</code> operation supports tag-based access control via resource tags applied to the resource identified by <code>load balancer name</code>. For more information, see the <a href=\"https://lightsail.aws.amazon.com/ls/docs/en/articles/amazon-lightsail-controlling-access-using-tags\">Lightsail Dev Guide</a>.</p>"
+      "documentation":"<p>Attaches a Transport Layer Security (TLS) certificate to your load balancer. TLS is just an updated, more secure version of Secure Socket Layer (SSL).</p> <p>Once you create and validate your certificate, you can attach it to your load balancer. You can also use this API to rotate the certificates on your account. Use the <code>AttachLoadBalancerTlsCertificate</code> action with the non-attached certificate, and it will replace the existing one and become the attached certificate.</p> <p>The <code>AttachLoadBalancerTlsCertificate</code> operation supports tag-based access control via resource tags applied to the resource identified by <code>load balancer name</code>. For more information, see the <a href=\"https://lightsail.aws.amazon.com/ls/docs/en/articles/amazon-lightsail-controlling-access-using-tags\">Lightsail Dev Guide</a>.</p>"
     },
     "AttachStaticIp":{
       "name":"AttachStaticIp",
@@ -143,7 +143,7 @@
         {"shape":"AccountSetupInProgressException"},
         {"shape":"UnauthenticatedException"}
       ],
-      "documentation":"<p>Copies a manual instance or disk snapshot as another manual snapshot, or copies an automatic instance or disk snapshot as a manual snapshot. This operation can also be used to copy a manual or automatic snapshot of an instance or a disk from one AWS Region to another in Amazon Lightsail.</p> <p>When copying a <i>manual snapshot</i>, be sure to define the <code>source region</code>, <code>source snapshot name</code>, and <code>target snapshot name</code> parameters.</p> <p>When copying an <i>automatic snapshot</i>, be sure to define the <code>source region</code>, <code>source resource name</code>, <code>target snapshot name</code>, and either the <code>restore date</code> or the <code>use latest restorable auto snapshot</code> parameters.</p> <note> <p>Database snapshots cannot be copied at this time.</p> </note>"
+      "documentation":"<p>Copies a manual snapshot of an instance or disk as another manual snapshot, or copies an automatic snapshot of an instance or disk as a manual snapshot. This operation can also be used to copy a manual or automatic snapshot of an instance or a disk from one AWS Region to another in Amazon Lightsail.</p> <p>When copying a <i>manual snapshot</i>, be sure to define the <code>source region</code>, <code>source snapshot name</code>, and <code>target snapshot name</code> parameters.</p> <p>When copying an <i>automatic snapshot</i>, be sure to define the <code>source region</code>, <code>source resource name</code>, <code>target snapshot name</code>, and either the <code>restore date</code> or the <code>use latest restorable auto snapshot</code> parameters.</p>"
     },
     "CreateCloudFormationStack":{
       "name":"CreateCloudFormationStack",
@@ -164,6 +164,24 @@
       ],
       "documentation":"<p>Creates an AWS CloudFormation stack, which creates a new Amazon EC2 instance from an exported Amazon Lightsail snapshot. This operation results in a CloudFormation stack record that can be used to track the AWS CloudFormation stack created. Use the <code>get cloud formation stack records</code> operation to get a list of the CloudFormation stacks created.</p> <important> <p>Wait until after your new Amazon EC2 instance is created before running the <code>create cloud formation stack</code> operation again with the same export snapshot record.</p> </important>"
     },
+    "CreateContactMethod":{
+      "name":"CreateContactMethod",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"CreateContactMethodRequest"},
+      "output":{"shape":"CreateContactMethodResult"},
+      "errors":[
+        {"shape":"ServiceException"},
+        {"shape":"InvalidInputException"},
+        {"shape":"NotFoundException"},
+        {"shape":"OperationFailureException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"UnauthenticatedException"}
+      ],
+      "documentation":"<p>Creates an email or SMS text message contact method.</p> <p>A contact method is used to send you notifications about your Amazon Lightsail resources. You can add one email address and one mobile phone number contact method in each AWS Region. However, SMS text messaging is not supported in some AWS Regions, and SMS text messages cannot be sent to some countries/regions. For more information, see <a href=\"https://lightsail.aws.amazon.com/ls/docs/en_us/articles/amazon-lightsail-notifications\">Notifications in Amazon Lightsail</a>.</p>"
+    },
     "CreateDisk":{
       "name":"CreateDisk",
       "http":{
@@ -371,7 +389,7 @@
         {"shape":"AccountSetupInProgressException"},
         {"shape":"UnauthenticatedException"}
       ],
-      "documentation":"<p>Creates a Lightsail load balancer TLS certificate.</p> <p>TLS is just an updated, more secure version of Secure Socket Layer (SSL).</p> <p>The <code>create load balancer tls certificate</code> operation supports tag-based access control via resource tags applied to the resource identified by <code>load balancer name</code>. For more information, see the <a href=\"https://lightsail.aws.amazon.com/ls/docs/en/articles/amazon-lightsail-controlling-access-using-tags\">Lightsail Dev Guide</a>.</p>"
+      "documentation":"<p>Creates a Lightsail load balancer TLS certificate.</p> <p>TLS is just an updated, more secure version of Secure Socket Layer (SSL).</p> <p>The <code>CreateLoadBalancerTlsCertificate</code> operation supports tag-based access control via resource tags applied to the resource identified by <code>load balancer name</code>. For more information, see the <a href=\"https://lightsail.aws.amazon.com/ls/docs/en/articles/amazon-lightsail-controlling-access-using-tags\">Lightsail Dev Guide</a>.</p>"
     },
     "CreateRelationalDatabase":{
       "name":"CreateRelationalDatabase",
@@ -430,6 +448,24 @@
       ],
       "documentation":"<p>Creates a snapshot of your database in Amazon Lightsail. You can use snapshots for backups, to make copies of a database, and to save data before deleting a database.</p> <p>The <code>create relational database snapshot</code> operation supports tag-based access control via request tags. For more information, see the <a href=\"https://lightsail.aws.amazon.com/ls/docs/en/articles/amazon-lightsail-controlling-access-using-tags\">Lightsail Dev Guide</a>.</p>"
     },
+    "DeleteAlarm":{
+      "name":"DeleteAlarm",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DeleteAlarmRequest"},
+      "output":{"shape":"DeleteAlarmResult"},
+      "errors":[
+        {"shape":"ServiceException"},
+        {"shape":"InvalidInputException"},
+        {"shape":"OperationFailureException"},
+        {"shape":"UnauthenticatedException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"NotFoundException"}
+      ],
+      "documentation":"<p>Deletes an alarm.</p> <p>An alarm is used to monitor a single metric for one of your resources. When a metric condition is met, the alarm can notify you by email, SMS text message, and a banner displayed on the Amazon Lightsail console. For more information, see <a href=\"https://lightsail.aws.amazon.com/ls/docs/en_us/articles/amazon-lightsail-alarms\">Alarms in Amazon Lightsail</a>.</p>"
+    },
     "DeleteAutoSnapshot":{
       "name":"DeleteAutoSnapshot",
       "http":{
@@ -446,7 +482,25 @@
         {"shape":"AccessDeniedException"},
         {"shape":"UnauthenticatedException"}
       ],
-      "documentation":"<p>Deletes an automatic snapshot for an instance or disk.</p>"
+      "documentation":"<p>Deletes an automatic snapshot of an instance or disk. For more information, see the <a href=\"https://lightsail.aws.amazon.com/ls/docs/en_us/articles/amazon-lightsail-configuring-automatic-snapshots\">Lightsail Dev Guide</a>.</p>"
+    },
+    "DeleteContactMethod":{
+      "name":"DeleteContactMethod",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DeleteContactMethodRequest"},
+      "output":{"shape":"DeleteContactMethodResult"},
+      "errors":[
+        {"shape":"ServiceException"},
+        {"shape":"InvalidInputException"},
+        {"shape":"OperationFailureException"},
+        {"shape":"UnauthenticatedException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"NotFoundException"}
+      ],
+      "documentation":"<p>Deletes a contact method.</p> <p>A contact method is used to send you notifications about your Amazon Lightsail resources. You can add one email address and one mobile phone number contact method in each AWS Region. However, SMS text messaging is not supported in some AWS Regions, and SMS text messages cannot be sent to some countries/regions. For more information, see <a href=\"https://lightsail.aws.amazon.com/ls/docs/en_us/articles/amazon-lightsail-notifications\">Notifications in Amazon Lightsail</a>.</p>"
     },
     "DeleteDisk":{
       "name":"DeleteDisk",
@@ -636,7 +690,7 @@
         {"shape":"AccountSetupInProgressException"},
         {"shape":"UnauthenticatedException"}
       ],
-      "documentation":"<p>Deletes an SSL/TLS certificate associated with a Lightsail load balancer.</p> <p>The <code>delete load balancer tls certificate</code> operation supports tag-based access control via resource tags applied to the resource identified by <code>load balancer name</code>. For more information, see the <a href=\"https://lightsail.aws.amazon.com/ls/docs/en/articles/amazon-lightsail-controlling-access-using-tags\">Lightsail Dev Guide</a>.</p>"
+      "documentation":"<p>Deletes an SSL/TLS certificate associated with a Lightsail load balancer.</p> <p>The <code>DeleteLoadBalancerTlsCertificate</code> operation supports tag-based access control via resource tags applied to the resource identified by <code>load balancer name</code>. For more information, see the <a href=\"https://lightsail.aws.amazon.com/ls/docs/en/articles/amazon-lightsail-controlling-access-using-tags\">Lightsail Dev Guide</a>.</p>"
     },
     "DeleteRelationalDatabase":{
       "name":"DeleteRelationalDatabase",
@@ -826,6 +880,24 @@
       ],
       "documentation":"<p>Returns the names of all active (not deleted) resources.</p>"
     },
+    "GetAlarms":{
+      "name":"GetAlarms",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"GetAlarmsRequest"},
+      "output":{"shape":"GetAlarmsResult"},
+      "errors":[
+        {"shape":"ServiceException"},
+        {"shape":"InvalidInputException"},
+        {"shape":"OperationFailureException"},
+        {"shape":"UnauthenticatedException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"NotFoundException"}
+      ],
+      "documentation":"<p>Returns information about the configured alarms. Specify an alarm name in your request to return information about a specific alarm, or specify a monitored resource name to return information about all alarms for a specific resource.</p> <p>An alarm is used to monitor a single metric for one of your resources. When a metric condition is met, the alarm can notify you by email, SMS text message, and a banner displayed on the Amazon Lightsail console. For more information, see <a href=\"https://lightsail.aws.amazon.com/ls/docs/en_us/articles/amazon-lightsail-alarms\">Alarms in Amazon Lightsail</a>.</p>"
+    },
     "GetAutoSnapshots":{
       "name":"GetAutoSnapshots",
       "http":{
@@ -842,7 +914,7 @@
         {"shape":"AccessDeniedException"},
         {"shape":"UnauthenticatedException"}
       ],
-      "documentation":"<p>Returns the available automatic snapshots for the specified resource name. For more information, see the <a href=\"https://lightsail.aws.amazon.com/ls/docs/en_us/articles/amazon-lightsail-configuring-automatic-snapshots\">Lightsail Dev Guide</a>.</p>"
+      "documentation":"<p>Returns the available automatic snapshots for an instance or disk. For more information, see the <a href=\"https://lightsail.aws.amazon.com/ls/docs/en_us/articles/amazon-lightsail-configuring-automatic-snapshots\">Lightsail Dev Guide</a>.</p>"
     },
     "GetBlueprints":{
       "name":"GetBlueprints",
@@ -901,6 +973,24 @@
       ],
       "documentation":"<p>Returns the CloudFormation stack record created as a result of the <code>create cloud formation stack</code> operation.</p> <p>An AWS CloudFormation stack is used to create a new Amazon EC2 instance from an exported Lightsail snapshot.</p>"
     },
+    "GetContactMethods":{
+      "name":"GetContactMethods",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"GetContactMethodsRequest"},
+      "output":{"shape":"GetContactMethodsResult"},
+      "errors":[
+        {"shape":"ServiceException"},
+        {"shape":"InvalidInputException"},
+        {"shape":"NotFoundException"},
+        {"shape":"OperationFailureException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"UnauthenticatedException"}
+      ],
+      "documentation":"<p>Returns information about the configured contact methods. Specify a protocol in your request to return information about a specific contact method.</p> <p>A contact method is used to send you notifications about your Amazon Lightsail resources. You can add one email address and one mobile phone number contact method in each AWS Region. However, SMS text messaging is not supported in some AWS Regions, and SMS text messages cannot be sent to some countries/regions. For more information, see <a href=\"https://lightsail.aws.amazon.com/ls/docs/en_us/articles/amazon-lightsail-notifications\">Notifications in Amazon Lightsail</a>.</p>"
+    },
     "GetDisk":{
       "name":"GetDisk",
       "http":{
@@ -956,7 +1046,7 @@
         {"shape":"AccountSetupInProgressException"},
         {"shape":"UnauthenticatedException"}
       ],
-      "documentation":"<p>Returns information about all block storage disk snapshots in your AWS account and region.</p> <p>If you are describing a long list of disk snapshots, you can paginate the output to make the list more manageable. You can use the pageToken and nextPageToken values to retrieve the next items in the list.</p>"
+      "documentation":"<p>Returns information about all block storage disk snapshots in your AWS account and region.</p>"
     },
     "GetDisks":{
       "name":"GetDisks",
@@ -975,7 +1065,7 @@
         {"shape":"AccountSetupInProgressException"},
         {"shape":"UnauthenticatedException"}
       ],
-      "documentation":"<p>Returns information about all block storage disks in your AWS account and region.</p> <p>If you are describing a long list of disks, you can paginate the output to make the list more manageable. You can use the pageToken and nextPageToken values to retrieve the next items in the list.</p>"
+      "documentation":"<p>Returns information about all block storage disks in your AWS account and region.</p>"
     },
     "GetDomain":{
       "name":"GetDomain",
@@ -1298,7 +1388,7 @@
         {"shape":"AccountSetupInProgressException"},
         {"shape":"UnauthenticatedException"}
       ],
-      "documentation":"<p>Returns information about all load balancers in an account.</p> <p>If you are describing a long list of load balancers, you can paginate the output to make the list more manageable. You can use the pageToken and nextPageToken values to retrieve the next items in the list.</p>"
+      "documentation":"<p>Returns information about all load balancers in an account.</p>"
     },
     "GetOperation":{
       "name":"GetOperation",
@@ -1718,6 +1808,24 @@
       ],
       "documentation":"<p>Tries to peer the Lightsail VPC with the user's default VPC.</p>"
     },
+    "PutAlarm":{
+      "name":"PutAlarm",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"PutAlarmRequest"},
+      "output":{"shape":"PutAlarmResult"},
+      "errors":[
+        {"shape":"ServiceException"},
+        {"shape":"InvalidInputException"},
+        {"shape":"OperationFailureException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"UnauthenticatedException"},
+        {"shape":"NotFoundException"}
+      ],
+      "documentation":"<p>Creates or updates an alarm, and associates it with the specified metric.</p> <p>An alarm is used to monitor a single metric for one of your resources. When a metric condition is met, the alarm can notify you by email, SMS text message, and a banner displayed on the Amazon Lightsail console. For more information, see <a href=\"https://lightsail.aws.amazon.com/ls/docs/en_us/articles/amazon-lightsail-alarms\">Alarms in Amazon Lightsail</a>.</p> <p>When this action creates an alarm, the alarm state is immediately set to <code>INSUFFICIENT_DATA</code>. The alarm is then evaluated and its state is set appropriately. Any actions associated with the new state are then executed.</p> <p>When you update an existing alarm, its state is left unchanged, but the update completely overwrites the previous configuration of the alarm. The alarm is then evaluated with the updated configuration.</p>"
+    },
     "PutInstancePublicPorts":{
       "name":"PutInstancePublicPorts",
       "http":{
@@ -1794,6 +1902,24 @@
       ],
       "documentation":"<p>Deletes a specific static IP from your account.</p>"
     },
+    "SendContactMethodVerification":{
+      "name":"SendContactMethodVerification",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"SendContactMethodVerificationRequest"},
+      "output":{"shape":"SendContactMethodVerificationResult"},
+      "errors":[
+        {"shape":"ServiceException"},
+        {"shape":"InvalidInputException"},
+        {"shape":"OperationFailureException"},
+        {"shape":"UnauthenticatedException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"NotFoundException"}
+      ],
+      "documentation":"<p>Sends a verification request to an email contact method to ensure it’s owned by the requester. SMS contact methods don’t need to be verified.</p> <p>A contact method is used to send you notifications about your Amazon Lightsail resources. You can add one email address and one mobile phone number contact method in each AWS Region. However, SMS text messaging is not supported in some AWS Regions, and SMS text messages cannot be sent to some countries/regions. For more information, see <a href=\"https://lightsail.aws.amazon.com/ls/docs/en_us/articles/amazon-lightsail-notifications\">Notifications in Amazon Lightsail</a>.</p> <p>A verification request is sent to the contact method when you initially create it. Use this action to send another verification request if a previous verification request was deleted, or has expired.</p> <important> <p>Notifications are not sent to an email contact method until after it is verified, and confirmed as valid.</p> </important>"
+    },
     "StartInstance":{
       "name":"StartInstance",
       "http":{
@@ -1889,6 +2015,24 @@
       ],
       "documentation":"<p>Adds one or more tags to the specified Amazon Lightsail resource. Each resource can have a maximum of 50 tags. Each tag consists of a key and an optional value. Tag keys must be unique per resource. For more information about tags, see the <a href=\"https://lightsail.aws.amazon.com/ls/docs/en/articles/amazon-lightsail-tags\">Lightsail Dev Guide</a>.</p> <p>The <code>tag resource</code> operation supports tag-based access control via request tags and resource tags applied to the resource identified by <code>resource name</code>. For more information, see the <a href=\"https://lightsail.aws.amazon.com/ls/docs/en/articles/amazon-lightsail-controlling-access-using-tags\">Lightsail Dev Guide</a>.</p>"
     },
+    "TestAlarm":{
+      "name":"TestAlarm",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"TestAlarmRequest"},
+      "output":{"shape":"TestAlarmResult"},
+      "errors":[
+        {"shape":"ServiceException"},
+        {"shape":"InvalidInputException"},
+        {"shape":"OperationFailureException"},
+        {"shape":"UnauthenticatedException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"NotFoundException"}
+      ],
+      "documentation":"<p>Tests an alarm by displaying a banner on the Amazon Lightsail console. If a notification trigger is configured for the specified alarm, the test also sends a notification to the notification protocol (<code>Email</code> and/or <code>SMS</code>) configured for the alarm.</p> <p>An alarm is used to monitor a single metric for one of your resources. When a metric condition is met, the alarm can notify you by email, SMS text message, and a banner displayed on the Amazon Lightsail console. For more information, see <a href=\"https://lightsail.aws.amazon.com/ls/docs/en_us/articles/amazon-lightsail-alarms\">Alarms in Amazon Lightsail</a>.</p>"
+    },
     "UnpeerVpc":{
       "name":"UnpeerVpc",
       "http":{
@@ -2001,7 +2145,7 @@
         {"shape":"AccountSetupInProgressException"},
         {"shape":"UnauthenticatedException"}
       ],
-      "documentation":"<p>Allows the update of one or more parameters of a database in Amazon Lightsail.</p> <p>Parameter updates don't cause outages; therefore, their application is not subject to the preferred maintenance window. However, there are two ways in which paramater updates are applied: <code>dynamic</code> or <code>pending-reboot</code>. Parameters marked with a <code>dynamic</code> apply type are applied immediately. Parameters marked with a <code>pending-reboot</code> apply type are applied only after the database is rebooted using the <code>reboot relational database</code> operation.</p> <p>The <code>update relational database parameters</code> operation supports tag-based access control via resource tags applied to the resource identified by relationalDatabaseName. For more information, see the <a href=\"https://lightsail.aws.amazon.com/ls/docs/en/articles/amazon-lightsail-controlling-access-using-tags\">Lightsail Dev Guide</a>.</p>"
+      "documentation":"<p>Allows the update of one or more parameters of a database in Amazon Lightsail.</p> <p>Parameter updates don't cause outages; therefore, their application is not subject to the preferred maintenance window. However, there are two ways in which parameter updates are applied: <code>dynamic</code> or <code>pending-reboot</code>. Parameters marked with a <code>dynamic</code> apply type are applied immediately. Parameters marked with a <code>pending-reboot</code> apply type are applied only after the database is rebooted using the <code>reboot relational database</code> operation.</p> <p>The <code>update relational database parameters</code> operation supports tag-based access control via resource tags applied to the resource identified by relationalDatabaseName. For more information, see the <a href=\"https://lightsail.aws.amazon.com/ls/docs/en/articles/amazon-lightsail-controlling-access-using-tags\">Lightsail Dev Guide</a>.</p>"
     }
   },
   "shapes":{
@@ -2083,6 +2227,104 @@
       "type":"string",
       "enum":["AutoSnapshot"]
     },
+    "Alarm":{
+      "type":"structure",
+      "members":{
+        "name":{
+          "shape":"ResourceName",
+          "documentation":"<p>The name of the alarm.</p>"
+        },
+        "arn":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the alarm.</p>"
+        },
+        "createdAt":{
+          "shape":"IsoDate",
+          "documentation":"<p>The timestamp when the alarm was created.</p>"
+        },
+        "location":{
+          "shape":"ResourceLocation",
+          "documentation":"<p>An object that lists information about the location of the alarm.</p>"
+        },
+        "resourceType":{
+          "shape":"ResourceType",
+          "documentation":"<p>The Lightsail resource type (e.g., <code>Alarm</code>).</p>"
+        },
+        "supportCode":{
+          "shape":"string",
+          "documentation":"<p>The support code. Include this code in your email to support when you have questions about your Lightsail alarm. This code enables our support team to look up your Lightsail information more easily.</p>"
+        },
+        "monitoredResourceInfo":{
+          "shape":"MonitoredResourceInfo",
+          "documentation":"<p>An object that lists information about the resource monitored by the alarm.</p>"
+        },
+        "comparisonOperator":{
+          "shape":"ComparisonOperator",
+          "documentation":"<p>The arithmetic operation used when comparing the specified statistic and threshold.</p>"
+        },
+        "evaluationPeriods":{
+          "shape":"integer",
+          "documentation":"<p>The number of periods over which data is compared to the specified threshold.</p>"
+        },
+        "period":{
+          "shape":"MetricPeriod",
+          "documentation":"<p>The period, in seconds, over which the statistic is applied.</p>"
+        },
+        "threshold":{
+          "shape":"double",
+          "documentation":"<p>The value against which the specified statistic is compared.</p>"
+        },
+        "datapointsToAlarm":{
+          "shape":"integer",
+          "documentation":"<p>The number of data points that must not within the specified threshold to trigger the alarm.</p>"
+        },
+        "treatMissingData":{
+          "shape":"TreatMissingData",
+          "documentation":"<p>Specifies how the alarm handles missing data points.</p> <p>An alarm can treat missing data in the following ways:</p> <ul> <li> <p> <code>breaching</code> — Assume the missing data is not within the threshold. Missing data counts towards the number of times the metric is not within the threshold.</p> </li> <li> <p> <code>notBreaching</code> — Assume the missing data is within the threshold. Missing data does not count towards the number of times the metric is not within the threshold.</p> </li> <li> <p> <code>ignore</code> — Ignore the missing data. Maintains the current alarm state.</p> </li> <li> <p> <code>missing</code> — Missing data is treated as missing.</p> </li> </ul>"
+        },
+        "statistic":{
+          "shape":"MetricStatistic",
+          "documentation":"<p>The statistic for the metric associated with the alarm.</p> <p>The following statistics are available:</p> <ul> <li> <p> <code>Minimum</code> — The lowest value observed during the specified period. Use this value to determine low volumes of activity for your application.</p> </li> <li> <p> <code>Maximum</code> — The highest value observed during the specified period. Use this value to determine high volumes of activity for your application.</p> </li> <li> <p> <code>Sum</code> — All values submitted for the matching metric added together. You can use this statistic to determine the total volume of a metric.</p> </li> <li> <p> <code>Average</code> — The value of Sum / SampleCount during the specified period. By comparing this statistic with the Minimum and Maximum values, you can determine the full scope of a metric and how close the average use is to the Minimum and Maximum values. This comparison helps you to know when to increase or decrease your resources.</p> </li> <li> <p> <code>SampleCount</code> — The count, or number, of data points used for the statistical calculation.</p> </li> </ul>"
+        },
+        "metricName":{
+          "shape":"MetricName",
+          "documentation":"<p>The name of the metric associated with the alarm.</p>"
+        },
+        "state":{
+          "shape":"AlarmState",
+          "documentation":"<p>The current state of the alarm.</p> <p>An alarm has the following possible states:</p> <ul> <li> <p> <code>ALARM</code> — The metric is outside of the defined threshold.</p> </li> <li> <p> <code>INSUFFICIENT_DATA</code> — The alarm has just started, the metric is not available, or not enough data is available for the metric to determine the alarm state.</p> </li> <li> <p> <code>OK</code> — The metric is within the defined threshold.</p> </li> </ul>"
+        },
+        "unit":{
+          "shape":"MetricUnit",
+          "documentation":"<p>The unit of the metric associated with the alarm.</p>"
+        },
+        "contactProtocols":{
+          "shape":"ContactProtocolsList",
+          "documentation":"<p>The contact protocols for the alarm, such as <code>Email</code>, <code>SMS</code> (text messaging), or both.</p>"
+        },
+        "notificationTriggers":{
+          "shape":"NotificationTriggerList",
+          "documentation":"<p>The alarm states that trigger a notification.</p>"
+        },
+        "notificationEnabled":{
+          "shape":"boolean",
+          "documentation":"<p>Indicates whether the alarm is enabled.</p>"
+        }
+      },
+      "documentation":"<p>Describes an alarm.</p> <p>An alarm is a way to monitor your Amazon Lightsail resource metrics. For more information, see <a href=\"https://lightsail.aws.amazon.com/ls/docs/en_us/articles/amazon-lightsail-alarms\">Alarms in Amazon Lightsail</a>.</p>"
+    },
+    "AlarmState":{
+      "type":"string",
+      "enum":[
+        "OK",
+        "ALARM",
+        "INSUFFICIENT_DATA"
+      ]
+    },
+    "AlarmsList":{
+      "type":"list",
+      "member":{"shape":"Alarm"}
+    },
     "AllocateStaticIpRequest":{
       "type":"structure",
       "required":["staticIpName"],
@@ -2098,7 +2340,7 @@
       "members":{
         "operations":{
           "shape":"OperationList",
-          "documentation":"<p>An array of key-value pairs containing information about the static IP address you allocated.</p>"
+          "documentation":"<p>An array of objects that describe the result of the action, such as the status of the request, the time stamp of the request, and the resources affected by the request.</p>"
         }
       }
     },
@@ -2129,7 +2371,7 @@
       "members":{
         "operations":{
           "shape":"OperationList",
-          "documentation":"<p>An object describing the API operations.</p>"
+          "documentation":"<p>An array of objects that describe the result of the action, such as the status of the request, the time stamp of the request, and the resources affected by the request.</p>"
         }
       }
     },
@@ -2155,7 +2397,7 @@
       "members":{
         "operations":{
           "shape":"OperationList",
-          "documentation":"<p>An object representing the API operations.</p>"
+          "documentation":"<p>An array of objects that describe the result of the action, such as the status of the request, the time stamp of the request, and the resources affected by the request.</p>"
         }
       }
     },
@@ -2181,7 +2423,7 @@
       "members":{
         "operations":{
           "shape":"OperationList",
-          "documentation":"<p>An object representing the API operations.</p> <p>These SSL/TLS certificates are only usable by Lightsail load balancers. You can't get the certificate and use it for another purpose.</p>"
+          "documentation":"<p>An array of objects that describe the result of the action, such as the status of the request, the time stamp of the request, and the resources affected by the request.</p> <p>These SSL/TLS certificates are only usable by Lightsail load balancers. You can't get the certificate and use it for another purpose.</p>"
         }
       }
     },
@@ -2207,7 +2449,7 @@
       "members":{
         "operations":{
           "shape":"OperationList",
-          "documentation":"<p>An array of key-value pairs containing information about your API operations.</p>"
+          "documentation":"<p>An array of objects that describe the result of the action, such as the status of the request, the time stamp of the request, and the resources affected by the request.</p>"
         }
       }
     },
@@ -2443,7 +2685,7 @@
       "members":{
         "operation":{
           "shape":"Operation",
-          "documentation":"<p>An array of key-value pairs that contains information about the operation.</p>"
+          "documentation":"<p>An array of objects that describe the result of the action, such as the status of the request, the time stamp of the request, and the resources affected by the request.</p>"
         }
       }
     },
@@ -2515,6 +2757,81 @@
       "type":"string",
       "enum":["ExportSnapshotRecord"]
     },
+    "ComparisonOperator":{
+      "type":"string",
+      "enum":[
+        "GreaterThanOrEqualToThreshold",
+        "GreaterThanThreshold",
+        "LessThanThreshold",
+        "LessThanOrEqualToThreshold"
+      ]
+    },
+    "ContactMethod":{
+      "type":"structure",
+      "members":{
+        "contactEndpoint":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The destination of the contact method, such as an email address or a mobile phone number.</p>"
+        },
+        "status":{
+          "shape":"ContactMethodStatus",
+          "documentation":"<p>The current status of the contact method.</p> <p>A contact method has the following possible status:</p> <ul> <li> <p> <code>PendingVerification</code> — The contact method has not yet been verified, and the verification has not yet expired.</p> </li> <li> <p> <code>Valid</code> — The contact method has been verified.</p> </li> <li> <p> <code>InValid</code> — An attempt was made to verify the contact method, but the verification has expired.</p> </li> </ul>"
+        },
+        "protocol":{
+          "shape":"ContactProtocol",
+          "documentation":"<p>The protocol of the contact method, such as email or SMS (text messaging).</p>"
+        },
+        "name":{
+          "shape":"ResourceName",
+          "documentation":"<p>The name of the contact method.</p>"
+        },
+        "arn":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the contact method.</p>"
+        },
+        "createdAt":{
+          "shape":"IsoDate",
+          "documentation":"<p>The timestamp when the contact method was created.</p>"
+        },
+        "location":{"shape":"ResourceLocation"},
+        "resourceType":{
+          "shape":"ResourceType",
+          "documentation":"<p>The Lightsail resource type (e.g., <code>ContactMethod</code>).</p>"
+        },
+        "supportCode":{
+          "shape":"string",
+          "documentation":"<p>The support code. Include this code in your email to support when you have questions about your Lightsail contact method. This code enables our support team to look up your Lightsail information more easily.</p>"
+        }
+      },
+      "documentation":"<p>Describes a contact method.</p> <p>A contact method is a way to send you notifications. For more information, see <a href=\"https://lightsail.aws.amazon.com/ls/docs/en_us/articles/amazon-lightsail-notifications\">Notifications in Amazon Lightsail</a>.</p>"
+    },
+    "ContactMethodStatus":{
+      "type":"string",
+      "enum":[
+        "PendingVerification",
+        "Valid",
+        "Invalid"
+      ]
+    },
+    "ContactMethodVerificationProtocol":{
+      "type":"string",
+      "enum":["Email"]
+    },
+    "ContactMethodsList":{
+      "type":"list",
+      "member":{"shape":"ContactMethod"}
+    },
+    "ContactProtocol":{
+      "type":"string",
+      "enum":[
+        "Email",
+        "SMS"
+      ]
+    },
+    "ContactProtocolsList":{
+      "type":"list",
+      "member":{"shape":"ContactProtocol"}
+    },
     "CopySnapshotRequest":{
       "type":"structure",
       "required":[
@@ -2524,23 +2841,23 @@
       "members":{
         "sourceSnapshotName":{
           "shape":"ResourceName",
-          "documentation":"<p>The name of the source instance or disk snapshot to be copied.</p> <note> <p>Define this parameter only when copying a manual snapshot as another manual snapshot.</p> </note>"
+          "documentation":"<p>The name of the source manual snapshot to copy.</p> <p>Constraint:</p> <ul> <li> <p>Define this parameter only when copying a manual snapshot as another manual snapshot.</p> </li> </ul>"
         },
         "sourceResourceName":{
           "shape":"string",
-          "documentation":"<p>The name of the source resource from which the automatic snapshot was created.</p> <note> <p>Define this parameter only when copying an automatic snapshot as a manual snapshot. For more information, see the <a href=\"https://lightsail.aws.amazon.com/ls/docs/en_us/articles/amazon-lightsail-configuring-automatic-snapshots\">Lightsail Dev Guide</a>.</p> </note>"
+          "documentation":"<p>The name of the source instance or disk from which the source automatic snapshot was created.</p> <p>Constraint:</p> <ul> <li> <p>Define this parameter only when copying an automatic snapshot as a manual snapshot. For more information, see the <a href=\"https://lightsail.aws.amazon.com/ls/docs/en_us/articles/amazon-lightsail-keeping-automatic-snapshots\">Lightsail Dev Guide</a>.</p> </li> </ul>"
         },
         "restoreDate":{
           "shape":"string",
-          "documentation":"<p>The date of the automatic snapshot to copy for the new manual snapshot.</p> <p>Use the <code>get auto snapshots</code> operation to identify the dates of the available automatic snapshots.</p> <p>Constraints:</p> <ul> <li> <p>Must be specified in <code>YYYY-MM-DD</code> format.</p> </li> <li> <p>This parameter cannot be defined together with the <code>use latest restorable auto snapshot</code> parameter. The <code>restore date</code> and <code>use latest restorable auto snapshot</code> parameters are mutually exclusive.</p> </li> </ul> <note> <p>Define this parameter only when copying an automatic snapshot as a manual snapshot. For more information, see the <a href=\"https://lightsail.aws.amazon.com/ls/docs/en_us/articles/amazon-lightsail-configuring-automatic-snapshots\">Lightsail Dev Guide</a>.</p> </note>"
+          "documentation":"<p>The date of the source automatic snapshot to copy. Use the <code>get auto snapshots</code> operation to identify the dates of the available automatic snapshots.</p> <p>Constraints:</p> <ul> <li> <p>Must be specified in <code>YYYY-MM-DD</code> format.</p> </li> <li> <p>This parameter cannot be defined together with the <code>use latest restorable auto snapshot</code> parameter. The <code>restore date</code> and <code>use latest restorable auto snapshot</code> parameters are mutually exclusive.</p> </li> <li> <p>Define this parameter only when copying an automatic snapshot as a manual snapshot. For more information, see the <a href=\"https://lightsail.aws.amazon.com/ls/docs/en_us/articles/amazon-lightsail-keeping-automatic-snapshots\">Lightsail Dev Guide</a>.</p> </li> </ul>"
         },
         "useLatestRestorableAutoSnapshot":{
           "shape":"boolean",
-          "documentation":"<p>A Boolean value to indicate whether to use the latest available automatic snapshot.</p> <p>This parameter cannot be defined together with the <code>restore date</code> parameter. The <code>use latest restorable auto snapshot</code> and <code>restore date</code> parameters are mutually exclusive.</p> <note> <p>Define this parameter only when copying an automatic snapshot as a manual snapshot. For more information, see the <a href=\"https://lightsail.aws.amazon.com/ls/docs/en_us/articles/amazon-lightsail-configuring-automatic-snapshots\">Lightsail Dev Guide</a>.</p> </note>"
+          "documentation":"<p>A Boolean value to indicate whether to use the latest available automatic snapshot of the specified source instance or disk.</p> <p>Constraints:</p> <ul> <li> <p>This parameter cannot be defined together with the <code>restore date</code> parameter. The <code>use latest restorable auto snapshot</code> and <code>restore date</code> parameters are mutually exclusive.</p> </li> <li> <p>Define this parameter only when copying an automatic snapshot as a manual snapshot. For more information, see the <a href=\"https://lightsail.aws.amazon.com/ls/docs/en_us/articles/amazon-lightsail-keeping-automatic-snapshots\">Lightsail Dev Guide</a>.</p> </li> </ul>"
         },
         "targetSnapshotName":{
           "shape":"ResourceName",
-          "documentation":"<p>The name of the new instance or disk snapshot to be created as a copy.</p>"
+          "documentation":"<p>The name of the new manual snapshot to be created as a copy.</p>"
         },
         "sourceRegion":{
           "shape":"RegionName",
@@ -2553,7 +2870,7 @@
       "members":{
         "operations":{
           "shape":"OperationList",
-          "documentation":"<p>A list of objects describing the API operation.</p>"
+          "documentation":"<p>An array of objects that describe the result of the action, such as the status of the request, the time stamp of the request, and the resources affected by the request.</p>"
         }
       }
     },
@@ -2572,7 +2889,33 @@
       "members":{
         "operations":{
           "shape":"OperationList",
-          "documentation":"<p>A list of objects describing the API operation.</p>"
+          "documentation":"<p>An array of objects that describe the result of the action, such as the status of the request, the time stamp of the request, and the resources affected by the request.</p>"
+        }
+      }
+    },
+    "CreateContactMethodRequest":{
+      "type":"structure",
+      "required":[
+        "protocol",
+        "contactEndpoint"
+      ],
+      "members":{
+        "protocol":{
+          "shape":"ContactProtocol",
+          "documentation":"<p>The protocol of the contact method, such as <code>Email</code> or <code>SMS</code> (text messaging).</p> <p>The <code>SMS</code> protocol is supported only in the following AWS Regions.</p> <ul> <li> <p>US East (N. Virginia) (<code>us-east-1</code>)</p> </li> <li> <p>US West (Oregon) (<code>us-west-2</code>)</p> </li> <li> <p>Europe (Ireland) (<code>eu-west-1</code>)</p> </li> <li> <p>Asia Pacific (Tokyo) (<code>ap-northeast-1</code>)</p> </li> <li> <p>Asia Pacific (Singapore) (<code>ap-southeast-1</code>)</p> </li> <li> <p>Asia Pacific (Sydney) (<code>ap-southeast-2</code>)</p> </li> </ul> <p>For a list of countries/regions where SMS text messages can be sent, and the latest AWS Regions where SMS text messaging is supported, see <a href=\"https://docs.aws.amazon.com/sns/latest/dg/sns-supported-regions-countries.html\">Supported Regions and Countries</a> in the <i>Amazon SNS Developer Guide</i>.</p> <p>For more information about notifications in Amazon Lightsail, see <a href=\"https://lightsail.aws.amazon.com/ls/docs/en_us/articles/amazon-lightsail-notifications\">Notifications in Amazon Lightsail</a>.</p>"
+        },
+        "contactEndpoint":{
+          "shape":"StringMax256",
+          "documentation":"<p>The destination of the contact method, such as an email address or a mobile phone number.</p> <p>Use the E.164 format when specifying a mobile phone number. E.164 is a standard for the phone number structure used for international telecommunication. Phone numbers that follow this format can have a maximum of 15 digits, and they are prefixed with the plus character (+) and the country code. For example, a U.S. phone number in E.164 format would be specified as +1XXX5550100. For more information, see <a href=\"https://en.wikipedia.org/wiki/E.164\">E.164</a> in Wikipedia.</p>"
+        }
+      }
+    },
+    "CreateContactMethodResult":{
+      "type":"structure",
+      "members":{
+        "operations":{
+          "shape":"OperationList",
+          "documentation":"<p>An array of objects that describe the result of the action, such as the status of the request, the time stamp of the request, and the resources affected by the request.</p>"
         }
       }
     },
@@ -2590,7 +2933,7 @@
         },
         "diskSnapshotName":{
           "shape":"ResourceName",
-          "documentation":"<p>The name of the disk snapshot (e.g., <code>my-snapshot</code>) from which to create the new storage disk.</p> <p>This parameter cannot be defined together with the <code>source disk name</code> parameter. The <code>disk snapshot name</code> and <code>source disk name</code> parameters are mutually exclusive.</p>"
+          "documentation":"<p>The name of the disk snapshot (e.g., <code>my-snapshot</code>) from which to create the new storage disk.</p> <p>Constraint:</p> <ul> <li> <p>This parameter cannot be defined together with the <code>source disk name</code> parameter. The <code>disk snapshot name</code> and <code>source disk name</code> parameters are mutually exclusive.</p> </li> </ul>"
         },
         "availabilityZone":{
           "shape":"NonEmptyString",
@@ -2610,15 +2953,15 @@
         },
         "sourceDiskName":{
           "shape":"string",
-          "documentation":"<p>The name of the source disk from which the source automatic snapshot was created.</p> <p>This parameter cannot be defined together with the <code>disk snapshot name</code> parameter. The <code>source disk name</code> and <code>disk snapshot name</code> parameters are mutually exclusive.</p> <note> <p>Define this parameter only when creating a new disk from an automatic snapshot. For more information, see the <a href=\"https://lightsail.aws.amazon.com/ls/docs/en_us/articles/amazon-lightsail-configuring-automatic-snapshots\">Lightsail Dev Guide</a>.</p> </note>"
+          "documentation":"<p>The name of the source disk from which the source automatic snapshot was created.</p> <p>Constraints:</p> <ul> <li> <p>This parameter cannot be defined together with the <code>disk snapshot name</code> parameter. The <code>source disk name</code> and <code>disk snapshot name</code> parameters are mutually exclusive.</p> </li> <li> <p>Define this parameter only when creating a new disk from an automatic snapshot. For more information, see the <a href=\"https://lightsail.aws.amazon.com/ls/docs/en_us/articles/amazon-lightsail-configuring-automatic-snapshots\">Lightsail Dev Guide</a>.</p> </li> </ul>"
         },
         "restoreDate":{
           "shape":"string",
-          "documentation":"<p>The date of the automatic snapshot to use for the new disk.</p> <p>Use the <code>get auto snapshots</code> operation to identify the dates of the available automatic snapshots.</p> <p>Constraints:</p> <ul> <li> <p>Must be specified in <code>YYYY-MM-DD</code> format.</p> </li> <li> <p>This parameter cannot be defined together with the <code>use latest restorable auto snapshot</code> parameter. The <code>restore date</code> and <code>use latest restorable auto snapshot</code> parameters are mutually exclusive.</p> </li> </ul> <note> <p>Define this parameter only when creating a new disk from an automatic snapshot. For more information, see the <a href=\"https://lightsail.aws.amazon.com/ls/docs/en_us/articles/amazon-lightsail-configuring-automatic-snapshots\">Lightsail Dev Guide</a>.</p> </note>"
+          "documentation":"<p>The date of the automatic snapshot to use for the new disk. Use the <code>get auto snapshots</code> operation to identify the dates of the available automatic snapshots.</p> <p>Constraints:</p> <ul> <li> <p>Must be specified in <code>YYYY-MM-DD</code> format.</p> </li> <li> <p>This parameter cannot be defined together with the <code>use latest restorable auto snapshot</code> parameter. The <code>restore date</code> and <code>use latest restorable auto snapshot</code> parameters are mutually exclusive.</p> </li> <li> <p>Define this parameter only when creating a new disk from an automatic snapshot. For more information, see the <a href=\"https://lightsail.aws.amazon.com/ls/docs/en_us/articles/amazon-lightsail-configuring-automatic-snapshots\">Lightsail Dev Guide</a>.</p> </li> </ul>"
         },
         "useLatestRestorableAutoSnapshot":{
           "shape":"boolean",
-          "documentation":"<p>A Boolean value to indicate whether to use the latest available automatic snapshot.</p> <p>This parameter cannot be defined together with the <code>restore date</code> parameter. The <code>use latest restorable auto snapshot</code> and <code>restore date</code> parameters are mutually exclusive.</p> <note> <p>Define this parameter only when creating a new disk from an automatic snapshot. For more information, see the <a href=\"https://lightsail.aws.amazon.com/ls/docs/en_us/articles/amazon-lightsail-configuring-automatic-snapshots\">Lightsail Dev Guide</a>.</p> </note>"
+          "documentation":"<p>A Boolean value to indicate whether to use the latest available automatic snapshot.</p> <p>Constraints:</p> <ul> <li> <p>This parameter cannot be defined together with the <code>restore date</code> parameter. The <code>use latest restorable auto snapshot</code> and <code>restore date</code> parameters are mutually exclusive.</p> </li> <li> <p>Define this parameter only when creating a new disk from an automatic snapshot. For more information, see the <a href=\"https://lightsail.aws.amazon.com/ls/docs/en_us/articles/amazon-lightsail-configuring-automatic-snapshots\">Lightsail Dev Guide</a>.</p> </li> </ul>"
         }
       }
     },
@@ -2627,7 +2970,7 @@
       "members":{
         "operations":{
           "shape":"OperationList",
-          "documentation":"<p>An object describing the API operations.</p>"
+          "documentation":"<p>An array of objects that describe the result of the action, such as the status of the request, the time stamp of the request, and the resources affected by the request.</p>"
         }
       }
     },
@@ -2666,7 +3009,7 @@
       "members":{
         "operations":{
           "shape":"OperationList",
-          "documentation":"<p>An object describing the API operations.</p>"
+          "documentation":"<p>An array of objects that describe the result of the action, such as the status of the request, the time stamp of the request, and the resources affected by the request.</p>"
         }
       }
     },
@@ -2697,7 +3040,7 @@
       "members":{
         "operations":{
           "shape":"OperationList",
-          "documentation":"<p>An object describing the API operations.</p>"
+          "documentation":"<p>An array of objects that describe the result of the action, such as the status of the request, the time stamp of the request, and the resources affected by the request.</p>"
         }
       }
     },
@@ -2723,7 +3066,7 @@
       "members":{
         "operation":{
           "shape":"Operation",
-          "documentation":"<p>An array of key-value pairs containing information about the operation.</p>"
+          "documentation":"<p>An array of objects that describe the result of the action, such as the status of the request, the time stamp of the request, and the resources affected by the request.</p>"
         }
       }
     },
@@ -2746,7 +3089,7 @@
       "members":{
         "operation":{
           "shape":"Operation",
-          "documentation":"<p>An array of key-value pairs containing information about the domain resource you created.</p>"
+          "documentation":"<p>An array of objects that describe the result of the action, such as the status of the request, the time stamp of the request, and the resources affected by the request.</p>"
         }
       }
     },
@@ -2776,7 +3119,7 @@
       "members":{
         "operations":{
           "shape":"OperationList",
-          "documentation":"<p>An array of key-value pairs containing information about the results of your create instances snapshot request.</p>"
+          "documentation":"<p>An array of objects that describe the result of the action, such as the status of the request, the time stamp of the request, and the resources affected by the request.</p>"
         }
       }
     },
@@ -2802,7 +3145,7 @@
         },
         "instanceSnapshotName":{
           "shape":"ResourceName",
-          "documentation":"<p>The name of the instance snapshot on which you are basing your new instances. Use the get instance snapshots operation to return information about your existing snapshots.</p> <p>This parameter cannot be defined together with the <code>source instance name</code> parameter. The <code>instance snapshot name</code> and <code>source instance name</code> parameters are mutually exclusive.</p>"
+          "documentation":"<p>The name of the instance snapshot on which you are basing your new instances. Use the get instance snapshots operation to return information about your existing snapshots.</p> <p>Constraint:</p> <ul> <li> <p>This parameter cannot be defined together with the <code>source instance name</code> parameter. The <code>instance snapshot name</code> and <code>source instance name</code> parameters are mutually exclusive.</p> </li> </ul>"
         },
         "bundleId":{
           "shape":"NonEmptyString",
@@ -2826,15 +3169,15 @@
         },
         "sourceInstanceName":{
           "shape":"string",
-          "documentation":"<p>The name of the source instance from which the source automatic snapshot was created.</p> <p>This parameter cannot be defined together with the <code>instance snapshot name</code> parameter. The <code>source instance name</code> and <code>instance snapshot name</code> parameters are mutually exclusive.</p> <note> <p>Define this parameter only when creating a new instance from an automatic snapshot. For more information, see the <a href=\"https://lightsail.aws.amazon.com/ls/docs/en_us/articles/amazon-lightsail-configuring-automatic-snapshots\">Lightsail Dev Guide</a>.</p> </note>"
+          "documentation":"<p>The name of the source instance from which the source automatic snapshot was created.</p> <p>Constraints:</p> <ul> <li> <p>This parameter cannot be defined together with the <code>instance snapshot name</code> parameter. The <code>source instance name</code> and <code>instance snapshot name</code> parameters are mutually exclusive.</p> </li> <li> <p>Define this parameter only when creating a new instance from an automatic snapshot. For more information, see the <a href=\"https://lightsail.aws.amazon.com/ls/docs/en_us/articles/amazon-lightsail-configuring-automatic-snapshots\">Lightsail Dev Guide</a>.</p> </li> </ul>"
         },
         "restoreDate":{
           "shape":"string",
-          "documentation":"<p>The date of the automatic snapshot to use for the new instance.</p> <p>Use the <code>get auto snapshots</code> operation to identify the dates of the available automatic snapshots.</p> <p>Constraints:</p> <ul> <li> <p>Must be specified in <code>YYYY-MM-DD</code> format.</p> </li> <li> <p>This parameter cannot be defined together with the <code>use latest restorable auto snapshot</code> parameter. The <code>restore date</code> and <code>use latest restorable auto snapshot</code> parameters are mutually exclusive.</p> </li> </ul> <note> <p>Define this parameter only when creating a new instance from an automatic snapshot. For more information, see the <a href=\"https://lightsail.aws.amazon.com/ls/docs/en_us/articles/amazon-lightsail-configuring-automatic-snapshots\">Lightsail Dev Guide</a>.</p> </note>"
+          "documentation":"<p>The date of the automatic snapshot to use for the new instance. Use the <code>get auto snapshots</code> operation to identify the dates of the available automatic snapshots.</p> <p>Constraints:</p> <ul> <li> <p>Must be specified in <code>YYYY-MM-DD</code> format.</p> </li> <li> <p>This parameter cannot be defined together with the <code>use latest restorable auto snapshot</code> parameter. The <code>restore date</code> and <code>use latest restorable auto snapshot</code> parameters are mutually exclusive.</p> </li> <li> <p>Define this parameter only when creating a new instance from an automatic snapshot. For more information, see the <a href=\"https://lightsail.aws.amazon.com/ls/docs/en_us/articles/amazon-lightsail-configuring-automatic-snapshots\">Lightsail Dev Guide</a>.</p> </li> </ul>"
         },
         "useLatestRestorableAutoSnapshot":{
           "shape":"boolean",
-          "documentation":"<p>A Boolean value to indicate whether to use the latest available automatic snapshot.</p> <p>This parameter cannot be defined together with the <code>restore date</code> parameter. The <code>use latest restorable auto snapshot</code> and <code>restore date</code> parameters are mutually exclusive.</p> <note> <p>Define this parameter only when creating a new instance from an automatic snapshot. For more information, see the <a href=\"https://lightsail.aws.amazon.com/ls/docs/en_us/articles/amazon-lightsail-configuring-automatic-snapshots\">Lightsail Dev Guide</a>.</p> </note>"
+          "documentation":"<p>A Boolean value to indicate whether to use the latest available automatic snapshot.</p> <p>Constraints:</p> <ul> <li> <p>This parameter cannot be defined together with the <code>restore date</code> parameter. The <code>use latest restorable auto snapshot</code> and <code>restore date</code> parameters are mutually exclusive.</p> </li> <li> <p>Define this parameter only when creating a new instance from an automatic snapshot. For more information, see the <a href=\"https://lightsail.aws.amazon.com/ls/docs/en_us/articles/amazon-lightsail-configuring-automatic-snapshots\">Lightsail Dev Guide</a>.</p> </li> </ul>"
         }
       }
     },
@@ -2843,7 +3186,7 @@
       "members":{
         "operations":{
           "shape":"OperationList",
-          "documentation":"<p>An array of key-value pairs containing information about the results of your create instances from snapshot request.</p>"
+          "documentation":"<p>An array of objects that describe the result of the action, such as the status of the request, the time stamp of the request, and the resources affected by the request.</p>"
         }
       }
     },
@@ -2900,7 +3243,7 @@
       "members":{
         "operations":{
           "shape":"OperationList",
-          "documentation":"<p>An array of key-value pairs containing information about the results of your create instances request.</p>"
+          "documentation":"<p>An array of objects that describe the result of the action, such as the status of the request, the time stamp of the request, and the resources affected by the request.</p>"
         }
       }
     },
@@ -2935,7 +3278,7 @@
         },
         "operation":{
           "shape":"Operation",
-          "documentation":"<p>An array of key-value pairs containing information about the results of your create key pair request.</p>"
+          "documentation":"<p>An array of objects that describe the result of the action, such as the status of the request, the time stamp of the request, and the resources affected by the request.</p>"
         }
       }
     },
@@ -2981,7 +3324,7 @@
       "members":{
         "operations":{
           "shape":"OperationList",
-          "documentation":"<p>An object containing information about the API operations.</p>"
+          "documentation":"<p>An array of objects that describe the result of the action, such as the status of the request, the time stamp of the request, and the resources affected by the request.</p>"
         }
       }
     },
@@ -3020,7 +3363,7 @@
       "members":{
         "operations":{
           "shape":"OperationList",
-          "documentation":"<p>An object containing information about the API operations.</p>"
+          "documentation":"<p>An array of objects that describe the result of the action, such as the status of the request, the time stamp of the request, and the resources affected by the request.</p>"
         }
       }
     },
@@ -3071,7 +3414,7 @@
       "members":{
         "operations":{
           "shape":"OperationList",
-          "documentation":"<p>An object describing the result of your create relational database from snapshot request.</p>"
+          "documentation":"<p>An array of objects that describe the result of the action, such as the status of the request, the time stamp of the request, and the resources affected by the request.</p>"
         }
       }
     },
@@ -3136,7 +3479,7 @@
       "members":{
         "operations":{
           "shape":"OperationList",
-          "documentation":"<p>An object describing the result of your create relational database request.</p>"
+          "documentation":"<p>An array of objects that describe the result of the action, such as the status of the request, the time stamp of the request, and the resources affected by the request.</p>"
         }
       }
     },
@@ -3166,7 +3509,26 @@
       "members":{
         "operations":{
           "shape":"OperationList",
-          "documentation":"<p>An object describing the result of your create relational database snapshot request.</p>"
+          "documentation":"<p>An array of objects that describe the result of the action, such as the status of the request, the time stamp of the request, and the resources affected by the request.</p>"
+        }
+      }
+    },
+    "DeleteAlarmRequest":{
+      "type":"structure",
+      "required":["alarmName"],
+      "members":{
+        "alarmName":{
+          "shape":"ResourceName",
+          "documentation":"<p>The name of the alarm to delete.</p>"
+        }
+      }
+    },
+    "DeleteAlarmResult":{
+      "type":"structure",
+      "members":{
+        "operations":{
+          "shape":"OperationList",
+          "documentation":"<p>An array of objects that describe the result of the action, such as the status of the request, the time stamp of the request, and the resources affected by the request.</p>"
         }
       }
     },
@@ -3179,11 +3541,11 @@
       "members":{
         "resourceName":{
           "shape":"ResourceName",
-          "documentation":"<p>The name of the source resource from which to delete the automatic snapshot.</p>"
+          "documentation":"<p>The name of the source instance or disk from which to delete the automatic snapshot.</p>"
         },
         "date":{
           "shape":"AutoSnapshotDate",
-          "documentation":"<p>The date of the automatic snapshot to delete in <code>YYYY-MM-DD</code> format.</p> <p>Use the <code>get auto snapshots</code> operation to get the available automatic snapshots for a resource.</p>"
+          "documentation":"<p>The date of the automatic snapshot to delete in <code>YYYY-MM-DD</code> format. Use the <code>get auto snapshots</code> operation to get the available automatic snapshots for a resource.</p>"
         }
       }
     },
@@ -3192,7 +3554,26 @@
       "members":{
         "operations":{
           "shape":"OperationList",
-          "documentation":"<p>An array of objects that describe the result of your request.</p>"
+          "documentation":"<p>An array of objects that describe the result of the action, such as the status of the request, the time stamp of the request, and the resources affected by the request.</p>"
+        }
+      }
+    },
+    "DeleteContactMethodRequest":{
+      "type":"structure",
+      "required":["protocol"],
+      "members":{
+        "protocol":{
+          "shape":"ContactProtocol",
+          "documentation":"<p>The protocol that will be deleted, such as <code>Email</code> or <code>SMS</code> (text messaging).</p> <note> <p>To delete an <code>Email</code> and an <code>SMS</code> contact method if you added both, you must run separate <code>DeleteContactMethod</code> actions to delete each protocol.</p> </note>"
+        }
+      }
+    },
+    "DeleteContactMethodResult":{
+      "type":"structure",
+      "members":{
+        "operations":{
+          "shape":"OperationList",
+          "documentation":"<p>An array of objects that describe the result of the action, such as the status of the request, the time stamp of the request, and the resources affected by the request.</p>"
         }
       }
     },
@@ -3215,7 +3596,7 @@
       "members":{
         "operations":{
           "shape":"OperationList",
-          "documentation":"<p>An array of objects that describe the result of your request.</p>"
+          "documentation":"<p>An array of objects that describe the result of the action, such as the status of the request, the time stamp of the request, and the resources affected by the request.</p>"
         }
       }
     },
@@ -3234,7 +3615,7 @@
       "members":{
         "operations":{
           "shape":"OperationList",
-          "documentation":"<p>An object describing the API operations.</p>"
+          "documentation":"<p>An array of objects that describe the result of the action, such as the status of the request, the time stamp of the request, and the resources affected by the request.</p>"
         }
       }
     },
@@ -3260,7 +3641,7 @@
       "members":{
         "operation":{
           "shape":"Operation",
-          "documentation":"<p>An array of key-value pairs containing information about the results of your delete domain entry request.</p>"
+          "documentation":"<p>An array of objects that describe the result of the action, such as the status of the request, the time stamp of the request, and the resources affected by the request.</p>"
         }
       }
     },
@@ -3279,7 +3660,7 @@
       "members":{
         "operation":{
           "shape":"Operation",
-          "documentation":"<p>An array of key-value pairs containing information about the results of your delete domain request.</p>"
+          "documentation":"<p>An array of objects that describe the result of the action, such as the status of the request, the time stamp of the request, and the resources affected by the request.</p>"
         }
       }
     },
@@ -3302,7 +3683,7 @@
       "members":{
         "operations":{
           "shape":"OperationList",
-          "documentation":"<p>An array of key-value pairs containing information about the results of your delete instance request.</p>"
+          "documentation":"<p>An array of objects that describe the result of the action, such as the status of the request, the time stamp of the request, and the resources affected by the request.</p>"
         }
       }
     },
@@ -3321,7 +3702,7 @@
       "members":{
         "operations":{
           "shape":"OperationList",
-          "documentation":"<p>An array of key-value pairs containing information about the results of your delete instance snapshot request.</p>"
+          "documentation":"<p>An array of objects that describe the result of the action, such as the status of the request, the time stamp of the request, and the resources affected by the request.</p>"
         }
       }
     },
@@ -3340,7 +3721,7 @@
       "members":{
         "operation":{
           "shape":"Operation",
-          "documentation":"<p>An array of key-value pairs containing information about the results of your delete key pair request.</p>"
+          "documentation":"<p>An array of objects that describe the result of the action, such as the status of the request, the time stamp of the request, and the resources affected by the request.</p>"
         }
       }
     },
@@ -3359,7 +3740,7 @@
       "members":{
         "operations":{
           "shape":"OperationList",
-          "documentation":"<p>A list of objects describing the API operation.</p>"
+          "documentation":"<p>An array of objects that describe the result of the action, such as the status of the request, the time stamp of the request, and the resources affected by the request.</p>"
         }
       }
     },
@@ -3378,7 +3759,7 @@
       "members":{
         "operations":{
           "shape":"OperationList",
-          "documentation":"<p>An object describing the API operations.</p>"
+          "documentation":"<p>An array of objects that describe the result of the action, such as the status of the request, the time stamp of the request, and the resources affected by the request.</p>"
         }
       }
     },
@@ -3408,7 +3789,7 @@
       "members":{
         "operations":{
           "shape":"OperationList",
-          "documentation":"<p>An object describing the API operations.</p>"
+          "documentation":"<p>An array of objects that describe the result of the action, such as the status of the request, the time stamp of the request, and the resources affected by the request.</p>"
         }
       }
     },
@@ -3435,7 +3816,7 @@
       "members":{
         "operations":{
           "shape":"OperationList",
-          "documentation":"<p>An object describing the result of your delete relational database request.</p>"
+          "documentation":"<p>An array of objects that describe the result of the action, such as the status of the request, the time stamp of the request, and the resources affected by the request.</p>"
         }
       }
     },
@@ -3454,7 +3835,7 @@
       "members":{
         "operations":{
           "shape":"OperationList",
-          "documentation":"<p>An object describing the result of your delete relational database snapshot request.</p>"
+          "documentation":"<p>An array of objects that describe the result of the action, such as the status of the request, the time stamp of the request, and the resources affected by the request.</p>"
         }
       }
     },
@@ -3487,7 +3868,7 @@
       "members":{
         "operations":{
           "shape":"OperationList",
-          "documentation":"<p>An object describing the API operations.</p>"
+          "documentation":"<p>An array of objects that describe the result of the action, such as the status of the request, the time stamp of the request, and the resources affected by the request.</p>"
         }
       }
     },
@@ -3513,7 +3894,7 @@
       "members":{
         "operations":{
           "shape":"OperationList",
-          "documentation":"<p>An object describing the API operations.</p>"
+          "documentation":"<p>An array of objects that describe the result of the action, such as the status of the request, the time stamp of the request, and the resources affected by the request.</p>"
         }
       }
     },
@@ -3532,7 +3913,7 @@
       "members":{
         "operations":{
           "shape":"OperationList",
-          "documentation":"<p>An array of key-value pairs containing information about the results of your detach static IP request.</p>"
+          "documentation":"<p>An array of objects that describe the result of the action, such as the status of the request, the time stamp of the request, and the resources affected by the request.</p>"
         }
       }
     },
@@ -3549,7 +3930,7 @@
         },
         "resourceName":{
           "shape":"ResourceName",
-          "documentation":"<p>The name of the source resource from which to disable the add-on.</p>"
+          "documentation":"<p>The name of the source resource for which to disable the add-on.</p>"
         }
       }
     },
@@ -3558,7 +3939,7 @@
       "members":{
         "operations":{
           "shape":"OperationList",
-          "documentation":"<p>An array of objects that describe the result of your request.</p>"
+          "documentation":"<p>An array of objects that describe the result of the action, such as the status of the request, the time stamp of the request, and the resources affected by the request.</p>"
         }
       }
     },
@@ -3914,7 +4295,7 @@
       "members":{
         "operations":{
           "shape":"OperationList",
-          "documentation":"<p>An array of objects that describe the result of your request.</p>"
+          "documentation":"<p>An array of objects that describe the result of the action, such as the status of the request, the time stamp of the request, and the resources affected by the request.</p>"
         }
       }
     },
@@ -4020,7 +4401,7 @@
       "members":{
         "operations":{
           "shape":"OperationList",
-          "documentation":"<p>A list of objects describing the API operation.</p>"
+          "documentation":"<p>An array of objects that describe the result of the action, such as the status of the request, the time stamp of the request, and the resources affected by the request.</p>"
         }
       }
     },
@@ -4029,7 +4410,7 @@
       "members":{
         "pageToken":{
           "shape":"string",
-          "documentation":"<p>A token used for paginating results from your get active names request.</p>"
+          "documentation":"<p>The token to advance to the next page of results from your request.</p> <p>To get a page token, perform an initial <code>GetActiveNames</code> request. If your results are paginated, the response will return a next page token that you can specify as the page token in a subsequent request.</p>"
         }
       }
     },
@@ -4042,7 +4423,37 @@
         },
         "nextPageToken":{
           "shape":"string",
-          "documentation":"<p>A token used for advancing to the next page of results from your get active names request.</p>"
+          "documentation":"<p>The token to advance to the next page of resutls from your request.</p> <p>A next page token is not returned if there are no more results to display.</p> <p>To get the next page of results, perform another <code>GetActiveNames</code> request and specify the next page token using the <code>pageToken</code> parameter.</p>"
+        }
+      }
+    },
+    "GetAlarmsRequest":{
+      "type":"structure",
+      "members":{
+        "alarmName":{
+          "shape":"ResourceName",
+          "documentation":"<p>The name of the alarm.</p> <p>Specify an alarm name to return information about a specific alarm.</p>"
+        },
+        "pageToken":{
+          "shape":"string",
+          "documentation":"<p>The token to advance to the next page of results from your request.</p> <p>To get a page token, perform an initial <code>GetAlarms</code> request. If your results are paginated, the response will return a next page token that you can specify as the page token in a subsequent request.</p>"
+        },
+        "monitoredResourceName":{
+          "shape":"ResourceName",
+          "documentation":"<p>The name of the Lightsail resource being monitored by the alarm.</p> <p>Specify a monitored resource name to return information about all alarms for a specific resource.</p>"
+        }
+      }
+    },
+    "GetAlarmsResult":{
+      "type":"structure",
+      "members":{
+        "alarms":{
+          "shape":"AlarmsList",
+          "documentation":"<p>An array of objects that describe the alarms.</p>"
+        },
+        "nextPageToken":{
+          "shape":"string",
+          "documentation":"<p>The token to advance to the next page of resutls from your request.</p> <p>A next page token is not returned if there are no more results to display.</p> <p>To get the next page of results, perform another <code>GetAlarms</code> request and specify the next page token using the <code>pageToken</code> parameter.</p>"
         }
       }
     },
@@ -4052,7 +4463,7 @@
       "members":{
         "resourceName":{
           "shape":"ResourceName",
-          "documentation":"<p>The name of the source resource from which to get automatic snapshot information.</p>"
+          "documentation":"<p>The name of the source instance or disk from which to get automatic snapshot information.</p>"
         }
       }
     },
@@ -4061,7 +4472,7 @@
       "members":{
         "resourceName":{
           "shape":"ResourceName",
-          "documentation":"<p>The name of the source resource for the automatic snapshots.</p>"
+          "documentation":"<p>The name of the source instance or disk for the automatic snapshots.</p>"
         },
         "resourceType":{
           "shape":"ResourceType",
@@ -4069,7 +4480,7 @@
         },
         "autoSnapshots":{
           "shape":"AutoSnapshotDetailsList",
-          "documentation":"<p>An array of objects that describe the automatic snapshots that are available for the specified source resource.asdf</p>"
+          "documentation":"<p>An array of objects that describe the automatic snapshots that are available for the specified source instance or disk.</p>"
         }
       }
     },
@@ -4082,7 +4493,7 @@
         },
         "pageToken":{
           "shape":"string",
-          "documentation":"<p>A token used for advancing to the next page of results from your get blueprints request.</p>"
+          "documentation":"<p>The token to advance to the next page of results from your request.</p> <p>To get a page token, perform an initial <code>GetBlueprints</code> request. If your results are paginated, the response will return a next page token that you can specify as the page token in a subsequent request.</p>"
         }
       }
     },
@@ -4095,7 +4506,7 @@
         },
         "nextPageToken":{
           "shape":"string",
-          "documentation":"<p>A token used for advancing to the next page of results from your get blueprints request.</p>"
+          "documentation":"<p>The token to advance to the next page of resutls from your request.</p> <p>A next page token is not returned if there are no more results to display.</p> <p>To get the next page of results, perform another <code>GetBlueprints</code> request and specify the next page token using the <code>pageToken</code> parameter.</p>"
         }
       }
     },
@@ -4108,7 +4519,7 @@
         },
         "pageToken":{
           "shape":"string",
-          "documentation":"<p>A token used for advancing to the next page of results from your get bundles request.</p>"
+          "documentation":"<p>The token to advance to the next page of results from your request.</p> <p>To get a page token, perform an initial <code>GetBundles</code> request. If your results are paginated, the response will return a next page token that you can specify as the page token in a subsequent request.</p>"
         }
       }
     },
@@ -4121,7 +4532,7 @@
         },
         "nextPageToken":{
           "shape":"string",
-          "documentation":"<p>A token used for advancing to the next page of results from your get active names request.</p>"
+          "documentation":"<p>The token to advance to the next page of resutls from your request.</p> <p>A next page token is not returned if there are no more results to display.</p> <p>To get the next page of results, perform another <code>GetBundles</code> request and specify the next page token using the <code>pageToken</code> parameter.</p>"
         }
       }
     },
@@ -4130,7 +4541,7 @@
       "members":{
         "pageToken":{
           "shape":"string",
-          "documentation":"<p>A token used for advancing to a specific page of results for your <code>get cloud formation stack records</code> request.</p>"
+          "documentation":"<p>The token to advance to the next page of results from your request.</p> <p>To get a page token, perform an initial <code>GetClouFormationStackRecords</code> request. If your results are paginated, the response will return a next page token that you can specify as the page token in a subsequent request.</p>"
         }
       }
     },
@@ -4143,7 +4554,25 @@
         },
         "nextPageToken":{
           "shape":"string",
-          "documentation":"<p>A token used for advancing to the next page of results of your get relational database bundles request.</p>"
+          "documentation":"<p>The token to advance to the next page of resutls from your request.</p> <p>A next page token is not returned if there are no more results to display.</p> <p>To get the next page of results, perform another <code>GetCloudFormationStackRecords</code> request and specify the next page token using the <code>pageToken</code> parameter.</p>"
+        }
+      }
+    },
+    "GetContactMethodsRequest":{
+      "type":"structure",
+      "members":{
+        "protocols":{
+          "shape":"ContactProtocolsList",
+          "documentation":"<p>The protocols used to send notifications, such as <code>Email</code>, or <code>SMS</code> (text messaging).</p> <p>Specify a protocol in your request to return information about a specific contact method protocol.</p>"
+        }
+      }
+    },
+    "GetContactMethodsResult":{
+      "type":"structure",
+      "members":{
+        "contactMethods":{
+          "shape":"ContactMethodsList",
+          "documentation":"<p>An array of objects that describe the contact methods.</p>"
         }
       }
     },
@@ -4190,7 +4619,7 @@
       "members":{
         "pageToken":{
           "shape":"string",
-          "documentation":"<p>A token used for advancing to the next page of results from your GetDiskSnapshots request.</p>"
+          "documentation":"<p>The token to advance to the next page of results from your request.</p> <p>To get a page token, perform an initial <code>GetDiskSnapshots</code> request. If your results are paginated, the response will return a next page token that you can specify as the page token in a subsequent request.</p>"
         }
       }
     },
@@ -4203,7 +4632,7 @@
         },
         "nextPageToken":{
           "shape":"string",
-          "documentation":"<p>A token used for advancing to the next page of results from your GetDiskSnapshots request.</p>"
+          "documentation":"<p>The token to advance to the next page of resutls from your request.</p> <p>A next page token is not returned if there are no more results to display.</p> <p>To get the next page of results, perform another <code>GetDiskSnapshots</code> request and specify the next page token using the <code>pageToken</code> parameter.</p>"
         }
       }
     },
@@ -4212,7 +4641,7 @@
       "members":{
         "pageToken":{
           "shape":"string",
-          "documentation":"<p>A token used for advancing to the next page of results from your GetDisks request.</p>"
+          "documentation":"<p>The token to advance to the next page of results from your request.</p> <p>To get a page token, perform an initial <code>GetDisks</code> request. If your results are paginated, the response will return a next page token that you can specify as the page token in a subsequent request.</p>"
         }
       }
     },
@@ -4225,7 +4654,7 @@
         },
         "nextPageToken":{
           "shape":"string",
-          "documentation":"<p>A token used for advancing to the next page of results from your GetDisks request.</p>"
+          "documentation":"<p>The token to advance to the next page of resutls from your request.</p> <p>A next page token is not returned if there are no more results to display.</p> <p>To get the next page of results, perform another <code>GetDisks</code> request and specify the next page token using the <code>pageToken</code> parameter.</p>"
         }
       }
     },
@@ -4253,7 +4682,7 @@
       "members":{
         "pageToken":{
           "shape":"string",
-          "documentation":"<p>A token used for advancing to the next page of results from your get domains request.</p>"
+          "documentation":"<p>The token to advance to the next page of results from your request.</p> <p>To get a page token, perform an initial <code>GetDomains</code> request. If your results are paginated, the response will return a next page token that you can specify as the page token in a subsequent request.</p>"
         }
       }
     },
@@ -4266,7 +4695,7 @@
         },
         "nextPageToken":{
           "shape":"string",
-          "documentation":"<p>A token used for advancing to the next page of results from your get active names request.</p>"
+          "documentation":"<p>The token to advance to the next page of resutls from your request.</p> <p>A next page token is not returned if there are no more results to display.</p> <p>To get the next page of results, perform another <code>GetDomains</code> request and specify the next page token using the <code>pageToken</code> parameter.</p>"
         }
       }
     },
@@ -4275,7 +4704,7 @@
       "members":{
         "pageToken":{
           "shape":"string",
-          "documentation":"<p>A token used for advancing to a specific page of results for your <code>get export snapshot records</code> request.</p>"
+          "documentation":"<p>The token to advance to the next page of results from your request.</p> <p>To get a page token, perform an initial <code>GetExportSnapshotRecords</code> request. If your results are paginated, the response will return a next page token that you can specify as the page token in a subsequent request.</p>"
         }
       }
     },
@@ -4288,7 +4717,7 @@
         },
         "nextPageToken":{
           "shape":"string",
-          "documentation":"<p>A token used for advancing to the next page of results of your get relational database bundles request.</p>"
+          "documentation":"<p>The token to advance to the next page of resutls from your request.</p> <p>A next page token is not returned if there are no more results to display.</p> <p>To get the next page of results, perform another <code>GetExportSnapshotRecords</code> request and specify the next page token using the <code>pageToken</code> parameter.</p>"
         }
       }
     },
@@ -4333,11 +4762,11 @@
         },
         "metricName":{
           "shape":"InstanceMetricName",
-          "documentation":"<p>The metric name to get data about. </p>"
+          "documentation":"<p>The metric for which you want to return information.</p> <p>Valid instance metric names are listed below, along with the most useful <code>statistics</code> to include in your request, and the published <code>unit</code> value.</p> <ul> <li> <p> <b> <code>CPUUtilization</code> </b> — The percentage of allocated compute units that are currently in use on the instance. This metric identifies the processing power to run the applications on the instance. Tools in your operating system can show a lower percentage than Lightsail when the instance is not allocated a full processor core.</p> <p> <code>Statistics</code>: The most useful statistics are <code>Maximum</code> and <code>Average</code>.</p> <p> <code>Unit</code>: The published unit is <code>Percent</code>.</p> </li> <li> <p> <b> <code>NetworkIn</code> </b> — The number of bytes received on all network interfaces by the instance. This metric identifies the volume of incoming network traffic to the instance. The number reported is the number of bytes received during the period. Because this metric is reported in 5-minute intervals, divide the reported number by 300 to find Bytes/second.</p> <p> <code>Statistics</code>: The most useful statistic is <code>Sum</code>.</p> <p> <code>Unit</code>: The published unit is <code>Bytes</code>.</p> </li> <li> <p> <b> <code>NetworkOut</code> </b> — The number of bytes sent out on all network interfaces by the instance. This metric identifies the volume of outgoing network traffic from the instance. The number reported is the number of bytes sent during the period. Because this metric is reported in 5-minute intervals, divide the reported number by 300 to find Bytes/second.</p> <p> <code>Statistics</code>: The most useful statistic is <code>Sum</code>.</p> <p> <code>Unit</code>: The published unit is <code>Bytes</code>.</p> </li> <li> <p> <b> <code>StatusCheckFailed</code> </b> — Reports whether the instance passed or failed both the instance status check and the system status check. This metric can be either 0 (passed) or 1 (failed). This metric data is available in 1-minute (60 seconds) granularity.</p> <p> <code>Statistics</code>: The most useful statistic is <code>Sum</code>.</p> <p> <code>Unit</code>: The published unit is <code>Count</code>.</p> </li> <li> <p> <b> <code>StatusCheckFailed_Instance</code> </b> — Reports whether the instance passed or failed the instance status check. This metric can be either 0 (passed) or 1 (failed). This metric data is available in 1-minute (60 seconds) granularity.</p> <p> <code>Statistics</code>: The most useful statistic is <code>Sum</code>.</p> <p> <code>Unit</code>: The published unit is <code>Count</code>.</p> </li> <li> <p> <b> <code>StatusCheckFailed_System</code> </b> — Reports whether the instance passed or failed the system status check. This metric can be either 0 (passed) or 1 (failed). This metric data is available in 1-minute (60 seconds) granularity.</p> <p> <code>Statistics</code>: The most useful statistic is <code>Sum</code>.</p> <p> <code>Unit</code>: The published unit is <code>Count</code>.</p> </li> </ul>"
         },
         "period":{
           "shape":"MetricPeriod",
-          "documentation":"<p>The granularity, in seconds, of the returned data points.</p>"
+          "documentation":"<p>The granularity, in seconds, of the returned data points.</p> <p>The <code>StatusCheckFailed</code>, <code>StatusCheckFailed_Instance</code>, and <code>StatusCheckFailed_System</code> instance metric data is available in 1-minute (60 seconds) granularity. All other instance metric data is available in 5-minute (300 seconds) granularity.</p>"
         },
         "startTime":{
           "shape":"timestamp",
@@ -4349,11 +4778,11 @@
         },
         "unit":{
           "shape":"MetricUnit",
-          "documentation":"<p>The unit. The list of valid values is below.</p>"
+          "documentation":"<p>The unit for the metric data request. Valid units depend on the metric data being required. For the valid units with each available metric, see the <code>metricName</code> parameter.</p>"
         },
         "statistics":{
           "shape":"MetricStatisticList",
-          "documentation":"<p>The instance statistics. </p>"
+          "documentation":"<p>The statistic for the metric.</p> <p>The following statistics are available:</p> <ul> <li> <p> <code>Minimum</code> — The lowest value observed during the specified period. Use this value to determine low volumes of activity for your application.</p> </li> <li> <p> <code>Maximum</code> — The highest value observed during the specified period. Use this value to determine high volumes of activity for your application.</p> </li> <li> <p> <code>Sum</code> — All values submitted for the matching metric added together. You can use this statistic to determine the total volume of a metric.</p> </li> <li> <p> <code>Average</code> — The value of Sum / SampleCount during the specified period. By comparing this statistic with the Minimum and Maximum values, you can determine the full scope of a metric and how close the average use is to the Minimum and Maximum values. This comparison helps you to know when to increase or decrease your resources.</p> </li> <li> <p> <code>SampleCount</code> — The count, or number, of data points used for the statistical calculation.</p> </li> </ul>"
         }
       }
     },
@@ -4432,7 +4861,7 @@
       "members":{
         "pageToken":{
           "shape":"string",
-          "documentation":"<p>A token used for advancing to the next page of results from your get instance snapshots request.</p>"
+          "documentation":"<p>The token to advance to the next page of results from your request.</p> <p>To get a page token, perform an initial <code>GetInstanceSnapshots</code> request. If your results are paginated, the response will return a next page token that you can specify as the page token in a subsequent request.</p>"
         }
       }
     },
@@ -4445,7 +4874,7 @@
         },
         "nextPageToken":{
           "shape":"string",
-          "documentation":"<p>A token used for advancing to the next page of results from your get instance snapshots request.</p>"
+          "documentation":"<p>The token to advance to the next page of resutls from your request.</p> <p>A next page token is not returned if there are no more results to display.</p> <p>To get the next page of results, perform another <code>GetInstanceSnapshots</code> request and specify the next page token using the <code>pageToken</code> parameter.</p>"
         }
       }
     },
@@ -4473,7 +4902,7 @@
       "members":{
         "pageToken":{
           "shape":"string",
-          "documentation":"<p>A token used for advancing to the next page of results from your get instances request.</p>"
+          "documentation":"<p>The token to advance to the next page of results from your request.</p> <p>To get a page token, perform an initial <code>GetInstances</code> request. If your results are paginated, the response will return a next page token that you can specify as the page token in a subsequent request.</p>"
         }
       }
     },
@@ -4486,7 +4915,7 @@
         },
         "nextPageToken":{
           "shape":"string",
-          "documentation":"<p>A token used for advancing to the next page of results from your get instances request.</p>"
+          "documentation":"<p>The token to advance to the next page of resutls from your request.</p> <p>A next page token is not returned if there are no more results to display.</p> <p>To get the next page of results, perform another <code>GetInstances</code> request and specify the next page token using the <code>pageToken</code> parameter.</p>"
         }
       }
     },
@@ -4514,7 +4943,7 @@
       "members":{
         "pageToken":{
           "shape":"string",
-          "documentation":"<p>A token used for advancing to the next page of results from your get key pairs request.</p>"
+          "documentation":"<p>The token to advance to the next page of results from your request.</p> <p>To get a page token, perform an initial <code>GetKeyPairs</code> request. If your results are paginated, the response will return a next page token that you can specify as the page token in a subsequent request.</p>"
         }
       }
     },
@@ -4527,7 +4956,7 @@
         },
         "nextPageToken":{
           "shape":"string",
-          "documentation":"<p>A token used for advancing to the next page of results from your get key pairs request.</p>"
+          "documentation":"<p>The token to advance to the next page of resutls from your request.</p> <p>A next page token is not returned if there are no more results to display.</p> <p>To get the next page of results, perform another <code>GetKeyPairs</code> request and specify the next page token using the <code>pageToken</code> parameter.</p>"
         }
       }
     },
@@ -4549,7 +4978,7 @@
         },
         "metricName":{
           "shape":"LoadBalancerMetricName",
-          "documentation":"<p>The metric about which you want to return information. Valid values are listed below, along with the most useful <code>statistics</code> to include in your request.</p> <ul> <li> <p> <b> <code>ClientTLSNegotiationErrorCount</code> </b> - The number of TLS connections initiated by the client that did not establish a session with the load balancer. Possible causes include a mismatch of ciphers or protocols.</p> <p> <code>Statistics</code>: The most useful statistic is <code>Sum</code>.</p> </li> <li> <p> <b> <code>HealthyHostCount</code> </b> - The number of target instances that are considered healthy.</p> <p> <code>Statistics</code>: The most useful statistic are <code>Average</code>, <code>Minimum</code>, and <code>Maximum</code>.</p> </li> <li> <p> <b> <code>UnhealthyHostCount</code> </b> - The number of target instances that are considered unhealthy.</p> <p> <code>Statistics</code>: The most useful statistic are <code>Average</code>, <code>Minimum</code>, and <code>Maximum</code>.</p> </li> <li> <p> <b> <code>HTTPCode_LB_4XX_Count</code> </b> - The number of HTTP 4XX client error codes that originate from the load balancer. Client errors are generated when requests are malformed or incomplete. These requests have not been received by the target instance. This count does not include any response codes generated by the target instances.</p> <p> <code>Statistics</code>: The most useful statistic is <code>Sum</code>. Note that <code>Minimum</code>, <code>Maximum</code>, and <code>Average</code> all return <code>1</code>.</p> </li> <li> <p> <b> <code>HTTPCode_LB_5XX_Count</code> </b> - The number of HTTP 5XX server error codes that originate from the load balancer. This count does not include any response codes generated by the target instances.</p> <p> <code>Statistics</code>: The most useful statistic is <code>Sum</code>. Note that <code>Minimum</code>, <code>Maximum</code>, and <code>Average</code> all return <code>1</code>. Note that <code>Minimum</code>, <code>Maximum</code>, and <code>Average</code> all return <code>1</code>.</p> </li> <li> <p> <b> <code>HTTPCode_Instance_2XX_Count</code> </b> - The number of HTTP response codes generated by the target instances. This does not include any response codes generated by the load balancer.</p> <p> <code>Statistics</code>: The most useful statistic is <code>Sum</code>. Note that <code>Minimum</code>, <code>Maximum</code>, and <code>Average</code> all return <code>1</code>.</p> </li> <li> <p> <b> <code>HTTPCode_Instance_3XX_Count</code> </b> - The number of HTTP response codes generated by the target instances. This does not include any response codes generated by the load balancer. </p> <p> <code>Statistics</code>: The most useful statistic is <code>Sum</code>. Note that <code>Minimum</code>, <code>Maximum</code>, and <code>Average</code> all return <code>1</code>.</p> </li> <li> <p> <b> <code>HTTPCode_Instance_4XX_Count</code> </b> - The number of HTTP response codes generated by the target instances. This does not include any response codes generated by the load balancer.</p> <p> <code>Statistics</code>: The most useful statistic is <code>Sum</code>. Note that <code>Minimum</code>, <code>Maximum</code>, and <code>Average</code> all return <code>1</code>.</p> </li> <li> <p> <b> <code>HTTPCode_Instance_5XX_Count</code> </b> - The number of HTTP response codes generated by the target instances. This does not include any response codes generated by the load balancer.</p> <p> <code>Statistics</code>: The most useful statistic is <code>Sum</code>. Note that <code>Minimum</code>, <code>Maximum</code>, and <code>Average</code> all return <code>1</code>.</p> </li> <li> <p> <b> <code>InstanceResponseTime</code> </b> - The time elapsed, in seconds, after the request leaves the load balancer until a response from the target instance is received.</p> <p> <code>Statistics</code>: The most useful statistic is <code>Average</code>.</p> </li> <li> <p> <b> <code>RejectedConnectionCount</code> </b> - The number of connections that were rejected because the load balancer had reached its maximum number of connections.</p> <p> <code>Statistics</code>: The most useful statistic is <code>Sum</code>.</p> </li> <li> <p> <b> <code>RequestCount</code> </b> - The number of requests processed over IPv4. This count includes only the requests with a response generated by a target instance of the load balancer.</p> <p> <code>Statistics</code>: The most useful statistic is <code>Sum</code>. Note that <code>Minimum</code>, <code>Maximum</code>, and <code>Average</code> all return <code>1</code>.</p> </li> </ul>"
+          "documentation":"<p>The metric for which you want to return information.</p> <p>Valid load balancer metric names are listed below, along with the most useful <code>statistics</code> to include in your request, and the published <code>unit</code> value.</p> <ul> <li> <p> <b> <code>ClientTLSNegotiationErrorCount</code> </b> — The number of TLS connections initiated by the client that did not establish a session with the load balancer due to a TLS error generated by the load balancer. Possible causes include a mismatch of ciphers or protocols.</p> <p> <code>Statistics</code>: The most useful statistic is <code>Sum</code>.</p> <p> <code>Unit</code>: The published unit is <code>Count</code>.</p> </li> <li> <p> <b> <code>HealthyHostCount</code> </b> — The number of target instances that are considered healthy.</p> <p> <code>Statistics</code>: The most useful statistic are <code>Average</code>, <code>Minimum</code>, and <code>Maximum</code>.</p> <p> <code>Unit</code>: The published unit is <code>Count</code>.</p> </li> <li> <p> <b> <code>HTTPCode_Instance_2XX_Count</code> </b> — The number of HTTP 2XX response codes generated by the target instances. This does not include any response codes generated by the load balancer.</p> <p> <code>Statistics</code>: The most useful statistic is <code>Sum</code>. Note that <code>Minimum</code>, <code>Maximum</code>, and <code>Average</code> all return <code>1</code>.</p> <p> <code>Unit</code>: The published unit is <code>Count</code>.</p> </li> <li> <p> <b> <code>HTTPCode_Instance_3XX_Count</code> </b> — The number of HTTP 3XX response codes generated by the target instances. This does not include any response codes generated by the load balancer.</p> <p> <code>Statistics</code>: The most useful statistic is <code>Sum</code>. Note that <code>Minimum</code>, <code>Maximum</code>, and <code>Average</code> all return <code>1</code>.</p> <p> <code>Unit</code>: The published unit is <code>Count</code>.</p> </li> <li> <p> <b> <code>HTTPCode_Instance_4XX_Count</code> </b> — The number of HTTP 4XX response codes generated by the target instances. This does not include any response codes generated by the load balancer.</p> <p> <code>Statistics</code>: The most useful statistic is <code>Sum</code>. Note that <code>Minimum</code>, <code>Maximum</code>, and <code>Average</code> all return <code>1</code>.</p> <p> <code>Unit</code>: The published unit is <code>Count</code>.</p> </li> <li> <p> <b> <code>HTTPCode_Instance_5XX_Count</code> </b> — The number of HTTP 5XX response codes generated by the target instances. This does not include any response codes generated by the load balancer.</p> <p> <code>Statistics</code>: The most useful statistic is <code>Sum</code>. Note that <code>Minimum</code>, <code>Maximum</code>, and <code>Average</code> all return <code>1</code>.</p> <p> <code>Unit</code>: The published unit is <code>Count</code>.</p> </li> <li> <p> <b> <code>HTTPCode_LB_4XX_Count</code> </b> — The number of HTTP 4XX client error codes that originated from the load balancer. Client errors are generated when requests are malformed or incomplete. These requests were not received by the target instance. This count does not include response codes generated by the target instances.</p> <p> <code>Statistics</code>: The most useful statistic is <code>Sum</code>. Note that <code>Minimum</code>, <code>Maximum</code>, and <code>Average</code> all return <code>1</code>.</p> <p> <code>Unit</code>: The published unit is <code>Count</code>.</p> </li> <li> <p> <b> <code>HTTPCode_LB_5XX_Count</code> </b> — The number of HTTP 5XX server error codes that originated from the load balancer. This does not include any response codes generated by the target instance. This metric is reported if there are no healthy instances attached to the load balancer, or if the request rate exceeds the capacity of the instances (spillover) or the load balancer.</p> <p> <code>Statistics</code>: The most useful statistic is <code>Sum</code>. Note that <code>Minimum</code>, <code>Maximum</code>, and <code>Average</code> all return <code>1</code>.</p> <p> <code>Unit</code>: The published unit is <code>Count</code>.</p> </li> <li> <p> <b> <code>InstanceResponseTime</code> </b> — The time elapsed, in seconds, after the request leaves the load balancer until a response from the target instance is received.</p> <p> <code>Statistics</code>: The most useful statistic is <code>Average</code>.</p> <p> <code>Unit</code>: The published unit is <code>Seconds</code>.</p> </li> <li> <p> <b> <code>RejectedConnectionCount</code> </b> — The number of connections that were rejected because the load balancer had reached its maximum number of connections.</p> <p> <code>Statistics</code>: The most useful statistic is <code>Sum</code>.</p> <p> <code>Unit</code>: The published unit is <code>Count</code>.</p> </li> <li> <p> <b> <code>RequestCount</code> </b> — The number of requests processed over IPv4. This count includes only the requests with a response generated by a target instance of the load balancer.</p> <p> <code>Statistics</code>: The most useful statistic is <code>Sum</code>. Note that <code>Minimum</code>, <code>Maximum</code>, and <code>Average</code> all return <code>1</code>.</p> <p> <code>Unit</code>: The published unit is <code>Count</code>.</p> </li> <li> <p> <b> <code>UnhealthyHostCount</code> </b> — The number of target instances that are considered unhealthy.</p> <p> <code>Statistics</code>: The most useful statistic are <code>Average</code>, <code>Minimum</code>, and <code>Maximum</code>.</p> <p> <code>Unit</code>: The published unit is <code>Count</code>.</p> </li> </ul>"
         },
         "period":{
           "shape":"MetricPeriod",
@@ -4565,11 +4994,11 @@
         },
         "unit":{
           "shape":"MetricUnit",
-          "documentation":"<p>The unit for the time period request. Valid values are listed below.</p>"
+          "documentation":"<p>The unit for the metric data request. Valid units depend on the metric data being required. For the valid units with each available metric, see the <code>metricName</code> parameter.</p>"
         },
         "statistics":{
           "shape":"MetricStatisticList",
-          "documentation":"<p>An array of statistics that you want to request metrics for. Valid values are listed below.</p> <ul> <li> <p> <b> <code>SampleCount</code> </b> - The count (number) of data points used for the statistical calculation.</p> </li> <li> <p> <b> <code>Average</code> </b> - The value of Sum / SampleCount during the specified period. By comparing this statistic with the Minimum and Maximum, you can determine the full scope of a metric and how close the average use is to the Minimum and Maximum. This comparison helps you to know when to increase or decrease your resources as needed.</p> </li> <li> <p> <b> <code>Sum</code> </b> - All values submitted for the matching metric added together. This statistic can be useful for determining the total volume of a metric.</p> </li> <li> <p> <b> <code>Minimum</code> </b> - The lowest value observed during the specified period. You can use this value to determine low volumes of activity for your application.</p> </li> <li> <p> <b> <code>Maximum</code> </b> - The highest value observed during the specified period. You can use this value to determine high volumes of activity for your application.</p> </li> </ul>"
+          "documentation":"<p>The statistic for the metric.</p> <p>The following statistics are available:</p> <ul> <li> <p> <code>Minimum</code> — The lowest value observed during the specified period. Use this value to determine low volumes of activity for your application.</p> </li> <li> <p> <code>Maximum</code> — The highest value observed during the specified period. Use this value to determine high volumes of activity for your application.</p> </li> <li> <p> <code>Sum</code> — All values submitted for the matching metric added together. You can use this statistic to determine the total volume of a metric.</p> </li> <li> <p> <code>Average</code> — The value of Sum / SampleCount during the specified period. By comparing this statistic with the Minimum and Maximum values, you can determine the full scope of a metric and how close the average use is to the Minimum and Maximum values. This comparison helps you to know when to increase or decrease your resources.</p> </li> <li> <p> <code>SampleCount</code> — The count, or number, of data points used for the statistical calculation.</p> </li> </ul>"
         }
       }
     },
@@ -4629,7 +5058,7 @@
       "members":{
         "pageToken":{
           "shape":"string",
-          "documentation":"<p>A token used for paginating the results from your GetLoadBalancers request.</p>"
+          "documentation":"<p>The token to advance to the next page of results from your request.</p> <p>To get a page token, perform an initial <code>GetLoadBalancers</code> request. If your results are paginated, the response will return a next page token that you can specify as the page token in a subsequent request.</p>"
         }
       }
     },
@@ -4642,7 +5071,7 @@
         },
         "nextPageToken":{
           "shape":"string",
-          "documentation":"<p>A token used for advancing to the next page of results from your GetLoadBalancers request.</p>"
+          "documentation":"<p>The token to advance to the next page of resutls from your request.</p> <p>A next page token is not returned if there are no more results to display.</p> <p>To get the next page of results, perform another <code>GetLoadBalancers</code> request and specify the next page token using the <code>pageToken</code> parameter.</p>"
         }
       }
     },
@@ -4661,7 +5090,7 @@
       "members":{
         "operation":{
           "shape":"Operation",
-          "documentation":"<p>An array of key-value pairs containing information about the results of your get operation request.</p>"
+          "documentation":"<p>An array of objects that describe the result of the action, such as the status of the request, the time stamp of the request, and the resources affected by the request.</p>"
         }
       }
     },
@@ -4675,7 +5104,7 @@
         },
         "pageToken":{
           "shape":"string",
-          "documentation":"<p>A token used for advancing to the next page of results from your get operations for resource request.</p>"
+          "documentation":"<p>The token to advance to the next page of results from your request.</p> <p>To get a page token, perform an initial <code>GetOperationsForResource</code> request. If your results are paginated, the response will return a next page token that you can specify as the page token in a subsequent request.</p>"
         }
       }
     },
@@ -4684,7 +5113,7 @@
       "members":{
         "operations":{
           "shape":"OperationList",
-          "documentation":"<p>An array of key-value pairs containing information about the results of your get operations for resource request.</p>"
+          "documentation":"<p>An array of objects that describe the result of the action, such as the status of the request, the time stamp of the request, and the resources affected by the request.</p>"
         },
         "nextPageCount":{
           "shape":"string",
@@ -4693,7 +5122,7 @@
         },
         "nextPageToken":{
           "shape":"string",
-          "documentation":"<p>An identifier that was returned from the previous call to this operation, which can be used to return the next set of items in the list.</p>"
+          "documentation":"<p>The token to advance to the next page of resutls from your request.</p> <p>A next page token is not returned if there are no more results to display.</p> <p>To get the next page of results, perform another <code>GetOperationsForResource</code> request and specify the next page token using the <code>pageToken</code> parameter.</p>"
         }
       }
     },
@@ -4702,7 +5131,7 @@
       "members":{
         "pageToken":{
           "shape":"string",
-          "documentation":"<p>A token used for advancing to the next page of results from your get operations request.</p>"
+          "documentation":"<p>The token to advance to the next page of results from your request.</p> <p>To get a page token, perform an initial <code>GetOperations</code> request. If your results are paginated, the response will return a next page token that you can specify as the page token in a subsequent request.</p>"
         }
       }
     },
@@ -4711,11 +5140,11 @@
       "members":{
         "operations":{
           "shape":"OperationList",
-          "documentation":"<p>An array of key-value pairs containing information about the results of your get operations request.</p>"
+          "documentation":"<p>An array of objects that describe the result of the action, such as the status of the request, the time stamp of the request, and the resources affected by the request.</p>"
         },
         "nextPageToken":{
           "shape":"string",
-          "documentation":"<p>A token used for advancing to the next page of results from your get operations request.</p>"
+          "documentation":"<p>The token to advance to the next page of resutls from your request.</p> <p>A next page token is not returned if there are no more results to display.</p> <p>To get the next page of results, perform another <code>GetOperations</code> request and specify the next page token using the <code>pageToken</code> parameter.</p>"
         }
       }
     },
@@ -4746,7 +5175,7 @@
       "members":{
         "pageToken":{
           "shape":"string",
-          "documentation":"<p>A token used for advancing to a specific page of results for your <code>get relational database blueprints</code> request.</p>"
+          "documentation":"<p>The token to advance to the next page of results from your request.</p> <p>To get a page token, perform an initial <code>GetRelationalDatabaseBlueprints</code> request. If your results are paginated, the response will return a next page token that you can specify as the page token in a subsequent request.</p>"
         }
       }
     },
@@ -4759,7 +5188,7 @@
         },
         "nextPageToken":{
           "shape":"string",
-          "documentation":"<p>A token used for advancing to the next page of results of your get relational database blueprints request.</p>"
+          "documentation":"<p>The token to advance to the next page of resutls from your request.</p> <p>A next page token is not returned if there are no more results to display.</p> <p>To get the next page of results, perform another <code>GetRelationalDatabaseBlueprints</code> request and specify the next page token using the <code>pageToken</code> parameter.</p>"
         }
       }
     },
@@ -4768,7 +5197,7 @@
       "members":{
         "pageToken":{
           "shape":"string",
-          "documentation":"<p>A token used for advancing to a specific page of results for your <code>get relational database bundles</code> request.</p>"
+          "documentation":"<p>The token to advance to the next page of results from your request.</p> <p>To get a page token, perform an initial <code>GetRelationalDatabaseBundles</code> request. If your results are paginated, the response will return a next page token that you can specify as the page token in a subsequent request.</p>"
         }
       }
     },
@@ -4781,7 +5210,7 @@
         },
         "nextPageToken":{
           "shape":"string",
-          "documentation":"<p>A token used for advancing to the next page of results of your get relational database bundles request.</p>"
+          "documentation":"<p>The token to advance to the next page of resutls from your request.</p> <p>A next page token is not returned if there are no more results to display.</p> <p>To get the next page of results, perform another <code>GetRelationalDatabaseBundles</code> request and specify the next page token using the <code>pageToken</code> parameter.</p>"
         }
       }
     },
@@ -4799,7 +5228,7 @@
         },
         "pageToken":{
           "shape":"string",
-          "documentation":"<p>A token used for advancing to a specific page of results from for get relational database events request.</p>"
+          "documentation":"<p>The token to advance to the next page of results from your request.</p> <p>To get a page token, perform an initial <code>GetRelationalDatabaseEvents</code> request. If your results are paginated, the response will return a next page token that you can specify as the page token in a subsequent request.</p>"
         }
       }
     },
@@ -4812,7 +5241,7 @@
         },
         "nextPageToken":{
           "shape":"string",
-          "documentation":"<p>A token used for advancing to the next page of results from your get relational database events request.</p>"
+          "documentation":"<p>The token to advance to the next page of resutls from your request.</p> <p>A next page token is not returned if there are no more results to display.</p> <p>To get the next page of results, perform another <code>GetRelationalDatabaseEvents</code> request and specify the next page token using the <code>pageToken</code> parameter.</p>"
         }
       }
     },
@@ -4845,7 +5274,7 @@
         },
         "pageToken":{
           "shape":"string",
-          "documentation":"<p>A token used for advancing to a specific page of results for your <code>get relational database log events</code> request.</p>"
+          "documentation":"<p>The token to advance to the next or previous page of results from your request.</p> <p>To get a page token, perform an initial <code>GetRelationalDatabaseLogEvents</code> request. If your results are paginated, the response will return a next forward token and/or next backward token that you can specify as the page token in a subsequent request.</p>"
         }
       }
     },
@@ -4930,11 +5359,11 @@
         },
         "metricName":{
           "shape":"RelationalDatabaseMetricName",
-          "documentation":"<p>The name of the metric data to return.</p>"
+          "documentation":"<p>The metric for which you want to return information.</p> <p>Valid relational database metric names are listed below, along with the most useful <code>statistics</code> to include in your request, and the published <code>unit</code> value. All relational database metric data is available in 1-minute (60 seconds) granularity.</p> <ul> <li> <p> <b> <code>CPUUtilization</code> </b> — The percentage of CPU utilization currently in use on the database.</p> <p> <code>Statistics</code>: The most useful statistics are <code>Maximum</code> and <code>Average</code>.</p> <p> <code>Unit</code>: The published unit is <code>Percent</code>.</p> </li> <li> <p> <b> <code>DatabaseConnections</code> </b> — The number of database connections in use.</p> <p> <code>Statistics</code>: The most useful statistics are <code>Maximum</code> and <code>Sum</code>.</p> <p> <code>Unit</code>: The published unit is <code>Count</code>.</p> </li> <li> <p> <b> <code>DiskQueueDepth</code> </b> — The number of outstanding IOs (read/write requests) that are waiting to access the disk.</p> <p> <code>Statistics</code>: The most useful statistic is <code>Sum</code>.</p> <p> <code>Unit</code>: The published unit is <code>Count</code>.</p> </li> <li> <p> <b> <code>FreeStorageSpace</code> </b> — The amount of available storage space.</p> <p> <code>Statistics</code>: The most useful statistic is <code>Sum</code>.</p> <p> <code>Unit</code>: The published unit is <code>Bytes</code>.</p> </li> <li> <p> <b> <code>NetworkReceiveThroughput</code> </b> — The incoming (Receive) network traffic on the database, including both customer database traffic and AWS traffic used for monitoring and replication.</p> <p> <code>Statistics</code>: The most useful statistic is <code>Average</code>.</p> <p> <code>Unit</code>: The published unit is <code>Bytes/Second</code>.</p> </li> <li> <p> <b> <code>NetworkTransmitThroughput</code> </b> — The outgoing (Transmit) network traffic on the database, including both customer database traffic and AWS traffic used for monitoring and replication.</p> <p> <code>Statistics</code>: The most useful statistic is <code>Average</code>.</p> <p> <code>Unit</code>: The published unit is <code>Bytes/Second</code>.</p> </li> </ul>"
         },
         "period":{
           "shape":"MetricPeriod",
-          "documentation":"<p>The granularity, in seconds, of the returned data points.</p>"
+          "documentation":"<p>The granularity, in seconds, of the returned data points.</p> <p>All relational database metric data is available in 1-minute (60 seconds) granularity.</p>"
         },
         "startTime":{
           "shape":"IsoDate",
@@ -4946,11 +5375,11 @@
         },
         "unit":{
           "shape":"MetricUnit",
-          "documentation":"<p>The unit for the metric data request.</p>"
+          "documentation":"<p>The unit for the metric data request. Valid units depend on the metric data being required. For the valid units with each available metric, see the <code>metricName</code> parameter.</p>"
         },
         "statistics":{
           "shape":"MetricStatisticList",
-          "documentation":"<p>The array of statistics for your metric data request.</p>"
+          "documentation":"<p>The statistic for the metric.</p> <p>The following statistics are available:</p> <ul> <li> <p> <code>Minimum</code> — The lowest value observed during the specified period. Use this value to determine low volumes of activity for your application.</p> </li> <li> <p> <code>Maximum</code> — The highest value observed during the specified period. Use this value to determine high volumes of activity for your application.</p> </li> <li> <p> <code>Sum</code> — All values submitted for the matching metric added together. You can use this statistic to determine the total volume of a metric.</p> </li> <li> <p> <code>Average</code> — The value of Sum / SampleCount during the specified period. By comparing this statistic with the Minimum and Maximum values, you can determine the full scope of a metric and how close the average use is to the Minimum and Maximum values. This comparison helps you to know when to increase or decrease your resources.</p> </li> <li> <p> <code>SampleCount</code> — The count, or number, of data points used for the statistical calculation.</p> </li> </ul>"
         }
       }
     },
@@ -4977,7 +5406,7 @@
         },
         "pageToken":{
           "shape":"string",
-          "documentation":"<p>A token used for advancing to a specific page of results for your <code>get relational database parameters</code> request.</p>"
+          "documentation":"<p>The token to advance to the next page of results from your request.</p> <p>To get a page token, perform an initial <code>GetRelationalDatabaseParameters</code> request. If your results are paginated, the response will return a next page token that you can specify as the page token in a subsequent request.</p>"
         }
       }
     },
@@ -4990,7 +5419,7 @@
         },
         "nextPageToken":{
           "shape":"string",
-          "documentation":"<p>A token used for advancing to the next page of results from your get static IPs request.</p>"
+          "documentation":"<p>The token to advance to the next page of resutls from your request.</p> <p>A next page token is not returned if there are no more results to display.</p> <p>To get the next page of results, perform another <code>GetRelationalDatabaseParameters</code> request and specify the next page token using the <code>pageToken</code> parameter.</p>"
         }
       }
     },
@@ -5037,7 +5466,7 @@
       "members":{
         "pageToken":{
           "shape":"string",
-          "documentation":"<p>A token used for advancing to a specific page of results for your <code>get relational database snapshots</code> request.</p>"
+          "documentation":"<p>The token to advance to the next page of results from your request.</p> <p>To get a page token, perform an initial <code>GetRelationalDatabaseSnapshots</code> request. If your results are paginated, the response will return a next page token that you can specify as the page token in a subsequent request.</p>"
         }
       }
     },
@@ -5050,7 +5479,7 @@
         },
         "nextPageToken":{
           "shape":"string",
-          "documentation":"<p>A token used for advancing to the next page of results from your get relational database snapshots request.</p>"
+          "documentation":"<p>The token to advance to the next page of resutls from your request.</p> <p>A next page token is not returned if there are no more results to display.</p> <p>To get the next page of results, perform another <code>GetRelationalDatabaseSnapshots</code> request and specify the next page token using the <code>pageToken</code> parameter.</p>"
         }
       }
     },
@@ -5059,7 +5488,7 @@
       "members":{
         "pageToken":{
           "shape":"string",
-          "documentation":"<p>A token used for advancing to a specific page of results for your <code>get relational database</code> request.</p>"
+          "documentation":"<p>The token to advance to the next page of results from your request.</p> <p>To get a page token, perform an initial <code>GetRelationalDatabases</code> request. If your results are paginated, the response will return a next page token that you can specify as the page token in a subsequent request.</p>"
         }
       }
     },
@@ -5072,7 +5501,7 @@
         },
         "nextPageToken":{
           "shape":"string",
-          "documentation":"<p>A token used for advancing to the next page of results from your get relational databases request.</p>"
+          "documentation":"<p>The token to advance to the next page of resutls from your request.</p> <p>A next page token is not returned if there are no more results to display.</p> <p>To get the next page of results, perform another <code>GetRelationalDatabases</code> request and specify the next page token using the <code>pageToken</code> parameter.</p>"
         }
       }
     },
@@ -5100,7 +5529,7 @@
       "members":{
         "pageToken":{
           "shape":"string",
-          "documentation":"<p>A token used for advancing to the next page of results from your get static IPs request.</p>"
+          "documentation":"<p>The token to advance to the next page of results from your request.</p> <p>To get a page token, perform an initial <code>GetStaticIps</code> request. If your results are paginated, the response will return a next page token that you can specify as the page token in a subsequent request.</p>"
         }
       }
     },
@@ -5113,7 +5542,7 @@
         },
         "nextPageToken":{
           "shape":"string",
-          "documentation":"<p>A token used for advancing to the next page of results from your get static IPs request.</p>"
+          "documentation":"<p>The token to advance to the next page of resutls from your request.</p> <p>A next page token is not returned if there are no more results to display.</p> <p>To get the next page of results, perform another <code>GetStaticIps</code> request and specify the next page token using the <code>pageToken</code> parameter.</p>"
         }
       }
     },
@@ -5177,7 +5606,7 @@
       "members":{
         "operation":{
           "shape":"Operation",
-          "documentation":"<p>An array of key-value pairs containing information about the request operation.</p>"
+          "documentation":"<p>An array of objects that describe the result of the action, such as the status of the request, the time stamp of the request, and the resources affected by the request.</p>"
         }
       }
     },
@@ -6139,6 +6568,34 @@
       "type":"list",
       "member":{"shape":"MetricDatapoint"}
     },
+    "MetricName":{
+      "type":"string",
+      "enum":[
+        "CPUUtilization",
+        "NetworkIn",
+        "NetworkOut",
+        "StatusCheckFailed",
+        "StatusCheckFailed_Instance",
+        "StatusCheckFailed_System",
+        "ClientTLSNegotiationErrorCount",
+        "HealthyHostCount",
+        "UnhealthyHostCount",
+        "HTTPCode_LB_4XX_Count",
+        "HTTPCode_LB_5XX_Count",
+        "HTTPCode_Instance_2XX_Count",
+        "HTTPCode_Instance_3XX_Count",
+        "HTTPCode_Instance_4XX_Count",
+        "HTTPCode_Instance_5XX_Count",
+        "InstanceResponseTime",
+        "RejectedConnectionCount",
+        "RequestCount",
+        "DatabaseConnections",
+        "DiskQueueDepth",
+        "FreeStorageSpace",
+        "NetworkReceiveThroughput",
+        "NetworkTransmitThroughput"
+      ]
+    },
     "MetricPeriod":{
       "type":"integer",
       "max":86400,
@@ -6190,6 +6647,24 @@
         "None"
       ]
     },
+    "MonitoredResourceInfo":{
+      "type":"structure",
+      "members":{
+        "arn":{
+          "shape":"ResourceArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the resource being monitored.</p>"
+        },
+        "name":{
+          "shape":"ResourceName",
+          "documentation":"<p>The name of the Lightsail resource being monitored.</p>"
+        },
+        "resourceType":{
+          "shape":"ResourceType",
+          "documentation":"<p>The Lightsail resource type of the resource being monitored.</p> <p>Instances, load balancers, and relational databases are the only Lightsail resources that can currently be monitored by alarms.</p>"
+        }
+      },
+      "documentation":"<p>Describes resource being monitored by an alarm.</p> <p>An alarm is a way to monitor your Amazon Lightsail resource metrics. For more information, see <a href=\"https://lightsail.aws.amazon.com/ls/docs/en_us/articles/amazon-lightsail-alarms\">Alarms in Amazon Lightsail</a>.</p>"
+    },
     "MonthlyTransfer":{
       "type":"structure",
       "members":{
@@ -6223,6 +6698,10 @@
       "documentation":"<p>Lightsail throws this exception when it cannot find a resource.</p>",
       "exception":true
     },
+    "NotificationTriggerList":{
+      "type":"list",
+      "member":{"shape":"AlarmState"}
+    },
     "OpenInstancePublicPortsRequest":{
       "type":"structure",
       "required":[
@@ -6245,7 +6724,7 @@
       "members":{
         "operation":{
           "shape":"Operation",
-          "documentation":"<p>An array of key-value pairs containing information about the request operation.</p>"
+          "documentation":"<p>An array of objects that describe the result of the action, such as the status of the request, the time stamp of the request, and the resources affected by the request.</p>"
         }
       }
     },
@@ -6377,7 +6856,15 @@
         "RebootRelationalDatabase",
         "StopRelationalDatabase",
         "EnableAddOn",
-        "DisableAddOn"
+        "DisableAddOn",
+        "PutAlarm",
+        "GetAlarms",
+        "DeleteAlarm",
+        "TestAlarm",
+        "CreateContactMethod",
+        "GetContactMethods",
+        "SendContactMethodVerification",
+        "DeleteContactMethod"
       ]
     },
     "PasswordData":{
@@ -6404,7 +6891,7 @@
       "members":{
         "operation":{
           "shape":"Operation",
-          "documentation":"<p>An array of key-value pairs containing information about the request operation.</p>"
+          "documentation":"<p>An array of objects that describe the result of the action, such as the status of the request, the time stamp of the request, and the resources affected by the request.</p>"
         }
       }
     },
@@ -6502,6 +6989,72 @@
         "closed"
       ]
     },
+    "PutAlarmRequest":{
+      "type":"structure",
+      "required":[
+        "alarmName",
+        "metricName",
+        "monitoredResourceName",
+        "comparisonOperator",
+        "threshold",
+        "evaluationPeriods"
+      ],
+      "members":{
+        "alarmName":{
+          "shape":"ResourceName",
+          "documentation":"<p>The name for the alarm. Specify the name of an existing alarm to update, and overwrite the previous configuration of the alarm.</p>"
+        },
+        "metricName":{
+          "shape":"MetricName",
+          "documentation":"<p>The name of the metric to associate with the alarm.</p> <p>You can configure up to two alarms per metric.</p> <p>The following metrics are available for each resource type:</p> <ul> <li> <p> <b>Instances</b>: <code>CPUUtilization</code>, <code>NetworkIn</code>, <code>NetworkOut</code>, <code>StatusCheckFailed</code>, <code>StatusCheckFailed_Instance</code>, and <code>StatusCheckFailed_System</code>.</p> </li> <li> <p> <b>Load balancers</b>: <code>ClientTLSNegotiationErrorCount</code>, <code>HealthyHostCount</code>, <code>UnhealthyHostCount</code>, <code>HTTPCode_LB_4XX_Count</code>, <code>HTTPCode_LB_5XX_Count</code>, <code>HTTPCode_Instance_2XX_Count</code>, <code>HTTPCode_Instance_3XX_Count</code>, <code>HTTPCode_Instance_4XX_Count</code>, <code>HTTPCode_Instance_5XX_Count</code>, <code>InstanceResponseTime</code>, <code>RejectedConnectionCount</code>, and <code>RequestCount</code>.</p> </li> <li> <p> <b>Relational databases</b>: <code>CPUUtilization</code>, <code>DatabaseConnections</code>, <code>DiskQueueDepth</code>, <code>FreeStorageSpace</code>, <code>NetworkReceiveThroughput</code>, and <code>NetworkTransmitThroughput</code>.</p> </li> </ul>"
+        },
+        "monitoredResourceName":{
+          "shape":"ResourceName",
+          "documentation":"<p>The name of the Lightsail resource that will be monitored.</p> <p>Instances, load balancers, and relational databases are the only Lightsail resources that can currently be monitored by alarms.</p>"
+        },
+        "comparisonOperator":{
+          "shape":"ComparisonOperator",
+          "documentation":"<p>The arithmetic operation to use when comparing the specified statistic to the threshold. The specified statistic value is used as the first operand.</p>"
+        },
+        "threshold":{
+          "shape":"double",
+          "documentation":"<p>The value against which the specified statistic is compared.</p>"
+        },
+        "evaluationPeriods":{
+          "shape":"integer",
+          "documentation":"<p>The number of most recent periods over which data is compared to the specified threshold. If you are setting an \"M out of N\" alarm, this value (<code>evaluationPeriods</code>) is the N.</p> <p>If you are setting an alarm that requires that a number of consecutive data points be breaching to trigger the alarm, this value specifies the rolling period of time in which data points are evaluated.</p> <p>Each evaluation period is five minutes long. For example, specify an evaluation period of 24 to evaluate a metric over a rolling period of two hours.</p> <p>You can specify a minimum valuation period of 1 (5 minutes), and a maximum evaluation period of 288 (24 hours).</p>"
+        },
+        "datapointsToAlarm":{
+          "shape":"integer",
+          "documentation":"<p>The number of data points that must be not within the specified threshold to trigger the alarm. If you are setting an \"M out of N\" alarm, this value (<code>datapointsToAlarm</code>) is the M.</p>"
+        },
+        "treatMissingData":{
+          "shape":"TreatMissingData",
+          "documentation":"<p>Sets how this alarm will handle missing data points.</p> <p>An alarm can treat missing data in the following ways:</p> <ul> <li> <p> <code>breaching</code> — Assume the missing data is not within the threshold. Missing data counts towards the number of times the metric is not within the threshold.</p> </li> <li> <p> <code>notBreaching</code> — Assume the missing data is within the threshold. Missing data does not count towards the number of times the metric is not within the threshold.</p> </li> <li> <p> <code>ignore</code> — Ignore the missing data. Maintains the current alarm state.</p> </li> <li> <p> <code>missing</code> — Missing data is treated as missing.</p> </li> </ul> <p>If <code>treatMissingData</code> is not specified, the default behavior of <code>missing</code> is used.</p>"
+        },
+        "contactProtocols":{
+          "shape":"ContactProtocolsList",
+          "documentation":"<p>The contact protocols to use for the alarm, such as <code>Email</code>, <code>SMS</code> (text messaging), or both.</p> <p>A notification is sent via the specified contact protocol if notifications are enabled for the alarm, and when the alarm is triggered.</p> <p>A notification is not sent if a contact protocol is not specified, if the specified contact protocol is not configured in the AWS Region, or if notifications are not enabled for the alarm using the <code>notificationEnabled</code> paramater.</p> <p>Use the <code>CreateContactMethod</code> action to configure a contact protocol in an AWS Region.</p>"
+        },
+        "notificationTriggers":{
+          "shape":"NotificationTriggerList",
+          "documentation":"<p>The alarm states that trigger a notification.</p> <p>An alarm has the following possible states:</p> <ul> <li> <p> <code>ALARM</code> — The metric is outside of the defined threshold.</p> </li> <li> <p> <code>INSUFFICIENT_DATA</code> — The alarm has just started, the metric is not available, or not enough data is available for the metric to determine the alarm state.</p> </li> <li> <p> <code>OK</code> — The metric is within the defined threshold.</p> </li> </ul> <p>When you specify a notification trigger, the <code>ALARM</code> state must be specified. The <code>INSUFFICIENT_DATA</code> and <code>OK</code> states can be specified in addition to the <code>ALARM</code> state.</p> <ul> <li> <p>If you specify <code>OK</code> as an alarm trigger, a notification is sent when the alarm switches from an <code>ALARM</code> or <code>INSUFFICIENT_DATA</code> alarm state to an <code>OK</code> state. This can be thought of as an <i>all clear</i> alarm notification.</p> </li> <li> <p>If you specify <code>INSUFFICIENT_DATA</code> as the alarm trigger, a notification is sent when the alarm switches from an <code>OK</code> or <code>ALARM</code> alarm state to an <code>INSUFFICIENT_DATA</code> state.</p> </li> </ul> <p>The notification trigger defaults to <code>ALARM</code> if you don't specify this parameter.</p>"
+        },
+        "notificationEnabled":{
+          "shape":"boolean",
+          "documentation":"<p>Indicates whether the alarm is enabled.</p> <p>Notifications are enabled by default if you don't specify this parameter.</p>"
+        }
+      }
+    },
+    "PutAlarmResult":{
+      "type":"structure",
+      "members":{
+        "operations":{
+          "shape":"OperationList",
+          "documentation":"<p>An array of objects that describe the result of the action, such as the status of the request, the time stamp of the request, and the resources affected by the request.</p>"
+        }
+      }
+    },
     "PutInstancePublicPortsRequest":{
       "type":"structure",
       "required":[
@@ -6524,7 +7077,7 @@
       "members":{
         "operation":{
           "shape":"Operation",
-          "documentation":"<p>Describes metadata about the operation you just executed.</p>"
+          "documentation":"<p>An array of objects that describe the result of the action, such as the status of the request, the time stamp of the request, and the resources affected by the request.</p>"
         }
       }
     },
@@ -6543,7 +7096,7 @@
       "members":{
         "operations":{
           "shape":"OperationList",
-          "documentation":"<p>An array of key-value pairs containing information about the request operations.</p>"
+          "documentation":"<p>An array of objects that describe the result of the action, such as the status of the request, the time stamp of the request, and the resources affected by the request.</p>"
         }
       }
     },
@@ -6562,7 +7115,7 @@
       "members":{
         "operations":{
           "shape":"OperationList",
-          "documentation":"<p>An object describing the result of your reboot relational database request.</p>"
+          "documentation":"<p>An array of objects that describe the result of the action, such as the status of the request, the time stamp of the request, and the resources affected by the request.</p>"
         }
       }
     },
@@ -6729,6 +7282,10 @@
         "pendingMaintenanceActions":{
           "shape":"PendingMaintenanceActionList",
           "documentation":"<p>Describes the pending maintenance actions for the database.</p>"
+        },
+        "caCertificateIdentifier":{
+          "shape":"string",
+          "documentation":"<p>The certificate associated with the database.</p>"
         }
       },
       "documentation":"<p>Describes a database.</p>"
@@ -7025,7 +7582,7 @@
       "members":{
         "operations":{
           "shape":"OperationList",
-          "documentation":"<p>An array of key-value pairs containing information about the request operation.</p>"
+          "documentation":"<p>An array of objects that describe the result of the action, such as the status of the request, the time stamp of the request, and the resources affected by the request.</p>"
         }
       }
     },
@@ -7071,9 +7628,30 @@
         "RelationalDatabase",
         "RelationalDatabaseSnapshot",
         "ExportSnapshotRecord",
-        "CloudFormationStackRecord"
+        "CloudFormationStackRecord",
+        "Alarm",
+        "ContactMethod"
       ]
     },
+    "SendContactMethodVerificationRequest":{
+      "type":"structure",
+      "required":["protocol"],
+      "members":{
+        "protocol":{
+          "shape":"ContactMethodVerificationProtocol",
+          "documentation":"<p>The protocol to verify, such as <code>Email</code> or <code>SMS</code> (text messaging).</p>"
+        }
+      }
+    },
+    "SendContactMethodVerificationResult":{
+      "type":"structure",
+      "members":{
+        "operations":{
+          "shape":"OperationList",
+          "documentation":"<p>An array of objects that describe the result of the action, such as the status of the request, the time stamp of the request, and the resources affected by the request.</p>"
+        }
+      }
+    },
     "SensitiveString":{
       "type":"string",
       "sensitive":true
@@ -7105,7 +7683,7 @@
       "members":{
         "operations":{
           "shape":"OperationList",
-          "documentation":"<p>An array of key-value pairs containing information about the request operation.</p>"
+          "documentation":"<p>An array of objects that describe the result of the action, such as the status of the request, the time stamp of the request, and the resources affected by the request.</p>"
         }
       }
     },
@@ -7124,7 +7702,7 @@
       "members":{
         "operations":{
           "shape":"OperationList",
-          "documentation":"<p>An object describing the result of your start relational database request.</p>"
+          "documentation":"<p>An array of objects that describe the result of the action, such as the status of the request, the time stamp of the request, and the resources affected by the request.</p>"
         }
       }
     },
@@ -7193,7 +7771,7 @@
       "members":{
         "operations":{
           "shape":"OperationList",
-          "documentation":"<p>An array of key-value pairs containing information about the request operation.</p>"
+          "documentation":"<p>An array of objects that describe the result of the action, such as the status of the request, the time stamp of the request, and the resources affected by the request.</p>"
         }
       }
     },
@@ -7216,7 +7794,7 @@
       "members":{
         "operations":{
           "shape":"OperationList",
-          "documentation":"<p>An object describing the result of your stop relational database request.</p>"
+          "documentation":"<p>An array of objects that describe the result of the action, such as the status of the request, the time stamp of the request, and the resources affected by the request.</p>"
         }
       }
     },
@@ -7278,15 +7856,50 @@
       "members":{
         "operations":{
           "shape":"OperationList",
-          "documentation":"<p>A list of objects describing the API operation.</p>"
+          "documentation":"<p>An array of objects that describe the result of the action, such as the status of the request, the time stamp of the request, and the resources affected by the request.</p>"
         }
       }
     },
     "TagValue":{"type":"string"},
+    "TestAlarmRequest":{
+      "type":"structure",
+      "required":[
+        "alarmName",
+        "state"
+      ],
+      "members":{
+        "alarmName":{
+          "shape":"ResourceName",
+          "documentation":"<p>The name of the alarm to test.</p>"
+        },
+        "state":{
+          "shape":"AlarmState",
+          "documentation":"<p>The alarm state to test.</p> <p>An alarm has the following possible states that can be tested:</p> <ul> <li> <p> <code>ALARM</code> — The metric is outside of the defined threshold.</p> </li> <li> <p> <code>INSUFFICIENT_DATA</code> — The alarm has just started, the metric is not available, or not enough data is available for the metric to determine the alarm state.</p> </li> <li> <p> <code>OK</code> — The metric is within the defined threshold.</p> </li> </ul>"
+        }
+      }
+    },
+    "TestAlarmResult":{
+      "type":"structure",
+      "members":{
+        "operations":{
+          "shape":"OperationList",
+          "documentation":"<p>An array of objects that describe the result of the action, such as the status of the request, the time stamp of the request, and the resources affected by the request.</p>"
+        }
+      }
+    },
     "TimeOfDay":{
       "type":"string",
       "pattern":"^(0[0-9]|1[0-9]|2[0-3]):[0-5][0-9]$"
     },
+    "TreatMissingData":{
+      "type":"string",
+      "enum":[
+        "breaching",
+        "notBreaching",
+        "ignore",
+        "missing"
+      ]
+    },
     "UnauthenticatedException":{
       "type":"structure",
       "members":{
@@ -7308,7 +7921,7 @@
       "members":{
         "operation":{
           "shape":"Operation",
-          "documentation":"<p>An array of key-value pairs containing information about the request operation.</p>"
+          "documentation":"<p>An array of objects that describe the result of the action, such as the status of the request, the time stamp of the request, and the resources affected by the request.</p>"
         }
       }
     },
@@ -7338,7 +7951,7 @@
       "members":{
         "operations":{
           "shape":"OperationList",
-          "documentation":"<p>A list of objects describing the API operation.</p>"
+          "documentation":"<p>An array of objects that describe the result of the action, such as the status of the request, the time stamp of the request, and the resources affected by the request.</p>"
         }
       }
     },
@@ -7364,7 +7977,7 @@
       "members":{
         "operations":{
           "shape":"OperationList",
-          "documentation":"<p>An array of key-value pairs containing information about the request operation.</p>"
+          "documentation":"<p>An array of objects that describe the result of the action, such as the status of the request, the time stamp of the request, and the resources affected by the request.</p>"
         }
       }
     },
@@ -7395,7 +8008,7 @@
       "members":{
         "operations":{
           "shape":"OperationList",
-          "documentation":"<p>An object describing the API operations.</p>"
+          "documentation":"<p>An array of objects that describe the result of the action, such as the status of the request, the time stamp of the request, and the resources affected by the request.</p>"
         }
       }
     },
@@ -7421,7 +8034,7 @@
       "members":{
         "operations":{
           "shape":"OperationList",
-          "documentation":"<p>An object describing the result of your update relational database parameters request.</p>"
+          "documentation":"<p>An array of objects that describe the result of the action, such as the status of the request, the time stamp of the request, and the resources affected by the request.</p>"
         }
       }
     },
@@ -7464,6 +8077,10 @@
         "applyImmediately":{
           "shape":"boolean",
           "documentation":"<p>When <code>true</code>, applies changes immediately. When <code>false</code>, applies changes during the preferred maintenance window. Some changes may cause an outage.</p> <p>Default: <code>false</code> </p>"
+        },
+        "caCertificateIdentifier":{
+          "shape":"string",
+          "documentation":"<p>Indicates the certificate that needs to be associated with the database.</p>"
         }
       }
     },
@@ -7472,7 +8089,7 @@
       "members":{
         "operations":{
           "shape":"OperationList",
-          "documentation":"<p>An object describing the result of your update relational database request.</p>"
+          "documentation":"<p>An array of objects that describe the result of the action, such as the status of the request, the time stamp of the request, and the resources affected by the request.</p>"
         }
       }
     },
diff --git a/services/machinelearning/build.properties b/services/machinelearning/build.properties
index ecf2dae6fcb1..15ec2da1fc71 100644
--- a/services/machinelearning/build.properties
+++ b/services/machinelearning/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/machinelearning/pom.xml b/services/machinelearning/pom.xml
index 8be797dea933..6c37a44e7e60 100644
--- a/services/machinelearning/pom.xml
+++ b/services/machinelearning/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>machinelearning</artifactId>
     <name>AWS Java SDK :: Services :: Amazon Machine Learning</name>
diff --git a/services/machinelearning/src/it/java/software/amazon/awssdk/services/machinelearning/AmazonMachineLearningIntegrationTest.java b/services/machinelearning/src/it/java/software/amazon/awssdk/services/machinelearning/AmazonMachineLearningIntegrationTest.java
index b50c4a1d71cb..cb628f0f5188 100644
--- a/services/machinelearning/src/it/java/software/amazon/awssdk/services/machinelearning/AmazonMachineLearningIntegrationTest.java
+++ b/services/machinelearning/src/it/java/software/amazon/awssdk/services/machinelearning/AmazonMachineLearningIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/machinelearning/src/main/java/software/amazon/awssdk/services/machinelearning/internal/PredictEndpointInterceptor.java b/services/machinelearning/src/main/java/software/amazon/awssdk/services/machinelearning/internal/PredictEndpointInterceptor.java
index d27b42391a03..23f5a88c34c2 100644
--- a/services/machinelearning/src/main/java/software/amazon/awssdk/services/machinelearning/internal/PredictEndpointInterceptor.java
+++ b/services/machinelearning/src/main/java/software/amazon/awssdk/services/machinelearning/internal/PredictEndpointInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/machinelearning/src/main/java/software/amazon/awssdk/services/machinelearning/internal/RandomIdInterceptor.java b/services/machinelearning/src/main/java/software/amazon/awssdk/services/machinelearning/internal/RandomIdInterceptor.java
index 3e9ee6d9f721..8a152832dfdc 100644
--- a/services/machinelearning/src/main/java/software/amazon/awssdk/services/machinelearning/internal/RandomIdInterceptor.java
+++ b/services/machinelearning/src/main/java/software/amazon/awssdk/services/machinelearning/internal/RandomIdInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/machinelearning/src/test/resources/cucumber.properties b/services/machinelearning/src/test/resources/cucumber.properties
index c69428797963..f8ef23baeb62 100644
--- a/services/machinelearning/src/test/resources/cucumber.properties
+++ b/services/machinelearning/src/test/resources/cucumber.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/macie/pom.xml b/services/macie/pom.xml
index be3df87ff3d4..6a8d6b26d33c 100644
--- a/services/macie/pom.xml
+++ b/services/macie/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>macie</artifactId>
     <name>AWS Java SDK :: Services :: Macie</name>
diff --git a/services/managedblockchain/pom.xml b/services/managedblockchain/pom.xml
index dca8f4b6a54e..fd43d59f2fc8 100644
--- a/services/managedblockchain/pom.xml
+++ b/services/managedblockchain/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>managedblockchain</artifactId>
     <name>AWS Java SDK :: Services :: ManagedBlockchain</name>
diff --git a/services/managedblockchain/src/main/resources/codegen-resources/service-2.json b/services/managedblockchain/src/main/resources/codegen-resources/service-2.json
index 36523922808e..8996a8c318b1 100644
--- a/services/managedblockchain/src/main/resources/codegen-resources/service-2.json
+++ b/services/managedblockchain/src/main/resources/codegen-resources/service-2.json
@@ -310,6 +310,40 @@
       ],
       "documentation":"<p>Rejects an invitation to join a network. This action can be called by a principal in an AWS account that has received an invitation to create a member and join a network.</p>"
     },
+    "UpdateMember":{
+      "name":"UpdateMember",
+      "http":{
+        "method":"PATCH",
+        "requestUri":"/networks/{networkId}/members/{memberId}"
+      },
+      "input":{"shape":"UpdateMemberInput"},
+      "output":{"shape":"UpdateMemberOutput"},
+      "errors":[
+        {"shape":"InvalidRequestException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"InternalServiceErrorException"}
+      ],
+      "documentation":"<p>Updates a member configuration with new parameters.</p>"
+    },
+    "UpdateNode":{
+      "name":"UpdateNode",
+      "http":{
+        "method":"PATCH",
+        "requestUri":"/networks/{networkId}/members/{memberId}/nodes/{nodeId}"
+      },
+      "input":{"shape":"UpdateNodeInput"},
+      "output":{"shape":"UpdateNodeOutput"},
+      "errors":[
+        {"shape":"InvalidRequestException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"InternalServiceErrorException"}
+      ],
+      "documentation":"<p>Updates a node configuration with new parameters.</p>"
+    },
     "VoteOnProposal":{
       "name":"VoteOnProposal",
       "http":{
@@ -614,6 +648,10 @@
         "STANDARD"
       ]
     },
+    "Enabled":{
+      "type":"boolean",
+      "box":true
+    },
     "Framework":{
       "type":"string",
       "enum":["HYPERLEDGER_FABRIC"]
@@ -1092,6 +1130,26 @@
         }
       }
     },
+    "LogConfiguration":{
+      "type":"structure",
+      "members":{
+        "Enabled":{
+          "shape":"Enabled",
+          "documentation":"<p>Indicates whether logging is enabled.</p>"
+        }
+      },
+      "documentation":"<p>A configuration for logging events.</p>"
+    },
+    "LogConfigurations":{
+      "type":"structure",
+      "members":{
+        "Cloudwatch":{
+          "shape":"LogConfiguration",
+          "documentation":"<p>Parameters for publishing logs to Amazon CloudWatch Logs.</p>"
+        }
+      },
+      "documentation":"<p>A collection of log configurations.</p>"
+    },
     "Member":{
       "type":"structure",
       "members":{
@@ -1115,6 +1173,10 @@
           "shape":"MemberFrameworkAttributes",
           "documentation":"<p>Attributes relevant to a member for the blockchain framework that the Managed Blockchain network uses.</p>"
         },
+        "LogPublishingConfiguration":{
+          "shape":"MemberLogPublishingConfiguration",
+          "documentation":"<p>Configuration properties for logging events associated with a member.</p>"
+        },
         "Status":{
           "shape":"MemberStatus",
           "documentation":"<p>The status of a member.</p> <ul> <li> <p> <code>CREATING</code> - The AWS account is in the process of creating a member.</p> </li> <li> <p> <code>AVAILABLE</code> - The member has been created and can participate in the network.</p> </li> <li> <p> <code>CREATE_FAILED</code> - The AWS account attempted to create a member and creation failed.</p> </li> <li> <p> <code>DELETING</code> - The member and all associated resources are in the process of being deleted. Either the AWS account that owns the member deleted it, or the member is being deleted as the result of an <code>APPROVED</code> <code>PROPOSAL</code> to remove the member.</p> </li> <li> <p> <code>DELETED</code> - The member can no longer participate on the network and all associated resources are deleted. Either the AWS account that owns the member deleted it, or the member is being deleted as the result of an <code>APPROVED</code> <code>PROPOSAL</code> to remove the member.</p> </li> </ul>"
@@ -1144,6 +1206,10 @@
         "FrameworkConfiguration":{
           "shape":"MemberFrameworkConfiguration",
           "documentation":"<p>Configuration properties of the blockchain framework relevant to the member.</p>"
+        },
+        "LogPublishingConfiguration":{
+          "shape":"MemberLogPublishingConfiguration",
+          "documentation":"<p/>"
         }
       },
       "documentation":"<p>Configuration properties of the member.</p>"
@@ -1180,6 +1246,16 @@
       },
       "documentation":"<p>Configuration properties for Hyperledger Fabric for a member in a Managed Blockchain network using the Hyperledger Fabric framework.</p>"
     },
+    "MemberFabricLogPublishingConfiguration":{
+      "type":"structure",
+      "members":{
+        "CaLogs":{
+          "shape":"LogConfigurations",
+          "documentation":"<p>Configuration properties for logging events associated with a member's Certificate Authority (CA). CA logs help you determine when a member in your account joins the network, or when new peers register with a member CA.</p>"
+        }
+      },
+      "documentation":"<p>Configuration properties for logging events associated with a member of a Managed Blockchain network using the Hyperledger Fabric framework.</p>"
+    },
     "MemberFrameworkAttributes":{
       "type":"structure",
       "members":{
@@ -1206,12 +1282,23 @@
       "max":20,
       "min":1
     },
+    "MemberLogPublishingConfiguration":{
+      "type":"structure",
+      "members":{
+        "Fabric":{
+          "shape":"MemberFabricLogPublishingConfiguration",
+          "documentation":"<p>Configuration properties for logging events associated with a member of a Managed Blockchain network using the Hyperledger Fabric framework.</p>"
+        }
+      },
+      "documentation":"<p>Configuration properties for logging events associated with a member of a Managed Blockchain network.</p>"
+    },
     "MemberStatus":{
       "type":"string",
       "enum":[
         "CREATING",
         "AVAILABLE",
         "CREATE_FAILED",
+        "UPDATING",
         "DELETING",
         "DELETED"
       ]
@@ -1311,7 +1398,7 @@
         },
         "Edition":{
           "shape":"Edition",
-          "documentation":"<p>The edition of Amazon Managed Blockchain that Hyperledger Fabric uses. For more information, see <a href=\"https://aws.amazon.com/managed-blockchain/pricing/\">Amazon Managed Blockchain Pricing</a>.</p>"
+          "documentation":"<p>The edition of Amazon Managed Blockchain that Hyperledger Fabric uses. For more information, see <a href=\"http://aws.amazon.com/managed-blockchain/pricing/\">Amazon Managed Blockchain Pricing</a>.</p>"
         }
       },
       "documentation":"<p>Attributes of Hyperledger Fabric for a network.</p>"
@@ -1322,7 +1409,7 @@
       "members":{
         "Edition":{
           "shape":"Edition",
-          "documentation":"<p>The edition of Amazon Managed Blockchain that the network uses. For more information, see <a href=\"https://aws.amazon.com/managed-blockchain/pricing/\">Amazon Managed Blockchain Pricing</a>.</p>"
+          "documentation":"<p>The edition of Amazon Managed Blockchain that the network uses. For more information, see <a href=\"http://aws.amazon.com/managed-blockchain/pricing/\">Amazon Managed Blockchain Pricing</a>.</p>"
         }
       },
       "documentation":"<p>Hyperledger Fabric configuration properties for the network.</p>"
@@ -1434,6 +1521,10 @@
           "shape":"NodeFrameworkAttributes",
           "documentation":"<p>Attributes of the blockchain framework being used.</p>"
         },
+        "LogPublishingConfiguration":{
+          "shape":"NodeLogPublishingConfiguration",
+          "documentation":"<p/>"
+        },
         "Status":{
           "shape":"NodeStatus",
           "documentation":"<p>The status of the node.</p>"
@@ -1459,6 +1550,10 @@
         "AvailabilityZone":{
           "shape":"AvailabilityZoneString",
           "documentation":"<p>The Availability Zone in which the node exists.</p>"
+        },
+        "LogPublishingConfiguration":{
+          "shape":"NodeLogPublishingConfiguration",
+          "documentation":"<p/>"
         }
       },
       "documentation":"<p>Configuration properties of a peer node.</p>"
@@ -1477,6 +1572,20 @@
       },
       "documentation":"<p>Attributes of Hyperledger Fabric for a peer node on a Managed Blockchain network that uses Hyperledger Fabric.</p>"
     },
+    "NodeFabricLogPublishingConfiguration":{
+      "type":"structure",
+      "members":{
+        "ChaincodeLogs":{
+          "shape":"LogConfigurations",
+          "documentation":"<p>Configuration properties for logging events associated with chaincode execution on a peer node. Chaincode logs contain the results of instantiating, invoking, and querying the chaincode. A peer can run multiple instances of chaincode. When enabled, a log stream is created for all chaincodes, with an individual log stream for each chaincode.</p>"
+        },
+        "PeerLogs":{
+          "shape":"LogConfigurations",
+          "documentation":"<p>Configuration properties for a peer node log. Peer node logs contain messages generated when your client submits transaction proposals to peer nodes, requests to join channels, enrolls an admin peer, and lists the chaincode instances on a peer node. </p>"
+        }
+      },
+      "documentation":"<p>Configuration properties for logging events associated with a peer node owned by a member in a Managed Blockchain network.</p>"
+    },
     "NodeFrameworkAttributes":{
       "type":"structure",
       "members":{
@@ -1493,12 +1602,23 @@
       "max":20,
       "min":1
     },
+    "NodeLogPublishingConfiguration":{
+      "type":"structure",
+      "members":{
+        "Fabric":{
+          "shape":"NodeFabricLogPublishingConfiguration",
+          "documentation":"<p>Configuration properties for logging events associated with a node that is owned by a member of a Managed Blockchain network using the Hyperledger Fabric framework.</p>"
+        }
+      },
+      "documentation":"<p>Configuration properties for logging events associated with a peer node owned by a member in a Managed Blockchain network.</p>"
+    },
     "NodeStatus":{
       "type":"string",
       "enum":[
         "CREATING",
         "AVAILABLE",
         "CREATE_FAILED",
+        "UPDATING",
         "DELETING",
         "DELETED",
         "FAILED"
@@ -1575,7 +1695,7 @@
         },
         "Status":{
           "shape":"ProposalStatus",
-          "documentation":"<p>The status of the proposal. Values are as follows:</p> <ul> <li> <p> <code>IN_PROGRESS</code> - The proposal is active and open for member voting.</p> </li> <li> <p> <code>APPROVED</code> - The proposal was approved with sufficient <code>YES</code> votes among members according to the <code>VotingPolicy</code> specified for the <code>Network</code>. The specified proposal actions are carried out.</p> </li> <li> <p> <code>REJECTED</code> - The proposal was rejected with insufficient <code>YES</code> votes among members according to the <code>VotingPolicy</code> specified for the <code>Network</code>. The specified <code>ProposalActions</code> are not carried out.</p> </li> <li> <p> <code>EXPIRED</code> - Members did not cast the number of votes required to determine the proposal outcome before the proposal expired. The specified <code>ProposalActions</code> are not carried out.</p> </li> <li> <p> <code>ACTION_FAILED</code> - One or more of the specified <code>ProposalActions</code> in a proposal that was approved could not be completed because of an error.</p> </li> </ul>"
+          "documentation":"<p>The status of the proposal. Values are as follows:</p> <ul> <li> <p> <code>IN_PROGRESS</code> - The proposal is active and open for member voting.</p> </li> <li> <p> <code>APPROVED</code> - The proposal was approved with sufficient <code>YES</code> votes among members according to the <code>VotingPolicy</code> specified for the <code>Network</code>. The specified proposal actions are carried out.</p> </li> <li> <p> <code>REJECTED</code> - The proposal was rejected with insufficient <code>YES</code> votes among members according to the <code>VotingPolicy</code> specified for the <code>Network</code>. The specified <code>ProposalActions</code> are not carried out.</p> </li> <li> <p> <code>EXPIRED</code> - Members did not cast the number of votes required to determine the proposal outcome before the proposal expired. The specified <code>ProposalActions</code> are not carried out.</p> </li> <li> <p> <code>ACTION_FAILED</code> - One or more of the specified <code>ProposalActions</code> in a proposal that was approved could not be completed because of an error. The <code>ACTION_FAILED</code> status occurs even if only one ProposalAction fails and other actions are successful.</p> </li> </ul>"
         },
         "CreationDate":{
           "shape":"Timestamp",
@@ -1777,6 +1897,73 @@
       "type":"timestamp",
       "timestampFormat":"iso8601"
     },
+    "UpdateMemberInput":{
+      "type":"structure",
+      "required":[
+        "NetworkId",
+        "MemberId"
+      ],
+      "members":{
+        "NetworkId":{
+          "shape":"ResourceIdString",
+          "documentation":"<p>The unique ID of the Managed Blockchain network to which the member belongs.</p>",
+          "location":"uri",
+          "locationName":"networkId"
+        },
+        "MemberId":{
+          "shape":"ResourceIdString",
+          "documentation":"<p>The unique ID of the member.</p>",
+          "location":"uri",
+          "locationName":"memberId"
+        },
+        "LogPublishingConfiguration":{
+          "shape":"MemberLogPublishingConfiguration",
+          "documentation":"<p>Configuration properties for publishing to Amazon CloudWatch Logs.</p>"
+        }
+      }
+    },
+    "UpdateMemberOutput":{
+      "type":"structure",
+      "members":{
+      }
+    },
+    "UpdateNodeInput":{
+      "type":"structure",
+      "required":[
+        "NetworkId",
+        "MemberId",
+        "NodeId"
+      ],
+      "members":{
+        "NetworkId":{
+          "shape":"ResourceIdString",
+          "documentation":"<p>The unique ID of the Managed Blockchain network to which the node belongs.</p>",
+          "location":"uri",
+          "locationName":"networkId"
+        },
+        "MemberId":{
+          "shape":"ResourceIdString",
+          "documentation":"<p>The unique ID of the member that owns the node.</p>",
+          "location":"uri",
+          "locationName":"memberId"
+        },
+        "NodeId":{
+          "shape":"ResourceIdString",
+          "documentation":"<p>The unique ID of the node.</p>",
+          "location":"uri",
+          "locationName":"nodeId"
+        },
+        "LogPublishingConfiguration":{
+          "shape":"NodeLogPublishingConfiguration",
+          "documentation":"<p>Configuration properties for publishing to Amazon CloudWatch Logs.</p>"
+        }
+      }
+    },
+    "UpdateNodeOutput":{
+      "type":"structure",
+      "members":{
+      }
+    },
     "UsernameString":{
       "type":"string",
       "max":16,
diff --git a/services/marketplacecatalog/pom.xml b/services/marketplacecatalog/pom.xml
new file mode 100644
index 000000000000..5e197e46d0a5
--- /dev/null
+++ b/services/marketplacecatalog/pom.xml
@@ -0,0 +1,60 @@
+<?xml version="1.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.
+  -->
+
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>software.amazon.awssdk</groupId>
+        <artifactId>services</artifactId>
+        <version>2.11.8-SNAPSHOT</version>
+    </parent>
+    <artifactId>marketplacecatalog</artifactId>
+    <name>AWS Java SDK :: Services :: Marketplace Catalog</name>
+    <description>The AWS Java SDK for Marketplace Catalog module holds the client classes that are used for
+        communicating with Marketplace Catalog.
+    </description>
+    <url>https://aws.amazon.com/sdkforjava</url>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifestEntries>
+                            <Automatic-Module-Name>software.amazon.awssdk.services.marketplacecatalog</Automatic-Module-Name>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>protocol-core</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>aws-json-protocol</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/services/marketplacecatalog/src/main/resources/codegen-resources/paginators-1.json b/services/marketplacecatalog/src/main/resources/codegen-resources/paginators-1.json
new file mode 100644
index 000000000000..dbcad8968038
--- /dev/null
+++ b/services/marketplacecatalog/src/main/resources/codegen-resources/paginators-1.json
@@ -0,0 +1,14 @@
+{
+  "pagination": {
+    "ListChangeSets": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "MaxResults"
+    },
+    "ListEntities": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "MaxResults"
+    }
+  }
+}
diff --git a/services/marketplacecatalog/src/main/resources/codegen-resources/service-2.json b/services/marketplacecatalog/src/main/resources/codegen-resources/service-2.json
new file mode 100644
index 000000000000..1a01518c04ae
--- /dev/null
+++ b/services/marketplacecatalog/src/main/resources/codegen-resources/service-2.json
@@ -0,0 +1,768 @@
+{
+  "version":"2.0",
+  "metadata":{
+    "apiVersion":"2018-09-17",
+    "endpointPrefix":"catalog.marketplace",
+    "jsonVersion":"1.1",
+    "protocol":"rest-json",
+    "serviceAbbreviation":"AWS Marketplace Catalog",
+    "serviceFullName":"AWS Marketplace Catalog Service",
+    "serviceId":"Marketplace Catalog",
+    "signatureVersion":"v4",
+    "signingName":"aws-marketplace",
+    "uid":"marketplace-catalog-2018-09-17"
+  },
+  "operations":{
+    "CancelChangeSet":{
+      "name":"CancelChangeSet",
+      "http":{
+        "method":"PATCH",
+        "requestUri":"/CancelChangeSet"
+      },
+      "input":{"shape":"CancelChangeSetRequest"},
+      "output":{"shape":"CancelChangeSetResponse"},
+      "errors":[
+        {"shape":"InternalServiceException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"ValidationException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ResourceInUseException"},
+        {"shape":"ThrottlingException"}
+      ],
+      "documentation":"<p>Used to cancel an open change request. Must be sent before the status of the request changes to <code>APPLYING</code>, the final stage of completing your change request. You can describe a change during the 60-day request history retention period for API calls.</p>"
+    },
+    "DescribeChangeSet":{
+      "name":"DescribeChangeSet",
+      "http":{
+        "method":"GET",
+        "requestUri":"/DescribeChangeSet"
+      },
+      "input":{"shape":"DescribeChangeSetRequest"},
+      "output":{"shape":"DescribeChangeSetResponse"},
+      "errors":[
+        {"shape":"InternalServiceException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"ValidationException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ThrottlingException"}
+      ],
+      "documentation":"<p>Provides information about a given change set.</p>"
+    },
+    "DescribeEntity":{
+      "name":"DescribeEntity",
+      "http":{
+        "method":"GET",
+        "requestUri":"/DescribeEntity"
+      },
+      "input":{"shape":"DescribeEntityRequest"},
+      "output":{"shape":"DescribeEntityResponse"},
+      "errors":[
+        {"shape":"InternalServiceException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"ValidationException"},
+        {"shape":"ResourceNotSupportedException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ThrottlingException"}
+      ],
+      "documentation":"<p>Returns the metadata and content of the entity.</p>"
+    },
+    "ListChangeSets":{
+      "name":"ListChangeSets",
+      "http":{
+        "method":"POST",
+        "requestUri":"/ListChangeSets"
+      },
+      "input":{"shape":"ListChangeSetsRequest"},
+      "output":{"shape":"ListChangeSetsResponse"},
+      "errors":[
+        {"shape":"InternalServiceException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"ValidationException"},
+        {"shape":"ThrottlingException"}
+      ],
+      "documentation":"<p>Returns the list of change sets owned by the account being used to make the call. You can filter this list by providing any combination of <code>entityId</code>, <code>ChangeSetName</code>, and status. If you provide more than one filter, the API operation applies a logical AND between the filters.</p> <p>You can describe a change during the 60-day request history retention period for API calls.</p>"
+    },
+    "ListEntities":{
+      "name":"ListEntities",
+      "http":{
+        "method":"POST",
+        "requestUri":"/ListEntities"
+      },
+      "input":{"shape":"ListEntitiesRequest"},
+      "output":{"shape":"ListEntitiesResponse"},
+      "errors":[
+        {"shape":"InternalServiceException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"ValidationException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ThrottlingException"}
+      ],
+      "documentation":"<p>Provides the list of entities of a given type.</p>"
+    },
+    "StartChangeSet":{
+      "name":"StartChangeSet",
+      "http":{
+        "method":"POST",
+        "requestUri":"/StartChangeSet"
+      },
+      "input":{"shape":"StartChangeSetRequest"},
+      "output":{"shape":"StartChangeSetResponse"},
+      "errors":[
+        {"shape":"InternalServiceException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"ValidationException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ResourceInUseException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"ServiceQuotaExceededException"}
+      ],
+      "documentation":"<p>This operation allows you to request changes in your entities.</p>"
+    }
+  },
+  "shapes":{
+    "ARN":{
+      "type":"string",
+      "max":2048,
+      "min":1,
+      "pattern":"^[a-zA-Z0-9:*/-]+$"
+    },
+    "AccessDeniedException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"StringValue"}
+      },
+      "documentation":"<p>Access is denied.</p>",
+      "error":{"httpStatusCode":403},
+      "exception":true,
+      "synthetic":true
+    },
+    "CancelChangeSetRequest":{
+      "type":"structure",
+      "required":[
+        "Catalog",
+        "ChangeSetId"
+      ],
+      "members":{
+        "Catalog":{
+          "shape":"Catalog",
+          "documentation":"<p>Required. The catalog related to the request. Fixed value: <code>AWSMarketplace</code>.</p>",
+          "location":"querystring",
+          "locationName":"catalog"
+        },
+        "ChangeSetId":{
+          "shape":"ResourceId",
+          "documentation":"<p>Required. The unique identifier of the <code>StartChangeSet</code> request that you want to cancel.</p>",
+          "location":"querystring",
+          "locationName":"changeSetId"
+        }
+      }
+    },
+    "CancelChangeSetResponse":{
+      "type":"structure",
+      "members":{
+        "ChangeSetId":{
+          "shape":"ResourceId",
+          "documentation":"<p>The unique identifier for the change set referenced in this request.</p>"
+        },
+        "ChangeSetArn":{
+          "shape":"ARN",
+          "documentation":"<p>The ARN associated with the change set referenced in this request.</p>"
+        }
+      }
+    },
+    "Catalog":{
+      "type":"string",
+      "max":64,
+      "min":1,
+      "pattern":"^[a-zA-Z]+$"
+    },
+    "Change":{
+      "type":"structure",
+      "required":[
+        "ChangeType",
+        "Entity",
+        "Details"
+      ],
+      "members":{
+        "ChangeType":{
+          "shape":"ChangeType",
+          "documentation":"<p>Change types are single string values that describe your intention for the change. Each change type is unique for each <code>EntityType</code> provided in the change's scope.</p>"
+        },
+        "Entity":{
+          "shape":"Entity",
+          "documentation":"<p>The entity to be changed.</p>"
+        },
+        "Details":{
+          "shape":"Json",
+          "documentation":"<p>This object contains details specific to the change type of the requested change.</p>"
+        }
+      },
+      "documentation":"<p>An object that contains the <code>ChangeType</code>, <code>Details</code>, and <code>Entity</code>.</p>"
+    },
+    "ChangeSetDescription":{
+      "type":"list",
+      "member":{"shape":"ChangeSummary"}
+    },
+    "ChangeSetName":{
+      "type":"string",
+      "max":100,
+      "min":1,
+      "pattern":"^[\\w\\s+=.:@-]+$"
+    },
+    "ChangeSetSummaryList":{
+      "type":"list",
+      "member":{"shape":"ChangeSetSummaryListItem"}
+    },
+    "ChangeSetSummaryListItem":{
+      "type":"structure",
+      "members":{
+        "ChangeSetId":{
+          "shape":"ResourceId",
+          "documentation":"<p>The unique identifier for a change set.</p>"
+        },
+        "ChangeSetArn":{
+          "shape":"ARN",
+          "documentation":"<p>The ARN associated with the unique identifier for the change set referenced in this request.</p>"
+        },
+        "ChangeSetName":{
+          "shape":"ChangeSetName",
+          "documentation":"<p>The non-unique name for the change set.</p>"
+        },
+        "StartTime":{
+          "shape":"DateTimeISO8601",
+          "documentation":"<p>The time, in ISO 8601 format (2018-02-27T13:45:22Z), when the change set was started.</p>"
+        },
+        "EndTime":{
+          "shape":"DateTimeISO8601",
+          "documentation":"<p>The time, in ISO 8601 format (2018-02-27T13:45:22Z), when the change set was finished.</p>"
+        },
+        "Status":{
+          "shape":"ChangeStatus",
+          "documentation":"<p>The current status of the change set.</p>"
+        },
+        "EntityIdList":{
+          "shape":"ResourceIdList",
+          "documentation":"<p>This object is a list of entity IDs (string) that are a part of a change set. The entity ID list is a maximum of 20 entities. It must contain at least one entity.</p>"
+        }
+      },
+      "documentation":"<p>A summary of a change set returned in a list of change sets when the <code>ListChangeSets</code> action is called.</p>"
+    },
+    "ChangeStatus":{
+      "type":"string",
+      "enum":[
+        "PREPARING",
+        "APPLYING",
+        "SUCCEEDED",
+        "CANCELLED",
+        "FAILED"
+      ]
+    },
+    "ChangeSummary":{
+      "type":"structure",
+      "members":{
+        "ChangeType":{
+          "shape":"ChangeType",
+          "documentation":"<p>The type of the change.</p>"
+        },
+        "Entity":{
+          "shape":"Entity",
+          "documentation":"<p>The entity to be changed.</p>"
+        },
+        "ErrorDetailList":{
+          "shape":"ErrorDetailList",
+          "documentation":"<p>An array of <code>ErrorDetail</code> objects associated with the change.</p>"
+        }
+      },
+      "documentation":"<p>This object is a container for common summary information about the change. The summary doesn't contain the whole change structure.</p>"
+    },
+    "ChangeType":{
+      "type":"string",
+      "max":255,
+      "min":1,
+      "pattern":"^[A-Z][\\w]*$"
+    },
+    "ClientRequestToken":{
+      "type":"string",
+      "max":36,
+      "min":1,
+      "pattern":"^[\\w\\-]+$"
+    },
+    "DateTimeISO8601":{
+      "type":"string",
+      "max":20,
+      "min":20,
+      "pattern":"^([\\d]{4})\\-(1[0-2]|0[1-9])\\-(3[01]|0[1-9]|[12][\\d])T(2[0-3]|[01][\\d]):([0-5][\\d]):([0-5][\\d])Z$"
+    },
+    "DescribeChangeSetRequest":{
+      "type":"structure",
+      "required":[
+        "Catalog",
+        "ChangeSetId"
+      ],
+      "members":{
+        "Catalog":{
+          "shape":"Catalog",
+          "documentation":"<p>Required. The catalog related to the request. Fixed value: <code>AWSMarketplace</code> </p>",
+          "location":"querystring",
+          "locationName":"catalog"
+        },
+        "ChangeSetId":{
+          "shape":"ResourceId",
+          "documentation":"<p>Required. The unique identifier for the <code>StartChangeSet</code> request that you want to describe the details for.</p>",
+          "location":"querystring",
+          "locationName":"changeSetId"
+        }
+      }
+    },
+    "DescribeChangeSetResponse":{
+      "type":"structure",
+      "members":{
+        "ChangeSetId":{
+          "shape":"ResourceId",
+          "documentation":"<p>Required. The unique identifier for the change set referenced in this request.</p>"
+        },
+        "ChangeSetArn":{
+          "shape":"ARN",
+          "documentation":"<p>The ARN associated with the unique identifier for the change set referenced in this request.</p>"
+        },
+        "ChangeSetName":{
+          "shape":"ChangeSetName",
+          "documentation":"<p>The optional name provided in the <code>StartChangeSet</code> request. If you do not provide a name, one is set by default.</p>"
+        },
+        "StartTime":{
+          "shape":"DateTimeISO8601",
+          "documentation":"<p>The date and time, in ISO 8601 format (2018-02-27T13:45:22Z), the request started. </p>"
+        },
+        "EndTime":{
+          "shape":"DateTimeISO8601",
+          "documentation":"<p>The date and time, in ISO 8601 format (2018-02-27T13:45:22Z), the request transitioned to a terminal state. The change cannot transition to a different state. Null if the request is not in a terminal state. </p>"
+        },
+        "Status":{
+          "shape":"ChangeStatus",
+          "documentation":"<p>The status of the change request.</p>"
+        },
+        "FailureDescription":{
+          "shape":"StringValue",
+          "documentation":"<p>Returned if there is a failure on the change set, but that failure is not related to any of the changes in the request.</p>"
+        },
+        "ChangeSet":{
+          "shape":"ChangeSetDescription",
+          "documentation":"<p>An array of <code>ChangeSummary</code> objects.</p>"
+        }
+      }
+    },
+    "DescribeEntityRequest":{
+      "type":"structure",
+      "required":[
+        "Catalog",
+        "EntityId"
+      ],
+      "members":{
+        "Catalog":{
+          "shape":"Catalog",
+          "documentation":"<p>Required. The catalog related to the request. Fixed value: <code>AWSMarketplace</code> </p>",
+          "location":"querystring",
+          "locationName":"catalog"
+        },
+        "EntityId":{
+          "shape":"ResourceId",
+          "documentation":"<p>Required. The unique ID of the entity to describe.</p>",
+          "location":"querystring",
+          "locationName":"entityId"
+        }
+      }
+    },
+    "DescribeEntityResponse":{
+      "type":"structure",
+      "members":{
+        "EntityType":{
+          "shape":"EntityType",
+          "documentation":"<p>The named type of the entity, in the format of <code>EntityType@Version</code>.</p>"
+        },
+        "EntityIdentifier":{
+          "shape":"Identifier",
+          "documentation":"<p>The identifier of the entity, in the format of <code>EntityId@RevisionId</code>.</p>"
+        },
+        "EntityArn":{
+          "shape":"ARN",
+          "documentation":"<p>The ARN associated to the unique identifier for the change set referenced in this request.</p>"
+        },
+        "LastModifiedDate":{
+          "shape":"StringValue",
+          "documentation":"<p>The last modified date of the entity, in ISO 8601 format (2018-02-27T13:45:22Z).</p>"
+        },
+        "Details":{
+          "shape":"Json",
+          "documentation":"<p>This stringified JSON object includes the details of the entity.</p>"
+        }
+      }
+    },
+    "Entity":{
+      "type":"structure",
+      "required":["Type"],
+      "members":{
+        "Type":{
+          "shape":"EntityType",
+          "documentation":"<p>The type of entity.</p>"
+        },
+        "Identifier":{
+          "shape":"Identifier",
+          "documentation":"<p>The identifier for the entity.</p>"
+        }
+      },
+      "documentation":"<p>A product entity contains data that describes your product, its supported features, and how it can be used or launched by your customer. </p>"
+    },
+    "EntitySummary":{
+      "type":"structure",
+      "members":{
+        "Name":{
+          "shape":"StringValue",
+          "documentation":"<p>The name for the entity. This value is not unique. It is defined by the provider.</p>"
+        },
+        "EntityType":{
+          "shape":"EntityType",
+          "documentation":"<p>The type of the entity.</p>"
+        },
+        "EntityId":{
+          "shape":"ResourceId",
+          "documentation":"<p>The unique identifier for the entity.</p>"
+        },
+        "EntityArn":{
+          "shape":"ARN",
+          "documentation":"<p>The ARN associated with the unique identifier for the entity.</p>"
+        },
+        "LastModifiedDate":{
+          "shape":"StringValue",
+          "documentation":"<p>The last time the entity was published, using ISO 8601 format (2018-02-27T13:45:22Z).</p>"
+        },
+        "Visibility":{
+          "shape":"StringValue",
+          "documentation":"<p>The visibility status of the entity to subscribers. This value can be <code>Public</code> (everyone can view the entity), <code>Limited</code> (the entity is visible to limited accounts only), or <code>Restricted</code> (the entity was published and then unpublished and only existing subscribers can view it). </p>"
+        }
+      },
+      "documentation":"<p>This object is a container for common summary information about the entity. The summary doesn't contain the whole entity structure, but it does contain information common across all entities.</p>"
+    },
+    "EntitySummaryList":{
+      "type":"list",
+      "member":{"shape":"EntitySummary"}
+    },
+    "EntityType":{
+      "type":"string",
+      "max":255,
+      "min":1,
+      "pattern":"^[a-zA-Z]+$"
+    },
+    "ErrorDetail":{
+      "type":"structure",
+      "members":{
+        "ErrorCode":{
+          "shape":"StringValue",
+          "documentation":"<p>The error code that identifies the type of error.</p>"
+        },
+        "ErrorMessage":{
+          "shape":"StringValue",
+          "documentation":"<p>The message for the error.</p>"
+        }
+      },
+      "documentation":"<p>Details about the error.</p>"
+    },
+    "ErrorDetailList":{
+      "type":"list",
+      "member":{"shape":"ErrorDetail"}
+    },
+    "Filter":{
+      "type":"structure",
+      "members":{
+        "Name":{
+          "shape":"FilterName",
+          "documentation":"<p>For <code>ListEntities</code>, the supported value for this is an <code>EntityId</code>.</p> <p>For <code>ListChangeSets</code>, the supported values are as follows:</p>"
+        },
+        "ValueList":{
+          "shape":"ValueList",
+          "documentation":"<p> <code>ListEntities</code> - This is a list of unique <code>EntityId</code>s.</p> <p> <code>ListChangeSets</code> - The supported filter names and associated <code>ValueList</code>s is as follows:</p> <ul> <li> <p> <code>ChangeSetName</code> - The supported <code>ValueList</code> is a list of non-unique <code>ChangeSetName</code>s. These are defined when you call the <code>StartChangeSet</code> action.</p> </li> <li> <p> <code>Status</code> - The supported <code>ValueList</code> is a list of statuses for all change set requests.</p> </li> <li> <p> <code>EntityId</code> - The supported <code>ValueList</code> is a list of unique <code>EntityId</code>s.</p> </li> <li> <p> <code>BeforeStartTime</code> - The supported <code>ValueList</code> is a list of all change sets that started before the filter value.</p> </li> <li> <p> <code>AfterStartTime</code> - The supported <code>ValueList</code> is a list of all change sets that started after the filter value.</p> </li> <li> <p> <code>BeforeEndTime</code> - The supported <code>ValueList</code> is a list of all change sets that ended before the filter value.</p> </li> <li> <p> <code>AfterEndTime</code> - The supported <code>ValueList</code> is a list of all change sets that ended after the filter value.</p> </li> </ul>"
+        }
+      },
+      "documentation":"<p>A filter object, used to optionally filter results from calls to the <code>ListEntities</code> and <code>ListChangeSets</code> actions.</p>"
+    },
+    "FilterList":{
+      "type":"list",
+      "member":{"shape":"Filter"},
+      "max":8,
+      "min":1
+    },
+    "FilterName":{
+      "type":"string",
+      "max":255,
+      "min":1,
+      "pattern":"^[a-zA-Z]+$"
+    },
+    "Identifier":{
+      "type":"string",
+      "max":255,
+      "min":1,
+      "pattern":"^[\\w\\-@]+$"
+    },
+    "InternalServiceException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"StringValue"}
+      },
+      "documentation":"<p>There was an internal service exception.</p>",
+      "error":{"httpStatusCode":500},
+      "exception":true,
+      "synthetic":true
+    },
+    "Json":{
+      "type":"string",
+      "max":16384,
+      "min":2,
+      "pattern":"^[\\s]*\\{[\\s\\S]*\\}[\\s]*$"
+    },
+    "ListChangeSetsRequest":{
+      "type":"structure",
+      "required":["Catalog"],
+      "members":{
+        "Catalog":{
+          "shape":"Catalog",
+          "documentation":"<p>The catalog related to the request. Fixed value: <code>AWSMarketplace</code> </p>"
+        },
+        "FilterList":{
+          "shape":"FilterList",
+          "documentation":"<p>An array of filter objects.</p>"
+        },
+        "Sort":{
+          "shape":"Sort",
+          "documentation":"<p>An object that contains two attributes, <code>sortBy</code> and <code>sortOrder</code>.</p>"
+        },
+        "MaxResults":{
+          "shape":"MaxResultInteger",
+          "documentation":"<p>The maximum number of results returned by a single call. This value must be provided in the next call to retrieve the next set of results. By default, this value is 20.</p>"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>The token value retrieved from a previous call to access the next page of results.</p>"
+        }
+      }
+    },
+    "ListChangeSetsResponse":{
+      "type":"structure",
+      "members":{
+        "ChangeSetSummaryList":{
+          "shape":"ChangeSetSummaryList",
+          "documentation":"<p> Array of <code>ChangeSetSummaryListItem</code> objects.</p>"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>The value of the next token, if it exists. Null if there are no more results.</p>"
+        }
+      }
+    },
+    "ListEntitiesRequest":{
+      "type":"structure",
+      "required":[
+        "Catalog",
+        "EntityType"
+      ],
+      "members":{
+        "Catalog":{
+          "shape":"Catalog",
+          "documentation":"<p>The catalog related to the request. Fixed value: <code>AWSMarketplace</code> </p>"
+        },
+        "EntityType":{
+          "shape":"EntityType",
+          "documentation":"<p>The type of entities to retrieve.</p>"
+        },
+        "FilterList":{
+          "shape":"FilterList",
+          "documentation":"<p>An array of filter objects. Each filter object contains two attributes, <code>filterName</code> and <code>filterValues</code>.</p>"
+        },
+        "Sort":{
+          "shape":"Sort",
+          "documentation":"<p>An object that contains two attributes, <code>sortBy</code> and <code>sortOrder</code>.</p>"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>The value of the next token, if it exists. Null if there are no more results.</p>"
+        },
+        "MaxResults":{
+          "shape":"MaxResultInteger",
+          "documentation":"<p>Specifies the upper limit of the elements on a single page. If a value isn't provided, the default value is 20.</p>"
+        }
+      }
+    },
+    "ListEntitiesResponse":{
+      "type":"structure",
+      "members":{
+        "EntitySummaryList":{
+          "shape":"EntitySummaryList",
+          "documentation":"<p> Array of <code>EntitySummary</code> object.</p>"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>The value of the next token if it exists. Null if there is no more result.</p>"
+        }
+      }
+    },
+    "MaxResultInteger":{
+      "type":"integer",
+      "box":true,
+      "max":20,
+      "min":1
+    },
+    "NextToken":{
+      "type":"string",
+      "max":2048,
+      "min":1,
+      "pattern":"^[\\w+=.:@\\-\\/]$"
+    },
+    "RequestedChangeList":{
+      "type":"list",
+      "member":{"shape":"Change"},
+      "max":20,
+      "min":1
+    },
+    "ResourceId":{
+      "type":"string",
+      "max":255,
+      "min":1,
+      "pattern":"^[\\w\\-]+$"
+    },
+    "ResourceIdList":{
+      "type":"list",
+      "member":{"shape":"ResourceId"}
+    },
+    "ResourceInUseException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"StringValue"}
+      },
+      "documentation":"<p>The resource is currently in use.</p>",
+      "error":{"httpStatusCode":423},
+      "exception":true,
+      "synthetic":true
+    },
+    "ResourceNotFoundException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"StringValue"}
+      },
+      "documentation":"<p>The specified resource wasn't found.</p>",
+      "error":{"httpStatusCode":404},
+      "exception":true,
+      "synthetic":true
+    },
+    "ResourceNotSupportedException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"StringValue"}
+      },
+      "documentation":"<p>Currently, the specified resource is not supported.</p>",
+      "error":{"httpStatusCode":415},
+      "exception":true,
+      "synthetic":true
+    },
+    "ServiceQuotaExceededException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"StringValue"}
+      },
+      "documentation":"<p>The maximum number of open requests per account has been exceeded.</p>",
+      "error":{"httpStatusCode":402},
+      "exception":true,
+      "synthetic":true
+    },
+    "Sort":{
+      "type":"structure",
+      "members":{
+        "SortBy":{
+          "shape":"SortBy",
+          "documentation":"<p>For <code>ListEntities</code>, supported attributes include <code>LastModifiedDate</code> (default), <code>Visibility</code>, <code>EntityId</code>, and <code>Name</code>.</p> <p>For <code>ListChangeSets</code>, supported attributes include <code>StartTime</code> and <code>EndTime</code>.</p>"
+        },
+        "SortOrder":{
+          "shape":"SortOrder",
+          "documentation":"<p>The sorting order. Can be <code>ASCENDING</code> or <code>DESCENDING</code>. The default value is <code>DESCENDING</code>.</p>"
+        }
+      },
+      "documentation":"<p>An object that contains two attributes, <code>sortBy</code> and <code>sortOrder</code>.</p>"
+    },
+    "SortBy":{
+      "type":"string",
+      "max":255,
+      "min":1,
+      "pattern":"^[a-zA-Z]+$"
+    },
+    "SortOrder":{
+      "type":"string",
+      "enum":[
+        "ASCENDING",
+        "DESCENDING"
+      ]
+    },
+    "StartChangeSetRequest":{
+      "type":"structure",
+      "required":[
+        "Catalog",
+        "ChangeSet"
+      ],
+      "members":{
+        "Catalog":{
+          "shape":"Catalog",
+          "documentation":"<p>The catalog related to the request. Fixed value: <code>AWSMarketplace</code> </p>"
+        },
+        "ChangeSet":{
+          "shape":"RequestedChangeList",
+          "documentation":"<p>Array of <code>change</code> object.</p>"
+        },
+        "ChangeSetName":{
+          "shape":"ChangeSetName",
+          "documentation":"<p>Optional case sensitive string of up to 100 ASCII characters. The change set name can be used to filter the list of change sets. </p>"
+        },
+        "ClientRequestToken":{
+          "shape":"ClientRequestToken",
+          "documentation":"<p>A unique token to identify the request to ensure idempotency.</p>"
+        }
+      }
+    },
+    "StartChangeSetResponse":{
+      "type":"structure",
+      "members":{
+        "ChangeSetId":{
+          "shape":"ResourceId",
+          "documentation":"<p>Unique identifier generated for the request.</p>"
+        },
+        "ChangeSetArn":{
+          "shape":"ARN",
+          "documentation":"<p>The ARN associated to the unique identifier generated for the request.</p>"
+        }
+      }
+    },
+    "StringValue":{"type":"string"},
+    "ThrottlingException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"StringValue"}
+      },
+      "documentation":"<p>Too many requests.</p>",
+      "error":{"httpStatusCode":429},
+      "exception":true,
+      "synthetic":true
+    },
+    "ValidationException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"StringValue"}
+      },
+      "documentation":"<p>An error occurred during validation.</p>",
+      "error":{"httpStatusCode":422},
+      "exception":true,
+      "synthetic":true
+    },
+    "ValueList":{
+      "type":"list",
+      "member":{"shape":"StringValue"},
+      "max":10,
+      "min":1
+    }
+  },
+  "documentation":"<p>Catalog API actions allow you to create, describe, list, and delete changes to your published entities. An entity is a product or an offer on AWS Marketplace.</p> <p>You can automate your entity update process by integrating the AWS Marketplace Catalog API with your AWS Marketplace product build or deployment pipelines. You can also create your own applications on top of the Catalog API to manage your products on AWS Marketplace.</p>"
+}
diff --git a/services/marketplacecommerceanalytics/build.properties b/services/marketplacecommerceanalytics/build.properties
index ecf2dae6fcb1..15ec2da1fc71 100644
--- a/services/marketplacecommerceanalytics/build.properties
+++ b/services/marketplacecommerceanalytics/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/marketplacecommerceanalytics/pom.xml b/services/marketplacecommerceanalytics/pom.xml
index 21581dde2cf3..8620447f285b 100644
--- a/services/marketplacecommerceanalytics/pom.xml
+++ b/services/marketplacecommerceanalytics/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>marketplacecommerceanalytics</artifactId>
     <name>AWS Java SDK :: Services :: AWS Marketplace Commerce Analytics</name>
diff --git a/services/marketplacecommerceanalytics/src/it/java/software/amazon/awssdk/services/marketplacecommerceanalytics/ServiceIntegrationTest.java b/services/marketplacecommerceanalytics/src/it/java/software/amazon/awssdk/services/marketplacecommerceanalytics/ServiceIntegrationTest.java
index e40ea9c40daa..009598683930 100644
--- a/services/marketplacecommerceanalytics/src/it/java/software/amazon/awssdk/services/marketplacecommerceanalytics/ServiceIntegrationTest.java
+++ b/services/marketplacecommerceanalytics/src/it/java/software/amazon/awssdk/services/marketplacecommerceanalytics/ServiceIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/marketplacecommerceanalytics/src/main/resources/codegen-resources/service-2.json b/services/marketplacecommerceanalytics/src/main/resources/codegen-resources/service-2.json
index 17f866f0d4a8..141550a1b623 100644
--- a/services/marketplacecommerceanalytics/src/main/resources/codegen-resources/service-2.json
+++ b/services/marketplacecommerceanalytics/src/main/resources/codegen-resources/service-2.json
@@ -101,11 +101,11 @@
       "members":{
         "dataSetType":{
           "shape":"DataSetType",
-          "documentation":"<p>The desired data set type.</p> <p> <ul> <li> <strong>customer_subscriber_hourly_monthly_subscriptions</strong> <p>From 2014-07-21 to present: Available daily by 24:00 UTC.</p> </li> <li> <strong>customer_subscriber_annual_subscriptions</strong> <p>From 2014-07-21 to present: Available daily by 24:00 UTC.</p> </li> <li> <strong>daily_business_usage_by_instance_type</strong> <p>From 2015-01-26 to present: Available daily by 24:00 UTC.</p> </li> <li> <strong>daily_business_fees</strong> <p>From 2015-01-26 to present: Available daily by 24:00 UTC.</p> </li> <li> <strong>daily_business_free_trial_conversions</strong> <p>From 2015-01-26 to present: Available daily by 24:00 UTC.</p> </li> <li> <strong>daily_business_new_instances</strong> <p>From 2015-01-26 to present: Available daily by 24:00 UTC.</p> </li> <li> <strong>daily_business_new_product_subscribers</strong> <p>From 2015-01-26 to present: Available daily by 24:00 UTC.</p> </li> <li> <strong>daily_business_canceled_product_subscribers</strong> <p>From 2015-01-26 to present: Available daily by 24:00 UTC.</p> </li> <li> <strong>monthly_revenue_billing_and_revenue_data</strong> <p>From 2015-02 to 2017-06: Available monthly on the 4th day of the month by 24:00 UTC. Data includes metered transactions (e.g. hourly) from two months prior.</p> <p>From 2017-07 to present: Available monthly on the 15th day of the month by 24:00 UTC. Data includes metered transactions (e.g. hourly) from one month prior.</p> </li> <li> <strong>monthly_revenue_annual_subscriptions</strong> <p>From 2015-02 to 2017-06: Available monthly on the 4th day of the month by 24:00 UTC. Data includes up-front software charges (e.g. annual) from one month prior.</p> <p>From 2017-07 to present: Available monthly on the 15th day of the month by 24:00 UTC. Data includes up-front software charges (e.g. annual) from one month prior.</p> </li> <li> <strong>monthly_revenue_field_demonstration_usage</strong> <p>From 2018-03-15 to present: Available monthly on the 15th day of the month by 24:00 UTC.</p> </li> <li> <strong>monthly_revenue_flexible_payment_schedule</strong> <p>From 2018-11-15 to present: Available monthly on the 15th day of the month by 24:00 UTC.</p> </li> <li> <strong>disbursed_amount_by_product</strong> <p>From 2015-01-26 to present: Available every 30 days by 24:00 UTC.</p> </li> <li> <strong>disbursed_amount_by_product_with_uncollected_funds</strong> <p>From 2012-04-19 to 2015-01-25: Available every 30 days by 24:00 UTC.</p> <p>From 2015-01-26 to present: This data set was split into three data sets: disbursed_amount_by_product, disbursed_amount_by_age_of_uncollected_funds, and disbursed_amount_by_age_of_disbursed_funds.</p> </li> <li> <strong>disbursed_amount_by_instance_hours</strong> <p>From 2012-09-04 to present: Available every 30 days by 24:00 UTC.</p> </li> <li> <strong>disbursed_amount_by_customer_geo</strong> <p>From 2012-04-19 to present: Available every 30 days by 24:00 UTC.</p> </li> <li> <strong>disbursed_amount_by_age_of_uncollected_funds</strong> <p>From 2015-01-26 to present: Available every 30 days by 24:00 UTC.</p> </li> <li> <strong>disbursed_amount_by_age_of_disbursed_funds</strong> <p>From 2015-01-26 to present: Available every 30 days by 24:00 UTC.</p> </li> <li> <strong>disbursed_amount_by_age_of_past_due_funds</strong> <p>From 2018-04-07 to present: Available every 30 days by 24:00 UTC.</p> </li> <li> <strong>disbursed_amount_by_uncollected_funds_breakdown</strong> <p>From 2019-10-04 to present: Available every 30 days by 24:00 UTC.</p> </li> <li> <strong>customer_profile_by_industry</strong> <p>From 2015-10-01 to 2017-06-29: Available daily by 24:00 UTC.</p> <p>From 2017-06-30 to present: This data set is no longer available.</p> </li> <li> <strong>customer_profile_by_revenue</strong> <p>From 2015-10-01 to 2017-06-29: Available daily by 24:00 UTC.</p> <p>From 2017-06-30 to present: This data set is no longer available.</p> </li> <li> <strong>customer_profile_by_geography</strong> <p>From 2015-10-01 to 2017-06-29: Available daily by 24:00 UTC.</p> <p>From 2017-06-30 to present: This data set is no longer available.</p> </li> <li> <strong>sales_compensation_billed_revenue</strong> <p>From 2016-12 to 2017-06: Available monthly on the 4th day of the month by 24:00 UTC. Data includes metered transactions (e.g. hourly) from two months prior, and up-front software charges (e.g. annual) from one month prior.</p> <p>From 2017-06 to present: Available monthly on the 15th day of the month by 24:00 UTC. Data includes metered transactions (e.g. hourly) from one month prior, and up-front software charges (e.g. annual) from one month prior.</p> </li> <li> <strong>us_sales_and_use_tax_records</strong> <p>From 2017-02-15 to present: Available monthly on the 15th day of the month by 24:00 UTC.</p> </li> </ul> </p>"
+          "documentation":"<p>The desired data set type.</p> <p> <ul> <li> <strong>customer_subscriber_hourly_monthly_subscriptions</strong> <p>From 2017-09-15 to present: Available daily by 24:00 UTC.</p> </li> <li> <strong>customer_subscriber_annual_subscriptions</strong> <p>From 2017-09-15 to present: Available daily by 24:00 UTC.</p> </li> <li> <strong>daily_business_usage_by_instance_type</strong> <p>From 2017-09-15 to present: Available daily by 24:00 UTC.</p> </li> <li> <strong>daily_business_fees</strong> <p>From 2017-09-15 to present: Available daily by 24:00 UTC.</p> </li> <li> <strong>daily_business_free_trial_conversions</strong> <p>From 2017-09-15 to present: Available daily by 24:00 UTC.</p> </li> <li> <strong>daily_business_new_instances</strong> <p>From 2017-09-15 to present: Available daily by 24:00 UTC.</p> </li> <li> <strong>daily_business_new_product_subscribers</strong> <p>From 2017-09-15 to present: Available daily by 24:00 UTC.</p> </li> <li> <strong>daily_business_canceled_product_subscribers</strong> <p>From 2017-09-15 to present: Available daily by 24:00 UTC.</p> </li> <li> <strong>monthly_revenue_billing_and_revenue_data</strong> <p>From 2017-09-15 to present: Available monthly on the 15th day of the month by 24:00 UTC. Data includes metered transactions (e.g. hourly) from one month prior.</p> </li> <li> <strong>monthly_revenue_annual_subscriptions</strong> <p>From 2017-09-15 to present: Available monthly on the 15th day of the month by 24:00 UTC. Data includes up-front software charges (e.g. annual) from one month prior.</p> </li> <li> <strong>monthly_revenue_field_demonstration_usage</strong> <p>From 2018-03-15 to present: Available monthly on the 15th day of the month by 24:00 UTC.</p> </li> <li> <strong>monthly_revenue_flexible_payment_schedule</strong> <p>From 2018-11-15 to present: Available monthly on the 15th day of the month by 24:00 UTC.</p> </li> <li> <strong>disbursed_amount_by_product</strong> <p>From 2017-09-15 to present: Available every 30 days by 24:00 UTC.</p> </li> <li> <strong>disbursed_amount_by_instance_hours</strong> <p>From 2017-09-15 to present: Available every 30 days by 24:00 UTC.</p> </li> <li> <strong>disbursed_amount_by_customer_geo</strong> <p>From 2017-09-15 to present: Available every 30 days by 24:00 UTC.</p> </li> <li> <strong>disbursed_amount_by_age_of_uncollected_funds</strong> <p>From 2017-09-15 to present: Available every 30 days by 24:00 UTC.</p> </li> <li> <strong>disbursed_amount_by_age_of_disbursed_funds</strong> <p>From 2017-09-15 to present: Available every 30 days by 24:00 UTC.</p> </li> <li> <strong>disbursed_amount_by_age_of_past_due_funds</strong> <p>From 2018-04-07 to present: Available every 30 days by 24:00 UTC.</p> </li> <li> <strong>disbursed_amount_by_uncollected_funds_breakdown</strong> <p>From 2019-10-04 to present: Available every 30 days by 24:00 UTC.</p> </li> <li> <strong>sales_compensation_billed_revenue</strong> <p>From 2017-09-15 to present: Available monthly on the 15th day of the month by 24:00 UTC. Data includes metered transactions (e.g. hourly) from one month prior, and up-front software charges (e.g. annual) from one month prior.</p> </li> <li> <strong>us_sales_and_use_tax_records</strong> <p>From 2017-09-15 to present: Available monthly on the 15th day of the month by 24:00 UTC.</p> </li> </ul> </p>"
         },
         "dataSetPublicationDate":{
           "shape":"DataSetPublicationDate",
-          "documentation":"The date a data set was published. For daily data sets, provide a date with day-level granularity for the desired day. For weekly data sets, provide a date with day-level granularity within the desired week (the day value will be ignored). For monthly data sets, provide a date with month-level granularity for the desired month (the day value will be ignored)."
+          "documentation":"The date a data set was published. For daily data sets, provide a date with day-level granularity for the desired day. For monthly data sets except those with prefix disbursed_amount, provide a date with month-level granularity for the desired month (the day value will be ignored). For data sets with prefix disbursed_amount, provide a date with day-level granularity for the desired day. For these data sets we will look backwards in time over the range of 31 days until the first data set is found (the latest one)."
         },
         "roleNameArn":{
           "shape":"RoleNameArn",
diff --git a/services/marketplacecommerceanalytics/src/test/resources/cucumber.properties b/services/marketplacecommerceanalytics/src/test/resources/cucumber.properties
index 16c6fc437ebd..6a810ed2dc72 100644
--- a/services/marketplacecommerceanalytics/src/test/resources/cucumber.properties
+++ b/services/marketplacecommerceanalytics/src/test/resources/cucumber.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/marketplaceentitlement/build.properties b/services/marketplaceentitlement/build.properties
index ecf2dae6fcb1..15ec2da1fc71 100644
--- a/services/marketplaceentitlement/build.properties
+++ b/services/marketplaceentitlement/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/marketplaceentitlement/pom.xml b/services/marketplaceentitlement/pom.xml
index 951dea61e2e8..60335e9142bc 100644
--- a/services/marketplaceentitlement/pom.xml
+++ b/services/marketplaceentitlement/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>marketplaceentitlement</artifactId>
     <name>AWS Java SDK :: Services :: AWS Marketplace Entitlement</name>
diff --git a/services/marketplacemetering/build.properties b/services/marketplacemetering/build.properties
index ecf2dae6fcb1..15ec2da1fc71 100644
--- a/services/marketplacemetering/build.properties
+++ b/services/marketplacemetering/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/marketplacemetering/pom.xml b/services/marketplacemetering/pom.xml
index 54e42986fb09..ab882af5af2f 100644
--- a/services/marketplacemetering/pom.xml
+++ b/services/marketplacemetering/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>marketplacemetering</artifactId>
     <name>AWS Java SDK :: Services :: AWS Marketplace Metering Service</name>
diff --git a/services/marketplacemetering/src/main/resources/codegen-resources/service-2.json b/services/marketplacemetering/src/main/resources/codegen-resources/service-2.json
index b74f8b397d19..4b72bca72d5b 100644
--- a/services/marketplacemetering/src/main/resources/codegen-resources/service-2.json
+++ b/services/marketplacemetering/src/main/resources/codegen-resources/service-2.json
@@ -47,9 +47,10 @@
         {"shape":"InvalidEndpointRegionException"},
         {"shape":"TimestampOutOfBoundsException"},
         {"shape":"DuplicateRequestException"},
-        {"shape":"ThrottlingException"}
+        {"shape":"ThrottlingException"},
+        {"shape":"CustomerNotEntitledException"}
       ],
-      "documentation":"<p>API to emit metering records. For identical requests, the API is idempotent. It simply returns the metering record ID.</p> <p>MeterUsage is authenticated on the buyer's AWS account, generally when running from an EC2 instance on the AWS Marketplace.</p>"
+      "documentation":"<p>API to emit metering records. For identical requests, the API is idempotent. It simply returns the metering record ID.</p> <p>MeterUsage is authenticated on the buyer's AWS account using credentials from the EC2 instance, ECS task, or EKS pod.</p>"
     },
     "RegisterUsage":{
       "name":"RegisterUsage",
@@ -69,7 +70,7 @@
         {"shape":"InternalServiceErrorException"},
         {"shape":"DisabledApiException"}
       ],
-      "documentation":"<p>Paid container software products sold through AWS Marketplace must integrate with the AWS Marketplace Metering Service and call the RegisterUsage operation for software entitlement and metering. Calling RegisterUsage from containers running outside of ECS is not currently supported. Free and BYOL products for ECS aren't required to call RegisterUsage, but you may choose to do so if you would like to receive usage data in your seller reports. The sections below explain the behavior of RegisterUsage. RegisterUsage performs two primary functions: metering and entitlement.</p> <ul> <li> <p> <i>Entitlement</i>: RegisterUsage allows you to verify that the customer running your paid software is subscribed to your product on AWS Marketplace, enabling you to guard against unauthorized use. Your container image that integrates with RegisterUsage is only required to guard against unauthorized use at container startup, as such a CustomerNotSubscribedException/PlatformNotSupportedException will only be thrown on the initial call to RegisterUsage. Subsequent calls from the same Amazon ECS task instance (e.g. task-id) will not throw a CustomerNotSubscribedException, even if the customer unsubscribes while the Amazon ECS task is still running.</p> </li> <li> <p> <i>Metering</i>: RegisterUsage meters software use per ECS task, per hour, with usage prorated to the second. A minimum of 1 minute of usage applies to tasks that are short lived. For example, if a customer has a 10 node ECS cluster and creates an ECS service configured as a Daemon Set, then ECS will launch a task on all 10 cluster nodes and the customer will be charged: (10 * hourly_rate). Metering for software use is automatically handled by the AWS Marketplace Metering Control Plane -- your software is not required to perform any metering specific actions, other than call RegisterUsage once for metering of software use to commence. The AWS Marketplace Metering Control Plane will also continue to bill customers for running ECS tasks, regardless of the customers subscription state, removing the need for your software to perform entitlement checks at runtime.</p> </li> </ul>"
+      "documentation":"<p>Paid container software products sold through AWS Marketplace must integrate with the AWS Marketplace Metering Service and call the RegisterUsage operation for software entitlement and metering. Free and BYOL products for Amazon ECS or Amazon EKS aren't required to call RegisterUsage, but you may choose to do so if you would like to receive usage data in your seller reports. The sections below explain the behavior of RegisterUsage. RegisterUsage performs two primary functions: metering and entitlement.</p> <ul> <li> <p> <i>Entitlement</i>: RegisterUsage allows you to verify that the customer running your paid software is subscribed to your product on AWS Marketplace, enabling you to guard against unauthorized use. Your container image that integrates with RegisterUsage is only required to guard against unauthorized use at container startup, as such a CustomerNotSubscribedException/PlatformNotSupportedException will only be thrown on the initial call to RegisterUsage. Subsequent calls from the same Amazon ECS task instance (e.g. task-id) or Amazon EKS pod will not throw a CustomerNotSubscribedException, even if the customer unsubscribes while the Amazon ECS task or Amazon EKS pod is still running.</p> </li> <li> <p> <i>Metering</i>: RegisterUsage meters software use per ECS task, per hour, or per pod for Amazon EKS with usage prorated to the second. A minimum of 1 minute of usage applies to tasks that are short lived. For example, if a customer has a 10 node Amazon ECS or Amazon EKS cluster and a service configured as a Daemon Set, then Amazon ECS or Amazon EKS will launch a task on all 10 cluster nodes and the customer will be charged: (10 * hourly_rate). Metering for software use is automatically handled by the AWS Marketplace Metering Control Plane -- your software is not required to perform any metering specific actions, other than call RegisterUsage once for metering of software use to commence. The AWS Marketplace Metering Control Plane will also continue to bill customers for running ECS tasks and Amazon EKS pods, regardless of the customers subscription state, removing the need for your software to perform entitlement checks at runtime.</p> </li> </ul>"
     },
     "ResolveCustomer":{
       "name":"ResolveCustomer",
@@ -149,7 +150,7 @@
       "members":{
         "message":{"shape":"errorMessage"}
       },
-      "documentation":"<p>A metering record has already been emitted by the same EC2 instance for the given {usageDimension, timestamp} with a different usageQuantity.</p>",
+      "documentation":"<p>A metering record has already been emitted by the same EC2 instance, ECS task, or EKS pod for the given {usageDimension, timestamp} with a different usageQuantity.</p>",
       "exception":true
     },
     "ExpiredTokenException":{
@@ -182,7 +183,7 @@
       "members":{
         "message":{"shape":"errorMessage"}
       },
-      "documentation":"<p>The endpoint being called is in a Region different from your EC2 instance. The Region of the Metering Service endpoint and the Region of the EC2 instance must match.</p>",
+      "documentation":"<p>The endpoint being called is in a AWS Region different from your EC2 instance, ECS task, or EKS pod. The Region of the Metering Service endpoint and the AWS Region of the resource must match.</p>",
       "exception":true
     },
     "InvalidProductCodeException":{
@@ -441,5 +442,5 @@
     },
     "errorMessage":{"type":"string"}
   },
-  "documentation":"<fullname>AWS Marketplace Metering Service</fullname> <p>This reference provides descriptions of the low-level AWS Marketplace Metering Service API.</p> <p>AWS Marketplace sellers can use this API to submit usage data for custom usage dimensions.</p> <p> <b>Submitting Metering Records</b> </p> <ul> <li> <p> <i>MeterUsage</i>- Submits the metering record for a Marketplace product. MeterUsage is called from an EC2 instance.</p> </li> <li> <p> <i>BatchMeterUsage</i>- Submits the metering record for a set of customers. BatchMeterUsage is called from a software-as-a-service (SaaS) application.</p> </li> </ul> <p> <b>Accepting New Customers</b> </p> <ul> <li> <p> <i>ResolveCustomer</i>- Called by a SaaS application during the registration process. When a buyer visits your website during the registration process, the buyer submits a Registration Token through the browser. The Registration Token is resolved through this API to obtain a CustomerIdentifier and Product Code.</p> </li> </ul> <p> <b>Entitlement and Metering for Paid Container Products</b> </p> <ul> <li> <p> Paid container software products sold through AWS Marketplace must integrate with the AWS Marketplace Metering Service and call the RegisterUsage operation for software entitlement and metering. Calling RegisterUsage from containers running outside of Amazon Elastic Container Service (Amazon ECR) isn't supported. Free and BYOL products for ECS aren't required to call RegisterUsage, but you can do so if you want to receive usage data in your seller reports. For more information on using the RegisterUsage operation, see <a href=\"https://docs.aws.amazon.com/marketplace/latest/userguide/container-based-products.html\">Container-Based Products</a>. </p> </li> </ul> <p>BatchMeterUsage API calls are captured by AWS CloudTrail. You can use Cloudtrail to verify that the SaaS metering records that you sent are accurate by searching for records with the eventName of BatchMeterUsage. You can also use CloudTrail to audit records over time. For more information, see the <i> <a href=\"http://docs.aws.amazon.com/awscloudtrail/latest/userguide/cloudtrail-concepts.html\">AWS CloudTrail User Guide</a> </i>.</p>"
+  "documentation":"<fullname>AWS Marketplace Metering Service</fullname> <p>This reference provides descriptions of the low-level AWS Marketplace Metering Service API.</p> <p>AWS Marketplace sellers can use this API to submit usage data for custom usage dimensions.</p> <p> <b>Submitting Metering Records</b> </p> <ul> <li> <p> <i>MeterUsage</i>- Submits the metering record for a Marketplace product. MeterUsage is called from an EC2 instance or a container running on EKS or ECS.</p> </li> <li> <p> <i>BatchMeterUsage</i>- Submits the metering record for a set of customers. BatchMeterUsage is called from a software-as-a-service (SaaS) application.</p> </li> </ul> <p> <b>Accepting New Customers</b> </p> <ul> <li> <p> <i>ResolveCustomer</i>- Called by a SaaS application during the registration process. When a buyer visits your website during the registration process, the buyer submits a Registration Token through the browser. The Registration Token is resolved through this API to obtain a CustomerIdentifier and Product Code.</p> </li> </ul> <p> <b>Entitlement and Metering for Paid Container Products</b> </p> <ul> <li> <p> Paid container software products sold through AWS Marketplace must integrate with the AWS Marketplace Metering Service and call the RegisterUsage operation for software entitlement and metering. Free and BYOL products for Amazon ECS or Amazon EKS aren't required to call RegisterUsage, but you can do so if you want to receive usage data in your seller reports. For more information on using the RegisterUsage operation, see <a href=\"https://docs.aws.amazon.com/marketplace/latest/userguide/container-based-products.html\">Container-Based Products</a>. </p> </li> </ul> <p>BatchMeterUsage API calls are captured by AWS CloudTrail. You can use Cloudtrail to verify that the SaaS metering records that you sent are accurate by searching for records with the eventName of BatchMeterUsage. You can also use CloudTrail to audit records over time. For more information, see the <i> <a href=\"http://docs.aws.amazon.com/awscloudtrail/latest/userguide/cloudtrail-concepts.html\">AWS CloudTrail User Guide</a> </i>.</p>"
 }
diff --git a/services/marketplacemetering/src/test/resources/cucumber.properties b/services/marketplacemetering/src/test/resources/cucumber.properties
index cc229bfd83d3..4691bf55aa0d 100644
--- a/services/marketplacemetering/src/test/resources/cucumber.properties
+++ b/services/marketplacemetering/src/test/resources/cucumber.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/mediaconnect/pom.xml b/services/mediaconnect/pom.xml
index 9373708483e2..ca8ef51687d4 100644
--- a/services/mediaconnect/pom.xml
+++ b/services/mediaconnect/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>mediaconnect</artifactId>
     <name>AWS Java SDK :: Services :: MediaConnect</name>
diff --git a/services/mediaconnect/src/main/resources/codegen-resources/service-2.json b/services/mediaconnect/src/main/resources/codegen-resources/service-2.json
index 63c044003078..45802b6d623e 100644
--- a/services/mediaconnect/src/main/resources/codegen-resources/service-2.json
+++ b/services/mediaconnect/src/main/resources/codegen-resources/service-2.json
@@ -28,7 +28,7 @@
       "errors": [
         {
           "shape": "AddFlowOutputs420Exception",
-          "documentation": "AWS Elemental MediaConnect can't complete this request because this flow already has the maximum number of allowed outputs (20). For more information, contact AWS Customer Support."
+          "documentation": "AWS Elemental MediaConnect can't complete this request because this flow already has the maximum number of allowed outputs (50). For more information, contact AWS Customer Support."
         },
         {
           "shape": "BadRequestException",
@@ -55,7 +55,91 @@
           "documentation": "You have exceeded the service request rate limit for your AWS Elemental MediaConnect account."
         }
       ],
-      "documentation": "Adds outputs to an existing flow. You can create up to 20 outputs per flow."
+      "documentation": "Adds outputs to an existing flow. You can create up to 50 outputs per flow."
+    },
+    "AddFlowSources": {
+      "name": "AddFlowSources",
+      "http": {
+        "method": "POST",
+        "requestUri": "/v1/flows/{flowArn}/source",
+        "responseCode": 201
+      },
+      "input": {
+        "shape": "AddFlowSourcesRequest"
+      },
+      "output": {
+        "shape": "AddFlowSourcesResponse",
+        "documentation": "AWS Elemental MediaConnect added sources to the flow successfully."
+      },
+      "errors": [
+        {
+          "shape": "BadRequestException",
+          "documentation": "The request that you submitted is not valid."
+        },
+        {
+          "shape": "InternalServerErrorException",
+          "documentation": "AWS Elemental MediaConnect can't fulfill your request because it encountered an unexpected condition."
+        },
+        {
+          "shape": "ForbiddenException",
+          "documentation": "You don't have the required permissions to perform this operation."
+        },
+        {
+          "shape": "NotFoundException",
+          "documentation": "AWS Elemental MediaConnect did not find the resource that you specified in the request."
+        },
+        {
+          "shape": "ServiceUnavailableException",
+          "documentation": "AWS Elemental MediaConnect is currently unavailable. Try again later."
+        },
+        {
+          "shape": "TooManyRequestsException",
+          "documentation": "You have exceeded the service request rate limit for your AWS Elemental MediaConnect account."
+        }
+      ],
+      "documentation": "Adds Sources to flow"
+    },
+    "AddFlowVpcInterfaces": {
+      "name": "AddFlowVpcInterfaces",
+      "http": {
+        "method": "POST",
+        "requestUri": "/v1/flows/{flowArn}/vpcInterfaces",
+        "responseCode": 201
+      },
+      "input": {
+        "shape": "AddFlowVpcInterfacesRequest"
+      },
+      "output": {
+        "shape": "AddFlowVpcInterfacesResponse",
+        "documentation": "The following VPC interface was added to the Flow configuration."
+      },
+      "errors": [
+        {
+          "shape": "BadRequestException",
+          "documentation": "The request that you submitted is not valid."
+        },
+        {
+          "shape": "InternalServerErrorException",
+          "documentation": "AWS Elemental MediaConnect can't fulfill your request because it encountered an unexpected condition."
+        },
+        {
+          "shape": "ForbiddenException",
+          "documentation": "You don't have the required permissions to perform this operation."
+        },
+        {
+          "shape": "NotFoundException",
+          "documentation": "AWS Elemental MediaConnect did not find the resource that you specified in the request."
+        },
+        {
+          "shape": "ServiceUnavailableException",
+          "documentation": "AWS Elemental MediaConnect is currently unavailable. Try again later."
+        },
+        {
+          "shape": "TooManyRequestsException",
+          "documentation": "You have exceeded the service request rate limit for your AWS Elemental MediaConnect account."
+        }
+      ],
+      "documentation": "Adds VPC interfaces to flow"
     },
     "CreateFlow": {
       "name": "CreateFlow",
@@ -97,7 +181,7 @@
           "documentation": "You have exceeded the service request rate limit for your AWS Elemental MediaConnect account."
         }
       ],
-      "documentation": "Creates a new flow. The request must include one source. The request optionally can include outputs (up to 20) and entitlements (up to 50)."
+      "documentation": "Creates a new flow. The request must include one source. The request optionally can include outputs (up to 50) and entitlements (up to 50)."
     },
     "DeleteFlow": {
       "name": "DeleteFlow",
@@ -369,6 +453,90 @@
       ],
       "documentation": "Removes an output from an existing flow. This request can be made only on an output that does not have an entitlement associated with it. If the output has an entitlement, you must revoke the entitlement instead. When an entitlement is revoked from a flow, the service automatically removes the associated output."
     },
+    "RemoveFlowSource": {
+      "name": "RemoveFlowSource",
+      "http": {
+        "method": "DELETE",
+        "requestUri": "/v1/flows/{flowArn}/source/{sourceArn}",
+        "responseCode": 202
+      },
+      "input": {
+        "shape": "RemoveFlowSourceRequest"
+      },
+      "output": {
+        "shape": "RemoveFlowSourceResponse",
+        "documentation": "source successfully removed from flow configuration."
+      },
+      "errors": [
+        {
+          "shape": "BadRequestException",
+          "documentation": "The request that you submitted is not valid."
+        },
+        {
+          "shape": "InternalServerErrorException",
+          "documentation": "AWS Elemental MediaConnect can't fulfill your request because it encountered an unexpected condition."
+        },
+        {
+          "shape": "ForbiddenException",
+          "documentation": "You don't have the required permissions to perform this operation."
+        },
+        {
+          "shape": "NotFoundException",
+          "documentation": "AWS Elemental MediaConnect did not find the resource that you specified in the request."
+        },
+        {
+          "shape": "ServiceUnavailableException",
+          "documentation": "AWS Elemental MediaConnect is currently unavailable. Try again later."
+        },
+        {
+          "shape": "TooManyRequestsException",
+          "documentation": "You have exceeded the service request rate limit for your AWS Elemental MediaConnect account."
+        }
+      ],
+      "documentation": "Removes a source from an existing flow. This request can be made only if there is more than one source on the flow."
+    },
+    "RemoveFlowVpcInterface": {
+      "name": "RemoveFlowVpcInterface",
+      "http": {
+        "method": "DELETE",
+        "requestUri": "/v1/flows/{flowArn}/vpcInterfaces/{vpcInterfaceName}",
+        "responseCode": 200
+      },
+      "input": {
+        "shape": "RemoveFlowVpcInterfaceRequest"
+      },
+      "output": {
+        "shape": "RemoveFlowVpcInterfaceResponse",
+        "documentation": "VPC interface successfully removed from flow configuration."
+      },
+      "errors": [
+        {
+          "shape": "BadRequestException",
+          "documentation": "The request that you submitted is not valid."
+        },
+        {
+          "shape": "InternalServerErrorException",
+          "documentation": "AWS Elemental MediaConnect can't fulfill your request because it encountered an unexpected condition."
+        },
+        {
+          "shape": "ForbiddenException",
+          "documentation": "You don't have the required permissions to perform this operation."
+        },
+        {
+          "shape": "NotFoundException",
+          "documentation": "AWS Elemental MediaConnect did not find the resource that you specified in the request."
+        },
+        {
+          "shape": "ServiceUnavailableException",
+          "documentation": "AWS Elemental MediaConnect is currently unavailable. Try again later."
+        },
+        {
+          "shape": "TooManyRequestsException",
+          "documentation": "You have exceeded the service request rate limit for your AWS Elemental MediaConnect account."
+        }
+      ],
+      "documentation": "Removes a VPC Interface from an existing flow. This request can be made only on a VPC interface that does not have a Source or Output associated with it. If the VPC interface is referenced by a Source or Output, you must first delete or update the Source or Output to no longer reference the VPC interface."
+    },
     "RevokeFlowEntitlement": {
       "name": "RevokeFlowEntitlement",
       "http": {
@@ -547,6 +715,48 @@
       ],
       "documentation": "Deletes specified tags from a resource."
     },
+    "UpdateFlow": {
+      "name": "UpdateFlow",
+      "http": {
+        "method": "PUT",
+        "requestUri": "/v1/flows/{flowArn}",
+        "responseCode": 202
+      },
+      "input": {
+        "shape": "UpdateFlowRequest"
+      },
+      "output": {
+        "shape": "UpdateFlowResponse",
+        "documentation": "AWS Elemental MediaConnect updated the flow successfully."
+      },
+      "errors": [
+        {
+          "shape": "BadRequestException",
+          "documentation": "The request that you submitted is not valid."
+        },
+        {
+          "shape": "InternalServerErrorException",
+          "documentation": "AWS Elemental MediaConnect can't fulfill your request because it encountered an unexpected condition."
+        },
+        {
+          "shape": "ForbiddenException",
+          "documentation": "You don't have the required permissions to perform this operation."
+        },
+        {
+          "shape": "NotFoundException",
+          "documentation": "AWS Elemental MediaConnect did not find the resource that you specified in the request."
+        },
+        {
+          "shape": "ServiceUnavailableException",
+          "documentation": "AWS Elemental MediaConnect is currently unavailable. Try again later."
+        },
+        {
+          "shape": "TooManyRequestsException",
+          "documentation": "You have exceeded the service request rate limit for your AWS Elemental MediaConnect account."
+        }
+      ],
+      "documentation": "Updates flow"
+    },
     "UpdateFlowEntitlement": {
       "name": "UpdateFlowEntitlement",
       "http": {
@@ -729,6 +939,78 @@
         }
       }
     },
+    "AddFlowSourcesRequest": {
+      "type": "structure",
+      "members": {
+        "FlowArn": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "flowArn",
+          "documentation": "The flow that you want to mutate."
+        },
+        "Sources": {
+          "shape": "__listOfSetSourceRequest",
+          "locationName": "sources",
+          "documentation": "A list of sources that you want to add."
+        }
+      },
+      "documentation": "A request to add sources to the flow.",
+      "required": [
+        "FlowArn",
+        "Sources"
+      ]
+    },
+    "AddFlowSourcesResponse": {
+      "type": "structure",
+      "members": {
+        "FlowArn": {
+          "shape": "__string",
+          "locationName": "flowArn",
+          "documentation": "The ARN of the flow that these sources were added to."
+        },
+        "Sources": {
+          "shape": "__listOfSource",
+          "locationName": "sources",
+          "documentation": "The details of the newly added sources."
+        }
+      }
+    },
+    "AddFlowVpcInterfacesRequest": {
+      "type": "structure",
+      "members": {
+        "FlowArn": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "flowArn",
+          "documentation": "The flow that you want to mutate."
+        },
+        "VpcInterfaces": {
+          "shape": "__listOfVpcInterfaceRequest",
+          "locationName": "vpcInterfaces",
+          "documentation": "A list of VPC interfaces that you want to add."
+        }
+      },
+      "documentation": "A request to add VPC interfaces to the flow.",
+      "required": [
+        "FlowArn",
+        "VpcInterfaces"
+      ]
+    },
+    "AddFlowVpcInterfacesResponse": {
+      "type": "structure",
+      "members": {
+        "FlowArn": {
+          "shape": "__string",
+          "locationName": "flowArn",
+          "documentation": "The ARN of the flow that these VPC interfaces were added to."
+        },
+        "VpcInterfaces": {
+          "shape": "__listOfVpcInterface",
+          "locationName": "vpcInterfaces",
+          "documentation": "The details of the newly added VPC interfaces."
+        }
+      }
+    },
     "AddOutputRequest": {
       "type": "structure",
       "members": {
@@ -863,11 +1145,23 @@
         "Source": {
           "shape": "SetSourceRequest",
           "locationName": "source"
+        },
+        "SourceFailoverConfig": {
+          "shape": "FailoverConfig",
+          "locationName": "sourceFailoverConfig"
+        },
+        "Sources": {
+          "shape": "__listOfSetSourceRequest",
+          "locationName": "sources"
+        },
+        "VpcInterfaces": {
+          "shape": "__listOfVpcInterfaceRequest",
+          "locationName": "vpcInterfaces",
+          "documentation": "The VPC interfaces you want on the flow."
         }
       },
-      "documentation": "Creates a new flow. The request must include one source. The request optionally can include outputs (up to 20) and entitlements (up to 50).",
+      "documentation": "Creates a new flow. The request must include one source. The request optionally can include outputs (up to 50) and entitlements (up to 50).",
       "required": [
-        "Source",
         "Name"
       ]
     },
@@ -1032,6 +1326,21 @@
         "Name"
       ]
     },
+    "FailoverConfig": {
+      "type": "structure",
+      "members": {
+        "RecoveryWindow": {
+          "shape": "__integer",
+          "locationName": "recoveryWindow",
+          "documentation": "Search window time to look for dash-7 packets"
+        },
+        "State": {
+          "shape": "State",
+          "locationName": "state"
+        }
+      },
+      "documentation": "The settings for source failover"
+    },
     "Flow": {
       "type": "structure",
       "members": {
@@ -1074,10 +1383,23 @@
           "shape": "Source",
           "locationName": "source"
         },
+        "SourceFailoverConfig": {
+          "shape": "FailoverConfig",
+          "locationName": "sourceFailoverConfig"
+        },
+        "Sources": {
+          "shape": "__listOfSource",
+          "locationName": "sources"
+        },
         "Status": {
           "shape": "Status",
           "locationName": "status",
           "documentation": "The current status of the flow."
+        },
+        "VpcInterfaces": {
+          "shape": "__listOfVpcInterface",
+          "locationName": "vpcInterfaces",
+          "documentation": "The VPC Interfaces for this flow."
         }
       },
       "documentation": "The settings for a flow, including its source, outputs, and entitlements.",
@@ -1522,6 +1844,83 @@
         }
       }
     },
+    "RemoveFlowSourceRequest": {
+      "type": "structure",
+      "members": {
+        "FlowArn": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "flowArn",
+          "documentation": "The flow that you want to remove a source from."
+        },
+        "SourceArn": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "sourceArn",
+          "documentation": "The ARN of the source that you want to remove."
+        }
+      },
+      "required": [
+        "FlowArn",
+        "SourceArn"
+      ]
+    },
+    "RemoveFlowSourceResponse": {
+      "type": "structure",
+      "members": {
+        "FlowArn": {
+          "shape": "__string",
+          "locationName": "flowArn",
+          "documentation": "The ARN of the flow that is associated with the source you removed."
+        },
+        "SourceArn": {
+          "shape": "__string",
+          "locationName": "sourceArn",
+          "documentation": "The ARN of the source that was removed."
+        }
+      }
+    },
+    "RemoveFlowVpcInterfaceRequest": {
+      "type": "structure",
+      "members": {
+        "FlowArn": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "flowArn",
+          "documentation": "The flow that you want to remove a VPC interface from."
+        },
+        "VpcInterfaceName": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "vpcInterfaceName",
+          "documentation": "The name of the VPC interface that you want to remove."
+        }
+      },
+      "required": [
+        "FlowArn",
+        "VpcInterfaceName"
+      ]
+    },
+    "RemoveFlowVpcInterfaceResponse": {
+      "type": "structure",
+      "members": {
+        "FlowArn": {
+          "shape": "__string",
+          "locationName": "flowArn",
+          "documentation": "The ARN of the flow that is associated with the VPC interface you removed."
+        },
+        "NonDeletedNetworkInterfaceIds": {
+          "shape": "__listOf__string",
+          "locationName": "nonDeletedNetworkInterfaceIds",
+          "documentation": "IDs of network interfaces associated with the removed VPC interface that Media Connect was unable to remove."
+        },
+        "VpcInterfaceName": {
+          "shape": "__string",
+          "locationName": "vpcInterfaceName",
+          "documentation": "The name of the VPC interface that was removed."
+        }
+      }
+    },
     "ResponseError": {
       "type": "structure",
       "members": {
@@ -1638,6 +2037,11 @@
           "locationName": "streamId",
           "documentation": "The stream ID that you want to use for this transport. This parameter applies only to Zixi-based streams."
         },
+        "VpcInterfaceName": {
+          "shape": "__string",
+          "locationName": "vpcInterfaceName",
+          "documentation": "The name of the VPC interface to use for this source."
+        },
         "WhitelistCidr": {
           "shape": "__string",
           "locationName": "whitelistCidr",
@@ -1694,6 +2098,11 @@
           "locationName": "transport",
           "documentation": "Attributes related to the transport stream that are used in the source."
         },
+        "VpcInterfaceName": {
+          "shape": "__string",
+          "locationName": "vpcInterfaceName",
+          "documentation": "The name of the VPC Interface this Source is configured with."
+        },
         "WhitelistCidr": {
           "shape": "__string",
           "locationName": "whitelistCidr",
@@ -1742,6 +2151,13 @@
         }
       }
     },
+    "State": {
+      "type": "string",
+      "enum": [
+        "ENABLED",
+        "DISABLED"
+      ]
+    },
     "Status": {
       "type": "string",
       "enum": [
@@ -1938,6 +2354,21 @@
       },
       "documentation": "Information about the encryption of the flow."
     },
+    "UpdateFailoverConfig": {
+      "type": "structure",
+      "members": {
+        "RecoveryWindow": {
+          "shape": "__integer",
+          "locationName": "recoveryWindow",
+          "documentation": "Recovery window time to look for dash-7 packets"
+        },
+        "State": {
+          "shape": "State",
+          "locationName": "state"
+        }
+      },
+      "documentation": "The settings for source failover"
+    },
     "UpdateFlowEntitlementRequest": {
       "type": "structure",
       "members": {
@@ -2075,6 +2506,34 @@
         }
       }
     },
+    "UpdateFlowRequest": {
+      "type": "structure",
+      "members": {
+        "FlowArn": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "flowArn",
+          "documentation": "The flow that you want to update."
+        },
+        "SourceFailoverConfig": {
+          "shape": "UpdateFailoverConfig",
+          "locationName": "sourceFailoverConfig"
+        }
+      },
+      "documentation": "A request to update flow.",
+      "required": [
+        "FlowArn"
+      ]
+    },
+    "UpdateFlowResponse": {
+      "type": "structure",
+      "members": {
+        "Flow": {
+          "shape": "Flow",
+          "locationName": "flow"
+        }
+      }
+    },
     "UpdateFlowSourceRequest": {
       "type": "structure",
       "members": {
@@ -2130,6 +2589,11 @@
           "locationName": "streamId",
           "documentation": "The stream ID that you want to use for this transport. This parameter applies only to Zixi-based streams."
         },
+        "VpcInterfaceName": {
+          "shape": "__string",
+          "locationName": "vpcInterfaceName",
+          "documentation": "The name of the VPC Interface to configure this Source with."
+        },
         "WhitelistCidr": {
           "shape": "__string",
           "locationName": "whitelistCidr",
@@ -2157,6 +2621,76 @@
         }
       }
     },
+    "VpcInterface": {
+      "type": "structure",
+      "members": {
+        "Name": {
+          "shape": "__string",
+          "locationName": "name",
+          "documentation": "Immutable and has to be a unique against other VpcInterfaces in this Flow"
+        },
+        "NetworkInterfaceIds": {
+          "shape": "__listOf__string",
+          "locationName": "networkInterfaceIds",
+          "documentation": "IDs of the network interfaces created in customer's account by MediaConnect."
+        },
+        "RoleArn": {
+          "shape": "__string",
+          "locationName": "roleArn",
+          "documentation": "Role Arn MediaConnect can assumes to create ENIs in customer's account"
+        },
+        "SecurityGroupIds": {
+          "shape": "__listOf__string",
+          "locationName": "securityGroupIds",
+          "documentation": "Security Group IDs to be used on ENI."
+        },
+        "SubnetId": {
+          "shape": "__string",
+          "locationName": "subnetId",
+          "documentation": "Subnet must be in the AZ of the Flow"
+        }
+      },
+      "documentation": "The settings for a VPC Source.",
+      "required": [
+        "NetworkInterfaceIds",
+        "SubnetId",
+        "SecurityGroupIds",
+        "RoleArn",
+        "Name"
+      ]
+    },
+    "VpcInterfaceRequest": {
+      "type": "structure",
+      "members": {
+        "Name": {
+          "shape": "__string",
+          "locationName": "name",
+          "documentation": "The name of the VPC Interface. This value must be unique within the current flow."
+        },
+        "RoleArn": {
+          "shape": "__string",
+          "locationName": "roleArn",
+          "documentation": "Role Arn MediaConnect can assumes to create ENIs in customer's account"
+        },
+        "SecurityGroupIds": {
+          "shape": "__listOf__string",
+          "locationName": "securityGroupIds",
+          "documentation": "Security Group IDs to be used on ENI."
+        },
+        "SubnetId": {
+          "shape": "__string",
+          "locationName": "subnetId",
+          "documentation": "Subnet must be in the AZ of the Flow"
+        }
+      },
+      "documentation": "Desired VPC Interface for a Flow",
+      "required": [
+        "SubnetId",
+        "SecurityGroupIds",
+        "RoleArn",
+        "Name"
+      ]
+    },
     "__boolean": {
       "type": "boolean"
     },
@@ -2202,6 +2736,36 @@
         "shape": "Output"
       }
     },
+    "__listOfSetSourceRequest": {
+      "type": "list",
+      "member": {
+        "shape": "SetSourceRequest"
+      }
+    },
+    "__listOfSource": {
+      "type": "list",
+      "member": {
+        "shape": "Source"
+      }
+    },
+    "__listOfVpcInterface": {
+      "type": "list",
+      "member": {
+        "shape": "VpcInterface"
+      }
+    },
+    "__listOfVpcInterfaceRequest": {
+      "type": "list",
+      "member": {
+        "shape": "VpcInterfaceRequest"
+      }
+    },
+    "__listOf__integer": {
+      "type": "list",
+      "member": {
+        "shape": "__integer"
+      }
+    },
     "__listOf__string": {
       "type": "list",
       "member": {
@@ -2233,4 +2797,4 @@
     }
   },
   "documentation": "API for AWS Elemental MediaConnect"
-}
+}
\ No newline at end of file
diff --git a/services/mediaconvert/pom.xml b/services/mediaconvert/pom.xml
index 385503785811..5319bf1471d1 100644
--- a/services/mediaconvert/pom.xml
+++ b/services/mediaconvert/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>services</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>mediaconvert</artifactId>
diff --git a/services/mediaconvert/src/main/resources/codegen-resources/service-2.json b/services/mediaconvert/src/main/resources/codegen-resources/service-2.json
index f322ebd6385c..a131164bb62f 100644
--- a/services/mediaconvert/src/main/resources/codegen-resources/service-2.json
+++ b/services/mediaconvert/src/main/resources/codegen-resources/service-2.json
@@ -1309,6 +1309,14 @@
       },
       "documentation": "Required when you set (Codec) under (AudioDescriptions)>(CodecSettings) to the value AIFF."
     },
+    "AlphaBehavior": {
+      "type": "string",
+      "documentation": "Ignore this setting unless this input is a QuickTime animation with an alpha channel. Use this setting to create separate Key and Fill outputs. In each output, specify which part of the input MediaConvert uses. Leave this setting at the default value DISCARD to delete the alpha channel and preserve the video. Set it to REMAP_TO_LUMA to delete the video and map the alpha channel to the luma channel of your outputs.",
+      "enum": [
+        "DISCARD",
+        "REMAP_TO_LUMA"
+      ]
+    },
     "AncillaryConvert608To708": {
       "type": "string",
       "documentation": "Specify whether this set of input captions appears in your outputs in both 608 and 708 format. If you choose Upconvert (UPCONVERT), MediaConvert includes the captions data in two ways: it passes the 608 data through using the 608 compatibility bytes fields of the 708 wrapper, and it also translates the 608 data into 708.",
@@ -1378,6 +1386,7 @@
       "enum": [
         "AAC",
         "MP2",
+        "MP3",
         "WAV",
         "AIFF",
         "AC3",
@@ -1424,13 +1433,18 @@
           "locationName": "mp2Settings",
           "documentation": "Required when you set (Codec) under (AudioDescriptions)>(CodecSettings) to the value MP2."
         },
+        "Mp3Settings": {
+          "shape": "Mp3Settings",
+          "locationName": "mp3Settings",
+          "documentation": "Required when you set Codec, under AudioDescriptions>CodecSettings, to the value MP3."
+        },
         "WavSettings": {
           "shape": "WavSettings",
           "locationName": "wavSettings",
           "documentation": "Required when you set (Codec) under (AudioDescriptions)>(CodecSettings) to the value WAV."
         }
       },
-      "documentation": "Audio codec settings (CodecSettings) under (AudioDescriptions) contains the group of settings related to audio encoding. The settings in this group vary depending on the value that you choose for Audio codec (Codec). For each codec enum that you choose, define the corresponding settings object. The following lists the codec enum, settings object pairs. * AAC, AacSettings * MP2, Mp2Settings * WAV, WavSettings * AIFF, AiffSettings * AC3, Ac3Settings * EAC3, Eac3Settings * EAC3_ATMOS, Eac3AtmosSettings"
+      "documentation": "Audio codec settings (CodecSettings) under (AudioDescriptions) contains the group of settings related to audio encoding. The settings in this group vary depending on the value that you choose for Audio codec (Codec). For each codec enum that you choose, define the corresponding settings object. The following lists the codec enum, settings object pairs. * AAC, AacSettings * MP2, Mp2Settings * MP3, Mp3Settings * WAV, WavSettings * AIFF, AiffSettings * AC3, Ac3Settings * EAC3, Eac3Settings * EAC3_ATMOS, Eac3AtmosSettings"
     },
     "AudioDefaultSelection": {
       "type": "string",
@@ -1466,12 +1480,12 @@
         "CodecSettings": {
           "shape": "AudioCodecSettings",
           "locationName": "codecSettings",
-          "documentation": "Audio codec settings (CodecSettings) under (AudioDescriptions) contains the group of settings related to audio encoding. The settings in this group vary depending on the value that you choose for Audio codec (Codec). For each codec enum that you choose, define the corresponding settings object. The following lists the codec enum, settings object pairs. * AAC, AacSettings * MP2, Mp2Settings * WAV, WavSettings * AIFF, AiffSettings * AC3, Ac3Settings * EAC3, Eac3Settings * EAC3_ATMOS, Eac3AtmosSettings"
+          "documentation": "Audio codec settings (CodecSettings) under (AudioDescriptions) contains the group of settings related to audio encoding. The settings in this group vary depending on the value that you choose for Audio codec (Codec). For each codec enum that you choose, define the corresponding settings object. The following lists the codec enum, settings object pairs. * AAC, AacSettings * MP2, Mp2Settings * MP3, Mp3Settings * WAV, WavSettings * AIFF, AiffSettings * AC3, Ac3Settings * EAC3, Eac3Settings * EAC3_ATMOS, Eac3AtmosSettings"
         },
         "CustomLanguageCode": {
-          "shape": "__stringMin3Max3PatternAZaZ3",
+          "shape": "__stringPatternAZaZ23AZaZ",
           "locationName": "customLanguageCode",
-          "documentation": "Specify the language for this audio output track, using the ISO 639-2 or ISO 639-3 three-letter language code. The language specified will be used when 'Follow Input Language Code' is not selected or when 'Follow Input Language Code' is selected but there is no ISO 639 language code specified by the input."
+          "documentation": "Specify the language for this audio output track. The service puts this language code into your output audio track when you set Language code control (AudioLanguageCodeControl) to Use configured (USE_CONFIGURED). The service also uses your specified custom language code when you set Language code control (AudioLanguageCodeControl) to Follow input (FOLLOW_INPUT), but your input file doesn't specify a language code. For all outputs, you can use an ISO 639-2 or ISO 639-3 code. For streaming outputs, you can also use any other code in the full RFC-5646 specification. Streaming outputs are those that are in one of the following output groups: CMAF, DASH ISO, Apple HLS, or Microsoft Smooth Streaming."
         },
         "LanguageCode": {
           "shape": "LanguageCode",
@@ -1481,7 +1495,7 @@
         "LanguageCodeControl": {
           "shape": "AudioLanguageCodeControl",
           "locationName": "languageCodeControl",
-          "documentation": "Choosing FOLLOW_INPUT will cause the ISO 639 language code of the output to follow the ISO 639 language code of the input. The language specified for languageCode' will be used when USE_CONFIGURED is selected or when FOLLOW_INPUT is selected but there is no ISO 639 language code specified by the input."
+          "documentation": "Specify which source for language code takes precedence for this audio track. When you choose Follow input (FOLLOW_INPUT), the service uses the language code from the input track if it's present. If there's no languge code on the input track, the service uses the code that you specify in the setting Language code (languageCode or customLanguageCode). When you choose Use configured (USE_CONFIGURED), the service uses the language code that you specify."
         },
         "RemixSettings": {
           "shape": "RemixSettings",
@@ -1498,7 +1512,7 @@
     },
     "AudioLanguageCodeControl": {
       "type": "string",
-      "documentation": "Choosing FOLLOW_INPUT will cause the ISO 639 language code of the output to follow the ISO 639 language code of the input. The language specified for languageCode' will be used when USE_CONFIGURED is selected or when FOLLOW_INPUT is selected but there is no ISO 639 language code specified by the input.",
+      "documentation": "Specify which source for language code takes precedence for this audio track. When you choose Follow input (FOLLOW_INPUT), the service uses the language code from the input track if it's present. If there's no languge code on the input track, the service uses the code that you specify in the setting Language code (languageCode or customLanguageCode). When you choose Use configured (USE_CONFIGURED), the service uses the language code that you specify.",
       "enum": [
         "FOLLOW_INPUT",
         "USE_CONFIGURED"
@@ -1554,7 +1568,7 @@
         "CorrectionGateLevel": {
           "shape": "__integerMinNegative70Max0",
           "locationName": "correctionGateLevel",
-          "documentation": "Content measuring above this level will be corrected to the target level. Content measuring below this level will not be corrected. Gating only applies when not using real_time_correction."
+          "documentation": "Content measuring above this level will be corrected to the target level. Content measuring below this level will not be corrected."
         },
         "LoudnessLogging": {
           "shape": "AudioNormalizationLoudnessLogging",
@@ -1588,7 +1602,7 @@
           "documentation": "Enable this setting on one audio selector to set it as the default for the job. The service uses this default for outputs where it can't find the specified input audio. If you don't set a default, those outputs have no audio."
         },
         "ExternalAudioFileInput": {
-          "shape": "__stringPatternHttpHttpsS3MM2VVMMPPEEGGMMPP3AAVVIIMMPP4FFLLVVMMPPTTMMPPGGMM4VVTTRRPPFF4VVMM2TTSSTTSS264HH264MMKKVVMMOOVVMMTTSSMM2TTWWMMVVAASSFFVVOOBB3GGPP3GGPPPPMMXXFFDDIIVVXXXXVVIIDDRRAAWWDDVVGGXXFFMM1VV3GG2VVMMFFMM3UU8LLCCHHGGXXFFMMPPEEGG2MMXXFFMMPPEEGG2MMXXFFHHDDWWAAVVYY4MMAAAACCAAIIFFFFMMPP2AACC3EECC3DDTTSSEE",
+          "shape": "__stringPatternS3MM2VVMMPPEEGGMMPP3AAVVIIMMPP4FFLLVVMMPPTTMMPPGGMM4VVTTRRPPFF4VVMM2TTSSTTSS264HH264MMKKVVMMOOVVMMTTSSMM2TTWWMMVVAASSFFVVOOBB3GGPP3GGPPPPMMXXFFDDIIVVXXXXVVIIDDRRAAWWDDVVGGXXFFMM1VV3GG2VVMMFFMM3UU8LLCCHHGGXXFFMMPPEEGG2MMXXFFMMPPEEGG2MMXXFFHHDDWWAAVVYY4MMAAAACCAAIIFFFFMMPP2AACC3EECC3DDTTSSEEHttpsMM2VVMMPPEEGGMMPP3AAVVIIMMPP4FFLLVVMMPPTTMMPPGGMM4VVTTRRPPFF4VVMM2TTSSTTSS264HH264MMKKVVMMOOVVMMTTSSMM2TTWWMMVVAASSFFVVOOBB3GGPP3GGPPPPMMXXFFDDIIVVXXXXVVIIDDRRAAWWDDVVGGXXFFMM1VV3GG2VVMMFFMM3UU8LLCCHHGGXXFFMMPPEEGG2MMXXFFMMPPEEGG2MMXXFFHHDDWWAAVVYY4MMAAAACCAAIIFFFFMMPP2AACC3EECC3DDTTSSEE",
           "locationName": "externalAudioFileInput",
           "documentation": "Specifies audio data from an external file source."
         },
@@ -1658,11 +1672,136 @@
         "USE_CONFIGURED"
       ]
     },
+    "Av1AdaptiveQuantization": {
+      "type": "string",
+      "documentation": "Adaptive quantization. Allows intra-frame quantizers to vary to improve visual quality.",
+      "enum": [
+        "OFF",
+        "LOW",
+        "MEDIUM",
+        "HIGH",
+        "HIGHER",
+        "MAX"
+      ]
+    },
+    "Av1FramerateControl": {
+      "type": "string",
+      "documentation": "If you are using the console, use the Framerate setting to specify the frame rate for this output. If you want to keep the same frame rate as the input video, choose Follow source. If you want to do frame rate conversion, choose a frame rate from the dropdown list or choose Custom. The framerates shown in the dropdown list are decimal approximations of fractions. If you choose Custom, specify your frame rate as a fraction. If you are creating your transcoding job specification as a JSON file without the console, use FramerateControl to specify which value the service uses for the frame rate for this output. Choose INITIALIZE_FROM_SOURCE if you want the service to use the frame rate from the input. Choose SPECIFIED if you want the service to use the frame rate you specify in the settings FramerateNumerator and FramerateDenominator.",
+      "enum": [
+        "INITIALIZE_FROM_SOURCE",
+        "SPECIFIED"
+      ]
+    },
+    "Av1FramerateConversionAlgorithm": {
+      "type": "string",
+      "documentation": "When set to INTERPOLATE, produces smoother motion during frame rate conversion.",
+      "enum": [
+        "DUPLICATE_DROP",
+        "INTERPOLATE"
+      ]
+    },
+    "Av1QvbrSettings": {
+      "type": "structure",
+      "members": {
+        "QvbrQualityLevel": {
+          "shape": "__integerMin1Max10",
+          "locationName": "qvbrQualityLevel",
+          "documentation": "Required when you use QVBR rate control mode. That is, when you specify qvbrSettings within av1Settings. Specify the general target quality level for this output, from 1 to 10. Use higher numbers for greater quality. Level 10 results in nearly lossless compression. The quality level for most broadcast-quality transcodes is between 6 and 9. Optionally, to specify a value between whole numbers, also provide a value for the setting qvbrQualityLevelFineTune. For example, if you want your QVBR quality level to be 7.33, set qvbrQualityLevel to 7 and set qvbrQualityLevelFineTune to .33."
+        },
+        "QvbrQualityLevelFineTune": {
+          "shape": "__doubleMin0Max1",
+          "locationName": "qvbrQualityLevelFineTune",
+          "documentation": "Optional. Specify a value here to set the QVBR quality to a level that is between whole numbers. For example, if you want your QVBR quality level to be 7.33, set qvbrQualityLevel to 7 and set qvbrQualityLevelFineTune to .33. MediaConvert rounds your QVBR quality level to the nearest third of a whole number. For example, if you set qvbrQualityLevel to 7 and you set qvbrQualityLevelFineTune to .25, your actual QVBR quality level is 7.33."
+        }
+      },
+      "documentation": "Settings for quality-defined variable bitrate encoding with the AV1 codec. Required when you set Rate control mode to QVBR. Not valid when you set Rate control mode to a value other than QVBR, or when you don't define Rate control mode."
+    },
+    "Av1RateControlMode": {
+      "type": "string",
+      "documentation": "'With AV1 outputs, for rate control mode, MediaConvert supports only quality-defined variable bitrate (QVBR). You can''t use CBR or VBR.'",
+      "enum": [
+        "QVBR"
+      ]
+    },
+    "Av1Settings": {
+      "type": "structure",
+      "members": {
+        "AdaptiveQuantization": {
+          "shape": "Av1AdaptiveQuantization",
+          "locationName": "adaptiveQuantization",
+          "documentation": "Adaptive quantization. Allows intra-frame quantizers to vary to improve visual quality."
+        },
+        "FramerateControl": {
+          "shape": "Av1FramerateControl",
+          "locationName": "framerateControl",
+          "documentation": "If you are using the console, use the Framerate setting to specify the frame rate for this output. If you want to keep the same frame rate as the input video, choose Follow source. If you want to do frame rate conversion, choose a frame rate from the dropdown list or choose Custom. The framerates shown in the dropdown list are decimal approximations of fractions. If you choose Custom, specify your frame rate as a fraction. If you are creating your transcoding job specification as a JSON file without the console, use FramerateControl to specify which value the service uses for the frame rate for this output. Choose INITIALIZE_FROM_SOURCE if you want the service to use the frame rate from the input. Choose SPECIFIED if you want the service to use the frame rate you specify in the settings FramerateNumerator and FramerateDenominator."
+        },
+        "FramerateConversionAlgorithm": {
+          "shape": "Av1FramerateConversionAlgorithm",
+          "locationName": "framerateConversionAlgorithm",
+          "documentation": "When set to INTERPOLATE, produces smoother motion during frame rate conversion."
+        },
+        "FramerateDenominator": {
+          "shape": "__integerMin1Max2147483647",
+          "locationName": "framerateDenominator",
+          "documentation": "When you use the API for transcode jobs that use frame rate conversion, specify the frame rate as a fraction. For example,  24000 / 1001 = 23.976 fps. Use FramerateDenominator to specify the denominator of this fraction. In this example, use 1001 for the value of FramerateDenominator. When you use the console for transcode jobs that use frame rate conversion, provide the value as a decimal number for Framerate. In this example, specify 23.976."
+        },
+        "FramerateNumerator": {
+          "shape": "__integerMin1Max2147483647",
+          "locationName": "framerateNumerator",
+          "documentation": "When you use the API for transcode jobs that use frame rate conversion, specify the frame rate as a fraction. For example,  24000 / 1001 = 23.976 fps. Use FramerateNumerator to specify the numerator of this fraction. In this example, use 24000 for the value of FramerateNumerator. When you use the console for transcode jobs that use frame rate conversion, provide the value as a decimal number for Framerate. In this example, specify 23.976."
+        },
+        "GopSize": {
+          "shape": "__doubleMin0",
+          "locationName": "gopSize",
+          "documentation": "Specify the GOP length (keyframe interval) in frames. With AV1, MediaConvert doesn't support GOP length in seconds. This value must be greater than zero and preferably equal to 1 + ((numberBFrames + 1) * x), where x is an integer value."
+        },
+        "MaxBitrate": {
+          "shape": "__integerMin1000Max1152000000",
+          "locationName": "maxBitrate",
+          "documentation": "Maximum bitrate in bits/second. For example, enter five megabits per second as 5000000. Required when Rate control mode is QVBR."
+        },
+        "NumberBFramesBetweenReferenceFrames": {
+          "shape": "__integerMin7Max15",
+          "locationName": "numberBFramesBetweenReferenceFrames",
+          "documentation": "Specify the number of B-frames. With AV1, MediaConvert supports only 7 or 15."
+        },
+        "QvbrSettings": {
+          "shape": "Av1QvbrSettings",
+          "locationName": "qvbrSettings",
+          "documentation": "Settings for quality-defined variable bitrate encoding with the AV1 codec. Required when you set Rate control mode to QVBR. Not valid when you set Rate control mode to a value other than QVBR, or when you don't define Rate control mode."
+        },
+        "RateControlMode": {
+          "shape": "Av1RateControlMode",
+          "locationName": "rateControlMode",
+          "documentation": "'With AV1 outputs, for rate control mode, MediaConvert supports only quality-defined variable bitrate (QVBR). You can''t use CBR or VBR.'"
+        },
+        "Slices": {
+          "shape": "__integerMin1Max32",
+          "locationName": "slices",
+          "documentation": "Specify the number of slices per picture. This value must be 1, 2, 4, 8, 16, or 32. For progressive pictures, this value must be less than or equal to the number of macroblock rows. For interlaced pictures, this value must be less than or equal to half the number of macroblock rows."
+        },
+        "SpatialAdaptiveQuantization": {
+          "shape": "Av1SpatialAdaptiveQuantization",
+          "locationName": "spatialAdaptiveQuantization",
+          "documentation": "Adjust quantization within each frame based on spatial variation of content complexity."
+        }
+      },
+      "documentation": "Required when you set Codec, under VideoDescription>CodecSettings to the value AV1."
+    },
+    "Av1SpatialAdaptiveQuantization": {
+      "type": "string",
+      "documentation": "Adjust quantization within each frame based on spatial variation of content complexity.",
+      "enum": [
+        "DISABLED",
+        "ENABLED"
+      ]
+    },
     "AvailBlanking": {
       "type": "structure",
       "members": {
         "AvailBlankingImage": {
-          "shape": "__stringMin14PatternHttpHttpsS3BmpBMPPngPNG",
+          "shape": "__stringMin14PatternS3BmpBMPPngPNGHttpsBmpBMPPngPNG",
           "locationName": "availBlankingImage",
           "documentation": "Blanking image to be used. Leave empty for solid black. Only bmp and png images are supported."
         }
@@ -1870,9 +2009,9 @@
           "documentation": "Specifies which \"Caption Selector\":#inputs-caption_selector to use from each input when generating captions. The name should be of the format \"Caption Selector <N>\", which denotes that the Nth Caption Selector will be used from each input."
         },
         "CustomLanguageCode": {
-          "shape": "__stringMin3Max3PatternAZaZ3",
+          "shape": "__stringPatternAZaZ23AZaZ",
           "locationName": "customLanguageCode",
-          "documentation": "Indicates the language of the caption output track, using the ISO 639-2 or ISO 639-3 three-letter language code. For most captions output formats, the encoder puts this language information in the output captions metadata. If your output captions format is DVB-Sub or Burn in, the encoder uses this language information to choose the font language for rendering the captions text."
+          "documentation": "Specify the language for this captions output track. For most captions output formats, the encoder puts this language information in the output captions metadata. If your output captions format is DVB-Sub or Burn in, the encoder uses this language information when automatically selecting the font script for rendering the captions text. For all outputs, you can use an ISO 639-2 or ISO 639-3 code. For streaming outputs, you can also use any other code in the full RFC-5646 specification. Streaming outputs are those that are in one of the following output groups: CMAF, DASH ISO, Apple HLS, or Microsoft Smooth Streaming."
         },
         "DestinationSettings": {
           "shape": "CaptionDestinationSettings",
@@ -1896,9 +2035,9 @@
       "type": "structure",
       "members": {
         "CustomLanguageCode": {
-          "shape": "__stringMin3Max3PatternAZaZ3",
+          "shape": "__stringPatternAZaZ23AZaZ",
           "locationName": "customLanguageCode",
-          "documentation": "Indicates the language of the caption output track, using the ISO 639-2 or ISO 639-3 three-letter language code. For most captions output formats, the encoder puts this language information in the output captions metadata. If your output captions format is DVB-Sub or Burn in, the encoder uses this language information to choose the font language for rendering the captions text."
+          "documentation": "Specify the language for this captions output track. For most captions output formats, the encoder puts this language information in the output captions metadata. If your output captions format is DVB-Sub or Burn in, the encoder uses this language information when automatically selecting the font script for rendering the captions text. For all outputs, you can use an ISO 639-2 or ISO 639-3 code. For streaming outputs, you can also use any other code in the full RFC-5646 specification. Streaming outputs are those that are in one of the following output groups: CMAF, DASH ISO, Apple HLS, or Microsoft Smooth Streaming."
         },
         "DestinationSettings": {
           "shape": "CaptionDestinationSettings",
@@ -2073,6 +2212,22 @@
       },
       "documentation": "Channel mapping (ChannelMapping) contains the group of fields that hold the remixing value for each channel. Units are in dB. Acceptable values are within the range from -60 (mute) through 6. A setting of 0 passes the input channel unchanged to the output channel (no attenuation or amplification)."
     },
+    "CmafAdditionalManifest": {
+      "type": "structure",
+      "members": {
+        "ManifestNameModifier": {
+          "shape": "__stringMin1",
+          "locationName": "manifestNameModifier",
+          "documentation": "Specify a name modifier that the service adds to the name of this manifest to make it different from the file names of the other main manifests in the output group. For example, say that the default main manifest for your HLS group is film-name.m3u8. If you enter \"-no-premium\" for this setting, then the file name the service generates for this top-level manifest is film-name-no-premium.m3u8. For HLS output groups, specify a manifestNameModifier that is different from the nameModifier of the output. The service uses the output name modifier to create unique names for the individual variant manifests."
+        },
+        "SelectedOutputs": {
+          "shape": "__listOf__stringMin1",
+          "locationName": "selectedOutputs",
+          "documentation": "Specify the outputs that you want this additional top-level manifest to reference."
+        }
+      },
+      "documentation": "Specify the details for each pair of HLS and DASH additional manifests that you want the service to generate for this CMAF output group. Each pair of manifests can reference a different subset of outputs in the group."
+    },
     "CmafClientCache": {
       "type": "string",
       "documentation": "When set to ENABLED, sets #EXT-X-ALLOW-CACHE:no tag, which prevents client from saving media segments for later replay.",
@@ -2136,6 +2291,11 @@
     "CmafGroupSettings": {
       "type": "structure",
       "members": {
+        "AdditionalManifests": {
+          "shape": "__listOfCmafAdditionalManifest",
+          "locationName": "additionalManifests",
+          "documentation": "By default, the service creates one top-level .m3u8 HLS manifest and one top -level .mpd DASH manifest for each CMAF output group in your job. These default manifests reference every output in the output group. To create additional top-level manifests that reference a subset of the outputs in the output group, specify a list of them here. For each additional manifest that you specify, the service creates one HLS manifest and one DASH manifest."
+        },
         "BaseUrl": {
           "shape": "__string",
           "locationName": "baseUrl",
@@ -2220,6 +2380,11 @@
           "shape": "CmafWriteHLSManifest",
           "locationName": "writeHlsManifest",
           "documentation": "When set to ENABLED, an Apple HLS manifest will be generated for this output."
+        },
+        "WriteSegmentTimelineInRepresentation": {
+          "shape": "CmafWriteSegmentTimelineInRepresentation",
+          "locationName": "writeSegmentTimelineInRepresentation",
+          "documentation": "When you enable Precise segment duration in DASH manifests (writeSegmentTimelineInRepresentation), your DASH manifest shows precise segment durations. The segment duration information appears inside the SegmentTimeline element, inside SegmentTemplate at the Representation level. When this feature isn't enabled, the segment durations in your DASH manifest are approximate. The segment duration information appears in the duration attribute of the SegmentTemplate element."
         }
       },
       "documentation": "Required when you set (Type) under (OutputGroups)>(OutputGroupSettings) to CMAF_GROUP_SETTINGS. Each output in a CMAF Output Group may only contain a single video, audio, or caption output."
@@ -2296,6 +2461,46 @@
         "ENABLED"
       ]
     },
+    "CmafWriteSegmentTimelineInRepresentation": {
+      "type": "string",
+      "documentation": "When you enable Precise segment duration in DASH manifests (writeSegmentTimelineInRepresentation), your DASH manifest shows precise segment durations. The segment duration information appears inside the SegmentTimeline element, inside SegmentTemplate at the Representation level. When this feature isn't enabled, the segment durations in your DASH manifest are approximate. The segment duration information appears in the duration attribute of the SegmentTemplate element.",
+      "enum": [
+        "ENABLED",
+        "DISABLED"
+      ]
+    },
+    "CmfcScte35Esam": {
+      "type": "string",
+      "documentation": "Use this setting only when you specify SCTE-35 markers from ESAM. Choose INSERT to put SCTE-35 markers in this output at the insertion points that you specify in an ESAM XML document. Provide the document in the setting SCC XML (sccXml).",
+      "enum": [
+        "INSERT",
+        "NONE"
+      ]
+    },
+    "CmfcScte35Source": {
+      "type": "string",
+      "documentation": "Ignore this setting unless you have SCTE-35 markers in your input video file. Choose Passthrough (PASSTHROUGH) if you want SCTE-35 markers that appear in your input to also appear in this output. Choose None (NONE) if you don't want those SCTE-35 markers in this output.",
+      "enum": [
+        "PASSTHROUGH",
+        "NONE"
+      ]
+    },
+    "CmfcSettings": {
+      "type": "structure",
+      "members": {
+        "Scte35Esam": {
+          "shape": "CmfcScte35Esam",
+          "locationName": "scte35Esam",
+          "documentation": "Use this setting only when you specify SCTE-35 markers from ESAM. Choose INSERT to put SCTE-35 markers in this output at the insertion points that you specify in an ESAM XML document. Provide the document in the setting SCC XML (sccXml)."
+        },
+        "Scte35Source": {
+          "shape": "CmfcScte35Source",
+          "locationName": "scte35Source",
+          "documentation": "Ignore this setting unless you have SCTE-35 markers in your input video file. Choose Passthrough (PASSTHROUGH) if you want SCTE-35 markers that appear in your input to also appear in this output. Choose None (NONE) if you don't want those SCTE-35 markers in this output."
+        }
+      },
+      "documentation": "Settings for MP4 segments in CMAF"
+    },
     "ColorCorrector": {
       "type": "structure",
       "members": {
@@ -2307,7 +2512,7 @@
         "ColorSpaceConversion": {
           "shape": "ColorSpaceConversion",
           "locationName": "colorSpaceConversion",
-          "documentation": "Specify the color space you want for this output. The service supports conversion between HDR formats, between SDR formats, and from SDR to HDR. The service doesn't support conversion from HDR to SDR. SDR to HDR conversion doesn't upgrade the dynamic range. The converted video has an HDR format, but visually appears the same as an unconverted output."
+          "documentation": "Specify the color space you want for this output. The service supports conversion between HDR formats, between SDR formats, from SDR to HDR, and from HDR to SDR. SDR to HDR conversion doesn't upgrade the dynamic range. The converted video has an HDR format, but visually appears the same as an unconverted output. HDR to SDR conversion uses Elemental tone mapping technology to approximate the outcome of manually regrading from HDR to SDR."
         },
         "Contrast": {
           "shape": "__integerMin1Max100",
@@ -2353,7 +2558,7 @@
     },
     "ColorSpaceConversion": {
       "type": "string",
-      "documentation": "Specify the color space you want for this output. The service supports conversion between HDR formats, between SDR formats, and from SDR to HDR. The service doesn't support conversion from HDR to SDR. SDR to HDR conversion doesn't upgrade the dynamic range. The converted video has an HDR format, but visually appears the same as an unconverted output.",
+      "documentation": "Specify the color space you want for this output. The service supports conversion between HDR formats, between SDR formats, from SDR to HDR, and from HDR to SDR. SDR to HDR conversion doesn't upgrade the dynamic range. The converted video has an HDR format, but visually appears the same as an unconverted output. HDR to SDR conversion uses Elemental tone mapping technology to approximate the outcome of manually regrading from HDR to SDR.",
       "enum": [
         "NONE",
         "FORCE_601",
@@ -2394,6 +2599,11 @@
     "ContainerSettings": {
       "type": "structure",
       "members": {
+        "CmfcSettings": {
+          "shape": "CmfcSettings",
+          "locationName": "cmfcSettings",
+          "documentation": "Settings for MP4 segments in CMAF"
+        },
         "Container": {
           "shape": "ContainerType",
           "locationName": "container",
@@ -2423,6 +2633,11 @@
           "shape": "Mp4Settings",
           "locationName": "mp4Settings",
           "documentation": "Settings for MP4 container. You can create audio-only AAC outputs with this container."
+        },
+        "MpdSettings": {
+          "shape": "MpdSettings",
+          "locationName": "mpdSettings",
+          "documentation": "Settings for MP4 segments in DASH"
         }
       },
       "documentation": "Container specific settings."
@@ -2679,6 +2894,22 @@
         }
       }
     },
+    "DashAdditionalManifest": {
+      "type": "structure",
+      "members": {
+        "ManifestNameModifier": {
+          "shape": "__stringMin1",
+          "locationName": "manifestNameModifier",
+          "documentation": "Specify a name modifier that the service adds to the name of this manifest to make it different from the file names of the other main manifests in the output group. For example, say that the default main manifest for your DASH group is film-name.mpd. If you enter \"-no-premium\" for this setting, then the file name the service generates for this top-level manifest is film-name-no-premium.mpd."
+        },
+        "SelectedOutputs": {
+          "shape": "__listOf__stringMin1",
+          "locationName": "selectedOutputs",
+          "documentation": "Specify the outputs that you want this additional top-level manifest to reference."
+        }
+      },
+      "documentation": "Specify the details for each additional DASH manifest that you want the service to generate for this output group. Each manifest can reference a different subset of outputs in the group."
+    },
     "DashIsoEncryptionSettings": {
       "type": "structure",
       "members": {
@@ -2698,6 +2929,11 @@
     "DashIsoGroupSettings": {
       "type": "structure",
       "members": {
+        "AdditionalManifests": {
+          "shape": "__listOfDashAdditionalManifest",
+          "locationName": "additionalManifests",
+          "documentation": "By default, the service creates one .mpd DASH manifest for each DASH ISO output group in your job. This default manifest references every output in the output group. To create additional DASH manifests that reference a subset of the outputs in the output group, specify a list of them here."
+        },
         "BaseUrl": {
           "shape": "__string",
           "locationName": "baseUrl",
@@ -2984,6 +3220,59 @@
       "members": {
       }
     },
+    "DolbyVision": {
+      "type": "structure",
+      "members": {
+        "L6Metadata": {
+          "shape": "DolbyVisionLevel6Metadata",
+          "locationName": "l6Metadata",
+          "documentation": "Use these settings when you set DolbyVisionLevel6Mode to SPECIFY to override the MaxCLL and MaxFALL values in your input with new values."
+        },
+        "L6Mode": {
+          "shape": "DolbyVisionLevel6Mode",
+          "locationName": "l6Mode",
+          "documentation": "Use Dolby Vision Mode to choose how the service will handle Dolby Vision MaxCLL and MaxFALL properies."
+        },
+        "Profile": {
+          "shape": "DolbyVisionProfile",
+          "locationName": "profile",
+          "documentation": "In the current MediaConvert implementation, the Dolby Vision profile is always 5 (PROFILE_5). Therefore, all of your inputs must contain Dolby Vision frame interleaved data."
+        }
+      },
+      "documentation": "Settings for Dolby Vision"
+    },
+    "DolbyVisionLevel6Metadata": {
+      "type": "structure",
+      "members": {
+        "MaxCll": {
+          "shape": "__integerMin0Max65535",
+          "locationName": "maxCll",
+          "documentation": "Maximum Content Light Level. Static HDR metadata that corresponds to the brightest pixel in the entire stream. Measured in nits."
+        },
+        "MaxFall": {
+          "shape": "__integerMin0Max65535",
+          "locationName": "maxFall",
+          "documentation": "Maximum Frame-Average Light Level. Static HDR metadata that corresponds to the highest frame-average brightness in the entire stream. Measured in nits."
+        }
+      },
+      "documentation": "Use these settings when you set DolbyVisionLevel6Mode to SPECIFY to override the MaxCLL and MaxFALL values in your input with new values."
+    },
+    "DolbyVisionLevel6Mode": {
+      "type": "string",
+      "documentation": "Use Dolby Vision Mode to choose how the service will handle Dolby Vision MaxCLL and MaxFALL properies.",
+      "enum": [
+        "PASSTHROUGH",
+        "RECALCULATE",
+        "SPECIFY"
+      ]
+    },
+    "DolbyVisionProfile": {
+      "type": "string",
+      "documentation": "In the current MediaConvert implementation, the Dolby Vision profile is always 5 (PROFILE_5). Therefore, all of your inputs must contain Dolby Vision frame interleaved data.",
+      "enum": [
+        "PROFILE_5"
+      ]
+    },
     "DropFrameTimecode": {
       "type": "string",
       "documentation": "Applies only to 29.97 fps outputs. When this feature is enabled, the service will use drop-frame timecode on outputs. If it is not possible to use drop-frame timecode, the system will fall back to non-drop-frame. This setting is enabled by default when Timecode insertion (TimecodeInsertion) is enabled.",
@@ -3112,6 +3401,11 @@
           "locationName": "shadowYOffset",
           "documentation": "Specifies the vertical offset of the shadow relative to the captions in pixels. A value of -2 would result in a shadow offset 2 pixels above the text. All burn-in and DVB-Sub font settings must match."
         },
+        "SubtitlingType": {
+          "shape": "DvbSubtitlingType",
+          "locationName": "subtitlingType",
+          "documentation": "Specify whether your DVB subtitles are standard or for hearing impaired. Choose hearing impaired if your subtitles include audio descriptions and dialogue. Choose standard if your subtitles include only dialogue."
+        },
         "TeletextSpacing": {
           "shape": "DvbSubtitleTeletextSpacing",
           "locationName": "teletextSpacing",
@@ -3199,6 +3493,14 @@
         "PROPORTIONAL"
       ]
     },
+    "DvbSubtitlingType": {
+      "type": "string",
+      "documentation": "Specify whether your DVB subtitles are standard or for hearing impaired. Choose hearing impaired if your subtitles include audio descriptions and dialogue. Choose standard if your subtitles include only dialogue.",
+      "enum": [
+        "HEARING_IMPAIRED",
+        "STANDARD"
+      ]
+    },
     "DvbTdtSettings": {
       "type": "structure",
       "members": {
@@ -3779,7 +4081,7 @@
           "documentation": "Specify whether this set of input captions appears in your outputs in both 608 and 708 format. If you choose Upconvert (UPCONVERT), MediaConvert includes the captions data in two ways: it passes the 608 data through using the 608 compatibility bytes fields of the 708 wrapper, and it also translates the 608 data into 708."
         },
         "SourceFile": {
-          "shape": "__stringMin14PatternHttpHttpsS3SccSCCTtmlTTMLDfxpDFXPStlSTLSrtSRTXmlXMLSmiSMI",
+          "shape": "__stringMin14PatternS3SccSCCTtmlTTMLDfxpDFXPStlSTLSrtSRTXmlXMLSmiSMIHttpsSccSCCTtmlTTMLDfxpDFXPStlSTLSrtSRTXmlXMLSmiSMI",
           "locationName": "sourceFile",
           "documentation": "External caption file used for loading captions. Accepted file extensions are 'scc', 'ttml', 'dfxp', 'stl', 'srt', 'xml', and 'smi'."
         },
@@ -4086,7 +4388,12 @@
         "QvbrQualityLevel": {
           "shape": "__integerMin1Max10",
           "locationName": "qvbrQualityLevel",
-          "documentation": "Required when you use QVBR rate control mode. That is, when you specify qvbrSettings within h264Settings. Specify the target quality level for this output, from 1 to 10. Use higher numbers for greater quality. Level 10 results in nearly lossless compression. The quality level for most broadcast-quality transcodes is between 6 and 9."
+          "documentation": "Required when you use QVBR rate control mode. That is, when you specify qvbrSettings within h264Settings. Specify the general target quality level for this output, from 1 to 10. Use higher numbers for greater quality. Level 10 results in nearly lossless compression. The quality level for most broadcast-quality transcodes is between 6 and 9. Optionally, to specify a value between whole numbers, also provide a value for the setting qvbrQualityLevelFineTune. For example, if you want your QVBR quality level to be 7.33, set qvbrQualityLevel to 7 and set qvbrQualityLevelFineTune to .33."
+        },
+        "QvbrQualityLevelFineTune": {
+          "shape": "__doubleMin0Max1",
+          "locationName": "qvbrQualityLevelFineTune",
+          "documentation": "Optional. Specify a value here to set the QVBR quality to a level that is between whole numbers. For example, if you want your QVBR quality level to be 7.33, set qvbrQualityLevel to 7 and set qvbrQualityLevelFineTune to .33. MediaConvert rounds your QVBR quality level to the nearest third of a whole number. For example, if you set qvbrQualityLevel to 7 and you set qvbrQualityLevelFineTune to .25, your actual QVBR quality level is 7.33."
         }
       },
       "documentation": "Settings for quality-defined variable bitrate encoding with the H.264 codec. Required when you set Rate control mode to QVBR. Not valid when you set Rate control mode to a value other than QVBR, or when you don't define Rate control mode."
@@ -4508,7 +4815,12 @@
         "QvbrQualityLevel": {
           "shape": "__integerMin1Max10",
           "locationName": "qvbrQualityLevel",
-          "documentation": "Required when you use QVBR rate control mode. That is, when you specify qvbrSettings within h265Settings. Specify the target quality level for this output, from 1 to 10. Use higher numbers for greater quality. Level 10 results in nearly lossless compression. The quality level for most broadcast-quality transcodes is between 6 and 9."
+          "documentation": "Required when you use QVBR rate control mode. That is, when you specify qvbrSettings within h265Settings. Specify the general target quality level for this output, from 1 to 10. Use higher numbers for greater quality. Level 10 results in nearly lossless compression. The quality level for most broadcast-quality transcodes is between 6 and 9. Optionally, to specify a value between whole numbers, also provide a value for the setting qvbrQualityLevelFineTune. For example, if you want your QVBR quality level to be 7.33, set qvbrQualityLevel to 7 and set qvbrQualityLevelFineTune to .33."
+        },
+        "QvbrQualityLevelFineTune": {
+          "shape": "__doubleMin0Max1",
+          "locationName": "qvbrQualityLevelFineTune",
+          "documentation": "Optional. Specify a value here to set the QVBR quality to a level that is between whole numbers. For example, if you want your QVBR quality level to be 7.33, set qvbrQualityLevel to 7 and set qvbrQualityLevelFineTune to .33. MediaConvert rounds your QVBR quality level to the nearest third of a whole number. For example, if you set qvbrQualityLevel to 7 and you set qvbrQualityLevelFineTune to .25, your actual QVBR quality level is 7.33."
         }
       },
       "documentation": "Settings for quality-defined variable bitrate encoding with the H.265 codec. Required when you set Rate control mode to QVBR. Not valid when you set Rate control mode to a value other than QVBR, or when you don't define Rate control mode."
@@ -4736,7 +5048,7 @@
         "WriteMp4PackagingType": {
           "shape": "H265WriteMp4PackagingType",
           "locationName": "writeMp4PackagingType",
-          "documentation": "If the location of parameter set NAL units doesn't matter in your workflow, ignore this setting. Use this setting in your CMAF, DASH, or file MP4 output. For file MP4 outputs, choosing HVC1 can create video that doesn't work properly with some downstream systems and video players. Choose HVC1 to mark your output as HVC1. This makes your output compliant with the following specification: ISO IECJTC1 SC29 N13798 Text ISO/IEC FDIS 14496-15 3rd Edition. For these outputs, the service stores parameter set NAL units in the sample headers but not in the samples directly. The service defaults to marking your output as HEV1. For these outputs, the service writes parameter set NAL units directly into the samples."
+          "documentation": "If the location of parameter set NAL units doesn't matter in your workflow, ignore this setting. Use this setting only with CMAF or DASH outputs, or with standalone file outputs in an MPEG-4 container (MP4 outputs). Choose HVC1 to mark your output as HVC1. This makes your output compliant with the following specification: ISO IECJTC1 SC29 N13798 Text ISO/IEC FDIS 14496-15 3rd Edition. For these outputs, the service stores parameter set NAL units in the sample headers but not in the samples directly. For MP4 outputs, when you choose HVC1, your output video might not work properly with some downstream systems and video players. The service defaults to marking your output as HEV1. For these outputs, the service writes parameter set NAL units directly into the samples."
         }
       },
       "documentation": "Settings for H265 codec"
@@ -4800,7 +5112,7 @@
     },
     "H265WriteMp4PackagingType": {
       "type": "string",
-      "documentation": "If the location of parameter set NAL units doesn't matter in your workflow, ignore this setting. Use this setting in your CMAF, DASH, or file MP4 output. For file MP4 outputs, choosing HVC1 can create video that doesn't work properly with some downstream systems and video players. Choose HVC1 to mark your output as HVC1. This makes your output compliant with the following specification: ISO IECJTC1 SC29 N13798 Text ISO/IEC FDIS 14496-15 3rd Edition. For these outputs, the service stores parameter set NAL units in the sample headers but not in the samples directly. The service defaults to marking your output as HEV1. For these outputs, the service writes parameter set NAL units directly into the samples.",
+      "documentation": "If the location of parameter set NAL units doesn't matter in your workflow, ignore this setting. Use this setting only with CMAF or DASH outputs, or with standalone file outputs in an MPEG-4 container (MP4 outputs). Choose HVC1 to mark your output as HVC1. This makes your output compliant with the following specification: ISO IECJTC1 SC29 N13798 Text ISO/IEC FDIS 14496-15 3rd Edition. For these outputs, the service stores parameter set NAL units in the sample headers but not in the samples directly. For MP4 outputs, when you choose HVC1, your output video might not work properly with some downstream systems and video players. The service defaults to marking your output as HEV1. For these outputs, the service writes parameter set NAL units directly into the samples.",
       "enum": [
         "HVC1",
         "HEV1"
@@ -4879,6 +5191,22 @@
         "ELEMENTAL_SCTE35"
       ]
     },
+    "HlsAdditionalManifest": {
+      "type": "structure",
+      "members": {
+        "ManifestNameModifier": {
+          "shape": "__stringMin1",
+          "locationName": "manifestNameModifier",
+          "documentation": "Specify a name modifier that the service adds to the name of this manifest to make it different from the file names of the other main manifests in the output group. For example, say that the default main manifest for your HLS group is film-name.m3u8. If you enter \"-no-premium\" for this setting, then the file name the service generates for this top-level manifest is film-name-no-premium.m3u8. For HLS output groups, specify a manifestNameModifier that is different from the nameModifier of the output. The service uses the output name modifier to create unique names for the individual variant manifests."
+        },
+        "SelectedOutputs": {
+          "shape": "__listOf__stringMin1",
+          "locationName": "selectedOutputs",
+          "documentation": "Specify the outputs that you want this additional top-level manifest to reference."
+        }
+      },
+      "documentation": "Specify the details for each additional HLS manifest that you want the service to generate for this output group. Each manifest can reference a different subset of outputs in the group."
+    },
     "HlsAudioOnlyContainer": {
       "type": "string",
       "documentation": "Use this setting only in audio-only outputs. Choose MPEG-2 Transport Stream (M2TS) to create a file in an MPEG2-TS container. Keep the default value Automatic (AUTOMATIC) to create a raw audio-only file with no container. Regardless of the value that you specify here, if this output has video, the service will place outputs into an MPEG2-TS container.",
@@ -4908,7 +5236,7 @@
         "CustomLanguageCode": {
           "shape": "__stringMin3Max3PatternAZaZ3",
           "locationName": "customLanguageCode",
-          "documentation": "Specify the language for this caption channel, using the ISO 639-2 or ISO 639-3 three-letter language code"
+          "documentation": "Specify the language for this captions channel, using the ISO 639-2 or ISO 639-3 three-letter language code"
         },
         "LanguageCode": {
           "shape": "LanguageCode",
@@ -5013,6 +5341,11 @@
           "locationName": "adMarkers",
           "documentation": "Choose one or more ad marker types to decorate your Apple HLS manifest. This setting does not determine whether SCTE-35 markers appear in the outputs themselves."
         },
+        "AdditionalManifests": {
+          "shape": "__listOfHlsAdditionalManifest",
+          "locationName": "additionalManifests",
+          "documentation": "By default, the service creates one top-level .m3u8 HLS manifest for each HLS output group in your job. This default manifest references every output in the output group. To create additional top-level manifests that reference a subset of the outputs in the output group, specify a list of them here."
+        },
         "BaseUrl": {
           "shape": "__string",
           "locationName": "baseUrl",
@@ -5234,7 +5567,7 @@
         "SegmentModifier": {
           "shape": "__string",
           "locationName": "segmentModifier",
-          "documentation": "String concatenated to end of segment filenames. Accepts \"Format Identifiers\":#format_identifier_parameters."
+          "documentation": "Use this setting to add an identifying string to the filename of each segment. The service adds this string between the name modifier and segment index number. You can use format identifiers in the string. For more information, see https://docs.aws.amazon.com/mediaconvert/latest/ug/using-variables-in-your-job-settings.html"
         }
       },
       "documentation": "Settings for HLS output groups"
@@ -5341,7 +5674,7 @@
           "documentation": "Enable Denoise (InputDenoiseFilter) to filter noise from the input.  Default is disabled. Only applicable to MPEG2, H.264, H.265, and uncompressed video inputs."
         },
         "FileInput": {
-          "shape": "__stringPatternHttpHttpsS3MM2VVMMPPEEGGMMPP3AAVVIIMMPP4FFLLVVMMPPTTMMPPGGMM4VVTTRRPPFF4VVMM2TTSSTTSS264HH264MMKKVVMMOOVVMMTTSSMM2TTWWMMVVAASSFFVVOOBB3GGPP3GGPPPPMMXXFFDDIIVVXXXXVVIIDDRRAAWWDDVVGGXXFFMM1VV3GG2VVMMFFMM3UU8WWEEBBMMLLCCHHGGXXFFMMPPEEGG2MMXXFFMMPPEEGG2MMXXFFHHDDWWAAVVYY4MMXXMMLL",
+          "shape": "__stringPatternS3MM2VVMMPPEEGGMMPP3AAVVIIMMPP4FFLLVVMMPPTTMMPPGGMM4VVTTRRPPFF4VVMM2TTSSTTSS264HH264MMKKVVMMOOVVMMTTSSMM2TTWWMMVVAASSFFVVOOBB3GGPP3GGPPPPMMXXFFDDIIVVXXXXVVIIDDRRAAWWDDVVGGXXFFMM1VV3GG2VVMMFFMM3UU8WWEEBBMMLLCCHHGGXXFFMMPPEEGG2MMXXFFMMPPEEGG2MMXXFFHHDDWWAAVVYY4MMXXMMLLHttpsMM2VVMMPPEEGGMMPP3AAVVIIMMPP4FFLLVVMMPPTTMMPPGGMM4VVTTRRPPFF4VVMM2TTSSTTSS264HH264MMKKVVMMOOVVMMTTSSMM2TTWWMMVVAASSFFVVOOBB3GGPP3GGPPPPMMXXFFDDIIVVXXXXVVIIDDRRAAWWDDVVGGXXFFMM1VV3GG2VVMMFFMM3UU8WWEEBBMMLLCCHHGGXXFFMMPPEEGG2MMXXFFMMPPEEGG2MMXXFFHHDDWWAAVVYY4MMXXMMLL",
           "locationName": "fileInput",
           "documentation": "Specify the source file for your transcoding job. You can use multiple inputs in a single job. The service concatenates these inputs, in the order that you specify them in the job, to create the outputs. If your input format is IMF, specify your input by providing the path to your CPL. For example, \"s3://bucket/vf/cpl.xml\". If the CPL is in an incomplete IMP, make sure to use *Supplemental IMPs* (SupplementalImps) to specify any supplemental IMPs that contain assets referenced by the CPL."
         },
@@ -5608,7 +5941,7 @@
           "documentation": "Specify the height of the inserted image in pixels. If you specify a value that's larger than the video resolution height, the service will crop your overlaid image to fit. To use the native height of the image, keep this setting blank."
         },
         "ImageInserterInput": {
-          "shape": "__stringMin14PatternHttpHttpsS3BmpBMPPngPNGTgaTGA",
+          "shape": "__stringMin14PatternS3BmpBMPPngPNGTgaTGAHttpsBmpBMPPngPNGTgaTGA",
           "locationName": "imageInserterInput",
           "documentation": "Specify the HTTP, HTTPS, or Amazon S3 location of the image that you want to overlay on the video. Use a PNG or TGA file."
         },
@@ -6832,7 +7165,7 @@
           "documentation": "If your motion graphic asset is a .mov file, keep this setting unspecified. If your motion graphic asset is a series of .png files, specify the frame rate of the overlay in frames per second, as a fraction. For example, specify 24 fps as 24/1. Make sure that the number of images in your series matches the frame rate and your intended overlay duration. For example, if you want a 30-second overlay at 30 fps, you should have 900 .png images. This overlay frame rate doesn't need to match the frame rate of the underlying video."
         },
         "Input": {
-          "shape": "__stringMin14Max1285PatternHttpHttpsS3Mov09Png",
+          "shape": "__stringMin14Max1285PatternS3Mov09PngHttpsMov09Png",
           "locationName": "input",
           "documentation": "Specify the .mov file or series of .png files that you want to overlay on your video. For .png files, provide the file name of the first file in the series. Make sure that the names of the .png files end with sequential numbers that specify the order that they are played in. For example, overlay_000.png, overlay_001.png, overlay_002.png, and so on. The sequence must start at zero, and each image file name must have the same number of digits. Pad your initial file names with enough zeros to complete the sequence. For example, if the first image is overlay_0.png, there can be only 10 images in the sequence, with the last image being overlay_9.png. But if the first image is overlay_00.png, there can be 100 images in the sequence."
         },
@@ -6999,6 +7332,45 @@
       },
       "documentation": "Required when you set (Codec) under (AudioDescriptions)>(CodecSettings) to the value MP2."
     },
+    "Mp3RateControlMode": {
+      "type": "string",
+      "documentation": "Specify whether the service encodes this MP3 audio output with a constant bitrate (CBR) or a variable bitrate (VBR).",
+      "enum": [
+        "CBR",
+        "VBR"
+      ]
+    },
+    "Mp3Settings": {
+      "type": "structure",
+      "members": {
+        "Bitrate": {
+          "shape": "__integerMin16000Max320000",
+          "locationName": "bitrate",
+          "documentation": "Specify the average bitrate in bits per second."
+        },
+        "Channels": {
+          "shape": "__integerMin1Max2",
+          "locationName": "channels",
+          "documentation": "Specify the number of channels in this output audio track. Choosing Mono on the console gives you 1 output channel; choosing Stereo gives you 2. In the API, valid values are 1 and 2."
+        },
+        "RateControlMode": {
+          "shape": "Mp3RateControlMode",
+          "locationName": "rateControlMode",
+          "documentation": "Specify whether the service encodes this MP3 audio output with a constant bitrate (CBR) or a variable bitrate (VBR)."
+        },
+        "SampleRate": {
+          "shape": "__integerMin22050Max48000",
+          "locationName": "sampleRate",
+          "documentation": "Sample rate in hz."
+        },
+        "VbrQuality": {
+          "shape": "__integerMin0Max9",
+          "locationName": "vbrQuality",
+          "documentation": "Required when you set Bitrate control mode (rateControlMode) to VBR. Specify the audio quality of this MP3 output from 0 (highest quality) to 9 (lowest quality)."
+        }
+      },
+      "documentation": "Required when you set Codec, under AudioDescriptions>CodecSettings, to the value MP3."
+    },
     "Mp4CslgAtom": {
       "type": "string",
       "documentation": "When enabled, file composition times will start at zero, composition times in the 'ctts' (composition time to sample) box for B-frames will be negative, and a 'cslg' (composition shift least greatest) box will be included per 14496-1 amendment 1. This improves compatibility with Apple players and tools.",
@@ -7031,6 +7403,11 @@
           "locationName": "cslgAtom",
           "documentation": "When enabled, file composition times will start at zero, composition times in the 'ctts' (composition time to sample) box for B-frames will be negative, and a 'cslg' (composition shift least greatest) box will be included per 14496-1 amendment 1. This improves compatibility with Apple players and tools."
         },
+        "CttsVersion": {
+          "shape": "__integerMin0Max1",
+          "locationName": "cttsVersion",
+          "documentation": "Ignore this setting unless compliance to the CTTS box version specification matters in your workflow. Specify a value of 1 to set your CTTS box version to 1 and make your output compliant with the specification. When you specify a value of 1, you must also set CSLG atom (cslgAtom) to the value INCLUDE. Keep the default value 0 to set your CTTS box version to 0. This can provide backward compatibility for some players and packagers."
+        },
         "FreeSpaceBox": {
           "shape": "Mp4FreeSpaceBox",
           "locationName": "freeSpaceBox",
@@ -7049,6 +7426,51 @@
       },
       "documentation": "Settings for MP4 container. You can create audio-only AAC outputs with this container."
     },
+    "MpdCaptionContainerType": {
+      "type": "string",
+      "documentation": "Use this setting only in DASH output groups that include sidecar TTML or IMSC captions.  You specify sidecar captions in a separate output from your audio and video. Choose Raw (RAW) for captions in a single XML file in a raw container. Choose Fragmented MPEG-4 (FRAGMENTED_MP4) for captions in XML format contained within fragmented MP4 files. This set of fragmented MP4 files is separate from your video and audio fragmented MP4 files.",
+      "enum": [
+        "RAW",
+        "FRAGMENTED_MP4"
+      ]
+    },
+    "MpdScte35Esam": {
+      "type": "string",
+      "documentation": "Use this setting only when you specify SCTE-35 markers from ESAM. Choose INSERT to put SCTE-35 markers in this output at the insertion points that you specify in an ESAM XML document. Provide the document in the setting SCC XML (sccXml).",
+      "enum": [
+        "INSERT",
+        "NONE"
+      ]
+    },
+    "MpdScte35Source": {
+      "type": "string",
+      "documentation": "Ignore this setting unless you have SCTE-35 markers in your input video file. Choose Passthrough (PASSTHROUGH) if you want SCTE-35 markers that appear in your input to also appear in this output. Choose None (NONE) if you don't want those SCTE-35 markers in this output.",
+      "enum": [
+        "PASSTHROUGH",
+        "NONE"
+      ]
+    },
+    "MpdSettings": {
+      "type": "structure",
+      "members": {
+        "CaptionContainerType": {
+          "shape": "MpdCaptionContainerType",
+          "locationName": "captionContainerType",
+          "documentation": "Use this setting only in DASH output groups that include sidecar TTML or IMSC captions.  You specify sidecar captions in a separate output from your audio and video. Choose Raw (RAW) for captions in a single XML file in a raw container. Choose Fragmented MPEG-4 (FRAGMENTED_MP4) for captions in XML format contained within fragmented MP4 files. This set of fragmented MP4 files is separate from your video and audio fragmented MP4 files."
+        },
+        "Scte35Esam": {
+          "shape": "MpdScte35Esam",
+          "locationName": "scte35Esam",
+          "documentation": "Use this setting only when you specify SCTE-35 markers from ESAM. Choose INSERT to put SCTE-35 markers in this output at the insertion points that you specify in an ESAM XML document. Provide the document in the setting SCC XML (sccXml)."
+        },
+        "Scte35Source": {
+          "shape": "MpdScte35Source",
+          "locationName": "scte35Source",
+          "documentation": "Ignore this setting unless you have SCTE-35 markers in your input video file. Choose Passthrough (PASSTHROUGH) if you want SCTE-35 markers that appear in your input to also appear in this output. Choose None (NONE) if you don't want those SCTE-35 markers in this output."
+        }
+      },
+      "documentation": "Settings for MP4 segments in DASH"
+    },
     "Mpeg2AdaptiveQuantization": {
       "type": "string",
       "documentation": "Adaptive quantization. Allows intra-frame quantizers to vary to improve visual quality.",
@@ -7366,6 +7788,22 @@
         "ENABLED"
       ]
     },
+    "MsSmoothAdditionalManifest": {
+      "type": "structure",
+      "members": {
+        "ManifestNameModifier": {
+          "shape": "__stringMin1",
+          "locationName": "manifestNameModifier",
+          "documentation": "Specify a name modifier that the service adds to the name of this manifest to make it different from the file names of the other main manifests in the output group. For example, say that the default main manifest for your Microsoft Smooth group is film-name.ismv. If you enter \"-no-premium\" for this setting, then the file name the service generates for this top-level manifest is film-name-no-premium.ismv."
+        },
+        "SelectedOutputs": {
+          "shape": "__listOf__stringMin1",
+          "locationName": "selectedOutputs",
+          "documentation": "Specify the outputs that you want this additional top-level manifest to reference."
+        }
+      },
+      "documentation": "Specify the details for each additional Microsoft Smooth Streaming manifest that you want the service to generate for this output group. Each manifest can reference a different subset of outputs in the group."
+    },
     "MsSmoothAudioDeduplication": {
       "type": "string",
       "documentation": "COMBINE_DUPLICATE_STREAMS combines identical audio encoding settings across a Microsoft Smooth output group into a single audio stream.",
@@ -7388,6 +7826,11 @@
     "MsSmoothGroupSettings": {
       "type": "structure",
       "members": {
+        "AdditionalManifests": {
+          "shape": "__listOfMsSmoothAdditionalManifest",
+          "locationName": "additionalManifests",
+          "documentation": "By default, the service creates one .ism Microsoft Smooth Streaming manifest for each Microsoft Smooth Streaming output group in your job. This default manifest references every output in the output group. To create additional manifests that reference a subset of the outputs in the output group, specify a list of them here."
+        },
         "AudioDeduplication": {
           "shape": "MsSmoothAudioDeduplication",
           "locationName": "audioDeduplication",
@@ -8183,9 +8626,25 @@
         "PASSTHROUGH"
       ]
     },
+    "S3DestinationAccessControl": {
+      "type": "structure",
+      "members": {
+        "CannedAcl": {
+          "shape": "S3ObjectCannedAcl",
+          "locationName": "cannedAcl",
+          "documentation": "Choose an Amazon S3 canned ACL for MediaConvert to apply to this output."
+        }
+      },
+      "documentation": "Optional. Have MediaConvert automatically apply Amazon S3 access control for the outputs in this output group. When you don't use this setting, S3 automatically applies the default access control list PRIVATE."
+    },
     "S3DestinationSettings": {
       "type": "structure",
       "members": {
+        "AccessControl": {
+          "shape": "S3DestinationAccessControl",
+          "locationName": "accessControl",
+          "documentation": "Optional. Have MediaConvert automatically apply Amazon S3 access control for the outputs in this output group. When you don't use this setting, S3 automatically applies the default access control list PRIVATE."
+        },
         "Encryption": {
           "shape": "S3EncryptionSettings",
           "locationName": "encryption",
@@ -8210,6 +8669,16 @@
       },
       "documentation": "Settings for how your job outputs are encrypted as they are uploaded to Amazon S3."
     },
+    "S3ObjectCannedAcl": {
+      "type": "string",
+      "documentation": "Choose an Amazon S3 canned ACL for MediaConvert to apply to this output.",
+      "enum": [
+        "PUBLIC_READ",
+        "AUTHENTICATED_READ",
+        "BUCKET_OWNER_READ",
+        "BUCKET_OWNER_FULL_CONTROL"
+      ]
+    },
     "S3ServerSideEncryptionType": {
       "type": "string",
       "documentation": "Specify how you want your data keys managed. AWS uses data keys to encrypt your content. AWS also encrypts the data keys themselves, using a customer master key (CMK), and then stores the encrypted data keys alongside your encrypted content. Use this setting to specify which AWS service manages the CMK. For simplest set up, choose Amazon S3 (SERVER_SIDE_ENCRYPTION_S3). If you want your master key to be managed by AWS Key Management Service (KMS), choose AWS KMS (SERVER_SIDE_ENCRYPTION_KMS). By default, when you choose AWS KMS, KMS uses the AWS managed customer master key (CMK) associated with Amazon S3 to encrypt your data keys. You can optionally choose to specify a different, customer managed CMK. Do so by specifying the Amazon Resource Name (ARN) of the key for the setting  KMS ARN (kmsKeyArn).",
@@ -8232,6 +8701,7 @@
       "enum": [
         "FRAMERATE_23_97",
         "FRAMERATE_24",
+        "FRAMERATE_25",
         "FRAMERATE_29_97_DROPFRAME",
         "FRAMERATE_29_97_NON_DROPFRAME"
       ]
@@ -8749,6 +9219,7 @@
       "documentation": "Type of video codec",
       "enum": [
         "FRAME_CAPTURE",
+        "AV1",
         "H_264",
         "H_265",
         "MPEG2",
@@ -8758,6 +9229,11 @@
     "VideoCodecSettings": {
       "type": "structure",
       "members": {
+        "Av1Settings": {
+          "shape": "Av1Settings",
+          "locationName": "av1Settings",
+          "documentation": "Required when you set Codec, under VideoDescription>CodecSettings to the value AV1."
+        },
         "Codec": {
           "shape": "VideoCodec",
           "locationName": "codec",
@@ -8789,7 +9265,7 @@
           "documentation": "Required when you set (Codec) under (VideoDescription)>(CodecSettings) to the value PRORES."
         }
       },
-      "documentation": "Video codec settings, (CodecSettings) under (VideoDescription), contains the group of settings related to video encoding. The settings in this group vary depending on the value that you choose for Video codec (Codec). For each codec enum that you choose, define the corresponding settings object. The following lists the codec enum, settings object pairs. * H_264, H264Settings * H_265, H265Settings * MPEG2, Mpeg2Settings * PRORES, ProresSettings * FRAME_CAPTURE, FrameCaptureSettings"
+      "documentation": "Video codec settings, (CodecSettings) under (VideoDescription), contains the group of settings related to video encoding. The settings in this group vary depending on the value that you choose for Video codec (Codec). For each codec enum that you choose, define the corresponding settings object. The following lists the codec enum, settings object pairs. * FRAME_CAPTURE, FrameCaptureSettings * AV1, Av1Settings * H_264, H264Settings * H_265, H265Settings * MPEG2, Mpeg2Settings * PRORES, ProresSettings"
     },
     "VideoDescription": {
       "type": "structure",
@@ -8807,7 +9283,7 @@
         "CodecSettings": {
           "shape": "VideoCodecSettings",
           "locationName": "codecSettings",
-          "documentation": "Video codec settings, (CodecSettings) under (VideoDescription), contains the group of settings related to video encoding. The settings in this group vary depending on the value that you choose for Video codec (Codec). For each codec enum that you choose, define the corresponding settings object. The following lists the codec enum, settings object pairs. * H_264, H264Settings * H_265, H265Settings * MPEG2, Mpeg2Settings * PRORES, ProresSettings * FRAME_CAPTURE, FrameCaptureSettings"
+          "documentation": "Video codec settings, (CodecSettings) under (VideoDescription), contains the group of settings related to video encoding. The settings in this group vary depending on the value that you choose for Video codec (Codec). For each codec enum that you choose, define the corresponding settings object. The following lists the codec enum, settings object pairs. * FRAME_CAPTURE, FrameCaptureSettings * AV1, Av1Settings * H_264, H264Settings * H_265, H265Settings * MPEG2, Mpeg2Settings * PRORES, ProresSettings"
         },
         "ColorMetadata": {
           "shape": "ColorMetadata",
@@ -8830,7 +9306,7 @@
           "documentation": "Applies only if you set AFD Signaling(AfdSignaling) to Fixed (FIXED). Use Fixed (FixedAfd) to specify a four-bit AFD value which the service will write on all  frames of this video output."
         },
         "Height": {
-          "shape": "__integerMin32Max4096",
+          "shape": "__integerMin32Max8192",
           "locationName": "height",
           "documentation": "Use the Height (Height) setting to define the video resolution height for this output. Specify in pixels. If you don't provide a value here, the service will use the input height."
         },
@@ -8865,7 +9341,7 @@
           "documentation": "Find additional transcoding features under Preprocessors (VideoPreprocessors). Enable the features at each output individually. These features are disabled by default."
         },
         "Width": {
-          "shape": "__integerMin32Max4096",
+          "shape": "__integerMin32Max8192",
           "locationName": "width",
           "documentation": "Use Width (Width) to define the video resolution width, in pixels, for this output. If you don't provide a value here, the service will use the input width."
         }
@@ -8901,6 +9377,11 @@
           "locationName": "deinterlacer",
           "documentation": "Use Deinterlacer (Deinterlacer) to produce smoother motion and a clearer picture."
         },
+        "DolbyVision": {
+          "shape": "DolbyVision",
+          "locationName": "dolbyVision",
+          "documentation": "Enable Dolby Vision feature to produce Dolby Vision compatible video output."
+        },
         "ImageInserter": {
           "shape": "ImageInserter",
           "locationName": "imageInserter",
@@ -8922,6 +9403,11 @@
     "VideoSelector": {
       "type": "structure",
       "members": {
+        "AlphaBehavior": {
+          "shape": "AlphaBehavior",
+          "locationName": "alphaBehavior",
+          "documentation": "Ignore this setting unless this input is a QuickTime animation with an alpha channel. Use this setting to create separate Key and Fill outputs. In each output, specify which part of the input MediaConvert uses. Leave this setting at the default value DISCARD to delete the alpha channel and preserve the video. Set it to REMAP_TO_LUMA to delete the video and map the alpha channel to the luma channel of your outputs."
+        },
         "ColorSpace": {
           "shape": "ColorSpace",
           "locationName": "colorSpace",
@@ -9006,6 +9492,9 @@
     "__doubleMin0": {
       "type": "double"
     },
+    "__doubleMin0Max1": {
+      "type": "double"
+    },
     "__doubleMin0Max2147483647": {
       "type": "double"
     },
@@ -9029,6 +9518,11 @@
       "min": 0,
       "max": 0
     },
+    "__integerMin0Max1": {
+      "type": "integer",
+      "min": 0,
+      "max": 1
+    },
     "__integerMin0Max10": {
       "type": "integer",
       "min": 0,
@@ -9139,6 +9633,11 @@
       "min": 0,
       "max": 8
     },
+    "__integerMin0Max9": {
+      "type": "integer",
+      "min": 0,
+      "max": 9
+    },
     "__integerMin0Max96": {
       "type": "integer",
       "min": 0,
@@ -9179,6 +9678,11 @@
       "min": 10,
       "max": 48
     },
+    "__integerMin16000Max320000": {
+      "type": "integer",
+      "min": 16000,
+      "max": 320000
+    },
     "__integerMin16Max24": {
       "type": "integer",
       "min": 16,
@@ -9259,6 +9763,11 @@
       "min": 1,
       "max": 64
     },
+    "__integerMin22050Max48000": {
+      "type": "integer",
+      "min": 22050,
+      "max": 48000
+    },
     "__integerMin24Max60000": {
       "type": "integer",
       "min": 24,
@@ -9289,15 +9798,15 @@
       "min": 32000,
       "max": 48000
     },
-    "__integerMin32Max4096": {
+    "__integerMin32Max8182": {
       "type": "integer",
       "min": 32,
-      "max": 4096
+      "max": 8182
     },
-    "__integerMin32Max8182": {
+    "__integerMin32Max8192": {
       "type": "integer",
       "min": 32,
-      "max": 8182
+      "max": 8192
     },
     "__integerMin384000Max768000": {
       "type": "integer",
@@ -9319,6 +9828,11 @@
       "min": 64000,
       "max": 640000
     },
+    "__integerMin7Max15": {
+      "type": "integer",
+      "min": 7,
+      "max": 15
+    },
     "__integerMin8000Max192000": {
       "type": "integer",
       "min": 8000,
@@ -9397,6 +9911,18 @@
         "shape": "CaptionDescriptionPreset"
       }
     },
+    "__listOfCmafAdditionalManifest": {
+      "type": "list",
+      "member": {
+        "shape": "CmafAdditionalManifest"
+      }
+    },
+    "__listOfDashAdditionalManifest": {
+      "type": "list",
+      "member": {
+        "shape": "DashAdditionalManifest"
+      }
+    },
     "__listOfEndpoint": {
       "type": "list",
       "member": {
@@ -9409,6 +9935,12 @@
         "shape": "HlsAdMarkers"
       }
     },
+    "__listOfHlsAdditionalManifest": {
+      "type": "list",
+      "member": {
+        "shape": "HlsAdditionalManifest"
+      }
+    },
     "__listOfHlsCaptionLanguageMapping": {
       "type": "list",
       "member": {
@@ -9457,6 +9989,12 @@
         "shape": "JobTemplate"
       }
     },
+    "__listOfMsSmoothAdditionalManifest": {
+      "type": "list",
+      "member": {
+        "shape": "MsSmoothAdditionalManifest"
+      }
+    },
     "__listOfOutput": {
       "type": "list",
       "member": {
@@ -9606,26 +10144,26 @@
       "max": 11,
       "pattern": "^((([0-1]\\d)|(2[0-3]))(:[0-5]\\d){2}([:;][0-5]\\d))$"
     },
-    "__stringMin14Max1285PatternHttpHttpsS3Mov09Png": {
+    "__stringMin14Max1285PatternS3Mov09PngHttpsMov09Png": {
       "type": "string",
       "min": 14,
       "max": 1285,
-      "pattern": "^(http|https|s3)://(.*)(\\.mov|[0-9]+\\.png)$"
+      "pattern": "^((s3://(.*)(\\.mov|[0-9]+\\.png))|(https?://(.*)(\\.mov|[0-9]+\\.png)(\\?([^&=]+=[^&]+&)*[^&=]+=[^&]+)?))$"
     },
-    "__stringMin14PatternHttpHttpsS3BmpBMPPngPNG": {
+    "__stringMin14PatternS3BmpBMPPngPNGHttpsBmpBMPPngPNG": {
       "type": "string",
       "min": 14,
-      "pattern": "^(http|https|s3)://(.*?)\\.(bmp|BMP|png|PNG)$"
+      "pattern": "^((s3://(.*?)\\.(bmp|BMP|png|PNG))|(https?://(.*?)\\.(bmp|BMP|png|PNG)(\\?([^&=]+=[^&]+&)*[^&=]+=[^&]+)?))$"
     },
-    "__stringMin14PatternHttpHttpsS3BmpBMPPngPNGTgaTGA": {
+    "__stringMin14PatternS3BmpBMPPngPNGTgaTGAHttpsBmpBMPPngPNGTgaTGA": {
       "type": "string",
       "min": 14,
-      "pattern": "^(http|https|s3)://(.*?)\\.(bmp|BMP|png|PNG|tga|TGA)$"
+      "pattern": "^((s3://(.*?)\\.(bmp|BMP|png|PNG|tga|TGA))|(https?://(.*?)\\.(bmp|BMP|png|PNG|tga|TGA)(\\?([^&=]+=[^&]+&)*[^&=]+=[^&]+)?))$"
     },
-    "__stringMin14PatternHttpHttpsS3SccSCCTtmlTTMLDfxpDFXPStlSTLSrtSRTXmlXMLSmiSMI": {
+    "__stringMin14PatternS3SccSCCTtmlTTMLDfxpDFXPStlSTLSrtSRTXmlXMLSmiSMIHttpsSccSCCTtmlTTMLDfxpDFXPStlSTLSrtSRTXmlXMLSmiSMI": {
       "type": "string",
       "min": 14,
-      "pattern": "^(http|https|s3)://(.*?)\\.(scc|SCC|ttml|TTML|dfxp|DFXP|stl|STL|srt|SRT|xml|XML|smi|SMI)$"
+      "pattern": "^((s3://(.*?)\\.(scc|SCC|ttml|TTML|dfxp|DFXP|stl|STL|srt|SRT|xml|XML|smi|SMI))|(https?://(.*?)\\.(scc|SCC|ttml|TTML|dfxp|DFXP|stl|STL|srt|SRT|xml|XML|smi|SMI)(\\?([^&=]+=[^&]+&)*[^&=]+=[^&]+)?))$"
     },
     "__stringMin16Max24PatternAZaZ0922AZaZ0916": {
       "type": "string",
@@ -9702,6 +10240,10 @@
       "type": "string",
       "pattern": "^[A-Za-z0-9]{32}$"
     },
+    "__stringPatternAZaZ23AZaZ": {
+      "type": "string",
+      "pattern": "^[A-Za-z]{2,3}(-[A-Za-z-]+)?$"
+    },
     "__stringPatternArnAwsUsGovAcm": {
       "type": "string",
       "pattern": "^arn:aws(-us-gov)?:acm:"
@@ -9714,14 +10256,6 @@
       "type": "string",
       "pattern": "^(\\d+(\\/\\d+)*)$"
     },
-    "__stringPatternHttpHttpsS3MM2VVMMPPEEGGMMPP3AAVVIIMMPP4FFLLVVMMPPTTMMPPGGMM4VVTTRRPPFF4VVMM2TTSSTTSS264HH264MMKKVVMMOOVVMMTTSSMM2TTWWMMVVAASSFFVVOOBB3GGPP3GGPPPPMMXXFFDDIIVVXXXXVVIIDDRRAAWWDDVVGGXXFFMM1VV3GG2VVMMFFMM3UU8LLCCHHGGXXFFMMPPEEGG2MMXXFFMMPPEEGG2MMXXFFHHDDWWAAVVYY4MMAAAACCAAIIFFFFMMPP2AACC3EECC3DDTTSSEE": {
-      "type": "string",
-      "pattern": "^(http|https|s3)://([^\\/]+\\/)+([^\\/\\.]+|(([^\\/]*)\\.([mM]2[vV]|[mM][pP][eE][gG]|[mM][pP]3|[aA][vV][iI]|[mM][pP]4|[fF][lL][vV]|[mM][pP][tT]|[mM][pP][gG]|[mM]4[vV]|[tT][rR][pP]|[fF]4[vV]|[mM]2[tT][sS]|[tT][sS]|264|[hH]264|[mM][kK][vV]|[mM][oO][vV]|[mM][tT][sS]|[mM]2[tT]|[wW][mM][vV]|[aA][sS][fF]|[vV][oO][bB]|3[gG][pP]|3[gG][pP][pP]|[mM][xX][fF]|[dD][iI][vV][xX]|[xX][vV][iI][dD]|[rR][aA][wW]|[dD][vV]|[gG][xX][fF]|[mM]1[vV]|3[gG]2|[vV][mM][fF]|[mM]3[uU]8|[lL][cC][hH]|[gG][xX][fF]_[mM][pP][eE][gG]2|[mM][xX][fF]_[mM][pP][eE][gG]2|[mM][xX][fF][hH][dD]|[wW][aA][vV]|[yY]4[mM]|[aA][aA][cC]|[aA][iI][fF][fF]|[mM][pP]2|[aA][cC]3|[eE][cC]3|[dD][tT][sS][eE])))$"
-    },
-    "__stringPatternHttpHttpsS3MM2VVMMPPEEGGMMPP3AAVVIIMMPP4FFLLVVMMPPTTMMPPGGMM4VVTTRRPPFF4VVMM2TTSSTTSS264HH264MMKKVVMMOOVVMMTTSSMM2TTWWMMVVAASSFFVVOOBB3GGPP3GGPPPPMMXXFFDDIIVVXXXXVVIIDDRRAAWWDDVVGGXXFFMM1VV3GG2VVMMFFMM3UU8WWEEBBMMLLCCHHGGXXFFMMPPEEGG2MMXXFFMMPPEEGG2MMXXFFHHDDWWAAVVYY4MMXXMMLL": {
-      "type": "string",
-      "pattern": "^(http|https|s3)://([^\\/]+\\/)+([^\\/\\.]+|(([^\\/]*)\\.([mM]2[vV]|[mM][pP][eE][gG]|[mM][pP]3|[aA][vV][iI]|[mM][pP]4|[fF][lL][vV]|[mM][pP][tT]|[mM][pP][gG]|[mM]4[vV]|[tT][rR][pP]|[fF]4[vV]|[mM]2[tT][sS]|[tT][sS]|264|[hH]264|[mM][kK][vV]|[mM][oO][vV]|[mM][tT][sS]|[mM]2[tT]|[wW][mM][vV]|[aA][sS][fF]|[vV][oO][bB]|3[gG][pP]|3[gG][pP][pP]|[mM][xX][fF]|[dD][iI][vV][xX]|[xX][vV][iI][dD]|[rR][aA][wW]|[dD][vV]|[gG][xX][fF]|[mM]1[vV]|3[gG]2|[vV][mM][fF]|[mM]3[uU]8|[wW][eE][bB][mM]|[lL][cC][hH]|[gG][xX][fF]_[mM][pP][eE][gG]2|[mM][xX][fF]_[mM][pP][eE][gG]2|[mM][xX][fF][hH][dD]|[wW][aA][vV]|[yY]4[mM]|[xX][mM][lL])))$"
-    },
     "__stringPatternHttps": {
       "type": "string",
       "pattern": "^https:\\/\\/"
@@ -9738,6 +10272,14 @@
       "type": "string",
       "pattern": "^s3:\\/\\/.*\\/(ASSETMAP.xml)?$"
     },
+    "__stringPatternS3MM2VVMMPPEEGGMMPP3AAVVIIMMPP4FFLLVVMMPPTTMMPPGGMM4VVTTRRPPFF4VVMM2TTSSTTSS264HH264MMKKVVMMOOVVMMTTSSMM2TTWWMMVVAASSFFVVOOBB3GGPP3GGPPPPMMXXFFDDIIVVXXXXVVIIDDRRAAWWDDVVGGXXFFMM1VV3GG2VVMMFFMM3UU8LLCCHHGGXXFFMMPPEEGG2MMXXFFMMPPEEGG2MMXXFFHHDDWWAAVVYY4MMAAAACCAAIIFFFFMMPP2AACC3EECC3DDTTSSEEHttpsMM2VVMMPPEEGGMMPP3AAVVIIMMPP4FFLLVVMMPPTTMMPPGGMM4VVTTRRPPFF4VVMM2TTSSTTSS264HH264MMKKVVMMOOVVMMTTSSMM2TTWWMMVVAASSFFVVOOBB3GGPP3GGPPPPMMXXFFDDIIVVXXXXVVIIDDRRAAWWDDVVGGXXFFMM1VV3GG2VVMMFFMM3UU8LLCCHHGGXXFFMMPPEEGG2MMXXFFMMPPEEGG2MMXXFFHHDDWWAAVVYY4MMAAAACCAAIIFFFFMMPP2AACC3EECC3DDTTSSEE": {
+      "type": "string",
+      "pattern": "^((s3://([^\\/]+\\/+)+([^\\/\\.]+|(([^\\/]*)\\.([mM]2[vV]|[mM][pP][eE][gG]|[mM][pP]3|[aA][vV][iI]|[mM][pP]4|[fF][lL][vV]|[mM][pP][tT]|[mM][pP][gG]|[mM]4[vV]|[tT][rR][pP]|[fF]4[vV]|[mM]2[tT][sS]|[tT][sS]|264|[hH]264|[mM][kK][vV]|[mM][oO][vV]|[mM][tT][sS]|[mM]2[tT]|[wW][mM][vV]|[aA][sS][fF]|[vV][oO][bB]|3[gG][pP]|3[gG][pP][pP]|[mM][xX][fF]|[dD][iI][vV][xX]|[xX][vV][iI][dD]|[rR][aA][wW]|[dD][vV]|[gG][xX][fF]|[mM]1[vV]|3[gG]2|[vV][mM][fF]|[mM]3[uU]8|[lL][cC][hH]|[gG][xX][fF]_[mM][pP][eE][gG]2|[mM][xX][fF]_[mM][pP][eE][gG]2|[mM][xX][fF][hH][dD]|[wW][aA][vV]|[yY]4[mM]|[aA][aA][cC]|[aA][iI][fF][fF]|[mM][pP]2|[aA][cC]3|[eE][cC]3|[dD][tT][sS][eE]))))|(https?://([^\\/]+\\/+)+([^\\/\\.]+|(([^\\/]*)\\.([mM]2[vV]|[mM][pP][eE][gG]|[mM][pP]3|[aA][vV][iI]|[mM][pP]4|[fF][lL][vV]|[mM][pP][tT]|[mM][pP][gG]|[mM]4[vV]|[tT][rR][pP]|[fF]4[vV]|[mM]2[tT][sS]|[tT][sS]|264|[hH]264|[mM][kK][vV]|[mM][oO][vV]|[mM][tT][sS]|[mM]2[tT]|[wW][mM][vV]|[aA][sS][fF]|[vV][oO][bB]|3[gG][pP]|3[gG][pP][pP]|[mM][xX][fF]|[dD][iI][vV][xX]|[xX][vV][iI][dD]|[rR][aA][wW]|[dD][vV]|[gG][xX][fF]|[mM]1[vV]|3[gG]2|[vV][mM][fF]|[mM]3[uU]8|[lL][cC][hH]|[gG][xX][fF]_[mM][pP][eE][gG]2|[mM][xX][fF]_[mM][pP][eE][gG]2|[mM][xX][fF][hH][dD]|[wW][aA][vV]|[yY]4[mM]|[aA][aA][cC]|[aA][iI][fF][fF]|[mM][pP]2|[aA][cC]3|[eE][cC]3|[dD][tT][sS][eE])))(\\?([^&=]+=[^&]+&)*[^&=]+=[^&]+)?))$"
+    },
+    "__stringPatternS3MM2VVMMPPEEGGMMPP3AAVVIIMMPP4FFLLVVMMPPTTMMPPGGMM4VVTTRRPPFF4VVMM2TTSSTTSS264HH264MMKKVVMMOOVVMMTTSSMM2TTWWMMVVAASSFFVVOOBB3GGPP3GGPPPPMMXXFFDDIIVVXXXXVVIIDDRRAAWWDDVVGGXXFFMM1VV3GG2VVMMFFMM3UU8WWEEBBMMLLCCHHGGXXFFMMPPEEGG2MMXXFFMMPPEEGG2MMXXFFHHDDWWAAVVYY4MMXXMMLLHttpsMM2VVMMPPEEGGMMPP3AAVVIIMMPP4FFLLVVMMPPTTMMPPGGMM4VVTTRRPPFF4VVMM2TTSSTTSS264HH264MMKKVVMMOOVVMMTTSSMM2TTWWMMVVAASSFFVVOOBB3GGPP3GGPPPPMMXXFFDDIIVVXXXXVVIIDDRRAAWWDDVVGGXXFFMM1VV3GG2VVMMFFMM3UU8WWEEBBMMLLCCHHGGXXFFMMPPEEGG2MMXXFFMMPPEEGG2MMXXFFHHDDWWAAVVYY4MMXXMMLL": {
+      "type": "string",
+      "pattern": "^((s3://([^\\/]+\\/+)+([^\\/\\.]+|(([^\\/]*)\\.([mM]2[vV]|[mM][pP][eE][gG]|[mM][pP]3|[aA][vV][iI]|[mM][pP]4|[fF][lL][vV]|[mM][pP][tT]|[mM][pP][gG]|[mM]4[vV]|[tT][rR][pP]|[fF]4[vV]|[mM]2[tT][sS]|[tT][sS]|264|[hH]264|[mM][kK][vV]|[mM][oO][vV]|[mM][tT][sS]|[mM]2[tT]|[wW][mM][vV]|[aA][sS][fF]|[vV][oO][bB]|3[gG][pP]|3[gG][pP][pP]|[mM][xX][fF]|[dD][iI][vV][xX]|[xX][vV][iI][dD]|[rR][aA][wW]|[dD][vV]|[gG][xX][fF]|[mM]1[vV]|3[gG]2|[vV][mM][fF]|[mM]3[uU]8|[wW][eE][bB][mM]|[lL][cC][hH]|[gG][xX][fF]_[mM][pP][eE][gG]2|[mM][xX][fF]_[mM][pP][eE][gG]2|[mM][xX][fF][hH][dD]|[wW][aA][vV]|[yY]4[mM]|[xX][mM][lL]))))|(https?://([^\\/]+\\/+)+([^\\/\\.]+|(([^\\/]*)\\.([mM]2[vV]|[mM][pP][eE][gG]|[mM][pP]3|[aA][vV][iI]|[mM][pP]4|[fF][lL][vV]|[mM][pP][tT]|[mM][pP][gG]|[mM]4[vV]|[tT][rR][pP]|[fF]4[vV]|[mM]2[tT][sS]|[tT][sS]|264|[hH]264|[mM][kK][vV]|[mM][oO][vV]|[mM][tT][sS]|[mM]2[tT]|[wW][mM][vV]|[aA][sS][fF]|[vV][oO][bB]|3[gG][pP]|3[gG][pP][pP]|[mM][xX][fF]|[dD][iI][vV][xX]|[xX][vV][iI][dD]|[rR][aA][wW]|[dD][vV]|[gG][xX][fF]|[mM]1[vV]|3[gG]2|[vV][mM][fF]|[mM]3[uU]8|[wW][eE][bB][mM]|[lL][cC][hH]|[gG][xX][fF]_[mM][pP][eE][gG]2|[mM][xX][fF]_[mM][pP][eE][gG]2|[mM][xX][fF][hH][dD]|[wW][aA][vV]|[yY]4[mM]|[xX][mM][lL])))(\\?([^&=]+=[^&]+&)*[^&=]+=[^&]+)?))$"
+    },
     "__stringPatternSNManifestConfirmConditionNotificationNS": {
       "type": "string",
       "pattern": "^\\s*<(.|\\n)*ManifestConfirmConditionNotification(.|\\n)*>\\s*$"
diff --git a/services/medialive/pom.xml b/services/medialive/pom.xml
index c95219452d1b..cee2cb31eff8 100644
--- a/services/medialive/pom.xml
+++ b/services/medialive/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>services</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>medialive</artifactId>
diff --git a/services/medialive/src/main/resources/codegen-resources/paginators-1.json b/services/medialive/src/main/resources/codegen-resources/paginators-1.json
index 6b6597570cfa..ca39535729b3 100644
--- a/services/medialive/src/main/resources/codegen-resources/paginators-1.json
+++ b/services/medialive/src/main/resources/codegen-resources/paginators-1.json
@@ -35,6 +35,18 @@
       "output_token": "NextToken",
       "limit_key": "MaxResults",
       "result_key": "Reservations"
+    },
+    "ListMultiplexPrograms": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "MaxResults",
+      "result_key": "MultiplexPrograms"
+    },
+    "ListMultiplexes": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "MaxResults",
+      "result_key": "Multiplexes"
     }
   }
 }
diff --git a/services/medialive/src/main/resources/codegen-resources/service-2.json b/services/medialive/src/main/resources/codegen-resources/service-2.json
index ce5c77b6bb2a..e55be0908b40 100644
--- a/services/medialive/src/main/resources/codegen-resources/service-2.json
+++ b/services/medialive/src/main/resources/codegen-resources/service-2.json
@@ -6,10 +6,10 @@
     "serviceFullName": "AWS Elemental MediaLive",
     "serviceId": "MediaLive",
     "protocol": "rest-json",
-    "jsonVersion": "1.1",
     "uid": "medialive-2017-10-14",
     "signatureVersion": "v4",
-    "serviceAbbreviation": "MediaLive"
+    "serviceAbbreviation": "MediaLive",
+    "jsonVersion": "1.1"
   },
   "operations": {
     "BatchUpdateSchedule": {
@@ -196,6 +196,106 @@
       ],
       "documentation": "Creates a Input Security Group"
     },
+    "CreateMultiplex": {
+      "name": "CreateMultiplex",
+      "http": {
+        "method": "POST",
+        "requestUri": "/prod/multiplexes",
+        "responseCode": 201
+      },
+      "input": {
+        "shape": "CreateMultiplexRequest"
+      },
+      "output": {
+        "shape": "CreateMultiplexResponse",
+        "documentation": "Creation of the multiplex is in progress."
+      },
+      "errors": [
+        {
+          "shape": "BadRequestException",
+          "documentation": "MediaLive can't process your request because of a problem in the request. Please check your request form and syntax."
+        },
+        {
+          "shape": "UnprocessableEntityException",
+          "documentation": "The Multiplex failed validation and could not be created."
+        },
+        {
+          "shape": "InternalServerErrorException",
+          "documentation": "Unexpected internal service error."
+        },
+        {
+          "shape": "ForbiddenException",
+          "documentation": "You don't have permission to create the multiplex."
+        },
+        {
+          "shape": "BadGatewayException",
+          "documentation": "Bad Gateway Error."
+        },
+        {
+          "shape": "GatewayTimeoutException",
+          "documentation": "Gateway Timeout Error."
+        },
+        {
+          "shape": "TooManyRequestsException",
+          "documentation": "Request limit exceeded on create multiplex calls to multiplex service."
+        },
+        {
+          "shape": "ConflictException",
+          "documentation": "The multiplex is unable to create due to an issue with multiplex resources."
+        }
+      ],
+      "documentation": "Create a new multiplex."
+    },
+    "CreateMultiplexProgram": {
+      "name": "CreateMultiplexProgram",
+      "http": {
+        "method": "POST",
+        "requestUri": "/prod/multiplexes/{multiplexId}/programs",
+        "responseCode": 201
+      },
+      "input": {
+        "shape": "CreateMultiplexProgramRequest"
+      },
+      "output": {
+        "shape": "CreateMultiplexProgramResponse",
+        "documentation": "Creation of the program is in progress."
+      },
+      "errors": [
+        {
+          "shape": "BadRequestException",
+          "documentation": "MediaLive can't process your request because of a problem in the request. Please check your request form and syntax."
+        },
+        {
+          "shape": "UnprocessableEntityException",
+          "documentation": "The Multiplex program failed validation and could not be created."
+        },
+        {
+          "shape": "InternalServerErrorException",
+          "documentation": "Unexpected internal service error."
+        },
+        {
+          "shape": "ForbiddenException",
+          "documentation": "You do not have permission to create a program."
+        },
+        {
+          "shape": "BadGatewayException",
+          "documentation": "Bad Gateway Error."
+        },
+        {
+          "shape": "GatewayTimeoutException",
+          "documentation": "Gateway Timeout Error."
+        },
+        {
+          "shape": "TooManyRequestsException",
+          "documentation": "Request limit exceeded on create multiplex program calls to multiplex service."
+        },
+        {
+          "shape": "ConflictException",
+          "documentation": "The multiplex program is unable to create due to an issue with multiplex resources."
+        }
+      ],
+      "documentation": "Create a new program in the multiplex."
+    },
     "CreateTags": {
       "name": "CreateTags",
       "http": {
@@ -372,6 +472,106 @@
       ],
       "documentation": "Deletes an Input Security Group"
     },
+    "DeleteMultiplex": {
+      "name": "DeleteMultiplex",
+      "http": {
+        "method": "DELETE",
+        "requestUri": "/prod/multiplexes/{multiplexId}",
+        "responseCode": 202
+      },
+      "input": {
+        "shape": "DeleteMultiplexRequest"
+      },
+      "output": {
+        "shape": "DeleteMultiplexResponse",
+        "documentation": "Deletion of the multiplex is in progress."
+      },
+      "errors": [
+        {
+          "shape": "BadRequestException",
+          "documentation": "This request was invalid."
+        },
+        {
+          "shape": "InternalServerErrorException",
+          "documentation": "Unexpected internal service error."
+        },
+        {
+          "shape": "ForbiddenException",
+          "documentation": "You don't have permission to delete the multiplex."
+        },
+        {
+          "shape": "BadGatewayException",
+          "documentation": "Bad Gateway Error."
+        },
+        {
+          "shape": "NotFoundException",
+          "documentation": "The multiplex that you are trying to delete doesn\u2019t exist. Check the ID and try again."
+        },
+        {
+          "shape": "GatewayTimeoutException",
+          "documentation": "Gateway Timeout Error."
+        },
+        {
+          "shape": "TooManyRequestsException",
+          "documentation": "Request limit exceeded on delete multiplex calls to multiplex service."
+        },
+        {
+          "shape": "ConflictException",
+          "documentation": "The multiplex is unable to delete due to an issue with multiplex resources."
+        }
+      ],
+      "documentation": "Delete a multiplex. The multiplex must be idle."
+    },
+    "DeleteMultiplexProgram": {
+      "name": "DeleteMultiplexProgram",
+      "http": {
+        "method": "DELETE",
+        "requestUri": "/prod/multiplexes/{multiplexId}/programs/{programName}",
+        "responseCode": 200
+      },
+      "input": {
+        "shape": "DeleteMultiplexProgramRequest"
+      },
+      "output": {
+        "shape": "DeleteMultiplexProgramResponse",
+        "documentation": "Deletion of the program is in progress."
+      },
+      "errors": [
+        {
+          "shape": "BadRequestException",
+          "documentation": "This request was invalid."
+        },
+        {
+          "shape": "InternalServerErrorException",
+          "documentation": "Unexpected internal service error."
+        },
+        {
+          "shape": "ForbiddenException",
+          "documentation": "You don't have permission to delete the multiplex program."
+        },
+        {
+          "shape": "BadGatewayException",
+          "documentation": "Bad Gateway Error."
+        },
+        {
+          "shape": "NotFoundException",
+          "documentation": "The program that you are trying to delete doesn\u2019t exist. Check the ID and try again."
+        },
+        {
+          "shape": "GatewayTimeoutException",
+          "documentation": "Gateway Timeout Error."
+        },
+        {
+          "shape": "TooManyRequestsException",
+          "documentation": "Request limit exceeded on delete multiplex program calls to multiplex service."
+        },
+        {
+          "shape": "ConflictException",
+          "documentation": "The multiplex program is unable to delete due to an issue with multiplex resources."
+        }
+      ],
+      "documentation": "Delete a program from a multiplex."
+    },
     "DeleteReservation": {
       "name": "DeleteReservation",
       "http": {
@@ -636,6 +836,98 @@
       ],
       "documentation": "Produces a summary of an Input Security Group"
     },
+    "DescribeMultiplex": {
+      "name": "DescribeMultiplex",
+      "http": {
+        "method": "GET",
+        "requestUri": "/prod/multiplexes/{multiplexId}",
+        "responseCode": 200
+      },
+      "input": {
+        "shape": "DescribeMultiplexRequest"
+      },
+      "output": {
+        "shape": "DescribeMultiplexResponse",
+        "documentation": "Details for one multiplex."
+      },
+      "errors": [
+        {
+          "shape": "BadRequestException",
+          "documentation": "This request was invalid."
+        },
+        {
+          "shape": "InternalServerErrorException",
+          "documentation": "Unexpected internal service error."
+        },
+        {
+          "shape": "ForbiddenException",
+          "documentation": "You don't have permission to describe the multiplex."
+        },
+        {
+          "shape": "BadGatewayException",
+          "documentation": "Bad Gateway Error."
+        },
+        {
+          "shape": "NotFoundException",
+          "documentation": "The multiplex that you are trying to describe doesn\u2019t exist. Check the ID and try again."
+        },
+        {
+          "shape": "GatewayTimeoutException",
+          "documentation": "Gateway Timeout Error."
+        },
+        {
+          "shape": "TooManyRequestsException",
+          "documentation": "Request limit exceeded on describe multiplex calls to multiplex service."
+        }
+      ],
+      "documentation": "Gets details about a multiplex."
+    },
+    "DescribeMultiplexProgram": {
+      "name": "DescribeMultiplexProgram",
+      "http": {
+        "method": "GET",
+        "requestUri": "/prod/multiplexes/{multiplexId}/programs/{programName}",
+        "responseCode": 200
+      },
+      "input": {
+        "shape": "DescribeMultiplexProgramRequest"
+      },
+      "output": {
+        "shape": "DescribeMultiplexProgramResponse",
+        "documentation": "The details of one program."
+      },
+      "errors": [
+        {
+          "shape": "BadRequestException",
+          "documentation": "This request was invalid."
+        },
+        {
+          "shape": "InternalServerErrorException",
+          "documentation": "Unexpected internal service error."
+        },
+        {
+          "shape": "ForbiddenException",
+          "documentation": "You don't have permission to describe the multiplex program."
+        },
+        {
+          "shape": "BadGatewayException",
+          "documentation": "Bad Gateway Error."
+        },
+        {
+          "shape": "NotFoundException",
+          "documentation": "MediaLive can't describe the program. The multiplex or the program that you specified doesn\u2019t exist. Check the IDs and try again."
+        },
+        {
+          "shape": "GatewayTimeoutException",
+          "documentation": "Gateway Timeout Error."
+        },
+        {
+          "shape": "TooManyRequestsException",
+          "documentation": "Request limit exceeded on describe multiplex program calls to multiplex service."
+        }
+      ],
+      "documentation": "Get the details for a program in a multiplex."
+    },
     "DescribeOffering": {
       "name": "DescribeOffering",
       "http": {
@@ -900,103 +1192,191 @@
       ],
       "documentation": "Produces list of inputs that have been created"
     },
-    "ListOfferings": {
-      "name": "ListOfferings",
+    "ListMultiplexPrograms": {
+      "name": "ListMultiplexPrograms",
       "http": {
         "method": "GET",
-        "requestUri": "/prod/offerings",
+        "requestUri": "/prod/multiplexes/{multiplexId}/programs",
         "responseCode": 200
       },
       "input": {
-        "shape": "ListOfferingsRequest"
+        "shape": "ListMultiplexProgramsRequest"
       },
       "output": {
-        "shape": "ListOfferingsResponse",
-        "documentation": "List of offerings"
+        "shape": "ListMultiplexProgramsResponse",
+        "documentation": "An array of the programs for one multiplex."
       },
       "errors": [
         {
           "shape": "BadRequestException",
-          "documentation": "This request was invalid"
+          "documentation": "MediaLive can't process your request because of a problem in the request. Please check your request form and syntax."
         },
         {
           "shape": "InternalServerErrorException",
-          "documentation": "Internal service error"
+          "documentation": "Unexpected internal service error."
         },
         {
           "shape": "ForbiddenException",
-          "documentation": "You do not have permission to list offerings"
+          "documentation": "You do not have permission to list multiplex programs."
         },
         {
           "shape": "BadGatewayException",
-          "documentation": "Bad gateway error"
+          "documentation": "Bad Gateway Error."
+        },
+        {
+          "shape": "NotFoundException",
+          "documentation": "MediaLive can't provide the list of programs. The multiplex that you specified doesn\u2019t exist. Check the ID and try again."
         },
         {
           "shape": "GatewayTimeoutException",
-          "documentation": "Gateway timeout error"
+          "documentation": "Gateway Timeout Error."
         },
         {
           "shape": "TooManyRequestsException",
-          "documentation": "Request limit exceeded on list offerings request"
+          "documentation": "Request limit exceeded on list multiplex calls to multiplex service."
         }
       ],
-      "documentation": "List offerings available for purchase."
+      "documentation": "List the programs that currently exist for a specific multiplex."
     },
-    "ListReservations": {
-      "name": "ListReservations",
+    "ListMultiplexes": {
+      "name": "ListMultiplexes",
       "http": {
         "method": "GET",
-        "requestUri": "/prod/reservations",
+        "requestUri": "/prod/multiplexes",
         "responseCode": 200
       },
       "input": {
-        "shape": "ListReservationsRequest"
+        "shape": "ListMultiplexesRequest"
       },
       "output": {
-        "shape": "ListReservationsResponse",
-        "documentation": "List of reservations"
+        "shape": "ListMultiplexesResponse",
+        "documentation": "An array of multiplexes."
       },
       "errors": [
         {
           "shape": "BadRequestException",
-          "documentation": "This request was invalid"
+          "documentation": "MediaLive can't process your request because of a problem in the request. Please check your request form and syntax."
         },
         {
           "shape": "InternalServerErrorException",
-          "documentation": "Internal service error"
+          "documentation": "Unexpected internal service error."
         },
         {
           "shape": "ForbiddenException",
-          "documentation": "You do not have permission to list reservations"
+          "documentation": "You don't have permission to list multiplexes."
         },
         {
           "shape": "BadGatewayException",
-          "documentation": "Bad gateway error"
+          "documentation": "Bad Gateway Error."
         },
         {
           "shape": "GatewayTimeoutException",
-          "documentation": "Gateway timeout error"
+          "documentation": "Gateway Timeout Error."
         },
         {
           "shape": "TooManyRequestsException",
-          "documentation": "Request limit exceeded on list reservations request"
+          "documentation": "Request limit exceeded on list multiplex calls to multiplex service."
         }
       ],
-      "documentation": "List purchased reservations."
+      "documentation": "Retrieve a list of the existing multiplexes."
     },
-    "ListTagsForResource": {
-      "name": "ListTagsForResource",
+    "ListOfferings": {
+      "name": "ListOfferings",
       "http": {
         "method": "GET",
-        "requestUri": "/prod/tags/{resource-arn}",
+        "requestUri": "/prod/offerings",
         "responseCode": 200
       },
       "input": {
-        "shape": "ListTagsForResourceRequest"
+        "shape": "ListOfferingsRequest"
       },
       "output": {
-        "shape": "ListTagsForResourceResponse",
-        "documentation": "An array of tags"
+        "shape": "ListOfferingsResponse",
+        "documentation": "List of offerings"
+      },
+      "errors": [
+        {
+          "shape": "BadRequestException",
+          "documentation": "This request was invalid"
+        },
+        {
+          "shape": "InternalServerErrorException",
+          "documentation": "Internal service error"
+        },
+        {
+          "shape": "ForbiddenException",
+          "documentation": "You do not have permission to list offerings"
+        },
+        {
+          "shape": "BadGatewayException",
+          "documentation": "Bad gateway error"
+        },
+        {
+          "shape": "GatewayTimeoutException",
+          "documentation": "Gateway timeout error"
+        },
+        {
+          "shape": "TooManyRequestsException",
+          "documentation": "Request limit exceeded on list offerings request"
+        }
+      ],
+      "documentation": "List offerings available for purchase."
+    },
+    "ListReservations": {
+      "name": "ListReservations",
+      "http": {
+        "method": "GET",
+        "requestUri": "/prod/reservations",
+        "responseCode": 200
+      },
+      "input": {
+        "shape": "ListReservationsRequest"
+      },
+      "output": {
+        "shape": "ListReservationsResponse",
+        "documentation": "List of reservations"
+      },
+      "errors": [
+        {
+          "shape": "BadRequestException",
+          "documentation": "This request was invalid"
+        },
+        {
+          "shape": "InternalServerErrorException",
+          "documentation": "Internal service error"
+        },
+        {
+          "shape": "ForbiddenException",
+          "documentation": "You do not have permission to list reservations"
+        },
+        {
+          "shape": "BadGatewayException",
+          "documentation": "Bad gateway error"
+        },
+        {
+          "shape": "GatewayTimeoutException",
+          "documentation": "Gateway timeout error"
+        },
+        {
+          "shape": "TooManyRequestsException",
+          "documentation": "Request limit exceeded on list reservations request"
+        }
+      ],
+      "documentation": "List purchased reservations."
+    },
+    "ListTagsForResource": {
+      "name": "ListTagsForResource",
+      "http": {
+        "method": "GET",
+        "requestUri": "/prod/tags/{resource-arn}",
+        "responseCode": 200
+      },
+      "input": {
+        "shape": "ListTagsForResourceRequest"
+      },
+      "output": {
+        "shape": "ListTagsForResourceResponse",
+        "documentation": "An array of tags"
       },
       "errors": [
         {
@@ -1118,6 +1498,56 @@
       ],
       "documentation": "Starts an existing channel"
     },
+    "StartMultiplex": {
+      "name": "StartMultiplex",
+      "http": {
+        "method": "POST",
+        "requestUri": "/prod/multiplexes/{multiplexId}/start",
+        "responseCode": 202
+      },
+      "input": {
+        "shape": "StartMultiplexRequest"
+      },
+      "output": {
+        "shape": "StartMultiplexResponse",
+        "documentation": "The action to start the multiplex is in progress."
+      },
+      "errors": [
+        {
+          "shape": "BadRequestException",
+          "documentation": "MediaLive can't process your request because of a problem in the request. Please check your request form and syntax."
+        },
+        {
+          "shape": "InternalServerErrorException",
+          "documentation": "Unexpected internal service error."
+        },
+        {
+          "shape": "ForbiddenException",
+          "documentation": "You don't have permission to start the multiplex."
+        },
+        {
+          "shape": "BadGatewayException",
+          "documentation": "Bad Gateway Error."
+        },
+        {
+          "shape": "NotFoundException",
+          "documentation": "The multiplex that you are trying to start doesn\u2019t exist. Check the ID and try again."
+        },
+        {
+          "shape": "GatewayTimeoutException",
+          "documentation": "Gateway Timeout Error."
+        },
+        {
+          "shape": "TooManyRequestsException",
+          "documentation": "Request limit exceeded on start multiplex calls to multiplex service."
+        },
+        {
+          "shape": "ConflictException",
+          "documentation": "The multiplex is unable to start due to an issue with multiplex resources."
+        }
+      ],
+      "documentation": "Start (run) the multiplex. Starting the multiplex does not start the channels. You must explicitly start each channel."
+    },
     "StopChannel": {
       "name": "StopChannel",
       "http": {
@@ -1168,6 +1598,56 @@
       ],
       "documentation": "Stops a running channel"
     },
+    "StopMultiplex": {
+      "name": "StopMultiplex",
+      "http": {
+        "method": "POST",
+        "requestUri": "/prod/multiplexes/{multiplexId}/stop",
+        "responseCode": 202
+      },
+      "input": {
+        "shape": "StopMultiplexRequest"
+      },
+      "output": {
+        "shape": "StopMultiplexResponse",
+        "documentation": "The action to stop the multiplex is in progress."
+      },
+      "errors": [
+        {
+          "shape": "BadRequestException",
+          "documentation": "MediaLive can't process your request because of a problem in the request. Please check your request form and syntax."
+        },
+        {
+          "shape": "InternalServerErrorException",
+          "documentation": "Unexpected internal service error."
+        },
+        {
+          "shape": "ForbiddenException",
+          "documentation": "You don't have permission to stop the multiplex."
+        },
+        {
+          "shape": "BadGatewayException",
+          "documentation": "Bad Gateway Error."
+        },
+        {
+          "shape": "NotFoundException",
+          "documentation": "The multiplex that you are trying to stop doesn\u2019t exist. Check the ID and try again."
+        },
+        {
+          "shape": "GatewayTimeoutException",
+          "documentation": "Gateway Timeout Error."
+        },
+        {
+          "shape": "TooManyRequestsException",
+          "documentation": "Request limit exceeded on stop multiplex calls to multiplex service."
+        },
+        {
+          "shape": "ConflictException",
+          "documentation": "The multiplex is unable to stop due to an issue with multiplex resources."
+        }
+      ],
+      "documentation": "Stops a running multiplex. If the multiplex isn't running, this action has no effect."
+    },
     "UpdateChannel": {
       "name": "UpdateChannel",
       "http": {
@@ -1360,6 +1840,106 @@
       ],
       "documentation": "Update an Input Security Group's Whilelists."
     },
+    "UpdateMultiplex": {
+      "name": "UpdateMultiplex",
+      "http": {
+        "method": "PUT",
+        "requestUri": "/prod/multiplexes/{multiplexId}",
+        "responseCode": 200
+      },
+      "input": {
+        "shape": "UpdateMultiplexRequest"
+      },
+      "output": {
+        "shape": "UpdateMultiplexResponse",
+        "documentation": "The update to the multiplex has succeeded."
+      },
+      "errors": [
+        {
+          "shape": "BadRequestException",
+          "documentation": "MediaLive can't process your request because of a problem in the request. Please check your request form and syntax."
+        },
+        {
+          "shape": "UnprocessableEntityException",
+          "documentation": "The multiplex configuration failed validation and could not be updated."
+        },
+        {
+          "shape": "InternalServerErrorException",
+          "documentation": "Unexpected internal service error."
+        },
+        {
+          "shape": "ForbiddenException",
+          "documentation": "You don't have permission to update the multiplex."
+        },
+        {
+          "shape": "BadGatewayException",
+          "documentation": "Bad Gateway Error."
+        },
+        {
+          "shape": "NotFoundException",
+          "documentation": "The multiplex that you are trying to update doesn\u2019t exist. Check the ID and try again."
+        },
+        {
+          "shape": "GatewayTimeoutException",
+          "documentation": "Gateway Timeout Error."
+        },
+        {
+          "shape": "ConflictException",
+          "documentation": "The multiplex is unable to update due to an issue with multiplex resources."
+        }
+      ],
+      "documentation": "Updates a multiplex."
+    },
+    "UpdateMultiplexProgram": {
+      "name": "UpdateMultiplexProgram",
+      "http": {
+        "method": "PUT",
+        "requestUri": "/prod/multiplexes/{multiplexId}/programs/{programName}",
+        "responseCode": 200
+      },
+      "input": {
+        "shape": "UpdateMultiplexProgramRequest"
+      },
+      "output": {
+        "shape": "UpdateMultiplexProgramResponse",
+        "documentation": "The update to the program has succeeded."
+      },
+      "errors": [
+        {
+          "shape": "BadRequestException",
+          "documentation": "MediaLive can't process your request because of a problem in the request. Please check your request form and syntax."
+        },
+        {
+          "shape": "UnprocessableEntityException",
+          "documentation": "The multiplex program failed validation and could not be updated."
+        },
+        {
+          "shape": "InternalServerErrorException",
+          "documentation": "Unexpected internal service error."
+        },
+        {
+          "shape": "ForbiddenException",
+          "documentation": "You don't have permission to update the multiplex program."
+        },
+        {
+          "shape": "BadGatewayException",
+          "documentation": "Bad Gateway Error."
+        },
+        {
+          "shape": "NotFoundException",
+          "documentation": "MediaLive can't update the program. The multiplex or the program that you specified doesn\u2019t exist. Check the IDs and try again."
+        },
+        {
+          "shape": "GatewayTimeoutException",
+          "documentation": "Gateway Timeout Error."
+        },
+        {
+          "shape": "ConflictException",
+          "documentation": "The multiplex program is unable to update due to an issue with multiplex resources."
+        }
+      ],
+      "documentation": "Update a program in a multiplex."
+    },
     "UpdateReservation": {
       "name": "UpdateReservation",
       "http": {
@@ -1883,6 +2463,14 @@
       },
       "documentation": "Audio Normalization Settings"
     },
+    "AudioOnlyHlsSegmentType": {
+      "type": "string",
+      "documentation": "Audio Only Hls Segment Type",
+      "enum": [
+        "AAC",
+        "FMP4"
+      ]
+    },
     "AudioOnlyHlsSettings": {
       "type": "structure",
       "members": {
@@ -1900,6 +2488,11 @@
           "shape": "AudioOnlyHlsTrackType",
           "locationName": "audioTrackType",
           "documentation": "Four types of audio-only tracks are supported:\n\nAudio-Only Variant Stream\nThe client can play back this audio-only stream instead of video in low-bandwidth scenarios. Represented as an EXT-X-STREAM-INF in the HLS manifest.\n\nAlternate Audio, Auto Select, Default\nAlternate rendition that the client should try to play back by default. Represented as an EXT-X-MEDIA in the HLS manifest with DEFAULT=YES, AUTOSELECT=YES\n\nAlternate Audio, Auto Select, Not Default\nAlternate rendition that the client may try to play back by default. Represented as an EXT-X-MEDIA in the HLS manifest with DEFAULT=NO, AUTOSELECT=YES\n\nAlternate Audio, not Auto Select\nAlternate rendition that the client will not try to play back by default. Represented as an EXT-X-MEDIA in the HLS manifest with DEFAULT=NO, AUTOSELECT=NO"
+        },
+        "SegmentType": {
+          "shape": "AudioOnlyHlsSegmentType",
+          "locationName": "segmentType",
+          "documentation": "Specifies the segment type."
         }
       },
       "documentation": "Audio Only Hls Settings"
@@ -2395,7 +2988,7 @@
           "documentation": "Name of the caption description.  Used to associate a caption description with an output.  Names must be unique within an event."
         }
       },
-      "documentation": "Output groups for this Live Event. Output groups contain information about where streams should be distributed.",
+      "documentation": "Caption Description",
       "required": [
         "CaptionSelectorName",
         "Name"
@@ -3061,30 +3654,211 @@
       },
       "documentation": "Placeholder documentation for CreateInputSecurityGroupResultModel"
     },
-    "CreateTagsRequest": {
+    "CreateMultiplex": {
       "type": "structure",
       "members": {
-        "ResourceArn": {
+        "AvailabilityZones": {
+          "shape": "__listOf__string",
+          "locationName": "availabilityZones",
+          "documentation": "A list of availability zones for the multiplex. You must specify exactly two."
+        },
+        "MultiplexSettings": {
+          "shape": "MultiplexSettings",
+          "locationName": "multiplexSettings",
+          "documentation": "Configuration for a multiplex event."
+        },
+        "Name": {
           "shape": "__string",
-          "location": "uri",
-          "locationName": "resource-arn"
+          "locationName": "name",
+          "documentation": "Name of multiplex."
+        },
+        "RequestId": {
+          "shape": "__string",
+          "locationName": "requestId",
+          "documentation": "Unique request ID. This prevents retries from creating multiple\nresources.\n",
+          "idempotencyToken": true
         },
         "Tags": {
           "shape": "Tags",
-          "locationName": "tags"
+          "locationName": "tags",
+          "documentation": "A collection of key-value pairs."
         }
       },
       "required": [
-        "ResourceArn"
+        "RequestId",
+        "MultiplexSettings",
+        "AvailabilityZones",
+        "Name"
       ],
-      "documentation": "Placeholder documentation for CreateTagsRequest"
+      "documentation": "Placeholder documentation for CreateMultiplex"
     },
-    "DeleteChannelRequest": {
+    "CreateMultiplexProgram": {
       "type": "structure",
       "members": {
-        "ChannelId": {
+        "MultiplexProgramSettings": {
+          "shape": "MultiplexProgramSettings",
+          "locationName": "multiplexProgramSettings",
+          "documentation": "The settings for this multiplex program."
+        },
+        "ProgramName": {
           "shape": "__string",
-          "location": "uri",
+          "locationName": "programName",
+          "documentation": "Name of multiplex program."
+        },
+        "RequestId": {
+          "shape": "__string",
+          "locationName": "requestId",
+          "documentation": "Unique request ID. This prevents retries from creating multiple\nresources.\n",
+          "idempotencyToken": true
+        }
+      },
+      "required": [
+        "RequestId",
+        "MultiplexProgramSettings",
+        "ProgramName"
+      ],
+      "documentation": "Placeholder documentation for CreateMultiplexProgram"
+    },
+    "CreateMultiplexProgramRequest": {
+      "type": "structure",
+      "members": {
+        "MultiplexId": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "multiplexId",
+          "documentation": "ID of the multiplex where the program is to be created."
+        },
+        "MultiplexProgramSettings": {
+          "shape": "MultiplexProgramSettings",
+          "locationName": "multiplexProgramSettings",
+          "documentation": "The settings for this multiplex program."
+        },
+        "ProgramName": {
+          "shape": "__string",
+          "locationName": "programName",
+          "documentation": "Name of multiplex program."
+        },
+        "RequestId": {
+          "shape": "__string",
+          "locationName": "requestId",
+          "documentation": "Unique request ID. This prevents retries from creating multiple\nresources.\n",
+          "idempotencyToken": true
+        }
+      },
+      "documentation": "A request to create a program in a multiplex.",
+      "required": [
+        "MultiplexId",
+        "RequestId",
+        "MultiplexProgramSettings",
+        "ProgramName"
+      ]
+    },
+    "CreateMultiplexProgramResponse": {
+      "type": "structure",
+      "members": {
+        "MultiplexProgram": {
+          "shape": "MultiplexProgram",
+          "locationName": "multiplexProgram",
+          "documentation": "The newly created multiplex program."
+        }
+      },
+      "documentation": "Placeholder documentation for CreateMultiplexProgramResponse"
+    },
+    "CreateMultiplexProgramResultModel": {
+      "type": "structure",
+      "members": {
+        "MultiplexProgram": {
+          "shape": "MultiplexProgram",
+          "locationName": "multiplexProgram",
+          "documentation": "The newly created multiplex program."
+        }
+      },
+      "documentation": "Placeholder documentation for CreateMultiplexProgramResultModel"
+    },
+    "CreateMultiplexRequest": {
+      "type": "structure",
+      "members": {
+        "AvailabilityZones": {
+          "shape": "__listOf__string",
+          "locationName": "availabilityZones",
+          "documentation": "A list of availability zones for the multiplex. You must specify exactly two."
+        },
+        "MultiplexSettings": {
+          "shape": "MultiplexSettings",
+          "locationName": "multiplexSettings",
+          "documentation": "Configuration for a multiplex event."
+        },
+        "Name": {
+          "shape": "__string",
+          "locationName": "name",
+          "documentation": "Name of multiplex."
+        },
+        "RequestId": {
+          "shape": "__string",
+          "locationName": "requestId",
+          "documentation": "Unique request ID. This prevents retries from creating multiple\nresources.\n",
+          "idempotencyToken": true
+        },
+        "Tags": {
+          "shape": "Tags",
+          "locationName": "tags",
+          "documentation": "A collection of key-value pairs."
+        }
+      },
+      "documentation": "A request to create a multiplex.",
+      "required": [
+        "RequestId",
+        "MultiplexSettings",
+        "AvailabilityZones",
+        "Name"
+      ]
+    },
+    "CreateMultiplexResponse": {
+      "type": "structure",
+      "members": {
+        "Multiplex": {
+          "shape": "Multiplex",
+          "locationName": "multiplex",
+          "documentation": "The newly created multiplex."
+        }
+      },
+      "documentation": "Placeholder documentation for CreateMultiplexResponse"
+    },
+    "CreateMultiplexResultModel": {
+      "type": "structure",
+      "members": {
+        "Multiplex": {
+          "shape": "Multiplex",
+          "locationName": "multiplex",
+          "documentation": "The newly created multiplex."
+        }
+      },
+      "documentation": "Placeholder documentation for CreateMultiplexResultModel"
+    },
+    "CreateTagsRequest": {
+      "type": "structure",
+      "members": {
+        "ResourceArn": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "resource-arn"
+        },
+        "Tags": {
+          "shape": "Tags",
+          "locationName": "tags"
+        }
+      },
+      "required": [
+        "ResourceArn"
+      ],
+      "documentation": "Placeholder documentation for CreateTagsRequest"
+    },
+    "DeleteChannelRequest": {
+      "type": "structure",
+      "members": {
+        "ChannelId": {
+          "shape": "__string",
+          "location": "uri",
           "locationName": "channelId",
           "documentation": "Unique ID of the channel."
         }
@@ -3214,6 +3988,125 @@
       },
       "documentation": "Placeholder documentation for DeleteInputSecurityGroupResponse"
     },
+    "DeleteMultiplexProgramRequest": {
+      "type": "structure",
+      "members": {
+        "MultiplexId": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "multiplexId",
+          "documentation": "The ID of the multiplex that the program belongs to."
+        },
+        "ProgramName": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "programName",
+          "documentation": "The multiplex program name."
+        }
+      },
+      "required": [
+        "MultiplexId",
+        "ProgramName"
+      ],
+      "documentation": "Placeholder documentation for DeleteMultiplexProgramRequest"
+    },
+    "DeleteMultiplexProgramResponse": {
+      "type": "structure",
+      "members": {
+        "ChannelId": {
+          "shape": "__string",
+          "locationName": "channelId",
+          "documentation": "The MediaLive channel associated with the program."
+        },
+        "MultiplexProgramSettings": {
+          "shape": "MultiplexProgramSettings",
+          "locationName": "multiplexProgramSettings",
+          "documentation": "The settings for this multiplex program."
+        },
+        "PacketIdentifiersMap": {
+          "shape": "MultiplexProgramPacketIdentifiersMap",
+          "locationName": "packetIdentifiersMap",
+          "documentation": "The packet identifier map for this multiplex program."
+        },
+        "ProgramName": {
+          "shape": "__string",
+          "locationName": "programName",
+          "documentation": "The name of the multiplex program."
+        }
+      },
+      "documentation": "Placeholder documentation for DeleteMultiplexProgramResponse"
+    },
+    "DeleteMultiplexRequest": {
+      "type": "structure",
+      "members": {
+        "MultiplexId": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "multiplexId",
+          "documentation": "The ID of the multiplex."
+        }
+      },
+      "required": [
+        "MultiplexId"
+      ],
+      "documentation": "Placeholder documentation for DeleteMultiplexRequest"
+    },
+    "DeleteMultiplexResponse": {
+      "type": "structure",
+      "members": {
+        "Arn": {
+          "shape": "__string",
+          "locationName": "arn",
+          "documentation": "The unique arn of the multiplex."
+        },
+        "AvailabilityZones": {
+          "shape": "__listOf__string",
+          "locationName": "availabilityZones",
+          "documentation": "A list of availability zones for the multiplex."
+        },
+        "Destinations": {
+          "shape": "__listOfMultiplexOutputDestination",
+          "locationName": "destinations",
+          "documentation": "A list of the multiplex output destinations."
+        },
+        "Id": {
+          "shape": "__string",
+          "locationName": "id",
+          "documentation": "The unique id of the multiplex."
+        },
+        "MultiplexSettings": {
+          "shape": "MultiplexSettings",
+          "locationName": "multiplexSettings",
+          "documentation": "Configuration for a multiplex event."
+        },
+        "Name": {
+          "shape": "__string",
+          "locationName": "name",
+          "documentation": "The name of the multiplex."
+        },
+        "PipelinesRunningCount": {
+          "shape": "__integer",
+          "locationName": "pipelinesRunningCount",
+          "documentation": "The number of currently healthy pipelines."
+        },
+        "ProgramCount": {
+          "shape": "__integer",
+          "locationName": "programCount",
+          "documentation": "The number of programs in the multiplex."
+        },
+        "State": {
+          "shape": "MultiplexState",
+          "locationName": "state",
+          "documentation": "The current state of the multiplex."
+        },
+        "Tags": {
+          "shape": "Tags",
+          "locationName": "tags",
+          "documentation": "A collection of key-value pairs."
+        }
+      },
+      "documentation": "Placeholder documentation for DeleteMultiplexResponse"
+    },
     "DeleteReservationRequest": {
       "type": "structure",
       "members": {
@@ -3600,6 +4493,125 @@
       },
       "documentation": "Placeholder documentation for DescribeInputSecurityGroupResponse"
     },
+    "DescribeMultiplexProgramRequest": {
+      "type": "structure",
+      "members": {
+        "MultiplexId": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "multiplexId",
+          "documentation": "The ID of the multiplex that the program belongs to."
+        },
+        "ProgramName": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "programName",
+          "documentation": "The name of the program."
+        }
+      },
+      "required": [
+        "MultiplexId",
+        "ProgramName"
+      ],
+      "documentation": "Placeholder documentation for DescribeMultiplexProgramRequest"
+    },
+    "DescribeMultiplexProgramResponse": {
+      "type": "structure",
+      "members": {
+        "ChannelId": {
+          "shape": "__string",
+          "locationName": "channelId",
+          "documentation": "The MediaLive channel associated with the program."
+        },
+        "MultiplexProgramSettings": {
+          "shape": "MultiplexProgramSettings",
+          "locationName": "multiplexProgramSettings",
+          "documentation": "The settings for this multiplex program."
+        },
+        "PacketIdentifiersMap": {
+          "shape": "MultiplexProgramPacketIdentifiersMap",
+          "locationName": "packetIdentifiersMap",
+          "documentation": "The packet identifier map for this multiplex program."
+        },
+        "ProgramName": {
+          "shape": "__string",
+          "locationName": "programName",
+          "documentation": "The name of the multiplex program."
+        }
+      },
+      "documentation": "Placeholder documentation for DescribeMultiplexProgramResponse"
+    },
+    "DescribeMultiplexRequest": {
+      "type": "structure",
+      "members": {
+        "MultiplexId": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "multiplexId",
+          "documentation": "The ID of the multiplex."
+        }
+      },
+      "required": [
+        "MultiplexId"
+      ],
+      "documentation": "Placeholder documentation for DescribeMultiplexRequest"
+    },
+    "DescribeMultiplexResponse": {
+      "type": "structure",
+      "members": {
+        "Arn": {
+          "shape": "__string",
+          "locationName": "arn",
+          "documentation": "The unique arn of the multiplex."
+        },
+        "AvailabilityZones": {
+          "shape": "__listOf__string",
+          "locationName": "availabilityZones",
+          "documentation": "A list of availability zones for the multiplex."
+        },
+        "Destinations": {
+          "shape": "__listOfMultiplexOutputDestination",
+          "locationName": "destinations",
+          "documentation": "A list of the multiplex output destinations."
+        },
+        "Id": {
+          "shape": "__string",
+          "locationName": "id",
+          "documentation": "The unique id of the multiplex."
+        },
+        "MultiplexSettings": {
+          "shape": "MultiplexSettings",
+          "locationName": "multiplexSettings",
+          "documentation": "Configuration for a multiplex event."
+        },
+        "Name": {
+          "shape": "__string",
+          "locationName": "name",
+          "documentation": "The name of the multiplex."
+        },
+        "PipelinesRunningCount": {
+          "shape": "__integer",
+          "locationName": "pipelinesRunningCount",
+          "documentation": "The number of currently healthy pipelines."
+        },
+        "ProgramCount": {
+          "shape": "__integer",
+          "locationName": "programCount",
+          "documentation": "The number of programs in the multiplex."
+        },
+        "State": {
+          "shape": "MultiplexState",
+          "locationName": "state",
+          "documentation": "The current state of the multiplex."
+        },
+        "Tags": {
+          "shape": "Tags",
+          "locationName": "tags",
+          "documentation": "A collection of key-value pairs."
+        }
+      },
+      "documentation": "Placeholder documentation for DescribeMultiplexResponse"
+    },
     "DescribeOfferingRequest": {
       "type": "structure",
       "members": {
@@ -4387,6 +5399,11 @@
           "locationName": "globalConfiguration",
           "documentation": "Configuration settings that apply to the event as a whole."
         },
+        "NielsenConfiguration": {
+          "shape": "NielsenConfiguration",
+          "locationName": "nielsenConfiguration",
+          "documentation": "Nielsen configuration settings."
+        },
         "OutputGroups": {
           "shape": "__listOfOutputGroup",
           "locationName": "outputGroups"
@@ -4469,6 +5486,17 @@
         "Time"
       ]
     },
+    "Fmp4HlsSettings": {
+      "type": "structure",
+      "members": {
+        "AudioRenditionSets": {
+          "shape": "__string",
+          "locationName": "audioRenditionSets",
+          "documentation": "List all the audio groups that are used with the video output stream. Input all the audio GROUP-IDs that are associated to the video, separate by ','."
+        }
+      },
+      "documentation": "Fmp4 Hls Settings"
+    },
     "FollowModeScheduleActionStartSettings": {
       "type": "structure",
       "members": {
@@ -4525,6 +5553,14 @@
         "Destination"
       ]
     },
+    "FrameCaptureIntervalUnit": {
+      "type": "string",
+      "documentation": "Frame Capture Interval Unit",
+      "enum": [
+        "MILLISECONDS",
+        "SECONDS"
+      ]
+    },
     "FrameCaptureOutputSettings": {
       "type": "structure",
       "members": {
@@ -4540,9 +5576,14 @@
       "type": "structure",
       "members": {
         "CaptureInterval": {
-          "shape": "__integerMin1Max3600",
+          "shape": "__integerMin1Max3600000",
           "locationName": "captureInterval",
-          "documentation": "The frequency, in seconds, for capturing frames for inclusion in the output.  For example, \"10\" means capture a frame every 10 seconds."
+          "documentation": "The frequency at which to capture frames for inclusion in the output. May be specified in either seconds or milliseconds, as specified by captureIntervalUnits."
+        },
+        "CaptureIntervalUnits": {
+          "shape": "FrameCaptureIntervalUnit",
+          "locationName": "captureIntervalUnits",
+          "documentation": "Unit for the frame capture interval."
         }
       },
       "documentation": "Frame Capture Settings",
@@ -4872,9 +5913,9 @@
           "documentation": "Number of B-frames between reference frames."
         },
         "GopSize": {
-          "shape": "__doubleMin1",
+          "shape": "__double",
           "locationName": "gopSize",
-          "documentation": "GOP size (keyframe interval) in units of either frames or seconds per gopSizeUnits. Must be greater than zero."
+          "documentation": "GOP size (keyframe interval) in units of either frames or seconds per gopSizeUnits.\nIf gopSizeUnits is frames, gopSize must be an integer and must be greater than or equal to 1.\nIf gopSizeUnits is seconds, gopSize must be greater than 0, but need not be an integer."
         },
         "GopSizeUnits": {
           "shape": "H264GopSizeUnits",
@@ -4899,7 +5940,7 @@
         "MinIInterval": {
           "shape": "__integerMin0Max30",
           "locationName": "minIInterval",
-          "documentation": "Only meaningful if sceneChangeDetect is set to enabled.  Enforces separation between repeated (cadence) I-frames and I-frames inserted by Scene Change Detection. If a scene change I-frame is within I-interval frames of a cadence I-frame, the GOP is shrunk and/or stretched to the scene change I-frame. GOP stretch requires enabling lookahead as well as setting I-interval. The normal cadence resumes for the next GOP. Note: Maximum GOP stretch = GOP size + Min-I-interval - 1"
+          "documentation": "Only meaningful if sceneChangeDetect is set to enabled.  Defaults to 5 if multiplex rate control is used.  Enforces separation between repeated (cadence) I-frames and I-frames inserted by Scene Change Detection. If a scene change I-frame is within I-interval frames of a cadence I-frame, the GOP is shrunk and/or stretched to the scene change I-frame. GOP stretch requires enabling lookahead as well as setting I-interval. The normal cadence resumes for the next GOP. Note: Maximum GOP stretch = GOP size + Min-I-interval - 1"
         },
         "NumRefFrames": {
           "shape": "__integerMin1Max6",
@@ -4934,7 +5975,7 @@
         "RateControlMode": {
           "shape": "H264RateControlMode",
           "locationName": "rateControlMode",
-          "documentation": "Rate control mode.\n\nQVBR: Quality will match the specified quality level except when it is constrained by the\nmaximum bitrate.  Recommended if you or your viewers pay for bandwidth.\n\nVBR: Quality and bitrate vary, depending on the video complexity. Recommended instead of QVBR\nif you want to maintain a specific average bitrate over the duration of the channel.\n\nCBR: Quality varies, depending on the video complexity. Recommended only if you distribute\nyour assets to devices that cannot handle variable bitrates."
+          "documentation": "Rate control mode.\n\nQVBR: Quality will match the specified quality level except when it is constrained by the\nmaximum bitrate.  Recommended if you or your viewers pay for bandwidth.\n\nVBR: Quality and bitrate vary, depending on the video complexity. Recommended instead of QVBR\nif you want to maintain a specific average bitrate over the duration of the channel.\n\nCBR: Quality varies, depending on the video complexity. Recommended only if you distribute\nyour assets to devices that cannot handle variable bitrates.\n\nMultiplex: This rate control mode is only supported (and is required) when the video is being\ndelivered to a MediaLive Multiplex in which case the rate control configuration is controlled\nby the properties within the Multiplex Program."
         },
         "ScanType": {
           "shape": "H264ScanType",
@@ -5132,6 +6173,7 @@
       "documentation": "H265 Rate Control Mode",
       "enum": [
         "CBR",
+        "MULTIPLEX",
         "QVBR"
       ]
     },
@@ -5214,9 +6256,9 @@
           "documentation": "Frequency of closed GOPs. In streaming applications, it is recommended that this be set to 1 so a decoder joining mid-stream will receive an IDR frame as quickly as possible. Setting this value to 0 will break output segmenting."
         },
         "GopSize": {
-          "shape": "__doubleMin1",
+          "shape": "__double",
           "locationName": "gopSize",
-          "documentation": "GOP size (keyframe interval) in units of either frames or seconds per gopSizeUnits. Must be greater than zero."
+          "documentation": "GOP size (keyframe interval) in units of either frames or seconds per gopSizeUnits.\nIf gopSizeUnits is frames, gopSize must be an integer and must be greater than or equal to 1.\nIf gopSizeUnits is seconds, gopSize must be greater than 0, but need not be an integer."
         },
         "GopSizeUnits": {
           "shape": "H265GopSizeUnits",
@@ -5241,7 +6283,7 @@
         "MinIInterval": {
           "shape": "__integerMin0Max30",
           "locationName": "minIInterval",
-          "documentation": "Only meaningful if sceneChangeDetect is set to enabled.  Enforces separation between repeated (cadence) I-frames and I-frames inserted by Scene Change Detection. If a scene change I-frame is within I-interval frames of a cadence I-frame, the GOP is shrunk and/or stretched to the scene change I-frame. GOP stretch requires enabling lookahead as well as setting I-interval. The normal cadence resumes for the next GOP. Note: Maximum GOP stretch = GOP size + Min-I-interval - 1"
+          "documentation": "Only meaningful if sceneChangeDetect is set to enabled.  Defaults to 5 if multiplex rate control is used.  Enforces separation between repeated (cadence) I-frames and I-frames inserted by Scene Change Detection. If a scene change I-frame is within I-interval frames of a cadence I-frame, the GOP is shrunk and/or stretched to the scene change I-frame. GOP stretch requires enabling lookahead as well as setting I-interval. The normal cadence resumes for the next GOP. Note: Maximum GOP stretch = GOP size + Min-I-interval - 1"
         },
         "ParDenominator": {
           "shape": "__integerMin1",
@@ -5492,11 +6534,21 @@
           "locationName": "baseUrlContent",
           "documentation": "A partial URI prefix that will be prepended to each output in the media .m3u8 file. Can be used if base manifest is delivered from a different URL than the main .m3u8 file."
         },
+        "BaseUrlContent1": {
+          "shape": "__string",
+          "locationName": "baseUrlContent1",
+          "documentation": "Optional. One value per output group.\n\nThis field is required only if you are completing Base URL content A, and the downstream system has notified you that the media files for pipeline 1 of all outputs are in a location different from the media files for pipeline 0."
+        },
         "BaseUrlManifest": {
           "shape": "__string",
           "locationName": "baseUrlManifest",
           "documentation": "A partial URI prefix that will be prepended to each output in the media .m3u8 file. Can be used if base manifest is delivered from a different URL than the main .m3u8 file."
         },
+        "BaseUrlManifest1": {
+          "shape": "__string",
+          "locationName": "baseUrlManifest1",
+          "documentation": "Optional. One value per output group.\n\nComplete this field only if you are completing Base URL manifest A, and the downstream system has notified you that the child manifest files for pipeline 1 of all outputs are in a location different from the child manifest files for pipeline 0."
+        },
         "CaptionLanguageMappings": {
           "shape": "__listOfCaptionLanguageMapping",
           "locationName": "captionLanguageMappings",
@@ -5542,6 +6594,11 @@
           "locationName": "hlsCdnSettings",
           "documentation": "Parameters that control interactions with the CDN."
         },
+        "HlsId3SegmentTagging": {
+          "shape": "HlsId3SegmentTaggingState",
+          "locationName": "hlsId3SegmentTagging",
+          "documentation": "State of HLS ID3 Segment Tagging"
+        },
         "IFrameOnlyPlaylists": {
           "shape": "IFrameOnlyPlaylistType",
           "locationName": "iFrameOnlyPlaylists",
@@ -5673,6 +6730,36 @@
         "Destination"
       ]
     },
+    "HlsH265PackagingType": {
+      "type": "string",
+      "documentation": "Hls H265 Packaging Type",
+      "enum": [
+        "HEV1",
+        "HVC1"
+      ]
+    },
+    "HlsId3SegmentTaggingScheduleActionSettings": {
+      "type": "structure",
+      "members": {
+        "Tag": {
+          "shape": "__string",
+          "locationName": "tag",
+          "documentation": "ID3 tag to insert into each segment. Supports special keyword identifiers to substitute in segment-related values.\\nSupported keyword identifiers: https://docs.aws.amazon.com/medialive/latest/ug/variable-data-identifiers.html"
+        }
+      },
+      "documentation": "Settings for the action to insert a user-defined ID3 tag in each HLS segment",
+      "required": [
+        "Tag"
+      ]
+    },
+    "HlsId3SegmentTaggingState": {
+      "type": "string",
+      "documentation": "State of HLS ID3 Segment Tagging",
+      "enum": [
+        "DISABLED",
+        "ENABLED"
+      ]
+    },
     "HlsInputSettings": {
       "type": "structure",
       "members": {
@@ -5788,6 +6875,11 @@
     "HlsOutputSettings": {
       "type": "structure",
       "members": {
+        "H265PackagingType": {
+          "shape": "HlsH265PackagingType",
+          "locationName": "h265PackagingType",
+          "documentation": "Only applicable when this output is referencing an H.265 video description.\nSpecifies whether MP4 segments should be packaged as HEV1 or HVC1."
+        },
         "HlsSettings": {
           "shape": "HlsSettings",
           "locationName": "hlsSettings",
@@ -5840,6 +6932,10 @@
           "shape": "AudioOnlyHlsSettings",
           "locationName": "audioOnlyHlsSettings"
         },
+        "Fmp4HlsSettings": {
+          "shape": "Fmp4HlsSettings",
+          "locationName": "fmp4HlsSettings"
+        },
         "StandardHlsSettings": {
           "shape": "StandardHlsSettings",
           "locationName": "standardHlsSettings"
@@ -6771,6 +7867,115 @@
       },
       "documentation": "Placeholder documentation for ListInputsResultModel"
     },
+    "ListMultiplexProgramsRequest": {
+      "type": "structure",
+      "members": {
+        "MaxResults": {
+          "shape": "MaxResults",
+          "location": "querystring",
+          "locationName": "maxResults",
+          "documentation": "The maximum number of items to return."
+        },
+        "MultiplexId": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "multiplexId",
+          "documentation": "The ID of the multiplex that the programs belong to."
+        },
+        "NextToken": {
+          "shape": "__string",
+          "location": "querystring",
+          "locationName": "nextToken",
+          "documentation": "The token to retrieve the next page of results."
+        }
+      },
+      "required": [
+        "MultiplexId"
+      ],
+      "documentation": "Placeholder documentation for ListMultiplexProgramsRequest"
+    },
+    "ListMultiplexProgramsResponse": {
+      "type": "structure",
+      "members": {
+        "MultiplexPrograms": {
+          "shape": "__listOfMultiplexProgramSummary",
+          "locationName": "multiplexPrograms",
+          "documentation": "List of multiplex programs."
+        },
+        "NextToken": {
+          "shape": "__string",
+          "locationName": "nextToken",
+          "documentation": "Token for the next ListMultiplexProgram request."
+        }
+      },
+      "documentation": "Placeholder documentation for ListMultiplexProgramsResponse"
+    },
+    "ListMultiplexProgramsResultModel": {
+      "type": "structure",
+      "members": {
+        "MultiplexPrograms": {
+          "shape": "__listOfMultiplexProgramSummary",
+          "locationName": "multiplexPrograms",
+          "documentation": "List of multiplex programs."
+        },
+        "NextToken": {
+          "shape": "__string",
+          "locationName": "nextToken",
+          "documentation": "Token for the next ListMultiplexProgram request."
+        }
+      },
+      "documentation": "Placeholder documentation for ListMultiplexProgramsResultModel"
+    },
+    "ListMultiplexesRequest": {
+      "type": "structure",
+      "members": {
+        "MaxResults": {
+          "shape": "MaxResults",
+          "location": "querystring",
+          "locationName": "maxResults",
+          "documentation": "The maximum number of items to return."
+        },
+        "NextToken": {
+          "shape": "__string",
+          "location": "querystring",
+          "locationName": "nextToken",
+          "documentation": "The token to retrieve the next page of results."
+        }
+      },
+      "documentation": "Placeholder documentation for ListMultiplexesRequest"
+    },
+    "ListMultiplexesResponse": {
+      "type": "structure",
+      "members": {
+        "Multiplexes": {
+          "shape": "__listOfMultiplexSummary",
+          "locationName": "multiplexes",
+          "documentation": "List of multiplexes."
+        },
+        "NextToken": {
+          "shape": "__string",
+          "locationName": "nextToken",
+          "documentation": "Token for the next ListMultiplexes request."
+        }
+      },
+      "documentation": "Placeholder documentation for ListMultiplexesResponse"
+    },
+    "ListMultiplexesResultModel": {
+      "type": "structure",
+      "members": {
+        "Multiplexes": {
+          "shape": "__listOfMultiplexSummary",
+          "locationName": "multiplexes",
+          "documentation": "List of multiplexes."
+        },
+        "NextToken": {
+          "shape": "__string",
+          "locationName": "nextToken",
+          "documentation": "Token for the next ListMultiplexes request."
+        }
+      },
+      "documentation": "Placeholder documentation for ListMultiplexesResultModel"
+    },
     "ListOfferingsRequest": {
       "type": "structure",
       "members": {
@@ -6792,6 +7997,12 @@
           "locationName": "codec",
           "documentation": "Filter by codec, 'AVC', 'HEVC', 'MPEG2', or 'AUDIO'"
         },
+        "Duration": {
+          "shape": "__string",
+          "location": "querystring",
+          "locationName": "duration",
+          "documentation": "Filter by offering duration, e.g. '12'"
+        },
         "MaxResults": {
           "shape": "MaxResults",
           "location": "querystring",
@@ -6818,13 +8029,13 @@
           "shape": "__string",
           "location": "querystring",
           "locationName": "resolution",
-          "documentation": "Filter by resolution, 'SD', 'HD', or 'UHD'"
+          "documentation": "Filter by resolution, 'SD', 'HD', 'FHD', or 'UHD'"
         },
         "ResourceType": {
           "shape": "__string",
           "location": "querystring",
           "locationName": "resourceType",
-          "documentation": "Filter by resource type, 'INPUT', 'OUTPUT', or 'CHANNEL'"
+          "documentation": "Filter by resource type, 'INPUT', 'OUTPUT', 'MULTIPLEX', or 'CHANNEL'"
         },
         "SpecialFeature": {
           "shape": "__string",
@@ -6914,13 +8125,13 @@
           "shape": "__string",
           "location": "querystring",
           "locationName": "resolution",
-          "documentation": "Filter by resolution, 'SD', 'HD', or 'UHD'"
+          "documentation": "Filter by resolution, 'SD', 'HD', 'FHD', or 'UHD'"
         },
         "ResourceType": {
           "shape": "__string",
           "location": "querystring",
           "locationName": "resourceType",
-          "documentation": "Filter by resource type, 'INPUT', 'OUTPUT', or 'CHANNEL'"
+          "documentation": "Filter by resource type, 'INPUT', 'OUTPUT', 'MULTIPLEX', or 'CHANNEL'"
         },
         "SpecialFeature": {
           "shape": "__string",
@@ -7100,6 +8311,14 @@
         "PASSTHROUGH"
       ]
     },
+    "M2tsNielsenId3Behavior": {
+      "type": "string",
+      "documentation": "M2ts Nielsen Id3 Behavior",
+      "enum": [
+        "NO_PASSTHROUGH",
+        "PASSTHROUGH"
+      ]
+    },
     "M2tsPcrControl": {
       "type": "string",
       "documentation": "M2ts Pcr Control",
@@ -7282,6 +8501,11 @@
           "locationName": "klvDataPids",
           "documentation": "Packet Identifier (PID) for input source KLV data to this output. Multiple values are accepted, and can be entered in ranges and/or by comma separation. Can be entered as decimal or hexadecimal values.  Each PID specified must be in the range of 32 (or 0x20)..8182 (or 0x1ff6)."
         },
+        "NielsenId3Behavior": {
+          "shape": "M2tsNielsenId3Behavior",
+          "locationName": "nielsenId3Behavior",
+          "documentation": "If set to passthrough, Nielsen inaudible tones for media tracking will be detected in the input audio and an equivalent ID3 tag will be inserted in the output."
+        },
         "NullPacketBitrate": {
           "shape": "__doubleMin0",
           "locationName": "nullPacketBitrate",
@@ -7388,6 +8612,14 @@
         "PASSTHROUGH"
       ]
     },
+    "M3u8NielsenId3Behavior": {
+      "type": "string",
+      "documentation": "M3u8 Nielsen Id3 Behavior",
+      "enum": [
+        "NO_PASSTHROUGH",
+        "PASSTHROUGH"
+      ]
+    },
     "M3u8PcrControl": {
       "type": "string",
       "documentation": "M3u8 Pcr Control",
@@ -7422,6 +8654,11 @@
           "locationName": "ecmPid",
           "documentation": "This parameter is unused and deprecated."
         },
+        "NielsenId3Behavior": {
+          "shape": "M3u8NielsenId3Behavior",
+          "locationName": "nielsenId3Behavior",
+          "documentation": "If set to passthrough, Nielsen inaudible tones for media tracking will be detected in the input audio and an equivalent ID3 tag will be inserted in the output."
+        },
         "PatInterval": {
           "shape": "__integerMin0Max1000",
           "locationName": "patInterval",
@@ -7674,45 +8911,479 @@
           "locationName": "streamManifestBehavior",
           "documentation": "When set to send, send stream manifest so publishing point doesn't start until all streams start."
         },
-        "TimestampOffset": {
+        "TimestampOffset": {
+          "shape": "__string",
+          "locationName": "timestampOffset",
+          "documentation": "Timestamp offset for the event.  Only used if timestampOffsetMode is set to useConfiguredOffset."
+        },
+        "TimestampOffsetMode": {
+          "shape": "SmoothGroupTimestampOffsetMode",
+          "locationName": "timestampOffsetMode",
+          "documentation": "Type of timestamp date offset to use.\n- useEventStartDate: Use the date the event was started as the offset\n- useConfiguredOffset: Use an explicitly configured date as the offset"
+        }
+      },
+      "documentation": "Ms Smooth Group Settings",
+      "required": [
+        "Destination"
+      ]
+    },
+    "MsSmoothH265PackagingType": {
+      "type": "string",
+      "documentation": "Ms Smooth H265 Packaging Type",
+      "enum": [
+        "HEV1",
+        "HVC1"
+      ]
+    },
+    "MsSmoothOutputSettings": {
+      "type": "structure",
+      "members": {
+        "H265PackagingType": {
+          "shape": "MsSmoothH265PackagingType",
+          "locationName": "h265PackagingType",
+          "documentation": "Only applicable when this output is referencing an H.265 video description.\nSpecifies whether MP4 segments should be packaged as HEV1 or HVC1."
+        },
+        "NameModifier": {
+          "shape": "__string",
+          "locationName": "nameModifier",
+          "documentation": "String concatenated to the end of the destination filename.  Required for multiple outputs of the same type."
+        }
+      },
+      "documentation": "Ms Smooth Output Settings"
+    },
+    "Multiplex": {
+      "type": "structure",
+      "members": {
+        "Arn": {
+          "shape": "__string",
+          "locationName": "arn",
+          "documentation": "The unique arn of the multiplex."
+        },
+        "AvailabilityZones": {
+          "shape": "__listOf__string",
+          "locationName": "availabilityZones",
+          "documentation": "A list of availability zones for the multiplex."
+        },
+        "Destinations": {
+          "shape": "__listOfMultiplexOutputDestination",
+          "locationName": "destinations",
+          "documentation": "A list of the multiplex output destinations."
+        },
+        "Id": {
+          "shape": "__string",
+          "locationName": "id",
+          "documentation": "The unique id of the multiplex."
+        },
+        "MultiplexSettings": {
+          "shape": "MultiplexSettings",
+          "locationName": "multiplexSettings",
+          "documentation": "Configuration for a multiplex event."
+        },
+        "Name": {
+          "shape": "__string",
+          "locationName": "name",
+          "documentation": "The name of the multiplex."
+        },
+        "PipelinesRunningCount": {
+          "shape": "__integer",
+          "locationName": "pipelinesRunningCount",
+          "documentation": "The number of currently healthy pipelines."
+        },
+        "ProgramCount": {
+          "shape": "__integer",
+          "locationName": "programCount",
+          "documentation": "The number of programs in the multiplex."
+        },
+        "State": {
+          "shape": "MultiplexState",
+          "locationName": "state",
+          "documentation": "The current state of the multiplex."
+        },
+        "Tags": {
+          "shape": "Tags",
+          "locationName": "tags",
+          "documentation": "A collection of key-value pairs."
+        }
+      },
+      "documentation": "The multiplex object."
+    },
+    "MultiplexConfigurationValidationError": {
+      "type": "structure",
+      "members": {
+        "Message": {
+          "shape": "__string",
+          "locationName": "message",
+          "documentation": "The error message."
+        },
+        "ValidationErrors": {
+          "shape": "__listOfMultiplexValidationError",
+          "locationName": "validationErrors",
+          "documentation": "A collection of validation error responses."
+        }
+      },
+      "documentation": "Placeholder documentation for MultiplexConfigurationValidationError"
+    },
+    "MultiplexGroupSettings": {
+      "type": "structure",
+      "members": {
+      },
+      "documentation": "Multiplex Group Settings"
+    },
+    "MultiplexMediaConnectOutputDestinationSettings": {
+      "type": "structure",
+      "members": {
+        "EntitlementArn": {
+          "shape": "__stringMin1",
+          "locationName": "entitlementArn",
+          "documentation": "The MediaConnect entitlement ARN available as a Flow source."
+        }
+      },
+      "documentation": "Multiplex MediaConnect output destination settings."
+    },
+    "MultiplexOutputDestination": {
+      "type": "structure",
+      "members": {
+        "MediaConnectSettings": {
+          "shape": "MultiplexMediaConnectOutputDestinationSettings",
+          "locationName": "mediaConnectSettings",
+          "documentation": "Multiplex MediaConnect output destination settings."
+        }
+      },
+      "documentation": "Multiplex output destination settings"
+    },
+    "MultiplexOutputSettings": {
+      "type": "structure",
+      "members": {
+        "Destination": {
+          "shape": "OutputLocationRef",
+          "locationName": "destination",
+          "documentation": "Destination is a Multiplex."
+        }
+      },
+      "documentation": "Multiplex Output Settings",
+      "required": [
+        "Destination"
+      ]
+    },
+    "MultiplexProgram": {
+      "type": "structure",
+      "members": {
+        "ChannelId": {
+          "shape": "__string",
+          "locationName": "channelId",
+          "documentation": "The MediaLive channel associated with the program."
+        },
+        "MultiplexProgramSettings": {
+          "shape": "MultiplexProgramSettings",
+          "locationName": "multiplexProgramSettings",
+          "documentation": "The settings for this multiplex program."
+        },
+        "PacketIdentifiersMap": {
+          "shape": "MultiplexProgramPacketIdentifiersMap",
+          "locationName": "packetIdentifiersMap",
+          "documentation": "The packet identifier map for this multiplex program."
+        },
+        "ProgramName": {
+          "shape": "__string",
+          "locationName": "programName",
+          "documentation": "The name of the multiplex program."
+        }
+      },
+      "documentation": "The multiplex program object."
+    },
+    "MultiplexProgramChannelDestinationSettings": {
+      "type": "structure",
+      "members": {
+        "MultiplexId": {
+          "shape": "__stringMin1",
+          "locationName": "multiplexId",
+          "documentation": "The ID of the Multiplex that the encoder is providing output to. You do not need to specify the individual inputs to the Multiplex; MediaLive will handle the connection of the two MediaLive pipelines to the two Multiplex instances.\nThe Multiplex must be in the same region as the Channel."
+        },
+        "ProgramName": {
+          "shape": "__stringMin1",
+          "locationName": "programName",
+          "documentation": "The program name of the Multiplex program that the encoder is providing output to."
+        }
+      },
+      "documentation": "Multiplex Program Input Destination Settings for outputting a Channel to a Multiplex"
+    },
+    "MultiplexProgramPacketIdentifiersMap": {
+      "type": "structure",
+      "members": {
+        "AudioPids": {
+          "shape": "__listOf__integer",
+          "locationName": "audioPids"
+        },
+        "DvbSubPids": {
+          "shape": "__listOf__integer",
+          "locationName": "dvbSubPids"
+        },
+        "DvbTeletextPid": {
+          "shape": "__integer",
+          "locationName": "dvbTeletextPid"
+        },
+        "EtvPlatformPid": {
+          "shape": "__integer",
+          "locationName": "etvPlatformPid"
+        },
+        "EtvSignalPid": {
+          "shape": "__integer",
+          "locationName": "etvSignalPid"
+        },
+        "KlvDataPids": {
+          "shape": "__listOf__integer",
+          "locationName": "klvDataPids"
+        },
+        "PcrPid": {
+          "shape": "__integer",
+          "locationName": "pcrPid"
+        },
+        "PmtPid": {
+          "shape": "__integer",
+          "locationName": "pmtPid"
+        },
+        "PrivateMetadataPid": {
+          "shape": "__integer",
+          "locationName": "privateMetadataPid"
+        },
+        "Scte27Pids": {
+          "shape": "__listOf__integer",
+          "locationName": "scte27Pids"
+        },
+        "Scte35Pid": {
+          "shape": "__integer",
+          "locationName": "scte35Pid"
+        },
+        "TimedMetadataPid": {
+          "shape": "__integer",
+          "locationName": "timedMetadataPid"
+        },
+        "VideoPid": {
+          "shape": "__integer",
+          "locationName": "videoPid"
+        }
+      },
+      "documentation": "Packet identifiers map for a given Multiplex program."
+    },
+    "MultiplexProgramServiceDescriptor": {
+      "type": "structure",
+      "members": {
+        "ProviderName": {
+          "shape": "__stringMax256",
+          "locationName": "providerName",
+          "documentation": "Name of the provider."
+        },
+        "ServiceName": {
+          "shape": "__stringMax256",
+          "locationName": "serviceName",
+          "documentation": "Name of the service."
+        }
+      },
+      "documentation": "Transport stream service descriptor configuration for the Multiplex program.",
+      "required": [
+        "ProviderName",
+        "ServiceName"
+      ]
+    },
+    "MultiplexProgramSettings": {
+      "type": "structure",
+      "members": {
+        "PreferredChannelPipeline": {
+          "shape": "PreferredChannelPipeline",
+          "locationName": "preferredChannelPipeline",
+          "documentation": "Indicates which pipeline is preferred by the multiplex for program ingest."
+        },
+        "ProgramNumber": {
+          "shape": "__integerMin0Max65535",
+          "locationName": "programNumber",
+          "documentation": "Unique program number."
+        },
+        "ServiceDescriptor": {
+          "shape": "MultiplexProgramServiceDescriptor",
+          "locationName": "serviceDescriptor",
+          "documentation": "Transport stream service descriptor configuration for the Multiplex program."
+        },
+        "VideoSettings": {
+          "shape": "MultiplexVideoSettings",
+          "locationName": "videoSettings",
+          "documentation": "Program video settings configuration."
+        }
+      },
+      "documentation": "Multiplex Program settings configuration.",
+      "required": [
+        "ProgramNumber"
+      ]
+    },
+    "MultiplexProgramSummary": {
+      "type": "structure",
+      "members": {
+        "ChannelId": {
+          "shape": "__string",
+          "locationName": "channelId",
+          "documentation": "The MediaLive Channel associated with the program."
+        },
+        "ProgramName": {
+          "shape": "__string",
+          "locationName": "programName",
+          "documentation": "The name of the multiplex program."
+        }
+      },
+      "documentation": "Placeholder documentation for MultiplexProgramSummary"
+    },
+    "MultiplexSettings": {
+      "type": "structure",
+      "members": {
+        "MaximumVideoBufferDelayMilliseconds": {
+          "shape": "__integerMin1000Max3000",
+          "locationName": "maximumVideoBufferDelayMilliseconds",
+          "documentation": "Maximum video buffer delay in milliseconds."
+        },
+        "TransportStreamBitrate": {
+          "shape": "__integerMin1000000Max100000000",
+          "locationName": "transportStreamBitrate",
+          "documentation": "Transport stream bit rate."
+        },
+        "TransportStreamId": {
+          "shape": "__integerMin0Max65535",
+          "locationName": "transportStreamId",
+          "documentation": "Transport stream ID."
+        },
+        "TransportStreamReservedBitrate": {
+          "shape": "__integerMin0Max100000000",
+          "locationName": "transportStreamReservedBitrate",
+          "documentation": "Transport stream reserved bit rate."
+        }
+      },
+      "documentation": "Contains configuration for a Multiplex event",
+      "required": [
+        "TransportStreamBitrate",
+        "TransportStreamId"
+      ]
+    },
+    "MultiplexSettingsSummary": {
+      "type": "structure",
+      "members": {
+        "TransportStreamBitrate": {
+          "shape": "__integerMin1000000Max100000000",
+          "locationName": "transportStreamBitrate",
+          "documentation": "Transport stream bit rate."
+        }
+      },
+      "documentation": "Contains summary configuration for a Multiplex event."
+    },
+    "MultiplexState": {
+      "type": "string",
+      "documentation": "The current state of the multiplex.",
+      "enum": [
+        "CREATING",
+        "CREATE_FAILED",
+        "IDLE",
+        "STARTING",
+        "RUNNING",
+        "RECOVERING",
+        "STOPPING",
+        "DELETING",
+        "DELETED"
+      ]
+    },
+    "MultiplexStatmuxVideoSettings": {
+      "type": "structure",
+      "members": {
+        "MaximumBitrate": {
+          "shape": "__integerMin100000Max100000000",
+          "locationName": "maximumBitrate",
+          "documentation": "Maximum statmux bitrate."
+        },
+        "MinimumBitrate": {
+          "shape": "__integerMin100000Max100000000",
+          "locationName": "minimumBitrate",
+          "documentation": "Minimum statmux bitrate."
+        }
+      },
+      "documentation": "Statmux rate control settings"
+    },
+    "MultiplexSummary": {
+      "type": "structure",
+      "members": {
+        "Arn": {
+          "shape": "__string",
+          "locationName": "arn",
+          "documentation": "The unique arn of the multiplex."
+        },
+        "AvailabilityZones": {
+          "shape": "__listOf__string",
+          "locationName": "availabilityZones",
+          "documentation": "A list of availability zones for the multiplex."
+        },
+        "Id": {
+          "shape": "__string",
+          "locationName": "id",
+          "documentation": "The unique id of the multiplex."
+        },
+        "MultiplexSettings": {
+          "shape": "MultiplexSettingsSummary",
+          "locationName": "multiplexSettings",
+          "documentation": "Configuration for a multiplex event."
+        },
+        "Name": {
+          "shape": "__string",
+          "locationName": "name",
+          "documentation": "The name of the multiplex."
+        },
+        "PipelinesRunningCount": {
+          "shape": "__integer",
+          "locationName": "pipelinesRunningCount",
+          "documentation": "The number of currently healthy pipelines."
+        },
+        "ProgramCount": {
+          "shape": "__integer",
+          "locationName": "programCount",
+          "documentation": "The number of programs in the multiplex."
+        },
+        "State": {
+          "shape": "MultiplexState",
+          "locationName": "state",
+          "documentation": "The current state of the multiplex."
+        },
+        "Tags": {
+          "shape": "Tags",
+          "locationName": "tags",
+          "documentation": "A collection of key-value pairs."
+        }
+      },
+      "documentation": "Placeholder documentation for MultiplexSummary"
+    },
+    "MultiplexValidationError": {
+      "type": "structure",
+      "members": {
+        "ElementPath": {
           "shape": "__string",
-          "locationName": "timestampOffset",
-          "documentation": "Timestamp offset for the event.  Only used if timestampOffsetMode is set to useConfiguredOffset."
+          "locationName": "elementPath",
+          "documentation": "Path to the source of the error."
         },
-        "TimestampOffsetMode": {
-          "shape": "SmoothGroupTimestampOffsetMode",
-          "locationName": "timestampOffsetMode",
-          "documentation": "Type of timestamp date offset to use.\n- useEventStartDate: Use the date the event was started as the offset\n- useConfiguredOffset: Use an explicitly configured date as the offset"
+        "ErrorMessage": {
+          "shape": "__string",
+          "locationName": "errorMessage",
+          "documentation": "The error message."
         }
       },
-      "documentation": "Ms Smooth Group Settings",
-      "required": [
-        "Destination"
-      ]
-    },
-    "MsSmoothH265PackagingType": {
-      "type": "string",
-      "documentation": "Ms Smooth H265 Packaging Type",
-      "enum": [
-        "HEV1",
-        "HVC1"
-      ]
+      "documentation": "Placeholder documentation for MultiplexValidationError"
     },
-    "MsSmoothOutputSettings": {
+    "MultiplexVideoSettings": {
       "type": "structure",
       "members": {
-        "H265PackagingType": {
-          "shape": "MsSmoothH265PackagingType",
-          "locationName": "h265PackagingType",
-          "documentation": "Only applicable when this output is referencing an H.265 video description.\nSpecifies whether MP4 segments should be packaged as HEV1 or HVC1."
+        "ConstantBitrate": {
+          "shape": "__integerMin100000Max100000000",
+          "locationName": "constantBitrate",
+          "documentation": "The constant bitrate configuration for the video encode.\nWhen this field is defined, StatmuxSettings must be undefined."
         },
-        "NameModifier": {
-          "shape": "__string",
-          "locationName": "nameModifier",
-          "documentation": "String concatenated to the end of the destination filename.  Required for multiple outputs of the same type."
+        "StatmuxSettings": {
+          "shape": "MultiplexStatmuxVideoSettings",
+          "locationName": "statmuxSettings",
+          "documentation": "Statmux rate control settings.\nWhen this field is defined, ConstantBitrate must be undefined."
         }
       },
-      "documentation": "Ms Smooth Output Settings"
+      "documentation": "The video configuration for each program in a multiplex."
     },
     "NetworkInputServerValidation": {
       "type": "string",
@@ -7738,6 +9409,30 @@
       },
       "documentation": "Network source to transcode. Must be accessible to the Elemental Live node that is running the live event through a network connection."
     },
+    "NielsenConfiguration": {
+      "type": "structure",
+      "members": {
+        "DistributorId": {
+          "shape": "__string",
+          "locationName": "distributorId",
+          "documentation": "Enter the Distributor ID assigned to your organization by Nielsen."
+        },
+        "NielsenPcmToId3Tagging": {
+          "shape": "NielsenPcmToId3TaggingState",
+          "locationName": "nielsenPcmToId3Tagging",
+          "documentation": "Enables Nielsen PCM to ID3 tagging"
+        }
+      },
+      "documentation": "Nielsen Configuration"
+    },
+    "NielsenPcmToId3TaggingState": {
+      "type": "string",
+      "documentation": "State of Nielsen PCM to ID3 tagging",
+      "enum": [
+        "DISABLED",
+        "ENABLED"
+      ]
+    },
     "NotFoundException": {
       "type": "structure",
       "members": {
@@ -7874,6 +9569,11 @@
           "locationName": "mediaPackageSettings",
           "documentation": "Destination settings for a MediaPackage output; one destination for both encoders."
         },
+        "MultiplexSettings": {
+          "shape": "MultiplexProgramChannelDestinationSettings",
+          "locationName": "multiplexSettings",
+          "documentation": "Destination settings for a Multiplex output; one destination for both encoders."
+        },
         "Settings": {
           "shape": "__listOfOutputDestinationSettings",
           "locationName": "settings",
@@ -7955,6 +9655,10 @@
           "shape": "MsSmoothGroupSettings",
           "locationName": "msSmoothGroupSettings"
         },
+        "MultiplexGroupSettings": {
+          "shape": "MultiplexGroupSettings",
+          "locationName": "multiplexGroupSettings"
+        },
         "RtmpGroupSettings": {
           "shape": "RtmpGroupSettings",
           "locationName": "rtmpGroupSettings"
@@ -7999,6 +9703,10 @@
           "shape": "MsSmoothOutputSettings",
           "locationName": "msSmoothOutputSettings"
         },
+        "MultiplexOutputSettings": {
+          "shape": "MultiplexOutputSettings",
+          "locationName": "multiplexOutputSettings"
+        },
         "RtmpOutputSettings": {
           "shape": "RtmpOutputSettings",
           "locationName": "rtmpOutputSettings"
@@ -8069,6 +9777,15 @@
         "PipelineId"
       ]
     },
+    "PreferredChannelPipeline": {
+      "type": "string",
+      "documentation": "Indicates which pipeline is preferred by the multiplex for program ingest.\nIf set to \\\"PIPELINE_0\\\" or \\\"PIPELINE_1\\\" and an unhealthy ingest causes the multiplex to switch to the non-preferred pipeline,\nit will switch back once that ingest is healthy again. If set to \\\"CURRENTLY_ACTIVE\\\",\nit will not switch back to the other pipeline based on it recovering to a healthy state,\nit will only switch if the active pipeline becomes unhealthy.\n",
+      "enum": [
+        "CURRENTLY_ACTIVE",
+        "PIPELINE_0",
+        "PIPELINE_1"
+      ]
+    },
     "PurchaseOffering": {
       "type": "structure",
       "members": {
@@ -8327,10 +10044,11 @@
     },
     "ReservationResolution": {
       "type": "string",
-      "documentation": "Resolution based on lines of vertical resolution; SD is less than 720 lines, HD is 720 to 1080 lines, UHD is greater than 1080 lines\n",
+      "documentation": "Resolution based on lines of vertical resolution; SD is less than 720 lines, HD is 720 to 1080 lines, FHD is 1080 lines, UHD is greater than 1080 lines\n",
       "enum": [
         "SD",
         "HD",
+        "FHD",
         "UHD"
       ]
     },
@@ -8365,7 +10083,7 @@
         "ResourceType": {
           "shape": "ReservationResourceType",
           "locationName": "resourceType",
-          "documentation": "Resource type, 'INPUT', 'OUTPUT', or 'CHANNEL'"
+          "documentation": "Resource type, 'INPUT', 'OUTPUT', 'MULTIPLEX', or 'CHANNEL'"
         },
         "SpecialFeature": {
           "shape": "ReservationSpecialFeature",
@@ -8382,10 +10100,11 @@
     },
     "ReservationResourceType": {
       "type": "string",
-      "documentation": "Resource type, 'INPUT', 'OUTPUT', or 'CHANNEL'",
+      "documentation": "Resource type, 'INPUT', 'OUTPUT', 'MULTIPLEX', or 'CHANNEL'",
       "enum": [
         "INPUT",
         "OUTPUT",
+        "MULTIPLEX",
         "CHANNEL"
       ]
     },
@@ -8561,6 +10280,11 @@
     "ScheduleActionSettings": {
       "type": "structure",
       "members": {
+        "HlsId3SegmentTaggingSettings": {
+          "shape": "HlsId3SegmentTaggingScheduleActionSettings",
+          "locationName": "hlsId3SegmentTaggingSettings",
+          "documentation": "Action to insert HLS ID3 segment tagging"
+        },
         "HlsTimedMetadataSettings": {
           "shape": "HlsTimedMetadataScheduleActionSettings",
           "locationName": "hlsTimedMetadataSettings",
@@ -9167,6 +10891,77 @@
       },
       "documentation": "Placeholder documentation for StartChannelResponse"
     },
+    "StartMultiplexRequest": {
+      "type": "structure",
+      "members": {
+        "MultiplexId": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "multiplexId",
+          "documentation": "The ID of the multiplex."
+        }
+      },
+      "required": [
+        "MultiplexId"
+      ],
+      "documentation": "Placeholder documentation for StartMultiplexRequest"
+    },
+    "StartMultiplexResponse": {
+      "type": "structure",
+      "members": {
+        "Arn": {
+          "shape": "__string",
+          "locationName": "arn",
+          "documentation": "The unique arn of the multiplex."
+        },
+        "AvailabilityZones": {
+          "shape": "__listOf__string",
+          "locationName": "availabilityZones",
+          "documentation": "A list of availability zones for the multiplex."
+        },
+        "Destinations": {
+          "shape": "__listOfMultiplexOutputDestination",
+          "locationName": "destinations",
+          "documentation": "A list of the multiplex output destinations."
+        },
+        "Id": {
+          "shape": "__string",
+          "locationName": "id",
+          "documentation": "The unique id of the multiplex."
+        },
+        "MultiplexSettings": {
+          "shape": "MultiplexSettings",
+          "locationName": "multiplexSettings",
+          "documentation": "Configuration for a multiplex event."
+        },
+        "Name": {
+          "shape": "__string",
+          "locationName": "name",
+          "documentation": "The name of the multiplex."
+        },
+        "PipelinesRunningCount": {
+          "shape": "__integer",
+          "locationName": "pipelinesRunningCount",
+          "documentation": "The number of currently healthy pipelines."
+        },
+        "ProgramCount": {
+          "shape": "__integer",
+          "locationName": "programCount",
+          "documentation": "The number of programs in the multiplex."
+        },
+        "State": {
+          "shape": "MultiplexState",
+          "locationName": "state",
+          "documentation": "The current state of the multiplex."
+        },
+        "Tags": {
+          "shape": "Tags",
+          "locationName": "tags",
+          "documentation": "A collection of key-value pairs."
+        }
+      },
+      "documentation": "Placeholder documentation for StartMultiplexResponse"
+    },
     "StartTimecode": {
       "type": "structure",
       "members": {
@@ -9365,6 +11160,77 @@
       },
       "documentation": "Placeholder documentation for StopChannelResponse"
     },
+    "StopMultiplexRequest": {
+      "type": "structure",
+      "members": {
+        "MultiplexId": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "multiplexId",
+          "documentation": "The ID of the multiplex."
+        }
+      },
+      "required": [
+        "MultiplexId"
+      ],
+      "documentation": "Placeholder documentation for StopMultiplexRequest"
+    },
+    "StopMultiplexResponse": {
+      "type": "structure",
+      "members": {
+        "Arn": {
+          "shape": "__string",
+          "locationName": "arn",
+          "documentation": "The unique arn of the multiplex."
+        },
+        "AvailabilityZones": {
+          "shape": "__listOf__string",
+          "locationName": "availabilityZones",
+          "documentation": "A list of availability zones for the multiplex."
+        },
+        "Destinations": {
+          "shape": "__listOfMultiplexOutputDestination",
+          "locationName": "destinations",
+          "documentation": "A list of the multiplex output destinations."
+        },
+        "Id": {
+          "shape": "__string",
+          "locationName": "id",
+          "documentation": "The unique id of the multiplex."
+        },
+        "MultiplexSettings": {
+          "shape": "MultiplexSettings",
+          "locationName": "multiplexSettings",
+          "documentation": "Configuration for a multiplex event."
+        },
+        "Name": {
+          "shape": "__string",
+          "locationName": "name",
+          "documentation": "The name of the multiplex."
+        },
+        "PipelinesRunningCount": {
+          "shape": "__integer",
+          "locationName": "pipelinesRunningCount",
+          "documentation": "The number of currently healthy pipelines."
+        },
+        "ProgramCount": {
+          "shape": "__integer",
+          "locationName": "programCount",
+          "documentation": "The number of programs in the multiplex."
+        },
+        "State": {
+          "shape": "MultiplexState",
+          "locationName": "state",
+          "documentation": "The current state of the multiplex."
+        },
+        "Tags": {
+          "shape": "Tags",
+          "locationName": "tags",
+          "documentation": "A collection of key-value pairs."
+        }
+      },
+      "documentation": "Placeholder documentation for StopMultiplexResponse"
+    },
     "StopTimecode": {
       "type": "structure",
       "members": {
@@ -9877,6 +11743,129 @@
       },
       "documentation": "Placeholder documentation for UpdateInputSecurityGroupResultModel"
     },
+    "UpdateMultiplex": {
+      "type": "structure",
+      "members": {
+        "MultiplexSettings": {
+          "shape": "MultiplexSettings",
+          "locationName": "multiplexSettings",
+          "documentation": "The new settings for a multiplex."
+        },
+        "Name": {
+          "shape": "__string",
+          "locationName": "name",
+          "documentation": "Name of the multiplex."
+        }
+      },
+      "documentation": "Placeholder documentation for UpdateMultiplex"
+    },
+    "UpdateMultiplexProgram": {
+      "type": "structure",
+      "members": {
+        "MultiplexProgramSettings": {
+          "shape": "MultiplexProgramSettings",
+          "locationName": "multiplexProgramSettings",
+          "documentation": "The new settings for a multiplex program."
+        }
+      },
+      "documentation": "Placeholder documentation for UpdateMultiplexProgram"
+    },
+    "UpdateMultiplexProgramRequest": {
+      "type": "structure",
+      "members": {
+        "MultiplexId": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "multiplexId",
+          "documentation": "The ID of the multiplex of the program to update."
+        },
+        "MultiplexProgramSettings": {
+          "shape": "MultiplexProgramSettings",
+          "locationName": "multiplexProgramSettings",
+          "documentation": "The new settings for a multiplex program."
+        },
+        "ProgramName": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "programName",
+          "documentation": "The name of the program to update."
+        }
+      },
+      "documentation": "A request to update a program in a multiplex.",
+      "required": [
+        "MultiplexId",
+        "ProgramName"
+      ]
+    },
+    "UpdateMultiplexProgramResponse": {
+      "type": "structure",
+      "members": {
+        "MultiplexProgram": {
+          "shape": "MultiplexProgram",
+          "locationName": "multiplexProgram",
+          "documentation": "The updated multiplex program."
+        }
+      },
+      "documentation": "Placeholder documentation for UpdateMultiplexProgramResponse"
+    },
+    "UpdateMultiplexProgramResultModel": {
+      "type": "structure",
+      "members": {
+        "MultiplexProgram": {
+          "shape": "MultiplexProgram",
+          "locationName": "multiplexProgram",
+          "documentation": "The updated multiplex program."
+        }
+      },
+      "documentation": "Placeholder documentation for UpdateMultiplexProgramResultModel"
+    },
+    "UpdateMultiplexRequest": {
+      "type": "structure",
+      "members": {
+        "MultiplexId": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "multiplexId",
+          "documentation": "ID of the multiplex to update."
+        },
+        "MultiplexSettings": {
+          "shape": "MultiplexSettings",
+          "locationName": "multiplexSettings",
+          "documentation": "The new settings for a multiplex."
+        },
+        "Name": {
+          "shape": "__string",
+          "locationName": "name",
+          "documentation": "Name of the multiplex."
+        }
+      },
+      "documentation": "A request to update a multiplex.",
+      "required": [
+        "MultiplexId"
+      ]
+    },
+    "UpdateMultiplexResponse": {
+      "type": "structure",
+      "members": {
+        "Multiplex": {
+          "shape": "Multiplex",
+          "locationName": "multiplex",
+          "documentation": "The updated multiplex."
+        }
+      },
+      "documentation": "Placeholder documentation for UpdateMultiplexResponse"
+    },
+    "UpdateMultiplexResultModel": {
+      "type": "structure",
+      "members": {
+        "Multiplex": {
+          "shape": "Multiplex",
+          "locationName": "multiplex",
+          "documentation": "The updated multiplex."
+        }
+      },
+      "documentation": "Placeholder documentation for UpdateMultiplexResultModel"
+    },
     "UpdateReservation": {
       "type": "structure",
       "members": {
@@ -10113,22 +12102,10 @@
       "type": "double",
       "documentation": "Placeholder documentation for __doubleMin0"
     },
-    "__doubleMin0Max1000000000": {
-      "type": "double",
-      "documentation": "Placeholder documentation for __doubleMin0Max1000000000"
-    },
-    "__doubleMin0Max65535": {
-      "type": "double",
-      "documentation": "Placeholder documentation for __doubleMin0Max65535"
-    },
     "__doubleMin1": {
       "type": "double",
       "documentation": "Placeholder documentation for __doubleMin1"
     },
-    "__doubleMin10000Max1000000000": {
-      "type": "double",
-      "documentation": "Placeholder documentation for __doubleMin10000Max1000000000"
-    },
     "__doubleMinNegative59Max0": {
       "type": "double",
       "documentation": "Placeholder documentation for __doubleMinNegative59Max0"
@@ -10172,6 +12149,12 @@
       "max": 1000000,
       "documentation": "Placeholder documentation for __integerMin0Max1000000"
     },
+    "__integerMin0Max100000000": {
+      "type": "integer",
+      "min": 0,
+      "max": 100000000,
+      "documentation": "Placeholder documentation for __integerMin0Max100000000"
+    },
     "__integerMin0Max128": {
       "type": "integer",
       "min": 0,
@@ -10254,6 +12237,12 @@
       "min": 1000,
       "documentation": "Placeholder documentation for __integerMin1000"
     },
+    "__integerMin1000000Max100000000": {
+      "type": "integer",
+      "min": 1000000,
+      "max": 100000000,
+      "documentation": "Placeholder documentation for __integerMin1000000Max100000000"
+    },
     "__integerMin100000Max100000000": {
       "type": "integer",
       "min": 100000,
@@ -10272,6 +12261,12 @@
       "max": 80000000,
       "documentation": "Placeholder documentation for __integerMin100000Max80000000"
     },
+    "__integerMin1000Max3000": {
+      "type": "integer",
+      "min": 1000,
+      "max": 3000,
+      "documentation": "Placeholder documentation for __integerMin1000Max3000"
+    },
     "__integerMin1000Max30000": {
       "type": "integer",
       "min": 1000,
@@ -10320,11 +12315,11 @@
       "max": 32,
       "documentation": "Placeholder documentation for __integerMin1Max32"
     },
-    "__integerMin1Max3600": {
+    "__integerMin1Max3600000": {
       "type": "integer",
       "min": 1,
-      "max": 3600,
-      "documentation": "Placeholder documentation for __integerMin1Max3600"
+      "max": 3600000,
+      "documentation": "Placeholder documentation for __integerMin1Max3600000"
     },
     "__integerMin1Max4": {
       "type": "integer",
@@ -10556,6 +12551,34 @@
       },
       "documentation": "Placeholder documentation for __listOfMediaPackageOutputDestinationSettings"
     },
+    "__listOfMultiplexOutputDestination": {
+      "type": "list",
+      "member": {
+        "shape": "MultiplexOutputDestination"
+      },
+      "documentation": "Placeholder documentation for __listOfMultiplexOutputDestination"
+    },
+    "__listOfMultiplexProgramSummary": {
+      "type": "list",
+      "member": {
+        "shape": "MultiplexProgramSummary"
+      },
+      "documentation": "Placeholder documentation for __listOfMultiplexProgramSummary"
+    },
+    "__listOfMultiplexSummary": {
+      "type": "list",
+      "member": {
+        "shape": "MultiplexSummary"
+      },
+      "documentation": "Placeholder documentation for __listOfMultiplexSummary"
+    },
+    "__listOfMultiplexValidationError": {
+      "type": "list",
+      "member": {
+        "shape": "MultiplexValidationError"
+      },
+      "documentation": "Placeholder documentation for __listOfMultiplexValidationError"
+    },
     "__listOfOffering": {
       "type": "list",
       "member": {
@@ -10640,6 +12663,13 @@
       },
       "documentation": "Placeholder documentation for __listOfVideoDescription"
     },
+    "__listOf__integer": {
+      "type": "list",
+      "member": {
+        "shape": "__integer"
+      },
+      "documentation": "Placeholder documentation for __listOf__integer"
+    },
     "__listOf__string": {
       "type": "list",
       "member": {
diff --git a/services/medialive/src/main/resources/codegen-resources/waiters-2.json b/services/medialive/src/main/resources/codegen-resources/waiters-2.json
index 937213813898..6b9f74cbce8e 100644
--- a/services/medialive/src/main/resources/codegen-resources/waiters-2.json
+++ b/services/medialive/src/main/resources/codegen-resources/waiters-2.json
@@ -106,6 +106,112 @@
           "expected": 500
         }
       ]
+    },
+    "MultiplexCreated": {
+      "description": "Wait until a multiplex has been created",
+      "operation": "DescribeMultiplex",
+      "delay": 3,
+      "maxAttempts": 5,
+      "acceptors": [
+        {
+          "state": "success",
+          "matcher": "path",
+          "argument": "State",
+          "expected": "IDLE"
+        },
+        {
+          "state": "retry",
+          "matcher": "path",
+          "argument": "State",
+          "expected": "CREATING"
+        },
+        {
+          "state": "retry",
+          "matcher": "status",
+          "expected": 500
+        },
+        {
+          "state": "failure",
+          "matcher": "path",
+          "argument": "State",
+          "expected": "CREATE_FAILED"
+        }
+      ]
+    },
+    "MultiplexRunning": {
+      "description": "Wait until a multiplex is running",
+      "operation": "DescribeMultiplex",
+      "delay": 5,
+      "maxAttempts": 120,
+      "acceptors": [
+        {
+          "state": "success",
+          "matcher": "path",
+          "argument": "State",
+          "expected": "RUNNING"
+        },
+        {
+          "state": "retry",
+          "matcher": "path",
+          "argument": "State",
+          "expected": "STARTING"
+        },
+        {
+          "state": "retry",
+          "matcher": "status",
+          "expected": 500
+        }
+      ]
+    },
+    "MultiplexStopped": {
+      "description": "Wait until a multiplex has is stopped",
+      "operation": "DescribeMultiplex",
+      "delay": 5,
+      "maxAttempts": 28,
+      "acceptors": [
+        {
+          "state": "success",
+          "matcher": "path",
+          "argument": "State",
+          "expected": "IDLE"
+        },
+        {
+          "state": "retry",
+          "matcher": "path",
+          "argument": "State",
+          "expected": "STOPPING"
+        },
+        {
+          "state": "retry",
+          "matcher": "status",
+          "expected": 500
+        }
+      ]
+    },
+    "MultiplexDeleted": {
+      "description": "Wait until a multiplex has been deleted",
+      "operation": "DescribeMultiplex",
+      "delay": 5,
+      "maxAttempts": 20,
+      "acceptors": [
+        {
+          "state": "success",
+          "matcher": "path",
+          "argument": "State",
+          "expected": "DELETED"
+        },
+        {
+          "state": "retry",
+          "matcher": "path",
+          "argument": "State",
+          "expected": "DELETING"
+        },
+        {
+          "state": "retry",
+          "matcher": "status",
+          "expected": 500
+        }
+      ]
     }
   }
 }
diff --git a/services/mediapackage/pom.xml b/services/mediapackage/pom.xml
index 2a9ec35aeab7..e8c4ce3eec4b 100644
--- a/services/mediapackage/pom.xml
+++ b/services/mediapackage/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>services</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>mediapackage</artifactId>
diff --git a/services/mediapackage/src/main/resources/codegen-resources/service-2.json b/services/mediapackage/src/main/resources/codegen-resources/service-2.json
index e8f590b1f658..a1fb2c185037 100644
--- a/services/mediapackage/src/main/resources/codegen-resources/service-2.json
+++ b/services/mediapackage/src/main/resources/codegen-resources/service-2.json
@@ -622,6 +622,26 @@
       ],
       "type": "string"
     },
+    "Authorization": {
+      "documentation": "CDN Authorization credentials",
+      "members": {
+        "CdnIdentifierSecret": {
+          "documentation": "The Amazon Resource Name (ARN) for the secret in Secrets Manager that your Content Distribution Network (CDN) uses for authorization to access your endpoint.\n",
+          "locationName": "cdnIdentifierSecret",
+          "shape": "__string"
+        },
+        "SecretsRoleArn": {
+          "documentation": "The Amazon Resource Name (ARN) for the IAM role that allows MediaPackage to communicate with AWS Secrets Manager.\n",
+          "locationName": "secretsRoleArn",
+          "shape": "__string"
+        }
+      },
+      "required": [
+        "SecretsRoleArn",
+        "CdnIdentifierSecret"
+      ],
+      "type": "structure"
+    },
     "Channel": {
       "documentation": "A Channel resource configuration.",
       "members": {
@@ -917,6 +937,10 @@
     "CreateOriginEndpointRequest": {
       "documentation": "Configuration parameters used to create a new OriginEndpoint.",
       "members": {
+        "Authorization": {
+          "locationName": "authorization",
+          "shape": "Authorization"
+        },
         "ChannelId": {
           "documentation": "The ID of the Channel that the OriginEndpoint will be associated with.\nThis cannot be changed after the OriginEndpoint is created.\n",
           "locationName": "channelId",
@@ -991,6 +1015,10 @@
           "locationName": "arn",
           "shape": "__string"
         },
+        "Authorization": {
+          "locationName": "authorization",
+          "shape": "Authorization"
+        },
         "ChannelId": {
           "documentation": "The ID of the Channel the OriginEndpoint is associated with.",
           "locationName": "channelId",
@@ -1306,6 +1334,10 @@
           "locationName": "arn",
           "shape": "__string"
         },
+        "Authorization": {
+          "locationName": "authorization",
+          "shape": "Authorization"
+        },
         "ChannelId": {
           "documentation": "The ID of the Channel the OriginEndpoint is associated with.",
           "locationName": "channelId",
@@ -1947,6 +1979,10 @@
           "locationName": "arn",
           "shape": "__string"
         },
+        "Authorization": {
+          "locationName": "authorization",
+          "shape": "Authorization"
+        },
         "ChannelId": {
           "documentation": "The ID of the Channel the OriginEndpoint is associated with.",
           "locationName": "channelId",
@@ -2018,6 +2054,10 @@
     "OriginEndpointCreateParameters": {
       "documentation": "Configuration parameters for a new OriginEndpoint.",
       "members": {
+        "Authorization": {
+          "locationName": "authorization",
+          "shape": "Authorization"
+        },
         "ChannelId": {
           "documentation": "The ID of the Channel that the OriginEndpoint will be associated with.\nThis cannot be changed after the OriginEndpoint is created.\n",
           "locationName": "channelId",
@@ -2080,8 +2120,8 @@
         }
       },
       "required": [
-        "Id",
-        "ChannelId"
+        "ChannelId",
+        "Id"
       ],
       "type": "structure"
     },
@@ -2104,6 +2144,10 @@
     "OriginEndpointUpdateParameters": {
       "documentation": "Configuration parameters for updating an existing OriginEndpoint.",
       "members": {
+        "Authorization": {
+          "locationName": "authorization",
+          "shape": "Authorization"
+        },
         "CmafPackage": {
           "locationName": "cmafPackage",
           "shape": "CmafPackageCreateOrUpdateParameters"
@@ -2529,6 +2573,10 @@
     "UpdateOriginEndpointRequest": {
       "documentation": "Configuration parameters used to update an existing OriginEndpoint.",
       "members": {
+        "Authorization": {
+          "locationName": "authorization",
+          "shape": "Authorization"
+        },
         "CmafPackage": {
           "locationName": "cmafPackage",
           "shape": "CmafPackageCreateOrUpdateParameters"
@@ -2594,6 +2642,10 @@
           "locationName": "arn",
           "shape": "__string"
         },
+        "Authorization": {
+          "locationName": "authorization",
+          "shape": "Authorization"
+        },
         "ChannelId": {
           "documentation": "The ID of the Channel the OriginEndpoint is associated with.",
           "locationName": "channelId",
@@ -2754,4 +2806,4 @@
       "type": "string"
     }
   }
-}
\ No newline at end of file
+}
diff --git a/services/mediapackagevod/pom.xml b/services/mediapackagevod/pom.xml
index 27550ef3b1d3..8e96b9c09408 100644
--- a/services/mediapackagevod/pom.xml
+++ b/services/mediapackagevod/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>mediapackagevod</artifactId>
     <name>AWS Java SDK :: Services :: MediaPackage Vod</name>
diff --git a/services/mediapackagevod/src/main/resources/codegen-resources/service-2.json b/services/mediapackagevod/src/main/resources/codegen-resources/service-2.json
index b38e47db82dc..784753939cbd 100644
--- a/services/mediapackagevod/src/main/resources/codegen-resources/service-2.json
+++ b/services/mediapackagevod/src/main/resources/codegen-resources/service-2.json
@@ -463,6 +463,11 @@
           "locationName": "arn",
           "shape": "__string"
         },
+        "CreatedAt": {
+          "documentation": "The time the Asset was initially submitted for Ingest.",
+          "locationName": "createdAt",
+          "shape": "__string"
+        },
         "EgressEndpoints": {
           "documentation": "The list of egress endpoints available for the Asset.",
           "locationName": "egressEndpoints",
@@ -557,6 +562,11 @@
           "locationName": "arn",
           "shape": "__string"
         },
+        "CreatedAt": {
+          "documentation": "The time the Asset was initially submitted for Ingest.",
+          "locationName": "createdAt",
+          "shape": "__string"
+        },
         "Id": {
           "documentation": "The unique identifier for the Asset.",
           "locationName": "id",
@@ -665,6 +675,11 @@
           "locationName": "arn",
           "shape": "__string"
         },
+        "CreatedAt": {
+          "documentation": "The time the Asset was initially submitted for Ingest.",
+          "locationName": "createdAt",
+          "shape": "__string"
+        },
         "EgressEndpoints": {
           "documentation": "The list of egress endpoints available for the Asset.",
           "locationName": "egressEndpoints",
@@ -791,6 +806,11 @@
           "locationName": "arn",
           "shape": "__string"
         },
+        "DomainName": {
+          "documentation": "The fully qualified domain name for Assets in the PackagingGroup.",
+          "locationName": "domainName",
+          "shape": "__string"
+        },
         "Id": {
           "documentation": "The ID of the PackagingGroup.",
           "locationName": "id",
@@ -815,6 +835,11 @@
     "DashManifest": {
       "documentation": "A DASH manifest configuration.",
       "members": {
+        "ManifestLayout": {
+          "documentation": "Determines the position of some tags in the Media Presentation Description (MPD).  When set to FULL, elements like SegmentTemplate and ContentProtection are included in each Representation.  When set to COMPACT, duplicate elements are combined and presented at the AdaptationSet level.",
+          "locationName": "manifestLayout",
+          "shape": "ManifestLayout"
+        },
         "ManifestName": {
           "documentation": "An optional string to include in the name of the manifest.",
           "locationName": "manifestName",
@@ -849,10 +874,20 @@
           "locationName": "encryption",
           "shape": "DashEncryption"
         },
+        "PeriodTriggers": {
+          "documentation": "A list of triggers that controls when the outgoing Dynamic Adaptive Streaming over HTTP (DASH)\nMedia Presentation Description (MPD) will be partitioned into multiple periods. If empty, the content will not\nbe partitioned into more than one period. If the list contains \"ADS\", new periods will be created where\nthe Asset contains SCTE-35 ad markers.\n",
+          "locationName": "periodTriggers",
+          "shape": "__listOf__PeriodTriggersElement"
+        },
         "SegmentDurationSeconds": {
           "documentation": "Duration (in seconds) of each segment. Actual segments will be\nrounded to the nearest multiple of the source segment duration.\n",
           "locationName": "segmentDurationSeconds",
           "shape": "__integer"
+        },
+        "SegmentTemplateFormat": {
+          "documentation": "Determines the type of SegmentTemplate included in the Media Presentation Description (MPD).  When set to NUMBER_WITH_TIMELINE, a full timeline is presented in each SegmentTemplate, with $Number$ media URLs.  When set to TIME_WITH_TIMELINE, a full timeline is presented in each SegmentTemplate, with $Time$ media URLs. When set to NUMBER_WITH_DURATION, only a duration is included in each SegmentTemplate, with $Number$ media URLs.",
+          "locationName": "segmentTemplateFormat",
+          "shape": "SegmentTemplateFormat"
         }
       },
       "required": [
@@ -935,6 +970,11 @@
           "locationName": "arn",
           "shape": "__string"
         },
+        "CreatedAt": {
+          "documentation": "The time the Asset was initially submitted for Ingest.",
+          "locationName": "createdAt",
+          "shape": "__string"
+        },
         "EgressEndpoints": {
           "documentation": "The list of egress endpoints available for the Asset.",
           "locationName": "egressEndpoints",
@@ -1039,6 +1079,11 @@
           "locationName": "arn",
           "shape": "__string"
         },
+        "DomainName": {
+          "documentation": "The fully qualified domain name for Assets in the PackagingGroup.",
+          "locationName": "domainName",
+          "shape": "__string"
+        },
         "Id": {
           "documentation": "The ID of the PackagingGroup.",
           "locationName": "id",
@@ -1292,6 +1337,13 @@
       },
       "type": "structure"
     },
+    "ManifestLayout": {
+      "enum": [
+        "FULL",
+        "COMPACT"
+      ],
+      "type": "string"
+    },
     "MaxResults": {
       "max": 1000,
       "min": 1,
@@ -1459,6 +1511,11 @@
           "locationName": "arn",
           "shape": "__string"
         },
+        "DomainName": {
+          "documentation": "The fully qualified domain name for Assets in the PackagingGroup.",
+          "locationName": "domainName",
+          "shape": "__string"
+        },
         "Id": {
           "documentation": "The ID of the PackagingGroup.",
           "locationName": "id",
@@ -1504,6 +1561,14 @@
       ],
       "type": "string"
     },
+    "SegmentTemplateFormat": {
+      "enum": [
+        "NUMBER_WITH_TIMELINE",
+        "TIME_WITH_TIMELINE",
+        "NUMBER_WITH_DURATION"
+      ],
+      "type": "string"
+    },
     "ServiceUnavailableException": {
       "documentation": "An unexpected error occurred.",
       "error": {
@@ -1601,6 +1666,12 @@
       },
       "type": "structure"
     },
+    "__PeriodTriggersElement": {
+      "enum": [
+        "ADS"
+      ],
+      "type": "string"
+    },
     "__boolean": {
       "type": "boolean"
     },
@@ -1652,6 +1723,12 @@
       },
       "type": "list"
     },
+    "__listOf__PeriodTriggersElement": {
+      "member": {
+        "shape": "__PeriodTriggersElement"
+      },
+      "type": "list"
+    },
     "__listOf__string": {
       "member": {
         "shape": "__string"
diff --git a/services/mediastore/pom.xml b/services/mediastore/pom.xml
index 5d932441b48e..d3d09389dc09 100644
--- a/services/mediastore/pom.xml
+++ b/services/mediastore/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>services</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>mediastore</artifactId>
diff --git a/services/mediastore/src/main/resources/codegen-resources/service-2.json b/services/mediastore/src/main/resources/codegen-resources/service-2.json
index af202889e229..f401828a9ddb 100644
--- a/services/mediastore/src/main/resources/codegen-resources/service-2.json
+++ b/services/mediastore/src/main/resources/codegen-resources/service-2.json
@@ -92,6 +92,22 @@
       ],
       "documentation":"<p>Removes an object lifecycle policy from a container. It takes up to 20 minutes for the change to take effect.</p>"
     },
+    "DeleteMetricPolicy":{
+      "name":"DeleteMetricPolicy",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DeleteMetricPolicyInput"},
+      "output":{"shape":"DeleteMetricPolicyOutput"},
+      "errors":[
+        {"shape":"ContainerInUseException"},
+        {"shape":"ContainerNotFoundException"},
+        {"shape":"PolicyNotFoundException"},
+        {"shape":"InternalServerError"}
+      ],
+      "documentation":"<p>Deletes the metric policy that is associated with the specified container. If there is no metric policy associated with the container, MediaStore doesn't send metrics to CloudWatch.</p>"
+    },
     "DescribeContainer":{
       "name":"DescribeContainer",
       "http":{
@@ -154,6 +170,22 @@
       ],
       "documentation":"<p>Retrieves the object lifecycle policy that is assigned to a container.</p>"
     },
+    "GetMetricPolicy":{
+      "name":"GetMetricPolicy",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"GetMetricPolicyInput"},
+      "output":{"shape":"GetMetricPolicyOutput"},
+      "errors":[
+        {"shape":"ContainerNotFoundException"},
+        {"shape":"PolicyNotFoundException"},
+        {"shape":"ContainerInUseException"},
+        {"shape":"InternalServerError"}
+      ],
+      "documentation":"<p>Returns the metric policy for the specified container. </p>"
+    },
     "ListContainers":{
       "name":"ListContainers",
       "http":{
@@ -227,6 +259,21 @@
       ],
       "documentation":"<p>Writes an object lifecycle policy to a container. If the container already has an object lifecycle policy, the service replaces the existing policy with the new policy. It takes up to 20 minutes for the change to take effect.</p> <p>For information about how to construct an object lifecycle policy, see <a href=\"https://docs.aws.amazon.com/mediastore/latest/ug/policies-object-lifecycle-components.html\">Components of an Object Lifecycle Policy</a>.</p>"
     },
+    "PutMetricPolicy":{
+      "name":"PutMetricPolicy",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"PutMetricPolicyInput"},
+      "output":{"shape":"PutMetricPolicyOutput"},
+      "errors":[
+        {"shape":"ContainerInUseException"},
+        {"shape":"ContainerNotFoundException"},
+        {"shape":"InternalServerError"}
+      ],
+      "documentation":"<p>The metric policy that you want to add to the container. A metric policy allows AWS Elemental MediaStore to send metrics to Amazon CloudWatch. It takes up to 20 minutes for the new policy to take effect.</p>"
+    },
     "StartAccessLogging":{
       "name":"StartAccessLogging",
       "http":{
@@ -270,7 +317,7 @@
         {"shape":"ContainerNotFoundException"},
         {"shape":"InternalServerError"}
       ],
-      "documentation":"<p>Adds tags to the specified AWS Elemental MediaStore container. Tags are key:value pairs that you can associate with AWS resources. For example, the tag key might be \"customer\" and the tag value might be \"companyA.\" You can specify one or more tags to add to each container. You can add up to 50 tags to each container. For more information about tagging, including naming and usage conventions, see <a href=\"https://aws.amazon.com/documentation/mediastore/tagging\">Tagging Resources in MediaStore</a>.</p>"
+      "documentation":"<p>Adds tags to the specified AWS Elemental MediaStore container. Tags are key:value pairs that you can associate with AWS resources. For example, the tag key might be \"customer\" and the tag value might be \"companyA.\" You can specify one or more tags to add to each container. You can add up to 50 tags to each container. For more information about tagging, including naming and usage conventions, see <a href=\"https://docs.aws.amazon.com/mediastore/latest/ug/tagging.html\">Tagging Resources in MediaStore</a>.</p>"
     },
     "UntagResource":{
       "name":"UntagResource",
@@ -352,6 +399,13 @@
       "documentation":"<p>The container that you specified in the request already exists or is being updated.</p>",
       "exception":true
     },
+    "ContainerLevelMetrics":{
+      "type":"string",
+      "enum":[
+        "ENABLED",
+        "DISABLED"
+      ]
+    },
     "ContainerList":{
       "type":"list",
       "member":{"shape":"Container"}
@@ -446,7 +500,7 @@
         },
         "Tags":{
           "shape":"TagList",
-          "documentation":"<p>An array of key:value pairs that you define. These values can be anything that you want. Typically, the tag key represents a category (such as \"environment\") and the tag value represents a specific value within that category (such as \"test,\" \"development,\" or \"production\"). You can add up to 50 tags to each container. For more information about tagging, including naming and usage conventions, see <a href=\"https://aws.amazon.com/documentation/mediastore/tagging\">Tagging Resources in MediaStore</a>.</p>"
+          "documentation":"<p>An array of key:value pairs that you define. These values can be anything that you want. Typically, the tag key represents a category (such as \"environment\") and the tag value represents a specific value within that category (such as \"test,\" \"development,\" or \"production\"). You can add up to 50 tags to each container. For more information about tagging, including naming and usage conventions, see <a href=\"https://docs.aws.amazon.com/mediastore/latest/ug/tagging.html\">Tagging Resources in MediaStore</a>.</p>"
         }
       }
     },
@@ -520,6 +574,21 @@
       "members":{
       }
     },
+    "DeleteMetricPolicyInput":{
+      "type":"structure",
+      "required":["ContainerName"],
+      "members":{
+        "ContainerName":{
+          "shape":"ContainerName",
+          "documentation":"<p>The name of the container that is associated with the metric policy that you want to delete.</p>"
+        }
+      }
+    },
+    "DeleteMetricPolicyOutput":{
+      "type":"structure",
+      "members":{
+      }
+    },
     "DescribeContainerInput":{
       "type":"structure",
       "members":{
@@ -541,7 +610,8 @@
     "Endpoint":{
       "type":"string",
       "max":255,
-      "min":1
+      "min":1,
+      "pattern":"[\\u0009\\u000A\\u000D\\u0020-\\u00FF]+"
     },
     "ErrorMessage":{
       "type":"string",
@@ -615,6 +685,26 @@
         }
       }
     },
+    "GetMetricPolicyInput":{
+      "type":"structure",
+      "required":["ContainerName"],
+      "members":{
+        "ContainerName":{
+          "shape":"ContainerName",
+          "documentation":"<p>The name of the container that is associated with the metric policy.</p>"
+        }
+      }
+    },
+    "GetMetricPolicyOutput":{
+      "type":"structure",
+      "required":["MetricPolicy"],
+      "members":{
+        "MetricPolicy":{
+          "shape":"MetricPolicy",
+          "documentation":"<p>The metric policy that is associated with the specific container.</p>"
+        }
+      }
+    },
     "Header":{
       "type":"string",
       "max":8192,
@@ -704,6 +794,57 @@
         "HEAD"
       ]
     },
+    "MetricPolicy":{
+      "type":"structure",
+      "required":["ContainerLevelMetrics"],
+      "members":{
+        "ContainerLevelMetrics":{
+          "shape":"ContainerLevelMetrics",
+          "documentation":"<p>A setting to enable or disable metrics at the container level.</p>"
+        },
+        "MetricPolicyRules":{
+          "shape":"MetricPolicyRules",
+          "documentation":"<p>A parameter that holds an array of rules that enable metrics at the object level. This parameter is optional, but if you choose to include it, you must also include at least one rule. By default, you can include up to five rules. You can also <a href=\"https://console.aws.amazon.com/servicequotas/home?region=us-east-1#!/services/mediastore/quotas\">request a quota increase</a> to allow up to 300 rules per policy.</p>"
+        }
+      },
+      "documentation":"<p>The metric policy that is associated with the container. A metric policy allows AWS Elemental MediaStore to send metrics to Amazon CloudWatch. In the policy, you must indicate whether you want MediaStore to send container-level metrics. You can also include rules to define groups of objects that you want MediaStore to send object-level metrics for.</p> <p>To view examples of how to construct a metric policy for your use case, see <a href=\"https://docs.aws.amazon.com/mediastore/latest/ug/policies-metric-examples.html\">Example Metric Policies</a>.</p>"
+    },
+    "MetricPolicyRule":{
+      "type":"structure",
+      "required":[
+        "ObjectGroup",
+        "ObjectGroupName"
+      ],
+      "members":{
+        "ObjectGroup":{
+          "shape":"ObjectGroup",
+          "documentation":"<p>A path or file name that defines which objects to include in the group. Wildcards (*) are acceptable.</p>"
+        },
+        "ObjectGroupName":{
+          "shape":"ObjectGroupName",
+          "documentation":"<p>A name that allows you to refer to the object group.</p>"
+        }
+      },
+      "documentation":"<p>A setting that enables metrics at the object level. Each rule contains an object group and an object group name. If the policy includes the MetricPolicyRules parameter, you must include at least one rule. Each metric policy can include up to five rules by default. You can also <a href=\"https://console.aws.amazon.com/servicequotas/home?region=us-east-1#!/services/mediastore/quotas\">request a quota increase</a> to allow up to 300 rules per policy.</p>"
+    },
+    "MetricPolicyRules":{
+      "type":"list",
+      "member":{"shape":"MetricPolicyRule"},
+      "max":300,
+      "min":1
+    },
+    "ObjectGroup":{
+      "type":"string",
+      "max":900,
+      "min":1,
+      "pattern":"/?(?:[A-Za-z0-9_=:\\.\\-\\~\\*]+/){0,10}(?:[A-Za-z0-9_=:\\.\\-\\~\\*]+)?/?"
+    },
+    "ObjectGroupName":{
+      "type":"string",
+      "max":30,
+      "min":1,
+      "pattern":"[a-zA-Z0-9_]+"
+    },
     "Origin":{
       "type":"string",
       "max":2048,
@@ -790,6 +931,28 @@
       "members":{
       }
     },
+    "PutMetricPolicyInput":{
+      "type":"structure",
+      "required":[
+        "ContainerName",
+        "MetricPolicy"
+      ],
+      "members":{
+        "ContainerName":{
+          "shape":"ContainerName",
+          "documentation":"<p>The name of the container that you want to add the metric policy to.</p>"
+        },
+        "MetricPolicy":{
+          "shape":"MetricPolicy",
+          "documentation":"<p>The metric policy that you want to associate with the container. In the policy, you must indicate whether you want MediaStore to send container-level metrics. You can also include up to five rules to define groups of objects that you want MediaStore to send object-level metrics for. If you include rules in the policy, construct each rule with both of the following:</p> <ul> <li> <p>An object group that defines which objects to include in the group. The definition can be a path or a file name, but it can't have more than 900 characters. Valid characters are: a-z, A-Z, 0-9, _ (underscore), = (equal), : (colon), . (period), - (hyphen), ~ (tilde), / (forward slash), and * (asterisk). Wildcards (*) are acceptable.</p> </li> <li> <p>An object group name that allows you to refer to the object group. The name can't have more than 30 characters. Valid characters are: a-z, A-Z, 0-9, and _ (underscore).</p> </li> </ul>"
+        }
+      }
+    },
+    "PutMetricPolicyOutput":{
+      "type":"structure",
+      "members":{
+      }
+    },
     "StartAccessLoggingInput":{
       "type":"structure",
       "required":["ContainerName"],
@@ -822,6 +985,7 @@
     },
     "Tag":{
       "type":"structure",
+      "required":["Key"],
       "members":{
         "Key":{
           "shape":"TagKey",
@@ -832,12 +996,13 @@
           "documentation":"<p>Part of the key:value pair that defines a tag. You can use a tag value to describe a specific value within a category, such as \"companyA\" or \"companyB.\" Tag values are case-sensitive.</p>"
         }
       },
-      "documentation":"<p>A collection of tags associated with a container. Each tag consists of a key:value pair, which can be anything you define. Typically, the tag key represents a category (such as \"environment\") and the tag value represents a specific value within that category (such as \"test,\" \"development,\" or \"production\"). You can add up to 50 tags to each container. For more information about tagging, including naming and usage conventions, see <a href=\"https://aws.amazon.com/documentation/mediastore/tagging\">Tagging Resources in MediaStore</a>.</p>"
+      "documentation":"<p>A collection of tags associated with a container. Each tag consists of a key:value pair, which can be anything you define. Typically, the tag key represents a category (such as \"environment\") and the tag value represents a specific value within that category (such as \"test,\" \"development,\" or \"production\"). You can add up to 50 tags to each container. For more information about tagging, including naming and usage conventions, see <a href=\"https://docs.aws.amazon.com/mediastore/latest/ug/tagging.html\">Tagging Resources in MediaStore</a>.</p>"
     },
     "TagKey":{
       "type":"string",
       "max":128,
-      "min":1
+      "min":1,
+      "pattern":"[\\p{L}\\p{Z}\\p{N}_.:/=+\\-@]*"
     },
     "TagKeyList":{
       "type":"list",
@@ -845,7 +1010,9 @@
     },
     "TagList":{
       "type":"list",
-      "member":{"shape":"Tag"}
+      "member":{"shape":"Tag"},
+      "max":200,
+      "min":1
     },
     "TagResourceInput":{
       "type":"structure",
@@ -872,7 +1039,8 @@
     "TagValue":{
       "type":"string",
       "max":256,
-      "min":0
+      "min":0,
+      "pattern":"[\\p{L}\\p{Z}\\p{N}_.:/=+\\-@]*"
     },
     "TimeStamp":{"type":"timestamp"},
     "UntagResourceInput":{
diff --git a/services/mediastoredata/pom.xml b/services/mediastoredata/pom.xml
index e161276b20f3..0ceb09656795 100644
--- a/services/mediastoredata/pom.xml
+++ b/services/mediastoredata/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>services</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>mediastoredata</artifactId>
diff --git a/services/mediatailor/pom.xml b/services/mediatailor/pom.xml
index 7bd6574f71f6..63d8f68b1204 100644
--- a/services/mediatailor/pom.xml
+++ b/services/mediatailor/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>mediatailor</artifactId>
     <name>AWS Java SDK :: Services :: MediaTailor</name>
diff --git a/services/mediatailor/src/main/resources/codegen-resources/service-2.json b/services/mediatailor/src/main/resources/codegen-resources/service-2.json
index a1820ba2ea6d..69d38d5e7f32 100644
--- a/services/mediatailor/src/main/resources/codegen-resources/service-2.json
+++ b/services/mediatailor/src/main/resources/codegen-resources/service-2.json
@@ -253,11 +253,19 @@
                 "HlsConfiguration": {
                     "documentation": "<p>The configuration for HLS content. </p>", 
                     "shape": "HlsConfiguration"
-                }, 
+                },
+                "LivePreRollConfiguration" : {
+                    "shape" : "LivePreRollConfiguration",
+                    "documentation" : "<p>The configuration for pre-roll ad insertion.</p>"
+                },
                 "Name": {
                     "documentation": "<p>The identifier for the playback configuration.</p>", 
                     "shape": "__string"
                 }, 
+                "PersonalizationThresholdSeconds" : {
+                    "documentation": "<p>The maximum duration of underfilled ad time (in seconds) allowed in an ad break.</p>",
+                    "shape" : "__integerMin1"
+                }, 
                 "PlaybackConfigurationArn": {
                     "documentation": "<p>The Amazon Resource Name (ARN) for the playback configuration. </p>", 
                     "shape": "__string"
@@ -353,7 +361,7 @@
                 }
             }, 
             "type": "structure"
-        }, 
+        },
         "OriginManifestType": {
             "enum": [
                 "SINGLE_PERIOD", 
@@ -409,13 +417,31 @@
                     "documentation": "<p>The name that is used to associate this playback configuration with a custom transcode profile. This overrides the dynamic transcoding defaults of MediaTailor. Use this only if you have already set up custom profiles with the help of AWS Support.</p>", 
                     "shape": "__string"
                 }, 
+                "PersonalizationThresholdSeconds" : {
+                    "documentation": "<p>The maximum duration of underfilled ad time (in seconds) allowed in an ad break.</p>",
+                    "shape" : "__integerMin1"
+                }, 
                 "VideoContentSourceUrl": {
                     "documentation": "<p>The URL prefix for the master playlist for the stream, minus the asset ID. The maximum length is 512 characters.</p>", 
                     "shape": "__string"
                 }
             }, 
             "type": "structure"
-        }, 
+        },
+        "LivePreRollConfiguration" : {
+            "type" : "structure",
+            "members" : {
+                "AdDecisionServerUrl" : {
+                    "shape" : "__string",
+                    "documentation" : "<p>The URL for the ad decision server (ADS) for pre-roll ads. This includes the specification of static parameters and placeholders for dynamic parameters. AWS Elemental MediaTailor substitutes player-specific and session-specific parameters as needed when calling the ADS. Alternately, for testing, you can provide a static VAST URL. The maximum length is 25,000 characters.</p>"
+                },
+                "MaxDurationSeconds" : {
+                    "shape" : "__integer",
+                    "documentation" : "The maximum allowed duration for the pre-roll ad avail. AWS Elemental MediaTailor won't play pre-roll ads to exceed this duration, regardless of the total duration of ads that the ADS returns."
+                }
+            },
+            "documentation" : "<p>The configuration for pre-roll ad insertion.</p>"
+        },
         "PutPlaybackConfigurationRequest": {
             "members": {
                 "AdDecisionServerUrl": {
@@ -429,11 +455,19 @@
                 "DashConfiguration": {
                     "documentation": "<p>The configuration for DASH content. </p>", 
                     "shape": "DashConfigurationForPut"
-                }, 
+                },
+                "LivePreRollConfiguration" : {
+                    "shape" : "LivePreRollConfiguration",
+                    "documentation" : "<p>The configuration for pre-roll ad insertion.</p>"
+                },
                 "Name": {
                     "documentation": "<p>The identifier for the playback configuration.</p>", 
                     "shape": "__string"
                 }, 
+                "PersonalizationThresholdSeconds" : {
+                    "documentation": "<p>The maximum duration of underfilled ad time (in seconds) allowed in an ad break.</p>",
+                    "shape" : "__integerMin1"
+                }, 
                 "SlateAdUrl": {
                     "documentation": "<p>The URL for a high-quality video asset to transcode and use to fill in time that's not used by ads. AWS Elemental MediaTailor shows the slate to fill in gaps in media content. Configuring the slate is optional for non-VPAID configurations. For VPAID, the slate is required because MediaTailor provides it in the slots that are designated for dynamic ad content. The slate must be a high-quality asset that contains both audio and video. </p>", 
                     "shape": "__string"
@@ -471,10 +505,18 @@
                 "HlsConfiguration": {
                     "documentation": "<p>The configuration for HLS content. </p>", 
                     "shape": "HlsConfiguration"
-                }, 
+                },
+                "LivePreRollConfiguration" : {
+                    "shape" : "LivePreRollConfiguration",
+                    "documentation" : "<p>The configuration for pre-roll ad insertion.</p>"
+                },
                 "Name": {
                     "documentation": "<p>The identifier for the playback configuration.</p>", 
                     "shape": "__string"
+                },
+                "PersonalizationThresholdSeconds" : {
+                    "documentation": "<p>The maximum duration of underfilled ad time (in seconds) allowed in an ad break.</p>",
+                    "shape" : "__integerMin1"
                 }, 
                 "PlaybackConfigurationArn": {
                     "documentation": "<p>The Amazon Resource Name (ARN) for the playback configuration. </p>", 
@@ -571,6 +613,10 @@
         }, 
         "__integer": {
             "type": "integer"
+        },
+        "__integerMin1": {
+            "type": "integer",
+            "min": 1
         }, 
         "__integerMin1Max100": {
             "max": 100, 
diff --git a/services/migrationhub/pom.xml b/services/migrationhub/pom.xml
index 21d6f9712b9e..b19b09fd2f48 100644
--- a/services/migrationhub/pom.xml
+++ b/services/migrationhub/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>services</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>migrationhub</artifactId>
diff --git a/services/migrationhub/src/main/resources/codegen-resources/paginators-1.json b/services/migrationhub/src/main/resources/codegen-resources/paginators-1.json
index 5677bd8e4a2d..3f2d290acf48 100644
--- a/services/migrationhub/src/main/resources/codegen-resources/paginators-1.json
+++ b/services/migrationhub/src/main/resources/codegen-resources/paginators-1.json
@@ -1,4 +1,34 @@
 {
   "pagination": {
+    "ListApplicationStates": {
+      "input_token": "NextToken",
+      "limit_key": "MaxResults",
+      "output_token": "NextToken",
+      "result_key": "ApplicationStateList"
+    },
+    "ListCreatedArtifacts": {
+      "input_token": "NextToken",
+      "limit_key": "MaxResults",
+      "output_token": "NextToken",
+      "result_key": "CreatedArtifactList"
+    },
+    "ListDiscoveredResources": {
+      "input_token": "NextToken",
+      "limit_key": "MaxResults",
+      "output_token": "NextToken",
+      "result_key": "DiscoveredResourceList"
+    },
+    "ListMigrationTasks": {
+      "input_token": "NextToken",
+      "limit_key": "MaxResults",
+      "output_token": "NextToken",
+      "result_key": "MigrationTaskSummaryList"
+    },
+    "ListProgressUpdateStreams": {
+      "input_token": "NextToken",
+      "limit_key": "MaxResults",
+      "output_token": "NextToken",
+      "result_key": "ProgressUpdateStreamSummaryList"
+    }
   }
-}
+}
\ No newline at end of file
diff --git a/services/migrationhub/src/main/resources/codegen-resources/service-2.json b/services/migrationhub/src/main/resources/codegen-resources/service-2.json
index 68e2b5a2b724..b744e2f71506 100644
--- a/services/migrationhub/src/main/resources/codegen-resources/service-2.json
+++ b/services/migrationhub/src/main/resources/codegen-resources/service-2.json
@@ -27,7 +27,8 @@
         {"shape":"DryRunOperation"},
         {"shape":"UnauthorizedOperation"},
         {"shape":"InvalidInputException"},
-        {"shape":"ResourceNotFoundException"}
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"HomeRegionNotSetException"}
       ],
       "documentation":"<p>Associates a created artifact of an AWS cloud resource, the target receiving the migration, with the migration task performed by a migration tool. This API has the following traits:</p> <ul> <li> <p>Migration tools can call the <code>AssociateCreatedArtifact</code> operation to indicate which AWS artifact is associated with a migration task.</p> </li> <li> <p>The created artifact name must be provided in ARN (Amazon Resource Name) format which will contain information about type and region; for example: <code>arn:aws:ec2:us-east-1:488216288981:image/ami-6d0ba87b</code>.</p> </li> <li> <p>Examples of the AWS resource behind the created artifact are, AMI's, EC2 instance, or DMS endpoint, etc.</p> </li> </ul>"
     },
@@ -47,9 +48,10 @@
         {"shape":"UnauthorizedOperation"},
         {"shape":"InvalidInputException"},
         {"shape":"PolicyErrorException"},
-        {"shape":"ResourceNotFoundException"}
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"HomeRegionNotSetException"}
       ],
-      "documentation":"<p>Associates a discovered resource ID from Application Discovery Service (ADS) with a migration task.</p>"
+      "documentation":"<p>Associates a discovered resource ID from Application Discovery Service with a migration task.</p>"
     },
     "CreateProgressUpdateStream":{
       "name":"CreateProgressUpdateStream",
@@ -65,7 +67,8 @@
         {"shape":"ServiceUnavailableException"},
         {"shape":"DryRunOperation"},
         {"shape":"UnauthorizedOperation"},
-        {"shape":"InvalidInputException"}
+        {"shape":"InvalidInputException"},
+        {"shape":"HomeRegionNotSetException"}
       ],
       "documentation":"<p>Creates a progress update stream which is an AWS resource used for access control as well as a namespace for migration task names that is implicitly linked to your AWS account. It must uniquely identify the migration tool as it is used for all updates made by the tool; however, it does not need to be unique for each AWS account because it is scoped to the AWS account.</p>"
     },
@@ -84,9 +87,10 @@
         {"shape":"DryRunOperation"},
         {"shape":"UnauthorizedOperation"},
         {"shape":"InvalidInputException"},
-        {"shape":"ResourceNotFoundException"}
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"HomeRegionNotSetException"}
       ],
-      "documentation":"<p>Deletes a progress update stream, including all of its tasks, which was previously created as an AWS resource used for access control. This API has the following traits:</p> <ul> <li> <p>The only parameter needed for <code>DeleteProgressUpdateStream</code> is the stream name (same as a <code>CreateProgressUpdateStream</code> call).</p> </li> <li> <p>The call will return, and a background process will asynchronously delete the stream and all of its resources (tasks, associated resources, resource attributes, created artifacts).</p> </li> <li> <p>If the stream takes time to be deleted, it might still show up on a <code>ListProgressUpdateStreams</code> call.</p> </li> <li> <p> <code>CreateProgressUpdateStream</code>, <code>ImportMigrationTask</code>, <code>NotifyMigrationTaskState</code>, and all Associate[*] APIs realted to the tasks belonging to the stream will throw \"InvalidInputException\" if the stream of the same name is in the process of being deleted.</p> </li> <li> <p>Once the stream and all of its resources are deleted, <code>CreateProgressUpdateStream</code> for a stream of the same name will succeed, and that stream will be an entirely new logical resource (without any resources associated with the old stream).</p> </li> </ul>"
+      "documentation":"<p>Deletes a progress update stream, including all of its tasks, which was previously created as an AWS resource used for access control. This API has the following traits:</p> <ul> <li> <p>The only parameter needed for <code>DeleteProgressUpdateStream</code> is the stream name (same as a <code>CreateProgressUpdateStream</code> call).</p> </li> <li> <p>The call will return, and a background process will asynchronously delete the stream and all of its resources (tasks, associated resources, resource attributes, created artifacts).</p> </li> <li> <p>If the stream takes time to be deleted, it might still show up on a <code>ListProgressUpdateStreams</code> call.</p> </li> <li> <p> <code>CreateProgressUpdateStream</code>, <code>ImportMigrationTask</code>, <code>NotifyMigrationTaskState</code>, and all Associate[*] APIs related to the tasks belonging to the stream will throw \"InvalidInputException\" if the stream of the same name is in the process of being deleted.</p> </li> <li> <p>Once the stream and all of its resources are deleted, <code>CreateProgressUpdateStream</code> for a stream of the same name will succeed, and that stream will be an entirely new logical resource (without any resources associated with the old stream).</p> </li> </ul>"
     },
     "DescribeApplicationState":{
       "name":"DescribeApplicationState",
@@ -102,7 +106,8 @@
         {"shape":"ServiceUnavailableException"},
         {"shape":"InvalidInputException"},
         {"shape":"PolicyErrorException"},
-        {"shape":"ResourceNotFoundException"}
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"HomeRegionNotSetException"}
       ],
       "documentation":"<p>Gets the migration status of an application.</p>"
     },
@@ -119,7 +124,8 @@
         {"shape":"InternalServerError"},
         {"shape":"ServiceUnavailableException"},
         {"shape":"InvalidInputException"},
-        {"shape":"ResourceNotFoundException"}
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"HomeRegionNotSetException"}
       ],
       "documentation":"<p>Retrieves a list of all attributes associated with a specific migration task.</p>"
     },
@@ -138,7 +144,8 @@
         {"shape":"DryRunOperation"},
         {"shape":"UnauthorizedOperation"},
         {"shape":"InvalidInputException"},
-        {"shape":"ResourceNotFoundException"}
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"HomeRegionNotSetException"}
       ],
       "documentation":"<p>Disassociates a created artifact of an AWS resource with a migration task performed by a migration tool that was previously associated. This API has the following traits:</p> <ul> <li> <p>A migration user can call the <code>DisassociateCreatedArtifacts</code> operation to disassociate a created AWS Artifact from a migration task.</p> </li> <li> <p>The created artifact name must be provided in ARN (Amazon Resource Name) format which will contain information about type and region; for example: <code>arn:aws:ec2:us-east-1:488216288981:image/ami-6d0ba87b</code>.</p> </li> <li> <p>Examples of the AWS resource behind the created artifact are, AMI's, EC2 instance, or RDS instance, etc.</p> </li> </ul>"
     },
@@ -157,9 +164,10 @@
         {"shape":"DryRunOperation"},
         {"shape":"UnauthorizedOperation"},
         {"shape":"InvalidInputException"},
-        {"shape":"ResourceNotFoundException"}
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"HomeRegionNotSetException"}
       ],
-      "documentation":"<p>Disassociate an Application Discovery Service (ADS) discovered resource from a migration task.</p>"
+      "documentation":"<p>Disassociate an Application Discovery Service discovered resource from a migration task.</p>"
     },
     "ImportMigrationTask":{
       "name":"ImportMigrationTask",
@@ -176,10 +184,28 @@
         {"shape":"DryRunOperation"},
         {"shape":"UnauthorizedOperation"},
         {"shape":"InvalidInputException"},
-        {"shape":"ResourceNotFoundException"}
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"HomeRegionNotSetException"}
       ],
       "documentation":"<p>Registers a new migration task which represents a server, database, etc., being migrated to AWS by a migration tool.</p> <p>This API is a prerequisite to calling the <code>NotifyMigrationTaskState</code> API as the migration tool must first register the migration task with Migration Hub.</p>"
     },
+    "ListApplicationStates":{
+      "name":"ListApplicationStates",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"ListApplicationStatesRequest"},
+      "output":{"shape":"ListApplicationStatesResult"},
+      "errors":[
+        {"shape":"AccessDeniedException"},
+        {"shape":"InternalServerError"},
+        {"shape":"ServiceUnavailableException"},
+        {"shape":"InvalidInputException"},
+        {"shape":"HomeRegionNotSetException"}
+      ],
+      "documentation":"<p>Lists all the migration statuses for your applications. If you use the optional <code>ApplicationIds</code> parameter, only the migration statuses for those applications will be returned.</p>"
+    },
     "ListCreatedArtifacts":{
       "name":"ListCreatedArtifacts",
       "http":{
@@ -193,7 +219,8 @@
         {"shape":"InternalServerError"},
         {"shape":"ServiceUnavailableException"},
         {"shape":"InvalidInputException"},
-        {"shape":"ResourceNotFoundException"}
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"HomeRegionNotSetException"}
       ],
       "documentation":"<p>Lists the created artifacts attached to a given migration task in an update stream. This API has the following traits:</p> <ul> <li> <p>Gets the list of the created artifacts while migration is taking place.</p> </li> <li> <p>Shows the artifacts created by the migration tool that was associated by the <code>AssociateCreatedArtifact</code> API. </p> </li> <li> <p>Lists created artifacts in a paginated interface. </p> </li> </ul>"
     },
@@ -210,7 +237,8 @@
         {"shape":"InternalServerError"},
         {"shape":"ServiceUnavailableException"},
         {"shape":"InvalidInputException"},
-        {"shape":"ResourceNotFoundException"}
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"HomeRegionNotSetException"}
       ],
       "documentation":"<p>Lists discovered resources associated with the given <code>MigrationTask</code>.</p>"
     },
@@ -228,7 +256,8 @@
         {"shape":"ServiceUnavailableException"},
         {"shape":"InvalidInputException"},
         {"shape":"PolicyErrorException"},
-        {"shape":"ResourceNotFoundException"}
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"HomeRegionNotSetException"}
       ],
       "documentation":"<p>Lists all, or filtered by resource name, migration tasks associated with the user account making this call. This API has the following traits:</p> <ul> <li> <p>Can show a summary list of the most recent migration tasks.</p> </li> <li> <p>Can show a summary list of migration tasks associated with a given discovered resource.</p> </li> <li> <p>Lists migration tasks in a paginated interface.</p> </li> </ul>"
     },
@@ -244,7 +273,8 @@
         {"shape":"AccessDeniedException"},
         {"shape":"InternalServerError"},
         {"shape":"ServiceUnavailableException"},
-        {"shape":"InvalidInputException"}
+        {"shape":"InvalidInputException"},
+        {"shape":"HomeRegionNotSetException"}
       ],
       "documentation":"<p>Lists progress update streams associated with the user account making this call.</p>"
     },
@@ -264,7 +294,8 @@
         {"shape":"UnauthorizedOperation"},
         {"shape":"InvalidInputException"},
         {"shape":"PolicyErrorException"},
-        {"shape":"ResourceNotFoundException"}
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"HomeRegionNotSetException"}
       ],
       "documentation":"<p>Sets the migration state of an application. For a given application identified by the value passed to <code>ApplicationId</code>, its status is set or updated by passing one of three values to <code>Status</code>: <code>NOT_STARTED | IN_PROGRESS | COMPLETED</code>.</p>"
     },
@@ -283,7 +314,8 @@
         {"shape":"DryRunOperation"},
         {"shape":"UnauthorizedOperation"},
         {"shape":"InvalidInputException"},
-        {"shape":"ResourceNotFoundException"}
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"HomeRegionNotSetException"}
       ],
       "documentation":"<p>Notifies Migration Hub of the current status, progress, or other detail regarding a migration task. This API has the following traits:</p> <ul> <li> <p>Migration tools will call the <code>NotifyMigrationTaskState</code> API to share the latest progress and status.</p> </li> <li> <p> <code>MigrationTaskName</code> is used for addressing updates to the correct target.</p> </li> <li> <p> <code>ProgressUpdateStream</code> is used for access control and to provide a namespace for each migration tool.</p> </li> </ul>"
     },
@@ -302,9 +334,10 @@
         {"shape":"DryRunOperation"},
         {"shape":"UnauthorizedOperation"},
         {"shape":"InvalidInputException"},
-        {"shape":"ResourceNotFoundException"}
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"HomeRegionNotSetException"}
       ],
-      "documentation":"<p>Provides identifying details of the resource being migrated so that it can be associated in the Application Discovery Service (ADS)'s repository. This association occurs asynchronously after <code>PutResourceAttributes</code> returns.</p> <important> <ul> <li> <p>Keep in mind that subsequent calls to PutResourceAttributes will override previously stored attributes. For example, if it is first called with a MAC address, but later, it is desired to <i>add</i> an IP address, it will then be required to call it with <i>both</i> the IP and MAC addresses to prevent overiding the MAC address.</p> </li> <li> <p>Note the instructions regarding the special use case of the <a href=\"https://docs.aws.amazon.com/migrationhub/latest/ug/API_PutResourceAttributes.html#migrationhub-PutResourceAttributes-request-ResourceAttributeList\"> <code>ResourceAttributeList</code> </a> parameter when specifying any \"VM\" related value. </p> </li> </ul> </important> <note> <p>Because this is an asynchronous call, it will always return 200, whether an association occurs or not. To confirm if an association was found based on the provided details, call <code>ListDiscoveredResources</code>.</p> </note>"
+      "documentation":"<p>Provides identifying details of the resource being migrated so that it can be associated in the Application Discovery Service repository. This association occurs asynchronously after <code>PutResourceAttributes</code> returns.</p> <important> <ul> <li> <p>Keep in mind that subsequent calls to PutResourceAttributes will override previously stored attributes. For example, if it is first called with a MAC address, but later, it is desired to <i>add</i> an IP address, it will then be required to call it with <i>both</i> the IP and MAC addresses to prevent overriding the MAC address.</p> </li> <li> <p>Note the instructions regarding the special use case of the <a href=\"https://docs.aws.amazon.com/migrationhub/latest/ug/API_PutResourceAttributes.html#migrationhub-PutResourceAttributes-request-ResourceAttributeList\"> <code>ResourceAttributeList</code> </a> parameter when specifying any \"VM\" related value.</p> </li> </ul> </important> <note> <p>Because this is an asynchronous call, it will always return 200, whether an association occurs or not. To confirm if an association was found based on the provided details, call <code>ListDiscoveredResources</code>.</p> </note>"
     }
   },
   "shapes":{
@@ -321,6 +354,36 @@
       "max":1600,
       "min":1
     },
+    "ApplicationIds":{
+      "type":"list",
+      "member":{"shape":"ApplicationId"},
+      "max":100,
+      "min":1
+    },
+    "ApplicationState":{
+      "type":"structure",
+      "members":{
+        "ApplicationId":{
+          "shape":"ApplicationId",
+          "documentation":"<p>The configurationId from the Application Discovery Service that uniquely identifies an application.</p>"
+        },
+        "ApplicationStatus":{
+          "shape":"ApplicationStatus",
+          "documentation":"<p>The current status of an application.</p>"
+        },
+        "LastUpdatedTime":{
+          "shape":"UpdateDateTime",
+          "documentation":"<p>The timestamp when the application status was last updated.</p>"
+        }
+      },
+      "documentation":"<p>The state of an application discovered through Migration Hub import, the AWS Agentless Discovery Connector, or the AWS Application Discovery Agent.</p>"
+    },
+    "ApplicationStateList":{
+      "type":"list",
+      "member":{"shape":"ApplicationState"},
+      "max":1000,
+      "min":0
+    },
     "ApplicationStatus":{
       "type":"string",
       "enum":[
@@ -343,7 +406,7 @@
         },
         "MigrationTaskName":{
           "shape":"MigrationTaskName",
-          "documentation":"<p>Unique identifier that references the migration task.</p>"
+          "documentation":"<p>Unique identifier that references the migration task. <i>Do not store personal data in this field.</i> </p>"
         },
         "CreatedArtifact":{
           "shape":"CreatedArtifact",
@@ -374,7 +437,7 @@
         },
         "MigrationTaskName":{
           "shape":"MigrationTaskName",
-          "documentation":"<p>The identifier given to the MigrationTask.</p>"
+          "documentation":"<p>The identifier given to the MigrationTask. <i>Do not store personal data in this field.</i> </p>"
         },
         "DiscoveredResource":{
           "shape":"DiscoveredResource",
@@ -401,7 +464,7 @@
       "members":{
         "ProgressUpdateStreamName":{
           "shape":"ProgressUpdateStream",
-          "documentation":"<p>The name of the ProgressUpdateStream. </p>"
+          "documentation":"<p>The name of the ProgressUpdateStream. <i>Do not store personal data in this field.</i> </p>"
         },
         "DryRun":{
           "shape":"DryRun",
@@ -450,7 +513,7 @@
       "members":{
         "ProgressUpdateStreamName":{
           "shape":"ProgressUpdateStream",
-          "documentation":"<p>The name of the ProgressUpdateStream. </p>"
+          "documentation":"<p>The name of the ProgressUpdateStream. <i>Do not store personal data in this field.</i> </p>"
         },
         "DryRun":{
           "shape":"DryRun",
@@ -469,7 +532,7 @@
       "members":{
         "ApplicationId":{
           "shape":"ApplicationId",
-          "documentation":"<p>The configurationId in ADS that uniquely identifies the grouped application.</p>"
+          "documentation":"<p>The configurationId in Application Discovery Service that uniquely identifies the grouped application.</p>"
         }
       }
     },
@@ -499,7 +562,7 @@
         },
         "MigrationTaskName":{
           "shape":"MigrationTaskName",
-          "documentation":"<p>The identifier given to the MigrationTask.</p>"
+          "documentation":"<p>The identifier given to the MigrationTask. <i>Do not store personal data in this field.</i> </p>"
         }
       }
     },
@@ -526,7 +589,7 @@
         },
         "MigrationTaskName":{
           "shape":"MigrationTaskName",
-          "documentation":"<p>Unique identifier that references the migration task to be disassociated with the artifact.</p>"
+          "documentation":"<p>Unique identifier that references the migration task to be disassociated with the artifact. <i>Do not store personal data in this field.</i> </p>"
         },
         "CreatedArtifactName":{
           "shape":"CreatedArtifactName",
@@ -557,11 +620,11 @@
         },
         "MigrationTaskName":{
           "shape":"MigrationTaskName",
-          "documentation":"<p>The identifier given to the MigrationTask.</p>"
+          "documentation":"<p>The identifier given to the MigrationTask. <i>Do not store personal data in this field.</i> </p>"
         },
         "ConfigurationId":{
           "shape":"ConfigurationId",
-          "documentation":"<p>ConfigurationId of the ADS resource to be disassociated.</p>"
+          "documentation":"<p>ConfigurationId of the Application Discovery Service resource to be disassociated.</p>"
         },
         "DryRun":{
           "shape":"DryRun",
@@ -580,7 +643,7 @@
       "members":{
         "ConfigurationId":{
           "shape":"ConfigurationId",
-          "documentation":"<p>The configurationId in ADS that uniquely identifies the on-premise resource.</p>"
+          "documentation":"<p>The configurationId in Application Discovery Service that uniquely identifies the on-premise resource.</p>"
         },
         "Description":{
           "shape":"DiscoveredResourceDescription",
@@ -608,6 +671,14 @@
       "exception":true
     },
     "ErrorMessage":{"type":"string"},
+    "HomeRegionNotSetException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p>The home region is not set. Set the home region to continue.</p>",
+      "exception":true
+    },
     "ImportMigrationTaskRequest":{
       "type":"structure",
       "required":[
@@ -617,11 +688,11 @@
       "members":{
         "ProgressUpdateStream":{
           "shape":"ProgressUpdateStream",
-          "documentation":"<p>The name of the ProgressUpdateStream. </p>"
+          "documentation":"<p>The name of the ProgressUpdateStream. &gt;</p>"
         },
         "MigrationTaskName":{
           "shape":"MigrationTaskName",
-          "documentation":"<p>Unique identifier that references the migration task.</p>"
+          "documentation":"<p>Unique identifier that references the migration task. <i>Do not store personal data in this field.</i> </p>"
         },
         "DryRun":{
           "shape":"DryRun",
@@ -639,7 +710,7 @@
       "members":{
         "Message":{"shape":"ErrorMessage"}
       },
-      "documentation":"<p>Exception raised when there is an internal, configuration, or dependency error encountered.</p>",
+      "documentation":"<p>Exception raised when an internal, configuration, or dependency error is encountered.</p>",
       "exception":true,
       "fault":true
     },
@@ -657,6 +728,36 @@
       "max":100,
       "min":0
     },
+    "ListApplicationStatesRequest":{
+      "type":"structure",
+      "members":{
+        "ApplicationIds":{
+          "shape":"ApplicationIds",
+          "documentation":"<p>The configurationIds from the Application Discovery Service that uniquely identifies your applications.</p>"
+        },
+        "NextToken":{
+          "shape":"Token",
+          "documentation":"<p>If a <code>NextToken</code> was returned by a previous call, there are more results available. To retrieve the next page of results, make the call again using the returned token in <code>NextToken</code>.</p>"
+        },
+        "MaxResults":{
+          "shape":"MaxResults",
+          "documentation":"<p>Maximum number of results to be returned per page.</p>"
+        }
+      }
+    },
+    "ListApplicationStatesResult":{
+      "type":"structure",
+      "members":{
+        "ApplicationStateList":{
+          "shape":"ApplicationStateList",
+          "documentation":"<p>A list of Applications that exist in Application Discovery Service.</p>"
+        },
+        "NextToken":{
+          "shape":"Token",
+          "documentation":"<p>If a <code>NextToken</code> was returned by a previous call, there are more results available. To retrieve the next page of results, make the call again using the returned token in <code>NextToken</code>.</p>"
+        }
+      }
+    },
     "ListCreatedArtifactsRequest":{
       "type":"structure",
       "required":[
@@ -670,7 +771,7 @@
         },
         "MigrationTaskName":{
           "shape":"MigrationTaskName",
-          "documentation":"<p>Unique identifier that references the migration task.</p>"
+          "documentation":"<p>Unique identifier that references the migration task. <i>Do not store personal data in this field.</i> </p>"
         },
         "NextToken":{
           "shape":"Token",
@@ -708,7 +809,7 @@
         },
         "MigrationTaskName":{
           "shape":"MigrationTaskName",
-          "documentation":"<p>The name of the MigrationTask.</p>"
+          "documentation":"<p>The name of the MigrationTask. <i>Do not store personal data in this field.</i> </p>"
         },
         "NextToken":{
           "shape":"Token",
@@ -816,7 +917,7 @@
         },
         "MigrationTaskName":{
           "shape":"MigrationTaskName",
-          "documentation":"<p>Unique identifier that references the migration task.</p>"
+          "documentation":"<p>Unique identifier that references the migration task. <i>Do not store personal data in this field.</i> </p>"
         },
         "Task":{
           "shape":"Task",
@@ -828,7 +929,7 @@
         },
         "ResourceAttributeList":{
           "shape":"LatestResourceAttributeList",
-          "documentation":"<p/>"
+          "documentation":"<p>Information about the resource that is being migrated. This data will be used to map the task to a resource in the Application Discovery Service repository.</p>"
         }
       },
       "documentation":"<p>Represents a migration task in a migration tool.</p>"
@@ -848,7 +949,7 @@
         },
         "MigrationTaskName":{
           "shape":"MigrationTaskName",
-          "documentation":"<p>Unique identifier that references the migration task.</p>"
+          "documentation":"<p>Unique identifier that references the migration task. <i>Do not store personal data in this field.</i> </p>"
         },
         "Status":{
           "shape":"Status",
@@ -856,7 +957,7 @@
         },
         "ProgressPercent":{
           "shape":"ProgressPercent",
-          "documentation":"<p/>"
+          "documentation":"<p>Indication of the percentage completion of the task.</p>"
         },
         "StatusDetail":{
           "shape":"StatusDetail",
@@ -886,12 +987,16 @@
       "members":{
         "ApplicationId":{
           "shape":"ApplicationId",
-          "documentation":"<p>The configurationId in ADS that uniquely identifies the grouped application.</p>"
+          "documentation":"<p>The configurationId in Application Discovery Service that uniquely identifies the grouped application.</p>"
         },
         "Status":{
           "shape":"ApplicationStatus",
           "documentation":"<p>Status of the application - Not Started, In-Progress, Complete.</p>"
         },
+        "UpdateDateTime":{
+          "shape":"UpdateDateTime",
+          "documentation":"<p>The timestamp when the application state changed.</p>"
+        },
         "DryRun":{
           "shape":"DryRun",
           "documentation":"<p>Optional boolean flag to indicate whether any effect should take place. Used to test if the caller has permission to make the call.</p>"
@@ -919,7 +1024,7 @@
         },
         "MigrationTaskName":{
           "shape":"MigrationTaskName",
-          "documentation":"<p>Unique identifier that references the migration task.</p>"
+          "documentation":"<p>Unique identifier that references the migration task. <i>Do not store personal data in this field.</i> </p>"
         },
         "Task":{
           "shape":"Task",
@@ -949,7 +1054,7 @@
       "members":{
         "Message":{"shape":"ErrorMessage"}
       },
-      "documentation":"<p>Exception raised when there are problems accessing ADS (Application Discovery Service); most likely due to a misconfigured policy or the <code>migrationhub-discovery</code> role is missing or not configured correctly.</p>",
+      "documentation":"<p>Exception raised when there are problems accessing Application Discovery Service (Application Discovery Service); most likely due to a misconfigured policy or the <code>migrationhub-discovery</code> role is missing or not configured correctly.</p>",
       "exception":true
     },
     "ProgressPercent":{
@@ -969,7 +1074,7 @@
       "members":{
         "ProgressUpdateStreamName":{
           "shape":"ProgressUpdateStream",
-          "documentation":"<p>The name of the ProgressUpdateStream. </p>"
+          "documentation":"<p>The name of the ProgressUpdateStream. <i>Do not store personal data in this field.</i> </p>"
         }
       },
       "documentation":"<p>Summary of the AWS resource used for access control that is implicitly linked to your AWS account.</p>"
@@ -992,11 +1097,11 @@
         },
         "MigrationTaskName":{
           "shape":"MigrationTaskName",
-          "documentation":"<p>Unique identifier that references the migration task.</p>"
+          "documentation":"<p>Unique identifier that references the migration task. <i>Do not store personal data in this field.</i> </p>"
         },
         "ResourceAttributeList":{
           "shape":"ResourceAttributeList",
-          "documentation":"<p>Information about the resource that is being migrated. This data will be used to map the task to a resource in the Application Discovery Service (ADS)'s repository.</p> <note> <p>Takes the object array of <code>ResourceAttribute</code> where the <code>Type</code> field is reserved for the following values: <code>IPV4_ADDRESS | IPV6_ADDRESS | MAC_ADDRESS | FQDN | VM_MANAGER_ID | VM_MANAGED_OBJECT_REFERENCE | VM_NAME | VM_PATH | BIOS_ID | MOTHERBOARD_SERIAL_NUMBER</code> where the identifying value can be a string up to 256 characters.</p> </note> <important> <ul> <li> <p>If any \"VM\" related value is set for a <code>ResourceAttribute</code> object, it is required that <code>VM_MANAGER_ID</code>, as a minimum, is always set. If <code>VM_MANAGER_ID</code> is not set, then all \"VM\" fields will be discarded and \"VM\" fields will not be used for matching the migration task to a server in Application Discovery Service (ADS)'s repository. See the <a href=\"https://docs.aws.amazon.com/migrationhub/latest/ug/API_PutResourceAttributes.html#API_PutResourceAttributes_Examples\">Example</a> section below for a use case of specifying \"VM\" related values.</p> </li> <li> <p> If a server you are trying to match has multiple IP or MAC addresses, you should provide as many as you know in separate type/value pairs passed to the <code>ResourceAttributeList</code> parameter to maximize the chances of matching.</p> </li> </ul> </important>"
+          "documentation":"<p>Information about the resource that is being migrated. This data will be used to map the task to a resource in the Application Discovery Service repository.</p> <note> <p>Takes the object array of <code>ResourceAttribute</code> where the <code>Type</code> field is reserved for the following values: <code>IPV4_ADDRESS | IPV6_ADDRESS | MAC_ADDRESS | FQDN | VM_MANAGER_ID | VM_MANAGED_OBJECT_REFERENCE | VM_NAME | VM_PATH | BIOS_ID | MOTHERBOARD_SERIAL_NUMBER</code> where the identifying value can be a string up to 256 characters.</p> </note> <important> <ul> <li> <p>If any \"VM\" related value is set for a <code>ResourceAttribute</code> object, it is required that <code>VM_MANAGER_ID</code>, as a minimum, is always set. If <code>VM_MANAGER_ID</code> is not set, then all \"VM\" fields will be discarded and \"VM\" fields will not be used for matching the migration task to a server in Application Discovery Service repository. See the <a href=\"https://docs.aws.amazon.com/migrationhub/latest/ug/API_PutResourceAttributes.html#API_PutResourceAttributes_Examples\">Example</a> section below for a use case of specifying \"VM\" related values.</p> </li> <li> <p> If a server you are trying to match has multiple IP or MAC addresses, you should provide as many as you know in separate type/value pairs passed to the <code>ResourceAttributeList</code> parameter to maximize the chances of matching.</p> </li> </ul> </important>"
         },
         "DryRun":{
           "shape":"DryRun",
@@ -1063,7 +1168,7 @@
       "members":{
         "Message":{"shape":"ErrorMessage"}
       },
-      "documentation":"<p>Exception raised when the request references a resource (ADS configuration, update stream, migration task, etc.) that does not exist in ADS (Application Discovery Service) or in Migration Hub's repository.</p>",
+      "documentation":"<p>Exception raised when the request references a resource (Application Discovery Service configuration, update stream, migration task, etc.) that does not exist in Application Discovery Service (Application Discovery Service) or in Migration Hub's repository.</p>",
       "exception":true
     },
     "ServiceUnavailableException":{
@@ -1119,5 +1224,5 @@
     },
     "UpdateDateTime":{"type":"timestamp"}
   },
-  "documentation":"<p>The AWS Migration Hub API methods help to obtain server and application migration status and integrate your resource-specific migration tool by providing a programmatic interface to Migration Hub. </p>"
+  "documentation":"<p>The AWS Migration Hub API methods help to obtain server and application migration status and integrate your resource-specific migration tool by providing a programmatic interface to Migration Hub.</p> <p>Remember that you must set your AWS Migration Hub home region before you call any of these APIs, or a <code>HomeRegionNotSetException</code> error will be returned. Also, you must make the API calls while in your home region.</p>"
 }
diff --git a/services/migrationhubconfig/pom.xml b/services/migrationhubconfig/pom.xml
new file mode 100644
index 000000000000..59e96daa2eb7
--- /dev/null
+++ b/services/migrationhubconfig/pom.xml
@@ -0,0 +1,60 @@
+<?xml version="1.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.
+  -->
+
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>software.amazon.awssdk</groupId>
+        <artifactId>services</artifactId>
+        <version>2.11.8-SNAPSHOT</version>
+    </parent>
+    <artifactId>migrationhubconfig</artifactId>
+    <name>AWS Java SDK :: Services :: MigrationHub Config</name>
+    <description>The AWS Java SDK for MigrationHub Config module holds the client classes that are used for
+        communicating with MigrationHub Config.
+    </description>
+    <url>https://aws.amazon.com/sdkforjava</url>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifestEntries>
+                            <Automatic-Module-Name>software.amazon.awssdk.services.migrationhubconfig</Automatic-Module-Name>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>protocol-core</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>aws-json-protocol</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/services/migrationhubconfig/src/main/resources/codegen-resources/paginators-1.json b/services/migrationhubconfig/src/main/resources/codegen-resources/paginators-1.json
new file mode 100644
index 000000000000..cd89e068e4d1
--- /dev/null
+++ b/services/migrationhubconfig/src/main/resources/codegen-resources/paginators-1.json
@@ -0,0 +1,9 @@
+{
+  "pagination": {
+    "DescribeHomeRegionControls": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "MaxResults"
+    }
+  }
+}
diff --git a/services/migrationhubconfig/src/main/resources/codegen-resources/service-2.json b/services/migrationhubconfig/src/main/resources/codegen-resources/service-2.json
new file mode 100644
index 000000000000..7534a7068276
--- /dev/null
+++ b/services/migrationhubconfig/src/main/resources/codegen-resources/service-2.json
@@ -0,0 +1,272 @@
+{
+  "version":"2.0",
+  "metadata":{
+    "apiVersion":"2019-06-30",
+    "endpointPrefix":"migrationhub-config",
+    "jsonVersion":"1.1",
+    "protocol":"json",
+    "serviceFullName":"AWS Migration Hub Config",
+    "serviceId":"MigrationHub Config",
+    "signatureVersion":"v4",
+    "signingName":"mgh",
+    "targetPrefix":"AWSMigrationHubMultiAccountService",
+    "uid":"migrationhub-config-2019-06-30"
+  },
+  "operations":{
+    "CreateHomeRegionControl":{
+      "name":"CreateHomeRegionControl",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"CreateHomeRegionControlRequest"},
+      "output":{"shape":"CreateHomeRegionControlResult"},
+      "errors":[
+        {"shape":"InternalServerError"},
+        {"shape":"ServiceUnavailableException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"DryRunOperation"},
+        {"shape":"InvalidInputException"}
+      ],
+      "documentation":"<p>This API sets up the home region for the calling account only.</p>"
+    },
+    "DescribeHomeRegionControls":{
+      "name":"DescribeHomeRegionControls",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DescribeHomeRegionControlsRequest"},
+      "output":{"shape":"DescribeHomeRegionControlsResult"},
+      "errors":[
+        {"shape":"InternalServerError"},
+        {"shape":"ServiceUnavailableException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"InvalidInputException"}
+      ],
+      "documentation":"<p>This API permits filtering on the <code>ControlId</code>, <code>HomeRegion</code>, and <code>RegionControlScope</code> fields.</p>"
+    },
+    "GetHomeRegion":{
+      "name":"GetHomeRegion",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"GetHomeRegionRequest"},
+      "output":{"shape":"GetHomeRegionResult"},
+      "errors":[
+        {"shape":"InternalServerError"},
+        {"shape":"ServiceUnavailableException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"InvalidInputException"}
+      ],
+      "documentation":"<p>Returns the calling account’s home region, if configured. This API is used by other AWS services to determine the regional endpoint for calling AWS Application Discovery Service and Migration Hub. You must call <code>GetHomeRegion</code> at least once before you call any other AWS Application Discovery Service and AWS Migration Hub APIs, to obtain the account's Migration Hub home region.</p>"
+    }
+  },
+  "shapes":{
+    "AccessDeniedException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p>You do not have sufficient access to perform this action.</p>",
+      "exception":true
+    },
+    "ControlId":{
+      "type":"string",
+      "max":50,
+      "min":1,
+      "pattern":"^hrc-[a-z0-9]{12}$"
+    },
+    "CreateHomeRegionControlRequest":{
+      "type":"structure",
+      "required":[
+        "HomeRegion",
+        "Target"
+      ],
+      "members":{
+        "HomeRegion":{
+          "shape":"HomeRegion",
+          "documentation":"<p>The name of the home region of the calling account.</p>"
+        },
+        "Target":{
+          "shape":"Target",
+          "documentation":"<p>The account for which this command sets up a home region control. The <code>Target</code> is always of type <code>ACCOUNT</code>.</p>"
+        },
+        "DryRun":{
+          "shape":"DryRun",
+          "documentation":"<p>Optional Boolean flag to indicate whether any effect should take place. It tests whether the caller has permission to make the call.</p>"
+        }
+      }
+    },
+    "CreateHomeRegionControlResult":{
+      "type":"structure",
+      "members":{
+        "HomeRegionControl":{
+          "shape":"HomeRegionControl",
+          "documentation":"<p>This object is the <code>HomeRegionControl</code> object that's returned by a successful call to <code>CreateHomeRegionControl</code>.</p>"
+        }
+      }
+    },
+    "DescribeHomeRegionControlsMaxResults":{
+      "type":"integer",
+      "box":true,
+      "max":100,
+      "min":1
+    },
+    "DescribeHomeRegionControlsRequest":{
+      "type":"structure",
+      "members":{
+        "ControlId":{
+          "shape":"ControlId",
+          "documentation":"<p>The <code>ControlID</code> is a unique identifier string of your <code>HomeRegionControl</code> object.</p>"
+        },
+        "HomeRegion":{
+          "shape":"HomeRegion",
+          "documentation":"<p>The name of the home region you'd like to view.</p>"
+        },
+        "Target":{
+          "shape":"Target",
+          "documentation":"<p>The target parameter specifies the identifier to which the home region is applied, which is always of type <code>ACCOUNT</code>. It applies the home region to the current <code>ACCOUNT</code>.</p>"
+        },
+        "MaxResults":{
+          "shape":"DescribeHomeRegionControlsMaxResults",
+          "documentation":"<p>The maximum number of filtering results to display per page. </p>"
+        },
+        "NextToken":{
+          "shape":"Token",
+          "documentation":"<p>If a <code>NextToken</code> was returned by a previous call, more results are available. To retrieve the next page of results, make the call again using the returned token in <code>NextToken</code>.</p>"
+        }
+      }
+    },
+    "DescribeHomeRegionControlsResult":{
+      "type":"structure",
+      "members":{
+        "HomeRegionControls":{
+          "shape":"HomeRegionControls",
+          "documentation":"<p>An array that contains your <code>HomeRegionControl</code> objects.</p>"
+        },
+        "NextToken":{
+          "shape":"Token",
+          "documentation":"<p>If a <code>NextToken</code> was returned by a previous call, more results are available. To retrieve the next page of results, make the call again using the returned token in <code>NextToken</code>.</p>"
+        }
+      }
+    },
+    "DryRun":{"type":"boolean"},
+    "DryRunOperation":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p>Exception raised to indicate that authorization of an action was successful, when the <code>DryRun</code> flag is set to true.</p>",
+      "exception":true
+    },
+    "ErrorMessage":{"type":"string"},
+    "GetHomeRegionRequest":{
+      "type":"structure",
+      "members":{
+      }
+    },
+    "GetHomeRegionResult":{
+      "type":"structure",
+      "members":{
+        "HomeRegion":{
+          "shape":"HomeRegion",
+          "documentation":"<p>The name of the home region of the calling account.</p>"
+        }
+      }
+    },
+    "HomeRegion":{
+      "type":"string",
+      "max":50,
+      "min":1,
+      "pattern":"^([a-z]+)-([a-z]+)-([0-9]+)$"
+    },
+    "HomeRegionControl":{
+      "type":"structure",
+      "members":{
+        "ControlId":{
+          "shape":"ControlId",
+          "documentation":"<p>A unique identifier that's generated for each home region control. It's always a string that begins with \"hrc-\" followed by 12 lowercase letters and numbers.</p>"
+        },
+        "HomeRegion":{
+          "shape":"HomeRegion",
+          "documentation":"<p>The AWS Region that's been set as home region. For example, \"us-west-2\" or \"eu-central-1\" are valid home regions.</p>"
+        },
+        "Target":{
+          "shape":"Target",
+          "documentation":"<p>The target parameter specifies the identifier to which the home region is applied, which is always an <code>ACCOUNT</code>. It applies the home region to the current <code>ACCOUNT</code>.</p>"
+        },
+        "RequestedTime":{
+          "shape":"RequestedTime",
+          "documentation":"<p>A timestamp representing the time when the customer called <code>CreateHomeregionControl</code> and set the home region for the account.</p>"
+        }
+      },
+      "documentation":"<p>A home region control is an object that specifies the home region for an account, with some additional information. It contains a target (always of type <code>ACCOUNT</code>), an ID, and a time at which the home region was set.</p>"
+    },
+    "HomeRegionControls":{
+      "type":"list",
+      "member":{"shape":"HomeRegionControl"},
+      "max":100
+    },
+    "InternalServerError":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p>Exception raised when an internal, configuration, or dependency error is encountered.</p>",
+      "exception":true,
+      "fault":true
+    },
+    "InvalidInputException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p>Exception raised when the provided input violates a policy constraint or is entered in the wrong format or data type.</p>",
+      "exception":true
+    },
+    "RequestedTime":{"type":"timestamp"},
+    "ServiceUnavailableException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p>Exception raised when a request fails due to temporary unavailability of the service.</p>",
+      "exception":true,
+      "fault":true
+    },
+    "Target":{
+      "type":"structure",
+      "required":["Type"],
+      "members":{
+        "Type":{
+          "shape":"TargetType",
+          "documentation":"<p>The target type is always an <code>ACCOUNT</code>.</p>"
+        },
+        "Id":{
+          "shape":"TargetId",
+          "documentation":"<p>The <code>TargetID</code> is a 12-character identifier of the <code>ACCOUNT</code> for which the control was created. (This must be the current account.) </p>"
+        }
+      },
+      "documentation":"<p>The target parameter specifies the identifier to which the home region is applied, which is always an <code>ACCOUNT</code>. It applies the home region to the current <code>ACCOUNT</code>.</p>"
+    },
+    "TargetId":{
+      "type":"string",
+      "max":12,
+      "min":12,
+      "pattern":"^\\d{12}$"
+    },
+    "TargetType":{
+      "type":"string",
+      "enum":["ACCOUNT"]
+    },
+    "Token":{
+      "type":"string",
+      "max":2048,
+      "min":0,
+      "pattern":"^[a-zA-Z0-9\\/\\+\\=]{0,2048}$"
+    }
+  },
+  "documentation":"<p>The AWS Migration Hub home region APIs are available specifically for working with your Migration Hub home region. You can use these APIs to determine a home region, as well as to create and work with controls that describe the home region.</p> <p>You can use these APIs within your home region only. If you call these APIs from outside your home region, your calls are rejected, except for the ability to register your agents and connectors. </p> <p> You must call <code>GetHomeRegion</code> at least once before you call any other AWS Application Discovery Service and AWS Migration Hub APIs, to obtain the account's Migration Hub home region.</p> <p>The <code>StartDataCollection</code> API call in AWS Application Discovery Service allows your agents and connectors to begin collecting data that flows directly into the home region, and it will prevent you from enabling data collection information to be sent outside the home region. </p> <p>For specific API usage, see the sections that follow in this AWS Migration Hub Home Region API reference. </p> <note> <p>The Migration Hub Home Region APIs do not support AWS Organizations.</p> </note>"
+}
diff --git a/services/mobile/pom.xml b/services/mobile/pom.xml
index 7d8c6cb23824..c0346127574c 100644
--- a/services/mobile/pom.xml
+++ b/services/mobile/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>services</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>mobile</artifactId>
diff --git a/services/mq/pom.xml b/services/mq/pom.xml
index 4c0f845b30ef..568159e34fb8 100644
--- a/services/mq/pom.xml
+++ b/services/mq/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>services</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>mq</artifactId>
diff --git a/services/mq/src/main/resources/codegen-resources/service-2.json b/services/mq/src/main/resources/codegen-resources/service-2.json
index 982592351fe7..2def4c651315 100644
--- a/services/mq/src/main/resources/codegen-resources/service-2.json
+++ b/services/mq/src/main/resources/codegen-resources/service-2.json
@@ -753,6 +753,16 @@
           "locationName" : "hostInstanceType",
           "documentation" : "The type of broker instance."
         },
+        "StorageType" : {
+          "shape" : "BrokerStorageType",
+          "locationName" : "storageType",
+          "documentation" : "The broker's storage type."
+        },
+        "SupportedDeploymentModes" : {
+          "shape" : "__listOfDeploymentMode",
+          "locationName" : "supportedDeploymentModes",
+          "documentation" : "The list of supported deployment modes."
+        },
         "SupportedEngineVersions" : {
           "shape" : "__listOf__string",
           "locationName" : "supportedEngineVersions",
@@ -787,6 +797,11 @@
       "documentation" : "The status of the broker.",
       "enum" : [ "CREATION_IN_PROGRESS", "CREATION_FAILED", "DELETION_IN_PROGRESS", "RUNNING", "REBOOT_IN_PROGRESS" ]
     },
+    "BrokerStorageType" : {
+      "type" : "string",
+      "documentation" : "The storage type of the broker.",
+      "enum" : [ "EBS", "EFS" ]
+    },
     "BrokerSummary" : {
       "type" : "structure",
       "members" : {
@@ -1029,7 +1044,12 @@
         "SecurityGroups" : {
           "shape" : "__listOf__string",
           "locationName" : "securityGroups",
-          "documentation" : "The list of security groups (1 minimum, 5 maximum) that authorize connections to brokers."
+          "documentation" : "The list of security groups (1 minimum, 5 maximum) that authorizes connections to brokers."
+        },
+        "StorageType" : {
+          "shape" : "BrokerStorageType",
+          "locationName" : "storageType",
+          "documentation" : "The broker's storage type."
         },
         "SubnetIds" : {
           "shape" : "__listOf__string",
@@ -1047,7 +1067,7 @@
           "documentation" : "Required. The list of ActiveMQ users (persons or applications) who can access queues and topics. This value can contain only alphanumeric characters, dashes, periods, underscores, and tildes (- . _ ~). This value must be 2-100 characters long."
         }
       },
-      "documentation" : "Required. The time period during which Amazon MQ applies pending updates or patches to the broker."
+      "documentation" : "Required. The version of the broker engine. For a list of supported engine versions, see https://docs.aws.amazon.com/amazon-mq/latest/developer-guide/broker-engine.html"
     },
     "CreateBrokerOutput" : {
       "type" : "structure",
@@ -1132,7 +1152,12 @@
         "SecurityGroups" : {
           "shape" : "__listOf__string",
           "locationName" : "securityGroups",
-          "documentation" : "The list of security groups (1 minimum, 5 maximum) that authorize connections to brokers."
+          "documentation" : "The list of security groups (1 minimum, 5 maximum) that authorizes connections to brokers."
+        },
+        "StorageType" : {
+          "shape" : "BrokerStorageType",
+          "locationName" : "storageType",
+          "documentation" : "The broker's storage type."
         },
         "SubnetIds" : {
           "shape" : "__listOf__string",
@@ -1508,6 +1533,12 @@
           "location" : "querystring",
           "locationName" : "nextToken",
           "documentation" : "The token that specifies the next page of results Amazon MQ should return. To request the first page, leave nextToken empty."
+        },
+        "StorageType" : {
+          "shape" : "__string",
+          "location" : "querystring",
+          "locationName" : "storageType",
+          "documentation" : "Filter response by storage type."
         }
       }
     },
@@ -1614,16 +1645,16 @@
           "locationName" : "pendingEngineVersion",
           "documentation" : "The version of the broker engine to upgrade to. For a list of supported engine versions, see https://docs.aws.amazon.com/amazon-mq/latest/developer-guide/broker-engine.html"
         },
-        "PendingSecurityGroups" : {
-          "shape" : "__listOf__string",
-          "locationName" : "pendingSecurityGroups",
-          "documentation" : "The list of pending security groups to authorize connections to brokers."
-        },
         "PendingHostInstanceType" : {
           "shape" : "__string",
           "locationName" : "pendingHostInstanceType",
           "documentation" : "The host instance type of the broker to upgrade to. For a list of supported instance types, see https://docs.aws.amazon.com/amazon-mq/latest/developer-guide//broker.html#broker-instance-types"
         },
+        "PendingSecurityGroups" : {
+          "shape" : "__listOf__string",
+          "locationName" : "pendingSecurityGroups",
+          "documentation" : "The list of pending security groups to authorize connections to brokers."
+        },
         "PubliclyAccessible" : {
           "shape" : "__boolean",
           "locationName" : "publiclyAccessible",
@@ -1632,7 +1663,12 @@
         "SecurityGroups" : {
           "shape" : "__listOf__string",
           "locationName" : "securityGroups",
-          "documentation" : "The list of security groups (1 minimum, 5 maximum) that authorize connections to brokers."
+          "documentation" : "The list of security groups (1 minimum, 5 maximum) that authorizes connections to brokers."
+        },
+        "StorageType" : {
+          "shape" : "BrokerStorageType",
+          "locationName" : "storageType",
+          "documentation" : "The broker's storage type."
         },
         "SubnetIds" : {
           "shape" : "__listOf__string",
@@ -1747,16 +1783,16 @@
           "locationName" : "pendingEngineVersion",
           "documentation" : "The version of the broker engine to upgrade to. For a list of supported engine versions, see https://docs.aws.amazon.com/amazon-mq/latest/developer-guide/broker-engine.html"
         },
-        "PendingSecurityGroups" : {
-          "shape" : "__listOf__string",
-          "locationName" : "pendingSecurityGroups",
-          "documentation" : "The list of pending security groups to authorize connections to brokers."
-        },
         "PendingHostInstanceType" : {
           "shape" : "__string",
           "locationName" : "pendingHostInstanceType",
           "documentation" : "The host instance type of the broker to upgrade to. For a list of supported instance types, see https://docs.aws.amazon.com/amazon-mq/latest/developer-guide//broker.html#broker-instance-types"
         },
+        "PendingSecurityGroups" : {
+          "shape" : "__listOf__string",
+          "locationName" : "pendingSecurityGroups",
+          "documentation" : "The list of pending security groups to authorize connections to brokers."
+        },
         "PubliclyAccessible" : {
           "shape" : "__boolean",
           "locationName" : "publiclyAccessible",
@@ -1765,7 +1801,12 @@
         "SecurityGroups" : {
           "shape" : "__listOf__string",
           "locationName" : "securityGroups",
-          "documentation" : "The list of security groups (1 minimum, 5 maximum) that authorize connections to brokers."
+          "documentation" : "The list of security groups (1 minimum, 5 maximum) that authorizes connections to brokers."
+        },
+        "StorageType" : {
+          "shape" : "BrokerStorageType",
+          "locationName" : "storageType",
+          "documentation" : "The broker's storage type."
         },
         "SubnetIds" : {
           "shape" : "__listOf__string",
@@ -2553,7 +2594,7 @@
         "SecurityGroups" : {
           "shape" : "__listOf__string",
           "locationName" : "securityGroups",
-          "documentation" : "The list of security groups (1 minimum, 5 maximum) that authorize connections to brokers."
+          "documentation" : "The list of security groups (1 minimum, 5 maximum) that authorizes connections to brokers."
         }
       },
       "documentation" : "Updates the broker using the specified properties."
@@ -2594,7 +2635,7 @@
         "SecurityGroups" : {
           "shape" : "__listOf__string",
           "locationName" : "securityGroups",
-          "documentation" : "The list of security groups (1 minimum, 5 maximum) that authorize connections to brokers."
+          "documentation" : "The list of security groups (1 minimum, 5 maximum) that authorizes connections to brokers."
         }
       },
       "documentation" : "Returns information about the updated broker."
@@ -2636,7 +2677,7 @@
         "SecurityGroups" : {
           "shape" : "__listOf__string",
           "locationName" : "securityGroups",
-          "documentation" : "The list of security groups (1 minimum, 5 maximum) that authorize connections to brokers."
+          "documentation" : "The list of security groups (1 minimum, 5 maximum) that authorizes connections to brokers."
         }
       },
       "documentation" : "Updates the broker using the specified properties.",
@@ -2678,7 +2719,7 @@
         "SecurityGroups" : {
           "shape" : "__listOf__string",
           "locationName" : "securityGroups",
-          "documentation" : "The list of security groups (1 minimum, 5 maximum) that authorize connections to brokers."
+          "documentation" : "The list of security groups (1 minimum, 5 maximum) that authorizes connections to brokers."
         }
       }
     },
@@ -2997,6 +3038,12 @@
         "shape" : "ConfigurationRevision"
       }
     },
+    "__listOfDeploymentMode" : {
+      "type" : "list",
+      "member" : {
+        "shape" : "DeploymentMode"
+      }
+    },
     "__listOfEngineVersion" : {
       "type" : "list",
       "member" : {
@@ -3062,4 +3109,4 @@
     }
   },
   "documentation" : "Amazon MQ is a managed message broker service for Apache ActiveMQ that makes it easy to set up and operate message brokers in the cloud. A message broker allows software applications and components to communicate using various programming languages, operating systems, and formal messaging protocols."
-}
+}
\ No newline at end of file
diff --git a/services/mturk/build.properties b/services/mturk/build.properties
index ecf2dae6fcb1..15ec2da1fc71 100644
--- a/services/mturk/build.properties
+++ b/services/mturk/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/mturk/pom.xml b/services/mturk/pom.xml
index d2ca19305d9a..16afdb86ee23 100644
--- a/services/mturk/pom.xml
+++ b/services/mturk/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>mturk</artifactId>
     <name>AWS Java SDK :: Services :: Amazon Mechanical Turk Requester</name>
diff --git a/services/neptune/pom.xml b/services/neptune/pom.xml
index 0a387bc84be7..14d1a1f74071 100644
--- a/services/neptune/pom.xml
+++ b/services/neptune/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>neptune</artifactId>
     <name>AWS Java SDK :: Services :: Neptune</name>
diff --git a/services/neptune/src/main/resources/codegen-resources/service-2.json b/services/neptune/src/main/resources/codegen-resources/service-2.json
index cf3ebb8e74fc..ed8a484a390b 100644
--- a/services/neptune/src/main/resources/codegen-resources/service-2.json
+++ b/services/neptune/src/main/resources/codegen-resources/service-2.json
@@ -112,7 +112,7 @@
         {"shape":"SnapshotQuotaExceededFault"},
         {"shape":"KMSKeyNotAccessibleFault"}
       ],
-      "documentation":"<p>Copies a snapshot of a DB cluster.</p> <p>To copy a DB cluster snapshot from a shared manual DB cluster snapshot, <code>SourceDBClusterSnapshotIdentifier</code> must be the Amazon Resource Name (ARN) of the shared DB cluster snapshot.</p> <p>You can't copy from one AWS Region to another.</p>"
+      "documentation":"<p>Copies a snapshot of a DB cluster.</p> <p>To copy a DB cluster snapshot from a shared manual DB cluster snapshot, <code>SourceDBClusterSnapshotIdentifier</code> must be the Amazon Resource Name (ARN) of the shared DB cluster snapshot.</p>"
     },
     "CopyDBParameterGroup":{
       "name":"CopyDBParameterGroup",
@@ -160,7 +160,7 @@
         {"shape":"DBInstanceNotFoundFault"},
         {"shape":"DBSubnetGroupDoesNotCoverEnoughAZs"}
       ],
-      "documentation":"<p>Creates a new Amazon Neptune DB cluster.</p> <p>You can use the <code>ReplicationSourceIdentifier</code> parameter to create the DB cluster as a Read Replica of another DB cluster or Amazon Neptune DB instance.</p>"
+      "documentation":"<p>Creates a new Amazon Neptune DB cluster.</p> <p>You can use the <code>ReplicationSourceIdentifier</code> parameter to create the DB cluster as a Read Replica of another DB cluster or Amazon Neptune DB instance.</p> <p>Note that when you create a new cluster using <code>CreateDBCluster</code> directly, deletion protection is disabled by default (when you create a new production cluster in the console, deletion protection is enabled by default). You can only delete a DB cluster if its <code>DeletionProtection</code> field is set to <code>false</code>.</p>"
     },
     "CreateDBClusterParameterGroup":{
       "name":"CreateDBClusterParameterGroup",
@@ -309,7 +309,7 @@
         {"shape":"SnapshotQuotaExceededFault"},
         {"shape":"InvalidDBClusterSnapshotStateFault"}
       ],
-      "documentation":"<p>The DeleteDBCluster action deletes a previously provisioned DB cluster. When you delete a DB cluster, all automated backups for that DB cluster are deleted and can't be recovered. Manual DB cluster snapshots of the specified DB cluster are not deleted.</p>"
+      "documentation":"<p>The DeleteDBCluster action deletes a previously provisioned DB cluster. When you delete a DB cluster, all automated backups for that DB cluster are deleted and can't be recovered. Manual DB cluster snapshots of the specified DB cluster are not deleted.</p> <p>Note that the DB Cluster cannot be deleted if deletion protection is enabled. To delete it, you must first set its <code>DeletionProtection</code> field to <code>False</code>.</p>"
     },
     "DeleteDBClusterParameterGroup":{
       "name":"DeleteDBClusterParameterGroup",
@@ -359,7 +359,7 @@
         {"shape":"SnapshotQuotaExceededFault"},
         {"shape":"InvalidDBClusterStateFault"}
       ],
-      "documentation":"<p>The DeleteDBInstance action deletes a previously provisioned DB instance. When you delete a DB instance, all automated backups for that instance are deleted and can't be recovered. Manual DB snapshots of the DB instance to be deleted by <code>DeleteDBInstance</code> are not deleted.</p> <p> If you request a final DB snapshot the status of the Amazon Neptune DB instance is <code>deleting</code> until the DB snapshot is created. The API action <code>DescribeDBInstance</code> is used to monitor the status of this operation. The action can't be canceled or reverted once submitted.</p> <p>Note that when a DB instance is in a failure state and has a status of <code>failed</code>, <code>incompatible-restore</code>, or <code>incompatible-network</code>, you can only delete it when the <code>SkipFinalSnapshot</code> parameter is set to <code>true</code>.</p> <p>You can't delete a DB instance if it is the only instance in the DB cluster.</p>"
+      "documentation":"<p>The DeleteDBInstance action deletes a previously provisioned DB instance. When you delete a DB instance, all automated backups for that instance are deleted and can't be recovered. Manual DB snapshots of the DB instance to be deleted by <code>DeleteDBInstance</code> are not deleted.</p> <p> If you request a final DB snapshot the status of the Amazon Neptune DB instance is <code>deleting</code> until the DB snapshot is created. The API action <code>DescribeDBInstance</code> is used to monitor the status of this operation. The action can't be canceled or reverted once submitted.</p> <p>Note that when a DB instance is in a failure state and has a status of <code>failed</code>, <code>incompatible-restore</code>, or <code>incompatible-network</code>, you can only delete it when the <code>SkipFinalSnapshot</code> parameter is set to <code>true</code>.</p> <p>You can't delete a DB instance if it is the only instance in the DB cluster, or if it has deletion protection enabled.</p>"
     },
     "DeleteDBParameterGroup":{
       "name":"DeleteDBParameterGroup",
@@ -483,7 +483,7 @@
       "errors":[
         {"shape":"DBClusterNotFoundFault"}
       ],
-      "documentation":"<p>Returns information about provisioned DB clusters. This API supports pagination.</p>"
+      "documentation":"<p>Returns information about provisioned DB clusters, and supports pagination.</p> <note> <p>This operation can also return information for Amazon RDS clusters and Amazon DocDB clusters.</p> </note>"
     },
     "DescribeDBEngineVersions":{
       "name":"DescribeDBEngineVersions",
@@ -512,7 +512,7 @@
       "errors":[
         {"shape":"DBInstanceNotFoundFault"}
       ],
-      "documentation":"<p>Returns information about provisioned instances. This API supports pagination.</p>"
+      "documentation":"<p>Returns information about provisioned instances, and supports pagination.</p> <note> <p>This operation can also return information for Amazon RDS instances and Amazon DocDB instances.</p> </note>"
     },
     "DescribeDBParameterGroups":{
       "name":"DescribeDBParameterGroups",
@@ -1039,6 +1039,42 @@
         {"shape":"DBClusterParameterGroupNotFoundFault"}
       ],
       "documentation":"<p>Restores a DB cluster to an arbitrary point in time. Users can restore to any point in time before <code>LatestRestorableTime</code> for up to <code>BackupRetentionPeriod</code> days. The target DB cluster is created from the source DB cluster with the same configuration as the original DB cluster, except that the new DB cluster is created with the default DB security group.</p> <note> <p>This action only restores the DB cluster, not the DB instances for that DB cluster. You must invoke the <a>CreateDBInstance</a> action to create DB instances for the restored DB cluster, specifying the identifier of the restored DB cluster in <code>DBClusterIdentifier</code>. You can create DB instances only after the <code>RestoreDBClusterToPointInTime</code> action has completed and the DB cluster is available.</p> </note>"
+    },
+    "StartDBCluster":{
+      "name":"StartDBCluster",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"StartDBClusterMessage"},
+      "output":{
+        "shape":"StartDBClusterResult",
+        "resultWrapper":"StartDBClusterResult"
+      },
+      "errors":[
+        {"shape":"DBClusterNotFoundFault"},
+        {"shape":"InvalidDBClusterStateFault"},
+        {"shape":"InvalidDBInstanceStateFault"}
+      ],
+      "documentation":"<p>Starts an Amazon Neptune DB cluster that was stopped using the AWS console, the AWS CLI stop-db-cluster command, or the StopDBCluster API.</p>"
+    },
+    "StopDBCluster":{
+      "name":"StopDBCluster",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"StopDBClusterMessage"},
+      "output":{
+        "shape":"StopDBClusterResult",
+        "resultWrapper":"StopDBClusterResult"
+      },
+      "errors":[
+        {"shape":"DBClusterNotFoundFault"},
+        {"shape":"InvalidDBClusterStateFault"},
+        {"shape":"InvalidDBInstanceStateFault"}
+      ],
+      "documentation":"<p>Stops an Amazon Neptune DB cluster. When you stop a DB cluster, Neptune retains the DB cluster's metadata, including its endpoints and DB parameter groups.</p> <p>Neptune also retains the transaction logs so you can do a point-in-time restore if necessary.</p>"
     }
   },
   "shapes":{
@@ -1269,7 +1305,7 @@
         },
         "KmsKeyId":{
           "shape":"String",
-          "documentation":"<p>The AWS AWS KMS key ID for an encrypted DB cluster snapshot. The KMS key ID is the Amazon Resource Name (ARN), KMS key identifier, or the KMS key alias for the KMS encryption key.</p> <p>If you copy an unencrypted DB cluster snapshot and specify a value for the <code>KmsKeyId</code> parameter, Amazon Neptune encrypts the target DB cluster snapshot using the specified KMS encryption key.</p> <p>If you copy an encrypted DB cluster snapshot from your AWS account, you can specify a value for <code>KmsKeyId</code> to encrypt the copy with a new KMS encryption key. If you don't specify a value for <code>KmsKeyId</code>, then the copy of the DB cluster snapshot is encrypted with the same KMS key as the source DB cluster snapshot.</p> <p>If you copy an encrypted DB cluster snapshot that is shared from another AWS account, then you must specify a value for <code>KmsKeyId</code>.</p> <p> KMS encryption keys are specific to the AWS Region that they are created in, and you can't use encryption keys from one AWS Region in another AWS Region.</p>"
+          "documentation":"<p>The AWS AWS KMS key ID for an encrypted DB cluster snapshot. The KMS key ID is the Amazon Resource Name (ARN), KMS key identifier, or the KMS key alias for the KMS encryption key.</p> <p>If you copy an encrypted DB cluster snapshot from your AWS account, you can specify a value for <code>KmsKeyId</code> to encrypt the copy with a new KMS encryption key. If you don't specify a value for <code>KmsKeyId</code>, then the copy of the DB cluster snapshot is encrypted with the same KMS key as the source DB cluster snapshot.</p> <p>If you copy an encrypted DB cluster snapshot that is shared from another AWS account, then you must specify a value for <code>KmsKeyId</code>.</p> <p> KMS encryption keys are specific to the AWS Region that they are created in, and you can't use encryption keys from one AWS Region in another AWS Region.</p> <p>You cannot encrypt an unencrypted DB cluster snapshot when you copy it. If you try to copy an unencrypted DB cluster snapshot and specify a value for the KmsKeyId parameter, an error is returned.</p>"
         },
         "PreSignedUrl":{
           "shape":"String",
@@ -1340,7 +1376,7 @@
         },
         "CharacterSetName":{
           "shape":"String",
-          "documentation":"<p>A value that indicates that the DB cluster should be associated with the specified CharacterSet.</p>"
+          "documentation":"<p> <i>(Not supported by Neptune)</i> </p>"
         },
         "DatabaseName":{
           "shape":"String",
@@ -1368,7 +1404,7 @@
         },
         "EngineVersion":{
           "shape":"String",
-          "documentation":"<p>The version number of the database engine to use.</p> <p>Example: <code>1.0.1</code> </p>"
+          "documentation":"<p>The version number of the database engine to use. Currently, setting this parameter has no effect.</p> <p>Example: <code>1.0.1</code> </p>"
         },
         "Port":{
           "shape":"IntegerOptional",
@@ -1384,7 +1420,7 @@
         },
         "OptionGroupName":{
           "shape":"String",
-          "documentation":"<p>A value that indicates that the DB cluster should be associated with the specified option group.</p> <p>Permanent options can't be removed from an option group. The option group can't be removed from a DB cluster once it is associated with a DB cluster.</p>"
+          "documentation":"<p> <i>(Not supported by Neptune)</i> </p>"
         },
         "PreferredBackupWindow":{
           "shape":"String",
@@ -1421,6 +1457,10 @@
         "EnableCloudwatchLogsExports":{
           "shape":"LogTypeList",
           "documentation":"<p>The list of log types that need to be enabled for exporting to CloudWatch Logs.</p>"
+        },
+        "DeletionProtection":{
+          "shape":"BooleanOptional",
+          "documentation":"<p>A value that indicates whether the DB cluster has deletion protection enabled. The database can't be deleted when deletion protection is enabled. By default, deletion protection is enabled.</p>"
         }
       }
     },
@@ -1567,7 +1607,7 @@
         },
         "EngineVersion":{
           "shape":"String",
-          "documentation":"<p>The version number of the database engine to use.</p>"
+          "documentation":"<p>The version number of the database engine to use. Currently, setting this parameter has no effect.</p>"
         },
         "AutoMinorVersionUpgrade":{
           "shape":"BooleanOptional",
@@ -1583,11 +1623,11 @@
         },
         "OptionGroupName":{
           "shape":"String",
-          "documentation":"<p>Indicates that the DB instance should be associated with the specified option group.</p> <p>Permanent options, such as the TDE option for Oracle Advanced Security TDE, can't be removed from an option group, and that option group can't be removed from a DB instance once it is associated with a DB instance</p>"
+          "documentation":"<p> <i>(Not supported by Neptune)</i> </p>"
         },
         "CharacterSetName":{
           "shape":"String",
-          "documentation":"<p>Indicates that the DB instance should be associated with the specified CharacterSet.</p> <p>Not applicable. The character set is managed by the DB cluster. For more information, see <a>CreateDBCluster</a>.</p>"
+          "documentation":"<p> <i>(Not supported by Neptune)</i> </p>"
         },
         "PubliclyAccessible":{
           "shape":"BooleanOptional",
@@ -1656,15 +1696,19 @@
         },
         "EnablePerformanceInsights":{
           "shape":"BooleanOptional",
-          "documentation":"<p>True to enable Performance Insights for the DB instance, and otherwise false.</p>"
+          "documentation":"<p> <i>(Not supported by Neptune)</i> </p>"
         },
         "PerformanceInsightsKMSKeyId":{
           "shape":"String",
-          "documentation":"<p>The AWS KMS key identifier for encryption of Performance Insights data. The KMS key ID is the Amazon Resource Name (ARN), KMS key identifier, or the KMS key alias for the KMS encryption key.</p>"
+          "documentation":"<p> <i>(Not supported by Neptune)</i> </p>"
         },
         "EnableCloudwatchLogsExports":{
           "shape":"LogTypeList",
           "documentation":"<p>The list of log types that need to be enabled for exporting to CloudWatch Logs.</p>"
+        },
+        "DeletionProtection":{
+          "shape":"BooleanOptional",
+          "documentation":"<p>A value that indicates whether the DB instance has deletion protection enabled. The database can't be deleted when deletion protection is enabled. By default, deletion protection is disabled. See <a href=\"https://docs.aws.amazon.com/neptune/latest/userguide/manage-console-instances-delete.html\">Deleting a DB Instance</a>.</p> <p>DB instances in a DB cluster can be deleted even when deletion protection is enabled in their parent DB cluster.</p>"
         }
       }
     },
@@ -1798,7 +1842,7 @@
         },
         "CharacterSetName":{
           "shape":"String",
-          "documentation":"<p>If present, specifies the name of the character set that this cluster is associated with.</p>"
+          "documentation":"<p> <i>(Not supported by Neptune)</i> </p>"
         },
         "DatabaseName":{
           "shape":"String",
@@ -1862,7 +1906,7 @@
         },
         "DBClusterOptionGroupMemberships":{
           "shape":"DBClusterOptionGroupMemberships",
-          "documentation":"<p>Provides the list of option group memberships for this DB cluster.</p>"
+          "documentation":"<p> <i>(Not supported by Neptune)</i> </p>"
         },
         "PreferredBackupWindow":{
           "shape":"String",
@@ -1927,6 +1971,10 @@
         "EnabledCloudwatchLogsExports":{
           "shape":"LogTypeList",
           "documentation":"<p>A list of log types that this DB cluster is configured to export to CloudWatch Logs.</p>"
+        },
+        "DeletionProtection":{
+          "shape":"BooleanOptional",
+          "documentation":"<p>Indicates whether or not the DB cluster has deletion protection enabled. The database can't be deleted when deletion protection is enabled.</p>"
         }
       },
       "documentation":"<p>Contains the details of an Amazon Neptune DB cluster.</p> <p>This data type is used as a response element in the <a>DescribeDBClusters</a> action.</p>",
@@ -2182,7 +2230,7 @@
         },
         "DBClusterSnapshotIdentifier":{
           "shape":"String",
-          "documentation":"<p>Specifies the identifier for the DB cluster snapshot.</p>"
+          "documentation":"<p>Specifies the identifier for a DB cluster snapshot. Must match the identifier of an existing snapshot.</p> <p>After you restore a DB cluster using a <code>DBClusterSnapshotIdentifier</code>, you must specify the same <code>DBClusterSnapshotIdentifier</code> for any future updates to the DB cluster. When you specify this property for an update, the DB cluster is not restored from the snapshot again, and the data in the database is not changed.</p> <p>However, if you don't specify the <code>DBClusterSnapshotIdentifier</code>, an empty DB cluster is created, and the original DB cluster is deleted. If you specify a property that is different from the previous snapshot restore property, the DB cluster is restored from the snapshot specified by the <code>DBClusterSnapshotIdentifier</code>, and the original DB cluster is deleted.</p>"
         },
         "DBClusterIdentifier":{
           "shape":"String",
@@ -2365,11 +2413,11 @@
         },
         "DefaultCharacterSet":{
           "shape":"CharacterSet",
-          "documentation":"<p> The default character set for new instances of this engine version, if the <code>CharacterSetName</code> parameter of the CreateDBInstance API is not specified.</p>"
+          "documentation":"<p> <i>(Not supported by Neptune)</i> </p>"
         },
         "SupportedCharacterSets":{
           "shape":"SupportedCharacterSetsList",
-          "documentation":"<p> A list of the character sets supported by this engine for the <code>CharacterSetName</code> parameter of the <code>CreateDBInstance</code> action.</p>"
+          "documentation":"<p> <i>(Not supported by Neptune)</i> </p>"
         },
         "ValidUpgradeTarget":{
           "shape":"ValidUpgradeTargetList",
@@ -2527,11 +2575,11 @@
         },
         "OptionGroupMemberships":{
           "shape":"OptionGroupMembershipList",
-          "documentation":"<p>Provides the list of option group memberships for this DB instance.</p>"
+          "documentation":"<p> <i>(Not supported by Neptune)</i> </p>"
         },
         "CharacterSetName":{
           "shape":"String",
-          "documentation":"<p>If present, specifies the name of the character set that this instance is associated with.</p>"
+          "documentation":"<p> <i>(Not supported by Neptune)</i> </p>"
         },
         "SecondaryAvailabilityZone":{
           "shape":"String",
@@ -2616,15 +2664,19 @@
         },
         "PerformanceInsightsEnabled":{
           "shape":"BooleanOptional",
-          "documentation":"<p>True if Performance Insights is enabled for the DB instance, and otherwise false.</p>"
+          "documentation":"<p> <i>(Not supported by Neptune)</i> </p>"
         },
         "PerformanceInsightsKMSKeyId":{
           "shape":"String",
-          "documentation":"<p>The AWS KMS key identifier for encryption of Performance Insights data. The KMS key ID is the Amazon Resource Name (ARN), KMS key identifier, or the KMS key alias for the KMS encryption key.</p>"
+          "documentation":"<p> <i>(Not supported by Neptune)</i> </p>"
         },
         "EnabledCloudwatchLogsExports":{
           "shape":"LogTypeList",
           "documentation":"<p>A list of log types that this DB instance is configured to export to CloudWatch Logs.</p>"
+        },
+        "DeletionProtection":{
+          "shape":"BooleanOptional",
+          "documentation":"<p>Indicates whether or not the DB instance has deletion protection enabled. The instance can't be deleted when deletion protection is enabled. See <a href=\"https://docs.aws.amazon.com/neptune/latest/userguide/manage-console-instances-delete.html\">Deleting a DB Instance</a>.</p>"
         }
       },
       "documentation":"<p>Contains the details of an Amazon Neptune DB instance.</p> <p>This data type is used as a response element in the <a>DescribeDBInstances</a> action.</p>",
@@ -3231,7 +3283,7 @@
         },
         "Filters":{
           "shape":"FilterList",
-          "documentation":"<p>A filter that specifies one or more DB clusters to describe.</p> <p>Supported filters:</p> <ul> <li> <p> <code>db-cluster-id</code> - Accepts DB cluster identifiers and DB cluster Amazon Resource Names (ARNs). The results list will only include information about the DB clusters identified by these ARNs.</p> </li> </ul>"
+          "documentation":"<p>A filter that specifies one or more DB clusters to describe.</p> <p>Supported filters:</p> <ul> <li> <p> <code>db-cluster-id</code> - Accepts DB cluster identifiers and DB cluster Amazon Resource Names (ARNs). The results list will only include information about the DB clusters identified by these ARNs.</p> </li> <li> <p> <code>engine</code> - Accepts an engine name (such as <code>neptune</code>), and restricts the results list to DB clusters created by that engine.</p> </li> </ul> <p>For example, to invoke this API from the AWS CLI and filter so that only Neptune DB clusters are returned, you could use the following command:</p>"
         },
         "MaxRecords":{
           "shape":"IntegerOptional",
@@ -3293,7 +3345,7 @@
         },
         "Filters":{
           "shape":"FilterList",
-          "documentation":"<p>A filter that specifies one or more DB instances to describe.</p> <p>Supported filters:</p> <ul> <li> <p> <code>db-cluster-id</code> - Accepts DB cluster identifiers and DB cluster Amazon Resource Names (ARNs). The results list will only include information about the DB instances associated with the DB clusters identified by these ARNs.</p> </li> <li> <p> <code>db-instance-id</code> - Accepts DB instance identifiers and DB instance Amazon Resource Names (ARNs). The results list will only include information about the DB instances identified by these ARNs.</p> </li> </ul>"
+          "documentation":"<p>A filter that specifies one or more DB instances to describe.</p> <p>Supported filters:</p> <ul> <li> <p> <code>db-cluster-id</code> - Accepts DB cluster identifiers and DB cluster Amazon Resource Names (ARNs). The results list will only include information about the DB instances associated with the DB clusters identified by these ARNs.</p> </li> <li> <p> <code>engine</code> - Accepts an engine name (such as <code>neptune</code>), and restricts the results list to DB instances created by that engine.</p> </li> </ul> <p>For example, to invoke this API from the AWS CLI and filter so that only Neptune DB instances are returned, you could use the following command:</p>"
         },
         "MaxRecords":{
           "shape":"IntegerOptional",
@@ -4164,7 +4216,7 @@
         },
         "OptionGroupName":{
           "shape":"String",
-          "documentation":"<p>A value that indicates that the DB cluster should be associated with the specified option group. Changing this parameter doesn't result in an outage except in the following case, and the change is applied during the next maintenance window unless the <code>ApplyImmediately</code> parameter is set to <code>true</code> for this request. If the parameter change results in an option group that enables OEM, this change can cause a brief (sub-second) period during which new connections are rejected but existing connections are not interrupted.</p> <p>Permanent options can't be removed from an option group. The option group can't be removed from a DB cluster once it is associated with a DB cluster.</p>"
+          "documentation":"<p> <i>(Not supported by Neptune)</i> </p>"
         },
         "PreferredBackupWindow":{
           "shape":"String",
@@ -4184,7 +4236,11 @@
         },
         "EngineVersion":{
           "shape":"String",
-          "documentation":"<p>The version number of the database engine to which you want to upgrade. Changing this parameter results in an outage. The change is applied during the next maintenance window unless the ApplyImmediately parameter is set to true.</p> <p>For a list of valid engine versions, see <a>CreateDBInstance</a>, or call <a>DescribeDBEngineVersions</a>.</p>"
+          "documentation":"<p>The version number of the database engine. Currently, setting this parameter has no effect. To upgrade your database engine to the most recent release, use the <a>ApplyPendingMaintenanceAction</a> API.</p> <p>For a list of valid engine versions, see <a>CreateDBInstance</a>, or call <a>DescribeDBEngineVersions</a>.</p>"
+        },
+        "DeletionProtection":{
+          "shape":"BooleanOptional",
+          "documentation":"<p>A value that indicates whether the DB cluster has deletion protection enabled. The database can't be deleted when deletion protection is enabled. By default, deletion protection is disabled.</p>"
         }
       }
     },
@@ -4300,11 +4356,11 @@
         },
         "EngineVersion":{
           "shape":"String",
-          "documentation":"<p> The version number of the database engine to upgrade to. Changing this parameter results in an outage and the change is applied during the next maintenance window unless the <code>ApplyImmediately</code> parameter is set to <code>true</code> for this request.</p> <p>For major version upgrades, if a nondefault DB parameter group is currently in use, a new DB parameter group in the DB parameter group family for the new engine version must be specified. The new DB parameter group can be the default for that DB parameter group family.</p>"
+          "documentation":"<p>The version number of the database engine to upgrade to. Currently, setting this parameter has no effect. To upgrade your database engine to the most recent release, use the <a>ApplyPendingMaintenanceAction</a> API.</p>"
         },
         "AllowMajorVersionUpgrade":{
           "shape":"Boolean",
-          "documentation":"<p>Indicates that major version upgrades are allowed. Changing this parameter doesn't result in an outage and the change is asynchronously applied as soon as possible.</p> <p>Constraints: This parameter must be set to true when specifying a value for the EngineVersion parameter that is a different major version than the DB instance's current version.</p>"
+          "documentation":"<p>Indicates that major version upgrades are allowed. Changing this parameter doesn't result in an outage and the change is asynchronously applied as soon as possible.</p>"
         },
         "AutoMinorVersionUpgrade":{
           "shape":"BooleanOptional",
@@ -4320,7 +4376,7 @@
         },
         "OptionGroupName":{
           "shape":"String",
-          "documentation":"<p> Indicates that the DB instance should be associated with the specified option group. Changing this parameter doesn't result in an outage except in the following case and the change is applied during the next maintenance window unless the <code>ApplyImmediately</code> parameter is set to <code>true</code> for this request. If the parameter change results in an option group that enables OEM, this change can cause a brief (sub-second) period during which new connections are rejected but existing connections are not interrupted.</p> <p>Permanent options, such as the TDE option for Oracle Advanced Security TDE, can't be removed from an option group, and that option group can't be removed from a DB instance once it is associated with a DB instance</p>"
+          "documentation":"<p> <i>(Not supported by Neptune)</i> </p>"
         },
         "NewDBInstanceIdentifier":{
           "shape":"String",
@@ -4381,15 +4437,19 @@
         },
         "EnablePerformanceInsights":{
           "shape":"BooleanOptional",
-          "documentation":"<p>Not supported.</p>"
+          "documentation":"<p> <i>(Not supported by Neptune)</i> </p>"
         },
         "PerformanceInsightsKMSKeyId":{
           "shape":"String",
-          "documentation":"<p>Not supported.</p>"
+          "documentation":"<p> <i>(Not supported by Neptune)</i> </p>"
         },
         "CloudwatchLogsExportConfiguration":{
           "shape":"CloudwatchLogsExportConfiguration",
           "documentation":"<p>The configuration setting for the log types to be enabled for export to CloudWatch Logs for a specific DB instance or DB cluster.</p>"
+        },
+        "DeletionProtection":{
+          "shape":"BooleanOptional",
+          "documentation":"<p>A value that indicates whether the DB instance has deletion protection enabled. The database can't be deleted when deletion protection is enabled. By default, deletion protection is disabled. See <a href=\"https://docs.aws.amazon.com/neptune/latest/userguide/manage-console-instances-delete.html\">Deleting a DB Instance</a>.</p>"
         }
       }
     },
@@ -4565,7 +4625,7 @@
         },
         "SupportsPerformanceInsights":{
           "shape":"Boolean",
-          "documentation":"<p>True if a DB instance supports Performance Insights, otherwise false.</p>"
+          "documentation":"<p> <i>(Not supported by Neptune)</i> </p>"
         },
         "MinStorageSize":{
           "shape":"IntegerOptional",
@@ -4796,7 +4856,7 @@
         },
         "PendingCloudwatchLogsExports":{
           "shape":"PendingCloudwatchLogsExports",
-          "documentation":"<p>Specifies the CloudWatch logs to be exported.</p>"
+          "documentation":"<p>This <code>PendingCloudwatchLogsExports</code> structure specifies pending changes to which CloudWatch logs are enabled and which are disabled.</p>"
         }
       },
       "documentation":"<p> This data type is used as a response element in the <a>ModifyDBInstance</a> action.</p>"
@@ -5057,7 +5117,7 @@
         },
         "OptionGroupName":{
           "shape":"String",
-          "documentation":"<p>The name of the option group to use for the restored DB cluster.</p>"
+          "documentation":"<p> <i>(Not supported by Neptune)</i> </p>"
         },
         "VpcSecurityGroupIds":{
           "shape":"VpcSecurityGroupIdList",
@@ -5082,6 +5142,10 @@
         "DBClusterParameterGroupName":{
           "shape":"String",
           "documentation":"<p>The name of the DB cluster parameter group to associate with the new DB cluster.</p> <p>Constraints:</p> <ul> <li> <p>If supplied, must match the name of an existing DBClusterParameterGroup.</p> </li> </ul>"
+        },
+        "DeletionProtection":{
+          "shape":"BooleanOptional",
+          "documentation":"<p>A value that indicates whether the DB cluster has deletion protection enabled. The database can't be deleted when deletion protection is enabled. By default, deletion protection is disabled. </p>"
         }
       }
     },
@@ -5128,7 +5192,7 @@
         },
         "OptionGroupName":{
           "shape":"String",
-          "documentation":"<p>The name of the option group for the new DB cluster.</p>"
+          "documentation":"<p> <i>(Not supported by Neptune)</i> </p>"
         },
         "VpcSecurityGroupIds":{
           "shape":"VpcSecurityGroupIdList",
@@ -5153,6 +5217,10 @@
         "DBClusterParameterGroupName":{
           "shape":"String",
           "documentation":"<p>The name of the DB cluster parameter group to associate with the new DB cluster.</p> <p>Constraints:</p> <ul> <li> <p>If supplied, must match the name of an existing DBClusterParameterGroup.</p> </li> </ul>"
+        },
+        "DeletionProtection":{
+          "shape":"BooleanOptional",
+          "documentation":"<p>A value that indicates whether the DB cluster has deletion protection enabled. The database can't be deleted when deletion protection is enabled. By default, deletion protection is disabled. </p>"
         }
       }
     },
@@ -5252,6 +5320,38 @@
         "db-cluster-snapshot"
       ]
     },
+    "StartDBClusterMessage":{
+      "type":"structure",
+      "required":["DBClusterIdentifier"],
+      "members":{
+        "DBClusterIdentifier":{
+          "shape":"String",
+          "documentation":"<p>The DB cluster identifier of the Neptune DB cluster to be started. This parameter is stored as a lowercase string.</p>"
+        }
+      }
+    },
+    "StartDBClusterResult":{
+      "type":"structure",
+      "members":{
+        "DBCluster":{"shape":"DBCluster"}
+      }
+    },
+    "StopDBClusterMessage":{
+      "type":"structure",
+      "required":["DBClusterIdentifier"],
+      "members":{
+        "DBClusterIdentifier":{
+          "shape":"String",
+          "documentation":"<p>The DB cluster identifier of the Neptune DB cluster to be stopped. This parameter is stored as a lowercase string.</p>"
+        }
+      }
+    },
+    "StopDBClusterResult":{
+      "type":"structure",
+      "members":{
+        "DBCluster":{"shape":"DBCluster"}
+      }
+    },
     "StorageQuotaExceededFault":{
       "type":"structure",
       "members":{
diff --git a/services/networkmanager/pom.xml b/services/networkmanager/pom.xml
new file mode 100644
index 000000000000..4c1792b34131
--- /dev/null
+++ b/services/networkmanager/pom.xml
@@ -0,0 +1,60 @@
+<?xml version="1.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.
+  -->
+
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>software.amazon.awssdk</groupId>
+        <artifactId>services</artifactId>
+        <version>2.11.8-SNAPSHOT</version>
+    </parent>
+    <artifactId>networkmanager</artifactId>
+    <name>AWS Java SDK :: Services :: NetworkManager</name>
+    <description>The AWS Java SDK for NetworkManager module holds the client classes that are used for
+        communicating with NetworkManager.
+    </description>
+    <url>https://aws.amazon.com/sdkforjava</url>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifestEntries>
+                            <Automatic-Module-Name>software.amazon.awssdk.services.networkmanager</Automatic-Module-Name>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>protocol-core</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>aws-json-protocol</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/services/networkmanager/src/main/resources/codegen-resources/paginators-1.json b/services/networkmanager/src/main/resources/codegen-resources/paginators-1.json
new file mode 100644
index 000000000000..37b8fedd68d2
--- /dev/null
+++ b/services/networkmanager/src/main/resources/codegen-resources/paginators-1.json
@@ -0,0 +1,46 @@
+{
+  "pagination": {
+    "DescribeGlobalNetworks": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "MaxResults",
+      "result_key": "GlobalNetworks"
+    },
+    "GetCustomerGatewayAssociations": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "MaxResults",
+      "result_key": "CustomerGatewayAssociations"
+    },
+    "GetDevices": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "MaxResults",
+      "result_key": "Devices"
+    },
+    "GetLinkAssociations": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "MaxResults",
+      "result_key": "LinkAssociations"
+    },
+    "GetLinks": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "MaxResults",
+      "result_key": "Links"
+    },
+    "GetSites": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "MaxResults",
+      "result_key": "Sites"
+    },
+    "GetTransitGatewayRegistrations": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "MaxResults",
+      "result_key": "TransitGatewayRegistrations"
+    }
+  }
+}
diff --git a/services/networkmanager/src/main/resources/codegen-resources/service-2.json b/services/networkmanager/src/main/resources/codegen-resources/service-2.json
new file mode 100644
index 000000000000..5912f67de933
--- /dev/null
+++ b/services/networkmanager/src/main/resources/codegen-resources/service-2.json
@@ -0,0 +1,2133 @@
+{
+  "version":"2.0",
+  "metadata":{
+    "apiVersion":"2019-07-05",
+    "endpointPrefix":"networkmanager",
+    "jsonVersion":"1.1",
+    "protocol":"rest-json",
+    "serviceAbbreviation":"NetworkManager",
+    "serviceFullName":"AWS Network Manager",
+    "serviceId":"NetworkManager",
+    "signatureVersion":"v4",
+    "signingName":"networkmanager",
+    "uid":"networkmanager-2019-07-05"
+  },
+  "operations":{
+    "AssociateCustomerGateway":{
+      "name":"AssociateCustomerGateway",
+      "http":{
+        "method":"POST",
+        "requestUri":"/global-networks/{globalNetworkId}/customer-gateway-associations"
+      },
+      "input":{"shape":"AssociateCustomerGatewayRequest"},
+      "output":{"shape":"AssociateCustomerGatewayResponse"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"ServiceQuotaExceededException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ConflictException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Associates a customer gateway with a device and optionally, with a link. If you specify a link, it must be associated with the specified device. </p> <p>You can only associate customer gateways that are connected to a VPN attachment on a transit gateway. The transit gateway must be registered in your global network. When you register a transit gateway, customer gateways that are connected to the transit gateway are automatically included in the global network. To list customer gateways that are connected to a transit gateway, use the <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_DescribeVpnConnections.html\">DescribeVpnConnections</a> EC2 API and filter by <code>transit-gateway-id</code>.</p> <p>You cannot associate a customer gateway with more than one device and link. </p>"
+    },
+    "AssociateLink":{
+      "name":"AssociateLink",
+      "http":{
+        "method":"POST",
+        "requestUri":"/global-networks/{globalNetworkId}/link-associations"
+      },
+      "input":{"shape":"AssociateLinkRequest"},
+      "output":{"shape":"AssociateLinkResponse"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"ServiceQuotaExceededException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ConflictException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Associates a link to a device. A device can be associated to multiple links and a link can be associated to multiple devices. The device and link must be in the same global network and the same site.</p>"
+    },
+    "CreateDevice":{
+      "name":"CreateDevice",
+      "http":{
+        "method":"POST",
+        "requestUri":"/global-networks/{globalNetworkId}/devices"
+      },
+      "input":{"shape":"CreateDeviceRequest"},
+      "output":{"shape":"CreateDeviceResponse"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"ServiceQuotaExceededException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ConflictException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Creates a new device in a global network. If you specify both a site ID and a location, the location of the site is used for visualization in the Network Manager console.</p>"
+    },
+    "CreateGlobalNetwork":{
+      "name":"CreateGlobalNetwork",
+      "http":{
+        "method":"POST",
+        "requestUri":"/global-networks"
+      },
+      "input":{"shape":"CreateGlobalNetworkRequest"},
+      "output":{"shape":"CreateGlobalNetworkResponse"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"ServiceQuotaExceededException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"ConflictException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Creates a new, empty global network.</p>"
+    },
+    "CreateLink":{
+      "name":"CreateLink",
+      "http":{
+        "method":"POST",
+        "requestUri":"/global-networks/{globalNetworkId}/links"
+      },
+      "input":{"shape":"CreateLinkRequest"},
+      "output":{"shape":"CreateLinkResponse"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"ServiceQuotaExceededException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ConflictException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Creates a new link for a specified site.</p>"
+    },
+    "CreateSite":{
+      "name":"CreateSite",
+      "http":{
+        "method":"POST",
+        "requestUri":"/global-networks/{globalNetworkId}/sites"
+      },
+      "input":{"shape":"CreateSiteRequest"},
+      "output":{"shape":"CreateSiteResponse"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"ServiceQuotaExceededException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ConflictException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Creates a new site in a global network.</p>"
+    },
+    "DeleteDevice":{
+      "name":"DeleteDevice",
+      "http":{
+        "method":"DELETE",
+        "requestUri":"/global-networks/{globalNetworkId}/devices/{deviceId}"
+      },
+      "input":{"shape":"DeleteDeviceRequest"},
+      "output":{"shape":"DeleteDeviceResponse"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ConflictException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Deletes an existing device. You must first disassociate the device from any links and customer gateways.</p>"
+    },
+    "DeleteGlobalNetwork":{
+      "name":"DeleteGlobalNetwork",
+      "http":{
+        "method":"DELETE",
+        "requestUri":"/global-networks/{globalNetworkId}"
+      },
+      "input":{"shape":"DeleteGlobalNetworkRequest"},
+      "output":{"shape":"DeleteGlobalNetworkResponse"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ConflictException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Deletes an existing global network. You must first delete all global network objects (devices, links, and sites) and deregister all transit gateways.</p>"
+    },
+    "DeleteLink":{
+      "name":"DeleteLink",
+      "http":{
+        "method":"DELETE",
+        "requestUri":"/global-networks/{globalNetworkId}/links/{linkId}"
+      },
+      "input":{"shape":"DeleteLinkRequest"},
+      "output":{"shape":"DeleteLinkResponse"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ConflictException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Deletes an existing link. You must first disassociate the link from any devices and customer gateways.</p>"
+    },
+    "DeleteSite":{
+      "name":"DeleteSite",
+      "http":{
+        "method":"DELETE",
+        "requestUri":"/global-networks/{globalNetworkId}/sites/{siteId}"
+      },
+      "input":{"shape":"DeleteSiteRequest"},
+      "output":{"shape":"DeleteSiteResponse"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ConflictException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Deletes an existing site. The site cannot be associated with any device or link.</p>"
+    },
+    "DeregisterTransitGateway":{
+      "name":"DeregisterTransitGateway",
+      "http":{
+        "method":"DELETE",
+        "requestUri":"/global-networks/{globalNetworkId}/transit-gateway-registrations/{transitGatewayArn}"
+      },
+      "input":{"shape":"DeregisterTransitGatewayRequest"},
+      "output":{"shape":"DeregisterTransitGatewayResponse"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ConflictException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Deregisters a transit gateway from your global network. This action does not delete your transit gateway, or modify any of its attachments. This action removes any customer gateway associations.</p>"
+    },
+    "DescribeGlobalNetworks":{
+      "name":"DescribeGlobalNetworks",
+      "http":{
+        "method":"GET",
+        "requestUri":"/global-networks"
+      },
+      "input":{"shape":"DescribeGlobalNetworksRequest"},
+      "output":{"shape":"DescribeGlobalNetworksResponse"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Describes one or more global networks. By default, all global networks are described. To describe the objects in your global network, you must use the appropriate <code>Get*</code> action. For example, to list the transit gateways in your global network, use <a>GetTransitGatewayRegistrations</a>.</p>"
+    },
+    "DisassociateCustomerGateway":{
+      "name":"DisassociateCustomerGateway",
+      "http":{
+        "method":"DELETE",
+        "requestUri":"/global-networks/{globalNetworkId}/customer-gateway-associations/{customerGatewayArn}"
+      },
+      "input":{"shape":"DisassociateCustomerGatewayRequest"},
+      "output":{"shape":"DisassociateCustomerGatewayResponse"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ConflictException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Disassociates a customer gateway from a device and a link.</p>"
+    },
+    "DisassociateLink":{
+      "name":"DisassociateLink",
+      "http":{
+        "method":"DELETE",
+        "requestUri":"/global-networks/{globalNetworkId}/link-associations"
+      },
+      "input":{"shape":"DisassociateLinkRequest"},
+      "output":{"shape":"DisassociateLinkResponse"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ConflictException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Disassociates an existing device from a link. You must first disassociate any customer gateways that are associated with the link.</p>"
+    },
+    "GetCustomerGatewayAssociations":{
+      "name":"GetCustomerGatewayAssociations",
+      "http":{
+        "method":"GET",
+        "requestUri":"/global-networks/{globalNetworkId}/customer-gateway-associations"
+      },
+      "input":{"shape":"GetCustomerGatewayAssociationsRequest"},
+      "output":{"shape":"GetCustomerGatewayAssociationsResponse"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ConflictException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Gets the association information for customer gateways that are associated with devices and links in your global network.</p>"
+    },
+    "GetDevices":{
+      "name":"GetDevices",
+      "http":{
+        "method":"GET",
+        "requestUri":"/global-networks/{globalNetworkId}/devices"
+      },
+      "input":{"shape":"GetDevicesRequest"},
+      "output":{"shape":"GetDevicesResponse"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Gets information about one or more of your devices in a global network.</p>"
+    },
+    "GetLinkAssociations":{
+      "name":"GetLinkAssociations",
+      "http":{
+        "method":"GET",
+        "requestUri":"/global-networks/{globalNetworkId}/link-associations"
+      },
+      "input":{"shape":"GetLinkAssociationsRequest"},
+      "output":{"shape":"GetLinkAssociationsResponse"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Gets the link associations for a device or a link. Either the device ID or the link ID must be specified.</p>"
+    },
+    "GetLinks":{
+      "name":"GetLinks",
+      "http":{
+        "method":"GET",
+        "requestUri":"/global-networks/{globalNetworkId}/links"
+      },
+      "input":{"shape":"GetLinksRequest"},
+      "output":{"shape":"GetLinksResponse"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Gets information about one or more links in a specified global network.</p> <p>If you specify the site ID, you cannot specify the type or provider in the same request. You can specify the type and provider in the same request.</p>"
+    },
+    "GetSites":{
+      "name":"GetSites",
+      "http":{
+        "method":"GET",
+        "requestUri":"/global-networks/{globalNetworkId}/sites"
+      },
+      "input":{"shape":"GetSitesRequest"},
+      "output":{"shape":"GetSitesResponse"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Gets information about one or more of your sites in a global network.</p>"
+    },
+    "GetTransitGatewayRegistrations":{
+      "name":"GetTransitGatewayRegistrations",
+      "http":{
+        "method":"GET",
+        "requestUri":"/global-networks/{globalNetworkId}/transit-gateway-registrations"
+      },
+      "input":{"shape":"GetTransitGatewayRegistrationsRequest"},
+      "output":{"shape":"GetTransitGatewayRegistrationsResponse"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Gets information about the transit gateway registrations in a specified global network.</p>"
+    },
+    "ListTagsForResource":{
+      "name":"ListTagsForResource",
+      "http":{
+        "method":"GET",
+        "requestUri":"/tags/{resourceArn}"
+      },
+      "input":{"shape":"ListTagsForResourceRequest"},
+      "output":{"shape":"ListTagsForResourceResponse"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Lists the tags for a specified resource.</p>"
+    },
+    "RegisterTransitGateway":{
+      "name":"RegisterTransitGateway",
+      "http":{
+        "method":"POST",
+        "requestUri":"/global-networks/{globalNetworkId}/transit-gateway-registrations"
+      },
+      "input":{"shape":"RegisterTransitGatewayRequest"},
+      "output":{"shape":"RegisterTransitGatewayResponse"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ConflictException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Registers a transit gateway in your global network. The transit gateway can be in any AWS Region, but it must be owned by the same AWS account that owns the global network. You cannot register a transit gateway in more than one global network.</p>"
+    },
+    "TagResource":{
+      "name":"TagResource",
+      "http":{
+        "method":"POST",
+        "requestUri":"/tags/{resourceArn}"
+      },
+      "input":{"shape":"TagResourceRequest"},
+      "output":{"shape":"TagResourceResponse"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"ServiceQuotaExceededException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ConflictException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Tags a specified resource.</p>"
+    },
+    "UntagResource":{
+      "name":"UntagResource",
+      "http":{
+        "method":"DELETE",
+        "requestUri":"/tags/{resourceArn}"
+      },
+      "input":{"shape":"UntagResourceRequest"},
+      "output":{"shape":"UntagResourceResponse"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ConflictException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Removes tags from a specified resource.</p>"
+    },
+    "UpdateDevice":{
+      "name":"UpdateDevice",
+      "http":{
+        "method":"PATCH",
+        "requestUri":"/global-networks/{globalNetworkId}/devices/{deviceId}"
+      },
+      "input":{"shape":"UpdateDeviceRequest"},
+      "output":{"shape":"UpdateDeviceResponse"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ConflictException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Updates the details for an existing device. To remove information for any of the parameters, specify an empty string.</p>"
+    },
+    "UpdateGlobalNetwork":{
+      "name":"UpdateGlobalNetwork",
+      "http":{
+        "method":"PATCH",
+        "requestUri":"/global-networks/{globalNetworkId}"
+      },
+      "input":{"shape":"UpdateGlobalNetworkRequest"},
+      "output":{"shape":"UpdateGlobalNetworkResponse"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ConflictException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Updates an existing global network. To remove information for any of the parameters, specify an empty string.</p>"
+    },
+    "UpdateLink":{
+      "name":"UpdateLink",
+      "http":{
+        "method":"PATCH",
+        "requestUri":"/global-networks/{globalNetworkId}/links/{linkId}"
+      },
+      "input":{"shape":"UpdateLinkRequest"},
+      "output":{"shape":"UpdateLinkResponse"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"ServiceQuotaExceededException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ConflictException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Updates the details for an existing link. To remove information for any of the parameters, specify an empty string.</p>"
+    },
+    "UpdateSite":{
+      "name":"UpdateSite",
+      "http":{
+        "method":"PATCH",
+        "requestUri":"/global-networks/{globalNetworkId}/sites/{siteId}"
+      },
+      "input":{"shape":"UpdateSiteRequest"},
+      "output":{"shape":"UpdateSiteResponse"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ConflictException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Updates the information for an existing site. To remove information for any of the parameters, specify an empty string.</p>"
+    }
+  },
+  "shapes":{
+    "AccessDeniedException":{
+      "type":"structure",
+      "required":["Message"],
+      "members":{
+        "Message":{"shape":"String"}
+      },
+      "documentation":"<p>You do not have sufficient access to perform this action.</p>",
+      "error":{"httpStatusCode":403},
+      "exception":true
+    },
+    "AssociateCustomerGatewayRequest":{
+      "type":"structure",
+      "required":[
+        "CustomerGatewayArn",
+        "GlobalNetworkId",
+        "DeviceId"
+      ],
+      "members":{
+        "CustomerGatewayArn":{
+          "shape":"String",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the customer gateway. For more information, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/list_amazonec2.html#amazonec2-resources-for-iam-policies\">Resources Defined by Amazon EC2</a>.</p>"
+        },
+        "GlobalNetworkId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the global network.</p>",
+          "location":"uri",
+          "locationName":"globalNetworkId"
+        },
+        "DeviceId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the device.</p>"
+        },
+        "LinkId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the link.</p>"
+        }
+      }
+    },
+    "AssociateCustomerGatewayResponse":{
+      "type":"structure",
+      "members":{
+        "CustomerGatewayAssociation":{
+          "shape":"CustomerGatewayAssociation",
+          "documentation":"<p>The customer gateway association.</p>"
+        }
+      }
+    },
+    "AssociateLinkRequest":{
+      "type":"structure",
+      "required":[
+        "GlobalNetworkId",
+        "DeviceId",
+        "LinkId"
+      ],
+      "members":{
+        "GlobalNetworkId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the global network.</p>",
+          "location":"uri",
+          "locationName":"globalNetworkId"
+        },
+        "DeviceId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the device.</p>"
+        },
+        "LinkId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the link.</p>"
+        }
+      }
+    },
+    "AssociateLinkResponse":{
+      "type":"structure",
+      "members":{
+        "LinkAssociation":{
+          "shape":"LinkAssociation",
+          "documentation":"<p>The link association.</p>"
+        }
+      }
+    },
+    "Bandwidth":{
+      "type":"structure",
+      "members":{
+        "UploadSpeed":{
+          "shape":"Integer",
+          "documentation":"<p>Upload speed in Mbps.</p>"
+        },
+        "DownloadSpeed":{
+          "shape":"Integer",
+          "documentation":"<p>Download speed in Mbps.</p>"
+        }
+      },
+      "documentation":"<p>Describes bandwidth information.</p>"
+    },
+    "ConflictException":{
+      "type":"structure",
+      "required":[
+        "Message",
+        "ResourceId",
+        "ResourceType"
+      ],
+      "members":{
+        "Message":{"shape":"String"},
+        "ResourceId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the resource.</p>"
+        },
+        "ResourceType":{
+          "shape":"String",
+          "documentation":"<p>The resource type.</p>"
+        }
+      },
+      "documentation":"<p>There was a conflict processing the request. Updating or deleting the resource can cause an inconsistent state.</p>",
+      "error":{"httpStatusCode":409},
+      "exception":true
+    },
+    "CreateDeviceRequest":{
+      "type":"structure",
+      "required":["GlobalNetworkId"],
+      "members":{
+        "GlobalNetworkId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the global network.</p>",
+          "location":"uri",
+          "locationName":"globalNetworkId"
+        },
+        "Description":{
+          "shape":"String",
+          "documentation":"<p>A description of the device.</p> <p>Length Constraints: Maximum length of 256 characters.</p>"
+        },
+        "Type":{
+          "shape":"String",
+          "documentation":"<p>The type of the device.</p>"
+        },
+        "Vendor":{
+          "shape":"String",
+          "documentation":"<p>The vendor of the device.</p> <p>Length Constraints: Maximum length of 128 characters.</p>"
+        },
+        "Model":{
+          "shape":"String",
+          "documentation":"<p>The model of the device.</p> <p>Length Constraints: Maximum length of 128 characters.</p>"
+        },
+        "SerialNumber":{
+          "shape":"String",
+          "documentation":"<p>The serial number of the device.</p> <p>Length Constraints: Maximum length of 128 characters.</p>"
+        },
+        "Location":{
+          "shape":"Location",
+          "documentation":"<p>The location of the device.</p>"
+        },
+        "SiteId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the site.</p>"
+        },
+        "Tags":{
+          "shape":"TagList",
+          "documentation":"<p>The tags to apply to the resource during creation.</p>"
+        }
+      }
+    },
+    "CreateDeviceResponse":{
+      "type":"structure",
+      "members":{
+        "Device":{
+          "shape":"Device",
+          "documentation":"<p>Information about the device.</p>"
+        }
+      }
+    },
+    "CreateGlobalNetworkRequest":{
+      "type":"structure",
+      "members":{
+        "Description":{
+          "shape":"String",
+          "documentation":"<p>A description of the global network.</p> <p>Length Constraints: Maximum length of 256 characters.</p>"
+        },
+        "Tags":{
+          "shape":"TagList",
+          "documentation":"<p>The tags to apply to the resource during creation.</p>"
+        }
+      }
+    },
+    "CreateGlobalNetworkResponse":{
+      "type":"structure",
+      "members":{
+        "GlobalNetwork":{
+          "shape":"GlobalNetwork",
+          "documentation":"<p>Information about the global network object.</p>"
+        }
+      }
+    },
+    "CreateLinkRequest":{
+      "type":"structure",
+      "required":[
+        "GlobalNetworkId",
+        "Bandwidth",
+        "SiteId"
+      ],
+      "members":{
+        "GlobalNetworkId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the global network.</p>",
+          "location":"uri",
+          "locationName":"globalNetworkId"
+        },
+        "Description":{
+          "shape":"String",
+          "documentation":"<p>A description of the link.</p> <p>Length Constraints: Maximum length of 256 characters.</p>"
+        },
+        "Type":{
+          "shape":"String",
+          "documentation":"<p>The type of the link.</p> <p>Constraints: Cannot include the following characters: | \\ ^</p> <p>Length Constraints: Maximum length of 128 characters.</p>"
+        },
+        "Bandwidth":{
+          "shape":"Bandwidth",
+          "documentation":"<p> The upload speed and download speed in Mbps. </p>"
+        },
+        "Provider":{
+          "shape":"String",
+          "documentation":"<p>The provider of the link.</p> <p>Constraints: Cannot include the following characters: | \\ ^</p> <p>Length Constraints: Maximum length of 128 characters.</p>"
+        },
+        "SiteId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the site.</p>"
+        },
+        "Tags":{
+          "shape":"TagList",
+          "documentation":"<p>The tags to apply to the resource during creation.</p>"
+        }
+      }
+    },
+    "CreateLinkResponse":{
+      "type":"structure",
+      "members":{
+        "Link":{
+          "shape":"Link",
+          "documentation":"<p>Information about the link.</p>"
+        }
+      }
+    },
+    "CreateSiteRequest":{
+      "type":"structure",
+      "required":["GlobalNetworkId"],
+      "members":{
+        "GlobalNetworkId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the global network.</p>",
+          "location":"uri",
+          "locationName":"globalNetworkId"
+        },
+        "Description":{
+          "shape":"String",
+          "documentation":"<p>A description of your site.</p> <p>Length Constraints: Maximum length of 256 characters.</p>"
+        },
+        "Location":{
+          "shape":"Location",
+          "documentation":"<p>The site location. This information is used for visualization in the Network Manager console. If you specify the address, the latitude and longitude are automatically calculated.</p> <ul> <li> <p> <code>Address</code>: The physical address of the site.</p> </li> <li> <p> <code>Latitude</code>: The latitude of the site. </p> </li> <li> <p> <code>Longitude</code>: The longitude of the site.</p> </li> </ul>"
+        },
+        "Tags":{
+          "shape":"TagList",
+          "documentation":"<p>The tags to apply to the resource during creation.</p>"
+        }
+      }
+    },
+    "CreateSiteResponse":{
+      "type":"structure",
+      "members":{
+        "Site":{
+          "shape":"Site",
+          "documentation":"<p>Information about the site.</p>"
+        }
+      }
+    },
+    "CustomerGatewayAssociation":{
+      "type":"structure",
+      "members":{
+        "CustomerGatewayArn":{
+          "shape":"String",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the customer gateway.</p>"
+        },
+        "GlobalNetworkId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the global network.</p>"
+        },
+        "DeviceId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the device.</p>"
+        },
+        "LinkId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the link.</p>"
+        },
+        "State":{
+          "shape":"CustomerGatewayAssociationState",
+          "documentation":"<p>The association state.</p>"
+        }
+      },
+      "documentation":"<p>Describes the association between a customer gateway, a device, and a link.</p>"
+    },
+    "CustomerGatewayAssociationList":{
+      "type":"list",
+      "member":{"shape":"CustomerGatewayAssociation"}
+    },
+    "CustomerGatewayAssociationState":{
+      "type":"string",
+      "enum":[
+        "PENDING",
+        "AVAILABLE",
+        "DELETING",
+        "DELETED"
+      ]
+    },
+    "DateTime":{"type":"timestamp"},
+    "DeleteDeviceRequest":{
+      "type":"structure",
+      "required":[
+        "GlobalNetworkId",
+        "DeviceId"
+      ],
+      "members":{
+        "GlobalNetworkId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the global network.</p>",
+          "location":"uri",
+          "locationName":"globalNetworkId"
+        },
+        "DeviceId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the device.</p>",
+          "location":"uri",
+          "locationName":"deviceId"
+        }
+      }
+    },
+    "DeleteDeviceResponse":{
+      "type":"structure",
+      "members":{
+        "Device":{
+          "shape":"Device",
+          "documentation":"<p>Information about the device.</p>"
+        }
+      }
+    },
+    "DeleteGlobalNetworkRequest":{
+      "type":"structure",
+      "required":["GlobalNetworkId"],
+      "members":{
+        "GlobalNetworkId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the global network.</p>",
+          "location":"uri",
+          "locationName":"globalNetworkId"
+        }
+      }
+    },
+    "DeleteGlobalNetworkResponse":{
+      "type":"structure",
+      "members":{
+        "GlobalNetwork":{
+          "shape":"GlobalNetwork",
+          "documentation":"<p>Information about the global network.</p>"
+        }
+      }
+    },
+    "DeleteLinkRequest":{
+      "type":"structure",
+      "required":[
+        "GlobalNetworkId",
+        "LinkId"
+      ],
+      "members":{
+        "GlobalNetworkId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the global network.</p>",
+          "location":"uri",
+          "locationName":"globalNetworkId"
+        },
+        "LinkId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the link.</p>",
+          "location":"uri",
+          "locationName":"linkId"
+        }
+      }
+    },
+    "DeleteLinkResponse":{
+      "type":"structure",
+      "members":{
+        "Link":{
+          "shape":"Link",
+          "documentation":"<p>Information about the link.</p>"
+        }
+      }
+    },
+    "DeleteSiteRequest":{
+      "type":"structure",
+      "required":[
+        "GlobalNetworkId",
+        "SiteId"
+      ],
+      "members":{
+        "GlobalNetworkId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the global network.</p>",
+          "location":"uri",
+          "locationName":"globalNetworkId"
+        },
+        "SiteId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the site.</p>",
+          "location":"uri",
+          "locationName":"siteId"
+        }
+      }
+    },
+    "DeleteSiteResponse":{
+      "type":"structure",
+      "members":{
+        "Site":{
+          "shape":"Site",
+          "documentation":"<p>Information about the site.</p>"
+        }
+      }
+    },
+    "DeregisterTransitGatewayRequest":{
+      "type":"structure",
+      "required":[
+        "GlobalNetworkId",
+        "TransitGatewayArn"
+      ],
+      "members":{
+        "GlobalNetworkId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the global network.</p>",
+          "location":"uri",
+          "locationName":"globalNetworkId"
+        },
+        "TransitGatewayArn":{
+          "shape":"String",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the transit gateway.</p>",
+          "location":"uri",
+          "locationName":"transitGatewayArn"
+        }
+      }
+    },
+    "DeregisterTransitGatewayResponse":{
+      "type":"structure",
+      "members":{
+        "TransitGatewayRegistration":{
+          "shape":"TransitGatewayRegistration",
+          "documentation":"<p>The transit gateway registration information.</p>"
+        }
+      }
+    },
+    "DescribeGlobalNetworksRequest":{
+      "type":"structure",
+      "members":{
+        "GlobalNetworkIds":{
+          "shape":"StringList",
+          "documentation":"<p>The IDs of one or more global networks. The maximum is 10.</p>",
+          "location":"querystring",
+          "locationName":"globalNetworkIds"
+        },
+        "MaxResults":{
+          "shape":"MaxResults",
+          "documentation":"<p>The maximum number of results to return.</p>",
+          "location":"querystring",
+          "locationName":"maxResults"
+        },
+        "NextToken":{
+          "shape":"String",
+          "documentation":"<p>The token for the next page of results.</p>",
+          "location":"querystring",
+          "locationName":"nextToken"
+        }
+      }
+    },
+    "DescribeGlobalNetworksResponse":{
+      "type":"structure",
+      "members":{
+        "GlobalNetworks":{
+          "shape":"GlobalNetworkList",
+          "documentation":"<p>Information about the global networks.</p>"
+        },
+        "NextToken":{
+          "shape":"String",
+          "documentation":"<p>The token for the next page of results.</p>"
+        }
+      }
+    },
+    "Device":{
+      "type":"structure",
+      "members":{
+        "DeviceId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the device.</p>"
+        },
+        "DeviceArn":{
+          "shape":"String",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the device.</p>"
+        },
+        "GlobalNetworkId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the global network.</p>"
+        },
+        "Description":{
+          "shape":"String",
+          "documentation":"<p>The description of the device.</p>"
+        },
+        "Type":{
+          "shape":"String",
+          "documentation":"<p>The device type.</p>"
+        },
+        "Vendor":{
+          "shape":"String",
+          "documentation":"<p>The device vendor.</p>"
+        },
+        "Model":{
+          "shape":"String",
+          "documentation":"<p>The device model.</p>"
+        },
+        "SerialNumber":{
+          "shape":"String",
+          "documentation":"<p>The device serial number.</p>"
+        },
+        "Location":{
+          "shape":"Location",
+          "documentation":"<p>The site location.</p>"
+        },
+        "SiteId":{
+          "shape":"String",
+          "documentation":"<p>The site ID.</p>"
+        },
+        "CreatedAt":{
+          "shape":"DateTime",
+          "documentation":"<p>The date and time that the site was created.</p>"
+        },
+        "State":{
+          "shape":"DeviceState",
+          "documentation":"<p>The device state.</p>"
+        },
+        "Tags":{
+          "shape":"TagList",
+          "documentation":"<p>The tags for the device.</p>"
+        }
+      },
+      "documentation":"<p>Describes a device.</p>"
+    },
+    "DeviceList":{
+      "type":"list",
+      "member":{"shape":"Device"}
+    },
+    "DeviceState":{
+      "type":"string",
+      "enum":[
+        "PENDING",
+        "AVAILABLE",
+        "DELETING",
+        "UPDATING"
+      ]
+    },
+    "DisassociateCustomerGatewayRequest":{
+      "type":"structure",
+      "required":[
+        "GlobalNetworkId",
+        "CustomerGatewayArn"
+      ],
+      "members":{
+        "GlobalNetworkId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the global network.</p>",
+          "location":"uri",
+          "locationName":"globalNetworkId"
+        },
+        "CustomerGatewayArn":{
+          "shape":"String",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the customer gateway. For more information, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/list_amazonec2.html#amazonec2-resources-for-iam-policies\">Resources Defined by Amazon EC2</a>.</p>",
+          "location":"uri",
+          "locationName":"customerGatewayArn"
+        }
+      }
+    },
+    "DisassociateCustomerGatewayResponse":{
+      "type":"structure",
+      "members":{
+        "CustomerGatewayAssociation":{
+          "shape":"CustomerGatewayAssociation",
+          "documentation":"<p>Information about the customer gateway association.</p>"
+        }
+      }
+    },
+    "DisassociateLinkRequest":{
+      "type":"structure",
+      "required":[
+        "GlobalNetworkId",
+        "DeviceId",
+        "LinkId"
+      ],
+      "members":{
+        "GlobalNetworkId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the global network.</p>",
+          "location":"uri",
+          "locationName":"globalNetworkId"
+        },
+        "DeviceId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the device.</p>",
+          "location":"querystring",
+          "locationName":"deviceId"
+        },
+        "LinkId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the link.</p>",
+          "location":"querystring",
+          "locationName":"linkId"
+        }
+      }
+    },
+    "DisassociateLinkResponse":{
+      "type":"structure",
+      "members":{
+        "LinkAssociation":{
+          "shape":"LinkAssociation",
+          "documentation":"<p>Information about the link association.</p>"
+        }
+      }
+    },
+    "GetCustomerGatewayAssociationsRequest":{
+      "type":"structure",
+      "required":["GlobalNetworkId"],
+      "members":{
+        "GlobalNetworkId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the global network.</p>",
+          "location":"uri",
+          "locationName":"globalNetworkId"
+        },
+        "CustomerGatewayArns":{
+          "shape":"StringList",
+          "documentation":"<p>One or more customer gateway Amazon Resource Names (ARNs). For more information, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/list_amazonec2.html#amazonec2-resources-for-iam-policies\">Resources Defined by Amazon EC2</a>. The maximum is 10.</p>",
+          "location":"querystring",
+          "locationName":"customerGatewayArns"
+        },
+        "MaxResults":{
+          "shape":"MaxResults",
+          "documentation":"<p>The maximum number of results to return.</p>",
+          "location":"querystring",
+          "locationName":"maxResults"
+        },
+        "NextToken":{
+          "shape":"String",
+          "documentation":"<p>The token for the next page of results.</p>",
+          "location":"querystring",
+          "locationName":"nextToken"
+        }
+      }
+    },
+    "GetCustomerGatewayAssociationsResponse":{
+      "type":"structure",
+      "members":{
+        "CustomerGatewayAssociations":{
+          "shape":"CustomerGatewayAssociationList",
+          "documentation":"<p>The customer gateway associations.</p>"
+        },
+        "NextToken":{
+          "shape":"String",
+          "documentation":"<p>The token for the next page of results.</p>"
+        }
+      }
+    },
+    "GetDevicesRequest":{
+      "type":"structure",
+      "required":["GlobalNetworkId"],
+      "members":{
+        "GlobalNetworkId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the global network.</p>",
+          "location":"uri",
+          "locationName":"globalNetworkId"
+        },
+        "DeviceIds":{
+          "shape":"StringList",
+          "documentation":"<p>One or more device IDs. The maximum is 10.</p>",
+          "location":"querystring",
+          "locationName":"deviceIds"
+        },
+        "SiteId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the site.</p>",
+          "location":"querystring",
+          "locationName":"siteId"
+        },
+        "MaxResults":{
+          "shape":"MaxResults",
+          "documentation":"<p>The maximum number of results to return.</p>",
+          "location":"querystring",
+          "locationName":"maxResults"
+        },
+        "NextToken":{
+          "shape":"String",
+          "documentation":"<p>The token for the next page of results.</p>",
+          "location":"querystring",
+          "locationName":"nextToken"
+        }
+      }
+    },
+    "GetDevicesResponse":{
+      "type":"structure",
+      "members":{
+        "Devices":{
+          "shape":"DeviceList",
+          "documentation":"<p>The devices.</p>"
+        },
+        "NextToken":{
+          "shape":"String",
+          "documentation":"<p>The token for the next page of results.</p>"
+        }
+      }
+    },
+    "GetLinkAssociationsRequest":{
+      "type":"structure",
+      "required":["GlobalNetworkId"],
+      "members":{
+        "GlobalNetworkId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the global network.</p>",
+          "location":"uri",
+          "locationName":"globalNetworkId"
+        },
+        "DeviceId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the device.</p>",
+          "location":"querystring",
+          "locationName":"deviceId"
+        },
+        "LinkId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the link.</p>",
+          "location":"querystring",
+          "locationName":"linkId"
+        },
+        "MaxResults":{
+          "shape":"MaxResults",
+          "documentation":"<p>The maximum number of results to return.</p>",
+          "location":"querystring",
+          "locationName":"maxResults"
+        },
+        "NextToken":{
+          "shape":"String",
+          "documentation":"<p>The token for the next page of results.</p>",
+          "location":"querystring",
+          "locationName":"nextToken"
+        }
+      }
+    },
+    "GetLinkAssociationsResponse":{
+      "type":"structure",
+      "members":{
+        "LinkAssociations":{
+          "shape":"LinkAssociationList",
+          "documentation":"<p>The link associations.</p>"
+        },
+        "NextToken":{
+          "shape":"String",
+          "documentation":"<p>The token for the next page of results.</p>"
+        }
+      }
+    },
+    "GetLinksRequest":{
+      "type":"structure",
+      "required":["GlobalNetworkId"],
+      "members":{
+        "GlobalNetworkId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the global network.</p>",
+          "location":"uri",
+          "locationName":"globalNetworkId"
+        },
+        "LinkIds":{
+          "shape":"StringList",
+          "documentation":"<p>One or more link IDs. The maximum is 10.</p>",
+          "location":"querystring",
+          "locationName":"linkIds"
+        },
+        "SiteId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the site.</p>",
+          "location":"querystring",
+          "locationName":"siteId"
+        },
+        "Type":{
+          "shape":"String",
+          "documentation":"<p>The link type.</p>",
+          "location":"querystring",
+          "locationName":"type"
+        },
+        "Provider":{
+          "shape":"String",
+          "documentation":"<p>The link provider.</p>",
+          "location":"querystring",
+          "locationName":"provider"
+        },
+        "MaxResults":{
+          "shape":"MaxResults",
+          "documentation":"<p>The maximum number of results to return.</p>",
+          "location":"querystring",
+          "locationName":"maxResults"
+        },
+        "NextToken":{
+          "shape":"String",
+          "documentation":"<p>The token for the next page of results.</p>",
+          "location":"querystring",
+          "locationName":"nextToken"
+        }
+      }
+    },
+    "GetLinksResponse":{
+      "type":"structure",
+      "members":{
+        "Links":{
+          "shape":"LinkList",
+          "documentation":"<p>The links.</p>"
+        },
+        "NextToken":{
+          "shape":"String",
+          "documentation":"<p>The token for the next page of results.</p>"
+        }
+      }
+    },
+    "GetSitesRequest":{
+      "type":"structure",
+      "required":["GlobalNetworkId"],
+      "members":{
+        "GlobalNetworkId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the global network.</p>",
+          "location":"uri",
+          "locationName":"globalNetworkId"
+        },
+        "SiteIds":{
+          "shape":"StringList",
+          "documentation":"<p>One or more site IDs. The maximum is 10.</p>",
+          "location":"querystring",
+          "locationName":"siteIds"
+        },
+        "MaxResults":{
+          "shape":"MaxResults",
+          "documentation":"<p>The maximum number of results to return.</p>",
+          "location":"querystring",
+          "locationName":"maxResults"
+        },
+        "NextToken":{
+          "shape":"String",
+          "documentation":"<p>The token for the next page of results.</p>",
+          "location":"querystring",
+          "locationName":"nextToken"
+        }
+      }
+    },
+    "GetSitesResponse":{
+      "type":"structure",
+      "members":{
+        "Sites":{
+          "shape":"SiteList",
+          "documentation":"<p>The sites.</p>"
+        },
+        "NextToken":{
+          "shape":"String",
+          "documentation":"<p>The token for the next page of results.</p>"
+        }
+      }
+    },
+    "GetTransitGatewayRegistrationsRequest":{
+      "type":"structure",
+      "required":["GlobalNetworkId"],
+      "members":{
+        "GlobalNetworkId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the global network.</p>",
+          "location":"uri",
+          "locationName":"globalNetworkId"
+        },
+        "TransitGatewayArns":{
+          "shape":"StringList",
+          "documentation":"<p>The Amazon Resource Names (ARNs) of one or more transit gateways. The maximum is 10.</p>",
+          "location":"querystring",
+          "locationName":"transitGatewayArns"
+        },
+        "MaxResults":{
+          "shape":"MaxResults",
+          "documentation":"<p>The maximum number of results to return.</p>",
+          "location":"querystring",
+          "locationName":"maxResults"
+        },
+        "NextToken":{
+          "shape":"String",
+          "documentation":"<p>The token for the next page of results.</p>",
+          "location":"querystring",
+          "locationName":"nextToken"
+        }
+      }
+    },
+    "GetTransitGatewayRegistrationsResponse":{
+      "type":"structure",
+      "members":{
+        "TransitGatewayRegistrations":{
+          "shape":"TransitGatewayRegistrationList",
+          "documentation":"<p>The transit gateway registrations.</p>"
+        },
+        "NextToken":{
+          "shape":"String",
+          "documentation":"<p>The token for the next page of results.</p>"
+        }
+      }
+    },
+    "GlobalNetwork":{
+      "type":"structure",
+      "members":{
+        "GlobalNetworkId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the global network.</p>"
+        },
+        "GlobalNetworkArn":{
+          "shape":"String",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the global network.</p>"
+        },
+        "Description":{
+          "shape":"String",
+          "documentation":"<p>The description of the global network.</p>"
+        },
+        "CreatedAt":{
+          "shape":"DateTime",
+          "documentation":"<p>The date and time that the global network was created.</p>"
+        },
+        "State":{
+          "shape":"GlobalNetworkState",
+          "documentation":"<p>The state of the global network.</p>"
+        },
+        "Tags":{
+          "shape":"TagList",
+          "documentation":"<p>The tags for the global network.</p>"
+        }
+      },
+      "documentation":"<p>Describes a global network.</p>"
+    },
+    "GlobalNetworkList":{
+      "type":"list",
+      "member":{"shape":"GlobalNetwork"}
+    },
+    "GlobalNetworkState":{
+      "type":"string",
+      "enum":[
+        "PENDING",
+        "AVAILABLE",
+        "DELETING",
+        "UPDATING"
+      ]
+    },
+    "Integer":{"type":"integer"},
+    "InternalServerException":{
+      "type":"structure",
+      "required":["Message"],
+      "members":{
+        "Message":{"shape":"String"},
+        "RetryAfterSeconds":{
+          "shape":"RetryAfterSeconds",
+          "documentation":"<p>Indicates when to retry the request.</p>",
+          "location":"header",
+          "locationName":"Retry-After"
+        }
+      },
+      "documentation":"<p>The request has failed due to an internal error.</p>",
+      "error":{"httpStatusCode":500},
+      "exception":true,
+      "fault":true
+    },
+    "Link":{
+      "type":"structure",
+      "members":{
+        "LinkId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the link.</p>"
+        },
+        "LinkArn":{
+          "shape":"String",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the link.</p>"
+        },
+        "GlobalNetworkId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the global network.</p>"
+        },
+        "SiteId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the site.</p>"
+        },
+        "Description":{
+          "shape":"String",
+          "documentation":"<p>The description of the link.</p>"
+        },
+        "Type":{
+          "shape":"String",
+          "documentation":"<p>The type of the link.</p>"
+        },
+        "Bandwidth":{
+          "shape":"Bandwidth",
+          "documentation":"<p>The bandwidth for the link.</p>"
+        },
+        "Provider":{
+          "shape":"String",
+          "documentation":"<p>The provider of the link.</p>"
+        },
+        "CreatedAt":{
+          "shape":"DateTime",
+          "documentation":"<p>The date and time that the link was created.</p>"
+        },
+        "State":{
+          "shape":"LinkState",
+          "documentation":"<p>The state of the link.</p>"
+        },
+        "Tags":{
+          "shape":"TagList",
+          "documentation":"<p>The tags for the link.</p>"
+        }
+      },
+      "documentation":"<p>Describes a link.</p>"
+    },
+    "LinkAssociation":{
+      "type":"structure",
+      "members":{
+        "GlobalNetworkId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the global network.</p>"
+        },
+        "DeviceId":{
+          "shape":"String",
+          "documentation":"<p>The device ID for the link association.</p>"
+        },
+        "LinkId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the link.</p>"
+        },
+        "LinkAssociationState":{
+          "shape":"LinkAssociationState",
+          "documentation":"<p>The state of the association.</p>"
+        }
+      },
+      "documentation":"<p>Describes the association between a device and a link.</p>"
+    },
+    "LinkAssociationList":{
+      "type":"list",
+      "member":{"shape":"LinkAssociation"}
+    },
+    "LinkAssociationState":{
+      "type":"string",
+      "enum":[
+        "PENDING",
+        "AVAILABLE",
+        "DELETING",
+        "DELETED"
+      ]
+    },
+    "LinkList":{
+      "type":"list",
+      "member":{"shape":"Link"}
+    },
+    "LinkState":{
+      "type":"string",
+      "enum":[
+        "PENDING",
+        "AVAILABLE",
+        "DELETING",
+        "UPDATING"
+      ]
+    },
+    "ListTagsForResourceRequest":{
+      "type":"structure",
+      "required":["ResourceArn"],
+      "members":{
+        "ResourceArn":{
+          "shape":"ResourceARN",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the resource.</p>",
+          "location":"uri",
+          "locationName":"resourceArn"
+        }
+      }
+    },
+    "ListTagsForResourceResponse":{
+      "type":"structure",
+      "members":{
+        "TagList":{
+          "shape":"TagList",
+          "documentation":"<p>The list of tags.</p>"
+        }
+      }
+    },
+    "Location":{
+      "type":"structure",
+      "members":{
+        "Address":{
+          "shape":"String",
+          "documentation":"<p>The physical address.</p>"
+        },
+        "Latitude":{
+          "shape":"String",
+          "documentation":"<p>The latitude.</p>"
+        },
+        "Longitude":{
+          "shape":"String",
+          "documentation":"<p>The longitude.</p>"
+        }
+      },
+      "documentation":"<p>Describes a location.</p>"
+    },
+    "MaxResults":{
+      "type":"integer",
+      "max":500,
+      "min":1
+    },
+    "RegisterTransitGatewayRequest":{
+      "type":"structure",
+      "required":[
+        "GlobalNetworkId",
+        "TransitGatewayArn"
+      ],
+      "members":{
+        "GlobalNetworkId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the global network.</p>",
+          "location":"uri",
+          "locationName":"globalNetworkId"
+        },
+        "TransitGatewayArn":{
+          "shape":"String",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the transit gateway. For more information, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/list_amazonec2.html#amazonec2-resources-for-iam-policies\">Resources Defined by Amazon EC2</a>.</p>"
+        }
+      }
+    },
+    "RegisterTransitGatewayResponse":{
+      "type":"structure",
+      "members":{
+        "TransitGatewayRegistration":{
+          "shape":"TransitGatewayRegistration",
+          "documentation":"<p>Information about the transit gateway registration.</p>"
+        }
+      }
+    },
+    "ResourceARN":{"type":"string"},
+    "ResourceNotFoundException":{
+      "type":"structure",
+      "required":[
+        "Message",
+        "ResourceId",
+        "ResourceType"
+      ],
+      "members":{
+        "Message":{"shape":"String"},
+        "ResourceId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the resource.</p>"
+        },
+        "ResourceType":{
+          "shape":"String",
+          "documentation":"<p>The resource type.</p>"
+        }
+      },
+      "documentation":"<p>The specified resource could not be found.</p>",
+      "error":{"httpStatusCode":404},
+      "exception":true
+    },
+    "RetryAfterSeconds":{"type":"integer"},
+    "ServiceQuotaExceededException":{
+      "type":"structure",
+      "required":[
+        "Message",
+        "LimitCode",
+        "ServiceCode"
+      ],
+      "members":{
+        "Message":{
+          "shape":"String",
+          "documentation":"<p>The error message.</p>"
+        },
+        "ResourceId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the resource.</p>"
+        },
+        "ResourceType":{
+          "shape":"String",
+          "documentation":"<p>The resource type.</p>"
+        },
+        "LimitCode":{
+          "shape":"String",
+          "documentation":"<p>The limit code.</p>"
+        },
+        "ServiceCode":{
+          "shape":"String",
+          "documentation":"<p>The service code.</p>"
+        }
+      },
+      "documentation":"<p>A service limit was exceeded.</p>",
+      "error":{"httpStatusCode":402},
+      "exception":true
+    },
+    "Site":{
+      "type":"structure",
+      "members":{
+        "SiteId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the site.</p>"
+        },
+        "SiteArn":{
+          "shape":"String",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the site.</p>"
+        },
+        "GlobalNetworkId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the global network.</p>"
+        },
+        "Description":{
+          "shape":"String",
+          "documentation":"<p>The description of the site.</p>"
+        },
+        "Location":{
+          "shape":"Location",
+          "documentation":"<p>The location of the site.</p>"
+        },
+        "CreatedAt":{
+          "shape":"DateTime",
+          "documentation":"<p>The date and time that the site was created.</p>"
+        },
+        "State":{
+          "shape":"SiteState",
+          "documentation":"<p>The state of the site.</p>"
+        },
+        "Tags":{
+          "shape":"TagList",
+          "documentation":"<p>The tags for the site.</p>"
+        }
+      },
+      "documentation":"<p>Describes a site.</p>"
+    },
+    "SiteList":{
+      "type":"list",
+      "member":{"shape":"Site"}
+    },
+    "SiteState":{
+      "type":"string",
+      "enum":[
+        "PENDING",
+        "AVAILABLE",
+        "DELETING",
+        "UPDATING"
+      ]
+    },
+    "String":{"type":"string"},
+    "StringList":{
+      "type":"list",
+      "member":{"shape":"String"}
+    },
+    "Tag":{
+      "type":"structure",
+      "members":{
+        "Key":{
+          "shape":"TagKey",
+          "documentation":"<p>The tag key.</p> <p>Length Constraints: Maximum length of 128 characters.</p>"
+        },
+        "Value":{
+          "shape":"TagValue",
+          "documentation":"<p>The tag value.</p> <p>Length Constraints: Maximum length of 256 characters.</p>"
+        }
+      },
+      "documentation":"<p>Describes a tag.</p>"
+    },
+    "TagKey":{"type":"string"},
+    "TagKeyList":{
+      "type":"list",
+      "member":{"shape":"TagKey"}
+    },
+    "TagList":{
+      "type":"list",
+      "member":{"shape":"Tag"}
+    },
+    "TagResourceRequest":{
+      "type":"structure",
+      "required":[
+        "ResourceArn",
+        "Tags"
+      ],
+      "members":{
+        "ResourceArn":{
+          "shape":"ResourceARN",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the resource.</p>",
+          "location":"uri",
+          "locationName":"resourceArn"
+        },
+        "Tags":{
+          "shape":"TagList",
+          "documentation":"<p>The tags to apply to the specified resource.</p>"
+        }
+      }
+    },
+    "TagResourceResponse":{
+      "type":"structure",
+      "members":{
+      }
+    },
+    "TagValue":{"type":"string"},
+    "ThrottlingException":{
+      "type":"structure",
+      "required":["Message"],
+      "members":{
+        "Message":{"shape":"String"},
+        "RetryAfterSeconds":{
+          "shape":"RetryAfterSeconds",
+          "documentation":"<p>Indicates when to retry the request.</p>",
+          "location":"header",
+          "locationName":"Retry-After"
+        }
+      },
+      "documentation":"<p>The request was denied due to request throttling.</p>",
+      "error":{"httpStatusCode":429},
+      "exception":true
+    },
+    "TransitGatewayRegistration":{
+      "type":"structure",
+      "members":{
+        "GlobalNetworkId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the global network.</p>"
+        },
+        "TransitGatewayArn":{
+          "shape":"String",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the transit gateway.</p>"
+        },
+        "State":{
+          "shape":"TransitGatewayRegistrationStateReason",
+          "documentation":"<p>The state of the transit gateway registration.</p>"
+        }
+      },
+      "documentation":"<p>Describes the registration of a transit gateway to a global network.</p>"
+    },
+    "TransitGatewayRegistrationList":{
+      "type":"list",
+      "member":{"shape":"TransitGatewayRegistration"}
+    },
+    "TransitGatewayRegistrationState":{
+      "type":"string",
+      "enum":[
+        "PENDING",
+        "AVAILABLE",
+        "DELETING",
+        "DELETED",
+        "FAILED"
+      ]
+    },
+    "TransitGatewayRegistrationStateReason":{
+      "type":"structure",
+      "members":{
+        "Code":{
+          "shape":"TransitGatewayRegistrationState",
+          "documentation":"<p>The code for the state reason.</p>"
+        },
+        "Message":{
+          "shape":"String",
+          "documentation":"<p>The message for the state reason.</p>"
+        }
+      },
+      "documentation":"<p>Describes the status of a transit gateway registration.</p>"
+    },
+    "UntagResourceRequest":{
+      "type":"structure",
+      "required":[
+        "ResourceArn",
+        "TagKeys"
+      ],
+      "members":{
+        "ResourceArn":{
+          "shape":"ResourceARN",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the resource.</p>",
+          "location":"uri",
+          "locationName":"resourceArn"
+        },
+        "TagKeys":{
+          "shape":"TagKeyList",
+          "documentation":"<p>The tag keys to remove from the specified resource.</p>",
+          "location":"querystring",
+          "locationName":"tagKeys"
+        }
+      }
+    },
+    "UntagResourceResponse":{
+      "type":"structure",
+      "members":{
+      }
+    },
+    "UpdateDeviceRequest":{
+      "type":"structure",
+      "required":[
+        "GlobalNetworkId",
+        "DeviceId"
+      ],
+      "members":{
+        "GlobalNetworkId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the global network.</p>",
+          "location":"uri",
+          "locationName":"globalNetworkId"
+        },
+        "DeviceId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the device.</p>",
+          "location":"uri",
+          "locationName":"deviceId"
+        },
+        "Description":{
+          "shape":"String",
+          "documentation":"<p>A description of the device.</p> <p>Length Constraints: Maximum length of 256 characters.</p>"
+        },
+        "Type":{
+          "shape":"String",
+          "documentation":"<p>The type of the device.</p>"
+        },
+        "Vendor":{
+          "shape":"String",
+          "documentation":"<p>The vendor of the device.</p> <p>Length Constraints: Maximum length of 128 characters.</p>"
+        },
+        "Model":{
+          "shape":"String",
+          "documentation":"<p>The model of the device.</p> <p>Length Constraints: Maximum length of 128 characters.</p>"
+        },
+        "SerialNumber":{
+          "shape":"String",
+          "documentation":"<p>The serial number of the device.</p> <p>Length Constraints: Maximum length of 128 characters.</p>"
+        },
+        "Location":{"shape":"Location"},
+        "SiteId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the site.</p>"
+        }
+      }
+    },
+    "UpdateDeviceResponse":{
+      "type":"structure",
+      "members":{
+        "Device":{
+          "shape":"Device",
+          "documentation":"<p>Information about the device.</p>"
+        }
+      }
+    },
+    "UpdateGlobalNetworkRequest":{
+      "type":"structure",
+      "required":["GlobalNetworkId"],
+      "members":{
+        "GlobalNetworkId":{
+          "shape":"String",
+          "documentation":"<p>The ID of your global network.</p>",
+          "location":"uri",
+          "locationName":"globalNetworkId"
+        },
+        "Description":{
+          "shape":"String",
+          "documentation":"<p>A description of the global network.</p> <p>Length Constraints: Maximum length of 256 characters.</p>"
+        }
+      }
+    },
+    "UpdateGlobalNetworkResponse":{
+      "type":"structure",
+      "members":{
+        "GlobalNetwork":{
+          "shape":"GlobalNetwork",
+          "documentation":"<p>Information about the global network object.</p>"
+        }
+      }
+    },
+    "UpdateLinkRequest":{
+      "type":"structure",
+      "required":[
+        "GlobalNetworkId",
+        "LinkId"
+      ],
+      "members":{
+        "GlobalNetworkId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the global network.</p>",
+          "location":"uri",
+          "locationName":"globalNetworkId"
+        },
+        "LinkId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the link.</p>",
+          "location":"uri",
+          "locationName":"linkId"
+        },
+        "Description":{
+          "shape":"String",
+          "documentation":"<p>A description of the link.</p> <p>Length Constraints: Maximum length of 256 characters.</p>"
+        },
+        "Type":{
+          "shape":"String",
+          "documentation":"<p>The type of the link.</p> <p>Length Constraints: Maximum length of 128 characters.</p>"
+        },
+        "Bandwidth":{
+          "shape":"Bandwidth",
+          "documentation":"<p>The upload and download speed in Mbps. </p>"
+        },
+        "Provider":{
+          "shape":"String",
+          "documentation":"<p>The provider of the link.</p> <p>Length Constraints: Maximum length of 128 characters.</p>"
+        }
+      }
+    },
+    "UpdateLinkResponse":{
+      "type":"structure",
+      "members":{
+        "Link":{
+          "shape":"Link",
+          "documentation":"<p>Information about the link.</p>"
+        }
+      }
+    },
+    "UpdateSiteRequest":{
+      "type":"structure",
+      "required":[
+        "GlobalNetworkId",
+        "SiteId"
+      ],
+      "members":{
+        "GlobalNetworkId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the global network.</p>",
+          "location":"uri",
+          "locationName":"globalNetworkId"
+        },
+        "SiteId":{
+          "shape":"String",
+          "documentation":"<p>The ID of your site.</p>",
+          "location":"uri",
+          "locationName":"siteId"
+        },
+        "Description":{
+          "shape":"String",
+          "documentation":"<p>A description of your site.</p> <p>Length Constraints: Maximum length of 256 characters.</p>"
+        },
+        "Location":{
+          "shape":"Location",
+          "documentation":"<p>The site location:</p> <ul> <li> <p> <code>Address</code>: The physical address of the site.</p> </li> <li> <p> <code>Latitude</code>: The latitude of the site. </p> </li> <li> <p> <code>Longitude</code>: The longitude of the site.</p> </li> </ul>"
+        }
+      }
+    },
+    "UpdateSiteResponse":{
+      "type":"structure",
+      "members":{
+        "Site":{
+          "shape":"Site",
+          "documentation":"<p>Information about the site.</p>"
+        }
+      }
+    },
+    "ValidationException":{
+      "type":"structure",
+      "required":["Message"],
+      "members":{
+        "Message":{"shape":"String"},
+        "Reason":{
+          "shape":"ValidationExceptionReason",
+          "documentation":"<p>The reason for the error.</p>"
+        },
+        "Fields":{
+          "shape":"ValidationExceptionFieldList",
+          "documentation":"<p>The fields that caused the error, if applicable.</p>"
+        }
+      },
+      "documentation":"<p>The input fails to satisfy the constraints.</p>",
+      "error":{"httpStatusCode":400},
+      "exception":true
+    },
+    "ValidationExceptionField":{
+      "type":"structure",
+      "required":[
+        "Name",
+        "Message"
+      ],
+      "members":{
+        "Name":{
+          "shape":"String",
+          "documentation":"<p>The name of the field.</p>"
+        },
+        "Message":{
+          "shape":"String",
+          "documentation":"<p>The message for the field.</p>"
+        }
+      },
+      "documentation":"<p>Describes a validation exception for a field.</p>"
+    },
+    "ValidationExceptionFieldList":{
+      "type":"list",
+      "member":{"shape":"ValidationExceptionField"}
+    },
+    "ValidationExceptionReason":{
+      "type":"string",
+      "enum":[
+        "UnknownOperation",
+        "CannotParse",
+        "FieldValidationFailed",
+        "Other"
+      ]
+    }
+  },
+  "documentation":"<p>Transit Gateway Network Manager (Network Manager) enables you to create a global network, in which you can monitor your AWS and on-premises networks that are built around transit gateways.</p>"
+}
diff --git a/services/new-service-template/pom.xml b/services/new-service-template/pom.xml
index 78d4d4349f88..2ae4673db1e7 100644
--- a/services/new-service-template/pom.xml
+++ b/services/new-service-template/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
diff --git a/services/opsworks/build.properties b/services/opsworks/build.properties
index ecf2dae6fcb1..15ec2da1fc71 100644
--- a/services/opsworks/build.properties
+++ b/services/opsworks/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/opsworks/pom.xml b/services/opsworks/pom.xml
index 7a053ab9450c..26b4977b73e2 100644
--- a/services/opsworks/pom.xml
+++ b/services/opsworks/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>opsworks</artifactId>
     <name>AWS Java SDK :: Services :: AWS OpsWorks</name>
diff --git a/services/opsworks/src/test/resources/cucumber.properties b/services/opsworks/src/test/resources/cucumber.properties
index 21236cc6c504..38b5640b23c9 100644
--- a/services/opsworks/src/test/resources/cucumber.properties
+++ b/services/opsworks/src/test/resources/cucumber.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/opsworkscm/build.properties b/services/opsworkscm/build.properties
index ecf2dae6fcb1..15ec2da1fc71 100644
--- a/services/opsworkscm/build.properties
+++ b/services/opsworkscm/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/opsworkscm/pom.xml b/services/opsworkscm/pom.xml
index 14a0fd54cfc9..8787cd2ec1db 100644
--- a/services/opsworkscm/pom.xml
+++ b/services/opsworkscm/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>opsworkscm</artifactId>
     <name>AWS Java SDK :: Services :: AWS OpsWorks for Chef Automate</name>
diff --git a/services/opsworkscm/src/main/resources/codegen-resources/service-2.json b/services/opsworkscm/src/main/resources/codegen-resources/service-2.json
index 82e715d40931..0b2b2cd3a31b 100644
--- a/services/opsworkscm/src/main/resources/codegen-resources/service-2.json
+++ b/services/opsworkscm/src/main/resources/codegen-resources/service-2.json
@@ -190,6 +190,20 @@
       ],
       "documentation":"<p> Exports a specified server engine attribute as a base64-encoded string. For example, you can export user data that you can use in EC2 to associate nodes with a server. </p> <p> This operation is synchronous. </p> <p> A <code>ValidationException</code> is raised when parameters of the request are not valid. A <code>ResourceNotFoundException</code> is thrown when the server does not exist. An <code>InvalidStateException</code> is thrown when the server is in any of the following states: CREATING, TERMINATED, FAILED or DELETING. </p>"
     },
+    "ListTagsForResource":{
+      "name":"ListTagsForResource",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"ListTagsForResourceRequest"},
+      "output":{"shape":"ListTagsForResourceResponse"},
+      "errors":[
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ValidationException"}
+      ],
+      "documentation":"<p>Returns a list of tags that are applied to the specified AWS OpsWorks for Chef Automate or AWS OpsWorks for Puppet Enterprise servers or backups.</p>"
+    },
     "RestoreServer":{
       "name":"RestoreServer",
       "http":{
@@ -203,7 +217,7 @@
         {"shape":"ResourceNotFoundException"},
         {"shape":"ValidationException"}
       ],
-      "documentation":"<p> Restores a backup to a server that is in a <code>CONNECTION_LOST</code>, <code>HEALTHY</code>, <code>RUNNING</code>, <code>UNHEALTHY</code>, or <code>TERMINATED</code> state. When you run RestoreServer, the server's EC2 instance is deleted, and a new EC2 instance is configured. RestoreServer maintains the existing server endpoint, so configuration management of the server's client devices (nodes) should continue to work. </p> <p> This operation is asynchronous. </p> <p> An <code>InvalidStateException</code> is thrown when the server is not in a valid state. A <code>ResourceNotFoundException</code> is thrown when the server does not exist. A <code>ValidationException</code> is raised when parameters of the request are not valid. </p>"
+      "documentation":"<p> Restores a backup to a server that is in a <code>CONNECTION_LOST</code>, <code>HEALTHY</code>, <code>RUNNING</code>, <code>UNHEALTHY</code>, or <code>TERMINATED</code> state. When you run RestoreServer, the server's EC2 instance is deleted, and a new EC2 instance is configured. RestoreServer maintains the existing server endpoint, so configuration management of the server's client devices (nodes) should continue to work. </p> <p>Restoring from a backup is performed by creating a new EC2 instance. If restoration is successful, and the server is in a <code>HEALTHY</code> state, AWS OpsWorks CM switches traffic over to the new instance. After restoration is finished, the old EC2 instance is maintained in a <code>Running</code> or <code>Stopped</code> state, but is eventually terminated.</p> <p> This operation is asynchronous. </p> <p> An <code>InvalidStateException</code> is thrown when the server is not in a valid state. A <code>ResourceNotFoundException</code> is thrown when the server does not exist. A <code>ValidationException</code> is raised when parameters of the request are not valid. </p>"
     },
     "StartMaintenance":{
       "name":"StartMaintenance",
@@ -220,6 +234,36 @@
       ],
       "documentation":"<p> Manually starts server maintenance. This command can be useful if an earlier maintenance attempt failed, and the underlying cause of maintenance failure has been resolved. The server is in an <code>UNDER_MAINTENANCE</code> state while maintenance is in progress. </p> <p> Maintenance can only be started on servers in <code>HEALTHY</code> and <code>UNHEALTHY</code> states. Otherwise, an <code>InvalidStateException</code> is thrown. A <code>ResourceNotFoundException</code> is thrown when the server does not exist. A <code>ValidationException</code> is raised when parameters of the request are not valid. </p>"
     },
+    "TagResource":{
+      "name":"TagResource",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"TagResourceRequest"},
+      "output":{"shape":"TagResourceResponse"},
+      "errors":[
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ValidationException"},
+        {"shape":"InvalidStateException"}
+      ],
+      "documentation":"<p>Applies tags to an AWS OpsWorks for Chef Automate or AWS OpsWorks for Puppet Enterprise server, or to server backups.</p>"
+    },
+    "UntagResource":{
+      "name":"UntagResource",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"UntagResourceRequest"},
+      "output":{"shape":"UntagResourceResponse"},
+      "errors":[
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ValidationException"},
+        {"shape":"InvalidStateException"}
+      ],
+      "documentation":"<p>Removes specified tags from an AWS OpsWorks-CM server or backup.</p>"
+    },
     "UpdateServer":{
       "name":"UpdateServer",
       "http":{
@@ -252,6 +296,10 @@
     }
   },
   "shapes":{
+    "AWSOpsWorksCMResourceArn":{
+      "type":"string",
+      "pattern":"arn:aws.*:opsworks-cm:.*:[0-9]{12}:.*"
+    },
     "AccountAttribute":{
       "type":"structure",
       "members":{
@@ -462,6 +510,10 @@
         "Description":{
           "shape":"String",
           "documentation":"<p> A user-defined description of the backup. </p>"
+        },
+        "Tags":{
+          "shape":"TagList",
+          "documentation":"<p>A map that contains tag keys and tag values to attach to an AWS OpsWorks-CM server backup.</p> <ul> <li> <p>The key cannot be empty.</p> </li> <li> <p>The key can be a maximum of 127 characters, and can contain only Unicode letters, numbers, or separators, or the following special characters: <code>+ - = . _ : /</code> </p> </li> <li> <p>The value can be a maximum 255 characters, and contain only Unicode letters, numbers, or separators, or the following special characters: <code>+ - = . _ : /</code> </p> </li> <li> <p>Leading and trailing white spaces are trimmed from both the key and value.</p> </li> <li> <p>A maximum of 50 user-applied tags is allowed for tag-supported AWS OpsWorks-CM resources.</p> </li> </ul>"
         }
       }
     },
@@ -513,7 +565,7 @@
         },
         "EngineVersion":{
           "shape":"String",
-          "documentation":"<p> The major release version of the engine that you want to use. For a Chef server, the valid value for EngineVersion is currently <code>12</code>. For a Puppet server, the valid value is <code>2017</code>. </p>"
+          "documentation":"<p> The major release version of the engine that you want to use. For a Chef server, the valid value for EngineVersion is currently <code>2</code>. For a Puppet server, the valid value is <code>2017</code>. </p>"
         },
         "EngineAttributes":{
           "shape":"EngineAttributes",
@@ -541,11 +593,11 @@
         },
         "PreferredMaintenanceWindow":{
           "shape":"TimeWindowDefinition",
-          "documentation":"<p> The start time for a one-hour period each week during which AWS OpsWorks CM performs maintenance on the instance. Valid values must be specified in the following format: <code>DDD:HH:MM</code>. The specified time is in coordinated universal time (UTC). The default value is a random one-hour period on Tuesday, Wednesday, or Friday. See <code>TimeWindowDefinition</code> for more information. </p> <p> <b>Example:</b> <code>Mon:08:00</code>, which represents a start time of every Monday at 08:00 UTC. (8:00 a.m.) </p>"
+          "documentation":"<p> The start time for a one-hour period each week during which AWS OpsWorks CM performs maintenance on the instance. Valid values must be specified in the following format: <code>DDD:HH:MM</code>. <code>MM</code> must be specified as <code>00</code>. The specified time is in coordinated universal time (UTC). The default value is a random one-hour period on Tuesday, Wednesday, or Friday. See <code>TimeWindowDefinition</code> for more information. </p> <p> <b>Example:</b> <code>Mon:08:00</code>, which represents a start time of every Monday at 08:00 UTC. (8:00 a.m.) </p>"
         },
         "PreferredBackupWindow":{
           "shape":"TimeWindowDefinition",
-          "documentation":"<p> The start time for a one-hour period during which AWS OpsWorks CM backs up application-level data on your server if automated backups are enabled. Valid values must be specified in one of the following formats: </p> <ul> <li> <p> <code>HH:MM</code> for daily backups</p> </li> <li> <p> <code>DDD:HH:MM</code> for weekly backups</p> </li> </ul> <p>The specified time is in coordinated universal time (UTC). The default value is a random, daily start time.</p> <p> <b>Example:</b> <code>08:00</code>, which represents a daily start time of 08:00 UTC.</p> <p> <b>Example:</b> <code>Mon:08:00</code>, which represents a start time of every Monday at 08:00 UTC. (8:00 a.m.)</p>"
+          "documentation":"<p> The start time for a one-hour period during which AWS OpsWorks CM backs up application-level data on your server if automated backups are enabled. Valid values must be specified in one of the following formats: </p> <ul> <li> <p> <code>HH:MM</code> for daily backups</p> </li> <li> <p> <code>DDD:HH:MM</code> for weekly backups</p> </li> </ul> <p> <code>MM</code> must be specified as <code>00</code>. The specified time is in coordinated universal time (UTC). The default value is a random, daily start time.</p> <p> <b>Example:</b> <code>08:00</code>, which represents a daily start time of 08:00 UTC.</p> <p> <b>Example:</b> <code>Mon:08:00</code>, which represents a start time of every Monday at 08:00 UTC. (8:00 a.m.)</p>"
         },
         "SecurityGroupIds":{
           "shape":"Strings",
@@ -559,6 +611,10 @@
           "shape":"Strings",
           "documentation":"<p> The IDs of subnets in which to launch the server EC2 instance. </p> <p> Amazon EC2-Classic customers: This field is required. All servers must run within a VPC. The VPC must have \"Auto Assign Public IP\" enabled. </p> <p> EC2-VPC customers: This field is optional. If you do not specify subnet IDs, your EC2 instances are created in a default subnet that is selected by Amazon EC2. If you specify subnet IDs, the VPC must have \"Auto Assign Public IP\" enabled. </p> <p>For more information about supported Amazon EC2 platforms, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-supported-platforms.html\">Supported Platforms</a>.</p>"
         },
+        "Tags":{
+          "shape":"TagList",
+          "documentation":"<p>A map that contains tag keys and tag values to attach to an AWS OpsWorks for Chef Automate or AWS OpsWorks for Puppet Enterprise server.</p> <ul> <li> <p>The key cannot be empty.</p> </li> <li> <p>The key can be a maximum of 127 characters, and can contain only Unicode letters, numbers, or separators, or the following special characters: <code>+ - = . _ : / @</code> </p> </li> <li> <p>The value can be a maximum 255 characters, and contain only Unicode letters, numbers, or separators, or the following special characters: <code>+ - = . _ : / @</code> </p> </li> <li> <p>Leading and trailing white spaces are trimmed from both the key and value.</p> </li> <li> <p>A maximum of 50 user-applied tags is allowed for any AWS OpsWorks-CM server.</p> </li> </ul>"
+        },
         "BackupId":{
           "shape":"BackupId",
           "documentation":"<p> If you specify this field, AWS OpsWorks CM creates the server by using the backup represented by BackupId. </p>"
@@ -751,7 +807,7 @@
       "members":{
         "Servers":{
           "shape":"Servers",
-          "documentation":"<p>Contains the response to a <code>DescribeServers</code> request.</p> <p> <i>For Puppet Server:</i> <code>DescribeServersResponse$Servers$EngineAttributes</code> contains PUPPET_API_CA_CERT. This is the PEM-encoded CA certificate that is used by the Puppet API over TCP port number 8140. The CA certificate is also used to sign node certificates.</p>"
+          "documentation":"<p>Contains the response to a <code>DescribeServers</code> request.</p> <p> <i>For Chef Automate servers:</i> If <code>DescribeServersResponse$Servers$EngineAttributes</code> includes CHEF_MAJOR_UPGRADE_AVAILABLE, you can upgrade the Chef Automate server to Chef Automate 2. To be eligible for upgrade, a server running Chef Automate 1 must have had at least one successful maintenance run after November 1, 2019.</p> <p> <i>For Puppet Server:</i> <code>DescribeServersResponse$Servers$EngineAttributes</code> contains PUPPET_API_CA_CERT. This is the PEM-encoded CA certificate that is used by the Puppet API over TCP port number 8140. The CA certificate is also used to sign node certificates.</p>"
         },
         "NextToken":{
           "shape":"String",
@@ -896,6 +952,37 @@
       "documentation":"<p>The limit of servers or backups has been reached. </p>",
       "exception":true
     },
+    "ListTagsForResourceRequest":{
+      "type":"structure",
+      "required":["ResourceArn"],
+      "members":{
+        "ResourceArn":{
+          "shape":"AWSOpsWorksCMResourceArn",
+          "documentation":"<p>The Amazon Resource Number (ARN) of an AWS OpsWorks for Chef Automate or AWS OpsWorks for Puppet Enterprise server for which you want to show applied tags. For example, <code>arn:aws:opsworks-cm:us-west-2:123456789012:server/test-owcm-server/EXAMPLE-66b0-4196-8274-d1a2bEXAMPLE</code>.</p>"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>NextToken is a string that is returned in some command responses. It indicates that not all entries have been returned, and that you must run at least one more request to get remaining items. To get remaining results, call <code>ListTagsForResource</code> again, and assign the token from the previous results as the value of the <code>nextToken</code> parameter. If there are no more results, the response object's <code>nextToken</code> parameter value is <code>null</code>. Setting a <code>nextToken</code> value that was not returned in your previous results causes an <code>InvalidNextTokenException</code> to occur.</p>"
+        },
+        "MaxResults":{
+          "shape":"MaxResults",
+          "documentation":"<p>To receive a paginated response, use this parameter to specify the maximum number of results to be returned with a single call. If the number of available results exceeds this maximum, the response includes a <code>NextToken</code> value that you can assign to the <code>NextToken</code> request parameter to get the next set of results.</p>"
+        }
+      }
+    },
+    "ListTagsForResourceResponse":{
+      "type":"structure",
+      "members":{
+        "Tags":{
+          "shape":"TagList",
+          "documentation":"<p>Tags that have been applied to the resource.</p>"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>A token that you can use as the value of <code>NextToken</code> in subsequent calls to the API to show more results.</p>"
+        }
+      }
+    },
     "MaintenanceStatus":{
       "type":"string",
       "enum":[
@@ -971,7 +1058,7 @@
         },
         "InstanceType":{
           "shape":"String",
-          "documentation":"<p> The type of the instance to create. Valid values must be specified in the following format: <code>^([cm][34]|t2).*</code> For example, <code>m5.large</code>. Valid values are <code>m5.large</code>, <code>r5.xlarge</code>, and <code>r5.2xlarge</code>. If you do not specify this parameter, RestoreServer uses the instance type from the specified backup. </p>"
+          "documentation":"<p> The type of instance to restore. Valid values must be specified in the following format: <code>^([cm][34]|t2).*</code> For example, <code>m5.large</code>. Valid values are <code>m5.large</code>, <code>r5.xlarge</code>, and <code>r5.2xlarge</code>. If you do not specify this parameter, RestoreServer uses the instance type from the specified backup. </p>"
         },
         "KeyPair":{
           "shape":"KeyPair",
@@ -1033,7 +1120,7 @@
         },
         "EngineVersion":{
           "shape":"String",
-          "documentation":"<p>The engine version of the server. For a Chef server, the valid value for EngineVersion is currently <code>12</code>. For a Puppet server, the valid value is <code>2017</code>. </p>"
+          "documentation":"<p>The engine version of the server. For a Chef server, the valid value for EngineVersion is currently <code>2</code>. For a Puppet server, the valid value is <code>2017</code>. </p>"
         },
         "InstanceProfileArn":{
           "shape":"String",
@@ -1155,7 +1242,7 @@
         },
         "EngineAttributes":{
           "shape":"EngineAttributes",
-          "documentation":"<p>Engine attributes that are specific to the server on which you want to run maintenance. </p>"
+          "documentation":"<p>Engine attributes that are specific to the server on which you want to run maintenance.</p> <p class=\"title\"> <b>Attributes accepted in a StartMaintenance request for Chef</b> </p> <ul> <li> <p> <code>CHEF_MAJOR_UPGRADE</code>: If a Chef Automate server is eligible for upgrade to Chef Automate 2, add this engine attribute to a <code>StartMaintenance</code> request and set the value to <code>true</code> to upgrade the server to Chef Automate 2. For more information, see <a href=\"https://docs.aws.amazon.com/opsworks/latest/userguide/opscm-a2upgrade.html\">Upgrade an AWS OpsWorks for Chef Automate Server to Chef Automate 2</a>. </p> </li> </ul>"
         }
       }
     },
@@ -1177,6 +1264,70 @@
       "type":"list",
       "member":{"shape":"String"}
     },
+    "Tag":{
+      "type":"structure",
+      "required":[
+        "Key",
+        "Value"
+      ],
+      "members":{
+        "Key":{
+          "shape":"TagKey",
+          "documentation":"<p>A tag key, such as <code>Stage</code> or <code>Name</code>. A tag key cannot be empty. The key can be a maximum of 127 characters, and can contain only Unicode letters, numbers, or separators, or the following special characters: <code>+ - = . _ : /</code> </p>"
+        },
+        "Value":{
+          "shape":"TagValue",
+          "documentation":"<p>An optional tag value, such as <code>Production</code> or <code>test-owcm-server</code>. The value can be a maximum of 255 characters, and contain only Unicode letters, numbers, or separators, or the following special characters: <code>+ - = . _ : /</code> </p>"
+        }
+      },
+      "documentation":"<p>A map that contains tag keys and tag values to attach to an AWS OpsWorks for Chef Automate or AWS OpsWorks for Puppet Enterprise server. Leading and trailing white spaces are trimmed from both the key and value. A maximum of 50 user-applied tags is allowed for tag-supported AWS OpsWorks-CM resources.</p>"
+    },
+    "TagKey":{
+      "type":"string",
+      "max":128,
+      "min":1,
+      "pattern":"^([\\p{L}\\p{Z}\\p{N}_.:/=+\\-@]*)$"
+    },
+    "TagKeyList":{
+      "type":"list",
+      "member":{"shape":"TagKey"},
+      "max":200,
+      "min":0
+    },
+    "TagList":{
+      "type":"list",
+      "member":{"shape":"Tag"},
+      "max":200,
+      "min":0
+    },
+    "TagResourceRequest":{
+      "type":"structure",
+      "required":[
+        "ResourceArn",
+        "Tags"
+      ],
+      "members":{
+        "ResourceArn":{
+          "shape":"AWSOpsWorksCMResourceArn",
+          "documentation":"<p>The Amazon Resource Number (ARN) of a resource to which you want to apply tags. For example, <code>arn:aws:opsworks-cm:us-west-2:123456789012:server/test-owcm-server/EXAMPLE-66b0-4196-8274-d1a2bEXAMPLE</code>.</p>"
+        },
+        "Tags":{
+          "shape":"TagList",
+          "documentation":"<p>A map that contains tag keys and tag values to attach to AWS OpsWorks-CM servers or backups.</p> <ul> <li> <p>The key cannot be empty.</p> </li> <li> <p>The key can be a maximum of 127 characters, and can contain only Unicode letters, numbers, or separators, or the following special characters: <code>+ - = . _ : /</code> </p> </li> <li> <p>The value can be a maximum 255 characters, and contain only Unicode letters, numbers, or separators, or the following special characters: <code>+ - = . _ : /</code> </p> </li> <li> <p>Leading and trailing white spaces are trimmed from both the key and value.</p> </li> <li> <p>A maximum of 50 user-applied tags is allowed for any AWS OpsWorks-CM server or backup.</p> </li> </ul>"
+        }
+      }
+    },
+    "TagResourceResponse":{
+      "type":"structure",
+      "members":{
+      }
+    },
+    "TagValue":{
+      "type":"string",
+      "max":256,
+      "min":0,
+      "pattern":"^([\\p{L}\\p{Z}\\p{N}_.:/=+\\-@]*)$"
+    },
     "TimeWindowDefinition":{
       "type":"string",
       "documentation":"<p> <code>DDD:HH:MM</code> (weekly start time) or <code>HH:MM</code> (daily start time). </p> <p> Time windows always use coordinated universal time (UTC). Valid strings for day of week (<code>DDD</code>) are: <code>Mon</code>, <code>Tue</code>, <code>Wed</code>, <code>Thr</code>, <code>Fri</code>, <code>Sat</code>, or <code>Sun</code>.</p>",
@@ -1184,6 +1335,28 @@
       "pattern":"^((Mon|Tue|Wed|Thu|Fri|Sat|Sun):)?([0-1][0-9]|2[0-3]):[0-5][0-9]$"
     },
     "Timestamp":{"type":"timestamp"},
+    "UntagResourceRequest":{
+      "type":"structure",
+      "required":[
+        "ResourceArn",
+        "TagKeys"
+      ],
+      "members":{
+        "ResourceArn":{
+          "shape":"AWSOpsWorksCMResourceArn",
+          "documentation":"<p>The Amazon Resource Number (ARN) of a resource from which you want to remove tags. For example, <code>arn:aws:opsworks-cm:us-west-2:123456789012:server/test-owcm-server/EXAMPLE-66b0-4196-8274-d1a2bEXAMPLE</code>.</p>"
+        },
+        "TagKeys":{
+          "shape":"TagKeyList",
+          "documentation":"<p>The keys of tags that you want to remove.</p>"
+        }
+      }
+    },
+    "UntagResourceResponse":{
+      "type":"structure",
+      "members":{
+      }
+    },
     "UpdateServerEngineAttributesRequest":{
       "type":"structure",
       "required":[
diff --git a/services/organizations/build.properties b/services/organizations/build.properties
index ecf2dae6fcb1..15ec2da1fc71 100644
--- a/services/organizations/build.properties
+++ b/services/organizations/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/organizations/pom.xml b/services/organizations/pom.xml
index 4c2ce5414216..3eebe2fd0685 100644
--- a/services/organizations/pom.xml
+++ b/services/organizations/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>organizations</artifactId>
     <name>AWS Java SDK :: Services :: AWS Organizations</name>
diff --git a/services/organizations/src/main/resources/codegen-resources/paginators-1.json b/services/organizations/src/main/resources/codegen-resources/paginators-1.json
index af4ef881eb72..95c13385d057 100644
--- a/services/organizations/src/main/resources/codegen-resources/paginators-1.json
+++ b/services/organizations/src/main/resources/codegen-resources/paginators-1.json
@@ -25,6 +25,18 @@
       "limit_key": "MaxResults",
       "output_token": "NextToken"
     },
+    "ListDelegatedAdministrators": {
+      "input_token": "NextToken",
+      "limit_key": "MaxResults",
+      "output_token": "NextToken",
+      "result_key": "DelegatedAdministrators"
+    },
+    "ListDelegatedServicesForAccount": {
+      "input_token": "NextToken",
+      "limit_key": "MaxResults",
+      "output_token": "NextToken",
+      "result_key": "DelegatedServices"
+    },
     "ListHandshakesForAccount": {
       "input_token": "NextToken",
       "limit_key": "MaxResults",
diff --git a/services/organizations/src/main/resources/codegen-resources/service-2.json b/services/organizations/src/main/resources/codegen-resources/service-2.json
index 454d34f2a753..db9de25aba44 100644
--- a/services/organizations/src/main/resources/codegen-resources/service-2.json
+++ b/services/organizations/src/main/resources/codegen-resources/service-2.json
@@ -54,7 +54,9 @@
         {"shape":"PolicyTypeNotEnabledException"},
         {"shape":"ServiceException"},
         {"shape":"TargetNotFoundException"},
-        {"shape":"TooManyRequestsException"}
+        {"shape":"TooManyRequestsException"},
+        {"shape":"UnsupportedAPIEndpointException"},
+        {"shape":"PolicyChangesInProgressException"}
       ],
       "documentation":"<p>Attaches a policy to a root, an organizational unit (OU), or an individual account. How the policy affects accounts depends on the type of policy:</p> <ul> <li> <p> <b>Service control policy (SCP)</b> - An SCP specifies what permissions can be delegated to users in affected member accounts. The scope of influence for a policy depends on what you attach the policy to:</p> <ul> <li> <p>If you attach an SCP to a root, it affects all accounts in the organization.</p> </li> <li> <p>If you attach an SCP to an OU, it affects all accounts in that OU and in any child OUs.</p> </li> <li> <p>If you attach the policy directly to an account, it affects only that account.</p> </li> </ul> <p>SCPs are JSON policies that specify the maximum permissions for an organization or organizational unit (OU). You can attach one SCP to a higher level root or OU, and a different SCP to a child OU or to an account. The child policy can further restrict only the permissions that pass through the parent filter and are available to the child. An SCP that is attached to a child can't grant a permission that the parent hasn't already granted. For example, imagine that the parent SCP allows permissions A, B, C, D, and E. The child SCP allows C, D, E, F, and G. The result is that the accounts affected by the child SCP are allowed to use only C, D, and E. They can't use A or B because the child OU filtered them out. They also can't use F and G because the parent OU filtered them out. They can't be granted back by the child SCP; child SCPs can only filter the permissions they receive from the parent SCP.</p> <p>AWS Organizations attaches a default SCP named <code>\"FullAWSAccess</code> to every root, OU, and account. This default SCP allows all services and actions, enabling any new child OU or account to inherit the permissions of the parent root or OU. If you detach the default policy, you must replace it with a policy that specifies the permissions that you want to allow in that OU or account.</p> <p>For more information about how AWS Organizations policies permissions work, see <a href=\"https://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_policies_scp.html\">Using Service Control Policies</a> in the <i>AWS Organizations User Guide.</i> </p> </li> </ul> <p>This operation can be called only from the organization's master account.</p>"
     },
@@ -138,7 +140,7 @@
         {"shape":"TooManyRequestsException"},
         {"shape":"AccessDeniedForDependencyException"}
       ],
-      "documentation":"<p>Creates an AWS organization. The account whose user is calling the <code>CreateOrganization</code> operation automatically becomes the <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/orgs_getting-started_concepts.html#account\">master account</a> of the new organization.</p> <p>This operation must be called using credentials from the account that is to become the new organization's master account. The principal must also have the relevant IAM permissions.</p> <p>By default (or if you set the <code>FeatureSet</code> parameter to <code>ALL</code>), the new organization is created with all features enabled and service control policies automatically enabled in the root. If you instead choose to create the organization supporting only the consolidated billing features by setting the <code>FeatureSet</code> parameter to <code>CONSOLIDATED_BILLING\"</code>, no policy types are enabled by default, and you can't use organization policies.</p>"
+      "documentation":"<p>Creates an AWS organization. The account whose user is calling the <code>CreateOrganization</code> operation automatically becomes the <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/orgs_getting-started_concepts.html#account\">master account</a> of the new organization.</p> <p>This operation must be called using credentials from the account that is to become the new organization's master account. The principal must also have the relevant IAM permissions.</p> <p>By default (or if you set the <code>FeatureSet</code> parameter to <code>ALL</code>), the new organization is created with all features enabled and service control policies automatically enabled in the root. If you instead choose to create the organization supporting only the consolidated billing features by setting the <code>FeatureSet</code> parameter to <code>CONSOLIDATED_BILLING\"</code>, no policy types are enabled by default, and you can't use organization policies</p>"
     },
     "CreateOrganizationalUnit":{
       "name":"CreateOrganizationalUnit",
@@ -179,7 +181,8 @@
         {"shape":"MalformedPolicyDocumentException"},
         {"shape":"PolicyTypeNotAvailableForOrganizationException"},
         {"shape":"ServiceException"},
-        {"shape":"TooManyRequestsException"}
+        {"shape":"TooManyRequestsException"},
+        {"shape":"UnsupportedAPIEndpointException"}
       ],
       "documentation":"<p>Creates a policy of a specified type that you can attach to a root, an organizational unit (OU), or an individual AWS account.</p> <p>For more information about policies and their use, see <a href=\"https://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_policies.html\">Managing Organization Policies</a>.</p> <p>This operation can be called only from the organization's master account.</p>"
     },
@@ -254,10 +257,32 @@
         {"shape":"PolicyInUseException"},
         {"shape":"PolicyNotFoundException"},
         {"shape":"ServiceException"},
-        {"shape":"TooManyRequestsException"}
+        {"shape":"TooManyRequestsException"},
+        {"shape":"UnsupportedAPIEndpointException"}
       ],
       "documentation":"<p>Deletes the specified policy from your organization. Before you perform this operation, you must first detach the policy from all organizational units (OUs), roots, and accounts.</p> <p>This operation can be called only from the organization's master account.</p>"
     },
+    "DeregisterDelegatedAdministrator":{
+      "name":"DeregisterDelegatedAdministrator",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DeregisterDelegatedAdministratorRequest"},
+      "errors":[
+        {"shape":"AccessDeniedException"},
+        {"shape":"AccountNotFoundException"},
+        {"shape":"AccountNotRegisteredException"},
+        {"shape":"AWSOrganizationsNotInUseException"},
+        {"shape":"ConcurrentModificationException"},
+        {"shape":"ConstraintViolationException"},
+        {"shape":"InvalidInputException"},
+        {"shape":"TooManyRequestsException"},
+        {"shape":"ServiceException"},
+        {"shape":"UnsupportedAPIEndpointException"}
+      ],
+      "documentation":"<p>Removes the specified member AWS account as a delegated administrator for the specified AWS service.</p> <p>You can run this action only for AWS services that support this feature. For a current list of services that support it, see the column <i>Supports Delegated Administrator</i> in the table at <a href=\"https://docs.aws.amazon.com/organizations/latest/userguide/orgs_integrated-services-list.html\">AWS Services that you can use with AWS Organizations</a> in the <i>AWS Organizations User Guide.</i> </p> <p>This operation can be called only from the organization's master account.</p>"
+    },
     "DescribeAccount":{
       "name":"DescribeAccount",
       "http":{
@@ -274,7 +299,7 @@
         {"shape":"ServiceException"},
         {"shape":"TooManyRequestsException"}
       ],
-      "documentation":"<p>Retrieves AWS Organizations-related information about the specified account.</p> <p>This operation can be called only from the organization's master account.</p>"
+      "documentation":"<p>Retrieves AWS Organizations-related information about the specified account.</p> <p>This operation can be called only from the organization's master account or by a member account that is a delegated administrator for an AWS service.</p>"
     },
     "DescribeCreateAccountStatus":{
       "name":"DescribeCreateAccountStatus",
@@ -293,7 +318,28 @@
         {"shape":"TooManyRequestsException"},
         {"shape":"UnsupportedAPIEndpointException"}
       ],
-      "documentation":"<p>Retrieves the current status of an asynchronous request to create an account.</p> <p>This operation can be called only from the organization's master account.</p>"
+      "documentation":"<p>Retrieves the current status of an asynchronous request to create an account.</p> <p>This operation can be called only from the organization's master account or by a member account that is a delegated administrator for an AWS service.</p>"
+    },
+    "DescribeEffectivePolicy":{
+      "name":"DescribeEffectivePolicy",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DescribeEffectivePolicyRequest"},
+      "output":{"shape":"DescribeEffectivePolicyResponse"},
+      "errors":[
+        {"shape":"AccessDeniedException"},
+        {"shape":"AWSOrganizationsNotInUseException"},
+        {"shape":"ConstraintViolationException"},
+        {"shape":"ServiceException"},
+        {"shape":"TooManyRequestsException"},
+        {"shape":"TargetNotFoundException"},
+        {"shape":"EffectivePolicyNotFoundException"},
+        {"shape":"InvalidInputException"},
+        {"shape":"UnsupportedAPIEndpointException"}
+      ],
+      "documentation":"<p>Returns the contents of the effective tag policy for the account. The effective tag policy is the aggregation of any tag policies the account inherits, plus any policy directly that is attached to the account. </p> <p>This action returns information on tag policies only.</p> <p>For more information on policy inheritance, see <a href=\"http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_policies-inheritance.html\">How Policy Inheritance Works</a> in the <i>AWS Organizations User Guide</i>.</p> <p>This operation can be called only from the organization's master account or by a member account that is a delegated administrator for an AWS service.</p>"
     },
     "DescribeHandshake":{
       "name":"DescribeHandshake",
@@ -345,7 +391,7 @@
         {"shape":"ServiceException"},
         {"shape":"TooManyRequestsException"}
       ],
-      "documentation":"<p>Retrieves information about an organizational unit (OU).</p> <p>This operation can be called only from the organization's master account.</p>"
+      "documentation":"<p>Retrieves information about an organizational unit (OU).</p> <p>This operation can be called only from the organization's master account or by a member account that is a delegated administrator for an AWS service.</p>"
     },
     "DescribePolicy":{
       "name":"DescribePolicy",
@@ -361,9 +407,10 @@
         {"shape":"InvalidInputException"},
         {"shape":"PolicyNotFoundException"},
         {"shape":"ServiceException"},
-        {"shape":"TooManyRequestsException"}
+        {"shape":"TooManyRequestsException"},
+        {"shape":"UnsupportedAPIEndpointException"}
       ],
-      "documentation":"<p>Retrieves information about a policy.</p> <p>This operation can be called only from the organization's master account.</p>"
+      "documentation":"<p>Retrieves information about a policy.</p> <p>This operation can be called only from the organization's master account or by a member account that is a delegated administrator for an AWS service.</p>"
     },
     "DetachPolicy":{
       "name":"DetachPolicy",
@@ -382,9 +429,11 @@
         {"shape":"PolicyNotFoundException"},
         {"shape":"ServiceException"},
         {"shape":"TargetNotFoundException"},
-        {"shape":"TooManyRequestsException"}
+        {"shape":"TooManyRequestsException"},
+        {"shape":"UnsupportedAPIEndpointException"},
+        {"shape":"PolicyChangesInProgressException"}
       ],
-      "documentation":"<p>Detaches a policy from a target root, organizational unit (OU), or account. If the policy being detached is a service control policy (SCP), the changes to permissions for IAM users and roles in affected accounts are immediate.</p> <p> <b>Note:</b> Every root, OU, and account must have at least one SCP attached. If you want to replace the default <code>FullAWSAccess</code> policy with one that limits the permissions that can be delegated, you must attach the replacement policy before you can remove the default one. This is the authorization strategy of <a href=\"https://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_policies_about-scps.html#orgs_policies_whitelist\">whitelisting</a>. If you instead attach a second SCP and leave the <code>FullAWSAccess</code> SCP still attached, and specify <code>\"Effect\": \"Deny\"</code> in the second SCP to override the <code>\"Effect\": \"Allow\"</code> in the <code>FullAWSAccess</code> policy (or any other attached SCP), you're using the authorization strategy of <a href=\"https://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_policies_about-scps.html#orgs_policies_blacklist\">blacklisting</a> . </p> <p>This operation can be called only from the organization's master account.</p>"
+      "documentation":"<p>Detaches a policy from a target root, organizational unit (OU), or account. If the policy being detached is a service control policy (SCP), the changes to permissions for IAM users and roles in affected accounts are immediate.</p> <p> <b>Note:</b> Every root, OU, and account must have at least one SCP attached. If you want to replace the default <code>FullAWSAccess</code> policy with one that limits the permissions that can be delegated, you must attach the replacement policy before you can remove the default one. This is the authorization strategy of an \"<a href=\"https://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_policies_about-scps.html#orgs_policies_whitelist\">allow list</a>\". If you instead attach a second SCP and leave the <code>FullAWSAccess</code> SCP still attached, and specify <code>\"Effect\": \"Deny\"</code> in the second SCP to override the <code>\"Effect\": \"Allow\"</code> in the <code>FullAWSAccess</code> policy (or any other attached SCP), you're using the authorization strategy of a \"<a href=\"https://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_policies_about-scps.html#orgs_policies_blacklist\">deny list</a>\".</p> <p>This operation can be called only from the organization's master account.</p>"
     },
     "DisableAWSServiceAccess":{
       "name":"DisableAWSServiceAccess",
@@ -402,7 +451,7 @@
         {"shape":"ServiceException"},
         {"shape":"TooManyRequestsException"}
       ],
-      "documentation":"<p>Disables the integration of an AWS service (the service that is specified by <code>ServicePrincipal</code>) with AWS Organizations. When you disable integration, the specified service no longer can create a <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/using-service-linked-roles.html\">service-linked role</a> in <i>new</i> accounts in your organization. This means the service can't perform operations on your behalf on any new accounts in your organization. The service can still perform operations in older accounts until the service completes its clean-up from AWS Organizations.</p> <p/> <important> <p>We recommend that you disable integration between AWS Organizations and the specified AWS service by using the console or commands that are provided by the specified service. Doing so ensures that the other service is aware that it can clean up any resources that are required only for the integration. How the service cleans up its resources in the organization's accounts depends on that service. For more information, see the documentation for the other AWS service.</p> </important> <p>After you perform the <code>DisableAWSServiceAccess</code> operation, the specified service can no longer perform operations in your organization's accounts unless the operations are explicitly permitted by the IAM policies that are attached to your roles. </p> <p>For more information about integrating other services with AWS Organizations, including the list of services that work with Organizations, see <a href=\"http://docs.aws.amazon.com/organizations/latest/userguide/orgs_integrate_services.html\">Integrating AWS Organizations with Other AWS Services</a> in the <i>AWS Organizations User Guide.</i> </p> <p>This operation can be called only from the organization's master account.</p>"
+      "documentation":"<p>Disables the integration of an AWS service (the service that is specified by <code>ServicePrincipal</code>) with AWS Organizations. When you disable integration, the specified service no longer can create a <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/using-service-linked-roles.html\">service-linked role</a> in <i>new</i> accounts in your organization. This means the service can't perform operations on your behalf on any new accounts in your organization. The service can still perform operations in older accounts until the service completes its clean-up from AWS Organizations.</p> <p/> <important> <p>We recommend that you disable integration between AWS Organizations and the specified AWS service by using the console or commands that are provided by the specified service. Doing so ensures that the other service is aware that it can clean up any resources that are required only for the integration. How the service cleans up its resources in the organization's accounts depends on that service. For more information, see the documentation for the other AWS service.</p> </important> <p>After you perform the <code>DisableAWSServiceAccess</code> operation, the specified service can no longer perform operations in your organization's accounts unless the operations are explicitly permitted by the IAM policies that are attached to your roles.</p> <p>For more information about integrating other services with AWS Organizations, including the list of services that work with Organizations, see <a href=\"http://docs.aws.amazon.com/organizations/latest/userguide/orgs_integrate_services.html\">Integrating AWS Organizations with Other AWS Services</a> in the <i>AWS Organizations User Guide.</i> </p> <p>This operation can be called only from the organization's master account.</p>"
     },
     "DisablePolicyType":{
       "name":"DisablePolicyType",
@@ -421,7 +470,9 @@
         {"shape":"PolicyTypeNotEnabledException"},
         {"shape":"RootNotFoundException"},
         {"shape":"ServiceException"},
-        {"shape":"TooManyRequestsException"}
+        {"shape":"TooManyRequestsException"},
+        {"shape":"UnsupportedAPIEndpointException"},
+        {"shape":"PolicyChangesInProgressException"}
       ],
       "documentation":"<p>Disables an organizational control policy type in a root. A policy of a certain type can be attached to entities in a root only if that type is enabled in the root. After you perform this operation, you no longer can attach policies of the specified type to that root or to any organizational unit (OU) or account in that root. You can undo this by using the <a>EnablePolicyType</a> operation.</p> <p>This is an asynchronous request that AWS performs in the background. If you disable a policy for a root, it still appears enabled for the organization if <a href=\"https://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_org_support-all-features.html\">all features</a> are enabled for the organization. AWS recommends that you first use <a>ListRoots</a> to see the status of policy types for a specified root, and then use this operation. </p> <p>This operation can be called only from the organization's master account.</p> <p> To view the status of available policy types in the organization, use <a>DescribeOrganization</a>.</p>"
     },
@@ -480,7 +531,9 @@
         {"shape":"RootNotFoundException"},
         {"shape":"ServiceException"},
         {"shape":"TooManyRequestsException"},
-        {"shape":"PolicyTypeNotAvailableForOrganizationException"}
+        {"shape":"PolicyTypeNotAvailableForOrganizationException"},
+        {"shape":"UnsupportedAPIEndpointException"},
+        {"shape":"PolicyChangesInProgressException"}
       ],
       "documentation":"<p>Enables a policy type in a root. After you enable a policy type in a root, you can attach policies of that type to the root, any organizational unit (OU), or account in that root. You can undo this by using the <a>DisablePolicyType</a> operation.</p> <p>This is an asynchronous request that AWS performs in the background. AWS recommends that you first use <a>ListRoots</a> to see the status of policy types for a specified root, and then use this operation. </p> <p>This operation can be called only from the organization's master account.</p> <p>You can enable a policy type in a root only if that policy type is available in the organization. To view the status of available policy types in the organization, use <a>DescribeOrganization</a>.</p>"
     },
@@ -523,7 +576,7 @@
         {"shape":"ServiceException"},
         {"shape":"TooManyRequestsException"}
       ],
-      "documentation":"<p>Removes a member account from its parent organization. This version of the operation is performed by the account that wants to leave. To remove a member account as a user in the master account, use <a>RemoveAccountFromOrganization</a> instead.</p> <p>This operation can be called only from a member account in the organization.</p> <important> <ul> <li> <p>The master account in an organization with all features enabled can set service control policies (SCPs) that can restrict what administrators of member accounts can do, including preventing them from successfully calling <code>LeaveOrganization</code> and leaving the organization. </p> </li> <li> <p>You can leave an organization as a member account only if the account is configured with the information required to operate as a standalone account. When you create an account in an organization using the AWS Organizations console, API, or CLI commands, the information required of standalone accounts is <i>not</i> automatically collected. For each account that you want to make standalone, you must accept the end user license agreement (EULA), choose a support plan, provide and verify the required contact information, and provide a current payment method. AWS uses the payment method to charge for any billable (not free tier) AWS activity that occurs while the account isn't attached to an organization. Follow the steps at <a href=\"http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info\"> To leave an organization when all required account information has not yet been provided</a> in the <i>AWS Organizations User Guide.</i> </p> </li> <li> <p>You can leave an organization only after you enable IAM user access to billing in your account. For more information, see <a href=\"http://docs.aws.amazon.com/awsaccountbilling/latest/aboutv2/grantaccess.html#ControllingAccessWebsite-Activate\">Activating Access to the Billing and Cost Management Console</a> in the <i>AWS Billing and Cost Management User Guide.</i> </p> </li> </ul> </important>"
+      "documentation":"<p>Removes a member account from its parent organization. This version of the operation is performed by the account that wants to leave. To remove a member account as a user in the master account, use <a>RemoveAccountFromOrganization</a> instead.</p> <p>This operation can be called only from a member account in the organization.</p> <important> <ul> <li> <p>The master account in an organization with all features enabled can set service control policies (SCPs) that can restrict what administrators of member accounts can do. This includes preventing them from successfully calling <code>LeaveOrganization</code> and leaving the organization. </p> </li> <li> <p>You can leave an organization as a member account only if the account is configured with the information required to operate as a standalone account. When you create an account in an organization using the AWS Organizations console, API, or CLI commands, the information required of standalone accounts is <i>not</i> automatically collected. For each account that you want to make standalone, you must do the following steps:</p> <ul> <li> <p>Accept the end user license agreement (EULA)</p> </li> <li> <p>Choose a support plan</p> </li> <li> <p>Provide and verify the required contact information</p> </li> <li> <p>Provide a current payment method</p> </li> </ul> <p>AWS uses the payment method to charge for any billable (not free tier) AWS activity that occurs while the account isn't attached to an organization. Follow the steps at <a href=\"http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info\"> To leave an organization when all required account information has not yet been provided</a> in the <i>AWS Organizations User Guide.</i> </p> </li> <li> <p>You can leave an organization only after you enable IAM user access to billing in your account. For more information, see <a href=\"http://docs.aws.amazon.com/awsaccountbilling/latest/aboutv2/grantaccess.html#ControllingAccessWebsite-Activate\">Activating Access to the Billing and Cost Management Console</a> in the <i>AWS Billing and Cost Management User Guide.</i> </p> </li> </ul> </important>"
     },
     "ListAWSServiceAccessForOrganization":{
       "name":"ListAWSServiceAccessForOrganization",
@@ -541,7 +594,7 @@
         {"shape":"ServiceException"},
         {"shape":"TooManyRequestsException"}
       ],
-      "documentation":"<p>Returns a list of the AWS services that you enabled to integrate with your organization. After a service on this list creates the resources that it requires for the integration, it can perform operations on your organization and its accounts.</p> <p>For more information about integrating other services with AWS Organizations, including the list of services that currently work with Organizations, see <a href=\"http://docs.aws.amazon.com/organizations/latest/userguide/orgs_integrate_services.html\">Integrating AWS Organizations with Other AWS Services</a> in the <i>AWS Organizations User Guide.</i> </p> <p>This operation can be called only from the organization's master account.</p>"
+      "documentation":"<p>Returns a list of the AWS services that you enabled to integrate with your organization. After a service on this list creates the resources that it requires for the integration, it can perform operations on your organization and its accounts.</p> <p>For more information about integrating other services with AWS Organizations, including the list of services that currently work with Organizations, see <a href=\"http://docs.aws.amazon.com/organizations/latest/userguide/orgs_integrate_services.html\">Integrating AWS Organizations with Other AWS Services</a> in the <i>AWS Organizations User Guide.</i> </p> <p>This operation can be called only from the organization's master account or by a member account that is a delegated administrator for an AWS service.</p>"
     },
     "ListAccounts":{
       "name":"ListAccounts",
@@ -558,7 +611,7 @@
         {"shape":"ServiceException"},
         {"shape":"TooManyRequestsException"}
       ],
-      "documentation":"<p>Lists all the accounts in the organization. To request only the accounts in a specified root or organizational unit (OU), use the <a>ListAccountsForParent</a> operation instead.</p> <note> <p>Always check the <code>NextToken</code> response parameter for a <code>null</code> value when calling a <code>List*</code> operation. These operations can occasionally return an empty set of results even when there are more results available. The <code>NextToken</code> response parameter value is <code>null</code> <i>only</i> when there are no more results to display.</p> </note> <p>This operation can be called only from the organization's master account.</p>"
+      "documentation":"<p>Lists all the accounts in the organization. To request only the accounts in a specified root or organizational unit (OU), use the <a>ListAccountsForParent</a> operation instead.</p> <note> <p>Always check the <code>NextToken</code> response parameter for a <code>null</code> value when calling a <code>List*</code> operation. These operations can occasionally return an empty set of results even when there are more results available. The <code>NextToken</code> response parameter value is <code>null</code> <i>only</i> when there are no more results to display.</p> </note> <p>This operation can be called only from the organization's master account or by a member account that is a delegated administrator for an AWS service.</p>"
     },
     "ListAccountsForParent":{
       "name":"ListAccountsForParent",
@@ -576,7 +629,7 @@
         {"shape":"ServiceException"},
         {"shape":"TooManyRequestsException"}
       ],
-      "documentation":"<p>Lists the accounts in an organization that are contained by the specified target root or organizational unit (OU). If you specify the root, you get a list of all the accounts that aren't in any OU. If you specify an OU, you get a list of all the accounts in only that OU and not in any child OUs. To get a list of all accounts in the organization, use the <a>ListAccounts</a> operation.</p> <note> <p>Always check the <code>NextToken</code> response parameter for a <code>null</code> value when calling a <code>List*</code> operation. These operations can occasionally return an empty set of results even when there are more results available. The <code>NextToken</code> response parameter value is <code>null</code> <i>only</i> when there are no more results to display.</p> </note> <p>This operation can be called only from the organization's master account.</p>"
+      "documentation":"<p>Lists the accounts in an organization that are contained by the specified target root or organizational unit (OU). If you specify the root, you get a list of all the accounts that aren't in any OU. If you specify an OU, you get a list of all the accounts in only that OU and not in any child OUs. To get a list of all accounts in the organization, use the <a>ListAccounts</a> operation.</p> <note> <p>Always check the <code>NextToken</code> response parameter for a <code>null</code> value when calling a <code>List*</code> operation. These operations can occasionally return an empty set of results even when there are more results available. The <code>NextToken</code> response parameter value is <code>null</code> <i>only</i> when there are no more results to display.</p> </note> <p>This operation can be called only from the organization's master account or by a member account that is a delegated administrator for an AWS service.</p>"
     },
     "ListChildren":{
       "name":"ListChildren",
@@ -594,7 +647,7 @@
         {"shape":"ServiceException"},
         {"shape":"TooManyRequestsException"}
       ],
-      "documentation":"<p>Lists all of the organizational units (OUs) or accounts that are contained in the specified parent OU or root. This operation, along with <a>ListParents</a> enables you to traverse the tree structure that makes up this root.</p> <note> <p>Always check the <code>NextToken</code> response parameter for a <code>null</code> value when calling a <code>List*</code> operation. These operations can occasionally return an empty set of results even when there are more results available. The <code>NextToken</code> response parameter value is <code>null</code> <i>only</i> when there are no more results to display.</p> </note> <p>This operation can be called only from the organization's master account.</p>"
+      "documentation":"<p>Lists all of the organizational units (OUs) or accounts that are contained in the specified parent OU or root. This operation, along with <a>ListParents</a> enables you to traverse the tree structure that makes up this root.</p> <note> <p>Always check the <code>NextToken</code> response parameter for a <code>null</code> value when calling a <code>List*</code> operation. These operations can occasionally return an empty set of results even when there are more results available. The <code>NextToken</code> response parameter value is <code>null</code> <i>only</i> when there are no more results to display.</p> </note> <p>This operation can be called only from the organization's master account or by a member account that is a delegated administrator for an AWS service.</p>"
     },
     "ListCreateAccountStatus":{
       "name":"ListCreateAccountStatus",
@@ -612,7 +665,47 @@
         {"shape":"TooManyRequestsException"},
         {"shape":"UnsupportedAPIEndpointException"}
       ],
-      "documentation":"<p>Lists the account creation requests that match the specified status that is currently being tracked for the organization.</p> <note> <p>Always check the <code>NextToken</code> response parameter for a <code>null</code> value when calling a <code>List*</code> operation. These operations can occasionally return an empty set of results even when there are more results available. The <code>NextToken</code> response parameter value is <code>null</code> <i>only</i> when there are no more results to display.</p> </note> <p>This operation can be called only from the organization's master account.</p>"
+      "documentation":"<p>Lists the account creation requests that match the specified status that is currently being tracked for the organization.</p> <note> <p>Always check the <code>NextToken</code> response parameter for a <code>null</code> value when calling a <code>List*</code> operation. These operations can occasionally return an empty set of results even when there are more results available. The <code>NextToken</code> response parameter value is <code>null</code> <i>only</i> when there are no more results to display.</p> </note> <p>This operation can be called only from the organization's master account or by a member account that is a delegated administrator for an AWS service.</p>"
+    },
+    "ListDelegatedAdministrators":{
+      "name":"ListDelegatedAdministrators",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"ListDelegatedAdministratorsRequest"},
+      "output":{"shape":"ListDelegatedAdministratorsResponse"},
+      "errors":[
+        {"shape":"AccessDeniedException"},
+        {"shape":"AWSOrganizationsNotInUseException"},
+        {"shape":"ConstraintViolationException"},
+        {"shape":"InvalidInputException"},
+        {"shape":"TooManyRequestsException"},
+        {"shape":"ServiceException"},
+        {"shape":"UnsupportedAPIEndpointException"}
+      ],
+      "documentation":"<p>Lists the AWS accounts that are designated as delegated administrators in this organization.</p> <p>This operation can be called only from the organization's master account or by a member account that is a delegated administrator for an AWS service.</p>"
+    },
+    "ListDelegatedServicesForAccount":{
+      "name":"ListDelegatedServicesForAccount",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"ListDelegatedServicesForAccountRequest"},
+      "output":{"shape":"ListDelegatedServicesForAccountResponse"},
+      "errors":[
+        {"shape":"AccessDeniedException"},
+        {"shape":"AccountNotFoundException"},
+        {"shape":"AccountNotRegisteredException"},
+        {"shape":"AWSOrganizationsNotInUseException"},
+        {"shape":"ConstraintViolationException"},
+        {"shape":"InvalidInputException"},
+        {"shape":"TooManyRequestsException"},
+        {"shape":"ServiceException"},
+        {"shape":"UnsupportedAPIEndpointException"}
+      ],
+      "documentation":"<p>List the AWS services for which the specified account is a delegated administrator. </p> <p>This operation can be called only from the organization's master account or by a member account that is a delegated administrator for an AWS service.</p>"
     },
     "ListHandshakesForAccount":{
       "name":"ListHandshakesForAccount",
@@ -629,7 +722,7 @@
         {"shape":"ServiceException"},
         {"shape":"TooManyRequestsException"}
       ],
-      "documentation":"<p>Lists the current handshakes that are associated with the account of the requesting user.</p> <p>Handshakes that are <code>ACCEPTED</code>, <code>DECLINED</code>, or <code>CANCELED</code> appear in the results of this API for only 30 days after changing to that state. After that, they're deleted and no longer accessible.</p> <note> <p>Always check the <code>NextToken</code> response parameter for a <code>null</code> value when calling a <code>List*</code> operation. These operations can occasionally return an empty set of results even when there are more results available. The <code>NextToken</code> response parameter value is <code>null</code> <i>only</i> when there are no more results to display.</p> </note> <p>This operation can be called from any account in the organization.</p>"
+      "documentation":"<p>Lists the current handshakes that are associated with the account of the requesting user.</p> <p>Handshakes that are <code>ACCEPTED</code>, <code>DECLINED</code>, or <code>CANCELED</code> appear in the results of this API for only 30 days after changing to that state. After that, they're deleted and no longer accessible.</p> <note> <p>Always check the <code>NextToken</code> response parameter for a <code>null</code> value when calling a <code>List*</code> operation. These operations can occasionally return an empty set of results even when there are more results available. The <code>NextToken</code> response parameter value is <code>null</code> <i>only</i> when there are no more results to display.</p> </note> <p>This operation can be called only from the organization's master account or by a member account that is a delegated administrator for an AWS service.</p>"
     },
     "ListHandshakesForOrganization":{
       "name":"ListHandshakesForOrganization",
@@ -647,7 +740,7 @@
         {"shape":"ServiceException"},
         {"shape":"TooManyRequestsException"}
       ],
-      "documentation":"<p>Lists the handshakes that are associated with the organization that the requesting user is part of. The <code>ListHandshakesForOrganization</code> operation returns a list of handshake structures. Each structure contains details and status about a handshake.</p> <p>Handshakes that are <code>ACCEPTED</code>, <code>DECLINED</code>, or <code>CANCELED</code> appear in the results of this API for only 30 days after changing to that state. After that, they're deleted and no longer accessible.</p> <note> <p>Always check the <code>NextToken</code> response parameter for a <code>null</code> value when calling a <code>List*</code> operation. These operations can occasionally return an empty set of results even when there are more results available. The <code>NextToken</code> response parameter value is <code>null</code> <i>only</i> when there are no more results to display.</p> </note> <p>This operation can be called only from the organization's master account.</p>"
+      "documentation":"<p>Lists the handshakes that are associated with the organization that the requesting user is part of. The <code>ListHandshakesForOrganization</code> operation returns a list of handshake structures. Each structure contains details and status about a handshake.</p> <p>Handshakes that are <code>ACCEPTED</code>, <code>DECLINED</code>, or <code>CANCELED</code> appear in the results of this API for only 30 days after changing to that state. After that, they're deleted and no longer accessible.</p> <note> <p>Always check the <code>NextToken</code> response parameter for a <code>null</code> value when calling a <code>List*</code> operation. These operations can occasionally return an empty set of results even when there are more results available. The <code>NextToken</code> response parameter value is <code>null</code> <i>only</i> when there are no more results to display.</p> </note> <p>This operation can be called only from the organization's master account or by a member account that is a delegated administrator for an AWS service.</p>"
     },
     "ListOrganizationalUnitsForParent":{
       "name":"ListOrganizationalUnitsForParent",
@@ -665,7 +758,7 @@
         {"shape":"ServiceException"},
         {"shape":"TooManyRequestsException"}
       ],
-      "documentation":"<p>Lists the organizational units (OUs) in a parent organizational unit or root.</p> <note> <p>Always check the <code>NextToken</code> response parameter for a <code>null</code> value when calling a <code>List*</code> operation. These operations can occasionally return an empty set of results even when there are more results available. The <code>NextToken</code> response parameter value is <code>null</code> <i>only</i> when there are no more results to display.</p> </note> <p>This operation can be called only from the organization's master account.</p>"
+      "documentation":"<p>Lists the organizational units (OUs) in a parent organizational unit or root.</p> <note> <p>Always check the <code>NextToken</code> response parameter for a <code>null</code> value when calling a <code>List*</code> operation. These operations can occasionally return an empty set of results even when there are more results available. The <code>NextToken</code> response parameter value is <code>null</code> <i>only</i> when there are no more results to display.</p> </note> <p>This operation can be called only from the organization's master account or by a member account that is a delegated administrator for an AWS service.</p>"
     },
     "ListParents":{
       "name":"ListParents",
@@ -683,7 +776,7 @@
         {"shape":"ServiceException"},
         {"shape":"TooManyRequestsException"}
       ],
-      "documentation":"<p>Lists the root or organizational units (OUs) that serve as the immediate parent of the specified child OU or account. This operation, along with <a>ListChildren</a> enables you to traverse the tree structure that makes up this root.</p> <note> <p>Always check the <code>NextToken</code> response parameter for a <code>null</code> value when calling a <code>List*</code> operation. These operations can occasionally return an empty set of results even when there are more results available. The <code>NextToken</code> response parameter value is <code>null</code> <i>only</i> when there are no more results to display.</p> </note> <p>This operation can be called only from the organization's master account.</p> <note> <p>In the current release, a child can have only a single parent. </p> </note>"
+      "documentation":"<p>Lists the root or organizational units (OUs) that serve as the immediate parent of the specified child OU or account. This operation, along with <a>ListChildren</a> enables you to traverse the tree structure that makes up this root.</p> <note> <p>Always check the <code>NextToken</code> response parameter for a <code>null</code> value when calling a <code>List*</code> operation. These operations can occasionally return an empty set of results even when there are more results available. The <code>NextToken</code> response parameter value is <code>null</code> <i>only</i> when there are no more results to display.</p> </note> <p>This operation can be called only from the organization's master account or by a member account that is a delegated administrator for an AWS service.</p> <note> <p>In the current release, a child can have only a single parent. </p> </note>"
     },
     "ListPolicies":{
       "name":"ListPolicies",
@@ -698,9 +791,10 @@
         {"shape":"AWSOrganizationsNotInUseException"},
         {"shape":"InvalidInputException"},
         {"shape":"ServiceException"},
-        {"shape":"TooManyRequestsException"}
+        {"shape":"TooManyRequestsException"},
+        {"shape":"UnsupportedAPIEndpointException"}
       ],
-      "documentation":"<p>Retrieves the list of all policies in an organization of a specified type.</p> <note> <p>Always check the <code>NextToken</code> response parameter for a <code>null</code> value when calling a <code>List*</code> operation. These operations can occasionally return an empty set of results even when there are more results available. The <code>NextToken</code> response parameter value is <code>null</code> <i>only</i> when there are no more results to display.</p> </note> <p>This operation can be called only from the organization's master account.</p>"
+      "documentation":"<p>Retrieves the list of all policies in an organization of a specified type.</p> <note> <p>Always check the <code>NextToken</code> response parameter for a <code>null</code> value when calling a <code>List*</code> operation. These operations can occasionally return an empty set of results even when there are more results available. The <code>NextToken</code> response parameter value is <code>null</code> <i>only</i> when there are no more results to display.</p> </note> <p>This operation can be called only from the organization's master account or by a member account that is a delegated administrator for an AWS service.</p>"
     },
     "ListPoliciesForTarget":{
       "name":"ListPoliciesForTarget",
@@ -716,9 +810,10 @@
         {"shape":"InvalidInputException"},
         {"shape":"ServiceException"},
         {"shape":"TargetNotFoundException"},
-        {"shape":"TooManyRequestsException"}
+        {"shape":"TooManyRequestsException"},
+        {"shape":"UnsupportedAPIEndpointException"}
       ],
-      "documentation":"<p>Lists the policies that are directly attached to the specified target root, organizational unit (OU), or account. You must specify the policy type that you want included in the returned list.</p> <note> <p>Always check the <code>NextToken</code> response parameter for a <code>null</code> value when calling a <code>List*</code> operation. These operations can occasionally return an empty set of results even when there are more results available. The <code>NextToken</code> response parameter value is <code>null</code> <i>only</i> when there are no more results to display.</p> </note> <p>This operation can be called only from the organization's master account.</p>"
+      "documentation":"<p>Lists the policies that are directly attached to the specified target root, organizational unit (OU), or account. You must specify the policy type that you want included in the returned list.</p> <note> <p>Always check the <code>NextToken</code> response parameter for a <code>null</code> value when calling a <code>List*</code> operation. These operations can occasionally return an empty set of results even when there are more results available. The <code>NextToken</code> response parameter value is <code>null</code> <i>only</i> when there are no more results to display.</p> </note> <p>This operation can be called only from the organization's master account or by a member account that is a delegated administrator for an AWS service.</p>"
     },
     "ListRoots":{
       "name":"ListRoots",
@@ -735,7 +830,7 @@
         {"shape":"ServiceException"},
         {"shape":"TooManyRequestsException"}
       ],
-      "documentation":"<p>Lists the roots that are defined in the current organization.</p> <note> <p>Always check the <code>NextToken</code> response parameter for a <code>null</code> value when calling a <code>List*</code> operation. These operations can occasionally return an empty set of results even when there are more results available. The <code>NextToken</code> response parameter value is <code>null</code> <i>only</i> when there are no more results to display.</p> </note> <p>This operation can be called only from the organization's master account.</p> <note> <p>Policy types can be enabled and disabled in roots. This is distinct from whether they're available in the organization. When you enable all features, you make policy types available for use in that organization. Individual policy types can then be enabled and disabled in a root. To see the availability of a policy type in an organization, use <a>DescribeOrganization</a>.</p> </note>"
+      "documentation":"<p>Lists the roots that are defined in the current organization.</p> <note> <p>Always check the <code>NextToken</code> response parameter for a <code>null</code> value when calling a <code>List*</code> operation. These operations can occasionally return an empty set of results even when there are more results available. The <code>NextToken</code> response parameter value is <code>null</code> <i>only</i> when there are no more results to display.</p> </note> <p>This operation can be called only from the organization's master account or by a member account that is a delegated administrator for an AWS service.</p> <note> <p>Policy types can be enabled and disabled in roots. This is distinct from whether they're available in the organization. When you enable all features, you make policy types available for use in that organization. Individual policy types can then be enabled and disabled in a root. To see the availability of a policy type in an organization, use <a>DescribeOrganization</a>.</p> </note>"
     },
     "ListTagsForResource":{
       "name":"ListTagsForResource",
@@ -753,7 +848,7 @@
         {"shape":"ServiceException"},
         {"shape":"TooManyRequestsException"}
       ],
-      "documentation":"<p>Lists tags for the specified resource. </p> <p>Currently, you can list tags on an account in AWS Organizations.</p> <p>This operation can be called only from the organization's master account.</p>"
+      "documentation":"<p>Lists tags for the specified resource. </p> <p>Currently, you can list tags on an account in AWS Organizations.</p> <p>This operation can be called only from the organization's master account or by a member account that is a delegated administrator for an AWS service.</p>"
     },
     "ListTargetsForPolicy":{
       "name":"ListTargetsForPolicy",
@@ -769,9 +864,10 @@
         {"shape":"InvalidInputException"},
         {"shape":"PolicyNotFoundException"},
         {"shape":"ServiceException"},
-        {"shape":"TooManyRequestsException"}
+        {"shape":"TooManyRequestsException"},
+        {"shape":"UnsupportedAPIEndpointException"}
       ],
-      "documentation":"<p>Lists all the roots, organizational units (OUs), and accounts that the specified policy is attached to.</p> <note> <p>Always check the <code>NextToken</code> response parameter for a <code>null</code> value when calling a <code>List*</code> operation. These operations can occasionally return an empty set of results even when there are more results available. The <code>NextToken</code> response parameter value is <code>null</code> <i>only</i> when there are no more results to display.</p> </note> <p>This operation can be called only from the organization's master account.</p>"
+      "documentation":"<p>Lists all the roots, organizational units (OUs), and accounts that the specified policy is attached to.</p> <note> <p>Always check the <code>NextToken</code> response parameter for a <code>null</code> value when calling a <code>List*</code> operation. These operations can occasionally return an empty set of results even when there are more results available. The <code>NextToken</code> response parameter value is <code>null</code> <i>only</i> when there are no more results to display.</p> </note> <p>This operation can be called only from the organization's master account or by a member account that is a delegated administrator for an AWS service.</p>"
     },
     "MoveAccount":{
       "name":"MoveAccount",
@@ -794,6 +890,27 @@
       ],
       "documentation":"<p>Moves an account from its current source parent root or organizational unit (OU) to the specified destination parent root or OU.</p> <p>This operation can be called only from the organization's master account.</p>"
     },
+    "RegisterDelegatedAdministrator":{
+      "name":"RegisterDelegatedAdministrator",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"RegisterDelegatedAdministratorRequest"},
+      "errors":[
+        {"shape":"AccessDeniedException"},
+        {"shape":"AccountAlreadyRegisteredException"},
+        {"shape":"AccountNotFoundException"},
+        {"shape":"AWSOrganizationsNotInUseException"},
+        {"shape":"ConcurrentModificationException"},
+        {"shape":"ConstraintViolationException"},
+        {"shape":"InvalidInputException"},
+        {"shape":"TooManyRequestsException"},
+        {"shape":"ServiceException"},
+        {"shape":"UnsupportedAPIEndpointException"}
+      ],
+      "documentation":"<p>Enables the specified member account to administer the Organizations features of the specified AWS service. It grants read-only access to AWS Organizations service data. The account still requires IAM permissions to access and administer the AWS service.</p> <p>You can run this action only for AWS services that support this feature. For a current list of services that support it, see the column <i>Supports Delegated Administrator</i> in the table at <a href=\"https://docs.aws.amazon.com/organizations/latest/userguide/orgs_integrated-services-list.html\">AWS Services that you can use with AWS Organizations</a> in the <i>AWS Organizations User Guide.</i> </p> <p>This operation can be called only from the organization's master account.</p>"
+    },
     "RemoveAccountFromOrganization":{
       "name":"RemoveAccountFromOrganization",
       "http":{
@@ -890,7 +1007,9 @@
         {"shape":"MalformedPolicyDocumentException"},
         {"shape":"PolicyNotFoundException"},
         {"shape":"ServiceException"},
-        {"shape":"TooManyRequestsException"}
+        {"shape":"TooManyRequestsException"},
+        {"shape":"UnsupportedAPIEndpointException"},
+        {"shape":"PolicyChangesInProgressException"}
       ],
       "documentation":"<p>Updates an existing policy with a new name, description, or content. If you don't supply any parameter, that value remains unchanged. You can't change a policy's type.</p> <p>This operation can be called only from the organization's master account.</p>"
     }
@@ -910,7 +1029,7 @@
       "members":{
         "HandshakeId":{
           "shape":"HandshakeId",
-          "documentation":"<p>The unique identifier (ID) of the handshake that you want to accept.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> for handshake ID string requires \"h-\" followed by from 8 to 32 lower-case letters or digits.</p>"
+          "documentation":"<p>The unique identifier (ID) of the handshake that you want to accept.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> for handshake ID string requires \"h-\" followed by from 8 to 32 lowercase letters or digits.</p>"
         }
       }
     },
@@ -957,7 +1076,7 @@
         },
         "Email":{
           "shape":"Email",
-          "documentation":"<p>The email address associated with the AWS account.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> for this parameter is a string of characters that represents a standard Internet email address.</p>"
+          "documentation":"<p>The email address associated with the AWS account.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> for this parameter is a string of characters that represents a standard internet email address.</p>"
         },
         "Name":{
           "shape":"AccountName",
@@ -978,6 +1097,14 @@
       },
       "documentation":"<p>Contains information about an AWS account that is a member of an organization.</p>"
     },
+    "AccountAlreadyRegisteredException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"ExceptionMessage"}
+      },
+      "documentation":"<p>The specified account is already a delegated administrator for this AWS service.</p>",
+      "exception":true
+    },
     "AccountArn":{
       "type":"string",
       "pattern":"^arn:aws:organizations::\\d{12}:account\\/o-[a-z0-9]{10,32}\\/\\d{12}"
@@ -1008,6 +1135,14 @@
       "documentation":"<p> We can't find an AWS account with the <code>AccountId</code> that you specified, or the account whose credentials you used to make this request isn't a member of an organization.</p>",
       "exception":true
     },
+    "AccountNotRegisteredException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"ExceptionMessage"}
+      },
+      "documentation":"<p>The specified account is not a delegated administrator for this AWS service. </p>",
+      "exception":true
+    },
     "AccountOwnerNotVerifiedException":{
       "type":"structure",
       "members":{
@@ -1053,11 +1188,11 @@
       "members":{
         "PolicyId":{
           "shape":"PolicyId",
-          "documentation":"<p>The unique identifier (ID) of the policy that you want to attach to the target. You can get the ID for the policy by calling the <a>ListPolicies</a> operation.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> for a policy ID string requires \"p-\" followed by from 8 to 128 lower-case letters or digits.</p>"
+          "documentation":"<p>The unique identifier (ID) of the policy that you want to attach to the target. You can get the ID for the policy by calling the <a>ListPolicies</a> operation.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> for a policy ID string requires \"p-\" followed by from 8 to 128 lowercase or uppercase letters, digits, or the underscore character (_).</p>"
         },
         "TargetId":{
           "shape":"PolicyTargetId",
-          "documentation":"<p>The unique identifier (ID) of the root, OU, or account that you want to attach the policy to. You can get the ID by calling the <a>ListRoots</a>, <a>ListOrganizationalUnitsForParent</a>, or <a>ListAccounts</a> operations.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> for a target ID string requires one of the following:</p> <ul> <li> <p> <b>Root</b> - A string that begins with \"r-\" followed by from 4 to 32 lower-case letters or digits.</p> </li> <li> <p> <b>Account</b> - A string that consists of exactly 12 digits.</p> </li> <li> <p> <b>Organizational unit (OU)</b> - A string that begins with \"ou-\" followed by from 4 to 32 lower-case letters or digits (the ID of the root that the OU is in) followed by a second \"-\" dash and from 8 to 32 additional lower-case letters or digits.</p> </li> </ul>"
+          "documentation":"<p>The unique identifier (ID) of the root, OU, or account that you want to attach the policy to. You can get the ID by calling the <a>ListRoots</a>, <a>ListOrganizationalUnitsForParent</a>, or <a>ListAccounts</a> operations.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> for a target ID string requires one of the following:</p> <ul> <li> <p> <b>Root</b> - A string that begins with \"r-\" followed by from 4 to 32 lowercase letters or digits.</p> </li> <li> <p> <b>Account</b> - A string that consists of exactly 12 digits.</p> </li> <li> <p> <b>Organizational unit (OU)</b> - A string that begins with \"ou-\" followed by from 4 to 32 lowercase letters or digits (the ID of the root that the OU is in). This string is followed by a second \"-\" dash and from 8 to 32 additional lowercase letters or digits.</p> </li> </ul>"
         }
       }
     },
@@ -1068,7 +1203,7 @@
       "members":{
         "HandshakeId":{
           "shape":"HandshakeId",
-          "documentation":"<p>The unique identifier (ID) of the handshake that you want to cancel. You can get the ID from the <a>ListHandshakesForOrganization</a> operation.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> for handshake ID string requires \"h-\" followed by from 8 to 32 lower-case letters or digits.</p>"
+          "documentation":"<p>The unique identifier (ID) of the handshake that you want to cancel. You can get the ID from the <a>ListHandshakesForOrganization</a> operation.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> for handshake ID string requires \"h-\" followed by from 8 to 32 lowercase letters or digits.</p>"
         }
       }
     },
@@ -1086,7 +1221,7 @@
       "members":{
         "Id":{
           "shape":"ChildId",
-          "documentation":"<p>The unique identifier (ID) of this child entity.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> for a child ID string requires one of the following:</p> <ul> <li> <p>Account: a string that consists of exactly 12 digits.</p> </li> <li> <p>Organizational unit (OU): a string that begins with \"ou-\" followed by from 4 to 32 lower-case letters or digits (the ID of the root that contains the OU) followed by a second \"-\" dash and from 8 to 32 additional lower-case letters or digits.</p> </li> </ul>"
+          "documentation":"<p>The unique identifier (ID) of this child entity.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> for a child ID string requires one of the following:</p> <ul> <li> <p>Account: A string that consists of exactly 12 digits.</p> </li> <li> <p>Organizational unit (OU): A string that begins with \"ou-\" followed by from 4 to 32 lower-case letters or digits (the ID of the root that contains the OU). This string is followed by a second \"-\" dash and from 8 to 32 additional lower-case letters or digits.</p> </li> </ul>"
         },
         "Type":{
           "shape":"ChildType",
@@ -1132,7 +1267,7 @@
         "Message":{"shape":"ExceptionMessage"},
         "Reason":{"shape":"ConstraintViolationExceptionReason"}
       },
-      "documentation":"<p>Performing this operation violates a minimum or maximum value limit. For example, attempting to remove the last service control policy (SCP) from an OU or root, inviting or creating too many accounts to the organization, or attaching too many policies to an account, OU, or root. This exception includes a reason that contains additional information about the violated limit.</p> <p>Some of the reasons in the following list might not be applicable to this specific API or operation:</p> <ul> <li> <p>ACCOUNT_CANNOT_LEAVE_WITHOUT_EULA: You attempted to remove an account from the organization that doesn't yet have enough information to exist as a standalone account. This account requires you to first agree to the AWS Customer Agreement. Follow the steps at <a href=\"http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info\">To leave an organization when all required account information has not yet been provided</a> in the <i>AWS Organizations User Guide.</i> </p> </li> <li> <p>ACCOUNT_CANNOT_LEAVE_WITHOUT_PHONE_VERIFICATION: You attempted to remove an account from the organization that doesn't yet have enough information to exist as a standalone account. This account requires you to first complete phone verification. Follow the steps at <a href=\"http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info\">To leave an organization when all required account information has not yet been provided</a> in the <i>AWS Organizations User Guide.</i> </p> </li> <li> <p>ACCOUNT_CREATION_RATE_LIMIT_EXCEEDED: You attempted to exceed the number of accounts that you can create in one day.</p> </li> <li> <p>ACCOUNT_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the limit on the number of accounts in an organization. If you need more accounts, contact <a href=\"https://console.aws.amazon.com/support/home#/\">AWS Support</a> to request an increase in your limit. </p> <p>Or the number of invitations that you tried to send would cause you to exceed the limit of accounts in your organization. Send fewer invitations or contact AWS Support to request an increase in the number of accounts.</p> <note> <p>Deleted and closed accounts still count toward your limit.</p> </note> <important> <p>If you get receive this exception when running a command immediately after creating the organization, wait one hour and try again. If after an hour it continues to fail with this error, contact <a href=\"https://console.aws.amazon.com/support/home#/\">AWS Support</a>.</p> </important> </li> <li> <p>HANDSHAKE_RATE_LIMIT_EXCEEDED: You attempted to exceed the number of handshakes that you can send in one day.</p> </li> <li> <p>MASTER_ACCOUNT_ADDRESS_DOES_NOT_MATCH_MARKETPLACE: To create an account in this organization, you first must migrate the organization's master account to the marketplace that corresponds to the master account's address. For example, accounts with India addresses must be associated with the AISPL marketplace. All accounts in an organization must be associated with the same marketplace.</p> </li> <li> <p>MASTER_ACCOUNT_MISSING_CONTACT_INFO: To complete this operation, you must first provide contact a valid address and phone number for the master account. Then try the operation again.</p> </li> <li> <p>MASTER_ACCOUNT_NOT_GOVCLOUD_ENABLED: To complete this operation, the master account must have an associated account in the AWS GovCloud (US-West) Region. For more information, see <a href=\"http://docs.aws.amazon.com/govcloud-us/latest/UserGuide/govcloud-organizations.html\">AWS Organizations</a> in the <i>AWS GovCloud User Guide.</i> </p> </li> <li> <p>MASTER_ACCOUNT_PAYMENT_INSTRUMENT_REQUIRED: To create an organization with this master account, you first must associate a valid payment instrument, such as a credit card, with the account. Follow the steps at <a href=\"http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info\">To leave an organization when all required account information has not yet been provided</a> in the <i>AWS Organizations User Guide.</i> </p> </li> <li> <p>MAX_POLICY_TYPE_ATTACHMENT_LIMIT_EXCEEDED: You attempted to exceed the number of policies of a certain type that can be attached to an entity at one time.</p> </li> <li> <p>MAX_TAG_LIMIT_EXCEEDED: You have exceeded the number of tags allowed on this resource. </p> </li> <li> <p>MEMBER_ACCOUNT_PAYMENT_INSTRUMENT_REQUIRED: To complete this operation with this member account, you first must associate a valid payment instrument, such as a credit card, with the account. Follow the steps at <a href=\"http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info\">To leave an organization when all required account information has not yet been provided</a> in the <i>AWS Organizations User Guide.</i> </p> </li> <li> <p>MIN_POLICY_TYPE_ATTACHMENT_LIMIT_EXCEEDED: You attempted to detach a policy from an entity that would cause the entity to have fewer than the minimum number of policies of a certain type required.</p> </li> <li> <p>OU_DEPTH_LIMIT_EXCEEDED: You attempted to create an OU tree that is too many levels deep.</p> </li> <li> <p>ORGANIZATION_NOT_IN_ALL_FEATURES_MODE: You attempted to perform an operation that requires the organization to be configured to support all features. An organization that supports only consolidated billing features can't perform this operation.</p> </li> <li> <p>OU_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the number of OUs that you can have in an organization.</p> </li> <li> <p>POLICY_NUMBER_LIMIT_EXCEEDED. You attempted to exceed the number of policies that you can have in an organization.</p> </li> </ul>",
+      "documentation":"<p>Performing this operation violates a minimum or maximum value limit. For example, attempting to remove the last service control policy (SCP) from an OU or root, inviting or creating too many accounts to the organization, or attaching too many policies to an account, OU, or root. This exception includes a reason that contains additional information about the violated limit.</p> <p>Some of the reasons in the following list might not be applicable to this specific API or operation:</p> <ul> <li> <p>ACCOUNT_CANNOT_LEAVE_WITHOUT_EULA: You attempted to remove an account from the organization that doesn't yet have enough information to exist as a standalone account. This account requires you to first agree to the AWS Customer Agreement. Follow the steps at <a href=\"http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info\">To leave an organization when all required account information has not yet been provided</a> in the <i>AWS Organizations User Guide.</i> </p> </li> <li> <p>ACCOUNT_CANNOT_LEAVE_WITHOUT_PHONE_VERIFICATION: You attempted to remove an account from the organization that doesn't yet have enough information to exist as a standalone account. This account requires you to first complete phone verification. Follow the steps at <a href=\"http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info\">To leave an organization when all required account information has not yet been provided</a> in the <i>AWS Organizations User Guide.</i> </p> </li> <li> <p>ACCOUNT_CREATION_RATE_LIMIT_EXCEEDED: You attempted to exceed the number of accounts that you can create in one day.</p> </li> <li> <p>ACCOUNT_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the limit on the number of accounts in an organization. If you need more accounts, contact <a href=\"https://console.aws.amazon.com/support/home#/\">AWS Support</a> to request an increase in your limit. </p> <p>Or the number of invitations that you tried to send would cause you to exceed the limit of accounts in your organization. Send fewer invitations or contact AWS Support to request an increase in the number of accounts.</p> <note> <p>Deleted and closed accounts still count toward your limit.</p> </note> <important> <p>If you get receive this exception when running a command immediately after creating the organization, wait one hour and try again. If after an hour it continues to fail with this error, contact <a href=\"https://console.aws.amazon.com/support/home#/\">AWS Support</a>.</p> </important> </li> <li> <p>CANNOT_REGISTER_MASTER_AS_DELEGATED_ADMINISTRATOR: You can designate only a member account as a delegated administrator.</p> </li> <li> <p>CANNOT_REMOVE_DELEGATED_ADMINISTRATOR_FROM_ORG: To complete this operation, you must first deregister this account as a delegated administrator. </p> </li> <li> <p>DELEGATED_ADMINISTRATOR_EXISTS_FOR_THIS_SERVICE: To complete this operation, you must first deregister all delegated administrators for this service.</p> </li> <li> <p>HANDSHAKE_RATE_LIMIT_EXCEEDED: You attempted to exceed the number of handshakes that you can send in one day.</p> </li> <li> <p>MASTER_ACCOUNT_ADDRESS_DOES_NOT_MATCH_MARKETPLACE: To create an account in this organization, you first must migrate the organization's master account to the marketplace that corresponds to the master account's address. For example, accounts with India addresses must be associated with the AISPL marketplace. All accounts in an organization must be associated with the same marketplace.</p> </li> <li> <p>MASTER_ACCOUNT_MISSING_CONTACT_INFO: To complete this operation, you must first provide contact a valid address and phone number for the master account. Then try the operation again.</p> </li> <li> <p>MASTER_ACCOUNT_NOT_GOVCLOUD_ENABLED: To complete this operation, the master account must have an associated account in the AWS GovCloud (US-West) Region. For more information, see <a href=\"http://docs.aws.amazon.com/govcloud-us/latest/UserGuide/govcloud-organizations.html\">AWS Organizations</a> in the <i>AWS GovCloud User Guide.</i> </p> </li> <li> <p>MASTER_ACCOUNT_PAYMENT_INSTRUMENT_REQUIRED: To create an organization with this master account, you first must associate a valid payment instrument, such as a credit card, with the account. Follow the steps at <a href=\"http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info\">To leave an organization when all required account information has not yet been provided</a> in the <i>AWS Organizations User Guide.</i> </p> </li> <li> <p>MAX_DELEGATED_ADMINISTRATORS_FOR_SERVICE_LIMIT_EXCEEDED: You attempted to register more delegated administrators than allowed for the service principal. </p> </li> <li> <p>MAX_POLICY_TYPE_ATTACHMENT_LIMIT_EXCEEDED: You attempted to exceed the number of policies of a certain type that can be attached to an entity at one time.</p> </li> <li> <p>MAX_TAG_LIMIT_EXCEEDED: You have exceeded the number of tags allowed on this resource. </p> </li> <li> <p>MEMBER_ACCOUNT_PAYMENT_INSTRUMENT_REQUIRED: To complete this operation with this member account, you first must associate a valid payment instrument, such as a credit card, with the account. Follow the steps at <a href=\"http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_remove.html#leave-without-all-info\">To leave an organization when all required account information has not yet been provided</a> in the <i>AWS Organizations User Guide.</i> </p> </li> <li> <p>MIN_POLICY_TYPE_ATTACHMENT_LIMIT_EXCEEDED: You attempted to detach a policy from an entity that would cause the entity to have fewer than the minimum number of policies of a certain type required.</p> </li> <li> <p>OU_DEPTH_LIMIT_EXCEEDED: You attempted to create an OU tree that is too many levels deep.</p> </li> <li> <p>ORGANIZATION_NOT_IN_ALL_FEATURES_MODE: You attempted to perform an operation that requires the organization to be configured to support all features. An organization that supports only consolidated billing features can't perform this operation.</p> </li> <li> <p>OU_NUMBER_LIMIT_EXCEEDED: You attempted to exceed the number of OUs that you can have in an organization.</p> </li> <li> <p>POLICY_NUMBER_LIMIT_EXCEEDED. You attempted to exceed the number of policies that you can have in an organization.</p> </li> </ul>",
       "exception":true
     },
     "ConstraintViolationExceptionReason":{
@@ -1143,6 +1278,7 @@
         "OU_NUMBER_LIMIT_EXCEEDED",
         "OU_DEPTH_LIMIT_EXCEEDED",
         "POLICY_NUMBER_LIMIT_EXCEEDED",
+        "POLICY_CONTENT_LIMIT_EXCEEDED",
         "MAX_POLICY_TYPE_ATTACHMENT_LIMIT_EXCEEDED",
         "MIN_POLICY_TYPE_ATTACHMENT_LIMIT_EXCEEDED",
         "ACCOUNT_CANNOT_LEAVE_ORGANIZATION",
@@ -1159,7 +1295,11 @@
         "EMAIL_VERIFICATION_CODE_EXPIRED",
         "WAIT_PERIOD_ACTIVE",
         "MAX_TAG_LIMIT_EXCEEDED",
-        "TAG_POLICY_VIOLATION"
+        "TAG_POLICY_VIOLATION",
+        "MAX_DELEGATED_ADMINISTRATORS_FOR_SERVICE_LIMIT_EXCEEDED",
+        "CANNOT_REGISTER_MASTER_AS_DELEGATED_ADMINISTRATOR",
+        "CANNOT_REMOVE_DELEGATED_ADMINISTRATOR_FROM_ORG",
+        "DELEGATED_ADMINISTRATOR_EXISTS_FOR_THIS_SERVICE"
       ]
     },
     "CreateAccountFailureReason":{
@@ -1170,7 +1310,8 @@
         "INVALID_ADDRESS",
         "INVALID_EMAIL",
         "CONCURRENT_ACCOUNT_MODIFICATION",
-        "INTERNAL_FAILURE"
+        "INTERNAL_FAILURE",
+        "GOVCLOUD_ACCOUNT_ALREADY_EXISTS"
       ]
     },
     "CreateAccountRequest":{
@@ -1190,7 +1331,7 @@
         },
         "RoleName":{
           "shape":"RoleName",
-          "documentation":"<p>(Optional)</p> <p>The name of an IAM role that AWS Organizations automatically preconfigures in the new member account. This role trusts the master account, allowing users in the master account to assume the role, as permitted by the master account administrator. The role has administrator permissions in the new member account.</p> <p>If you don't specify this parameter, the role name defaults to <code>OrganizationAccountAccessRole</code>.</p> <p>For more information about how to use this role to access the member account, see <a href=\"https://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_access.html#orgs_manage_accounts_create-cross-account-role\">Accessing and Administering the Member Accounts in Your Organization</a> in the <i>AWS Organizations User Guide</i>, and steps 2 and 3 in <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/tutorial_cross-account-with-roles.html\">Tutorial: Delegate Access Across AWS Accounts Using IAM Roles</a> in the <i>IAM User Guide.</i> </p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> that is used to validate this parameter is a string of characters that can consist of uppercase letters, lowercase letters, digits with no spaces, and any of the following characters: =,.@-</p>"
+          "documentation":"<p>(Optional)</p> <p>The name of an IAM role that AWS Organizations automatically preconfigures in the new member account. This role trusts the master account, allowing users in the master account to assume the role, as permitted by the master account administrator. The role has administrator permissions in the new member account.</p> <p>If you don't specify this parameter, the role name defaults to <code>OrganizationAccountAccessRole</code>.</p> <p>For more information about how to use this role to access the member account, see the following links:</p> <ul> <li> <p> <a href=\"https://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_access.html#orgs_manage_accounts_create-cross-account-role\">Accessing and Administering the Member Accounts in Your Organization</a> in the <i>AWS Organizations User Guide</i> </p> </li> <li> <p>Steps 2 and 3 in <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/tutorial_cross-account-with-roles.html\">Tutorial: Delegate Access Across AWS Accounts Using IAM Roles</a> in the <i>IAM User Guide</i> </p> </li> </ul> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> that is used to validate this parameter. The pattern can include uppercase letters, lowercase letters, digits with no spaces, and any of the following characters: =,.@-</p>"
         },
         "IamUserAccessToBilling":{
           "shape":"IAMUserAccessToBilling",
@@ -1228,7 +1369,7 @@
       "members":{
         "Id":{
           "shape":"CreateAccountRequestId",
-          "documentation":"<p>The unique identifier (ID) that references this request. You get this value from the response of the initial <a>CreateAccount</a> request to create the account.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> for an create account request ID string requires \"car-\" followed by from 8 to 32 lower-case letters or digits.</p>"
+          "documentation":"<p>The unique identifier (ID) that references this request. You get this value from the response of the initial <a>CreateAccount</a> request to create the account.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> for a create account request ID string requires \"car-\" followed by from 8 to 32 lower-case letters or digits.</p>"
         },
         "AccountName":{
           "shape":"AccountName",
@@ -1290,7 +1431,7 @@
         },
         "RoleName":{
           "shape":"RoleName",
-          "documentation":"<p>(Optional)</p> <p>The name of an IAM role that AWS Organizations automatically preconfigures in the new member accounts in both the AWS GovCloud (US) Region and in the commercial Region. This role trusts the master account, allowing users in the master account to assume the role, as permitted by the master account administrator. The role has administrator permissions in the new member account.</p> <p>If you don't specify this parameter, the role name defaults to <code>OrganizationAccountAccessRole</code>.</p> <p>For more information about how to use this role to access the member account, see <a href=\"https://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_access.html#orgs_manage_accounts_create-cross-account-role\">Accessing and Administering the Member Accounts in Your Organization</a> in the <i>AWS Organizations User Guide</i> and steps 2 and 3 in <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/tutorial_cross-account-with-roles.html\">Tutorial: Delegate Access Across AWS Accounts Using IAM Roles</a> in the <i>IAM User Guide.</i> </p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> that is used to validate this parameter is a string of characters that can consist of uppercase letters, lowercase letters, digits with no spaces, and any of the following characters: =,.@-</p>"
+          "documentation":"<p>(Optional)</p> <p>The name of an IAM role that AWS Organizations automatically preconfigures in the new member accounts in both the AWS GovCloud (US) Region and in the commercial Region. This role trusts the master account, allowing users in the master account to assume the role, as permitted by the master account administrator. The role has administrator permissions in the new member account.</p> <p>If you don't specify this parameter, the role name defaults to <code>OrganizationAccountAccessRole</code>.</p> <p>For more information about how to use this role to access the member account, see <a href=\"https://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_accounts_access.html#orgs_manage_accounts_create-cross-account-role\">Accessing and Administering the Member Accounts in Your Organization</a> in the <i>AWS Organizations User Guide</i> and steps 2 and 3 in <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/tutorial_cross-account-with-roles.html\">Tutorial: Delegate Access Across AWS Accounts Using IAM Roles</a> in the <i>IAM User Guide.</i> </p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> that is used to validate this parameter. The pattern can include uppercase letters, lowercase letters, digits with no spaces, and any of the following characters: =,.@-</p>"
         },
         "IamUserAccessToBilling":{
           "shape":"IAMUserAccessToBilling",
@@ -1331,7 +1472,7 @@
       "members":{
         "ParentId":{
           "shape":"ParentId",
-          "documentation":"<p>The unique identifier (ID) of the parent root or OU that you want to create the new OU in.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> for a parent ID string requires one of the following:</p> <ul> <li> <p> <b>Root</b> - A string that begins with \"r-\" followed by from 4 to 32 lower-case letters or digits.</p> </li> <li> <p> <b>Organizational unit (OU)</b> - A string that begins with \"ou-\" followed by from 4 to 32 lower-case letters or digits (the ID of the root that the OU is in) followed by a second \"-\" dash and from 8 to 32 additional lower-case letters or digits.</p> </li> </ul>"
+          "documentation":"<p>The unique identifier (ID) of the parent root or OU that you want to create the new OU in.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> for a parent ID string requires one of the following:</p> <ul> <li> <p> <b>Root</b> - A string that begins with \"r-\" followed by from 4 to 32 lowercase letters or digits.</p> </li> <li> <p> <b>Organizational unit (OU)</b> - A string that begins with \"ou-\" followed by from 4 to 32 lowercase letters or digits (the ID of the root that the OU is in). This string is followed by a second \"-\" dash and from 8 to 32 additional lowercase letters or digits.</p> </li> </ul>"
         },
         "Name":{
           "shape":"OrganizationalUnitName",
@@ -1390,7 +1531,7 @@
       "members":{
         "HandshakeId":{
           "shape":"HandshakeId",
-          "documentation":"<p>The unique identifier (ID) of the handshake that you want to decline. You can get the ID from the <a>ListHandshakesForAccount</a> operation.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> for handshake ID string requires \"h-\" followed by from 8 to 32 lower-case letters or digits.</p>"
+          "documentation":"<p>The unique identifier (ID) of the handshake that you want to decline. You can get the ID from the <a>ListHandshakesForAccount</a> operation.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> for handshake ID string requires \"h-\" followed by from 8 to 32 lowercase letters or digits.</p>"
         }
       }
     },
@@ -1403,13 +1544,73 @@
         }
       }
     },
+    "DelegatedAdministrator":{
+      "type":"structure",
+      "members":{
+        "Id":{
+          "shape":"AccountId",
+          "documentation":"<p>The unique identifier (ID) of the delegated administrator's account.</p>"
+        },
+        "Arn":{
+          "shape":"AccountArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the delegated administrator's account.</p>"
+        },
+        "Email":{
+          "shape":"Email",
+          "documentation":"<p>The email address that is associated with the delegated administrator's AWS account.</p>"
+        },
+        "Name":{
+          "shape":"AccountName",
+          "documentation":"<p>The friendly name of the delegated administrator's account.</p>"
+        },
+        "Status":{
+          "shape":"AccountStatus",
+          "documentation":"<p>The status of the delegated administrator's account in the organization.</p>"
+        },
+        "JoinedMethod":{
+          "shape":"AccountJoinedMethod",
+          "documentation":"<p>The method by which the delegated administrator's account joined the organization.</p>"
+        },
+        "JoinedTimestamp":{
+          "shape":"Timestamp",
+          "documentation":"<p>The date when the delegated administrator's account became a part of the organization.</p>"
+        },
+        "DelegationEnabledDate":{
+          "shape":"Timestamp",
+          "documentation":"<p>The date when the account was made a delegated administrator.</p>"
+        }
+      },
+      "documentation":"<p>Contains information about the delegated administrator.</p>"
+    },
+    "DelegatedAdministrators":{
+      "type":"list",
+      "member":{"shape":"DelegatedAdministrator"}
+    },
+    "DelegatedService":{
+      "type":"structure",
+      "members":{
+        "ServicePrincipal":{
+          "shape":"ServicePrincipal",
+          "documentation":"<p>The name of a service that can request an operation for the specified service. This is typically in the form of a URL, such as: <code> <i>servicename</i>.amazonaws.com</code>.</p>"
+        },
+        "DelegationEnabledDate":{
+          "shape":"Timestamp",
+          "documentation":"<p>The date that the account became a delegated administrator for this service. </p>"
+        }
+      },
+      "documentation":"<p>Contains information about the AWS service for which the account is a delegated administrator.</p>"
+    },
+    "DelegatedServices":{
+      "type":"list",
+      "member":{"shape":"DelegatedService"}
+    },
     "DeleteOrganizationalUnitRequest":{
       "type":"structure",
       "required":["OrganizationalUnitId"],
       "members":{
         "OrganizationalUnitId":{
           "shape":"OrganizationalUnitId",
-          "documentation":"<p>The unique identifier (ID) of the organizational unit that you want to delete. You can get the ID from the <a>ListOrganizationalUnitsForParent</a> operation.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> for an organizational unit ID string requires \"ou-\" followed by from 4 to 32 lower-case letters or digits (the ID of the root that contains the OU) followed by a second \"-\" dash and from 8 to 32 additional lower-case letters or digits.</p>"
+          "documentation":"<p>The unique identifier (ID) of the organizational unit that you want to delete. You can get the ID from the <a>ListOrganizationalUnitsForParent</a> operation.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> for an organizational unit ID string requires \"ou-\" followed by from 4 to 32 lowercase letters or digits (the ID of the root that contains the OU). This string is followed by a second \"-\" dash and from 8 to 32 additional lowercase letters or digits.</p>"
         }
       }
     },
@@ -1419,7 +1620,24 @@
       "members":{
         "PolicyId":{
           "shape":"PolicyId",
-          "documentation":"<p>The unique identifier (ID) of the policy that you want to delete. You can get the ID from the <a>ListPolicies</a> or <a>ListPoliciesForTarget</a> operations.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> for a policy ID string requires \"p-\" followed by from 8 to 128 lower-case letters or digits.</p>"
+          "documentation":"<p>The unique identifier (ID) of the policy that you want to delete. You can get the ID from the <a>ListPolicies</a> or <a>ListPoliciesForTarget</a> operations.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> for a policy ID string requires \"p-\" followed by from 8 to 128 lowercase or uppercase letters, digits, or the underscore character (_).</p>"
+        }
+      }
+    },
+    "DeregisterDelegatedAdministratorRequest":{
+      "type":"structure",
+      "required":[
+        "AccountId",
+        "ServicePrincipal"
+      ],
+      "members":{
+        "AccountId":{
+          "shape":"AccountId",
+          "documentation":"<p>The account ID number of the member account in the organization that you want to deregister as a delegated administrator.</p>"
+        },
+        "ServicePrincipal":{
+          "shape":"ServicePrincipal",
+          "documentation":"<p>The service principal name of an AWS service for which the account is a delegated administrator.</p> <p>Delegated administrator privileges are revoked for only the specified AWS service from the member account. If the specified service is the only service for which the member account is a delegated administrator, the operation also revokes Organizations read action permissions.</p>"
         }
       }
     },
@@ -1448,7 +1666,7 @@
       "members":{
         "CreateAccountRequestId":{
           "shape":"CreateAccountRequestId",
-          "documentation":"<p>Specifies the <code>operationId</code> that uniquely identifies the request. You can get the ID from the response to an earlier <a>CreateAccount</a> request, or from the <a>ListCreateAccountStatus</a> operation.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> for a create account request ID string requires \"car-\" followed by from 8 to 32 lower-case letters or digits.</p>"
+          "documentation":"<p>Specifies the <code>operationId</code> that uniquely identifies the request. You can get the ID from the response to an earlier <a>CreateAccount</a> request, or from the <a>ListCreateAccountStatus</a> operation.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> for a create account request ID string requires \"car-\" followed by from 8 to 32 lowercase letters or digits.</p>"
         }
       }
     },
@@ -1461,13 +1679,36 @@
         }
       }
     },
+    "DescribeEffectivePolicyRequest":{
+      "type":"structure",
+      "required":["PolicyType"],
+      "members":{
+        "PolicyType":{
+          "shape":"EffectivePolicyType",
+          "documentation":"<p>The type of policy that you want information about.</p>"
+        },
+        "TargetId":{
+          "shape":"PolicyTargetId",
+          "documentation":"<p>When you're signed in as the master account, specify the ID of the account that you want details about. Specifying an organization root or OU as the target is not supported. </p>"
+        }
+      }
+    },
+    "DescribeEffectivePolicyResponse":{
+      "type":"structure",
+      "members":{
+        "EffectivePolicy":{
+          "shape":"EffectivePolicy",
+          "documentation":"<p>The contents of the effective policy.</p>"
+        }
+      }
+    },
     "DescribeHandshakeRequest":{
       "type":"structure",
       "required":["HandshakeId"],
       "members":{
         "HandshakeId":{
           "shape":"HandshakeId",
-          "documentation":"<p>The unique identifier (ID) of the handshake that you want information about. You can get the ID from the original call to <a>InviteAccountToOrganization</a>, or from a call to <a>ListHandshakesForAccount</a> or <a>ListHandshakesForOrganization</a>.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> for handshake ID string requires \"h-\" followed by from 8 to 32 lower-case letters or digits.</p>"
+          "documentation":"<p>The unique identifier (ID) of the handshake that you want information about. You can get the ID from the original call to <a>InviteAccountToOrganization</a>, or from a call to <a>ListHandshakesForAccount</a> or <a>ListHandshakesForOrganization</a>.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> for handshake ID string requires \"h-\" followed by from 8 to 32 lowercase letters or digits.</p>"
         }
       }
     },
@@ -1495,7 +1736,7 @@
       "members":{
         "OrganizationalUnitId":{
           "shape":"OrganizationalUnitId",
-          "documentation":"<p>The unique identifier (ID) of the organizational unit that you want details about. You can get the ID from the <a>ListOrganizationalUnitsForParent</a> operation.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> for an organizational unit ID string requires \"ou-\" followed by from 4 to 32 lower-case letters or digits (the ID of the root that contains the OU) followed by a second \"-\" dash and from 8 to 32 additional lower-case letters or digits.</p>"
+          "documentation":"<p>The unique identifier (ID) of the organizational unit that you want details about. You can get the ID from the <a>ListOrganizationalUnitsForParent</a> operation.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> for an organizational unit ID string requires \"ou-\" followed by from 4 to 32 lowercase letters or digits (the ID of the root that contains the OU). This string is followed by a second \"-\" dash and from 8 to 32 additional lowercase letters or digits.</p>"
         }
       }
     },
@@ -1514,7 +1755,7 @@
       "members":{
         "PolicyId":{
           "shape":"PolicyId",
-          "documentation":"<p>The unique identifier (ID) of the policy that you want details about. You can get the ID from the <a>ListPolicies</a> or <a>ListPoliciesForTarget</a> operations.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> for a policy ID string requires \"p-\" followed by from 8 to 128 lower-case letters or digits.</p>"
+          "documentation":"<p>The unique identifier (ID) of the policy that you want details about. You can get the ID from the <a>ListPolicies</a> or <a>ListPoliciesForTarget</a> operations.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> for a policy ID string requires \"p-\" followed by from 8 to 128 lowercase or uppercase letters, digits, or the underscore character (_).</p>"
         }
       }
     },
@@ -1544,11 +1785,11 @@
       "members":{
         "PolicyId":{
           "shape":"PolicyId",
-          "documentation":"<p>The unique identifier (ID) of the policy you want to detach. You can get the ID from the <a>ListPolicies</a> or <a>ListPoliciesForTarget</a> operations.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> for a policy ID string requires \"p-\" followed by from 8 to 128 lower-case letters or digits.</p>"
+          "documentation":"<p>The unique identifier (ID) of the policy you want to detach. You can get the ID from the <a>ListPolicies</a> or <a>ListPoliciesForTarget</a> operations.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> for a policy ID string requires \"p-\" followed by from 8 to 128 lowercase or uppercase letters, digits, or the underscore character (_).</p>"
         },
         "TargetId":{
           "shape":"PolicyTargetId",
-          "documentation":"<p>The unique identifier (ID) of the root, OU, or account that you want to detach the policy from. You can get the ID from the <a>ListRoots</a>, <a>ListOrganizationalUnitsForParent</a>, or <a>ListAccounts</a> operations.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> for a target ID string requires one of the following:</p> <ul> <li> <p> <b>Root</b> - A string that begins with \"r-\" followed by from 4 to 32 lower-case letters or digits.</p> </li> <li> <p> <b>Account</b> - A string that consists of exactly 12 digits.</p> </li> <li> <p> <b>Organizational unit (OU)</b> - A string that begins with \"ou-\" followed by from 4 to 32 lower-case letters or digits (the ID of the root that the OU is in) followed by a second \"-\" dash and from 8 to 32 additional lower-case letters or digits.</p> </li> </ul>"
+          "documentation":"<p>The unique identifier (ID) of the root, OU, or account that you want to detach the policy from. You can get the ID from the <a>ListRoots</a>, <a>ListOrganizationalUnitsForParent</a>, or <a>ListAccounts</a> operations.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> for a target ID string requires one of the following:</p> <ul> <li> <p> <b>Root</b> - A string that begins with \"r-\" followed by from 4 to 32 lowercase letters or digits.</p> </li> <li> <p> <b>Account</b> - A string that consists of exactly 12 digits.</p> </li> <li> <p> <b>Organizational unit (OU)</b> - A string that begins with \"ou-\" followed by from 4 to 32 lowercase letters or digits (the ID of the root that the OU is in). This string is followed by a second \"-\" dash and from 8 to 32 additional lowercase letters or digits.</p> </li> </ul>"
         }
       }
     },
@@ -1571,7 +1812,7 @@
       "members":{
         "RootId":{
           "shape":"RootId",
-          "documentation":"<p>The unique identifier (ID) of the root in which you want to disable a policy type. You can get the ID from the <a>ListRoots</a> operation.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> for a root ID string requires \"r-\" followed by from 4 to 32 lower-case letters or digits.</p>"
+          "documentation":"<p>The unique identifier (ID) of the root in which you want to disable a policy type. You can get the ID from the <a>ListRoots</a> operation.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> for a root ID string requires \"r-\" followed by from 4 to 32 lowercase letters or digits.</p>"
         },
         "PolicyType":{
           "shape":"PolicyType",
@@ -1628,6 +1869,40 @@
       "documentation":"<p>A policy with the same name already exists.</p>",
       "exception":true
     },
+    "EffectivePolicy":{
+      "type":"structure",
+      "members":{
+        "PolicyContent":{
+          "shape":"PolicyContent",
+          "documentation":"<p>The text content of the policy.</p>"
+        },
+        "LastUpdatedTimestamp":{
+          "shape":"Timestamp",
+          "documentation":"<p>The time of the last update to this policy.</p>"
+        },
+        "TargetId":{
+          "shape":"PolicyTargetId",
+          "documentation":"<p>The account ID of the policy target. </p>"
+        },
+        "PolicyType":{
+          "shape":"EffectivePolicyType",
+          "documentation":"<p>The policy type.</p>"
+        }
+      },
+      "documentation":"<p>Contains rules to be applied to the affected accounts. The effective policy is the aggregation of any policies the account inherits, plus any policy directly attached to the account.</p>"
+    },
+    "EffectivePolicyNotFoundException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"ExceptionMessage"}
+      },
+      "documentation":"<p>If you ran this action on the master account, this policy type is not enabled. If you ran the action on a member account, the account doesn't have an effective policy of this type. Contact the administrator of your organization about attaching a policy of this type to the account. </p>",
+      "exception":true
+    },
+    "EffectivePolicyType":{
+      "type":"string",
+      "enum":["TAG_POLICY"]
+    },
     "Email":{
       "type":"string",
       "max":64,
@@ -1668,7 +1943,7 @@
       "members":{
         "RootId":{
           "shape":"RootId",
-          "documentation":"<p>The unique identifier (ID) of the root in which you want to enable a policy type. You can get the ID from the <a>ListRoots</a> operation.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> for a root ID string requires \"r-\" followed by from 4 to 32 lower-case letters or digits.</p>"
+          "documentation":"<p>The unique identifier (ID) of the root in which you want to enable a policy type. You can get the ID from the <a>ListRoots</a> operation.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> for a root ID string requires \"r-\" followed by from 4 to 32 lowercase letters or digits.</p>"
         },
         "PolicyType":{
           "shape":"PolicyType",
@@ -1697,7 +1972,7 @@
           "documentation":"<p>The date that the service principal was enabled for integration with AWS Organizations.</p>"
         }
       },
-      "documentation":"<p>A structure that contains details of a service principal that is enabled to integrate with AWS Organizations.</p>"
+      "documentation":"<p>A structure that contains details of a service principal that represents an AWS service that is enabled to integrate with AWS Organizations.</p>"
     },
     "EnabledServicePrincipals":{
       "type":"list",
@@ -1941,6 +2216,7 @@
         "INVALID_SYNTAX_ORGANIZATION_ARN",
         "INVALID_SYNTAX_POLICY_ID",
         "INVALID_ENUM",
+        "INVALID_ENUM_POLICY_TYPE",
         "INVALID_LIST_MEMBER",
         "MAX_LENGTH_EXCEEDED",
         "MAX_VALUE_EXCEEDED",
@@ -1956,7 +2232,8 @@
         "INVALID_FULL_NAME_TARGET",
         "UNRECOGNIZED_SERVICE_PRINCIPAL",
         "INVALID_ROLE_NAME",
-        "INVALID_SYSTEM_TAGS_PARAMETER"
+        "INVALID_SYSTEM_TAGS_PARAMETER",
+        "TARGET_NOT_SUPPORTED"
       ]
     },
     "InviteAccountToOrganizationRequest":{
@@ -1987,11 +2264,11 @@
       "members":{
         "NextToken":{
           "shape":"NextToken",
-          "documentation":"<p>Use this parameter if you receive a <code>NextToken</code> response in a previous request that indicates that there is more output available. Set it to the value of the previous call's <code>NextToken</code> response to indicate where the output should continue from.</p>"
+          "documentation":"<p>The parameter for receiving additional results if you receive a <code>NextToken</code> response in a previous request. A <code>NextToken</code> response indicates that more output is available. Set this parameter to the value of the previous call's <code>NextToken</code> response to indicate where the output should continue from.</p>"
         },
         "MaxResults":{
           "shape":"MaxResults",
-          "documentation":"<p>(Optional) Use this to limit the number of results you want included per page in the response. If you do not include this parameter, it defaults to a value that is specific to the operation. If additional items exist beyond the maximum you specify, the <code>NextToken</code> response element is present and has a value (is not null). Include that value as the <code>NextToken</code> request parameter in the next call to the operation to get the next part of the results. Note that Organizations might return fewer results than the maximum even when there are more results available. You should check <code>NextToken</code> after every operation to ensure that you receive all of the results.</p>"
+          "documentation":"<p>The total number of results that you want included on each page of the response. If you do not include this parameter, it defaults to a value that is specific to the operation. If additional items exist beyond the maximum you specify, the <code>NextToken</code> response element is present and has a value (is not null). Include that value as the <code>NextToken</code> request parameter in the next call to the operation to get the next part of the results. Note that Organizations might return fewer results than the maximum even when there are more results available. You should check <code>NextToken</code> after every operation to ensure that you receive all of the results.</p>"
         }
       }
     },
@@ -2004,7 +2281,7 @@
         },
         "NextToken":{
           "shape":"NextToken",
-          "documentation":"<p>If present, this value indicates that there is more output available than is included in the current response. Use this value in the <code>NextToken</code> request parameter in a subsequent call to the operation to get the next part of the output. You should repeat this until the <code>NextToken</code> response element comes back as <code>null</code>.</p>"
+          "documentation":"<p>If present, indicates that more output is available than is included in the current response. Use this value in the <code>NextToken</code> request parameter in a subsequent call to the operation to get the next part of the output. You should repeat this until the <code>NextToken</code> response element comes back as <code>null</code>.</p>"
         }
       }
     },
@@ -2018,11 +2295,11 @@
         },
         "NextToken":{
           "shape":"NextToken",
-          "documentation":"<p>Use this parameter if you receive a <code>NextToken</code> response in a previous request that indicates that there is more output available. Set it to the value of the previous call's <code>NextToken</code> response to indicate where the output should continue from.</p>"
+          "documentation":"<p>The parameter for receiving additional results if you receive a <code>NextToken</code> response in a previous request. A <code>NextToken</code> response indicates that more output is available. Set this parameter to the value of the previous call's <code>NextToken</code> response to indicate where the output should continue from.</p>"
         },
         "MaxResults":{
           "shape":"MaxResults",
-          "documentation":"<p>(Optional) Use this to limit the number of results you want included per page in the response. If you do not include this parameter, it defaults to a value that is specific to the operation. If additional items exist beyond the maximum you specify, the <code>NextToken</code> response element is present and has a value (is not null). Include that value as the <code>NextToken</code> request parameter in the next call to the operation to get the next part of the results. Note that Organizations might return fewer results than the maximum even when there are more results available. You should check <code>NextToken</code> after every operation to ensure that you receive all of the results.</p>"
+          "documentation":"<p>The total number of results that you want included on each page of the response. If you do not include this parameter, it defaults to a value that is specific to the operation. If additional items exist beyond the maximum you specify, the <code>NextToken</code> response element is present and has a value (is not null). Include that value as the <code>NextToken</code> request parameter in the next call to the operation to get the next part of the results. Note that Organizations might return fewer results than the maximum even when there are more results available. You should check <code>NextToken</code> after every operation to ensure that you receive all of the results.</p>"
         }
       }
     },
@@ -2035,7 +2312,7 @@
         },
         "NextToken":{
           "shape":"NextToken",
-          "documentation":"<p>If present, this value indicates that there is more output available than is included in the current response. Use this value in the <code>NextToken</code> request parameter in a subsequent call to the operation to get the next part of the output. You should repeat this until the <code>NextToken</code> response element comes back as <code>null</code>.</p>"
+          "documentation":"<p>If present, indicates that more output is available than is included in the current response. Use this value in the <code>NextToken</code> request parameter in a subsequent call to the operation to get the next part of the output. You should repeat this until the <code>NextToken</code> response element comes back as <code>null</code>.</p>"
         }
       }
     },
@@ -2044,11 +2321,11 @@
       "members":{
         "NextToken":{
           "shape":"NextToken",
-          "documentation":"<p>Use this parameter if you receive a <code>NextToken</code> response in a previous request that indicates that there is more output available. Set it to the value of the previous call's <code>NextToken</code> response to indicate where the output should continue from.</p>"
+          "documentation":"<p>The parameter for receiving additional results if you receive a <code>NextToken</code> response in a previous request. A <code>NextToken</code> response indicates that more output is available. Set this parameter to the value of the previous call's <code>NextToken</code> response to indicate where the output should continue from.</p>"
         },
         "MaxResults":{
           "shape":"MaxResults",
-          "documentation":"<p>(Optional) Use this to limit the number of results you want included per page in the response. If you do not include this parameter, it defaults to a value that is specific to the operation. If additional items exist beyond the maximum you specify, the <code>NextToken</code> response element is present and has a value (is not null). Include that value as the <code>NextToken</code> request parameter in the next call to the operation to get the next part of the results. Note that Organizations might return fewer results than the maximum even when there are more results available. You should check <code>NextToken</code> after every operation to ensure that you receive all of the results.</p>"
+          "documentation":"<p>The total number of results that you want included on each page of the response. If you do not include this parameter, it defaults to a value that is specific to the operation. If additional items exist beyond the maximum you specify, the <code>NextToken</code> response element is present and has a value (is not null). Include that value as the <code>NextToken</code> request parameter in the next call to the operation to get the next part of the results. Note that Organizations might return fewer results than the maximum even when there are more results available. You should check <code>NextToken</code> after every operation to ensure that you receive all of the results.</p>"
         }
       }
     },
@@ -2061,7 +2338,7 @@
         },
         "NextToken":{
           "shape":"NextToken",
-          "documentation":"<p>If present, this value indicates that there is more output available than is included in the current response. Use this value in the <code>NextToken</code> request parameter in a subsequent call to the operation to get the next part of the output. You should repeat this until the <code>NextToken</code> response element comes back as <code>null</code>.</p>"
+          "documentation":"<p>If present, indicates that more output is available than is included in the current response. Use this value in the <code>NextToken</code> request parameter in a subsequent call to the operation to get the next part of the output. You should repeat this until the <code>NextToken</code> response element comes back as <code>null</code>.</p>"
         }
       }
     },
@@ -2074,7 +2351,7 @@
       "members":{
         "ParentId":{
           "shape":"ParentId",
-          "documentation":"<p>The unique identifier (ID) for the parent root or OU whose children you want to list.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> for a parent ID string requires one of the following:</p> <ul> <li> <p> <b>Root</b> - A string that begins with \"r-\" followed by from 4 to 32 lower-case letters or digits.</p> </li> <li> <p> <b>Organizational unit (OU)</b> - A string that begins with \"ou-\" followed by from 4 to 32 lower-case letters or digits (the ID of the root that the OU is in) followed by a second \"-\" dash and from 8 to 32 additional lower-case letters or digits.</p> </li> </ul>"
+          "documentation":"<p>The unique identifier (ID) for the parent root or OU whose children you want to list.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> for a parent ID string requires one of the following:</p> <ul> <li> <p> <b>Root</b> - A string that begins with \"r-\" followed by from 4 to 32 lowercase letters or digits.</p> </li> <li> <p> <b>Organizational unit (OU)</b> - A string that begins with \"ou-\" followed by from 4 to 32 lowercase letters or digits (the ID of the root that the OU is in). This string is followed by a second \"-\" dash and from 8 to 32 additional lowercase letters or digits.</p> </li> </ul>"
         },
         "ChildType":{
           "shape":"ChildType",
@@ -2082,11 +2359,11 @@
         },
         "NextToken":{
           "shape":"NextToken",
-          "documentation":"<p>Use this parameter if you receive a <code>NextToken</code> response in a previous request that indicates that there is more output available. Set it to the value of the previous call's <code>NextToken</code> response to indicate where the output should continue from.</p>"
+          "documentation":"<p>The parameter for receiving additional results if you receive a <code>NextToken</code> response in a previous request. A <code>NextToken</code> response indicates that more output is available. Set this parameter to the value of the previous call's <code>NextToken</code> response to indicate where the output should continue from.</p>"
         },
         "MaxResults":{
           "shape":"MaxResults",
-          "documentation":"<p>(Optional) Use this to limit the number of results you want included per page in the response. If you do not include this parameter, it defaults to a value that is specific to the operation. If additional items exist beyond the maximum you specify, the <code>NextToken</code> response element is present and has a value (is not null). Include that value as the <code>NextToken</code> request parameter in the next call to the operation to get the next part of the results. Note that Organizations might return fewer results than the maximum even when there are more results available. You should check <code>NextToken</code> after every operation to ensure that you receive all of the results.</p>"
+          "documentation":"<p>The total number of results that you want included on each page of the response. If you do not include this parameter, it defaults to a value that is specific to the operation. If additional items exist beyond the maximum you specify, the <code>NextToken</code> response element is present and has a value (is not null). Include that value as the <code>NextToken</code> request parameter in the next call to the operation to get the next part of the results. Note that Organizations might return fewer results than the maximum even when there are more results available. You should check <code>NextToken</code> after every operation to ensure that you receive all of the results.</p>"
         }
       }
     },
@@ -2099,7 +2376,7 @@
         },
         "NextToken":{
           "shape":"NextToken",
-          "documentation":"<p>If present, this value indicates that there is more output available than is included in the current response. Use this value in the <code>NextToken</code> request parameter in a subsequent call to the operation to get the next part of the output. You should repeat this until the <code>NextToken</code> response element comes back as <code>null</code>.</p>"
+          "documentation":"<p>If present, indicates that more output is available than is included in the current response. Use this value in the <code>NextToken</code> request parameter in a subsequent call to the operation to get the next part of the output. You should repeat this until the <code>NextToken</code> response element comes back as <code>null</code>.</p>"
         }
       }
     },
@@ -2112,11 +2389,11 @@
         },
         "NextToken":{
           "shape":"NextToken",
-          "documentation":"<p>Use this parameter if you receive a <code>NextToken</code> response in a previous request that indicates that there is more output available. Set it to the value of the previous call's <code>NextToken</code> response to indicate where the output should continue from.</p>"
+          "documentation":"<p>The parameter for receiving additional results if you receive a <code>NextToken</code> response in a previous request. A <code>NextToken</code> response indicates that more output is available. Set this parameter to the value of the previous call's <code>NextToken</code> response to indicate where the output should continue from.</p>"
         },
         "MaxResults":{
           "shape":"MaxResults",
-          "documentation":"<p>(Optional) Use this to limit the number of results you want included per page in the response. If you do not include this parameter, it defaults to a value that is specific to the operation. If additional items exist beyond the maximum you specify, the <code>NextToken</code> response element is present and has a value (is not null). Include that value as the <code>NextToken</code> request parameter in the next call to the operation to get the next part of the results. Note that Organizations might return fewer results than the maximum even when there are more results available. You should check <code>NextToken</code> after every operation to ensure that you receive all of the results.</p>"
+          "documentation":"<p>The total number of results that you want included on each page of the response. If you do not include this parameter, it defaults to a value that is specific to the operation. If additional items exist beyond the maximum you specify, the <code>NextToken</code> response element is present and has a value (is not null). Include that value as the <code>NextToken</code> request parameter in the next call to the operation to get the next part of the results. Note that Organizations might return fewer results than the maximum even when there are more results available. You should check <code>NextToken</code> after every operation to ensure that you receive all of the results.</p>"
         }
       }
     },
@@ -2129,7 +2406,68 @@
         },
         "NextToken":{
           "shape":"NextToken",
-          "documentation":"<p>If present, this value indicates that there is more output available than is included in the current response. Use this value in the <code>NextToken</code> request parameter in a subsequent call to the operation to get the next part of the output. You should repeat this until the <code>NextToken</code> response element comes back as <code>null</code>.</p>"
+          "documentation":"<p>If present, indicates that more output is available than is included in the current response. Use this value in the <code>NextToken</code> request parameter in a subsequent call to the operation to get the next part of the output. You should repeat this until the <code>NextToken</code> response element comes back as <code>null</code>.</p>"
+        }
+      }
+    },
+    "ListDelegatedAdministratorsRequest":{
+      "type":"structure",
+      "members":{
+        "ServicePrincipal":{
+          "shape":"ServicePrincipal",
+          "documentation":"<p>Specifies a service principal name. If specified, then the operation lists the delegated administrators only for the specified service.</p> <p>If you don't specify a service principal, the operation lists all delegated administrators for all services in your organization.</p>"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>The parameter for receiving additional results if you receive a <code>NextToken</code> response in a previous request. A <code>NextToken</code> response indicates that more output is available. Set this parameter to the value of the previous call's <code>NextToken</code> response to indicate where the output should continue from.</p>"
+        },
+        "MaxResults":{
+          "shape":"MaxResults",
+          "documentation":"<p>The total number of results that you want included on each page of the response. If you do not include this parameter, it defaults to a value that is specific to the operation. If additional items exist beyond the maximum you specify, the <code>NextToken</code> response element is present and has a value (is not null). Include that value as the <code>NextToken</code> request parameter in the next call to the operation to get the next part of the results. Note that Organizations might return fewer results than the maximum even when there are more results available. You should check <code>NextToken</code> after every operation to ensure that you receive all of the results.</p>"
+        }
+      }
+    },
+    "ListDelegatedAdministratorsResponse":{
+      "type":"structure",
+      "members":{
+        "DelegatedAdministrators":{
+          "shape":"DelegatedAdministrators",
+          "documentation":"<p>The list of delegated administrators in your organization.</p>"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>If present, indicates that more output is available than is included in the current response. Use this value in the <code>NextToken</code> request parameter in a subsequent call to the operation to get the next part of the output. You should repeat this until the <code>NextToken</code> response element comes back as <code>null</code>.</p>"
+        }
+      }
+    },
+    "ListDelegatedServicesForAccountRequest":{
+      "type":"structure",
+      "required":["AccountId"],
+      "members":{
+        "AccountId":{
+          "shape":"AccountId",
+          "documentation":"<p>The account ID number of a delegated administrator account in the organization.</p>"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>The parameter for receiving additional results if you receive a <code>NextToken</code> response in a previous request. A <code>NextToken</code> response indicates that more output is available. Set this parameter to the value of the previous call's <code>NextToken</code> response to indicate where the output should continue from.</p>"
+        },
+        "MaxResults":{
+          "shape":"MaxResults",
+          "documentation":"<p>The total number of results that you want included on each page of the response. If you do not include this parameter, it defaults to a value that is specific to the operation. If additional items exist beyond the maximum you specify, the <code>NextToken</code> response element is present and has a value (is not null). Include that value as the <code>NextToken</code> request parameter in the next call to the operation to get the next part of the results. Note that Organizations might return fewer results than the maximum even when there are more results available. You should check <code>NextToken</code> after every operation to ensure that you receive all of the results.</p>"
+        }
+      }
+    },
+    "ListDelegatedServicesForAccountResponse":{
+      "type":"structure",
+      "members":{
+        "DelegatedServices":{
+          "shape":"DelegatedServices",
+          "documentation":"<p>The services for which the account is a delegated administrator.</p>"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>If present, indicates that more output is available than is included in the current response. Use this value in the <code>NextToken</code> request parameter in a subsequent call to the operation to get the next part of the output. You should repeat this until the <code>NextToken</code> response element comes back as <code>null</code>.</p>"
         }
       }
     },
@@ -2142,11 +2480,11 @@
         },
         "NextToken":{
           "shape":"NextToken",
-          "documentation":"<p>Use this parameter if you receive a <code>NextToken</code> response in a previous request that indicates that there is more output available. Set it to the value of the previous call's <code>NextToken</code> response to indicate where the output should continue from.</p>"
+          "documentation":"<p>The parameter for receiving additional results if you receive a <code>NextToken</code> response in a previous request. A <code>NextToken</code> response indicates that more output is available. Set this parameter to the value of the previous call's <code>NextToken</code> response to indicate where the output should continue from.</p>"
         },
         "MaxResults":{
           "shape":"MaxResults",
-          "documentation":"<p>(Optional) Use this to limit the number of results you want included per page in the response. If you do not include this parameter, it defaults to a value that is specific to the operation. If additional items exist beyond the maximum you specify, the <code>NextToken</code> response element is present and has a value (is not null). Include that value as the <code>NextToken</code> request parameter in the next call to the operation to get the next part of the results. Note that Organizations might return fewer results than the maximum even when there are more results available. You should check <code>NextToken</code> after every operation to ensure that you receive all of the results.</p>"
+          "documentation":"<p>The total number of results that you want included on each page of the response. If you do not include this parameter, it defaults to a value that is specific to the operation. If additional items exist beyond the maximum you specify, the <code>NextToken</code> response element is present and has a value (is not null). Include that value as the <code>NextToken</code> request parameter in the next call to the operation to get the next part of the results. Note that Organizations might return fewer results than the maximum even when there are more results available. You should check <code>NextToken</code> after every operation to ensure that you receive all of the results.</p>"
         }
       }
     },
@@ -2159,7 +2497,7 @@
         },
         "NextToken":{
           "shape":"NextToken",
-          "documentation":"<p>If present, this value indicates that there is more output available than is included in the current response. Use this value in the <code>NextToken</code> request parameter in a subsequent call to the operation to get the next part of the output. You should repeat this until the <code>NextToken</code> response element comes back as <code>null</code>.</p>"
+          "documentation":"<p>If present, indicates that more output is available than is included in the current response. Use this value in the <code>NextToken</code> request parameter in a subsequent call to the operation to get the next part of the output. You should repeat this until the <code>NextToken</code> response element comes back as <code>null</code>.</p>"
         }
       }
     },
@@ -2172,11 +2510,11 @@
         },
         "NextToken":{
           "shape":"NextToken",
-          "documentation":"<p>Use this parameter if you receive a <code>NextToken</code> response in a previous request that indicates that there is more output available. Set it to the value of the previous call's <code>NextToken</code> response to indicate where the output should continue from.</p>"
+          "documentation":"<p>The parameter for receiving additional results if you receive a <code>NextToken</code> response in a previous request. A <code>NextToken</code> response indicates that more output is available. Set this parameter to the value of the previous call's <code>NextToken</code> response to indicate where the output should continue from.</p>"
         },
         "MaxResults":{
           "shape":"MaxResults",
-          "documentation":"<p>(Optional) Use this to limit the number of results you want included per page in the response. If you do not include this parameter, it defaults to a value that is specific to the operation. If additional items exist beyond the maximum you specify, the <code>NextToken</code> response element is present and has a value (is not null). Include that value as the <code>NextToken</code> request parameter in the next call to the operation to get the next part of the results. Note that Organizations might return fewer results than the maximum even when there are more results available. You should check <code>NextToken</code> after every operation to ensure that you receive all of the results.</p>"
+          "documentation":"<p>The total number of results that you want included on each page of the response. If you do not include this parameter, it defaults to a value that is specific to the operation. If additional items exist beyond the maximum you specify, the <code>NextToken</code> response element is present and has a value (is not null). Include that value as the <code>NextToken</code> request parameter in the next call to the operation to get the next part of the results. Note that Organizations might return fewer results than the maximum even when there are more results available. You should check <code>NextToken</code> after every operation to ensure that you receive all of the results.</p>"
         }
       }
     },
@@ -2189,7 +2527,7 @@
         },
         "NextToken":{
           "shape":"NextToken",
-          "documentation":"<p>If present, this value indicates that there is more output available than is included in the current response. Use this value in the <code>NextToken</code> request parameter in a subsequent call to the operation to get the next part of the output. You should repeat this until the <code>NextToken</code> response element comes back as <code>null</code>.</p>"
+          "documentation":"<p>If present, indicates that more output is available than is included in the current response. Use this value in the <code>NextToken</code> request parameter in a subsequent call to the operation to get the next part of the output. You should repeat this until the <code>NextToken</code> response element comes back as <code>null</code>.</p>"
         }
       }
     },
@@ -2199,15 +2537,15 @@
       "members":{
         "ParentId":{
           "shape":"ParentId",
-          "documentation":"<p>The unique identifier (ID) of the root or OU whose child OUs you want to list.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> for a parent ID string requires one of the following:</p> <ul> <li> <p> <b>Root</b> - A string that begins with \"r-\" followed by from 4 to 32 lower-case letters or digits.</p> </li> <li> <p> <b>Organizational unit (OU)</b> - A string that begins with \"ou-\" followed by from 4 to 32 lower-case letters or digits (the ID of the root that the OU is in) followed by a second \"-\" dash and from 8 to 32 additional lower-case letters or digits.</p> </li> </ul>"
+          "documentation":"<p>The unique identifier (ID) of the root or OU whose child OUs you want to list.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> for a parent ID string requires one of the following:</p> <ul> <li> <p> <b>Root</b> - A string that begins with \"r-\" followed by from 4 to 32 lowercase letters or digits.</p> </li> <li> <p> <b>Organizational unit (OU)</b> - A string that begins with \"ou-\" followed by from 4 to 32 lowercase letters or digits (the ID of the root that the OU is in). This string is followed by a second \"-\" dash and from 8 to 32 additional lowercase letters or digits.</p> </li> </ul>"
         },
         "NextToken":{
           "shape":"NextToken",
-          "documentation":"<p>Use this parameter if you receive a <code>NextToken</code> response in a previous request that indicates that there is more output available. Set it to the value of the previous call's <code>NextToken</code> response to indicate where the output should continue from.</p>"
+          "documentation":"<p>The parameter for receiving additional results if you receive a <code>NextToken</code> response in a previous request. A <code>NextToken</code> response indicates that more output is available. Set this parameter to the value of the previous call's <code>NextToken</code> response to indicate where the output should continue from.</p>"
         },
         "MaxResults":{
           "shape":"MaxResults",
-          "documentation":"<p>(Optional) Use this to limit the number of results you want included per page in the response. If you do not include this parameter, it defaults to a value that is specific to the operation. If additional items exist beyond the maximum you specify, the <code>NextToken</code> response element is present and has a value (is not null). Include that value as the <code>NextToken</code> request parameter in the next call to the operation to get the next part of the results. Note that Organizations might return fewer results than the maximum even when there are more results available. You should check <code>NextToken</code> after every operation to ensure that you receive all of the results.</p>"
+          "documentation":"<p>The total number of results that you want included on each page of the response. If you do not include this parameter, it defaults to a value that is specific to the operation. If additional items exist beyond the maximum you specify, the <code>NextToken</code> response element is present and has a value (is not null). Include that value as the <code>NextToken</code> request parameter in the next call to the operation to get the next part of the results. Note that Organizations might return fewer results than the maximum even when there are more results available. You should check <code>NextToken</code> after every operation to ensure that you receive all of the results.</p>"
         }
       }
     },
@@ -2220,7 +2558,7 @@
         },
         "NextToken":{
           "shape":"NextToken",
-          "documentation":"<p>If present, this value indicates that there is more output available than is included in the current response. Use this value in the <code>NextToken</code> request parameter in a subsequent call to the operation to get the next part of the output. You should repeat this until the <code>NextToken</code> response element comes back as <code>null</code>.</p>"
+          "documentation":"<p>If present, indicates that more output is available than is included in the current response. Use this value in the <code>NextToken</code> request parameter in a subsequent call to the operation to get the next part of the output. You should repeat this until the <code>NextToken</code> response element comes back as <code>null</code>.</p>"
         }
       }
     },
@@ -2230,15 +2568,15 @@
       "members":{
         "ChildId":{
           "shape":"ChildId",
-          "documentation":"<p>The unique identifier (ID) of the OU or account whose parent containers you want to list. Don't specify a root.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> for a child ID string requires one of the following:</p> <ul> <li> <p> <b>Account</b> - A string that consists of exactly 12 digits.</p> </li> <li> <p> <b>Organizational unit (OU)</b> - A string that begins with \"ou-\" followed by from 4 to 32 lower-case letters or digits (the ID of the root that contains the OU) followed by a second \"-\" dash and from 8 to 32 additional lower-case letters or digits.</p> </li> </ul>"
+          "documentation":"<p>The unique identifier (ID) of the OU or account whose parent containers you want to list. Don't specify a root.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> for a child ID string requires one of the following:</p> <ul> <li> <p> <b>Account</b> - A string that consists of exactly 12 digits.</p> </li> <li> <p> <b>Organizational unit (OU)</b> - A string that begins with \"ou-\" followed by from 4 to 32 lowercase letters or digits (the ID of the root that contains the OU). This string is followed by a second \"-\" dash and from 8 to 32 additional lowercase letters or digits.</p> </li> </ul>"
         },
         "NextToken":{
           "shape":"NextToken",
-          "documentation":"<p>Use this parameter if you receive a <code>NextToken</code> response in a previous request that indicates that there is more output available. Set it to the value of the previous call's <code>NextToken</code> response to indicate where the output should continue from.</p>"
+          "documentation":"<p>The parameter for receiving additional results if you receive a <code>NextToken</code> response in a previous request. A <code>NextToken</code> response indicates that more output is available. Set this parameter to the value of the previous call's <code>NextToken</code> response to indicate where the output should continue from.</p>"
         },
         "MaxResults":{
           "shape":"MaxResults",
-          "documentation":"<p>(Optional) Use this to limit the number of results you want included per page in the response. If you do not include this parameter, it defaults to a value that is specific to the operation. If additional items exist beyond the maximum you specify, the <code>NextToken</code> response element is present and has a value (is not null). Include that value as the <code>NextToken</code> request parameter in the next call to the operation to get the next part of the results. Note that Organizations might return fewer results than the maximum even when there are more results available. You should check <code>NextToken</code> after every operation to ensure that you receive all of the results.</p>"
+          "documentation":"<p>The total number of results that you want included on each page of the response. If you do not include this parameter, it defaults to a value that is specific to the operation. If additional items exist beyond the maximum you specify, the <code>NextToken</code> response element is present and has a value (is not null). Include that value as the <code>NextToken</code> request parameter in the next call to the operation to get the next part of the results. Note that Organizations might return fewer results than the maximum even when there are more results available. You should check <code>NextToken</code> after every operation to ensure that you receive all of the results.</p>"
         }
       }
     },
@@ -2251,7 +2589,7 @@
         },
         "NextToken":{
           "shape":"NextToken",
-          "documentation":"<p>If present, this value indicates that there is more output available than is included in the current response. Use this value in the <code>NextToken</code> request parameter in a subsequent call to the operation to get the next part of the output. You should repeat this until the <code>NextToken</code> response element comes back as <code>null</code>.</p>"
+          "documentation":"<p>If present, indicates that more output is available than is included in the current response. Use this value in the <code>NextToken</code> request parameter in a subsequent call to the operation to get the next part of the output. You should repeat this until the <code>NextToken</code> response element comes back as <code>null</code>.</p>"
         }
       }
     },
@@ -2264,7 +2602,7 @@
       "members":{
         "TargetId":{
           "shape":"PolicyTargetId",
-          "documentation":"<p>The unique identifier (ID) of the root, organizational unit, or account whose policies you want to list.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> for a target ID string requires one of the following:</p> <ul> <li> <p> <b>Root</b> - A string that begins with \"r-\" followed by from 4 to 32 lower-case letters or digits.</p> </li> <li> <p> <b>Account</b> - A string that consists of exactly 12 digits.</p> </li> <li> <p> <b>Organizational unit (OU)</b> - A string that begins with \"ou-\" followed by from 4 to 32 lower-case letters or digits (the ID of the root that the OU is in) followed by a second \"-\" dash and from 8 to 32 additional lower-case letters or digits.</p> </li> </ul>"
+          "documentation":"<p>The unique identifier (ID) of the root, organizational unit, or account whose policies you want to list.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> for a target ID string requires one of the following:</p> <ul> <li> <p> <b>Root</b> - A string that begins with \"r-\" followed by from 4 to 32 lowercase letters or digits.</p> </li> <li> <p> <b>Account</b> - A string that consists of exactly 12 digits.</p> </li> <li> <p> <b>Organizational unit (OU)</b> - A string that begins with \"ou-\" followed by from 4 to 32 lowercase letters or digits (the ID of the root that the OU is in). This string is followed by a second \"-\" dash and from 8 to 32 additional lowercase letters or digits.</p> </li> </ul>"
         },
         "Filter":{
           "shape":"PolicyType",
@@ -2272,11 +2610,11 @@
         },
         "NextToken":{
           "shape":"NextToken",
-          "documentation":"<p>Use this parameter if you receive a <code>NextToken</code> response in a previous request that indicates that there is more output available. Set it to the value of the previous call's <code>NextToken</code> response to indicate where the output should continue from.</p>"
+          "documentation":"<p>The parameter for receiving additional results if you receive a <code>NextToken</code> response in a previous request. A <code>NextToken</code> response indicates that more output is available. Set this parameter to the value of the previous call's <code>NextToken</code> response to indicate where the output should continue from.</p>"
         },
         "MaxResults":{
           "shape":"MaxResults",
-          "documentation":"<p>(Optional) Use this to limit the number of results you want included per page in the response. If you do not include this parameter, it defaults to a value that is specific to the operation. If additional items exist beyond the maximum you specify, the <code>NextToken</code> response element is present and has a value (is not null). Include that value as the <code>NextToken</code> request parameter in the next call to the operation to get the next part of the results. Note that Organizations might return fewer results than the maximum even when there are more results available. You should check <code>NextToken</code> after every operation to ensure that you receive all of the results.</p>"
+          "documentation":"<p>The total number of results that you want included on each page of the response. If you do not include this parameter, it defaults to a value that is specific to the operation. If additional items exist beyond the maximum you specify, the <code>NextToken</code> response element is present and has a value (is not null). Include that value as the <code>NextToken</code> request parameter in the next call to the operation to get the next part of the results. Note that Organizations might return fewer results than the maximum even when there are more results available. You should check <code>NextToken</code> after every operation to ensure that you receive all of the results.</p>"
         }
       }
     },
@@ -2289,7 +2627,7 @@
         },
         "NextToken":{
           "shape":"NextToken",
-          "documentation":"<p>If present, this value indicates that there is more output available than is included in the current response. Use this value in the <code>NextToken</code> request parameter in a subsequent call to the operation to get the next part of the output. You should repeat this until the <code>NextToken</code> response element comes back as <code>null</code>.</p>"
+          "documentation":"<p>If present, indicates that more output is available than is included in the current response. Use this value in the <code>NextToken</code> request parameter in a subsequent call to the operation to get the next part of the output. You should repeat this until the <code>NextToken</code> response element comes back as <code>null</code>.</p>"
         }
       }
     },
@@ -2303,11 +2641,11 @@
         },
         "NextToken":{
           "shape":"NextToken",
-          "documentation":"<p>Use this parameter if you receive a <code>NextToken</code> response in a previous request that indicates that there is more output available. Set it to the value of the previous call's <code>NextToken</code> response to indicate where the output should continue from.</p>"
+          "documentation":"<p>The parameter for receiving additional results if you receive a <code>NextToken</code> response in a previous request. A <code>NextToken</code> response indicates that more output is available. Set this parameter to the value of the previous call's <code>NextToken</code> response to indicate where the output should continue from.</p>"
         },
         "MaxResults":{
           "shape":"MaxResults",
-          "documentation":"<p>(Optional) Use this to limit the number of results you want included per page in the response. If you do not include this parameter, it defaults to a value that is specific to the operation. If additional items exist beyond the maximum you specify, the <code>NextToken</code> response element is present and has a value (is not null). Include that value as the <code>NextToken</code> request parameter in the next call to the operation to get the next part of the results. Note that Organizations might return fewer results than the maximum even when there are more results available. You should check <code>NextToken</code> after every operation to ensure that you receive all of the results.</p>"
+          "documentation":"<p>The total number of results that you want included on each page of the response. If you do not include this parameter, it defaults to a value that is specific to the operation. If additional items exist beyond the maximum you specify, the <code>NextToken</code> response element is present and has a value (is not null). Include that value as the <code>NextToken</code> request parameter in the next call to the operation to get the next part of the results. Note that Organizations might return fewer results than the maximum even when there are more results available. You should check <code>NextToken</code> after every operation to ensure that you receive all of the results.</p>"
         }
       }
     },
@@ -2320,7 +2658,7 @@
         },
         "NextToken":{
           "shape":"NextToken",
-          "documentation":"<p>If present, this value indicates that there is more output available than is included in the current response. Use this value in the <code>NextToken</code> request parameter in a subsequent call to the operation to get the next part of the output. You should repeat this until the <code>NextToken</code> response element comes back as <code>null</code>.</p>"
+          "documentation":"<p>If present, indicates that more output is available than is included in the current response. Use this value in the <code>NextToken</code> request parameter in a subsequent call to the operation to get the next part of the output. You should repeat this until the <code>NextToken</code> response element comes back as <code>null</code>.</p>"
         }
       }
     },
@@ -2329,11 +2667,11 @@
       "members":{
         "NextToken":{
           "shape":"NextToken",
-          "documentation":"<p>Use this parameter if you receive a <code>NextToken</code> response in a previous request that indicates that there is more output available. Set it to the value of the previous call's <code>NextToken</code> response to indicate where the output should continue from.</p>"
+          "documentation":"<p>The parameter for receiving additional results if you receive a <code>NextToken</code> response in a previous request. A <code>NextToken</code> response indicates that more output is available. Set this parameter to the value of the previous call's <code>NextToken</code> response to indicate where the output should continue from.</p>"
         },
         "MaxResults":{
           "shape":"MaxResults",
-          "documentation":"<p>(Optional) Use this to limit the number of results you want included per page in the response. If you do not include this parameter, it defaults to a value that is specific to the operation. If additional items exist beyond the maximum you specify, the <code>NextToken</code> response element is present and has a value (is not null). Include that value as the <code>NextToken</code> request parameter in the next call to the operation to get the next part of the results. Note that Organizations might return fewer results than the maximum even when there are more results available. You should check <code>NextToken</code> after every operation to ensure that you receive all of the results.</p>"
+          "documentation":"<p>The total number of results that you want included on each page of the response. If you do not include this parameter, it defaults to a value that is specific to the operation. If additional items exist beyond the maximum you specify, the <code>NextToken</code> response element is present and has a value (is not null). Include that value as the <code>NextToken</code> request parameter in the next call to the operation to get the next part of the results. Note that Organizations might return fewer results than the maximum even when there are more results available. You should check <code>NextToken</code> after every operation to ensure that you receive all of the results.</p>"
         }
       }
     },
@@ -2346,7 +2684,7 @@
         },
         "NextToken":{
           "shape":"NextToken",
-          "documentation":"<p>If present, this value indicates that there is more output available than is included in the current response. Use this value in the <code>NextToken</code> request parameter in a subsequent call to the operation to get the next part of the output. You should repeat this until the <code>NextToken</code> response element comes back as <code>null</code>.</p>"
+          "documentation":"<p>If present, indicates that more output is available than is included in the current response. Use this value in the <code>NextToken</code> request parameter in a subsequent call to the operation to get the next part of the output. You should repeat this until the <code>NextToken</code> response element comes back as <code>null</code>.</p>"
         }
       }
     },
@@ -2360,7 +2698,7 @@
         },
         "NextToken":{
           "shape":"NextToken",
-          "documentation":"<p>Use this parameter if you receive a <code>NextToken</code> response in a previous request that indicates that there is more output available. Set it to the value of the previous call's <code>NextToken</code> response to indicate where the output should continue from.</p>"
+          "documentation":"<p>The parameter for receiving additional results if you receive a <code>NextToken</code> response in a previous request. A <code>NextToken</code> response indicates that more output is available. Set this parameter to the value of the previous call's <code>NextToken</code> response to indicate where the output should continue from.</p>"
         }
       }
     },
@@ -2373,7 +2711,7 @@
         },
         "NextToken":{
           "shape":"NextToken",
-          "documentation":"<p>If present, this value indicates that there is more output available than is included in the current response. Use this value in the <code>NextToken</code> request parameter in a subsequent call to the operation to get the next part of the output. You should repeat this until the <code>NextToken</code> response element comes back as <code>null</code>.</p>"
+          "documentation":"<p>If present, indicates that more output is available than is included in the current response. Use this value in the <code>NextToken</code> request parameter in a subsequent call to the operation to get the next part of the output. You should repeat this until the <code>NextToken</code> response element comes back as <code>null</code>.</p>"
         }
       }
     },
@@ -2383,15 +2721,15 @@
       "members":{
         "PolicyId":{
           "shape":"PolicyId",
-          "documentation":"<p>The unique identifier (ID) of the policy whose attachments you want to know.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> for a policy ID string requires \"p-\" followed by from 8 to 128 lower-case letters or digits.</p>"
+          "documentation":"<p>The unique identifier (ID) of the policy whose attachments you want to know.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> for a policy ID string requires \"p-\" followed by from 8 to 128 lowercase or uppercase letters, digits, or the underscore character (_).</p>"
         },
         "NextToken":{
           "shape":"NextToken",
-          "documentation":"<p>Use this parameter if you receive a <code>NextToken</code> response in a previous request that indicates that there is more output available. Set it to the value of the previous call's <code>NextToken</code> response to indicate where the output should continue from.</p>"
+          "documentation":"<p>The parameter for receiving additional results if you receive a <code>NextToken</code> response in a previous request. A <code>NextToken</code> response indicates that more output is available. Set this parameter to the value of the previous call's <code>NextToken</code> response to indicate where the output should continue from.</p>"
         },
         "MaxResults":{
           "shape":"MaxResults",
-          "documentation":"<p>(Optional) Use this to limit the number of results you want included per page in the response. If you do not include this parameter, it defaults to a value that is specific to the operation. If additional items exist beyond the maximum you specify, the <code>NextToken</code> response element is present and has a value (is not null). Include that value as the <code>NextToken</code> request parameter in the next call to the operation to get the next part of the results. Note that Organizations might return fewer results than the maximum even when there are more results available. You should check <code>NextToken</code> after every operation to ensure that you receive all of the results.</p>"
+          "documentation":"<p>The total number of results that you want included on each page of the response. If you do not include this parameter, it defaults to a value that is specific to the operation. If additional items exist beyond the maximum you specify, the <code>NextToken</code> response element is present and has a value (is not null). Include that value as the <code>NextToken</code> request parameter in the next call to the operation to get the next part of the results. Note that Organizations might return fewer results than the maximum even when there are more results available. You should check <code>NextToken</code> after every operation to ensure that you receive all of the results.</p>"
         }
       }
     },
@@ -2404,7 +2742,7 @@
         },
         "NextToken":{
           "shape":"NextToken",
-          "documentation":"<p>If present, this value indicates that there is more output available than is included in the current response. Use this value in the <code>NextToken</code> request parameter in a subsequent call to the operation to get the next part of the output. You should repeat this until the <code>NextToken</code> response element comes back as <code>null</code>.</p>"
+          "documentation":"<p>If present, indicates that more output is available than is included in the current response. Use this value in the <code>NextToken</code> request parameter in a subsequent call to the operation to get the next part of the output. You should repeat this until the <code>NextToken</code> response element comes back as <code>null</code>.</p>"
         }
       }
     },
@@ -2444,11 +2782,11 @@
         },
         "SourceParentId":{
           "shape":"ParentId",
-          "documentation":"<p>The unique identifier (ID) of the root or organizational unit that you want to move the account from.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> for a parent ID string requires one of the following:</p> <ul> <li> <p> <b>Root</b> - A string that begins with \"r-\" followed by from 4 to 32 lower-case letters or digits.</p> </li> <li> <p> <b>Organizational unit (OU)</b> - A string that begins with \"ou-\" followed by from 4 to 32 lower-case letters or digits (the ID of the root that the OU is in) followed by a second \"-\" dash and from 8 to 32 additional lower-case letters or digits.</p> </li> </ul>"
+          "documentation":"<p>The unique identifier (ID) of the root or organizational unit that you want to move the account from.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> for a parent ID string requires one of the following:</p> <ul> <li> <p> <b>Root</b> - A string that begins with \"r-\" followed by from 4 to 32 lowercase letters or digits.</p> </li> <li> <p> <b>Organizational unit (OU)</b> - A string that begins with \"ou-\" followed by from 4 to 32 lowercase letters or digits (the ID of the root that the OU is in). This string is followed by a second \"-\" dash and from 8 to 32 additional lowercase letters or digits.</p> </li> </ul>"
         },
         "DestinationParentId":{
           "shape":"ParentId",
-          "documentation":"<p>The unique identifier (ID) of the root or organizational unit that you want to move the account to.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> for a parent ID string requires one of the following:</p> <ul> <li> <p> <b>Root</b> - A string that begins with \"r-\" followed by from 4 to 32 lower-case letters or digits.</p> </li> <li> <p> <b>Organizational unit (OU)</b> - A string that begins with \"ou-\" followed by from 4 to 32 lower-case letters or digits (the ID of the root that the OU is in) followed by a second \"-\" dash and from 8 to 32 additional lower-case letters or digits.</p> </li> </ul>"
+          "documentation":"<p>The unique identifier (ID) of the root or organizational unit that you want to move the account to.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> for a parent ID string requires one of the following:</p> <ul> <li> <p> <b>Root</b> - A string that begins with \"r-\" followed by from 4 to 32 lowercase letters or digits.</p> </li> <li> <p> <b>Organizational unit (OU)</b> - A string that begins with \"ou-\" followed by from 4 to 32 lowercase letters or digits (the ID of the root that the OU is in). This string is followed by a second \"-\" dash and from 8 to 32 additional lowercase letters or digits.</p> </li> </ul>"
         }
       }
     },
@@ -2515,7 +2853,7 @@
       "members":{
         "Id":{
           "shape":"OrganizationalUnitId",
-          "documentation":"<p>The unique identifier (ID) associated with this OU.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> for an organizational unit ID string requires \"ou-\" followed by from 4 to 32 lower-case letters or digits (the ID of the root that contains the OU) followed by a second \"-\" dash and from 8 to 32 additional lower-case letters or digits.</p>"
+          "documentation":"<p>The unique identifier (ID) associated with this OU.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> for an organizational unit ID string requires \"ou-\" followed by from 4 to 32 lower-case letters or digits (the ID of the root that contains the OU). This string is followed by a second \"-\" dash and from 8 to 32 additional lower-case letters or digits.</p>"
         },
         "Arn":{
           "shape":"OrganizationalUnitArn",
@@ -2566,7 +2904,7 @@
       "members":{
         "Id":{
           "shape":"ParentId",
-          "documentation":"<p>The unique identifier (ID) of the parent entity.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> for a parent ID string requires one of the following:</p> <ul> <li> <p>Root: a string that begins with \"r-\" followed by from 4 to 32 lower-case letters or digits.</p> </li> <li> <p>Organizational unit (OU): a string that begins with \"ou-\" followed by from 4 to 32 lower-case letters or digits (the ID of the root that the OU is in) followed by a second \"-\" dash and from 8 to 32 additional lower-case letters or digits.</p> </li> </ul>"
+          "documentation":"<p>The unique identifier (ID) of the parent entity.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> for a parent ID string requires one of the following:</p> <ul> <li> <p>Root: A string that begins with \"r-\" followed by from 4 to 32 lower-case letters or digits.</p> </li> <li> <p>Organizational unit (OU): A string that begins with \"ou-\" followed by from 4 to 32 lower-case letters or digits (the ID of the root that the OU is in). This string is followed by a second \"-\" dash and from 8 to 32 additional lower-case letters or digits.</p> </li> </ul>"
         },
         "Type":{
           "shape":"ParentType",
@@ -2620,6 +2958,14 @@
       "type":"string",
       "pattern":"^(arn:aws:organizations::\\d{12}:policy\\/o-[a-z0-9]{10,32}\\/[0-9a-z_]+\\/p-[0-9a-z]{10,32})|(arn:aws:organizations::aws:policy\\/[0-9a-z_]+\\/p-[0-9a-zA-Z_]{10,128})"
     },
+    "PolicyChangesInProgressException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"ExceptionMessage"}
+      },
+      "documentation":"<p>Changes to the effective policy are in progress, and its contents can't be returned. Try the operation again later. </p>",
+      "exception":true
+    },
     "PolicyContent":{
       "type":"string",
       "max":1000000,
@@ -2701,7 +3047,7 @@
       "members":{
         "TargetId":{
           "shape":"PolicyTargetId",
-          "documentation":"<p>The unique identifier (ID) of the policy target.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> for a target ID string requires one of the following:</p> <ul> <li> <p>Root: a string that begins with \"r-\" followed by from 4 to 32 lower-case letters or digits.</p> </li> <li> <p>Account: a string that consists of exactly 12 digits.</p> </li> <li> <p>Organizational unit (OU): a string that begins with \"ou-\" followed by from 4 to 32 lower-case letters or digits (the ID of the root that the OU is in) followed by a second \"-\" dash and from 8 to 32 additional lower-case letters or digits.</p> </li> </ul>"
+          "documentation":"<p>The unique identifier (ID) of the policy target.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> for a target ID string requires one of the following:</p> <ul> <li> <p>Root: A string that begins with \"r-\" followed by from 4 to 32 lower-case letters or digits.</p> </li> <li> <p>Account: A string that consists of exactly 12 digits.</p> </li> <li> <p>Organizational unit (OU): A string that begins with \"ou-\" followed by from 4 to 32 lower-case letters or digits (the ID of the root that the OU is in). This string is followed by a second \"-\" dash and from 8 to 32 additional lower-case letters or digits.</p> </li> </ul>"
         },
         "Arn":{
           "shape":"GenericArn",
@@ -2724,7 +3070,10 @@
     },
     "PolicyType":{
       "type":"string",
-      "enum":["SERVICE_CONTROL_POLICY"]
+      "enum":[
+        "SERVICE_CONTROL_POLICY",
+        "TAG_POLICY"
+      ]
     },
     "PolicyTypeAlreadyEnabledException":{
       "type":"structure",
@@ -2776,6 +3125,23 @@
       "type":"list",
       "member":{"shape":"PolicyTypeSummary"}
     },
+    "RegisterDelegatedAdministratorRequest":{
+      "type":"structure",
+      "required":[
+        "AccountId",
+        "ServicePrincipal"
+      ],
+      "members":{
+        "AccountId":{
+          "shape":"AccountId",
+          "documentation":"<p>The account ID number of the member account in the organization to register as a delegated administrator.</p>"
+        },
+        "ServicePrincipal":{
+          "shape":"ServicePrincipal",
+          "documentation":"<p>The service principal of the AWS service for which you want to make the member account a delegated administrator.</p>"
+        }
+      }
+    },
     "RemoveAccountFromOrganizationRequest":{
       "type":"structure",
       "required":["AccountId"],
@@ -2980,7 +3346,7 @@
       "members":{
         "OrganizationalUnitId":{
           "shape":"OrganizationalUnitId",
-          "documentation":"<p>The unique identifier (ID) of the OU that you want to rename. You can get the ID from the <a>ListOrganizationalUnitsForParent</a> operation.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> for an organizational unit ID string requires \"ou-\" followed by from 4 to 32 lower-case letters or digits (the ID of the root that contains the OU) followed by a second \"-\" dash and from 8 to 32 additional lower-case letters or digits.</p>"
+          "documentation":"<p>The unique identifier (ID) of the OU that you want to rename. You can get the ID from the <a>ListOrganizationalUnitsForParent</a> operation.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> for an organizational unit ID string requires \"ou-\" followed by from 4 to 32 lowercase letters or digits (the ID of the root that contains the OU). This string is followed by a second \"-\" dash and from 8 to 32 additional lowercase letters or digits.</p>"
         },
         "Name":{
           "shape":"OrganizationalUnitName",
@@ -3003,7 +3369,7 @@
       "members":{
         "PolicyId":{
           "shape":"PolicyId",
-          "documentation":"<p>The unique identifier (ID) of the policy that you want to update.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> for a policy ID string requires \"p-\" followed by from 8 to 128 lower-case letters or digits.</p>"
+          "documentation":"<p>The unique identifier (ID) of the policy that you want to update.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> for a policy ID string requires \"p-\" followed by from 8 to 128 lowercase or uppercase letters, digits, or the underscore character (_).</p>"
         },
         "Name":{
           "shape":"PolicyName",
diff --git a/services/outposts/pom.xml b/services/outposts/pom.xml
new file mode 100644
index 000000000000..5ff0d332be98
--- /dev/null
+++ b/services/outposts/pom.xml
@@ -0,0 +1,60 @@
+<?xml version="1.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.
+  -->
+
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>software.amazon.awssdk</groupId>
+        <artifactId>services</artifactId>
+        <version>2.11.8-SNAPSHOT</version>
+    </parent>
+    <artifactId>outposts</artifactId>
+    <name>AWS Java SDK :: Services :: Outposts</name>
+    <description>The AWS Java SDK for Outposts module holds the client classes that are used for
+        communicating with Outposts.
+    </description>
+    <url>https://aws.amazon.com/sdkforjava</url>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifestEntries>
+                            <Automatic-Module-Name>software.amazon.awssdk.services.outposts</Automatic-Module-Name>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>protocol-core</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>aws-json-protocol</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/services/outposts/src/main/resources/codegen-resources/paginators-1.json b/services/outposts/src/main/resources/codegen-resources/paginators-1.json
new file mode 100644
index 000000000000..a22e9d094c75
--- /dev/null
+++ b/services/outposts/src/main/resources/codegen-resources/paginators-1.json
@@ -0,0 +1,14 @@
+{
+  "pagination": {
+    "ListOutposts": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "MaxResults"
+    },
+    "ListSites": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "MaxResults"
+    }
+  }
+}
diff --git a/services/outposts/src/main/resources/codegen-resources/service-2.json b/services/outposts/src/main/resources/codegen-resources/service-2.json
new file mode 100644
index 000000000000..592e20363153
--- /dev/null
+++ b/services/outposts/src/main/resources/codegen-resources/service-2.json
@@ -0,0 +1,467 @@
+{
+  "version":"2.0",
+  "metadata":{
+    "apiVersion":"2019-12-03",
+    "endpointPrefix":"outposts",
+    "jsonVersion":"1.1",
+    "protocol":"rest-json",
+    "serviceAbbreviation":"Outposts",
+    "serviceFullName":"AWS Outposts",
+    "serviceId":"Outposts",
+    "signatureVersion":"v4",
+    "signingName":"outposts",
+    "uid":"outposts-2019-12-03"
+  },
+  "operations":{
+    "CreateOutpost":{
+      "name":"CreateOutpost",
+      "http":{
+        "method":"POST",
+        "requestUri":"/outposts"
+      },
+      "input":{"shape":"CreateOutpostInput"},
+      "output":{"shape":"CreateOutpostOutput"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"NotFoundException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"InternalServerException"},
+        {"shape":"ServiceQuotaExceededException"}
+      ],
+      "documentation":"<p>Creates an Outpost.</p>"
+    },
+    "DeleteOutpost":{
+      "name":"DeleteOutpost",
+      "http":{
+        "method":"DELETE",
+        "requestUri":"/outposts/{OutpostId}"
+      },
+      "input":{"shape":"DeleteOutpostInput"},
+      "output":{"shape":"DeleteOutpostOutput"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"NotFoundException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Deletes the Outpost.</p>"
+    },
+    "DeleteSite":{
+      "name":"DeleteSite",
+      "http":{
+        "method":"DELETE",
+        "requestUri":"/sites/{SiteId}"
+      },
+      "input":{"shape":"DeleteSiteInput"},
+      "output":{"shape":"DeleteSiteOutput"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"NotFoundException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Deletes the site.</p>"
+    },
+    "GetOutpost":{
+      "name":"GetOutpost",
+      "http":{
+        "method":"GET",
+        "requestUri":"/outposts/{OutpostId}"
+      },
+      "input":{"shape":"GetOutpostInput"},
+      "output":{"shape":"GetOutpostOutput"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"NotFoundException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Gets information about the specified Outpost.</p>"
+    },
+    "GetOutpostInstanceTypes":{
+      "name":"GetOutpostInstanceTypes",
+      "http":{
+        "method":"GET",
+        "requestUri":"/outposts/{OutpostId}/instanceTypes"
+      },
+      "input":{"shape":"GetOutpostInstanceTypesInput"},
+      "output":{"shape":"GetOutpostInstanceTypesOutput"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"NotFoundException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Lists the instance types for the specified Outpost.</p>"
+    },
+    "ListOutposts":{
+      "name":"ListOutposts",
+      "http":{
+        "method":"GET",
+        "requestUri":"/outposts"
+      },
+      "input":{"shape":"ListOutpostsInput"},
+      "output":{"shape":"ListOutpostsOutput"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>List the Outposts for your AWS account.</p>"
+    },
+    "ListSites":{
+      "name":"ListSites",
+      "http":{
+        "method":"GET",
+        "requestUri":"/sites"
+      },
+      "input":{"shape":"ListSitesInput"},
+      "output":{"shape":"ListSitesOutput"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Lists the sites for the specified AWS account.</p>"
+    }
+  },
+  "shapes":{
+    "AccessDeniedException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p>You do not have permission to perform this operation.</p>",
+      "error":{"httpStatusCode":403},
+      "exception":true
+    },
+    "AccountId":{
+      "type":"string",
+      "documentation":"<p>The ID of the AWS account.</p>",
+      "max":12,
+      "min":12
+    },
+    "AvailabilityZone":{
+      "type":"string",
+      "documentation":"<p>The Availability Zone.</p> <p>You must specify <code>AvailabilityZone</code> or <code>AvailabilityZoneId</code>.</p>",
+      "max":1000,
+      "min":1,
+      "pattern":"[a-z\\d-]+"
+    },
+    "AvailabilityZoneId":{
+      "type":"string",
+      "documentation":"<p>The ID of the Availability Zone.</p> <p>You must specify <code>AvailabilityZone</code> or <code>AvailabilityZoneId</code>.</p>",
+      "max":255,
+      "min":1,
+      "pattern":"[a-z]+[0-9]+-az[0-9]+"
+    },
+    "CreateOutpostInput":{
+      "type":"structure",
+      "required":["SiteId"],
+      "members":{
+        "Name":{"shape":"OutpostName"},
+        "Description":{"shape":"OutpostDescription"},
+        "SiteId":{"shape":"SiteId"},
+        "AvailabilityZone":{"shape":"AvailabilityZone"},
+        "AvailabilityZoneId":{"shape":"AvailabilityZoneId"}
+      }
+    },
+    "CreateOutpostOutput":{
+      "type":"structure",
+      "members":{
+        "Outpost":{"shape":"Outpost"}
+      }
+    },
+    "DeleteOutpostInput":{
+      "type":"structure",
+      "required":["OutpostId"],
+      "members":{
+        "OutpostId":{
+          "shape":"OutpostId",
+          "location":"uri",
+          "locationName":"OutpostId"
+        }
+      }
+    },
+    "DeleteOutpostOutput":{
+      "type":"structure",
+      "members":{
+      }
+    },
+    "DeleteSiteInput":{
+      "type":"structure",
+      "required":["SiteId"],
+      "members":{
+        "SiteId":{
+          "shape":"SiteId",
+          "location":"uri",
+          "locationName":"SiteId"
+        }
+      }
+    },
+    "DeleteSiteOutput":{
+      "type":"structure",
+      "members":{
+      }
+    },
+    "ErrorMessage":{
+      "type":"string",
+      "max":1000,
+      "min":1,
+      "pattern":"^[\\S \\n]+$"
+    },
+    "GetOutpostInput":{
+      "type":"structure",
+      "required":["OutpostId"],
+      "members":{
+        "OutpostId":{
+          "shape":"OutpostId",
+          "location":"uri",
+          "locationName":"OutpostId"
+        }
+      }
+    },
+    "GetOutpostInstanceTypesInput":{
+      "type":"structure",
+      "required":["OutpostId"],
+      "members":{
+        "OutpostId":{
+          "shape":"OutpostId",
+          "location":"uri",
+          "locationName":"OutpostId"
+        },
+        "NextToken":{
+          "shape":"Token",
+          "location":"querystring",
+          "locationName":"NextToken"
+        },
+        "MaxResults":{
+          "shape":"MaxResults1000",
+          "location":"querystring",
+          "locationName":"MaxResults"
+        }
+      }
+    },
+    "GetOutpostInstanceTypesOutput":{
+      "type":"structure",
+      "members":{
+        "InstanceTypes":{"shape":"InstanceTypeListDefinition"},
+        "NextToken":{"shape":"Token"},
+        "OutpostId":{"shape":"OutpostId"},
+        "OutpostArn":{"shape":"OutpostArn"}
+      }
+    },
+    "GetOutpostOutput":{
+      "type":"structure",
+      "members":{
+        "Outpost":{"shape":"Outpost"}
+      }
+    },
+    "InstanceType":{
+      "type":"string",
+      "documentation":"<p>The instance type.</p>"
+    },
+    "InstanceTypeItem":{
+      "type":"structure",
+      "members":{
+        "InstanceType":{"shape":"InstanceType"}
+      },
+      "documentation":"<p>Information about an instance type.</p>"
+    },
+    "InstanceTypeListDefinition":{
+      "type":"list",
+      "member":{"shape":"InstanceTypeItem"},
+      "documentation":"<p>Information about the instance types.</p>"
+    },
+    "InternalServerException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p>An internal error has occurred.</p>",
+      "error":{"httpStatusCode":500},
+      "exception":true
+    },
+    "LifeCycleStatus":{
+      "type":"string",
+      "documentation":"<p>The life cycle status.</p>"
+    },
+    "ListOutpostsInput":{
+      "type":"structure",
+      "members":{
+        "NextToken":{
+          "shape":"Token",
+          "location":"querystring",
+          "locationName":"NextToken"
+        },
+        "MaxResults":{
+          "shape":"MaxResults1000",
+          "location":"querystring",
+          "locationName":"MaxResults"
+        }
+      }
+    },
+    "ListOutpostsOutput":{
+      "type":"structure",
+      "members":{
+        "Outposts":{"shape":"outpostListDefinition"},
+        "NextToken":{"shape":"Token"}
+      }
+    },
+    "ListSitesInput":{
+      "type":"structure",
+      "members":{
+        "NextToken":{
+          "shape":"Token",
+          "location":"querystring",
+          "locationName":"NextToken"
+        },
+        "MaxResults":{
+          "shape":"MaxResults1000",
+          "location":"querystring",
+          "locationName":"MaxResults"
+        }
+      }
+    },
+    "ListSitesOutput":{
+      "type":"structure",
+      "members":{
+        "Sites":{"shape":"siteListDefinition"},
+        "NextToken":{"shape":"Token"}
+      }
+    },
+    "MaxResults1000":{
+      "type":"integer",
+      "documentation":"<p>The maximum page size.</p>",
+      "box":true,
+      "max":1000,
+      "min":1
+    },
+    "NotFoundException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p>The specified request is not valid.</p>",
+      "error":{"httpStatusCode":404},
+      "exception":true
+    },
+    "Outpost":{
+      "type":"structure",
+      "members":{
+        "OutpostId":{"shape":"OutpostId"},
+        "OwnerId":{"shape":"OwnerId"},
+        "OutpostArn":{"shape":"OutpostArn"},
+        "SiteId":{"shape":"SiteId"},
+        "Name":{"shape":"OutpostName"},
+        "Description":{"shape":"OutpostDescription"},
+        "LifeCycleStatus":{"shape":"LifeCycleStatus"},
+        "AvailabilityZone":{"shape":"AvailabilityZone"},
+        "AvailabilityZoneId":{"shape":"AvailabilityZoneId"}
+      },
+      "documentation":"<p>Information about an Outpost.</p>"
+    },
+    "OutpostArn":{
+      "type":"string",
+      "documentation":"<p>The Amazon Resource Name (ARN) of the Outpost.</p>",
+      "max":255,
+      "min":1,
+      "pattern":"^arn:aws([a-z-]+)?:outposts:[a-z\\d-]+:\\d{12}:outpost/op-[a-f0-9]{17}$"
+    },
+    "OutpostDescription":{
+      "type":"string",
+      "documentation":"<p>The Outpost description.</p>",
+      "max":1000,
+      "min":1,
+      "pattern":"^[\\S ]+$"
+    },
+    "OutpostId":{
+      "type":"string",
+      "documentation":"<p>The ID of the Outpost.</p>",
+      "max":180,
+      "min":1,
+      "pattern":"^(arn:aws([a-z-]+)?:outposts:[a-z\\d-]+:\\d{12}:outpost/)?op-[a-f0-9]{17}$"
+    },
+    "OutpostName":{
+      "type":"string",
+      "documentation":"<p>The name of the Outpost.</p>",
+      "max":255,
+      "min":1,
+      "pattern":"^[\\S ]+$"
+    },
+    "OwnerId":{
+      "type":"string",
+      "documentation":"<p>The AWS account ID of the Outpost owner.</p>",
+      "max":12,
+      "min":12,
+      "pattern":"\\d{12}"
+    },
+    "ServiceQuotaExceededException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p>You have exceeded a service quota.</p>",
+      "error":{"httpStatusCode":402},
+      "exception":true
+    },
+    "Site":{
+      "type":"structure",
+      "members":{
+        "SiteId":{"shape":"SiteId"},
+        "AccountId":{"shape":"AccountId"},
+        "Name":{"shape":"SiteName"},
+        "Description":{"shape":"SiteDescription"}
+      },
+      "documentation":"<p>Information about a site.</p>"
+    },
+    "SiteDescription":{
+      "type":"string",
+      "documentation":"<p>The description of the site.</p>",
+      "max":1000,
+      "min":1,
+      "pattern":"^[\\S ]+$"
+    },
+    "SiteId":{
+      "type":"string",
+      "documentation":"<p>The ID of the site.</p>",
+      "max":255,
+      "min":1,
+      "pattern":"os-[a-f0-9]{17}"
+    },
+    "SiteName":{
+      "type":"string",
+      "documentation":"<p>The name of the site.</p>",
+      "max":1000,
+      "min":1,
+      "pattern":"^[\\S ]+$"
+    },
+    "Token":{
+      "type":"string",
+      "documentation":"<p>The pagination token.</p>",
+      "max":1005,
+      "min":1,
+      "pattern":".*\\S.*"
+    },
+    "ValidationException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p>A parameter is not valid.</p>",
+      "error":{"httpStatusCode":400},
+      "exception":true
+    },
+    "outpostListDefinition":{
+      "type":"list",
+      "member":{"shape":"Outpost"},
+      "documentation":"<p>Information about the Outposts.</p>"
+    },
+    "siteListDefinition":{
+      "type":"list",
+      "member":{"shape":"Site"},
+      "documentation":"<p>Information about the sites.</p>"
+    }
+  },
+  "documentation":"<p>AWS Outposts is a fully-managed service that extends AWS infrastructure, APIs, and tools to customer premises. By providing local access to AWS-managed infrastructure, AWS Outposts enables customers to build and run applications on premises using the same programming interfaces as in AWS Regions, while using local compute and storage resources for lower latency and local data processing needs.</p>"
+}
diff --git a/services/personalize/pom.xml b/services/personalize/pom.xml
index 596fda553730..631531f95053 100644
--- a/services/personalize/pom.xml
+++ b/services/personalize/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>personalize</artifactId>
     <name>AWS Java SDK :: Services :: Personalize</name>
diff --git a/services/personalize/src/main/resources/codegen-resources/paginators-1.json b/services/personalize/src/main/resources/codegen-resources/paginators-1.json
index 69cd212a061c..78f6ecfa8d2d 100644
--- a/services/personalize/src/main/resources/codegen-resources/paginators-1.json
+++ b/services/personalize/src/main/resources/codegen-resources/paginators-1.json
@@ -1,5 +1,11 @@
 {
   "pagination": {
+    "ListBatchInferenceJobs": {
+      "input_token": "nextToken",
+      "limit_key": "maxResults",
+      "output_token": "nextToken",
+      "result_key": "batchInferenceJobs"
+    },
     "ListCampaigns": {
       "input_token": "nextToken",
       "limit_key": "maxResults",
diff --git a/services/personalize/src/main/resources/codegen-resources/service-2.json b/services/personalize/src/main/resources/codegen-resources/service-2.json
index 6a3211b28686..f9d3a0bbca16 100644
--- a/services/personalize/src/main/resources/codegen-resources/service-2.json
+++ b/services/personalize/src/main/resources/codegen-resources/service-2.json
@@ -13,6 +13,23 @@
     "uid":"personalize-2018-05-22"
   },
   "operations":{
+    "CreateBatchInferenceJob":{
+      "name":"CreateBatchInferenceJob",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"CreateBatchInferenceJobRequest"},
+      "output":{"shape":"CreateBatchInferenceJobResponse"},
+      "errors":[
+        {"shape":"InvalidInputException"},
+        {"shape":"ResourceAlreadyExistsException"},
+        {"shape":"LimitExceededException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ResourceInUseException"}
+      ],
+      "documentation":"<p>Creates a batch inference job. The operation can handle up to 50 million records and the input file must be in JSON format. For more information, see <a>recommendations-batch</a>.</p>"
+    },
     "CreateCampaign":{
       "name":"CreateCampaign",
       "http":{
@@ -252,6 +269,21 @@
       "documentation":"<p>Describes the given algorithm.</p>",
       "idempotent":true
     },
+    "DescribeBatchInferenceJob":{
+      "name":"DescribeBatchInferenceJob",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DescribeBatchInferenceJobRequest"},
+      "output":{"shape":"DescribeBatchInferenceJobResponse"},
+      "errors":[
+        {"shape":"InvalidInputException"},
+        {"shape":"ResourceNotFoundException"}
+      ],
+      "documentation":"<p>Gets the properties of a batch inference job including name, Amazon Resource Name (ARN), status, input and output configurations, and the ARN of the solution version used to generate the recommendations.</p>",
+      "idempotent":true
+    },
     "DescribeCampaign":{
       "name":"DescribeCampaign",
       "http":{
@@ -417,6 +449,21 @@
       ],
       "documentation":"<p>Gets the metrics for the specified solution version.</p>"
     },
+    "ListBatchInferenceJobs":{
+      "name":"ListBatchInferenceJobs",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"ListBatchInferenceJobsRequest"},
+      "output":{"shape":"ListBatchInferenceJobsResponse"},
+      "errors":[
+        {"shape":"InvalidInputException"},
+        {"shape":"InvalidNextTokenException"}
+      ],
+      "documentation":"<p>Gets a list of the batch inference jobs that have been performed off of a solution version.</p>",
+      "idempotent":true
+    },
     "ListCampaigns":{
       "name":"ListCampaigns",
       "http":{
@@ -671,6 +718,117 @@
       "type":"string",
       "max":10000
     },
+    "BatchInferenceJob":{
+      "type":"structure",
+      "members":{
+        "jobName":{
+          "shape":"Name",
+          "documentation":"<p>The name of the batch inference job.</p>"
+        },
+        "batchInferenceJobArn":{
+          "shape":"Arn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the batch inference job.</p>"
+        },
+        "failureReason":{
+          "shape":"FailureReason",
+          "documentation":"<p>If the batch inference job failed, the reason for the failure.</p>"
+        },
+        "solutionVersionArn":{
+          "shape":"Arn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the solution version from which the batch inference job was created.</p>"
+        },
+        "numResults":{
+          "shape":"NumBatchResults",
+          "documentation":"<p>The number of recommendations generated by the batch inference job. This number includes the error messages generated for failed input records.</p>"
+        },
+        "jobInput":{
+          "shape":"BatchInferenceJobInput",
+          "documentation":"<p>The Amazon S3 path that leads to the input data used to generate the batch inference job.</p>"
+        },
+        "jobOutput":{
+          "shape":"BatchInferenceJobOutput",
+          "documentation":"<p>The Amazon S3 bucket that contains the output data generated by the batch inference job.</p>"
+        },
+        "roleArn":{
+          "shape":"RoleArn",
+          "documentation":"<p>The ARN of the Amazon Identity and Access Management (IAM) role that requested the batch inference job.</p>"
+        },
+        "status":{
+          "shape":"Status",
+          "documentation":"<p>The status of the batch inference job. The status is one of the following values:</p> <ul> <li> <p>PENDING</p> </li> <li> <p>IN PROGRESS</p> </li> <li> <p>ACTIVE</p> </li> <li> <p>CREATE FAILED</p> </li> </ul>"
+        },
+        "creationDateTime":{
+          "shape":"Date",
+          "documentation":"<p>The time at which the batch inference job was created.</p>"
+        },
+        "lastUpdatedDateTime":{
+          "shape":"Date",
+          "documentation":"<p>The time at which the batch inference job was last updated.</p>"
+        }
+      },
+      "documentation":"<p>Contains information on a batch inference job.</p>"
+    },
+    "BatchInferenceJobInput":{
+      "type":"structure",
+      "required":["s3DataSource"],
+      "members":{
+        "s3DataSource":{
+          "shape":"S3DataConfig",
+          "documentation":"<p>The URI of the Amazon S3 location that contains your input data. The Amazon S3 bucket must be in the same region as the API endpoint you are calling.</p>"
+        }
+      },
+      "documentation":"<p>The input configuration of a batch inference job.</p>"
+    },
+    "BatchInferenceJobOutput":{
+      "type":"structure",
+      "required":["s3DataDestination"],
+      "members":{
+        "s3DataDestination":{
+          "shape":"S3DataConfig",
+          "documentation":"<p>Information on the Amazon S3 bucket in which the batch inference job's output is stored.</p>"
+        }
+      },
+      "documentation":"<p>The output configuration parameters of a batch inference job.</p>"
+    },
+    "BatchInferenceJobSummary":{
+      "type":"structure",
+      "members":{
+        "batchInferenceJobArn":{
+          "shape":"Arn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the batch inference job.</p>"
+        },
+        "jobName":{
+          "shape":"Name",
+          "documentation":"<p>The name of the batch inference job.</p>"
+        },
+        "status":{
+          "shape":"Status",
+          "documentation":"<p>The status of the batch inference job. The status is one of the following values:</p> <ul> <li> <p>PENDING</p> </li> <li> <p>IN PROGRESS</p> </li> <li> <p>ACTIVE</p> </li> <li> <p>CREATE FAILED</p> </li> </ul>"
+        },
+        "creationDateTime":{
+          "shape":"Date",
+          "documentation":"<p>The time at which the batch inference job was created.</p>"
+        },
+        "lastUpdatedDateTime":{
+          "shape":"Date",
+          "documentation":"<p>The time at which the batch inference job was last updated.</p>"
+        },
+        "failureReason":{
+          "shape":"FailureReason",
+          "documentation":"<p>If the batch inference job failed, the reason for the failure.</p>"
+        },
+        "solutionVersionArn":{
+          "shape":"Arn",
+          "documentation":"<p>The ARN of the solution version used by the batch inference job.</p>"
+        }
+      },
+      "documentation":"<p>A truncated version of the <a>BatchInferenceJob</a> datatype. The <a>ListBatchInferenceJobs</a> operation returns a list of batch inference job summaries.</p>"
+    },
+    "BatchInferenceJobs":{
+      "type":"list",
+      "member":{"shape":"BatchInferenceJobSummary"},
+      "max":100
+    },
     "Boolean":{"type":"boolean"},
     "Campaign":{
       "type":"structure",
@@ -835,6 +993,51 @@
       "type":"double",
       "min":-1000000
     },
+    "CreateBatchInferenceJobRequest":{
+      "type":"structure",
+      "required":[
+        "jobName",
+        "solutionVersionArn",
+        "jobInput",
+        "jobOutput",
+        "roleArn"
+      ],
+      "members":{
+        "jobName":{
+          "shape":"Name",
+          "documentation":"<p>The name of the batch inference job to create.</p>"
+        },
+        "solutionVersionArn":{
+          "shape":"Arn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the solution version that will be used to generate the batch inference recommendations.</p>"
+        },
+        "numResults":{
+          "shape":"NumBatchResults",
+          "documentation":"<p>The number of recommendations to retreive.</p>"
+        },
+        "jobInput":{
+          "shape":"BatchInferenceJobInput",
+          "documentation":"<p>The Amazon S3 path that leads to the input file to base your recommendations on. The input material must be in JSON format.</p>"
+        },
+        "jobOutput":{
+          "shape":"BatchInferenceJobOutput",
+          "documentation":"<p>The path to the Amazon S3 bucket where the job's output will be stored.</p>"
+        },
+        "roleArn":{
+          "shape":"RoleArn",
+          "documentation":"<p>The ARN of the Amazon Identity and Access Management role that has permissions to read and write to your input and out Amazon S3 buckets respectively.</p>"
+        }
+      }
+    },
+    "CreateBatchInferenceJobResponse":{
+      "type":"structure",
+      "members":{
+        "batchInferenceJobArn":{
+          "shape":"Arn",
+          "documentation":"<p>The ARN of the batch inference job.</p>"
+        }
+      }
+    },
     "CreateCampaignRequest":{
       "type":"structure",
       "required":[
@@ -1550,6 +1753,25 @@
         }
       }
     },
+    "DescribeBatchInferenceJobRequest":{
+      "type":"structure",
+      "required":["batchInferenceJobArn"],
+      "members":{
+        "batchInferenceJobArn":{
+          "shape":"Arn",
+          "documentation":"<p>The ARN of the batch inference job to describe.</p>"
+        }
+      }
+    },
+    "DescribeBatchInferenceJobResponse":{
+      "type":"structure",
+      "members":{
+        "batchInferenceJob":{
+          "shape":"BatchInferenceJob",
+          "documentation":"<p>Information on the specified batch inference job.</p>"
+        }
+      }
+    },
     "DescribeCampaignRequest":{
       "type":"structure",
       "required":["campaignArn"],
@@ -1912,7 +2134,7 @@
       "members":{
         "type":{
           "shape":"HPOObjectiveType",
-          "documentation":"<p>The data type of the metric.</p>"
+          "documentation":"<p>The type of the metric. Valid values are <code>Maximize</code> and <code>Minimize</code>.</p>"
         },
         "metricName":{
           "shape":"MetricName",
@@ -2027,6 +2249,36 @@
       "documentation":"<p>The limit on the number of requests per second has been exceeded.</p>",
       "exception":true
     },
+    "ListBatchInferenceJobsRequest":{
+      "type":"structure",
+      "members":{
+        "solutionVersionArn":{
+          "shape":"Arn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the solution version from which the batch inference jobs were created.</p>"
+        },
+        "nextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>The token to request the next page of results.</p>"
+        },
+        "maxResults":{
+          "shape":"MaxResults",
+          "documentation":"<p>The maximum number of batch inference job results to return in each page. The default value is 100.</p>"
+        }
+      }
+    },
+    "ListBatchInferenceJobsResponse":{
+      "type":"structure",
+      "members":{
+        "batchInferenceJobs":{
+          "shape":"BatchInferenceJobs",
+          "documentation":"<p>A list containing information on each job that is returned.</p>"
+        },
+        "nextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>The token to use to retreive the next page of results. The value is <code>null</code> when there are no more results to return.</p>"
+        }
+      }
+    },
     "ListCampaignsRequest":{
       "type":"structure",
       "members":{
@@ -2319,6 +2571,7 @@
       "type":"string",
       "max":1300
     },
+    "NumBatchResults":{"type":"integer"},
     "ParameterName":{
       "type":"string",
       "max":256
@@ -2445,6 +2698,21 @@
       "max":256,
       "pattern":"arn:([a-z\\d-]+):iam::\\d{12}:role/?[a-zA-Z_0-9+=,.@\\-_/]+"
     },
+    "S3DataConfig":{
+      "type":"structure",
+      "required":["path"],
+      "members":{
+        "path":{
+          "shape":"S3Location",
+          "documentation":"<p>The file path of the Amazon S3 bucket.</p>"
+        },
+        "kmsKeyArn":{
+          "shape":"KmsKeyArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the Amazon Key Management Service (KMS) key that Amazon Personalize uses to encrypt or decrypt the input and output files of a batch inference job.</p>"
+        }
+      },
+      "documentation":"<p>The configuration details of an Amazon S3 input or output bucket.</p>"
+    },
     "S3Location":{
       "type":"string",
       "max":256
@@ -2521,7 +2789,7 @@
         },
         "hpoConfig":{
           "shape":"HPOConfig",
-          "documentation":"<p>Describes the properties for hyperparameter optimization (HPO). For use with the bring-your-own-recipe feature. Not used with Amazon Personalize predefined recipes.</p>"
+          "documentation":"<p>Describes the properties for hyperparameter optimization (HPO).</p>"
         },
         "algorithmHyperParameters":{
           "shape":"HyperParameters",
@@ -2607,6 +2875,10 @@
           "shape":"TrainingMode",
           "documentation":"<p>The scope of training used to create the solution version. The <code>FULL</code> option trains the solution version based on the entirety of the input solution's training data, while the <code>UPDATE</code> option processes only the training data that has changed since the creation of the last solution version. Choose <code>UPDATE</code> when you want to start recommending items added to the dataset without retraining the model.</p> <important> <p>The <code>UPDATE</code> option can only be used after you've created a solution version with the <code>FULL</code> option and the training solution uses the <a>native-recipe-hrnn-coldstart</a>.</p> </important>"
         },
+        "tunedHPOParams":{
+          "shape":"TunedHPOParams",
+          "documentation":"<p>If hyperparameter optimization was performed, contains the hyperparameter values of the best performing model.</p>"
+        },
         "status":{
           "shape":"Status",
           "documentation":"<p>The status of the solution version.</p> <p>A solution version can be in one of the following states:</p> <ul> <li> <p>CREATE PENDING</p> </li> <li> <p>CREATE IN_PROGRESS</p> </li> <li> <p>ACTIVE</p> </li> <li> <p>CREATE FAILED</p> </li> </ul>"
@@ -2690,6 +2962,16 @@
       "min":1
     },
     "Tunable":{"type":"boolean"},
+    "TunedHPOParams":{
+      "type":"structure",
+      "members":{
+        "algorithmHyperParameters":{
+          "shape":"HyperParameters",
+          "documentation":"<p>A list of the hyperparameter values of the best performing model.</p>"
+        }
+      },
+      "documentation":"<p>If hyperparameter optimization (HPO) was performed, contains the hyperparameter values of the best performing model.</p>"
+    },
     "UpdateCampaignRequest":{
       "type":"structure",
       "required":["campaignArn"],
diff --git a/services/personalizeevents/pom.xml b/services/personalizeevents/pom.xml
index 23aaebece36b..f513b9b76a5b 100644
--- a/services/personalizeevents/pom.xml
+++ b/services/personalizeevents/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>personalizeevents</artifactId>
     <name>AWS Java SDK :: Services :: Personalize Events</name>
diff --git a/services/personalizeruntime/pom.xml b/services/personalizeruntime/pom.xml
index 851598a18271..f51b5fea8725 100644
--- a/services/personalizeruntime/pom.xml
+++ b/services/personalizeruntime/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>personalizeruntime</artifactId>
     <name>AWS Java SDK :: Services :: Personalize Runtime</name>
diff --git a/services/personalizeruntime/src/main/resources/codegen-resources/service-2.json b/services/personalizeruntime/src/main/resources/codegen-resources/service-2.json
index 3c29c4a21cd6..bee262699de9 100644
--- a/services/personalizeruntime/src/main/resources/codegen-resources/service-2.json
+++ b/services/personalizeruntime/src/main/resources/codegen-resources/service-2.json
@@ -49,6 +49,22 @@
       "max":256,
       "pattern":"arn:([a-z\\d-]+):personalize:.*:.*:.+"
     },
+    "AttributeName":{
+      "type":"string",
+      "max":150,
+      "pattern":"[A-Za-z\\d_]+"
+    },
+    "AttributeValue":{
+      "type":"string",
+      "max":1000,
+      "sensitive":true
+    },
+    "Context":{
+      "type":"map",
+      "key":{"shape":"AttributeName"},
+      "value":{"shape":"AttributeValue"},
+      "max":150
+    },
     "ErrorMessage":{"type":"string"},
     "GetPersonalizedRankingRequest":{
       "type":"structure",
@@ -64,11 +80,15 @@
         },
         "inputList":{
           "shape":"InputList",
-          "documentation":"<p>A list of items (itemId's) to rank. If an item was not included in the training dataset, the item is appended to the end of the reranked list.</p>"
+          "documentation":"<p>A list of items (itemId's) to rank. If an item was not included in the training dataset, the item is appended to the end of the reranked list. The maximum is 500.</p>"
         },
         "userId":{
           "shape":"UserID",
           "documentation":"<p>The user for which you want the campaign to provide a personalized ranking.</p>"
+        },
+        "context":{
+          "shape":"Context",
+          "documentation":"<p>The contextual metadata to use when getting recommendations. Contextual metadata includes any interaction information that might be relevant when getting a user's recommendations, such as the user's current location or device type. For more information, see Contextual Metadata.</p>"
         }
       }
     },
@@ -77,7 +97,7 @@
       "members":{
         "personalizedRanking":{
           "shape":"ItemList",
-          "documentation":"<p>A list of items in order of most likely interest to the user.</p>"
+          "documentation":"<p>A list of items in order of most likely interest to the user. The maximum is 500.</p>"
         }
       }
     },
@@ -99,7 +119,11 @@
         },
         "numResults":{
           "shape":"NumResults",
-          "documentation":"<p>The number of results to return. The default is 25. The maximum is 100.</p>"
+          "documentation":"<p>The number of results to return. The default is 25. The maximum is 500.</p>"
+        },
+        "context":{
+          "shape":"Context",
+          "documentation":"<p>The contextual metadata to use when getting recommendations. Contextual metadata includes any interaction information that might be relevant when getting a user's recommendations, such as the user's current location or device type. For more information, see Contextual Metadata.</p>"
         }
       }
     },
@@ -108,7 +132,7 @@
       "members":{
         "itemList":{
           "shape":"ItemList",
-          "documentation":"<p>A list of recommendations.</p>"
+          "documentation":"<p>A list of recommendations sorted in ascending order by prediction score. There can be a maximum of 500 items in the list.</p>"
         }
       }
     },
diff --git a/services/pi/pom.xml b/services/pi/pom.xml
index 9a7cf10be8a3..28aedfc5d211 100644
--- a/services/pi/pom.xml
+++ b/services/pi/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>pi</artifactId>
     <name>AWS Java SDK :: Services :: PI</name>
diff --git a/services/pinpoint/build.properties b/services/pinpoint/build.properties
index ecf2dae6fcb1..15ec2da1fc71 100644
--- a/services/pinpoint/build.properties
+++ b/services/pinpoint/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/pinpoint/pom.xml b/services/pinpoint/pom.xml
index f59fb7ac5724..45df9bf1f7dd 100644
--- a/services/pinpoint/pom.xml
+++ b/services/pinpoint/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>pinpoint</artifactId>
     <name>AWS Java SDK :: Services :: Amazon Pinpoint</name>
diff --git a/services/pinpoint/src/it/java/software/amazon/awssdk/services/pinpoint/PinpointIntegTest.java b/services/pinpoint/src/it/java/software/amazon/awssdk/services/pinpoint/PinpointIntegTest.java
index d8b4b65bcad0..93f58481d7e3 100644
--- a/services/pinpoint/src/it/java/software/amazon/awssdk/services/pinpoint/PinpointIntegTest.java
+++ b/services/pinpoint/src/it/java/software/amazon/awssdk/services/pinpoint/PinpointIntegTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/pinpoint/src/main/resources/codegen-resources/service-2.json b/services/pinpoint/src/main/resources/codegen-resources/service-2.json
index 96ce000ea0d5..42f7a0208b2e 100644
--- a/services/pinpoint/src/main/resources/codegen-resources/service-2.json
+++ b/services/pinpoint/src/main/resources/codegen-resources/service-2.json
@@ -35,6 +35,10 @@
           "shape": "InternalServerErrorException",
           "documentation": "<p>The request failed due to an unknown internal server error, exception, or failure (InternalServerErrorException).</p>"
         },
+        {
+          "shape": "PayloadTooLargeException",
+          "documentation": "<p>The request failed because the payload for the body of the request is too large (RequestEntityTooLargeException).</p>"
+        },
         {
           "shape": "ForbiddenException",
           "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
@@ -77,6 +81,10 @@
           "shape": "InternalServerErrorException",
           "documentation": "<p>The request failed due to an unknown internal server error, exception, or failure (InternalServerErrorException).</p>"
         },
+        {
+          "shape": "PayloadTooLargeException",
+          "documentation": "<p>The request failed because the payload for the body of the request is too large (RequestEntityTooLargeException).</p>"
+        },
         {
           "shape": "ForbiddenException",
           "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
@@ -132,7 +140,7 @@
           "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
         }
       ],
-      "documentation": "<p>Creates a message template that you can use in messages that are sent through the email channel.</p>"
+      "documentation": "<p>Creates a message template for messages that are sent through the email channel.</p>"
     },
     "CreateExportJob": {
       "name": "CreateExportJob",
@@ -157,6 +165,10 @@
           "shape": "InternalServerErrorException",
           "documentation": "<p>The request failed due to an unknown internal server error, exception, or failure (InternalServerErrorException).</p>"
         },
+        {
+          "shape": "PayloadTooLargeException",
+          "documentation": "<p>The request failed because the payload for the body of the request is too large (RequestEntityTooLargeException).</p>"
+        },
         {
           "shape": "ForbiddenException",
           "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
@@ -199,6 +211,10 @@
           "shape": "InternalServerErrorException",
           "documentation": "<p>The request failed due to an unknown internal server error, exception, or failure (InternalServerErrorException).</p>"
         },
+        {
+          "shape": "PayloadTooLargeException",
+          "documentation": "<p>The request failed because the payload for the body of the request is too large (RequestEntityTooLargeException).</p>"
+        },
         {
           "shape": "ForbiddenException",
           "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
@@ -218,6 +234,52 @@
       ],
       "documentation": "<p>Creates an import job for an application.</p>"
     },
+    "CreateJourney": {
+      "name": "CreateJourney",
+      "http": {
+        "method": "POST",
+        "requestUri": "/v1/apps/{application-id}/journeys",
+        "responseCode": 201
+      },
+      "input": {
+        "shape": "CreateJourneyRequest"
+      },
+      "output": {
+        "shape": "CreateJourneyResponse",
+        "documentation": "<p>The request succeeded and the specified resource was created.</p>"
+      },
+      "errors": [
+        {
+          "shape": "BadRequestException",
+          "documentation": "<p>The request contains a syntax error (BadRequestException).</p>"
+        },
+        {
+          "shape": "InternalServerErrorException",
+          "documentation": "<p>The request failed due to an unknown internal server error, exception, or failure (InternalServerErrorException).</p>"
+        },
+        {
+          "shape": "PayloadTooLargeException",
+          "documentation": "<p>The request failed because the payload for the body of the request is too large (RequestEntityTooLargeException).</p>"
+        },
+        {
+          "shape": "ForbiddenException",
+          "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
+        },
+        {
+          "shape": "NotFoundException",
+          "documentation": "<p>The request failed because the specified resource was not found (NotFoundException).</p>"
+        },
+        {
+          "shape": "MethodNotAllowedException",
+          "documentation": "<p>The request failed because the method is not allowed for the specified resource (MethodNotAllowedException).</p>"
+        },
+        {
+          "shape": "TooManyRequestsException",
+          "documentation": "<p>The request failed because too many requests were sent during a certain amount of time (TooManyRequestsException).</p>"
+        }
+      ],
+      "documentation": "<p>Creates a journey for an application.</p>"
+    },
     "CreatePushTemplate": {
       "name": "CreatePushTemplate",
       "http": {
@@ -254,7 +316,53 @@
           "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
         }
       ],
-      "documentation": "<p>Creates a message template that you can use in messages that are sent through a push notification channel.</p>"
+      "documentation": "<p>Creates a message template for messages that are sent through a push notification channel.</p>"
+    },
+    "CreateRecommenderConfiguration": {
+      "name": "CreateRecommenderConfiguration",
+      "http": {
+        "method": "POST",
+        "requestUri": "/v1/recommenders",
+        "responseCode": 201
+      },
+      "input": {
+        "shape": "CreateRecommenderConfigurationRequest"
+      },
+      "output": {
+        "shape": "CreateRecommenderConfigurationResponse",
+        "documentation": "<p>The request succeeded and the specified resource was created.</p>"
+      },
+      "errors": [
+        {
+          "shape": "BadRequestException",
+          "documentation": "<p>The request contains a syntax error (BadRequestException).</p>"
+        },
+        {
+          "shape": "InternalServerErrorException",
+          "documentation": "<p>The request failed due to an unknown internal server error, exception, or failure (InternalServerErrorException).</p>"
+        },
+        {
+          "shape": "PayloadTooLargeException",
+          "documentation": "<p>The request failed because the payload for the body of the request is too large (RequestEntityTooLargeException).</p>"
+        },
+        {
+          "shape": "ForbiddenException",
+          "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
+        },
+        {
+          "shape": "NotFoundException",
+          "documentation": "<p>The request failed because the specified resource was not found (NotFoundException).</p>"
+        },
+        {
+          "shape": "MethodNotAllowedException",
+          "documentation": "<p>The request failed because the method is not allowed for the specified resource (MethodNotAllowedException).</p>"
+        },
+        {
+          "shape": "TooManyRequestsException",
+          "documentation": "<p>The request failed because too many requests were sent during a certain amount of time (TooManyRequestsException).</p>"
+        }
+      ],
+      "documentation": "<p>Creates an Amazon Pinpoint configuration for a recommender model.</p>"
     },
     "CreateSegment": {
       "name": "CreateSegment",
@@ -279,6 +387,10 @@
           "shape": "InternalServerErrorException",
           "documentation": "<p>The request failed due to an unknown internal server error, exception, or failure (InternalServerErrorException).</p>"
         },
+        {
+          "shape": "PayloadTooLargeException",
+          "documentation": "<p>The request failed because the payload for the body of the request is too large (RequestEntityTooLargeException).</p>"
+        },
         {
           "shape": "ForbiddenException",
           "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
@@ -334,7 +446,45 @@
           "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
         }
       ],
-      "documentation": "<p>Creates a message template that you can use in messages that are sent through the SMS channel.</p>"
+      "documentation": "<p>Creates a message template for messages that are sent through the SMS channel.</p>"
+    },
+    "CreateVoiceTemplate": {
+      "name": "CreateVoiceTemplate",
+      "http": {
+        "method": "POST",
+        "requestUri": "/v1/templates/{template-name}/voice",
+        "responseCode": 201
+      },
+      "input": {
+        "shape": "CreateVoiceTemplateRequest"
+      },
+      "output": {
+        "shape": "CreateVoiceTemplateResponse",
+        "documentation": "<p>The request succeeded and the specified resource was created.</p>"
+      },
+      "errors": [
+        {
+          "shape": "MethodNotAllowedException",
+          "documentation": "<p>The request failed because the method is not allowed for the specified resource (MethodNotAllowedException).</p>"
+        },
+        {
+          "shape": "TooManyRequestsException",
+          "documentation": "<p>The request failed because too many requests were sent during a certain amount of time (TooManyRequestsException).</p>"
+        },
+        {
+          "shape": "BadRequestException",
+          "documentation": "<p>The request contains a syntax error (BadRequestException).</p>"
+        },
+        {
+          "shape": "InternalServerErrorException",
+          "documentation": "<p>The request failed due to an unknown internal server error, exception, or failure (InternalServerErrorException).</p>"
+        },
+        {
+          "shape": "ForbiddenException",
+          "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
+        }
+      ],
+      "documentation": "<p>Creates a message template for messages that are sent through the voice channel.</p>"
     },
     "DeleteAdmChannel": {
       "name": "DeleteAdmChannel",
@@ -359,6 +509,10 @@
           "shape": "InternalServerErrorException",
           "documentation": "<p>The request failed due to an unknown internal server error, exception, or failure (InternalServerErrorException).</p>"
         },
+        {
+          "shape": "PayloadTooLargeException",
+          "documentation": "<p>The request failed because the payload for the body of the request is too large (RequestEntityTooLargeException).</p>"
+        },
         {
           "shape": "ForbiddenException",
           "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
@@ -401,6 +555,10 @@
           "shape": "InternalServerErrorException",
           "documentation": "<p>The request failed due to an unknown internal server error, exception, or failure (InternalServerErrorException).</p>"
         },
+        {
+          "shape": "PayloadTooLargeException",
+          "documentation": "<p>The request failed because the payload for the body of the request is too large (RequestEntityTooLargeException).</p>"
+        },
         {
           "shape": "ForbiddenException",
           "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
@@ -443,6 +601,10 @@
           "shape": "InternalServerErrorException",
           "documentation": "<p>The request failed due to an unknown internal server error, exception, or failure (InternalServerErrorException).</p>"
         },
+        {
+          "shape": "PayloadTooLargeException",
+          "documentation": "<p>The request failed because the payload for the body of the request is too large (RequestEntityTooLargeException).</p>"
+        },
         {
           "shape": "ForbiddenException",
           "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
@@ -485,6 +647,10 @@
           "shape": "InternalServerErrorException",
           "documentation": "<p>The request failed due to an unknown internal server error, exception, or failure (InternalServerErrorException).</p>"
         },
+        {
+          "shape": "PayloadTooLargeException",
+          "documentation": "<p>The request failed because the payload for the body of the request is too large (RequestEntityTooLargeException).</p>"
+        },
         {
           "shape": "ForbiddenException",
           "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
@@ -527,6 +693,10 @@
           "shape": "InternalServerErrorException",
           "documentation": "<p>The request failed due to an unknown internal server error, exception, or failure (InternalServerErrorException).</p>"
         },
+        {
+          "shape": "PayloadTooLargeException",
+          "documentation": "<p>The request failed because the payload for the body of the request is too large (RequestEntityTooLargeException).</p>"
+        },
         {
           "shape": "ForbiddenException",
           "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
@@ -569,6 +739,10 @@
           "shape": "InternalServerErrorException",
           "documentation": "<p>The request failed due to an unknown internal server error, exception, or failure (InternalServerErrorException).</p>"
         },
+        {
+          "shape": "PayloadTooLargeException",
+          "documentation": "<p>The request failed because the payload for the body of the request is too large (RequestEntityTooLargeException).</p>"
+        },
         {
           "shape": "ForbiddenException",
           "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
@@ -611,6 +785,10 @@
           "shape": "InternalServerErrorException",
           "documentation": "<p>The request failed due to an unknown internal server error, exception, or failure (InternalServerErrorException).</p>"
         },
+        {
+          "shape": "PayloadTooLargeException",
+          "documentation": "<p>The request failed because the payload for the body of the request is too large (RequestEntityTooLargeException).</p>"
+        },
         {
           "shape": "ForbiddenException",
           "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
@@ -653,6 +831,10 @@
           "shape": "InternalServerErrorException",
           "documentation": "<p>The request failed due to an unknown internal server error, exception, or failure (InternalServerErrorException).</p>"
         },
+        {
+          "shape": "PayloadTooLargeException",
+          "documentation": "<p>The request failed because the payload for the body of the request is too large (RequestEntityTooLargeException).</p>"
+        },
         {
           "shape": "ForbiddenException",
           "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
@@ -695,6 +877,10 @@
           "shape": "InternalServerErrorException",
           "documentation": "<p>The request failed due to an unknown internal server error, exception, or failure (InternalServerErrorException).</p>"
         },
+        {
+          "shape": "PayloadTooLargeException",
+          "documentation": "<p>The request failed because the payload for the body of the request is too large (RequestEntityTooLargeException).</p>"
+        },
         {
           "shape": "ForbiddenException",
           "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
@@ -737,6 +923,10 @@
           "shape": "InternalServerErrorException",
           "documentation": "<p>The request failed due to an unknown internal server error, exception, or failure (InternalServerErrorException).</p>"
         },
+        {
+          "shape": "PayloadTooLargeException",
+          "documentation": "<p>The request failed because the payload for the body of the request is too large (RequestEntityTooLargeException).</p>"
+        },
         {
           "shape": "ForbiddenException",
           "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
@@ -754,7 +944,7 @@
           "documentation": "<p>The request failed because too many requests were sent during a certain amount of time (TooManyRequestsException).</p>"
         }
       ],
-      "documentation": "<p>Deletes a message template that was designed for use in messages that were sent through the email channel.</p>"
+      "documentation": "<p>Deletes a message template for messages that were sent through the email channel.</p>"
     },
     "DeleteEndpoint": {
       "name": "DeleteEndpoint",
@@ -779,6 +969,10 @@
           "shape": "InternalServerErrorException",
           "documentation": "<p>The request failed due to an unknown internal server error, exception, or failure (InternalServerErrorException).</p>"
         },
+        {
+          "shape": "PayloadTooLargeException",
+          "documentation": "<p>The request failed because the payload for the body of the request is too large (RequestEntityTooLargeException).</p>"
+        },
         {
           "shape": "ForbiddenException",
           "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
@@ -821,6 +1015,10 @@
           "shape": "InternalServerErrorException",
           "documentation": "<p>The request failed due to an unknown internal server error, exception, or failure (InternalServerErrorException).</p>"
         },
+        {
+          "shape": "PayloadTooLargeException",
+          "documentation": "<p>The request failed because the payload for the body of the request is too large (RequestEntityTooLargeException).</p>"
+        },
         {
           "shape": "ForbiddenException",
           "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
@@ -863,6 +1061,10 @@
           "shape": "InternalServerErrorException",
           "documentation": "<p>The request failed due to an unknown internal server error, exception, or failure (InternalServerErrorException).</p>"
         },
+        {
+          "shape": "PayloadTooLargeException",
+          "documentation": "<p>The request failed because the payload for the body of the request is too large (RequestEntityTooLargeException).</p>"
+        },
         {
           "shape": "ForbiddenException",
           "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
@@ -882,6 +1084,52 @@
       ],
       "documentation": "<p>Disables the GCM channel for an application and deletes any existing settings for the channel.</p>"
     },
+    "DeleteJourney": {
+      "name": "DeleteJourney",
+      "http": {
+        "method": "DELETE",
+        "requestUri": "/v1/apps/{application-id}/journeys/{journey-id}",
+        "responseCode": 200
+      },
+      "input": {
+        "shape": "DeleteJourneyRequest"
+      },
+      "output": {
+        "shape": "DeleteJourneyResponse",
+        "documentation": "<p>The request succeeded.</p>"
+      },
+      "errors": [
+        {
+          "shape": "BadRequestException",
+          "documentation": "<p>The request contains a syntax error (BadRequestException).</p>"
+        },
+        {
+          "shape": "InternalServerErrorException",
+          "documentation": "<p>The request failed due to an unknown internal server error, exception, or failure (InternalServerErrorException).</p>"
+        },
+        {
+          "shape": "PayloadTooLargeException",
+          "documentation": "<p>The request failed because the payload for the body of the request is too large (RequestEntityTooLargeException).</p>"
+        },
+        {
+          "shape": "ForbiddenException",
+          "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
+        },
+        {
+          "shape": "NotFoundException",
+          "documentation": "<p>The request failed because the specified resource was not found (NotFoundException).</p>"
+        },
+        {
+          "shape": "MethodNotAllowedException",
+          "documentation": "<p>The request failed because the method is not allowed for the specified resource (MethodNotAllowedException).</p>"
+        },
+        {
+          "shape": "TooManyRequestsException",
+          "documentation": "<p>The request failed because too many requests were sent during a certain amount of time (TooManyRequestsException).</p>"
+        }
+      ],
+      "documentation": "<p>Deletes a journey from an application.</p>"
+    },
     "DeletePushTemplate": {
       "name": "DeletePushTemplate",
       "http": {
@@ -905,6 +1153,56 @@
           "shape": "InternalServerErrorException",
           "documentation": "<p>The request failed due to an unknown internal server error, exception, or failure (InternalServerErrorException).</p>"
         },
+        {
+          "shape": "PayloadTooLargeException",
+          "documentation": "<p>The request failed because the payload for the body of the request is too large (RequestEntityTooLargeException).</p>"
+        },
+        {
+          "shape": "ForbiddenException",
+          "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
+        },
+        {
+          "shape": "NotFoundException",
+          "documentation": "<p>The request failed because the specified resource was not found (NotFoundException).</p>"
+        },
+        {
+          "shape": "MethodNotAllowedException",
+          "documentation": "<p>The request failed because the method is not allowed for the specified resource (MethodNotAllowedException).</p>"
+        },
+        {
+          "shape": "TooManyRequestsException",
+          "documentation": "<p>The request failed because too many requests were sent during a certain amount of time (TooManyRequestsException).</p>"
+        }
+      ],
+      "documentation": "<p>Deletes a message template for messages that were sent through a push notification channel.</p>"
+    },
+    "DeleteRecommenderConfiguration": {
+      "name": "DeleteRecommenderConfiguration",
+      "http": {
+        "method": "DELETE",
+        "requestUri": "/v1/recommenders/{recommender-id}",
+        "responseCode": 200
+      },
+      "input": {
+        "shape": "DeleteRecommenderConfigurationRequest"
+      },
+      "output": {
+        "shape": "DeleteRecommenderConfigurationResponse",
+        "documentation": "<p>The request succeeded.</p>"
+      },
+      "errors": [
+        {
+          "shape": "BadRequestException",
+          "documentation": "<p>The request contains a syntax error (BadRequestException).</p>"
+        },
+        {
+          "shape": "InternalServerErrorException",
+          "documentation": "<p>The request failed due to an unknown internal server error, exception, or failure (InternalServerErrorException).</p>"
+        },
+        {
+          "shape": "PayloadTooLargeException",
+          "documentation": "<p>The request failed because the payload for the body of the request is too large (RequestEntityTooLargeException).</p>"
+        },
         {
           "shape": "ForbiddenException",
           "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
@@ -922,7 +1220,7 @@
           "documentation": "<p>The request failed because too many requests were sent during a certain amount of time (TooManyRequestsException).</p>"
         }
       ],
-      "documentation": "<p>Deletes a message template that was designed for use in messages that were sent through a push notification channel.</p>"
+      "documentation": "<p>Deletes an Amazon Pinpoint configuration for a recommender model.</p>"
     },
     "DeleteSegment": {
       "name": "DeleteSegment",
@@ -947,6 +1245,10 @@
           "shape": "InternalServerErrorException",
           "documentation": "<p>The request failed due to an unknown internal server error, exception, or failure (InternalServerErrorException).</p>"
         },
+        {
+          "shape": "PayloadTooLargeException",
+          "documentation": "<p>The request failed because the payload for the body of the request is too large (RequestEntityTooLargeException).</p>"
+        },
         {
           "shape": "ForbiddenException",
           "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
@@ -989,6 +1291,10 @@
           "shape": "InternalServerErrorException",
           "documentation": "<p>The request failed due to an unknown internal server error, exception, or failure (InternalServerErrorException).</p>"
         },
+        {
+          "shape": "PayloadTooLargeException",
+          "documentation": "<p>The request failed because the payload for the body of the request is too large (RequestEntityTooLargeException).</p>"
+        },
         {
           "shape": "ForbiddenException",
           "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
@@ -1031,6 +1337,10 @@
           "shape": "InternalServerErrorException",
           "documentation": "<p>The request failed due to an unknown internal server error, exception, or failure (InternalServerErrorException).</p>"
         },
+        {
+          "shape": "PayloadTooLargeException",
+          "documentation": "<p>The request failed because the payload for the body of the request is too large (RequestEntityTooLargeException).</p>"
+        },
         {
           "shape": "ForbiddenException",
           "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
@@ -1048,7 +1358,7 @@
           "documentation": "<p>The request failed because too many requests were sent during a certain amount of time (TooManyRequestsException).</p>"
         }
       ],
-      "documentation": "<p>Deletes a message template that was designed for use in messages that were sent through the SMS channel.</p>"
+      "documentation": "<p>Deletes a message template for messages that were sent through the SMS channel.</p>"
     },
     "DeleteUserEndpoints": {
       "name": "DeleteUserEndpoints",
@@ -1073,6 +1383,10 @@
           "shape": "InternalServerErrorException",
           "documentation": "<p>The request failed due to an unknown internal server error, exception, or failure (InternalServerErrorException).</p>"
         },
+        {
+          "shape": "PayloadTooLargeException",
+          "documentation": "<p>The request failed because the payload for the body of the request is too large (RequestEntityTooLargeException).</p>"
+        },
         {
           "shape": "ForbiddenException",
           "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
@@ -1115,6 +1429,10 @@
           "shape": "InternalServerErrorException",
           "documentation": "<p>The request failed due to an unknown internal server error, exception, or failure (InternalServerErrorException).</p>"
         },
+        {
+          "shape": "PayloadTooLargeException",
+          "documentation": "<p>The request failed because the payload for the body of the request is too large (RequestEntityTooLargeException).</p>"
+        },
         {
           "shape": "ForbiddenException",
           "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
@@ -1134,19 +1452,19 @@
       ],
       "documentation": "<p>Disables the voice channel for an application and deletes any existing settings for the channel.</p>"
     },
-    "GetAdmChannel": {
-      "name": "GetAdmChannel",
+    "DeleteVoiceTemplate": {
+      "name": "DeleteVoiceTemplate",
       "http": {
-        "method": "GET",
-        "requestUri": "/v1/apps/{application-id}/channels/adm",
-        "responseCode": 200
+        "method": "DELETE",
+        "requestUri": "/v1/templates/{template-name}/voice",
+        "responseCode": 202
       },
       "input": {
-        "shape": "GetAdmChannelRequest"
+        "shape": "DeleteVoiceTemplateRequest"
       },
       "output": {
-        "shape": "GetAdmChannelResponse",
-        "documentation": "<p>The request succeeded.</p>"
+        "shape": "DeleteVoiceTemplateResponse",
+        "documentation": "<p>The request was accepted for processing. Processing may not be complete.</p>"
       },
       "errors": [
         {
@@ -1157,6 +1475,10 @@
           "shape": "InternalServerErrorException",
           "documentation": "<p>The request failed due to an unknown internal server error, exception, or failure (InternalServerErrorException).</p>"
         },
+        {
+          "shape": "PayloadTooLargeException",
+          "documentation": "<p>The request failed because the payload for the body of the request is too large (RequestEntityTooLargeException).</p>"
+        },
         {
           "shape": "ForbiddenException",
           "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
@@ -1174,20 +1496,20 @@
           "documentation": "<p>The request failed because too many requests were sent during a certain amount of time (TooManyRequestsException).</p>"
         }
       ],
-      "documentation": "<p>Retrieves information about the status and settings of the ADM channel for an application.</p>"
+      "documentation": "<p>Deletes a message template for messages that were sent through the voice channel.</p>"
     },
-    "GetApnsChannel": {
-      "name": "GetApnsChannel",
+    "GetAdmChannel": {
+      "name": "GetAdmChannel",
       "http": {
         "method": "GET",
-        "requestUri": "/v1/apps/{application-id}/channels/apns",
+        "requestUri": "/v1/apps/{application-id}/channels/adm",
         "responseCode": 200
       },
       "input": {
-        "shape": "GetApnsChannelRequest"
+        "shape": "GetAdmChannelRequest"
       },
       "output": {
-        "shape": "GetApnsChannelResponse",
+        "shape": "GetAdmChannelResponse",
         "documentation": "<p>The request succeeded.</p>"
       },
       "errors": [
@@ -1199,6 +1521,56 @@
           "shape": "InternalServerErrorException",
           "documentation": "<p>The request failed due to an unknown internal server error, exception, or failure (InternalServerErrorException).</p>"
         },
+        {
+          "shape": "PayloadTooLargeException",
+          "documentation": "<p>The request failed because the payload for the body of the request is too large (RequestEntityTooLargeException).</p>"
+        },
+        {
+          "shape": "ForbiddenException",
+          "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
+        },
+        {
+          "shape": "NotFoundException",
+          "documentation": "<p>The request failed because the specified resource was not found (NotFoundException).</p>"
+        },
+        {
+          "shape": "MethodNotAllowedException",
+          "documentation": "<p>The request failed because the method is not allowed for the specified resource (MethodNotAllowedException).</p>"
+        },
+        {
+          "shape": "TooManyRequestsException",
+          "documentation": "<p>The request failed because too many requests were sent during a certain amount of time (TooManyRequestsException).</p>"
+        }
+      ],
+      "documentation": "<p>Retrieves information about the status and settings of the ADM channel for an application.</p>"
+    },
+    "GetApnsChannel": {
+      "name": "GetApnsChannel",
+      "http": {
+        "method": "GET",
+        "requestUri": "/v1/apps/{application-id}/channels/apns",
+        "responseCode": 200
+      },
+      "input": {
+        "shape": "GetApnsChannelRequest"
+      },
+      "output": {
+        "shape": "GetApnsChannelResponse",
+        "documentation": "<p>The request succeeded.</p>"
+      },
+      "errors": [
+        {
+          "shape": "BadRequestException",
+          "documentation": "<p>The request contains a syntax error (BadRequestException).</p>"
+        },
+        {
+          "shape": "InternalServerErrorException",
+          "documentation": "<p>The request failed due to an unknown internal server error, exception, or failure (InternalServerErrorException).</p>"
+        },
+        {
+          "shape": "PayloadTooLargeException",
+          "documentation": "<p>The request failed because the payload for the body of the request is too large (RequestEntityTooLargeException).</p>"
+        },
         {
           "shape": "ForbiddenException",
           "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
@@ -1241,6 +1613,10 @@
           "shape": "InternalServerErrorException",
           "documentation": "<p>The request failed due to an unknown internal server error, exception, or failure (InternalServerErrorException).</p>"
         },
+        {
+          "shape": "PayloadTooLargeException",
+          "documentation": "<p>The request failed because the payload for the body of the request is too large (RequestEntityTooLargeException).</p>"
+        },
         {
           "shape": "ForbiddenException",
           "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
@@ -1283,6 +1659,10 @@
           "shape": "InternalServerErrorException",
           "documentation": "<p>The request failed due to an unknown internal server error, exception, or failure (InternalServerErrorException).</p>"
         },
+        {
+          "shape": "PayloadTooLargeException",
+          "documentation": "<p>The request failed because the payload for the body of the request is too large (RequestEntityTooLargeException).</p>"
+        },
         {
           "shape": "ForbiddenException",
           "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
@@ -1325,6 +1705,10 @@
           "shape": "InternalServerErrorException",
           "documentation": "<p>The request failed due to an unknown internal server error, exception, or failure (InternalServerErrorException).</p>"
         },
+        {
+          "shape": "PayloadTooLargeException",
+          "documentation": "<p>The request failed because the payload for the body of the request is too large (RequestEntityTooLargeException).</p>"
+        },
         {
           "shape": "ForbiddenException",
           "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
@@ -1367,6 +1751,10 @@
           "shape": "InternalServerErrorException",
           "documentation": "<p>The request failed due to an unknown internal server error, exception, or failure (InternalServerErrorException).</p>"
         },
+        {
+          "shape": "PayloadTooLargeException",
+          "documentation": "<p>The request failed because the payload for the body of the request is too large (RequestEntityTooLargeException).</p>"
+        },
         {
           "shape": "ForbiddenException",
           "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
@@ -1409,6 +1797,10 @@
           "shape": "InternalServerErrorException",
           "documentation": "<p>The request failed due to an unknown internal server error, exception, or failure (InternalServerErrorException).</p>"
         },
+        {
+          "shape": "PayloadTooLargeException",
+          "documentation": "<p>The request failed because the payload for the body of the request is too large (RequestEntityTooLargeException).</p>"
+        },
         {
           "shape": "ForbiddenException",
           "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
@@ -1451,6 +1843,10 @@
           "shape": "InternalServerErrorException",
           "documentation": "<p>The request failed due to an unknown internal server error, exception, or failure (InternalServerErrorException).</p>"
         },
+        {
+          "shape": "PayloadTooLargeException",
+          "documentation": "<p>The request failed because the payload for the body of the request is too large (RequestEntityTooLargeException).</p>"
+        },
         {
           "shape": "ForbiddenException",
           "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
@@ -1493,6 +1889,10 @@
           "shape": "InternalServerErrorException",
           "documentation": "<p>The request failed due to an unknown internal server error, exception, or failure (InternalServerErrorException).</p>"
         },
+        {
+          "shape": "PayloadTooLargeException",
+          "documentation": "<p>The request failed because the payload for the body of the request is too large (RequestEntityTooLargeException).</p>"
+        },
         {
           "shape": "ForbiddenException",
           "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
@@ -1510,7 +1910,7 @@
           "documentation": "<p>The request failed because too many requests were sent during a certain amount of time (TooManyRequestsException).</p>"
         }
       ],
-      "documentation": "<p>Retrieves information about all of your applications.</p>"
+      "documentation": "<p>Retrieves information about all the applications that are associated with your Amazon Pinpoint account.</p>"
     },
     "GetBaiduChannel": {
       "name": "GetBaiduChannel",
@@ -1535,6 +1935,10 @@
           "shape": "InternalServerErrorException",
           "documentation": "<p>The request failed due to an unknown internal server error, exception, or failure (InternalServerErrorException).</p>"
         },
+        {
+          "shape": "PayloadTooLargeException",
+          "documentation": "<p>The request failed because the payload for the body of the request is too large (RequestEntityTooLargeException).</p>"
+        },
         {
           "shape": "ForbiddenException",
           "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
@@ -1577,6 +1981,10 @@
           "shape": "InternalServerErrorException",
           "documentation": "<p>The request failed due to an unknown internal server error, exception, or failure (InternalServerErrorException).</p>"
         },
+        {
+          "shape": "PayloadTooLargeException",
+          "documentation": "<p>The request failed because the payload for the body of the request is too large (RequestEntityTooLargeException).</p>"
+        },
         {
           "shape": "ForbiddenException",
           "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
@@ -1619,6 +2027,10 @@
           "shape": "InternalServerErrorException",
           "documentation": "<p>The request failed due to an unknown internal server error, exception, or failure (InternalServerErrorException).</p>"
         },
+        {
+          "shape": "PayloadTooLargeException",
+          "documentation": "<p>The request failed because the payload for the body of the request is too large (RequestEntityTooLargeException).</p>"
+        },
         {
           "shape": "ForbiddenException",
           "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
@@ -1636,7 +2048,7 @@
           "documentation": "<p>The request failed because too many requests were sent during a certain amount of time (TooManyRequestsException).</p>"
         }
       ],
-      "documentation": "<p>Retrieves information about the activity performed by a campaign.</p>"
+      "documentation": "<p>Retrieves information about all the activities for a campaign.</p>"
     },
     "GetCampaignDateRangeKpi": {
       "name": "GetCampaignDateRangeKpi",
@@ -1661,6 +2073,10 @@
           "shape": "InternalServerErrorException",
           "documentation": "<p>The request failed due to an unknown internal server error, exception, or failure (InternalServerErrorException).</p>"
         },
+        {
+          "shape": "PayloadTooLargeException",
+          "documentation": "<p>The request failed because the payload for the body of the request is too large (RequestEntityTooLargeException).</p>"
+        },
         {
           "shape": "ForbiddenException",
           "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
@@ -1703,6 +2119,10 @@
           "shape": "InternalServerErrorException",
           "documentation": "<p>The request failed due to an unknown internal server error, exception, or failure (InternalServerErrorException).</p>"
         },
+        {
+          "shape": "PayloadTooLargeException",
+          "documentation": "<p>The request failed because the payload for the body of the request is too large (RequestEntityTooLargeException).</p>"
+        },
         {
           "shape": "ForbiddenException",
           "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
@@ -1745,6 +2165,10 @@
           "shape": "InternalServerErrorException",
           "documentation": "<p>The request failed due to an unknown internal server error, exception, or failure (InternalServerErrorException).</p>"
         },
+        {
+          "shape": "PayloadTooLargeException",
+          "documentation": "<p>The request failed because the payload for the body of the request is too large (RequestEntityTooLargeException).</p>"
+        },
         {
           "shape": "ForbiddenException",
           "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
@@ -1762,7 +2186,7 @@
           "documentation": "<p>The request failed because too many requests were sent during a certain amount of time (TooManyRequestsException).</p>"
         }
       ],
-      "documentation": "<p>Retrieves information about the status, configuration, and other settings for all versions of a specific campaign.</p>"
+      "documentation": "<p>Retrieves information about the status, configuration, and other settings for all versions of a campaign.</p>"
     },
     "GetCampaigns": {
       "name": "GetCampaigns",
@@ -1787,6 +2211,10 @@
           "shape": "InternalServerErrorException",
           "documentation": "<p>The request failed due to an unknown internal server error, exception, or failure (InternalServerErrorException).</p>"
         },
+        {
+          "shape": "PayloadTooLargeException",
+          "documentation": "<p>The request failed because the payload for the body of the request is too large (RequestEntityTooLargeException).</p>"
+        },
         {
           "shape": "ForbiddenException",
           "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
@@ -1829,6 +2257,10 @@
           "shape": "InternalServerErrorException",
           "documentation": "<p>The request failed due to an unknown internal server error, exception, or failure (InternalServerErrorException).</p>"
         },
+        {
+          "shape": "PayloadTooLargeException",
+          "documentation": "<p>The request failed because the payload for the body of the request is too large (RequestEntityTooLargeException).</p>"
+        },
         {
           "shape": "ForbiddenException",
           "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
@@ -1871,6 +2303,10 @@
           "shape": "InternalServerErrorException",
           "documentation": "<p>The request failed due to an unknown internal server error, exception, or failure (InternalServerErrorException).</p>"
         },
+        {
+          "shape": "PayloadTooLargeException",
+          "documentation": "<p>The request failed because the payload for the body of the request is too large (RequestEntityTooLargeException).</p>"
+        },
         {
           "shape": "ForbiddenException",
           "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
@@ -1913,6 +2349,10 @@
           "shape": "InternalServerErrorException",
           "documentation": "<p>The request failed due to an unknown internal server error, exception, or failure (InternalServerErrorException).</p>"
         },
+        {
+          "shape": "PayloadTooLargeException",
+          "documentation": "<p>The request failed because the payload for the body of the request is too large (RequestEntityTooLargeException).</p>"
+        },
         {
           "shape": "ForbiddenException",
           "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
@@ -1930,7 +2370,7 @@
           "documentation": "<p>The request failed because too many requests were sent during a certain amount of time (TooManyRequestsException).</p>"
         }
       ],
-      "documentation": "<p>Retrieves the content and settings for a message template that you can use in messages that are sent through the email channel.</p>"
+      "documentation": "<p>Retrieves the content and settings of a message template for messages that are sent through the email channel.</p>"
     },
     "GetEndpoint": {
       "name": "GetEndpoint",
@@ -1955,6 +2395,10 @@
           "shape": "InternalServerErrorException",
           "documentation": "<p>The request failed due to an unknown internal server error, exception, or failure (InternalServerErrorException).</p>"
         },
+        {
+          "shape": "PayloadTooLargeException",
+          "documentation": "<p>The request failed because the payload for the body of the request is too large (RequestEntityTooLargeException).</p>"
+        },
         {
           "shape": "ForbiddenException",
           "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
@@ -1997,6 +2441,10 @@
           "shape": "InternalServerErrorException",
           "documentation": "<p>The request failed due to an unknown internal server error, exception, or failure (InternalServerErrorException).</p>"
         },
+        {
+          "shape": "PayloadTooLargeException",
+          "documentation": "<p>The request failed because the payload for the body of the request is too large (RequestEntityTooLargeException).</p>"
+        },
         {
           "shape": "ForbiddenException",
           "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
@@ -2039,6 +2487,10 @@
           "shape": "InternalServerErrorException",
           "documentation": "<p>The request failed due to an unknown internal server error, exception, or failure (InternalServerErrorException).</p>"
         },
+        {
+          "shape": "PayloadTooLargeException",
+          "documentation": "<p>The request failed because the payload for the body of the request is too large (RequestEntityTooLargeException).</p>"
+        },
         {
           "shape": "ForbiddenException",
           "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
@@ -2081,6 +2533,10 @@
           "shape": "InternalServerErrorException",
           "documentation": "<p>The request failed due to an unknown internal server error, exception, or failure (InternalServerErrorException).</p>"
         },
+        {
+          "shape": "PayloadTooLargeException",
+          "documentation": "<p>The request failed because the payload for the body of the request is too large (RequestEntityTooLargeException).</p>"
+        },
         {
           "shape": "ForbiddenException",
           "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
@@ -2123,6 +2579,10 @@
           "shape": "InternalServerErrorException",
           "documentation": "<p>The request failed due to an unknown internal server error, exception, or failure (InternalServerErrorException).</p>"
         },
+        {
+          "shape": "PayloadTooLargeException",
+          "documentation": "<p>The request failed because the payload for the body of the request is too large (RequestEntityTooLargeException).</p>"
+        },
         {
           "shape": "ForbiddenException",
           "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
@@ -2165,6 +2625,10 @@
           "shape": "InternalServerErrorException",
           "documentation": "<p>The request failed due to an unknown internal server error, exception, or failure (InternalServerErrorException).</p>"
         },
+        {
+          "shape": "PayloadTooLargeException",
+          "documentation": "<p>The request failed because the payload for the body of the request is too large (RequestEntityTooLargeException).</p>"
+        },
         {
           "shape": "ForbiddenException",
           "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
@@ -2207,6 +2671,10 @@
           "shape": "InternalServerErrorException",
           "documentation": "<p>The request failed due to an unknown internal server error, exception, or failure (InternalServerErrorException).</p>"
         },
+        {
+          "shape": "PayloadTooLargeException",
+          "documentation": "<p>The request failed because the payload for the body of the request is too large (RequestEntityTooLargeException).</p>"
+        },
         {
           "shape": "ForbiddenException",
           "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
@@ -2226,18 +2694,18 @@
       ],
       "documentation": "<p>Retrieves information about the status and settings of all the import jobs for an application.</p>"
     },
-    "GetPushTemplate": {
-      "name": "GetPushTemplate",
+    "GetJourney": {
+      "name": "GetJourney",
       "http": {
         "method": "GET",
-        "requestUri": "/v1/templates/{template-name}/push",
+        "requestUri": "/v1/apps/{application-id}/journeys/{journey-id}",
         "responseCode": 200
       },
       "input": {
-        "shape": "GetPushTemplateRequest"
+        "shape": "GetJourneyRequest"
       },
       "output": {
-        "shape": "GetPushTemplateResponse",
+        "shape": "GetJourneyResponse",
         "documentation": "<p>The request succeeded.</p>"
       },
       "errors": [
@@ -2249,6 +2717,10 @@
           "shape": "InternalServerErrorException",
           "documentation": "<p>The request failed due to an unknown internal server error, exception, or failure (InternalServerErrorException).</p>"
         },
+        {
+          "shape": "PayloadTooLargeException",
+          "documentation": "<p>The request failed because the payload for the body of the request is too large (RequestEntityTooLargeException).</p>"
+        },
         {
           "shape": "ForbiddenException",
           "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
@@ -2266,20 +2738,20 @@
           "documentation": "<p>The request failed because too many requests were sent during a certain amount of time (TooManyRequestsException).</p>"
         }
       ],
-      "documentation": "<p>Retrieves the content and settings for a message template that you can use in messages that are sent through a push notification channel.</p>"
+      "documentation": "<p>Retrieves information about the status, configuration, and other settings for a journey.</p>"
     },
-    "GetSegment": {
-      "name": "GetSegment",
+    "GetJourneyDateRangeKpi": {
+      "name": "GetJourneyDateRangeKpi",
       "http": {
         "method": "GET",
-        "requestUri": "/v1/apps/{application-id}/segments/{segment-id}",
+        "requestUri": "/v1/apps/{application-id}/journeys/{journey-id}/kpis/daterange/{kpi-name}",
         "responseCode": 200
       },
       "input": {
-        "shape": "GetSegmentRequest"
+        "shape": "GetJourneyDateRangeKpiRequest"
       },
       "output": {
-        "shape": "GetSegmentResponse",
+        "shape": "GetJourneyDateRangeKpiResponse",
         "documentation": "<p>The request succeeded.</p>"
       },
       "errors": [
@@ -2291,6 +2763,10 @@
           "shape": "InternalServerErrorException",
           "documentation": "<p>The request failed due to an unknown internal server error, exception, or failure (InternalServerErrorException).</p>"
         },
+        {
+          "shape": "PayloadTooLargeException",
+          "documentation": "<p>The request failed because the payload for the body of the request is too large (RequestEntityTooLargeException).</p>"
+        },
         {
           "shape": "ForbiddenException",
           "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
@@ -2308,20 +2784,20 @@
           "documentation": "<p>The request failed because too many requests were sent during a certain amount of time (TooManyRequestsException).</p>"
         }
       ],
-      "documentation": "<p>Retrieves information about the configuration, dimension, and other settings for a specific segment that's associated with an application.</p>"
+      "documentation": "<p>Retrieves (queries) pre-aggregated data for a standard engagement metric that applies to a journey.</p>"
     },
-    "GetSegmentExportJobs": {
-      "name": "GetSegmentExportJobs",
+    "GetJourneyExecutionActivityMetrics": {
+      "name": "GetJourneyExecutionActivityMetrics",
       "http": {
         "method": "GET",
-        "requestUri": "/v1/apps/{application-id}/segments/{segment-id}/jobs/export",
+        "requestUri": "/v1/apps/{application-id}/journeys/{journey-id}/activities/{journey-activity-id}/execution-metrics",
         "responseCode": 200
       },
       "input": {
-        "shape": "GetSegmentExportJobsRequest"
+        "shape": "GetJourneyExecutionActivityMetricsRequest"
       },
       "output": {
-        "shape": "GetSegmentExportJobsResponse",
+        "shape": "GetJourneyExecutionActivityMetricsResponse",
         "documentation": "<p>The request succeeded.</p>"
       },
       "errors": [
@@ -2333,6 +2809,10 @@
           "shape": "InternalServerErrorException",
           "documentation": "<p>The request failed due to an unknown internal server error, exception, or failure (InternalServerErrorException).</p>"
         },
+        {
+          "shape": "PayloadTooLargeException",
+          "documentation": "<p>The request failed because the payload for the body of the request is too large (RequestEntityTooLargeException).</p>"
+        },
         {
           "shape": "ForbiddenException",
           "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
@@ -2350,20 +2830,20 @@
           "documentation": "<p>The request failed because too many requests were sent during a certain amount of time (TooManyRequestsException).</p>"
         }
       ],
-      "documentation": "<p>Retrieves information about the status and settings of the export jobs for a segment.</p>"
+      "documentation": "<p>Retrieves (queries) pre-aggregated data for a standard execution metric that applies to a journey activity.</p>"
     },
-    "GetSegmentImportJobs": {
-      "name": "GetSegmentImportJobs",
+    "GetJourneyExecutionMetrics": {
+      "name": "GetJourneyExecutionMetrics",
       "http": {
         "method": "GET",
-        "requestUri": "/v1/apps/{application-id}/segments/{segment-id}/jobs/import",
+        "requestUri": "/v1/apps/{application-id}/journeys/{journey-id}/execution-metrics",
         "responseCode": 200
       },
       "input": {
-        "shape": "GetSegmentImportJobsRequest"
+        "shape": "GetJourneyExecutionMetricsRequest"
       },
       "output": {
-        "shape": "GetSegmentImportJobsResponse",
+        "shape": "GetJourneyExecutionMetricsResponse",
         "documentation": "<p>The request succeeded.</p>"
       },
       "errors": [
@@ -2375,6 +2855,10 @@
           "shape": "InternalServerErrorException",
           "documentation": "<p>The request failed due to an unknown internal server error, exception, or failure (InternalServerErrorException).</p>"
         },
+        {
+          "shape": "PayloadTooLargeException",
+          "documentation": "<p>The request failed because the payload for the body of the request is too large (RequestEntityTooLargeException).</p>"
+        },
         {
           "shape": "ForbiddenException",
           "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
@@ -2392,20 +2876,20 @@
           "documentation": "<p>The request failed because too many requests were sent during a certain amount of time (TooManyRequestsException).</p>"
         }
       ],
-      "documentation": "<p>Retrieves information about the status and settings of the import jobs for a segment.</p>"
+      "documentation": "<p>Retrieves (queries) pre-aggregated data for a standard execution metric that applies to a journey.</p>"
     },
-    "GetSegmentVersion": {
-      "name": "GetSegmentVersion",
+    "GetPushTemplate": {
+      "name": "GetPushTemplate",
       "http": {
         "method": "GET",
-        "requestUri": "/v1/apps/{application-id}/segments/{segment-id}/versions/{version}",
+        "requestUri": "/v1/templates/{template-name}/push",
         "responseCode": 200
       },
       "input": {
-        "shape": "GetSegmentVersionRequest"
+        "shape": "GetPushTemplateRequest"
       },
       "output": {
-        "shape": "GetSegmentVersionResponse",
+        "shape": "GetPushTemplateResponse",
         "documentation": "<p>The request succeeded.</p>"
       },
       "errors": [
@@ -2417,6 +2901,10 @@
           "shape": "InternalServerErrorException",
           "documentation": "<p>The request failed due to an unknown internal server error, exception, or failure (InternalServerErrorException).</p>"
         },
+        {
+          "shape": "PayloadTooLargeException",
+          "documentation": "<p>The request failed because the payload for the body of the request is too large (RequestEntityTooLargeException).</p>"
+        },
         {
           "shape": "ForbiddenException",
           "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
@@ -2434,20 +2922,20 @@
           "documentation": "<p>The request failed because too many requests were sent during a certain amount of time (TooManyRequestsException).</p>"
         }
       ],
-      "documentation": "<p>Retrieves information about the configuration, dimension, and other settings for a specific version of a segment that's associated with an application.</p>"
+      "documentation": "<p>Retrieves the content and settings of a message template for messages that are sent through a push notification channel.</p>"
     },
-    "GetSegmentVersions": {
-      "name": "GetSegmentVersions",
+    "GetRecommenderConfiguration": {
+      "name": "GetRecommenderConfiguration",
       "http": {
         "method": "GET",
-        "requestUri": "/v1/apps/{application-id}/segments/{segment-id}/versions",
+        "requestUri": "/v1/recommenders/{recommender-id}",
         "responseCode": 200
       },
       "input": {
-        "shape": "GetSegmentVersionsRequest"
+        "shape": "GetRecommenderConfigurationRequest"
       },
       "output": {
-        "shape": "GetSegmentVersionsResponse",
+        "shape": "GetRecommenderConfigurationResponse",
         "documentation": "<p>The request succeeded.</p>"
       },
       "errors": [
@@ -2459,6 +2947,10 @@
           "shape": "InternalServerErrorException",
           "documentation": "<p>The request failed due to an unknown internal server error, exception, or failure (InternalServerErrorException).</p>"
         },
+        {
+          "shape": "PayloadTooLargeException",
+          "documentation": "<p>The request failed because the payload for the body of the request is too large (RequestEntityTooLargeException).</p>"
+        },
         {
           "shape": "ForbiddenException",
           "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
@@ -2476,20 +2968,20 @@
           "documentation": "<p>The request failed because too many requests were sent during a certain amount of time (TooManyRequestsException).</p>"
         }
       ],
-      "documentation": "<p>Retrieves information about the configuration, dimension, and other settings for all versions of a specific segment that's associated with an application.</p>"
+      "documentation": "<p>Retrieves information about an Amazon Pinpoint configuration for a recommender model.</p>"
     },
-    "GetSegments": {
-      "name": "GetSegments",
+    "GetRecommenderConfigurations": {
+      "name": "GetRecommenderConfigurations",
       "http": {
         "method": "GET",
-        "requestUri": "/v1/apps/{application-id}/segments",
+        "requestUri": "/v1/recommenders",
         "responseCode": 200
       },
       "input": {
-        "shape": "GetSegmentsRequest"
+        "shape": "GetRecommenderConfigurationsRequest"
       },
       "output": {
-        "shape": "GetSegmentsResponse",
+        "shape": "GetRecommenderConfigurationsResponse",
         "documentation": "<p>The request succeeded.</p>"
       },
       "errors": [
@@ -2501,6 +2993,10 @@
           "shape": "InternalServerErrorException",
           "documentation": "<p>The request failed due to an unknown internal server error, exception, or failure (InternalServerErrorException).</p>"
         },
+        {
+          "shape": "PayloadTooLargeException",
+          "documentation": "<p>The request failed because the payload for the body of the request is too large (RequestEntityTooLargeException).</p>"
+        },
         {
           "shape": "ForbiddenException",
           "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
@@ -2518,20 +3014,20 @@
           "documentation": "<p>The request failed because too many requests were sent during a certain amount of time (TooManyRequestsException).</p>"
         }
       ],
-      "documentation": "<p>Retrieves information about the configuration, dimension, and other settings for all the segments that are associated with an application.</p>"
+      "documentation": "<p>Retrieves information about all the recommender model configurations that are associated with your Amazon Pinpoint account.</p>"
     },
-    "GetSmsChannel": {
-      "name": "GetSmsChannel",
+    "GetSegment": {
+      "name": "GetSegment",
       "http": {
         "method": "GET",
-        "requestUri": "/v1/apps/{application-id}/channels/sms",
+        "requestUri": "/v1/apps/{application-id}/segments/{segment-id}",
         "responseCode": 200
       },
       "input": {
-        "shape": "GetSmsChannelRequest"
+        "shape": "GetSegmentRequest"
       },
       "output": {
-        "shape": "GetSmsChannelResponse",
+        "shape": "GetSegmentResponse",
         "documentation": "<p>The request succeeded.</p>"
       },
       "errors": [
@@ -2543,6 +3039,10 @@
           "shape": "InternalServerErrorException",
           "documentation": "<p>The request failed due to an unknown internal server error, exception, or failure (InternalServerErrorException).</p>"
         },
+        {
+          "shape": "PayloadTooLargeException",
+          "documentation": "<p>The request failed because the payload for the body of the request is too large (RequestEntityTooLargeException).</p>"
+        },
         {
           "shape": "ForbiddenException",
           "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
@@ -2560,20 +3060,20 @@
           "documentation": "<p>The request failed because too many requests were sent during a certain amount of time (TooManyRequestsException).</p>"
         }
       ],
-      "documentation": "<p>Retrieves information about the status and settings of the SMS channel for an application.</p>"
+      "documentation": "<p>Retrieves information about the configuration, dimension, and other settings for a specific segment that's associated with an application.</p>"
     },
-    "GetSmsTemplate": {
-      "name": "GetSmsTemplate",
+    "GetSegmentExportJobs": {
+      "name": "GetSegmentExportJobs",
       "http": {
         "method": "GET",
-        "requestUri": "/v1/templates/{template-name}/sms",
+        "requestUri": "/v1/apps/{application-id}/segments/{segment-id}/jobs/export",
         "responseCode": 200
       },
       "input": {
-        "shape": "GetSmsTemplateRequest"
+        "shape": "GetSegmentExportJobsRequest"
       },
       "output": {
-        "shape": "GetSmsTemplateResponse",
+        "shape": "GetSegmentExportJobsResponse",
         "documentation": "<p>The request succeeded.</p>"
       },
       "errors": [
@@ -2585,6 +3085,10 @@
           "shape": "InternalServerErrorException",
           "documentation": "<p>The request failed due to an unknown internal server error, exception, or failure (InternalServerErrorException).</p>"
         },
+        {
+          "shape": "PayloadTooLargeException",
+          "documentation": "<p>The request failed because the payload for the body of the request is too large (RequestEntityTooLargeException).</p>"
+        },
         {
           "shape": "ForbiddenException",
           "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
@@ -2602,20 +3106,20 @@
           "documentation": "<p>The request failed because too many requests were sent during a certain amount of time (TooManyRequestsException).</p>"
         }
       ],
-      "documentation": "<p>Retrieves the content and settings for a message template that you can use in messages that are sent through the SMS channel.</p>"
+      "documentation": "<p>Retrieves information about the status and settings of the export jobs for a segment.</p>"
     },
-    "GetUserEndpoints": {
-      "name": "GetUserEndpoints",
+    "GetSegmentImportJobs": {
+      "name": "GetSegmentImportJobs",
       "http": {
         "method": "GET",
-        "requestUri": "/v1/apps/{application-id}/users/{user-id}",
+        "requestUri": "/v1/apps/{application-id}/segments/{segment-id}/jobs/import",
         "responseCode": 200
       },
       "input": {
-        "shape": "GetUserEndpointsRequest"
+        "shape": "GetSegmentImportJobsRequest"
       },
       "output": {
-        "shape": "GetUserEndpointsResponse",
+        "shape": "GetSegmentImportJobsResponse",
         "documentation": "<p>The request succeeded.</p>"
       },
       "errors": [
@@ -2627,6 +3131,10 @@
           "shape": "InternalServerErrorException",
           "documentation": "<p>The request failed due to an unknown internal server error, exception, or failure (InternalServerErrorException).</p>"
         },
+        {
+          "shape": "PayloadTooLargeException",
+          "documentation": "<p>The request failed because the payload for the body of the request is too large (RequestEntityTooLargeException).</p>"
+        },
         {
           "shape": "ForbiddenException",
           "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
@@ -2644,20 +3152,20 @@
           "documentation": "<p>The request failed because too many requests were sent during a certain amount of time (TooManyRequestsException).</p>"
         }
       ],
-      "documentation": "<p>Retrieves information about all the endpoints that are associated with a specific user ID.</p>"
+      "documentation": "<p>Retrieves information about the status and settings of the import jobs for a segment.</p>"
     },
-    "GetVoiceChannel": {
-      "name": "GetVoiceChannel",
+    "GetSegmentVersion": {
+      "name": "GetSegmentVersion",
       "http": {
         "method": "GET",
-        "requestUri": "/v1/apps/{application-id}/channels/voice",
+        "requestUri": "/v1/apps/{application-id}/segments/{segment-id}/versions/{version}",
         "responseCode": 200
       },
       "input": {
-        "shape": "GetVoiceChannelRequest"
+        "shape": "GetSegmentVersionRequest"
       },
       "output": {
-        "shape": "GetVoiceChannelResponse",
+        "shape": "GetSegmentVersionResponse",
         "documentation": "<p>The request succeeded.</p>"
       },
       "errors": [
@@ -2669,6 +3177,10 @@
           "shape": "InternalServerErrorException",
           "documentation": "<p>The request failed due to an unknown internal server error, exception, or failure (InternalServerErrorException).</p>"
         },
+        {
+          "shape": "PayloadTooLargeException",
+          "documentation": "<p>The request failed because the payload for the body of the request is too large (RequestEntityTooLargeException).</p>"
+        },
         {
           "shape": "ForbiddenException",
           "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
@@ -2686,39 +3198,20 @@
           "documentation": "<p>The request failed because too many requests were sent during a certain amount of time (TooManyRequestsException).</p>"
         }
       ],
-      "documentation": "<p>Retrieves information about the status and settings of the voice channel for an application.</p>"
-    },
-    "ListTagsForResource": {
-      "name": "ListTagsForResource",
-      "http": {
-        "method": "GET",
-        "requestUri": "/v1/tags/{resource-arn}",
-        "responseCode": 200
-      },
-      "input": {
-        "shape": "ListTagsForResourceRequest"
-      },
-      "output": {
-        "shape": "ListTagsForResourceResponse",
-        "documentation": "<p>The request succeeded.</p>"
-      },
-      "errors": [
-
-      ],
-      "documentation": "<p>Retrieves all the tags (keys and values) that are associated with an application, campaign, message template, or segment.</p>"
+      "documentation": "<p>Retrieves information about the configuration, dimension, and other settings for a specific version of a segment that's associated with an application.</p>"
     },
-    "ListTemplates": {
-      "name": "ListTemplates",
+    "GetSegmentVersions": {
+      "name": "GetSegmentVersions",
       "http": {
         "method": "GET",
-        "requestUri": "/v1/templates",
+        "requestUri": "/v1/apps/{application-id}/segments/{segment-id}/versions",
         "responseCode": 200
       },
       "input": {
-        "shape": "ListTemplatesRequest"
+        "shape": "GetSegmentVersionsRequest"
       },
       "output": {
-        "shape": "ListTemplatesResponse",
+        "shape": "GetSegmentVersionsResponse",
         "documentation": "<p>The request succeeded.</p>"
       },
       "errors": [
@@ -2730,6 +3223,10 @@
           "shape": "InternalServerErrorException",
           "documentation": "<p>The request failed due to an unknown internal server error, exception, or failure (InternalServerErrorException).</p>"
         },
+        {
+          "shape": "PayloadTooLargeException",
+          "documentation": "<p>The request failed because the payload for the body of the request is too large (RequestEntityTooLargeException).</p>"
+        },
         {
           "shape": "ForbiddenException",
           "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
@@ -2747,20 +3244,20 @@
           "documentation": "<p>The request failed because too many requests were sent during a certain amount of time (TooManyRequestsException).</p>"
         }
       ],
-      "documentation": "<p>Retrieves information about all the message templates that are associated with your Amazon Pinpoint account.</p>"
+      "documentation": "<p>Retrieves information about the configuration, dimension, and other settings for all the versions of a specific segment that's associated with an application.</p>"
     },
-    "PhoneNumberValidate": {
-      "name": "PhoneNumberValidate",
+    "GetSegments": {
+      "name": "GetSegments",
       "http": {
-        "method": "POST",
-        "requestUri": "/v1/phone/number/validate",
+        "method": "GET",
+        "requestUri": "/v1/apps/{application-id}/segments",
         "responseCode": 200
       },
       "input": {
-        "shape": "PhoneNumberValidateRequest"
+        "shape": "GetSegmentsRequest"
       },
       "output": {
-        "shape": "PhoneNumberValidateResponse",
+        "shape": "GetSegmentsResponse",
         "documentation": "<p>The request succeeded.</p>"
       },
       "errors": [
@@ -2772,6 +3269,10 @@
           "shape": "InternalServerErrorException",
           "documentation": "<p>The request failed due to an unknown internal server error, exception, or failure (InternalServerErrorException).</p>"
         },
+        {
+          "shape": "PayloadTooLargeException",
+          "documentation": "<p>The request failed because the payload for the body of the request is too large (RequestEntityTooLargeException).</p>"
+        },
         {
           "shape": "ForbiddenException",
           "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
@@ -2789,9 +3290,432 @@
           "documentation": "<p>The request failed because too many requests were sent during a certain amount of time (TooManyRequestsException).</p>"
         }
       ],
-      "documentation": "<p>Retrieves information about a phone number.</p>"
+      "documentation": "<p>Retrieves information about the configuration, dimension, and other settings for all the segments that are associated with an application.</p>"
     },
-    "PutEventStream": {
+    "GetSmsChannel": {
+      "name": "GetSmsChannel",
+      "http": {
+        "method": "GET",
+        "requestUri": "/v1/apps/{application-id}/channels/sms",
+        "responseCode": 200
+      },
+      "input": {
+        "shape": "GetSmsChannelRequest"
+      },
+      "output": {
+        "shape": "GetSmsChannelResponse",
+        "documentation": "<p>The request succeeded.</p>"
+      },
+      "errors": [
+        {
+          "shape": "BadRequestException",
+          "documentation": "<p>The request contains a syntax error (BadRequestException).</p>"
+        },
+        {
+          "shape": "InternalServerErrorException",
+          "documentation": "<p>The request failed due to an unknown internal server error, exception, or failure (InternalServerErrorException).</p>"
+        },
+        {
+          "shape": "PayloadTooLargeException",
+          "documentation": "<p>The request failed because the payload for the body of the request is too large (RequestEntityTooLargeException).</p>"
+        },
+        {
+          "shape": "ForbiddenException",
+          "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
+        },
+        {
+          "shape": "NotFoundException",
+          "documentation": "<p>The request failed because the specified resource was not found (NotFoundException).</p>"
+        },
+        {
+          "shape": "MethodNotAllowedException",
+          "documentation": "<p>The request failed because the method is not allowed for the specified resource (MethodNotAllowedException).</p>"
+        },
+        {
+          "shape": "TooManyRequestsException",
+          "documentation": "<p>The request failed because too many requests were sent during a certain amount of time (TooManyRequestsException).</p>"
+        }
+      ],
+      "documentation": "<p>Retrieves information about the status and settings of the SMS channel for an application.</p>"
+    },
+    "GetSmsTemplate": {
+      "name": "GetSmsTemplate",
+      "http": {
+        "method": "GET",
+        "requestUri": "/v1/templates/{template-name}/sms",
+        "responseCode": 200
+      },
+      "input": {
+        "shape": "GetSmsTemplateRequest"
+      },
+      "output": {
+        "shape": "GetSmsTemplateResponse",
+        "documentation": "<p>The request succeeded.</p>"
+      },
+      "errors": [
+        {
+          "shape": "BadRequestException",
+          "documentation": "<p>The request contains a syntax error (BadRequestException).</p>"
+        },
+        {
+          "shape": "InternalServerErrorException",
+          "documentation": "<p>The request failed due to an unknown internal server error, exception, or failure (InternalServerErrorException).</p>"
+        },
+        {
+          "shape": "PayloadTooLargeException",
+          "documentation": "<p>The request failed because the payload for the body of the request is too large (RequestEntityTooLargeException).</p>"
+        },
+        {
+          "shape": "ForbiddenException",
+          "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
+        },
+        {
+          "shape": "NotFoundException",
+          "documentation": "<p>The request failed because the specified resource was not found (NotFoundException).</p>"
+        },
+        {
+          "shape": "MethodNotAllowedException",
+          "documentation": "<p>The request failed because the method is not allowed for the specified resource (MethodNotAllowedException).</p>"
+        },
+        {
+          "shape": "TooManyRequestsException",
+          "documentation": "<p>The request failed because too many requests were sent during a certain amount of time (TooManyRequestsException).</p>"
+        }
+      ],
+      "documentation": "<p>Retrieves the content and settings of a message template for messages that are sent through the SMS channel.</p>"
+    },
+    "GetUserEndpoints": {
+      "name": "GetUserEndpoints",
+      "http": {
+        "method": "GET",
+        "requestUri": "/v1/apps/{application-id}/users/{user-id}",
+        "responseCode": 200
+      },
+      "input": {
+        "shape": "GetUserEndpointsRequest"
+      },
+      "output": {
+        "shape": "GetUserEndpointsResponse",
+        "documentation": "<p>The request succeeded.</p>"
+      },
+      "errors": [
+        {
+          "shape": "BadRequestException",
+          "documentation": "<p>The request contains a syntax error (BadRequestException).</p>"
+        },
+        {
+          "shape": "InternalServerErrorException",
+          "documentation": "<p>The request failed due to an unknown internal server error, exception, or failure (InternalServerErrorException).</p>"
+        },
+        {
+          "shape": "PayloadTooLargeException",
+          "documentation": "<p>The request failed because the payload for the body of the request is too large (RequestEntityTooLargeException).</p>"
+        },
+        {
+          "shape": "ForbiddenException",
+          "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
+        },
+        {
+          "shape": "NotFoundException",
+          "documentation": "<p>The request failed because the specified resource was not found (NotFoundException).</p>"
+        },
+        {
+          "shape": "MethodNotAllowedException",
+          "documentation": "<p>The request failed because the method is not allowed for the specified resource (MethodNotAllowedException).</p>"
+        },
+        {
+          "shape": "TooManyRequestsException",
+          "documentation": "<p>The request failed because too many requests were sent during a certain amount of time (TooManyRequestsException).</p>"
+        }
+      ],
+      "documentation": "<p>Retrieves information about all the endpoints that are associated with a specific user ID.</p>"
+    },
+    "GetVoiceChannel": {
+      "name": "GetVoiceChannel",
+      "http": {
+        "method": "GET",
+        "requestUri": "/v1/apps/{application-id}/channels/voice",
+        "responseCode": 200
+      },
+      "input": {
+        "shape": "GetVoiceChannelRequest"
+      },
+      "output": {
+        "shape": "GetVoiceChannelResponse",
+        "documentation": "<p>The request succeeded.</p>"
+      },
+      "errors": [
+        {
+          "shape": "BadRequestException",
+          "documentation": "<p>The request contains a syntax error (BadRequestException).</p>"
+        },
+        {
+          "shape": "InternalServerErrorException",
+          "documentation": "<p>The request failed due to an unknown internal server error, exception, or failure (InternalServerErrorException).</p>"
+        },
+        {
+          "shape": "PayloadTooLargeException",
+          "documentation": "<p>The request failed because the payload for the body of the request is too large (RequestEntityTooLargeException).</p>"
+        },
+        {
+          "shape": "ForbiddenException",
+          "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
+        },
+        {
+          "shape": "NotFoundException",
+          "documentation": "<p>The request failed because the specified resource was not found (NotFoundException).</p>"
+        },
+        {
+          "shape": "MethodNotAllowedException",
+          "documentation": "<p>The request failed because the method is not allowed for the specified resource (MethodNotAllowedException).</p>"
+        },
+        {
+          "shape": "TooManyRequestsException",
+          "documentation": "<p>The request failed because too many requests were sent during a certain amount of time (TooManyRequestsException).</p>"
+        }
+      ],
+      "documentation": "<p>Retrieves information about the status and settings of the voice channel for an application.</p>"
+    },
+    "GetVoiceTemplate": {
+      "name": "GetVoiceTemplate",
+      "http": {
+        "method": "GET",
+        "requestUri": "/v1/templates/{template-name}/voice",
+        "responseCode": 200
+      },
+      "input": {
+        "shape": "GetVoiceTemplateRequest"
+      },
+      "output": {
+        "shape": "GetVoiceTemplateResponse",
+        "documentation": "<p>The request succeeded.</p>"
+      },
+      "errors": [
+        {
+          "shape": "BadRequestException",
+          "documentation": "<p>The request contains a syntax error (BadRequestException).</p>"
+        },
+        {
+          "shape": "InternalServerErrorException",
+          "documentation": "<p>The request failed due to an unknown internal server error, exception, or failure (InternalServerErrorException).</p>"
+        },
+        {
+          "shape": "PayloadTooLargeException",
+          "documentation": "<p>The request failed because the payload for the body of the request is too large (RequestEntityTooLargeException).</p>"
+        },
+        {
+          "shape": "ForbiddenException",
+          "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
+        },
+        {
+          "shape": "NotFoundException",
+          "documentation": "<p>The request failed because the specified resource was not found (NotFoundException).</p>"
+        },
+        {
+          "shape": "MethodNotAllowedException",
+          "documentation": "<p>The request failed because the method is not allowed for the specified resource (MethodNotAllowedException).</p>"
+        },
+        {
+          "shape": "TooManyRequestsException",
+          "documentation": "<p>The request failed because too many requests were sent during a certain amount of time (TooManyRequestsException).</p>"
+        }
+      ],
+      "documentation": "<p>Retrieves the content and settings of a message template for messages that are sent through the voice channel.</p>"
+    },
+    "ListJourneys": {
+      "name": "ListJourneys",
+      "http": {
+        "method": "GET",
+        "requestUri": "/v1/apps/{application-id}/journeys",
+        "responseCode": 200
+      },
+      "input": {
+        "shape": "ListJourneysRequest"
+      },
+      "output": {
+        "shape": "ListJourneysResponse",
+        "documentation": "<p>The request succeeded.</p>"
+      },
+      "errors": [
+        {
+          "shape": "BadRequestException",
+          "documentation": "<p>The request contains a syntax error (BadRequestException).</p>"
+        },
+        {
+          "shape": "InternalServerErrorException",
+          "documentation": "<p>The request failed due to an unknown internal server error, exception, or failure (InternalServerErrorException).</p>"
+        },
+        {
+          "shape": "PayloadTooLargeException",
+          "documentation": "<p>The request failed because the payload for the body of the request is too large (RequestEntityTooLargeException).</p>"
+        },
+        {
+          "shape": "ForbiddenException",
+          "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
+        },
+        {
+          "shape": "NotFoundException",
+          "documentation": "<p>The request failed because the specified resource was not found (NotFoundException).</p>"
+        },
+        {
+          "shape": "MethodNotAllowedException",
+          "documentation": "<p>The request failed because the method is not allowed for the specified resource (MethodNotAllowedException).</p>"
+        },
+        {
+          "shape": "TooManyRequestsException",
+          "documentation": "<p>The request failed because too many requests were sent during a certain amount of time (TooManyRequestsException).</p>"
+        }
+      ],
+      "documentation": "<p>Retrieves information about the status, configuration, and other settings for all the journeys that are associated with an application.</p>"
+    },
+    "ListTagsForResource": {
+      "name": "ListTagsForResource",
+      "http": {
+        "method": "GET",
+        "requestUri": "/v1/tags/{resource-arn}",
+        "responseCode": 200
+      },
+      "input": {
+        "shape": "ListTagsForResourceRequest"
+      },
+      "output": {
+        "shape": "ListTagsForResourceResponse",
+        "documentation": "<p>The request succeeded.</p>"
+      },
+      "errors": [],
+      "documentation": "<p>Retrieves all the tags (keys and values) that are associated with an application, campaign, message template, or segment.</p>"
+    },
+    "ListTemplateVersions": {
+      "name": "ListTemplateVersions",
+      "http": {
+        "method": "GET",
+        "requestUri": "/v1/templates/{template-name}/{template-type}/versions",
+        "responseCode": 200
+      },
+      "input": {
+        "shape": "ListTemplateVersionsRequest"
+      },
+      "output": {
+        "shape": "ListTemplateVersionsResponse",
+        "documentation": "<p>The request succeeded.</p>"
+      },
+      "errors": [
+        {
+          "shape": "BadRequestException",
+          "documentation": "<p>The request contains a syntax error (BadRequestException).</p>"
+        },
+        {
+          "shape": "InternalServerErrorException",
+          "documentation": "<p>The request failed due to an unknown internal server error, exception, or failure (InternalServerErrorException).</p>"
+        },
+        {
+          "shape": "PayloadTooLargeException",
+          "documentation": "<p>The request failed because the payload for the body of the request is too large (RequestEntityTooLargeException).</p>"
+        },
+        {
+          "shape": "ForbiddenException",
+          "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
+        },
+        {
+          "shape": "NotFoundException",
+          "documentation": "<p>The request failed because the specified resource was not found (NotFoundException).</p>"
+        },
+        {
+          "shape": "MethodNotAllowedException",
+          "documentation": "<p>The request failed because the method is not allowed for the specified resource (MethodNotAllowedException).</p>"
+        },
+        {
+          "shape": "TooManyRequestsException",
+          "documentation": "<p>The request failed because too many requests were sent during a certain amount of time (TooManyRequestsException).</p>"
+        }
+      ],
+      "documentation": "<p>Retrieves information about all the versions of a specific message template.</p>"
+    },
+    "ListTemplates": {
+      "name": "ListTemplates",
+      "http": {
+        "method": "GET",
+        "requestUri": "/v1/templates",
+        "responseCode": 200
+      },
+      "input": {
+        "shape": "ListTemplatesRequest"
+      },
+      "output": {
+        "shape": "ListTemplatesResponse",
+        "documentation": "<p>The request succeeded.</p>"
+      },
+      "errors": [
+        {
+          "shape": "MethodNotAllowedException",
+          "documentation": "<p>The request failed because the method is not allowed for the specified resource (MethodNotAllowedException).</p>"
+        },
+        {
+          "shape": "TooManyRequestsException",
+          "documentation": "<p>The request failed because too many requests were sent during a certain amount of time (TooManyRequestsException).</p>"
+        },
+        {
+          "shape": "BadRequestException",
+          "documentation": "<p>The request contains a syntax error (BadRequestException).</p>"
+        },
+        {
+          "shape": "InternalServerErrorException",
+          "documentation": "<p>The request failed due to an unknown internal server error, exception, or failure (InternalServerErrorException).</p>"
+        },
+        {
+          "shape": "ForbiddenException",
+          "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
+        }
+      ],
+      "documentation": "<p>Retrieves information about all the message templates that are associated with your Amazon Pinpoint account.</p>"
+    },
+    "PhoneNumberValidate": {
+      "name": "PhoneNumberValidate",
+      "http": {
+        "method": "POST",
+        "requestUri": "/v1/phone/number/validate",
+        "responseCode": 200
+      },
+      "input": {
+        "shape": "PhoneNumberValidateRequest"
+      },
+      "output": {
+        "shape": "PhoneNumberValidateResponse",
+        "documentation": "<p>The request succeeded.</p>"
+      },
+      "errors": [
+        {
+          "shape": "BadRequestException",
+          "documentation": "<p>The request contains a syntax error (BadRequestException).</p>"
+        },
+        {
+          "shape": "InternalServerErrorException",
+          "documentation": "<p>The request failed due to an unknown internal server error, exception, or failure (InternalServerErrorException).</p>"
+        },
+        {
+          "shape": "PayloadTooLargeException",
+          "documentation": "<p>The request failed because the payload for the body of the request is too large (RequestEntityTooLargeException).</p>"
+        },
+        {
+          "shape": "ForbiddenException",
+          "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
+        },
+        {
+          "shape": "NotFoundException",
+          "documentation": "<p>The request failed because the specified resource was not found (NotFoundException).</p>"
+        },
+        {
+          "shape": "MethodNotAllowedException",
+          "documentation": "<p>The request failed because the method is not allowed for the specified resource (MethodNotAllowedException).</p>"
+        },
+        {
+          "shape": "TooManyRequestsException",
+          "documentation": "<p>The request failed because too many requests were sent during a certain amount of time (TooManyRequestsException).</p>"
+        }
+      ],
+      "documentation": "<p>Retrieves information about a phone number.</p>"
+    },
+    "PutEventStream": {
       "name": "PutEventStream",
       "http": {
         "method": "POST",
@@ -2814,6 +3738,10 @@
           "shape": "InternalServerErrorException",
           "documentation": "<p>The request failed due to an unknown internal server error, exception, or failure (InternalServerErrorException).</p>"
         },
+        {
+          "shape": "PayloadTooLargeException",
+          "documentation": "<p>The request failed because the payload for the body of the request is too large (RequestEntityTooLargeException).</p>"
+        },
         {
           "shape": "ForbiddenException",
           "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
@@ -2856,6 +3784,10 @@
           "shape": "InternalServerErrorException",
           "documentation": "<p>The request failed due to an unknown internal server error, exception, or failure (InternalServerErrorException).</p>"
         },
+        {
+          "shape": "PayloadTooLargeException",
+          "documentation": "<p>The request failed because the payload for the body of the request is too large (RequestEntityTooLargeException).</p>"
+        },
         {
           "shape": "ForbiddenException",
           "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
@@ -2898,6 +3830,10 @@
           "shape": "InternalServerErrorException",
           "documentation": "<p>The request failed due to an unknown internal server error, exception, or failure (InternalServerErrorException).</p>"
         },
+        {
+          "shape": "PayloadTooLargeException",
+          "documentation": "<p>The request failed because the payload for the body of the request is too large (RequestEntityTooLargeException).</p>"
+        },
         {
           "shape": "ForbiddenException",
           "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
@@ -2940,6 +3876,10 @@
           "shape": "InternalServerErrorException",
           "documentation": "<p>The request failed due to an unknown internal server error, exception, or failure (InternalServerErrorException).</p>"
         },
+        {
+          "shape": "PayloadTooLargeException",
+          "documentation": "<p>The request failed because the payload for the body of the request is too large (RequestEntityTooLargeException).</p>"
+        },
         {
           "shape": "ForbiddenException",
           "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
@@ -2982,6 +3922,10 @@
           "shape": "InternalServerErrorException",
           "documentation": "<p>The request failed due to an unknown internal server error, exception, or failure (InternalServerErrorException).</p>"
         },
+        {
+          "shape": "PayloadTooLargeException",
+          "documentation": "<p>The request failed because the payload for the body of the request is too large (RequestEntityTooLargeException).</p>"
+        },
         {
           "shape": "ForbiddenException",
           "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
@@ -3011,9 +3955,7 @@
       "input": {
         "shape": "TagResourceRequest"
       },
-      "errors": [
-
-      ],
+      "errors": [],
       "documentation": "<p>Adds one or more tags (keys and values) to an application, campaign, message template, or segment.</p>"
     },
     "UntagResource": {
@@ -3026,9 +3968,7 @@
       "input": {
         "shape": "UntagResourceRequest"
       },
-      "errors": [
-
-      ],
+      "errors": [],
       "documentation": "<p>Removes one or more tags (keys and values) from an application, campaign, message template, or segment.</p>"
     },
     "UpdateAdmChannel": {
@@ -3054,6 +3994,10 @@
           "shape": "InternalServerErrorException",
           "documentation": "<p>The request failed due to an unknown internal server error, exception, or failure (InternalServerErrorException).</p>"
         },
+        {
+          "shape": "PayloadTooLargeException",
+          "documentation": "<p>The request failed because the payload for the body of the request is too large (RequestEntityTooLargeException).</p>"
+        },
         {
           "shape": "ForbiddenException",
           "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
@@ -3096,6 +4040,10 @@
           "shape": "InternalServerErrorException",
           "documentation": "<p>The request failed due to an unknown internal server error, exception, or failure (InternalServerErrorException).</p>"
         },
+        {
+          "shape": "PayloadTooLargeException",
+          "documentation": "<p>The request failed because the payload for the body of the request is too large (RequestEntityTooLargeException).</p>"
+        },
         {
           "shape": "ForbiddenException",
           "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
@@ -3138,6 +4086,10 @@
           "shape": "InternalServerErrorException",
           "documentation": "<p>The request failed due to an unknown internal server error, exception, or failure (InternalServerErrorException).</p>"
         },
+        {
+          "shape": "PayloadTooLargeException",
+          "documentation": "<p>The request failed because the payload for the body of the request is too large (RequestEntityTooLargeException).</p>"
+        },
         {
           "shape": "ForbiddenException",
           "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
@@ -3180,6 +4132,10 @@
           "shape": "InternalServerErrorException",
           "documentation": "<p>The request failed due to an unknown internal server error, exception, or failure (InternalServerErrorException).</p>"
         },
+        {
+          "shape": "PayloadTooLargeException",
+          "documentation": "<p>The request failed because the payload for the body of the request is too large (RequestEntityTooLargeException).</p>"
+        },
         {
           "shape": "ForbiddenException",
           "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
@@ -3222,6 +4178,10 @@
           "shape": "InternalServerErrorException",
           "documentation": "<p>The request failed due to an unknown internal server error, exception, or failure (InternalServerErrorException).</p>"
         },
+        {
+          "shape": "PayloadTooLargeException",
+          "documentation": "<p>The request failed because the payload for the body of the request is too large (RequestEntityTooLargeException).</p>"
+        },
         {
           "shape": "ForbiddenException",
           "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
@@ -3264,6 +4224,10 @@
           "shape": "InternalServerErrorException",
           "documentation": "<p>The request failed due to an unknown internal server error, exception, or failure (InternalServerErrorException).</p>"
         },
+        {
+          "shape": "PayloadTooLargeException",
+          "documentation": "<p>The request failed because the payload for the body of the request is too large (RequestEntityTooLargeException).</p>"
+        },
         {
           "shape": "ForbiddenException",
           "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
@@ -3306,6 +4270,10 @@
           "shape": "InternalServerErrorException",
           "documentation": "<p>The request failed due to an unknown internal server error, exception, or failure (InternalServerErrorException).</p>"
         },
+        {
+          "shape": "PayloadTooLargeException",
+          "documentation": "<p>The request failed because the payload for the body of the request is too large (RequestEntityTooLargeException).</p>"
+        },
         {
           "shape": "ForbiddenException",
           "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
@@ -3348,6 +4316,10 @@
           "shape": "InternalServerErrorException",
           "documentation": "<p>The request failed due to an unknown internal server error, exception, or failure (InternalServerErrorException).</p>"
         },
+        {
+          "shape": "PayloadTooLargeException",
+          "documentation": "<p>The request failed because the payload for the body of the request is too large (RequestEntityTooLargeException).</p>"
+        },
         {
           "shape": "ForbiddenException",
           "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
@@ -3365,7 +4337,7 @@
           "documentation": "<p>The request failed because too many requests were sent during a certain amount of time (TooManyRequestsException).</p>"
         }
       ],
-      "documentation": "<p>Updates the settings for a campaign.</p>"
+      "documentation": "<p>Updates the configuration and other settings for a campaign.</p>"
     },
     "UpdateEmailChannel": {
       "name": "UpdateEmailChannel",
@@ -3390,6 +4362,10 @@
           "shape": "InternalServerErrorException",
           "documentation": "<p>The request failed due to an unknown internal server error, exception, or failure (InternalServerErrorException).</p>"
         },
+        {
+          "shape": "PayloadTooLargeException",
+          "documentation": "<p>The request failed because the payload for the body of the request is too large (RequestEntityTooLargeException).</p>"
+        },
         {
           "shape": "ForbiddenException",
           "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
@@ -3432,6 +4408,10 @@
           "shape": "InternalServerErrorException",
           "documentation": "<p>The request failed due to an unknown internal server error, exception, or failure (InternalServerErrorException).</p>"
         },
+        {
+          "shape": "PayloadTooLargeException",
+          "documentation": "<p>The request failed because the payload for the body of the request is too large (RequestEntityTooLargeException).</p>"
+        },
         {
           "shape": "ForbiddenException",
           "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
@@ -3449,7 +4429,7 @@
           "documentation": "<p>The request failed because too many requests were sent during a certain amount of time (TooManyRequestsException).</p>"
         }
       ],
-      "documentation": "<p>Updates an existing message template that you can use in messages that are sent through the email channel.</p>"
+      "documentation": "<p>Updates an existing message template for messages that are sent through the email channel.</p>"
     },
     "UpdateEndpoint": {
       "name": "UpdateEndpoint",
@@ -3474,6 +4454,10 @@
           "shape": "InternalServerErrorException",
           "documentation": "<p>The request failed due to an unknown internal server error, exception, or failure (InternalServerErrorException).</p>"
         },
+        {
+          "shape": "PayloadTooLargeException",
+          "documentation": "<p>The request failed because the payload for the body of the request is too large (RequestEntityTooLargeException).</p>"
+        },
         {
           "shape": "ForbiddenException",
           "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
@@ -3516,6 +4500,10 @@
           "shape": "InternalServerErrorException",
           "documentation": "<p>The request failed due to an unknown internal server error, exception, or failure (InternalServerErrorException).</p>"
         },
+        {
+          "shape": "PayloadTooLargeException",
+          "documentation": "<p>The request failed because the payload for the body of the request is too large (RequestEntityTooLargeException).</p>"
+        },
         {
           "shape": "ForbiddenException",
           "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
@@ -3558,6 +4546,10 @@
           "shape": "InternalServerErrorException",
           "documentation": "<p>The request failed due to an unknown internal server error, exception, or failure (InternalServerErrorException).</p>"
         },
+        {
+          "shape": "PayloadTooLargeException",
+          "documentation": "<p>The request failed because the payload for the body of the request is too large (RequestEntityTooLargeException).</p>"
+        },
         {
           "shape": "ForbiddenException",
           "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
@@ -3577,6 +4569,98 @@
       ],
       "documentation": "<p>Enables the GCM channel for an application or updates the status and settings of the GCM channel for an application.</p>"
     },
+    "UpdateJourney": {
+      "name": "UpdateJourney",
+      "http": {
+        "method": "PUT",
+        "requestUri": "/v1/apps/{application-id}/journeys/{journey-id}",
+        "responseCode": 200
+      },
+      "input": {
+        "shape": "UpdateJourneyRequest"
+      },
+      "output": {
+        "shape": "UpdateJourneyResponse",
+        "documentation": "<p>The request succeeded.</p>"
+      },
+      "errors": [
+        {
+          "shape": "BadRequestException",
+          "documentation": "<p>The request contains a syntax error (BadRequestException).</p>"
+        },
+        {
+          "shape": "InternalServerErrorException",
+          "documentation": "<p>The request failed due to an unknown internal server error, exception, or failure (InternalServerErrorException).</p>"
+        },
+        {
+          "shape": "PayloadTooLargeException",
+          "documentation": "<p>The request failed because the payload for the body of the request is too large (RequestEntityTooLargeException).</p>"
+        },
+        {
+          "shape": "ForbiddenException",
+          "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
+        },
+        {
+          "shape": "NotFoundException",
+          "documentation": "<p>The request failed because the specified resource was not found (NotFoundException).</p>"
+        },
+        {
+          "shape": "MethodNotAllowedException",
+          "documentation": "<p>The request failed because the method is not allowed for the specified resource (MethodNotAllowedException).</p>"
+        },
+        {
+          "shape": "TooManyRequestsException",
+          "documentation": "<p>The request failed because too many requests were sent during a certain amount of time (TooManyRequestsException).</p>"
+        }
+      ],
+      "documentation": "<p>Updates the configuration and other settings for a journey.</p>"
+    },
+    "UpdateJourneyState": {
+      "name": "UpdateJourneyState",
+      "http": {
+        "method": "PUT",
+        "requestUri": "/v1/apps/{application-id}/journeys/{journey-id}/state",
+        "responseCode": 200
+      },
+      "input": {
+        "shape": "UpdateJourneyStateRequest"
+      },
+      "output": {
+        "shape": "UpdateJourneyStateResponse",
+        "documentation": "<p>The request succeeded.</p>"
+      },
+      "errors": [
+        {
+          "shape": "BadRequestException",
+          "documentation": "<p>The request contains a syntax error (BadRequestException).</p>"
+        },
+        {
+          "shape": "InternalServerErrorException",
+          "documentation": "<p>The request failed due to an unknown internal server error, exception, or failure (InternalServerErrorException).</p>"
+        },
+        {
+          "shape": "PayloadTooLargeException",
+          "documentation": "<p>The request failed because the payload for the body of the request is too large (RequestEntityTooLargeException).</p>"
+        },
+        {
+          "shape": "ForbiddenException",
+          "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
+        },
+        {
+          "shape": "NotFoundException",
+          "documentation": "<p>The request failed because the specified resource was not found (NotFoundException).</p>"
+        },
+        {
+          "shape": "MethodNotAllowedException",
+          "documentation": "<p>The request failed because the method is not allowed for the specified resource (MethodNotAllowedException).</p>"
+        },
+        {
+          "shape": "TooManyRequestsException",
+          "documentation": "<p>The request failed because too many requests were sent during a certain amount of time (TooManyRequestsException).</p>"
+        }
+      ],
+      "documentation": "<p>Cancels (stops) an active journey.</p>"
+    },
     "UpdatePushTemplate": {
       "name": "UpdatePushTemplate",
       "http": {
@@ -3600,6 +4684,56 @@
           "shape": "InternalServerErrorException",
           "documentation": "<p>The request failed due to an unknown internal server error, exception, or failure (InternalServerErrorException).</p>"
         },
+        {
+          "shape": "PayloadTooLargeException",
+          "documentation": "<p>The request failed because the payload for the body of the request is too large (RequestEntityTooLargeException).</p>"
+        },
+        {
+          "shape": "ForbiddenException",
+          "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
+        },
+        {
+          "shape": "NotFoundException",
+          "documentation": "<p>The request failed because the specified resource was not found (NotFoundException).</p>"
+        },
+        {
+          "shape": "MethodNotAllowedException",
+          "documentation": "<p>The request failed because the method is not allowed for the specified resource (MethodNotAllowedException).</p>"
+        },
+        {
+          "shape": "TooManyRequestsException",
+          "documentation": "<p>The request failed because too many requests were sent during a certain amount of time (TooManyRequestsException).</p>"
+        }
+      ],
+      "documentation": "<p>Updates an existing message template for messages that are sent through a push notification channel.</p>"
+    },
+    "UpdateRecommenderConfiguration": {
+      "name": "UpdateRecommenderConfiguration",
+      "http": {
+        "method": "PUT",
+        "requestUri": "/v1/recommenders/{recommender-id}",
+        "responseCode": 200
+      },
+      "input": {
+        "shape": "UpdateRecommenderConfigurationRequest"
+      },
+      "output": {
+        "shape": "UpdateRecommenderConfigurationResponse",
+        "documentation": "<p>The request succeeded.</p>"
+      },
+      "errors": [
+        {
+          "shape": "BadRequestException",
+          "documentation": "<p>The request contains a syntax error (BadRequestException).</p>"
+        },
+        {
+          "shape": "InternalServerErrorException",
+          "documentation": "<p>The request failed due to an unknown internal server error, exception, or failure (InternalServerErrorException).</p>"
+        },
+        {
+          "shape": "PayloadTooLargeException",
+          "documentation": "<p>The request failed because the payload for the body of the request is too large (RequestEntityTooLargeException).</p>"
+        },
         {
           "shape": "ForbiddenException",
           "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
@@ -3617,7 +4751,7 @@
           "documentation": "<p>The request failed because too many requests were sent during a certain amount of time (TooManyRequestsException).</p>"
         }
       ],
-      "documentation": "<p>Updates an existing message template that you can use in messages that are sent through a push notification channel.</p>"
+      "documentation": "<p>Updates an Amazon Pinpoint configuration for a recommender model.</p>"
     },
     "UpdateSegment": {
       "name": "UpdateSegment",
@@ -3642,6 +4776,102 @@
           "shape": "InternalServerErrorException",
           "documentation": "<p>The request failed due to an unknown internal server error, exception, or failure (InternalServerErrorException).</p>"
         },
+        {
+          "shape": "PayloadTooLargeException",
+          "documentation": "<p>The request failed because the payload for the body of the request is too large (RequestEntityTooLargeException).</p>"
+        },
+        {
+          "shape": "ForbiddenException",
+          "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
+        },
+        {
+          "shape": "NotFoundException",
+          "documentation": "<p>The request failed because the specified resource was not found (NotFoundException).</p>"
+        },
+        {
+          "shape": "MethodNotAllowedException",
+          "documentation": "<p>The request failed because the method is not allowed for the specified resource (MethodNotAllowedException).</p>"
+        },
+        {
+          "shape": "TooManyRequestsException",
+          "documentation": "<p>The request failed because too many requests were sent during a certain amount of time (TooManyRequestsException).</p>"
+        }
+      ],
+      "documentation": "<p>Creates a new segment for an application or updates the configuration, dimension, and other settings for an existing segment that's associated with an application.</p>"
+    },
+    "UpdateSmsChannel": {
+      "name": "UpdateSmsChannel",
+      "http": {
+        "method": "PUT",
+        "requestUri": "/v1/apps/{application-id}/channels/sms",
+        "responseCode": 200
+      },
+      "input": {
+        "shape": "UpdateSmsChannelRequest"
+      },
+      "output": {
+        "shape": "UpdateSmsChannelResponse",
+        "documentation": "<p>The request succeeded.</p>"
+      },
+      "errors": [
+        {
+          "shape": "BadRequestException",
+          "documentation": "<p>The request contains a syntax error (BadRequestException).</p>"
+        },
+        {
+          "shape": "InternalServerErrorException",
+          "documentation": "<p>The request failed due to an unknown internal server error, exception, or failure (InternalServerErrorException).</p>"
+        },
+        {
+          "shape": "PayloadTooLargeException",
+          "documentation": "<p>The request failed because the payload for the body of the request is too large (RequestEntityTooLargeException).</p>"
+        },
+        {
+          "shape": "ForbiddenException",
+          "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
+        },
+        {
+          "shape": "NotFoundException",
+          "documentation": "<p>The request failed because the specified resource was not found (NotFoundException).</p>"
+        },
+        {
+          "shape": "MethodNotAllowedException",
+          "documentation": "<p>The request failed because the method is not allowed for the specified resource (MethodNotAllowedException).</p>"
+        },
+        {
+          "shape": "TooManyRequestsException",
+          "documentation": "<p>The request failed because too many requests were sent during a certain amount of time (TooManyRequestsException).</p>"
+        }
+      ],
+      "documentation": "<p>Enables the SMS channel for an application or updates the status and settings of the SMS channel for an application.</p>"
+    },
+    "UpdateSmsTemplate": {
+      "name": "UpdateSmsTemplate",
+      "http": {
+        "method": "PUT",
+        "requestUri": "/v1/templates/{template-name}/sms",
+        "responseCode": 202
+      },
+      "input": {
+        "shape": "UpdateSmsTemplateRequest"
+      },
+      "output": {
+        "shape": "UpdateSmsTemplateResponse",
+        "documentation": "<p>The request was accepted for processing. Processing may not be complete.</p>"
+      },
+      "errors": [
+        {
+          "shape": "BadRequestException",
+          "documentation": "<p>The request contains a syntax error (BadRequestException).</p>"
+        },
+        {
+          "shape": "InternalServerErrorException",
+          "documentation": "<p>The request failed due to an unknown internal server error, exception, or failure (InternalServerErrorException).</p>"
+        },
+        {
+          "shape": "PayloadTooLargeException",
+          "documentation": "<p>The request failed because the payload for the body of the request is too large (RequestEntityTooLargeException).</p>"
+        },
         {
           "shape": "ForbiddenException",
           "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
@@ -3659,20 +4889,20 @@
           "documentation": "<p>The request failed because too many requests were sent during a certain amount of time (TooManyRequestsException).</p>"
         }
       ],
-      "documentation": "<p>Creates a new segment for an application or updates the configuration, dimension, and other settings for an existing segment that's associated with an application.</p>"
+      "documentation": "<p>Updates an existing message template for messages that are sent through the SMS channel.</p>"
     },
-    "UpdateSmsChannel": {
-      "name": "UpdateSmsChannel",
+    "UpdateTemplateActiveVersion": {
+      "name": "UpdateTemplateActiveVersion",
       "http": {
         "method": "PUT",
-        "requestUri": "/v1/apps/{application-id}/channels/sms",
+        "requestUri": "/v1/templates/{template-name}/{template-type}/active-version",
         "responseCode": 200
       },
       "input": {
-        "shape": "UpdateSmsChannelRequest"
+        "shape": "UpdateTemplateActiveVersionRequest"
       },
       "output": {
-        "shape": "UpdateSmsChannelResponse",
+        "shape": "UpdateTemplateActiveVersionResponse",
         "documentation": "<p>The request succeeded.</p>"
       },
       "errors": [
@@ -3684,6 +4914,10 @@
           "shape": "InternalServerErrorException",
           "documentation": "<p>The request failed due to an unknown internal server error, exception, or failure (InternalServerErrorException).</p>"
         },
+        {
+          "shape": "PayloadTooLargeException",
+          "documentation": "<p>The request failed because the payload for the body of the request is too large (RequestEntityTooLargeException).</p>"
+        },
         {
           "shape": "ForbiddenException",
           "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
@@ -3701,21 +4935,21 @@
           "documentation": "<p>The request failed because too many requests were sent during a certain amount of time (TooManyRequestsException).</p>"
         }
       ],
-      "documentation": "<p>Enables the SMS channel for an application or updates the status and settings of the SMS channel for an application.</p>"
+      "documentation": "<p>Changes the status of a specific version of a message template to <i>active</i>.</p>"
     },
-    "UpdateSmsTemplate": {
-      "name": "UpdateSmsTemplate",
+    "UpdateVoiceChannel": {
+      "name": "UpdateVoiceChannel",
       "http": {
         "method": "PUT",
-        "requestUri": "/v1/templates/{template-name}/sms",
-        "responseCode": 202
+        "requestUri": "/v1/apps/{application-id}/channels/voice",
+        "responseCode": 200
       },
       "input": {
-        "shape": "UpdateSmsTemplateRequest"
+        "shape": "UpdateVoiceChannelRequest"
       },
       "output": {
-        "shape": "UpdateSmsTemplateResponse",
-        "documentation": "<p>The request was accepted for processing. Processing may not be complete.</p>"
+        "shape": "UpdateVoiceChannelResponse",
+        "documentation": "<p>The request succeeded.</p>"
       },
       "errors": [
         {
@@ -3726,6 +4960,10 @@
           "shape": "InternalServerErrorException",
           "documentation": "<p>The request failed due to an unknown internal server error, exception, or failure (InternalServerErrorException).</p>"
         },
+        {
+          "shape": "PayloadTooLargeException",
+          "documentation": "<p>The request failed because the payload for the body of the request is too large (RequestEntityTooLargeException).</p>"
+        },
         {
           "shape": "ForbiddenException",
           "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
@@ -3743,21 +4981,21 @@
           "documentation": "<p>The request failed because too many requests were sent during a certain amount of time (TooManyRequestsException).</p>"
         }
       ],
-      "documentation": "<p>Updates an existing message template that you can use in messages that are sent through the SMS channel.</p>"
+      "documentation": "<p>Enables the voice channel for an application or updates the status and settings of the voice channel for an application.</p>"
     },
-    "UpdateVoiceChannel": {
-      "name": "UpdateVoiceChannel",
+    "UpdateVoiceTemplate": {
+      "name": "UpdateVoiceTemplate",
       "http": {
         "method": "PUT",
-        "requestUri": "/v1/apps/{application-id}/channels/voice",
-        "responseCode": 200
+        "requestUri": "/v1/templates/{template-name}/voice",
+        "responseCode": 202
       },
       "input": {
-        "shape": "UpdateVoiceChannelRequest"
+        "shape": "UpdateVoiceTemplateRequest"
       },
       "output": {
-        "shape": "UpdateVoiceChannelResponse",
-        "documentation": "<p>The request succeeded.</p>"
+        "shape": "UpdateVoiceTemplateResponse",
+        "documentation": "<p>The request was accepted for processing. Processing may not be complete.</p>"
       },
       "errors": [
         {
@@ -3768,6 +5006,10 @@
           "shape": "InternalServerErrorException",
           "documentation": "<p>The request failed due to an unknown internal server error, exception, or failure (InternalServerErrorException).</p>"
         },
+        {
+          "shape": "PayloadTooLargeException",
+          "documentation": "<p>The request failed because the payload for the body of the request is too large (RequestEntityTooLargeException).</p>"
+        },
         {
           "shape": "ForbiddenException",
           "documentation": "<p>The request was denied because access to the specified resource is forbidden (ForbiddenException).</p>"
@@ -3785,7 +5027,7 @@
           "documentation": "<p>The request failed because too many requests were sent during a certain amount of time (TooManyRequestsException).</p>"
         }
       ],
-      "documentation": "<p>Enables the voice channel for an application or updates the status and settings of the voice channel for an application.</p>"
+      "documentation": "<p>Updates an existing message template for messages that are sent through the voice channel.</p>"
     }
   },
   "shapes": {
@@ -3901,7 +5143,7 @@
         },
         "RawContent": {
           "shape": "__string",
-          "documentation": "<p>The raw, JSON-formatted string to use as the payload for the notification message. This value overrides the message.</p>"
+          "documentation": "<p>The raw, JSON-formatted string to use as the payload for the notification message. If specified, this value overrides all other content for the message.</p>"
         },
         "SilentPush": {
           "shape": "__boolean",
@@ -4028,6 +5270,10 @@
     "APNSMessage": {
       "type": "structure",
       "members": {
+        "APNSPushType": {
+          "shape": "__string",
+          "documentation": "<p>The type of push notification to send. Valid values are:</p> <ul><li><p>alert - For a standard notification that's displayed on recipients' devices and prompts a recipient to interact with the notification.</p></li> <li><p>background - For a silent notification that delivers content in the background and isn't displayed on recipients' devices.</p></li> <li><p>complication - For a notification that contains update information for an app’s complication timeline.</p></li> <li><p>fileprovider - For a notification that signals changes to a File Provider extension.</p></li> <li><p>mdm - For a notification that tells managed devices to contact the MDM server.</p></li> <li><p>voip - For a notification that provides information about an incoming VoIP call.</p></li></ul> <p>Amazon Pinpoint specifies this value in the apns-push-type request header when it sends the notification message to APNs. If you don't specify a value for this property, Amazon Pinpoint sets the value to alert or background automatically, based on the value that you specify for the SilentPush or RawContent property of the message.</p> <p>For more information about the apns-push-type request header, see <a href=\"https://developer.apple.com/documentation/usernotifications/setting_up_a_remote_notification_server/sending_notification_requests_to_apns\">Sending Notification Requests to APNs</a> on the Apple Developer website.</p>"
+        },
         "Action": {
           "shape": "Action",
           "documentation": "<p>The action to occur if the recipient taps the push notification. Valid values are:</p> <ul><li><p>OPEN_APP - Your app opens or it becomes the foreground app if it was sent to the background. This is the default action.</p></li> <li><p>DEEP_LINK - Your app opens and displays a designated user interface in the app. This setting uses the deep-linking features of the iOS platform.</p></li> <li><p>URL - The default mobile browser on the recipient's device opens and loads the web page at a URL that you specify.</p></li></ul>"
@@ -4058,7 +5304,7 @@
         },
         "PreferredAuthenticationMethod": {
           "shape": "__string",
-          "documentation": "<p>The authentication method that you want Amazon Pinpoint to use when authenticating with Apple Push Notification service (APNs), CERTIFICATE or TOKEN.</p>"
+          "documentation": "<p>The authentication method that you want Amazon Pinpoint to use when authenticating with APNs, CERTIFICATE or TOKEN.</p>"
         },
         "Priority": {
           "shape": "__string",
@@ -4066,7 +5312,7 @@
         },
         "RawContent": {
           "shape": "__string",
-          "documentation": "<p>The raw, JSON-formatted string to use as the payload for the notification message. This value overrides the message.</p> <note><p>If you specify the raw content of an APNs push notification, the message payload has to include the content-available key. The value of the content-available key has to be an integer, and can only be 0 or 1. If you're sending a standard notification, set the value of content-available to 0. If you're sending a silent (background) notification, set the value of content-available to 1. Additionally, silent notification payloads can't include the alert, badge, or sound keys. For more information, see <a href=\"https://developer.apple.com/documentation/usernotifications/setting_up_a_remote_notification_server/generating_a_remote_notification\">Generating a Remote Notification</a> and <a href=\"https://developer.apple.com/documentation/usernotifications/setting_up_a_remote_notification_server/pushing_background_updates_to_your_app\">Pushing Background Updates to Your App</a> on the Apple Developer website.</p></note>"
+          "documentation": "<p>The raw, JSON-formatted string to use as the payload for the notification message. If specified, this value overrides all other content for the message.</p> <note><p>If you specify the raw content of an APNs push notification, the message payload has to include the content-available key. The value of the content-available key has to be an integer, and can only be 0 or 1. If you're sending a standard notification, set the value of content-available to 0. If you're sending a silent (background) notification, set the value of content-available to 1. Additionally, silent notification payloads can't include the alert, badge, or sound keys. For more information, see <a href=\"https://developer.apple.com/documentation/usernotifications/setting_up_a_remote_notification_server/generating_a_remote_notification\">Generating a Remote Notification</a> and <a href=\"https://developer.apple.com/documentation/usernotifications/setting_up_a_remote_notification_server/pushing_background_updates_to_your_app\">Pushing Background Updates to Your App</a> on the Apple Developer website.</p></note>"
         },
         "SilentPush": {
           "shape": "__boolean",
@@ -4114,6 +5360,10 @@
           "shape": "__string",
           "documentation": "<p>The URL of an image or video to display in push notifications that are based on the message template.</p>"
         },
+        "RawContent": {
+          "shape": "__string",
+          "documentation": "<p>The raw, JSON-formatted string to use as the payload for push notifications that are based on the message template. If specified, this value overrides all other content for the message template.</p>"
+        },
         "Sound": {
           "shape": "__string",
           "documentation": "<p>The key for the sound to play when the recipient receives a push notification that's based on the message template. The value for this key is the name of a sound file in your app's main bundle or the Library/Sounds folder in your app's data container. If the sound file can't be found or you specify default for the value, the system plays the default alert sound.</p>"
@@ -4127,7 +5377,7 @@
           "documentation": "<p>The URL to open in the recipient's default mobile browser, if a recipient taps a push notification that's based on the message template and the value of the Action property is URL.</p>"
         }
       },
-      "documentation": "<p>Specifies the content and settings for a message template that can be used in push notifications that are sent through the APNs (Apple Push Notification service) channel.</p>"
+      "documentation": "<p>Specifies channel-specific content and settings for a message template that can be used in push notifications that are sent through the APNs (Apple Push Notification service) channel.</p>"
     },
     "APNSSandboxChannelRequest": {
       "type": "structure",
@@ -4439,6 +5689,40 @@
         "Item"
       ]
     },
+    "Activity": {
+      "type": "structure",
+      "members": {
+        "ConditionalSplit": {
+          "shape": "ConditionalSplitActivity",
+          "documentation": "<p>The settings for a yes/no split activity. This type of activity sends participants down one of two paths in a journey, based on conditions that you specify.</p>"
+        },
+        "Description": {
+          "shape": "__string",
+          "documentation": "<p>The custom description of the activity.</p>"
+        },
+        "EMAIL": {
+          "shape": "EmailMessageActivity",
+          "documentation": "<p>The settings for an email activity. This type of activity sends an email message to participants.</p>"
+        },
+        "Holdout": {
+          "shape": "HoldoutActivity",
+          "documentation": "<p>The settings for a holdout activity. This type of activity stops a journey for a specified percentage of participants.</p>"
+        },
+        "MultiCondition": {
+          "shape": "MultiConditionalSplitActivity",
+          "documentation": "<p>The settings for a multivariate split activity. This type of activity sends participants down one of as many as five paths (including a default <i>Else</i> path) in a journey, based on conditions that you specify.</p>"
+        },
+        "RandomSplit": {
+          "shape": "RandomSplitActivity",
+          "documentation": "<p>The settings for a random split activity. This type of activity randomly sends specified percentages of participants down one of as many as five paths in a journey, based on conditions that you specify.</p>"
+        },
+        "Wait": {
+          "shape": "WaitActivity",
+          "documentation": "<p>The settings for a wait activity. This type of activity waits for a certain amount of time or until a specific date and time before moving participants to the next activity in a journey.</p>"
+        }
+      },
+      "documentation": "<p>Specifies the configuration and other settings for an activity in a journey.</p>"
+    },
     "ActivityResponse": {
       "type": "structure",
       "members": {
@@ -4472,7 +5756,7 @@
         },
         "State": {
           "shape": "__string",
-          "documentation": "<p>The state of the activity. Possible values are: PENDING, INITIALIZING, RUNNING, PAUSED, CANCELLED, and COMPLETED.</p>"
+          "documentation": "<p>The current status of the activity. Possible values are: PENDING, INITIALIZING, RUNNING, PAUSED, CANCELLED, and COMPLETED.</p>"
         },
         "SuccessfulEndpointCount": {
           "shape": "__integer",
@@ -4515,15 +5799,15 @@
         },
         "Context": {
           "shape": "MapOf__string",
-          "documentation": "<p>An object that maps custom attributes to attributes for the address and is attached to the message. For a push notification, this payload is added to the data.pinpoint object. For an email or text message, this payload is added to email/SMS delivery receipt event attributes.</p>"
+          "documentation": "<p>An object that maps custom attributes to attributes for the address and is attached to the message. Attribute names are case sensitive.</p> <p>For a push notification, this payload is added to the data.pinpoint object. For an email or text message, this payload is added to email/SMS delivery receipt event attributes.</p>"
         },
         "RawContent": {
           "shape": "__string",
-          "documentation": "<p>The raw, JSON-formatted string to use as the payload for the notification message. This value overrides the message.</p>"
+          "documentation": "<p>The raw, JSON-formatted string to use as the payload for the message. If specified, this value overrides all other values for the message.</p>"
         },
         "Substitutions": {
           "shape": "MapOfListOf__string",
-          "documentation": "<p>An object that maps variable values for the message. Amazon Pinpoint merges these values with the variable values specified by properties of the DefaultMessage object. The substitutions in this map take precedence over all other substitutions.</p>"
+          "documentation": "<p>A map of the message variables to merge with the variables specified by properties of the DefaultMessage object. The variables specified in this map take precedence over all other variables.</p>"
         },
         "TitleOverride": {
           "shape": "__string",
@@ -4551,6 +5835,10 @@
           "shape": "__string",
           "documentation": "<p>The URL of an image to display in a push notification that's based on the message template.</p>"
         },
+        "RawContent": {
+          "shape": "__string",
+          "documentation": "<p>The raw, JSON-formatted string to use as the payload for a push notification that's based on the message template. If specified, this value overrides all other content for the message template.</p>"
+        },
         "SmallImageIconUrl": {
           "shape": "__string",
           "documentation": "<p>The URL of the small icon image to display in the status bar and the content view of a push notification that's based on the message template.</p>"
@@ -4565,10 +5853,10 @@
         },
         "Url": {
           "shape": "__string",
-          "documentation": "<p>The URL to open in a recipient's default mobile browser, if a recipient taps a a push notification that's based on the message template and the value of the Action property is URL.</p>"
+          "documentation": "<p>The URL to open in a recipient's default mobile browser, if a recipient taps a push notification that's based on the message template and the value of the Action property is URL.</p>"
         }
       },
-      "documentation": "<p>Specifies the content and settings for a message template can be used in push notifications that are sent through the ADM (Amazon Device Messaging), GCM (Firebase Cloud Messaging, formerly Google Cloud Messaging), or Baidu (Baidu Cloud Push) channel.</p>"
+      "documentation": "<p>Specifies channel-specific content and settings for a message template that can be used in push notifications that are sent through the ADM (Amazon Device Messaging), Baidu (Baidu Cloud Push), or GCM (Firebase Cloud Messaging, formerly Google Cloud Messaging) channel.</p>"
     },
     "ApplicationDateRangeKpiResponse": {
       "type": "structure",
@@ -4583,7 +5871,7 @@
         },
         "KpiName": {
           "shape": "__string",
-          "documentation": "<p>The name of the metric, also referred to as a <i>key performance indicator (KPI)</i>, that the data was retrieved for. This value describes the associated metric and consists of two or more terms, which are comprised of lowercase alphanumeric characters, separated by a hyphen. For a list of valid values, see the <a href=\"https://docs.aws.amazon.com/pinpoint/latest/developerguide/welcome.html\">Amazon Pinpoint Developer Guide</a>.</p>"
+          "documentation": "<p>The name of the metric, also referred to as a <i>key performance indicator (KPI)</i>, that the data was retrieved for. This value describes the associated metric and consists of two or more terms, which are comprised of lowercase alphanumeric characters, separated by a hyphen. For a list of possible values, see the <a href=\"https://docs.aws.amazon.com/pinpoint/latest/developerguide/welcome.html\">Amazon Pinpoint Developer Guide</a>.</p>"
         },
         "KpiResult": {
           "shape": "BaseKpiResult",
@@ -4591,7 +5879,7 @@
         },
         "NextToken": {
           "shape": "__string",
-          "documentation": "<p>The string to use in a subsequent request to get the next page of results in a paginated response. This value is null for the Application Metrics resource. The Application Metrics resource returns all results in a single page.</p>"
+          "documentation": "<p>The string to use in a subsequent request to get the next page of results in a paginated response. This value is null for the Application Metrics resource because the resource returns all results in a single page.</p>"
         },
         "StartTime": {
           "shape": "__timestampIso8601",
@@ -4656,7 +5944,7 @@
         },
         "QuietTime": {
           "shape": "QuietTime",
-          "documentation": "<p>The default quiet time for campaigns in the application. Quiet time is a specific time range when campaigns don't send messages to endpoints, if all the following conditions are met:</p> <ul><li><p>The EndpointDemographic.Timezone property of the endpoint is set to a valid value.</p></li> <li><p>The current time in the endpoint's time zone is later than or equal to the time specified by the QuietTime.Start property for the application (or a campaign that has custom quiet time settings).</p></li> <li><p>The current time in the endpoint's time zone is earlier than or equal to the time specified by the QuietTime.End property for the application (or a campaign that has custom quiet time settings).</p></li></ul> <p>If any of the preceding conditions isn't met, the endpoint will receive messages from a campaign, even if quiet time is enabled.</p>"
+          "documentation": "<p>The default quiet time for campaigns and journeys in the application. Quiet time is a specific time range when messages aren't sent to endpoints, if all the following conditions are met:</p> <ul><li><p>The EndpointDemographic.Timezone property of the endpoint is set to a valid value.</p></li> <li><p>The current time in the endpoint's time zone is later than or equal to the time specified by the QuietTime.Start property for the application (or a campaign or journey that has custom quiet time settings).</p></li> <li><p>The current time in the endpoint's time zone is earlier than or equal to the time specified by the QuietTime.End property for the application (or a campaign or journey that has custom quiet time settings).</p></li></ul> <p>If any of the preceding conditions isn't met, the endpoint will receive messages from a campaign or journey, even if quiet time is enabled.</p>"
         }
       },
       "documentation": "<p>Provides information about an application, including the default settings for an application.</p>",
@@ -4711,7 +5999,7 @@
         },
         "AttributeType": {
           "shape": "__string",
-          "documentation": "<p>The type of attribute or attributes that were removed from the endpoints. Valid values are:</p> <ul><li><p>endpoint-custom-attributes - Custom attributes that describe endpoints.</p></li> <li><p>endpoint-custom-metrics - Custom metrics that your app reports to Amazon Pinpoint for endpoints.</p></li> <li><p>endpoint-user-attributes - Custom attributes that describe users.</p></li></ul>"
+          "documentation": "<p>The type of attribute or attributes that were removed from the endpoints. Valid values are:</p> <ul><li><p>endpoint-custom-attributes - Custom attributes that describe endpoints.</p></li> <li><p>endpoint-metric-attributes - Custom metrics that your app reports to Amazon Pinpoint for endpoints.</p></li> <li><p>endpoint-user-attributes - Custom attributes that describe users.</p></li></ul>"
         },
         "Attributes": {
           "shape": "ListOf__string",
@@ -4847,7 +6135,7 @@
         },
         "RawContent": {
           "shape": "__string",
-          "documentation": "<p>The raw, JSON-formatted string to use as the payload for the notification message. This value overrides the message.</p>"
+          "documentation": "<p>The raw, JSON-formatted string to use as the payload for the notification message. If specified, this value overrides all other content for the message.</p>"
         },
         "SilentPush": {
           "shape": "__boolean",
@@ -4885,10 +6173,10 @@
       "members": {
         "Rows": {
           "shape": "ListOfResultRow",
-          "documentation": "<p>An array of objects that provides the results of a query that retrieved the data for a standard metric that applies to an application or campaign.</p>"
+          "documentation": "<p>An array of objects that provides the results of a query that retrieved the data for a standard metric that applies to an application, campaign, or journey.</p>"
         }
       },
-      "documentation": "<p>Provides the results of a query that retrieved the data for a standard metric that applies to an application or campaign.</p>",
+      "documentation": "<p>Provides the results of a query that retrieved the data for a standard metric that applies to an application, campaign, or journey.</p>",
       "required": [
         "Rows"
       ]
@@ -4910,7 +6198,7 @@
         },
         "KpiName": {
           "shape": "__string",
-          "documentation": "<p>The name of the metric, also referred to as a <i>key performance indicator (KPI)</i>, that the data was retrieved for. This value describes the associated metric and consists of two or more terms, which are comprised of lowercase alphanumeric characters, separated by a hyphen. For a list of valid values, see the <a href=\"https://docs.aws.amazon.com/pinpoint/latest/developerguide/welcome.html\">Amazon Pinpoint Developer Guide</a>.</p>"
+          "documentation": "<p>The name of the metric, also referred to as a <i>key performance indicator (KPI)</i>, that the data was retrieved for. This value describes the associated metric and consists of two or more terms, which are comprised of lowercase alphanumeric characters, separated by a hyphen. For a list of possible values, see the <a href=\"https://docs.aws.amazon.com/pinpoint/latest/developerguide/welcome.html\">Amazon Pinpoint Developer Guide</a>.</p>"
         },
         "KpiResult": {
           "shape": "BaseKpiResult",
@@ -4918,7 +6206,7 @@
         },
         "NextToken": {
           "shape": "__string",
-          "documentation": "<p>The string to use in a subsequent request to get the next page of results in a paginated response. This value is null for the Campaign Metrics resource. The Campaign Metrics resource returns all results in a single page.</p>"
+          "documentation": "<p>The string to use in a subsequent request to get the next page of results in a paginated response. This value is null for the Campaign Metrics resource because the resource returns all results in a single page.</p>"
         },
         "StartTime": {
           "shape": "__timestampIso8601",
@@ -4940,7 +6228,7 @@
       "members": {
         "Body": {
           "shape": "__string",
-          "documentation": "<p>The body of the email for recipients whose email clients don't support HTML content.</p>"
+          "documentation": "<p>The body of the email for recipients whose email clients don't render HTML content.</p>"
         },
         "FromAddress": {
           "shape": "__string",
@@ -4948,17 +6236,14 @@
         },
         "HtmlBody": {
           "shape": "__string",
-          "documentation": "<p>The body of the email, in HTML format, for recipients whose email clients support HTML content.</p>"
+          "documentation": "<p>The body of the email, in HTML format, for recipients whose email clients render HTML content.</p>"
         },
         "Title": {
           "shape": "__string",
           "documentation": "<p>The subject line, or title, of the email.</p>"
         }
       },
-      "documentation": "<p>Specifies the content and \"From\" address for an email message that's sent to recipients of a campaign.</p>",
-      "required": [
-        "Title"
-      ]
+      "documentation": "<p>Specifies the content and \"From\" address for an email message that's sent to recipients of a campaign.</p>"
     },
     "CampaignEventFilter": {
       "type": "structure",
@@ -5035,7 +6320,7 @@
         },
         "CreationDate": {
           "shape": "__string",
-          "documentation": "<p>The date, ISO 8601 format, when the campaign was created.</p>"
+          "documentation": "<p>The date, in ISO 8601 format, when the campaign was created.</p>"
         },
         "DefaultState": {
           "shape": "CampaignState",
@@ -5099,7 +6384,8 @@
           "documentation": "<p>A string-to-string map of key-value pairs that identifies the tags that are associated with the campaign. Each tag consists of a required tag key and an associated tag value.</p>"
         },
         "TemplateConfiguration": {
-          "shape": "TemplateConfiguration"
+          "shape": "TemplateConfiguration",
+          "documentation": "<p>The message template that’s used for the campaign.</p>"
         },
         "TreatmentDescription": {
           "shape": "__string",
@@ -5148,7 +6434,7 @@
       "members": {
         "CampaignStatus": {
           "shape": "CampaignStatus",
-          "documentation": "<p>The status of the campaign, or the status of a treatment that belongs to an A/B test campaign. If a campaign uses A/B testing, the campaign has a status of COMPLETED only when all campaign treatments have a status of COMPLETED.</p>"
+          "documentation": "<p>The current status of the campaign, or the current status of a treatment that belongs to an A/B test campaign. If a campaign uses A/B testing, the campaign has a status of COMPLETED only if all campaign treatments have a status of COMPLETED.</p>"
         }
       },
       "documentation": "<p>Provides information about the status of a campaign.</p>"
@@ -5252,6 +6538,42 @@
         "Channels"
       ]
     },
+    "Condition": {
+      "type": "structure",
+      "members": {
+        "Conditions": {
+          "shape": "ListOfSimpleCondition",
+          "documentation": "<p>The conditions to evaluate for the activity.</p>"
+        },
+        "Operator": {
+          "shape": "Operator",
+          "documentation": "<p>Specifies how to handle multiple conditions for the activity. For example, if you specify two conditions for an activity, whether both or only one of the conditions must be met for the activity to be performed.</p>"
+        }
+      },
+      "documentation": "<p>Specifies the conditions to evaluate for an activity in a journey, and how to evaluate those conditions.</p>"
+    },
+    "ConditionalSplitActivity": {
+      "type": "structure",
+      "members": {
+        "Condition": {
+          "shape": "Condition",
+          "documentation": "<p>The conditions that define the paths for the activity, and the relationship between the conditions.</p>"
+        },
+        "EvaluationWaitTime": {
+          "shape": "WaitTime",
+          "documentation": "<p>The amount of time to wait before determining whether the conditions are met, or the date and time when Amazon Pinpoint determines whether the conditions are met.</p>"
+        },
+        "FalseActivity": {
+          "shape": "__string",
+          "documentation": "<p>The unique identifier for the activity to perform if the conditions aren't met.</p>"
+        },
+        "TrueActivity": {
+          "shape": "__string",
+          "documentation": "<p>The unique identifier for the activity to perform if the conditions are met.</p>"
+        }
+      },
+      "documentation": "<p>Specifies the settings for a yes/no split activity in a journey. This type of activity sends participants down one of two paths in a journey, based on conditions that you specify.</p>"
+    },
     "CreateAppRequest": {
       "type": "structure",
       "members": {
@@ -5329,8 +6651,7 @@
       "type": "structure",
       "members": {
         "EmailTemplateRequest": {
-          "shape": "EmailTemplateRequest",
-          "documentation": "<p>Creates a new message template that you can use in messages that are sent through the email channel.</p>"
+          "shape": "EmailTemplateRequest"
         },
         "TemplateName": {
           "shape": "__string",
@@ -5419,12 +6740,42 @@
       ],
       "payload": "ImportJobResponse"
     },
+    "CreateJourneyRequest": {
+      "type": "structure",
+      "members": {
+        "ApplicationId": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "application-id",
+          "documentation": "<p>The unique identifier for the application. This identifier is displayed as the <b>Project ID</b> on the Amazon Pinpoint console.</p>"
+        },
+        "WriteJourneyRequest": {
+          "shape": "WriteJourneyRequest"
+        }
+      },
+      "required": [
+        "ApplicationId",
+        "WriteJourneyRequest"
+      ],
+      "payload": "WriteJourneyRequest"
+    },
+    "CreateJourneyResponse": {
+      "type": "structure",
+      "members": {
+        "JourneyResponse": {
+          "shape": "JourneyResponse"
+        }
+      },
+      "required": [
+        "JourneyResponse"
+      ],
+      "payload": "JourneyResponse"
+    },
     "CreatePushTemplateRequest": {
       "type": "structure",
       "members": {
         "PushNotificationTemplateRequest": {
-          "shape": "PushNotificationTemplateRequest",
-          "documentation": "<p>Creates a message template that you can use in messages that are sent through a push notification channel.</p>"
+          "shape": "PushNotificationTemplateRequest"
         },
         "TemplateName": {
           "shape": "__string",
@@ -5451,6 +6802,76 @@
       ],
       "payload": "CreateTemplateMessageBody"
     },
+    "CreateRecommenderConfiguration": {
+      "type": "structure",
+      "members": {
+        "Attributes": {
+          "shape": "MapOf__string",
+          "documentation": "<p>A map of key-value pairs that defines 1-10 custom endpoint or user attributes, depending on the value for the RecommenderUserIdType property. Each of these attributes temporarily stores a recommended item that's retrieved from the recommender model and sent to an AWS Lambda function for additional processing. Each attribute can be used as a message variable in a message template.</p> <p>In the map, the key is the name of a custom attribute and the value is a custom display name for that attribute. The display name appears in the <b>Attribute finder</b> pane of the template editor on the Amazon Pinpoint console. The following restrictions apply to these names:</p> <ul><li><p>An attribute name must start with a letter or number and it can contain up to 50 characters. The characters can be letters, numbers, underscores (_), or hyphens (-). Attribute names are case sensitive and must be unique.</p></li> <li><p>An attribute display name must start with a letter or number and it can contain up to 25 characters. The characters can be letters, numbers, spaces, underscores (_), or hyphens (-).</p></li></ul> <p>This object is required if the configuration invokes an AWS Lambda function (LambdaFunctionArn) to process recommendation data. Otherwise, don't include this object in your request.</p>"
+        },
+        "Description": {
+          "shape": "__string",
+          "documentation": "<p>A custom description of the configuration for the recommender model. The description can contain up to 128 characters.</p>"
+        },
+        "Name": {
+          "shape": "__string",
+          "documentation": "<p>A custom name of the configuration for the recommender model. The name must start with a letter or number and it can contain up to 128 characters. The characters can be letters, numbers, spaces, underscores (_), or hyphens (-).</p>"
+        },
+        "RecommendationProviderIdType": {
+          "shape": "__string",
+          "documentation": "<p>The type of Amazon Pinpoint ID to associate with unique user IDs in the recommender model. This value enables the model to use attribute and event data that’s specific to a particular endpoint or user in an Amazon Pinpoint application. Valid values are:</p> <ul><li><p>PINPOINT_ENDPOINT_ID - Associate each user in the model with a particular endpoint in Amazon Pinpoint. The data is correlated based on endpoint IDs in Amazon Pinpoint. This is the default value.</p></li> <li><p>PINPOINT_USER_ID - Associate each user in the model with a particular user and endpoint in Amazon Pinpoint. The data is correlated based on user IDs in Amazon Pinpoint. If you specify this value, an endpoint definition in Amazon Pinpoint has to specify a both a user ID (UserId) and an endpoint ID. Otherwise, messages won’t be sent to the user's endpoint.</p></li></ul>"
+        },
+        "RecommendationProviderRoleArn": {
+          "shape": "__string",
+          "documentation": "<p>The Amazon Resource Name (ARN) of the AWS Identity and Access Management (IAM) role that authorizes Amazon Pinpoint to retrieve recommendation data from the recommender model.</p>"
+        },
+        "RecommendationProviderUri": {
+          "shape": "__string",
+          "documentation": "<p>The Amazon Resource Name (ARN) of the recommender model to retrieve recommendation data from. This value must match the ARN of an Amazon Personalize campaign.</p>"
+        },
+        "RecommendationTransformerUri": {
+          "shape": "__string",
+          "documentation": "<p>The name or Amazon Resource Name (ARN) of the AWS Lambda function to invoke for additional processing of recommendation data that's retrieved from the recommender model.</p>"
+        },
+        "RecommendationsDisplayName": {
+          "shape": "__string",
+          "documentation": "<p>A custom display name for the standard endpoint or user attribute (RecommendationItems) that temporarily stores a recommended item for each endpoint or user, depending on the value for the RecommenderUserIdType property. This value is required if the configuration doesn't invoke an AWS Lambda function (LambdaFunctionArn) to perform additional processing of recommendation data.</p> <p>This name appears in the <b>Attribute finder</b> pane of the template editor on the Amazon Pinpoint console. The name can contain up to 25 characters. The characters can be letters, numbers, spaces, underscores (_), or hyphens (-). These restrictions don't apply to attribute values.</p>"
+        },
+        "RecommendationsPerMessage": {
+          "shape": "__integer",
+          "documentation": "<p>The number of recommended items to retrieve from the model for each endpoint or user, depending on the value for the RecommenderUserIdType property. This number determines how many recommended attributes are available for use as message variables in message templates. The minimum value is 1. The maximum value is 5. The default value is 5.</p> <p>To use multiple recommended items and custom attributes with message variables, you have to use an AWS Lambda function (LambdaFunctionArn) to perform additional processing of recommendation data.</p>"
+        }
+      },
+      "documentation": "<p>Specifies Amazon Pinpoint configuration settings for retrieving and processing recommendation data from a recommender model.</p>",
+      "required": [
+        "RecommendationProviderUri",
+        "RecommendationProviderRoleArn"
+      ]
+    },
+    "CreateRecommenderConfigurationRequest": {
+      "type": "structure",
+      "members": {
+        "CreateRecommenderConfiguration": {
+          "shape": "CreateRecommenderConfiguration"
+        }
+      },
+      "required": [
+        "CreateRecommenderConfiguration"
+      ],
+      "payload": "CreateRecommenderConfiguration"
+    },
+    "CreateRecommenderConfigurationResponse": {
+      "type": "structure",
+      "members": {
+        "RecommenderConfigurationResponse": {
+          "shape": "RecommenderConfigurationResponse"
+        }
+      },
+      "required": [
+        "RecommenderConfigurationResponse"
+      ],
+      "payload": "RecommenderConfigurationResponse"
+    },
     "CreateSegmentRequest": {
       "type": "structure",
       "members": {
@@ -5486,8 +6907,7 @@
       "type": "structure",
       "members": {
         "SMSTemplateRequest": {
-          "shape": "SMSTemplateRequest",
-          "documentation": "<p>Creates a message template that you can use in messages that are sent through the SMS channel.</p>"
+          "shape": "SMSTemplateRequest"
         },
         "TemplateName": {
           "shape": "__string",
@@ -5519,32 +6939,63 @@
       "members": {
         "Arn": {
           "shape": "__string",
-          "documentation": "<p>The Amazon Resource Name (ARN) of the message template.</p>"
+          "documentation": "<p>The Amazon Resource Name (ARN) of the message template that was created.</p>"
         },
         "Message": {
           "shape": "__string",
-          "documentation": "<p>The message that's returned from the API.</p>"
+          "documentation": "<p>The message that's returned from the API for the request to create the message template.</p>"
         },
         "RequestID": {
           "shape": "__string",
-          "documentation": "<p>The unique identifier for the request or response.</p>"
+          "documentation": "<p>The unique identifier for the request to create the message template.</p>"
         }
       },
-      "documentation": "<p>Provides information about an API request or response.</p>"
+      "documentation": "<p>Provides information about a request to create a message template.</p>"
+    },
+    "CreateVoiceTemplateRequest": {
+      "type": "structure",
+      "members": {
+        "TemplateName": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "template-name",
+          "documentation": "<p>The name of the message template. A template name must start with an alphanumeric character and can contain a maximum of 128 characters. The characters can be alphanumeric characters, underscores (_), or hyphens (-). Template names are case sensitive.</p>"
+        },
+        "VoiceTemplateRequest": {
+          "shape": "VoiceTemplateRequest"
+        }
+      },
+      "required": [
+        "TemplateName",
+        "VoiceTemplateRequest"
+      ],
+      "payload": "VoiceTemplateRequest"
+    },
+    "CreateVoiceTemplateResponse": {
+      "type": "structure",
+      "members": {
+        "CreateTemplateMessageBody": {
+          "shape": "CreateTemplateMessageBody"
+        }
+      },
+      "required": [
+        "CreateTemplateMessageBody"
+      ],
+      "payload": "CreateTemplateMessageBody"
     },
     "DefaultMessage": {
       "type": "structure",
       "members": {
         "Body": {
           "shape": "__string",
-          "documentation": "<p>The default message body of the push notification, email, or SMS message.</p>"
+          "documentation": "<p>The default body of the message.</p>"
         },
         "Substitutions": {
           "shape": "MapOfListOf__string",
-          "documentation": "<p>The default message variables to use in the push notification, email, or SMS message. You can override these default variables with individual address variables.</p>"
+          "documentation": "<p>The default message variables to use in the message. You can override these default variables with individual address variables.</p>"
         }
       },
-      "documentation": "<p>Specifies the default message to use for all channels.</p>"
+      "documentation": "<p>Specifies the default message for all channels.</p>"
     },
     "DefaultPushNotificationMessage": {
       "type": "structure",
@@ -5604,7 +7055,7 @@
           "documentation": "<p>The URL to open in a recipient's default mobile browser, if a recipient taps a push notification that's based on the message template and the value of the Action property is URL.</p>"
         }
       },
-      "documentation": "<p>Specifies the settings and content for the default message template that's used in messages that are sent through a push notification channel.</p>"
+      "documentation": "<p>Specifies the default settings and content for a message template that can be used in messages that are sent through a push notification channel.</p>"
     },
     "DeleteAdmChannelRequest": {
       "type": "structure",
@@ -5855,6 +7306,12 @@
           "location": "uri",
           "locationName": "template-name",
           "documentation": "<p>The name of the message template. A template name must start with an alphanumeric character and can contain a maximum of 128 characters. The characters can be alphanumeric characters, underscores (_), or hyphens (-). Template names are case sensitive.</p>"
+        },
+        "Version": {
+          "shape": "__string",
+          "location": "querystring",
+          "locationName": "version",
+          "documentation": "<p>The unique identifier for the version of the message template to update, retrieve information about, or delete. To retrieve identifiers and other information for all the versions of a template, use the <link  linkend=\"templates-template-name-template-type-versions\">Template Versions</link> resource.</p> <p>If specified, this value must match the identifier for an existing template version. If specified for an update operation, this value must match the identifier for the latest existing version of the template. This restriction helps ensure that race conditions don't occur.</p> <p>If you don't specify a value for this parameter, Amazon Pinpoint does the following:</p> <ul><li><p>For a get operation, retrieves information about the active version of the template.</p></li> <li><p>For an update operation, saves the updates to (overwrites) the latest existing version of the template, if the create-new-version parameter isn't used or is set to false.</p></li> <li><p>For a delete operation, deletes the template, including all versions of the template.</p></li></ul>"
         }
       },
       "required": [
@@ -5958,6 +7415,39 @@
       ],
       "payload": "GCMChannelResponse"
     },
+    "DeleteJourneyRequest": {
+      "type": "structure",
+      "members": {
+        "ApplicationId": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "application-id",
+          "documentation": "<p>The unique identifier for the application. This identifier is displayed as the <b>Project ID</b> on the Amazon Pinpoint console.</p>"
+        },
+        "JourneyId": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "journey-id",
+          "documentation": "<p>The unique identifier for the journey.</p>"
+        }
+      },
+      "required": [
+        "JourneyId",
+        "ApplicationId"
+      ]
+    },
+    "DeleteJourneyResponse": {
+      "type": "structure",
+      "members": {
+        "JourneyResponse": {
+          "shape": "JourneyResponse"
+        }
+      },
+      "required": [
+        "JourneyResponse"
+      ],
+      "payload": "JourneyResponse"
+    },
     "DeletePushTemplateRequest": {
       "type": "structure",
       "members": {
@@ -5966,6 +7456,12 @@
           "location": "uri",
           "locationName": "template-name",
           "documentation": "<p>The name of the message template. A template name must start with an alphanumeric character and can contain a maximum of 128 characters. The characters can be alphanumeric characters, underscores (_), or hyphens (-). Template names are case sensitive.</p>"
+        },
+        "Version": {
+          "shape": "__string",
+          "location": "querystring",
+          "locationName": "version",
+          "documentation": "<p>The unique identifier for the version of the message template to update, retrieve information about, or delete. To retrieve identifiers and other information for all the versions of a template, use the <link  linkend=\"templates-template-name-template-type-versions\">Template Versions</link> resource.</p> <p>If specified, this value must match the identifier for an existing template version. If specified for an update operation, this value must match the identifier for the latest existing version of the template. This restriction helps ensure that race conditions don't occur.</p> <p>If you don't specify a value for this parameter, Amazon Pinpoint does the following:</p> <ul><li><p>For a get operation, retrieves information about the active version of the template.</p></li> <li><p>For an update operation, saves the updates to (overwrites) the latest existing version of the template, if the create-new-version parameter isn't used or is set to false.</p></li> <li><p>For a delete operation, deletes the template, including all versions of the template.</p></li></ul>"
         }
       },
       "required": [
@@ -5984,6 +7480,32 @@
       ],
       "payload": "MessageBody"
     },
+    "DeleteRecommenderConfigurationRequest": {
+      "type": "structure",
+      "members": {
+        "RecommenderId": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "recommender-id",
+          "documentation": "<p>The unique identifier for the recommender model configuration. This identifier is displayed as the <b>Recommender ID</b> on the Amazon Pinpoint console.</p>"
+        }
+      },
+      "required": [
+        "RecommenderId"
+      ]
+    },
+    "DeleteRecommenderConfigurationResponse": {
+      "type": "structure",
+      "members": {
+        "RecommenderConfigurationResponse": {
+          "shape": "RecommenderConfigurationResponse"
+        }
+      },
+      "required": [
+        "RecommenderConfigurationResponse"
+      ],
+      "payload": "RecommenderConfigurationResponse"
+    },
     "DeleteSegmentRequest": {
       "type": "structure",
       "members": {
@@ -6051,6 +7573,12 @@
           "location": "uri",
           "locationName": "template-name",
           "documentation": "<p>The name of the message template. A template name must start with an alphanumeric character and can contain a maximum of 128 characters. The characters can be alphanumeric characters, underscores (_), or hyphens (-). Template names are case sensitive.</p>"
+        },
+        "Version": {
+          "shape": "__string",
+          "location": "querystring",
+          "locationName": "version",
+          "documentation": "<p>The unique identifier for the version of the message template to update, retrieve information about, or delete. To retrieve identifiers and other information for all the versions of a template, use the <link  linkend=\"templates-template-name-template-type-versions\">Template Versions</link> resource.</p> <p>If specified, this value must match the identifier for an existing template version. If specified for an update operation, this value must match the identifier for the latest existing version of the template. This restriction helps ensure that race conditions don't occur.</p> <p>If you don't specify a value for this parameter, Amazon Pinpoint does the following:</p> <ul><li><p>For a get operation, retrieves information about the active version of the template.</p></li> <li><p>For an update operation, saves the updates to (overwrites) the latest existing version of the template, if the create-new-version parameter isn't used or is set to false.</p></li> <li><p>For a delete operation, deletes the template, including all versions of the template.</p></li></ul>"
         }
       },
       "required": [
@@ -6105,28 +7633,60 @@
     "DeleteVoiceChannelRequest": {
       "type": "structure",
       "members": {
-        "ApplicationId": {
+        "ApplicationId": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "application-id",
+          "documentation": "<p>The unique identifier for the application. This identifier is displayed as the <b>Project ID</b> on the Amazon Pinpoint console.</p>"
+        }
+      },
+      "required": [
+        "ApplicationId"
+      ]
+    },
+    "DeleteVoiceChannelResponse": {
+      "type": "structure",
+      "members": {
+        "VoiceChannelResponse": {
+          "shape": "VoiceChannelResponse"
+        }
+      },
+      "required": [
+        "VoiceChannelResponse"
+      ],
+      "payload": "VoiceChannelResponse"
+    },
+    "DeleteVoiceTemplateRequest": {
+      "type": "structure",
+      "members": {
+        "TemplateName": {
           "shape": "__string",
           "location": "uri",
-          "locationName": "application-id",
-          "documentation": "<p>The unique identifier for the application. This identifier is displayed as the <b>Project ID</b> on the Amazon Pinpoint console.</p>"
+          "locationName": "template-name",
+          "documentation": "<p>The name of the message template. A template name must start with an alphanumeric character and can contain a maximum of 128 characters. The characters can be alphanumeric characters, underscores (_), or hyphens (-). Template names are case sensitive.</p>"
+        },
+        "Version": {
+          "shape": "__string",
+          "location": "querystring",
+          "locationName": "version",
+          "documentation": "<p>The unique identifier for the version of the message template to update, retrieve information about, or delete. To retrieve identifiers and other information for all the versions of a template, use the <link  linkend=\"templates-template-name-template-type-versions\">Template Versions</link> resource.</p> <p>If specified, this value must match the identifier for an existing template version. If specified for an update operation, this value must match the identifier for the latest existing version of the template. This restriction helps ensure that race conditions don't occur.</p> <p>If you don't specify a value for this parameter, Amazon Pinpoint does the following:</p> <ul><li><p>For a get operation, retrieves information about the active version of the template.</p></li> <li><p>For an update operation, saves the updates to (overwrites) the latest existing version of the template, if the create-new-version parameter isn't used or is set to false.</p></li> <li><p>For a delete operation, deletes the template, including all versions of the template.</p></li></ul>"
         }
       },
       "required": [
-        "ApplicationId"
+        "TemplateName"
       ]
     },
-    "DeleteVoiceChannelResponse": {
+    "DeleteVoiceTemplateResponse": {
       "type": "structure",
       "members": {
-        "VoiceChannelResponse": {
-          "shape": "VoiceChannelResponse"
+        "MessageBody": {
+          "shape": "MessageBody"
         }
       },
       "required": [
-        "VoiceChannelResponse"
+        "MessageBody"
       ],
-      "payload": "VoiceChannelResponse"
+      "payload": "MessageBody"
     },
     "DeliveryStatus": {
       "type": "string",
@@ -6164,7 +7724,7 @@
         },
         "DefaultMessage": {
           "shape": "DefaultMessage",
-          "documentation": "<p>The default message body for all channels.</p>"
+          "documentation": "<p>The default message for all channels.</p>"
         },
         "DefaultPushNotificationMessage": {
           "shape": "DefaultPushNotificationMessage",
@@ -6331,12 +7891,42 @@
       },
       "documentation": "<p>Specifies the default settings and content for a one-time email message that's sent directly to an endpoint.</p>"
     },
+    "EmailMessageActivity": {
+      "type": "structure",
+      "members": {
+        "MessageConfig": {
+          "shape": "JourneyEmailMessage",
+          "documentation": "<p>The \"From\" address to use for the message.</p>"
+        },
+        "NextActivity": {
+          "shape": "__string",
+          "documentation": "<p>The unique identifier for the next activity to perform, after the message is sent.</p>"
+        },
+        "TemplateName": {
+          "shape": "__string",
+          "documentation": "<p>The name of the email template to use for the message.</p>"
+        },
+        "TemplateVersion": {
+          "shape": "__string",
+          "documentation": "<p>The unique identifier for the version of the email template to use for the message. If specified, this value must match the identifier for an existing template version. To retrieve a list of versions and version identifiers for a template, use the <link  linkend=\"templates-template-name-template-type-versions\">Template Versions</link> resource.</p> <p>If you don't specify a value for this property, Amazon Pinpoint uses the <i>active version</i> of the template. The <i>active version</i> is typically the version of a template that's been most recently reviewed and approved for use, depending on your workflow. It isn't necessarily the latest version of a template.</p>"
+        }
+      },
+      "documentation": "<p>Specifies the settings for an email activity in a journey. This type of activity sends an email message to participants.</p>"
+    },
     "EmailTemplateRequest": {
       "type": "structure",
       "members": {
+        "DefaultSubstitutions": {
+          "shape": "__string",
+          "documentation": "<p>A JSON object that specifies the default values to use for message variables in the message template. This object is a set of key-value pairs. Each key defines a message variable in the template. The corresponding value defines the default value for that variable. When you create a message that's based on the template, you can override these defaults with message-specific and address-specific variables and values.</p>"
+        },
         "HtmlPart": {
           "shape": "__string",
-          "documentation": "<p>The message body, in HTML format, to use in email messages that are based on the message template. We recommend using HTML format for email clients that support HTML. You can include links, formatted text, and more in an HTML message.</p>"
+          "documentation": "<p>The message body, in HTML format, to use in email messages that are based on the message template. We recommend using HTML format for email clients that render HTML content. You can include links, formatted text, and more in an HTML message.</p>"
+        },
+        "RecommenderId": {
+          "shape": "__string",
+          "documentation": "<p>The unique identifier for the recommender model to use for the message template. Amazon Pinpoint uses this value to determine how to retrieve and process data from a recommender model when it sends messages that use the template, if the template contains message variables for recommendation data.</p>"
         },
         "Subject": {
           "shape": "__string",
@@ -6347,9 +7937,13 @@
           "locationName": "tags",
           "documentation": "<p>A string-to-string map of key-value pairs that defines the tags to associate with the message template. Each tag consists of a required tag key and an associated tag value.</p>"
         },
+        "TemplateDescription": {
+          "shape": "__string",
+          "documentation": "<p>A custom description of the message template.</p>"
+        },
         "TextPart": {
           "shape": "__string",
-          "documentation": "<p>The message body, in text format, to use in email messages that are based on the message template. We recommend using text format for email clients that don't support HTML and clients that are connected to high-latency networks, such as mobile devices.</p>"
+          "documentation": "<p>The message body, in plain text format, to use in email messages that are based on the message template. We recommend using plain text format for email clients that don't render HTML content and clients that are connected to high-latency networks, such as mobile devices.</p>"
         }
       },
       "documentation": "<p>Specifies the content and settings for a message template that can be used in messages that are sent through the email channel.</p>"
@@ -6363,7 +7957,11 @@
         },
         "CreationDate": {
           "shape": "__string",
-          "documentation": "<p>The date when the message template was created.</p>"
+          "documentation": "<p>The date, in ISO 8601 format, when the message template was created.</p>"
+        },
+        "DefaultSubstitutions": {
+          "shape": "__string",
+          "documentation": "<p>The JSON object that specifies the default values that are used for message variables in the message template. This object is a set of key-value pairs. Each key defines a message variable in the template. The corresponding value defines the default value for that variable.</p>"
         },
         "HtmlPart": {
           "shape": "__string",
@@ -6371,7 +7969,11 @@
         },
         "LastModifiedDate": {
           "shape": "__string",
-          "documentation": "<p>The date when the message template was last modified.</p>"
+          "documentation": "<p>The date, in ISO 8601 format, when the message template was last modified.</p>"
+        },
+        "RecommenderId": {
+          "shape": "__string",
+          "documentation": "<p>The unique identifier for the recommender model that's used by the message template.</p>"
         },
         "Subject": {
           "shape": "__string",
@@ -6382,6 +7984,10 @@
           "locationName": "tags",
           "documentation": "<p>A string-to-string map of key-value pairs that identifies the tags that are associated with the message template. Each tag consists of a required tag key and an associated tag value.</p>"
         },
+        "TemplateDescription": {
+          "shape": "__string",
+          "documentation": "<p>The custom description of the message template.</p>"
+        },
         "TemplateName": {
           "shape": "__string",
           "documentation": "<p>The name of the message template.</p>"
@@ -6392,7 +7998,11 @@
         },
         "TextPart": {
           "shape": "__string",
-          "documentation": "<p>The message body, in text format, that's used in email messages that are based on the message template.</p>"
+          "documentation": "<p>The message body, in plain text format, that's used in email messages that are based on the message template.</p>"
+        },
+        "Version": {
+          "shape": "__string",
+          "documentation": "<p>The unique identifier, as an integer, for the active version of the message template, or the version of the template that you specified by using the version parameter in your request.</p>"
         }
       },
       "documentation": "<p>Provides information about the content and settings for a message template that can be used in messages that are sent through the email channel.</p>",
@@ -6412,7 +8022,7 @@
         },
         "Attributes": {
           "shape": "MapOfListOf__string",
-          "documentation": "<p>One or more custom attributes that describe the endpoint by associating a name with an array of values. For example, the value of a custom attribute named Interests might be: [\"science\", \"music\", \"travel\"]. You can use these attributes as filter criteria when you create segments.</p> <p>When you define the name of a custom attribute, avoid using the following characters: number sign (#), colon (:), question mark (?), backslash (\\), and slash (/). The Amazon Pinpoint console can't display attribute names that contain these characters. This limitation doesn't apply to attribute values.</p>"
+          "documentation": "<p>One or more custom attributes that describe the endpoint by associating a name with an array of values. For example, the value of a custom attribute named Interests might be: [\"Science\", \"Music\", \"Travel\"]. You can use these attributes as filter criteria when you create segments. Attribute names are case sensitive.</p> <p>An attribute name can contain up to 50 characters. An attribute value can contain up to 100 characters. When you define the name of a custom attribute, avoid using the following characters: number sign (#), colon (:), question mark (?), backslash (\\), and slash (/). The Amazon Pinpoint console can't display attribute names that contain these characters. This restriction doesn't apply to attribute values.</p>"
         },
         "ChannelType": {
           "shape": "ChannelType",
@@ -6452,7 +8062,7 @@
         },
         "User": {
           "shape": "EndpointUser",
-          "documentation": "<p>One or more custom user attributes that your app reports to Amazon Pinpoint for the user who's associated with the endpoint.</p>"
+          "documentation": "<p>One or more custom user attributes that describe the user who's associated with the endpoint.</p>"
         }
       },
       "documentation": "<p>Specifies an endpoint to create or update and the settings and attributes to set or change for the endpoint.</p>"
@@ -6483,11 +8093,11 @@
         },
         "Make": {
           "shape": "__string",
-          "documentation": "<p>The manufacturer of the endpoint device, such as Apple or Samsung.</p>"
+          "documentation": "<p>The manufacturer of the endpoint device, such as apple or samsung.</p>"
         },
         "Model": {
           "shape": "__string",
-          "documentation": "<p>The model name or number of the endpoint device, such as iPhone.</p>"
+          "documentation": "<p>The model name or number of the endpoint device, such as iPhone or SM-G900F.</p>"
         },
         "ModelVersion": {
           "shape": "__string",
@@ -6495,7 +8105,7 @@
         },
         "Platform": {
           "shape": "__string",
-          "documentation": "<p>The platform of the endpoint device, such as iOS or Android.</p>"
+          "documentation": "<p>The platform of the endpoint device, such as ios.</p>"
         },
         "PlatformVersion": {
           "shape": "__string",
@@ -6561,7 +8171,7 @@
         },
         "DeliveryStatus": {
           "shape": "DeliveryStatus",
-          "documentation": "<p>The delivery status of the message. Possible values are:</p> <ul> <li><p>DUPLICATE - The endpoint address is a duplicate of another endpoint address. Amazon Pinpoint won't attempt to send the message again.</p></li> <li><p>OPT_OUT - The user who's associated with the endpoint has opted out of receiving messages from you. Amazon Pinpoint won't attempt to send the message again.</p></li> <li><p>PERMANENT_FAILURE - An error occurred when delivering the message to the endpoint. Amazon Pinpoint won't attempt to send the message again.</p></li>    <li><p>SUCCESSFUL - The message was successfully delivered to the endpoint.</p></li> <li><p>TEMPORARY_FAILURE - A temporary error occurred. Amazon Pinpoint will attempt to deliver the message again later.</p></li> <li><p>THROTTLED - Amazon Pinpoint throttled the operation to send the message to the endpoint.</p></li> <li><p>TIMEOUT - The message couldn't be sent within the timeout period.</p></li> <li><p>UNKNOWN_FAILURE - An unknown error occurred.</p></li></ul>"
+          "documentation": "<p>The delivery status of the message. Possible values are:</p> <ul> <li><p>DUPLICATE - The endpoint address is a duplicate of another endpoint address. Amazon Pinpoint won't attempt to send the message again.</p></li> <li><p>OPT_OUT - The user who's associated with the endpoint has opted out of receiving messages from you. Amazon Pinpoint won't attempt to send the message again.</p></li> <li><p>PERMANENT_FAILURE - An error occurred when delivering the message to the endpoint. Amazon Pinpoint won't attempt to send the message again.</p></li>    <li><p>SUCCESSFUL - The message was successfully delivered to the endpoint.</p></li> <li><p>TEMPORARY_FAILURE - A temporary error occurred. Amazon Pinpoint won't attempt to send the message again.</p></li> <li><p>THROTTLED - Amazon Pinpoint throttled the operation to send the message to the endpoint.</p></li> <li><p>TIMEOUT - The message couldn't be sent within the timeout period.</p></li> <li><p>UNKNOWN_FAILURE - An unknown error occurred.</p></li></ul>"
         },
         "MessageId": {
           "shape": "__string",
@@ -6595,7 +8205,7 @@
         },
         "Attributes": {
           "shape": "MapOfListOf__string",
-          "documentation": "<p>One or more custom attributes that describe the endpoint by associating a name with an array of values. For example, the value of a custom attribute named Interests might be: [\"science\", \"music\", \"travel\"]. You can use these attributes as filter criteria when you create segments.</p> <p>When you define the name of a custom attribute, avoid using the following characters: number sign (#), colon (:), question mark (?), backslash (\\), and slash (/). The Amazon Pinpoint console can't display attribute names that contain these characters. This limitation doesn't apply to attribute values.</p>"
+          "documentation": "<p>One or more custom attributes that describe the endpoint by associating a name with an array of values. For example, the value of a custom attribute named Interests might be: [\"Science\", \"Music\", \"Travel\"]. You can use these attributes as filter criteria when you create segments. Attribute names are case sensitive.</p> <p>An attribute name can contain up to 50 characters. An attribute value can contain up to 100 characters. When you define the name of a custom attribute, avoid using the following characters: number sign (#), colon (:), question mark (?), backslash (\\), and slash (/). The Amazon Pinpoint console can't display attribute names that contain these characters. This restriction doesn't apply to attribute values.</p>"
         },
         "ChannelType": {
           "shape": "ChannelType",
@@ -6649,7 +8259,7 @@
         },
         "Attributes": {
           "shape": "MapOfListOf__string",
-          "documentation": "<p>One or more custom attributes that describe the endpoint by associating a name with an array of values. For example, the value of a custom attribute named Interests might be: [\"science\", \"music\", \"travel\"]. You can use these attributes as filter criteria when you create segments.</p>"
+          "documentation": "<p>One or more custom attributes that describe the endpoint by associating a name with an array of values. For example, the value of a custom attribute named Interests might be: [\"Science\", \"Music\", \"Travel\"]. You can use these attributes as filter criteria when you create segments.</p>"
         },
         "ChannelType": {
           "shape": "ChannelType",
@@ -6711,11 +8321,11 @@
         },
         "Context": {
           "shape": "MapOf__string",
-          "documentation": "<p>A map of custom attributes to attach to the message for the address. For a push notification, this payload is added to the data.pinpoint object. For an email or text message, this payload is added to email/SMS delivery receipt event attributes.</p>"
+          "documentation": "<p>A map of custom attributes to attach to the message for the address. Attribute names are case sensitive.</p> <p>For a push notification, this payload is added to the data.pinpoint object. For an email or text message, this payload is added to email/SMS delivery receipt event attributes.</p>"
         },
         "RawContent": {
           "shape": "__string",
-          "documentation": "<p>The raw, JSON-formatted string to use as the payload for the message. If specified, this value overrides the message.</p>"
+          "documentation": "<p>The raw, JSON-formatted string to use as the payload for the message. If specified, this value overrides all other values for the message.</p>"
         },
         "Substitutions": {
           "shape": "MapOfListOf__string",
@@ -6733,7 +8343,7 @@
       "members": {
         "UserAttributes": {
           "shape": "MapOfListOf__string",
-          "documentation": "<p>One or more custom attributes that describe the user by associating a name with an array of values. For example, the value of an attribute named Interests might be: [\"science\", \"music\", \"travel\"]. You can use these attributes as filter criteria when you create segments.</p> <p>When you define the name of a custom attribute, avoid using the following characters: number sign (#), colon (:), question mark (?), backslash (\\), and slash (/). The Amazon Pinpoint console can't display attribute names that contain these characters. This limitation doesn't apply to attribute values.</p>"
+          "documentation": "<p>One or more custom attributes that describe the user by associating a name with an array of values. For example, the value of an attribute named Interests might be: [\"Science\", \"Music\", \"Travel\"]. You can use these attributes as filter criteria when you create segments. Attribute names are case sensitive.</p> <p>An attribute name can contain up to 50 characters. An attribute value can contain up to 100 characters. When you define the name of a custom attribute, avoid using the following characters: number sign (#), colon (:), question mark (?), backslash (\\), and slash (/). The Amazon Pinpoint console can't display attribute names that contain these characters. This restriction doesn't apply to attribute values.</p>"
         },
         "UserId": {
           "shape": "__string",
@@ -6805,23 +8415,40 @@
         "Timestamp"
       ]
     },
+    "EventCondition": {
+      "type": "structure",
+      "members": {
+        "Dimensions": {
+          "shape": "EventDimensions",
+          "documentation": "<p>The dimensions for the event filter to use for the activity.</p>"
+        },
+        "MessageActivity": {
+          "shape": "__string",
+          "documentation": "<p>The message identifier (message_id) for the message to use when determining whether message events meet the condition.</p>"
+        }
+      },
+      "documentation": "<p>Specifies the conditions to evaluate for an event that applies to an activity in a journey.</p>",
+      "required": [
+        "Dimensions"
+      ]
+    },
     "EventDimensions": {
       "type": "structure",
       "members": {
         "Attributes": {
           "shape": "MapOfAttributeDimension",
-          "documentation": "<p>One or more custom attributes that your app reports to Amazon Pinpoint. You can use these attributes as selection criteria when you create an event filter.</p>"
+          "documentation": "<p>One or more custom attributes that your application reports to Amazon Pinpoint. You can use these attributes as selection criteria when you create an event filter.</p>"
         },
         "EventType": {
           "shape": "SetDimension",
-          "documentation": "<p>The name of the event that causes the campaign to be sent. This can be a standard type of event that Amazon Pinpoint generates, such as _session.start, or a custom event that's specific to your app.</p>"
+          "documentation": "<p>The name of the event that causes the campaign to be sent or the journey activity to be performed. This can be a standard event that Amazon Pinpoint generates, such as _email.delivered. For campaigns, this can also be a custom event that's specific to your application. For information about standard events, see <a href=\"https://docs.aws.amazon.com/pinpoint/latest/developerguide/event-streams.html\">Streaming Amazon Pinpoint Events</a> in the <i>Amazon Pinpoint Developer Guide</i>.</p>"
         },
         "Metrics": {
           "shape": "MapOfMetricDimension",
-          "documentation": "<p>One or more custom metrics that your app reports to Amazon Pinpoint. You can use these metrics as selection criteria when you create an event filter.</p>"
+          "documentation": "<p>One or more custom metrics that your application reports to Amazon Pinpoint. You can use these metrics as selection criteria when you create an event filter.</p>"
         }
       },
-      "documentation": "<p>Specifies the dimensions for an event filter that determines when a campaign is sent.</p>"
+      "documentation": "<p>Specifies the dimensions for an event filter that determines when a campaign is sent or a journey activity is performed.</p>"
     },
     "EventItemResponse": {
       "type": "structure",
@@ -7199,7 +8826,7 @@
         },
         "RawContent": {
           "shape": "__string",
-          "documentation": "<p>The raw, JSON-formatted string to use as the payload for the notification message. This value overrides the message.</p>"
+          "documentation": "<p>The raw, JSON-formatted string to use as the payload for the notification message. If specified, this value overrides all other content for the message.</p>"
         },
         "RestrictedPackageName": {
           "shape": "__string",
@@ -7440,31 +9067,31 @@
           "shape": "__timestampIso8601",
           "location": "querystring",
           "locationName": "end-time",
-          "documentation": "<p>The last date and time to retrieve data for, as part of an inclusive date range that filters the query results. This value should be in extended ISO 8601 format, for example: 2019-07-19T00:00:00Z for July 19, 2019 and 2019-07-19T20:00:00Z for 8:00 PM July 19, 2019.</p>"
+          "documentation": "<p>The last date and time to retrieve data for, as part of an inclusive date range that filters the query results. This value should be in extended ISO 8601 format and use Coordinated Universal Time (UTC), for example: 2019-07-26T20:00:00Z for 8:00 PM UTC July 26, 2019.</p>"
         },
         "KpiName": {
           "shape": "__string",
           "location": "uri",
           "locationName": "kpi-name",
-          "documentation": "<p>The name of the metric, also referred to as a <i>key performance indicator (KPI)</i>, to retrieve data for. This value describes the associated metric and consists of two or more terms, which are comprised of lowercase alphanumeric characters, separated by a hyphen. Examples are email-open-rate and successful-delivery-rate. For a list of valid values, see the <a href=\"developerguide.html\">Amazon Pinpoint Developer Guide</a>.</p>"
+          "documentation": "<p>The name of the metric, also referred to as a <i>key performance indicator (KPI)</i>, to retrieve data for. This value describes the associated metric and consists of two or more terms, which are comprised of lowercase alphanumeric characters, separated by a hyphen. Examples are email-open-rate and successful-delivery-rate. For a list of valid values, see the <a href=\"https://docs.aws.amazon.com/pinpoint/latest/developerguide/welcome.html\">Amazon Pinpoint Developer Guide</a>.</p>"
         },
         "NextToken": {
           "shape": "__string",
           "location": "querystring",
           "locationName": "next-token",
-          "documentation": "<p>The NextToken string that specifies which page of results to return in a paginated response. This parameter is currently not supported by the Application Metrics and Campaign Metrics resources.</p>"
+          "documentation": "<p>The  string that specifies which page of results to return in a paginated response. This parameter is currently not supported for application, campaign, and journey metrics.</p>"
         },
         "PageSize": {
           "shape": "__string",
           "location": "querystring",
           "locationName": "page-size",
-          "documentation": "<p>The maximum number of items to include in each page of a paginated response. This parameter is currently not supported by the Application Metrics and Campaign Metrics resources.</p>"
+          "documentation": "<p>The maximum number of items to include in each page of a paginated response. This parameter is currently not supported for application, campaign, and journey metrics.</p>"
         },
         "StartTime": {
           "shape": "__timestampIso8601",
           "location": "querystring",
           "locationName": "start-time",
-          "documentation": "<p>The first date and time to retrieve data for, as part of an inclusive date range that filters the query results. This value should be in extended ISO 8601 format, for example: 2019-07-15T00:00:00Z for July 15, 2019 and 2019-07-15T16:00:00Z for 4:00 PM July 15, 2019.</p>"
+          "documentation": "<p>The first date and time to retrieve data for, as part of an inclusive date range that filters the query results. This value should be in extended ISO 8601 format and use Coordinated Universal Time (UTC), for example: 2019-07-19T20:00:00Z for 8:00 PM UTC July 19, 2019. This value should also be fewer than 90 days from the current day.</p>"
         }
       },
       "required": [
@@ -7517,7 +9144,7 @@
           "shape": "__string",
           "location": "querystring",
           "locationName": "page-size",
-          "documentation": "<p>The maximum number of items to include in each page of a paginated response. This parameter is currently not supported by the Application Metrics and Campaign Metrics resources.</p>"
+          "documentation": "<p>The maximum number of items to include in each page of a paginated response. This parameter is currently not supported for application, campaign, and journey metrics.</p>"
         },
         "Token": {
           "shape": "__string",
@@ -7584,7 +9211,7 @@
           "shape": "__string",
           "location": "querystring",
           "locationName": "page-size",
-          "documentation": "<p>The maximum number of items to include in each page of a paginated response. This parameter is currently not supported by the Application Metrics and Campaign Metrics resources.</p>"
+          "documentation": "<p>The maximum number of items to include in each page of a paginated response. This parameter is currently not supported for application, campaign, and journey metrics.</p>"
         },
         "Token": {
           "shape": "__string",
@@ -7629,31 +9256,31 @@
           "shape": "__timestampIso8601",
           "location": "querystring",
           "locationName": "end-time",
-          "documentation": "<p>The last date and time to retrieve data for, as part of an inclusive date range that filters the query results. This value should be in extended ISO 8601 format, for example: 2019-07-19T00:00:00Z for July 19, 2019 and 2019-07-19T20:00:00Z for 8:00 PM July 19, 2019.</p>"
+          "documentation": "<p>The last date and time to retrieve data for, as part of an inclusive date range that filters the query results. This value should be in extended ISO 8601 format and use Coordinated Universal Time (UTC), for example: 2019-07-26T20:00:00Z for 8:00 PM UTC July 26, 2019.</p>"
         },
         "KpiName": {
           "shape": "__string",
           "location": "uri",
           "locationName": "kpi-name",
-          "documentation": "<p>The name of the metric, also referred to as a <i>key performance indicator (KPI)</i>, to retrieve data for. This value describes the associated metric and consists of two or more terms, which are comprised of lowercase alphanumeric characters, separated by a hyphen. Examples are email-open-rate and successful-delivery-rate. For a list of valid values, see the <a href=\"developerguide.html\">Amazon Pinpoint Developer Guide</a>.</p>"
+          "documentation": "<p>The name of the metric, also referred to as a <i>key performance indicator (KPI)</i>, to retrieve data for. This value describes the associated metric and consists of two or more terms, which are comprised of lowercase alphanumeric characters, separated by a hyphen. Examples are email-open-rate and successful-delivery-rate. For a list of valid values, see the <a href=\"https://docs.aws.amazon.com/pinpoint/latest/developerguide/welcome.html\">Amazon Pinpoint Developer Guide</a>.</p>"
         },
         "NextToken": {
           "shape": "__string",
           "location": "querystring",
           "locationName": "next-token",
-          "documentation": "<p>The NextToken string that specifies which page of results to return in a paginated response. This parameter is currently not supported by the Application Metrics and Campaign Metrics resources.</p>"
+          "documentation": "<p>The  string that specifies which page of results to return in a paginated response. This parameter is currently not supported for application, campaign, and journey metrics.</p>"
         },
         "PageSize": {
           "shape": "__string",
           "location": "querystring",
           "locationName": "page-size",
-          "documentation": "<p>The maximum number of items to include in each page of a paginated response. This parameter is currently not supported by the Application Metrics and Campaign Metrics resources.</p>"
+          "documentation": "<p>The maximum number of items to include in each page of a paginated response. This parameter is currently not supported for application, campaign, and journey metrics.</p>"
         },
         "StartTime": {
           "shape": "__timestampIso8601",
           "location": "querystring",
           "locationName": "start-time",
-          "documentation": "<p>The first date and time to retrieve data for, as part of an inclusive date range that filters the query results. This value should be in extended ISO 8601 format, for example: 2019-07-15T00:00:00Z for July 15, 2019 and 2019-07-15T16:00:00Z for 4:00 PM July 15, 2019.</p>"
+          "documentation": "<p>The first date and time to retrieve data for, as part of an inclusive date range that filters the query results. This value should be in extended ISO 8601 format and use Coordinated Universal Time (UTC), for example: 2019-07-19T20:00:00Z for 8:00 PM UTC July 19, 2019. This value should also be fewer than 90 days from the current day.</p>"
         }
       },
       "required": [
@@ -7766,7 +9393,7 @@
           "shape": "__string",
           "location": "querystring",
           "locationName": "page-size",
-          "documentation": "<p>The maximum number of items to include in each page of a paginated response. This parameter is currently not supported by the Application Metrics and Campaign Metrics resources.</p>"
+          "documentation": "<p>The maximum number of items to include in each page of a paginated response. This parameter is currently not supported for application, campaign, and journey metrics.</p>"
         },
         "Token": {
           "shape": "__string",
@@ -7805,7 +9432,7 @@
           "shape": "__string",
           "location": "querystring",
           "locationName": "page-size",
-          "documentation": "<p>The maximum number of items to include in each page of a paginated response. This parameter is currently not supported by the Application Metrics and Campaign Metrics resources.</p>"
+          "documentation": "<p>The maximum number of items to include in each page of a paginated response. This parameter is currently not supported for application, campaign, and journey metrics.</p>"
         },
         "Token": {
           "shape": "__string",
@@ -7890,6 +9517,12 @@
           "location": "uri",
           "locationName": "template-name",
           "documentation": "<p>The name of the message template. A template name must start with an alphanumeric character and can contain a maximum of 128 characters. The characters can be alphanumeric characters, underscores (_), or hyphens (-). Template names are case sensitive.</p>"
+        },
+        "Version": {
+          "shape": "__string",
+          "location": "querystring",
+          "locationName": "version",
+          "documentation": "<p>The unique identifier for the version of the message template to update, retrieve information about, or delete. To retrieve identifiers and other information for all the versions of a template, use the <link  linkend=\"templates-template-name-template-type-versions\">Template Versions</link> resource.</p> <p>If specified, this value must match the identifier for an existing template version. If specified for an update operation, this value must match the identifier for the latest existing version of the template. This restriction helps ensure that race conditions don't occur.</p> <p>If you don't specify a value for this parameter, Amazon Pinpoint does the following:</p> <ul><li><p>For a get operation, retrieves information about the active version of the template.</p></li> <li><p>For an update operation, saves the updates to (overwrites) the latest existing version of the template, if the create-new-version parameter isn't used or is set to false.</p></li> <li><p>For a delete operation, deletes the template, including all versions of the template.</p></li></ul>"
         }
       },
       "required": [
@@ -8013,7 +9646,7 @@
           "shape": "__string",
           "location": "querystring",
           "locationName": "page-size",
-          "documentation": "<p>The maximum number of items to include in each page of a paginated response. This parameter is currently not supported by the Application Metrics and Campaign Metrics resources.</p>"
+          "documentation": "<p>The maximum number of items to include in each page of a paginated response. This parameter is currently not supported for application, campaign, and journey metrics.</p>"
         },
         "Token": {
           "shape": "__string",
@@ -8110,7 +9743,7 @@
           "shape": "__string",
           "location": "querystring",
           "locationName": "page-size",
-          "documentation": "<p>The maximum number of items to include in each page of a paginated response. This parameter is currently not supported by the Application Metrics and Campaign Metrics resources.</p>"
+          "documentation": "<p>The maximum number of items to include in each page of a paginated response. This parameter is currently not supported for application, campaign, and journey metrics.</p>"
         },
         "Token": {
           "shape": "__string",
@@ -8135,6 +9768,200 @@
       ],
       "payload": "ImportJobsResponse"
     },
+    "GetJourneyDateRangeKpiRequest": {
+      "type": "structure",
+      "members": {
+        "ApplicationId": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "application-id",
+          "documentation": "<p>The unique identifier for the application. This identifier is displayed as the <b>Project ID</b> on the Amazon Pinpoint console.</p>"
+        },
+        "EndTime": {
+          "shape": "__timestampIso8601",
+          "location": "querystring",
+          "locationName": "end-time",
+          "documentation": "<p>The last date and time to retrieve data for, as part of an inclusive date range that filters the query results. This value should be in extended ISO 8601 format and use Coordinated Universal Time (UTC), for example: 2019-07-26T20:00:00Z for 8:00 PM UTC July 26, 2019.</p>"
+        },
+        "JourneyId": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "journey-id",
+          "documentation": "<p>The unique identifier for the journey.</p>"
+        },
+        "KpiName": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "kpi-name",
+          "documentation": "<p>The name of the metric, also referred to as a <i>key performance indicator (KPI)</i>, to retrieve data for. This value describes the associated metric and consists of two or more terms, which are comprised of lowercase alphanumeric characters, separated by a hyphen. Examples are email-open-rate and successful-delivery-rate. For a list of valid values, see the <a href=\"https://docs.aws.amazon.com/pinpoint/latest/developerguide/welcome.html\">Amazon Pinpoint Developer Guide</a>.</p>"
+        },
+        "NextToken": {
+          "shape": "__string",
+          "location": "querystring",
+          "locationName": "next-token",
+          "documentation": "<p>The  string that specifies which page of results to return in a paginated response. This parameter is currently not supported for application, campaign, and journey metrics.</p>"
+        },
+        "PageSize": {
+          "shape": "__string",
+          "location": "querystring",
+          "locationName": "page-size",
+          "documentation": "<p>The maximum number of items to include in each page of a paginated response. This parameter is currently not supported for application, campaign, and journey metrics.</p>"
+        },
+        "StartTime": {
+          "shape": "__timestampIso8601",
+          "location": "querystring",
+          "locationName": "start-time",
+          "documentation": "<p>The first date and time to retrieve data for, as part of an inclusive date range that filters the query results. This value should be in extended ISO 8601 format and use Coordinated Universal Time (UTC), for example: 2019-07-19T20:00:00Z for 8:00 PM UTC July 19, 2019. This value should also be fewer than 90 days from the current day.</p>"
+        }
+      },
+      "required": [
+        "JourneyId",
+        "ApplicationId",
+        "KpiName"
+      ]
+    },
+    "GetJourneyDateRangeKpiResponse": {
+      "type": "structure",
+      "members": {
+        "JourneyDateRangeKpiResponse": {
+          "shape": "JourneyDateRangeKpiResponse"
+        }
+      },
+      "required": [
+        "JourneyDateRangeKpiResponse"
+      ],
+      "payload": "JourneyDateRangeKpiResponse"
+    },
+    "GetJourneyExecutionActivityMetricsRequest": {
+      "type": "structure",
+      "members": {
+        "ApplicationId": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "application-id",
+          "documentation": "<p>The unique identifier for the application. This identifier is displayed as the <b>Project ID</b> on the Amazon Pinpoint console.</p>"
+        },
+        "JourneyActivityId": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "journey-activity-id",
+          "documentation": "<p>The unique identifier for the journey activity.</p>"
+        },
+        "JourneyId": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "journey-id",
+          "documentation": "<p>The unique identifier for the journey.</p>"
+        },
+        "NextToken": {
+          "shape": "__string",
+          "location": "querystring",
+          "locationName": "next-token",
+          "documentation": "<p>The  string that specifies which page of results to return in a paginated response. This parameter is currently not supported for application, campaign, and journey metrics.</p>"
+        },
+        "PageSize": {
+          "shape": "__string",
+          "location": "querystring",
+          "locationName": "page-size",
+          "documentation": "<p>The maximum number of items to include in each page of a paginated response. This parameter is currently not supported for application, campaign, and journey metrics.</p>"
+        }
+      },
+      "required": [
+        "JourneyActivityId",
+        "ApplicationId",
+        "JourneyId"
+      ]
+    },
+    "GetJourneyExecutionActivityMetricsResponse": {
+      "type": "structure",
+      "members": {
+        "JourneyExecutionActivityMetricsResponse": {
+          "shape": "JourneyExecutionActivityMetricsResponse"
+        }
+      },
+      "required": [
+        "JourneyExecutionActivityMetricsResponse"
+      ],
+      "payload": "JourneyExecutionActivityMetricsResponse"
+    },
+    "GetJourneyExecutionMetricsRequest": {
+      "type": "structure",
+      "members": {
+        "ApplicationId": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "application-id",
+          "documentation": "<p>The unique identifier for the application. This identifier is displayed as the <b>Project ID</b> on the Amazon Pinpoint console.</p>"
+        },
+        "JourneyId": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "journey-id",
+          "documentation": "<p>The unique identifier for the journey.</p>"
+        },
+        "NextToken": {
+          "shape": "__string",
+          "location": "querystring",
+          "locationName": "next-token",
+          "documentation": "<p>The  string that specifies which page of results to return in a paginated response. This parameter is currently not supported for application, campaign, and journey metrics.</p>"
+        },
+        "PageSize": {
+          "shape": "__string",
+          "location": "querystring",
+          "locationName": "page-size",
+          "documentation": "<p>The maximum number of items to include in each page of a paginated response. This parameter is currently not supported for application, campaign, and journey metrics.</p>"
+        }
+      },
+      "required": [
+        "ApplicationId",
+        "JourneyId"
+      ]
+    },
+    "GetJourneyExecutionMetricsResponse": {
+      "type": "structure",
+      "members": {
+        "JourneyExecutionMetricsResponse": {
+          "shape": "JourneyExecutionMetricsResponse"
+        }
+      },
+      "required": [
+        "JourneyExecutionMetricsResponse"
+      ],
+      "payload": "JourneyExecutionMetricsResponse"
+    },
+    "GetJourneyRequest": {
+      "type": "structure",
+      "members": {
+        "ApplicationId": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "application-id",
+          "documentation": "<p>The unique identifier for the application. This identifier is displayed as the <b>Project ID</b> on the Amazon Pinpoint console.</p>"
+        },
+        "JourneyId": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "journey-id",
+          "documentation": "<p>The unique identifier for the journey.</p>"
+        }
+      },
+      "required": [
+        "JourneyId",
+        "ApplicationId"
+      ]
+    },
+    "GetJourneyResponse": {
+      "type": "structure",
+      "members": {
+        "JourneyResponse": {
+          "shape": "JourneyResponse"
+        }
+      },
+      "required": [
+        "JourneyResponse"
+      ],
+      "payload": "JourneyResponse"
+    },
     "GetPushTemplateRequest": {
       "type": "structure",
       "members": {
@@ -8143,23 +9970,84 @@
           "location": "uri",
           "locationName": "template-name",
           "documentation": "<p>The name of the message template. A template name must start with an alphanumeric character and can contain a maximum of 128 characters. The characters can be alphanumeric characters, underscores (_), or hyphens (-). Template names are case sensitive.</p>"
+        },
+        "Version": {
+          "shape": "__string",
+          "location": "querystring",
+          "locationName": "version",
+          "documentation": "<p>The unique identifier for the version of the message template to update, retrieve information about, or delete. To retrieve identifiers and other information for all the versions of a template, use the <link  linkend=\"templates-template-name-template-type-versions\">Template Versions</link> resource.</p> <p>If specified, this value must match the identifier for an existing template version. If specified for an update operation, this value must match the identifier for the latest existing version of the template. This restriction helps ensure that race conditions don't occur.</p> <p>If you don't specify a value for this parameter, Amazon Pinpoint does the following:</p> <ul><li><p>For a get operation, retrieves information about the active version of the template.</p></li> <li><p>For an update operation, saves the updates to (overwrites) the latest existing version of the template, if the create-new-version parameter isn't used or is set to false.</p></li> <li><p>For a delete operation, deletes the template, including all versions of the template.</p></li></ul>"
         }
       },
       "required": [
         "TemplateName"
       ]
     },
-    "GetPushTemplateResponse": {
+    "GetPushTemplateResponse": {
+      "type": "structure",
+      "members": {
+        "PushNotificationTemplateResponse": {
+          "shape": "PushNotificationTemplateResponse"
+        }
+      },
+      "required": [
+        "PushNotificationTemplateResponse"
+      ],
+      "payload": "PushNotificationTemplateResponse"
+    },
+    "GetRecommenderConfigurationRequest": {
+      "type": "structure",
+      "members": {
+        "RecommenderId": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "recommender-id",
+          "documentation": "<p>The unique identifier for the recommender model configuration. This identifier is displayed as the <b>Recommender ID</b> on the Amazon Pinpoint console.</p>"
+        }
+      },
+      "required": [
+        "RecommenderId"
+      ]
+    },
+    "GetRecommenderConfigurationResponse": {
+      "type": "structure",
+      "members": {
+        "RecommenderConfigurationResponse": {
+          "shape": "RecommenderConfigurationResponse"
+        }
+      },
+      "required": [
+        "RecommenderConfigurationResponse"
+      ],
+      "payload": "RecommenderConfigurationResponse"
+    },
+    "GetRecommenderConfigurationsRequest": {
+      "type": "structure",
+      "members": {
+        "PageSize": {
+          "shape": "__string",
+          "location": "querystring",
+          "locationName": "page-size",
+          "documentation": "<p>The maximum number of items to include in each page of a paginated response. This parameter is currently not supported for application, campaign, and journey metrics.</p>"
+        },
+        "Token": {
+          "shape": "__string",
+          "location": "querystring",
+          "locationName": "token",
+          "documentation": "<p>The NextToken string that specifies which page of results to return in a paginated response.</p>"
+        }
+      }
+    },
+    "GetRecommenderConfigurationsResponse": {
       "type": "structure",
       "members": {
-        "PushNotificationTemplateResponse": {
-          "shape": "PushNotificationTemplateResponse"
+        "ListRecommenderConfigurationsResponse": {
+          "shape": "ListRecommenderConfigurationsResponse"
         }
       },
       "required": [
-        "PushNotificationTemplateResponse"
+        "ListRecommenderConfigurationsResponse"
       ],
-      "payload": "PushNotificationTemplateResponse"
+      "payload": "ListRecommenderConfigurationsResponse"
     },
     "GetSegmentExportJobsRequest": {
       "type": "structure",
@@ -8174,7 +10062,7 @@
           "shape": "__string",
           "location": "querystring",
           "locationName": "page-size",
-          "documentation": "<p>The maximum number of items to include in each page of a paginated response. This parameter is currently not supported by the Application Metrics and Campaign Metrics resources.</p>"
+          "documentation": "<p>The maximum number of items to include in each page of a paginated response. This parameter is currently not supported for application, campaign, and journey metrics.</p>"
         },
         "SegmentId": {
           "shape": "__string",
@@ -8219,7 +10107,7 @@
           "shape": "__string",
           "location": "querystring",
           "locationName": "page-size",
-          "documentation": "<p>The maximum number of items to include in each page of a paginated response. This parameter is currently not supported by the Application Metrics and Campaign Metrics resources.</p>"
+          "documentation": "<p>The maximum number of items to include in each page of a paginated response. This parameter is currently not supported for application, campaign, and journey metrics.</p>"
         },
         "SegmentId": {
           "shape": "__string",
@@ -8337,7 +10225,7 @@
           "shape": "__string",
           "location": "querystring",
           "locationName": "page-size",
-          "documentation": "<p>The maximum number of items to include in each page of a paginated response. This parameter is currently not supported by the Application Metrics and Campaign Metrics resources.</p>"
+          "documentation": "<p>The maximum number of items to include in each page of a paginated response. This parameter is currently not supported for application, campaign, and journey metrics.</p>"
         },
         "SegmentId": {
           "shape": "__string",
@@ -8382,7 +10270,7 @@
           "shape": "__string",
           "location": "querystring",
           "locationName": "page-size",
-          "documentation": "<p>The maximum number of items to include in each page of a paginated response. This parameter is currently not supported by the Application Metrics and Campaign Metrics resources.</p>"
+          "documentation": "<p>The maximum number of items to include in each page of a paginated response. This parameter is currently not supported for application, campaign, and journey metrics.</p>"
         },
         "Token": {
           "shape": "__string",
@@ -8441,6 +10329,12 @@
           "location": "uri",
           "locationName": "template-name",
           "documentation": "<p>The name of the message template. A template name must start with an alphanumeric character and can contain a maximum of 128 characters. The characters can be alphanumeric characters, underscores (_), or hyphens (-). Template names are case sensitive.</p>"
+        },
+        "Version": {
+          "shape": "__string",
+          "location": "querystring",
+          "locationName": "version",
+          "documentation": "<p>The unique identifier for the version of the message template to update, retrieve information about, or delete. To retrieve identifiers and other information for all the versions of a template, use the <link  linkend=\"templates-template-name-template-type-versions\">Template Versions</link> resource.</p> <p>If specified, this value must match the identifier for an existing template version. If specified for an update operation, this value must match the identifier for the latest existing version of the template. This restriction helps ensure that race conditions don't occur.</p> <p>If you don't specify a value for this parameter, Amazon Pinpoint does the following:</p> <ul><li><p>For a get operation, retrieves information about the active version of the template.</p></li> <li><p>For an update operation, saves the updates to (overwrites) the latest existing version of the template, if the create-new-version parameter isn't used or is set to false.</p></li> <li><p>For a delete operation, deletes the template, including all versions of the template.</p></li></ul>"
         }
       },
       "required": [
@@ -8518,6 +10412,55 @@
       ],
       "payload": "VoiceChannelResponse"
     },
+    "GetVoiceTemplateRequest": {
+      "type": "structure",
+      "members": {
+        "TemplateName": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "template-name",
+          "documentation": "<p>The name of the message template. A template name must start with an alphanumeric character and can contain a maximum of 128 characters. The characters can be alphanumeric characters, underscores (_), or hyphens (-). Template names are case sensitive.</p>"
+        },
+        "Version": {
+          "shape": "__string",
+          "location": "querystring",
+          "locationName": "version",
+          "documentation": "<p>The unique identifier for the version of the message template to update, retrieve information about, or delete. To retrieve identifiers and other information for all the versions of a template, use the <link  linkend=\"templates-template-name-template-type-versions\">Template Versions</link> resource.</p> <p>If specified, this value must match the identifier for an existing template version. If specified for an update operation, this value must match the identifier for the latest existing version of the template. This restriction helps ensure that race conditions don't occur.</p> <p>If you don't specify a value for this parameter, Amazon Pinpoint does the following:</p> <ul><li><p>For a get operation, retrieves information about the active version of the template.</p></li> <li><p>For an update operation, saves the updates to (overwrites) the latest existing version of the template, if the create-new-version parameter isn't used or is set to false.</p></li> <li><p>For a delete operation, deletes the template, including all versions of the template.</p></li></ul>"
+        }
+      },
+      "required": [
+        "TemplateName"
+      ]
+    },
+    "GetVoiceTemplateResponse": {
+      "type": "structure",
+      "members": {
+        "VoiceTemplateResponse": {
+          "shape": "VoiceTemplateResponse"
+        }
+      },
+      "required": [
+        "VoiceTemplateResponse"
+      ],
+      "payload": "VoiceTemplateResponse"
+    },
+    "HoldoutActivity": {
+      "type": "structure",
+      "members": {
+        "NextActivity": {
+          "shape": "__string",
+          "documentation": "<p>The unique identifier for the next activity to perform, after performing the holdout activity.</p>"
+        },
+        "Percentage": {
+          "shape": "__integer",
+          "documentation": "<p>The percentage of participants who shouldn't continue the journey.</p> <p>To determine which participants are held out, Amazon Pinpoint applies a probability-based algorithm to the percentage that you specify. Therefore, the actual percentage of participants who are held out may not be equal to the percentage that you specify.</p>"
+        }
+      },
+      "documentation": "<p>Specifies the settings for a holdout activity in a journey. This type of activity stops a journey for a specified percentage of participants.</p>",
+      "required": [
+        "Percentage"
+      ]
+    },
     "ImportJobRequest": {
       "type": "structure",
       "members": {
@@ -8551,7 +10494,7 @@
         },
         "SegmentName": {
           "shape": "__string",
-          "documentation": "<p>The custom name for the segment that's created by the import job, if the value of the DefineSegment property is true.</p>"
+          "documentation": "<p>A custom name for the segment that's created by the import job, if the value of the DefineSegment property is true.</p>"
         }
       },
       "documentation": "<p>Specifies the settings for a job that imports endpoint definitions from an Amazon Simple Storage Service (Amazon S3) bucket.</p>",
@@ -8647,96 +10590,406 @@
           "shape": "__integer",
           "documentation": "<p>The total number of endpoint definitions that weren't processed successfully (failed) by the import job, typically because an error, such as a syntax error, occurred.</p>"
         },
-        "TotalPieces": {
-          "shape": "__integer",
-          "documentation": "<p>The total number of pieces that must be processed to complete the import job. Each piece consists of an approximately equal portion of the endpoint definitions that are part of the import job.</p>"
+        "TotalPieces": {
+          "shape": "__integer",
+          "documentation": "<p>The total number of pieces that must be processed to complete the import job. Each piece consists of an approximately equal portion of the endpoint definitions that are part of the import job.</p>"
+        },
+        "TotalProcessed": {
+          "shape": "__integer",
+          "documentation": "<p>The total number of endpoint definitions that were processed by the import job.</p>"
+        },
+        "Type": {
+          "shape": "__string",
+          "documentation": "<p>The job type. This value is IMPORT for import jobs.</p>"
+        }
+      },
+      "documentation": "<p>Provides information about the status and settings of a job that imports endpoint definitions from one or more files. The files can be stored in an Amazon Simple Storage Service (Amazon S3) bucket or uploaded directly from a computer by using the Amazon Pinpoint console.</p>",
+      "required": [
+        "JobStatus",
+        "CreationDate",
+        "Type",
+        "Definition",
+        "Id",
+        "ApplicationId"
+      ]
+    },
+    "ImportJobsResponse": {
+      "type": "structure",
+      "members": {
+        "Item": {
+          "shape": "ListOfImportJobResponse",
+          "documentation": "<p>An array of responses, one for each import job that's associated with the application (Import Jobs resource) or segment (Segment Import Jobs resource).</p>"
+        },
+        "NextToken": {
+          "shape": "__string",
+          "documentation": "<p>The string to use in a subsequent request to get the next page of results in a paginated response. This value is null if there are no additional pages.</p>"
+        }
+      },
+      "documentation": "<p>Provides information about the status and settings of all the import jobs that are associated with an application or segment. An import job is a job that imports endpoint definitions from one or more files.</p>",
+      "required": [
+        "Item"
+      ]
+    },
+    "Include": {
+      "type": "string",
+      "enum": [
+        "ALL",
+        "ANY",
+        "NONE"
+      ]
+    },
+    "InternalServerErrorException": {
+      "type": "structure",
+      "members": {
+        "Message": {
+          "shape": "__string",
+          "documentation": "<p>The message that's returned from the API.</p>"
+        },
+        "RequestID": {
+          "shape": "__string",
+          "documentation": "<p>The unique identifier for the request or response.</p>"
+        }
+      },
+      "documentation": "<p>Provides information about an API request or response.</p>",
+      "exception": true,
+      "error": {
+        "httpStatusCode": 500
+      }
+    },
+    "ItemResponse": {
+      "type": "structure",
+      "members": {
+        "EndpointItemResponse": {
+          "shape": "EndpointItemResponse",
+          "documentation": "<p>The response that was received after the endpoint data was accepted.</p>"
+        },
+        "EventsItemResponse": {
+          "shape": "MapOfEventItemResponse",
+          "documentation": "<p>A multipart response object that contains a key and a value for each event in the request. In each object, the event ID is the key and an EventItemResponse object is the value.</p>"
+        }
+      },
+      "documentation": "<p>Provides information about the results of a request to create or update an endpoint that's associated with an event.</p>"
+    },
+    "JobStatus": {
+      "type": "string",
+      "enum": [
+        "CREATED",
+        "PREPARING_FOR_INITIALIZATION",
+        "INITIALIZING",
+        "PROCESSING",
+        "PENDING_JOB",
+        "COMPLETING",
+        "COMPLETED",
+        "FAILING",
+        "FAILED"
+      ]
+    },
+    "JourneyDateRangeKpiResponse": {
+      "type": "structure",
+      "members": {
+        "ApplicationId": {
+          "shape": "__string",
+          "documentation": "<p>The unique identifier for the application that the metric applies to.</p>"
+        },
+        "EndTime": {
+          "shape": "__timestampIso8601",
+          "documentation": "<p>The last date and time of the date range that was used to filter the query results, in extended ISO 8601 format. The date range is inclusive.</p>"
+        },
+        "JourneyId": {
+          "shape": "__string",
+          "documentation": "<p>The unique identifier for the journey that the metric applies to.</p>"
+        },
+        "KpiName": {
+          "shape": "__string",
+          "documentation": "<p>The name of the metric, also referred to as a <i>key performance indicator (KPI)</i>, that the data was retrieved for. This value describes the associated metric and consists of two or more terms, which are comprised of lowercase alphanumeric characters, separated by a hyphen. For a list of possible values, see the <a href=\"https://docs.aws.amazon.com/pinpoint/latest/developerguide/welcome.html\">Amazon Pinpoint Developer Guide</a>.</p>"
+        },
+        "KpiResult": {
+          "shape": "BaseKpiResult",
+          "documentation": "<p>An array of objects that contains the results of the query. Each object contains the value for the metric and metadata about that value.</p>"
+        },
+        "NextToken": {
+          "shape": "__string",
+          "documentation": "<p>The string to use in a subsequent request to get the next page of results in a paginated response. This value is null for the Journey Engagement Metrics resource because the resource returns all results in a single page.</p>"
+        },
+        "StartTime": {
+          "shape": "__timestampIso8601",
+          "documentation": "<p>The first date and time of the date range that was used to filter the query results, in extended ISO 8601 format. The date range is inclusive.</p>"
+        }
+      },
+      "documentation": "<p>Provides the results of a query that retrieved the data for a standard engagement metric that applies to a journey, and provides information about that query.</p>",
+      "required": [
+        "KpiResult",
+        "KpiName",
+        "JourneyId",
+        "EndTime",
+        "StartTime",
+        "ApplicationId"
+      ]
+    },
+    "JourneyEmailMessage": {
+      "type": "structure",
+      "members": {
+        "FromAddress": {
+          "shape": "__string",
+          "documentation": "<p>The verified email address to send the email message from. The default address is the FromAddress specified for the email channel for the application.</p>"
+        }
+      },
+      "documentation": "<p>Specifies the \"From\" address for an email message that's sent to participants in a journey.</p>"
+    },
+    "JourneyExecutionActivityMetricsResponse": {
+      "type": "structure",
+      "members": {
+        "ActivityType": {
+          "shape": "__string",
+          "documentation": "<p>The type of activity that the metric applies to. Possible values are:</p> <ul><li><p>CONDITIONAL_SPLIT - For a yes/no split activity, which is an activity that sends participants down one of two paths in a journey.</p></li> <li><p>HOLDOUT - For a holdout activity, which is an activity that stops a journey for a specified percentage of participants.</p></li> <li><p>MESSAGE - For an email activity, which is an activity that sends an email message to participants.</p></li> <li><p>MULTI_CONDITIONAL_SPLIT - For a multivariate split activity, which is an activity that sends participants down one of as many as five paths in a journey.</p></li> <li><p>RANDOM_SPLIT - For a random split activity, which is an activity that sends specified percentages of participants down one of as many as five paths in a journey.</p></li> <li><p>WAIT - For a wait activity, which is an activity that waits for a certain amount of time or until a specific date and time before moving participants to the next activity in a journey.</p></li></ul>"
+        },
+        "ApplicationId": {
+          "shape": "__string",
+          "documentation": "<p>The unique identifier for the application that the metric applies to.</p>"
+        },
+        "JourneyActivityId": {
+          "shape": "__string",
+          "documentation": "<p>The unique identifier for the activity that the metric applies to.</p>"
+        },
+        "JourneyId": {
+          "shape": "__string",
+          "documentation": "<p>The unique identifier for the journey that the metric applies to.</p>"
+        },
+        "LastEvaluatedTime": {
+          "shape": "__string",
+          "documentation": "<p>The date and time, in ISO 8601 format, when Amazon Pinpoint last evaluated the execution status of the activity and updated the data for the metric.</p>"
+        },
+        "Metrics": {
+          "shape": "MapOf__string",
+          "documentation": "<p>A JSON object that contains the results of the query. The results vary depending on the type of activity (ActivityType). For information about the structure and contents of the results, see the <a href=\"https://docs.aws.amazon.com/pinpoint/latest/developerguide/welcome.html\">Amazon Pinpoint Developer Guide</a>.</p>"
+        }
+      },
+      "documentation": "<p>Provides the results of a query that retrieved the data for a standard execution metric that applies to a journey activity, and provides information about that query.</p>",
+      "required": [
+        "Metrics",
+        "JourneyId",
+        "LastEvaluatedTime",
+        "JourneyActivityId",
+        "ActivityType",
+        "ApplicationId"
+      ]
+    },
+    "JourneyExecutionMetricsResponse": {
+      "type": "structure",
+      "members": {
+        "ApplicationId": {
+          "shape": "__string",
+          "documentation": "<p>The unique identifier for the application that the metric applies to.</p>"
+        },
+        "JourneyId": {
+          "shape": "__string",
+          "documentation": "<p>The unique identifier for the journey that the metric applies to.</p>"
+        },
+        "LastEvaluatedTime": {
+          "shape": "__string",
+          "documentation": "<p>The date and time, in ISO 8601 format, when Amazon Pinpoint last evaluated the journey and updated the data for the metric.</p>"
+        },
+        "Metrics": {
+          "shape": "MapOf__string",
+          "documentation": "<p>A JSON object that contains the results of the query. For information about the structure and contents of the results, see the <a href=\"https://docs.aws.amazon.com/pinpoint/latest/developerguide/welcome.html\">Amazon Pinpoint Developer Guide</a>.</p>"
+        }
+      },
+      "documentation": "<p>Provides the results of a query that retrieved the data for a standard execution metric that applies to a journey, and provides information about that query.</p>",
+      "required": [
+        "Metrics",
+        "JourneyId",
+        "LastEvaluatedTime",
+        "ApplicationId"
+      ]
+    },
+    "JourneyLimits": {
+      "type": "structure",
+      "members": {
+        "DailyCap": {
+          "shape": "__integer",
+          "documentation": "<p>The maximum number of messages that the journey can send to a single participant during a 24-hour period. The maximum value is 100.</p>"
+        },
+        "EndpointReentryCap": {
+          "shape": "__integer",
+          "documentation": "<p>The maximum number of times that a participant can enter the journey. The maximum value is 100. To allow participants to enter the journey an unlimited number of times, set this value to 0.</p>"
+        },
+        "MessagesPerSecond": {
+          "shape": "__integer",
+          "documentation": "<p>The maximum number of messages that the journey can send each second.</p>"
+        }
+      },
+      "documentation": "<p>Specifies limits on the messages that a journey can send and the number of times participants can enter a journey.</p>"
+    },
+    "JourneyResponse": {
+      "type": "structure",
+      "members": {
+        "Activities": {
+          "shape": "MapOfActivity",
+          "documentation": "<p>A map that contains a set of Activity objects, one object for each activity in the journey. For each Activity object, the key is the unique identifier (string) for an activity and the value is the settings for the activity.</p>"
+        },
+        "ApplicationId": {
+          "shape": "__string",
+          "documentation": "<p>The unique identifier for the application that the journey applies to.</p>"
+        },
+        "CreationDate": {
+          "shape": "__string",
+          "documentation": "<p>The date, in ISO 8601 format, when the journey was created.</p>"
+        },
+        "Id": {
+          "shape": "__string",
+          "documentation": "<p>The unique identifier for the journey.</p>"
+        },
+        "LastModifiedDate": {
+          "shape": "__string",
+          "documentation": "<p>The date, in ISO 8601 format, when the journey was last modified.</p>"
+        },
+        "Limits": {
+          "shape": "JourneyLimits",
+          "documentation": "<p>The messaging and entry limits for the journey.</p>"
+        },
+        "LocalTime": {
+          "shape": "__boolean",
+          "documentation": "<p>Specifies whether the journey's scheduled start and end times use each participant's local time. If this value is true, the schedule uses each participant's local time.</p>"
+        },
+        "Name": {
+          "shape": "__string",
+          "documentation": "<p>The name of the journey.</p>"
+        },
+        "QuietTime": {
+          "shape": "QuietTime",
+          "documentation": "<p>The quiet time settings for the journey. Quiet time is a specific time range when a journey doesn't send messages to participants, if all the following conditions are met:</p> <ul><li><p>The EndpointDemographic.Timezone property of the endpoint for the participant is set to a valid value.</p></li> <li><p>The current time in the participant's time zone is later than or equal to the time specified by the QuietTime.Start property for the journey.</p></li> <li><p>The current time in the participant's time zone is earlier than or equal to the time specified by the QuietTime.End property for the journey.</p></li></ul> <p>If any of the preceding conditions isn't met, the participant will receive messages from the journey, even if quiet time is enabled.</p>"
+        },
+        "RefreshFrequency": {
+          "shape": "__string",
+          "documentation": "<p>The frequency with which Amazon Pinpoint evaluates segment and event data for the journey, as a duration in ISO 8601 format.</p>"
         },
-        "TotalProcessed": {
-          "shape": "__integer",
-          "documentation": "<p>The total number of endpoint definitions that were processed by the import job.</p>"
+        "Schedule": {
+          "shape": "JourneySchedule",
+          "documentation": "<p>The schedule settings for the journey.</p>"
         },
-        "Type": {
+        "StartActivity": {
           "shape": "__string",
-          "documentation": "<p>The job type. This value is IMPORT for import jobs.</p>"
+          "documentation": "<p>The unique identifier for the first activity in the journey.</p>"
+        },
+        "StartCondition": {
+          "shape": "StartCondition",
+          "documentation": "<p>The segment that defines which users are participants in the journey.</p>"
+        },
+        "State": {
+          "shape": "State",
+          "documentation": "<p>The current status of the journey. Possible values are:</p> <ul><li><p>DRAFT - The journey is being developed and hasn't been published yet.</p></li> <li><p>ACTIVE - The journey has been developed and published. Depending on the journey's schedule, the journey may currently be running or scheduled to start running at a later time. If a journey's status is ACTIVE, you can't add, change, or remove activities from it.</p></li> <li><p>COMPLETED - The journey has been published and has finished running. All participants have entered the journey and no participants are waiting to complete the journey or any activities in the journey.</p></li> <li><p>CANCELLED - The journey has been stopped. If a journey's status is CANCELLED, you can't add, change, or remove activities or segment settings from the journey.</p></li> <li><p>CLOSED - The journey has been published and has started running. It may have also passed its scheduled end time, or passed its scheduled start time and a refresh frequency hasn't been specified for it. If a journey's status is CLOSED, you can't add participants to it, and no existing participants can enter the journey for the first time. However, any existing participants who are currently waiting to start an activity may continue the journey.</p></li></ul>"
+        },
+        "tags": {
+          "shape": "MapOf__string",
+          "locationName": "tags",
+          "documentation": "<p>This object is not used or supported.</p>"
         }
       },
-      "documentation": "<p>Provides information about the status and settings of a job that imports endpoint definitions from one or more files. The files can be stored in an Amazon Simple Storage Service (Amazon S3) bucket or uploaded directly from a computer by using the Amazon Pinpoint console.</p>",
+      "documentation": "<p>Provides information about the status, configuration, and other settings for a journey.</p>",
       "required": [
-        "JobStatus",
-        "CreationDate",
-        "Type",
-        "Definition",
+        "Name",
         "Id",
         "ApplicationId"
       ]
     },
-    "ImportJobsResponse": {
+    "JourneySchedule": {
+      "type": "structure",
+      "members": {
+        "EndTime": {
+          "shape": "__timestampIso8601",
+          "documentation": "<p>The scheduled time, in ISO 8601 format, when the journey ended or will end.</p>"
+        },
+        "StartTime": {
+          "shape": "__timestampIso8601",
+          "documentation": "<p>The scheduled time, in ISO 8601 format, when the journey began or will begin.</p>"
+        },
+        "Timezone": {
+          "shape": "__string",
+          "documentation": "<p>The starting UTC offset for the journey schedule, if the value of the journey's LocalTime property is true. Valid values are: UTC,\n                  UTC+01, UTC+02, UTC+03, UTC+03:30, UTC+04, UTC+04:30, UTC+05, UTC+05:30,\n                  UTC+05:45, UTC+06, UTC+06:30, UTC+07, UTC+08, UTC+08:45, UTC+09, UTC+09:30,\n                  UTC+10, UTC+10:30, UTC+11, UTC+12, UTC+12:45, UTC+13, UTC+13:45, UTC-02,\n                  UTC-02:30, UTC-03, UTC-03:30, UTC-04, UTC-05, UTC-06, UTC-07, UTC-08, UTC-09,\n                  UTC-09:30, UTC-10, and UTC-11.</p>"
+        }
+      },
+      "documentation": "<p>Specifies the schedule settings for a journey.</p>"
+    },
+    "JourneyStateRequest": {
+      "type": "structure",
+      "members": {
+        "State": {
+          "shape": "State",
+          "documentation": "<p>The status of the journey. Currently, the only supported value is CANCELLED.</p> <p>If you cancel a journey, Amazon Pinpoint continues to perform activities that are currently in progress, until those activities are complete. Amazon Pinpoint also continues to collect and aggregate analytics data for those activities, until they are complete, and any activities that were complete when you cancelled the journey.</p> <p>After you cancel a journey, you can't add, change, or remove any activities from the journey. In addition, Amazon Pinpoint stops evaluating the journey and doesn't perform any activities that haven't started.</p>"
+        }
+      },
+      "documentation": "<p>Changes the status of a journey.</p>"
+    },
+    "JourneysResponse": {
       "type": "structure",
       "members": {
         "Item": {
-          "shape": "ListOfImportJobResponse",
-          "documentation": "<p>An array of responses, one for each import job that's associated with the application (Import Jobs resource) or segment (Segment Import Jobs resource).</p>"
+          "shape": "ListOfJourneyResponse",
+          "documentation": "<p>An array of responses, one for each journey that's associated with the application.</p>"
         },
         "NextToken": {
           "shape": "__string",
           "documentation": "<p>The string to use in a subsequent request to get the next page of results in a paginated response. This value is null if there are no additional pages.</p>"
         }
       },
-      "documentation": "<p>Provides information about the status and settings of all the import jobs that are associated with an application or segment. An import job is a job that imports endpoint definitions from one or more files.</p>",
+      "documentation": "<p>Provides information about the status, configuration, and other settings for all the journeys that are associated with an application.</p>",
       "required": [
         "Item"
       ]
     },
-    "Include": {
-      "type": "string",
-      "enum": [
-        "ALL",
-        "ANY",
-        "NONE"
-      ]
-    },
-    "InternalServerErrorException": {
+    "ListJourneysRequest": {
       "type": "structure",
       "members": {
-        "Message": {
+        "ApplicationId": {
           "shape": "__string",
-          "documentation": "<p>The message that's returned from the API.</p>"
+          "location": "uri",
+          "locationName": "application-id",
+          "documentation": "<p>The unique identifier for the application. This identifier is displayed as the <b>Project ID</b> on the Amazon Pinpoint console.</p>"
         },
-        "RequestID": {
+        "PageSize": {
           "shape": "__string",
-          "documentation": "<p>The unique identifier for the request or response.</p>"
+          "location": "querystring",
+          "locationName": "page-size",
+          "documentation": "<p>The maximum number of items to include in each page of a paginated response. This parameter is currently not supported for application, campaign, and journey metrics.</p>"
+        },
+        "Token": {
+          "shape": "__string",
+          "location": "querystring",
+          "locationName": "token",
+          "documentation": "<p>The NextToken string that specifies which page of results to return in a paginated response.</p>"
         }
       },
-      "documentation": "<p>Provides information about an API request or response.</p>",
-      "exception": true,
-      "error": {
-        "httpStatusCode": 500
-      }
+      "required": [
+        "ApplicationId"
+      ]
     },
-    "ItemResponse": {
+    "ListJourneysResponse": {
       "type": "structure",
       "members": {
-        "EndpointItemResponse": {
-          "shape": "EndpointItemResponse",
-          "documentation": "<p>The response that was received after the endpoint data was accepted.</p>"
-        },
-        "EventsItemResponse": {
-          "shape": "MapOfEventItemResponse",
-          "documentation": "<p>A multipart response object that contains a key and a value for each event in the request. In each object, the event ID is the key and an EventItemResponse object is the value.</p>"
+        "JourneysResponse": {
+          "shape": "JourneysResponse"
         }
       },
-      "documentation": "<p>Provides information about the results of a request to create or update an endpoint that's associated with an event.</p>"
+      "required": [
+        "JourneysResponse"
+      ],
+      "payload": "JourneysResponse"
     },
-    "JobStatus": {
-      "type": "string",
-      "enum": [
-        "CREATED",
-        "INITIALIZING",
-        "PROCESSING",
-        "COMPLETING",
-        "COMPLETED",
-        "FAILING",
-        "FAILED"
+    "ListRecommenderConfigurationsResponse": {
+      "type": "structure",
+      "members": {
+        "Item": {
+          "shape": "ListOfRecommenderConfigurationResponse",
+          "documentation": "<p>An array of responses, one for each recommender model configuration that's associated with your Amazon Pinpoint account.</p>"
+        },
+        "NextToken": {
+          "shape": "__string",
+          "documentation": "<p>The string to use in a subsequent request to get the next page of results in a paginated response. This value is null if there are no additional pages.</p>"
+        }
+      },
+      "documentation": "<p>Provides information about all the recommender model configurations that are associated with your Amazon Pinpoint account.</p>",
+      "required": [
+        "Item"
       ]
     },
     "ListTagsForResourceRequest": {
@@ -8746,7 +10999,7 @@
           "shape": "__string",
           "location": "uri",
           "locationName": "resource-arn",
-          "documentation": "<p>The Amazon Resource Name (ARN) of the application, campaign, message template, or segment.</p>"
+          "documentation": "<p>The Amazon Resource Name (ARN) of the resource.</p>"
         }
       },
       "required": [
@@ -8765,6 +11018,51 @@
       ],
       "payload": "TagsModel"
     },
+    "ListTemplateVersionsRequest": {
+      "type": "structure",
+      "members": {
+        "NextToken": {
+          "shape": "__string",
+          "location": "querystring",
+          "locationName": "next-token",
+          "documentation": "<p>The  string that specifies which page of results to return in a paginated response. This parameter is currently not supported for application, campaign, and journey metrics.</p>"
+        },
+        "PageSize": {
+          "shape": "__string",
+          "location": "querystring",
+          "locationName": "page-size",
+          "documentation": "<p>The maximum number of items to include in each page of a paginated response. This parameter is currently not supported for application, campaign, and journey metrics.</p>"
+        },
+        "TemplateName": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "template-name",
+          "documentation": "<p>The name of the message template. A template name must start with an alphanumeric character and can contain a maximum of 128 characters. The characters can be alphanumeric characters, underscores (_), or hyphens (-). Template names are case sensitive.</p>"
+        },
+        "TemplateType": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "template-type",
+          "documentation": "<p>The type of channel that the message template is designed for. Valid values are: EMAIL, PUSH, SMS, and VOICE.</p>"
+        }
+      },
+      "required": [
+        "TemplateName",
+        "TemplateType"
+      ]
+    },
+    "ListTemplateVersionsResponse": {
+      "type": "structure",
+      "members": {
+        "TemplateVersionsResponse": {
+          "shape": "TemplateVersionsResponse"
+        }
+      },
+      "required": [
+        "TemplateVersionsResponse"
+      ],
+      "payload": "TemplateVersionsResponse"
+    },
     "ListTemplatesRequest": {
       "type": "structure",
       "members": {
@@ -8772,13 +11070,13 @@
           "shape": "__string",
           "location": "querystring",
           "locationName": "next-token",
-          "documentation": "<p>The NextToken string that specifies which page of results to return in a paginated response. This parameter is currently not supported by the Application Metrics and Campaign Metrics resources.</p>"
+          "documentation": "<p>The  string that specifies which page of results to return in a paginated response. This parameter is currently not supported for application, campaign, and journey metrics.</p>"
         },
         "PageSize": {
           "shape": "__string",
           "location": "querystring",
           "locationName": "page-size",
-          "documentation": "<p>The maximum number of items to include in each page of a paginated response. This parameter is currently not supported by the Application Metrics and Campaign Metrics resources.</p>"
+          "documentation": "<p>The maximum number of items to include in each page of a paginated response. This parameter is currently not supported for application, campaign, and journey metrics.</p>"
         },
         "Prefix": {
           "shape": "__string",
@@ -8790,7 +11088,7 @@
           "shape": "__string",
           "location": "querystring",
           "locationName": "template-type",
-          "documentation": "<p>The type of message template to include in the results. Valid values are: EMAIL, SMS, and PUSH. To include all types of templates in the results, don't include this parameter in your request.</p>"
+          "documentation": "<p>The type of message template to include in the results. Valid values are: EMAIL, PUSH, SMS, and VOICE. To include all types of templates in the results, don't include this parameter in your request.</p>"
         }
       }
     },
@@ -8839,7 +11137,7 @@
         },
         "RawContent": {
           "shape": "__string",
-          "documentation": "<p>The raw, JSON-formatted string to use as the payload for the notification message. This value overrides other values for the message.</p>"
+          "documentation": "<p>The raw, JSON-formatted string to use as the payload for the notification message. If specified, this value overrides all other content for the message.</p>"
         },
         "SilentPush": {
           "shape": "__boolean",
@@ -8925,7 +11223,7 @@
         },
         "MessageConfiguration": {
           "shape": "DirectMessageConfiguration",
-          "documentation": "<p>The set of properties that defines the configuration settings for the message.</p>"
+          "documentation": "<p>The settings and content for the default message and any default messages that you defined for specific channels.</p>"
         },
         "TemplateConfiguration": {
           "shape": "TemplateConfiguration",
@@ -8936,7 +11234,7 @@
           "documentation": "<p>The unique identifier for tracing the message. This identifier is visible to message recipients.</p>"
         }
       },
-      "documentation": "<p>Specifies the objects that define configuration and other settings for a message.</p>",
+      "documentation": "<p>Specifies the configuration and other settings for a message.</p>",
       "required": [
         "MessageConfiguration"
       ]
@@ -8971,7 +11269,7 @@
       "members": {
         "DeliveryStatus": {
           "shape": "DeliveryStatus",
-          "documentation": "<p>The delivery status of the message. Possible values are:</p> <ul> <li><p>DUPLICATE - The endpoint address is a duplicate of another endpoint address. Amazon Pinpoint won't attempt to send the message again.</p></li>   <li><p>OPT_OUT - The user who's associated with the endpoint address has opted out of receiving messages from you. Amazon Pinpoint won't attempt to send the message again.</p></li> <li><p>PERMANENT_FAILURE - An error occurred when delivering the message to the endpoint address. Amazon Pinpoint won't attempt to send the message again.</p></li>   <li><p>SUCCESSFUL - The message was successfully delivered to the endpoint address.</p></li> <li><p>TEMPORARY_FAILURE - A temporary error occurred. Amazon Pinpoint will attempt to deliver the message again later.</p></li> <li><p>THROTTLED - Amazon Pinpoint throttled the operation to send the message to the endpoint address.</p></li> <li><p>TIMEOUT - The message couldn't be sent within the timeout period.</p></li> <li><p>UNKNOWN_FAILURE - An unknown error occurred.</p></li></ul>"
+          "documentation": "<p>The delivery status of the message. Possible values are:</p> <ul> <li><p>DUPLICATE - The endpoint address is a duplicate of another endpoint address. Amazon Pinpoint won't attempt to send the message again.</p></li>   <li><p>OPT_OUT - The user who's associated with the endpoint address has opted out of receiving messages from you. Amazon Pinpoint won't attempt to send the message again.</p></li> <li><p>PERMANENT_FAILURE - An error occurred when delivering the message to the endpoint address. Amazon Pinpoint won't attempt to send the message again.</p></li>   <li><p>SUCCESSFUL - The message was successfully delivered to the endpoint address.</p></li> <li><p>TEMPORARY_FAILURE - A temporary error occurred. Amazon Pinpoint won't attempt to send the message again.</p></li> <li><p>THROTTLED - Amazon Pinpoint throttled the operation to send the message to the endpoint address.</p></li> <li><p>TIMEOUT - The message couldn't be sent within the timeout period.</p></li> <li><p>UNKNOWN_FAILURE - An unknown error occurred.</p></li></ul>"
         },
         "MessageId": {
           "shape": "__string",
@@ -9046,6 +11344,38 @@
         "FILTER"
       ]
     },
+    "MultiConditionalBranch": {
+      "type": "structure",
+      "members": {
+        "Condition": {
+          "shape": "SimpleCondition",
+          "documentation": "<p>The condition to evaluate for the activity path.</p>"
+        },
+        "NextActivity": {
+          "shape": "__string",
+          "documentation": "<p>The unique identifier for the next activity to perform, after completing the activity for the path.</p>"
+        }
+      },
+      "documentation": "<p>Specifies a condition to evaluate for an activity path in a journey.</p>"
+    },
+    "MultiConditionalSplitActivity": {
+      "type": "structure",
+      "members": {
+        "Branches": {
+          "shape": "ListOfMultiConditionalBranch",
+          "documentation": "<p>The paths for the activity, including the conditions for entering each path and the activity to perform for each path.</p>"
+        },
+        "DefaultActivity": {
+          "shape": "__string",
+          "documentation": "<p>The unique identifier for the activity to perform for participants who don't meet any of the conditions specified for other paths in the activity.</p>"
+        },
+        "EvaluationWaitTime": {
+          "shape": "WaitTime",
+          "documentation": "<p>The amount of time to wait or the date and time when Amazon Pinpoint determines whether the conditions are met.</p>"
+        }
+      },
+      "documentation": "<p>Specifies the settings for a multivariate split activity in a journey. This type of activity sends participants down one of as many as five paths (including a default <i>Else</i> path) in a journey, based on conditions that you specify.</p>"
+    },
     "NotFoundException": {
       "type": "structure",
       "members": {
@@ -9140,6 +11470,31 @@
       },
       "documentation": "<p>Provides information about a phone number.</p>"
     },
+    "Operator": {
+      "type": "string",
+      "enum": [
+        "ALL",
+        "ANY"
+      ]
+    },
+    "PayloadTooLargeException": {
+      "type": "structure",
+      "members": {
+        "Message": {
+          "shape": "__string",
+          "documentation": "<p>The message that's returned from the API.</p>"
+        },
+        "RequestID": {
+          "shape": "__string",
+          "documentation": "<p>The unique identifier for the request or response.</p>"
+        }
+      },
+      "documentation": "<p>Provides information about an API request or response.</p>",
+      "exception": true,
+      "error": {
+        "httpStatusCode": 413
+      }
+    },
     "PhoneNumberValidateRequest": {
       "type": "structure",
       "members": {
@@ -9233,14 +11588,26 @@
           "shape": "DefaultPushNotificationTemplate",
           "documentation": "<p>The default message template to use for push notification channels.</p>"
         },
+        "DefaultSubstitutions": {
+          "shape": "__string",
+          "documentation": "<p>A JSON object that specifies the default values to use for message variables in the message template. This object is a set of key-value pairs. Each key defines a message variable in the template. The corresponding value defines the default value for that variable. When you create a message that's based on the template, you can override these defaults with message-specific and address-specific variables and values.</p>"
+        },
         "GCM": {
           "shape": "AndroidPushNotificationTemplate",
           "documentation": "<p>The message template to use for the GCM channel, which is used to send notifications through the Firebase Cloud Messaging (FCM), formerly Google Cloud Messaging (GCM), service. This message template overrides the default template for push notification channels (DefaultPushNotificationTemplate).</p>"
         },
+        "RecommenderId": {
+          "shape": "__string",
+          "documentation": "<p>The unique identifier for the recommender model to use for the message template. Amazon Pinpoint uses this value to determine how to retrieve and process data from a recommender model when it sends messages that use the template, if the template contains message variables for recommendation data.</p>"
+        },
         "tags": {
           "shape": "MapOf__string",
           "locationName": "tags",
           "documentation": "<p>A string-to-string map of key-value pairs that defines the tags to associate with the message template. Each tag consists of a required tag key and an associated tag value.</p>"
+        },
+        "TemplateDescription": {
+          "shape": "__string",
+          "documentation": "<p>A custom description of the message template.</p>"
         }
       },
       "documentation": "<p>Specifies the content and settings for a message template that can be used in messages that are sent through a push notification channel.</p>"
@@ -9266,25 +11633,37 @@
         },
         "CreationDate": {
           "shape": "__string",
-          "documentation": "<p>The date when the message template was created.</p>"
+          "documentation": "<p>The date, in ISO 8601 format, when the message template was created.</p>"
         },
         "Default": {
           "shape": "DefaultPushNotificationTemplate",
           "documentation": "<p>The default message template that's used for push notification channels.</p>"
         },
+        "DefaultSubstitutions": {
+          "shape": "__string",
+          "documentation": "<p>The JSON object that specifies the default values that are used for message variables in the message template. This object is a set of key-value pairs. Each key defines a message variable in the template. The corresponding value defines the default value for that variable.</p>"
+        },
         "GCM": {
           "shape": "AndroidPushNotificationTemplate",
           "documentation": "<p>The message template that's used for the GCM channel, which is used to send notifications through the Firebase Cloud Messaging (FCM), formerly Google Cloud Messaging (GCM), service. This message template overrides the default template for push notification channels (DefaultPushNotificationTemplate).</p>"
         },
         "LastModifiedDate": {
           "shape": "__string",
-          "documentation": "<p>The date when the message template was last modified.</p>"
+          "documentation": "<p>The date, in ISO 8601 format, when the message template was last modified.</p>"
+        },
+        "RecommenderId": {
+          "shape": "__string",
+          "documentation": "<p>The unique identifier for the recommender model that's used by the message template.</p>"
         },
         "tags": {
           "shape": "MapOf__string",
           "locationName": "tags",
           "documentation": "<p>A string-to-string map of key-value pairs that identifies the tags that are associated with the message template. Each tag consists of a required tag key and an associated tag value.</p>"
         },
+        "TemplateDescription": {
+          "shape": "__string",
+          "documentation": "<p>The custom description of the message template.</p>"
+        },
         "TemplateName": {
           "shape": "__string",
           "documentation": "<p>The name of the message template.</p>"
@@ -9292,14 +11671,18 @@
         "TemplateType": {
           "shape": "TemplateType",
           "documentation": "<p>The type of channel that the message template is designed for. For a push notification template, this value is PUSH.</p>"
+        },
+        "Version": {
+          "shape": "__string",
+          "documentation": "<p>The unique identifier, as an integer, for the active version of the message template, or the version of the template that you specified by using the version parameter in your request.</p>"
         }
       },
       "documentation": "<p>Provides information about the content and settings for a message template that can be used in messages that are sent through a push notification channel.</p>",
       "required": [
         "LastModifiedDate",
         "CreationDate",
-        "TemplateName",
-        "TemplateType"
+        "TemplateType",
+        "TemplateName"
       ]
     },
     "PutEventStreamRequest": {
@@ -9378,6 +11761,30 @@
       },
       "documentation": "<p>Specifies the start and end times that define a time range when messages aren't sent to endpoints.</p>"
     },
+    "RandomSplitActivity": {
+      "type": "structure",
+      "members": {
+        "Branches": {
+          "shape": "ListOfRandomSplitEntry",
+          "documentation": "<p>The paths for the activity, including the percentage of participants to enter each path and the activity to perform for each path.</p>"
+        }
+      },
+      "documentation": "<p>Specifies the settings for a random split activity in a journey. This type of activity randomly sends specified percentages of participants down one of as many as five paths in a journey, based on conditions that you specify.</p>"
+    },
+    "RandomSplitEntry": {
+      "type": "structure",
+      "members": {
+        "NextActivity": {
+          "shape": "__string",
+          "documentation": "<p>The unique identifier for the next activity to perform, after completing the activity for the path.</p>"
+        },
+        "Percentage": {
+          "shape": "__integer",
+          "documentation": "<p>The percentage of participants to send down the activity path.</p> <p>To determine which participants are sent down each path, Amazon Pinpoint applies a probability-based algorithm to the percentages that you specify for the paths. Therefore, the actual percentage of participants who are sent down a path may not be equal to the percentage that you specify.</p>"
+        }
+      },
+      "documentation": "<p>Specifies the settings for a path in a random split activity in a journey.</p>"
+    },
     "RawEmail": {
       "type": "structure",
       "members": {
@@ -9398,22 +11805,83 @@
           "shape": "Duration",
           "documentation": "<p>The duration to use when determining whether an endpoint is active or inactive.</p>"
         },
-        "RecencyType": {
-          "shape": "RecencyType",
-          "documentation": "<p>The type of recency dimension to use for the segment. Valid values are: ACTIVE, endpoints that were active within the specified duration are included in the segment; and, INACTIVE, endpoints that weren't active within the specified duration are included in the segment.</p>"
+        "RecencyType": {
+          "shape": "RecencyType",
+          "documentation": "<p>The type of recency dimension to use for the segment. Valid values are: ACTIVE, endpoints that were active within the specified duration are included in the segment; and, INACTIVE, endpoints that weren't active within the specified duration are included in the segment.</p>"
+        }
+      },
+      "documentation": "<p>Specifies criteria for including or excluding endpoints from a segment based on how recently an endpoint was active.</p>",
+      "required": [
+        "Duration",
+        "RecencyType"
+      ]
+    },
+    "RecencyType": {
+      "type": "string",
+      "enum": [
+        "ACTIVE",
+        "INACTIVE"
+      ]
+    },
+    "RecommenderConfigurationResponse": {
+      "type": "structure",
+      "members": {
+        "Attributes": {
+          "shape": "MapOf__string",
+          "documentation": "<p>A map that defines 1-10 custom endpoint or user attributes, depending on the value for the RecommenderUserIdType property. Each of these attributes temporarily stores a recommended item that's retrieved from the recommender model and sent to an AWS Lambda function for additional processing. Each attribute can be used as a message variable in a message template.</p> <p>This value is null if the configuration doesn't invoke an AWS Lambda function (LambdaFunctionArn) to perform additional processing of recommendation data.</p>"
+        },
+        "CreationDate": {
+          "shape": "__string",
+          "documentation": "<p>The date, in extended ISO 8601 format, when the configuration was created for the recommender model.</p>"
+        },
+        "Description": {
+          "shape": "__string",
+          "documentation": "<p>The custom description of the configuration for the recommender model.</p>"
+        },
+        "Id": {
+          "shape": "__string",
+          "documentation": "<p>The unique identifier for the recommender model configuration.</p>"
+        },
+        "LastModifiedDate": {
+          "shape": "__string",
+          "documentation": "<p>The date, in extended ISO 8601 format, when the configuration for the recommender model was last modified.</p>"
+        },
+        "Name": {
+          "shape": "__string",
+          "documentation": "<p>The custom name of the configuration for the recommender model.</p>"
+        },
+        "RecommendationProviderIdType": {
+          "shape": "__string",
+          "documentation": "<p>The type of Amazon Pinpoint ID that's associated with unique user IDs in the recommender model. This value enables the model to use attribute and event data that’s specific to a particular endpoint or user in an Amazon Pinpoint application. Possible values are:</p> <ul><li><p>PINPOINT_ENDPOINT_ID - Each user in the model is associated with a particular endpoint in Amazon Pinpoint. The data is correlated based on endpoint IDs in Amazon Pinpoint. This is the default value.</p></li> <li><p>PINPOINT_USER_ID - Each user in the model is associated with a particular user and endpoint in Amazon Pinpoint. The data is correlated based on user IDs in Amazon Pinpoint. If this value is specified, an endpoint definition in Amazon Pinpoint has to specify both a user ID (UserId) and an endpoint ID. Otherwise, messages won’t be sent to the user's endpoint.</p></li></ul>"
+        },
+        "RecommendationProviderRoleArn": {
+          "shape": "__string",
+          "documentation": "<p>The Amazon Resource Name (ARN) of the AWS Identity and Access Management (IAM) role that authorizes Amazon Pinpoint to retrieve recommendation data from the recommender model.</p>"
+        },
+        "RecommendationProviderUri": {
+          "shape": "__string",
+          "documentation": "<p>The Amazon Resource Name (ARN) of the recommender model that Amazon Pinpoint retrieves the recommendation data from. This value is the ARN of an Amazon Personalize campaign.</p>"
+        },
+        "RecommendationTransformerUri": {
+          "shape": "__string",
+          "documentation": "<p>The name or Amazon Resource Name (ARN) of the AWS Lambda function that Amazon Pinpoint invokes to perform additional processing of recommendation data that it retrieves from the recommender model.</p>"
+        },
+        "RecommendationsDisplayName": {
+          "shape": "__string",
+          "documentation": "<p>The custom display name for the standard endpoint or user attribute (RecommendationItems) that temporarily stores a recommended item for each endpoint or user, depending on the value for the RecommenderUserIdType property. This name appears in the <b>Attribute finder</b> pane of the template editor on the Amazon Pinpoint console.</p> <p>This value is null if the configuration doesn't invoke an AWS Lambda function (LambdaFunctionArn) to perform additional processing of recommendation data.</p>"
+        },
+        "RecommendationsPerMessage": {
+          "shape": "__integer",
+          "documentation": "<p>The number of recommended items that are retrieved from the model for each endpoint or user, depending on the value for the RecommenderUserIdType property. This number determines how many recommended attributes are available for use as message variables in message templates.</p>"
         }
       },
-      "documentation": "<p>Specifies criteria for including or excluding endpoints from a segment based on how recently an endpoint was active.</p>",
+      "documentation": "<p>Provides information about Amazon Pinpoint configuration settings for retrieving and processing data from a recommender model.</p>",
       "required": [
-        "Duration",
-        "RecencyType"
-      ]
-    },
-    "RecencyType": {
-      "type": "string",
-      "enum": [
-        "ACTIVE",
-        "INACTIVE"
+        "RecommendationProviderUri",
+        "LastModifiedDate",
+        "CreationDate",
+        "RecommendationProviderRoleArn",
+        "Id"
       ]
     },
     "RemoveAttributesRequest": {
@@ -9429,7 +11897,7 @@
           "shape": "__string",
           "location": "uri",
           "locationName": "attribute-type",
-          "documentation": " <p>The type of attribute or attributes to remove. Valid values are:</p> <ul><li><p>endpoint-custom-attributes - Custom attributes that describe endpoints, such as the date when an associated user opted in or out of receiving communications from you through a specific type of channel.</p></li> <li><p>endpoint-custom-metrics - Custom metrics that your app reports to Amazon Pinpoint for endpoints, such as the number of app sessions or the number of items left in a cart.</p></li> <li><p>endpoint-user-attributes - Custom attributes that describe users, such as first name, last name, and age.</p></li></ul>"
+          "documentation": " <p>The type of attribute or attributes to remove. Valid values are:</p> <ul><li><p>endpoint-custom-attributes - Custom attributes that describe endpoints, such as the date when an associated user opted in or out of receiving communications from you through a specific type of channel.</p></li> <li><p>endpoint-metric-attributes - Custom metrics that your app reports to Amazon Pinpoint for endpoints, such as the number of app sessions or the number of items left in a cart.</p></li> <li><p>endpoint-user-attributes - Custom attributes that describe users, such as first name, last name, and age.</p></li></ul>"
         },
         "UpdateAttributesRequest": {
           "shape": "UpdateAttributesRequest"
@@ -9463,10 +11931,10 @@
         },
         "Values": {
           "shape": "ListOfResultRowValue",
-          "documentation": "<p>An array of objects that provides pre-aggregated values for a standard metric that applies to an application or campaign.</p>"
+          "documentation": "<p>An array of objects that provides pre-aggregated values for a standard metric that applies to an application, campaign, or journey.</p>"
         }
       },
-      "documentation": "<p>Provides the results of a query that retrieved the data for a standard metric that applies to an application or campaign.</p>",
+      "documentation": "<p>Provides the results of a query that retrieved the data for a standard metric that applies to an application, campaign, or journey.</p>",
       "required": [
         "GroupedBys",
         "Values"
@@ -9477,18 +11945,18 @@
       "members": {
         "Key": {
           "shape": "__string",
-          "documentation": "<p>The name of the field that Amazon Pinpoint uses to store the value specified by the Value property.</p>"
+          "documentation": "<p>The friendly name of the metric whose value is specified by the Value property.</p>"
         },
         "Type": {
           "shape": "__string",
-          "documentation": " <p>The data type of the value specified by the Value property.</p>"
+          "documentation": "<p>The data type of the value specified by the Value property.</p>"
         },
         "Value": {
           "shape": "__string",
           "documentation": "<p>In a Values object, the value for the metric that the query retrieved data for. In a GroupedBys object, the value for the field that was used to group data in a result set that contains multiple results (Values objects).</p>"
         }
       },
-      "documentation": "<p>Provides a single value and metadata about that value as part of an array of query results for a standard metric that applies to an application or campaign.</p>",
+      "documentation": "<p>Provides a single value and metadata about that value as part of an array of query results for a standard metric that applies to an application, campaign, or journey.</p>",
       "required": [
         "Type",
         "Value",
@@ -9589,6 +12057,10 @@
           "shape": "__string",
           "documentation": "<p>The SMS program name that you provided to AWS Support when you requested your dedicated number.</p>"
         },
+        "MediaUrl": {
+          "shape": "__string",
+          "documentation": "<p>The URL of an image or video to display in the SMS message.</p>"
+        },
         "MessageType": {
           "shape": "MessageType",
           "documentation": "<p>The SMS message type. Valid values are: TRANSACTIONAL, the message is critical or time-sensitive, such as a one-time password that supports a customer transaction; and, PROMOTIONAL, the message is not critical or time-sensitive, such as a marketing message.</p>"
@@ -9615,10 +12087,22 @@
           "shape": "__string",
           "documentation": "<p>The message body to use in text messages that are based on the message template.</p>"
         },
+        "DefaultSubstitutions": {
+          "shape": "__string",
+          "documentation": "<p>A JSON object that specifies the default values to use for message variables in the message template. This object is a set of key-value pairs. Each key defines a message variable in the template. The corresponding value defines the default value for that variable. When you create a message that's based on the template, you can override these defaults with message-specific and address-specific variables and values.</p>"
+        },
+        "RecommenderId": {
+          "shape": "__string",
+          "documentation": "<p>The unique identifier for the recommender model to use for the message template. Amazon Pinpoint uses this value to determine how to retrieve and process data from a recommender model when it sends messages that use the template, if the template contains message variables for recommendation data.</p>"
+        },
         "tags": {
           "shape": "MapOf__string",
           "locationName": "tags",
           "documentation": "<p>A string-to-string map of key-value pairs that defines the tags to associate with the message template. Each tag consists of a required tag key and an associated tag value.</p>"
+        },
+        "TemplateDescription": {
+          "shape": "__string",
+          "documentation": "<p>A custom description of the message template.</p>"
         }
       },
       "documentation": "<p>Specifies the content and settings for a message template that can be used in text messages that are sent through the SMS channel.</p>"
@@ -9636,17 +12120,29 @@
         },
         "CreationDate": {
           "shape": "__string",
-          "documentation": "<p>The date when the message template was created.</p>"
+          "documentation": "<p>The date, in ISO 8601 format, when the message template was created.</p>"
+        },
+        "DefaultSubstitutions": {
+          "shape": "__string",
+          "documentation": "<p>The JSON object that specifies the default values that are used for message variables in the message template. This object is a set of key-value pairs. Each key defines a message variable in the template. The corresponding value defines the default value for that variable.</p>"
         },
         "LastModifiedDate": {
           "shape": "__string",
-          "documentation": "<p>The date when the message template was last modified.</p>"
+          "documentation": "<p>The date, in ISO 8601 format, when the message template was last modified.</p>"
+        },
+        "RecommenderId": {
+          "shape": "__string",
+          "documentation": "<p>The unique identifier for the recommender model that's used by the message template.</p>"
         },
         "tags": {
           "shape": "MapOf__string",
           "locationName": "tags",
           "documentation": "<p>A string-to-string map of key-value pairs that identifies the tags that are associated with the message template. Each tag consists of a required tag key and an associated tag value.</p>"
         },
+        "TemplateDescription": {
+          "shape": "__string",
+          "documentation": "<p>The custom description of the message template.</p>"
+        },
         "TemplateName": {
           "shape": "__string",
           "documentation": "<p>The name of the message template.</p>"
@@ -9654,6 +12150,10 @@
         "TemplateType": {
           "shape": "TemplateType",
           "documentation": "<p>The type of channel that the message template is designed for. For an SMS template, this value is SMS.</p>"
+        },
+        "Version": {
+          "shape": "__string",
+          "documentation": "<p>The unique identifier, as an integer, for the active version of the message template, or the version of the template that you specified by using the version parameter in your request.</p>"
         }
       },
       "documentation": "<p>Provides information about the content and settings for a message template that can be used in text messages that are sent through the SMS channel.</p>",
@@ -9669,7 +12169,7 @@
       "members": {
         "EndTime": {
           "shape": "__string",
-          "documentation": "<p>The scheduled time, in ISO 8601 format, for the campaign to end.</p>"
+          "documentation": "<p>The scheduled time, in ISO 8601 format, when the campaign ended or will end.</p>"
         },
         "EventFilter": {
           "shape": "CampaignEventFilter",
@@ -9689,7 +12189,7 @@
         },
         "StartTime": {
           "shape": "__string",
-          "documentation": "<p>The scheduled time, in ISO 8601 format, for the campaign to begin.</p>"
+          "documentation": "<p>The scheduled time when the campaign began or will begin. Valid values are: IMMEDIATE, to start the campaign immediately; or, a specific time in ISO 8601 format.</p>"
         },
         "Timezone": {
           "shape": "__string",
@@ -9711,6 +12211,19 @@
       },
       "documentation": "<p>Specifies dimension settings for including or excluding endpoints from a segment based on how recently an endpoint was active.</p>"
     },
+    "SegmentCondition": {
+      "type": "structure",
+      "members": {
+        "SegmentId": {
+          "shape": "__string",
+          "documentation": "<p>The unique identifier for the segment to associate with the activity.</p>"
+        }
+      },
+      "documentation": "<p>Specifies a segment to associate with an activity in a journey.</p>",
+      "required": [
+        "SegmentId"
+      ]
+    },
     "SegmentDemographics": {
       "type": "structure",
       "members": {
@@ -10001,7 +12514,7 @@
         },
         "MessageConfiguration": {
           "shape": "DirectMessageConfiguration",
-          "documentation": "<p>The message definitions for the default message and any default messages that you defined for specific channels.</p>"
+          "documentation": "<p>The settings and content for the default message and any default messages that you defined for specific channels.</p>"
         },
         "TemplateConfiguration": {
           "shape": "TemplateConfiguration",
@@ -10117,12 +12630,31 @@
         "Values"
       ]
     },
+    "SimpleCondition": {
+      "type": "structure",
+      "members": {
+        "EventCondition": {
+          "shape": "EventCondition",
+          "documentation": "<p>The dimension settings for the event that's associated with the activity.</p>"
+        },
+        "SegmentCondition": {
+          "shape": "SegmentCondition",
+          "documentation": "<p>The segment that's associated with the activity.</p>"
+        },
+        "SegmentDimensions": {
+          "shape": "SegmentDimensions",
+          "locationName": "segmentDimensions",
+          "documentation": "<p>The dimension settings for the segment that's associated with the activity.</p>"
+        }
+      },
+      "documentation": "<p>Specifies a condition to evaluate for an activity in a journey.</p>"
+    },
     "SimpleEmail": {
       "type": "structure",
       "members": {
         "HtmlPart": {
           "shape": "SimpleEmailPart",
-          "documentation": "<p>The body of the email message, in HTML format. We recommend using an HTML part for email clients that support HTML. You can include links, formatted text, and more in an HTML message.</p>"
+          "documentation": "<p>The body of the email message, in HTML format. We recommend using HTML format for email clients that render HTML content. You can include links, formatted text, and more in an HTML message.</p>"
         },
         "Subject": {
           "shape": "SimpleEmailPart",
@@ -10130,7 +12662,7 @@
         },
         "TextPart": {
           "shape": "SimpleEmailPart",
-          "documentation": "<p>The body of the email message, in text format. We recommend using a text part for email clients that don't support HTML and clients that are connected to high-latency networks, such as mobile devices.</p>"
+          "documentation": "<p>The body of the email message, in plain text format. We recommend using plain text format for email clients that don't render HTML content and clients that are connected to high-latency networks, such as mobile devices.</p>"
         }
       },
       "documentation": "<p>Specifies the contents of an email message, composed of a subject, a text part, and an HTML part.</p>"
@@ -10157,6 +12689,30 @@
         "NONE"
       ]
     },
+    "StartCondition": {
+      "type": "structure",
+      "members": {
+        "Description": {
+          "shape": "__string",
+          "documentation": "<p>The custom description of the condition.</p>"
+        },
+        "SegmentStartCondition": {
+          "shape": "SegmentCondition",
+          "documentation": "<p>The segment that's associated with the first activity in the journey. This segment determines which users are participants in the journey.</p>"
+        }
+      },
+      "documentation": "<p>Specifies the conditions for the first activity in a journey. This activity and its conditions determine which users are participants in a journey.</p>"
+    },
+    "State": {
+      "type": "string",
+      "enum": [
+        "DRAFT",
+        "ACTIVE",
+        "COMPLETED",
+        "CANCELLED",
+        "CLOSED"
+      ]
+    },
     "TagResourceRequest": {
       "type": "structure",
       "members": {
@@ -10164,7 +12720,7 @@
           "shape": "__string",
           "location": "uri",
           "locationName": "resource-arn",
-          "documentation": "<p>The Amazon Resource Name (ARN) of the application, campaign, message template, or segment.</p>"
+          "documentation": "<p>The Amazon Resource Name (ARN) of the resource.</p>"
         },
         "TagsModel": {
           "shape": "TagsModel"
@@ -10182,7 +12738,7 @@
         "tags": {
           "shape": "MapOf__string",
           "locationName": "tags",
-          "documentation": "<p>A string-to-string map of key-value pairs that defines the tags for an application, campaign, message template, or segment. Each project, campaign, message template, or segment can have a maximum of 50 tags.</p> <p>Each tag consists of a required tag key and an associated tag value. The maximum length of a tag key is 128 characters. The maximum length of a tag value is 256 characters.</p>"
+          "documentation": "<p>A string-to-string map of key-value pairs that defines the tags for an application, campaign, message template, or segment. Each of these resources can have a maximum of 50 tags.</p> <p>Each tag consists of a required tag key and an associated tag value. The maximum length of a tag key is 128 characters. The maximum length of a tag value is 256 characters.</p>"
         }
       },
       "documentation": "<p>Specifies the tags (keys and values) for an application, campaign, message template, or segment.</p>",
@@ -10196,9 +12752,23 @@
         "Name": {
           "shape": "__string",
           "documentation": "<p>The name of the message template to use for the message. If specified, this value must match the name of an existing message template.</p>"
+        },
+        "Version": {
+          "shape": "__string",
+          "documentation": "<p>The unique identifier for the version of the message template to use for the message. If specified, this value must match the identifier for an existing template version. To retrieve a list of versions and version identifiers for a template, use the <link  linkend=\"templates-template-name-template-type-versions\">Template Versions</link> resource.</p> <p>If you don't specify a value for this property, Amazon Pinpoint uses the <i>active version</i> of the template. The <i>active version</i> is typically the version of a template that's been most recently reviewed and approved for use, depending on your workflow. It isn't necessarily the latest version of a template.</p>"
+        }
+      },
+      "documentation": "<p>Specifies the name and version of the message template to use for the message.</p>"
+    },
+    "TemplateActiveVersionRequest": {
+      "type": "structure",
+      "members": {
+        "Version": {
+          "shape": "__string",
+          "documentation": "<p>The version of the message template to use as the active version of the template. Valid values are: latest, for the most recent version of the template; or, the unique identifier for any existing version of the template. If you specify an identifier, the value must match the identifier for an existing template version. To retrieve a list of versions and version identifiers for a template, use the <link  linkend=\"templates-template-name-template-type-versions\">Template Versions</link> resource.</p>"
         }
       },
-      "documentation": "<p>Specifies the name of the message template to use for the message.</p>"
+      "documentation": "<p>Specifies which version of a message template to use as the active version of the template.</p>"
     },
     "TemplateConfiguration": {
       "type": "structure",
@@ -10214,6 +12784,10 @@
         "SMSTemplate": {
           "shape": "Template",
           "documentation": "<p>The SMS template to use for the message.</p>"
+        },
+        "VoiceTemplate": {
+          "shape": "Template",
+          "documentation": "<p>The voice template to use for the message. This object isn't supported for campaigns.</p>"
         }
       },
       "documentation": "<p>Specifies the message template to use for the message, for each type of channel.</p>"
@@ -10223,20 +12797,28 @@
       "members": {
         "Arn": {
           "shape": "__string",
-          "documentation": "<p>The Amazon Resource Name (ARN) of the message template.</p>"
+          "documentation": "<p>The Amazon Resource Name (ARN) of the message template. This value isn't included in a TemplateResponse object. To retrieve the ARN of a template, use the GetEmailTemplate, GetPushTemplate, GetSmsTemplate, or GetVoiceTemplate operation, depending on the type of template that you want to retrieve the ARN for.</p>"
         },
         "CreationDate": {
           "shape": "__string",
-          "documentation": "<p>The date when the message template was created.</p>"
+          "documentation": "<p>The date, in ISO 8601 format, when the message template was created.</p>"
+        },
+        "DefaultSubstitutions": {
+          "shape": "__string",
+          "documentation": "<p>The JSON object that specifies the default values that are used for message variables in the message template. This object isn't included in a TemplateResponse object. To retrieve this object for a template, use the GetEmailTemplate, GetPushTemplate, GetSmsTemplate, or GetVoiceTemplate operation, depending on the type of template that you want to retrieve the object for.</p>"
         },
         "LastModifiedDate": {
           "shape": "__string",
-          "documentation": "<p>The date when the message template was last modified.</p>"
+          "documentation": "<p>The date, in ISO 8601 format, when the message template was last modified.</p>"
         },
         "tags": {
           "shape": "MapOf__string",
           "locationName": "tags",
-          "documentation": "<p>A string-to-string map of key-value pairs that identifies the tags that are associated with the message template. Each tag consists of a required tag key and an associated tag value.</p>"
+          "documentation": "<p>A map of key-value pairs that identifies the tags that are associated with the message template. This object isn't included in a TemplateResponse object. To retrieve this object for a template, use the GetEmailTemplate, GetPushTemplate, GetSmsTemplate, or GetVoiceTemplate operation, depending on the type of template that you want to retrieve the object for.</p>"
+        },
+        "TemplateDescription": {
+          "shape": "__string",
+          "documentation": "<p>The custom description of the message template. This value isn't included in a TemplateResponse object. To retrieve the description of a template, use the GetEmailTemplate, GetPushTemplate, GetSmsTemplate, or GetVoiceTemplate operation, depending on the type of template that you want to retrieve the description for.</p>"
         },
         "TemplateName": {
           "shape": "__string",
@@ -10244,7 +12826,11 @@
         },
         "TemplateType": {
           "shape": "TemplateType",
-          "documentation": "<p>The type of channel that the message template is designed for.</p>"
+          "documentation": "<p>The type of channel that the message template is designed for. Possible values are: EMAIL, PUSH, SMS, and VOICE.</p>"
+        },
+        "Version": {
+          "shape": "__string",
+          "documentation": "<p>The unique identifier, as an integer, for the active version of the message template.</p>"
         }
       },
       "documentation": "<p>Provides information about a message template that's associated with your Amazon Pinpoint account.</p>",
@@ -10260,9 +12846,75 @@
       "enum": [
         "EMAIL",
         "SMS",
+        "VOICE",
         "PUSH"
       ]
     },
+    "TemplateVersionResponse": {
+      "type": "structure",
+      "members": {
+        "CreationDate": {
+          "shape": "__string",
+          "documentation": "<p>The date, in ISO 8601 format, when the version of the message template was created.</p>"
+        },
+        "DefaultSubstitutions": {
+          "shape": "__string",
+          "documentation": "<p>A JSON object that specifies the default values that are used for message variables in the version of the message template. This object is a set of key-value pairs. Each key defines a message variable in the template. The corresponding value defines the default value for that variable.</p>"
+        },
+        "LastModifiedDate": {
+          "shape": "__string",
+          "documentation": "<p>The date, in ISO 8601 format, when the version of the message template was last modified.</p>"
+        },
+        "TemplateDescription": {
+          "shape": "__string",
+          "documentation": "<p>The custom description of the version of the message template.</p>"
+        },
+        "TemplateName": {
+          "shape": "__string",
+          "documentation": "<p>The name of the message template.</p>"
+        },
+        "TemplateType": {
+          "shape": "__string",
+          "documentation": "<p>The type of channel that the message template is designed for. Possible values are: EMAIL, PUSH, SMS, and VOICE.</p>"
+        },
+        "Version": {
+          "shape": "__string",
+          "documentation": "<p>The unique identifier for the version of the message template. This value is an integer that Amazon Pinpoint automatically increments and assigns to each new version of a template.</p>"
+        }
+      },
+      "documentation": "<p>Provides information about a specific version of a message template.</p>",
+      "required": [
+        "LastModifiedDate",
+        "CreationDate",
+        "TemplateName",
+        "TemplateType"
+      ]
+    },
+    "TemplateVersionsResponse": {
+      "type": "structure",
+      "members": {
+        "Item": {
+          "shape": "ListOfTemplateVersionResponse",
+          "documentation": "<p>An array of responses, one for each version of the message template.</p>"
+        },
+        "Message": {
+          "shape": "__string",
+          "documentation": "<p>The message that's returned from the API for the request to retrieve information about all the versions of the message template.</p>"
+        },
+        "NextToken": {
+          "shape": "__string",
+          "documentation": "<p>The string to use in a subsequent request to get the next page of results in a paginated response. This value is null if there are no additional pages.</p>"
+        },
+        "RequestID": {
+          "shape": "__string",
+          "documentation": "<p>The unique identifier for the request to retrieve information about all the versions of the message template.</p>"
+        }
+      },
+      "documentation": "<p>Provides information about all the versions of a specific message template.</p>",
+      "required": [
+        "Item"
+      ]
+    },
     "TemplatesResponse": {
       "type": "structure",
       "members": {
@@ -10319,10 +12971,11 @@
         },
         "State": {
           "shape": "CampaignState",
-          "documentation": "<p>The status of the treatment.</p>"
+          "documentation": "<p>The current status of the treatment.</p>"
         },
         "TemplateConfiguration": {
-          "shape": "TemplateConfiguration"
+          "shape": "TemplateConfiguration",
+          "documentation": "<p>The message template to use for the treatment.</p>"
         },
         "TreatmentDescription": {
           "shape": "__string",
@@ -10354,13 +13007,13 @@
           "shape": "__string",
           "location": "uri",
           "locationName": "resource-arn",
-          "documentation": "<p>The Amazon Resource Name (ARN) of the application, campaign, message template, or segment.</p>"
+          "documentation": "<p>The Amazon Resource Name (ARN) of the resource.</p>"
         },
         "TagKeys": {
           "shape": "ListOf__string",
           "location": "querystring",
           "locationName": "tagKeys",
-          "documentation": "<p>The key of the tag to remove from the application, campaign, message template, or segment. To remove multiple tags, append the tagKeys parameter and argument for each additional tag to remove, separated by an ampersand (&amp;).</p>"
+          "documentation": "<p>The key of the tag to remove from the resource. To remove multiple tags, append the tagKeys parameter and argument for each additional tag to remove, separated by an ampersand (&amp;).</p>"
         }
       },
       "required": [
@@ -10667,6 +13320,12 @@
     "UpdateEmailTemplateRequest": {
       "type": "structure",
       "members": {
+        "CreateNewVersion": {
+          "shape": "__boolean",
+          "location": "querystring",
+          "locationName": "create-new-version",
+          "documentation": "<p>Specifies whether to save the updates as a new version of the message template. Valid values are: true, save the updates as a new version; and, false, save the updates to (overwrite) the latest existing version of the template.</p> <p>If you don't specify a value for this parameter, Amazon Pinpoint saves the updates to (overwrites) the latest existing version of the template. If you specify a value of true for this parameter, don't specify a value for the version parameter. Otherwise, an error will occur.</p>"
+        },
         "EmailTemplateRequest": {
           "shape": "EmailTemplateRequest"
         },
@@ -10675,6 +13334,12 @@
           "location": "uri",
           "locationName": "template-name",
           "documentation": "<p>The name of the message template. A template name must start with an alphanumeric character and can contain a maximum of 128 characters. The characters can be alphanumeric characters, underscores (_), or hyphens (-). Template names are case sensitive.</p>"
+        },
+        "Version": {
+          "shape": "__string",
+          "location": "querystring",
+          "locationName": "version",
+          "documentation": "<p>The unique identifier for the version of the message template to update, retrieve information about, or delete. To retrieve identifiers and other information for all the versions of a template, use the <link  linkend=\"templates-template-name-template-type-versions\">Template Versions</link> resource.</p> <p>If specified, this value must match the identifier for an existing template version. If specified for an update operation, this value must match the identifier for the latest existing version of the template. This restriction helps ensure that race conditions don't occur.</p> <p>If you don't specify a value for this parameter, Amazon Pinpoint does the following:</p> <ul><li><p>For a get operation, retrieves information about the active version of the template.</p></li> <li><p>For an update operation, saves the updates to (overwrites) the latest existing version of the template, if the create-new-version parameter isn't used or is set to false.</p></li> <li><p>For a delete operation, deletes the template, including all versions of the template.</p></li></ul>"
         }
       },
       "required": [
@@ -10791,41 +13456,205 @@
         }
       },
       "required": [
-        "GCMChannelResponse"
-      ],
-      "payload": "GCMChannelResponse"
+        "GCMChannelResponse"
+      ],
+      "payload": "GCMChannelResponse"
+    },
+    "UpdateJourneyRequest": {
+      "type": "structure",
+      "members": {
+        "ApplicationId": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "application-id",
+          "documentation": "<p>The unique identifier for the application. This identifier is displayed as the <b>Project ID</b> on the Amazon Pinpoint console.</p>"
+        },
+        "JourneyId": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "journey-id",
+          "documentation": "<p>The unique identifier for the journey.</p>"
+        },
+        "WriteJourneyRequest": {
+          "shape": "WriteJourneyRequest"
+        }
+      },
+      "required": [
+        "JourneyId",
+        "ApplicationId",
+        "WriteJourneyRequest"
+      ],
+      "payload": "WriteJourneyRequest"
+    },
+    "UpdateJourneyResponse": {
+      "type": "structure",
+      "members": {
+        "JourneyResponse": {
+          "shape": "JourneyResponse"
+        }
+      },
+      "required": [
+        "JourneyResponse"
+      ],
+      "payload": "JourneyResponse"
+    },
+    "UpdateJourneyStateRequest": {
+      "type": "structure",
+      "members": {
+        "ApplicationId": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "application-id",
+          "documentation": "<p>The unique identifier for the application. This identifier is displayed as the <b>Project ID</b> on the Amazon Pinpoint console.</p>"
+        },
+        "JourneyId": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "journey-id",
+          "documentation": "<p>The unique identifier for the journey.</p>"
+        },
+        "JourneyStateRequest": {
+          "shape": "JourneyStateRequest"
+        }
+      },
+      "required": [
+        "JourneyId",
+        "ApplicationId",
+        "JourneyStateRequest"
+      ],
+      "payload": "JourneyStateRequest"
+    },
+    "UpdateJourneyStateResponse": {
+      "type": "structure",
+      "members": {
+        "JourneyResponse": {
+          "shape": "JourneyResponse"
+        }
+      },
+      "required": [
+        "JourneyResponse"
+      ],
+      "payload": "JourneyResponse"
+    },
+    "UpdatePushTemplateRequest": {
+      "type": "structure",
+      "members": {
+        "CreateNewVersion": {
+          "shape": "__boolean",
+          "location": "querystring",
+          "locationName": "create-new-version",
+          "documentation": "<p>Specifies whether to save the updates as a new version of the message template. Valid values are: true, save the updates as a new version; and, false, save the updates to (overwrite) the latest existing version of the template.</p> <p>If you don't specify a value for this parameter, Amazon Pinpoint saves the updates to (overwrites) the latest existing version of the template. If you specify a value of true for this parameter, don't specify a value for the version parameter. Otherwise, an error will occur.</p>"
+        },
+        "PushNotificationTemplateRequest": {
+          "shape": "PushNotificationTemplateRequest"
+        },
+        "TemplateName": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "template-name",
+          "documentation": "<p>The name of the message template. A template name must start with an alphanumeric character and can contain a maximum of 128 characters. The characters can be alphanumeric characters, underscores (_), or hyphens (-). Template names are case sensitive.</p>"
+        },
+        "Version": {
+          "shape": "__string",
+          "location": "querystring",
+          "locationName": "version",
+          "documentation": "<p>The unique identifier for the version of the message template to update, retrieve information about, or delete. To retrieve identifiers and other information for all the versions of a template, use the <link  linkend=\"templates-template-name-template-type-versions\">Template Versions</link> resource.</p> <p>If specified, this value must match the identifier for an existing template version. If specified for an update operation, this value must match the identifier for the latest existing version of the template. This restriction helps ensure that race conditions don't occur.</p> <p>If you don't specify a value for this parameter, Amazon Pinpoint does the following:</p> <ul><li><p>For a get operation, retrieves information about the active version of the template.</p></li> <li><p>For an update operation, saves the updates to (overwrites) the latest existing version of the template, if the create-new-version parameter isn't used or is set to false.</p></li> <li><p>For a delete operation, deletes the template, including all versions of the template.</p></li></ul>"
+        }
+      },
+      "required": [
+        "TemplateName",
+        "PushNotificationTemplateRequest"
+      ],
+      "payload": "PushNotificationTemplateRequest"
+    },
+    "UpdatePushTemplateResponse": {
+      "type": "structure",
+      "members": {
+        "MessageBody": {
+          "shape": "MessageBody"
+        }
+      },
+      "required": [
+        "MessageBody"
+      ],
+      "payload": "MessageBody"
+    },
+    "UpdateRecommenderConfiguration": {
+      "type": "structure",
+      "members": {
+        "Attributes": {
+          "shape": "MapOf__string",
+          "documentation": "<p>A map of key-value pairs that defines 1-10 custom endpoint or user attributes, depending on the value for the RecommenderUserIdType property. Each of these attributes temporarily stores a recommended item that's retrieved from the recommender model and sent to an AWS Lambda function for additional processing. Each attribute can be used as a message variable in a message template.</p> <p>In the map, the key is the name of a custom attribute and the value is a custom display name for that attribute. The display name appears in the <b>Attribute finder</b> pane of the template editor on the Amazon Pinpoint console. The following restrictions apply to these names:</p> <ul><li><p>An attribute name must start with a letter or number and it can contain up to 50 characters. The characters can be letters, numbers, underscores (_), or hyphens (-). Attribute names are case sensitive and must be unique.</p></li> <li><p>An attribute display name must start with a letter or number and it can contain up to 25 characters. The characters can be letters, numbers, spaces, underscores (_), or hyphens (-).</p></li></ul> <p>This object is required if the configuration invokes an AWS Lambda function (LambdaFunctionArn) to process recommendation data. Otherwise, don't include this object in your request.</p>"
+        },
+        "Description": {
+          "shape": "__string",
+          "documentation": "<p>A custom description of the configuration for the recommender model. The description can contain up to 128 characters.</p>"
+        },
+        "Name": {
+          "shape": "__string",
+          "documentation": "<p>A custom name of the configuration for the recommender model. The name must start with a letter or number and it can contain up to 128 characters. The characters can be letters, numbers, spaces, underscores (_), or hyphens (-).</p>"
+        },
+        "RecommendationProviderIdType": {
+          "shape": "__string",
+          "documentation": "<p>The type of Amazon Pinpoint ID to associate with unique user IDs in the recommender model. This value enables the model to use attribute and event data that’s specific to a particular endpoint or user in an Amazon Pinpoint application. Valid values are:</p> <ul><li><p>PINPOINT_ENDPOINT_ID - Associate each user in the model with a particular endpoint in Amazon Pinpoint. The data is correlated based on endpoint IDs in Amazon Pinpoint. This is the default value.</p></li> <li><p>PINPOINT_USER_ID - Associate each user in the model with a particular user and endpoint in Amazon Pinpoint. The data is correlated based on user IDs in Amazon Pinpoint. If you specify this value, an endpoint definition in Amazon Pinpoint has to specify a both a user ID (UserId) and an endpoint ID. Otherwise, messages won’t be sent to the user's endpoint.</p></li></ul>"
+        },
+        "RecommendationProviderRoleArn": {
+          "shape": "__string",
+          "documentation": "<p>The Amazon Resource Name (ARN) of the AWS Identity and Access Management (IAM) role that authorizes Amazon Pinpoint to retrieve recommendation data from the recommender model.</p>"
+        },
+        "RecommendationProviderUri": {
+          "shape": "__string",
+          "documentation": "<p>The Amazon Resource Name (ARN) of the recommender model to retrieve recommendation data from. This value must match the ARN of an Amazon Personalize campaign.</p>"
+        },
+        "RecommendationTransformerUri": {
+          "shape": "__string",
+          "documentation": "<p>The name or Amazon Resource Name (ARN) of the AWS Lambda function to invoke for additional processing of recommendation data that's retrieved from the recommender model.</p>"
+        },
+        "RecommendationsDisplayName": {
+          "shape": "__string",
+          "documentation": "<p>A custom display name for the standard endpoint or user attribute (RecommendationItems) that temporarily stores a recommended item for each endpoint or user, depending on the value for the RecommenderUserIdType property. This value is required if the configuration doesn't invoke an AWS Lambda function (LambdaFunctionArn) to perform additional processing of recommendation data.</p> <p>This name appears in the <b>Attribute finder</b> pane of the template editor on the Amazon Pinpoint console. The name can contain up to 25 characters. The characters can be letters, numbers, spaces, underscores (_), or hyphens (-). These restrictions don't apply to attribute values.</p>"
+        },
+        "RecommendationsPerMessage": {
+          "shape": "__integer",
+          "documentation": "<p>The number of recommended items to retrieve from the model for each endpoint or user, depending on the value for the RecommenderUserIdType property. This number determines how many recommended attributes are available for use as message variables in message templates. The minimum value is 1. The maximum value is 5. The default value is 5.</p> <p>To use multiple recommended items and custom attributes with message variables, you have to use an AWS Lambda function (LambdaFunctionArn) to perform additional processing of recommendation data.</p>"
+        }
+      },
+      "documentation": "<p>Specifies Amazon Pinpoint configuration settings for retrieving and processing recommendation data from a recommender model.</p>",
+      "required": [
+        "RecommendationProviderUri",
+        "RecommendationProviderRoleArn"
+      ]
     },
-    "UpdatePushTemplateRequest": {
+    "UpdateRecommenderConfigurationRequest": {
       "type": "structure",
       "members": {
-        "PushNotificationTemplateRequest": {
-          "shape": "PushNotificationTemplateRequest",
-          "documentation": "<p>Updates an existing message template that you can use in messages that are sent through a push notification channel.</p>"
-        },
-        "TemplateName": {
+        "RecommenderId": {
           "shape": "__string",
           "location": "uri",
-          "locationName": "template-name",
-          "documentation": "<p>The name of the message template. A template name must start with an alphanumeric character and can contain a maximum of 128 characters. The characters can be alphanumeric characters, underscores (_), or hyphens (-). Template names are case sensitive.</p>"
+          "locationName": "recommender-id",
+          "documentation": "<p>The unique identifier for the recommender model configuration. This identifier is displayed as the <b>Recommender ID</b> on the Amazon Pinpoint console.</p>"
+        },
+        "UpdateRecommenderConfiguration": {
+          "shape": "UpdateRecommenderConfiguration"
         }
       },
       "required": [
-        "TemplateName",
-        "PushNotificationTemplateRequest"
+        "RecommenderId",
+        "UpdateRecommenderConfiguration"
       ],
-      "payload": "PushNotificationTemplateRequest"
+      "payload": "UpdateRecommenderConfiguration"
     },
-    "UpdatePushTemplateResponse": {
+    "UpdateRecommenderConfigurationResponse": {
       "type": "structure",
       "members": {
-        "MessageBody": {
-          "shape": "MessageBody"
+        "RecommenderConfigurationResponse": {
+          "shape": "RecommenderConfigurationResponse"
         }
       },
       "required": [
-        "MessageBody"
+        "RecommenderConfigurationResponse"
       ],
-      "payload": "MessageBody"
+      "payload": "RecommenderConfigurationResponse"
     },
     "UpdateSegmentRequest": {
       "type": "structure",
@@ -10899,6 +13728,12 @@
     "UpdateSmsTemplateRequest": {
       "type": "structure",
       "members": {
+        "CreateNewVersion": {
+          "shape": "__boolean",
+          "location": "querystring",
+          "locationName": "create-new-version",
+          "documentation": "<p>Specifies whether to save the updates as a new version of the message template. Valid values are: true, save the updates as a new version; and, false, save the updates to (overwrite) the latest existing version of the template.</p> <p>If you don't specify a value for this parameter, Amazon Pinpoint saves the updates to (overwrites) the latest existing version of the template. If you specify a value of true for this parameter, don't specify a value for the version parameter. Otherwise, an error will occur.</p>"
+        },
         "SMSTemplateRequest": {
           "shape": "SMSTemplateRequest"
         },
@@ -10907,6 +13742,12 @@
           "location": "uri",
           "locationName": "template-name",
           "documentation": "<p>The name of the message template. A template name must start with an alphanumeric character and can contain a maximum of 128 characters. The characters can be alphanumeric characters, underscores (_), or hyphens (-). Template names are case sensitive.</p>"
+        },
+        "Version": {
+          "shape": "__string",
+          "location": "querystring",
+          "locationName": "version",
+          "documentation": "<p>The unique identifier for the version of the message template to update, retrieve information about, or delete. To retrieve identifiers and other information for all the versions of a template, use the <link  linkend=\"templates-template-name-template-type-versions\">Template Versions</link> resource.</p> <p>If specified, this value must match the identifier for an existing template version. If specified for an update operation, this value must match the identifier for the latest existing version of the template. This restriction helps ensure that race conditions don't occur.</p> <p>If you don't specify a value for this parameter, Amazon Pinpoint does the following:</p> <ul><li><p>For a get operation, retrieves information about the active version of the template.</p></li> <li><p>For an update operation, saves the updates to (overwrites) the latest existing version of the template, if the create-new-version parameter isn't used or is set to false.</p></li> <li><p>For a delete operation, deletes the template, including all versions of the template.</p></li></ul>"
         }
       },
       "required": [
@@ -10927,6 +13768,44 @@
       ],
       "payload": "MessageBody"
     },
+    "UpdateTemplateActiveVersionRequest": {
+      "type": "structure",
+      "members": {
+        "TemplateActiveVersionRequest": {
+          "shape": "TemplateActiveVersionRequest"
+        },
+        "TemplateName": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "template-name",
+          "documentation": "<p>The name of the message template. A template name must start with an alphanumeric character and can contain a maximum of 128 characters. The characters can be alphanumeric characters, underscores (_), or hyphens (-). Template names are case sensitive.</p>"
+        },
+        "TemplateType": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "template-type",
+          "documentation": "<p>The type of channel that the message template is designed for. Valid values are: EMAIL, PUSH, SMS, and VOICE.</p>"
+        }
+      },
+      "required": [
+        "TemplateName",
+        "TemplateType",
+        "TemplateActiveVersionRequest"
+      ],
+      "payload": "TemplateActiveVersionRequest"
+    },
+    "UpdateTemplateActiveVersionResponse": {
+      "type": "structure",
+      "members": {
+        "MessageBody": {
+          "shape": "MessageBody"
+        }
+      },
+      "required": [
+        "MessageBody"
+      ],
+      "payload": "MessageBody"
+    },
     "UpdateVoiceChannelRequest": {
       "type": "structure",
       "members": {
@@ -10958,6 +13837,49 @@
       ],
       "payload": "VoiceChannelResponse"
     },
+    "UpdateVoiceTemplateRequest": {
+      "type": "structure",
+      "members": {
+        "CreateNewVersion": {
+          "shape": "__boolean",
+          "location": "querystring",
+          "locationName": "create-new-version",
+          "documentation": "<p>Specifies whether to save the updates as a new version of the message template. Valid values are: true, save the updates as a new version; and, false, save the updates to (overwrite) the latest existing version of the template.</p> <p>If you don't specify a value for this parameter, Amazon Pinpoint saves the updates to (overwrites) the latest existing version of the template. If you specify a value of true for this parameter, don't specify a value for the version parameter. Otherwise, an error will occur.</p>"
+        },
+        "TemplateName": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "template-name",
+          "documentation": "<p>The name of the message template. A template name must start with an alphanumeric character and can contain a maximum of 128 characters. The characters can be alphanumeric characters, underscores (_), or hyphens (-). Template names are case sensitive.</p>"
+        },
+        "Version": {
+          "shape": "__string",
+          "location": "querystring",
+          "locationName": "version",
+          "documentation": "<p>The unique identifier for the version of the message template to update, retrieve information about, or delete. To retrieve identifiers and other information for all the versions of a template, use the <link  linkend=\"templates-template-name-template-type-versions\">Template Versions</link> resource.</p> <p>If specified, this value must match the identifier for an existing template version. If specified for an update operation, this value must match the identifier for the latest existing version of the template. This restriction helps ensure that race conditions don't occur.</p> <p>If you don't specify a value for this parameter, Amazon Pinpoint does the following:</p> <ul><li><p>For a get operation, retrieves information about the active version of the template.</p></li> <li><p>For an update operation, saves the updates to (overwrites) the latest existing version of the template, if the create-new-version parameter isn't used or is set to false.</p></li> <li><p>For a delete operation, deletes the template, including all versions of the template.</p></li></ul>"
+        },
+        "VoiceTemplateRequest": {
+          "shape": "VoiceTemplateRequest"
+        }
+      },
+      "required": [
+        "TemplateName",
+        "VoiceTemplateRequest"
+      ],
+      "payload": "VoiceTemplateRequest"
+    },
+    "UpdateVoiceTemplateResponse": {
+      "type": "structure",
+      "members": {
+        "MessageBody": {
+          "shape": "MessageBody"
+        }
+      },
+      "required": [
+        "MessageBody"
+      ],
+      "payload": "MessageBody"
+    },
     "VoiceChannelRequest": {
       "type": "structure",
       "members": {
@@ -11022,11 +13944,11 @@
       "members": {
         "Body": {
           "shape": "__string",
-          "documentation": "<p>The text script for the voice message.</p>"
+          "documentation": "<p>The text of the script to use for the voice message.</p>"
         },
         "LanguageCode": {
           "shape": "__string",
-          "documentation": "<p>The language to use when delivering the message. For a list of supported languages, see the <a href=\"AmazonPollyDG.html\">Amazon Polly Developer Guide</a>.</p>"
+          "documentation": "<p>The code for the language to use when synthesizing the text of the message script. For a list of supported languages and the code for each one, see the <a href=\"https://docs.aws.amazon.com/polly/latest/dg/what-is.html\">Amazon Polly Developer Guide</a>.</p>"
         },
         "OriginationNumber": {
           "shape": "__string",
@@ -11038,11 +13960,131 @@
         },
         "VoiceId": {
           "shape": "__string",
-          "documentation": "<p>The name of the voice to use when delivering the message. For a list of supported voices, see the <a href=\"AmazonPollyDG.html\">Amazon Polly Developer Guide</a>.</p>"
+          "documentation": "<p>The name of the voice to use when delivering the message. For a list of supported voices, see the <a href=\"https://docs.aws.amazon.com/polly/latest/dg/what-is.html\">Amazon Polly Developer Guide</a>.</p>"
         }
       },
       "documentation": "<p>Specifies the settings for a one-time voice message that's sent directly to an endpoint through the voice channel.</p>"
     },
+    "VoiceTemplateRequest": {
+      "type": "structure",
+      "members": {
+        "Body": {
+          "shape": "__string",
+          "documentation": "<p>The text of the script to use in messages that are based on the message template, in plain text format.</p>"
+        },
+        "DefaultSubstitutions": {
+          "shape": "__string",
+          "documentation": "<p>A JSON object that specifies the default values to use for message variables in the message template. This object is a set of key-value pairs. Each key defines a message variable in the template. The corresponding value defines the default value for that variable. When you create a message that's based on the template, you can override these defaults with message-specific and address-specific variables and values.</p>"
+        },
+        "LanguageCode": {
+          "shape": "__string",
+          "documentation": "<p>The code for the language to use when synthesizing the text of the script in messages that are based on the message template. For a list of supported languages and the code for each one, see the <a href=\"https://docs.aws.amazon.com/polly/latest/dg/what-is.html\">Amazon Polly Developer Guide</a>.</p>"
+        },
+        "tags": {
+          "shape": "MapOf__string",
+          "locationName": "tags",
+          "documentation": "<p>A string-to-string map of key-value pairs that defines the tags to associate with the message template. Each tag consists of a required tag key and an associated tag value.</p>"
+        },
+        "TemplateDescription": {
+          "shape": "__string",
+          "documentation": "<p>A custom description of the message template.</p>"
+        },
+        "VoiceId": {
+          "shape": "__string",
+          "documentation": "<p>The name of the voice to use when delivering messages that are based on the message template. For a list of supported voices, see the <a href=\"https://docs.aws.amazon.com/polly/latest/dg/what-is.html\">Amazon Polly Developer Guide</a>.</p>"
+        }
+      },
+      "documentation": "<p>Specifies the content and settings for a message template that can be used in messages that are sent through the voice channel.</p>"
+    },
+    "VoiceTemplateResponse": {
+      "type": "structure",
+      "members": {
+        "Arn": {
+          "shape": "__string",
+          "documentation": "<p>The Amazon Resource Name (ARN) of the message template.</p>"
+        },
+        "Body": {
+          "shape": "__string",
+          "documentation": "<p>The text of the script that's used in messages that are based on the message template, in plain text format.</p>"
+        },
+        "CreationDate": {
+          "shape": "__string",
+          "documentation": "<p>The date, in ISO 8601 format, when the message template was created.</p>"
+        },
+        "DefaultSubstitutions": {
+          "shape": "__string",
+          "documentation": "<p>The JSON object that specifies the default values that are used for message variables in the message template. This object is a set of key-value pairs. Each key defines a message variable in the template. The corresponding value defines the default value for that variable.</p>"
+        },
+        "LanguageCode": {
+          "shape": "__string",
+          "documentation": "<p>The code for the language that's used when synthesizing the text of the script in messages that are based on the message template. For a list of supported languages and the code for each one, see the <a href=\"https://docs.aws.amazon.com/polly/latest/dg/what-is.html\">Amazon Polly Developer Guide</a>.</p>"
+        },
+        "LastModifiedDate": {
+          "shape": "__string",
+          "documentation": "<p>The date, in ISO 8601 format, when the message template was last modified.</p>"
+        },
+        "tags": {
+          "shape": "MapOf__string",
+          "locationName": "tags",
+          "documentation": "<p>A string-to-string map of key-value pairs that identifies the tags that are associated with the message template. Each tag consists of a required tag key and an associated tag value.</p>"
+        },
+        "TemplateDescription": {
+          "shape": "__string",
+          "documentation": "<p>The custom description of the message template.</p>"
+        },
+        "TemplateName": {
+          "shape": "__string",
+          "documentation": "<p>The name of the message template.</p>"
+        },
+        "TemplateType": {
+          "shape": "TemplateType",
+          "documentation": "<p>The type of channel that the message template is designed for. For a voice template, this value is VOICE.</p>"
+        },
+        "Version": {
+          "shape": "__string",
+          "documentation": "<p>The unique identifier, as an integer, for the active version of the message template, or the version of the template that you specified by using the version parameter in your request.</p>"
+        },
+        "VoiceId": {
+          "shape": "__string",
+          "documentation": "<p>The name of the voice that's used when delivering messages that are based on the message template. For a list of supported voices, see the <a href=\"https://docs.aws.amazon.com/polly/latest/dg/what-is.html\">Amazon Polly Developer Guide</a>.</p>"
+        }
+      },
+      "documentation": "<p>Provides information about the content and settings for a message template that can be used in messages that are sent through the voice channel.</p>",
+      "required": [
+        "LastModifiedDate",
+        "CreationDate",
+        "TemplateName",
+        "TemplateType"
+      ]
+    },
+    "WaitActivity": {
+      "type": "structure",
+      "members": {
+        "NextActivity": {
+          "shape": "__string",
+          "documentation": "<p>The unique identifier for the next activity to perform, after performing the wait activity.</p>"
+        },
+        "WaitTime": {
+          "shape": "WaitTime",
+          "documentation": "<p>The amount of time to wait or the date and time when the activity moves participants to the next activity in the journey.</p>"
+        }
+      },
+      "documentation": "<p>Specifies the settings for a wait activity in a journey. This type of activity waits for a certain amount of time or until a specific date and time before moving participants to the next activity in a journey.</p>"
+    },
+    "WaitTime": {
+      "type": "structure",
+      "members": {
+        "WaitFor": {
+          "shape": "__string",
+          "documentation": "<p>The amount of time to wait, as a duration in ISO 8601 format, before determining whether the activity's conditions have been met or moving participants to the next activity in the journey.</p>"
+        },
+        "WaitUntil": {
+          "shape": "__string",
+          "documentation": "<p>The date and time, in ISO 8601 format, when Amazon Pinpoint determines whether the activity's conditions have been met or the activity moves participants to the next activity in the journey.</p>"
+        }
+      },
+      "documentation": "<p>Specifies a duration or a date and time that indicates when Amazon Pinpoint determines whether an activity's conditions have been met or an activity moves participants to the next activity in a journey.</p>"
+    },
     "WriteApplicationSettingsRequest": {
       "type": "structure",
       "members": {
@@ -11060,7 +14102,7 @@
         },
         "QuietTime": {
           "shape": "QuietTime",
-          "documentation": "<p>The default quiet time for campaigns in the application. Quiet time is a specific time range when campaigns don't send messages to endpoints, if all the following conditions are met:</p> <ul><li><p>The EndpointDemographic.Timezone property of the endpoint is set to a valid value.</p></li> <li><p>The current time in the endpoint's time zone is later than or equal to the time specified by the QuietTime.Start property for the application (or a campaign that has custom quiet time settings).</p></li> <li><p>The current time in the endpoint's time zone is earlier than or equal to the time specified by the QuietTime.End property for the application (or a campaign that has custom quiet time settings).</p></li></ul> <p>If any of the preceding conditions isn't met, the endpoint will receive messages from a campaign, even if quiet time is enabled.</p> <p>To override the default quiet time settings for a specific campaign, use the <link  linkend=\"apps-application-id-campaigns-campaign-id\">Campaign</link> resource to define a custom quiet time for the campaign.</p>"
+          "documentation": "<p>The default quiet time for campaigns and journeys in the application. Quiet time is a specific time range when messages aren't sent to endpoints, if all the following conditions are met:</p> <ul><li><p>The EndpointDemographic.Timezone property of the endpoint is set to a valid value.</p></li> <li><p>The current time in the endpoint's time zone is later than or equal to the time specified by the QuietTime.Start property for the application (or a campaign or journey that has custom quiet time settings).</p></li> <li><p>The current time in the endpoint's time zone is earlier than or equal to the time specified by the QuietTime.End property for the application (or a campaign or journey that has custom quiet time settings).</p></li></ul> <p>If any of the preceding conditions isn't met, the endpoint will receive messages from a campaign or journey, even if quiet time is enabled.</p> <p>To override the default quiet time settings for a specific campaign or journey, use the <link  linkend=\"apps-application-id-campaigns-campaign-id\">Campaign</link> resource or the <link  linkend=\"apps-application-id-journeys-journey-id\">Journey</link> resource to define a custom quiet time for the campaign or journey.</p>"
         }
       },
       "documentation": "<p>Specifies the default settings for an application.</p>"
@@ -11074,7 +14116,7 @@
         },
         "Description": {
           "shape": "__string",
-          "documentation": "<p>The custom description of the campaign.</p>"
+          "documentation": "<p>A custom description of the campaign.</p>"
         },
         "HoldoutPercent": {
           "shape": "__integer",
@@ -11098,7 +14140,7 @@
         },
         "Name": {
           "shape": "__string",
-          "documentation": "<p>The custom name of the campaign.</p>"
+          "documentation": "<p>A custom name for the campaign.</p>"
         },
         "Schedule": {
           "shape": "Schedule",
@@ -11118,15 +14160,16 @@
           "documentation": "<p>A string-to-string map of key-value pairs that defines the tags to associate with the campaign. Each tag consists of a required tag key and an associated tag value.</p>"
         },
         "TemplateConfiguration": {
-          "shape": "TemplateConfiguration"
+          "shape": "TemplateConfiguration",
+          "documentation": "<p>The message template to use for the campaign.</p>"
         },
         "TreatmentDescription": {
           "shape": "__string",
-          "documentation": "<p>The custom description of a variation of the campaign to use for A/B testing.</p>"
+          "documentation": "<p>A custom description of a variation of the campaign to use for A/B testing.</p>"
         },
         "TreatmentName": {
           "shape": "__string",
-          "documentation": "<p>The custom name of a variation of the campaign to use for A/B testing.</p>"
+          "documentation": "<p>A custom name for a variation of the campaign to use for A/B testing.</p>"
         }
       },
       "documentation": "<p>Specifies the configuration and other settings for a campaign.</p>"
@@ -11149,6 +14192,63 @@
         "DestinationStreamArn"
       ]
     },
+    "WriteJourneyRequest": {
+      "type": "structure",
+      "members": {
+        "Activities": {
+          "shape": "MapOfActivity",
+          "documentation": "<p>A map that contains a set of Activity objects, one object for each activity in the journey. For each Activity object, the key is the unique identifier (string) for an activity and the value is the settings for the activity. An activity identifier can contain a maximum of 100 characters. The characters must be alphanumeric characters.</p>"
+        },
+        "CreationDate": {
+          "shape": "__string",
+          "documentation": "<p>The date, in ISO 8601 format, when the journey was created.</p>"
+        },
+        "LastModifiedDate": {
+          "shape": "__string",
+          "documentation": "<p>The date, in ISO 8601 format, when the journey was last modified.</p>"
+        },
+        "Limits": {
+          "shape": "JourneyLimits",
+          "documentation": "<p>The messaging and entry limits for the journey.</p>"
+        },
+        "LocalTime": {
+          "shape": "__boolean",
+          "documentation": "<p>Specifies whether the journey's scheduled start and end times use each participant's local time. To base the schedule on each participant's local time, set this value to true.</p>"
+        },
+        "Name": {
+          "shape": "__string",
+          "documentation": "<p>The name of the journey. A journey name can contain a maximum of 150 characters. The characters can be alphanumeric characters or symbols, such as underscores (_) or hyphens (-). A journey name can't contain any spaces.</p>"
+        },
+        "QuietTime": {
+          "shape": "QuietTime",
+          "documentation": "<p>The quiet time settings for the journey. Quiet time is a specific time range when a journey doesn't send messages to participants, if all the following conditions are met:</p> <ul><li><p>The EndpointDemographic.Timezone property of the endpoint for the participant is set to a valid value.</p></li> <li><p>The current time in the participant's time zone is later than or equal to the time specified by the QuietTime.Start property for the journey.</p></li> <li><p>The current time in the participant's time zone is earlier than or equal to the time specified by the QuietTime.End property for the journey.</p></li></ul> <p>If any of the preceding conditions isn't met, the participant will receive messages from the journey, even if quiet time is enabled.</p>"
+        },
+        "RefreshFrequency": {
+          "shape": "__string",
+          "documentation": "<p>The frequency with which Amazon Pinpoint evaluates segment and event data for the journey, as a duration in ISO 8601 format.</p>"
+        },
+        "Schedule": {
+          "shape": "JourneySchedule",
+          "documentation": "<p>The schedule settings for the journey.</p>"
+        },
+        "StartActivity": {
+          "shape": "__string",
+          "documentation": "<p>The unique identifier for the first activity in the journey. The identifier for this activity can contain a maximum of 128 characters. The characters must be alphanumeric characters.</p>"
+        },
+        "StartCondition": {
+          "shape": "StartCondition",
+          "documentation": "<p>The segment that defines which users are participants in the journey.</p>"
+        },
+        "State": {
+          "shape": "State",
+          "documentation": "<p>The status of the journey. Valid values are:</p> <ul><li><p>DRAFT - Saves the journey and doesn't publish it.</p></li> <li><p>ACTIVE - Saves and publishes the journey. Depending on the journey's schedule, the journey starts running immediately or at the scheduled start time. If a journey's status is ACTIVE, you can't add, change, or remove activities from it.</p></li></ul> <p>The CANCELLED, COMPLETED, and CLOSED values are not supported in requests to create or update a journey. To cancel a journey, use the <link  linkend=\"apps-application-id-journeys-journey-id-state\">Journey State</link> resource.</p>"
+        }
+      },
+      "documentation": "<p>Specifies the configuration and other settings for a journey.</p>",
+      "required": [
+        "Name"
+      ]
+    },
     "WriteSegmentRequest": {
       "type": "structure",
       "members": {
@@ -11188,15 +14288,16 @@
           "documentation": "<p>The allocated percentage of users (segment members) to send the treatment to.</p>"
         },
         "TemplateConfiguration": {
-          "shape": "TemplateConfiguration"
+          "shape": "TemplateConfiguration",
+          "documentation": "<p>The message template to use for the treatment.</p>"
         },
         "TreatmentDescription": {
           "shape": "__string",
-          "documentation": "<p>The custom description of the treatment.</p>"
+          "documentation": "<p>A custom description of the treatment.</p>"
         },
         "TreatmentName": {
           "shape": "__string",
-          "documentation": "<p>The custom name of the treatment. A treatment is a variation of a campaign that's used for A/B testing of a campaign.</p>"
+          "documentation": "<p>A custom name for the treatment. A treatment is a variation of a campaign that's used for A/B testing of a campaign.</p>"
         }
       },
       "documentation": "<p>Specifies the settings for a campaign treatment. A treatment is a variation of a campaign that's used for A/B testing of a campaign.</p>",
@@ -11255,6 +14356,30 @@
         "shape": "ImportJobResponse"
       }
     },
+    "ListOfJourneyResponse": {
+      "type": "list",
+      "member": {
+        "shape": "JourneyResponse"
+      }
+    },
+    "ListOfMultiConditionalBranch": {
+      "type": "list",
+      "member": {
+        "shape": "MultiConditionalBranch"
+      }
+    },
+    "ListOfRandomSplitEntry": {
+      "type": "list",
+      "member": {
+        "shape": "RandomSplitEntry"
+      }
+    },
+    "ListOfRecommenderConfigurationResponse": {
+      "type": "list",
+      "member": {
+        "shape": "RecommenderConfigurationResponse"
+      }
+    },
     "ListOfResultRow": {
       "type": "list",
       "member": {
@@ -11291,12 +14416,24 @@
         "shape": "SegmentResponse"
       }
     },
+    "ListOfSimpleCondition": {
+      "type": "list",
+      "member": {
+        "shape": "SimpleCondition"
+      }
+    },
     "ListOfTemplateResponse": {
       "type": "list",
       "member": {
         "shape": "TemplateResponse"
       }
     },
+    "ListOfTemplateVersionResponse": {
+      "type": "list",
+      "member": {
+        "shape": "TemplateVersionResponse"
+      }
+    },
     "ListOfTreatmentResource": {
       "type": "list",
       "member": {
@@ -11318,6 +14455,15 @@
     "__long": {
       "type": "long"
     },
+    "MapOfActivity": {
+      "type": "map",
+      "key": {
+        "shape": "__string"
+      },
+      "value": {
+        "shape": "Activity"
+      }
+    },
     "MapOfAddressConfiguration": {
       "type": "map",
       "key": {
diff --git a/services/pinpoint/src/test/resources/cucumber.properties b/services/pinpoint/src/test/resources/cucumber.properties
index 3f1caeedc27e..4ee987f5a1fc 100644
--- a/services/pinpoint/src/test/resources/cucumber.properties
+++ b/services/pinpoint/src/test/resources/cucumber.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/pinpointemail/pom.xml b/services/pinpointemail/pom.xml
index 9cfcf2730c8e..0cc8a7d2eeb4 100644
--- a/services/pinpointemail/pom.xml
+++ b/services/pinpointemail/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>pinpointemail</artifactId>
     <name>AWS Java SDK :: Services :: Pinpoint Email</name>
diff --git a/services/pinpointsmsvoice/pom.xml b/services/pinpointsmsvoice/pom.xml
index 6a2b61fe409a..ce3d5c91a00a 100644
--- a/services/pinpointsmsvoice/pom.xml
+++ b/services/pinpointsmsvoice/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>pinpointsmsvoice</artifactId>
     <name>AWS Java SDK :: Services :: Pinpoint SMS Voice</name>
diff --git a/services/polly/build.properties b/services/polly/build.properties
index ecf2dae6fcb1..15ec2da1fc71 100644
--- a/services/polly/build.properties
+++ b/services/polly/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/polly/pom.xml b/services/polly/pom.xml
index 323a049b266b..66c4fc3d0021 100644
--- a/services/polly/pom.xml
+++ b/services/polly/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>polly</artifactId>
     <name>AWS Java SDK :: Services :: Amazon Polly</name>
diff --git a/services/polly/src/it/java/software/amazon/awssdk/services/polly/internal/presigner/DefaultPollyPresignerIntegrationTest.java b/services/polly/src/it/java/software/amazon/awssdk/services/polly/internal/presigner/DefaultPollyPresignerIntegrationTest.java
new file mode 100644
index 000000000000..2d971163d859
--- /dev/null
+++ b/services/polly/src/it/java/software/amazon/awssdk/services/polly/internal/presigner/DefaultPollyPresignerIntegrationTest.java
@@ -0,0 +1,72 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.services.polly.internal.presigner;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import java.io.IOException;
+import java.net.URL;
+import java.time.Duration;
+import javax.net.ssl.HttpsURLConnection;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import software.amazon.awssdk.services.polly.model.OutputFormat;
+import software.amazon.awssdk.services.polly.model.SynthesizeSpeechRequest;
+import software.amazon.awssdk.services.polly.model.VoiceId;
+import software.amazon.awssdk.services.polly.presigner.PollyPresigner;
+import software.amazon.awssdk.services.polly.presigner.model.SynthesizeSpeechPresignRequest;
+import software.amazon.awssdk.testutils.service.AwsIntegrationTestBase;
+
+/**
+ * Integration tests for {@link DefaultPollyPresigner}.
+ */
+public class DefaultPollyPresignerIntegrationTest extends AwsIntegrationTestBase {
+
+    private static PollyPresigner presigner;
+
+    @BeforeClass
+    public static void setup() {
+        presigner = DefaultPollyPresigner.builder()
+                .credentialsProvider(getCredentialsProvider())
+                .build();
+    }
+
+    @Test
+    public void presign_requestIsValid() throws IOException {
+        SynthesizeSpeechRequest request = SynthesizeSpeechRequest.builder()
+                .text("hello world!")
+                .outputFormat(OutputFormat.PCM)
+                .voiceId(VoiceId.SALLI)
+                .build();
+
+        SynthesizeSpeechPresignRequest presignRequest = SynthesizeSpeechPresignRequest.builder()
+                .signatureDuration(Duration.ofMinutes(45))
+                .synthesizeSpeechRequest(request)
+                .build();
+
+        URL presignedUrl = presigner.presignSynthesizeSpeech(presignRequest).url();
+
+        HttpsURLConnection urlConnection = null;
+        try {
+            urlConnection = ((HttpsURLConnection) presignedUrl.openConnection());
+            urlConnection.connect();
+            assertThat(urlConnection.getResponseCode()).isEqualTo(200);
+            assertThat(urlConnection.getHeaderField("Content-Type")).isEqualTo("audio/pcm");
+        } finally {
+            urlConnection.getInputStream().close();
+        }
+    }
+
+}
diff --git a/services/polly/src/main/java/software/amazon/awssdk/services/polly/internal/presigner/DefaultPollyPresigner.java b/services/polly/src/main/java/software/amazon/awssdk/services/polly/internal/presigner/DefaultPollyPresigner.java
new file mode 100644
index 000000000000..5dc7a613938e
--- /dev/null
+++ b/services/polly/src/main/java/software/amazon/awssdk/services/polly/internal/presigner/DefaultPollyPresigner.java
@@ -0,0 +1,253 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.services.polly.internal.presigner;
+
+import static java.util.stream.Collectors.toMap;
+import static software.amazon.awssdk.auth.signer.AwsSignerExecutionAttribute.PRESIGNER_EXPIRATION;
+
+import java.net.URI;
+import java.time.Instant;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Stream;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.auth.credentials.AwsCredentials;
+import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;
+import software.amazon.awssdk.auth.credentials.DefaultCredentialsProvider;
+import software.amazon.awssdk.auth.signer.Aws4Signer;
+import software.amazon.awssdk.auth.signer.AwsSignerExecutionAttribute;
+import software.amazon.awssdk.awscore.AwsExecutionAttribute;
+import software.amazon.awssdk.awscore.AwsRequestOverrideConfiguration;
+import software.amazon.awssdk.awscore.endpoint.DefaultServiceEndpointBuilder;
+import software.amazon.awssdk.awscore.presigner.PresignRequest;
+import software.amazon.awssdk.awscore.presigner.PresignedRequest;
+import software.amazon.awssdk.core.ClientType;
+import software.amazon.awssdk.core.interceptor.ExecutionAttributes;
+import software.amazon.awssdk.core.interceptor.SdkExecutionAttribute;
+import software.amazon.awssdk.core.interceptor.SdkInternalExecutionAttribute;
+import software.amazon.awssdk.core.signer.Presigner;
+import software.amazon.awssdk.core.signer.Signer;
+import software.amazon.awssdk.http.SdkHttpFullRequest;
+import software.amazon.awssdk.http.SdkHttpMethod;
+import software.amazon.awssdk.regions.Region;
+import software.amazon.awssdk.regions.providers.AwsRegionProvider;
+import software.amazon.awssdk.regions.providers.DefaultAwsRegionProviderChain;
+import software.amazon.awssdk.regions.providers.LazyAwsRegionProvider;
+import software.amazon.awssdk.services.polly.internal.presigner.model.transform.SynthesizeSpeechRequestMarshaller;
+import software.amazon.awssdk.services.polly.model.PollyRequest;
+import software.amazon.awssdk.services.polly.presigner.PollyPresigner;
+import software.amazon.awssdk.services.polly.presigner.model.PresignedSynthesizeSpeechRequest;
+import software.amazon.awssdk.services.polly.presigner.model.SynthesizeSpeechPresignRequest;
+import software.amazon.awssdk.utils.IoUtils;
+import software.amazon.awssdk.utils.Validate;
+
+/**
+ * Default implementation of {@link PollyPresigner}.
+ */
+@SdkInternalApi
+public final class DefaultPollyPresigner implements PollyPresigner {
+    private static final String SIGNING_NAME = "polly";
+    private static final String SERVICE_NAME = "polly";
+    private static final AwsRegionProvider DEFAULT_REGION_PROVIDER =
+            new LazyAwsRegionProvider(DefaultAwsRegionProviderChain::new);
+    private static final AwsCredentialsProvider DEFAULT_CREDENTIALS_PROVIDER =
+            DefaultCredentialsProvider.create();
+    private static final Aws4Signer DEFAULT_SIGNER = Aws4Signer.create();
+
+    private final Region region;
+    private final AwsCredentialsProvider credentialsProvider;
+    private final URI endpointOverride;
+
+    private DefaultPollyPresigner(BuilderImpl builder) {
+        this.region = builder.region != null ? builder.region : DEFAULT_REGION_PROVIDER.getRegion();
+        this.credentialsProvider = builder.credentialsProvider != null
+                ? builder.credentialsProvider : DEFAULT_CREDENTIALS_PROVIDER;
+        this.endpointOverride = builder.endpointOverride;
+    }
+
+    public Region region() {
+        return region;
+    }
+
+    public AwsCredentialsProvider credentialsProvider() {
+        return credentialsProvider;
+    }
+
+    public URI endpointOverride() {
+        return endpointOverride;
+    }
+
+    @Override
+    public void close() {
+        IoUtils.closeIfCloseable(credentialsProvider, null);
+    }
+
+    public static PollyPresigner.Builder builder() {
+        return new BuilderImpl();
+    }
+
+    @Override
+    public PresignedSynthesizeSpeechRequest presignSynthesizeSpeech(
+            SynthesizeSpeechPresignRequest synthesizeSpeechPresignRequest) {
+        return presign(PresignedSynthesizeSpeechRequest.builder(),
+                       synthesizeSpeechPresignRequest,
+                       synthesizeSpeechPresignRequest.synthesizeSpeechRequest(),
+                       SynthesizeSpeechRequestMarshaller.getInstance()::marshall)
+                .build();
+    }
+
+    private <T extends PollyRequest> SdkHttpFullRequest marshallRequest(
+            T request, Function<T, SdkHttpFullRequest.Builder> marshalFn) {
+        SdkHttpFullRequest.Builder requestBuilder = marshalFn.apply(request);
+        applyOverrideHeadersAndQueryParams(requestBuilder, request);
+        applyEndpoint(requestBuilder);
+        return requestBuilder.build();
+    }
+
+    /**
+     * Generate a {@link PresignedRequest} from a {@link PresignedRequest} and {@link PollyRequest}.
+     */
+    private <T extends PresignedRequest.Builder, U extends PollyRequest> T presign(T presignedRequest,
+                                                              PresignRequest presignRequest,
+                                                              U requestToPresign,
+                                                              Function<U, SdkHttpFullRequest.Builder> requestMarshaller) {
+        ExecutionAttributes execAttrs = createExecutionAttributes(presignRequest, requestToPresign);
+
+        SdkHttpFullRequest marshalledRequest = marshallRequest(requestToPresign, requestMarshaller);
+        SdkHttpFullRequest signedHttpRequest = presignRequest(requestToPresign, marshalledRequest, execAttrs);
+        initializePresignedRequest(presignedRequest, execAttrs, signedHttpRequest);
+        return presignedRequest;
+    }
+
+    private void initializePresignedRequest(PresignedRequest.Builder presignedRequest,
+                                            ExecutionAttributes execAttrs,
+                                            SdkHttpFullRequest signedHttpRequest) {
+        List<String> signedHeadersQueryParam = signedHttpRequest.rawQueryParameters().get("X-Amz-SignedHeaders");
+
+        Map<String, List<String>> signedHeaders =
+                signedHeadersQueryParam.stream()
+                        .flatMap(h -> Stream.of(h.split(";")))
+                        .collect(toMap(h -> h, h -> signedHttpRequest.firstMatchingHeader(h)
+                                .map(Collections::singletonList)
+                                .orElseGet(ArrayList::new)));
+
+        boolean isBrowserExecutable = signedHttpRequest.method() == SdkHttpMethod.GET &&
+                (signedHeaders.isEmpty() ||
+                        (signedHeaders.size() == 1 && signedHeaders.containsKey("host")));
+
+        presignedRequest.expiration(execAttrs.getAttribute(PRESIGNER_EXPIRATION))
+                .isBrowserExecutable(isBrowserExecutable)
+                .httpRequest(signedHttpRequest)
+                .signedHeaders(signedHeaders);
+    }
+
+    private SdkHttpFullRequest presignRequest(PollyRequest requestToPresign,
+                                              SdkHttpFullRequest marshalledRequest,
+                                              ExecutionAttributes executionAttributes) {
+        Presigner presigner = resolvePresigner(requestToPresign);
+        SdkHttpFullRequest presigned = presigner.presign(marshalledRequest, executionAttributes);
+        List<String> signedHeadersQueryParam = presigned.rawQueryParameters().get("X-Amz-SignedHeaders");
+        Validate.validState(signedHeadersQueryParam != null,
+                "Only SigV4 presigners are supported at this time, but the configured "
+                        + "presigner (%s) did not seem to generate a SigV4 signature.", presigner);
+        return presigned;
+    }
+
+    private ExecutionAttributes createExecutionAttributes(PresignRequest presignRequest, PollyRequest requestToPresign) {
+        Instant signatureExpiration = Instant.now().plus(presignRequest.signatureDuration());
+        AwsCredentials credentials = resolveCredentialsProvider(requestToPresign).resolveCredentials();
+        Validate.validState(credentials != null, "Credential providers must never return null.");
+
+        return new ExecutionAttributes()
+                .putAttribute(AwsSignerExecutionAttribute.AWS_CREDENTIALS, credentials)
+                .putAttribute(AwsSignerExecutionAttribute.SERVICE_SIGNING_NAME, SIGNING_NAME)
+                .putAttribute(AwsExecutionAttribute.AWS_REGION, region())
+                .putAttribute(AwsSignerExecutionAttribute.SIGNING_REGION, region())
+                .putAttribute(SdkInternalExecutionAttribute.IS_FULL_DUPLEX, false)
+                .putAttribute(SdkExecutionAttribute.CLIENT_TYPE, ClientType.SYNC)
+                .putAttribute(SdkExecutionAttribute.SERVICE_NAME, SERVICE_NAME)
+                .putAttribute(PRESIGNER_EXPIRATION, signatureExpiration);
+    }
+
+    private AwsCredentialsProvider resolveCredentialsProvider(PollyRequest request) {
+        return request.overrideConfiguration().flatMap(AwsRequestOverrideConfiguration::credentialsProvider)
+                .orElse(credentialsProvider());
+    }
+
+    private Presigner resolvePresigner(PollyRequest request) {
+        Signer signer = request.overrideConfiguration().flatMap(AwsRequestOverrideConfiguration::signer)
+                .orElse(DEFAULT_SIGNER);
+
+        return Validate.isInstanceOf(Presigner.class, signer,
+                "Signer of type %s given in request override is not a Presigner", signer.getClass().getSimpleName());
+    }
+
+    private void applyOverrideHeadersAndQueryParams(SdkHttpFullRequest.Builder httpRequestBuilder, PollyRequest request) {
+        request.overrideConfiguration().ifPresent(o -> {
+            o.headers().forEach(httpRequestBuilder::putHeader);
+            o.rawQueryParameters().forEach(httpRequestBuilder::putRawQueryParameter);
+        });
+    }
+
+    private void applyEndpoint(SdkHttpFullRequest.Builder httpRequestBuilder) {
+        URI uri = resolveEndpoint();
+        httpRequestBuilder.protocol(uri.getScheme())
+                .host(uri.getHost())
+                .port(uri.getPort());
+    }
+
+    private URI resolveEndpoint() {
+        if (endpointOverride() != null) {
+            return endpointOverride();
+        }
+
+        return new DefaultServiceEndpointBuilder(SERVICE_NAME, "https")
+                .withRegion(region())
+                .getServiceEndpoint();
+    }
+
+    public static class BuilderImpl implements PollyPresigner.Builder {
+        private Region region;
+        private AwsCredentialsProvider credentialsProvider;
+        private URI endpointOverride;
+
+        @Override
+        public Builder region(Region region) {
+            this.region = region;
+            return this;
+        }
+
+        @Override
+        public Builder credentialsProvider(AwsCredentialsProvider credentialsProvider) {
+            this.credentialsProvider = credentialsProvider;
+            return this;
+        }
+
+        @Override
+        public Builder endpointOverride(URI endpointOverride) {
+            this.endpointOverride = endpointOverride;
+            return this;
+        }
+
+        @Override
+        public PollyPresigner build() {
+            return new DefaultPollyPresigner(this);
+        }
+    }
+}
diff --git a/services/polly/src/main/java/software/amazon/awssdk/services/polly/internal/presigner/model/transform/SynthesizeSpeechRequestMarshaller.java b/services/polly/src/main/java/software/amazon/awssdk/services/polly/internal/presigner/model/transform/SynthesizeSpeechRequestMarshaller.java
new file mode 100644
index 000000000000..55a3a5da132b
--- /dev/null
+++ b/services/polly/src/main/java/software/amazon/awssdk/services/polly/internal/presigner/model/transform/SynthesizeSpeechRequestMarshaller.java
@@ -0,0 +1,77 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.services.polly.internal.presigner.model.transform;
+
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.http.SdkHttpFullRequest;
+import software.amazon.awssdk.http.SdkHttpMethod;
+import software.amazon.awssdk.services.polly.model.SynthesizeSpeechRequest;
+
+/**
+ * Marshaller for {@link SynthesizeSpeechRequest} that marshalls the request into a form that can be presigned.
+ */
+@SdkInternalApi
+public final class SynthesizeSpeechRequestMarshaller {
+    private static final SynthesizeSpeechRequestMarshaller INSTANCE = new SynthesizeSpeechRequestMarshaller();
+
+    public SdkHttpFullRequest.Builder marshall(SynthesizeSpeechRequest synthesizeSpeechRequest) {
+        SdkHttpFullRequest.Builder builder = SdkHttpFullRequest.builder()
+                .method(SdkHttpMethod.GET)
+                .encodedPath("/v1/speech");
+
+        if (synthesizeSpeechRequest.text() != null) {
+            builder.putRawQueryParameter("Text", synthesizeSpeechRequest.text());
+        }
+
+        if (synthesizeSpeechRequest.textType() != null) {
+            builder.putRawQueryParameter("TextType", synthesizeSpeechRequest.textTypeAsString());
+        }
+
+        if (synthesizeSpeechRequest.voiceId() != null) {
+            builder.putRawQueryParameter("VoiceId", synthesizeSpeechRequest.voiceIdAsString());
+        }
+
+        if (synthesizeSpeechRequest.sampleRate() != null) {
+            builder.putRawQueryParameter("SampleRate", synthesizeSpeechRequest.sampleRate());
+        }
+
+        if (synthesizeSpeechRequest.outputFormat() != null) {
+            builder.putRawQueryParameter("OutputFormat", synthesizeSpeechRequest.outputFormatAsString());
+        }
+
+        if (synthesizeSpeechRequest.lexiconNames() != null) {
+            builder.putRawQueryParameter("LexiconNames", synthesizeSpeechRequest.lexiconNames());
+        }
+
+        if (synthesizeSpeechRequest.speechMarkTypes() != null) {
+            builder.putRawQueryParameter("SpeechMarkTypes", synthesizeSpeechRequest.speechMarkTypesAsStrings());
+        }
+
+        if (synthesizeSpeechRequest.languageCode() != null) {
+            builder.putRawQueryParameter("LanguageCode", synthesizeSpeechRequest.languageCodeAsString());
+        }
+
+        if (synthesizeSpeechRequest.engine() != null) {
+            builder.putRawQueryParameter("Engine", synthesizeSpeechRequest.engineAsString());
+        }
+
+        return builder;
+    }
+
+    public static SynthesizeSpeechRequestMarshaller getInstance() {
+        return INSTANCE;
+    }
+}
diff --git a/services/polly/src/main/java/software/amazon/awssdk/services/polly/presigner/PollyPresigner.java b/services/polly/src/main/java/software/amazon/awssdk/services/polly/presigner/PollyPresigner.java
new file mode 100644
index 000000000000..f1fd6e7e4d31
--- /dev/null
+++ b/services/polly/src/main/java/software/amazon/awssdk/services/polly/presigner/PollyPresigner.java
@@ -0,0 +1,171 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.services.polly.presigner;
+
+import java.net.URI;
+import java.net.URLConnection;
+import software.amazon.awssdk.annotations.SdkPublicApi;
+import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;
+import software.amazon.awssdk.awscore.presigner.PresignedRequest;
+import software.amazon.awssdk.awscore.presigner.SdkPresigner;
+import software.amazon.awssdk.http.SdkHttpClient;
+import software.amazon.awssdk.regions.Region;
+import software.amazon.awssdk.services.polly.internal.presigner.DefaultPollyPresigner;
+import software.amazon.awssdk.services.polly.model.PollyRequest;
+import software.amazon.awssdk.services.polly.model.SynthesizeSpeechRequest;
+import software.amazon.awssdk.services.polly.presigner.model.PresignedSynthesizeSpeechRequest;
+import software.amazon.awssdk.services.polly.presigner.model.SynthesizeSpeechPresignRequest;
+
+/**
+ * Enables signing a {@link PollyRequest} so that it can be executed without requiring any additional authentication on the
+ * part of the caller.
+ * <p/>
+ *
+ * <b>Signature Duration</b>
+ * <p/>
+ *
+ * Pre-signed requests are only valid for a finite period of time, referred to as the signature duration. This signature
+ * duration is configured when the request is generated, and cannot be longer than 7 days. Attempting to generate a signature
+ * longer than 7 days in the future will fail at generation time. Attempting to use a pre-signed request after the signature
+ * duration has passed will result in an access denied response from the service.
+ * <p/>
+ *
+ * <b>Example Usage</b>
+ * <p/>
+ *
+ * <pre>
+ * {@code
+ *     // Create a PollyPresigner using the default region and credentials.
+ *     // This is usually done at application startup, because creating a presigner can be expensive.
+ *     PollyPresigner presigner = PollyPresigner.create();
+ *
+ *     // Create a SynthesizeSpeechRequest to be pre-signed
+ *     SynthesizeSpeechRequest synthesizeSpeechRequest =
+ *             SynthesizeSpeechRequest.builder()
+ *                                    .text("Hello Polly!")
+ *                                    .voiceId(VoiceId.SALLI)
+ *                                    .outputFormat(OutputFormat.PCM)
+ *                                    .build();
+ *
+ *     // Create a SynthesizeSpeechRequest to specify the signature duration
+ *     SynthesizeSpeechPresignRequest synthesizeSpeechPresignRequest =
+ *         SynthesizeSpeechPresignRequest.builder()
+ *                                .signatureDuration(Duration.ofMinutes(10))
+ *                                .synthesizeSpeechRequest(synthesizeSpeechRequest)
+ *                                .build();
+ *
+ *     // Generate the presigned request
+ *     PresignedSynthesizeSpeechRequest presignedSynthesizeSpeechRequest =
+ *         presigner.presignSynthesizeSpeech(SynthesizeSpeechPresignRequest);
+ *
+ *     // Log the presigned URL, for example.
+ *     System.out.println("Presigned URL: " + presignedSynthesizeSpeechRequest.url());
+ *
+ *     // It is recommended to close the presigner when it is done being used, because some credential
+ *     // providers (e.g. if your AWS profile is configured to assume an STS role) require system resources
+ *     // that need to be freed. If you are using one presigner per application (as recommended), this
+ *     // usually is not needed.
+ *     presigner.close();
+ * }
+ * </pre>
+ * <p/>
+ *
+ * <b>Browser Compatibility</b>
+ * <p/>
+ *
+ * Some pre-signed requests can be executed by a web browser. These "browser compatible" pre-signed requests
+ * do not require the customer to send anything other than a "host" header when performing an HTTP GET against
+ * the pre-signed URL.
+ * <p/>
+ *
+ * Whether a pre-signed request is "browser compatible" can be determined by checking the
+ * {@link PresignedRequest#isBrowserExecutable()} flag. It is recommended to always check this flag when the pre-signed
+ * request needs to be executed by a browser, because some request fields will result in the pre-signed request not
+ * being browser-compatible.
+ * <p />
+ *
+ * <b>Executing a Pre-Signed Request from Java code</b>
+ * <p />
+ *
+ * Browser-compatible requests (see above) can be executed using a web browser. All pre-signed requests can be executed
+ * from Java code. This documentation describes two methods for executing a pre-signed request: (1) using the JDK's
+ * {@link URLConnection} class, (2) using an SDK synchronous {@link SdkHttpClient} class.
+ *
+ * <p />
+ * <i>Using {code URLConnection}:</i>
+ *
+ * <p />
+ * <pre>
+ *     // Create a pre-signed request using one of the "presign" methods on PollyPresigner
+ *     PresignedRequest presignedRequest = ...;
+ *
+ *     // Create a JDK HttpURLConnection for communicating with Polly
+ *     HttpURLConnection connection = (HttpURLConnection) presignedRequest.url().openConnection();
+ *
+ *     // Specify any headers that are needed by the service (not needed when isBrowserExecutable is true)
+ *     presignedRequest.httpRequest().headers().forEach((header, values) -> {
+ *         values.forEach(value -> {
+ *             connection.addRequestProperty(header, value);
+ *         });
+ *     });
+ *
+ *     // Download the result of executing the request
+ *     try (InputStream content = connection.getInputStream()) {
+ *         System.out.println("Service returned response: ");
+ *         IoUtils.copy(content, myFileOutputstream);
+ *     }
+ * </pre>
+ */
+@SdkPublicApi
+public interface PollyPresigner extends SdkPresigner {
+
+    /**
+     * Presign a {@link SynthesizeSpeechRequest} so that it can be executed at a later time without requiring additional
+     * signing or authentication.
+     *
+     * @param synthesizeSpeechPresignRequest The presign request.
+     * @return The presigned request.
+     */
+    PresignedSynthesizeSpeechRequest presignSynthesizeSpeech(SynthesizeSpeechPresignRequest synthesizeSpeechPresignRequest);
+
+    /**
+     * Create an instance of this presigner using the default region and credentials chains to resolve the region and
+     * credentials to use.
+     */
+    static PollyPresigner create() {
+        return builder().build();
+    }
+
+    /**
+     * @return the builder for a {@link PollyPresigner}.
+     */
+    static Builder builder() {
+        return DefaultPollyPresigner.builder();
+    }
+
+    interface Builder extends SdkPresigner.Builder {
+        @Override
+        Builder region(Region region);
+
+        @Override
+        Builder credentialsProvider(AwsCredentialsProvider credentialsProvider);
+
+        @Override
+        Builder endpointOverride(URI endpointOverride);
+
+        PollyPresigner build();
+    }
+}
\ No newline at end of file
diff --git a/services/polly/src/main/java/software/amazon/awssdk/services/polly/presigner/model/PresignedSynthesizeSpeechRequest.java b/services/polly/src/main/java/software/amazon/awssdk/services/polly/presigner/model/PresignedSynthesizeSpeechRequest.java
new file mode 100644
index 000000000000..62b6720d6fe4
--- /dev/null
+++ b/services/polly/src/main/java/software/amazon/awssdk/services/polly/presigner/model/PresignedSynthesizeSpeechRequest.java
@@ -0,0 +1,94 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.services.polly.presigner.model;
+
+import java.time.Instant;
+import java.util.List;
+import java.util.Map;
+import software.amazon.awssdk.annotations.Immutable;
+import software.amazon.awssdk.annotations.SdkPublicApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.awscore.presigner.PresignedRequest;
+import software.amazon.awssdk.core.SdkBytes;
+import software.amazon.awssdk.http.SdkHttpRequest;
+import software.amazon.awssdk.utils.builder.CopyableBuilder;
+import software.amazon.awssdk.utils.builder.ToCopyableBuilder;
+
+/**
+ * A pre-signed a {@link SynthesizeSpeechPresignRequest} that can be executed at a later time without requiring
+ * additional signing or authentication.
+ *
+ * @see software.amazon.awssdk.services.polly.presigner.PollyPresigner#presignSynthesizeSpeech(SynthesizeSpeechPresignRequest)
+ * @see #builder()
+ */
+@SdkPublicApi
+@Immutable
+@ThreadSafe
+public final class PresignedSynthesizeSpeechRequest
+        extends PresignedRequest
+        implements ToCopyableBuilder<PresignedSynthesizeSpeechRequest.Builder, PresignedSynthesizeSpeechRequest> {
+
+
+    private PresignedSynthesizeSpeechRequest(BuilderImpl builder) {
+        super(builder);
+    }
+
+    public static Builder builder() {
+        return new BuilderImpl();
+    }
+
+    @Override
+    public Builder toBuilder() {
+        return new BuilderImpl(this);
+    }
+
+    public interface Builder extends PresignedRequest.Builder,
+            CopyableBuilder<Builder, PresignedSynthesizeSpeechRequest> {
+
+        @Override
+        Builder expiration(Instant expiration);
+
+        @Override
+        Builder isBrowserExecutable(Boolean isBrowserExecutable);
+
+        @Override
+        Builder signedHeaders(Map<String, List<String>> signedHeaders);
+
+        @Override
+        Builder signedPayload(SdkBytes signedPayload);
+
+        @Override
+        Builder httpRequest(SdkHttpRequest httpRequest);
+
+        @Override
+        PresignedSynthesizeSpeechRequest build();
+    }
+
+    private static class BuilderImpl extends PresignedRequest.DefaultBuilder<BuilderImpl> implements Builder {
+
+        BuilderImpl() {
+        }
+
+        BuilderImpl(PresignedSynthesizeSpeechRequest presignedSynthesizeSpeechRequest) {
+            super(presignedSynthesizeSpeechRequest);
+        }
+
+        @Override
+        public PresignedSynthesizeSpeechRequest build() {
+            return new PresignedSynthesizeSpeechRequest(this);
+        }
+    }
+}
diff --git a/services/polly/src/main/java/software/amazon/awssdk/services/polly/presigner/model/SynthesizeSpeechPresignRequest.java b/services/polly/src/main/java/software/amazon/awssdk/services/polly/presigner/model/SynthesizeSpeechPresignRequest.java
new file mode 100644
index 000000000000..3a4fd63591e1
--- /dev/null
+++ b/services/polly/src/main/java/software/amazon/awssdk/services/polly/presigner/model/SynthesizeSpeechPresignRequest.java
@@ -0,0 +1,96 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.services.polly.presigner.model;
+
+import java.time.Duration;
+import software.amazon.awssdk.annotations.Immutable;
+import software.amazon.awssdk.annotations.SdkPublicApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.awscore.presigner.PresignRequest;
+import software.amazon.awssdk.services.polly.model.SynthesizeSpeechRequest;
+import software.amazon.awssdk.utils.builder.CopyableBuilder;
+import software.amazon.awssdk.utils.builder.ToCopyableBuilder;
+
+/**
+ * A request to pre-sign a {@link software.amazon.awssdk.services.polly.presigner.PollyPresigner} so that it can be
+ * executed at a later time without requiring additional signing or authentication.
+ *
+ * @see software.amazon.awssdk.services.polly.presigner.PollyPresigner#presignSynthesizeSpeech(SynthesizeSpeechPresignRequest)
+ * @see #builder()
+ */
+@SdkPublicApi
+@Immutable
+@ThreadSafe
+public final class SynthesizeSpeechPresignRequest
+        extends PresignRequest
+        implements ToCopyableBuilder<SynthesizeSpeechPresignRequest.Builder, SynthesizeSpeechPresignRequest> {
+
+    private final SynthesizeSpeechRequest synthesizeSpeechRequest;
+
+    private SynthesizeSpeechPresignRequest(BuilderImpl builder) {
+        super(builder);
+        this.synthesizeSpeechRequest = builder.synthesizeSpeechRequest;
+    }
+
+    public SynthesizeSpeechRequest synthesizeSpeechRequest() {
+        return synthesizeSpeechRequest;
+    }
+
+    @Override
+    public Builder toBuilder() {
+        return new BuilderImpl(this);
+    }
+
+    public static Builder builder() {
+        return new BuilderImpl();
+    }
+
+    public interface Builder extends PresignRequest.Builder,
+            CopyableBuilder<SynthesizeSpeechPresignRequest.Builder, SynthesizeSpeechPresignRequest> {
+
+        Builder synthesizeSpeechRequest(SynthesizeSpeechRequest synthesizeSpeechRequest);
+
+        Builder signatureDuration(Duration signatureDuration);
+
+        /**
+         * Build the presigned request, based on the configuration on this builder.
+         */
+        SynthesizeSpeechPresignRequest build();
+    }
+
+    private static class BuilderImpl extends PresignRequest.DefaultBuilder<BuilderImpl> implements Builder {
+        private SynthesizeSpeechRequest synthesizeSpeechRequest;
+
+        BuilderImpl() {
+        }
+
+        private BuilderImpl(SynthesizeSpeechPresignRequest synthesizeSpeechPresignRequest) {
+            super(synthesizeSpeechPresignRequest);
+            this.synthesizeSpeechRequest = synthesizeSpeechPresignRequest.synthesizeSpeechRequest();
+        }
+
+        @Override
+        public Builder synthesizeSpeechRequest(SynthesizeSpeechRequest synthesizeSpeechRequest) {
+            this.synthesizeSpeechRequest = synthesizeSpeechRequest;
+            return this;
+        }
+
+        @Override
+        public SynthesizeSpeechPresignRequest build() {
+            return new SynthesizeSpeechPresignRequest(this);
+        }
+    }
+}
diff --git a/services/polly/src/test/java/software/amazon/awssdk/services/polly/internal/presigner/DefaultPollyPresignerTest.java b/services/polly/src/test/java/software/amazon/awssdk/services/polly/internal/presigner/DefaultPollyPresignerTest.java
new file mode 100644
index 000000000000..2f61853c7f72
--- /dev/null
+++ b/services/polly/src/test/java/software/amazon/awssdk/services/polly/internal/presigner/DefaultPollyPresignerTest.java
@@ -0,0 +1,190 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.services.polly.internal.presigner;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import java.io.Closeable;
+import java.io.IOException;
+import java.net.URI;
+import java.net.URL;
+import java.time.Duration;
+import org.junit.Before;
+import org.junit.Test;
+import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
+import software.amazon.awssdk.auth.credentials.AwsCredentials;
+import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;
+import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
+import software.amazon.awssdk.awscore.AwsRequestOverrideConfiguration;
+import software.amazon.awssdk.regions.Region;
+import software.amazon.awssdk.services.polly.model.OutputFormat;
+import software.amazon.awssdk.services.polly.model.SynthesizeSpeechRequest;
+import software.amazon.awssdk.services.polly.presigner.PollyPresigner;
+import software.amazon.awssdk.services.polly.presigner.model.PresignedSynthesizeSpeechRequest;
+import software.amazon.awssdk.services.polly.presigner.model.SynthesizeSpeechPresignRequest;
+
+/**
+ * Tests for {@link DefaultPollyPresigner}.
+ */
+public class DefaultPollyPresignerTest {
+    private static final SynthesizeSpeechRequest BASIC_SYNTHESIZE_SPEECH_REQUEST = SynthesizeSpeechRequest.builder()
+            .voiceId("Salli")
+            .outputFormat(OutputFormat.PCM)
+            .text("Hello presigners!")
+            .build();
+
+    private AwsCredentialsProvider credentialsProvider;
+
+    @Before
+    public void methodSetup() {
+        credentialsProvider = StaticCredentialsProvider.create(AwsBasicCredentials.create("akid", "skid"));
+    }
+
+    @Test
+    public void presign_requestLevelCredentials_honored() {
+        AwsCredentials requestCredentials = AwsBasicCredentials.create("akid2", "skid2");
+
+        PollyPresigner presigner = DefaultPollyPresigner.builder()
+                .region(Region.US_EAST_1)
+                .credentialsProvider(credentialsProvider)
+                .build();
+
+        SynthesizeSpeechRequest synthesizeSpeechRequest = BASIC_SYNTHESIZE_SPEECH_REQUEST.toBuilder()
+                .overrideConfiguration(AwsRequestOverrideConfiguration.builder()
+                        .credentialsProvider(StaticCredentialsProvider.create(requestCredentials)).build())
+                .build();
+
+        SynthesizeSpeechPresignRequest presignRequest = SynthesizeSpeechPresignRequest.builder()
+                .synthesizeSpeechRequest(synthesizeSpeechRequest)
+                .signatureDuration(Duration.ofHours(3))
+                .build();
+
+        PresignedSynthesizeSpeechRequest presignedSynthesizeSpeechRequest = presigner.presignSynthesizeSpeech(presignRequest);
+
+        assertThat(presignedSynthesizeSpeechRequest.url().getQuery()).contains("X-Amz-Credential=akid2");
+    }
+
+    @Test
+    public void presign_requestLevelHeaders_included() {
+        PollyPresigner presigner = DefaultPollyPresigner.builder()
+                .region(Region.US_EAST_1)
+                .credentialsProvider(credentialsProvider)
+                .build();
+
+        SynthesizeSpeechRequest synthesizeSpeechRequest = BASIC_SYNTHESIZE_SPEECH_REQUEST.toBuilder()
+                .overrideConfiguration(AwsRequestOverrideConfiguration.builder()
+                        .putHeader("Header1", "Header1Value")
+                        .putHeader("Header2", "Header2Value")
+                        .build())
+                .build();
+
+        SynthesizeSpeechPresignRequest presignRequest = SynthesizeSpeechPresignRequest.builder()
+                .synthesizeSpeechRequest(synthesizeSpeechRequest)
+                .signatureDuration(Duration.ofHours(3))
+                .build();
+
+        PresignedSynthesizeSpeechRequest presignedSynthesizeSpeechRequest = presigner.presignSynthesizeSpeech(presignRequest);
+
+        assertThat(presignedSynthesizeSpeechRequest.httpRequest().headers().keySet()).contains("Header1", "Header2");
+    }
+
+    @Test
+    public void presign_includesRequestLevelHeaders_notBrowserCompatible() {
+        PollyPresigner presigner = DefaultPollyPresigner.builder()
+                .region(Region.US_EAST_1)
+                .credentialsProvider(credentialsProvider)
+                .build();
+
+        SynthesizeSpeechRequest synthesizeSpeechRequest = BASIC_SYNTHESIZE_SPEECH_REQUEST.toBuilder()
+                .overrideConfiguration(AwsRequestOverrideConfiguration.builder()
+                        .putHeader("Header1", "Header1Value")
+                        .putHeader("Header2", "Header2Value")
+                        .build())
+                .build();
+
+        SynthesizeSpeechPresignRequest presignRequest = SynthesizeSpeechPresignRequest.builder()
+                .synthesizeSpeechRequest(synthesizeSpeechRequest)
+                .signatureDuration(Duration.ofHours(3))
+                .build();
+
+        PresignedSynthesizeSpeechRequest presignedSynthesizeSpeechRequest = presigner.presignSynthesizeSpeech(presignRequest);
+
+        assertThat(presignedSynthesizeSpeechRequest.isBrowserExecutable()).isFalse();
+    }
+
+    @Test
+    public void presign_includesRequestLevelQueryParams_included() {
+        PollyPresigner presigner = DefaultPollyPresigner.builder()
+                .region(Region.US_EAST_1)
+                .credentialsProvider(credentialsProvider)
+                .build();
+
+        SynthesizeSpeechRequest synthesizeSpeechRequest = BASIC_SYNTHESIZE_SPEECH_REQUEST.toBuilder()
+                .overrideConfiguration(AwsRequestOverrideConfiguration.builder()
+                        .putRawQueryParameter("QueryParam1", "Param1Value")
+                        .build())
+                .build();
+
+        SynthesizeSpeechPresignRequest presignRequest = SynthesizeSpeechPresignRequest.builder()
+                .synthesizeSpeechRequest(synthesizeSpeechRequest)
+                .signatureDuration(Duration.ofHours(3))
+                .build();
+
+        PresignedSynthesizeSpeechRequest presignedSynthesizeSpeechRequest = presigner.presignSynthesizeSpeech(presignRequest);
+
+        assertThat(presignedSynthesizeSpeechRequest.httpRequest().rawQueryParameters().keySet()).contains("QueryParam1");
+    }
+
+    @Test
+    public void presign_endpointOverriden() {
+        PollyPresigner presigner = DefaultPollyPresigner.builder()
+                .region(Region.US_EAST_1)
+                .credentialsProvider(credentialsProvider)
+                .endpointOverride(URI.create("http://some-other-polly-endpoint.aws:1234"))
+                .build();
+
+        SynthesizeSpeechPresignRequest presignRequest = SynthesizeSpeechPresignRequest.builder()
+                .synthesizeSpeechRequest(BASIC_SYNTHESIZE_SPEECH_REQUEST)
+                .signatureDuration(Duration.ofHours(3))
+                .build();
+
+        PresignedSynthesizeSpeechRequest presignedSynthesizeSpeechRequest = presigner.presignSynthesizeSpeech(presignRequest);
+
+        URL presignedUrl = presignedSynthesizeSpeechRequest.url();
+
+        assertThat(presignedUrl.getProtocol()).isEqualTo("http");
+        assertThat(presignedUrl.getHost()).isEqualTo("some-other-polly-endpoint.aws");
+        assertThat(presignedUrl.getPort()).isEqualTo(1234);
+    }
+
+    @Test
+    public void close_closesCustomCloseableCredentialsProvider() throws IOException {
+        TestCredentialsProvider mockCredentialsProvider = mock(TestCredentialsProvider.class);
+
+        PollyPresigner presigner = DefaultPollyPresigner.builder()
+                .region(Region.US_EAST_1)
+                .credentialsProvider(mockCredentialsProvider)
+                .build();
+
+        presigner.close();
+
+        verify(mockCredentialsProvider).close();
+    }
+
+    private interface TestCredentialsProvider extends AwsCredentialsProvider, Closeable {
+    }
+}
diff --git a/services/polly/src/test/java/software/amazon/awssdk/services/polly/internal/presigner/model/transform/SynthesizeSpeechRequestMarshallerTest.java b/services/polly/src/test/java/software/amazon/awssdk/services/polly/internal/presigner/model/transform/SynthesizeSpeechRequestMarshallerTest.java
new file mode 100644
index 000000000000..e03997fe4736
--- /dev/null
+++ b/services/polly/src/test/java/software/amazon/awssdk/services/polly/internal/presigner/model/transform/SynthesizeSpeechRequestMarshallerTest.java
@@ -0,0 +1,99 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.services.polly.internal.presigner.model.transform;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import software.amazon.awssdk.core.SdkField;
+import software.amazon.awssdk.http.SdkHttpFullRequest;
+import software.amazon.awssdk.http.SdkHttpMethod;
+import software.amazon.awssdk.services.polly.model.SynthesizeSpeechRequest;
+
+public class SynthesizeSpeechRequestMarshallerTest {
+    private static Map<String, Object> properties;
+
+    @BeforeClass
+    public static void setup() {
+        properties = new HashMap<>();
+
+        properties.put("Engine", "engine");
+        properties.put("LanguageCode", "languageCode");
+        properties.put("LexiconNames", Arrays.asList("Lexicon1", "Lexicon2", "Lexicon3"));
+        properties.put("OutputFormat", "outputFormat");
+        properties.put("SampleRate", "sampleRate");
+        properties.put("SpeechMarkTypes", Arrays.asList("SpeechMark1", "SpeechMark2"));
+        properties.put("Text", "text");
+        properties.put("TextType", "textType");
+        properties.put("VoiceId", "voiceId");
+    }
+
+    // Test to ensure that we are testing with all the known properties for
+    // this request. If this test fails, it means Polly added a new field to
+    // SynthesizeSpeechRequest and the marshaller and/or properties map above
+    // wasn't updated.
+    @Test
+    public void marshall_allPropertiesAccountedFor() {
+        SynthesizeSpeechRequest request = SynthesizeSpeechRequest.builder().build();
+        request.sdkFields().forEach(f -> assertThat(properties.containsKey(f.locationName())).isTrue());
+    }
+
+    @Test
+    public void marshall_allPropertiesMarshalled() {
+        SynthesizeSpeechRequest.Builder builder = setAllProperties(SynthesizeSpeechRequest.builder());
+
+        SdkHttpFullRequest.Builder marshalled = SynthesizeSpeechRequestMarshaller.getInstance().marshall(builder.build());
+
+        Map<String, List<String>> queryParams = marshalled.rawQueryParameters();
+
+        properties.keySet().forEach(k -> {
+            Object expected = properties.get(k);
+            List<String> actual = queryParams.get(k);
+            if (expected instanceof List) {
+                assertThat(actual).isEqualTo(expected);
+            } else {
+                assertThat(actual).containsExactly((String) expected);
+            }
+        });
+
+        assertThat(marshalled.contentStreamProvider()).isNull();
+    }
+
+    @Test
+    public void marshall_correctPath() {
+        SdkHttpFullRequest.Builder marshalled = SynthesizeSpeechRequestMarshaller.getInstance()
+                .marshall(SynthesizeSpeechRequest.builder().build());
+        assertThat(marshalled.encodedPath()).isEqualTo("/v1/speech");
+    }
+
+    @Test
+    public void marshall_correctMethod() {
+        SdkHttpFullRequest.Builder marshalled = SynthesizeSpeechRequestMarshaller.getInstance()
+                .marshall(SynthesizeSpeechRequest.builder().build());
+        assertThat(marshalled.method()).isEqualTo(SdkHttpMethod.GET);
+    }
+
+    private SynthesizeSpeechRequest.Builder setAllProperties(SynthesizeSpeechRequest.Builder builder) {
+        SynthesizeSpeechRequest request = SynthesizeSpeechRequest.builder().build();
+        List<SdkField<?>> sdkFields = request.sdkFields();
+        sdkFields.forEach(f -> f.set(builder, properties.get(f.locationName())));
+        return builder;
+    }
+}
diff --git a/services/polly/src/test/resources/cucumber.properties b/services/polly/src/test/resources/cucumber.properties
index 632076784f92..3a1dfa7f0405 100644
--- a/services/polly/src/test/resources/cucumber.properties
+++ b/services/polly/src/test/resources/cucumber.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/polly/src/test/resources/log4j.properties b/services/polly/src/test/resources/log4j.properties
index bca2db7f0aa7..811a9c51ff3d 100644
--- a/services/polly/src/test/resources/log4j.properties
+++ b/services/polly/src/test/resources/log4j.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/pom.xml b/services/pom.xml
index cb230e0953eb..e7de375b8418 100644
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -1,10 +1,25 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+  ~ 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.
+  -->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>services</artifactId>
     <name>AWS Java SDK :: Services</name>
@@ -198,6 +213,34 @@
         <module>qldb</module>
         <module>qldbsession</module>
         <module>workmailmessageflow</module>
+        <module>codestarnotifications</module>
+        <module>savingsplans</module>
+        <module>sso</module>
+        <module>ssooidc</module>
+        <module>marketplacecatalog</module>
+        <module>sesv2</module>
+        <module>dataexchange</module>
+        <module>migrationhubconfig</module>
+        <module>connectparticipant</module>
+        <module>wafv2</module>
+        <module>appconfig</module>
+        <module>iotsecuretunneling</module>
+        <module>elasticinference</module>
+        <module>imagebuilder</module>
+        <module>schemas</module>
+        <module>accessanalyzer</module>
+        <module>computeoptimizer</module>
+        <module>networkmanager</module>
+        <module>kendra</module>
+        <module>frauddetector</module>
+        <module>codegurureviewer</module>
+        <module>codeguruprofiler</module>
+        <module>outposts</module>
+        <module>sagemakera2iruntime</module>
+        <module>ebs</module>
+        <module>kinesisvideosignaling</module>
+        <module>detective</module>
+        <module>codestarconnections</module>
     </modules>
     <description>The AWS Java SDK services</description>
     <url>https://aws.amazon.com/sdkforjava</url>
diff --git a/services/pricing/pom.xml b/services/pricing/pom.xml
index 2bca4a3a79f6..45e615f43b6c 100644
--- a/services/pricing/pom.xml
+++ b/services/pricing/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>services</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>pricing</artifactId>
diff --git a/services/qldb/pom.xml b/services/qldb/pom.xml
index 8838a32d9230..67fbb2d945bd 100644
--- a/services/qldb/pom.xml
+++ b/services/qldb/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>qldb</artifactId>
     <name>AWS Java SDK :: Services :: QLDB</name>
diff --git a/services/qldbsession/pom.xml b/services/qldbsession/pom.xml
index 951241e8045d..427ff774bdc5 100644
--- a/services/qldbsession/pom.xml
+++ b/services/qldbsession/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>qldbsession</artifactId>
     <name>AWS Java SDK :: Services :: QLDB Session</name>
diff --git a/services/quicksight/pom.xml b/services/quicksight/pom.xml
index 31fce027e3a2..74bc015ed040 100644
--- a/services/quicksight/pom.xml
+++ b/services/quicksight/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>quicksight</artifactId>
     <name>AWS Java SDK :: Services :: QuickSight</name>
diff --git a/services/quicksight/src/main/resources/codegen-resources/paginators-1.json b/services/quicksight/src/main/resources/codegen-resources/paginators-1.json
index 5677bd8e4a2d..c6285c2b18c2 100644
--- a/services/quicksight/src/main/resources/codegen-resources/paginators-1.json
+++ b/services/quicksight/src/main/resources/codegen-resources/paginators-1.json
@@ -1,4 +1,49 @@
 {
   "pagination": {
+    "ListDashboardVersions": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "MaxResults"
+    },
+    "ListDashboards": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "MaxResults"
+    },
+    "ListDataSets": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "MaxResults"
+    },
+    "ListDataSources": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "MaxResults"
+    },
+    "ListIngestions": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "MaxResults"
+    },
+    "ListTemplateAliases": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "MaxResults"
+    },
+    "ListTemplateVersions": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "MaxResults"
+    },
+    "ListTemplates": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "MaxResults"
+    },
+    "SearchDashboards": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "MaxResults"
+    }
   }
 }
diff --git a/services/quicksight/src/main/resources/codegen-resources/service-2.json b/services/quicksight/src/main/resources/codegen-resources/service-2.json
index 686bf0401bc1..c7fdcb203178 100644
--- a/services/quicksight/src/main/resources/codegen-resources/service-2.json
+++ b/services/quicksight/src/main/resources/codegen-resources/service-2.json
@@ -11,6 +11,84 @@
     "uid":"quicksight-2018-04-01"
   },
   "operations":{
+    "CancelIngestion":{
+      "name":"CancelIngestion",
+      "http":{
+        "method":"DELETE",
+        "requestUri":"/accounts/{AwsAccountId}/data-sets/{DataSetId}/ingestions/{IngestionId}"
+      },
+      "input":{"shape":"CancelIngestionRequest"},
+      "output":{"shape":"CancelIngestionResponse"},
+      "errors":[
+        {"shape":"AccessDeniedException"},
+        {"shape":"InvalidParameterValueException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"ResourceExistsException"},
+        {"shape":"InternalFailureException"}
+      ],
+      "documentation":"<p>Cancels an ongoing ingestion of data into SPICE.</p>"
+    },
+    "CreateDashboard":{
+      "name":"CreateDashboard",
+      "http":{
+        "method":"POST",
+        "requestUri":"/accounts/{AwsAccountId}/dashboards/{DashboardId}"
+      },
+      "input":{"shape":"CreateDashboardRequest"},
+      "output":{"shape":"CreateDashboardResponse"},
+      "errors":[
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InvalidParameterValueException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"ResourceExistsException"},
+        {"shape":"ConflictException"},
+        {"shape":"UnsupportedUserEditionException"},
+        {"shape":"InternalFailureException"}
+      ],
+      "documentation":"<p>Creates a dashboard from a template. To first create a template, see the CreateTemplate API operation.</p> <p>A dashboard is an entity in QuickSight that identifies QuickSight reports, created from analyses. You can share QuickSight dashboards. With the right permissions, you can create scheduled email reports from them. The <code>CreateDashboard</code>, <code>DescribeDashboard</code>, and <code>ListDashboardsByUser</code> API operations act on the dashboard entity. If you have the correct permissions, you can create a dashboard from a template that exists in a different AWS account.</p>"
+    },
+    "CreateDataSet":{
+      "name":"CreateDataSet",
+      "http":{
+        "method":"POST",
+        "requestUri":"/accounts/{AwsAccountId}/data-sets"
+      },
+      "input":{"shape":"CreateDataSetRequest"},
+      "output":{"shape":"CreateDataSetResponse"},
+      "errors":[
+        {"shape":"AccessDeniedException"},
+        {"shape":"ConflictException"},
+        {"shape":"InvalidParameterValueException"},
+        {"shape":"LimitExceededException"},
+        {"shape":"ResourceExistsException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"UnsupportedUserEditionException"},
+        {"shape":"InternalFailureException"}
+      ],
+      "documentation":"<p>Creates a dataset.</p>"
+    },
+    "CreateDataSource":{
+      "name":"CreateDataSource",
+      "http":{
+        "method":"POST",
+        "requestUri":"/accounts/{AwsAccountId}/data-sources"
+      },
+      "input":{"shape":"CreateDataSourceRequest"},
+      "output":{"shape":"CreateDataSourceResponse"},
+      "errors":[
+        {"shape":"AccessDeniedException"},
+        {"shape":"ConflictException"},
+        {"shape":"InvalidParameterValueException"},
+        {"shape":"LimitExceededException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ResourceExistsException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"InternalFailureException"}
+      ],
+      "documentation":"<p>Creates a data source.</p>"
+    },
     "CreateGroup":{
       "name":"CreateGroup",
       "http":{
@@ -30,7 +108,7 @@
         {"shape":"InternalFailureException"},
         {"shape":"ResourceUnavailableException"}
       ],
-      "documentation":"<p>Creates an Amazon QuickSight group.</p> <p>The permissions resource is <code>arn:aws:quicksight:us-east-1:<i>&lt;relevant-aws-account-id&gt;</i>:group/default/<i>&lt;group-name&gt;</i> </code>.</p> <p>The response is a group object.</p> <p> <b>CLI Sample:</b> </p> <p> <code>aws quicksight create-group --aws-account-id=111122223333 --namespace=default --group-name=\"Sales-Management\" --description=\"Sales Management - Forecasting\" </code> </p>"
+      "documentation":"<p>Creates an Amazon QuickSight group.</p> <p>The permissions resource is <code>arn:aws:quicksight:us-east-1:<i>&lt;relevant-aws-account-id&gt;</i>:group/default/<i>&lt;group-name&gt;</i> </code>.</p> <p>The response is a group object.</p>"
     },
     "CreateGroupMembership":{
       "name":"CreateGroupMembership",
@@ -49,7 +127,136 @@
         {"shape":"InternalFailureException"},
         {"shape":"ResourceUnavailableException"}
       ],
-      "documentation":"<p>Adds an Amazon QuickSight user to an Amazon QuickSight group. </p> <p>The permissions resource is <code>arn:aws:quicksight:us-east-1:<i>&lt;aws-account-id&gt;</i>:group/default/<i>&lt;group-name&gt;</i> </code>.</p> <p>The condition resource is the user name.</p> <p>The condition key is <code>quicksight:UserName</code>.</p> <p>The response is the group member object.</p> <p> <b>CLI Sample:</b> </p> <p> <code>aws quicksight create-group-membership --aws-account-id=111122223333 --namespace=default --group-name=Sales --member-name=Pat </code> </p>"
+      "documentation":"<p>Adds an Amazon QuickSight user to an Amazon QuickSight group. </p>"
+    },
+    "CreateIAMPolicyAssignment":{
+      "name":"CreateIAMPolicyAssignment",
+      "http":{
+        "method":"POST",
+        "requestUri":"/accounts/{AwsAccountId}/namespaces/{Namespace}/iam-policy-assignments/"
+      },
+      "input":{"shape":"CreateIAMPolicyAssignmentRequest"},
+      "output":{"shape":"CreateIAMPolicyAssignmentResponse"},
+      "errors":[
+        {"shape":"AccessDeniedException"},
+        {"shape":"InvalidParameterValueException"},
+        {"shape":"ResourceExistsException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"ConcurrentUpdatingException"},
+        {"shape":"InternalFailureException"}
+      ],
+      "documentation":"<p>Creates an assignment with one specified IAM policy, identified by its Amazon Resource Name (ARN). This policy will be assigned to specified groups or users of Amazon QuickSight. The users and groups need to be in the same namespace. </p>"
+    },
+    "CreateIngestion":{
+      "name":"CreateIngestion",
+      "http":{
+        "method":"PUT",
+        "requestUri":"/accounts/{AwsAccountId}/data-sets/{DataSetId}/ingestions/{IngestionId}"
+      },
+      "input":{"shape":"CreateIngestionRequest"},
+      "output":{"shape":"CreateIngestionResponse"},
+      "errors":[
+        {"shape":"AccessDeniedException"},
+        {"shape":"InvalidParameterValueException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"LimitExceededException"},
+        {"shape":"ResourceExistsException"},
+        {"shape":"InternalFailureException"}
+      ],
+      "documentation":"<p>Creates and starts a new SPICE ingestion on a dataset</p> <p>Any ingestions operating on tagged datasets inherit the same tags automatically for use in access control. For an example, see <a href=\"https://aws.example.com/premiumsupport/knowledge-center/iam-ec2-resource-tags/\">How do I create an IAM policy to control access to Amazon EC2 resources using tags?</a> in the AWS Knowledge Center. Tags are visible on the tagged dataset, but not on the ingestion resource.</p>"
+    },
+    "CreateTemplate":{
+      "name":"CreateTemplate",
+      "http":{
+        "method":"POST",
+        "requestUri":"/accounts/{AwsAccountId}/templates/{TemplateId}"
+      },
+      "input":{"shape":"CreateTemplateRequest"},
+      "output":{"shape":"CreateTemplateResponse"},
+      "errors":[
+        {"shape":"InvalidParameterValueException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"ResourceExistsException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"LimitExceededException"},
+        {"shape":"UnsupportedUserEditionException"},
+        {"shape":"InternalFailureException"}
+      ],
+      "documentation":"<p>Creates a template from an existing QuickSight analysis or template. You can use the resulting template to create a dashboard.</p> <p>A <i>template</i> is an entity in QuickSight that encapsulates the metadata required to create an analysis and that you can use to create s dashboard. A template adds a layer of abstraction by using placeholders to replace the dataset associated with the analysis. You can use templates to create dashboards by replacing dataset placeholders with datasets that follow the same schema that was used to create the source analysis and template.</p>"
+    },
+    "CreateTemplateAlias":{
+      "name":"CreateTemplateAlias",
+      "http":{
+        "method":"POST",
+        "requestUri":"/accounts/{AwsAccountId}/templates/{TemplateId}/aliases/{AliasName}"
+      },
+      "input":{"shape":"CreateTemplateAliasRequest"},
+      "output":{"shape":"CreateTemplateAliasResponse"},
+      "errors":[
+        {"shape":"ThrottlingException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ConflictException"},
+        {"shape":"ResourceExistsException"},
+        {"shape":"LimitExceededException"},
+        {"shape":"UnsupportedUserEditionException"},
+        {"shape":"InternalFailureException"}
+      ],
+      "documentation":"<p>Creates a template alias for a template.</p>"
+    },
+    "DeleteDashboard":{
+      "name":"DeleteDashboard",
+      "http":{
+        "method":"DELETE",
+        "requestUri":"/accounts/{AwsAccountId}/dashboards/{DashboardId}"
+      },
+      "input":{"shape":"DeleteDashboardRequest"},
+      "output":{"shape":"DeleteDashboardResponse"},
+      "errors":[
+        {"shape":"ThrottlingException"},
+        {"shape":"InvalidParameterValueException"},
+        {"shape":"ConflictException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"UnsupportedUserEditionException"},
+        {"shape":"InternalFailureException"}
+      ],
+      "documentation":"<p>Deletes a dashboard.</p>"
+    },
+    "DeleteDataSet":{
+      "name":"DeleteDataSet",
+      "http":{
+        "method":"DELETE",
+        "requestUri":"/accounts/{AwsAccountId}/data-sets/{DataSetId}"
+      },
+      "input":{"shape":"DeleteDataSetRequest"},
+      "output":{"shape":"DeleteDataSetResponse"},
+      "errors":[
+        {"shape":"AccessDeniedException"},
+        {"shape":"InvalidParameterValueException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InternalFailureException"}
+      ],
+      "documentation":"<p>Deletes a dataset.</p>"
+    },
+    "DeleteDataSource":{
+      "name":"DeleteDataSource",
+      "http":{
+        "method":"DELETE",
+        "requestUri":"/accounts/{AwsAccountId}/data-sources/{DataSourceId}"
+      },
+      "input":{"shape":"DeleteDataSourceRequest"},
+      "output":{"shape":"DeleteDataSourceResponse"},
+      "errors":[
+        {"shape":"AccessDeniedException"},
+        {"shape":"InvalidParameterValueException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InternalFailureException"}
+      ],
+      "documentation":"<p>Deletes the data source permanently. This action breaks all the datasets that reference the deleted data source.</p>"
     },
     "DeleteGroup":{
       "name":"DeleteGroup",
@@ -68,7 +275,7 @@
         {"shape":"InternalFailureException"},
         {"shape":"ResourceUnavailableException"}
       ],
-      "documentation":"<p>Removes a user group from Amazon QuickSight. </p> <p>The permissions resource is <code>arn:aws:quicksight:us-east-1:<i>&lt;aws-account-id&gt;</i>:group/default/<i>&lt;group-name&gt;</i> </code>.</p> <p> <b>CLI Sample:</b> </p> <p> <code>aws quicksight delete-group -\\-aws-account-id=111122223333 -\\-namespace=default -\\-group-name=Sales-Management </code> </p>"
+      "documentation":"<p>Removes a user group from Amazon QuickSight. </p>"
     },
     "DeleteGroupMembership":{
       "name":"DeleteGroupMembership",
@@ -87,7 +294,61 @@
         {"shape":"InternalFailureException"},
         {"shape":"ResourceUnavailableException"}
       ],
-      "documentation":"<p>Removes a user from a group so that the user is no longer a member of the group.</p> <p>The permissions resource is <code>arn:aws:quicksight:us-east-1:<i>&lt;aws-account-id&gt;</i>:group/default/<i>&lt;group-name&gt;</i> </code>.</p> <p>The condition resource is the user name.</p> <p>The condition key is <code>quicksight:UserName</code>.</p> <p> <b>CLI Sample:</b> </p> <p> <code>aws quicksight delete-group-membership --aws-account-id=111122223333 --namespace=default --group-name=Sales-Management --member-name=Charlie </code> </p>"
+      "documentation":"<p>Removes a user from a group so that the user is no longer a member of the group.</p>"
+    },
+    "DeleteIAMPolicyAssignment":{
+      "name":"DeleteIAMPolicyAssignment",
+      "http":{
+        "method":"DELETE",
+        "requestUri":"/accounts/{AwsAccountId}/namespace/{Namespace}/iam-policy-assignments/{AssignmentName}"
+      },
+      "input":{"shape":"DeleteIAMPolicyAssignmentRequest"},
+      "output":{"shape":"DeleteIAMPolicyAssignmentResponse"},
+      "errors":[
+        {"shape":"AccessDeniedException"},
+        {"shape":"InvalidParameterValueException"},
+        {"shape":"ResourceExistsException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"ConcurrentUpdatingException"},
+        {"shape":"InternalFailureException"}
+      ],
+      "documentation":"<p>Deletes an existing IAM policy assignment.</p>"
+    },
+    "DeleteTemplate":{
+      "name":"DeleteTemplate",
+      "http":{
+        "method":"DELETE",
+        "requestUri":"/accounts/{AwsAccountId}/templates/{TemplateId}"
+      },
+      "input":{"shape":"DeleteTemplateRequest"},
+      "output":{"shape":"DeleteTemplateResponse"},
+      "errors":[
+        {"shape":"InvalidParameterValueException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"ConflictException"},
+        {"shape":"LimitExceededException"},
+        {"shape":"UnsupportedUserEditionException"},
+        {"shape":"InternalFailureException"}
+      ],
+      "documentation":"<p>Deletes a template.</p>"
+    },
+    "DeleteTemplateAlias":{
+      "name":"DeleteTemplateAlias",
+      "http":{
+        "method":"DELETE",
+        "requestUri":"/accounts/{AwsAccountId}/templates/{TemplateId}/aliases/{AliasName}"
+      },
+      "input":{"shape":"DeleteTemplateAliasRequest"},
+      "output":{"shape":"DeleteTemplateAliasResponse"},
+      "errors":[
+        {"shape":"ThrottlingException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"UnsupportedUserEditionException"},
+        {"shape":"InternalFailureException"}
+      ],
+      "documentation":"<p>Deletes the item that the specified template alias points to. If you provide a specific alias, you delete the version of the template that the alias points to.</p>"
     },
     "DeleteUser":{
       "name":"DeleteUser",
@@ -105,7 +366,7 @@
         {"shape":"InternalFailureException"},
         {"shape":"ResourceUnavailableException"}
       ],
-      "documentation":"<p>Deletes the Amazon QuickSight user that is associated with the identity of the AWS Identity and Access Management (IAM) user or role that's making the call. The IAM user isn't deleted as a result of this call. </p> <p>The permission resource is <code>arn:aws:quicksight:us-east-1:<i>&lt;aws-account-id&gt;</i>:user/default/<i>&lt;user-name&gt; </i> </code>.</p> <p> <b>CLI Sample:</b> </p> <p> <code>aws quicksight delete-user --aws-account-id=111122223333 --namespace=default --user-name=Pat </code> </p>"
+      "documentation":"<p>Deletes the Amazon QuickSight user that is associated with the identity of the AWS Identity and Access Management (IAM) user or role that's making the call. The IAM user isn't deleted as a result of this call. </p>"
     },
     "DeleteUserByPrincipalId":{
       "name":"DeleteUserByPrincipalId",
@@ -123,195 +384,228 @@
         {"shape":"InternalFailureException"},
         {"shape":"ResourceUnavailableException"}
       ],
-      "documentation":"<p>Deletes a user identified by its principal ID. </p> <p>The permission resource is <code>arn:aws:quicksight:us-east-1:<i>&lt;aws-account-id&gt;</i>:user/default/<i>&lt;user-name&gt; </i> </code>.</p> <p> <b>CLI Sample:</b> </p> <p> <code>aws quicksight delete-user-by-principal-id --aws-account-id=111122223333 --namespace=default --principal-id=ABCDEFJA26JLI7EUUOEHS </code> </p>"
+      "documentation":"<p>Deletes a user identified by its principal ID. </p>"
     },
-    "DescribeGroup":{
-      "name":"DescribeGroup",
+    "DescribeDashboard":{
+      "name":"DescribeDashboard",
       "http":{
         "method":"GET",
-        "requestUri":"/accounts/{AwsAccountId}/namespaces/{Namespace}/groups/{GroupName}"
+        "requestUri":"/accounts/{AwsAccountId}/dashboards/{DashboardId}"
       },
-      "input":{"shape":"DescribeGroupRequest"},
-      "output":{"shape":"DescribeGroupResponse"},
+      "input":{"shape":"DescribeDashboardRequest"},
+      "output":{"shape":"DescribeDashboardResponse"},
       "errors":[
-        {"shape":"AccessDeniedException"},
         {"shape":"InvalidParameterValueException"},
         {"shape":"ResourceNotFoundException"},
+        {"shape":"AccessDeniedException"},
         {"shape":"ThrottlingException"},
-        {"shape":"PreconditionNotMetException"},
-        {"shape":"InternalFailureException"},
-        {"shape":"ResourceUnavailableException"}
+        {"shape":"UnsupportedUserEditionException"},
+        {"shape":"InternalFailureException"}
       ],
-      "documentation":"<p>Returns an Amazon QuickSight group's description and Amazon Resource Name (ARN). </p> <p>The permissions resource is <code>arn:aws:quicksight:us-east-1:<i>&lt;relevant-aws-account-id&gt;</i>:group/default/<i>&lt;group-name&gt;</i> </code>.</p> <p>The response is the group object. </p> <p> <b>CLI Sample:</b> </p> <p> <code>aws quicksight describe-group -\\-aws-account-id=11112222333 -\\-namespace=default -\\-group-name=Sales </code> </p>"
+      "documentation":"<p>Provides a summary for a dashboard.</p>"
     },
-    "DescribeUser":{
-      "name":"DescribeUser",
+    "DescribeDashboardPermissions":{
+      "name":"DescribeDashboardPermissions",
       "http":{
         "method":"GET",
-        "requestUri":"/accounts/{AwsAccountId}/namespaces/{Namespace}/users/{UserName}"
+        "requestUri":"/accounts/{AwsAccountId}/dashboards/{DashboardId}/permissions"
       },
-      "input":{"shape":"DescribeUserRequest"},
-      "output":{"shape":"DescribeUserResponse"},
+      "input":{"shape":"DescribeDashboardPermissionsRequest"},
+      "output":{"shape":"DescribeDashboardPermissionsResponse"},
       "errors":[
-        {"shape":"AccessDeniedException"},
         {"shape":"InvalidParameterValueException"},
         {"shape":"ResourceNotFoundException"},
         {"shape":"ThrottlingException"},
-        {"shape":"InternalFailureException"},
-        {"shape":"ResourceUnavailableException"}
+        {"shape":"UnsupportedUserEditionException"},
+        {"shape":"InternalFailureException"}
       ],
-      "documentation":"<p>Returns information about a user, given the user name. </p> <p>The permission resource is <code>arn:aws:quicksight:us-east-1:<i>&lt;aws-account-id&gt;</i>:user/default/<i>&lt;user-name&gt;</i> </code>. </p> <p>The response is a user object that contains the user's Amazon Resource Name (ARN), AWS Identity and Access Management (IAM) role, and email address. </p> <p> <b>CLI Sample:</b> </p> <p> <code>aws quicksight describe-user --aws-account-id=111122223333 --namespace=default --user-name=Pat </code> </p>"
+      "documentation":"<p>Describes read and write permissions for a dashboard.</p>"
     },
-    "GetDashboardEmbedUrl":{
-      "name":"GetDashboardEmbedUrl",
+    "DescribeDataSet":{
+      "name":"DescribeDataSet",
       "http":{
         "method":"GET",
-        "requestUri":"/accounts/{AwsAccountId}/dashboards/{DashboardId}/embed-url"
+        "requestUri":"/accounts/{AwsAccountId}/data-sets/{DataSetId}"
       },
-      "input":{"shape":"GetDashboardEmbedUrlRequest"},
-      "output":{"shape":"GetDashboardEmbedUrlResponse"},
+      "input":{"shape":"DescribeDataSetRequest"},
+      "output":{"shape":"DescribeDataSetResponse"},
       "errors":[
         {"shape":"AccessDeniedException"},
         {"shape":"InvalidParameterValueException"},
-        {"shape":"ResourceExistsException"},
-        {"shape":"ResourceNotFoundException"},
         {"shape":"ThrottlingException"},
-        {"shape":"PreconditionNotMetException"},
-        {"shape":"DomainNotWhitelistedException"},
-        {"shape":"QuickSightUserNotFoundException"},
-        {"shape":"IdentityTypeNotSupportedException"},
-        {"shape":"SessionLifetimeInMinutesInvalidException"},
-        {"shape":"UnsupportedUserEditionException"},
-        {"shape":"InternalFailureException"},
-        {"shape":"ResourceUnavailableException"}
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InternalFailureException"}
       ],
-      "documentation":"<p>Generates a server-side embeddable URL and authorization code. Before this can work properly, first you need to configure the dashboards and user permissions. For more information, see <a href=\"https://docs.aws.amazon.com/en_us/quicksight/latest/user/embedding.html\"> Embedding Amazon QuickSight Dashboards</a>.</p> <p>Currently, you can use <code>GetDashboardEmbedURL</code> only from the server, not from the user’s browser.</p> <p> <b>CLI Sample:</b> </p> <p>Assume the role with permissions enabled for actions: <code>quickSight:RegisterUser</code> and <code>quicksight:GetDashboardEmbedURL</code>. You can use assume-role, assume-role-with-web-identity, or assume-role-with-saml. </p> <p> <code>aws sts assume-role --role-arn \"arn:aws:iam::111122223333:role/embedding_quicksight_dashboard_role\" --role-session-name embeddingsession</code> </p> <p>If the user does not exist in QuickSight, register the user:</p> <p> <code>aws quicksight register-user --aws-account-id 111122223333 --namespace default --identity-type IAM --iam-arn \"arn:aws:iam::111122223333:role/embedding_quicksight_dashboard_role\" --user-role READER --session-name \"embeddingsession\" --email user123@example.com --region us-east-1</code> </p> <p>Get the URL for the embedded dashboard</p> <p> <code>aws quicksight get-dashboard-embed-url --aws-account-id 111122223333 --dashboard-id 1a1ac2b2-3fc3-4b44-5e5d-c6db6778df89 --identity-type IAM</code> </p>"
+      "documentation":"<p>Describes a dataset. </p>"
     },
-    "ListGroupMemberships":{
-      "name":"ListGroupMemberships",
+    "DescribeDataSetPermissions":{
+      "name":"DescribeDataSetPermissions",
       "http":{
         "method":"GET",
-        "requestUri":"/accounts/{AwsAccountId}/namespaces/{Namespace}/groups/{GroupName}/members"
+        "requestUri":"/accounts/{AwsAccountId}/data-sets/{DataSetId}/permissions"
       },
-      "input":{"shape":"ListGroupMembershipsRequest"},
-      "output":{"shape":"ListGroupMembershipsResponse"},
+      "input":{"shape":"DescribeDataSetPermissionsRequest"},
+      "output":{"shape":"DescribeDataSetPermissionsResponse"},
       "errors":[
         {"shape":"AccessDeniedException"},
         {"shape":"InvalidParameterValueException"},
-        {"shape":"ResourceNotFoundException"},
         {"shape":"ThrottlingException"},
-        {"shape":"InvalidNextTokenException"},
-        {"shape":"PreconditionNotMetException"},
-        {"shape":"InternalFailureException"},
-        {"shape":"ResourceUnavailableException"}
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InternalFailureException"}
       ],
-      "documentation":"<p>Lists member users in a group.</p> <p>The permissions resource is <code>arn:aws:quicksight:us-east-1:<i>&lt;aws-account-id&gt;</i>:group/default/<i>&lt;group-name&gt;</i> </code>.</p> <p>The response is a list of group member objects.</p> <p> <b>CLI Sample:</b> </p> <p> <code>aws quicksight list-group-memberships -\\-aws-account-id=111122223333 -\\-namespace=default </code> </p>"
+      "documentation":"<p>Describes the permissions on a dataset.</p> <p>The permissions resource is <code>arn:aws:quicksight:region:aws-account-id:dataset/data-set-id</code>.</p>"
     },
-    "ListGroups":{
-      "name":"ListGroups",
+    "DescribeDataSource":{
+      "name":"DescribeDataSource",
       "http":{
         "method":"GET",
-        "requestUri":"/accounts/{AwsAccountId}/namespaces/{Namespace}/groups"
+        "requestUri":"/accounts/{AwsAccountId}/data-sources/{DataSourceId}"
       },
-      "input":{"shape":"ListGroupsRequest"},
-      "output":{"shape":"ListGroupsResponse"},
+      "input":{"shape":"DescribeDataSourceRequest"},
+      "output":{"shape":"DescribeDataSourceResponse"},
       "errors":[
         {"shape":"AccessDeniedException"},
         {"shape":"InvalidParameterValueException"},
-        {"shape":"ResourceNotFoundException"},
         {"shape":"ThrottlingException"},
-        {"shape":"InvalidNextTokenException"},
-        {"shape":"PreconditionNotMetException"},
-        {"shape":"InternalFailureException"},
-        {"shape":"ResourceUnavailableException"}
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InternalFailureException"}
       ],
-      "documentation":"<p>Lists all user groups in Amazon QuickSight. </p> <p>The permissions resource is <code>arn:aws:quicksight:us-east-1:<i>&lt;aws-account-id&gt;</i>:group/default/*</code>.</p> <p>The response is a list of group objects. </p> <p> <b>CLI Sample:</b> </p> <p> <code>aws quicksight list-groups -\\-aws-account-id=111122223333 -\\-namespace=default </code> </p>"
+      "documentation":"<p>Describes a data source.</p>"
     },
-    "ListUserGroups":{
-      "name":"ListUserGroups",
+    "DescribeDataSourcePermissions":{
+      "name":"DescribeDataSourcePermissions",
       "http":{
         "method":"GET",
-        "requestUri":"/accounts/{AwsAccountId}/namespaces/{Namespace}/users/{UserName}/groups"
+        "requestUri":"/accounts/{AwsAccountId}/data-sources/{DataSourceId}/permissions"
       },
-      "input":{"shape":"ListUserGroupsRequest"},
-      "output":{"shape":"ListUserGroupsResponse"},
+      "input":{"shape":"DescribeDataSourcePermissionsRequest"},
+      "output":{"shape":"DescribeDataSourcePermissionsResponse"},
       "errors":[
         {"shape":"AccessDeniedException"},
         {"shape":"InvalidParameterValueException"},
-        {"shape":"ResourceNotFoundException"},
         {"shape":"ThrottlingException"},
-        {"shape":"InternalFailureException"},
-        {"shape":"ResourceUnavailableException"}
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InternalFailureException"}
       ],
-      "documentation":"<p>Lists the Amazon QuickSight groups that an Amazon QuickSight user is a member of.</p> <p>The permission resource is <code>arn:aws:quicksight:us-east-1:<i>&lt;aws-account-id&gt;</i>:user/default/<i>&lt;user-name&gt;</i> </code>. </p> <p>The response is a one or more group objects. </p> <p> <b>CLI Sample:</b> </p> <p> <code>aws quicksight list-user-groups -\\-user-name=Pat -\\-aws-account-id=111122223333 -\\-namespace=default -\\-region=us-east-1 </code> </p>"
+      "documentation":"<p>Describes the resource permissions for a data source.</p>"
     },
-    "ListUsers":{
-      "name":"ListUsers",
+    "DescribeGroup":{
+      "name":"DescribeGroup",
       "http":{
         "method":"GET",
-        "requestUri":"/accounts/{AwsAccountId}/namespaces/{Namespace}/users"
+        "requestUri":"/accounts/{AwsAccountId}/namespaces/{Namespace}/groups/{GroupName}"
       },
-      "input":{"shape":"ListUsersRequest"},
-      "output":{"shape":"ListUsersResponse"},
+      "input":{"shape":"DescribeGroupRequest"},
+      "output":{"shape":"DescribeGroupResponse"},
       "errors":[
         {"shape":"AccessDeniedException"},
         {"shape":"InvalidParameterValueException"},
         {"shape":"ResourceNotFoundException"},
         {"shape":"ThrottlingException"},
-        {"shape":"InvalidNextTokenException"},
+        {"shape":"PreconditionNotMetException"},
         {"shape":"InternalFailureException"},
         {"shape":"ResourceUnavailableException"}
       ],
-      "documentation":"<p>Returns a list of all of the Amazon QuickSight users belonging to this account. </p> <p>The permission resource is <code>arn:aws:quicksight:us-east-1:<i>&lt;aws-account-id&gt;</i>:user/default/<i>*</i> </code>.</p> <p>The response is a list of user objects, containing each user's Amazon Resource Name (ARN), AWS Identity and Access Management (IAM) role, and email address. </p> <p> <b>CLI Sample:</b> </p> <p> <code>aws quicksight list-users --aws-account-id=111122223333 --namespace=default </code> </p>"
+      "documentation":"<p>Returns an Amazon QuickSight group's description and Amazon Resource Name (ARN). </p>"
     },
-    "RegisterUser":{
-      "name":"RegisterUser",
+    "DescribeIAMPolicyAssignment":{
+      "name":"DescribeIAMPolicyAssignment",
       "http":{
-        "method":"POST",
-        "requestUri":"/accounts/{AwsAccountId}/namespaces/{Namespace}/users"
+        "method":"GET",
+        "requestUri":"/accounts/{AwsAccountId}/namespaces/{Namespace}/iam-policy-assignments/{AssignmentName}"
       },
-      "input":{"shape":"RegisterUserRequest"},
-      "output":{"shape":"RegisterUserResponse"},
+      "input":{"shape":"DescribeIAMPolicyAssignmentRequest"},
+      "output":{"shape":"DescribeIAMPolicyAssignmentResponse"},
       "errors":[
         {"shape":"AccessDeniedException"},
         {"shape":"InvalidParameterValueException"},
         {"shape":"ResourceNotFoundException"},
         {"shape":"ThrottlingException"},
-        {"shape":"LimitExceededException"},
-        {"shape":"ResourceExistsException"},
-        {"shape":"PreconditionNotMetException"},
-        {"shape":"InternalFailureException"},
-        {"shape":"ResourceUnavailableException"}
+        {"shape":"InvalidNextTokenException"},
+        {"shape":"InternalFailureException"}
       ],
-      "documentation":"<p>Creates an Amazon QuickSight user, whose identity is associated with the AWS Identity and Access Management (IAM) identity or role specified in the request. </p> <p>The permission resource is <code>arn:aws:quicksight:us-east-1:<i>&lt;aws-account-id&gt;</i>:user/default/<i>&lt;user-name&gt;</i> </code>.</p> <p>The condition resource is the Amazon Resource Name (ARN) for the IAM user or role, and the session name. </p> <p>The condition keys are <code>quicksight:IamArn</code> and <code>quicksight:SessionName</code>. </p> <p> <b>CLI Sample:</b> </p> <p> <code>aws quicksight register-user -\\-aws-account-id=111122223333 -\\-namespace=default -\\-email=pat@example.com -\\-identity-type=IAM -\\-user-role=AUTHOR -\\-iam-arn=arn:aws:iam::111122223333:user/Pat </code> </p>"
+      "documentation":"<p>Describes an existing IAM policy assignment, as specified by the assignment name.</p>"
     },
-    "UpdateGroup":{
-      "name":"UpdateGroup",
+    "DescribeIngestion":{
+      "name":"DescribeIngestion",
       "http":{
-        "method":"PUT",
-        "requestUri":"/accounts/{AwsAccountId}/namespaces/{Namespace}/groups/{GroupName}"
+        "method":"GET",
+        "requestUri":"/accounts/{AwsAccountId}/data-sets/{DataSetId}/ingestions/{IngestionId}"
       },
-      "input":{"shape":"UpdateGroupRequest"},
-      "output":{"shape":"UpdateGroupResponse"},
+      "input":{"shape":"DescribeIngestionRequest"},
+      "output":{"shape":"DescribeIngestionResponse"},
       "errors":[
         {"shape":"AccessDeniedException"},
         {"shape":"InvalidParameterValueException"},
         {"shape":"ResourceNotFoundException"},
         {"shape":"ThrottlingException"},
-        {"shape":"PreconditionNotMetException"},
-        {"shape":"InternalFailureException"},
-        {"shape":"ResourceUnavailableException"}
+        {"shape":"ResourceExistsException"},
+        {"shape":"InternalFailureException"}
       ],
-      "documentation":"<p>Changes a group description. </p> <p>The permissions resource is <code>arn:aws:quicksight:us-east-1:<i>&lt;aws-account-id&gt;</i>:group/default/<i>&lt;group-name&gt;</i> </code>.</p> <p>The response is a group object.</p> <p> <b>CLI Sample:</b> </p> <p> <code>aws quicksight update-group --aws-account-id=111122223333 --namespace=default --group-name=Sales --description=\"Sales BI Dashboards\" </code> </p>"
+      "documentation":"<p>Describes a SPICE ingestion.</p>"
     },
-    "UpdateUser":{
-      "name":"UpdateUser",
+    "DescribeTemplate":{
+      "name":"DescribeTemplate",
       "http":{
-        "method":"PUT",
+        "method":"GET",
+        "requestUri":"/accounts/{AwsAccountId}/templates/{TemplateId}"
+      },
+      "input":{"shape":"DescribeTemplateRequest"},
+      "output":{"shape":"DescribeTemplateResponse"},
+      "errors":[
+        {"shape":"InvalidParameterValueException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"ResourceExistsException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"ConflictException"},
+        {"shape":"UnsupportedUserEditionException"},
+        {"shape":"InternalFailureException"}
+      ],
+      "documentation":"<p>Describes a template's metadata.</p>"
+    },
+    "DescribeTemplateAlias":{
+      "name":"DescribeTemplateAlias",
+      "http":{
+        "method":"GET",
+        "requestUri":"/accounts/{AwsAccountId}/templates/{TemplateId}/aliases/{AliasName}"
+      },
+      "input":{"shape":"DescribeTemplateAliasRequest"},
+      "output":{"shape":"DescribeTemplateAliasResponse"},
+      "errors":[
+        {"shape":"ThrottlingException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"UnsupportedUserEditionException"},
+        {"shape":"InternalFailureException"}
+      ],
+      "documentation":"<p>Describes the template alias for a template.</p>"
+    },
+    "DescribeTemplatePermissions":{
+      "name":"DescribeTemplatePermissions",
+      "http":{
+        "method":"GET",
+        "requestUri":"/accounts/{AwsAccountId}/templates/{TemplateId}/permissions"
+      },
+      "input":{"shape":"DescribeTemplatePermissionsRequest"},
+      "output":{"shape":"DescribeTemplatePermissionsResponse"},
+      "errors":[
+        {"shape":"ThrottlingException"},
+        {"shape":"InvalidParameterValueException"},
+        {"shape":"ConflictException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"UnsupportedUserEditionException"},
+        {"shape":"InternalFailureException"}
+      ],
+      "documentation":"<p>Describes read and write permissions on a template.</p>"
+    },
+    "DescribeUser":{
+      "name":"DescribeUser",
+      "http":{
+        "method":"GET",
         "requestUri":"/accounts/{AwsAccountId}/namespaces/{Namespace}/users/{UserName}"
       },
-      "input":{"shape":"UpdateUserRequest"},
-      "output":{"shape":"UpdateUserResponse"},
+      "input":{"shape":"DescribeUserRequest"},
+      "output":{"shape":"DescribeUserResponse"},
       "errors":[
         {"shape":"AccessDeniedException"},
         {"shape":"InvalidParameterValueException"},
@@ -320,390 +614,6296 @@
         {"shape":"InternalFailureException"},
         {"shape":"ResourceUnavailableException"}
       ],
-      "documentation":"<p>Updates an Amazon QuickSight user.</p> <p>The permission resource is <code>arn:aws:quicksight:us-east-1:<i>&lt;aws-account-id&gt;</i>:user/default/<i>&lt;user-name&gt;</i> </code>. </p> <p>The response is a user object that contains the user's Amazon QuickSight user name, email address, active or inactive status in Amazon QuickSight, Amazon QuickSight role, and Amazon Resource Name (ARN). </p> <p> <b>CLI Sample:</b> </p> <p> <code>aws quicksight update-user --user-name=Pat --role=ADMIN --email=new_address@amazon.com --aws-account-id=111122223333 --namespace=default --region=us-east-1 </code> </p>"
-    }
-  },
-  "shapes":{
-    "AccessDeniedException":{
-      "type":"structure",
-      "members":{
-        "Message":{"shape":"String"},
-        "RequestId":{
-          "shape":"String",
-          "documentation":"<p>The AWS request id for this request.</p>"
-        }
+      "documentation":"<p>Returns information about a user, given the user name. </p>"
+    },
+    "GetDashboardEmbedUrl":{
+      "name":"GetDashboardEmbedUrl",
+      "http":{
+        "method":"GET",
+        "requestUri":"/accounts/{AwsAccountId}/dashboards/{DashboardId}/embed-url"
       },
-      "documentation":"<p>You don't have access to this. The provided credentials couldn't be validated. You might not be authorized to carry out the request. Ensure that your account is authorized to use the Amazon QuickSight service, that your policies have the correct permissions, and that you are using the correct access keys.</p>",
-      "error":{"httpStatusCode":401},
-      "exception":true
+      "input":{"shape":"GetDashboardEmbedUrlRequest"},
+      "output":{"shape":"GetDashboardEmbedUrlResponse"},
+      "errors":[
+        {"shape":"AccessDeniedException"},
+        {"shape":"InvalidParameterValueException"},
+        {"shape":"ResourceExistsException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"DomainNotWhitelistedException"},
+        {"shape":"QuickSightUserNotFoundException"},
+        {"shape":"IdentityTypeNotSupportedException"},
+        {"shape":"SessionLifetimeInMinutesInvalidException"},
+        {"shape":"UnsupportedUserEditionException"},
+        {"shape":"InternalFailureException"}
+      ],
+      "documentation":"<p>Generates a server-side embeddable URL and authorization code. For this process to work properly, first configure the dashboards and user permissions. For more information, see <a href=\"https://docs.aws.amazon.com/quicksight/latest/user/embedding-dashboards.html\">Embedding Amazon QuickSight Dashboards</a> in the <i>Amazon QuickSight User Guide</i> or <a href=\"https://docs.aws.amazon.com/quicksight/latest/APIReference/qs-dev-embedded-dashboards.html\">Embedding Amazon QuickSight Dashboards</a> in the <i>Amazon QuickSight API Reference</i>.</p> <p>Currently, you can use <code>GetDashboardEmbedURL</code> only from the server, not from the user’s browser.</p>"
     },
-    "Arn":{"type":"string"},
-    "AwsAccountId":{
-      "type":"string",
-      "max":12,
-      "min":12,
-      "pattern":"^[0-9]{12}$"
+    "ListDashboardVersions":{
+      "name":"ListDashboardVersions",
+      "http":{
+        "method":"GET",
+        "requestUri":"/accounts/{AwsAccountId}/dashboards/{DashboardId}/versions"
+      },
+      "input":{"shape":"ListDashboardVersionsRequest"},
+      "output":{"shape":"ListDashboardVersionsResponse"},
+      "errors":[
+        {"shape":"InvalidParameterValueException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"InvalidNextTokenException"},
+        {"shape":"UnsupportedUserEditionException"},
+        {"shape":"InternalFailureException"}
+      ],
+      "documentation":"<p>Lists all the versions of the dashboards in the QuickSight subscription.</p>"
     },
-    "Boolean":{"type":"boolean"},
-    "CreateGroupMembershipRequest":{
+    "ListDashboards":{
+      "name":"ListDashboards",
+      "http":{
+        "method":"GET",
+        "requestUri":"/accounts/{AwsAccountId}/dashboards"
+      },
+      "input":{"shape":"ListDashboardsRequest"},
+      "output":{"shape":"ListDashboardsResponse"},
+      "errors":[
+        {"shape":"ThrottlingException"},
+        {"shape":"InvalidNextTokenException"},
+        {"shape":"UnsupportedUserEditionException"},
+        {"shape":"InternalFailureException"}
+      ],
+      "documentation":"<p>Lists dashboards in an AWS account.</p>"
+    },
+    "ListDataSets":{
+      "name":"ListDataSets",
+      "http":{
+        "method":"GET",
+        "requestUri":"/accounts/{AwsAccountId}/data-sets"
+      },
+      "input":{"shape":"ListDataSetsRequest"},
+      "output":{"shape":"ListDataSetsResponse"},
+      "errors":[
+        {"shape":"AccessDeniedException"},
+        {"shape":"InvalidParameterValueException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"InvalidNextTokenException"},
+        {"shape":"InternalFailureException"}
+      ],
+      "documentation":"<p>Lists all of the datasets belonging to the current AWS account in an AWS Region.</p> <p>The permissions resource is <code>arn:aws:quicksight:region:aws-account-id:dataset/*</code>.</p>"
+    },
+    "ListDataSources":{
+      "name":"ListDataSources",
+      "http":{
+        "method":"GET",
+        "requestUri":"/accounts/{AwsAccountId}/data-sources"
+      },
+      "input":{"shape":"ListDataSourcesRequest"},
+      "output":{"shape":"ListDataSourcesResponse"},
+      "errors":[
+        {"shape":"AccessDeniedException"},
+        {"shape":"InvalidParameterValueException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"InvalidNextTokenException"},
+        {"shape":"InternalFailureException"}
+      ],
+      "documentation":"<p>Lists data sources in current AWS Region that belong to this AWS account.</p>"
+    },
+    "ListGroupMemberships":{
+      "name":"ListGroupMemberships",
+      "http":{
+        "method":"GET",
+        "requestUri":"/accounts/{AwsAccountId}/namespaces/{Namespace}/groups/{GroupName}/members"
+      },
+      "input":{"shape":"ListGroupMembershipsRequest"},
+      "output":{"shape":"ListGroupMembershipsResponse"},
+      "errors":[
+        {"shape":"AccessDeniedException"},
+        {"shape":"InvalidParameterValueException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"InvalidNextTokenException"},
+        {"shape":"PreconditionNotMetException"},
+        {"shape":"InternalFailureException"},
+        {"shape":"ResourceUnavailableException"}
+      ],
+      "documentation":"<p>Lists member users in a group.</p>"
+    },
+    "ListGroups":{
+      "name":"ListGroups",
+      "http":{
+        "method":"GET",
+        "requestUri":"/accounts/{AwsAccountId}/namespaces/{Namespace}/groups"
+      },
+      "input":{"shape":"ListGroupsRequest"},
+      "output":{"shape":"ListGroupsResponse"},
+      "errors":[
+        {"shape":"AccessDeniedException"},
+        {"shape":"InvalidParameterValueException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"InvalidNextTokenException"},
+        {"shape":"PreconditionNotMetException"},
+        {"shape":"InternalFailureException"},
+        {"shape":"ResourceUnavailableException"}
+      ],
+      "documentation":"<p>Lists all user groups in Amazon QuickSight. </p>"
+    },
+    "ListIAMPolicyAssignments":{
+      "name":"ListIAMPolicyAssignments",
+      "http":{
+        "method":"GET",
+        "requestUri":"/accounts/{AwsAccountId}/namespaces/{Namespace}/iam-policy-assignments"
+      },
+      "input":{"shape":"ListIAMPolicyAssignmentsRequest"},
+      "output":{"shape":"ListIAMPolicyAssignmentsResponse"},
+      "errors":[
+        {"shape":"AccessDeniedException"},
+        {"shape":"InvalidParameterValueException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"InvalidNextTokenException"},
+        {"shape":"InternalFailureException"}
+      ],
+      "documentation":"<p>Lists IAM policy assignments in the current Amazon QuickSight account.</p>"
+    },
+    "ListIAMPolicyAssignmentsForUser":{
+      "name":"ListIAMPolicyAssignmentsForUser",
+      "http":{
+        "method":"GET",
+        "requestUri":"/accounts/{AwsAccountId}/namespaces/{Namespace}/users/{UserName}/iam-policy-assignments"
+      },
+      "input":{"shape":"ListIAMPolicyAssignmentsForUserRequest"},
+      "output":{"shape":"ListIAMPolicyAssignmentsForUserResponse"},
+      "errors":[
+        {"shape":"AccessDeniedException"},
+        {"shape":"InvalidParameterValueException"},
+        {"shape":"ResourceExistsException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"ConcurrentUpdatingException"},
+        {"shape":"InternalFailureException"}
+      ],
+      "documentation":"<p>Lists all the IAM policy assignments, including the Amazon Resource Names (ARNs) for the IAM policies assigned to the specified user and group or groups that the user belongs to.</p>"
+    },
+    "ListIngestions":{
+      "name":"ListIngestions",
+      "http":{
+        "method":"GET",
+        "requestUri":"/accounts/{AwsAccountId}/data-sets/{DataSetId}/ingestions"
+      },
+      "input":{"shape":"ListIngestionsRequest"},
+      "output":{"shape":"ListIngestionsResponse"},
+      "errors":[
+        {"shape":"AccessDeniedException"},
+        {"shape":"InvalidParameterValueException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"ResourceExistsException"},
+        {"shape":"InvalidNextTokenException"},
+        {"shape":"InternalFailureException"}
+      ],
+      "documentation":"<p>Lists the history of SPICE ingestions for a dataset.</p>"
+    },
+    "ListTagsForResource":{
+      "name":"ListTagsForResource",
+      "http":{
+        "method":"GET",
+        "requestUri":"/resources/{ResourceArn}/tags"
+      },
+      "input":{"shape":"ListTagsForResourceRequest"},
+      "output":{"shape":"ListTagsForResourceResponse"},
+      "errors":[
+        {"shape":"AccessDeniedException"},
+        {"shape":"InvalidParameterValueException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"InternalFailureException"}
+      ],
+      "documentation":"<p>Lists the tags assigned to a resource.</p>"
+    },
+    "ListTemplateAliases":{
+      "name":"ListTemplateAliases",
+      "http":{
+        "method":"GET",
+        "requestUri":"/accounts/{AwsAccountId}/templates/{TemplateId}/aliases"
+      },
+      "input":{"shape":"ListTemplateAliasesRequest"},
+      "output":{"shape":"ListTemplateAliasesResponse"},
+      "errors":[
+        {"shape":"ThrottlingException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"UnsupportedUserEditionException"},
+        {"shape":"InternalFailureException"}
+      ],
+      "documentation":"<p>Lists all the aliases of a template.</p>"
+    },
+    "ListTemplateVersions":{
+      "name":"ListTemplateVersions",
+      "http":{
+        "method":"GET",
+        "requestUri":"/accounts/{AwsAccountId}/templates/{TemplateId}/versions"
+      },
+      "input":{"shape":"ListTemplateVersionsRequest"},
+      "output":{"shape":"ListTemplateVersionsResponse"},
+      "errors":[
+        {"shape":"ThrottlingException"},
+        {"shape":"InvalidParameterValueException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InvalidNextTokenException"},
+        {"shape":"UnsupportedUserEditionException"},
+        {"shape":"InternalFailureException"}
+      ],
+      "documentation":"<p>Lists all the versions of the templates in the current Amazon QuickSight account.</p>"
+    },
+    "ListTemplates":{
+      "name":"ListTemplates",
+      "http":{
+        "method":"GET",
+        "requestUri":"/accounts/{AwsAccountId}/templates"
+      },
+      "input":{"shape":"ListTemplatesRequest"},
+      "output":{"shape":"ListTemplatesResponse"},
+      "errors":[
+        {"shape":"ThrottlingException"},
+        {"shape":"InvalidParameterValueException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InvalidNextTokenException"},
+        {"shape":"UnsupportedUserEditionException"},
+        {"shape":"InternalFailureException"}
+      ],
+      "documentation":"<p>Lists all the templates in the current Amazon QuickSight account.</p>"
+    },
+    "ListUserGroups":{
+      "name":"ListUserGroups",
+      "http":{
+        "method":"GET",
+        "requestUri":"/accounts/{AwsAccountId}/namespaces/{Namespace}/users/{UserName}/groups"
+      },
+      "input":{"shape":"ListUserGroupsRequest"},
+      "output":{"shape":"ListUserGroupsResponse"},
+      "errors":[
+        {"shape":"AccessDeniedException"},
+        {"shape":"InvalidParameterValueException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"InternalFailureException"},
+        {"shape":"ResourceUnavailableException"}
+      ],
+      "documentation":"<p>Lists the Amazon QuickSight groups that an Amazon QuickSight user is a member of.</p>"
+    },
+    "ListUsers":{
+      "name":"ListUsers",
+      "http":{
+        "method":"GET",
+        "requestUri":"/accounts/{AwsAccountId}/namespaces/{Namespace}/users"
+      },
+      "input":{"shape":"ListUsersRequest"},
+      "output":{"shape":"ListUsersResponse"},
+      "errors":[
+        {"shape":"AccessDeniedException"},
+        {"shape":"InvalidParameterValueException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"InvalidNextTokenException"},
+        {"shape":"InternalFailureException"},
+        {"shape":"ResourceUnavailableException"}
+      ],
+      "documentation":"<p>Returns a list of all of the Amazon QuickSight users belonging to this account. </p>"
+    },
+    "RegisterUser":{
+      "name":"RegisterUser",
+      "http":{
+        "method":"POST",
+        "requestUri":"/accounts/{AwsAccountId}/namespaces/{Namespace}/users"
+      },
+      "input":{"shape":"RegisterUserRequest"},
+      "output":{"shape":"RegisterUserResponse"},
+      "errors":[
+        {"shape":"AccessDeniedException"},
+        {"shape":"InvalidParameterValueException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"LimitExceededException"},
+        {"shape":"ResourceExistsException"},
+        {"shape":"PreconditionNotMetException"},
+        {"shape":"InternalFailureException"},
+        {"shape":"ResourceUnavailableException"}
+      ],
+      "documentation":"<p>Creates an Amazon QuickSight user, whose identity is associated with the AWS Identity and Access Management (IAM) identity or role specified in the request. </p>"
+    },
+    "SearchDashboards":{
+      "name":"SearchDashboards",
+      "http":{
+        "method":"POST",
+        "requestUri":"/accounts/{AwsAccountId}/search/dashboards"
+      },
+      "input":{"shape":"SearchDashboardsRequest"},
+      "output":{"shape":"SearchDashboardsResponse"},
+      "errors":[
+        {"shape":"ThrottlingException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InvalidParameterValueException"},
+        {"shape":"UnsupportedUserEditionException"},
+        {"shape":"InvalidNextTokenException"},
+        {"shape":"InternalFailureException"}
+      ],
+      "documentation":"<p>Searchs for dashboards that belong to a user. </p>"
+    },
+    "TagResource":{
+      "name":"TagResource",
+      "http":{
+        "method":"POST",
+        "requestUri":"/resources/{ResourceArn}/tags"
+      },
+      "input":{"shape":"TagResourceRequest"},
+      "output":{"shape":"TagResourceResponse"},
+      "errors":[
+        {"shape":"LimitExceededException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"InvalidParameterValueException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"InternalFailureException"}
+      ],
+      "documentation":"<p>Assigns one or more tags (key-value pairs) to the specified QuickSight resource. </p> <p>Tags can help you organize and categorize your resources. You can also use them to scope user permissions, by granting a user permission to access or change only resources with certain tag values. You can use the <code>TagResource</code> operation with a resource that already has tags. If you specify a new tag key for the resource, this tag is appended to the list of tags associated with the resource. If you specify a tag key that is already associated with the resource, the new tag value that you specify replaces the previous value for that tag.</p> <p>You can associate as many as 50 tags with a resource. QuickSight supports tagging on data set, data source, dashboard, and template. </p> <p>Tagging for QuickSight works in a similar way to tagging for other AWS services, except for the following:</p> <ul> <li> <p>You can't use tags to track AWS costs for QuickSight. This restriction is because QuickSight costs are based on users and SPICE capacity, which aren't taggable resources.</p> </li> <li> <p>QuickSight doesn't currently support the Tag Editor for AWS Resource Groups.</p> </li> </ul>"
+    },
+    "UntagResource":{
+      "name":"UntagResource",
+      "http":{
+        "method":"DELETE",
+        "requestUri":"/resources/{ResourceArn}/tags"
+      },
+      "input":{"shape":"UntagResourceRequest"},
+      "output":{"shape":"UntagResourceResponse"},
+      "errors":[
+        {"shape":"AccessDeniedException"},
+        {"shape":"InvalidParameterValueException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"InternalFailureException"}
+      ],
+      "documentation":"<p>Removes a tag or tags from a resource.</p>"
+    },
+    "UpdateDashboard":{
+      "name":"UpdateDashboard",
+      "http":{
+        "method":"PUT",
+        "requestUri":"/accounts/{AwsAccountId}/dashboards/{DashboardId}"
+      },
+      "input":{"shape":"UpdateDashboardRequest"},
+      "output":{"shape":"UpdateDashboardResponse"},
+      "errors":[
+        {"shape":"ThrottlingException"},
+        {"shape":"InvalidParameterValueException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ConflictException"},
+        {"shape":"LimitExceededException"},
+        {"shape":"UnsupportedUserEditionException"},
+        {"shape":"InternalFailureException"}
+      ],
+      "documentation":"<p>Updates a dashboard in an AWS account.</p>"
+    },
+    "UpdateDashboardPermissions":{
+      "name":"UpdateDashboardPermissions",
+      "http":{
+        "method":"PUT",
+        "requestUri":"/accounts/{AwsAccountId}/dashboards/{DashboardId}/permissions"
+      },
+      "input":{"shape":"UpdateDashboardPermissionsRequest"},
+      "output":{"shape":"UpdateDashboardPermissionsResponse"},
+      "errors":[
+        {"shape":"ThrottlingException"},
+        {"shape":"InvalidParameterValueException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"UnsupportedUserEditionException"},
+        {"shape":"ConflictException"},
+        {"shape":"InternalFailureException"}
+      ],
+      "documentation":"<p>Updates read and write permissions on a dashboard.</p>"
+    },
+    "UpdateDashboardPublishedVersion":{
+      "name":"UpdateDashboardPublishedVersion",
+      "http":{
+        "method":"PUT",
+        "requestUri":"/accounts/{AwsAccountId}/dashboards/{DashboardId}/versions/{VersionNumber}"
+      },
+      "input":{"shape":"UpdateDashboardPublishedVersionRequest"},
+      "output":{"shape":"UpdateDashboardPublishedVersionResponse"},
+      "errors":[
+        {"shape":"InvalidParameterValueException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"ConflictException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"UnsupportedUserEditionException"},
+        {"shape":"InternalFailureException"}
+      ],
+      "documentation":"<p>Updates the published version of a dashboard.</p>"
+    },
+    "UpdateDataSet":{
+      "name":"UpdateDataSet",
+      "http":{
+        "method":"PUT",
+        "requestUri":"/accounts/{AwsAccountId}/data-sets/{DataSetId}"
+      },
+      "input":{"shape":"UpdateDataSetRequest"},
+      "output":{"shape":"UpdateDataSetResponse"},
+      "errors":[
+        {"shape":"AccessDeniedException"},
+        {"shape":"ConflictException"},
+        {"shape":"InvalidParameterValueException"},
+        {"shape":"LimitExceededException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"UnsupportedUserEditionException"},
+        {"shape":"InternalFailureException"}
+      ],
+      "documentation":"<p>Updates a dataset.</p>"
+    },
+    "UpdateDataSetPermissions":{
+      "name":"UpdateDataSetPermissions",
+      "http":{
+        "method":"POST",
+        "requestUri":"/accounts/{AwsAccountId}/data-sets/{DataSetId}/permissions"
+      },
+      "input":{"shape":"UpdateDataSetPermissionsRequest"},
+      "output":{"shape":"UpdateDataSetPermissionsResponse"},
+      "errors":[
+        {"shape":"AccessDeniedException"},
+        {"shape":"ConflictException"},
+        {"shape":"InvalidParameterValueException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"InternalFailureException"}
+      ],
+      "documentation":"<p>Updates the permissions on a dataset.</p> <p>The permissions resource is <code>arn:aws:quicksight:region:aws-account-id:dataset/data-set-id</code>.</p>"
+    },
+    "UpdateDataSource":{
+      "name":"UpdateDataSource",
+      "http":{
+        "method":"PUT",
+        "requestUri":"/accounts/{AwsAccountId}/data-sources/{DataSourceId}"
+      },
+      "input":{"shape":"UpdateDataSourceRequest"},
+      "output":{"shape":"UpdateDataSourceResponse"},
+      "errors":[
+        {"shape":"AccessDeniedException"},
+        {"shape":"ConflictException"},
+        {"shape":"InvalidParameterValueException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InternalFailureException"}
+      ],
+      "documentation":"<p>Updates a data source.</p>"
+    },
+    "UpdateDataSourcePermissions":{
+      "name":"UpdateDataSourcePermissions",
+      "http":{
+        "method":"POST",
+        "requestUri":"/accounts/{AwsAccountId}/data-sources/{DataSourceId}/permissions"
+      },
+      "input":{"shape":"UpdateDataSourcePermissionsRequest"},
+      "output":{"shape":"UpdateDataSourcePermissionsResponse"},
+      "errors":[
+        {"shape":"AccessDeniedException"},
+        {"shape":"ConflictException"},
+        {"shape":"InvalidParameterValueException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"InternalFailureException"}
+      ],
+      "documentation":"<p>Updates the permissions to a data source.</p>"
+    },
+    "UpdateGroup":{
+      "name":"UpdateGroup",
+      "http":{
+        "method":"PUT",
+        "requestUri":"/accounts/{AwsAccountId}/namespaces/{Namespace}/groups/{GroupName}"
+      },
+      "input":{"shape":"UpdateGroupRequest"},
+      "output":{"shape":"UpdateGroupResponse"},
+      "errors":[
+        {"shape":"AccessDeniedException"},
+        {"shape":"InvalidParameterValueException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"PreconditionNotMetException"},
+        {"shape":"InternalFailureException"},
+        {"shape":"ResourceUnavailableException"}
+      ],
+      "documentation":"<p>Changes a group description. </p>"
+    },
+    "UpdateIAMPolicyAssignment":{
+      "name":"UpdateIAMPolicyAssignment",
+      "http":{
+        "method":"PUT",
+        "requestUri":"/accounts/{AwsAccountId}/namespaces/{Namespace}/iam-policy-assignments/{AssignmentName}"
+      },
+      "input":{"shape":"UpdateIAMPolicyAssignmentRequest"},
+      "output":{"shape":"UpdateIAMPolicyAssignmentResponse"},
+      "errors":[
+        {"shape":"AccessDeniedException"},
+        {"shape":"InvalidParameterValueException"},
+        {"shape":"ResourceExistsException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"ConcurrentUpdatingException"},
+        {"shape":"InternalFailureException"}
+      ],
+      "documentation":"<p>Updates an existing IAM policy assignment. This operation updates only the optional parameter or parameters that are specified in the request.</p>"
+    },
+    "UpdateTemplate":{
+      "name":"UpdateTemplate",
+      "http":{
+        "method":"PUT",
+        "requestUri":"/accounts/{AwsAccountId}/templates/{TemplateId}"
+      },
+      "input":{"shape":"UpdateTemplateRequest"},
+      "output":{"shape":"UpdateTemplateResponse"},
+      "errors":[
+        {"shape":"InvalidParameterValueException"},
+        {"shape":"ResourceExistsException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"ConflictException"},
+        {"shape":"LimitExceededException"},
+        {"shape":"UnsupportedUserEditionException"},
+        {"shape":"InternalFailureException"}
+      ],
+      "documentation":"<p>Updates a template from an existing Amazon QuickSight analysis or another template.</p>"
+    },
+    "UpdateTemplateAlias":{
+      "name":"UpdateTemplateAlias",
+      "http":{
+        "method":"PUT",
+        "requestUri":"/accounts/{AwsAccountId}/templates/{TemplateId}/aliases/{AliasName}"
+      },
+      "input":{"shape":"UpdateTemplateAliasRequest"},
+      "output":{"shape":"UpdateTemplateAliasResponse"},
+      "errors":[
+        {"shape":"ThrottlingException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ConflictException"},
+        {"shape":"UnsupportedUserEditionException"},
+        {"shape":"InternalFailureException"}
+      ],
+      "documentation":"<p>Updates the template alias of a template.</p>"
+    },
+    "UpdateTemplatePermissions":{
+      "name":"UpdateTemplatePermissions",
+      "http":{
+        "method":"PUT",
+        "requestUri":"/accounts/{AwsAccountId}/templates/{TemplateId}/permissions"
+      },
+      "input":{"shape":"UpdateTemplatePermissionsRequest"},
+      "output":{"shape":"UpdateTemplatePermissionsResponse"},
+      "errors":[
+        {"shape":"ThrottlingException"},
+        {"shape":"InvalidParameterValueException"},
+        {"shape":"ConflictException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"UnsupportedUserEditionException"},
+        {"shape":"InternalFailureException"}
+      ],
+      "documentation":"<p>Updates the resource permissions for a template.</p>"
+    },
+    "UpdateUser":{
+      "name":"UpdateUser",
+      "http":{
+        "method":"PUT",
+        "requestUri":"/accounts/{AwsAccountId}/namespaces/{Namespace}/users/{UserName}"
+      },
+      "input":{"shape":"UpdateUserRequest"},
+      "output":{"shape":"UpdateUserResponse"},
+      "errors":[
+        {"shape":"AccessDeniedException"},
+        {"shape":"InvalidParameterValueException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"InternalFailureException"},
+        {"shape":"ResourceUnavailableException"}
+      ],
+      "documentation":"<p>Updates an Amazon QuickSight user.</p>"
+    }
+  },
+  "shapes":{
+    "AccessDeniedException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"String"},
+        "RequestId":{
+          "shape":"String",
+          "documentation":"<p>The AWS request ID for this request.</p>"
+        }
+      },
+      "documentation":"<p>You don't have access to this item. The provided credentials couldn't be validated. You might not be authorized to carry out the request. Make sure that your account is authorized to use the Amazon QuickSight service, that your policies have the correct permissions, and that you are using the correct access keys.</p>",
+      "error":{"httpStatusCode":401},
+      "exception":true
+    },
+    "ActionList":{
+      "type":"list",
+      "member":{"shape":"String"},
+      "max":16,
+      "min":1
+    },
+    "ActiveIAMPolicyAssignment":{
+      "type":"structure",
+      "members":{
+        "AssignmentName":{
+          "shape":"IAMPolicyAssignmentName",
+          "documentation":"<p>A name for the IAM policy assignment.</p>"
+        },
+        "PolicyArn":{
+          "shape":"Arn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the resource.</p>"
+        }
+      },
+      "documentation":"<p>The active AWS Identity and Access Management (IAM) policy assignment.</p>"
+    },
+    "ActiveIAMPolicyAssignmentList":{
+      "type":"list",
+      "member":{"shape":"ActiveIAMPolicyAssignment"}
+    },
+    "AdHocFilteringOption":{
+      "type":"structure",
+      "members":{
+        "AvailabilityStatus":{
+          "shape":"DashboardBehavior",
+          "documentation":"<p>Availability status.</p>"
+        }
+      },
+      "documentation":"<p>Ad hoc (one-time) filtering option.</p>"
+    },
+    "AliasName":{
+      "type":"string",
+      "max":2048,
+      "min":1,
+      "pattern":"[\\w\\-]+|(\\$LATEST)|(\\$PUBLISHED)"
+    },
+    "AmazonElasticsearchParameters":{
+      "type":"structure",
+      "required":["Domain"],
+      "members":{
+        "Domain":{
+          "shape":"Domain",
+          "documentation":"<p>The Amazon Elasticsearch Service domain.</p>"
+        }
+      },
+      "documentation":"<p>Amazon Elasticsearch Service parameters.</p>"
+    },
+    "Arn":{"type":"string"},
+    "AssignmentStatus":{
+      "type":"string",
+      "enum":[
+        "ENABLED",
+        "DRAFT",
+        "DISABLED"
+      ]
+    },
+    "AthenaParameters":{
+      "type":"structure",
+      "members":{
+        "WorkGroup":{
+          "shape":"WorkGroup",
+          "documentation":"<p>The workgroup that Amazon Athena uses.</p>"
+        }
+      },
+      "documentation":"<p>Amazon Athena parameters.</p>"
+    },
+    "AuroraParameters":{
+      "type":"structure",
+      "required":[
+        "Host",
+        "Port",
+        "Database"
+      ],
+      "members":{
+        "Host":{
+          "shape":"Host",
+          "documentation":"<p>Host.</p>"
+        },
+        "Port":{
+          "shape":"Port",
+          "documentation":"<p>Port.</p>"
+        },
+        "Database":{
+          "shape":"Database",
+          "documentation":"<p>Database.</p>"
+        }
+      },
+      "documentation":"<p>Amazon Aurora parameters.</p>"
+    },
+    "AuroraPostgreSqlParameters":{
+      "type":"structure",
+      "required":[
+        "Host",
+        "Port",
+        "Database"
+      ],
+      "members":{
+        "Host":{
+          "shape":"Host",
+          "documentation":"<p>Host.</p>"
+        },
+        "Port":{
+          "shape":"Port",
+          "documentation":"<p>Port.</p>"
+        },
+        "Database":{
+          "shape":"Database",
+          "documentation":"<p>Database.</p>"
+        }
+      },
+      "documentation":"<p>Amazon Aurora with PostgreSQL compatibility parameters.</p>"
+    },
+    "AwsAccountId":{
+      "type":"string",
+      "max":12,
+      "min":12,
+      "pattern":"^[0-9]{12}$"
+    },
+    "AwsIotAnalyticsParameters":{
+      "type":"structure",
+      "required":["DataSetName"],
+      "members":{
+        "DataSetName":{
+          "shape":"DataSetName",
+          "documentation":"<p>Dataset name.</p>"
+        }
+      },
+      "documentation":"<p>AWS IoT Analytics parameters.</p>"
+    },
+    "Boolean":{"type":"boolean"},
+    "CalculatedColumn":{
+      "type":"structure",
+      "required":[
+        "ColumnName",
+        "ColumnId",
+        "Expression"
+      ],
+      "members":{
+        "ColumnName":{
+          "shape":"ColumnName",
+          "documentation":"<p>Column name.</p>"
+        },
+        "ColumnId":{
+          "shape":"ColumnId",
+          "documentation":"<p>A unique ID to identify a calculated column. During a dataset update, if the column ID of a calculated column matches that of an existing calculated column, Amazon QuickSight preserves the existing calculated column.</p>"
+        },
+        "Expression":{
+          "shape":"Expression",
+          "documentation":"<p>An expression that defines the calculated column.</p>"
+        }
+      },
+      "documentation":"<p>A calculated column for a dataset.</p>"
+    },
+    "CalculatedColumnList":{
+      "type":"list",
+      "member":{"shape":"CalculatedColumn"},
+      "max":128,
+      "min":1
+    },
+    "CancelIngestionRequest":{
+      "type":"structure",
+      "required":[
+        "AwsAccountId",
+        "DataSetId",
+        "IngestionId"
+      ],
+      "members":{
+        "AwsAccountId":{
+          "shape":"AwsAccountId",
+          "documentation":"<p>The AWS account ID.</p>",
+          "location":"uri",
+          "locationName":"AwsAccountId"
+        },
+        "DataSetId":{
+          "shape":"string",
+          "documentation":"<p>The ID of the dataset used in the ingestion.</p>",
+          "location":"uri",
+          "locationName":"DataSetId"
+        },
+        "IngestionId":{
+          "shape":"IngestionId",
+          "documentation":"<p>An ID for the ingestion.</p>",
+          "location":"uri",
+          "locationName":"IngestionId"
+        }
+      }
+    },
+    "CancelIngestionResponse":{
+      "type":"structure",
+      "members":{
+        "Arn":{
+          "shape":"Arn",
+          "documentation":"<p>The Amazon Resource Name (ARN) for the data ingestion.</p>"
+        },
+        "IngestionId":{
+          "shape":"IngestionId",
+          "documentation":"<p>An ID for the ingestion.</p>"
+        },
+        "RequestId":{
+          "shape":"string",
+          "documentation":"<p>The AWS request ID for this operation.</p>"
+        },
+        "Status":{
+          "shape":"StatusCode",
+          "documentation":"<p>The HTTP status of the request.</p>",
+          "location":"statusCode"
+        }
+      }
+    },
+    "CastColumnTypeOperation":{
+      "type":"structure",
+      "required":[
+        "ColumnName",
+        "NewColumnType"
+      ],
+      "members":{
+        "ColumnName":{
+          "shape":"ColumnName",
+          "documentation":"<p>Column name.</p>"
+        },
+        "NewColumnType":{
+          "shape":"ColumnDataType",
+          "documentation":"<p>New column data type.</p>"
+        },
+        "Format":{
+          "shape":"TypeCastFormat",
+          "documentation":"<p>When casting a column from string to datetime type, you can supply a string in a format supported by Amazon QuickSight to denote the source data format.</p>"
+        }
+      },
+      "documentation":"<p>A transform operation that casts a column to a different type.</p>"
+    },
+    "Catalog":{
+      "type":"string",
+      "max":128
+    },
+    "ClusterId":{
+      "type":"string",
+      "max":64,
+      "min":1
+    },
+    "ColumnDataType":{
+      "type":"string",
+      "enum":[
+        "STRING",
+        "INTEGER",
+        "DECIMAL",
+        "DATETIME"
+      ]
+    },
+    "ColumnGroup":{
+      "type":"structure",
+      "members":{
+        "GeoSpatialColumnGroup":{
+          "shape":"GeoSpatialColumnGroup",
+          "documentation":"<p>Geospatial column group that denotes a hierarchy.</p>"
+        }
+      },
+      "documentation":"<p>Groupings of columns that work together in certain Amazon QuickSight features. This is a variant type structure. For this structure to be valid, only one of the attributes can be non-null.</p>"
+    },
+    "ColumnGroupColumnSchema":{
+      "type":"structure",
+      "members":{
+        "Name":{
+          "shape":"String",
+          "documentation":"<p>The name of the column group's column schema.</p>"
+        }
+      },
+      "documentation":"<p>A structure describing the name, data type, and geographic role of the columns.</p>"
+    },
+    "ColumnGroupColumnSchemaList":{
+      "type":"list",
+      "member":{"shape":"ColumnGroupColumnSchema"},
+      "max":500
+    },
+    "ColumnGroupList":{
+      "type":"list",
+      "member":{"shape":"ColumnGroup"},
+      "max":8,
+      "min":1
+    },
+    "ColumnGroupName":{
+      "type":"string",
+      "max":64,
+      "min":1
+    },
+    "ColumnGroupSchema":{
+      "type":"structure",
+      "members":{
+        "Name":{
+          "shape":"String",
+          "documentation":"<p>The name of the column group schema.</p>"
+        },
+        "ColumnGroupColumnSchemaList":{
+          "shape":"ColumnGroupColumnSchemaList",
+          "documentation":"<p>A structure containing the list of schemas for column group columns.</p>"
+        }
+      },
+      "documentation":"<p>The column group schema.</p>"
+    },
+    "ColumnGroupSchemaList":{
+      "type":"list",
+      "member":{"shape":"ColumnGroupSchema"},
+      "max":500
+    },
+    "ColumnId":{
+      "type":"string",
+      "max":64,
+      "min":1
+    },
+    "ColumnList":{
+      "type":"list",
+      "member":{"shape":"ColumnName"},
+      "max":16,
+      "min":1
+    },
+    "ColumnName":{
+      "type":"string",
+      "max":128,
+      "min":1
+    },
+    "ColumnSchema":{
+      "type":"structure",
+      "members":{
+        "Name":{
+          "shape":"String",
+          "documentation":"<p>The name of the column schema.</p>"
+        },
+        "DataType":{
+          "shape":"String",
+          "documentation":"<p>The data type of the column schema.</p>"
+        },
+        "GeographicRole":{
+          "shape":"String",
+          "documentation":"<p>The geographic role of the column schema.</p>"
+        }
+      },
+      "documentation":"<p>The column schema.</p>"
+    },
+    "ColumnSchemaList":{
+      "type":"list",
+      "member":{"shape":"ColumnSchema"},
+      "max":500
+    },
+    "ColumnTag":{
+      "type":"structure",
+      "members":{
+        "ColumnGeographicRole":{
+          "shape":"GeoSpatialDataRole",
+          "documentation":"<p>A geospatial role for a column.</p>"
+        }
+      },
+      "documentation":"<p>A tag for a column in a <code>TagColumnOperation</code> structure. This is a variant type structure. For this structure to be valid, only one of the attributes can be non-null.</p>"
+    },
+    "ColumnTagList":{
+      "type":"list",
+      "member":{"shape":"ColumnTag"},
+      "max":16,
+      "min":1
+    },
+    "ConcurrentUpdatingException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"String"},
+        "RequestId":{"shape":"String"}
+      },
+      "documentation":"<p>A resource is already in a state that indicates an action is happening that must complete before a new update can be applied.</p>",
+      "error":{"httpStatusCode":500},
+      "exception":true
+    },
+    "ConflictException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"String"},
+        "RequestId":{
+          "shape":"String",
+          "documentation":"<p>The AWS request ID for this request.</p>"
+        }
+      },
+      "documentation":"<p>Updating or deleting a resource can cause an inconsistent state.</p>",
+      "error":{"httpStatusCode":409},
+      "exception":true
+    },
+    "CreateColumnsOperation":{
+      "type":"structure",
+      "required":["Columns"],
+      "members":{
+        "Columns":{
+          "shape":"CalculatedColumnList",
+          "documentation":"<p>Calculated columns to create.</p>"
+        }
+      },
+      "documentation":"<p>A transform operation that creates calculated columns. Columns created in one such operation form a lexical closure.</p>"
+    },
+    "CreateDashboardRequest":{
+      "type":"structure",
+      "required":[
+        "AwsAccountId",
+        "DashboardId",
+        "Name",
+        "SourceEntity"
+      ],
+      "members":{
+        "AwsAccountId":{
+          "shape":"AwsAccountId",
+          "documentation":"<p>The ID of the AWS account where you want to create the dashboard.</p>",
+          "location":"uri",
+          "locationName":"AwsAccountId"
+        },
+        "DashboardId":{
+          "shape":"RestrictiveResourceId",
+          "documentation":"<p>The ID for the dashboard, also added to the IAM policy.</p>",
+          "location":"uri",
+          "locationName":"DashboardId"
+        },
+        "Name":{
+          "shape":"DashboardName",
+          "documentation":"<p>The display name of the dashboard.</p>"
+        },
+        "Parameters":{
+          "shape":"Parameters",
+          "documentation":"<p>A structure that contains the parameters of the dashboard. These are parameter overrides for a dashboard. A dashboard can have any type of parameters, and some parameters might accept multiple values. You can use the dashboard permissions structure described following to override two string parameters that accept multiple values. </p>"
+        },
+        "Permissions":{
+          "shape":"ResourcePermissionList",
+          "documentation":"<p>A structure that contains the permissions of the dashboard. You can use this structure for granting permissions with principal and action information.</p>"
+        },
+        "SourceEntity":{
+          "shape":"DashboardSourceEntity",
+          "documentation":"<p>The source entity from which the dashboard is created. The source entity accepts the Amazon Resource Name (ARN) of the source template or analysis and also references the replacement datasets for the placeholders set when creating the template. The replacement datasets need to follow the same schema as the datasets for which placeholders were created when creating the template. </p> <p>If you are creating a dashboard from a source entity in a different AWS account, use the ARN of the source template.</p>"
+        },
+        "Tags":{
+          "shape":"TagList",
+          "documentation":"<p>Contains a map of the key-value pairs for the resource tag or tags assigned to the dashboard.</p>"
+        },
+        "VersionDescription":{
+          "shape":"VersionDescription",
+          "documentation":"<p>A description for the first version of the dashboard being created.</p>"
+        },
+        "DashboardPublishOptions":{
+          "shape":"DashboardPublishOptions",
+          "documentation":"<p>Options for publishing the dashboard when you create it:</p> <ul> <li> <p> <code>AvailabilityStatus</code> for <code>AdHocFilteringOption</code> - This status can be either <code>ENABLED</code> or <code>DISABLED</code>. When this is set to <code>DISABLED</code>, QuickSight disables the left filter pane on the published dashboard, which can be used for ad hoc (one-time) filtering. This option is <code>ENABLED</code> by default. </p> </li> <li> <p> <code>AvailabilityStatus</code> for <code>ExportToCSVOption</code> - This status can be either <code>ENABLED</code> or <code>DISABLED</code>. The visual option to export data to .csv format isn't enabled when this is set to <code>DISABLED</code>. This option is <code>ENABLED</code> by default. </p> </li> <li> <p> <code>VisibilityState</code> for <code>SheetControlsOption</code> - This visibility state can be either <code>COLLAPSED</code> or <code>EXPANDED</code>. The sheet controls pane is collapsed by default when set to true. This option is <code>COLLAPSED</code> by default. </p> </li> </ul>"
+        }
+      }
+    },
+    "CreateDashboardResponse":{
+      "type":"structure",
+      "members":{
+        "Arn":{
+          "shape":"Arn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the dashboard.</p>"
+        },
+        "VersionArn":{
+          "shape":"Arn",
+          "documentation":"<p>The ARN of the dashboard, including the version number of the first version that is created.</p>"
+        },
+        "DashboardId":{
+          "shape":"RestrictiveResourceId",
+          "documentation":"<p>The ID for the dashboard.</p>"
+        },
+        "CreationStatus":{
+          "shape":"ResourceStatus",
+          "documentation":"<p>The status of the dashboard creation request.</p>"
+        },
+        "Status":{
+          "shape":"StatusCode",
+          "documentation":"<p>The HTTP status of the request.</p>",
+          "location":"statusCode"
+        },
+        "RequestId":{
+          "shape":"String",
+          "documentation":"<p>The AWS request ID for this operation.</p>"
+        }
+      }
+    },
+    "CreateDataSetRequest":{
+      "type":"structure",
+      "required":[
+        "AwsAccountId",
+        "DataSetId",
+        "Name",
+        "PhysicalTableMap",
+        "ImportMode"
+      ],
+      "members":{
+        "AwsAccountId":{
+          "shape":"AwsAccountId",
+          "documentation":"<p>The AWS account ID.</p>",
+          "location":"uri",
+          "locationName":"AwsAccountId"
+        },
+        "DataSetId":{
+          "shape":"ResourceId",
+          "documentation":"<p>An ID for the dataset that you want to create. This ID is unique per AWS Region for each AWS account.</p>"
+        },
+        "Name":{
+          "shape":"ResourceName",
+          "documentation":"<p>The display name for the dataset.</p>"
+        },
+        "PhysicalTableMap":{
+          "shape":"PhysicalTableMap",
+          "documentation":"<p>Declares the physical tables that are available in the underlying data sources.</p>"
+        },
+        "LogicalTableMap":{
+          "shape":"LogicalTableMap",
+          "documentation":"<p>Configures the combination and transformation of the data from the physical tables.</p>"
+        },
+        "ImportMode":{
+          "shape":"DataSetImportMode",
+          "documentation":"<p>Indicates whether you want to import the data into SPICE.</p>"
+        },
+        "ColumnGroups":{
+          "shape":"ColumnGroupList",
+          "documentation":"<p>Groupings of columns that work together in certain QuickSight features. Currently, only geospatial hierarchy is supported.</p>"
+        },
+        "Permissions":{
+          "shape":"ResourcePermissionList",
+          "documentation":"<p>A list of resource permissions on the dataset.</p>"
+        },
+        "RowLevelPermissionDataSet":{
+          "shape":"RowLevelPermissionDataSet",
+          "documentation":"<p>The row-level security configuration for the data that you want to create.</p>"
+        },
+        "Tags":{
+          "shape":"TagList",
+          "documentation":"<p>Contains a map of the key-value pairs for the resource tag or tags assigned to the dataset.</p>"
+        }
+      }
+    },
+    "CreateDataSetResponse":{
+      "type":"structure",
+      "members":{
+        "Arn":{
+          "shape":"Arn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the dataset.</p>"
+        },
+        "DataSetId":{
+          "shape":"ResourceId",
+          "documentation":"<p>The ID for the dataset that you want to create. This ID is unique per AWS Region for each AWS account.</p>"
+        },
+        "IngestionArn":{
+          "shape":"Arn",
+          "documentation":"<p>The ARN for the ingestion, which is triggered as a result of dataset creation if the import mode is SPICE.</p>"
+        },
+        "IngestionId":{
+          "shape":"ResourceId",
+          "documentation":"<p>The ID of the ingestion, which is triggered as a result of dataset creation if the import mode is SPICE.</p>"
+        },
+        "RequestId":{
+          "shape":"String",
+          "documentation":"<p>The AWS request ID for this operation.</p>"
+        },
+        "Status":{
+          "shape":"StatusCode",
+          "documentation":"<p>The HTTP status of the request.</p>",
+          "location":"statusCode"
+        }
+      }
+    },
+    "CreateDataSourceRequest":{
+      "type":"structure",
+      "required":[
+        "AwsAccountId",
+        "DataSourceId",
+        "Name",
+        "Type"
+      ],
+      "members":{
+        "AwsAccountId":{
+          "shape":"AwsAccountId",
+          "documentation":"<p>The AWS account ID.</p>",
+          "location":"uri",
+          "locationName":"AwsAccountId"
+        },
+        "DataSourceId":{
+          "shape":"ResourceId",
+          "documentation":"<p>An ID for the data source. This ID is unique per AWS Region for each AWS account. </p>"
+        },
+        "Name":{
+          "shape":"ResourceName",
+          "documentation":"<p>A display name for the data source.</p>"
+        },
+        "Type":{
+          "shape":"DataSourceType",
+          "documentation":"<p>The type of the data source. Currently, the supported types for this operation are: <code>ATHENA, AURORA, AURORA_POSTGRESQL, MARIADB, MYSQL, POSTGRESQL, PRESTO, REDSHIFT, S3, SNOWFLAKE, SPARK, SQLSERVER, TERADATA</code>. Use <code>ListDataSources</code> to return a list of all data sources.</p>"
+        },
+        "DataSourceParameters":{
+          "shape":"DataSourceParameters",
+          "documentation":"<p>The parameters that QuickSight uses to connect to your underlying source.</p>"
+        },
+        "Credentials":{
+          "shape":"DataSourceCredentials",
+          "documentation":"<p>The credentials QuickSight that uses to connect to your underlying source. Currently, only credentials based on user name and password are supported.</p>"
+        },
+        "Permissions":{
+          "shape":"ResourcePermissionList",
+          "documentation":"<p>A list of resource permissions on the data source.</p>"
+        },
+        "VpcConnectionProperties":{
+          "shape":"VpcConnectionProperties",
+          "documentation":"<p>Use this parameter only when you want QuickSight to use a VPC connection when connecting to your underlying source.</p>"
+        },
+        "SslProperties":{
+          "shape":"SslProperties",
+          "documentation":"<p>Secure Socket Layer (SSL) properties that apply when QuickSight connects to your underlying source.</p>"
+        },
+        "Tags":{
+          "shape":"TagList",
+          "documentation":"<p>Contains a map of the key-value pairs for the resource tag or tags assigned to the data source.</p>"
+        }
+      }
+    },
+    "CreateDataSourceResponse":{
+      "type":"structure",
+      "members":{
+        "Arn":{
+          "shape":"Arn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the data source.</p>"
+        },
+        "DataSourceId":{
+          "shape":"ResourceId",
+          "documentation":"<p>The ID of the data source. This ID is unique per AWS Region for each AWS account.</p>"
+        },
+        "CreationStatus":{
+          "shape":"ResourceStatus",
+          "documentation":"<p>The status of creating the data source.</p>"
+        },
+        "RequestId":{
+          "shape":"String",
+          "documentation":"<p>The AWS request ID for this operation.</p>"
+        },
+        "Status":{
+          "shape":"StatusCode",
+          "documentation":"<p>The HTTP status of the request.</p>",
+          "location":"statusCode"
+        }
+      }
+    },
+    "CreateGroupMembershipRequest":{
+      "type":"structure",
+      "required":[
+        "MemberName",
+        "GroupName",
+        "AwsAccountId",
+        "Namespace"
+      ],
+      "members":{
+        "MemberName":{
+          "shape":"GroupMemberName",
+          "documentation":"<p>The name of the user that you want to add to the group membership.</p>",
+          "location":"uri",
+          "locationName":"MemberName"
+        },
+        "GroupName":{
+          "shape":"GroupName",
+          "documentation":"<p>The name of the group that you want to add the user to.</p>",
+          "location":"uri",
+          "locationName":"GroupName"
+        },
+        "AwsAccountId":{
+          "shape":"AwsAccountId",
+          "documentation":"<p>The ID for the AWS account that the group is in. Currently, you use the ID for the AWS account that contains your Amazon QuickSight account.</p>",
+          "location":"uri",
+          "locationName":"AwsAccountId"
+        },
+        "Namespace":{
+          "shape":"Namespace",
+          "documentation":"<p>The namespace. Currently, you should set this to <code>default</code>.</p>",
+          "location":"uri",
+          "locationName":"Namespace"
+        }
+      }
+    },
+    "CreateGroupMembershipResponse":{
+      "type":"structure",
+      "members":{
+        "GroupMember":{
+          "shape":"GroupMember",
+          "documentation":"<p>The group member.</p>"
+        },
+        "RequestId":{
+          "shape":"String",
+          "documentation":"<p>The AWS request ID for this operation.</p>"
+        },
+        "Status":{
+          "shape":"StatusCode",
+          "documentation":"<p>The HTTP status of the request.</p>",
+          "location":"statusCode"
+        }
+      }
+    },
+    "CreateGroupRequest":{
+      "type":"structure",
+      "required":[
+        "GroupName",
+        "AwsAccountId",
+        "Namespace"
+      ],
+      "members":{
+        "GroupName":{
+          "shape":"GroupName",
+          "documentation":"<p>A name for the group that you want to create.</p>"
+        },
+        "Description":{
+          "shape":"GroupDescription",
+          "documentation":"<p>A description for the group that you want to create.</p>"
+        },
+        "AwsAccountId":{
+          "shape":"AwsAccountId",
+          "documentation":"<p>The ID for the AWS account that the group is in. Currently, you use the ID for the AWS account that contains your Amazon QuickSight account.</p>",
+          "location":"uri",
+          "locationName":"AwsAccountId"
+        },
+        "Namespace":{
+          "shape":"Namespace",
+          "documentation":"<p>The namespace. Currently, you should set this to <code>default</code>.</p>",
+          "location":"uri",
+          "locationName":"Namespace"
+        }
+      },
+      "documentation":"<p>The request object for this operation. </p>"
+    },
+    "CreateGroupResponse":{
+      "type":"structure",
+      "members":{
+        "Group":{
+          "shape":"Group",
+          "documentation":"<p>The name of the group.</p>"
+        },
+        "RequestId":{
+          "shape":"String",
+          "documentation":"<p>The AWS request ID for this operation.</p>"
+        },
+        "Status":{
+          "shape":"StatusCode",
+          "documentation":"<p>The HTTP status of the request.</p>",
+          "location":"statusCode"
+        }
+      },
+      "documentation":"<p>The response object for this operation.</p>"
+    },
+    "CreateIAMPolicyAssignmentRequest":{
+      "type":"structure",
+      "required":[
+        "AwsAccountId",
+        "AssignmentName",
+        "AssignmentStatus",
+        "Namespace"
+      ],
+      "members":{
+        "AwsAccountId":{
+          "shape":"AwsAccountId",
+          "documentation":"<p>The ID of the AWS account where you want to assign an IAM policy to QuickSight users or groups.</p>",
+          "location":"uri",
+          "locationName":"AwsAccountId"
+        },
+        "AssignmentName":{
+          "shape":"IAMPolicyAssignmentName",
+          "documentation":"<p>The name of the assignment. It must be unique within an AWS account.</p>"
+        },
+        "AssignmentStatus":{
+          "shape":"AssignmentStatus",
+          "documentation":"<p>The status of the assignment. Possible values are as follows:</p> <ul> <li> <p> <code>ENABLED</code> - Anything specified in this assignment is used when creating the data source.</p> </li> <li> <p> <code>DISABLED</code> - This assignment isn't used when creating the data source.</p> </li> <li> <p> <code>DRAFT</code> - This assignment is an unfinished draft and isn't used when creating the data source.</p> </li> </ul>"
+        },
+        "PolicyArn":{
+          "shape":"Arn",
+          "documentation":"<p>The ARN for the IAM policy to apply to the QuickSight users and groups specified in this assignment.</p>"
+        },
+        "Identities":{
+          "shape":"IdentityMap",
+          "documentation":"<p>The QuickSight users, groups, or both that you want to assign the policy to.</p>"
+        },
+        "Namespace":{
+          "shape":"Namespace",
+          "documentation":"<p>The namespace that contains the assignment.</p>",
+          "location":"uri",
+          "locationName":"Namespace"
+        }
+      }
+    },
+    "CreateIAMPolicyAssignmentResponse":{
+      "type":"structure",
+      "members":{
+        "AssignmentName":{
+          "shape":"IAMPolicyAssignmentName",
+          "documentation":"<p>The name of the assignment. This name must be unique within the AWS account.</p>"
+        },
+        "AssignmentId":{
+          "shape":"String",
+          "documentation":"<p>The ID for the assignment.</p>"
+        },
+        "AssignmentStatus":{
+          "shape":"AssignmentStatus",
+          "documentation":"<p>The status of the assignment. Possible values are as follows:</p> <ul> <li> <p> <code>ENABLED</code> - Anything specified in this assignment is used when creating the data source.</p> </li> <li> <p> <code>DISABLED</code> - This assignment isn't used when creating the data source.</p> </li> <li> <p> <code>DRAFT</code> - This assignment is an unfinished draft and isn't used when creating the data source.</p> </li> </ul>"
+        },
+        "PolicyArn":{
+          "shape":"Arn",
+          "documentation":"<p>The ARN for the IAM policy that is applied to the QuickSight users and groups specified in this assignment.</p>"
+        },
+        "Identities":{
+          "shape":"IdentityMap",
+          "documentation":"<p>The QuickSight users, groups, or both that the IAM policy is assigned to.</p>"
+        },
+        "RequestId":{
+          "shape":"String",
+          "documentation":"<p>The AWS request ID for this operation.</p>"
+        },
+        "Status":{
+          "shape":"StatusCode",
+          "documentation":"<p>The HTTP status of the request.</p>",
+          "location":"statusCode"
+        }
+      }
+    },
+    "CreateIngestionRequest":{
+      "type":"structure",
+      "required":[
+        "DataSetId",
+        "IngestionId",
+        "AwsAccountId"
+      ],
+      "members":{
+        "DataSetId":{
+          "shape":"string",
+          "documentation":"<p>The ID of the dataset used in the ingestion.</p>",
+          "location":"uri",
+          "locationName":"DataSetId"
+        },
+        "IngestionId":{
+          "shape":"IngestionId",
+          "documentation":"<p>An ID for the ingestion.</p>",
+          "location":"uri",
+          "locationName":"IngestionId"
+        },
+        "AwsAccountId":{
+          "shape":"AwsAccountId",
+          "documentation":"<p>The AWS account ID.</p>",
+          "location":"uri",
+          "locationName":"AwsAccountId"
+        }
+      }
+    },
+    "CreateIngestionResponse":{
+      "type":"structure",
+      "members":{
+        "Arn":{
+          "shape":"Arn",
+          "documentation":"<p>The Amazon Resource Name (ARN) for the data ingestion.</p>"
+        },
+        "IngestionId":{
+          "shape":"IngestionId",
+          "documentation":"<p>An ID for the ingestion.</p>"
+        },
+        "IngestionStatus":{
+          "shape":"IngestionStatus",
+          "documentation":"<p>The ingestion status.</p>"
+        },
+        "RequestId":{
+          "shape":"string",
+          "documentation":"<p>The AWS request ID for this operation.</p>"
+        },
+        "Status":{
+          "shape":"StatusCode",
+          "documentation":"<p>The HTTP status of the request.</p>",
+          "location":"statusCode"
+        }
+      }
+    },
+    "CreateTemplateAliasRequest":{
+      "type":"structure",
+      "required":[
+        "AwsAccountId",
+        "TemplateId",
+        "AliasName",
+        "TemplateVersionNumber"
+      ],
+      "members":{
+        "AwsAccountId":{
+          "shape":"AwsAccountId",
+          "documentation":"<p>The ID of the AWS account that contains the template that you creating an alias for.</p>",
+          "location":"uri",
+          "locationName":"AwsAccountId"
+        },
+        "TemplateId":{
+          "shape":"RestrictiveResourceId",
+          "documentation":"<p>An ID for the template.</p>",
+          "location":"uri",
+          "locationName":"TemplateId"
+        },
+        "AliasName":{
+          "shape":"AliasName",
+          "documentation":"<p>The name that you want to give to the template alias that you're creating. Don't start the alias name with the <code>$</code> character. Alias names that start with <code>$</code> are reserved by QuickSight. </p>",
+          "location":"uri",
+          "locationName":"AliasName"
+        },
+        "TemplateVersionNumber":{
+          "shape":"VersionNumber",
+          "documentation":"<p>The version number of the template.</p>"
+        }
+      }
+    },
+    "CreateTemplateAliasResponse":{
+      "type":"structure",
+      "members":{
+        "TemplateAlias":{
+          "shape":"TemplateAlias",
+          "documentation":"<p>Information about the template alias.</p>"
+        },
+        "Status":{
+          "shape":"StatusCode",
+          "documentation":"<p>The HTTP status of the request.</p>",
+          "location":"statusCode"
+        },
+        "RequestId":{
+          "shape":"String",
+          "documentation":"<p>The AWS request ID for this operation.</p>"
+        }
+      }
+    },
+    "CreateTemplateRequest":{
+      "type":"structure",
+      "required":[
+        "AwsAccountId",
+        "TemplateId",
+        "SourceEntity"
+      ],
+      "members":{
+        "AwsAccountId":{
+          "shape":"AwsAccountId",
+          "documentation":"<p>The ID for the AWS account that the group is in. Currently, you use the ID for the AWS account that contains your Amazon QuickSight account.</p>",
+          "location":"uri",
+          "locationName":"AwsAccountId"
+        },
+        "TemplateId":{
+          "shape":"RestrictiveResourceId",
+          "documentation":"<p>An ID for the template that you want to create. This template is unique per AWS Region in each AWS account.</p>",
+          "location":"uri",
+          "locationName":"TemplateId"
+        },
+        "Name":{
+          "shape":"TemplateName",
+          "documentation":"<p>A display name for the template.</p>"
+        },
+        "Permissions":{
+          "shape":"ResourcePermissionList",
+          "documentation":"<p>A list of resource permissions to be set on the template. </p>"
+        },
+        "SourceEntity":{
+          "shape":"TemplateSourceEntity",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the source entity from which this template is being created. Currently, you can create a template from an analysis or another template. If the ARN is for an analysis, include its dataset references. </p>"
+        },
+        "Tags":{
+          "shape":"TagList",
+          "documentation":"<p>Contains a map of the key-value pairs for the resource tag or tags assigned to the resource.</p>"
+        },
+        "VersionDescription":{
+          "shape":"VersionDescription",
+          "documentation":"<p>A description of the current template version being created. This API operation creates the first version of the template. Every time <code>UpdateTemplate</code> is called, a new version is created. Each version of the template maintains a description of the version in the <code>VersionDescription</code> field.</p>"
+        }
+      }
+    },
+    "CreateTemplateResponse":{
+      "type":"structure",
+      "members":{
+        "Arn":{
+          "shape":"Arn",
+          "documentation":"<p>The ARN for the template.</p>"
+        },
+        "VersionArn":{
+          "shape":"Arn",
+          "documentation":"<p>The ARN for the template, including the version information of the first version.</p>"
+        },
+        "TemplateId":{
+          "shape":"RestrictiveResourceId",
+          "documentation":"<p>The ID of the template.</p>"
+        },
+        "CreationStatus":{
+          "shape":"ResourceStatus",
+          "documentation":"<p>The template creation status.</p>"
+        },
+        "Status":{
+          "shape":"StatusCode",
+          "documentation":"<p>The HTTP status of the request.</p>",
+          "location":"statusCode"
+        },
+        "RequestId":{
+          "shape":"String",
+          "documentation":"<p>The AWS request ID for this operation.</p>"
+        }
+      }
+    },
+    "CredentialPair":{
+      "type":"structure",
+      "required":[
+        "Username",
+        "Password"
+      ],
+      "members":{
+        "Username":{
+          "shape":"Username",
+          "documentation":"<p>User name.</p>"
+        },
+        "Password":{
+          "shape":"Password",
+          "documentation":"<p>Password.</p>"
+        }
+      },
+      "documentation":"<p>The combination of user name and password that are used as credentials.</p>"
+    },
+    "CustomSql":{
+      "type":"structure",
+      "required":[
+        "DataSourceArn",
+        "Name",
+        "SqlQuery"
+      ],
+      "members":{
+        "DataSourceArn":{
+          "shape":"Arn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the data source.</p>"
+        },
+        "Name":{
+          "shape":"CustomSqlName",
+          "documentation":"<p>A display name for the SQL query result.</p>"
+        },
+        "SqlQuery":{
+          "shape":"SqlQuery",
+          "documentation":"<p>The SQL query.</p>"
+        },
+        "Columns":{
+          "shape":"InputColumnList",
+          "documentation":"<p>The column schema from the SQL query result set.</p>"
+        }
+      },
+      "documentation":"<p>A physical table type built from the results of the custom SQL query.</p>"
+    },
+    "CustomSqlName":{
+      "type":"string",
+      "max":64,
+      "min":1
+    },
+    "Dashboard":{
+      "type":"structure",
+      "members":{
+        "DashboardId":{
+          "shape":"RestrictiveResourceId",
+          "documentation":"<p>Dashboard ID.</p>"
+        },
+        "Arn":{
+          "shape":"Arn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the resource.</p>"
+        },
+        "Name":{
+          "shape":"DashboardName",
+          "documentation":"<p>A display name for the dataset.</p>"
+        },
+        "Version":{
+          "shape":"DashboardVersion",
+          "documentation":"<p>Version.</p>"
+        },
+        "CreatedTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>The time that this dataset was created.</p>"
+        },
+        "LastPublishedTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>The last time that this dataset was published.</p>"
+        },
+        "LastUpdatedTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>The last time that this dataset was updated.</p>"
+        }
+      },
+      "documentation":"<p>Dashboard.</p>"
+    },
+    "DashboardBehavior":{
+      "type":"string",
+      "enum":[
+        "ENABLED",
+        "DISABLED"
+      ]
+    },
+    "DashboardError":{
+      "type":"structure",
+      "members":{
+        "Type":{
+          "shape":"DashboardErrorType",
+          "documentation":"<p>Type.</p>"
+        },
+        "Message":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>Message.</p>"
+        }
+      },
+      "documentation":"<p>Dashboard error.</p>"
+    },
+    "DashboardErrorList":{
+      "type":"list",
+      "member":{"shape":"DashboardError"},
+      "min":1
+    },
+    "DashboardErrorType":{
+      "type":"string",
+      "enum":[
+        "DATA_SET_NOT_FOUND",
+        "INTERNAL_FAILURE",
+        "PARAMETER_VALUE_INCOMPATIBLE",
+        "PARAMETER_TYPE_INVALID",
+        "PARAMETER_NOT_FOUND",
+        "COLUMN_TYPE_MISMATCH",
+        "COLUMN_GEOGRAPHIC_ROLE_MISMATCH",
+        "COLUMN_REPLACEMENT_MISSING"
+      ]
+    },
+    "DashboardFilterAttribute":{
+      "type":"string",
+      "enum":["QUICKSIGHT_USER"]
+    },
+    "DashboardName":{
+      "type":"string",
+      "max":2048,
+      "min":1,
+      "pattern":"[\\u0020-\\u00FF]+"
+    },
+    "DashboardPublishOptions":{
+      "type":"structure",
+      "members":{
+        "AdHocFilteringOption":{
+          "shape":"AdHocFilteringOption",
+          "documentation":"<p>Ad hoc (one-time) filtering option.</p>"
+        },
+        "ExportToCSVOption":{
+          "shape":"ExportToCSVOption",
+          "documentation":"<p>Export to .csv option.</p>"
+        },
+        "SheetControlsOption":{
+          "shape":"SheetControlsOption",
+          "documentation":"<p>Sheet controls option.</p>"
+        }
+      },
+      "documentation":"<p>Dashboard publish options.</p>"
+    },
+    "DashboardSearchFilter":{
+      "type":"structure",
+      "required":["Operator"],
+      "members":{
+        "Operator":{
+          "shape":"FilterOperator",
+          "documentation":"<p>The comparison operator that you want to use as a filter. For example, <code>\"Operator\": \"StringEquals\"</code>.</p>"
+        },
+        "Name":{
+          "shape":"DashboardFilterAttribute",
+          "documentation":"<p>The name of the value that you want to use as a filter. For example, <code>\"Name\": \"QUICKSIGHT_USER\"</code>. </p>"
+        },
+        "Value":{
+          "shape":"String",
+          "documentation":"<p>The value of the named item, in this case <code>QUICKSIGHT_USER</code>, that you want to use as a filter. For example, <code>\"Value\": \"arn:aws:quicksight:us-east-1:1:user/default/UserName1\"</code>. </p>"
+        }
+      },
+      "documentation":"<p>A filter that you apply when searching for dashboards. </p>"
+    },
+    "DashboardSearchFilterList":{
+      "type":"list",
+      "member":{"shape":"DashboardSearchFilter"},
+      "max":1
+    },
+    "DashboardSourceEntity":{
+      "type":"structure",
+      "members":{
+        "SourceTemplate":{
+          "shape":"DashboardSourceTemplate",
+          "documentation":"<p>Source template.</p>"
+        }
+      },
+      "documentation":"<p>Dashboard source entity.</p>"
+    },
+    "DashboardSourceTemplate":{
+      "type":"structure",
+      "required":[
+        "DataSetReferences",
+        "Arn"
+      ],
+      "members":{
+        "DataSetReferences":{
+          "shape":"DataSetReferenceList",
+          "documentation":"<p>Dataset references.</p>"
+        },
+        "Arn":{
+          "shape":"Arn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the resource.</p>"
+        }
+      },
+      "documentation":"<p>Dashboard source template.</p>"
+    },
+    "DashboardSummary":{
+      "type":"structure",
+      "members":{
+        "Arn":{
+          "shape":"Arn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the resource.</p>"
+        },
+        "DashboardId":{
+          "shape":"RestrictiveResourceId",
+          "documentation":"<p>Dashboard ID.</p>"
+        },
+        "Name":{
+          "shape":"DashboardName",
+          "documentation":"<p>A display name for the dashboard.</p>"
+        },
+        "CreatedTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>The time that this dashboard was created.</p>"
+        },
+        "LastUpdatedTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>The last time that this dashboard was updated.</p>"
+        },
+        "PublishedVersionNumber":{
+          "shape":"VersionNumber",
+          "documentation":"<p>Published version number.</p>"
+        },
+        "LastPublishedTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>The last time that this dashboard was published.</p>"
+        }
+      },
+      "documentation":"<p>Dashboard summary.</p>"
+    },
+    "DashboardSummaryList":{
+      "type":"list",
+      "member":{"shape":"DashboardSummary"},
+      "max":100
+    },
+    "DashboardUIState":{
+      "type":"string",
+      "enum":[
+        "EXPANDED",
+        "COLLAPSED"
+      ]
+    },
+    "DashboardVersion":{
+      "type":"structure",
+      "members":{
+        "CreatedTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>The time that this dashboard version was created.</p>"
+        },
+        "Errors":{
+          "shape":"DashboardErrorList",
+          "documentation":"<p>Errors.</p>"
+        },
+        "VersionNumber":{
+          "shape":"VersionNumber",
+          "documentation":"<p>Version number.</p>"
+        },
+        "Status":{
+          "shape":"ResourceStatus",
+          "documentation":"<p>The HTTP status of the request.</p>"
+        },
+        "Arn":{
+          "shape":"Arn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the resource.</p>"
+        },
+        "SourceEntityArn":{
+          "shape":"Arn",
+          "documentation":"<p>Source entity ARN.</p>"
+        },
+        "Description":{
+          "shape":"VersionDescription",
+          "documentation":"<p>Description.</p>"
+        }
+      },
+      "documentation":"<p>Dashboard version.</p>"
+    },
+    "DashboardVersionSummary":{
+      "type":"structure",
+      "members":{
+        "Arn":{
+          "shape":"Arn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the resource.</p>"
+        },
+        "CreatedTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>The time that this dashboard version was created.</p>"
+        },
+        "VersionNumber":{
+          "shape":"VersionNumber",
+          "documentation":"<p>Version number.</p>"
+        },
+        "Status":{
+          "shape":"ResourceStatus",
+          "documentation":"<p>The HTTP status of the request.</p>"
+        },
+        "SourceEntityArn":{
+          "shape":"Arn",
+          "documentation":"<p>Source entity ARN.</p>"
+        },
+        "Description":{
+          "shape":"VersionDescription",
+          "documentation":"<p>Description.</p>"
+        }
+      },
+      "documentation":"<p>Dashboard version summary.</p>"
+    },
+    "DashboardVersionSummaryList":{
+      "type":"list",
+      "member":{"shape":"DashboardVersionSummary"},
+      "max":100
+    },
+    "DataSet":{
+      "type":"structure",
+      "members":{
+        "Arn":{
+          "shape":"Arn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the resource.</p>"
+        },
+        "DataSetId":{
+          "shape":"ResourceId",
+          "documentation":"<p>The ID of the dataset.</p>"
+        },
+        "Name":{
+          "shape":"ResourceName",
+          "documentation":"<p>A display name for the dataset.</p>"
+        },
+        "CreatedTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>The time that this dataset was created.</p>"
+        },
+        "LastUpdatedTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>The last time that this dataset was updated.</p>"
+        },
+        "PhysicalTableMap":{
+          "shape":"PhysicalTableMap",
+          "documentation":"<p>Declares the physical tables that are available in the underlying data sources.</p>"
+        },
+        "LogicalTableMap":{
+          "shape":"LogicalTableMap",
+          "documentation":"<p>Configures the combination and transformation of the data from the physical tables.</p>"
+        },
+        "OutputColumns":{
+          "shape":"OutputColumnList",
+          "documentation":"<p>The list of columns after all transforms. These columns are available in templates, analyses, and dashboards.</p>"
+        },
+        "ImportMode":{
+          "shape":"DataSetImportMode",
+          "documentation":"<p>Indicates whether you want to import the data into SPICE.</p>"
+        },
+        "ConsumedSpiceCapacityInBytes":{
+          "shape":"Long",
+          "documentation":"<p>The amount of SPICE capacity used by this dataset. This is 0 if the dataset isn't imported into SPICE.</p>"
+        },
+        "ColumnGroups":{
+          "shape":"ColumnGroupList",
+          "documentation":"<p>Groupings of columns that work together in certain Amazon QuickSight features. Currently, only geospatial hierarchy is supported.</p>"
+        },
+        "RowLevelPermissionDataSet":{
+          "shape":"RowLevelPermissionDataSet",
+          "documentation":"<p>The row-level security configuration for the dataset.</p>"
+        }
+      },
+      "documentation":"<p>Dataset.</p>"
+    },
+    "DataSetConfiguration":{
+      "type":"structure",
+      "members":{
+        "Placeholder":{
+          "shape":"String",
+          "documentation":"<p>Placeholder.</p>"
+        },
+        "DataSetSchema":{
+          "shape":"DataSetSchema",
+          "documentation":"<p>Dataset schema.</p>"
+        },
+        "ColumnGroupSchemaList":{
+          "shape":"ColumnGroupSchemaList",
+          "documentation":"<p>A structure containing the list of column group schemas.</p>"
+        }
+      },
+      "documentation":"<p>Dataset configuration.</p>"
+    },
+    "DataSetConfigurationList":{
+      "type":"list",
+      "member":{"shape":"DataSetConfiguration"},
+      "max":30
+    },
+    "DataSetImportMode":{
+      "type":"string",
+      "enum":[
+        "SPICE",
+        "DIRECT_QUERY"
+      ]
+    },
+    "DataSetName":{
+      "type":"string",
+      "max":128,
+      "min":1
+    },
+    "DataSetReference":{
+      "type":"structure",
+      "required":[
+        "DataSetPlaceholder",
+        "DataSetArn"
+      ],
+      "members":{
+        "DataSetPlaceholder":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>Dataset placeholder.</p>"
+        },
+        "DataSetArn":{
+          "shape":"Arn",
+          "documentation":"<p>Dataset Amazon Resource Name (ARN).</p>"
+        }
+      },
+      "documentation":"<p>Dataset reference.</p>"
+    },
+    "DataSetReferenceList":{
+      "type":"list",
+      "member":{"shape":"DataSetReference"},
+      "min":1
+    },
+    "DataSetSchema":{
+      "type":"structure",
+      "members":{
+        "ColumnSchemaList":{
+          "shape":"ColumnSchemaList",
+          "documentation":"<p>A structure containing the list of column schemas.</p>"
+        }
+      },
+      "documentation":"<p>Dataset schema.</p>"
+    },
+    "DataSetSummary":{
+      "type":"structure",
+      "members":{
+        "Arn":{
+          "shape":"Arn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the dataset.</p>"
+        },
+        "DataSetId":{
+          "shape":"ResourceId",
+          "documentation":"<p>The ID of the dataset.</p>"
+        },
+        "Name":{
+          "shape":"ResourceName",
+          "documentation":"<p>A display name for the dataset.</p>"
+        },
+        "CreatedTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>The time that this dataset was created.</p>"
+        },
+        "LastUpdatedTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>The last time that this dataset was updated.</p>"
+        },
+        "ImportMode":{
+          "shape":"DataSetImportMode",
+          "documentation":"<p>Indicates whether you want to import the data into SPICE.</p>"
+        },
+        "RowLevelPermissionDataSet":{
+          "shape":"RowLevelPermissionDataSet",
+          "documentation":"<p>The row-level security configuration for the dataset.</p>"
+        }
+      },
+      "documentation":"<p>Dataset summary.</p>"
+    },
+    "DataSetSummaryList":{
+      "type":"list",
+      "member":{"shape":"DataSetSummary"}
+    },
+    "DataSource":{
+      "type":"structure",
+      "members":{
+        "Arn":{
+          "shape":"Arn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the data source.</p>"
+        },
+        "DataSourceId":{
+          "shape":"ResourceId",
+          "documentation":"<p>The ID of the data source. This ID is unique per AWS Region for each AWS account.</p>"
+        },
+        "Name":{
+          "shape":"ResourceName",
+          "documentation":"<p>A display name for the data source.</p>"
+        },
+        "Type":{
+          "shape":"DataSourceType",
+          "documentation":"<p>The type of the data source. This type indicates which database engine the data source connects to.</p>"
+        },
+        "Status":{
+          "shape":"ResourceStatus",
+          "documentation":"<p>The HTTP status of the request.</p>"
+        },
+        "CreatedTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>The time that this data source was created.</p>"
+        },
+        "LastUpdatedTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>The last time that this data source was updated.</p>"
+        },
+        "DataSourceParameters":{
+          "shape":"DataSourceParameters",
+          "documentation":"<p>The parameters that Amazon QuickSight uses to connect to your underlying source. This is a variant type structure. For this structure to be valid, only one of the attributes can be non-null.</p>"
+        },
+        "VpcConnectionProperties":{
+          "shape":"VpcConnectionProperties",
+          "documentation":"<p>The VPC connection information. You need to use this parameter only when you want QuickSight to use a VPC connection when connecting to your underlying source.</p>"
+        },
+        "SslProperties":{
+          "shape":"SslProperties",
+          "documentation":"<p>Secure Socket Layer (SSL) properties that apply when QuickSight connects to your underlying source.</p>"
+        },
+        "ErrorInfo":{
+          "shape":"DataSourceErrorInfo",
+          "documentation":"<p>Error information from the last update or the creation of the data source.</p>"
+        }
+      },
+      "documentation":"<p>The structure of a data source.</p>"
+    },
+    "DataSourceCredentials":{
+      "type":"structure",
+      "members":{
+        "CredentialPair":{
+          "shape":"CredentialPair",
+          "documentation":"<p>Credential pair.</p>"
+        }
+      },
+      "documentation":"<p>Data source credentials.</p>",
+      "sensitive":true
+    },
+    "DataSourceErrorInfo":{
+      "type":"structure",
+      "members":{
+        "Type":{
+          "shape":"DataSourceErrorInfoType",
+          "documentation":"<p>Error type.</p>"
+        },
+        "Message":{
+          "shape":"String",
+          "documentation":"<p>Error message.</p>"
+        }
+      },
+      "documentation":"<p>Error information for the data source creation or update.</p>"
+    },
+    "DataSourceErrorInfoType":{
+      "type":"string",
+      "enum":[
+        "TIMEOUT",
+        "ENGINE_VERSION_NOT_SUPPORTED",
+        "UNKNOWN_HOST",
+        "GENERIC_SQL_FAILURE",
+        "CONFLICT",
+        "UNKNOWN"
+      ]
+    },
+    "DataSourceList":{
+      "type":"list",
+      "member":{"shape":"DataSource"}
+    },
+    "DataSourceParameters":{
+      "type":"structure",
+      "members":{
+        "AmazonElasticsearchParameters":{
+          "shape":"AmazonElasticsearchParameters",
+          "documentation":"<p>Amazon Elasticsearch Service parameters.</p>"
+        },
+        "AthenaParameters":{
+          "shape":"AthenaParameters",
+          "documentation":"<p>Amazon Athena parameters.</p>"
+        },
+        "AuroraParameters":{
+          "shape":"AuroraParameters",
+          "documentation":"<p>Amazon Aurora MySQL parameters.</p>"
+        },
+        "AuroraPostgreSqlParameters":{
+          "shape":"AuroraPostgreSqlParameters",
+          "documentation":"<p>Aurora PostgreSQL parameters.</p>"
+        },
+        "AwsIotAnalyticsParameters":{
+          "shape":"AwsIotAnalyticsParameters",
+          "documentation":"<p>AWS IoT Analytics parameters.</p>"
+        },
+        "JiraParameters":{
+          "shape":"JiraParameters",
+          "documentation":"<p>Jira parameters.</p>"
+        },
+        "MariaDbParameters":{
+          "shape":"MariaDbParameters",
+          "documentation":"<p>MariaDB parameters.</p>"
+        },
+        "MySqlParameters":{
+          "shape":"MySqlParameters",
+          "documentation":"<p>MySQL parameters.</p>"
+        },
+        "PostgreSqlParameters":{
+          "shape":"PostgreSqlParameters",
+          "documentation":"<p>PostgreSQL parameters.</p>"
+        },
+        "PrestoParameters":{
+          "shape":"PrestoParameters",
+          "documentation":"<p>Presto parameters.</p>"
+        },
+        "RdsParameters":{
+          "shape":"RdsParameters",
+          "documentation":"<p>Amazon RDS parameters.</p>"
+        },
+        "RedshiftParameters":{
+          "shape":"RedshiftParameters",
+          "documentation":"<p>Amazon Redshift parameters.</p>"
+        },
+        "S3Parameters":{
+          "shape":"S3Parameters",
+          "documentation":"<p>S3 parameters.</p>"
+        },
+        "ServiceNowParameters":{
+          "shape":"ServiceNowParameters",
+          "documentation":"<p>ServiceNow parameters.</p>"
+        },
+        "SnowflakeParameters":{
+          "shape":"SnowflakeParameters",
+          "documentation":"<p>Snowflake parameters.</p>"
+        },
+        "SparkParameters":{
+          "shape":"SparkParameters",
+          "documentation":"<p>Spark parameters.</p>"
+        },
+        "SqlServerParameters":{
+          "shape":"SqlServerParameters",
+          "documentation":"<p>SQL Server parameters.</p>"
+        },
+        "TeradataParameters":{
+          "shape":"TeradataParameters",
+          "documentation":"<p>Teradata parameters.</p>"
+        },
+        "TwitterParameters":{
+          "shape":"TwitterParameters",
+          "documentation":"<p>Twitter parameters.</p>"
+        }
+      },
+      "documentation":"<p>The parameters that Amazon QuickSight uses to connect to your underlying data source. This is a variant type structure. For this structure to be valid, only one of the attributes can be non-null.</p>"
+    },
+    "DataSourceType":{
+      "type":"string",
+      "enum":[
+        "ADOBE_ANALYTICS",
+        "AMAZON_ELASTICSEARCH",
+        "ATHENA",
+        "AURORA",
+        "AURORA_POSTGRESQL",
+        "AWS_IOT_ANALYTICS",
+        "GITHUB",
+        "JIRA",
+        "MARIADB",
+        "MYSQL",
+        "POSTGRESQL",
+        "PRESTO",
+        "REDSHIFT",
+        "S3",
+        "SALESFORCE",
+        "SERVICENOW",
+        "SNOWFLAKE",
+        "SPARK",
+        "SQLSERVER",
+        "TERADATA",
+        "TWITTER"
+      ]
+    },
+    "Database":{
+      "type":"string",
+      "max":128,
+      "min":1
+    },
+    "DateTimeParameter":{
+      "type":"structure",
+      "required":[
+        "Name",
+        "Values"
+      ],
+      "members":{
+        "Name":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>A display name for the dataset.</p>"
+        },
+        "Values":{
+          "shape":"TimestampList",
+          "documentation":"<p>Values.</p>"
+        }
+      },
+      "documentation":"<p>Date time parameter.</p>"
+    },
+    "DateTimeParameterList":{
+      "type":"list",
+      "member":{"shape":"DateTimeParameter"},
+      "max":100
+    },
+    "DecimalParameter":{
+      "type":"structure",
+      "required":[
+        "Name",
+        "Values"
+      ],
+      "members":{
+        "Name":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>A display name for the dataset.</p>"
+        },
+        "Values":{
+          "shape":"DoubleList",
+          "documentation":"<p>Values.</p>"
+        }
+      },
+      "documentation":"<p>Decimal parameter.</p>"
+    },
+    "DecimalParameterList":{
+      "type":"list",
+      "member":{"shape":"DecimalParameter"},
+      "max":100
+    },
+    "DeleteDashboardRequest":{
+      "type":"structure",
+      "required":[
+        "AwsAccountId",
+        "DashboardId"
+      ],
+      "members":{
+        "AwsAccountId":{
+          "shape":"AwsAccountId",
+          "documentation":"<p>The ID of the AWS account that contains the dashboard that you're deleting.</p>",
+          "location":"uri",
+          "locationName":"AwsAccountId"
+        },
+        "DashboardId":{
+          "shape":"RestrictiveResourceId",
+          "documentation":"<p>The ID for the dashboard.</p>",
+          "location":"uri",
+          "locationName":"DashboardId"
+        },
+        "VersionNumber":{
+          "shape":"VersionNumber",
+          "documentation":"<p>The version number of the dashboard. If the version number property is provided, only the specified version of the dashboard is deleted.</p>",
+          "location":"querystring",
+          "locationName":"version-number"
+        }
+      }
+    },
+    "DeleteDashboardResponse":{
+      "type":"structure",
+      "members":{
+        "Status":{
+          "shape":"StatusCode",
+          "documentation":"<p>The HTTP status of the request.</p>",
+          "location":"statusCode"
+        },
+        "Arn":{
+          "shape":"Arn",
+          "documentation":"<p>The Secure Socket Layer (SSL) properties that apply for the resource.</p>"
+        },
+        "DashboardId":{
+          "shape":"RestrictiveResourceId",
+          "documentation":"<p>The ID of the dashboard.</p>"
+        },
+        "RequestId":{
+          "shape":"String",
+          "documentation":"<p>The AWS request ID for this operation.</p>"
+        }
+      }
+    },
+    "DeleteDataSetRequest":{
+      "type":"structure",
+      "required":[
+        "AwsAccountId",
+        "DataSetId"
+      ],
+      "members":{
+        "AwsAccountId":{
+          "shape":"AwsAccountId",
+          "documentation":"<p>The AWS account ID.</p>",
+          "location":"uri",
+          "locationName":"AwsAccountId"
+        },
+        "DataSetId":{
+          "shape":"ResourceId",
+          "documentation":"<p>The ID for the dataset that you want to create. This ID is unique per AWS Region for each AWS account.</p>",
+          "location":"uri",
+          "locationName":"DataSetId"
+        }
+      }
+    },
+    "DeleteDataSetResponse":{
+      "type":"structure",
+      "members":{
+        "Arn":{
+          "shape":"Arn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the dataset.</p>"
+        },
+        "DataSetId":{
+          "shape":"ResourceId",
+          "documentation":"<p>The ID for the dataset that you want to create. This ID is unique per AWS Region for each AWS account.</p>"
+        },
+        "RequestId":{
+          "shape":"String",
+          "documentation":"<p>The AWS request ID for this operation.</p>"
+        },
+        "Status":{
+          "shape":"StatusCode",
+          "documentation":"<p>The HTTP status of the request.</p>",
+          "location":"statusCode"
+        }
+      }
+    },
+    "DeleteDataSourceRequest":{
+      "type":"structure",
+      "required":[
+        "AwsAccountId",
+        "DataSourceId"
+      ],
+      "members":{
+        "AwsAccountId":{
+          "shape":"AwsAccountId",
+          "documentation":"<p>The AWS account ID.</p>",
+          "location":"uri",
+          "locationName":"AwsAccountId"
+        },
+        "DataSourceId":{
+          "shape":"ResourceId",
+          "documentation":"<p>The ID of the data source. This ID is unique per AWS Region for each AWS account.</p>",
+          "location":"uri",
+          "locationName":"DataSourceId"
+        }
+      }
+    },
+    "DeleteDataSourceResponse":{
+      "type":"structure",
+      "members":{
+        "Arn":{
+          "shape":"Arn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the data source that you deleted.</p>"
+        },
+        "DataSourceId":{
+          "shape":"ResourceId",
+          "documentation":"<p>The ID of the data source. This ID is unique per AWS Region for each AWS account.</p>"
+        },
+        "RequestId":{
+          "shape":"String",
+          "documentation":"<p>The AWS request ID for this operation.</p>"
+        },
+        "Status":{
+          "shape":"StatusCode",
+          "documentation":"<p>The HTTP status of the request.</p>",
+          "location":"statusCode"
+        }
+      }
+    },
+    "DeleteGroupMembershipRequest":{
+      "type":"structure",
+      "required":[
+        "MemberName",
+        "GroupName",
+        "AwsAccountId",
+        "Namespace"
+      ],
+      "members":{
+        "MemberName":{
+          "shape":"GroupMemberName",
+          "documentation":"<p>The name of the user that you want to delete from the group membership.</p>",
+          "location":"uri",
+          "locationName":"MemberName"
+        },
+        "GroupName":{
+          "shape":"GroupName",
+          "documentation":"<p>The name of the group that you want to delete the user from.</p>",
+          "location":"uri",
+          "locationName":"GroupName"
+        },
+        "AwsAccountId":{
+          "shape":"AwsAccountId",
+          "documentation":"<p>The ID for the AWS account that the group is in. Currently, you use the ID for the AWS account that contains your Amazon QuickSight account.</p>",
+          "location":"uri",
+          "locationName":"AwsAccountId"
+        },
+        "Namespace":{
+          "shape":"Namespace",
+          "documentation":"<p>The namespace. Currently, you should set this to <code>default</code>.</p>",
+          "location":"uri",
+          "locationName":"Namespace"
+        }
+      }
+    },
+    "DeleteGroupMembershipResponse":{
+      "type":"structure",
+      "members":{
+        "RequestId":{
+          "shape":"String",
+          "documentation":"<p>The AWS request ID for this operation.</p>"
+        },
+        "Status":{
+          "shape":"StatusCode",
+          "documentation":"<p>The HTTP status of the request.</p>",
+          "location":"statusCode"
+        }
+      }
+    },
+    "DeleteGroupRequest":{
+      "type":"structure",
+      "required":[
+        "GroupName",
+        "AwsAccountId",
+        "Namespace"
+      ],
+      "members":{
+        "GroupName":{
+          "shape":"GroupName",
+          "documentation":"<p>The name of the group that you want to delete.</p>",
+          "location":"uri",
+          "locationName":"GroupName"
+        },
+        "AwsAccountId":{
+          "shape":"AwsAccountId",
+          "documentation":"<p>The ID for the AWS account that the group is in. Currently, you use the ID for the AWS account that contains your Amazon QuickSight account.</p>",
+          "location":"uri",
+          "locationName":"AwsAccountId"
+        },
+        "Namespace":{
+          "shape":"Namespace",
+          "documentation":"<p>The namespace. Currently, you should set this to <code>default</code>.</p>",
+          "location":"uri",
+          "locationName":"Namespace"
+        }
+      }
+    },
+    "DeleteGroupResponse":{
+      "type":"structure",
+      "members":{
+        "RequestId":{
+          "shape":"String",
+          "documentation":"<p>The AWS request ID for this operation.</p>"
+        },
+        "Status":{
+          "shape":"StatusCode",
+          "documentation":"<p>The HTTP status of the request.</p>",
+          "location":"statusCode"
+        }
+      }
+    },
+    "DeleteIAMPolicyAssignmentRequest":{
+      "type":"structure",
+      "required":[
+        "AwsAccountId",
+        "AssignmentName",
+        "Namespace"
+      ],
+      "members":{
+        "AwsAccountId":{
+          "shape":"AwsAccountId",
+          "documentation":"<p>The AWS account ID where you want to delete the IAM policy assignment.</p>",
+          "location":"uri",
+          "locationName":"AwsAccountId"
+        },
+        "AssignmentName":{
+          "shape":"IAMPolicyAssignmentName",
+          "documentation":"<p>The name of the assignment. </p>",
+          "location":"uri",
+          "locationName":"AssignmentName"
+        },
+        "Namespace":{
+          "shape":"Namespace",
+          "documentation":"<p>The namespace that contains the assignment.</p>",
+          "location":"uri",
+          "locationName":"Namespace"
+        }
+      }
+    },
+    "DeleteIAMPolicyAssignmentResponse":{
+      "type":"structure",
+      "members":{
+        "AssignmentName":{
+          "shape":"IAMPolicyAssignmentName",
+          "documentation":"<p>The name of the assignment. </p>"
+        },
+        "RequestId":{
+          "shape":"String",
+          "documentation":"<p>The AWS request ID for this operation.</p>"
+        },
+        "Status":{
+          "shape":"StatusCode",
+          "documentation":"<p>The HTTP status of the request.</p>",
+          "location":"statusCode"
+        }
+      }
+    },
+    "DeleteTemplateAliasRequest":{
+      "type":"structure",
+      "required":[
+        "AwsAccountId",
+        "TemplateId",
+        "AliasName"
+      ],
+      "members":{
+        "AwsAccountId":{
+          "shape":"AwsAccountId",
+          "documentation":"<p>The ID of the AWS account that contains the item to delete.</p>",
+          "location":"uri",
+          "locationName":"AwsAccountId"
+        },
+        "TemplateId":{
+          "shape":"RestrictiveResourceId",
+          "documentation":"<p>The ID for the template that the specified alias is for.</p>",
+          "location":"uri",
+          "locationName":"TemplateId"
+        },
+        "AliasName":{
+          "shape":"AliasName",
+          "documentation":"<p>The name for the template alias. If you name a specific alias, you delete the version that the alias points to. You can specify the latest version of the template by providing the keyword <code>$LATEST</code> in the <code>AliasName</code> parameter. </p>",
+          "location":"uri",
+          "locationName":"AliasName"
+        }
+      }
+    },
+    "DeleteTemplateAliasResponse":{
+      "type":"structure",
+      "members":{
+        "Status":{
+          "shape":"StatusCode",
+          "documentation":"<p>The HTTP status of the request.</p>",
+          "location":"statusCode"
+        },
+        "TemplateId":{
+          "shape":"RestrictiveResourceId",
+          "documentation":"<p>An ID for the template associated with the deletion.</p>"
+        },
+        "AliasName":{
+          "shape":"AliasName",
+          "documentation":"<p>The name for the template alias.</p>"
+        },
+        "Arn":{
+          "shape":"Arn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the resource.</p>"
+        },
+        "RequestId":{
+          "shape":"String",
+          "documentation":"<p>The AWS request ID for this operation.</p>"
+        }
+      }
+    },
+    "DeleteTemplateRequest":{
+      "type":"structure",
+      "required":[
+        "AwsAccountId",
+        "TemplateId"
+      ],
+      "members":{
+        "AwsAccountId":{
+          "shape":"AwsAccountId",
+          "documentation":"<p>The ID of the AWS account that contains the template that you're deleting.</p>",
+          "location":"uri",
+          "locationName":"AwsAccountId"
+        },
+        "TemplateId":{
+          "shape":"RestrictiveResourceId",
+          "documentation":"<p>An ID for the template you want to delete.</p>",
+          "location":"uri",
+          "locationName":"TemplateId"
+        },
+        "VersionNumber":{
+          "shape":"VersionNumber",
+          "documentation":"<p>Specifies the version of the template that you want to delete. If you don't provide a version number, <code>DeleteTemplate</code> deletes all versions of the template. </p>",
+          "location":"querystring",
+          "locationName":"version-number"
+        }
+      }
+    },
+    "DeleteTemplateResponse":{
+      "type":"structure",
+      "members":{
+        "RequestId":{
+          "shape":"String",
+          "documentation":"<p>The AWS request ID for this operation.</p>"
+        },
+        "Arn":{
+          "shape":"Arn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the resource.</p>"
+        },
+        "TemplateId":{
+          "shape":"RestrictiveResourceId",
+          "documentation":"<p>An ID for the template.</p>"
+        },
+        "Status":{
+          "shape":"StatusCode",
+          "documentation":"<p>The HTTP status of the request.</p>",
+          "location":"statusCode"
+        }
+      }
+    },
+    "DeleteUserByPrincipalIdRequest":{
+      "type":"structure",
+      "required":[
+        "PrincipalId",
+        "AwsAccountId",
+        "Namespace"
+      ],
+      "members":{
+        "PrincipalId":{
+          "shape":"String",
+          "documentation":"<p>The principal ID of the user.</p>",
+          "location":"uri",
+          "locationName":"PrincipalId"
+        },
+        "AwsAccountId":{
+          "shape":"AwsAccountId",
+          "documentation":"<p>The ID for the AWS account that the user is in. Currently, you use the ID for the AWS account that contains your Amazon QuickSight account.</p>",
+          "location":"uri",
+          "locationName":"AwsAccountId"
+        },
+        "Namespace":{
+          "shape":"Namespace",
+          "documentation":"<p>The namespace. Currently, you should set this to <code>default</code>.</p>",
+          "location":"uri",
+          "locationName":"Namespace"
+        }
+      },
+      "documentation":"<p/>"
+    },
+    "DeleteUserByPrincipalIdResponse":{
+      "type":"structure",
+      "members":{
+        "RequestId":{
+          "shape":"String",
+          "documentation":"<p>The AWS request ID for this operation.</p>"
+        },
+        "Status":{
+          "shape":"StatusCode",
+          "documentation":"<p>The HTTP status of the request.</p>",
+          "location":"statusCode"
+        }
+      }
+    },
+    "DeleteUserRequest":{
+      "type":"structure",
+      "required":[
+        "UserName",
+        "AwsAccountId",
+        "Namespace"
+      ],
+      "members":{
+        "UserName":{
+          "shape":"UserName",
+          "documentation":"<p>The name of the user that you want to delete.</p>",
+          "location":"uri",
+          "locationName":"UserName"
+        },
+        "AwsAccountId":{
+          "shape":"AwsAccountId",
+          "documentation":"<p>The ID for the AWS account that the user is in. Currently, you use the ID for the AWS account that contains your Amazon QuickSight account.</p>",
+          "location":"uri",
+          "locationName":"AwsAccountId"
+        },
+        "Namespace":{
+          "shape":"Namespace",
+          "documentation":"<p>The namespace. Currently, you should set this to <code>default</code>.</p>",
+          "location":"uri",
+          "locationName":"Namespace"
+        }
+      }
+    },
+    "DeleteUserResponse":{
+      "type":"structure",
+      "members":{
+        "RequestId":{
+          "shape":"String",
+          "documentation":"<p>The AWS request ID for this operation.</p>"
+        },
+        "Status":{
+          "shape":"StatusCode",
+          "documentation":"<p>The HTTP status of the request.</p>",
+          "location":"statusCode"
+        }
+      }
+    },
+    "Delimiter":{
+      "type":"string",
+      "max":1,
+      "min":1
+    },
+    "DescribeDashboardPermissionsRequest":{
+      "type":"structure",
+      "required":[
+        "AwsAccountId",
+        "DashboardId"
+      ],
+      "members":{
+        "AwsAccountId":{
+          "shape":"AwsAccountId",
+          "documentation":"<p>The ID of the AWS account that contains the dashboard that you're describing permissions for.</p>",
+          "location":"uri",
+          "locationName":"AwsAccountId"
+        },
+        "DashboardId":{
+          "shape":"RestrictiveResourceId",
+          "documentation":"<p>The ID for the dashboard, also added to the IAM policy.</p>",
+          "location":"uri",
+          "locationName":"DashboardId"
+        }
+      }
+    },
+    "DescribeDashboardPermissionsResponse":{
+      "type":"structure",
+      "members":{
+        "DashboardId":{
+          "shape":"RestrictiveResourceId",
+          "documentation":"<p>The ID for the dashboard.</p>"
+        },
+        "DashboardArn":{
+          "shape":"Arn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the dashboard.</p>"
+        },
+        "Permissions":{
+          "shape":"ResourcePermissionList",
+          "documentation":"<p>A structure that contains the permissions for the dashboard.</p>"
+        },
+        "Status":{
+          "shape":"StatusCode",
+          "documentation":"<p>The HTTP status of the request.</p>",
+          "location":"statusCode"
+        },
+        "RequestId":{
+          "shape":"String",
+          "documentation":"<p>The AWS request ID for this operation.</p>"
+        }
+      }
+    },
+    "DescribeDashboardRequest":{
+      "type":"structure",
+      "required":[
+        "AwsAccountId",
+        "DashboardId"
+      ],
+      "members":{
+        "AwsAccountId":{
+          "shape":"AwsAccountId",
+          "documentation":"<p>The ID of the AWS account that contains the dashboard that you're describing.</p>",
+          "location":"uri",
+          "locationName":"AwsAccountId"
+        },
+        "DashboardId":{
+          "shape":"RestrictiveResourceId",
+          "documentation":"<p>The ID for the dashboard.</p>",
+          "location":"uri",
+          "locationName":"DashboardId"
+        },
+        "VersionNumber":{
+          "shape":"VersionNumber",
+          "documentation":"<p>The version number for the dashboard. If a version number isn't passed, the latest published dashboard version is described. </p>",
+          "location":"querystring",
+          "locationName":"version-number"
+        },
+        "AliasName":{
+          "shape":"AliasName",
+          "documentation":"<p>The alias name.</p>",
+          "location":"querystring",
+          "locationName":"alias-name"
+        }
+      }
+    },
+    "DescribeDashboardResponse":{
+      "type":"structure",
+      "members":{
+        "Dashboard":{
+          "shape":"Dashboard",
+          "documentation":"<p>Information about the dashboard.</p>"
+        },
+        "Status":{
+          "shape":"StatusCode",
+          "documentation":"<p>The HTTP status of this request.</p>",
+          "location":"statusCode"
+        },
+        "RequestId":{
+          "shape":"String",
+          "documentation":"<p>The AWS request ID for this operation.</p>"
+        }
+      }
+    },
+    "DescribeDataSetPermissionsRequest":{
+      "type":"structure",
+      "required":[
+        "AwsAccountId",
+        "DataSetId"
+      ],
+      "members":{
+        "AwsAccountId":{
+          "shape":"AwsAccountId",
+          "documentation":"<p>The AWS account ID.</p>",
+          "location":"uri",
+          "locationName":"AwsAccountId"
+        },
+        "DataSetId":{
+          "shape":"ResourceId",
+          "documentation":"<p>The ID for the dataset that you want to create. This ID is unique per AWS Region for each AWS account.</p>",
+          "location":"uri",
+          "locationName":"DataSetId"
+        }
+      }
+    },
+    "DescribeDataSetPermissionsResponse":{
+      "type":"structure",
+      "members":{
+        "DataSetArn":{
+          "shape":"Arn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the dataset.</p>"
+        },
+        "DataSetId":{
+          "shape":"ResourceId",
+          "documentation":"<p>The ID for the dataset that you want to create. This ID is unique per AWS Region for each AWS account.</p>"
+        },
+        "Permissions":{
+          "shape":"ResourcePermissionList",
+          "documentation":"<p>A list of resource permissions on the dataset.</p>"
+        },
+        "RequestId":{
+          "shape":"String",
+          "documentation":"<p>The AWS request ID for this operation.</p>"
+        },
+        "Status":{
+          "shape":"StatusCode",
+          "documentation":"<p>The HTTP status of the request.</p>",
+          "location":"statusCode"
+        }
+      }
+    },
+    "DescribeDataSetRequest":{
+      "type":"structure",
+      "required":[
+        "AwsAccountId",
+        "DataSetId"
+      ],
+      "members":{
+        "AwsAccountId":{
+          "shape":"AwsAccountId",
+          "documentation":"<p>The AWS account ID.</p>",
+          "location":"uri",
+          "locationName":"AwsAccountId"
+        },
+        "DataSetId":{
+          "shape":"ResourceId",
+          "documentation":"<p>The ID for the dataset that you want to create. This ID is unique per AWS Region for each AWS account.</p>",
+          "location":"uri",
+          "locationName":"DataSetId"
+        }
+      }
+    },
+    "DescribeDataSetResponse":{
+      "type":"structure",
+      "members":{
+        "DataSet":{
+          "shape":"DataSet",
+          "documentation":"<p>Information on the dataset.</p>"
+        },
+        "RequestId":{
+          "shape":"String",
+          "documentation":"<p>The AWS request ID for this operation.</p>"
+        },
+        "Status":{
+          "shape":"StatusCode",
+          "documentation":"<p>The HTTP status of the request.</p>",
+          "location":"statusCode"
+        }
+      }
+    },
+    "DescribeDataSourcePermissionsRequest":{
+      "type":"structure",
+      "required":[
+        "AwsAccountId",
+        "DataSourceId"
+      ],
+      "members":{
+        "AwsAccountId":{
+          "shape":"AwsAccountId",
+          "documentation":"<p>The AWS account ID.</p>",
+          "location":"uri",
+          "locationName":"AwsAccountId"
+        },
+        "DataSourceId":{
+          "shape":"ResourceId",
+          "documentation":"<p>The ID of the data source. This ID is unique per AWS Region for each AWS account.</p>",
+          "location":"uri",
+          "locationName":"DataSourceId"
+        }
+      }
+    },
+    "DescribeDataSourcePermissionsResponse":{
+      "type":"structure",
+      "members":{
+        "DataSourceArn":{
+          "shape":"Arn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the data source.</p>"
+        },
+        "DataSourceId":{
+          "shape":"ResourceId",
+          "documentation":"<p>The ID of the data source. This ID is unique per AWS Region for each AWS account.</p>"
+        },
+        "Permissions":{
+          "shape":"ResourcePermissionList",
+          "documentation":"<p>A list of resource permissions on the data source.</p>"
+        },
+        "RequestId":{
+          "shape":"String",
+          "documentation":"<p>The AWS request ID for this operation.</p>"
+        },
+        "Status":{
+          "shape":"StatusCode",
+          "documentation":"<p>The HTTP status of the request.</p>",
+          "location":"statusCode"
+        }
+      }
+    },
+    "DescribeDataSourceRequest":{
+      "type":"structure",
+      "required":[
+        "AwsAccountId",
+        "DataSourceId"
+      ],
+      "members":{
+        "AwsAccountId":{
+          "shape":"AwsAccountId",
+          "documentation":"<p>The AWS account ID.</p>",
+          "location":"uri",
+          "locationName":"AwsAccountId"
+        },
+        "DataSourceId":{
+          "shape":"ResourceId",
+          "documentation":"<p>The ID of the data source. This ID is unique per AWS Region for each AWS account.</p>",
+          "location":"uri",
+          "locationName":"DataSourceId"
+        }
+      }
+    },
+    "DescribeDataSourceResponse":{
+      "type":"structure",
+      "members":{
+        "DataSource":{
+          "shape":"DataSource",
+          "documentation":"<p>The information on the data source.</p>"
+        },
+        "RequestId":{
+          "shape":"String",
+          "documentation":"<p>The AWS request ID for this operation.</p>"
+        },
+        "Status":{
+          "shape":"StatusCode",
+          "documentation":"<p>The HTTP status of the request.</p>",
+          "location":"statusCode"
+        }
+      }
+    },
+    "DescribeGroupRequest":{
+      "type":"structure",
+      "required":[
+        "GroupName",
+        "AwsAccountId",
+        "Namespace"
+      ],
+      "members":{
+        "GroupName":{
+          "shape":"GroupName",
+          "documentation":"<p>The name of the group that you want to describe.</p>",
+          "location":"uri",
+          "locationName":"GroupName"
+        },
+        "AwsAccountId":{
+          "shape":"AwsAccountId",
+          "documentation":"<p>The ID for the AWS account that the group is in. Currently, you use the ID for the AWS account that contains your Amazon QuickSight account.</p>",
+          "location":"uri",
+          "locationName":"AwsAccountId"
+        },
+        "Namespace":{
+          "shape":"Namespace",
+          "documentation":"<p>The namespace. Currently, you should set this to <code>default</code>.</p>",
+          "location":"uri",
+          "locationName":"Namespace"
+        }
+      }
+    },
+    "DescribeGroupResponse":{
+      "type":"structure",
+      "members":{
+        "Group":{
+          "shape":"Group",
+          "documentation":"<p>The name of the group.</p>"
+        },
+        "RequestId":{
+          "shape":"String",
+          "documentation":"<p>The AWS request ID for this operation.</p>"
+        },
+        "Status":{
+          "shape":"StatusCode",
+          "documentation":"<p>The HTTP status of the request.</p>",
+          "location":"statusCode"
+        }
+      }
+    },
+    "DescribeIAMPolicyAssignmentRequest":{
+      "type":"structure",
+      "required":[
+        "AwsAccountId",
+        "AssignmentName",
+        "Namespace"
+      ],
+      "members":{
+        "AwsAccountId":{
+          "shape":"AwsAccountId",
+          "documentation":"<p>The ID of the AWS account that contains the assignment that you want to describe.</p>",
+          "location":"uri",
+          "locationName":"AwsAccountId"
+        },
+        "AssignmentName":{
+          "shape":"IAMPolicyAssignmentName",
+          "documentation":"<p>The name of the assignment. </p>",
+          "location":"uri",
+          "locationName":"AssignmentName"
+        },
+        "Namespace":{
+          "shape":"Namespace",
+          "documentation":"<p>The namespace that contains the assignment.</p>",
+          "location":"uri",
+          "locationName":"Namespace"
+        }
+      }
+    },
+    "DescribeIAMPolicyAssignmentResponse":{
+      "type":"structure",
+      "members":{
+        "IAMPolicyAssignment":{
+          "shape":"IAMPolicyAssignment",
+          "documentation":"<p>Information describing the IAM policy assignment.</p>"
+        },
+        "RequestId":{
+          "shape":"String",
+          "documentation":"<p>The AWS request ID for this operation.</p>"
+        },
+        "Status":{
+          "shape":"StatusCode",
+          "documentation":"<p>The HTTP status of the request.</p>",
+          "location":"statusCode"
+        }
+      }
+    },
+    "DescribeIngestionRequest":{
+      "type":"structure",
+      "required":[
+        "AwsAccountId",
+        "DataSetId",
+        "IngestionId"
+      ],
+      "members":{
+        "AwsAccountId":{
+          "shape":"AwsAccountId",
+          "documentation":"<p>The AWS account ID.</p>",
+          "location":"uri",
+          "locationName":"AwsAccountId"
+        },
+        "DataSetId":{
+          "shape":"string",
+          "documentation":"<p>The ID of the dataset used in the ingestion.</p>",
+          "location":"uri",
+          "locationName":"DataSetId"
+        },
+        "IngestionId":{
+          "shape":"IngestionId",
+          "documentation":"<p>An ID for the ingestion.</p>",
+          "location":"uri",
+          "locationName":"IngestionId"
+        }
+      }
+    },
+    "DescribeIngestionResponse":{
+      "type":"structure",
+      "members":{
+        "Ingestion":{
+          "shape":"Ingestion",
+          "documentation":"<p>Information about the ingestion.</p>"
+        },
+        "RequestId":{
+          "shape":"string",
+          "documentation":"<p>The AWS request ID for this operation.</p>"
+        },
+        "Status":{
+          "shape":"StatusCode",
+          "documentation":"<p>The HTTP status of the request.</p>",
+          "location":"statusCode"
+        }
+      }
+    },
+    "DescribeTemplateAliasRequest":{
+      "type":"structure",
+      "required":[
+        "AwsAccountId",
+        "TemplateId",
+        "AliasName"
+      ],
+      "members":{
+        "AwsAccountId":{
+          "shape":"AwsAccountId",
+          "documentation":"<p>The ID of the AWS account that contains the template alias that you're describing.</p>",
+          "location":"uri",
+          "locationName":"AwsAccountId"
+        },
+        "TemplateId":{
+          "shape":"RestrictiveResourceId",
+          "documentation":"<p>The ID for the template.</p>",
+          "location":"uri",
+          "locationName":"TemplateId"
+        },
+        "AliasName":{
+          "shape":"AliasName",
+          "documentation":"<p>The name of the template alias that you want to describe. If you name a specific alias, you describe the version that the alias points to. You can specify the latest version of the template by providing the keyword <code>$LATEST</code> in the <code>AliasName</code> parameter. The keyword <code>$PUBLISHED</code> doesn't apply to templates.</p>",
+          "location":"uri",
+          "locationName":"AliasName"
+        }
+      }
+    },
+    "DescribeTemplateAliasResponse":{
+      "type":"structure",
+      "members":{
+        "TemplateAlias":{
+          "shape":"TemplateAlias",
+          "documentation":"<p>Information about the template alias.</p>"
+        },
+        "Status":{
+          "shape":"StatusCode",
+          "documentation":"<p>The HTTP status of the request.</p>",
+          "location":"statusCode"
+        },
+        "RequestId":{
+          "shape":"String",
+          "documentation":"<p>The AWS request ID for this operation.</p>"
+        }
+      }
+    },
+    "DescribeTemplatePermissionsRequest":{
+      "type":"structure",
+      "required":[
+        "AwsAccountId",
+        "TemplateId"
+      ],
+      "members":{
+        "AwsAccountId":{
+          "shape":"AwsAccountId",
+          "documentation":"<p>The ID of the AWS account that contains the template that you're describing.</p>",
+          "location":"uri",
+          "locationName":"AwsAccountId"
+        },
+        "TemplateId":{
+          "shape":"RestrictiveResourceId",
+          "documentation":"<p>The ID for the template.</p>",
+          "location":"uri",
+          "locationName":"TemplateId"
+        }
+      }
+    },
+    "DescribeTemplatePermissionsResponse":{
+      "type":"structure",
+      "members":{
+        "TemplateId":{
+          "shape":"RestrictiveResourceId",
+          "documentation":"<p>The ID for the template.</p>"
+        },
+        "TemplateArn":{
+          "shape":"Arn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the template.</p>"
+        },
+        "Permissions":{
+          "shape":"ResourcePermissionList",
+          "documentation":"<p>A list of resource permissions to be set on the template. </p>"
+        },
+        "RequestId":{
+          "shape":"String",
+          "documentation":"<p>The AWS request ID for this operation.</p>"
+        },
+        "Status":{
+          "shape":"StatusCode",
+          "documentation":"<p>The HTTP status of the request.</p>",
+          "location":"statusCode"
+        }
+      }
+    },
+    "DescribeTemplateRequest":{
+      "type":"structure",
+      "required":[
+        "AwsAccountId",
+        "TemplateId"
+      ],
+      "members":{
+        "AwsAccountId":{
+          "shape":"AwsAccountId",
+          "documentation":"<p>The ID of the AWS account that contains the template that you're describing.</p>",
+          "location":"uri",
+          "locationName":"AwsAccountId"
+        },
+        "TemplateId":{
+          "shape":"RestrictiveResourceId",
+          "documentation":"<p>The ID for the template.</p>",
+          "location":"uri",
+          "locationName":"TemplateId"
+        },
+        "VersionNumber":{
+          "shape":"VersionNumber",
+          "documentation":"<p>(Optional) The number for the version to describe. If a <code>VersionNumber</code> parameter value isn't provided, the latest version of the template is described.</p>",
+          "location":"querystring",
+          "locationName":"version-number"
+        },
+        "AliasName":{
+          "shape":"AliasName",
+          "documentation":"<p>The alias of the template that you want to describe. If you name a specific alias, you describe the version that the alias points to. You can specify the latest version of the template by providing the keyword <code>$LATEST</code> in the <code>AliasName</code> parameter. The keyword <code>$PUBLISHED</code> doesn't apply to templates.</p>",
+          "location":"querystring",
+          "locationName":"alias-name"
+        }
+      }
+    },
+    "DescribeTemplateResponse":{
+      "type":"structure",
+      "members":{
+        "Template":{
+          "shape":"Template",
+          "documentation":"<p>The template structure for the object you want to describe.</p>"
+        },
+        "Status":{
+          "shape":"StatusCode",
+          "documentation":"<p>The HTTP status of the request.</p>",
+          "location":"statusCode"
+        }
+      }
+    },
+    "DescribeUserRequest":{
+      "type":"structure",
+      "required":[
+        "UserName",
+        "AwsAccountId",
+        "Namespace"
+      ],
+      "members":{
+        "UserName":{
+          "shape":"UserName",
+          "documentation":"<p>The name of the user that you want to describe.</p>",
+          "location":"uri",
+          "locationName":"UserName"
+        },
+        "AwsAccountId":{
+          "shape":"AwsAccountId",
+          "documentation":"<p>The ID for the AWS account that the user is in. Currently, you use the ID for the AWS account that contains your Amazon QuickSight account.</p>",
+          "location":"uri",
+          "locationName":"AwsAccountId"
+        },
+        "Namespace":{
+          "shape":"Namespace",
+          "documentation":"<p>The namespace. Currently, you should set this to <code>default</code>.</p>",
+          "location":"uri",
+          "locationName":"Namespace"
+        }
+      }
+    },
+    "DescribeUserResponse":{
+      "type":"structure",
+      "members":{
+        "User":{
+          "shape":"User",
+          "documentation":"<p>The user name.</p>"
+        },
+        "RequestId":{
+          "shape":"String",
+          "documentation":"<p>The AWS request ID for this operation.</p>"
+        },
+        "Status":{
+          "shape":"StatusCode",
+          "documentation":"<p>The HTTP status of the request.</p>",
+          "location":"statusCode"
+        }
+      }
+    },
+    "Domain":{
+      "type":"string",
+      "max":64,
+      "min":1
+    },
+    "DomainNotWhitelistedException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"String"},
+        "RequestId":{
+          "shape":"String",
+          "documentation":"<p>The AWS request ID for this request.</p>"
+        }
+      },
+      "documentation":"<p>The domain specified isn't on the allow list. All domains for embedded dashboards must be added to the approved list by an Amazon QuickSight admin.</p>",
+      "error":{"httpStatusCode":403},
+      "exception":true
+    },
+    "Double":{"type":"double"},
+    "DoubleList":{
+      "type":"list",
+      "member":{"shape":"Double"}
+    },
+    "EmbeddingUrl":{
+      "type":"string",
+      "sensitive":true
+    },
+    "ErrorInfo":{
+      "type":"structure",
+      "members":{
+        "Type":{
+          "shape":"IngestionErrorType",
+          "documentation":"<p>Error type.</p>"
+        },
+        "Message":{
+          "shape":"string",
+          "documentation":"<p>Error message.</p>"
+        }
+      },
+      "documentation":"<p>Error information for the SPICE ingestion of a dataset.</p>"
+    },
+    "ExceptionResourceType":{
+      "type":"string",
+      "enum":[
+        "USER",
+        "GROUP",
+        "NAMESPACE",
+        "ACCOUNT_SETTINGS",
+        "IAMPOLICY_ASSIGNMENT",
+        "DATA_SOURCE",
+        "DATA_SET",
+        "VPC_CONNECTION",
+        "INGESTION"
+      ]
+    },
+    "ExportToCSVOption":{
+      "type":"structure",
+      "members":{
+        "AvailabilityStatus":{
+          "shape":"DashboardBehavior",
+          "documentation":"<p>Availability status.</p>"
+        }
+      },
+      "documentation":"<p>Export to .csv option.</p>"
+    },
+    "Expression":{
+      "type":"string",
+      "max":4096,
+      "min":1
+    },
+    "FileFormat":{
+      "type":"string",
+      "enum":[
+        "CSV",
+        "TSV",
+        "CLF",
+        "ELF",
+        "XLSX",
+        "JSON"
+      ]
+    },
+    "FilterOperation":{
+      "type":"structure",
+      "required":["ConditionExpression"],
+      "members":{
+        "ConditionExpression":{
+          "shape":"Expression",
+          "documentation":"<p>An expression that must evaluate to a Boolean value. Rows for which the expression evaluates to true are kept in the dataset.</p>"
+        }
+      },
+      "documentation":"<p>A transform operation that filters rows based on a condition.</p>"
+    },
+    "FilterOperator":{
+      "type":"string",
+      "enum":["StringEquals"]
+    },
+    "GeoSpatialColumnGroup":{
+      "type":"structure",
+      "required":[
+        "Name",
+        "CountryCode",
+        "Columns"
+      ],
+      "members":{
+        "Name":{
+          "shape":"ColumnGroupName",
+          "documentation":"<p>A display name for the hierarchy.</p>"
+        },
+        "CountryCode":{
+          "shape":"GeoSpatialCountryCode",
+          "documentation":"<p>Country code.</p>"
+        },
+        "Columns":{
+          "shape":"ColumnList",
+          "documentation":"<p>Columns in this hierarchy.</p>"
+        }
+      },
+      "documentation":"<p>Geospatial column group that denotes a hierarchy.</p>"
+    },
+    "GeoSpatialCountryCode":{
+      "type":"string",
+      "enum":["US"]
+    },
+    "GeoSpatialDataRole":{
+      "type":"string",
+      "enum":[
+        "COUNTRY",
+        "STATE",
+        "COUNTY",
+        "CITY",
+        "POSTCODE",
+        "LONGITUDE",
+        "LATITUDE"
+      ]
+    },
+    "GetDashboardEmbedUrlRequest":{
+      "type":"structure",
+      "required":[
+        "AwsAccountId",
+        "DashboardId",
+        "IdentityType"
+      ],
+      "members":{
+        "AwsAccountId":{
+          "shape":"AwsAccountId",
+          "documentation":"<p>The ID for the AWS account that contains the dashboard that you're embedding.</p>",
+          "location":"uri",
+          "locationName":"AwsAccountId"
+        },
+        "DashboardId":{
+          "shape":"RestrictiveResourceId",
+          "documentation":"<p>The ID for the dashboard, also added to the IAM policy.</p>",
+          "location":"uri",
+          "locationName":"DashboardId"
+        },
+        "IdentityType":{
+          "shape":"IdentityType",
+          "documentation":"<p>The authentication method that the user uses to sign in.</p>",
+          "location":"querystring",
+          "locationName":"creds-type"
+        },
+        "SessionLifetimeInMinutes":{
+          "shape":"SessionLifetimeInMinutes",
+          "documentation":"<p>How many minutes the session is valid. The session lifetime must be 15-600 minutes.</p>",
+          "location":"querystring",
+          "locationName":"session-lifetime"
+        },
+        "UndoRedoDisabled":{
+          "shape":"boolean",
+          "documentation":"<p>Remove the undo/redo button on the embedded dashboard. The default is FALSE, which enables the undo/redo button.</p>",
+          "location":"querystring",
+          "locationName":"undo-redo-disabled"
+        },
+        "ResetDisabled":{
+          "shape":"boolean",
+          "documentation":"<p>Remove the reset button on the embedded dashboard. The default is FALSE, which enables the reset button.</p>",
+          "location":"querystring",
+          "locationName":"reset-disabled"
+        },
+        "UserArn":{
+          "shape":"Arn",
+          "documentation":"<p>The Amazon QuickSight user's Amazon Resource Name (ARN), for use with <code>QUICKSIGHT</code> identity type. You can use this for any Amazon QuickSight users in your account (readers, authors, or admins) authenticated as one of the following:</p> <ul> <li> <p>Active Directory (AD) users or group members</p> </li> <li> <p>Invited nonfederated users</p> </li> <li> <p>IAM users and IAM role-based sessions authenticated through Federated Single Sign-On using SAML, OpenID Connect, or IAM federation.</p> </li> </ul>",
+          "location":"querystring",
+          "locationName":"user-arn"
+        }
+      }
+    },
+    "GetDashboardEmbedUrlResponse":{
+      "type":"structure",
+      "members":{
+        "EmbedUrl":{
+          "shape":"EmbeddingUrl",
+          "documentation":"<p>An URL that you can put into your server-side webpage to embed your dashboard. This URL is valid for 5 minutes, and the resulting session is valid for 10 hours. The API provides the URL with an <code>auth_code</code> value that enables a single sign-on session. </p>"
+        },
+        "Status":{
+          "shape":"StatusCode",
+          "documentation":"<p>The HTTP status of the request.</p>",
+          "location":"statusCode"
+        },
+        "RequestId":{
+          "shape":"String",
+          "documentation":"<p>The AWS request ID for this operation.</p>"
+        }
+      }
+    },
+    "Group":{
+      "type":"structure",
+      "members":{
+        "Arn":{
+          "shape":"Arn",
+          "documentation":"<p>The Amazon Resource Name (ARN) for the group.</p>"
+        },
+        "GroupName":{
+          "shape":"GroupName",
+          "documentation":"<p>The name of the group.</p>"
+        },
+        "Description":{
+          "shape":"GroupDescription",
+          "documentation":"<p>The group description.</p>"
+        },
+        "PrincipalId":{
+          "shape":"String",
+          "documentation":"<p>The principal ID of the group.</p>"
+        }
+      },
+      "documentation":"<p>A <i>group</i> in Amazon QuickSight consists of a set of users. You can use groups to make it easier to manage access and security. Currently, an Amazon QuickSight subscription can't contain more than 500 Amazon QuickSight groups.</p>"
+    },
+    "GroupDescription":{
+      "type":"string",
+      "max":512,
+      "min":1
+    },
+    "GroupList":{
+      "type":"list",
+      "member":{"shape":"Group"}
+    },
+    "GroupMember":{
+      "type":"structure",
+      "members":{
+        "Arn":{
+          "shape":"Arn",
+          "documentation":"<p>The Amazon Resource Name (ARN) for the group member (user).</p>"
+        },
+        "MemberName":{
+          "shape":"GroupMemberName",
+          "documentation":"<p>The name of the group member (user).</p>"
+        }
+      },
+      "documentation":"<p>A member of an Amazon QuickSight group. Currently, group members must be users. Groups can't be members of another group. .</p>"
+    },
+    "GroupMemberList":{
+      "type":"list",
+      "member":{"shape":"GroupMember"}
+    },
+    "GroupMemberName":{
+      "type":"string",
+      "max":256,
+      "min":1,
+      "pattern":"[\\u0020-\\u00FF]+"
+    },
+    "GroupName":{
+      "type":"string",
+      "min":1,
+      "pattern":"[\\u0020-\\u00FF]+"
+    },
+    "Host":{
+      "type":"string",
+      "max":256,
+      "min":1
+    },
+    "IAMPolicyAssignment":{
+      "type":"structure",
+      "members":{
+        "AwsAccountId":{
+          "shape":"AwsAccountId",
+          "documentation":"<p>The AWS account ID.</p>"
+        },
+        "AssignmentId":{
+          "shape":"String",
+          "documentation":"<p>Assignment ID.</p>"
+        },
+        "AssignmentName":{
+          "shape":"IAMPolicyAssignmentName",
+          "documentation":"<p>Assignment name.</p>"
+        },
+        "PolicyArn":{
+          "shape":"Arn",
+          "documentation":"<p>The Amazon Resource Name (ARN) for the IAM policy.</p>"
+        },
+        "Identities":{
+          "shape":"IdentityMap",
+          "documentation":"<p>Identities.</p>"
+        },
+        "AssignmentStatus":{
+          "shape":"AssignmentStatus",
+          "documentation":"<p>Assignment status.</p>"
+        }
+      },
+      "documentation":"<p>An IAM policy assignment.</p>"
+    },
+    "IAMPolicyAssignmentName":{
+      "type":"string",
+      "min":1,
+      "pattern":"(?=^.{2,256}$)(?!.*\\s)[0-9a-zA-Z-_.:=+@]*$"
+    },
+    "IAMPolicyAssignmentSummary":{
+      "type":"structure",
+      "members":{
+        "AssignmentName":{
+          "shape":"IAMPolicyAssignmentName",
+          "documentation":"<p>Assignment name.</p>"
+        },
+        "AssignmentStatus":{
+          "shape":"AssignmentStatus",
+          "documentation":"<p>Assignment status.</p>"
+        }
+      },
+      "documentation":"<p>IAM policy assignment summary.</p>"
+    },
+    "IAMPolicyAssignmentSummaryList":{
+      "type":"list",
+      "member":{"shape":"IAMPolicyAssignmentSummary"}
+    },
+    "IdentityMap":{
+      "type":"map",
+      "key":{"shape":"String"},
+      "value":{"shape":"IdentityNameList"}
+    },
+    "IdentityName":{
+      "type":"string",
+      "min":1,
+      "pattern":"[\\u0020-\\u00FF]+"
+    },
+    "IdentityNameList":{
+      "type":"list",
+      "member":{"shape":"IdentityName"}
+    },
+    "IdentityType":{
+      "type":"string",
+      "enum":[
+        "IAM",
+        "QUICKSIGHT"
+      ]
+    },
+    "IdentityTypeNotSupportedException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"String"},
+        "RequestId":{
+          "shape":"String",
+          "documentation":"<p>The AWS request ID for this request.</p>"
+        }
+      },
+      "documentation":"<p>The identity type specified isn't supported. Supported identity types include <code>IAM</code> and <code>QUICKSIGHT</code>.</p>",
+      "error":{"httpStatusCode":403},
+      "exception":true
+    },
+    "Ingestion":{
+      "type":"structure",
+      "required":[
+        "Arn",
+        "IngestionStatus",
+        "CreatedTime"
+      ],
+      "members":{
+        "Arn":{
+          "shape":"Arn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the resource.</p>"
+        },
+        "IngestionId":{
+          "shape":"IngestionId",
+          "documentation":"<p>Ingestion ID.</p>"
+        },
+        "IngestionStatus":{
+          "shape":"IngestionStatus",
+          "documentation":"<p>Ingestion status.</p>"
+        },
+        "ErrorInfo":{
+          "shape":"ErrorInfo",
+          "documentation":"<p>Error information for this ingestion.</p>"
+        },
+        "RowInfo":{"shape":"RowInfo"},
+        "QueueInfo":{"shape":"QueueInfo"},
+        "CreatedTime":{
+          "shape":"timestamp",
+          "documentation":"<p>The time that this ingestion started.</p>"
+        },
+        "IngestionTimeInSeconds":{
+          "shape":"long",
+          "documentation":"<p>The time that this ingestion took, measured in seconds.</p>",
+          "box":true
+        },
+        "IngestionSizeInBytes":{
+          "shape":"long",
+          "documentation":"<p>The size of the data ingested, in bytes.</p>",
+          "box":true
+        },
+        "RequestSource":{
+          "shape":"IngestionRequestSource",
+          "documentation":"<p>Event source for this ingestion.</p>"
+        },
+        "RequestType":{
+          "shape":"IngestionRequestType",
+          "documentation":"<p>Type of this ingestion.</p>"
+        }
+      },
+      "documentation":"<p>Information about the SPICE ingestion for a dataset.</p>"
+    },
+    "IngestionErrorType":{
+      "type":"string",
+      "enum":[
+        "FAILURE_TO_ASSUME_ROLE",
+        "INGESTION_SUPERSEDED",
+        "INGESTION_CANCELED",
+        "DATA_SET_DELETED",
+        "DATA_SET_NOT_SPICE",
+        "S3_UPLOADED_FILE_DELETED",
+        "S3_MANIFEST_ERROR",
+        "DATA_TOLERANCE_EXCEPTION",
+        "SPICE_TABLE_NOT_FOUND",
+        "DATA_SET_SIZE_LIMIT_EXCEEDED",
+        "ROW_SIZE_LIMIT_EXCEEDED",
+        "ACCOUNT_CAPACITY_LIMIT_EXCEEDED",
+        "CUSTOMER_ERROR",
+        "DATA_SOURCE_NOT_FOUND",
+        "IAM_ROLE_NOT_AVAILABLE",
+        "CONNECTION_FAILURE",
+        "SQL_TABLE_NOT_FOUND",
+        "PERMISSION_DENIED",
+        "SSL_CERTIFICATE_VALIDATION_FAILURE",
+        "OAUTH_TOKEN_FAILURE",
+        "SOURCE_API_LIMIT_EXCEEDED_FAILURE",
+        "PASSWORD_AUTHENTICATION_FAILURE",
+        "SQL_SCHEMA_MISMATCH_ERROR",
+        "INVALID_DATE_FORMAT",
+        "INVALID_DATAPREP_SYNTAX",
+        "SOURCE_RESOURCE_LIMIT_EXCEEDED",
+        "SQL_INVALID_PARAMETER_VALUE",
+        "QUERY_TIMEOUT",
+        "SQL_NUMERIC_OVERFLOW",
+        "UNRESOLVABLE_HOST",
+        "UNROUTABLE_HOST",
+        "SQL_EXCEPTION",
+        "S3_FILE_INACCESSIBLE",
+        "IOT_FILE_NOT_FOUND",
+        "IOT_DATA_SET_FILE_EMPTY",
+        "INVALID_DATA_SOURCE_CONFIG",
+        "DATA_SOURCE_AUTH_FAILED",
+        "DATA_SOURCE_CONNECTION_FAILED",
+        "FAILURE_TO_PROCESS_JSON_FILE",
+        "INTERNAL_SERVICE_ERROR"
+      ]
+    },
+    "IngestionId":{
+      "type":"string",
+      "max":128,
+      "min":1,
+      "pattern":"^[a-zA-Z0-9-_]+$"
+    },
+    "IngestionMaxResults":{
+      "type":"integer",
+      "max":100,
+      "min":1
+    },
+    "IngestionRequestSource":{
+      "type":"string",
+      "enum":[
+        "MANUAL",
+        "SCHEDULED"
+      ]
+    },
+    "IngestionRequestType":{
+      "type":"string",
+      "enum":[
+        "INITIAL_INGESTION",
+        "EDIT",
+        "INCREMENTAL_REFRESH",
+        "FULL_REFRESH"
+      ]
+    },
+    "IngestionStatus":{
+      "type":"string",
+      "enum":[
+        "INITIALIZED",
+        "QUEUED",
+        "RUNNING",
+        "FAILED",
+        "COMPLETED",
+        "CANCELLED"
+      ]
+    },
+    "Ingestions":{
+      "type":"list",
+      "member":{"shape":"Ingestion"}
+    },
+    "InputColumn":{
+      "type":"structure",
+      "required":[
+        "Name",
+        "Type"
+      ],
+      "members":{
+        "Name":{
+          "shape":"ColumnName",
+          "documentation":"<p>The name of this column in the underlying data source.</p>"
+        },
+        "Type":{
+          "shape":"InputColumnDataType",
+          "documentation":"<p>The data type of the column.</p>"
+        }
+      },
+      "documentation":"<p>Metadata for a column that is used as the input of a transform operation.</p>"
+    },
+    "InputColumnDataType":{
+      "type":"string",
+      "enum":[
+        "STRING",
+        "INTEGER",
+        "DECIMAL",
+        "DATETIME",
+        "BIT",
+        "BOOLEAN",
+        "JSON"
+      ]
+    },
+    "InputColumnList":{
+      "type":"list",
+      "member":{"shape":"InputColumn"},
+      "max":2048,
+      "min":1
+    },
+    "InstanceId":{
+      "type":"string",
+      "max":64,
+      "min":1
+    },
+    "IntegerParameter":{
+      "type":"structure",
+      "required":[
+        "Name",
+        "Values"
+      ],
+      "members":{
+        "Name":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>A display name for the dataset.</p>"
+        },
+        "Values":{
+          "shape":"LongList",
+          "documentation":"<p>Values.</p>"
+        }
+      },
+      "documentation":"<p>Integer parameter.</p>"
+    },
+    "IntegerParameterList":{
+      "type":"list",
+      "member":{"shape":"IntegerParameter"},
+      "max":100
+    },
+    "InternalFailureException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"String"},
+        "RequestId":{
+          "shape":"String",
+          "documentation":"<p>The AWS request ID for this request.</p>"
+        }
+      },
+      "documentation":"<p>An internal failure occurred.</p>",
+      "error":{"httpStatusCode":500},
+      "exception":true,
+      "fault":true
+    },
+    "InvalidNextTokenException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"String"},
+        "RequestId":{
+          "shape":"String",
+          "documentation":"<p>The AWS request ID for this request.</p>"
+        }
+      },
+      "documentation":"<p>The <code>NextToken</code> value isn't valid.</p>",
+      "error":{"httpStatusCode":400},
+      "exception":true
+    },
+    "InvalidParameterValueException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"String"},
+        "RequestId":{
+          "shape":"String",
+          "documentation":"<p>The AWS request ID for this request.</p>"
+        }
+      },
+      "documentation":"<p>One or more parameters has a value that isn't valid.</p>",
+      "error":{"httpStatusCode":400},
+      "exception":true
+    },
+    "JiraParameters":{
+      "type":"structure",
+      "required":["SiteBaseUrl"],
+      "members":{
+        "SiteBaseUrl":{
+          "shape":"SiteBaseUrl",
+          "documentation":"<p>The base URL of the Jira site.</p>"
+        }
+      },
+      "documentation":"<p>Jira parameters.</p>"
+    },
+    "JoinInstruction":{
+      "type":"structure",
+      "required":[
+        "LeftOperand",
+        "RightOperand",
+        "Type",
+        "OnClause"
+      ],
+      "members":{
+        "LeftOperand":{
+          "shape":"LogicalTableId",
+          "documentation":"<p>Left operand.</p>"
+        },
+        "RightOperand":{
+          "shape":"LogicalTableId",
+          "documentation":"<p>Right operand.</p>"
+        },
+        "Type":{
+          "shape":"JoinType",
+          "documentation":"<p>Type.</p>"
+        },
+        "OnClause":{
+          "shape":"OnClause",
+          "documentation":"<p>On Clause.</p>"
+        }
+      },
+      "documentation":"<p>Join instruction.</p>"
+    },
+    "JoinType":{
+      "type":"string",
+      "enum":[
+        "INNER",
+        "OUTER",
+        "LEFT",
+        "RIGHT"
+      ]
+    },
+    "LimitExceededException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"String"},
+        "ResourceType":{
+          "shape":"ExceptionResourceType",
+          "documentation":"<p>Limit exceeded.</p>"
+        },
+        "RequestId":{
+          "shape":"String",
+          "documentation":"<p>The AWS request ID for this request.</p>"
+        }
+      },
+      "documentation":"<p>A limit is exceeded.</p>",
+      "error":{"httpStatusCode":409},
+      "exception":true
+    },
+    "ListDashboardVersionsRequest":{
+      "type":"structure",
+      "required":[
+        "AwsAccountId",
+        "DashboardId"
+      ],
+      "members":{
+        "AwsAccountId":{
+          "shape":"AwsAccountId",
+          "documentation":"<p>The ID of the AWS account that contains the dashboard that you're listing versions for.</p>",
+          "location":"uri",
+          "locationName":"AwsAccountId"
+        },
+        "DashboardId":{
+          "shape":"RestrictiveResourceId",
+          "documentation":"<p>The ID for the dashboard.</p>",
+          "location":"uri",
+          "locationName":"DashboardId"
+        },
+        "NextToken":{
+          "shape":"String",
+          "documentation":"<p>The token for the next set of results, or null if there are no more results.</p>",
+          "location":"querystring",
+          "locationName":"next-token"
+        },
+        "MaxResults":{
+          "shape":"MaxResults",
+          "documentation":"<p>The maximum number of results to be returned per request.</p>",
+          "box":true,
+          "location":"querystring",
+          "locationName":"max-results"
+        }
+      }
+    },
+    "ListDashboardVersionsResponse":{
+      "type":"structure",
+      "members":{
+        "DashboardVersionSummaryList":{
+          "shape":"DashboardVersionSummaryList",
+          "documentation":"<p>A structure that contains information about each version of the dashboard.</p>"
+        },
+        "NextToken":{
+          "shape":"String",
+          "documentation":"<p>The token for the next set of results, or null if there are no more results.</p>"
+        },
+        "Status":{
+          "shape":"StatusCode",
+          "documentation":"<p>The HTTP status of the request.</p>",
+          "location":"statusCode"
+        },
+        "RequestId":{
+          "shape":"String",
+          "documentation":"<p>The AWS request ID for this operation.</p>"
+        }
+      }
+    },
+    "ListDashboardsRequest":{
+      "type":"structure",
+      "required":["AwsAccountId"],
+      "members":{
+        "AwsAccountId":{
+          "shape":"AwsAccountId",
+          "documentation":"<p>The ID of the AWS account that contains the dashboards that you're listing.</p>",
+          "location":"uri",
+          "locationName":"AwsAccountId"
+        },
+        "NextToken":{
+          "shape":"String",
+          "documentation":"<p>The token for the next set of results, or null if there are no more results.</p>",
+          "location":"querystring",
+          "locationName":"next-token"
+        },
+        "MaxResults":{
+          "shape":"MaxResults",
+          "documentation":"<p>The maximum number of results to be returned per request.</p>",
+          "box":true,
+          "location":"querystring",
+          "locationName":"max-results"
+        }
+      }
+    },
+    "ListDashboardsResponse":{
+      "type":"structure",
+      "members":{
+        "DashboardSummaryList":{
+          "shape":"DashboardSummaryList",
+          "documentation":"<p>A structure that contains all of the dashboards shared with the user. This structure provides basic information about the dashboards.</p>"
+        },
+        "NextToken":{
+          "shape":"String",
+          "documentation":"<p>The token for the next set of results, or null if there are no more results.</p>"
+        },
+        "Status":{
+          "shape":"StatusCode",
+          "documentation":"<p>The HTTP status of the request.</p>",
+          "location":"statusCode"
+        },
+        "RequestId":{
+          "shape":"String",
+          "documentation":"<p>The AWS request ID for this operation.</p>"
+        }
+      }
+    },
+    "ListDataSetsRequest":{
+      "type":"structure",
+      "required":["AwsAccountId"],
+      "members":{
+        "AwsAccountId":{
+          "shape":"AwsAccountId",
+          "documentation":"<p>The AWS account ID.</p>",
+          "location":"uri",
+          "locationName":"AwsAccountId"
+        },
+        "NextToken":{
+          "shape":"String",
+          "documentation":"<p>The token for the next set of results, or null if there are no more results.</p>",
+          "location":"querystring",
+          "locationName":"next-token"
+        },
+        "MaxResults":{
+          "shape":"MaxResults",
+          "documentation":"<p>The maximum number of results to be returned per request.</p>",
+          "box":true,
+          "location":"querystring",
+          "locationName":"max-results"
+        }
+      }
+    },
+    "ListDataSetsResponse":{
+      "type":"structure",
+      "members":{
+        "DataSetSummaries":{
+          "shape":"DataSetSummaryList",
+          "documentation":"<p>The list of dataset summaries.</p>"
+        },
+        "NextToken":{
+          "shape":"String",
+          "documentation":"<p>The token for the next set of results, or null if there are no more results.</p>"
+        },
+        "RequestId":{
+          "shape":"String",
+          "documentation":"<p>The AWS request ID for this operation.</p>"
+        },
+        "Status":{
+          "shape":"StatusCode",
+          "documentation":"<p>The HTTP status of the request.</p>",
+          "location":"statusCode"
+        }
+      }
+    },
+    "ListDataSourcesRequest":{
+      "type":"structure",
+      "required":["AwsAccountId"],
+      "members":{
+        "AwsAccountId":{
+          "shape":"AwsAccountId",
+          "documentation":"<p>The AWS account ID.</p>",
+          "location":"uri",
+          "locationName":"AwsAccountId"
+        },
+        "NextToken":{
+          "shape":"String",
+          "documentation":"<p>The token for the next set of results, or null if there are no more results.</p>",
+          "location":"querystring",
+          "locationName":"next-token"
+        },
+        "MaxResults":{
+          "shape":"MaxResults",
+          "documentation":"<p>The maximum number of results to be returned per request.</p>",
+          "box":true,
+          "location":"querystring",
+          "locationName":"max-results"
+        }
+      }
+    },
+    "ListDataSourcesResponse":{
+      "type":"structure",
+      "members":{
+        "DataSources":{
+          "shape":"DataSourceList",
+          "documentation":"<p>A list of data sources.</p>"
+        },
+        "NextToken":{
+          "shape":"String",
+          "documentation":"<p>The token for the next set of results, or null if there are no more results.</p>"
+        },
+        "RequestId":{
+          "shape":"String",
+          "documentation":"<p>The AWS request ID for this operation.</p>"
+        },
+        "Status":{
+          "shape":"StatusCode",
+          "documentation":"<p>The HTTP status of the request.</p>",
+          "location":"statusCode"
+        }
+      }
+    },
+    "ListGroupMembershipsRequest":{
+      "type":"structure",
+      "required":[
+        "GroupName",
+        "AwsAccountId",
+        "Namespace"
+      ],
+      "members":{
+        "GroupName":{
+          "shape":"GroupName",
+          "documentation":"<p>The name of the group that you want to see a membership list of.</p>",
+          "location":"uri",
+          "locationName":"GroupName"
+        },
+        "NextToken":{
+          "shape":"String",
+          "documentation":"<p>A pagination token that can be used in a subsequent request.</p>",
+          "location":"querystring",
+          "locationName":"next-token"
+        },
+        "MaxResults":{
+          "shape":"MaxResults",
+          "documentation":"<p>The maximum number of results to return from this request.</p>",
+          "box":true,
+          "location":"querystring",
+          "locationName":"max-results"
+        },
+        "AwsAccountId":{
+          "shape":"AwsAccountId",
+          "documentation":"<p>The ID for the AWS account that the group is in. Currently, you use the ID for the AWS account that contains your Amazon QuickSight account.</p>",
+          "location":"uri",
+          "locationName":"AwsAccountId"
+        },
+        "Namespace":{
+          "shape":"Namespace",
+          "documentation":"<p>The namespace. Currently, you should set this to <code>default</code>.</p>",
+          "location":"uri",
+          "locationName":"Namespace"
+        }
+      }
+    },
+    "ListGroupMembershipsResponse":{
+      "type":"structure",
+      "members":{
+        "GroupMemberList":{
+          "shape":"GroupMemberList",
+          "documentation":"<p>The list of the members of the group.</p>"
+        },
+        "NextToken":{
+          "shape":"String",
+          "documentation":"<p>A pagination token that can be used in a subsequent request.</p>"
+        },
+        "RequestId":{
+          "shape":"String",
+          "documentation":"<p>The AWS request ID for this operation.</p>"
+        },
+        "Status":{
+          "shape":"StatusCode",
+          "documentation":"<p>The HTTP status of the request.</p>",
+          "location":"statusCode"
+        }
+      }
+    },
+    "ListGroupsRequest":{
+      "type":"structure",
+      "required":[
+        "AwsAccountId",
+        "Namespace"
+      ],
+      "members":{
+        "AwsAccountId":{
+          "shape":"AwsAccountId",
+          "documentation":"<p>The ID for the AWS account that the group is in. Currently, you use the ID for the AWS account that contains your Amazon QuickSight account.</p>",
+          "location":"uri",
+          "locationName":"AwsAccountId"
+        },
+        "NextToken":{
+          "shape":"String",
+          "documentation":"<p>A pagination token that can be used in a subsequent request.</p>",
+          "location":"querystring",
+          "locationName":"next-token"
+        },
+        "MaxResults":{
+          "shape":"MaxResults",
+          "documentation":"<p>The maximum number of results to return.</p>",
+          "box":true,
+          "location":"querystring",
+          "locationName":"max-results"
+        },
+        "Namespace":{
+          "shape":"Namespace",
+          "documentation":"<p>The namespace. Currently, you should set this to <code>default</code>.</p>",
+          "location":"uri",
+          "locationName":"Namespace"
+        }
+      }
+    },
+    "ListGroupsResponse":{
+      "type":"structure",
+      "members":{
+        "GroupList":{
+          "shape":"GroupList",
+          "documentation":"<p>The list of the groups.</p>"
+        },
+        "NextToken":{
+          "shape":"String",
+          "documentation":"<p>A pagination token that can be used in a subsequent request.</p>"
+        },
+        "RequestId":{
+          "shape":"String",
+          "documentation":"<p>The AWS request ID for this operation.</p>"
+        },
+        "Status":{
+          "shape":"StatusCode",
+          "documentation":"<p>The HTTP status of the request.</p>",
+          "location":"statusCode"
+        }
+      }
+    },
+    "ListIAMPolicyAssignmentsForUserRequest":{
+      "type":"structure",
+      "required":[
+        "AwsAccountId",
+        "UserName",
+        "Namespace"
+      ],
+      "members":{
+        "AwsAccountId":{
+          "shape":"AwsAccountId",
+          "documentation":"<p>The ID of the AWS account that contains the assignments.</p>",
+          "location":"uri",
+          "locationName":"AwsAccountId"
+        },
+        "UserName":{
+          "shape":"UserName",
+          "documentation":"<p>The name of the user.</p>",
+          "location":"uri",
+          "locationName":"UserName"
+        },
+        "NextToken":{
+          "shape":"String",
+          "documentation":"<p>The token for the next set of results, or null if there are no more results.</p>",
+          "location":"querystring",
+          "locationName":"next-token"
+        },
+        "MaxResults":{
+          "shape":"MaxResults",
+          "documentation":"<p>The maximum number of results to be returned per request.</p>",
+          "box":true,
+          "location":"querystring",
+          "locationName":"max-results"
+        },
+        "Namespace":{
+          "shape":"Namespace",
+          "documentation":"<p>The namespace of the assignment.</p>",
+          "location":"uri",
+          "locationName":"Namespace"
+        }
+      }
+    },
+    "ListIAMPolicyAssignmentsForUserResponse":{
+      "type":"structure",
+      "members":{
+        "ActiveAssignments":{
+          "shape":"ActiveIAMPolicyAssignmentList",
+          "documentation":"<p>The active assignments for this user.</p>"
+        },
+        "RequestId":{
+          "shape":"String",
+          "documentation":"<p>The AWS request ID for this operation.</p>"
+        },
+        "NextToken":{
+          "shape":"String",
+          "documentation":"<p>The token for the next set of results, or null if there are no more results.</p>"
+        },
+        "Status":{
+          "shape":"StatusCode",
+          "documentation":"<p>The HTTP status of the request.</p>",
+          "location":"statusCode"
+        }
+      }
+    },
+    "ListIAMPolicyAssignmentsRequest":{
+      "type":"structure",
+      "required":[
+        "AwsAccountId",
+        "Namespace"
+      ],
+      "members":{
+        "AwsAccountId":{
+          "shape":"AwsAccountId",
+          "documentation":"<p>The ID of the AWS account that contains these IAM policy assignments.</p>",
+          "location":"uri",
+          "locationName":"AwsAccountId"
+        },
+        "AssignmentStatus":{
+          "shape":"AssignmentStatus",
+          "documentation":"<p>The status of the assignments.</p>"
+        },
+        "Namespace":{
+          "shape":"Namespace",
+          "documentation":"<p>The namespace for the assignments.</p>",
+          "location":"uri",
+          "locationName":"Namespace"
+        },
+        "NextToken":{
+          "shape":"String",
+          "documentation":"<p>The token for the next set of results, or null if there are no more results.</p>",
+          "location":"querystring",
+          "locationName":"next-token"
+        },
+        "MaxResults":{
+          "shape":"MaxResults",
+          "documentation":"<p>The maximum number of results to be returned per request.</p>",
+          "box":true,
+          "location":"querystring",
+          "locationName":"max-results"
+        }
+      }
+    },
+    "ListIAMPolicyAssignmentsResponse":{
+      "type":"structure",
+      "members":{
+        "IAMPolicyAssignments":{
+          "shape":"IAMPolicyAssignmentSummaryList",
+          "documentation":"<p>Information describing the IAM policy assignments.</p>"
+        },
+        "NextToken":{
+          "shape":"String",
+          "documentation":"<p>The token for the next set of results, or null if there are no more results.</p>"
+        },
+        "RequestId":{
+          "shape":"String",
+          "documentation":"<p>The AWS request ID for this operation.</p>"
+        },
+        "Status":{
+          "shape":"StatusCode",
+          "documentation":"<p>The HTTP status of the request.</p>",
+          "location":"statusCode"
+        }
+      }
+    },
+    "ListIngestionsRequest":{
+      "type":"structure",
+      "required":[
+        "DataSetId",
+        "AwsAccountId"
+      ],
+      "members":{
+        "DataSetId":{
+          "shape":"string",
+          "documentation":"<p>The ID of the dataset used in the ingestion.</p>",
+          "location":"uri",
+          "locationName":"DataSetId"
+        },
+        "NextToken":{
+          "shape":"string",
+          "documentation":"<p>The token for the next set of results, or null if there are no more results.</p>",
+          "location":"querystring",
+          "locationName":"next-token"
+        },
+        "AwsAccountId":{
+          "shape":"AwsAccountId",
+          "documentation":"<p>The AWS account ID.</p>",
+          "location":"uri",
+          "locationName":"AwsAccountId"
+        },
+        "MaxResults":{
+          "shape":"IngestionMaxResults",
+          "documentation":"<p>The maximum number of results to be returned per request.</p>",
+          "box":true,
+          "location":"querystring",
+          "locationName":"max-results"
+        }
+      }
+    },
+    "ListIngestionsResponse":{
+      "type":"structure",
+      "members":{
+        "Ingestions":{
+          "shape":"Ingestions",
+          "documentation":"<p>A list of the ingestions.</p>"
+        },
+        "NextToken":{
+          "shape":"string",
+          "documentation":"<p>The token for the next set of results, or null if there are no more results.</p>"
+        },
+        "RequestId":{
+          "shape":"string",
+          "documentation":"<p>The AWS request ID for this operation.</p>"
+        },
+        "Status":{
+          "shape":"StatusCode",
+          "documentation":"<p>The HTTP status of the request.</p>",
+          "location":"statusCode"
+        }
+      }
+    },
+    "ListTagsForResourceRequest":{
+      "type":"structure",
+      "required":["ResourceArn"],
+      "members":{
+        "ResourceArn":{
+          "shape":"Arn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the resource that you want a list of tags for.</p>",
+          "location":"uri",
+          "locationName":"ResourceArn"
+        }
+      }
+    },
+    "ListTagsForResourceResponse":{
+      "type":"structure",
+      "members":{
+        "Tags":{
+          "shape":"TagList",
+          "documentation":"<p>Contains a map of the key-value pairs for the resource tag or tags assigned to the resource.</p>"
+        },
+        "RequestId":{
+          "shape":"String",
+          "documentation":"<p>The AWS request ID for this operation.</p>"
+        },
+        "Status":{
+          "shape":"StatusCode",
+          "documentation":"<p>The HTTP status of the request.</p>",
+          "location":"statusCode"
+        }
+      }
+    },
+    "ListTemplateAliasesRequest":{
+      "type":"structure",
+      "required":[
+        "AwsAccountId",
+        "TemplateId"
+      ],
+      "members":{
+        "AwsAccountId":{
+          "shape":"AwsAccountId",
+          "documentation":"<p>The ID of the AWS account that contains the template aliases that you're listing.</p>",
+          "location":"uri",
+          "locationName":"AwsAccountId"
+        },
+        "TemplateId":{
+          "shape":"RestrictiveResourceId",
+          "documentation":"<p>The ID for the template.</p>",
+          "location":"uri",
+          "locationName":"TemplateId"
+        },
+        "NextToken":{
+          "shape":"String",
+          "documentation":"<p>The token for the next set of results, or null if there are no more results.</p>",
+          "location":"querystring",
+          "locationName":"next-token"
+        },
+        "MaxResults":{
+          "shape":"MaxResults",
+          "documentation":"<p>The maximum number of results to be returned per request.</p>",
+          "box":true,
+          "location":"querystring",
+          "locationName":"max-result"
+        }
+      }
+    },
+    "ListTemplateAliasesResponse":{
+      "type":"structure",
+      "members":{
+        "TemplateAliasList":{
+          "shape":"TemplateAliasList",
+          "documentation":"<p>A structure containing the list of the template's aliases.</p>"
+        },
+        "Status":{
+          "shape":"StatusCode",
+          "documentation":"<p>The HTTP status of the request.</p>",
+          "location":"statusCode"
+        },
+        "RequestId":{
+          "shape":"String",
+          "documentation":"<p>The AWS request ID for this operation.</p>"
+        },
+        "NextToken":{
+          "shape":"String",
+          "documentation":"<p>The token for the next set of results, or null if there are no more results.</p>"
+        }
+      }
+    },
+    "ListTemplateVersionsRequest":{
+      "type":"structure",
+      "required":[
+        "AwsAccountId",
+        "TemplateId"
+      ],
+      "members":{
+        "AwsAccountId":{
+          "shape":"AwsAccountId",
+          "documentation":"<p>The ID of the AWS account that contains the templates that you're listing.</p>",
+          "location":"uri",
+          "locationName":"AwsAccountId"
+        },
+        "TemplateId":{
+          "shape":"RestrictiveResourceId",
+          "documentation":"<p>The ID for the template.</p>",
+          "location":"uri",
+          "locationName":"TemplateId"
+        },
+        "NextToken":{
+          "shape":"String",
+          "documentation":"<p>The token for the next set of results, or null if there are no more results.</p>",
+          "location":"querystring",
+          "locationName":"next-token"
+        },
+        "MaxResults":{
+          "shape":"MaxResults",
+          "documentation":"<p>The maximum number of results to be returned per request.</p>",
+          "box":true,
+          "location":"querystring",
+          "locationName":"max-results"
+        }
+      }
+    },
+    "ListTemplateVersionsResponse":{
+      "type":"structure",
+      "members":{
+        "TemplateVersionSummaryList":{
+          "shape":"TemplateVersionSummaryList",
+          "documentation":"<p>A structure containing a list of all the versions of the specified template.</p>"
+        },
+        "NextToken":{
+          "shape":"String",
+          "documentation":"<p>The token for the next set of results, or null if there are no more results.</p>"
+        },
+        "Status":{
+          "shape":"StatusCode",
+          "documentation":"<p>The HTTP status of the request.</p>",
+          "location":"statusCode"
+        },
+        "RequestId":{
+          "shape":"String",
+          "documentation":"<p>The AWS request ID for this operation.</p>"
+        }
+      }
+    },
+    "ListTemplatesRequest":{
+      "type":"structure",
+      "required":["AwsAccountId"],
+      "members":{
+        "AwsAccountId":{
+          "shape":"AwsAccountId",
+          "documentation":"<p>The ID of the AWS account that contains the templates that you're listing.</p>",
+          "location":"uri",
+          "locationName":"AwsAccountId"
+        },
+        "NextToken":{
+          "shape":"String",
+          "documentation":"<p>The token for the next set of results, or null if there are no more results.</p>",
+          "location":"querystring",
+          "locationName":"next-token"
+        },
+        "MaxResults":{
+          "shape":"MaxResults",
+          "documentation":"<p>The maximum number of results to be returned per request.</p>",
+          "box":true,
+          "location":"querystring",
+          "locationName":"max-result"
+        }
+      }
+    },
+    "ListTemplatesResponse":{
+      "type":"structure",
+      "members":{
+        "TemplateSummaryList":{
+          "shape":"TemplateSummaryList",
+          "documentation":"<p>A structure containing information about the templates in the list.</p>"
+        },
+        "NextToken":{
+          "shape":"String",
+          "documentation":"<p>The token for the next set of results, or null if there are no more results.</p>"
+        },
+        "Status":{
+          "shape":"StatusCode",
+          "documentation":"<p>The HTTP status of the request.</p>",
+          "location":"statusCode"
+        },
+        "RequestId":{
+          "shape":"String",
+          "documentation":"<p>The AWS request ID for this operation.</p>"
+        }
+      }
+    },
+    "ListUserGroupsRequest":{
+      "type":"structure",
+      "required":[
+        "UserName",
+        "AwsAccountId",
+        "Namespace"
+      ],
+      "members":{
+        "UserName":{
+          "shape":"UserName",
+          "documentation":"<p>The Amazon QuickSight user name that you want to list group memberships for.</p>",
+          "location":"uri",
+          "locationName":"UserName"
+        },
+        "AwsAccountId":{
+          "shape":"AwsAccountId",
+          "documentation":"<p>The AWS account ID that the user is in. Currently, you use the ID for the AWS account that contains your Amazon QuickSight account.</p>",
+          "location":"uri",
+          "locationName":"AwsAccountId"
+        },
+        "Namespace":{
+          "shape":"Namespace",
+          "documentation":"<p>The namespace. Currently, you should set this to <code>default</code>.</p>",
+          "location":"uri",
+          "locationName":"Namespace"
+        },
+        "NextToken":{
+          "shape":"String",
+          "documentation":"<p>A pagination token that can be used in a subsequent request.</p>",
+          "location":"querystring",
+          "locationName":"next-token"
+        },
+        "MaxResults":{
+          "shape":"MaxResults",
+          "documentation":"<p>The maximum number of results to return from this request.</p>",
+          "box":true,
+          "location":"querystring",
+          "locationName":"max-results"
+        }
+      }
+    },
+    "ListUserGroupsResponse":{
+      "type":"structure",
+      "members":{
+        "GroupList":{
+          "shape":"GroupList",
+          "documentation":"<p>The list of groups the user is a member of.</p>"
+        },
+        "NextToken":{
+          "shape":"String",
+          "documentation":"<p>A pagination token that can be used in a subsequent request.</p>"
+        },
+        "RequestId":{
+          "shape":"String",
+          "documentation":"<p>The AWS request ID for this operation.</p>"
+        },
+        "Status":{
+          "shape":"StatusCode",
+          "documentation":"<p>The HTTP status of the request.</p>",
+          "location":"statusCode"
+        }
+      }
+    },
+    "ListUsersRequest":{
+      "type":"structure",
+      "required":[
+        "AwsAccountId",
+        "Namespace"
+      ],
+      "members":{
+        "AwsAccountId":{
+          "shape":"AwsAccountId",
+          "documentation":"<p>The ID for the AWS account that the user is in. Currently, you use the ID for the AWS account that contains your Amazon QuickSight account.</p>",
+          "location":"uri",
+          "locationName":"AwsAccountId"
+        },
+        "NextToken":{
+          "shape":"String",
+          "documentation":"<p>A pagination token that can be used in a subsequent request.</p>",
+          "location":"querystring",
+          "locationName":"next-token"
+        },
+        "MaxResults":{
+          "shape":"MaxResults",
+          "documentation":"<p>The maximum number of results to return from this request.</p>",
+          "box":true,
+          "location":"querystring",
+          "locationName":"max-results"
+        },
+        "Namespace":{
+          "shape":"Namespace",
+          "documentation":"<p>The namespace. Currently, you should set this to <code>default</code>.</p>",
+          "location":"uri",
+          "locationName":"Namespace"
+        }
+      }
+    },
+    "ListUsersResponse":{
+      "type":"structure",
+      "members":{
+        "UserList":{
+          "shape":"UserList",
+          "documentation":"<p>The list of users.</p>"
+        },
+        "NextToken":{
+          "shape":"String",
+          "documentation":"<p>A pagination token that can be used in a subsequent request.</p>"
+        },
+        "RequestId":{
+          "shape":"String",
+          "documentation":"<p>The AWS request ID for this operation.</p>"
+        },
+        "Status":{
+          "shape":"StatusCode",
+          "documentation":"<p>The HTTP status of the request.</p>",
+          "location":"statusCode"
+        }
+      }
+    },
+    "LogicalTable":{
+      "type":"structure",
+      "required":[
+        "Alias",
+        "Source"
+      ],
+      "members":{
+        "Alias":{
+          "shape":"LogicalTableAlias",
+          "documentation":"<p>A display name for the logical table.</p>"
+        },
+        "DataTransforms":{
+          "shape":"TransformOperationList",
+          "documentation":"<p>Transform operations that act on this logical table.</p>"
+        },
+        "Source":{
+          "shape":"LogicalTableSource",
+          "documentation":"<p>Source of this logical table.</p>"
+        }
+      },
+      "documentation":"<p>A <i>logical table</i> is a unit that joins and that data transformations operate on. A logical table has a source, which can be either a physical table or result of a join. When a logical table points to a physical table, the logical table acts as a mutable copy of that physical table through transform operations.</p>"
+    },
+    "LogicalTableAlias":{
+      "type":"string",
+      "max":64,
+      "min":1
+    },
+    "LogicalTableId":{
+      "type":"string",
+      "max":64,
+      "min":1,
+      "pattern":"[0-9a-zA-Z-]*"
+    },
+    "LogicalTableMap":{
+      "type":"map",
+      "key":{"shape":"LogicalTableId"},
+      "value":{"shape":"LogicalTable"},
+      "max":32,
+      "min":1
+    },
+    "LogicalTableSource":{
+      "type":"structure",
+      "members":{
+        "JoinInstruction":{
+          "shape":"JoinInstruction",
+          "documentation":"<p>Specifies the result of a join of two logical tables.</p>"
+        },
+        "PhysicalTableId":{
+          "shape":"PhysicalTableId",
+          "documentation":"<p>Physical table ID.</p>"
+        }
+      },
+      "documentation":"<p>Information about the source of a logical table. This is a variant type structure. For this structure to be valid, only one of the attributes can be non-null.</p>"
+    },
+    "Long":{"type":"long"},
+    "LongList":{
+      "type":"list",
+      "member":{"shape":"Long"}
+    },
+    "ManifestFileLocation":{
+      "type":"structure",
+      "required":[
+        "Bucket",
+        "Key"
+      ],
+      "members":{
+        "Bucket":{
+          "shape":"S3Bucket",
+          "documentation":"<p>Amazon S3 bucket.</p>"
+        },
+        "Key":{
+          "shape":"S3Key",
+          "documentation":"<p>Amazon S3 key that identifies an object.</p>"
+        }
+      },
+      "documentation":"<p>Amazon S3 manifest file location.</p>"
+    },
+    "MariaDbParameters":{
+      "type":"structure",
+      "required":[
+        "Host",
+        "Port",
+        "Database"
+      ],
+      "members":{
+        "Host":{
+          "shape":"Host",
+          "documentation":"<p>Host.</p>"
+        },
+        "Port":{
+          "shape":"Port",
+          "documentation":"<p>Port.</p>"
+        },
+        "Database":{
+          "shape":"Database",
+          "documentation":"<p>Database.</p>"
+        }
+      },
+      "documentation":"<p>MariaDB parameters.</p>"
+    },
+    "MaxResults":{
+      "type":"integer",
+      "max":100,
+      "min":1
+    },
+    "MySqlParameters":{
+      "type":"structure",
+      "required":[
+        "Host",
+        "Port",
+        "Database"
+      ],
+      "members":{
+        "Host":{
+          "shape":"Host",
+          "documentation":"<p>Host.</p>"
+        },
+        "Port":{
+          "shape":"Port",
+          "documentation":"<p>Port.</p>"
+        },
+        "Database":{
+          "shape":"Database",
+          "documentation":"<p>Database.</p>"
+        }
+      },
+      "documentation":"<p>MySQL parameters.</p>"
+    },
+    "Namespace":{
+      "type":"string",
+      "max":64,
+      "pattern":"^[a-zA-Z0-9._-]*$"
+    },
+    "NonEmptyString":{
+      "type":"string",
+      "pattern":".*\\S.*"
+    },
+    "OnClause":{
+      "type":"string",
+      "max":512,
+      "min":1
+    },
+    "OptionalPort":{
+      "type":"integer",
+      "max":65535,
+      "min":0
+    },
+    "OutputColumn":{
+      "type":"structure",
+      "members":{
+        "Name":{
+          "shape":"ColumnName",
+          "documentation":"<p>A display name for the dataset.</p>"
+        },
+        "Type":{
+          "shape":"ColumnDataType",
+          "documentation":"<p>Type.</p>"
+        }
+      },
+      "documentation":"<p>Output column.</p>"
+    },
+    "OutputColumnList":{
+      "type":"list",
+      "member":{"shape":"OutputColumn"}
+    },
+    "Parameters":{
+      "type":"structure",
+      "members":{
+        "StringParameters":{
+          "shape":"StringParameterList",
+          "documentation":"<p>String parameters.</p>"
+        },
+        "IntegerParameters":{
+          "shape":"IntegerParameterList",
+          "documentation":"<p>Integer parameters.</p>"
+        },
+        "DecimalParameters":{
+          "shape":"DecimalParameterList",
+          "documentation":"<p>Decimal parameters.</p>"
+        },
+        "DateTimeParameters":{
+          "shape":"DateTimeParameterList",
+          "documentation":"<p>DateTime parameters.</p>"
+        }
+      },
+      "documentation":"<p>Parameters.</p>"
+    },
+    "Password":{
+      "type":"string",
+      "max":1024,
+      "min":1
+    },
+    "PhysicalTable":{
+      "type":"structure",
+      "members":{
+        "RelationalTable":{
+          "shape":"RelationalTable",
+          "documentation":"<p>A physical table type for relational data sources.</p>"
+        },
+        "CustomSql":{
+          "shape":"CustomSql",
+          "documentation":"<p>A physical table type built from the results of the custom SQL query.</p>"
+        },
+        "S3Source":{
+          "shape":"S3Source",
+          "documentation":"<p>A physical table type for as S3 data source.</p>"
+        }
+      },
+      "documentation":"<p>A view of a data source that contains information about the shape of the data in the underlying source. This is a variant type structure. For this structure to be valid, only one of the attributes can be non-null.</p>"
+    },
+    "PhysicalTableId":{
+      "type":"string",
+      "max":64,
+      "min":1,
+      "pattern":"[0-9a-zA-Z-]*"
+    },
+    "PhysicalTableMap":{
+      "type":"map",
+      "key":{"shape":"PhysicalTableId"},
+      "value":{"shape":"PhysicalTable"},
+      "max":16,
+      "min":1
+    },
+    "Port":{
+      "type":"integer",
+      "max":65535,
+      "min":1
+    },
+    "PositiveInteger":{
+      "type":"integer",
+      "min":1
+    },
+    "PostgreSqlParameters":{
+      "type":"structure",
+      "required":[
+        "Host",
+        "Port",
+        "Database"
+      ],
+      "members":{
+        "Host":{
+          "shape":"Host",
+          "documentation":"<p>Host.</p>"
+        },
+        "Port":{
+          "shape":"Port",
+          "documentation":"<p>Port.</p>"
+        },
+        "Database":{
+          "shape":"Database",
+          "documentation":"<p>Database.</p>"
+        }
+      },
+      "documentation":"<p>PostgreSQL parameters.</p>"
+    },
+    "PreconditionNotMetException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"String"},
+        "RequestId":{
+          "shape":"String",
+          "documentation":"<p>The AWS request ID for this request.</p>"
+        }
+      },
+      "documentation":"<p>One or more preconditions aren't met.</p>",
+      "error":{"httpStatusCode":400},
+      "exception":true
+    },
+    "PrestoParameters":{
+      "type":"structure",
+      "required":[
+        "Host",
+        "Port",
+        "Catalog"
+      ],
+      "members":{
+        "Host":{
+          "shape":"Host",
+          "documentation":"<p>Host.</p>"
+        },
+        "Port":{
+          "shape":"Port",
+          "documentation":"<p>Port.</p>"
+        },
+        "Catalog":{
+          "shape":"Catalog",
+          "documentation":"<p>Catalog.</p>"
+        }
+      },
+      "documentation":"<p>Presto parameters.</p>"
+    },
+    "Principal":{
+      "type":"string",
+      "max":256,
+      "min":1
+    },
+    "ProjectOperation":{
+      "type":"structure",
+      "required":["ProjectedColumns"],
+      "members":{
+        "ProjectedColumns":{
+          "shape":"ProjectedColumnList",
+          "documentation":"<p>Projected columns.</p>"
+        }
+      },
+      "documentation":"<p>A transform operation that projects columns. Operations that come after a projection can only refer to projected columns.</p>"
+    },
+    "ProjectedColumnList":{
+      "type":"list",
+      "member":{"shape":"String"},
+      "max":2000,
+      "min":1
+    },
+    "Query":{
+      "type":"string",
+      "max":256,
+      "min":1
+    },
+    "QueueInfo":{
+      "type":"structure",
+      "required":[
+        "WaitingOnIngestion",
+        "QueuedIngestion"
+      ],
+      "members":{
+        "WaitingOnIngestion":{
+          "shape":"string",
+          "documentation":"<p>The ID of the queued ingestion.</p>"
+        },
+        "QueuedIngestion":{
+          "shape":"string",
+          "documentation":"<p>The ID of the ongoing ingestion. The queued ingestion is waiting for the ongoing ingestion to complete.</p>"
+        }
+      },
+      "documentation":"<p>Information about a queued dataset SPICE ingestion.</p>"
+    },
+    "QuickSightUserNotFoundException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"String"},
+        "RequestId":{
+          "shape":"String",
+          "documentation":"<p>The AWS request ID for this request.</p>"
+        }
+      },
+      "documentation":"<p>The user with the provided name isn't found. This error can happen in any operation that requires finding a user based on a provided user name, such as <code>DeleteUser</code>, <code>DescribeUser</code>, and so on.</p>",
+      "error":{"httpStatusCode":404},
+      "exception":true
+    },
+    "RdsParameters":{
+      "type":"structure",
+      "required":[
+        "InstanceId",
+        "Database"
+      ],
+      "members":{
+        "InstanceId":{
+          "shape":"InstanceId",
+          "documentation":"<p>Instance ID.</p>"
+        },
+        "Database":{
+          "shape":"Database",
+          "documentation":"<p>Database.</p>"
+        }
+      },
+      "documentation":"<p>Amazon RDS parameters.</p>"
+    },
+    "RedshiftParameters":{
+      "type":"structure",
+      "required":["Database"],
+      "members":{
+        "Host":{
+          "shape":"Host",
+          "documentation":"<p>Host. This field can be blank if <code>ClusterId</code> is provided.</p>"
+        },
+        "Port":{
+          "shape":"OptionalPort",
+          "documentation":"<p>Port. This field can be blank if the <code>ClusterId</code> is provided.</p>"
+        },
+        "Database":{
+          "shape":"Database",
+          "documentation":"<p>Database.</p>"
+        },
+        "ClusterId":{
+          "shape":"ClusterId",
+          "documentation":"<p>Cluster ID. This field can be blank if the <code>Host</code> and <code>Port</code> are provided.</p>"
+        }
+      },
+      "documentation":"<p>Amazon Redshift parameters. The <code>ClusterId</code> field can be blank if <code>Host</code> and <code>Port</code> are both set. The <code>Host</code> and <code>Port</code> fields can be blank if the <code>ClusterId</code> field is set.</p>"
+    },
+    "RegisterUserRequest":{
+      "type":"structure",
+      "required":[
+        "IdentityType",
+        "Email",
+        "UserRole",
+        "AwsAccountId",
+        "Namespace"
+      ],
+      "members":{
+        "IdentityType":{
+          "shape":"IdentityType",
+          "documentation":"<p>Amazon QuickSight supports several ways of managing the identity of users. This parameter accepts two values:</p> <ul> <li> <p> <code>IAM</code>: A user whose identity maps to an existing IAM user or role. </p> </li> <li> <p> <code>QUICKSIGHT</code>: A user whose identity is owned and managed internally by Amazon QuickSight. </p> </li> </ul>"
+        },
+        "Email":{
+          "shape":"String",
+          "documentation":"<p>The email address of the user that you want to register.</p>"
+        },
+        "UserRole":{
+          "shape":"UserRole",
+          "documentation":"<p>The Amazon QuickSight role for the user. The user role can be one of the following:</p> <ul> <li> <p> <code>READER</code>: A user who has read-only access to dashboards.</p> </li> <li> <p> <code>AUTHOR</code>: A user who can create data sources, datasets, analyses, and dashboards.</p> </li> <li> <p> <code>ADMIN</code>: A user who is an author, who can also manage Amazon QuickSight settings.</p> </li> <li> <p> <code>RESTRICTED_READER</code>: This role isn't currently available for use.</p> </li> <li> <p> <code>RESTRICTED_AUTHOR</code>: This role isn't currently available for use.</p> </li> </ul>"
+        },
+        "IamArn":{
+          "shape":"String",
+          "documentation":"<p>The ARN of the IAM user or role that you are registering with Amazon QuickSight. </p>"
+        },
+        "SessionName":{
+          "shape":"RoleSessionName",
+          "documentation":"<p>You need to use this parameter only when you register one or more users using an assumed IAM role. You don't need to provide the session name for other scenarios, for example when you are registering an IAM user or an Amazon QuickSight user. You can register multiple users using the same IAM role if each user has a different session name. For more information on assuming IAM roles, see <a href=\"https://docs.aws.example.com/cli/latest/reference/sts/assume-role.html\"> <code>assume-role</code> </a> in the <i>AWS CLI Reference.</i> </p>"
+        },
+        "AwsAccountId":{
+          "shape":"AwsAccountId",
+          "documentation":"<p>The ID for the AWS account that the user is in. Currently, you use the ID for the AWS account that contains your Amazon QuickSight account.</p>",
+          "location":"uri",
+          "locationName":"AwsAccountId"
+        },
+        "Namespace":{
+          "shape":"Namespace",
+          "documentation":"<p>The namespace. Currently, you should set this to <code>default</code>.</p>",
+          "location":"uri",
+          "locationName":"Namespace"
+        },
+        "UserName":{
+          "shape":"UserName",
+          "documentation":"<p>The Amazon QuickSight user name that you want to create for the user you are registering.</p>"
+        }
+      }
+    },
+    "RegisterUserResponse":{
+      "type":"structure",
+      "members":{
+        "User":{
+          "shape":"User",
+          "documentation":"<p>The user name.</p>"
+        },
+        "UserInvitationUrl":{
+          "shape":"String",
+          "documentation":"<p>The URL the user visits to complete registration and provide a password. This is returned only for users with an identity type of <code>QUICKSIGHT</code>.</p>"
+        },
+        "RequestId":{
+          "shape":"String",
+          "documentation":"<p>The AWS request ID for this operation.</p>"
+        },
+        "Status":{
+          "shape":"StatusCode",
+          "documentation":"<p>The HTTP status of the request.</p>",
+          "location":"statusCode"
+        }
+      }
+    },
+    "RelationalTable":{
+      "type":"structure",
+      "required":[
+        "DataSourceArn",
+        "Name",
+        "InputColumns"
+      ],
+      "members":{
+        "DataSourceArn":{
+          "shape":"Arn",
+          "documentation":"<p>The Amazon Resource Name (ARN) for the data source.</p>"
+        },
+        "Schema":{
+          "shape":"RelationalTableSchema",
+          "documentation":"<p>The schema name. This name applies to certain relational database engines.</p>"
+        },
+        "Name":{
+          "shape":"RelationalTableName",
+          "documentation":"<p>The name of the relational table.</p>"
+        },
+        "InputColumns":{
+          "shape":"InputColumnList",
+          "documentation":"<p>The column schema of the table.</p>"
+        }
+      },
+      "documentation":"<p>A physical table type for relational data sources.</p>"
+    },
+    "RelationalTableName":{
+      "type":"string",
+      "max":64,
+      "min":1
+    },
+    "RelationalTableSchema":{
+      "type":"string",
+      "max":64
+    },
+    "RenameColumnOperation":{
+      "type":"structure",
+      "required":[
+        "ColumnName",
+        "NewColumnName"
+      ],
+      "members":{
+        "ColumnName":{
+          "shape":"ColumnName",
+          "documentation":"<p>The name of the column to be renamed.</p>"
+        },
+        "NewColumnName":{
+          "shape":"ColumnName",
+          "documentation":"<p>The new name for the column.</p>"
+        }
+      },
+      "documentation":"<p>A transform operation that renames a column.</p>"
+    },
+    "ResourceExistsException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"String"},
+        "ResourceType":{
+          "shape":"ExceptionResourceType",
+          "documentation":"<p>The AWS request ID for this request.</p>"
+        },
+        "RequestId":{
+          "shape":"String",
+          "documentation":"<p>The AWS request ID for this request.</p>"
+        }
+      },
+      "documentation":"<p>The resource specified already exists. </p>",
+      "error":{"httpStatusCode":409},
+      "exception":true
+    },
+    "ResourceId":{"type":"string"},
+    "ResourceName":{
+      "type":"string",
+      "max":128,
+      "min":1
+    },
+    "ResourceNotFoundException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"String"},
+        "ResourceType":{
+          "shape":"ExceptionResourceType",
+          "documentation":"<p>The AWS request ID for this request.</p>"
+        },
+        "RequestId":{
+          "shape":"String",
+          "documentation":"<p>The AWS request ID for this request.</p>"
+        }
+      },
+      "documentation":"<p>One or more resources can't be found.</p>",
+      "error":{"httpStatusCode":404},
+      "exception":true
+    },
+    "ResourcePermission":{
+      "type":"structure",
+      "required":[
+        "Principal",
+        "Actions"
+      ],
+      "members":{
+        "Principal":{
+          "shape":"Principal",
+          "documentation":"<p>The Amazon Resource Name (ARN) of an Amazon QuickSight user or group, or an IAM ARN. If you are using cross-account resource sharing, this is the IAM ARN of an account root. Otherwise, it is the ARN of a QuickSight user or group. .</p>"
+        },
+        "Actions":{
+          "shape":"ActionList",
+          "documentation":"<p>The action to grant or revoke permissions on, for example <code>\"quicksight:DescribeDashboard\"</code>.</p>"
+        }
+      },
+      "documentation":"<p>Permission for the resource.</p>"
+    },
+    "ResourcePermissionList":{
+      "type":"list",
+      "member":{"shape":"ResourcePermission"},
+      "max":64,
+      "min":1
+    },
+    "ResourceStatus":{
+      "type":"string",
+      "enum":[
+        "CREATION_IN_PROGRESS",
+        "CREATION_SUCCESSFUL",
+        "CREATION_FAILED",
+        "UPDATE_IN_PROGRESS",
+        "UPDATE_SUCCESSFUL",
+        "UPDATE_FAILED"
+      ]
+    },
+    "ResourceUnavailableException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"String"},
+        "ResourceType":{
+          "shape":"ExceptionResourceType",
+          "documentation":"<p>The resource type for this request.</p>"
+        },
+        "RequestId":{
+          "shape":"String",
+          "documentation":"<p>The AWS request ID for this request.</p>"
+        }
+      },
+      "documentation":"<p>This resource is currently unavailable.</p>",
+      "error":{"httpStatusCode":503},
+      "exception":true
+    },
+    "RestrictiveResourceId":{
+      "type":"string",
+      "max":2048,
+      "min":1,
+      "pattern":"[\\w\\-]+"
+    },
+    "RoleSessionName":{
+      "type":"string",
+      "max":64,
+      "min":2,
+      "pattern":"[\\w+=.@-]*"
+    },
+    "RowInfo":{
+      "type":"structure",
+      "members":{
+        "RowsIngested":{
+          "shape":"long",
+          "documentation":"<p>The number of rows that were ingested.</p>",
+          "box":true
+        },
+        "RowsDropped":{
+          "shape":"long",
+          "documentation":"<p>The number of rows that were not ingested.</p>",
+          "box":true
+        }
+      },
+      "documentation":"<p>Information about rows for a data set SPICE ingestion.</p>"
+    },
+    "RowLevelPermissionDataSet":{
+      "type":"structure",
+      "required":[
+        "Arn",
+        "PermissionPolicy"
+      ],
+      "members":{
+        "Arn":{
+          "shape":"Arn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the permission dataset.</p>"
+        },
+        "PermissionPolicy":{
+          "shape":"RowLevelPermissionPolicy",
+          "documentation":"<p>Permission policy.</p>"
+        }
+      },
+      "documentation":"<p>The row-level security configuration for the dataset.</p>"
+    },
+    "RowLevelPermissionPolicy":{
+      "type":"string",
+      "enum":[
+        "GRANT_ACCESS",
+        "DENY_ACCESS"
+      ]
+    },
+    "S3Bucket":{
+      "type":"string",
+      "max":1024,
+      "min":1
+    },
+    "S3Key":{
+      "type":"string",
+      "max":1024,
+      "min":1
+    },
+    "S3Parameters":{
+      "type":"structure",
+      "required":["ManifestFileLocation"],
+      "members":{
+        "ManifestFileLocation":{
+          "shape":"ManifestFileLocation",
+          "documentation":"<p>Location of the Amazon S3 manifest file. This is NULL if the manifest file was uploaded in the console.</p>"
+        }
+      },
+      "documentation":"<p>S3 parameters.</p>"
+    },
+    "S3Source":{
+      "type":"structure",
+      "required":[
+        "DataSourceArn",
+        "InputColumns"
+      ],
+      "members":{
+        "DataSourceArn":{
+          "shape":"Arn",
+          "documentation":"<p>The amazon Resource Name (ARN) for the data source.</p>"
+        },
+        "UploadSettings":{
+          "shape":"UploadSettings",
+          "documentation":"<p>Information about the format for the S3 source file or files.</p>"
+        },
+        "InputColumns":{
+          "shape":"InputColumnList",
+          "documentation":"<p>A physical table type for as S3 data source.</p>"
+        }
+      },
+      "documentation":"<p>A physical table type for as S3 data source.</p>"
+    },
+    "SearchDashboardsRequest":{
+      "type":"structure",
+      "required":[
+        "AwsAccountId",
+        "Filters"
+      ],
+      "members":{
+        "AwsAccountId":{
+          "shape":"AwsAccountId",
+          "documentation":"<p>The ID of the AWS account that contains the user whose dashboards you're searching for. </p>",
+          "location":"uri",
+          "locationName":"AwsAccountId"
+        },
+        "Filters":{
+          "shape":"DashboardSearchFilterList",
+          "documentation":"<p>The filters to apply to the search. Currently, you can search only by user name. For example, <code>\"Filters\": [ { \"Name\": \"QUICKSIGHT_USER\", \"Operator\": \"StringEquals\", \"Value\": \"arn:aws:quicksight:us-east-1:1:user/default/UserName1\" } ]</code> </p>"
+        },
+        "NextToken":{
+          "shape":"String",
+          "documentation":"<p>The token for the next set of results, or null if there are no more results.</p>"
+        },
+        "MaxResults":{
+          "shape":"MaxResults",
+          "documentation":"<p>The maximum number of results to be returned per request.</p>"
+        }
+      }
+    },
+    "SearchDashboardsResponse":{
+      "type":"structure",
+      "members":{
+        "DashboardSummaryList":{
+          "shape":"DashboardSummaryList",
+          "documentation":"<p>The list of dashboards owned by the user specified in <code>Filters</code> in your request.</p>"
+        },
+        "NextToken":{
+          "shape":"String",
+          "documentation":"<p>The token for the next set of results, or null if there are no more results.</p>"
+        },
+        "Status":{
+          "shape":"StatusCode",
+          "documentation":"<p>The HTTP status of the request.</p>",
+          "location":"statusCode"
+        },
+        "RequestId":{
+          "shape":"String",
+          "documentation":"<p>The AWS request ID for this operation.</p>"
+        }
+      }
+    },
+    "ServiceNowParameters":{
+      "type":"structure",
+      "required":["SiteBaseUrl"],
+      "members":{
+        "SiteBaseUrl":{
+          "shape":"SiteBaseUrl",
+          "documentation":"<p>URL of the base site.</p>"
+        }
+      },
+      "documentation":"<p>ServiceNow parameters.</p>"
+    },
+    "SessionLifetimeInMinutes":{
+      "type":"long",
+      "max":600,
+      "min":15
+    },
+    "SessionLifetimeInMinutesInvalidException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"String"},
+        "RequestId":{
+          "shape":"String",
+          "documentation":"<p>The AWS request ID for this request.</p>"
+        }
+      },
+      "documentation":"<p>The number of minutes specified for the lifetime of a session isn't valid. The session lifetime must be 15-600 minutes.</p>",
+      "error":{"httpStatusCode":400},
+      "exception":true
+    },
+    "SheetControlsOption":{
+      "type":"structure",
+      "members":{
+        "VisibilityState":{
+          "shape":"DashboardUIState",
+          "documentation":"<p>Visibility state.</p>"
+        }
+      },
+      "documentation":"<p>Sheet controls option.</p>"
+    },
+    "SiteBaseUrl":{
+      "type":"string",
+      "max":1024,
+      "min":1
+    },
+    "SnowflakeParameters":{
+      "type":"structure",
+      "required":[
+        "Host",
+        "Database",
+        "Warehouse"
+      ],
+      "members":{
+        "Host":{
+          "shape":"Host",
+          "documentation":"<p>Host.</p>"
+        },
+        "Database":{
+          "shape":"Database",
+          "documentation":"<p>Database.</p>"
+        },
+        "Warehouse":{
+          "shape":"Warehouse",
+          "documentation":"<p>Warehouse.</p>"
+        }
+      },
+      "documentation":"<p>Snowflake parameters.</p>"
+    },
+    "SparkParameters":{
+      "type":"structure",
+      "required":[
+        "Host",
+        "Port"
+      ],
+      "members":{
+        "Host":{
+          "shape":"Host",
+          "documentation":"<p>Host.</p>"
+        },
+        "Port":{
+          "shape":"Port",
+          "documentation":"<p>Port.</p>"
+        }
+      },
+      "documentation":"<p>Spark parameters.</p>"
+    },
+    "SqlQuery":{
+      "type":"string",
+      "max":65536,
+      "min":1
+    },
+    "SqlServerParameters":{
+      "type":"structure",
+      "required":[
+        "Host",
+        "Port",
+        "Database"
+      ],
+      "members":{
+        "Host":{
+          "shape":"Host",
+          "documentation":"<p>Host.</p>"
+        },
+        "Port":{
+          "shape":"Port",
+          "documentation":"<p>Port.</p>"
+        },
+        "Database":{
+          "shape":"Database",
+          "documentation":"<p>Database.</p>"
+        }
+      },
+      "documentation":"<p>SQL Server parameters.</p>"
+    },
+    "SslProperties":{
+      "type":"structure",
+      "members":{
+        "DisableSsl":{
+          "shape":"Boolean",
+          "documentation":"<p>A Boolean option to control whether SSL should be disabled.</p>"
+        }
+      },
+      "documentation":"<p>Secure Socket Layer (SSL) properties that apply when QuickSight connects to your underlying data source.</p>"
+    },
+    "StatusCode":{"type":"integer"},
+    "String":{"type":"string"},
+    "StringList":{
+      "type":"list",
+      "member":{"shape":"String"}
+    },
+    "StringParameter":{
+      "type":"structure",
+      "required":[
+        "Name",
+        "Values"
+      ],
+      "members":{
+        "Name":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>A display name for the dataset.</p>"
+        },
+        "Values":{
+          "shape":"StringList",
+          "documentation":"<p>Values.</p>"
+        }
+      },
+      "documentation":"<p>String parameter.</p>"
+    },
+    "StringParameterList":{
+      "type":"list",
+      "member":{"shape":"StringParameter"},
+      "max":100
+    },
+    "Tag":{
+      "type":"structure",
+      "required":[
+        "Key",
+        "Value"
+      ],
+      "members":{
+        "Key":{
+          "shape":"TagKey",
+          "documentation":"<p>Tag key.</p>"
+        },
+        "Value":{
+          "shape":"TagValue",
+          "documentation":"<p>Tag value.</p>"
+        }
+      },
+      "documentation":"<p>The key or keys of the key-value pairs for the resource tag or tags assigned to the resource.</p>"
+    },
+    "TagColumnOperation":{
+      "type":"structure",
+      "required":[
+        "ColumnName",
+        "Tags"
+      ],
+      "members":{
+        "ColumnName":{
+          "shape":"ColumnName",
+          "documentation":"<p>The column that this operation acts on.</p>"
+        },
+        "Tags":{
+          "shape":"ColumnTagList",
+          "documentation":"<p>The dataset column tag, currently only used for geospatial type tagging. .</p> <note> <p>This is not tags for the AWS tagging feature. .</p> </note>"
+        }
+      },
+      "documentation":"<p>A transform operation that tags a column with additional information.</p>"
+    },
+    "TagKey":{
+      "type":"string",
+      "max":128,
+      "min":1
+    },
+    "TagKeyList":{
+      "type":"list",
+      "member":{"shape":"TagKey"},
+      "max":200,
+      "min":1
+    },
+    "TagList":{
+      "type":"list",
+      "member":{"shape":"Tag"},
+      "max":200,
+      "min":1
+    },
+    "TagResourceRequest":{
       "type":"structure",
       "required":[
-        "MemberName",
-        "GroupName",
-        "AwsAccountId",
-        "Namespace"
+        "ResourceArn",
+        "Tags"
       ],
       "members":{
-        "MemberName":{
-          "shape":"GroupMemberName",
-          "documentation":"<p>The name of the user that you want to add to the group membership.</p>",
-          "location":"uri",
-          "locationName":"MemberName"
-        },
-        "GroupName":{
-          "shape":"GroupName",
-          "documentation":"<p>The name of the group that you want to add the user to.</p>",
-          "location":"uri",
-          "locationName":"GroupName"
-        },
-        "AwsAccountId":{
-          "shape":"AwsAccountId",
-          "documentation":"<p>The ID for the AWS account that the group is in. Currently, you use the ID for the AWS account that contains your Amazon QuickSight account.</p>",
+        "ResourceArn":{
+          "shape":"Arn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the resource that you want to tag.</p>",
           "location":"uri",
-          "locationName":"AwsAccountId"
+          "locationName":"ResourceArn"
         },
-        "Namespace":{
-          "shape":"Namespace",
-          "documentation":"<p>The namespace. Currently, you should set this to <code>default</code>.</p>",
-          "location":"uri",
-          "locationName":"Namespace"
+        "Tags":{
+          "shape":"TagList",
+          "documentation":"<p>Contains a map of the key-value pairs for the resource tag or tags assigned to the resource.</p>"
         }
       }
     },
-    "CreateGroupMembershipResponse":{
+    "TagResourceResponse":{
       "type":"structure",
       "members":{
-        "GroupMember":{
-          "shape":"GroupMember",
-          "documentation":"<p>The group member.</p>"
-        },
         "RequestId":{
           "shape":"String",
           "documentation":"<p>The AWS request ID for this operation.</p>"
         },
         "Status":{
           "shape":"StatusCode",
-          "documentation":"<p>The http status of the request.</p>",
+          "documentation":"<p>The HTTP status of the request.</p>",
           "location":"statusCode"
         }
       }
     },
-    "CreateGroupRequest":{
+    "TagValue":{
+      "type":"string",
+      "max":256,
+      "min":1
+    },
+    "Template":{
       "type":"structure",
-      "required":[
-        "GroupName",
-        "AwsAccountId",
-        "Namespace"
-      ],
       "members":{
-        "GroupName":{
-          "shape":"GroupName",
-          "documentation":"<p>A name for the group that you want to create.</p>"
+        "Arn":{
+          "shape":"Arn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the template.</p>"
         },
-        "Description":{
-          "shape":"GroupDescription",
-          "documentation":"<p>A description for the group that you want to create.</p>"
+        "Name":{
+          "shape":"TemplateName",
+          "documentation":"<p>The display name of the template.</p>"
         },
-        "AwsAccountId":{
-          "shape":"AwsAccountId",
-          "documentation":"<p>The ID for the AWS account that the group is in. Currently, you use the ID for the AWS account that contains your Amazon QuickSight account.</p>",
-          "location":"uri",
-          "locationName":"AwsAccountId"
+        "Version":{
+          "shape":"TemplateVersion",
+          "documentation":"<p>A structure describing the versions of the template.</p>"
         },
-        "Namespace":{
-          "shape":"Namespace",
-          "documentation":"<p>The namespace. Currently, you should set this to <code>default</code>.</p>",
-          "location":"uri",
-          "locationName":"Namespace"
+        "TemplateId":{
+          "shape":"RestrictiveResourceId",
+          "documentation":"<p>The ID for the template. This is unique per AWS Region for each AWS account.</p>"
+        },
+        "LastUpdatedTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>Time when this was last updated.</p>"
+        },
+        "CreatedTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>Time when this was created.</p>"
         }
       },
-      "documentation":"<p>The request object for this operation. </p>"
+      "documentation":"<p>A template object. A <i>template</i> is an entity in QuickSight that encapsulates the metadata required to create an analysis and that you can use to create a dashboard. A template adds a layer of abstraction by using placeholders to replace the dataset associated with the analysis. You can use templates to create dashboards by replacing dataset placeholders with datasets that follow the same schema that was used to create the source analysis and template.</p> <p>You can share templates across AWS accounts by allowing users in other AWS accounts to create a template or a dashboard from an existing template.</p>"
     },
-    "CreateGroupResponse":{
+    "TemplateAlias":{
       "type":"structure",
       "members":{
-        "Group":{
-          "shape":"Group",
-          "documentation":"<p>The name of the group.</p>"
+        "AliasName":{
+          "shape":"AliasName",
+          "documentation":"<p>The display name of the template alias.</p>"
         },
-        "RequestId":{
-          "shape":"String",
-          "documentation":"<p>The AWS request ID for this operation.</p>"
+        "Arn":{
+          "shape":"Arn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the template alias.</p>"
         },
-        "Status":{
-          "shape":"StatusCode",
-          "documentation":"<p>The http status of the request.</p>",
-          "location":"statusCode"
+        "TemplateVersionNumber":{
+          "shape":"VersionNumber",
+          "documentation":"<p>The version number of the template alias.</p>"
         }
       },
-      "documentation":"<p>The response object for this operation.</p>"
+      "documentation":"<p>The template alias.</p>"
     },
-    "DeleteGroupMembershipRequest":{
+    "TemplateAliasList":{
+      "type":"list",
+      "member":{"shape":"TemplateAlias"},
+      "max":100
+    },
+    "TemplateError":{
+      "type":"structure",
+      "members":{
+        "Type":{
+          "shape":"TemplateErrorType",
+          "documentation":"<p>Type of error.</p>"
+        },
+        "Message":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>Description of the error type.</p>"
+        }
+      },
+      "documentation":"<p>List of errors that occurred when the template version creation failed.</p>"
+    },
+    "TemplateErrorList":{
+      "type":"list",
+      "member":{"shape":"TemplateError"},
+      "min":1
+    },
+    "TemplateErrorType":{
+      "type":"string",
+      "enum":[
+        "DATA_SET_NOT_FOUND",
+        "INTERNAL_FAILURE"
+      ]
+    },
+    "TemplateName":{
+      "type":"string",
+      "max":2048,
+      "min":1,
+      "pattern":"[\\u0020-\\u00FF]+"
+    },
+    "TemplateSourceAnalysis":{
       "type":"structure",
       "required":[
-        "MemberName",
-        "GroupName",
-        "AwsAccountId",
-        "Namespace"
+        "Arn",
+        "DataSetReferences"
       ],
       "members":{
-        "MemberName":{
-          "shape":"GroupMemberName",
-          "documentation":"<p>The name of the user that you want to delete from the group membership.</p>",
-          "location":"uri",
-          "locationName":"MemberName"
-        },
-        "GroupName":{
-          "shape":"GroupName",
-          "documentation":"<p>The name of the group that you want to delete the user from.</p>",
-          "location":"uri",
-          "locationName":"GroupName"
+        "Arn":{
+          "shape":"Arn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the resource.</p>"
         },
-        "AwsAccountId":{
-          "shape":"AwsAccountId",
-          "documentation":"<p>The ID for the AWS account that the group is in. Currently, you use the ID for the AWS account that contains your Amazon QuickSight account.</p>",
-          "location":"uri",
-          "locationName":"AwsAccountId"
+        "DataSetReferences":{
+          "shape":"DataSetReferenceList",
+          "documentation":"<p>A structure containing information about the dataset references used as placeholders in the template.</p>"
+        }
+      },
+      "documentation":"<p>The source analysis of the template.</p>"
+    },
+    "TemplateSourceEntity":{
+      "type":"structure",
+      "members":{
+        "SourceAnalysis":{
+          "shape":"TemplateSourceAnalysis",
+          "documentation":"<p>The source analysis, if it is based on an analysis.</p>"
         },
-        "Namespace":{
-          "shape":"Namespace",
-          "documentation":"<p>The namespace. Currently, you should set this to <code>default</code>.</p>",
-          "location":"uri",
-          "locationName":"Namespace"
+        "SourceTemplate":{
+          "shape":"TemplateSourceTemplate",
+          "documentation":"<p>The source template, if it is based on an template.</p>"
         }
-      }
+      },
+      "documentation":"<p>The source entity of the template.</p>"
     },
-    "DeleteGroupMembershipResponse":{
+    "TemplateSourceTemplate":{
       "type":"structure",
+      "required":["Arn"],
       "members":{
-        "RequestId":{
-          "shape":"String",
-          "documentation":"<p>The AWS request ID for this operation.</p>"
+        "Arn":{
+          "shape":"Arn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the resource.</p>"
+        }
+      },
+      "documentation":"<p>The source template of the template.</p>"
+    },
+    "TemplateSummary":{
+      "type":"structure",
+      "members":{
+        "Arn":{
+          "shape":"Arn",
+          "documentation":"<p>A summary of a template.</p>"
         },
-        "Status":{
-          "shape":"StatusCode",
-          "documentation":"<p>The http status of the request.</p>",
-          "location":"statusCode"
+        "TemplateId":{
+          "shape":"RestrictiveResourceId",
+          "documentation":"<p>The ID of the template. This ID is unique per AWS Region for each AWS account.</p>"
+        },
+        "Name":{
+          "shape":"TemplateName",
+          "documentation":"<p>A display name for the template.</p>"
+        },
+        "LatestVersionNumber":{
+          "shape":"VersionNumber",
+          "documentation":"<p>A structure containing a list of version numbers for the template summary.</p>"
+        },
+        "CreatedTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>The last time that this template was created.</p>"
+        },
+        "LastUpdatedTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>The last time that this template was updated.</p>"
         }
-      }
+      },
+      "documentation":"<p>The template summary.</p>"
     },
-    "DeleteGroupRequest":{
+    "TemplateSummaryList":{
+      "type":"list",
+      "member":{"shape":"TemplateSummary"},
+      "max":100
+    },
+    "TemplateVersion":{
       "type":"structure",
-      "required":[
-        "GroupName",
-        "AwsAccountId",
-        "Namespace"
-      ],
       "members":{
-        "GroupName":{
-          "shape":"GroupName",
-          "documentation":"<p>The name of the group that you want to delete.</p>",
-          "location":"uri",
-          "locationName":"GroupName"
+        "CreatedTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>The time that this template version was created.</p>"
         },
-        "AwsAccountId":{
-          "shape":"AwsAccountId",
-          "documentation":"<p>The ID for the AWS account that the group is in. Currently, you use the ID for the AWS account that contains your Amazon QuickSight account.</p>",
-          "location":"uri",
-          "locationName":"AwsAccountId"
+        "Errors":{
+          "shape":"TemplateErrorList",
+          "documentation":"<p>Errors associated with the template.</p>"
         },
-        "Namespace":{
-          "shape":"Namespace",
-          "documentation":"<p>The namespace. Currently, you should set this to <code>default</code>.</p>",
-          "location":"uri",
-          "locationName":"Namespace"
+        "VersionNumber":{
+          "shape":"VersionNumber",
+          "documentation":"<p>The version number of the template.</p>"
+        },
+        "Status":{
+          "shape":"ResourceStatus",
+          "documentation":"<p>The HTTP status of the request.</p>"
+        },
+        "DataSetConfigurations":{
+          "shape":"DataSetConfigurationList",
+          "documentation":"<p>Schema of the dataset identified by the placeholder. The idea is that any dashboard created from the template should be bound to new datasets matching the same schema described through this API. .</p>"
+        },
+        "Description":{
+          "shape":"VersionDescription",
+          "documentation":"<p>The description of the template.</p>"
+        },
+        "SourceEntityArn":{
+          "shape":"Arn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the analysis or template which was used to create this template.</p>"
         }
-      }
+      },
+      "documentation":"<p>A version of a template.</p>"
     },
-    "DeleteGroupResponse":{
+    "TemplateVersionSummary":{
       "type":"structure",
       "members":{
-        "RequestId":{
-          "shape":"String",
-          "documentation":"<p>The AWS request ID for this operation.</p>"
+        "Arn":{
+          "shape":"Arn",
+          "documentation":"<p>The ARN of the template version.</p>"
+        },
+        "VersionNumber":{
+          "shape":"VersionNumber",
+          "documentation":"<p>The version number of the template version.</p>"
+        },
+        "CreatedTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>The time that this template version was created.</p>"
         },
         "Status":{
-          "shape":"StatusCode",
-          "documentation":"<p>The http status of the request.</p>",
-          "location":"statusCode"
+          "shape":"ResourceStatus",
+          "documentation":"<p>The status of the template version.</p>"
+        },
+        "Description":{
+          "shape":"VersionDescription",
+          "documentation":"<p>The description of the template version.</p>"
         }
-      }
+      },
+      "documentation":"<p>The template version.</p>"
     },
-    "DeleteUserByPrincipalIdRequest":{
+    "TemplateVersionSummaryList":{
+      "type":"list",
+      "member":{"shape":"TemplateVersionSummary"},
+      "max":100
+    },
+    "TeradataParameters":{
       "type":"structure",
       "required":[
-        "PrincipalId",
-        "AwsAccountId",
-        "Namespace"
+        "Host",
+        "Port",
+        "Database"
       ],
       "members":{
-        "PrincipalId":{
-          "shape":"String",
-          "documentation":"<p>The principal ID of the user.</p>",
-          "location":"uri",
-          "locationName":"PrincipalId"
+        "Host":{
+          "shape":"Host",
+          "documentation":"<p>Host.</p>"
         },
-        "AwsAccountId":{
-          "shape":"AwsAccountId",
-          "documentation":"<p>The ID for the AWS account that the user is in. Currently, you use the ID for the AWS account that contains your Amazon QuickSight account.</p>",
-          "location":"uri",
-          "locationName":"AwsAccountId"
+        "Port":{
+          "shape":"Port",
+          "documentation":"<p>Port.</p>"
         },
-        "Namespace":{
-          "shape":"Namespace",
-          "documentation":"<p>The namespace. Currently, you should set this to <code>default</code>.</p>",
-          "location":"uri",
-          "locationName":"Namespace"
+        "Database":{
+          "shape":"Database",
+          "documentation":"<p>Database.</p>"
         }
       },
-      "documentation":"<p/>"
+      "documentation":"<p>Teradata parameters.</p>"
     },
-    "DeleteUserByPrincipalIdResponse":{
+    "TextQualifier":{
+      "type":"string",
+      "enum":[
+        "DOUBLE_QUOTE",
+        "SINGLE_QUOTE"
+      ]
+    },
+    "ThrottlingException":{
       "type":"structure",
       "members":{
+        "Message":{"shape":"String"},
         "RequestId":{
           "shape":"String",
-          "documentation":"<p>The AWS request ID for this operation.</p>"
+          "documentation":"<p>The AWS request ID for this request.</p>"
+        }
+      },
+      "documentation":"<p>Access is throttled.</p>",
+      "error":{"httpStatusCode":429},
+      "exception":true
+    },
+    "Timestamp":{"type":"timestamp"},
+    "TimestampList":{
+      "type":"list",
+      "member":{"shape":"Timestamp"}
+    },
+    "TransformOperation":{
+      "type":"structure",
+      "members":{
+        "ProjectOperation":{
+          "shape":"ProjectOperation",
+          "documentation":"<p>An operation that projects columns. Operations that come after a projection can only refer to projected columns.</p>"
         },
-        "Status":{
-          "shape":"StatusCode",
-          "documentation":"<p>The http status of the request.</p>",
-          "location":"statusCode"
+        "FilterOperation":{
+          "shape":"FilterOperation",
+          "documentation":"<p>An operation that filters rows based on some condition.</p>"
+        },
+        "CreateColumnsOperation":{
+          "shape":"CreateColumnsOperation",
+          "documentation":"<p>An operation that creates calculated columns. Columns created in one such operation form a lexical closure.</p>"
+        },
+        "RenameColumnOperation":{
+          "shape":"RenameColumnOperation",
+          "documentation":"<p>An operation that renames a column.</p>"
+        },
+        "CastColumnTypeOperation":{
+          "shape":"CastColumnTypeOperation",
+          "documentation":"<p>A transform operation that casts a column to a different type.</p>"
+        },
+        "TagColumnOperation":{
+          "shape":"TagColumnOperation",
+          "documentation":"<p>An operation that tags a column with additional information.</p>"
         }
-      }
+      },
+      "documentation":"<p>A data transformation on a logical table. This is a variant type structure. For this structure to be valid, only one of the attributes can be non-null.</p>"
     },
-    "DeleteUserRequest":{
+    "TransformOperationList":{
+      "type":"list",
+      "member":{"shape":"TransformOperation"},
+      "max":2048,
+      "min":1
+    },
+    "TwitterParameters":{
       "type":"structure",
-      "required":[
-        "UserName",
-        "AwsAccountId",
-        "Namespace"
+      "required":[
+        "Query",
+        "MaxRows"
       ],
       "members":{
-        "UserName":{
-          "shape":"UserName",
-          "documentation":"<p>The name of the user that you want to delete.</p>",
-          "location":"uri",
-          "locationName":"UserName"
-        },
-        "AwsAccountId":{
-          "shape":"AwsAccountId",
-          "documentation":"<p>The ID for the AWS account that the user is in. Currently, you use the ID for the AWS account that contains your Amazon QuickSight account.</p>",
-          "location":"uri",
-          "locationName":"AwsAccountId"
+        "Query":{
+          "shape":"Query",
+          "documentation":"<p>Twitter query string.</p>"
         },
-        "Namespace":{
-          "shape":"Namespace",
-          "documentation":"<p>The namespace. Currently, you should set this to <code>default</code>.</p>",
-          "location":"uri",
-          "locationName":"Namespace"
+        "MaxRows":{
+          "shape":"PositiveInteger",
+          "documentation":"<p>Maximum number of rows to query Twitter.</p>"
         }
-      }
+      },
+      "documentation":"<p>Twitter parameters.</p>"
     },
-    "DeleteUserResponse":{
+    "TypeCastFormat":{
+      "type":"string",
+      "max":32
+    },
+    "UnsupportedUserEditionException":{
       "type":"structure",
       "members":{
+        "Message":{"shape":"String"},
         "RequestId":{
           "shape":"String",
-          "documentation":"<p>The AWS request ID for this operation.</p>"
-        },
-        "Status":{
-          "shape":"StatusCode",
-          "documentation":"<p>The http status of the request.</p>",
-          "location":"statusCode"
+          "documentation":"<p>The AWS request ID for this request.</p>"
         }
-      }
+      },
+      "documentation":"<p>This error indicates that you are calling an operation on an Amazon QuickSight subscription where the edition doesn't include support for that operation. Amazon QuickSight currently has Standard Edition and Enterprise Edition. Not every operation and capability is available in every edition.</p>",
+      "error":{"httpStatusCode":403},
+      "exception":true
     },
-    "DescribeGroupRequest":{
+    "UntagResourceRequest":{
       "type":"structure",
       "required":[
-        "GroupName",
-        "AwsAccountId",
-        "Namespace"
+        "ResourceArn",
+        "TagKeys"
       ],
       "members":{
-        "GroupName":{
-          "shape":"GroupName",
-          "documentation":"<p>The name of the group that you want to describe.</p>",
-          "location":"uri",
-          "locationName":"GroupName"
-        },
-        "AwsAccountId":{
-          "shape":"AwsAccountId",
-          "documentation":"<p>The ID for the AWS account that the group is in. Currently, you use the ID for the AWS account that contains your Amazon QuickSight account.</p>",
+        "ResourceArn":{
+          "shape":"Arn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the resource that you want to untag.</p>",
           "location":"uri",
-          "locationName":"AwsAccountId"
+          "locationName":"ResourceArn"
         },
-        "Namespace":{
-          "shape":"Namespace",
-          "documentation":"<p>The namespace. Currently, you should set this to <code>default</code>.</p>",
-          "location":"uri",
-          "locationName":"Namespace"
+        "TagKeys":{
+          "shape":"TagKeyList",
+          "documentation":"<p>The keys of the key-value pairs for the resource tag or tags assigned to the resource.</p>",
+          "location":"querystring",
+          "locationName":"keys"
         }
       }
     },
-    "DescribeGroupResponse":{
+    "UntagResourceResponse":{
       "type":"structure",
       "members":{
-        "Group":{
-          "shape":"Group",
-          "documentation":"<p>The name of the group.</p>"
-        },
         "RequestId":{
           "shape":"String",
           "documentation":"<p>The AWS request ID for this operation.</p>"
         },
         "Status":{
           "shape":"StatusCode",
-          "documentation":"<p>The http status of the request.</p>",
+          "documentation":"<p>The HTTP status of the request.</p>",
           "location":"statusCode"
         }
       }
     },
-    "DescribeUserRequest":{
+    "UpdateDashboardPermissionsRequest":{
       "type":"structure",
       "required":[
-        "UserName",
         "AwsAccountId",
-        "Namespace"
+        "DashboardId"
       ],
       "members":{
-        "UserName":{
-          "shape":"UserName",
-          "documentation":"<p>The name of the user that you want to describe.</p>",
-          "location":"uri",
-          "locationName":"UserName"
-        },
         "AwsAccountId":{
           "shape":"AwsAccountId",
-          "documentation":"<p>The ID for the AWS account that the user is in. Currently, you use the ID for the AWS account that contains your Amazon QuickSight account.</p>",
+          "documentation":"<p>The ID of the AWS account that contains the dashboard whose permissions you're updating.</p>",
           "location":"uri",
           "locationName":"AwsAccountId"
         },
-        "Namespace":{
-          "shape":"Namespace",
-          "documentation":"<p>The namespace. Currently, you should set this to <code>default</code>.</p>",
+        "DashboardId":{
+          "shape":"RestrictiveResourceId",
+          "documentation":"<p>The ID for the dashboard.</p>",
           "location":"uri",
-          "locationName":"Namespace"
+          "locationName":"DashboardId"
+        },
+        "GrantPermissions":{
+          "shape":"UpdateResourcePermissionList",
+          "documentation":"<p>The permissions that you want to grant on this resource.</p>"
+        },
+        "RevokePermissions":{
+          "shape":"UpdateResourcePermissionList",
+          "documentation":"<p>The permissions that you want to revoke from this resource.</p>"
         }
       }
     },
-    "DescribeUserResponse":{
+    "UpdateDashboardPermissionsResponse":{
       "type":"structure",
       "members":{
-        "User":{
-          "shape":"User",
-          "documentation":"<p>The user name.</p>"
+        "DashboardArn":{
+          "shape":"Arn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the dashboard.</p>"
+        },
+        "DashboardId":{
+          "shape":"RestrictiveResourceId",
+          "documentation":"<p>The ID for the dashboard.</p>"
+        },
+        "Permissions":{
+          "shape":"ResourcePermissionList",
+          "documentation":"<p>Information about the permissions on the dashboard.</p>"
         },
         "RequestId":{
           "shape":"String",
@@ -711,298 +6911,172 @@
         },
         "Status":{
           "shape":"StatusCode",
-          "documentation":"<p>The http status of the request.</p>",
+          "documentation":"<p>The HTTP status of the request.</p>",
           "location":"statusCode"
         }
       }
     },
-    "DomainNotWhitelistedException":{
-      "type":"structure",
-      "members":{
-        "Message":{"shape":"String"},
-        "RequestId":{
-          "shape":"String",
-          "documentation":"<p>The AWS request ID for this request.</p>"
-        }
-      },
-      "documentation":"<p>The domain specified is not on the allowlist. All domains for embedded dashboards must be added to the approved list by an Amazon QuickSight admin.</p>",
-      "error":{"httpStatusCode":403},
-      "exception":true
-    },
-    "EmbeddingUrl":{
-      "type":"string",
-      "sensitive":true
-    },
-    "ExceptionResourceType":{
-      "type":"string",
-      "enum":[
-        "USER",
-        "GROUP",
-        "NAMESPACE",
-        "DATA_SOURCE",
-        "DATA_SET",
-        "VPC_CONNECTION",
-        "INGESTION"
-      ]
-    },
-    "GetDashboardEmbedUrlRequest":{
+    "UpdateDashboardPublishedVersionRequest":{
       "type":"structure",
       "required":[
         "AwsAccountId",
         "DashboardId",
-        "IdentityType"
+        "VersionNumber"
       ],
       "members":{
         "AwsAccountId":{
           "shape":"AwsAccountId",
-          "documentation":"<p>AWS account ID that contains the dashboard you are embedding.</p>",
+          "documentation":"<p>The ID of the AWS account that contains the dashboard that you're updating.</p>",
           "location":"uri",
           "locationName":"AwsAccountId"
         },
         "DashboardId":{
-          "shape":"String",
-          "documentation":"<p>The ID for the dashboard, also added to IAM policy</p>",
+          "shape":"RestrictiveResourceId",
+          "documentation":"<p>The ID for the dashboard.</p>",
           "location":"uri",
-          "locationName":"DashboardId"
-        },
-        "IdentityType":{
-          "shape":"IdentityType",
-          "documentation":"<p>The authentication method the user uses to sign in (IAM only).</p>",
-          "location":"querystring",
-          "locationName":"creds-type"
-        },
-        "SessionLifetimeInMinutes":{
-          "shape":"SessionLifetimeInMinutes",
-          "documentation":"<p>How many minutes the session is valid. The session lifetime must be between 15 and 600 minutes.</p>",
-          "location":"querystring",
-          "locationName":"session-lifetime"
-        },
-        "UndoRedoDisabled":{
-          "shape":"boolean",
-          "documentation":"<p>Remove the undo/redo button on embedded dashboard. The default is FALSE, which enables the undo/redo button.</p>",
-          "location":"querystring",
-          "locationName":"undo-redo-disabled"
-        },
-        "ResetDisabled":{
-          "shape":"boolean",
-          "documentation":"<p>Remove the reset button on embedded dashboard. The default is FALSE, which allows the reset button.</p>",
-          "location":"querystring",
-          "locationName":"reset-disabled"
-        },
-        "UserArn":{
-          "shape":"Arn",
-          "documentation":"<p>The Amazon QuickSight user's ARN, for use with <code>QUICKSIGHT</code> identity type. You can use this for any of the following:</p> <ul> <li> <p>Amazon QuickSight users in your account (readers, authors, or admins)</p> </li> <li> <p>AD users</p> </li> <li> <p>Invited non-federated users</p> </li> <li> <p>Federated IAM users</p> </li> <li> <p>Federated IAM role-based sessions</p> </li> </ul>",
-          "location":"querystring",
-          "locationName":"user-arn"
-        }
-      }
-    },
-    "GetDashboardEmbedUrlResponse":{
-      "type":"structure",
-      "members":{
-        "EmbedUrl":{
-          "shape":"EmbeddingUrl",
-          "documentation":"<p>URL that you can put into your server-side webpage to embed your dashboard. This URL is valid for 5 minutes, and the resulting session is valid for 10 hours. The API provides the URL with an auth_code that enables a single-signon session. </p>"
-        },
-        "Status":{
-          "shape":"StatusCode",
-          "documentation":"<p>The http status of the request.</p>",
-          "location":"statusCode"
-        },
-        "RequestId":{
-          "shape":"String",
-          "documentation":"<p>The AWS request ID for this operation.</p>"
-        }
-      }
-    },
-    "Group":{
-      "type":"structure",
-      "members":{
-        "Arn":{
-          "shape":"Arn",
-          "documentation":"<p>The Amazon Resource Name (ARN) for the group.</p>"
-        },
-        "GroupName":{
-          "shape":"GroupName",
-          "documentation":"<p>The name of the group.</p>"
-        },
-        "Description":{
-          "shape":"GroupDescription",
-          "documentation":"<p>The group description.</p>"
-        },
-        "PrincipalId":{
-          "shape":"String",
-          "documentation":"<p>The principal ID of the group.</p>"
-        }
-      },
-      "documentation":"<p>A <i>group</i> in Amazon QuickSight consists of a set of users. You can use groups to make it easier to manage access and security. Currently, an Amazon QuickSight subscription can't contain more than 500 Amazon QuickSight groups.</p>"
-    },
-    "GroupDescription":{
-      "type":"string",
-      "max":512,
-      "min":1
-    },
-    "GroupList":{
-      "type":"list",
-      "member":{"shape":"Group"}
-    },
-    "GroupMember":{
-      "type":"structure",
-      "members":{
-        "Arn":{
-          "shape":"Arn",
-          "documentation":"<p>The Amazon Resource Name (ARN) for the group member (user).</p>"
-        },
-        "MemberName":{
-          "shape":"GroupMemberName",
-          "documentation":"<p>The name of the group member (user).</p>"
-        }
-      },
-      "documentation":"<p>A member of an Amazon QuickSight group. Currently, group members must be users. Groups can't be members of another group. </p>"
-    },
-    "GroupMemberList":{
-      "type":"list",
-      "member":{"shape":"GroupMember"}
-    },
-    "GroupMemberName":{
-      "type":"string",
-      "max":256,
-      "min":1,
-      "pattern":"[\\u0020-\\u00FF]+"
-    },
-    "GroupName":{
-      "type":"string",
-      "min":1,
-      "pattern":"[\\u0020-\\u00FF]+"
-    },
-    "IdentityType":{
-      "type":"string",
-      "enum":[
-        "IAM",
-        "QUICKSIGHT"
-      ]
-    },
-    "IdentityTypeNotSupportedException":{
-      "type":"structure",
-      "members":{
-        "Message":{"shape":"String"},
-        "RequestId":{
-          "shape":"String",
-          "documentation":"<p>The AWS request ID for this request.</p>"
-        }
-      },
-      "documentation":"<p>The identity type specified is not supported. Supported identity types include IAM and QUICKSIGHT.</p>",
-      "error":{"httpStatusCode":403},
-      "exception":true
-    },
-    "InternalFailureException":{
-      "type":"structure",
-      "members":{
-        "Message":{"shape":"String"},
-        "RequestId":{
-          "shape":"String",
-          "documentation":"<p>The AWS request ID for this request.</p>"
-        }
-      },
-      "documentation":"<p>An internal failure occurred.</p>",
-      "error":{"httpStatusCode":500},
-      "exception":true,
-      "fault":true
+          "locationName":"DashboardId"
+        },
+        "VersionNumber":{
+          "shape":"VersionNumber",
+          "documentation":"<p>The version number of the dashboard.</p>",
+          "location":"uri",
+          "locationName":"VersionNumber"
+        }
+      }
     },
-    "InvalidNextTokenException":{
+    "UpdateDashboardPublishedVersionResponse":{
       "type":"structure",
       "members":{
-        "Message":{"shape":"String"},
+        "DashboardId":{
+          "shape":"RestrictiveResourceId",
+          "documentation":"<p>The ID for the dashboard.</p>"
+        },
+        "DashboardArn":{
+          "shape":"Arn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the dashboard.</p>"
+        },
+        "Status":{
+          "shape":"StatusCode",
+          "documentation":"<p>The HTTP status of the request.</p>",
+          "location":"statusCode"
+        },
         "RequestId":{
           "shape":"String",
-          "documentation":"<p>The AWS request ID for this request.</p>"
+          "documentation":"<p>The AWS request ID for this operation.</p>"
         }
-      },
-      "documentation":"<p>The <code>NextToken</code> value isn't valid.</p>",
-      "error":{"httpStatusCode":400},
-      "exception":true
+      }
     },
-    "InvalidParameterValueException":{
+    "UpdateDashboardRequest":{
       "type":"structure",
+      "required":[
+        "AwsAccountId",
+        "DashboardId",
+        "Name",
+        "SourceEntity"
+      ],
       "members":{
-        "Message":{"shape":"String"},
-        "RequestId":{
-          "shape":"String",
-          "documentation":"<p>The AWS request ID for this request.</p>"
+        "AwsAccountId":{
+          "shape":"AwsAccountId",
+          "documentation":"<p>The ID of the AWS account that contains the dashboard that you're updating.</p>",
+          "location":"uri",
+          "locationName":"AwsAccountId"
+        },
+        "DashboardId":{
+          "shape":"RestrictiveResourceId",
+          "documentation":"<p>The ID for the dashboard.</p>",
+          "location":"uri",
+          "locationName":"DashboardId"
+        },
+        "Name":{
+          "shape":"DashboardName",
+          "documentation":"<p>The display name of the dashboard.</p>"
+        },
+        "SourceEntity":{
+          "shape":"DashboardSourceEntity",
+          "documentation":"<p>The template or analysis from which the dashboard is created. The <code>SouceTemplate</code> entity accepts the Amazon Resource Name (ARN) of the template and also references to replacement datasets for the placeholders set when creating the template. The replacement datasets need to follow the same schema as the datasets for which placeholders were created when creating the template.</p>"
+        },
+        "Parameters":{
+          "shape":"Parameters",
+          "documentation":"<p>A structure that contains the parameters of the dashboard.</p>"
+        },
+        "VersionDescription":{
+          "shape":"VersionDescription",
+          "documentation":"<p>A description for the first version of the dashboard being created.</p>"
+        },
+        "DashboardPublishOptions":{
+          "shape":"DashboardPublishOptions",
+          "documentation":"<p>Options for publishing the dashboard when you create it:</p> <ul> <li> <p> <code>AvailabilityStatus</code> for <code>AdHocFilteringOption</code> - This status can be either <code>ENABLED</code> or <code>DISABLED</code>. When this is set to <code>DISABLED</code>, QuickSight disables the left filter pane on the published dashboard, which can be used for ad hoc (one-time) filtering. This option is <code>ENABLED</code> by default. </p> </li> <li> <p> <code>AvailabilityStatus</code> for <code>ExportToCSVOption</code> - This status can be either <code>ENABLED</code> or <code>DISABLED</code>. The visual option to export data to .csv format isn't enabled when this is set to <code>DISABLED</code>. This option is <code>ENABLED</code> by default. </p> </li> <li> <p> <code>VisibilityState</code> for <code>SheetControlsOption</code> - This visibility state can be either <code>COLLAPSED</code> or <code>EXPANDED</code>. The sheet controls pane is collapsed by default when set to true. This option is <code>COLLAPSED</code> by default. </p> </li> </ul>"
         }
-      },
-      "documentation":"<p>One or more parameters don't have a valid value.</p>",
-      "error":{"httpStatusCode":400},
-      "exception":true
+      }
     },
-    "LimitExceededException":{
+    "UpdateDashboardResponse":{
       "type":"structure",
       "members":{
-        "Message":{"shape":"String"},
-        "ResourceType":{
-          "shape":"ExceptionResourceType",
-          "documentation":"<p>Limit exceeded.</p>"
+        "Arn":{
+          "shape":"Arn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the resource.</p>"
+        },
+        "VersionArn":{
+          "shape":"Arn",
+          "documentation":"<p>The ARN of the dashboard, including the version number.</p>"
+        },
+        "DashboardId":{
+          "shape":"RestrictiveResourceId",
+          "documentation":"<p>The ID for the dashboard.</p>"
+        },
+        "CreationStatus":{
+          "shape":"ResourceStatus",
+          "documentation":"<p>The creation status of the request.</p>"
+        },
+        "Status":{
+          "shape":"StatusCode",
+          "documentation":"<p>The HTTP status of the request.</p>"
         },
         "RequestId":{
           "shape":"String",
-          "documentation":"<p>The AWS request ID for this request.</p>"
+          "documentation":"<p>The AWS request ID for this operation.</p>"
         }
-      },
-      "documentation":"<p>A limit is exceeded.</p>",
-      "error":{"httpStatusCode":409},
-      "exception":true
+      }
     },
-    "ListGroupMembershipsRequest":{
+    "UpdateDataSetPermissionsRequest":{
       "type":"structure",
       "required":[
-        "GroupName",
         "AwsAccountId",
-        "Namespace"
+        "DataSetId"
       ],
       "members":{
-        "GroupName":{
-          "shape":"GroupName",
-          "documentation":"<p>The name of the group that you want to see a membership list of.</p>",
-          "location":"uri",
-          "locationName":"GroupName"
-        },
-        "NextToken":{
-          "shape":"String",
-          "documentation":"<p>A pagination token that can be used in a subsequent request.</p>",
-          "location":"querystring",
-          "locationName":"next-token"
-        },
-        "MaxResults":{
-          "shape":"MaxResults",
-          "documentation":"<p>The maximum number of results to return from this request.</p>",
-          "box":true,
-          "location":"querystring",
-          "locationName":"max-results"
-        },
         "AwsAccountId":{
           "shape":"AwsAccountId",
-          "documentation":"<p>The ID for the AWS account that the group is in. Currently, you use the ID for the AWS account that contains your Amazon QuickSight account.</p>",
+          "documentation":"<p>The AWS account ID.</p>",
           "location":"uri",
           "locationName":"AwsAccountId"
         },
-        "Namespace":{
-          "shape":"Namespace",
-          "documentation":"<p>The namespace. Currently, you should set this to <code>default</code>.</p>",
+        "DataSetId":{
+          "shape":"ResourceId",
+          "documentation":"<p>The ID for the dataset whose permissions you want to update. This ID is unique per AWS Region for each AWS account.</p>",
           "location":"uri",
-          "locationName":"Namespace"
+          "locationName":"DataSetId"
+        },
+        "GrantPermissions":{
+          "shape":"ResourcePermissionList",
+          "documentation":"<p>The resource permissions that you want to grant to the dataset.</p>"
+        },
+        "RevokePermissions":{
+          "shape":"ResourcePermissionList",
+          "documentation":"<p>The resource permissions that you want to revoke from the dataset.</p>"
         }
       }
     },
-    "ListGroupMembershipsResponse":{
+    "UpdateDataSetPermissionsResponse":{
       "type":"structure",
       "members":{
-        "GroupMemberList":{
-          "shape":"GroupMemberList",
-          "documentation":"<p>The list of the members of the group.</p>"
+        "DataSetArn":{
+          "shape":"Arn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the dataset.</p>"
         },
-        "NextToken":{
-          "shape":"String",
-          "documentation":"<p>A pagination token that can be used in a subsequent request.</p>"
+        "DataSetId":{
+          "shape":"ResourceId",
+          "documentation":"<p>The ID for the dataset whose permissions you want to update. This ID is unique per AWS Region for each AWS account.</p>"
         },
         "RequestId":{
           "shape":"String",
@@ -1010,55 +7084,77 @@
         },
         "Status":{
           "shape":"StatusCode",
-          "documentation":"<p>The http status of the request.</p>",
+          "documentation":"<p>The HTTP status of the request.</p>",
           "location":"statusCode"
         }
       }
     },
-    "ListGroupsRequest":{
+    "UpdateDataSetRequest":{
       "type":"structure",
       "required":[
         "AwsAccountId",
-        "Namespace"
+        "DataSetId",
+        "Name",
+        "PhysicalTableMap",
+        "ImportMode"
       ],
       "members":{
         "AwsAccountId":{
           "shape":"AwsAccountId",
-          "documentation":"<p>The ID for the AWS account that the group is in. Currently, you use the ID for the AWS account that contains your Amazon QuickSight account.</p>",
+          "documentation":"<p>The AWS account ID.</p>",
           "location":"uri",
           "locationName":"AwsAccountId"
         },
-        "NextToken":{
-          "shape":"String",
-          "documentation":"<p>A pagination token that can be used in a subsequent request.</p>",
-          "location":"querystring",
-          "locationName":"next-token"
+        "DataSetId":{
+          "shape":"ResourceId",
+          "documentation":"<p>The ID for the dataset that you want to update. This ID is unique per AWS Region for each AWS account.</p>",
+          "location":"uri",
+          "locationName":"DataSetId"
         },
-        "MaxResults":{
-          "shape":"MaxResults",
-          "documentation":"<p>The maximum number of results to return.</p>",
-          "box":true,
-          "location":"querystring",
-          "locationName":"max-results"
+        "Name":{
+          "shape":"ResourceName",
+          "documentation":"<p>The display name for the dataset.</p>"
         },
-        "Namespace":{
-          "shape":"Namespace",
-          "documentation":"<p>The namespace. Currently, you should set this to <code>default</code>.</p>",
-          "location":"uri",
-          "locationName":"Namespace"
+        "PhysicalTableMap":{
+          "shape":"PhysicalTableMap",
+          "documentation":"<p>Declares the physical tables that are available in the underlying data sources.</p>"
+        },
+        "LogicalTableMap":{
+          "shape":"LogicalTableMap",
+          "documentation":"<p>Configures the combination and transformation of the data from the physical tables.</p>"
+        },
+        "ImportMode":{
+          "shape":"DataSetImportMode",
+          "documentation":"<p>Indicates whether you want to import the data into SPICE.</p>"
+        },
+        "ColumnGroups":{
+          "shape":"ColumnGroupList",
+          "documentation":"<p>Groupings of columns that work together in certain QuickSight features. Currently, only geospatial hierarchy is supported.</p>"
+        },
+        "RowLevelPermissionDataSet":{
+          "shape":"RowLevelPermissionDataSet",
+          "documentation":"<p>The row-level security configuration for the data you want to create.</p>"
         }
       }
     },
-    "ListGroupsResponse":{
+    "UpdateDataSetResponse":{
       "type":"structure",
       "members":{
-        "GroupList":{
-          "shape":"GroupList",
-          "documentation":"<p>The list of the groups.</p>"
+        "Arn":{
+          "shape":"Arn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the dataset.</p>"
         },
-        "NextToken":{
-          "shape":"String",
-          "documentation":"<p>A pagination token that can be used in a subsequent request.</p>"
+        "DataSetId":{
+          "shape":"ResourceId",
+          "documentation":"<p>The ID for the dataset that you want to create. This ID is unique per AWS Region for each AWS account.</p>"
+        },
+        "IngestionArn":{
+          "shape":"Arn",
+          "documentation":"<p>The ARN for the ingestion, which is triggered as a result of dataset creation if the import mode is SPICE.</p>"
+        },
+        "IngestionId":{
+          "shape":"ResourceId",
+          "documentation":"<p>The ID of the ingestion, which is triggered as a result of dataset creation if the import mode is SPICE.</p>"
         },
         "RequestId":{
           "shape":"String",
@@ -1066,62 +7162,50 @@
         },
         "Status":{
           "shape":"StatusCode",
-          "documentation":"<p>The http status of the request.</p>",
+          "documentation":"<p>The HTTP status of the request.</p>",
           "location":"statusCode"
         }
       }
     },
-    "ListUserGroupsRequest":{
+    "UpdateDataSourcePermissionsRequest":{
       "type":"structure",
       "required":[
-        "UserName",
         "AwsAccountId",
-        "Namespace"
+        "DataSourceId"
       ],
       "members":{
-        "UserName":{
-          "shape":"UserName",
-          "documentation":"<p>The Amazon QuickSight user name that you want to list group memberships for.</p>",
-          "location":"uri",
-          "locationName":"UserName"
-        },
         "AwsAccountId":{
           "shape":"AwsAccountId",
-          "documentation":"<p>The AWS Account ID that the user is in. Currently, you use the ID for the AWS account that contains your Amazon QuickSight account.</p>",
+          "documentation":"<p>The AWS account ID.</p>",
           "location":"uri",
           "locationName":"AwsAccountId"
         },
-        "Namespace":{
-          "shape":"Namespace",
-          "documentation":"<p>The namespace. Currently, you should set this to <code>default</code>.</p>",
+        "DataSourceId":{
+          "shape":"ResourceId",
+          "documentation":"<p>The ID of the data source. This ID is unique per AWS Region for each AWS account. </p>",
           "location":"uri",
-          "locationName":"Namespace"
+          "locationName":"DataSourceId"
         },
-        "NextToken":{
-          "shape":"String",
-          "documentation":"<p>A pagination token that can be used in a subsequent request.</p>",
-          "location":"querystring",
-          "locationName":"next-token"
+        "GrantPermissions":{
+          "shape":"ResourcePermissionList",
+          "documentation":"<p>A list of resource permissions that you want to grant on the data source.</p>"
         },
-        "MaxResults":{
-          "shape":"MaxResults",
-          "documentation":"<p>The maximum number of results to return from this request.</p>",
-          "box":true,
-          "location":"querystring",
-          "locationName":"max-results"
+        "RevokePermissions":{
+          "shape":"ResourcePermissionList",
+          "documentation":"<p>A list of resource permissions that you want to revoke on the data source.</p>"
         }
       }
     },
-    "ListUserGroupsResponse":{
+    "UpdateDataSourcePermissionsResponse":{
       "type":"structure",
       "members":{
-        "GroupList":{
-          "shape":"GroupList",
-          "documentation":"<p>The list of groups the user is a member of.</p>"
+        "DataSourceArn":{
+          "shape":"Arn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the data source.</p>"
         },
-        "NextToken":{
-          "shape":"String",
-          "documentation":"<p>A pagination token that can be used in a subsequent request.</p>"
+        "DataSourceId":{
+          "shape":"ResourceId",
+          "documentation":"<p>The ID of the data source. This ID is unique per AWS Region for each AWS account.</p>"
         },
         "RequestId":{
           "shape":"String",
@@ -1134,50 +7218,62 @@
         }
       }
     },
-    "ListUsersRequest":{
+    "UpdateDataSourceRequest":{
       "type":"structure",
       "required":[
         "AwsAccountId",
-        "Namespace"
+        "DataSourceId",
+        "Name"
       ],
       "members":{
         "AwsAccountId":{
           "shape":"AwsAccountId",
-          "documentation":"<p>The ID for the AWS account that the user is in. Currently, you use the ID for the AWS account that contains your Amazon QuickSight account.</p>",
+          "documentation":"<p>The AWS account ID.</p>",
           "location":"uri",
           "locationName":"AwsAccountId"
         },
-        "NextToken":{
-          "shape":"String",
-          "documentation":"<p>A pagination token that can be used in a subsequent request.</p>",
-          "location":"querystring",
-          "locationName":"next-token"
+        "DataSourceId":{
+          "shape":"ResourceId",
+          "documentation":"<p>The ID of the data source. This ID is unique per AWS Region for each AWS account. </p>",
+          "location":"uri",
+          "locationName":"DataSourceId"
         },
-        "MaxResults":{
-          "shape":"MaxResults",
-          "documentation":"<p>The maximum number of results to return from this request.</p>",
-          "box":true,
-          "location":"querystring",
-          "locationName":"max-results"
+        "Name":{
+          "shape":"ResourceName",
+          "documentation":"<p>A display name for the data source.</p>"
         },
-        "Namespace":{
-          "shape":"Namespace",
-          "documentation":"<p>The namespace. Currently, you should set this to <code>default</code>.</p>",
-          "location":"uri",
-          "locationName":"Namespace"
+        "DataSourceParameters":{
+          "shape":"DataSourceParameters",
+          "documentation":"<p>The parameters that QuickSight uses to connect to your underlying source.</p>"
+        },
+        "Credentials":{
+          "shape":"DataSourceCredentials",
+          "documentation":"<p>The credentials that QuickSight that uses to connect to your underlying source. Currently, only credentials based on user name and password are supported.</p>"
+        },
+        "VpcConnectionProperties":{
+          "shape":"VpcConnectionProperties",
+          "documentation":"<p>Use this parameter only when you want QuickSight to use a VPC connection when connecting to your underlying source.</p>"
+        },
+        "SslProperties":{
+          "shape":"SslProperties",
+          "documentation":"<p>Secure Socket Layer (SSL) properties that apply when QuickSight connects to your underlying source.</p>"
         }
       }
     },
-    "ListUsersResponse":{
+    "UpdateDataSourceResponse":{
       "type":"structure",
       "members":{
-        "UserList":{
-          "shape":"UserList",
-          "documentation":"<p>The list of users.</p>"
+        "Arn":{
+          "shape":"Arn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the data source.</p>"
         },
-        "NextToken":{
-          "shape":"String",
-          "documentation":"<p>A pagination token that can be used in a subsequent request.</p>"
+        "DataSourceId":{
+          "shape":"ResourceId",
+          "documentation":"<p>The ID of the data source. This ID is unique per AWS Region for each AWS account.</p>"
+        },
+        "UpdateStatus":{
+          "shape":"ResourceStatus",
+          "documentation":"<p>The update status of the data source's last update.</p>"
         },
         "RequestId":{
           "shape":"String",
@@ -1185,104 +7281,123 @@
         },
         "Status":{
           "shape":"StatusCode",
-          "documentation":"<p>The http status of the request.</p>",
+          "documentation":"<p>The HTTP status of the request.</p>",
           "location":"statusCode"
         }
       }
     },
-    "MaxResults":{
-      "type":"integer",
-      "max":100,
-      "min":1
-    },
-    "Namespace":{
-      "type":"string",
-      "pattern":"default"
-    },
-    "PreconditionNotMetException":{
+    "UpdateGroupRequest":{
       "type":"structure",
+      "required":[
+        "GroupName",
+        "AwsAccountId",
+        "Namespace"
+      ],
       "members":{
-        "Message":{"shape":"String"},
-        "RequestId":{
-          "shape":"String",
-          "documentation":"<p>The AWS request ID for this request.</p>"
+        "GroupName":{
+          "shape":"GroupName",
+          "documentation":"<p>The name of the group that you want to update.</p>",
+          "location":"uri",
+          "locationName":"GroupName"
+        },
+        "Description":{
+          "shape":"GroupDescription",
+          "documentation":"<p>The description for the group that you want to update.</p>"
+        },
+        "AwsAccountId":{
+          "shape":"AwsAccountId",
+          "documentation":"<p>The ID for the AWS account that the group is in. Currently, you use the ID for the AWS account that contains your Amazon QuickSight account.</p>",
+          "location":"uri",
+          "locationName":"AwsAccountId"
+        },
+        "Namespace":{
+          "shape":"Namespace",
+          "documentation":"<p>The namespace. Currently, you should set this to <code>default</code>.</p>",
+          "location":"uri",
+          "locationName":"Namespace"
         }
-      },
-      "documentation":"<p>One or more preconditions aren't met.</p>",
-      "error":{"httpStatusCode":400},
-      "exception":true
+      }
     },
-    "QuickSightUserNotFoundException":{
+    "UpdateGroupResponse":{
       "type":"structure",
       "members":{
-        "Message":{"shape":"String"},
+        "Group":{
+          "shape":"Group",
+          "documentation":"<p>The name of the group.</p>"
+        },
         "RequestId":{
           "shape":"String",
-          "documentation":"<p>The AWS request ID for this request.</p>"
+          "documentation":"<p>The AWS request ID for this operation.</p>"
+        },
+        "Status":{
+          "shape":"StatusCode",
+          "documentation":"<p>The HTTP status of the request.</p>",
+          "location":"statusCode"
         }
-      },
-      "documentation":"<p>The user is not found. This error can happen in any operation that requires finding a user based on a provided user name, such as <code>DeleteUser</code>, <code>DescribeUser</code>, and so on.</p>",
-      "error":{"httpStatusCode":404},
-      "exception":true
+      }
     },
-    "RegisterUserRequest":{
+    "UpdateIAMPolicyAssignmentRequest":{
       "type":"structure",
       "required":[
-        "IdentityType",
-        "Email",
-        "UserRole",
         "AwsAccountId",
+        "AssignmentName",
         "Namespace"
       ],
       "members":{
-        "IdentityType":{
-          "shape":"IdentityType",
-          "documentation":"<p>Amazon QuickSight supports several ways of managing the identity of users. This parameter accepts two values:</p> <ul> <li> <p> <code>IAM</code>: A user whose identity maps to an existing IAM user or role. </p> </li> <li> <p> <code>QUICKSIGHT</code>: A user whose identity is owned and managed internally by Amazon QuickSight. </p> </li> </ul>"
-        },
-        "Email":{
-          "shape":"String",
-          "documentation":"<p>The email address of the user that you want to register.</p>"
-        },
-        "UserRole":{
-          "shape":"UserRole",
-          "documentation":"<p>The Amazon QuickSight role of the user. The user role can be one of the following:</p> <ul> <li> <p> <code>READER</code>: A user who has read-only access to dashboards.</p> </li> <li> <p> <code>AUTHOR</code>: A user who can create data sources, data sets, analyses, and dashboards.</p> </li> <li> <p> <code>ADMIN</code>: A user who is an author, who can also manage Amazon QuickSight settings.</p> </li> </ul>"
-        },
-        "IamArn":{
-          "shape":"String",
-          "documentation":"<p>The ARN of the IAM user or role that you are registering with Amazon QuickSight. </p>"
-        },
-        "SessionName":{
-          "shape":"RoleSessionName",
-          "documentation":"<p>You need to use this parameter only when you register one or more users using an assumed IAM role. You don't need to provide the session name for other scenarios, for example when you are registering an IAM user or an Amazon QuickSight user. You can register multiple users using the same IAM role if each user has a different session name. For more information on assuming IAM roles, see <a href=\"https://docs.aws.amazon.com/cli/latest/reference/sts/assume-role.html\"> <code>assume-role</code> </a> in the <i>AWS CLI Reference.</i> </p>"
-        },
         "AwsAccountId":{
           "shape":"AwsAccountId",
-          "documentation":"<p>The ID for the AWS account that the user is in. Currently, you use the ID for the AWS account that contains your Amazon QuickSight account.</p>",
+          "documentation":"<p>The ID of the AWS account that contains the IAM policy assignment.</p>",
           "location":"uri",
           "locationName":"AwsAccountId"
         },
+        "AssignmentName":{
+          "shape":"IAMPolicyAssignmentName",
+          "documentation":"<p>The name of the assignment. This name must be unique within an AWS account.</p>",
+          "location":"uri",
+          "locationName":"AssignmentName"
+        },
         "Namespace":{
           "shape":"Namespace",
-          "documentation":"<p>The namespace. Currently, you should set this to <code>default</code>.</p>",
+          "documentation":"<p>The namespace of the assignment.</p>",
           "location":"uri",
           "locationName":"Namespace"
         },
-        "UserName":{
-          "shape":"UserName",
-          "documentation":"<p>The Amazon QuickSight user name that you want to create for the user you are registering.</p>"
+        "AssignmentStatus":{
+          "shape":"AssignmentStatus",
+          "documentation":"<p>The status of the assignment. Possible values are as follows:</p> <ul> <li> <p> <code>ENABLED</code> - Anything specified in this assignment is used when creating the data source.</p> </li> <li> <p> <code>DISABLED</code> - This assignment isn't used when creating the data source.</p> </li> <li> <p> <code>DRAFT</code> - This assignment is an unfinished draft and isn't used when creating the data source.</p> </li> </ul>"
+        },
+        "PolicyArn":{
+          "shape":"Arn",
+          "documentation":"<p>The ARN for the IAM policy to apply to the QuickSight users and groups specified in this assignment.</p>"
+        },
+        "Identities":{
+          "shape":"IdentityMap",
+          "documentation":"<p>The QuickSight users, groups, or both that you want to assign the policy to.</p>"
         }
       }
     },
-    "RegisterUserResponse":{
+    "UpdateIAMPolicyAssignmentResponse":{
       "type":"structure",
       "members":{
-        "User":{
-          "shape":"User",
-          "documentation":"<p>The user name.</p>"
+        "AssignmentName":{
+          "shape":"IAMPolicyAssignmentName",
+          "documentation":"<p>The name of the assignment. </p>"
         },
-        "UserInvitationUrl":{
+        "AssignmentId":{
           "shape":"String",
-          "documentation":"<p>The URL the user visits to complete registration and provide a password. This is returned only for users with an identity type of <code>QUICKSIGHT</code>.</p>"
+          "documentation":"<p>The ID of the assignment.</p>"
+        },
+        "PolicyArn":{
+          "shape":"Arn",
+          "documentation":"<p>The ARN for the IAM policy applied to the QuickSight users and groups specified in this assignment.</p>"
+        },
+        "Identities":{
+          "shape":"IdentityMap",
+          "documentation":"<p>The QuickSight users, groups, or both that the IAM policy is assigned to.</p>"
+        },
+        "AssignmentStatus":{
+          "shape":"AssignmentStatus",
+          "documentation":"<p>The status of the assignment. Possible values are as follows:</p> <ul> <li> <p> <code>ENABLED</code> - Anything specified in this assignment is used when creating the data source.</p> </li> <li> <p> <code>DISABLED</code> - This assignment isn't used when creating the data source.</p> </li> <li> <p> <code>DRAFT</code> - This assignment is an unfinished draft and isn't used when creating the data source.</p> </li> </ul>"
         },
         "RequestId":{
           "shape":"String",
@@ -1290,161 +7405,184 @@
         },
         "Status":{
           "shape":"StatusCode",
-          "documentation":"<p>The http status of the request.</p>",
+          "documentation":"<p>The HTTP status of the request.</p>",
           "location":"statusCode"
         }
       }
     },
-    "ResourceExistsException":{
-      "type":"structure",
-      "members":{
-        "Message":{"shape":"String"},
-        "ResourceType":{
-          "shape":"ExceptionResourceType",
-          "documentation":"<p>The AWS request ID for this request.</p>"
-        },
-        "RequestId":{
-          "shape":"String",
-          "documentation":"<p>The AWS request ID for this request.</p>"
-        }
-      },
-      "documentation":"<p>The resource specified doesn't exist. </p>",
-      "error":{"httpStatusCode":409},
-      "exception":true
+    "UpdateResourcePermissionList":{
+      "type":"list",
+      "member":{"shape":"ResourcePermission"},
+      "max":100,
+      "min":1
     },
-    "ResourceNotFoundException":{
+    "UpdateTemplateAliasRequest":{
       "type":"structure",
+      "required":[
+        "AwsAccountId",
+        "TemplateId",
+        "AliasName",
+        "TemplateVersionNumber"
+      ],
       "members":{
-        "Message":{"shape":"String"},
-        "ResourceType":{
-          "shape":"ExceptionResourceType",
-          "documentation":"<p>The AWS request ID for this request.</p>"
+        "AwsAccountId":{
+          "shape":"AwsAccountId",
+          "documentation":"<p>The ID of the AWS account that contains the template alias that you're updating.</p>",
+          "location":"uri",
+          "locationName":"AwsAccountId"
         },
-        "RequestId":{
-          "shape":"String",
-          "documentation":"<p>The AWS request ID for this request.</p>"
-        }
-      },
-      "documentation":"<p>One or more resources can't be found.</p>",
-      "error":{"httpStatusCode":404},
-      "exception":true
-    },
-    "ResourceUnavailableException":{
-      "type":"structure",
-      "members":{
-        "Message":{"shape":"String"},
-        "ResourceType":{
-          "shape":"ExceptionResourceType",
-          "documentation":"<p>The resource type for this request.</p>"
+        "TemplateId":{
+          "shape":"RestrictiveResourceId",
+          "documentation":"<p>The ID for the template.</p>",
+          "location":"uri",
+          "locationName":"TemplateId"
         },
-        "RequestId":{
-          "shape":"String",
-          "documentation":"<p>The AWS request ID for this request.</p>"
+        "AliasName":{
+          "shape":"AliasName",
+          "documentation":"<p>The alias of the template that you want to update. If you name a specific alias, you update the version that the alias points to. You can specify the latest version of the template by providing the keyword <code>$LATEST</code> in the <code>AliasName</code> parameter. The keyword <code>$PUBLISHED</code> doesn't apply to templates.</p>",
+          "location":"uri",
+          "locationName":"AliasName"
+        },
+        "TemplateVersionNumber":{
+          "shape":"VersionNumber",
+          "documentation":"<p>The version number of the template.</p>"
         }
-      },
-      "documentation":"<p>This resource is currently unavailable.</p>",
-      "error":{"httpStatusCode":503},
-      "exception":true
-    },
-    "RoleSessionName":{
-      "type":"string",
-      "max":64,
-      "min":2,
-      "pattern":"[\\w+=.@-]*"
-    },
-    "SessionLifetimeInMinutes":{
-      "type":"long",
-      "max":600,
-      "min":15
+      }
     },
-    "SessionLifetimeInMinutesInvalidException":{
+    "UpdateTemplateAliasResponse":{
       "type":"structure",
       "members":{
-        "Message":{"shape":"String"},
+        "TemplateAlias":{
+          "shape":"TemplateAlias",
+          "documentation":"<p>The template alias.</p>"
+        },
+        "Status":{
+          "shape":"StatusCode",
+          "documentation":"<p>The HTTP status of the request.</p>",
+          "location":"statusCode"
+        },
         "RequestId":{
           "shape":"String",
-          "documentation":"<p>The AWS request ID for this request.</p>"
+          "documentation":"<p>The AWS request ID for this operation.</p>"
         }
-      },
-      "documentation":"<p>The number of minutes specified for the lifetime of a session is not valid. The session lifetime must be from 15 to 600 minutes.</p>",
-      "error":{"httpStatusCode":400},
-      "exception":true
+      }
     },
-    "StatusCode":{"type":"integer"},
-    "String":{"type":"string"},
-    "ThrottlingException":{
+    "UpdateTemplatePermissionsRequest":{
       "type":"structure",
+      "required":[
+        "AwsAccountId",
+        "TemplateId"
+      ],
       "members":{
-        "Message":{"shape":"String"},
-        "RequestId":{
-          "shape":"String",
-          "documentation":"<p>The AWS request ID for this request.</p>"
+        "AwsAccountId":{
+          "shape":"AwsAccountId",
+          "documentation":"<p>The ID of the AWS account that contains the template.</p>",
+          "location":"uri",
+          "locationName":"AwsAccountId"
+        },
+        "TemplateId":{
+          "shape":"RestrictiveResourceId",
+          "documentation":"<p>The ID for the template.</p>",
+          "location":"uri",
+          "locationName":"TemplateId"
+        },
+        "GrantPermissions":{
+          "shape":"UpdateResourcePermissionList",
+          "documentation":"<p>A list of resource permissions to be granted on the template. </p>"
+        },
+        "RevokePermissions":{
+          "shape":"UpdateResourcePermissionList",
+          "documentation":"<p>A list of resource permissions to be revoked from the template. </p>"
         }
-      },
-      "documentation":"<p>Access is throttled.</p>",
-      "error":{"httpStatusCode":429},
-      "exception":true
+      }
     },
-    "UnsupportedUserEditionException":{
+    "UpdateTemplatePermissionsResponse":{
       "type":"structure",
       "members":{
-        "Message":{"shape":"String"},
+        "TemplateId":{
+          "shape":"RestrictiveResourceId",
+          "documentation":"<p>The ID for the template.</p>"
+        },
+        "TemplateArn":{
+          "shape":"Arn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the template.</p>"
+        },
+        "Permissions":{
+          "shape":"ResourcePermissionList",
+          "documentation":"<p>A list of resource permissions to be set on the template.</p>"
+        },
         "RequestId":{
           "shape":"String",
-          "documentation":"<p>The AWS request ID for this request.</p>"
+          "documentation":"<p>The AWS request ID for this operation.</p>"
+        },
+        "Status":{
+          "shape":"StatusCode",
+          "documentation":"<p>The HTTP status of the request.</p>",
+          "location":"statusCode"
         }
-      },
-      "documentation":"<p>This error indicates that you are calling an operation on an Amazon QuickSight subscription where the edition doesn't include support for that operation. Amazon QuickSight currently has Standard Edition and Enterprise Edition. Not every operation and capability is available in every edition.</p>",
-      "error":{"httpStatusCode":403},
-      "exception":true
+      }
     },
-    "UpdateGroupRequest":{
+    "UpdateTemplateRequest":{
       "type":"structure",
       "required":[
-        "GroupName",
         "AwsAccountId",
-        "Namespace"
+        "TemplateId",
+        "SourceEntity"
       ],
       "members":{
-        "GroupName":{
-          "shape":"GroupName",
-          "documentation":"<p>The name of the group that you want to update.</p>",
-          "location":"uri",
-          "locationName":"GroupName"
-        },
-        "Description":{
-          "shape":"GroupDescription",
-          "documentation":"<p>The description for the group that you want to update.</p>"
-        },
         "AwsAccountId":{
           "shape":"AwsAccountId",
-          "documentation":"<p>The ID for the AWS account that the group is in. Currently, you use the ID for the AWS account that contains your Amazon QuickSight account.</p>",
+          "documentation":"<p>The ID of the AWS account that contains the template that you're updating.</p>",
           "location":"uri",
           "locationName":"AwsAccountId"
         },
-        "Namespace":{
-          "shape":"Namespace",
-          "documentation":"<p>The namespace. Currently, you should set this to <code>default</code>.</p>",
+        "TemplateId":{
+          "shape":"RestrictiveResourceId",
+          "documentation":"<p>The ID for the template.</p>",
           "location":"uri",
-          "locationName":"Namespace"
+          "locationName":"TemplateId"
+        },
+        "SourceEntity":{
+          "shape":"TemplateSourceEntity",
+          "documentation":"<p>The source QuickSight entity from which this template is being updated. You can currently update templates from an Analysis or another template.</p>"
+        },
+        "VersionDescription":{
+          "shape":"VersionDescription",
+          "documentation":"<p>A description of the current template version that is being updated. Every time you call <code>UpdateTemplate</code>, you create a new version of the template. Each version of the template maintains a description of the version in the <code>VersionDescription</code> field.</p>"
+        },
+        "Name":{
+          "shape":"TemplateName",
+          "documentation":"<p>The name for the template.</p>"
         }
       }
     },
-    "UpdateGroupResponse":{
+    "UpdateTemplateResponse":{
       "type":"structure",
       "members":{
-        "Group":{
-          "shape":"Group",
-          "documentation":"<p>The name of the group.</p>"
+        "TemplateId":{
+          "shape":"RestrictiveResourceId",
+          "documentation":"<p>The ID for the template.</p>"
         },
-        "RequestId":{
-          "shape":"String",
-          "documentation":"<p>The AWS request ID for this operation.</p>"
+        "Arn":{
+          "shape":"Arn",
+          "documentation":"<p>The Amazon Resource Name (ARN) for the template.</p>"
+        },
+        "VersionArn":{
+          "shape":"Arn",
+          "documentation":"<p>The ARN for the template, including the version information of the first version.</p>"
+        },
+        "CreationStatus":{
+          "shape":"ResourceStatus",
+          "documentation":"<p>The creation status of the template.</p>"
         },
         "Status":{
           "shape":"StatusCode",
-          "documentation":"<p>The http status of the request.</p>",
+          "documentation":"<p>The HTTP status of the request.</p>",
           "location":"statusCode"
+        },
+        "RequestId":{
+          "shape":"String",
+          "documentation":"<p>The AWS request ID for this operation.</p>"
         }
       }
     },
@@ -1482,7 +7620,7 @@
         },
         "Role":{
           "shape":"UserRole",
-          "documentation":"<p>The Amazon QuickSight role of the user. The user role can be one of the following:</p> <ul> <li> <p> <code>READER</code>: A user who has read-only access to dashboards.</p> </li> <li> <p> <code>AUTHOR</code>: A user who can create data sources, data sets, analyses, and dashboards.</p> </li> <li> <p> <code>ADMIN</code>: A user who is an author, who can also manage Amazon QuickSight settings.</p> </li> </ul>"
+          "documentation":"<p>The Amazon QuickSight role of the user. The user role can be one of the following:</p> <ul> <li> <p> <code>READER</code>: A user who has read-only access to dashboards.</p> </li> <li> <p> <code>AUTHOR</code>: A user who can create data sources, datasets, analyses, and dashboards.</p> </li> <li> <p> <code>ADMIN</code>: A user who is an author, who can also manage Amazon QuickSight settings.</p> </li> </ul>"
         }
       }
     },
@@ -1499,11 +7637,39 @@
         },
         "Status":{
           "shape":"StatusCode",
-          "documentation":"<p>The http status of the request.</p>",
+          "documentation":"<p>The HTTP status of the request.</p>",
           "location":"statusCode"
         }
       }
     },
+    "UploadSettings":{
+      "type":"structure",
+      "members":{
+        "Format":{
+          "shape":"FileFormat",
+          "documentation":"<p>File format.</p>"
+        },
+        "StartFromRow":{
+          "shape":"PositiveInteger",
+          "documentation":"<p>A row number to start reading data from.</p>",
+          "box":true
+        },
+        "ContainsHeader":{
+          "shape":"Boolean",
+          "documentation":"<p>Whether the file has a header row, or the files each have a header row.</p>",
+          "box":true
+        },
+        "TextQualifier":{
+          "shape":"TextQualifier",
+          "documentation":"<p>Text qualifier.</p>"
+        },
+        "Delimiter":{
+          "shape":"Delimiter",
+          "documentation":"<p>The delimiter between values in the file.</p>"
+        }
+      },
+      "documentation":"<p>Information about the format for a source file or files.</p>"
+    },
     "User":{
       "type":"structure",
       "members":{
@@ -1521,7 +7687,7 @@
         },
         "Role":{
           "shape":"UserRole",
-          "documentation":"<p>The Amazon QuickSight role for the user.</p>"
+          "documentation":"<p>The Amazon QuickSight role for the user. The user role can be one of the following:.</p> <ul> <li> <p> <code>READER</code>: A user who has read-only access to dashboards.</p> </li> <li> <p> <code>AUTHOR</code>: A user who can create data sources, datasets, analyses, and dashboards.</p> </li> <li> <p> <code>ADMIN</code>: A user who is an author, who can also manage Amazon QuickSight settings.</p> </li> <li> <p> <code>RESTRICTED_READER</code>: This role isn't currently available for use.</p> </li> <li> <p> <code>RESTRICTED_AUTHOR</code>: This role isn't currently available for use.</p> </li> </ul>"
         },
         "IdentityType":{
           "shape":"IdentityType",
@@ -1529,7 +7695,7 @@
         },
         "Active":{
           "shape":"Boolean",
-          "documentation":"<p>Active status of user. When you create an Amazon QuickSight user that’s not an IAM user or an AD user, that user is inactive until they sign in and provide a password</p>"
+          "documentation":"<p>The active status of user. When you create an Amazon QuickSight user that’s not an IAM user or an Active Directory user, that user is inactive until they sign in and provide a password.</p>"
         },
         "PrincipalId":{
           "shape":"String",
@@ -1557,7 +7723,44 @@
         "RESTRICTED_READER"
       ]
     },
-    "boolean":{"type":"boolean"}
+    "Username":{
+      "type":"string",
+      "max":64,
+      "min":1
+    },
+    "VersionDescription":{
+      "type":"string",
+      "max":512,
+      "min":1
+    },
+    "VersionNumber":{
+      "type":"long",
+      "min":1
+    },
+    "VpcConnectionProperties":{
+      "type":"structure",
+      "required":["VpcConnectionArn"],
+      "members":{
+        "VpcConnectionArn":{
+          "shape":"Arn",
+          "documentation":"<p>The Amazon Resource Name (ARN) for the VPC connection.</p>"
+        }
+      },
+      "documentation":"<p>VPC connection properties.</p>"
+    },
+    "Warehouse":{
+      "type":"string",
+      "max":128
+    },
+    "WorkGroup":{
+      "type":"string",
+      "max":128,
+      "min":1
+    },
+    "boolean":{"type":"boolean"},
+    "long":{"type":"long"},
+    "string":{"type":"string"},
+    "timestamp":{"type":"timestamp"}
   },
-  "documentation":"<fullname>Amazon QuickSight API Reference</fullname> <p>Amazon QuickSight is a fully managed, serverless, cloud business intelligence service that makes it easy to extend data and insights to every user in your organization. This API interface reference contains documentation for a programming interface that you can use to manage Amazon QuickSight. </p>"
+  "documentation":"<fullname>Amazon QuickSight API Reference</fullname> <p>Amazon QuickSight is a fully managed, serverless business intelligence service for the AWS Cloud that makes it easy to extend data and insights to every user in your organization. This API reference contains documentation for a programming interface that you can use to manage Amazon QuickSight. </p>"
 }
diff --git a/services/ram/pom.xml b/services/ram/pom.xml
index e87dac9f5636..8e8c84bd2f29 100644
--- a/services/ram/pom.xml
+++ b/services/ram/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>ram</artifactId>
     <name>AWS Java SDK :: Services :: RAM</name>
diff --git a/services/ram/src/main/resources/codegen-resources/service-2.json b/services/ram/src/main/resources/codegen-resources/service-2.json
index e227e50d4ff5..b3b4ce4219ce 100644
--- a/services/ram/src/main/resources/codegen-resources/service-2.json
+++ b/services/ram/src/main/resources/codegen-resources/service-2.json
@@ -58,6 +58,25 @@
       ],
       "documentation":"<p>Associates the specified resource share with the specified principals and resources.</p>"
     },
+    "AssociateResourceSharePermission":{
+      "name":"AssociateResourceSharePermission",
+      "http":{
+        "method":"POST",
+        "requestUri":"/associateresourcesharepermission"
+      },
+      "input":{"shape":"AssociateResourceSharePermissionRequest"},
+      "output":{"shape":"AssociateResourceSharePermissionResponse"},
+      "errors":[
+        {"shape":"MalformedArnException"},
+        {"shape":"UnknownResourceException"},
+        {"shape":"InvalidParameterException"},
+        {"shape":"InvalidClientTokenException"},
+        {"shape":"ServerInternalException"},
+        {"shape":"ServiceUnavailableException"},
+        {"shape":"OperationNotPermittedException"}
+      ],
+      "documentation":"<p>Associates a permission with a resource share.</p>"
+    },
     "CreateResourceShare":{
       "name":"CreateResourceShare",
       "http":{
@@ -124,6 +143,25 @@
       ],
       "documentation":"<p>Disassociates the specified principals or resources from the specified resource share.</p>"
     },
+    "DisassociateResourceSharePermission":{
+      "name":"DisassociateResourceSharePermission",
+      "http":{
+        "method":"POST",
+        "requestUri":"/disassociateresourcesharepermission"
+      },
+      "input":{"shape":"DisassociateResourceSharePermissionRequest"},
+      "output":{"shape":"DisassociateResourceSharePermissionResponse"},
+      "errors":[
+        {"shape":"MalformedArnException"},
+        {"shape":"UnknownResourceException"},
+        {"shape":"InvalidParameterException"},
+        {"shape":"InvalidClientTokenException"},
+        {"shape":"ServerInternalException"},
+        {"shape":"ServiceUnavailableException"},
+        {"shape":"OperationNotPermittedException"}
+      ],
+      "documentation":"<p>Disassociates an AWS RAM permission from a resource share.</p>"
+    },
     "EnableSharingWithAwsOrganization":{
       "name":"EnableSharingWithAwsOrganization",
       "http":{
@@ -139,6 +177,24 @@
       ],
       "documentation":"<p>Enables resource sharing within your AWS Organization.</p> <p>The caller must be the master account for the AWS Organization.</p>"
     },
+    "GetPermission":{
+      "name":"GetPermission",
+      "http":{
+        "method":"POST",
+        "requestUri":"/getpermission"
+      },
+      "input":{"shape":"GetPermissionRequest"},
+      "output":{"shape":"GetPermissionResponse"},
+      "errors":[
+        {"shape":"InvalidParameterException"},
+        {"shape":"MalformedArnException"},
+        {"shape":"UnknownResourceException"},
+        {"shape":"ServerInternalException"},
+        {"shape":"ServiceUnavailableException"},
+        {"shape":"OperationNotPermittedException"}
+      ],
+      "documentation":"<p>Gets the contents of an AWS RAM permission in JSON format.</p>"
+    },
     "GetResourcePolicies":{
       "name":"GetResourcePolicies",
       "http":{
@@ -233,6 +289,23 @@
       ],
       "documentation":"<p>Lists the resources in a resource share that is shared with you but that the invitation is still pending for.</p>"
     },
+    "ListPermissions":{
+      "name":"ListPermissions",
+      "http":{
+        "method":"POST",
+        "requestUri":"/listpermissions"
+      },
+      "input":{"shape":"ListPermissionsRequest"},
+      "output":{"shape":"ListPermissionsResponse"},
+      "errors":[
+        {"shape":"InvalidParameterException"},
+        {"shape":"InvalidNextTokenException"},
+        {"shape":"ServerInternalException"},
+        {"shape":"ServiceUnavailableException"},
+        {"shape":"OperationNotPermittedException"}
+      ],
+      "documentation":"<p>Lists the AWS RAM permissions.</p>"
+    },
     "ListPrincipals":{
       "name":"ListPrincipals",
       "http":{
@@ -249,7 +322,26 @@
         {"shape":"ServerInternalException"},
         {"shape":"ServiceUnavailableException"}
       ],
-      "documentation":"<p>Lists the principals that you have shared resources with or the principals that have shared resources with you.</p>"
+      "documentation":"<p>Lists the principals that you have shared resources with or that have shared resources with you.</p>"
+    },
+    "ListResourceSharePermissions":{
+      "name":"ListResourceSharePermissions",
+      "http":{
+        "method":"POST",
+        "requestUri":"/listresourcesharepermissions"
+      },
+      "input":{"shape":"ListResourceSharePermissionsRequest"},
+      "output":{"shape":"ListResourceSharePermissionsResponse"},
+      "errors":[
+        {"shape":"InvalidParameterException"},
+        {"shape":"MalformedArnException"},
+        {"shape":"UnknownResourceException"},
+        {"shape":"InvalidNextTokenException"},
+        {"shape":"ServerInternalException"},
+        {"shape":"ServiceUnavailableException"},
+        {"shape":"OperationNotPermittedException"}
+      ],
+      "documentation":"<p>Lists the AWS RAM permissions that are associated with a resource share.</p>"
     },
     "ListResources":{
       "name":"ListResources",
@@ -270,6 +362,24 @@
       ],
       "documentation":"<p>Lists the resources that you added to a resource shares or the resources that are shared with you.</p>"
     },
+    "PromoteResourceShareCreatedFromPolicy":{
+      "name":"PromoteResourceShareCreatedFromPolicy",
+      "http":{
+        "method":"POST",
+        "requestUri":"/promoteresourcesharecreatedfrompolicy"
+      },
+      "input":{"shape":"PromoteResourceShareCreatedFromPolicyRequest"},
+      "output":{"shape":"PromoteResourceShareCreatedFromPolicyResponse"},
+      "errors":[
+        {"shape":"MalformedArnException"},
+        {"shape":"OperationNotPermittedException"},
+        {"shape":"InvalidParameterException"},
+        {"shape":"MissingRequiredParameterException"},
+        {"shape":"ServerInternalException"},
+        {"shape":"ServiceUnavailableException"}
+      ],
+      "documentation":"<p>Resource shares that were created by attaching a policy to a resource are visible only to the resource share owner, and the resource share cannot be modified in AWS RAM.</p> <p>Use this API action to promote the resource share. When you promote the resource share, it becomes:</p> <ul> <li> <p>Visible to all principals that it is shared with.</p> </li> <li> <p>Modifiable in AWS RAM.</p> </li> </ul>"
+    },
     "RejectResourceShareInvitation":{
       "name":"RejectResourceShareInvitation",
       "http":{
@@ -376,6 +486,44 @@
         }
       }
     },
+    "AssociateResourceSharePermissionRequest":{
+      "type":"structure",
+      "required":[
+        "resourceShareArn",
+        "permissionArn"
+      ],
+      "members":{
+        "resourceShareArn":{
+          "shape":"String",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the resource share.</p>"
+        },
+        "permissionArn":{
+          "shape":"String",
+          "documentation":"<p>The ARN of the AWS RAM permission to associate with the resource share.</p>"
+        },
+        "replace":{
+          "shape":"Boolean",
+          "documentation":"<p>Indicates whether the permission should replace the permissions that are currently associated with the resource share. Use <code>true</code> to replace the current permissions. Use <code>false</code> to add the permission to the current permission.</p>"
+        },
+        "clientToken":{
+          "shape":"String",
+          "documentation":"<p>A unique, case-sensitive identifier that you provide to ensure the idempotency of the request.</p>"
+        }
+      }
+    },
+    "AssociateResourceSharePermissionResponse":{
+      "type":"structure",
+      "members":{
+        "returnValue":{
+          "shape":"Boolean",
+          "documentation":"<p>Indicates whether the request succeeded.</p>"
+        },
+        "clientToken":{
+          "shape":"String",
+          "documentation":"<p>A unique, case-sensitive identifier that you provide to ensure the idempotency of the request.</p>"
+        }
+      }
+    },
     "AssociateResourceShareRequest":{
       "type":"structure",
       "required":["resourceShareArn"],
@@ -439,6 +587,10 @@
         "clientToken":{
           "shape":"String",
           "documentation":"<p>A unique, case-sensitive identifier that you provide to ensure the idempotency of the request.</p>"
+        },
+        "permissionArns":{
+          "shape":"PermissionArnList",
+          "documentation":"<p>The ARNs of the permissions to associate with the resource share. If you do not specify an ARN for the permission, AWS RAM automatically attaches the default version of the permission for each resource type.</p>"
         }
       }
     },
@@ -487,6 +639,40 @@
         }
       }
     },
+    "DisassociateResourceSharePermissionRequest":{
+      "type":"structure",
+      "required":[
+        "resourceShareArn",
+        "permissionArn"
+      ],
+      "members":{
+        "resourceShareArn":{
+          "shape":"String",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the resource share.</p>"
+        },
+        "permissionArn":{
+          "shape":"String",
+          "documentation":"<p>The ARN of the permission to disassociate from the resource share.</p>"
+        },
+        "clientToken":{
+          "shape":"String",
+          "documentation":"<p>A unique, case-sensitive identifier that you provide to ensure the idempotency of the request.</p>"
+        }
+      }
+    },
+    "DisassociateResourceSharePermissionResponse":{
+      "type":"structure",
+      "members":{
+        "returnValue":{
+          "shape":"Boolean",
+          "documentation":"<p>Indicates whether the request succeeded.</p>"
+        },
+        "clientToken":{
+          "shape":"String",
+          "documentation":"<p>A unique, case-sensitive identifier that you provide to ensure the idempotency of the request.</p>"
+        }
+      }
+    },
     "DisassociateResourceShareRequest":{
       "type":"structure",
       "required":["resourceShareArn"],
@@ -497,7 +683,7 @@
         },
         "resourceArns":{
           "shape":"ResourceArnList",
-          "documentation":"<p>The Amazon Resource Names (ARN) of the resources.</p>"
+          "documentation":"<p>The Amazon Resource Names (ARNs) of the resources.</p>"
         },
         "principals":{
           "shape":"PrincipalArnOrIdList",
@@ -536,6 +722,29 @@
         }
       }
     },
+    "GetPermissionRequest":{
+      "type":"structure",
+      "required":["permissionArn"],
+      "members":{
+        "permissionArn":{
+          "shape":"String",
+          "documentation":"<p>The ARN of the permission.</p>"
+        },
+        "permissionVersion":{
+          "shape":"Integer",
+          "documentation":"<p>The identifier for the version of the permission.</p>"
+        }
+      }
+    },
+    "GetPermissionResponse":{
+      "type":"structure",
+      "members":{
+        "permission":{
+          "shape":"ResourceSharePermissionDetail",
+          "documentation":"<p>Information about the permission.</p>"
+        }
+      }
+    },
     "GetResourcePoliciesRequest":{
       "type":"structure",
       "required":["resourceArns"],
@@ -577,7 +786,7 @@
       "members":{
         "associationType":{
           "shape":"ResourceShareAssociationType",
-          "documentation":"<p>The association type.</p>"
+          "documentation":"<p>The association type. Specify <code>PRINCIPAL</code> to list the principals that are associated with the specified resource share. Specify <code>RESOURCE</code> to list the resources that are associated with the specified resource share.</p>"
         },
         "resourceShareArns":{
           "shape":"ResourceShareArnList",
@@ -709,6 +918,7 @@
       "error":{"httpStatusCode":400},
       "exception":true
     },
+    "Integer":{"type":"integer"},
     "InvalidClientTokenException":{
       "type":"structure",
       "required":["message"],
@@ -800,6 +1010,36 @@
         }
       }
     },
+    "ListPermissionsRequest":{
+      "type":"structure",
+      "members":{
+        "resourceType":{
+          "shape":"String",
+          "documentation":"<p>Specifies the resource type for which to list permissions. For example, to list only permissions that apply to EC2 subnets, specify <code>ec2:Subnet</code>.</p>"
+        },
+        "nextToken":{
+          "shape":"String",
+          "documentation":"<p>The token for the next page of results.</p>"
+        },
+        "maxResults":{
+          "shape":"MaxResults",
+          "documentation":"<p>The maximum number of results to return with a single call. To retrieve the remaining results, make another call with the returned <code>nextToken</code> value.</p>"
+        }
+      }
+    },
+    "ListPermissionsResponse":{
+      "type":"structure",
+      "members":{
+        "permissions":{
+          "shape":"ResourceSharePermissionList",
+          "documentation":"<p>Information about the permissions.</p>"
+        },
+        "nextToken":{
+          "shape":"String",
+          "documentation":"<p>The token to use to retrieve the next page of results. This value is <code>null</code> when there are no more results to return.</p>"
+        }
+      }
+    },
     "ListPrincipalsRequest":{
       "type":"structure",
       "required":["resourceOwner"],
@@ -818,7 +1058,7 @@
         },
         "resourceType":{
           "shape":"String",
-          "documentation":"<p>The resource type.</p> <p>Valid values: <code>route53resolver:ResolverRule</code> | <code>ec2:TransitGateway</code> | <code>ec2:Subnet</code> | <code>license-manager:LicenseConfiguration</code> </p>"
+          "documentation":"<p>The resource type.</p> <p>Valid values: <code>ec2:CapacityReservation</code> | <code>ec2:Subnet</code> | <code>ec2:TrafficMirrorTarget</code> | <code>ec2:TransitGateway</code> | <code>license-manager:LicenseConfiguration</code> | <code>rds:Cluster</code> | <code>route53resolver:ResolverRule</code> I <code>resource-groups:Group</code> </p>"
         },
         "resourceShareArns":{
           "shape":"ResourceShareArnList",
@@ -847,6 +1087,37 @@
         }
       }
     },
+    "ListResourceSharePermissionsRequest":{
+      "type":"structure",
+      "required":["resourceShareArn"],
+      "members":{
+        "resourceShareArn":{
+          "shape":"String",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the resource share.</p>"
+        },
+        "nextToken":{
+          "shape":"String",
+          "documentation":"<p>The token for the next page of results.</p>"
+        },
+        "maxResults":{
+          "shape":"MaxResults",
+          "documentation":"<p>The maximum number of results to return with a single call. To retrieve the remaining results, make another call with the returned <code>nextToken</code> value.</p>"
+        }
+      }
+    },
+    "ListResourceSharePermissionsResponse":{
+      "type":"structure",
+      "members":{
+        "permissions":{
+          "shape":"ResourceSharePermissionList",
+          "documentation":"<p>The permissions associated with the resource share.</p>"
+        },
+        "nextToken":{
+          "shape":"String",
+          "documentation":"<p>The token to use to retrieve the next page of results. This value is <code>null</code> when there are no more results to return.</p>"
+        }
+      }
+    },
     "ListResourcesRequest":{
       "type":"structure",
       "required":["resourceOwner"],
@@ -861,7 +1132,7 @@
         },
         "resourceType":{
           "shape":"String",
-          "documentation":"<p>The resource type.</p> <p>Valid values: <code>route53resolver:ResolverRule</code> | <code>ec2:TransitGateway</code> | <code>ec2:Subnet</code> | <code>license-manager:LicenseConfiguration</code> </p>"
+          "documentation":"<p>The resource type.</p> <p>Valid values: <code>ec2:CapacityReservation</code> | <code>ec2:Subnet</code> | <code>ec2:TrafficMirrorTarget</code> | <code>ec2:TransitGateway</code> | <code>license-manager:LicenseConfiguration</code> | <code>rds:Cluster</code> | <code>route53resolver:ResolverRule</code> | <code>resource-groups:Group</code> </p>"
         },
         "resourceArns":{
           "shape":"ResourceArnList",
@@ -929,6 +1200,10 @@
       "error":{"httpStatusCode":400},
       "exception":true
     },
+    "PermissionArnList":{
+      "type":"list",
+      "member":{"shape":"String"}
+    },
     "Policy":{"type":"string"},
     "PolicyList":{
       "type":"list",
@@ -968,6 +1243,27 @@
       "type":"list",
       "member":{"shape":"Principal"}
     },
+    "PromoteResourceShareCreatedFromPolicyRequest":{
+      "type":"structure",
+      "required":["resourceShareArn"],
+      "members":{
+        "resourceShareArn":{
+          "shape":"String",
+          "documentation":"<p>The ARN of the resource share to promote.</p>",
+          "location":"querystring",
+          "locationName":"resourceShareArn"
+        }
+      }
+    },
+    "PromoteResourceShareCreatedFromPolicyResponse":{
+      "type":"structure",
+      "members":{
+        "returnValue":{
+          "shape":"Boolean",
+          "documentation":"<p>Indicates whether the request succeeded.</p>"
+        }
+      }
+    },
     "RejectResourceShareInvitationRequest":{
       "type":"structure",
       "required":["resourceShareInvitationArn"],
@@ -1010,6 +1306,10 @@
           "shape":"String",
           "documentation":"<p>The Amazon Resource Name (ARN) of the resource share.</p>"
         },
+        "resourceGroupArn":{
+          "shape":"String",
+          "documentation":"<p>The ARN of the resource group. This value is returned only if the resource is a resource group.</p>"
+        },
         "status":{
           "shape":"ResourceStatus",
           "documentation":"<p>The status of the resource.</p>"
@@ -1092,6 +1392,10 @@
         "lastUpdatedTime":{
           "shape":"DateTime",
           "documentation":"<p>The time when the resource share was last updated.</p>"
+        },
+        "featureSet":{
+          "shape":"ResourceShareFeatureSet",
+          "documentation":"<p>Indicates how the resource share was created. Possible values include:</p> <ul> <li> <p> <code>CREATED_FROM_POLICY</code> - Indicates that the resource share was created from an AWS Identity and Access Management (AWS IAM) policy attached to a resource. These resource shares are visible only to the AWS account that created it. They cannot be modified in AWS RAM.</p> </li> <li> <p> <code>PROMOTING_TO_STANDARD</code> - The resource share is in the process of being promoted. For more information, see <a>PromoteResourceShareCreatedFromPolicy</a>.</p> </li> <li> <p> <code>STANDARD</code> - Indicates that the resource share was created in AWS RAM using the console or APIs. These resource shares are visible to all principals. They can be modified in AWS RAM.</p> </li> </ul>"
         }
       },
       "documentation":"<p>Describes a resource share.</p>"
@@ -1163,6 +1467,14 @@
         "RESOURCE"
       ]
     },
+    "ResourceShareFeatureSet":{
+      "type":"string",
+      "enum":[
+        "CREATED_FROM_POLICY",
+        "PROMOTING_TO_STANDARD",
+        "STANDARD"
+      ]
+    },
     "ResourceShareInvitation":{
       "type":"structure",
       "members":{
@@ -1196,7 +1508,7 @@
         },
         "resourceShareAssociations":{
           "shape":"ResourceShareAssociationList",
-          "documentation":"<p>To view the resources associated with a pending resource share invitation, use <a href=\"https://docs.aws.amazon.com/ram/latest/APIReference/API_ListPendingInvitationResources.html\">ListPendingInvitationResources</a>.</p>",
+          "documentation":"<p>To view the resources associated with a pending resource share invitation, use <a href=\"https://docs.aws.amazon.com/ram/latest/APIReference/API_ListPendingInvitationResources.html\"> ListPendingInvitationResources</a>.</p>",
           "deprecated":true,
           "deprecatedMessage":"This member has been deprecated. Use ListPendingInvitationResources."
         }
@@ -1274,6 +1586,86 @@
       "type":"list",
       "member":{"shape":"ResourceShare"}
     },
+    "ResourceSharePermissionDetail":{
+      "type":"structure",
+      "members":{
+        "arn":{
+          "shape":"String",
+          "documentation":"<p>The ARN of the permission.</p>"
+        },
+        "version":{
+          "shape":"String",
+          "documentation":"<p>The identifier for the version of the permission.</p>"
+        },
+        "defaultVersion":{
+          "shape":"Boolean",
+          "documentation":"<p>The identifier for the version of the permission that is set as the default version.</p>"
+        },
+        "name":{
+          "shape":"String",
+          "documentation":"<p>The name of the permission.</p>"
+        },
+        "resourceType":{
+          "shape":"String",
+          "documentation":"<p>The resource type to which the permission applies.</p>"
+        },
+        "permission":{
+          "shape":"String",
+          "documentation":"<p>The permission's effect and actions in JSON format. The <code>effect</code> indicates whether the actions are allowed or denied. The <code>actions</code> list the API actions to which the principal is granted or denied access.</p>"
+        },
+        "creationTime":{
+          "shape":"DateTime",
+          "documentation":"<p>The date and time when the permission was created.</p>"
+        },
+        "lastUpdatedTime":{
+          "shape":"DateTime",
+          "documentation":"<p>The date and time when the permission was last updated.</p>"
+        }
+      },
+      "documentation":"<p>Information about an AWS RAM permission.</p>"
+    },
+    "ResourceSharePermissionList":{
+      "type":"list",
+      "member":{"shape":"ResourceSharePermissionSummary"}
+    },
+    "ResourceSharePermissionSummary":{
+      "type":"structure",
+      "members":{
+        "arn":{
+          "shape":"String",
+          "documentation":"<p>The ARN of the permission.</p>"
+        },
+        "version":{
+          "shape":"String",
+          "documentation":"<p>The identifier for the version of the permission.</p>"
+        },
+        "defaultVersion":{
+          "shape":"Boolean",
+          "documentation":"<p>The identifier for the version of the permission that is set as the default version.</p>"
+        },
+        "name":{
+          "shape":"String",
+          "documentation":"<p>The name of the permission.</p>"
+        },
+        "resourceType":{
+          "shape":"String",
+          "documentation":"<p>The type of resource to which the permission applies.</p>"
+        },
+        "status":{
+          "shape":"String",
+          "documentation":"<p>The current status of the permission.</p>"
+        },
+        "creationTime":{
+          "shape":"DateTime",
+          "documentation":"<p>The date and time when the permission was created.</p>"
+        },
+        "lastUpdatedTime":{
+          "shape":"DateTime",
+          "documentation":"<p>The date and time when the permission was last updated.</p>"
+        }
+      },
+      "documentation":"<p>Information about a permission that is associated with a resource share.</p>"
+    },
     "ResourceShareStatus":{
       "type":"string",
       "enum":[
diff --git a/services/rds/build.properties b/services/rds/build.properties
index ecf2dae6fcb1..15ec2da1fc71 100644
--- a/services/rds/build.properties
+++ b/services/rds/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/rds/pom.xml b/services/rds/pom.xml
index c7d92dbac325..5d66186659a1 100644
--- a/services/rds/pom.xml
+++ b/services/rds/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>rds</artifactId>
     <name>AWS Java SDK :: Services :: Amazon RDS</name>
diff --git a/services/rds/src/main/java/software/amazon/awssdk/services/rds/internal/CopyDbSnapshotPresignInterceptor.java b/services/rds/src/main/java/software/amazon/awssdk/services/rds/internal/CopyDbSnapshotPresignInterceptor.java
index 457e8917381c..0417f0c0b9e2 100644
--- a/services/rds/src/main/java/software/amazon/awssdk/services/rds/internal/CopyDbSnapshotPresignInterceptor.java
+++ b/services/rds/src/main/java/software/amazon/awssdk/services/rds/internal/CopyDbSnapshotPresignInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/rds/src/main/java/software/amazon/awssdk/services/rds/internal/CreateDbInstanceReadReplicaPresignInterceptor.java b/services/rds/src/main/java/software/amazon/awssdk/services/rds/internal/CreateDbInstanceReadReplicaPresignInterceptor.java
index 31f968ba084e..943648cd8214 100644
--- a/services/rds/src/main/java/software/amazon/awssdk/services/rds/internal/CreateDbInstanceReadReplicaPresignInterceptor.java
+++ b/services/rds/src/main/java/software/amazon/awssdk/services/rds/internal/CreateDbInstanceReadReplicaPresignInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/rds/src/main/java/software/amazon/awssdk/services/rds/internal/RdsPresignInterceptor.java b/services/rds/src/main/java/software/amazon/awssdk/services/rds/internal/RdsPresignInterceptor.java
index 1e8162d18c5d..41ec7ca5b8b1 100644
--- a/services/rds/src/main/java/software/amazon/awssdk/services/rds/internal/RdsPresignInterceptor.java
+++ b/services/rds/src/main/java/software/amazon/awssdk/services/rds/internal/RdsPresignInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -48,11 +48,13 @@
 @SdkInternalApi
 public abstract class RdsPresignInterceptor<T extends RdsRequest> implements ExecutionInterceptor {
 
+    private static final URI CUSTOM_ENDPOINT_LOCALHOST = URI.create("http://localhost");
+
     protected static final AwsQueryProtocolFactory PROTOCOL_FACTORY = AwsQueryProtocolFactory
         .builder()
         // Need an endpoint to marshall but this will be overwritten in modifyHttpRequest
         .clientConfiguration(SdkClientConfiguration.builder()
-                                                   .option(SdkClientOption.ENDPOINT, URI.create("http://localhost"))
+                                                   .option(SdkClientOption.ENDPOINT, CUSTOM_ENDPOINT_LOCALHOST)
                                                    .build())
         .build();
 
diff --git a/services/rds/src/main/resources/codegen-resources/paginators-1.json b/services/rds/src/main/resources/codegen-resources/paginators-1.json
index 56bc661c4da9..7fc21f579564 100755
--- a/services/rds/src/main/resources/codegen-resources/paginators-1.json
+++ b/services/rds/src/main/resources/codegen-resources/paginators-1.json
@@ -48,6 +48,24 @@
       "output_token": "Marker",
       "result_key": "Parameters"
     },
+    "DescribeDBProxies": {
+      "input_token": "Marker",
+      "limit_key": "MaxRecords",
+      "output_token": "Marker",
+      "result_key": "DBProxies"
+    },
+    "DescribeDBProxyTargetGroups": {
+      "input_token": "Marker",
+      "limit_key": "MaxRecords",
+      "output_token": "Marker",
+      "result_key": "TargetGroups"
+    },
+    "DescribeDBProxyTargets": {
+      "input_token": "Marker",
+      "limit_key": "MaxRecords",
+      "output_token": "Marker",
+      "result_key": "Targets"
+    },
     "DescribeDBSecurityGroups": {
       "input_token": "Marker",
       "limit_key": "MaxRecords",
@@ -84,6 +102,12 @@
       "output_token": "Marker",
       "result_key": "Events"
     },
+    "DescribeExportTasks": {
+      "input_token": "Marker",
+      "limit_key": "MaxRecords",
+      "output_token": "Marker",
+      "result_key": "ExportTasks"
+    },
     "DescribeGlobalClusters": {
       "input_token": "Marker",
       "limit_key": "MaxRecords",
diff --git a/services/rds/src/main/resources/codegen-resources/service-2.json b/services/rds/src/main/resources/codegen-resources/service-2.json
index 5958abc0f6dd..076c6c692184 100755
--- a/services/rds/src/main/resources/codegen-resources/service-2.json
+++ b/services/rds/src/main/resources/codegen-resources/service-2.json
@@ -127,6 +127,23 @@
       ],
       "documentation":"<p>Backtracks a DB cluster to a specific time, without creating a new DB cluster.</p> <p>For more information on backtracking, see <a href=\"https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/AuroraMySQL.Managing.Backtrack.html\"> Backtracking an Aurora DB Cluster</a> in the <i>Amazon Aurora User Guide.</i> </p> <note> <p>This action only applies to Aurora DB clusters.</p> </note>"
     },
+    "CancelExportTask":{
+      "name":"CancelExportTask",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"CancelExportTaskMessage"},
+      "output":{
+        "shape":"ExportTask",
+        "resultWrapper":"CancelExportTaskResult"
+      },
+      "errors":[
+        {"shape":"ExportTaskNotFoundFault"},
+        {"shape":"InvalidExportTaskStateFault"}
+      ],
+      "documentation":"<p>Cancels an export task in progress that is exporting a snapshot to Amazon S3. Any data that has already been written to the S3 bucket isn't removed. </p>"
+    },
     "CopyDBClusterParameterGroup":{
       "name":"CopyDBClusterParameterGroup",
       "http":{
@@ -164,7 +181,7 @@
         {"shape":"SnapshotQuotaExceededFault"},
         {"shape":"KMSKeyNotAccessibleFault"}
       ],
-      "documentation":"<p>Copies a snapshot of a DB cluster.</p> <p>To copy a DB cluster snapshot from a shared manual DB cluster snapshot, <code>SourceDBClusterSnapshotIdentifier</code> must be the Amazon Resource Name (ARN) of the shared DB cluster snapshot.</p> <p>You can copy an encrypted DB cluster snapshot from another AWS Region. In that case, the AWS Region where you call the <code>CopyDBClusterSnapshot</code> action is the destination AWS Region for the encrypted DB cluster snapshot to be copied to. To copy an encrypted DB cluster snapshot from another AWS Region, you must provide the following values:</p> <ul> <li> <p> <code>KmsKeyId</code> - The AWS Key Management System (AWS KMS) key identifier for the key to use to encrypt the copy of the DB cluster snapshot in the destination AWS Region.</p> </li> <li> <p> <code>PreSignedUrl</code> - A URL that contains a Signature Version 4 signed request for the <code>CopyDBClusterSnapshot</code> action to be called in the source AWS Region where the DB cluster snapshot is copied from. The pre-signed URL must be a valid request for the <code>CopyDBClusterSnapshot</code> API action that can be executed in the source AWS Region that contains the encrypted DB cluster snapshot to be copied.</p> <p>The pre-signed URL request must contain the following parameter values:</p> <ul> <li> <p> <code>KmsKeyId</code> - The KMS key identifier for the key to use to encrypt the copy of the DB cluster snapshot in the destination AWS Region. This is the same identifier for both the <code>CopyDBClusterSnapshot</code> action that is called in the destination AWS Region, and the action contained in the pre-signed URL.</p> </li> <li> <p> <code>DestinationRegion</code> - The name of the AWS Region that the DB cluster snapshot will be created in.</p> </li> <li> <p> <code>SourceDBClusterSnapshotIdentifier</code> - The DB cluster snapshot identifier for the encrypted DB cluster snapshot to be copied. This identifier must be in the Amazon Resource Name (ARN) format for the source AWS Region. For example, if you are copying an encrypted DB cluster snapshot from the us-west-2 AWS Region, then your <code>SourceDBClusterSnapshotIdentifier</code> looks like the following example: <code>arn:aws:rds:us-west-2:123456789012:cluster-snapshot:aurora-cluster1-snapshot-20161115</code>.</p> </li> </ul> <p>To learn how to generate a Signature Version 4 signed request, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/API/sigv4-query-string-auth.html\"> Authenticating Requests: Using Query Parameters (AWS Signature Version 4)</a> and <a href=\"https://docs.aws.amazon.com/general/latest/gr/signature-version-4.html\"> Signature Version 4 Signing Process</a>.</p> </li> <li> <p> <code>TargetDBClusterSnapshotIdentifier</code> - The identifier for the new copy of the DB cluster snapshot in the destination AWS Region.</p> </li> <li> <p> <code>SourceDBClusterSnapshotIdentifier</code> - The DB cluster snapshot identifier for the encrypted DB cluster snapshot to be copied. This identifier must be in the ARN format for the source AWS Region and is the same value as the <code>SourceDBClusterSnapshotIdentifier</code> in the pre-signed URL. </p> </li> </ul> <p>To cancel the copy operation once it is in progress, delete the target DB cluster snapshot identified by <code>TargetDBClusterSnapshotIdentifier</code> while that DB cluster snapshot is in \"copying\" status.</p> <p>For more information on copying encrypted DB cluster snapshots from one AWS Region to another, see <a href=\"https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/USER_CopySnapshot.html\"> Copying a Snapshot</a> in the <i>Amazon Aurora User Guide.</i> </p> <p>For more information on Amazon Aurora, see <a href=\"https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/CHAP_AuroraOverview.html\"> What Is Amazon Aurora?</a> in the <i>Amazon Aurora User Guide.</i> </p> <note> <p>This action only applies to Aurora DB clusters.</p> </note>"
+      "documentation":"<p>Copies a snapshot of a DB cluster.</p> <p>To copy a DB cluster snapshot from a shared manual DB cluster snapshot, <code>SourceDBClusterSnapshotIdentifier</code> must be the Amazon Resource Name (ARN) of the shared DB cluster snapshot.</p> <p>You can copy an encrypted DB cluster snapshot from another AWS Region. In that case, the AWS Region where you call the <code>CopyDBClusterSnapshot</code> action is the destination AWS Region for the encrypted DB cluster snapshot to be copied to. To copy an encrypted DB cluster snapshot from another AWS Region, you must provide the following values:</p> <ul> <li> <p> <code>KmsKeyId</code> - The AWS Key Management System (AWS KMS) key identifier for the key to use to encrypt the copy of the DB cluster snapshot in the destination AWS Region.</p> </li> <li> <p> <code>PreSignedUrl</code> - A URL that contains a Signature Version 4 signed request for the <code>CopyDBClusterSnapshot</code> action to be called in the source AWS Region where the DB cluster snapshot is copied from. The pre-signed URL must be a valid request for the <code>CopyDBClusterSnapshot</code> API action that can be executed in the source AWS Region that contains the encrypted DB cluster snapshot to be copied.</p> <p>The pre-signed URL request must contain the following parameter values:</p> <ul> <li> <p> <code>KmsKeyId</code> - The KMS key identifier for the key to use to encrypt the copy of the DB cluster snapshot in the destination AWS Region. This is the same identifier for both the <code>CopyDBClusterSnapshot</code> action that is called in the destination AWS Region, and the action contained in the pre-signed URL.</p> </li> <li> <p> <code>DestinationRegion</code> - The name of the AWS Region that the DB cluster snapshot is to be created in.</p> </li> <li> <p> <code>SourceDBClusterSnapshotIdentifier</code> - The DB cluster snapshot identifier for the encrypted DB cluster snapshot to be copied. This identifier must be in the Amazon Resource Name (ARN) format for the source AWS Region. For example, if you are copying an encrypted DB cluster snapshot from the us-west-2 AWS Region, then your <code>SourceDBClusterSnapshotIdentifier</code> looks like the following example: <code>arn:aws:rds:us-west-2:123456789012:cluster-snapshot:aurora-cluster1-snapshot-20161115</code>.</p> </li> </ul> <p>To learn how to generate a Signature Version 4 signed request, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/API/sigv4-query-string-auth.html\"> Authenticating Requests: Using Query Parameters (AWS Signature Version 4)</a> and <a href=\"https://docs.aws.amazon.com/general/latest/gr/signature-version-4.html\"> Signature Version 4 Signing Process</a>.</p> <note> <p>If you are using an AWS SDK tool or the AWS CLI, you can specify <code>SourceRegion</code> (or <code>--source-region</code> for the AWS CLI) instead of specifying <code>PreSignedUrl</code> manually. Specifying <code>SourceRegion</code> autogenerates a pre-signed URL that is a valid request for the operation that can be executed in the source AWS Region.</p> </note> </li> <li> <p> <code>TargetDBClusterSnapshotIdentifier</code> - The identifier for the new copy of the DB cluster snapshot in the destination AWS Region.</p> </li> <li> <p> <code>SourceDBClusterSnapshotIdentifier</code> - The DB cluster snapshot identifier for the encrypted DB cluster snapshot to be copied. This identifier must be in the ARN format for the source AWS Region and is the same value as the <code>SourceDBClusterSnapshotIdentifier</code> in the pre-signed URL. </p> </li> </ul> <p>To cancel the copy operation once it is in progress, delete the target DB cluster snapshot identified by <code>TargetDBClusterSnapshotIdentifier</code> while that DB cluster snapshot is in \"copying\" status.</p> <p>For more information on copying encrypted DB cluster snapshots from one AWS Region to another, see <a href=\"https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/USER_CopySnapshot.html\"> Copying a Snapshot</a> in the <i>Amazon Aurora User Guide.</i> </p> <p>For more information on Amazon Aurora, see <a href=\"https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/CHAP_AuroraOverview.html\"> What Is Amazon Aurora?</a> in the <i>Amazon Aurora User Guide.</i> </p> <note> <p>This action only applies to Aurora DB clusters.</p> </note>"
     },
     "CopyDBParameterGroup":{
       "name":"CopyDBParameterGroup",
@@ -202,7 +219,7 @@
         {"shape":"SnapshotQuotaExceededFault"},
         {"shape":"KMSKeyNotAccessibleFault"}
       ],
-      "documentation":"<p>Copies the specified DB snapshot. The source DB snapshot must be in the \"available\" state.</p> <p>You can copy a snapshot from one AWS Region to another. In that case, the AWS Region where you call the <code>CopyDBSnapshot</code> action is the destination AWS Region for the DB snapshot copy. </p> <p>For more information about copying snapshots, see <a href=\"https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_CopyDBSnapshot.html\">Copying a DB Snapshot</a> in the <i>Amazon RDS User Guide.</i> </p>"
+      "documentation":"<p>Copies the specified DB snapshot. The source DB snapshot must be in the \"available\" state.</p> <p>You can copy a snapshot from one AWS Region to another. In that case, the AWS Region where you call the <code>CopyDBSnapshot</code> action is the destination AWS Region for the DB snapshot copy. </p> <p>For more information about copying snapshots, see <a href=\"https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_CopySnapshot.html#USER_CopyDBSnapshot\">Copying a DB Snapshot</a> in the <i>Amazon RDS User Guide.</i> </p>"
     },
     "CopyOptionGroup":{
       "name":"CopyOptionGroup",
@@ -416,6 +433,24 @@
       ],
       "documentation":"<p>Creates a new DB parameter group.</p> <p> A DB parameter group is initially created with the default parameters for the database engine used by the DB instance. To provide custom values for any of the parameters, you must modify the group after creating it using <i>ModifyDBParameterGroup</i>. Once you've created a DB parameter group, you need to associate it with your DB instance using <i>ModifyDBInstance</i>. When you associate a new DB parameter group with a running DB instance, you need to reboot the DB instance without failover for the new DB parameter group and associated settings to take effect. </p> <important> <p>After you create a DB parameter group, you should wait at least 5 minutes before creating your first DB instance that uses that DB parameter group as the default parameter group. This allows Amazon RDS to fully complete the create action before the parameter group is used as the default for a new DB instance. This is especially important for parameters that are critical when creating the default database for a DB instance, such as the character set for the default database defined by the <code>character_set_database</code> parameter. You can use the <i>Parameter Groups</i> option of the <a href=\"https://console.aws.amazon.com/rds/\">Amazon RDS console</a> or the <i>DescribeDBParameters</i> command to verify that your DB parameter group has been created or modified.</p> </important>"
     },
+    "CreateDBProxy":{
+      "name":"CreateDBProxy",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"CreateDBProxyRequest"},
+      "output":{
+        "shape":"CreateDBProxyResponse",
+        "resultWrapper":"CreateDBProxyResult"
+      },
+      "errors":[
+        {"shape":"InvalidSubnet"},
+        {"shape":"DBProxyAlreadyExistsFault"},
+        {"shape":"DBProxyQuotaExceededFault"}
+      ],
+      "documentation":"<note> <p>This is prerelease documentation for the RDS Database Proxy feature in preview release. It is subject to change.</p> </note> <p>Creates a new DB proxy.</p>"
+    },
     "CreateDBSecurityGroup":{
       "name":"CreateDBSecurityGroup",
       "http":{
@@ -493,7 +528,7 @@
         {"shape":"SubscriptionCategoryNotFoundFault"},
         {"shape":"SourceNotFoundFault"}
       ],
-      "documentation":"<p>Creates an RDS event notification subscription. This action requires a topic ARN (Amazon Resource Name) created by either the RDS console, the SNS console, or the SNS API. To obtain an ARN with SNS, you must create a topic in Amazon SNS and subscribe to the topic. The ARN is displayed in the SNS console.</p> <p>You can specify the type of source (SourceType) you want to be notified of, provide a list of RDS sources (SourceIds) that triggers the events, and provide a list of event categories (EventCategories) for events you want to be notified of. For example, you can specify SourceType = db-instance, SourceIds = mydbinstance1, mydbinstance2 and EventCategories = Availability, Backup.</p> <p>If you specify both the SourceType and SourceIds, such as SourceType = db-instance and SourceIdentifier = myDBInstance1, you are notified of all the db-instance events for the specified source. If you specify a SourceType but do not specify a SourceIdentifier, you receive notice of the events for that source type for all your RDS sources. If you do not specify either the SourceType nor the SourceIdentifier, you are notified of events generated from all RDS sources belonging to your customer account.</p>"
+      "documentation":"<p>Creates an RDS event notification subscription. This action requires a topic Amazon Resource Name (ARN) created by either the RDS console, the SNS console, or the SNS API. To obtain an ARN with SNS, you must create a topic in Amazon SNS and subscribe to the topic. The ARN is displayed in the SNS console.</p> <p>You can specify the type of source (SourceType) you want to be notified of, provide a list of RDS sources (SourceIds) that triggers the events, and provide a list of event categories (EventCategories) for events you want to be notified of. For example, you can specify SourceType = db-instance, SourceIds = mydbinstance1, mydbinstance2 and EventCategories = Availability, Backup.</p> <p>If you specify both the SourceType and SourceIds, such as SourceType = db-instance and SourceIdentifier = myDBInstance1, you are notified of all the db-instance events for the specified source. If you specify a SourceType but do not specify a SourceIdentifier, you receive notice of the events for that source type for all your RDS sources. If you don't specify either the SourceType or the SourceIdentifier, you are notified of events generated from all RDS sources belonging to your customer account.</p> <note> <p>RDS event notification is only available for unencrypted SNS topics. If you specify an encrypted SNS topic, event notifications aren't sent for the topic.</p> </note>"
     },
     "CreateGlobalCluster":{
       "name":"CreateGlobalCluster",
@@ -635,7 +670,7 @@
         {"shape":"InvalidDBClusterStateFault"},
         {"shape":"DBInstanceAutomatedBackupQuotaExceededFault"}
       ],
-      "documentation":"<p>The DeleteDBInstance action deletes a previously provisioned DB instance. When you delete a DB instance, all automated backups for that instance are deleted and can't be recovered. Manual DB snapshots of the DB instance to be deleted by <code>DeleteDBInstance</code> are not deleted.</p> <p> If you request a final DB snapshot the status of the Amazon RDS DB instance is <code>deleting</code> until the DB snapshot is created. The API action <code>DescribeDBInstance</code> is used to monitor the status of this operation. The action can't be canceled or reverted once submitted. </p> <p>Note that when a DB instance is in a failure state and has a status of <code>failed</code>, <code>incompatible-restore</code>, or <code>incompatible-network</code>, you can only delete it when you skip creation of the final snapshot with the <code>SkipFinalSnapshot</code> parameter.</p> <p>If the specified DB instance is part of an Amazon Aurora DB cluster, you can't delete the DB instance if both of the following conditions are true:</p> <ul> <li> <p>The DB cluster is a Read Replica of another Amazon Aurora DB cluster.</p> </li> <li> <p>The DB instance is the only instance in the DB cluster.</p> </li> </ul> <p>To delete a DB instance in this case, first call the <code>PromoteReadReplicaDBCluster</code> API action to promote the DB cluster so it's no longer a Read Replica. After the promotion completes, then call the <code>DeleteDBInstance</code> API action to delete the final instance in the DB cluster.</p>"
+      "documentation":"<p>The DeleteDBInstance action deletes a previously provisioned DB instance. When you delete a DB instance, all automated backups for that instance are deleted and can't be recovered. Manual DB snapshots of the DB instance to be deleted by <code>DeleteDBInstance</code> are not deleted.</p> <p> If you request a final DB snapshot the status of the Amazon RDS DB instance is <code>deleting</code> until the DB snapshot is created. The API action <code>DescribeDBInstance</code> is used to monitor the status of this operation. The action can't be canceled or reverted once submitted. </p> <p>When a DB instance is in a failure state and has a status of <code>failed</code>, <code>incompatible-restore</code>, or <code>incompatible-network</code>, you can only delete it when you skip creation of the final snapshot with the <code>SkipFinalSnapshot</code> parameter.</p> <p>If the specified DB instance is part of an Amazon Aurora DB cluster, you can't delete the DB instance if both of the following conditions are true:</p> <ul> <li> <p>The DB cluster is a Read Replica of another Amazon Aurora DB cluster.</p> </li> <li> <p>The DB instance is the only instance in the DB cluster.</p> </li> </ul> <p>To delete a DB instance in this case, first call the <code>PromoteReadReplicaDBCluster</code> API action to promote the DB cluster so it's no longer a Read Replica. After the promotion completes, then call the <code>DeleteDBInstance</code> API action to delete the final instance in the DB cluster.</p>"
     },
     "DeleteDBInstanceAutomatedBackup":{
       "name":"DeleteDBInstanceAutomatedBackup",
@@ -667,6 +702,23 @@
       ],
       "documentation":"<p>Deletes a specified DB parameter group. The DB parameter group to be deleted can't be associated with any DB instances.</p>"
     },
+    "DeleteDBProxy":{
+      "name":"DeleteDBProxy",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DeleteDBProxyRequest"},
+      "output":{
+        "shape":"DeleteDBProxyResponse",
+        "resultWrapper":"DeleteDBProxyResult"
+      },
+      "errors":[
+        {"shape":"DBProxyNotFoundFault"},
+        {"shape":"InvalidDBProxyStateFault"}
+      ],
+      "documentation":"<note> <p>This is prerelease documentation for the RDS Database Proxy feature in preview release. It is subject to change.</p> </note> <p>Deletes an existing proxy.</p>"
+    },
     "DeleteDBSecurityGroup":{
       "name":"DeleteDBSecurityGroup",
       "http":{
@@ -759,7 +811,7 @@
       "errors":[
         {"shape":"InstallationMediaNotFoundFault"}
       ],
-      "documentation":"<p>Deletes the installation media for an on-premises, bring your own media (BYOM) DB engine, such as Microsoft SQL Server.</p>"
+      "documentation":"<p>Deletes the installation medium for a DB engine that requires an on-premises customer provided license, such as Microsoft SQL Server.</p>"
     },
     "DeleteOptionGroup":{
       "name":"DeleteOptionGroup",
@@ -774,6 +826,25 @@
       ],
       "documentation":"<p>Deletes an existing option group.</p>"
     },
+    "DeregisterDBProxyTargets":{
+      "name":"DeregisterDBProxyTargets",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DeregisterDBProxyTargetsRequest"},
+      "output":{
+        "shape":"DeregisterDBProxyTargetsResponse",
+        "resultWrapper":"DeregisterDBProxyTargetsResult"
+      },
+      "errors":[
+        {"shape":"DBProxyTargetNotFoundFault"},
+        {"shape":"DBProxyTargetGroupNotFoundFault"},
+        {"shape":"DBProxyNotFoundFault"},
+        {"shape":"InvalidDBProxyStateFault"}
+      ],
+      "documentation":"<note> <p>This is prerelease documentation for the RDS Database Proxy feature in preview release. It is subject to change.</p> </note> <p>Remove the association between one or more <code>DBProxyTarget</code> data structures and a <code>DBProxyTargetGroup</code>.</p>"
+    },
     "DescribeAccountAttributes":{
       "name":"DescribeAccountAttributes",
       "http":{
@@ -930,7 +1001,7 @@
       "errors":[
         {"shape":"DBClusterNotFoundFault"}
       ],
-      "documentation":"<p>Returns information about provisioned Aurora DB clusters. This API supports pagination.</p> <p>For more information on Amazon Aurora, see <a href=\"https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/CHAP_AuroraOverview.html\"> What Is Amazon Aurora?</a> in the <i>Amazon Aurora User Guide.</i> </p> <note> <p>This action only applies to Aurora DB clusters.</p> </note>"
+      "documentation":"<p>Returns information about provisioned Aurora DB clusters. This API supports pagination.</p> <p>For more information on Amazon Aurora, see <a href=\"https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/CHAP_AuroraOverview.html\"> What Is Amazon Aurora?</a> in the <i>Amazon Aurora User Guide.</i> </p> <note> <p>This operation can also return information for Amazon Neptune DB instances and Amazon DocumentDB instances.</p> </note>"
     },
     "DescribeDBEngineVersions":{
       "name":"DescribeDBEngineVersions",
@@ -975,7 +1046,7 @@
       "errors":[
         {"shape":"DBInstanceNotFoundFault"}
       ],
-      "documentation":"<p>Returns information about provisioned RDS instances. This API supports pagination.</p>"
+      "documentation":"<p>Returns information about provisioned RDS instances. This API supports pagination.</p> <note> <p>This operation can also return information for Amazon Neptune DB instances and Amazon DocumentDB instances.</p> </note>"
     },
     "DescribeDBLogFiles":{
       "name":"DescribeDBLogFiles",
@@ -1025,6 +1096,59 @@
       ],
       "documentation":"<p>Returns the detailed parameter list for a particular DB parameter group.</p>"
     },
+    "DescribeDBProxies":{
+      "name":"DescribeDBProxies",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DescribeDBProxiesRequest"},
+      "output":{
+        "shape":"DescribeDBProxiesResponse",
+        "resultWrapper":"DescribeDBProxiesResult"
+      },
+      "errors":[
+        {"shape":"DBProxyNotFoundFault"}
+      ],
+      "documentation":"<note> <p>This is prerelease documentation for the RDS Database Proxy feature in preview release. It is subject to change.</p> </note> <p>Returns information about DB proxies.</p>"
+    },
+    "DescribeDBProxyTargetGroups":{
+      "name":"DescribeDBProxyTargetGroups",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DescribeDBProxyTargetGroupsRequest"},
+      "output":{
+        "shape":"DescribeDBProxyTargetGroupsResponse",
+        "resultWrapper":"DescribeDBProxyTargetGroupsResult"
+      },
+      "errors":[
+        {"shape":"DBProxyNotFoundFault"},
+        {"shape":"DBProxyTargetGroupNotFoundFault"},
+        {"shape":"InvalidDBProxyStateFault"}
+      ],
+      "documentation":"<note> <p>This is prerelease documentation for the RDS Database Proxy feature in preview release. It is subject to change.</p> </note> <p>Returns information about DB proxy target groups, represented by <code>DBProxyTargetGroup</code> data structures.</p>"
+    },
+    "DescribeDBProxyTargets":{
+      "name":"DescribeDBProxyTargets",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DescribeDBProxyTargetsRequest"},
+      "output":{
+        "shape":"DescribeDBProxyTargetsResponse",
+        "resultWrapper":"DescribeDBProxyTargetsResult"
+      },
+      "errors":[
+        {"shape":"DBProxyNotFoundFault"},
+        {"shape":"DBProxyTargetNotFoundFault"},
+        {"shape":"DBProxyTargetGroupNotFoundFault"},
+        {"shape":"InvalidDBProxyStateFault"}
+      ],
+      "documentation":"<note> <p>This is prerelease documentation for the RDS Database Proxy feature in preview release. It is subject to change.</p> </note> <p>Returns information about <code>DBProxyTarget</code> objects. This API supports pagination.</p>"
+    },
     "DescribeDBSecurityGroups":{
       "name":"DescribeDBSecurityGroups",
       "http":{
@@ -1157,6 +1281,22 @@
       },
       "documentation":"<p>Returns events related to DB instances, DB security groups, DB snapshots, and DB parameter groups for the past 14 days. Events specific to a particular DB instance, DB security group, database snapshot, or DB parameter group can be obtained by providing the name as a parameter. By default, the past hour of events are returned.</p>"
     },
+    "DescribeExportTasks":{
+      "name":"DescribeExportTasks",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DescribeExportTasksMessage"},
+      "output":{
+        "shape":"ExportTasksMessage",
+        "resultWrapper":"DescribeExportTasksResult"
+      },
+      "errors":[
+        {"shape":"ExportTaskNotFoundFault"}
+      ],
+      "documentation":"<p>Returns information about a snapshot export to Amazon S3. This API operation supports pagination. </p>"
+    },
     "DescribeGlobalClusters":{
       "name":"DescribeGlobalClusters",
       "http":{
@@ -1187,7 +1327,7 @@
       "errors":[
         {"shape":"InstallationMediaNotFoundFault"}
       ],
-      "documentation":"<p>Describes the available installation media for on-premises, bring your own media (BYOM) DB engines, such as Microsoft SQL Server.</p>"
+      "documentation":"<p>Describes the available installation media for a DB engine that requires an on-premises customer provided license, such as Microsoft SQL Server.</p>"
     },
     "DescribeOptionGroupOptions":{
       "name":"DescribeOptionGroupOptions",
@@ -1359,7 +1499,7 @@
         {"shape":"CustomAvailabilityZoneNotFoundFault"},
         {"shape":"InstallationMediaAlreadyExistsFault"}
       ],
-      "documentation":"<p>Imports the installation media for an on-premises, bring your own media (BYOM) DB engine, such as SQL Server.</p>"
+      "documentation":"<p>Imports the installation media for a DB engine that requires an on-premises customer provided license, such as SQL Server.</p>"
     },
     "ListTagsForResource":{
       "name":"ListTagsForResource",
@@ -1379,6 +1519,22 @@
       ],
       "documentation":"<p>Lists all tags on an Amazon RDS resource.</p> <p>For an overview on tagging an Amazon RDS resource, see <a href=\"https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/Overview.Tagging.html\">Tagging Amazon RDS Resources</a> in the <i>Amazon RDS User Guide</i>.</p>"
     },
+    "ModifyCertificates":{
+      "name":"ModifyCertificates",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"ModifyCertificatesMessage"},
+      "output":{
+        "shape":"ModifyCertificatesResult",
+        "resultWrapper":"ModifyCertificatesResult"
+      },
+      "errors":[
+        {"shape":"CertificateNotFoundFault"}
+      ],
+      "documentation":"<p>Override the system-default Secure Sockets Layer/Transport Layer Security (SSL/TLS) certificate for Amazon RDS for new DB instances temporarily, or remove the override.</p> <p>By using this operation, you can specify an RDS-approved SSL/TLS certificate for new DB instances that is different from the default certificate provided by RDS. You can also use this operation to remove the override, so that new DB instances use the default certificate provided by RDS.</p> <p>You might need to override the default certificate in the following situations:</p> <ul> <li> <p>You already migrated your applications to support the latest certificate authority (CA) certificate, but the new CA certificate is not yet the RDS default CA certificate for the specified AWS Region.</p> </li> <li> <p>RDS has already moved to a new default CA certificate for the specified AWS Region, but you are still in the process of supporting the new CA certificate. In this case, you temporarily need additional time to finish your application changes.</p> </li> </ul> <p>For more information about rotating your SSL/TLS certificate for RDS DB engines, see <a href=\"https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/UsingWithRDS.SSL-certificate-rotation.html\"> Rotating Your SSL/TLS Certificate</a> in the <i>Amazon RDS User Guide</i>.</p> <p>For more information about rotating your SSL/TLS certificate for Aurora DB engines, see <a href=\"https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/UsingWithRDS.SSL-certificate-rotation.html\"> Rotating Your SSL/TLS Certificate</a> in the <i>Amazon Aurora User Guide</i>.</p>"
+    },
     "ModifyCurrentDBClusterCapacity":{
       "name":"ModifyCurrentDBClusterCapacity",
       "http":{
@@ -1459,7 +1615,7 @@
         {"shape":"DBParameterGroupNotFoundFault"},
         {"shape":"InvalidDBParameterGroupStateFault"}
       ],
-      "documentation":"<p> Modifies the parameters of a DB cluster parameter group. To modify more than one parameter, submit a list of the following: <code>ParameterName</code>, <code>ParameterValue</code>, and <code>ApplyMethod</code>. A maximum of 20 parameters can be modified in a single request. </p> <p>For more information on Amazon Aurora, see <a href=\"https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/CHAP_AuroraOverview.html\"> What Is Amazon Aurora?</a> in the <i>Amazon Aurora User Guide.</i> </p> <note> <p>Changes to dynamic parameters are applied immediately. Changes to static parameters require a reboot without failover to the DB cluster associated with the parameter group before the change can take effect.</p> </note> <important> <p>After you create a DB cluster parameter group, you should wait at least 5 minutes before creating your first DB cluster that uses that DB cluster parameter group as the default parameter group. This allows Amazon RDS to fully complete the create action before the parameter group is used as the default for a new DB cluster. This is especially important for parameters that are critical when creating the default database for a DB cluster, such as the character set for the default database defined by the <code>character_set_database</code> parameter. You can use the <i>Parameter Groups</i> option of the <a href=\"https://console.aws.amazon.com/rds/\">Amazon RDS console</a> or the <code>DescribeDBClusterParameters</code> action to verify that your DB cluster parameter group has been created or modified.</p> </important> <note> <p>This action only applies to Aurora DB clusters.</p> </note>"
+      "documentation":"<p> Modifies the parameters of a DB cluster parameter group. To modify more than one parameter, submit a list of the following: <code>ParameterName</code>, <code>ParameterValue</code>, and <code>ApplyMethod</code>. A maximum of 20 parameters can be modified in a single request. </p> <p>For more information on Amazon Aurora, see <a href=\"https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/CHAP_AuroraOverview.html\"> What Is Amazon Aurora?</a> in the <i>Amazon Aurora User Guide.</i> </p> <note> <p>Changes to dynamic parameters are applied immediately. Changes to static parameters require a reboot without failover to the DB cluster associated with the parameter group before the change can take effect.</p> </note> <important> <p>After you create a DB cluster parameter group, you should wait at least 5 minutes before creating your first DB cluster that uses that DB cluster parameter group as the default parameter group. This allows Amazon RDS to fully complete the create action before the parameter group is used as the default for a new DB cluster. This is especially important for parameters that are critical when creating the default database for a DB cluster, such as the character set for the default database defined by the <code>character_set_database</code> parameter. You can use the <i>Parameter Groups</i> option of the <a href=\"https://console.aws.amazon.com/rds/\">Amazon RDS console</a> or the <code>DescribeDBClusterParameters</code> action to verify that your DB cluster parameter group has been created or modified.</p> <p>If the modified DB cluster parameter group is used by an Aurora Serverless cluster, Aurora applies the update immediately. The cluster restart might interrupt your workload. In that case, your application must reopen any connections and retry any transactions that were active when the parameter changes took effect.</p> </important> <note> <p>This action only applies to Aurora DB clusters.</p> </note>"
     },
     "ModifyDBClusterSnapshotAttribute":{
       "name":"ModifyDBClusterSnapshotAttribute",
@@ -1528,6 +1684,42 @@
       ],
       "documentation":"<p> Modifies the parameters of a DB parameter group. To modify more than one parameter, submit a list of the following: <code>ParameterName</code>, <code>ParameterValue</code>, and <code>ApplyMethod</code>. A maximum of 20 parameters can be modified in a single request. </p> <note> <p>Changes to dynamic parameters are applied immediately. Changes to static parameters require a reboot without failover to the DB instance associated with the parameter group before the change can take effect.</p> </note> <important> <p>After you modify a DB parameter group, you should wait at least 5 minutes before creating your first DB instance that uses that DB parameter group as the default parameter group. This allows Amazon RDS to fully complete the modify action before the parameter group is used as the default for a new DB instance. This is especially important for parameters that are critical when creating the default database for a DB instance, such as the character set for the default database defined by the <code>character_set_database</code> parameter. You can use the <i>Parameter Groups</i> option of the <a href=\"https://console.aws.amazon.com/rds/\">Amazon RDS console</a> or the <i>DescribeDBParameters</i> command to verify that your DB parameter group has been created or modified.</p> </important>"
     },
+    "ModifyDBProxy":{
+      "name":"ModifyDBProxy",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"ModifyDBProxyRequest"},
+      "output":{
+        "shape":"ModifyDBProxyResponse",
+        "resultWrapper":"ModifyDBProxyResult"
+      },
+      "errors":[
+        {"shape":"DBProxyNotFoundFault"},
+        {"shape":"DBProxyAlreadyExistsFault"},
+        {"shape":"InvalidDBProxyStateFault"}
+      ],
+      "documentation":"<note> <p>This is prerelease documentation for the RDS Database Proxy feature in preview release. It is subject to change.</p> </note> <p>Changes the settings for an existing DB proxy.</p>"
+    },
+    "ModifyDBProxyTargetGroup":{
+      "name":"ModifyDBProxyTargetGroup",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"ModifyDBProxyTargetGroupRequest"},
+      "output":{
+        "shape":"ModifyDBProxyTargetGroupResponse",
+        "resultWrapper":"ModifyDBProxyTargetGroupResult"
+      },
+      "errors":[
+        {"shape":"DBProxyNotFoundFault"},
+        {"shape":"DBProxyTargetGroupNotFoundFault"},
+        {"shape":"InvalidDBProxyStateFault"}
+      ],
+      "documentation":"<note> <p>This is prerelease documentation for the RDS Database Proxy feature in preview release. It is subject to change.</p> </note> <p>Modifies the properties of a <code>DBProxyTargetGroup</code>.</p>"
+    },
     "ModifyDBSnapshot":{
       "name":"ModifyDBSnapshot",
       "http":{
@@ -1542,7 +1734,7 @@
       "errors":[
         {"shape":"DBSnapshotNotFoundFault"}
       ],
-      "documentation":"<p>Updates a manual DB snapshot, which can be encrypted or not encrypted, with a new engine version. </p> <p>Amazon RDS supports upgrading DB snapshots for MySQL and Oracle. </p>"
+      "documentation":"<p>Updates a manual DB snapshot, which can be encrypted or not encrypted, with a new engine version. </p> <p>Amazon RDS supports upgrading DB snapshots for MySQL, Oracle, and PostgreSQL. </p>"
     },
     "ModifyDBSnapshotAttribute":{
       "name":"ModifyDBSnapshotAttribute",
@@ -1601,7 +1793,7 @@
         {"shape":"SNSTopicArnNotFoundFault"},
         {"shape":"SubscriptionCategoryNotFoundFault"}
       ],
-      "documentation":"<p>Modifies an existing RDS event notification subscription. Note that you can't modify the source identifiers using this call; to change source identifiers for a subscription, use the <code>AddSourceIdentifierToSubscription</code> and <code>RemoveSourceIdentifierFromSubscription</code> calls.</p> <p>You can see a list of the event categories for a given SourceType in the <a href=\"https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_Events.html\">Events</a> topic in the <i>Amazon RDS User Guide</i> or by using the <b>DescribeEventCategories</b> action.</p>"
+      "documentation":"<p>Modifies an existing RDS event notification subscription. You can't modify the source identifiers using this call. To change source identifiers for a subscription, use the <code>AddSourceIdentifierToSubscription</code> and <code>RemoveSourceIdentifierFromSubscription</code> calls.</p> <p>You can see a list of the event categories for a given SourceType in the <a href=\"https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_Events.html\">Events</a> topic in the <i>Amazon RDS User Guide</i> or by using the <b>DescribeEventCategories</b> action.</p>"
     },
     "ModifyGlobalCluster":{
       "name":"ModifyGlobalCluster",
@@ -1706,6 +1898,29 @@
       ],
       "documentation":"<p>You might need to reboot your DB instance, usually for maintenance reasons. For example, if you make certain modifications, or if you change the DB parameter group associated with the DB instance, you must reboot the instance for the changes to take effect. </p> <p>Rebooting a DB instance restarts the database engine service. Rebooting a DB instance results in a momentary outage, during which the DB instance status is set to rebooting. </p> <p>For more information about rebooting, see <a href=\"https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_RebootInstance.html\">Rebooting a DB Instance</a> in the <i>Amazon RDS User Guide.</i> </p>"
     },
+    "RegisterDBProxyTargets":{
+      "name":"RegisterDBProxyTargets",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"RegisterDBProxyTargetsRequest"},
+      "output":{
+        "shape":"RegisterDBProxyTargetsResponse",
+        "resultWrapper":"RegisterDBProxyTargetsResult"
+      },
+      "errors":[
+        {"shape":"DBProxyNotFoundFault"},
+        {"shape":"DBProxyTargetGroupNotFoundFault"},
+        {"shape":"DBClusterNotFoundFault"},
+        {"shape":"DBInstanceNotFoundFault"},
+        {"shape":"DBProxyTargetAlreadyRegisteredFault"},
+        {"shape":"InvalidDBInstanceStateFault"},
+        {"shape":"InvalidDBClusterStateFault"},
+        {"shape":"InvalidDBProxyStateFault"}
+      ],
+      "documentation":"<note> <p>This is prerelease documentation for the RDS Database Proxy feature in preview release. It is subject to change.</p> </note> <p>Associate one or more <code>DBProxyTarget</code> data structures with a <code>DBProxyTargetGroup</code>.</p>"
+    },
     "RemoveFromGlobalCluster":{
       "name":"RemoveFromGlobalCluster",
       "http":{
@@ -1878,7 +2093,7 @@
         {"shape":"DomainNotFoundFault"},
         {"shape":"DBClusterParameterGroupNotFoundFault"}
       ],
-      "documentation":"<p>Creates a new DB cluster from a DB snapshot or DB cluster snapshot.</p> <p>If a DB snapshot is specified, the target DB cluster is created from the source DB snapshot with a default configuration and default security group.</p> <p>If a DB cluster snapshot is specified, the target DB cluster is created from the source DB cluster restore point with the same configuration as the original source DB cluster, except that the new DB cluster is created with the default security group.</p> <p>For more information on Amazon Aurora, see <a href=\"https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/CHAP_AuroraOverview.html\"> What Is Amazon Aurora?</a> in the <i>Amazon Aurora User Guide.</i> </p> <note> <p>This action only applies to Aurora DB clusters.</p> </note>"
+      "documentation":"<p>Creates a new DB cluster from a DB snapshot or DB cluster snapshot.</p> <p>If a DB snapshot is specified, the target DB cluster is created from the source DB snapshot with a default configuration and default security group.</p> <p>If a DB cluster snapshot is specified, the target DB cluster is created from the source DB cluster restore point with the same configuration as the original source DB cluster. If you don't specify a security group, the new DB cluster is associated with the default security group.</p> <p>For more information on Amazon Aurora, see <a href=\"https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/CHAP_AuroraOverview.html\"> What Is Amazon Aurora?</a> in the <i>Amazon Aurora User Guide.</i> </p> <note> <p>This action only applies to Aurora DB clusters.</p> </note>"
     },
     "RestoreDBClusterToPointInTime":{
       "name":"RestoreDBClusterToPointInTime",
@@ -2100,6 +2315,30 @@
       ],
       "documentation":"<p> Starts an Amazon RDS DB instance that was stopped using the AWS console, the stop-db-instance AWS CLI command, or the StopDBInstance action. </p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_StartInstance.html\"> Starting an Amazon RDS DB instance That Was Previously Stopped</a> in the <i>Amazon RDS User Guide.</i> </p> <note> <p> This command doesn't apply to Aurora MySQL and Aurora PostgreSQL. For Aurora DB clusters, use <code>StartDBCluster</code> instead. </p> </note>"
     },
+    "StartExportTask":{
+      "name":"StartExportTask",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"StartExportTaskMessage"},
+      "output":{
+        "shape":"ExportTask",
+        "resultWrapper":"StartExportTaskResult"
+      },
+      "errors":[
+        {"shape":"DBSnapshotNotFoundFault"},
+        {"shape":"DBClusterSnapshotNotFoundFault"},
+        {"shape":"ExportTaskAlreadyExistsFault"},
+        {"shape":"InvalidS3BucketFault"},
+        {"shape":"IamRoleNotFoundFault"},
+        {"shape":"IamRoleMissingPermissionsFault"},
+        {"shape":"InvalidExportOnlyFault"},
+        {"shape":"KMSKeyNotAccessibleFault"},
+        {"shape":"InvalidExportSourceStateFault"}
+      ],
+      "documentation":"<p>Starts an export of a snapshot to Amazon S3. The provided IAM role must have access to the S3 bucket. </p>"
+    },
     "StopActivityStream":{
       "name":"StopActivityStream",
       "http":{
@@ -2186,7 +2425,7 @@
           "documentation":"<p>The maximum allowed value for the quota.</p>"
         }
       },
-      "documentation":"<p>Describes a quota for an AWS account.</p> <p>The following are account quotas:</p> <ul> <li> <p> <code>AllocatedStorage</code> - The total allocated storage per account, in GiB. The used value is the total allocated storage in the account, in GiB.</p> </li> <li> <p> <code>AuthorizationsPerDBSecurityGroup</code> - The number of ingress rules per DB security group. The used value is the highest number of ingress rules in a DB security group in the account. Other DB security groups in the account might have a lower number of ingress rules.</p> </li> <li> <p> <code>CustomEndpointsPerDBCluster</code> - The number of custom endpoints per DB cluster. The used value is the highest number of custom endpoints in a DB clusters in the account. Other DB clusters in the account might have a lower number of custom endpoints.</p> </li> <li> <p> <code>DBClusterParameterGroups</code> - The number of DB cluster parameter groups per account, excluding default parameter groups. The used value is the count of nondefault DB cluster parameter groups in the account.</p> </li> <li> <p> <code>DBClusterRoles</code> - The number of associated AWS Identity and Access Management (IAM) roles per DB cluster. The used value is the highest number of associated IAM roles for a DB cluster in the account. Other DB clusters in the account might have a lower number of associated IAM roles.</p> </li> <li> <p> <code>DBClusters</code> - The number of DB clusters per account. The used value is the count of DB clusters in the account.</p> </li> <li> <p> <code>DBInstanceRoles</code> - The number of associated IAM roles per DB instance. The used value is the highest number of associated IAM roles for a DB instance in the account. Other DB instances in the account might have a lower number of associated IAM roles.</p> </li> <li> <p> <code>DBInstances</code> - The number of DB instances per account. The used value is the count of the DB instances in the account.</p> </li> <li> <p> <code>DBParameterGroups</code> - The number of DB parameter groups per account, excluding default parameter groups. The used value is the count of nondefault DB parameter groups in the account.</p> </li> <li> <p> <code>DBSecurityGroups</code> - The number of DB security groups (not VPC security groups) per account, excluding the default security group. The used value is the count of nondefault DB security groups in the account.</p> </li> <li> <p> <code>DBSubnetGroups</code> - The number of DB subnet groups per account. The used value is the count of the DB subnet groups in the account.</p> </li> <li> <p> <code>EventSubscriptions</code> - The number of event subscriptions per account. The used value is the count of the event subscriptions in the account.</p> </li> <li> <p> <code>ManualSnapshots</code> - The number of manual DB snapshots per account. The used value is the count of the manual DB snapshots in the account.</p> </li> <li> <p> <code>OptionGroups</code> - The number of DB option groups per account, excluding default option groups. The used value is the count of nondefault DB option groups in the account.</p> </li> <li> <p> <code>ReadReplicasPerMaster</code> - The number of Read Replicas per DB instance. The used value is the highest number of Read Replicas for a DB instance in the account. Other DB instances in the account might have a lower number of Read Replicas.</p> </li> <li> <p> <code>ReservedDBInstances</code> - The number of reserved DB instances per account. The used value is the count of the active reserved DB instances in the account.</p> </li> <li> <p> <code>SubnetsPerDBSubnetGroup</code> - The number of subnets per DB subnet group. The used value is highest number of subnets for a DB subnet group in the account. Other DB subnet groups in the account might have a lower number of subnets.</p> </li> </ul> <p>For more information, see <a href=\"https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/CHAP_Limits.html\">Limits</a> in the <i>Amazon RDS User Guide</i> and <a href=\"https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/CHAP_Limits.html\">Limits</a> in the <i>Amazon Aurora User Guide</i>.</p>",
+      "documentation":"<p>Describes a quota for an AWS account.</p> <p>The following are account quotas:</p> <ul> <li> <p> <code>AllocatedStorage</code> - The total allocated storage per account, in GiB. The used value is the total allocated storage in the account, in GiB.</p> </li> <li> <p> <code>AuthorizationsPerDBSecurityGroup</code> - The number of ingress rules per DB security group. The used value is the highest number of ingress rules in a DB security group in the account. Other DB security groups in the account might have a lower number of ingress rules.</p> </li> <li> <p> <code>CustomEndpointsPerDBCluster</code> - The number of custom endpoints per DB cluster. The used value is the highest number of custom endpoints in a DB clusters in the account. Other DB clusters in the account might have a lower number of custom endpoints.</p> </li> <li> <p> <code>DBClusterParameterGroups</code> - The number of DB cluster parameter groups per account, excluding default parameter groups. The used value is the count of nondefault DB cluster parameter groups in the account.</p> </li> <li> <p> <code>DBClusterRoles</code> - The number of associated AWS Identity and Access Management (IAM) roles per DB cluster. The used value is the highest number of associated IAM roles for a DB cluster in the account. Other DB clusters in the account might have a lower number of associated IAM roles.</p> </li> <li> <p> <code>DBClusters</code> - The number of DB clusters per account. The used value is the count of DB clusters in the account.</p> </li> <li> <p> <code>DBInstanceRoles</code> - The number of associated IAM roles per DB instance. The used value is the highest number of associated IAM roles for a DB instance in the account. Other DB instances in the account might have a lower number of associated IAM roles.</p> </li> <li> <p> <code>DBInstances</code> - The number of DB instances per account. The used value is the count of the DB instances in the account.</p> <p>Amazon RDS DB instances, Amazon Aurora DB instances, Amazon Neptune instances, and Amazon DocumentDB instances apply to this quota.</p> </li> <li> <p> <code>DBParameterGroups</code> - The number of DB parameter groups per account, excluding default parameter groups. The used value is the count of nondefault DB parameter groups in the account.</p> </li> <li> <p> <code>DBSecurityGroups</code> - The number of DB security groups (not VPC security groups) per account, excluding the default security group. The used value is the count of nondefault DB security groups in the account.</p> </li> <li> <p> <code>DBSubnetGroups</code> - The number of DB subnet groups per account. The used value is the count of the DB subnet groups in the account.</p> </li> <li> <p> <code>EventSubscriptions</code> - The number of event subscriptions per account. The used value is the count of the event subscriptions in the account.</p> </li> <li> <p> <code>ManualSnapshots</code> - The number of manual DB snapshots per account. The used value is the count of the manual DB snapshots in the account.</p> </li> <li> <p> <code>OptionGroups</code> - The number of DB option groups per account, excluding default option groups. The used value is the count of nondefault DB option groups in the account.</p> </li> <li> <p> <code>ReadReplicasPerMaster</code> - The number of Read Replicas per DB instance. The used value is the highest number of Read Replicas for a DB instance in the account. Other DB instances in the account might have a lower number of Read Replicas.</p> </li> <li> <p> <code>ReservedDBInstances</code> - The number of reserved DB instances per account. The used value is the count of the active reserved DB instances in the account.</p> </li> <li> <p> <code>SubnetsPerDBSubnetGroup</code> - The number of subnets per DB subnet group. The used value is highest number of subnets for a DB subnet group in the account. Other DB subnet groups in the account might have a lower number of subnets.</p> </li> </ul> <p>For more information, see <a href=\"https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/CHAP_Limits.html\">Quotas for Amazon RDS</a> in the <i>Amazon RDS User Guide</i> and <a href=\"https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/CHAP_Limits.html\">Quotas for Amazon Aurora</a> in the <i>Amazon Aurora User Guide</i>.</p>",
       "wrapper":true
     },
     "AccountQuotaList":{
@@ -2251,7 +2490,7 @@
         },
         "FeatureName":{
           "shape":"String",
-          "documentation":"<p>The name of the feature for the DB instance that the IAM role is to be associated with. For the list of supported feature names, see <code>DBEngineVersion</code>. </p>"
+          "documentation":"<p>The name of the feature for the DB instance that the IAM role is to be associated with. For the list of supported feature names, see <a>DBEngineVersion</a>. </p>"
         }
       }
     },
@@ -2318,7 +2557,7 @@
         },
         "ApplyAction":{
           "shape":"String",
-          "documentation":"<p>The pending maintenance action to apply to this resource.</p> <p>Valid values: <code>system-update</code>, <code>db-upgrade</code>, <code>hardware-maintenance</code> </p>"
+          "documentation":"<p>The pending maintenance action to apply to this resource.</p> <p>Valid values: <code>system-update</code>, <code>db-upgrade</code>, <code>hardware-maintenance</code>, <code>ca-certificate-rotation</code> </p>"
         },
         "OptInType":{
           "shape":"String",
@@ -2340,6 +2579,10 @@
         "locationName":"AttributeValue"
       }
     },
+    "AuthScheme":{
+      "type":"string",
+      "enum":["SECRETS"]
+    },
     "AuthorizationAlreadyExistsFault":{
       "type":"structure",
       "members":{
@@ -2398,7 +2641,7 @@
         },
         "EC2SecurityGroupOwnerId":{
           "shape":"String",
-          "documentation":"<p> AWS account number of the owner of the EC2 security group specified in the <code>EC2SecurityGroupName</code> parameter. The AWS Access Key ID is not an acceptable value. For VPC DB security groups, <code>EC2SecurityGroupId</code> must be provided. Otherwise, <code>EC2SecurityGroupOwnerId</code> and either <code>EC2SecurityGroupName</code> or <code>EC2SecurityGroupId</code> must be provided. </p>"
+          "documentation":"<p> AWS account number of the owner of the EC2 security group specified in the <code>EC2SecurityGroupName</code> parameter. The AWS access key ID isn't an acceptable value. For VPC DB security groups, <code>EC2SecurityGroupId</code> must be provided. Otherwise, <code>EC2SecurityGroupOwnerId</code> and either <code>EC2SecurityGroupName</code> or <code>EC2SecurityGroupId</code> must be provided. </p>"
         }
       },
       "documentation":"<p/>"
@@ -2472,7 +2715,7 @@
         },
         "BacktrackTo":{
           "shape":"TStamp",
-          "documentation":"<p>The timestamp of the time to backtrack the DB cluster to, specified in ISO 8601 format. For more information about ISO 8601, see the <a href=\"http://en.wikipedia.org/wiki/ISO_8601\">ISO8601 Wikipedia page.</a> </p> <note> <p>If the specified time is not a consistent time for the DB cluster, Aurora automatically chooses the nearest possible consistent time for the DB cluster.</p> </note> <p>Constraints:</p> <ul> <li> <p>Must contain a valid ISO 8601 timestamp.</p> </li> <li> <p>Can't contain a timestamp set in the future.</p> </li> </ul> <p>Example: <code>2017-07-08T18:00Z</code> </p>"
+          "documentation":"<p>The timestamp of the time to backtrack the DB cluster to, specified in ISO 8601 format. For more information about ISO 8601, see the <a href=\"http://en.wikipedia.org/wiki/ISO_8601\">ISO8601 Wikipedia page.</a> </p> <note> <p>If the specified time isn't a consistent time for the DB cluster, Aurora automatically chooses the nearest possible consistent time for the DB cluster.</p> </note> <p>Constraints:</p> <ul> <li> <p>Must contain a valid ISO 8601 timestamp.</p> </li> <li> <p>Can't contain a timestamp set in the future.</p> </li> </ul> <p>Example: <code>2017-07-08T18:00Z</code> </p>"
         },
         "Force":{
           "shape":"BooleanOptional",
@@ -2500,6 +2743,16 @@
     },
     "Boolean":{"type":"boolean"},
     "BooleanOptional":{"type":"boolean"},
+    "CancelExportTaskMessage":{
+      "type":"structure",
+      "required":["ExportTaskIdentifier"],
+      "members":{
+        "ExportTaskIdentifier":{
+          "shape":"String",
+          "documentation":"<p>The identifier of the snapshot export task to cancel.</p>"
+        }
+      }
+    },
     "Certificate":{
       "type":"structure",
       "members":{
@@ -2526,6 +2779,14 @@
         "CertificateArn":{
           "shape":"String",
           "documentation":"<p>The Amazon Resource Name (ARN) for the certificate.</p>"
+        },
+        "CustomerOverride":{
+          "shape":"BooleanOptional",
+          "documentation":"<p>Whether there is an override for the default certificate identifier.</p>"
+        },
+        "CustomerOverrideValidTill":{
+          "shape":"TStamp",
+          "documentation":"<p>If there is an override for the default certificate identifier, when the override expires.</p>"
         }
       },
       "documentation":"<p>A CA certificate for an AWS account.</p>",
@@ -2592,6 +2853,58 @@
       },
       "documentation":"<p>The configuration setting for the log types to be enabled for export to CloudWatch Logs for a specific DB instance or DB cluster.</p> <p>The <code>EnableLogTypes</code> and <code>DisableLogTypes</code> arrays determine which logs will be exported (or not exported) to CloudWatch Logs. The values within these arrays depend on the DB engine being used. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_LogAccess.html#USER_LogAccess.Procedural.UploadtoCloudWatch\">Publishing Database Logs to Amazon CloudWatch Logs </a> in the <i>Amazon RDS User Guide</i>.</p>"
     },
+    "ConnectionPoolConfiguration":{
+      "type":"structure",
+      "members":{
+        "MaxConnectionsPercent":{
+          "shape":"IntegerOptional",
+          "documentation":"<p>The maximum size of the connection pool for each target in a target group. For Aurora MySQL, it is expressed as a percentage of the <code>max_connections</code> setting for the RDS DB instance or Aurora DB cluster used by the target group.</p> <p>Default: 100</p> <p>Constraints: between 1 and 100</p>"
+        },
+        "MaxIdleConnectionsPercent":{
+          "shape":"IntegerOptional",
+          "documentation":"<p> Controls how actively the proxy closes idle database connections in the connection pool. A high value enables the proxy to leave a high percentage of idle connections open. A low value causes the proxy to close idle client connections and return the underlying database connections to the connection pool. For Aurora MySQL, it is expressed as a percentage of the <code>max_connections</code> setting for the RDS DB instance or Aurora DB cluster used by the target group. </p> <p>Default: 50</p> <p>Constraints: between 0 and <code>MaxConnectionsPercent</code> </p>"
+        },
+        "ConnectionBorrowTimeout":{
+          "shape":"IntegerOptional",
+          "documentation":"<p>The number of seconds for a proxy to wait for a connection to become available in the connection pool. Only applies when the proxy has opened its maximum number of connections and all connections are busy with client sessions.</p> <p>Default: 120</p> <p>Constraints: between 1 and 3600, or 0 representing unlimited</p>"
+        },
+        "SessionPinningFilters":{
+          "shape":"StringList",
+          "documentation":"<p>Each item in the list represents a class of SQL operations that normally cause all later statements in a session using a proxy to be pinned to the same underlying database connection. Including an item in the list exempts that class of SQL operations from the pinning behavior.</p> <p>Default: no session pinning filters</p>"
+        },
+        "InitQuery":{
+          "shape":"String",
+          "documentation":"<p> One or more SQL statements for the proxy to run when opening each new database connection. Typically used with <code>SET</code> statements to make sure that each connection has identical settings such as time zone and character set. For multiple statements, use semicolons as the separator. You can also include multiple variables in a single <code>SET</code> statement, such as <code>SET x=1, y=2</code>. </p> <p>Default: no initialization query</p>"
+        }
+      },
+      "documentation":"<note> <p>This is prerelease documentation for the RDS Database Proxy feature in preview release. It is subject to change.</p> </note> <p>Specifies the settings that control the size and behavior of the connection pool associated with a <code>DBProxyTargetGroup</code>.</p>"
+    },
+    "ConnectionPoolConfigurationInfo":{
+      "type":"structure",
+      "members":{
+        "MaxConnectionsPercent":{
+          "shape":"Integer",
+          "documentation":"<p>The maximum size of the connection pool for each target in a target group. For Aurora MySQL, it is expressed as a percentage of the <code>max_connections</code> setting for the RDS DB instance or Aurora DB cluster used by the target group.</p>"
+        },
+        "MaxIdleConnectionsPercent":{
+          "shape":"Integer",
+          "documentation":"<p> Controls how actively the proxy closes idle database connections in the connection pool. A high value enables the proxy to leave a high percentage of idle connections open. A low value causes the proxy to close idle client connections and return the underlying database connections to the connection pool. For Aurora MySQL, it is expressed as a percentage of the <code>max_connections</code> setting for the RDS DB instance or Aurora DB cluster used by the target group. </p>"
+        },
+        "ConnectionBorrowTimeout":{
+          "shape":"Integer",
+          "documentation":"<p>The number of seconds for a proxy to wait for a connection to become available in the connection pool. Only applies when the proxy has opened its maximum number of connections and all connections are busy with client sessions.</p>"
+        },
+        "SessionPinningFilters":{
+          "shape":"StringList",
+          "documentation":"<p>Each item in the list represents a class of SQL operations that normally cause all later statements in a session using a proxy to be pinned to the same underlying database connection. Including an item in the list exempts that class of SQL operations from the pinning behavior. Currently, the only allowed value is <code>EXCLUDE_VARIABLE_SETS</code>.</p>"
+        },
+        "InitQuery":{
+          "shape":"String",
+          "documentation":"<p> One or more SQL statements for the proxy to run when opening each new database connection. Typically used with <code>SET</code> statements to make sure that each connection has identical settings such as time zone and character set. This setting is empty by default. For multiple statements, use semicolons as the separator. You can also include multiple variables in a single <code>SET</code> statement, such as <code>SET x=1, y=2</code>. </p>"
+        }
+      },
+      "documentation":"<note> <p>This is prerelease documentation for the RDS Database Proxy feature in preview release. It is subject to change.</p> </note> <p>Displays the settings that control the size and behavior of the connection pool associated with a <code>DBProxyTarget</code>.</p>"
+    },
     "CopyDBClusterParameterGroupMessage":{
       "type":"structure",
       "required":[
@@ -2630,19 +2943,19 @@
       "members":{
         "SourceDBClusterSnapshotIdentifier":{
           "shape":"String",
-          "documentation":"<p>The identifier of the DB cluster snapshot to copy. This parameter is not case-sensitive.</p> <p>You can't copy an encrypted, shared DB cluster snapshot from one AWS Region to another.</p> <p>Constraints:</p> <ul> <li> <p>Must specify a valid system snapshot in the \"available\" state.</p> </li> <li> <p>If the source snapshot is in the same AWS Region as the copy, specify a valid DB snapshot identifier.</p> </li> <li> <p>If the source snapshot is in a different AWS Region than the copy, specify a valid DB cluster snapshot ARN. For more information, go to <a href=\"https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/USER_CopySnapshot.html#USER_CopySnapshot.AcrossRegions\"> Copying Snapshots Across AWS Regions</a> in the <i>Amazon Aurora User Guide.</i> </p> </li> </ul> <p>Example: <code>my-cluster-snapshot1</code> </p>"
+          "documentation":"<p>The identifier of the DB cluster snapshot to copy. This parameter isn't case-sensitive.</p> <p>You can't copy an encrypted, shared DB cluster snapshot from one AWS Region to another.</p> <p>Constraints:</p> <ul> <li> <p>Must specify a valid system snapshot in the \"available\" state.</p> </li> <li> <p>If the source snapshot is in the same AWS Region as the copy, specify a valid DB snapshot identifier.</p> </li> <li> <p>If the source snapshot is in a different AWS Region than the copy, specify a valid DB cluster snapshot ARN. For more information, go to <a href=\"https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/USER_CopySnapshot.html#USER_CopySnapshot.AcrossRegions\"> Copying Snapshots Across AWS Regions</a> in the <i>Amazon Aurora User Guide.</i> </p> </li> </ul> <p>Example: <code>my-cluster-snapshot1</code> </p>"
         },
         "TargetDBClusterSnapshotIdentifier":{
           "shape":"String",
-          "documentation":"<p>The identifier of the new DB cluster snapshot to create from the source DB cluster snapshot. This parameter is not case-sensitive.</p> <p>Constraints:</p> <ul> <li> <p>Must contain from 1 to 63 letters, numbers, or hyphens.</p> </li> <li> <p>First character must be a letter.</p> </li> <li> <p>Can't end with a hyphen or contain two consecutive hyphens.</p> </li> </ul> <p>Example: <code>my-cluster-snapshot2</code> </p>"
+          "documentation":"<p>The identifier of the new DB cluster snapshot to create from the source DB cluster snapshot. This parameter isn't case-sensitive.</p> <p>Constraints:</p> <ul> <li> <p>Must contain from 1 to 63 letters, numbers, or hyphens.</p> </li> <li> <p>First character must be a letter.</p> </li> <li> <p>Can't end with a hyphen or contain two consecutive hyphens.</p> </li> </ul> <p>Example: <code>my-cluster-snapshot2</code> </p>"
         },
         "KmsKeyId":{
           "shape":"String",
-          "documentation":"<p>The AWS AWS KMS key ID for an encrypted DB cluster snapshot. The KMS key ID is the Amazon Resource Name (ARN), KMS key identifier, or the KMS key alias for the KMS encryption key. </p> <p>If you copy an encrypted DB cluster snapshot from your AWS account, you can specify a value for <code>KmsKeyId</code> to encrypt the copy with a new KMS encryption key. If you don't specify a value for <code>KmsKeyId</code>, then the copy of the DB cluster snapshot is encrypted with the same KMS key as the source DB cluster snapshot. </p> <p>If you copy an encrypted DB cluster snapshot that is shared from another AWS account, then you must specify a value for <code>KmsKeyId</code>. </p> <p>To copy an encrypted DB cluster snapshot to another AWS Region, you must set <code>KmsKeyId</code> to the KMS key ID you want to use to encrypt the copy of the DB cluster snapshot in the destination AWS Region. KMS encryption keys are specific to the AWS Region that they are created in, and you can't use encryption keys from one AWS Region in another AWS Region.</p> <p>If you copy an unencrypted DB cluster snapshot and specify a value for the <code>KmsKeyId</code> parameter, an error is returned.</p>"
+          "documentation":"<p>The AWS KMS key ID for an encrypted DB cluster snapshot. The KMS key ID is the Amazon Resource Name (ARN), KMS key identifier, or the KMS key alias for the KMS encryption key. </p> <p>If you copy an encrypted DB cluster snapshot from your AWS account, you can specify a value for <code>KmsKeyId</code> to encrypt the copy with a new KMS encryption key. If you don't specify a value for <code>KmsKeyId</code>, then the copy of the DB cluster snapshot is encrypted with the same KMS key as the source DB cluster snapshot. </p> <p>If you copy an encrypted DB cluster snapshot that is shared from another AWS account, then you must specify a value for <code>KmsKeyId</code>. </p> <p>To copy an encrypted DB cluster snapshot to another AWS Region, you must set <code>KmsKeyId</code> to the KMS key ID you want to use to encrypt the copy of the DB cluster snapshot in the destination AWS Region. KMS encryption keys are specific to the AWS Region that they are created in, and you can't use encryption keys from one AWS Region in another AWS Region.</p> <p>If you copy an unencrypted DB cluster snapshot and specify a value for the <code>KmsKeyId</code> parameter, an error is returned.</p>"
         },
         "PreSignedUrl":{
           "shape":"String",
-          "documentation":"<p>The URL that contains a Signature Version 4 signed request for the <code>CopyDBClusterSnapshot</code> API action in the AWS Region that contains the source DB cluster snapshot to copy. The <code>PreSignedUrl</code> parameter must be used when copying an encrypted DB cluster snapshot from another AWS Region.</p> <p>The pre-signed URL must be a valid request for the <code>CopyDBSClusterSnapshot</code> API action that can be executed in the source AWS Region that contains the encrypted DB cluster snapshot to be copied. The pre-signed URL request must contain the following parameter values:</p> <ul> <li> <p> <code>KmsKeyId</code> - The AWS KMS key identifier for the key to use to encrypt the copy of the DB cluster snapshot in the destination AWS Region. This is the same identifier for both the <code>CopyDBClusterSnapshot</code> action that is called in the destination AWS Region, and the action contained in the pre-signed URL.</p> </li> <li> <p> <code>DestinationRegion</code> - The name of the AWS Region that the DB cluster snapshot will be created in.</p> </li> <li> <p> <code>SourceDBClusterSnapshotIdentifier</code> - The DB cluster snapshot identifier for the encrypted DB cluster snapshot to be copied. This identifier must be in the Amazon Resource Name (ARN) format for the source AWS Region. For example, if you are copying an encrypted DB cluster snapshot from the us-west-2 AWS Region, then your <code>SourceDBClusterSnapshotIdentifier</code> looks like the following example: <code>arn:aws:rds:us-west-2:123456789012:cluster-snapshot:aurora-cluster1-snapshot-20161115</code>.</p> </li> </ul> <p>To learn how to generate a Signature Version 4 signed request, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/API/sigv4-query-string-auth.html\"> Authenticating Requests: Using Query Parameters (AWS Signature Version 4)</a> and <a href=\"https://docs.aws.amazon.com/general/latest/gr/signature-version-4.html\"> Signature Version 4 Signing Process</a>.</p>"
+          "documentation":"<p>The URL that contains a Signature Version 4 signed request for the <code>CopyDBClusterSnapshot</code> API action in the AWS Region that contains the source DB cluster snapshot to copy. The <code>PreSignedUrl</code> parameter must be used when copying an encrypted DB cluster snapshot from another AWS Region. Don't specify <code>PreSignedUrl</code> when you are copying an encrypted DB cluster snapshot in the same AWS Region.</p> <p>The pre-signed URL must be a valid request for the <code>CopyDBSClusterSnapshot</code> API action that can be executed in the source AWS Region that contains the encrypted DB cluster snapshot to be copied. The pre-signed URL request must contain the following parameter values:</p> <ul> <li> <p> <code>KmsKeyId</code> - The AWS KMS key identifier for the key to use to encrypt the copy of the DB cluster snapshot in the destination AWS Region. This is the same identifier for both the <code>CopyDBClusterSnapshot</code> action that is called in the destination AWS Region, and the action contained in the pre-signed URL.</p> </li> <li> <p> <code>DestinationRegion</code> - The name of the AWS Region that the DB cluster snapshot is to be created in.</p> </li> <li> <p> <code>SourceDBClusterSnapshotIdentifier</code> - The DB cluster snapshot identifier for the encrypted DB cluster snapshot to be copied. This identifier must be in the Amazon Resource Name (ARN) format for the source AWS Region. For example, if you are copying an encrypted DB cluster snapshot from the us-west-2 AWS Region, then your <code>SourceDBClusterSnapshotIdentifier</code> looks like the following example: <code>arn:aws:rds:us-west-2:123456789012:cluster-snapshot:aurora-cluster1-snapshot-20161115</code>.</p> </li> </ul> <p>To learn how to generate a Signature Version 4 signed request, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/API/sigv4-query-string-auth.html\"> Authenticating Requests: Using Query Parameters (AWS Signature Version 4)</a> and <a href=\"https://docs.aws.amazon.com/general/latest/gr/signature-version-4.html\"> Signature Version 4 Signing Process</a>.</p> <note> <p>If you are using an AWS SDK tool or the AWS CLI, you can specify <code>SourceRegion</code> (or <code>--source-region</code> for the AWS CLI) instead of specifying <code>PreSignedUrl</code> manually. Specifying <code>SourceRegion</code> autogenerates a pre-signed URL that is a valid request for the operation that can be executed in the source AWS Region.</p> </note>"
         },
         "CopyTags":{
           "shape":"BooleanOptional",
@@ -2714,7 +3027,7 @@
         },
         "PreSignedUrl":{
           "shape":"String",
-          "documentation":"<p>The URL that contains a Signature Version 4 signed request for the <code>CopyDBSnapshot</code> API action in the source AWS Region that contains the source DB snapshot to copy. </p> <p>You must specify this parameter when you copy an encrypted DB snapshot from another AWS Region by using the Amazon RDS API. You can specify the <code>--source-region</code> option instead of this parameter when you copy an encrypted DB snapshot from another AWS Region by using the AWS CLI. </p> <p>The presigned URL must be a valid request for the <code>CopyDBSnapshot</code> API action that can be executed in the source AWS Region that contains the encrypted DB snapshot to be copied. The presigned URL request must contain the following parameter values: </p> <ul> <li> <p> <code>DestinationRegion</code> - The AWS Region that the encrypted DB snapshot is copied to. This AWS Region is the same one where the <code>CopyDBSnapshot</code> action is called that contains this presigned URL. </p> <p>For example, if you copy an encrypted DB snapshot from the us-west-2 AWS Region to the us-east-1 AWS Region, then you call the <code>CopyDBSnapshot</code> action in the us-east-1 AWS Region and provide a presigned URL that contains a call to the <code>CopyDBSnapshot</code> action in the us-west-2 AWS Region. For this example, the <code>DestinationRegion</code> in the presigned URL must be set to the us-east-1 AWS Region. </p> </li> <li> <p> <code>KmsKeyId</code> - The AWS KMS key identifier for the key to use to encrypt the copy of the DB snapshot in the destination AWS Region. This is the same identifier for both the <code>CopyDBSnapshot</code> action that is called in the destination AWS Region, and the action contained in the presigned URL. </p> </li> <li> <p> <code>SourceDBSnapshotIdentifier</code> - The DB snapshot identifier for the encrypted snapshot to be copied. This identifier must be in the Amazon Resource Name (ARN) format for the source AWS Region. For example, if you are copying an encrypted DB snapshot from the us-west-2 AWS Region, then your <code>SourceDBSnapshotIdentifier</code> looks like the following example: <code>arn:aws:rds:us-west-2:123456789012:snapshot:mysql-instance1-snapshot-20161115</code>. </p> </li> </ul> <p>To learn how to generate a Signature Version 4 signed request, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/API/sigv4-query-string-auth.html\">Authenticating Requests: Using Query Parameters (AWS Signature Version 4)</a> and <a href=\"https://docs.aws.amazon.com/general/latest/gr/signature-version-4.html\">Signature Version 4 Signing Process</a>. </p>"
+          "documentation":"<p>The URL that contains a Signature Version 4 signed request for the <code>CopyDBSnapshot</code> API action in the source AWS Region that contains the source DB snapshot to copy. </p> <p>You must specify this parameter when you copy an encrypted DB snapshot from another AWS Region by using the Amazon RDS API. Don't specify <code>PreSignedUrl</code> when you are copying an encrypted DB snapshot in the same AWS Region.</p> <p>The presigned URL must be a valid request for the <code>CopyDBSnapshot</code> API action that can be executed in the source AWS Region that contains the encrypted DB snapshot to be copied. The presigned URL request must contain the following parameter values: </p> <ul> <li> <p> <code>DestinationRegion</code> - The AWS Region that the encrypted DB snapshot is copied to. This AWS Region is the same one where the <code>CopyDBSnapshot</code> action is called that contains this presigned URL. </p> <p>For example, if you copy an encrypted DB snapshot from the us-west-2 AWS Region to the us-east-1 AWS Region, then you call the <code>CopyDBSnapshot</code> action in the us-east-1 AWS Region and provide a presigned URL that contains a call to the <code>CopyDBSnapshot</code> action in the us-west-2 AWS Region. For this example, the <code>DestinationRegion</code> in the presigned URL must be set to the us-east-1 AWS Region. </p> </li> <li> <p> <code>KmsKeyId</code> - The AWS KMS key identifier for the key to use to encrypt the copy of the DB snapshot in the destination AWS Region. This is the same identifier for both the <code>CopyDBSnapshot</code> action that is called in the destination AWS Region, and the action contained in the presigned URL. </p> </li> <li> <p> <code>SourceDBSnapshotIdentifier</code> - The DB snapshot identifier for the encrypted snapshot to be copied. This identifier must be in the Amazon Resource Name (ARN) format for the source AWS Region. For example, if you are copying an encrypted DB snapshot from the us-west-2 AWS Region, then your <code>SourceDBSnapshotIdentifier</code> looks like the following example: <code>arn:aws:rds:us-west-2:123456789012:snapshot:mysql-instance1-snapshot-20161115</code>. </p> </li> </ul> <p>To learn how to generate a Signature Version 4 signed request, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/API/sigv4-query-string-auth.html\">Authenticating Requests: Using Query Parameters (AWS Signature Version 4)</a> and <a href=\"https://docs.aws.amazon.com/general/latest/gr/signature-version-4.html\">Signature Version 4 Signing Process</a>. </p> <note> <p>If you are using an AWS SDK tool or the AWS CLI, you can specify <code>SourceRegion</code> (or <code>--source-region</code> for the AWS CLI) instead of specifying <code>PreSignedUrl</code> manually. Specifying <code>SourceRegion</code> autogenerates a pre-signed URL that is a valid request for the operation that can be executed in the source AWS Region.</p> </note>"
         },
         "OptionGroupName":{
           "shape":"String",
@@ -2773,11 +3086,11 @@
         },
         "NewVpnTunnelName":{
           "shape":"String",
-          "documentation":"<p>The name of a new VPN tunnel between the Amazon RDS website and the VMware vSphere cluster.</p> <p>Specify this parameter only if <code>ExistingVpnId</code> is not specified.</p>"
+          "documentation":"<p>The name of a new VPN tunnel between the Amazon RDS website and the VMware vSphere cluster.</p> <p>Specify this parameter only if <code>ExistingVpnId</code> isn't specified.</p>"
         },
         "VpnTunnelOriginatorIP":{
           "shape":"String",
-          "documentation":"<p>The IP address of network traffic from your on-premises data center. A custom AZ receives the network traffic.</p> <p>Specify this parameter only if <code>ExistingVpnId</code> is not specified.</p>"
+          "documentation":"<p>The IP address of network traffic from your on-premises data center. A custom AZ receives the network traffic.</p> <p>Specify this parameter only if <code>ExistingVpnId</code> isn't specified.</p>"
         }
       },
       "documentation":"<p/>"
@@ -2815,6 +3128,10 @@
         "ExcludedMembers":{
           "shape":"StringList",
           "documentation":"<p>List of DB instance identifiers that aren't part of the custom endpoint group. All other eligible instances are reachable through the custom endpoint. Only relevant if the list of static members is empty.</p>"
+        },
+        "Tags":{
+          "shape":"TagList",
+          "documentation":"<p>The tags to be assigned to the Amazon RDS resource.</p>"
         }
       }
     },
@@ -2839,7 +3156,7 @@
         },
         "DatabaseName":{
           "shape":"String",
-          "documentation":"<p>The name for your database of up to 64 alpha-numeric characters. If you do not provide a name, Amazon RDS will not create a database in the DB cluster you are creating.</p>"
+          "documentation":"<p>The name for your database of up to 64 alphanumeric characters. If you do not provide a name, Amazon RDS doesn't create a database in the DB cluster you are creating.</p>"
         },
         "DBClusterIdentifier":{
           "shape":"String",
@@ -2847,7 +3164,7 @@
         },
         "DBClusterParameterGroupName":{
           "shape":"String",
-          "documentation":"<p> The name of the DB cluster parameter group to associate with this DB cluster. If this argument is omitted, <code>default.aurora5.6</code> is used. </p> <p>Constraints:</p> <ul> <li> <p>If supplied, must match the name of an existing DB cluster parameter group.</p> </li> </ul>"
+          "documentation":"<p> The name of the DB cluster parameter group to associate with this DB cluster. If you do not specify a value, then the default DB cluster parameter group for the specified DB engine and version is used. </p> <p>Constraints:</p> <ul> <li> <p>If supplied, must match the name of an existing DB cluster parameter group.</p> </li> </ul>"
         },
         "VpcSecurityGroupIds":{
           "shape":"VpcSecurityGroupIdList",
@@ -2903,11 +3220,11 @@
         },
         "KmsKeyId":{
           "shape":"String",
-          "documentation":"<p>The AWS KMS key identifier for an encrypted DB cluster.</p> <p>The KMS key identifier is the Amazon Resource Name (ARN) for the KMS encryption key. If you are creating a DB cluster with the same AWS account that owns the KMS encryption key used to encrypt the new DB cluster, then you can use the KMS key alias instead of the ARN for the KMS encryption key.</p> <p>If an encryption key is not specified in <code>KmsKeyId</code>:</p> <ul> <li> <p>If <code>ReplicationSourceIdentifier</code> identifies an encrypted source, then Amazon RDS will use the encryption key used to encrypt the source. Otherwise, Amazon RDS will use your default encryption key. </p> </li> <li> <p>If the <code>StorageEncrypted</code> parameter is enabled and <code>ReplicationSourceIdentifier</code> is not specified, then Amazon RDS will use your default encryption key.</p> </li> </ul> <p>AWS KMS creates the default encryption key for your AWS account. Your AWS account has a different default encryption key for each AWS Region.</p> <p>If you create a Read Replica of an encrypted DB cluster in another AWS Region, you must set <code>KmsKeyId</code> to a KMS key ID that is valid in the destination AWS Region. This key is used to encrypt the Read Replica in that AWS Region.</p>"
+          "documentation":"<p>The AWS KMS key identifier for an encrypted DB cluster.</p> <p>The KMS key identifier is the Amazon Resource Name (ARN) for the KMS encryption key. If you are creating a DB cluster with the same AWS account that owns the KMS encryption key used to encrypt the new DB cluster, then you can use the KMS key alias instead of the ARN for the KMS encryption key.</p> <p>If an encryption key isn't specified in <code>KmsKeyId</code>:</p> <ul> <li> <p>If <code>ReplicationSourceIdentifier</code> identifies an encrypted source, then Amazon RDS will use the encryption key used to encrypt the source. Otherwise, Amazon RDS will use your default encryption key. </p> </li> <li> <p>If the <code>StorageEncrypted</code> parameter is enabled and <code>ReplicationSourceIdentifier</code> isn't specified, then Amazon RDS will use your default encryption key.</p> </li> </ul> <p>AWS KMS creates the default encryption key for your AWS account. Your AWS account has a different default encryption key for each AWS Region.</p> <p>If you create a Read Replica of an encrypted DB cluster in another AWS Region, you must set <code>KmsKeyId</code> to a KMS key ID that is valid in the destination AWS Region. This key is used to encrypt the Read Replica in that AWS Region.</p>"
         },
         "PreSignedUrl":{
           "shape":"String",
-          "documentation":"<p>A URL that contains a Signature Version 4 signed request for the <code>CreateDBCluster</code> action to be called in the source AWS Region where the DB cluster is replicated from. You only need to specify <code>PreSignedUrl</code> when you are performing cross-region replication from an encrypted DB cluster.</p> <p>The pre-signed URL must be a valid request for the <code>CreateDBCluster</code> API action that can be executed in the source AWS Region that contains the encrypted DB cluster to be copied.</p> <p>The pre-signed URL request must contain the following parameter values:</p> <ul> <li> <p> <code>KmsKeyId</code> - The AWS KMS key identifier for the key to use to encrypt the copy of the DB cluster in the destination AWS Region. This should refer to the same KMS key for both the <code>CreateDBCluster</code> action that is called in the destination AWS Region, and the action contained in the pre-signed URL.</p> </li> <li> <p> <code>DestinationRegion</code> - The name of the AWS Region that Aurora Read Replica will be created in.</p> </li> <li> <p> <code>ReplicationSourceIdentifier</code> - The DB cluster identifier for the encrypted DB cluster to be copied. This identifier must be in the Amazon Resource Name (ARN) format for the source AWS Region. For example, if you are copying an encrypted DB cluster from the us-west-2 AWS Region, then your <code>ReplicationSourceIdentifier</code> would look like Example: <code>arn:aws:rds:us-west-2:123456789012:cluster:aurora-cluster1</code>.</p> </li> </ul> <p>To learn how to generate a Signature Version 4 signed request, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/API/sigv4-query-string-auth.html\"> Authenticating Requests: Using Query Parameters (AWS Signature Version 4)</a> and <a href=\"https://docs.aws.amazon.com/general/latest/gr/signature-version-4.html\"> Signature Version 4 Signing Process</a>.</p>"
+          "documentation":"<p>A URL that contains a Signature Version 4 signed request for the <code>CreateDBCluster</code> action to be called in the source AWS Region where the DB cluster is replicated from. You only need to specify <code>PreSignedUrl</code> when you are performing cross-region replication from an encrypted DB cluster.</p> <p>The pre-signed URL must be a valid request for the <code>CreateDBCluster</code> API action that can be executed in the source AWS Region that contains the encrypted DB cluster to be copied.</p> <p>The pre-signed URL request must contain the following parameter values:</p> <ul> <li> <p> <code>KmsKeyId</code> - The AWS KMS key identifier for the key to use to encrypt the copy of the DB cluster in the destination AWS Region. This should refer to the same KMS key for both the <code>CreateDBCluster</code> action that is called in the destination AWS Region, and the action contained in the pre-signed URL.</p> </li> <li> <p> <code>DestinationRegion</code> - The name of the AWS Region that Aurora Read Replica will be created in.</p> </li> <li> <p> <code>ReplicationSourceIdentifier</code> - The DB cluster identifier for the encrypted DB cluster to be copied. This identifier must be in the Amazon Resource Name (ARN) format for the source AWS Region. For example, if you are copying an encrypted DB cluster from the us-west-2 AWS Region, then your <code>ReplicationSourceIdentifier</code> would look like Example: <code>arn:aws:rds:us-west-2:123456789012:cluster:aurora-cluster1</code>.</p> </li> </ul> <p>To learn how to generate a Signature Version 4 signed request, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/API/sigv4-query-string-auth.html\"> Authenticating Requests: Using Query Parameters (AWS Signature Version 4)</a> and <a href=\"https://docs.aws.amazon.com/general/latest/gr/signature-version-4.html\"> Signature Version 4 Signing Process</a>.</p> <note> <p>If you are using an AWS SDK tool or the AWS CLI, you can specify <code>SourceRegion</code> (or <code>--source-region</code> for the AWS CLI) instead of specifying <code>PreSignedUrl</code> manually. Specifying <code>SourceRegion</code> autogenerates a pre-signed URL that is a valid request for the operation that can be executed in the source AWS Region.</p> </note>"
         },
         "EnableIAMDatabaseAuthentication":{
           "shape":"BooleanOptional",
@@ -2923,7 +3240,7 @@
         },
         "EngineMode":{
           "shape":"String",
-          "documentation":"<p>The DB engine mode of the DB cluster, either <code>provisioned</code>, <code>serverless</code>, <code>parallelquery</code>, <code>global</code>, or <code>multimaster</code>.</p>"
+          "documentation":"<p>The DB engine mode of the DB cluster, either <code>provisioned</code>, <code>serverless</code>, <code>parallelquery</code>, <code>global</code>, or <code>multimaster</code>.</p> <p>Limitations and requirements apply to some DB engine modes. For more information, see the following sections in the <i>Amazon Aurora User Guide</i>:</p> <ul> <li> <p> <a href=\"https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/aurora-serverless.html#aurora-serverless.limitations\"> Limitations of Aurora Serverless</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/aurora-mysql-parallel-query.html#aurora-mysql-parallel-query-limitations\"> Limitations of Parallel Query</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/aurora-global-database.html#aurora-global-database.limitations\"> Requirements for Aurora Global Databases</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/aurora-multi-master.html#aurora-multi-master-limitations\"> Limitations of Multi-Master Clusters</a> </p> </li> </ul>"
         },
         "ScalingConfiguration":{
           "shape":"ScalingConfiguration",
@@ -2944,6 +3261,14 @@
         "CopyTagsToSnapshot":{
           "shape":"BooleanOptional",
           "documentation":"<p>A value that indicates whether to copy all tags from the DB cluster to snapshots of the DB cluster. The default is not to copy them.</p>"
+        },
+        "Domain":{
+          "shape":"String",
+          "documentation":"<p>The Active Directory directory ID to create the DB cluster in.</p> <p> For Amazon Aurora DB clusters, Amazon RDS can use Kerberos Authentication to authenticate users that connect to the DB cluster. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/aurmysql-kerberos.html\">Using Kerberos Authentication for Aurora MySQL</a> in the <i>Amazon Aurora User Guide</i>. </p>"
+        },
+        "DomainIAMRoleName":{
+          "shape":"String",
+          "documentation":"<p>Specify the name of the IAM role to be used when making API calls to the Directory Service.</p>"
         }
       },
       "documentation":"<p/>"
@@ -3000,7 +3325,7 @@
         },
         "DBClusterIdentifier":{
           "shape":"String",
-          "documentation":"<p>The identifier of the DB cluster to create a snapshot for. This parameter is not case-sensitive.</p> <p>Constraints:</p> <ul> <li> <p>Must match the identifier of an existing DBCluster.</p> </li> </ul> <p>Example: <code>my-cluster1</code> </p>"
+          "documentation":"<p>The identifier of the DB cluster to create a snapshot for. This parameter isn't case-sensitive.</p> <p>Constraints:</p> <ul> <li> <p>Must match the identifier of an existing DBCluster.</p> </li> </ul> <p>Example: <code>my-cluster1</code> </p>"
         },
         "Tags":{
           "shape":"TagList",
@@ -3025,7 +3350,7 @@
       "members":{
         "DBName":{
           "shape":"String",
-          "documentation":"<p>The meaning of this parameter differs according to the database engine you use.</p> <p> <b>MySQL</b> </p> <p>The name of the database to create when the DB instance is created. If this parameter is not specified, no database is created in the DB instance.</p> <p>Constraints:</p> <ul> <li> <p>Must contain 1 to 64 letters or numbers.</p> </li> <li> <p>Can't be a word reserved by the specified database engine</p> </li> </ul> <p> <b>MariaDB</b> </p> <p>The name of the database to create when the DB instance is created. If this parameter is not specified, no database is created in the DB instance.</p> <p>Constraints:</p> <ul> <li> <p>Must contain 1 to 64 letters or numbers.</p> </li> <li> <p>Can't be a word reserved by the specified database engine</p> </li> </ul> <p> <b>PostgreSQL</b> </p> <p>The name of the database to create when the DB instance is created. If this parameter is not specified, the default \"postgres\" database is created in the DB instance.</p> <p>Constraints:</p> <ul> <li> <p>Must contain 1 to 63 letters, numbers, or underscores.</p> </li> <li> <p>Must begin with a letter or an underscore. Subsequent characters can be letters, underscores, or digits (0-9).</p> </li> <li> <p>Can't be a word reserved by the specified database engine</p> </li> </ul> <p> <b>Oracle</b> </p> <p>The Oracle System ID (SID) of the created DB instance. If you specify <code>null</code>, the default value <code>ORCL</code> is used. You can't specify the string NULL, or any other reserved word, for <code>DBName</code>. </p> <p>Default: <code>ORCL</code> </p> <p>Constraints:</p> <ul> <li> <p>Can't be longer than 8 characters</p> </li> </ul> <p> <b>SQL Server</b> </p> <p>Not applicable. Must be null.</p> <p> <b>Amazon Aurora</b> </p> <p>The name of the database to create when the primary instance of the DB cluster is created. If this parameter is not specified, no database is created in the DB instance.</p> <p>Constraints:</p> <ul> <li> <p>Must contain 1 to 64 letters or numbers.</p> </li> <li> <p>Can't be a word reserved by the specified database engine</p> </li> </ul>"
+          "documentation":"<p>The meaning of this parameter differs according to the database engine you use.</p> <p> <b>MySQL</b> </p> <p>The name of the database to create when the DB instance is created. If this parameter isn't specified, no database is created in the DB instance.</p> <p>Constraints:</p> <ul> <li> <p>Must contain 1 to 64 letters or numbers.</p> </li> <li> <p>Can't be a word reserved by the specified database engine</p> </li> </ul> <p> <b>MariaDB</b> </p> <p>The name of the database to create when the DB instance is created. If this parameter isn't specified, no database is created in the DB instance.</p> <p>Constraints:</p> <ul> <li> <p>Must contain 1 to 64 letters or numbers.</p> </li> <li> <p>Can't be a word reserved by the specified database engine</p> </li> </ul> <p> <b>PostgreSQL</b> </p> <p>The name of the database to create when the DB instance is created. If this parameter isn't specified, the default \"postgres\" database is created in the DB instance.</p> <p>Constraints:</p> <ul> <li> <p>Must contain 1 to 63 letters, numbers, or underscores.</p> </li> <li> <p>Must begin with a letter or an underscore. Subsequent characters can be letters, underscores, or digits (0-9).</p> </li> <li> <p>Can't be a word reserved by the specified database engine</p> </li> </ul> <p> <b>Oracle</b> </p> <p>The Oracle System ID (SID) of the created DB instance. If you specify <code>null</code>, the default value <code>ORCL</code> is used. You can't specify the string NULL, or any other reserved word, for <code>DBName</code>. </p> <p>Default: <code>ORCL</code> </p> <p>Constraints:</p> <ul> <li> <p>Can't be longer than 8 characters</p> </li> </ul> <p> <b>SQL Server</b> </p> <p>Not applicable. Must be null.</p> <p> <b>Amazon Aurora</b> </p> <p>The name of the database to create when the primary instance of the DB cluster is created. If this parameter isn't specified, no database is created in the DB instance.</p> <p>Constraints:</p> <ul> <li> <p>Must contain 1 to 64 letters or numbers.</p> </li> <li> <p>Can't be a word reserved by the specified database engine</p> </li> </ul>"
         },
         "DBInstanceIdentifier":{
           "shape":"String",
@@ -3073,7 +3398,7 @@
         },
         "DBParameterGroupName":{
           "shape":"String",
-          "documentation":"<p>The name of the DB parameter group to associate with this DB instance. If you do not specify a value for <code>DBParameterGroupName</code>, then the default <code>DBParameterGroup</code> for the specified DB engine is used.</p> <p>Constraints:</p> <ul> <li> <p>Must be 1 to 255 letters, numbers, or hyphens.</p> </li> <li> <p>First character must be a letter</p> </li> <li> <p>Can't end with a hyphen or contain two consecutive hyphens</p> </li> </ul>"
+          "documentation":"<p>The name of the DB parameter group to associate with this DB instance. If you do not specify a value, then the default DB parameter group for the specified DB engine and version is used.</p> <p>Constraints:</p> <ul> <li> <p>Must be 1 to 255 letters, numbers, or hyphens.</p> </li> <li> <p>First character must be a letter</p> </li> <li> <p>Can't end with a hyphen or contain two consecutive hyphens</p> </li> </ul>"
         },
         "BackupRetentionPeriod":{
           "shape":"IntegerOptional",
@@ -3105,11 +3430,11 @@
         },
         "Iops":{
           "shape":"IntegerOptional",
-          "documentation":"<p>The amount of Provisioned IOPS (input/output operations per second) to be initially allocated for the DB instance. For information about valid Iops values, see <a href=\"https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/CHAP_Storage.html#USER_PIOPS\">Amazon RDS Provisioned IOPS Storage to Improve Performance</a> in the <i>Amazon RDS User Guide</i>. </p> <p>Constraints: Must be a multiple between 1 and 50 of the storage amount for the DB instance. </p>"
+          "documentation":"<p>The amount of Provisioned IOPS (input/output operations per second) to be initially allocated for the DB instance. For information about valid Iops values, see <a href=\"https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/CHAP_Storage.html#USER_PIOPS\">Amazon RDS Provisioned IOPS Storage to Improve Performance</a> in the <i>Amazon RDS User Guide</i>. </p> <p>Constraints: For MariaDB, MySQL, Oracle, and PostgreSQL DB instances, must be a multiple between .5 and 50 of the storage amount for the DB instance. For SQL Server DB instances, must be a multiple between 1 and 50 of the storage amount for the DB instance. </p>"
         },
         "OptionGroupName":{
           "shape":"String",
-          "documentation":"<p>Indicates that the DB instance should be associated with the specified option group.</p> <p>Permanent options, such as the TDE option for Oracle Advanced Security TDE, can't be removed from an option group, and that option group can't be removed from a DB instance once it is associated with a DB instance</p>"
+          "documentation":"<p>Indicates that the DB instance should be associated with the specified option group.</p> <p>Permanent options, such as the TDE option for Oracle Advanced Security TDE, can't be removed from an option group. Also, that option group can't be removed from a DB instance once it is associated with a DB instance</p>"
         },
         "CharacterSetName":{
           "shape":"String",
@@ -3117,7 +3442,7 @@
         },
         "PubliclyAccessible":{
           "shape":"BooleanOptional",
-          "documentation":"<p>A value that indicates whether the DB instance is publicly accessible. When the DB instance is publicly accessible, it is an Internet-facing instance with a publicly resolvable DNS name, which resolves to a public IP address. When the DB instance is not publicly accessible, it is an internal instance with a DNS name that resolves to a private IP address.</p> <p>Default: The default behavior varies depending on whether <code>DBSubnetGroupName</code> is specified.</p> <p>If <code>DBSubnetGroupName</code> is not specified, and <code>PubliclyAccessible</code> is not specified, the following applies:</p> <ul> <li> <p>If the default VPC in the target region doesn’t have an Internet gateway attached to it, the DB instance is private.</p> </li> <li> <p>If the default VPC in the target region has an Internet gateway attached to it, the DB instance is public.</p> </li> </ul> <p>If <code>DBSubnetGroupName</code> is specified, and <code>PubliclyAccessible</code> is not specified, the following applies:</p> <ul> <li> <p>If the subnets are part of a VPC that doesn’t have an Internet gateway attached to it, the DB instance is private.</p> </li> <li> <p>If the subnets are part of a VPC that has an Internet gateway attached to it, the DB instance is public.</p> </li> </ul>"
+          "documentation":"<p>A value that indicates whether the DB instance is publicly accessible. When the DB instance is publicly accessible, it is an Internet-facing instance with a publicly resolvable DNS name, which resolves to a public IP address. When the DB instance isn't publicly accessible, it is an internal instance with a DNS name that resolves to a private IP address.</p> <p>Default: The default behavior varies depending on whether <code>DBSubnetGroupName</code> is specified.</p> <p>If <code>DBSubnetGroupName</code> isn't specified, and <code>PubliclyAccessible</code> isn't specified, the following applies:</p> <ul> <li> <p>If the default VPC in the target region doesn’t have an Internet gateway attached to it, the DB instance is private.</p> </li> <li> <p>If the default VPC in the target region has an Internet gateway attached to it, the DB instance is public.</p> </li> </ul> <p>If <code>DBSubnetGroupName</code> is specified, and <code>PubliclyAccessible</code> isn't specified, the following applies:</p> <ul> <li> <p>If the subnets are part of a VPC that doesn’t have an Internet gateway attached to it, the DB instance is private.</p> </li> <li> <p>If the subnets are part of a VPC that has an Internet gateway attached to it, the DB instance is public.</p> </li> </ul>"
         },
         "Tags":{
           "shape":"TagList",
@@ -3141,7 +3466,7 @@
         },
         "StorageEncrypted":{
           "shape":"BooleanOptional",
-          "documentation":"<p>A value that indicates whether the DB instance is encrypted. By default, it is not encrypted.</p> <p> <b>Amazon Aurora</b> </p> <p>Not applicable. The encryption for DB instances is managed by the DB cluster.</p>"
+          "documentation":"<p>A value that indicates whether the DB instance is encrypted. By default, it isn't encrypted.</p> <p> <b>Amazon Aurora</b> </p> <p>Not applicable. The encryption for DB instances is managed by the DB cluster.</p>"
         },
         "KmsKeyId":{
           "shape":"String",
@@ -3201,7 +3526,7 @@
         },
         "DeletionProtection":{
           "shape":"BooleanOptional",
-          "documentation":"<p>A value that indicates whether the DB instance has deletion protection enabled. The database can't be deleted when deletion protection is enabled. By default, deletion protection is disabled. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_DeleteInstance.html\"> Deleting a DB Instance</a>. </p>"
+          "documentation":"<p>A value that indicates whether the DB instance has deletion protection enabled. The database can't be deleted when deletion protection is enabled. By default, deletion protection is disabled. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_DeleteInstance.html\"> Deleting a DB Instance</a>. </p> <p> <b>Amazon Aurora</b> </p> <p>Not applicable. You can enable or disable deletion protection for the DB cluster. For more information, see <code>CreateDBCluster</code>. DB instances in a DB cluster can be deleted even when deletion protection is enabled for the DB cluster. </p>"
         },
         "MaxAllocatedStorage":{
           "shape":"IntegerOptional",
@@ -3255,16 +3580,16 @@
         },
         "DBParameterGroupName":{
           "shape":"String",
-          "documentation":"<p>The name of the DB parameter group to associate with this DB instance.</p> <p>If you do not specify a value for <code>DBParameterGroupName</code>, then Amazon RDS uses the <code>DBParameterGroup</code> of source DB instance for a same region Read Replica, or the default <code>DBParameterGroup</code> for the specified DB engine for a cross region Read Replica.</p> <p>Constraints:</p> <ul> <li> <p>Must be 1 to 255 letters, numbers, or hyphens.</p> </li> <li> <p>First character must be a letter</p> </li> <li> <p>Can't end with a hyphen or contain two consecutive hyphens</p> </li> </ul>"
+          "documentation":"<p>The name of the DB parameter group to associate with this DB instance.</p> <p>If you do not specify a value for <code>DBParameterGroupName</code>, then Amazon RDS uses the <code>DBParameterGroup</code> of source DB instance for a same region Read Replica, or the default <code>DBParameterGroup</code> for the specified DB engine for a cross region Read Replica.</p> <note> <p>Currently, specifying a parameter group for this operation is only supported for Oracle DB instances.</p> </note> <p>Constraints:</p> <ul> <li> <p>Must be 1 to 255 letters, numbers, or hyphens.</p> </li> <li> <p>First character must be a letter</p> </li> <li> <p>Can't end with a hyphen or contain two consecutive hyphens</p> </li> </ul>"
         },
         "PubliclyAccessible":{
           "shape":"BooleanOptional",
-          "documentation":"<p>A value that indicates whether the DB instance is publicly accessible. When the DB instance is publicly accessible, it is an Internet-facing instance with a publicly resolvable DNS name, which resolves to a public IP address. When the DB instance is not publicly accessible, it is an internal instance with a DNS name that resolves to a private IP address. For more information, see <a>CreateDBInstance</a>.</p>"
+          "documentation":"<p>A value that indicates whether the DB instance is publicly accessible. When the DB instance is publicly accessible, it is an Internet-facing instance with a publicly resolvable DNS name, which resolves to a public IP address. When the DB instance isn't publicly accessible, it is an internal instance with a DNS name that resolves to a private IP address. For more information, see <a>CreateDBInstance</a>.</p>"
         },
         "Tags":{"shape":"TagList"},
         "DBSubnetGroupName":{
           "shape":"String",
-          "documentation":"<p>Specifies a DB subnet group for the DB instance. The new DB instance is created in the VPC associated with the DB subnet group. If no DB subnet group is specified, then the new DB instance is not created in a VPC.</p> <p>Constraints:</p> <ul> <li> <p>Can only be specified if the source DB instance identifier specifies a DB instance in another AWS Region.</p> </li> <li> <p>If supplied, must match the name of an existing DBSubnetGroup.</p> </li> <li> <p>The specified DB subnet group must be in the same AWS Region in which the operation is running.</p> </li> <li> <p>All Read Replicas in one AWS Region that are created from the same source DB instance must either:&gt;</p> <ul> <li> <p>Specify DB subnet groups from the same VPC. All these Read Replicas are created in the same VPC.</p> </li> <li> <p>Not specify a DB subnet group. All these Read Replicas are created outside of any VPC.</p> </li> </ul> </li> </ul> <p>Example: <code>mySubnetgroup</code> </p>"
+          "documentation":"<p>Specifies a DB subnet group for the DB instance. The new DB instance is created in the VPC associated with the DB subnet group. If no DB subnet group is specified, then the new DB instance isn't created in a VPC.</p> <p>Constraints:</p> <ul> <li> <p>Can only be specified if the source DB instance identifier specifies a DB instance in another AWS Region.</p> </li> <li> <p>If supplied, must match the name of an existing DBSubnetGroup.</p> </li> <li> <p>The specified DB subnet group must be in the same AWS Region in which the operation is running.</p> </li> <li> <p>All Read Replicas in one AWS Region that are created from the same source DB instance must either:&gt;</p> <ul> <li> <p>Specify DB subnet groups from the same VPC. All these Read Replicas are created in the same VPC.</p> </li> <li> <p>Not specify a DB subnet group. All these Read Replicas are created outside of any VPC.</p> </li> </ul> </li> </ul> <p>Example: <code>mySubnetgroup</code> </p>"
         },
         "VpcSecurityGroupIds":{
           "shape":"VpcSecurityGroupIdList",
@@ -3292,7 +3617,7 @@
         },
         "PreSignedUrl":{
           "shape":"String",
-          "documentation":"<p>The URL that contains a Signature Version 4 signed request for the <code>CreateDBInstanceReadReplica</code> API action in the source AWS Region that contains the source DB instance. </p> <p>You must specify this parameter when you create an encrypted Read Replica from another AWS Region by using the Amazon RDS API. You can specify the <code>--source-region</code> option instead of this parameter when you create an encrypted Read Replica from another AWS Region by using the AWS CLI. </p> <p>The presigned URL must be a valid request for the <code>CreateDBInstanceReadReplica</code> API action that can be executed in the source AWS Region that contains the encrypted source DB instance. The presigned URL request must contain the following parameter values: </p> <ul> <li> <p> <code>DestinationRegion</code> - The AWS Region that the encrypted Read Replica is created in. This AWS Region is the same one where the <code>CreateDBInstanceReadReplica</code> action is called that contains this presigned URL. </p> <p>For example, if you create an encrypted DB instance in the us-west-1 AWS Region, from a source DB instance in the us-east-2 AWS Region, then you call the <code>CreateDBInstanceReadReplica</code> action in the us-east-1 AWS Region and provide a presigned URL that contains a call to the <code>CreateDBInstanceReadReplica</code> action in the us-west-2 AWS Region. For this example, the <code>DestinationRegion</code> in the presigned URL must be set to the us-east-1 AWS Region. </p> </li> <li> <p> <code>KmsKeyId</code> - The AWS KMS key identifier for the key to use to encrypt the Read Replica in the destination AWS Region. This is the same identifier for both the <code>CreateDBInstanceReadReplica</code> action that is called in the destination AWS Region, and the action contained in the presigned URL. </p> </li> <li> <p> <code>SourceDBInstanceIdentifier</code> - The DB instance identifier for the encrypted DB instance to be replicated. This identifier must be in the Amazon Resource Name (ARN) format for the source AWS Region. For example, if you are creating an encrypted Read Replica from a DB instance in the us-west-2 AWS Region, then your <code>SourceDBInstanceIdentifier</code> looks like the following example: <code>arn:aws:rds:us-west-2:123456789012:instance:mysql-instance1-20161115</code>. </p> </li> </ul> <p>To learn how to generate a Signature Version 4 signed request, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/API/sigv4-query-string-auth.html\">Authenticating Requests: Using Query Parameters (AWS Signature Version 4)</a> and <a href=\"https://docs.aws.amazon.com/general/latest/gr/signature-version-4.html\">Signature Version 4 Signing Process</a>. </p>"
+          "documentation":"<p>The URL that contains a Signature Version 4 signed request for the <code>CreateDBInstanceReadReplica</code> API action in the source AWS Region that contains the source DB instance. </p> <p>You must specify this parameter when you create an encrypted Read Replica from another AWS Region by using the Amazon RDS API. Don't specify <code>PreSignedUrl</code> when you are creating an encrypted Read Replica in the same AWS Region. </p> <p>The presigned URL must be a valid request for the <code>CreateDBInstanceReadReplica</code> API action that can be executed in the source AWS Region that contains the encrypted source DB instance. The presigned URL request must contain the following parameter values: </p> <ul> <li> <p> <code>DestinationRegion</code> - The AWS Region that the encrypted Read Replica is created in. This AWS Region is the same one where the <code>CreateDBInstanceReadReplica</code> action is called that contains this presigned URL. </p> <p>For example, if you create an encrypted DB instance in the us-west-1 AWS Region, from a source DB instance in the us-east-2 AWS Region, then you call the <code>CreateDBInstanceReadReplica</code> action in the us-east-1 AWS Region and provide a presigned URL that contains a call to the <code>CreateDBInstanceReadReplica</code> action in the us-west-2 AWS Region. For this example, the <code>DestinationRegion</code> in the presigned URL must be set to the us-east-1 AWS Region. </p> </li> <li> <p> <code>KmsKeyId</code> - The AWS KMS key identifier for the key to use to encrypt the Read Replica in the destination AWS Region. This is the same identifier for both the <code>CreateDBInstanceReadReplica</code> action that is called in the destination AWS Region, and the action contained in the presigned URL. </p> </li> <li> <p> <code>SourceDBInstanceIdentifier</code> - The DB instance identifier for the encrypted DB instance to be replicated. This identifier must be in the Amazon Resource Name (ARN) format for the source AWS Region. For example, if you are creating an encrypted Read Replica from a DB instance in the us-west-2 AWS Region, then your <code>SourceDBInstanceIdentifier</code> looks like the following example: <code>arn:aws:rds:us-west-2:123456789012:instance:mysql-instance1-20161115</code>. </p> </li> </ul> <p>To learn how to generate a Signature Version 4 signed request, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/API/sigv4-query-string-auth.html\">Authenticating Requests: Using Query Parameters (AWS Signature Version 4)</a> and <a href=\"https://docs.aws.amazon.com/general/latest/gr/signature-version-4.html\">Signature Version 4 Signing Process</a>. </p> <note> <p>If you are using an AWS SDK tool or the AWS CLI, you can specify <code>SourceRegion</code> (or <code>--source-region</code> for the AWS CLI) instead of specifying <code>PreSignedUrl</code> manually. Specifying <code>SourceRegion</code> autogenerates a pre-signed URL that is a valid request for the operation that can be executed in the source AWS Region.</p> </note>"
         },
         "EnableIAMDatabaseAuthentication":{
           "shape":"BooleanOptional",
@@ -3381,6 +3706,67 @@
         "DBParameterGroup":{"shape":"DBParameterGroup"}
       }
     },
+    "CreateDBProxyRequest":{
+      "type":"structure",
+      "required":[
+        "DBProxyName",
+        "EngineFamily",
+        "Auth",
+        "RoleArn",
+        "VpcSubnetIds"
+      ],
+      "members":{
+        "DBProxyName":{
+          "shape":"String",
+          "documentation":"<p>The identifier for the proxy. This name must be unique for all proxies owned by your AWS account in the specified AWS Region. An identifier must begin with a letter and must contain only ASCII letters, digits, and hyphens; it can't end with a hyphen or contain two consecutive hyphens.</p>"
+        },
+        "EngineFamily":{
+          "shape":"EngineFamily",
+          "documentation":"<p>The kinds of databases that the proxy can connect to. This value determines which database network protocol the proxy recognizes when it interprets network traffic to and from the database. Currently, this value is always <code>MYSQL</code>. The engine family applies to both RDS MySQL and Aurora MySQL.</p>"
+        },
+        "Auth":{
+          "shape":"UserAuthConfigList",
+          "documentation":"<p>The authorization mechanism that the proxy uses.</p>"
+        },
+        "RoleArn":{
+          "shape":"String",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the IAM role that the proxy uses to access secrets in AWS Secrets Manager.</p>"
+        },
+        "VpcSubnetIds":{
+          "shape":"StringList",
+          "documentation":"<p>One or more VPC subnet IDs to associate with the new proxy.</p>"
+        },
+        "VpcSecurityGroupIds":{
+          "shape":"StringList",
+          "documentation":"<p>One or more VPC security group IDs to associate with the new proxy.</p>"
+        },
+        "RequireTLS":{
+          "shape":"Boolean",
+          "documentation":"<p>A Boolean parameter that specifies whether Transport Layer Security (TLS) encryption is required for connections to the proxy. By enabling this setting, you can enforce encrypted TLS connections to the proxy.</p>"
+        },
+        "IdleClientTimeout":{
+          "shape":"IntegerOptional",
+          "documentation":"<p>The number of seconds that a connection to the proxy can be inactive before the proxy disconnects it. You can set this value higher or lower than the connection timeout limit for the associated database.</p>"
+        },
+        "DebugLogging":{
+          "shape":"Boolean",
+          "documentation":"<p>Whether the proxy includes detailed information about SQL statements in its logs. This information helps you to debug issues involving SQL behavior or the performance and scalability of the proxy connections. The debug information includes the text of SQL statements that you submit through the proxy. Thus, only enable this setting when needed for debugging, and only when you have security measures in place to safeguard any sensitive information that appears in the logs.</p>"
+        },
+        "Tags":{
+          "shape":"TagList",
+          "documentation":"<p>An optional set of key-value pairs to associate arbitrary data of your choosing with the proxy.</p>"
+        }
+      }
+    },
+    "CreateDBProxyResponse":{
+      "type":"structure",
+      "members":{
+        "DBProxy":{
+          "shape":"DBProxy",
+          "documentation":"<p>The <code>DBProxy</code> structure corresponding to the new proxy.</p>"
+        }
+      }
+    },
     "CreateDBSecurityGroupMessage":{
       "type":"structure",
       "required":[
@@ -3484,7 +3870,7 @@
         },
         "SourceType":{
           "shape":"String",
-          "documentation":"<p>The type of source that is generating the events. For example, if you want to be notified of events generated by a DB instance, you would set this parameter to db-instance. if this value is not specified, all events are returned.</p> <p>Valid values: <code>db-instance</code> | <code>db-cluster</code> | <code>db-parameter-group</code> | <code>db-security-group</code> | <code>db-snapshot</code> | <code>db-cluster-snapshot</code> </p>"
+          "documentation":"<p>The type of source that is generating the events. For example, if you want to be notified of events generated by a DB instance, you would set this parameter to db-instance. if this value isn't specified, all events are returned.</p> <p>Valid values: <code>db-instance</code> | <code>db-cluster</code> | <code>db-parameter-group</code> | <code>db-security-group</code> | <code>db-snapshot</code> | <code>db-cluster-snapshot</code> </p>"
         },
         "EventCategories":{
           "shape":"EventCategoriesList",
@@ -3492,11 +3878,11 @@
         },
         "SourceIds":{
           "shape":"SourceIdsList",
-          "documentation":"<p>The list of identifiers of the event sources for which events are returned. If not specified, then all sources are included in the response. An identifier must begin with a letter and must contain only ASCII letters, digits, and hyphens; it can't end with a hyphen or contain two consecutive hyphens.</p> <p>Constraints:</p> <ul> <li> <p>If SourceIds are supplied, SourceType must also be provided.</p> </li> <li> <p>If the source type is a DB instance, then a <code>DBInstanceIdentifier</code> must be supplied.</p> </li> <li> <p>If the source type is a DB security group, a <code>DBSecurityGroupName</code> must be supplied.</p> </li> <li> <p>If the source type is a DB parameter group, a <code>DBParameterGroupName</code> must be supplied.</p> </li> <li> <p>If the source type is a DB snapshot, a <code>DBSnapshotIdentifier</code> must be supplied.</p> </li> </ul>"
+          "documentation":"<p>The list of identifiers of the event sources for which events are returned. If not specified, then all sources are included in the response. An identifier must begin with a letter and must contain only ASCII letters, digits, and hyphens. It can't end with a hyphen or contain two consecutive hyphens.</p> <p>Constraints:</p> <ul> <li> <p>If SourceIds are supplied, SourceType must also be provided.</p> </li> <li> <p>If the source type is a DB instance, then a <code>DBInstanceIdentifier</code> must be supplied.</p> </li> <li> <p>If the source type is a DB security group, a <code>DBSecurityGroupName</code> must be supplied.</p> </li> <li> <p>If the source type is a DB parameter group, a <code>DBParameterGroupName</code> must be supplied.</p> </li> <li> <p>If the source type is a DB snapshot, a <code>DBSnapshotIdentifier</code> must be supplied.</p> </li> </ul>"
         },
         "Enabled":{
           "shape":"BooleanOptional",
-          "documentation":"<p> A value that indicates whether to activate the subscription. If the event notification subscription is not activated, the subscription is created but not active. </p>"
+          "documentation":"<p> A value that indicates whether to activate the subscription. If the event notification subscription isn't activated, the subscription is created but not active. </p>"
         },
         "Tags":{"shape":"TagList"}
       },
@@ -3669,7 +4055,7 @@
       "members":{
         "AllocatedStorage":{
           "shape":"IntegerOptional",
-          "documentation":"<p>For all database engines except Amazon Aurora, <code>AllocatedStorage</code> specifies the allocated storage size in gibibytes (GiB). For Aurora, <code>AllocatedStorage</code> always returns 1, because Aurora DB cluster storage size is not fixed, but instead automatically adjusts as needed.</p>"
+          "documentation":"<p>For all database engines except Amazon Aurora, <code>AllocatedStorage</code> specifies the allocated storage size in gibibytes (GiB). For Aurora, <code>AllocatedStorage</code> always returns 1, because Aurora DB cluster storage size isn't fixed, but instead automatically adjusts as needed.</p>"
         },
         "AvailabilityZones":{
           "shape":"AvailabilityZones",
@@ -3867,6 +4253,10 @@
         "CrossAccountClone":{
           "shape":"BooleanOptional",
           "documentation":"<p>Specifies whether the DB cluster is a clone of a DB cluster owned by a different AWS account.</p>"
+        },
+        "DomainMemberships":{
+          "shape":"DomainMembershipList",
+          "documentation":"<p>The Active Directory Domain membership records associated with the DB cluster.</p>"
         }
       },
       "documentation":"<p>Contains the details of an Amazon Aurora DB cluster. </p> <p>This data type is used as a response element in the <code>DescribeDBClusters</code>, <code>StopDBCluster</code>, and <code>StartDBCluster</code> actions. </p>",
@@ -3926,7 +4316,7 @@
       "members":{
         "Marker":{
           "shape":"String",
-          "documentation":"<p>A pagination token that can be used in a subsequent <code>DescribeDBClusterBacktracks</code> request.</p>"
+          "documentation":"<p>A pagination token that can be used in a later <code>DescribeDBClusterBacktracks</code> request.</p>"
         },
         "DBClusterBacktracks":{
           "shape":"DBClusterBacktrackList",
@@ -4116,7 +4506,7 @@
       "members":{
         "Marker":{
           "shape":"String",
-          "documentation":"<p>A pagination token that can be used in a subsequent DescribeDBClusters request.</p>"
+          "documentation":"<p>A pagination token that can be used in a later DescribeDBClusters request.</p>"
         },
         "DBClusters":{
           "shape":"DBClusterList",
@@ -4504,7 +4894,7 @@
         },
         "DefaultCharacterSet":{
           "shape":"CharacterSet",
-          "documentation":"<p> The default character set for new instances of this engine version, if the <code>CharacterSetName</code> parameter of the CreateDBInstance API is not specified. </p>"
+          "documentation":"<p> The default character set for new instances of this engine version, if the <code>CharacterSetName</code> parameter of the CreateDBInstance API isn't specified. </p>"
         },
         "SupportedCharacterSets":{
           "shape":"SupportedCharacterSetsList",
@@ -4695,7 +5085,7 @@
         },
         "StatusInfos":{
           "shape":"DBInstanceStatusInfoList",
-          "documentation":"<p>The status of a Read Replica. If the instance is not a Read Replica, this is blank.</p>"
+          "documentation":"<p>The status of a Read Replica. If the instance isn't a Read Replica, this is blank.</p>"
         },
         "StorageType":{
           "shape":"String",
@@ -5072,7 +5462,7 @@
         },
         "Message":{
           "shape":"String",
-          "documentation":"<p>Details of the error if there is an error for the instance. If the instance is not in an error state, this value is blank.</p>"
+          "documentation":"<p>Details of the error if there is an error for the instance. If the instance isn't in an error state, this value is blank.</p>"
         }
       },
       "documentation":"<p>Provides a list of status information for a DB instance.</p>"
@@ -5221,42 +5611,259 @@
       },
       "documentation":"<p> Contains the result of a successful invocation of the <code>DescribeDBParameterGroups</code> action. </p>"
     },
-    "DBSecurityGroup":{
+    "DBProxy":{
       "type":"structure",
       "members":{
-        "OwnerId":{
+        "DBProxyName":{
           "shape":"String",
-          "documentation":"<p>Provides the AWS ID of the owner of a specific DB security group.</p>"
+          "documentation":"<p>The identifier for the proxy. This name must be unique for all proxies owned by your AWS account in the specified AWS Region.</p>"
         },
-        "DBSecurityGroupName":{
+        "DBProxyArn":{
           "shape":"String",
-          "documentation":"<p>Specifies the name of the DB security group.</p>"
+          "documentation":"<p>The Amazon Resource Name (ARN) for the proxy.</p>"
         },
-        "DBSecurityGroupDescription":{
-          "shape":"String",
-          "documentation":"<p>Provides the description of the DB security group.</p>"
+        "Status":{
+          "shape":"DBProxyStatus",
+          "documentation":"<p>The current status of this proxy. A status of <code>available</code> means the proxy is ready to handle requests. Other values indicate that you must wait for the proxy to be ready, or take some action to resolve an issue.</p>"
         },
-        "VpcId":{
+        "EngineFamily":{
           "shape":"String",
-          "documentation":"<p>Provides the VpcId of the DB security group.</p>"
+          "documentation":"<p>Currently, this value is always <code>MYSQL</code>. The engine family applies to both RDS MySQL and Aurora MySQL.</p>"
         },
-        "EC2SecurityGroups":{
-          "shape":"EC2SecurityGroupList",
-          "documentation":"<p> Contains a list of <code>EC2SecurityGroup</code> elements. </p>"
+        "VpcSecurityGroupIds":{
+          "shape":"StringList",
+          "documentation":"<p>Provides a list of VPC security groups that the proxy belongs to.</p>"
         },
-        "IPRanges":{
-          "shape":"IPRangeList",
-          "documentation":"<p> Contains a list of <code>IPRange</code> elements. </p>"
+        "VpcSubnetIds":{
+          "shape":"StringList",
+          "documentation":"<p>The EC2 subnet IDs for the proxy.</p>"
         },
-        "DBSecurityGroupArn":{
+        "Auth":{
+          "shape":"UserAuthConfigInfoList",
+          "documentation":"<p>One or more data structures specifying the authorization mechanism to connect to the associated RDS DB instance or Aurora DB cluster.</p>"
+        },
+        "RoleArn":{
           "shape":"String",
-          "documentation":"<p>The Amazon Resource Name (ARN) for the DB security group.</p>"
+          "documentation":"<p>The Amazon Resource Name (ARN) for the IAM role that the proxy uses to access Amazon Secrets Manager.</p>"
+        },
+        "Endpoint":{
+          "shape":"String",
+          "documentation":"<p>The endpoint that you can use to connect to the proxy. You include the endpoint value in the connection string for a database client application.</p>"
+        },
+        "RequireTLS":{
+          "shape":"Boolean",
+          "documentation":"<p>Indicates whether Transport Layer Security (TLS) encryption is required for connections to the proxy.</p>"
+        },
+        "IdleClientTimeout":{
+          "shape":"Integer",
+          "documentation":"<p>The number of seconds a connection to the proxy can have no activity before the proxy drops the client connection. The proxy keeps the underlying database connection open and puts it back into the connection pool for reuse by later connection requests.</p> <p>Default: 1800 (30 minutes)</p> <p>Constraints: 1 to 28,800</p>"
+        },
+        "DebugLogging":{
+          "shape":"Boolean",
+          "documentation":"<p>Whether the proxy includes detailed information about SQL statements in its logs. This information helps you to debug issues involving SQL behavior or the performance and scalability of the proxy connections. The debug information includes the text of SQL statements that you submit through the proxy. Thus, only enable this setting when needed for debugging, and only when you have security measures in place to safeguard any sensitive information that appears in the logs.</p>"
+        },
+        "CreatedDate":{
+          "shape":"TStamp",
+          "documentation":"<p>The date and time when the proxy was first created.</p>"
+        },
+        "UpdatedDate":{
+          "shape":"TStamp",
+          "documentation":"<p>The date and time when the proxy was last updated.</p>"
         }
       },
-      "documentation":"<p>Contains the details for an Amazon RDS DB security group. </p> <p>This data type is used as a response element in the <code>DescribeDBSecurityGroups</code> action. </p>",
-      "wrapper":true
+      "documentation":"<note> <p>This is prerelease documentation for the RDS Database Proxy feature in preview release. It is subject to change.</p> </note> <p>The data structure representing a proxy managed by the RDS Proxy.</p> <p>This data type is used as a response element in the <code>DescribeDBProxies</code> action.</p>"
     },
-    "DBSecurityGroupAlreadyExistsFault":{
+    "DBProxyAlreadyExistsFault":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>The specified proxy name must be unique for all proxies owned by your AWS account in the specified AWS Region.</p>",
+      "error":{
+        "code":"DBProxyTargetExistsFault",
+        "httpStatusCode":400,
+        "senderFault":true
+      },
+      "exception":true
+    },
+    "DBProxyList":{
+      "type":"list",
+      "member":{"shape":"DBProxy"}
+    },
+    "DBProxyNotFoundFault":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>The specified proxy name doesn't correspond to a proxy owned by your AWS accoutn in the specified AWS Region.</p>",
+      "error":{
+        "code":"DBProxyNotFoundFault",
+        "httpStatusCode":404,
+        "senderFault":true
+      },
+      "exception":true
+    },
+    "DBProxyQuotaExceededFault":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>Your AWS account already has the maximum number of proxies in the specified AWS Region.</p>",
+      "error":{
+        "code":"DBProxyQuotaExceededFault",
+        "httpStatusCode":400,
+        "senderFault":true
+      },
+      "exception":true
+    },
+    "DBProxyStatus":{
+      "type":"string",
+      "enum":[
+        "available",
+        "modifying",
+        "incompatible-network",
+        "insufficient-resource-limits",
+        "creating",
+        "deleting"
+      ]
+    },
+    "DBProxyTarget":{
+      "type":"structure",
+      "members":{
+        "TargetArn":{
+          "shape":"String",
+          "documentation":"<p>The Amazon Resource Name (ARN) for the RDS DB instance or Aurora DB cluster.</p>"
+        },
+        "Endpoint":{
+          "shape":"String",
+          "documentation":"<p>The writer endpoint for the RDS DB instance or Aurora DB cluster.</p>"
+        },
+        "TrackedClusterId":{
+          "shape":"String",
+          "documentation":"<p>The DB cluster identifier when the target represents an Aurora DB cluster. This field is blank when the target represents an RDS DB instance.</p>"
+        },
+        "RdsResourceId":{
+          "shape":"String",
+          "documentation":"<p>The identifier representing the target. It can be the instance identifier for an RDS DB instance, or the cluster identifier for an Aurora DB cluster.</p>"
+        },
+        "Port":{
+          "shape":"Integer",
+          "documentation":"<p>The port that the RDS Proxy uses to connect to the target RDS DB instance or Aurora DB cluster.</p>"
+        },
+        "Type":{
+          "shape":"TargetType",
+          "documentation":"<p>Specifies the kind of database, such as an RDS DB instance or an Aurora DB cluster, that the target represents.</p>"
+        }
+      },
+      "documentation":"<note> <p>This is prerelease documentation for the RDS Database Proxy feature in preview release. It is subject to change.</p> </note> <p>Contains the details for an RDS Proxy target. It represents an RDS DB instance or Aurora DB cluster that the proxy can connect to. One or more targets are associated with an RDS Proxy target group.</p> <p>This data type is used as a response element in the <code>DescribeDBProxyTargets</code> action.</p>"
+    },
+    "DBProxyTargetAlreadyRegisteredFault":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>The proxy is already associated with the specified RDS DB instance or Aurora DB cluster.</p>",
+      "error":{
+        "code":"DBProxyTargetAlreadyRegisteredFault",
+        "httpStatusCode":400,
+        "senderFault":true
+      },
+      "exception":true
+    },
+    "DBProxyTargetGroup":{
+      "type":"structure",
+      "members":{
+        "DBProxyName":{
+          "shape":"String",
+          "documentation":"<p>The identifier for the RDS proxy associated with this target group.</p>"
+        },
+        "TargetGroupName":{
+          "shape":"String",
+          "documentation":"<p>The identifier for the target group. This name must be unique for all target groups owned by your AWS account in the specified AWS Region.</p>"
+        },
+        "TargetGroupArn":{
+          "shape":"String",
+          "documentation":"<p>The Amazon Resource Name (ARN) representing the target group.</p>"
+        },
+        "IsDefault":{
+          "shape":"Boolean",
+          "documentation":"<p>Whether this target group is the first one used for connection requests by the associated proxy. Because each proxy is currently associated with a single target group, currently this setting is always <code>true</code>.</p>"
+        },
+        "Status":{
+          "shape":"String",
+          "documentation":"<p>The current status of this target group. A status of <code>available</code> means the target group is correctly associated with a database. Other values indicate that you must wait for the target group to be ready, or take some action to resolve an issue.</p>"
+        },
+        "ConnectionPoolConfig":{
+          "shape":"ConnectionPoolConfigurationInfo",
+          "documentation":"<p>The settings that determine the size and behavior of the connection pool for the target group.</p>"
+        },
+        "CreatedDate":{
+          "shape":"TStamp",
+          "documentation":"<p>The date and time when the target group was first created.</p>"
+        },
+        "UpdatedDate":{
+          "shape":"TStamp",
+          "documentation":"<p>The date and time when the target group was last updated.</p>"
+        }
+      },
+      "documentation":"<note> <p>This is prerelease documentation for the RDS Database Proxy feature in preview release. It is subject to change.</p> </note> <p>Represents a set of RDS DB instances, Aurora DB clusters, or both that a proxy can connect to. Currently, each target group is associated with exactly one RDS DB instance or Aurora DB cluster.</p> <p>This data type is used as a response element in the <code>DescribeDBProxyTargetGroups</code> action.</p>"
+    },
+    "DBProxyTargetGroupNotFoundFault":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>The specified target group isn't available for a proxy owned by your AWS account in the specified AWS Region.</p>",
+      "error":{
+        "code":"DBProxyTargetGroupNotFoundFault",
+        "httpStatusCode":404,
+        "senderFault":true
+      },
+      "exception":true
+    },
+    "DBProxyTargetNotFoundFault":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>The specified RDS DB instance or Aurora DB cluster isn't available for a proxy owned by your AWS account in the specified AWS Region.</p>",
+      "error":{
+        "code":"DBProxyTargetNotFoundFault",
+        "httpStatusCode":404,
+        "senderFault":true
+      },
+      "exception":true
+    },
+    "DBSecurityGroup":{
+      "type":"structure",
+      "members":{
+        "OwnerId":{
+          "shape":"String",
+          "documentation":"<p>Provides the AWS ID of the owner of a specific DB security group.</p>"
+        },
+        "DBSecurityGroupName":{
+          "shape":"String",
+          "documentation":"<p>Specifies the name of the DB security group.</p>"
+        },
+        "DBSecurityGroupDescription":{
+          "shape":"String",
+          "documentation":"<p>Provides the description of the DB security group.</p>"
+        },
+        "VpcId":{
+          "shape":"String",
+          "documentation":"<p>Provides the VpcId of the DB security group.</p>"
+        },
+        "EC2SecurityGroups":{
+          "shape":"EC2SecurityGroupList",
+          "documentation":"<p> Contains a list of <code>EC2SecurityGroup</code> elements. </p>"
+        },
+        "IPRanges":{
+          "shape":"IPRangeList",
+          "documentation":"<p> Contains a list of <code>IPRange</code> elements. </p>"
+        },
+        "DBSecurityGroupArn":{
+          "shape":"String",
+          "documentation":"<p>The Amazon Resource Name (ARN) for the DB security group.</p>"
+        }
+      },
+      "documentation":"<p>Contains the details for an Amazon RDS DB security group. </p> <p>This data type is used as a response element in the <code>DescribeDBSecurityGroups</code> action. </p>",
+      "wrapper":true
+    },
+    "DBSecurityGroupAlreadyExistsFault":{
       "type":"structure",
       "members":{
       },
@@ -5726,7 +6333,7 @@
         },
         "SkipFinalSnapshot":{
           "shape":"Boolean",
-          "documentation":"<p>A value that indicates whether to skip the creation of a final DB cluster snapshot before the DB cluster is deleted. If skip is specified, no DB cluster snapshot is created. If skip is not specified, a DB cluster snapshot is created before the DB cluster is deleted. By default, skip is not specified, and the DB cluster snapshot is created. By default, this parameter is disabled.</p> <note> <p>You must specify a <code>FinalDBSnapshotIdentifier</code> parameter if <code>SkipFinalSnapshot</code> is disabled.</p> </note>"
+          "documentation":"<p>A value that indicates whether to skip the creation of a final DB cluster snapshot before the DB cluster is deleted. If skip is specified, no DB cluster snapshot is created. If skip isn't specified, a DB cluster snapshot is created before the DB cluster is deleted. By default, skip isn't specified, and the DB cluster snapshot is created. By default, this parameter is disabled.</p> <note> <p>You must specify a <code>FinalDBSnapshotIdentifier</code> parameter if <code>SkipFinalSnapshot</code> is disabled.</p> </note>"
         },
         "FinalDBSnapshotIdentifier":{
           "shape":"String",
@@ -5796,7 +6403,7 @@
         },
         "SkipFinalSnapshot":{
           "shape":"Boolean",
-          "documentation":"<p>A value that indicates whether to skip the creation of a final DB snapshot before the DB instance is deleted. If skip is specified, no DB snapshot is created. If skip is not specified, a DB snapshot is created before the DB instance is deleted. By default, skip is not specified, and the DB snapshot is created.</p> <p>Note that when a DB instance is in a failure state and has a status of 'failed', 'incompatible-restore', or 'incompatible-network', it can only be deleted when skip is specified.</p> <p>Specify skip when deleting a Read Replica.</p> <note> <p>The FinalDBSnapshotIdentifier parameter must be specified if skip is not specified.</p> </note>"
+          "documentation":"<p>A value that indicates whether to skip the creation of a final DB snapshot before the DB instance is deleted. If skip is specified, no DB snapshot is created. If skip isn't specified, a DB snapshot is created before the DB instance is deleted. By default, skip isn't specified, and the DB snapshot is created.</p> <p>When a DB instance is in a failure state and has a status of 'failed', 'incompatible-restore', or 'incompatible-network', it can only be deleted when skip is specified.</p> <p>Specify skip when deleting a Read Replica.</p> <note> <p>The FinalDBSnapshotIdentifier parameter must be specified if skip isn't specified.</p> </note>"
         },
         "FinalDBSnapshotIdentifier":{
           "shape":"String",
@@ -5826,6 +6433,25 @@
       },
       "documentation":"<p/>"
     },
+    "DeleteDBProxyRequest":{
+      "type":"structure",
+      "required":["DBProxyName"],
+      "members":{
+        "DBProxyName":{
+          "shape":"String",
+          "documentation":"<p>The name of the DB proxy to delete.</p>"
+        }
+      }
+    },
+    "DeleteDBProxyResponse":{
+      "type":"structure",
+      "members":{
+        "DBProxy":{
+          "shape":"DBProxy",
+          "documentation":"<p>The data structure representing the details of the DB proxy that you delete.</p>"
+        }
+      }
+    },
     "DeleteDBSecurityGroupMessage":{
       "type":"structure",
       "required":["DBSecurityGroupName"],
@@ -5904,7 +6530,7 @@
       "members":{
         "InstallationMediaId":{
           "shape":"String",
-          "documentation":"<p>The installation media ID.</p>"
+          "documentation":"<p>The installation medium ID.</p>"
         }
       }
     },
@@ -5919,6 +6545,33 @@
       },
       "documentation":"<p/>"
     },
+    "DeregisterDBProxyTargetsRequest":{
+      "type":"structure",
+      "required":["DBProxyName"],
+      "members":{
+        "DBProxyName":{
+          "shape":"String",
+          "documentation":"<p>The identifier of the <code>DBProxy</code> that is associated with the <code>DBProxyTargetGroup</code>.</p>"
+        },
+        "TargetGroupName":{
+          "shape":"String",
+          "documentation":"<p>The identifier of the <code>DBProxyTargetGroup</code>.</p>"
+        },
+        "DBInstanceIdentifiers":{
+          "shape":"StringList",
+          "documentation":"<p>One or more DB instance identifiers.</p>"
+        },
+        "DBClusterIdentifiers":{
+          "shape":"StringList",
+          "documentation":"<p>One or more DB cluster identifiers.</p>"
+        }
+      }
+    },
+    "DeregisterDBProxyTargetsResponse":{
+      "type":"structure",
+      "members":{
+      }
+    },
     "DescribeAccountAttributesMessage":{
       "type":"structure",
       "members":{
@@ -5934,11 +6587,11 @@
         },
         "Filters":{
           "shape":"FilterList",
-          "documentation":"<p>This parameter is not currently supported.</p>"
+          "documentation":"<p>This parameter isn't currently supported.</p>"
         },
         "MaxRecords":{
           "shape":"IntegerOptional",
-          "documentation":"<p> The maximum number of records to include in the response. If more records exist than the specified <code>MaxRecords</code> value, a pagination token called a marker is included in the response so that you can retrieve the remaining results. </p> <p>Default: 100</p> <p>Constraints: Minimum 20, maximum 100.</p>"
+          "documentation":"<p> The maximum number of records to include in the response. If more records exist than the specified <code>MaxRecords</code> value, a pagination token called a marker is included in the response so you can retrieve the remaining results. </p> <p>Default: 100</p> <p>Constraints: Minimum 20, maximum 100.</p>"
         },
         "Marker":{
           "shape":"String",
@@ -5960,7 +6613,7 @@
         },
         "MaxRecords":{
           "shape":"IntegerOptional",
-          "documentation":"<p>The maximum number of records to include in the response. If more records exist than the specified <code>MaxRecords</code> value, a pagination token called a marker is included in the response so that you can retrieve the remaining results.</p> <p>Default: 100</p> <p>Constraints: Minimum 20, maximum 100.</p>"
+          "documentation":"<p>The maximum number of records to include in the response. If more records exist than the specified <code>MaxRecords</code> value, a pagination token called a marker is included in the response so you can retrieve the remaining results.</p> <p>Default: 100</p> <p>Constraints: Minimum 20, maximum 100.</p>"
         },
         "Marker":{
           "shape":"String",
@@ -5986,7 +6639,7 @@
         },
         "MaxRecords":{
           "shape":"IntegerOptional",
-          "documentation":"<p>The maximum number of records to include in the response. If more records exist than the specified <code>MaxRecords</code> value, a pagination token called a marker is included in the response so that you can retrieve the remaining results. </p> <p>Default: 100</p> <p>Constraints: Minimum 20, maximum 100.</p>"
+          "documentation":"<p>The maximum number of records to include in the response. If more records exist than the specified <code>MaxRecords</code> value, a pagination token called a marker is included in the response so you can retrieve the remaining results. </p> <p>Default: 100</p> <p>Constraints: Minimum 20, maximum 100.</p>"
         },
         "Marker":{
           "shape":"String",
@@ -6012,7 +6665,7 @@
         },
         "MaxRecords":{
           "shape":"IntegerOptional",
-          "documentation":"<p>The maximum number of records to include in the response. If more records exist than the specified <code>MaxRecords</code> value, a pagination token called a marker is included in the response so that you can retrieve the remaining results. </p> <p>Default: 100</p> <p>Constraints: Minimum 20, maximum 100.</p>"
+          "documentation":"<p>The maximum number of records to include in the response. If more records exist than the specified <code>MaxRecords</code> value, a pagination token called a marker is included in the response so you can retrieve the remaining results. </p> <p>Default: 100</p> <p>Constraints: Minimum 20, maximum 100.</p>"
         },
         "Marker":{
           "shape":"String",
@@ -6029,11 +6682,11 @@
         },
         "Filters":{
           "shape":"FilterList",
-          "documentation":"<p>This parameter is not currently supported.</p>"
+          "documentation":"<p>This parameter isn't currently supported.</p>"
         },
         "MaxRecords":{
           "shape":"IntegerOptional",
-          "documentation":"<p> The maximum number of records to include in the response. If more records exist than the specified <code>MaxRecords</code> value, a pagination token called a marker is included in the response so that you can retrieve the remaining results. </p> <p>Default: 100</p> <p>Constraints: Minimum 20, maximum 100.</p>"
+          "documentation":"<p> The maximum number of records to include in the response. If more records exist than the specified <code>MaxRecords</code> value, a pagination token called a marker is included in the response so you can retrieve the remaining results. </p> <p>Default: 100</p> <p>Constraints: Minimum 20, maximum 100.</p>"
         },
         "Marker":{
           "shape":"String",
@@ -6056,11 +6709,11 @@
         },
         "Filters":{
           "shape":"FilterList",
-          "documentation":"<p>This parameter is not currently supported.</p>"
+          "documentation":"<p>This parameter isn't currently supported.</p>"
         },
         "MaxRecords":{
           "shape":"IntegerOptional",
-          "documentation":"<p> The maximum number of records to include in the response. If more records exist than the specified <code>MaxRecords</code> value, a pagination token called a marker is included in the response so that you can retrieve the remaining results. </p> <p>Default: 100</p> <p>Constraints: Minimum 20, maximum 100.</p>"
+          "documentation":"<p> The maximum number of records to include in the response. If more records exist than the specified <code>MaxRecords</code> value, a pagination token called a marker is included in the response so you can retrieve the remaining results. </p> <p>Default: 100</p> <p>Constraints: Minimum 20, maximum 100.</p>"
         },
         "Marker":{
           "shape":"String",
@@ -6091,7 +6744,7 @@
       "members":{
         "DBClusterIdentifier":{
           "shape":"String",
-          "documentation":"<p>The ID of the DB cluster to retrieve the list of DB cluster snapshots for. This parameter can't be used in conjunction with the <code>DBClusterSnapshotIdentifier</code> parameter. This parameter is not case-sensitive. </p> <p>Constraints:</p> <ul> <li> <p>If supplied, must match the identifier of an existing DBCluster.</p> </li> </ul>"
+          "documentation":"<p>The ID of the DB cluster to retrieve the list of DB cluster snapshots for. This parameter can't be used in conjunction with the <code>DBClusterSnapshotIdentifier</code> parameter. This parameter isn't case-sensitive. </p> <p>Constraints:</p> <ul> <li> <p>If supplied, must match the identifier of an existing DBCluster.</p> </li> </ul>"
         },
         "DBClusterSnapshotIdentifier":{
           "shape":"String",
@@ -6107,7 +6760,7 @@
         },
         "MaxRecords":{
           "shape":"IntegerOptional",
-          "documentation":"<p>The maximum number of records to include in the response. If more records exist than the specified <code>MaxRecords</code> value, a pagination token called a marker is included in the response so that you can retrieve the remaining results. </p> <p>Default: 100</p> <p>Constraints: Minimum 20, maximum 100.</p>"
+          "documentation":"<p>The maximum number of records to include in the response. If more records exist than the specified <code>MaxRecords</code> value, a pagination token called a marker is included in the response so you can retrieve the remaining results. </p> <p>Default: 100</p> <p>Constraints: Minimum 20, maximum 100.</p>"
         },
         "Marker":{
           "shape":"String",
@@ -6137,7 +6790,7 @@
         },
         "MaxRecords":{
           "shape":"IntegerOptional",
-          "documentation":"<p>The maximum number of records to include in the response. If more records exist than the specified <code>MaxRecords</code> value, a pagination token called a marker is included in the response so that you can retrieve the remaining results. </p> <p>Default: 100</p> <p>Constraints: Minimum 20, maximum 100.</p>"
+          "documentation":"<p>The maximum number of records to include in the response. If more records exist than the specified <code>MaxRecords</code> value, a pagination token called a marker is included in the response so you can retrieve the remaining results. </p> <p>Default: 100</p> <p>Constraints: Minimum 20, maximum 100.</p>"
         },
         "Marker":{
           "shape":"String",
@@ -6167,11 +6820,11 @@
         },
         "Filters":{
           "shape":"FilterList",
-          "documentation":"<p>This parameter is not currently supported.</p>"
+          "documentation":"<p>This parameter isn't currently supported.</p>"
         },
         "MaxRecords":{
           "shape":"IntegerOptional",
-          "documentation":"<p> The maximum number of records to include in the response. If more than the <code>MaxRecords</code> value is available, a pagination token called a marker is included in the response so that you can retrieve the remaining results. </p> <p>Default: 100</p> <p>Constraints: Minimum 20, maximum 100.</p>"
+          "documentation":"<p> The maximum number of records to include in the response. If more than the <code>MaxRecords</code> value is available, a pagination token called a marker is included in the response so you can retrieve the remaining results. </p> <p>Default: 100</p> <p>Constraints: Minimum 20, maximum 100.</p>"
         },
         "Marker":{
           "shape":"String",
@@ -6290,11 +6943,11 @@
         },
         "Filters":{
           "shape":"FilterList",
-          "documentation":"<p>This parameter is not currently supported.</p>"
+          "documentation":"<p>This parameter isn't currently supported.</p>"
         },
         "MaxRecords":{
           "shape":"IntegerOptional",
-          "documentation":"<p>The maximum number of records to include in the response. If more records exist than the specified MaxRecords value, a pagination token called a marker is included in the response so that you can retrieve the remaining results.</p>"
+          "documentation":"<p>The maximum number of records to include in the response. If more records exist than the specified MaxRecords value, a pagination token called a marker is included in the response so you can retrieve the remaining results.</p>"
         },
         "Marker":{
           "shape":"String",
@@ -6312,7 +6965,7 @@
         },
         "Marker":{
           "shape":"String",
-          "documentation":"<p>A pagination token that can be used in a subsequent DescribeDBLogFiles request.</p>"
+          "documentation":"<p>A pagination token that can be used in a later DescribeDBLogFiles request.</p>"
         }
       },
       "documentation":"<p> The response from a call to <code>DescribeDBLogFiles</code>. </p>"
@@ -6326,7 +6979,7 @@
         },
         "Filters":{
           "shape":"FilterList",
-          "documentation":"<p>This parameter is not currently supported.</p>"
+          "documentation":"<p>This parameter isn't currently supported.</p>"
         },
         "MaxRecords":{
           "shape":"IntegerOptional",
@@ -6353,7 +7006,7 @@
         },
         "Filters":{
           "shape":"FilterList",
-          "documentation":"<p>This parameter is not currently supported.</p>"
+          "documentation":"<p>This parameter isn't currently supported.</p>"
         },
         "MaxRecords":{
           "shape":"IntegerOptional",
@@ -6365,6 +7018,118 @@
         }
       }
     },
+    "DescribeDBProxiesRequest":{
+      "type":"structure",
+      "members":{
+        "DBProxyName":{
+          "shape":"String",
+          "documentation":"<p>The name of the DB proxy.</p>"
+        },
+        "Filters":{
+          "shape":"FilterList",
+          "documentation":"<p>This parameter is not currently supported.</p>"
+        },
+        "Marker":{
+          "shape":"String",
+          "documentation":"<p> An optional pagination token provided by a previous request. If this parameter is specified, the response includes only records beyond the marker, up to the value specified by <code>MaxRecords</code>. </p>"
+        },
+        "MaxRecords":{
+          "shape":"MaxRecords",
+          "documentation":"<p>The maximum number of records to include in the response. If more records exist than the specified <code>MaxRecords</code> value, a pagination token called a marker is included in the response so that the remaining results can be retrieved. </p> <p>Default: 100</p> <p>Constraints: Minimum 20, maximum 100.</p>"
+        }
+      }
+    },
+    "DescribeDBProxiesResponse":{
+      "type":"structure",
+      "members":{
+        "DBProxies":{
+          "shape":"DBProxyList",
+          "documentation":"<p>A return value representing an arbitrary number of <code>DBProxy</code> data structures.</p>"
+        },
+        "Marker":{
+          "shape":"String",
+          "documentation":"<p> An optional pagination token provided by a previous request. If this parameter is specified, the response includes only records beyond the marker, up to the value specified by <code>MaxRecords</code>. </p>"
+        }
+      }
+    },
+    "DescribeDBProxyTargetGroupsRequest":{
+      "type":"structure",
+      "required":["DBProxyName"],
+      "members":{
+        "DBProxyName":{
+          "shape":"String",
+          "documentation":"<p>The identifier of the <code>DBProxy</code> associated with the target group.</p>"
+        },
+        "TargetGroupName":{
+          "shape":"String",
+          "documentation":"<p>The identifier of the <code>DBProxyTargetGroup</code> to describe.</p>"
+        },
+        "Filters":{
+          "shape":"FilterList",
+          "documentation":"<p>This parameter is not currently supported.</p>"
+        },
+        "Marker":{
+          "shape":"String",
+          "documentation":"<p> An optional pagination token provided by a previous request. If this parameter is specified, the response includes only records beyond the marker, up to the value specified by <code>MaxRecords</code>. </p>"
+        },
+        "MaxRecords":{
+          "shape":"MaxRecords",
+          "documentation":"<p> The maximum number of records to include in the response. If more records exist than the specified <code>MaxRecords</code> value, a pagination token called a marker is included in the response so that the remaining results can be retrieved. </p> <p>Default: 100</p> <p>Constraints: Minimum 20, maximum 100.</p>"
+        }
+      }
+    },
+    "DescribeDBProxyTargetGroupsResponse":{
+      "type":"structure",
+      "members":{
+        "TargetGroups":{
+          "shape":"TargetGroupList",
+          "documentation":"<p>An arbitrary number of <code>DBProxyTargetGroup</code> objects, containing details of the corresponding target groups.</p>"
+        },
+        "Marker":{
+          "shape":"String",
+          "documentation":"<p> An optional pagination token provided by a previous request. If this parameter is specified, the response includes only records beyond the marker, up to the value specified by <code>MaxRecords</code>. </p>"
+        }
+      }
+    },
+    "DescribeDBProxyTargetsRequest":{
+      "type":"structure",
+      "required":["DBProxyName"],
+      "members":{
+        "DBProxyName":{
+          "shape":"String",
+          "documentation":"<p>The identifier of the <code>DBProxyTarget</code> to describe.</p>"
+        },
+        "TargetGroupName":{
+          "shape":"String",
+          "documentation":"<p>The identifier of the <code>DBProxyTargetGroup</code> to describe.</p>"
+        },
+        "Filters":{
+          "shape":"FilterList",
+          "documentation":"<p>This parameter is not currently supported.</p>"
+        },
+        "Marker":{
+          "shape":"String",
+          "documentation":"<p> An optional pagination token provided by a previous request. If this parameter is specified, the response includes only records beyond the marker, up to the value specified by <code>MaxRecords</code>. </p>"
+        },
+        "MaxRecords":{
+          "shape":"MaxRecords",
+          "documentation":"<p> The maximum number of records to include in the response. If more records exist than the specified <code>MaxRecords</code> value, a pagination token called a marker is included in the response so that the remaining results can be retrieved. </p> <p>Default: 100</p> <p>Constraints: Minimum 20, maximum 100.</p>"
+        }
+      }
+    },
+    "DescribeDBProxyTargetsResponse":{
+      "type":"structure",
+      "members":{
+        "Targets":{
+          "shape":"TargetList",
+          "documentation":"<p>An arbitrary number of <code>DBProxyTarget</code> objects, containing details of the corresponding targets.</p>"
+        },
+        "Marker":{
+          "shape":"String",
+          "documentation":"<p> An optional pagination token provided by a previous request. If this parameter is specified, the response includes only records beyond the marker, up to the value specified by <code>MaxRecords</code>. </p>"
+        }
+      }
+    },
     "DescribeDBSecurityGroupsMessage":{
       "type":"structure",
       "members":{
@@ -6374,7 +7139,7 @@
         },
         "Filters":{
           "shape":"FilterList",
-          "documentation":"<p>This parameter is not currently supported.</p>"
+          "documentation":"<p>This parameter isn't currently supported.</p>"
         },
         "MaxRecords":{
           "shape":"IntegerOptional",
@@ -6409,7 +7174,7 @@
       "members":{
         "DBInstanceIdentifier":{
           "shape":"String",
-          "documentation":"<p>The ID of the DB instance to retrieve the list of DB snapshots for. This parameter can't be used in conjunction with <code>DBSnapshotIdentifier</code>. This parameter is not case-sensitive. </p> <p>Constraints:</p> <ul> <li> <p>If supplied, must match the identifier of an existing DBInstance.</p> </li> </ul>"
+          "documentation":"<p>The ID of the DB instance to retrieve the list of DB snapshots for. This parameter can't be used in conjunction with <code>DBSnapshotIdentifier</code>. This parameter isn't case-sensitive. </p> <p>Constraints:</p> <ul> <li> <p>If supplied, must match the identifier of an existing DBInstance.</p> </li> </ul>"
         },
         "DBSnapshotIdentifier":{
           "shape":"String",
@@ -6455,7 +7220,7 @@
         },
         "Filters":{
           "shape":"FilterList",
-          "documentation":"<p>This parameter is not currently supported.</p>"
+          "documentation":"<p>This parameter isn't currently supported.</p>"
         },
         "MaxRecords":{
           "shape":"IntegerOptional",
@@ -6478,11 +7243,11 @@
         },
         "Filters":{
           "shape":"FilterList",
-          "documentation":"<p>This parameter is not currently supported.</p>"
+          "documentation":"<p>This parameter isn't currently supported.</p>"
         },
         "MaxRecords":{
           "shape":"IntegerOptional",
-          "documentation":"<p> The maximum number of records to include in the response. If more records exist than the specified <code>MaxRecords</code> value, a pagination token called a marker is included in the response so that you can retrieve the remaining results. </p> <p>Default: 100</p> <p>Constraints: Minimum 20, maximum 100.</p>"
+          "documentation":"<p> The maximum number of records to include in the response. If more records exist than the specified <code>MaxRecords</code> value, a pagination token called a marker is included in the response so you can retrieve the remaining results. </p> <p>Default: 100</p> <p>Constraints: Minimum 20, maximum 100.</p>"
         },
         "Marker":{
           "shape":"String",
@@ -6507,11 +7272,11 @@
         },
         "Filters":{
           "shape":"FilterList",
-          "documentation":"<p>This parameter is not currently supported.</p>"
+          "documentation":"<p>This parameter isn't currently supported.</p>"
         },
         "MaxRecords":{
           "shape":"IntegerOptional",
-          "documentation":"<p> The maximum number of records to include in the response. If more records exist than the specified <code>MaxRecords</code> value, a pagination token called a marker is included in the response so that you can retrieve the remaining results. </p> <p>Default: 100</p> <p>Constraints: Minimum 20, maximum 100.</p>"
+          "documentation":"<p> The maximum number of records to include in the response. If more records exist than the specified <code>MaxRecords</code> value, a pagination token called a marker is included in the response so you can retrieve the remaining results. </p> <p>Default: 100</p> <p>Constraints: Minimum 20, maximum 100.</p>"
         },
         "Marker":{
           "shape":"String",
@@ -6535,7 +7300,7 @@
         },
         "Filters":{
           "shape":"FilterList",
-          "documentation":"<p>This parameter is not currently supported.</p>"
+          "documentation":"<p>This parameter isn't currently supported.</p>"
         }
       },
       "documentation":"<p/>"
@@ -6549,7 +7314,7 @@
         },
         "Filters":{
           "shape":"FilterList",
-          "documentation":"<p>This parameter is not currently supported.</p>"
+          "documentation":"<p>This parameter isn't currently supported.</p>"
         },
         "MaxRecords":{
           "shape":"IntegerOptional",
@@ -6591,7 +7356,7 @@
         },
         "Filters":{
           "shape":"FilterList",
-          "documentation":"<p>This parameter is not currently supported.</p>"
+          "documentation":"<p>This parameter isn't currently supported.</p>"
         },
         "MaxRecords":{
           "shape":"IntegerOptional",
@@ -6604,6 +7369,31 @@
       },
       "documentation":"<p/>"
     },
+    "DescribeExportTasksMessage":{
+      "type":"structure",
+      "members":{
+        "ExportTaskIdentifier":{
+          "shape":"String",
+          "documentation":"<p>The identifier of the snapshot export task to be described.</p>"
+        },
+        "SourceArn":{
+          "shape":"String",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the snapshot exported to Amazon S3.</p>"
+        },
+        "Filters":{
+          "shape":"FilterList",
+          "documentation":"<p>Filters specify one or more snapshot exports to describe. The filters are specified as name-value pairs that define what to include in the output.</p> <p>Supported filters include the following: </p> <ul> <li> <p> <code>export-task-identifier</code> - An identifier for the snapshot export task.</p> </li> <li> <p> <code>s3-bucket</code> - The Amazon S3 bucket the snapshot is exported to.</p> </li> <li> <p> <code>source-arn</code> - The Amazon Resource Name (ARN) of the snapshot exported to Amazon S3</p> </li> <li> <p> <code>status</code> - The status of the export task.</p> </li> </ul>"
+        },
+        "Marker":{
+          "shape":"String",
+          "documentation":"<p> An optional pagination token provided by a previous <code>DescribeExportTasks</code> request. If you specify this parameter, the response includes only records beyond the marker, up to the value specified by the <code>MaxRecords</code> parameter. </p>"
+        },
+        "MaxRecords":{
+          "shape":"MaxRecords",
+          "documentation":"<p> The maximum number of records to include in the response. If more records exist than the specified value, a pagination token called a marker is included in the response. You can use the marker in a later <code>DescribeExportTasks</code> request to retrieve the remaining results. </p> <p>Default: 100</p> <p>Constraints: Minimum 20, maximum 100.</p>"
+        }
+      }
+    },
     "DescribeGlobalClustersMessage":{
       "type":"structure",
       "members":{
@@ -6630,7 +7420,7 @@
       "members":{
         "InstallationMediaId":{
           "shape":"String",
-          "documentation":"<p>The installation media ID.</p>"
+          "documentation":"<p>The installation medium ID.</p>"
         },
         "Filters":{
           "shape":"FilterList",
@@ -6660,7 +7450,7 @@
         },
         "Filters":{
           "shape":"FilterList",
-          "documentation":"<p>This parameter is not currently supported.</p>"
+          "documentation":"<p>This parameter isn't currently supported.</p>"
         },
         "MaxRecords":{
           "shape":"IntegerOptional",
@@ -6682,7 +7472,7 @@
         },
         "Filters":{
           "shape":"FilterList",
-          "documentation":"<p>This parameter is not currently supported.</p>"
+          "documentation":"<p>This parameter isn't currently supported.</p>"
         },
         "Marker":{
           "shape":"String",
@@ -6729,7 +7519,7 @@
         },
         "Filters":{
           "shape":"FilterList",
-          "documentation":"<p>This parameter is not currently supported.</p>"
+          "documentation":"<p>This parameter isn't currently supported.</p>"
         },
         "MaxRecords":{
           "shape":"IntegerOptional",
@@ -6801,11 +7591,11 @@
         },
         "Filters":{
           "shape":"FilterList",
-          "documentation":"<p>This parameter is not currently supported.</p>"
+          "documentation":"<p>This parameter isn't currently supported.</p>"
         },
         "MaxRecords":{
           "shape":"IntegerOptional",
-          "documentation":"<p> The maximum number of records to include in the response. If more than the <code>MaxRecords</code> value is available, a pagination token called a marker is included in the response so that you can retrieve the remaining results. </p> <p>Default: 100</p> <p>Constraints: Minimum 20, maximum 100.</p>"
+          "documentation":"<p> The maximum number of records to include in the response. If more than the <code>MaxRecords</code> value is available, a pagination token called a marker is included in the response so you can retrieve the remaining results. </p> <p>Default: 100</p> <p>Constraints: Minimum 20, maximum 100.</p>"
         },
         "Marker":{
           "shape":"String",
@@ -6843,11 +7633,11 @@
         },
         "Filters":{
           "shape":"FilterList",
-          "documentation":"<p>This parameter is not currently supported.</p>"
+          "documentation":"<p>This parameter isn't currently supported.</p>"
         },
         "MaxRecords":{
           "shape":"IntegerOptional",
-          "documentation":"<p> The maximum number of records to include in the response. If more than the <code>MaxRecords</code> value is available, a pagination token called a marker is included in the response so that you can retrieve the reamaining results. </p> <p>Default: 100</p> <p>Constraints: Minimum 20, maximum 100.</p>"
+          "documentation":"<p> The maximum number of records to include in the response. If more than the <code>MaxRecords</code> value is available, a pagination token called a marker is included in the response so you can retrieve the remaining results. </p> <p>Default: 100</p> <p>Constraints: Minimum 20, maximum 100.</p>"
         },
         "Marker":{
           "shape":"String",
@@ -6865,7 +7655,7 @@
         },
         "MaxRecords":{
           "shape":"IntegerOptional",
-          "documentation":"<p>The maximum number of records to include in the response. If more records exist than the specified <code>MaxRecords</code> value, a pagination token called a marker is included in the response so that you can retrieve the remaining results. </p> <p>Default: 100</p> <p>Constraints: Minimum 20, maximum 100.</p>"
+          "documentation":"<p>The maximum number of records to include in the response. If more records exist than the specified <code>MaxRecords</code> value, a pagination token called a marker is included in the response so you can retrieve the remaining results. </p> <p>Default: 100</p> <p>Constraints: Minimum 20, maximum 100.</p>"
         },
         "Marker":{
           "shape":"String",
@@ -6873,7 +7663,7 @@
         },
         "Filters":{
           "shape":"FilterList",
-          "documentation":"<p>This parameter is not currently supported.</p>"
+          "documentation":"<p>This parameter isn't currently supported.</p>"
         }
       },
       "documentation":"<p/>"
@@ -6904,7 +7694,7 @@
         },
         "Status":{
           "shape":"String",
-          "documentation":"<p>The status of the DB instance's Active Directory Domain membership, such as joined, pending-join, failed etc).</p>"
+          "documentation":"<p>The status of the Active Directory Domain membership for the DB instance or cluster. Values include joined, pending-join, failed, and so on.</p>"
         },
         "FQDN":{
           "shape":"String",
@@ -6915,7 +7705,7 @@
           "documentation":"<p>The name of the IAM role to be used when making API calls to the Directory Service.</p>"
         }
       },
-      "documentation":"<p>An Active Directory Domain membership record associated with the DB instance.</p>"
+      "documentation":"<p>An Active Directory Domain membership record associated with the DB instance or cluster.</p>"
     },
     "DomainMembershipList":{
       "type":"list",
@@ -6923,7 +7713,7 @@
         "shape":"DomainMembership",
         "locationName":"DomainMembership"
       },
-      "documentation":"<p>List of Active Directory Domain membership records associated with a DB instance.</p>"
+      "documentation":"<p>List of Active Directory Domain membership records associated with a DB instance or cluster.</p>"
     },
     "DomainNotFoundFault":{
       "type":"structure",
@@ -6969,7 +7759,7 @@
         },
         "Marker":{
           "shape":"String",
-          "documentation":"<p>A pagination token that can be used in a subsequent DownloadDBLogFilePortion request.</p>"
+          "documentation":"<p>A pagination token that can be used in a later DownloadDBLogFilePortion request.</p>"
         },
         "AdditionalDataPending":{
           "shape":"Boolean",
@@ -6999,7 +7789,7 @@
         },
         "NumberOfLines":{
           "shape":"Integer",
-          "documentation":"<p>The number of lines to download. If the number of lines specified results in a file over 1 MB in size, the file is truncated at 1 MB in size.</p> <p>If the NumberOfLines parameter is specified, then the block of lines returned can be from the beginning or the end of the log file, depending on the value of the Marker parameter.</p> <ul> <li> <p>If neither Marker or NumberOfLines are specified, the entire log file is returned up to a maximum of 10000 lines, starting with the most recent log entries first.</p> </li> <li> <p>If NumberOfLines is specified and Marker is not specified, then the most recent lines from the end of the log file are returned.</p> </li> <li> <p>If Marker is specified as \"0\", then the specified number of lines from the beginning of the log file are returned.</p> </li> <li> <p>You can download the log file in blocks of lines by specifying the size of the block using the NumberOfLines parameter, and by specifying a value of \"0\" for the Marker parameter in your first request. Include the Marker value returned in the response as the Marker value for the next request, continuing until the AdditionalDataPending response element returns false.</p> </li> </ul>"
+          "documentation":"<p>The number of lines to download. If the number of lines specified results in a file over 1 MB in size, the file is truncated at 1 MB in size.</p> <p>If the NumberOfLines parameter is specified, then the block of lines returned can be from the beginning or the end of the log file, depending on the value of the Marker parameter.</p> <ul> <li> <p>If neither Marker or NumberOfLines are specified, the entire log file is returned up to a maximum of 10000 lines, starting with the most recent log entries first.</p> </li> <li> <p>If NumberOfLines is specified and Marker isn't specified, then the most recent lines from the end of the log file are returned.</p> </li> <li> <p>If Marker is specified as \"0\", then the specified number of lines from the beginning of the log file are returned.</p> </li> <li> <p>You can download the log file in blocks of lines by specifying the size of the block using the NumberOfLines parameter, and by specifying a value of \"0\" for the Marker parameter in your first request. Include the Marker value returned in the response as the Marker value for the next request, continuing until the AdditionalDataPending response element returns false.</p> </li> </ul>"
         }
       },
       "documentation":"<p/>"
@@ -7070,6 +7860,10 @@
       "documentation":"<p> Contains the result of a successful invocation of the <code>DescribeEngineDefaultParameters</code> action. </p>",
       "wrapper":true
     },
+    "EngineFamily":{
+      "type":"string",
+      "enum":["MYSQL"]
+    },
     "EngineModeList":{
       "type":"list",
       "member":{"shape":"String"}
@@ -7201,48 +7995,158 @@
       "type":"structure",
       "members":{
       },
-      "documentation":"<p>You have reached the maximum number of event subscriptions.</p>",
+      "documentation":"<p>You have reached the maximum number of event subscriptions.</p>",
+      "error":{
+        "code":"EventSubscriptionQuotaExceeded",
+        "httpStatusCode":400,
+        "senderFault":true
+      },
+      "exception":true
+    },
+    "EventSubscriptionsList":{
+      "type":"list",
+      "member":{
+        "shape":"EventSubscription",
+        "locationName":"EventSubscription"
+      }
+    },
+    "EventSubscriptionsMessage":{
+      "type":"structure",
+      "members":{
+        "Marker":{
+          "shape":"String",
+          "documentation":"<p> An optional pagination token provided by a previous DescribeOrderableDBInstanceOptions request. If this parameter is specified, the response includes only records beyond the marker, up to the value specified by <code>MaxRecords</code>. </p>"
+        },
+        "EventSubscriptionsList":{
+          "shape":"EventSubscriptionsList",
+          "documentation":"<p>A list of EventSubscriptions data types.</p>"
+        }
+      },
+      "documentation":"<p>Data returned by the <b>DescribeEventSubscriptions</b> action.</p>"
+    },
+    "EventsMessage":{
+      "type":"structure",
+      "members":{
+        "Marker":{
+          "shape":"String",
+          "documentation":"<p> An optional pagination token provided by a previous Events request. If this parameter is specified, the response includes only records beyond the marker, up to the value specified by <code>MaxRecords</code> . </p>"
+        },
+        "Events":{
+          "shape":"EventList",
+          "documentation":"<p> A list of <code>Event</code> instances. </p>"
+        }
+      },
+      "documentation":"<p> Contains the result of a successful invocation of the <code>DescribeEvents</code> action. </p>"
+    },
+    "ExportTask":{
+      "type":"structure",
+      "members":{
+        "ExportTaskIdentifier":{
+          "shape":"String",
+          "documentation":"<p>A unique identifier for the snapshot export task. This ID isn't an identifier for the Amazon S3 bucket where the snapshot is exported to. </p>"
+        },
+        "SourceArn":{
+          "shape":"String",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the snapshot exported to Amazon S3.</p>"
+        },
+        "ExportOnly":{
+          "shape":"StringList",
+          "documentation":"<p>The data exported from the snapshot. Valid values are the following:</p> <ul> <li> <p> <code>database</code> - Export all the data of the snapshot.</p> </li> <li> <p> <code>database.table [table-name]</code> - Export a table of the snapshot.</p> </li> <li> <p> <code>database.schema [schema-name]</code> - Export a database schema of the snapshot. This value isn't valid for RDS for MySQL, RDS for MariaDB, or Aurora MySQL.</p> </li> <li> <p> <code>database.schema.table [table-name]</code> - Export a table of the database schema. This value isn't valid for RDS for MySQL, RDS for MariaDB, or Aurora MySQL.</p> </li> </ul>"
+        },
+        "SnapshotTime":{
+          "shape":"TStamp",
+          "documentation":"<p>The time that the snapshot was created.</p>"
+        },
+        "TaskStartTime":{
+          "shape":"TStamp",
+          "documentation":"<p>The time that the snapshot export task started.</p>"
+        },
+        "TaskEndTime":{
+          "shape":"TStamp",
+          "documentation":"<p>The time that the snapshot export task completed.</p>"
+        },
+        "S3Bucket":{
+          "shape":"String",
+          "documentation":"<p>The Amazon S3 bucket that the snapshot is exported to.</p>"
+        },
+        "S3Prefix":{
+          "shape":"String",
+          "documentation":"<p>The Amazon S3 bucket prefix that is the file name and path of the exported snapshot.</p>"
+        },
+        "IamRoleArn":{
+          "shape":"String",
+          "documentation":"<p>The name of the IAM role that is used to write to Amazon S3 when exporting a snapshot. </p>"
+        },
+        "KmsKeyId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the AWS KMS key that is used to encrypt the snapshot when it's exported to Amazon S3. The KMS key ID is the Amazon Resource Name (ARN), the KMS key identifier, or the KMS key alias for the KMS encryption key. The IAM role used for the snapshot export must have encryption and decryption permissions to use this KMS key. </p>"
+        },
+        "Status":{
+          "shape":"String",
+          "documentation":"<p>The progress status of the export task.</p>"
+        },
+        "PercentProgress":{
+          "shape":"Integer",
+          "documentation":"<p>The progress of the snapshot export task as a percentage.</p>"
+        },
+        "TotalExtractedDataInGB":{
+          "shape":"Integer",
+          "documentation":"<p>The total amount of data exported, in gigabytes.</p>"
+        },
+        "FailureCause":{
+          "shape":"String",
+          "documentation":"<p>The reason the export failed, if it failed.</p>"
+        },
+        "WarningMessage":{
+          "shape":"String",
+          "documentation":"<p>A warning about the snapshot export task.</p>"
+        }
+      },
+      "documentation":"<p>Contains the details of a snapshot export to Amazon S3. </p> <p>This data type is used as a response element in the <code>DescribeExportTasks</code> action. </p>"
+    },
+    "ExportTaskAlreadyExistsFault":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>You can't start an export task that's already running.</p>",
+      "error":{
+        "code":"ExportTaskAlreadyExists",
+        "httpStatusCode":400,
+        "senderFault":true
+      },
+      "exception":true
+    },
+    "ExportTaskNotFoundFault":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>The export task doesn't exist.</p>",
       "error":{
-        "code":"EventSubscriptionQuotaExceeded",
-        "httpStatusCode":400,
+        "code":"ExportTaskNotFound",
+        "httpStatusCode":404,
         "senderFault":true
       },
       "exception":true
     },
-    "EventSubscriptionsList":{
+    "ExportTasksList":{
       "type":"list",
       "member":{
-        "shape":"EventSubscription",
-        "locationName":"EventSubscription"
+        "shape":"ExportTask",
+        "locationName":"ExportTask"
       }
     },
-    "EventSubscriptionsMessage":{
-      "type":"structure",
-      "members":{
-        "Marker":{
-          "shape":"String",
-          "documentation":"<p> An optional pagination token provided by a previous DescribeOrderableDBInstanceOptions request. If this parameter is specified, the response includes only records beyond the marker, up to the value specified by <code>MaxRecords</code>. </p>"
-        },
-        "EventSubscriptionsList":{
-          "shape":"EventSubscriptionsList",
-          "documentation":"<p>A list of EventSubscriptions data types.</p>"
-        }
-      },
-      "documentation":"<p>Data returned by the <b>DescribeEventSubscriptions</b> action.</p>"
-    },
-    "EventsMessage":{
+    "ExportTasksMessage":{
       "type":"structure",
       "members":{
         "Marker":{
           "shape":"String",
-          "documentation":"<p> An optional pagination token provided by a previous Events request. If this parameter is specified, the response includes only records beyond the marker, up to the value specified by <code>MaxRecords</code> . </p>"
+          "documentation":"<p>A pagination token that can be used in a later <code>DescribeExportTasks</code> request. A marker is used for pagination to identify the location to begin output for the next response of <code>DescribeExportTasks</code>.</p>"
         },
-        "Events":{
-          "shape":"EventList",
-          "documentation":"<p> A list of <code>Event</code> instances. </p>"
+        "ExportTasks":{
+          "shape":"ExportTasksList",
+          "documentation":"<p>Information about an export of a snapshot to Amazon S3.</p>"
         }
-      },
-      "documentation":"<p> Contains the result of a successful invocation of the <code>DescribeEvents</code> action. </p>"
+      }
     },
     "FailoverDBClusterMessage":{
       "type":"structure",
@@ -7250,7 +8154,7 @@
       "members":{
         "DBClusterIdentifier":{
           "shape":"String",
-          "documentation":"<p>A DB cluster identifier to force a failover for. This parameter is not case-sensitive.</p> <p>Constraints:</p> <ul> <li> <p>Must match the identifier of an existing DBCluster.</p> </li> </ul>"
+          "documentation":"<p>A DB cluster identifier to force a failover for. This parameter isn't case-sensitive.</p> <p>Constraints:</p> <ul> <li> <p>Must match the identifier of an existing DBCluster.</p> </li> </ul>"
         },
         "TargetDBInstanceIdentifier":{
           "shape":"String",
@@ -7430,6 +8334,13 @@
         }
       }
     },
+    "IAMAuthMode":{
+      "type":"string",
+      "enum":[
+        "DISABLED",
+        "REQUIRED"
+      ]
+    },
     "IPRange":{
       "type":"structure",
       "members":{
@@ -7451,6 +8362,30 @@
         "locationName":"IPRange"
       }
     },
+    "IamRoleMissingPermissionsFault":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>The IAM role requires additional permissions to export to an Amazon S3 bucket.</p>",
+      "error":{
+        "code":"IamRoleMissingPermissions",
+        "httpStatusCode":400,
+        "senderFault":true
+      },
+      "exception":true
+    },
+    "IamRoleNotFoundFault":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>The IAM role is missing for exporting to an Amazon S3 bucket.</p>",
+      "error":{
+        "code":"IamRoleNotFound",
+        "httpStatusCode":404,
+        "senderFault":true
+      },
+      "exception":true
+    },
     "ImportInstallationMediaMessage":{
       "type":"structure",
       "required":[
@@ -7467,19 +8402,19 @@
         },
         "Engine":{
           "shape":"String",
-          "documentation":"<p>The name of the database engine to be used for this instance. </p> <p>The list only includes supported on-premises, bring your own media (BYOM) DB engines. </p> <p>Valid Values: </p> <ul> <li> <p> <code>sqlserver-ee</code> </p> </li> <li> <p> <code>sqlserver-se</code> </p> </li> <li> <p> <code>sqlserver-ex</code> </p> </li> <li> <p> <code>sqlserver-web</code> </p> </li> </ul>"
+          "documentation":"<p>The name of the database engine to be used for this instance. </p> <p>The list only includes supported DB engines that require an on-premises customer provided license. </p> <p>Valid Values: </p> <ul> <li> <p> <code>sqlserver-ee</code> </p> </li> <li> <p> <code>sqlserver-se</code> </p> </li> <li> <p> <code>sqlserver-ex</code> </p> </li> <li> <p> <code>sqlserver-web</code> </p> </li> </ul>"
         },
         "EngineVersion":{
           "shape":"String",
-          "documentation":"<p>The version number of the database engine to use.</p> <p>For a list of valid engine versions, call <a>DescribeDBEngineVersions</a>.</p> <p>The following are the database engines and links to information about the major and minor versions. The list only includes supported on-premises, bring your own media (BYOM) DB engines.</p> <p> <b>Microsoft SQL Server</b> </p> <p>See <a href=\"https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/CHAP_SQLServer.html#SQLServer.Concepts.General.FeatureSupport\">Version and Feature Support on Amazon RDS</a> in the <i>Amazon RDS User Guide.</i> </p>"
+          "documentation":"<p>The version number of the database engine to use.</p> <p>For a list of valid engine versions, call <a>DescribeDBEngineVersions</a>.</p> <p>The following are the database engines and links to information about the major and minor versions. The list only includes DB engines that require an on-premises customer provided license.</p> <p> <b>Microsoft SQL Server</b> </p> <p>See <a href=\"https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/CHAP_SQLServer.html#SQLServer.Concepts.General.FeatureSupport\">Version and Feature Support on Amazon RDS</a> in the <i>Amazon RDS User Guide.</i> </p>"
         },
         "EngineInstallationMediaPath":{
           "shape":"String",
-          "documentation":"<p>The path to the installation media for the specified DB engine.</p> <p>Example: <code>SQLServerISO/en_sql_server_2016_enterprise_x64_dvd_8701793.iso</code> </p>"
+          "documentation":"<p>The path to the installation medium for the specified DB engine.</p> <p>Example: <code>SQLServerISO/en_sql_server_2016_enterprise_x64_dvd_8701793.iso</code> </p>"
         },
         "OSInstallationMediaPath":{
           "shape":"String",
-          "documentation":"<p>The path to the installation media for the operating system associated with the specified DB engine.</p> <p>Example: <code>WindowsISO/en_windows_server_2016_x64_dvd_9327751.iso</code> </p>"
+          "documentation":"<p>The path to the installation medium for the operating system associated with the specified DB engine.</p> <p>Example: <code>WindowsISO/en_windows_server_2016_x64_dvd_9327751.iso</code> </p>"
         }
       }
     },
@@ -7488,7 +8423,7 @@
       "members":{
         "InstallationMediaId":{
           "shape":"String",
-          "documentation":"<p>The installation media ID.</p>"
+          "documentation":"<p>The installation medium ID.</p>"
         },
         "CustomAvailabilityZoneId":{
           "shape":"String",
@@ -7504,28 +8439,28 @@
         },
         "EngineInstallationMediaPath":{
           "shape":"String",
-          "documentation":"<p>The path to the installation media for the DB engine.</p>"
+          "documentation":"<p>The path to the installation medium for the DB engine.</p>"
         },
         "OSInstallationMediaPath":{
           "shape":"String",
-          "documentation":"<p>The path to the installation media for the operating system associated with the DB engine.</p>"
+          "documentation":"<p>The path to the installation medium for the operating system associated with the DB engine.</p>"
         },
         "Status":{
           "shape":"String",
-          "documentation":"<p>The status of the installation media.</p>"
+          "documentation":"<p>The status of the installation medium.</p>"
         },
         "FailureCause":{
           "shape":"InstallationMediaFailureCause",
           "documentation":"<p>If an installation media failure occurred, the cause of the failure.</p>"
         }
       },
-      "documentation":"<p>Contains the installation media for on-premises, bring your own media (BYOM) DB engines, such as Microsoft SQL Server.</p>"
+      "documentation":"<p>Contains the installation media for a DB engine that requires an on-premises customer provided license, such as Microsoft SQL Server.</p>"
     },
     "InstallationMediaAlreadyExistsFault":{
       "type":"structure",
       "members":{
       },
-      "documentation":"<p>The specified installation media has already been imported.</p>",
+      "documentation":"<p>The specified installation medium has already been imported.</p>",
       "error":{
         "code":"InstallationMediaAlreadyExists",
         "httpStatusCode":400,
@@ -7541,7 +8476,7 @@
           "documentation":"<p>The reason that an installation media import failed.</p>"
         }
       },
-      "documentation":"<p>Contains the cause of an installation media failure. Installation media is used for on-premises, bring your own media (BYOM) DB engines, such as Microsoft SQL Server.</p>"
+      "documentation":"<p>Contains the cause of an installation media failure. Installation media is used for a DB engine that requires an on-premises customer provided license, such as Microsoft SQL Server.</p>"
     },
     "InstallationMediaList":{
       "type":"list",
@@ -7567,7 +8502,7 @@
       "type":"structure",
       "members":{
       },
-      "documentation":"<p> <code>InstallationMediaID</code> doesn't refer to an existing installation media.</p>",
+      "documentation":"<p> <code>InstallationMediaID</code> doesn't refer to an existing installation medium.</p>",
       "error":{
         "code":"InstallationMediaNotFound",
         "httpStatusCode":404,
@@ -7709,6 +8644,18 @@
       },
       "exception":true
     },
+    "InvalidDBProxyStateFault":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>The requested operation can't be performed while the proxy is in this state.</p>",
+      "error":{
+        "code":"InvalidDBProxyStateFault",
+        "httpStatusCode":400,
+        "senderFault":true
+      },
+      "exception":true
+    },
     "InvalidDBSecurityGroupStateFault":{
       "type":"structure",
       "members":{
@@ -7781,6 +8728,42 @@
       },
       "exception":true
     },
+    "InvalidExportOnlyFault":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>The export is invalid for exporting to an Amazon S3 bucket.</p>",
+      "error":{
+        "code":"InvalidExportOnly",
+        "httpStatusCode":400,
+        "senderFault":true
+      },
+      "exception":true
+    },
+    "InvalidExportSourceStateFault":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>The state of the export snapshot is invalid for exporting to an Amazon S3 bucket.</p>",
+      "error":{
+        "code":"InvalidExportSourceState",
+        "httpStatusCode":400,
+        "senderFault":true
+      },
+      "exception":true
+    },
+    "InvalidExportTaskStateFault":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>You can't cancel an export task that has completed.</p>",
+      "error":{
+        "code":"InvalidExportTaskStateFault",
+        "httpStatusCode":400,
+        "senderFault":true
+      },
+      "exception":true
+    },
     "InvalidGlobalClusterStateFault":{
       "type":"structure",
       "members":{
@@ -7879,7 +8862,7 @@
         },
         "Filters":{
           "shape":"FilterList",
-          "documentation":"<p>This parameter is not currently supported.</p>"
+          "documentation":"<p>This parameter isn't currently supported.</p>"
         }
       },
       "documentation":"<p/>"
@@ -7890,6 +8873,11 @@
     },
     "Long":{"type":"long"},
     "LongOptional":{"type":"long"},
+    "MaxRecords":{
+      "type":"integer",
+      "max":100,
+      "min":20
+    },
     "MinimumEngineVersionPerAllowedValue":{
       "type":"structure",
       "members":{
@@ -7911,17 +8899,36 @@
         "locationName":"MinimumEngineVersionPerAllowedValue"
       }
     },
+    "ModifyCertificatesMessage":{
+      "type":"structure",
+      "members":{
+        "CertificateIdentifier":{
+          "shape":"String",
+          "documentation":"<p>The new default certificate identifier to override the current one with.</p> <p>To determine the valid values, use the <code>describe-certificates</code> AWS CLI command or the <code>DescribeCertificates</code> API operation.</p>"
+        },
+        "RemoveCustomerOverride":{
+          "shape":"BooleanOptional",
+          "documentation":"<p>A value that indicates whether to remove the override for the default certificate. If the override is removed, the default certificate is the system default.</p>"
+        }
+      }
+    },
+    "ModifyCertificatesResult":{
+      "type":"structure",
+      "members":{
+        "Certificate":{"shape":"Certificate"}
+      }
+    },
     "ModifyCurrentDBClusterCapacityMessage":{
       "type":"structure",
       "required":["DBClusterIdentifier"],
       "members":{
         "DBClusterIdentifier":{
           "shape":"String",
-          "documentation":"<p>The DB cluster identifier for the cluster being modified. This parameter is not case-sensitive.</p> <p>Constraints:</p> <ul> <li> <p>Must match the identifier of an existing DB cluster.</p> </li> </ul>"
+          "documentation":"<p>The DB cluster identifier for the cluster being modified. This parameter isn't case-sensitive.</p> <p>Constraints:</p> <ul> <li> <p>Must match the identifier of an existing DB cluster.</p> </li> </ul>"
         },
         "Capacity":{
           "shape":"IntegerOptional",
-          "documentation":"<p>The DB cluster capacity.</p> <p>When you change the capacity of a paused Aurora Serverless DB cluster, it automatically resumes.</p> <p>Constraints:</p> <ul> <li> <p>Value must be <code>1</code>, <code>2</code>, <code>4</code>, <code>8</code>, <code>16</code>, <code>32</code>, <code>64</code>, <code>128</code>, or <code>256</code>.</p> </li> </ul>"
+          "documentation":"<p>The DB cluster capacity.</p> <p>When you change the capacity of a paused Aurora Serverless DB cluster, it automatically resumes.</p> <p>Constraints:</p> <ul> <li> <p>For Aurora MySQL, valid capacity values are <code>1</code>, <code>2</code>, <code>4</code>, <code>8</code>, <code>16</code>, <code>32</code>, <code>64</code>, <code>128</code>, and <code>256</code>.</p> </li> <li> <p>For Aurora PostgreSQL, valid capacity values are <code>2</code>, <code>4</code>, <code>8</code>, <code>16</code>, <code>32</code>, <code>64</code>, <code>192</code>, and <code>384</code>.</p> </li> </ul>"
         },
         "SecondsBeforeTimeout":{
           "shape":"IntegerOptional",
@@ -7929,7 +8936,7 @@
         },
         "TimeoutAction":{
           "shape":"String",
-          "documentation":"<p>The action to take when the timeout is reached, either <code>ForceApplyCapacityChange</code> or <code>RollbackCapacityChange</code>.</p> <p> <code>ForceApplyCapacityChange</code>, the default, sets the capacity to the specified value as soon as possible.</p> <p> <code>RollbackCapacityChange</code> ignores the capacity change if a scaling point is not found in the timeout period.</p>"
+          "documentation":"<p>The action to take when the timeout is reached, either <code>ForceApplyCapacityChange</code> or <code>RollbackCapacityChange</code>.</p> <p> <code>ForceApplyCapacityChange</code>, the default, sets the capacity to the specified value as soon as possible.</p> <p> <code>RollbackCapacityChange</code> ignores the capacity change if a scaling point isn't found in the timeout period.</p>"
         }
       }
     },
@@ -7961,7 +8968,7 @@
       "members":{
         "DBClusterIdentifier":{
           "shape":"String",
-          "documentation":"<p>The DB cluster identifier for the cluster being modified. This parameter is not case-sensitive.</p> <p>Constraints: This identifier must match the identifier of an existing DB cluster.</p>"
+          "documentation":"<p>The DB cluster identifier for the cluster being modified. This parameter isn't case-sensitive.</p> <p>Constraints: This identifier must match the identifier of an existing DB cluster.</p>"
         },
         "NewDBClusterIdentifier":{
           "shape":"String",
@@ -8027,6 +9034,14 @@
           "shape":"String",
           "documentation":"<p>The name of the DB parameter group to apply to all instances of the DB cluster. </p> <note> <p>When you apply a parameter group using the <code>DBInstanceParameterGroupName</code> parameter, the DB cluster isn't rebooted automatically. Also, parameter changes aren't applied during the next maintenance window but instead are applied immediately.</p> </note> <p>Default: The existing name setting</p> <p>Constraints:</p> <ul> <li> <p>The DB parameter group must be in the same DB parameter group family as this DB cluster.</p> </li> <li> <p>The <code>DBInstanceParameterGroupName</code> parameter is only valid in combination with the <code>AllowMajorVersionUpgrade</code> parameter.</p> </li> </ul>"
         },
+        "Domain":{
+          "shape":"String",
+          "documentation":"<p>The Active Directory directory ID to move the DB cluster to. Specify <code>none</code> to remove the cluster from its current domain. The domain must be created prior to this operation. </p>"
+        },
+        "DomainIAMRoleName":{
+          "shape":"String",
+          "documentation":"<p>Specify the name of the IAM role to be used when making API calls to the Directory Service.</p>"
+        },
         "ScalingConfiguration":{
           "shape":"ScalingConfiguration",
           "documentation":"<p>The scaling properties of the DB cluster. You can only modify scaling properties for DB clusters in <code>serverless</code> DB engine mode.</p>"
@@ -8120,7 +9135,7 @@
         },
         "DBSubnetGroupName":{
           "shape":"String",
-          "documentation":"<p>The new DB subnet group for the DB instance. You can use this parameter to move your DB instance to a different VPC. If your DB instance is not in a VPC, you can also use this parameter to move your DB instance into a VPC. For more information, see <a href=\"http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_VPC.WorkingWithRDSInstanceinaVPC.html#USER_VPC.Non-VPC2VPC\">Updating the VPC for a DB Instance</a> in the <i>Amazon RDS User Guide.</i> </p> <p>Changing the subnet group causes an outage during the change. The change is applied during the next maintenance window, unless you enable <code>ApplyImmediately</code>. </p> <p>Constraints: If supplied, must match the name of an existing DBSubnetGroup.</p> <p>Example: <code>mySubnetGroup</code> </p>"
+          "documentation":"<p>The new DB subnet group for the DB instance. You can use this parameter to move your DB instance to a different VPC. If your DB instance isn't in a VPC, you can also use this parameter to move your DB instance into a VPC. For more information, see <a href=\"http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_VPC.WorkingWithRDSInstanceinaVPC.html#USER_VPC.Non-VPC2VPC\">Updating the VPC for a DB Instance</a> in the <i>Amazon RDS User Guide.</i> </p> <p>Changing the subnet group causes an outage during the change. The change is applied during the next maintenance window, unless you enable <code>ApplyImmediately</code>. </p> <p>Constraints: If supplied, must match the name of an existing DBSubnetGroup.</p> <p>Example: <code>mySubnetGroup</code> </p>"
         },
         "DBSecurityGroups":{
           "shape":"DBSecurityGroupNameList",
@@ -8220,7 +9235,7 @@
         },
         "PubliclyAccessible":{
           "shape":"BooleanOptional",
-          "documentation":"<p>A value that indicates whether the DB instance is publicly accessible. When the DB instance is publicly accessible, it is an Internet-facing instance with a publicly resolvable DNS name, which resolves to a public IP address. When the DB instance is not publicly accessible, it is an internal instance with a DNS name that resolves to a private IP address. </p> <p> <code>PubliclyAccessible</code> only applies to DB instances in a VPC. The DB instance must be part of a public subnet and <code>PubliclyAccessible</code> must be enabled for it to be publicly accessible. </p> <p>Changes to the <code>PubliclyAccessible</code> parameter are applied immediately regardless of the value of the <code>ApplyImmediately</code> parameter.</p>"
+          "documentation":"<p>A value that indicates whether the DB instance is publicly accessible. When the DB instance is publicly accessible, it is an Internet-facing instance with a publicly resolvable DNS name, which resolves to a public IP address. When the DB instance isn't publicly accessible, it is an internal instance with a DNS name that resolves to a private IP address. </p> <p> <code>PubliclyAccessible</code> only applies to DB instances in a VPC. The DB instance must be part of a public subnet and <code>PubliclyAccessible</code> must be enabled for it to be publicly accessible. </p> <p>Changes to the <code>PubliclyAccessible</code> parameter are applied immediately regardless of the value of the <code>ApplyImmediately</code> parameter.</p>"
         },
         "MonitoringRoleArn":{
           "shape":"String",
@@ -8269,6 +9284,10 @@
         "MaxAllocatedStorage":{
           "shape":"IntegerOptional",
           "documentation":"<p>The upper limit to which Amazon RDS can automatically scale the storage of the DB instance.</p>"
+        },
+        "CertificateRotationRestart":{
+          "shape":"BooleanOptional",
+          "documentation":"<p>A value that indicates whether the DB instance is restarted when you rotate your SSL/TLS certificate.</p> <p>By default, the DB instance is restarted when you rotate your SSL/TLS certificate. The certificate is not updated until the DB instance is restarted.</p> <important> <p>Set this parameter only if you are <i>not</i> using SSL/TLS to connect to the DB instance.</p> </important> <p>If you are using SSL/TLS to connect to the DB instance, follow the appropriate instructions for your DB engine to rotate your SSL/TLS certificate:</p> <ul> <li> <p>For more information about rotating your SSL/TLS certificate for RDS DB engines, see <a href=\"https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/UsingWithRDS.SSL-certificate-rotation.html\"> Rotating Your SSL/TLS Certificate.</a> in the <i>Amazon RDS User Guide.</i> </p> </li> <li> <p>For more information about rotating your SSL/TLS certificate for Aurora DB engines, see <a href=\"https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/UsingWithRDS.SSL-certificate-rotation.html\"> Rotating Your SSL/TLS Certificate</a> in the <i>Amazon Aurora User Guide.</i> </p> </li> </ul>"
         }
       },
       "documentation":"<p/>"
@@ -8292,11 +9311,92 @@
         },
         "Parameters":{
           "shape":"ParametersList",
-          "documentation":"<p>An array of parameter names, values, and the apply method for the parameter update. At least one parameter name, value, and apply method must be supplied; subsequent arguments are optional. A maximum of 20 parameters can be modified in a single request.</p> <p>Valid Values (for the application method): <code>immediate | pending-reboot</code> </p> <note> <p>You can use the immediate value with dynamic parameters only. You can use the pending-reboot value for both dynamic and static parameters, and changes are applied when you reboot the DB instance without failover.</p> </note>"
+          "documentation":"<p>An array of parameter names, values, and the apply method for the parameter update. At least one parameter name, value, and apply method must be supplied; later arguments are optional. A maximum of 20 parameters can be modified in a single request.</p> <p>Valid Values (for the application method): <code>immediate | pending-reboot</code> </p> <note> <p>You can use the immediate value with dynamic parameters only. You can use the pending-reboot value for both dynamic and static parameters, and changes are applied when you reboot the DB instance without failover.</p> </note>"
         }
       },
       "documentation":"<p/>"
     },
+    "ModifyDBProxyRequest":{
+      "type":"structure",
+      "required":["DBProxyName"],
+      "members":{
+        "DBProxyName":{
+          "shape":"String",
+          "documentation":"<p>The identifier for the <code>DBProxy</code> to modify.</p>"
+        },
+        "NewDBProxyName":{
+          "shape":"String",
+          "documentation":"<p>The new identifier for the <code>DBProxy</code>. An identifier must begin with a letter and must contain only ASCII letters, digits, and hyphens; it can't end with a hyphen or contain two consecutive hyphens.</p>"
+        },
+        "Auth":{
+          "shape":"UserAuthConfigList",
+          "documentation":"<p>The new authentication settings for the <code>DBProxy</code>.</p>"
+        },
+        "RequireTLS":{
+          "shape":"BooleanOptional",
+          "documentation":"<p>Whether Transport Layer Security (TLS) encryption is required for connections to the proxy. By enabling this setting, you can enforce encrypted TLS connections to the proxy, even if the associated database doesn't use TLS.</p>"
+        },
+        "IdleClientTimeout":{
+          "shape":"IntegerOptional",
+          "documentation":"<p>The number of seconds that a connection to the proxy can be inactive before the proxy disconnects it. You can set this value higher or lower than the connection timeout limit for the associated database.</p>"
+        },
+        "DebugLogging":{
+          "shape":"BooleanOptional",
+          "documentation":"<p>Whether the proxy includes detailed information about SQL statements in its logs. This information helps you to debug issues involving SQL behavior or the performance and scalability of the proxy connections. The debug information includes the text of SQL statements that you submit through the proxy. Thus, only enable this setting when needed for debugging, and only when you have security measures in place to safeguard any sensitive information that appears in the logs.</p>"
+        },
+        "RoleArn":{
+          "shape":"String",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the IAM role that the proxy uses to access secrets in AWS Secrets Manager.</p>"
+        },
+        "SecurityGroups":{
+          "shape":"StringList",
+          "documentation":"<p>The new list of security groups for the <code>DBProxy</code>.</p>"
+        }
+      }
+    },
+    "ModifyDBProxyResponse":{
+      "type":"structure",
+      "members":{
+        "DBProxy":{
+          "shape":"DBProxy",
+          "documentation":"<p>The <code>DBProxy</code> object representing the new settings for the proxy.</p>"
+        }
+      }
+    },
+    "ModifyDBProxyTargetGroupRequest":{
+      "type":"structure",
+      "required":[
+        "TargetGroupName",
+        "DBProxyName"
+      ],
+      "members":{
+        "TargetGroupName":{
+          "shape":"String",
+          "documentation":"<p>The name of the new target group to assign to the proxy.</p>"
+        },
+        "DBProxyName":{
+          "shape":"String",
+          "documentation":"<p>The name of the new proxy to which to assign the target group.</p>"
+        },
+        "ConnectionPoolConfig":{
+          "shape":"ConnectionPoolConfiguration",
+          "documentation":"<p>The settings that determine the size and behavior of the connection pool for the target group.</p>"
+        },
+        "NewName":{
+          "shape":"String",
+          "documentation":"<p>The new name for the modified <code>DBProxyTarget</code>. An identifier must begin with a letter and must contain only ASCII letters, digits, and hyphens; it can't end with a hyphen or contain two consecutive hyphens.</p>"
+        }
+      }
+    },
+    "ModifyDBProxyTargetGroupResponse":{
+      "type":"structure",
+      "members":{
+        "DBProxyTargetGroup":{
+          "shape":"DBProxyTargetGroup",
+          "documentation":"<p>The settings of the modified <code>DBProxyTarget</code>.</p>"
+        }
+      }
+    },
     "ModifyDBSnapshotAttributeMessage":{
       "type":"structure",
       "required":[
@@ -8339,7 +9439,7 @@
         },
         "EngineVersion":{
           "shape":"String",
-          "documentation":"<p>The engine version to upgrade the DB snapshot to. </p> <p>The following are the database engines and engine versions that are available when you upgrade a DB snapshot. </p> <p> <b>MySQL</b> </p> <ul> <li> <p> <code>5.5.46</code> (supported for 5.1 DB snapshots)</p> </li> </ul> <p> <b>Oracle</b> </p> <ul> <li> <p> <code>12.1.0.2.v8</code> (supported for 12.1.0.1 DB snapshots)</p> </li> <li> <p> <code>11.2.0.4.v12</code> (supported for 11.2.0.2 DB snapshots)</p> </li> <li> <p> <code>11.2.0.4.v11</code> (supported for 11.2.0.3 DB snapshots)</p> </li> </ul>"
+          "documentation":"<p>The engine version to upgrade the DB snapshot to. </p> <p>The following are the database engines and engine versions that are available when you upgrade a DB snapshot. </p> <p> <b>MySQL</b> </p> <ul> <li> <p> <code>5.5.46</code> (supported for 5.1 DB snapshots)</p> </li> </ul> <p> <b>Oracle</b> </p> <ul> <li> <p> <code>12.1.0.2.v8</code> (supported for 12.1.0.1 DB snapshots)</p> </li> <li> <p> <code>11.2.0.4.v12</code> (supported for 11.2.0.2 DB snapshots)</p> </li> <li> <p> <code>11.2.0.4.v11</code> (supported for 11.2.0.3 DB snapshots)</p> </li> </ul> <p> <b>PostgreSQL</b> </p> <p>For the list of engine versions that are available for upgrading a DB snapshot, see <a href=\"https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_UpgradeDBInstance.PostgreSQL.html#USER_UpgradeDBInstance.PostgreSQL.MajorVersion\"> Upgrading the PostgreSQL DB Engine for Amazon RDS</a>. </p>"
         },
         "OptionGroupName":{
           "shape":"String",
@@ -8395,7 +9495,7 @@
         },
         "SourceType":{
           "shape":"String",
-          "documentation":"<p>The type of source that is generating the events. For example, if you want to be notified of events generated by a DB instance, you would set this parameter to db-instance. if this value is not specified, all events are returned.</p> <p>Valid values: db-instance | db-parameter-group | db-security-group | db-snapshot</p>"
+          "documentation":"<p>The type of source that is generating the events. For example, if you want to be notified of events generated by a DB instance, you would set this parameter to db-instance. If this value isn't specified, all events are returned.</p> <p>Valid values: db-instance | db-parameter-group | db-security-group | db-snapshot</p>"
         },
         "EventCategories":{
           "shape":"EventCategoriesList",
@@ -8419,7 +9519,7 @@
       "members":{
         "GlobalClusterIdentifier":{
           "shape":"String",
-          "documentation":"<p> The DB cluster identifier for the global cluster being modified. This parameter is not case-sensitive. </p> <p>Constraints:</p> <ul> <li> <p>Must match the identifier of an existing global database cluster.</p> </li> </ul>"
+          "documentation":"<p> The DB cluster identifier for the global cluster being modified. This parameter isn't case-sensitive. </p> <p>Constraints:</p> <ul> <li> <p>Must match the identifier of an existing global database cluster.</p> </li> </ul>"
         },
         "NewGlobalClusterIdentifier":{
           "shape":"String",
@@ -9099,7 +10199,7 @@
       "members":{
         "Action":{
           "shape":"String",
-          "documentation":"<p>The type of pending maintenance action that is available for the resource. Valid actions are <code>system-update</code>, <code>db-upgrade</code>, and <code>hardware-maintenance</code>.</p>"
+          "documentation":"<p>The type of pending maintenance action that is available for the resource. Valid actions are <code>system-update</code>, <code>db-upgrade</code>, <code>hardware-maintenance</code>, and <code>ca-certificate-rotation</code>.</p>"
         },
         "AutoAppliedAfterDate":{
           "shape":"TStamp",
@@ -9254,7 +10354,7 @@
       "members":{
         "DBClusterIdentifier":{
           "shape":"String",
-          "documentation":"<p>The identifier of the DB cluster Read Replica to promote. This parameter is not case-sensitive. </p> <p>Constraints:</p> <ul> <li> <p>Must match the identifier of an existing DBCluster Read Replica.</p> </li> </ul> <p>Example: <code>my-cluster-replica1</code> </p>"
+          "documentation":"<p>The identifier of the DB cluster Read Replica to promote. This parameter isn't case-sensitive. </p> <p>Constraints:</p> <ul> <li> <p>Must match the identifier of an existing DBCluster Read Replica.</p> </li> </ul> <p>Example: <code>my-cluster-replica1</code> </p>"
         }
       },
       "documentation":"<p/>"
@@ -9388,7 +10488,7 @@
         },
         "ForceFailover":{
           "shape":"BooleanOptional",
-          "documentation":"<p> A value that indicates whether the reboot is conducted through a Multi-AZ failover. </p> <p>Constraint: You can't enable force failover if the instance is not configured for Multi-AZ.</p>"
+          "documentation":"<p> A value that indicates whether the reboot is conducted through a Multi-AZ failover. </p> <p>Constraint: You can't enable force failover if the instance isn't configured for Multi-AZ.</p>"
         }
       },
       "documentation":"<p/>"
@@ -9421,6 +10521,37 @@
         "locationName":"RecurringCharge"
       }
     },
+    "RegisterDBProxyTargetsRequest":{
+      "type":"structure",
+      "required":["DBProxyName"],
+      "members":{
+        "DBProxyName":{
+          "shape":"String",
+          "documentation":"<p>The identifier of the <code>DBProxy</code> that is associated with the <code>DBProxyTargetGroup</code>.</p>"
+        },
+        "TargetGroupName":{
+          "shape":"String",
+          "documentation":"<p>The identifier of the <code>DBProxyTargetGroup</code>.</p>"
+        },
+        "DBInstanceIdentifiers":{
+          "shape":"StringList",
+          "documentation":"<p>One or more DB instance identifiers.</p>"
+        },
+        "DBClusterIdentifiers":{
+          "shape":"StringList",
+          "documentation":"<p>One or more DB cluster identifiers.</p>"
+        }
+      }
+    },
+    "RegisterDBProxyTargetsResponse":{
+      "type":"structure",
+      "members":{
+        "DBProxyTargets":{
+          "shape":"TargetList",
+          "documentation":"<p>One or more <code>DBProxyTarget</code> objects that are created when you register targets with a target group.</p>"
+        }
+      }
+    },
     "RemoveFromGlobalClusterMessage":{
       "type":"structure",
       "members":{
@@ -9923,6 +11054,14 @@
         "CopyTagsToSnapshot":{
           "shape":"BooleanOptional",
           "documentation":"<p>A value that indicates whether to copy all tags from the restored DB cluster to snapshots of the restored DB cluster. The default is not to copy them.</p>"
+        },
+        "Domain":{
+          "shape":"String",
+          "documentation":"<p>Specify the Active Directory directory ID to restore the DB cluster in. The domain must be created prior to this operation. </p> <p> For Amazon Aurora DB clusters, Amazon RDS can use Kerberos Authentication to authenticate users that connect to the DB cluster. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/aurmysql-kerberos.html\">Using Kerberos Authentication for Aurora MySQL</a> in the <i>Amazon Aurora User Guide</i>. </p>"
+        },
+        "DomainIAMRoleName":{
+          "shape":"String",
+          "documentation":"<p>Specify the name of the IAM role to be used when making API calls to the Directory Service.</p>"
         }
       }
     },
@@ -9958,7 +11097,7 @@
         },
         "EngineVersion":{
           "shape":"String",
-          "documentation":"<p>The version of the database engine to use for the new DB cluster.</p> <p>To list all of the available engine versions for <code>aurora</code> (for MySQL 5.6-compatible Aurora), use the following command:</p> <p> <code>aws rds describe-db-engine-versions --engine aurora --query \"DBEngineVersions[].EngineVersion\"</code> </p> <p>To list all of the available engine versions for <code>aurora-mysql</code> (for MySQL 5.7-compatible Aurora), use the following command:</p> <p> <code>aws rds describe-db-engine-versions --engine aurora-mysql --query \"DBEngineVersions[].EngineVersion\"</code> </p> <p>To list all of the available engine versions for <code>aurora-postgresql</code>, use the following command:</p> <p> <code>aws rds describe-db-engine-versions --engine aurora-postgresql --query \"DBEngineVersions[].EngineVersion\"</code> </p> <p> <b>Aurora MySQL</b> </p> <p>Example: <code>5.6.10a</code>, <code>5.6.mysql_aurora.1.19.2</code>, <code>5.7.12</code>, <code>5.7.mysql_aurora.2.04.5</code> </p> <p> <b>Aurora PostgreSQL</b> </p> <p>Example: <code>9.6.3</code>, <code>10.7</code> </p>"
+          "documentation":"<p>The version of the database engine to use for the new DB cluster.</p> <p>To list all of the available engine versions for <code>aurora</code> (for MySQL 5.6-compatible Aurora), use the following command:</p> <p> <code>aws rds describe-db-engine-versions --engine aurora --query \"DBEngineVersions[].EngineVersion\"</code> </p> <p>To list all of the available engine versions for <code>aurora-mysql</code> (for MySQL 5.7-compatible Aurora), use the following command:</p> <p> <code>aws rds describe-db-engine-versions --engine aurora-mysql --query \"DBEngineVersions[].EngineVersion\"</code> </p> <p>To list all of the available engine versions for <code>aurora-postgresql</code>, use the following command:</p> <p> <code>aws rds describe-db-engine-versions --engine aurora-postgresql --query \"DBEngineVersions[].EngineVersion\"</code> </p> <note> <p>If you aren't using the default engine version, then you must specify the engine version.</p> </note> <p> <b>Aurora MySQL</b> </p> <p>Example: <code>5.6.10a</code>, <code>5.6.mysql_aurora.1.19.2</code>, <code>5.7.12</code>, <code>5.7.mysql_aurora.2.04.5</code> </p> <p> <b>Aurora PostgreSQL</b> </p> <p>Example: <code>9.6.3</code>, <code>10.7</code> </p>"
         },
         "Port":{
           "shape":"IntegerOptional",
@@ -9986,7 +11125,7 @@
         },
         "KmsKeyId":{
           "shape":"String",
-          "documentation":"<p>The AWS KMS key identifier to use when restoring an encrypted DB cluster from a DB snapshot or DB cluster snapshot.</p> <p>The KMS key identifier is the Amazon Resource Name (ARN) for the KMS encryption key. If you are restoring a DB cluster with the same AWS account that owns the KMS encryption key used to encrypt the new DB cluster, then you can use the KMS key alias instead of the ARN for the KMS encryption key.</p> <p>If you don't specify a value for the <code>KmsKeyId</code> parameter, then the following occurs:</p> <ul> <li> <p>If the DB snapshot or DB cluster snapshot in <code>SnapshotIdentifier</code> is encrypted, then the restored DB cluster is encrypted using the KMS key that was used to encrypt the DB snapshot or DB cluster snapshot.</p> </li> <li> <p>If the DB snapshot or DB cluster snapshot in <code>SnapshotIdentifier</code> is not encrypted, then the restored DB cluster is not encrypted.</p> </li> </ul>"
+          "documentation":"<p>The AWS KMS key identifier to use when restoring an encrypted DB cluster from a DB snapshot or DB cluster snapshot.</p> <p>The KMS key identifier is the Amazon Resource Name (ARN) for the KMS encryption key. If you are restoring a DB cluster with the same AWS account that owns the KMS encryption key used to encrypt the new DB cluster, then you can use the KMS key alias instead of the ARN for the KMS encryption key.</p> <p>If you don't specify a value for the <code>KmsKeyId</code> parameter, then the following occurs:</p> <ul> <li> <p>If the DB snapshot or DB cluster snapshot in <code>SnapshotIdentifier</code> is encrypted, then the restored DB cluster is encrypted using the KMS key that was used to encrypt the DB snapshot or DB cluster snapshot.</p> </li> <li> <p>If the DB snapshot or DB cluster snapshot in <code>SnapshotIdentifier</code> isn't encrypted, then the restored DB cluster isn't encrypted.</p> </li> </ul>"
         },
         "EnableIAMDatabaseAuthentication":{
           "shape":"BooleanOptional",
@@ -10019,6 +11158,14 @@
         "CopyTagsToSnapshot":{
           "shape":"BooleanOptional",
           "documentation":"<p>A value that indicates whether to copy all tags from the restored DB cluster to snapshots of the restored DB cluster. The default is not to copy them.</p>"
+        },
+        "Domain":{
+          "shape":"String",
+          "documentation":"<p>Specify the Active Directory directory ID to restore the DB cluster in. The domain must be created prior to this operation. </p>"
+        },
+        "DomainIAMRoleName":{
+          "shape":"String",
+          "documentation":"<p>Specify the name of the IAM role to be used when making API calls to the Directory Service.</p>"
         }
       },
       "documentation":"<p/>"
@@ -10050,11 +11197,11 @@
         },
         "RestoreToTime":{
           "shape":"TStamp",
-          "documentation":"<p>The date and time to restore the DB cluster to.</p> <p>Valid Values: Value must be a time in Universal Coordinated Time (UTC) format</p> <p>Constraints:</p> <ul> <li> <p>Must be before the latest restorable time for the DB instance</p> </li> <li> <p>Must be specified if <code>UseLatestRestorableTime</code> parameter is not provided</p> </li> <li> <p>Can't be specified if the <code>UseLatestRestorableTime</code> parameter is enabled</p> </li> <li> <p>Can't be specified if the <code>RestoreType</code> parameter is <code>copy-on-write</code> </p> </li> </ul> <p>Example: <code>2015-03-07T23:45:00Z</code> </p>"
+          "documentation":"<p>The date and time to restore the DB cluster to.</p> <p>Valid Values: Value must be a time in Universal Coordinated Time (UTC) format</p> <p>Constraints:</p> <ul> <li> <p>Must be before the latest restorable time for the DB instance</p> </li> <li> <p>Must be specified if <code>UseLatestRestorableTime</code> parameter isn't provided</p> </li> <li> <p>Can't be specified if the <code>UseLatestRestorableTime</code> parameter is enabled</p> </li> <li> <p>Can't be specified if the <code>RestoreType</code> parameter is <code>copy-on-write</code> </p> </li> </ul> <p>Example: <code>2015-03-07T23:45:00Z</code> </p>"
         },
         "UseLatestRestorableTime":{
           "shape":"Boolean",
-          "documentation":"<p>A value that indicates whether to restore the DB cluster to the latest restorable backup time. By default, the DB cluster is not restored to the latest restorable backup time. </p> <p>Constraints: Can't be specified if <code>RestoreToTime</code> parameter is provided.</p>"
+          "documentation":"<p>A value that indicates whether to restore the DB cluster to the latest restorable backup time. By default, the DB cluster isn't restored to the latest restorable backup time. </p> <p>Constraints: Can't be specified if <code>RestoreToTime</code> parameter is provided.</p>"
         },
         "Port":{
           "shape":"IntegerOptional",
@@ -10075,7 +11222,7 @@
         "Tags":{"shape":"TagList"},
         "KmsKeyId":{
           "shape":"String",
-          "documentation":"<p>The AWS KMS key identifier to use when restoring an encrypted DB cluster from an encrypted DB cluster.</p> <p>The KMS key identifier is the Amazon Resource Name (ARN) for the KMS encryption key. If you are restoring a DB cluster with the same AWS account that owns the KMS encryption key used to encrypt the new DB cluster, then you can use the KMS key alias instead of the ARN for the KMS encryption key.</p> <p>You can restore to a new DB cluster and encrypt the new DB cluster with a KMS key that is different than the KMS key used to encrypt the source DB cluster. The new DB cluster is encrypted with the KMS key identified by the <code>KmsKeyId</code> parameter.</p> <p>If you don't specify a value for the <code>KmsKeyId</code> parameter, then the following occurs:</p> <ul> <li> <p>If the DB cluster is encrypted, then the restored DB cluster is encrypted using the KMS key that was used to encrypt the source DB cluster.</p> </li> <li> <p>If the DB cluster is not encrypted, then the restored DB cluster is not encrypted.</p> </li> </ul> <p>If <code>DBClusterIdentifier</code> refers to a DB cluster that is not encrypted, then the restore request is rejected.</p>"
+          "documentation":"<p>The AWS KMS key identifier to use when restoring an encrypted DB cluster from an encrypted DB cluster.</p> <p>The KMS key identifier is the Amazon Resource Name (ARN) for the KMS encryption key. If you are restoring a DB cluster with the same AWS account that owns the KMS encryption key used to encrypt the new DB cluster, then you can use the KMS key alias instead of the ARN for the KMS encryption key.</p> <p>You can restore to a new DB cluster and encrypt the new DB cluster with a KMS key that is different than the KMS key used to encrypt the source DB cluster. The new DB cluster is encrypted with the KMS key identified by the <code>KmsKeyId</code> parameter.</p> <p>If you don't specify a value for the <code>KmsKeyId</code> parameter, then the following occurs:</p> <ul> <li> <p>If the DB cluster is encrypted, then the restored DB cluster is encrypted using the KMS key that was used to encrypt the source DB cluster.</p> </li> <li> <p>If the DB cluster isn't encrypted, then the restored DB cluster isn't encrypted.</p> </li> </ul> <p>If <code>DBClusterIdentifier</code> refers to a DB cluster that isn't encrypted, then the restore request is rejected.</p>"
         },
         "EnableIAMDatabaseAuthentication":{
           "shape":"BooleanOptional",
@@ -10100,6 +11247,14 @@
         "CopyTagsToSnapshot":{
           "shape":"BooleanOptional",
           "documentation":"<p>A value that indicates whether to copy all tags from the restored DB cluster to snapshots of the restored DB cluster. The default is not to copy them.</p>"
+        },
+        "Domain":{
+          "shape":"String",
+          "documentation":"<p>Specify the Active Directory directory ID to restore the DB cluster in. The domain must be created prior to this operation. </p> <p> For Amazon Aurora DB clusters, Amazon RDS can use Kerberos Authentication to authenticate users that connect to the DB cluster. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/aurmysql-kerberos.html\">Using Kerberos Authentication for Aurora MySQL</a> in the <i>Amazon Aurora User Guide</i>. </p>"
+        },
+        "DomainIAMRoleName":{
+          "shape":"String",
+          "documentation":"<p>Specify the name of the IAM role to be used when making API calls to the Directory Service.</p>"
         }
       },
       "documentation":"<p/>"
@@ -10147,7 +11302,7 @@
         },
         "PubliclyAccessible":{
           "shape":"BooleanOptional",
-          "documentation":"<p>A value that indicates whether the DB instance is publicly accessible. When the DB instance is publicly accessible, it is an Internet-facing instance with a publicly resolvable DNS name, which resolves to a public IP address. When the DB instance is not publicly accessible, it is an internal instance with a DNS name that resolves to a private IP address. For more information, see <a>CreateDBInstance</a>.</p>"
+          "documentation":"<p>A value that indicates whether the DB instance is publicly accessible. When the DB instance is publicly accessible, it is an Internet-facing instance with a publicly resolvable DNS name, which resolves to a public IP address. When the DB instance isn't publicly accessible, it is an internal instance with a DNS name that resolves to a private IP address. For more information, see <a>CreateDBInstance</a>.</p>"
         },
         "AutoMinorVersionUpgrade":{
           "shape":"BooleanOptional",
@@ -10167,7 +11322,7 @@
         },
         "Iops":{
           "shape":"IntegerOptional",
-          "documentation":"<p>Specifies the amount of provisioned IOPS for the DB instance, expressed in I/O operations per second. If this parameter is not specified, the IOPS value is taken from the backup. If this parameter is set to 0, the new instance is converted to a non-PIOPS instance. The conversion takes additional time, though your DB instance is available for connections before the conversion starts. </p> <p>The provisioned IOPS value must follow the requirements for your database engine. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/CHAP_Storage.html#USER_PIOPS\">Amazon RDS Provisioned IOPS Storage to Improve Performance</a> in the <i>Amazon RDS User Guide.</i> </p> <p>Constraints: Must be an integer greater than 1000.</p>"
+          "documentation":"<p>Specifies the amount of provisioned IOPS for the DB instance, expressed in I/O operations per second. If this parameter isn't specified, the IOPS value is taken from the backup. If this parameter is set to 0, the new instance is converted to a non-PIOPS instance. The conversion takes additional time, though your DB instance is available for connections before the conversion starts. </p> <p>The provisioned IOPS value must follow the requirements for your database engine. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/CHAP_Storage.html#USER_PIOPS\">Amazon RDS Provisioned IOPS Storage to Improve Performance</a> in the <i>Amazon RDS User Guide.</i> </p> <p>Constraints: Must be an integer greater than 1000.</p>"
         },
         "OptionGroupName":{
           "shape":"String",
@@ -10261,7 +11416,7 @@
         },
         "DBInstanceClass":{
           "shape":"String",
-          "documentation":"<p>The compute and memory capacity of the DB instance, for example, <code>db.m4.large</code>. Not all DB instance classes are available in all AWS Regions, or for all database engines. For the full list of DB instance classes, and availability for your engine, see <a href=\"https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/Concepts.DBInstanceClass.html\">DB Instance Class</a> in the <i>Amazon RDS User Guide.</i> </p> <p>Importing from Amazon S3 is not supported on the db.t2.micro DB instance class. </p>"
+          "documentation":"<p>The compute and memory capacity of the DB instance, for example, <code>db.m4.large</code>. Not all DB instance classes are available in all AWS Regions, or for all database engines. For the full list of DB instance classes, and availability for your engine, see <a href=\"https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/Concepts.DBInstanceClass.html\">DB Instance Class</a> in the <i>Amazon RDS User Guide.</i> </p> <p>Importing from Amazon S3 isn't supported on the db.t2.micro DB instance class. </p>"
         },
         "Engine":{
           "shape":"String",
@@ -10337,7 +11492,7 @@
         },
         "PubliclyAccessible":{
           "shape":"BooleanOptional",
-          "documentation":"<p>A value that indicates whether the DB instance is publicly accessible. When the DB instance is publicly accessible, it is an Internet-facing instance with a publicly resolvable DNS name, which resolves to a public IP address. When the DB instance is not publicly accessible, it is an internal instance with a DNS name that resolves to a private IP address. For more information, see <a>CreateDBInstance</a>.</p>"
+          "documentation":"<p>A value that indicates whether the DB instance is publicly accessible. When the DB instance is publicly accessible, it is an Internet-facing instance with a publicly resolvable DNS name, which resolves to a public IP address. When the DB instance isn't publicly accessible, it is an internal instance with a DNS name that resolves to a private IP address. For more information, see <a>CreateDBInstance</a>.</p>"
         },
         "Tags":{
           "shape":"TagList",
@@ -10445,7 +11600,7 @@
         },
         "UseLatestRestorableTime":{
           "shape":"Boolean",
-          "documentation":"<p> A value that indicates whether the DB instance is restored from the latest backup time. By default, the DB instance is not restored from the latest backup time. </p> <p>Constraints: Can't be specified if the <code>RestoreTime</code> parameter is provided.</p>"
+          "documentation":"<p> A value that indicates whether the DB instance is restored from the latest backup time. By default, the DB instance isn't restored from the latest backup time. </p> <p>Constraints: Can't be specified if the <code>RestoreTime</code> parameter is provided.</p>"
         },
         "DBInstanceClass":{
           "shape":"String",
@@ -10469,7 +11624,7 @@
         },
         "PubliclyAccessible":{
           "shape":"BooleanOptional",
-          "documentation":"<p>A value that indicates whether the DB instance is publicly accessible. When the DB instance is publicly accessible, it is an Internet-facing instance with a publicly resolvable DNS name, which resolves to a public IP address. When the DB instance is not publicly accessible, it is an internal instance with a DNS name that resolves to a private IP address. For more information, see <a>CreateDBInstance</a>.</p>"
+          "documentation":"<p>A value that indicates whether the DB instance is publicly accessible. When the DB instance is publicly accessible, it is an Internet-facing instance with a publicly resolvable DNS name, which resolves to a public IP address. When the DB instance isn't publicly accessible, it is an internal instance with a DNS name that resolves to a private IP address. For more information, see <a>CreateDBInstance</a>.</p>"
         },
         "AutoMinorVersionUpgrade":{
           "shape":"BooleanOptional",
@@ -10481,7 +11636,7 @@
         },
         "DBName":{
           "shape":"String",
-          "documentation":"<p>The database name for the restored DB instance.</p> <note> <p>This parameter is not used for the MySQL or MariaDB engines.</p> </note>"
+          "documentation":"<p>The database name for the restored DB instance.</p> <note> <p>This parameter isn't used for the MySQL or MariaDB engines.</p> </note>"
         },
         "Engine":{
           "shape":"String",
@@ -10489,7 +11644,7 @@
         },
         "Iops":{
           "shape":"IntegerOptional",
-          "documentation":"<p>The amount of Provisioned IOPS (input/output operations per second) to be initially allocated for the DB instance.</p> <p>Constraints: Must be an integer greater than 1000.</p> <p> <b>SQL Server</b> </p> <p>Setting the IOPS value for the SQL Server database engine is not supported.</p>"
+          "documentation":"<p>The amount of Provisioned IOPS (input/output operations per second) to be initially allocated for the DB instance.</p> <p>Constraints: Must be an integer greater than 1000.</p> <p> <b>SQL Server</b> </p> <p>Setting the IOPS value for the SQL Server database engine isn't supported.</p>"
         },
         "OptionGroupName":{
           "shape":"String",
@@ -10597,7 +11752,7 @@
         },
         "EC2SecurityGroupOwnerId":{
           "shape":"String",
-          "documentation":"<p> The AWS Account Number of the owner of the EC2 security group specified in the <code>EC2SecurityGroupName</code> parameter. The AWS Access Key ID is not an acceptable value. For VPC DB security groups, <code>EC2SecurityGroupId</code> must be provided. Otherwise, EC2SecurityGroupOwnerId and either <code>EC2SecurityGroupName</code> or <code>EC2SecurityGroupId</code> must be provided. </p>"
+          "documentation":"<p> The AWS account number of the owner of the EC2 security group specified in the <code>EC2SecurityGroupName</code> parameter. The AWS access key ID isn't an acceptable value. For VPC DB security groups, <code>EC2SecurityGroupId</code> must be provided. Otherwise, EC2SecurityGroupOwnerId and either <code>EC2SecurityGroupName</code> or <code>EC2SecurityGroupId</code> must be provided. </p>"
         }
       },
       "documentation":"<p/>"
@@ -10649,11 +11804,11 @@
       "members":{
         "MinCapacity":{
           "shape":"IntegerOptional",
-          "documentation":"<p>The minimum capacity for an Aurora DB cluster in <code>serverless</code> DB engine mode.</p> <p>Valid capacity values are <code>1</code>, <code>2</code>, <code>4</code>, <code>8</code>, <code>16</code>, <code>32</code>, <code>64</code>, <code>128</code>, and <code>256</code>.</p> <p>The minimum capacity must be less than or equal to the maximum capacity.</p>"
+          "documentation":"<p>The minimum capacity for an Aurora DB cluster in <code>serverless</code> DB engine mode.</p> <p>For Aurora MySQL, valid capacity values are <code>1</code>, <code>2</code>, <code>4</code>, <code>8</code>, <code>16</code>, <code>32</code>, <code>64</code>, <code>128</code>, and <code>256</code>.</p> <p>For Aurora PostgreSQL, valid capacity values are <code>2</code>, <code>4</code>, <code>8</code>, <code>16</code>, <code>32</code>, <code>64</code>, <code>192</code>, and <code>384</code>.</p> <p>The minimum capacity must be less than or equal to the maximum capacity.</p>"
         },
         "MaxCapacity":{
           "shape":"IntegerOptional",
-          "documentation":"<p>The maximum capacity for an Aurora DB cluster in <code>serverless</code> DB engine mode.</p> <p>Valid capacity values are <code>1</code>, <code>2</code>, <code>4</code>, <code>8</code>, <code>16</code>, <code>32</code>, <code>64</code>, <code>128</code>, and <code>256</code>.</p> <p>The maximum capacity must be greater than or equal to the minimum capacity.</p>"
+          "documentation":"<p>The maximum capacity for an Aurora DB cluster in <code>serverless</code> DB engine mode.</p> <p>For Aurora MySQL, valid capacity values are <code>1</code>, <code>2</code>, <code>4</code>, <code>8</code>, <code>16</code>, <code>32</code>, <code>64</code>, <code>128</code>, and <code>256</code>.</p> <p>For Aurora PostgreSQL, valid capacity values are <code>2</code>, <code>4</code>, <code>8</code>, <code>16</code>, <code>32</code>, <code>64</code>, <code>192</code>, and <code>384</code>.</p> <p>The maximum capacity must be greater than or equal to the minimum capacity.</p>"
         },
         "AutoPause":{
           "shape":"BooleanOptional",
@@ -10665,7 +11820,7 @@
         },
         "TimeoutAction":{
           "shape":"String",
-          "documentation":"<p>The action to take when the timeout is reached, either <code>ForceApplyCapacityChange</code> or <code>RollbackCapacityChange</code>.</p> <p> <code>ForceApplyCapacityChange</code> sets the capacity to the specified value as soon as possible.</p> <p> <code>RollbackCapacityChange</code>, the default, ignores the capacity change if a scaling point is not found in the timeout period.</p> <important> <p>If you specify <code>ForceApplyCapacityChange</code>, connections that prevent Aurora Serverless from finding a scaling point might be dropped.</p> </important> <p>For more information, see <a href=\"https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/aurora-serverless.how-it-works.html#aurora-serverless.how-it-works.auto-scaling\"> Autoscaling for Aurora Serverless</a> in the <i>Amazon Aurora User Guide</i>.</p>"
+          "documentation":"<p>The action to take when the timeout is reached, either <code>ForceApplyCapacityChange</code> or <code>RollbackCapacityChange</code>.</p> <p> <code>ForceApplyCapacityChange</code> sets the capacity to the specified value as soon as possible.</p> <p> <code>RollbackCapacityChange</code>, the default, ignores the capacity change if a scaling point isn't found in the timeout period.</p> <important> <p>If you specify <code>ForceApplyCapacityChange</code>, connections that prevent Aurora Serverless from finding a scaling point might be dropped.</p> </important> <p>For more information, see <a href=\"https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/aurora-serverless.how-it-works.html#aurora-serverless.how-it-works.auto-scaling\"> Autoscaling for Aurora Serverless</a> in the <i>Amazon Aurora User Guide</i>.</p>"
         }
       },
       "documentation":"<p>Contains the scaling configuration of an Aurora Serverless DB cluster.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/aurora-serverless.html\">Using Amazon Aurora Serverless</a> in the <i>Amazon Aurora User Guide</i>.</p>"
@@ -10872,6 +12027,46 @@
         "DBInstance":{"shape":"DBInstance"}
       }
     },
+    "StartExportTaskMessage":{
+      "type":"structure",
+      "required":[
+        "ExportTaskIdentifier",
+        "SourceArn",
+        "S3BucketName",
+        "IamRoleArn",
+        "KmsKeyId"
+      ],
+      "members":{
+        "ExportTaskIdentifier":{
+          "shape":"String",
+          "documentation":"<p>A unique identifier for the snapshot export task. This ID isn't an identifier for the Amazon S3 bucket where the snapshot is to be exported to. </p>"
+        },
+        "SourceArn":{
+          "shape":"String",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the snapshot to export to Amazon S3.</p>"
+        },
+        "S3BucketName":{
+          "shape":"String",
+          "documentation":"<p>The name of the Amazon S3 bucket to export the snapshot to.</p>"
+        },
+        "IamRoleArn":{
+          "shape":"String",
+          "documentation":"<p>The name of the IAM role to use for writing to the Amazon S3 bucket when exporting a snapshot. </p>"
+        },
+        "KmsKeyId":{
+          "shape":"String",
+          "documentation":"<p>The ID of the AWS KMS key to use to encrypt the snapshot exported to Amazon S3. The KMS key ID is the Amazon Resource Name (ARN), the KMS key identifier, or the KMS key alias for the KMS encryption key. The IAM role used for the snapshot export must have encryption and decryption permissions to use this KMS key. </p>"
+        },
+        "S3Prefix":{
+          "shape":"String",
+          "documentation":"<p>The Amazon S3 bucket prefix to use as the file name and path of the exported snapshot.</p>"
+        },
+        "ExportOnly":{
+          "shape":"StringList",
+          "documentation":"<p>The data to be exported from the snapshot. If this parameter is not provided, all the snapshot data is exported. Valid values are the following:</p> <ul> <li> <p> <code>database</code> - Export all the data of the snapshot.</p> </li> <li> <p> <code>database.table [table-name]</code> - Export a table of the snapshot.</p> </li> <li> <p> <code>database.schema [schema-name]</code> - Export a database schema of the snapshot. This value isn't valid for RDS for MySQL, RDS for MariaDB, or Aurora MySQL.</p> </li> <li> <p> <code>database.schema.table [table-name]</code> - Export a table of the database schema. This value isn't valid for RDS for MySQL, RDS for MariaDB, or Aurora MySQL.</p> </li> </ul>"
+        }
+      }
+    },
     "StopActivityStreamRequest":{
       "type":"structure",
       "required":["ResourceArn"],
@@ -11096,6 +12291,22 @@
       },
       "documentation":"<p/>"
     },
+    "TargetGroupList":{
+      "type":"list",
+      "member":{"shape":"DBProxyTargetGroup"}
+    },
+    "TargetList":{
+      "type":"list",
+      "member":{"shape":"DBProxyTarget"}
+    },
+    "TargetType":{
+      "type":"string",
+      "enum":[
+        "RDS_INSTANCE",
+        "RDS_SERVERLESS_ENDPOINT",
+        "TRACKED_CLUSTER"
+      ]
+    },
     "Timezone":{
       "type":"structure",
       "members":{
@@ -11132,6 +12343,66 @@
       },
       "documentation":"<p>The version of the database engine that a DB instance can be upgraded to.</p>"
     },
+    "UserAuthConfig":{
+      "type":"structure",
+      "members":{
+        "Description":{
+          "shape":"String",
+          "documentation":"<p>A user-specified description about the authentication used by a proxy to log in as a specific database user.</p>"
+        },
+        "UserName":{
+          "shape":"String",
+          "documentation":"<p>The name of the database user to which the proxy connects.</p>"
+        },
+        "AuthScheme":{
+          "shape":"AuthScheme",
+          "documentation":"<p>The type of authentication that the proxy uses for connections from the proxy to the underlying database.</p>"
+        },
+        "SecretArn":{
+          "shape":"String",
+          "documentation":"<p>The Amazon Resource Name (ARN) representing the secret that the proxy uses to authenticate to the RDS DB instance or Aurora DB cluster. These secrets are stored within Amazon Secrets Manager.</p>"
+        },
+        "IAMAuth":{
+          "shape":"IAMAuthMode",
+          "documentation":"<p>Whether to require or disallow AWS Identity and Access Management (IAM) authentication for connections to the proxy.</p>"
+        }
+      },
+      "documentation":"<note> <p>This is prerelease documentation for the RDS Database Proxy feature in preview release. It is subject to change.</p> </note> <p>Specifies the details of authentication used by a proxy to log in as a specific database user.</p>"
+    },
+    "UserAuthConfigInfo":{
+      "type":"structure",
+      "members":{
+        "Description":{
+          "shape":"String",
+          "documentation":"<p>A user-specified description about the authentication used by a proxy to log in as a specific database user.</p>"
+        },
+        "UserName":{
+          "shape":"String",
+          "documentation":"<p>The name of the database user to which the proxy connects.</p>"
+        },
+        "AuthScheme":{
+          "shape":"AuthScheme",
+          "documentation":"<p>The type of authentication that the proxy uses for connections from the proxy to the underlying database.</p>"
+        },
+        "SecretArn":{
+          "shape":"String",
+          "documentation":"<p>The Amazon Resource Name (ARN) representing the secret that the proxy uses to authenticate to the RDS DB instance or Aurora DB cluster. These secrets are stored within Amazon Secrets Manager.</p>"
+        },
+        "IAMAuth":{
+          "shape":"IAMAuthMode",
+          "documentation":"<p>Whether to require or disallow AWS Identity and Access Management (IAM) authentication for connections to the proxy.</p>"
+        }
+      },
+      "documentation":"<note> <p>This is prerelease documentation for the RDS Database Proxy feature in preview release. It is subject to change.</p> </note> <p>Returns the details of authentication used by a proxy to log in as a specific database user.</p>"
+    },
+    "UserAuthConfigInfoList":{
+      "type":"list",
+      "member":{"shape":"UserAuthConfigInfo"}
+    },
+    "UserAuthConfigList":{
+      "type":"list",
+      "member":{"shape":"UserAuthConfig"}
+    },
     "ValidDBInstanceModificationsMessage":{
       "type":"structure",
       "members":{
@@ -11246,5 +12517,5 @@
       "documentation":"<p>Information about the virtual private network (VPN) between the VMware vSphere cluster and the AWS website.</p> <p>For more information about RDS on VMware, see the <a href=\"https://docs.aws.amazon.com/AmazonRDS/latest/RDSonVMwareUserGuide/rds-on-vmware.html\"> <i>RDS on VMware User Guide.</i> </a> </p>"
     }
   },
-  "documentation":"<fullname>Amazon Relational Database Service</fullname> <p> </p> <p>Amazon Relational Database Service (Amazon RDS) is a web service that makes it easier to set up, operate, and scale a relational database in the cloud. It provides cost-efficient, resizeable capacity for an industry-standard relational database and manages common database administration tasks, freeing up developers to focus on what makes their applications and businesses unique.</p> <p>Amazon RDS gives you access to the capabilities of a MySQL, MariaDB, PostgreSQL, Microsoft SQL Server, Oracle, or Amazon Aurora database server. These capabilities mean that the code, applications, and tools you already use today with your existing databases work with Amazon RDS without modification. Amazon RDS automatically backs up your database and maintains the database software that powers your DB instance. Amazon RDS is flexible: you can scale your DB instance's compute resources and storage capacity to meet your application's demand. As with all Amazon Web Services, there are no up-front investments, and you pay only for the resources you use.</p> <p>This interface reference for Amazon RDS contains documentation for a programming or command line interface you can use to manage Amazon RDS. Note that Amazon RDS is asynchronous, which means that some interfaces might require techniques such as polling or callback functions to determine when a command has been applied. In this reference, the parameter descriptions indicate whether a command is applied immediately, on the next instance reboot, or during the maintenance window. The reference structure is as follows, and we list following some related topics from the user guide.</p> <p> <b>Amazon RDS API Reference</b> </p> <ul> <li> <p>For the alphabetical list of API actions, see <a href=\"https://docs.aws.amazon.com/AmazonRDS/latest/APIReference/API_Operations.html\">API Actions</a>.</p> </li> <li> <p>For the alphabetical list of data types, see <a href=\"https://docs.aws.amazon.com/AmazonRDS/latest/APIReference/API_Types.html\">Data Types</a>.</p> </li> <li> <p>For a list of common query parameters, see <a href=\"https://docs.aws.amazon.com/AmazonRDS/latest/APIReference/CommonParameters.html\">Common Parameters</a>.</p> </li> <li> <p>For descriptions of the error codes, see <a href=\"https://docs.aws.amazon.com/AmazonRDS/latest/APIReference/CommonErrors.html\">Common Errors</a>.</p> </li> </ul> <p> <b>Amazon RDS User Guide</b> </p> <ul> <li> <p>For a summary of the Amazon RDS interfaces, see <a href=\"https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/Welcome.html#Welcome.Interfaces\">Available RDS Interfaces</a>.</p> </li> <li> <p>For more information about how to use the Query API, see <a href=\"https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/Using_the_Query_API.html\">Using the Query API</a>.</p> </li> </ul>"
+  "documentation":"<fullname>Amazon Relational Database Service</fullname> <p> </p> <p>Amazon Relational Database Service (Amazon RDS) is a web service that makes it easier to set up, operate, and scale a relational database in the cloud. It provides cost-efficient, resizeable capacity for an industry-standard relational database and manages common database administration tasks, freeing up developers to focus on what makes their applications and businesses unique.</p> <p>Amazon RDS gives you access to the capabilities of a MySQL, MariaDB, PostgreSQL, Microsoft SQL Server, Oracle, or Amazon Aurora database server. These capabilities mean that the code, applications, and tools you already use today with your existing databases work with Amazon RDS without modification. Amazon RDS automatically backs up your database and maintains the database software that powers your DB instance. Amazon RDS is flexible: you can scale your DB instance's compute resources and storage capacity to meet your application's demand. As with all Amazon Web Services, there are no up-front investments, and you pay only for the resources you use.</p> <p>This interface reference for Amazon RDS contains documentation for a programming or command line interface you can use to manage Amazon RDS. Amazon RDS is asynchronous, which means that some interfaces might require techniques such as polling or callback functions to determine when a command has been applied. In this reference, the parameter descriptions indicate whether a command is applied immediately, on the next instance reboot, or during the maintenance window. The reference structure is as follows, and we list following some related topics from the user guide.</p> <p> <b>Amazon RDS API Reference</b> </p> <ul> <li> <p>For the alphabetical list of API actions, see <a href=\"https://docs.aws.amazon.com/AmazonRDS/latest/APIReference/API_Operations.html\">API Actions</a>.</p> </li> <li> <p>For the alphabetical list of data types, see <a href=\"https://docs.aws.amazon.com/AmazonRDS/latest/APIReference/API_Types.html\">Data Types</a>.</p> </li> <li> <p>For a list of common query parameters, see <a href=\"https://docs.aws.amazon.com/AmazonRDS/latest/APIReference/CommonParameters.html\">Common Parameters</a>.</p> </li> <li> <p>For descriptions of the error codes, see <a href=\"https://docs.aws.amazon.com/AmazonRDS/latest/APIReference/CommonErrors.html\">Common Errors</a>.</p> </li> </ul> <p> <b>Amazon RDS User Guide</b> </p> <ul> <li> <p>For a summary of the Amazon RDS interfaces, see <a href=\"https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/Welcome.html#Welcome.Interfaces\">Available RDS Interfaces</a>.</p> </li> <li> <p>For more information about how to use the Query API, see <a href=\"https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/Using_the_Query_API.html\">Using the Query API</a>.</p> </li> </ul>"
 }
diff --git a/services/rds/src/test/java/software/amazon/awssdk/services/rds/internal/PresignRequestHandlerTest.java b/services/rds/src/test/java/software/amazon/awssdk/services/rds/internal/PresignRequestHandlerTest.java
index 2cb9746ae4d7..cc62a7007749 100644
--- a/services/rds/src/test/java/software/amazon/awssdk/services/rds/internal/PresignRequestHandlerTest.java
+++ b/services/rds/src/test/java/software/amazon/awssdk/services/rds/internal/PresignRequestHandlerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/rds/src/test/resources/cucumber.properties b/services/rds/src/test/resources/cucumber.properties
index d5668025c025..270c0494bc8a 100644
--- a/services/rds/src/test/resources/cucumber.properties
+++ b/services/rds/src/test/resources/cucumber.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/rds/src/test/resources/log4j.properties b/services/rds/src/test/resources/log4j.properties
index 1b76f68f72cc..a1010ce5f9a6 100644
--- a/services/rds/src/test/resources/log4j.properties
+++ b/services/rds/src/test/resources/log4j.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/rdsdata/pom.xml b/services/rdsdata/pom.xml
index a7ea61709fcc..9c20387bd003 100644
--- a/services/rdsdata/pom.xml
+++ b/services/rdsdata/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>rdsdata</artifactId>
     <name>AWS Java SDK :: Services :: RDS Data</name>
diff --git a/services/rdsdata/src/main/resources/codegen-resources/service-2.json b/services/rdsdata/src/main/resources/codegen-resources/service-2.json
index 53cee2dc20b1..294450a6bb29 100644
--- a/services/rdsdata/src/main/resources/codegen-resources/service-2.json
+++ b/services/rdsdata/src/main/resources/codegen-resources/service-2.json
@@ -59,6 +59,7 @@
       "output":{"shape":"CommitTransactionResponse"},
       "errors":[
         {"shape":"BadRequestException"},
+        {"shape":"StatementTimeoutException"},
         {"shape":"InternalServerErrorException"},
         {"shape":"ForbiddenException"},
         {"shape":"ServiceUnavailableError"},
@@ -101,7 +102,7 @@
         {"shape":"ForbiddenException"},
         {"shape":"ServiceUnavailableError"}
       ],
-      "documentation":"<p>Runs a SQL statement against a database.</p> <important> <p>If a call isn't part of a transaction because it doesn't include the <code>transactionID</code> parameter, changes that result from the call are committed automatically.</p> </important> <p>The response size limit is 1 MB or 1,000 records. If the call returns more than 1 MB of response data or over 1,000 records, the call is terminated.</p>"
+      "documentation":"<p>Runs a SQL statement against a database.</p> <important> <p>If a call isn't part of a transaction because it doesn't include the <code>transactionID</code> parameter, changes that result from the call are committed automatically.</p> </important> <p>The response size limit is 1 MB. If the call returns more than 1 MB of response data, the call is terminated.</p>"
     },
     "RollbackTransaction":{
       "name":"RollbackTransaction",
@@ -114,6 +115,7 @@
       "output":{"shape":"RollbackTransactionResponse"},
       "errors":[
         {"shape":"BadRequestException"},
+        {"shape":"StatementTimeoutException"},
         {"shape":"InternalServerErrorException"},
         {"shape":"ForbiddenException"},
         {"shape":"ServiceUnavailableError"},
@@ -192,7 +194,7 @@
         },
         "parameterSets":{
           "shape":"SqlParameterSets",
-          "documentation":"<p>The parameter set for the batch operation.</p>"
+          "documentation":"<p>The parameter set for the batch operation.</p> <p>The SQL statement is executed as many times as the number of parameter sets provided. To execute a SQL statement with no parameters, use one of the following options:</p> <ul> <li> <p>Specify one or more empty parameter sets.</p> </li> <li> <p>Use the <code>ExecuteStatement</code> operation instead of the <code>BatchExecuteStatement</code> operation.</p> </li> </ul> <note> <p>Array parameters are not supported.</p> </note>"
         },
         "resourceArn":{
           "shape":"Arn",
@@ -466,7 +468,7 @@
         },
         "parameters":{
           "shape":"SqlParametersList",
-          "documentation":"<p>The parameters for the SQL statement.</p>"
+          "documentation":"<p>The parameters for the SQL statement.</p> <note> <p>Array parameters are not supported.</p> </note>"
         },
         "resourceArn":{
           "shape":"Arn",
@@ -717,6 +719,10 @@
           "shape":"ParameterName",
           "documentation":"<p>The name of the parameter.</p>"
         },
+        "typeHint":{
+          "shape":"TypeHint",
+          "documentation":"<p>A hint that specifies the correct object type for data type mapping.</p> <p> <b>Values:</b> </p> <ul> <li> <p> <code>DECIMAL</code> - The corresponding <code>String</code> parameter value is sent as an object of <code>DECIMAL</code> type to the database.</p> </li> <li> <p> <code>TIMESTAMP</code> - The corresponding <code>String</code> parameter value is sent as an object of <code>TIMESTAMP</code> type to the database. The accepted format is <code>YYYY-MM-DD HH:MM:SS[.FFF]</code>.</p> </li> <li> <p> <code>TIME</code> - The corresponding <code>String</code> parameter value is sent as an object of <code>TIME</code> type to the database. The accepted format is <code>HH:MM:SS[.FFF]</code>.</p> </li> <li> <p> <code>DATE</code> - The corresponding <code>String</code> parameter value is sent as an object of <code>DATE</code> type to the database. The accepted format is <code>YYYY-MM-DD</code>.</p> </li> </ul>"
+        },
         "value":{
           "shape":"Field",
           "documentation":"<p>The value of the parameter.</p>"
@@ -799,6 +805,15 @@
       "max":128,
       "min":0
     },
+    "TypeHint":{
+      "type":"string",
+      "enum":[
+        "DATE",
+        "DECIMAL",
+        "TIME",
+        "TIMESTAMP"
+      ]
+    },
     "UpdateResult":{
       "type":"structure",
       "members":{
diff --git a/services/redshift/build.properties b/services/redshift/build.properties
index ecf2dae6fcb1..15ec2da1fc71 100644
--- a/services/redshift/build.properties
+++ b/services/redshift/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/redshift/pom.xml b/services/redshift/pom.xml
index 06f9859d61c6..11b377e693ca 100644
--- a/services/redshift/pom.xml
+++ b/services/redshift/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>redshift</artifactId>
     <name>AWS Java SDK :: Services :: Amazon Redshift</name>
diff --git a/services/redshift/src/main/resources/codegen-resources/paginators-1.json b/services/redshift/src/main/resources/codegen-resources/paginators-1.json
index 165f7f74ff08..e9690c816d8a 100644
--- a/services/redshift/src/main/resources/codegen-resources/paginators-1.json
+++ b/services/redshift/src/main/resources/codegen-resources/paginators-1.json
@@ -95,6 +95,12 @@
       "limit_key": "MaxRecords",
       "output_token": "Marker",
       "result_key": "ReservedNodes"
+    },
+    "DescribeScheduledActions": {
+      "input_token": "Marker",
+      "limit_key": "MaxRecords",
+      "output_token": "Marker",
+      "result_key": "ScheduledActions"
     }
   }
 }
\ No newline at end of file
diff --git a/services/redshift/src/main/resources/codegen-resources/service-2.json b/services/redshift/src/main/resources/codegen-resources/service-2.json
index 2a1a913df93c..e4340a85034b 100644
--- a/services/redshift/src/main/resources/codegen-resources/service-2.json
+++ b/services/redshift/src/main/resources/codegen-resources/service-2.json
@@ -104,7 +104,7 @@
         {"shape":"InvalidRetentionPeriodFault"},
         {"shape":"BatchModifyClusterSnapshotsLimitExceededFault"}
       ],
-      "documentation":"<p>Modifies the settings for a list of snapshots.</p>"
+      "documentation":"<p>Modifies the settings for a set of cluster snapshots.</p>"
     },
     "CancelResize":{
       "name":"CancelResize",
@@ -123,7 +123,7 @@
         {"shape":"InvalidClusterStateFault"},
         {"shape":"UnsupportedOperationFault"}
       ],
-      "documentation":"<p>Cancels a resize operation.</p>"
+      "documentation":"<p>Cancels a resize operation for a cluster.</p>"
     },
     "CopyClusterSnapshot":{
       "name":"CopyClusterSnapshot",
@@ -180,7 +180,7 @@
         {"shape":"SnapshotScheduleNotFoundFault"},
         {"shape":"InvalidRetentionPeriodFault"}
       ],
-      "documentation":"<p>Creates a new cluster.</p> <p>To create a cluster in Virtual Private Cloud (VPC), you must provide a cluster subnet group name. The cluster subnet group identifies the subnets of your VPC that Amazon Redshift uses when creating the cluster. For more information about managing clusters, go to <a href=\"https://docs.aws.amazon.com/redshift/latest/mgmt/working-with-clusters.html\">Amazon Redshift Clusters</a> in the <i>Amazon Redshift Cluster Management Guide</i>.</p>"
+      "documentation":"<p>Creates a new cluster with the specified parameters.</p> <p>To create a cluster in Virtual Private Cloud (VPC), you must provide a cluster subnet group name. The cluster subnet group identifies the subnets of your VPC that Amazon Redshift uses when creating the cluster. For more information about managing clusters, go to <a href=\"https://docs.aws.amazon.com/redshift/latest/mgmt/working-with-clusters.html\">Amazon Redshift Clusters</a> in the <i>Amazon Redshift Cluster Management Guide</i>.</p>"
     },
     "CreateClusterParameterGroup":{
       "name":"CreateClusterParameterGroup",
@@ -329,6 +329,27 @@
       ],
       "documentation":"<p>Creates an HSM configuration that contains the information required by an Amazon Redshift cluster to store and use database encryption keys in a Hardware Security Module (HSM). After creating the HSM configuration, you can specify it as a parameter when creating a cluster. The cluster will then store its encryption keys in the HSM.</p> <p>In addition to creating an HSM configuration, you must also create an HSM client certificate. For more information, go to <a href=\"https://docs.aws.amazon.com/redshift/latest/mgmt/working-with-HSM.html\">Hardware Security Modules</a> in the Amazon Redshift Cluster Management Guide.</p>"
     },
+    "CreateScheduledAction":{
+      "name":"CreateScheduledAction",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"CreateScheduledActionMessage"},
+      "output":{
+        "shape":"ScheduledAction",
+        "resultWrapper":"CreateScheduledActionResult"
+      },
+      "errors":[
+        {"shape":"ScheduledActionAlreadyExistsFault"},
+        {"shape":"ScheduledActionQuotaExceededFault"},
+        {"shape":"ScheduledActionTypeUnsupportedFault"},
+        {"shape":"InvalidScheduleFault"},
+        {"shape":"InvalidScheduledActionFault"},
+        {"shape":"UnauthorizedOperation"}
+      ],
+      "documentation":"<p>Creates a scheduled action. A scheduled action contains a schedule and an Amazon Redshift API action. For example, you can create a schedule of when to run the <code>ResizeCluster</code> API operation. </p>"
+    },
     "CreateSnapshotCopyGrant":{
       "name":"CreateSnapshotCopyGrant",
       "http":{
@@ -368,7 +389,7 @@
         {"shape":"TagLimitExceededFault"},
         {"shape":"ScheduleDefinitionTypeUnsupportedFault"}
       ],
-      "documentation":"<p>Creates a new snapshot schedule.</p>"
+      "documentation":"<p>Creates a snapshot schedule with the rate of every 12 hours.</p>"
     },
     "CreateTags":{
       "name":"CreateTags",
@@ -382,7 +403,7 @@
         {"shape":"ResourceNotFoundFault"},
         {"shape":"InvalidTagFault"}
       ],
-      "documentation":"<p>Adds one or more tags to a specified resource.</p> <p>A resource can have up to 50 tags. If you try to create more than 50 tags for a resource, you will receive an error and the attempt will fail.</p> <p>If you specify a key that already exists for the resource, the value for that key will be updated with the new value.</p>"
+      "documentation":"<p>Adds tags to a cluster.</p> <p>A resource can have up to 50 tags. If you try to create more than 50 tags for a resource, you will receive an error and the attempt will fail.</p> <p>If you specify a key that already exists for the resource, the value for that key will be updated with the new value.</p>"
     },
     "DeleteCluster":{
       "name":"DeleteCluster",
@@ -402,7 +423,7 @@
         {"shape":"ClusterSnapshotQuotaExceededFault"},
         {"shape":"InvalidRetentionPeriodFault"}
       ],
-      "documentation":"<p>Deletes a previously provisioned cluster. A successful response from the web service indicates that the request was received correctly. Use <a>DescribeClusters</a> to monitor the status of the deletion. The delete operation cannot be canceled or reverted once submitted. For more information about managing clusters, go to <a href=\"https://docs.aws.amazon.com/redshift/latest/mgmt/working-with-clusters.html\">Amazon Redshift Clusters</a> in the <i>Amazon Redshift Cluster Management Guide</i>.</p> <p>If you want to shut down the cluster and retain it for future use, set <i>SkipFinalClusterSnapshot</i> to <code>false</code> and specify a name for <i>FinalClusterSnapshotIdentifier</i>. You can later restore this snapshot to resume using the cluster. If a final cluster snapshot is requested, the status of the cluster will be \"final-snapshot\" while the snapshot is being taken, then it's \"deleting\" once Amazon Redshift begins deleting the cluster. </p> <p> For more information about managing clusters, go to <a href=\"https://docs.aws.amazon.com/redshift/latest/mgmt/working-with-clusters.html\">Amazon Redshift Clusters</a> in the <i>Amazon Redshift Cluster Management Guide</i>.</p>"
+      "documentation":"<p>Deletes a previously provisioned cluster without its final snapshot being created. A successful response from the web service indicates that the request was received correctly. Use <a>DescribeClusters</a> to monitor the status of the deletion. The delete operation cannot be canceled or reverted once submitted. For more information about managing clusters, go to <a href=\"https://docs.aws.amazon.com/redshift/latest/mgmt/working-with-clusters.html\">Amazon Redshift Clusters</a> in the <i>Amazon Redshift Cluster Management Guide</i>.</p> <p>If you want to shut down the cluster and retain it for future use, set <i>SkipFinalClusterSnapshot</i> to <code>false</code> and specify a name for <i>FinalClusterSnapshotIdentifier</i>. You can later restore this snapshot to resume using the cluster. If a final cluster snapshot is requested, the status of the cluster will be \"final-snapshot\" while the snapshot is being taken, then it's \"deleting\" once Amazon Redshift begins deleting the cluster. </p> <p> For more information about managing clusters, go to <a href=\"https://docs.aws.amazon.com/redshift/latest/mgmt/working-with-clusters.html\">Amazon Redshift Clusters</a> in the <i>Amazon Redshift Cluster Management Guide</i>.</p>"
     },
     "DeleteClusterParameterGroup":{
       "name":"DeleteClusterParameterGroup",
@@ -500,6 +521,19 @@
       ],
       "documentation":"<p>Deletes the specified Amazon Redshift HSM configuration.</p>"
     },
+    "DeleteScheduledAction":{
+      "name":"DeleteScheduledAction",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DeleteScheduledActionMessage"},
+      "errors":[
+        {"shape":"ScheduledActionNotFoundFault"},
+        {"shape":"UnauthorizedOperation"}
+      ],
+      "documentation":"<p>Deletes a scheduled action. </p>"
+    },
     "DeleteSnapshotCopyGrant":{
       "name":"DeleteSnapshotCopyGrant",
       "http":{
@@ -537,7 +571,7 @@
         {"shape":"ResourceNotFoundFault"},
         {"shape":"InvalidTagFault"}
       ],
-      "documentation":"<p>Deletes a tag or tags from a resource. You must provide the ARN of the resource from which you want to delete the tag or tags.</p>"
+      "documentation":"<p>Deletes tags from a resource. You must provide the ARN of the resource from which you want to delete the tag or tags.</p>"
     },
     "DescribeAccountAttributes":{
       "name":"DescribeAccountAttributes",
@@ -820,7 +854,9 @@
       },
       "errors":[
         {"shape":"ClusterSnapshotNotFoundFault"},
-        {"shape":"InvalidClusterSnapshotStateFault"}
+        {"shape":"InvalidClusterSnapshotStateFault"},
+        {"shape":"ClusterNotFoundFault"},
+        {"shape":"AccessToSnapshotDeniedFault"}
       ],
       "documentation":"<p>Returns properties of possible node configurations such as node type, number of nodes, and disk usage for the specified action type.</p>"
     },
@@ -889,6 +925,23 @@
       ],
       "documentation":"<p>Returns information about the last resize operation for the specified cluster. If no resize operation has ever been initiated for the specified cluster, a <code>HTTP 404</code> error is returned. If a resize operation was initiated and completed, the status of the resize remains as <code>SUCCEEDED</code> until the next resize. </p> <p>A resize operation can be requested using <a>ModifyCluster</a> and specifying a different number or type of nodes for the cluster. </p>"
     },
+    "DescribeScheduledActions":{
+      "name":"DescribeScheduledActions",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DescribeScheduledActionsMessage"},
+      "output":{
+        "shape":"ScheduledActionsMessage",
+        "resultWrapper":"DescribeScheduledActionsResult"
+      },
+      "errors":[
+        {"shape":"ScheduledActionNotFoundFault"},
+        {"shape":"UnauthorizedOperation"}
+      ],
+      "documentation":"<p>Describes properties of scheduled actions. </p>"
+    },
     "DescribeSnapshotCopyGrants":{
       "name":"DescribeSnapshotCopyGrants",
       "http":{
@@ -929,7 +982,7 @@
         "shape":"CustomerStorageMessage",
         "resultWrapper":"DescribeStorageResult"
       },
-      "documentation":"<p>Returns the total amount of snapshot usage and provisioned storage in megabytes.</p>"
+      "documentation":"<p>Returns account level backups storage size and provisional storage.</p>"
     },
     "DescribeTableRestoreStatus":{
       "name":"DescribeTableRestoreStatus",
@@ -1016,7 +1069,8 @@
         {"shape":"BucketNotFoundFault"},
         {"shape":"InsufficientS3BucketPolicyFault"},
         {"shape":"InvalidS3KeyPrefixFault"},
-        {"shape":"InvalidS3BucketNameFault"}
+        {"shape":"InvalidS3BucketNameFault"},
+        {"shape":"InvalidClusterStateFault"}
       ],
       "documentation":"<p>Starts logging information, such as queries and connection attempts, for the specified Amazon Redshift cluster.</p>"
     },
@@ -1116,7 +1170,7 @@
         {"shape":"InvalidClusterTrackFault"},
         {"shape":"InvalidRetentionPeriodFault"}
       ],
-      "documentation":"<p>Modifies the settings for a cluster. For example, you can add another security or parameter group, update the preferred maintenance window, or change the master user password. Resetting a cluster password or modifying the security groups associated with a cluster do not need a reboot. However, modifying a parameter group requires a reboot for parameters to take effect. For more information about managing clusters, go to <a href=\"https://docs.aws.amazon.com/redshift/latest/mgmt/working-with-clusters.html\">Amazon Redshift Clusters</a> in the <i>Amazon Redshift Cluster Management Guide</i>.</p> <p>You can also change node type and the number of nodes to scale up or down the cluster. When resizing a cluster, you must specify both the number of nodes and the node type even if one of the parameters does not change.</p>"
+      "documentation":"<p>Modifies the settings for a cluster.</p> <p>You can also change node type and the number of nodes to scale up or down the cluster. When resizing a cluster, you must specify both the number of nodes and the node type even if one of the parameters does not change.</p> <p>You can add another security or parameter group, or change the master user password. Resetting a cluster password or modifying the security groups associated with a cluster do not need a reboot. However, modifying a parameter group requires a reboot for parameters to take effect. For more information about managing clusters, go to <a href=\"https://docs.aws.amazon.com/redshift/latest/mgmt/working-with-clusters.html\">Amazon Redshift Clusters</a> in the <i>Amazon Redshift Cluster Management Guide</i>.</p>"
     },
     "ModifyClusterDbRevision":{
       "name":"ModifyClusterDbRevision",
@@ -1165,9 +1219,10 @@
         "resultWrapper":"ModifyClusterMaintenanceResult"
       },
       "errors":[
-        {"shape":"ClusterNotFoundFault"}
+        {"shape":"ClusterNotFoundFault"},
+        {"shape":"InvalidClusterStateFault"}
       ],
-      "documentation":"<p>Modifies the maintenance settings of a cluster. For example, you can defer a maintenance window. You can also update or cancel a deferment. </p>"
+      "documentation":"<p>Modifies the maintenance settings of a cluster.</p>"
     },
     "ModifyClusterParameterGroup":{
       "name":"ModifyClusterParameterGroup",
@@ -1202,7 +1257,7 @@
         {"shape":"ClusterSnapshotNotFoundFault"},
         {"shape":"InvalidRetentionPeriodFault"}
       ],
-      "documentation":"<p>Modifies the settings for a snapshot.</p>"
+      "documentation":"<p>Modifies the settings for a snapshot.</p> <p>This exanmple modifies the manual retention period setting for a cluster snapshot.</p>"
     },
     "ModifyClusterSnapshotSchedule":{
       "name":"ModifyClusterSnapshotSchedule",
@@ -1263,6 +1318,26 @@
       ],
       "documentation":"<p>Modifies an existing Amazon Redshift event notification subscription.</p>"
     },
+    "ModifyScheduledAction":{
+      "name":"ModifyScheduledAction",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"ModifyScheduledActionMessage"},
+      "output":{
+        "shape":"ScheduledAction",
+        "resultWrapper":"ModifyScheduledActionResult"
+      },
+      "errors":[
+        {"shape":"ScheduledActionNotFoundFault"},
+        {"shape":"ScheduledActionTypeUnsupportedFault"},
+        {"shape":"InvalidScheduleFault"},
+        {"shape":"InvalidScheduledActionFault"},
+        {"shape":"UnauthorizedOperation"}
+      ],
+      "documentation":"<p>Modifies a scheduled action. </p>"
+    },
     "ModifySnapshotCopyRetentionPeriod":{
       "name":"ModifySnapshotCopyRetentionPeriod",
       "http":{
@@ -1301,6 +1376,23 @@
       ],
       "documentation":"<p>Modifies a snapshot schedule. Any schedule associated with a cluster is modified asynchronously.</p>"
     },
+    "PauseCluster":{
+      "name":"PauseCluster",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"PauseClusterMessage"},
+      "output":{
+        "shape":"PauseClusterResult",
+        "resultWrapper":"PauseClusterResult"
+      },
+      "errors":[
+        {"shape":"ClusterNotFoundFault"},
+        {"shape":"InvalidClusterStateFault"}
+      ],
+      "documentation":"<p>Pauses a cluster.</p>"
+    },
     "PurchaseReservedNodeOffering":{
       "name":"PurchaseReservedNodeOffering",
       "http":{
@@ -1376,7 +1468,7 @@
         {"shape":"UnauthorizedOperation"},
         {"shape":"LimitExceededFault"}
       ],
-      "documentation":"<p>Changes the size of the cluster. You can change the cluster's type, or change the number or type of nodes. The default behavior is to use the elastic resize method. With an elastic resize, your cluster is available for read and write operations more quickly than with the classic resize method. </p> <p>Elastic resize operations have the following restrictions:</p> <ul> <li> <p>You can only resize clusters of the following types:</p> <ul> <li> <p>dc2.large</p> </li> <li> <p>dc2.8xlarge</p> </li> <li> <p>ds2.xlarge</p> </li> <li> <p>ds2.8xlarge</p> </li> </ul> </li> <li> <p>The type of nodes that you add must match the node type for the cluster.</p> </li> </ul>"
+      "documentation":"<p>Changes the size of the cluster. You can change the cluster's type, or change the number or type of nodes. The default behavior is to use the elastic resize method. With an elastic resize, your cluster is available for read and write operations more quickly than with the classic resize method. </p> <p>Elastic resize operations have the following restrictions:</p> <ul> <li> <p>You can only resize clusters of the following types:</p> <ul> <li> <p>dc2.large</p> </li> <li> <p>dc2.8xlarge</p> </li> <li> <p>ds2.xlarge</p> </li> <li> <p>ds2.8xlarge</p> </li> <li> <p>ra3.16xlarge</p> </li> </ul> </li> <li> <p>The type of nodes that you add must match the node type for the cluster.</p> </li> </ul>"
     },
     "RestoreFromClusterSnapshot":{
       "name":"RestoreFromClusterSnapshot",
@@ -1440,6 +1532,23 @@
       ],
       "documentation":"<p>Creates a new table from a table in an Amazon Redshift cluster snapshot. You must create the new table within the Amazon Redshift cluster that the snapshot was taken from.</p> <p>You cannot use <code>RestoreTableFromClusterSnapshot</code> to restore a table with the same name as an existing table in an Amazon Redshift cluster. That is, you cannot overwrite an existing table in a cluster with a restored table. If you want to replace your original table with a new, restored table, then rename or drop your original table before you call <code>RestoreTableFromClusterSnapshot</code>. When you have renamed your original table, then you can pass the original name of the table as the <code>NewTableName</code> parameter value in the call to <code>RestoreTableFromClusterSnapshot</code>. This way, you can replace the original table with the table created from the snapshot.</p>"
     },
+    "ResumeCluster":{
+      "name":"ResumeCluster",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"ResumeClusterMessage"},
+      "output":{
+        "shape":"ResumeClusterResult",
+        "resultWrapper":"ResumeClusterResult"
+      },
+      "errors":[
+        {"shape":"ClusterNotFoundFault"},
+        {"shape":"InvalidClusterStateFault"}
+      ],
+      "documentation":"<p>Resumes a paused cluster.</p>"
+    },
     "RevokeClusterSecurityGroupIngress":{
       "name":"RevokeClusterSecurityGroupIngress",
       "http":{
@@ -1580,7 +1689,11 @@
     },
     "ActionType":{
       "type":"string",
-      "enum":["restore-cluster"]
+      "enum":[
+        "restore-cluster",
+        "recommend-node-config",
+        "resize-cluster"
+      ]
     },
     "AssociatedClusterList":{
       "type":"list",
@@ -1864,7 +1977,7 @@
         },
         "ClusterStatus":{
           "shape":"String",
-          "documentation":"<p> The current state of the cluster. Possible values are the following:</p> <ul> <li> <p> <code>available</code> </p> </li> <li> <p> <code>available, prep-for-resize</code> </p> </li> <li> <p> <code>available, resize-cleanup</code> </p> </li> <li> <p> <code>cancelling-resize</code> </p> </li> <li> <p> <code>creating</code> </p> </li> <li> <p> <code>deleting</code> </p> </li> <li> <p> <code>final-snapshot</code> </p> </li> <li> <p> <code>hardware-failure</code> </p> </li> <li> <p> <code>incompatible-hsm</code> </p> </li> <li> <p> <code>incompatible-network</code> </p> </li> <li> <p> <code>incompatible-parameters</code> </p> </li> <li> <p> <code>incompatible-restore</code> </p> </li> <li> <p> <code>modifying</code> </p> </li> <li> <p> <code>rebooting</code> </p> </li> <li> <p> <code>renaming</code> </p> </li> <li> <p> <code>resizing</code> </p> </li> <li> <p> <code>rotating-keys</code> </p> </li> <li> <p> <code>storage-full</code> </p> </li> <li> <p> <code>updating-hsm</code> </p> </li> </ul>"
+          "documentation":"<p> The current state of the cluster. Possible values are the following:</p> <ul> <li> <p> <code>available</code> </p> </li> <li> <p> <code>available, prep-for-resize</code> </p> </li> <li> <p> <code>available, resize-cleanup</code> </p> </li> <li> <p> <code>cancelling-resize</code> </p> </li> <li> <p> <code>creating</code> </p> </li> <li> <p> <code>deleting</code> </p> </li> <li> <p> <code>final-snapshot</code> </p> </li> <li> <p> <code>hardware-failure</code> </p> </li> <li> <p> <code>incompatible-hsm</code> </p> </li> <li> <p> <code>incompatible-network</code> </p> </li> <li> <p> <code>incompatible-parameters</code> </p> </li> <li> <p> <code>incompatible-restore</code> </p> </li> <li> <p> <code>modifying</code> </p> </li> <li> <p> <code>paused</code> </p> </li> <li> <p> <code>rebooting</code> </p> </li> <li> <p> <code>renaming</code> </p> </li> <li> <p> <code>resizing</code> </p> </li> <li> <p> <code>rotating-keys</code> </p> </li> <li> <p> <code>storage-full</code> </p> </li> <li> <p> <code>updating-hsm</code> </p> </li> </ul>"
         },
         "ClusterAvailabilityStatus":{
           "shape":"String",
@@ -2752,7 +2865,7 @@
         },
         "NodeType":{
           "shape":"String",
-          "documentation":"<p>The node type to be provisioned for the cluster. For information about node types, go to <a href=\"https://docs.aws.amazon.com/redshift/latest/mgmt/working-with-clusters.html#how-many-nodes\"> Working with Clusters</a> in the <i>Amazon Redshift Cluster Management Guide</i>. </p> <p>Valid Values: <code>ds2.xlarge</code> | <code>ds2.8xlarge</code> | <code>ds2.xlarge</code> | <code>ds2.8xlarge</code> | <code>dc1.large</code> | <code>dc1.8xlarge</code> | <code>dc2.large</code> | <code>dc2.8xlarge</code> </p>"
+          "documentation":"<p>The node type to be provisioned for the cluster. For information about node types, go to <a href=\"https://docs.aws.amazon.com/redshift/latest/mgmt/working-with-clusters.html#how-many-nodes\"> Working with Clusters</a> in the <i>Amazon Redshift Cluster Management Guide</i>. </p> <p>Valid Values: <code>ds2.xlarge</code> | <code>ds2.8xlarge</code> | <code>dc1.large</code> | <code>dc1.8xlarge</code> | <code>dc2.large</code> | <code>dc2.8xlarge</code> | <code>ra3.16xlarge</code> </p>"
         },
         "MasterUsername":{
           "shape":"String",
@@ -2776,7 +2889,7 @@
         },
         "AvailabilityZone":{
           "shape":"String",
-          "documentation":"<p>The EC2 Availability Zone (AZ) in which you want Amazon Redshift to provision the cluster. For example, if you have several EC2 instances running in a specific Availability Zone, then you might want the cluster to be provisioned in the same zone in order to decrease network latency.</p> <p>Default: A random, system-chosen Availability Zone in the region that is specified by the endpoint.</p> <p>Example: <code>us-east-1d</code> </p> <p>Constraint: The specified Availability Zone must be in the same region as the current endpoint.</p>"
+          "documentation":"<p>The EC2 Availability Zone (AZ) in which you want Amazon Redshift to provision the cluster. For example, if you have several EC2 instances running in a specific Availability Zone, then you might want the cluster to be provisioned in the same zone in order to decrease network latency.</p> <p>Default: A random, system-chosen Availability Zone in the region that is specified by the endpoint.</p> <p>Example: <code>us-east-2d</code> </p> <p>Constraint: The specified Availability Zone must be in the same region as the current endpoint.</p>"
         },
         "PreferredMaintenanceWindow":{
           "shape":"String",
@@ -3010,7 +3123,7 @@
         },
         "SourceType":{
           "shape":"String",
-          "documentation":"<p>The type of source that will be generating the events. For example, if you want to be notified of events generated by a cluster, you would set this parameter to cluster. If this value is not specified, events are returned for all Amazon Redshift objects in your AWS account. You must specify a source type in order to specify source IDs.</p> <p>Valid values: cluster, cluster-parameter-group, cluster-security-group, and cluster-snapshot.</p>"
+          "documentation":"<p>The type of source that will be generating the events. For example, if you want to be notified of events generated by a cluster, you would set this parameter to cluster. If this value is not specified, events are returned for all Amazon Redshift objects in your AWS account. You must specify a source type in order to specify source IDs.</p> <p>Valid values: cluster, cluster-parameter-group, cluster-security-group, cluster-snapshot, and scheduled-action.</p>"
         },
         "SourceIds":{
           "shape":"SourceIdsList",
@@ -3110,6 +3223,49 @@
         "HsmConfiguration":{"shape":"HsmConfiguration"}
       }
     },
+    "CreateScheduledActionMessage":{
+      "type":"structure",
+      "required":[
+        "ScheduledActionName",
+        "TargetAction",
+        "Schedule",
+        "IamRole"
+      ],
+      "members":{
+        "ScheduledActionName":{
+          "shape":"String",
+          "documentation":"<p>The name of the scheduled action. The name must be unique within an account. For more information about this parameter, see <a>ScheduledAction</a>. </p>"
+        },
+        "TargetAction":{
+          "shape":"ScheduledActionType",
+          "documentation":"<p>A JSON format string of the Amazon Redshift API operation with input parameters. For more information about this parameter, see <a>ScheduledAction</a>. </p>"
+        },
+        "Schedule":{
+          "shape":"String",
+          "documentation":"<p>The schedule in <code>at( )</code> or <code>cron( )</code> format. For more information about this parameter, see <a>ScheduledAction</a>.</p>"
+        },
+        "IamRole":{
+          "shape":"String",
+          "documentation":"<p>The IAM role to assume to run the target action. For more information about this parameter, see <a>ScheduledAction</a>. </p>"
+        },
+        "ScheduledActionDescription":{
+          "shape":"String",
+          "documentation":"<p>The description of the scheduled action. </p>"
+        },
+        "StartTime":{
+          "shape":"TStamp",
+          "documentation":"<p>The start time in UTC of the scheduled action. Before this time, the scheduled action does not trigger. For more information about this parameter, see <a>ScheduledAction</a>.</p>"
+        },
+        "EndTime":{
+          "shape":"TStamp",
+          "documentation":"<p>The end time in UTC of the scheduled action. After this time, the scheduled action does not trigger. For more information about this parameter, see <a>ScheduledAction</a>. </p>"
+        },
+        "Enable":{
+          "shape":"BooleanOptional",
+          "documentation":"<p>If true, the schedule is enabled. If false, the scheduled action does not trigger. For more information about <code>state</code> of the scheduled action, see <a>ScheduledAction</a>. </p>"
+        }
+      }
+    },
     "CreateSnapshotCopyGrantMessage":{
       "type":"structure",
       "required":["SnapshotCopyGrantName"],
@@ -3173,7 +3329,7 @@
       "members":{
         "ResourceName":{
           "shape":"String",
-          "documentation":"<p>The Amazon Resource Name (ARN) to which you want to add the tag or tags. For example, <code>arn:aws:redshift:us-east-1:123456789:cluster:t1</code>. </p>"
+          "documentation":"<p>The Amazon Resource Name (ARN) to which you want to add the tag or tags. For example, <code>arn:aws:redshift:us-east-2:123456789:cluster:t1</code>. </p>"
         },
         "Tags":{
           "shape":"TagList",
@@ -3399,6 +3555,16 @@
       },
       "documentation":"<p/>"
     },
+    "DeleteScheduledActionMessage":{
+      "type":"structure",
+      "required":["ScheduledActionName"],
+      "members":{
+        "ScheduledActionName":{
+          "shape":"String",
+          "documentation":"<p>The name of the scheduled action to delete. </p>"
+        }
+      }
+    },
     "DeleteSnapshotCopyGrantMessage":{
       "type":"structure",
       "required":["SnapshotCopyGrantName"],
@@ -3429,7 +3595,7 @@
       "members":{
         "ResourceName":{
           "shape":"String",
-          "documentation":"<p>The Amazon Resource Name (ARN) from which you want to remove the tag or tags. For example, <code>arn:aws:redshift:us-east-1:123456789:cluster:t1</code>. </p>"
+          "documentation":"<p>The Amazon Resource Name (ARN) from which you want to remove the tag or tags. For example, <code>arn:aws:redshift:us-east-2:123456789:cluster:t1</code>. </p>"
         },
         "TagKeys":{
           "shape":"TagKeyList",
@@ -3738,7 +3904,7 @@
       "members":{
         "SourceType":{
           "shape":"String",
-          "documentation":"<p>The source type, such as cluster or parameter group, to which the described event categories apply.</p> <p>Valid values: cluster, cluster-snapshot, cluster-parameter-group, and cluster-security-group.</p>"
+          "documentation":"<p>The source type, such as cluster or parameter group, to which the described event categories apply.</p> <p>Valid values: cluster, cluster-snapshot, cluster-parameter-group, cluster-security-group, and scheduled-action.</p>"
         }
       },
       "documentation":"<p/>"
@@ -3872,7 +4038,11 @@
       "members":{
         "ActionType":{
           "shape":"ActionType",
-          "documentation":"<p>The action type to evaluate for possible node configurations. Currently, it must be \"restore-cluster\".</p>"
+          "documentation":"<p>The action type to evaluate for possible node configurations. Specify \"restore-cluster\" to get configuration combinations based on an existing snapshot. Specify \"recommend-node-config\" to get configuration recommendations based on an existing cluster or snapshot. Specify \"resize-cluster\" to get configuration combinations for elastic resize based on an existing cluster. </p>"
+        },
+        "ClusterIdentifier":{
+          "shape":"String",
+          "documentation":"<p>The identifier of the cluster to evaluate for possible node configurations.</p>"
         },
         "SnapshotIdentifier":{
           "shape":"String",
@@ -3966,6 +4136,43 @@
       },
       "documentation":"<p/>"
     },
+    "DescribeScheduledActionsMessage":{
+      "type":"structure",
+      "members":{
+        "ScheduledActionName":{
+          "shape":"String",
+          "documentation":"<p>The name of the scheduled action to retrieve. </p>"
+        },
+        "TargetActionType":{
+          "shape":"ScheduledActionTypeValues",
+          "documentation":"<p>The type of the scheduled actions to retrieve. </p>"
+        },
+        "StartTime":{
+          "shape":"TStamp",
+          "documentation":"<p>The start time in UTC of the scheduled actions to retrieve. Only active scheduled actions that have invocations after this time are retrieved.</p>"
+        },
+        "EndTime":{
+          "shape":"TStamp",
+          "documentation":"<p>The end time in UTC of the scheduled action to retrieve. Only active scheduled actions that have invocations before this time are retrieved.</p>"
+        },
+        "Active":{
+          "shape":"BooleanOptional",
+          "documentation":"<p>If true, retrieve only active scheduled actions. If false, retrieve only disabled scheduled actions. </p>"
+        },
+        "Filters":{
+          "shape":"ScheduledActionFilterList",
+          "documentation":"<p>List of scheduled action filters. </p>"
+        },
+        "Marker":{
+          "shape":"String",
+          "documentation":"<p>An optional parameter that specifies the starting point to return a set of response records. When the results of a <a>DescribeScheduledActions</a> request exceed the value specified in <code>MaxRecords</code>, AWS returns a value in the <code>Marker</code> field of the response. You can retrieve the next set of response records by providing the returned marker value in the <code>Marker</code> parameter and retrying the request. </p>"
+        },
+        "MaxRecords":{
+          "shape":"IntegerOptional",
+          "documentation":"<p>The maximum number of response records to return in each call. If the number of remaining response records exceeds the specified <code>MaxRecords</code> value, a value is returned in a <code>marker</code> field of the response. You can retrieve the next set of records by retrying the command with the returned marker value. </p> <p>Default: <code>100</code> </p> <p>Constraints: minimum 20, maximum 100.</p>"
+        }
+      }
+    },
     "DescribeSnapshotCopyGrantsMessage":{
       "type":"structure",
       "members":{
@@ -4061,7 +4268,7 @@
       "members":{
         "ResourceName":{
           "shape":"String",
-          "documentation":"<p>The Amazon Resource Name (ARN) for which you want to describe the tag or tags. For example, <code>arn:aws:redshift:us-east-1:123456789:cluster:t1</code>. </p>"
+          "documentation":"<p>The Amazon Resource Name (ARN) for which you want to describe the tag or tags. For example, <code>arn:aws:redshift:us-east-2:123456789:cluster:t1</code>. </p>"
         },
         "ResourceType":{
           "shape":"String",
@@ -4373,7 +4580,7 @@
         },
         "SourceType":{
           "shape":"String",
-          "documentation":"<p>The source type of the events returned the Amazon Redshift event notification, such as cluster, or cluster-snapshot.</p>"
+          "documentation":"<p>The source type of the events returned by the Amazon Redshift event notification, such as cluster, cluster-snapshot, cluster-parameter-group, cluster-security-group, or scheduled-action. </p>"
         },
         "SourceIdsList":{
           "shape":"SourceIdsList",
@@ -4988,6 +5195,18 @@
       },
       "exception":true
     },
+    "InvalidScheduledActionFault":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>The scheduled action is not valid. </p>",
+      "error":{
+        "code":"InvalidScheduledAction",
+        "httpStatusCode":400,
+        "senderFault":true
+      },
+      "exception":true
+    },
     "InvalidSnapshotCopyGrantStateFault":{
       "type":"structure",
       "members":{
@@ -5122,6 +5341,13 @@
       },
       "documentation":"<p>Defines a maintenance track that determines which Amazon Redshift version to apply during a maintenance window. If the value for <code>MaintenanceTrack</code> is <code>current</code>, the cluster is updated to the most recently certified maintenance release. If the value is <code>trailing</code>, the cluster is updated to the previously certified maintenance release. </p>"
     },
+    "Mode":{
+      "type":"string",
+      "enum":[
+        "standard",
+        "high-performance"
+      ]
+    },
     "ModifyClusterDbRevisionMessage":{
       "type":"structure",
       "required":[
@@ -5220,11 +5446,11 @@
         },
         "NodeType":{
           "shape":"String",
-          "documentation":"<p>The new node type of the cluster. If you specify a new node type, you must also specify the number of nodes parameter.</p> <p>When you submit your request to resize a cluster, Amazon Redshift sets access permissions for the cluster to read-only. After Amazon Redshift provisions a new cluster according to your resize requirements, there will be a temporary outage while the old cluster is deleted and your connection is switched to the new cluster. When the new connection is complete, the original access permissions for the cluster are restored. You can use <a>DescribeResize</a> to track the progress of the resize request. </p> <p>Valid Values: <code>ds2.xlarge</code> | <code>ds2.8xlarge</code> | <code>dc1.large</code> | <code>dc1.8xlarge</code> | <code>dc2.large</code> | <code>dc2.8xlarge</code> </p>"
+          "documentation":"<p>The new node type of the cluster. If you specify a new node type, you must also specify the number of nodes parameter.</p> <p> For more information about resizing clusters, go to <a href=\"https://docs.aws.amazon.com/redshift/latest/mgmt/rs-resize-tutorial.html\">Resizing Clusters in Amazon Redshift</a> in the <i>Amazon Redshift Cluster Management Guide</i>.</p> <p>Valid Values: <code>ds2.xlarge</code> | <code>ds2.8xlarge</code> | <code>dc1.large</code> | <code>dc1.8xlarge</code> | <code>dc2.large</code> | <code>dc2.8xlarge</code> | <code>ra3.16xlarge</code> </p>"
         },
         "NumberOfNodes":{
           "shape":"IntegerOptional",
-          "documentation":"<p>The new number of nodes of the cluster. If you specify a new number of nodes, you must also specify the node type parameter.</p> <p>When you submit your request to resize a cluster, Amazon Redshift sets access permissions for the cluster to read-only. After Amazon Redshift provisions a new cluster according to your resize requirements, there will be a temporary outage while the old cluster is deleted and your connection is switched to the new cluster. When the new connection is complete, the original access permissions for the cluster are restored. You can use <a>DescribeResize</a> to track the progress of the resize request. </p> <p>Valid Values: Integer greater than <code>0</code>.</p>"
+          "documentation":"<p>The new number of nodes of the cluster. If you specify a new number of nodes, you must also specify the node type parameter.</p> <p> For more information about resizing clusters, go to <a href=\"https://docs.aws.amazon.com/redshift/latest/mgmt/rs-resize-tutorial.html\">Resizing Clusters in Amazon Redshift</a> in the <i>Amazon Redshift Cluster Management Guide</i>.</p> <p>Valid Values: Integer greater than <code>0</code>.</p>"
         },
         "ClusterSecurityGroups":{
           "shape":"ClusterSecurityGroupNameList",
@@ -5292,7 +5518,7 @@
         },
         "Encrypted":{
           "shape":"BooleanOptional",
-          "documentation":"<p>Indicates whether the cluster is encrypted. If the cluster is encrypted and you provide a value for the <code>KmsKeyId</code> parameter, we will encrypt the cluster with the provided <code>KmsKeyId</code>. If you don't provide a <code>KmsKeyId</code>, we will encrypt with the default key. In the China region we will use legacy encryption if you specify that the cluster is encrypted.</p>"
+          "documentation":"<p>Indicates whether the cluster is encrypted. If the value is encrypted (true) and you provide a value for the <code>KmsKeyId</code> parameter, we encrypt the cluster with the provided <code>KmsKeyId</code>. If you don't provide a <code>KmsKeyId</code>, we encrypt with the default key. In the China region we use legacy encryption if you specify that the cluster is encrypted.</p> <p>If the value is not encrypted (false), then the cluster is decrypted. </p>"
         },
         "KmsKeyId":{
           "shape":"String",
@@ -5409,7 +5635,7 @@
         },
         "SourceType":{
           "shape":"String",
-          "documentation":"<p>The type of source that will be generating the events. For example, if you want to be notified of events generated by a cluster, you would set this parameter to cluster. If this value is not specified, events are returned for all Amazon Redshift objects in your AWS account. You must specify a source type in order to specify source IDs.</p> <p>Valid values: cluster, cluster-parameter-group, cluster-security-group, and cluster-snapshot.</p>"
+          "documentation":"<p>The type of source that will be generating the events. For example, if you want to be notified of events generated by a cluster, you would set this parameter to cluster. If this value is not specified, events are returned for all Amazon Redshift objects in your AWS account. You must specify a source type in order to specify source IDs.</p> <p>Valid values: cluster, cluster-parameter-group, cluster-security-group, cluster-snapshot, and scheduled-action.</p>"
         },
         "SourceIds":{
           "shape":"SourceIdsList",
@@ -5436,6 +5662,44 @@
         "EventSubscription":{"shape":"EventSubscription"}
       }
     },
+    "ModifyScheduledActionMessage":{
+      "type":"structure",
+      "required":["ScheduledActionName"],
+      "members":{
+        "ScheduledActionName":{
+          "shape":"String",
+          "documentation":"<p>The name of the scheduled action to modify. </p>"
+        },
+        "TargetAction":{
+          "shape":"ScheduledActionType",
+          "documentation":"<p>A modified JSON format of the scheduled action. For more information about this parameter, see <a>ScheduledAction</a>. </p>"
+        },
+        "Schedule":{
+          "shape":"String",
+          "documentation":"<p>A modified schedule in either <code>at( )</code> or <code>cron( )</code> format. For more information about this parameter, see <a>ScheduledAction</a>.</p>"
+        },
+        "IamRole":{
+          "shape":"String",
+          "documentation":"<p>A different IAM role to assume to run the target action. For more information about this parameter, see <a>ScheduledAction</a>.</p>"
+        },
+        "ScheduledActionDescription":{
+          "shape":"String",
+          "documentation":"<p>A modified description of the scheduled action. </p>"
+        },
+        "StartTime":{
+          "shape":"TStamp",
+          "documentation":"<p>A modified start time of the scheduled action. For more information about this parameter, see <a>ScheduledAction</a>. </p>"
+        },
+        "EndTime":{
+          "shape":"TStamp",
+          "documentation":"<p>A modified end time of the scheduled action. For more information about this parameter, see <a>ScheduledAction</a>. </p>"
+        },
+        "Enable":{
+          "shape":"BooleanOptional",
+          "documentation":"<p>A modified enable flag of the scheduled action. If true, the scheduled action is active. If false, the scheduled action is disabled. </p>"
+        }
+      }
+    },
     "ModifySnapshotCopyRetentionPeriodMessage":{
       "type":"structure",
       "required":[
@@ -5495,6 +5759,10 @@
         "EstimatedDiskUtilizationPercent":{
           "shape":"DoubleOptional",
           "documentation":"<p>The estimated disk utilizaton percentage.</p>"
+        },
+        "Mode":{
+          "shape":"Mode",
+          "documentation":"<p>The category of the node configuration recommendation.</p>"
         }
       },
       "documentation":"<p>A list of node configurations.</p>"
@@ -5537,7 +5805,8 @@
       "enum":[
         "NodeType",
         "NumberOfNodes",
-        "EstimatedDiskUtilizationPercent"
+        "EstimatedDiskUtilizationPercent",
+        "Mode"
       ]
     },
     "NodeConfigurationOptionsMessage":{
@@ -5696,6 +5965,22 @@
         "locationName":"Parameter"
       }
     },
+    "PauseClusterMessage":{
+      "type":"structure",
+      "required":["ClusterIdentifier"],
+      "members":{
+        "ClusterIdentifier":{
+          "shape":"String",
+          "documentation":"<p>The identifier of the cluster to be paused.</p>"
+        }
+      }
+    },
+    "PauseClusterResult":{
+      "type":"structure",
+      "members":{
+        "Cluster":{"shape":"Cluster"}
+      }
+    },
     "PendingActionsList":{
       "type":"list",
       "member":{"shape":"String"}
@@ -6042,10 +6327,7 @@
     },
     "ResizeClusterMessage":{
       "type":"structure",
-      "required":[
-        "ClusterIdentifier",
-        "NumberOfNodes"
-      ],
+      "required":["ClusterIdentifier"],
       "members":{
         "ClusterIdentifier":{
           "shape":"String",
@@ -6215,7 +6497,7 @@
         },
         "AvailabilityZone":{
           "shape":"String",
-          "documentation":"<p>The Amazon EC2 Availability Zone in which to restore the cluster.</p> <p>Default: A random, system-chosen Availability Zone.</p> <p>Example: <code>us-east-1a</code> </p>"
+          "documentation":"<p>The Amazon EC2 Availability Zone in which to restore the cluster.</p> <p>Default: A random, system-chosen Availability Zone.</p> <p>Example: <code>us-east-2a</code> </p>"
         },
         "AllowVersionUpgrade":{
           "shape":"BooleanOptional",
@@ -6319,23 +6601,23 @@
         },
         "CurrentRestoreRateInMegaBytesPerSecond":{
           "shape":"Double",
-          "documentation":"<p>The number of megabytes per second being transferred from the backup storage. Returns the average rate for a completed backup.</p>"
+          "documentation":"<p>The number of megabytes per second being transferred from the backup storage. Returns the average rate for a completed backup. This field is only updated when you restore to DC2 and DS2 node types. </p>"
         },
         "SnapshotSizeInMegaBytes":{
           "shape":"Long",
-          "documentation":"<p>The size of the set of snapshot data used to restore the cluster.</p>"
+          "documentation":"<p>The size of the set of snapshot data used to restore the cluster. This field is only updated when you restore to DC2 and DS2 node types. </p>"
         },
         "ProgressInMegaBytes":{
           "shape":"Long",
-          "documentation":"<p>The number of megabytes that have been transferred from snapshot storage.</p>"
+          "documentation":"<p>The number of megabytes that have been transferred from snapshot storage. This field is only updated when you restore to DC2 and DS2 node types. </p>"
         },
         "ElapsedTimeInSeconds":{
           "shape":"Long",
-          "documentation":"<p>The amount of time an in-progress restore has been running, or the amount of time it took a completed restore to finish.</p>"
+          "documentation":"<p>The amount of time an in-progress restore has been running, or the amount of time it took a completed restore to finish. This field is only updated when you restore to DC2 and DS2 node types. </p>"
         },
         "EstimatedTimeToCompletionInSeconds":{
           "shape":"Long",
-          "documentation":"<p>The estimate of the time remaining before the restore will complete. Returns 0 for a completed restore.</p>"
+          "documentation":"<p>The estimate of the time remaining before the restore will complete. Returns 0 for a completed restore. This field is only updated when you restore to DC2 and DS2 node types. </p>"
         }
       },
       "documentation":"<p>Describes the status of a cluster restore action. Returns null if the cluster was not created by restoring a snapshot.</p>"
@@ -6391,6 +6673,22 @@
         "TableRestoreStatus":{"shape":"TableRestoreStatus"}
       }
     },
+    "ResumeClusterMessage":{
+      "type":"structure",
+      "required":["ClusterIdentifier"],
+      "members":{
+        "ClusterIdentifier":{
+          "shape":"String",
+          "documentation":"<p>The identifier of the cluster to be resumed.</p>"
+        }
+      }
+    },
+    "ResumeClusterResult":{
+      "type":"structure",
+      "members":{
+        "Cluster":{"shape":"Cluster"}
+      }
+    },
     "RevisionTarget":{
       "type":"structure",
       "members":{
@@ -6553,6 +6851,188 @@
         "FAILED"
       ]
     },
+    "ScheduledAction":{
+      "type":"structure",
+      "members":{
+        "ScheduledActionName":{
+          "shape":"String",
+          "documentation":"<p>The name of the scheduled action. </p>"
+        },
+        "TargetAction":{
+          "shape":"ScheduledActionType",
+          "documentation":"<p>A JSON format string of the Amazon Redshift API operation with input parameters. </p> <p>\"<code>{\\\"ResizeCluster\\\":{\\\"NodeType\\\":\\\"ds2.8xlarge\\\",\\\"ClusterIdentifier\\\":\\\"my-test-cluster\\\",\\\"NumberOfNodes\\\":3}}</code>\". </p>"
+        },
+        "Schedule":{
+          "shape":"String",
+          "documentation":"<p>The schedule for a one-time (at format) or recurring (cron format) scheduled action. Schedule invocations must be separated by at least one hour.</p> <p>Format of at expressions is \"<code>at(yyyy-mm-ddThh:mm:ss)</code>\". For example, \"<code>at(2016-03-04T17:27:00)</code>\".</p> <p>Format of cron expressions is \"<code>cron(Minutes Hours Day-of-month Month Day-of-week Year)</code>\". For example, \"<code>cron(0 10 ? * MON *)</code>\". For more information, see <a href=\"https://docs.aws.amazon.com/AmazonCloudWatch/latest/events/ScheduledEvents.html#CronExpressions\">Cron Expressions</a> in the <i>Amazon CloudWatch Events User Guide</i>.</p>"
+        },
+        "IamRole":{
+          "shape":"String",
+          "documentation":"<p>The IAM role to assume to run the scheduled action. This IAM role must have permission to run the Amazon Redshift API operation in the scheduled action. This IAM role must allow the Amazon Redshift scheduler (Principal scheduler.redshift.amazonaws.com) to assume permissions on your behalf. For more information about the IAM role to use with the Amazon Redshift scheduler, see <a href=\"https://docs.aws.amazon.com/redshift/latest/mgmt/redshift-iam-access-control-identity-based.html\">Using Identity-Based Policies for Amazon Redshift</a> in the <i>Amazon Redshift Cluster Management Guide</i>. </p>"
+        },
+        "ScheduledActionDescription":{
+          "shape":"String",
+          "documentation":"<p>The description of the scheduled action. </p>"
+        },
+        "State":{
+          "shape":"ScheduledActionState",
+          "documentation":"<p>The state of the scheduled action. For example, <code>DISABLED</code>. </p>"
+        },
+        "NextInvocations":{
+          "shape":"ScheduledActionTimeList",
+          "documentation":"<p>List of times when the scheduled action will run. </p>"
+        },
+        "StartTime":{
+          "shape":"TStamp",
+          "documentation":"<p>The start time in UTC when the schedule is active. Before this time, the scheduled action does not trigger. </p>"
+        },
+        "EndTime":{
+          "shape":"TStamp",
+          "documentation":"<p>The end time in UTC when the schedule is no longer active. After this time, the scheduled action does not trigger. </p>"
+        }
+      },
+      "documentation":"<p>Describes a scheduled action. You can use a scheduled action to trigger some Amazon Redshift API operations on a schedule. For information about which API operations can be scheduled, see <a>ScheduledActionType</a>. </p>"
+    },
+    "ScheduledActionAlreadyExistsFault":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>The scheduled action already exists. </p>",
+      "error":{
+        "code":"ScheduledActionAlreadyExists",
+        "httpStatusCode":400,
+        "senderFault":true
+      },
+      "exception":true
+    },
+    "ScheduledActionFilter":{
+      "type":"structure",
+      "required":[
+        "Name",
+        "Values"
+      ],
+      "members":{
+        "Name":{
+          "shape":"ScheduledActionFilterName",
+          "documentation":"<p>The type of element to filter. </p>"
+        },
+        "Values":{
+          "shape":"ValueStringList",
+          "documentation":"<p>List of values. Compare if the value (of type defined by <code>Name</code>) equals an item in the list of scheduled actions. </p>"
+        }
+      },
+      "documentation":"<p>A set of elements to filter the returned scheduled actions. </p>"
+    },
+    "ScheduledActionFilterList":{
+      "type":"list",
+      "member":{
+        "shape":"ScheduledActionFilter",
+        "locationName":"ScheduledActionFilter"
+      }
+    },
+    "ScheduledActionFilterName":{
+      "type":"string",
+      "enum":[
+        "cluster-identifier",
+        "iam-role"
+      ]
+    },
+    "ScheduledActionList":{
+      "type":"list",
+      "member":{
+        "shape":"ScheduledAction",
+        "locationName":"ScheduledAction"
+      }
+    },
+    "ScheduledActionNotFoundFault":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>The scheduled action cannot be found. </p>",
+      "error":{
+        "code":"ScheduledActionNotFound",
+        "httpStatusCode":400,
+        "senderFault":true
+      },
+      "exception":true
+    },
+    "ScheduledActionQuotaExceededFault":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>The quota for scheduled actions exceeded. </p>",
+      "error":{
+        "code":"ScheduledActionQuotaExceeded",
+        "httpStatusCode":400,
+        "senderFault":true
+      },
+      "exception":true
+    },
+    "ScheduledActionState":{
+      "type":"string",
+      "enum":[
+        "ACTIVE",
+        "DISABLED"
+      ]
+    },
+    "ScheduledActionTimeList":{
+      "type":"list",
+      "member":{
+        "shape":"TStamp",
+        "locationName":"ScheduledActionTime"
+      }
+    },
+    "ScheduledActionType":{
+      "type":"structure",
+      "members":{
+        "ResizeCluster":{
+          "shape":"ResizeClusterMessage",
+          "documentation":"<p>An action that runs a <code>ResizeCluster</code> API operation. </p>"
+        },
+        "PauseCluster":{
+          "shape":"PauseClusterMessage",
+          "documentation":"<p>An action that runs a <code>PauseCluster</code> API operation. </p>"
+        },
+        "ResumeCluster":{
+          "shape":"ResumeClusterMessage",
+          "documentation":"<p>An action that runs a <code>ResumeCluster</code> API operation. </p>"
+        }
+      },
+      "documentation":"<p>The action type that specifies an Amazon Redshift API operation that is supported by the Amazon Redshift scheduler. </p>"
+    },
+    "ScheduledActionTypeUnsupportedFault":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>The action type specified for a scheduled action is not supported. </p>",
+      "error":{
+        "code":"ScheduledActionTypeUnsupported",
+        "httpStatusCode":400,
+        "senderFault":true
+      },
+      "exception":true
+    },
+    "ScheduledActionTypeValues":{
+      "type":"string",
+      "enum":[
+        "ResizeCluster",
+        "PauseCluster",
+        "ResumeCluster"
+      ]
+    },
+    "ScheduledActionsMessage":{
+      "type":"structure",
+      "members":{
+        "Marker":{
+          "shape":"String",
+          "documentation":"<p>An optional parameter that specifies the starting point to return a set of response records. When the results of a <a>DescribeScheduledActions</a> request exceed the value specified in <code>MaxRecords</code>, AWS returns a value in the <code>Marker</code> field of the response. You can retrieve the next set of response records by providing the returned marker value in the <code>Marker</code> parameter and retrying the request. </p>"
+        },
+        "ScheduledActions":{
+          "shape":"ScheduledActionList",
+          "documentation":"<p>List of retrieved scheduled actions. </p>"
+        }
+      }
+    },
     "ScheduledSnapshotTimeList":{
       "type":"list",
       "member":{
@@ -7016,7 +7496,8 @@
         "cluster",
         "cluster-parameter-group",
         "cluster-security-group",
-        "cluster-snapshot"
+        "cluster-snapshot",
+        "scheduled-action"
       ]
     },
     "String":{"type":"string"},
@@ -7334,7 +7815,7 @@
         },
         "ResourceName":{
           "shape":"String",
-          "documentation":"<p>The Amazon Resource Name (ARN) with which the tag is associated, for example: <code>arn:aws:redshift:us-east-1:123456789:cluster:t1</code>.</p>"
+          "documentation":"<p>The Amazon Resource Name (ARN) with which the tag is associated, for example: <code>arn:aws:redshift:us-east-2:123456789:cluster:t1</code>.</p>"
         },
         "ResourceType":{
           "shape":"String",
diff --git a/services/redshift/src/test/resources/cucumber.properties b/services/redshift/src/test/resources/cucumber.properties
index e582d5e600aa..4f17a5217951 100644
--- a/services/redshift/src/test/resources/cucumber.properties
+++ b/services/redshift/src/test/resources/cucumber.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/rekognition/build.properties b/services/rekognition/build.properties
index ecf2dae6fcb1..15ec2da1fc71 100644
--- a/services/rekognition/build.properties
+++ b/services/rekognition/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/rekognition/pom.xml b/services/rekognition/pom.xml
index 0e7affdefa5b..2317f3b84e45 100644
--- a/services/rekognition/pom.xml
+++ b/services/rekognition/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>rekognition</artifactId>
     <name>AWS Java SDK :: Services :: Amazon Rekognition</name>
diff --git a/services/rekognition/src/main/resources/codegen-resources/paginators-1.json b/services/rekognition/src/main/resources/codegen-resources/paginators-1.json
index 2448075c8b04..0cca435bb35f 100644
--- a/services/rekognition/src/main/resources/codegen-resources/paginators-1.json
+++ b/services/rekognition/src/main/resources/codegen-resources/paginators-1.json
@@ -1,5 +1,17 @@
 {
   "pagination": {
+    "DescribeProjectVersions": {
+      "input_token": "NextToken",
+      "limit_key": "MaxResults",
+      "output_token": "NextToken",
+      "result_key": "ProjectVersionDescriptions"
+    },
+    "DescribeProjects": {
+      "input_token": "NextToken",
+      "limit_key": "MaxResults",
+      "output_token": "NextToken",
+      "result_key": "ProjectDescriptions"
+    },
     "GetCelebrityRecognition": {
       "input_token": "NextToken",
       "limit_key": "MaxResults",
@@ -30,6 +42,11 @@
       "limit_key": "MaxResults",
       "output_token": "NextToken"
     },
+    "GetTextDetection": {
+      "input_token": "NextToken",
+      "limit_key": "MaxResults",
+      "output_token": "NextToken"
+    },
     "ListCollections": {
       "input_token": "NextToken",
       "limit_key": "MaxResults",
diff --git a/services/rekognition/src/main/resources/codegen-resources/service-2.json b/services/rekognition/src/main/resources/codegen-resources/service-2.json
index f81e973ddb77..0ed7861c2ead 100644
--- a/services/rekognition/src/main/resources/codegen-resources/service-2.json
+++ b/services/rekognition/src/main/resources/codegen-resources/service-2.json
@@ -30,7 +30,7 @@
         {"shape":"ProvisionedThroughputExceededException"},
         {"shape":"InvalidImageFormatException"}
       ],
-      "documentation":"<p>Compares a face in the <i>source</i> input image with each of the 100 largest faces detected in the <i>target</i> input image. </p> <note> <p> If the source image contains multiple faces, the service detects the largest face and compares it with each face detected in the target image. </p> </note> <p>You pass the input and target images either as base64-encoded image bytes or as references to images in an Amazon S3 bucket. If you use the AWS CLI to call Amazon Rekognition operations, passing image bytes isn't supported. The image must be formatted as a PNG or JPEG file. </p> <p>In response, the operation returns an array of face matches ordered by similarity score in descending order. For each face match, the response provides a bounding box of the face, facial landmarks, pose details (pitch, role, and yaw), quality (brightness and sharpness), and confidence value (indicating the level of confidence that the bounding box contains a face). The response also provides a similarity score, which indicates how closely the faces match. </p> <note> <p>By default, only faces with a similarity score of greater than or equal to 80% are returned in the response. You can change this value by specifying the <code>SimilarityThreshold</code> parameter.</p> </note> <p> <code>CompareFaces</code> also returns an array of faces that don't match the source image. For each face, it returns a bounding box, confidence value, landmarks, pose details, and quality. The response also returns information about the face in the source image, including the bounding box of the face and confidence value.</p> <p>If the image doesn't contain Exif metadata, <code>CompareFaces</code> returns orientation information for the source and target images. Use these values to display the images with the correct image orientation.</p> <p>If no faces are detected in the source or target images, <code>CompareFaces</code> returns an <code>InvalidParameterException</code> error. </p> <note> <p> This is a stateless API operation. That is, data returned by this operation doesn't persist.</p> </note> <p>For an example, see Comparing Faces in Images in the Amazon Rekognition Developer Guide.</p> <p>This operation requires permissions to perform the <code>rekognition:CompareFaces</code> action.</p>"
+      "documentation":"<p>Compares a face in the <i>source</i> input image with each of the 100 largest faces detected in the <i>target</i> input image. </p> <note> <p> If the source image contains multiple faces, the service detects the largest face and compares it with each face detected in the target image. </p> </note> <p>You pass the input and target images either as base64-encoded image bytes or as references to images in an Amazon S3 bucket. If you use the AWS CLI to call Amazon Rekognition operations, passing image bytes isn't supported. The image must be formatted as a PNG or JPEG file. </p> <p>In response, the operation returns an array of face matches ordered by similarity score in descending order. For each face match, the response provides a bounding box of the face, facial landmarks, pose details (pitch, role, and yaw), quality (brightness and sharpness), and confidence value (indicating the level of confidence that the bounding box contains a face). The response also provides a similarity score, which indicates how closely the faces match. </p> <note> <p>By default, only faces with a similarity score of greater than or equal to 80% are returned in the response. You can change this value by specifying the <code>SimilarityThreshold</code> parameter.</p> </note> <p> <code>CompareFaces</code> also returns an array of faces that don't match the source image. For each face, it returns a bounding box, confidence value, landmarks, pose details, and quality. The response also returns information about the face in the source image, including the bounding box of the face and confidence value.</p> <p>The <code>QualityFilter</code> input parameter allows you to filter out detected faces that don’t meet a required quality bar. The quality bar is based on a variety of common use cases. Use <code>QualityFilter</code> to set the quality bar by specifying <code>LOW</code>, <code>MEDIUM</code>, or <code>HIGH</code>. If you do not want to filter detected faces, specify <code>NONE</code>. The default value is <code>NONE</code>. </p> <note> <p>To use quality filtering, you need a collection associated with version 3 of the face model or higher. To get the version of the face model associated with a collection, call <a>DescribeCollection</a>. </p> </note> <p>If the image doesn't contain Exif metadata, <code>CompareFaces</code> returns orientation information for the source and target images. Use these values to display the images with the correct image orientation.</p> <p>If no faces are detected in the source or target images, <code>CompareFaces</code> returns an <code>InvalidParameterException</code> error. </p> <note> <p> This is a stateless API operation. That is, data returned by this operation doesn't persist.</p> </note> <p>For an example, see Comparing Faces in Images in the Amazon Rekognition Developer Guide.</p> <p>This operation requires permissions to perform the <code>rekognition:CompareFaces</code> action.</p>"
     },
     "CreateCollection":{
       "name":"CreateCollection",
@@ -50,6 +50,45 @@
       ],
       "documentation":"<p>Creates a collection in an AWS Region. You can add faces to the collection using the <a>IndexFaces</a> operation. </p> <p>For example, you might create collections, one for each of your application users. A user can then index faces using the <code>IndexFaces</code> operation and persist results in a specific collection. Then, a user can search the collection for faces in the user-specific container. </p> <p>When you create a collection, it is associated with the latest version of the face model version.</p> <note> <p>Collection names are case-sensitive.</p> </note> <p>This operation requires permissions to perform the <code>rekognition:CreateCollection</code> action.</p>"
     },
+    "CreateProject":{
+      "name":"CreateProject",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"CreateProjectRequest"},
+      "output":{"shape":"CreateProjectResponse"},
+      "errors":[
+        {"shape":"ResourceInUseException"},
+        {"shape":"LimitExceededException"},
+        {"shape":"InvalidParameterException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"InternalServerError"},
+        {"shape":"ThrottlingException"},
+        {"shape":"ProvisionedThroughputExceededException"}
+      ],
+      "documentation":"<p>Creates a new Amazon Rekognition Custom Labels project. A project is a logical grouping of resources (images, Labels, models) and operations (training, evaluation and detection). </p> <p>This operation requires permissions to perform the <code>rekognition:CreateProject</code> action.</p>"
+    },
+    "CreateProjectVersion":{
+      "name":"CreateProjectVersion",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"CreateProjectVersionRequest"},
+      "output":{"shape":"CreateProjectVersionResponse"},
+      "errors":[
+        {"shape":"ResourceInUseException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"LimitExceededException"},
+        {"shape":"InvalidParameterException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"InternalServerError"},
+        {"shape":"ThrottlingException"},
+        {"shape":"ProvisionedThroughputExceededException"}
+      ],
+      "documentation":"<p>Creates a new version of a model and begins training. Models are managed as part of an Amazon Rekognition Custom Labels project. You can specify one training dataset and one testing dataset. The response from <code>CreateProjectVersion</code> is an Amazon Resource Name (ARN) for the version of the model. </p> <p>Training takes a while to complete. You can get the current status by calling <a>DescribeProjectVersions</a>.</p> <p>Once training has successfully completed, call <a>DescribeProjectVersions</a> to get the training results and evaluate the model. </p> <p>After evaluating the model, you start the model by calling <a>StartProjectVersion</a>.</p> <p>This operation requires permissions to perform the <code>rekognition:CreateProjectVersion</code> action.</p>"
+    },
     "CreateStreamProcessor":{
       "name":"CreateStreamProcessor",
       "http":{
@@ -105,6 +144,44 @@
       ],
       "documentation":"<p>Deletes faces from a collection. You specify a collection ID and an array of face IDs to remove from the collection.</p> <p>This operation requires permissions to perform the <code>rekognition:DeleteFaces</code> action.</p>"
     },
+    "DeleteProject":{
+      "name":"DeleteProject",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DeleteProjectRequest"},
+      "output":{"shape":"DeleteProjectResponse"},
+      "errors":[
+        {"shape":"ResourceInUseException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InvalidParameterException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"InternalServerError"},
+        {"shape":"ThrottlingException"},
+        {"shape":"ProvisionedThroughputExceededException"}
+      ],
+      "documentation":"<p>Deletes an Amazon Rekognition Custom Labels project. To delete a project you must first delete all versions of the model associated with the project. To delete a version of a model, see <a>DeleteProjectVersion</a>.</p> <p>This operation requires permissions to perform the <code>rekognition:DeleteProject</code> action. </p>"
+    },
+    "DeleteProjectVersion":{
+      "name":"DeleteProjectVersion",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DeleteProjectVersionRequest"},
+      "output":{"shape":"DeleteProjectVersionResponse"},
+      "errors":[
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ResourceInUseException"},
+        {"shape":"InvalidParameterException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"InternalServerError"},
+        {"shape":"ThrottlingException"},
+        {"shape":"ProvisionedThroughputExceededException"}
+      ],
+      "documentation":"<p>Deletes a version of a model. </p> <p>You must first stop the model before you can delete it. To check if a model is running, use the <code>Status</code> field returned from <a>DescribeProjectVersions</a>. To stop a running model call <a>StopProjectVersion</a>. </p> <p>This operation requires permissions to perform the <code>rekognition:DeleteProjectVersion</code> action. </p>"
+    },
     "DeleteStreamProcessor":{
       "name":"DeleteStreamProcessor",
       "http":{
@@ -142,6 +219,43 @@
       ],
       "documentation":"<p>Describes the specified collection. You can use <code>DescribeCollection</code> to get information, such as the number of faces indexed into a collection and the version of the model used by the collection for face detection.</p> <p>For more information, see Describing a Collection in the Amazon Rekognition Developer Guide.</p>"
     },
+    "DescribeProjectVersions":{
+      "name":"DescribeProjectVersions",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DescribeProjectVersionsRequest"},
+      "output":{"shape":"DescribeProjectVersionsResponse"},
+      "errors":[
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InvalidPaginationTokenException"},
+        {"shape":"InvalidParameterException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"InternalServerError"},
+        {"shape":"ThrottlingException"},
+        {"shape":"ProvisionedThroughputExceededException"}
+      ],
+      "documentation":"<p>Lists and describes the models in an Amazon Rekognition Custom Labels project. You can specify up to 10 model versions in <code>ProjectVersionArns</code>. If you don't specify a value, descriptions for all models are returned.</p> <p>This operation requires permissions to perform the <code>rekognition:DescribeProjectVersions</code> action.</p>"
+    },
+    "DescribeProjects":{
+      "name":"DescribeProjects",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DescribeProjectsRequest"},
+      "output":{"shape":"DescribeProjectsResponse"},
+      "errors":[
+        {"shape":"InvalidPaginationTokenException"},
+        {"shape":"InvalidParameterException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"InternalServerError"},
+        {"shape":"ThrottlingException"},
+        {"shape":"ProvisionedThroughputExceededException"}
+      ],
+      "documentation":"<p>Lists and gets information about your Amazon Rekognition Custom Labels projects.</p> <p>This operation requires permissions to perform the <code>rekognition:DescribeProjects</code> action.</p>"
+    },
     "DescribeStreamProcessor":{
       "name":"DescribeStreamProcessor",
       "http":{
@@ -160,6 +274,29 @@
       ],
       "documentation":"<p>Provides information about a stream processor created by <a>CreateStreamProcessor</a>. You can get information about the input and output streams, the input parameters for the face recognition being performed, and the current status of the stream processor.</p>"
     },
+    "DetectCustomLabels":{
+      "name":"DetectCustomLabels",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DetectCustomLabelsRequest"},
+      "output":{"shape":"DetectCustomLabelsResponse"},
+      "errors":[
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ResourceNotReadyException"},
+        {"shape":"InvalidS3ObjectException"},
+        {"shape":"InvalidParameterException"},
+        {"shape":"ImageTooLargeException"},
+        {"shape":"LimitExceededException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"InternalServerError"},
+        {"shape":"ThrottlingException"},
+        {"shape":"ProvisionedThroughputExceededException"},
+        {"shape":"InvalidImageFormatException"}
+      ],
+      "documentation":"<p>Detects custom labels in a supplied image by using an Amazon Rekognition Custom Labels model. </p> <p>You specify which version of a model version to use by using the <code>ProjectVersionArn</code> input parameter. </p> <p>You pass the input image as base64-encoded image bytes or as a reference to an image in an Amazon S3 bucket. If you use the AWS CLI to call Amazon Rekognition operations, passing image bytes is not supported. The image must be either a PNG or JPEG formatted file. </p> <p> For each object that the model version detects on an image, the API returns a (<code>CustomLabel</code>) object in an array (<code>CustomLabels</code>). Each <code>CustomLabel</code> object provides the label name (<code>Name</code>), the level of confidence that the image contains the object (<code>Confidence</code>), and object location information, if it exists, for the label on the image (<code>Geometry</code>). </p> <p>During training model calculates a threshold value that determines if a prediction for a label is true. By default, <code>DetectCustomLabels</code> doesn't return labels whose confidence value is below the model's calculated threshold value. To filter labels that are returned, specify a value for <code>MinConfidence</code> that is higher than the model's calculated threshold. You can get the model's calculated threshold from the model's training results shown in the Amazon Rekognition Custom Labels console. To get all labels, regardless of confidence, specify a <code>MinConfidence</code> value of 0. </p> <p>You can also add the <code>MaxResults</code> parameter to limit the number of labels returned. </p> <p>This is a stateless API operation. That is, the operation does not persist any data.</p> <p>This operation requires permissions to perform the <code>rekognition:DetectCustomLabels</code> action. </p>"
+    },
     "DetectFaces":{
       "name":"DetectFaces",
       "http":{
@@ -178,7 +315,7 @@
         {"shape":"ProvisionedThroughputExceededException"},
         {"shape":"InvalidImageFormatException"}
       ],
-      "documentation":"<p>Detects faces within an image that is provided as input.</p> <p> <code>DetectFaces</code> detects the 100 largest faces in the image. For each face detected, the operation returns face details. These details include a bounding box of the face, a confidence value (that the bounding box contains a face), and a fixed set of attributes such as facial landmarks (for example, coordinates of eye and mouth), gender, presence of beard, sunglasses, and so on. </p> <p>The face-detection algorithm is most effective on frontal faces. For non-frontal or obscured faces, the algorithm might not detect the faces or might detect faces with lower confidence. </p> <p>You pass the input image either as base64-encoded image bytes or as a reference to an image in an Amazon S3 bucket. If you use the to call Amazon Rekognition operations, passing image bytes is not supported. The image must be either a PNG or JPEG formatted file. </p> <note> <p>This is a stateless API operation. That is, the operation does not persist any data.</p> </note> <p>This operation requires permissions to perform the <code>rekognition:DetectFaces</code> action. </p>"
+      "documentation":"<p>Detects faces within an image that is provided as input.</p> <p> <code>DetectFaces</code> detects the 100 largest faces in the image. For each face detected, the operation returns face details. These details include a bounding box of the face, a confidence value (that the bounding box contains a face), and a fixed set of attributes such as facial landmarks (for example, coordinates of eye and mouth), presence of beard, sunglasses, and so on. </p> <p>The face-detection algorithm is most effective on frontal faces. For non-frontal or obscured faces, the algorithm might not detect the faces or might detect faces with lower confidence. </p> <p>You pass the input image either as base64-encoded image bytes or as a reference to an image in an Amazon S3 bucket. If you use the AWS CLI to call Amazon Rekognition operations, passing image bytes is not supported. The image must be either a PNG or JPEG formatted file. </p> <note> <p>This is a stateless API operation. That is, the operation does not persist any data.</p> </note> <p>This operation requires permissions to perform the <code>rekognition:DetectFaces</code> action. </p>"
     },
     "DetectLabels":{
       "name":"DetectLabels",
@@ -216,7 +353,8 @@
         {"shape":"InternalServerError"},
         {"shape":"ThrottlingException"},
         {"shape":"ProvisionedThroughputExceededException"},
-        {"shape":"InvalidImageFormatException"}
+        {"shape":"InvalidImageFormatException"},
+        {"shape":"HumanLoopQuotaExceededException"}
       ],
       "documentation":"<p>Detects unsafe content in a specified JPEG or PNG format image. Use <code>DetectModerationLabels</code> to moderate images depending on your requirements. For example, you might want to filter images that contain nudity, but not images containing suggestive content.</p> <p>To filter images, use the labels returned by <code>DetectModerationLabels</code> to determine which types of content are appropriate.</p> <p>For information about moderation labels, see Detecting Unsafe Content in the Amazon Rekognition Developer Guide.</p> <p>You pass the input image either as base64-encoded image bytes or as a reference to an image in an Amazon S3 bucket. If you use the AWS CLI to call Amazon Rekognition operations, passing image bytes is not supported. The image must be either a PNG or JPEG formatted file. </p>"
     },
@@ -372,6 +510,25 @@
       ],
       "documentation":"<p>Gets the path tracking results of a Amazon Rekognition Video analysis started by <a>StartPersonTracking</a>.</p> <p>The person path tracking operation is started by a call to <code>StartPersonTracking</code> which returns a job identifier (<code>JobId</code>). When the operation finishes, Amazon Rekognition Video publishes a completion status to the Amazon Simple Notification Service topic registered in the initial call to <code>StartPersonTracking</code>.</p> <p>To get the results of the person path tracking operation, first check that the status value published to the Amazon SNS topic is <code>SUCCEEDED</code>. If so, call <a>GetPersonTracking</a> and pass the job identifier (<code>JobId</code>) from the initial call to <code>StartPersonTracking</code>.</p> <p> <code>GetPersonTracking</code> returns an array, <code>Persons</code>, of tracked persons and the time(s) their paths were tracked in the video. </p> <note> <p> <code>GetPersonTracking</code> only returns the default facial attributes (<code>BoundingBox</code>, <code>Confidence</code>, <code>Landmarks</code>, <code>Pose</code>, and <code>Quality</code>). The other facial attributes listed in the <code>Face</code> object of the following response syntax are not returned. </p> <p>For more information, see FaceDetail in the Amazon Rekognition Developer Guide.</p> </note> <p>By default, the array is sorted by the time(s) a person's path is tracked in the video. You can sort by tracked persons by specifying <code>INDEX</code> for the <code>SortBy</code> input parameter.</p> <p>Use the <code>MaxResults</code> parameter to limit the number of items returned. If there are more results than specified in <code>MaxResults</code>, the value of <code>NextToken</code> in the operation response contains a pagination token for getting the next set of results. To get the next page of results, call <code>GetPersonTracking</code> and populate the <code>NextToken</code> request parameter with the token value returned from the previous call to <code>GetPersonTracking</code>.</p>"
     },
+    "GetTextDetection":{
+      "name":"GetTextDetection",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"GetTextDetectionRequest"},
+      "output":{"shape":"GetTextDetectionResponse"},
+      "errors":[
+        {"shape":"AccessDeniedException"},
+        {"shape":"InternalServerError"},
+        {"shape":"InvalidParameterException"},
+        {"shape":"InvalidPaginationTokenException"},
+        {"shape":"ProvisionedThroughputExceededException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ThrottlingException"}
+      ],
+      "documentation":"<p>Gets the text detection results of a Amazon Rekognition Video analysis started by <a>StartTextDetection</a>.</p> <p>Text detection with Amazon Rekognition Video is an asynchronous operation. You start text detection by calling <a>StartTextDetection</a> which returns a job identifier (<code>JobId</code>) When the text detection operation finishes, Amazon Rekognition publishes a completion status to the Amazon Simple Notification Service topic registered in the initial call to <code>StartTextDetection</code>. To get the results of the text detection operation, first check that the status value published to the Amazon SNS topic is <code>SUCCEEDED</code>. if so, call <code>GetTextDetection</code> and pass the job identifier (<code>JobId</code>) from the initial call of <code>StartLabelDetection</code>.</p> <p> <code>GetTextDetection</code> returns an array of detected text (<code>TextDetections</code>) sorted by the time the text was detected, up to 50 words per frame of video.</p> <p>Each element of the array includes the detected text, the precentage confidence in the acuracy of the detected text, the time the text was detected, bounding box information for where the text was located, and unique identifiers for words and their lines.</p> <p>Use MaxResults parameter to limit the number of text detections returned. If there are more results than specified in <code>MaxResults</code>, the value of <code>NextToken</code> in the operation response contains a pagination token for getting the next set of results. To get the next page of results, call <code>GetTextDetection</code> and populate the <code>NextToken</code> request parameter with the token value returned from the previous call to <code>GetTextDetection</code>.</p>"
+    },
     "IndexFaces":{
       "name":"IndexFaces",
       "http":{
@@ -391,7 +548,7 @@
         {"shape":"ResourceNotFoundException"},
         {"shape":"InvalidImageFormatException"}
       ],
-      "documentation":"<p>Detects faces in the input image and adds them to the specified collection. </p> <p>Amazon Rekognition doesn't save the actual faces that are detected. Instead, the underlying detection algorithm first detects the faces in the input image. For each face, the algorithm extracts facial features into a feature vector, and stores it in the backend database. Amazon Rekognition uses feature vectors when it performs face match and search operations using the <a>SearchFaces</a> and <a>SearchFacesByImage</a> operations.</p> <p>For more information, see Adding Faces to a Collection in the Amazon Rekognition Developer Guide.</p> <p>To get the number of faces in a collection, call <a>DescribeCollection</a>. </p> <p>If you're using version 1.0 of the face detection model, <code>IndexFaces</code> indexes the 15 largest faces in the input image. Later versions of the face detection model index the 100 largest faces in the input image. </p> <p>If you're using version 4 or later of the face model, image orientation information is not returned in the <code>OrientationCorrection</code> field. </p> <p>To determine which version of the model you're using, call <a>DescribeCollection</a> and supply the collection ID. You can also get the model version from the value of <code>FaceModelVersion</code> in the response from <code>IndexFaces</code> </p> <p>For more information, see Model Versioning in the Amazon Rekognition Developer Guide.</p> <p>If you provide the optional <code>ExternalImageID</code> for the input image you provided, Amazon Rekognition associates this ID with all faces that it detects. When you call the <a>ListFaces</a> operation, the response returns the external ID. You can use this external image ID to create a client-side index to associate the faces with each image. You can then use the index to find all faces in an image.</p> <p>You can specify the maximum number of faces to index with the <code>MaxFaces</code> input parameter. This is useful when you want to index the largest faces in an image and don't want to index smaller faces, such as those belonging to people standing in the background.</p> <p>The <code>QualityFilter</code> input parameter allows you to filter out detected faces that don’t meet the required quality bar chosen by Amazon Rekognition. The quality bar is based on a variety of common use cases. By default, <code>IndexFaces</code> filters detected faces. You can also explicitly filter detected faces by specifying <code>AUTO</code> for the value of <code>QualityFilter</code>. If you do not want to filter detected faces, specify <code>NONE</code>. </p> <note> <p>To use quality filtering, you need a collection associated with version 3 of the face model. To get the version of the face model associated with a collection, call <a>DescribeCollection</a>. </p> </note> <p>Information about faces detected in an image, but not indexed, is returned in an array of <a>UnindexedFace</a> objects, <code>UnindexedFaces</code>. Faces aren't indexed for reasons such as:</p> <ul> <li> <p>The number of faces detected exceeds the value of the <code>MaxFaces</code> request parameter.</p> </li> <li> <p>The face is too small compared to the image dimensions.</p> </li> <li> <p>The face is too blurry.</p> </li> <li> <p>The image is too dark.</p> </li> <li> <p>The face has an extreme pose.</p> </li> </ul> <p>In response, the <code>IndexFaces</code> operation returns an array of metadata for all detected faces, <code>FaceRecords</code>. This includes: </p> <ul> <li> <p>The bounding box, <code>BoundingBox</code>, of the detected face. </p> </li> <li> <p>A confidence value, <code>Confidence</code>, which indicates the confidence that the bounding box contains a face.</p> </li> <li> <p>A face ID, <code>FaceId</code>, assigned by the service for each face that's detected and stored.</p> </li> <li> <p>An image ID, <code>ImageId</code>, assigned by the service for the input image.</p> </li> </ul> <p>If you request all facial attributes (by using the <code>detectionAttributes</code> parameter), Amazon Rekognition returns detailed facial attributes, such as facial landmarks (for example, location of eye and mouth) and other facial attributes like gender. If you provide the same image, specify the same collection, and use the same external ID in the <code>IndexFaces</code> operation, Amazon Rekognition doesn't save duplicate face metadata.</p> <p/> <p>The input image is passed either as base64-encoded image bytes, or as a reference to an image in an Amazon S3 bucket. If you use the AWS CLI to call Amazon Rekognition operations, passing image bytes isn't supported. The image must be formatted as a PNG or JPEG file. </p> <p>This operation requires permissions to perform the <code>rekognition:IndexFaces</code> action.</p>"
+      "documentation":"<p>Detects faces in the input image and adds them to the specified collection. </p> <p>Amazon Rekognition doesn't save the actual faces that are detected. Instead, the underlying detection algorithm first detects the faces in the input image. For each face, the algorithm extracts facial features into a feature vector, and stores it in the backend database. Amazon Rekognition uses feature vectors when it performs face match and search operations using the <a>SearchFaces</a> and <a>SearchFacesByImage</a> operations.</p> <p>For more information, see Adding Faces to a Collection in the Amazon Rekognition Developer Guide.</p> <p>To get the number of faces in a collection, call <a>DescribeCollection</a>. </p> <p>If you're using version 1.0 of the face detection model, <code>IndexFaces</code> indexes the 15 largest faces in the input image. Later versions of the face detection model index the 100 largest faces in the input image. </p> <p>If you're using version 4 or later of the face model, image orientation information is not returned in the <code>OrientationCorrection</code> field. </p> <p>To determine which version of the model you're using, call <a>DescribeCollection</a> and supply the collection ID. You can also get the model version from the value of <code>FaceModelVersion</code> in the response from <code>IndexFaces</code> </p> <p>For more information, see Model Versioning in the Amazon Rekognition Developer Guide.</p> <p>If you provide the optional <code>ExternalImageID</code> for the input image you provided, Amazon Rekognition associates this ID with all faces that it detects. When you call the <a>ListFaces</a> operation, the response returns the external ID. You can use this external image ID to create a client-side index to associate the faces with each image. You can then use the index to find all faces in an image.</p> <p>You can specify the maximum number of faces to index with the <code>MaxFaces</code> input parameter. This is useful when you want to index the largest faces in an image and don't want to index smaller faces, such as those belonging to people standing in the background.</p> <p>The <code>QualityFilter</code> input parameter allows you to filter out detected faces that don’t meet a required quality bar. The quality bar is based on a variety of common use cases. By default, <code>IndexFaces</code> chooses the quality bar that's used to filter faces. You can also explicitly choose the quality bar. Use <code>QualityFilter</code>, to set the quality bar by specifying <code>LOW</code>, <code>MEDIUM</code>, or <code>HIGH</code>. If you do not want to filter detected faces, specify <code>NONE</code>. </p> <note> <p>To use quality filtering, you need a collection associated with version 3 of the face model or higher. To get the version of the face model associated with a collection, call <a>DescribeCollection</a>. </p> </note> <p>Information about faces detected in an image, but not indexed, is returned in an array of <a>UnindexedFace</a> objects, <code>UnindexedFaces</code>. Faces aren't indexed for reasons such as:</p> <ul> <li> <p>The number of faces detected exceeds the value of the <code>MaxFaces</code> request parameter.</p> </li> <li> <p>The face is too small compared to the image dimensions.</p> </li> <li> <p>The face is too blurry.</p> </li> <li> <p>The image is too dark.</p> </li> <li> <p>The face has an extreme pose.</p> </li> <li> <p>The face doesn’t have enough detail to be suitable for face search.</p> </li> </ul> <p>In response, the <code>IndexFaces</code> operation returns an array of metadata for all detected faces, <code>FaceRecords</code>. This includes: </p> <ul> <li> <p>The bounding box, <code>BoundingBox</code>, of the detected face. </p> </li> <li> <p>A confidence value, <code>Confidence</code>, which indicates the confidence that the bounding box contains a face.</p> </li> <li> <p>A face ID, <code>FaceId</code>, assigned by the service for each face that's detected and stored.</p> </li> <li> <p>An image ID, <code>ImageId</code>, assigned by the service for the input image.</p> </li> </ul> <p>If you request all facial attributes (by using the <code>detectionAttributes</code> parameter), Amazon Rekognition returns detailed facial attributes, such as facial landmarks (for example, location of eye and mouth) and other facial attributes. If you provide the same image, specify the same collection, and use the same external ID in the <code>IndexFaces</code> operation, Amazon Rekognition doesn't save duplicate face metadata.</p> <p/> <p>The input image is passed either as base64-encoded image bytes, or as a reference to an image in an Amazon S3 bucket. If you use the AWS CLI to call Amazon Rekognition operations, passing image bytes isn't supported. The image must be formatted as a PNG or JPEG file. </p> <p>This operation requires permissions to perform the <code>rekognition:IndexFaces</code> action.</p>"
     },
     "ListCollections":{
       "name":"ListCollections",
@@ -507,7 +664,7 @@
         {"shape":"ResourceNotFoundException"},
         {"shape":"InvalidImageFormatException"}
       ],
-      "documentation":"<p>For a given input image, first detects the largest face in the image, and then searches the specified collection for matching faces. The operation compares the features of the input face with faces in the specified collection. </p> <note> <p>To search for all faces in an input image, you might first call the <a>IndexFaces</a> operation, and then use the face IDs returned in subsequent calls to the <a>SearchFaces</a> operation. </p> <p> You can also call the <code>DetectFaces</code> operation and use the bounding boxes in the response to make face crops, which then you can pass in to the <code>SearchFacesByImage</code> operation. </p> </note> <p>You pass the input image either as base64-encoded image bytes or as a reference to an image in an Amazon S3 bucket. If you use the AWS CLI to call Amazon Rekognition operations, passing image bytes is not supported. The image must be either a PNG or JPEG formatted file. </p> <p> The response returns an array of faces that match, ordered by similarity score with the highest similarity first. More specifically, it is an array of metadata for each face match found. Along with the metadata, the response also includes a <code>similarity</code> indicating how similar the face is to the input face. In the response, the operation also returns the bounding box (and a confidence level that the bounding box contains a face) of the face that Amazon Rekognition used for the input image. </p> <p>For an example, Searching for a Face Using an Image in the Amazon Rekognition Developer Guide.</p> <p>This operation requires permissions to perform the <code>rekognition:SearchFacesByImage</code> action.</p>"
+      "documentation":"<p>For a given input image, first detects the largest face in the image, and then searches the specified collection for matching faces. The operation compares the features of the input face with faces in the specified collection. </p> <note> <p>To search for all faces in an input image, you might first call the <a>IndexFaces</a> operation, and then use the face IDs returned in subsequent calls to the <a>SearchFaces</a> operation. </p> <p> You can also call the <code>DetectFaces</code> operation and use the bounding boxes in the response to make face crops, which then you can pass in to the <code>SearchFacesByImage</code> operation. </p> </note> <p>You pass the input image either as base64-encoded image bytes or as a reference to an image in an Amazon S3 bucket. If you use the AWS CLI to call Amazon Rekognition operations, passing image bytes is not supported. The image must be either a PNG or JPEG formatted file. </p> <p> The response returns an array of faces that match, ordered by similarity score with the highest similarity first. More specifically, it is an array of metadata for each face match found. Along with the metadata, the response also includes a <code>similarity</code> indicating how similar the face is to the input face. In the response, the operation also returns the bounding box (and a confidence level that the bounding box contains a face) of the face that Amazon Rekognition used for the input image. </p> <p>For an example, Searching for a Face Using an Image in the Amazon Rekognition Developer Guide.</p> <p>The <code>QualityFilter</code> input parameter allows you to filter out detected faces that don’t meet a required quality bar. The quality bar is based on a variety of common use cases. Use <code>QualityFilter</code> to set the quality bar for filtering by specifying <code>LOW</code>, <code>MEDIUM</code>, or <code>HIGH</code>. If you do not want to filter detected faces, specify <code>NONE</code>. The default value is <code>NONE</code>.</p> <note> <p>To use quality filtering, you need a collection associated with version 3 of the face model or higher. To get the version of the face model associated with a collection, call <a>DescribeCollection</a>. </p> </note> <p>This operation requires permissions to perform the <code>rekognition:SearchFacesByImage</code> action.</p>"
     },
     "StartCelebrityRecognition":{
       "name":"StartCelebrityRecognition",
@@ -642,6 +799,26 @@
       "documentation":"<p>Starts the asynchronous tracking of a person's path in a stored video.</p> <p>Amazon Rekognition Video can track the path of people in a video stored in an Amazon S3 bucket. Use <a>Video</a> to specify the bucket name and the filename of the video. <code>StartPersonTracking</code> returns a job identifier (<code>JobId</code>) which you use to get the results of the operation. When label detection is finished, Amazon Rekognition publishes a completion status to the Amazon Simple Notification Service topic that you specify in <code>NotificationChannel</code>. </p> <p>To get the results of the person detection operation, first check that the status value published to the Amazon SNS topic is <code>SUCCEEDED</code>. If so, call <a>GetPersonTracking</a> and pass the job identifier (<code>JobId</code>) from the initial call to <code>StartPersonTracking</code>.</p>",
       "idempotent":true
     },
+    "StartProjectVersion":{
+      "name":"StartProjectVersion",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"StartProjectVersionRequest"},
+      "output":{"shape":"StartProjectVersionResponse"},
+      "errors":[
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ResourceInUseException"},
+        {"shape":"LimitExceededException"},
+        {"shape":"InvalidParameterException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"InternalServerError"},
+        {"shape":"ThrottlingException"},
+        {"shape":"ProvisionedThroughputExceededException"}
+      ],
+      "documentation":"<p>Starts the running of the version of a model. Starting a model takes a while to complete. To check the current state of the model, use <a>DescribeProjectVersions</a>.</p> <p>Once the model is running, you can detect custom labels in new images by calling <a>DetectCustomLabels</a>.</p> <note> <p>You are charged for the amount of time that the model is running. To stop a running model, call <a>StopProjectVersion</a>.</p> </note> <p>This operation requires permissions to perform the <code>rekognition:StartProjectVersion</code> action.</p>"
+    },
     "StartStreamProcessor":{
       "name":"StartStreamProcessor",
       "http":{
@@ -661,6 +838,47 @@
       ],
       "documentation":"<p>Starts processing a stream processor. You create a stream processor by calling <a>CreateStreamProcessor</a>. To tell <code>StartStreamProcessor</code> which stream processor to start, use the value of the <code>Name</code> field specified in the call to <code>CreateStreamProcessor</code>.</p>"
     },
+    "StartTextDetection":{
+      "name":"StartTextDetection",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"StartTextDetectionRequest"},
+      "output":{"shape":"StartTextDetectionResponse"},
+      "errors":[
+        {"shape":"AccessDeniedException"},
+        {"shape":"IdempotentParameterMismatchException"},
+        {"shape":"InvalidParameterException"},
+        {"shape":"InvalidS3ObjectException"},
+        {"shape":"InternalServerError"},
+        {"shape":"VideoTooLargeException"},
+        {"shape":"ProvisionedThroughputExceededException"},
+        {"shape":"LimitExceededException"},
+        {"shape":"ThrottlingException"}
+      ],
+      "documentation":"<p>Starts asynchronous detection of text in a stored video.</p> <p>Amazon Rekognition Video can detect text in a video stored in an Amazon S3 bucket. Use <a>Video</a> to specify the bucket name and the filename of the video. <code>StartTextDetection</code> returns a job identifier (<code>JobId</code>) which you use to get the results of the operation. When text detection is finished, Amazon Rekognition Video publishes a completion status to the Amazon Simple Notification Service topic that you specify in <code>NotificationChannel</code>.</p> <p>To get the results of the text detection operation, first check that the status value published to the Amazon SNS topic is <code>SUCCEEDED</code>. if so, call <a>GetTextDetection</a> and pass the job identifier (<code>JobId</code>) from the initial call to <code>StartTextDetection</code>. </p>",
+      "idempotent":true
+    },
+    "StopProjectVersion":{
+      "name":"StopProjectVersion",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"StopProjectVersionRequest"},
+      "output":{"shape":"StopProjectVersionResponse"},
+      "errors":[
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ResourceInUseException"},
+        {"shape":"InvalidParameterException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"InternalServerError"},
+        {"shape":"ThrottlingException"},
+        {"shape":"ProvisionedThroughputExceededException"}
+      ],
+      "documentation":"<p>Stops a running model. The operation might take a while to complete. To check the current status, call <a>DescribeProjectVersions</a>. </p>"
+    },
     "StopStreamProcessor":{
       "name":"StopStreamProcessor",
       "http":{
@@ -703,6 +921,17 @@
       },
       "documentation":"<p>Structure containing the estimated age range, in years, for a face.</p> <p>Amazon Rekognition estimates an age range for faces detected in the input image. Estimated age ranges can overlap. A face of a 5-year-old might have an estimated range of 4-6, while the face of a 6-year-old might have an estimated range of 4-8.</p>"
     },
+    "Asset":{
+      "type":"structure",
+      "members":{
+        "GroundTruthManifest":{"shape":"GroundTruthManifest"}
+      },
+      "documentation":"<p>Assets are the images that you use to train and evaluate a model version. Assets are referenced by Sagemaker GroundTruth manifest files. </p>"
+    },
+    "Assets":{
+      "type":"list",
+      "member":{"shape":"Asset"}
+    },
     "Attribute":{
       "type":"string",
       "enum":[
@@ -751,6 +980,16 @@
       },
       "documentation":"<p>Identifies the bounding box around the label, face, or text. The <code>left</code> (x-coordinate) and <code>top</code> (y-coordinate) are coordinates representing the top and left sides of the bounding box. Note that the upper-left corner of the image is the origin (0,0). </p> <p>The <code>top</code> and <code>left</code> values returned are ratios of the overall image size. For example, if the input image is 700x200 pixels, and the top-left coordinate of the bounding box is 350x50 pixels, the API returns a <code>left</code> value of 0.5 (350/700) and a <code>top</code> value of 0.25 (50/200).</p> <p>The <code>width</code> and <code>height</code> values represent the dimensions of the bounding box as a ratio of the overall image dimension. For example, if the input image is 700x200 pixels, and the bounding box width is 70 pixels, the width returned is 0.1. </p> <note> <p> The bounding box coordinates can have negative values. For example, if Amazon Rekognition is able to detect a face that is at the image edge and is only partially visible, the service can return coordinates that are outside the image bounds and, depending on the image edge, you might get negative values or values greater than 1 for the <code>left</code> or <code>top</code> values. </p> </note>"
     },
+    "BoundingBoxHeight":{
+      "type":"float",
+      "max":1,
+      "min":0
+    },
+    "BoundingBoxWidth":{
+      "type":"float",
+      "max":1,
+      "min":0
+    },
     "Celebrity":{
       "type":"structure",
       "members":{
@@ -888,6 +1127,10 @@
         "SimilarityThreshold":{
           "shape":"Percent",
           "documentation":"<p>The minimum level of confidence in the face matches that a match must meet to be included in the <code>FaceMatches</code> array.</p>"
+        },
+        "QualityFilter":{
+          "shape":"QualityFilter",
+          "documentation":"<p>A filter that specifies a quality bar for how much filtering is done to identify faces. Filtered faces aren't compared. If you specify <code>AUTO</code>, Amazon Rekognition chooses the quality bar. If you specify <code>LOW</code>, <code>MEDIUM</code>, or <code>HIGH</code>, filtering removes all faces that don’t meet the chosen quality bar. The quality bar is based on a variety of common use cases. Low-quality detections can occur for a number of reasons. Some examples are an object that's misidentified as a face, a face that's too blurry, or a face with a pose that's too extreme to use. If you specify <code>NONE</code>, no filtering is performed. The default value is <code>NONE</code>. </p> <p>To use quality filtering, the collection you are using must be associated with version 3 of the face model or higher.</p>"
         }
       }
     },
@@ -964,6 +1207,18 @@
       },
       "documentation":"<p>Type that describes the face Amazon Rekognition chose to compare with the faces in the target. This contains a bounding box for the selected face and confidence level that the bounding box contains a face. Note that Amazon Rekognition selects the largest face in the source image for this comparison. </p>"
     },
+    "ContentClassifier":{
+      "type":"string",
+      "enum":[
+        "FreeOfPersonallyIdentifiableInformation",
+        "FreeOfAdultContent"
+      ]
+    },
+    "ContentClassifiers":{
+      "type":"list",
+      "member":{"shape":"ContentClassifier"},
+      "max":256
+    },
     "ContentModerationDetection":{
       "type":"structure",
       "members":{
@@ -1016,6 +1271,66 @@
         }
       }
     },
+    "CreateProjectRequest":{
+      "type":"structure",
+      "required":["ProjectName"],
+      "members":{
+        "ProjectName":{
+          "shape":"ProjectName",
+          "documentation":"<p>The name of the project to create.</p>"
+        }
+      }
+    },
+    "CreateProjectResponse":{
+      "type":"structure",
+      "members":{
+        "ProjectArn":{
+          "shape":"ProjectArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the new project. You can use the ARN to configure IAM access to the project. </p>"
+        }
+      }
+    },
+    "CreateProjectVersionRequest":{
+      "type":"structure",
+      "required":[
+        "ProjectArn",
+        "VersionName",
+        "OutputConfig",
+        "TrainingData",
+        "TestingData"
+      ],
+      "members":{
+        "ProjectArn":{
+          "shape":"ProjectArn",
+          "documentation":"<p>The ARN of the Amazon Rekognition Custom Labels project that manages the model that you want to train.</p>"
+        },
+        "VersionName":{
+          "shape":"VersionName",
+          "documentation":"<p>A name for the version of the model. This value must be unique.</p>"
+        },
+        "OutputConfig":{
+          "shape":"OutputConfig",
+          "documentation":"<p>The Amazon S3 location to store the results of training.</p>"
+        },
+        "TrainingData":{
+          "shape":"TrainingData",
+          "documentation":"<p>The dataset to use for training. </p>"
+        },
+        "TestingData":{
+          "shape":"TestingData",
+          "documentation":"<p>The dataset to use for testing.</p>"
+        }
+      }
+    },
+    "CreateProjectVersionResponse":{
+      "type":"structure",
+      "members":{
+        "ProjectVersionArn":{
+          "shape":"ProjectVersionArn",
+          "documentation":"<p>The ARN of the model version that was created. Use <code>DescribeProjectVersion</code> to get the current status of the training operation.</p>"
+        }
+      }
+    },
     "CreateStreamProcessorRequest":{
       "type":"structure",
       "required":[
@@ -1057,6 +1372,28 @@
         }
       }
     },
+    "CustomLabel":{
+      "type":"structure",
+      "members":{
+        "Name":{
+          "shape":"String",
+          "documentation":"<p>The name of the custom label.</p>"
+        },
+        "Confidence":{
+          "shape":"Percent",
+          "documentation":"<p>The confidence that the model has in the detection of the custom label. The range is 0-100. A higher value indicates a higher confidence.</p>"
+        },
+        "Geometry":{
+          "shape":"Geometry",
+          "documentation":"<p>The location of the detected object on the image that corresponds to the custom label. Includes an axis aligned coarse bounding box surrounding the object and a finer grain polygon for more accurate spatial information.</p>"
+        }
+      },
+      "documentation":"<p>A custom label detected in an image by a call to <a>DetectCustomLabels</a>.</p>"
+    },
+    "CustomLabels":{
+      "type":"list",
+      "member":{"shape":"CustomLabel"}
+    },
     "DateTime":{"type":"timestamp"},
     "Degree":{
       "type":"float",
@@ -1108,6 +1445,44 @@
         }
       }
     },
+    "DeleteProjectRequest":{
+      "type":"structure",
+      "required":["ProjectArn"],
+      "members":{
+        "ProjectArn":{
+          "shape":"ProjectArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the project that you want to delete.</p>"
+        }
+      }
+    },
+    "DeleteProjectResponse":{
+      "type":"structure",
+      "members":{
+        "Status":{
+          "shape":"ProjectStatus",
+          "documentation":"<p>The current status of the delete project operation.</p>"
+        }
+      }
+    },
+    "DeleteProjectVersionRequest":{
+      "type":"structure",
+      "required":["ProjectVersionArn"],
+      "members":{
+        "ProjectVersionArn":{
+          "shape":"ProjectVersionArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the model version that you want to delete.</p>"
+        }
+      }
+    },
+    "DeleteProjectVersionResponse":{
+      "type":"structure",
+      "members":{
+        "Status":{
+          "shape":"ProjectVersionStatus",
+          "documentation":"<p>The status of the deletion operation.</p>"
+        }
+      }
+    },
     "DeleteStreamProcessorRequest":{
       "type":"structure",
       "required":["Name"],
@@ -1154,6 +1529,67 @@
         }
       }
     },
+    "DescribeProjectVersionsRequest":{
+      "type":"structure",
+      "required":["ProjectArn"],
+      "members":{
+        "ProjectArn":{
+          "shape":"ProjectArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the project that contains the models you want to describe.</p>"
+        },
+        "VersionNames":{
+          "shape":"VersionNames",
+          "documentation":"<p>A list of model version names that you want to describe. You can add up to 10 model version names to the list. If you don't specify a value, all model descriptions are returned.</p>"
+        },
+        "NextToken":{
+          "shape":"ExtendedPaginationToken",
+          "documentation":"<p>If the previous response was incomplete (because there is more results to retrieve), Amazon Rekognition Custom Labels returns a pagination token in the response. You can use this pagination token to retrieve the next set of results. </p>"
+        },
+        "MaxResults":{
+          "shape":"ProjectVersionsPageSize",
+          "documentation":"<p>The maximum number of results to return per paginated call. The largest value you can specify is 100. If you specify a value greater than 100, a ValidationException error occurs. The default value is 100. </p>"
+        }
+      }
+    },
+    "DescribeProjectVersionsResponse":{
+      "type":"structure",
+      "members":{
+        "ProjectVersionDescriptions":{
+          "shape":"ProjectVersionDescriptions",
+          "documentation":"<p>A list of model descriptions. The list is sorted by the creation date and time of the model versions, latest to earliest.</p>"
+        },
+        "NextToken":{
+          "shape":"ExtendedPaginationToken",
+          "documentation":"<p>If the previous response was incomplete (because there is more results to retrieve), Amazon Rekognition Custom Labels returns a pagination token in the response. You can use this pagination token to retrieve the next set of results. </p>"
+        }
+      }
+    },
+    "DescribeProjectsRequest":{
+      "type":"structure",
+      "members":{
+        "NextToken":{
+          "shape":"ExtendedPaginationToken",
+          "documentation":"<p>If the previous response was incomplete (because there is more results to retrieve), Amazon Rekognition Custom Labels returns a pagination token in the response. You can use this pagination token to retrieve the next set of results. </p>"
+        },
+        "MaxResults":{
+          "shape":"ProjectsPageSize",
+          "documentation":"<p>The maximum number of results to return per paginated call. The largest value you can specify is 100. If you specify a value greater than 100, a ValidationException error occurs. The default value is 100. </p>"
+        }
+      }
+    },
+    "DescribeProjectsResponse":{
+      "type":"structure",
+      "members":{
+        "ProjectDescriptions":{
+          "shape":"ProjectDescriptions",
+          "documentation":"<p>A list of project descriptions. The list is sorted by the date and time the projects are created.</p>"
+        },
+        "NextToken":{
+          "shape":"ExtendedPaginationToken",
+          "documentation":"<p>If the previous response was incomplete (because there is more results to retrieve), Amazon Rekognition Custom Labels returns a pagination token in the response. You can use this pagination token to retrieve the next set of results. </p>"
+        }
+      }
+    },
     "DescribeStreamProcessorRequest":{
       "type":"structure",
       "required":["Name"],
@@ -1209,6 +1645,37 @@
         }
       }
     },
+    "DetectCustomLabelsRequest":{
+      "type":"structure",
+      "required":[
+        "ProjectVersionArn",
+        "Image"
+      ],
+      "members":{
+        "ProjectVersionArn":{
+          "shape":"ProjectVersionArn",
+          "documentation":"<p>The ARN of the model version that you want to use.</p>"
+        },
+        "Image":{"shape":"Image"},
+        "MaxResults":{
+          "shape":"UInteger",
+          "documentation":"<p>Maximum number of results you want the service to return in the response. The service returns the specified number of highest confidence labels ranked from highest confidence to lowest.</p>"
+        },
+        "MinConfidence":{
+          "shape":"Percent",
+          "documentation":"<p>Specifies the minimum confidence level for the labels to return. Amazon Rekognition doesn't return any labels with a confidence lower than this specified value. If you specify a value of 0, all labels are return, regardless of the default thresholds that the model version applies.</p>"
+        }
+      }
+    },
+    "DetectCustomLabelsResponse":{
+      "type":"structure",
+      "members":{
+        "CustomLabels":{
+          "shape":"CustomLabels",
+          "documentation":"<p>An array of custom labels detected in the input image.</p>"
+        }
+      }
+    },
     "DetectFacesRequest":{
       "type":"structure",
       "required":["Image"],
@@ -1282,6 +1749,10 @@
         "MinConfidence":{
           "shape":"Percent",
           "documentation":"<p>Specifies the minimum confidence level for the labels to return. Amazon Rekognition doesn't return any labels with a confidence level lower than this specified value.</p> <p>If you don't specify <code>MinConfidence</code>, the operation returns labels with confidence values greater than or equal to 50 percent.</p>"
+        },
+        "HumanLoopConfig":{
+          "shape":"HumanLoopConfig",
+          "documentation":"<p>Sets up the configuration for human evaluation, including the FlowDefinition the image will be sent to.</p>"
         }
       }
     },
@@ -1295,9 +1766,24 @@
         "ModerationModelVersion":{
           "shape":"String",
           "documentation":"<p>Version number of the moderation detection model that was used to detect unsafe content.</p>"
+        },
+        "HumanLoopActivationOutput":{
+          "shape":"HumanLoopActivationOutput",
+          "documentation":"<p>Shows the results of the human in the loop evaluation.</p>"
         }
       }
     },
+    "DetectTextFilters":{
+      "type":"structure",
+      "members":{
+        "WordFilter":{"shape":"DetectionFilter"},
+        "RegionsOfInterest":{
+          "shape":"RegionsOfInterest",
+          "documentation":"<p> A Filter focusing on a certain area of the image. Uses a <code>BoundingBox</code> object to set the region of the image.</p>"
+        }
+      },
+      "documentation":"<p>A set of optional parameters that you can use to set the criteria that the text must meet to be included in your response. <code>WordFilter</code> looks at a word’s height, width, and minimum confidence. <code>RegionOfInterest</code> lets you set a specific region of the image to look for text in. </p>"
+    },
     "DetectTextRequest":{
       "type":"structure",
       "required":["Image"],
@@ -1305,6 +1791,10 @@
         "Image":{
           "shape":"Image",
           "documentation":"<p>The input image as base64-encoded bytes or an Amazon S3 object. If you use the AWS CLI to call Amazon Rekognition operations, you can't pass image bytes. </p> <p>If you are using an AWS SDK to call Amazon Rekognition, you might not need to base64-encode image bytes passed using the <code>Bytes</code> field. For more information, see Images in the Amazon Rekognition developer guide.</p>"
+        },
+        "Filters":{
+          "shape":"DetectTextFilters",
+          "documentation":"<p>Optional parameters that let you set the criteria that the text must meet to be included in your response.</p>"
         }
       }
     },
@@ -1314,9 +1804,31 @@
         "TextDetections":{
           "shape":"TextDetectionList",
           "documentation":"<p>An array of text that was detected in the input image.</p>"
+        },
+        "TextModelVersion":{
+          "shape":"String",
+          "documentation":"<p>The model version used to detect text.</p>"
         }
       }
     },
+    "DetectionFilter":{
+      "type":"structure",
+      "members":{
+        "MinConfidence":{
+          "shape":"Percent",
+          "documentation":"<p>Sets confidence of word detection. Words with detection confidence below this will be excluded from the result. Values should be between 0.5 and 1 as Text in Video will not return any result below 0.5.</p>"
+        },
+        "MinBoundingBoxHeight":{
+          "shape":"BoundingBoxHeight",
+          "documentation":"<p>Sets the minimum height of the word bounding box. Words with bounding box heights lesser than this value will be excluded from the result. Value is relative to the video frame height.</p>"
+        },
+        "MinBoundingBoxWidth":{
+          "shape":"BoundingBoxWidth",
+          "documentation":"<p>Sets the minimum width of the word bounding box. Words with bounding boxes widths lesser than this value will be excluded from the result. Value is relative to the video frame width.</p>"
+        }
+      },
+      "documentation":"<p>A set of parameters that allow you to filter out certain results from your returned results.</p>"
+    },
     "Emotion":{
       "type":"structure",
       "members":{
@@ -1349,6 +1861,24 @@
       "type":"list",
       "member":{"shape":"Emotion"}
     },
+    "EvaluationResult":{
+      "type":"structure",
+      "members":{
+        "F1Score":{
+          "shape":"Float",
+          "documentation":"<p>The F1 score for the evaluation of all labels. The F1 score metric evaluates the overall precision and recall performance of the model as a single value. A higher value indicates better precision and recall performance. A lower score indicates that precision, recall, or both are performing poorly. </p>"
+        },
+        "Summary":{
+          "shape":"Summary",
+          "documentation":"<p>The S3 bucket that contains the training summary.</p>"
+        }
+      },
+      "documentation":"<p>The evaluation results for the training of a model.</p>"
+    },
+    "ExtendedPaginationToken":{
+      "type":"string",
+      "max":1024
+    },
     "ExternalImageId":{
       "type":"string",
       "max":255,
@@ -1441,7 +1971,7 @@
         },
         "Gender":{
           "shape":"Gender",
-          "documentation":"<p>Gender of the face and the confidence level in the determination.</p>"
+          "documentation":"<p>The predicted gender of a detected face. </p>"
         },
         "Beard":{
           "shape":"Beard",
@@ -1567,7 +2097,7 @@
         },
         "FaceMatchThreshold":{
           "shape":"Percent",
-          "documentation":"<p>Minimum face match confidence score that must be met to return a result for a recognized face. Default is 70. 0 is the lowest confidence. 100 is the highest confidence.</p>"
+          "documentation":"<p>Minimum face match confidence score that must be met to return a result for a recognized face. Default is 80. 0 is the lowest confidence. 100 is the highest confidence.</p>"
         }
       },
       "documentation":"<p>Input face recognition parameters for an Amazon Rekognition stream processor. <code>FaceRecognitionSettings</code> is a request parameter for <a>CreateStreamProcessor</a>.</p>"
@@ -1580,19 +2110,23 @@
       ]
     },
     "Float":{"type":"float"},
+    "FlowDefinitionArn":{
+      "type":"string",
+      "max":256
+    },
     "Gender":{
       "type":"structure",
       "members":{
         "Value":{
           "shape":"GenderType",
-          "documentation":"<p>Gender of the face.</p>"
+          "documentation":"<p>The predicted gender of the face.</p>"
         },
         "Confidence":{
           "shape":"Percent",
-          "documentation":"<p>Level of confidence in the determination.</p>"
+          "documentation":"<p>Level of confidence in the prediction.</p>"
         }
       },
-      "documentation":"<p>Gender of the face and the confidence level in the determination.</p>"
+      "documentation":"<p>The predicted gender of a detected face. </p> <p>Amazon Rekognition makes gender binary (male/female) predictions based on the physical appearance of a face in a particular image. This kind of prediction is not designed to categorize a person’s gender identity, and you shouldn't use Amazon Rekognition to make such a determination. For example, a male actor wearing a long-haired wig and earrings for a role might be predicted as female.</p> <p>Using Amazon Rekognition to make gender binary predictions is best suited for use cases where aggregate gender distribution statistics need to be analyzed without identifying specific users. For example, the percentage of female users compared to male users on a social media platform. </p> <p>We don't recommend using gender binary predictions to make decisions that impact&#x2028; an individual's rights, privacy, or access to services.</p>"
     },
     "GenderType":{
       "type":"string",
@@ -1606,14 +2140,14 @@
       "members":{
         "BoundingBox":{
           "shape":"BoundingBox",
-          "documentation":"<p>An axis-aligned coarse representation of the detected text's location on the image.</p>"
+          "documentation":"<p>An axis-aligned coarse representation of the detected item's location on the image.</p>"
         },
         "Polygon":{
           "shape":"Polygon",
-          "documentation":"<p>Within the bounding box, a fine-grained polygon around the detected text.</p>"
+          "documentation":"<p>Within the bounding box, a fine-grained polygon around the detected item.</p>"
         }
       },
-      "documentation":"<p>Information about where the text detected by <a>DetectText</a> is located on an image.</p>"
+      "documentation":"<p>Information about where an object (<a>DetectCustomLabels</a>) or text (<a>DetectText</a>) is located on an image.</p>"
     },
     "GetCelebrityInfoRequest":{
       "type":"structure",
@@ -1877,53 +2411,185 @@
         }
       }
     },
-    "GetPersonTrackingRequest":{
+    "GetPersonTrackingRequest":{
+      "type":"structure",
+      "required":["JobId"],
+      "members":{
+        "JobId":{
+          "shape":"JobId",
+          "documentation":"<p>The identifier for a job that tracks persons in a video. You get the <code>JobId</code> from a call to <code>StartPersonTracking</code>. </p>"
+        },
+        "MaxResults":{
+          "shape":"MaxResults",
+          "documentation":"<p>Maximum number of results to return per paginated call. The largest value you can specify is 1000. If you specify a value greater than 1000, a maximum of 1000 results is returned. The default value is 1000.</p>"
+        },
+        "NextToken":{
+          "shape":"PaginationToken",
+          "documentation":"<p>If the previous response was incomplete (because there are more persons to retrieve), Amazon Rekognition Video returns a pagination token in the response. You can use this pagination token to retrieve the next set of persons. </p>"
+        },
+        "SortBy":{
+          "shape":"PersonTrackingSortBy",
+          "documentation":"<p>Sort to use for elements in the <code>Persons</code> array. Use <code>TIMESTAMP</code> to sort array elements by the time persons are detected. Use <code>INDEX</code> to sort by the tracked persons. If you sort by <code>INDEX</code>, the array elements for each person are sorted by detection confidence. The default sort is by <code>TIMESTAMP</code>.</p>"
+        }
+      }
+    },
+    "GetPersonTrackingResponse":{
+      "type":"structure",
+      "members":{
+        "JobStatus":{
+          "shape":"VideoJobStatus",
+          "documentation":"<p>The current status of the person tracking job.</p>"
+        },
+        "StatusMessage":{
+          "shape":"StatusMessage",
+          "documentation":"<p>If the job fails, <code>StatusMessage</code> provides a descriptive error message.</p>"
+        },
+        "VideoMetadata":{
+          "shape":"VideoMetadata",
+          "documentation":"<p>Information about a video that Amazon Rekognition Video analyzed. <code>Videometadata</code> is returned in every page of paginated responses from a Amazon Rekognition Video operation.</p>"
+        },
+        "NextToken":{
+          "shape":"PaginationToken",
+          "documentation":"<p>If the response is truncated, Amazon Rekognition Video returns this token that you can use in the subsequent request to retrieve the next set of persons. </p>"
+        },
+        "Persons":{
+          "shape":"PersonDetections",
+          "documentation":"<p>An array of the persons detected in the video and the time(s) their path was tracked throughout the video. An array element will exist for each time a person's path is tracked. </p>"
+        }
+      }
+    },
+    "GetTextDetectionRequest":{
       "type":"structure",
       "required":["JobId"],
       "members":{
         "JobId":{
           "shape":"JobId",
-          "documentation":"<p>The identifier for a job that tracks persons in a video. You get the <code>JobId</code> from a call to <code>StartPersonTracking</code>. </p>"
+          "documentation":"<p>Job identifier for the label detection operation for which you want results returned. You get the job identifer from an initial call to <code>StartTextDetection</code>.</p>"
         },
         "MaxResults":{
           "shape":"MaxResults",
-          "documentation":"<p>Maximum number of results to return per paginated call. The largest value you can specify is 1000. If you specify a value greater than 1000, a maximum of 1000 results is returned. The default value is 1000.</p>"
+          "documentation":"<p>Maximum number of results to return per paginated call. The largest value you can specify is 1000.</p>"
         },
         "NextToken":{
           "shape":"PaginationToken",
-          "documentation":"<p>If the previous response was incomplete (because there are more persons to retrieve), Amazon Rekognition Video returns a pagination token in the response. You can use this pagination token to retrieve the next set of persons. </p>"
-        },
-        "SortBy":{
-          "shape":"PersonTrackingSortBy",
-          "documentation":"<p>Sort to use for elements in the <code>Persons</code> array. Use <code>TIMESTAMP</code> to sort array elements by the time persons are detected. Use <code>INDEX</code> to sort by the tracked persons. If you sort by <code>INDEX</code>, the array elements for each person are sorted by detection confidence. The default sort is by <code>TIMESTAMP</code>.</p>"
+          "documentation":"<p>If the previous response was incomplete (because there are more labels to retrieve), Amazon Rekognition Video returns a pagination token in the response. You can use this pagination token to retrieve the next set of text.</p>"
         }
       }
     },
-    "GetPersonTrackingResponse":{
+    "GetTextDetectionResponse":{
       "type":"structure",
       "members":{
         "JobStatus":{
           "shape":"VideoJobStatus",
-          "documentation":"<p>The current status of the person tracking job.</p>"
+          "documentation":"<p>Current status of the text detection job.</p>"
         },
         "StatusMessage":{
           "shape":"StatusMessage",
           "documentation":"<p>If the job fails, <code>StatusMessage</code> provides a descriptive error message.</p>"
         },
-        "VideoMetadata":{
-          "shape":"VideoMetadata",
-          "documentation":"<p>Information about a video that Amazon Rekognition Video analyzed. <code>Videometadata</code> is returned in every page of paginated responses from a Amazon Rekognition Video operation.</p>"
+        "VideoMetadata":{"shape":"VideoMetadata"},
+        "TextDetections":{
+          "shape":"TextDetectionResults",
+          "documentation":"<p>An array of text detected in the video. Each element contains the detected text, the time in milliseconds from the start of the video that the text was detected, and where it was detected on the screen.</p>"
         },
         "NextToken":{
           "shape":"PaginationToken",
-          "documentation":"<p>If the response is truncated, Amazon Rekognition Video returns this token that you can use in the subsequent request to retrieve the next set of persons. </p>"
+          "documentation":"<p>If the response is truncated, Amazon Rekognition Video returns this token that you can use in the subsequent request to retrieve the next set of text.</p>"
         },
-        "Persons":{
-          "shape":"PersonDetections",
-          "documentation":"<p>An array of the persons detected in the video and the time(s) their path was tracked throughout the video. An array element will exist for each time a person's path is tracked. </p>"
+        "TextModelVersion":{
+          "shape":"String",
+          "documentation":"<p>Version number of the text detection model that was used to detect text.</p>"
         }
       }
     },
+    "GroundTruthManifest":{
+      "type":"structure",
+      "members":{
+        "S3Object":{"shape":"S3Object"}
+      },
+      "documentation":"<p>The S3 bucket that contains the Ground Truth manifest file.</p>"
+    },
+    "HumanLoopActivationConditionsEvaluationResults":{
+      "type":"string",
+      "max":10240
+    },
+    "HumanLoopActivationOutput":{
+      "type":"structure",
+      "members":{
+        "HumanLoopArn":{
+          "shape":"HumanLoopArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the HumanLoop created.</p>"
+        },
+        "HumanLoopActivationReasons":{
+          "shape":"HumanLoopActivationReasons",
+          "documentation":"<p>Shows if and why human review was needed.</p>"
+        },
+        "HumanLoopActivationConditionsEvaluationResults":{
+          "shape":"HumanLoopActivationConditionsEvaluationResults",
+          "documentation":"<p>Shows the result of condition evaluations, including those conditions which activated a human review.</p>",
+          "jsonvalue":true
+        }
+      },
+      "documentation":"<p>Shows the results of the human in the loop evaluation. If there is no HumanLoopArn, the input did not trigger human review.</p>"
+    },
+    "HumanLoopActivationReason":{"type":"string"},
+    "HumanLoopActivationReasons":{
+      "type":"list",
+      "member":{"shape":"HumanLoopActivationReason"},
+      "min":1
+    },
+    "HumanLoopArn":{
+      "type":"string",
+      "max":256
+    },
+    "HumanLoopConfig":{
+      "type":"structure",
+      "required":[
+        "HumanLoopName",
+        "FlowDefinitionArn"
+      ],
+      "members":{
+        "HumanLoopName":{
+          "shape":"HumanLoopName",
+          "documentation":"<p>The name of the human review used for this image. This should be kept unique within a region.</p>"
+        },
+        "FlowDefinitionArn":{
+          "shape":"FlowDefinitionArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the flow definition.</p>"
+        },
+        "DataAttributes":{
+          "shape":"HumanLoopDataAttributes",
+          "documentation":"<p>Sets attributes of the input data.</p>"
+        }
+      },
+      "documentation":"<p>Sets up the flow definition the image will be sent to if one of the conditions is met. You can also set certain attributes of the image before review.</p>"
+    },
+    "HumanLoopDataAttributes":{
+      "type":"structure",
+      "members":{
+        "ContentClassifiers":{
+          "shape":"ContentClassifiers",
+          "documentation":"<p>Sets whether the input image is free of personally identifiable information.</p>"
+        }
+      },
+      "documentation":"<p>Allows you to set attributes of the image. Currently, you can declare an image as free of personally identifiable information.</p>"
+    },
+    "HumanLoopName":{
+      "type":"string",
+      "max":63,
+      "min":1,
+      "pattern":"^[a-z0-9](-*[a-z0-9])*"
+    },
+    "HumanLoopQuotaExceededException":{
+      "type":"structure",
+      "members":{
+        "ResourceType":{"shape":"String"},
+        "QuotaCode":{"shape":"String"},
+        "ServiceCode":{"shape":"String"}
+      },
+      "documentation":"<p>The number of in-progress human reviews you have has exceeded the number allowed.</p>",
+      "exception":true
+    },
     "IdempotentParameterMismatchException":{
       "type":"structure",
       "members":{
@@ -2004,7 +2670,7 @@
         },
         "QualityFilter":{
           "shape":"QualityFilter",
-          "documentation":"<p>A filter that specifies how much filtering is done to identify faces that are detected with low quality. Filtered faces aren't indexed. If you specify <code>AUTO</code>, filtering prioritizes the identification of faces that don’t meet the required quality bar chosen by Amazon Rekognition. The quality bar is based on a variety of common use cases. Low-quality detections can occur for a number of reasons. Some examples are an object that's misidentified as a face, a face that's too blurry, or a face with a pose that's too extreme to use. If you specify <code>NONE</code>, no filtering is performed. The default value is AUTO.</p> <p>To use quality filtering, the collection you are using must be associated with version 3 of the face model.</p>"
+          "documentation":"<p>A filter that specifies a quality bar for how much filtering is done to identify faces. Filtered faces aren't indexed. If you specify <code>AUTO</code>, Amazon Rekognition chooses the quality bar. If you specify <code>LOW</code>, <code>MEDIUM</code>, or <code>HIGH</code>, filtering removes all faces that don’t meet the chosen quality bar. The default value is <code>AUTO</code>. The quality bar is based on a variety of common use cases. Low-quality detections can occur for a number of reasons. Some examples are an object that's misidentified as a face, a face that's too blurry, or a face with a pose that's too extreme to use. If you specify <code>NONE</code>, no filtering is performed. </p> <p>To use quality filtering, the collection you are using must be associated with version 3 of the face model or higher.</p>"
         }
       }
     },
@@ -2029,6 +2695,10 @@
         }
       }
     },
+    "InferenceUnits":{
+      "type":"integer",
+      "min":1
+    },
     "Instance":{
       "type":"structure",
       "members":{
@@ -2419,6 +3089,20 @@
         "ROTATE_270"
       ]
     },
+    "OutputConfig":{
+      "type":"structure",
+      "members":{
+        "S3Bucket":{
+          "shape":"S3Bucket",
+          "documentation":"<p>The S3 bucket where training output is placed.</p>"
+        },
+        "S3KeyPrefix":{
+          "shape":"S3KeyPrefix",
+          "documentation":"<p>The prefix applied to the training output files. </p>"
+        }
+      },
+      "documentation":"<p>The S3 bucket and folder location where training output is placed.</p>"
+    },
     "PageSize":{
       "type":"integer",
       "max":4096,
@@ -2525,7 +3209,7 @@
           "documentation":"<p>The value of the Y coordinate for a point on a <code>Polygon</code>.</p>"
         }
       },
-      "documentation":"<p>The X and Y coordinates of a point on an image. The X and Y values returned are ratios of the overall image size. For example, if the input image is 700x200 and the operation returns X=0.5 and Y=0.25, then the point is at the (350,50) pixel coordinate on the image.</p> <p>An array of <code>Point</code> objects, <code>Polygon</code>, is returned by <a>DetectText</a>. <code>Polygon</code> represents a fine-grained polygon around detected text. For more information, see Geometry in the Amazon Rekognition Developer Guide. </p>"
+      "documentation":"<p>The X and Y coordinates of a point on an image. The X and Y values returned are ratios of the overall image size. For example, if the input image is 700x200 and the operation returns X=0.5 and Y=0.25, then the point is at the (350,50) pixel coordinate on the image.</p> <p>An array of <code>Point</code> objects, <code>Polygon</code>, is returned by <a>DetectText</a> and by <a>DetectCustomLabels</a>. <code>Polygon</code> represents a fine-grained polygon around a detected item. For more information, see Geometry in the Amazon Rekognition Developer Guide. </p>"
     },
     "Polygon":{
       "type":"list",
@@ -2549,6 +3233,132 @@
       },
       "documentation":"<p>Indicates the pose of the face as determined by its pitch, roll, and yaw.</p>"
     },
+    "ProjectArn":{
+      "type":"string",
+      "max":2048,
+      "min":20,
+      "pattern":"(^arn:[a-z\\d-]+:rekognition:[a-z\\d-]+:\\d{12}:project\\/[a-zA-Z0-9_.\\-]{1,255}\\/[0-9]+$)"
+    },
+    "ProjectDescription":{
+      "type":"structure",
+      "members":{
+        "ProjectArn":{
+          "shape":"ProjectArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the project.</p>"
+        },
+        "CreationTimestamp":{
+          "shape":"DateTime",
+          "documentation":"<p>The Unix timestamp for the date and time that the project was created.</p>"
+        },
+        "Status":{
+          "shape":"ProjectStatus",
+          "documentation":"<p>The current status of the project.</p>"
+        }
+      },
+      "documentation":"<p>A description of a Amazon Rekognition Custom Labels project.</p>"
+    },
+    "ProjectDescriptions":{
+      "type":"list",
+      "member":{"shape":"ProjectDescription"}
+    },
+    "ProjectName":{
+      "type":"string",
+      "max":255,
+      "min":1,
+      "pattern":"[a-zA-Z0-9_.\\-]+"
+    },
+    "ProjectStatus":{
+      "type":"string",
+      "enum":[
+        "CREATING",
+        "CREATED",
+        "DELETING"
+      ]
+    },
+    "ProjectVersionArn":{
+      "type":"string",
+      "max":2048,
+      "min":20,
+      "pattern":"(^arn:[a-z\\d-]+:rekognition:[a-z\\d-]+:\\d{12}:project\\/[a-zA-Z0-9_.\\-]{1,255}\\/version\\/[a-zA-Z0-9_.\\-]{1,255}\\/[0-9]+$)"
+    },
+    "ProjectVersionDescription":{
+      "type":"structure",
+      "members":{
+        "ProjectVersionArn":{
+          "shape":"ProjectVersionArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the model version. </p>"
+        },
+        "CreationTimestamp":{
+          "shape":"DateTime",
+          "documentation":"<p>The Unix datetime for the date and time that training started.</p>"
+        },
+        "MinInferenceUnits":{
+          "shape":"InferenceUnits",
+          "documentation":"<p>The minimum number of inference units used by the model. For more information, see <a>StartProjectVersion</a>.</p>"
+        },
+        "Status":{
+          "shape":"ProjectVersionStatus",
+          "documentation":"<p>The current status of the model version.</p>"
+        },
+        "StatusMessage":{
+          "shape":"StatusMessage",
+          "documentation":"<p>A descriptive message for an error or warning that occurred.</p>"
+        },
+        "BillableTrainingTimeInSeconds":{
+          "shape":"ULong",
+          "documentation":"<p>The duration, in seconds, that the model version has been billed for training. This value is only returned if the model version has been successfully trained.</p>"
+        },
+        "TrainingEndTimestamp":{
+          "shape":"DateTime",
+          "documentation":"<p>The Unix date and time that training of the model ended.</p>"
+        },
+        "OutputConfig":{
+          "shape":"OutputConfig",
+          "documentation":"<p>The location where training results are saved.</p>"
+        },
+        "TrainingDataResult":{
+          "shape":"TrainingDataResult",
+          "documentation":"<p>The manifest file that represents the training results.</p>"
+        },
+        "TestingDataResult":{
+          "shape":"TestingDataResult",
+          "documentation":"<p>The manifest file that represents the testing results.</p>"
+        },
+        "EvaluationResult":{
+          "shape":"EvaluationResult",
+          "documentation":"<p>The training results. <code>EvaluationResult</code> is only returned if training is successful.</p>"
+        }
+      },
+      "documentation":"<p>The description of a version of a model.</p>"
+    },
+    "ProjectVersionDescriptions":{
+      "type":"list",
+      "member":{"shape":"ProjectVersionDescription"}
+    },
+    "ProjectVersionStatus":{
+      "type":"string",
+      "enum":[
+        "TRAINING_IN_PROGRESS",
+        "TRAINING_COMPLETED",
+        "TRAINING_FAILED",
+        "STARTING",
+        "RUNNING",
+        "FAILED",
+        "STOPPING",
+        "STOPPED",
+        "DELETING"
+      ]
+    },
+    "ProjectVersionsPageSize":{
+      "type":"integer",
+      "max":100,
+      "min":1
+    },
+    "ProjectsPageSize":{
+      "type":"integer",
+      "max":100,
+      "min":1
+    },
     "ProvisionedThroughputExceededException":{
       "type":"structure",
       "members":{
@@ -2560,7 +3370,10 @@
       "type":"string",
       "enum":[
         "NONE",
-        "AUTO"
+        "AUTO",
+        "LOW",
+        "MEDIUM",
+        "HIGH"
       ]
     },
     "Reason":{
@@ -2571,7 +3384,8 @@
         "LOW_BRIGHTNESS",
         "LOW_SHARPNESS",
         "LOW_CONFIDENCE",
-        "SMALL_BOUNDING_BOX"
+        "SMALL_BOUNDING_BOX",
+        "LOW_FACE_QUALITY"
       ]
     },
     "Reasons":{
@@ -2605,6 +3419,22 @@
         }
       }
     },
+    "RegionOfInterest":{
+      "type":"structure",
+      "members":{
+        "BoundingBox":{
+          "shape":"BoundingBox",
+          "documentation":"<p>The box representing a region of interest on screen.</p>"
+        }
+      },
+      "documentation":"<p>Specifies a location within the frame that Rekognition checks for text. Uses a <code>BoundingBox</code> object to set a region of the screen.</p> <p>A word is included in the region if the word is more than half in that region. If there is more than one region, the word will be compared with all regions of the screen. Any word more than half in a region is kept in the results.</p>"
+    },
+    "RegionsOfInterest":{
+      "type":"list",
+      "member":{"shape":"RegionOfInterest"},
+      "max":10,
+      "min":0
+    },
     "RekognitionUniqueId":{
       "type":"string",
       "pattern":"[0-9A-Za-z]*"
@@ -2630,6 +3460,13 @@
       "documentation":"<p>The collection specified in the request cannot be found.</p>",
       "exception":true
     },
+    "ResourceNotReadyException":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>The requested resource isn't ready. For example, this exception occurs when you call <code>DetectCustomLabels</code> with a model version that isn't deployed. </p>",
+      "exception":true
+    },
     "RoleArn":{
       "type":"string",
       "pattern":"arn:aws:iam::\\d{12}:role/?[a-zA-Z_0-9+=,.@\\-_/]+"
@@ -2640,6 +3477,10 @@
       "min":3,
       "pattern":"[0-9A-Za-z\\.\\-_]*"
     },
+    "S3KeyPrefix":{
+      "type":"string",
+      "max":1024
+    },
     "S3Object":{
       "type":"structure",
       "members":{
@@ -2694,6 +3535,10 @@
         "FaceMatchThreshold":{
           "shape":"Percent",
           "documentation":"<p>(Optional) Specifies the minimum confidence in the face match to return. For example, don't return any matches where confidence in matches is less than 70%. The default value is 80%.</p>"
+        },
+        "QualityFilter":{
+          "shape":"QualityFilter",
+          "documentation":"<p>A filter that specifies a quality bar for how much filtering is done to identify faces. Filtered faces aren't searched for in the collection. If you specify <code>AUTO</code>, Amazon Rekognition chooses the quality bar. If you specify <code>LOW</code>, <code>MEDIUM</code>, or <code>HIGH</code>, filtering removes all faces that don’t meet the chosen quality bar. The quality bar is based on a variety of common use cases. Low-quality detections can occur for a number of reasons. Some examples are an object that's misidentified as a face, a face that's too blurry, or a face with a pose that's too extreme to use. If you specify <code>NONE</code>, no filtering is performed. The default value is <code>NONE</code>. </p> <p>To use quality filtering, the collection you are using must be associated with version 3 of the face model or higher.</p>"
         }
       }
     },
@@ -2983,6 +3828,32 @@
         }
       }
     },
+    "StartProjectVersionRequest":{
+      "type":"structure",
+      "required":[
+        "ProjectVersionArn",
+        "MinInferenceUnits"
+      ],
+      "members":{
+        "ProjectVersionArn":{
+          "shape":"ProjectVersionArn",
+          "documentation":"<p>The Amazon Resource Name(ARN) of the model version that you want to start.</p>"
+        },
+        "MinInferenceUnits":{
+          "shape":"InferenceUnits",
+          "documentation":"<p>The minimum number of inference units to use. A single inference unit represents 1 hour of processing and can support up to 5 Transaction Pers Second (TPS). Use a higher number to increase the TPS throughput of your model. You are charged for the number of inference units that you use. </p>"
+        }
+      }
+    },
+    "StartProjectVersionResponse":{
+      "type":"structure",
+      "members":{
+        "Status":{
+          "shape":"ProjectVersionStatus",
+          "documentation":"<p>The current running status of the model. </p>"
+        }
+      }
+    },
     "StartStreamProcessorRequest":{
       "type":"structure",
       "required":["Name"],
@@ -2998,7 +3869,69 @@
       "members":{
       }
     },
+    "StartTextDetectionFilters":{
+      "type":"structure",
+      "members":{
+        "WordFilter":{
+          "shape":"DetectionFilter",
+          "documentation":"<p>Filters focusing on qualities of the text, such as confidence or size.</p>"
+        },
+        "RegionsOfInterest":{
+          "shape":"RegionsOfInterest",
+          "documentation":"<p>Filter focusing on a certain area of the frame. Uses a <code>BoundingBox</code> object to set the region of the screen.</p>"
+        }
+      },
+      "documentation":"<p>Set of optional parameters that let you set the criteria text must meet to be included in your response. <code>WordFilter</code> looks at a word's height, width and minimum confidence. <code>RegionOfInterest</code> lets you set a specific region of the screen to look for text in.</p>"
+    },
+    "StartTextDetectionRequest":{
+      "type":"structure",
+      "required":["Video"],
+      "members":{
+        "Video":{"shape":"Video"},
+        "ClientRequestToken":{
+          "shape":"ClientRequestToken",
+          "documentation":"<p>Idempotent token used to identify the start request. If you use the same token with multiple <code>StartTextDetection</code> requests, the same <code>JobId</code> is returned. Use <code>ClientRequestToken</code> to prevent the same job from being accidentaly started more than once.</p>"
+        },
+        "NotificationChannel":{"shape":"NotificationChannel"},
+        "JobTag":{
+          "shape":"JobTag",
+          "documentation":"<p>An identifier returned in the completion status published by your Amazon Simple Notification Service topic. For example, you can use <code>JobTag</code> to group related jobs and identify them in the completion notification.</p>"
+        },
+        "Filters":{
+          "shape":"StartTextDetectionFilters",
+          "documentation":"<p>Optional parameters that let you set criteria the text must meet to be included in your response.</p>"
+        }
+      }
+    },
+    "StartTextDetectionResponse":{
+      "type":"structure",
+      "members":{
+        "JobId":{
+          "shape":"JobId",
+          "documentation":"<p>Identifier for the text detection job. Use <code>JobId</code> to identify the job in a subsequent call to <code>GetTextDetection</code>.</p>"
+        }
+      }
+    },
     "StatusMessage":{"type":"string"},
+    "StopProjectVersionRequest":{
+      "type":"structure",
+      "required":["ProjectVersionArn"],
+      "members":{
+        "ProjectVersionArn":{
+          "shape":"ProjectVersionArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the model version that you want to delete.</p> <p>This operation requires permissions to perform the <code>rekognition:StopProjectVersion</code> action.</p>"
+        }
+      }
+    },
+    "StopProjectVersionResponse":{
+      "type":"structure",
+      "members":{
+        "Status":{
+          "shape":"ProjectVersionStatus",
+          "documentation":"<p>The current status of the stop operation. </p>"
+        }
+      }
+    },
     "StopStreamProcessorRequest":{
       "type":"structure",
       "required":["Name"],
@@ -3083,6 +4016,13 @@
       ]
     },
     "String":{"type":"string"},
+    "Summary":{
+      "type":"structure",
+      "members":{
+        "S3Object":{"shape":"S3Object"}
+      },
+      "documentation":"<p>The S3 bucket that contains the training summary. The training summary includes aggregated evaluation metrics for the entire testing dataset and metrics for each individual label. </p> <p>You get the training summary S3 bucket location by calling <a>DescribeProjectVersions</a>. </p>"
+    },
     "Sunglasses":{
       "type":"structure",
       "members":{
@@ -3097,6 +4037,34 @@
       },
       "documentation":"<p>Indicates whether or not the face is wearing sunglasses, and the confidence level in the determination.</p>"
     },
+    "TestingData":{
+      "type":"structure",
+      "members":{
+        "Assets":{
+          "shape":"Assets",
+          "documentation":"<p>The assets used for testing.</p>"
+        },
+        "AutoCreate":{
+          "shape":"Boolean",
+          "documentation":"<p>If specified, Amazon Rekognition Custom Labels creates a testing dataset with an 80/20 split of the training dataset.</p>"
+        }
+      },
+      "documentation":"<p>The dataset used for testing. Optionally, if <code>AutoCreate</code> is set, Amazon Rekognition Custom Labels creates a testing dataset using an 80/20 split of the training dataset.</p>"
+    },
+    "TestingDataResult":{
+      "type":"structure",
+      "members":{
+        "Input":{
+          "shape":"TestingData",
+          "documentation":"<p>The testing dataset that was supplied for training.</p>"
+        },
+        "Output":{
+          "shape":"TestingData",
+          "documentation":"<p>The subset of the dataset that was actually tested. Some images (assets) might not be tested due to file formatting and other issues. </p>"
+        }
+      },
+      "documentation":"<p>A Sagemaker Groundtruth format manifest file representing the dataset used for testing.</p>"
+    },
     "TextDetection":{
       "type":"structure",
       "members":{
@@ -3131,6 +4099,24 @@
       "type":"list",
       "member":{"shape":"TextDetection"}
     },
+    "TextDetectionResult":{
+      "type":"structure",
+      "members":{
+        "Timestamp":{
+          "shape":"Timestamp",
+          "documentation":"<p>The time, in milliseconds from the start of the video, that the text was detected.</p>"
+        },
+        "TextDetection":{
+          "shape":"TextDetection",
+          "documentation":"<p>Details about text detected in a video.</p>"
+        }
+      },
+      "documentation":"<p>Information about text detected in a video. Incudes the detected text, the time in milliseconds from the start of the video that the text was detected, and where it was detected on the screen.</p>"
+    },
+    "TextDetectionResults":{
+      "type":"list",
+      "member":{"shape":"TextDetectionResult"}
+    },
     "TextTypes":{
       "type":"string",
       "enum":[
@@ -3147,6 +4133,30 @@
       "fault":true
     },
     "Timestamp":{"type":"long"},
+    "TrainingData":{
+      "type":"structure",
+      "members":{
+        "Assets":{
+          "shape":"Assets",
+          "documentation":"<p>A Sagemaker GroundTruth manifest file that contains the training images (assets).</p>"
+        }
+      },
+      "documentation":"<p>The dataset used for training.</p>"
+    },
+    "TrainingDataResult":{
+      "type":"structure",
+      "members":{
+        "Input":{
+          "shape":"TrainingData",
+          "documentation":"<p>The training assets that you supplied for training.</p>"
+        },
+        "Output":{
+          "shape":"TrainingData",
+          "documentation":"<p>The images (assets) that were actually trained by Amazon Rekognition Custom Labels. </p>"
+        }
+      },
+      "documentation":"<p>A Sagemaker Groundtruth format manifest file that represents the dataset used for training.</p>"
+    },
     "UInteger":{
       "type":"integer",
       "min":0
@@ -3178,6 +4188,18 @@
       "type":"list",
       "member":{"shape":"Url"}
     },
+    "VersionName":{
+      "type":"string",
+      "max":255,
+      "min":1,
+      "pattern":"[a-zA-Z0-9_.\\-]+"
+    },
+    "VersionNames":{
+      "type":"list",
+      "member":{"shape":"VersionName"},
+      "max":10,
+      "min":1
+    },
     "Video":{
       "type":"structure",
       "members":{
@@ -3230,7 +4252,7 @@
       "type":"structure",
       "members":{
       },
-      "documentation":"<p>The file size or duration of the supplied media is too large. The maximum file size is 8GB. The maximum duration is 2 hours. </p>",
+      "documentation":"<p>The file size or duration of the supplied media is too large. The maximum file size is 10GB. The maximum duration is 6 hours. </p>",
       "exception":true
     }
   },
diff --git a/services/rekognition/src/main/resources/codegen-resources/waiters-2.json b/services/rekognition/src/main/resources/codegen-resources/waiters-2.json
new file mode 100644
index 000000000000..c67dc6239b45
--- /dev/null
+++ b/services/rekognition/src/main/resources/codegen-resources/waiters-2.json
@@ -0,0 +1,45 @@
+{
+    "version": 2,
+    "waiters": {
+        "ProjectVersionTrainingCompleted": {
+            "description": "Wait until the ProjectVersion training completes.",
+            "operation": "DescribeProjectVersions",
+            "delay": 120,
+            "maxAttempts": 360,
+            "acceptors": [
+                {
+                    "state": "success",
+                    "matcher": "pathAll",
+                    "argument": "ProjectVersionDescriptions[].Status",
+                    "expected": "TRAINING_COMPLETED"
+                },
+                {
+                    "state": "failure",
+                    "matcher": "pathAny",
+                    "argument": "ProjectVersionDescriptions[].Status",
+                    "expected": "TRAINING_FAILED"
+                }
+            ]
+        },
+        "ProjectVersionRunning": {
+            "description": "Wait until the ProjectVersion is running.",
+            "delay": 30,
+            "maxAttempts": 40,
+            "operation": "DescribeProjectVersions",
+            "acceptors": [
+                {
+                    "state": "success",
+                    "matcher": "pathAll",
+                    "argument": "ProjectVersionDescriptions[].Status",
+                    "expected": "RUNNING"
+                },
+                {
+                    "state": "failure",
+                    "matcher": "pathAny",
+                    "argument": "ProjectVersionDescriptions[].Status",
+                    "expected": "FAILED"
+                }
+            ]
+        }
+    }
+}
diff --git a/services/rekognition/src/test/resources/cucumber.properties b/services/rekognition/src/test/resources/cucumber.properties
index fc31e7dd1d41..14aabd318f31 100644
--- a/services/rekognition/src/test/resources/cucumber.properties
+++ b/services/rekognition/src/test/resources/cucumber.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/resourcegroups/pom.xml b/services/resourcegroups/pom.xml
index 3dd06c564b96..ef09bbc97b0c 100644
--- a/services/resourcegroups/pom.xml
+++ b/services/resourcegroups/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>services</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>resourcegroups</artifactId>
diff --git a/services/resourcegroupstaggingapi/build.properties b/services/resourcegroupstaggingapi/build.properties
index ecf2dae6fcb1..15ec2da1fc71 100644
--- a/services/resourcegroupstaggingapi/build.properties
+++ b/services/resourcegroupstaggingapi/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/resourcegroupstaggingapi/pom.xml b/services/resourcegroupstaggingapi/pom.xml
index f2f53f8a4213..1fec1b5cb7b4 100644
--- a/services/resourcegroupstaggingapi/pom.xml
+++ b/services/resourcegroupstaggingapi/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>resourcegroupstaggingapi</artifactId>
     <name>AWS Java SDK :: Services :: AWS Resource Groups Tagging API</name>
diff --git a/services/resourcegroupstaggingapi/src/main/resources/codegen-resources/paginators-1.json b/services/resourcegroupstaggingapi/src/main/resources/codegen-resources/paginators-1.json
index 7bff285bdbb8..b0558052117b 100644
--- a/services/resourcegroupstaggingapi/src/main/resources/codegen-resources/paginators-1.json
+++ b/services/resourcegroupstaggingapi/src/main/resources/codegen-resources/paginators-1.json
@@ -1,5 +1,11 @@
 {
   "pagination": {
+    "GetComplianceSummary": {
+      "input_token": "PaginationToken",
+      "limit_key": "MaxResults",
+      "output_token": "PaginationToken",
+      "result_key": "SummaryList"
+    },
     "GetResources": {
       "input_token": "PaginationToken",
       "limit_key": "ResourcesPerPage",
diff --git a/services/resourcegroupstaggingapi/src/main/resources/codegen-resources/service-2.json b/services/resourcegroupstaggingapi/src/main/resources/codegen-resources/service-2.json
index c8fe14c8e26b..d405b011fb80 100644
--- a/services/resourcegroupstaggingapi/src/main/resources/codegen-resources/service-2.json
+++ b/services/resourcegroupstaggingapi/src/main/resources/codegen-resources/service-2.json
@@ -12,6 +12,38 @@
     "uid":"resourcegroupstaggingapi-2017-01-26"
   },
   "operations":{
+    "DescribeReportCreation":{
+      "name":"DescribeReportCreation",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DescribeReportCreationInput"},
+      "output":{"shape":"DescribeReportCreationOutput"},
+      "errors":[
+        {"shape":"ConstraintViolationException"},
+        {"shape":"InternalServiceException"},
+        {"shape":"InvalidParameterException"},
+        {"shape":"ThrottledException"}
+      ],
+      "documentation":"<p>Describes the status of the <code>StartReportCreation</code> operation. </p> <p>You can call this operation only from the organization's master account and from the us-east-1 Region.</p>"
+    },
+    "GetComplianceSummary":{
+      "name":"GetComplianceSummary",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"GetComplianceSummaryInput"},
+      "output":{"shape":"GetComplianceSummaryOutput"},
+      "errors":[
+        {"shape":"ConstraintViolationException"},
+        {"shape":"InternalServiceException"},
+        {"shape":"InvalidParameterException"},
+        {"shape":"ThrottledException"}
+      ],
+      "documentation":"<p>Returns a table that shows counts of resources that are noncompliant with their tag policies.</p> <p>For more information on tag policies, see <a href=\"http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_policies_tag-policies.html\">Tag Policies</a> in the <i>AWS Organizations User Guide.</i> </p> <p>You can call this operation only from the organization's master account and from the us-east-1 Region.</p>"
+    },
     "GetResources":{
       "name":"GetResources",
       "http":{
@@ -26,7 +58,7 @@
         {"shape":"InternalServiceException"},
         {"shape":"PaginationTokenExpiredException"}
       ],
-      "documentation":"<p>Returns all the tagged or previously tagged resources that are located in the specified region for the AWS account. You can optionally specify <i>filters</i> (tags and resource types) in your request, depending on what information you want returned. The response includes all tags that are associated with the requested resources.</p> <note> <p>You can check the <code>PaginationToken</code> response parameter to determine if a query completed. Queries can occasionally return fewer results on a page than allowed. The <code>PaginationToken</code> response parameter value is <code>null</code> <i>only</i> when there are no more results to display. </p> </note>"
+      "documentation":"<p>Returns all the tagged or previously tagged resources that are located in the specified Region for the AWS account.</p> <p>Depending on what information you want returned, you can also specify the following:</p> <ul> <li> <p> <i>Filters</i> that specify what tags and resource types you want returned. The response includes all tags that are associated with the requested resources.</p> </li> <li> <p>Information about compliance with the account's effective tag policy. For more information on tag policies, see <a href=\"http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_policies_tag-policies.html\">Tag Policies</a> in the <i>AWS Organizations User Guide.</i> </p> </li> </ul> <note> <p>You can check the <code>PaginationToken</code> response parameter to determine if a query is complete. Queries occasionally return fewer results on a page than allowed. The <code>PaginationToken</code> response parameter value is <code>null</code> <i>only</i> when there are no more results to display. </p> </note>"
     },
     "GetTagKeys":{
       "name":"GetTagKeys",
@@ -42,7 +74,7 @@
         {"shape":"InternalServiceException"},
         {"shape":"PaginationTokenExpiredException"}
       ],
-      "documentation":"<p>Returns all tag keys in the specified region for the AWS account.</p>"
+      "documentation":"<p>Returns all tag keys in the specified Region for the AWS account.</p>"
     },
     "GetTagValues":{
       "name":"GetTagValues",
@@ -58,7 +90,24 @@
         {"shape":"InternalServiceException"},
         {"shape":"PaginationTokenExpiredException"}
       ],
-      "documentation":"<p>Returns all tag values for the specified key in the specified region for the AWS account.</p>"
+      "documentation":"<p>Returns all tag values for the specified key in the specified Region for the AWS account.</p>"
+    },
+    "StartReportCreation":{
+      "name":"StartReportCreation",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"StartReportCreationInput"},
+      "output":{"shape":"StartReportCreationOutput"},
+      "errors":[
+        {"shape":"ConcurrentModificationException"},
+        {"shape":"ConstraintViolationException"},
+        {"shape":"InternalServiceException"},
+        {"shape":"InvalidParameterException"},
+        {"shape":"ThrottledException"}
+      ],
+      "documentation":"<p>Generates a report that lists all tagged resources in accounts across your organization and tells whether each resource is compliant with the effective tag policy. Compliance data is refreshed daily. </p> <p>The generated report is saved to the following location:</p> <p> <code>s3://example-bucket/AwsTagPolicies/o-exampleorgid/YYYY-MM-ddTHH:mm:ssZ/report.csv</code> </p> <p>You can call this operation only from the organization's master account and from the us-east-1 Region.</p>"
     },
     "TagResources":{
       "name":"TagResources",
@@ -73,7 +122,7 @@
         {"shape":"ThrottledException"},
         {"shape":"InternalServiceException"}
       ],
-      "documentation":"<p>Applies one or more tags to the specified resources. Note the following:</p> <ul> <li> <p>Not all resources can have tags. For a list of resources that support tagging, see <a href=\"http://docs.aws.amazon.com/ARG/latest/userguide/supported-resources.html\">Supported Resources</a> in the <i>AWS Resource Groups User Guide</i>.</p> </li> <li> <p>Each resource can have up to 50 tags. For other limits, see <a href=\"http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Using_Tags.html#tag-restrictions\">Tag Restrictions</a> in the <i>Amazon EC2 User Guide for Linux Instances</i>.</p> </li> <li> <p>You can only tag resources that are located in the specified region for the AWS account.</p> </li> <li> <p>To add tags to a resource, you need the necessary permissions for the service that the resource belongs to as well as permissions for adding tags. For more information, see <a href=\"http://docs.aws.amazon.com/ARG/latest/userguide/obtaining-permissions-for-tagging.html\">Obtaining Permissions for Tagging</a> in the <i>AWS Resource Groups User Guide</i>.</p> </li> </ul>"
+      "documentation":"<p>Applies one or more tags to the specified resources. Note the following:</p> <ul> <li> <p>Not all resources can have tags. For a list of services that support tagging, see <a href=\"http://docs.aws.amazon.com/resourcegroupstagging/latest/APIReference/Welcome.html\">this list</a>.</p> </li> <li> <p>Each resource can have up to 50 tags. For other limits, see <a href=\"http://docs.aws.amazon.com/general/latest/gr/aws_tagging.html#tag-conventions\">Tag Naming and Usage Conventions</a> in the <i>AWS General Reference.</i> </p> </li> <li> <p>You can only tag resources that are located in the specified Region for the AWS account.</p> </li> <li> <p>To add tags to a resource, you need the necessary permissions for the service that the resource belongs to as well as permissions for adding tags. For more information, see <a href=\"http://docs.aws.amazon.com/resourcegroupstagging/latest/APIReference/Welcome.html\">this list</a>.</p> </li> </ul>"
     },
     "UntagResources":{
       "name":"UntagResources",
@@ -88,14 +137,72 @@
         {"shape":"ThrottledException"},
         {"shape":"InternalServiceException"}
       ],
-      "documentation":"<p>Removes the specified tags from the specified resources. When you specify a tag key, the action removes both that key and its associated value. The operation succeeds even if you attempt to remove tags from a resource that were already removed. Note the following:</p> <ul> <li> <p>To remove tags from a resource, you need the necessary permissions for the service that the resource belongs to as well as permissions for removing tags. For more information, see <a href=\"http://docs.aws.amazon.com/ARG/latest/userguide/obtaining-permissions-for-tagging.html\">Obtaining Permissions for Tagging</a> in the <i>AWS Resource Groups User Guide</i>.</p> </li> <li> <p>You can only tag resources that are located in the specified region for the AWS account.</p> </li> </ul>"
+      "documentation":"<p>Removes the specified tags from the specified resources. When you specify a tag key, the action removes both that key and its associated value. The operation succeeds even if you attempt to remove tags from a resource that were already removed. Note the following:</p> <ul> <li> <p>To remove tags from a resource, you need the necessary permissions for the service that the resource belongs to as well as permissions for removing tags. For more information, see <a href=\"http://docs.aws.amazon.com/resourcegroupstagging/latest/APIReference/Welcome.html\">this list</a>.</p> </li> <li> <p>You can only tag resources that are located in the specified Region for the AWS account.</p> </li> </ul>"
     }
   },
   "shapes":{
     "AmazonResourceType":{
       "type":"string",
       "max":256,
-      "min":0
+      "min":0,
+      "pattern":"[\\s\\S]*"
+    },
+    "ComplianceDetails":{
+      "type":"structure",
+      "members":{
+        "NoncompliantKeys":{
+          "shape":"TagKeyList",
+          "documentation":"<p>These tag keys on the resource are noncompliant with the effective tag policy.</p>"
+        },
+        "KeysWithNoncompliantValues":{
+          "shape":"TagKeyList",
+          "documentation":"<p>These are keys defined in the effective policy that are on the resource with either incorrect case treatment or noncompliant values. </p>"
+        },
+        "ComplianceStatus":{
+          "shape":"ComplianceStatus",
+          "documentation":"<p>Whether a resource is compliant with the effective tag policy.</p>"
+        }
+      },
+      "documentation":"<p>Information that shows whether a resource is compliant with the effective tag policy, including details on any noncompliant tag keys.</p>"
+    },
+    "ComplianceStatus":{"type":"boolean"},
+    "ConcurrentModificationException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"ExceptionMessage"}
+      },
+      "documentation":"<p>The target of the operation is currently being modified by a different request. Try again later.</p>",
+      "exception":true
+    },
+    "ConstraintViolationException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"ExceptionMessage"}
+      },
+      "documentation":"<p>The request was denied because performing this operation violates a constraint. </p> <p>Some of the reasons in the following list might not apply to this specific operation.</p> <ul> <li> <p>You must meet the prerequisites for using tag policies. For information, see <a href=\"http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_policies_tag-policies-prereqs.html\">Prerequisites and Permissions for Using Tag Policies</a> in the <i>AWS Organizations User Guide.</i> </p> </li> <li> <p>You must enable the tag policies service principal (<code>tagpolicies.tag.amazonaws.com</code>) to integrate with AWS Organizations For information, see <a href=\"http://docs.aws.amazon.com/organizations/latest/APIReference/API_EnableAWSServiceAccess.html\">EnableAWSServiceAccess</a>.</p> </li> <li> <p>You must have a tag policy attached to the organization root, an OU, or an account.</p> </li> </ul>",
+      "exception":true
+    },
+    "DescribeReportCreationInput":{
+      "type":"structure",
+      "members":{
+      }
+    },
+    "DescribeReportCreationOutput":{
+      "type":"structure",
+      "members":{
+        "Status":{
+          "shape":"Status",
+          "documentation":"<p>Reports the status of the operation.</p> <p>The operation status can be one of the following:</p> <ul> <li> <p> <code>RUNNING</code> - Report creation is in progress.</p> </li> <li> <p> <code>SUCCEEDED</code> - Report creation is complete. You can open the report from the Amazon S3 bucket that you specified when you ran <code>StartReportCreation</code>.</p> </li> <li> <p> <code>FAILED</code> - Report creation timed out or the Amazon S3 bucket is not accessible. </p> </li> <li> <p> <code>NO REPORT</code> - No report was generated in the last 90 days.</p> </li> </ul>"
+        },
+        "S3Location":{
+          "shape":"S3Location",
+          "documentation":"<p>The path to the Amazon S3 bucket where the report was stored on creation.</p>"
+        },
+        "ErrorMessage":{
+          "shape":"ErrorMessage",
+          "documentation":"<p>Details of the common errors that all operations return.</p>"
+        }
+      }
     },
     "ErrorCode":{
       "type":"string",
@@ -110,6 +217,7 @@
       "max":2048,
       "min":0
     },
+    "ExcludeCompliantResources":{"type":"boolean"},
     "FailedResourcesMap":{
       "type":"map",
       "key":{"shape":"ResourceARN"},
@@ -131,7 +239,53 @@
           "documentation":"<p>The message of the common error.</p>"
         }
       },
-      "documentation":"<p>Details of the common errors that all actions return.</p>"
+      "documentation":"<p>Information about the errors that are returned for each failed resource. This information can include <code>InternalServiceException</code> and <code>InvalidParameterException</code> errors. It can also include any valid error code returned by the AWS service that hosts the resource that the ARN key represents.</p> <p>The following are common error codes that you might receive from other AWS services:</p> <ul> <li> <p> <b>InternalServiceException</b> – This can mean that the Resource Groups Tagging API didn't receive a response from another AWS service. It can also mean the the resource type in the request is not supported by the Resource Groups Tagging API. In these cases, it's safe to retry the request and then call <a href=\"http://docs.aws.amazon.com/resourcegroupstagging/latest/APIReference/API_GetResources.html\">GetResources</a> to verify the changes.</p> </li> <li> <p> <b>AccessDeniedException</b> – This can mean that you need permission to calling tagging operations in the AWS service that contains the resource. For example, to use the Resource Groups Tagging API to tag a CloudWatch alarm resource, you need permission to call <a href=\"http://docs.aws.amazon.com/resourcegroupstagging/latest/APIReference/API_TagResources.html\"> <code>TagResources</code> </a> <i>and</i> <a href=\"http://docs.aws.amazon.com/AmazonCloudWatch/latest/APIReference/API_TagResource.html\"> <code>TagResource</code> </a> in the CloudWatch API. </p> </li> </ul> <p>For more information on errors that are generated from other AWS services, see the documentation for that service. </p>"
+    },
+    "GetComplianceSummaryInput":{
+      "type":"structure",
+      "members":{
+        "TargetIdFilters":{
+          "shape":"TargetIdFilterList",
+          "documentation":"<p>The target identifiers (usually, specific account IDs) to limit the output by. If you use this parameter, the count of returned noncompliant resources includes only resources with the specified target IDs.</p>"
+        },
+        "RegionFilters":{
+          "shape":"RegionFilterList",
+          "documentation":"<p>A list of Regions to limit the output by. If you use this parameter, the count of returned noncompliant resources includes only resources in the specified Regions.</p>"
+        },
+        "ResourceTypeFilters":{
+          "shape":"ResourceTypeFilterList",
+          "documentation":"<p>The constraints on the resources that you want returned. The format of each resource type is <code>service[:resourceType]</code>. For example, specifying a resource type of <code>ec2</code> returns all Amazon EC2 resources (which includes EC2 instances). Specifying a resource type of <code>ec2:instance</code> returns only EC2 instances. </p> <p>The string for each service name and resource type is the same as that embedded in a resource's Amazon Resource Name (ARN). Consult the <i>AWS General Reference</i> for the following:</p> <ul> <li> <p>For a list of service name strings, see <a href=\"http://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html#genref-aws-service-namespaces\">AWS Service Namespaces</a>.</p> </li> <li> <p>For resource type strings, see <a href=\"http://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html#arns-syntax\">Example ARNs</a>.</p> </li> <li> <p>For more information about ARNs, see <a href=\"http://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html\">Amazon Resource Names (ARNs) and AWS Service Namespaces</a>.</p> </li> </ul> <p>You can specify multiple resource types by using an array. The array can include up to 100 items. Note that the length constraint requirement applies to each resource type filter. </p>"
+        },
+        "TagKeyFilters":{
+          "shape":"TagKeyFilterList",
+          "documentation":"<p>A list of tag keys to limit the output by. If you use this parameter, the count of returned noncompliant resources includes only resources that have the specified tag keys.</p>"
+        },
+        "GroupBy":{
+          "shape":"GroupBy",
+          "documentation":"<p>A list of attributes to group the counts of noncompliant resources by. If supplied, the counts are sorted by those attributes.</p>"
+        },
+        "MaxResults":{
+          "shape":"MaxResultsGetComplianceSummary",
+          "documentation":"<p>A limit that restricts the number of results that are returned per page.</p>"
+        },
+        "PaginationToken":{
+          "shape":"PaginationToken",
+          "documentation":"<p>A string that indicates that additional data is available. Leave this value empty for your initial request. If the response includes a <code>PaginationToken</code>, use that string for this value to request an additional page of data.</p>"
+        }
+      }
+    },
+    "GetComplianceSummaryOutput":{
+      "type":"structure",
+      "members":{
+        "SummaryList":{
+          "shape":"SummaryList",
+          "documentation":"<p>A table that shows counts of noncompliant resources.</p>"
+        },
+        "PaginationToken":{
+          "shape":"PaginationToken",
+          "documentation":"<p>A string that indicates that the response contains more data than can be returned in a single response. To receive additional data, specify this string for the <code>PaginationToken</code> value in a subsequent request.</p>"
+        }
+      }
     },
     "GetResourcesInput":{
       "type":"structure",
@@ -150,11 +304,19 @@
         },
         "TagsPerPage":{
           "shape":"TagsPerPage",
-          "documentation":"<p>A limit that restricts the number of tags (key and value pairs) returned by GetResources in paginated output. A resource with no tags is counted as having one tag (one key and value pair).</p> <p> <code>GetResources</code> does not split a resource and its associated tags across pages. If the specified <code>TagsPerPage</code> would cause such a break, a <code>PaginationToken</code> is returned in place of the affected resource and its tags. Use that token in another request to get the remaining data. For example, if you specify a <code>TagsPerPage</code> of <code>100</code> and the account has 22 resources with 10 tags each (meaning that each resource has 10 key and value pairs), the output will consist of 3 pages, with the first page displaying the first 10 resources, each with its 10 tags, the second page displaying the next 10 resources each with its 10 tags, and the third page displaying the remaining 2 resources, each with its 10 tags.</p> <p>You can set <code>TagsPerPage</code> to a minimum of 100 items and the maximum of 500 items.</p>"
+          "documentation":"<p>AWS recommends using <code>ResourcesPerPage</code> instead of this parameter.</p> <p>A limit that restricts the number of tags (key and value pairs) returned by GetResources in paginated output. A resource with no tags is counted as having one tag (one key and value pair).</p> <p> <code>GetResources</code> does not split a resource and its associated tags across pages. If the specified <code>TagsPerPage</code> would cause such a break, a <code>PaginationToken</code> is returned in place of the affected resource and its tags. Use that token in another request to get the remaining data. For example, if you specify a <code>TagsPerPage</code> of <code>100</code> and the account has 22 resources with 10 tags each (meaning that each resource has 10 key and value pairs), the output will consist of three pages. The first page displays the first 10 resources, each with its 10 tags. The second page displays the next 10 resources, each with its 10 tags. The third page displays the remaining 2 resources, each with its 10 tags.</p> <p>You can set <code>TagsPerPage</code> to a minimum of 100 items and the maximum of 500 items.</p>"
         },
         "ResourceTypeFilters":{
           "shape":"ResourceTypeFilterList",
           "documentation":"<p>The constraints on the resources that you want returned. The format of each resource type is <code>service[:resourceType]</code>. For example, specifying a resource type of <code>ec2</code> returns all Amazon EC2 resources (which includes EC2 instances). Specifying a resource type of <code>ec2:instance</code> returns only EC2 instances. </p> <p>The string for each service name and resource type is the same as that embedded in a resource's Amazon Resource Name (ARN). Consult the <i>AWS General Reference</i> for the following:</p> <ul> <li> <p>For a list of service name strings, see <a href=\"http://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html#genref-aws-service-namespaces\">AWS Service Namespaces</a>.</p> </li> <li> <p>For resource type strings, see <a href=\"http://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html#arns-syntax\">Example ARNs</a>.</p> </li> <li> <p>For more information about ARNs, see <a href=\"http://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html\">Amazon Resource Names (ARNs) and AWS Service Namespaces</a>.</p> </li> </ul> <p>You can specify multiple resource types by using an array. The array can include up to 100 items. Note that the length constraint requirement applies to each resource type filter. </p>"
+        },
+        "IncludeComplianceDetails":{
+          "shape":"IncludeComplianceDetails",
+          "documentation":"<p>Specifies whether to include details regarding the compliance with the effective tag policy. Set this to <code>true</code> to determine whether resources are compliant with the tag policy and to get details.</p>"
+        },
+        "ExcludeCompliantResources":{
+          "shape":"ExcludeCompliantResources",
+          "documentation":"<p>Specifies whether to exclude resources that are compliant with the tag policy. Set this to <code>true</code> if you are interested in retrieving information on noncompliant resources only.</p> <p>You can use this parameter only if the <code>IncludeComplianceDetails</code> parameter is also set to <code>true</code>.</p>"
         }
       }
     },
@@ -176,7 +338,7 @@
       "members":{
         "PaginationToken":{
           "shape":"PaginationToken",
-          "documentation":"<p>A string that indicates that additional data is available. Leave this value empty for your initial request. If the response includes a PaginationToken, use that string for this value to request an additional page of data.</p>"
+          "documentation":"<p>A string that indicates that additional data is available. Leave this value empty for your initial request. If the response includes a <code>PaginationToken</code>, use that string for this value to request an additional page of data.</p>"
         }
       }
     },
@@ -199,11 +361,11 @@
       "members":{
         "PaginationToken":{
           "shape":"PaginationToken",
-          "documentation":"<p>A string that indicates that additional data is available. Leave this value empty for your initial request. If the response includes a PaginationToken, use that string for this value to request an additional page of data.</p>"
+          "documentation":"<p>A string that indicates that additional data is available. Leave this value empty for your initial request. If the response includes a <code>PaginationToken</code>, use that string for this value to request an additional page of data.</p>"
         },
         "Key":{
           "shape":"TagKey",
-          "documentation":"<p>The key for which you want to list all existing values in the specified region for the AWS account.</p>"
+          "documentation":"<p>The key for which you want to list all existing values in the specified Region for the AWS account.</p>"
         }
       }
     },
@@ -220,6 +382,19 @@
         }
       }
     },
+    "GroupBy":{
+      "type":"list",
+      "member":{"shape":"GroupByAttribute"}
+    },
+    "GroupByAttribute":{
+      "type":"string",
+      "enum":[
+        "TARGET_ID",
+        "REGION",
+        "RESOURCE_TYPE"
+      ]
+    },
+    "IncludeComplianceDetails":{"type":"boolean"},
     "InternalServiceException":{
       "type":"structure",
       "members":{
@@ -234,13 +409,21 @@
       "members":{
         "Message":{"shape":"ExceptionMessage"}
       },
-      "documentation":"<p>A parameter is missing or a malformed string or invalid or out-of-range value was supplied for the request parameter.</p>",
+      "documentation":"<p>This error indicates one of the following:</p> <ul> <li> <p>A parameter is missing.</p> </li> <li> <p>A malformed string was supplied for the request parameter.</p> </li> <li> <p>An out-of-range value was supplied for the request parameter.</p> </li> <li> <p>The target ID is invalid, unsupported, or doesn't exist.</p> </li> <li> <p>You can't access the Amazon S3 bucket for report storage. For more information, see <a href=\"http://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_policies_tag-policies-prereqs.html#bucket-policies-org-report\">Additional Requirements for Organization-wide Tag Compliance Reports</a> in the <i>AWS Organizations User Guide.</i> </p> </li> </ul>",
       "exception":true
     },
+    "LastUpdated":{"type":"string"},
+    "MaxResultsGetComplianceSummary":{
+      "type":"integer",
+      "max":1000,
+      "min":1
+    },
+    "NonCompliantResources":{"type":"long"},
     "PaginationToken":{
       "type":"string",
       "max":2048,
-      "min":0
+      "min":0,
+      "pattern":"[\\s\\S]*"
     },
     "PaginationTokenExpiredException":{
       "type":"structure",
@@ -250,11 +433,24 @@
       "documentation":"<p>A <code>PaginationToken</code> is valid for a maximum of 15 minutes. Your request was denied because the specified <code>PaginationToken</code> has expired.</p>",
       "exception":true
     },
-    "ResourceARN":{
+    "Region":{
       "type":"string",
-      "max":1600,
+      "max":256,
+      "min":1,
+      "pattern":"[\\s\\S]*"
+    },
+    "RegionFilterList":{
+      "type":"list",
+      "member":{"shape":"Region"},
+      "max":100,
       "min":1
     },
+    "ResourceARN":{
+      "type":"string",
+      "max":1011,
+      "min":1,
+      "pattern":"[\\s\\S]*"
+    },
     "ResourceARNList":{
       "type":"list",
       "member":{"shape":"ResourceARN"},
@@ -271,6 +467,10 @@
         "Tags":{
           "shape":"TagList",
           "documentation":"<p>The tags that have been applied to one or more AWS resources.</p>"
+        },
+        "ComplianceDetails":{
+          "shape":"ComplianceDetails",
+          "documentation":"<p>Information that shows whether a resource is compliant with the effective tag policy, including details on any noncompliant tag keys.</p>"
         }
       },
       "documentation":"<p>A list of resource ARNs and the tags (keys and values) that are associated with each.</p>"
@@ -284,7 +484,64 @@
       "member":{"shape":"AmazonResourceType"}
     },
     "ResourcesPerPage":{"type":"integer"},
+    "S3Bucket":{
+      "type":"string",
+      "max":63,
+      "min":3,
+      "pattern":"[\\s\\S]*"
+    },
+    "S3Location":{"type":"string"},
+    "StartReportCreationInput":{
+      "type":"structure",
+      "required":["S3Bucket"],
+      "members":{
+        "S3Bucket":{
+          "shape":"S3Bucket",
+          "documentation":"<p>The name of the Amazon S3 bucket where the report will be stored; for example:</p> <p> <code>awsexamplebucket</code> </p> <p>For more information on S3 bucket requirements, including an example bucket policy, see the example S3 bucket policy on this page.</p>"
+        }
+      }
+    },
+    "StartReportCreationOutput":{
+      "type":"structure",
+      "members":{
+      }
+    },
+    "Status":{"type":"string"},
     "StatusCode":{"type":"integer"},
+    "Summary":{
+      "type":"structure",
+      "members":{
+        "LastUpdated":{
+          "shape":"LastUpdated",
+          "documentation":"<p>The timestamp that shows when this summary was generated in this Region. </p>"
+        },
+        "TargetId":{
+          "shape":"TargetId",
+          "documentation":"<p>The account identifier or the root identifier of the organization. If you don't know the root ID, you can call the AWS Organizations <a href=\"http://docs.aws.amazon.com/organizations/latest/APIReference/API_ListRoots.html\">ListRoots</a> API.</p>"
+        },
+        "TargetIdType":{
+          "shape":"TargetIdType",
+          "documentation":"<p>Whether the target is an account, an OU, or the organization root.</p>"
+        },
+        "Region":{
+          "shape":"Region",
+          "documentation":"<p>The AWS Region that the summary applies to.</p>"
+        },
+        "ResourceType":{
+          "shape":"AmazonResourceType",
+          "documentation":"<p>The AWS resource type.</p>"
+        },
+        "NonCompliantResources":{
+          "shape":"NonCompliantResources",
+          "documentation":"<p>The count of noncompliant resources.</p>"
+        }
+      },
+      "documentation":"<p>A count of noncompliant resources.</p>"
+    },
+    "SummaryList":{
+      "type":"list",
+      "member":{"shape":"Summary"}
+    },
     "Tag":{
       "type":"structure",
       "required":[
@@ -294,21 +551,21 @@
       "members":{
         "Key":{
           "shape":"TagKey",
-          "documentation":"<p>One part of a key-value pair that make up a tag. A key is a general label that acts like a category for more specific tag values.</p>"
+          "documentation":"<p>One part of a key-value pair that makes up a tag. A key is a general label that acts like a category for more specific tag values.</p>"
         },
         "Value":{
           "shape":"TagValue",
           "documentation":"<p>The optional part of a key-value pair that make up a tag. A value acts as a descriptor within a tag category (key).</p>"
         }
       },
-      "documentation":"<p>The metadata that you apply to AWS resources to help you categorize and organize them. Each tag consists of a key and an optional value, both of which you define. For more information, see <a href=\"http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Using_Tags.html#tag-basics\">Tag Basics</a> in the <i>Amazon EC2 User Guide for Linux Instances</i>.</p>"
+      "documentation":"<p>The metadata that you apply to AWS resources to help you categorize and organize them. Each tag consists of a key and an optional value, both of which you define. For more information, see <a href=\"http://docs.aws.amazon.com/general/latest/gr/aws_tagging.html\">Tagging AWS Resources</a> in the <i>AWS General Reference</i>.</p>"
     },
     "TagFilter":{
       "type":"structure",
       "members":{
         "Key":{
           "shape":"TagKey",
-          "documentation":"<p>One part of a key-value pair that make up a tag. A key is a general label that acts like a category for more specific tag values.</p>"
+          "documentation":"<p>One part of a key-value pair that makes up a tag. A key is a general label that acts like a category for more specific tag values.</p>"
         },
         "Values":{
           "shape":"TagValueList",
@@ -326,6 +583,13 @@
     "TagKey":{
       "type":"string",
       "max":128,
+      "min":1,
+      "pattern":"[\\s\\S]*"
+    },
+    "TagKeyFilterList":{
+      "type":"list",
+      "member":{"shape":"TagKey"},
+      "max":50,
       "min":1
     },
     "TagKeyList":{
@@ -371,14 +635,15 @@
       "members":{
         "FailedResourcesMap":{
           "shape":"FailedResourcesMap",
-          "documentation":"<p>Details of resources that could not be tagged. An error code, status code, and error message are returned for each failed item.</p>"
+          "documentation":"<p>A map containing a key-value pair for each failed item that couldn't be tagged. The key is the ARN of the failed resource. The value is a <code>FailureInfo</code> object that contains an error code, a status code, and an error message. If there are no errors, the <code>FailedResourcesMap</code> is empty.</p>"
         }
       }
     },
     "TagValue":{
       "type":"string",
       "max":256,
-      "min":0
+      "min":0,
+      "pattern":"[\\s\\S]*"
     },
     "TagValueList":{
       "type":"list",
@@ -391,6 +656,26 @@
       "member":{"shape":"TagValue"}
     },
     "TagsPerPage":{"type":"integer"},
+    "TargetId":{
+      "type":"string",
+      "max":68,
+      "min":6,
+      "pattern":"[\\s\\S]*"
+    },
+    "TargetIdFilterList":{
+      "type":"list",
+      "member":{"shape":"TargetId"},
+      "max":100,
+      "min":1
+    },
+    "TargetIdType":{
+      "type":"string",
+      "enum":[
+        "ACCOUNT",
+        "OU",
+        "ROOT"
+      ]
+    },
     "ThrottledException":{
       "type":"structure",
       "members":{
@@ -421,10 +706,10 @@
       "members":{
         "FailedResourcesMap":{
           "shape":"FailedResourcesMap",
-          "documentation":"<p>Details of resources that could not be untagged. An error code, status code, and error message are returned for each failed item.</p>"
+          "documentation":"<p>Details of resources that could not be untagged. An error code, status code, and error message are returned for each failed item. </p>"
         }
       }
     }
   },
-  "documentation":"<fullname>Resource Groups Tagging API</fullname> <p>This guide describes the API operations for the resource groups tagging.</p> <p>A tag is a label that you assign to an AWS resource. A tag consists of a key and a value, both of which you define. For example, if you have two Amazon EC2 instances, you might assign both a tag key of \"Stack.\" But the value of \"Stack\" might be \"Testing\" for one and \"Production\" for the other.</p> <p>Tagging can help you organize your resources and enables you to simplify resource management, access management and cost allocation. </p> <p>You can use the resource groups tagging API operations to complete the following tasks:</p> <ul> <li> <p>Tag and untag supported resources located in the specified region for the AWS account</p> </li> <li> <p>Use tag-based filters to search for resources located in the specified region for the AWS account</p> </li> <li> <p>List all existing tag keys in the specified region for the AWS account</p> </li> <li> <p>List all existing values for the specified key in the specified region for the AWS account</p> </li> </ul> <p/> <p>To use resource groups tagging API operations, you must add the following permissions to your IAM policy:</p> <ul> <li> <p> <code>tag:GetResources</code> </p> </li> <li> <p> <code>tag:TagResources</code> </p> </li> <li> <p> <code>tag:UntagResources</code> </p> </li> <li> <p> <code>tag:GetTagKeys</code> </p> </li> <li> <p> <code>tag:GetTagValues</code> </p> </li> </ul> <p>You'll also need permissions to access the resources of individual services so that you can tag and untag those resources.</p> <p>For more information on IAM policies, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/access_policies_manage.html\">Managing IAM Policies</a> in the <i>IAM User Guide</i>.</p> <p>You can use the Resource Groups Tagging API to tag resources for the following AWS services.</p> <ul> <li> <p>Alexa for Business (a4b)</p> </li> <li> <p>API Gateway</p> </li> <li> <p>AWS AppStream</p> </li> <li> <p>AWS AppSync</p> </li> <li> <p>AWS App Mesh</p> </li> <li> <p>Amazon Athena</p> </li> <li> <p>Amazon Aurora</p> </li> <li> <p>AWS Backup</p> </li> <li> <p>AWS Certificate Manager</p> </li> <li> <p>AWS Certificate Manager Private CA</p> </li> <li> <p>Amazon Cloud Directory</p> </li> <li> <p>AWS CloudFormation</p> </li> <li> <p>Amazon CloudFront</p> </li> <li> <p>AWS CloudHSM</p> </li> <li> <p>AWS CloudTrail</p> </li> <li> <p>Amazon CloudWatch (alarms only)</p> </li> <li> <p>Amazon CloudWatch Events</p> </li> <li> <p>Amazon CloudWatch Logs</p> </li> <li> <p>AWS CodeBuild</p> </li> <li> <p>AWS CodeCommit</p> </li> <li> <p>AWS CodePipeline</p> </li> <li> <p>AWS CodeStar</p> </li> <li> <p>Amazon Cognito Identity</p> </li> <li> <p>Amazon Cognito User Pools</p> </li> <li> <p>Amazon Comprehend</p> </li> <li> <p>AWS Config</p> </li> <li> <p>AWS Data Pipeline</p> </li> <li> <p>AWS Database Migration Service</p> </li> <li> <p>AWS Datasync</p> </li> <li> <p>AWS Direct Connect</p> </li> <li> <p>AWS Directory Service</p> </li> <li> <p>Amazon DynamoDB</p> </li> <li> <p>Amazon EBS</p> </li> <li> <p>Amazon EC2</p> </li> <li> <p>Amazon ECR</p> </li> <li> <p>Amazon ECS</p> </li> <li> <p>AWS Elastic Beanstalk</p> </li> <li> <p>Amazon Elastic File System</p> </li> <li> <p>Elastic Load Balancing</p> </li> <li> <p>Amazon ElastiCache</p> </li> <li> <p>Amazon Elasticsearch Service</p> </li> <li> <p>AWS Elemental MediaLive</p> </li> <li> <p>AWS Elemental MediaPackage</p> </li> <li> <p>AWS Elemental MediaTailor</p> </li> <li> <p>Amazon EMR</p> </li> <li> <p>Amazon FSx</p> </li> <li> <p>Amazon Glacier</p> </li> <li> <p>AWS Glue</p> </li> <li> <p>Amazon Inspector</p> </li> <li> <p>AWS IoT Analytics</p> </li> <li> <p>AWS IoT Core</p> </li> <li> <p>AWS IoT Device Defender</p> </li> <li> <p>AWS IoT Device Management</p> </li> <li> <p>AWS IoT Greengrass</p> </li> <li> <p>AWS Key Management Service</p> </li> <li> <p>Amazon Kinesis</p> </li> <li> <p>Amazon Kinesis Data Analytics</p> </li> <li> <p>Amazon Kinesis Data Firehose</p> </li> <li> <p>AWS Lambda</p> </li> <li> <p>AWS License Manager</p> </li> <li> <p>Amazon Machine Learning</p> </li> <li> <p>Amazon MQ</p> </li> <li> <p>Amazon MSK</p> </li> <li> <p>Amazon Neptune</p> </li> <li> <p>AWS OpsWorks</p> </li> <li> <p>Amazon RDS</p> </li> <li> <p>Amazon Redshift</p> </li> <li> <p>AWS Resource Access Manager</p> </li> <li> <p>AWS Resource Groups</p> </li> <li> <p>AWS RoboMaker</p> </li> <li> <p>Amazon Route 53</p> </li> <li> <p>Amazon Route 53 Resolver</p> </li> <li> <p>Amazon S3 (buckets only)</p> </li> <li> <p>Amazon SageMaker</p> </li> <li> <p>AWS Secrets Manager</p> </li> <li> <p>AWS Service Catalog</p> </li> <li> <p>Amazon Simple Notification Service (SNS)</p> </li> <li> <p>Amazon Simple Queue Service (SQS)</p> </li> <li> <p>AWS Simple System Manager (SSM)</p> </li> <li> <p>AWS Step Functions</p> </li> <li> <p>AWS Storage Gateway</p> </li> <li> <p>AWS Transfer for SFTP</p> </li> <li> <p>Amazon VPC</p> </li> <li> <p>Amazon WorkSpaces</p> </li> </ul>"
+  "documentation":"<fullname>Resource Groups Tagging API</fullname> <p>This guide describes the API operations for the resource groups tagging.</p> <p>A tag is a label that you assign to an AWS resource. A tag consists of a key and a value, both of which you define. For example, if you have two Amazon EC2 instances, you might assign both a tag key of \"Stack.\" But the value of \"Stack\" might be \"Testing\" for one and \"Production\" for the other.</p> <p>Tagging can help you organize your resources and enables you to simplify resource management, access management and cost allocation. </p> <p>You can use the resource groups tagging API operations to complete the following tasks:</p> <ul> <li> <p>Tag and untag supported resources located in the specified Region for the AWS account.</p> </li> <li> <p>Use tag-based filters to search for resources located in the specified Region for the AWS account.</p> </li> <li> <p>List all existing tag keys in the specified Region for the AWS account.</p> </li> <li> <p>List all existing values for the specified key in the specified Region for the AWS account.</p> </li> </ul> <p>To use resource groups tagging API operations, you must add the following permissions to your IAM policy:</p> <ul> <li> <p> <code>tag:GetResources</code> </p> </li> <li> <p> <code>tag:TagResources</code> </p> </li> <li> <p> <code>tag:UntagResources</code> </p> </li> <li> <p> <code>tag:GetTagKeys</code> </p> </li> <li> <p> <code>tag:GetTagValues</code> </p> </li> </ul> <p>You'll also need permissions to access the resources of individual services so that you can tag and untag those resources.</p> <p>For more information on IAM policies, see <a href=\"http://docs.aws.amazon.com/IAM/latest/UserGuide/access_policies_manage.html\">Managing IAM Policies</a> in the <i>IAM User Guide</i>.</p> <p>You can use the Resource Groups Tagging API to tag resources for the following AWS services.</p> <ul> <li> <p>Alexa for Business (a4b)</p> </li> <li> <p>API Gateway</p> </li> <li> <p>Amazon AppStream</p> </li> <li> <p>AWS AppSync</p> </li> <li> <p>AWS App Mesh</p> </li> <li> <p>Amazon Athena</p> </li> <li> <p>Amazon Aurora</p> </li> <li> <p>AWS Backup</p> </li> <li> <p>AWS Certificate Manager</p> </li> <li> <p>AWS Certificate Manager Private CA</p> </li> <li> <p>Amazon Cloud Directory</p> </li> <li> <p>AWS CloudFormation</p> </li> <li> <p>Amazon CloudFront</p> </li> <li> <p>AWS CloudHSM</p> </li> <li> <p>AWS CloudTrail</p> </li> <li> <p>Amazon CloudWatch (alarms only)</p> </li> <li> <p>Amazon CloudWatch Events</p> </li> <li> <p>Amazon CloudWatch Logs</p> </li> <li> <p>AWS CodeBuild</p> </li> <li> <p>AWS CodeCommit</p> </li> <li> <p>AWS CodePipeline</p> </li> <li> <p>AWS CodeStar</p> </li> <li> <p>Amazon Cognito Identity</p> </li> <li> <p>Amazon Cognito User Pools</p> </li> <li> <p>Amazon Comprehend</p> </li> <li> <p>AWS Config</p> </li> <li> <p>AWS Data Exchange</p> </li> <li> <p>AWS Data Pipeline</p> </li> <li> <p>AWS Database Migration Service</p> </li> <li> <p>AWS DataSync</p> </li> <li> <p>AWS Device Farm</p> </li> <li> <p>AWS Direct Connect</p> </li> <li> <p>AWS Directory Service</p> </li> <li> <p>Amazon DynamoDB</p> </li> <li> <p>Amazon EBS</p> </li> <li> <p>Amazon EC2</p> </li> <li> <p>Amazon ECR</p> </li> <li> <p>Amazon ECS</p> </li> <li> <p>Amazon EKS</p> </li> <li> <p>AWS Elastic Beanstalk</p> </li> <li> <p>Amazon Elastic File System</p> </li> <li> <p>Elastic Load Balancing</p> </li> <li> <p>Amazon ElastiCache</p> </li> <li> <p>Amazon Elasticsearch Service</p> </li> <li> <p>AWS Elemental MediaLive</p> </li> <li> <p>AWS Elemental MediaPackage</p> </li> <li> <p>AWS Elemental MediaTailor</p> </li> <li> <p>Amazon EMR</p> </li> <li> <p>Amazon FSx</p> </li> <li> <p>Amazon S3 Glacier</p> </li> <li> <p>AWS Glue</p> </li> <li> <p>Amazon GuardDuty</p> </li> <li> <p>Amazon Inspector</p> </li> <li> <p>AWS IoT Analytics</p> </li> <li> <p>AWS IoT Core</p> </li> <li> <p>AWS IoT Device Defender</p> </li> <li> <p>AWS IoT Device Management</p> </li> <li> <p>AWS IoT Events</p> </li> <li> <p>AWS IoT Greengrass</p> </li> <li> <p>AWS IoT 1-Click</p> </li> <li> <p>AWS Key Management Service</p> </li> <li> <p>Amazon Kinesis</p> </li> <li> <p>Amazon Kinesis Data Analytics</p> </li> <li> <p>Amazon Kinesis Data Firehose</p> </li> <li> <p>AWS Lambda</p> </li> <li> <p>AWS License Manager</p> </li> <li> <p>Amazon Machine Learning</p> </li> <li> <p>Amazon MQ</p> </li> <li> <p>Amazon MSK</p> </li> <li> <p>Amazon Neptune</p> </li> <li> <p>AWS OpsWorks</p> </li> <li> <p>AWS Organizations</p> </li> <li> <p>Amazon Quantum Ledger Database (QLDB)</p> </li> <li> <p>Amazon RDS</p> </li> <li> <p>Amazon Redshift</p> </li> <li> <p>AWS Resource Access Manager</p> </li> <li> <p>AWS Resource Groups</p> </li> <li> <p>AWS RoboMaker</p> </li> <li> <p>Amazon Route 53</p> </li> <li> <p>Amazon Route 53 Resolver</p> </li> <li> <p>Amazon S3 (buckets only)</p> </li> <li> <p>Amazon SageMaker</p> </li> <li> <p>AWS Secrets Manager</p> </li> <li> <p>AWS Security Hub</p> </li> <li> <p>AWS Service Catalog</p> </li> <li> <p>Amazon Simple Notification Service (SNS)</p> </li> <li> <p>Amazon Simple Queue Service (SQS)</p> </li> <li> <p>Amazon Simple Workflow Service</p> </li> <li> <p>AWS Step Functions</p> </li> <li> <p>AWS Storage Gateway</p> </li> <li> <p>AWS Systems Manager</p> </li> <li> <p>AWS Transfer for SFTP</p> </li> <li> <p>Amazon VPC</p> </li> <li> <p>Amazon WorkSpaces</p> </li> </ul>"
 }
diff --git a/services/robomaker/pom.xml b/services/robomaker/pom.xml
index 7d8536eb2832..bff3e0355985 100644
--- a/services/robomaker/pom.xml
+++ b/services/robomaker/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>robomaker</artifactId>
     <name>AWS Java SDK :: Services :: RoboMaker</name>
diff --git a/services/robomaker/src/main/resources/codegen-resources/paginators-1.json b/services/robomaker/src/main/resources/codegen-resources/paginators-1.json
index 581613c45081..164e1501947b 100644
--- a/services/robomaker/src/main/resources/codegen-resources/paginators-1.json
+++ b/services/robomaker/src/main/resources/codegen-resources/paginators-1.json
@@ -3,32 +3,44 @@
     "ListDeploymentJobs": {
       "input_token": "nextToken",
       "output_token": "nextToken",
-      "limit_key": "maxResults"
+      "limit_key": "maxResults",
+      "result_key": "deploymentJobs"
     },
     "ListFleets": {
       "input_token": "nextToken",
       "output_token": "nextToken",
-      "limit_key": "maxResults"
+      "limit_key": "maxResults",
+      "result_key": "fleetDetails"
     },
     "ListRobotApplications": {
       "input_token": "nextToken",
       "output_token": "nextToken",
-      "limit_key": "maxResults"
+      "limit_key": "maxResults",
+      "result_key": "robotApplicationSummaries"
     },
     "ListRobots": {
       "input_token": "nextToken",
       "output_token": "nextToken",
-      "limit_key": "maxResults"
+      "limit_key": "maxResults",
+      "result_key": "robots"
     },
     "ListSimulationApplications": {
       "input_token": "nextToken",
       "output_token": "nextToken",
-      "limit_key": "maxResults"
+      "limit_key": "maxResults",
+      "result_key": "simulationApplicationSummaries"
+    },
+    "ListSimulationJobBatches": {
+      "input_token": "nextToken",
+      "output_token": "nextToken",
+      "limit_key": "maxResults",
+      "result_key": "simulationJobBatchSummaries"
     },
     "ListSimulationJobs": {
       "input_token": "nextToken",
       "output_token": "nextToken",
-      "limit_key": "maxResults"
+      "limit_key": "maxResults",
+      "result_key": "simulationJobSummaries"
     }
   }
 }
diff --git a/services/robomaker/src/main/resources/codegen-resources/service-2.json b/services/robomaker/src/main/resources/codegen-resources/service-2.json
index b67649f8f79f..bde7e0e5d485 100644
--- a/services/robomaker/src/main/resources/codegen-resources/service-2.json
+++ b/services/robomaker/src/main/resources/codegen-resources/service-2.json
@@ -61,6 +61,22 @@
       ],
       "documentation":"<p>Cancels the specified simulation job.</p>"
     },
+    "CancelSimulationJobBatch":{
+      "name":"CancelSimulationJobBatch",
+      "http":{
+        "method":"POST",
+        "requestUri":"/cancelSimulationJobBatch"
+      },
+      "input":{"shape":"CancelSimulationJobBatchRequest"},
+      "output":{"shape":"CancelSimulationJobBatchResponse"},
+      "errors":[
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InvalidParameterException"},
+        {"shape":"InternalServerException"},
+        {"shape":"ThrottlingException"}
+      ],
+      "documentation":"<p>Cancels a simulation job batch. When you cancel a simulation job batch, you are also cancelling all of the active simulation jobs created as part of the batch. </p>"
+    },
     "CreateDeploymentJob":{
       "name":"CreateDeploymentJob",
       "http":{
@@ -374,6 +390,21 @@
       ],
       "documentation":"<p>Describes a simulation job.</p>"
     },
+    "DescribeSimulationJobBatch":{
+      "name":"DescribeSimulationJobBatch",
+      "http":{
+        "method":"POST",
+        "requestUri":"/describeSimulationJobBatch"
+      },
+      "input":{"shape":"DescribeSimulationJobBatchRequest"},
+      "output":{"shape":"DescribeSimulationJobBatchResponse"},
+      "errors":[
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InvalidParameterException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Describes a simulation job batch.</p>"
+    },
     "ListDeploymentJobs":{
       "name":"ListDeploymentJobs",
       "http":{
@@ -388,7 +419,7 @@
         {"shape":"InternalServerException"},
         {"shape":"ThrottlingException"}
       ],
-      "documentation":"<p>Returns a list of deployment jobs for a fleet. You can optionally provide filters to retrieve specific deployment jobs. </p> <note> <p> </p> </note>"
+      "documentation":"<p>Returns a list of deployment jobs for a fleet. You can optionally provide filters to retrieve specific deployment jobs. </p>"
     },
     "ListFleets":{
       "name":"ListFleets",
@@ -452,6 +483,20 @@
       ],
       "documentation":"<p>Returns a list of simulation applications. You can optionally provide filters to retrieve specific simulation applications. </p>"
     },
+    "ListSimulationJobBatches":{
+      "name":"ListSimulationJobBatches",
+      "http":{
+        "method":"POST",
+        "requestUri":"/listSimulationJobBatches"
+      },
+      "input":{"shape":"ListSimulationJobBatchesRequest"},
+      "output":{"shape":"ListSimulationJobBatchesResponse"},
+      "errors":[
+        {"shape":"InvalidParameterException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Returns a list simulation job batches. You can optionally provide filters to retrieve specific simulation batch jobs. </p>"
+    },
     "ListSimulationJobs":{
       "name":"ListSimulationJobs",
       "http":{
@@ -517,6 +562,23 @@
       ],
       "documentation":"<p>Restarts a running simulation job.</p>"
     },
+    "StartSimulationJobBatch":{
+      "name":"StartSimulationJobBatch",
+      "http":{
+        "method":"POST",
+        "requestUri":"/startSimulationJobBatch"
+      },
+      "input":{"shape":"StartSimulationJobBatchRequest"},
+      "output":{"shape":"StartSimulationJobBatchResponse"},
+      "errors":[
+        {"shape":"InvalidParameterException"},
+        {"shape":"LimitExceededException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"IdempotentParameterMismatchException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Starts a new simulation job batch. The batch is defined using one or more <code>SimulationJobRequest</code> objects. </p>"
+    },
     "SyncDeploymentJob":{
       "name":"SyncDeploymentJob",
       "http":{
@@ -647,6 +709,21 @@
         }
       }
     },
+    "BatchPolicy":{
+      "type":"structure",
+      "members":{
+        "timeoutInSeconds":{
+          "shape":"BatchTimeoutInSeconds",
+          "documentation":"<p>The amount of time, in seconds, to wait for the batch to complete. </p> <p>If a batch times out, and there are pending requests that were failing due to an internal failure (like <code>InternalServiceError</code>), they will be moved to the failed list and the batch status will be <code>Failed</code>. If the pending requests were failing for any other reason, the failed pending requests will be moved to the failed list and the batch status will be <code>TimedOut</code>. </p>"
+        },
+        "maxConcurrency":{
+          "shape":"MaxConcurrency",
+          "documentation":"<p>The number of active simulation jobs create as part of the batch that can be in an active state at the same time. </p> <p>Active states include: <code>Pending</code>,<code>Preparing</code>, <code>Running</code>, <code>Restarting</code>, <code>RunningFailed</code> and <code>Terminating</code>. All other states are terminal states. </p>"
+        }
+      },
+      "documentation":"<p>Information about the batch policy.</p>"
+    },
+    "BatchTimeoutInSeconds":{"type":"long"},
     "Boolean":{"type":"boolean"},
     "BoxedBoolean":{"type":"boolean"},
     "CancelDeploymentJobRequest":{
@@ -664,6 +741,21 @@
       "members":{
       }
     },
+    "CancelSimulationJobBatchRequest":{
+      "type":"structure",
+      "required":["batch"],
+      "members":{
+        "batch":{
+          "shape":"Arn",
+          "documentation":"<p>The id of the batch to cancel.</p>"
+        }
+      }
+    },
+    "CancelSimulationJobBatchResponse":{
+      "type":"structure",
+      "members":{
+      }
+    },
     "CancelSimulationJobRequest":{
       "type":"structure",
       "required":["job"],
@@ -825,7 +917,7 @@
         },
         "robotSoftwareSuite":{
           "shape":"RobotSoftwareSuite",
-          "documentation":"<p>The robot software suite used by the robot application.</p>"
+          "documentation":"<p>The robot software suite (ROS distribuition) used by the robot application.</p>"
         },
         "tags":{
           "shape":"TagMap",
@@ -854,7 +946,7 @@
         },
         "robotSoftwareSuite":{
           "shape":"RobotSoftwareSuite",
-          "documentation":"<p>The robot software suite used by the robot application.</p>"
+          "documentation":"<p>The robot software suite (ROS distribution) used by the robot application.</p>"
         },
         "lastUpdatedAt":{
           "shape":"LastUpdatedAt",
@@ -905,7 +997,7 @@
         },
         "robotSoftwareSuite":{
           "shape":"RobotSoftwareSuite",
-          "documentation":"<p>The robot software suite used by the robot application.</p>"
+          "documentation":"<p>The robot software suite (ROS distribution) used by the robot application.</p>"
         },
         "lastUpdatedAt":{
           "shape":"LastUpdatedAt",
@@ -995,7 +1087,7 @@
         },
         "robotSoftwareSuite":{
           "shape":"RobotSoftwareSuite",
-          "documentation":"<p>The robot software suite of the simulation application.</p>"
+          "documentation":"<p>The robot software suite (ROS distribution) used by the simulation application.</p>"
         },
         "renderingEngine":{
           "shape":"RenderingEngine",
@@ -1032,7 +1124,7 @@
         },
         "robotSoftwareSuite":{
           "shape":"RobotSoftwareSuite",
-          "documentation":"<p>Information about the robot software suite.</p>"
+          "documentation":"<p>Information about the robot software suite (ROS distribution).</p>"
         },
         "renderingEngine":{
           "shape":"RenderingEngine",
@@ -1091,7 +1183,7 @@
         },
         "robotSoftwareSuite":{
           "shape":"RobotSoftwareSuite",
-          "documentation":"<p>Information about the robot software suite.</p>"
+          "documentation":"<p>Information about the robot software suite (ROS distribution).</p>"
         },
         "renderingEngine":{
           "shape":"RenderingEngine",
@@ -1149,7 +1241,7 @@
         },
         "dataSources":{
           "shape":"DataSourceConfigs",
-          "documentation":"<p>The data sources for the simulation job.</p> <note> <p>There is a limit of 100 files and a combined size of 25GB for all <code>DataSourceConfig</code> objects. </p> </note>"
+          "documentation":"<p>Specify data sources to mount read-only files from S3 into your simulation. These files are available under <code>/opt/robomaker/datasources/data_source_name</code>. </p> <note> <p>There is a limit of 100 files and a combined size of 25GB for all <code>DataSourceConfig</code> objects. </p> </note>"
         },
         "tags":{
           "shape":"TagMap",
@@ -1161,6 +1253,11 @@
         }
       }
     },
+    "CreateSimulationJobRequests":{
+      "type":"list",
+      "member":{"shape":"SimulationJobRequest"},
+      "min":1
+    },
     "CreateSimulationJobResponse":{
       "type":"structure",
       "members":{
@@ -1401,6 +1498,10 @@
         "robotDeploymentTimeoutInSeconds":{
           "shape":"DeploymentTimeout",
           "documentation":"<p>The amount of time, in seconds, to wait for deployment to a single robot to complete. Choose a time between 1 minute and 7 days. The default is 5 hours.</p>"
+        },
+        "downloadConditionFile":{
+          "shape":"S3Object",
+          "documentation":"<p>The download condition file.</p>"
         }
       },
       "documentation":"<p>Information about a deployment configuration.</p>"
@@ -1454,14 +1555,17 @@
         "RobotDeploymentNoResponse",
         "RobotAgentConnectionTimeout",
         "GreengrassDeploymentFailed",
+        "InvalidGreengrassGroup",
         "MissingRobotArchitecture",
         "MissingRobotApplicationArchitecture",
         "MissingRobotDeploymentResource",
         "GreengrassGroupVersionDoesNotExist",
+        "LambdaDeleted",
         "ExtractingBundleFailure",
         "PreLaunchFileFailure",
         "PostLaunchFileFailure",
         "BadPermissionError",
+        "DownloadConditionFailed",
         "InternalServerError"
       ]
     },
@@ -1686,7 +1790,7 @@
         },
         "robotSoftwareSuite":{
           "shape":"RobotSoftwareSuite",
-          "documentation":"<p>The robot software suite used by the robot application.</p>"
+          "documentation":"<p>The robot software suite (ROS distribution) used by the robot application.</p>"
         },
         "revisionId":{
           "shape":"RevisionId",
@@ -1796,7 +1900,7 @@
         },
         "robotSoftwareSuite":{
           "shape":"RobotSoftwareSuite",
-          "documentation":"<p>Information about the robot software suite.</p>"
+          "documentation":"<p>Information about the robot software suite (ROS distribution).</p>"
         },
         "renderingEngine":{
           "shape":"RenderingEngine",
@@ -1816,6 +1920,69 @@
         }
       }
     },
+    "DescribeSimulationJobBatchRequest":{
+      "type":"structure",
+      "required":["batch"],
+      "members":{
+        "batch":{
+          "shape":"Arn",
+          "documentation":"<p>The id of the batch to describe.</p>"
+        }
+      }
+    },
+    "DescribeSimulationJobBatchResponse":{
+      "type":"structure",
+      "members":{
+        "arn":{
+          "shape":"Arn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the batch.</p>"
+        },
+        "status":{
+          "shape":"SimulationJobBatchStatus",
+          "documentation":"<p>The status of the batch.</p> <dl> <dt>Pending</dt> <dd> <p>The simulation job batch request is pending.</p> </dd> <dt>InProgress</dt> <dd> <p>The simulation job batch is in progress. </p> </dd> <dt>Failed</dt> <dd> <p>The simulation job batch failed. One or more simulation job requests could not be completed due to an internal failure (like <code>InternalServiceError</code>). See <code>failureCode</code> and <code>failureReason</code> for more information.</p> </dd> <dt>Completed</dt> <dd> <p>The simulation batch job completed. A batch is complete when (1) there are no pending simulation job requests in the batch and none of the failed simulation job requests are due to <code>InternalServiceError</code> and (2) when all created simulation jobs have reached a terminal state (for example, <code>Completed</code> or <code>Failed</code>). </p> </dd> <dt>Canceled</dt> <dd> <p>The simulation batch job was cancelled.</p> </dd> <dt>Canceling</dt> <dd> <p>The simulation batch job is being cancelled.</p> </dd> <dt>Completing</dt> <dd> <p>The simulation batch job is completing.</p> </dd> <dt>TimingOut</dt> <dd> <p>The simulation job batch is timing out.</p> <p>If a batch timing out, and there are pending requests that were failing due to an internal failure (like <code>InternalServiceError</code>), the batch status will be <code>Failed</code>. If there are no such failing request, the batch status will be <code>TimedOut</code>. </p> </dd> <dt>TimedOut</dt> <dd> <p>The simulation batch job timed out.</p> </dd> </dl>"
+        },
+        "lastUpdatedAt":{
+          "shape":"LastUpdatedAt",
+          "documentation":"<p>The time, in milliseconds since the epoch, when the simulation job batch was last updated.</p>"
+        },
+        "createdAt":{
+          "shape":"CreatedAt",
+          "documentation":"<p>The time, in milliseconds since the epoch, when the simulation job batch was created.</p>"
+        },
+        "clientRequestToken":{
+          "shape":"ClientRequestToken",
+          "documentation":"<p>Unique, case-sensitive identifier that you provide to ensure the idempotency of the request.</p>"
+        },
+        "batchPolicy":{
+          "shape":"BatchPolicy",
+          "documentation":"<p>The batch policy.</p>"
+        },
+        "failureCode":{
+          "shape":"SimulationJobBatchErrorCode",
+          "documentation":"<p>The failure code of the simulation job batch.</p>"
+        },
+        "failureReason":{
+          "shape":"GenericString",
+          "documentation":"<p>The reason the simulation job batch failed.</p>"
+        },
+        "failedRequests":{
+          "shape":"FailedCreateSimulationJobRequests",
+          "documentation":"<p>A list of failed create simulation job requests. The request failed to be created into a simulation job. Failed requests do not have a simulation job ID. </p>"
+        },
+        "pendingRequests":{
+          "shape":"CreateSimulationJobRequests",
+          "documentation":"<p>A list of pending simulation job requests. These requests have not yet been created into simulation jobs.</p>"
+        },
+        "createdRequests":{
+          "shape":"SimulationJobSummaries",
+          "documentation":"<p>A list of created simulation job summaries.</p>"
+        },
+        "tags":{
+          "shape":"TagMap",
+          "documentation":"<p>A map that contains tag keys and tag values that are attached to the simulation job batch.</p>"
+        }
+      }
+    },
     "DescribeSimulationJobRequest":{
       "type":"structure",
       "required":["job"],
@@ -1930,6 +2097,33 @@
       "min":1,
       "pattern":".*"
     },
+    "FailedAt":{"type":"timestamp"},
+    "FailedCreateSimulationJobRequest":{
+      "type":"structure",
+      "members":{
+        "request":{
+          "shape":"SimulationJobRequest",
+          "documentation":"<p>The simulation job request.</p>"
+        },
+        "failureReason":{
+          "shape":"GenericString",
+          "documentation":"<p>The failure reason of the simulation job request.</p>"
+        },
+        "failureCode":{
+          "shape":"SimulationJobErrorCode",
+          "documentation":"<p>The failure code.</p>"
+        },
+        "failedAt":{
+          "shape":"FailedAt",
+          "documentation":"<p>The time, in milliseconds since the epoch, when the simulation job batch failed.</p>"
+        }
+      },
+      "documentation":"<p>Information about a failed create simulation job request.</p>"
+    },
+    "FailedCreateSimulationJobRequests":{
+      "type":"list",
+      "member":{"shape":"FailedCreateSimulationJobRequest"}
+    },
     "FailureBehavior":{
       "type":"string",
       "enum":[
@@ -2000,7 +2194,12 @@
       "min":0
     },
     "GenericInteger":{"type":"integer"},
-    "GenericString":{"type":"string"},
+    "GenericString":{
+      "type":"string",
+      "max":1024,
+      "min":0,
+      "pattern":".*"
+    },
     "IamRole":{
       "type":"string",
       "max":255,
@@ -2022,6 +2221,7 @@
       "error":{"httpStatusCode":400},
       "exception":true
     },
+    "Integer":{"type":"integer"},
     "InternalServerException":{
       "type":"structure",
       "members":{
@@ -2065,6 +2265,10 @@
         "portForwardingConfig":{
           "shape":"PortForwardingConfig",
           "documentation":"<p>The port forwarding configuration.</p>"
+        },
+        "streamUI":{
+          "shape":"Boolean",
+          "documentation":"<p>Boolean indicating whether a streaming session will be configured for the application. If <code>True</code>, AWS RoboMaker will configure a connection so you can interact with your application as it is running in the simulation. You must configure and luanch the component. It must have a graphical user interface. </p>"
         }
       },
       "documentation":"<p>Information about a launch configuration.</p>"
@@ -2087,11 +2291,11 @@
         },
         "nextToken":{
           "shape":"PaginationToken",
-          "documentation":"<p>The <code>nextToken</code> value returned from a previous paginated <code>ListDeploymentJobs</code> request where <code>maxResults</code> was used and the results exceeded the value of that parameter. Pagination continues from the end of the previous results that returned the <code>nextToken</code> value. </p> <note> <p>This token should be treated as an opaque identifier that is only used to retrieve the next items in a list and not for other programmatic purposes.</p> </note>"
+          "documentation":"<p>The <code>nextToken</code> value returned from a previous paginated <code>ListDeploymentJobs</code> request where <code>maxResults</code> was used and the results exceeded the value of that parameter. Pagination continues from the end of the previous results that returned the <code>nextToken</code> value. </p>"
         },
         "maxResults":{
           "shape":"MaxResults",
-          "documentation":"<p>The maximum number of deployment job results returned by <code>ListDeploymentJobs</code> in paginated output. When this parameter is used, <code>ListDeploymentJobs</code> only returns <code>maxResults</code> results in a single page along with a <code>nextToken</code> response element. The remaining results of the initial request can be seen by sending another <code>ListDeploymentJobs</code> request with the returned <code>nextToken</code> value. This value can be between 1 and 100. If this parameter is not used, then <code>ListDeploymentJobs</code> returns up to 100 results and a <code>nextToken</code> value if applicable. </p>"
+          "documentation":"<p>When this parameter is used, <code>ListDeploymentJobs</code> only returns <code>maxResults</code> results in a single page along with a <code>nextToken</code> response element. The remaining results of the initial request can be seen by sending another <code>ListDeploymentJobs</code> request with the returned <code>nextToken</code> value. This value can be between 1 and 200. If this parameter is not used, then <code>ListDeploymentJobs</code> returns up to 200 results and a <code>nextToken</code> value if applicable. </p>"
         }
       }
     },
@@ -2117,7 +2321,7 @@
         },
         "maxResults":{
           "shape":"MaxResults",
-          "documentation":"<p>The maximum number of deployment job results returned by <code>ListFleets</code> in paginated output. When this parameter is used, <code>ListFleets</code> only returns <code>maxResults</code> results in a single page along with a <code>nextToken</code> response element. The remaining results of the initial request can be seen by sending another <code>ListFleets</code> request with the returned <code>nextToken</code> value. This value can be between 1 and 100. If this parameter is not used, then <code>ListFleets</code> returns up to 100 results and a <code>nextToken</code> value if applicable. </p>"
+          "documentation":"<p>When this parameter is used, <code>ListFleets</code> only returns <code>maxResults</code> results in a single page along with a <code>nextToken</code> response element. The remaining results of the initial request can be seen by sending another <code>ListFleets</code> request with the returned <code>nextToken</code> value. This value can be between 1 and 200. If this parameter is not used, then <code>ListFleets</code> returns up to 200 results and a <code>nextToken</code> value if applicable. </p>"
         },
         "filters":{
           "shape":"Filters",
@@ -2147,11 +2351,11 @@
         },
         "nextToken":{
           "shape":"PaginationToken",
-          "documentation":"<p>The <code>nextToken</code> value returned from a previous paginated <code>ListRobotApplications</code> request where <code>maxResults</code> was used and the results exceeded the value of that parameter. Pagination continues from the end of the previous results that returned the <code>nextToken</code> value. </p> <note> <p>This token should be treated as an opaque identifier that is only used to retrieve the next items in a list and not for other programmatic purposes.</p> </note>"
+          "documentation":"<p>The <code>nextToken</code> value returned from a previous paginated <code>ListRobotApplications</code> request where <code>maxResults</code> was used and the results exceeded the value of that parameter. Pagination continues from the end of the previous results that returned the <code>nextToken</code> value. </p>"
         },
         "maxResults":{
           "shape":"MaxResults",
-          "documentation":"<p>The maximum number of deployment job results returned by <code>ListRobotApplications</code> in paginated output. When this parameter is used, <code>ListRobotApplications</code> only returns <code>maxResults</code> results in a single page along with a <code>nextToken</code> response element. The remaining results of the initial request can be seen by sending another <code>ListRobotApplications</code> request with the returned <code>nextToken</code> value. This value can be between 1 and 100. If this parameter is not used, then <code>ListRobotApplications</code> returns up to 100 results and a <code>nextToken</code> value if applicable. </p>"
+          "documentation":"<p>When this parameter is used, <code>ListRobotApplications</code> only returns <code>maxResults</code> results in a single page along with a <code>nextToken</code> response element. The remaining results of the initial request can be seen by sending another <code>ListRobotApplications</code> request with the returned <code>nextToken</code> value. This value can be between 1 and 100. If this parameter is not used, then <code>ListRobotApplications</code> returns up to 100 results and a <code>nextToken</code> value if applicable. </p>"
         },
         "filters":{
           "shape":"Filters",
@@ -2177,11 +2381,11 @@
       "members":{
         "nextToken":{
           "shape":"PaginationToken",
-          "documentation":"<p>The <code>nextToken</code> value returned from a previous paginated <code>ListRobots</code> request where <code>maxResults</code> was used and the results exceeded the value of that parameter. Pagination continues from the end of the previous results that returned the <code>nextToken</code> value. </p> <note> <p>This token should be treated as an opaque identifier that is only used to retrieve the next items in a list and not for other programmatic purposes.</p> </note>"
+          "documentation":"<p>The <code>nextToken</code> value returned from a previous paginated <code>ListRobots</code> request where <code>maxResults</code> was used and the results exceeded the value of that parameter. Pagination continues from the end of the previous results that returned the <code>nextToken</code> value. </p>"
         },
         "maxResults":{
           "shape":"MaxResults",
-          "documentation":"<p>The maximum number of deployment job results returned by <code>ListRobots</code> in paginated output. When this parameter is used, <code>ListRobots</code> only returns <code>maxResults</code> results in a single page along with a <code>nextToken</code> response element. The remaining results of the initial request can be seen by sending another <code>ListRobots</code> request with the returned <code>nextToken</code> value. This value can be between 1 and 100. If this parameter is not used, then <code>ListRobots</code> returns up to 100 results and a <code>nextToken</code> value if applicable. </p>"
+          "documentation":"<p>When this parameter is used, <code>ListRobots</code> only returns <code>maxResults</code> results in a single page along with a <code>nextToken</code> response element. The remaining results of the initial request can be seen by sending another <code>ListRobots</code> request with the returned <code>nextToken</code> value. This value can be between 1 and 200. If this parameter is not used, then <code>ListRobots</code> returns up to 200 results and a <code>nextToken</code> value if applicable. </p>"
         },
         "filters":{
           "shape":"Filters",
@@ -2211,11 +2415,11 @@
         },
         "nextToken":{
           "shape":"PaginationToken",
-          "documentation":"<p>The <code>nextToken</code> value returned from a previous paginated <code>ListSimulationApplications</code> request where <code>maxResults</code> was used and the results exceeded the value of that parameter. Pagination continues from the end of the previous results that returned the <code>nextToken</code> value. </p> <note> <p>This token should be treated as an opaque identifier that is only used to retrieve the next items in a list and not for other programmatic purposes.</p> </note>"
+          "documentation":"<p>The <code>nextToken</code> value returned from a previous paginated <code>ListSimulationApplications</code> request where <code>maxResults</code> was used and the results exceeded the value of that parameter. Pagination continues from the end of the previous results that returned the <code>nextToken</code> value. </p>"
         },
         "maxResults":{
           "shape":"MaxResults",
-          "documentation":"<p>The maximum number of deployment job results returned by <code>ListSimulationApplications</code> in paginated output. When this parameter is used, <code>ListSimulationApplications</code> only returns <code>maxResults</code> results in a single page along with a <code>nextToken</code> response element. The remaining results of the initial request can be seen by sending another <code>ListSimulationApplications</code> request with the returned <code>nextToken</code> value. This value can be between 1 and 100. If this parameter is not used, then <code>ListSimulationApplications</code> returns up to 100 results and a <code>nextToken</code> value if applicable. </p>"
+          "documentation":"<p>When this parameter is used, <code>ListSimulationApplications</code> only returns <code>maxResults</code> results in a single page along with a <code>nextToken</code> response element. The remaining results of the initial request can be seen by sending another <code>ListSimulationApplications</code> request with the returned <code>nextToken</code> value. This value can be between 1 and 100. If this parameter is not used, then <code>ListSimulationApplications</code> returns up to 100 results and a <code>nextToken</code> value if applicable. </p>"
         },
         "filters":{
           "shape":"Filters",
@@ -2236,6 +2440,36 @@
         }
       }
     },
+    "ListSimulationJobBatchesRequest":{
+      "type":"structure",
+      "members":{
+        "nextToken":{
+          "shape":"PaginationToken",
+          "documentation":"<p>The <code>nextToken</code> value returned from a previous paginated <code>ListSimulationJobBatches</code> request where <code>maxResults</code> was used and the results exceeded the value of that parameter. Pagination continues from the end of the previous results that returned the <code>nextToken</code> value. </p>"
+        },
+        "maxResults":{
+          "shape":"MaxResults",
+          "documentation":"<p>When this parameter is used, <code>ListSimulationJobBatches</code> only returns <code>maxResults</code> results in a single page along with a <code>nextToken</code> response element. The remaining results of the initial request can be seen by sending another <code>ListSimulationJobBatches</code> request with the returned <code>nextToken</code> value. </p>"
+        },
+        "filters":{
+          "shape":"Filters",
+          "documentation":"<p>Optional filters to limit results.</p>"
+        }
+      }
+    },
+    "ListSimulationJobBatchesResponse":{
+      "type":"structure",
+      "members":{
+        "simulationJobBatchSummaries":{
+          "shape":"SimulationJobBatchSummaries",
+          "documentation":"<p>A list of simulation job batch summaries.</p>"
+        },
+        "nextToken":{
+          "shape":"PaginationToken",
+          "documentation":"<p>The <code>nextToken</code> value to include in a future <code>ListSimulationJobBatches</code> request. When the results of a <code>ListSimulationJobBatches</code> request exceed <code>maxResults</code>, this value can be used to retrieve the next page of results. This value is <code>null</code> when there are no more results to return. </p>"
+        }
+      }
+    },
     "ListSimulationJobsRequest":{
       "type":"structure",
       "members":{
@@ -2245,7 +2479,7 @@
         },
         "maxResults":{
           "shape":"MaxResults",
-          "documentation":"<p>The maximum number of deployment job results returned by <code>ListSimulationJobs</code> in paginated output. When this parameter is used, <code>ListSimulationJobs</code> only returns <code>maxResults</code> results in a single page along with a <code>nextToken</code> response element. The remaining results of the initial request can be seen by sending another <code>ListSimulationJobs</code> request with the returned <code>nextToken</code> value. This value can be between 1 and 100. If this parameter is not used, then <code>ListSimulationJobs</code> returns up to 100 results and a <code>nextToken</code> value if applicable. </p>"
+          "documentation":"<p>When this parameter is used, <code>ListSimulationJobs</code> only returns <code>maxResults</code> results in a single page along with a <code>nextToken</code> response element. The remaining results of the initial request can be seen by sending another <code>ListSimulationJobs</code> request with the returned <code>nextToken</code> value. This value can be between 1 and 1000. If this parameter is not used, then <code>ListSimulationJobs</code> returns up to 1000 results and a <code>nextToken</code> value if applicable. </p>"
         },
         "filters":{
           "shape":"Filters",
@@ -2299,6 +2533,7 @@
       },
       "documentation":"<p>The logging configuration.</p>"
     },
+    "MaxConcurrency":{"type":"integer"},
     "MaxResults":{"type":"integer"},
     "Name":{
       "type":"string",
@@ -2326,7 +2561,9 @@
     },
     "NonEmptyString":{
       "type":"string",
-      "min":1
+      "max":255,
+      "min":1,
+      "pattern":".+"
     },
     "NonSystemPort":{
       "type":"integer",
@@ -2484,6 +2721,8 @@
     },
     "RenderingEngineVersionType":{
       "type":"string",
+      "max":4,
+      "min":1,
       "pattern":"1.x"
     },
     "ResourceAlreadyExistsException":{
@@ -2626,7 +2865,7 @@
         },
         "robotSoftwareSuite":{
           "shape":"RobotSoftwareSuite",
-          "documentation":"<p>Information about a robot software suite.</p>"
+          "documentation":"<p>Information about a robot software suite (ROS distribution).</p>"
         }
       },
       "documentation":"<p>Summary information for a robot application.</p>"
@@ -2670,6 +2909,7 @@
       "enum":[
         "Validating",
         "DownloadingExtracting",
+        "ExecutingDownloadCondition",
         "ExecutingPreLaunch",
         "Launching",
         "ExecutingPostLaunch",
@@ -2685,14 +2925,14 @@
       "members":{
         "name":{
           "shape":"RobotSoftwareSuiteType",
-          "documentation":"<p>The name of the robot software suite.</p>"
+          "documentation":"<p>The name of the robot software suite (ROS distribution).</p>"
         },
         "version":{
           "shape":"RobotSoftwareSuiteVersionType",
-          "documentation":"<p>The version of the robot software suite.</p>"
+          "documentation":"<p>The version of the robot software suite (ROS distribution).</p>"
         }
       },
-      "documentation":"<p>Information about a robot software suite.</p>"
+      "documentation":"<p>Information about a robot software suite (ROS distribution).</p>"
     },
     "RobotSoftwareSuiteType":{
       "type":"string",
@@ -2764,6 +3004,28 @@
       "max":100,
       "min":1
     },
+    "S3Object":{
+      "type":"structure",
+      "required":[
+        "bucket",
+        "key"
+      ],
+      "members":{
+        "bucket":{
+          "shape":"S3Bucket",
+          "documentation":"<p>The bucket containing the object.</p>"
+        },
+        "key":{
+          "shape":"S3Key",
+          "documentation":"<p>The key of the object.</p>"
+        },
+        "etag":{
+          "shape":"S3Etag",
+          "documentation":"<p>The etag of the object.</p>"
+        }
+      },
+      "documentation":"<p>Information about an S3 object.</p>"
+    },
     "SecurityGroups":{
       "type":"list",
       "member":{"shape":"NonEmptyString"},
@@ -2838,7 +3100,7 @@
         },
         "robotSoftwareSuite":{
           "shape":"RobotSoftwareSuite",
-          "documentation":"<p>Information about a robot software suite.</p>"
+          "documentation":"<p>Information about a robot software suite (ROS distribution).</p>"
         },
         "simulationSoftwareSuite":{
           "shape":"SimulationSoftwareSuite",
@@ -2928,11 +3190,67 @@
         },
         "networkInterface":{
           "shape":"NetworkInterface",
-          "documentation":"<p/>"
+          "documentation":"<p>Information about a network interface.</p>"
         }
       },
       "documentation":"<p>Information about a simulation job.</p>"
     },
+    "SimulationJobBatchErrorCode":{
+      "type":"string",
+      "enum":["InternalServiceError"]
+    },
+    "SimulationJobBatchStatus":{
+      "type":"string",
+      "enum":[
+        "Pending",
+        "InProgress",
+        "Failed",
+        "Completed",
+        "Canceled",
+        "Canceling",
+        "Completing",
+        "TimingOut",
+        "TimedOut"
+      ]
+    },
+    "SimulationJobBatchSummaries":{
+      "type":"list",
+      "member":{"shape":"SimulationJobBatchSummary"}
+    },
+    "SimulationJobBatchSummary":{
+      "type":"structure",
+      "members":{
+        "arn":{
+          "shape":"Arn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the batch.</p>"
+        },
+        "lastUpdatedAt":{
+          "shape":"LastUpdatedAt",
+          "documentation":"<p>The time, in milliseconds since the epoch, when the simulation job batch was last updated.</p>"
+        },
+        "createdAt":{
+          "shape":"CreatedAt",
+          "documentation":"<p>The time, in milliseconds since the epoch, when the simulation job batch was created.</p>"
+        },
+        "status":{
+          "shape":"SimulationJobBatchStatus",
+          "documentation":"<p>The status of the simulation job batch.</p> <dl> <dt>Pending</dt> <dd> <p>The simulation job batch request is pending.</p> </dd> <dt>InProgress</dt> <dd> <p>The simulation job batch is in progress. </p> </dd> <dt>Failed</dt> <dd> <p>The simulation job batch failed. One or more simulation job requests could not be completed due to an internal failure (like <code>InternalServiceError</code>). See <code>failureCode</code> and <code>failureReason</code> for more information.</p> </dd> <dt>Completed</dt> <dd> <p>The simulation batch job completed. A batch is complete when (1) there are no pending simulation job requests in the batch and none of the failed simulation job requests are due to <code>InternalServiceError</code> and (2) when all created simulation jobs have reached a terminal state (for example, <code>Completed</code> or <code>Failed</code>). </p> </dd> <dt>Canceled</dt> <dd> <p>The simulation batch job was cancelled.</p> </dd> <dt>Canceling</dt> <dd> <p>The simulation batch job is being cancelled.</p> </dd> <dt>Completing</dt> <dd> <p>The simulation batch job is completing.</p> </dd> <dt>TimingOut</dt> <dd> <p>The simulation job batch is timing out.</p> <p>If a batch timing out, and there are pending requests that were failing due to an internal failure (like <code>InternalServiceError</code>), the batch status will be <code>Failed</code>. If there are no such failing request, the batch status will be <code>TimedOut</code>. </p> </dd> <dt>TimedOut</dt> <dd> <p>The simulation batch job timed out.</p> </dd> </dl>"
+        },
+        "failedRequestCount":{
+          "shape":"Integer",
+          "documentation":"<p>The number of failed simulation job requests.</p>"
+        },
+        "pendingRequestCount":{
+          "shape":"Integer",
+          "documentation":"<p>The number of pending simulation job requests.</p>"
+        },
+        "createdRequestCount":{
+          "shape":"Integer",
+          "documentation":"<p>The number of created simulation job requests.</p>"
+        }
+      },
+      "documentation":"<p>Information about a simulation job batch.</p>"
+    },
     "SimulationJobErrorCode":{
       "type":"string",
       "enum":[
@@ -2950,10 +3268,14 @@
         "InvalidBundleRobotApplication",
         "InvalidBundleSimulationApplication",
         "InvalidS3Resource",
+        "LimitExceeded",
         "MismatchedEtag",
         "RobotApplicationVersionMismatchedEtag",
         "SimulationApplicationVersionMismatchedEtag",
         "ResourceNotFound",
+        "RequestThrottled",
+        "BatchTimedOut",
+        "BatchCanceled",
         "InvalidInput",
         "WrongRegionS3Bucket",
         "WrongRegionS3Output",
@@ -2961,6 +3283,48 @@
         "WrongRegionSimulationApplication"
       ]
     },
+    "SimulationJobRequest":{
+      "type":"structure",
+      "required":["maxJobDurationInSeconds"],
+      "members":{
+        "outputLocation":{"shape":"OutputLocation"},
+        "loggingConfig":{"shape":"LoggingConfig"},
+        "maxJobDurationInSeconds":{
+          "shape":"JobDuration",
+          "documentation":"<p>The maximum simulation job duration in seconds. The value must be 8 days (691,200 seconds) or less.</p>"
+        },
+        "iamRole":{
+          "shape":"IamRole",
+          "documentation":"<p>The IAM role name that allows the simulation instance to call the AWS APIs that are specified in its associated policies on your behalf. This is how credentials are passed in to your simulation job. </p>"
+        },
+        "failureBehavior":{
+          "shape":"FailureBehavior",
+          "documentation":"<p>The failure behavior the simulation job.</p> <dl> <dt>Continue</dt> <dd> <p>Restart the simulation job in the same host instance.</p> </dd> <dt>Fail</dt> <dd> <p>Stop the simulation job and terminate the instance.</p> </dd> </dl>"
+        },
+        "useDefaultApplications":{
+          "shape":"BoxedBoolean",
+          "documentation":"<p>Boolean indicating whether to use default simulation tool applications.</p>"
+        },
+        "robotApplications":{
+          "shape":"RobotApplicationConfigs",
+          "documentation":"<p>The robot applications to use in the simulation job.</p>"
+        },
+        "simulationApplications":{
+          "shape":"SimulationApplicationConfigs",
+          "documentation":"<p>The simulation applications to use in the simulation job.</p>"
+        },
+        "dataSources":{
+          "shape":"DataSourceConfigs",
+          "documentation":"<p>Specify data sources to mount read-only files from S3 into your simulation. These files are available under <code>/opt/robomaker/datasources/data_source_name</code>. </p> <note> <p>There is a limit of 100 files and a combined size of 25GB for all <code>DataSourceConfig</code> objects. </p> </note>"
+        },
+        "vpcConfig":{"shape":"VPCConfig"},
+        "tags":{
+          "shape":"TagMap",
+          "documentation":"<p>A map that contains tag keys and tag values that are attached to the simulation job request.</p>"
+        }
+      },
+      "documentation":"<p>Information about a simulation job request.</p>"
+    },
     "SimulationJobStatus":{
       "type":"string",
       "enum":[
@@ -3043,6 +3407,8 @@
     },
     "SimulationSoftwareSuiteVersionType":{
       "type":"string",
+      "max":1024,
+      "min":0,
       "pattern":"7|9|Kinetic|Melodic|Dashing"
     },
     "SimulationTimeMillis":{"type":"long"},
@@ -3094,6 +3460,78 @@
       "type":"list",
       "member":{"shape":"Source"}
     },
+    "StartSimulationJobBatchRequest":{
+      "type":"structure",
+      "required":["createSimulationJobRequests"],
+      "members":{
+        "clientRequestToken":{
+          "shape":"ClientRequestToken",
+          "documentation":"<p>Unique, case-sensitive identifier that you provide to ensure the idempotency of the request.</p>",
+          "idempotencyToken":true
+        },
+        "batchPolicy":{
+          "shape":"BatchPolicy",
+          "documentation":"<p>The batch policy.</p>"
+        },
+        "createSimulationJobRequests":{
+          "shape":"CreateSimulationJobRequests",
+          "documentation":"<p>A list of simulation job requests to create in the batch.</p>"
+        },
+        "tags":{
+          "shape":"TagMap",
+          "documentation":"<p>A map that contains tag keys and tag values that are attached to the deployment job batch.</p>"
+        }
+      }
+    },
+    "StartSimulationJobBatchResponse":{
+      "type":"structure",
+      "members":{
+        "arn":{
+          "shape":"Arn",
+          "documentation":"<p>The Amazon Resource Name (arn) of the batch.</p>"
+        },
+        "status":{
+          "shape":"SimulationJobBatchStatus",
+          "documentation":"<p>The status of the simulation job batch.</p> <dl> <dt>Pending</dt> <dd> <p>The simulation job batch request is pending.</p> </dd> <dt>InProgress</dt> <dd> <p>The simulation job batch is in progress. </p> </dd> <dt>Failed</dt> <dd> <p>The simulation job batch failed. One or more simulation job requests could not be completed due to an internal failure (like <code>InternalServiceError</code>). See <code>failureCode</code> and <code>failureReason</code> for more information.</p> </dd> <dt>Completed</dt> <dd> <p>The simulation batch job completed. A batch is complete when (1) there are no pending simulation job requests in the batch and none of the failed simulation job requests are due to <code>InternalServiceError</code> and (2) when all created simulation jobs have reached a terminal state (for example, <code>Completed</code> or <code>Failed</code>). </p> </dd> <dt>Canceled</dt> <dd> <p>The simulation batch job was cancelled.</p> </dd> <dt>Canceling</dt> <dd> <p>The simulation batch job is being cancelled.</p> </dd> <dt>Completing</dt> <dd> <p>The simulation batch job is completing.</p> </dd> <dt>TimingOut</dt> <dd> <p>The simulation job batch is timing out.</p> <p>If a batch timing out, and there are pending requests that were failing due to an internal failure (like <code>InternalServiceError</code>), the batch status will be <code>Failed</code>. If there are no such failing request, the batch status will be <code>TimedOut</code>. </p> </dd> <dt>TimedOut</dt> <dd> <p>The simulation batch job timed out.</p> </dd> </dl>"
+        },
+        "createdAt":{
+          "shape":"CreatedAt",
+          "documentation":"<p>The time, in milliseconds since the epoch, when the simulation job batch was created.</p>"
+        },
+        "clientRequestToken":{
+          "shape":"ClientRequestToken",
+          "documentation":"<p>Unique, case-sensitive identifier that you provide to ensure the idempotency of the request.</p>"
+        },
+        "batchPolicy":{
+          "shape":"BatchPolicy",
+          "documentation":"<p>The batch policy.</p>"
+        },
+        "failureCode":{
+          "shape":"SimulationJobBatchErrorCode",
+          "documentation":"<p>The failure code if the simulation job batch failed.</p>"
+        },
+        "failureReason":{
+          "shape":"GenericString",
+          "documentation":"<p>The reason the simulation job batch failed.</p>"
+        },
+        "failedRequests":{
+          "shape":"FailedCreateSimulationJobRequests",
+          "documentation":"<p>A list of failed simulation job requests. The request failed to be created into a simulation job. Failed requests do not have a simulation job ID. </p>"
+        },
+        "pendingRequests":{
+          "shape":"CreateSimulationJobRequests",
+          "documentation":"<p>A list of pending simulation job requests. These requests have not yet been created into simulation jobs.</p>"
+        },
+        "createdRequests":{
+          "shape":"SimulationJobSummaries",
+          "documentation":"<p>A list of created simulation job request summaries.</p>"
+        },
+        "tags":{
+          "shape":"TagMap",
+          "documentation":"<p>A map that contains tag keys and tag values that are attached to the deployment job batch.</p>"
+        }
+      }
+    },
     "Subnets":{
       "type":"list",
       "member":{"shape":"NonEmptyString"},
@@ -3255,7 +3693,7 @@
         },
         "robotSoftwareSuite":{
           "shape":"RobotSoftwareSuite",
-          "documentation":"<p>The robot software suite used by the robot application.</p>"
+          "documentation":"<p>The robot software suite (ROS distribution) used by the robot application.</p>"
         },
         "currentRevisionId":{
           "shape":"RevisionId",
@@ -3284,7 +3722,7 @@
         },
         "robotSoftwareSuite":{
           "shape":"RobotSoftwareSuite",
-          "documentation":"<p>The robot software suite used by the robot application.</p>"
+          "documentation":"<p>The robot software suite (ROS distribution) used by the robot application.</p>"
         },
         "lastUpdatedAt":{
           "shape":"LastUpdatedAt",
@@ -3319,7 +3757,7 @@
         },
         "robotSoftwareSuite":{
           "shape":"RobotSoftwareSuite",
-          "documentation":"<p>Information about the robot software suite.</p>"
+          "documentation":"<p>Information about the robot software suite (ROS distribution).</p>"
         },
         "renderingEngine":{
           "shape":"RenderingEngine",
@@ -3356,7 +3794,7 @@
         },
         "robotSoftwareSuite":{
           "shape":"RobotSoftwareSuite",
-          "documentation":"<p>Information about the robot software suite.</p>"
+          "documentation":"<p>Information about the robot software suite (ROS distribution).</p>"
         },
         "renderingEngine":{
           "shape":"RenderingEngine",
@@ -3421,6 +3859,8 @@
     },
     "VersionQualifier":{
       "type":"string",
+      "max":255,
+      "min":1,
       "pattern":"ALL"
     },
     "errorMessage":{"type":"string"}
diff --git a/services/route53/build.properties b/services/route53/build.properties
index ecf2dae6fcb1..15ec2da1fc71 100644
--- a/services/route53/build.properties
+++ b/services/route53/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/route53/pom.xml b/services/route53/pom.xml
index 13a8c80568a6..449862aec5e3 100644
--- a/services/route53/pom.xml
+++ b/services/route53/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>route53</artifactId>
     <name>AWS Java SDK :: Services :: Amazon Route53</name>
diff --git a/services/route53/src/it/java/software/amazon/awssdk/services/route53/IntegrationTestBase.java b/services/route53/src/it/java/software/amazon/awssdk/services/route53/IntegrationTestBase.java
index d7db1befd1d1..8d9f106179c5 100644
--- a/services/route53/src/it/java/software/amazon/awssdk/services/route53/IntegrationTestBase.java
+++ b/services/route53/src/it/java/software/amazon/awssdk/services/route53/IntegrationTestBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/route53/src/it/java/software/amazon/awssdk/services/route53/Route53IntegrationTest.java b/services/route53/src/it/java/software/amazon/awssdk/services/route53/Route53IntegrationTest.java
index aac4c288a3f6..8ebc4c5fec2a 100644
--- a/services/route53/src/it/java/software/amazon/awssdk/services/route53/Route53IntegrationTest.java
+++ b/services/route53/src/it/java/software/amazon/awssdk/services/route53/Route53IntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/route53/src/main/java/software/amazon/awssdk/services/route53/internal/Route53IdInterceptor.java b/services/route53/src/main/java/software/amazon/awssdk/services/route53/internal/Route53IdInterceptor.java
index 8902ad5e09a7..7cc3492fd7af 100644
--- a/services/route53/src/main/java/software/amazon/awssdk/services/route53/internal/Route53IdInterceptor.java
+++ b/services/route53/src/main/java/software/amazon/awssdk/services/route53/internal/Route53IdInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/route53/src/main/resources/codegen-resources/service-2.json b/services/route53/src/main/resources/codegen-resources/service-2.json
index 5feb69ec7144..f39907861384 100644
--- a/services/route53/src/main/resources/codegen-resources/service-2.json
+++ b/services/route53/src/main/resources/codegen-resources/service-2.json
@@ -33,7 +33,7 @@
         {"shape":"ConflictingDomainExists"},
         {"shape":"LimitsExceeded"}
       ],
-      "documentation":"<p>Associates an Amazon VPC with a private hosted zone. </p> <important> <p>To perform the association, the VPC and the private hosted zone must already exist. You can't convert a public hosted zone into a private hosted zone.</p> </important> <note> <p>If you want to associate a VPC that was created by using one AWS account with a private hosted zone that was created by using a different account, the AWS account that created the private hosted zone must first submit a <code>CreateVPCAssociationAuthorization</code> request. Then the account that created the VPC must submit an <code>AssociateVPCWithHostedZone</code> request.</p> </note>"
+      "documentation":"<p>Associates an Amazon VPC with a private hosted zone. </p> <note> <p>To perform the association, the VPC and the private hosted zone must already exist. Also, you can't convert a public hosted zone into a private hosted zone.</p> </note> <p>If you want to associate a VPC that was created by one AWS account with a private hosted zone that was created by a different account, do one of the following:</p> <ul> <li> <p>Use the AWS account that created the private hosted zone to submit a <a href=\"https://docs.aws.amazon.com/Route53/latest/APIReference/API_CreateVPCAssociationAuthorization.html\">CreateVPCAssociationAuthorization</a> request. Then use the account that created the VPC to submit an <code>AssociateVPCWithHostedZone</code> request.</p> </li> <li> <p>If a subnet in the VPC was shared with another account, you can use the account that the subnet was shared with to submit an <code>AssociateVPCWithHostedZone</code> request. For more information about sharing subnets, see <a href=\"https://docs.aws.amazon.com/vpc/latest/userguide/vpc-sharing.html\">Working with Shared VPCs</a>.</p> </li> </ul>"
     },
     "ChangeResourceRecordSets":{
       "name":"ChangeResourceRecordSets",
@@ -54,7 +54,7 @@
         {"shape":"InvalidInput"},
         {"shape":"PriorRequestNotComplete"}
       ],
-      "documentation":"<p>Creates, changes, or deletes a resource record set, which contains authoritative DNS information for a specified domain name or subdomain name. For example, you can use <code>ChangeResourceRecordSets</code> to create a resource record set that routes traffic for test.example.com to a web server that has an IP address of 192.0.2.44.</p> <p> <b>Change Batches and Transactional Changes</b> </p> <p>The request body must include a document with a <code>ChangeResourceRecordSetsRequest</code> element. The request body contains a list of change items, known as a change batch. Change batches are considered transactional changes. When using the Amazon Route 53 API to change resource record sets, Route 53 either makes all or none of the changes in a change batch request. This ensures that Route 53 never partially implements the intended changes to the resource record sets in a hosted zone. </p> <p>For example, a change batch request that deletes the <code>CNAME</code> record for www.example.com and creates an alias resource record set for www.example.com. Route 53 deletes the first resource record set and creates the second resource record set in a single operation. If either the <code>DELETE</code> or the <code>CREATE</code> action fails, then both changes (plus any other changes in the batch) fail, and the original <code>CNAME</code> record continues to exist.</p> <important> <p>Due to the nature of transactional changes, you can't delete the same resource record set more than once in a single change batch. If you attempt to delete the same change batch more than once, Route 53 returns an <code>InvalidChangeBatch</code> error.</p> </important> <p> <b>Traffic Flow</b> </p> <p>To create resource record sets for complex routing configurations, use either the traffic flow visual editor in the Route 53 console or the API actions for traffic policies and traffic policy instances. Save the configuration as a traffic policy, then associate the traffic policy with one or more domain names (such as example.com) or subdomain names (such as www.example.com), in the same hosted zone or in multiple hosted zones. You can roll back the updates if the new configuration isn't performing as expected. For more information, see <a href=\"http://docs.aws.amazon.com/Route53/latest/DeveloperGuide/traffic-flow.html\">Using Traffic Flow to Route DNS Traffic</a> in the <i>Amazon Route 53 Developer Guide</i>.</p> <p> <b>Create, Delete, and Upsert</b> </p> <p>Use <code>ChangeResourceRecordsSetsRequest</code> to perform the following actions:</p> <ul> <li> <p> <code>CREATE</code>: Creates a resource record set that has the specified values.</p> </li> <li> <p> <code>DELETE</code>: Deletes an existing resource record set that has the specified values.</p> </li> <li> <p> <code>UPSERT</code>: If a resource record set does not already exist, AWS creates it. If a resource set does exist, Route 53 updates it with the values in the request. </p> </li> </ul> <p> <b>Syntaxes for Creating, Updating, and Deleting Resource Record Sets</b> </p> <p>The syntax for a request depends on the type of resource record set that you want to create, delete, or update, such as weighted, alias, or failover. The XML elements in your request must appear in the order listed in the syntax. </p> <p>For an example for each type of resource record set, see \"Examples.\"</p> <p>Don't refer to the syntax in the \"Parameter Syntax\" section, which includes all of the elements for every kind of resource record set that you can create, delete, or update by using <code>ChangeResourceRecordSets</code>. </p> <p> <b>Change Propagation to Route 53 DNS Servers</b> </p> <p>When you submit a <code>ChangeResourceRecordSets</code> request, Route 53 propagates your changes to all of the Route 53 authoritative DNS servers. While your changes are propagating, <code>GetChange</code> returns a status of <code>PENDING</code>. When propagation is complete, <code>GetChange</code> returns a status of <code>INSYNC</code>. Changes generally propagate to all Route 53 name servers within 60 seconds. For more information, see <a href=\"https://docs.aws.amazon.com/Route53/latest/APIReference/API_GetChange.html\">GetChange</a>.</p> <p> <b>Limits on ChangeResourceRecordSets Requests</b> </p> <p>For information about the limits on a <code>ChangeResourceRecordSets</code> request, see <a href=\"https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/DNSLimitations.html\">Limits</a> in the <i>Amazon Route 53 Developer Guide</i>.</p>"
+      "documentation":"<p>Creates, changes, or deletes a resource record set, which contains authoritative DNS information for a specified domain name or subdomain name. For example, you can use <code>ChangeResourceRecordSets</code> to create a resource record set that routes traffic for test.example.com to a web server that has an IP address of 192.0.2.44.</p> <p> <b>Change Batches and Transactional Changes</b> </p> <p>The request body must include a document with a <code>ChangeResourceRecordSetsRequest</code> element. The request body contains a list of change items, known as a change batch. Change batches are considered transactional changes. When using the Amazon Route 53 API to change resource record sets, Route 53 either makes all or none of the changes in a change batch request. This ensures that Route 53 never partially implements the intended changes to the resource record sets in a hosted zone. </p> <p>For example, a change batch request that deletes the <code>CNAME</code> record for www.example.com and creates an alias resource record set for www.example.com. Route 53 deletes the first resource record set and creates the second resource record set in a single operation. If either the <code>DELETE</code> or the <code>CREATE</code> action fails, then both changes (plus any other changes in the batch) fail, and the original <code>CNAME</code> record continues to exist.</p> <important> <p>Due to the nature of transactional changes, you can't delete the same resource record set more than once in a single change batch. If you attempt to delete the same change batch more than once, Route 53 returns an <code>InvalidChangeBatch</code> error.</p> </important> <p> <b>Traffic Flow</b> </p> <p>To create resource record sets for complex routing configurations, use either the traffic flow visual editor in the Route 53 console or the API actions for traffic policies and traffic policy instances. Save the configuration as a traffic policy, then associate the traffic policy with one or more domain names (such as example.com) or subdomain names (such as www.example.com), in the same hosted zone or in multiple hosted zones. You can roll back the updates if the new configuration isn't performing as expected. For more information, see <a href=\"https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/traffic-flow.html\">Using Traffic Flow to Route DNS Traffic</a> in the <i>Amazon Route 53 Developer Guide</i>.</p> <p> <b>Create, Delete, and Upsert</b> </p> <p>Use <code>ChangeResourceRecordsSetsRequest</code> to perform the following actions:</p> <ul> <li> <p> <code>CREATE</code>: Creates a resource record set that has the specified values.</p> </li> <li> <p> <code>DELETE</code>: Deletes an existing resource record set that has the specified values.</p> </li> <li> <p> <code>UPSERT</code>: If a resource record set does not already exist, AWS creates it. If a resource set does exist, Route 53 updates it with the values in the request. </p> </li> </ul> <p> <b>Syntaxes for Creating, Updating, and Deleting Resource Record Sets</b> </p> <p>The syntax for a request depends on the type of resource record set that you want to create, delete, or update, such as weighted, alias, or failover. The XML elements in your request must appear in the order listed in the syntax. </p> <p>For an example for each type of resource record set, see \"Examples.\"</p> <p>Don't refer to the syntax in the \"Parameter Syntax\" section, which includes all of the elements for every kind of resource record set that you can create, delete, or update by using <code>ChangeResourceRecordSets</code>. </p> <p> <b>Change Propagation to Route 53 DNS Servers</b> </p> <p>When you submit a <code>ChangeResourceRecordSets</code> request, Route 53 propagates your changes to all of the Route 53 authoritative DNS servers. While your changes are propagating, <code>GetChange</code> returns a status of <code>PENDING</code>. When propagation is complete, <code>GetChange</code> returns a status of <code>INSYNC</code>. Changes generally propagate to all Route 53 name servers within 60 seconds. For more information, see <a href=\"https://docs.aws.amazon.com/Route53/latest/APIReference/API_GetChange.html\">GetChange</a>.</p> <p> <b>Limits on ChangeResourceRecordSets Requests</b> </p> <p>For information about the limits on a <code>ChangeResourceRecordSets</code> request, see <a href=\"https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/DNSLimitations.html\">Limits</a> in the <i>Amazon Route 53 Developer Guide</i>.</p>"
     },
     "ChangeTagsForResource":{
       "name":"ChangeTagsForResource",
@@ -95,7 +95,7 @@
         {"shape":"HealthCheckAlreadyExists"},
         {"shape":"InvalidInput"}
       ],
-      "documentation":"<p>Creates a new health check.</p> <p>For information about adding health checks to resource record sets, see <a href=\"https://docs.aws.amazon.com/Route53/latest/APIReference/API_ResourceRecordSet.html#Route53-Type-ResourceRecordSet-HealthCheckId\">HealthCheckId</a> in <a href=\"https://docs.aws.amazon.com/Route53/latest/APIReference/API_ChangeResourceRecordSets.html\">ChangeResourceRecordSets</a>. </p> <p> <b>ELB Load Balancers</b> </p> <p>If you're registering EC2 instances with an Elastic Load Balancing (ELB) load balancer, do not create Amazon Route 53 health checks for the EC2 instances. When you register an EC2 instance with a load balancer, you configure settings for an ELB health check, which performs a similar function to a Route 53 health check.</p> <p> <b>Private Hosted Zones</b> </p> <p>You can associate health checks with failover resource record sets in a private hosted zone. Note the following:</p> <ul> <li> <p>Route 53 health checkers are outside the VPC. To check the health of an endpoint within a VPC by IP address, you must assign a public IP address to the instance in the VPC.</p> </li> <li> <p>You can configure a health checker to check the health of an external resource that the instance relies on, such as a database server.</p> </li> <li> <p>You can create a CloudWatch metric, associate an alarm with the metric, and then create a health check that is based on the state of the alarm. For example, you might create a CloudWatch metric that checks the status of the Amazon EC2 <code>StatusCheckFailed</code> metric, add an alarm to the metric, and then create a health check that is based on the state of the alarm. For information about creating CloudWatch metrics and alarms by using the CloudWatch console, see the <a href=\"http://docs.aws.amazon.com/AmazonCloudWatch/latest/DeveloperGuide/WhatIsCloudWatch.html\">Amazon CloudWatch User Guide</a>.</p> </li> </ul>"
+      "documentation":"<p>Creates a new health check.</p> <p>For information about adding health checks to resource record sets, see <a href=\"https://docs.aws.amazon.com/Route53/latest/APIReference/API_ResourceRecordSet.html#Route53-Type-ResourceRecordSet-HealthCheckId\">HealthCheckId</a> in <a href=\"https://docs.aws.amazon.com/Route53/latest/APIReference/API_ChangeResourceRecordSets.html\">ChangeResourceRecordSets</a>. </p> <p> <b>ELB Load Balancers</b> </p> <p>If you're registering EC2 instances with an Elastic Load Balancing (ELB) load balancer, do not create Amazon Route 53 health checks for the EC2 instances. When you register an EC2 instance with a load balancer, you configure settings for an ELB health check, which performs a similar function to a Route 53 health check.</p> <p> <b>Private Hosted Zones</b> </p> <p>You can associate health checks with failover resource record sets in a private hosted zone. Note the following:</p> <ul> <li> <p>Route 53 health checkers are outside the VPC. To check the health of an endpoint within a VPC by IP address, you must assign a public IP address to the instance in the VPC.</p> </li> <li> <p>You can configure a health checker to check the health of an external resource that the instance relies on, such as a database server.</p> </li> <li> <p>You can create a CloudWatch metric, associate an alarm with the metric, and then create a health check that is based on the state of the alarm. For example, you might create a CloudWatch metric that checks the status of the Amazon EC2 <code>StatusCheckFailed</code> metric, add an alarm to the metric, and then create a health check that is based on the state of the alarm. For information about creating CloudWatch metrics and alarms by using the CloudWatch console, see the <a href=\"https://docs.aws.amazon.com/AmazonCloudWatch/latest/DeveloperGuide/WhatIsCloudWatch.html\">Amazon CloudWatch User Guide</a>.</p> </li> </ul>"
     },
     "CreateHostedZone":{
       "name":"CreateHostedZone",
@@ -121,7 +121,7 @@
         {"shape":"NoSuchDelegationSet"},
         {"shape":"DelegationSetNotReusable"}
       ],
-      "documentation":"<p>Creates a new public or private hosted zone. You create records in a public hosted zone to define how you want to route traffic on the internet for a domain, such as example.com, and its subdomains (apex.example.com, acme.example.com). You create records in a private hosted zone to define how you want to route traffic for a domain and its subdomains within one or more Amazon Virtual Private Clouds (Amazon VPCs). </p> <important> <p>You can't convert a public hosted zone to a private hosted zone or vice versa. Instead, you must create a new hosted zone with the same name and create new resource record sets.</p> </important> <p>For more information about charges for hosted zones, see <a href=\"http://aws.amazon.com/route53/pricing/\">Amazon Route 53 Pricing</a>.</p> <p>Note the following:</p> <ul> <li> <p>You can't create a hosted zone for a top-level domain (TLD) such as .com.</p> </li> <li> <p>For public hosted zones, Amazon Route 53 automatically creates a default SOA record and four NS records for the zone. For more information about SOA and NS records, see <a href=\"http://docs.aws.amazon.com/Route53/latest/DeveloperGuide/SOA-NSrecords.html\">NS and SOA Records that Route 53 Creates for a Hosted Zone</a> in the <i>Amazon Route 53 Developer Guide</i>.</p> <p>If you want to use the same name servers for multiple public hosted zones, you can optionally associate a reusable delegation set with the hosted zone. See the <code>DelegationSetId</code> element.</p> </li> <li> <p>If your domain is registered with a registrar other than Route 53, you must update the name servers with your registrar to make Route 53 the DNS service for the domain. For more information, see <a href=\"http://docs.aws.amazon.com/Route53/latest/DeveloperGuide/MigratingDNS.html\">Migrating DNS Service for an Existing Domain to Amazon Route 53</a> in the <i>Amazon Route 53 Developer Guide</i>. </p> </li> </ul> <p>When you submit a <code>CreateHostedZone</code> request, the initial status of the hosted zone is <code>PENDING</code>. For public hosted zones, this means that the NS and SOA records are not yet available on all Route 53 DNS servers. When the NS and SOA records are available, the status of the zone changes to <code>INSYNC</code>.</p>"
+      "documentation":"<p>Creates a new public or private hosted zone. You create records in a public hosted zone to define how you want to route traffic on the internet for a domain, such as example.com, and its subdomains (apex.example.com, acme.example.com). You create records in a private hosted zone to define how you want to route traffic for a domain and its subdomains within one or more Amazon Virtual Private Clouds (Amazon VPCs). </p> <important> <p>You can't convert a public hosted zone to a private hosted zone or vice versa. Instead, you must create a new hosted zone with the same name and create new resource record sets.</p> </important> <p>For more information about charges for hosted zones, see <a href=\"http://aws.amazon.com/route53/pricing/\">Amazon Route 53 Pricing</a>.</p> <p>Note the following:</p> <ul> <li> <p>You can't create a hosted zone for a top-level domain (TLD) such as .com.</p> </li> <li> <p>For public hosted zones, Route 53 automatically creates a default SOA record and four NS records for the zone. For more information about SOA and NS records, see <a href=\"https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/SOA-NSrecords.html\">NS and SOA Records that Route 53 Creates for a Hosted Zone</a> in the <i>Amazon Route 53 Developer Guide</i>.</p> <p>If you want to use the same name servers for multiple public hosted zones, you can optionally associate a reusable delegation set with the hosted zone. See the <code>DelegationSetId</code> element.</p> </li> <li> <p>If your domain is registered with a registrar other than Route 53, you must update the name servers with your registrar to make Route 53 the DNS service for the domain. For more information, see <a href=\"https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/MigratingDNS.html\">Migrating DNS Service for an Existing Domain to Amazon Route 53</a> in the <i>Amazon Route 53 Developer Guide</i>. </p> </li> </ul> <p>When you submit a <code>CreateHostedZone</code> request, the initial status of the hosted zone is <code>PENDING</code>. For public hosted zones, this means that the NS and SOA records are not yet available on all Route 53 DNS servers. When the NS and SOA records are available, the status of the zone changes to <code>INSYNC</code>.</p>"
     },
     "CreateQueryLoggingConfig":{
       "name":"CreateQueryLoggingConfig",
@@ -168,7 +168,7 @@
         {"shape":"DelegationSetNotAvailable"},
         {"shape":"DelegationSetAlreadyReusable"}
       ],
-      "documentation":"<p>Creates a delegation set (a group of four name servers) that can be reused by multiple hosted zones. If a hosted zoned ID is specified, <code>CreateReusableDelegationSet</code> marks the delegation set associated with that zone as reusable.</p> <note> <p>You can't associate a reusable delegation set with a private hosted zone.</p> </note> <p>For information about using a reusable delegation set to configure white label name servers, see <a href=\"http://docs.aws.amazon.com/Route53/latest/DeveloperGuide/white-label-name-servers.html\">Configuring White Label Name Servers</a>.</p> <p>The process for migrating existing hosted zones to use a reusable delegation set is comparable to the process for configuring white label name servers. You need to perform the following steps:</p> <ol> <li> <p>Create a reusable delegation set.</p> </li> <li> <p>Recreate hosted zones, and reduce the TTL to 60 seconds or less.</p> </li> <li> <p>Recreate resource record sets in the new hosted zones.</p> </li> <li> <p>Change the registrar's name servers to use the name servers for the new hosted zones.</p> </li> <li> <p>Monitor traffic for the website or application.</p> </li> <li> <p>Change TTLs back to their original values.</p> </li> </ol> <p>If you want to migrate existing hosted zones to use a reusable delegation set, the existing hosted zones can't use any of the name servers that are assigned to the reusable delegation set. If one or more hosted zones do use one or more name servers that are assigned to the reusable delegation set, you can do one of the following:</p> <ul> <li> <p>For small numbers of hosted zones—up to a few hundred—it's relatively easy to create reusable delegation sets until you get one that has four name servers that don't overlap with any of the name servers in your hosted zones.</p> </li> <li> <p>For larger numbers of hosted zones, the easiest solution is to use more than one reusable delegation set.</p> </li> <li> <p>For larger numbers of hosted zones, you can also migrate hosted zones that have overlapping name servers to hosted zones that don't have overlapping name servers, then migrate the hosted zones again to use the reusable delegation set.</p> </li> </ul>"
+      "documentation":"<p>Creates a delegation set (a group of four name servers) that can be reused by multiple hosted zones that were created by the same AWS account. </p> <p>You can also create a reusable delegation set that uses the four name servers that are associated with an existing hosted zone. Specify the hosted zone ID in the <code>CreateReusableDelegationSet</code> request.</p> <note> <p>You can't associate a reusable delegation set with a private hosted zone.</p> </note> <p>For information about using a reusable delegation set to configure white label name servers, see <a href=\"https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/white-label-name-servers.html\">Configuring White Label Name Servers</a>.</p> <p>The process for migrating existing hosted zones to use a reusable delegation set is comparable to the process for configuring white label name servers. You need to perform the following steps:</p> <ol> <li> <p>Create a reusable delegation set.</p> </li> <li> <p>Recreate hosted zones, and reduce the TTL to 60 seconds or less.</p> </li> <li> <p>Recreate resource record sets in the new hosted zones.</p> </li> <li> <p>Change the registrar's name servers to use the name servers for the new hosted zones.</p> </li> <li> <p>Monitor traffic for the website or application.</p> </li> <li> <p>Change TTLs back to their original values.</p> </li> </ol> <p>If you want to migrate existing hosted zones to use a reusable delegation set, the existing hosted zones can't use any of the name servers that are assigned to the reusable delegation set. If one or more hosted zones do use one or more name servers that are assigned to the reusable delegation set, you can do one of the following:</p> <ul> <li> <p>For small numbers of hosted zones—up to a few hundred—it's relatively easy to create reusable delegation sets until you get one that has four name servers that don't overlap with any of the name servers in your hosted zones.</p> </li> <li> <p>For larger numbers of hosted zones, the easiest solution is to use more than one reusable delegation set.</p> </li> <li> <p>For larger numbers of hosted zones, you can also migrate hosted zones that have overlapping name servers to hosted zones that don't have overlapping name servers, then migrate the hosted zones again to use the reusable delegation set.</p> </li> </ul>"
     },
     "CreateTrafficPolicy":{
       "name":"CreateTrafficPolicy",
@@ -269,7 +269,7 @@
         {"shape":"HealthCheckInUse"},
         {"shape":"InvalidInput"}
       ],
-      "documentation":"<p>Deletes a health check.</p> <important> <p>Amazon Route 53 does not prevent you from deleting a health check even if the health check is associated with one or more resource record sets. If you delete a health check and you don't update the associated resource record sets, the future status of the health check can't be predicted and may change. This will affect the routing of DNS queries for your DNS failover configuration. For more information, see <a href=\"http://docs.aws.amazon.com/Route53/latest/DeveloperGuide/health-checks-creating-deleting.html#health-checks-deleting.html\">Replacing and Deleting Health Checks</a> in the <i>Amazon Route 53 Developer Guide</i>.</p> </important>"
+      "documentation":"<p>Deletes a health check.</p> <important> <p>Amazon Route 53 does not prevent you from deleting a health check even if the health check is associated with one or more resource record sets. If you delete a health check and you don't update the associated resource record sets, the future status of the health check can't be predicted and may change. This will affect the routing of DNS queries for your DNS failover configuration. For more information, see <a href=\"https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/health-checks-creating-deleting.html#health-checks-deleting.html\">Replacing and Deleting Health Checks</a> in the <i>Amazon Route 53 Developer Guide</i>.</p> </important> <p>If you're using AWS Cloud Map and you configured Cloud Map to create a Route 53 health check when you register an instance, you can't use the Route 53 <code>DeleteHealthCheck</code> command to delete the health check. The health check is deleted automatically when you deregister the instance; there can be a delay of several hours before the health check is deleted from Route 53. </p>"
     },
     "DeleteHostedZone":{
       "name":"DeleteHostedZone",
@@ -427,7 +427,7 @@
       },
       "input":{"shape":"GetCheckerIpRangesRequest"},
       "output":{"shape":"GetCheckerIpRangesResponse"},
-      "documentation":"<important> <p> <code>GetCheckerIpRanges</code> still works, but we recommend that you download ip-ranges.json, which includes IP address ranges for all AWS services. For more information, see <a href=\"http://docs.aws.amazon.com/Route53/latest/DeveloperGuide/route-53-ip-addresses.html\">IP Address Ranges of Amazon Route 53 Servers</a> in the <i>Amazon Route 53 Developer Guide</i>.</p> </important>"
+      "documentation":"<important> <p> <code>GetCheckerIpRanges</code> still works, but we recommend that you download ip-ranges.json, which includes IP address ranges for all AWS services. For more information, see <a href=\"https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/route-53-ip-addresses.html\">IP Address Ranges of Amazon Route 53 Servers</a> in the <i>Amazon Route 53 Developer Guide</i>.</p> </important>"
     },
     "GetGeoLocation":{
       "name":"GetGeoLocation",
@@ -630,7 +630,7 @@
       "errors":[
         {"shape":"InvalidInput"}
       ],
-      "documentation":"<p>Retrieves a list of supported geographic locations.</p> <p>Countries are listed first, and continents are listed last. If Amazon Route 53 supports subdivisions for a country (for example, states or provinces), the subdivisions for that country are listed in alphabetical order immediately after the corresponding country.</p>"
+      "documentation":"<p>Retrieves a list of supported geographic locations.</p> <p>Countries are listed first, and continents are listed last. If Amazon Route 53 supports subdivisions for a country (for example, states or provinces), the subdivisions for that country are listed in alphabetical order immediately after the corresponding country.</p> <p>For a list of supported geolocation codes, see the <a href=\"https://docs.aws.amazon.com/Route53/latest/APIReference/API_GeoLocation.html\">GeoLocation</a> data type.</p>"
     },
     "ListHealthChecks":{
       "name":"ListHealthChecks",
@@ -673,7 +673,7 @@
         {"shape":"InvalidInput"},
         {"shape":"InvalidDomainName"}
       ],
-      "documentation":"<p>Retrieves a list of your hosted zones in lexicographic order. The response includes a <code>HostedZones</code> child element for each hosted zone created by the current AWS account. </p> <p> <code>ListHostedZonesByName</code> sorts hosted zones by name with the labels reversed. For example:</p> <p> <code>com.example.www.</code> </p> <p>Note the trailing dot, which can change the sort order in some circumstances.</p> <p>If the domain name includes escape characters or Punycode, <code>ListHostedZonesByName</code> alphabetizes the domain name using the escaped or Punycoded value, which is the format that Amazon Route 53 saves in its database. For example, to create a hosted zone for exämple.com, you specify ex\\344mple.com for the domain name. <code>ListHostedZonesByName</code> alphabetizes it as:</p> <p> <code>com.ex\\344mple.</code> </p> <p>The labels are reversed and alphabetized using the escaped value. For more information about valid domain name formats, including internationalized domain names, see <a href=\"http://docs.aws.amazon.com/Route53/latest/DeveloperGuide/DomainNameFormat.html\">DNS Domain Name Format</a> in the <i>Amazon Route 53 Developer Guide</i>.</p> <p>Route 53 returns up to 100 items in each response. If you have a lot of hosted zones, use the <code>MaxItems</code> parameter to list them in groups of up to 100. The response includes values that help navigate from one group of <code>MaxItems</code> hosted zones to the next:</p> <ul> <li> <p>The <code>DNSName</code> and <code>HostedZoneId</code> elements in the response contain the values, if any, specified for the <code>dnsname</code> and <code>hostedzoneid</code> parameters in the request that produced the current response.</p> </li> <li> <p>The <code>MaxItems</code> element in the response contains the value, if any, that you specified for the <code>maxitems</code> parameter in the request that produced the current response.</p> </li> <li> <p>If the value of <code>IsTruncated</code> in the response is true, there are more hosted zones associated with the current AWS account. </p> <p>If <code>IsTruncated</code> is false, this response includes the last hosted zone that is associated with the current account. The <code>NextDNSName</code> element and <code>NextHostedZoneId</code> elements are omitted from the response.</p> </li> <li> <p>The <code>NextDNSName</code> and <code>NextHostedZoneId</code> elements in the response contain the domain name and the hosted zone ID of the next hosted zone that is associated with the current AWS account. If you want to list more hosted zones, make another call to <code>ListHostedZonesByName</code>, and specify the value of <code>NextDNSName</code> and <code>NextHostedZoneId</code> in the <code>dnsname</code> and <code>hostedzoneid</code> parameters, respectively.</p> </li> </ul>"
+      "documentation":"<p>Retrieves a list of your hosted zones in lexicographic order. The response includes a <code>HostedZones</code> child element for each hosted zone created by the current AWS account. </p> <p> <code>ListHostedZonesByName</code> sorts hosted zones by name with the labels reversed. For example:</p> <p> <code>com.example.www.</code> </p> <p>Note the trailing dot, which can change the sort order in some circumstances.</p> <p>If the domain name includes escape characters or Punycode, <code>ListHostedZonesByName</code> alphabetizes the domain name using the escaped or Punycoded value, which is the format that Amazon Route 53 saves in its database. For example, to create a hosted zone for exämple.com, you specify ex\\344mple.com for the domain name. <code>ListHostedZonesByName</code> alphabetizes it as:</p> <p> <code>com.ex\\344mple.</code> </p> <p>The labels are reversed and alphabetized using the escaped value. For more information about valid domain name formats, including internationalized domain names, see <a href=\"https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/DomainNameFormat.html\">DNS Domain Name Format</a> in the <i>Amazon Route 53 Developer Guide</i>.</p> <p>Route 53 returns up to 100 items in each response. If you have a lot of hosted zones, use the <code>MaxItems</code> parameter to list them in groups of up to 100. The response includes values that help navigate from one group of <code>MaxItems</code> hosted zones to the next:</p> <ul> <li> <p>The <code>DNSName</code> and <code>HostedZoneId</code> elements in the response contain the values, if any, specified for the <code>dnsname</code> and <code>hostedzoneid</code> parameters in the request that produced the current response.</p> </li> <li> <p>The <code>MaxItems</code> element in the response contains the value, if any, that you specified for the <code>maxitems</code> parameter in the request that produced the current response.</p> </li> <li> <p>If the value of <code>IsTruncated</code> in the response is true, there are more hosted zones associated with the current AWS account. </p> <p>If <code>IsTruncated</code> is false, this response includes the last hosted zone that is associated with the current account. The <code>NextDNSName</code> element and <code>NextHostedZoneId</code> elements are omitted from the response.</p> </li> <li> <p>The <code>NextDNSName</code> and <code>NextHostedZoneId</code> elements in the response contain the domain name and the hosted zone ID of the next hosted zone that is associated with the current AWS account. If you want to list more hosted zones, make another call to <code>ListHostedZonesByName</code>, and specify the value of <code>NextDNSName</code> and <code>NextHostedZoneId</code> in the <code>dnsname</code> and <code>hostedzoneid</code> parameters, respectively.</p> </li> </ul>"
     },
     "ListQueryLoggingConfigs":{
       "name":"ListQueryLoggingConfigs",
@@ -872,7 +872,7 @@
         {"shape":"InvalidInput"},
         {"shape":"HealthCheckVersionMismatch"}
       ],
-      "documentation":"<p>Updates an existing health check. Note that some values can't be updated. </p> <p>For more information about updating health checks, see <a href=\"http://docs.aws.amazon.com/Route53/latest/DeveloperGuide/health-checks-creating-deleting.html\">Creating, Updating, and Deleting Health Checks</a> in the <i>Amazon Route 53 Developer Guide</i>.</p>"
+      "documentation":"<p>Updates an existing health check. Note that some values can't be updated. </p> <p>For more information about updating health checks, see <a href=\"https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/health-checks-creating-deleting.html\">Creating, Updating, and Deleting Health Checks</a> in the <i>Amazon Route 53 Developer Guide</i>.</p>"
     },
     "UpdateHostedZoneComment":{
       "name":"UpdateHostedZoneComment",
@@ -971,11 +971,11 @@
       "members":{
         "Region":{
           "shape":"CloudWatchRegion",
-          "documentation":"<p>For the CloudWatch alarm that you want Route 53 health checkers to use to determine whether this health check is healthy, the region that the alarm was created in.</p> <p>For the current list of CloudWatch regions, see <a href=\"http://docs.aws.amazon.com/general/latest/gr/rande.html#cw_region\">Amazon CloudWatch</a> in the <i>AWS Regions and Endpoints</i> chapter of the <i>Amazon Web Services General Reference</i>.</p>"
+          "documentation":"<p>For the CloudWatch alarm that you want Route 53 health checkers to use to determine whether this health check is healthy, the region that the alarm was created in.</p> <p>For the current list of CloudWatch regions, see <a href=\"https://docs.aws.amazon.com/general/latest/gr/rande.html#cw_region\">Amazon CloudWatch</a> in the <i>AWS Service Endpoints</i> chapter of the <i>Amazon Web Services General Reference</i>.</p>"
         },
         "Name":{
           "shape":"AlarmName",
-          "documentation":"<p>The name of the CloudWatch alarm that you want Amazon Route 53 health checkers to use to determine whether this health check is healthy.</p> <note> <p>Route 53 supports CloudWatch alarms with the following features:</p> <ul> <li> <p>Standard-resolution metrics. High-resolution metrics aren't supported. For more information, see <a href=\"http://docs.aws.amazon.com/AmazonCloudWatch/latest/DeveloperGuide/publishingMetrics.html#high-resolution-metrics\">High-Resolution Metrics</a> in the <i>Amazon CloudWatch User Guide</i>.</p> </li> <li> <p>Statistics: Average, Minimum, Maximum, Sum, and SampleCount. Extended statistics aren't supported.</p> </li> </ul> </note>"
+          "documentation":"<p>The name of the CloudWatch alarm that you want Amazon Route 53 health checkers to use to determine whether this health check is healthy.</p> <note> <p>Route 53 supports CloudWatch alarms with the following features:</p> <ul> <li> <p>Standard-resolution metrics. High-resolution metrics aren't supported. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonCloudWatch/latest/DeveloperGuide/publishingMetrics.html#high-resolution-metrics\">High-Resolution Metrics</a> in the <i>Amazon CloudWatch User Guide</i>.</p> </li> <li> <p>Statistics: Average, Minimum, Maximum, Sum, and SampleCount. Extended statistics aren't supported.</p> </li> </ul> </note>"
         }
       },
       "documentation":"<p>A complex type that identifies the CloudWatch alarm that you want Amazon Route 53 health checkers to use to determine whether the specified health check is healthy.</p>"
@@ -996,18 +996,18 @@
       "members":{
         "HostedZoneId":{
           "shape":"ResourceId",
-          "documentation":"<p> <i>Alias resource records sets only</i>: The value used depends on where you want to route traffic:</p> <dl> <dt>Amazon API Gateway custom regional APIs and edge-optimized APIs</dt> <dd> <p>Specify the hosted zone ID for your API. You can get the applicable value using the AWS CLI command <a href=\"https://docs.aws.amazon.com/cli/latest/reference/apigateway/get-domain-names.html\">get-domain-names</a>:</p> <ul> <li> <p>For regional APIs, specify the value of <code>regionalHostedZoneId</code>.</p> </li> <li> <p>For edge-optimized APIs, specify the value of <code>distributionHostedZoneId</code>.</p> </li> </ul> </dd> <dt>Amazon Virtual Private Cloud interface VPC endpoint</dt> <dd> <p>Specify the hosted zone ID for your interface endpoint. You can get the value of <code>HostedZoneId</code> using the AWS CLI command <a href=\"https://docs.aws.amazon.com/cli/latest/reference/ec2/describe-vpc-endpoints.html\">describe-vpc-endpoints</a>.</p> </dd> <dt>CloudFront distribution</dt> <dd> <p>Specify <code>Z2FDTNDATAQYW2</code>.</p> <note> <p>Alias resource record sets for CloudFront can't be created in a private zone.</p> </note> </dd> <dt>Elastic Beanstalk environment</dt> <dd> <p>Specify the hosted zone ID for the region that you created the environment in. The environment must have a regionalized subdomain. For a list of regions and the corresponding hosted zone IDs, see <a href=\"http://docs.aws.amazon.com/general/latest/gr/rande.html#elasticbeanstalk_region\">AWS Elastic Beanstalk</a> in the \"AWS Regions and Endpoints\" chapter of the <i>Amazon Web Services General Reference</i>.</p> </dd> <dt>ELB load balancer</dt> <dd> <p>Specify the value of the hosted zone ID for the load balancer. Use the following methods to get the hosted zone ID:</p> <ul> <li> <p> <a href=\"https://docs.aws.amazon.com/general/latest/gr/rande.html#elb_region\">Elastic Load Balancing</a> table in the \"AWS Regions and Endpoints\" chapter of the <i>Amazon Web Services General Reference</i>: Use the value that corresponds with the region that you created your load balancer in. Note that there are separate columns for Application and Classic Load Balancers and for Network Load Balancers.</p> </li> <li> <p> <b>AWS Management Console</b>: Go to the Amazon EC2 page, choose <b>Load Balancers</b> in the navigation pane, select the load balancer, and get the value of the <b>Hosted zone</b> field on the <b>Description</b> tab.</p> </li> <li> <p> <b>Elastic Load Balancing API</b>: Use <code>DescribeLoadBalancers</code> to get the applicable value. For more information, see the applicable guide:</p> <ul> <li> <p>Classic Load Balancers: Use <a href=\"http://docs.aws.amazon.com/elasticloadbalancing/2012-06-01/APIReference/API_DescribeLoadBalancers.html\">DescribeLoadBalancers</a> to get the value of <code>CanonicalHostedZoneNameId</code>.</p> </li> <li> <p>Application and Network Load Balancers: Use <a href=\"http://docs.aws.amazon.com/elasticloadbalancing/latest/APIReference/API_DescribeLoadBalancers.html\">DescribeLoadBalancers</a> to get the value of <code>CanonicalHostedZoneId</code>.</p> </li> </ul> </li> <li> <p> <b>AWS CLI</b>: Use <code>describe-load-balancers</code> to get the applicable value. For more information, see the applicable guide:</p> <ul> <li> <p>Classic Load Balancers: Use <a href=\"http://docs.aws.amazon.com/cli/latest/reference/elb/describe-load-balancers.html\">describe-load-balancers</a> to get the value of <code>CanonicalHostedZoneNameId</code>.</p> </li> <li> <p>Application and Network Load Balancers: Use <a href=\"http://docs.aws.amazon.com/cli/latest/reference/elbv2/describe-load-balancers.html\">describe-load-balancers</a> to get the value of <code>CanonicalHostedZoneId</code>.</p> </li> </ul> </li> </ul> </dd> <dt>An Amazon S3 bucket configured as a static website</dt> <dd> <p>Specify the hosted zone ID for the region that you created the bucket in. For more information about valid values, see the <a href=\"http://docs.aws.amazon.com/general/latest/gr/rande.html#s3_region\">Amazon Simple Storage Service Website Endpoints</a> table in the \"AWS Regions and Endpoints\" chapter of the <i>Amazon Web Services General Reference</i>.</p> </dd> <dt>Another Route 53 resource record set in your hosted zone</dt> <dd> <p>Specify the hosted zone ID of your hosted zone. (An alias resource record set can't reference a resource record set in a different hosted zone.)</p> </dd> </dl>"
+          "documentation":"<p> <i>Alias resource records sets only</i>: The value used depends on where you want to route traffic:</p> <dl> <dt>Amazon API Gateway custom regional APIs and edge-optimized APIs</dt> <dd> <p>Specify the hosted zone ID for your API. You can get the applicable value using the AWS CLI command <a href=\"https://docs.aws.amazon.com/cli/latest/reference/apigateway/get-domain-names.html\">get-domain-names</a>:</p> <ul> <li> <p>For regional APIs, specify the value of <code>regionalHostedZoneId</code>.</p> </li> <li> <p>For edge-optimized APIs, specify the value of <code>distributionHostedZoneId</code>.</p> </li> </ul> </dd> <dt>Amazon Virtual Private Cloud interface VPC endpoint</dt> <dd> <p>Specify the hosted zone ID for your interface endpoint. You can get the value of <code>HostedZoneId</code> using the AWS CLI command <a href=\"https://docs.aws.amazon.com/cli/latest/reference/ec2/describe-vpc-endpoints.html\">describe-vpc-endpoints</a>.</p> </dd> <dt>CloudFront distribution</dt> <dd> <p>Specify <code>Z2FDTNDATAQYW2</code>.</p> <note> <p>Alias resource record sets for CloudFront can't be created in a private zone.</p> </note> </dd> <dt>Elastic Beanstalk environment</dt> <dd> <p>Specify the hosted zone ID for the region that you created the environment in. The environment must have a regionalized subdomain. For a list of regions and the corresponding hosted zone IDs, see <a href=\"https://docs.aws.amazon.com/general/latest/gr/rande.html#elasticbeanstalk_region\">AWS Elastic Beanstalk</a> in the \"AWS Service Endpoints\" chapter of the <i>Amazon Web Services General Reference</i>.</p> </dd> <dt>ELB load balancer</dt> <dd> <p>Specify the value of the hosted zone ID for the load balancer. Use the following methods to get the hosted zone ID:</p> <ul> <li> <p> <a href=\"https://docs.aws.amazon.com/general/latest/gr/elb.html\">Service Endpoints</a> table in the \"Elastic Load Balancing Endpoints and Quotas\" topic in the <i>Amazon Web Services General Reference</i>: Use the value that corresponds with the region that you created your load balancer in. Note that there are separate columns for Application and Classic Load Balancers and for Network Load Balancers.</p> </li> <li> <p> <b>AWS Management Console</b>: Go to the Amazon EC2 page, choose <b>Load Balancers</b> in the navigation pane, select the load balancer, and get the value of the <b>Hosted zone</b> field on the <b>Description</b> tab.</p> </li> <li> <p> <b>Elastic Load Balancing API</b>: Use <code>DescribeLoadBalancers</code> to get the applicable value. For more information, see the applicable guide:</p> <ul> <li> <p>Classic Load Balancers: Use <a href=\"https://docs.aws.amazon.com/elasticloadbalancing/2012-06-01/APIReference/API_DescribeLoadBalancers.html\">DescribeLoadBalancers</a> to get the value of <code>CanonicalHostedZoneNameId</code>.</p> </li> <li> <p>Application and Network Load Balancers: Use <a href=\"https://docs.aws.amazon.com/elasticloadbalancing/latest/APIReference/API_DescribeLoadBalancers.html\">DescribeLoadBalancers</a> to get the value of <code>CanonicalHostedZoneId</code>.</p> </li> </ul> </li> <li> <p> <b>AWS CLI</b>: Use <code>describe-load-balancers</code> to get the applicable value. For more information, see the applicable guide:</p> <ul> <li> <p>Classic Load Balancers: Use <a href=\"http://docs.aws.amazon.com/cli/latest/reference/elb/describe-load-balancers.html\">describe-load-balancers</a> to get the value of <code>CanonicalHostedZoneNameId</code>.</p> </li> <li> <p>Application and Network Load Balancers: Use <a href=\"http://docs.aws.amazon.com/cli/latest/reference/elbv2/describe-load-balancers.html\">describe-load-balancers</a> to get the value of <code>CanonicalHostedZoneId</code>.</p> </li> </ul> </li> </ul> </dd> <dt>AWS Global Accelerator accelerator</dt> <dd> <p>Specify <code>Z2BJ6XQ5FK7U4H</code>.</p> </dd> <dt>An Amazon S3 bucket configured as a static website</dt> <dd> <p>Specify the hosted zone ID for the region that you created the bucket in. For more information about valid values, see the table <a href=\"https://docs.aws.amazon.com/general/latest/gr/s3.html#s3_website_region_endpoints\">Amazon S3 Website Endpoints</a> in the <i>Amazon Web Services General Reference</i>.</p> </dd> <dt>Another Route 53 resource record set in your hosted zone</dt> <dd> <p>Specify the hosted zone ID of your hosted zone. (An alias resource record set can't reference a resource record set in a different hosted zone.)</p> </dd> </dl>"
         },
         "DNSName":{
           "shape":"DNSName",
-          "documentation":"<p> <i>Alias resource record sets only:</i> The value that you specify depends on where you want to route queries:</p> <dl> <dt>Amazon API Gateway custom regional APIs and edge-optimized APIs</dt> <dd> <p>Specify the applicable domain name for your API. You can get the applicable value using the AWS CLI command <a href=\"https://docs.aws.amazon.com/cli/latest/reference/apigateway/get-domain-names.html\">get-domain-names</a>:</p> <ul> <li> <p>For regional APIs, specify the value of <code>regionalDomainName</code>.</p> </li> <li> <p>For edge-optimized APIs, specify the value of <code>distributionDomainName</code>. This is the name of the associated CloudFront distribution, such as <code>da1b2c3d4e5.cloudfront.net</code>.</p> </li> </ul> <note> <p>The name of the record that you're creating must match a custom domain name for your API, such as <code>api.example.com</code>.</p> </note> </dd> <dt>Amazon Virtual Private Cloud interface VPC endpoint</dt> <dd> <p>Enter the API endpoint for the interface endpoint, such as <code>vpce-123456789abcdef01-example-us-east-1a.elasticloadbalancing.us-east-1.vpce.amazonaws.com</code>. For edge-optimized APIs, this is the domain name for the corresponding CloudFront distribution. You can get the value of <code>DnsName</code> using the AWS CLI command <a href=\"https://docs.aws.amazon.com/cli/latest/reference/ec2/describe-vpc-endpoints.html\">describe-vpc-endpoints</a>.</p> </dd> <dt>CloudFront distribution</dt> <dd> <p>Specify the domain name that CloudFront assigned when you created your distribution.</p> <p>Your CloudFront distribution must include an alternate domain name that matches the name of the resource record set. For example, if the name of the resource record set is <i>acme.example.com</i>, your CloudFront distribution must include <i>acme.example.com</i> as one of the alternate domain names. For more information, see <a href=\"http://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/CNAMEs.html\">Using Alternate Domain Names (CNAMEs)</a> in the <i>Amazon CloudFront Developer Guide</i>.</p> <p>You can't create a resource record set in a private hosted zone to route traffic to a CloudFront distribution.</p> <note> <p>For failover alias records, you can't specify a CloudFront distribution for both the primary and secondary records. A distribution must include an alternate domain name that matches the name of the record. However, the primary and secondary records have the same name, and you can't include the same alternate domain name in more than one distribution. </p> </note> </dd> <dt>Elastic Beanstalk environment</dt> <dd> <p>If the domain name for your Elastic Beanstalk environment includes the region that you deployed the environment in, you can create an alias record that routes traffic to the environment. For example, the domain name <code>my-environment.<i>us-west-2</i>.elasticbeanstalk.com</code> is a regionalized domain name. </p> <important> <p>For environments that were created before early 2016, the domain name doesn't include the region. To route traffic to these environments, you must create a CNAME record instead of an alias record. Note that you can't create a CNAME record for the root domain name. For example, if your domain name is example.com, you can create a record that routes traffic for acme.example.com to your Elastic Beanstalk environment, but you can't create a record that routes traffic for example.com to your Elastic Beanstalk environment.</p> </important> <p>For Elastic Beanstalk environments that have regionalized subdomains, specify the <code>CNAME</code> attribute for the environment. You can use the following methods to get the value of the CNAME attribute:</p> <ul> <li> <p> <i>AWS Management Console</i>: For information about how to get the value by using the console, see <a href=\"http://docs.aws.amazon.com/elasticbeanstalk/latest/dg/customdomains.html\">Using Custom Domains with AWS Elastic Beanstalk</a> in the <i>AWS Elastic Beanstalk Developer Guide</i>.</p> </li> <li> <p> <i>Elastic Beanstalk API</i>: Use the <code>DescribeEnvironments</code> action to get the value of the <code>CNAME</code> attribute. For more information, see <a href=\"http://docs.aws.amazon.com/elasticbeanstalk/latest/api/API_DescribeEnvironments.html\">DescribeEnvironments</a> in the <i>AWS Elastic Beanstalk API Reference</i>.</p> </li> <li> <p> <i>AWS CLI</i>: Use the <code>describe-environments</code> command to get the value of the <code>CNAME</code> attribute. For more information, see <a href=\"http://docs.aws.amazon.com/cli/latest/reference/elasticbeanstalk/describe-environments.html\">describe-environments</a> in the <i>AWS Command Line Interface Reference</i>.</p> </li> </ul> </dd> <dt>ELB load balancer</dt> <dd> <p>Specify the DNS name that is associated with the load balancer. Get the DNS name by using the AWS Management Console, the ELB API, or the AWS CLI. </p> <ul> <li> <p> <b>AWS Management Console</b>: Go to the EC2 page, choose <b>Load Balancers</b> in the navigation pane, choose the load balancer, choose the <b>Description</b> tab, and get the value of the <b>DNS name</b> field. </p> <p>If you're routing traffic to a Classic Load Balancer, get the value that begins with <b>dualstack</b>. If you're routing traffic to another type of load balancer, get the value that applies to the record type, A or AAAA.</p> </li> <li> <p> <b>Elastic Load Balancing API</b>: Use <code>DescribeLoadBalancers</code> to get the value of <code>DNSName</code>. For more information, see the applicable guide:</p> <ul> <li> <p>Classic Load Balancers: <a href=\"http://docs.aws.amazon.com/elasticloadbalancing/2012-06-01/APIReference/API_DescribeLoadBalancers.html\">DescribeLoadBalancers</a> </p> </li> <li> <p>Application and Network Load Balancers: <a href=\"http://docs.aws.amazon.com/elasticloadbalancing/latest/APIReference/API_DescribeLoadBalancers.html\">DescribeLoadBalancers</a> </p> </li> </ul> </li> <li> <p> <b>AWS CLI</b>: Use <code>describe-load-balancers</code> to get the value of <code>DNSName</code>. For more information, see the applicable guide:</p> <ul> <li> <p>Classic Load Balancers: <a href=\"http://docs.aws.amazon.com/cli/latest/reference/elb/describe-load-balancers.html\">describe-load-balancers</a> </p> </li> <li> <p>Application and Network Load Balancers: <a href=\"http://docs.aws.amazon.com/cli/latest/reference/elbv2/describe-load-balancers.html\">describe-load-balancers</a> </p> </li> </ul> </li> </ul> </dd> <dt>Amazon S3 bucket that is configured as a static website</dt> <dd> <p>Specify the domain name of the Amazon S3 website endpoint that you created the bucket in, for example, <code>s3-website.us-east-2.amazonaws.com</code>. For more information about valid values, see the table <a href=\"http://docs.aws.amazon.com/general/latest/gr/rande.html#s3_region\">Amazon Simple Storage Service (S3) Website Endpoints</a> in the <i>Amazon Web Services General Reference</i>. For more information about using S3 buckets for websites, see <a href=\"http://docs.aws.amazon.com/Route53/latest/DeveloperGuide/getting-started.html\">Getting Started with Amazon Route 53</a> in the <i>Amazon Route 53 Developer Guide.</i> </p> </dd> <dt>Another Route 53 resource record set</dt> <dd> <p>Specify the value of the <code>Name</code> element for a resource record set in the current hosted zone.</p> <note> <p>If you're creating an alias record that has the same name as the hosted zone (known as the zone apex), you can't specify the domain name for a record for which the value of <code>Type</code> is <code>CNAME</code>. This is because the alias record must have the same type as the record that you're routing traffic to, and creating a CNAME record for the zone apex isn't supported even for an alias record.</p> </note> </dd> </dl>"
+          "documentation":"<p> <i>Alias resource record sets only:</i> The value that you specify depends on where you want to route queries:</p> <dl> <dt>Amazon API Gateway custom regional APIs and edge-optimized APIs</dt> <dd> <p>Specify the applicable domain name for your API. You can get the applicable value using the AWS CLI command <a href=\"https://docs.aws.amazon.com/cli/latest/reference/apigateway/get-domain-names.html\">get-domain-names</a>:</p> <ul> <li> <p>For regional APIs, specify the value of <code>regionalDomainName</code>.</p> </li> <li> <p>For edge-optimized APIs, specify the value of <code>distributionDomainName</code>. This is the name of the associated CloudFront distribution, such as <code>da1b2c3d4e5.cloudfront.net</code>.</p> </li> </ul> <note> <p>The name of the record that you're creating must match a custom domain name for your API, such as <code>api.example.com</code>.</p> </note> </dd> <dt>Amazon Virtual Private Cloud interface VPC endpoint</dt> <dd> <p>Enter the API endpoint for the interface endpoint, such as <code>vpce-123456789abcdef01-example-us-east-1a.elasticloadbalancing.us-east-1.vpce.amazonaws.com</code>. For edge-optimized APIs, this is the domain name for the corresponding CloudFront distribution. You can get the value of <code>DnsName</code> using the AWS CLI command <a href=\"https://docs.aws.amazon.com/cli/latest/reference/ec2/describe-vpc-endpoints.html\">describe-vpc-endpoints</a>.</p> </dd> <dt>CloudFront distribution</dt> <dd> <p>Specify the domain name that CloudFront assigned when you created your distribution.</p> <p>Your CloudFront distribution must include an alternate domain name that matches the name of the resource record set. For example, if the name of the resource record set is <i>acme.example.com</i>, your CloudFront distribution must include <i>acme.example.com</i> as one of the alternate domain names. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/CNAMEs.html\">Using Alternate Domain Names (CNAMEs)</a> in the <i>Amazon CloudFront Developer Guide</i>.</p> <p>You can't create a resource record set in a private hosted zone to route traffic to a CloudFront distribution.</p> <note> <p>For failover alias records, you can't specify a CloudFront distribution for both the primary and secondary records. A distribution must include an alternate domain name that matches the name of the record. However, the primary and secondary records have the same name, and you can't include the same alternate domain name in more than one distribution. </p> </note> </dd> <dt>Elastic Beanstalk environment</dt> <dd> <p>If the domain name for your Elastic Beanstalk environment includes the region that you deployed the environment in, you can create an alias record that routes traffic to the environment. For example, the domain name <code>my-environment.<i>us-west-2</i>.elasticbeanstalk.com</code> is a regionalized domain name. </p> <important> <p>For environments that were created before early 2016, the domain name doesn't include the region. To route traffic to these environments, you must create a CNAME record instead of an alias record. Note that you can't create a CNAME record for the root domain name. For example, if your domain name is example.com, you can create a record that routes traffic for acme.example.com to your Elastic Beanstalk environment, but you can't create a record that routes traffic for example.com to your Elastic Beanstalk environment.</p> </important> <p>For Elastic Beanstalk environments that have regionalized subdomains, specify the <code>CNAME</code> attribute for the environment. You can use the following methods to get the value of the CNAME attribute:</p> <ul> <li> <p> <i>AWS Management Console</i>: For information about how to get the value by using the console, see <a href=\"https://docs.aws.amazon.com/elasticbeanstalk/latest/dg/customdomains.html\">Using Custom Domains with AWS Elastic Beanstalk</a> in the <i>AWS Elastic Beanstalk Developer Guide</i>.</p> </li> <li> <p> <i>Elastic Beanstalk API</i>: Use the <code>DescribeEnvironments</code> action to get the value of the <code>CNAME</code> attribute. For more information, see <a href=\"https://docs.aws.amazon.com/elasticbeanstalk/latest/api/API_DescribeEnvironments.html\">DescribeEnvironments</a> in the <i>AWS Elastic Beanstalk API Reference</i>.</p> </li> <li> <p> <i>AWS CLI</i>: Use the <code>describe-environments</code> command to get the value of the <code>CNAME</code> attribute. For more information, see <a href=\"https://docs.aws.amazon.com/cli/latest/reference/elasticbeanstalk/describe-environments.html\">describe-environments</a> in the <i>AWS CLI Command Reference</i>.</p> </li> </ul> </dd> <dt>ELB load balancer</dt> <dd> <p>Specify the DNS name that is associated with the load balancer. Get the DNS name by using the AWS Management Console, the ELB API, or the AWS CLI. </p> <ul> <li> <p> <b>AWS Management Console</b>: Go to the EC2 page, choose <b>Load Balancers</b> in the navigation pane, choose the load balancer, choose the <b>Description</b> tab, and get the value of the <b>DNS name</b> field. </p> <p>If you're routing traffic to a Classic Load Balancer, get the value that begins with <b>dualstack</b>. If you're routing traffic to another type of load balancer, get the value that applies to the record type, A or AAAA.</p> </li> <li> <p> <b>Elastic Load Balancing API</b>: Use <code>DescribeLoadBalancers</code> to get the value of <code>DNSName</code>. For more information, see the applicable guide:</p> <ul> <li> <p>Classic Load Balancers: <a href=\"https://docs.aws.amazon.com/elasticloadbalancing/2012-06-01/APIReference/API_DescribeLoadBalancers.html\">DescribeLoadBalancers</a> </p> </li> <li> <p>Application and Network Load Balancers: <a href=\"https://docs.aws.amazon.com/elasticloadbalancing/latest/APIReference/API_DescribeLoadBalancers.html\">DescribeLoadBalancers</a> </p> </li> </ul> </li> <li> <p> <b>AWS CLI</b>: Use <code>describe-load-balancers</code> to get the value of <code>DNSName</code>. For more information, see the applicable guide:</p> <ul> <li> <p>Classic Load Balancers: <a href=\"http://docs.aws.amazon.com/cli/latest/reference/elb/describe-load-balancers.html\">describe-load-balancers</a> </p> </li> <li> <p>Application and Network Load Balancers: <a href=\"http://docs.aws.amazon.com/cli/latest/reference/elbv2/describe-load-balancers.html\">describe-load-balancers</a> </p> </li> </ul> </li> </ul> </dd> <dt>AWS Global Accelerator accelerator</dt> <dd> <p>Specify the DNS name for your accelerator:</p> <ul> <li> <p> <b>Global Accelerator API:</b> To get the DNS name, use <a href=\"https://docs.aws.amazon.com/global-accelerator/latest/api/API_DescribeAccelerator.html\">DescribeAccelerator</a>.</p> </li> <li> <p> <b>AWS CLI:</b> To get the DNS name, use <a href=\"https://docs.aws.amazon.com/cli/latest/reference/globalaccelerator/describe-accelerator.html\">describe-accelerator</a>.</p> </li> </ul> </dd> <dt>Amazon S3 bucket that is configured as a static website</dt> <dd> <p>Specify the domain name of the Amazon S3 website endpoint that you created the bucket in, for example, <code>s3-website.us-east-2.amazonaws.com</code>. For more information about valid values, see the table <a href=\"https://docs.aws.amazon.com/general/latest/gr/s3.html#s3_website_region_endpoints\">Amazon S3 Website Endpoints</a> in the <i>Amazon Web Services General Reference</i>. For more information about using S3 buckets for websites, see <a href=\"https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/getting-started.html\">Getting Started with Amazon Route 53</a> in the <i>Amazon Route 53 Developer Guide.</i> </p> </dd> <dt>Another Route 53 resource record set</dt> <dd> <p>Specify the value of the <code>Name</code> element for a resource record set in the current hosted zone.</p> <note> <p>If you're creating an alias record that has the same name as the hosted zone (known as the zone apex), you can't specify the domain name for a record for which the value of <code>Type</code> is <code>CNAME</code>. This is because the alias record must have the same type as the record that you're routing traffic to, and creating a CNAME record for the zone apex isn't supported even for an alias record.</p> </note> </dd> </dl>"
         },
         "EvaluateTargetHealth":{
           "shape":"AliasHealthEnabled",
-          "documentation":"<p> <i>Applies only to alias, failover alias, geolocation alias, latency alias, and weighted alias resource record sets:</i> When <code>EvaluateTargetHealth</code> is <code>true</code>, an alias resource record set inherits the health of the referenced AWS resource, such as an ELB load balancer or another resource record set in the hosted zone.</p> <p>Note the following:</p> <dl> <dt>CloudFront distributions</dt> <dd> <p>You can't set <code>EvaluateTargetHealth</code> to <code>true</code> when the alias target is a CloudFront distribution.</p> </dd> <dt>Elastic Beanstalk environments that have regionalized subdomains</dt> <dd> <p>If you specify an Elastic Beanstalk environment in <code>DNSName</code> and the environment contains an ELB load balancer, Elastic Load Balancing routes queries only to the healthy Amazon EC2 instances that are registered with the load balancer. (An environment automatically contains an ELB load balancer if it includes more than one Amazon EC2 instance.) If you set <code>EvaluateTargetHealth</code> to <code>true</code> and either no Amazon EC2 instances are healthy or the load balancer itself is unhealthy, Route 53 routes queries to other available resources that are healthy, if any. </p> <p>If the environment contains a single Amazon EC2 instance, there are no special requirements.</p> </dd> <dt>ELB load balancers</dt> <dd> <p>Health checking behavior depends on the type of load balancer:</p> <ul> <li> <p> <b>Classic Load Balancers</b>: If you specify an ELB Classic Load Balancer in <code>DNSName</code>, Elastic Load Balancing routes queries only to the healthy Amazon EC2 instances that are registered with the load balancer. If you set <code>EvaluateTargetHealth</code> to <code>true</code> and either no EC2 instances are healthy or the load balancer itself is unhealthy, Route 53 routes queries to other resources.</p> </li> <li> <p> <b>Application and Network Load Balancers</b>: If you specify an ELB Application or Network Load Balancer and you set <code>EvaluateTargetHealth</code> to <code>true</code>, Route 53 routes queries to the load balancer based on the health of the target groups that are associated with the load balancer:</p> <ul> <li> <p>For an Application or Network Load Balancer to be considered healthy, every target group that contains targets must contain at least one healthy target. If any target group contains only unhealthy targets, the load balancer is considered unhealthy, and Route 53 routes queries to other resources.</p> </li> <li> <p>A target group that has no registered targets is considered unhealthy.</p> </li> </ul> </li> </ul> <note> <p>When you create a load balancer, you configure settings for Elastic Load Balancing health checks; they're not Route 53 health checks, but they perform a similar function. Do not create Route 53 health checks for the EC2 instances that you register with an ELB load balancer. </p> </note> </dd> <dt>S3 buckets</dt> <dd> <p>There are no special requirements for setting <code>EvaluateTargetHealth</code> to <code>true</code> when the alias target is an S3 bucket.</p> </dd> <dt>Other records in the same hosted zone</dt> <dd> <p>If the AWS resource that you specify in <code>DNSName</code> is a record or a group of records (for example, a group of weighted records) but is not another alias record, we recommend that you associate a health check with all of the records in the alias target. For more information, see <a href=\"http://docs.aws.amazon.com/Route53/latest/DeveloperGuide/dns-failover-complex-configs.html#dns-failover-complex-configs-hc-omitting\">What Happens When You Omit Health Checks?</a> in the <i>Amazon Route 53 Developer Guide</i>.</p> </dd> </dl> <p>For more information and examples, see <a href=\"http://docs.aws.amazon.com/Route53/latest/DeveloperGuide/dns-failover.html\">Amazon Route 53 Health Checks and DNS Failover</a> in the <i>Amazon Route 53 Developer Guide</i>.</p>"
+          "documentation":"<p> <i>Applies only to alias, failover alias, geolocation alias, latency alias, and weighted alias resource record sets:</i> When <code>EvaluateTargetHealth</code> is <code>true</code>, an alias resource record set inherits the health of the referenced AWS resource, such as an ELB load balancer or another resource record set in the hosted zone.</p> <p>Note the following:</p> <dl> <dt>CloudFront distributions</dt> <dd> <p>You can't set <code>EvaluateTargetHealth</code> to <code>true</code> when the alias target is a CloudFront distribution.</p> </dd> <dt>Elastic Beanstalk environments that have regionalized subdomains</dt> <dd> <p>If you specify an Elastic Beanstalk environment in <code>DNSName</code> and the environment contains an ELB load balancer, Elastic Load Balancing routes queries only to the healthy Amazon EC2 instances that are registered with the load balancer. (An environment automatically contains an ELB load balancer if it includes more than one Amazon EC2 instance.) If you set <code>EvaluateTargetHealth</code> to <code>true</code> and either no Amazon EC2 instances are healthy or the load balancer itself is unhealthy, Route 53 routes queries to other available resources that are healthy, if any. </p> <p>If the environment contains a single Amazon EC2 instance, there are no special requirements.</p> </dd> <dt>ELB load balancers</dt> <dd> <p>Health checking behavior depends on the type of load balancer:</p> <ul> <li> <p> <b>Classic Load Balancers</b>: If you specify an ELB Classic Load Balancer in <code>DNSName</code>, Elastic Load Balancing routes queries only to the healthy Amazon EC2 instances that are registered with the load balancer. If you set <code>EvaluateTargetHealth</code> to <code>true</code> and either no EC2 instances are healthy or the load balancer itself is unhealthy, Route 53 routes queries to other resources.</p> </li> <li> <p> <b>Application and Network Load Balancers</b>: If you specify an ELB Application or Network Load Balancer and you set <code>EvaluateTargetHealth</code> to <code>true</code>, Route 53 routes queries to the load balancer based on the health of the target groups that are associated with the load balancer:</p> <ul> <li> <p>For an Application or Network Load Balancer to be considered healthy, every target group that contains targets must contain at least one healthy target. If any target group contains only unhealthy targets, the load balancer is considered unhealthy, and Route 53 routes queries to other resources.</p> </li> <li> <p>A target group that has no registered targets is considered unhealthy.</p> </li> </ul> </li> </ul> <note> <p>When you create a load balancer, you configure settings for Elastic Load Balancing health checks; they're not Route 53 health checks, but they perform a similar function. Do not create Route 53 health checks for the EC2 instances that you register with an ELB load balancer. </p> </note> </dd> <dt>S3 buckets</dt> <dd> <p>There are no special requirements for setting <code>EvaluateTargetHealth</code> to <code>true</code> when the alias target is an S3 bucket.</p> </dd> <dt>Other records in the same hosted zone</dt> <dd> <p>If the AWS resource that you specify in <code>DNSName</code> is a record or a group of records (for example, a group of weighted records) but is not another alias record, we recommend that you associate a health check with all of the records in the alias target. For more information, see <a href=\"https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/dns-failover-complex-configs.html#dns-failover-complex-configs-hc-omitting\">What Happens When You Omit Health Checks?</a> in the <i>Amazon Route 53 Developer Guide</i>.</p> </dd> </dl> <p>For more information and examples, see <a href=\"https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/dns-failover.html\">Amazon Route 53 Health Checks and DNS Failover</a> in the <i>Amazon Route 53 Developer Guide</i>.</p>"
         }
       },
-      "documentation":"<p> <i>Alias resource record sets only:</i> Information about the AWS resource, such as a CloudFront distribution or an Amazon S3 bucket, that you want to route traffic to.</p> <p>When creating resource record sets for a private hosted zone, note the following:</p> <ul> <li> <p>Creating geolocation alias resource record sets or latency alias resource record sets in a private hosted zone is unsupported.</p> </li> <li> <p>For information about creating failover resource record sets in a private hosted zone, see <a href=\"http://docs.aws.amazon.com/Route53/latest/DeveloperGuide/dns-failover-private-hosted-zones.html\">Configuring Failover in a Private Hosted Zone</a>.</p> </li> </ul>"
+      "documentation":"<p> <i>Alias resource record sets only:</i> Information about the AWS resource, such as a CloudFront distribution or an Amazon S3 bucket, that you want to route traffic to.</p> <p>When creating resource record sets for a private hosted zone, note the following:</p> <ul> <li> <p>Creating geolocation alias resource record sets or latency alias resource record sets in a private hosted zone is unsupported.</p> </li> <li> <p>For information about creating failover resource record sets in a private hosted zone, see <a href=\"https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/dns-failover-private-hosted-zones.html\">Configuring Failover in a Private Hosted Zone</a>.</p> </li> </ul>"
     },
     "AssociateVPCComment":{"type":"string"},
     "AssociateVPCWithHostedZoneRequest":{
@@ -1241,7 +1241,7 @@
         },
         "Namespace":{
           "shape":"Namespace",
-          "documentation":"<p>The namespace of the metric that the alarm is associated with. For more information, see <a href=\"http://docs.aws.amazon.com/AmazonCloudWatch/latest/DeveloperGuide/CW_Support_For_AWS.html\">Amazon CloudWatch Namespaces, Dimensions, and Metrics Reference</a> in the <i>Amazon CloudWatch User Guide</i>.</p>"
+          "documentation":"<p>The namespace of the metric that the alarm is associated with. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonCloudWatch/latest/DeveloperGuide/CW_Support_For_AWS.html\">Amazon CloudWatch Namespaces, Dimensions, and Metrics Reference</a> in the <i>Amazon CloudWatch User Guide</i>.</p>"
         },
         "Statistic":{
           "shape":"Statistic",
@@ -1249,7 +1249,7 @@
         },
         "Dimensions":{
           "shape":"DimensionList",
-          "documentation":"<p>For the metric that the CloudWatch alarm is associated with, a complex type that contains information about the dimensions for the metric. For information, see <a href=\"http://docs.aws.amazon.com/AmazonCloudWatch/latest/DeveloperGuide/CW_Support_For_AWS.html\">Amazon CloudWatch Namespaces, Dimensions, and Metrics Reference</a> in the <i>Amazon CloudWatch User Guide</i>.</p>"
+          "documentation":"<p>For the metric that the CloudWatch alarm is associated with, a complex type that contains information about the dimensions for the metric. For information, see <a href=\"https://docs.aws.amazon.com/AmazonCloudWatch/latest/DeveloperGuide/CW_Support_For_AWS.html\">Amazon CloudWatch Namespaces, Dimensions, and Metrics Reference</a> in the <i>Amazon CloudWatch User Guide</i>.</p>"
         }
       },
       "documentation":"<p>A complex type that contains information about the CloudWatch alarm that Amazon Route 53 is monitoring for this health check.</p>"
@@ -2013,15 +2013,15 @@
       "members":{
         "ContinentCode":{
           "shape":"GeoLocationContinentCode",
-          "documentation":"<p>The two-letter code for the continent.</p> <p>Valid values: <code>AF</code> | <code>AN</code> | <code>AS</code> | <code>EU</code> | <code>OC</code> | <code>NA</code> | <code>SA</code> </p> <p>Constraint: Specifying <code>ContinentCode</code> with either <code>CountryCode</code> or <code>SubdivisionCode</code> returns an <code>InvalidInput</code> error.</p>"
+          "documentation":"<p>The two-letter code for the continent.</p> <p>Amazon Route 53 supports the following continent codes:</p> <ul> <li> <p> <b>AF</b>: Africa</p> </li> <li> <p> <b>AN</b>: Antarctica</p> </li> <li> <p> <b>AS</b>: Asia</p> </li> <li> <p> <b>EU</b>: Europe</p> </li> <li> <p> <b>OC</b>: Oceania</p> </li> <li> <p> <b>NA</b>: North America</p> </li> <li> <p> <b>SA</b>: South America</p> </li> </ul> <p>Constraint: Specifying <code>ContinentCode</code> with either <code>CountryCode</code> or <code>SubdivisionCode</code> returns an <code>InvalidInput</code> error.</p>"
         },
         "CountryCode":{
           "shape":"GeoLocationCountryCode",
-          "documentation":"<p>The two-letter code for the country.</p>"
+          "documentation":"<p>For geolocation resource record sets, the two-letter code for a country.</p> <p>Amazon Route 53 uses the two-letter country codes that are specified in <a href=\"https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2\">ISO standard 3166-1 alpha-2</a>.</p>"
         },
         "SubdivisionCode":{
           "shape":"GeoLocationSubdivisionCode",
-          "documentation":"<p>The code for the subdivision. Route 53 currently supports only states in the United States.</p>"
+          "documentation":"<p>For geolocation resource record sets, the two-letter code for a state of the United States. Route 53 doesn't support any other values for <code>SubdivisionCode</code>. For a list of state abbreviations, see <a href=\"https://pe.usps.com/text/pub28/28apb.htm\">Appendix B: Two–Letter State and Possession Abbreviations</a> on the United States Postal Service website. </p> <p>If you specify <code>subdivisioncode</code>, you must also specify <code>US</code> for <code>CountryCode</code>. </p>"
         }
       },
       "documentation":"<p>A complex type that contains information about a geographic location.</p>"
@@ -2170,7 +2170,7 @@
       "members":{
         "ContinentCode":{
           "shape":"GeoLocationContinentCode",
-          "documentation":"<p>Amazon Route 53 supports the following continent codes:</p> <ul> <li> <p> <b>AF</b>: Africa</p> </li> <li> <p> <b>AN</b>: Antarctica</p> </li> <li> <p> <b>AS</b>: Asia</p> </li> <li> <p> <b>EU</b>: Europe</p> </li> <li> <p> <b>OC</b>: Oceania</p> </li> <li> <p> <b>NA</b>: North America</p> </li> <li> <p> <b>SA</b>: South America</p> </li> </ul>",
+          "documentation":"<p>For geolocation resource record sets, a two-letter abbreviation that identifies a continent. Amazon Route 53 supports the following continent codes:</p> <ul> <li> <p> <b>AF</b>: Africa</p> </li> <li> <p> <b>AN</b>: Antarctica</p> </li> <li> <p> <b>AS</b>: Asia</p> </li> <li> <p> <b>EU</b>: Europe</p> </li> <li> <p> <b>OC</b>: Oceania</p> </li> <li> <p> <b>NA</b>: North America</p> </li> <li> <p> <b>SA</b>: South America</p> </li> </ul>",
           "location":"querystring",
           "locationName":"continentcode"
         },
@@ -2182,7 +2182,7 @@
         },
         "SubdivisionCode":{
           "shape":"GeoLocationSubdivisionCode",
-          "documentation":"<p>Amazon Route 53 uses the one- to three-letter subdivision codes that are specified in <a href=\"https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2\">ISO standard 3166-1 alpha-2</a>. Route 53 doesn't support subdivision codes for all countries. If you specify <code>subdivisioncode</code>, you must also specify <code>countrycode</code>. </p>",
+          "documentation":"<p>For <code>SubdivisionCode</code>, Amazon Route 53 supports only states of the United States. For a list of state abbreviations, see <a href=\"https://pe.usps.com/text/pub28/28apb.htm\">Appendix B: Two–Letter State and Possession Abbreviations</a> on the United States Postal Service website. </p> <p>If you specify <code>subdivisioncode</code>, you must also specify <code>US</code> for <code>CountryCode</code>. </p>",
           "location":"querystring",
           "locationName":"subdivisioncode"
         }
@@ -2596,7 +2596,7 @@
         },
         "Port":{
           "shape":"Port",
-          "documentation":"<p>The port on the endpoint on which you want Amazon Route 53 to perform health checks. Specify a value for <code>Port</code> only when you specify a value for <code>IPAddress</code>.</p>"
+          "documentation":"<p>The port on the endpoint that you want Amazon Route 53 to perform health checks on.</p> <note> <p>Don't specify a value for <code>Port</code> when you specify a value for <code>Type</code> of <code>CLOUDWATCH_METRIC</code> or <code>CALCULATED</code>.</p> </note>"
         },
         "Type":{
           "shape":"HealthCheckType",
@@ -2612,7 +2612,7 @@
         },
         "SearchString":{
           "shape":"SearchString",
-          "documentation":"<p>If the value of Type is <code>HTTP_STR_MATCH</code> or <code>HTTP_STR_MATCH</code>, the string that you want Amazon Route 53 to search for in the response body from the specified resource. If the string appears in the response body, Route 53 considers the resource healthy.</p> <p>Route 53 considers case when searching for <code>SearchString</code> in the response body. </p>"
+          "documentation":"<p>If the value of Type is <code>HTTP_STR_MATCH</code> or <code>HTTPS_STR_MATCH</code>, the string that you want Amazon Route 53 to search for in the response body from the specified resource. If the string appears in the response body, Route 53 considers the resource healthy.</p> <p>Route 53 considers case when searching for <code>SearchString</code> in the response body. </p>"
         },
         "RequestInterval":{
           "shape":"RequestInterval",
@@ -2620,7 +2620,7 @@
         },
         "FailureThreshold":{
           "shape":"FailureThreshold",
-          "documentation":"<p>The number of consecutive health checks that an endpoint must pass or fail for Amazon Route 53 to change the current status of the endpoint from unhealthy to healthy or vice versa. For more information, see <a href=\"http://docs.aws.amazon.com/Route53/latest/DeveloperGuide/dns-failover-determining-health-of-endpoints.html\">How Amazon Route 53 Determines Whether an Endpoint Is Healthy</a> in the <i>Amazon Route 53 Developer Guide</i>.</p> <p>If you don't specify a value for <code>FailureThreshold</code>, the default value is three health checks.</p>"
+          "documentation":"<p>The number of consecutive health checks that an endpoint must pass or fail for Amazon Route 53 to change the current status of the endpoint from unhealthy to healthy or vice versa. For more information, see <a href=\"https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/dns-failover-determining-health-of-endpoints.html\">How Amazon Route 53 Determines Whether an Endpoint Is Healthy</a> in the <i>Amazon Route 53 Developer Guide</i>.</p> <p>If you don't specify a value for <code>FailureThreshold</code>, the default value is three health checks.</p>"
         },
         "MeasureLatency":{
           "shape":"MeasureLatency",
@@ -3065,13 +3065,13 @@
         },
         "StartCountryCode":{
           "shape":"GeoLocationCountryCode",
-          "documentation":"<p>The code for the country with which you want to start listing locations that Amazon Route 53 supports for geolocation. If Route 53 has already returned a page or more of results, if <code>IsTruncated</code> is <code>true</code>, and if <code>NextCountryCode</code> from the previous response has a value, enter that value in <code>startcountrycode</code> to return the next page of results.</p> <p>Route 53 uses the two-letter country codes that are specified in <a href=\"https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2\">ISO standard 3166-1 alpha-2</a>.</p>",
+          "documentation":"<p>The code for the country with which you want to start listing locations that Amazon Route 53 supports for geolocation. If Route 53 has already returned a page or more of results, if <code>IsTruncated</code> is <code>true</code>, and if <code>NextCountryCode</code> from the previous response has a value, enter that value in <code>startcountrycode</code> to return the next page of results.</p>",
           "location":"querystring",
           "locationName":"startcountrycode"
         },
         "StartSubdivisionCode":{
           "shape":"GeoLocationSubdivisionCode",
-          "documentation":"<p>The code for the subdivision (for example, state or province) with which you want to start listing locations that Amazon Route 53 supports for geolocation. If Route 53 has already returned a page or more of results, if <code>IsTruncated</code> is <code>true</code>, and if <code>NextSubdivisionCode</code> from the previous response has a value, enter that value in <code>startsubdivisioncode</code> to return the next page of results.</p> <p>To list subdivisions of a country, you must include both <code>startcountrycode</code> and <code>startsubdivisioncode</code>.</p>",
+          "documentation":"<p>The code for the state of the United States with which you want to start listing locations that Amazon Route 53 supports for geolocation. If Route 53 has already returned a page or more of results, if <code>IsTruncated</code> is <code>true</code>, and if <code>NextSubdivisionCode</code> from the previous response has a value, enter that value in <code>startsubdivisioncode</code> to return the next page of results.</p> <p>To list subdivisions (U.S. states), you must include both <code>startcountrycode</code> and <code>startsubdivisioncode</code>.</p>",
           "location":"querystring",
           "locationName":"startsubdivisioncode"
         },
@@ -3336,13 +3336,13 @@
         },
         "StartRecordName":{
           "shape":"DNSName",
-          "documentation":"<p>The first name in the lexicographic ordering of resource record sets that you want to list.</p>",
+          "documentation":"<p>The first name in the lexicographic ordering of resource record sets that you want to list. If the specified record name doesn't exist, the results begin with the first resource record set that has a name greater than the value of <code>name</code>.</p>",
           "location":"querystring",
           "locationName":"name"
         },
         "StartRecordType":{
           "shape":"RRType",
-          "documentation":"<p>The type of resource record set to begin the record listing from.</p> <p>Valid values for basic resource record sets: <code>A</code> | <code>AAAA</code> | <code>CAA</code> | <code>CNAME</code> | <code>MX</code> | <code>NAPTR</code> | <code>NS</code> | <code>PTR</code> | <code>SOA</code> | <code>SPF</code> | <code>SRV</code> | <code>TXT</code> </p> <p>Values for weighted, latency, geolocation, and failover resource record sets: <code>A</code> | <code>AAAA</code> | <code>CAA</code> | <code>CNAME</code> | <code>MX</code> | <code>NAPTR</code> | <code>PTR</code> | <code>SPF</code> | <code>SRV</code> | <code>TXT</code> </p> <p>Values for alias resource record sets: </p> <ul> <li> <p> <b>API Gateway custom regional API or edge-optimized API</b>: A</p> </li> <li> <p> <b>CloudFront distribution</b>: A or AAAA</p> </li> <li> <p> <b>Elastic Beanstalk environment that has a regionalized subdomain</b>: A</p> </li> <li> <p> <b>Elastic Load Balancing load balancer</b>: A | AAAA</p> </li> <li> <p> <b>Amazon S3 bucket</b>: A</p> </li> <li> <p> <b>Amazon VPC interface VPC endpoint</b>: A</p> </li> <li> <p> <b>Another resource record set in this hosted zone:</b> The type of the resource record set that the alias references.</p> </li> </ul> <p>Constraint: Specifying <code>type</code> without specifying <code>name</code> returns an <code>InvalidInput</code> error.</p>",
+          "documentation":"<p>The type of resource record set to begin the record listing from.</p> <p>Valid values for basic resource record sets: <code>A</code> | <code>AAAA</code> | <code>CAA</code> | <code>CNAME</code> | <code>MX</code> | <code>NAPTR</code> | <code>NS</code> | <code>PTR</code> | <code>SOA</code> | <code>SPF</code> | <code>SRV</code> | <code>TXT</code> </p> <p>Values for weighted, latency, geolocation, and failover resource record sets: <code>A</code> | <code>AAAA</code> | <code>CAA</code> | <code>CNAME</code> | <code>MX</code> | <code>NAPTR</code> | <code>PTR</code> | <code>SPF</code> | <code>SRV</code> | <code>TXT</code> </p> <p>Values for alias resource record sets: </p> <ul> <li> <p> <b>API Gateway custom regional API or edge-optimized API</b>: A</p> </li> <li> <p> <b>CloudFront distribution</b>: A or AAAA</p> </li> <li> <p> <b>Elastic Beanstalk environment that has a regionalized subdomain</b>: A</p> </li> <li> <p> <b>Elastic Load Balancing load balancer</b>: A | AAAA</p> </li> <li> <p> <b>S3 bucket</b>: A</p> </li> <li> <p> <b>VPC interface VPC endpoint</b>: A</p> </li> <li> <p> <b>Another resource record set in this hosted zone:</b> The type of the resource record set that the alias references.</p> </li> </ul> <p>Constraint: Specifying <code>type</code> without specifying <code>name</code> returns an <code>InvalidInput</code> error.</p>",
           "location":"querystring",
           "locationName":"type"
         },
@@ -3922,7 +3922,7 @@
           "documentation":"<p>Descriptive message for the error response.</p>"
         }
       },
-      "documentation":"<p>Amazon Route 53 doesn't support the specified geographic location.</p>",
+      "documentation":"<p>Amazon Route 53 doesn't support the specified geographic location. For a list of supported geolocation codes, see the <a href=\"https://docs.aws.amazon.com/Route53/latest/APIReference/API_GeoLocation.html\">GeoLocation</a> data type.</p>",
       "error":{"httpStatusCode":404},
       "exception":true
     },
@@ -4174,11 +4174,11 @@
       "members":{
         "Name":{
           "shape":"DNSName",
-          "documentation":"<p>For <code>ChangeResourceRecordSets</code> requests, the name of the record that you want to create, update, or delete. For <code>ListResourceRecordSets</code> responses, the name of a record in the specified hosted zone.</p> <p> <b>ChangeResourceRecordSets Only</b> </p> <p>Enter a fully qualified domain name, for example, <code>www.example.com</code>. You can optionally include a trailing dot. If you omit the trailing dot, Amazon Route 53 assumes that the domain name that you specify is fully qualified. This means that Route 53 treats <code>www.example.com</code> (without a trailing dot) and <code>www.example.com.</code> (with a trailing dot) as identical.</p> <p>For information about how to specify characters other than <code>a-z</code>, <code>0-9</code>, and <code>-</code> (hyphen) and how to specify internationalized domain names, see <a href=\"http://docs.aws.amazon.com/Route53/latest/DeveloperGuide/DomainNameFormat.html\">DNS Domain Name Format</a> in the <i>Amazon Route 53 Developer Guide</i>.</p> <p>You can use the asterisk (*) wildcard to replace the leftmost label in a domain name, for example, <code>*.example.com</code>. Note the following:</p> <ul> <li> <p>The * must replace the entire label. For example, you can't specify <code>*prod.example.com</code> or <code>prod*.example.com</code>.</p> </li> <li> <p>The * can't replace any of the middle labels, for example, marketing.*.example.com.</p> </li> <li> <p>If you include * in any position other than the leftmost label in a domain name, DNS treats it as an * character (ASCII 42), not as a wildcard.</p> <important> <p>You can't use the * wildcard for resource records sets that have a type of NS.</p> </important> </li> </ul> <p>You can use the * wildcard as the leftmost label in a domain name, for example, <code>*.example.com</code>. You can't use an * for one of the middle labels, for example, <code>marketing.*.example.com</code>. In addition, the * must replace the entire label; for example, you can't specify <code>prod*.example.com</code>.</p>"
+          "documentation":"<p>For <code>ChangeResourceRecordSets</code> requests, the name of the record that you want to create, update, or delete. For <code>ListResourceRecordSets</code> responses, the name of a record in the specified hosted zone.</p> <p> <b>ChangeResourceRecordSets Only</b> </p> <p>Enter a fully qualified domain name, for example, <code>www.example.com</code>. You can optionally include a trailing dot. If you omit the trailing dot, Amazon Route 53 assumes that the domain name that you specify is fully qualified. This means that Route 53 treats <code>www.example.com</code> (without a trailing dot) and <code>www.example.com.</code> (with a trailing dot) as identical.</p> <p>For information about how to specify characters other than <code>a-z</code>, <code>0-9</code>, and <code>-</code> (hyphen) and how to specify internationalized domain names, see <a href=\"https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/DomainNameFormat.html\">DNS Domain Name Format</a> in the <i>Amazon Route 53 Developer Guide</i>.</p> <p>You can use the asterisk (*) wildcard to replace the leftmost label in a domain name, for example, <code>*.example.com</code>. Note the following:</p> <ul> <li> <p>The * must replace the entire label. For example, you can't specify <code>*prod.example.com</code> or <code>prod*.example.com</code>.</p> </li> <li> <p>The * can't replace any of the middle labels, for example, marketing.*.example.com.</p> </li> <li> <p>If you include * in any position other than the leftmost label in a domain name, DNS treats it as an * character (ASCII 42), not as a wildcard.</p> <important> <p>You can't use the * wildcard for resource records sets that have a type of NS.</p> </important> </li> </ul> <p>You can use the * wildcard as the leftmost label in a domain name, for example, <code>*.example.com</code>. You can't use an * for one of the middle labels, for example, <code>marketing.*.example.com</code>. In addition, the * must replace the entire label; for example, you can't specify <code>prod*.example.com</code>.</p>"
         },
         "Type":{
           "shape":"RRType",
-          "documentation":"<p>The DNS record type. For information about different record types and how data is encoded for them, see <a href=\"http://docs.aws.amazon.com/Route53/latest/DeveloperGuide/ResourceRecordTypes.html\">Supported DNS Resource Record Types</a> in the <i>Amazon Route 53 Developer Guide</i>.</p> <p>Valid values for basic resource record sets: <code>A</code> | <code>AAAA</code> | <code>CAA</code> | <code>CNAME</code> | <code>MX</code> | <code>NAPTR</code> | <code>NS</code> | <code>PTR</code> | <code>SOA</code> | <code>SPF</code> | <code>SRV</code> | <code>TXT</code> </p> <p>Values for weighted, latency, geolocation, and failover resource record sets: <code>A</code> | <code>AAAA</code> | <code>CAA</code> | <code>CNAME</code> | <code>MX</code> | <code>NAPTR</code> | <code>PTR</code> | <code>SPF</code> | <code>SRV</code> | <code>TXT</code>. When creating a group of weighted, latency, geolocation, or failover resource record sets, specify the same value for all of the resource record sets in the group.</p> <p>Valid values for multivalue answer resource record sets: <code>A</code> | <code>AAAA</code> | <code>MX</code> | <code>NAPTR</code> | <code>PTR</code> | <code>SPF</code> | <code>SRV</code> | <code>TXT</code> </p> <note> <p>SPF records were formerly used to verify the identity of the sender of email messages. However, we no longer recommend that you create resource record sets for which the value of <code>Type</code> is <code>SPF</code>. RFC 7208, <i>Sender Policy Framework (SPF) for Authorizing Use of Domains in Email, Version 1</i>, has been updated to say, \"...[I]ts existence and mechanism defined in [RFC4408] have led to some interoperability issues. Accordingly, its use is no longer appropriate for SPF version 1; implementations are not to use it.\" In RFC 7208, see section 14.1, <a href=\"http://tools.ietf.org/html/rfc7208#section-14.1\">The SPF DNS Record Type</a>.</p> </note> <p>Values for alias resource record sets:</p> <ul> <li> <p> <b>Amazon API Gateway custom regional APIs and edge-optimized APIs:</b> <code>A</code> </p> </li> <li> <p> <b>CloudFront distributions:</b> <code>A</code> </p> <p>If IPv6 is enabled for the distribution, create two resource record sets to route traffic to your distribution, one with a value of <code>A</code> and one with a value of <code>AAAA</code>. </p> </li> <li> <p> <b>AWS Elastic Beanstalk environment that has a regionalized subdomain</b>: <code>A</code> </p> </li> <li> <p> <b>ELB load balancers:</b> <code>A</code> | <code>AAAA</code> </p> </li> <li> <p> <b>Amazon S3 buckets:</b> <code>A</code> </p> </li> <li> <p> <b>Amazon Virtual Private Cloud interface VPC endpoints</b> <code>A</code> </p> </li> <li> <p> <b>Another resource record set in this hosted zone:</b> Specify the type of the resource record set that you're creating the alias for. All values are supported except <code>NS</code> and <code>SOA</code>.</p> <note> <p>If you're creating an alias record that has the same name as the hosted zone (known as the zone apex), you can't route traffic to a record for which the value of <code>Type</code> is <code>CNAME</code>. This is because the alias record must have the same type as the record you're routing traffic to, and creating a CNAME record for the zone apex isn't supported even for an alias record.</p> </note> </li> </ul>"
+          "documentation":"<p>The DNS record type. For information about different record types and how data is encoded for them, see <a href=\"https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/ResourceRecordTypes.html\">Supported DNS Resource Record Types</a> in the <i>Amazon Route 53 Developer Guide</i>.</p> <p>Valid values for basic resource record sets: <code>A</code> | <code>AAAA</code> | <code>CAA</code> | <code>CNAME</code> | <code>MX</code> | <code>NAPTR</code> | <code>NS</code> | <code>PTR</code> | <code>SOA</code> | <code>SPF</code> | <code>SRV</code> | <code>TXT</code> </p> <p>Values for weighted, latency, geolocation, and failover resource record sets: <code>A</code> | <code>AAAA</code> | <code>CAA</code> | <code>CNAME</code> | <code>MX</code> | <code>NAPTR</code> | <code>PTR</code> | <code>SPF</code> | <code>SRV</code> | <code>TXT</code>. When creating a group of weighted, latency, geolocation, or failover resource record sets, specify the same value for all of the resource record sets in the group.</p> <p>Valid values for multivalue answer resource record sets: <code>A</code> | <code>AAAA</code> | <code>MX</code> | <code>NAPTR</code> | <code>PTR</code> | <code>SPF</code> | <code>SRV</code> | <code>TXT</code> </p> <note> <p>SPF records were formerly used to verify the identity of the sender of email messages. However, we no longer recommend that you create resource record sets for which the value of <code>Type</code> is <code>SPF</code>. RFC 7208, <i>Sender Policy Framework (SPF) for Authorizing Use of Domains in Email, Version 1</i>, has been updated to say, \"...[I]ts existence and mechanism defined in [RFC4408] have led to some interoperability issues. Accordingly, its use is no longer appropriate for SPF version 1; implementations are not to use it.\" In RFC 7208, see section 14.1, <a href=\"http://tools.ietf.org/html/rfc7208#section-14.1\">The SPF DNS Record Type</a>.</p> </note> <p>Values for alias resource record sets:</p> <ul> <li> <p> <b>Amazon API Gateway custom regional APIs and edge-optimized APIs:</b> <code>A</code> </p> </li> <li> <p> <b>CloudFront distributions:</b> <code>A</code> </p> <p>If IPv6 is enabled for the distribution, create two resource record sets to route traffic to your distribution, one with a value of <code>A</code> and one with a value of <code>AAAA</code>. </p> </li> <li> <p> <b>Amazon API Gateway environment that has a regionalized subdomain</b>: <code>A</code> </p> </li> <li> <p> <b>ELB load balancers:</b> <code>A</code> | <code>AAAA</code> </p> </li> <li> <p> <b>Amazon S3 buckets:</b> <code>A</code> </p> </li> <li> <p> <b>Amazon Virtual Private Cloud interface VPC endpoints</b> <code>A</code> </p> </li> <li> <p> <b>Another resource record set in this hosted zone:</b> Specify the type of the resource record set that you're creating the alias for. All values are supported except <code>NS</code> and <code>SOA</code>.</p> <note> <p>If you're creating an alias record that has the same name as the hosted zone (known as the zone apex), you can't route traffic to a record for which the value of <code>Type</code> is <code>CNAME</code>. This is because the alias record must have the same type as the record you're routing traffic to, and creating a CNAME record for the zone apex isn't supported even for an alias record.</p> </note> </li> </ul>"
         },
         "SetIdentifier":{
           "shape":"ResourceRecordSetIdentifier",
@@ -4186,19 +4186,19 @@
         },
         "Weight":{
           "shape":"ResourceRecordSetWeight",
-          "documentation":"<p> <i>Weighted resource record sets only:</i> Among resource record sets that have the same combination of DNS name and type, a value that determines the proportion of DNS queries that Amazon Route 53 responds to using the current resource record set. Route 53 calculates the sum of the weights for the resource record sets that have the same combination of DNS name and type. Route 53 then responds to queries based on the ratio of a resource's weight to the total. Note the following:</p> <ul> <li> <p>You must specify a value for the <code>Weight</code> element for every weighted resource record set.</p> </li> <li> <p>You can only specify one <code>ResourceRecord</code> per weighted resource record set.</p> </li> <li> <p>You can't create latency, failover, or geolocation resource record sets that have the same values for the <code>Name</code> and <code>Type</code> elements as weighted resource record sets.</p> </li> <li> <p>You can create a maximum of 100 weighted resource record sets that have the same values for the <code>Name</code> and <code>Type</code> elements.</p> </li> <li> <p>For weighted (but not weighted alias) resource record sets, if you set <code>Weight</code> to <code>0</code> for a resource record set, Route 53 never responds to queries with the applicable value for that resource record set. However, if you set <code>Weight</code> to <code>0</code> for all resource record sets that have the same combination of DNS name and type, traffic is routed to all resources with equal probability.</p> <p>The effect of setting <code>Weight</code> to <code>0</code> is different when you associate health checks with weighted resource record sets. For more information, see <a href=\"http://docs.aws.amazon.com/Route53/latest/DeveloperGuide/dns-failover-configuring-options.html\">Options for Configuring Route 53 Active-Active and Active-Passive Failover</a> in the <i>Amazon Route 53 Developer Guide</i>.</p> </li> </ul>"
+          "documentation":"<p> <i>Weighted resource record sets only:</i> Among resource record sets that have the same combination of DNS name and type, a value that determines the proportion of DNS queries that Amazon Route 53 responds to using the current resource record set. Route 53 calculates the sum of the weights for the resource record sets that have the same combination of DNS name and type. Route 53 then responds to queries based on the ratio of a resource's weight to the total. Note the following:</p> <ul> <li> <p>You must specify a value for the <code>Weight</code> element for every weighted resource record set.</p> </li> <li> <p>You can only specify one <code>ResourceRecord</code> per weighted resource record set.</p> </li> <li> <p>You can't create latency, failover, or geolocation resource record sets that have the same values for the <code>Name</code> and <code>Type</code> elements as weighted resource record sets.</p> </li> <li> <p>You can create a maximum of 100 weighted resource record sets that have the same values for the <code>Name</code> and <code>Type</code> elements.</p> </li> <li> <p>For weighted (but not weighted alias) resource record sets, if you set <code>Weight</code> to <code>0</code> for a resource record set, Route 53 never responds to queries with the applicable value for that resource record set. However, if you set <code>Weight</code> to <code>0</code> for all resource record sets that have the same combination of DNS name and type, traffic is routed to all resources with equal probability.</p> <p>The effect of setting <code>Weight</code> to <code>0</code> is different when you associate health checks with weighted resource record sets. For more information, see <a href=\"https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/dns-failover-configuring-options.html\">Options for Configuring Route 53 Active-Active and Active-Passive Failover</a> in the <i>Amazon Route 53 Developer Guide</i>.</p> </li> </ul>"
         },
         "Region":{
           "shape":"ResourceRecordSetRegion",
-          "documentation":"<p> <i>Latency-based resource record sets only:</i> The Amazon EC2 Region where you created the resource that this resource record set refers to. The resource typically is an AWS resource, such as an EC2 instance or an ELB load balancer, and is referred to by an IP address or a DNS domain name, depending on the record type.</p> <note> <p>Creating latency and latency alias resource record sets in private hosted zones is not supported.</p> </note> <p>When Amazon Route 53 receives a DNS query for a domain name and type for which you have created latency resource record sets, Route 53 selects the latency resource record set that has the lowest latency between the end user and the associated Amazon EC2 Region. Route 53 then returns the value that is associated with the selected resource record set.</p> <p>Note the following:</p> <ul> <li> <p>You can only specify one <code>ResourceRecord</code> per latency resource record set.</p> </li> <li> <p>You can only create one latency resource record set for each Amazon EC2 Region.</p> </li> <li> <p>You aren't required to create latency resource record sets for all Amazon EC2 Regions. Route 53 will choose the region with the best latency from among the regions that you create latency resource record sets for.</p> </li> <li> <p>You can't create non-latency resource record sets that have the same values for the <code>Name</code> and <code>Type</code> elements as latency resource record sets.</p> </li> </ul>"
+          "documentation":"<p> <i>Latency-based resource record sets only:</i> The Amazon EC2 Region where you created the resource that this resource record set refers to. The resource typically is an AWS resource, such as an EC2 instance or an ELB load balancer, and is referred to by an IP address or a DNS domain name, depending on the record type.</p> <note> <p>Although creating latency and latency alias resource record sets in a private hosted zone is allowed, it's not supported.</p> </note> <p>When Amazon Route 53 receives a DNS query for a domain name and type for which you have created latency resource record sets, Route 53 selects the latency resource record set that has the lowest latency between the end user and the associated Amazon EC2 Region. Route 53 then returns the value that is associated with the selected resource record set.</p> <p>Note the following:</p> <ul> <li> <p>You can only specify one <code>ResourceRecord</code> per latency resource record set.</p> </li> <li> <p>You can only create one latency resource record set for each Amazon EC2 Region.</p> </li> <li> <p>You aren't required to create latency resource record sets for all Amazon EC2 Regions. Route 53 will choose the region with the best latency from among the regions that you create latency resource record sets for.</p> </li> <li> <p>You can't create non-latency resource record sets that have the same values for the <code>Name</code> and <code>Type</code> elements as latency resource record sets.</p> </li> </ul>"
         },
         "GeoLocation":{
           "shape":"GeoLocation",
-          "documentation":"<p> <i>Geolocation resource record sets only:</i> A complex type that lets you control how Amazon Route 53 responds to DNS queries based on the geographic origin of the query. For example, if you want all queries from Africa to be routed to a web server with an IP address of <code>192.0.2.111</code>, create a resource record set with a <code>Type</code> of <code>A</code> and a <code>ContinentCode</code> of <code>AF</code>.</p> <note> <p>Creating geolocation and geolocation alias resource record sets in private hosted zones is not supported.</p> </note> <p>If you create separate resource record sets for overlapping geographic regions (for example, one resource record set for a continent and one for a country on the same continent), priority goes to the smallest geographic region. This allows you to route most queries for a continent to one resource and to route queries for a country on that continent to a different resource.</p> <p>You can't create two geolocation resource record sets that specify the same geographic location.</p> <p>The value <code>*</code> in the <code>CountryCode</code> element matches all geographic locations that aren't specified in other geolocation resource record sets that have the same values for the <code>Name</code> and <code>Type</code> elements.</p> <important> <p>Geolocation works by mapping IP addresses to locations. However, some IP addresses aren't mapped to geographic locations, so even if you create geolocation resource record sets that cover all seven continents, Route 53 will receive some DNS queries from locations that it can't identify. We recommend that you create a resource record set for which the value of <code>CountryCode</code> is <code>*</code>, which handles both queries that come from locations for which you haven't created geolocation resource record sets and queries from IP addresses that aren't mapped to a location. If you don't create a <code>*</code> resource record set, Route 53 returns a \"no answer\" response for queries from those locations.</p> </important> <p>You can't create non-geolocation resource record sets that have the same values for the <code>Name</code> and <code>Type</code> elements as geolocation resource record sets.</p>"
+          "documentation":"<p> <i>Geolocation resource record sets only:</i> A complex type that lets you control how Amazon Route 53 responds to DNS queries based on the geographic origin of the query. For example, if you want all queries from Africa to be routed to a web server with an IP address of <code>192.0.2.111</code>, create a resource record set with a <code>Type</code> of <code>A</code> and a <code>ContinentCode</code> of <code>AF</code>.</p> <note> <p>Although creating geolocation and geolocation alias resource record sets in a private hosted zone is allowed, it's not supported.</p> </note> <p>If you create separate resource record sets for overlapping geographic regions (for example, one resource record set for a continent and one for a country on the same continent), priority goes to the smallest geographic region. This allows you to route most queries for a continent to one resource and to route queries for a country on that continent to a different resource.</p> <p>You can't create two geolocation resource record sets that specify the same geographic location.</p> <p>The value <code>*</code> in the <code>CountryCode</code> element matches all geographic locations that aren't specified in other geolocation resource record sets that have the same values for the <code>Name</code> and <code>Type</code> elements.</p> <important> <p>Geolocation works by mapping IP addresses to locations. However, some IP addresses aren't mapped to geographic locations, so even if you create geolocation resource record sets that cover all seven continents, Route 53 will receive some DNS queries from locations that it can't identify. We recommend that you create a resource record set for which the value of <code>CountryCode</code> is <code>*</code>. Two groups of queries are routed to the resource that you specify in this record: queries that come from locations for which you haven't created geolocation resource record sets and queries from IP addresses that aren't mapped to a location. If you don't create a <code>*</code> resource record set, Route 53 returns a \"no answer\" response for queries from those locations.</p> </important> <p>You can't create non-geolocation resource record sets that have the same values for the <code>Name</code> and <code>Type</code> elements as geolocation resource record sets.</p>"
         },
         "Failover":{
           "shape":"ResourceRecordSetFailover",
-          "documentation":"<p> <i>Failover resource record sets only:</i> To configure failover, you add the <code>Failover</code> element to two resource record sets. For one resource record set, you specify <code>PRIMARY</code> as the value for <code>Failover</code>; for the other resource record set, you specify <code>SECONDARY</code>. In addition, you include the <code>HealthCheckId</code> element and specify the health check that you want Amazon Route 53 to perform for each resource record set.</p> <p>Except where noted, the following failover behaviors assume that you have included the <code>HealthCheckId</code> element in both resource record sets:</p> <ul> <li> <p>When the primary resource record set is healthy, Route 53 responds to DNS queries with the applicable value from the primary resource record set regardless of the health of the secondary resource record set.</p> </li> <li> <p>When the primary resource record set is unhealthy and the secondary resource record set is healthy, Route 53 responds to DNS queries with the applicable value from the secondary resource record set.</p> </li> <li> <p>When the secondary resource record set is unhealthy, Route 53 responds to DNS queries with the applicable value from the primary resource record set regardless of the health of the primary resource record set.</p> </li> <li> <p>If you omit the <code>HealthCheckId</code> element for the secondary resource record set, and if the primary resource record set is unhealthy, Route 53 always responds to DNS queries with the applicable value from the secondary resource record set. This is true regardless of the health of the associated endpoint.</p> </li> </ul> <p>You can't create non-failover resource record sets that have the same values for the <code>Name</code> and <code>Type</code> elements as failover resource record sets.</p> <p>For failover alias resource record sets, you must also include the <code>EvaluateTargetHealth</code> element and set the value to true.</p> <p>For more information about configuring failover for Route 53, see the following topics in the <i>Amazon Route 53 Developer Guide</i>: </p> <ul> <li> <p> <a href=\"http://docs.aws.amazon.com/Route53/latest/DeveloperGuide/dns-failover.html\">Route 53 Health Checks and DNS Failover</a> </p> </li> <li> <p> <a href=\"http://docs.aws.amazon.com/Route53/latest/DeveloperGuide/dns-failover-private-hosted-zones.html\">Configuring Failover in a Private Hosted Zone</a> </p> </li> </ul>"
+          "documentation":"<p> <i>Failover resource record sets only:</i> To configure failover, you add the <code>Failover</code> element to two resource record sets. For one resource record set, you specify <code>PRIMARY</code> as the value for <code>Failover</code>; for the other resource record set, you specify <code>SECONDARY</code>. In addition, you include the <code>HealthCheckId</code> element and specify the health check that you want Amazon Route 53 to perform for each resource record set.</p> <p>Except where noted, the following failover behaviors assume that you have included the <code>HealthCheckId</code> element in both resource record sets:</p> <ul> <li> <p>When the primary resource record set is healthy, Route 53 responds to DNS queries with the applicable value from the primary resource record set regardless of the health of the secondary resource record set.</p> </li> <li> <p>When the primary resource record set is unhealthy and the secondary resource record set is healthy, Route 53 responds to DNS queries with the applicable value from the secondary resource record set.</p> </li> <li> <p>When the secondary resource record set is unhealthy, Route 53 responds to DNS queries with the applicable value from the primary resource record set regardless of the health of the primary resource record set.</p> </li> <li> <p>If you omit the <code>HealthCheckId</code> element for the secondary resource record set, and if the primary resource record set is unhealthy, Route 53 always responds to DNS queries with the applicable value from the secondary resource record set. This is true regardless of the health of the associated endpoint.</p> </li> </ul> <p>You can't create non-failover resource record sets that have the same values for the <code>Name</code> and <code>Type</code> elements as failover resource record sets.</p> <p>For failover alias resource record sets, you must also include the <code>EvaluateTargetHealth</code> element and set the value to true.</p> <p>For more information about configuring failover for Route 53, see the following topics in the <i>Amazon Route 53 Developer Guide</i>: </p> <ul> <li> <p> <a href=\"https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/dns-failover.html\">Route 53 Health Checks and DNS Failover</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/dns-failover-private-hosted-zones.html\">Configuring Failover in a Private Hosted Zone</a> </p> </li> </ul>"
         },
         "MultiValueAnswer":{
           "shape":"ResourceRecordSetMultiValueAnswer",
@@ -4214,11 +4214,11 @@
         },
         "AliasTarget":{
           "shape":"AliasTarget",
-          "documentation":"<p> <i>Alias resource record sets only:</i> Information about the AWS resource, such as a CloudFront distribution or an Amazon S3 bucket, that you want to route traffic to. </p> <p>If you're creating resource records sets for a private hosted zone, note the following:</p> <ul> <li> <p>You can't create an alias resource record set in a private hosted zone to route traffic to a CloudFront distribution.</p> </li> <li> <p>Creating geolocation alias resource record sets or latency alias resource record sets in a private hosted zone is unsupported.</p> </li> <li> <p>For information about creating failover resource record sets in a private hosted zone, see <a href=\"http://docs.aws.amazon.com/Route53/latest/DeveloperGuide/dns-failover-private-hosted-zones.html\">Configuring Failover in a Private Hosted Zone</a> in the <i>Amazon Route 53 Developer Guide</i>.</p> </li> </ul>"
+          "documentation":"<p> <i>Alias resource record sets only:</i> Information about the AWS resource, such as a CloudFront distribution or an Amazon S3 bucket, that you want to route traffic to. </p> <p>If you're creating resource records sets for a private hosted zone, note the following:</p> <ul> <li> <p>You can't create an alias resource record set in a private hosted zone to route traffic to a CloudFront distribution.</p> </li> <li> <p>Creating geolocation alias resource record sets or latency alias resource record sets in a private hosted zone is unsupported.</p> </li> <li> <p>For information about creating failover resource record sets in a private hosted zone, see <a href=\"https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/dns-failover-private-hosted-zones.html\">Configuring Failover in a Private Hosted Zone</a> in the <i>Amazon Route 53 Developer Guide</i>.</p> </li> </ul>"
         },
         "HealthCheckId":{
           "shape":"HealthCheckId",
-          "documentation":"<p>If you want Amazon Route 53 to return this resource record set in response to a DNS query only when the status of a health check is healthy, include the <code>HealthCheckId</code> element and specify the ID of the applicable health check.</p> <p>Route 53 determines whether a resource record set is healthy based on one of the following:</p> <ul> <li> <p>By periodically sending a request to the endpoint that is specified in the health check</p> </li> <li> <p>By aggregating the status of a specified group of health checks (calculated health checks)</p> </li> <li> <p>By determining the current state of a CloudWatch alarm (CloudWatch metric health checks)</p> </li> </ul> <important> <p>Route 53 doesn't check the health of the endpoint that is specified in the resource record set, for example, the endpoint specified by the IP address in the <code>Value</code> element. When you add a <code>HealthCheckId</code> element to a resource record set, Route 53 checks the health of the endpoint that you specified in the health check. </p> </important> <p>For more information, see the following topics in the <i>Amazon Route 53 Developer Guide</i>:</p> <ul> <li> <p> <a href=\"https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/dns-failover-determining-health-of-endpoints.html\">How Amazon Route 53 Determines Whether an Endpoint Is Healthy</a> </p> </li> <li> <p> <a href=\"http://docs.aws.amazon.com/Route53/latest/DeveloperGuide/dns-failover.html\">Route 53 Health Checks and DNS Failover</a> </p> </li> <li> <p> <a href=\"http://docs.aws.amazon.com/Route53/latest/DeveloperGuide/dns-failover-private-hosted-zones.html\">Configuring Failover in a Private Hosted Zone</a> </p> </li> </ul> <p> <b>When to Specify HealthCheckId</b> </p> <p>Specifying a value for <code>HealthCheckId</code> is useful only when Route 53 is choosing between two or more resource record sets to respond to a DNS query, and you want Route 53 to base the choice in part on the status of a health check. Configuring health checks makes sense only in the following configurations:</p> <ul> <li> <p> <b>Non-alias resource record sets</b>: You're checking the health of a group of non-alias resource record sets that have the same routing policy, name, and type (such as multiple weighted records named www.example.com with a type of A) and you specify health check IDs for all the resource record sets. </p> <p>If the health check status for a resource record set is healthy, Route 53 includes the record among the records that it responds to DNS queries with.</p> <p>If the health check status for a resource record set is unhealthy, Route 53 stops responding to DNS queries using the value for that resource record set.</p> <p>If the health check status for all resource record sets in the group is unhealthy, Route 53 considers all resource record sets in the group healthy and responds to DNS queries accordingly. </p> </li> <li> <p> <b>Alias resource record sets</b>: You specify the following settings:</p> <ul> <li> <p>You set <code>EvaluateTargetHealth</code> to true for an alias resource record set in a group of resource record sets that have the same routing policy, name, and type (such as multiple weighted records named www.example.com with a type of A). </p> </li> <li> <p>You configure the alias resource record set to route traffic to a non-alias resource record set in the same hosted zone.</p> </li> <li> <p>You specify a health check ID for the non-alias resource record set. </p> </li> </ul> <p>If the health check status is healthy, Route 53 considers the alias resource record set to be healthy and includes the alias record among the records that it responds to DNS queries with.</p> <p>If the health check status is unhealthy, Route 53 stops responding to DNS queries using the alias resource record set.</p> <note> <p>The alias resource record set can also route traffic to a <i>group</i> of non-alias resource record sets that have the same routing policy, name, and type. In that configuration, associate health checks with all of the resource record sets in the group of non-alias resource record sets.</p> </note> </li> </ul> <p> <b>Geolocation Routing</b> </p> <p>For geolocation resource record sets, if an endpoint is unhealthy, Route 53 looks for a resource record set for the larger, associated geographic region. For example, suppose you have resource record sets for a state in the United States, for the entire United States, for North America, and a resource record set that has <code>*</code> for <code>CountryCode</code> is <code>*</code>, which applies to all locations. If the endpoint for the state resource record set is unhealthy, Route 53 checks for healthy resource record sets in the following order until it finds a resource record set for which the endpoint is healthy:</p> <ul> <li> <p>The United States</p> </li> <li> <p>North America</p> </li> <li> <p>The default resource record set</p> </li> </ul> <p> <b>Specifying the Health Check Endpoint by Domain Name</b> </p> <p>If your health checks specify the endpoint only by domain name, we recommend that you create a separate health check for each endpoint. For example, create a health check for each <code>HTTP</code> server that is serving content for <code>www.example.com</code>. For the value of <code>FullyQualifiedDomainName</code>, specify the domain name of the server (such as <code>us-east-2-www.example.com</code>), not the name of the resource record sets (<code>www.example.com</code>).</p> <important> <p>Health check results will be unpredictable if you do the following:</p> <ul> <li> <p>Create a health check that has the same value for <code>FullyQualifiedDomainName</code> as the name of a resource record set.</p> </li> <li> <p>Associate that health check with the resource record set.</p> </li> </ul> </important>"
+          "documentation":"<p>If you want Amazon Route 53 to return this resource record set in response to a DNS query only when the status of a health check is healthy, include the <code>HealthCheckId</code> element and specify the ID of the applicable health check.</p> <p>Route 53 determines whether a resource record set is healthy based on one of the following:</p> <ul> <li> <p>By periodically sending a request to the endpoint that is specified in the health check</p> </li> <li> <p>By aggregating the status of a specified group of health checks (calculated health checks)</p> </li> <li> <p>By determining the current state of a CloudWatch alarm (CloudWatch metric health checks)</p> </li> </ul> <important> <p>Route 53 doesn't check the health of the endpoint that is specified in the resource record set, for example, the endpoint specified by the IP address in the <code>Value</code> element. When you add a <code>HealthCheckId</code> element to a resource record set, Route 53 checks the health of the endpoint that you specified in the health check. </p> </important> <p>For more information, see the following topics in the <i>Amazon Route 53 Developer Guide</i>:</p> <ul> <li> <p> <a href=\"https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/dns-failover-determining-health-of-endpoints.html\">How Amazon Route 53 Determines Whether an Endpoint Is Healthy</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/dns-failover.html\">Route 53 Health Checks and DNS Failover</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/dns-failover-private-hosted-zones.html\">Configuring Failover in a Private Hosted Zone</a> </p> </li> </ul> <p> <b>When to Specify HealthCheckId</b> </p> <p>Specifying a value for <code>HealthCheckId</code> is useful only when Route 53 is choosing between two or more resource record sets to respond to a DNS query, and you want Route 53 to base the choice in part on the status of a health check. Configuring health checks makes sense only in the following configurations:</p> <ul> <li> <p> <b>Non-alias resource record sets</b>: You're checking the health of a group of non-alias resource record sets that have the same routing policy, name, and type (such as multiple weighted records named www.example.com with a type of A) and you specify health check IDs for all the resource record sets. </p> <p>If the health check status for a resource record set is healthy, Route 53 includes the record among the records that it responds to DNS queries with.</p> <p>If the health check status for a resource record set is unhealthy, Route 53 stops responding to DNS queries using the value for that resource record set.</p> <p>If the health check status for all resource record sets in the group is unhealthy, Route 53 considers all resource record sets in the group healthy and responds to DNS queries accordingly. </p> </li> <li> <p> <b>Alias resource record sets</b>: You specify the following settings:</p> <ul> <li> <p>You set <code>EvaluateTargetHealth</code> to true for an alias resource record set in a group of resource record sets that have the same routing policy, name, and type (such as multiple weighted records named www.example.com with a type of A). </p> </li> <li> <p>You configure the alias resource record set to route traffic to a non-alias resource record set in the same hosted zone.</p> </li> <li> <p>You specify a health check ID for the non-alias resource record set. </p> </li> </ul> <p>If the health check status is healthy, Route 53 considers the alias resource record set to be healthy and includes the alias record among the records that it responds to DNS queries with.</p> <p>If the health check status is unhealthy, Route 53 stops responding to DNS queries using the alias resource record set.</p> <note> <p>The alias resource record set can also route traffic to a <i>group</i> of non-alias resource record sets that have the same routing policy, name, and type. In that configuration, associate health checks with all of the resource record sets in the group of non-alias resource record sets.</p> </note> </li> </ul> <p> <b>Geolocation Routing</b> </p> <p>For geolocation resource record sets, if an endpoint is unhealthy, Route 53 looks for a resource record set for the larger, associated geographic region. For example, suppose you have resource record sets for a state in the United States, for the entire United States, for North America, and a resource record set that has <code>*</code> for <code>CountryCode</code> is <code>*</code>, which applies to all locations. If the endpoint for the state resource record set is unhealthy, Route 53 checks for healthy resource record sets in the following order until it finds a resource record set for which the endpoint is healthy:</p> <ul> <li> <p>The United States</p> </li> <li> <p>North America</p> </li> <li> <p>The default resource record set</p> </li> </ul> <p> <b>Specifying the Health Check Endpoint by Domain Name</b> </p> <p>If your health checks specify the endpoint only by domain name, we recommend that you create a separate health check for each endpoint. For example, create a health check for each <code>HTTP</code> server that is serving content for <code>www.example.com</code>. For the value of <code>FullyQualifiedDomainName</code>, specify the domain name of the server (such as <code>us-east-2-www.example.com</code>), not the name of the resource record sets (<code>www.example.com</code>).</p> <important> <p>Health check results will be unpredictable if you do the following:</p> <ul> <li> <p>Create a health check that has the same value for <code>FullyQualifiedDomainName</code> as the name of a resource record set.</p> </li> <li> <p>Associate that health check with the resource record set.</p> </li> </ul> </important>"
         },
         "TrafficPolicyInstanceId":{
           "shape":"TrafficPolicyInstanceId",
@@ -4840,7 +4840,7 @@
         },
         "Port":{
           "shape":"Port",
-          "documentation":"<p>The port on the endpoint on which you want Amazon Route 53 to perform health checks.</p>"
+          "documentation":"<p>The port on the endpoint that you want Amazon Route 53 to perform health checks on.</p> <note> <p>Don't specify a value for <code>Port</code> when you specify a value for <code>Type</code> of <code>CLOUDWATCH_METRIC</code> or <code>CALCULATED</code>.</p> </note>"
         },
         "ResourcePath":{
           "shape":"ResourcePath",
@@ -4852,11 +4852,11 @@
         },
         "SearchString":{
           "shape":"SearchString",
-          "documentation":"<p>If the value of <code>Type</code> is <code>HTTP_STR_MATCH</code> or <code>HTTP_STR_MATCH</code>, the string that you want Amazon Route 53 to search for in the response body from the specified resource. If the string appears in the response body, Route 53 considers the resource healthy. (You can't change the value of <code>Type</code> when you update a health check.)</p>"
+          "documentation":"<p>If the value of <code>Type</code> is <code>HTTP_STR_MATCH</code> or <code>HTTPS_STR_MATCH</code>, the string that you want Amazon Route 53 to search for in the response body from the specified resource. If the string appears in the response body, Route 53 considers the resource healthy. (You can't change the value of <code>Type</code> when you update a health check.)</p>"
         },
         "FailureThreshold":{
           "shape":"FailureThreshold",
-          "documentation":"<p>The number of consecutive health checks that an endpoint must pass or fail for Amazon Route 53 to change the current status of the endpoint from unhealthy to healthy or vice versa. For more information, see <a href=\"http://docs.aws.amazon.com/Route53/latest/DeveloperGuide/dns-failover-determining-health-of-endpoints.html\">How Amazon Route 53 Determines Whether an Endpoint Is Healthy</a> in the <i>Amazon Route 53 Developer Guide</i>.</p> <p>If you don't specify a value for <code>FailureThreshold</code>, the default value is three health checks.</p>"
+          "documentation":"<p>The number of consecutive health checks that an endpoint must pass or fail for Amazon Route 53 to change the current status of the endpoint from unhealthy to healthy or vice versa. For more information, see <a href=\"https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/dns-failover-determining-health-of-endpoints.html\">How Amazon Route 53 Determines Whether an Endpoint Is Healthy</a> in the <i>Amazon Route 53 Developer Guide</i>.</p> <p>If you don't specify a value for <code>FailureThreshold</code>, the default value is three health checks.</p>"
         },
         "Inverted":{
           "shape":"Inverted",
diff --git a/services/route53/src/test/java/software/amazon/awssdk/services/route53/QueryParamBindingTest.java b/services/route53/src/test/java/software/amazon/awssdk/services/route53/QueryParamBindingTest.java
index f3035c3cd547..29813c77ea81 100644
--- a/services/route53/src/test/java/software/amazon/awssdk/services/route53/QueryParamBindingTest.java
+++ b/services/route53/src/test/java/software/amazon/awssdk/services/route53/QueryParamBindingTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/route53/src/test/java/software/amazon/awssdk/services/route53/Route53InterceptorTest.java b/services/route53/src/test/java/software/amazon/awssdk/services/route53/Route53InterceptorTest.java
index a9763a50347f..2a12ae824889 100644
--- a/services/route53/src/test/java/software/amazon/awssdk/services/route53/Route53InterceptorTest.java
+++ b/services/route53/src/test/java/software/amazon/awssdk/services/route53/Route53InterceptorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/route53/src/test/resources/cucumber.properties b/services/route53/src/test/resources/cucumber.properties
index 2c7536e8774d..89f7b584c7f7 100644
--- a/services/route53/src/test/resources/cucumber.properties
+++ b/services/route53/src/test/resources/cucumber.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/route53/src/test/resources/log4j.properties b/services/route53/src/test/resources/log4j.properties
index 0cf0351a8c67..06eb3e302162 100644
--- a/services/route53/src/test/resources/log4j.properties
+++ b/services/route53/src/test/resources/log4j.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/route53domains/pom.xml b/services/route53domains/pom.xml
index 9c2784f4d879..ddbb59896b20 100644
--- a/services/route53domains/pom.xml
+++ b/services/route53domains/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -22,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>route53domains</artifactId>
     <name>AWS Java SDK :: Services :: Amazon Route53 Domains</name>
diff --git a/services/route53resolver/pom.xml b/services/route53resolver/pom.xml
index 9e509440c4ec..b2563060e911 100644
--- a/services/route53resolver/pom.xml
+++ b/services/route53resolver/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>route53resolver</artifactId>
     <name>AWS Java SDK :: Services :: Route53Resolver</name>
diff --git a/services/s3/build.properties b/services/s3/build.properties
index ecf2dae6fcb1..15ec2da1fc71 100644
--- a/services/s3/build.properties
+++ b/services/s3/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/s3/pom.xml b/services/s3/pom.xml
index b72a0b13def6..d4764cbcf178 100644
--- a/services/s3/pom.xml
+++ b/services/s3/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>s3</artifactId>
     <name>AWS Java SDK :: Services :: Amazon S3</name>
@@ -56,6 +56,16 @@
             <artifactId>protocol-core</artifactId>
             <version>${awsjavasdk.version}</version>
         </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>arns</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>profiles</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
         <!-- Test Dependencies -->
         <dependency>
             <artifactId>commons-io</artifactId>
@@ -80,10 +90,27 @@
             <version>${awsjavasdk.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <artifactId>s3control</artifactId>
+            <groupId>software.amazon.awssdk</groupId>
+            <version>${awsjavasdk.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <artifactId>kms</artifactId>
+            <groupId>software.amazon.awssdk</groupId>
+            <version>${awsjavasdk.version}</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>com.github.tomakehurst</groupId>
+            <artifactId>wiremock</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 </project>
diff --git a/services/s3/src/it/java/software/amazon/awssdk/services/s3/AccessPointsIntegrationTest.java b/services/s3/src/it/java/software/amazon/awssdk/services/s3/AccessPointsIntegrationTest.java
new file mode 100644
index 000000000000..8dee1096fa22
--- /dev/null
+++ b/services/s3/src/it/java/software/amazon/awssdk/services/s3/AccessPointsIntegrationTest.java
@@ -0,0 +1,109 @@
+/*
+ * 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.
+ */
+package software.amazon.awssdk.services.s3;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static software.amazon.awssdk.testutils.service.S3BucketUtils.temporaryBucketName;
+
+import java.util.StringJoiner;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import software.amazon.awssdk.core.sync.RequestBody;
+import software.amazon.awssdk.regions.Region;
+import software.amazon.awssdk.services.s3.model.GetObjectRequest;
+import software.amazon.awssdk.services.s3.model.PutObjectRequest;
+import software.amazon.awssdk.services.s3control.S3ControlClient;
+import software.amazon.awssdk.services.sts.StsClient;
+
+public class AccessPointsIntegrationTest extends S3IntegrationTestBase {
+
+    private static final String BUCKET = temporaryBucketName(AccessPointsIntegrationTest.class);
+
+    private static final String AP_NAME = "java-sdk-" + System.currentTimeMillis();
+
+    private static final String KEY = "some-key";
+
+    private static S3ControlClient s3control;
+
+    private static StsClient sts;
+
+    private static String accountId;
+
+    @BeforeClass
+    public static void setupFixture() {
+        createBucket(BUCKET);
+
+        s3control = S3ControlClient.builder()
+                                   .region(Region.US_WEST_2)
+                                   .credentialsProvider(CREDENTIALS_PROVIDER_CHAIN)
+                                   .build();
+
+        sts = StsClient.builder()
+                       .region(Region.US_WEST_2)
+                       .credentialsProvider(CREDENTIALS_PROVIDER_CHAIN)
+                       .build();
+
+        accountId = sts.getCallerIdentity().account();
+        s3control.createAccessPoint(r -> r.accountId(accountId)
+                                          .bucket(BUCKET)
+                                          .name(AP_NAME));
+    }
+
+    @AfterClass
+    public static void tearDown() {
+        deleteBucketAndAllContents(BUCKET);
+        s3control.deleteAccessPoint(b -> b.accountId(accountId).name(AP_NAME));
+    }
+
+    @Test
+    public void transfer_Succeeds_UsingAccessPoint() {
+        StringJoiner apArn = new StringJoiner(":");
+        apArn.add("arn").add("aws").add("s3").add("us-west-2").add(accountId).add("accesspoint").add(AP_NAME);
+
+        s3.putObject(PutObjectRequest.builder()
+                                     .bucket(apArn.toString())
+                                     .key(KEY)
+                                     .build(), RequestBody.fromString("helloworld"));
+
+        String objectContent = s3.getObjectAsBytes(GetObjectRequest.builder()
+                                                                   .bucket(apArn.toString())
+                                                                   .key(KEY)
+                                                                   .build()).asUtf8String();
+
+        assertThat(objectContent).isEqualTo("helloworld");
+    }
+
+    @Test
+    public void transfer_Succeeds_UsingAccessPoint_CrossRegion() {
+        S3Client s3DifferentRegion =
+            s3ClientBuilder().region(Region.US_EAST_1).serviceConfiguration(c -> c.useArnRegionEnabled(true)).build();
+
+        StringJoiner apArn = new StringJoiner(":");
+        apArn.add("arn").add("aws").add("s3").add("us-west-2").add(accountId).add("accesspoint").add(AP_NAME);
+
+        s3DifferentRegion.putObject(PutObjectRequest.builder()
+                                                    .bucket(apArn.toString())
+                                                    .key(KEY)
+                                                    .build(), RequestBody.fromString("helloworld"));
+
+        String objectContent = s3DifferentRegion.getObjectAsBytes(GetObjectRequest.builder()
+                                                                                  .bucket(apArn.toString())
+                                                                                  .key(KEY)
+                                                                                  .build()).asUtf8String();
+
+        assertThat(objectContent).isEqualTo("helloworld");
+    }
+}
diff --git a/services/s3/src/it/java/software/amazon/awssdk/services/s3/AclIntegrationTest.java b/services/s3/src/it/java/software/amazon/awssdk/services/s3/AclIntegrationTest.java
index f9170c5743d8..c5bb38836cc8 100644
--- a/services/s3/src/it/java/software/amazon/awssdk/services/s3/AclIntegrationTest.java
+++ b/services/s3/src/it/java/software/amazon/awssdk/services/s3/AclIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -16,13 +16,11 @@
 package software.amazon.awssdk.services.s3;
 
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertNotNull;
 import static software.amazon.awssdk.testutils.service.S3BucketUtils.temporaryBucketName;
 
-import java.io.File;
-import java.util.List;
 import java.util.function.Consumer;
-import java.util.stream.Collectors;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -30,9 +28,7 @@
 import software.amazon.awssdk.services.s3.model.AccessControlPolicy;
 import software.amazon.awssdk.services.s3.model.GetBucketAclResponse;
 import software.amazon.awssdk.services.s3.model.GetObjectAclResponse;
-import software.amazon.awssdk.services.s3.model.Grant;
 import software.amazon.awssdk.services.s3.model.PutObjectRequest;
-import software.amazon.awssdk.services.s3.model.Type;
 
 public class AclIntegrationTest extends S3IntegrationTestBase {
 
@@ -55,10 +51,12 @@ public static void deleteAllBuckets() {
     }
 
     @Test
-    public void putObjectAcl() {
+    public void putGetObjectAcl() {
         GetObjectAclResponse objectAcl = s3.getObjectAcl(b -> b.bucket(BUCKET).key(KEY));
+        GetObjectAclResponse objectAclAsyncResponse = s3Async.getObjectAcl(b -> b.bucket(BUCKET).key(KEY)).join();
+        assertThat(objectAcl.equalsBySdkFields(objectAclAsyncResponse)).isTrue();
         Consumer<AccessControlPolicy.Builder> aclBuilder = a -> a.owner(objectAcl.owner())
-                                                                 .grants(addGranteeType(objectAcl.grants()));
+                                                                 .grants(objectAcl.grants());
 
 
         assertNotNull(s3.putObjectAcl(b -> b.bucket(BUCKET)
@@ -71,24 +69,16 @@ public void putObjectAcl() {
     }
 
     @Test
-    public void putBucketAcl() {
+    public void putGetBucketAcl() {
         GetBucketAclResponse bucketAcl = s3.getBucketAcl(b -> b.bucket(BUCKET));
+        GetBucketAclResponse bucketAclAsyncResponse = s3Async.getBucketAcl(b -> b.bucket(BUCKET)).join();
+        assertThat(bucketAcl.equalsBySdkFields(bucketAclAsyncResponse)).isTrue();
         Consumer<AccessControlPolicy.Builder> aclBuilder = a -> a.owner(bucketAcl.owner())
-                                                                 .grants(addGranteeType(bucketAcl.grants()));
+                                                                 .grants(bucketAcl.grants());
         assertNotNull(s3.putBucketAcl(b -> b.bucket(BUCKET)
                                             .accessControlPolicy(aclBuilder)));
         assertNotNull(s3Async.putBucketAcl(b -> b.bucket(BUCKET)
                                                  .accessControlPolicy(aclBuilder)).join());
 
     }
-
-    //TODO: remove this once we fix the unmarshalling issue for Grant#type
-    private List<Grant> addGranteeType(List<Grant> grants) {
-        return grants.stream().map(g -> g.toBuilder().grantee(g.grantee()
-                                                               .toBuilder()
-                                                               .type(Type.CANONICAL_USER)
-                                                               .build()).build())
-                     .collect(Collectors.toList());
-    }
-
 }
diff --git a/services/s3/src/it/java/software/amazon/awssdk/services/s3/AsyncGetObjectFaultIntegrationTest.java b/services/s3/src/it/java/software/amazon/awssdk/services/s3/AsyncGetObjectFaultIntegrationTest.java
index 207dcedd5293..6b3972c2f190 100644
--- a/services/s3/src/it/java/software/amazon/awssdk/services/s3/AsyncGetObjectFaultIntegrationTest.java
+++ b/services/s3/src/it/java/software/amazon/awssdk/services/s3/AsyncGetObjectFaultIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/s3/src/it/java/software/amazon/awssdk/services/s3/AsyncResponseTransformerIntegrationTest.java b/services/s3/src/it/java/software/amazon/awssdk/services/s3/AsyncResponseTransformerIntegrationTest.java
index 58fde0a96955..945ac902af8e 100644
--- a/services/s3/src/it/java/software/amazon/awssdk/services/s3/AsyncResponseTransformerIntegrationTest.java
+++ b/services/s3/src/it/java/software/amazon/awssdk/services/s3/AsyncResponseTransformerIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/s3/src/it/java/software/amazon/awssdk/services/s3/AsyncServerSideEncryptionIntegrationTest.java b/services/s3/src/it/java/software/amazon/awssdk/services/s3/AsyncServerSideEncryptionIntegrationTest.java
index 43d59c593ad8..70241622f610 100644
--- a/services/s3/src/it/java/software/amazon/awssdk/services/s3/AsyncServerSideEncryptionIntegrationTest.java
+++ b/services/s3/src/it/java/software/amazon/awssdk/services/s3/AsyncServerSideEncryptionIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -14,47 +14,21 @@
  */
 package software.amazon.awssdk.services.s3;
 
-import static org.assertj.core.api.Fail.fail;
 import static software.amazon.awssdk.services.s3.model.ServerSideEncryption.AES256;
-import static software.amazon.awssdk.testutils.service.S3BucketUtils.temporaryBucketName;
 
-import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.security.SecureRandom;
 import java.util.Base64;
 import java.util.UUID;
-import javax.crypto.KeyGenerator;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
 import org.junit.Test;
 import software.amazon.awssdk.core.async.AsyncResponseTransformer;
 import software.amazon.awssdk.services.s3.model.GetObjectRequest;
 import software.amazon.awssdk.services.s3.model.PutObjectRequest;
 import software.amazon.awssdk.services.s3.model.ServerSideEncryption;
-import software.amazon.awssdk.testutils.RandomTempFile;
 import software.amazon.awssdk.testutils.SdkAsserts;
 import software.amazon.awssdk.utils.Md5Utils;
 
-public class AsyncServerSideEncryptionIntegrationTest extends S3IntegrationTestBase {
-    
-    private static final String BUCKET = temporaryBucketName(GetObjectIntegrationTest.class);
-
-    private static File file;
-
-    @BeforeClass
-    public static void setupFixture() throws IOException {
-        createBucket(BUCKET);
-        file = new RandomTempFile(10_000);
-    }
-
-    @AfterClass
-    public static void tearDownFixture() {
-        deleteBucketAndAllContents(BUCKET);
-        file.delete();
-    }
-
+public class AsyncServerSideEncryptionIntegrationTest extends ServerSideEncryptionIntegrationTestBase {
     @Test
     public void sse_AES256_succeeds() throws FileNotFoundException {
         String key = UUID.randomUUID().toString();
@@ -121,20 +95,27 @@ public void sse_customerManaged_succeeds() throws FileNotFoundException {
         verifyGetResponse(getObjectRequest);
     }
 
+    @Test
+    public void sse_onBucket_succeeds() throws FileNotFoundException {
+        String key = UUID.randomUUID().toString();
+
+        PutObjectRequest request = PutObjectRequest.builder()
+                                                   .key(key)
+                                                   .bucket(BUCKET_WITH_SSE)
+                                                   .build();
+
+        s3Async.putObject(request, file.toPath()).join();
+
+        GetObjectRequest getObjectRequest = GetObjectRequest.builder()
+                                                            .key(key)
+                                                            .bucket(BUCKET_WITH_SSE)
+                                                            .build();
+
+        verifyGetResponse(getObjectRequest);
+    }
+
     private void verifyGetResponse(GetObjectRequest getObjectRequest) throws FileNotFoundException {
         String response = s3Async.getObject(getObjectRequest, AsyncResponseTransformer.toBytes()).join().asUtf8String();
         SdkAsserts.assertStringEqualsStream(response, new FileInputStream(file));
     }
-
-    private static byte[] generateSecretKey() {
-        KeyGenerator generator;
-        try {
-            generator = KeyGenerator.getInstance("AES");
-            generator.init(256, new SecureRandom());
-            return generator.generateKey().getEncoded();
-        } catch (Exception e) {
-            fail("Unable to generate symmetric key: " + e.getMessage());
-            return null;
-        }
-    }    
 }
diff --git a/services/s3/src/it/java/software/amazon/awssdk/services/s3/AsyncUploadMultiplePartIntegrationTest.java b/services/s3/src/it/java/software/amazon/awssdk/services/s3/AsyncUploadMultiplePartIntegrationTest.java
index 36e942dad25e..09445bc16ee9 100644
--- a/services/s3/src/it/java/software/amazon/awssdk/services/s3/AsyncUploadMultiplePartIntegrationTest.java
+++ b/services/s3/src/it/java/software/amazon/awssdk/services/s3/AsyncUploadMultiplePartIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/s3/src/it/java/software/amazon/awssdk/services/s3/BucketAccelerateIntegrationTest.java b/services/s3/src/it/java/software/amazon/awssdk/services/s3/BucketAccelerateIntegrationTest.java
index 79cf1b963a72..cee5a393032a 100644
--- a/services/s3/src/it/java/software/amazon/awssdk/services/s3/BucketAccelerateIntegrationTest.java
+++ b/services/s3/src/it/java/software/amazon/awssdk/services/s3/BucketAccelerateIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/s3/src/it/java/software/amazon/awssdk/services/s3/BucketAnalyticsConfigurationIntegrationTest.java b/services/s3/src/it/java/software/amazon/awssdk/services/s3/BucketAnalyticsConfigurationIntegrationTest.java
index 1b155687aa2b..c9062ccadd55 100644
--- a/services/s3/src/it/java/software/amazon/awssdk/services/s3/BucketAnalyticsConfigurationIntegrationTest.java
+++ b/services/s3/src/it/java/software/amazon/awssdk/services/s3/BucketAnalyticsConfigurationIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/s3/src/it/java/software/amazon/awssdk/services/s3/BucketInventoryConfigurationIntegrationTest.java b/services/s3/src/it/java/software/amazon/awssdk/services/s3/BucketInventoryConfigurationIntegrationTest.java
index ab2298268e79..9a866d8b5768 100644
--- a/services/s3/src/it/java/software/amazon/awssdk/services/s3/BucketInventoryConfigurationIntegrationTest.java
+++ b/services/s3/src/it/java/software/amazon/awssdk/services/s3/BucketInventoryConfigurationIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/s3/src/it/java/software/amazon/awssdk/services/s3/CopyObjectIntegrationTest.java b/services/s3/src/it/java/software/amazon/awssdk/services/s3/CopyObjectIntegrationTest.java
index 3f73265db1ba..2e956d06538d 100644
--- a/services/s3/src/it/java/software/amazon/awssdk/services/s3/CopyObjectIntegrationTest.java
+++ b/services/s3/src/it/java/software/amazon/awssdk/services/s3/CopyObjectIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/s3/src/it/java/software/amazon/awssdk/services/s3/CreateBucketIntegrationTest.java b/services/s3/src/it/java/software/amazon/awssdk/services/s3/CreateBucketIntegrationTest.java
index 902f2589b7c5..f83d504bb2ef 100644
--- a/services/s3/src/it/java/software/amazon/awssdk/services/s3/CreateBucketIntegrationTest.java
+++ b/services/s3/src/it/java/software/amazon/awssdk/services/s3/CreateBucketIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -21,8 +21,8 @@
 import org.junit.Test;
 import software.amazon.awssdk.regions.Region;
 import software.amazon.awssdk.services.s3.model.CreateBucketRequest;
-import software.amazon.awssdk.services.s3.model.GetBucketLocationRequest;
 import software.amazon.awssdk.services.s3.utils.S3TestUtils;
+import software.amazon.awssdk.testutils.Waiter;
 
 public class CreateBucketIntegrationTest extends S3IntegrationTestBase {
 
@@ -44,9 +44,8 @@ public static void cleanup() {
     public void createBucket_InUsEast1_Succeeds() {
         US_EAST_1_CLIENT.createBucket(CreateBucketRequest.builder().bucket(US_EAST_1_BUCKET_NAME).build());
 
-        String region = US_EAST_1_CLIENT.getBucketLocation(GetBucketLocationRequest.builder()
-                                                                         .bucket(US_EAST_1_BUCKET_NAME)
-                                                                         .build())
+        String region = Waiter.run(() -> US_EAST_1_CLIENT.getBucketLocation(r -> r.bucket(US_EAST_1_BUCKET_NAME)))
+                              .orFail()
                               .locationConstraintAsString();
         assertThat(region).isEqualToIgnoringCase("");
     }
@@ -56,7 +55,9 @@ public void createBucket_Succeeds_WithoutSpecifyingBucketLocation() {
         S3Client client = S3Client.builder().region(Region.US_WEST_2).credentialsProvider(CREDENTIALS_PROVIDER_CHAIN).build();
         client.createBucket(CreateBucketRequest.builder().bucket(BUCKET_NAME).build());
 
-        String region = client.getBucketLocation(GetBucketLocationRequest.builder().bucket(BUCKET_NAME).build()).locationConstraintAsString();
+        String region = Waiter.run(() -> client.getBucketLocation(r -> r.bucket(BUCKET_NAME)))
+                              .orFail()
+                              .locationConstraintAsString();
         assertThat(region).isEqualToIgnoringCase("us-west-2");
     }
 
diff --git a/services/s3/src/it/java/software/amazon/awssdk/services/s3/ExceptionUnmarshallingIntegrationTest.java b/services/s3/src/it/java/software/amazon/awssdk/services/s3/ExceptionUnmarshallingIntegrationTest.java
index cd2c158e8d30..f16a21ff5039 100644
--- a/services/s3/src/it/java/software/amazon/awssdk/services/s3/ExceptionUnmarshallingIntegrationTest.java
+++ b/services/s3/src/it/java/software/amazon/awssdk/services/s3/ExceptionUnmarshallingIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -19,8 +19,11 @@
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static software.amazon.awssdk.testutils.service.S3BucketUtils.temporaryBucketName;
 
+import java.nio.charset.StandardCharsets;
+
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
+import org.junit.Ignore;
 import org.junit.Test;
 import software.amazon.awssdk.regions.Region;
 import software.amazon.awssdk.services.s3.model.BucketAlreadyExistsException;
@@ -163,6 +166,17 @@ public void asyncHeadBucketWrongRegion() {
           .satisfies(e -> assertThat(((S3Exception) (e.getCause())).statusCode()).isEqualTo(301));
     }
 
+    @Test
+    @Ignore("TODO")
+    public void errorResponseContainsRawBytes() {
+        assertThatThrownBy(() -> s3.getObjectAcl(b -> b.bucket(BUCKET + KEY).key(KEY)))
+            .isInstanceOf(NoSuchBucketException.class)
+            .satisfies(e -> assertThat(
+                ((NoSuchBucketException) e).awsErrorDetails().rawResponse().asString(StandardCharsets.UTF_8))
+                .startsWith("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<Error><Code>NoSuchBucket</Code><Message>The "
+                            + "specified bucket does not exist</Message>"));
+    }
+
     private void assertMetadata(S3Exception e, String expectedErrorCode) {
         assertThat(e.awsErrorDetails()).satisfies(
             errorDetails -> {
diff --git a/services/s3/src/it/java/software/amazon/awssdk/services/s3/GetObjectAsyncIntegrationTest.java b/services/s3/src/it/java/software/amazon/awssdk/services/s3/GetObjectAsyncIntegrationTest.java
index 356ae78fa893..eb8a07a08aae 100644
--- a/services/s3/src/it/java/software/amazon/awssdk/services/s3/GetObjectAsyncIntegrationTest.java
+++ b/services/s3/src/it/java/software/amazon/awssdk/services/s3/GetObjectAsyncIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/s3/src/it/java/software/amazon/awssdk/services/s3/GetObjectFaultIntegrationTest.java b/services/s3/src/it/java/software/amazon/awssdk/services/s3/GetObjectFaultIntegrationTest.java
index 501b896f57bb..414e8edb4727 100644
--- a/services/s3/src/it/java/software/amazon/awssdk/services/s3/GetObjectFaultIntegrationTest.java
+++ b/services/s3/src/it/java/software/amazon/awssdk/services/s3/GetObjectFaultIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/s3/src/it/java/software/amazon/awssdk/services/s3/GetObjectIntegrationTest.java b/services/s3/src/it/java/software/amazon/awssdk/services/s3/GetObjectIntegrationTest.java
index 2c92e61746d4..80a2665ce519 100644
--- a/services/s3/src/it/java/software/amazon/awssdk/services/s3/GetObjectIntegrationTest.java
+++ b/services/s3/src/it/java/software/amazon/awssdk/services/s3/GetObjectIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/s3/src/it/java/software/amazon/awssdk/services/s3/KeysWithLeadingSlashIntegrationTest.java b/services/s3/src/it/java/software/amazon/awssdk/services/s3/KeysWithLeadingSlashIntegrationTest.java
index dcc8f0b25454..db3d6dcf66d5 100644
--- a/services/s3/src/it/java/software/amazon/awssdk/services/s3/KeysWithLeadingSlashIntegrationTest.java
+++ b/services/s3/src/it/java/software/amazon/awssdk/services/s3/KeysWithLeadingSlashIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/s3/src/it/java/software/amazon/awssdk/services/s3/ListObjectsIntegrationTest.java b/services/s3/src/it/java/software/amazon/awssdk/services/s3/ListObjectsIntegrationTest.java
new file mode 100644
index 000000000000..d3a039f7478e
--- /dev/null
+++ b/services/s3/src/it/java/software/amazon/awssdk/services/s3/ListObjectsIntegrationTest.java
@@ -0,0 +1,193 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.services.s3;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static software.amazon.awssdk.testutils.service.S3BucketUtils.temporaryBucketName;
+
+import java.text.DecimalFormat;
+import java.text.NumberFormat;
+import java.time.Instant;
+import java.util.ArrayList;
+import java.util.List;
+import org.apache.commons.lang3.RandomStringUtils;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import software.amazon.awssdk.core.sync.RequestBody;
+import software.amazon.awssdk.services.s3.model.EncodingType;
+import software.amazon.awssdk.services.s3.model.ListObjectsRequest;
+import software.amazon.awssdk.services.s3.model.ListObjectsResponse;
+import software.amazon.awssdk.services.s3.model.PutObjectRequest;
+import software.amazon.awssdk.services.s3.model.S3Object;
+
+/**
+ * Integration tests for the listObjects operation in the Amazon S3 Java
+ * client.
+ */
+public class ListObjectsIntegrationTest extends S3IntegrationTestBase {
+    /**
+     * One hour in milliseconds for verifying that a last modified date is recent.
+     */
+    private static final long ONE_HOUR_IN_MILLISECONDS = 1000 * 60 * 60;
+
+    private static final String KEY_NAME_WITH_SPECIAL_CHARS = "special-chars-@$%";
+    private static final int BUCKET_OBJECTS = 15;
+    /**
+     * The name of the bucket created, used, and deleted by these tests.
+     */
+    private static String bucketName = temporaryBucketName("list-objects-integ-test");
+    /**
+     * List of all keys created  by these tests.
+     */
+    private static List<String> keys = new ArrayList<>();
+
+
+    /**
+     * Releases all resources created in this test.
+     */
+    @AfterClass
+    public static void tearDown() {
+        deleteBucketAndAllContents(bucketName);
+    }
+
+    /**
+     * Creates all the test resources for the tests.
+     */
+    @BeforeClass
+    public static void createResources() throws Exception {
+        createBucket(bucketName);
+
+        NumberFormat numberFormatter = new DecimalFormat("##00");
+        for (int i = 1; i <= BUCKET_OBJECTS; i++) {
+            createKey("key-" + numberFormatter.format(i));
+        }
+        createKey("aaaaa");
+        createKey("aaaaa/aaaaa/aaaaa");
+        createKey("aaaaa/aaaaa+a");
+        createKey("aaaaa/aaaaa//aaaaa");
+        createKey(KEY_NAME_WITH_SPECIAL_CHARS);
+    }
+
+    private static void createKey(String key) {
+        s3.putObject(PutObjectRequest.builder()
+                                     .bucket(bucketName)
+                                     .key(key)
+                                     .build(),
+                     RequestBody.fromString(RandomStringUtils.random(1000)));
+        keys.add(key);
+    }
+
+    @Test
+    public void listObjectsNoParameters() {
+        ListObjectsResponse result = s3.listObjects(ListObjectsRequest.builder().bucket(bucketName).build());
+        List<S3Object> objects = result.contents();
+
+        assertEquals(keys.size(), objects.size());
+        assertEquals(bucketName, result.name());
+        assertS3ObjectSummariesAreValid(objects);
+        assertNotNull(result.maxKeys());
+
+        // We didn't use a delimiter, so we expect these to be empty/null
+        assertNull(result.delimiter());
+
+        // We don't expect any truncated results
+        assertFalse(result.isTruncated());
+
+        // We didn't set other request parameters, so we expect them to be empty
+        assertNull(result.encodingType());
+        assertThat(result.prefix()).isEmpty();
+    }
+
+    @Test
+    public void listObjectsWithAllElements() {
+        String delimiter = "/";
+        String marker = "aaa";
+        ListObjectsResponse result = s3.listObjects(ListObjectsRequest.builder()
+                                                                      .bucket(bucketName)
+                                                                      .prefix(KEY_NAME_WITH_SPECIAL_CHARS)
+                                                                      .marker(marker)
+                                                                      .encodingType(EncodingType.URL)
+                                                                      .delimiter(delimiter)
+                                                                      .build());
+        List<S3Object> objects = result.contents();
+
+        assertEquals(bucketName, result.name());
+        assertS3ObjectSummariesAreValid(objects);
+        assertEquals(marker, result.marker());
+        assertEquals(delimiter, result.delimiter());
+        assertEquals(KEY_NAME_WITH_SPECIAL_CHARS, result.prefix());
+
+        assertFalse(result.isTruncated());
+        assertTrue(result.maxKeys() >= 1000);
+    }
+
+    @Test
+    public void listObjectsWithMaxKeys() {
+        int maxKeys = 4;
+        ListObjectsResponse result = s3.listObjects(ListObjectsRequest.builder()
+                                                                      .bucket(bucketName)
+                                                                      .maxKeys(maxKeys)
+                                                                      .build());
+
+        List<S3Object> objects = result.contents();
+
+        assertEquals(maxKeys, objects.size());
+        assertEquals(bucketName, result.name());
+        assertThat(maxKeys).isEqualTo(result.maxKeys());
+        assertS3ObjectSummariesAreValid(objects);
+
+        // We didn't use a delimiter, so we expect this to be empty/null
+        assertNull(result.delimiter());
+
+        // We expect truncated results since we set maxKeys
+        assertTrue(result.isTruncated());
+
+        // URL encoding is requested by default
+
+        // We didn't set other request parameters, so we expect them to be empty
+        assertNull(result.encodingType());
+        assertThat(result.prefix()).isEmpty();
+        assertNull(result.delimiter());
+    }
+
+    /**
+     * Asserts that a list of S3Object objects are valid, by checking
+     * that expected fields are not null or empty, that ETag values don't
+     * contain leading or trailing quotes, that the last modified date is
+     * recent, etc.
+     *  @param objectSummaries The list of objects to validate.
+     *
+     */
+    private void assertS3ObjectSummariesAreValid(List<S3Object> objectSummaries) {
+        for (S3Object obj : objectSummaries) {
+            assertTrue(obj.eTag().length() > 1);
+            assertTrue(obj.key().length() > 1);
+
+            // Verify that the last modified date is within an hour
+            assertNotNull(obj.lastModified());
+            long offset = obj.lastModified().toEpochMilli() - Instant.now().toEpochMilli();
+            assertTrue(offset < ONE_HOUR_IN_MILLISECONDS);
+
+            assertTrue(obj.storageClassAsString().length() > 1);
+        }
+    }
+}
diff --git a/services/s3/src/it/java/software/amazon/awssdk/services/s3/ListObjectsV2PaginatorsIntegrationTest.java b/services/s3/src/it/java/software/amazon/awssdk/services/s3/ListObjectsV2PaginatorsIntegrationTest.java
index 79229e316977..f0333b3b715e 100644
--- a/services/s3/src/it/java/software/amazon/awssdk/services/s3/ListObjectsV2PaginatorsIntegrationTest.java
+++ b/services/s3/src/it/java/software/amazon/awssdk/services/s3/ListObjectsV2PaginatorsIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/s3/src/it/java/software/amazon/awssdk/services/s3/ObjectTaggingIntegrationTest.java b/services/s3/src/it/java/software/amazon/awssdk/services/s3/ObjectTaggingIntegrationTest.java
index 4a5f488c4aea..f27a5534e889 100644
--- a/services/s3/src/it/java/software/amazon/awssdk/services/s3/ObjectTaggingIntegrationTest.java
+++ b/services/s3/src/it/java/software/amazon/awssdk/services/s3/ObjectTaggingIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -20,11 +20,13 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import org.apache.commons.lang3.RandomStringUtils;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import software.amazon.awssdk.core.sync.RequestBody;
 import software.amazon.awssdk.services.s3.model.BucketVersioningStatus;
+import software.amazon.awssdk.services.s3.model.CompletedMultipartUpload;
 import software.amazon.awssdk.services.s3.model.CopyObjectRequest;
 import software.amazon.awssdk.services.s3.model.DeleteObjectTaggingRequest;
 import software.amazon.awssdk.services.s3.model.GetObjectTaggingRequest;
@@ -33,6 +35,7 @@
 import software.amazon.awssdk.services.s3.model.PutObjectRequest;
 import software.amazon.awssdk.services.s3.model.Tag;
 import software.amazon.awssdk.services.s3.model.Tagging;
+import software.amazon.awssdk.services.s3.model.UploadPartResponse;
 import software.amazon.awssdk.services.s3.model.VersioningConfiguration;
 
 /**
@@ -95,10 +98,7 @@ public void putObject_WithTagging_Succeeds() {
 
     @Test
     public void getObjectTagging_Succeeds() {
-        List<Tag> tagSet = new ArrayList<>();
-        tagSet.add(Tag.builder().key("foo").value("1").build());
-        tagSet.add(Tag.builder().key("bar").value("2").build());
-        tagSet.add(Tag.builder().key("baz").value("3").build());
+        List<Tag> tagSet = tags();
 
         Tagging tags = Tagging.builder().tagSet(tagSet).build();
 
@@ -147,10 +147,7 @@ public void putObjectTagging_Succeeds_WithUrlEncodedTags() {
 
     @Test
     public void copyObject_Succeeds_WithNewTags() {
-        List<Tag> tagSet = new ArrayList<>();
-        tagSet.add(Tag.builder().key("foo").value("1").build());
-        tagSet.add(Tag.builder().key("bar").value("2").build());
-        tagSet.add(Tag.builder().key("baz").value("3").build());
+        List<Tag> tagSet = tags();
 
         Tagging tags = Tagging.builder().tagSet(tagSet).build();
 
@@ -183,12 +180,43 @@ public void copyObject_Succeeds_WithNewTags() {
         assertThat(getTaggingResult).containsExactlyInAnyOrder(tagsCopy.tagSet().toArray(new Tag[tagsCopy.tagSet().size()]));
     }
 
-    @Test
-    public void testDeleteObjectTagging() {
+    private List<Tag> tags() {
         List<Tag> tagSet = new ArrayList<>();
         tagSet.add(Tag.builder().key("foo").value("1").build());
         tagSet.add(Tag.builder().key("bar").value("2").build());
         tagSet.add(Tag.builder().key("baz").value("3").build());
+        return tagSet;
+    }
+
+    @Test
+    public void multipartUploadWithNewTags_shouldSucceed() {
+        List<Tag> tagSet = tags();
+
+        Tagging tags = Tagging.builder().tagSet(tagSet).build();
+
+        String key = makeNewKey();
+        String uploadId =
+            s3.createMultipartUpload(b -> b.tagging(tags).bucket(BUCKET).key(key)).uploadId();
+
+        UploadPartResponse uploadPartResponse = s3.uploadPart(b -> b.bucket(BUCKET).key(key).partNumber(1).uploadId(uploadId),
+                                                              RequestBody.fromString(RandomStringUtils.random(1000)));
+        CompletedMultipartUpload parts =
+            CompletedMultipartUpload.builder().parts(p -> p.partNumber(1).eTag(uploadPartResponse.eTag()).build()).build();
+
+        s3.completeMultipartUpload(b -> b.bucket(BUCKET).key(key).multipartUpload(parts).uploadId(uploadId).build());
+
+        List<Tag> getTaggingResult = s3.getObjectTagging(GetObjectTaggingRequest.builder()
+                                                                                .bucket(BUCKET)
+                                                                                .key(key)
+                                                                                .build())
+                                       .tagSet();
+
+        assertThat(getTaggingResult).containsExactlyInAnyOrder(tags.tagSet().toArray(new Tag[0]));
+    }
+
+    @Test
+    public void testDeleteObjectTagging() {
+        List<Tag> tagSet = tags();
 
         Tagging tags = Tagging.builder().tagSet(tagSet).build();
 
diff --git a/services/s3/src/it/java/software/amazon/awssdk/services/s3/OperationsWithNonStandardResponsesIntegrationTest.java b/services/s3/src/it/java/software/amazon/awssdk/services/s3/OperationsWithNonStandardResponsesIntegrationTest.java
index aebc668c6b8f..bb2142bebbf6 100644
--- a/services/s3/src/it/java/software/amazon/awssdk/services/s3/OperationsWithNonStandardResponsesIntegrationTest.java
+++ b/services/s3/src/it/java/software/amazon/awssdk/services/s3/OperationsWithNonStandardResponsesIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/s3/src/it/java/software/amazon/awssdk/services/s3/PutObjectIntegrationTest.java b/services/s3/src/it/java/software/amazon/awssdk/services/s3/PutObjectIntegrationTest.java
index 77aeae12a5e0..4e548feb4bae 100644
--- a/services/s3/src/it/java/software/amazon/awssdk/services/s3/PutObjectIntegrationTest.java
+++ b/services/s3/src/it/java/software/amazon/awssdk/services/s3/PutObjectIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/s3/src/it/java/software/amazon/awssdk/services/s3/S3IntegrationTestBase.java b/services/s3/src/it/java/software/amazon/awssdk/services/s3/S3IntegrationTestBase.java
index cc2700609c53..f38a93e59fdb 100644
--- a/services/s3/src/it/java/software/amazon/awssdk/services/s3/S3IntegrationTestBase.java
+++ b/services/s3/src/it/java/software/amazon/awssdk/services/s3/S3IntegrationTestBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/s3/src/it/java/software/amazon/awssdk/services/s3/S3ListObjectsV2IntegrationTest.java b/services/s3/src/it/java/software/amazon/awssdk/services/s3/S3ListObjectsV2IntegrationTest.java
index 761dd0a201e5..0e64f5e4135f 100644
--- a/services/s3/src/it/java/software/amazon/awssdk/services/s3/S3ListObjectsV2IntegrationTest.java
+++ b/services/s3/src/it/java/software/amazon/awssdk/services/s3/S3ListObjectsV2IntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/s3/src/it/java/software/amazon/awssdk/services/s3/S3PresignerIntegrationTest.java b/services/s3/src/it/java/software/amazon/awssdk/services/s3/S3PresignerIntegrationTest.java
index 4aee95ce6293..735f3455b8af 100644
--- a/services/s3/src/it/java/software/amazon/awssdk/services/s3/S3PresignerIntegrationTest.java
+++ b/services/s3/src/it/java/software/amazon/awssdk/services/s3/S3PresignerIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -17,33 +17,56 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import java.io.Closeable;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.HttpURLConnection;
 import java.time.Duration;
+import java.util.Optional;
 import java.util.UUID;
+import java.util.function.Consumer;
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
+
+import software.amazon.awssdk.awscore.presigner.PresignedRequest;
+import software.amazon.awssdk.core.ResponseInputStream;
 import software.amazon.awssdk.core.SdkBytes;
+import software.amazon.awssdk.core.sync.RequestBody;
+import software.amazon.awssdk.http.AbortableInputStream;
 import software.amazon.awssdk.http.ContentStreamProvider;
 import software.amazon.awssdk.http.HttpExecuteRequest;
 import software.amazon.awssdk.http.HttpExecuteResponse;
 import software.amazon.awssdk.http.SdkHttpClient;
 import software.amazon.awssdk.http.apache.ApacheHttpClient;
+import software.amazon.awssdk.services.s3.model.AbortMultipartUploadRequest;
+import software.amazon.awssdk.services.s3.model.CompleteMultipartUploadRequest;
+import software.amazon.awssdk.services.s3.model.CreateMultipartUploadRequest;
+import software.amazon.awssdk.services.s3.model.CreateMultipartUploadResponse;
+import software.amazon.awssdk.services.s3.model.GetObjectResponse;
+import software.amazon.awssdk.services.s3.model.ListMultipartUploadsResponse;
+import software.amazon.awssdk.services.s3.model.MultipartUpload;
 import software.amazon.awssdk.services.s3.model.RequestPayer;
+import software.amazon.awssdk.services.s3.model.UploadPartRequest;
+import software.amazon.awssdk.services.s3.model.UploadPartResponse;
 import software.amazon.awssdk.services.s3.presigner.S3Presigner;
+import software.amazon.awssdk.services.s3.presigner.model.PresignedAbortMultipartUploadRequest;
+import software.amazon.awssdk.services.s3.presigner.model.PresignedCompleteMultipartUploadRequest;
+import software.amazon.awssdk.services.s3.presigner.model.PresignedCreateMultipartUploadRequest;
 import software.amazon.awssdk.services.s3.presigner.model.PresignedGetObjectRequest;
+import software.amazon.awssdk.services.s3.presigner.model.PresignedPutObjectRequest;
+import software.amazon.awssdk.services.s3.presigner.model.PresignedUploadPartRequest;
 import software.amazon.awssdk.services.s3.utils.S3TestUtils;
 import software.amazon.awssdk.utils.IoUtils;
+import software.amazon.awssdk.utils.StringInputStream;
 
 public class S3PresignerIntegrationTest {
     private static S3Client client;
     private static String testBucket;
     private static String testNonDnsCompatibleBucket;
-    private static String testObjectKey;
+    private static String testGetObjectKey;
     private static String testObjectContent;
 
     private S3Presigner presigner;
@@ -53,11 +76,11 @@ public static void setUpClass() {
         client = S3Client.create();
         testBucket = S3TestUtils.getTestBucket(client);
         testNonDnsCompatibleBucket = S3TestUtils.getNonDnsCompatibleTestBucket(client);
-        testObjectKey = "s3-presigner-it-" + UUID.randomUUID();
+        testGetObjectKey = generateRandomObjectKey();
         testObjectContent = "Howdy!";
 
-        S3TestUtils.putObject(S3PresignerIntegrationTest.class, client, testBucket, testObjectKey, testObjectContent);
-        S3TestUtils.putObject(S3PresignerIntegrationTest.class, client, testNonDnsCompatibleBucket, testObjectKey, testObjectContent);
+        S3TestUtils.putObject(S3PresignerIntegrationTest.class, client, testBucket, testGetObjectKey, testObjectContent);
+        S3TestUtils.putObject(S3PresignerIntegrationTest.class, client, testNonDnsCompatibleBucket, testGetObjectKey, testObjectContent);
     }
 
     @AfterClass
@@ -66,6 +89,10 @@ public static void tearDownClass() {
         client.close();
     }
 
+    private static String generateRandomObjectKey() {
+        return "s3-presigner-it-" + UUID.randomUUID();
+    }
+
     @Before
     public void setUpInstance() {
         this.presigner = S3Presigner.create();
@@ -76,19 +103,20 @@ public void testDownInstance() {
         this.presigner.close();
     }
 
+
     @Test
     public void browserCompatiblePresignedUrlWorks() throws IOException {
-        assertThatPresigningWorks(testBucket, testObjectKey);
+        assertThatPresigningWorks(testBucket, testGetObjectKey);
     }
 
     @Test
     public void bucketsWithScaryCharactersWorks() throws IOException {
-        assertThatPresigningWorks(testNonDnsCompatibleBucket, testObjectKey);
+        assertThatPresigningWorks(testNonDnsCompatibleBucket, testGetObjectKey);
     }
 
     @Test
     public void keysWithScaryCharactersWorks() throws IOException {
-        String scaryObjectKey = testObjectKey + " !'/()~`";
+        String scaryObjectKey = testGetObjectKey + " !'/()~`";
         S3TestUtils.putObject(S3PresignerIntegrationTest.class, client, testBucket, scaryObjectKey, testObjectContent);
 
         assertThatPresigningWorks(testBucket, scaryObjectKey);
@@ -111,7 +139,7 @@ public void browserIncompatiblePresignedUrlDoesNotWorkWithoutAdditionalHeaders()
         PresignedGetObjectRequest presigned =
             presigner.presignGetObject(r -> r.signatureDuration(Duration.ofMinutes(5))
                                              .getObjectRequest(gor -> gor.bucket(testBucket)
-                                                                         .key(testObjectKey)
+                                                                         .key(testGetObjectKey)
                                                                          .requestPayer(RequestPayer.REQUESTER)));
 
         assertThat(presigned.isBrowserExecutable()).isFalse();
@@ -130,7 +158,7 @@ public void browserIncompatiblePresignedUrlWorksWithAdditionalHeaders() throws I
         PresignedGetObjectRequest presigned =
             presigner.presignGetObject(r -> r.signatureDuration(Duration.ofMinutes(5))
                                              .getObjectRequest(gor -> gor.bucket(testBucket)
-                                                                         .key(testObjectKey)
+                                                                         .key(testGetObjectKey)
                                                                          .requestPayer(RequestPayer.REQUESTER)));
 
         assertThat(presigned.isBrowserExecutable()).isFalse();
@@ -149,11 +177,11 @@ public void browserIncompatiblePresignedUrlWorksWithAdditionalHeaders() throws I
     }
 
     @Test
-    public void presignedHttpRequestCanBeInvokedDirectlyBySdk() throws IOException {
+    public void getObject_PresignedHttpRequestCanBeInvokedDirectlyBySdk() throws IOException {
         PresignedGetObjectRequest presigned =
             presigner.presignGetObject(r -> r.signatureDuration(Duration.ofMinutes(5))
                                              .getObjectRequest(gor -> gor.bucket(testBucket)
-                                                                         .key(testObjectKey)
+                                                                         .key(testGetObjectKey)
                                                                          .requestPayer(RequestPayer.REQUESTER)));
 
         assertThat(presigned.isBrowserExecutable()).isFalse();
@@ -176,4 +204,171 @@ public void presignedHttpRequestCanBeInvokedDirectlyBySdk() throws IOException {
             assertThat(IoUtils.toUtf8String(responseStream)).isEqualTo(testObjectContent);
         }
     }
+
+    @Test
+    public void putObject_PresignedHttpRequestCanBeInvokedDirectlyBySdk() throws IOException {
+        String objectKey = generateRandomObjectKey();
+        S3TestUtils.addCleanupTask(S3PresignerIntegrationTest.class,
+                                   () -> client.deleteObject(r -> r.bucket(testBucket).key(objectKey)));
+
+        PresignedPutObjectRequest presigned =
+            presigner.presignPutObject(r -> r.signatureDuration(Duration.ofMinutes(5))
+                                             .putObjectRequest(por -> por.bucket(testBucket).key(objectKey)));
+
+        assertThat(presigned.isBrowserExecutable()).isFalse();
+
+        SdkHttpClient httpClient = ApacheHttpClient.builder().build(); // or UrlConnectionHttpClient.builder().build()
+
+        ContentStreamProvider requestPayload = () -> new StringInputStream(testObjectContent);
+
+        HttpExecuteRequest request = HttpExecuteRequest.builder()
+                                                       .request(presigned.httpRequest())
+                                                       .contentStreamProvider(requestPayload)
+                                                       .build();
+
+        HttpExecuteResponse response = httpClient.prepareRequest(request).call();
+
+        assertThat(response.responseBody()).isPresent();
+        assertThat(response.httpResponse().isSuccessful()).isTrue();
+        response.responseBody().ifPresent(AbortableInputStream::abort);
+        String content = client.getObjectAsBytes(r -> r.bucket(testBucket).key(objectKey)).asUtf8String();
+        assertThat(content).isEqualTo(testObjectContent);
+    }
+
+    @Test
+    public void createMultipartUpload_CanBePresigned() throws IOException {
+        String objectKey = generateRandomObjectKey();
+
+        PresignedCreateMultipartUploadRequest presigned =
+            presigner.presignCreateMultipartUpload(p -> p.signatureDuration(Duration.ofMinutes(10))
+                                                         .createMultipartUploadRequest(createMultipartUploadRequest(objectKey)));
+
+        HttpExecuteResponse response = execute(presigned, null);
+
+        assertThat(response.httpResponse().isSuccessful()).isTrue();
+
+        Optional<MultipartUpload> upload = getMultipartUpload(objectKey);
+        assertThat(upload).isPresent();
+
+        client.abortMultipartUpload(abortMultipartUploadRequest(objectKey, upload.get().uploadId()));
+    }
+
+    @Test
+    public void uploadPart_CanBePresigned() throws IOException {
+        String objectKey = generateRandomObjectKey();
+        S3TestUtils.addCleanupTask(S3PresignerIntegrationTest.class,
+                                   () -> client.deleteObject(r -> r.bucket(testBucket).key(objectKey)));
+
+        CreateMultipartUploadResponse create = client.createMultipartUpload(createMultipartUploadRequest(objectKey));
+        S3TestUtils.addCleanupTask(S3PresignerIntegrationTest.class,
+                                   () -> client.abortMultipartUpload(abortMultipartUploadRequest(objectKey, create.uploadId())));
+
+        PresignedUploadPartRequest uploadPart =
+            presigner.presignUploadPart(up -> up.signatureDuration(Duration.ofDays(1))
+                                                .uploadPartRequest(upr -> upr.bucket(testBucket)
+                                                                             .key(objectKey)
+                                                                             .partNumber(1)
+                                                                             .uploadId(create.uploadId())));
+
+
+        HttpExecuteResponse uploadPartResponse = execute(uploadPart, testObjectContent);
+        assertThat(uploadPartResponse.httpResponse().isSuccessful()).isTrue();
+        String etag = uploadPartResponse.httpResponse().firstMatchingHeader("ETag").orElse(null);
+
+        client.completeMultipartUpload(createMultipartUploadRequest(objectKey, create, etag));
+
+        String content = client.getObjectAsBytes(r -> r.bucket(testBucket).key(objectKey)).asUtf8String();
+        assertThat(content).isEqualTo(testObjectContent);
+    }
+
+    @Test
+    public void completeMultipartUpload_CanBePresigned() throws IOException {
+        String objectKey = generateRandomObjectKey();
+        S3TestUtils.addCleanupTask(S3PresignerIntegrationTest.class,
+                                   () -> client.deleteObject(r -> r.bucket(testBucket).key(objectKey)));
+
+        CreateMultipartUploadResponse create = client.createMultipartUpload(createMultipartUploadRequest(objectKey));
+        S3TestUtils.addCleanupTask(S3PresignerIntegrationTest.class,
+                                   () -> client.abortMultipartUpload(abortMultipartUploadRequest(objectKey, create.uploadId())));
+
+        UploadPartResponse uploadPartResponse = client.uploadPart(uploadPartRequest(objectKey, create),
+                                                                  RequestBody.fromString(testObjectContent));
+        String etag = uploadPartResponse.eTag();
+
+        PresignedCompleteMultipartUploadRequest presignedRequest =
+            presigner.presignCompleteMultipartUpload(
+                r -> r.signatureDuration(Duration.ofDays(1))
+                      .completeMultipartUploadRequest(createMultipartUploadRequest(objectKey, create, etag)));
+
+        assertThat(execute(presignedRequest, presignedRequest.signedPayload().get().asUtf8String())
+                       .httpResponse().isSuccessful()).isTrue();
+
+        String content = client.getObjectAsBytes(r -> r.bucket(testBucket).key(objectKey)).asUtf8String();
+        assertThat(content).isEqualTo(testObjectContent);
+    }
+
+    @Test
+    public void abortMultipartUpload_CanBePresigned() throws IOException {
+        String objectKey = generateRandomObjectKey();
+        S3TestUtils.addCleanupTask(S3PresignerIntegrationTest.class,
+                                   () -> client.deleteObject(r -> r.bucket(testBucket).key(objectKey)));
+
+        CreateMultipartUploadResponse create = client.createMultipartUpload(createMultipartUploadRequest(objectKey));
+        S3TestUtils.addCleanupTask(S3PresignerIntegrationTest.class,
+                                   () -> client.abortMultipartUpload(abortMultipartUploadRequest(objectKey, create.uploadId())));
+
+        PresignedAbortMultipartUploadRequest presignedRequest = presigner.presignAbortMultipartUpload(
+            r -> r.signatureDuration(Duration.ofDays(1))
+                  .abortMultipartUploadRequest(abortMultipartUploadRequest(objectKey, create.uploadId())));
+
+
+        assertThat(execute(presignedRequest, null).httpResponse().isSuccessful()).isTrue();
+
+        assertThat(getMultipartUpload(objectKey)).isNotPresent();
+    }
+
+    private Consumer<CreateMultipartUploadRequest.Builder> createMultipartUploadRequest(String objectKey) {
+        return r -> r.bucket(testBucket).key(objectKey);
+    }
+
+    private Consumer<UploadPartRequest.Builder> uploadPartRequest(String objectKey, CreateMultipartUploadResponse create) {
+        return r -> r.bucket(testBucket)
+                     .key(objectKey)
+                     .partNumber(1)
+                     .uploadId(create.uploadId());
+    }
+
+    private Consumer<CompleteMultipartUploadRequest.Builder> createMultipartUploadRequest(String objectKey, CreateMultipartUploadResponse create, String etag) {
+        return c -> c.bucket(testBucket)
+                     .key(objectKey)
+                     .uploadId(create.uploadId())
+                     .multipartUpload(m -> m.parts(p -> p.partNumber(1).eTag(etag)));
+    }
+
+    private Consumer<AbortMultipartUploadRequest.Builder> abortMultipartUploadRequest(String objectKey, String uploadId) {
+        return r -> r.bucket(testBucket)
+                     .key(objectKey)
+                     .uploadId(uploadId);
+    }
+
+    private Optional<MultipartUpload> getMultipartUpload(String objectKey) {
+        return client.listMultipartUploadsPaginator(r -> r.bucket(testBucket).prefix(objectKey))
+                     .uploads()
+                     .stream()
+                     .filter(u -> u.key().equals(objectKey))
+                     .findAny();
+    }
+
+    private HttpExecuteResponse execute(PresignedRequest presigned, String payload) throws IOException {
+        SdkHttpClient httpClient = ApacheHttpClient.builder().build();
+
+        ContentStreamProvider requestPayload = payload == null ? null : () -> new StringInputStream(payload);
+
+        HttpExecuteRequest request = HttpExecuteRequest.builder()
+                                                       .request(presigned.httpRequest())
+                                                       .contentStreamProvider(requestPayload)
+                                                       .build();
+
+        return httpClient.prepareRequest(request).call();
+    }
 }
diff --git a/services/s3/src/it/java/software/amazon/awssdk/services/s3/S3ResponseMetadataIntegrationTest.java b/services/s3/src/it/java/software/amazon/awssdk/services/s3/S3ResponseMetadataIntegrationTest.java
index 484f613a25d4..1763788d1627 100644
--- a/services/s3/src/it/java/software/amazon/awssdk/services/s3/S3ResponseMetadataIntegrationTest.java
+++ b/services/s3/src/it/java/software/amazon/awssdk/services/s3/S3ResponseMetadataIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/s3/src/it/java/software/amazon/awssdk/services/s3/ServerSideEncryptionIntegrationTestBase.java b/services/s3/src/it/java/software/amazon/awssdk/services/s3/ServerSideEncryptionIntegrationTestBase.java
new file mode 100644
index 000000000000..32d7ba225af4
--- /dev/null
+++ b/services/s3/src/it/java/software/amazon/awssdk/services/s3/ServerSideEncryptionIntegrationTestBase.java
@@ -0,0 +1,79 @@
+/*
+ * 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.
+ */
+package software.amazon.awssdk.services.s3;
+
+import static org.assertj.core.api.Fail.fail;
+import static software.amazon.awssdk.services.s3.S3IntegrationTestBase.createBucket;
+import static software.amazon.awssdk.testutils.service.S3BucketUtils.temporaryBucketName;
+
+import java.io.File;
+import java.io.IOException;
+import java.security.SecureRandom;
+import javax.crypto.KeyGenerator;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import software.amazon.awssdk.services.kms.KmsClient;
+import software.amazon.awssdk.services.s3.model.ServerSideEncryption;
+import software.amazon.awssdk.testutils.RandomTempFile;
+
+public class ServerSideEncryptionIntegrationTestBase extends S3IntegrationTestBase {
+
+    protected static final String BUCKET = temporaryBucketName(ServerSideEncryptionIntegrationTestBase.class);
+    protected static final String BUCKET_WITH_SSE = temporaryBucketName(ServerSideEncryptionIntegrationTestBase.class);
+
+    private static final KmsClient KMS = KmsClient.builder()
+                                                  .region(DEFAULT_REGION)
+                                                  .credentialsProvider(CREDENTIALS_PROVIDER_CHAIN)
+                                                  .build();
+
+    protected static File file;
+
+    private static String keyId;
+
+    @BeforeClass
+    public static void setupFixture() throws IOException {
+        createBucket(BUCKET);
+        createBucket(BUCKET_WITH_SSE);
+        keyId = KMS.createKey().keyMetadata().keyId();
+
+        s3.putBucketEncryption(r -> r
+            .bucket(BUCKET_WITH_SSE)
+            .serverSideEncryptionConfiguration(ssec -> ssec
+                .rules(rule -> rule
+                    .applyServerSideEncryptionByDefault(d -> d.kmsMasterKeyID(keyId)
+                                                              .sseAlgorithm(ServerSideEncryption.AWS_KMS)))));
+        file = new RandomTempFile(10_000);
+    }
+
+    @AfterClass
+    public static void tearDownFixture() {
+        deleteBucketAndAllContents(BUCKET);
+        deleteBucketAndAllContents(BUCKET_WITH_SSE);
+        file.delete();
+        KMS.scheduleKeyDeletion(r -> r.keyId(keyId));
+    }
+
+    protected static byte[] generateSecretKey() {
+        KeyGenerator generator;
+        try {
+            generator = KeyGenerator.getInstance("AES");
+            generator.init(256, new SecureRandom());
+            return generator.generateKey().getEncoded();
+        } catch (Exception e) {
+            fail("Unable to generate symmetric key: " + e.getMessage());
+            return null;
+        }
+    }
+}
diff --git a/services/s3/src/it/java/software/amazon/awssdk/services/s3/SyncServerSideEncryptionIntegrationTest.java b/services/s3/src/it/java/software/amazon/awssdk/services/s3/SyncServerSideEncryptionIntegrationTest.java
index 3d7dc3901c40..23235b89a21b 100644
--- a/services/s3/src/it/java/software/amazon/awssdk/services/s3/SyncServerSideEncryptionIntegrationTest.java
+++ b/services/s3/src/it/java/software/amazon/awssdk/services/s3/SyncServerSideEncryptionIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -14,47 +14,22 @@
  */
 package software.amazon.awssdk.services.s3;
 
-import static org.assertj.core.api.Fail.fail;
 import static software.amazon.awssdk.services.s3.model.ServerSideEncryption.AES256;
-import static software.amazon.awssdk.testutils.service.S3BucketUtils.temporaryBucketName;
 
-import java.io.File;
 import java.io.FileInputStream;
-import java.io.IOException;
+import java.io.FileNotFoundException;
 import java.io.InputStream;
-import java.security.SecureRandom;
 import java.util.Base64;
 import java.util.UUID;
-import javax.crypto.KeyGenerator;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
 import org.junit.Test;
 import software.amazon.awssdk.core.sync.ResponseTransformer;
 import software.amazon.awssdk.services.s3.model.GetObjectRequest;
 import software.amazon.awssdk.services.s3.model.PutObjectRequest;
 import software.amazon.awssdk.services.s3.model.ServerSideEncryption;
-import software.amazon.awssdk.testutils.RandomTempFile;
 import software.amazon.awssdk.testutils.SdkAsserts;
 import software.amazon.awssdk.utils.Md5Utils;
 
-public class SyncServerSideEncryptionIntegrationTest extends S3IntegrationTestBase {
-
-    private static final String BUCKET = temporaryBucketName(GetObjectIntegrationTest.class);
-
-    private static File file;
-
-    @BeforeClass
-    public static void setupFixture() throws IOException {
-        createBucket(BUCKET);
-        file = new RandomTempFile(10_000);
-    }
-
-    @AfterClass
-    public static void tearDownFixture() {
-        deleteBucketAndAllContents(BUCKET);
-        file.delete();
-    }
-
+public class SyncServerSideEncryptionIntegrationTest extends ServerSideEncryptionIntegrationTestBase {
     @Test
     public void sse_AES256_succeeds() throws Exception {
         String key = UUID.randomUUID().toString();
@@ -124,15 +99,23 @@ public void sse_customerManaged_succeeds() {
         SdkAsserts.assertFileEqualsStream(file, response);
     }
 
-    private static byte[] generateSecretKey() {
-        KeyGenerator generator;
-        try {
-            generator = KeyGenerator.getInstance("AES");
-            generator.init(256, new SecureRandom());
-            return generator.generateKey().getEncoded();
-        } catch (Exception e) {
-            fail("Unable to generate symmetric key: " + e.getMessage());
-            return null;
-        }
+    @Test
+    public void sse_onBucket_succeeds() throws FileNotFoundException {
+        String key = UUID.randomUUID().toString();
+
+        PutObjectRequest request = PutObjectRequest.builder()
+                                                   .key(key)
+                                                   .bucket(BUCKET_WITH_SSE)
+                                                   .build();
+
+        s3.putObject(request, file.toPath());
+
+        GetObjectRequest getObjectRequest = GetObjectRequest.builder()
+                                                            .key(key)
+                                                            .bucket(BUCKET_WITH_SSE)
+                                                            .build();
+
+        String response = s3.getObject(getObjectRequest, ResponseTransformer.toBytes()).asUtf8String();
+        SdkAsserts.assertStringEqualsStream(response, new FileInputStream(file));
     }
 }
diff --git a/services/s3/src/it/java/software/amazon/awssdk/services/s3/UploadLargeObjectIntegrationTest.java b/services/s3/src/it/java/software/amazon/awssdk/services/s3/UploadLargeObjectIntegrationTest.java
index 5a4c79de7720..c6f9db74bb30 100644
--- a/services/s3/src/it/java/software/amazon/awssdk/services/s3/UploadLargeObjectIntegrationTest.java
+++ b/services/s3/src/it/java/software/amazon/awssdk/services/s3/UploadLargeObjectIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/s3/src/it/java/software/amazon/awssdk/services/s3/UploadMultiplePartIntegrationTest.java b/services/s3/src/it/java/software/amazon/awssdk/services/s3/UploadMultiplePartIntegrationTest.java
index 23f94028d2e0..e3963ddfb317 100644
--- a/services/s3/src/it/java/software/amazon/awssdk/services/s3/UploadMultiplePartIntegrationTest.java
+++ b/services/s3/src/it/java/software/amazon/awssdk/services/s3/UploadMultiplePartIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/s3/src/it/java/software/amazon/awssdk/services/s3/UploadMultiplePartTestBase.java b/services/s3/src/it/java/software/amazon/awssdk/services/s3/UploadMultiplePartTestBase.java
index 12285fccbac0..9ebce247c716 100644
--- a/services/s3/src/it/java/software/amazon/awssdk/services/s3/UploadMultiplePartTestBase.java
+++ b/services/s3/src/it/java/software/amazon/awssdk/services/s3/UploadMultiplePartTestBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/s3/src/it/java/software/amazon/awssdk/services/s3/UrlEncodingIntegrationTest.java b/services/s3/src/it/java/software/amazon/awssdk/services/s3/UrlEncodingIntegrationTest.java
new file mode 100644
index 000000000000..e988c458c2b0
--- /dev/null
+++ b/services/s3/src/it/java/software/amazon/awssdk/services/s3/UrlEncodingIntegrationTest.java
@@ -0,0 +1,134 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.services.s3;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static software.amazon.awssdk.testutils.service.S3BucketUtils.temporaryBucketName;
+
+import org.apache.commons.lang3.RandomStringUtils;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import software.amazon.awssdk.core.sync.RequestBody;
+import software.amazon.awssdk.services.s3.model.CreateMultipartUploadResponse;
+import software.amazon.awssdk.services.s3.model.EncodingType;
+import software.amazon.awssdk.services.s3.model.ListMultipartUploadsResponse;
+import software.amazon.awssdk.services.s3.model.ListObjectVersionsResponse;
+import software.amazon.awssdk.services.s3.model.ListObjectsResponse;
+import software.amazon.awssdk.services.s3.model.ListObjectsV2Response;
+import software.amazon.awssdk.services.s3.model.PutObjectRequest;
+import software.amazon.awssdk.services.s3.model.UploadPartResponse;
+
+/**
+ * Integration tests for the operations that support encoding type
+ */
+public class UrlEncodingIntegrationTest extends S3IntegrationTestBase {
+    /**
+     * The name of the bucket created, used, and deleted by these tests.
+     */
+    private static final String BUCKET_NAME = temporaryBucketName(UrlEncodingIntegrationTest.class);
+    private static final String KEY_NAME_WITH_SPECIAL_CHARS = "filename_@_=_&_?_+_)_.temp";
+
+    @BeforeClass
+    public static void createResources() {
+        createBucket(BUCKET_NAME);
+        s3.putObject(PutObjectRequest.builder()
+                                     .bucket(BUCKET_NAME)
+                                     .key(KEY_NAME_WITH_SPECIAL_CHARS)
+                                     .build(), RequestBody.fromString(RandomStringUtils.random(1000)));
+    }
+
+    /**
+     * Releases all resources created in this test.
+     */
+    @AfterClass
+    public static void tearDown() {
+        deleteBucketAndAllContents(BUCKET_NAME);
+    }
+
+    @Test
+    public void listObjectVersionsWithUrlEncodingType_shouldDecode() {
+        ListObjectVersionsResponse listObjectVersionsResponse =
+            s3.listObjectVersions(b -> b.bucket(BUCKET_NAME).encodingType(EncodingType.URL));
+        listObjectVersionsResponse.versions().forEach(v -> assertKeyIsDecoded(v.key()));
+
+        ListObjectVersionsResponse asyncResponse =
+            s3Async.listObjectVersions(b -> b.bucket(BUCKET_NAME).encodingType(EncodingType.URL)).join();
+
+        asyncResponse.versions().forEach(v -> assertKeyIsDecoded(v.key()));
+    }
+
+    @Test
+    public void listObjectV2WithUrlEncodingType_shouldDecode() {
+        ListObjectsV2Response listObjectsV2Response =
+            s3.listObjectsV2(b -> b.bucket(BUCKET_NAME).encodingType(EncodingType.URL));
+
+        listObjectsV2Response.contents().forEach(c -> assertKeyIsDecoded(c.key()));
+        ListObjectVersionsResponse asyncResponse =
+            s3Async.listObjectVersions(b -> b.bucket(BUCKET_NAME).encodingType(EncodingType.URL)).join();
+
+        asyncResponse.versions().forEach(v -> assertKeyIsDecoded(v.key()));
+    }
+
+    @Test
+    public void listObjectWithUrlEncodingType_shouldDecode() {
+        ListObjectsResponse listObjectsV2Response =
+            s3.listObjects(b -> b.bucket(BUCKET_NAME).encodingType(EncodingType.URL));
+
+        listObjectsV2Response.contents().forEach(c -> assertKeyIsDecoded(c.key()));
+        ListObjectVersionsResponse asyncResponse =
+            s3Async.listObjectVersions(b -> b.bucket(BUCKET_NAME).encodingType(EncodingType.URL)).join();
+
+        asyncResponse.versions().forEach(v -> assertKeyIsDecoded(v.key()));
+    }
+
+    @Test
+    public void listMultipartUploadsWithUrlEncodingType_shouldDecode() {
+        String uploaddId = null;
+        try {
+            CreateMultipartUploadResponse multipartUploadResponse =
+                s3.createMultipartUpload(b -> b.bucket(BUCKET_NAME).key(KEY_NAME_WITH_SPECIAL_CHARS));
+            uploaddId = multipartUploadResponse.uploadId();
+
+            String finalUploadId = uploaddId;
+            UploadPartResponse uploadPartResponse = s3.uploadPart(b -> b.bucket(BUCKET_NAME)
+                                                                        .key(KEY_NAME_WITH_SPECIAL_CHARS)
+                                                                        .partNumber(1)
+                                                                        .uploadId(finalUploadId),
+                                                                  RequestBody.fromString(RandomStringUtils.random(1000)));
+
+
+            ListMultipartUploadsResponse listMultipartUploadsResponse =
+                s3.listMultipartUploads(b -> b.encodingType(EncodingType.URL).bucket(BUCKET_NAME));
+
+            listMultipartUploadsResponse.uploads().forEach(upload -> assertThat(upload.key()).isEqualTo(KEY_NAME_WITH_SPECIAL_CHARS));
+
+            ListMultipartUploadsResponse asyncListMultipartUploadsResponse =
+                s3Async.listMultipartUploads(b -> b.encodingType(EncodingType.URL).bucket(BUCKET_NAME)).join();
+
+            asyncListMultipartUploadsResponse.uploads().forEach(upload -> assertKeyIsDecoded(upload.key()));
+        } finally {
+            if (uploaddId != null) {
+                String finalUploadId = uploaddId;
+                s3.abortMultipartUpload(b -> b.bucket(BUCKET_NAME).key(KEY_NAME_WITH_SPECIAL_CHARS).uploadId(finalUploadId));
+            }
+        }
+    }
+
+    private void assertKeyIsDecoded(String key) {
+        assertThat(key).isEqualTo(KEY_NAME_WITH_SPECIAL_CHARS);
+    }
+}
diff --git a/services/s3/src/it/java/software/amazon/awssdk/services/s3/UserMetadataIntegrationTest.java b/services/s3/src/it/java/software/amazon/awssdk/services/s3/UserMetadataIntegrationTest.java
index 94e82315769f..e24c029da125 100644
--- a/services/s3/src/it/java/software/amazon/awssdk/services/s3/UserMetadataIntegrationTest.java
+++ b/services/s3/src/it/java/software/amazon/awssdk/services/s3/UserMetadataIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/s3/src/it/java/software/amazon/awssdk/services/s3/signer/AwsS3V4SignerIntegrationTest.java b/services/s3/src/it/java/software/amazon/awssdk/services/s3/signer/AwsS3V4SignerIntegrationTest.java
index 8fa568b44389..2cab5a15e4c8 100644
--- a/services/s3/src/it/java/software/amazon/awssdk/services/s3/signer/AwsS3V4SignerIntegrationTest.java
+++ b/services/s3/src/it/java/software/amazon/awssdk/services/s3/signer/AwsS3V4SignerIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/s3/src/it/java/software/amazon/awssdk/services/s3/utils/S3TestUtils.java b/services/s3/src/it/java/software/amazon/awssdk/services/s3/utils/S3TestUtils.java
index 8fe701564c95..952fbccdc701 100644
--- a/services/s3/src/it/java/software/amazon/awssdk/services/s3/utils/S3TestUtils.java
+++ b/services/s3/src/it/java/software/amazon/awssdk/services/s3/utils/S3TestUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/s3/src/it/resources/log4j2.xml b/services/s3/src/it/resources/log4j2.xml
index 784a3e2dbf93..80ace9124cfc 100644
--- a/services/s3/src/it/resources/log4j2.xml
+++ b/services/s3/src/it/resources/log4j2.xml
@@ -1,4 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ 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.
+  -->
+
 <Configuration status="WARN">
     <Appenders>
         <Console name="Console" target="SYSTEM_OUT">
diff --git a/services/s3/src/main/java/software/amazon/awssdk/services/s3/S3Configuration.java b/services/s3/src/main/java/software/amazon/awssdk/services/s3/S3Configuration.java
index 5bf00e558fbe..9e48a335baec 100644
--- a/services/s3/src/main/java/software/amazon/awssdk/services/s3/S3Configuration.java
+++ b/services/s3/src/main/java/software/amazon/awssdk/services/s3/S3Configuration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -20,6 +20,10 @@
 import software.amazon.awssdk.annotations.SdkPublicApi;
 import software.amazon.awssdk.annotations.ThreadSafe;
 import software.amazon.awssdk.core.ServiceConfiguration;
+import software.amazon.awssdk.profiles.ProfileFile;
+import software.amazon.awssdk.profiles.ProfileFileSystemSetting;
+import software.amazon.awssdk.services.s3.internal.FieldWithDefault;
+import software.amazon.awssdk.services.s3.internal.usearnregion.UseArnRegionProviderChain;
 import software.amazon.awssdk.services.s3.model.PutBucketAccelerateConfigurationRequest;
 import software.amazon.awssdk.utils.builder.CopyableBuilder;
 import software.amazon.awssdk.utils.builder.ToCopyableBuilder;
@@ -55,21 +59,36 @@ public final class S3Configuration implements ServiceConfiguration, ToCopyableBu
      */
     private static final boolean DEFAULT_CHUNKED_ENCODING_ENABLED = true;
 
-    private final boolean pathStyleAccessEnabled;
-    private final boolean accelerateModeEnabled;
-    private final boolean dualstackEnabled;
-    private final boolean checksumValidationEnabled;
-    private final boolean chunkedEncodingEnabled;
+    private final FieldWithDefault<Boolean> pathStyleAccessEnabled;
+    private final FieldWithDefault<Boolean> accelerateModeEnabled;
+    private final FieldWithDefault<Boolean> dualstackEnabled;
+    private final FieldWithDefault<Boolean> checksumValidationEnabled;
+    private final FieldWithDefault<Boolean> chunkedEncodingEnabled;
+    private final FieldWithDefault<Boolean> useArnRegionEnabled;
+    private final FieldWithDefault<ProfileFile> profileFile;
+    private final FieldWithDefault<String> profileName;
 
     private S3Configuration(DefaultS3ServiceConfigurationBuilder builder) {
-        this.dualstackEnabled = resolveBoolean(builder.dualstackEnabled, DEFAULT_DUALSTACK_ENABLED);
-        this.accelerateModeEnabled = resolveBoolean(builder.accelerateModeEnabled, DEFAULT_ACCELERATE_MODE_ENABLED);
-        this.pathStyleAccessEnabled = resolveBoolean(builder.pathStyleAccessEnabled, DEFAULT_PATH_STYLE_ACCESS_ENABLED);
-        this.checksumValidationEnabled = resolveBoolean(builder.checksumValidationEnabled, DEFAULT_CHECKSUM_VALIDATION_ENABLED);
-        if (accelerateModeEnabled && pathStyleAccessEnabled) {
+        this.dualstackEnabled = FieldWithDefault.create(builder.dualstackEnabled, DEFAULT_DUALSTACK_ENABLED);
+        this.accelerateModeEnabled = FieldWithDefault.create(builder.accelerateModeEnabled, DEFAULT_ACCELERATE_MODE_ENABLED);
+        this.pathStyleAccessEnabled = FieldWithDefault.create(builder.pathStyleAccessEnabled, DEFAULT_PATH_STYLE_ACCESS_ENABLED);
+        this.checksumValidationEnabled =  FieldWithDefault.create(builder.checksumValidationEnabled,
+                                                                 DEFAULT_CHECKSUM_VALIDATION_ENABLED);
+        this.chunkedEncodingEnabled = FieldWithDefault.create(builder.chunkedEncodingEnabled, DEFAULT_CHUNKED_ENCODING_ENABLED);
+        this.profileFile = FieldWithDefault.createLazy(builder.profileFile, ProfileFile::defaultProfileFile);
+        this.profileName = FieldWithDefault.create(builder.profileName,
+                                                   ProfileFileSystemSetting.AWS_PROFILE.getStringValueOrThrow());
+        this.useArnRegionEnabled = FieldWithDefault.createLazy(builder.useArnRegionEnabled, this::resolveUserArnRegionEnabled);
+
+        if (accelerateModeEnabled() && pathStyleAccessEnabled()) {
             throw new IllegalArgumentException("Accelerate mode cannot be used with path style addressing");
         }
-        this.chunkedEncodingEnabled = resolveBoolean(builder.chunkedEncodingEnabled, DEFAULT_CHUNKED_ENCODING_ENABLED);
+    }
+
+    private boolean resolveUserArnRegionEnabled() {
+        return UseArnRegionProviderChain.create(this.profileFile.value(), this.profileName.value())
+                                        .resolveUseArnRegion()
+                                        .orElse(false);
     }
 
     /**
@@ -99,7 +118,7 @@ public static Builder builder() {
      * @return True is the client should always use path-style access
      */
     public boolean pathStyleAccessEnabled() {
-        return pathStyleAccessEnabled;
+        return pathStyleAccessEnabled.value();
     }
 
     /**
@@ -115,7 +134,7 @@ public boolean pathStyleAccessEnabled() {
      * @return True if accelerate mode is enabled.
      */
     public boolean accelerateModeEnabled() {
-        return accelerateModeEnabled;
+        return accelerateModeEnabled.value();
     }
 
     /**
@@ -132,11 +151,11 @@ public boolean accelerateModeEnabled() {
      * @return True if the client will use the dualstack endpoints
      */
     public boolean dualstackEnabled() {
-        return dualstackEnabled;
+        return dualstackEnabled.value();
     }
 
     public boolean checksumValidationEnabled() {
-        return checksumValidationEnabled;
+        return checksumValidationEnabled.value();
     }
 
     /**
@@ -150,23 +169,36 @@ public boolean checksumValidationEnabled() {
      * @return True if chunked encoding should be used.
      */
     public boolean chunkedEncodingEnabled() {
-        return chunkedEncodingEnabled;
+        return chunkedEncodingEnabled.value();
     }
 
-    private boolean resolveBoolean(Boolean customerSuppliedValue, boolean defaultValue) {
-        return customerSuppliedValue == null ? defaultValue : customerSuppliedValue;
+    /**
+     * Returns whether the client is allowed to make cross-region calls when an S3 Access Point ARN has a different
+     * region to the one configured on the client.
+     * <p>
+     * @return True if a different region in the ARN can be used.
+     */
+    public boolean useArnRegionEnabled() {
+        return useArnRegionEnabled.value();
     }
 
     @Override
     public Builder toBuilder() {
         return builder()
-                .dualstackEnabled(dualstackEnabled)
-                .accelerateModeEnabled(accelerateModeEnabled)
-                .pathStyleAccessEnabled(pathStyleAccessEnabled);
+                .dualstackEnabled(dualstackEnabled.valueOrNullIfDefault())
+                .accelerateModeEnabled(accelerateModeEnabled.valueOrNullIfDefault())
+                .pathStyleAccessEnabled(pathStyleAccessEnabled.valueOrNullIfDefault())
+                .checksumValidationEnabled(checksumValidationEnabled.valueOrNullIfDefault())
+                .chunkedEncodingEnabled(chunkedEncodingEnabled.valueOrNullIfDefault())
+                .useArnRegionEnabled(useArnRegionEnabled.valueOrNullIfDefault())
+                .profileFile(profileFile.valueOrNullIfDefault())
+                .profileName(profileName.valueOrNullIfDefault());
     }
 
     @NotThreadSafe
-    public interface Builder extends CopyableBuilder<Builder, S3Configuration> { // (8)
+    public interface Builder extends CopyableBuilder<Builder, S3Configuration> {
+        Boolean dualstackEnabled();
+
         /**
          * Option to enable using the dualstack endpoints when accessing S3. Dualstack
          * should be enabled if you want to use IPv6.
@@ -179,6 +211,8 @@ public interface Builder extends CopyableBuilder<Builder, S3Configuration> { //
          */
         Builder dualstackEnabled(Boolean dualstackEnabled);
 
+        Boolean accelerateModeEnabled();
+
         /**
          * Option to enable using the accelerate enedpoint when accessing S3. Accelerate
          * endpoints allow faster transfer of objects by using Amazon CloudFront's
@@ -192,6 +226,8 @@ public interface Builder extends CopyableBuilder<Builder, S3Configuration> { //
          */
         Builder accelerateModeEnabled(Boolean accelerateModeEnabled);
 
+        Boolean pathStyleAccessEnabled();
+
         /**
          * Option to enable using path style access for accessing S3 objects
          * instead of DNS style access. DNS style access is preferred as it
@@ -206,6 +242,8 @@ public interface Builder extends CopyableBuilder<Builder, S3Configuration> { //
          */
         Builder pathStyleAccessEnabled(Boolean pathStyleAccessEnabled);
 
+        Boolean checksumValidationEnabled();
+
         /**
          * Option to disable doing a validation of the checksum of an object stored in S3.
          *
@@ -217,6 +255,8 @@ public interface Builder extends CopyableBuilder<Builder, S3Configuration> { //
          */
         Builder checksumValidationEnabled(Boolean checksumValidationEnabled);
 
+        Boolean chunkedEncodingEnabled();
+
         /**
          * Option to enable using chunked encoding when signing the request
          * payload for {@link
@@ -226,21 +266,68 @@ public interface Builder extends CopyableBuilder<Builder, S3Configuration> { //
          * @see S3Configuration#chunkedEncodingEnabled()
          */
         Builder chunkedEncodingEnabled(Boolean chunkedEncodingEnabled);
-    }
 
-    private static final class DefaultS3ServiceConfigurationBuilder implements Builder {
+        Boolean useArnRegionEnabled();
+
+        /**
+         * If an S3 resource ARN is passed in as the target of an S3 operation that has a different region to the one
+         * the client was configured with, this flag must be set to 'true' to permit the client to make a
+         * cross-region call to the region specified in the ARN otherwise an exception will be thrown.
+         *
+         * @see S3Configuration#useArnRegionEnabled()
+         */
+        Builder useArnRegionEnabled(Boolean useArnRegionEnabled);
 
+        ProfileFile profileFile();
+
+        /**
+         * The profile file that should be consulted to determine the default value of {@link #useArnRegionEnabled(Boolean)}.
+         * This is not used, if the {@link #useArnRegionEnabled(Boolean)} is configured.
+         *
+         * <p>
+         * By default, the {@link ProfileFile#defaultProfileFile()} is used.
+         * </p>
+         */
+        Builder profileFile(ProfileFile profileFile);
+
+        String profileName();
+
+        /**
+         * The profile name that should be consulted to determine the default value of {@link #useArnRegionEnabled(Boolean)}.
+         * This is not used, if the {@link #useArnRegionEnabled(Boolean)} is configured.
+         *
+         * <p>
+         * By default, the {@link ProfileFileSystemSetting#AWS_PROFILE} is used.
+         * </p>
+         */
+        Builder profileName(String profileName);
+    }
+
+    static final class DefaultS3ServiceConfigurationBuilder implements Builder {
         private Boolean dualstackEnabled;
         private Boolean accelerateModeEnabled;
         private Boolean pathStyleAccessEnabled;
         private Boolean checksumValidationEnabled;
         private Boolean chunkedEncodingEnabled;
+        private Boolean useArnRegionEnabled;
+        private ProfileFile profileFile;
+        private String profileName;
+
+        @Override
+        public Boolean dualstackEnabled() {
+            return dualstackEnabled;
+        }
 
         public Builder dualstackEnabled(Boolean dualstackEnabled) {
             this.dualstackEnabled = dualstackEnabled;
             return this;
         }
 
+        @Override
+        public Boolean accelerateModeEnabled() {
+            return accelerateModeEnabled;
+        }
+
         public void setDualstackEnabled(Boolean dualstackEnabled) {
             dualstackEnabled(dualstackEnabled);
         }
@@ -250,6 +337,11 @@ public Builder accelerateModeEnabled(Boolean accelerateModeEnabled) {
             return this;
         }
 
+        @Override
+        public Boolean pathStyleAccessEnabled() {
+            return pathStyleAccessEnabled;
+        }
+
         public void setAccelerateModeEnabled(Boolean accelerateModeEnabled) {
             accelerateModeEnabled(accelerateModeEnabled);
         }
@@ -259,6 +351,11 @@ public Builder pathStyleAccessEnabled(Boolean pathStyleAccessEnabled) {
             return this;
         }
 
+        @Override
+        public Boolean checksumValidationEnabled() {
+            return checksumValidationEnabled;
+        }
+
         public void setPathStyleAccessEnabled(Boolean pathStyleAccessEnabled) {
             pathStyleAccessEnabled(pathStyleAccessEnabled);
         }
@@ -268,6 +365,11 @@ public Builder checksumValidationEnabled(Boolean checksumValidationEnabled) {
             return this;
         }
 
+        @Override
+        public Boolean chunkedEncodingEnabled() {
+            return chunkedEncodingEnabled;
+        }
+
         public void setChecksumValidationEnabled(Boolean checksumValidationEnabled) {
             checksumValidationEnabled(checksumValidationEnabled);
         }
@@ -277,10 +379,46 @@ public Builder chunkedEncodingEnabled(Boolean chunkedEncodingEnabled) {
             return this;
         }
 
+        @Override
+        public Boolean useArnRegionEnabled() {
+            return useArnRegionEnabled;
+        }
+
         public void setChunkedEncodingEnabled(Boolean chunkedEncodingEnabled) {
             chunkedEncodingEnabled(chunkedEncodingEnabled);
         }
 
+        public Builder useArnRegionEnabled(Boolean useArnRegionEnabled) {
+            this.useArnRegionEnabled = useArnRegionEnabled;
+            return this;
+        }
+
+        @Override
+        public ProfileFile profileFile() {
+            return profileFile;
+        }
+
+        @Override
+        public Builder profileFile(ProfileFile profileFile) {
+            this.profileFile = profileFile;
+            return this;
+        }
+
+        @Override
+        public String profileName() {
+            return profileName;
+        }
+
+        @Override
+        public Builder profileName(String profileName) {
+            this.profileName = profileName;
+            return this;
+        }
+
+        public void setUseArnRegionEnabled(Boolean useArnRegionEnabled) {
+            useArnRegionEnabled(useArnRegionEnabled);
+        }
+
         public S3Configuration build() {
             return new S3Configuration(this);
         }
diff --git a/services/s3/src/main/java/software/amazon/awssdk/services/s3/S3SystemSetting.java b/services/s3/src/main/java/software/amazon/awssdk/services/s3/S3SystemSetting.java
new file mode 100644
index 000000000000..239df4aec35c
--- /dev/null
+++ b/services/s3/src/main/java/software/amazon/awssdk/services/s3/S3SystemSetting.java
@@ -0,0 +1,51 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.services.s3;
+
+import software.amazon.awssdk.annotations.SdkProtectedApi;
+import software.amazon.awssdk.utils.SystemSetting;
+
+/**
+ * S3 specific system setting
+ */
+@SdkProtectedApi
+public enum S3SystemSetting implements SystemSetting {
+
+    AWS_S3_USE_ARN_REGION("aws.s3UseArnRegion", null);
+
+    private final String systemProperty;
+    private final String defaultValue;
+
+    S3SystemSetting(String systemProperty, String defaultValue) {
+        this.systemProperty = systemProperty;
+        this.defaultValue = defaultValue;
+    }
+
+    @Override
+    public String property() {
+        return systemProperty;
+    }
+
+    @Override
+    public String environmentVariable() {
+        return name();
+    }
+
+    @Override
+    public String defaultValue() {
+        return defaultValue;
+    }
+}
diff --git a/services/s3/src/main/java/software/amazon/awssdk/services/s3/S3Utilities.java b/services/s3/src/main/java/software/amazon/awssdk/services/s3/S3Utilities.java
index 89596aca60d7..72c4b6c98589 100644
--- a/services/s3/src/main/java/software/amazon/awssdk/services/s3/S3Utilities.java
+++ b/services/s3/src/main/java/software/amazon/awssdk/services/s3/S3Utilities.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -23,18 +23,21 @@
 import software.amazon.awssdk.annotations.SdkInternalApi;
 import software.amazon.awssdk.annotations.SdkPublicApi;
 import software.amazon.awssdk.awscore.client.config.AwsClientOption;
-import software.amazon.awssdk.awscore.internal.EndpointUtils;
+import software.amazon.awssdk.awscore.endpoint.DefaultServiceEndpointBuilder;
+import software.amazon.awssdk.core.client.config.ClientOverrideConfiguration;
 import software.amazon.awssdk.core.client.config.SdkClientConfiguration;
 import software.amazon.awssdk.core.client.config.SdkClientOption;
 import software.amazon.awssdk.core.exception.SdkException;
 import software.amazon.awssdk.http.SdkHttpFullRequest;
 import software.amazon.awssdk.http.SdkHttpMethod;
 import software.amazon.awssdk.http.SdkHttpRequest;
+import software.amazon.awssdk.profiles.ProfileFile;
 import software.amazon.awssdk.protocols.core.OperationInfo;
 import software.amazon.awssdk.protocols.core.PathMarshaller;
 import software.amazon.awssdk.protocols.core.ProtocolUtils;
 import software.amazon.awssdk.regions.Region;
 import software.amazon.awssdk.services.s3.internal.S3EndpointUtils;
+import software.amazon.awssdk.services.s3.model.GetObjectRequest;
 import software.amazon.awssdk.services.s3.model.GetUrlRequest;
 import software.amazon.awssdk.utils.Validate;
 
@@ -46,8 +49,8 @@
  *
  * <pre>
  * S3Utilities utilities = S3Utilities.builder().region(Region.US_WEST_2).build()
- * GetUrlRequest request = GetUrlRequest.builder().bucket("foo-bucket").key("key-without-spaces").build()
- * URL url = pathStyleUtilities.getUrl(request);
+ * GetUrlRequest request = GetUrlRequest.builder().bucket("foo-bucket").key("key-without-spaces").build();
+ * URL url = utilities.getUrl(request);
  * </pre>
  * </p>
  *
@@ -58,8 +61,8 @@
  * <pre>
  * S3Client s3client = S3Client.create();
  * S3Utilities utilities = s3client.utilities();
- * GetUrlRequest request = GetUrlRequest.builder().bucket("foo-bucket").key("key-without-spaces").build()
- * URL url = pathStyleUtilities.getUrl(request);
+ * GetUrlRequest request = GetUrlRequest.builder().bucket("foo-bucket").key("key-without-spaces").build();
+ * URL url = utilities.getUrl(request);
  * </pre>
  * </p>
  *
@@ -68,10 +71,10 @@
 @Immutable
 @SdkPublicApi
 public final class S3Utilities {
-
     private final Region region;
-
     private final S3Configuration s3Configuration;
+    private final ProfileFile profileFile;
+    private final String profileName;
 
     /**
      * SDK currently validates that region is present while constructing {@link S3Utilities} object.
@@ -80,6 +83,8 @@ public final class S3Utilities {
     private S3Utilities(Builder builder) {
         this.region = Validate.paramNotNull(builder.region, "Region");
         this.s3Configuration = builder.s3Configuration;
+        this.profileFile = builder.profileFile;
+        this.profileName = builder.profileName;
     }
 
     /**
@@ -95,6 +100,8 @@ static S3Utilities create(SdkClientConfiguration clientConfiguration) {
         return S3Utilities.builder()
                           .region(clientConfiguration.option(AwsClientOption.AWS_REGION))
                           .s3Configuration((S3Configuration) clientConfiguration.option(SdkClientOption.SERVICE_CONFIGURATION))
+                          .profileFile(clientConfiguration.option(SdkClientOption.PROFILE_FILE))
+                          .profileName(clientConfiguration.option(SdkClientOption.PROFILE_NAME))
                           .build();
     }
 
@@ -140,19 +147,26 @@ public URL getUrl(Consumer<GetUrlRequest.Builder> getUrlRequest) {
     public URL getUrl(GetUrlRequest getUrlRequest) {
         Region resolvedRegion = resolveRegionForGetUrl(getUrlRequest);
         URI resolvedEndpoint = resolveEndpoint(getUrlRequest.endpoint(), resolvedRegion);
+        boolean endpointOverridden = getUrlRequest.endpoint() != null;
 
         SdkHttpFullRequest marshalledRequest = createMarshalledRequest(getUrlRequest, resolvedEndpoint);
 
+        GetObjectRequest getObjectRequest = GetObjectRequest.builder()
+                                                            .bucket(getUrlRequest.bucket())
+                                                            .key(getUrlRequest.key())
+                                                            .build();
+
         SdkHttpRequest httpRequest = S3EndpointUtils.applyEndpointConfiguration(marshalledRequest,
-                                                                                getUrlRequest,
+                                                                                getObjectRequest,
                                                                                 resolvedRegion,
                                                                                 s3Configuration,
-                                                                                getUrlRequest.bucket());
+                                                                                endpointOverridden)
+                                                    .sdkHttpRequest();
 
         try {
             return httpRequest.getUri().toURL();
         } catch (MalformedURLException exception) {
-            throw SdkException.create(String.format("Generated URI is malformed: " + httpRequest.getUri()),
+            throw SdkException.create("Generated URI is malformed: " + httpRequest.getUri(),
                                       exception);
         }
     }
@@ -170,7 +184,10 @@ private Region resolveRegionForGetUrl(GetUrlRequest getUrlRequest) {
      */
     private URI resolveEndpoint(URI endpoint, Region region) {
         return endpoint != null ? endpoint
-                                : EndpointUtils.buildEndpoint("https", "s3", region);
+                                : new DefaultServiceEndpointBuilder("s3", "https").withRegion(region)
+                                                                                  .withProfileFile(profileFile)
+                                                                                  .withProfileName(profileName)
+                                                                                  .getServiceEndpoint();
     }
 
     /**
@@ -202,6 +219,8 @@ public static final class Builder {
         private Region region;
 
         private S3Configuration s3Configuration;
+        private ProfileFile profileFile;
+        private String profileName;
 
         private Builder() {
         }
@@ -232,6 +251,26 @@ public Builder s3Configuration(S3Configuration s3Configuration) {
             return this;
         }
 
+        /**
+         * The profile file from the {@link ClientOverrideConfiguration#profileFile()}. This is private and only used when the
+         * utilities is created via {@link S3Client#utilities()}. This is not currently public because it may be less confusing
+         * to support the full {@link ClientOverrideConfiguration} object in the future.
+         */
+        private Builder profileFile(ProfileFile profileFile) {
+            this.profileFile = profileFile;
+            return this;
+        }
+
+        /**
+         * The profile name from the {@link ClientOverrideConfiguration#profileName()}. This is private and only used when the
+         * utilities is created via {@link S3Client#utilities()}. This is not currently public because it may be less confusing
+         * to support the full {@link ClientOverrideConfiguration} object in the future.
+         */
+        private Builder profileName(String profileName) {
+            this.profileName = profileName;
+            return this;
+        }
+
         /**
          * Construct a {@link S3Utilities} object.
          */
diff --git a/services/s3/src/main/java/software/amazon/awssdk/services/s3/checksums/ChecksumCalculatingAsyncRequestBody.java b/services/s3/src/main/java/software/amazon/awssdk/services/s3/checksums/ChecksumCalculatingAsyncRequestBody.java
index c4f262a1c710..48c56d82503c 100644
--- a/services/s3/src/main/java/software/amazon/awssdk/services/s3/checksums/ChecksumCalculatingAsyncRequestBody.java
+++ b/services/s3/src/main/java/software/amazon/awssdk/services/s3/checksums/ChecksumCalculatingAsyncRequestBody.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -42,6 +42,7 @@ public Optional<Long> contentLength() {
 
     @Override
     public void subscribe(Subscriber<? super ByteBuffer> s) {
+        sdkChecksum.reset();
         wrapped.subscribe(new ChecksumCalculatingSubscriber(s, sdkChecksum));
     }
 
diff --git a/services/s3/src/main/java/software/amazon/awssdk/services/s3/checksums/ChecksumCalculatingInputStream.java b/services/s3/src/main/java/software/amazon/awssdk/services/s3/checksums/ChecksumCalculatingInputStream.java
index 382f789865cb..f6fae1ff968f 100644
--- a/services/s3/src/main/java/software/amazon/awssdk/services/s3/checksums/ChecksumCalculatingInputStream.java
+++ b/services/s3/src/main/java/software/amazon/awssdk/services/s3/checksums/ChecksumCalculatingInputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/s3/src/main/java/software/amazon/awssdk/services/s3/checksums/ChecksumConstant.java b/services/s3/src/main/java/software/amazon/awssdk/services/s3/checksums/ChecksumConstant.java
index 03872809faca..fbe49e94eae3 100644
--- a/services/s3/src/main/java/software/amazon/awssdk/services/s3/checksums/ChecksumConstant.java
+++ b/services/s3/src/main/java/software/amazon/awssdk/services/s3/checksums/ChecksumConstant.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -55,5 +55,6 @@ public final class ChecksumConstant {
      */
     public static final int S3_MD5_CHECKSUM_LENGTH = 16;
 
-    private ChecksumConstant() {}
+    private ChecksumConstant() {
+    }
 }
diff --git a/services/s3/src/main/java/software/amazon/awssdk/services/s3/checksums/ChecksumValidatingInputStream.java b/services/s3/src/main/java/software/amazon/awssdk/services/s3/checksums/ChecksumValidatingInputStream.java
index 6b18f6403d7f..ab089377e8cc 100644
--- a/services/s3/src/main/java/software/amazon/awssdk/services/s3/checksums/ChecksumValidatingInputStream.java
+++ b/services/s3/src/main/java/software/amazon/awssdk/services/s3/checksums/ChecksumValidatingInputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -105,12 +105,12 @@ public int read(byte[] buf, int off, int len) throws IOException {
         int read = -1;
 
         if (lengthRead < strippedLength) {
-            long maxRead = Math.min((long) Integer.MAX_VALUE, strippedLength - lengthRead);
-            int maxIterRead = (int) Math.min(maxRead, (long) len);
+            long maxRead = Math.min(Integer.MAX_VALUE, strippedLength - lengthRead);
+            int maxIterRead = (int) Math.min(maxRead, len);
 
             read = inputStream.read(buf, off, maxIterRead);
 
-            int toUpdate = (int) Math.min(strippedLength - lengthRead, (long) read);
+            int toUpdate = (int) Math.min(strippedLength - lengthRead, read);
 
             if (toUpdate > 0) {
                 checkSum.update(buf, off, toUpdate);
diff --git a/services/s3/src/main/java/software/amazon/awssdk/services/s3/checksums/ChecksumValidatingPublisher.java b/services/s3/src/main/java/software/amazon/awssdk/services/s3/checksums/ChecksumValidatingPublisher.java
index 2b453f4ec0c8..2c871470d84e 100644
--- a/services/s3/src/main/java/software/amazon/awssdk/services/s3/checksums/ChecksumValidatingPublisher.java
+++ b/services/s3/src/main/java/software/amazon/awssdk/services/s3/checksums/ChecksumValidatingPublisher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/s3/src/main/java/software/amazon/awssdk/services/s3/checksums/ChecksumsEnabledValidator.java b/services/s3/src/main/java/software/amazon/awssdk/services/s3/checksums/ChecksumsEnabledValidator.java
index e74438c33a85..6c2afec748f0 100644
--- a/services/s3/src/main/java/software/amazon/awssdk/services/s3/checksums/ChecksumsEnabledValidator.java
+++ b/services/s3/src/main/java/software/amazon/awssdk/services/s3/checksums/ChecksumsEnabledValidator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -32,6 +32,8 @@
 import software.amazon.awssdk.core.interceptor.ExecutionAttributes;
 import software.amazon.awssdk.core.interceptor.SdkExecutionAttribute;
 import software.amazon.awssdk.http.SdkHttpHeaders;
+import software.amazon.awssdk.http.SdkHttpRequest;
+import software.amazon.awssdk.http.SdkHttpResponse;
 import software.amazon.awssdk.services.s3.S3Client;
 import software.amazon.awssdk.services.s3.S3Configuration;
 import software.amazon.awssdk.services.s3.internal.handlers.AsyncChecksumValidationInterceptor;
@@ -84,14 +86,13 @@ public static boolean getObjectChecksumEnabledPerResponse(SdkRequest request, Sd
      *
      * @param expectedClientType - The expected client type for enabling checksums
      * @param executionAttributes - {@link ExecutionAttributes} to determine the actual client type
-     * @param sdkHttpHeaders A map of headers for a given request
      * @return If trailing checksums should be enabled for this request.
      */
-    public static boolean putObjectChecksumEnabled(SdkRequest request,
-                                                   ClientType expectedClientType,
-                                                   ExecutionAttributes executionAttributes,
-                                                   SdkHttpHeaders sdkHttpHeaders) {
-        if (!(request instanceof PutObjectRequest)) {
+    public static boolean shouldRecordChecksum(SdkRequest sdkRequest,
+                                               ClientType expectedClientType,
+                                               ExecutionAttributes executionAttributes,
+                                               SdkHttpRequest httpRequest) {
+        if (!(sdkRequest instanceof PutObjectRequest)) {
             return false;
         }
 
@@ -101,21 +102,33 @@ public static boolean putObjectChecksumEnabled(SdkRequest request,
             return false;
         }
 
-        // S3 doesn't support trailing checksums for customer encryption
-        if (sdkHttpHeaders.firstMatchingHeader(SERVER_SIDE_CUSTOMER_ENCRYPTION_HEADER).isPresent()) {
-            return false;
-        }
 
-        // S3 doesn't support trailing checksums for KMS encrypted objects
-        if (sdkHttpHeaders.firstMatchingHeader(SERVER_SIDE_ENCRYPTION_HEADER)
-                          .filter(h -> h.contains(AWS_KMS.toString()))
-                          .isPresent()) {
+        if (hasServerSideEncryptionHeader(httpRequest)) {
             return false;
         }
 
         return checksumEnabledPerConfig(executionAttributes);
     }
 
+    public static boolean responseChecksumIsValid(SdkHttpResponse httpResponse) {
+        return !hasServerSideEncryptionHeader(httpResponse);
+    }
+
+    private static boolean hasServerSideEncryptionHeader(SdkHttpHeaders httpRequest) {
+        // S3 doesn't support trailing checksums for customer encryption
+        if (httpRequest.firstMatchingHeader(SERVER_SIDE_CUSTOMER_ENCRYPTION_HEADER).isPresent()) {
+            return true;
+        }
+
+        // S3 doesn't support trailing checksums for KMS encrypted objects
+        if (httpRequest.firstMatchingHeader(SERVER_SIDE_ENCRYPTION_HEADER)
+                       .filter(h -> h.contains(AWS_KMS.toString()))
+                       .isPresent()) {
+            return true;
+        }
+        return false;
+    }
+
     /**
      * Client side validation for {@link PutObjectRequest}
      *
@@ -131,7 +144,9 @@ public static void validatePutObjectChecksum(PutObjectResponse response, Executi
             byte[] ssHash = Base16Lower.decode(response.eTag().replace("\"", ""));
 
             if (!Arrays.equals(digest, ssHash)) {
-                throw SdkClientException.create("Data read has a different checksum than expected.");
+                throw SdkClientException.create(
+                    String.format("Data read has a different checksum than expected. Was 0x%s, but expected 0x%s",
+                                  BinaryUtils.toHex(digest), BinaryUtils.toHex(ssHash)));
             }
         }
     }
diff --git a/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/BucketUtils.java b/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/BucketUtils.java
index 781d6d202b7e..9e6a31a7531d 100644
--- a/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/BucketUtils.java
+++ b/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/BucketUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/ConfiguredS3SdkHttpRequest.java b/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/ConfiguredS3SdkHttpRequest.java
new file mode 100644
index 000000000000..72f31f2e6a54
--- /dev/null
+++ b/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/ConfiguredS3SdkHttpRequest.java
@@ -0,0 +1,103 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.services.s3.internal;
+
+import java.util.Optional;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.http.SdkHttpRequest;
+import software.amazon.awssdk.regions.Region;
+import software.amazon.awssdk.utils.Validate;
+import software.amazon.awssdk.utils.builder.CopyableBuilder;
+import software.amazon.awssdk.utils.builder.ToCopyableBuilder;
+
+@SdkInternalApi
+public class ConfiguredS3SdkHttpRequest
+        implements ToCopyableBuilder<ConfiguredS3SdkHttpRequest.Builder, ConfiguredS3SdkHttpRequest> {
+    private final SdkHttpRequest sdkHttpRequest;
+    private final Region signingRegionModification;
+
+    private ConfiguredS3SdkHttpRequest(Builder builder) {
+        this.sdkHttpRequest = Validate.notNull(builder.sdkHttpRequest, "sdkHttpRequest");
+        this.signingRegionModification = builder.signingRegionModification;
+    }
+
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    public SdkHttpRequest sdkHttpRequest() {
+        return sdkHttpRequest;
+    }
+
+    public Optional<Region> signingRegionModification() {
+        return Optional.ofNullable(signingRegionModification);
+    }
+
+    @Override
+    public Builder toBuilder() {
+        return builder().sdkHttpRequest(sdkHttpRequest).signingRegionModification(signingRegionModification);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        ConfiguredS3SdkHttpRequest that = (ConfiguredS3SdkHttpRequest) o;
+
+        if (sdkHttpRequest != null ? ! sdkHttpRequest.equals(that.sdkHttpRequest) : that.sdkHttpRequest != null) {
+            return false;
+        }
+        return signingRegionModification != null ?
+            signingRegionModification.equals(that.signingRegionModification)
+            : that.signingRegionModification == null;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = sdkHttpRequest != null ? sdkHttpRequest.hashCode() : 0;
+        result = 31 * result + (signingRegionModification != null ? signingRegionModification.hashCode() : 0);
+        return result;
+    }
+
+    public static class Builder implements CopyableBuilder<Builder, ConfiguredS3SdkHttpRequest> {
+        private SdkHttpRequest sdkHttpRequest;
+        private Region signingRegionModification;
+
+        private Builder() {
+        }
+
+        public Builder sdkHttpRequest(SdkHttpRequest sdkHttpRequest) {
+            this.sdkHttpRequest = sdkHttpRequest;
+            return this;
+        }
+
+        public Builder signingRegionModification(Region signingRegionModification) {
+            this.signingRegionModification = signingRegionModification;
+            return this;
+        }
+
+        @Override
+        public ConfiguredS3SdkHttpRequest build() {
+            return new ConfiguredS3SdkHttpRequest(this);
+        }
+    }
+
+}
diff --git a/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/FieldWithDefault.java b/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/FieldWithDefault.java
new file mode 100644
index 000000000000..9c1f9ca8ee17
--- /dev/null
+++ b/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/FieldWithDefault.java
@@ -0,0 +1,123 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.services.s3.internal;
+
+import java.util.function.Supplier;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.utils.Lazy;
+
+/**
+ * A helper class for setting a field's value to a default if it isn't specified, while still keeping track of whether the value
+ * was from the default or from the field.
+ *
+ * For example, a "profile name" field-with-default might be set to "null" with a default of "foo". {@link #value()} returns
+ * "foo", while {@link #isDefault()} can be used to keep track of the fact that the value was from the default.
+ */
+@SdkInternalApi
+public abstract class FieldWithDefault<T> {
+    private FieldWithDefault(){
+    }
+
+    /**
+     * Create a {@link FieldWithDefault} using the provided field and its default value. If the field is null, the default value
+     * will be returned by {@link #value()} and {@link #isDefault()} will return true. If the field is not null, the field value
+     * will be returned by {@link #value()} and {@link #isDefault()} will return false.
+     *
+     * @see #createLazy(Object, Supplier)
+     */
+    public static <T> FieldWithDefault<T> create(T field, T defaultValue) {
+        return new Impl<>(field, defaultValue);
+    }
+
+    /**
+     * Create a {@link FieldWithDefault} using the provided field and its default value. If the field is null, the default value
+     * will be returned by {@link #value()} and {@link #isDefault()} will return true. If the field is not null, the field value
+     * will be returned by {@link #value()} and {@link #isDefault()} will return false.
+     *
+     * <p>This differs from {@link #create(Object, Object)} in that the default value won't be resolved if the provided field is
+     * not null. The default value also won't be resolved until the first {@link #value()} call. This is useful for delaying
+     * expensive calculations until right before they're needed.
+     */
+    public static <T> FieldWithDefault<T> createLazy(T field, Supplier<T> defaultValue) {
+        return new LazyImpl<>(field, defaultValue);
+    }
+
+    /**
+     * Retrieve the value of this field.
+     */
+    public abstract T value();
+
+    /**
+     * True, if the value returned by {@link #value()} is the default value (i.e. the field is null). False otherwise.
+     */
+    public abstract boolean isDefault();
+
+    /**
+     * Return the field exactly as it was specified when the field-with-default was created. If the field was null, this will
+     * return null. This will not resolve the default if this is a field from {@link #createLazy(Object, Supplier)}.
+     */
+    public abstract T valueOrNullIfDefault();
+
+    private static class Impl<T> extends FieldWithDefault<T> {
+        private final T value;
+        private final boolean isDefault;
+
+        private Impl(T field, T defaultValue) {
+            this.value = field != null ? field : defaultValue;
+            this.isDefault = field == null;
+        }
+
+        @Override
+        public T value() {
+            return value;
+        }
+
+        @Override
+        public boolean isDefault() {
+            return isDefault;
+        }
+
+        @Override
+        public T valueOrNullIfDefault() {
+            return isDefault ? null : value;
+        }
+    }
+
+    private static class LazyImpl<T> extends FieldWithDefault<T> {
+        private final Lazy<T> value;
+        private final boolean isDefault;
+
+        private LazyImpl(T field, Supplier<T> defaultValue) {
+            this.value = field != null ? new Lazy<>(() -> field) : new Lazy<>(defaultValue);
+            this.isDefault = field == null;
+        }
+
+        @Override
+        public T value() {
+            return value.getValue();
+        }
+
+        @Override
+        public boolean isDefault() {
+            return isDefault;
+        }
+
+        @Override
+        public T valueOrNullIfDefault() {
+            return isDefault ? null : value.getValue();
+        }
+    }
+}
diff --git a/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/S3EndpointUtils.java b/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/S3EndpointUtils.java
index f20068fc8a2e..41d1455035fc 100644
--- a/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/S3EndpointUtils.java
+++ b/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/S3EndpointUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -22,13 +22,22 @@
 import java.util.Arrays;
 import java.util.List;
 import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.arns.Arn;
+import software.amazon.awssdk.core.SdkRequest;
 import software.amazon.awssdk.http.SdkHttpRequest;
+import software.amazon.awssdk.regions.PartitionMetadata;
 import software.amazon.awssdk.regions.Region;
 import software.amazon.awssdk.regions.RegionMetadata;
 import software.amazon.awssdk.services.s3.S3Configuration;
+import software.amazon.awssdk.services.s3.internal.resource.S3AccessPointBuilder;
+import software.amazon.awssdk.services.s3.internal.resource.S3AccessPointResource;
+import software.amazon.awssdk.services.s3.internal.resource.S3ArnConverter;
+import software.amazon.awssdk.services.s3.internal.resource.S3Resource;
+import software.amazon.awssdk.services.s3.internal.resource.S3ResourceType;
 import software.amazon.awssdk.services.s3.model.CreateBucketRequest;
 import software.amazon.awssdk.services.s3.model.DeleteBucketRequest;
 import software.amazon.awssdk.services.s3.model.ListBucketsRequest;
+import software.amazon.awssdk.utils.Validate;
 
 /**
  * Utilities for working with Amazon S3 bucket names, such as validation and
@@ -47,11 +56,18 @@ private S3EndpointUtils() {
      * Returns a new instance of the given {@link SdkHttpRequest} by applying any endpoint changes based on
      * the given {@link S3Configuration} options.
      */
-    public static SdkHttpRequest applyEndpointConfiguration(SdkHttpRequest request,
-                                                            Object originalRequest,
-                                                            Region region,
-                                                            S3Configuration serviceConfiguration,
-                                                            String bucketName) {
+    public static ConfiguredS3SdkHttpRequest applyEndpointConfiguration(SdkHttpRequest request,
+                                                                        SdkRequest originalRequest,
+                                                                        Region region,
+                                                                        S3Configuration serviceConfiguration,
+                                                                        boolean endpointOverridden) {
+        String bucketName = originalRequest.getValueForField("Bucket", String.class).orElse(null);
+        String key = originalRequest.getValueForField("Key", String.class).orElse(null);
+
+        if (bucketName != null && isArn(bucketName)) {
+            return applyEndpointConfigurationForAccessPointArn(request, region, endpointOverridden,
+                                                               serviceConfiguration, bucketName, key);
+        }
 
         SdkHttpRequest.Builder mutableRequest = request.toBuilder();
 
@@ -66,7 +82,108 @@ public static SdkHttpRequest applyEndpointConfiguration(SdkHttpRequest request,
             }
         }
 
-        return mutableRequest.build();
+        return ConfiguredS3SdkHttpRequest.builder()
+                                         .sdkHttpRequest(mutableRequest.build())
+                                         .build();
+    }
+
+    private static ConfiguredS3SdkHttpRequest applyEndpointConfigurationForAccessPointArn(
+            SdkHttpRequest request,
+            Region region,
+            boolean endpointOverridden,
+            S3Configuration serviceConfiguration,
+            String bucketName,
+            String key) {
+
+        Arn resourceArn = Arn.fromString(bucketName);
+        S3Resource s3Resource = S3ArnConverter.create().convertArn(resourceArn);
+
+        if (S3ResourceType.fromValue(s3Resource.type()) != S3ResourceType.ACCESS_POINT) {
+            throw new IllegalArgumentException("An ARN was passed as a bucket parameter to an S3 operation, "
+                                               + "however it does not appear to be a valid S3 access point ARN.");
+        }
+
+        String arnRegion = resourceArn.region().orElseThrow(() -> new IllegalArgumentException(
+            "An S3 access point ARN must have a region"));
+
+        if (isFipsRegion(region.toString())) {
+            throw new IllegalArgumentException("An access point ARN cannot be passed as a bucket parameter to an S3"
+                                               + " operation if the S3 client has been configured with a FIPS"
+                                               + " enabled region.");
+        }
+
+        if (serviceConfiguration != null && serviceConfiguration.accelerateModeEnabled()) {
+            throw new IllegalArgumentException("An access point ARN cannot be passed as a bucket parameter to an S3 "
+                                               + "operation if the S3 client has been configured with accelerate mode"
+                                               + " enabled.");
+        }
+
+        if (serviceConfiguration != null && serviceConfiguration.pathStyleAccessEnabled()) {
+            throw new IllegalArgumentException("An access point ARN cannot be passed as a bucket parameter to an S3 "
+                                               + "operation if the S3 client has been configured with path style "
+                                               + "addressing enabled.");
+        }
+
+        if (endpointOverridden) {
+            throw new IllegalArgumentException("An access point ARN cannot be passed as a bucket parameter to an S3"
+                                               + " operation if the S3 client has been configured with an endpoint "
+                                               + "override.");
+        }
+
+        if (serviceConfiguration == null || !serviceConfiguration.useArnRegionEnabled()) {
+            if (!region.id().equals(arnRegion)) {
+                throw new IllegalArgumentException(
+                    String.format("The region field of the ARN being passed as a bucket parameter to an S3 operation "
+                                  + "does not match the region the client was configured with. To enable this "
+                                  + "behavior and prevent this exception set 'useArnRegionEnabled' to true in the "
+                                  + "configuration when building the S3 client. Provided region: '%s'; client region:"
+                                  + " '%s'.", arnRegion, region));
+            }
+        }
+
+        PartitionMetadata clientPartitionMetadata = PartitionMetadata.of(region);
+        String clientPartition = clientPartitionMetadata.id();
+
+        if (clientPartition == null || clientPartition.isEmpty() || !s3Resource.partition().isPresent()
+            || !clientPartition.equals(s3Resource.partition().get())) {
+            throw new IllegalArgumentException(
+                String.format("The partition field of the ARN being passed as a bucket parameter to an S3 operation "
+                              + "does not match the partition the S3 client has been configured with. Provided "
+                              + "partition: '%s'; client partition: '%s'.", s3Resource.partition().orElse(""),
+                              clientPartition));
+        }
+
+        S3AccessPointResource s3EndpointResource =
+            Validate.isInstanceOf(S3AccessPointResource.class, s3Resource,
+                                  "An ARN was passed as a bucket parameter to an S3 operation, however it does not "
+                                  + "appear to be a valid S3 access point ARN.");
+
+        // DualstackEnabled considered false by default
+        boolean dualstackEnabled = serviceConfiguration != null && serviceConfiguration.dualstackEnabled();
+
+        URI accessPointUri =
+            S3AccessPointBuilder.create()
+                                .accessPointName(s3EndpointResource.accessPointName())
+                                .accountId(
+                                    s3EndpointResource.accountId().orElseThrow(() -> new IllegalArgumentException(
+                                        "An S3 access point ARN must have an account ID")))
+                                .region(arnRegion)
+                                .protocol(request.protocol())
+                                .domain(clientPartitionMetadata.dnsSuffix())
+                                .dualstackEnabled(dualstackEnabled)
+                                .toUri();
+
+        SdkHttpRequest httpRequest = request.toBuilder()
+                                            .protocol(accessPointUri.getScheme())
+                                            .host(accessPointUri.getHost())
+                                            .port(accessPointUri.getPort())
+                                            .encodedPath(key)
+                                            .build();
+
+        return ConfiguredS3SdkHttpRequest.builder()
+                                         .sdkHttpRequest(httpRequest)
+                                         .signingRegionModification(Region.of(arnRegion))
+                                         .build();
     }
 
     /**
@@ -75,12 +192,14 @@ public static SdkHttpRequest applyEndpointConfiguration(SdkHttpRequest request,
      * a regional dualstack endpoint for IPV6 (i.e. s3.dualstack.us-east-1.amazonaws.com).
      */
     private static URI resolveEndpoint(SdkHttpRequest request,
-                                       Object originalRequest,
+                                       SdkRequest originalRequest,
                                        Region region,
                                        S3Configuration serviceConfiguration) {
-        RegionMetadata regionMetadata = RegionMetadata.of(region);
+
         String protocol = request.protocol();
 
+        RegionMetadata regionMetadata = RegionMetadata.of(region);
+
         if (isAccelerateEnabled(serviceConfiguration) && isAccelerateSupported(originalRequest)) {
             return accelerateEndpoint(serviceConfiguration, regionMetadata, protocol);
         }
@@ -128,7 +247,7 @@ private static boolean isAccelerateEnabled(S3Configuration serviceConfiguration)
      * @param originalRequest Request object to identify the operation.
      * @return True if accelerate is supported for the given operation, false if not.
      */
-    private static boolean isAccelerateSupported(Object originalRequest) {
+    private static boolean isAccelerateSupported(SdkRequest originalRequest) {
         return !ACCELERATE_DISABLED_OPERATIONS.contains(originalRequest.getClass());
     }
 
@@ -149,4 +268,12 @@ private static URI toUri(String protocol, String endpoint) {
             throw new IllegalArgumentException(e);
         }
     }
+
+    private static boolean isArn(String s) {
+        return s.startsWith("arn:");
+    }
+
+    private static boolean isFipsRegion(String region) {
+        return region.startsWith("fips-") || region.endsWith("-fips");
+    }
 }
diff --git a/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/S3HttpConfigurationOptions.java b/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/S3HttpConfigurationOptions.java
deleted file mode 100644
index 02d9dc8129b8..000000000000
--- a/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/S3HttpConfigurationOptions.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.s3.internal;
-
-import java.time.Duration;
-import software.amazon.awssdk.annotations.SdkInternalApi;
-import software.amazon.awssdk.http.SdkHttpConfigurationOption;
-import software.amazon.awssdk.utils.AttributeMap;
-
-/**
- * S3 specific http configurations
- */
-@SdkInternalApi
-public final class S3HttpConfigurationOptions {
-    private static final AttributeMap OPTIONS = AttributeMap
-        .builder()
-        .put(SdkHttpConfigurationOption.CONNECTION_MAX_IDLE_TIMEOUT, Duration.ofSeconds(5))
-        .build();
-
-    private S3HttpConfigurationOptions() {
-    }
-
-    public static AttributeMap defaultHttpConfig() {
-        return OPTIONS;
-    }
-}
diff --git a/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/TaggingAdapter.java b/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/TaggingAdapter.java
index 85a46964fbe6..c9d97e6e4090 100644
--- a/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/TaggingAdapter.java
+++ b/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/TaggingAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/handlers/AddContentMd5HeaderInterceptor.java b/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/handlers/AddContentMd5HeaderInterceptor.java
index c113782c1eab..8d2510e329de 100644
--- a/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/handlers/AddContentMd5HeaderInterceptor.java
+++ b/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/handlers/AddContentMd5HeaderInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/handlers/AsyncChecksumValidationInterceptor.java b/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/handlers/AsyncChecksumValidationInterceptor.java
index ec94f4b40912..af691aae4ee5 100644
--- a/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/handlers/AsyncChecksumValidationInterceptor.java
+++ b/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/handlers/AsyncChecksumValidationInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -19,7 +19,8 @@
 import static software.amazon.awssdk.services.s3.checksums.ChecksumConstant.CONTENT_LENGTH_HEADER;
 import static software.amazon.awssdk.services.s3.checksums.ChecksumsEnabledValidator.CHECKSUM;
 import static software.amazon.awssdk.services.s3.checksums.ChecksumsEnabledValidator.getObjectChecksumEnabledPerResponse;
-import static software.amazon.awssdk.services.s3.checksums.ChecksumsEnabledValidator.putObjectChecksumEnabled;
+import static software.amazon.awssdk.services.s3.checksums.ChecksumsEnabledValidator.responseChecksumIsValid;
+import static software.amazon.awssdk.services.s3.checksums.ChecksumsEnabledValidator.shouldRecordChecksum;
 import static software.amazon.awssdk.services.s3.checksums.ChecksumsEnabledValidator.validatePutObjectChecksum;
 
 import java.nio.ByteBuffer;
@@ -30,6 +31,7 @@
 import software.amazon.awssdk.core.checksums.Md5Checksum;
 import software.amazon.awssdk.core.checksums.SdkChecksum;
 import software.amazon.awssdk.core.interceptor.Context;
+import software.amazon.awssdk.core.interceptor.ExecutionAttribute;
 import software.amazon.awssdk.core.interceptor.ExecutionAttributes;
 import software.amazon.awssdk.core.interceptor.ExecutionInterceptor;
 import software.amazon.awssdk.services.s3.checksums.ChecksumCalculatingAsyncRequestBody;
@@ -38,16 +40,16 @@
 
 @SdkInternalApi
 public final class AsyncChecksumValidationInterceptor implements ExecutionInterceptor {
+    private static ExecutionAttribute<Boolean> ASYNC_RECORDING_CHECKSUM = new ExecutionAttribute<>("asyncRecordingChecksum");
 
     @Override
     public Optional<AsyncRequestBody> modifyAsyncHttpContent(Context.ModifyHttpRequest context,
                                                              ExecutionAttributes executionAttributes) {
+        boolean shouldRecordChecksum = shouldRecordChecksum(context.request(), ASYNC, executionAttributes, context.httpRequest());
 
-        boolean putObjectTrailingChecksumsEnabled =
-            putObjectChecksumEnabled(context.request(), ASYNC, executionAttributes, context.httpRequest());
-
-        if (putObjectTrailingChecksumsEnabled && context.asyncRequestBody().isPresent()) {
+        if (shouldRecordChecksum && context.asyncRequestBody().isPresent()) {
             SdkChecksum checksum = new Md5Checksum();
+            executionAttributes.putAttribute(ASYNC_RECORDING_CHECKSUM, true);
             executionAttributes.putAttribute(CHECKSUM, checksum);
             return Optional.of(new ChecksumCalculatingAsyncRequestBody(context.asyncRequestBody().get(), checksum));
         }
@@ -58,7 +60,6 @@ public Optional<AsyncRequestBody> modifyAsyncHttpContent(Context.ModifyHttpReque
     @Override
     public Optional<Publisher<ByteBuffer>> modifyAsyncHttpResponseContent(Context.ModifyHttpResponse context,
                                                                           ExecutionAttributes executionAttributes) {
-
         if (getObjectChecksumEnabledPerResponse(context.request(), context.httpResponse())
             && context.responsePublisher().isPresent()) {
             long contentLength = context.httpResponse()
@@ -78,11 +79,10 @@ public Optional<Publisher<ByteBuffer>> modifyAsyncHttpResponseContent(Context.Mo
 
     @Override
     public void afterUnmarshalling(Context.AfterUnmarshalling context, ExecutionAttributes executionAttributes) {
+        boolean recordingChecksum = Boolean.TRUE.equals(executionAttributes.getAttribute(ASYNC_RECORDING_CHECKSUM));
+        boolean responseChecksumIsValid = responseChecksumIsValid(context.httpResponse());
 
-        boolean putObjectChecksumsEnabled =
-            putObjectChecksumEnabled(context.request(), ASYNC, executionAttributes, context.httpRequest());
-
-        if (putObjectChecksumsEnabled) {
+        if (recordingChecksum && responseChecksumIsValid) {
             validatePutObjectChecksum((PutObjectResponse) context.response(), executionAttributes);
         }
     }
diff --git a/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/handlers/CreateBucketInterceptor.java b/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/handlers/CreateBucketInterceptor.java
index 81e525504a4f..5bb616f8cd0d 100644
--- a/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/handlers/CreateBucketInterceptor.java
+++ b/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/handlers/CreateBucketInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/handlers/CreateMultipartUploadRequestInterceptor.java b/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/handlers/CreateMultipartUploadRequestInterceptor.java
index 5c678d2f2c82..94bf44339df1 100644
--- a/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/handlers/CreateMultipartUploadRequestInterceptor.java
+++ b/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/handlers/CreateMultipartUploadRequestInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/handlers/DecodeUrlEncodedResponseInterceptor.java b/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/handlers/DecodeUrlEncodedResponseInterceptor.java
index 9a2e26b76eb4..3a94b74d9e14 100644
--- a/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/handlers/DecodeUrlEncodedResponseInterceptor.java
+++ b/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/handlers/DecodeUrlEncodedResponseInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -17,6 +17,7 @@
 
 import static software.amazon.awssdk.utils.http.SdkHttpUtils.urlDecode;
 
+import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 import software.amazon.awssdk.annotations.SdkInternalApi;
@@ -24,9 +25,14 @@
 import software.amazon.awssdk.core.interceptor.Context;
 import software.amazon.awssdk.core.interceptor.ExecutionAttributes;
 import software.amazon.awssdk.core.interceptor.ExecutionInterceptor;
+import software.amazon.awssdk.services.s3.model.CommonPrefix;
 import software.amazon.awssdk.services.s3.model.EncodingType;
+import software.amazon.awssdk.services.s3.model.ListMultipartUploadsResponse;
+import software.amazon.awssdk.services.s3.model.ListObjectVersionsResponse;
 import software.amazon.awssdk.services.s3.model.ListObjectsResponse;
 import software.amazon.awssdk.services.s3.model.ListObjectsV2Response;
+import software.amazon.awssdk.services.s3.model.MultipartUpload;
+import software.amazon.awssdk.services.s3.model.ObjectVersion;
 import software.amazon.awssdk.services.s3.model.S3Object;
 
 /**
@@ -50,9 +56,19 @@ public SdkResponse modifyResponse(Context.ModifyResponse context,
         SdkResponse response = context.response();
         if (shouldHandle(response)) {
             if (response instanceof ListObjectsResponse) {
-                response = modifyListObjectsResponse((ListObjectsResponse) response);
-            } else if (response instanceof ListObjectsV2Response) {
-                response = modifyListObjectsV2Response((ListObjectsV2Response) response);
+                return modifyListObjectsResponse((ListObjectsResponse) response);
+            }
+
+            if (response instanceof ListObjectsV2Response) {
+                return modifyListObjectsV2Response((ListObjectsV2Response) response);
+            }
+
+            if (response instanceof ListObjectVersionsResponse) {
+                return modifyListObjectVersionsResponse((ListObjectVersionsResponse) response);
+            }
+
+            if (response instanceof ListMultipartUploadsResponse) {
+                return modifyListMultipartUploadsResponse((ListMultipartUploadsResponse) response);
             }
         }
         return response;
@@ -67,30 +83,90 @@ private static boolean shouldHandle(SdkResponse sdkResponse) {
     // Elements to decode: Delimiter, Marker, Prefix, NextMarker, Key
     private static SdkResponse modifyListObjectsResponse(ListObjectsResponse response) {
         return response.toBuilder()
-                .delimiter(urlDecode(response.delimiter()))
-                .marker(urlDecode(response.delimiter()))
-                .prefix(urlDecode(response.prefix()))
-                .nextMarker(urlDecode(response.nextMarker()))
-                .contents(decodeContents(response.contents()))
-                .build();
+                       .delimiter(urlDecode(response.delimiter()))
+                       .marker(urlDecode(response.marker()))
+                       .prefix(urlDecode(response.prefix()))
+                       .nextMarker(urlDecode(response.nextMarker()))
+                       .contents(decodeContents(response.contents()))
+                       .commonPrefixes(decodeCommonPrefixes(response.commonPrefixes()))
+                       .build();
     }
 
     // Elements to decode: Delimiter, Prefix, Key, and StartAfter
     private static SdkResponse modifyListObjectsV2Response(ListObjectsV2Response response) {
         return response.toBuilder()
-                .delimiter(urlDecode(response.delimiter()))
-                .prefix(urlDecode(response.prefix()))
-                .startAfter(urlDecode(response.startAfter()))
-                .contents(decodeContents(response.contents()))
-                .build();
+                       .delimiter(urlDecode(response.delimiter()))
+                       .prefix(urlDecode(response.prefix()))
+                       .startAfter(urlDecode(response.startAfter()))
+                       .contents(decodeContents(response.contents()))
+                       .commonPrefixes(decodeCommonPrefixes(response.commonPrefixes()))
+                       .build();
+    }
+
+    // https://docs.aws.amazon.com/AmazonS3/latest/API/API_ListObjectVersions.html
+    // Elements to decode: Delimiter, KeyMarker, NextKeyMarker, Prefix
+    private SdkResponse modifyListObjectVersionsResponse(ListObjectVersionsResponse response) {
+
+        return response.toBuilder()
+                       .prefix(urlDecode(response.prefix()))
+                       .keyMarker(urlDecode(response.keyMarker()))
+                       .delimiter(urlDecode(response.delimiter()))
+                       .nextKeyMarker(urlDecode(response.nextKeyMarker()))
+                       .commonPrefixes(decodeCommonPrefixes(response.commonPrefixes()))
+                       .versions(decodeObjectVersions(response.versions()))
+                       .build();
+    }
+
+    // https://docs.aws.amazon.com/AmazonS3/latest/API/API_ListMultipartUploads.html
+    // Elements to decode: Delimiter, KeyMarker, NextKeyMarker, Prefix, Key
+    private SdkResponse modifyListMultipartUploadsResponse(ListMultipartUploadsResponse response) {
+        return response.toBuilder()
+                       .delimiter(urlDecode(response.delimiter()))
+                       .keyMarker(urlDecode(response.keyMarker()))
+                       .nextKeyMarker(urlDecode(response.nextKeyMarker()))
+                       .prefix(urlDecode(response.prefix()))
+                       .commonPrefixes(decodeCommonPrefixes(response.commonPrefixes()))
+                       .uploads(decodeMultipartUpload(response.uploads()))
+                       .build();
+
     }
 
     private static List<S3Object> decodeContents(List<S3Object> contents) {
         if (contents == null) {
             return null;
         }
-        return contents.stream()
-                       .map(o -> o.toBuilder().key(urlDecode(o.key())).build())
-                       .collect(Collectors.toList());
+        return Collections.unmodifiableList(contents.stream()
+                                                     .map(o -> o.toBuilder().key(urlDecode(o.key())).build())
+                                                     .collect(Collectors.toList()));
+    }
+
+    private static List<ObjectVersion> decodeObjectVersions(List<ObjectVersion> objectVersions) {
+        if (objectVersions == null) {
+            return null;
+        }
+
+        return Collections.unmodifiableList(objectVersions.stream()
+                                                          .map(o -> o.toBuilder().key(urlDecode(o.key())).build())
+                                                          .collect(Collectors.toList()));
+    }
+
+    private static List<CommonPrefix> decodeCommonPrefixes(List<CommonPrefix> commonPrefixes) {
+        if (commonPrefixes == null) {
+            return null;
+        }
+
+        return Collections.unmodifiableList(commonPrefixes.stream()
+                                                          .map(p -> p.toBuilder().prefix(urlDecode(p.prefix())).build())
+                                                          .collect(Collectors.toList()));
+    }
+
+    private static List<MultipartUpload> decodeMultipartUpload(List<MultipartUpload> multipartUploads) {
+        if (multipartUploads == null) {
+            return null;
+        }
+
+        return Collections.unmodifiableList(multipartUploads.stream()
+                                                            .map(u -> u.toBuilder().key(urlDecode(u.key())).build())
+                                                            .collect(Collectors.toList()));
     }
 }
diff --git a/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/handlers/DisableDoubleUrlEncodingInterceptor.java b/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/handlers/DisableDoubleUrlEncodingInterceptor.java
index 5547310f112e..211a44719e7b 100644
--- a/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/handlers/DisableDoubleUrlEncodingInterceptor.java
+++ b/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/handlers/DisableDoubleUrlEncodingInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/handlers/EnableChunkedEncodingInterceptor.java b/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/handlers/EnableChunkedEncodingInterceptor.java
index ec11b919128c..4788782e9cf2 100644
--- a/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/handlers/EnableChunkedEncodingInterceptor.java
+++ b/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/handlers/EnableChunkedEncodingInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/handlers/EnableTrailingChecksumInterceptor.java b/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/handlers/EnableTrailingChecksumInterceptor.java
index c18455351db6..95efceb68dd7 100644
--- a/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/handlers/EnableTrailingChecksumInterceptor.java
+++ b/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/handlers/EnableTrailingChecksumInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -30,6 +30,7 @@
 import software.amazon.awssdk.http.SdkHttpResponse;
 import software.amazon.awssdk.services.s3.model.GetObjectRequest;
 import software.amazon.awssdk.services.s3.model.GetObjectResponse;
+import software.amazon.awssdk.utils.Validate;
 
 @SdkInternalApi
 public final class EnableTrailingChecksumInterceptor implements ExecutionInterceptor {
@@ -60,7 +61,11 @@ public SdkResponse modifyResponse(Context.ModifyResponse context, ExecutionAttri
 
         if (getObjectChecksumEnabledPerResponse(context.request(), httpResponse)) {
             GetObjectResponse getResponse = (GetObjectResponse) response;
-            return getResponse.toBuilder().contentLength(getResponse.contentLength() - S3_MD5_CHECKSUM_LENGTH).build();
+            Long contentLength = getResponse.contentLength();
+            Validate.notNull(contentLength, "Service returned null 'Content-Length'.");
+            return getResponse.toBuilder()
+                              .contentLength(contentLength - S3_MD5_CHECKSUM_LENGTH)
+                              .build();
         }
 
         return response;
diff --git a/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/handlers/EndpointAddressInterceptor.java b/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/handlers/EndpointAddressInterceptor.java
index 6c7bfe52c5b1..9b0fecca4137 100644
--- a/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/handlers/EndpointAddressInterceptor.java
+++ b/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/handlers/EndpointAddressInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -18,12 +18,13 @@
 import software.amazon.awssdk.annotations.SdkInternalApi;
 import software.amazon.awssdk.auth.signer.AwsSignerExecutionAttribute;
 import software.amazon.awssdk.awscore.AwsExecutionAttribute;
-import software.amazon.awssdk.core.SdkRequest;
 import software.amazon.awssdk.core.interceptor.Context;
 import software.amazon.awssdk.core.interceptor.ExecutionAttributes;
 import software.amazon.awssdk.core.interceptor.ExecutionInterceptor;
+import software.amazon.awssdk.core.interceptor.SdkExecutionAttribute;
 import software.amazon.awssdk.http.SdkHttpRequest;
 import software.amazon.awssdk.services.s3.S3Configuration;
+import software.amazon.awssdk.services.s3.internal.ConfiguredS3SdkHttpRequest;
 import software.amazon.awssdk.services.s3.internal.S3EndpointUtils;
 
 @SdkInternalApi
@@ -32,15 +33,17 @@ public final class EndpointAddressInterceptor implements ExecutionInterceptor {
     @Override
     public SdkHttpRequest modifyHttpRequest(Context.ModifyHttpRequest context,
                                             ExecutionAttributes executionAttributes) {
+        ConfiguredS3SdkHttpRequest configuredRequest =
+            S3EndpointUtils.applyEndpointConfiguration(
+                    context.httpRequest(),
+                    context.request(),
+                    executionAttributes.getAttribute(AwsExecutionAttribute.AWS_REGION),
+                    (S3Configuration) executionAttributes.getAttribute(AwsSignerExecutionAttribute.SERVICE_CONFIG),
+                    Boolean.TRUE.equals(executionAttributes.getAttribute(SdkExecutionAttribute.ENDPOINT_OVERRIDDEN)));
 
-        SdkRequest sdkRequest = context.request();
+        configuredRequest.signingRegionModification().ifPresent(
+            region -> executionAttributes.putAttribute(AwsSignerExecutionAttribute.SIGNING_REGION, region));
 
-        return S3EndpointUtils.applyEndpointConfiguration(context.httpRequest(),
-                                                          sdkRequest,
-                                                          executionAttributes.getAttribute(AwsExecutionAttribute.AWS_REGION),
-                                                          (S3Configuration) executionAttributes
-                                                              .getAttribute(AwsSignerExecutionAttribute.SERVICE_CONFIG),
-                                                          sdkRequest.getValueForField("Bucket", String.class)
-                                                                    .orElse(null));
+        return configuredRequest.sdkHttpRequest();
     }
 }
diff --git a/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/handlers/ExceptionTranslationInterceptor.java b/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/handlers/ExceptionTranslationInterceptor.java
index 933cd8f3130a..b185d36439a0 100644
--- a/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/handlers/ExceptionTranslationInterceptor.java
+++ b/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/handlers/ExceptionTranslationInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/handlers/GetBucketPolicyInterceptor.java b/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/handlers/GetBucketPolicyInterceptor.java
index d33d868a91f8..dc66f7fca380 100644
--- a/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/handlers/GetBucketPolicyInterceptor.java
+++ b/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/handlers/GetBucketPolicyInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -18,11 +18,15 @@
 import static software.amazon.awssdk.utils.FunctionalUtils.invokeSafely;
 
 import java.io.InputStream;
+import java.nio.ByteBuffer;
 import java.util.Optional;
+import java.util.function.Predicate;
+import org.reactivestreams.Publisher;
 import software.amazon.awssdk.annotations.SdkInternalApi;
 import software.amazon.awssdk.core.interceptor.Context;
 import software.amazon.awssdk.core.interceptor.ExecutionAttributes;
 import software.amazon.awssdk.core.interceptor.ExecutionInterceptor;
+import software.amazon.awssdk.core.internal.async.SdkPublishers;
 import software.amazon.awssdk.http.AbortableInputStream;
 import software.amazon.awssdk.services.s3.model.GetBucketPolicyRequest;
 import software.amazon.awssdk.utils.IoUtils;
@@ -33,24 +37,38 @@
  */
 @SdkInternalApi
 public final class GetBucketPolicyInterceptor implements ExecutionInterceptor {
+    private static final String XML_ENVELOPE_PREFIX = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><Policy><![CDATA[";
+    private static final String XML_ENVELOPE_SUFFIX = "]]></Policy>";
+
+    private static final Predicate<Context.ModifyHttpResponse> INTERCEPTOR_CONTEXT_PREDICATE =
+        context -> context.request() instanceof GetBucketPolicyRequest && context.httpResponse().isSuccessful();
 
     @Override
     public Optional<InputStream> modifyHttpResponseContent(Context.ModifyHttpResponse context,
                                                            ExecutionAttributes executionAttributes) {
-        if (context.request() instanceof GetBucketPolicyRequest && context.httpResponse().isSuccessful()) {
+        if (INTERCEPTOR_CONTEXT_PREDICATE.test(context)) {
 
             String policy = context.responseBody()
                                    .map(r -> invokeSafely(() -> IoUtils.toUtf8String(r)))
                                    .orElse(null);
 
             if (policy != null) {
-                // Wrap in CDATA to deal with any escaping issues
-                String xml = String.format("<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
-                                           + "<Policy><![CDATA[%s]]></Policy>", policy);
+                String xml = XML_ENVELOPE_PREFIX + policy + XML_ENVELOPE_SUFFIX;
                 return Optional.of(AbortableInputStream.create(new StringInputStream(xml)));
             }
         }
 
         return context.responseBody();
     }
+
+    @Override
+    public Optional<Publisher<ByteBuffer>> modifyAsyncHttpResponseContent(Context.ModifyHttpResponse context,
+                                                                          ExecutionAttributes executionAttributes) {
+        if (INTERCEPTOR_CONTEXT_PREDICATE.test(context)) {
+            return context.responsePublisher().map(
+                body -> SdkPublishers.envelopeWrappedPublisher(body, XML_ENVELOPE_PREFIX, XML_ENVELOPE_SUFFIX));
+        }
+
+        return context.responsePublisher();
+    }
 }
diff --git a/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/handlers/PutObjectInterceptor.java b/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/handlers/PutObjectInterceptor.java
index f207d365555e..92859b96dea9 100644
--- a/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/handlers/PutObjectInterceptor.java
+++ b/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/handlers/PutObjectInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/handlers/SyncChecksumValidationInterceptor.java b/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/handlers/SyncChecksumValidationInterceptor.java
index 5e53224cb8da..02d58b107b5d 100644
--- a/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/handlers/SyncChecksumValidationInterceptor.java
+++ b/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/handlers/SyncChecksumValidationInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -19,7 +19,8 @@
 import static software.amazon.awssdk.services.s3.checksums.ChecksumConstant.CONTENT_LENGTH_HEADER;
 import static software.amazon.awssdk.services.s3.checksums.ChecksumsEnabledValidator.CHECKSUM;
 import static software.amazon.awssdk.services.s3.checksums.ChecksumsEnabledValidator.getObjectChecksumEnabledPerResponse;
-import static software.amazon.awssdk.services.s3.checksums.ChecksumsEnabledValidator.putObjectChecksumEnabled;
+import static software.amazon.awssdk.services.s3.checksums.ChecksumsEnabledValidator.responseChecksumIsValid;
+import static software.amazon.awssdk.services.s3.checksums.ChecksumsEnabledValidator.shouldRecordChecksum;
 import static software.amazon.awssdk.services.s3.checksums.ChecksumsEnabledValidator.validatePutObjectChecksum;
 import static software.amazon.awssdk.utils.FunctionalUtils.invokeSafely;
 
@@ -29,6 +30,7 @@
 import software.amazon.awssdk.core.checksums.Md5Checksum;
 import software.amazon.awssdk.core.checksums.SdkChecksum;
 import software.amazon.awssdk.core.interceptor.Context;
+import software.amazon.awssdk.core.interceptor.ExecutionAttribute;
 import software.amazon.awssdk.core.interceptor.ExecutionAttributes;
 import software.amazon.awssdk.core.interceptor.ExecutionInterceptor;
 import software.amazon.awssdk.core.sync.RequestBody;
@@ -39,15 +41,16 @@
 
 @SdkInternalApi
 public final class SyncChecksumValidationInterceptor implements ExecutionInterceptor {
+    private static ExecutionAttribute<Boolean> SYNC_RECORDING_CHECKSUM = new ExecutionAttribute<>("syncRecordingChecksum");
 
     @Override
     public Optional<RequestBody> modifyHttpContent(Context.ModifyHttpRequest context,
                                                    ExecutionAttributes executionAttributes) {
-
-        if (putObjectChecksumEnabled(context.request(), SYNC, executionAttributes, context.httpRequest())
+        if (shouldRecordChecksum(context.request(), SYNC, executionAttributes, context.httpRequest())
             && context.requestBody().isPresent()) {
             SdkChecksum checksum = new Md5Checksum();
             executionAttributes.putAttribute(CHECKSUM, checksum);
+            executionAttributes.putAttribute(SYNC_RECORDING_CHECKSUM, true);
 
             RequestBody requestBody = context.requestBody().get();
 
@@ -65,7 +68,6 @@ public Optional<RequestBody> modifyHttpContent(Context.ModifyHttpRequest context
     @Override
     public Optional<InputStream> modifyHttpResponseContent(Context.ModifyHttpResponse context,
                                                            ExecutionAttributes executionAttributes) {
-
         if (getObjectChecksumEnabledPerResponse(context.request(), context.httpResponse())
             && context.responseBody().isPresent()) {
 
@@ -86,7 +88,10 @@ public Optional<InputStream> modifyHttpResponseContent(Context.ModifyHttpRespons
 
     @Override
     public void afterUnmarshalling(Context.AfterUnmarshalling context, ExecutionAttributes executionAttributes) {
-        if (putObjectChecksumEnabled(context.request(), SYNC, executionAttributes, context.httpResponse())) {
+        boolean recordingChecksum = Boolean.TRUE.equals(executionAttributes.getAttribute(SYNC_RECORDING_CHECKSUM));
+        boolean responseChecksumIsValid = responseChecksumIsValid(context.httpResponse());
+
+        if (recordingChecksum && responseChecksumIsValid) {
             validatePutObjectChecksum((PutObjectResponse) context.response(), executionAttributes);
         }
     }
diff --git a/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/presigner/DefaultS3Presigner.java b/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/presigner/DefaultS3Presigner.java
index a8c12ebe4a6b..6df831bbbcc0 100644
--- a/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/presigner/DefaultS3Presigner.java
+++ b/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/presigner/DefaultS3Presigner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -64,11 +64,31 @@
 import software.amazon.awssdk.http.SdkHttpRequest;
 import software.amazon.awssdk.protocols.xml.AwsS3ProtocolFactory;
 import software.amazon.awssdk.services.s3.S3Configuration;
+import software.amazon.awssdk.services.s3.model.AbortMultipartUploadRequest;
+import software.amazon.awssdk.services.s3.model.CompleteMultipartUploadRequest;
+import software.amazon.awssdk.services.s3.model.CreateMultipartUploadRequest;
 import software.amazon.awssdk.services.s3.model.GetObjectRequest;
+import software.amazon.awssdk.services.s3.model.PutObjectRequest;
+import software.amazon.awssdk.services.s3.model.UploadPartRequest;
 import software.amazon.awssdk.services.s3.presigner.S3Presigner;
+import software.amazon.awssdk.services.s3.presigner.model.AbortMultipartUploadPresignRequest;
+import software.amazon.awssdk.services.s3.presigner.model.CompleteMultipartUploadPresignRequest;
+import software.amazon.awssdk.services.s3.presigner.model.CreateMultipartUploadPresignRequest;
 import software.amazon.awssdk.services.s3.presigner.model.GetObjectPresignRequest;
+import software.amazon.awssdk.services.s3.presigner.model.PresignedAbortMultipartUploadRequest;
+import software.amazon.awssdk.services.s3.presigner.model.PresignedCompleteMultipartUploadRequest;
+import software.amazon.awssdk.services.s3.presigner.model.PresignedCreateMultipartUploadRequest;
 import software.amazon.awssdk.services.s3.presigner.model.PresignedGetObjectRequest;
+import software.amazon.awssdk.services.s3.presigner.model.PresignedPutObjectRequest;
+import software.amazon.awssdk.services.s3.presigner.model.PresignedUploadPartRequest;
+import software.amazon.awssdk.services.s3.presigner.model.PutObjectPresignRequest;
+import software.amazon.awssdk.services.s3.presigner.model.UploadPartPresignRequest;
+import software.amazon.awssdk.services.s3.transform.AbortMultipartUploadRequestMarshaller;
+import software.amazon.awssdk.services.s3.transform.CompleteMultipartUploadRequestMarshaller;
+import software.amazon.awssdk.services.s3.transform.CreateMultipartUploadRequestMarshaller;
 import software.amazon.awssdk.services.s3.transform.GetObjectRequestMarshaller;
+import software.amazon.awssdk.services.s3.transform.PutObjectRequestMarshaller;
+import software.amazon.awssdk.services.s3.transform.UploadPartRequestMarshaller;
 import software.amazon.awssdk.utils.IoUtils;
 import software.amazon.awssdk.utils.Validate;
 
@@ -83,11 +103,39 @@ public final class DefaultS3Presigner extends DefaultSdkPresigner implements S3P
 
     private final List<ExecutionInterceptor> clientInterceptors;
     private final GetObjectRequestMarshaller getObjectRequestMarshaller;
+    private final PutObjectRequestMarshaller putObjectRequestMarshaller;
+    private final CreateMultipartUploadRequestMarshaller createMultipartUploadRequestMarshaller;
+    private final UploadPartRequestMarshaller uploadPartRequestMarshaller;
+    private final CompleteMultipartUploadRequestMarshaller completeMultipartUploadRequestMarshaller;
+    private final AbortMultipartUploadRequestMarshaller abortMultipartUploadRequestMarshaller;
 
     private DefaultS3Presigner(Builder b) {
         super(b);
+
         this.clientInterceptors = initializeInterceptors();
-        this.getObjectRequestMarshaller = initializeGetObjectRequestMarshaller();
+
+        // Copied from DefaultS3Client#init
+        AwsS3ProtocolFactory protocolFactory = AwsS3ProtocolFactory.builder()
+                                                                   .clientConfiguration(createClientConfiguration())
+                                                                   .build();
+
+        // Copied from DefaultS3Client#getObject
+        this.getObjectRequestMarshaller = new GetObjectRequestMarshaller(protocolFactory);
+
+        // Copied from DefaultS3Client#putObject
+        this.putObjectRequestMarshaller = new PutObjectRequestMarshaller(protocolFactory);
+
+        // Copied from DefaultS3Client#createMultipartUpload
+        this.createMultipartUploadRequestMarshaller = new CreateMultipartUploadRequestMarshaller(protocolFactory);
+
+        // Copied from DefaultS3Client#uploadPart
+        this.uploadPartRequestMarshaller = new UploadPartRequestMarshaller(protocolFactory);
+
+        // Copied from DefaultS3Client#completeMultipartUpload
+        this.completeMultipartUploadRequestMarshaller = new CompleteMultipartUploadRequestMarshaller(protocolFactory);
+
+        // Copied from DefaultS3Client#abortMultipartUpload
+        this.abortMultipartUploadRequestMarshaller = new AbortMultipartUploadRequestMarshaller(protocolFactory);
     }
 
     public static S3Presigner.Builder builder() {
@@ -104,35 +152,22 @@ private List<ExecutionInterceptor> initializeInterceptors() {
         return mergeLists(interceptorFactory.getGlobalInterceptors(), s3Interceptors);
     }
 
-    /**
-     * Copied from {@code DefaultS3Client}.
-     */
-    private GetObjectRequestMarshaller initializeGetObjectRequestMarshaller() {
-        // Copied from DefaultS3Client#init
-        AwsS3ProtocolFactory protocolFactory = AwsS3ProtocolFactory.builder()
-                                                                   .clientConfiguration(createClientConfiguration())
-                                                                   .build();
-        // Copied from DefaultS3Client#getObject
-        return new GetObjectRequestMarshaller(protocolFactory);
-    }
-
     /**
      * Copied from {@link AwsDefaultClientBuilder}.
      */
     private SdkClientConfiguration createClientConfiguration() {
-        return SdkClientConfiguration.builder()
-                                     .option(SdkClientOption.ENDPOINT, resolveEndpoint())
-                                     .build();
-    }
-
-    private URI resolveEndpoint() {
         if (endpointOverride() != null) {
-            return endpointOverride();
+            return SdkClientConfiguration.builder()
+                                         .option(SdkClientOption.ENDPOINT, endpointOverride())
+                                         .option(SdkClientOption.ENDPOINT_OVERRIDDEN, true)
+                                         .build();
+        } else {
+            URI defaultEndpoint = new DefaultServiceEndpointBuilder(SERVICE_NAME, "https").withRegion(region())
+                                                                                          .getServiceEndpoint();
+            return SdkClientConfiguration.builder()
+                                         .option(SdkClientOption.ENDPOINT, defaultEndpoint)
+                                         .build();
         }
-
-        return new DefaultServiceEndpointBuilder(SERVICE_NAME, "https")
-            .withRegion(region())
-            .getServiceEndpoint();
     }
 
     @Override
@@ -146,6 +181,61 @@ public PresignedGetObjectRequest presignGetObject(GetObjectPresignRequest reques
             .build();
     }
 
+    @Override
+    public PresignedPutObjectRequest presignPutObject(PutObjectPresignRequest request) {
+        return presign(PresignedPutObjectRequest.builder(),
+                       request,
+                       request.putObjectRequest(),
+                       PutObjectRequest.class,
+                       putObjectRequestMarshaller::marshall,
+                       "PutObject")
+            .build();
+    }
+
+    @Override
+    public PresignedCreateMultipartUploadRequest presignCreateMultipartUpload(CreateMultipartUploadPresignRequest request) {
+        return presign(PresignedCreateMultipartUploadRequest.builder(),
+                       request,
+                       request.createMultipartUploadRequest(),
+                       CreateMultipartUploadRequest.class,
+                       createMultipartUploadRequestMarshaller::marshall,
+                       "CreateMultipartUpload")
+            .build();
+    }
+
+    @Override
+    public PresignedUploadPartRequest presignUploadPart(UploadPartPresignRequest request) {
+        return presign(PresignedUploadPartRequest.builder(),
+                       request,
+                       request.uploadPartRequest(),
+                       UploadPartRequest.class,
+                       uploadPartRequestMarshaller::marshall,
+                       "UploadPart")
+            .build();
+    }
+
+    @Override
+    public PresignedCompleteMultipartUploadRequest presignCompleteMultipartUpload(CompleteMultipartUploadPresignRequest request) {
+        return presign(PresignedCompleteMultipartUploadRequest.builder(),
+                       request,
+                       request.completeMultipartUploadRequest(),
+                       CompleteMultipartUploadRequest.class,
+                       completeMultipartUploadRequestMarshaller::marshall,
+                       "CompleteMultipartUpload")
+            .build();
+    }
+
+    @Override
+    public PresignedAbortMultipartUploadRequest presignAbortMultipartUpload(AbortMultipartUploadPresignRequest request) {
+        return presign(PresignedAbortMultipartUploadRequest.builder(),
+                       request,
+                       request.abortMultipartUploadRequest(),
+                       AbortMultipartUploadRequest.class,
+                       abortMultipartUploadRequestMarshaller::marshall,
+                       "AbortMultipartUpload")
+            .build();
+    }
+
     /**
      * Generate a {@link PresignedRequest} from a {@link PresignedRequest} and {@link SdkRequest}.
      */
@@ -374,7 +464,8 @@ private void initializePresignedRequest(PresignedRequest.Builder presignedReques
     public static final class Builder extends DefaultSdkPresigner.Builder<Builder>
         implements S3Presigner.Builder {
 
-        private Builder() {}
+        private Builder() {
+        }
 
         @Override
         public S3Presigner build() {
diff --git a/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/presigner/DefaultSdkPresigner.java b/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/presigner/DefaultSdkPresigner.java
index 5104b472cd44..dcf94b6375be 100644
--- a/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/presigner/DefaultSdkPresigner.java
+++ b/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/presigner/DefaultSdkPresigner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -77,7 +77,8 @@ public abstract static class Builder<B extends Builder<B>>
         private AwsCredentialsProvider credentialsProvider;
         private URI endpointOverride;
 
-        protected Builder() {}
+        protected Builder() {
+        }
 
         @Override
         public B region(Region region) {
diff --git a/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/resource/ArnConverter.java b/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/resource/ArnConverter.java
new file mode 100644
index 000000000000..6a6ecd931b1f
--- /dev/null
+++ b/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/resource/ArnConverter.java
@@ -0,0 +1,37 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.services.s3.internal.resource;
+
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.arns.Arn;
+
+/**
+ * An interface for converting an AWS ARN into a service specific {@link AwsResource}. Services that model
+ * their own AWS resources will provide a specific implementation of this ARN parser.
+ * <p>
+ * @param <T> The service specific representation of {@link AwsResource}.
+ */
+@SdkInternalApi
+@FunctionalInterface
+public interface ArnConverter<T extends AwsResource> {
+    /**
+     * Converts an AWS ARN into a service specific {@link AwsResource}.
+     *
+     * @param arn The ARN to convert.
+     * @return A service specific {@link AwsResource}.
+     */
+    T convertArn(Arn arn);
+}
diff --git a/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/resource/AwsResource.java b/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/resource/AwsResource.java
new file mode 100644
index 000000000000..8821b383e365
--- /dev/null
+++ b/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/resource/AwsResource.java
@@ -0,0 +1,44 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.services.s3.internal.resource;
+
+import java.util.Optional;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+
+/**
+ * An abstract representation of an AWS Resource. Provides an interface to properties that are common across all AWS
+ * resource types. Services may provide concrete implementations that can be found in each service module.
+ */
+@SdkInternalApi
+public interface AwsResource {
+    /**
+     * Gets the partition associated with the AWS Resource (e.g.: 'aws') if one has been specified.
+     * @return the optional value for the partition.
+     */
+    Optional<String> partition();
+
+    /**
+     * Gets the region associated with the AWS Resource (e.g.: 'us-east-1') if one has been specified.
+     * @return the optional value for the region.
+     */
+    Optional<String> region();
+
+    /**
+     * Gets the account ID associated with the AWS Resource if one has been specified.
+     * @return the optional value for the account ID.
+     */
+    Optional<String> accountId();
+}
diff --git a/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/resource/S3AccessPointBuilder.java b/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/resource/S3AccessPointBuilder.java
new file mode 100644
index 000000000000..be2ddd2b1f42
--- /dev/null
+++ b/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/resource/S3AccessPointBuilder.java
@@ -0,0 +1,128 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.services.s3.internal.resource;
+
+import static software.amazon.awssdk.utils.http.SdkHttpUtils.urlEncode;
+
+import java.net.URI;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+
+/**
+ * This class is used to construct an endpoint host for an S3 access point.
+ */
+@SdkInternalApi
+public class S3AccessPointBuilder {
+    private static final Pattern HOSTNAME_COMPLIANT_PATTERN = Pattern.compile("[A-Za-z0-9\\-]+");
+    private static final int HOSTNAME_MAX_LENGTH = 63;
+
+    private Boolean dualstackEnabled;
+    private String accessPointName;
+    private String region;
+    private String accountId;
+    private String protocol;
+    private String domain;
+
+    /**
+     * Create a new instance of this builder class.
+     */
+    public static S3AccessPointBuilder create() {
+        return new S3AccessPointBuilder();
+    }
+
+    /**
+     * Enable DualStack endpoint.
+     */
+    public S3AccessPointBuilder dualstackEnabled(Boolean dualstackEnabled) {
+        this.dualstackEnabled = dualstackEnabled;
+        return this;
+    }
+
+    /**
+     * The S3 Access Point name.
+     */
+    public S3AccessPointBuilder accessPointName(String accessPointName) {
+        this.accessPointName = accessPointName;
+        return this;
+    }
+
+    /**
+     * The AWS region hosting the Access Point.
+     */
+    public S3AccessPointBuilder region(String region) {
+        this.region = region;
+        return this;
+    }
+
+    /**
+     * The ID of the AWS Account the Access Point is associated with.
+     */
+    public S3AccessPointBuilder accountId(String accountId) {
+        this.accountId = accountId;
+        return this;
+    }
+
+    /**
+     * The protocol to be used with the endpoint URI.
+     */
+    public S3AccessPointBuilder protocol(String protocol) {
+        this.protocol = protocol;
+        return this;
+    }
+
+    /**
+     * The TLD for the access point.
+     */
+    public S3AccessPointBuilder domain(String domain) {
+        this.domain = domain;
+        return this;
+    }
+
+    /**
+     * Generate an endpoint URI with no path that maps to the Access Point information stored in this builder.
+     */
+    public URI toUri() {
+        validateHostnameCompliant(accountId, "accountId");
+        validateHostnameCompliant(accessPointName, "accessPointName");
+
+        String dualStackSegment = Boolean.TRUE.equals(dualstackEnabled) ? ".dualstack" : "";
+        String uriString = String.format("%s://%s-%s.s3-accesspoint%s.%s.%s", protocol, urlEncode(accessPointName),
+                                         accountId, dualStackSegment, region, domain);
+        return URI.create(uriString);
+    }
+
+    private static void validateHostnameCompliant(String hostnameComponent, String paramName) {
+        if (hostnameComponent.isEmpty()) {
+            throw new IllegalArgumentException(
+                String.format("An S3 Access Point ARN has been passed that is not valid: the required '%s' "
+                              + "component is missing.", paramName));
+        }
+
+        if (hostnameComponent.length() > HOSTNAME_MAX_LENGTH) {
+            throw new IllegalArgumentException(
+                String.format("An S3 Access Point ARN has been passed that is not valid: the '%s' "
+                              + "component exceeds the maximum length of %d characters.", paramName, HOSTNAME_MAX_LENGTH));
+        }
+
+        Matcher m = HOSTNAME_COMPLIANT_PATTERN.matcher(hostnameComponent);
+        if (!m.matches()) {
+            throw new IllegalArgumentException(
+                String.format("An S3 Access Point ARN has been passed that is not valid: the '%s' "
+                              + "component must only contain alphanumeric characters and dashes.", paramName));
+        }
+    }
+}
\ No newline at end of file
diff --git a/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/resource/S3AccessPointResource.java b/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/resource/S3AccessPointResource.java
new file mode 100644
index 000000000000..2f7977afa824
--- /dev/null
+++ b/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/resource/S3AccessPointResource.java
@@ -0,0 +1,206 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.services.s3.internal.resource;
+
+import java.util.Optional;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.utils.Validate;
+import software.amazon.awssdk.utils.builder.CopyableBuilder;
+import software.amazon.awssdk.utils.builder.ToCopyableBuilder;
+
+/**
+ * An {@link S3Resource} that represents an S3 access point.
+ */
+@SdkInternalApi
+public final class S3AccessPointResource
+    implements S3Resource, ToCopyableBuilder<S3AccessPointResource.Builder, S3AccessPointResource> {
+
+    private static final S3ResourceType S3_RESOURCE_TYPE = S3ResourceType.ACCESS_POINT;
+
+    private final String partition;
+    private final String region;
+    private final String accountId;
+    private final String accessPointName;
+
+    private S3AccessPointResource(Builder b) {
+        this.accessPointName = Validate.paramNotBlank(b.accessPointName, "accessPointName");
+        this.partition = Validate.paramNotBlank(b.partition, "partition");
+        this.region = Validate.paramNotBlank(b.region, "region");
+        this.accountId = Validate.paramNotBlank(b.accountId, "accountId");
+    }
+
+    /**
+     * Get a new builder for this class.
+     * @return A newly initialized instance of a builder.
+     */
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    /**
+     * Gets the resource type for this access point.
+     * @return This will always return "access_point".
+     */
+    @Override
+    public String type() {
+        return S3_RESOURCE_TYPE.toString();
+    }
+
+    /**
+     * Gets the AWS partition name associated with this access point (e.g.: 'aws').
+     * @return the name of the partition.
+     */
+    @Override
+    public Optional<String> partition() {
+        return Optional.ofNullable(this.partition);
+    }
+
+    /**
+     * Gets the AWS region name associated with this bucket (e.g.: 'us-east-1').
+     * @return the name of the region.
+     */
+    @Override
+    public Optional<String> region() {
+        return Optional.ofNullable(this.region);
+    }
+
+    /**
+     * Gets the AWS account ID associated with this bucket.
+     * @return the AWS account ID.
+     */
+    @Override
+    public Optional<String> accountId() {
+        return Optional.ofNullable(this.accountId);
+    }
+
+    /**
+     * Gets the name of the access point.
+     * @return the name of the access point.
+     */
+    public String accessPointName() {
+        return this.accessPointName;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        S3AccessPointResource that = (S3AccessPointResource) o;
+
+        if (partition != null ? ! partition.equals(that.partition) : that.partition != null) {
+            return false;
+        }
+        if (region != null ? ! region.equals(that.region) : that.region != null) {
+            return false;
+        }
+        if (accountId != null ? ! accountId.equals(that.accountId) : that.accountId != null) {
+            return false;
+        }
+        return accessPointName.equals(that.accessPointName);
+    }
+
+    @Override
+    public int hashCode() {
+        int result = partition != null ? partition.hashCode() : 0;
+        result = 31 * result + (region != null ? region.hashCode() : 0);
+        result = 31 * result + (accountId != null ? accountId.hashCode() : 0);
+        result = 31 * result + accessPointName.hashCode();
+        return result;
+    }
+
+    @Override
+    public Builder toBuilder() {
+        return builder()
+            .partition(partition)
+            .region(region)
+            .accountId(accountId)
+            .accessPointName(accessPointName);
+    }
+
+    /**
+     * A builder for {@link S3AccessPointResource} objects.
+     */
+    public static final class Builder implements CopyableBuilder<Builder, S3AccessPointResource> {
+        private String partition;
+        private String region;
+        private String accountId;
+        private String accessPointName;
+
+        private Builder() {
+        }
+
+        public void setPartition(String partition) {
+            partition(partition);
+        }
+
+        /**
+         * The AWS partition associated with the access point.
+         */
+        public Builder partition(String partition) {
+            this.partition = partition;
+            return this;
+        }
+
+        public void setRegion(String region) {
+            region(region);
+        }
+
+        /**
+         * The AWS region associated with the access point.
+         */
+        public Builder region(String region) {
+            this.region = region;
+            return this;
+        }
+
+        public void setAccountId(String accountId) {
+            accountId(accountId);
+        }
+
+        /**
+         * The AWS account ID associated with the access point.
+         */
+        public Builder accountId(String accountId) {
+            this.accountId = accountId;
+            return this;
+        }
+
+        public void setAccessPointName(String accessPointName) {
+            accessPointName(accessPointName);
+        }
+
+        /**
+         * The name of the S3 access point.
+         */
+        public Builder accessPointName(String accessPointName) {
+            this.accessPointName = accessPointName;
+            return this;
+        }
+
+        /**
+         * Builds an instance of {@link S3AccessPointResource}.
+         */
+        @Override
+        public S3AccessPointResource build() {
+            return new S3AccessPointResource(this);
+        }
+    }
+}
diff --git a/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/resource/S3ArnConverter.java b/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/resource/S3ArnConverter.java
new file mode 100644
index 000000000000..47f79d25c644
--- /dev/null
+++ b/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/resource/S3ArnConverter.java
@@ -0,0 +1,131 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.services.s3.internal.resource;
+
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.arns.Arn;
+
+/**
+ * An implementation of {@link ArnConverter} that can be used to convert valid {@link Arn} representations of s3
+ * resources into {@link S3Resource} objects. To fetch an instance of this class, use the singleton getter method
+ * {@link #create()}.
+ */
+@SdkInternalApi
+public final class S3ArnConverter implements ArnConverter<S3Resource> {
+    private static final S3ArnConverter INSTANCE = new S3ArnConverter();
+
+    private S3ArnConverter() {
+    }
+
+    /**
+     * Gets a static singleton instance of an {@link S3ArnConverter}.
+     * @return A static instance of an {@link S3ArnConverter}.
+     */
+    public static S3ArnConverter create() {
+        return INSTANCE;
+    }
+
+    /**
+     * Converts a valid ARN representation of an S3 resource into a {@link S3Resource} object.
+     * @param arn The ARN to convert.
+     * @return An {@link S3Resource} object as specified by the ARN.
+     * @throws IllegalArgumentException if the ARN is not a valid representation of an S3 resource supported by this
+     * SDK.
+     */
+    @Override
+    public S3Resource convertArn(Arn arn) {
+        Arn v2Arn = convertToV2Arn(arn);
+        S3ResourceType s3ResourceType;
+
+        if (!v2Arn.resource().resourceType().isPresent()) {
+            throw new IllegalArgumentException("Unknown ARN type");
+        }
+
+        try {
+            s3ResourceType =
+                S3ResourceType.fromValue(v2Arn.resource().resourceType().get());
+        } catch (IllegalArgumentException e) {
+            throw new IllegalArgumentException("Unknown ARN type '" + v2Arn.resource().resourceType().get() + "'");
+        }
+
+        switch (s3ResourceType) {
+            case OBJECT:
+                return parseS3ObjectArn(v2Arn);
+            case ACCESS_POINT:
+                return parseS3AccessPointArn(v2Arn);
+            case BUCKET:
+                return parseS3BucketArn(v2Arn);
+            default:
+                throw new IllegalArgumentException("Unknown ARN type '" + s3ResourceType + "'");
+        }
+    }
+
+    private Arn convertToV2Arn(Arn arn) {
+        if (!isV1Arn(arn)) {
+            return arn;
+        }
+
+        String resource = arn.resourceAsString();
+
+        if (resource.contains("/")) {
+            return arn.toBuilder().resource("object:" + arn.resourceAsString()).build();
+        } else {
+            return arn.toBuilder().resource("bucket_name:" + arn.resourceAsString()).build();
+        }
+    }
+
+    private S3BucketResource parseS3BucketArn(Arn arn) {
+        return S3BucketResource.builder()
+                               .partition(arn.partition())
+                               .region(arn.region().orElse(null))
+                               .accountId(arn.accountId().orElse(null))
+                               .bucketName(arn.resource().resource())
+                               .build();
+    }
+
+    private S3AccessPointResource parseS3AccessPointArn(Arn arn) {
+        return S3AccessPointResource.builder()
+                                    .partition(arn.partition())
+                                    .region(arn.region().orElse(null))
+                                    .accountId(arn.accountId().orElse(null))
+                                    .accessPointName(arn.resource().resource())
+                                    .build();
+    }
+
+    private S3ObjectResource parseS3ObjectArn(Arn arn) {
+        String resourceString = arn.resource().resource();
+        String [] splitResourceString = resourceString.split("/");
+
+        if (splitResourceString.length < 2) {
+            throw new IllegalArgumentException("Invalid format for S3 object resource ARN");
+        }
+
+        String bucketName = splitResourceString[0];
+        String key = splitResourceString[1];
+
+        return S3ObjectResource.builder()
+                               .partition(arn.partition())
+                               .region(arn.region().orElse(null))
+                               .accountId(arn.accountId().orElse(null))
+                               .bucketName(bucketName)
+                               .key(key)
+                               .build();
+    }
+
+    private boolean isV1Arn(Arn arn) {
+        return !arn.accountId().isPresent() && !arn.region().isPresent();
+    }
+}
diff --git a/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/resource/S3BucketResource.java b/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/resource/S3BucketResource.java
new file mode 100644
index 000000000000..92a00129fd45
--- /dev/null
+++ b/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/resource/S3BucketResource.java
@@ -0,0 +1,207 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.services.s3.internal.resource;
+
+import java.util.Optional;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.utils.Validate;
+import software.amazon.awssdk.utils.builder.CopyableBuilder;
+import software.amazon.awssdk.utils.builder.ToCopyableBuilder;
+
+/**
+ * An {@link S3Resource} that represents an S3 bucket.
+ */
+@SdkInternalApi
+public final class S3BucketResource
+    implements S3Resource, ToCopyableBuilder<S3BucketResource.Builder, S3BucketResource> {
+
+    private static final S3ResourceType S3_RESOURCE_TYPE = S3ResourceType.BUCKET;
+
+    private final String partition;
+    private final String region;
+    private final String accountId;
+    private final String bucketName;
+
+    private S3BucketResource(Builder b) {
+        this.bucketName = Validate.paramNotBlank(b.bucketName, "bucketName");
+        this.partition = b.partition;
+        this.region = b.region;
+        this.accountId = b.accountId;
+    }
+
+    /**
+     * Get a new builder for this class.
+     * @return A newly initialized instance of a builder.
+     */
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    /**
+     * Gets the resource type for this bucket.
+     * @return This will always return "bucket_name".
+     */
+    @Override
+    public String type() {
+        return S3_RESOURCE_TYPE.toString();
+    }
+
+    /**
+     * Gets the AWS partition name associated with this bucket (e.g.: 'aws') if one has been specified.
+     * @return the optional name of the partition or empty if it has not been specified.
+     */
+    @Override
+    public Optional<String> partition() {
+        return Optional.ofNullable(this.partition);
+    }
+
+    /**
+     * Gets the AWS region name associated with this bucket (e.g.: 'us-east-1') if one has been specified.
+     * @return the optional name of the region or empty if the region has not been specified (e.g. the resource is in
+     * the global namespace).
+     */
+    @Override
+    public Optional<String> region() {
+        return Optional.ofNullable(this.region);
+    }
+
+    /**
+     * Gets the AWS account ID associated with this bucket if one has been specified.
+     * @return the optional AWS account ID or empty if the account ID has not been specified.
+     */
+    @Override
+    public Optional<String> accountId() {
+        return Optional.ofNullable(this.accountId);
+    }
+
+    /**
+     * Gets the name of the bucket.
+     * @return the name of the bucket.
+     */
+    public String bucketName() {
+        return this.bucketName;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        S3BucketResource that = (S3BucketResource) o;
+
+        if (partition != null ? ! partition.equals(that.partition) : that.partition != null) {
+            return false;
+        }
+        if (region != null ? ! region.equals(that.region) : that.region != null) {
+            return false;
+        }
+        if (accountId != null ? ! accountId.equals(that.accountId) : that.accountId != null) {
+            return false;
+        }
+        return bucketName.equals(that.bucketName);
+    }
+
+    @Override
+    public int hashCode() {
+        int result = partition != null ? partition.hashCode() : 0;
+        result = 31 * result + (region != null ? region.hashCode() : 0);
+        result = 31 * result + (accountId != null ? accountId.hashCode() : 0);
+        result = 31 * result + bucketName.hashCode();
+        return result;
+    }
+
+    @Override
+    public Builder toBuilder() {
+        return builder()
+            .partition(partition)
+            .region(region)
+            .accountId(accountId)
+            .bucketName(bucketName);
+    }
+
+    /**
+     * A builder for {@link S3BucketResource} objects.
+     */
+    public static final class Builder implements CopyableBuilder<Builder, S3BucketResource> {
+        private String partition;
+        private String region;
+        private String accountId;
+        private String bucketName;
+
+        private Builder() {
+        }
+
+        public void setPartition(String partition) {
+            partition(partition);
+        }
+
+        /**
+         * The AWS partition associated with the bucket.
+         */
+        public Builder partition(String partition) {
+            this.partition = partition;
+            return this;
+        }
+
+        public void setRegion(String region) {
+            region(region);
+        }
+
+        /**
+         * The AWS region associated with the bucket. This property is optional.
+         */
+        public Builder region(String region) {
+            this.region = region;
+            return this;
+        }
+
+        public void setAccountId(String accountId) {
+            accountId(accountId);
+        }
+
+        /**
+         * The AWS account ID associated with the bucket. This property is optional.
+         */
+        public Builder accountId(String accountId) {
+            this.accountId = accountId;
+            return this;
+        }
+
+        public void setBucketName(String bucketName) {
+            bucketName(bucketName);
+        }
+
+        /**
+         * The name of the S3 bucket.
+         */
+        public Builder bucketName(String bucketName) {
+            this.bucketName = bucketName;
+            return this;
+        }
+
+        /**
+         * Builds an instance of {@link S3BucketResource}.
+         */
+        @Override
+        public S3BucketResource build() {
+            return new S3BucketResource(this);
+        }
+    }
+}
diff --git a/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/resource/S3ObjectResource.java b/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/resource/S3ObjectResource.java
new file mode 100644
index 000000000000..ed8763626657
--- /dev/null
+++ b/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/resource/S3ObjectResource.java
@@ -0,0 +1,235 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.services.s3.internal.resource;
+
+import java.util.Optional;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.utils.Validate;
+import software.amazon.awssdk.utils.builder.CopyableBuilder;
+import software.amazon.awssdk.utils.builder.ToCopyableBuilder;
+
+/**
+ * An {@link S3Resource} that represents an S3 object.
+ */
+@SdkInternalApi
+public final class S3ObjectResource
+    implements S3Resource, ToCopyableBuilder<S3ObjectResource.Builder, S3ObjectResource> {
+
+    private static final S3ResourceType S3_RESOURCE_TYPE = S3ResourceType.OBJECT;
+
+    private final String partition;
+    private final String region;
+    private final String accountId;
+    private final String bucketName;
+    private final String key;
+
+    private S3ObjectResource(Builder b) {
+        this.bucketName = Validate.paramNotBlank(b.bucketName, "bucketName");
+        this.key = Validate.paramNotBlank(b.key, "key");
+        this.partition = Validate.paramNotBlank(b.partition, "partition");
+        this.region = b.region;
+        this.accountId = b.accountId;
+    }
+
+    /**
+     * Get a new builder for this class.
+     * @return A newly initialized instance of a builder.
+     */
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    /**
+     * Gets the resource type for this S3 object.
+     * @return This will always return "object".
+     */
+    @Override
+    public String type() {
+        return S3_RESOURCE_TYPE.toString();
+    }
+
+    /**
+     * Gets the AWS partition name associated with the S3 object (e.g.: 'aws').
+     * @return the name of the partition.
+     */
+    @Override
+    public Optional<String> partition() {
+        return Optional.ofNullable(this.partition);
+    }
+
+    /**
+     * Gets the AWS region name associated with the S3 object (e.g.: 'us-east-1').
+     * @return the name of the region or null if the region has not been specified (e.g. the resource is in the
+     * global namespace).
+     */
+    @Override
+    public Optional<String> region() {
+        return Optional.ofNullable(this.region);
+    }
+
+    /**
+     * Gets the AWS account ID associated with the S3 object if it has been specified.
+     * @return the optional AWS account ID or empty if the account ID has not been specified.
+     */
+    @Override
+    public Optional<String> accountId() {
+        return Optional.ofNullable(this.accountId);
+    }
+
+    /**
+     * Gets the name of the bucket associated with the S3 object.
+     * @return the name of the bucket associated with the S3 object.
+     */
+    public String bucketName() {
+        return this.bucketName;
+    }
+
+    /**
+     * Gets the key of the S3 object.
+     * @return the key of the S3 object.
+     */
+    public String key() {
+        return this.key;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        S3ObjectResource that = (S3ObjectResource) o;
+
+        if (partition != null ? ! partition.equals(that.partition) : that.partition != null) {
+            return false;
+        }
+        if (region != null ? ! region.equals(that.region) : that.region != null) {
+            return false;
+        }
+        if (accountId != null ? ! accountId.equals(that.accountId) : that.accountId != null) {
+            return false;
+        }
+        if (! bucketName.equals(that.bucketName)) {
+            return false;
+        }
+        return key.equals(that.key);
+    }
+
+    @Override
+    public int hashCode() {
+        int result = partition != null ? partition.hashCode() : 0;
+        result = 31 * result + (region != null ? region.hashCode() : 0);
+        result = 31 * result + (accountId != null ? accountId.hashCode() : 0);
+        result = 31 * result + bucketName.hashCode();
+        result = 31 * result + key.hashCode();
+        return result;
+    }
+
+    @Override
+    public Builder toBuilder() {
+        return builder()
+            .partition(partition)
+            .region(region)
+            .accountId(accountId)
+            .bucketName(bucketName)
+            .key(key);
+    }
+
+    /**
+     * A builder for {@link S3ObjectResource} objects.
+     */
+    public static final class Builder implements CopyableBuilder<Builder, S3ObjectResource> {
+        private String partition;
+        private String region;
+        private String accountId;
+        private String bucketName;
+        private String key;
+
+        private Builder() {
+        }
+
+        public void setPartition(String partition) {
+            partition(partition);
+        }
+
+        /**
+         * The AWS partition associated with the S3 object.
+         */
+        public Builder partition(String partition) {
+            this.partition = partition;
+            return this;
+        }
+
+        public void setRegion(String region) {
+            region(region);
+        }
+
+        /**
+         * The AWS region associated with the S3 object. This property is optional.
+         */
+        public Builder region(String region) {
+            this.region = region;
+            return this;
+        }
+
+        public void setAccountId(String accountId) {
+            accountId(accountId);
+        }
+
+        /**
+         * The AWS account ID associated with the S3 object. This property is optional.
+         */
+        public Builder accountId(String accountId) {
+            this.accountId = accountId;
+            return this;
+        }
+
+        public void setBucketName(String bucketName) {
+            bucketName(bucketName);
+        }
+
+        /**
+         * The name of the S3 bucket associated with this S3 object.
+         */
+        public Builder bucketName(String bucketName) {
+            this.bucketName = bucketName;
+            return this;
+        }
+
+        public void setKey(String key) {
+            key(key);
+        }
+
+        /**
+         * The key of the S3 object.
+         */
+        public Builder key(String key) {
+            this.key = key;
+            return this;
+        }
+
+        /**
+         * Builds an instance of {@link S3BucketResource}.
+         */
+        @Override
+        public S3ObjectResource build() {
+            return new S3ObjectResource(this);
+        }
+    }
+}
diff --git a/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/resource/S3Resource.java b/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/resource/S3Resource.java
new file mode 100644
index 000000000000..fa6da07ca1ff
--- /dev/null
+++ b/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/resource/S3Resource.java
@@ -0,0 +1,31 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.services.s3.internal.resource;
+
+import software.amazon.awssdk.annotations.SdkInternalApi;
+
+/**
+ * A representation of an AWS S3 resource. See {@link S3ResourceType} for a list and description of all valid types.
+ */
+@SdkInternalApi
+public interface S3Resource extends AwsResource {
+    /**
+     * Gets the type of S3 resource represented by this object (e.g.: 'bucket_name'). See {@link S3ResourceType} for
+     * a list and description of all valid types.
+     * @return the string name of the S3 resource type.
+     */
+    String type();
+}
diff --git a/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/resource/S3ResourceType.java b/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/resource/S3ResourceType.java
new file mode 100644
index 000000000000..79b4ed673d2b
--- /dev/null
+++ b/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/resource/S3ResourceType.java
@@ -0,0 +1,73 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.services.s3.internal.resource;
+
+import software.amazon.awssdk.annotations.SdkInternalApi;
+
+/**
+ * An enum representing the types of resources supported by S3. Each resource type below will have a
+ * concrete implementation of {@link S3Resource}.
+ */
+@SdkInternalApi
+public enum S3ResourceType {
+    /**
+     * A specific S3 bucket. Implemented by {@link S3BucketResource}.
+     */
+    BUCKET("bucket_name"),
+    /**
+     * An access point that fronts a bucket. Implemented by {@link S3AccessPointResource}.
+     */
+    ACCESS_POINT("accesspoint"),
+    /**
+     * A specific S3 object (bucket and key). Implemented by {@link S3ObjectResource}.
+     */
+    OBJECT("object");
+
+    private final String value;
+
+    S3ResourceType(String value) {
+        this.value = value;
+    }
+
+    /**
+     * @return The canonical string value of this resource type.
+     */
+    @Override
+    public String toString() {
+        return value;
+    }
+
+    /**
+     * Use this in place of valueOf.
+     *
+     * @param value real value
+     * @return S3ResourceType corresponding to the value
+     * @throws IllegalArgumentException If the specified value does not map to one of the known values in this enum.
+     */
+    public static S3ResourceType fromValue(String value) {
+        if (value == null || "".equals(value)) {
+            throw new IllegalArgumentException("Value cannot be null or empty!");
+        }
+
+        for (S3ResourceType enumEntry : S3ResourceType.values()) {
+            if (enumEntry.toString().equals(value)) {
+                return enumEntry;
+            }
+        }
+
+        throw new IllegalArgumentException("Cannot create enum from " + value + " value!");
+    }
+}
diff --git a/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/usearnregion/ProfileUseArnRegionProvider.java b/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/usearnregion/ProfileUseArnRegionProvider.java
new file mode 100644
index 000000000000..e3703abd9aa2
--- /dev/null
+++ b/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/usearnregion/ProfileUseArnRegionProvider.java
@@ -0,0 +1,60 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.services.s3.internal.usearnregion;
+
+import java.util.Optional;
+import java.util.function.Supplier;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.profiles.ProfileFile;
+import software.amazon.awssdk.profiles.ProfileFileSystemSetting;
+import software.amazon.awssdk.utils.StringUtils;
+
+/**
+ * Loads useArnRegion configuration from the {@link ProfileFile#defaultProfileFile()} using the default profile name.
+ */
+@SdkInternalApi
+public final class ProfileUseArnRegionProvider implements UseArnRegionProvider {
+    /**
+     * Property name for specifying whether or not use arn region should be enabled.
+     */
+    private static final String AWS_USE_ARN_REGION = "s3_use_arn_region";
+
+    private final Supplier<ProfileFile> profileFile;
+    private final String profileName;
+
+    private ProfileUseArnRegionProvider(Supplier<ProfileFile> profileFile, String profileName) {
+        this.profileFile = profileFile;
+        this.profileName = profileName;
+    }
+
+    public static ProfileUseArnRegionProvider create() {
+        return new ProfileUseArnRegionProvider(ProfileFile::defaultProfileFile,
+                                               ProfileFileSystemSetting.AWS_PROFILE.getStringValueOrThrow());
+    }
+
+    public static ProfileUseArnRegionProvider create(ProfileFile profileFile, String profileName) {
+        return new ProfileUseArnRegionProvider(() -> profileFile, profileName);
+    }
+
+    @Override
+    public Optional<Boolean> resolveUseArnRegion() {
+        return profileFile.get()
+                          .profile(profileName)
+                          .map(p -> p.properties().get(AWS_USE_ARN_REGION))
+                          .map(StringUtils::safeStringToBoolean);
+    }
+}
+
diff --git a/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/usearnregion/SystemsSettingsUseArnRegionProvider.java b/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/usearnregion/SystemsSettingsUseArnRegionProvider.java
new file mode 100644
index 000000000000..efbf213e7158
--- /dev/null
+++ b/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/usearnregion/SystemsSettingsUseArnRegionProvider.java
@@ -0,0 +1,40 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.services.s3.internal.usearnregion;
+
+import java.util.Optional;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.services.s3.S3SystemSetting;
+
+/**
+ * {@link UseArnRegionProvider} implementation that loads userArnRegion configuration from system properties
+ * and environment variables.
+ */
+@SdkInternalApi
+public final class SystemsSettingsUseArnRegionProvider implements UseArnRegionProvider {
+
+    private SystemsSettingsUseArnRegionProvider() {
+    }
+
+    public static SystemsSettingsUseArnRegionProvider create() {
+        return new SystemsSettingsUseArnRegionProvider();
+    }
+
+    @Override
+    public Optional<Boolean> resolveUseArnRegion() {
+        return S3SystemSetting.AWS_S3_USE_ARN_REGION.getBooleanValue();
+    }
+}
diff --git a/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/usearnregion/UseArnRegionProvider.java b/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/usearnregion/UseArnRegionProvider.java
new file mode 100644
index 000000000000..b23d32113bb4
--- /dev/null
+++ b/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/usearnregion/UseArnRegionProvider.java
@@ -0,0 +1,32 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.services.s3.internal.usearnregion;
+
+import java.util.Optional;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+
+/**
+ * Interface for loading useArnRegion configuration.
+ */
+@FunctionalInterface
+@SdkInternalApi
+public interface UseArnRegionProvider {
+
+    /**
+     * @return whether use-arn-region is enabled, or empty if it is not configured.
+     */
+    Optional<Boolean> resolveUseArnRegion();
+}
diff --git a/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/usearnregion/UseArnRegionProviderChain.java b/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/usearnregion/UseArnRegionProviderChain.java
new file mode 100644
index 000000000000..9149152b2971
--- /dev/null
+++ b/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/usearnregion/UseArnRegionProviderChain.java
@@ -0,0 +1,74 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.services.s3.internal.usearnregion;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.profiles.ProfileFile;
+import software.amazon.awssdk.profiles.ProfileFileSystemSetting;
+import software.amazon.awssdk.utils.Logger;
+
+/**
+ * {@link UseArnRegionProvider} implementation that chains together multiple useArnRegion providers.
+ */
+@SdkInternalApi
+public final class UseArnRegionProviderChain implements UseArnRegionProvider {
+    private static final Logger log = Logger.loggerFor(UseArnRegionProvider.class);
+
+    private final List<UseArnRegionProvider> providers;
+
+    private UseArnRegionProviderChain(List<UseArnRegionProvider> providers) {
+        this.providers = providers;
+    }
+
+    /**
+     * Creates a default {@link UseArnRegionProviderChain}.
+     *
+     * <p>
+     * AWS use arn region provider that looks for the useArnRegion in this order:
+     *
+     * <ol>
+     *   <li>Check the 'aws.useArnRegion' system property for the region.</li>
+     *   <li>Check the 'AWS_USE_ARN_REGION' environment variable for the region.</li>
+     * </ol>
+     */
+    public static UseArnRegionProviderChain create() {
+        return create(ProfileFile.defaultProfileFile(),
+                      ProfileFileSystemSetting.AWS_PROFILE.getStringValueOrThrow());
+    }
+
+    public static UseArnRegionProviderChain create(ProfileFile profileFile, String profileName) {
+        return new UseArnRegionProviderChain(Arrays.asList(SystemsSettingsUseArnRegionProvider.create(),
+                                                           ProfileUseArnRegionProvider.create(profileFile, profileName)));
+    }
+
+    @Override
+    public Optional<Boolean> resolveUseArnRegion() {
+        for (UseArnRegionProvider provider : providers) {
+            try {
+                Optional<Boolean> useArnRegion = provider.resolveUseArnRegion();
+                if (useArnRegion.isPresent()) {
+                    return useArnRegion;
+                }
+            } catch (Exception ex) {
+                log.warn(() -> "Failed to retrieve useArnRegion from " + provider);
+            }
+        }
+        return Optional.empty();
+    }
+}
\ No newline at end of file
diff --git a/services/s3/src/main/java/software/amazon/awssdk/services/s3/model/GetUrlRequest.java b/services/s3/src/main/java/software/amazon/awssdk/services/s3/model/GetUrlRequest.java
index 104ffbc91343..095e97ac2962 100644
--- a/services/s3/src/main/java/software/amazon/awssdk/services/s3/model/GetUrlRequest.java
+++ b/services/s3/src/main/java/software/amazon/awssdk/services/s3/model/GetUrlRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -42,14 +42,14 @@
 @SdkPublicApi
 public final class GetUrlRequest implements SdkPojo, ToCopyableBuilder<GetUrlRequest.Builder, GetUrlRequest> {
     private static final SdkField<String> BUCKET_FIELD = SdkField
-        .<String>builder(MarshallingType.STRING)
+        .builder(MarshallingType.STRING)
         .getter(getter(GetUrlRequest::bucket))
         .setter(setter(Builder::bucket))
         .traits(LocationTrait.builder().location(MarshallLocation.PATH).locationName("Bucket")
                              .unmarshallLocationName("Bucket").build()).build();
 
     private static final SdkField<String> KEY_FIELD = SdkField
-        .<String>builder(MarshallingType.STRING)
+        .builder(MarshallingType.STRING)
         .getter(getter(GetUrlRequest::key))
         .setter(setter(Builder::key))
         .traits(LocationTrait.builder().location(MarshallLocation.GREEDY_PATH).locationName("Key")
diff --git a/services/s3/src/main/java/software/amazon/awssdk/services/s3/presigner/S3Presigner.java b/services/s3/src/main/java/software/amazon/awssdk/services/s3/presigner/S3Presigner.java
index 6ba05e732119..a2a3510d632c 100644
--- a/services/s3/src/main/java/software/amazon/awssdk/services/s3/presigner/S3Presigner.java
+++ b/services/s3/src/main/java/software/amazon/awssdk/services/s3/presigner/S3Presigner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -31,9 +31,24 @@
 import software.amazon.awssdk.regions.Region;
 import software.amazon.awssdk.regions.providers.DefaultAwsRegionProviderChain;
 import software.amazon.awssdk.services.s3.internal.presigner.DefaultS3Presigner;
+import software.amazon.awssdk.services.s3.model.AbortMultipartUploadRequest;
+import software.amazon.awssdk.services.s3.model.CompleteMultipartUploadRequest;
+import software.amazon.awssdk.services.s3.model.CreateMultipartUploadRequest;
 import software.amazon.awssdk.services.s3.model.GetObjectRequest;
+import software.amazon.awssdk.services.s3.model.PutObjectRequest;
+import software.amazon.awssdk.services.s3.model.UploadPartRequest;
+import software.amazon.awssdk.services.s3.presigner.model.AbortMultipartUploadPresignRequest;
+import software.amazon.awssdk.services.s3.presigner.model.CompleteMultipartUploadPresignRequest;
+import software.amazon.awssdk.services.s3.presigner.model.CreateMultipartUploadPresignRequest;
 import software.amazon.awssdk.services.s3.presigner.model.GetObjectPresignRequest;
+import software.amazon.awssdk.services.s3.presigner.model.PresignedAbortMultipartUploadRequest;
+import software.amazon.awssdk.services.s3.presigner.model.PresignedCompleteMultipartUploadRequest;
+import software.amazon.awssdk.services.s3.presigner.model.PresignedCreateMultipartUploadRequest;
 import software.amazon.awssdk.services.s3.presigner.model.PresignedGetObjectRequest;
+import software.amazon.awssdk.services.s3.presigner.model.PresignedPutObjectRequest;
+import software.amazon.awssdk.services.s3.presigner.model.PresignedUploadPartRequest;
+import software.amazon.awssdk.services.s3.presigner.model.PutObjectPresignRequest;
+import software.amazon.awssdk.services.s3.presigner.model.UploadPartPresignRequest;
 
 /**
  * Enables signing an S3 {@link SdkRequest} so that it can be executed without requiring any additional authentication on the
@@ -263,6 +278,234 @@ default PresignedGetObjectRequest presignGetObject(Consumer<GetObjectPresignRequ
         return presignGetObject(builder.build());
     }
 
+    /**
+     * Presign a {@link PutObjectRequest} so that it can be executed at a later time without requiring additional
+     * signing or authentication.
+     * <p/>
+     *
+     * <b>Example Usage</b>
+     * <p/>
+     *
+     * <pre>
+     * {@code
+     *     S3Presigner presigner = ...;
+     *
+     *     // Create a PutObjectRequest to be pre-signed
+     *     PutObjectRequest putObjectRequest = ...;
+     *
+     *     // Create a PutObjectPresignRequest to specify the signature duration
+     *     PutObjectPresignRequest putObjectPresignRequest =
+     *         PutObjectPresignRequest.builder()
+     *                                .signatureDuration(Duration.ofMinutes(10))
+     *                                .putObjectRequest(request)
+     *                                .build();
+     *
+     *     // Generate the presigned request
+     *     PresignedPutObjectRequest presignedPutObjectRequest =
+     *         presigner.presignPutObject(putObjectPresignRequest);
+     * }
+     * </pre>
+     */
+    PresignedPutObjectRequest presignPutObject(PutObjectPresignRequest request);
+
+    /**
+     * Presign a {@link PutObjectRequest} so that it can be executed at a later time without requiring additional
+     * signing or authentication.
+     * <p />
+     * This is a shorter method of invoking {@link #presignPutObject(PutObjectPresignRequest)} without needing
+     * to call {@code PutObjectPresignRequest.builder()} or {@code .build()}.
+     *
+     * @see #presignPutObject(PutObjectPresignRequest)
+     */
+    default PresignedPutObjectRequest presignPutObject(Consumer<PutObjectPresignRequest.Builder> request) {
+        PutObjectPresignRequest.Builder builder = PutObjectPresignRequest.builder();
+        request.accept(builder);
+        return presignPutObject(builder.build());
+    }
+
+    /**
+     * Presign a {@link CreateMultipartUploadRequest} so that it can be executed at a later time without requiring additional
+     * signing or authentication.
+     * <p/>
+     *
+     * <b>Example Usage</b>
+     * <p/>
+     *
+     * <pre>
+     * {@code
+     *     S3Presigner presigner = ...;
+     *
+     *     // Create a CreateMultipartUploadRequest to be pre-signed
+     *     CreateMultipartUploadRequest createMultipartUploadRequest = ...;
+     *
+     *     // Create a CreateMultipartUploadPresignRequest to specify the signature duration
+     *     CreateMultipartUploadPresignRequest createMultipartUploadPresignRequest =
+     *         CreateMultipartUploadPresignRequest.builder()
+     *                                            .signatureDuration(Duration.ofMinutes(10))
+     *                                            .createMultipartUploadRequest(request)
+     *                                            .build();
+     *
+     *     // Generate the presigned request
+     *     PresignedCreateMultipartUploadRequest presignedCreateMultipartUploadRequest =
+     *         presigner.presignCreateMultipartUpload(createMultipartUploadPresignRequest);
+     * }
+     * </pre>
+     */
+    PresignedCreateMultipartUploadRequest presignCreateMultipartUpload(CreateMultipartUploadPresignRequest request);
+
+    /**
+     * Presign a {@link CreateMultipartUploadRequest} so that it can be executed at a later time without requiring additional
+     * signing or authentication.
+     * <p />
+     * This is a shorter method of invoking {@link #presignCreateMultipartUpload(CreateMultipartUploadPresignRequest)} without
+     * needing to call {@code CreateMultipartUploadPresignRequest.builder()} or {@code .build()}.
+     *
+     * @see #presignCreateMultipartUpload(CreateMultipartUploadPresignRequest)
+     */
+    default PresignedCreateMultipartUploadRequest presignCreateMultipartUpload(
+        Consumer<CreateMultipartUploadPresignRequest.Builder> request) {
+        CreateMultipartUploadPresignRequest.Builder builder = CreateMultipartUploadPresignRequest.builder();
+        request.accept(builder);
+        return presignCreateMultipartUpload(builder.build());
+    }
+
+    /**
+     * Presign a {@link UploadPartRequest} so that it can be executed at a later time without requiring additional
+     * signing or authentication.
+     * <p/>
+     *
+     * <b>Example Usage</b>
+     * <p/>
+     *
+     * <pre>
+     * {@code
+     *     S3Presigner presigner = ...;
+     *
+     *     // Create a UploadPartRequest to be pre-signed
+     *     UploadPartRequest uploadPartRequest = ...;
+     *
+     *     // Create a UploadPartPresignRequest to specify the signature duration
+     *     UploadPartPresignRequest uploadPartPresignRequest =
+     *         UploadPartPresignRequest.builder()
+     *                                 .signatureDuration(Duration.ofMinutes(10))
+     *                                 .uploadPartRequest(request)
+     *                                 .build();
+     *
+     *     // Generate the presigned request
+     *     PresignedUploadPartRequest presignedUploadPartRequest =
+     *         presigner.presignUploadPart(uploadPartPresignRequest);
+     * }
+     * </pre>
+     */
+    PresignedUploadPartRequest presignUploadPart(UploadPartPresignRequest request);
+
+    /**
+     * Presign a {@link UploadPartRequest} so that it can be executed at a later time without requiring additional
+     * signing or authentication.
+     * <p />
+     * This is a shorter method of invoking {@link #presignUploadPart(UploadPartPresignRequest)} without needing
+     * to call {@code UploadPartPresignRequest.builder()} or {@code .build()}.
+     *
+     * @see #presignUploadPart(UploadPartPresignRequest)
+     */
+    default PresignedUploadPartRequest presignUploadPart(Consumer<UploadPartPresignRequest.Builder> request) {
+        UploadPartPresignRequest.Builder builder = UploadPartPresignRequest.builder();
+        request.accept(builder);
+        return presignUploadPart(builder.build());
+    }
+
+    /**
+     * Presign a {@link CompleteMultipartUploadRequest} so that it can be executed at a later time without requiring additional
+     * signing or authentication.
+     * <p/>
+     *
+     * <b>Example Usage</b>
+     * <p/>
+     *
+     * <pre>
+     * {@code
+     *     S3Presigner presigner = ...;
+     *
+     *     // Complete a CompleteMultipartUploadRequest to be pre-signed
+     *     CompleteMultipartUploadRequest completeMultipartUploadRequest = ...;
+     *
+     *     // Create a CompleteMultipartUploadPresignRequest to specify the signature duration
+     *     CompleteMultipartUploadPresignRequest completeMultipartUploadPresignRequest =
+     *         CompleteMultipartUploadPresignRequest.builder()
+     *                                              .signatureDuration(Duration.ofMinutes(10))
+     *                                              .completeMultipartUploadRequest(request)
+     *                                              .build();
+     *
+     *     // Generate the presigned request
+     *     PresignedCompleteMultipartUploadRequest presignedCompleteMultipartUploadRequest =
+     *         presigner.presignCompleteMultipartUpload(completeMultipartUploadPresignRequest);
+     * }
+     * </pre>
+     */
+    PresignedCompleteMultipartUploadRequest presignCompleteMultipartUpload(CompleteMultipartUploadPresignRequest request);
+
+    /**
+     * Presign a {@link CompleteMultipartUploadRequest} so that it can be executed at a later time without requiring additional
+     * signing or authentication.
+     * <p />
+     * This is a shorter method of invoking {@link #presignCompleteMultipartUpload(CompleteMultipartUploadPresignRequest)} without
+     * needing to call {@code CompleteMultipartUploadPresignRequest.builder()} or {@code .build()}.
+     *
+     * @see #presignCompleteMultipartUpload(CompleteMultipartUploadPresignRequest)
+     */
+    default PresignedCompleteMultipartUploadRequest presignCompleteMultipartUpload(
+        Consumer<CompleteMultipartUploadPresignRequest.Builder> request) {
+        CompleteMultipartUploadPresignRequest.Builder builder = CompleteMultipartUploadPresignRequest.builder();
+        request.accept(builder);
+        return presignCompleteMultipartUpload(builder.build());
+    }
+
+    /**
+     * Presign a {@link AbortMultipartUploadRequest} so that it can be executed at a later time without requiring additional
+     * signing or authentication.
+     * <p/>
+     *
+     * <b>Example Usage</b>
+     * <p/>
+     *
+     * <pre>
+     * {@code
+     *     S3Presigner presigner = ...;
+     *
+     *     // Complete a AbortMultipartUploadRequest to be pre-signed
+     *     AbortMultipartUploadRequest abortMultipartUploadRequest = ...;
+     *
+     *     // Create a AbortMultipartUploadPresignRequest to specify the signature duration
+     *     AbortMultipartUploadPresignRequest abortMultipartUploadPresignRequest =
+     *         AbortMultipartUploadPresignRequest.builder()
+     *                                              .signatureDuration(Duration.ofMinutes(10))
+     *                                              .abortMultipartUploadRequest(request)
+     *                                              .build();
+     *
+     *     // Generate the presigned request
+     *     PresignedAbortMultipartUploadRequest presignedAbortMultipartUploadRequest =
+     *         presigner.presignAbortMultipartUpload(abortMultipartUploadPresignRequest);
+     * }
+     * </pre>
+     */
+    PresignedAbortMultipartUploadRequest presignAbortMultipartUpload(AbortMultipartUploadPresignRequest request);
+
+    /**
+     * Presign a {@link AbortMultipartUploadRequest} so that it can be executed at a later time without requiring additional
+     * signing or authentication.
+     * <p />
+     * This is a shorter method of invoking {@link #presignAbortMultipartUpload(AbortMultipartUploadPresignRequest)} without
+     * needing to call {@code AbortMultipartUploadPresignRequest.builder()} or {@code .build()}.
+     *
+     * @see #presignAbortMultipartUpload(AbortMultipartUploadPresignRequest)
+     */
+    default PresignedAbortMultipartUploadRequest presignAbortMultipartUpload(
+        Consumer<AbortMultipartUploadPresignRequest.Builder> request) {
+        AbortMultipartUploadPresignRequest.Builder builder = AbortMultipartUploadPresignRequest.builder();
+        request.accept(builder);
+        return presignAbortMultipartUpload(builder.build());
+    }
+
     /**
      * A builder for creating {@link S3Presigner}s. Created using {@link #builder()}.
      */
diff --git a/services/s3/src/main/java/software/amazon/awssdk/services/s3/presigner/model/AbortMultipartUploadPresignRequest.java b/services/s3/src/main/java/software/amazon/awssdk/services/s3/presigner/model/AbortMultipartUploadPresignRequest.java
new file mode 100644
index 000000000000..5198c03ca4fc
--- /dev/null
+++ b/services/s3/src/main/java/software/amazon/awssdk/services/s3/presigner/model/AbortMultipartUploadPresignRequest.java
@@ -0,0 +1,152 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.services.s3.presigner.model;
+
+import java.time.Duration;
+import java.util.function.Consumer;
+import software.amazon.awssdk.annotations.Immutable;
+import software.amazon.awssdk.annotations.NotThreadSafe;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.SdkPublicApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.awscore.presigner.PresignRequest;
+import software.amazon.awssdk.services.s3.model.AbortMultipartUploadRequest;
+import software.amazon.awssdk.services.s3.presigner.S3Presigner;
+import software.amazon.awssdk.utils.Validate;
+import software.amazon.awssdk.utils.builder.CopyableBuilder;
+import software.amazon.awssdk.utils.builder.ToCopyableBuilder;
+
+/**
+ * A request to pre-sign a {@link AbortMultipartUploadRequest} so that it can be executed at a later time without requiring
+ * additional signing or authentication.
+ *
+ * @see S3Presigner#presignAbortMultipartUpload(AbortMultipartUploadPresignRequest)
+ * @see #builder()
+ */
+@SdkPublicApi
+@Immutable
+@ThreadSafe
+public final class AbortMultipartUploadPresignRequest
+        extends PresignRequest
+        implements ToCopyableBuilder<AbortMultipartUploadPresignRequest.Builder, AbortMultipartUploadPresignRequest> {
+    private final AbortMultipartUploadRequest abortMultipartUploadRequest;
+
+    private AbortMultipartUploadPresignRequest(DefaultBuilder builder) {
+        super(builder);
+        this.abortMultipartUploadRequest = Validate.notNull(builder.abortMultipartUploadRequest, "abortMultipartUploadRequest");
+    }
+
+    /**
+     * Create a builder that can be used to create a {@link AbortMultipartUploadPresignRequest}.
+     *
+     * @see S3Presigner#presignAbortMultipartUpload(AbortMultipartUploadPresignRequest)
+     */
+    public static Builder builder() {
+        return new DefaultBuilder();
+    }
+
+    /**
+     * Retrieve the {@link AbortMultipartUploadRequest} that should be presigned.
+     */
+    public AbortMultipartUploadRequest abortMultipartUploadRequest() {
+        return abortMultipartUploadRequest;
+    }
+
+    @Override
+    public Builder toBuilder() {
+        return new DefaultBuilder(this);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        if (!super.equals(o)) {
+            return false;
+        }
+
+        AbortMultipartUploadPresignRequest that = (AbortMultipartUploadPresignRequest) o;
+
+        return abortMultipartUploadRequest.equals(that.abortMultipartUploadRequest);
+    }
+
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        result = 31 * result + abortMultipartUploadRequest.hashCode();
+        return result;
+    }
+
+    /**
+     * A builder for a {@link AbortMultipartUploadPresignRequest}, created with {@link #builder()}.
+     */
+    @SdkPublicApi
+    @NotThreadSafe
+    public interface Builder
+        extends PresignRequest.Builder,
+                CopyableBuilder<AbortMultipartUploadPresignRequest.Builder, AbortMultipartUploadPresignRequest> {
+        /**
+         * Configure the {@link AbortMultipartUploadRequest} that should be presigned.
+         */
+        Builder abortMultipartUploadRequest(AbortMultipartUploadRequest abortMultipartUploadRequest);
+
+        /**
+         * Configure the {@link AbortMultipartUploadRequest} that should be presigned.
+         * <p/>
+         * This is a convenience method for invoking {@link #abortMultipartUploadRequest(AbortMultipartUploadRequest)}
+         * without needing to invoke {@code AbortMultipartUploadRequest.builder()} or {@code build()}.
+         */
+        default Builder abortMultipartUploadRequest(Consumer<AbortMultipartUploadRequest.Builder> abortMultipartUploadRequest) {
+            AbortMultipartUploadRequest.Builder builder = AbortMultipartUploadRequest.builder();
+            abortMultipartUploadRequest.accept(builder);
+            return abortMultipartUploadRequest(builder.build());
+        }
+
+        @Override
+        Builder signatureDuration(Duration signatureDuration);
+
+        @Override
+        AbortMultipartUploadPresignRequest build();
+    }
+
+    @SdkInternalApi
+    private static final class DefaultBuilder extends PresignRequest.DefaultBuilder<DefaultBuilder> implements Builder {
+        private AbortMultipartUploadRequest abortMultipartUploadRequest;
+
+        private DefaultBuilder() {
+        }
+
+        private DefaultBuilder(AbortMultipartUploadPresignRequest request) {
+            super(request);
+            this.abortMultipartUploadRequest = request.abortMultipartUploadRequest;
+        }
+
+        @Override
+        public Builder abortMultipartUploadRequest(AbortMultipartUploadRequest abortMultipartUploadRequest) {
+            this.abortMultipartUploadRequest = abortMultipartUploadRequest;
+            return this;
+        }
+
+        @Override
+        public AbortMultipartUploadPresignRequest build() {
+            return new AbortMultipartUploadPresignRequest(this);
+        }
+    }
+}
diff --git a/services/s3/src/main/java/software/amazon/awssdk/services/s3/presigner/model/CompleteMultipartUploadPresignRequest.java b/services/s3/src/main/java/software/amazon/awssdk/services/s3/presigner/model/CompleteMultipartUploadPresignRequest.java
new file mode 100644
index 000000000000..012d72222d03
--- /dev/null
+++ b/services/s3/src/main/java/software/amazon/awssdk/services/s3/presigner/model/CompleteMultipartUploadPresignRequest.java
@@ -0,0 +1,154 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.services.s3.presigner.model;
+
+import java.time.Duration;
+import java.util.function.Consumer;
+import software.amazon.awssdk.annotations.Immutable;
+import software.amazon.awssdk.annotations.NotThreadSafe;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.SdkPublicApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.awscore.presigner.PresignRequest;
+import software.amazon.awssdk.services.s3.model.CompleteMultipartUploadRequest;
+import software.amazon.awssdk.services.s3.presigner.S3Presigner;
+import software.amazon.awssdk.utils.Validate;
+import software.amazon.awssdk.utils.builder.CopyableBuilder;
+import software.amazon.awssdk.utils.builder.ToCopyableBuilder;
+
+/**
+ * A request to pre-sign a {@link CompleteMultipartUploadRequest} so that it can be executed at a later time without requiring
+ * additional signing or authentication.
+ *
+ * @see S3Presigner#presignCompleteMultipartUpload(CompleteMultipartUploadPresignRequest)
+ * @see #builder()
+ */
+@SdkPublicApi
+@Immutable
+@ThreadSafe
+public final class CompleteMultipartUploadPresignRequest
+        extends PresignRequest
+        implements ToCopyableBuilder<CompleteMultipartUploadPresignRequest.Builder, CompleteMultipartUploadPresignRequest> {
+    private final CompleteMultipartUploadRequest completeMultipartUploadRequest;
+
+    private CompleteMultipartUploadPresignRequest(DefaultBuilder builder) {
+        super(builder);
+        this.completeMultipartUploadRequest = Validate.notNull(builder.completeMultipartUploadRequest,
+                                                               "completeMultipartUploadRequest");
+    }
+
+    /**
+     * Create a builder that can be used to create a {@link CompleteMultipartUploadPresignRequest}.
+     *
+     * @see S3Presigner#presignCompleteMultipartUpload(CompleteMultipartUploadPresignRequest)
+     */
+    public static Builder builder() {
+        return new DefaultBuilder();
+    }
+
+    /**
+     * Retrieve the {@link CompleteMultipartUploadRequest} that should be presigned.
+     */
+    public CompleteMultipartUploadRequest completeMultipartUploadRequest() {
+        return completeMultipartUploadRequest;
+    }
+
+    @Override
+    public Builder toBuilder() {
+        return new DefaultBuilder(this);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        if (!super.equals(o)) {
+            return false;
+        }
+
+        CompleteMultipartUploadPresignRequest that = (CompleteMultipartUploadPresignRequest) o;
+
+        return completeMultipartUploadRequest.equals(that.completeMultipartUploadRequest);
+    }
+
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        result = 31 * result + completeMultipartUploadRequest.hashCode();
+        return result;
+    }
+
+    /**
+     * A builder for a {@link CompleteMultipartUploadPresignRequest}, created with {@link #builder()}.
+     */
+    @SdkPublicApi
+    @NotThreadSafe
+    public interface Builder
+        extends PresignRequest.Builder,
+                CopyableBuilder<CompleteMultipartUploadPresignRequest.Builder, CompleteMultipartUploadPresignRequest> {
+        /**
+         * Configure the {@link CompleteMultipartUploadRequest} that should be presigned.
+         */
+        Builder completeMultipartUploadRequest(CompleteMultipartUploadRequest completeMultipartUploadRequest);
+
+        /**
+         * Configure the {@link CompleteMultipartUploadRequest} that should be presigned.
+         * <p/>
+         * This is a convenience method for invoking {@link #completeMultipartUploadRequest(CompleteMultipartUploadRequest)}
+         * without needing to invoke {@code CompleteMultipartUploadRequest.builder()} or {@code build()}.
+         */
+        default Builder completeMultipartUploadRequest(
+            Consumer<CompleteMultipartUploadRequest.Builder> completeMultipartUploadRequest) {
+            CompleteMultipartUploadRequest.Builder builder = CompleteMultipartUploadRequest.builder();
+            completeMultipartUploadRequest.accept(builder);
+            return completeMultipartUploadRequest(builder.build());
+        }
+
+        @Override
+        Builder signatureDuration(Duration signatureDuration);
+
+        @Override
+        CompleteMultipartUploadPresignRequest build();
+    }
+
+    @SdkInternalApi
+    private static final class DefaultBuilder extends PresignRequest.DefaultBuilder<DefaultBuilder> implements Builder {
+        private CompleteMultipartUploadRequest completeMultipartUploadRequest;
+
+        private DefaultBuilder() {
+        }
+
+        private DefaultBuilder(CompleteMultipartUploadPresignRequest request) {
+            super(request);
+            this.completeMultipartUploadRequest = request.completeMultipartUploadRequest;
+        }
+
+        @Override
+        public Builder completeMultipartUploadRequest(CompleteMultipartUploadRequest completeMultipartUploadRequest) {
+            this.completeMultipartUploadRequest = completeMultipartUploadRequest;
+            return this;
+        }
+
+        @Override
+        public CompleteMultipartUploadPresignRequest build() {
+            return new CompleteMultipartUploadPresignRequest(this);
+        }
+    }
+}
diff --git a/services/s3/src/main/java/software/amazon/awssdk/services/s3/presigner/model/CreateMultipartUploadPresignRequest.java b/services/s3/src/main/java/software/amazon/awssdk/services/s3/presigner/model/CreateMultipartUploadPresignRequest.java
new file mode 100644
index 000000000000..06531b295cc1
--- /dev/null
+++ b/services/s3/src/main/java/software/amazon/awssdk/services/s3/presigner/model/CreateMultipartUploadPresignRequest.java
@@ -0,0 +1,154 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.services.s3.presigner.model;
+
+import java.time.Duration;
+import java.util.function.Consumer;
+import software.amazon.awssdk.annotations.Immutable;
+import software.amazon.awssdk.annotations.NotThreadSafe;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.SdkPublicApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.awscore.presigner.PresignRequest;
+import software.amazon.awssdk.services.s3.model.CreateMultipartUploadRequest;
+import software.amazon.awssdk.services.s3.presigner.S3Presigner;
+import software.amazon.awssdk.utils.Validate;
+import software.amazon.awssdk.utils.builder.CopyableBuilder;
+import software.amazon.awssdk.utils.builder.ToCopyableBuilder;
+
+/**
+ * A request to pre-sign a {@link CreateMultipartUploadRequest} so that it can be executed at a later time without requiring
+ * additional signing or authentication.
+ *
+ * @see S3Presigner#presignCreateMultipartUpload(CreateMultipartUploadPresignRequest)
+ * @see #builder()
+ */
+@SdkPublicApi
+@Immutable
+@ThreadSafe
+public final class CreateMultipartUploadPresignRequest
+        extends PresignRequest
+        implements ToCopyableBuilder<CreateMultipartUploadPresignRequest.Builder, CreateMultipartUploadPresignRequest> {
+    private final CreateMultipartUploadRequest createMultipartUploadRequest;
+
+    private CreateMultipartUploadPresignRequest(DefaultBuilder builder) {
+        super(builder);
+        this.createMultipartUploadRequest = Validate.notNull(builder.createMultipartUploadRequest,
+                                                             "createMultipartUploadRequest");
+    }
+
+    /**
+     * Create a builder that can be used to create a {@link CreateMultipartUploadPresignRequest}.
+     *
+     * @see S3Presigner#presignCreateMultipartUpload(CreateMultipartUploadPresignRequest)
+     */
+    public static Builder builder() {
+        return new DefaultBuilder();
+    }
+
+    /**
+     * Retrieve the {@link CreateMultipartUploadRequest} that should be presigned.
+     */
+    public CreateMultipartUploadRequest createMultipartUploadRequest() {
+        return createMultipartUploadRequest;
+    }
+
+    @Override
+    public Builder toBuilder() {
+        return new DefaultBuilder(this);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        if (!super.equals(o)) {
+            return false;
+        }
+
+        CreateMultipartUploadPresignRequest that = (CreateMultipartUploadPresignRequest) o;
+
+        return createMultipartUploadRequest.equals(that.createMultipartUploadRequest);
+    }
+
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        result = 31 * result + createMultipartUploadRequest.hashCode();
+        return result;
+    }
+
+    /**
+     * A builder for a {@link CreateMultipartUploadPresignRequest}, created with {@link #builder()}.
+     */
+    @SdkPublicApi
+    @NotThreadSafe
+    public interface Builder
+        extends PresignRequest.Builder,
+                CopyableBuilder<CreateMultipartUploadPresignRequest.Builder, CreateMultipartUploadPresignRequest> {
+        /**
+         * Configure the {@link CreateMultipartUploadRequest} that should be presigned.
+         */
+        Builder createMultipartUploadRequest(CreateMultipartUploadRequest createMultipartUploadRequest);
+
+        /**
+         * Configure the {@link CreateMultipartUploadRequest} that should be presigned.
+         * <p/>
+         * This is a convenience method for invoking {@link #createMultipartUploadRequest(CreateMultipartUploadRequest)}
+         * without needing to invoke {@code CreateMultipartUploadRequest.builder()} or {@code build()}.
+         */
+        default Builder createMultipartUploadRequest(
+            Consumer<CreateMultipartUploadRequest.Builder> createMultipartUploadRequest) {
+            CreateMultipartUploadRequest.Builder builder = CreateMultipartUploadRequest.builder();
+            createMultipartUploadRequest.accept(builder);
+            return createMultipartUploadRequest(builder.build());
+        }
+
+        @Override
+        Builder signatureDuration(Duration signatureDuration);
+
+        @Override
+        CreateMultipartUploadPresignRequest build();
+    }
+
+    @SdkInternalApi
+    private static final class DefaultBuilder extends PresignRequest.DefaultBuilder<DefaultBuilder> implements Builder {
+        private CreateMultipartUploadRequest createMultipartUploadRequest;
+
+        private DefaultBuilder() {
+        }
+
+        private DefaultBuilder(CreateMultipartUploadPresignRequest request) {
+            super(request);
+            this.createMultipartUploadRequest = request.createMultipartUploadRequest;
+        }
+
+        @Override
+        public Builder createMultipartUploadRequest(CreateMultipartUploadRequest createMultipartUploadRequest) {
+            this.createMultipartUploadRequest = createMultipartUploadRequest;
+            return this;
+        }
+
+        @Override
+        public CreateMultipartUploadPresignRequest build() {
+            return new CreateMultipartUploadPresignRequest(this);
+        }
+    }
+}
diff --git a/services/s3/src/main/java/software/amazon/awssdk/services/s3/presigner/model/GetObjectPresignRequest.java b/services/s3/src/main/java/software/amazon/awssdk/services/s3/presigner/model/GetObjectPresignRequest.java
index 5b568a01506a..ce0c5d5fa2aa 100644
--- a/services/s3/src/main/java/software/amazon/awssdk/services/s3/presigner/model/GetObjectPresignRequest.java
+++ b/services/s3/src/main/java/software/amazon/awssdk/services/s3/presigner/model/GetObjectPresignRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -129,7 +129,8 @@ default Builder getObjectRequest(Consumer<GetObjectRequest.Builder> getObjectReq
     private static final class DefaultBuilder extends PresignRequest.DefaultBuilder<DefaultBuilder> implements Builder {
         private GetObjectRequest getObjectRequest;
 
-        private DefaultBuilder() {}
+        private DefaultBuilder() {
+        }
 
         private DefaultBuilder(GetObjectPresignRequest request) {
             super(request);
diff --git a/services/s3/src/main/java/software/amazon/awssdk/services/s3/presigner/model/PresignedAbortMultipartUploadRequest.java b/services/s3/src/main/java/software/amazon/awssdk/services/s3/presigner/model/PresignedAbortMultipartUploadRequest.java
new file mode 100644
index 000000000000..9848e647b6b4
--- /dev/null
+++ b/services/s3/src/main/java/software/amazon/awssdk/services/s3/presigner/model/PresignedAbortMultipartUploadRequest.java
@@ -0,0 +1,108 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.services.s3.presigner.model;
+
+import java.time.Instant;
+import java.util.List;
+import java.util.Map;
+import software.amazon.awssdk.annotations.Immutable;
+import software.amazon.awssdk.annotations.NotThreadSafe;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.SdkPublicApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.awscore.presigner.PresignedRequest;
+import software.amazon.awssdk.core.SdkBytes;
+import software.amazon.awssdk.http.SdkHttpRequest;
+import software.amazon.awssdk.services.s3.model.AbortMultipartUploadRequest;
+import software.amazon.awssdk.services.s3.presigner.S3Presigner;
+import software.amazon.awssdk.utils.builder.CopyableBuilder;
+import software.amazon.awssdk.utils.builder.ToCopyableBuilder;
+
+/**
+ * A pre-signed {@link AbortMultipartUploadRequest} that can be executed at a later time without requiring additional signing
+ * or authentication.
+ *
+ * @see S3Presigner#presignAbortMultipartUpload(AbortMultipartUploadPresignRequest)
+ * @see #builder()
+ */
+@SdkPublicApi
+@Immutable
+@ThreadSafe
+public class PresignedAbortMultipartUploadRequest
+        extends PresignedRequest
+        implements ToCopyableBuilder<PresignedAbortMultipartUploadRequest.Builder, PresignedAbortMultipartUploadRequest> {
+    private PresignedAbortMultipartUploadRequest(DefaultBuilder builder) {
+        super(builder);
+    }
+
+    /**
+     * Create a builder that can be used to create a {@link PresignedAbortMultipartUploadRequest}.
+     *
+     * @see S3Presigner#presignAbortMultipartUpload(AbortMultipartUploadPresignRequest)
+     */
+    public static Builder builder() {
+        return new DefaultBuilder();
+    }
+
+    @Override
+    public Builder toBuilder() {
+        return new DefaultBuilder(this);
+    }
+
+    /**
+     * A builder for a {@link PresignedAbortMultipartUploadRequest}, created with {@link #builder()}.
+     */
+    @SdkPublicApi
+    @NotThreadSafe
+    public interface Builder
+        extends PresignedRequest.Builder,
+                CopyableBuilder<PresignedAbortMultipartUploadRequest.Builder, PresignedAbortMultipartUploadRequest> {
+        @Override
+        Builder expiration(Instant expiration);
+
+        @Override
+        Builder isBrowserExecutable(Boolean isBrowserExecutable);
+
+        @Override
+        Builder signedHeaders(Map<String, List<String>> signedHeaders);
+
+        @Override
+        Builder signedPayload(SdkBytes signedPayload);
+
+        @Override
+        Builder httpRequest(SdkHttpRequest httpRequest);
+
+        @Override
+        PresignedAbortMultipartUploadRequest build();
+    }
+
+    @SdkInternalApi
+    private static final class DefaultBuilder
+            extends PresignedRequest.DefaultBuilder<DefaultBuilder>
+            implements Builder {
+        private DefaultBuilder() {
+        }
+
+        private DefaultBuilder(PresignedAbortMultipartUploadRequest request) {
+            super(request);
+        }
+
+        @Override
+        public PresignedAbortMultipartUploadRequest build() {
+            return new PresignedAbortMultipartUploadRequest(this);
+        }
+    }
+}
diff --git a/services/s3/src/main/java/software/amazon/awssdk/services/s3/presigner/model/PresignedCompleteMultipartUploadRequest.java b/services/s3/src/main/java/software/amazon/awssdk/services/s3/presigner/model/PresignedCompleteMultipartUploadRequest.java
new file mode 100644
index 000000000000..c06da5ecab06
--- /dev/null
+++ b/services/s3/src/main/java/software/amazon/awssdk/services/s3/presigner/model/PresignedCompleteMultipartUploadRequest.java
@@ -0,0 +1,108 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.services.s3.presigner.model;
+
+import java.time.Instant;
+import java.util.List;
+import java.util.Map;
+import software.amazon.awssdk.annotations.Immutable;
+import software.amazon.awssdk.annotations.NotThreadSafe;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.SdkPublicApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.awscore.presigner.PresignedRequest;
+import software.amazon.awssdk.core.SdkBytes;
+import software.amazon.awssdk.http.SdkHttpRequest;
+import software.amazon.awssdk.services.s3.model.CompleteMultipartUploadRequest;
+import software.amazon.awssdk.services.s3.presigner.S3Presigner;
+import software.amazon.awssdk.utils.builder.CopyableBuilder;
+import software.amazon.awssdk.utils.builder.ToCopyableBuilder;
+
+/**
+ * A pre-signed {@link CompleteMultipartUploadRequest} that can be executed at a later time without requiring additional signing
+ * or authentication.
+ *
+ * @see S3Presigner#presignCompleteMultipartUpload(CompleteMultipartUploadPresignRequest)
+ * @see #builder()
+ */
+@SdkPublicApi
+@Immutable
+@ThreadSafe
+public class PresignedCompleteMultipartUploadRequest
+        extends PresignedRequest
+        implements ToCopyableBuilder<PresignedCompleteMultipartUploadRequest.Builder, PresignedCompleteMultipartUploadRequest> {
+    private PresignedCompleteMultipartUploadRequest(DefaultBuilder builder) {
+        super(builder);
+    }
+
+    /**
+     * Create a builder that can be used to create a {@link PresignedCompleteMultipartUploadRequest}.
+     *
+     * @see S3Presigner#presignCompleteMultipartUpload(CompleteMultipartUploadPresignRequest)
+     */
+    public static Builder builder() {
+        return new DefaultBuilder();
+    }
+
+    @Override
+    public Builder toBuilder() {
+        return new DefaultBuilder(this);
+    }
+
+    /**
+     * A builder for a {@link PresignedCompleteMultipartUploadRequest}, created with {@link #builder()}.
+     */
+    @SdkPublicApi
+    @NotThreadSafe
+    public interface Builder
+        extends PresignedRequest.Builder,
+                CopyableBuilder<PresignedCompleteMultipartUploadRequest.Builder, PresignedCompleteMultipartUploadRequest> {
+        @Override
+        Builder expiration(Instant expiration);
+
+        @Override
+        Builder isBrowserExecutable(Boolean isBrowserExecutable);
+
+        @Override
+        Builder signedHeaders(Map<String, List<String>> signedHeaders);
+
+        @Override
+        Builder signedPayload(SdkBytes signedPayload);
+
+        @Override
+        Builder httpRequest(SdkHttpRequest httpRequest);
+
+        @Override
+        PresignedCompleteMultipartUploadRequest build();
+    }
+
+    @SdkInternalApi
+    private static final class DefaultBuilder
+            extends PresignedRequest.DefaultBuilder<DefaultBuilder>
+            implements Builder {
+        private DefaultBuilder() {
+        }
+
+        private DefaultBuilder(PresignedCompleteMultipartUploadRequest request) {
+            super(request);
+        }
+
+        @Override
+        public PresignedCompleteMultipartUploadRequest build() {
+            return new PresignedCompleteMultipartUploadRequest(this);
+        }
+    }
+}
diff --git a/services/s3/src/main/java/software/amazon/awssdk/services/s3/presigner/model/PresignedCreateMultipartUploadRequest.java b/services/s3/src/main/java/software/amazon/awssdk/services/s3/presigner/model/PresignedCreateMultipartUploadRequest.java
new file mode 100644
index 000000000000..b16e16de1d1b
--- /dev/null
+++ b/services/s3/src/main/java/software/amazon/awssdk/services/s3/presigner/model/PresignedCreateMultipartUploadRequest.java
@@ -0,0 +1,108 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.services.s3.presigner.model;
+
+import java.time.Instant;
+import java.util.List;
+import java.util.Map;
+import software.amazon.awssdk.annotations.Immutable;
+import software.amazon.awssdk.annotations.NotThreadSafe;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.SdkPublicApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.awscore.presigner.PresignedRequest;
+import software.amazon.awssdk.core.SdkBytes;
+import software.amazon.awssdk.http.SdkHttpRequest;
+import software.amazon.awssdk.services.s3.model.CreateMultipartUploadRequest;
+import software.amazon.awssdk.services.s3.presigner.S3Presigner;
+import software.amazon.awssdk.utils.builder.CopyableBuilder;
+import software.amazon.awssdk.utils.builder.ToCopyableBuilder;
+
+/**
+ * A pre-signed {@link CreateMultipartUploadRequest} that can be executed at a later time without requiring additional signing or
+ * authentication.
+ *
+ * @see S3Presigner#presignCreateMultipartUpload(CreateMultipartUploadPresignRequest)
+ * @see #builder()
+ */
+@SdkPublicApi
+@Immutable
+@ThreadSafe
+public class PresignedCreateMultipartUploadRequest
+        extends PresignedRequest
+        implements ToCopyableBuilder<PresignedCreateMultipartUploadRequest.Builder, PresignedCreateMultipartUploadRequest> {
+    private PresignedCreateMultipartUploadRequest(DefaultBuilder builder) {
+        super(builder);
+    }
+
+    /**
+     * Create a builder that can be used to create a {@link PresignedCreateMultipartUploadRequest}.
+     *
+     * @see S3Presigner#presignCreateMultipartUpload(CreateMultipartUploadPresignRequest)
+     */
+    public static Builder builder() {
+        return new DefaultBuilder();
+    }
+
+    @Override
+    public Builder toBuilder() {
+        return new DefaultBuilder(this);
+    }
+
+    /**
+     * A builder for a {@link PresignedCreateMultipartUploadRequest}, created with {@link #builder()}.
+     */
+    @SdkPublicApi
+    @NotThreadSafe
+    public interface Builder
+        extends PresignedRequest.Builder,
+                CopyableBuilder<PresignedCreateMultipartUploadRequest.Builder, PresignedCreateMultipartUploadRequest> {
+        @Override
+        Builder expiration(Instant expiration);
+
+        @Override
+        Builder isBrowserExecutable(Boolean isBrowserExecutable);
+
+        @Override
+        Builder signedHeaders(Map<String, List<String>> signedHeaders);
+
+        @Override
+        Builder signedPayload(SdkBytes signedPayload);
+
+        @Override
+        Builder httpRequest(SdkHttpRequest httpRequest);
+
+        @Override
+        PresignedCreateMultipartUploadRequest build();
+    }
+
+    @SdkInternalApi
+    private static final class DefaultBuilder
+            extends PresignedRequest.DefaultBuilder<DefaultBuilder>
+            implements Builder {
+        private DefaultBuilder() {
+        }
+
+        private DefaultBuilder(PresignedCreateMultipartUploadRequest request) {
+            super(request);
+        }
+
+        @Override
+        public PresignedCreateMultipartUploadRequest build() {
+            return new PresignedCreateMultipartUploadRequest(this);
+        }
+    }
+}
diff --git a/services/s3/src/main/java/software/amazon/awssdk/services/s3/presigner/model/PresignedGetObjectRequest.java b/services/s3/src/main/java/software/amazon/awssdk/services/s3/presigner/model/PresignedGetObjectRequest.java
index 6f03eb623bca..f9cacffae249 100644
--- a/services/s3/src/main/java/software/amazon/awssdk/services/s3/presigner/model/PresignedGetObjectRequest.java
+++ b/services/s3/src/main/java/software/amazon/awssdk/services/s3/presigner/model/PresignedGetObjectRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -92,7 +92,8 @@ public interface Builder extends PresignedRequest.Builder,
     private static final class DefaultBuilder
             extends PresignedRequest.DefaultBuilder<DefaultBuilder>
             implements Builder {
-        private DefaultBuilder() { }
+        private DefaultBuilder() {
+        }
 
         private DefaultBuilder(PresignedGetObjectRequest request) {
             super(request);
diff --git a/services/s3/src/main/java/software/amazon/awssdk/services/s3/presigner/model/PresignedPutObjectRequest.java b/services/s3/src/main/java/software/amazon/awssdk/services/s3/presigner/model/PresignedPutObjectRequest.java
new file mode 100644
index 000000000000..003a7ab0343b
--- /dev/null
+++ b/services/s3/src/main/java/software/amazon/awssdk/services/s3/presigner/model/PresignedPutObjectRequest.java
@@ -0,0 +1,107 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.services.s3.presigner.model;
+
+import java.time.Instant;
+import java.util.List;
+import java.util.Map;
+import software.amazon.awssdk.annotations.Immutable;
+import software.amazon.awssdk.annotations.NotThreadSafe;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.SdkPublicApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.awscore.presigner.PresignedRequest;
+import software.amazon.awssdk.core.SdkBytes;
+import software.amazon.awssdk.http.SdkHttpRequest;
+import software.amazon.awssdk.services.s3.model.PutObjectRequest;
+import software.amazon.awssdk.services.s3.presigner.S3Presigner;
+import software.amazon.awssdk.utils.builder.CopyableBuilder;
+import software.amazon.awssdk.utils.builder.ToCopyableBuilder;
+
+/**
+ * A pre-signed a {@link PutObjectRequest} that can be executed at a later time without requiring additional signing or
+ * authentication.
+ *
+ * @see S3Presigner#presignPutObject(PutObjectPresignRequest)
+ * @see #builder()
+ */
+@SdkPublicApi
+@Immutable
+@ThreadSafe
+public class PresignedPutObjectRequest
+        extends PresignedRequest
+        implements ToCopyableBuilder<PresignedPutObjectRequest.Builder, PresignedPutObjectRequest> {
+    private PresignedPutObjectRequest(DefaultBuilder builder) {
+        super(builder);
+    }
+
+    /**
+     * Create a builder that can be used to create a {@link PresignedPutObjectRequest}.
+     *
+     * @see S3Presigner#presignPutObject(PutObjectPresignRequest)
+     */
+    public static Builder builder() {
+        return new DefaultBuilder();
+    }
+
+    @Override
+    public Builder toBuilder() {
+        return new DefaultBuilder(this);
+    }
+
+    /**
+     * A builder for a {@link PresignedPutObjectRequest}, created with {@link #builder()}.
+     */
+    @SdkPublicApi
+    @NotThreadSafe
+    public interface Builder extends PresignedRequest.Builder,
+                                     CopyableBuilder<PresignedPutObjectRequest.Builder, PresignedPutObjectRequest> {
+        @Override
+        Builder expiration(Instant expiration);
+
+        @Override
+        Builder isBrowserExecutable(Boolean isBrowserExecutable);
+
+        @Override
+        Builder signedHeaders(Map<String, List<String>> signedHeaders);
+
+        @Override
+        Builder signedPayload(SdkBytes signedPayload);
+
+        @Override
+        Builder httpRequest(SdkHttpRequest httpRequest);
+
+        @Override
+        PresignedPutObjectRequest build();
+    }
+
+    @SdkInternalApi
+    private static final class DefaultBuilder
+            extends PresignedRequest.DefaultBuilder<DefaultBuilder>
+            implements Builder {
+        private DefaultBuilder() {
+        }
+
+        private DefaultBuilder(PresignedPutObjectRequest request) {
+            super(request);
+        }
+
+        @Override
+        public PresignedPutObjectRequest build() {
+            return new PresignedPutObjectRequest(this);
+        }
+    }
+}
diff --git a/services/s3/src/main/java/software/amazon/awssdk/services/s3/presigner/model/PresignedUploadPartRequest.java b/services/s3/src/main/java/software/amazon/awssdk/services/s3/presigner/model/PresignedUploadPartRequest.java
new file mode 100644
index 000000000000..89dcc6b9d68a
--- /dev/null
+++ b/services/s3/src/main/java/software/amazon/awssdk/services/s3/presigner/model/PresignedUploadPartRequest.java
@@ -0,0 +1,107 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.services.s3.presigner.model;
+
+import java.time.Instant;
+import java.util.List;
+import java.util.Map;
+import software.amazon.awssdk.annotations.Immutable;
+import software.amazon.awssdk.annotations.NotThreadSafe;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.SdkPublicApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.awscore.presigner.PresignedRequest;
+import software.amazon.awssdk.core.SdkBytes;
+import software.amazon.awssdk.http.SdkHttpRequest;
+import software.amazon.awssdk.services.s3.model.UploadPartRequest;
+import software.amazon.awssdk.services.s3.presigner.S3Presigner;
+import software.amazon.awssdk.utils.builder.CopyableBuilder;
+import software.amazon.awssdk.utils.builder.ToCopyableBuilder;
+
+/**
+ * A pre-signed {@link UploadPartRequest} that can be executed at a later time without requiring additional signing or
+ * authentication.
+ *
+ * @see S3Presigner#presignUploadPart(UploadPartPresignRequest)
+ * @see #builder()
+ */
+@SdkPublicApi
+@Immutable
+@ThreadSafe
+public class PresignedUploadPartRequest
+        extends PresignedRequest
+        implements ToCopyableBuilder<PresignedUploadPartRequest.Builder, PresignedUploadPartRequest> {
+    private PresignedUploadPartRequest(DefaultBuilder builder) {
+        super(builder);
+    }
+
+    /**
+     * Create a builder that can be used to create a {@link PresignedUploadPartRequest}.
+     *
+     * @see S3Presigner#presignUploadPart(UploadPartPresignRequest)
+     */
+    public static Builder builder() {
+        return new DefaultBuilder();
+    }
+
+    @Override
+    public Builder toBuilder() {
+        return new DefaultBuilder(this);
+    }
+
+    /**
+     * A builder for a {@link PresignedUploadPartRequest}, created with {@link #builder()}.
+     */
+    @SdkPublicApi
+    @NotThreadSafe
+    public interface Builder extends PresignedRequest.Builder,
+                                     CopyableBuilder<PresignedUploadPartRequest.Builder, PresignedUploadPartRequest> {
+        @Override
+        Builder expiration(Instant expiration);
+
+        @Override
+        Builder isBrowserExecutable(Boolean isBrowserExecutable);
+
+        @Override
+        Builder signedHeaders(Map<String, List<String>> signedHeaders);
+
+        @Override
+        Builder signedPayload(SdkBytes signedPayload);
+
+        @Override
+        Builder httpRequest(SdkHttpRequest httpRequest);
+
+        @Override
+        PresignedUploadPartRequest build();
+    }
+
+    @SdkInternalApi
+    private static final class DefaultBuilder
+            extends PresignedRequest.DefaultBuilder<DefaultBuilder>
+            implements Builder {
+        private DefaultBuilder() {
+        }
+
+        private DefaultBuilder(PresignedUploadPartRequest request) {
+            super(request);
+        }
+
+        @Override
+        public PresignedUploadPartRequest build() {
+            return new PresignedUploadPartRequest(this);
+        }
+    }
+}
diff --git a/services/s3/src/main/java/software/amazon/awssdk/services/s3/presigner/model/PutObjectPresignRequest.java b/services/s3/src/main/java/software/amazon/awssdk/services/s3/presigner/model/PutObjectPresignRequest.java
new file mode 100644
index 000000000000..2d02b0b079f8
--- /dev/null
+++ b/services/s3/src/main/java/software/amazon/awssdk/services/s3/presigner/model/PutObjectPresignRequest.java
@@ -0,0 +1,151 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.services.s3.presigner.model;
+
+import java.time.Duration;
+import java.util.function.Consumer;
+import software.amazon.awssdk.annotations.Immutable;
+import software.amazon.awssdk.annotations.NotThreadSafe;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.SdkPublicApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.awscore.presigner.PresignRequest;
+import software.amazon.awssdk.services.s3.model.PutObjectRequest;
+import software.amazon.awssdk.services.s3.presigner.S3Presigner;
+import software.amazon.awssdk.utils.Validate;
+import software.amazon.awssdk.utils.builder.CopyableBuilder;
+import software.amazon.awssdk.utils.builder.ToCopyableBuilder;
+
+/**
+ * A request to pre-sign a {@link PutObjectRequest} so that it can be executed at a later time without requiring additional
+ * signing or authentication.
+ *
+ * @see S3Presigner#presignPutObject(PutObjectPresignRequest)
+ * @see #builder()
+ */
+@SdkPublicApi
+@Immutable
+@ThreadSafe
+public final class PutObjectPresignRequest
+        extends PresignRequest
+        implements ToCopyableBuilder<PutObjectPresignRequest.Builder, PutObjectPresignRequest> {
+    private final PutObjectRequest putObjectRequest;
+
+    private PutObjectPresignRequest(DefaultBuilder builder) {
+        super(builder);
+        this.putObjectRequest = Validate.notNull(builder.putObjectRequest, "putObjectRequest");
+    }
+
+    /**
+     * Create a builder that can be used to create a {@link PutObjectPresignRequest}.
+     *
+     * @see S3Presigner#presignPutObject(PutObjectPresignRequest)
+     */
+    public static Builder builder() {
+        return new DefaultBuilder();
+    }
+
+    /**
+     * Retrieve the {@link PutObjectRequest} that should be presigned.
+     */
+    public PutObjectRequest putObjectRequest() {
+        return putObjectRequest;
+    }
+
+    @Override
+    public Builder toBuilder() {
+        return new DefaultBuilder(this);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        if (!super.equals(o)) {
+            return false;
+        }
+
+        PutObjectPresignRequest that = (PutObjectPresignRequest) o;
+
+        return putObjectRequest.equals(that.putObjectRequest);
+    }
+
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        result = 31 * result + putObjectRequest.hashCode();
+        return result;
+    }
+
+    /**
+     * A builder for a {@link PutObjectPresignRequest}, created with {@link #builder()}.
+     */
+    @SdkPublicApi
+    @NotThreadSafe
+    public interface Builder extends PresignRequest.Builder,
+                                     CopyableBuilder<PutObjectPresignRequest.Builder, PutObjectPresignRequest> {
+        /**
+         * Configure the {@link PutObjectRequest} that should be presigned.
+         */
+        Builder putObjectRequest(PutObjectRequest putObjectRequest);
+
+        /**
+         * Configure the {@link PutObjectRequest} that should be presigned.
+         * <p/>
+         * This is a convenience method for invoking {@link #putObjectRequest(PutObjectRequest)} without needing to invoke
+         * {@code PutObjectRequest.builder()} or {@code build()}.
+         */
+        default Builder putObjectRequest(Consumer<PutObjectRequest.Builder> putObjectRequest) {
+            PutObjectRequest.Builder builder = PutObjectRequest.builder();
+            putObjectRequest.accept(builder);
+            return putObjectRequest(builder.build());
+        }
+
+        @Override
+        Builder signatureDuration(Duration signatureDuration);
+
+        @Override
+        PutObjectPresignRequest build();
+    }
+
+    @SdkInternalApi
+    private static final class DefaultBuilder extends PresignRequest.DefaultBuilder<DefaultBuilder> implements Builder {
+        private PutObjectRequest putObjectRequest;
+
+        private DefaultBuilder() {
+        }
+
+        private DefaultBuilder(PutObjectPresignRequest request) {
+            super(request);
+            this.putObjectRequest = request.putObjectRequest;
+        }
+
+        @Override
+        public Builder putObjectRequest(PutObjectRequest putObjectRequest) {
+            this.putObjectRequest = putObjectRequest;
+            return this;
+        }
+
+        @Override
+        public PutObjectPresignRequest build() {
+            return new PutObjectPresignRequest(this);
+        }
+    }
+}
diff --git a/services/s3/src/main/java/software/amazon/awssdk/services/s3/presigner/model/UploadPartPresignRequest.java b/services/s3/src/main/java/software/amazon/awssdk/services/s3/presigner/model/UploadPartPresignRequest.java
new file mode 100644
index 000000000000..9b8dc595f191
--- /dev/null
+++ b/services/s3/src/main/java/software/amazon/awssdk/services/s3/presigner/model/UploadPartPresignRequest.java
@@ -0,0 +1,151 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.services.s3.presigner.model;
+
+import java.time.Duration;
+import java.util.function.Consumer;
+import software.amazon.awssdk.annotations.Immutable;
+import software.amazon.awssdk.annotations.NotThreadSafe;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.SdkPublicApi;
+import software.amazon.awssdk.annotations.ThreadSafe;
+import software.amazon.awssdk.awscore.presigner.PresignRequest;
+import software.amazon.awssdk.services.s3.model.UploadPartRequest;
+import software.amazon.awssdk.services.s3.presigner.S3Presigner;
+import software.amazon.awssdk.utils.Validate;
+import software.amazon.awssdk.utils.builder.CopyableBuilder;
+import software.amazon.awssdk.utils.builder.ToCopyableBuilder;
+
+/**
+ * A request to pre-sign a {@link UploadPartRequest} so that it can be executed at a later time without requiring additional
+ * signing or authentication.
+ *
+ * @see S3Presigner#presignUploadPart(UploadPartPresignRequest)
+ * @see #builder()
+ */
+@SdkPublicApi
+@Immutable
+@ThreadSafe
+public final class UploadPartPresignRequest
+        extends PresignRequest
+        implements ToCopyableBuilder<UploadPartPresignRequest.Builder, UploadPartPresignRequest> {
+    private final UploadPartRequest uploadPartRequest;
+
+    private UploadPartPresignRequest(DefaultBuilder builder) {
+        super(builder);
+        this.uploadPartRequest = Validate.notNull(builder.uploadPartRequest, "uploadPartRequest");
+    }
+
+    /**
+     * Create a builder that can be used to create a {@link UploadPartPresignRequest}.
+     *
+     * @see S3Presigner#presignUploadPart(UploadPartPresignRequest)
+     */
+    public static Builder builder() {
+        return new DefaultBuilder();
+    }
+
+    /**
+     * Retrieve the {@link UploadPartRequest} that should be presigned.
+     */
+    public UploadPartRequest uploadPartRequest() {
+        return uploadPartRequest;
+    }
+
+    @Override
+    public Builder toBuilder() {
+        return new DefaultBuilder(this);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        if (!super.equals(o)) {
+            return false;
+        }
+
+        UploadPartPresignRequest that = (UploadPartPresignRequest) o;
+
+        return uploadPartRequest.equals(that.uploadPartRequest);
+    }
+
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        result = 31 * result + uploadPartRequest.hashCode();
+        return result;
+    }
+
+    /**
+     * A builder for a {@link UploadPartPresignRequest}, created with {@link #builder()}.
+     */
+    @SdkPublicApi
+    @NotThreadSafe
+    public interface Builder extends PresignRequest.Builder,
+                                     CopyableBuilder<UploadPartPresignRequest.Builder, UploadPartPresignRequest> {
+        /**
+         * Configure the {@link UploadPartRequest} that should be presigned.
+         */
+        Builder uploadPartRequest(UploadPartRequest uploadPartRequest);
+
+        /**
+         * Configure the {@link UploadPartRequest} that should be presigned.
+         * <p/>
+         * This is a convenience method for invoking {@link #uploadPartRequest(UploadPartRequest)} without needing to invoke
+         * {@code UploadPartRequest.builder()} or {@code build()}.
+         */
+        default Builder uploadPartRequest(Consumer<UploadPartRequest.Builder> uploadPartRequest) {
+            UploadPartRequest.Builder builder = UploadPartRequest.builder();
+            uploadPartRequest.accept(builder);
+            return uploadPartRequest(builder.build());
+        }
+
+        @Override
+        Builder signatureDuration(Duration signatureDuration);
+
+        @Override
+        UploadPartPresignRequest build();
+    }
+
+    @SdkInternalApi
+    private static final class DefaultBuilder extends PresignRequest.DefaultBuilder<DefaultBuilder> implements Builder {
+        private UploadPartRequest uploadPartRequest;
+
+        private DefaultBuilder() {
+        }
+
+        private DefaultBuilder(UploadPartPresignRequest request) {
+            super(request);
+            this.uploadPartRequest = request.uploadPartRequest;
+        }
+
+        @Override
+        public Builder uploadPartRequest(UploadPartRequest uploadPartRequest) {
+            this.uploadPartRequest = uploadPartRequest;
+            return this;
+        }
+
+        @Override
+        public UploadPartPresignRequest build() {
+            return new UploadPartPresignRequest(this);
+        }
+    }
+}
diff --git a/services/s3/src/main/resources/codegen-resources/customization.config b/services/s3/src/main/resources/codegen-resources/customization.config
index e861f54701a6..e284b3aa21cf 100644
--- a/services/s3/src/main/resources/codegen-resources/customization.config
+++ b/services/s3/src/main/resources/codegen-resources/customization.config
@@ -16,6 +16,20 @@
         }
       ]
     },
+    "CopyObjectRequest": {
+      "modify": [
+        {
+          "Bucket": {
+            "emitPropertyName": "DestinationBucket",
+            "existingNameDeprecated": true
+          },
+          "Key": {
+            "emitPropertyName": "DestinationKey",
+            "existingNameDeprecated": true
+          }
+        }
+      ]
+    },
     "ObjectVersion": {
       "modify": [
         {
@@ -61,6 +75,12 @@
       "memberName": "Tagging",
       "convenienceType": "software.amazon.awssdk.services.s3.model.Tagging",
       "typeAdapterFqcn": "software.amazon.awssdk.services.s3.internal.TaggingAdapter"
+    },
+    {
+      "shapeName": "CreateMultipartUploadRequest",
+      "memberName": "Tagging",
+      "convenienceType": "software.amazon.awssdk.services.s3.model.Tagging",
+      "typeAdapterFqcn": "software.amazon.awssdk.services.s3.internal.TaggingAdapter"
     }
   ],
   "customResponseMetadata": {
@@ -85,6 +105,5 @@
     "createMethodParams": [
       "clientConfiguration"
     ]
-  },
-  "serviceSpecificHttpConfig": "software.amazon.awssdk.services.s3.internal.S3HttpConfigurationOptions"
+  }
 }
diff --git a/services/s3/src/main/resources/codegen-resources/service-2.json b/services/s3/src/main/resources/codegen-resources/service-2.json
index 218cfc465b76..027a0f0d6ea2 100644
--- a/services/s3/src/main/resources/codegen-resources/service-2.json
+++ b/services/s3/src/main/resources/codegen-resources/service-2.json
@@ -26,7 +26,7 @@
         {"shape":"NoSuchUpload"}
       ],
       "documentationUrl":"http://docs.amazonwebservices.com/AmazonS3/latest/API/mpUploadAbort.html",
-      "documentation":"<p>Aborts a multipart upload.</p> <p>To verify that all parts have been removed, so you don't get charged for the part storage, you should call the List Parts operation and ensure the parts list is empty.</p>"
+      "documentation":"<p>This operation aborts a multipart upload. After a multipart upload is aborted, no additional parts can be uploaded using that upload ID. The storage consumed by any previously uploaded parts will be freed. However, if any part uploads are currently in progress, those part uploads might or might not succeed. As a result, it might be necessary to abort a given multipart upload multiple times in order to completely free all storage consumed by all parts. </p> <p>To verify that all parts have been removed, so you don't get charged for the part storage, you should call the <a>ListParts</a> operation and ensure that the parts list is empty.</p> <p>For information about permissions required to use the multipart upload API, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/mpuAndPermissions.html\">Multipart Upload API and Permissions</a>.</p> <p>The following operations are related to <code>AbortMultipartUpload</code>:</p> <ul> <li> <p> <a>CreateMultipartUpload</a> </p> </li> <li> <p> <a>UploadPart</a> </p> </li> <li> <p> <a>CompleteMultipartUpload</a> </p> </li> <li> <p> <a>ListParts</a> </p> </li> <li> <p> <a>ListMultipartUploads</a> </p> </li> </ul>"
     },
     "CompleteMultipartUpload":{
       "name":"CompleteMultipartUpload",
@@ -37,7 +37,7 @@
       "input":{"shape":"CompleteMultipartUploadRequest"},
       "output":{"shape":"CompleteMultipartUploadOutput"},
       "documentationUrl":"http://docs.amazonwebservices.com/AmazonS3/latest/API/mpUploadComplete.html",
-      "documentation":"<p>Completes a multipart upload by assembling previously uploaded parts.</p>"
+      "documentation":"<p>Completes a multipart upload by assembling previously uploaded parts.</p> <p>You first initiate the multipart upload and then upload all parts using the <a>UploadPart</a> operation. After successfully uploading all relevant parts of an upload, you call this operation to complete the upload. Upon receiving this request, Amazon S3 concatenates all the parts in ascending order by part number to create a new object. In the Complete Multipart Upload request, you must provide the parts list. You must ensure that the parts list is complete. This operation concatenates the parts that you provide in the list. For each part in the list, you must provide the part number and the <code>ETag</code> value, returned after that part was uploaded.</p> <p>Processing of a Complete Multipart Upload request could take several minutes to complete. After Amazon S3 begins processing the request, it sends an HTTP response header that specifies a 200 OK response. While processing is in progress, Amazon S3 periodically sends white space characters to keep the connection from timing out. Because a request could fail after the initial 200 OK response has been sent, it is important that you check the response body to determine whether the request succeeded.</p> <p>Note that if <code>CompleteMultipartUpload</code> fails, applications should be prepared to retry the failed requests. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/ErrorBestPractices.html\">Amazon S3 Error Best Practices</a>.</p> <p>For more information about multipart uploads, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/uploadobjusingmpu.html\">Uploading Objects Using Multipart Upload</a>.</p> <p>For information about permissions required to use the multipart upload API, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/mpuAndPermissions.html\">Multipart Upload API and Permissions</a>.</p> <p> <code>GetBucketLifecycle</code> has the following special errors:</p> <ul> <li> <p>Error code: <code>EntityTooSmall</code> </p> <ul> <li> <p>Description: Your proposed upload is smaller than the minimum allowed object size. Each part must be at least 5 MB in size, except the last part.</p> </li> <li> <p>400 Bad Request</p> </li> </ul> </li> <li> <p>Error code: <code>InvalidPart</code> </p> <ul> <li> <p>Description: One or more of the specified parts could not be found. The part might not have been uploaded, or the specified entity tag might not have matched the part's entity tag.</p> </li> <li> <p>400 Bad Request</p> </li> </ul> </li> <li> <p>Error code: <code>InvalidPartOrder</code> </p> <ul> <li> <p>Description: The list of parts was not in ascending order. The parts list must be specified in order by part number.</p> </li> <li> <p>400 Bad Request</p> </li> </ul> </li> <li> <p>Error code: <code>NoSuchUpload</code> </p> <ul> <li> <p>Description: The specified multipart upload does not exist. The upload ID might be invalid, or the multipart upload might have been aborted or completed.</p> </li> <li> <p>404 Not Found</p> </li> </ul> </li> </ul> <p>The following operations are related to <code>DeleteBucketMetricsConfiguration</code>:</p> <ul> <li> <p> <a>CreateMultipartUpload</a> </p> </li> <li> <p> <a>UploadPart</a> </p> </li> <li> <p> <a>AbortMultipartUpload</a> </p> </li> <li> <p> <a>ListParts</a> </p> </li> <li> <p> <a>ListMultipartUploads</a> </p> </li> </ul>"
     },
     "CopyObject":{
       "name":"CopyObject",
@@ -51,7 +51,7 @@
         {"shape":"ObjectNotInActiveTierError"}
       ],
       "documentationUrl":"http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTObjectCOPY.html",
-      "documentation":"<p>Creates a copy of an object that is already stored in Amazon S3.</p>",
+      "documentation":"<p>Creates a copy of an object that is already stored in Amazon S3.</p> <note> <p>You can store individual objects of up to 5 TB in Amazon S3. You create a copy of your object up to 5 GB in size in a single atomic operation using this API. However, for copying an object greater than 5 GB, you must use the multipart upload Upload Part - Copy API. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/CopyingObjctsUsingRESTMPUapi.html\">Copy Object Using the REST Multipart Upload API</a>.</p> </note> <p>When copying an object, you can preserve all metadata (default) or specify new metadata. However, the ACL is not preserved and is set to private for the user making the request. To override the default ACL setting, specify a new ACL when generating a copy request. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/S3_ACLs_UsingACLs.html\">Using ACLs</a>.</p> <important> <p>Amazon S3 transfer acceleration does not support cross-region copies. If you request a cross-region copy using a transfer acceleration endpoint, you get a 400 <code>Bad Request</code> error. For more information about transfer acceleration, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/transfer-acceleration.html\">Transfer Acceleration</a>.</p> </important> <p>All copy requests must be authenticated. Additionally, you must have <i>read</i> access to the source object and <i>write</i> access to the destination bucket. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/RESTAuthentication.html\">REST Authentication</a>. Both the Region that you want to copy the object from and the Region that you want to copy the object to must be enabled for your account.</p> <p>To only copy an object under certain conditions, such as whether the <code>Etag</code> matches or whether the object was modified before or after a specified date, use the request parameters <code>x-amz-copy-source-if-match</code>, <code>x-amz-copy-source-if-none-match</code>, <code>x-amz-copy-source-if-unmodified-since</code>, or <code> x-amz-copy-source-if-modified-since</code>.</p> <note> <p>All headers with the <code>x-amz-</code> prefix, including <code>x-amz-copy-source</code>, must be signed.</p> </note> <p>You can use this operation to change the storage class of an object that is already stored in Amazon S3 using the <code>StorageClass</code> parameter. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/storage-class-intro.html\">Storage Classes</a>.</p> <p>The source object that you are copying can be encrypted or unencrypted. If the source object is encrypted, it can be encrypted by server-side encryption using AWS managed encryption keys or by using a customer-provided encryption key. When copying an object, you can request that Amazon S3 encrypt the target object by using either the AWS managed encryption keys or by using your own encryption key. You can do this regardless of the form of server-side encryption that was used to encrypt the source, or even if the source object was not encrypted. For more information about server-side encryption, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/serv-side-encryption.html\">Using Server-Side Encryption</a>.</p> <p>A copy request might return an error when Amazon S3 receives the copy request or while Amazon S3 is copying the files. If the error occurs before the copy operation starts, you receive a standard Amazon S3 error. If the error occurs during the copy operation, the error response is embedded in the <code>200 OK</code> response. This means that a <code>200 OK</code> response can contain either a success or an error. Design your application to parse the contents of the response and handle it appropriately.</p> <p>If the copy is successful, you receive a response with information about the copied object.</p> <note> <p>If the request is an HTTP 1.1 request, the response is chunk encoded. If it were not, it would not contain the content-length, and you would need to read the entire body.</p> </note> <p>Consider the following when using request headers:</p> <ul> <li> <p> Consideration 1 – If both the <code>x-amz-copy-source-if-match</code> and <code>x-amz-copy-source-if-unmodified-since</code> headers are present in the request and evaluate as follows, Amazon S3 returns 200 OK and copies the data:</p> <ul> <li> <p> <code>x-amz-copy-source-if-match</code> condition evaluates to true</p> </li> <li> <p> <code>x-amz-copy-source-if-unmodified-since</code> condition evaluates to false</p> </li> </ul> </li> <li> <p> Consideration 2 – If both of the <code>x-amz-copy-source-if-none-match</code> and <code>x-amz-copy-source-if-modified-since</code> headers are present in the request and evaluate as follows, Amazon S3 returns the <code>412 Precondition Failed</code> response code:</p> <ul> <li> <p> <code>x-amz-copy-source-if-none-match</code> condition evaluates to false</p> </li> <li> <p> <code>x-amz-copy-source-if-modified-since</code> condition evaluates to true</p> </li> </ul> </li> </ul> <p>The copy request charge is based on the storage class and Region you specify for the destination object. For pricing information, see <a href=\"https://aws.amazon.com/s3/pricing/\">Amazon S3 Pricing</a>.</p> <p>Following are other considerations when using <code>CopyObject</code>:</p> <dl> <dt>Versioning</dt> <dd> <p>By default, <code>x-amz-copy-source</code> identifies the current version of an object to copy. (If the current version is a delete marker, Amazon S3 behaves as if the object was deleted.) To copy a different version, use the <code>versionId</code> subresource.</p> <p>If you enable versioning on the target bucket, Amazon S3 generates a unique version ID for the object being copied. This version ID is different from the version ID of the source object. Amazon S3 returns the version ID of the copied object in the <code>x-amz-version-id</code> response header in the response.</p> <p>If you do not enable versioning or suspend it on the target bucket, the version ID that Amazon S3 generates is always null.</p> <p>If the source object's storage class is GLACIER, you must restore a copy of this object before you can use it as a source object for the copy operation. For more information, see .</p> </dd> <dt>Access Permissions</dt> <dd> <p>When copying an object, you can optionally specify the accounts or groups that should be granted specific permissions on the new object. There are two ways to grant the permissions using the request headers:</p> <ul> <li> <p>Specify a canned ACL with the <code>x-amz-acl</code> request header. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/acl-overview.html#CannedACL\">Canned ACL</a>.</p> </li> <li> <p>Specify access permissions explicitly with the <code>x-amz-grant-read</code>, <code>x-amz-grant-read-acp</code>, <code>x-amz-grant-write-acp</code>, and <code>x-amz-grant-full-control</code> headers. These parameters map to the set of permissions that Amazon S3 supports in an ACL. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/acl-overview.html\">Access Control List (ACL) Overview</a>.</p> </li> </ul> <p>You can use either a canned ACL or specify access permissions explicitly. You cannot do both.</p> </dd> <dt>Server-Side- Encryption-Specific Request Headers</dt> <dd> <p>To encrypt the target object, you must provide the appropriate encryption-related request headers. The one you use depends on whether you want to use AWS managed encryption keys or provide your own encryption key. </p> <ul> <li> <p>To encrypt the target object using server-side encryption with an AWS managed encryption key, provide the following request headers, as appropriate.</p> <ul> <li> <p> <code>x-amz-server-side​-encryption</code> </p> </li> <li> <p> <code>x-amz-server-side-encryption-aws-kms-key-id</code> </p> </li> <li> <p> <code>x-amz-server-side-encryption-context</code> </p> </li> </ul> <note> <p>If you specify <code>x-amz-server-side-encryption:aws:kms</code>, but don't provide <code>x-amz-server-side-encryption-aws-kms-key-id</code>, Amazon S3 uses the AWS managed CMK in AWS KMS to protect the data. If you want to use a customer managed AWS KMS CMK, you must provide the <code>x-amz-server-side-encryption-aws-kms-key-id</code> of the symmetric customer managed CMK. Amazon S3 only supports symmetric CMKs and not asymmetric CMKs. For more information, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/symmetric-asymmetric.html\">Using Symmetric and Asymmetric Keys</a> in the <i>AWS Key Management Service Developer Guide</i>.</p> </note> <important> <p>All GET and PUT requests for an object protected by AWS KMS fail if you don't make them with SSL or by using SigV4.</p> </important> <p>For more information about server-side encryption with CMKs stored in AWS KMS (SSE-KMS), see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/UsingKMSEncryption.html\">Protecting Data Using Server-Side Encryption with CMKs stored in KMS</a>.</p> </li> <li> <p>To encrypt the target object using server-side encryption with an encryption key that you provide, use the following headers.</p> <ul> <li> <p>x-amz-server-side​-encryption​-customer-algorithm</p> </li> <li> <p>x-amz-server-side​-encryption​-customer-key</p> </li> <li> <p>x-amz-server-side​-encryption​-customer-key-MD5</p> </li> </ul> </li> <li> <p>If the source object is encrypted using server-side encryption with customer-provided encryption keys, you must use the following headers.</p> <ul> <li> <p>x-amz-copy-source​-server-side​-encryption​-customer-algorithm</p> </li> <li> <p>x-amz-copy-source​-server-side​-encryption​-customer-key</p> </li> <li> <p>x-amz-copy-source-​server-side​-encryption​-customer-key-MD5</p> </li> </ul> <p>For more information about server-side encryption with CMKs stored in AWS KMS (SSE-KMS), see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/UsingKMSEncryption.html\">Protecting Data Using Server-Side Encryption with CMKs stored in Amazon KMS</a>.</p> </li> </ul> </dd> <dt>Access-Control-List (ACL)-Specific Request Headers</dt> <dd> <p>You also can use the following access control–related headers with this operation. By default, all objects are private. Only the owner has full access control. When adding a new object, you can grant permissions to individual AWS accounts or to predefined groups defined by Amazon S3. These permissions are then added to the access control list (ACL) on the object. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/S3_ACLs_UsingACLs.html\">Using ACLs</a>. With this operation, you can grant access permissions using one of the following two methods:</p> <ul> <li> <p>Specify a canned ACL (<code>x-amz-acl</code>) — Amazon S3 supports a set of predefined ACLs, known as <i>canned ACLs</i>. Each canned ACL has a predefined set of grantees and permissions. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/acl-overview.html#CannedACL\">Canned ACL</a>.</p> </li> <li> <p>Specify access permissions explicitly — To explicitly grant access permissions to specific AWS accounts or groups, use the following headers. Each header maps to specific permissions that Amazon S3 supports in an ACL. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/acl-overview.html\">Access Control List (ACL) Overview</a>. In the header, you specify a list of grantees who get the specific permission. To grant permissions explicitly, use:</p> <ul> <li> <p>x-amz-grant-read</p> </li> <li> <p>x-amz-grant-write</p> </li> <li> <p>x-amz-grant-read-acp</p> </li> <li> <p>x-amz-grant-write-acp</p> </li> <li> <p>x-amz-grant-full-control</p> </li> </ul> <p>You specify each grantee as a type=value pair, where the type is one of the following:</p> <ul> <li> <p> <code>emailAddress</code> – if the value specified is the email address of an AWS account</p> </li> <li> <p> <code>id</code> – if the value specified is the canonical user ID of an AWS account</p> </li> <li> <p> <code>uri</code> – if you are granting permissions to a predefined group</p> </li> </ul> <p>For example, the following <code>x-amz-grant-read</code> header grants the AWS accounts identified by email addresses permissions to read object data and its metadata:</p> <p> <code>x-amz-grant-read: emailAddress=\"xyz@amazon.com\", emailAddress=\"abc@amazon.com\" </code> </p> </li> </ul> </dd> </dl> <p>The following operations are related to <code>CopyObject</code>:</p> <ul> <li> <p> <a>PutObject</a> </p> </li> <li> <p> <a>GetObject</a> </p> </li> </ul> <p>For more information, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/CopyingObjectsExamples.html\">Copying Objects</a>.</p>",
       "alias":"PutObjectCopy"
     },
     "CreateBucket":{
@@ -67,7 +67,7 @@
         {"shape":"BucketAlreadyOwnedByYou"}
       ],
       "documentationUrl":"http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTBucketPUT.html",
-      "documentation":"<p>Creates a new bucket.</p>",
+      "documentation":"<p>Creates a new bucket. To create a bucket, you must register with Amazon S3 and have a valid AWS Access Key ID to authenticate requests. Anonymous requests are never allowed to create buckets. By creating the bucket, you become the bucket owner.</p> <p>Not every string is an acceptable bucket name. For information on bucket naming restrictions, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/UsingBucket.html\">Working with Amazon S3 Buckets</a>.</p> <p>By default, the bucket is created in the US East (N. Virginia) Region. You can optionally specify a Region in the request body. You might choose a Region to optimize latency, minimize costs, or address regulatory requirements. For example, if you reside in Europe, you will probably find it advantageous to create buckets in the EU (Ireland) Region. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/UsingBucket.html#access-bucket-intro\">How to Select a Region for Your Buckets</a>.</p> <note> <p>If you send your create bucket request to the <code>s3.amazonaws.com</code> endpoint, the request goes to the us-east-1 Region. Accordingly, the signature calculations in Signature Version 4 must use us-east-1 as the Region, even if the location constraint in the request specifies another Region where the bucket is to be created. If you create a bucket in a Region other than US East (N. Virginia), your application must be able to handle 307 redirect. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/VirtualHosting.html\">Virtual Hosting of Buckets</a>.</p> </note> <p>When creating a bucket using this operation, you can optionally specify the accounts or groups that should be granted specific permissions on the bucket. There are two ways to grant the appropriate permissions using the request headers.</p> <ul> <li> <p>Specify a canned ACL using the <code>x-amz-acl</code> request header. Amazon S3 supports a set of predefined ACLs, known as <i>canned ACLs</i>. Each canned ACL has a predefined set of grantees and permissions. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/acl-overview.html#CannedACL\">Canned ACL</a>.</p> </li> <li> <p>Specify access permissions explicitly using the <code>x-amz-grant-read</code>, <code>x-amz-grant-write</code>, <code>x-amz-grant-read-acp</code>, <code>x-amz-grant-write-acp</code>, and <code>x-amz-grant-full-control</code> headers. These headers map to the set of permissions Amazon S3 supports in an ACL. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/acl-overview.html\">Access Control List (ACL) Overview</a>.</p> <p>You specify each grantee as a type=value pair, where the type is one of the following:</p> <ul> <li> <p> <code>emailAddress</code> – if the value specified is the email address of an AWS account</p> </li> <li> <p> <code>id</code> – if the value specified is the canonical user ID of an AWS account</p> </li> <li> <p> <code>uri</code> – if you are granting permissions to a predefined group</p> </li> </ul> <p>For example, the following <code>x-amz-grant-read</code> header grants the AWS accounts identified by email addresses permissions to read object data and its metadata:</p> <p> <code>x-amz-grant-read: emailAddress=\"xyz@amazon.com\", emailAddress=\"abc@amazon.com\" </code> </p> </li> </ul> <note> <p>You can use either a canned ACL or specify access permissions explicitly. You cannot do both.</p> </note> <p>The following operations are related to <code>CreateBucket</code>:</p> <ul> <li> <p> <a>PutObject</a> </p> </li> <li> <p> <a>DeleteBucket</a> </p> </li> </ul>",
       "alias":"PutBucket"
     },
     "CreateMultipartUpload":{
@@ -79,7 +79,7 @@
       "input":{"shape":"CreateMultipartUploadRequest"},
       "output":{"shape":"CreateMultipartUploadOutput"},
       "documentationUrl":"http://docs.amazonwebservices.com/AmazonS3/latest/API/mpUploadInitiate.html",
-      "documentation":"<p>Initiates a multipart upload and returns an upload ID.</p> <p> <b>Note:</b> After you initiate multipart upload and upload one or more parts, you must either complete or abort multipart upload in order to stop getting charged for storage of the uploaded parts. Only after you either complete or abort multipart upload, Amazon S3 frees up the parts storage and stops charging you for the parts storage.</p>",
+      "documentation":"<p>This operation initiates a multipart upload and returns an upload ID. This upload ID is used to associate all of the parts in the specific multipart upload. You specify this upload ID in each of your subsequent upload part requests (see <a>UploadPart</a>). You also include this upload ID in the final request to either complete or abort the multipart upload request.</p> <p>For more information about multipart uploads, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/mpuoverview.html\">Multipart Upload Overview</a>.</p> <p>If you have configured a lifecycle rule to abort incomplete multipart uploads, the upload must complete within the number of days specified in the bucket lifecycle configuration. Otherwise, the incomplete multipart upload becomes eligible for an abort operation and Amazon S3 aborts the multipart upload. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/mpuoverview.html#mpu-abort-incomplete-mpu-lifecycle-config\">Aborting Incomplete Multipart Uploads Using a Bucket Lifecycle Policy</a>.</p> <p>For information about the permissions required to use the multipart upload API, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/mpuAndPermissions.html\">Multipart Upload API and Permissions</a>.</p> <p>For request signing, multipart upload is just a series of regular requests. You initiate a multipart upload, send one or more requests to upload parts, and then complete the multipart upload process. You sign each request individually. There is nothing special about signing multipart upload requests. For more information about signing, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/API/sig-v4-authenticating-requests.html\">Authenticating Requests (AWS Signature Version 4)</a>.</p> <note> <p> After you initiate a multipart upload and upload one or more parts, to stop being charged for storing the uploaded parts, you must either complete or abort the multipart upload. Amazon S3 frees up the space used to store the parts and stop charging you for storing them only after you either complete or abort a multipart upload. </p> </note> <p>You can optionally request server-side encryption. For server-side encryption, Amazon S3 encrypts your data as it writes it to disks in its data centers and decrypts it when you access it. You can provide your own encryption key, or use AWS Key Management Service (AWS KMS) customer master keys (CMKs) or Amazon S3-managed encryption keys. If you choose to provide your own encryption key, the request headers you provide in <a>UploadPart</a>) and <a>UploadPartCopy</a>) requests must match the headers you used in the request to initiate the upload by using <code>CreateMultipartUpload</code>. </p> <p>To perform a multipart upload with encryption using an AWS KMS CMK, the requester must have permission to the <code>kms:Encrypt</code>, <code>kms:Decrypt</code>, <code>kms:ReEncrypt*</code>, <code>kms:GenerateDataKey*</code>, and <code>kms:DescribeKey</code> actions on the key. These permissions are required because Amazon S3 must decrypt and read data from the encrypted file parts before it completes the multipart upload.</p> <p>If your AWS Identity and Access Management (IAM) user or role is in the same AWS account as the AWS KMS CMK, then you must have these permissions on the key policy. If your IAM user or role belongs to a different account than the key, then you must have the permissions on both the key policy and your IAM user or role.</p> <p> For more information, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/serv-side-encryption.html\">Protecting Data Using Server-Side Encryption</a>.</p> <dl> <dt>Access Permissions</dt> <dd> <p>When copying an object, you can optionally specify the accounts or groups that should be granted specific permissions on the new object. There are two ways to grant the permissions using the request headers:</p> <ul> <li> <p>Specify a canned ACL with the <code>x-amz-acl</code> request header. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/acl-overview.html#CannedACL\">Canned ACL</a>.</p> </li> <li> <p>Specify access permissions explicitly with the <code>x-amz-grant-read</code>, <code>x-amz-grant-read-acp</code>, <code>x-amz-grant-write-acp</code>, and <code>x-amz-grant-full-control</code> headers. These parameters map to the set of permissions that Amazon S3 supports in an ACL. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/acl-overview.html\">Access Control List (ACL) Overview</a>.</p> </li> </ul> <p>You can use either a canned ACL or specify access permissions explicitly. You cannot do both.</p> </dd> <dt>Server-Side- Encryption-Specific Request Headers</dt> <dd> <p>You can optionally tell Amazon S3 to encrypt data at rest using server-side encryption. Server-side encryption is for data encryption at rest. Amazon S3 encrypts your data as it writes it to disks in its data centers and decrypts it when you access it. The option you use depends on whether you want to use AWS managed encryption keys or provide your own encryption key. </p> <ul> <li> <p>Use encryption keys managed by Amazon S3 or customer master keys (CMKs) stored in AWS Key Management Service (AWS KMS) – If you want AWS to manage the keys used to encrypt data, specify the following headers in the request.</p> <ul> <li> <p>x-amz-server-side​-encryption</p> </li> <li> <p>x-amz-server-side-encryption-aws-kms-key-id</p> </li> <li> <p>x-amz-server-side-encryption-context</p> </li> </ul> <note> <p>If you specify <code>x-amz-server-side-encryption:aws:kms</code>, but don't provide <code>x-amz-server-side-encryption-aws-kms-key-id</code>, Amazon S3 uses the AWS managed CMK in AWS KMS to protect the data.</p> </note> <important> <p>All GET and PUT requests for an object protected by AWS KMS fail if you don't make them with SSL or by using SigV4.</p> </important> <p>For more information about server-side encryption with CMKs stored in AWS KMS (SSE-KMS), see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/UsingKMSEncryption.html\">Protecting Data Using Server-Side Encryption with CMKs stored in AWS KMS</a>.</p> </li> <li> <p>Use customer-provided encryption keys – If you want to manage your own encryption keys, provide all the following headers in the request.</p> <ul> <li> <p>x-amz-server-side​-encryption​-customer-algorithm</p> </li> <li> <p>x-amz-server-side​-encryption​-customer-key</p> </li> <li> <p>x-amz-server-side​-encryption​-customer-key-MD5</p> </li> </ul> <p>For more information about server-side encryption with CMKs stored in AWS KMS (SSE-KMS), see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/UsingKMSEncryption.html\">Protecting Data Using Server-Side Encryption with CMKs stored in AWS KMS</a>.</p> </li> </ul> </dd> <dt>Access-Control-List (ACL)-Specific Request Headers</dt> <dd> <p>You also can use the following access control–related headers with this operation. By default, all objects are private. Only the owner has full access control. When adding a new object, you can grant permissions to individual AWS accounts or to predefined groups defined by Amazon S3. These permissions are then added to the access control list (ACL) on the object. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/S3_ACLs_UsingACLs.html\">Using ACLs</a>. With this operation, you can grant access permissions using one of the following two methods:</p> <ul> <li> <p>Specify a canned ACL (<code>x-amz-acl</code>) — Amazon S3 supports a set of predefined ACLs, known as <i>canned ACLs</i>. Each canned ACL has a predefined set of grantees and permissions. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/acl-overview.html#CannedACL\">Canned ACL</a>.</p> </li> <li> <p>Specify access permissions explicitly — To explicitly grant access permissions to specific AWS accounts or groups, use the following headers. Each header maps to specific permissions that Amazon S3 supports in an ACL. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/acl-overview.html\">Access Control List (ACL) Overview</a>. In the header, you specify a list of grantees who get the specific permission. To grant permissions explicitly, use:</p> <ul> <li> <p>x-amz-grant-read</p> </li> <li> <p>x-amz-grant-write</p> </li> <li> <p>x-amz-grant-read-acp</p> </li> <li> <p>x-amz-grant-write-acp</p> </li> <li> <p>x-amz-grant-full-control</p> </li> </ul> <p>You specify each grantee as a type=value pair, where the type is one of the following:</p> <ul> <li> <p> <code>emailAddress</code> – if the value specified is the email address of an AWS account</p> </li> <li> <p> <code>id</code> – if the value specified is the canonical user ID of an AWS account</p> </li> <li> <p> <code>uri</code> – if you are granting permissions to a predefined group</p> </li> </ul> <p>For example, the following <code>x-amz-grant-read</code> header grants the AWS accounts identified by email addresses permissions to read object data and its metadata:</p> <p> <code>x-amz-grant-read: emailAddress=\"xyz@amazon.com\", emailAddress=\"abc@amazon.com\" </code> </p> </li> </ul> </dd> </dl> <p>The following operations are related to <code>CreateMultipartUpload</code>:</p> <ul> <li> <p> <a>UploadPart</a> </p> </li> <li> <p> <a>CompleteMultipartUpload</a> </p> </li> <li> <p> <a>AbortMultipartUpload</a> </p> </li> <li> <p> <a>ListParts</a> </p> </li> <li> <p> <a>ListMultipartUploads</a> </p> </li> </ul>",
       "alias":"InitiateMultipartUpload"
     },
     "DeleteBucket":{
@@ -91,7 +91,7 @@
       },
       "input":{"shape":"DeleteBucketRequest"},
       "documentationUrl":"http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTBucketDELETE.html",
-      "documentation":"<p>Deletes the bucket. All objects (including all object versions and Delete Markers) in the bucket must be deleted before the bucket itself can be deleted.</p>"
+      "documentation":"<p>Deletes the bucket. All objects (including all object versions and delete markers) in the bucket must be deleted before the bucket itself can be deleted.</p> <p class=\"title\"> <b>Related Resources</b> </p> <ul> <li> <p> </p> </li> <li> <p> </p> </li> </ul>"
     },
     "DeleteBucketAnalyticsConfiguration":{
       "name":"DeleteBucketAnalyticsConfiguration",
@@ -101,7 +101,7 @@
         "responseCode":204
       },
       "input":{"shape":"DeleteBucketAnalyticsConfigurationRequest"},
-      "documentation":"<p>Deletes an analytics configuration for the bucket (specified by the analytics configuration ID).</p> <p>To use this operation, you must have permissions to perform the s3:PutAnalyticsConfiguration action. The bucket owner has this permission by default. The bucket owner can grant this permission to others. </p>"
+      "documentation":"<p>Deletes an analytics configuration for the bucket (specified by the analytics configuration ID).</p> <p>To use this operation, you must have permissions to perform the <code>s3:PutAnalyticsConfiguration</code> action. The bucket owner has this permission by default. The bucket owner can grant this permission to others. For more information about permissions, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev//using-with-s3-actions.html#using-with-s3-actions-related-to-bucket-subresources\">Permissions Related to Bucket Subresource Operations</a> and <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/s3-access-control.html\">Managing Access Permissions to Your Amazon S3 Resources</a>.</p> <p>For information about the Amazon S3 analytics feature, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/analytics-storage-class.html\">Amazon S3 Analytics – Storage Class Analysis</a>. </p> <p>The following operations are related to <code>DeleteBucketAnalyticsConfiguration</code>:</p> <ul> <li> <p> </p> </li> <li> <p> </p> </li> <li> <p> </p> </li> </ul>"
     },
     "DeleteBucketCors":{
       "name":"DeleteBucketCors",
@@ -112,7 +112,7 @@
       },
       "input":{"shape":"DeleteBucketCorsRequest"},
       "documentationUrl":"http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTBucketDELETEcors.html",
-      "documentation":"<p>Deletes the CORS configuration information set for the bucket.</p>"
+      "documentation":"<p>Deletes the <code>cors</code> configuration information set for the bucket.</p> <p>To use this operation, you must have permission to perform the <code>s3:PutBucketCORS</code> action. The bucket owner has this permission by default and can grant this permission to others. </p> <p>For information about <code>cors</code>, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/cors.html\">Enabling Cross-Origin Resource Sharing</a> in the <i>Amazon Simple Storage Service Developer Guide</i>.</p> <p class=\"title\"> <b>Related Resources:</b> </p> <ul> <li> <p> </p> </li> <li> <p> <a>RESTOPTIONSobject</a> </p> </li> </ul>"
     },
     "DeleteBucketEncryption":{
       "name":"DeleteBucketEncryption",
@@ -122,7 +122,7 @@
         "responseCode":204
       },
       "input":{"shape":"DeleteBucketEncryptionRequest"},
-      "documentation":"<p>Deletes the server-side encryption configuration from the bucket.</p>"
+      "documentation":"<p>This implementation of the DELETE operation removes default encryption from the bucket. For information about the Amazon S3 default encryption feature, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev//bucket-encryption.html\">Amazon S3 Default Bucket Encryption</a> in the <i>Amazon Simple Storage Service Developer Guide</i>.</p> <p>To use this operation, you must have permissions to perform the <code>s3:PutEncryptionConfiguration</code> action. The bucket owner has this permission by default. The bucket owner can grant this permission to others. For more information about permissions, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev//using-with-s3-actions.html#using-with-s3-actions-related-to-bucket-subresources\">Permissions Related to Bucket Subresource Operations</a> and <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev//s3-access-control.html\">Managing Access Permissions to your Amazon S3 Resources</a> in the <i>Amazon Simple Storage Service Developer Guide</i>.</p> <p class=\"title\"> <b>Related Resources</b> </p> <ul> <li> <p> <a>PutBucketEncryption</a> </p> </li> <li> <p> <a>GetBucketEncryption</a> </p> </li> </ul>"
     },
     "DeleteBucketInventoryConfiguration":{
       "name":"DeleteBucketInventoryConfiguration",
@@ -132,7 +132,7 @@
         "responseCode":204
       },
       "input":{"shape":"DeleteBucketInventoryConfigurationRequest"},
-      "documentation":"<p>Deletes an inventory configuration (identified by the inventory ID) from the bucket.</p>"
+      "documentation":"<p>Deletes an inventory configuration (identified by the inventory ID) from the bucket.</p> <p>To use this operation, you must have permissions to perform the <code>s3:PutInventoryConfiguration</code> action. The bucket owner has this permission by default. The bucket owner can grant this permission to others. For more information about permissions, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/using-with-s3-actions.html#using-with-s3-actions-related-to-bucket-subresources\">Permissions Related to Bucket Subresource Operations</a> and <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/s3-access-control.html\">Managing Access Permissions to Your Amazon S3 Resources</a>.</p> <p>For information about the Amazon S3 inventory feature, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/storage-inventory.html\">Amazon S3 Inventory</a>.</p> <p>Operations related to <code>DeleteBucketInventoryConfiguration</code> include: </p> <ul> <li> <p> <a>GetBucketInventoryConfiguration</a> </p> </li> <li> <p> <a>PutBucketInventoryConfiguration</a> </p> </li> <li> <p> <a>ListBucketInventoryConfigurations</a> </p> </li> </ul>"
     },
     "DeleteBucketLifecycle":{
       "name":"DeleteBucketLifecycle",
@@ -143,7 +143,7 @@
       },
       "input":{"shape":"DeleteBucketLifecycleRequest"},
       "documentationUrl":"http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTBucketDELETElifecycle.html",
-      "documentation":"<p>Deletes the lifecycle configuration from the bucket.</p>"
+      "documentation":"<p>Deletes the lifecycle configuration from the specified bucket. Amazon S3 removes all the lifecycle configuration rules in the lifecycle subresource associated with the bucket. Your objects never expire, and Amazon S3 no longer automatically deletes any objects on the basis of rules contained in the deleted lifecycle configuration.</p> <p>To use this operation, you must have permission to perform the <code>s3:PutLifecycleConfiguration</code> action. By default, the bucket owner has this permission and the bucket owner can grant this permission to others.</p> <p>There is usually some time lag before lifecycle configuration deletion is fully propagated to all the Amazon S3 systems.</p> <p>For more information about the object expiration, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/intro-lifecycle-rules.html#intro-lifecycle-rules-actions\">Elements to Describe Lifecycle Actions</a>.</p> <p>Related actions include:</p> <ul> <li> <p> <a>PutBucketLifecycleConfiguration</a> </p> </li> <li> <p> <a>GetBucketLifecycleConfiguration</a> </p> </li> </ul>"
     },
     "DeleteBucketMetricsConfiguration":{
       "name":"DeleteBucketMetricsConfiguration",
@@ -153,7 +153,7 @@
         "responseCode":204
       },
       "input":{"shape":"DeleteBucketMetricsConfigurationRequest"},
-      "documentation":"<p>Deletes a metrics configuration (specified by the metrics configuration ID) from the bucket.</p>"
+      "documentation":"<p>Deletes a metrics configuration for the Amazon CloudWatch request metrics (specified by the metrics configuration ID) from the bucket. Note that this doesn't include the daily storage metrics.</p> <p> To use this operation, you must have permissions to perform the <code>s3:PutMetricsConfiguration</code> action. The bucket owner has this permission by default. The bucket owner can grant this permission to others. For more information about permissions, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/using-with-s3-actions.html#using-with-s3-actions-related-to-bucket-subresources\">Permissions Related to Bucket Subresource Operations</a> and <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/s3-access-control.html\">Managing Access Permissions to Your Amazon S3 Resources</a>.</p> <p>For information about CloudWatch request metrics for Amazon S3, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/cloudwatch-monitoring.html\">Monitoring Metrics with Amazon CloudWatch</a>. </p> <p>The following operations are related to <code>DeleteBucketMetricsConfiguration</code>:</p> <ul> <li> <p> <a>GetBucketMetricsConfiguration</a> </p> </li> <li> <p> <a>PutBucketMetricsConfiguration</a> </p> </li> <li> <p> <a>ListBucketMetricsConfigurations</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/cloudwatch-monitoring.html\">Monitoring Metrics with Amazon CloudWatch</a> </p> </li> </ul>"
     },
     "DeleteBucketPolicy":{
       "name":"DeleteBucketPolicy",
@@ -164,7 +164,7 @@
       },
       "input":{"shape":"DeleteBucketPolicyRequest"},
       "documentationUrl":"http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTBucketDELETEpolicy.html",
-      "documentation":"<p>Deletes the policy from the bucket.</p>"
+      "documentation":"<p>This implementation of the DELETE operation uses the policy subresource to delete the policy of a specified bucket. If you are using an identity other than the root user of the AWS account that owns the bucket, the calling identity must have the <code>DeleteBucketPolicy</code> permissions on the specified bucket and belong to the bucket owner's account to use this operation. </p> <p>If you don't have <code>DeleteBucketPolicy</code> permissions, Amazon S3 returns a <code>403 Access Denied</code> error. If you have the correct permissions, but you're not using an identity that belongs to the bucket owner's account, Amazon S3 returns a <code>405 Method Not Allowed</code> error. </p> <important> <p>As a security precaution, the root user of the AWS account that owns a bucket can always use this operation, even if the policy explicitly denies the root user the ability to perform this action.</p> </important> <p>For more information about bucket policies, see <a href=\" https://docs.aws.amazon.com/AmazonS3/latest/dev/using-iam-policies.html\">Using Bucket Policies and UserPolicies</a>. </p> <p>The following operations are related to <code>DeleteBucketPolicy</code> </p> <ul> <li> <p> <a>CreateBucket</a> </p> </li> <li> <p> <a>DeleteObject</a> </p> </li> </ul>"
     },
     "DeleteBucketReplication":{
       "name":"DeleteBucketReplication",
@@ -174,7 +174,7 @@
         "responseCode":204
       },
       "input":{"shape":"DeleteBucketReplicationRequest"},
-      "documentation":"<p> Deletes the replication configuration from the bucket. For information about replication configuration, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/crr.html\">Cross-Region Replication (CRR)</a> in the <i>Amazon S3 Developer Guide</i>. </p>"
+      "documentation":"<p> Deletes the replication configuration from the bucket.</p> <p>To use this operation, you must have permissions to perform the <code>s3:PutReplicationConfiguration</code> action. The bucket owner has these permissions by default and can grant it to others. For more information about permissions, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/using-with-s3-actions.html#using-with-s3-actions-related-to-bucket-subresources\">Permissions Related to Bucket Subresource Operations</a> and <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/s3-access-control.html\">Managing Access Permissions to Your Amazon S3 Resources</a>. </p> <note> <p>It can take a while for the deletion of a replication configuration to fully propagate.</p> </note> <p> For information about replication configuration, see <a href=\" https://docs.aws.amazon.com/AmazonS3/latest/dev/replication.html\">Replication</a> in the <i>Amazon S3 Developer Guide</i>. </p> <p>The following operations are related to <code>DeleteBucketReplication</code>:</p> <ul> <li> <p> <a>PutBucketReplication</a> </p> </li> <li> <p> <a>GetBucketReplication</a> </p> </li> </ul>"
     },
     "DeleteBucketTagging":{
       "name":"DeleteBucketTagging",
@@ -185,7 +185,7 @@
       },
       "input":{"shape":"DeleteBucketTaggingRequest"},
       "documentationUrl":"http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTBucketDELETEtagging.html",
-      "documentation":"<p>Deletes the tags from the bucket.</p>"
+      "documentation":"<p>Deletes the tags from the bucket.</p> <p>To use this operation, you must have permission to perform the <code>s3:PutBucketTagging</code> action. By default, the bucket owner has this permission and can grant this permission to others. </p> <p>The following operations are related to <code>DeleteBucketTagging</code>:</p> <ul> <li> <p> <a>GetBucketTagging</a> </p> </li> <li> <p> <a>PutBucketTagging</a> </p> </li> </ul>"
     },
     "DeleteBucketWebsite":{
       "name":"DeleteBucketWebsite",
@@ -196,7 +196,7 @@
       },
       "input":{"shape":"DeleteBucketWebsiteRequest"},
       "documentationUrl":"http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTBucketDELETEwebsite.html",
-      "documentation":"<p>This operation removes the website configuration from the bucket.</p>"
+      "documentation":"<p>This operation removes the website configuration for a bucket. Amazon S3 returns a <code>200 OK</code> response upon successfully deleting a website configuration on the specified bucket. You will get a <code>200 OK</code> response if the website configuration you are trying to delete does not exist on the bucket. Amazon S3 returns a <code>404</code> response if the bucket specified in the request does not exist.</p> <p>This DELETE operation requires the <code>S3:DeleteBucketWebsite</code> permission. By default, only the bucket owner can delete the website configuration attached to a bucket. However, bucket owners can grant other users permission to delete the website configuration by writing a bucket policy granting them the <code>S3:DeleteBucketWebsite</code> permission. </p> <p>For more information about hosting websites, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/WebsiteHosting.html\">Hosting Websites on Amazon S3</a>. </p> <p>The following operations are related to <code>DeleteBucketWebsite</code>:</p> <ul> <li> <p> <a>GetBucketWebsite</a> </p> </li> <li> <p> <a>PutBucketWebsite</a> </p> </li> </ul>"
     },
     "DeleteObject":{
       "name":"DeleteObject",
@@ -208,7 +208,7 @@
       "input":{"shape":"DeleteObjectRequest"},
       "output":{"shape":"DeleteObjectOutput"},
       "documentationUrl":"http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTObjectDELETE.html",
-      "documentation":"<p>Removes the null version (if there is one) of an object and inserts a delete marker, which becomes the latest version of the object. If there isn't a null version, Amazon S3 does not remove any objects.</p>"
+      "documentation":"<p>Removes the null version (if there is one) of an object and inserts a delete marker, which becomes the latest version of the object. If there isn't a null version, Amazon S3 does not remove any objects.</p> <p>To remove a specific version, you must be the bucket owner and you must use the version Id subresource. Using this subresource permanently deletes the version. If the object deleted is a delete marker, Amazon S3 sets the response header, <code>x-amz-delete-marker</code>, to true. </p> <p>If the object you want to delete is in a bucket where the bucket versioning configuration is MFA Delete enabled, you must include the <code>x-amz-mfa</code> request header in the DELETE <code>versionId</code> request. Requests that include <code>x-amz-mfa</code> must use HTTPS. </p> <p> For more information about MFA Delete, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/UsingMFADelete.html\">Using MFA Delete</a>. To see sample requests that use versioning, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/API/RESTObjectDELETE.html#ExampleVersionObjectDelete\">Sample Request</a>. </p> <p>You can delete objects by explicitly calling the DELETE Object API or configure its lifecycle (<a>PutBucketLifecycle</a>) to enable Amazon S3 to remove them for you. If you want to block users or accounts from removing or deleting objects from your bucket, you must deny them the <code>s3:DeleteObject</code>, <code>s3:DeleteObjectVersion</code>, and <code>s3:PutLifeCycleConfiguration</code> actions. </p> <p>The following operation is related to <code>DeleteObject</code>:</p> <ul> <li> <p> <a>PutObject</a> </p> </li> </ul>"
     },
     "DeleteObjectTagging":{
       "name":"DeleteObjectTagging",
@@ -219,7 +219,7 @@
       },
       "input":{"shape":"DeleteObjectTaggingRequest"},
       "output":{"shape":"DeleteObjectTaggingOutput"},
-      "documentation":"<p>Removes the tag-set from an existing object.</p>"
+      "documentation":"<p>Removes the entire tag set from the specified object. For more information about managing object tags, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/object-tagging.html\"> Object Tagging</a>.</p> <p>To use this operation, you must have permission to perform the <code>s3:DeleteObjectTagging</code> action.</p> <p>To delete tags of a specific object version, add the <code>versionId</code> query parameter in the request. You will need permission for the <code>s3:DeleteObjectVersionTagging</code> action.</p> <p>The following operations are related to <code>DeleteBucketMetricsConfiguration</code>:</p> <ul> <li> <p> <a>PutObjectTagging</a> </p> </li> <li> <p> <a>GetObjectTagging</a> </p> </li> </ul>"
     },
     "DeleteObjects":{
       "name":"DeleteObjects",
@@ -230,7 +230,7 @@
       "input":{"shape":"DeleteObjectsRequest"},
       "output":{"shape":"DeleteObjectsOutput"},
       "documentationUrl":"http://docs.amazonwebservices.com/AmazonS3/latest/API/multiobjectdeleteapi.html",
-      "documentation":"<p>This operation enables you to delete multiple objects from a bucket using a single HTTP request. You may specify up to 1000 keys.</p>",
+      "documentation":"<p>This operation enables you to delete multiple objects from a bucket using a single HTTP request. If you know the object keys that you want to delete, then this operation provides a suitable alternative to sending individual delete requests, reducing per-request overhead.</p> <p>The request contains a list of up to 1000 keys that you want to delete. In the XML, you provide the object key names, and optionally, version IDs if you want to delete a specific version of the object from a versioning-enabled bucket. For each key, Amazon S3 performs a delete operation and returns the result of that delete, success, or failure, in the response. Note that if the object specified in the request is not found, Amazon S3 returns the result as deleted.</p> <p> The operation supports two modes for the response: verbose and quiet. By default, the operation uses verbose mode in which the response includes the result of deletion of each key in your request. In quiet mode the response includes only keys where the delete operation encountered an error. For a successful deletion, the operation does not return any information about the delete in the response body.</p> <p>When performing this operation on an MFA Delete enabled bucket, that attempts to delete any versioned objects, you must include an MFA token. If you do not provide one, the entire request will fail, even if there are non-versioned objects you are trying to delete. If you provide an invalid token, whether there are versioned keys in the request or not, the entire Multi-Object Delete request will fail. For information about MFA Delete, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/Versioning.html#MultiFactorAuthenticationDelete\"> MFA Delete</a>.</p> <p>Finally, the Content-MD5 header is required for all Multi-Object Delete requests. Amazon S3 uses the header value to ensure that your request body has not been altered in transit.</p> <p>The following operations are related to <code>DeleteObjects</code>:</p> <ul> <li> <p> <a>CreateMultipartUpload</a> </p> </li> <li> <p> <a>UploadPart</a> </p> </li> <li> <p> <a>CompleteMultipartUpload</a> </p> </li> <li> <p> <a>ListParts</a> </p> </li> <li> <p> <a>AbortMultipartUpload</a> </p> </li> </ul>",
       "alias":"DeleteMultipleObjects"
     },
     "DeletePublicAccessBlock":{
@@ -241,7 +241,7 @@
         "responseCode":204
       },
       "input":{"shape":"DeletePublicAccessBlockRequest"},
-      "documentation":"<p>Removes the <code>PublicAccessBlock</code> configuration from an Amazon S3 bucket.</p>"
+      "documentation":"<p>Removes the <code>PublicAccessBlock</code> configuration for an Amazon S3 bucket. To use this operation, you must have the <code>s3:PutBucketPublicAccessBlock</code> permission. For more information about permissions, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/using-with-s3-actions.html#using-with-s3-actions-related-to-bucket-subresources\">Permissions Related to Bucket Subresource Operations</a> and <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/s3-access-control.html\">Managing Access Permissions to Your Amazon S3 Resources</a>.</p> <p>The following operations are related to <code>DeleteBucketMetricsConfiguration</code>:</p> <ul> <li> <p> <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/access-control-block-public-access.html\">Using Amazon S3 Block Public Access</a> </p> </li> <li> <p> <a>GetPublicAccessBlock</a> </p> </li> <li> <p> <a>PutPublicAccessBlock</a> </p> </li> <li> <p> <a>GetBucketPolicyStatus</a> </p> </li> </ul>"
     },
     "GetBucketAccelerateConfiguration":{
       "name":"GetBucketAccelerateConfiguration",
@@ -251,7 +251,7 @@
       },
       "input":{"shape":"GetBucketAccelerateConfigurationRequest"},
       "output":{"shape":"GetBucketAccelerateConfigurationOutput"},
-      "documentation":"<p>Returns the accelerate configuration of a bucket.</p>"
+      "documentation":"<p>This implementation of the GET operation uses the <code>accelerate</code> subresource to return the Transfer Acceleration state of a bucket, which is either <code>Enabled</code> or <code>Suspended</code>. Amazon S3 Transfer Acceleration is a bucket-level feature that enables you to perform faster data transfers to and from Amazon S3.</p> <p>To use this operation, you must have permission to perform the <code>s3:GetAccelerateConfiguration</code> action. The bucket owner has this permission by default. The bucket owner can grant this permission to others. For more information about permissions, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev//using-with-s3-actions.html#using-with-s3-actions-related-to-bucket-subresources\">Permissions Related to Bucket Subresource Operations</a> and <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev//s3-access-control.html\">Managing Access Permissions to your Amazon S3 Resources</a> in the <i>Amazon Simple Storage Service Developer Guide</i>.</p> <p>You set the Transfer Acceleration state of an existing bucket to <code>Enabled</code> or <code>Suspended</code> by using the <a>PutBucketAccelerateConfiguration</a> operation. </p> <p>A GET <code>accelerate</code> request does not return a state value for a bucket that has no transfer acceleration state. A bucket has no Transfer Acceleration state if a state has never been set on the bucket. </p> <p>For more information about transfer acceleration, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev//transfer-acceleration.html\">Transfer Acceleration</a> in the Amazon Simple Storage Service Developer Guide.</p> <p class=\"title\"> <b>Related Resources</b> </p> <ul> <li> <p> <a>PutBucketAccelerateConfiguration</a> </p> </li> </ul>"
     },
     "GetBucketAcl":{
       "name":"GetBucketAcl",
@@ -262,7 +262,7 @@
       "input":{"shape":"GetBucketAclRequest"},
       "output":{"shape":"GetBucketAclOutput"},
       "documentationUrl":"http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTBucketGETacl.html",
-      "documentation":"<p>Gets the access control policy for the bucket.</p>"
+      "documentation":"<p>This implementation of the <code>GET</code> operation uses the <code>acl</code> subresource to return the access control list (ACL) of a bucket. To use <code>GET</code> to return the ACL of the bucket, you must have <code>READ_ACP</code> access to the bucket. If <code>READ_ACP</code> permission is granted to the anonymous user, you can return the ACL of the bucket without using an authorization header.</p> <p class=\"title\"> <b>Related Resources</b> </p> <ul> <li> <p> </p> </li> </ul>"
     },
     "GetBucketAnalyticsConfiguration":{
       "name":"GetBucketAnalyticsConfiguration",
@@ -272,7 +272,7 @@
       },
       "input":{"shape":"GetBucketAnalyticsConfigurationRequest"},
       "output":{"shape":"GetBucketAnalyticsConfigurationOutput"},
-      "documentation":"<p>Gets an analytics configuration for the bucket (specified by the analytics configuration ID).</p>"
+      "documentation":"<p>This implementation of the GET operation returns an analytics configuration (identified by the analytics configuration ID) from the bucket.</p> <p>To use this operation, you must have permissions to perform the <code>s3:GetAnalyticsConfiguration</code> action. The bucket owner has this permission by default. The bucket owner can grant this permission to others. For more information about permissions, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/using-with-s3-actions.html#using-with-s3-actions-related-to-bucket-subresources\"> Permissions Related to Bucket Subresource Operations</a> and <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/s3-access-control.html\">Managing Access Permissions to Your Amazon S3 Resources</a> in the <i>Amazon Simple Storage Service Developer Guide</i>. </p> <p>For information about Amazon S3 analytics feature, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/analytics-storage-class.html\">Amazon S3 Analytics – Storage Class Analysis</a> in the <i>Amazon Simple Storage Service Developer Guide</i>.</p> <p class=\"title\"> <b>Related Resources</b> </p> <ul> <li> <p> </p> </li> <li> <p> </p> </li> <li> <p> </p> </li> </ul>"
     },
     "GetBucketCors":{
       "name":"GetBucketCors",
@@ -283,7 +283,7 @@
       "input":{"shape":"GetBucketCorsRequest"},
       "output":{"shape":"GetBucketCorsOutput"},
       "documentationUrl":"http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTBucketGETcors.html",
-      "documentation":"<p>Returns the CORS configuration for the bucket.</p>"
+      "documentation":"<p>Returns the cors configuration information set for the bucket.</p> <p> To use this operation, you must have permission to perform the s3:GetBucketCORS action. By default, the bucket owner has this permission and can grant it to others.</p> <p> For more information about cors, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/cors.html\"> Enabling Cross-Origin Resource Sharing</a>.</p> <p>The following operations are related to <code>GetBucketCors</code>:</p> <ul> <li> <p> <a>PutBucketCors</a> </p> </li> <li> <p> <a>DeleteBucketCors</a> </p> </li> </ul>"
     },
     "GetBucketEncryption":{
       "name":"GetBucketEncryption",
@@ -293,7 +293,7 @@
       },
       "input":{"shape":"GetBucketEncryptionRequest"},
       "output":{"shape":"GetBucketEncryptionOutput"},
-      "documentation":"<p>Returns the server-side encryption configuration of a bucket.</p>"
+      "documentation":"<p>Returns the default encryption configuration for an Amazon S3 bucket. For information about the Amazon S3 default encryption feature, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/bucket-encryption.html\">Amazon S3 Default Bucket Encryption</a>.</p> <p> To use this operation, you must have permission to perform the <code>s3:GetEncryptionConfiguration</code> action. The bucket owner has this permission by default. The bucket owner can grant this permission to others. For more information about permissions, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/using-with-s3-actions.html#using-with-s3-actions-related-to-bucket-subresources\">Permissions Related to Bucket Subresource Operations</a> and <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/s3-access-control.html\">Managing Access Permissions to Your Amazon S3 Resources</a>.</p> <p>The following operations are related to <code>GetBucketEncryption</code>:</p> <ul> <li> <p> <a>PutBucketEncryption</a> </p> </li> <li> <p> <a>DeleteBucketEncryption</a> </p> </li> </ul>"
     },
     "GetBucketInventoryConfiguration":{
       "name":"GetBucketInventoryConfiguration",
@@ -303,7 +303,7 @@
       },
       "input":{"shape":"GetBucketInventoryConfigurationRequest"},
       "output":{"shape":"GetBucketInventoryConfigurationOutput"},
-      "documentation":"<p>Returns an inventory configuration (identified by the inventory ID) from the bucket.</p>"
+      "documentation":"<p>Returns an inventory configuration (identified by the inventory configuration ID) from the bucket.</p> <p>To use this operation, you must have permissions to perform the <code>s3:GetInventoryConfiguration</code> action. The bucket owner has this permission by default and can grant this permission to others. For more information about permissions, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/using-with-s3-actions.html#using-with-s3-actions-related-to-bucket-subresources\">Permissions Related to Bucket Subresource Operations</a> and <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/s3-access-control.html\">Managing Access Permissions to Your Amazon S3 Resources</a>.</p> <p>For information about the Amazon S3 inventory feature, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/storage-inventory.html\">Amazon S3 Inventory</a>.</p> <p>The following operations are related to <code>GetBucketInventoryConfiguration</code>:</p> <ul> <li> <p> <a>DeleteBucketInventoryConfiguration</a> </p> </li> <li> <p> <a>ListBucketInventoryConfigurations</a> </p> </li> <li> <p> <a>PutBucketInventoryConfiguration</a> </p> </li> </ul>"
     },
     "GetBucketLifecycle":{
       "name":"GetBucketLifecycle",
@@ -314,7 +314,7 @@
       "input":{"shape":"GetBucketLifecycleRequest"},
       "output":{"shape":"GetBucketLifecycleOutput"},
       "documentationUrl":"http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTBucketGETlifecycle.html",
-      "documentation":"<p> No longer used, see the GetBucketLifecycleConfiguration operation.</p>",
+      "documentation":"<important> <p>For an updated version of this API, see <a>GetBucketLifecycleConfiguration</a>. If you configured a bucket lifecycle using the <code>filter</code> element, you should see the updated version of this topic. This topic is provided for backward compatibility.</p> </important> <p>Returns the lifecycle configuration information set on the bucket. For information about lifecycle configuration, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/object-lifecycle-mgmt.html\">Object Lifecycle Management</a>.</p> <p> To use this operation, you must have permission to perform the <code>s3:GetLifecycleConfiguration</code> action. The bucket owner has this permission by default. The bucket owner can grant this permission to others. For more information about permissions, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/using-with-s3-actions.html#using-with-s3-actions-related-to-bucket-subresources\">Permissions Related to Bucket Subresource Operations</a> and <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/s3-access-control.html\">Managing Access Permissions to Your Amazon S3 Resources</a>.</p> <p> <code>GetBucketLifecycle</code> has the following special error:</p> <ul> <li> <p>Error code: <code>NoSuchLifecycleConfiguration</code> </p> <ul> <li> <p>Description: The lifecycle configuration does not exist.</p> </li> <li> <p>HTTP Status Code: 404 Not Found</p> </li> <li> <p>SOAP Fault Code Prefix: Client</p> </li> </ul> </li> </ul> <p>The following operations are related to <code>GetBucketLifecycle</code>:</p> <ul> <li> <p> <a>GetBucketLifecycleConfiguration</a> </p> </li> <li> <p> <a>PutBucketLifecycle</a> </p> </li> <li> <p> <a>DeleteBucketLifecycle</a> </p> </li> </ul>",
       "deprecated":true
     },
     "GetBucketLifecycleConfiguration":{
@@ -325,7 +325,7 @@
       },
       "input":{"shape":"GetBucketLifecycleConfigurationRequest"},
       "output":{"shape":"GetBucketLifecycleConfigurationOutput"},
-      "documentation":"<p>Returns the lifecycle configuration information set on the bucket.</p>"
+      "documentation":"<note> <p>Bucket lifecycle configuration now supports specifying a lifecycle rule using an object key name prefix, one or more object tags, or a combination of both. Accordingly, this section describes the latest API. The response describes the new filter element that you can use to specify a filter to select a subset of objects to which the rule applies. If you are still using previous version of the lifecycle configuration, it works. For the earlier API description, see <a>GetBucketLifecycle</a>.</p> </note> <p>Returns the lifecycle configuration information set on the bucket. For information about lifecycle configuration, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/object-lifecycle-mgmt.html\">Object Lifecycle Management</a>.</p> <p>To use this operation, you must have permission to perform the <code>s3:GetLifecycleConfiguration</code> action. The bucket owner has this permission, by default. The bucket owner can grant this permission to others. For more information about permissions, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/using-with-s3-actions.html#using-with-s3-actions-related-to-bucket-subresources\">Permissions Related to Bucket Subresource Operations</a> and <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/s3-access-control.html\">Managing Access Permissions to Your Amazon S3 Resources</a>.</p> <p> <code>GetBucketLifecycleConfiguration</code> has the following special error:</p> <ul> <li> <p>Error code: <code>NoSuchLifecycleConfiguration</code> </p> <ul> <li> <p>Description: The lifecycle configuration does not exist.</p> </li> <li> <p>HTTP Status Code: 404 Not Found</p> </li> <li> <p>SOAP Fault Code Prefix: Client</p> </li> </ul> </li> </ul> <p>The following operations are related to <code>DeleteBucketMetricsConfiguration</code>:</p> <ul> <li> <p> <a>GetBucketLifecycle</a> </p> </li> <li> <p> <a>PutBucketLifecycle</a> </p> </li> <li> <p> <a>DeleteBucketLifecycle</a> </p> </li> </ul>"
     },
     "GetBucketLocation":{
       "name":"GetBucketLocation",
@@ -336,7 +336,7 @@
       "input":{"shape":"GetBucketLocationRequest"},
       "output":{"shape":"GetBucketLocationOutput"},
       "documentationUrl":"http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTBucketGETlocation.html",
-      "documentation":"<p>Returns the region the bucket resides in.</p>"
+      "documentation":"<p>Returns the Region the bucket resides in. You set the bucket's Region using the <code>LocationConstraint</code> request parameter in a <code>CreateBucket</code> request. For more information, see <a>CreateBucket</a>.</p> <p> To use this implementation of the operation, you must be the bucket owner.</p> <p>The following operations are related to <code>GetBucketLocation</code>:</p> <ul> <li> <p> <a>GetObject</a> </p> </li> <li> <p> <a>CreateBucket</a> </p> </li> </ul>"
     },
     "GetBucketLogging":{
       "name":"GetBucketLogging",
@@ -347,7 +347,7 @@
       "input":{"shape":"GetBucketLoggingRequest"},
       "output":{"shape":"GetBucketLoggingOutput"},
       "documentationUrl":"http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTBucketGETlogging.html",
-      "documentation":"<p>Returns the logging status of a bucket and the permissions users have to view and modify that status. To use GET, you must be the bucket owner.</p>"
+      "documentation":"<p>Returns the logging status of a bucket and the permissions users have to view and modify that status. To use GET, you must be the bucket owner.</p> <p>The following operations are related to <code>GetBucketLogging</code>:</p> <ul> <li> <p> <a>CreateBucket</a> </p> </li> <li> <p> <a>PutBucketLogging</a> </p> </li> </ul>"
     },
     "GetBucketMetricsConfiguration":{
       "name":"GetBucketMetricsConfiguration",
@@ -357,7 +357,7 @@
       },
       "input":{"shape":"GetBucketMetricsConfigurationRequest"},
       "output":{"shape":"GetBucketMetricsConfigurationOutput"},
-      "documentation":"<p>Gets a metrics configuration (specified by the metrics configuration ID) from the bucket.</p>"
+      "documentation":"<p>Gets a metrics configuration (specified by the metrics configuration ID) from the bucket. Note that this doesn't include the daily storage metrics.</p> <p> To use this operation, you must have permissions to perform the <code>s3:GetMetricsConfiguration</code> action. The bucket owner has this permission by default. The bucket owner can grant this permission to others. For more information about permissions, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/using-with-s3-actions.html#using-with-s3-actions-related-to-bucket-subresources\">Permissions Related to Bucket Subresource Operations</a> and <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/s3-access-control.html\">Managing Access Permissions to Your Amazon S3 Resources</a>.</p> <p> For information about CloudWatch request metrics for Amazon S3, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/cloudwatch-monitoring.html\">Monitoring Metrics with Amazon CloudWatch</a>.</p> <p>The following operations are related to <code>GetBucketMetricsConfiguration</code>:</p> <ul> <li> <p> <a>PutBucketMetricsConfiguration</a> </p> </li> <li> <p> <a>DeleteBucketMetricsConfiguration</a> </p> </li> <li> <p> <a>ListBucketMetricsConfigurations</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/cloudwatch-monitoring.html\">Monitoring Metrics with Amazon CloudWatch</a> </p> </li> </ul>"
     },
     "GetBucketNotification":{
       "name":"GetBucketNotification",
@@ -368,7 +368,7 @@
       "input":{"shape":"GetBucketNotificationConfigurationRequest"},
       "output":{"shape":"NotificationConfigurationDeprecated"},
       "documentationUrl":"http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTBucketGETnotification.html",
-      "documentation":"<p> No longer used, see the GetBucketNotificationConfiguration operation.</p>",
+      "documentation":"<p> No longer used, see <a>GetBucketNotificationConfiguration</a>.</p>",
       "deprecated":true
     },
     "GetBucketNotificationConfiguration":{
@@ -379,7 +379,7 @@
       },
       "input":{"shape":"GetBucketNotificationConfigurationRequest"},
       "output":{"shape":"NotificationConfiguration"},
-      "documentation":"<p>Returns the notification configuration of a bucket.</p>"
+      "documentation":"<p>Returns the notification configuration of a bucket.</p> <p>If notifications are not enabled on the bucket, the operation returns an empty <code>NotificationConfiguration</code> element.</p> <p>By default, you must be the bucket owner to read the notification configuration of a bucket. However, the bucket owner can use a bucket policy to grant permission to other users to read this configuration with the <code>s3:GetBucketNotification</code> permission.</p> <p>For more information about setting and reading the notification configuration on a bucket, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/NotificationHowTo.html\">Setting Up Notification of Bucket Events</a>. For more information about bucket policies, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/using-iam-policies.html\">Using Bucket Policies</a>.</p> <p>The following operation is related to <code>GetBucketNotification</code>:</p> <ul> <li> <p> <a>PutBucketNotification</a> </p> </li> </ul>"
     },
     "GetBucketPolicy":{
       "name":"GetBucketPolicy",
@@ -390,7 +390,7 @@
       "input":{"shape":"GetBucketPolicyRequest"},
       "output":{"shape":"GetBucketPolicyOutput"},
       "documentationUrl":"http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTBucketGETpolicy.html",
-      "documentation":"<p>Returns the policy of a specified bucket.</p>"
+      "documentation":"<p>Returns the policy of a specified bucket. If you are using an identity other than the root user of the AWS account that owns the bucket, the calling identity must have the <code>GetBucketPolicy</code> permissions on the specified bucket and belong to the bucket owner's account in order to use this operation.</p> <p>If you don't have <code>GetBucketPolicy</code> permissions, Amazon S3 returns a <code>403 Access Denied</code> error. If you have the correct permissions, but you're not using an identity that belongs to the bucket owner's account, Amazon S3 returns a <code>405 Method Not Allowed</code> error.</p> <important> <p>As a security precaution, the root user of the AWS account that owns a bucket can always use this operation, even if the policy explicitly denies the root user the ability to perform this action.</p> </important> <p>For more information about bucket policies, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/using-iam-policies.html\">Using Bucket Policies and User Policies</a>.</p> <p>The following operation is related to <code>GetBucketPolicy</code>:</p> <ul> <li> <p> <a>GetObject</a> </p> </li> </ul>"
     },
     "GetBucketPolicyStatus":{
       "name":"GetBucketPolicyStatus",
@@ -400,7 +400,7 @@
       },
       "input":{"shape":"GetBucketPolicyStatusRequest"},
       "output":{"shape":"GetBucketPolicyStatusOutput"},
-      "documentation":"<p>Retrieves the policy status for an Amazon S3 bucket, indicating whether the bucket is public.</p>"
+      "documentation":"<p>Retrieves the policy status for an Amazon S3 bucket, indicating whether the bucket is public. In order to use this operation, you must have the <code>s3:GetBucketPolicyStatus</code> permission. For more information about Amazon S3 permissions, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/using-with-s3-actions.html\">Specifying Permissions in a Policy</a>.</p> <p> For more information about when Amazon S3 considers a bucket public, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/access-control-block-public-access.html#access-control-block-public-access-policy-status\">The Meaning of \"Public\"</a>. </p> <p>The following operations are related to <code>GetBucketPolicyStatus</code>:</p> <ul> <li> <p> <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/access-control-block-public-access.html\">Using Amazon S3 Block Public Access</a> </p> </li> <li> <p> <a>GetPublicAccessBlock</a> </p> </li> <li> <p> <a>PutPublicAccessBlock</a> </p> </li> <li> <p> <a>DeletePublicAccessBlock</a> </p> </li> </ul>"
     },
     "GetBucketReplication":{
       "name":"GetBucketReplication",
@@ -410,7 +410,7 @@
       },
       "input":{"shape":"GetBucketReplicationRequest"},
       "output":{"shape":"GetBucketReplicationOutput"},
-      "documentation":"<p>Returns the replication configuration of a bucket.</p> <note> <p> It can take a while to propagate the put or delete a replication configuration to all Amazon S3 systems. Therefore, a get request soon after put or delete can return a wrong result. </p> </note>"
+      "documentation":"<p>Returns the replication configuration of a bucket.</p> <note> <p> It can take a while to propagate the put or delete a replication configuration to all Amazon S3 systems. Therefore, a get request soon after put or delete can return a wrong result. </p> </note> <p> For information about replication configuration, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/replication.html\">Replication</a> in the <i>Amazon Simple Storage Service Developer Guide</i>.</p> <p>This operation requires permissions for the <code>s3:GetReplicationConfiguration</code> action. For more information about permissions, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/using-iam-policies.html\">Using Bucket Policies and User Policies</a>.</p> <p>If you include the <code>Filter</code> element in a replication configuration, you must also include the <code>DeleteMarkerReplication</code> and <code>Priority</code> elements. The response also returns those elements.</p> <p>For information about <code>GetBucketReplication</code> errors, see <a>ReplicationErrorCodeList</a> </p> <p>The following operations are related to <code>GetBucketReplication</code>:</p> <ul> <li> <p> <a>PutBucketReplication</a> </p> </li> <li> <p> <a>DeleteBucketReplication</a> </p> </li> </ul>"
     },
     "GetBucketRequestPayment":{
       "name":"GetBucketRequestPayment",
@@ -421,7 +421,7 @@
       "input":{"shape":"GetBucketRequestPaymentRequest"},
       "output":{"shape":"GetBucketRequestPaymentOutput"},
       "documentationUrl":"http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTrequestPaymentGET.html",
-      "documentation":"<p>Returns the request payment configuration of a bucket.</p>"
+      "documentation":"<p>Returns the request payment configuration of a bucket. To use this version of the operation, you must be the bucket owner. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/RequesterPaysBuckets.html\">Requester Pays Buckets</a>.</p> <p>The following operations are related to <code>GetBucketRequestPayment</code>:</p> <ul> <li> <p> <a>ListObjects</a> </p> </li> </ul>"
     },
     "GetBucketTagging":{
       "name":"GetBucketTagging",
@@ -432,7 +432,7 @@
       "input":{"shape":"GetBucketTaggingRequest"},
       "output":{"shape":"GetBucketTaggingOutput"},
       "documentationUrl":"http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTBucketGETtagging.html",
-      "documentation":"<p>Returns the tag set associated with the bucket.</p>"
+      "documentation":"<p>Returns the tag set associated with the bucket.</p> <p>To use this operation, you must have permission to perform the <code>s3:GetBucketTagging</code> action. By default, the bucket owner has this permission and can grant this permission to others.</p> <p> <code>GetBucketTagging</code> has the following special error:</p> <ul> <li> <p>Error code: <code>NoSuchTagSetError</code> </p> <ul> <li> <p>Description: There is no tag set associated with the bucket.</p> </li> </ul> </li> </ul> <p>The following operations are related to <code>GetBucketTagging</code>:</p> <ul> <li> <p> <a>PutBucketTagging</a> </p> </li> <li> <p> <a>DeleteBucketTagging</a> </p> </li> </ul>"
     },
     "GetBucketVersioning":{
       "name":"GetBucketVersioning",
@@ -443,7 +443,7 @@
       "input":{"shape":"GetBucketVersioningRequest"},
       "output":{"shape":"GetBucketVersioningOutput"},
       "documentationUrl":"http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTBucketGETversioningStatus.html",
-      "documentation":"<p>Returns the versioning state of a bucket.</p>"
+      "documentation":"<p>Returns the versioning state of a bucket.</p> <p>To retrieve the versioning state of a bucket, you must be the bucket owner.</p> <p>This implementation also returns the MFA Delete status of the versioning state. If the MFA Delete status is <code>enabled</code>, the bucket owner must use an authentication device to change the versioning state of the bucket.</p> <p>The following operations are related to <code>GetBucketVersioning</code>:</p> <ul> <li> <p> <a>GetObject</a> </p> </li> <li> <p> <a>PutObject</a> </p> </li> <li> <p> <a>DeleteObject</a> </p> </li> </ul>"
     },
     "GetBucketWebsite":{
       "name":"GetBucketWebsite",
@@ -454,7 +454,7 @@
       "input":{"shape":"GetBucketWebsiteRequest"},
       "output":{"shape":"GetBucketWebsiteOutput"},
       "documentationUrl":"http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTBucketGETwebsite.html",
-      "documentation":"<p>Returns the website configuration for a bucket.</p>"
+      "documentation":"<p>Returns the website configuration for a bucket. To host website on Amazon S3, you can configure a bucket as website by adding a website configuration. For more information about hosting websites, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/WebsiteHosting.html\">Hosting Websites on Amazon S3</a>. </p> <p>This GET operation requires the <code>S3:GetBucketWebsite</code> permission. By default, only the bucket owner can read the bucket website configuration. However, bucket owners can allow other users to read the website configuration by writing a bucket policy granting them the <code>S3:GetBucketWebsite</code> permission.</p> <p>The following operations are related to <code>DeleteBucketWebsite</code>:</p> <ul> <li> <p> <a>DeleteBucketWebsite</a> </p> </li> <li> <p> <a>PutBucketWebsite</a> </p> </li> </ul>"
     },
     "GetObject":{
       "name":"GetObject",
@@ -468,7 +468,7 @@
         {"shape":"NoSuchKey"}
       ],
       "documentationUrl":"http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTObjectGET.html",
-      "documentation":"<p>Retrieves objects from Amazon S3.</p>"
+      "documentation":"<p>Retrieves objects from Amazon S3. To use <code>GET</code>, you must have <code>READ</code> access to the object. If you grant <code>READ</code> access to the anonymous user, you can return the object without using an authorization header.</p> <p>An Amazon S3 bucket has no directory hierarchy such as you would find in a typical computer file system. You can, however, create a logical hierarchy by using object key names that imply a folder structure. For example, instead of naming an object <code>sample.jpg</code>, you can name it <code>photos/2006/February/sample.jpg</code>.</p> <p>To get an object from such a logical hierarchy, specify the full key name for the object in the <code>GET</code> operation. For a virtual hosted-style request example, if you have the object <code>photos/2006/February/sample.jpg</code>, specify the resource as <code>/photos/2006/February/sample.jpg</code>. For a path-style request example, if you have the object <code>photos/2006/February/sample.jpg</code> in the bucket named <code>examplebucket</code>, specify the resource as <code>/examplebucket/photos/2006/February/sample.jpg</code>. For more information about request types, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/VirtualHosting.html#VirtualHostingSpecifyBucket\">HTTP Host Header Bucket Specification</a>.</p> <p>To distribute large files to many people, you can save bandwidth costs by using BitTorrent. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/S3Torrent.html\">Amazon S3 Torrent</a>. For more information about returning the ACL of an object, see <a>GetObjectAcl</a>.</p> <p>If the object you are retrieving is stored in the GLACIER or DEEP_ARCHIVE storage classes, before you can retrieve the object you must first restore a copy using . Otherwise, this operation returns an <code>InvalidObjectStateError</code> error. For information about restoring archived objects, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/restoring-objects.html\">Restoring Archived Objects</a>.</p> <p>Encryption request headers, like <code>x-amz-server-side-encryption</code>, should not be sent for GET requests if your object uses server-side encryption with CMKs stored in AWS KMS (SSE-KMS) or server-side encryption with Amazon S3–managed encryption keys (SSE-S3). If your object does use these types of keys, you’ll get an HTTP 400 BadRequest error.</p> <p>If you encrypt an object by using server-side encryption with customer-provided encryption keys (SSE-C) when you store the object in Amazon S3, then when you GET the object, you must use the following headers:</p> <ul> <li> <p>x-amz-server-side​-encryption​-customer-algorithm</p> </li> <li> <p>x-amz-server-side​-encryption​-customer-key</p> </li> <li> <p>x-amz-server-side​-encryption​-customer-key-MD5</p> </li> </ul> <p>For more information about SSE-C, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/ServerSideEncryptionCustomerKeys.html\">Server-Side Encryption (Using Customer-Provided Encryption Keys)</a>.</p> <p>Assuming you have permission to read object tags (permission for the <code>s3:GetObjectVersionTagging</code> action), the response also returns the <code>x-amz-tagging-count</code> header that provides the count of number of tags associated with the object. You can use <a>GetObjectTagging</a> to retrieve the tag set associated with an object.</p> <p> <b>Permissions</b> </p> <p>You need the <code>s3:GetObject</code> permission for this operation. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/using-with-s3-actions.html\">Specifying Permissions in a Policy</a>. If the object you request does not exist, the error Amazon S3 returns depends on whether you also have the <code>s3:ListBucket</code> permission.</p> <ul> <li> <p>If you have the <code>s3:ListBucket</code> permission on the bucket, Amazon S3 will return an HTTP status code 404 (\"no such key\") error.</p> </li> <li> <p>If you don’t have the <code>s3:ListBucket</code> permission, Amazon S3 will return an HTTP status code 403 (\"access denied\") error.</p> </li> </ul> <p> <b>Versioning</b> </p> <p>By default, the GET operation returns the current version of an object. To return a different version, use the <code>versionId</code> subresource.</p> <note> <p>If the current version of the object is a delete marker, Amazon S3 behaves as if the object was deleted and includes <code>x-amz-delete-marker: true</code> in the response.</p> </note> <p>For more information about versioning, see <a>PutBucketVersioning</a>. </p> <p> <b>Overriding Response Header Values</b> </p> <p>There are times when you want to override certain response header values in a GET response. For example, you might override the Content-Disposition response header value in your GET request.</p> <p>You can override values for a set of response headers using the following query parameters. These response header values are sent only on a successful request, that is, when status code 200 OK is returned. The set of headers you can override using these parameters is a subset of the headers that Amazon S3 accepts when you create an object. The response headers that you can override for the GET response are <code>Content-Type</code>, <code>Content-Language</code>, <code>Expires</code>, <code>Cache-Control</code>, <code>Content-Disposition</code>, and <code>Content-Encoding</code>. To override these header values in the GET response, you use the following request parameters.</p> <note> <p>You must sign the request, either using an Authorization header or a presigned URL, when using these parameters. They cannot be used with an unsigned (anonymous) request.</p> </note> <ul> <li> <p> <code>response-content-type</code> </p> </li> <li> <p> <code>response-content-language</code> </p> </li> <li> <p> <code>response-expires</code> </p> </li> <li> <p> <code>response-cache-control</code> </p> </li> <li> <p> <code>response-content-disposition</code> </p> </li> <li> <p> <code>response-content-encoding</code> </p> </li> </ul> <p> <b>Additional Considerations about Request Headers</b> </p> <p>If both of the <code>If-Match</code> and <code>If-Unmodified-Since</code> headers are present in the request as follows: <code>If-Match</code> condition evaluates to <code>true</code>, and; <code>If-Unmodified-Since</code> condition evaluates to <code>false</code>; then, S3 returns 200 OK and the data requested. </p> <p>If both of the <code>If-None-Match</code> and <code>If-Modified-Since</code> headers are present in the request as follows:<code> If-None-Match</code> condition evaluates to <code>false</code>, and; <code>If-Modified-Since</code> condition evaluates to <code>true</code>; then, S3 returns 304 Not Modified response code.</p> <p>For more information about conditional requests, see <a href=\"https://tools.ietf.org/html/rfc7232\">RFC 7232</a>.</p> <p>The following operations are related to <code>GetObject</code>:</p> <ul> <li> <p> <a>ListBuckets</a> </p> </li> <li> <p> <a>GetObjectAcl</a> </p> </li> </ul>"
     },
     "GetObjectAcl":{
       "name":"GetObjectAcl",
@@ -482,7 +482,7 @@
         {"shape":"NoSuchKey"}
       ],
       "documentationUrl":"http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTObjectGETacl.html",
-      "documentation":"<p>Returns the access control list (ACL) of an object.</p>"
+      "documentation":"<p>Returns the access control list (ACL) of an object. To use this operation, you must have READ_ACP access to the object.</p> <p> <b>Versioning</b> </p> <p>By default, GET returns ACL information about the current version of an object. To return ACL information about a different version, use the versionId subresource.</p> <p>The following operations are related to <code>GetObjectAcl</code>:</p> <ul> <li> <p> <a>GetObject</a> </p> </li> <li> <p> <a>DeleteObject</a> </p> </li> <li> <p> <a>PutObject</a> </p> </li> </ul>"
     },
     "GetObjectLegalHold":{
       "name":"GetObjectLegalHold",
@@ -492,7 +492,7 @@
       },
       "input":{"shape":"GetObjectLegalHoldRequest"},
       "output":{"shape":"GetObjectLegalHoldOutput"},
-      "documentation":"<p>Gets an object's current Legal Hold status.</p>"
+      "documentation":"<p>Gets an object's current Legal Hold status. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/object-lock.html\">Locking Objects</a>.</p>"
     },
     "GetObjectLockConfiguration":{
       "name":"GetObjectLockConfiguration",
@@ -502,7 +502,7 @@
       },
       "input":{"shape":"GetObjectLockConfigurationRequest"},
       "output":{"shape":"GetObjectLockConfigurationOutput"},
-      "documentation":"<p>Gets the object lock configuration for a bucket. The rule specified in the object lock configuration will be applied by default to every new object placed in the specified bucket.</p>"
+      "documentation":"<p>Gets the Object Lock configuration for a bucket. The rule specified in the Object Lock configuration will be applied by default to every new object placed in the specified bucket. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/object-lock.html\">Locking Objects</a>.</p>"
     },
     "GetObjectRetention":{
       "name":"GetObjectRetention",
@@ -512,7 +512,7 @@
       },
       "input":{"shape":"GetObjectRetentionRequest"},
       "output":{"shape":"GetObjectRetentionOutput"},
-      "documentation":"<p>Retrieves an object's retention settings.</p>"
+      "documentation":"<p>Retrieves an object's retention settings. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/object-lock.html\">Locking Objects</a>.</p>"
     },
     "GetObjectTagging":{
       "name":"GetObjectTagging",
@@ -522,7 +522,7 @@
       },
       "input":{"shape":"GetObjectTaggingRequest"},
       "output":{"shape":"GetObjectTaggingOutput"},
-      "documentation":"<p>Returns the tag-set of an object.</p>"
+      "documentation":"<p>Returns the tag-set of an object. You send the GET request against the tagging subresource associated with the object.</p> <p>To use this operation, you must have permission to perform the <code>s3:GetObjectTagging</code> action. By default, the GET operation returns information about current version of an object. For a versioned bucket, you can have multiple versions of an object in your bucket. To retrieve tags of any other version, use the versionId query parameter. You also need permission for the <code>s3:GetObjectVersionTagging</code> action.</p> <p> By default, the bucket owner has this permission and can grant this permission to others.</p> <p> For information about the Amazon S3 object tagging feature, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/object-tagging.html\">Object Tagging</a>.</p> <p>The following operation is related to <code>GetObjectTagging</code>:</p> <ul> <li> <p> <a>PutObjectTagging</a> </p> </li> </ul>"
     },
     "GetObjectTorrent":{
       "name":"GetObjectTorrent",
@@ -533,7 +533,7 @@
       "input":{"shape":"GetObjectTorrentRequest"},
       "output":{"shape":"GetObjectTorrentOutput"},
       "documentationUrl":"http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTObjectGETtorrent.html",
-      "documentation":"<p>Return torrent files from a bucket.</p>"
+      "documentation":"<p>Return torrent files from a bucket. BitTorrent can save you bandwidth when you're distributing large files. For more information about BitTorrent, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/S3Torrent.html\">Amazon S3 Torrent</a>.</p> <note> <p>You can get torrent only for objects that are less than 5 GB in size and that are not encrypted using server-side encryption with customer-provided encryption key.</p> </note> <p>To use GET, you must have READ access to the object.</p> <p>The following operation is related to <code>GetObjectTorrent</code>:</p> <ul> <li> <p> <a>GetObject</a> </p> </li> </ul>"
     },
     "GetPublicAccessBlock":{
       "name":"GetPublicAccessBlock",
@@ -543,7 +543,7 @@
       },
       "input":{"shape":"GetPublicAccessBlockRequest"},
       "output":{"shape":"GetPublicAccessBlockOutput"},
-      "documentation":"<p>Retrieves the <code>PublicAccessBlock</code> configuration for an Amazon S3 bucket.</p>"
+      "documentation":"<p>Retrieves the <code>PublicAccessBlock</code> configuration for an Amazon S3 bucket. To use this operation, you must have the <code>s3:GetBucketPublicAccessBlock</code> permission. For more information about Amazon S3 permissions, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/using-with-s3-actions.html\">Specifying Permissions in a Policy</a>.</p> <important> <p>When Amazon S3 evaluates the <code>PublicAccessBlock</code> configuration for a bucket or an object, it checks the <code>PublicAccessBlock</code> configuration for both the bucket (or the bucket that contains the object) and the bucket owner's account. If the <code>PublicAccessBlock</code> settings are different between the bucket and the account, Amazon S3 uses the most restrictive combination of the bucket-level and account-level settings.</p> </important> <p>For more information about when Amazon S3 considers a bucket or an object public, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/access-control-block-public-access.html#access-control-block-public-access-policy-status\">The Meaning of \"Public\"</a>.</p> <p>The following operations are related to <code>GetPublicAccessBlock</code>:</p> <ul> <li> <p> <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/access-control-block-public-access.html\">Using Amazon S3 Block Public Access</a> </p> </li> <li> <p> <a>PutPublicAccessBlock</a> </p> </li> <li> <p> <a>GetPublicAccessBlock</a> </p> </li> <li> <p> <a>DeletePublicAccessBlock</a> </p> </li> </ul>"
     },
     "HeadBucket":{
       "name":"HeadBucket",
@@ -556,7 +556,7 @@
         {"shape":"NoSuchBucket"}
       ],
       "documentationUrl":"http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTBucketHEAD.html",
-      "documentation":"<p>This operation is useful to determine if a bucket exists and you have permission to access it.</p>"
+      "documentation":"<p>This operation is useful to determine if a bucket exists and you have permission to access it. The operation returns a <code>200 OK</code> if the bucket exists and you have permission to access it. Otherwise, the operation might return responses such as <code>404 Not Found</code> and <code>403 Forbidden</code>. </p> <p>To use this operation, you must have permissions to perform the <code>s3:ListBucket</code> action. The bucket owner has this permission by default and can grant this permission to others. For more information about permissions, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/using-with-s3-actions.html#using-with-s3-actions-related-to-bucket-subresources\">Permissions Related to Bucket Subresource Operations</a> and <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/s3-access-control.html\">Managing Access Permissions to Your Amazon S3 Resources</a>.</p>"
     },
     "HeadObject":{
       "name":"HeadObject",
@@ -570,7 +570,7 @@
         {"shape":"NoSuchKey"}
       ],
       "documentationUrl":"http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTObjectHEAD.html",
-      "documentation":"<p>The HEAD operation retrieves metadata from an object without returning the object itself. This operation is useful if you're only interested in an object's metadata. To use HEAD, you must have READ access to the object.</p>"
+      "documentation":"<p>The HEAD operation retrieves metadata from an object without returning the object itself. This operation is useful if you're only interested in an object's metadata. To use HEAD, you must have READ access to the object.</p> <p>A <code>HEAD</code> request has the same options as a <code>GET</code> operation on an object. The response is identical to the <code>GET</code> response except that there is no response body.</p> <p>If you encrypt an object by using server-side encryption with customer-provided encryption keys (SSE-C) when you store the object in Amazon S3, then when you retrieve the metadata from the object, you must use the following headers:</p> <ul> <li> <p>x-amz-server-side​-encryption​-customer-algorithm</p> </li> <li> <p>x-amz-server-side​-encryption​-customer-key</p> </li> <li> <p>x-amz-server-side​-encryption​-customer-key-MD5</p> </li> </ul> <p>For more information about SSE-C, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/ServerSideEncryptionCustomerKeys.html\">Server-Side Encryption (Using Customer-Provided Encryption Keys)</a>.</p> <note> <p>Encryption request headers, like <code>x-amz-server-side-encryption</code>, should not be sent for GET requests if your object uses server-side encryption with CMKs stored in AWS KMS (SSE-KMS) or server-side encryption with Amazon S3–managed encryption keys (SSE-S3). If your object does use these types of keys, you’ll get an HTTP 400 BadRequest error.</p> </note> <p>Request headers are limited to 8 KB in size. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/API/RESTCommonRequestHeaders.html\">Common Request Headers</a>.</p> <p>Consider the following when using request headers:</p> <ul> <li> <p> Consideration 1 – If both of the <code>If-Match</code> and <code>If-Unmodified-Since</code> headers are present in the request as follows:</p> <ul> <li> <p> <code>If-Match</code> condition evaluates to <code>true</code>, and;</p> </li> <li> <p> <code>If-Unmodified-Since</code> condition evaluates to <code>false</code>;</p> </li> </ul> <p>Then Amazon S3 returns <code>200 OK</code> and the data requested.</p> </li> <li> <p> Consideration 2 – If both of the <code>If-None-Match</code> and <code>If-Modified-Since</code> headers are present in the request as follows:</p> <ul> <li> <p> <code>If-None-Match</code> condition evaluates to <code>false</code>, and;</p> </li> <li> <p> <code>If-Modified-Since</code> condition evaluates to <code>true</code>;</p> </li> </ul> <p>Then Amazon S3 returns the <code>304 Not Modified</code> response code.</p> </li> </ul> <p>For more information about conditional requests, see <a href=\"https://tools.ietf.org/html/rfc7232\">RFC 7232</a>.</p> <p> <b>Permissions</b> </p> <p>You need the <code>s3:GetObject</code> permission for this operation. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/using-with-s3-actions.html\">Specifying Permissions in a Policy</a>. If the object you request does not exist, the error Amazon S3 returns depends on whether you also have the s3:ListBucket permission.</p> <ul> <li> <p>If you have the <code>s3:ListBucket</code> permission on the bucket, Amazon S3 returns an HTTP status code 404 (\"no such key\") error.</p> </li> <li> <p>If you don’t have the <code>s3:ListBucket</code> permission, Amazon S3 returns an HTTP status code 403 (\"access denied\") error.</p> </li> </ul> <p>The following operation is related to <code>HeadObject</code>:</p> <ul> <li> <p> <a>GetObject</a> </p> </li> </ul>"
     },
     "ListBucketAnalyticsConfigurations":{
       "name":"ListBucketAnalyticsConfigurations",
@@ -580,7 +580,7 @@
       },
       "input":{"shape":"ListBucketAnalyticsConfigurationsRequest"},
       "output":{"shape":"ListBucketAnalyticsConfigurationsOutput"},
-      "documentation":"<p>Lists the analytics configurations for the bucket.</p>"
+      "documentation":"<p>Lists the analytics configurations for the bucket. You can have up to 1,000 analytics configurations per bucket.</p> <p>This operation supports list pagination and does not return more than 100 configurations at a time. You should always check the <code>IsTruncated</code> element in the response. If there are no more configurations to list, <code>IsTruncated</code> is set to false. If there are more configurations to list, <code>IsTruncated</code> is set to true, and there will be a value in <code>NextContinuationToken</code>. You use the <code>NextContinuationToken</code> value to continue the pagination of the list by passing the value in continuation-token in the request to <code>GET</code> the next page.</p> <p>To use this operation, you must have permissions to perform the <code>s3:GetAnalyticsConfiguration</code> action. The bucket owner has this permission by default. The bucket owner can grant this permission to others. For more information about permissions, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/using-with-s3-actions.html#using-with-s3-actions-related-to-bucket-subresources\">Permissions Related to Bucket Subresource Operations</a> and <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/s3-access-control.html\">Managing Access Permissions to Your Amazon S3 Resources</a>.</p> <p>For information about Amazon S3 analytics feature, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/analytics-storage-class.html\">Amazon S3 Analytics – Storage Class Analysis</a>. </p> <p>The following operations are related to <code>ListBucketAnalyticsConfigurations</code>:</p> <ul> <li> <p> <a>GetBucketAnalyticsConfiguration</a> </p> </li> <li> <p> <a>DeleteBucketAnalyticsConfiguration</a> </p> </li> <li> <p> <a>PutBucketAnalyticsConfiguration</a> </p> </li> </ul>"
     },
     "ListBucketInventoryConfigurations":{
       "name":"ListBucketInventoryConfigurations",
@@ -590,7 +590,7 @@
       },
       "input":{"shape":"ListBucketInventoryConfigurationsRequest"},
       "output":{"shape":"ListBucketInventoryConfigurationsOutput"},
-      "documentation":"<p>Returns a list of inventory configurations for the bucket.</p>"
+      "documentation":"<p>Returns a list of inventory configurations for the bucket. You can have up to 1,000 analytics configurations per bucket.</p> <p>This operation supports list pagination and does not return more than 100 configurations at a time. Always check the <code>IsTruncated</code> element in the response. If there are no more configurations to list, <code>IsTruncated</code> is set to false. If there are more configurations to list, <code>IsTruncated</code> is set to true, and there is a value in <code>NextContinuationToken</code>. You use the <code>NextContinuationToken</code> value to continue the pagination of the list by passing the value in continuation-token in the request to <code>GET</code> the next page.</p> <p> To use this operation, you must have permissions to perform the <code>s3:GetInventoryConfiguration</code> action. The bucket owner has this permission by default. The bucket owner can grant this permission to others. For more information about permissions, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/using-with-s3-actions.html#using-with-s3-actions-related-to-bucket-subresources\">Permissions Related to Bucket Subresource Operations</a> and <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/s3-access-control.html\">Managing Access Permissions to Your Amazon S3 Resources</a>.</p> <p>For information about the Amazon S3 inventory feature, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/storage-inventory.html\">Amazon S3 Inventory</a> </p> <p>The following operations are related to <code>ListBucketInventoryConfigurations</code>:</p> <ul> <li> <p> <a>GetBucketInventoryConfiguration</a> </p> </li> <li> <p> <a>DeleteBucketInventoryConfiguration</a> </p> </li> <li> <p> <a>PutBucketInventoryConfiguration</a> </p> </li> </ul>"
     },
     "ListBucketMetricsConfigurations":{
       "name":"ListBucketMetricsConfigurations",
@@ -600,7 +600,7 @@
       },
       "input":{"shape":"ListBucketMetricsConfigurationsRequest"},
       "output":{"shape":"ListBucketMetricsConfigurationsOutput"},
-      "documentation":"<p>Lists the metrics configurations for the bucket.</p>"
+      "documentation":"<p>Lists the metrics configurations for the bucket. The metrics configurations are only for the request metrics of the bucket and do not provide information on daily storage metrics. You can have up to 1,000 configurations per bucket.</p> <p>This operation supports list pagination and does not return more than 100 configurations at a time. Always check the <code>IsTruncated</code> element in the response. If there are no more configurations to list, <code>IsTruncated</code> is set to false. If there are more configurations to list, <code>IsTruncated</code> is set to true, and there is a value in <code>NextContinuationToken</code>. You use the <code>NextContinuationToken</code> value to continue the pagination of the list by passing the value in <code>continuation-token</code> in the request to <code>GET</code> the next page.</p> <p>To use this operation, you must have permissions to perform the <code>s3:GetMetricsConfiguration</code> action. The bucket owner has this permission by default. The bucket owner can grant this permission to others. For more information about permissions, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/using-with-s3-actions.html#using-with-s3-actions-related-to-bucket-subresources\">Permissions Related to Bucket Subresource Operations</a> and <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/s3-access-control.html\">Managing Access Permissions to Your Amazon S3 Resources</a>.</p> <p>For more information about metrics configurations and CloudWatch request metrics, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/cloudwatch-monitoring.html\">Monitoring Metrics with Amazon CloudWatch</a>.</p> <p>The following operations are related to <code>ListBucketMetricsConfigurations</code>:</p> <ul> <li> <p> <a>PutBucketMetricsConfiguration</a> </p> </li> <li> <p> <a>GetBucketMetricsConfiguration</a> </p> </li> <li> <p> <a>DeleteBucketMetricsConfiguration</a> </p> </li> </ul>"
     },
     "ListBuckets":{
       "name":"ListBuckets",
@@ -622,7 +622,7 @@
       "input":{"shape":"ListMultipartUploadsRequest"},
       "output":{"shape":"ListMultipartUploadsOutput"},
       "documentationUrl":"http://docs.amazonwebservices.com/AmazonS3/latest/API/mpUploadListMPUpload.html",
-      "documentation":"<p>This operation lists in-progress multipart uploads.</p>"
+      "documentation":"<p>This operation lists in-progress multipart uploads. An in-progress multipart upload is a multipart upload that has been initiated using the Initiate Multipart Upload request, but has not yet been completed or aborted.</p> <p>This operation returns at most 1,000 multipart uploads in the response. 1,000 multipart uploads is the maximum number of uploads a response can include, which is also the default value. You can further limit the number of uploads in a response by specifying the <code>max-uploads</code> parameter in the response. If additional multipart uploads satisfy the list criteria, the response will contain an <code>IsTruncated</code> element with the value true. To list the additional multipart uploads, use the <code>key-marker</code> and <code>upload-id-marker</code> request parameters.</p> <p>In the response, the uploads are sorted by key. If your application has initiated more than one multipart upload using the same object key, then uploads in the response are first sorted by key. Additionally, uploads are sorted in ascending order within each key by the upload initiation time.</p> <p>For more information on multipart uploads, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/uploadobjusingmpu.html\">Uploading Objects Using Multipart Upload</a>.</p> <p>For information on permissions required to use the multipart upload API, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/mpuAndPermissions.html\">Multipart Upload API and Permissions</a>.</p> <p>The following operations are related to <code>ListMultipartUploads</code>:</p> <ul> <li> <p> <a>CreateMultipartUpload</a> </p> </li> <li> <p> <a>UploadPart</a> </p> </li> <li> <p> <a>CompleteMultipartUpload</a> </p> </li> <li> <p> <a>ListParts</a> </p> </li> <li> <p> <a>AbortMultipartUpload</a> </p> </li> </ul>"
     },
     "ListObjectVersions":{
       "name":"ListObjectVersions",
@@ -633,7 +633,7 @@
       "input":{"shape":"ListObjectVersionsRequest"},
       "output":{"shape":"ListObjectVersionsOutput"},
       "documentationUrl":"http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTBucketGETVersion.html",
-      "documentation":"<p>Returns metadata about all of the versions of objects in a bucket.</p>",
+      "documentation":"<p>Returns metadata about all of the versions of objects in a bucket. You can also use request parameters as selection criteria to return metadata about a subset of all the object versions. </p> <note> <p> A 200 OK response can contain valid or invalid XML. Make sure to design your application to parse the contents of the response and handle it appropriately.</p> </note> <p>To use this operation, you must have READ access to the bucket.</p> <p>The following operations are related to <code>ListObjectVersions</code>:</p> <ul> <li> <p> <a>ListObjectsV2</a> </p> </li> <li> <p> <a>GetObject</a> </p> </li> <li> <p> <a>PutObject</a> </p> </li> <li> <p> <a>DeleteObject</a> </p> </li> </ul>",
       "alias":"GetBucketObjectVersions"
     },
     "ListObjects":{
@@ -648,7 +648,7 @@
         {"shape":"NoSuchBucket"}
       ],
       "documentationUrl":"http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTBucketGET.html",
-      "documentation":"<p>Returns some or all (up to 1000) of the objects in a bucket. You can use the request parameters as selection criteria to return a subset of the objects in a bucket.</p>",
+      "documentation":"<p>Returns some or all (up to 1,000) of the objects in a bucket. You can use the request parameters as selection criteria to return a subset of the objects in a bucket. A 200 OK response can contain valid or invalid XML. Be sure to design your application to parse the contents of the response and handle it appropriately.</p> <important> <p>This API has been revised. We recommend that you use the newer version, <a>ListObjectsV2</a>, when developing applications. For backward compatibility, Amazon S3 continues to support <code>ListObjects</code>.</p> </important> <p>The following operations are related to <code>ListObjects</code>:</p> <ul> <li> <p> <a>ListObjectsV2</a> </p> </li> <li> <p> <a>GetObject</a> </p> </li> <li> <p> <a>PutObject</a> </p> </li> <li> <p> <a>CreateBucket</a> </p> </li> <li> <p> <a>ListBuckets</a> </p> </li> </ul>",
       "alias":"GetBucket"
     },
     "ListObjectsV2":{
@@ -662,7 +662,7 @@
       "errors":[
         {"shape":"NoSuchBucket"}
       ],
-      "documentation":"<p>Returns some or all (up to 1000) of the objects in a bucket. You can use the request parameters as selection criteria to return a subset of the objects in a bucket. Note: ListObjectsV2 is the revised List Objects API and we recommend you use this revised API for new application development.</p>"
+      "documentation":"<p>Returns some or all (up to 1,000) of the objects in a bucket. You can use the request parameters as selection criteria to return a subset of the objects in a bucket. A <code>200 OK</code> response can contain valid or invalid XML. Make sure to design your application to parse the contents of the response and handle it appropriately.</p> <p>To use this operation, you must have READ access to the bucket.</p> <p>To use this operation in an AWS Identity and Access Management (IAM) policy, you must have permissions to perform the <code>s3:ListBucket</code> action. The bucket owner has this permission by default and can grant this permission to others. For more information about permissions, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/using-with-s3-actions.html#using-with-s3-actions-related-to-bucket-subresources\">Permissions Related to Bucket Subresource Operations</a> and <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/s3-access-control.html\">Managing Access Permissions to Your Amazon S3 Resources</a>.</p> <important> <p>This section describes the latest revision of the API. We recommend that you use this revised API for application development. For backward compatibility, Amazon S3 continues to support the prior version of this API, <a>ListObjects</a>.</p> </important> <p>To get a list of your buckets, see <a>ListBuckets</a>.</p> <p>The following operations are related to <code>ListObjectsV2</code>:</p> <ul> <li> <p> <a>GetObject</a> </p> </li> <li> <p> <a>PutObject</a> </p> </li> <li> <p> <a>CreateBucket</a> </p> </li> </ul>"
     },
     "ListParts":{
       "name":"ListParts",
@@ -673,7 +673,7 @@
       "input":{"shape":"ListPartsRequest"},
       "output":{"shape":"ListPartsOutput"},
       "documentationUrl":"http://docs.amazonwebservices.com/AmazonS3/latest/API/mpUploadListParts.html",
-      "documentation":"<p>Lists the parts that have been uploaded for a specific multipart upload.</p>"
+      "documentation":"<p>Lists the parts that have been uploaded for a specific multipart upload. This operation must include the upload ID, which you obtain by sending the initiate multipart upload request (see <a>CreateMultipartUpload</a>). This request returns a maximum of 1,000 uploaded parts. The default number of parts returned is 1,000 parts. You can restrict the number of parts returned by specifying the <code>max-parts</code> request parameter. If your multipart upload consists of more than 1,000 parts, the response returns an <code>IsTruncated</code> field with the value of true, and a <code>NextPartNumberMarker</code> element. In subsequent <code>ListParts</code> requests you can include the part-number-marker query string parameter and set its value to the <code>NextPartNumberMarker</code> field value from the previous response.</p> <p>For more information on multipart uploads, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/uploadobjusingmpu.html\">Uploading Objects Using Multipart Upload</a>.</p> <p>For information on permissions required to use the multipart upload API, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/mpuAndPermissions.html\">Multipart Upload API and Permissions</a>.</p> <p>The following operations are related to <code>ListParts</code>:</p> <ul> <li> <p> <a>CreateMultipartUpload</a> </p> </li> <li> <p> <a>UploadPart</a> </p> </li> <li> <p> <a>CompleteMultipartUpload</a> </p> </li> <li> <p> <a>AbortMultipartUpload</a> </p> </li> <li> <p> <a>ListMultipartUploads</a> </p> </li> </ul>"
     },
     "PutBucketAccelerateConfiguration":{
       "name":"PutBucketAccelerateConfiguration",
@@ -682,7 +682,7 @@
         "requestUri":"/{Bucket}?accelerate"
       },
       "input":{"shape":"PutBucketAccelerateConfigurationRequest"},
-      "documentation":"<p>Sets the accelerate configuration of an existing bucket.</p>"
+      "documentation":"<p>Sets the accelerate configuration of an existing bucket. Amazon S3 Transfer Acceleration is a bucket-level feature that enables you to perform faster data transfers to Amazon S3.</p> <p> To use this operation, you must have permission to perform the s3:PutAccelerateConfiguration action. The bucket owner has this permission by default. The bucket owner can grant this permission to others. For more information about permissions, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/using-with-s3-actions.html#using-with-s3-actions-related-to-bucket-subresources\">Permissions Related to Bucket Subresource Operations</a> and <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/s3-access-control.html\">Managing Access Permissions to Your Amazon S3 Resources</a>.</p> <p> The Transfer Acceleration state of a bucket can be set to one of the following two values:</p> <ul> <li> <p> Enabled – Enables accelerated data transfers to the bucket.</p> </li> <li> <p> Suspended – Disables accelerated data transfers to the bucket.</p> </li> </ul> <p>The <a>GetBucketAccelerateConfiguration</a> operation returns the transfer acceleration state of a bucket.</p> <p>After setting the Transfer Acceleration state of a bucket to Enabled, it might take up to thirty minutes before the data transfer rates to the bucket increase.</p> <p> The name of the bucket used for Transfer Acceleration must be DNS-compliant and must not contain periods (\".\").</p> <p> For more information about transfer acceleration, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/transfer-acceleration.html\">Transfer Acceleration</a>.</p> <p>The following operations are related to <code>PutBucketAccelerateConfiguration</code>:</p> <ul> <li> <p> <a>GetBucketAccelerateConfiguration</a> </p> </li> <li> <p> <a>CreateBucket</a> </p> </li> </ul>"
     },
     "PutBucketAcl":{
       "name":"PutBucketAcl",
@@ -692,7 +692,7 @@
       },
       "input":{"shape":"PutBucketAclRequest"},
       "documentationUrl":"http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTBucketPUTacl.html",
-      "documentation":"<p>Sets the permissions on a bucket using access control lists (ACL).</p>"
+      "documentation":"<p>Sets the permissions on an existing bucket using access control lists (ACL). For more information, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/S3_ACLs_UsingACLs.html\">Using ACLs</a>. To set the ACL of a bucket, you must have <code>WRITE_ACP</code> permission.</p> <p>You can use one of the following two ways to set a bucket's permissions:</p> <ul> <li> <p>Specify the ACL in the request body</p> </li> <li> <p>Specify permissions using request headers</p> </li> </ul> <note> <p>You cannot specify access permission using both the body and the request headers.</p> </note> <p>Depending on your application needs, you may choose to set the ACL on a bucket using either the request body or the headers. For example, if you have an existing application that updates a bucket ACL using the request body, then you can continue to use that approach.</p> <p> <b>Access Permissions</b> </p> <p>You can set access permissions using one of the following methods:</p> <ul> <li> <p>Specify a canned ACL with the <code>x-amz-acl</code> request header. Amazon S3 supports a set of predefined ACLs, known as <i>canned ACLs</i>. Each canned ACL has a predefined set of grantees and permissions. Specify the canned ACL name as the value of <code>x-amz-acl</code>. If you use this header, you cannot use other access control-specific headers in your request. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/acl-overview.html#CannedACL\">Canned ACL</a>.</p> </li> <li> <p>Specify access permissions explicitly with the <code>x-amz-grant-read</code>, <code>x-amz-grant-read-acp</code>, <code>x-amz-grant-write-acp</code>, and <code>x-amz-grant-full-control</code> headers. When using these headers, you specify explicit access permissions and grantees (AWS accounts or Amazon S3 groups) who will receive the permission. If you use these ACL-specific headers, you cannot use the <code>x-amz-acl</code> header to set a canned ACL. These parameters map to the set of permissions that Amazon S3 supports in an ACL. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/acl-overview.html\">Access Control List (ACL) Overview</a>.</p> <p>You specify each grantee as a type=value pair, where the type is one of the following:</p> <ul> <li> <p> <code>emailAddress</code> – if the value specified is the email address of an AWS account</p> </li> <li> <p> <code>id</code> – if the value specified is the canonical user ID of an AWS account</p> </li> <li> <p> <code>uri</code> – if you are granting permissions to a predefined group</p> </li> </ul> <p>For example, the following <code>x-amz-grant-write</code> header grants create, overwrite, and delete objects permission to LogDelivery group predefined by Amazon S3 and two AWS accounts identified by their email addresses.</p> <p> <code>x-amz-grant-write: uri=\"http://acs.amazonaws.com/groups/s3/LogDelivery\", emailAddress=\"xyz@amazon.com\", emailAddress=\"abc@amazon.com\" </code> </p> </li> </ul> <p>You can use either a canned ACL or specify access permissions explicitly. You cannot do both.</p> <p> <b>Grantee Values</b> </p> <p>You can specify the person (grantee) to whom you're assigning access rights (using request elements) in the following ways:</p> <ul> <li> <p>By Email address:</p> <p> <code>&lt;Grantee xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:type=\"AmazonCustomerByEmail\"&gt;&lt;EmailAddress&gt;&lt;&gt;Grantees@email.com&lt;&gt;&lt;/EmailAddress&gt;lt;/Grantee&gt;</code> </p> <p>The grantee is resolved to the CanonicalUser and, in a response to a GET Object acl request, appears as the CanonicalUser.</p> </li> <li> <p>By the person's ID:</p> <p> <code>&lt;Grantee xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:type=\"CanonicalUser\"&gt;&lt;ID&gt;&lt;&gt;ID&lt;&gt;&lt;/ID&gt;&lt;DisplayName&gt;&lt;&gt;GranteesEmail&lt;&gt;&lt;/DisplayName&gt; &lt;/Grantee&gt;</code> </p> <p>DisplayName is optional and ignored in the request</p> </li> <li> <p>By URI:</p> <p> <code>&lt;Grantee xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:type=\"Group\"&gt;&lt;URI&gt;&lt;&gt;http://acs.amazonaws.com/groups/global/AuthenticatedUsers&lt;&gt;&lt;/URI&gt;&lt;/Grantee&gt;</code> </p> </li> </ul> <p class=\"title\"> <b>Related Resources</b> </p> <ul> <li> <p> <a>CreateBucket</a> </p> </li> <li> <p> <a>DeleteBucket</a> </p> </li> <li> <p> <a>GetObjectAcl</a> </p> </li> </ul>"
     },
     "PutBucketAnalyticsConfiguration":{
       "name":"PutBucketAnalyticsConfiguration",
@@ -701,7 +701,7 @@
         "requestUri":"/{Bucket}?analytics"
       },
       "input":{"shape":"PutBucketAnalyticsConfigurationRequest"},
-      "documentation":"<p>Sets an analytics configuration for the bucket (specified by the analytics configuration ID).</p>"
+      "documentation":"<p>Sets an analytics configuration for the bucket (specified by the analytics configuration ID). You can have up to 1,000 analytics configurations per bucket.</p> <p>You can choose to have storage class analysis export analysis reports sent to a comma-separated values (CSV) flat file. See the <code>DataExport</code> request element. Reports are updated daily and are based on the object filters that you configure. When selecting data export, you specify a destination bucket and an optional destination prefix where the file is written. You can export the data to a destination bucket in a different account. However, the destination bucket must be in the same Region as the bucket that you are making the PUT analytics configuration to. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/analytics-storage-class.html\">Amazon S3 Analytics – Storage Class Analysis</a>. </p> <important> <p>You must create a bucket policy on the destination bucket where the exported file is written to grant permissions to Amazon S3 to write objects to the bucket. For an example policy, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/example-bucket-policies.html#example-bucket-policies-use-case-9\">Granting Permissions for Amazon S3 Inventory and Storage Class Analysis</a>.</p> </important> <p>To use this operation, you must have permissions to perform the <code>s3:PutAnalyticsConfiguration</code> action. The bucket owner has this permission by default. The bucket owner can grant this permission to others. For more information about permissions, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/using-with-s3-actions.html#using-with-s3-actions-related-to-bucket-subresources\">Permissions Related to Bucket Subresource Operations</a> and <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/s3-access-control.html\">Managing Access Permissions to Your Amazon S3 Resources</a>.</p> <p class=\"title\"> <b>Special Errors</b> </p> <ul> <li> <ul> <li> <p> <i>HTTP Error: HTTP 400 Bad Request</i> </p> </li> <li> <p> <i>Code: InvalidArgument</i> </p> </li> <li> <p> <i>Cause: Invalid argument.</i> </p> </li> </ul> </li> <li> <ul> <li> <p> <i>HTTP Error: HTTP 400 Bad Request</i> </p> </li> <li> <p> <i>Code: TooManyConfigurations</i> </p> </li> <li> <p> <i>Cause: You are attempting to create a new configuration but have already reached the 1,000-configuration limit.</i> </p> </li> </ul> </li> <li> <ul> <li> <p> <i>HTTP Error: HTTP 403 Forbidden</i> </p> </li> <li> <p> <i>Code: AccessDenied</i> </p> </li> <li> <p> <i>Cause: You are not the owner of the specified bucket, or you do not have the s3:PutAnalyticsConfiguration bucket permission to set the configuration on the bucket.</i> </p> </li> </ul> </li> </ul> <p class=\"title\"> <b>Related Resources</b> </p> <ul> <li> <p> </p> </li> <li> <p> </p> </li> <li> <p> </p> </li> </ul>"
     },
     "PutBucketCors":{
       "name":"PutBucketCors",
@@ -711,7 +711,7 @@
       },
       "input":{"shape":"PutBucketCorsRequest"},
       "documentationUrl":"http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTBucketPUTcors.html",
-      "documentation":"<p>Sets the CORS configuration for a bucket.</p>"
+      "documentation":"<p>Sets the <code>cors</code> configuration for your bucket. If the configuration exists, Amazon S3 replaces it.</p> <p>To use this operation, you must be allowed to perform the <code>s3:PutBucketCORS</code> action. By default, the bucket owner has this permission and can grant it to others.</p> <p>You set this configuration on a bucket so that the bucket can service cross-origin requests. For example, you might want to enable a request whose origin is <code>http://www.example.com</code> to access your Amazon S3 bucket at <code>my.example.bucket.com</code> by using the browser's <code>XMLHttpRequest</code> capability.</p> <p>To enable cross-origin resource sharing (CORS) on a bucket, you add the <code>cors</code> subresource to the bucket. The <code>cors</code> subresource is an XML document in which you configure rules that identify origins and the HTTP methods that can be executed on your bucket. The document is limited to 64 KB in size. </p> <p>When Amazon S3 receives a cross-origin request (or a pre-flight OPTIONS request) against a bucket, it evaluates the <code>cors</code> configuration on the bucket and uses the first <code>CORSRule</code> rule that matches the incoming browser request to enable a cross-origin request. For a rule to match, the following conditions must be met:</p> <ul> <li> <p>The request's <code>Origin</code> header must match <code>AllowedOrigin</code> elements.</p> </li> <li> <p>The request method (for example, GET, PUT, HEAD, and so on) or the <code>Access-Control-Request-Method</code> header in case of a pre-flight <code>OPTIONS</code> request must be one of the <code>AllowedMethod</code> elements. </p> </li> <li> <p>Every header specified in the <code>Access-Control-Request-Headers</code> request header of a pre-flight request must match an <code>AllowedHeader</code> element. </p> </li> </ul> <p> For more information about CORS, go to <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/cors.html\">Enabling Cross-Origin Resource Sharing</a> in the <i>Amazon Simple Storage Service Developer Guide</i>.</p> <p class=\"title\"> <b>Related Resources</b> </p> <ul> <li> <p> <a>GetBucketCors</a> </p> </li> <li> <p> <a>DeleteBucketCors</a> </p> </li> <li> <p> <a>RESTOPTIONSobject</a> </p> </li> </ul>"
     },
     "PutBucketEncryption":{
       "name":"PutBucketEncryption",
@@ -720,7 +720,7 @@
         "requestUri":"/{Bucket}?encryption"
       },
       "input":{"shape":"PutBucketEncryptionRequest"},
-      "documentation":"<p>Creates a new server-side encryption configuration (or replaces an existing one, if present).</p>"
+      "documentation":"<p>This implementation of the <code>PUT</code> operation uses the <code>encryption</code> subresource to set the default encryption state of an existing bucket.</p> <p>This implementation of the <code>PUT</code> operation sets default encryption for a bucket using server-side encryption with Amazon S3-managed keys SSE-S3 or AWS KMS customer master keys (CMKs) (SSE-KMS).</p> <important> <p>This operation requires AWS Signature Version 4. For more information, see <a href=\"sig-v4-authenticating-requests.html\"> Authenticating Requests (AWS Signature Version 4)</a>. </p> </important> <p>To use this operation, you must have permissions to perform the <code>s3:PutEncryptionConfiguration</code> action. The bucket owner has this permission by default. The bucket owner can grant this permission to others. For more information about permissions, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/using-with-s3-actions.html#using-with-s3-actions-related-to-bucket-subresources\">Permissions Related to Bucket Subresource Operations</a> and <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/s3-access-control.html\">Managing Access Permissions to Your Amazon S3 Resources</a> in the Amazon Simple Storage Service Developer Guide. </p> <p class=\"title\"> <b>Related Resources</b> </p> <ul> <li> <p> <a>GetBucketEncryption</a> </p> </li> <li> <p> <a>DeleteBucketEncryption</a> </p> </li> </ul>"
     },
     "PutBucketInventoryConfiguration":{
       "name":"PutBucketInventoryConfiguration",
@@ -729,7 +729,7 @@
         "requestUri":"/{Bucket}?inventory"
       },
       "input":{"shape":"PutBucketInventoryConfigurationRequest"},
-      "documentation":"<p>Adds an inventory configuration (identified by the inventory ID) from the bucket.</p>"
+      "documentation":"<p>This implementation of the <code>PUT</code> operation adds an inventory configuration (identified by the inventory ID) to the bucket. You can have up to 1,000 inventory configurations per bucket. </p> <p>Amazon S3 inventory generates inventories of the objects in the bucket on a daily or weekly basis, and the results are published to a flat file. The bucket that is inventoried is called the <i>source</i> bucket, and the bucket where the inventory flat file is stored is called the <i>destination</i> bucket. The <i>destination</i> bucket must be in the same AWS Region as the <i>source</i> bucket. </p> <p>When you configure an inventory for a <i>source</i> bucket, you specify the <i>destination</i> bucket where you want the inventory to be stored, and whether to generate the inventory daily or weekly. You can also configure what object metadata to include and whether to inventory all object versions or only current versions. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev//storage-inventory.html\">Amazon S3 Inventory</a> in the Amazon Simple Storage Service Developer Guide.</p> <important> <p>You must create a bucket policy on the <i>destination</i> bucket to grant permissions to Amazon S3 to write objects to the bucket in the defined location. For an example policy, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/example-bucket-policies.html#example-bucket-policies-use-case-9\"> Granting Permissions for Amazon S3 Inventory and Storage Class Analysis.</a> </p> </important> <p>To use this operation, you must have permissions to perform the <code>s3:PutInventoryConfiguration</code> action. The bucket owner has this permission by default and can grant this permission to others. For more information about permissions, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev//using-with-s3-actions.html#using-with-s3-actions-related-to-bucket-subresources\">Permissions Related to Bucket Subresource Operations</a> and <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev//s3-access-control.html\">Managing Access Permissions to Your Amazon S3 Resources</a> in the Amazon Simple Storage Service Developer Guide.</p> <p class=\"title\"> <b>Special Errors</b> </p> <ul> <li> <p class=\"title\"> <b>HTTP 400 Bad Request Error</b> </p> <ul> <li> <p> <i>Code:</i> InvalidArgument</p> </li> <li> <p> <i>Cause:</i> Invalid Argument</p> </li> </ul> </li> <li> <p class=\"title\"> <b>HTTP 400 Bad Request Error</b> </p> <ul> <li> <p> <i>Code:</i> TooManyConfigurations</p> </li> <li> <p> <i>Cause:</i> You are attempting to create a new configuration but have already reached the 1,000-configuration limit. </p> </li> </ul> </li> <li> <p class=\"title\"> <b>HTTP 403 Forbidden Error</b> </p> <ul> <li> <p> <i>Code:</i> AccessDenied</p> </li> <li> <p> <i>Cause:</i> You are not the owner of the specified bucket, or you do not have the <code>s3:PutInventoryConfiguration</code> bucket permission to set the configuration on the bucket </p> </li> </ul> </li> </ul> <p class=\"title\"> <b>Related Resources</b> </p> <ul> <li> <p> <a>GetBucketInventoryConfiguration</a> </p> </li> <li> <p> <a>DeleteBucketInventoryConfiguration</a> </p> </li> <li> <p> <a>ListBucketInventoryConfigurations</a> </p> </li> </ul>"
     },
     "PutBucketLifecycle":{
       "name":"PutBucketLifecycle",
@@ -739,7 +739,7 @@
       },
       "input":{"shape":"PutBucketLifecycleRequest"},
       "documentationUrl":"http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTBucketPUTlifecycle.html",
-      "documentation":"<p> No longer used, see the PutBucketLifecycleConfiguration operation.</p>",
+      "documentation":"<important> <p>For an updated version of this API, see <a>PutBucketLifecycleConfiguration</a>. This version has been deprecated. Existing lifecycle configurations will work. For new lifecycle configurations, use the updated API. </p> </important> <p>Creates a new lifecycle configuration for the bucket or replaces an existing lifecycle configuration. For information about lifecycle configuration, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev//object-lifecycle-mgmt.html\">Object Lifecycle Management</a> in the <i>Amazon Simple Storage Service Developer Guide</i>. </p> <p>By default, all Amazon S3 resources, including buckets, objects, and related subresources (for example, lifecycle configuration and website configuration) are private. Only the resource owner, the AWS account that created the resource, can access it. The resource owner can optionally grant access permissions to others by writing an access policy. For this operation, users must get the <code>s3:PutLifecycleConfiguration</code> permission.</p> <p>You can also explicitly deny permissions. Explicit denial also supersedes any other permissions. If you want to prevent users or accounts from removing or deleting objects from your bucket, you must deny them permissions for the following actions: </p> <ul> <li> <p> <code>s3:DeleteObject</code> </p> </li> <li> <p> <code>s3:DeleteObjectVersion</code> </p> </li> <li> <p> <code>s3:PutLifecycleConfiguration</code> </p> </li> </ul> <p>For more information about permissions, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev//s3-access-control.html\">Managing Access Permissions to your Amazon S3 Resources</a> in the <i>Amazon Simple Storage Service Developer Guide</i>.</p> <p>For more examples of transitioning objects to storage classes such as STANDARD_IA or ONEZONE_IA, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev//intro-lifecycle-rules.html#lifecycle-configuration-examples\">Examples of Lifecycle Configuration</a>.</p> <p class=\"title\"> <b>Related Resources</b> </p> <ul> <li> <p> <a>GetBucketLifecycle</a>(Deprecated)</p> </li> <li> <p> <a>GetBucketLifecycleConfiguration</a> </p> </li> <li> <p> </p> </li> <li> <p>By default, a resource owner—in this case, a bucket owner, which is the AWS account that created the bucket—can perform any of the operations. A resource owner can also grant others permission to perform the operation. For more information, see the following topics in the Amazon Simple Storage Service Developer Guide: </p> <ul> <li> <p> <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev//using-with-s3-actions.html\">Specifying Permissions in a Policy</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev//s3-access-control.html\">Managing Access Permissions to your Amazon S3 Resources</a> </p> </li> </ul> </li> </ul>",
       "deprecated":true
     },
     "PutBucketLifecycleConfiguration":{
@@ -749,7 +749,7 @@
         "requestUri":"/{Bucket}?lifecycle"
       },
       "input":{"shape":"PutBucketLifecycleConfigurationRequest"},
-      "documentation":"<p>Sets lifecycle configuration for your bucket. If a lifecycle configuration exists, it replaces it.</p>"
+      "documentation":"<p>Creates a new lifecycle configuration for the bucket or replaces an existing lifecycle configuration. For information about lifecycle configuration, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/s3-access-control.html\">Managing Access Permissions to Your Amazon S3 Resources</a>.</p> <note> <p>Bucket lifecycle configuration now supports specifying a lifecycle rule using an object key name prefix, one or more object tags, or a combination of both. Accordingly, this section describes the latest API. The previous version of the API supported filtering based only on an object key name prefix, which is supported for backward compatibility. For the related API description, see <a>PutBucketLifecycle</a>.</p> </note> <p> <b>Rules</b> </p> <p>You specify the lifecycle configuration in your request body. The lifecycle configuration is specified as XML consisting of one or more rules. Each rule consists of the following:</p> <ul> <li> <p>Filter identifying a subset of objects to which the rule applies. The filter can be based on a key name prefix, object tags, or a combination of both.</p> </li> <li> <p>Status whether the rule is in effect.</p> </li> <li> <p>One or more lifecycle transition and expiration actions that you want Amazon S3 to perform on the objects identified by the filter. If the state of your bucket is versioning-enabled or versioning-suspended, you can have many versions of the same object (one current version and zero or more noncurrent versions). Amazon S3 provides predefined actions that you can specify for current and noncurrent object versions.</p> </li> </ul> <p>For more information, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/object-lifecycle-mgmt.html\">Object Lifecycle Management</a> and <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/intro-lifecycle-rules.html\">Lifecycle Configuration Elements</a>.</p> <p> <b>Permissions</b> </p> <p>By default, all Amazon S3 resources are private, including buckets, objects, and related subresources (for example, lifecycle configuration and website configuration). Only the resource owner (that is, the AWS account that created it) can access the resource. The resource owner can optionally grant access permissions to others by writing an access policy. For this operation, a user must get the s3:PutLifecycleConfiguration permission.</p> <p>You can also explicitly deny permissions. Explicit deny also supersedes any other permissions. If you want to block users or accounts from removing or deleting objects from your bucket, you must deny them permissions for the following actions:</p> <ul> <li> <p>s3:DeleteObject</p> </li> <li> <p>s3:DeleteObjectVersion</p> </li> <li> <p>s3:PutLifecycleConfiguration</p> </li> </ul> <p>For more information about permissions, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/s3-access-control.html\">Managing Access Permissions to Your Amazon S3 Resources</a>.</p> <p>The following are related to <code>PutBucketLifecycleConfiguration</code>:</p> <ul> <li> <p> <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/lifecycle-configuration-examples.html\">Examples of Lifecycle Configuration</a> </p> </li> <li> <p> <a>GetBucketLifecycleConfiguration</a> </p> </li> <li> <p> <a>DeleteBucketLifecycle</a> </p> </li> </ul>"
     },
     "PutBucketLogging":{
       "name":"PutBucketLogging",
@@ -759,7 +759,7 @@
       },
       "input":{"shape":"PutBucketLoggingRequest"},
       "documentationUrl":"http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTBucketPUTlogging.html",
-      "documentation":"<p>Set the logging parameters for a bucket and to specify permissions for who can view and modify the logging parameters. To set the logging status of a bucket, you must be the bucket owner.</p>"
+      "documentation":"<p>Set the logging parameters for a bucket and to specify permissions for who can view and modify the logging parameters. All logs are saved to buckets in the same AWS Region as the source bucket. To set the logging status of a bucket, you must be the bucket owner.</p> <p>The bucket owner is automatically granted FULL_CONTROL to all logs. You use the <code>Grantee</code> request element to grant access to other people. The <code>Permissions</code> request element specifies the kind of access the grantee has to the logs.</p> <p> <b>Grantee Values</b> </p> <p>You can specify the person (grantee) to whom you're assigning access rights (using request elements) in the following ways:</p> <ul> <li> <p>By the person's ID:</p> <p> <code>&lt;Grantee xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:type=\"CanonicalUser\"&gt;&lt;ID&gt;&lt;&gt;ID&lt;&gt;&lt;/ID&gt;&lt;DisplayName&gt;&lt;&gt;GranteesEmail&lt;&gt;&lt;/DisplayName&gt; &lt;/Grantee&gt;</code> </p> <p>DisplayName is optional and ignored in the request.</p> </li> <li> <p>By Email address:</p> <p> <code> &lt;Grantee xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:type=\"AmazonCustomerByEmail\"&gt;&lt;EmailAddress&gt;&lt;&gt;Grantees@email.com&lt;&gt;&lt;/EmailAddress&gt;&lt;/Grantee&gt;</code> </p> <p>The grantee is resolved to the CanonicalUser and, in a response to a GET Object acl request, appears as the CanonicalUser.</p> </li> <li> <p>By URI:</p> <p> <code>&lt;Grantee xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:type=\"Group\"&gt;&lt;URI&gt;&lt;&gt;http://acs.amazonaws.com/groups/global/AuthenticatedUsers&lt;&gt;&lt;/URI&gt;&lt;/Grantee&gt;</code> </p> </li> </ul> <p>To enable logging, you use LoggingEnabled and its children request elements. To disable logging, you use an empty BucketLoggingStatus request element:</p> <p> <code>&lt;BucketLoggingStatus xmlns=\"http://doc.s3.amazonaws.com/2006-03-01\" /&gt;</code> </p> <p>For more information about server access logging, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/ServerLogs.html\">Server Access Logging</a>. </p> <p>For more information about creating a bucket, see <a>CreateBucket</a>. For more information about returning the logging status of a bucket, see <a>GetBucketLogging</a>.</p> <p>The following operations are related to <code>PutBucketLogging</code>:</p> <ul> <li> <p> <a>PutObject</a> </p> </li> <li> <p> <a>DeleteBucket</a> </p> </li> <li> <p> <a>CreateBucket</a> </p> </li> <li> <p> <a>GetBucketLogging</a> </p> </li> </ul>"
     },
     "PutBucketMetricsConfiguration":{
       "name":"PutBucketMetricsConfiguration",
@@ -768,7 +768,7 @@
         "requestUri":"/{Bucket}?metrics"
       },
       "input":{"shape":"PutBucketMetricsConfigurationRequest"},
-      "documentation":"<p>Sets a metrics configuration (specified by the metrics configuration ID) for the bucket.</p>"
+      "documentation":"<p>Sets a metrics configuration (specified by the metrics configuration ID) for the bucket. You can have up to 1,000 metrics configurations per bucket. If you're updating an existing metrics configuration, note that this is a full replacement of the existing metrics configuration. If you don't include the elements you want to keep, they are erased.</p> <p>To use this operation, you must have permissions to perform the <code>s3:PutMetricsConfiguration</code> action. The bucket owner has this permission by default. The bucket owner can grant this permission to others. For more information about permissions, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/using-with-s3-actions.html#using-with-s3-actions-related-to-bucket-subresources\">Permissions Related to Bucket Subresource Operations</a> and <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/s3-access-control.html\">Managing Access Permissions to Your Amazon S3 Resources</a>.</p> <p>For information about CloudWatch request metrics for Amazon S3, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/cloudwatch-monitoring.html\">Monitoring Metrics with Amazon CloudWatch</a>.</p> <p>The following operations are related to <code>PutBucketMetricsConfiguration</code>:</p> <ul> <li> <p> <a>DeleteBucketMetricsConfiguration</a> </p> </li> <li> <p> <a>PutBucketMetricsConfiguration</a> </p> </li> <li> <p> <a>ListBucketMetricsConfigurations</a> </p> </li> </ul> <p> <code>GetBucketLifecycle</code> has the following special error:</p> <ul> <li> <p>Error code: <code>TooManyConfigurations</code> </p> <ul> <li> <p>Description: You are attempting to create a new configuration but have already reached the 1,000-configuration limit.</p> </li> <li> <p>HTTP Status Code: HTTP 400 Bad Request</p> </li> </ul> </li> </ul>"
     },
     "PutBucketNotification":{
       "name":"PutBucketNotification",
@@ -778,7 +778,7 @@
       },
       "input":{"shape":"PutBucketNotificationRequest"},
       "documentationUrl":"http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTBucketPUTnotification.html",
-      "documentation":"<p> No longer used, see the PutBucketNotificationConfiguration operation.</p>",
+      "documentation":"<p> No longer used, see the <a>PutBucketNotificationConfiguration</a> operation.</p>",
       "deprecated":true
     },
     "PutBucketNotificationConfiguration":{
@@ -788,7 +788,7 @@
         "requestUri":"/{Bucket}?notification"
       },
       "input":{"shape":"PutBucketNotificationConfigurationRequest"},
-      "documentation":"<p>Enables notifications of specified events for a bucket.</p>"
+      "documentation":"<p>Enables notifications of specified events for a bucket. For more information about event notifications, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/NotificationHowTo.html\">Configuring Event Notifications</a>.</p> <p>Using this API, you can replace an existing notification configuration. The configuration is an XML file that defines the event types that you want Amazon S3 to publish and the destination where you want Amazon S3 to publish an event notification when it detects an event of the specified type.</p> <p>By default, your bucket has no event notifications configured. That is, the notification configuration will be an empty <code>NotificationConfiguration</code>.</p> <p> <code>&lt;NotificationConfiguration&gt;</code> </p> <p> <code>&lt;/NotificationConfiguration&gt;</code> </p> <p>This operation replaces the existing notification configuration with the configuration you include in the request body.</p> <p>After Amazon S3 receives this request, it first verifies that any Amazon Simple Notification Service (Amazon SNS) or Amazon Simple Queue Service (Amazon SQS) destination exists, and that the bucket owner has permission to publish to it by sending a test notification. In the case of AWS Lambda destinations, Amazon S3 verifies that the Lambda function permissions grant Amazon S3 permission to invoke the function from the Amazon S3 bucket. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/NotificationHowTo.html\">Configuring Notifications for Amazon S3 Events</a>.</p> <p>You can disable notifications by adding the empty NotificationConfiguration element.</p> <p>By default, only the bucket owner can configure notifications on a bucket. However, bucket owners can use a bucket policy to grant permission to other users to set this configuration with <code>s3:PutBucketNotification</code> permission.</p> <note> <p>The PUT notification is an atomic operation. For example, suppose your notification configuration includes SNS topic, SQS queue, and Lambda function configurations. When you send a PUT request with this configuration, Amazon S3 sends test messages to your SNS topic. If the message fails, the entire PUT operation will fail, and Amazon S3 will not add the configuration to your bucket.</p> </note> <p> <b>Responses</b> </p> <p>If the configuration in the request body includes only one <code>TopicConfiguration</code> specifying only the <code>s3:ReducedRedundancyLostObject</code> event type, the response will also include the <code>x-amz-sns-test-message-id</code> header containing the message ID of the test notification sent to the topic.</p> <p>The following operation is related to <code>PutBucketNotificationConfiguration</code>:</p> <ul> <li> <p> <a>GetBucketNotificationConfiguration</a> </p> </li> </ul>"
     },
     "PutBucketPolicy":{
       "name":"PutBucketPolicy",
@@ -798,7 +798,7 @@
       },
       "input":{"shape":"PutBucketPolicyRequest"},
       "documentationUrl":"http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTBucketPUTpolicy.html",
-      "documentation":"<p>Applies an Amazon S3 bucket policy to an Amazon S3 bucket.</p>"
+      "documentation":"<p>Applies an Amazon S3 bucket policy to an Amazon S3 bucket. If you are using an identity other than the root user of the AWS account that owns the bucket, the calling identity must have the <code>PutBucketPolicy</code> permissions on the specified bucket and belong to the bucket owner's account in order to use this operation.</p> <p>If you don't have <code>PutBucketPolic</code>y permissions, Amazon S3 returns a <code>403 Access Denied</code> error. If you have the correct permissions, but you're not using an identity that belongs to the bucket owner's account, Amazon S3 returns a <code>405 Method Not Allowed</code> error.</p> <important> <p> As a security precaution, the root user of the AWS account that owns a bucket can always use this operation, even if the policy explicitly denies the root user the ability to perform this action. </p> </important> <p>For more information about bucket policies, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/using-iam-policies.html\">Using Bucket Policies and User Policies</a>.</p> <p>The following operations are related to <code>PutBucketPolicy</code>:</p> <ul> <li> <p> <a>CreateBucket</a> </p> </li> <li> <p> <a>DeleteBucket</a> </p> </li> </ul>"
     },
     "PutBucketReplication":{
       "name":"PutBucketReplication",
@@ -807,7 +807,7 @@
         "requestUri":"/{Bucket}?replication"
       },
       "input":{"shape":"PutBucketReplicationRequest"},
-      "documentation":"<p> Creates a replication configuration or replaces an existing one. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/crr.html\">Cross-Region Replication (CRR)</a> in the <i>Amazon S3 Developer Guide</i>. </p>"
+      "documentation":"<p> Creates a replication configuration or replaces an existing one. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/replication.html\">Replication</a> in the <i>Amazon S3 Developer Guide</i>. </p> <note> <p>To perform this operation, the user or role performing the operation must have the <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use_passrole.html\">iam:PassRole</a> permission.</p> </note> <p>Specify the replication configuration in the request body. In the replication configuration, you provide the name of the destination bucket where you want Amazon S3 to replicate objects, the IAM role that Amazon S3 can assume to replicate objects on your behalf, and other relevant information.</p> <p>A replication configuration must include at least one rule, and can contain a maximum of 1,000. Each rule identifies a subset of objects to replicate by filtering the objects in the source bucket. To choose additional subsets of objects to replicate, add a rule for each subset. All rules must specify the same destination bucket.</p> <p>To specify a subset of the objects in the source bucket to apply a replication rule to, add the Filter element as a child of the Rule element. You can filter objects based on an object key prefix, one or more object tags, or both. When you add the Filter element in the configuration, you must also add the following elements: <code>DeleteMarkerReplication</code>, <code>Status</code>, and <code>Priority</code>.</p> <p>For information about enabling versioning on a bucket, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/Versioning.html\">Using Versioning</a>.</p> <p>By default, a resource owner, in this case the AWS account that created the bucket, can perform this operation. The resource owner can also grant others permissions to perform the operation. For more information about permissions, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/using-with-s3-actions.html\">Specifying Permissions in a Policy</a> and <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/s3-access-control.html\">Managing Access Permissions to Your Amazon S3 Resources</a>.</p> <p> <b>Handling Replication of Encrypted Objects</b> </p> <p>By default, Amazon S3 doesn't replicate objects that are stored at rest using server-side encryption with CMKs stored in AWS KMS. To replicate AWS KMS-encrypted objects, add the following: <code>SourceSelectionCriteria</code>, <code>SseKmsEncryptedObjects</code>, <code>Status</code>, <code>EncryptionConfiguration</code>, and <code>ReplicaKmsKeyID</code>. For information about replication configuration, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/replication-config-for-kms-objects.html\">Replicating Objects Created with SSE Using CMKs stored in AWS KMS</a>.</p> <p>For information on <code>PutBucketReplication</code> errors, see <a>ReplicationErrorCodeList</a> </p> <p>The following operations are related to <code>PutBucketReplication</code>:</p> <ul> <li> <p> <a>GetBucketReplication</a> </p> </li> <li> <p> <a>DeleteBucketReplication</a> </p> </li> </ul>"
     },
     "PutBucketRequestPayment":{
       "name":"PutBucketRequestPayment",
@@ -817,7 +817,7 @@
       },
       "input":{"shape":"PutBucketRequestPaymentRequest"},
       "documentationUrl":"http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTrequestPaymentPUT.html",
-      "documentation":"<p>Sets the request payment configuration for a bucket. By default, the bucket owner pays for downloads from the bucket. This configuration parameter enables the bucket owner (only) to specify that the person requesting the download will be charged for the download. Documentation on requester pays buckets can be found at http://docs.aws.amazon.com/AmazonS3/latest/dev/RequesterPaysBuckets.html</p>"
+      "documentation":"<p>Sets the request payment configuration for a bucket. By default, the bucket owner pays for downloads from the bucket. This configuration parameter enables the bucket owner (only) to specify that the person requesting the download will be charged for the download. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/RequesterPaysBuckets.html\">Requester Pays Buckets</a>.</p> <p>The following operations are related to <code>PutBucketRequestPayment</code>:</p> <ul> <li> <p> <a>CreateBucket</a> </p> </li> <li> <p> <a>GetBucketRequestPayment</a> </p> </li> </ul>"
     },
     "PutBucketTagging":{
       "name":"PutBucketTagging",
@@ -827,7 +827,7 @@
       },
       "input":{"shape":"PutBucketTaggingRequest"},
       "documentationUrl":"http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTBucketPUTtagging.html",
-      "documentation":"<p>Sets the tags for a bucket.</p>"
+      "documentation":"<p>Sets the tags for a bucket.</p> <p>Use tags to organize your AWS bill to reflect your own cost structure. To do this, sign up to get your AWS account bill with tag key values included. Then, to see the cost of combined resources, organize your billing information according to resources with the same tag key values. For example, you can tag several resources with a specific application name, and then organize your billing information to see the total cost of that application across several services. For more information, see <a href=\"https://docs.aws.amazon.com/awsaccountbilling/latest/aboutv2/cost-alloc-tags.html\">Cost Allocation and Tagging</a>.</p> <note> <p>Within a bucket, if you add a tag that has the same key as an existing tag, the new value overwrites the old value. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/CostAllocTagging.html\">Using Cost Allocation in Amazon S3 Bucket Tags</a>.</p> </note> <p>To use this operation, you must have permissions to perform the <code>s3:PutBucketTagging</code> action. The bucket owner has this permission by default and can grant this permission to others. For more information about permissions, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/using-with-s3-actions.html#using-with-s3-actions-related-to-bucket-subresources\">Permissions Related to Bucket Subresource Operations</a> and <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/s3-access-control.html\">Managing Access Permissions to Your Amazon S3 Resources</a>.</p> <p> <code>PutBucketTagging</code> has the following special errors:</p> <ul> <li> <p>Error code: <code>InvalidTagError</code> </p> <ul> <li> <p>Description: The tag provided was not a valid tag. This error can occur if the tag did not pass input validation. For information about tag restrictions, see <a href=\"https://docs.aws.amazon.com/awsaccountbilling/latest/aboutv2//allocation-tag-restrictions.html\">User-Defined Tag Restrictions</a> and <a href=\"https://docs.aws.amazon.com/awsaccountbilling/latest/aboutv2//aws-tag-restrictions.html\">AWS-Generated Cost Allocation Tag Restrictions</a>.</p> </li> </ul> </li> <li> <p>Error code: <code>MalformedXMLError</code> </p> <ul> <li> <p>Description: The XML provided does not match the schema.</p> </li> </ul> </li> <li> <p>Error code: <code>OperationAbortedError </code> </p> <ul> <li> <p>Description: A conflicting conditional operation is currently in progress against this resource. Please try again.</p> </li> </ul> </li> <li> <p>Error code: <code>InternalError</code> </p> <ul> <li> <p>Description: The service was unable to apply the provided tag to the bucket.</p> </li> </ul> </li> </ul> <p>The following operations are related to <code>PutBucketTagging</code>:</p> <ul> <li> <p> <a>GetBucketTagging</a> </p> </li> <li> <p> <a>DeleteBucketTagging</a> </p> </li> </ul>"
     },
     "PutBucketVersioning":{
       "name":"PutBucketVersioning",
@@ -837,7 +837,7 @@
       },
       "input":{"shape":"PutBucketVersioningRequest"},
       "documentationUrl":"http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTBucketPUTVersioningStatus.html",
-      "documentation":"<p>Sets the versioning state of an existing bucket. To set the versioning state, you must be the bucket owner.</p>"
+      "documentation":"<p>Sets the versioning state of an existing bucket. To set the versioning state, you must be the bucket owner.</p> <p>You can set the versioning state with one of the following values:</p> <p> <b>Enabled</b>—Enables versioning for the objects in the bucket. All objects added to the bucket receive a unique version ID.</p> <p> <b>Suspended</b>—Disables versioning for the objects in the bucket. All objects added to the bucket receive the version ID null.</p> <p>If the versioning state has never been set on a bucket, it has no versioning state; a <a>GetBucketVersioning</a> request does not return a versioning state value.</p> <p>If the bucket owner enables MFA Delete in the bucket versioning configuration, the bucket owner must include the <code>x-amz-mfa request</code> header and the <code>Status</code> and the <code>MfaDelete</code> request elements in a request to set the versioning state of the bucket.</p> <important> <p>If you have an object expiration lifecycle policy in your non-versioned bucket and you want to maintain the same permanent delete behavior when you enable versioning, you must add a noncurrent expiration policy. The noncurrent expiration lifecycle policy will manage the deletes of the noncurrent object versions in the version-enabled bucket. (A version-enabled bucket maintains one current and zero or more noncurrent object versions.) For more information, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/object-lifecycle-mgmt.html#lifecycle-and-other-bucket-config\">Lifecycle and Versioning</a>.</p> </important> <p class=\"title\"> <b>Related Resources</b> </p> <ul> <li> <p> <a>CreateBucket</a> </p> </li> <li> <p> <a>DeleteBucket</a> </p> </li> <li> <p> <a>GetBucketVersioning</a> </p> </li> </ul>"
     },
     "PutBucketWebsite":{
       "name":"PutBucketWebsite",
@@ -847,7 +847,7 @@
       },
       "input":{"shape":"PutBucketWebsiteRequest"},
       "documentationUrl":"http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTBucketPUTwebsite.html",
-      "documentation":"<p>Set the website configuration for a bucket.</p>"
+      "documentation":"<p>Sets the configuration of the website that is specified in the <code>website</code> subresource. To configure a bucket as a website, you can add this subresource on the bucket with website configuration information such as the file name of the index document and any redirect rules. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/WebsiteHosting.html\">Hosting Websites on Amazon S3</a>.</p> <p>This PUT operation requires the <code>S3:PutBucketWebsite</code> permission. By default, only the bucket owner can configure the website attached to a bucket; however, bucket owners can allow other users to set the website configuration by writing a bucket policy that grants them the <code>S3:PutBucketWebsite</code> permission.</p> <p>To redirect all website requests sent to the bucket's website endpoint, you add a website configuration with the following elements. Because all requests are sent to another website, you don't need to provide index document name for the bucket.</p> <ul> <li> <p> <code>WebsiteConfiguration</code> </p> </li> <li> <p> <code>RedirectAllRequestsTo</code> </p> </li> <li> <p> <code>HostName</code> </p> </li> <li> <p> <code>Protocol</code> </p> </li> </ul> <p>If you want granular control over redirects, you can use the following elements to add routing rules that describe conditions for redirecting requests and information about the redirect destination. In this case, the website configuration must provide an index document for the bucket, because some requests might not be redirected. </p> <ul> <li> <p> <code>WebsiteConfiguration</code> </p> </li> <li> <p> <code>IndexDocument</code> </p> </li> <li> <p> <code>Suffix</code> </p> </li> <li> <p> <code>ErrorDocument</code> </p> </li> <li> <p> <code>Key</code> </p> </li> <li> <p> <code>RoutingRules</code> </p> </li> <li> <p> <code>RoutingRule</code> </p> </li> <li> <p> <code>Condition</code> </p> </li> <li> <p> <code>HttpErrorCodeReturnedEquals</code> </p> </li> <li> <p> <code>KeyPrefixEquals</code> </p> </li> <li> <p> <code>Redirect</code> </p> </li> <li> <p> <code>Protocol</code> </p> </li> <li> <p> <code>HostName</code> </p> </li> <li> <p> <code>ReplaceKeyPrefixWith</code> </p> </li> <li> <p> <code>ReplaceKeyWith</code> </p> </li> <li> <p> <code>HttpRedirectCode</code> </p> </li> </ul>"
     },
     "PutObject":{
       "name":"PutObject",
@@ -858,7 +858,7 @@
       "input":{"shape":"PutObjectRequest"},
       "output":{"shape":"PutObjectOutput"},
       "documentationUrl":"http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTObjectPUT.html",
-      "documentation":"<p>Adds an object to a bucket.</p>"
+      "documentation":"<p>Adds an object to a bucket. You must have WRITE permissions on a bucket to add an object to it.</p> <p>Amazon S3 never adds partial objects; if you receive a success response, Amazon S3 added the entire object to the bucket.</p> <p>Amazon S3 is a distributed system. If it receives multiple write requests for the same object simultaneously, it overwrites all but the last object written. Amazon S3 does not provide object locking; if you need this, make sure to build it into your application layer or use versioning instead.</p> <p>To ensure that data is not corrupted traversing the network, use the <code>Content-MD5</code> header. When you use this header, Amazon S3 checks the object against the provided MD5 value and, if they do not match, returns an error. Additionally, you can calculate the MD5 while putting an object to Amazon S3 and compare the returned ETag to the calculated MD5 value.</p> <note> <p>To configure your application to send the request headers before sending the request body, use the <code>100-continue</code> HTTP status code. For PUT operations, this helps you avoid sending the message body if the message is rejected based on the headers (for example, because authentication fails or a redirect occurs). For more information on the <code>100-continue</code> HTTP status code, see Section 8.2.3 of <a href=\"http://www.ietf.org/rfc/rfc2616.txt\">http://www.ietf.org/rfc/rfc2616.txt</a>.</p> </note> <p>You can optionally request server-side encryption. With server-side encryption, Amazon S3 encrypts your data as it writes it to disks in its data centers and decrypts the data when you access it. You have the option to provide your own encryption key or use AWS managed encryption keys. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/UsingServerSideEncryption.html\">Using Server-Side Encryption</a>.</p> <dl> <dt>Access Permissions</dt> <dd> <p>You can optionally specify the accounts or groups that should be granted specific permissions on the new object. There are two ways to grant the permissions using the request headers:</p> <ul> <li> <p>Specify a canned ACL with the <code>x-amz-acl</code> request header. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/acl-overview.html#CannedACL\">Canned ACL</a>.</p> </li> <li> <p>Specify access permissions explicitly with the <code>x-amz-grant-read</code>, <code>x-amz-grant-read-acp</code>, <code>x-amz-grant-write-acp</code>, and <code>x-amz-grant-full-control</code> headers. These parameters map to the set of permissions that Amazon S3 supports in an ACL. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/acl-overview.html\">Access Control List (ACL) Overview</a>.</p> </li> </ul> <p>You can use either a canned ACL or specify access permissions explicitly. You cannot do both.</p> </dd> <dt>Server-Side- Encryption-Specific Request Headers</dt> <dd> <p>You can optionally tell Amazon S3 to encrypt data at rest using server-side encryption. Server-side encryption is for data encryption at rest. Amazon S3 encrypts your data as it writes it to disks in its data centers and decrypts it when you access it. The option you use depends on whether you want to use AWS managed encryption keys or provide your own encryption key. </p> <ul> <li> <p>Use encryption keys managed by Amazon S3 or customer master keys (CMKs) stored in AWS Key Management Service (AWS KMS) – If you want AWS to manage the keys used to encrypt data, specify the following headers in the request.</p> <ul> <li> <p>x-amz-server-side​-encryption</p> </li> <li> <p>x-amz-server-side-encryption-aws-kms-key-id</p> </li> <li> <p>x-amz-server-side-encryption-context</p> </li> </ul> <note> <p>If you specify <code>x-amz-server-side-encryption:aws:kms</code>, but don't provide <code>x-amz-server-side-encryption-aws-kms-key-id</code>, Amazon S3 uses the AWS managed CMK in AWS KMS to protect the data. If you want to use a customer managed AWS KMS CMK, you must provide the <code>x-amz-server-side-encryption-aws-kms-key-id</code> of the symmetric customer managed CMK. Amazon S3 only supports symmetric CMKs and not asymmetric CMKs. For more information, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/symmetric-asymmetric.html\">Using Symmetric and Asymmetric Keys</a> in the <i>AWS Key Management Service Developer Guide</i>.</p> </note> <important> <p>All GET and PUT requests for an object protected by AWS KMS fail if you don't make them with SSL or by using SigV4.</p> </important> <p>For more information about server-side encryption with CMKs stored in AWS KMS (SSE-KMS), see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/UsingKMSEncryption.html\">Protecting Data Using Server-Side Encryption with CMKs stored in AWS</a>.</p> </li> <li> <p>Use customer-provided encryption keys – If you want to manage your own encryption keys, provide all the following headers in the request.</p> <ul> <li> <p>x-amz-server-side​-encryption​-customer-algorithm</p> </li> <li> <p>x-amz-server-side​-encryption​-customer-key</p> </li> <li> <p>x-amz-server-side​-encryption​-customer-key-MD5</p> </li> </ul> <p>For more information about server-side encryption with CMKs stored in KMS (SSE-KMS), see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/UsingKMSEncryption.html\">Protecting Data Using Server-Side Encryption with CMKs stored in AWS</a>.</p> </li> </ul> </dd> <dt>Access-Control-List (ACL)-Specific Request Headers</dt> <dd> <p>You also can use the following access control–related headers with this operation. By default, all objects are private. Only the owner has full access control. When adding a new object, you can grant permissions to individual AWS accounts or to predefined groups defined by Amazon S3. These permissions are then added to the Access Control List (ACL) on the object. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/S3_ACLs_UsingACLs.html\">Using ACLs</a>. With this operation, you can grant access permissions using one of the following two methods:</p> <ul> <li> <p>Specify a canned ACL (<code>x-amz-acl</code>) — Amazon S3 supports a set of predefined ACLs, known as canned ACLs. Each canned ACL has a predefined set of grantees and permissions. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/acl-overview.html#CannedACL\">Canned ACL</a>.</p> </li> <li> <p>Specify access permissions explicitly — To explicitly grant access permissions to specific AWS accounts or groups, use the following headers. Each header maps to specific permissions that Amazon S3 supports in an ACL. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/acl-overview.html\">Access Control List (ACL) Overview</a>. In the header, you specify a list of grantees who get the specific permission. To grant permissions explicitly use:</p> <ul> <li> <p>x-amz-grant-read</p> </li> <li> <p>x-amz-grant-write</p> </li> <li> <p>x-amz-grant-read-acp</p> </li> <li> <p>x-amz-grant-write-acp</p> </li> <li> <p>x-amz-grant-full-control</p> </li> </ul> <p>You specify each grantee as a type=value pair, where the type is one of the following:</p> <ul> <li> <p> <code>emailAddress</code> – if the value specified is the email address of an AWS account</p> <important> <p>Using email addresses to specify a grantee is only supported in the following AWS Regions: </p> <ul> <li> <p>US East (N. Virginia)</p> </li> <li> <p>US West (N. California)</p> </li> <li> <p> US West (Oregon)</p> </li> <li> <p> Asia Pacific (Singapore)</p> </li> <li> <p>Asia Pacific (Sydney)</p> </li> <li> <p>Asia Pacific (Tokyo)</p> </li> <li> <p>EU (Ireland)</p> </li> <li> <p>South America (São Paulo)</p> </li> </ul> <p>For a list of all the Amazon S3 supported Regions and endpoints, see <a href=\"https://docs.aws.amazon.com/general/latest/gr/rande.html#s3_region\">Regions and Endpoints</a> in the AWS General Reference</p> </important> </li> <li> <p> <code>id</code> – if the value specified is the canonical user ID of an AWS account</p> </li> <li> <p> <code>uri</code> – if you are granting permissions to a predefined group</p> </li> </ul> <p>For example, the following <code>x-amz-grant-read</code> header grants the AWS accounts identified by email addresses permissions to read object data and its metadata:</p> <p> <code>x-amz-grant-read: emailAddress=\"xyz@amazon.com\", emailAddress=\"abc@amazon.com\" </code> </p> </li> </ul> </dd> <dt>Server-Side- Encryption-Specific Request Headers</dt> <dd> <p>You can optionally tell Amazon S3 to encrypt data at rest using server-side encryption. Server-side encryption is for data encryption at rest. Amazon S3 encrypts your data as it writes it to disks in its data centers and decrypts it when you access it. The option you use depends on whether you want to use AWS-managed encryption keys or provide your own encryption key. </p> <ul> <li> <p>Use encryption keys managed by Amazon S3 or customer master keys (CMKs) stored in AWS Key Management Service (AWS KMS) – If you want AWS to manage the keys used to encrypt data, specify the following headers in the request.</p> <ul> <li> <p>x-amz-server-side​-encryption</p> </li> <li> <p>x-amz-server-side-encryption-aws-kms-key-id</p> </li> <li> <p>x-amz-server-side-encryption-context</p> </li> </ul> <note> <p>If you specify <code>x-amz-server-side-encryption:aws:kms</code>, but don't provide <code>x-amz-server-side-encryption-aws-kms-key-id</code>, Amazon S3 uses the AWS managed CMK in AWS KMS to protect the data. If you want to use a customer managed AWS KMS CMK, you must provide the <code>x-amz-server-side-encryption-aws-kms-key-id</code> of the symmetric customer managed CMK. Amazon S3 only supports symmetric CMKs and not asymmetric CMKs. For more information, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/symmetric-asymmetric.html\">Using Symmetric and Asymmetric Keys</a> in the <i>AWS Key Management Service Developer Guide</i>.</p> </note> <important> <p>All GET and PUT requests for an object protected by AWS KMS fail if you don't make them with SSL or by using SigV4.</p> </important> <p>For more information about server-side encryption with CMKs stored in AWS KMS (SSE-KMS), see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/UsingKMSEncryption.html\">Protecting Data Using Server-Side Encryption with CMKs stored in AWS KMS</a>.</p> </li> <li> <p>Use customer-provided encryption keys – If you want to manage your own encryption keys, provide all the following headers in the request.</p> <note> <p>If you use this feature, the ETag value that Amazon S3 returns in the response is not the MD5 of the object.</p> </note> <ul> <li> <p>x-amz-server-side​-encryption​-customer-algorithm</p> </li> <li> <p>x-amz-server-side​-encryption​-customer-key</p> </li> <li> <p>x-amz-server-side​-encryption​-customer-key-MD5</p> </li> </ul> <p>For more information about server-side encryption with CMKs stored in AWS KMS (SSE-KMS), see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/UsingKMSEncryption.html\">Protecting Data Using Server-Side Encryption with CMKs stored in AWS KMS</a>.</p> </li> </ul> </dd> </dl> <p> <b>Storage Class Options</b> </p> <p>By default, Amazon S3 uses the Standard storage class to store newly created objects. The Standard storage class provides high durability and high availability. You can specify other storage classes depending on the performance needs. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/storage-class-intro.html\">Storage Classes</a> in the Amazon Simple Storage Service Developer Guide.</p> <p> <b>Versioning</b> </p> <p>If you enable versioning for a bucket, Amazon S3 automatically generates a unique version ID for the object being stored. Amazon S3 returns this ID in the response using the <code>x-amz-version-id response</code> header. If versioning is suspended, Amazon S3 always uses null as the version ID for the object stored. For more information about returning the versioning state of a bucket, see <a>GetBucketVersioning</a>. If you enable versioning for a bucket, when Amazon S3 receives multiple write requests for the same object simultaneously, it stores all of the objects.</p> <p class=\"title\"> <b>Related Resources</b> </p> <ul> <li> <p> <a>CopyObject</a> </p> </li> <li> <p> <a>DeleteObject</a> </p> </li> </ul>"
     },
     "PutObjectAcl":{
       "name":"PutObjectAcl",
@@ -872,7 +872,7 @@
         {"shape":"NoSuchKey"}
       ],
       "documentationUrl":"http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTObjectPUTacl.html",
-      "documentation":"<p>uses the acl subresource to set the access control list (ACL) permissions for an object that already exists in a bucket</p>"
+      "documentation":"<p>Uses the <code>acl</code> subresource to set the access control list (ACL) permissions for an object that already exists in a bucket. You must have <code>WRITE_ACP</code> permission to set the ACL of an object.</p> <p>Depending on your application needs, you can choose to set the ACL on an object using either the request body or the headers. For example, if you have an existing application that updates a bucket ACL using the request body, you can continue to use that approach.</p> <p> <b>Access Permissions</b> </p> <p>You can set access permissions using one of the following methods:</p> <ul> <li> <p>Specify a canned ACL with the <code>x-amz-acl</code> request header. Amazon S3 supports a set of predefined ACLs, known as canned ACLs. Each canned ACL has a predefined set of grantees and permissions. Specify the canned ACL name as the value of <code>x-amz-ac</code>l. If you use this header, you cannot use other access control-specific headers in your request. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/acl-overview.html#CannedACL\">Canned ACL</a>.</p> </li> <li> <p>Specify access permissions explicitly with the <code>x-amz-grant-read</code>, <code>x-amz-grant-read-acp</code>, <code>x-amz-grant-write-acp</code>, and <code>x-amz-grant-full-control</code> headers. When using these headers, you specify explicit access permissions and grantees (AWS accounts or Amazon S3 groups) who will receive the permission. If you use these ACL-specific headers, you cannot use <code>x-amz-acl</code> header to set a canned ACL. These parameters map to the set of permissions that Amazon S3 supports in an ACL. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/acl-overview.html\">Access Control List (ACL) Overview</a>.</p> <p>You specify each grantee as a type=value pair, where the type is one of the following:</p> <ul> <li> <p> <code>emailAddress</code> – if the value specified is the email address of an AWS account</p> </li> <li> <p> <code>id</code> – if the value specified is the canonical user ID of an AWS account</p> </li> <li> <p> <code>uri</code> – if you are granting permissions to a predefined group</p> </li> </ul> <p>For example, the following <code>x-amz-grant-read</code> header grants list objects permission to the two AWS accounts identified by their email addresses.</p> <p> <code>x-amz-grant-read: emailAddress=\"xyz@amazon.com\", emailAddress=\"abc@amazon.com\" </code> </p> </li> </ul> <p>You can use either a canned ACL or specify access permissions explicitly. You cannot do both.</p> <p> <b>Grantee Values</b> </p> <p>You can specify the person (grantee) to whom you're assigning access rights (using request elements) in the following ways:</p> <ul> <li> <p>By Email address:</p> <p> <code>&lt;Grantee xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:type=\"AmazonCustomerByEmail\"&gt;&lt;EmailAddress&gt;&lt;&gt;Grantees@email.com&lt;&gt;&lt;/EmailAddress&gt;lt;/Grantee&gt;</code> </p> <p>The grantee is resolved to the CanonicalUser and, in a response to a GET Object acl request, appears as the CanonicalUser.</p> </li> <li> <p>By the person's ID:</p> <p> <code>&lt;Grantee xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:type=\"CanonicalUser\"&gt;&lt;ID&gt;&lt;&gt;ID&lt;&gt;&lt;/ID&gt;&lt;DisplayName&gt;&lt;&gt;GranteesEmail&lt;&gt;&lt;/DisplayName&gt; &lt;/Grantee&gt;</code> </p> <p>DisplayName is optional and ignored in the request.</p> </li> <li> <p>By URI:</p> <p> <code>&lt;Grantee xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:type=\"Group\"&gt;&lt;URI&gt;&lt;&gt;http://acs.amazonaws.com/groups/global/AuthenticatedUsers&lt;&gt;&lt;/URI&gt;&lt;/Grantee&gt;</code> </p> </li> </ul> <p> <b>Versioning</b> </p> <p>The ACL of an object is set at the object version level. By default, PUT sets the ACL of the current version of an object. To set the ACL of a different version, use the <code>versionId</code> subresource.</p> <p class=\"title\"> <b>Related Resources</b> </p> <ul> <li> <p> <a>CopyObject</a> </p> </li> <li> <p> <a>GetObject</a> </p> </li> </ul>"
     },
     "PutObjectLegalHold":{
       "name":"PutObjectLegalHold",
@@ -882,7 +882,7 @@
       },
       "input":{"shape":"PutObjectLegalHoldRequest"},
       "output":{"shape":"PutObjectLegalHoldOutput"},
-      "documentation":"<p>Applies a Legal Hold configuration to the specified object.</p>"
+      "documentation":"<p>Applies a Legal Hold configuration to the specified object.</p> <p class=\"title\"> <b>Related Resources</b> </p> <ul> <li> <p> <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/object-lock.html\">Locking Objects</a> </p> </li> </ul>"
     },
     "PutObjectLockConfiguration":{
       "name":"PutObjectLockConfiguration",
@@ -892,7 +892,7 @@
       },
       "input":{"shape":"PutObjectLockConfigurationRequest"},
       "output":{"shape":"PutObjectLockConfigurationOutput"},
-      "documentation":"<p>Places an object lock configuration on the specified bucket. The rule specified in the object lock configuration will be applied by default to every new object placed in the specified bucket.</p>"
+      "documentation":"<p>Places an Object Lock configuration on the specified bucket. The rule specified in the Object Lock configuration will be applied by default to every new object placed in the specified bucket.</p> <note> <p> <code>DefaultRetention</code> requires either Days or Years. You can't specify both at the same time.</p> </note> <p class=\"title\"> <b>Related Resources</b> </p> <ul> <li> <p> <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/object-lock.html\">Locking Objects</a> </p> </li> </ul>"
     },
     "PutObjectRetention":{
       "name":"PutObjectRetention",
@@ -902,7 +902,7 @@
       },
       "input":{"shape":"PutObjectRetentionRequest"},
       "output":{"shape":"PutObjectRetentionOutput"},
-      "documentation":"<p>Places an Object Retention configuration on an object.</p>"
+      "documentation":"<p>Places an Object Retention configuration on an object.</p> <p class=\"title\"> <b>Related Resources</b> </p> <ul> <li> <p> <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/object-lock.html\">Locking Objects</a> </p> </li> </ul>"
     },
     "PutObjectTagging":{
       "name":"PutObjectTagging",
@@ -912,7 +912,7 @@
       },
       "input":{"shape":"PutObjectTaggingRequest"},
       "output":{"shape":"PutObjectTaggingOutput"},
-      "documentation":"<p>Sets the supplied tag-set to an object that already exists in a bucket</p>"
+      "documentation":"<p>Sets the supplied tag-set to an object that already exists in a bucket</p> <p>A tag is a key-value pair. You can associate tags with an object by sending a PUT request against the tagging subresource that is associated with the object. You can retrieve tags by sending a GET request. For more information, see <a>GetObjectTagging</a>.</p> <p>For tagging-related restrictions related to characters and encodings, see <a href=\"https://docs.aws.amazon.com/awsaccountbilling/latest/aboutv2/allocation-tag-restrictions.html\">Tag Restrictions</a>. Note that Amazon S3 limits the maximum number of tags to 10 tags per object.</p> <p>To use this operation, you must have permission to perform the <code>s3:PutObjectTagging</code> action. By default, the bucket owner has this permission and can grant this permission to others.</p> <p>To put tags of any other version, use the <code>versionId</code> query parameter. You also need permission for the <code>s3:PutObjectVersionTagging</code> action.</p> <p>For information about the Amazon S3 object tagging feature, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/object-tagging.html\">Object Tagging</a>.</p> <p class=\"title\"> <b>Special Errors</b> </p> <ul> <li> <p class=\"title\"> <b/> </p> <ul> <li> <p> <i>Code: InvalidTagError </i> </p> </li> <li> <p> <i>Cause: The tag provided was not a valid tag. This error can occur if the tag did not pass input validation. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/object-tagging.html\">Object Tagging</a>.</i> </p> </li> </ul> </li> <li> <p class=\"title\"> <b/> </p> <ul> <li> <p> <i>Code: MalformedXMLError </i> </p> </li> <li> <p> <i>Cause: The XML provided does not match the schema.</i> </p> </li> </ul> </li> <li> <ul> <li> <p> <i>Code: OperationAbortedError </i> </p> </li> <li> <p> <i>Cause: A conflicting conditional operation is currently in progress against this resource. Please try again.</i> </p> </li> </ul> </li> <li> <ul> <li> <p> <i>Code: InternalError</i> </p> </li> <li> <p> <i>Cause: The service was unable to apply the provided tag to the object.</i> </p> </li> </ul> </li> </ul> <p class=\"title\"> <b>Related Resources</b> </p> <ul> <li> <p> <a>GetObjectTagging</a> </p> </li> </ul>"
     },
     "PutPublicAccessBlock":{
       "name":"PutPublicAccessBlock",
@@ -921,7 +921,7 @@
         "requestUri":"/{Bucket}?publicAccessBlock"
       },
       "input":{"shape":"PutPublicAccessBlockRequest"},
-      "documentation":"<p>Creates or modifies the <code>PublicAccessBlock</code> configuration for an Amazon S3 bucket.</p>"
+      "documentation":"<p>Creates or modifies the <code>PublicAccessBlock</code> configuration for an Amazon S3 bucket. To use this operation, you must have the <code>s3:PutBucketPublicAccessBlock</code> permission. For more information about Amazon S3 permissions, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/using-with-s3-actions.html\">Specifying Permissions in a Policy</a>.</p> <important> <p>When Amazon S3 evaluates the <code>PublicAccessBlock</code> configuration for a bucket or an object, it checks the <code>PublicAccessBlock</code> configuration for both the bucket (or the bucket that contains the object) and the bucket owner's account. If the <code>PublicAccessBlock</code> configurations are different between the bucket and the account, Amazon S3 uses the most restrictive combination of the bucket-level and account-level settings.</p> </important> <p>For more information about when Amazon S3 considers a bucket or an object public, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/access-control-block-public-access.html#access-control-block-public-access-policy-status\">The Meaning of \"Public\"</a>.</p> <p class=\"title\"> <b>Related Resources</b> </p> <ul> <li> <p> <a>GetPublicAccessBlock</a> </p> </li> <li> <p> <a>DeletePublicAccessBlock</a> </p> </li> <li> <p> <a>GetBucketPolicyStatus</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/access-control-block-public-access.html\">Using Amazon S3 Block Public Access</a> </p> </li> </ul>"
     },
     "RestoreObject":{
       "name":"RestoreObject",
@@ -935,7 +935,7 @@
         {"shape":"ObjectAlreadyInActiveTierError"}
       ],
       "documentationUrl":"http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTObjectRestore.html",
-      "documentation":"<p>Restores an archived copy of an object back into Amazon S3</p>",
+      "documentation":"<p>Restores an archived copy of an object back into Amazon S3</p> <p>This operation performs the following types of requests: </p> <ul> <li> <p> <code>select</code> - Perform a select query on an archived object</p> </li> <li> <p> <code>restore an archive</code> - Restore an archived object</p> </li> </ul> <p>To use this operation, you must have permissions to perform the <code>s3:RestoreObject</code> and <code>s3:GetObject</code> actions. The bucket owner has this permission by default and can grant this permission to others. For more information about permissions, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/using-with-s3-actions.html#using-with-s3-actions-related-to-bucket-subresources\">Permissions Related to Bucket Subresource Operations</a> and <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/s3-access-control.html\">Managing Access Permissions to Your Amazon S3 Resources</a> in the <i>Amazon Simple Storage Service Developer Guide</i>.</p> <p> <b>Querying Archives with Select Requests</b> </p> <p>You use a select type of request to perform SQL queries on archived objects. The archived objects that are being queried by the select request must be formatted as uncompressed comma-separated values (CSV) files. You can run queries and custom analytics on your archived data without having to restore your data to a hotter Amazon S3 tier. For an overview about select requests, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/querying-glacier-archives.html\">Querying Archived Objects</a> in the <i>Amazon Simple Storage Service Developer Guide</i>.</p> <p>When making a select request, do the following:</p> <ul> <li> <p>Define an output location for the select query's output. This must be an Amazon S3 bucket in the same AWS Region as the bucket that contains the archive object that is being queried. The AWS account that initiates the job must have permissions to write to the S3 bucket. You can specify the storage class and encryption for the output objects stored in the bucket. For more information about output, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/querying-glacier-archives.html\">Querying Archived Objects</a> in the <i>Amazon Simple Storage Service Developer Guide</i>.</p> <p>For more information about the <code>S3</code> structure in the request body, see the following:</p> <ul> <li> <p> <a>PutObject</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/S3_ACLs_UsingACLs.html\">Managing Access with ACLs</a> in the <i>Amazon Simple Storage Service Developer Guide</i> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/serv-side-encryption.html\">Protecting Data Using Server-Side Encryption</a> in the <i>Amazon Simple Storage Service Developer Guide</i> </p> </li> </ul> </li> <li> <p>Define the SQL expression for the <code>SELECT</code> type of restoration for your query in the request body's <code>SelectParameters</code> structure. You can use expressions like the following examples.</p> <ul> <li> <p>The following expression returns all records from the specified object.</p> <p> <code>SELECT * FROM Object</code> </p> </li> <li> <p>Assuming that you are not using any headers for data stored in the object, you can specify columns with positional headers.</p> <p> <code>SELECT s._1, s._2 FROM Object s WHERE s._3 &gt; 100</code> </p> </li> <li> <p>If you have headers and you set the <code>fileHeaderInfo</code> in the <code>CSV</code> structure in the request body to <code>USE</code>, you can specify headers in the query. (If you set the <code>fileHeaderInfo</code> field to <code>IGNORE</code>, the first row is skipped for the query.) You cannot mix ordinal positions with header column names. </p> <p> <code>SELECT s.Id, s.FirstName, s.SSN FROM S3Object s</code> </p> </li> </ul> </li> </ul> <p>For more information about using SQL with Glacier Select restore, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/s3-glacier-select-sql-reference.html\">SQL Reference for Amazon S3 Select and Glacier Select</a> in the <i>Amazon Simple Storage Service Developer Guide</i>. </p> <p>When making a select request, you can also do the following:</p> <ul> <li> <p>To expedite your queries, specify the <code>Expedited</code> tier. For more information about tiers, see \"Restoring Archives,\" later in this topic.</p> </li> <li> <p>Specify details about the data serialization format of both the input object that is being queried and the serialization of the CSV-encoded query results.</p> </li> </ul> <p>The following are additional important facts about the select feature:</p> <ul> <li> <p>The output results are new Amazon S3 objects. Unlike archive retrievals, they are stored until explicitly deleted-manually or through a lifecycle policy.</p> </li> <li> <p>You can issue more than one select request on the same Amazon S3 object. Amazon S3 doesn't deduplicate requests, so avoid issuing duplicate requests.</p> </li> <li> <p> Amazon S3 accepts a select request even if the object has already been restored. A select request doesn’t return error response <code>409</code>.</p> </li> </ul> <p> <b>Restoring Archives</b> </p> <p>Objects in the GLACIER and DEEP_ARCHIVE storage classes are archived. To access an archived object, you must first initiate a restore request. This restores a temporary copy of the archived object. In a restore request, you specify the number of days that you want the restored copy to exist. After the specified period, Amazon S3 deletes the temporary copy but the object remains archived in the GLACIER or DEEP_ARCHIVE storage class that object was restored from. </p> <p>To restore a specific object version, you can provide a version ID. If you don't provide a version ID, Amazon S3 restores the current version.</p> <p>The time it takes restore jobs to finish depends on which storage class the object is being restored from and which data access tier you specify. </p> <p>When restoring an archived object (or using a select request), you can specify one of the following data access tier options in the <code>Tier</code> element of the request body: </p> <ul> <li> <p> <b> <code>Expedited</code> </b> - Expedited retrievals allow you to quickly access your data stored in the GLACIER storage class when occasional urgent requests for a subset of archives are required. For all but the largest archived objects (250 MB+), data accessed using Expedited retrievals are typically made available within 1–5 minutes. Provisioned capacity ensures that retrieval capacity for Expedited retrievals is available when you need it. Expedited retrievals and provisioned capacity are not available for the DEEP_ARCHIVE storage class.</p> </li> <li> <p> <b> <code>Standard</code> </b> - Standard retrievals allow you to access any of your archived objects within several hours. This is the default option for the GLACIER and DEEP_ARCHIVE retrieval requests that do not specify the retrieval option. Standard retrievals typically complete within 3-5 hours from the GLACIER storage class and typically complete within 12 hours from the DEEP_ARCHIVE storage class. </p> </li> <li> <p> <b> <code>Bulk</code> </b> - Bulk retrievals are Amazon S3 Glacier’s lowest-cost retrieval option, enabling you to retrieve large amounts, even petabytes, of data inexpensively in a day. Bulk retrievals typically complete within 5-12 hours from the GLACIER storage class and typically complete within 48 hours from the DEEP_ARCHIVE storage class.</p> </li> </ul> <p>For more information about archive retrieval options and provisioned capacity for <code>Expedited</code> data access, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/restoring-objects.html\">Restoring Archived Objects</a> in the <i>Amazon Simple Storage Service Developer Guide</i>. </p> <p>You can use Amazon S3 restore speed upgrade to change the restore speed to a faster speed while it is in progress. You upgrade the speed of an in-progress restoration by issuing another restore request to the same object, setting a new <code>Tier</code> request element. When issuing a request to upgrade the restore tier, you must choose a tier that is faster than the tier that the in-progress restore is using. You must not change any other parameters, such as the <code>Days</code> request element. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/restoring-objects.html#restoring-objects-upgrade-tier.title.html\"> Upgrading the Speed of an In-Progress Restore</a> in the <i>Amazon Simple Storage Service Developer Guide</i>. </p> <p>To get the status of object restoration, you can send a <code>HEAD</code> request. Operations return the <code>x-amz-restore</code> header, which provides information about the restoration status, in the response. You can use Amazon S3 event notifications to notify you when a restore is initiated or completed. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/NotificationHowTo.html\">Configuring Amazon S3 Event Notifications</a> in the <i>Amazon Simple Storage Service Developer Guide</i>.</p> <p>After restoring an archived object, you can update the restoration period by reissuing the request with a new period. Amazon S3 updates the restoration period relative to the current time and charges only for the request-there are no data transfer charges. You cannot update the restoration period when Amazon S3 is actively processing your current restore request for the object.</p> <p>If your bucket has a lifecycle configuration with a rule that includes an expiration action, the object expiration overrides the life span that you specify in a restore request. For example, if you restore an object copy for 10 days, but the object is scheduled to expire in 3 days, Amazon S3 deletes the object in 3 days. For more information about lifecycle configuration, see <a>PutBucketLifecycleConfiguration</a> and <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/object-lifecycle-mgmt.html\">Object Lifecycle Management</a> in <i>Amazon Simple Storage Service Developer Guide</i>.</p> <p> <b>Responses</b> </p> <p>A successful operation returns either the <code>200 OK</code> or <code>202 Accepted</code> status code. </p> <ul> <li> <p>If the object copy is not previously restored, then Amazon S3 returns <code>202 Accepted</code> in the response. </p> </li> <li> <p>If the object copy is previously restored, Amazon S3 returns <code>200 OK</code> in the response. </p> </li> </ul> <p class=\"title\"> <b>Special Errors</b> </p> <ul> <li> <p class=\"title\"> <b/> </p> <ul> <li> <p> <i>Code: RestoreAlreadyInProgress</i> </p> </li> <li> <p> <i>Cause: Object restore is already in progress. (This error does not apply to SELECT type requests.)</i> </p> </li> <li> <p> <i>HTTP Status Code: 409 Conflict</i> </p> </li> <li> <p> <i>SOAP Fault Code Prefix: Client</i> </p> </li> </ul> </li> <li> <p class=\"title\"> <b/> </p> <ul> <li> <p> <i>Code: GlacierExpeditedRetrievalNotAvailable</i> </p> </li> <li> <p> <i>Cause: Glacier expedited retrievals are currently not available. Try again later. (Returned if there is insufficient capacity to process the Expedited request. This error applies only to Expedited retrievals and not to Standard or Bulk retrievals.)</i> </p> </li> <li> <p> <i>HTTP Status Code: 503</i> </p> </li> <li> <p> <i>SOAP Fault Code Prefix: N/A</i> </p> </li> </ul> </li> </ul> <p class=\"title\"> <b>Related Resources</b> </p> <ul> <li> <p> <a>PutBucketLifecycleConfiguration</a> </p> </li> <li> <p> <a>GetBucketNotificationConfiguration</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/s3-glacier-select-sql-reference.html\">SQL Reference for Amazon S3 Select and Glacier Select </a> in the <i>Amazon Simple Storage Service Developer Guide</i> </p> </li> </ul>",
       "alias":"PostObjectRestore"
     },
     "SelectObjectContent":{
@@ -950,7 +950,7 @@
         "xmlNamespace":{"uri":"http://s3.amazonaws.com/doc/2006-03-01/"}
       },
       "output":{"shape":"SelectObjectContentOutput"},
-      "documentation":"<p>This operation filters the contents of an Amazon S3 object based on a simple Structured Query Language (SQL) statement. In the request, along with the SQL expression, you must also specify a data serialization format (JSON or CSV) of the object. Amazon S3 uses this to parse object data into records, and returns only records that match the specified SQL expression. You must also specify the data serialization format for the response.</p>"
+      "documentation":"<p>This operation filters the contents of an Amazon S3 object based on a simple structured query language (SQL) statement. In the request, along with the SQL expression, you must also specify a data serialization format (JSON, CSV, or Apache Parquet) of the object. Amazon S3 uses this format to parse object data into records, and returns only records that match the specified SQL expression. You must also specify the data serialization format for the response.</p> <p>For more information about Amazon S3 Select, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/selecting-content-from-objects.html\">Selecting Content from Objects</a> in the <i>Amazon Simple Storage Service Developer Guide</i>.</p> <p>For more information about using SQL with Amazon S3 Select, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/s3-glacier-select-sql-reference.html\"> SQL Reference for Amazon S3 Select and Glacier Select</a> in the <i>Amazon Simple Storage Service Developer Guide</i>.</p> <p/> <p> <b>Permissions</b> </p> <p>You must have <code>s3:GetObject</code> permission for this operation. Amazon S3 Select does not support anonymous access. For more information about permissions, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/using-with-s3-actions.html\">Specifying Permissions in a Policy</a> in the <i>Amazon Simple Storage Service Developer Guide</i>.</p> <p/> <p> <i>Object Data Formats</i> </p> <p>You can use Amazon S3 Select to query objects that have the following format properties:</p> <ul> <li> <p> <i>CSV, JSON, and Parquet</i> - Objects must be in CSV, JSON, or Parquet format.</p> </li> <li> <p> <i>UTF-8</i> - UTF-8 is the only encoding type Amazon S3 Select supports.</p> </li> <li> <p> <i>GZIP or BZIP2</i> - CSV and JSON files can be compressed using GZIP or BZIP2. GZIP and BZIP2 are the only compression formats that Amazon S3 Select supports for CSV and JSON files. Amazon S3 Select supports columnar compression for Parquet using GZIP or Snappy. Amazon S3 Select does not support whole-object compression for Parquet objects.</p> </li> <li> <p> <i>Server-side encryption</i> - Amazon S3 Select supports querying objects that are protected with server-side encryption.</p> <p>For objects that are encrypted with customer-provided encryption keys (SSE-C), you must use HTTPS, and you must use the headers that are documented in the <a>GetObject</a>. For more information about SSE-C, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/ServerSideEncryptionCustomerKeys.html\">Server-Side Encryption (Using Customer-Provided Encryption Keys)</a> in the <i>Amazon Simple Storage Service Developer Guide</i>.</p> <p>For objects that are encrypted with Amazon S3 managed encryption keys (SSE-S3) and customer master keys (CMKs) stored in AWS Key Management Service (SSE-KMS), server-side encryption is handled transparently, so you don't need to specify anything. For more information about server-side encryption, including SSE-S3 and SSE-KMS, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/serv-side-encryption.html\">Protecting Data Using Server-Side Encryption</a> in the <i>Amazon Simple Storage Service Developer Guide</i>.</p> </li> </ul> <p> <b>Working with the Response Body</b> </p> <p>Given the response size is unknown, Amazon S3 Select streams the response as a series of messages and includes a <code>Transfer-Encoding</code> header with <code>chunked</code> as its value in the response. For more information, see <a>RESTSelectObjectAppendix</a> .</p> <p/> <p> <b>GetObject Support</b> </p> <p>The <code>SelectObjectContent</code> operation does not support the following <code>GetObject</code> functionality. For more information, see <a>GetObject</a>.</p> <ul> <li> <p> <code>Range</code>: While you can specify a scan range for a Amazon S3 Select request, see <a>SelectObjectContentRequest$ScanRange</a> in the request parameters below, you cannot specify the range of bytes of an object to return. </p> </li> <li> <p>GLACIER, DEEP_ARCHIVE and REDUCED_REDUNDANCY storage classes: You cannot specify the GLACIER, DEEP_ARCHIVE, or <code>REDUCED_REDUNDANCY</code> storage classes. For more information, about storage classes see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/UsingMetadata.html#storage-class-intro\">Storage Classes</a> in the <i>Amazon Simple Storage Service Developer Guide</i>.</p> </li> </ul> <p/> <p> <b>Special Errors</b> </p> <p>For a list of special errors for this operation and for general information about Amazon S3 errors and a list of error codes, see <a>ErrorResponses</a> </p> <p class=\"title\"> <b>Related Resources</b> </p> <ul> <li> <p> <a>GetObject</a> </p> </li> <li> <p> <a>GetBucketLifecycleConfiguration</a> </p> </li> <li> <p> <a>PutBucketLifecycleConfiguration</a> </p> </li> </ul>"
     },
     "UploadPart":{
       "name":"UploadPart",
@@ -961,7 +961,7 @@
       "input":{"shape":"UploadPartRequest"},
       "output":{"shape":"UploadPartOutput"},
       "documentationUrl":"http://docs.amazonwebservices.com/AmazonS3/latest/API/mpUploadUploadPart.html",
-      "documentation":"<p>Uploads a part in a multipart upload.</p> <p> <b>Note:</b> After you initiate multipart upload and upload one or more parts, you must either complete or abort multipart upload in order to stop getting charged for storage of the uploaded parts. Only after you either complete or abort multipart upload, Amazon S3 frees up the parts storage and stops charging you for the parts storage.</p>"
+      "documentation":"<p>Uploads a part in a multipart upload.</p> <note> <p>In this operation, you provide part data in your request. However, you have an option to specify your existing Amazon S3 object as a data source for the part you are uploading. To upload a part from an existing object, you use the <a>UploadPartCopy</a> operation. </p> </note> <p>You must initiate a multipart upload (see <a>CreateMultipartUpload</a>) before you can upload any part. In response to your initiate request, Amazon S3 returns an upload ID, a unique identifier, that you must include in your upload part request.</p> <p>Part numbers can be any number from 1 to 10,000, inclusive. A part number uniquely identifies a part and also defines its position within the object being created. If you upload a new part using the same part number that was used with a previous part, the previously uploaded part is overwritten. Each part must be at least 5 MB in size, except the last part. There is no size limit on the last part of your multipart upload.</p> <p>To ensure that data is not corrupted when traversing the network, specify the <code>Content-MD5</code> header in the upload part request. Amazon S3 checks the part data against the provided MD5 value. If they do not match, Amazon S3 returns an error. </p> <p> <b>Note:</b> After you initiate multipart upload and upload one or more parts, you must either complete or abort multipart upload in order to stop getting charged for storage of the uploaded parts. Only after you either complete or abort multipart upload, Amazon S3 frees up the parts storage and stops charging you for the parts storage.</p> <p>For more information on multipart uploads, go to <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/mpuoverview.html\">Multipart Upload Overview</a> in the <i>Amazon Simple Storage Service Developer Guide </i>.</p> <p>For information on the permissions required to use the multipart upload API, go to <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/mpuAndPermissions.html\">Multipart Upload API and Permissions</a> in the <i>Amazon Simple Storage Service Developer Guide</i>.</p> <p>You can optionally request server-side encryption where Amazon S3 encrypts your data as it writes it to disks in its data centers and decrypts it for you when you access it. You have the option of providing your own encryption key, or you can use the AWS managed encryption keys. If you choose to provide your own encryption key, the request headers you provide in the request must match the headers you used in the request to initiate the upload by using <a>CreateMultipartUpload</a>. For more information, go to <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/UsingServerSideEncryption.html\">Using Server-Side Encryption</a> in the <i>Amazon Simple Storage Service Developer Guide</i>.</p> <p>Server-side encryption is supported by the S3 Multipart Upload actions. Unless you are using a customer-provided encryption key, you don't need to specify the encryption parameters in each UploadPart request. Instead, you only need to specify the server-side encryption parameters in the initial Initiate Multipart request. For more information, see <a>CreateMultipartUpload</a>.</p> <p>If you requested server-side encryption using a customer-provided encryption key in your initiate multipart upload request, you must provide identical encryption information in each part upload using the following headers.</p> <ul> <li> <p>x-amz-server-side​-encryption​-customer-algorithm</p> </li> <li> <p>x-amz-server-side​-encryption​-customer-key</p> </li> <li> <p>x-amz-server-side​-encryption​-customer-key-MD5</p> </li> </ul> <p class=\"title\"> <b>Special Errors</b> </p> <ul> <li> <p class=\"title\"> <b/> </p> <ul> <li> <p> <i>Code: NoSuchUpload</i> </p> </li> <li> <p> <i>Cause: The specified multipart upload does not exist. The upload ID might be invalid, or the multipart upload might have been aborted or completed.</i> </p> </li> <li> <p> <i> HTTP Status Code: 404 Not Found </i> </p> </li> <li> <p> <i>SOAP Fault Code Prefix: Client</i> </p> </li> </ul> </li> </ul> <p class=\"title\"> <b>Related Resources</b> </p> <ul> <li> <p> <a>CreateMultipartUpload</a> </p> </li> <li> <p> <a>CompleteMultipartUpload</a> </p> </li> <li> <p> <a>AbortMultipartUpload</a> </p> </li> <li> <p> <a>ListParts</a> </p> </li> <li> <p> <a>ListMultipartUploads</a> </p> </li> </ul>"
     },
     "UploadPartCopy":{
       "name":"UploadPartCopy",
@@ -972,7 +972,7 @@
       "input":{"shape":"UploadPartCopyRequest"},
       "output":{"shape":"UploadPartCopyOutput"},
       "documentationUrl":"http://docs.amazonwebservices.com/AmazonS3/latest/API/mpUploadUploadPartCopy.html",
-      "documentation":"<p>Uploads a part by copying data from an existing object as data source.</p>"
+      "documentation":"<p>Uploads a part by copying data from an existing object as data source. You specify the data source by adding the request header <code>x-amz-copy-source</code> in your request and a byte range by adding the request header <code>x-amz-copy-source-range</code> in your request. </p> <p>The minimum allowable part size for a multipart upload is 5 MB. For more information about multipart upload limits, go to <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/qfacts.html\">Quick Facts</a> in the <i>Amazon Simple Storage Service Developer Guide</i>. </p> <note> <p>Instead of using an existing object as part data, you might use the <a>UploadPart</a> operation and provide data in your request.</p> </note> <p>You must initiate a multipart upload before you can upload any part. In response to your initiate request. Amazon S3 returns a unique identifier, the upload ID, that you must include in your upload part request.</p> <p>For more information about using the <code>UploadPartCopy</code> operation, see the following:</p> <ul> <li> <p>For conceptual information about multipart uploads, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/uploadobjusingmpu.html\">Uploading Objects Using Multipart Upload</a> in the <i>Amazon Simple Storage Service Developer Guide</i>.</p> </li> <li> <p>For information about permissions required to use the multipart upload API, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/mpuAndPermissions.html\">Multipart Upload API and Permissions</a> in the <i>Amazon Simple Storage Service Developer Guide</i>.</p> </li> <li> <p>For information about copying objects using a single atomic operation vs. the multipart upload, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/ObjectOperations.html\">Operations on Objects</a> in the <i>Amazon Simple Storage Service Developer Guide</i>.</p> </li> <li> <p>For information about using server-side encryption with customer-provided encryption keys with the UploadPartCopy operation, see <a>CopyObject</a> and <a>UploadPart</a>.</p> </li> </ul> <p>Note the following additional considerations about the request headers <code>x-amz-copy-source-if-match</code>, <code>x-amz-copy-source-if-none-match</code>, <code>x-amz-copy-source-if-unmodified-since</code>, and <code>x-amz-copy-source-if-modified-since</code>:</p> <p> </p> <ul> <li> <p> <b>Consideration 1</b> - If both of the <code>x-amz-copy-source-if-match</code> and <code>x-amz-copy-source-if-unmodified-since</code> headers are present in the request as follows:</p> <p> <code>x-amz-copy-source-if-match</code> condition evaluates to <code>true</code>, and;</p> <p> <code>x-amz-copy-source-if-unmodified-since</code> condition evaluates to <code>false</code>;</p> <p>Amazon S3 returns <code>200 OK</code> and copies the data. </p> </li> <li> <p> <b>Consideration 2</b> - If both of the <code>x-amz-copy-source-if-none-match</code> and <code>x-amz-copy-source-if-modified-since</code> headers are present in the request as follows:</p> <p> <code>x-amz-copy-source-if-none-match</code> condition evaluates to <code>false</code>, and;</p> <p> <code>x-amz-copy-source-if-modified-since</code> condition evaluates to <code>true</code>;</p> <p>Amazon S3 returns <code>412 Precondition Failed</code> response code. </p> </li> </ul> <p> <b>Versioning</b> </p> <p>If your bucket has versioning enabled, you could have multiple versions of the same object. By default, <code>x-amz-copy-source</code> identifies the current version of the object to copy. If the current version is a delete marker and you don't specify a versionId in the <code>x-amz-copy-source</code>, Amazon S3 returns a 404 error, because the object does not exist. If you specify versionId in the <code>x-amz-copy-source</code> and the versionId is a delete marker, Amazon S3 returns an HTTP 400 error, because you are not allowed to specify a delete marker as a version for the <code>x-amz-copy-source</code>. </p> <p>You can optionally specify a specific version of the source object to copy by adding the <code>versionId</code> subresource as shown in the following example:</p> <p> <code>x-amz-copy-source: /bucket/object?versionId=version id</code> </p> <p class=\"title\"> <b>Special Errors</b> </p> <ul> <li> <p class=\"title\"> <b/> </p> <ul> <li> <p> <i>Code: NoSuchUpload</i> </p> </li> <li> <p> <i>Cause: The specified multipart upload does not exist. The upload ID might be invalid, or the multipart upload might have been aborted or completed.</i> </p> </li> <li> <p> <i>HTTP Status Code: 404 Not Found</i> </p> </li> </ul> </li> <li> <p class=\"title\"> <b/> </p> <ul> <li> <p> <i>Code: InvalidRequest</i> </p> </li> <li> <p> <i>Cause: The specified copy source is not supported as a byte-range copy source.</i> </p> </li> <li> <p> <i>HTTP Status Code: 400 Bad Request</i> </p> </li> </ul> </li> </ul> <p class=\"title\"> <b>Related Resources</b> </p> <ul> <li> <p> <a>CreateMultipartUpload</a> </p> </li> <li> <p> <a>UploadPart</a> </p> </li> <li> <p> <a>CompleteMultipartUpload</a> </p> </li> <li> <p> <a>AbortMultipartUpload</a> </p> </li> <li> <p> <a>ListParts</a> </p> </li> <li> <p> <a>ListMultipartUploads</a> </p> </li> </ul>"
     }
   },
   "shapes":{
@@ -1007,7 +1007,7 @@
       "members":{
         "Bucket":{
           "shape":"BucketName",
-          "documentation":"<p>Name of the bucket to which the multipart upload was initiated.</p>",
+          "documentation":"<p>The bucket name to which the upload was taking place. </p> <p>When using this API with an access point, you must direct requests to the access point hostname. The access point hostname takes the form <i>AccessPointName</i>-<i>AccountId</i>.s3-accesspoint.<i>Region</i>.amazonaws.com. When using this operation using an access point through the AWS SDKs, you provide the access point ARN in place of the bucket name. For more information about access point ARNs, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/using-access-points.html\">Using Access Points</a> in the <i>Amazon Simple Storage Service Developer Guide</i>.</p>",
           "location":"uri",
           "locationName":"Bucket"
         },
@@ -1124,7 +1124,7 @@
           "documentation":"<p> Contains data related to access patterns to be collected and made available to analyze the tradeoffs between different storage classes. </p>"
         }
       },
-      "documentation":"<p> Specifies the configuration and any analyses for the analytics filter of an Amazon S3 bucket.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/API/RESTBucketGETAnalyticsConfig.html\">GET Bucket analytics</a> in the <i>Amazon Simple Storage Service API Reference</i>. </p>"
+      "documentation":"<p> Specifies the configuration and any analyses for the analytics filter of an Amazon S3 bucket.</p>"
     },
     "AnalyticsConfigurationList":{
       "type":"list",
@@ -1158,7 +1158,7 @@
           "documentation":"<p>A conjunction (logical AND) of predicates, which is used in evaluating an analytics filter. The operator must have at least two predicates.</p>"
         }
       },
-      "documentation":"<p/>"
+      "documentation":"<p>The filter used to describe a set of objects for analyses. A filter must have exactly one prefix, one tag, or one conjunction (AnalyticsAndOperator). If no filter is provided, all objects will be considered in any analysis.</p>"
     },
     "AnalyticsId":{"type":"string"},
     "AnalyticsS3BucketDestination":{
@@ -1185,7 +1185,7 @@
           "documentation":"<p>The prefix to use when exporting data. The prefix is prepended to all results.</p>"
         }
       },
-      "documentation":"<p/>"
+      "documentation":"<p>Contains information about where to publish the analytics results.</p>"
     },
     "AnalyticsS3ExportFileFormat":{
       "type":"string",
@@ -1204,7 +1204,7 @@
           "documentation":"<p>Date the bucket was created.</p>"
         }
       },
-      "documentation":"<p/>"
+      "documentation":"<p> In terms of implementation, a Bucket is a resource. An Amazon S3 bucket name is globally unique, and the namespace is shared by all AWS accounts. </p>"
     },
     "BucketAccelerateStatus":{
       "type":"string",
@@ -1224,7 +1224,7 @@
       "type":"structure",
       "members":{
       },
-      "documentation":"<p/>",
+      "documentation":"<p>The bucket you tried to create already exists, and you own it. Amazon S3 returns this error in all AWS Regions except in the North Virginia Region. For legacy compatibility, if you re-create an existing bucket that you already own in the North Virginia Region, Amazon S3 returns 200 OK and resets the bucket access control lists (ACLs).</p>",
       "exception":true
     },
     "BucketCannedACL":{
@@ -1267,12 +1267,9 @@
     "BucketLoggingStatus":{
       "type":"structure",
       "members":{
-        "LoggingEnabled":{
-          "shape":"LoggingEnabled",
-          "documentation":"<p/>"
-        }
+        "LoggingEnabled":{"shape":"LoggingEnabled"}
       },
-      "documentation":"<p/>"
+      "documentation":"<p>Container for logging status information.</p>"
     },
     "BucketLogsPermission":{
       "type":"string",
@@ -1307,7 +1304,7 @@
       "members":{
         "CORSRules":{
           "shape":"CORSRules",
-          "documentation":"<p>A set of allowed origins and methods.</p>",
+          "documentation":"<p>A set of origins and methods (cross-origin access that you want to allow). You can add up to 100 rules to the configuration.</p>",
           "locationName":"CORSRule"
         }
       },
@@ -1357,60 +1354,60 @@
       "members":{
         "FileHeaderInfo":{
           "shape":"FileHeaderInfo",
-          "documentation":"<p>Describes the first line of input. Valid values: None, Ignore, Use.</p>"
+          "documentation":"<p>Describes the first line of input. Valid values are:</p> <ul> <li> <p> <code>NONE</code>: First line is not a header.</p> </li> <li> <p> <code>IGNORE</code>: First line is a header, but you can't use the header values to indicate the column in an expression. You can use column position (such as _1, _2, …) to indicate the column (<code>SELECT s._1 FROM OBJECT s</code>).</p> </li> <li> <p> <code>Use</code>: First line is a header, and you can use the header value to identify a column in an expression (<code>SELECT \"name\" FROM OBJECT</code>). </p> </li> </ul>"
         },
         "Comments":{
           "shape":"Comments",
-          "documentation":"<p>The single character used to indicate a row should be ignored when present at the start of a row.</p>"
+          "documentation":"<p>A single character used to indicate that a row should be ignored when the character is present at the start of that row. You can specify any character to indicate a comment line.</p>"
         },
         "QuoteEscapeCharacter":{
           "shape":"QuoteEscapeCharacter",
-          "documentation":"<p>The single character used for escaping the quote character inside an already escaped value.</p>"
+          "documentation":"<p>A single character used for escaping the quotation mark character inside an already escaped value. For example, the value \"\"\" a , b \"\"\" is parsed as \" a , b \".</p>"
         },
         "RecordDelimiter":{
           "shape":"RecordDelimiter",
-          "documentation":"<p>The value used to separate individual records.</p>"
+          "documentation":"<p>A single character used to separate individual records in the input. Instead of the default value, you can specify an arbitrary delimiter.</p>"
         },
         "FieldDelimiter":{
           "shape":"FieldDelimiter",
-          "documentation":"<p>The value used to separate individual fields in a record.</p>"
+          "documentation":"<p>A single character used to separate individual fields in a record. You can specify an arbitrary delimiter.</p>"
         },
         "QuoteCharacter":{
           "shape":"QuoteCharacter",
-          "documentation":"<p>Value used for escaping where the field delimiter is part of the value.</p>"
+          "documentation":"<p>A single character used for escaping when the field delimiter is part of the value. For example, if the value is <code>a, b</code>, Amazon S3 wraps this field value in quotation marks, as follows: <code>\" a , b \"</code>.</p> <p>Type: String</p> <p>Default: <code>\"</code> </p> <p>Ancestors: <code>CSV</code> </p>"
         },
         "AllowQuotedRecordDelimiter":{
           "shape":"AllowQuotedRecordDelimiter",
           "documentation":"<p>Specifies that CSV field values may contain quoted record delimiters and such records should be allowed. Default value is FALSE. Setting this value to TRUE may lower performance.</p>"
         }
       },
-      "documentation":"<p>Describes how a CSV-formatted input object is formatted.</p>"
+      "documentation":"<p>Describes how an uncompressed comma-separated values (CSV)-formatted input object is formatted.</p>"
     },
     "CSVOutput":{
       "type":"structure",
       "members":{
         "QuoteFields":{
           "shape":"QuoteFields",
-          "documentation":"<p>Indicates whether or not all output fields should be quoted.</p>"
+          "documentation":"<p>Indicates whether to use quotation marks around output fields. </p> <ul> <li> <p> <code>ALWAYS</code>: Always use quotation marks for output fields.</p> </li> <li> <p> <code>ASNEEDED</code>: Use quotation marks for output fields when needed.</p> </li> </ul>"
         },
         "QuoteEscapeCharacter":{
           "shape":"QuoteEscapeCharacter",
-          "documentation":"<p>Th single character used for escaping the quote character inside an already escaped value.</p>"
+          "documentation":"<p>The single character used for escaping the quote character inside an already escaped value.</p>"
         },
         "RecordDelimiter":{
           "shape":"RecordDelimiter",
-          "documentation":"<p>The value used to separate individual records.</p>"
+          "documentation":"<p>A single character used to separate individual records in the output. Instead of the default value, you can specify an arbitrary delimiter.</p>"
         },
         "FieldDelimiter":{
           "shape":"FieldDelimiter",
-          "documentation":"<p>The value used to separate individual fields in a record.</p>"
+          "documentation":"<p>The value used to separate individual fields in a record. You can specify an arbitrary delimiter.</p>"
         },
         "QuoteCharacter":{
           "shape":"QuoteCharacter",
-          "documentation":"<p>The value used for escaping where the field delimiter is part of the value.</p>"
+          "documentation":"<p>A single character used for escaping when the field delimiter is part of the value. For example, if the value is <code>a, b</code>, Amazon S3 wraps this field value in quotation marks, as follows: <code>\" a , b \"</code>.</p>"
         }
       },
-      "documentation":"<p>Describes how CSV-formatted results are formatted.</p>"
+      "documentation":"<p>Describes how uncompressed comma-separated values (CSV)-formatted results are formatted.</p>"
     },
     "CacheControl":{"type":"string"},
     "CloudFunction":{"type":"string"},
@@ -1424,19 +1421,19 @@
         },
         "Events":{
           "shape":"EventList",
-          "documentation":"<p/>",
+          "documentation":"<p>Bucket events for which to send notifications.</p>",
           "locationName":"Event"
         },
         "CloudFunction":{
           "shape":"CloudFunction",
-          "documentation":"<p/>"
+          "documentation":"<p>Lambda cloud function ARN that Amazon S3 can invoke when it detects events of the specified type.</p>"
         },
         "InvocationRole":{
           "shape":"CloudFunctionInvocationRole",
-          "documentation":"<p/>"
+          "documentation":"<p>The role supporting the invocation of the Lambda function</p>"
         }
       },
-      "documentation":"<p/>"
+      "documentation":"<p>Container for specifying the AWS Lambda notification configuration.</p>"
     },
     "CloudFunctionInvocationRole":{"type":"string"},
     "Code":{"type":"string"},
@@ -1446,10 +1443,10 @@
       "members":{
         "Prefix":{
           "shape":"Prefix",
-          "documentation":"<p/>"
+          "documentation":"<p>Container for the specified common prefix.</p>"
         }
       },
-      "documentation":"<p/>"
+      "documentation":"<p>Container for all (if there are any) keys between Prefix and the next occurrence of the string specified by a delimiter. CommonPrefixes lists keys that act like subdirectories in the directory specified by Prefix. For example, if the prefix is notes/ and the delimiter is a slash (/) as in notes/summer/july, the common prefix is notes/summer/. </p>"
     },
     "CommonPrefixList":{
       "type":"list",
@@ -1461,15 +1458,15 @@
       "members":{
         "Location":{
           "shape":"Location",
-          "documentation":"<p/>"
+          "documentation":"<p>The URI that identifies the newly created object.</p>"
         },
         "Bucket":{
           "shape":"BucketName",
-          "documentation":"<p/>"
+          "documentation":"<p>The name of the bucket that contains the newly created object.</p>"
         },
         "Key":{
           "shape":"ObjectKey",
-          "documentation":"<p/>"
+          "documentation":"<p>The object key of the newly created object.</p>"
         },
         "Expiration":{
           "shape":"Expiration",
@@ -1479,23 +1476,23 @@
         },
         "ETag":{
           "shape":"ETag",
-          "documentation":"<p>Entity tag of the object.</p>"
+          "documentation":"<p>Entity tag that identifies the newly created object's data. Objects with different object data will have different entity tags. The entity tag is an opaque string. The entity tag may or may not be an MD5 digest of the object data. If the entity tag is not an MD5 digest of the object data, it will contain one or more nonhexadecimal characters and/or will consist of less than 32 or more than 32 hexadecimal digits.</p>"
         },
         "ServerSideEncryption":{
           "shape":"ServerSideEncryption",
-          "documentation":"<p>The Server-side encryption algorithm used when storing this object in S3 (e.g., AES256, aws:kms).</p>",
+          "documentation":"<p>If you specified server-side encryption either with an Amazon S3-managed encryption key or an AWS KMS customer master key (CMK) in your initiate multipart upload request, the response includes this header. It confirms the encryption algorithm that Amazon S3 used to encrypt the object.</p>",
           "location":"header",
           "locationName":"x-amz-server-side-encryption"
         },
         "VersionId":{
           "shape":"ObjectVersionId",
-          "documentation":"<p>Version of the object.</p>",
+          "documentation":"<p>Version ID of the newly created object, in case the bucket has versioning turned on.</p>",
           "location":"header",
           "locationName":"x-amz-version-id"
         },
         "SSEKMSKeyId":{
           "shape":"SSEKMSKeyId",
-          "documentation":"<p>If present, specifies the ID of the AWS Key Management Service (KMS) master encryption key that was used for the object.</p>",
+          "documentation":"<p>If present, specifies the ID of the AWS Key Management Service (AWS KMS) symmetric customer managed customer master key (CMK) that was used for the object.</p>",
           "location":"header",
           "locationName":"x-amz-server-side-encryption-aws-kms-key-id"
         },
@@ -1516,25 +1513,25 @@
       "members":{
         "Bucket":{
           "shape":"BucketName",
-          "documentation":"<p/>",
+          "documentation":"<p>Name of the bucket to which the multipart upload was initiated.</p>",
           "location":"uri",
           "locationName":"Bucket"
         },
         "Key":{
           "shape":"ObjectKey",
-          "documentation":"<p/>",
+          "documentation":"<p>Object key for which the multipart upload was initiated.</p>",
           "location":"uri",
           "locationName":"Key"
         },
         "MultipartUpload":{
           "shape":"CompletedMultipartUpload",
-          "documentation":"<p/>",
+          "documentation":"<p>The container for the multipart upload request information.</p>",
           "locationName":"CompleteMultipartUpload",
           "xmlNamespace":{"uri":"http://s3.amazonaws.com/doc/2006-03-01/"}
         },
         "UploadId":{
           "shape":"MultipartUploadId",
-          "documentation":"<p/>",
+          "documentation":"<p>ID for the initiated multipart upload.</p>",
           "location":"querystring",
           "locationName":"uploadId"
         },
@@ -1551,11 +1548,11 @@
       "members":{
         "Parts":{
           "shape":"CompletedPartList",
-          "documentation":"<p/>",
+          "documentation":"<p>Array of CompletedPart data types.</p>",
           "locationName":"Part"
         }
       },
-      "documentation":"<p/>"
+      "documentation":"<p>The container for the completed multipart upload details.</p>"
     },
     "CompletedPart":{
       "type":"structure",
@@ -1569,7 +1566,7 @@
           "documentation":"<p>Part number that identifies the part. This is a positive integer between 1 and 10,000.</p>"
         }
       },
-      "documentation":"<p/>"
+      "documentation":"<p>Details of the parts that were uploaded.</p>"
     },
     "CompletedPartList":{
       "type":"list",
@@ -1593,10 +1590,10 @@
         },
         "KeyPrefixEquals":{
           "shape":"KeyPrefixEquals",
-          "documentation":"<p>The object key name prefix when the redirect is applied. For example, to redirect requests for <code>ExamplePage.html</code>, the key prefix will be <code>ExamplePage.html</code>. To redirect request for all pages with the prefix <code>docs/</code>, the key prefix will be <code>/docs</code>, which identifies all objects in the docs/ folder. Required when the parent element <code>Condition</code> is specified and sibling <code>HttpErrorCodeReturnedEquals</code> is not specified. If both conditions are specified, both must be true for the redirect to be applied.</p>"
+          "documentation":"<p>The object key name prefix when the redirect is applied. For example, to redirect requests for <code>ExamplePage.html</code>, the key prefix will be <code>ExamplePage.html</code>. To redirect request for all pages with the prefix <code>docs/</code>, the key prefix will be <code>/docs</code>, which identifies all objects in the <code>docs/</code> folder. Required when the parent element <code>Condition</code> is specified and sibling <code>HttpErrorCodeReturnedEquals</code> is not specified. If both conditions are specified, both must be true for the redirect to be applied.</p>"
         }
       },
-      "documentation":"<p>Specifies a condition that must be met for a redirect to apply. </p>"
+      "documentation":"<p>A container for describing a condition that must be met for the specified redirect to apply. For example, 1. If request is for pages in the <code>/docs</code> folder, redirect to the <code>/documents</code> folder. 2. If request results in HTTP error 4xx, redirect request to another host where you might process the error.</p>"
     },
     "ConfirmRemoveSelfBucketAccess":{"type":"boolean"},
     "ContentDisposition":{"type":"string"},
@@ -1618,7 +1615,7 @@
       "members":{
         "CopyObjectResult":{
           "shape":"CopyObjectResult",
-          "documentation":"<p/>"
+          "documentation":"<p>Container for all response elements.</p>"
         },
         "Expiration":{
           "shape":"Expiration",
@@ -1628,7 +1625,7 @@
         },
         "CopySourceVersionId":{
           "shape":"CopySourceVersionId",
-          "documentation":"<p/>",
+          "documentation":"<p>Version of the copied object in the destination bucket.</p>",
           "location":"header",
           "locationName":"x-amz-copy-source-version-id"
         },
@@ -1640,7 +1637,7 @@
         },
         "ServerSideEncryption":{
           "shape":"ServerSideEncryption",
-          "documentation":"<p>The Server-side encryption algorithm used when storing this object in S3 (e.g., AES256, aws:kms).</p>",
+          "documentation":"<p>The server-side encryption algorithm used when storing this object in Amazon S3 (for example, AES256, aws:kms).</p>",
           "location":"header",
           "locationName":"x-amz-server-side-encryption"
         },
@@ -1652,13 +1649,13 @@
         },
         "SSECustomerKeyMD5":{
           "shape":"SSECustomerKeyMD5",
-          "documentation":"<p>If server-side encryption with a customer-provided encryption key was requested, the response will include this header to provide round trip message integrity verification of the customer-provided encryption key.</p>",
+          "documentation":"<p>If server-side encryption with a customer-provided encryption key was requested, the response will include this header to provide round-trip message integrity verification of the customer-provided encryption key.</p>",
           "location":"header",
           "locationName":"x-amz-server-side-encryption-customer-key-MD5"
         },
         "SSEKMSKeyId":{
           "shape":"SSEKMSKeyId",
-          "documentation":"<p>If present, specifies the ID of the AWS Key Management Service (KMS) master encryption key that was used for the object.</p>",
+          "documentation":"<p>If present, specifies the ID of the AWS Key Management Service (AWS KMS) symmetric customer managed customer master key (CMK) that was used for the object.</p>",
           "location":"header",
           "locationName":"x-amz-server-side-encryption-aws-kms-key-id"
         },
@@ -1692,7 +1689,7 @@
         },
         "Bucket":{
           "shape":"BucketName",
-          "documentation":"<p/>",
+          "documentation":"<p>The name of the destination bucket.</p>",
           "location":"uri",
           "locationName":"Bucket"
         },
@@ -1788,7 +1785,7 @@
         },
         "Key":{
           "shape":"ObjectKey",
-          "documentation":"<p/>",
+          "documentation":"<p>The key of the destination object.</p>",
           "location":"uri",
           "locationName":"Key"
         },
@@ -1812,7 +1809,7 @@
         },
         "ServerSideEncryption":{
           "shape":"ServerSideEncryption",
-          "documentation":"<p>The Server-side encryption algorithm used when storing this object in S3 (e.g., AES256, aws:kms).</p>",
+          "documentation":"<p>The server-side encryption algorithm used when storing this object in Amazon S3 (for example, AES256, aws:kms).</p>",
           "location":"header",
           "locationName":"x-amz-server-side-encryption"
         },
@@ -1830,25 +1827,25 @@
         },
         "SSECustomerAlgorithm":{
           "shape":"SSECustomerAlgorithm",
-          "documentation":"<p>Specifies the algorithm to use to when encrypting the object (e.g., AES256).</p>",
+          "documentation":"<p>Specifies the algorithm to use to when encrypting the object (for example, AES256).</p>",
           "location":"header",
           "locationName":"x-amz-server-side-encryption-customer-algorithm"
         },
         "SSECustomerKey":{
           "shape":"SSECustomerKey",
-          "documentation":"<p>Specifies the customer-provided encryption key for Amazon S3 to use in encrypting data. This value is used to store the object and then it is discarded; Amazon does not store the encryption key. The key must be appropriate for use with the algorithm specified in the x-amz-server-side​-encryption​-customer-algorithm header.</p>",
+          "documentation":"<p>Specifies the customer-provided encryption key for Amazon S3 to use in encrypting data. This value is used to store the object and then it is discarded; Amazon S3 does not store the encryption key. The key must be appropriate for use with the algorithm specified in the <code>x-amz-server-side​-encryption​-customer-algorithm</code> header.</p>",
           "location":"header",
           "locationName":"x-amz-server-side-encryption-customer-key"
         },
         "SSECustomerKeyMD5":{
           "shape":"SSECustomerKeyMD5",
-          "documentation":"<p>Specifies the 128-bit MD5 digest of the encryption key according to RFC 1321. Amazon S3 uses this header for a message integrity check to ensure the encryption key was transmitted without error.</p>",
+          "documentation":"<p>Specifies the 128-bit MD5 digest of the encryption key according to RFC 1321. Amazon S3 uses this header for a message integrity check to ensure that the encryption key was transmitted without error.</p>",
           "location":"header",
           "locationName":"x-amz-server-side-encryption-customer-key-MD5"
         },
         "SSEKMSKeyId":{
           "shape":"SSEKMSKeyId",
-          "documentation":"<p>Specifies the AWS KMS key ID to use for object encryption. All GET and PUT requests for an object protected by AWS KMS will fail if not made via SSL or using SigV4. Documentation on configuring any of the officially supported AWS SDKs and CLI can be found at http://docs.aws.amazon.com/AmazonS3/latest/dev/UsingAWSSDK.html#specify-signature-version</p>",
+          "documentation":"<p>Specifies the AWS KMS key ID to use for object encryption. All GET and PUT requests for an object protected by AWS KMS will fail if not made via SSL or using SigV4. For information about configuring using any of the officially supported AWS SDKs and AWS CLI, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/UsingAWSSDK.html#specify-signature-version\">Specifying the Signature Version in Request Authentication</a> in the <i>Amazon S3 Developer Guide</i>.</p>",
           "location":"header",
           "locationName":"x-amz-server-side-encryption-aws-kms-key-id"
         },
@@ -1860,7 +1857,7 @@
         },
         "CopySourceSSECustomerAlgorithm":{
           "shape":"CopySourceSSECustomerAlgorithm",
-          "documentation":"<p>Specifies the algorithm to use when decrypting the source object (e.g., AES256).</p>",
+          "documentation":"<p>Specifies the algorithm to use when decrypting the source object (for example, AES256).</p>",
           "location":"header",
           "locationName":"x-amz-copy-source-server-side-encryption-customer-algorithm"
         },
@@ -1872,7 +1869,7 @@
         },
         "CopySourceSSECustomerKeyMD5":{
           "shape":"CopySourceSSECustomerKeyMD5",
-          "documentation":"<p>Specifies the 128-bit MD5 digest of the encryption key according to RFC 1321. Amazon S3 uses this header for a message integrity check to ensure the encryption key was transmitted without error.</p>",
+          "documentation":"<p>Specifies the 128-bit MD5 digest of the encryption key according to RFC 1321. Amazon S3 uses this header for a message integrity check to ensure that the encryption key was transmitted without error.</p>",
           "location":"header",
           "locationName":"x-amz-copy-source-server-side-encryption-customer-key-MD5"
         },
@@ -1883,19 +1880,19 @@
         },
         "Tagging":{
           "shape":"TaggingHeader",
-          "documentation":"<p>The tag-set for the object destination object this value must be used in conjunction with the TaggingDirective. The tag-set must be encoded as URL Query parameters</p>",
+          "documentation":"<p>The tag-set for the object destination object this value must be used in conjunction with the <code>TaggingDirective</code>. The tag-set must be encoded as URL Query parameters.</p>",
           "location":"header",
           "locationName":"x-amz-tagging"
         },
         "ObjectLockMode":{
           "shape":"ObjectLockMode",
-          "documentation":"<p>The object lock mode that you want to apply to the copied object.</p>",
+          "documentation":"<p>The Object Lock mode that you want to apply to the copied object.</p>",
           "location":"header",
           "locationName":"x-amz-object-lock-mode"
         },
         "ObjectLockRetainUntilDate":{
           "shape":"ObjectLockRetainUntilDate",
-          "documentation":"<p>The date and time when you want the copied object's object lock to expire.</p>",
+          "documentation":"<p>The date and time when you want the copied object's Object Lock to expire.</p>",
           "location":"header",
           "locationName":"x-amz-object-lock-retain-until-date"
         },
@@ -1912,14 +1909,14 @@
       "members":{
         "ETag":{
           "shape":"ETag",
-          "documentation":"<p/>"
+          "documentation":"<p>Returns the ETag of the new object. The ETag reflects only changes to the contents of an object, not its metadata. The source and destination ETag is identical for a successfully copied object.</p>"
         },
         "LastModified":{
           "shape":"LastModified",
-          "documentation":"<p/>"
+          "documentation":"<p>Returns the date that the object was last modified.</p>"
         }
       },
-      "documentation":"<p/>"
+      "documentation":"<p>Container for all response elements.</p>"
     },
     "CopyPartResult":{
       "type":"structure",
@@ -1933,7 +1930,7 @@
           "documentation":"<p>Date and time at which the object was uploaded.</p>"
         }
       },
-      "documentation":"<p/>"
+      "documentation":"<p>Container for all response elements.</p>"
     },
     "CopySource":{
       "type":"string",
@@ -1956,17 +1953,17 @@
       "members":{
         "LocationConstraint":{
           "shape":"BucketLocationConstraint",
-          "documentation":"<p>Specifies the region where the bucket will be created. If you don't specify a region, the bucket is created in US East (N. Virginia) Region (us-east-1).</p>"
+          "documentation":"<p>Specifies the Region where the bucket will be created. If you don't specify a Region, the bucket is created in the US East (N. Virginia) Region (us-east-1).</p>"
         }
       },
-      "documentation":"<p/>"
+      "documentation":"<p>The configuration information for the bucket.</p>"
     },
     "CreateBucketOutput":{
       "type":"structure",
       "members":{
         "Location":{
           "shape":"Location",
-          "documentation":"<p/>",
+          "documentation":"<p>Specifies the Region where the bucket will be created. If you are creating a bucket on the US East (N. Virginia) Region (us-east-1), you do not need to specify the location.</p>",
           "location":"header",
           "locationName":"Location"
         }
@@ -1984,13 +1981,13 @@
         },
         "Bucket":{
           "shape":"BucketName",
-          "documentation":"<p/>",
+          "documentation":"<p>The name of the bucket to create.</p>",
           "location":"uri",
           "locationName":"Bucket"
         },
         "CreateBucketConfiguration":{
           "shape":"CreateBucketConfiguration",
-          "documentation":"<p/>",
+          "documentation":"<p>The configuration information for the bucket.</p>",
           "locationName":"CreateBucketConfiguration",
           "xmlNamespace":{"uri":"http://s3.amazonaws.com/doc/2006-03-01/"}
         },
@@ -2026,7 +2023,7 @@
         },
         "ObjectLockEnabledForBucket":{
           "shape":"ObjectLockEnabledForBucket",
-          "documentation":"<p>Specifies whether you want Amazon S3 object lock to be enabled for the new bucket.</p>",
+          "documentation":"<p>Specifies whether you want S3 Object Lock to be enabled for the new bucket.</p>",
           "location":"header",
           "locationName":"x-amz-bucket-object-lock-enabled"
         }
@@ -2038,19 +2035,19 @@
       "members":{
         "AbortDate":{
           "shape":"AbortDate",
-          "documentation":"<p>Date when multipart upload will become eligible for abort operation by lifecycle.</p>",
+          "documentation":"<p>If the bucket has a lifecycle rule configured with an action to abort incomplete multipart uploads and the prefix in the lifecycle rule matches the object name in the request, the response includes this header. The header indicates when the initiated multipart upload becomes eligible for an abort operation. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/mpuoverview.html#mpu-abort-incomplete-mpu-lifecycle-config\"> Aborting Incomplete Multipart Uploads Using a Bucket Lifecycle Policy</a>.</p> <p>The response also includes the <code>x-amz-abort-rule-id</code> header that provides the ID of the lifecycle configuration rule that defines this action.</p>",
           "location":"header",
           "locationName":"x-amz-abort-date"
         },
         "AbortRuleId":{
           "shape":"AbortRuleId",
-          "documentation":"<p>Id of the lifecycle rule that makes a multipart upload eligible for abort operation.</p>",
+          "documentation":"<p>This header is returned along with the <code>x-amz-abort-date</code> header. It identifies the applicable lifecycle configuration rule that defines the action to abort incomplete multipart uploads.</p>",
           "location":"header",
           "locationName":"x-amz-abort-rule-id"
         },
         "Bucket":{
           "shape":"BucketName",
-          "documentation":"<p>Name of the bucket to which the multipart upload was initiated.</p>",
+          "documentation":"<p>Name of the bucket to which the multipart upload was initiated. </p> <p>When using this API with an access point, you must direct requests to the access point hostname. The access point hostname takes the form <i>AccessPointName</i>-<i>AccountId</i>.s3-accesspoint.<i>Region</i>.amazonaws.com. When using this operation using an access point through the AWS SDKs, you provide the access point ARN in place of the bucket name. For more information about access point ARNs, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/using-access-points.html\">Using Access Points</a> in the <i>Amazon Simple Storage Service Developer Guide</i>.</p>",
           "locationName":"Bucket"
         },
         "Key":{
@@ -2063,7 +2060,7 @@
         },
         "ServerSideEncryption":{
           "shape":"ServerSideEncryption",
-          "documentation":"<p>The Server-side encryption algorithm used when storing this object in S3 (e.g., AES256, aws:kms).</p>",
+          "documentation":"<p>The server-side encryption algorithm used when storing this object in Amazon S3 (for example, AES256, aws:kms).</p>",
           "location":"header",
           "locationName":"x-amz-server-side-encryption"
         },
@@ -2075,13 +2072,13 @@
         },
         "SSECustomerKeyMD5":{
           "shape":"SSECustomerKeyMD5",
-          "documentation":"<p>If server-side encryption with a customer-provided encryption key was requested, the response will include this header to provide round trip message integrity verification of the customer-provided encryption key.</p>",
+          "documentation":"<p>If server-side encryption with a customer-provided encryption key was requested, the response will include this header to provide round-trip message integrity verification of the customer-provided encryption key.</p>",
           "location":"header",
           "locationName":"x-amz-server-side-encryption-customer-key-MD5"
         },
         "SSEKMSKeyId":{
           "shape":"SSEKMSKeyId",
-          "documentation":"<p>If present, specifies the ID of the AWS Key Management Service (KMS) master encryption key that was used for the object.</p>",
+          "documentation":"<p>If present, specifies the ID of the AWS Key Management Service (AWS KMS) symmetric customer managed customer master key (CMK) that was used for the object.</p>",
           "location":"header",
           "locationName":"x-amz-server-side-encryption-aws-kms-key-id"
         },
@@ -2113,7 +2110,7 @@
         },
         "Bucket":{
           "shape":"BucketName",
-          "documentation":"<p/>",
+          "documentation":"<p>The name of the bucket to which to initiate the upload</p>",
           "location":"uri",
           "locationName":"Bucket"
         },
@@ -2179,7 +2176,7 @@
         },
         "Key":{
           "shape":"ObjectKey",
-          "documentation":"<p/>",
+          "documentation":"<p>Object key for which the multipart upload is to be initiated.</p>",
           "location":"uri",
           "locationName":"Key"
         },
@@ -2191,7 +2188,7 @@
         },
         "ServerSideEncryption":{
           "shape":"ServerSideEncryption",
-          "documentation":"<p>The Server-side encryption algorithm used when storing this object in S3 (e.g., AES256, aws:kms).</p>",
+          "documentation":"<p>The server-side encryption algorithm used when storing this object in Amazon S3 (for example, AES256, aws:kms).</p>",
           "location":"header",
           "locationName":"x-amz-server-side-encryption"
         },
@@ -2209,25 +2206,25 @@
         },
         "SSECustomerAlgorithm":{
           "shape":"SSECustomerAlgorithm",
-          "documentation":"<p>Specifies the algorithm to use to when encrypting the object (e.g., AES256).</p>",
+          "documentation":"<p>Specifies the algorithm to use to when encrypting the object (for example, AES256).</p>",
           "location":"header",
           "locationName":"x-amz-server-side-encryption-customer-algorithm"
         },
         "SSECustomerKey":{
           "shape":"SSECustomerKey",
-          "documentation":"<p>Specifies the customer-provided encryption key for Amazon S3 to use in encrypting data. This value is used to store the object and then it is discarded; Amazon does not store the encryption key. The key must be appropriate for use with the algorithm specified in the x-amz-server-side​-encryption​-customer-algorithm header.</p>",
+          "documentation":"<p>Specifies the customer-provided encryption key for Amazon S3 to use in encrypting data. This value is used to store the object and then it is discarded; Amazon S3 does not store the encryption key. The key must be appropriate for use with the algorithm specified in the <code>x-amz-server-side​-encryption​-customer-algorithm</code> header.</p>",
           "location":"header",
           "locationName":"x-amz-server-side-encryption-customer-key"
         },
         "SSECustomerKeyMD5":{
           "shape":"SSECustomerKeyMD5",
-          "documentation":"<p>Specifies the 128-bit MD5 digest of the encryption key according to RFC 1321. Amazon S3 uses this header for a message integrity check to ensure the encryption key was transmitted without error.</p>",
+          "documentation":"<p>Specifies the 128-bit MD5 digest of the encryption key according to RFC 1321. Amazon S3 uses this header for a message integrity check to ensure that the encryption key was transmitted without error.</p>",
           "location":"header",
           "locationName":"x-amz-server-side-encryption-customer-key-MD5"
         },
         "SSEKMSKeyId":{
           "shape":"SSEKMSKeyId",
-          "documentation":"<p>Specifies the AWS KMS key ID to use for object encryption. All GET and PUT requests for an object protected by AWS KMS will fail if not made via SSL or using SigV4. Documentation on configuring any of the officially supported AWS SDKs and CLI can be found at http://docs.aws.amazon.com/AmazonS3/latest/dev/UsingAWSSDK.html#specify-signature-version</p>",
+          "documentation":"<p>Specifies the ID of the symmetric customer managed AWS KMS CMK to use for object encryption. All GET and PUT requests for an object protected by AWS KMS will fail if not made via SSL or using SigV4. For information about configuring using any of the officially supported AWS SDKs and AWS CLI, see <a href=\"https://docs.aws.amazon.com/http:/docs.aws.amazon.com/AmazonS3/latest/dev/UsingAWSSDK.html#specify-signature-version\">Specifying the Signature Version in Request Authentication</a> in the <i>Amazon S3 Developer Guide</i>.</p>",
           "location":"header",
           "locationName":"x-amz-server-side-encryption-aws-kms-key-id"
         },
@@ -2244,19 +2241,19 @@
         },
         "Tagging":{
           "shape":"TaggingHeader",
-          "documentation":"<p>The tag-set for the object. The tag-set must be encoded as URL Query parameters</p>",
+          "documentation":"<p>The tag-set for the object. The tag-set must be encoded as URL Query parameters.</p>",
           "location":"header",
           "locationName":"x-amz-tagging"
         },
         "ObjectLockMode":{
           "shape":"ObjectLockMode",
-          "documentation":"<p>Specifies the object lock mode that you want to apply to the uploaded object.</p>",
+          "documentation":"<p>Specifies the Object Lock mode that you want to apply to the uploaded object.</p>",
           "location":"header",
           "locationName":"x-amz-object-lock-mode"
         },
         "ObjectLockRetainUntilDate":{
           "shape":"ObjectLockRetainUntilDate",
-          "documentation":"<p>Specifies the date and time when you want the object lock to expire.</p>",
+          "documentation":"<p>Specifies the date and time when you want the Object Lock to expire.</p>",
           "location":"header",
           "locationName":"x-amz-object-lock-retain-until-date"
         },
@@ -2280,7 +2277,7 @@
       "members":{
         "Mode":{
           "shape":"ObjectLockRetentionMode",
-          "documentation":"<p>The default object lock retention mode you want to apply to new objects placed in the specified bucket.</p>"
+          "documentation":"<p>The default Object Lock retention mode you want to apply to new objects placed in the specified bucket.</p>"
         },
         "Days":{
           "shape":"Days",
@@ -2291,7 +2288,7 @@
           "documentation":"<p>The number of years that you want to specify for the default retention period.</p>"
         }
       },
-      "documentation":"<p>The container element for specifying the default object lock retention settings for new objects placed in the specified bucket.</p>"
+      "documentation":"<p>The container element for specifying the default Object Lock retention settings for new objects placed in the specified bucket.</p>"
     },
     "Delete":{
       "type":"structure",
@@ -2299,7 +2296,7 @@
       "members":{
         "Objects":{
           "shape":"ObjectIdentifierList",
-          "documentation":"<p/>",
+          "documentation":"<p>The objects to delete.</p>",
           "locationName":"Object"
         },
         "Quiet":{
@@ -2307,7 +2304,7 @@
           "documentation":"<p>Element to enable quiet mode for the request. When you add this element, you must set its value to true.</p>"
         }
       },
-      "documentation":"<p/>"
+      "documentation":"<p>Container for the objects to delete.</p>"
     },
     "DeleteBucketAnalyticsConfigurationRequest":{
       "type":"structure",
@@ -2336,7 +2333,7 @@
       "members":{
         "Bucket":{
           "shape":"BucketName",
-          "documentation":"<p/>",
+          "documentation":"<p>Specifies the bucket whose <code>cors</code> configuration is being deleted.</p>",
           "location":"uri",
           "locationName":"Bucket"
         }
@@ -2381,7 +2378,7 @@
       "members":{
         "Bucket":{
           "shape":"BucketName",
-          "documentation":"<p/>",
+          "documentation":"<p>The bucket name of the lifecycle to delete.</p>",
           "location":"uri",
           "locationName":"Bucket"
         }
@@ -2414,7 +2411,7 @@
       "members":{
         "Bucket":{
           "shape":"BucketName",
-          "documentation":"<p/>",
+          "documentation":"<p>The bucket name.</p>",
           "location":"uri",
           "locationName":"Bucket"
         }
@@ -2426,7 +2423,7 @@
       "members":{
         "Bucket":{
           "shape":"BucketName",
-          "documentation":"<p> The bucket name. </p> <note> <p>It can take a while to propagate the deletion of a replication configuration to all Amazon S3 systems.</p> </note>",
+          "documentation":"<p> The bucket name. </p>",
           "location":"uri",
           "locationName":"Bucket"
         }
@@ -2438,7 +2435,7 @@
       "members":{
         "Bucket":{
           "shape":"BucketName",
-          "documentation":"<p/>",
+          "documentation":"<p>Specifies the bucket being deleted.</p>",
           "location":"uri",
           "locationName":"Bucket"
         }
@@ -2450,7 +2447,7 @@
       "members":{
         "Bucket":{
           "shape":"BucketName",
-          "documentation":"<p/>",
+          "documentation":"<p>The bucket that has the tag set to be removed.</p>",
           "location":"uri",
           "locationName":"Bucket"
         }
@@ -2462,7 +2459,7 @@
       "members":{
         "Bucket":{
           "shape":"BucketName",
-          "documentation":"<p/>",
+          "documentation":"<p>The bucket name for which you want to remove the website configuration. </p>",
           "location":"uri",
           "locationName":"Bucket"
         }
@@ -2474,7 +2471,7 @@
       "members":{
         "Owner":{
           "shape":"Owner",
-          "documentation":"<p/>"
+          "documentation":"<p>The account that created the delete marker.&gt;</p>"
         },
         "Key":{
           "shape":"ObjectKey",
@@ -2493,17 +2490,17 @@
           "documentation":"<p>Date and time the object was last modified.</p>"
         }
       },
-      "documentation":"<p/>"
+      "documentation":"<p>Information about the delete marker.</p>"
     },
     "DeleteMarkerReplication":{
       "type":"structure",
       "members":{
         "Status":{
           "shape":"DeleteMarkerReplicationStatus",
-          "documentation":"<p>The status of the delete marker replication.</p> <note> <p> In the current implementation, Amazon S3 doesn't replicate the delete markers. The status must be <code>Disabled</code>. </p> </note>"
+          "documentation":"<p>Indicates whether to replicate delete markers.</p> <note> <p> In the current implementation, Amazon S3 doesn't replicate the delete markers. The status must be <code>Disabled</code>. </p> </note>"
         }
       },
-      "documentation":"<p>Specifies whether Amazon S3 should replicate delete makers.</p>"
+      "documentation":"<p>Specifies whether Amazon S3 replicates the delete markers. If you specify a <code>Filter</code>, you must specify this element. However, in the latest version of replication configuration (when <code>Filter</code> is specified), Amazon S3 doesn't replicate delete markers. Therefore, the <code>DeleteMarkerReplication</code> element can contain only &lt;Status&gt;Disabled&lt;/Status&gt;. For an example configuration, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/replication-add-config.html#replication-config-min-rule-config\">Basic Rule Configuration</a>. </p> <note> <p> If you don't specify the <code>Filter</code> element, Amazon S3 assumes that the replication configuration is the earlier version, V1. In the earlier version, Amazon S3 handled replication of delete markers differently. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/replication-add-config.html#replication-backward-compat-considerations\">Backward Compatibility</a>.</p> </note>"
     },
     "DeleteMarkerReplicationStatus":{
       "type":"string",
@@ -2549,19 +2546,19 @@
       "members":{
         "Bucket":{
           "shape":"BucketName",
-          "documentation":"<p/>",
+          "documentation":"<p>The bucket name of the bucket containing the object. </p> <p>When using this API with an access point, you must direct requests to the access point hostname. The access point hostname takes the form <i>AccessPointName</i>-<i>AccountId</i>.s3-accesspoint.<i>Region</i>.amazonaws.com. When using this operation using an access point through the AWS SDKs, you provide the access point ARN in place of the bucket name. For more information about access point ARNs, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/using-access-points.html\">Using Access Points</a> in the <i>Amazon Simple Storage Service Developer Guide</i>.</p>",
           "location":"uri",
           "locationName":"Bucket"
         },
         "Key":{
           "shape":"ObjectKey",
-          "documentation":"<p/>",
+          "documentation":"<p>Key name of the object to delete.</p>",
           "location":"uri",
           "locationName":"Key"
         },
         "MFA":{
           "shape":"MFA",
-          "documentation":"<p>The concatenation of the authentication device's serial number, a space, and the value that is displayed on your authentication device.</p>",
+          "documentation":"<p>The concatenation of the authentication device's serial number, a space, and the value that is displayed on your authentication device. Required to permanently delete a versioned object if versioning is configured with MFA delete enabled.</p>",
           "location":"header",
           "locationName":"x-amz-mfa"
         },
@@ -2578,7 +2575,7 @@
         },
         "BypassGovernanceRetention":{
           "shape":"BypassGovernanceRetention",
-          "documentation":"<p>Indicates whether Amazon S3 object lock should bypass governance-mode restrictions to process this operation.</p>",
+          "documentation":"<p>Indicates whether S3 Object Lock should bypass Governance-mode restrictions to process this operation.</p>",
           "location":"header",
           "locationName":"x-amz-bypass-governance-retention"
         }
@@ -2604,13 +2601,13 @@
       "members":{
         "Bucket":{
           "shape":"BucketName",
-          "documentation":"<p/>",
+          "documentation":"<p>The bucket name containing the objects from which to remove the tags. </p> <p>When using this API with an access point, you must direct requests to the access point hostname. The access point hostname takes the form <i>AccessPointName</i>-<i>AccountId</i>.s3-accesspoint.<i>Region</i>.amazonaws.com. When using this operation using an access point through the AWS SDKs, you provide the access point ARN in place of the bucket name. For more information about access point ARNs, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/using-access-points.html\">Using Access Points</a> in the <i>Amazon Simple Storage Service Developer Guide</i>.</p>",
           "location":"uri",
           "locationName":"Bucket"
         },
         "Key":{
           "shape":"ObjectKey",
-          "documentation":"<p/>",
+          "documentation":"<p>Name of the tag.</p>",
           "location":"uri",
           "locationName":"Key"
         },
@@ -2627,7 +2624,7 @@
       "members":{
         "Deleted":{
           "shape":"DeletedObjects",
-          "documentation":"<p/>"
+          "documentation":"<p>Container element for a successful delete. It identifies the object that was successfully deleted.</p>"
         },
         "RequestCharged":{
           "shape":"RequestCharged",
@@ -2636,7 +2633,7 @@
         },
         "Errors":{
           "shape":"Errors",
-          "documentation":"<p/>",
+          "documentation":"<p>Container for a failed delete operation that describes the object that Amazon S3 attempted to delete and the error it encountered.</p>",
           "locationName":"Error"
         }
       }
@@ -2650,19 +2647,19 @@
       "members":{
         "Bucket":{
           "shape":"BucketName",
-          "documentation":"<p/>",
+          "documentation":"<p>The bucket name containing the objects to delete. </p> <p>When using this API with an access point, you must direct requests to the access point hostname. The access point hostname takes the form <i>AccessPointName</i>-<i>AccountId</i>.s3-accesspoint.<i>Region</i>.amazonaws.com. When using this operation using an access point through the AWS SDKs, you provide the access point ARN in place of the bucket name. For more information about access point ARNs, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/using-access-points.html\">Using Access Points</a> in the <i>Amazon Simple Storage Service Developer Guide</i>.</p>",
           "location":"uri",
           "locationName":"Bucket"
         },
         "Delete":{
           "shape":"Delete",
-          "documentation":"<p/>",
+          "documentation":"<p>Container for the request.</p>",
           "locationName":"Delete",
           "xmlNamespace":{"uri":"http://s3.amazonaws.com/doc/2006-03-01/"}
         },
         "MFA":{
           "shape":"MFA",
-          "documentation":"<p>The concatenation of the authentication device's serial number, a space, and the value that is displayed on your authentication device.</p>",
+          "documentation":"<p>The concatenation of the authentication device's serial number, a space, and the value that is displayed on your authentication device. Required to permanently delete a versioned object if versioning is configured with MFA delete enabled.</p>",
           "location":"header",
           "locationName":"x-amz-mfa"
         },
@@ -2673,7 +2670,7 @@
         },
         "BypassGovernanceRetention":{
           "shape":"BypassGovernanceRetention",
-          "documentation":"<p>Specifies whether you want to delete this object even if it has a Governance-type object lock in place. You must have sufficient permissions to perform this operation.</p>",
+          "documentation":"<p>Specifies whether you want to delete this object even if it has a Governance-type Object Lock in place. You must have sufficient permissions to perform this operation.</p>",
           "location":"header",
           "locationName":"x-amz-bypass-governance-retention"
         }
@@ -2697,22 +2694,22 @@
       "members":{
         "Key":{
           "shape":"ObjectKey",
-          "documentation":"<p/>"
+          "documentation":"<p>The name of the deleted object.</p>"
         },
         "VersionId":{
           "shape":"ObjectVersionId",
-          "documentation":"<p/>"
+          "documentation":"<p>The version ID of the deleted object.</p>"
         },
         "DeleteMarker":{
           "shape":"DeleteMarker",
-          "documentation":"<p/>"
+          "documentation":"<p>Specifies whether the versioned object that was permanently deleted was (true) or was not (false) a delete marker. In a simple DELETE, this header indicates whether (true) or not (false) a delete marker was created.</p>"
         },
         "DeleteMarkerVersionId":{
           "shape":"DeleteMarkerVersionId",
-          "documentation":"<p/>"
+          "documentation":"<p>The version ID of the delete marker created as a result of the DELETE operation. If you delete a specific object version, the value returned by this header is the version ID of the object version deleted.</p>"
         }
       },
-      "documentation":"<p/>"
+      "documentation":"<p>Information about the deleted object.</p>"
     },
     "DeletedObjects":{
       "type":"list",
@@ -2727,11 +2724,11 @@
       "members":{
         "Bucket":{
           "shape":"BucketName",
-          "documentation":"<p> The Amazon Resource Name (ARN) of the bucket where you want Amazon S3 to store replicas of the object identified by the rule.</p> <p>A replication configuration can replicate objects to only one destination bucket. If there are multiple rules in your replication configuration, all rules must specify the same destination bucket.</p>"
+          "documentation":"<p> The Amazon Resource Name (ARN) of the bucket where you want Amazon S3 to store the results.</p>"
         },
         "Account":{
           "shape":"AccountId",
-          "documentation":"<p>Destination bucket owner account ID. In a cross-account scenario, if you direct Amazon S3 to change replica ownership to the AWS account that owns the destination bucket by specifying the <code>AccessControlTranslation</code> property, this is the account ID of the destination bucket owner. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/crr-change-owner.html\">Cross-Region Replication Additional Configuration: Change Replica Owner</a> in the <i>Amazon Simple Storage Service Developer Guide</i>.</p>"
+          "documentation":"<p>Destination bucket owner account ID. In a cross-account scenario, if you direct Amazon S3 to change replica ownership to the AWS account that owns the destination bucket by specifying the <code>AccessControlTranslation</code> property, this is the account ID of the destination bucket owner. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/replication-change-owner.html\">Replication Additional Configuration: Changing the Replica Owner</a> in the <i>Amazon Simple Storage Service Developer Guide</i>.</p>"
         },
         "StorageClass":{
           "shape":"StorageClass",
@@ -2744,9 +2741,17 @@
         "EncryptionConfiguration":{
           "shape":"EncryptionConfiguration",
           "documentation":"<p>A container that provides information about encryption. If <code>SourceSelectionCriteria</code> is specified, you must specify this element.</p>"
+        },
+        "ReplicationTime":{
+          "shape":"ReplicationTime",
+          "documentation":"<p> A container specifying S3 Replication Time Control (S3 RTC), including whether S3 RTC is enabled and the time when all objects and operations on objects must be replicated. Must be specified together with a <code>Metrics</code> block. </p>"
+        },
+        "Metrics":{
+          "shape":"Metrics",
+          "documentation":"<p> A container specifying replication metrics-related settings enabling metrics and Amazon S3 events for S3 Replication Time Control (S3 RTC). Must be specified together with a <code>ReplicationTime</code> block. </p>"
         }
       },
-      "documentation":"<p>Specifies information about where to publish analysis or configuration results for an Amazon S3 bucket.</p>"
+      "documentation":"<p>Specifies information about where to publish analysis or configuration results for an Amazon S3 bucket and S3 Replication Time Control (S3 RTC).</p>"
     },
     "DisplayName":{"type":"string"},
     "ETag":{"type":"string"},
@@ -2763,25 +2768,25 @@
       "members":{
         "EncryptionType":{
           "shape":"ServerSideEncryption",
-          "documentation":"<p>The server-side encryption algorithm used when storing job results in Amazon S3 (e.g., AES256, aws:kms).</p>"
+          "documentation":"<p>The server-side encryption algorithm used when storing job results in Amazon S3 (for example, AES256, aws:kms).</p>"
         },
         "KMSKeyId":{
           "shape":"SSEKMSKeyId",
-          "documentation":"<p>If the encryption type is aws:kms, this optional value specifies the AWS KMS key ID to use for encryption of job results.</p>"
+          "documentation":"<p>If the encryption type is <code>aws:kms</code>, this optional value specifies the ID of the symmetric customer managed AWS KMS CMK to use for encryption of job results. Amazon S3 only supports symmetric CMKs. For more information, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/symmetric-asymmetric.html\">Using Symmetric and Asymmetric Keys</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
         },
         "KMSContext":{
           "shape":"KMSContext",
-          "documentation":"<p>If the encryption type is aws:kms, this optional value can be used to specify the encryption context for the restore results.</p>"
+          "documentation":"<p>If the encryption type is <code>aws:kms</code>, this optional value can be used to specify the encryption context for the restore results.</p>"
         }
       },
-      "documentation":"<p>Describes the server-side encryption that will be applied to the restore results.</p>"
+      "documentation":"<p>Contains the type of server-side encryption used.</p>"
     },
     "EncryptionConfiguration":{
       "type":"structure",
       "members":{
         "ReplicaKmsKeyID":{
           "shape":"ReplicaKmsKeyID",
-          "documentation":"<p>Specifies the AWS KMS Key ID (Key ARN or Alias ARN) for the destination bucket. Amazon S3 uses this key to encrypt replica objects.</p>"
+          "documentation":"<p>Specifies the ID (Key ARN or Alias ARN) of the customer managed customer master key (CMK) stored in AWS Key Management Service (KMS) for the destination bucket. Amazon S3 uses this key to encrypt replica objects. Amazon S3 only supports symmetric customer managed CMKs. For more information, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/symmetric-asymmetric.html\">Using Symmetric and Asymmetric Keys</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
         }
       },
       "documentation":"<p>Specifies encryption-related information for an Amazon S3 bucket that is a destination for replicated objects.</p>"
@@ -2791,7 +2796,7 @@
       "type":"structure",
       "members":{
       },
-      "documentation":"<p/>",
+      "documentation":"<p>A message that indicates the request is complete and no more messages will be sent. You should not assume that the request is complete until the client receives an <code>EndEvent</code>.</p>",
       "event":true
     },
     "Error":{
@@ -2799,22 +2804,22 @@
       "members":{
         "Key":{
           "shape":"ObjectKey",
-          "documentation":"<p/>"
+          "documentation":"<p>The error key.</p>"
         },
         "VersionId":{
           "shape":"ObjectVersionId",
-          "documentation":"<p/>"
+          "documentation":"<p>The version ID of the error.</p>"
         },
         "Code":{
           "shape":"Code",
-          "documentation":"<p/>"
+          "documentation":"<p>The error code is a string that uniquely identifies an error condition. It is meant to be read and understood by programs that detect and handle errors by type. </p> <p class=\"title\"> <b>Amazon S3 error codes</b> </p> <ul> <li> <ul> <li> <p> <i>Code:</i> AccessDenied </p> </li> <li> <p> <i>Description:</i> Access Denied</p> </li> <li> <p> <i>HTTP Status Code:</i> 403 Forbidden</p> </li> <li> <p> <i>SOAP Fault Code Prefix:</i> Client</p> </li> </ul> </li> <li> <ul> <li> <p> <i>Code:</i> AccountProblem</p> </li> <li> <p> <i>Description:</i> There is a problem with your AWS account that prevents the operation from completing successfully. Contact AWS Support for further assistance.</p> </li> <li> <p> <i>HTTP Status Code:</i> 403 Forbidden</p> </li> <li> <p> <i>SOAP Fault Code Prefix:</i> Client</p> </li> </ul> </li> <li> <ul> <li> <p> <i>Code:</i> AllAccessDisabled</p> </li> <li> <p> <i>Description:</i> All access to this Amazon S3 resource has been disabled. Contact AWS Support for further assistance.</p> </li> <li> <p> <i>HTTP Status Code:</i> 403 Forbidden</p> </li> <li> <p> <i>SOAP Fault Code Prefix:</i> Client</p> </li> </ul> </li> <li> <ul> <li> <p> <i>Code:</i> AmbiguousGrantByEmailAddress</p> </li> <li> <p> <i>Description:</i> The email address you provided is associated with more than one account.</p> </li> <li> <p> <i>HTTP Status Code:</i> 400 Bad Request</p> </li> <li> <p> <i>SOAP Fault Code Prefix:</i> Client</p> </li> </ul> </li> <li> <ul> <li> <p> <i>Code:</i> AuthorizationHeaderMalformed</p> </li> <li> <p> <i>Description:</i> The authorization header you provided is invalid.</p> </li> <li> <p> <i>HTTP Status Code:</i> 400 Bad Request</p> </li> <li> <p> <i>HTTP Status Code:</i> N/A</p> </li> </ul> </li> <li> <ul> <li> <p> <i>Code:</i> BadDigest</p> </li> <li> <p> <i>Description:</i> The Content-MD5 you specified did not match what we received.</p> </li> <li> <p> <i>HTTP Status Code:</i> 400 Bad Request</p> </li> <li> <p> <i>SOAP Fault Code Prefix:</i> Client</p> </li> </ul> </li> <li> <ul> <li> <p> <i>Code:</i> BucketAlreadyExists</p> </li> <li> <p> <i>Description:</i> The requested bucket name is not available. The bucket namespace is shared by all users of the system. Please select a different name and try again.</p> </li> <li> <p> <i>HTTP Status Code:</i> 409 Conflict</p> </li> <li> <p> <i>SOAP Fault Code Prefix:</i> Client</p> </li> </ul> </li> <li> <ul> <li> <p> <i>Code:</i> BucketAlreadyOwnedByYou</p> </li> <li> <p> <i>Description:</i> The bucket you tried to create already exists, and you own it. Amazon S3 returns this error in all AWS Regions except in the North Virginia Region. For legacy compatibility, if you re-create an existing bucket that you already own in the North Virginia Region, Amazon S3 returns 200 OK and resets the bucket access control lists (ACLs).</p> </li> <li> <p> <i>Code:</i> 409 Conflict (in all Regions except the North Virginia Region) </p> </li> <li> <p> <i>SOAP Fault Code Prefix:</i> Client</p> </li> </ul> </li> <li> <ul> <li> <p> <i>Code:</i> BucketNotEmpty</p> </li> <li> <p> <i>Description:</i> The bucket you tried to delete is not empty.</p> </li> <li> <p> <i>HTTP Status Code:</i> 409 Conflict</p> </li> <li> <p> <i>SOAP Fault Code Prefix:</i> Client</p> </li> </ul> </li> <li> <ul> <li> <p> <i>Code:</i> CredentialsNotSupported</p> </li> <li> <p> <i>Description:</i> This request does not support credentials.</p> </li> <li> <p> <i>HTTP Status Code:</i> 400 Bad Request</p> </li> <li> <p> <i>SOAP Fault Code Prefix:</i> Client</p> </li> </ul> </li> <li> <ul> <li> <p> <i>Code:</i> CrossLocationLoggingProhibited</p> </li> <li> <p> <i>Description:</i> Cross-location logging not allowed. Buckets in one geographic location cannot log information to a bucket in another location.</p> </li> <li> <p> <i>HTTP Status Code:</i> 403 Forbidden</p> </li> <li> <p> <i>SOAP Fault Code Prefix:</i> Client</p> </li> </ul> </li> <li> <ul> <li> <p> <i>Code:</i> EntityTooSmall</p> </li> <li> <p> <i>Description:</i> Your proposed upload is smaller than the minimum allowed object size.</p> </li> <li> <p> <i>HTTP Status Code:</i> 400 Bad Request</p> </li> <li> <p> <i>SOAP Fault Code Prefix:</i> Client</p> </li> </ul> </li> <li> <ul> <li> <p> <i>Code:</i> EntityTooLarge</p> </li> <li> <p> <i>Description:</i> Your proposed upload exceeds the maximum allowed object size.</p> </li> <li> <p> <i>HTTP Status Code:</i> 400 Bad Request</p> </li> <li> <p> <i>SOAP Fault Code Prefix:</i> Client</p> </li> </ul> </li> <li> <ul> <li> <p> <i>Code:</i> ExpiredToken</p> </li> <li> <p> <i>Description:</i> The provided token has expired.</p> </li> <li> <p> <i>HTTP Status Code:</i> 400 Bad Request</p> </li> <li> <p> <i>SOAP Fault Code Prefix:</i> Client</p> </li> </ul> </li> <li> <ul> <li> <p> <i>Code:</i> IllegalVersioningConfigurationException </p> </li> <li> <p> <i>Description:</i> Indicates that the versioning configuration specified in the request is invalid.</p> </li> <li> <p> <i>HTTP Status Code:</i> 400 Bad Request</p> </li> <li> <p> <i>SOAP Fault Code Prefix:</i> Client</p> </li> </ul> </li> <li> <ul> <li> <p> <i>Code:</i> IncompleteBody</p> </li> <li> <p> <i>Description:</i> You did not provide the number of bytes specified by the Content-Length HTTP header</p> </li> <li> <p> <i>HTTP Status Code:</i> 400 Bad Request</p> </li> <li> <p> <i>SOAP Fault Code Prefix:</i> Client</p> </li> </ul> </li> <li> <ul> <li> <p> <i>Code:</i> IncorrectNumberOfFilesInPostRequest</p> </li> <li> <p> <i>Description:</i> POST requires exactly one file upload per request.</p> </li> <li> <p> <i>HTTP Status Code:</i> 400 Bad Request</p> </li> <li> <p> <i>SOAP Fault Code Prefix:</i> Client</p> </li> </ul> </li> <li> <ul> <li> <p> <i>Code:</i> InlineDataTooLarge</p> </li> <li> <p> <i>Description:</i> Inline data exceeds the maximum allowed size.</p> </li> <li> <p> <i>HTTP Status Code:</i> 400 Bad Request</p> </li> <li> <p> <i>SOAP Fault Code Prefix:</i> Client</p> </li> </ul> </li> <li> <ul> <li> <p> <i>Code:</i> InternalError</p> </li> <li> <p> <i>Description:</i> We encountered an internal error. Please try again.</p> </li> <li> <p> <i>HTTP Status Code:</i> 500 Internal Server Error</p> </li> <li> <p> <i>SOAP Fault Code Prefix:</i> Server</p> </li> </ul> </li> <li> <ul> <li> <p> <i>Code:</i> InvalidAccessKeyId</p> </li> <li> <p> <i>Description:</i> The AWS access key ID you provided does not exist in our records.</p> </li> <li> <p> <i>HTTP Status Code:</i> 403 Forbidden</p> </li> <li> <p> <i>SOAP Fault Code Prefix:</i> Client</p> </li> </ul> </li> <li> <ul> <li> <p> <i>Code:</i> InvalidAddressingHeader</p> </li> <li> <p> <i>Description:</i> You must specify the Anonymous role.</p> </li> <li> <p> <i>HTTP Status Code:</i> N/A</p> </li> <li> <p> <i>SOAP Fault Code Prefix:</i> Client</p> </li> </ul> </li> <li> <ul> <li> <p> <i>Code:</i> InvalidArgument</p> </li> <li> <p> <i>Description:</i> Invalid Argument</p> </li> <li> <p> <i>HTTP Status Code:</i> 400 Bad Request</p> </li> <li> <p> <i>SOAP Fault Code Prefix:</i> Client</p> </li> </ul> </li> <li> <ul> <li> <p> <i>Code:</i> InvalidBucketName</p> </li> <li> <p> <i>Description:</i> The specified bucket is not valid.</p> </li> <li> <p> <i>HTTP Status Code:</i> 400 Bad Request</p> </li> <li> <p> <i>SOAP Fault Code Prefix:</i> Client</p> </li> </ul> </li> <li> <ul> <li> <p> <i>Code:</i> InvalidBucketState</p> </li> <li> <p> <i>Description:</i> The request is not valid with the current state of the bucket.</p> </li> <li> <p> <i>HTTP Status Code:</i> 409 Conflict</p> </li> <li> <p> <i>SOAP Fault Code Prefix:</i> Client</p> </li> </ul> </li> <li> <ul> <li> <p> <i>Code:</i> InvalidDigest</p> </li> <li> <p> <i>Description:</i> The Content-MD5 you specified is not valid.</p> </li> <li> <p> <i>HTTP Status Code:</i> 400 Bad Request</p> </li> <li> <p> <i>SOAP Fault Code Prefix:</i> Client</p> </li> </ul> </li> <li> <ul> <li> <p> <i>Code:</i> InvalidEncryptionAlgorithmError</p> </li> <li> <p> <i>Description:</i> The encryption request you specified is not valid. The valid value is AES256.</p> </li> <li> <p> <i>HTTP Status Code:</i> 400 Bad Request</p> </li> <li> <p> <i>SOAP Fault Code Prefix:</i> Client</p> </li> </ul> </li> <li> <ul> <li> <p> <i>Code:</i> InvalidLocationConstraint</p> </li> <li> <p> <i>Description:</i> The specified location constraint is not valid. For more information about Regions, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/UsingBucket.html#access-bucket-intro\">How to Select a Region for Your Buckets</a>. </p> </li> <li> <p> <i>HTTP Status Code:</i> 400 Bad Request</p> </li> <li> <p> <i>SOAP Fault Code Prefix:</i> Client</p> </li> </ul> </li> <li> <ul> <li> <p> <i>Code:</i> InvalidObjectState</p> </li> <li> <p> <i>Description:</i> The operation is not valid for the current state of the object.</p> </li> <li> <p> <i>HTTP Status Code:</i> 403 Forbidden</p> </li> <li> <p> <i>SOAP Fault Code Prefix:</i> Client</p> </li> </ul> </li> <li> <ul> <li> <p> <i>Code:</i> InvalidPart</p> </li> <li> <p> <i>Description:</i> One or more of the specified parts could not be found. The part might not have been uploaded, or the specified entity tag might not have matched the part's entity tag.</p> </li> <li> <p> <i>HTTP Status Code:</i> 400 Bad Request</p> </li> <li> <p> <i>SOAP Fault Code Prefix:</i> Client</p> </li> </ul> </li> <li> <ul> <li> <p> <i>Code:</i> InvalidPartOrder</p> </li> <li> <p> <i>Description:</i> The list of parts was not in ascending order. Parts list must be specified in order by part number.</p> </li> <li> <p> <i>HTTP Status Code:</i> 400 Bad Request</p> </li> <li> <p> <i>SOAP Fault Code Prefix:</i> Client</p> </li> </ul> </li> <li> <ul> <li> <p> <i>Code:</i> InvalidPayer</p> </li> <li> <p> <i>Description:</i> All access to this object has been disabled. Please contact AWS Support for further assistance.</p> </li> <li> <p> <i>HTTP Status Code:</i> 403 Forbidden</p> </li> <li> <p> <i>SOAP Fault Code Prefix:</i> Client</p> </li> </ul> </li> <li> <ul> <li> <p> <i>Code:</i> InvalidPolicyDocument</p> </li> <li> <p> <i>Description:</i> The content of the form does not meet the conditions specified in the policy document.</p> </li> <li> <p> <i>HTTP Status Code:</i> 400 Bad Request</p> </li> <li> <p> <i>SOAP Fault Code Prefix:</i> Client</p> </li> </ul> </li> <li> <ul> <li> <p> <i>Code:</i> InvalidRange</p> </li> <li> <p> <i>Description:</i> The requested range cannot be satisfied.</p> </li> <li> <p> <i>HTTP Status Code:</i> 416 Requested Range Not Satisfiable</p> </li> <li> <p> <i>SOAP Fault Code Prefix:</i> Client</p> </li> </ul> </li> <li> <ul> <li> <p> <i>Code:</i> InvalidRequest</p> </li> <li> <p> <i>Description:</i> Please use AWS4-HMAC-SHA256.</p> </li> <li> <p> <i>HTTP Status Code:</i> 400 Bad Request</p> </li> <li> <p> <i>Code:</i> N/A</p> </li> </ul> </li> <li> <ul> <li> <p> <i>Code:</i> InvalidRequest</p> </li> <li> <p> <i>Description:</i> SOAP requests must be made over an HTTPS connection.</p> </li> <li> <p> <i>HTTP Status Code:</i> 400 Bad Request</p> </li> <li> <p> <i>SOAP Fault Code Prefix:</i> Client</p> </li> </ul> </li> <li> <ul> <li> <p> <i>Code:</i> InvalidRequest</p> </li> <li> <p> <i>Description:</i> Amazon S3 Transfer Acceleration is not supported for buckets with non-DNS compliant names.</p> </li> <li> <p> <i>HTTP Status Code:</i> 400 Bad Request</p> </li> <li> <p> <i>Code:</i> N/A</p> </li> </ul> </li> <li> <ul> <li> <p> <i>Code:</i> InvalidRequest</p> </li> <li> <p> <i>Description:</i> Amazon S3 Transfer Acceleration is not supported for buckets with periods (.) in their names.</p> </li> <li> <p> <i>HTTP Status Code:</i> 400 Bad Request</p> </li> <li> <p> <i>Code:</i> N/A</p> </li> </ul> </li> <li> <ul> <li> <p> <i>Code:</i> InvalidRequest</p> </li> <li> <p> <i>Description:</i> Amazon S3 Transfer Accelerate endpoint only supports virtual style requests.</p> </li> <li> <p> <i>HTTP Status Code:</i> 400 Bad Request</p> </li> <li> <p> <i>Code:</i> N/A</p> </li> </ul> </li> <li> <ul> <li> <p> <i>Code:</i> InvalidRequest</p> </li> <li> <p> <i>Description:</i> Amazon S3 Transfer Accelerate is not configured on this bucket.</p> </li> <li> <p> <i>HTTP Status Code:</i> 400 Bad Request</p> </li> <li> <p> <i>Code:</i> N/A</p> </li> </ul> </li> <li> <ul> <li> <p> <i>Code:</i> InvalidRequest</p> </li> <li> <p> <i>Description:</i> Amazon S3 Transfer Accelerate is disabled on this bucket.</p> </li> <li> <p> <i>HTTP Status Code:</i> 400 Bad Request</p> </li> <li> <p> <i>Code:</i> N/A</p> </li> </ul> </li> <li> <ul> <li> <p> <i>Code:</i> InvalidRequest</p> </li> <li> <p> <i>Description:</i> Amazon S3 Transfer Acceleration is not supported on this bucket. Contact AWS Support for more information.</p> </li> <li> <p> <i>HTTP Status Code:</i> 400 Bad Request</p> </li> <li> <p> <i>Code:</i> N/A</p> </li> </ul> </li> <li> <ul> <li> <p> <i>Code:</i> InvalidRequest</p> </li> <li> <p> <i>Description:</i> Amazon S3 Transfer Acceleration cannot be enabled on this bucket. Contact AWS Support for more information.</p> </li> <li> <p> <i>HTTP Status Code:</i> 400 Bad Request</p> </li> <li> <p> <i>Code:</i> N/A</p> </li> </ul> </li> <li> <ul> <li> <p> <i>Code:</i> InvalidSecurity</p> </li> <li> <p> <i>Description:</i> The provided security credentials are not valid.</p> </li> <li> <p> <i>HTTP Status Code:</i> 403 Forbidden</p> </li> <li> <p> <i>SOAP Fault Code Prefix:</i> Client</p> </li> </ul> </li> <li> <ul> <li> <p> <i>Code:</i> InvalidSOAPRequest</p> </li> <li> <p> <i>Description:</i> The SOAP request body is invalid.</p> </li> <li> <p> <i>HTTP Status Code:</i> 400 Bad Request</p> </li> <li> <p> <i>SOAP Fault Code Prefix:</i> Client</p> </li> </ul> </li> <li> <ul> <li> <p> <i>Code:</i> InvalidStorageClass</p> </li> <li> <p> <i>Description:</i> The storage class you specified is not valid.</p> </li> <li> <p> <i>HTTP Status Code:</i> 400 Bad Request</p> </li> <li> <p> <i>SOAP Fault Code Prefix:</i> Client</p> </li> </ul> </li> <li> <ul> <li> <p> <i>Code:</i> InvalidTargetBucketForLogging</p> </li> <li> <p> <i>Description:</i> The target bucket for logging does not exist, is not owned by you, or does not have the appropriate grants for the log-delivery group. </p> </li> <li> <p> <i>HTTP Status Code:</i> 400 Bad Request</p> </li> <li> <p> <i>SOAP Fault Code Prefix:</i> Client</p> </li> </ul> </li> <li> <ul> <li> <p> <i>Code:</i> InvalidToken</p> </li> <li> <p> <i>Description:</i> The provided token is malformed or otherwise invalid.</p> </li> <li> <p> <i>HTTP Status Code:</i> 400 Bad Request</p> </li> <li> <p> <i>SOAP Fault Code Prefix:</i> Client</p> </li> </ul> </li> <li> <ul> <li> <p> <i>Code:</i> InvalidURI</p> </li> <li> <p> <i>Description:</i> Couldn't parse the specified URI.</p> </li> <li> <p> <i>HTTP Status Code:</i> 400 Bad Request</p> </li> <li> <p> <i>SOAP Fault Code Prefix:</i> Client</p> </li> </ul> </li> <li> <ul> <li> <p> <i>Code:</i> KeyTooLongError</p> </li> <li> <p> <i>Description:</i> Your key is too long.</p> </li> <li> <p> <i>HTTP Status Code:</i> 400 Bad Request</p> </li> <li> <p> <i>SOAP Fault Code Prefix:</i> Client</p> </li> </ul> </li> <li> <ul> <li> <p> <i>Code:</i> MalformedACLError</p> </li> <li> <p> <i>Description:</i> The XML you provided was not well-formed or did not validate against our published schema.</p> </li> <li> <p> <i>HTTP Status Code:</i> 400 Bad Request</p> </li> <li> <p> <i>SOAP Fault Code Prefix:</i> Client</p> </li> </ul> </li> <li> <ul> <li> <p> <i>Code:</i> MalformedPOSTRequest </p> </li> <li> <p> <i>Description:</i> The body of your POST request is not well-formed multipart/form-data.</p> </li> <li> <p> <i>HTTP Status Code:</i> 400 Bad Request</p> </li> <li> <p> <i>SOAP Fault Code Prefix:</i> Client</p> </li> </ul> </li> <li> <ul> <li> <p> <i>Code:</i> MalformedXML</p> </li> <li> <p> <i>Description:</i> This happens when the user sends malformed XML (XML that doesn't conform to the published XSD) for the configuration. The error message is, \"The XML you provided was not well-formed or did not validate against our published schema.\" </p> </li> <li> <p> <i>HTTP Status Code:</i> 400 Bad Request</p> </li> <li> <p> <i>SOAP Fault Code Prefix:</i> Client</p> </li> </ul> </li> <li> <ul> <li> <p> <i>Code:</i> MaxMessageLengthExceeded</p> </li> <li> <p> <i>Description:</i> Your request was too big.</p> </li> <li> <p> <i>HTTP Status Code:</i> 400 Bad Request</p> </li> <li> <p> <i>SOAP Fault Code Prefix:</i> Client</p> </li> </ul> </li> <li> <ul> <li> <p> <i>Code:</i> MaxPostPreDataLengthExceededError</p> </li> <li> <p> <i>Description:</i> Your POST request fields preceding the upload file were too large.</p> </li> <li> <p> <i>HTTP Status Code:</i> 400 Bad Request</p> </li> <li> <p> <i>SOAP Fault Code Prefix:</i> Client</p> </li> </ul> </li> <li> <ul> <li> <p> <i>Code:</i> MetadataTooLarge</p> </li> <li> <p> <i>Description:</i> Your metadata headers exceed the maximum allowed metadata size.</p> </li> <li> <p> <i>HTTP Status Code:</i> 400 Bad Request</p> </li> <li> <p> <i>SOAP Fault Code Prefix:</i> Client</p> </li> </ul> </li> <li> <ul> <li> <p> <i>Code:</i> MethodNotAllowed</p> </li> <li> <p> <i>Description:</i> The specified method is not allowed against this resource.</p> </li> <li> <p> <i>HTTP Status Code:</i> 405 Method Not Allowed</p> </li> <li> <p> <i>SOAP Fault Code Prefix:</i> Client</p> </li> </ul> </li> <li> <ul> <li> <p> <i>Code:</i> MissingAttachment</p> </li> <li> <p> <i>Description:</i> A SOAP attachment was expected, but none were found.</p> </li> <li> <p> <i>HTTP Status Code:</i> N/A</p> </li> <li> <p> <i>SOAP Fault Code Prefix:</i> Client</p> </li> </ul> </li> <li> <ul> <li> <p> <i>Code:</i> MissingContentLength</p> </li> <li> <p> <i>Description:</i> You must provide the Content-Length HTTP header.</p> </li> <li> <p> <i>HTTP Status Code:</i> 411 Length Required</p> </li> <li> <p> <i>SOAP Fault Code Prefix:</i> Client</p> </li> </ul> </li> <li> <ul> <li> <p> <i>Code:</i> MissingRequestBodyError</p> </li> <li> <p> <i>Description:</i> This happens when the user sends an empty XML document as a request. The error message is, \"Request body is empty.\" </p> </li> <li> <p> <i>HTTP Status Code:</i> 400 Bad Request</p> </li> <li> <p> <i>SOAP Fault Code Prefix:</i> Client</p> </li> </ul> </li> <li> <ul> <li> <p> <i>Code:</i> MissingSecurityElement</p> </li> <li> <p> <i>Description:</i> The SOAP 1.1 request is missing a security element.</p> </li> <li> <p> <i>HTTP Status Code:</i> 400 Bad Request</p> </li> <li> <p> <i>SOAP Fault Code Prefix:</i> Client</p> </li> </ul> </li> <li> <ul> <li> <p> <i>Code:</i> MissingSecurityHeader</p> </li> <li> <p> <i>Description:</i> Your request is missing a required header.</p> </li> <li> <p> <i>HTTP Status Code:</i> 400 Bad Request</p> </li> <li> <p> <i>SOAP Fault Code Prefix:</i> Client</p> </li> </ul> </li> <li> <ul> <li> <p> <i>Code:</i> NoLoggingStatusForKey</p> </li> <li> <p> <i>Description:</i> There is no such thing as a logging status subresource for a key.</p> </li> <li> <p> <i>HTTP Status Code:</i> 400 Bad Request</p> </li> <li> <p> <i>SOAP Fault Code Prefix:</i> Client</p> </li> </ul> </li> <li> <ul> <li> <p> <i>Code:</i> NoSuchBucket</p> </li> <li> <p> <i>Description:</i> The specified bucket does not exist.</p> </li> <li> <p> <i>HTTP Status Code:</i> 404 Not Found</p> </li> <li> <p> <i>SOAP Fault Code Prefix:</i> Client</p> </li> </ul> </li> <li> <ul> <li> <p> <i>Code:</i> NoSuchBucketPolicy</p> </li> <li> <p> <i>Description:</i> The specified bucket does not have a bucket policy.</p> </li> <li> <p> <i>HTTP Status Code:</i> 404 Not Found</p> </li> <li> <p> <i>SOAP Fault Code Prefix:</i> Client</p> </li> </ul> </li> <li> <ul> <li> <p> <i>Code:</i> NoSuchKey</p> </li> <li> <p> <i>Description:</i> The specified key does not exist.</p> </li> <li> <p> <i>HTTP Status Code:</i> 404 Not Found</p> </li> <li> <p> <i>SOAP Fault Code Prefix:</i> Client</p> </li> </ul> </li> <li> <ul> <li> <p> <i>Code:</i> NoSuchLifecycleConfiguration</p> </li> <li> <p> <i>Description:</i> The lifecycle configuration does not exist. </p> </li> <li> <p> <i>HTTP Status Code:</i> 404 Not Found</p> </li> <li> <p> <i>SOAP Fault Code Prefix:</i> Client</p> </li> </ul> </li> <li> <ul> <li> <p> <i>Code:</i> NoSuchUpload</p> </li> <li> <p> <i>Description:</i> The specified multipart upload does not exist. The upload ID might be invalid, or the multipart upload might have been aborted or completed.</p> </li> <li> <p> <i>HTTP Status Code:</i> 404 Not Found</p> </li> <li> <p> <i>SOAP Fault Code Prefix:</i> Client</p> </li> </ul> </li> <li> <ul> <li> <p> <i>Code:</i> NoSuchVersion </p> </li> <li> <p> <i>Description:</i> Indicates that the version ID specified in the request does not match an existing version.</p> </li> <li> <p> <i>HTTP Status Code:</i> 404 Not Found</p> </li> <li> <p> <i>SOAP Fault Code Prefix:</i> Client</p> </li> </ul> </li> <li> <ul> <li> <p> <i>Code:</i> NotImplemented</p> </li> <li> <p> <i>Description:</i> A header you provided implies functionality that is not implemented.</p> </li> <li> <p> <i>HTTP Status Code:</i> 501 Not Implemented</p> </li> <li> <p> <i>SOAP Fault Code Prefix:</i> Server</p> </li> </ul> </li> <li> <ul> <li> <p> <i>Code:</i> NotSignedUp</p> </li> <li> <p> <i>Description:</i> Your account is not signed up for the Amazon S3 service. You must sign up before you can use Amazon S3. You can sign up at the following URL: https://aws.amazon.com/s3</p> </li> <li> <p> <i>HTTP Status Code:</i> 403 Forbidden</p> </li> <li> <p> <i>SOAP Fault Code Prefix:</i> Client</p> </li> </ul> </li> <li> <ul> <li> <p> <i>Code:</i> OperationAborted</p> </li> <li> <p> <i>Description:</i> A conflicting conditional operation is currently in progress against this resource. Try again.</p> </li> <li> <p> <i>HTTP Status Code:</i> 409 Conflict</p> </li> <li> <p> <i>SOAP Fault Code Prefix:</i> Client</p> </li> </ul> </li> <li> <ul> <li> <p> <i>Code:</i> PermanentRedirect</p> </li> <li> <p> <i>Description:</i> The bucket you are attempting to access must be addressed using the specified endpoint. Send all future requests to this endpoint.</p> </li> <li> <p> <i>HTTP Status Code:</i> 301 Moved Permanently</p> </li> <li> <p> <i>SOAP Fault Code Prefix:</i> Client</p> </li> </ul> </li> <li> <ul> <li> <p> <i>Code:</i> PreconditionFailed</p> </li> <li> <p> <i>Description:</i> At least one of the preconditions you specified did not hold.</p> </li> <li> <p> <i>HTTP Status Code:</i> 412 Precondition Failed</p> </li> <li> <p> <i>SOAP Fault Code Prefix:</i> Client</p> </li> </ul> </li> <li> <ul> <li> <p> <i>Code:</i> Redirect</p> </li> <li> <p> <i>Description:</i> Temporary redirect.</p> </li> <li> <p> <i>HTTP Status Code:</i> 307 Moved Temporarily</p> </li> <li> <p> <i>SOAP Fault Code Prefix:</i> Client</p> </li> </ul> </li> <li> <ul> <li> <p> <i>Code:</i> RestoreAlreadyInProgress</p> </li> <li> <p> <i>Description:</i> Object restore is already in progress.</p> </li> <li> <p> <i>HTTP Status Code:</i> 409 Conflict</p> </li> <li> <p> <i>SOAP Fault Code Prefix:</i> Client</p> </li> </ul> </li> <li> <ul> <li> <p> <i>Code:</i> RequestIsNotMultiPartContent</p> </li> <li> <p> <i>Description:</i> Bucket POST must be of the enclosure-type multipart/form-data.</p> </li> <li> <p> <i>HTTP Status Code:</i> 400 Bad Request</p> </li> <li> <p> <i>SOAP Fault Code Prefix:</i> Client</p> </li> </ul> </li> <li> <ul> <li> <p> <i>Code:</i> RequestTimeout</p> </li> <li> <p> <i>Description:</i> Your socket connection to the server was not read from or written to within the timeout period.</p> </li> <li> <p> <i>HTTP Status Code:</i> 400 Bad Request</p> </li> <li> <p> <i>SOAP Fault Code Prefix:</i> Client</p> </li> </ul> </li> <li> <ul> <li> <p> <i>Code:</i> RequestTimeTooSkewed</p> </li> <li> <p> <i>Description:</i> The difference between the request time and the server's time is too large.</p> </li> <li> <p> <i>HTTP Status Code:</i> 403 Forbidden</p> </li> <li> <p> <i>SOAP Fault Code Prefix:</i> Client</p> </li> </ul> </li> <li> <ul> <li> <p> <i>Code:</i> RequestTorrentOfBucketError</p> </li> <li> <p> <i>Description:</i> Requesting the torrent file of a bucket is not permitted.</p> </li> <li> <p> <i>HTTP Status Code:</i> 400 Bad Request</p> </li> <li> <p> <i>SOAP Fault Code Prefix:</i> Client</p> </li> </ul> </li> <li> <ul> <li> <p> <i>Code:</i> SignatureDoesNotMatch</p> </li> <li> <p> <i>Description:</i> The request signature we calculated does not match the signature you provided. Check your AWS secret access key and signing method. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/RESTAuthentication.html\">REST Authentication</a> and <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/SOAPAuthentication.html\">SOAP Authentication</a> for details.</p> </li> <li> <p> <i>HTTP Status Code:</i> 403 Forbidden</p> </li> <li> <p> <i>SOAP Fault Code Prefix:</i> Client</p> </li> </ul> </li> <li> <ul> <li> <p> <i>Code:</i> ServiceUnavailable</p> </li> <li> <p> <i>Description:</i> Reduce your request rate.</p> </li> <li> <p> <i>HTTP Status Code:</i> 503 Service Unavailable</p> </li> <li> <p> <i>SOAP Fault Code Prefix:</i> Server</p> </li> </ul> </li> <li> <ul> <li> <p> <i>Code:</i> SlowDown</p> </li> <li> <p> <i>Description:</i> Reduce your request rate.</p> </li> <li> <p> <i>HTTP Status Code:</i> 503 Slow Down</p> </li> <li> <p> <i>SOAP Fault Code Prefix:</i> Server</p> </li> </ul> </li> <li> <ul> <li> <p> <i>Code:</i> TemporaryRedirect</p> </li> <li> <p> <i>Description:</i> You are being redirected to the bucket while DNS updates.</p> </li> <li> <p> <i>HTTP Status Code:</i> 307 Moved Temporarily</p> </li> <li> <p> <i>SOAP Fault Code Prefix:</i> Client</p> </li> </ul> </li> <li> <ul> <li> <p> <i>Code:</i> TokenRefreshRequired</p> </li> <li> <p> <i>Description:</i> The provided token must be refreshed.</p> </li> <li> <p> <i>HTTP Status Code:</i> 400 Bad Request</p> </li> <li> <p> <i>SOAP Fault Code Prefix:</i> Client</p> </li> </ul> </li> <li> <ul> <li> <p> <i>Code:</i> TooManyBuckets</p> </li> <li> <p> <i>Description:</i> You have attempted to create more buckets than allowed.</p> </li> <li> <p> <i>HTTP Status Code:</i> 400 Bad Request</p> </li> <li> <p> <i>SOAP Fault Code Prefix:</i> Client</p> </li> </ul> </li> <li> <ul> <li> <p> <i>Code:</i> UnexpectedContent</p> </li> <li> <p> <i>Description:</i> This request does not support content.</p> </li> <li> <p> <i>HTTP Status Code:</i> 400 Bad Request</p> </li> <li> <p> <i>SOAP Fault Code Prefix:</i> Client</p> </li> </ul> </li> <li> <ul> <li> <p> <i>Code:</i> UnresolvableGrantByEmailAddress</p> </li> <li> <p> <i>Description:</i> The email address you provided does not match any account on record.</p> </li> <li> <p> <i>HTTP Status Code:</i> 400 Bad Request</p> </li> <li> <p> <i>SOAP Fault Code Prefix:</i> Client</p> </li> </ul> </li> <li> <ul> <li> <p> <i>Code:</i> UserKeyMustBeSpecified</p> </li> <li> <p> <i>Description:</i> The bucket POST must contain the specified field name. If it is specified, check the order of the fields.</p> </li> <li> <p> <i>HTTP Status Code:</i> 400 Bad Request</p> </li> <li> <p> <i>SOAP Fault Code Prefix:</i> Client</p> </li> </ul> </li> </ul> <p/>"
         },
         "Message":{
           "shape":"Message",
-          "documentation":"<p/>"
+          "documentation":"<p>The error message contains a generic description of the error condition in English. It is intended for a human audience. Simple programs display the message directly to the end user if they encounter an error condition they don't know how or don't care to handle. Sophisticated programs with more exhaustive error handling and proper internationalization are more likely to ignore the error message.</p>"
         }
       },
-      "documentation":"<p/>"
+      "documentation":"<p>Container for all error elements.</p>"
     },
     "ErrorDocument":{
       "type":"structure",
@@ -2825,7 +2830,7 @@
           "documentation":"<p>The object key name to use when a 4XX class error occurs.</p>"
         }
       },
-      "documentation":"<p/>"
+      "documentation":"<p>The error information.</p>"
     },
     "Errors":{
       "type":"list",
@@ -2845,8 +2850,14 @@
         "s3:ObjectRemoved:*",
         "s3:ObjectRemoved:Delete",
         "s3:ObjectRemoved:DeleteMarkerCreated",
+        "s3:ObjectRestore:*",
         "s3:ObjectRestore:Post",
-        "s3:ObjectRestore:Completed"
+        "s3:ObjectRestore:Completed",
+        "s3:Replication:*",
+        "s3:Replication:OperationFailedReplication",
+        "s3:Replication:OperationNotTracked",
+        "s3:Replication:OperationMissedThreshold",
+        "s3:Replication:OperationReplicatedAfterThreshold"
       ]
     },
     "EventList":{
@@ -2854,6 +2865,24 @@
       "member":{"shape":"Event"},
       "flattened":true
     },
+    "ExistingObjectReplication":{
+      "type":"structure",
+      "required":["Status"],
+      "members":{
+        "Status":{
+          "shape":"ExistingObjectReplicationStatus",
+          "documentation":"<p/>"
+        }
+      },
+      "documentation":"<p>Optional configuration to replicate existing source bucket objects. For more information, see <a href=\" https://docs.aws.amazon.com/AmazonS3/latest/dev/replication-what-is-isnot-replicated.html#existing-object-replication\">Replicating Existing Objects</a> in the <i>Amazon S3 Developer Guide</i>. </p>"
+    },
+    "ExistingObjectReplicationStatus":{
+      "type":"string",
+      "enum":[
+        "Enabled",
+        "Disabled"
+      ]
+    },
     "Expiration":{"type":"string"},
     "ExpirationStatus":{
       "type":"string",
@@ -2902,7 +2931,7 @@
     "FilterRuleList":{
       "type":"list",
       "member":{"shape":"FilterRule"},
-      "documentation":"<p>A list of containers for the key value pair that defines the criteria for the filter rule.</p>",
+      "documentation":"<p>A list of containers for the key-value pair that defines the criteria for the filter rule.</p>",
       "flattened":true
     },
     "FilterRuleName":{
@@ -2939,7 +2968,7 @@
       "members":{
         "Owner":{
           "shape":"Owner",
-          "documentation":"<p/>"
+          "documentation":"<p>Container for the bucket owner's display name and ID.</p>"
         },
         "Grants":{
           "shape":"Grants",
@@ -2954,7 +2983,7 @@
       "members":{
         "Bucket":{
           "shape":"BucketName",
-          "documentation":"<p/>",
+          "documentation":"<p>Specifies the S3 bucket whose ACL is being requested.</p>",
           "location":"uri",
           "locationName":"Bucket"
         }
@@ -2996,7 +3025,7 @@
       "members":{
         "CORSRules":{
           "shape":"CORSRules",
-          "documentation":"<p/>",
+          "documentation":"<p>A set of origins and methods (cross-origin access that you want to allow). You can add up to 100 rules to the configuration.</p>",
           "locationName":"CORSRule"
         }
       }
@@ -3007,7 +3036,7 @@
       "members":{
         "Bucket":{
           "shape":"BucketName",
-          "documentation":"<p/>",
+          "documentation":"<p>The bucket name for which to get the cors configuration.</p>",
           "location":"uri",
           "locationName":"Bucket"
         }
@@ -3016,10 +3045,7 @@
     "GetBucketEncryptionOutput":{
       "type":"structure",
       "members":{
-        "ServerSideEncryptionConfiguration":{
-          "shape":"ServerSideEncryptionConfiguration",
-          "documentation":"<p/>"
-        }
+        "ServerSideEncryptionConfiguration":{"shape":"ServerSideEncryptionConfiguration"}
       },
       "payload":"ServerSideEncryptionConfiguration"
     },
@@ -3071,7 +3097,7 @@
       "members":{
         "Rules":{
           "shape":"LifecycleRules",
-          "documentation":"<p/>",
+          "documentation":"<p>Container for a lifecycle rule.</p>",
           "locationName":"Rule"
         }
       }
@@ -3082,7 +3108,7 @@
       "members":{
         "Bucket":{
           "shape":"BucketName",
-          "documentation":"<p/>",
+          "documentation":"<p>The name of the bucket for which to get the lifecycle information.</p>",
           "location":"uri",
           "locationName":"Bucket"
         }
@@ -3093,7 +3119,7 @@
       "members":{
         "Rules":{
           "shape":"Rules",
-          "documentation":"<p/>",
+          "documentation":"<p>Container for a lifecycle rule.</p>",
           "locationName":"Rule"
         }
       }
@@ -3104,7 +3130,7 @@
       "members":{
         "Bucket":{
           "shape":"BucketName",
-          "documentation":"<p/>",
+          "documentation":"<p>The name of the bucket for which to get the lifecycle information.</p>",
           "location":"uri",
           "locationName":"Bucket"
         }
@@ -3115,7 +3141,7 @@
       "members":{
         "LocationConstraint":{
           "shape":"BucketLocationConstraint",
-          "documentation":"<p/>"
+          "documentation":"<p>Specifies the Region where the bucket resides. For a list of all the Amazon S3 supported location constraints by Region, see <a href=\"https://docs.aws.amazon.com/general/latest/gr/rande.html#s3_region\">Regions and Endpoints</a>.</p>"
         }
       }
     },
@@ -3125,7 +3151,7 @@
       "members":{
         "Bucket":{
           "shape":"BucketName",
-          "documentation":"<p/>",
+          "documentation":"<p>The name of the bucket for which to get the location.</p>",
           "location":"uri",
           "locationName":"Bucket"
         }
@@ -3134,10 +3160,7 @@
     "GetBucketLoggingOutput":{
       "type":"structure",
       "members":{
-        "LoggingEnabled":{
-          "shape":"LoggingEnabled",
-          "documentation":"<p/>"
-        }
+        "LoggingEnabled":{"shape":"LoggingEnabled"}
       }
     },
     "GetBucketLoggingRequest":{
@@ -3146,7 +3169,7 @@
       "members":{
         "Bucket":{
           "shape":"BucketName",
-          "documentation":"<p/>",
+          "documentation":"<p>The bucket name for which to get the logging information.</p>",
           "location":"uri",
           "locationName":"Bucket"
         }
@@ -3189,7 +3212,7 @@
       "members":{
         "Bucket":{
           "shape":"BucketName",
-          "documentation":"<p>Name of the bucket to get the notification configuration for.</p>",
+          "documentation":"<p>Name of the bucket for which to get the notification configuration</p>",
           "location":"uri",
           "locationName":"Bucket"
         }
@@ -3211,7 +3234,7 @@
       "members":{
         "Bucket":{
           "shape":"BucketName",
-          "documentation":"<p/>",
+          "documentation":"<p>The bucket name for which to get the bucket policy.</p>",
           "location":"uri",
           "locationName":"Bucket"
         }
@@ -3242,10 +3265,7 @@
     "GetBucketReplicationOutput":{
       "type":"structure",
       "members":{
-        "ReplicationConfiguration":{
-          "shape":"ReplicationConfiguration",
-          "documentation":"<p/>"
-        }
+        "ReplicationConfiguration":{"shape":"ReplicationConfiguration"}
       },
       "payload":"ReplicationConfiguration"
     },
@@ -3255,7 +3275,7 @@
       "members":{
         "Bucket":{
           "shape":"BucketName",
-          "documentation":"<p/>",
+          "documentation":"<p>The bucket name for which to get the replication information.</p>",
           "location":"uri",
           "locationName":"Bucket"
         }
@@ -3276,7 +3296,7 @@
       "members":{
         "Bucket":{
           "shape":"BucketName",
-          "documentation":"<p/>",
+          "documentation":"<p>The name of the bucket for which to get the payment request configuration</p>",
           "location":"uri",
           "locationName":"Bucket"
         }
@@ -3288,7 +3308,7 @@
       "members":{
         "TagSet":{
           "shape":"TagSet",
-          "documentation":"<p/>"
+          "documentation":"<p>Contains the tag set.</p>"
         }
       }
     },
@@ -3298,7 +3318,7 @@
       "members":{
         "Bucket":{
           "shape":"BucketName",
-          "documentation":"<p/>",
+          "documentation":"<p>The name of the bucket for which to get the tagging information.</p>",
           "location":"uri",
           "locationName":"Bucket"
         }
@@ -3324,7 +3344,7 @@
       "members":{
         "Bucket":{
           "shape":"BucketName",
-          "documentation":"<p/>",
+          "documentation":"<p>The name of the bucket for which to get the versioning information.</p>",
           "location":"uri",
           "locationName":"Bucket"
         }
@@ -3335,19 +3355,19 @@
       "members":{
         "RedirectAllRequestsTo":{
           "shape":"RedirectAllRequestsTo",
-          "documentation":"<p/>"
+          "documentation":"<p>Specifies the redirect behavior of all requests to a website endpoint of an Amazon S3 bucket.</p>"
         },
         "IndexDocument":{
           "shape":"IndexDocument",
-          "documentation":"<p/>"
+          "documentation":"<p>The name of the index document for the website.</p>"
         },
         "ErrorDocument":{
           "shape":"ErrorDocument",
-          "documentation":"<p/>"
+          "documentation":"<p>The name of the error document for the website.</p>"
         },
         "RoutingRules":{
           "shape":"RoutingRules",
-          "documentation":"<p/>"
+          "documentation":"<p>Rules that define when a redirect is applied and the redirect behavior.</p>"
         }
       }
     },
@@ -3357,7 +3377,7 @@
       "members":{
         "Bucket":{
           "shape":"BucketName",
-          "documentation":"<p/>",
+          "documentation":"<p>The bucket name for which to get the website configuration.</p>",
           "location":"uri",
           "locationName":"Bucket"
         }
@@ -3368,7 +3388,7 @@
       "members":{
         "Owner":{
           "shape":"Owner",
-          "documentation":"<p/>"
+          "documentation":"<p> Container for the bucket owner's display name and ID.</p>"
         },
         "Grants":{
           "shape":"Grants",
@@ -3391,13 +3411,13 @@
       "members":{
         "Bucket":{
           "shape":"BucketName",
-          "documentation":"<p/>",
+          "documentation":"<p>The bucket name that contains the object for which to get the ACL information. </p> <p>When using this API with an access point, you must direct requests to the access point hostname. The access point hostname takes the form <i>AccessPointName</i>-<i>AccountId</i>.s3-accesspoint.<i>Region</i>.amazonaws.com. When using this operation using an access point through the AWS SDKs, you provide the access point ARN in place of the bucket name. For more information about access point ARNs, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/using-access-points.html\">Using Access Points</a> in the <i>Amazon Simple Storage Service Developer Guide</i>.</p>",
           "location":"uri",
           "locationName":"Bucket"
         },
         "Key":{
           "shape":"ObjectKey",
-          "documentation":"<p/>",
+          "documentation":"<p>The key of the object for which to get the ACL information.</p>",
           "location":"uri",
           "locationName":"Key"
         },
@@ -3433,7 +3453,7 @@
       "members":{
         "Bucket":{
           "shape":"BucketName",
-          "documentation":"<p>The bucket containing the object whose Legal Hold status you want to retrieve.</p>",
+          "documentation":"<p>The bucket name containing the object whose Legal Hold status you want to retrieve. </p> <p>When using this API with an access point, you must direct requests to the access point hostname. The access point hostname takes the form <i>AccessPointName</i>-<i>AccountId</i>.s3-accesspoint.<i>Region</i>.amazonaws.com. When using this operation using an access point through the AWS SDKs, you provide the access point ARN in place of the bucket name. For more information about access point ARNs, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/using-access-points.html\">Using Access Points</a> in the <i>Amazon Simple Storage Service Developer Guide</i>.</p>",
           "location":"uri",
           "locationName":"Bucket"
         },
@@ -3461,7 +3481,7 @@
       "members":{
         "ObjectLockConfiguration":{
           "shape":"ObjectLockConfiguration",
-          "documentation":"<p>The specified bucket's object lock configuration.</p>"
+          "documentation":"<p>The specified bucket's Object Lock configuration.</p>"
         }
       },
       "payload":"ObjectLockConfiguration"
@@ -3472,7 +3492,7 @@
       "members":{
         "Bucket":{
           "shape":"BucketName",
-          "documentation":"<p>The bucket whose object lock configuration you want to retrieve.</p>",
+          "documentation":"<p>The bucket whose Object Lock configuration you want to retrieve.</p>",
           "location":"uri",
           "locationName":"Bucket"
         }
@@ -3494,13 +3514,13 @@
         },
         "AcceptRanges":{
           "shape":"AcceptRanges",
-          "documentation":"<p/>",
+          "documentation":"<p>Indicates that a range of bytes was specified.</p>",
           "location":"header",
           "locationName":"accept-ranges"
         },
         "Expiration":{
           "shape":"Expiration",
-          "documentation":"<p>If the object expiration is configured (see PUT Bucket lifecycle), the response includes this header. It includes the expiry-date and rule-id key value pairs providing object expiration information. The value of the rule-id is URL encoded.</p>",
+          "documentation":"<p>If the object expiration is configured (see PUT Bucket lifecycle), the response includes this header. It includes the expiry-date and rule-id key-value pairs providing object expiration information. The value of the rule-id is URL encoded.</p>",
           "location":"header",
           "locationName":"x-amz-expiration"
         },
@@ -3524,13 +3544,13 @@
         },
         "ETag":{
           "shape":"ETag",
-          "documentation":"<p>An ETag is an opaque identifier assigned by a web server to a specific version of a resource found at a URL</p>",
+          "documentation":"<p>An ETag is an opaque identifier assigned by a web server to a specific version of a resource found at a URL.</p>",
           "location":"header",
           "locationName":"ETag"
         },
         "MissingMeta":{
           "shape":"MissingMeta",
-          "documentation":"<p>This is set to the number of metadata entries not returned in x-amz-meta headers. This can happen if you create metadata using an API like SOAP that supports more flexible metadata than the REST API. For example, using SOAP, you can create metadata whose values are not legal HTTP headers.</p>",
+          "documentation":"<p>This is set to the number of metadata entries not returned in <code>x-amz-meta</code> headers. This can happen if you create metadata using an API like SOAP that supports more flexible metadata than the REST API. For example, using SOAP, you can create metadata whose values are not legal HTTP headers.</p>",
           "location":"header",
           "locationName":"x-amz-missing-meta"
         },
@@ -3590,7 +3610,7 @@
         },
         "ServerSideEncryption":{
           "shape":"ServerSideEncryption",
-          "documentation":"<p>The Server-side encryption algorithm used when storing this object in S3 (e.g., AES256, aws:kms).</p>",
+          "documentation":"<p>The server-side encryption algorithm used when storing this object in Amazon S3 (for example, AES256, aws:kms).</p>",
           "location":"header",
           "locationName":"x-amz-server-side-encryption"
         },
@@ -3608,19 +3628,19 @@
         },
         "SSECustomerKeyMD5":{
           "shape":"SSECustomerKeyMD5",
-          "documentation":"<p>If server-side encryption with a customer-provided encryption key was requested, the response will include this header to provide round trip message integrity verification of the customer-provided encryption key.</p>",
+          "documentation":"<p>If server-side encryption with a customer-provided encryption key was requested, the response will include this header to provide round-trip message integrity verification of the customer-provided encryption key.</p>",
           "location":"header",
           "locationName":"x-amz-server-side-encryption-customer-key-MD5"
         },
         "SSEKMSKeyId":{
           "shape":"SSEKMSKeyId",
-          "documentation":"<p>If present, specifies the ID of the AWS Key Management Service (KMS) master encryption key that was used for the object.</p>",
+          "documentation":"<p>If present, specifies the ID of the AWS Key Management Service (AWS KMS) symmetric customer managed customer master key (CMK) that was used for the object.</p>",
           "location":"header",
           "locationName":"x-amz-server-side-encryption-aws-kms-key-id"
         },
         "StorageClass":{
           "shape":"StorageClass",
-          "documentation":"<p/>",
+          "documentation":"<p>Provides storage class information of the object. Amazon S3 returns this header for all objects except for Standard storage class objects.</p>",
           "location":"header",
           "locationName":"x-amz-storage-class"
         },
@@ -3631,7 +3651,7 @@
         },
         "ReplicationStatus":{
           "shape":"ReplicationStatus",
-          "documentation":"<p/>",
+          "documentation":"<p>Amazon S3 can return this if your request involves a bucket that is either a source or destination in a replication rule.</p>",
           "location":"header",
           "locationName":"x-amz-replication-status"
         },
@@ -3649,19 +3669,19 @@
         },
         "ObjectLockMode":{
           "shape":"ObjectLockMode",
-          "documentation":"<p>The object lock mode currently in place for this object.</p>",
+          "documentation":"<p>The Object Lock mode currently in place for this object.</p>",
           "location":"header",
           "locationName":"x-amz-object-lock-mode"
         },
         "ObjectLockRetainUntilDate":{
           "shape":"ObjectLockRetainUntilDate",
-          "documentation":"<p>The date and time when this object's object lock will expire.</p>",
+          "documentation":"<p>The date and time when this object's Object Lock will expire.</p>",
           "location":"header",
           "locationName":"x-amz-object-lock-retain-until-date"
         },
         "ObjectLockLegalHoldStatus":{
           "shape":"ObjectLockLegalHoldStatus",
-          "documentation":"<p>Indicates whether this object has an active legal hold. This field is only returned if you have permission to view an object's legal hold status.</p>",
+          "documentation":"<p>Indicates whether this object has an active legal hold. This field is only returned if you have permission to view an object's legal hold status. </p>",
           "location":"header",
           "locationName":"x-amz-object-lock-legal-hold"
         }
@@ -3677,7 +3697,7 @@
       "members":{
         "Bucket":{
           "shape":"BucketName",
-          "documentation":"<p/>",
+          "documentation":"<p>The bucket name containing the object. </p> <p>When using this API with an access point, you must direct requests to the access point hostname. The access point hostname takes the form <i>AccessPointName</i>-<i>AccountId</i>.s3-accesspoint.<i>Region</i>.amazonaws.com. When using this operation using an access point through the AWS SDKs, you provide the access point ARN in place of the bucket name. For more information about access point ARNs, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/using-access-points.html\">Using Access Points</a> in the <i>Amazon Simple Storage Service Developer Guide</i>.</p>",
           "location":"uri",
           "locationName":"Bucket"
         },
@@ -3707,49 +3727,49 @@
         },
         "Key":{
           "shape":"ObjectKey",
-          "documentation":"<p/>",
+          "documentation":"<p>Key of the object to get.</p>",
           "location":"uri",
           "locationName":"Key"
         },
         "Range":{
           "shape":"Range",
-          "documentation":"<p>Downloads the specified range bytes of an object. For more information about the HTTP Range header, go to http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.35.</p>",
+          "documentation":"<p>Downloads the specified range bytes of an object. For more information about the HTTP Range header, see <a href=\"\">http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.35</a>.</p>",
           "location":"header",
           "locationName":"Range"
         },
         "ResponseCacheControl":{
           "shape":"ResponseCacheControl",
-          "documentation":"<p>Sets the Cache-Control header of the response.</p>",
+          "documentation":"<p>Sets the <code>Cache-Control</code> header of the response.</p>",
           "location":"querystring",
           "locationName":"response-cache-control"
         },
         "ResponseContentDisposition":{
           "shape":"ResponseContentDisposition",
-          "documentation":"<p>Sets the Content-Disposition header of the response</p>",
+          "documentation":"<p>Sets the <code>Content-Disposition</code> header of the response</p>",
           "location":"querystring",
           "locationName":"response-content-disposition"
         },
         "ResponseContentEncoding":{
           "shape":"ResponseContentEncoding",
-          "documentation":"<p>Sets the Content-Encoding header of the response.</p>",
+          "documentation":"<p>Sets the <code>Content-Encoding</code> header of the response.</p>",
           "location":"querystring",
           "locationName":"response-content-encoding"
         },
         "ResponseContentLanguage":{
           "shape":"ResponseContentLanguage",
-          "documentation":"<p>Sets the Content-Language header of the response.</p>",
+          "documentation":"<p>Sets the <code>Content-Language</code> header of the response.</p>",
           "location":"querystring",
           "locationName":"response-content-language"
         },
         "ResponseContentType":{
           "shape":"ResponseContentType",
-          "documentation":"<p>Sets the Content-Type header of the response.</p>",
+          "documentation":"<p>Sets the <code>Content-Type</code> header of the response.</p>",
           "location":"querystring",
           "locationName":"response-content-type"
         },
         "ResponseExpires":{
           "shape":"ResponseExpires",
-          "documentation":"<p>Sets the Expires header of the response.</p>",
+          "documentation":"<p>Sets the <code>Expires</code> header of the response.</p>",
           "location":"querystring",
           "locationName":"response-expires"
         },
@@ -3761,19 +3781,19 @@
         },
         "SSECustomerAlgorithm":{
           "shape":"SSECustomerAlgorithm",
-          "documentation":"<p>Specifies the algorithm to use to when encrypting the object (e.g., AES256).</p>",
+          "documentation":"<p>Specifies the algorithm to use to when encrypting the object (for example, AES256).</p>",
           "location":"header",
           "locationName":"x-amz-server-side-encryption-customer-algorithm"
         },
         "SSECustomerKey":{
           "shape":"SSECustomerKey",
-          "documentation":"<p>Specifies the customer-provided encryption key for Amazon S3 to use in encrypting data. This value is used to store the object and then it is discarded; Amazon does not store the encryption key. The key must be appropriate for use with the algorithm specified in the x-amz-server-side​-encryption​-customer-algorithm header.</p>",
+          "documentation":"<p>Specifies the customer-provided encryption key for Amazon S3 to use in encrypting data. This value is used to store the object and then it is discarded; Amazon S3 does not store the encryption key. The key must be appropriate for use with the algorithm specified in the <code>x-amz-server-side​-encryption​-customer-algorithm</code> header.</p>",
           "location":"header",
           "locationName":"x-amz-server-side-encryption-customer-key"
         },
         "SSECustomerKeyMD5":{
           "shape":"SSECustomerKeyMD5",
-          "documentation":"<p>Specifies the 128-bit MD5 digest of the encryption key according to RFC 1321. Amazon S3 uses this header for a message integrity check to ensure the encryption key was transmitted without error.</p>",
+          "documentation":"<p>Specifies the 128-bit MD5 digest of the encryption key according to RFC 1321. Amazon S3 uses this header for a message integrity check to ensure that the encryption key was transmitted without error.</p>",
           "location":"header",
           "locationName":"x-amz-server-side-encryption-customer-key-MD5"
         },
@@ -3809,7 +3829,7 @@
       "members":{
         "Bucket":{
           "shape":"BucketName",
-          "documentation":"<p>The bucket containing the object whose retention settings you want to retrieve.</p>",
+          "documentation":"<p>The bucket name containing the object whose retention settings you want to retrieve. </p> <p>When using this API with an access point, you must direct requests to the access point hostname. The access point hostname takes the form <i>AccessPointName</i>-<i>AccountId</i>.s3-accesspoint.<i>Region</i>.amazonaws.com. When using this operation using an access point through the AWS SDKs, you provide the access point ARN in place of the bucket name. For more information about access point ARNs, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/using-access-points.html\">Using Access Points</a> in the <i>Amazon Simple Storage Service Developer Guide</i>.</p>",
           "location":"uri",
           "locationName":"Bucket"
         },
@@ -3838,13 +3858,13 @@
       "members":{
         "VersionId":{
           "shape":"ObjectVersionId",
-          "documentation":"<p/>",
+          "documentation":"<p>The versionId of the object for which you got the tagging information.</p>",
           "location":"header",
           "locationName":"x-amz-version-id"
         },
         "TagSet":{
           "shape":"TagSet",
-          "documentation":"<p/>"
+          "documentation":"<p>Contains the tag set.</p>"
         }
       }
     },
@@ -3857,19 +3877,19 @@
       "members":{
         "Bucket":{
           "shape":"BucketName",
-          "documentation":"<p/>",
+          "documentation":"<p>The bucket name containing the object for which to get the tagging information. </p> <p>When using this API with an access point, you must direct requests to the access point hostname. The access point hostname takes the form <i>AccessPointName</i>-<i>AccountId</i>.s3-accesspoint.<i>Region</i>.amazonaws.com. When using this operation using an access point through the AWS SDKs, you provide the access point ARN in place of the bucket name. For more information about access point ARNs, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/using-access-points.html\">Using Access Points</a> in the <i>Amazon Simple Storage Service Developer Guide</i>.</p>",
           "location":"uri",
           "locationName":"Bucket"
         },
         "Key":{
           "shape":"ObjectKey",
-          "documentation":"<p/>",
+          "documentation":"<p>Object key for which to get the tagging information.</p>",
           "location":"uri",
           "locationName":"Key"
         },
         "VersionId":{
           "shape":"ObjectVersionId",
-          "documentation":"<p/>",
+          "documentation":"<p>The versionId of the object for which to get the tagging information.</p>",
           "location":"querystring",
           "locationName":"versionId"
         }
@@ -3880,7 +3900,7 @@
       "members":{
         "Body":{
           "shape":"Body",
-          "documentation":"<p/>",
+          "documentation":"<p>A Bencoded dictionary as defined by the BitTorrent specification</p>",
           "streaming":true
         },
         "RequestCharged":{
@@ -3900,13 +3920,13 @@
       "members":{
         "Bucket":{
           "shape":"BucketName",
-          "documentation":"<p/>",
+          "documentation":"<p>The name of the bucket containing the object for which to get the torrent files.</p>",
           "location":"uri",
           "locationName":"Bucket"
         },
         "Key":{
           "shape":"ObjectKey",
-          "documentation":"<p/>",
+          "documentation":"<p>The object key for which to get the information.</p>",
           "location":"uri",
           "locationName":"Key"
         },
@@ -3948,21 +3968,21 @@
           "documentation":"<p>Glacier retrieval tier at which the restore will be processed.</p>"
         }
       },
-      "documentation":"<p/>"
+      "documentation":"<p>Container for Glacier job parameters.</p>"
     },
     "Grant":{
       "type":"structure",
       "members":{
         "Grantee":{
           "shape":"Grantee",
-          "documentation":"<p/>"
+          "documentation":"<p>The person being granted permissions.</p>"
         },
         "Permission":{
           "shape":"Permission",
           "documentation":"<p>Specifies the permission given to the grantee.</p>"
         }
       },
-      "documentation":"<p/>"
+      "documentation":"<p>Container for grant information.</p>"
     },
     "GrantFullControl":{"type":"string"},
     "GrantRead":{"type":"string"},
@@ -3996,7 +4016,7 @@
           "documentation":"<p>URI of the grantee group.</p>"
         }
       },
-      "documentation":"<p/>",
+      "documentation":"<p>Container for the person being granted permissions.</p>",
       "xmlNamespace":{
         "prefix":"xsi",
         "uri":"http://www.w3.org/2001/XMLSchema-instance"
@@ -4015,7 +4035,7 @@
       "members":{
         "Bucket":{
           "shape":"BucketName",
-          "documentation":"<p/>",
+          "documentation":"<p>The bucket name.</p>",
           "location":"uri",
           "locationName":"Bucket"
         }
@@ -4032,19 +4052,19 @@
         },
         "AcceptRanges":{
           "shape":"AcceptRanges",
-          "documentation":"<p/>",
+          "documentation":"<p>Indicates that a range of bytes was specified.</p>",
           "location":"header",
           "locationName":"accept-ranges"
         },
         "Expiration":{
           "shape":"Expiration",
-          "documentation":"<p>If the object expiration is configured (see PUT Bucket lifecycle), the response includes this header. It includes the expiry-date and rule-id key value pairs providing object expiration information. The value of the rule-id is URL encoded.</p>",
+          "documentation":"<p>If the object expiration is configured (see PUT Bucket lifecycle), the response includes this header. It includes the expiry-date and rule-id key-value pairs providing object expiration information. The value of the rule-id is URL encoded.</p>",
           "location":"header",
           "locationName":"x-amz-expiration"
         },
         "Restore":{
           "shape":"Restore",
-          "documentation":"<p>Provides information about object restoration operation and expiration time of the restored object copy.</p>",
+          "documentation":"<p>If the object is an archived object (an object whose storage class is GLACIER), the response includes this header if either the archive restoration is in progress (see <a>RestoreObject</a> or an archive copy is already restored.</p> <p> If an archive copy is already restored, the header value indicates when Amazon S3 is scheduled to delete the object copy. For example:</p> <p> <code>x-amz-restore: ongoing-request=\"false\", expiry-date=\"Fri, 23 Dec 2012 00:00:00 GMT\"</code> </p> <p>If the object restoration is in progress, the header returns the value <code>ongoing-request=\"true\"</code>.</p> <p>For more information about archiving objects, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/object-lifecycle-mgmt.html#lifecycle-transition-general-considerations\">Transitioning Objects: General Considerations</a>.</p>",
           "location":"header",
           "locationName":"x-amz-restore"
         },
@@ -4062,13 +4082,13 @@
         },
         "ETag":{
           "shape":"ETag",
-          "documentation":"<p>An ETag is an opaque identifier assigned by a web server to a specific version of a resource found at a URL</p>",
+          "documentation":"<p>An ETag is an opaque identifier assigned by a web server to a specific version of a resource found at a URL.</p>",
           "location":"header",
           "locationName":"ETag"
         },
         "MissingMeta":{
           "shape":"MissingMeta",
-          "documentation":"<p>This is set to the number of metadata entries not returned in x-amz-meta headers. This can happen if you create metadata using an API like SOAP that supports more flexible metadata than the REST API. For example, using SOAP, you can create metadata whose values are not legal HTTP headers.</p>",
+          "documentation":"<p>This is set to the number of metadata entries not returned in <code>x-amz-meta</code> headers. This can happen if you create metadata using an API like SOAP that supports more flexible metadata than the REST API. For example, using SOAP, you can create metadata whose values are not legal HTTP headers.</p>",
           "location":"header",
           "locationName":"x-amz-missing-meta"
         },
@@ -4122,7 +4142,7 @@
         },
         "ServerSideEncryption":{
           "shape":"ServerSideEncryption",
-          "documentation":"<p>The Server-side encryption algorithm used when storing this object in S3 (e.g., AES256, aws:kms).</p>",
+          "documentation":"<p>If the object is stored using server-side encryption either with an AWS KMS customer master key (CMK) or an Amazon S3-managed encryption key, the response includes this header with the value of the server-side encryption algorithm used when storing this object in Amazon S3 (for example, AES256, aws:kms).</p>",
           "location":"header",
           "locationName":"x-amz-server-side-encryption"
         },
@@ -4140,19 +4160,19 @@
         },
         "SSECustomerKeyMD5":{
           "shape":"SSECustomerKeyMD5",
-          "documentation":"<p>If server-side encryption with a customer-provided encryption key was requested, the response will include this header to provide round trip message integrity verification of the customer-provided encryption key.</p>",
+          "documentation":"<p>If server-side encryption with a customer-provided encryption key was requested, the response will include this header to provide round-trip message integrity verification of the customer-provided encryption key.</p>",
           "location":"header",
           "locationName":"x-amz-server-side-encryption-customer-key-MD5"
         },
         "SSEKMSKeyId":{
           "shape":"SSEKMSKeyId",
-          "documentation":"<p>If present, specifies the ID of the AWS Key Management Service (KMS) master encryption key that was used for the object.</p>",
+          "documentation":"<p>If present, specifies the ID of the AWS Key Management Service (AWS KMS) symmetric customer managed customer master key (CMK) that was used for the object.</p>",
           "location":"header",
           "locationName":"x-amz-server-side-encryption-aws-kms-key-id"
         },
         "StorageClass":{
           "shape":"StorageClass",
-          "documentation":"<p/>",
+          "documentation":"<p>Provides storage class information of the object. Amazon S3 returns this header for all objects except for Standard storage class objects.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/storage-class-intro.html\">Storage Classes</a>.</p>",
           "location":"header",
           "locationName":"x-amz-storage-class"
         },
@@ -4163,7 +4183,7 @@
         },
         "ReplicationStatus":{
           "shape":"ReplicationStatus",
-          "documentation":"<p/>",
+          "documentation":"<p>Amazon S3 can return this header if your request involves a bucket that is either a source or destination in a replication rule.</p> <p>In replication, you have a source bucket on which you configure replication and destination bucket where Amazon S3 stores object replicas. When you request an object (<code>GetObject</code>) or object metadata (<code>HeadObject</code>) from these buckets, Amazon S3 will return the <code>x-amz-replication-status</code> header in the response as follows:</p> <ul> <li> <p>If requesting an object from the source bucket — Amazon S3 will return the <code>x-amz-replication-status</code> header if the object in your request is eligible for replication.</p> <p> For example, suppose that in your replication configuration, you specify object prefix <code>TaxDocs</code> requesting Amazon S3 to replicate objects with key prefix <code>TaxDocs</code>. Any objects you upload with this key name prefix, for example <code>TaxDocs/document1.pdf</code>, are eligible for replication. For any object request with this key name prefix, Amazon S3 will return the <code>x-amz-replication-status</code> header with value PENDING, COMPLETED or FAILED indicating object replication status.</p> </li> <li> <p>If requesting an object from the destination bucket — Amazon S3 will return the <code>x-amz-replication-status</code> header with value REPLICA if the object in your request is a replica that Amazon S3 created.</p> </li> </ul> <p>For more information, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/NotificationHowTo.html\">Replication</a>.</p>",
           "location":"header",
           "locationName":"x-amz-replication-status"
         },
@@ -4175,19 +4195,19 @@
         },
         "ObjectLockMode":{
           "shape":"ObjectLockMode",
-          "documentation":"<p>The object lock mode currently in place for this object.</p>",
+          "documentation":"<p>The Object Lock mode, if any, that's in effect for this object. This header is only returned if the requester has the <code>s3:GetObjectRetention</code> permission. For more information about S3 Object Lock, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/object-lock.html\">Object Lock</a>. </p>",
           "location":"header",
           "locationName":"x-amz-object-lock-mode"
         },
         "ObjectLockRetainUntilDate":{
           "shape":"ObjectLockRetainUntilDate",
-          "documentation":"<p>The date and time when this object's object lock expires.</p>",
+          "documentation":"<p>The date and time when the Object Lock retention period expires. This header is only returned if the requester has the <code>s3:GetObjectRetention</code> permission.</p>",
           "location":"header",
           "locationName":"x-amz-object-lock-retain-until-date"
         },
         "ObjectLockLegalHoldStatus":{
           "shape":"ObjectLockLegalHoldStatus",
-          "documentation":"<p>The Legal Hold status for the specified object.</p>",
+          "documentation":"<p>Specifies whether a legal hold is in effect for this object. This header is only returned if the requester has the <code>s3:GetObjectLegalHold</code> permission. This header is not returned if the specified version of this object has never had a legal hold applied. For more information about S3 Object Lock, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/object-lock.html\">Object Lock</a>.</p>",
           "location":"header",
           "locationName":"x-amz-object-lock-legal-hold"
         }
@@ -4202,7 +4222,7 @@
       "members":{
         "Bucket":{
           "shape":"BucketName",
-          "documentation":"<p/>",
+          "documentation":"<p>The name of the bucket containing the object.</p>",
           "location":"uri",
           "locationName":"Bucket"
         },
@@ -4232,13 +4252,13 @@
         },
         "Key":{
           "shape":"ObjectKey",
-          "documentation":"<p/>",
+          "documentation":"<p>The object key.</p>",
           "location":"uri",
           "locationName":"Key"
         },
         "Range":{
           "shape":"Range",
-          "documentation":"<p>Downloads the specified range bytes of an object. For more information about the HTTP Range header, go to http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.35.</p>",
+          "documentation":"<p>Downloads the specified range bytes of an object. For more information about the HTTP Range header, see <a href=\"\">http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.35</a>.</p>",
           "location":"header",
           "locationName":"Range"
         },
@@ -4250,19 +4270,19 @@
         },
         "SSECustomerAlgorithm":{
           "shape":"SSECustomerAlgorithm",
-          "documentation":"<p>Specifies the algorithm to use to when encrypting the object (e.g., AES256).</p>",
+          "documentation":"<p>Specifies the algorithm to use to when encrypting the object (for example, AES256).</p>",
           "location":"header",
           "locationName":"x-amz-server-side-encryption-customer-algorithm"
         },
         "SSECustomerKey":{
           "shape":"SSECustomerKey",
-          "documentation":"<p>Specifies the customer-provided encryption key for Amazon S3 to use in encrypting data. This value is used to store the object and then it is discarded; Amazon does not store the encryption key. The key must be appropriate for use with the algorithm specified in the x-amz-server-side​-encryption​-customer-algorithm header.</p>",
+          "documentation":"<p>Specifies the customer-provided encryption key for Amazon S3 to use in encrypting data. This value is used to store the object and then it is discarded; Amazon S3 does not store the encryption key. The key must be appropriate for use with the algorithm specified in the <code>x-amz-server-side​-encryption​-customer-algorithm</code> header.</p>",
           "location":"header",
           "locationName":"x-amz-server-side-encryption-customer-key"
         },
         "SSECustomerKeyMD5":{
           "shape":"SSECustomerKeyMD5",
-          "documentation":"<p>Specifies the 128-bit MD5 digest of the encryption key according to RFC 1321. Amazon S3 uses this header for a message integrity check to ensure the encryption key was transmitted without error.</p>",
+          "documentation":"<p>Specifies the 128-bit MD5 digest of the encryption key according to RFC 1321. Amazon S3 uses this header for a message integrity check to ensure that the encryption key was transmitted without error.</p>",
           "location":"header",
           "locationName":"x-amz-server-side-encryption-customer-key-MD5"
         },
@@ -4293,10 +4313,10 @@
       "members":{
         "Suffix":{
           "shape":"Suffix",
-          "documentation":"<p>A suffix that is appended to a request that is for a directory on the website endpoint (e.g. if the suffix is index.html and you make a request to samplebucket/images/ the data that is returned will be for the object with the key name images/index.html) The suffix must not be empty and must not include a slash character.</p>"
+          "documentation":"<p>A suffix that is appended to a request that is for a directory on the website endpoint (for example,if the suffix is index.html and you make a request to samplebucket/images/ the data that is returned will be for the object with the key name images/index.html) The suffix must not be empty and must not include a slash character.</p>"
         }
       },
-      "documentation":"<p/>"
+      "documentation":"<p>Container for the <code>Suffix</code> element.</p>"
     },
     "Initiated":{"type":"timestamp"},
     "Initiator":{
@@ -4311,7 +4331,7 @@
           "documentation":"<p>Name of the Principal.</p>"
         }
       },
-      "documentation":"<p/>"
+      "documentation":"<p>Container element that identifies who initiated the multipart upload. </p>"
     },
     "InputSerialization":{
       "type":"structure",
@@ -4390,19 +4410,19 @@
           "documentation":"<p>Contains the bucket name, file format, bucket owner (optional), and prefix (optional) where inventory results are published.</p>"
         }
       },
-      "documentation":"<p/>"
+      "documentation":"<p>Specifies the inventory configuration for an Amazon S3 bucket.</p>"
     },
     "InventoryEncryption":{
       "type":"structure",
       "members":{
         "SSES3":{
           "shape":"SSES3",
-          "documentation":"<p>Specifies the use of SSE-S3 to encrypt delivered Inventory reports.</p>",
+          "documentation":"<p>Specifies the use of SSE-S3 to encrypt delivered inventory reports.</p>",
           "locationName":"SSE-S3"
         },
         "SSEKMS":{
           "shape":"SSEKMS",
-          "documentation":"<p>Specifies the use of SSE-KMS to encrypt delivered Inventory reports.</p>",
+          "documentation":"<p>Specifies the use of SSE-KMS to encrypt delivered inventory reports.</p>",
           "locationName":"SSE-KMS"
         }
       },
@@ -4417,7 +4437,7 @@
           "documentation":"<p>The prefix that an object must have to be included in the inventory results.</p>"
         }
       },
-      "documentation":"<p/>"
+      "documentation":"<p>Specifies an inventory filter. The inventory only includes objects that meet the filter's criteria.</p>"
     },
     "InventoryFormat":{
       "type":"string",
@@ -4478,7 +4498,7 @@
         },
         "Bucket":{
           "shape":"BucketName",
-          "documentation":"<p>The Amazon resource name (ARN) of the bucket where inventory results will be published.</p>"
+          "documentation":"<p>The Amazon Resource Name (ARN) of the bucket where inventory results will be published.</p>"
         },
         "Format":{
           "shape":"InventoryFormat",
@@ -4493,7 +4513,7 @@
           "documentation":"<p>Contains the type of server-side encryption used to encrypt the inventory results.</p>"
         }
       },
-      "documentation":"<p/>"
+      "documentation":"<p>Contains the bucket name, file format, bucket owner (optional), and prefix (optional) where inventory results are published.</p>"
     },
     "InventorySchedule":{
       "type":"structure",
@@ -4504,7 +4524,7 @@
           "documentation":"<p>Specifies how frequently inventory results are produced.</p>"
         }
       },
-      "documentation":"<p/>"
+      "documentation":"<p>Specifies the schedule for generating inventory results.</p>"
     },
     "IsEnabled":{"type":"boolean"},
     "IsLatest":{"type":"boolean"},
@@ -4518,7 +4538,7 @@
           "documentation":"<p>The type of JSON. Valid values: Document, Lines.</p>"
         }
       },
-      "documentation":"<p/>"
+      "documentation":"<p>Specifies JSON as object's input serialization format.</p>"
     },
     "JSONOutput":{
       "type":"structure",
@@ -4528,7 +4548,7 @@
           "documentation":"<p>The value used to separate individual records in the output.</p>"
         }
       },
-      "documentation":"<p/>"
+      "documentation":"<p>Specifies JSON as request's output serialization format.</p>"
     },
     "JSONType":{
       "type":"string",
@@ -4560,10 +4580,7 @@
           "documentation":"<p>The Amazon S3 bucket event for which to invoke the AWS Lambda function. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/NotificationHowTo.html\">Supported Event Types</a> in the <i>Amazon Simple Storage Service Developer Guide</i>.</p>",
           "locationName":"Event"
         },
-        "Filter":{
-          "shape":"NotificationConfigurationFilter",
-          "documentation":"<p/>"
-        }
+        "Filter":{"shape":"NotificationConfigurationFilter"}
       },
       "documentation":"<p>A container for specifying the configuration for AWS Lambda notifications.</p>"
     },
@@ -4579,11 +4596,11 @@
       "members":{
         "Rules":{
           "shape":"Rules",
-          "documentation":"<p/>",
+          "documentation":"<p>Specifies lifecycle configuration rules for an Amazon S3 bucket. </p>",
           "locationName":"Rule"
         }
       },
-      "documentation":"<p/>"
+      "documentation":"<p>Container for lifecycle rules. You can add as many as 1000 rules.</p>"
     },
     "LifecycleExpiration":{
       "type":"structure",
@@ -4601,7 +4618,7 @@
           "documentation":"<p>Indicates whether Amazon S3 will remove a delete marker with no noncurrent versions. If set to true, the delete marker will be expired; if set to false the policy takes no action. This cannot be specified with Days or Date in a Lifecycle Expiration Policy.</p>"
         }
       },
-      "documentation":"<p/>"
+      "documentation":"<p>Container for the expiration for the lifecycle of the object.</p>"
     },
     "LifecycleRule":{
       "type":"structure",
@@ -4609,7 +4626,7 @@
       "members":{
         "Expiration":{
           "shape":"LifecycleExpiration",
-          "documentation":"<p/>"
+          "documentation":"<p>Specifies the expiration for the lifecycle of the object in the form of date, days and, whether the object has a delete marker.</p>"
         },
         "ID":{
           "shape":"ID",
@@ -4617,44 +4634,35 @@
         },
         "Prefix":{
           "shape":"Prefix",
-          "documentation":"<p>Prefix identifying one or more objects to which the rule applies. This is No longer used; use Filter instead.</p>",
+          "documentation":"<p>Prefix identifying one or more objects to which the rule applies. This is No longer used; use <code>Filter</code> instead.</p>",
           "deprecated":true
         },
-        "Filter":{
-          "shape":"LifecycleRuleFilter",
-          "documentation":"<p/>"
-        },
+        "Filter":{"shape":"LifecycleRuleFilter"},
         "Status":{
           "shape":"ExpirationStatus",
           "documentation":"<p>If 'Enabled', the rule is currently being applied. If 'Disabled', the rule is not currently being applied.</p>"
         },
         "Transitions":{
           "shape":"TransitionList",
-          "documentation":"<p/>",
+          "documentation":"<p>Specifies when an Amazon S3 object transitions to a specified storage class.</p>",
           "locationName":"Transition"
         },
         "NoncurrentVersionTransitions":{
           "shape":"NoncurrentVersionTransitionList",
-          "documentation":"<p/>",
+          "documentation":"<p> Specifies the transition rule for the lifecycle rule that describes when noncurrent objects transition to a specific storage class. If your bucket is versioning-enabled (or versioning is suspended), you can set this action to request that Amazon S3 transition noncurrent object versions to a specific storage class at a set period in the object's lifetime. </p>",
           "locationName":"NoncurrentVersionTransition"
         },
-        "NoncurrentVersionExpiration":{
-          "shape":"NoncurrentVersionExpiration",
-          "documentation":"<p/>"
-        },
-        "AbortIncompleteMultipartUpload":{
-          "shape":"AbortIncompleteMultipartUpload",
-          "documentation":"<p/>"
-        }
+        "NoncurrentVersionExpiration":{"shape":"NoncurrentVersionExpiration"},
+        "AbortIncompleteMultipartUpload":{"shape":"AbortIncompleteMultipartUpload"}
       },
-      "documentation":"<p/>"
+      "documentation":"<p>A lifecycle rule for individual objects in an Amazon S3 bucket.</p>"
     },
     "LifecycleRuleAndOperator":{
       "type":"structure",
       "members":{
         "Prefix":{
           "shape":"Prefix",
-          "documentation":"<p/>"
+          "documentation":"<p>Prefix identifying one or more objects to which the rule applies.</p>"
         },
         "Tags":{
           "shape":"TagSet",
@@ -4676,12 +4684,9 @@
           "shape":"Tag",
           "documentation":"<p>This tag must exist in the object's tag set in order for the rule to apply.</p>"
         },
-        "And":{
-          "shape":"LifecycleRuleAndOperator",
-          "documentation":"<p/>"
-        }
+        "And":{"shape":"LifecycleRuleAndOperator"}
       },
-      "documentation":"<p>The Filter is used to identify objects that a Lifecycle Rule applies to. A Filter must have exactly one of Prefix, Tag, or And specified.</p>"
+      "documentation":"<p>The <code>Filter</code> is used to identify objects that a Lifecycle Rule applies to. A <code>Filter</code> must have exactly one of <code>Prefix</code>, <code>Tag</code>, or <code>And</code> specified.</p>"
     },
     "LifecycleRules":{
       "type":"list",
@@ -4697,11 +4702,11 @@
         },
         "ContinuationToken":{
           "shape":"Token",
-          "documentation":"<p>The ContinuationToken that represents where this request began.</p>"
+          "documentation":"<p>The marker that is used as a starting point for this analytics configuration list response. This value is present if it was sent in the request.</p>"
         },
         "NextContinuationToken":{
           "shape":"NextToken",
-          "documentation":"<p>NextContinuationToken is sent when isTruncated is true, which indicates that there are more analytics configurations to list. The next request must include this NextContinuationToken. The token is obfuscated and is not a usable value.</p>"
+          "documentation":"<p> <code>NextContinuationToken</code> is sent when <code>isTruncated</code> is true, which indicates that there are more analytics configurations to list. The next request must include this <code>NextContinuationToken</code>. The token is obfuscated and is not a usable value.</p>"
         },
         "AnalyticsConfigurationList":{
           "shape":"AnalyticsConfigurationList",
@@ -4742,11 +4747,11 @@
         },
         "IsTruncated":{
           "shape":"IsTruncated",
-          "documentation":"<p>Indicates whether the returned list of inventory configurations is truncated in this response. A value of true indicates that the list is truncated.</p>"
+          "documentation":"<p>Tells whether the returned list of inventory configurations is complete. A value of true indicates that the list is not complete and the NextContinuationToken is provided for a subsequent request.</p>"
         },
         "NextContinuationToken":{
           "shape":"NextToken",
-          "documentation":"<p>The marker used to continue this inventory configuration listing. Use the NextContinuationToken from this response to continue the listing in a subsequent request. The continuation token is an opaque value that Amazon S3 understands.</p>"
+          "documentation":"<p>The marker used to continue this inventory configuration listing. Use the <code>NextContinuationToken</code> from this response to continue the listing in a subsequent request. The continuation token is an opaque value that Amazon S3 understands.</p>"
         }
       }
     },
@@ -4781,7 +4786,7 @@
         },
         "NextContinuationToken":{
           "shape":"NextToken",
-          "documentation":"<p>The marker used to continue a metrics configuration listing that has been truncated. Use the NextContinuationToken from a previously truncated list response to continue the listing. The continuation token is an opaque value that Amazon S3 understands.</p>"
+          "documentation":"<p>The marker used to continue a metrics configuration listing that has been truncated. Use the <code>NextContinuationToken</code> from a previously truncated list response to continue the listing. The continuation token is an opaque value that Amazon S3 understands.</p>"
         },
         "MetricsConfigurationList":{
           "shape":"MetricsConfigurationList",
@@ -4813,11 +4818,11 @@
       "members":{
         "Buckets":{
           "shape":"Buckets",
-          "documentation":"<p/>"
+          "documentation":"<p>The list of buckets owned by the requestor.</p>"
         },
         "Owner":{
           "shape":"Owner",
-          "documentation":"<p/>"
+          "documentation":"<p>The owner of the buckets listed.</p>"
         }
       }
     },
@@ -4846,11 +4851,11 @@
         },
         "Delimiter":{
           "shape":"Delimiter",
-          "documentation":"<p/>"
+          "documentation":"<p>Contains the delimiter you specified in the request. If you don't specify a delimiter in your request, this element is absent from the response.</p>"
         },
         "NextUploadIdMarker":{
           "shape":"NextUploadIdMarker",
-          "documentation":"<p>When a list is truncated, this element specifies the value that should be used for the upload-id-marker request parameter in a subsequent request.</p>"
+          "documentation":"<p>When a list is truncated, this element specifies the value that should be used for the <code>upload-id-marker</code> request parameter in a subsequent request.</p>"
         },
         "MaxUploads":{
           "shape":"MaxUploads",
@@ -4862,16 +4867,16 @@
         },
         "Uploads":{
           "shape":"MultipartUploadList",
-          "documentation":"<p/>",
+          "documentation":"<p>Container for elements related to a particular multipart upload. A response can contain zero or more <code>Upload</code> elements.</p>",
           "locationName":"Upload"
         },
         "CommonPrefixes":{
           "shape":"CommonPrefixList",
-          "documentation":"<p/>"
+          "documentation":"<p>If you specify a delimiter in the request, then the result returns each distinct key prefix containing the delimiter in a <code>CommonPrefixes</code> element. The distinct key prefixes are returned in the <code>Prefix</code> child element.</p>"
         },
         "EncodingType":{
           "shape":"EncodingType",
-          "documentation":"<p>Encoding type used by Amazon S3 to encode object keys in the response.</p>"
+          "documentation":"<p>Encoding type used by Amazon S3 to encode object keys in the response.</p> <p>If you specify <code>encoding-type</code> request parameter, Amazon S3 includes this element in the response, and returns encoded key name values in the following response elements:</p> <p> <code>Delimiter</code>, <code>KeyMarker</code>, <code>Prefix</code>, <code>NextKeyMarker</code>, <code>Key</code>.</p>"
         }
       }
     },
@@ -4881,13 +4886,13 @@
       "members":{
         "Bucket":{
           "shape":"BucketName",
-          "documentation":"<p/>",
+          "documentation":"<p>Name of the bucket to which the multipart upload was initiated. </p> <p>When using this API with an access point, you must direct requests to the access point hostname. The access point hostname takes the form <i>AccessPointName</i>-<i>AccountId</i>.s3-accesspoint.<i>Region</i>.amazonaws.com. When using this operation using an access point through the AWS SDKs, you provide the access point ARN in place of the bucket name. For more information about access point ARNs, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/using-access-points.html\">Using Access Points</a> in the <i>Amazon Simple Storage Service Developer Guide</i>.</p>",
           "location":"uri",
           "locationName":"Bucket"
         },
         "Delimiter":{
           "shape":"Delimiter",
-          "documentation":"<p>Character you use to group keys.</p>",
+          "documentation":"<p>Character you use to group keys.</p> <p>All keys that contain the same string between the prefix, if specified, and the first occurrence of the delimiter after the prefix are grouped under a single result element, <code>CommonPrefixes</code>. If you don't specify the prefix parameter, then the substring starts at the beginning of the key. The keys that are grouped under <code>CommonPrefixes</code> result element are not returned elsewhere in the response.</p>",
           "location":"querystring",
           "locationName":"delimiter"
         },
@@ -4898,7 +4903,7 @@
         },
         "KeyMarker":{
           "shape":"KeyMarker",
-          "documentation":"<p>Together with upload-id-marker, this parameter specifies the multipart upload after which listing should begin.</p>",
+          "documentation":"<p>Together with upload-id-marker, this parameter specifies the multipart upload after which listing should begin.</p> <p>If <code>upload-id-marker</code> is not specified, only the keys lexicographically greater than the specified <code>key-marker</code> will be included in the list.</p> <p>If <code>upload-id-marker</code> is specified, any multipart uploads for a key equal to the <code>key-marker</code> might also be included, provided those multipart uploads have upload IDs lexicographically greater than the specified <code>upload-id-marker</code>.</p>",
           "location":"querystring",
           "locationName":"key-marker"
         },
@@ -4910,13 +4915,13 @@
         },
         "Prefix":{
           "shape":"Prefix",
-          "documentation":"<p>Lists in-progress uploads only for those keys that begin with the specified prefix.</p>",
+          "documentation":"<p>Lists in-progress uploads only for those keys that begin with the specified prefix. You can use prefixes to separate a bucket into different grouping of keys. (You can think of using prefix to make groups in the same way you'd use a folder in a file system.)</p>",
           "location":"querystring",
           "locationName":"prefix"
         },
         "UploadIdMarker":{
           "shape":"UploadIdMarker",
-          "documentation":"<p>Together with key-marker, specifies the multipart upload after which listing should begin. If key-marker is not specified, the upload-id-marker parameter is ignored.</p>",
+          "documentation":"<p>Together with key-marker, specifies the multipart upload after which listing should begin. If key-marker is not specified, the upload-id-marker parameter is ignored. Otherwise, any multipart uploads for a key equal to the key-marker might be included in the list only if they have an upload ID lexicographically greater than the specified <code>upload-id-marker</code>.</p>",
           "location":"querystring",
           "locationName":"upload-id-marker"
         }
@@ -4927,57 +4932,57 @@
       "members":{
         "IsTruncated":{
           "shape":"IsTruncated",
-          "documentation":"<p>A flag that indicates whether or not Amazon S3 returned all of the results that satisfied the search criteria. If your results were truncated, you can make a follow-up paginated request using the NextKeyMarker and NextVersionIdMarker response parameters as a starting place in another request to return the rest of the results.</p>"
+          "documentation":"<p>A flag that indicates whether Amazon S3 returned all of the results that satisfied the search criteria. If your results were truncated, you can make a follow-up paginated request using the NextKeyMarker and NextVersionIdMarker response parameters as a starting place in another request to return the rest of the results.</p>"
         },
         "KeyMarker":{
           "shape":"KeyMarker",
-          "documentation":"<p>Marks the last Key returned in a truncated response.</p>"
+          "documentation":"<p>Marks the last key returned in a truncated response.</p>"
         },
         "VersionIdMarker":{
           "shape":"VersionIdMarker",
-          "documentation":"<p/>"
+          "documentation":"<p>Marks the last version of the key returned in a truncated response.</p>"
         },
         "NextKeyMarker":{
           "shape":"NextKeyMarker",
-          "documentation":"<p>Use this value for the key marker request parameter in a subsequent request.</p>"
+          "documentation":"<p>When the number of responses exceeds the value of <code>MaxKeys</code>, <code>NextKeyMarker</code> specifies the first key not returned that satisfies the search criteria. Use this value for the key-marker request parameter in a subsequent request.</p>"
         },
         "NextVersionIdMarker":{
           "shape":"NextVersionIdMarker",
-          "documentation":"<p>Use this value for the next version id marker parameter in a subsequent request.</p>"
+          "documentation":"<p>When the number of responses exceeds the value of <code>MaxKeys</code>, <code>NextVersionIdMarker</code> specifies the first object version not returned that satisfies the search criteria. Use this value for the version-id-marker request parameter in a subsequent request.</p>"
         },
         "Versions":{
           "shape":"ObjectVersionList",
-          "documentation":"<p/>",
+          "documentation":"<p>Container for version information.</p>",
           "locationName":"Version"
         },
         "DeleteMarkers":{
           "shape":"DeleteMarkers",
-          "documentation":"<p/>",
+          "documentation":"<p>Container for an object that is a delete marker.</p>",
           "locationName":"DeleteMarker"
         },
         "Name":{
           "shape":"BucketName",
-          "documentation":"<p/>"
+          "documentation":"<p>Bucket name.</p>"
         },
         "Prefix":{
           "shape":"Prefix",
-          "documentation":"<p/>"
+          "documentation":"<p>Selects objects that start with the value supplied by this parameter.</p>"
         },
         "Delimiter":{
           "shape":"Delimiter",
-          "documentation":"<p/>"
+          "documentation":"<p>The delimiter grouping the included keys. A delimiter is a character that you specify to group keys. All keys that contain the same string between the prefix and the first occurrence of the delimiter are grouped under a single result element in <code>CommonPrefixes</code>. These groups are counted as one result against the max-keys limitation. These keys are not returned elsewhere in the response.</p>"
         },
         "MaxKeys":{
           "shape":"MaxKeys",
-          "documentation":"<p/>"
+          "documentation":"<p>Specifies the maximum number of objects to return.</p>"
         },
         "CommonPrefixes":{
           "shape":"CommonPrefixList",
-          "documentation":"<p/>"
+          "documentation":"<p>All of the keys rolled up into a common prefix count as a single return when calculating the number of returns.</p>"
         },
         "EncodingType":{
           "shape":"EncodingType",
-          "documentation":"<p>Encoding type used by Amazon S3 to encode object keys in the response.</p>"
+          "documentation":"<p> Encoding type used by Amazon S3 to encode object key names in the XML response.</p> <p>If you specify encoding-type request parameter, Amazon S3 includes this element in the response, and returns encoded key name values in the following response elements:</p> <p> <code>KeyMarker, NextKeyMarker, Prefix, Key</code>, and <code>Delimiter</code>.</p>"
         }
       }
     },
@@ -4987,13 +4992,13 @@
       "members":{
         "Bucket":{
           "shape":"BucketName",
-          "documentation":"<p/>",
+          "documentation":"<p>The bucket name that contains the objects. </p> <p>When using this API with an access point, you must direct requests to the access point hostname. The access point hostname takes the form <i>AccessPointName</i>-<i>AccountId</i>.s3-accesspoint.<i>Region</i>.amazonaws.com. When using this operation using an access point through the AWS SDKs, you provide the access point ARN in place of the bucket name. For more information about access point ARNs, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/using-access-points.html\">Using Access Points</a> in the <i>Amazon Simple Storage Service Developer Guide</i>.</p>",
           "location":"uri",
           "locationName":"Bucket"
         },
         "Delimiter":{
           "shape":"Delimiter",
-          "documentation":"<p>A delimiter is a character you use to group keys.</p>",
+          "documentation":"<p>A delimiter is a character that you specify to group keys. All keys that contain the same string between the <code>prefix</code> and the first occurrence of the delimiter are grouped under a single result element in CommonPrefixes. These groups are counted as one result against the max-keys limitation. These keys are not returned elsewhere in the response.</p>",
           "location":"querystring",
           "locationName":"delimiter"
         },
@@ -5010,13 +5015,13 @@
         },
         "MaxKeys":{
           "shape":"MaxKeys",
-          "documentation":"<p>Sets the maximum number of keys returned in the response. The response might contain fewer keys but will never contain more.</p>",
+          "documentation":"<p>Sets the maximum number of keys returned in the response. The response might contain fewer keys but will never contain more. If additional keys satisfy the search criteria, but were not returned because max-keys was exceeded, the response contains &lt;isTruncated&gt;true&lt;/isTruncated&gt;. To return the additional keys, see key-marker and version-id-marker.</p>",
           "location":"querystring",
           "locationName":"max-keys"
         },
         "Prefix":{
           "shape":"Prefix",
-          "documentation":"<p>Limits the response to keys that begin with the specified prefix.</p>",
+          "documentation":"<p>Use this parameter to select only those keys that begin with the specified prefix. You can use prefixes to separate a bucket into different groupings of keys. (You can think of using prefix to make groups in the same way you'd use a folder in a file system.) You can use prefix with delimiter to roll up numerous objects into a single result under CommonPrefixes. </p>",
           "location":"querystring",
           "locationName":"prefix"
         },
@@ -5033,11 +5038,11 @@
       "members":{
         "IsTruncated":{
           "shape":"IsTruncated",
-          "documentation":"<p>A flag that indicates whether or not Amazon S3 returned all of the results that satisfied the search criteria.</p>"
+          "documentation":"<p>A flag that indicates whether Amazon S3 returned all of the results that satisfied the search criteria.</p>"
         },
         "Marker":{
           "shape":"Marker",
-          "documentation":"<p/>"
+          "documentation":"<p>Indicates where in the bucket listing begins. Marker is included in the response if it was sent with the request.</p>"
         },
         "NextMarker":{
           "shape":"NextMarker",
@@ -5045,27 +5050,27 @@
         },
         "Contents":{
           "shape":"ObjectList",
-          "documentation":"<p/>"
+          "documentation":"<p>Metadata about each object returned.</p>"
         },
         "Name":{
           "shape":"BucketName",
-          "documentation":"<p/>"
+          "documentation":"<p>Bucket name.</p>"
         },
         "Prefix":{
           "shape":"Prefix",
-          "documentation":"<p/>"
+          "documentation":"<p>Keys that begin with the indicated prefix.</p>"
         },
         "Delimiter":{
           "shape":"Delimiter",
-          "documentation":"<p/>"
+          "documentation":"<p>Causes keys that contain the same string between the prefix and the first occurrence of the delimiter to be rolled up into a single result element in the <code>CommonPrefixes</code> collection. These rolled-up keys are not returned elsewhere in the response. Each rolled-up result counts as only one return against the <code>MaxKeys</code> value.</p>"
         },
         "MaxKeys":{
           "shape":"MaxKeys",
-          "documentation":"<p/>"
+          "documentation":"<p>The maximum number of keys returned in the response body.</p>"
         },
         "CommonPrefixes":{
           "shape":"CommonPrefixList",
-          "documentation":"<p/>"
+          "documentation":"<p>All of the keys rolled up in a common prefix count as a single return when calculating the number of returns. </p> <p>A response can contain CommonPrefixes only if you specify a delimiter.</p> <p>CommonPrefixes contains all (if there are any) keys between Prefix and the next occurrence of the string specified by the delimiter.</p> <p> CommonPrefixes lists keys that act like subdirectories in the directory specified by Prefix.</p> <p>For example, if the prefix is notes/ and the delimiter is a slash (/) as in notes/summer/july, the common prefix is notes/summer/. All of the keys that roll up into a common prefix count as a single return when calculating the number of returns.</p>"
         },
         "EncodingType":{
           "shape":"EncodingType",
@@ -5079,7 +5084,7 @@
       "members":{
         "Bucket":{
           "shape":"BucketName",
-          "documentation":"<p/>",
+          "documentation":"<p>The name of the bucket containing the objects.</p>",
           "location":"uri",
           "locationName":"Bucket"
         },
@@ -5125,7 +5130,7 @@
       "members":{
         "IsTruncated":{
           "shape":"IsTruncated",
-          "documentation":"<p>A flag that indicates whether or not Amazon S3 returned all of the results that satisfied the search criteria.</p>"
+          "documentation":"<p>Set to false if all of the results were returned. Set to true if more keys are available to return. If the number of results exceeds that specified by MaxKeys, all of the results might not be returned.</p>"
         },
         "Contents":{
           "shape":"ObjectList",
@@ -5133,15 +5138,15 @@
         },
         "Name":{
           "shape":"BucketName",
-          "documentation":"<p>Name of the bucket to list.</p>"
+          "documentation":"<p>Bucket name. </p> <p>When using this API with an access point, you must direct requests to the access point hostname. The access point hostname takes the form <i>AccessPointName</i>-<i>AccountId</i>.s3-accesspoint.<i>Region</i>.amazonaws.com. When using this operation using an access point through the AWS SDKs, you provide the access point ARN in place of the bucket name. For more information about access point ARNs, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/using-access-points.html\">Using Access Points</a> in the <i>Amazon Simple Storage Service Developer Guide</i>.</p>"
         },
         "Prefix":{
           "shape":"Prefix",
-          "documentation":"<p>Limits the response to keys that begin with the specified prefix.</p>"
+          "documentation":"<p> Keys that begin with the indicated prefix.</p>"
         },
         "Delimiter":{
           "shape":"Delimiter",
-          "documentation":"<p>A delimiter is a character you use to group keys.</p>"
+          "documentation":"<p>Causes keys that contain the same string between the prefix and the first occurrence of the delimiter to be rolled up into a single result element in the CommonPrefixes collection. These rolled-up keys are not returned elsewhere in the response. Each rolled-up result counts as only one return against the <code>MaxKeys</code> value.</p>"
         },
         "MaxKeys":{
           "shape":"MaxKeys",
@@ -5149,11 +5154,11 @@
         },
         "CommonPrefixes":{
           "shape":"CommonPrefixList",
-          "documentation":"<p>CommonPrefixes contains all (if there are any) keys between Prefix and the next occurrence of the string specified by delimiter</p>"
+          "documentation":"<p>All of the keys rolled up into a common prefix count as a single return when calculating the number of returns.</p> <p>A response can contain <code>CommonPrefixes</code> only if you specify a delimiter.</p> <p> <code>CommonPrefixes</code> contains all (if there are any) keys between <code>Prefix</code> and the next occurrence of the string specified by a delimiter.</p> <p> <code>CommonPrefixes</code> lists keys that act like subdirectories in the directory specified by <code>Prefix</code>.</p> <p>For example, if the prefix is <code>notes/</code> and the delimiter is a slash (<code>/</code>) as in <code>notes/summer/july</code>, the common prefix is <code>notes/summer/</code>. All of the keys that roll up into a common prefix count as a single return when calculating the number of returns. </p>"
         },
         "EncodingType":{
           "shape":"EncodingType",
-          "documentation":"<p>Encoding type used by Amazon S3 to encode object keys in the response.</p>"
+          "documentation":"<p>Encoding type used by Amazon S3 to encode object key names in the XML response.</p> <p>If you specify the encoding-type request parameter, Amazon S3 includes this element in the response, and returns encoded key name values in the following response elements:</p> <p> <code>Delimiter, Prefix, Key,</code> and <code>StartAfter</code>.</p>"
         },
         "KeyCount":{
           "shape":"KeyCount",
@@ -5161,15 +5166,15 @@
         },
         "ContinuationToken":{
           "shape":"Token",
-          "documentation":"<p>ContinuationToken indicates Amazon S3 that the list is being continued on this bucket with a token. ContinuationToken is obfuscated and is not a real key</p>"
+          "documentation":"<p> If ContinuationToken was sent with the request, it is included in the response.</p>"
         },
         "NextContinuationToken":{
           "shape":"NextToken",
-          "documentation":"<p>NextContinuationToken is sent when isTruncated is true which means there are more keys in the bucket that can be listed. The next list requests to Amazon S3 can be continued with this NextContinuationToken. NextContinuationToken is obfuscated and is not a real key</p>"
+          "documentation":"<p> <code>NextContinuationToken</code> is sent when <code>isTruncated</code> is true, which means there are more keys in the bucket that can be listed. The next list requests to Amazon S3 can be continued with this <code>NextContinuationToken</code>. <code>NextContinuationToken</code> is obfuscated and is not a real key</p>"
         },
         "StartAfter":{
           "shape":"StartAfter",
-          "documentation":"<p>StartAfter is where you want Amazon S3 to start listing from. Amazon S3 starts listing after this specified key. StartAfter can be any key in the bucket</p>"
+          "documentation":"<p>If StartAfter was sent with the request, it is included in the response.</p>"
         }
       }
     },
@@ -5179,7 +5184,7 @@
       "members":{
         "Bucket":{
           "shape":"BucketName",
-          "documentation":"<p>Name of the bucket to list.</p>",
+          "documentation":"<p>Bucket name to list. </p> <p>When using this API with an access point, you must direct requests to the access point hostname. The access point hostname takes the form <i>AccessPointName</i>-<i>AccountId</i>.s3-accesspoint.<i>Region</i>.amazonaws.com. When using this operation using an access point through the AWS SDKs, you provide the access point ARN in place of the bucket name. For more information about access point ARNs, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/using-access-points.html\">Using Access Points</a> in the <i>Amazon Simple Storage Service Developer Guide</i>.</p>",
           "location":"uri",
           "locationName":"Bucket"
         },
@@ -5209,19 +5214,19 @@
         },
         "ContinuationToken":{
           "shape":"Token",
-          "documentation":"<p>ContinuationToken indicates Amazon S3 that the list is being continued on this bucket with a token. ContinuationToken is obfuscated and is not a real key</p>",
+          "documentation":"<p>ContinuationToken indicates Amazon S3 that the list is being continued on this bucket with a token. ContinuationToken is obfuscated and is not a real key.</p>",
           "location":"querystring",
           "locationName":"continuation-token"
         },
         "FetchOwner":{
           "shape":"FetchOwner",
-          "documentation":"<p>The owner field is not present in listV2 by default, if you want to return owner field with each key in the result then set the fetch owner field to true</p>",
+          "documentation":"<p>The owner field is not present in listV2 by default, if you want to return owner field with each key in the result then set the fetch owner field to true.</p>",
           "location":"querystring",
           "locationName":"fetch-owner"
         },
         "StartAfter":{
           "shape":"StartAfter",
-          "documentation":"<p>StartAfter is where you want Amazon S3 to start listing from. Amazon S3 starts listing after this specified key. StartAfter can be any key in the bucket</p>",
+          "documentation":"<p>StartAfter is where you want Amazon S3 to start listing from. Amazon S3 starts listing after this specified key. StartAfter can be any key in the bucket.</p>",
           "location":"querystring",
           "locationName":"start-after"
         },
@@ -5238,13 +5243,13 @@
       "members":{
         "AbortDate":{
           "shape":"AbortDate",
-          "documentation":"<p>Date when multipart upload will become eligible for abort operation by lifecycle.</p>",
+          "documentation":"<p>If the bucket has a lifecycle rule configured with an action to abort incomplete multipart uploads and the prefix in the lifecycle rule matches the object name in the request, then the response includes this header indicating when the initiated multipart upload will become eligible for abort operation. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/mpuoverview.html#mpu-abort-incomplete-mpu-lifecycle-config\">Aborting Incomplete Multipart Uploads Using a Bucket Lifecycle Policy</a>.</p> <p>The response will also include the <code>x-amz-abort-rule-id</code> header that will provide the ID of the lifecycle configuration rule that defines this action.</p>",
           "location":"header",
           "locationName":"x-amz-abort-date"
         },
         "AbortRuleId":{
           "shape":"AbortRuleId",
-          "documentation":"<p>Id of the lifecycle rule that makes a multipart upload eligible for abort operation.</p>",
+          "documentation":"<p>This header is returned along with the <code>x-amz-abort-date</code> header. It identifies applicable lifecycle configuration rule that defines the action to abort incomplete multipart uploads.</p>",
           "location":"header",
           "locationName":"x-amz-abort-rule-id"
         },
@@ -5262,7 +5267,7 @@
         },
         "PartNumberMarker":{
           "shape":"PartNumberMarker",
-          "documentation":"<p>Part number after which listing begins.</p>"
+          "documentation":"<p>When a list is truncated, this element specifies the last part in the list, as well as the value to use for the part-number-marker request parameter in a subsequent request.</p>"
         },
         "NextPartNumberMarker":{
           "shape":"NextPartNumberMarker",
@@ -5274,24 +5279,24 @@
         },
         "IsTruncated":{
           "shape":"IsTruncated",
-          "documentation":"<p>Indicates whether the returned list of parts is truncated.</p>"
+          "documentation":"<p> Indicates whether the returned list of parts is truncated. A true value indicates that the list was truncated. A list can be truncated if the number of parts exceeds the limit returned in the MaxParts element.</p>"
         },
         "Parts":{
           "shape":"Parts",
-          "documentation":"<p/>",
+          "documentation":"<p> Container for elements related to a particular part. A response can contain zero or more <code>Part</code> elements.</p>",
           "locationName":"Part"
         },
         "Initiator":{
           "shape":"Initiator",
-          "documentation":"<p>Identifies who initiated the multipart upload.</p>"
+          "documentation":"<p>Container element that identifies who initiated the multipart upload. If the initiator is an AWS account, this element provides the same information as the <code>Owner</code> element. If the initiator is an IAM User, this element provides the user ARN and display name.</p>"
         },
         "Owner":{
           "shape":"Owner",
-          "documentation":"<p/>"
+          "documentation":"<p> Container element that identifies the object owner, after the object is created. If multipart upload is initiated by an IAM user, this element provides the parent account ID and display name.</p>"
         },
         "StorageClass":{
           "shape":"StorageClass",
-          "documentation":"<p>The class of storage used to store the object.</p>"
+          "documentation":"<p>Class of storage (STANDARD or REDUCED_REDUNDANCY) used to store the uploaded object.</p>"
         },
         "RequestCharged":{
           "shape":"RequestCharged",
@@ -5310,13 +5315,13 @@
       "members":{
         "Bucket":{
           "shape":"BucketName",
-          "documentation":"<p/>",
+          "documentation":"<p>Name of the bucket to which the parts are being uploaded. </p> <p>When using this API with an access point, you must direct requests to the access point hostname. The access point hostname takes the form <i>AccessPointName</i>-<i>AccountId</i>.s3-accesspoint.<i>Region</i>.amazonaws.com. When using this operation using an access point through the AWS SDKs, you provide the access point ARN in place of the bucket name. For more information about access point ARNs, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/using-access-points.html\">Using Access Points</a> in the <i>Amazon Simple Storage Service Developer Guide</i>.</p>",
           "location":"uri",
           "locationName":"Bucket"
         },
         "Key":{
           "shape":"ObjectKey",
-          "documentation":"<p/>",
+          "documentation":"<p>Object key for which the multipart upload was initiated.</p>",
           "location":"uri",
           "locationName":"Key"
         },
@@ -5356,11 +5361,11 @@
       "members":{
         "TargetBucket":{
           "shape":"TargetBucket",
-          "documentation":"<p>Specifies the bucket where you want Amazon S3 to store server access logs. You can have your logs delivered to any bucket that you own, including the same bucket that is being logged. You can also configure multiple buckets to deliver their logs to the same target bucket. In this case you should choose a different TargetPrefix for each source bucket so that the delivered log files can be distinguished by key.</p>"
+          "documentation":"<p>Specifies the bucket where you want Amazon S3 to store server access logs. You can have your logs delivered to any bucket that you own, including the same bucket that is being logged. You can also configure multiple buckets to deliver their logs to the same target bucket. In this case, you should choose a different <code>TargetPrefix</code> for each source bucket so that the delivered log files can be distinguished by key.</p>"
         },
         "TargetGrants":{
           "shape":"TargetGrants",
-          "documentation":"<p/>"
+          "documentation":"<p>Container for granting information.</p>"
         },
         "TargetPrefix":{
           "shape":"TargetPrefix",
@@ -5407,17 +5412,35 @@
       "members":{
         "Name":{
           "shape":"MetadataKey",
-          "documentation":"<p/>"
+          "documentation":"<p>Name of the Object.</p>"
         },
         "Value":{
           "shape":"MetadataValue",
-          "documentation":"<p/>"
+          "documentation":"<p>Value of the Object.</p>"
         }
       },
       "documentation":"<p>A metadata key-value pair to store with an object.</p>"
     },
     "MetadataKey":{"type":"string"},
     "MetadataValue":{"type":"string"},
+    "Metrics":{
+      "type":"structure",
+      "required":[
+        "Status",
+        "EventThreshold"
+      ],
+      "members":{
+        "Status":{
+          "shape":"MetricsStatus",
+          "documentation":"<p> Specifies whether the replication metrics are enabled. </p>"
+        },
+        "EventThreshold":{
+          "shape":"ReplicationTimeValue",
+          "documentation":"<p> A container specifying the time threshold for emitting the <code>s3:Replication:OperationMissedThreshold</code> event. </p>"
+        }
+      },
+      "documentation":"<p> A container specifying replication metrics-related settings enabling metrics and Amazon S3 events for S3 Replication Time Control (S3 RTC). Must be specified together with a <code>ReplicationTime</code> block. </p>"
+    },
     "MetricsAndOperator":{
       "type":"structure",
       "members":{
@@ -5432,7 +5455,7 @@
           "locationName":"Tag"
         }
       },
-      "documentation":"<p/>"
+      "documentation":"<p>A conjunction (logical AND) of predicates, which is used in evaluating a metrics filter. The operator must have at least two predicates, and an object must match all of the predicates in order for the filter to apply.</p>"
     },
     "MetricsConfiguration":{
       "type":"structure",
@@ -5470,9 +5493,17 @@
           "documentation":"<p>A conjunction (logical AND) of predicates, which is used in evaluating a metrics filter. The operator must have at least two predicates, and an object must match all of the predicates in order for the filter to apply.</p>"
         }
       },
-      "documentation":"<p/>"
+      "documentation":"<p>Specifies a metrics configuration filter. The metrics configuration only includes objects that meet the filter's criteria. A filter must be a prefix, a tag, or a conjunction (MetricsAndOperator).</p>"
     },
     "MetricsId":{"type":"string"},
+    "MetricsStatus":{
+      "type":"string",
+      "enum":[
+        "Enabled",
+        "Disabled"
+      ]
+    },
+    "Minutes":{"type":"integer"},
     "MissingMeta":{"type":"integer"},
     "MultipartUpload":{
       "type":"structure",
@@ -5495,14 +5526,14 @@
         },
         "Owner":{
           "shape":"Owner",
-          "documentation":"<p/>"
+          "documentation":"<p>Specifies the owner of the object that is part of the multipart upload. </p>"
         },
         "Initiator":{
           "shape":"Initiator",
           "documentation":"<p>Identifies who initiated the multipart upload.</p>"
         }
       },
-      "documentation":"<p/>"
+      "documentation":"<p>Container for the <code>MultipartUpload</code> for the Amazon S3 object.</p>"
     },
     "MultipartUploadId":{"type":"string"},
     "MultipartUploadList":{
@@ -5542,7 +5573,7 @@
       "members":{
         "NoncurrentDays":{
           "shape":"Days",
-          "documentation":"<p>Specifies the number of days an object is noncurrent before Amazon S3 can perform the associated action. For information about the noncurrent days calculations, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/intro-lifecycle-rules.html#non-current-days-calculations\">How Amazon S3 Calculates When an Object Became Noncurrent</a> in the Amazon Simple Storage Service Developer Guide.</p>"
+          "documentation":"<p>Specifies the number of days an object is noncurrent before Amazon S3 can perform the associated action. For information about the noncurrent days calculations, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/intro-lifecycle-rules.html#non-current-days-calculations\">How Amazon S3 Calculates When an Object Became Noncurrent</a> in the <i>Amazon Simple Storage Service Developer Guide</i>.</p>"
         }
       },
       "documentation":"<p>Specifies when noncurrent object versions expire. Upon expiration, Amazon S3 permanently deletes the noncurrent object versions. You set this lifecycle configuration action on a bucket that has versioning enabled (or suspended) to request that Amazon S3 delete noncurrent object versions at a specific period in the object's lifetime.</p>"
@@ -5552,7 +5583,7 @@
       "members":{
         "NoncurrentDays":{
           "shape":"Days",
-          "documentation":"<p>Specifies the number of days an object is noncurrent before Amazon S3 can perform the associated action. For information about the noncurrent days calculations, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/s3-access-control.html\">How Amazon S3 Calculates When an Object Became Noncurrent</a> in the <i>Amazon Simple Storage Service Developer Guide</i>.</p>"
+          "documentation":"<p>Specifies the number of days an object is noncurrent before Amazon S3 can perform the associated action. For information about the noncurrent days calculations, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/intro-lifecycle-rules.html#non-current-days-calculations\">How Amazon S3 Calculates How Long an Object Has Been Noncurrent</a> in the <i>Amazon Simple Storage Service Developer Guide</i>.</p>"
         },
         "StorageClass":{
           "shape":"TransitionStorageClass",
@@ -5592,15 +5623,15 @@
       "members":{
         "TopicConfiguration":{
           "shape":"TopicConfigurationDeprecated",
-          "documentation":"<p/>"
+          "documentation":"<p>This data type is deprecated. A container for specifying the configuration for publication of messages to an Amazon Simple Notification Service (Amazon SNS) topic when Amazon S3 detects specified events. </p>"
         },
         "QueueConfiguration":{
           "shape":"QueueConfigurationDeprecated",
-          "documentation":"<p/>"
+          "documentation":"<p>This data type is deprecated. This data type specifies the configuration for publishing messages to an Amazon Simple Queue Service (Amazon SQS) queue when Amazon S3 detects specified events. </p>"
         },
         "CloudFunctionConfiguration":{
           "shape":"CloudFunctionConfiguration",
-          "documentation":"<p/>"
+          "documentation":"<p>Container for specifying the AWS Lambda notification configuration.</p>"
         }
       }
     },
@@ -5609,7 +5640,6 @@
       "members":{
         "Key":{
           "shape":"S3KeyFilter",
-          "documentation":"<p/>",
           "locationName":"S3Key"
         }
       },
@@ -5624,19 +5654,19 @@
       "members":{
         "Key":{
           "shape":"ObjectKey",
-          "documentation":"<p/>"
+          "documentation":"<p>The name that you assign to an object. You use the object key to retrieve the object.</p>"
         },
         "LastModified":{
           "shape":"LastModified",
-          "documentation":"<p/>"
+          "documentation":"<p>The date the Object was Last Modified</p>"
         },
         "ETag":{
           "shape":"ETag",
-          "documentation":"<p/>"
+          "documentation":"<p>The entity tag is an MD5 hash of the object. ETag reflects only changes to the contents of an object, not its metadata.</p>"
         },
         "Size":{
           "shape":"Size",
-          "documentation":"<p/>"
+          "documentation":"<p>Size in bytes of the object</p>"
         },
         "StorageClass":{
           "shape":"ObjectStorageClass",
@@ -5644,16 +5674,16 @@
         },
         "Owner":{
           "shape":"Owner",
-          "documentation":"<p/>"
+          "documentation":"<p>The owner of the object</p>"
         }
       },
-      "documentation":"<p/>"
+      "documentation":"<p>An object consists of data and its descriptive metadata.</p>"
     },
     "ObjectAlreadyInActiveTierError":{
       "type":"structure",
       "members":{
       },
-      "documentation":"<p>This operation is not allowed against this storage tier</p>",
+      "documentation":"<p>This operation is not allowed against this storage tier.</p>",
       "exception":true
     },
     "ObjectCannedACL":{
@@ -5681,7 +5711,7 @@
           "documentation":"<p>VersionId for the specific version of the object to delete.</p>"
         }
       },
-      "documentation":"<p/>"
+      "documentation":"<p>Object Identifier is unique value to identify objects.</p>"
     },
     "ObjectIdentifierList":{
       "type":"list",
@@ -5702,14 +5732,14 @@
       "members":{
         "ObjectLockEnabled":{
           "shape":"ObjectLockEnabled",
-          "documentation":"<p>Indicates whether this bucket has an object lock configuration enabled.</p>"
+          "documentation":"<p>Indicates whether this bucket has an Object Lock configuration enabled.</p>"
         },
         "Rule":{
           "shape":"ObjectLockRule",
-          "documentation":"<p>The object lock rule in place for the specified object.</p>"
+          "documentation":"<p>The Object Lock rule in place for the specified object.</p>"
         }
       },
-      "documentation":"<p>The container element for object lock configuration parameters.</p>"
+      "documentation":"<p>The container element for Object Lock configuration parameters.</p>"
     },
     "ObjectLockEnabled":{
       "type":"string",
@@ -5753,7 +5783,7 @@
         },
         "RetainUntilDate":{
           "shape":"Date",
-          "documentation":"<p>The date on which this object lock retention expires.</p>"
+          "documentation":"<p>The date on which this Object Lock Retention will expire.</p>"
         }
       },
       "documentation":"<p>A Retention configuration for an object.</p>"
@@ -5773,14 +5803,14 @@
           "documentation":"<p>The default retention period that you want to apply to new objects placed in the specified bucket.</p>"
         }
       },
-      "documentation":"<p>The container element for an object lock rule.</p>"
+      "documentation":"<p>The container element for an Object Lock rule.</p>"
     },
     "ObjectLockToken":{"type":"string"},
     "ObjectNotInActiveTierError":{
       "type":"structure",
       "members":{
       },
-      "documentation":"<p>The source object of the COPY operation is not in the active tier and is only stored in Amazon Glacier.</p>",
+      "documentation":"<p>The source object of the COPY operation is not in the active tier and is only stored in Amazon S3 Glacier.</p>",
       "exception":true
     },
     "ObjectStorageClass":{
@@ -5800,7 +5830,7 @@
       "members":{
         "ETag":{
           "shape":"ETag",
-          "documentation":"<p/>"
+          "documentation":"<p>The entity tag is an MD5 hash of that version of the object.</p>"
         },
         "Size":{
           "shape":"Size",
@@ -5828,10 +5858,10 @@
         },
         "Owner":{
           "shape":"Owner",
-          "documentation":"<p/>"
+          "documentation":"<p>Specifies the owner of the object.</p>"
         }
       },
-      "documentation":"<p/>"
+      "documentation":"<p>The version of an object.</p>"
     },
     "ObjectVersionId":{"type":"string"},
     "ObjectVersionList":{
@@ -5872,14 +5902,14 @@
       "members":{
         "DisplayName":{
           "shape":"DisplayName",
-          "documentation":"<p/>"
+          "documentation":"<p>Container for the display name of the owner.</p>"
         },
         "ID":{
           "shape":"ID",
-          "documentation":"<p/>"
+          "documentation":"<p>Container for the ID of the owner.</p>"
         }
       },
-      "documentation":"<p/>"
+      "documentation":"<p>Container for the owner's display name and ID.</p>"
     },
     "OwnerOverride":{
       "type":"string",
@@ -5889,7 +5919,7 @@
       "type":"structure",
       "members":{
       },
-      "documentation":"<p/>"
+      "documentation":"<p>Container for Parquet.</p>"
     },
     "Part":{
       "type":"structure",
@@ -5911,7 +5941,7 @@
           "documentation":"<p>Size in bytes of the uploaded part data.</p>"
         }
       },
-      "documentation":"<p/>"
+      "documentation":"<p>Container for elements related to a part.</p>"
     },
     "PartNumber":{"type":"integer"},
     "PartNumberMarker":{"type":"integer"},
@@ -5968,7 +5998,7 @@
           "documentation":"<p>The current number of bytes of records payload data returned.</p>"
         }
       },
-      "documentation":"<p/>"
+      "documentation":"<p>This data type contains information about progress of an operation.</p>"
     },
     "ProgressEvent":{
       "type":"structure",
@@ -5979,7 +6009,7 @@
           "eventpayload":true
         }
       },
-      "documentation":"<p/>",
+      "documentation":"<p>This data type contains information about the progress event of an operation.</p>",
       "event":true
     },
     "Protocol":{
@@ -5994,7 +6024,7 @@
       "members":{
         "BlockPublicAcls":{
           "shape":"Setting",
-          "documentation":"<p>Specifies whether Amazon S3 should block public access control lists (ACLs) for this bucket and objects in this bucket. Setting this element to <code>TRUE</code> causes the following behavior:</p> <ul> <li> <p>PUT Bucket acl and PUT Object acl calls fail if the specified ACL is public.</p> </li> <li> <p>PUT Object calls fail if the request includes a public ACL.</p> </li> </ul> <p>Enabling this setting doesn't affect existing policies or ACLs.</p>",
+          "documentation":"<p>Specifies whether Amazon S3 should block public access control lists (ACLs) for this bucket and objects in this bucket. Setting this element to <code>TRUE</code> causes the following behavior:</p> <ul> <li> <p>PUT Bucket acl and PUT Object acl calls fail if the specified ACL is public.</p> </li> <li> <p>PUT Object calls fail if the request includes a public ACL.</p> </li> <li> <p>PUT Bucket calls fail if the request includes a public ACL.</p> </li> </ul> <p>Enabling this setting doesn't affect existing policies or ACLs.</p>",
           "locationName":"BlockPublicAcls"
         },
         "IgnorePublicAcls":{
@@ -6013,7 +6043,7 @@
           "locationName":"RestrictPublicBuckets"
         }
       },
-      "documentation":"<p>Specifies the Block Public Access configuration for an Amazon S3 bucket.</p>"
+      "documentation":"<p>The PublicAccessBlock configuration that you want to apply to this Amazon S3 bucket. You can enable the configuration options in any combination. For more information about when Amazon S3 considers a bucket or object public, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/access-control-block-public-access.html#access-control-block-public-access-policy-status\">The Meaning of \"Public\"</a> in the <i>Amazon Simple Storage Service Developer Guide</i>. </p>"
     },
     "PutBucketAccelerateConfigurationRequest":{
       "type":"structure",
@@ -6030,7 +6060,7 @@
         },
         "AccelerateConfiguration":{
           "shape":"AccelerateConfiguration",
-          "documentation":"<p>Specifies the Accelerate Configuration you want to set for the bucket.</p>",
+          "documentation":"<p>Container for setting the transfer acceleration state.</p>",
           "locationName":"AccelerateConfiguration",
           "xmlNamespace":{"uri":"http://s3.amazonaws.com/doc/2006-03-01/"}
         }
@@ -6055,13 +6085,13 @@
         },
         "Bucket":{
           "shape":"BucketName",
-          "documentation":"<p/>",
+          "documentation":"<p>The bucket to which to apply the ACL.</p>",
           "location":"uri",
           "locationName":"Bucket"
         },
         "ContentMD5":{
           "shape":"ContentMD5",
-          "documentation":"<p/>",
+          "documentation":"<p>The base64-encoded 128-bit MD5 digest of the data. This header must be used as a message integrity check to verify that the request body was not corrupted in transit. For more information, go to <a href=\"http://www.ietf.org/rfc/rfc1864.txt\">RFC 1864.</a> </p>",
           "location":"header",
           "locationName":"Content-MD5"
         },
@@ -6136,19 +6166,19 @@
       "members":{
         "Bucket":{
           "shape":"BucketName",
-          "documentation":"<p/>",
+          "documentation":"<p>Specifies the bucket impacted by the <code>cors</code>configuration.</p>",
           "location":"uri",
           "locationName":"Bucket"
         },
         "CORSConfiguration":{
           "shape":"CORSConfiguration",
-          "documentation":"<p/>",
+          "documentation":"<p>Describes the cross-origin access configuration for objects in an Amazon S3 bucket. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev//cors.html\">Enabling Cross-Origin Resource Sharing</a> in the <i>Amazon Simple Storage Service Developer Guide</i>.</p>",
           "locationName":"CORSConfiguration",
           "xmlNamespace":{"uri":"http://s3.amazonaws.com/doc/2006-03-01/"}
         },
         "ContentMD5":{
           "shape":"ContentMD5",
-          "documentation":"<p/>",
+          "documentation":"<p>The base64-encoded 128-bit MD5 digest of the data. This header must be used as a message integrity check to verify that the request body was not corrupted in transit. For more information, go to <a href=\"http://www.ietf.org/rfc/rfc1864.txt\">RFC 1864.</a> </p>",
           "location":"header",
           "locationName":"Content-MD5"
         }
@@ -6164,7 +6194,7 @@
       "members":{
         "Bucket":{
           "shape":"BucketName",
-          "documentation":"<p>Specifies default encryption for a bucket using server-side encryption with Amazon S3-managed keys (SSE-S3) or AWS KMS-managed keys (SSE-KMS). For information about the Amazon S3 default encryption feature, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/bucket-encryption.html\">Amazon S3 Default Bucket Encryption</a> in the <i>Amazon Simple Storage Service Developer Guide</i>.</p>",
+          "documentation":"<p>Specifies default encryption for a bucket using server-side encryption with Amazon S3-managed keys (SSE-S3) or customer master keys stored in AWS KMS (SSE-KMS). For information about the Amazon S3 default encryption feature, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/bucket-encryption.html\">Amazon S3 Default Bucket Encryption</a> in the <i>Amazon Simple Storage Service Developer Guide</i>.</p>",
           "location":"uri",
           "locationName":"Bucket"
         },
@@ -6176,7 +6206,6 @@
         },
         "ServerSideEncryptionConfiguration":{
           "shape":"ServerSideEncryptionConfiguration",
-          "documentation":"<p/>",
           "locationName":"ServerSideEncryptionConfiguration",
           "xmlNamespace":{"uri":"http://s3.amazonaws.com/doc/2006-03-01/"}
         }
@@ -6218,13 +6247,13 @@
       "members":{
         "Bucket":{
           "shape":"BucketName",
-          "documentation":"<p/>",
+          "documentation":"<p>The name of the bucket for which to set the configuration.</p>",
           "location":"uri",
           "locationName":"Bucket"
         },
         "LifecycleConfiguration":{
           "shape":"BucketLifecycleConfiguration",
-          "documentation":"<p/>",
+          "documentation":"<p>Container for lifecycle rules. You can add as many as 1,000 rules.</p>",
           "locationName":"LifecycleConfiguration",
           "xmlNamespace":{"uri":"http://s3.amazonaws.com/doc/2006-03-01/"}
         }
@@ -6265,19 +6294,19 @@
       "members":{
         "Bucket":{
           "shape":"BucketName",
-          "documentation":"<p/>",
+          "documentation":"<p>The name of the bucket for which to set the logging parameters.</p>",
           "location":"uri",
           "locationName":"Bucket"
         },
         "BucketLoggingStatus":{
           "shape":"BucketLoggingStatus",
-          "documentation":"<p/>",
+          "documentation":"<p>Container for logging status information.</p>",
           "locationName":"BucketLoggingStatus",
           "xmlNamespace":{"uri":"http://s3.amazonaws.com/doc/2006-03-01/"}
         },
         "ContentMD5":{
           "shape":"ContentMD5",
-          "documentation":"<p/>",
+          "documentation":"<p>The MD5 hash of the <code>PutBucketLogging</code> request body.</p>",
           "location":"header",
           "locationName":"Content-MD5"
         }
@@ -6322,13 +6351,12 @@
       "members":{
         "Bucket":{
           "shape":"BucketName",
-          "documentation":"<p/>",
+          "documentation":"<p>The name of the bucket.</p>",
           "location":"uri",
           "locationName":"Bucket"
         },
         "NotificationConfiguration":{
           "shape":"NotificationConfiguration",
-          "documentation":"<p/>",
           "locationName":"NotificationConfiguration",
           "xmlNamespace":{"uri":"http://s3.amazonaws.com/doc/2006-03-01/"}
         }
@@ -6344,19 +6372,19 @@
       "members":{
         "Bucket":{
           "shape":"BucketName",
-          "documentation":"<p/>",
+          "documentation":"<p>The name of the bucket.</p>",
           "location":"uri",
           "locationName":"Bucket"
         },
         "ContentMD5":{
           "shape":"ContentMD5",
-          "documentation":"<p/>",
+          "documentation":"<p>The MD5 hash of the <code>PutPublicAccessBlock</code> request body.</p>",
           "location":"header",
           "locationName":"Content-MD5"
         },
         "NotificationConfiguration":{
           "shape":"NotificationConfigurationDeprecated",
-          "documentation":"<p/>",
+          "documentation":"<p>The container for the configuration.</p>",
           "locationName":"NotificationConfiguration",
           "xmlNamespace":{"uri":"http://s3.amazonaws.com/doc/2006-03-01/"}
         }
@@ -6372,13 +6400,13 @@
       "members":{
         "Bucket":{
           "shape":"BucketName",
-          "documentation":"<p/>",
+          "documentation":"<p>The name of the bucket.</p>",
           "location":"uri",
           "locationName":"Bucket"
         },
         "ContentMD5":{
           "shape":"ContentMD5",
-          "documentation":"<p/>",
+          "documentation":"<p>The MD5 hash of the request body.</p>",
           "location":"header",
           "locationName":"Content-MD5"
         },
@@ -6404,25 +6432,24 @@
       "members":{
         "Bucket":{
           "shape":"BucketName",
-          "documentation":"<p/>",
+          "documentation":"<p>The name of the bucket</p>",
           "location":"uri",
           "locationName":"Bucket"
         },
         "ContentMD5":{
           "shape":"ContentMD5",
-          "documentation":"<p>The base64-encoded 128-bit MD5 digest of the data. You must use this header as a message integrity check to verify that the request body was not corrupted in transit.</p>",
+          "documentation":"<p>The base64-encoded 128-bit MD5 digest of the data. You must use this header as a message integrity check to verify that the request body was not corrupted in transit. For more information, see <a href=\"http://www.ietf.org/rfc/rfc1864.txt\">RFC 1864</a>.</p>",
           "location":"header",
           "locationName":"Content-MD5"
         },
         "ReplicationConfiguration":{
           "shape":"ReplicationConfiguration",
-          "documentation":"<p/>",
           "locationName":"ReplicationConfiguration",
           "xmlNamespace":{"uri":"http://s3.amazonaws.com/doc/2006-03-01/"}
         },
         "Token":{
           "shape":"ObjectLockToken",
-          "documentation":"<p>A token that allows Amazon S3 object lock to be enabled for an existing bucket.</p>",
+          "documentation":"<p/>",
           "location":"header",
           "locationName":"x-amz-bucket-object-lock-token"
         }
@@ -6438,19 +6465,19 @@
       "members":{
         "Bucket":{
           "shape":"BucketName",
-          "documentation":"<p/>",
+          "documentation":"<p>The bucket name.</p>",
           "location":"uri",
           "locationName":"Bucket"
         },
         "ContentMD5":{
           "shape":"ContentMD5",
-          "documentation":"<p/>",
+          "documentation":"<p>&gt;The base64-encoded 128-bit MD5 digest of the data. You must use this header as a message integrity check to verify that the request body was not corrupted in transit. For more information, see <a href=\"http://www.ietf.org/rfc/rfc1864.txt\">RFC 1864</a>.</p>",
           "location":"header",
           "locationName":"Content-MD5"
         },
         "RequestPaymentConfiguration":{
           "shape":"RequestPaymentConfiguration",
-          "documentation":"<p/>",
+          "documentation":"<p>Container for Payer.</p>",
           "locationName":"RequestPaymentConfiguration",
           "xmlNamespace":{"uri":"http://s3.amazonaws.com/doc/2006-03-01/"}
         }
@@ -6466,19 +6493,19 @@
       "members":{
         "Bucket":{
           "shape":"BucketName",
-          "documentation":"<p/>",
+          "documentation":"<p>The bucket name.</p>",
           "location":"uri",
           "locationName":"Bucket"
         },
         "ContentMD5":{
           "shape":"ContentMD5",
-          "documentation":"<p/>",
+          "documentation":"<p>The base64-encoded 128-bit MD5 digest of the data. You must use this header as a message integrity check to verify that the request body was not corrupted in transit. For more information, see <a href=\"http://www.ietf.org/rfc/rfc1864.txt\">RFC 1864</a>.</p>",
           "location":"header",
           "locationName":"Content-MD5"
         },
         "Tagging":{
           "shape":"Tagging",
-          "documentation":"<p/>",
+          "documentation":"<p>Container for the <code>TagSet</code> and <code>Tag</code> elements.</p>",
           "locationName":"Tagging",
           "xmlNamespace":{"uri":"http://s3.amazonaws.com/doc/2006-03-01/"}
         }
@@ -6494,13 +6521,13 @@
       "members":{
         "Bucket":{
           "shape":"BucketName",
-          "documentation":"<p/>",
+          "documentation":"<p>The bucket name.</p>",
           "location":"uri",
           "locationName":"Bucket"
         },
         "ContentMD5":{
           "shape":"ContentMD5",
-          "documentation":"<p/>",
+          "documentation":"<p>&gt;The base64-encoded 128-bit MD5 digest of the data. You must use this header as a message integrity check to verify that the request body was not corrupted in transit. For more information, see <a href=\"http://www.ietf.org/rfc/rfc1864.txt\">RFC 1864</a>.</p>",
           "location":"header",
           "locationName":"Content-MD5"
         },
@@ -6512,7 +6539,7 @@
         },
         "VersioningConfiguration":{
           "shape":"VersioningConfiguration",
-          "documentation":"<p/>",
+          "documentation":"<p>Container for setting the versioning state.</p>",
           "locationName":"VersioningConfiguration",
           "xmlNamespace":{"uri":"http://s3.amazonaws.com/doc/2006-03-01/"}
         }
@@ -6528,19 +6555,19 @@
       "members":{
         "Bucket":{
           "shape":"BucketName",
-          "documentation":"<p/>",
+          "documentation":"<p>The bucket name.</p>",
           "location":"uri",
           "locationName":"Bucket"
         },
         "ContentMD5":{
           "shape":"ContentMD5",
-          "documentation":"<p/>",
+          "documentation":"<p>The base64-encoded 128-bit MD5 digest of the data. You must use this header as a message integrity check to verify that the request body was not corrupted in transit. For more information, see <a href=\"http://www.ietf.org/rfc/rfc1864.txt\">RFC 1864</a>.</p>",
           "location":"header",
           "locationName":"Content-MD5"
         },
         "WebsiteConfiguration":{
           "shape":"WebsiteConfiguration",
-          "documentation":"<p/>",
+          "documentation":"<p>Container for the request.</p>",
           "locationName":"WebsiteConfiguration",
           "xmlNamespace":{"uri":"http://s3.amazonaws.com/doc/2006-03-01/"}
         }
@@ -6566,7 +6593,7 @@
       "members":{
         "ACL":{
           "shape":"ObjectCannedACL",
-          "documentation":"<p>The canned ACL to apply to the object.</p>",
+          "documentation":"<p>The canned ACL to apply to the object. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/acl-overview.html#CannedACL\">Canned ACL</a>.</p>",
           "location":"header",
           "locationName":"x-amz-acl"
         },
@@ -6578,13 +6605,13 @@
         },
         "Bucket":{
           "shape":"BucketName",
-          "documentation":"<p/>",
+          "documentation":"<p>The bucket name that contains the object to which you want to attach the ACL. </p> <p>When using this API with an access point, you must direct requests to the access point hostname. The access point hostname takes the form <i>AccessPointName</i>-<i>AccountId</i>.s3-accesspoint.<i>Region</i>.amazonaws.com. When using this operation using an access point through the AWS SDKs, you provide the access point ARN in place of the bucket name. For more information about access point ARNs, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/using-access-points.html\">Using Access Points</a> in the <i>Amazon Simple Storage Service Developer Guide</i>.</p>",
           "location":"uri",
           "locationName":"Bucket"
         },
         "ContentMD5":{
           "shape":"ContentMD5",
-          "documentation":"<p/>",
+          "documentation":"<p>The base64-encoded 128-bit MD5 digest of the data. This header must be used as a message integrity check to verify that the request body was not corrupted in transit. For more information, go to <a href=\"http://www.ietf.org/rfc/rfc1864.txt\">RFC 1864.&gt;</a> </p>",
           "location":"header",
           "locationName":"Content-MD5"
         },
@@ -6620,7 +6647,7 @@
         },
         "Key":{
           "shape":"ObjectKey",
-          "documentation":"<p/>",
+          "documentation":"<p>Key for which the PUT operation was initiated.</p>",
           "location":"uri",
           "locationName":"Key"
         },
@@ -6657,7 +6684,7 @@
       "members":{
         "Bucket":{
           "shape":"BucketName",
-          "documentation":"<p>The bucket containing the object that you want to place a Legal Hold on.</p>",
+          "documentation":"<p>The bucket name containing the object that you want to place a Legal Hold on. </p> <p>When using this API with an access point, you must direct requests to the access point hostname. The access point hostname takes the form <i>AccessPointName</i>-<i>AccountId</i>.s3-accesspoint.<i>Region</i>.amazonaws.com. When using this operation using an access point through the AWS SDKs, you provide the access point ARN in place of the bucket name. For more information about access point ARNs, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/using-access-points.html\">Using Access Points</a> in the <i>Amazon Simple Storage Service Developer Guide</i>.</p>",
           "location":"uri",
           "locationName":"Bucket"
         },
@@ -6709,13 +6736,13 @@
       "members":{
         "Bucket":{
           "shape":"BucketName",
-          "documentation":"<p>The bucket whose object lock configuration you want to create or replace.</p>",
+          "documentation":"<p>The bucket whose Object Lock configuration you want to create or replace.</p>",
           "location":"uri",
           "locationName":"Bucket"
         },
         "ObjectLockConfiguration":{
           "shape":"ObjectLockConfiguration",
-          "documentation":"<p>The object lock configuration that you want to apply to the specified bucket.</p>",
+          "documentation":"<p>The Object Lock configuration that you want to apply to the specified bucket.</p>",
           "locationName":"ObjectLockConfiguration",
           "xmlNamespace":{"uri":"http://s3.amazonaws.com/doc/2006-03-01/"}
         },
@@ -6726,7 +6753,7 @@
         },
         "Token":{
           "shape":"ObjectLockToken",
-          "documentation":"<p>A token to allow Amazon S3 object lock to be enabled for an existing bucket.</p>",
+          "documentation":"<p>A token to allow Object Lock to be enabled for an existing bucket.</p>",
           "location":"header",
           "locationName":"x-amz-bucket-object-lock-token"
         },
@@ -6744,7 +6771,7 @@
       "members":{
         "Expiration":{
           "shape":"Expiration",
-          "documentation":"<p>If the object expiration is configured, this will contain the expiration date (expiry-date) and rule ID (rule-id). The value of rule-id is URL encoded.</p>",
+          "documentation":"<p> If the expiration is configured for the object (see <a>PutBucketLifecycleConfiguration</a>), the response includes this header. It includes the expiry-date and rule-id key-value pairs that provide information about object expiration. The value of the rule-id is URL encoded.</p>",
           "location":"header",
           "locationName":"x-amz-expiration"
         },
@@ -6756,7 +6783,7 @@
         },
         "ServerSideEncryption":{
           "shape":"ServerSideEncryption",
-          "documentation":"<p>The Server-side encryption algorithm used when storing this object in S3 (e.g., AES256, aws:kms).</p>",
+          "documentation":"<p>If you specified server-side encryption either with an AWS KMS customer master key (CMK) or Amazon S3-managed encryption key in your PUT request, the response includes this header. It confirms the encryption algorithm that Amazon S3 used to encrypt the object.</p>",
           "location":"header",
           "locationName":"x-amz-server-side-encryption"
         },
@@ -6774,13 +6801,13 @@
         },
         "SSECustomerKeyMD5":{
           "shape":"SSECustomerKeyMD5",
-          "documentation":"<p>If server-side encryption with a customer-provided encryption key was requested, the response will include this header to provide round trip message integrity verification of the customer-provided encryption key.</p>",
+          "documentation":"<p>If server-side encryption with a customer-provided encryption key was requested, the response will include this header to provide round-trip message integrity verification of the customer-provided encryption key.</p>",
           "location":"header",
           "locationName":"x-amz-server-side-encryption-customer-key-MD5"
         },
         "SSEKMSKeyId":{
           "shape":"SSEKMSKeyId",
-          "documentation":"<p>If present, specifies the ID of the AWS Key Management Service (KMS) master encryption key that was used for the object.</p>",
+          "documentation":"<p>If <code>x-amz-server-side-encryption</code> is present and has the value of <code>aws:kms</code>, this header specifies the ID of the AWS Key Management Service (AWS KMS) symmetric customer managed customer master key (CMK) that was used for the object. </p>",
           "location":"header",
           "locationName":"x-amz-server-side-encryption-aws-kms-key-id"
         },
@@ -6806,7 +6833,7 @@
       "members":{
         "ACL":{
           "shape":"ObjectCannedACL",
-          "documentation":"<p>The canned ACL to apply to the object.</p>",
+          "documentation":"<p>The canned ACL to apply to the object. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/acl-overview.html#CannedACL\">Canned ACL</a>.</p>",
           "location":"header",
           "locationName":"x-amz-acl"
         },
@@ -6817,25 +6844,25 @@
         },
         "Bucket":{
           "shape":"BucketName",
-          "documentation":"<p>Name of the bucket to which the PUT operation was initiated.</p>",
+          "documentation":"<p>Bucket name to which the PUT operation was initiated. </p> <p>When using this API with an access point, you must direct requests to the access point hostname. The access point hostname takes the form <i>AccessPointName</i>-<i>AccountId</i>.s3-accesspoint.<i>Region</i>.amazonaws.com. When using this operation using an access point through the AWS SDKs, you provide the access point ARN in place of the bucket name. For more information about access point ARNs, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/using-access-points.html\">Using Access Points</a> in the <i>Amazon Simple Storage Service Developer Guide</i>.</p>",
           "location":"uri",
           "locationName":"Bucket"
         },
         "CacheControl":{
           "shape":"CacheControl",
-          "documentation":"<p>Specifies caching behavior along the request/reply chain.</p>",
+          "documentation":"<p> Can be used to specify caching behavior along the request/reply chain. For more information, see <a href=\"http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.9\">http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.9</a>.</p>",
           "location":"header",
           "locationName":"Cache-Control"
         },
         "ContentDisposition":{
           "shape":"ContentDisposition",
-          "documentation":"<p>Specifies presentational information for the object.</p>",
+          "documentation":"<p>Specifies presentational information for the object. For more information, see <a href=\"http://www.w3.org/Protocols/rfc2616/rfc2616-sec19.html#sec19.5.1\">http://www.w3.org/Protocols/rfc2616/rfc2616-sec19.html#sec19.5.1</a>.</p>",
           "location":"header",
           "locationName":"Content-Disposition"
         },
         "ContentEncoding":{
           "shape":"ContentEncoding",
-          "documentation":"<p>Specifies what content encodings have been applied to the object and thus what decoding mechanisms must be applied to obtain the media-type referenced by the Content-Type header field.</p>",
+          "documentation":"<p>Specifies what content encodings have been applied to the object and thus what decoding mechanisms must be applied to obtain the media-type referenced by the Content-Type header field. For more information, see <a href=\"http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.11\">http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.11</a>.</p>",
           "location":"header",
           "locationName":"Content-Encoding"
         },
@@ -6847,25 +6874,25 @@
         },
         "ContentLength":{
           "shape":"ContentLength",
-          "documentation":"<p>Size of the body in bytes. This parameter is useful when the size of the body cannot be determined automatically.</p>",
+          "documentation":"<p>Size of the body in bytes. This parameter is useful when the size of the body cannot be determined automatically. For more information, see <a href=\"http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.13\">http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.13</a>.</p>",
           "location":"header",
           "locationName":"Content-Length"
         },
         "ContentMD5":{
           "shape":"ContentMD5",
-          "documentation":"<p>The base64-encoded 128-bit MD5 digest of the part data. This parameter is auto-populated when using the command from the CLI. This parameted is required if object lock parameters are specified.</p>",
+          "documentation":"<p>The base64-encoded 128-bit MD5 digest of the message (without the headers) according to RFC 1864. This header can be used as a message integrity check to verify that the data is the same data that was originally sent. Although it is optional, we recommend using the Content-MD5 mechanism as an end-to-end integrity check. For more information about REST request authentication, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/RESTAuthentication.html\">REST Authentication</a>.</p>",
           "location":"header",
           "locationName":"Content-MD5"
         },
         "ContentType":{
           "shape":"ContentType",
-          "documentation":"<p>A standard MIME type describing the format of the object data.</p>",
+          "documentation":"<p>A standard MIME type describing the format of the contents. For more information, see <a href=\"http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.17\">http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.17</a>.</p>",
           "location":"header",
           "locationName":"Content-Type"
         },
         "Expires":{
           "shape":"Expires",
-          "documentation":"<p>The date and time at which the object is no longer cacheable.</p>",
+          "documentation":"<p>The date and time at which the object is no longer cacheable. For more information, see <a href=\"http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.21\">http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.21</a>.</p>",
           "location":"header",
           "locationName":"Expires"
         },
@@ -6907,43 +6934,43 @@
         },
         "ServerSideEncryption":{
           "shape":"ServerSideEncryption",
-          "documentation":"<p>The Server-side encryption algorithm used when storing this object in S3 (e.g., AES256, aws:kms).</p>",
+          "documentation":"<p>The server-side encryption algorithm used when storing this object in Amazon S3 (for example, AES256, aws:kms).</p>",
           "location":"header",
           "locationName":"x-amz-server-side-encryption"
         },
         "StorageClass":{
           "shape":"StorageClass",
-          "documentation":"<p>The type of storage to use for the object. Defaults to 'STANDARD'.</p>",
+          "documentation":"<p>If you don't specify, Standard is the default storage class. Amazon S3 supports other storage classes.</p>",
           "location":"header",
           "locationName":"x-amz-storage-class"
         },
         "WebsiteRedirectLocation":{
           "shape":"WebsiteRedirectLocation",
-          "documentation":"<p>If the bucket is configured as a website, redirects requests for this object to another object in the same bucket or to an external URL. Amazon S3 stores the value of this header in the object metadata.</p>",
+          "documentation":"<p>If the bucket is configured as a website, redirects requests for this object to another object in the same bucket or to an external URL. Amazon S3 stores the value of this header in the object metadata. For information about object metadata, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/UsingMetadata.html\">Object Key and Metadata</a>.</p> <p>In the following example, the request header sets the redirect to an object (anotherPage.html) in the same bucket:</p> <p> <code>x-amz-website-redirect-location: /anotherPage.html</code> </p> <p>In the following example, the request header sets the object redirect to another website:</p> <p> <code>x-amz-website-redirect-location: http://www.example.com/</code> </p> <p>For more information about website hosting in Amazon S3, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/WebsiteHosting.html\">Hosting Websites on Amazon S3</a> and <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/how-to-page-redirect.html\">How to Configure Website Page Redirects</a>. </p>",
           "location":"header",
           "locationName":"x-amz-website-redirect-location"
         },
         "SSECustomerAlgorithm":{
           "shape":"SSECustomerAlgorithm",
-          "documentation":"<p>Specifies the algorithm to use to when encrypting the object (e.g., AES256).</p>",
+          "documentation":"<p>Specifies the algorithm to use to when encrypting the object (for example, AES256).</p>",
           "location":"header",
           "locationName":"x-amz-server-side-encryption-customer-algorithm"
         },
         "SSECustomerKey":{
           "shape":"SSECustomerKey",
-          "documentation":"<p>Specifies the customer-provided encryption key for Amazon S3 to use in encrypting data. This value is used to store the object and then it is discarded; Amazon does not store the encryption key. The key must be appropriate for use with the algorithm specified in the x-amz-server-side​-encryption​-customer-algorithm header.</p>",
+          "documentation":"<p>Specifies the customer-provided encryption key for Amazon S3 to use in encrypting data. This value is used to store the object and then it is discarded; Amazon S3 does not store the encryption key. The key must be appropriate for use with the algorithm specified in the <code>x-amz-server-side​-encryption​-customer-algorithm</code> header.</p>",
           "location":"header",
           "locationName":"x-amz-server-side-encryption-customer-key"
         },
         "SSECustomerKeyMD5":{
           "shape":"SSECustomerKeyMD5",
-          "documentation":"<p>Specifies the 128-bit MD5 digest of the encryption key according to RFC 1321. Amazon S3 uses this header for a message integrity check to ensure the encryption key was transmitted without error.</p>",
+          "documentation":"<p>Specifies the 128-bit MD5 digest of the encryption key according to RFC 1321. Amazon S3 uses this header for a message integrity check to ensure that the encryption key was transmitted without error.</p>",
           "location":"header",
           "locationName":"x-amz-server-side-encryption-customer-key-MD5"
         },
         "SSEKMSKeyId":{
           "shape":"SSEKMSKeyId",
-          "documentation":"<p>Specifies the AWS KMS key ID to use for object encryption. All GET and PUT requests for an object protected by AWS KMS will fail if not made via SSL or using SigV4. Documentation on configuring any of the officially supported AWS SDKs and CLI can be found at http://docs.aws.amazon.com/AmazonS3/latest/dev/UsingAWSSDK.html#specify-signature-version</p>",
+          "documentation":"<p>If <code>x-amz-server-side-encryption</code> is present and has the value of <code>aws:kms</code>, this header specifies the ID of the AWS Key Management Service (AWS KMS) symmetrical customer managed customer master key (CMK) that was used for the object.</p> <p> If the value of <code>x-amz-server-side-encryption</code> is <code>aws:kms</code>, this header specifies the ID of the symmetric customer managed AWS KMS CMK that will be used for the object. If you specify <code>x-amz-server-side-encryption:aws:kms</code>, but do not provide<code> x-amz-server-side-encryption-aws-kms-key-id</code>, Amazon S3 uses the AWS managed CMK in AWS to protect the data.</p>",
           "location":"header",
           "locationName":"x-amz-server-side-encryption-aws-kms-key-id"
         },
@@ -6966,19 +6993,19 @@
         },
         "ObjectLockMode":{
           "shape":"ObjectLockMode",
-          "documentation":"<p>The object lock mode that you want to apply to this object.</p>",
+          "documentation":"<p>The Object Lock mode that you want to apply to this object.</p>",
           "location":"header",
           "locationName":"x-amz-object-lock-mode"
         },
         "ObjectLockRetainUntilDate":{
           "shape":"ObjectLockRetainUntilDate",
-          "documentation":"<p>The date and time when you want this object's object lock to expire.</p>",
+          "documentation":"<p>The date and time when you want this object's Object Lock to expire.</p>",
           "location":"header",
           "locationName":"x-amz-object-lock-retain-until-date"
         },
         "ObjectLockLegalHoldStatus":{
           "shape":"ObjectLockLegalHoldStatus",
-          "documentation":"<p>The Legal Hold status that you want to apply to the specified object.</p>",
+          "documentation":"<p>Specifies whether a legal hold will be applied to this object. For more information about S3 Object Lock, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/object-lock.html\">Object Lock</a>.</p>",
           "location":"header",
           "locationName":"x-amz-object-lock-legal-hold"
         }
@@ -7004,7 +7031,7 @@
       "members":{
         "Bucket":{
           "shape":"BucketName",
-          "documentation":"<p>The bucket that contains the object you want to apply this Object Retention configuration to.</p>",
+          "documentation":"<p>The bucket name that contains the object you want to apply this Object Retention configuration to. </p> <p>When using this API with an access point, you must direct requests to the access point hostname. The access point hostname takes the form <i>AccessPointName</i>-<i>AccountId</i>.s3-accesspoint.<i>Region</i>.amazonaws.com. When using this operation using an access point through the AWS SDKs, you provide the access point ARN in place of the bucket name. For more information about access point ARNs, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/using-access-points.html\">Using Access Points</a> in the <i>Amazon Simple Storage Service Developer Guide</i>.</p>",
           "location":"uri",
           "locationName":"Bucket"
         },
@@ -7033,7 +7060,7 @@
         },
         "BypassGovernanceRetention":{
           "shape":"BypassGovernanceRetention",
-          "documentation":"<p>Indicates whether this operation should bypass Governance-mode restrictions.j</p>",
+          "documentation":"<p>Indicates whether this operation should bypass Governance-mode restrictions.</p>",
           "location":"header",
           "locationName":"x-amz-bypass-governance-retention"
         },
@@ -7051,7 +7078,7 @@
       "members":{
         "VersionId":{
           "shape":"ObjectVersionId",
-          "documentation":"<p/>",
+          "documentation":"<p>The versionId of the object the tag-set was added to.</p>",
           "location":"header",
           "locationName":"x-amz-version-id"
         }
@@ -7067,31 +7094,31 @@
       "members":{
         "Bucket":{
           "shape":"BucketName",
-          "documentation":"<p/>",
+          "documentation":"<p>The bucket name containing the object. </p> <p>When using this API with an access point, you must direct requests to the access point hostname. The access point hostname takes the form <i>AccessPointName</i>-<i>AccountId</i>.s3-accesspoint.<i>Region</i>.amazonaws.com. When using this operation using an access point through the AWS SDKs, you provide the access point ARN in place of the bucket name. For more information about access point ARNs, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/using-access-points.html\">Using Access Points</a> in the <i>Amazon Simple Storage Service Developer Guide</i>.</p>",
           "location":"uri",
           "locationName":"Bucket"
         },
         "Key":{
           "shape":"ObjectKey",
-          "documentation":"<p/>",
+          "documentation":"<p>Name of the tag.</p>",
           "location":"uri",
           "locationName":"Key"
         },
         "VersionId":{
           "shape":"ObjectVersionId",
-          "documentation":"<p/>",
+          "documentation":"<p>The versionId of the object that the tag-set will be added to.</p>",
           "location":"querystring",
           "locationName":"versionId"
         },
         "ContentMD5":{
           "shape":"ContentMD5",
-          "documentation":"<p/>",
+          "documentation":"<p>The MD5 hash for the request body.</p>",
           "location":"header",
           "locationName":"Content-MD5"
         },
         "Tagging":{
           "shape":"Tagging",
-          "documentation":"<p/>",
+          "documentation":"<p>Container for the <code>TagSet</code> and <code>Tag</code> elements</p>",
           "locationName":"Tagging",
           "xmlNamespace":{"uri":"http://s3.amazonaws.com/doc/2006-03-01/"}
         }
@@ -7142,13 +7169,10 @@
         },
         "Events":{
           "shape":"EventList",
-          "documentation":"<p/>",
+          "documentation":"<p>A collection of bucket events for which to send notifications</p>",
           "locationName":"Event"
         },
-        "Filter":{
-          "shape":"NotificationConfigurationFilter",
-          "documentation":"<p/>"
-        }
+        "Filter":{"shape":"NotificationConfigurationFilter"}
       },
       "documentation":"<p>Specifies the configuration for publishing messages to an Amazon Simple Queue Service (Amazon SQS) queue when Amazon S3 detects specified events.</p>"
     },
@@ -7162,15 +7186,15 @@
         },
         "Events":{
           "shape":"EventList",
-          "documentation":"<p/>",
+          "documentation":"<p>A collection of bucket events for which to send notifications</p>",
           "locationName":"Event"
         },
         "Queue":{
           "shape":"QueueArn",
-          "documentation":"<p/>"
+          "documentation":"<p>The Amazon Resource Name (ARN) of the Amazon SQS queue to which Amazon S3 publishes a message when it detects events of the specified type. </p>"
         }
       },
-      "documentation":"<p/>"
+      "documentation":"<p>This data type is deprecated. Use <a>QueueConfiguration</a> for the same purposes. This data type specifies the configuration for publishing messages to an Amazon Simple Queue Service (Amazon SQS) queue when Amazon S3 detects specified events. </p>"
     },
     "QueueConfigurationList":{
       "type":"list",
@@ -7198,7 +7222,7 @@
           "eventpayload":true
         }
       },
-      "documentation":"<p/>",
+      "documentation":"<p>The container for the records event.</p>",
       "event":true
     },
     "Redirect":{
@@ -7254,7 +7278,7 @@
       "members":{
         "Role":{
           "shape":"Role",
-          "documentation":"<p>The Amazon Resource Name (ARN) of the AWS Identity and Access Management (IAM) role that Amazon S3 assumes when replicating objects. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/crr-how-setup.html\">How to Set Up Cross-Region Replication</a> in the <i>Amazon Simple Storage Service Developer Guide</i>.</p>"
+          "documentation":"<p>The Amazon Resource Name (ARN) of the AWS Identity and Access Management (IAM) role that Amazon S3 assumes when replicating objects. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/replication-how-setup.html\">How to Set Up Replication</a> in the <i>Amazon Simple Storage Service Developer Guide</i>.</p>"
         },
         "Rules":{
           "shape":"ReplicationRules",
@@ -7277,33 +7301,31 @@
         },
         "Priority":{
           "shape":"Priority",
-          "documentation":"<p>The priority associated with the rule. If you specify multiple rules in a replication configuration, Amazon S3 prioritizes the rules to prevent conflicts when filtering. If two or more rules identify the same object based on a specified filter, the rule with higher priority takes precedence. For example:</p> <ul> <li> <p>Same object quality prefix based filter criteria If prefixes you specified in multiple rules overlap </p> </li> <li> <p>Same object qualify tag based filter criteria specified in multiple rules</p> </li> </ul> <p>For more information, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/crr.html\">Cross-Region Replication (CRR)</a> in the <i>Amazon S3 Developer Guide</i>.</p>"
+          "documentation":"<p>The priority associated with the rule. If you specify multiple rules in a replication configuration, Amazon S3 prioritizes the rules to prevent conflicts when filtering. If two or more rules identify the same object based on a specified filter, the rule with higher priority takes precedence. For example:</p> <ul> <li> <p>Same object quality prefix-based filter criteria if prefixes you specified in multiple rules overlap </p> </li> <li> <p>Same object qualify tag-based filter criteria specified in multiple rules</p> </li> </ul> <p>For more information, see <a href=\" https://docs.aws.amazon.com/AmazonS3/latest/dev/replication.html\">Replication</a> in the <i>Amazon Simple Storage Service Developer Guide</i>.</p>"
         },
         "Prefix":{
           "shape":"Prefix",
-          "documentation":"<p>An object keyname prefix that identifies the object or objects to which the rule applies. The maximum prefix length is 1,024 characters. To include all objects in a bucket, specify an empty string. </p>",
+          "documentation":"<p>An object key name prefix that identifies the object or objects to which the rule applies. The maximum prefix length is 1,024 characters. To include all objects in a bucket, specify an empty string. </p>",
           "deprecated":true
         },
-        "Filter":{
-          "shape":"ReplicationRuleFilter",
-          "documentation":"<p/>"
-        },
+        "Filter":{"shape":"ReplicationRuleFilter"},
         "Status":{
           "shape":"ReplicationRuleStatus",
           "documentation":"<p>Specifies whether the rule is enabled.</p>"
         },
         "SourceSelectionCriteria":{
           "shape":"SourceSelectionCriteria",
-          "documentation":"<p>A container that describes additional filters for identifying the source objects that you want to replicate. You can choose to enable or disable the replication of these objects. Currently, Amazon S3 supports only the filter that you can specify for objects created with server-side encryption using an AWS KMS-Managed Key (SSE-KMS).</p>"
+          "documentation":"<p>A container that describes additional filters for identifying the source objects that you want to replicate. You can choose to enable or disable the replication of these objects. Currently, Amazon S3 supports only the filter that you can specify for objects created with server-side encryption using a customer master key (CMK) stored in AWS Key Management Service (SSE-KMS).</p>"
+        },
+        "ExistingObjectReplication":{
+          "shape":"ExistingObjectReplication",
+          "documentation":"<p/>"
         },
         "Destination":{
           "shape":"Destination",
-          "documentation":"<p>A container for information about the replication destination.</p>"
+          "documentation":"<p>A container for information about the replication destination and its configurations including enabling the S3 Replication Time Control (S3 RTC).</p>"
         },
-        "DeleteMarkerReplication":{
-          "shape":"DeleteMarkerReplication",
-          "documentation":"<p/>"
-        }
+        "DeleteMarkerReplication":{"shape":"DeleteMarkerReplication"}
       },
       "documentation":"<p>Specifies which Amazon S3 objects to replicate and where to store the replicas.</p>"
     },
@@ -7312,23 +7334,23 @@
       "members":{
         "Prefix":{
           "shape":"Prefix",
-          "documentation":"<p/>"
+          "documentation":"<p>An object key name prefix that identifies the subset of objects to which the rule applies.</p>"
         },
         "Tags":{
           "shape":"TagSet",
-          "documentation":"<p/>",
+          "documentation":"<p>An array of tags containing key and value pairs.</p>",
           "flattened":true,
           "locationName":"Tag"
         }
       },
-      "documentation":"<p/>"
+      "documentation":"<p>A container for specifying rule filters. The filters determine the subset of objects to which the rule applies. This element is required only if you specify more than one filter. </p> <p>For example:</p> <ul> <li> <p>If you specify both a <code>Prefix</code> and a <code>Tag</code> filter, wrap these filters in an <code>And</code> tag. </p> </li> <li> <p>If you specify a filter based on multiple tags, wrap the <code>Tag</code> elements in an <code>And</code> tag</p> </li> </ul>"
     },
     "ReplicationRuleFilter":{
       "type":"structure",
       "members":{
         "Prefix":{
           "shape":"Prefix",
-          "documentation":"<p>An object keyname prefix that identifies the subset of objects to which the rule applies.</p>"
+          "documentation":"<p>An object key name prefix that identifies the subset of objects to which the rule applies.</p>"
         },
         "Tag":{
           "shape":"Tag",
@@ -7362,6 +7384,41 @@
         "REPLICA"
       ]
     },
+    "ReplicationTime":{
+      "type":"structure",
+      "required":[
+        "Status",
+        "Time"
+      ],
+      "members":{
+        "Status":{
+          "shape":"ReplicationTimeStatus",
+          "documentation":"<p> Specifies whether the replication time is enabled. </p>"
+        },
+        "Time":{
+          "shape":"ReplicationTimeValue",
+          "documentation":"<p> A container specifying the time by which replication should be complete for all objects and operations on objects. </p>"
+        }
+      },
+      "documentation":"<p> A container specifying S3 Replication Time Control (S3 RTC) related information, including whether S3 RTC is enabled and the time when all objects and operations on objects must be replicated. Must be specified together with a <code>Metrics</code> block. </p>"
+    },
+    "ReplicationTimeStatus":{
+      "type":"string",
+      "enum":[
+        "Enabled",
+        "Disabled"
+      ]
+    },
+    "ReplicationTimeValue":{
+      "type":"structure",
+      "members":{
+        "Minutes":{
+          "shape":"Minutes",
+          "documentation":"<p> Contains an integer specifying time in minutes. </p> <p> Valid values: 15 minutes. </p>"
+        }
+      },
+      "documentation":"<p> A container specifying the time value for S3 Replication Time Control (S3 RTC) and replication metrics <code>EventThreshold</code>. </p>"
+    },
     "RequestCharged":{
       "type":"string",
       "documentation":"<p>If present, indicates that the requester was successfully charged for the request.</p>",
@@ -7369,7 +7426,7 @@
     },
     "RequestPayer":{
       "type":"string",
-      "documentation":"<p>Confirms that the requester knows that she or he will be charged for the request. Bucket owners need not specify this parameter in their requests. Documentation on downloading objects from requester pays buckets can be found at http://docs.aws.amazon.com/AmazonS3/latest/dev/ObjectsinRequesterPaysBuckets.html</p>",
+      "documentation":"<p>Confirms that the requester knows that they will be charged for the request. Bucket owners need not specify this parameter in their requests. For information about downloading objects from requester pays buckets, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/ObjectsinRequesterPaysBuckets.html\">Downloading Objects in Requestor Pays Buckets</a> in the <i>Amazon S3 Developer Guide</i>.</p>",
       "enum":["requester"]
     },
     "RequestPaymentConfiguration":{
@@ -7381,7 +7438,7 @@
           "documentation":"<p>Specifies who pays for the download and request fees.</p>"
         }
       },
-      "documentation":"<p/>"
+      "documentation":"<p>Container for Payer.</p>"
     },
     "RequestProgress":{
       "type":"structure",
@@ -7391,7 +7448,7 @@
           "documentation":"<p>Specifies whether periodic QueryProgress frames should be sent. Valid values: TRUE, FALSE. Default value: FALSE.</p>"
         }
       },
-      "documentation":"<p/>"
+      "documentation":"<p>Container for specifying if periodic <code>QueryProgress</code> messages should be sent.</p>"
     },
     "ResponseCacheControl":{"type":"string"},
     "ResponseContentDisposition":{"type":"string"},
@@ -7425,25 +7482,24 @@
       "members":{
         "Bucket":{
           "shape":"BucketName",
-          "documentation":"<p/>",
+          "documentation":"<p>The bucket name or containing the object to restore. </p> <p>When using this API with an access point, you must direct requests to the access point hostname. The access point hostname takes the form <i>AccessPointName</i>-<i>AccountId</i>.s3-accesspoint.<i>Region</i>.amazonaws.com. When using this operation using an access point through the AWS SDKs, you provide the access point ARN in place of the bucket name. For more information about access point ARNs, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/using-access-points.html\">Using Access Points</a> in the <i>Amazon Simple Storage Service Developer Guide</i>.</p>",
           "location":"uri",
           "locationName":"Bucket"
         },
         "Key":{
           "shape":"ObjectKey",
-          "documentation":"<p/>",
+          "documentation":"<p>Object key for which the operation was initiated.</p>",
           "location":"uri",
           "locationName":"Key"
         },
         "VersionId":{
           "shape":"ObjectVersionId",
-          "documentation":"<p/>",
+          "documentation":"<p>VersionId used to reference a specific version of the object.</p>",
           "location":"querystring",
           "locationName":"versionId"
         },
         "RestoreRequest":{
           "shape":"RestoreRequest",
-          "documentation":"<p/>",
           "locationName":"RestoreRequest",
           "xmlNamespace":{"uri":"http://s3.amazonaws.com/doc/2006-03-01/"}
         },
@@ -7461,11 +7517,11 @@
       "members":{
         "Days":{
           "shape":"Days",
-          "documentation":"<p>Lifetime of the active copy in days. Do not use with restores that specify OutputLocation.</p>"
+          "documentation":"<p>Lifetime of the active copy in days. Do not use with restores that specify <code>OutputLocation</code>.</p>"
         },
         "GlacierJobParameters":{
           "shape":"GlacierJobParameters",
-          "documentation":"<p>Glacier related parameters pertaining to this job. Do not use with restores that specify OutputLocation.</p>"
+          "documentation":"<p>Glacier related parameters pertaining to this job. Do not use with restores that specify <code>OutputLocation</code>.</p>"
         },
         "Type":{
           "shape":"RestoreRequestType",
@@ -7526,7 +7582,7 @@
       "members":{
         "Expiration":{
           "shape":"LifecycleExpiration",
-          "documentation":"<p/>"
+          "documentation":"<p>Specifies the expiration for the lifecycle of the object.</p>"
         },
         "ID":{
           "shape":"ID",
@@ -7542,20 +7598,11 @@
         },
         "Transition":{
           "shape":"Transition",
-          "documentation":"<p/>"
-        },
-        "NoncurrentVersionTransition":{
-          "shape":"NoncurrentVersionTransition",
-          "documentation":"<p/>"
-        },
-        "NoncurrentVersionExpiration":{
-          "shape":"NoncurrentVersionExpiration",
-          "documentation":"<p/>"
+          "documentation":"<p>Specifies when an object transitions to a specified storage class.</p>"
         },
-        "AbortIncompleteMultipartUpload":{
-          "shape":"AbortIncompleteMultipartUpload",
-          "documentation":"<p/>"
-        }
+        "NoncurrentVersionTransition":{"shape":"NoncurrentVersionTransition"},
+        "NoncurrentVersionExpiration":{"shape":"NoncurrentVersionExpiration"},
+        "AbortIncompleteMultipartUpload":{"shape":"AbortIncompleteMultipartUpload"}
       },
       "documentation":"<p>Specifies lifecycle rules for an Amazon S3 bucket. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/API/RESTBucketPUTlifecycle.html\">PUT Bucket lifecycle</a> in the <i>Amazon Simple Storage Service API Reference</i>.</p>"
     },
@@ -7569,7 +7616,6 @@
       "members":{
         "FilterRules":{
           "shape":"FilterRuleList",
-          "documentation":"<p/>",
           "locationName":"FilterRule"
         }
       },
@@ -7590,10 +7636,7 @@
           "shape":"LocationPrefix",
           "documentation":"<p>The prefix that is prepended to the restore results for this request.</p>"
         },
-        "Encryption":{
-          "shape":"Encryption",
-          "documentation":"<p/>"
-        },
+        "Encryption":{"shape":"Encryption"},
         "CannedACL":{
           "shape":"ObjectCannedACL",
           "documentation":"<p>The canned ACL to apply to the restore results.</p>"
@@ -7615,7 +7658,7 @@
           "documentation":"<p>The class of storage used to store the restore results.</p>"
         }
       },
-      "documentation":"<p>Describes an S3 location that will receive the results of the restore request.</p>"
+      "documentation":"<p>Describes an Amazon S3 location that will receive the results of the restore request.</p>"
     },
     "SSECustomerAlgorithm":{"type":"string"},
     "SSECustomerKey":{
@@ -7629,10 +7672,10 @@
       "members":{
         "KeyId":{
           "shape":"SSEKMSKeyId",
-          "documentation":"<p>Specifies the ID of the AWS Key Management Service (KMS) master encryption key to use for encrypting Inventory reports.</p>"
+          "documentation":"<p>Specifies the ID of the AWS Key Management Service (AWS KMS) symmetric customer managed customer master key (CMK) to use for encrypting inventory reports.</p>"
         }
       },
-      "documentation":"<p>Specifies the use of SSE-KMS to encrypt delivered Inventory reports.</p>",
+      "documentation":"<p>Specifies the use of SSE-KMS to encrypt delivered inventory reports.</p>",
       "locationName":"SSE-KMS"
     },
     "SSEKMSEncryptionContext":{
@@ -7647,7 +7690,7 @@
       "type":"structure",
       "members":{
       },
-      "documentation":"<p>Specifies the use of SSE-S3 to encrypt delivered Inventory reports.</p>",
+      "documentation":"<p>Specifies the use of SSE-S3 to encrypt delivered inventory reports.</p>",
       "locationName":"SSE-S3"
     },
     "ScanRange":{
@@ -7655,13 +7698,14 @@
       "members":{
         "Start":{
           "shape":"Start",
-          "documentation":"<p>Specifies the start of the byte range. This parameter is optional. Valid values: non-negative integers. The default value is 0.</p>"
+          "documentation":"<p>Specifies the start of the byte range. This parameter is optional. Valid values: non-negative integers. The default value is 0. If only start is supplied, it means scan from that point to the end of the file.For example; <code>&lt;scanrange&gt;&lt;start&gt;50&lt;/start&gt;&lt;/scanrange&gt;</code> means scan from byte 50 until the end of the file.</p>"
         },
         "End":{
           "shape":"End",
-          "documentation":"<p>Specifies the end of the byte range. This parameter is optional. Valid values: non-negative integers. The default value is one less than the size of the object being queried.</p>"
+          "documentation":"<p>Specifies the end of the byte range. This parameter is optional. Valid values: non-negative integers. The default value is one less than the size of the object being queried. If only the End parameter is supplied, it is interpreted to mean scan the last N bytes of the file. For example, <code>&lt;scanrange&gt;&lt;end&gt;50&lt;/end&gt;&lt;/scanrange&gt;</code> means scan the last 50 bytes.</p>"
         }
-      }
+      },
+      "documentation":"<p>Specifies the byte range of the object to get the records from. A record is processed when its first byte is contained by the range. This parameter is optional, but when specified, it must not be empty. See RFC 2616, Section 14.35.1 about how to specify the start and end of the range.</p>"
     },
     "SelectObjectContentEventStream":{
       "type":"structure",
@@ -7687,7 +7731,7 @@
           "documentation":"<p>The End Event.</p>"
         }
       },
-      "documentation":"<p/>",
+      "documentation":"<p>The container for selecting objects from a content event stream.</p>",
       "eventstream":true
     },
     "SelectObjectContentOutput":{
@@ -7695,7 +7739,7 @@
       "members":{
         "Payload":{
           "shape":"SelectObjectContentEventStream",
-          "documentation":"<p/>"
+          "documentation":"<p>The array of results.</p>"
         }
       },
       "payload":"Payload"
@@ -7725,19 +7769,19 @@
         },
         "SSECustomerAlgorithm":{
           "shape":"SSECustomerAlgorithm",
-          "documentation":"<p>The SSE Algorithm used to encrypt the object. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/ServerSideEncryptionCustomerKeys.html\"> Server-Side Encryption (Using Customer-Provided Encryption Keys</a>. </p>",
+          "documentation":"<p>The SSE Algorithm used to encrypt the object. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/ServerSideEncryptionCustomerKeys.html\">Server-Side Encryption (Using Customer-Provided Encryption Keys</a>. </p>",
           "location":"header",
           "locationName":"x-amz-server-side-encryption-customer-algorithm"
         },
         "SSECustomerKey":{
           "shape":"SSECustomerKey",
-          "documentation":"<p>The SSE Customer Key. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/ServerSideEncryptionCustomerKeys.html\"> Server-Side Encryption (Using Customer-Provided Encryption Keys</a>. </p>",
+          "documentation":"<p>The SSE Customer Key. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/ServerSideEncryptionCustomerKeys.html\">Server-Side Encryption (Using Customer-Provided Encryption Keys</a>. </p>",
           "location":"header",
           "locationName":"x-amz-server-side-encryption-customer-key"
         },
         "SSECustomerKeyMD5":{
           "shape":"SSECustomerKeyMD5",
-          "documentation":"<p>The SSE Customer Key MD5. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/ServerSideEncryptionCustomerKeys.html\"> Server-Side Encryption (Using Customer-Provided Encryption Keys</a>. </p>",
+          "documentation":"<p>The SSE Customer Key MD5. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/ServerSideEncryptionCustomerKeys.html\">Server-Side Encryption (Using Customer-Provided Encryption Keys</a>. </p>",
           "location":"header",
           "locationName":"x-amz-server-side-encryption-customer-key-MD5"
         },
@@ -7747,7 +7791,7 @@
         },
         "ExpressionType":{
           "shape":"ExpressionType",
-          "documentation":"<p>The type of the provided expression (for example., SQL).</p>"
+          "documentation":"<p>The type of the provided expression (for example, SQL).</p>"
         },
         "RequestProgress":{
           "shape":"RequestProgress",
@@ -7763,7 +7807,7 @@
         },
         "ScanRange":{
           "shape":"ScanRange",
-          "documentation":"<p>Specifies the byte range of the object to get the records from. A record is processed when its first byte is contained by the range. This parameter is optional, but when specified, it must not be empty. See RFC 2616, Section 14.35.1 about how to specify the start and end of the range.</p>"
+          "documentation":"<p>Specifies the byte range of the object to get the records from. A record is processed when its first byte is contained by the range. This parameter is optional, but when specified, it must not be empty. See RFC 2616, Section 14.35.1 about how to specify the start and end of the range.</p> <p> <code>ScanRange</code>may be used in the following ways:</p> <ul> <li> <p> <code>&lt;scanrange&gt;&lt;start&gt;50&lt;/start&gt;&lt;end&gt;100&lt;/end&gt;&lt;/scanrange&gt;</code> - process only the records starting between the bytes 50 and 100 (inclusive, counting from zero)</p> </li> <li> <p> <code>&lt;scanrange&gt;&lt;start&gt;50&lt;/start&gt;&lt;/scanrange&gt;</code> - process only the records starting after the byte 50</p> </li> <li> <p> <code>&lt;scanrange&gt;&lt;end&gt;50&lt;/end&gt;&lt;/scanrange&gt;</code> - process only the records within the last 50 bytes of the file.</p> </li> </ul>"
         }
       },
       "documentation":"<p>Request to filter the contents of an Amazon S3 object based on a simple Structured Query Language (SQL) statement. In the request, along with the SQL expression, you must specify a data serialization format (JSON or CSV) of the object. Amazon S3 uses this to parse object data into records. It returns only records that match the specified SQL expression. You must also specify the data serialization format for the response. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/API/RESTObjectSELECTContent.html\">S3Select API Documentation</a>.</p>"
@@ -7783,7 +7827,7 @@
         },
         "ExpressionType":{
           "shape":"ExpressionType",
-          "documentation":"<p>The type of the provided expression (e.g., SQL).</p>"
+          "documentation":"<p>The type of the provided expression (for example, SQL).</p>"
         },
         "Expression":{
           "shape":"Expression",
@@ -7855,7 +7899,7 @@
           "documentation":"<p> A container for filter information for the selection of Amazon S3 objects encrypted with AWS KMS. If you include <code>SourceSelectionCriteria</code> in the replication configuration, this element is required. </p>"
         }
       },
-      "documentation":"<p>A container that describes additional filters for identifying the source objects that you want to replicate. You can choose to enable or disable the replication of these objects. Currently, Amazon S3 supports only the filter that you can specify for objects created with server-side encryption using an AWS KMS-Managed Key (SSE-KMS).</p>"
+      "documentation":"<p>A container that describes additional filters for identifying the source objects that you want to replicate. You can choose to enable or disable the replication of these objects. Currently, Amazon S3 supports only the filter that you can specify for objects created with server-side encryption using a customer master key (CMK) stored in AWS Key Management Service (SSE-KMS).</p>"
     },
     "SseKmsEncryptedObjects":{
       "type":"structure",
@@ -7863,7 +7907,7 @@
       "members":{
         "Status":{
           "shape":"SseKmsEncryptedObjectsStatus",
-          "documentation":"<p>Specifies whether Amazon S3 replicates objects created with server-side encryption using an AWS KMS-managed key.</p>"
+          "documentation":"<p>Specifies whether Amazon S3 replicates objects created with server-side encryption using a customer master key (CMK) stored in AWS Key Management Service.</p>"
         }
       },
       "documentation":"<p>A container for filter information for the selection of S3 objects encrypted with AWS KMS.</p>"
@@ -7893,7 +7937,7 @@
           "documentation":"<p>The total number of bytes of records payload data returned.</p>"
         }
       },
-      "documentation":"<p/>"
+      "documentation":"<p>Container for the stats details.</p>"
     },
     "StatsEvent":{
       "type":"structure",
@@ -7904,7 +7948,7 @@
           "eventpayload":true
         }
       },
-      "documentation":"<p/>",
+      "documentation":"<p>Container for the Stats Event.</p>",
       "event":true
     },
     "StorageClass":{
@@ -7945,7 +7989,7 @@
           "documentation":"<p>The place to store the data for an analysis.</p>"
         }
       },
-      "documentation":"<p/>"
+      "documentation":"<p>Container for data related to the storage class analysis for an Amazon S3 bucket for export.</p>"
     },
     "StorageClassAnalysisSchemaVersion":{
       "type":"string",
@@ -7968,7 +8012,7 @@
           "documentation":"<p>Value of the tag.</p>"
         }
       },
-      "documentation":"<p/>"
+      "documentation":"<p>A container of a key value name pair.</p>"
     },
     "TagCount":{"type":"integer"},
     "TagSet":{
@@ -7984,10 +8028,10 @@
       "members":{
         "TagSet":{
           "shape":"TagSet",
-          "documentation":"<p/>"
+          "documentation":"<p>A collection for a set of tags</p>"
         }
       },
-      "documentation":"<p/>"
+      "documentation":"<p>Container for <code>TagSet</code> elements.</p>"
     },
     "TaggingDirective":{
       "type":"string",
@@ -8003,14 +8047,14 @@
       "members":{
         "Grantee":{
           "shape":"Grantee",
-          "documentation":"<p/>"
+          "documentation":"<p>Container for the person being granted permissions.</p>"
         },
         "Permission":{
           "shape":"BucketLogsPermission",
           "documentation":"<p>Logging permissions assigned to the Grantee for the bucket.</p>"
         }
       },
-      "documentation":"<p/>"
+      "documentation":"<p>Container for granting information.</p>"
     },
     "TargetGrants":{
       "type":"list",
@@ -8048,10 +8092,7 @@
           "documentation":"<p>The Amazon S3 bucket event about which to send notifications. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/NotificationHowTo.html\">Supported Event Types</a> in the <i>Amazon Simple Storage Service Developer Guide</i>.</p>",
           "locationName":"Event"
         },
-        "Filter":{
-          "shape":"NotificationConfigurationFilter",
-          "documentation":"<p/>"
-        }
+        "Filter":{"shape":"NotificationConfigurationFilter"}
       },
       "documentation":"<p>A container for specifying the configuration for publication of messages to an Amazon Simple Notification Service (Amazon SNS) topic when Amazon S3 detects specified events.</p>"
     },
@@ -8061,7 +8102,7 @@
         "Id":{"shape":"NotificationId"},
         "Events":{
           "shape":"EventList",
-          "documentation":"<p/>",
+          "documentation":"<p>A collection of events related to objects</p>",
           "locationName":"Event"
         },
         "Event":{
@@ -8074,7 +8115,7 @@
           "documentation":"<p>Amazon SNS topic to which Amazon S3 will publish a message to report the specified events for the bucket.</p>"
         }
       },
-      "documentation":"<p/>"
+      "documentation":"<p>A container for specifying the configuration for publication of messages to an Amazon Simple Notification Service (Amazon SNS) topic when Amazon S3 detects specified events. This data type is deprecated. Use <a>TopicConfiguration</a> instead.</p>"
     },
     "TopicConfigurationList":{
       "type":"list",
@@ -8135,11 +8176,11 @@
         },
         "CopyPartResult":{
           "shape":"CopyPartResult",
-          "documentation":"<p/>"
+          "documentation":"<p>Container for all response elements.</p>"
         },
         "ServerSideEncryption":{
           "shape":"ServerSideEncryption",
-          "documentation":"<p>The Server-side encryption algorithm used when storing this object in S3 (e.g., AES256, aws:kms).</p>",
+          "documentation":"<p>The server-side encryption algorithm used when storing this object in Amazon S3 (for example, AES256, aws:kms).</p>",
           "location":"header",
           "locationName":"x-amz-server-side-encryption"
         },
@@ -8151,13 +8192,13 @@
         },
         "SSECustomerKeyMD5":{
           "shape":"SSECustomerKeyMD5",
-          "documentation":"<p>If server-side encryption with a customer-provided encryption key was requested, the response will include this header to provide round trip message integrity verification of the customer-provided encryption key.</p>",
+          "documentation":"<p>If server-side encryption with a customer-provided encryption key was requested, the response will include this header to provide round-trip message integrity verification of the customer-provided encryption key.</p>",
           "location":"header",
           "locationName":"x-amz-server-side-encryption-customer-key-MD5"
         },
         "SSEKMSKeyId":{
           "shape":"SSEKMSKeyId",
-          "documentation":"<p>If present, specifies the ID of the AWS Key Management Service (KMS) master encryption key that was used for the object.</p>",
+          "documentation":"<p>If present, specifies the ID of the AWS Key Management Service (AWS KMS) symmetric customer managed customer master key (CMK) that was used for the object.</p>",
           "location":"header",
           "locationName":"x-amz-server-side-encryption-aws-kms-key-id"
         },
@@ -8181,7 +8222,7 @@
       "members":{
         "Bucket":{
           "shape":"BucketName",
-          "documentation":"<p/>",
+          "documentation":"<p>The bucket name.</p>",
           "location":"uri",
           "locationName":"Bucket"
         },
@@ -8217,13 +8258,13 @@
         },
         "CopySourceRange":{
           "shape":"CopySourceRange",
-          "documentation":"<p>The range of bytes to copy from the source object. The range value must use the form bytes=first-last, where the first and last are the zero-based byte offsets to copy. For example, bytes=0-9 indicates that you want to copy the first ten bytes of the source. You can copy a range only if the source object is greater than 5 MB.</p>",
+          "documentation":"<p>The range of bytes to copy from the source object. The range value must use the form bytes=first-last, where the first and last are the zero-based byte offsets to copy. For example, bytes=0-9 indicates that you want to copy the first 10 bytes of the source. You can copy a range only if the source object is greater than 5 MB.</p>",
           "location":"header",
           "locationName":"x-amz-copy-source-range"
         },
         "Key":{
           "shape":"ObjectKey",
-          "documentation":"<p/>",
+          "documentation":"<p>Object key for which the multipart upload was initiated.</p>",
           "location":"uri",
           "locationName":"Key"
         },
@@ -8241,25 +8282,25 @@
         },
         "SSECustomerAlgorithm":{
           "shape":"SSECustomerAlgorithm",
-          "documentation":"<p>Specifies the algorithm to use to when encrypting the object (e.g., AES256).</p>",
+          "documentation":"<p>Specifies the algorithm to use to when encrypting the object (for example, AES256).</p>",
           "location":"header",
           "locationName":"x-amz-server-side-encryption-customer-algorithm"
         },
         "SSECustomerKey":{
           "shape":"SSECustomerKey",
-          "documentation":"<p>Specifies the customer-provided encryption key for Amazon S3 to use in encrypting data. This value is used to store the object and then it is discarded; Amazon does not store the encryption key. The key must be appropriate for use with the algorithm specified in the x-amz-server-side​-encryption​-customer-algorithm header. This must be the same encryption key specified in the initiate multipart upload request.</p>",
+          "documentation":"<p>Specifies the customer-provided encryption key for Amazon S3 to use in encrypting data. This value is used to store the object and then it is discarded; Amazon S3 does not store the encryption key. The key must be appropriate for use with the algorithm specified in the <code>x-amz-server-side​-encryption​-customer-algorithm</code> header. This must be the same encryption key specified in the initiate multipart upload request.</p>",
           "location":"header",
           "locationName":"x-amz-server-side-encryption-customer-key"
         },
         "SSECustomerKeyMD5":{
           "shape":"SSECustomerKeyMD5",
-          "documentation":"<p>Specifies the 128-bit MD5 digest of the encryption key according to RFC 1321. Amazon S3 uses this header for a message integrity check to ensure the encryption key was transmitted without error.</p>",
+          "documentation":"<p>Specifies the 128-bit MD5 digest of the encryption key according to RFC 1321. Amazon S3 uses this header for a message integrity check to ensure that the encryption key was transmitted without error.</p>",
           "location":"header",
           "locationName":"x-amz-server-side-encryption-customer-key-MD5"
         },
         "CopySourceSSECustomerAlgorithm":{
           "shape":"CopySourceSSECustomerAlgorithm",
-          "documentation":"<p>Specifies the algorithm to use when decrypting the source object (e.g., AES256).</p>",
+          "documentation":"<p>Specifies the algorithm to use when decrypting the source object (for example, AES256).</p>",
           "location":"header",
           "locationName":"x-amz-copy-source-server-side-encryption-customer-algorithm"
         },
@@ -8271,7 +8312,7 @@
         },
         "CopySourceSSECustomerKeyMD5":{
           "shape":"CopySourceSSECustomerKeyMD5",
-          "documentation":"<p>Specifies the 128-bit MD5 digest of the encryption key according to RFC 1321. Amazon S3 uses this header for a message integrity check to ensure the encryption key was transmitted without error.</p>",
+          "documentation":"<p>Specifies the 128-bit MD5 digest of the encryption key according to RFC 1321. Amazon S3 uses this header for a message integrity check to ensure that the encryption key was transmitted without error.</p>",
           "location":"header",
           "locationName":"x-amz-copy-source-server-side-encryption-customer-key-MD5"
         },
@@ -8287,7 +8328,7 @@
       "members":{
         "ServerSideEncryption":{
           "shape":"ServerSideEncryption",
-          "documentation":"<p>The Server-side encryption algorithm used when storing this object in S3 (e.g., AES256, aws:kms).</p>",
+          "documentation":"<p>The server-side encryption algorithm used when storing this object in Amazon S3 (for example, AES256, aws:kms).</p>",
           "location":"header",
           "locationName":"x-amz-server-side-encryption"
         },
@@ -8305,13 +8346,13 @@
         },
         "SSECustomerKeyMD5":{
           "shape":"SSECustomerKeyMD5",
-          "documentation":"<p>If server-side encryption with a customer-provided encryption key was requested, the response will include this header to provide round trip message integrity verification of the customer-provided encryption key.</p>",
+          "documentation":"<p>If server-side encryption with a customer-provided encryption key was requested, the response will include this header to provide round-trip message integrity verification of the customer-provided encryption key.</p>",
           "location":"header",
           "locationName":"x-amz-server-side-encryption-customer-key-MD5"
         },
         "SSEKMSKeyId":{
           "shape":"SSEKMSKeyId",
-          "documentation":"<p>If present, specifies the ID of the AWS Key Management Service (KMS) master encryption key that was used for the object.</p>",
+          "documentation":"<p>If present, specifies the ID of the AWS Key Management Service (AWS KMS) symmetric customer managed customer master key (CMK) was used for the object.</p>",
           "location":"header",
           "locationName":"x-amz-server-side-encryption-aws-kms-key-id"
         },
@@ -8350,7 +8391,7 @@
         },
         "ContentMD5":{
           "shape":"ContentMD5",
-          "documentation":"<p>The base64-encoded 128-bit MD5 digest of the part data. This parameter is auto-populated when using the command from the CLI. This parameted is required if object lock parameters are specified.</p>",
+          "documentation":"<p>The base64-encoded 128-bit MD5 digest of the part data. This parameter is auto-populated when using the command from the CLI. This parameter is required if object lock parameters are specified.</p>",
           "location":"header",
           "locationName":"Content-MD5"
         },
@@ -8374,19 +8415,19 @@
         },
         "SSECustomerAlgorithm":{
           "shape":"SSECustomerAlgorithm",
-          "documentation":"<p>Specifies the algorithm to use to when encrypting the object (e.g., AES256).</p>",
+          "documentation":"<p>Specifies the algorithm to use to when encrypting the object (for example, AES256).</p>",
           "location":"header",
           "locationName":"x-amz-server-side-encryption-customer-algorithm"
         },
         "SSECustomerKey":{
           "shape":"SSECustomerKey",
-          "documentation":"<p>Specifies the customer-provided encryption key for Amazon S3 to use in encrypting data. This value is used to store the object and then it is discarded; Amazon does not store the encryption key. The key must be appropriate for use with the algorithm specified in the x-amz-server-side​-encryption​-customer-algorithm header. This must be the same encryption key specified in the initiate multipart upload request.</p>",
+          "documentation":"<p>Specifies the customer-provided encryption key for Amazon S3 to use in encrypting data. This value is used to store the object and then it is discarded; Amazon S3 does not store the encryption key. The key must be appropriate for use with the algorithm specified in the <code>x-amz-server-side​-encryption​-customer-algorithm header</code>. This must be the same encryption key specified in the initiate multipart upload request.</p>",
           "location":"header",
           "locationName":"x-amz-server-side-encryption-customer-key"
         },
         "SSECustomerKeyMD5":{
           "shape":"SSECustomerKeyMD5",
-          "documentation":"<p>Specifies the 128-bit MD5 digest of the encryption key according to RFC 1321. Amazon S3 uses this header for a message integrity check to ensure the encryption key was transmitted without error.</p>",
+          "documentation":"<p>Specifies the 128-bit MD5 digest of the encryption key according to RFC 1321. Amazon S3 uses this header for a message integrity check to ensure that the encryption key was transmitted without error.</p>",
           "location":"header",
           "locationName":"x-amz-server-side-encryption-customer-key-MD5"
         },
diff --git a/services/s3/src/test/java/software/amazon/awssdk/services/s3/AclTest.java b/services/s3/src/test/java/software/amazon/awssdk/services/s3/AclTest.java
index 0ca98e43462f..bc558e57fae7 100644
--- a/services/s3/src/test/java/software/amazon/awssdk/services/s3/AclTest.java
+++ b/services/s3/src/test/java/software/amazon/awssdk/services/s3/AclTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -18,9 +18,11 @@
 import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
 import static com.github.tomakehurst.wiremock.client.WireMock.anyRequestedFor;
 import static com.github.tomakehurst.wiremock.client.WireMock.anyUrl;
+import static com.github.tomakehurst.wiremock.client.WireMock.get;
 import static com.github.tomakehurst.wiremock.client.WireMock.put;
 import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
 import static com.github.tomakehurst.wiremock.client.WireMock.verify;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import com.github.tomakehurst.wiremock.junit.WireMockRule;
 import com.github.tomakehurst.wiremock.matching.ContainsPattern;
@@ -33,6 +35,7 @@
 import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
 import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
 import software.amazon.awssdk.regions.Region;
+import software.amazon.awssdk.services.s3.model.GetBucketAclResponse;
 import software.amazon.awssdk.services.s3.model.Grant;
 import software.amazon.awssdk.services.s3.model.Permission;
 import software.amazon.awssdk.services.s3.model.PutBucketAclRequest;
@@ -71,6 +74,16 @@ public void putBucketAcl_marshalling() {
         verify(anyRequestedFor(anyUrl()).withRequestBody(new ContainsPattern(MOCK_ACL_RESPONSE)));
     }
 
+    @Test
+    public void getBucketAcl_shouldUnmarshallCorrectly() {
+        stubFor(get(anyUrl())
+                    .willReturn(aResponse().withBody(MOCK_ACL_RESPONSE).withStatus(200)));
+
+        GetBucketAclResponse bucketAcl = s3Client.getBucketAcl(b -> b.bucket("test"));
+        assertThat(bucketAcl.owner()).isEqualTo(request().accessControlPolicy().owner());
+        assertThat(bucketAcl.grants()).isEqualTo(request().accessControlPolicy().grants());
+    }
+
     private PutBucketAclRequest request() {
 
         List<Grant> grants = new ArrayList<>();
diff --git a/services/s3/src/test/java/software/amazon/awssdk/services/s3/EndpointOverrideTest.java b/services/s3/src/test/java/software/amazon/awssdk/services/s3/EndpointOverrideTest.java
index a552c0e32e56..0d58559d4e5d 100644
--- a/services/s3/src/test/java/software/amazon/awssdk/services/s3/EndpointOverrideTest.java
+++ b/services/s3/src/test/java/software/amazon/awssdk/services/s3/EndpointOverrideTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/s3/src/test/java/software/amazon/awssdk/services/s3/MultipartUploadTest.java b/services/s3/src/test/java/software/amazon/awssdk/services/s3/MultipartUploadTest.java
index 2ff1986e660d..1c314ded4fc5 100644
--- a/services/s3/src/test/java/software/amazon/awssdk/services/s3/MultipartUploadTest.java
+++ b/services/s3/src/test/java/software/amazon/awssdk/services/s3/MultipartUploadTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/s3/src/test/java/software/amazon/awssdk/services/s3/S3MockUtils.java b/services/s3/src/test/java/software/amazon/awssdk/services/s3/S3MockUtils.java
index fa0efc327a89..10e7d779e9bc 100644
--- a/services/s3/src/test/java/software/amazon/awssdk/services/s3/S3MockUtils.java
+++ b/services/s3/src/test/java/software/amazon/awssdk/services/s3/S3MockUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/s3/src/test/java/software/amazon/awssdk/services/s3/S3PresignerTest.java b/services/s3/src/test/java/software/amazon/awssdk/services/s3/S3PresignerTest.java
index 2fefca96a76c..5cf3f215c607 100644
--- a/services/s3/src/test/java/software/amazon/awssdk/services/s3/S3PresignerTest.java
+++ b/services/s3/src/test/java/software/amazon/awssdk/services/s3/S3PresignerTest.java
@@ -1,3 +1,18 @@
+/*
+ * 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.
+ */
+
 package software.amazon.awssdk.services.s3;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -15,11 +30,13 @@
 import software.amazon.awssdk.auth.credentials.AwsCredentials;
 import software.amazon.awssdk.auth.signer.AwsS3V4Signer;
 import software.amazon.awssdk.awscore.AwsRequestOverrideConfiguration;
+import software.amazon.awssdk.core.client.config.ClientOverrideConfiguration;
 import software.amazon.awssdk.core.signer.NoOpSigner;
 import software.amazon.awssdk.regions.Region;
 import software.amazon.awssdk.services.s3.model.RequestPayer;
 import software.amazon.awssdk.services.s3.presigner.S3Presigner;
 import software.amazon.awssdk.services.s3.presigner.model.PresignedGetObjectRequest;
+import software.amazon.awssdk.services.s3.presigner.model.PresignedPutObjectRequest;
 
 @RunWith(MockitoJUnitRunner.class)
 public class S3PresignerTest {
@@ -73,7 +90,7 @@ public void build_minimalProperties() {
     }
 
     @Test
-    public void basicGetObjectSignatureIsUrlCompatible() {
+    public void getObject_SignatureIsUrlCompatible() {
         PresignedGetObjectRequest presigned =
             presigner.presignGetObject(r -> r.signatureDuration(Duration.ofMinutes(5))
                                              .getObjectRequest(go -> go.bucket("foo34343434")
@@ -85,7 +102,7 @@ public void basicGetObjectSignatureIsUrlCompatible() {
     }
 
     @Test
-    public void requesterPaysIsNotUrlCompatible() {
+    public void getObject_RequesterPaysIsNotUrlCompatible() {
         PresignedGetObjectRequest presigned =
             presigner.presignGetObject(r -> r.signatureDuration(Duration.ofMinutes(5))
                                              .getObjectRequest(go -> go.bucket("foo34343434")
@@ -97,7 +114,7 @@ public void requesterPaysIsNotUrlCompatible() {
     }
 
     @Test
-    public void endpointOverrideIsIncludedInPresignedUrl() {
+    public void getObject_EndpointOverrideIsIncludedInPresignedUrl() {
         S3Presigner presigner = presignerBuilder().endpointOverride(URI.create("http://foo.com")).build();
         PresignedGetObjectRequest presigned =
             presigner.presignGetObject(r -> r.signatureDuration(Duration.ofMinutes(5))
@@ -111,21 +128,7 @@ public void endpointOverrideIsIncludedInPresignedUrl() {
     }
 
     @Test
-    public void bodyAddedByInterceptorIsIncluded() {
-        S3Presigner presigner = presignerBuilder().endpointOverride(URI.create("http://foo.com")).build();
-        PresignedGetObjectRequest presigned =
-            presigner.presignGetObject(r -> r.signatureDuration(Duration.ofMinutes(5))
-                                             .getObjectRequest(go -> go.bucket("foo34343434")
-                                                                       .key("bar")));
-
-        assertThat(presigned.url().toString()).startsWith("http://foo.com/foo34343434/bar?");
-        assertThat(presigned.isBrowserExecutable()).isTrue();
-        assertThat(presigned.signedHeaders().get("host")).containsExactly("foo.com");
-        assertThat(presigned.signedPayload()).isEmpty();
-    }
-
-    @Test
-    public void credentialsCanBeOverriddenAtTheRequestLevel() {
+    public void getObject_CredentialsCanBeOverriddenAtTheRequestLevel() {
         AwsCredentials clientCredentials = AwsBasicCredentials.create("a", "a");
         AwsCredentials requestCredentials = AwsBasicCredentials.create("b", "b");
 
@@ -157,7 +160,7 @@ public void credentialsCanBeOverriddenAtTheRequestLevel() {
     }
 
     @Test
-    public void additionalHeadersAndQueryStringsCanBeAdded() {
+    public void getObject_AdditionalHeadersAndQueryStringsCanBeAdded() {
         AwsRequestOverrideConfiguration override =
             AwsRequestOverrideConfiguration.builder()
                                            .putHeader("X-Amz-AdditionalHeader", "foo1")
@@ -178,7 +181,7 @@ public void additionalHeadersAndQueryStringsCanBeAdded() {
     }
 
     @Test
-    public void nonSigV4SignersRaisesException() {
+    public void getObject_NonSigV4SignersRaisesException() {
         AwsRequestOverrideConfiguration override =
             AwsRequestOverrideConfiguration.builder()
                                            .signer(new NoOpSigner())
@@ -193,7 +196,7 @@ public void nonSigV4SignersRaisesException() {
     }
 
     @Test
-    public void sigv4PresignerHonorsSignatureDuration() {
+    public void getObject_Sigv4PresignerHonorsSignatureDuration() {
         AwsRequestOverrideConfiguration override =
             AwsRequestOverrideConfiguration.builder()
                                            .signer(AwsS3V4Signer.create())
@@ -210,4 +213,116 @@ public void sigv4PresignerHonorsSignatureDuration() {
             assertThat(Integer.parseInt(expires)).isCloseTo(1234, Offset.offset(2));
         });
     }
+
+    @Test
+    public void putObject_IsNotUrlCompatible() {
+        PresignedPutObjectRequest presigned =
+            presigner.presignPutObject(r -> r.signatureDuration(Duration.ofMinutes(5))
+                                             .putObjectRequest(go -> go.bucket("foo34343434")
+                                                                       .key("bar")));
+        assertThat(presigned.isBrowserExecutable()).isFalse();
+        assertThat(presigned.signedHeaders().keySet()).containsExactlyInAnyOrder("host");
+        assertThat(presigned.signedPayload()).isEmpty();
+    }
+
+    @Test
+    public void putObject_EndpointOverrideIsIncludedInPresignedUrl() {
+        S3Presigner presigner = presignerBuilder().endpointOverride(URI.create("http://foo.com")).build();
+        PresignedPutObjectRequest presigned =
+            presigner.presignPutObject(r -> r.signatureDuration(Duration.ofMinutes(5))
+                                             .putObjectRequest(go -> go.bucket("foo34343434")
+                                                                       .key("bar")));
+
+        assertThat(presigned.url().toString()).startsWith("http://foo.com/foo34343434/bar?");
+        assertThat(presigned.isBrowserExecutable()).isFalse();
+        assertThat(presigned.signedHeaders().get("host")).containsExactly("foo.com");
+        assertThat(presigned.signedPayload()).isEmpty();
+    }
+
+    @Test
+    public void putObject_CredentialsCanBeOverriddenAtTheRequestLevel() {
+        AwsCredentials clientCredentials = AwsBasicCredentials.create("a", "a");
+        AwsCredentials requestCredentials = AwsBasicCredentials.create("b", "b");
+
+        S3Presigner presigner = presignerBuilder().credentialsProvider(() -> clientCredentials).build();
+
+
+        AwsRequestOverrideConfiguration overrideConfiguration =
+            AwsRequestOverrideConfiguration.builder()
+                                           .credentialsProvider(() -> requestCredentials)
+                                           .build();
+
+        PresignedPutObjectRequest presignedWithClientCredentials =
+            presigner.presignPutObject(r -> r.signatureDuration(Duration.ofMinutes(5))
+                                             .putObjectRequest(go -> go.bucket("foo34343434")
+                                                                       .key("bar")));
+
+        PresignedPutObjectRequest presignedWithRequestCredentials =
+            presigner.presignPutObject(r -> r.signatureDuration(Duration.ofMinutes(5))
+                                             .putObjectRequest(go -> go.bucket("foo34343434")
+                                                                       .key("bar")
+                                                                       .overrideConfiguration(overrideConfiguration)));
+
+        System.out.println(presignedWithClientCredentials.url());
+
+        assertThat(presignedWithClientCredentials.httpRequest().rawQueryParameters().get("X-Amz-Credential").get(0))
+            .startsWith("a");
+        assertThat(presignedWithRequestCredentials.httpRequest().rawQueryParameters().get("X-Amz-Credential").get(0))
+            .startsWith("b");
+    }
+
+    @Test
+    public void putObject_AdditionalHeadersAndQueryStringsCanBeAdded() {
+        AwsRequestOverrideConfiguration override =
+            AwsRequestOverrideConfiguration.builder()
+                                           .putHeader("X-Amz-AdditionalHeader", "foo1")
+                                           .putRawQueryParameter("additionalQueryParam", "foo2")
+                                           .build();
+
+        PresignedPutObjectRequest presigned =
+            presigner.presignPutObject(r -> r.signatureDuration(Duration.ofMinutes(5))
+                                             .putObjectRequest(go -> go.bucket("foo34343434")
+                                                                       .key("bar")
+                                                                       .overrideConfiguration(override)));
+
+        assertThat(presigned.isBrowserExecutable()).isFalse();
+        assertThat(presigned.signedHeaders()).containsOnlyKeys("host", "x-amz-additionalheader");
+        assertThat(presigned.signedHeaders().get("x-amz-additionalheader")).containsExactly("foo1");
+        assertThat(presigned.httpRequest().headers()).containsKeys("x-amz-additionalheader");
+        assertThat(presigned.httpRequest().rawQueryParameters().get("additionalQueryParam").get(0)).isEqualTo("foo2");
+    }
+
+    @Test
+    public void putObject_NonSigV4SignersRaisesException() {
+        AwsRequestOverrideConfiguration override =
+            AwsRequestOverrideConfiguration.builder()
+                                           .signer(new NoOpSigner())
+                                           .build();
+
+        assertThatThrownBy(() -> presigner.presignPutObject(r -> r.signatureDuration(Duration.ofMinutes(5))
+                                                                  .putObjectRequest(go -> go.bucket("foo34343434")
+                                                                                            .key("bar")
+                                                                                            .overrideConfiguration(override))))
+            .isInstanceOf(IllegalStateException.class)
+            .hasMessageContaining("NoOpSigner");
+    }
+
+    @Test
+    public void putObject_Sigv4PresignerHonorsSignatureDuration() {
+        AwsRequestOverrideConfiguration override =
+            AwsRequestOverrideConfiguration.builder()
+                                           .signer(AwsS3V4Signer.create())
+                                           .build();
+
+        PresignedPutObjectRequest presigned =
+            presigner.presignPutObject(r -> r.signatureDuration(Duration.ofSeconds(1234))
+                                             .putObjectRequest(gor -> gor.bucket("a")
+                                                                         .key("b")
+                                                                         .overrideConfiguration(override)));
+
+        assertThat(presigned.httpRequest().rawQueryParameters().get("X-Amz-Expires").get(0)).satisfies(expires -> {
+            assertThat(expires).containsOnlyDigits();
+            assertThat(Integer.parseInt(expires)).isCloseTo(1234, Offset.offset(2));
+        });
+    }
 }
\ No newline at end of file
diff --git a/services/s3/src/test/java/software/amazon/awssdk/services/s3/S3UtilitiesTest.java b/services/s3/src/test/java/software/amazon/awssdk/services/s3/S3UtilitiesTest.java
index 93a90bcf708c..ea14ea6eaa3a 100644
--- a/services/s3/src/test/java/software/amazon/awssdk/services/s3/S3UtilitiesTest.java
+++ b/services/s3/src/test/java/software/amazon/awssdk/services/s3/S3UtilitiesTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -9,7 +9,7 @@
  *
  * 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 governings3
+ * express or implied. See the License for the specific language governing
  * permissions and limitations under the License.
  */
 
diff --git a/services/s3/src/test/java/software/amazon/awssdk/services/s3/bucketaddressingsep/VirtualHostAddressingSepTest.java b/services/s3/src/test/java/software/amazon/awssdk/services/s3/bucketaddressingsep/VirtualHostAddressingSepTest.java
index 446427931f34..3451b53968d2 100644
--- a/services/s3/src/test/java/software/amazon/awssdk/services/s3/bucketaddressingsep/VirtualHostAddressingSepTest.java
+++ b/services/s3/src/test/java/software/amazon/awssdk/services/s3/bucketaddressingsep/VirtualHostAddressingSepTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/s3/src/test/java/software/amazon/awssdk/services/s3/checksums/ChecksumCalculatingInputStreamTest.java b/services/s3/src/test/java/software/amazon/awssdk/services/s3/checksums/ChecksumCalculatingInputStreamTest.java
index f29d81c6e957..33b075be7142 100644
--- a/services/s3/src/test/java/software/amazon/awssdk/services/s3/checksums/ChecksumCalculatingInputStreamTest.java
+++ b/services/s3/src/test/java/software/amazon/awssdk/services/s3/checksums/ChecksumCalculatingInputStreamTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/s3/src/test/java/software/amazon/awssdk/services/s3/checksums/ChecksumResetsOnRetryTest.java b/services/s3/src/test/java/software/amazon/awssdk/services/s3/checksums/ChecksumResetsOnRetryTest.java
new file mode 100644
index 000000000000..38c4ccd040b9
--- /dev/null
+++ b/services/s3/src/test/java/software/amazon/awssdk/services/s3/checksums/ChecksumResetsOnRetryTest.java
@@ -0,0 +1,144 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.services.s3.checksums;
+
+import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
+import static com.github.tomakehurst.wiremock.client.WireMock.any;
+import static com.github.tomakehurst.wiremock.client.WireMock.anyUrl;
+import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
+import static org.assertj.core.api.Assertions.assertThat;
+import static software.amazon.awssdk.core.async.AsyncResponseTransformer.toBytes;
+
+import com.github.tomakehurst.wiremock.client.ResponseDefinitionBuilder;
+import com.github.tomakehurst.wiremock.client.WireMock;
+import com.github.tomakehurst.wiremock.junit.WireMockRule;
+import com.github.tomakehurst.wiremock.stubbing.Scenario;
+import java.net.URI;
+import java.nio.charset.StandardCharsets;
+import java.util.function.Consumer;
+import org.apache.commons.lang3.ArrayUtils;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
+import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
+import software.amazon.awssdk.core.ResponseBytes;
+import software.amazon.awssdk.core.async.AsyncRequestBody;
+import software.amazon.awssdk.core.sync.RequestBody;
+import software.amazon.awssdk.regions.Region;
+import software.amazon.awssdk.services.s3.S3AsyncClient;
+import software.amazon.awssdk.services.s3.S3Client;
+import software.amazon.awssdk.services.s3.model.GetObjectResponse;
+import software.amazon.awssdk.services.s3.model.PutObjectResponse;
+import software.amazon.awssdk.utils.BinaryUtils;
+
+/**
+ * Verifies that the checksum validators are reset on an HTTP retry.
+ */
+public class ChecksumResetsOnRetryTest {
+    @Rule
+    public WireMockRule mockServer = new WireMockRule(0);
+
+    private S3Client s3Client;
+
+    private S3AsyncClient s3AsyncClient;
+
+    private byte[] body;
+
+    private byte[] bodyWithTrailingChecksum;
+
+    private String bodyEtag;
+
+    @Before
+    public void setup() {
+        StaticCredentialsProvider credentials = StaticCredentialsProvider.create(AwsBasicCredentials.create("akid", "skid"));
+        s3Client = S3Client.builder()
+                           .credentialsProvider(credentials)
+                           .region(Region.US_WEST_2)
+                           .endpointOverride(URI.create("http://localhost:" + mockServer.port()))
+                           .build();
+
+        s3AsyncClient = S3AsyncClient.builder()
+                                     .credentialsProvider(credentials)
+                                     .region(Region.US_WEST_2)
+                                     .endpointOverride(URI.create("http://localhost:" + mockServer.port()))
+                                     .build();
+
+        body = "foo".getBytes(StandardCharsets.UTF_8);
+        String checksumAsHexString = "acbd18db4cc2f85cedef654fccc4a4d8";
+        bodyEtag = "\"" + checksumAsHexString + "\"";
+        bodyWithTrailingChecksum = ArrayUtils.addAll(body, BinaryUtils.fromHex(checksumAsHexString));
+    }
+
+    @Test
+    public void syncPutObject_resetsChecksumOnRetry() {
+        stubSuccessAfterOneRetry(r -> r.withHeader("ETag", bodyEtag));
+
+        PutObjectResponse response = s3Client.putObject(r -> r.bucket("foo").key("bar"), RequestBody.fromBytes(body));
+        assertThat(response.eTag()).isEqualTo(bodyEtag);
+    }
+
+    @Test
+    public void asyncPutObject_resetsChecksumOnRetry() {
+        stubSuccessAfterOneRetry(r -> r.withHeader("ETag", bodyEtag));
+
+        PutObjectResponse response = s3AsyncClient.putObject(r -> r.bucket("foo").key("bar"), AsyncRequestBody.fromBytes(body)).join();
+        assertThat(response.eTag()).isEqualTo(bodyEtag);
+    }
+
+    @Test
+    public void syncGetObject_resetsChecksumOnRetry() {
+        stubSuccessAfterOneRetry(r -> r.withHeader("ETag", bodyEtag)
+                                       .withHeader("x-amz-transfer-encoding", "append-md5")
+                                       .withHeader("content-length", Integer.toString(bodyWithTrailingChecksum.length))
+                                       .withBody(bodyWithTrailingChecksum));
+
+        ResponseBytes<GetObjectResponse> response = s3Client.getObjectAsBytes(r -> r.bucket("foo").key("bar"));
+        assertThat(response.response().eTag()).isEqualTo(bodyEtag);
+        assertThat(response.asByteArray()).isEqualTo(body);
+    }
+
+    @Test
+    public void asyncGetObject_resetsChecksumOnRetry() {
+        stubSuccessAfterOneRetry(r -> r.withHeader("ETag", bodyEtag)
+                                       .withHeader("x-amz-transfer-encoding", "append-md5")
+                                       .withHeader("content-length", Integer.toString(bodyWithTrailingChecksum.length))
+                                       .withBody(bodyWithTrailingChecksum));
+
+        ResponseBytes<GetObjectResponse> response = s3AsyncClient.getObject(r -> r.bucket("foo").key("bar"), toBytes()).join();
+        assertThat(response.response().eTag()).isEqualTo(bodyEtag);
+        assertThat(response.asByteArray()).isEqualTo(body);
+    }
+
+    private void stubSuccessAfterOneRetry(Consumer<ResponseDefinitionBuilder> successfulResponseModifier) {
+        WireMock.reset();
+
+        String scenario = "stubSuccessAfterOneRetry";
+        stubFor(any(anyUrl())
+                    .willReturn(aResponse().withStatus(500).withBody("<xml></xml>"))
+                    .inScenario(scenario)
+                    .whenScenarioStateIs(Scenario.STARTED)
+                    .willSetStateTo("200"));
+
+        ResponseDefinitionBuilder successfulResponse = aResponse().withStatus(200).withBody("<xml></xml>");
+        successfulResponseModifier.accept(successfulResponse);
+        stubFor(any(anyUrl())
+                    .willReturn(successfulResponse)
+                    .inScenario(scenario)
+                    .whenScenarioStateIs("200"));
+    }
+}
+
diff --git a/services/s3/src/test/java/software/amazon/awssdk/services/s3/checksums/ChecksumValidatingPublisherTest.java b/services/s3/src/test/java/software/amazon/awssdk/services/s3/checksums/ChecksumValidatingPublisherTest.java
index a89b547044b5..935b656d8539 100644
--- a/services/s3/src/test/java/software/amazon/awssdk/services/s3/checksums/ChecksumValidatingPublisherTest.java
+++ b/services/s3/src/test/java/software/amazon/awssdk/services/s3/checksums/ChecksumValidatingPublisherTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/s3/src/test/java/software/amazon/awssdk/services/s3/checksums/ChecksumsEnabledValidatorTest.java b/services/s3/src/test/java/software/amazon/awssdk/services/s3/checksums/ChecksumsEnabledValidatorTest.java
index ee951a62a367..b2e26e837ffa 100644
--- a/services/s3/src/test/java/software/amazon/awssdk/services/s3/checksums/ChecksumsEnabledValidatorTest.java
+++ b/services/s3/src/test/java/software/amazon/awssdk/services/s3/checksums/ChecksumsEnabledValidatorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -25,13 +25,17 @@
 import static software.amazon.awssdk.services.s3.checksums.ChecksumConstant.SERVER_SIDE_ENCRYPTION_HEADER;
 import static software.amazon.awssdk.services.s3.checksums.ChecksumsEnabledValidator.getObjectChecksumEnabledPerRequest;
 import static software.amazon.awssdk.services.s3.checksums.ChecksumsEnabledValidator.getObjectChecksumEnabledPerResponse;
-import static software.amazon.awssdk.services.s3.checksums.ChecksumsEnabledValidator.putObjectChecksumEnabled;
+import static software.amazon.awssdk.services.s3.checksums.ChecksumsEnabledValidator.responseChecksumIsValid;
+import static software.amazon.awssdk.services.s3.checksums.ChecksumsEnabledValidator.shouldRecordChecksum;
 import static software.amazon.awssdk.services.s3.model.ServerSideEncryption.AWS_KMS;
 
 import org.junit.Test;
 import software.amazon.awssdk.core.ClientType;
 import software.amazon.awssdk.core.interceptor.ExecutionAttributes;
+import software.amazon.awssdk.http.SdkHttpFullRequest;
 import software.amazon.awssdk.http.SdkHttpFullResponse;
+import software.amazon.awssdk.http.SdkHttpMethod;
+import software.amazon.awssdk.http.SdkHttpRequest;
 import software.amazon.awssdk.http.SdkHttpResponse;
 import software.amazon.awssdk.services.s3.S3Configuration;
 import software.amazon.awssdk.services.s3.model.GetObjectAclRequest;
@@ -77,65 +81,86 @@ public void getObjectChecksumEnabledPerResponse_responseNotContainsChecksumHeade
     }
 
     @Test
-    public void putObjectChecksumEnabled_defaultTrue() {
-        assertThat(putObjectChecksumEnabled(PutObjectRequest.builder().build(),
-                                            ClientType.SYNC,
-                                            getSyncExecutionAttributes(),
-                                            SdkHttpFullResponse.builder().build())).isTrue();
+    public void putObjectChecksumEnabled_defaultShouldRecord() {
+        assertThat(shouldRecordChecksum(PutObjectRequest.builder().build(),
+                                        ClientType.SYNC,
+                                        getSyncExecutionAttributes(),
+                                        emptyHttpRequest().build())).isTrue();
     }
 
     @Test
     public void putObjectChecksumEnabled_nonPutObjectRequest_false() {
-        assertThat(putObjectChecksumEnabled(PutBucketAclRequest.builder().build(),
-                                            ClientType.SYNC,
-                                            getSyncExecutionAttributes(),
-                                            SdkHttpFullResponse.builder().build())).isFalse();
+        assertThat(shouldRecordChecksum(PutBucketAclRequest.builder().build(),
+                                        ClientType.SYNC,
+                                        getSyncExecutionAttributes(),
+                                        emptyHttpRequest().build())).isFalse();
     }
 
     @Test
     public void putObjectChecksumEnabled_disabledFromConfig_false() {
         ExecutionAttributes executionAttributes = getExecutionAttributesWithChecksumDisabled();
 
-        assertThat(putObjectChecksumEnabled(PutObjectRequest.builder().build(),
-                                            ClientType.SYNC,
-                                            executionAttributes,
-                                            SdkHttpFullResponse.builder().build())).isFalse();
+        assertThat(shouldRecordChecksum(PutObjectRequest.builder().build(),
+                                        ClientType.SYNC,
+                                        executionAttributes,
+                                        emptyHttpRequest().build())).isFalse();
     }
 
     @Test
     public void putObjectChecksumEnabled_wrongClientType_false() {
         ExecutionAttributes executionAttributes = getSyncExecutionAttributes();
 
-        assertThat(putObjectChecksumEnabled(PutObjectRequest.builder().build(),
-                                            ClientType.ASYNC,
-                                            executionAttributes,
-                                            SdkHttpFullResponse.builder().build())).isFalse();
+        assertThat(shouldRecordChecksum(PutObjectRequest.builder().build(),
+                                        ClientType.ASYNC,
+                                        executionAttributes,
+                                        emptyHttpRequest().build())).isFalse();
     }
 
     @Test
     public void putObjectChecksumEnabled_serverSideCustomerEncryption_false() {
         ExecutionAttributes executionAttributes = getSyncExecutionAttributes();
-        SdkHttpFullResponse response = SdkHttpFullResponse.builder()
-                                                          .putHeader(SERVER_SIDE_CUSTOMER_ENCRYPTION_HEADER, "test")
-                                                          .build();
+        SdkHttpRequest response = emptyHttpRequest().putHeader(SERVER_SIDE_CUSTOMER_ENCRYPTION_HEADER, "test")
+                                                    .build();
 
-        assertThat(putObjectChecksumEnabled(PutObjectRequest.builder().build(),
-                                            ClientType.SYNC,
-                                            executionAttributes,
-                                            response)).isFalse();
+        assertThat(shouldRecordChecksum(PutObjectRequest.builder().build(),
+                                        ClientType.SYNC,
+                                        executionAttributes,
+                                        response)).isFalse();
     }
 
     @Test
     public void putObjectChecksumEnabled_serverSideEncryption_false() {
         ExecutionAttributes executionAttributes = getSyncExecutionAttributes();
-        SdkHttpFullResponse response = SdkHttpFullResponse.builder()
-                                                          .putHeader(SERVER_SIDE_ENCRYPTION_HEADER, AWS_KMS.toString())
-                                                          .build();
+        SdkHttpRequest response = emptyHttpRequest().putHeader(SERVER_SIDE_ENCRYPTION_HEADER, AWS_KMS.toString())
+                                                    .build();
 
-        assertThat(putObjectChecksumEnabled(PutObjectRequest.builder().build(),
-                                            ClientType.SYNC,
-                                            executionAttributes,
-                                            response)).isFalse();
+        assertThat(shouldRecordChecksum(PutObjectRequest.builder().build(),
+                                        ClientType.SYNC,
+                                        executionAttributes,
+                                        response)).isFalse();
+    }
+
+    @Test
+    public void responseChecksumIsValid_defaultTrue() {
+        assertThat(responseChecksumIsValid(SdkHttpResponse.builder().build())).isTrue();
+    }
+
+    @Test
+    public void responseChecksumIsValid_serverSideCustomerEncryption_false() {
+        SdkHttpResponse response = SdkHttpResponse.builder()
+                                                  .putHeader(SERVER_SIDE_CUSTOMER_ENCRYPTION_HEADER, "test")
+                                                  .build();
+
+        assertThat(responseChecksumIsValid(response)).isFalse();
+    }
+
+    @Test
+    public void responseChecksumIsValid_serverSideEncryption_false() {
+        SdkHttpResponse response = SdkHttpResponse.builder()
+                                                  .putHeader(SERVER_SIDE_ENCRYPTION_HEADER, AWS_KMS.toString())
+                                                  .build();
+
+        assertThat(responseChecksumIsValid(response)).isFalse();
     }
 
     private ExecutionAttributes getSyncExecutionAttributes() {
@@ -157,4 +182,12 @@ private SdkHttpResponse getSdkHttpResponseWithChecksumHeader() {
                               .build();
     }
 
+    private SdkHttpRequest.Builder emptyHttpRequest() {
+        return SdkHttpFullRequest.builder()
+                                 .method(SdkHttpMethod.GET)
+                                 .protocol("https")
+                                 .host("localhost")
+                                 .port(80);
+    }
+
 }
diff --git a/services/s3/src/test/java/software/amazon/awssdk/services/s3/functionaltests/CompleteMultipartUploadFunctionalTest.java b/services/s3/src/test/java/software/amazon/awssdk/services/s3/functionaltests/CompleteMultipartUploadFunctionalTest.java
new file mode 100644
index 000000000000..c9488c9ca634
--- /dev/null
+++ b/services/s3/src/test/java/software/amazon/awssdk/services/s3/functionaltests/CompleteMultipartUploadFunctionalTest.java
@@ -0,0 +1,305 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.services.s3.functionaltests;
+
+import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
+import static com.github.tomakehurst.wiremock.client.WireMock.any;
+import static com.github.tomakehurst.wiremock.client.WireMock.anyUrl;
+import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+import java.net.URI;
+import java.util.concurrent.CompletionException;
+
+import com.github.tomakehurst.wiremock.junit.WireMockRule;
+
+import org.junit.Rule;
+import org.junit.Test;
+
+import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
+import software.amazon.awssdk.auth.credentials.AwsCredentials;
+import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
+import software.amazon.awssdk.regions.Region;
+import software.amazon.awssdk.services.s3.S3AsyncClient;
+import software.amazon.awssdk.services.s3.S3AsyncClientBuilder;
+import software.amazon.awssdk.services.s3.S3Client;
+import software.amazon.awssdk.services.s3.S3ClientBuilder;
+import software.amazon.awssdk.services.s3.model.CompleteMultipartUploadResponse;
+import software.amazon.awssdk.services.s3.model.S3Exception;
+
+public class CompleteMultipartUploadFunctionalTest {
+    private static final URI HTTP_LOCALHOST_URI = URI.create("http://localhost:8080/");
+
+    @Rule
+    public WireMockRule wireMock = new WireMockRule();
+
+    private S3ClientBuilder getSyncClientBuilder() {
+
+        return S3Client.builder()
+                       .region(Region.US_EAST_1)
+                       .endpointOverride(HTTP_LOCALHOST_URI)
+                       .credentialsProvider(
+                           StaticCredentialsProvider.create(AwsBasicCredentials.create("key", "secret")));
+    }
+
+    private S3AsyncClientBuilder getAsyncClientBuilder() {
+        return S3AsyncClient.builder()
+                            .region(Region.US_EAST_1)
+                            .endpointOverride(HTTP_LOCALHOST_URI)
+                            .credentialsProvider(
+                                StaticCredentialsProvider.create(AwsBasicCredentials.create("key", "secret")));
+
+    }
+
+    @Test
+    public void completeMultipartUpload_syncClient_completeResponse() {
+        String location = "http://Example-Bucket.s3.amazonaws.com/Example-Object";
+        String bucket = "Example-Bucket";
+        String key = "Example-Object";
+        String eTag = "\"3858f62230ac3c915f300c664312c11f-9\"";
+        String xmlResponseBody = String.format(
+            "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+            + "<CompleteMultipartUploadResult xmlns=\"http://s3.amazonaws.com/doc/2006-03-01/\">\n"
+            + "<Location>%s</Location>\n"
+            + "<Bucket>%s</Bucket>\n"
+            + "<Key>%s</Key>\n"
+            + "<ETag>%s</ETag>\n"
+            + "</CompleteMultipartUploadResult>", location, bucket, key, eTag);
+
+        stubFor(any(anyUrl()).willReturn(aResponse().withStatus(200).withBody(xmlResponseBody)));
+
+        S3Client s3Client = getSyncClientBuilder().build();
+
+        CompleteMultipartUploadResponse response = s3Client.completeMultipartUpload(
+            r -> r.bucket(bucket).key(key).uploadId("upload-id"));
+
+        assertThat(response.location()).isEqualTo(location);
+        assertThat(response.bucket()).isEqualTo(bucket);
+        assertThat(response.key()).isEqualTo(key);
+        assertThat(response.eTag()).isEqualTo(eTag);
+    }
+
+    @Test
+    public void completeMultipartUpload_asyncClient_completeResponse() {
+        String location = "http://Example-Bucket.s3.amazonaws.com/Example-Object";
+        String bucket = "Example-Bucket";
+        String key = "Example-Object";
+        String eTag = "\"3858f62230ac3c915f300c664312c11f-9\"";
+        String xmlResponseBody = String.format(
+            "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+            + "<CompleteMultipartUploadResult xmlns=\"http://s3.amazonaws.com/doc/2006-03-01/\">\n"
+            + "<Location>%s</Location>\n"
+            + "<Bucket>%s</Bucket>\n"
+            + "<Key>%s</Key>\n"
+            + "<ETag>%s</ETag>\n"
+            + "</CompleteMultipartUploadResult>", location, bucket, key, eTag);
+
+        stubFor(any(anyUrl()).willReturn(aResponse().withStatus(200).withBody(xmlResponseBody)));
+
+        S3AsyncClient s3Client = getAsyncClientBuilder().build();
+
+        CompleteMultipartUploadResponse response = s3Client.completeMultipartUpload(
+            r -> r.bucket(bucket).key(key).uploadId("upload-id")).join();
+
+        assertThat(response.location()).isEqualTo(location);
+        assertThat(response.bucket()).isEqualTo(bucket);
+        assertThat(response.key()).isEqualTo(key);
+        assertThat(response.eTag()).isEqualTo(eTag);
+    }
+
+    @Test
+    public void completeMultipartUpload_syncClient_errorInResponseBody_correctType() {
+        String bucket = "Example-Bucket";
+        String key = "Example-Object";
+        String xmlResponseBody = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+                                 + "<Error>\n"
+                                 + "<Code>InternalError</Code>\n"
+                                 + "<Message>We encountered an internal error. Please try again.</Message>\n"
+                                 + "<RequestId>656c76696e6727732072657175657374</RequestId>\n"
+                                 + "<HostId>Uuag1LuByRx9e6j5Onimru9pO4ZVKnJ2Qz7/C1NPcfTWAtRPfTaOFg==</HostId>\n"
+                                 + "</Error>";
+
+        stubFor(any(anyUrl()).willReturn(aResponse().withStatus(200).withBody(xmlResponseBody)));
+
+        S3Client s3Client = getSyncClientBuilder().build();
+
+        assertThatThrownBy(() -> s3Client.completeMultipartUpload(r -> r.bucket(bucket)
+                                                                        .key(key)
+                                                                        .uploadId("upload-id")))
+            .isInstanceOf(S3Exception.class);
+    }
+
+    @Test
+    public void completeMultipartUpload_asyncClient_errorInResponseBody_correctType() {
+        String bucket = "Example-Bucket";
+        String key = "Example-Object";
+        String xmlResponseBody = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+                                 + "<Error>\n"
+                                 + "<Code>InternalError</Code>\n"
+                                 + "<Message>We encountered an internal error. Please try again.</Message>\n"
+                                 + "<RequestId>656c76696e6727732072657175657374</RequestId>\n"
+                                 + "<HostId>Uuag1LuByRx9e6j5Onimru9pO4ZVKnJ2Qz7/C1NPcfTWAtRPfTaOFg==</HostId>\n"
+                                 + "</Error>";
+
+        stubFor(any(anyUrl()).willReturn(aResponse().withStatus(200).withBody(xmlResponseBody)));
+
+        S3AsyncClient s3Client = getAsyncClientBuilder().build();
+
+        assertThatThrownBy(() -> s3Client.completeMultipartUpload(r -> r.bucket(bucket)
+                                                                        .key(key)
+                                                                        .uploadId("upload-id"))
+                                         .join())
+            .isInstanceOf(CompletionException.class)
+            .hasCauseInstanceOf(S3Exception.class);
+    }
+
+    @Test
+    public void completeMultipartUpload_syncClient_errorInResponseBody_correctCode() {
+        String bucket = "Example-Bucket";
+        String key = "Example-Object";
+        String xmlResponseBody = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+                                 + "<Error>\n"
+                                 + "<Code>CustomError</Code>\n"
+                                 + "<Message>We encountered an internal error. Please try again.</Message>\n"
+                                 + "<RequestId>656c76696e6727732072657175657374</RequestId>\n"
+                                 + "<HostId>Uuag1LuByRx9e6j5Onimru9pO4ZVKnJ2Qz7/C1NPcfTWAtRPfTaOFg==</HostId>\n"
+                                 + "</Error>";
+
+        stubFor(any(anyUrl()).willReturn(aResponse().withStatus(200).withBody(xmlResponseBody)));
+
+        S3Client s3Client = getSyncClientBuilder().build();
+
+        assertThatThrownBy(() -> s3Client.completeMultipartUpload(r -> r.bucket(bucket)
+                                                                        .key(key)
+                                                                        .uploadId("upload-id")))
+            .satisfies(e -> assertThat(((S3Exception)e).awsErrorDetails().errorCode()).isEqualTo("CustomError"));
+    }
+
+    @Test
+    public void completeMultipartUpload_asyncClient_errorInResponseBody_correctCode() {
+        String bucket = "Example-Bucket";
+        String key = "Example-Object";
+        String xmlResponseBody = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+                                 + "<Error>\n"
+                                 + "<Code>CustomError</Code>\n"
+                                 + "<Message>We encountered an internal error. Please try again.</Message>\n"
+                                 + "<RequestId>656c76696e6727732072657175657374</RequestId>\n"
+                                 + "<HostId>Uuag1LuByRx9e6j5Onimru9pO4ZVKnJ2Qz7/C1NPcfTWAtRPfTaOFg==</HostId>\n"
+                                 + "</Error>";
+
+        stubFor(any(anyUrl()).willReturn(aResponse().withStatus(200).withBody(xmlResponseBody)));
+
+        S3AsyncClient s3Client = getAsyncClientBuilder().build();
+
+        assertThatThrownBy(() -> s3Client.completeMultipartUpload(r -> r.bucket(bucket)
+                                                                        .key(key)
+                                                                        .uploadId("upload-id"))
+                                         .join())
+            .satisfies(e -> {
+                S3Exception s3Exception = (S3Exception) e.getCause();
+                assertThat(s3Exception.awsErrorDetails().errorCode()).isEqualTo("CustomError");
+            });
+    }
+
+    @Test
+    public void completeMultipartUpload_syncClient_errorInResponseBody_correctMessage() {
+        String bucket = "Example-Bucket";
+        String key = "Example-Object";
+        String xmlResponseBody = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+                                 + "<Error>\n"
+                                 + "<Code>CustomError</Code>\n"
+                                 + "<Message>Foo bar</Message>\n"
+                                 + "<RequestId>656c76696e6727732072657175657374</RequestId>\n"
+                                 + "<HostId>Uuag1LuByRx9e6j5Onimru9pO4ZVKnJ2Qz7/C1NPcfTWAtRPfTaOFg==</HostId>\n"
+                                 + "</Error>";
+
+        stubFor(any(anyUrl()).willReturn(aResponse().withStatus(200).withBody(xmlResponseBody)));
+
+        S3Client s3Client = getSyncClientBuilder().build();
+
+        assertThatThrownBy(() -> s3Client.completeMultipartUpload(r -> r.bucket(bucket)
+                                                                        .key(key)
+                                                                        .uploadId("upload-id")))
+            .satisfies(e -> assertThat(((S3Exception)e).awsErrorDetails().errorMessage()).isEqualTo("Foo bar"));
+    }
+
+    @Test
+    public void completeMultipartUpload_asyncClient_errorInResponseBody_correctMessage() {
+        String bucket = "Example-Bucket";
+        String key = "Example-Object";
+        String xmlResponseBody = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+                                 + "<Error>\n"
+                                 + "<Code>CustomError</Code>\n"
+                                 + "<Message>Foo bar</Message>\n"
+                                 + "<RequestId>656c76696e6727732072657175657374</RequestId>\n"
+                                 + "<HostId>Uuag1LuByRx9e6j5Onimru9pO4ZVKnJ2Qz7/C1NPcfTWAtRPfTaOFg==</HostId>\n"
+                                 + "</Error>";
+
+        stubFor(any(anyUrl()).willReturn(aResponse().withStatus(200).withBody(xmlResponseBody)));
+
+        S3AsyncClient s3Client = getAsyncClientBuilder().build();
+
+        assertThatThrownBy(() -> s3Client.completeMultipartUpload(r -> r.bucket(bucket)
+                                                                        .key(key)
+                                                                        .uploadId("upload-id"))
+                          .join())
+            .satisfies(e -> {
+                S3Exception s3Exception = (S3Exception) e.getCause();
+                assertThat(s3Exception.awsErrorDetails().errorMessage()).isEqualTo("Foo bar");
+            });
+    }
+
+    @Test
+    public void completeMultipartUpload_syncClient_errorInResponseBody_invalidErrorXml() {
+        String bucket = "Example-Bucket";
+        String key = "Example-Object";
+        String xmlResponseBody = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+                                 + "<Error>\n"
+                                 + "<SomethingWeird></SomethingWeird>"
+                                 + "</Error>";
+
+        stubFor(any(anyUrl()).willReturn(aResponse().withStatus(200).withBody(xmlResponseBody)));
+
+        S3Client s3Client = getSyncClientBuilder().build();
+
+        assertThatThrownBy(() -> s3Client.completeMultipartUpload(r -> r.bucket(bucket)
+                                                                        .key(key)
+                                                                        .uploadId("upload-id")))
+            .isInstanceOf(S3Exception.class);
+    }
+
+    @Test
+    public void completeMultipartUpload_asyncClient_errorInResponseBody_invalidErrorXml() {
+        String bucket = "Example-Bucket";
+        String key = "Example-Object";
+        String xmlResponseBody = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+                                 + "<Error>\n"
+                                 + "<SomethingWeird></SomethingWeird>"
+                                 + "</Error>";
+
+        stubFor(any(anyUrl()).willReturn(aResponse().withStatus(200).withBody(xmlResponseBody)));
+
+        S3AsyncClient s3Client = getAsyncClientBuilder().build();
+
+        assertThatThrownBy(() -> s3Client.completeMultipartUpload(r -> r.bucket(bucket)
+                                                                        .key(key)
+                                                                        .uploadId("upload-id"))
+                          .join())
+            .isInstanceOf(CompletionException.class)
+            .hasCauseInstanceOf(S3Exception.class);
+    }
+}
diff --git a/services/s3/src/test/java/software/amazon/awssdk/services/s3/functionaltests/GetBucketPolicyFunctionalTest.java b/services/s3/src/test/java/software/amazon/awssdk/services/s3/functionaltests/GetBucketPolicyFunctionalTest.java
new file mode 100644
index 000000000000..6933e8726648
--- /dev/null
+++ b/services/s3/src/test/java/software/amazon/awssdk/services/s3/functionaltests/GetBucketPolicyFunctionalTest.java
@@ -0,0 +1,93 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.services.s3.functionaltests;
+
+import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
+import static com.github.tomakehurst.wiremock.client.WireMock.any;
+import static com.github.tomakehurst.wiremock.client.WireMock.anyUrl;
+import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+import java.net.URI;
+import java.util.concurrent.CompletionException;
+
+import com.github.tomakehurst.wiremock.junit.WireMockRule;
+
+import org.junit.Rule;
+import org.junit.Test;
+
+import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
+import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
+import software.amazon.awssdk.regions.Region;
+import software.amazon.awssdk.services.s3.S3AsyncClient;
+import software.amazon.awssdk.services.s3.S3AsyncClientBuilder;
+import software.amazon.awssdk.services.s3.S3Client;
+import software.amazon.awssdk.services.s3.S3ClientBuilder;
+import software.amazon.awssdk.services.s3.model.CompleteMultipartUploadResponse;
+import software.amazon.awssdk.services.s3.model.GetBucketPolicyResponse;
+import software.amazon.awssdk.services.s3.model.S3Exception;
+
+public class GetBucketPolicyFunctionalTest {
+    private static final URI HTTP_LOCALHOST_URI = URI.create("http://localhost:8080/");
+    private static final String EXAMPLE_BUCKET = "Example-Bucket";
+    private static final String EXAMPLE_POLICY =
+        "{\"Version\":\"2012-10-17\",\"Id\":\"Policy1234\","
+        + "\"Statement\":[{\"Sid\":\"Stmt1578431058575\",\"Effect\":\"Allow\","
+        + "\"Principal\":{\"AWS\":\"arn:aws:iam::1234567890:root\"},\"Action\":\"s3:*\","
+        + "\"Resource\":\"arn:aws:s3:::dummy-resource/*\"}]}";
+
+    @Rule
+    public WireMockRule wireMock = new WireMockRule();
+
+    private S3ClientBuilder getSyncClientBuilder() {
+
+        return S3Client.builder()
+                       .region(Region.US_EAST_1)
+                       .endpointOverride(HTTP_LOCALHOST_URI)
+                       .credentialsProvider(
+                           StaticCredentialsProvider.create(AwsBasicCredentials.create("key", "secret")));
+    }
+
+    private S3AsyncClientBuilder getAsyncClientBuilder() {
+        return S3AsyncClient.builder()
+                            .region(Region.US_EAST_1)
+                            .endpointOverride(HTTP_LOCALHOST_URI)
+                            .credentialsProvider(
+                                StaticCredentialsProvider.create(AwsBasicCredentials.create("key", "secret")));
+
+    }
+
+    @Test
+    public void getBucketPolicy_syncClient() {
+        stubFor(any(anyUrl()).willReturn(aResponse().withStatus(200).withBody(EXAMPLE_POLICY)));
+
+        S3Client s3Client = getSyncClientBuilder().build();
+
+        GetBucketPolicyResponse response = s3Client.getBucketPolicy(r -> r.bucket(EXAMPLE_BUCKET));
+        assertThat(response.policy()).isEqualTo(EXAMPLE_POLICY);
+    }
+
+    @Test
+    public void getBucketPolicy_asyncClient() {
+        stubFor(any(anyUrl()).willReturn(aResponse().withStatus(200).withBody(EXAMPLE_POLICY)));
+
+        S3AsyncClient s3Client = getAsyncClientBuilder().build();
+
+        GetBucketPolicyResponse response = s3Client.getBucketPolicy(r -> r.bucket(EXAMPLE_BUCKET)).join();
+        assertThat(response.policy()).isEqualTo(EXAMPLE_POLICY);
+    }
+}
diff --git a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/handlers/AsyncChecksumValidationInterceptorTest.java b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/handlers/AsyncChecksumValidationInterceptorTest.java
index 97cc088242f2..b8376597ca9f 100644
--- a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/handlers/AsyncChecksumValidationInterceptorTest.java
+++ b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/handlers/AsyncChecksumValidationInterceptorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -39,6 +39,7 @@
 import software.amazon.awssdk.core.checksums.SdkChecksum;
 import software.amazon.awssdk.core.interceptor.Context;
 import software.amazon.awssdk.core.interceptor.ExecutionAttributes;
+import software.amazon.awssdk.core.interceptor.InterceptorContext;
 import software.amazon.awssdk.http.SdkHttpFullRequest;
 import software.amazon.awssdk.http.SdkHttpMethod;
 import software.amazon.awssdk.http.SdkHttpRequest;
@@ -169,10 +170,18 @@ public void afterUnmarshalling_putObjectRequest_shouldValidateChecksum_throwExce
                                                           .build();
 
         Context.AfterUnmarshalling afterUnmarshallingContext =
-            InterceptorTestUtils.afterUnmarshallingContext(putObjectRequest, sdkHttpRequest, response, sdkHttpResponse);
+            InterceptorContext.builder()
+                              .request(putObjectRequest)
+                              .httpRequest(sdkHttpRequest)
+                              .response(response)
+                              .httpResponse(sdkHttpResponse)
+                              .asyncRequestBody(AsyncRequestBody.fromString("Test"))
+                              .build();
 
-        assertThatThrownBy(() -> interceptor.afterUnmarshalling(afterUnmarshallingContext, getExecutionAttributesWithChecksum()))
-                .hasMessage("Data read has a different checksum than expected.");
+        ExecutionAttributes attributes = getExecutionAttributesWithChecksum();
+        interceptor.modifyAsyncHttpContent(afterUnmarshallingContext, attributes);
+        assertThatThrownBy(() -> interceptor.afterUnmarshalling(afterUnmarshallingContext, attributes))
+            .hasMessageContaining("Data read has a different checksum than expected.");
     }
 
     @Test
diff --git a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/handlers/CreateBucketInterceptorTest.java b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/handlers/CreateBucketInterceptorTest.java
index 99583344a225..cf9f5014e351 100644
--- a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/handlers/CreateBucketInterceptorTest.java
+++ b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/handlers/CreateBucketInterceptorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/handlers/CreateMultipartUploadRequestInterceptorTest.java b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/handlers/CreateMultipartUploadRequestInterceptorTest.java
index 13c034534fa4..586e62fa11e9 100644
--- a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/handlers/CreateMultipartUploadRequestInterceptorTest.java
+++ b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/handlers/CreateMultipartUploadRequestInterceptorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/handlers/DecodeUrlEncodedResponseInterceptorTest.java b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/handlers/DecodeUrlEncodedResponseInterceptorTest.java
index 8686ba0978d3..7f5a32dcae17 100644
--- a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/handlers/DecodeUrlEncodedResponseInterceptorTest.java
+++ b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/handlers/DecodeUrlEncodedResponseInterceptorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -31,12 +31,17 @@
 import software.amazon.awssdk.core.interceptor.Context;
 import software.amazon.awssdk.core.interceptor.ExecutionAttributes;
 import software.amazon.awssdk.core.sync.RequestBody;
-import software.amazon.awssdk.http.SdkHttpFullRequest;
 import software.amazon.awssdk.http.SdkHttpFullResponse;
 import software.amazon.awssdk.http.SdkHttpRequest;
+import software.amazon.awssdk.services.s3.model.CommonPrefix;
 import software.amazon.awssdk.services.s3.model.EncodingType;
+import software.amazon.awssdk.services.s3.model.HeadObjectResponse;
+import software.amazon.awssdk.services.s3.model.ListMultipartUploadsResponse;
+import software.amazon.awssdk.services.s3.model.ListObjectVersionsResponse;
 import software.amazon.awssdk.services.s3.model.ListObjectsResponse;
 import software.amazon.awssdk.services.s3.model.ListObjectsV2Response;
+import software.amazon.awssdk.services.s3.model.MultipartUpload;
+import software.amazon.awssdk.services.s3.model.ObjectVersion;
 import software.amazon.awssdk.services.s3.model.S3Object;
 
 /**
@@ -50,6 +55,13 @@
  */
 public class DecodeUrlEncodedResponseInterceptorTest {
     private static final String TEST_URL_ENCODED = "foo+%3D+bar+baz+%CE%B1+%CE%B2+%F0%9F%98%8A";
+    private static final String TEST_URL_ENCODED_DELIMITER = "foo+%3D+bar+baz+%CE%B1+%CE%B2+%F0%9F%98%8A+delimiter";
+    private static final String TEST_URL_ENCODED_NEXT_MARKER = "foo+%3D+bar+baz+%CE%B1+%CE%B2+%F0%9F%98%8A+nextmarker";
+
+    private static final String TEST_URL_ENCODED_MARKER = "foo+%3D+bar+baz+%CE%B1+%CE%B2+%F0%9F%98%8A+marker";
+    private static final String TEST_URL_ENCODED_PREFIX = "foo+%3D+bar+baz+%CE%B1+%CE%B2+%F0%9F%98%8A+prefix";
+    private static final String TEST_URL_ENCODED_KEY = "foo+%3D+bar+baz+%CE%B1+%CE%B2+%F0%9F%98%8A+key";
+    private static final String TEST_URL_ENCODED_START_AFTER = "foo+%3D+bar+baz+%CE%B1+%CE%B2+%F0%9F%98%8A+startafter";
 
     // foo = bar baz α β 😊
     private static final String TEST_URL_DECODED = "foo = bar baz α β \uD83D\uDE0A";
@@ -62,22 +74,53 @@ public class DecodeUrlEncodedResponseInterceptorTest {
             S3Object.builder().key(TEST_URL_ENCODED).build()
     );
 
+    private static final List<CommonPrefix> COMMON_PREFIXES = Arrays.asList(CommonPrefix.builder()
+                                                                                       .prefix(TEST_URL_ENCODED_PREFIX)
+                                                                                       .build());
     private static final ListObjectsResponse V1_TEST_ENCODED_RESPONSE = ListObjectsResponse.builder()
-            .encodingType(EncodingType.URL)
-            .delimiter(TEST_URL_ENCODED)
-            .nextMarker(TEST_URL_ENCODED)
-            .prefix(TEST_URL_ENCODED)
-            .marker(TEST_URL_ENCODED)
-            .contents(TEST_CONTENTS)
-            .build();
+                                                                                           .encodingType(EncodingType.URL)
+                                                                                           .delimiter(TEST_URL_ENCODED_DELIMITER)
+                                                                                           .nextMarker(TEST_URL_ENCODED_NEXT_MARKER)
+                                                                                           .prefix(TEST_URL_ENCODED_PREFIX)
+                                                                                           .marker(TEST_URL_ENCODED_MARKER)
+                                                                                           .contents(TEST_CONTENTS)
+                                                                                           .commonPrefixes(COMMON_PREFIXES)
+                                                                                           .build();
 
     private static final ListObjectsV2Response V2_TEST_ENCODED_RESPONSE = ListObjectsV2Response.builder()
-            .encodingType(EncodingType.URL)
-            .delimiter(TEST_URL_ENCODED)
-            .prefix(TEST_URL_ENCODED)
-            .startAfter(TEST_URL_ENCODED)
-            .contents(TEST_CONTENTS)
-            .build();
+                                                                                               .encodingType(EncodingType.URL)
+                                                                                               .delimiter(TEST_URL_ENCODED_DELIMITER)
+                                                                                               .prefix(TEST_URL_ENCODED_PREFIX)
+                                                                                               .startAfter(TEST_URL_ENCODED_START_AFTER)
+                                                                                               .contents(TEST_CONTENTS)
+                                                                                               .commonPrefixes(COMMON_PREFIXES)
+                                                                                               .build();
+
+    private static final String TEST_URL_ENCODED_NEXT_KEY_MARKER = TEST_URL_ENCODED + "+nextKeyMarker";
+    private static final String TEST_URL_ENCODED_KEY_MARKER = TEST_URL_ENCODED + "+keyMarker";
+    private static final ListObjectVersionsResponse TEST_LIST_OBJECT_VERSION_RESPONSE = ListObjectVersionsResponse.builder()
+                                                                                                                  .encodingType(EncodingType.URL)
+                                                                                                                  .delimiter(TEST_URL_ENCODED_DELIMITER)
+                                                                                                                  .prefix(TEST_URL_ENCODED_PREFIX)
+                                                                                                                  .keyMarker(TEST_URL_ENCODED_KEY_MARKER)
+                                                                                                                  .nextKeyMarker(TEST_URL_ENCODED_NEXT_KEY_MARKER)
+                                                                                                                  .commonPrefixes(COMMON_PREFIXES)
+                                                                                                                  .versions(ObjectVersion.builder()
+                                                                                                                                         .key(TEST_URL_ENCODED_KEY)
+                                                                                                                                         .build())
+                                                                                                                  .build();
+
+
+    private static final ListMultipartUploadsResponse TEST_LIST_MULTIPART_UPLOADS_RESPONSE =
+        ListMultipartUploadsResponse.builder()
+                                    .encodingType(EncodingType.URL)
+                                    .delimiter(TEST_URL_ENCODED_DELIMITER)
+                                    .prefix(TEST_URL_ENCODED_PREFIX)
+                                    .keyMarker(TEST_URL_ENCODED_KEY_MARKER)
+                                    .nextKeyMarker(TEST_URL_ENCODED_NEXT_KEY_MARKER)
+                                    .uploads(MultipartUpload.builder().key(TEST_URL_ENCODED_KEY).build())
+                                    .commonPrefixes(COMMON_PREFIXES)
+                                    .build();
 
     @Test
     public void encodingTypeSet_decodesListObjectsResponseParts() {
@@ -85,11 +128,12 @@ public void encodingTypeSet_decodesListObjectsResponseParts() {
 
         ListObjectsResponse decoded = (ListObjectsResponse) INTERCEPTOR.modifyResponse(ctx, new ExecutionAttributes());
 
-        assertDecoded(decoded::delimiter);
-        assertDecoded(decoded::nextMarker);
-        assertDecoded(decoded::prefix);
-        assertDecoded(decoded::marker);
+        assertDecoded(decoded::delimiter, " delimiter");
+        assertDecoded(decoded::nextMarker, " nextmarker");
+        assertDecoded(decoded::prefix, " prefix");
+        assertDecoded(decoded::marker, " marker");
         assertKeysAreDecoded(decoded.contents());
+        assertCommonPrefixesAreDecoded(decoded.commonPrefixes());
     }
 
     @Test
@@ -98,10 +142,40 @@ public void encodingTypeSet_decodesListObjectsV2ResponseParts() {
 
         ListObjectsV2Response decoded = (ListObjectsV2Response) INTERCEPTOR.modifyResponse(ctx, new ExecutionAttributes());
 
-        assertDecoded(decoded::delimiter);
-        assertDecoded(decoded::prefix);
-        assertDecoded(decoded::startAfter);
+        assertDecoded(decoded::delimiter, " delimiter");
+        assertDecoded(decoded::prefix, " prefix");
+        assertDecoded(decoded::startAfter, " startafter");
         assertKeysAreDecoded(decoded.contents());
+        assertCommonPrefixesAreDecoded(decoded.commonPrefixes());
+    }
+
+    @Test
+    public void encodingTypeSet_decodesListObjectVersionsResponse() {
+        Context.ModifyResponse ctx = newContext(TEST_LIST_OBJECT_VERSION_RESPONSE);
+
+        ListObjectVersionsResponse decoded = (ListObjectVersionsResponse) INTERCEPTOR.modifyResponse(ctx, new ExecutionAttributes());
+
+        assertDecoded(decoded::delimiter, " delimiter");
+        assertDecoded(decoded::prefix, " prefix");
+        assertDecoded(decoded::keyMarker, " keyMarker");
+        assertDecoded(decoded::nextKeyMarker, " nextKeyMarker");
+        assertCommonPrefixesAreDecoded(decoded.commonPrefixes());
+        assertVersionsAreDecoded(decoded.versions());
+    }
+
+    @Test
+    public void encodingTypeSet_decodesListMultipartUploadsResponse() {
+        Context.ModifyResponse ctx = newContext(TEST_LIST_MULTIPART_UPLOADS_RESPONSE);
+
+        ListMultipartUploadsResponse decoded = (ListMultipartUploadsResponse) INTERCEPTOR.modifyResponse(ctx, new ExecutionAttributes());
+
+        assertDecoded(decoded::delimiter, " delimiter");
+        assertDecoded(decoded::prefix, " prefix");
+        assertDecoded(decoded::keyMarker, " keyMarker");
+        assertDecoded(decoded::nextKeyMarker, " nextKeyMarker");
+        assertCommonPrefixesAreDecoded(decoded.commonPrefixes());
+        assertUploadsAreDecoded(decoded.uploads());
+        assertCommonPrefixesAreDecoded(decoded.commonPrefixes());
     }
 
     @Test
@@ -130,14 +204,39 @@ public void encodingTypeNotSet_doesNotDecodeListObjectsV2ResponseParts() {
         assertThat(fromInterceptor).isEqualTo(original);
     }
 
+    @Test
+    public void otherResponses_shouldNotModifyResponse() {
+        HeadObjectResponse original = HeadObjectResponse.builder().build();
+        Context.ModifyResponse ctx = newContext(original);
+        SdkResponse sdkResponse = INTERCEPTOR.modifyResponse(ctx, new ExecutionAttributes());
+        assertThat(original.hashCode()).isEqualTo(sdkResponse.hashCode());
+    }
+
     private void assertKeysAreDecoded(List<S3Object> objects) {
         objects.forEach(o -> assertDecoded(o::key));
     }
 
+    private void assertCommonPrefixesAreDecoded(List<CommonPrefix> commonPrefixes) {
+        commonPrefixes.forEach(c -> assertDecoded(c::prefix, " prefix"));
+    }
+
     private void assertDecoded(Supplier<String> supplier) {
-        assertThat(supplier.get()).isEqualTo(TEST_URL_DECODED);
+        assertDecoded(supplier, "");
+    }
+
+    private void assertDecoded(Supplier<String> supplier, String suffix) {
+        assertThat(supplier.get()).isEqualTo(TEST_URL_DECODED + suffix);
     }
 
+    private void assertVersionsAreDecoded(List<ObjectVersion> versions) {
+        versions.forEach(v -> assertDecoded(v::key, " key"));
+    }
+
+    private void assertUploadsAreDecoded(List<MultipartUpload> uploads) {
+        uploads.forEach(u -> assertDecoded(u::key, " key"));
+    }
+
+
     private static Context.ModifyResponse newContext(SdkResponse response) {
         return new Context.ModifyResponse() {
             @Override
diff --git a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/handlers/EnableChunkedEncodingInterceptorTest.java b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/handlers/EnableChunkedEncodingInterceptorTest.java
index f3230392287f..4f03921cbb69 100644
--- a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/handlers/EnableChunkedEncodingInterceptorTest.java
+++ b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/handlers/EnableChunkedEncodingInterceptorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/handlers/EnableTrailingChecksumInterceptorTest.java b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/handlers/EnableTrailingChecksumInterceptorTest.java
index c3ed27d0fe6f..400e20761b6f 100644
--- a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/handlers/EnableTrailingChecksumInterceptorTest.java
+++ b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/handlers/EnableTrailingChecksumInterceptorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/handlers/EndpointAddressInterceptorTest.java b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/handlers/EndpointAddressInterceptorTest.java
index a41382f9c0b1..73f63be12fe9 100644
--- a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/handlers/EndpointAddressInterceptorTest.java
+++ b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/handlers/EndpointAddressInterceptorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -16,12 +16,17 @@
 package software.amazon.awssdk.services.s3.internal.handlers;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static software.amazon.awssdk.auth.signer.AwsSignerExecutionAttribute.SIGNING_REGION;
 import static software.amazon.awssdk.awscore.AwsExecutionAttribute.AWS_REGION;
 import static software.amazon.awssdk.core.interceptor.SdkExecutionAttribute.SERVICE_CONFIG;
+import static software.amazon.awssdk.utils.http.SdkHttpUtils.urlEncode;
 
 import java.net.URI;
 import java.util.Optional;
 import org.junit.Test;
+
+import software.amazon.awssdk.auth.signer.AwsSignerExecutionAttribute;
 import software.amazon.awssdk.core.SdkRequest;
 import software.amazon.awssdk.core.async.AsyncRequestBody;
 import software.amazon.awssdk.core.interceptor.Context;
@@ -112,12 +117,263 @@ public void pathStyleAccessEnabled_shouldNotConvertToDnsEndpoint() {
                        S3Configuration.builder().pathStyleAccessEnabled(true));
     }
 
-    private void verifyVirtualStyleConvertDnsEndpoint(String protocol) {
-        URI customUri = URI.create(String.format("%s://s3-test.com", protocol));
-        String bucketName = "some-bucket";
-        URI expectedUri = URI.create(String.format("%s://%s.s3.dualstack.us-east-1.amazonaws.com", protocol, bucketName));
+    @Test
+    public void accesspointArn_shouldConvertEndpoint() {
+        verifyAccesspointArn("http",
+                             "arn:aws:s3:us-east-1:12345678910:accesspoint:foobar",
+                             "http://foobar-12345678910.s3-accesspoint.us-east-1.amazonaws.com",
+                             S3Configuration.builder());
+        verifyAccesspointArn("https",
+                             "arn:aws:s3:us-east-1:12345678910:accesspoint:foobar",
+                             "https://foobar-12345678910.s3-accesspoint.us-east-1.amazonaws.com",
+                             S3Configuration.builder());
+    }
+
+    @Test
+    public void accesspointArn_futureUnknownRegion_US_correctlyInfersPartition() {
+        verifyAccesspointArn("http",
+                             "arn:aws:s3:us-future-1:12345678910:accesspoint:foobar",
+                             "http://foobar-12345678910.s3-accesspoint.us-future-1.amazonaws.com",
+                             Region.of("us-future-1"),
+                             S3Configuration.builder(),
+                             Region.of("us-future-1"));
+    }
+
+    @Test
+    public void accesspointArn_futureUnknownRegion_crossRegion_correctlyInfersPartition() {
+        verifyAccesspointArn("http",
+                             "arn:aws:s3:us-future-2:12345678910:accesspoint:foobar",
+                             "http://foobar-12345678910.s3-accesspoint.us-future-2.amazonaws.com",
+                             Region.of("us-future-2"),
+                             S3Configuration.builder().useArnRegionEnabled(true),
+                             Region.of("us-future-1"));
+    }
+
+    @Test
+    public void accesspointArn_futureUnknownRegion_CN_correctlyInfersPartition() {
+        verifyAccesspointArn("http",
+                             "arn:aws-cn:s3:cn-future-1:12345678910:accesspoint:foobar",
+                             "http://foobar-12345678910.s3-accesspoint.cn-future-1.amazonaws.com.cn",
+                             Region.of("cn-future-1"),
+                             S3Configuration.builder(),
+                             Region.of("cn-future-1"));
+    }
+
+    @Test
+    public void accesspointArn_futureUnknownRegionAndPartition_defaultsToAws() {
+        verifyAccesspointArn("http",
+                             "arn:aws:s3:unknown:12345678910:accesspoint:foobar",
+                             "http://foobar-12345678910.s3-accesspoint.unknown.amazonaws.com",
+                             Region.of("unknown"),
+                             S3Configuration.builder(),
+                             Region.of("unknown"));
+    }
+
+    @Test
+    public void malformedArn_throwsIllegalArgumentException() {
+        assertThatThrownBy(() -> verifyAccesspointArn("http",
+                             "arn:foobar",
+                             null,
+                             S3Configuration.builder()))
+            .isInstanceOf(IllegalArgumentException.class)
+            .hasMessageContaining("ARN");
+    }
+
+    @Test
+    public void unsupportedArn_throwsIllegalArgumentException() {
+        assertThatThrownBy(() -> verifyAccesspointArn("http",
+                                                      "arn:aws:s3:us-east-1:12345678910:unsupported:foobar",
+                                                      null,
+                                                      S3Configuration.builder()))
+            .isInstanceOf(IllegalArgumentException.class)
+            .hasMessageContaining("ARN");
+    }
+
+    @Test
+    public void accesspointArn_invalidPartition_throwsIllegalArgumentException() {
+        assertThatThrownBy(() -> verifyAccesspointArn("http",
+                                                      "arn:bar:s3:us-east-1:12345678910:accesspoint:foobar",
+                                                      null,
+                                                      S3Configuration.builder()))
+            .isInstanceOf(IllegalArgumentException.class)
+            .hasMessageContaining("bar");
+    }
+
+    @Test
+    public void bucketArn_throwsIllegalArgumentException() {
+        assertThatThrownBy(() -> verifyAccesspointArn("http",
+                                                      "arn:aws:s3:us-east-1:12345678910:bucket_name:foobar",
+                                                      null,
+                                                      S3Configuration.builder()))
+            .isInstanceOf(IllegalArgumentException.class)
+            .hasMessageContaining("bucket parameter");
+    }
+
+
+    @Test
+    public void accesspointArn_withSlashes_shouldConvertEndpoint() {
+        verifyAccesspointArn("http",
+                             "arn:aws:s3:us-east-1:12345678910:accesspoint/foobar",
+                             "http://foobar-12345678910.s3-accesspoint.us-east-1.amazonaws.com",
+                             S3Configuration.builder());
+        verifyAccesspointArn("https",
+                             "arn:aws:s3:us-east-1:12345678910:accesspoint/foobar",
+                             "https://foobar-12345678910.s3-accesspoint.us-east-1.amazonaws.com",
+                             S3Configuration.builder());
+    }
+
+    @Test
+    public void accesspointArn_withDualStackEnabled_shouldConvertEndpoint() {
+        verifyAccesspointArn("http",
+                             "arn:aws:s3:us-east-1:12345678910:accesspoint/foobar",
+                             "http://foobar-12345678910.s3-accesspoint.dualstack.us-east-1.amazonaws.com",
+                             S3Configuration.builder().dualstackEnabled(true));
+        verifyAccesspointArn("https",
+                             "arn:aws:s3:us-east-1:12345678910:accesspoint/foobar",
+                             "https://foobar-12345678910.s3-accesspoint.dualstack.us-east-1.amazonaws.com",
+                             S3Configuration.builder().dualstackEnabled(true));
+    }
+
+    @Test
+    public void accesspointArn_withCnPartition_shouldConvertEndpoint() {
+        verifyAccesspointArn("http",
+                             "arn:aws-cn:s3:cn-north-1:12345678910:accesspoint:foobar",
+                             "http://foobar-12345678910.s3-accesspoint.cn-north-1.amazonaws.com.cn",
+                             Region.of("cn-north-1"),
+                             S3Configuration.builder(),
+                             Region.of("cn-north-1"));
+        verifyAccesspointArn("https",
+                             "arn:aws-cn:s3:cn-north-1:12345678910:accesspoint:foobar",
+                             "https://foobar-12345678910.s3-accesspoint.cn-north-1.amazonaws.com.cn",
+                             Region.of("cn-north-1"),
+                             S3Configuration.builder(),
+                             Region.of("cn-north-1"));
+    }
+
+    @Test
+    public void accesspointArn_withDifferentPartition_useArnRegionEnabled_shouldThrowIllegalArgumentException() {
+        assertThatThrownBy(() -> verifyAccesspointArn("http",
+                                                      "arn:aws-cn:s3:cn-north-1:12345678910:accesspoint:foobar",
+                                                      "http://foobar-12345678910.s3-accesspoint.cn-north-1.amazonaws.com.cn",
+                                                      Region.of("cn-north-1"),
+                                                      S3Configuration.builder().useArnRegionEnabled(true),
+                                                      Region.of("us-east-1")))
+            .isInstanceOf(IllegalArgumentException.class)
+            .hasMessageContaining("partition");
+    }
+
+    @Test
+    public void accesspointArn_withFipsRegionPrefix_useArnRegionEnabled_shouldThrowIllegalArgumentException() {
+        assertThatThrownBy(() -> verifyAccesspointArn("http",
+                             "arn:aws:s3:us-east-1:12345678910:accesspoint/foobar",
+                             "http://foobar-12345678910.s3-accesspoint.us-east-1.amazonaws.com",
+                             Region.of("us-east-1"),
+                             S3Configuration.builder().useArnRegionEnabled(true),
+                             Region.of("fips-us-east-1")))
+            .isInstanceOf(IllegalArgumentException.class)
+            .hasMessageContaining("FIPS");
+        assertThatThrownBy(() -> verifyAccesspointArn("https",
+                             "arn:aws:s3:us-east-1:12345678910:accesspoint/foobar",
+                             "https://foobar-12345678910.s3-accesspoint.us-east-1.amazonaws.com",
+                             Region.of("us-east-1"),
+                             S3Configuration.builder().useArnRegionEnabled(true),
+                             Region.of("fips-us-east-1")))
+            .isInstanceOf(IllegalArgumentException.class)
+            .hasMessageContaining("FIPS");
+    }
+
+    @Test
+    public void accesspointArn_withFipsRegionPrefix_shouldThrowIllegalArgumentException() {
+        assertThatThrownBy(() -> verifyAccesspointArn("http",
+                                                      "arn:aws:s3:us-east-1:12345678910:accesspoint/foobar",
+                                                      "http://foobar-12345678910.s3-accesspoint.us-east-1.amazonaws.com",
+                                                      Region.of("us-east-1"),
+                                                      S3Configuration.builder(),
+                                                      Region.of("fips-us-east-1")))
+            .isInstanceOf(IllegalArgumentException.class)
+            .hasMessageContaining("FIPS");
+        assertThatThrownBy(() -> verifyAccesspointArn("https",
+                                                      "arn:aws:s3:us-east-1:12345678910:accesspoint/foobar",
+                                                      "https://foobar-12345678910.s3-accesspoint.us-east-1.amazonaws.com",
+                                                      Region.of("us-east-1"),
+                                                      S3Configuration.builder(),
+                                                      Region.of("fips-us-east-1")))
+            .isInstanceOf(IllegalArgumentException.class)
+            .hasMessageContaining("FIPS");
+    }
+
+    @Test
+    public void accesspointArn_withFipsRegionSuffix_useArnRegionEnabled_shouldThrowIllegalArgumentException() {
+        assertThatThrownBy(() -> verifyAccesspointArn("http",
+                                                      "arn:aws:s3:us-east-1:12345678910:accesspoint/foobar",
+                                                      "http://foobar-12345678910.s3-accesspoint.us-east-1.amazonaws.com",
+                                                      Region.of("us-east-1"),
+                                                      S3Configuration.builder().useArnRegionEnabled(true),
+                                                      Region.of("us-east-1-fips")))
+            .isInstanceOf(IllegalArgumentException.class)
+            .hasMessageContaining("FIPS");
+        assertThatThrownBy(() -> verifyAccesspointArn("https",
+                                                      "arn:aws:s3:us-east-1:12345678910:accesspoint/foobar",
+                                                      "https://foobar-12345678910.s3-accesspoint.us-east-1.amazonaws.com",
+                                                      Region.of("us-east-1"),
+                                                      S3Configuration.builder().useArnRegionEnabled(true),
+                                                      Region.of("us-east-1-fips")))
+            .isInstanceOf(IllegalArgumentException.class)
+            .hasMessageContaining("FIPS");
+    }
+
+    @Test
+    public void accesspointArn_withFipsRegionSuffix_shouldThrowIllegalArgumentException() {
+        assertThatThrownBy(() -> verifyAccesspointArn("http",
+                                                      "arn:aws:s3:us-east-1:12345678910:accesspoint/foobar",
+                                                      "http://foobar-12345678910.s3-accesspoint.us-east-1.amazonaws.com",
+                                                      Region.of("us-east-1"),
+                                                      S3Configuration.builder(),
+                                                      Region.of("us-east-1-fips")))
+            .isInstanceOf(IllegalArgumentException.class)
+            .hasMessageContaining("FIPS");
+        assertThatThrownBy(() -> verifyAccesspointArn("https",
+                                                      "arn:aws:s3:us-east-1:12345678910:accesspoint/foobar",
+                                                      "https://foobar-12345678910.s3-accesspoint.us-east-1.amazonaws.com",
+                                                      Region.of("us-east-1"),
+                                                      S3Configuration.builder(),
+                                                      Region.of("us-east-1-fips")))
+            .isInstanceOf(IllegalArgumentException.class)
+            .hasMessageContaining("FIPS");
+    }
+
+    @Test
+    public void accesspointArn_withAccelerateEnabled_shouldThrowIllegalArgumentException() {
+        assertThatThrownBy(() -> verifyAccesspointArn("http",
+                                                      "arn:aws:s3:us-east-1:12345678910:accesspoint/foobar",
+                                                      "http://foobar-12345678910.s3-accesspoint.us-east-1.amazonaws.com",
+                                                      Region.of("us-east-1"),
+                                                      S3Configuration.builder().accelerateModeEnabled(true),
+                                                      Region.of("us-east-1")))
+            .isInstanceOf(IllegalArgumentException.class)
+            .hasMessageContaining("accelerate");
+    }
 
 
+    @Test
+    public void accesspointArn_withPathStyleAddressingEnabled_shouldThrowIllegalArgumentException() {
+        assertThatThrownBy(() -> verifyAccesspointArn("http",
+                                                      "arn:aws:s3:us-east-1:12345678910:accesspoint/foobar",
+                                                      "http://foobar-12345678910.s3-accesspoint.us-east-1.amazonaws.com",
+                                                      Region.of("us-east-1"),
+                                                      S3Configuration.builder().pathStyleAccessEnabled(true),
+                                                      Region.of("us-east-1")))
+            .isInstanceOf(IllegalArgumentException.class)
+            .hasMessageContaining("path style");
+    }
+
+    private void verifyVirtualStyleConvertDnsEndpoint(String protocol) {
+        String bucketName = "test-bucket";
+        String key = "test-key";
+        URI customUri = URI.create(String.format("%s://s3-test.com/%s/%s", protocol, bucketName, key));
+        URI expectedUri = URI.create(String.format("%s://%s.s3.dualstack.us-east-1.amazonaws.com/%s", protocol,
+                                                   bucketName, key));
+
         Context.ModifyHttpRequest ctx = context(ListObjectsV2Request.builder().bucket(bucketName).build(),
                                                 sdkHttpRequest(customUri));
         ExecutionAttributes executionAttributes = new ExecutionAttributes();
@@ -137,6 +393,7 @@ private SdkHttpRequest sdkHttpRequest(URI customUri) {
                                  .host(customUri.getHost())
                                  .port(customUri.getPort())
                                  .method(SdkHttpMethod.GET)
+                                 .encodedPath(customUri.getPath())
                                  .build();
     }
 
@@ -156,8 +413,10 @@ private void verifyAccelerateDisabledOperationsEndpointNotConverted(SdkRequest r
 
     private void verifyEndpoint(String protocol, String expectedEndpoint,
                                 S3Configuration.Builder builder) {
-        URI customUri = URI.create(String.format("%s://s3-test.com", protocol));
-        URI expectedUri = URI.create(expectedEndpoint);
+        String bucket = "test-bucket";
+        String key = "test-key";
+        URI customUri = URI.create(String.format("%s://s3-test.com/%s/%s", protocol, bucket, key));
+        URI expectedUri = URI.create(String.format("%s/%s/%s", expectedEndpoint, bucket, key));
         Context.ModifyHttpRequest ctx = context(PutObjectRequest.builder().build(), sdkHttpRequest(customUri));
         ExecutionAttributes executionAttributes = new ExecutionAttributes();
         S3Configuration s3Configuration = builder.build();
@@ -170,6 +429,38 @@ private void verifyEndpoint(String protocol, String expectedEndpoint,
         assertThat(sdkHttpFullRequest.getUri()).isEqualTo(expectedUri);
     }
 
+    private void verifyAccesspointArn(String protocol, String accessPointArn, String expectedEndpoint,
+                                      Region expectedSigningRegion,
+                                      S3Configuration.Builder builder, Region region) {
+        String key = "test-key";
+
+        URI customUri = URI.create(String.format("%s://s3-test.com/%s/%s", protocol, urlEncode(accessPointArn), key));
+        URI expectedUri = URI.create(String.format("%s/%s", expectedEndpoint, key));
+        PutObjectRequest putObjectRequest = PutObjectRequest.builder()
+                                                            .bucket(accessPointArn)
+                                                            .key(key)
+                                                            .build();
+        Context.ModifyHttpRequest ctx = context(putObjectRequest, sdkHttpRequest(customUri));
+        ExecutionAttributes executionAttributes = new ExecutionAttributes();
+        S3Configuration s3Configuration = builder.build();
+
+        executionAttributes.putAttribute(SERVICE_CONFIG, s3Configuration);
+        executionAttributes.putAttribute(AWS_REGION, region);
+        executionAttributes.putAttribute(SIGNING_REGION, region);
+
+        SdkHttpRequest sdkHttpFullRequest = interceptor.modifyHttpRequest(ctx, executionAttributes);
+
+        assertThat(executionAttributes.getAttribute(SIGNING_REGION))
+            .isEqualTo(expectedSigningRegion);
+        assertThat(sdkHttpFullRequest.getUri()).isEqualTo(expectedUri);
+    }
+
+
+    private void verifyAccesspointArn(String protocol, String accessPointArn, String expectedEndpoint,
+                                      S3Configuration.Builder builder) {
+        verifyAccesspointArn(protocol, accessPointArn, expectedEndpoint, Region.US_EAST_1, builder, Region.US_EAST_1);
+    }
+
     private Context.ModifyHttpRequest context(SdkRequest request, SdkHttpRequest sdkHttpRequest) {
         return new Context.ModifyHttpRequest() {
             @Override
diff --git a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/handlers/ExceptionTranslationInterceptorTest.java b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/handlers/ExceptionTranslationInterceptorTest.java
index 65dfad573661..b93b6b26851c 100644
--- a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/handlers/ExceptionTranslationInterceptorTest.java
+++ b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/handlers/ExceptionTranslationInterceptorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/handlers/GetBucketPolicyInterceptorTest.java b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/handlers/GetBucketPolicyInterceptorTest.java
index bc6d20800e77..95ee7178e58f 100644
--- a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/handlers/GetBucketPolicyInterceptorTest.java
+++ b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/handlers/GetBucketPolicyInterceptorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/handlers/PutObjectHeaderTest.java b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/handlers/PutObjectHeaderTest.java
index e03ff18547f8..0203649a477c 100644
--- a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/handlers/PutObjectHeaderTest.java
+++ b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/handlers/PutObjectHeaderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/handlers/PutObjectInterceptorTest.java b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/handlers/PutObjectInterceptorTest.java
index db120eb29bcc..13bc671086b1 100644
--- a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/handlers/PutObjectInterceptorTest.java
+++ b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/handlers/PutObjectInterceptorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/handlers/SyncChecksumValidationInterceptorTest.java b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/handlers/SyncChecksumValidationInterceptorTest.java
index 8a428d53e4af..90b779cdfd25 100644
--- a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/handlers/SyncChecksumValidationInterceptorTest.java
+++ b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/handlers/SyncChecksumValidationInterceptorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -17,17 +17,22 @@
 
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Java6Assertions.assertThatThrownBy;
 import static software.amazon.awssdk.core.ClientType.SYNC;
 import static software.amazon.awssdk.core.interceptor.SdkExecutionAttribute.CLIENT_TYPE;
 import static software.amazon.awssdk.core.interceptor.SdkExecutionAttribute.SERVICE_CONFIG;
 import static software.amazon.awssdk.services.s3.checksums.ChecksumConstant.CHECKSUM_ENABLED_RESPONSE_HEADER;
 import static software.amazon.awssdk.services.s3.checksums.ChecksumConstant.CONTENT_LENGTH_HEADER;
 import static software.amazon.awssdk.services.s3.checksums.ChecksumConstant.ENABLE_MD5_CHECKSUM_HEADER_VALUE;
+import static software.amazon.awssdk.services.s3.checksums.ChecksumConstant.SERVER_SIDE_ENCRYPTION_HEADER;
 import static software.amazon.awssdk.services.s3.checksums.ChecksumsEnabledValidator.CHECKSUM;
+import static software.amazon.awssdk.services.s3.model.ServerSideEncryption.AWS_KMS;
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.URI;
 import java.nio.ByteBuffer;
+import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
@@ -36,8 +41,12 @@
 import software.amazon.awssdk.core.checksums.SdkChecksum;
 import software.amazon.awssdk.core.interceptor.Context;
 import software.amazon.awssdk.core.interceptor.ExecutionAttributes;
+import software.amazon.awssdk.core.interceptor.InterceptorContext;
 import software.amazon.awssdk.core.sync.RequestBody;
 import software.amazon.awssdk.http.ContentStreamProvider;
+import software.amazon.awssdk.http.SdkHttpFullRequest;
+import software.amazon.awssdk.http.SdkHttpMethod;
+import software.amazon.awssdk.http.SdkHttpRequest;
 import software.amazon.awssdk.http.SdkHttpResponse;
 import software.amazon.awssdk.services.s3.S3Configuration;
 import software.amazon.awssdk.services.s3.checksums.ChecksumCalculatingInputStream;
@@ -45,12 +54,18 @@
 import software.amazon.awssdk.services.s3.internal.handlers.SyncChecksumValidationInterceptor.ChecksumCalculatingStreamProvider;
 import software.amazon.awssdk.services.s3.model.GetObjectRequest;
 import software.amazon.awssdk.services.s3.model.PutObjectRequest;
+import software.amazon.awssdk.services.s3.model.PutObjectResponse;
 import software.amazon.awssdk.services.s3.utils.InterceptorTestUtils;
 import software.amazon.awssdk.utils.IoUtils;
 import software.amazon.awssdk.utils.StringInputStream;
+import software.amazon.awssdk.utils.internal.Base16Lower;
 
 public class SyncChecksumValidationInterceptorTest {
 
+    private static final byte[] CONTENT_BYTES = "CONTENT".getBytes(Charset.forName("UTF-8"));
+    private static final String VALID_CHECKSUM = Base16Lower.encodeAsString(checkSumFor(CONTENT_BYTES).getChecksumBytes());
+    private static final String INVALID_CHECKSUM = "3902ee7e149eb8313a34757e89e21af6";
+
     private SyncChecksumValidationInterceptor interceptor = new SyncChecksumValidationInterceptor();
 
     @Test
@@ -149,6 +164,82 @@ public void checksumCalculatingStreamProvider_shouldReturnNewStreamResetChecksum
         newStream.close();
     }
 
+    @Test
+    public void afterUnmarshalling_putObjectRequest_shouldValidateChecksum() {
+        SdkHttpResponse sdkHttpResponse = getSdkHttpResponseWithChecksumHeader();
+
+        PutObjectResponse response = PutObjectResponse.builder()
+                                                      .eTag(VALID_CHECKSUM)
+                                                      .build();
+
+        PutObjectRequest putObjectRequest = PutObjectRequest.builder()
+                                                            .build();
+
+        SdkHttpRequest sdkHttpRequest = SdkHttpFullRequest.builder()
+                                                          .uri(URI.create("http://localhost:8080"))
+                                                          .method(SdkHttpMethod.PUT)
+                                                          .build();
+
+        Context.AfterUnmarshalling afterUnmarshallingContext =
+            InterceptorTestUtils.afterUnmarshallingContext(putObjectRequest, sdkHttpRequest, response, sdkHttpResponse);
+
+        interceptor.afterUnmarshalling(afterUnmarshallingContext, getExecutionAttributesWithChecksum());
+    }
+
+    @Test
+    public void afterUnmarshalling_putObjectRequest_shouldValidateChecksum_throwExceptionIfInvalid() {
+        SdkHttpResponse sdkHttpResponse = getSdkHttpResponseWithChecksumHeader();
+
+        PutObjectResponse response = PutObjectResponse.builder()
+                                                      .eTag(INVALID_CHECKSUM)
+                                                      .build();
+
+        PutObjectRequest putObjectRequest = PutObjectRequest.builder().build();
+
+        SdkHttpRequest sdkHttpRequest = SdkHttpFullRequest.builder()
+                                                          .uri(URI.create("http://localhost:8080"))
+                                                          .method(SdkHttpMethod.PUT)
+                                                          .contentStreamProvider(() -> new StringInputStream("Test"))
+                                                          .build();
+
+        Context.AfterUnmarshalling afterUnmarshallingContext =
+            InterceptorContext.builder()
+                              .request(putObjectRequest)
+                              .httpRequest(sdkHttpRequest)
+                              .response(response)
+                              .httpResponse(sdkHttpResponse)
+                              .requestBody(RequestBody.fromString("Test"))
+                              .build();
+
+        ExecutionAttributes attributes = getExecutionAttributesWithChecksum();
+        interceptor.modifyHttpContent(afterUnmarshallingContext, attributes);
+        assertThatThrownBy(() -> interceptor.afterUnmarshalling(afterUnmarshallingContext, attributes))
+            .hasMessageContaining("Data read has a different checksum than expected.");
+    }
+
+    @Test
+    public void afterUnmarshalling_putObjectRequest_with_SSE_shouldNotValidateChecksum() {
+        SdkHttpResponse sdkHttpResponse = getSdkHttpResponseWithChecksumHeader();
+
+        PutObjectResponse response = PutObjectResponse.builder()
+                                                      .eTag(INVALID_CHECKSUM)
+                                                      .build();
+
+        PutObjectRequest putObjectRequest = PutObjectRequest.builder().build();
+
+        SdkHttpRequest sdkHttpRequest = SdkHttpFullRequest.builder()
+                                                          .putHeader(SERVER_SIDE_ENCRYPTION_HEADER, AWS_KMS.toString())
+                                                          .putHeader("x-amz-server-side-encryption-aws-kms-key-id", ENABLE_MD5_CHECKSUM_HEADER_VALUE)
+                                                          .uri(URI.create("http://localhost:8080"))
+                                                          .method(SdkHttpMethod.PUT)
+                                                          .build();
+
+        Context.AfterUnmarshalling afterUnmarshallingContext =
+            InterceptorTestUtils.afterUnmarshallingContext(putObjectRequest, sdkHttpRequest, response, sdkHttpResponse);
+
+        interceptor.afterUnmarshalling(afterUnmarshallingContext, getExecutionAttributesWithChecksum());
+    }
+
     private static final class CloseAwareStream extends InputStream {
         private StringInputStream inputStream;
         private boolean isClosed;
@@ -192,4 +283,15 @@ private ExecutionAttributes getExecutionAttributesWithChecksumDisabled() {
         executionAttributes.putAttribute(SERVICE_CONFIG, S3Configuration.builder().checksumValidationEnabled(false).build());
         return executionAttributes;
     }
+
+    private ExecutionAttributes getExecutionAttributesWithChecksum() {
+        SdkChecksum checksum = checkSumFor(CONTENT_BYTES);
+        return getExecutionAttributes().putAttribute(CHECKSUM, checksum);
+    }
+
+    private static SdkChecksum checkSumFor(byte[] bytes) {
+        SdkChecksum checksum = new Md5Checksum();
+        checksum.update(bytes, 0, bytes.length);
+        return checksum;
+    }
 }
diff --git a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/resource/S3AccessPointBuilderTest.java b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/resource/S3AccessPointBuilderTest.java
new file mode 100644
index 000000000000..781faf7c89dc
--- /dev/null
+++ b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/resource/S3AccessPointBuilderTest.java
@@ -0,0 +1,173 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.services.s3.internal.resource;
+
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.*;
+
+import java.net.URI;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+
+public class S3AccessPointBuilderTest {
+    private static final String LONG_STRING_64 = "1234567890123456789012345678901234567890123456789012345678901234";
+
+    @Rule
+    public ExpectedException exception = ExpectedException.none();
+
+    @Test
+    public void toURI_noDualstack() {
+        URI result = S3AccessPointBuilder.create()
+                                         .accessPointName("access-point")
+                                         .accountId("account-id")
+                                         .region("region")
+                                         .protocol("protocol")
+                                         .domain("domain")
+                                         .toUri();
+
+        assertThat(result, is(URI.create("protocol://access-point-account-id.s3-accesspoint.region.domain")));
+    }
+
+    @Test
+    public void toURI_dualstack() {
+        URI result = S3AccessPointBuilder.create()
+                                         .accessPointName("access-point")
+                                         .accountId("account-id")
+                                         .region("region")
+                                         .protocol("protocol")
+                                         .domain("domain")
+                                         .dualstackEnabled(true)
+                                         .toUri();
+
+        assertThat(result,
+                   is(URI.create("protocol://access-point-account-id.s3-accesspoint.dualstack.region.domain")));
+    }
+
+    @Test
+    public void toURI_accessPointNameWithSlashes_throwsIllegalArgumentException() {
+        assertThatThrownBy(() -> S3AccessPointBuilder.create()
+                                         .accessPointName("access/point")
+                                         .accountId("account-id")
+                                         .region("region")
+                                         .protocol("protocol")
+                                         .domain("domain")
+                                         .toUri())
+            .isInstanceOf(IllegalArgumentException.class)
+            .hasMessageContaining("accessPointName")
+            .hasMessageContaining("alphanumeric");
+    }
+
+    @Test
+    public void toURI_accountIdWithSlashes_throwsIllegalArgumentException() {
+        assertThatThrownBy(() -> S3AccessPointBuilder.create()
+                                                     .accessPointName("accesspoint")
+                                                     .accountId("account/id")
+                                                     .region("region")
+                                                     .protocol("protocol")
+                                                     .domain("domain")
+                                                     .toUri())
+            .isInstanceOf(IllegalArgumentException.class)
+            .hasMessageContaining("accountId")
+            .hasMessageContaining("alphanumeric");
+    }
+
+    @Test
+    public void toURI_accessPointNameWithTooLongString_throwsIllegalArgumentException() {
+        assertThatThrownBy(() -> S3AccessPointBuilder.create()
+                                                     .accessPointName(LONG_STRING_64)
+                                                     .accountId("account-id")
+                                                     .region("region")
+                                                     .protocol("protocol")
+                                                     .domain("domain")
+                                                     .toUri())
+            .isInstanceOf(IllegalArgumentException.class)
+            .hasMessageContaining("accessPointName")
+            .hasMessageContaining("63");    // max length
+    }
+
+    @Test
+    public void toURI_accountIdWithTooLongString_throwsIllegalArgumentException() {
+        assertThatThrownBy(() -> S3AccessPointBuilder.create()
+                                                     .accessPointName("accesspoint")
+                                                     .accountId(LONG_STRING_64)
+                                                     .region("region")
+                                                     .protocol("protocol")
+                                                     .domain("domain")
+                                                     .toUri())
+            .isInstanceOf(IllegalArgumentException.class)
+            .hasMessageContaining("accountId")
+            .hasMessageContaining("63");    // max length
+    }
+
+    @Test
+    public void toURI_accessPointNameWithEmptyString_throwsIllegalArgumentException() {
+        assertThatThrownBy(() -> S3AccessPointBuilder.create()
+                                                     .accessPointName("")
+                                                     .accountId("account-id")
+                                                     .region("region")
+                                                     .protocol("protocol")
+                                                     .domain("domain")
+                                                     .toUri())
+            .isInstanceOf(IllegalArgumentException.class)
+            .hasMessageContaining("accessPointName")
+            .hasMessageContaining("missing");
+    }
+
+    @Test
+    public void toURI_accountIdWithEmptyString_throwsIllegalArgumentException() {
+        assertThatThrownBy(() -> S3AccessPointBuilder.create()
+                                                     .accessPointName("accesspoint")
+                                                     .accountId("")
+                                                     .region("region")
+                                                     .protocol("protocol")
+                                                     .domain("domain")
+                                                     .toUri())
+            .isInstanceOf(IllegalArgumentException.class)
+            .hasMessageContaining("accountId")
+            .hasMessageContaining("missing");
+    }
+
+    @Test
+    public void toURI_accessPointNameWithUrlEncodedCharacters_throwsIllegalArgumentException() {
+        assertThatThrownBy(() -> S3AccessPointBuilder.create()
+                                                     .accessPointName("access%2fpoint")
+                                                     .accountId("account-id")
+                                                     .region("region")
+                                                     .protocol("protocol")
+                                                     .domain("domain")
+                                                     .toUri())
+            .isInstanceOf(IllegalArgumentException.class)
+            .hasMessageContaining("accessPointName")
+            .hasMessageContaining("alphanumeric");
+    }
+
+    @Test
+    public void toURI_accountIdWithUrlEncodedCharacters_throwsIllegalArgumentException() {
+        assertThatThrownBy(() -> S3AccessPointBuilder.create()
+                                                     .accessPointName("accesspoint")
+                                                     .accountId("account%2fid")
+                                                     .region("region")
+                                                     .protocol("protocol")
+                                                     .domain("domain")
+                                                     .toUri())
+            .isInstanceOf(IllegalArgumentException.class)
+            .hasMessageContaining("accountId")
+            .hasMessageContaining("alphanumeric");
+    }
+}
\ No newline at end of file
diff --git a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/resource/S3AccessPointResourceTest.java b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/resource/S3AccessPointResourceTest.java
new file mode 100644
index 000000000000..adf5dd1b3b39
--- /dev/null
+++ b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/resource/S3AccessPointResourceTest.java
@@ -0,0 +1,205 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.services.s3.internal.resource;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+
+import java.util.Optional;
+
+import org.junit.Test;
+
+public class S3AccessPointResourceTest {
+    @Test
+    public void buildWithAllPropertiesSet() {
+        S3AccessPointResource s3AccessPointResource = S3AccessPointResource.builder()
+                                                                      .accessPointName("access_point-name")
+                                                                      .accountId("account-id")
+                                                                      .partition("partition")
+                                                                      .region("region")
+                                                                      .build();
+
+        assertEquals("access_point-name", s3AccessPointResource.accessPointName());
+        assertEquals(Optional.of("account-id"), s3AccessPointResource.accountId());
+        assertEquals(Optional.of("partition"), s3AccessPointResource.partition());
+        assertEquals(Optional.of("region"), s3AccessPointResource.region());
+        assertEquals("accesspoint", s3AccessPointResource.type());
+    }
+
+    @Test
+    public void toBuilder() {
+        S3AccessPointResource s3AccessPointResource = S3AccessPointResource.builder()
+                                                                      .accessPointName("access_point-name")
+                                                                      .accountId("account-id")
+                                                                      .partition("partition")
+                                                                      .region("region")
+                                                                      .build()
+                                                                      .toBuilder()
+                                                                      .build();
+
+        assertEquals("access_point-name", s3AccessPointResource.accessPointName());
+        assertEquals(Optional.of("account-id"), s3AccessPointResource.accountId());
+        assertEquals(Optional.of("partition"), s3AccessPointResource.partition());
+        assertEquals(Optional.of("region"), s3AccessPointResource.region());
+        assertEquals("accesspoint", s3AccessPointResource.type());
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void buildWithBlankRegion() {
+        S3AccessPointResource.builder()
+                             .accessPointName("access_point-name")
+                             .accountId("account-id")
+                             .partition("partition")
+                             .region("")
+                             .build();
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void buildWithBlankPartition() {
+        S3AccessPointResource.builder()
+                             .accessPointName("access_point-name")
+                             .accountId("account-id")
+                             .region("region")
+                             .partition("")
+                             .build();
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void buildWithBlankAccountId() {
+        S3AccessPointResource.builder()
+                             .accessPointName("access_point-name")
+                             .partition("partition")
+                             .region("region")
+                             .accountId("")
+                             .build();
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void buildWithBlankAccessPointName() {
+        S3AccessPointResource.builder()
+                             .accountId("account-id")
+                             .partition("partition")
+                             .region("region")
+                             .accessPointName("")
+                             .build();
+    }
+
+    @Test(expected = NullPointerException.class)
+    public void buildWithMissingRegion() {
+        S3AccessPointResource.builder()
+                             .accessPointName("access_point-name")
+                             .accountId("account-id")
+                             .partition("partition")
+                             .build();
+    }
+
+    @Test(expected = NullPointerException.class)
+    public void buildWithMissingPartition() {
+        S3AccessPointResource.builder()
+                             .accessPointName("access_point-name")
+                             .accountId("account-id")
+                             .region("region")
+                             .build();
+    }
+
+    @Test(expected = NullPointerException.class)
+    public void buildWithMissingAccountId() {
+        S3AccessPointResource.builder()
+                             .accessPointName("access_point-name")
+                             .partition("partition")
+                             .region("region")
+                             .build();
+    }
+
+    @Test(expected = NullPointerException.class)
+    public void buildWithMissingAccessPointName() {
+        S3AccessPointResource.builder()
+                             .accountId("account-id")
+                             .partition("partition")
+                             .region("region")
+                             .build();
+    }
+
+    @Test
+    public void buildWithSetters() {
+        S3AccessPointResource.Builder builder = S3AccessPointResource.builder();
+        builder.setAccessPointName("access_point-name");
+        builder.setAccountId("account-id");
+        builder.setPartition("partition");
+        builder.setRegion("region");
+        S3AccessPointResource s3AccessPointResource = builder.build();
+
+        assertEquals("access_point-name", s3AccessPointResource.accessPointName());
+        assertEquals(Optional.of("account-id"), s3AccessPointResource.accountId());
+        assertEquals(Optional.of("partition"), s3AccessPointResource.partition());
+        assertEquals(Optional.of("region"), s3AccessPointResource.region());
+        assertEquals("accesspoint", s3AccessPointResource.type());
+    }
+
+    @Test
+    public void equals_allProperties() {
+        S3AccessPointResource s3BucketResource1 = S3AccessPointResource.builder()
+                                                                       .accessPointName("access_point")
+                                                                       .accountId("account-id")
+                                                                       .partition("partition")
+                                                                       .region("region")
+                                                                       .build();
+
+        S3AccessPointResource s3BucketResource2 = S3AccessPointResource.builder()
+                                                                       .accessPointName("access_point")
+                                                                       .accountId("account-id")
+                                                                       .partition("partition")
+                                                                       .region("region")
+                                                                       .build();
+
+        S3AccessPointResource s3BucketResource3 = S3AccessPointResource.builder()
+                                                                       .accessPointName("access_point")
+                                                                       .accountId("account-id")
+                                                                       .partition("different-partition")
+                                                                       .region("region")
+                                                                       .build();
+
+        assertEquals(s3BucketResource1, s3BucketResource2);
+        assertNotEquals(s3BucketResource1, s3BucketResource3);
+    }
+
+    @Test
+    public void hashcode_allProperties() {
+        S3AccessPointResource s3BucketResource1 = S3AccessPointResource.builder()
+                                                                       .accessPointName("access_point")
+                                                                       .accountId("account-id")
+                                                                       .partition("partition")
+                                                                       .region("region")
+                                                                       .build();
+
+        S3AccessPointResource s3BucketResource2 = S3AccessPointResource.builder()
+                                                                       .accessPointName("access_point")
+                                                                       .accountId("account-id")
+                                                                       .partition("partition")
+                                                                       .region("region")
+                                                                       .build();
+
+        S3AccessPointResource s3BucketResource3 = S3AccessPointResource.builder()
+                                                                       .accessPointName("access_point")
+                                                                       .accountId("account-id")
+                                                                       .partition("different-partition")
+                                                                       .region("region")
+                                                                       .build();
+
+        assertEquals(s3BucketResource1.hashCode(), s3BucketResource2.hashCode());
+        assertNotEquals(s3BucketResource1.hashCode(), s3BucketResource3.hashCode());
+    }
+}
\ No newline at end of file
diff --git a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/resource/S3ArnConverterTest.java b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/resource/S3ArnConverterTest.java
new file mode 100644
index 000000000000..c8f72172e229
--- /dev/null
+++ b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/resource/S3ArnConverterTest.java
@@ -0,0 +1,261 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.services.s3.internal.resource;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.instanceOf;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.nullValue;
+
+import java.util.Optional;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+
+import software.amazon.awssdk.arns.Arn;
+
+public class S3ArnConverterTest {
+    private static final S3ArnConverter S3_ARN_PARSER = S3ArnConverter.create();
+
+    @Rule
+    public ExpectedException exception = ExpectedException.none();
+
+    @Test
+    public void parseArn_object_v2Arn() {
+        S3Resource resource = S3_ARN_PARSER.convertArn(Arn.builder()
+                                                          .partition("aws")
+                                                          .service("s3")
+                                                          .region("us-east-1")
+                                                          .accountId("123456789012")
+                                                          .resource("object:bucket/key")
+                                                          .build());
+
+        assertThat(resource, instanceOf(S3ObjectResource.class));
+
+        S3ObjectResource s3ObjectResource = (S3ObjectResource) resource;
+        assertThat(s3ObjectResource.bucketName(), is("bucket"));
+        assertThat(s3ObjectResource.key(), is("key"));
+        assertThat(s3ObjectResource.accountId(), is(Optional.of("123456789012")));
+        assertThat(s3ObjectResource.partition(), is(Optional.of("aws")));
+        assertThat(s3ObjectResource.region(), is(Optional.of("us-east-1")));
+        assertThat(s3ObjectResource.type(), is(S3ResourceType.OBJECT.toString()));
+    }
+
+    @Test
+    public void parseArn_object_v1Arn() {
+        S3Resource resource = S3_ARN_PARSER.convertArn(Arn.builder()
+                                                          .partition("aws")
+                                                          .service("s3")
+                                                          .resource("bucket/key")
+                                                          .build());
+
+        assertThat(resource, instanceOf(S3ObjectResource.class));
+
+        S3ObjectResource s3ObjectResource = (S3ObjectResource) resource;
+        assertThat(s3ObjectResource.bucketName(), is("bucket"));
+        assertThat(s3ObjectResource.key(), is("key"));
+        assertThat(s3ObjectResource.accountId(), is(Optional.empty()));
+        assertThat(s3ObjectResource.partition(), is(Optional.of("aws")));
+        assertThat(s3ObjectResource.region(), is(Optional.empty()));
+        assertThat(s3ObjectResource.type(), is(S3ResourceType.OBJECT.toString()));
+    }
+
+    @Test
+    public void parseArn_accessPoint() {
+        S3Resource resource = S3_ARN_PARSER.convertArn(Arn.builder()
+                                                          .partition("aws")
+                                                          .service("s3")
+                                                          .region("us-east-1")
+                                                          .accountId("123456789012")
+                                                          .resource("accesspoint:accesspoint-name")
+                                                          .build());
+
+        assertThat(resource, instanceOf(S3AccessPointResource.class));
+
+        S3AccessPointResource s3EndpointResource = (S3AccessPointResource) resource;
+        assertThat(s3EndpointResource.accessPointName(), is("accesspoint-name"));
+        assertThat(s3EndpointResource.accountId(), is(Optional.of("123456789012")));
+        assertThat(s3EndpointResource.partition(), is(Optional.of("aws")));
+        assertThat(s3EndpointResource.region(), is(Optional.of("us-east-1")));
+        assertThat(s3EndpointResource.type(), is(S3ResourceType.ACCESS_POINT.toString()));
+    }
+
+    @Test
+    public void parseArn_accessPoint_withQualifier() {
+        S3Resource resource = S3_ARN_PARSER.convertArn(Arn.builder()
+                                                          .partition("aws")
+                                                          .service("s3")
+                                                          .region("us-east-1")
+                                                          .accountId("123456789012")
+                                                          .resource("accesspoint:accesspoint-name:1214234234")
+                                                          .build());
+
+        assertThat(resource, instanceOf(S3AccessPointResource.class));
+
+        S3AccessPointResource s3EndpointResource = (S3AccessPointResource) resource;
+        assertThat(s3EndpointResource.accessPointName(), is("accesspoint-name"));
+        assertThat(s3EndpointResource.accountId(), is(Optional.of("123456789012")));
+        assertThat(s3EndpointResource.partition(), is(Optional.of("aws")));
+        assertThat(s3EndpointResource.region(), is(Optional.of("us-east-1")));
+        assertThat(s3EndpointResource.type(), is(S3ResourceType.ACCESS_POINT.toString()));
+    }
+
+    @Test
+    public void parseArn_v1Bucket() {
+        S3Resource resource = S3_ARN_PARSER.convertArn(Arn.builder()
+                                                          .partition("aws")
+                                                          .service("s3")
+                                                          .resource("bucket-name")
+                                                          .build());
+
+        assertThat(resource, instanceOf(S3BucketResource.class));
+
+        S3BucketResource s3BucketResource = (S3BucketResource) resource;
+        assertThat(s3BucketResource.bucketName(), is("bucket-name"));
+        assertThat(s3BucketResource.accountId(), is(Optional.empty()));
+        assertThat(s3BucketResource.partition(), is(Optional.of("aws")));
+        assertThat(s3BucketResource.region(), is(Optional.empty()));
+        assertThat(s3BucketResource.type(), is(S3ResourceType.BUCKET.toString()));
+    }
+
+    @Test
+    public void parseArn_v2Bucket() {
+        S3Resource resource = S3_ARN_PARSER.convertArn(Arn.builder()
+                                                          .partition("aws")
+                                                          .service("s3")
+                                                          .region("us-east-1")
+                                                          .accountId("123456789012")
+                                                          .resource("bucket_name:bucket-name")
+                                                          .build());
+
+        assertThat(resource, instanceOf(S3BucketResource.class));
+
+        S3BucketResource s3BucketResource = (S3BucketResource) resource;
+        assertThat(s3BucketResource.bucketName(), is("bucket-name"));
+        assertThat(s3BucketResource.accountId(), is(Optional.of("123456789012")));
+        assertThat(s3BucketResource.partition(), is(Optional.of("aws")));
+        assertThat(s3BucketResource.region(), is(Optional.of("us-east-1")));
+        assertThat(s3BucketResource.type(), is(S3ResourceType.BUCKET.toString()));
+    }
+
+    @Test
+    public void parseArn_unknownResource() {
+        exception.expect(IllegalArgumentException.class);
+        exception.expectMessage("ARN type");
+        S3_ARN_PARSER.convertArn(Arn.builder()
+                                    .partition("aws")
+                                    .service("s3")
+                                    .region("us-east-1")
+                                    .accountId("123456789012")
+                                    .resource("unknown:foobar")
+                                    .build());
+    }
+
+    @Test
+    public void parseArn_bucket_noName() {
+        exception.expect(IllegalArgumentException.class);
+        S3_ARN_PARSER.convertArn(Arn.builder()
+                                    .partition("aws")
+                                    .service("s3")
+                                    .region("us-east-1")
+                                    .accountId("123456789012")
+                                    .resource("bucket_name:")
+                                    .build());
+    }
+
+    @Test
+    public void parseArn_accesspoint_noName() {
+        exception.expect(IllegalArgumentException.class);
+        S3_ARN_PARSER.convertArn(Arn.builder()
+                                    .partition("aws")
+                                    .service("s3")
+                                    .region("us-east-1")
+                                    .accountId("123456789012")
+                                    .resource("access_point:")
+                                    .build());
+    }
+
+    @Test
+    public void parseArn_object_v2Arn_noKey() {
+        exception.expect(IllegalArgumentException.class);
+        S3_ARN_PARSER.convertArn(Arn.builder()
+                                    .partition("aws")
+                                    .service("s3")
+                                    .region("us-east-1")
+                                    .accountId("123456789012")
+                                    .resource("object:bucket")
+                                    .build());
+    }
+
+    @Test
+    public void parseArn_object_v2Arn_emptyBucket() {
+        exception.expect(IllegalArgumentException.class);
+        S3_ARN_PARSER.convertArn(Arn.builder()
+                                    .partition("aws")
+                                    .service("s3")
+                                    .region("us-east-1")
+                                    .accountId("123456789012")
+                                    .resource("object:/key")
+                                    .build());
+    }
+
+    @Test
+    public void parseArn_object_v2Arn_emptyKey() {
+        exception.expect(IllegalArgumentException.class);
+        S3_ARN_PARSER.convertArn(Arn.builder()
+                                    .partition("aws")
+                                    .service("s3")
+                                    .region("us-east-1")
+                                    .accountId("123456789012")
+                                    .resource("object:bucket/")
+                                    .build());
+    }
+
+    @Test
+    public void parseArn_object_v1Arn_emptyKey() {
+        exception.expect(IllegalArgumentException.class);
+        S3_ARN_PARSER.convertArn(Arn.builder()
+                                    .partition("aws")
+                                    .service("s3")
+                                    .resource("bucket/")
+                                    .build());
+    }
+
+    @Test
+    public void parseArn_object_v1Arn_emptyBucket() {
+        exception.expect(IllegalArgumentException.class);
+        S3_ARN_PARSER.convertArn(Arn.builder()
+                                    .partition("aws")
+                                    .service("s3")
+                                    .resource("/key")
+                                    .build());
+    }
+
+    @Test
+    public void parseArn_unknownType_throwsCorrectException() {
+        exception.expect(IllegalArgumentException.class);
+        exception.expectMessage("invalidType");
+
+        S3_ARN_PARSER.convertArn(Arn.builder()
+                                    .partition("aws")
+                                    .service("s3")
+                                    .region("us-east-1")
+                                    .accountId("123456789012")
+                                    .resource("invalidType:something")
+                                    .build());
+    }
+}
\ No newline at end of file
diff --git a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/resource/S3BucketResourceTest.java b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/resource/S3BucketResourceTest.java
new file mode 100644
index 000000000000..ed991c543d1e
--- /dev/null
+++ b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/resource/S3BucketResourceTest.java
@@ -0,0 +1,170 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.services.s3.internal.resource;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+
+import java.util.Optional;
+
+import org.junit.Test;
+
+public class S3BucketResourceTest {
+    @Test
+    public void buildWithAllPropertiesSet() {
+        S3BucketResource s3BucketResource = S3BucketResource.builder()
+                                                            .bucketName("bucket")
+                                                            .accountId("account-id")
+                                                            .partition("partition")
+                                                            .region("region")
+                                                            .build();
+
+        assertEquals("bucket", s3BucketResource.bucketName());
+        assertEquals(Optional.of("account-id"), s3BucketResource.accountId());
+        assertEquals(Optional.of("partition"), s3BucketResource.partition());
+        assertEquals(Optional.of("region"), s3BucketResource.region());
+        assertEquals("bucket_name", s3BucketResource.type());
+    }
+
+    @Test
+    public void toBuilder() {
+        S3BucketResource s3BucketResource = S3BucketResource.builder()
+                                                            .bucketName("bucket")
+                                                            .accountId("account-id")
+                                                            .partition("partition")
+                                                            .region("region")
+                                                            .build()
+                                                            .toBuilder()
+                                                            .build();
+
+        assertEquals("bucket", s3BucketResource.bucketName());
+        assertEquals(Optional.of("account-id"), s3BucketResource.accountId());
+        assertEquals(Optional.of("partition"), s3BucketResource.partition());
+        assertEquals(Optional.of("region"), s3BucketResource.region());
+        assertEquals("bucket_name", s3BucketResource.type());
+    }
+
+    @Test
+    public void buildWithSetters() {
+        S3BucketResource.Builder builder = S3BucketResource.builder();
+        builder.setBucketName("bucket");
+        builder.setAccountId("account-id");
+        builder.setPartition("partition");
+        builder.setRegion("region");
+        S3BucketResource s3BucketResource = builder.build();
+
+        assertEquals("bucket", s3BucketResource.bucketName());
+        assertEquals(Optional.of("account-id"), s3BucketResource.accountId());
+        assertEquals(Optional.of("partition"), s3BucketResource.partition());
+        assertEquals(Optional.of("region"), s3BucketResource.region());
+        assertEquals("bucket_name", s3BucketResource.type());
+    }
+
+    @Test
+    public void buildWithMinimalPropertiesSet() {
+        S3BucketResource s3BucketResource = S3BucketResource.builder()
+                                                            .bucketName("bucket")
+                                                            .build();
+
+        assertEquals("bucket", s3BucketResource.bucketName());
+        assertEquals(Optional.empty(), s3BucketResource.accountId());
+        assertEquals(Optional.empty(), s3BucketResource.partition());
+        assertEquals(Optional.empty(), s3BucketResource.region());
+        assertEquals("bucket_name", s3BucketResource.type());
+    }
+
+    @Test(expected = NullPointerException.class)
+    public void buildWithMissingBucketName() {
+        S3BucketResource.builder().build();
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void buildWithBlankBucketName() {
+        S3BucketResource.builder().bucketName("").build();
+    }
+
+    @Test
+    public void equals_allProperties() {
+        S3BucketResource s3BucketResource1 = S3BucketResource.builder()
+                                                            .bucketName("bucket")
+                                                            .accountId("account-id")
+                                                            .partition("partition")
+                                                            .region("region")
+                                                            .build();
+
+        S3BucketResource s3BucketResource2 = S3BucketResource.builder()
+                                                             .bucketName("bucket")
+                                                             .accountId("account-id")
+                                                             .partition("partition")
+                                                             .region("region")
+                                                             .build();
+
+        S3BucketResource s3BucketResource3 = S3BucketResource.builder()
+                                                             .bucketName("bucket")
+                                                             .accountId("account-id")
+                                                             .partition("different-partition")
+                                                             .region("region")
+                                                             .build();
+
+        assertEquals(s3BucketResource1, s3BucketResource2);
+        assertNotEquals(s3BucketResource1, s3BucketResource3);
+    }
+
+    @Test
+    public void equals_minimalProperties() {
+        S3BucketResource s3BucketResource1 = S3BucketResource.builder()
+                                                             .bucketName("bucket")
+                                                             .build();
+
+        S3BucketResource s3BucketResource2 = S3BucketResource.builder()
+                                                             .bucketName("bucket")
+                                                             .build();
+
+        S3BucketResource s3BucketResource3 = S3BucketResource.builder()
+                                                             .bucketName("another-bucket")
+                                                             .build();
+
+        assertEquals(s3BucketResource1, s3BucketResource2);
+        assertNotEquals(s3BucketResource1, s3BucketResource3);
+    }
+
+    @Test
+    public void hashcode_allProperties() {
+        S3BucketResource s3BucketResource1 = S3BucketResource.builder()
+                                                             .bucketName("bucket")
+                                                             .accountId("account-id")
+                                                             .partition("partition")
+                                                             .region("region")
+                                                             .build();
+
+        S3BucketResource s3BucketResource2 = S3BucketResource.builder()
+                                                             .bucketName("bucket")
+                                                             .accountId("account-id")
+                                                             .partition("partition")
+                                                             .region("region")
+                                                             .build();
+
+        S3BucketResource s3BucketResource3 = S3BucketResource.builder()
+                                                             .bucketName("bucket")
+                                                             .accountId("account-id")
+                                                             .partition("different-partition")
+                                                             .region("region")
+                                                             .build();
+
+        assertEquals(s3BucketResource1.hashCode(), s3BucketResource2.hashCode());
+        assertNotEquals(s3BucketResource1.hashCode(), s3BucketResource3.hashCode());
+    }
+}
\ No newline at end of file
diff --git a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/resource/S3ObjectResourceTest.java b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/resource/S3ObjectResourceTest.java
new file mode 100644
index 000000000000..f235c6d4639f
--- /dev/null
+++ b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/resource/S3ObjectResourceTest.java
@@ -0,0 +1,232 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.services.s3.internal.resource;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+
+import java.util.Optional;
+
+import org.junit.Test;
+
+public class S3ObjectResourceTest {
+    @Test
+    public void buildWithAllPropertiesSet() {
+        S3ObjectResource s3ObjectResource = S3ObjectResource.builder()
+                                                            .bucketName("bucket")
+                                                            .key("key")
+                                                            .accountId("account-id")
+                                                            .partition("partition")
+                                                            .region("region")
+                                                            .build();
+
+        assertEquals("bucket", s3ObjectResource.bucketName());
+        assertEquals("key", s3ObjectResource.key());
+        assertEquals(Optional.of("account-id"), s3ObjectResource.accountId());
+        assertEquals(Optional.of("partition"), s3ObjectResource.partition());
+        assertEquals(Optional.of("region"), s3ObjectResource.region());
+        assertEquals("object", s3ObjectResource.type());
+    }
+
+    @Test
+    public void toBuilder() {
+        S3ObjectResource s3ObjectResource = S3ObjectResource.builder()
+                                                            .bucketName("bucket")
+                                                            .key("key")
+                                                            .accountId("account-id")
+                                                            .partition("partition")
+                                                            .region("region")
+                                                            .build()
+                                                            .toBuilder()
+                                                            .build();
+
+        assertEquals("bucket", s3ObjectResource.bucketName());
+        assertEquals("key", s3ObjectResource.key());
+        assertEquals(Optional.of("account-id"), s3ObjectResource.accountId());
+        assertEquals(Optional.of("partition"), s3ObjectResource.partition());
+        assertEquals(Optional.of("region"), s3ObjectResource.region());
+        assertEquals("object", s3ObjectResource.type());
+    }
+
+    @Test
+    public void buildWithSetters() {
+        S3ObjectResource.Builder builder = S3ObjectResource.builder();
+        builder.setBucketName("bucket");
+        builder.setKey("key");
+        builder.setAccountId("account-id");
+        builder.setPartition("partition");
+        builder.setRegion("region");
+        S3ObjectResource s3ObjectResource = builder.build();
+
+        assertEquals("bucket", s3ObjectResource.bucketName());
+        assertEquals("key", s3ObjectResource.key());
+        assertEquals(Optional.of("account-id"), s3ObjectResource.accountId());
+        assertEquals(Optional.of("partition"), s3ObjectResource.partition());
+        assertEquals(Optional.of("region"), s3ObjectResource.region());
+        assertEquals("object", s3ObjectResource.type());
+    }
+
+    @Test
+    public void buildWithMinimalPropertiesSet() {
+        S3ObjectResource s3ObjectResource = S3ObjectResource.builder()
+                                                            .partition("aws")
+                                                            .bucketName("bucket")
+                                                            .key("key")
+                                                            .build();
+
+        assertEquals("bucket", s3ObjectResource.bucketName());
+        assertEquals("key", s3ObjectResource.key());
+        assertEquals(Optional.of("aws"), s3ObjectResource.partition());
+        assertEquals(Optional.empty(), s3ObjectResource.accountId());
+        assertEquals(Optional.empty(), s3ObjectResource.region());
+        assertEquals("object", s3ObjectResource.type());
+    }
+
+    @Test(expected = NullPointerException.class)
+    public void buildWithMissingPartition() {
+        S3ObjectResource.builder()
+                        .bucketName("bucket")
+                        .key("key")
+                        .build();
+    }
+
+    @Test(expected = NullPointerException.class)
+    public void buildWithMissingBucketName() {
+        S3ObjectResource.builder()
+                        .partition("aws")
+                        .key("key")
+                        .build();
+    }
+
+    @Test(expected = NullPointerException.class)
+    public void buildWithMissingKey() {
+        S3ObjectResource.builder()
+                        .partition("aws")
+                        .bucketName("bucket-name")
+                        .build();
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void buildWithEmptyPartition() {
+        S3ObjectResource.builder()
+                        .bucketName("bucket")
+                        .key("key")
+                        .partition("")
+                        .build();
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void buildWithEmptyBucketName() {
+        S3ObjectResource.builder()
+                        .partition("aws")
+                        .key("key")
+                        .bucketName("")
+                        .build();
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void buildWithEmptyKey() {
+        S3ObjectResource.builder()
+                        .partition("aws")
+                        .bucketName("bucket-name")
+                        .key("")
+                        .build();
+    }
+
+    @Test
+    public void equals_allProperties() {
+        S3ObjectResource s3ObjectResource1 = S3ObjectResource.builder()
+                                                             .bucketName("bucket")
+                                                             .key("key")
+                                                             .accountId("account-id")
+                                                             .partition("partition")
+                                                             .region("region")
+                                                             .build();
+
+        S3ObjectResource s3ObjectResource2 = S3ObjectResource.builder()
+                                                             .bucketName("bucket")
+                                                             .key("key")
+                                                             .accountId("account-id")
+                                                             .partition("partition")
+                                                             .region("region")
+                                                             .build();
+
+        S3ObjectResource s3ObjectResource3 = S3ObjectResource.builder()
+                                                             .bucketName("bucket")
+                                                             .key("key")
+                                                             .accountId("account-id")
+                                                             .partition("different-partition")
+                                                             .region("region")
+                                                             .build();
+
+        assertEquals(s3ObjectResource1, s3ObjectResource2);
+        assertNotEquals(s3ObjectResource1, s3ObjectResource3);
+    }
+
+    @Test
+    public void equals_minimalProperties() {
+        S3ObjectResource s3ObjectResource1 = S3ObjectResource.builder()
+                                                             .partition("aws")
+                                                             .bucketName("bucket")
+                                                             .key("key")
+                                                             .build();
+
+        S3ObjectResource s3ObjectResource2 = S3ObjectResource.builder()
+                                                             .partition("aws")
+                                                             .bucketName("bucket")
+                                                             .key("key")
+                                                             .build();
+
+        S3ObjectResource s3ObjectResource3 = S3ObjectResource.builder()
+                                                             .partition("aws")
+                                                             .bucketName("another-bucket")
+                                                             .key("key")
+                                                             .build();
+
+        assertEquals(s3ObjectResource1, s3ObjectResource2);
+        assertNotEquals(s3ObjectResource1, s3ObjectResource3);
+    }
+
+    @Test
+    public void hashcode_allProperties() {
+        S3ObjectResource s3ObjectResource1 = S3ObjectResource.builder()
+                                                             .bucketName("bucket")
+                                                             .key("key")
+                                                             .accountId("account-id")
+                                                             .partition("partition")
+                                                             .region("region")
+                                                             .build();
+
+        S3ObjectResource s3ObjectResource2 = S3ObjectResource.builder()
+                                                             .bucketName("bucket")
+                                                             .key("key")
+                                                             .accountId("account-id")
+                                                             .partition("partition")
+                                                             .region("region")
+                                                             .build();
+
+        S3ObjectResource s3ObjectResource3 = S3ObjectResource.builder()
+                                                             .bucketName("bucket")
+                                                             .key("key")
+                                                             .accountId("account-id")
+                                                             .partition("different-partition")
+                                                             .region("region")
+                                                             .build();
+
+        assertEquals(s3ObjectResource1.hashCode(), s3ObjectResource2.hashCode());
+        assertNotEquals(s3ObjectResource1.hashCode(), s3ObjectResource3.hashCode());
+    }
+}
\ No newline at end of file
diff --git a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/usearnregion/ProfileUseArnRegionProviderTest.java b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/usearnregion/ProfileUseArnRegionProviderTest.java
new file mode 100644
index 000000000000..eb6b3b27cc33
--- /dev/null
+++ b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/usearnregion/ProfileUseArnRegionProviderTest.java
@@ -0,0 +1,121 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.services.s3.internal.usearnregion;
+
+import static java.lang.Boolean.FALSE;
+import static java.lang.Boolean.TRUE;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.assertj.core.api.Assertions.in;
+import static org.mockito.Matchers.any;
+import static software.amazon.awssdk.profiles.ProfileFileSystemSetting.AWS_CONFIG_FILE;
+
+import java.util.Optional;
+import java.util.StringJoiner;
+import org.junit.After;
+import org.junit.Test;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mockito;
+import software.amazon.awssdk.auth.credentials.AnonymousCredentialsProvider;
+import software.amazon.awssdk.core.exception.SdkException;
+import software.amazon.awssdk.core.interceptor.Context;
+import software.amazon.awssdk.core.interceptor.ExecutionInterceptor;
+import software.amazon.awssdk.core.interceptor.SdkExecutionAttribute;
+import software.amazon.awssdk.http.SdkHttpRequest;
+import software.amazon.awssdk.profiles.ProfileFile;
+import software.amazon.awssdk.regions.Region;
+import software.amazon.awssdk.services.s3.S3Client;
+import software.amazon.awssdk.utils.StringInputStream;
+
+public class ProfileUseArnRegionProviderTest {
+    private ProfileUseArnRegionProvider provider = ProfileUseArnRegionProvider.create();
+
+    @After
+    public void clearSystemProperty() {
+        System.clearProperty(AWS_CONFIG_FILE.property());
+    }
+
+    @Test
+    public void notSpecified_shouldReturnEmptyOptional() {
+        assertThat(provider.resolveUseArnRegion()).isEqualTo(Optional.empty());
+    }
+
+    @Test
+    public void specifiedInConfigFile_shouldResolve() {
+        String configFile = getClass().getResource("UseArnRegionSet_true").getFile();
+        System.setProperty(AWS_CONFIG_FILE.property(), configFile);
+
+        assertThat(provider.resolveUseArnRegion()).isEqualTo(Optional.of(TRUE));
+    }
+
+    @Test
+    public void configFile_mixedSpace() {
+        String configFile = getClass().getResource("UseArnRegionSet_mixedSpace").getFile();
+        System.setProperty(AWS_CONFIG_FILE.property(), configFile);
+
+        assertThat(provider.resolveUseArnRegion()).isEqualTo(Optional.of(FALSE));
+    }
+
+    @Test
+    public void unsupportedValue_shouldThrowException() {
+        String configFile = getClass().getResource("UseArnRegionSet_unsupportedValue").getFile();
+        System.setProperty(AWS_CONFIG_FILE.property(), configFile);
+
+        assertThatThrownBy(() -> provider.resolveUseArnRegion()).isInstanceOf(IllegalArgumentException.class);
+    }
+
+    @Test
+    public void commaNoSpace_shouldResolveCorrectly() {
+        String configFile = getClass().getResource("UseArnRegionSet_noSpace").getFile();
+        System.setProperty(AWS_CONFIG_FILE.property(), configFile);
+
+        assertThat(provider.resolveUseArnRegion()).isEqualTo(Optional.of(FALSE));
+    }
+
+    @Test
+    public void specifiedInOverrideConfig_shouldUse() {
+        ExecutionInterceptor interceptor = Mockito.spy(AbstractExecutionInterceptor.class);
+
+        String profileFileContent =
+            "[default]\n" +
+            "s3_use_arn_region = true\n";
+
+        ProfileFile profileFile = ProfileFile.builder()
+                                             .type(ProfileFile.Type.CONFIGURATION)
+                                             .content(new StringInputStream(profileFileContent))
+                                             .build();
+
+        S3Client s3 = S3Client.builder()
+                              .region(Region.US_WEST_2)
+                              .credentialsProvider(AnonymousCredentialsProvider.create())
+                              .overrideConfiguration(c -> c.defaultProfileFile(profileFile)
+                                                           .defaultProfileName("default")
+                                                           .addExecutionInterceptor(interceptor)
+                                                           .retryPolicy(r -> r.numRetries(0)))
+                              .build();
+
+        String arn = "arn:aws:s3:us-banana-46:12345567890:accesspoint:foo";
+        assertThatThrownBy(() -> s3.getObject(r -> r.bucket(arn).key("bar"))).isInstanceOf(SdkException.class);
+
+        ArgumentCaptor<Context.BeforeTransmission> context = ArgumentCaptor.forClass(Context.BeforeTransmission.class);
+        Mockito.verify(interceptor).beforeTransmission(context.capture(), any());
+
+        String host = context.getValue().httpRequest().host();
+        assertThat(host).contains("us-banana-46");
+    }
+
+    public static abstract class AbstractExecutionInterceptor implements ExecutionInterceptor {}
+}
diff --git a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/usearnregion/SystemSettingsUseArnRegionProviderTest.java b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/usearnregion/SystemSettingsUseArnRegionProviderTest.java
new file mode 100644
index 000000000000..021fd91751bb
--- /dev/null
+++ b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/usearnregion/SystemSettingsUseArnRegionProviderTest.java
@@ -0,0 +1,74 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.services.s3.internal.usearnregion;
+
+import static java.lang.Boolean.FALSE;
+import static java.lang.Boolean.TRUE;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static software.amazon.awssdk.services.s3.S3SystemSetting.AWS_S3_USE_ARN_REGION;
+
+import java.util.Optional;
+import org.junit.After;
+import org.junit.Test;
+import software.amazon.awssdk.testutils.EnvironmentVariableHelper;
+
+public class SystemSettingsUseArnRegionProviderTest {
+    private final SystemsSettingsUseArnRegionProvider provider = SystemsSettingsUseArnRegionProvider.create();
+    private final EnvironmentVariableHelper helper = new EnvironmentVariableHelper();
+
+    @After
+    public void clearSystemProperty() {
+        System.clearProperty(AWS_S3_USE_ARN_REGION.property());
+        helper.reset();
+    }
+
+    @Test
+    public void notSpecified_shouldReturnEmptyOptional() {
+        assertThat(provider.resolveUseArnRegion()).isEqualTo(Optional.empty());
+    }
+
+    @Test
+    public void emptySystemProperties_shouldReturnEmptyOptional() {
+        System.setProperty(AWS_S3_USE_ARN_REGION.property(), "");
+        assertThatThrownBy(() -> provider.resolveUseArnRegion()).isInstanceOf(IllegalStateException.class);
+    }
+
+    @Test
+    public void specifiedInSystemProperties_shouldResolve() {
+        System.setProperty(AWS_S3_USE_ARN_REGION.property(), "false");
+        assertThat(provider.resolveUseArnRegion()).isEqualTo(Optional.of(FALSE));
+    }
+
+    @Test
+    public void specifiedInEnvironmentVariables_shouldResolve() {
+        helper.set(AWS_S3_USE_ARN_REGION.environmentVariable(), "true");
+        assertThat(provider.resolveUseArnRegion()).isEqualTo(Optional.of(TRUE));
+    }
+
+    @Test
+    public void specifiedInBothPlaces_SystemPropertiesShouldTakePrecedence() {
+        System.setProperty(AWS_S3_USE_ARN_REGION.property(), "true");
+        helper.set(AWS_S3_USE_ARN_REGION.environmentVariable(), "false");
+        assertThat(provider.resolveUseArnRegion()).isEqualTo(Optional.of(TRUE));
+    }
+
+    @Test
+    public void mixedSpace_shouldResolveCorrectly() {
+        System.setProperty(AWS_S3_USE_ARN_REGION.property(), "tRuE");
+        assertThat(provider.resolveUseArnRegion()).isEqualTo(Optional.of(TRUE));
+    }
+}
diff --git a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/usearnregion/UseArnRegionProviderChainTest.java b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/usearnregion/UseArnRegionProviderChainTest.java
new file mode 100644
index 000000000000..7ac12f7eda31
--- /dev/null
+++ b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/usearnregion/UseArnRegionProviderChainTest.java
@@ -0,0 +1,68 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.services.s3.internal.usearnregion;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static software.amazon.awssdk.profiles.ProfileFileSystemSetting.AWS_CONFIG_FILE;
+import static software.amazon.awssdk.services.s3.S3SystemSetting.AWS_S3_USE_ARN_REGION;
+
+import java.util.Optional;
+import org.junit.After;
+import org.junit.Test;
+import software.amazon.awssdk.testutils.EnvironmentVariableHelper;
+
+public class UseArnRegionProviderChainTest {
+    private final EnvironmentVariableHelper helper = new EnvironmentVariableHelper();
+
+    @After
+    public void clearSystemProperty() {
+        System.clearProperty(AWS_S3_USE_ARN_REGION.property());
+        System.clearProperty(AWS_CONFIG_FILE.property());
+        helper.reset();
+    }
+
+    @Test
+    public void notSpecified_shouldReturnEmptyOptional() {
+        assertThat(UseArnRegionProviderChain.create().resolveUseArnRegion()).isEqualTo(Optional.empty());
+    }
+
+    @Test
+    public void specifiedInBothProviders_systemPropertiesShouldTakePrecedence() {
+        System.setProperty(AWS_S3_USE_ARN_REGION.property(), "false");
+        String configFile = getClass().getResource("UseArnRegionSet_true").getFile();
+        System.setProperty(AWS_CONFIG_FILE.property(), configFile);
+
+        assertThat(UseArnRegionProviderChain.create().resolveUseArnRegion()).isEqualTo(Optional.of(Boolean.FALSE));
+    }
+
+    @Test
+    public void systemPropertiesThrowException_shouldUseConfigFile() {
+        System.setProperty(AWS_S3_USE_ARN_REGION.property(), "foobar");
+        String configFile = getClass().getResource("UseArnRegionSet_true").getFile();
+        System.setProperty(AWS_CONFIG_FILE.property(), configFile);
+
+        assertThat(UseArnRegionProviderChain.create().resolveUseArnRegion()).isEqualTo(Optional.of(Boolean.TRUE));
+    }
+
+    @Test
+    public void bothProvidersThrowException_shouldReturnEmpty() {
+        System.setProperty(AWS_S3_USE_ARN_REGION.property(), "foobar");
+        String configFile = getClass().getResource("UseArnRegionSet_unsupportedValue").getFile();
+        System.setProperty(AWS_CONFIG_FILE.property(), configFile);
+
+        assertThat(UseArnRegionProviderChain.create().resolveUseArnRegion()).isEqualTo(Optional.empty());
+    }
+}
diff --git a/services/s3/src/test/java/software/amazon/awssdk/services/s3/presigner/model/GetObjectPresignRequestTest.java b/services/s3/src/test/java/software/amazon/awssdk/services/s3/presigner/model/GetObjectPresignRequestTest.java
index e659c4f71206..4436e66cd8b7 100644
--- a/services/s3/src/test/java/software/amazon/awssdk/services/s3/presigner/model/GetObjectPresignRequestTest.java
+++ b/services/s3/src/test/java/software/amazon/awssdk/services/s3/presigner/model/GetObjectPresignRequestTest.java
@@ -1,3 +1,18 @@
+/*
+ * 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.
+ */
+
 package software.amazon.awssdk.services.s3.presigner.model;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/services/s3/src/test/java/software/amazon/awssdk/services/s3/presigner/model/PresignedGetObjectRequestTest.java b/services/s3/src/test/java/software/amazon/awssdk/services/s3/presigner/model/PresignedGetObjectRequestTest.java
index d53f9c5bf424..b1e6a70d21ce 100644
--- a/services/s3/src/test/java/software/amazon/awssdk/services/s3/presigner/model/PresignedGetObjectRequestTest.java
+++ b/services/s3/src/test/java/software/amazon/awssdk/services/s3/presigner/model/PresignedGetObjectRequestTest.java
@@ -1,3 +1,18 @@
+/*
+ * 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.
+ */
+
 package software.amazon.awssdk.services.s3.presigner.model;
 
 
diff --git a/services/s3/src/test/java/software/amazon/awssdk/services/s3/utils/InterceptorTestUtils.java b/services/s3/src/test/java/software/amazon/awssdk/services/s3/utils/InterceptorTestUtils.java
index 3228d86825dd..06c7efa12347 100644
--- a/services/s3/src/test/java/software/amazon/awssdk/services/s3/utils/InterceptorTestUtils.java
+++ b/services/s3/src/test/java/software/amazon/awssdk/services/s3/utils/InterceptorTestUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/s3/src/test/java/software/amazon/awssdk/services/s3/utils/S3EndpointResolutionTest.java b/services/s3/src/test/java/software/amazon/awssdk/services/s3/utils/S3EndpointResolutionTest.java
index 2387ca5d78af..26050f8c5b14 100644
--- a/services/s3/src/test/java/software/amazon/awssdk/services/s3/utils/S3EndpointResolutionTest.java
+++ b/services/s3/src/test/java/software/amazon/awssdk/services/s3/utils/S3EndpointResolutionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -17,26 +17,31 @@
 
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static software.amazon.awssdk.services.s3.S3MockUtils.mockListBucketsResponse;
 import static software.amazon.awssdk.services.s3.S3MockUtils.mockListObjectsResponse;
 
+import java.io.UnsupportedEncodingException;
 import java.net.URI;
 import org.junit.Before;
 import org.junit.Test;
 import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
 import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
+import software.amazon.awssdk.core.SdkSystemSetting;
 import software.amazon.awssdk.core.client.config.ClientOverrideConfiguration;
 import software.amazon.awssdk.core.client.config.SdkAdvancedClientOption;
 import software.amazon.awssdk.core.signer.Signer;
-import software.amazon.awssdk.http.SdkHttpFullRequest;
 import software.amazon.awssdk.http.SdkHttpRequest;
+import software.amazon.awssdk.profiles.ProfileFile;
 import software.amazon.awssdk.regions.Region;
 import software.amazon.awssdk.services.s3.S3Client;
 import software.amazon.awssdk.services.s3.S3ClientBuilder;
 import software.amazon.awssdk.services.s3.S3Configuration;
 import software.amazon.awssdk.services.s3.internal.handlers.EndpointAddressInterceptor;
 import software.amazon.awssdk.services.s3.model.ListObjectsRequest;
+import software.amazon.awssdk.testutils.EnvironmentVariableHelper;
 import software.amazon.awssdk.testutils.service.http.MockHttpClient;
+import software.amazon.awssdk.utils.StringInputStream;
 
 /**
  * Functional tests for various endpoint related behavior in S3.
@@ -109,6 +114,53 @@ public void customEndpointProvided_UsesCustomEndpoint() throws Exception {
                 .isEqualTo(URI.create(customEndpoint + "/"));
     }
 
+    @Test
+    public void accessPointArn_correctlyRewritesEndpoint() throws Exception {
+        URI customEndpoint = URI.create("https://foobar-12345678910.s3-accesspoint.ap-south-1.amazonaws.com");
+        mockHttpClient.stubNextResponse(mockListObjectsResponse());
+        S3Client s3Client = clientBuilder().build();
+        String accessPointArn = "arn:aws:s3:ap-south-1:12345678910:accesspoint:foobar";
+
+        s3Client.listObjects(ListObjectsRequest.builder().bucket(accessPointArn).build());
+
+        assertEndpointMatches(mockHttpClient.getLastRequest(), customEndpoint.toString());
+    }
+
+    @Test
+    public void accessPointArn_customEndpoint_throwsIllegalArgumentException() throws Exception {
+        URI customEndpoint = URI.create("https://foobar.amazonaws.com");
+        mockHttpClient.stubNextResponse(mockListObjectsResponse());
+        S3Client s3Client = clientBuilder().endpointOverride(customEndpoint).build();
+        String accessPointArn = "arn:aws:s3:ap-south-1:12345678910:accesspoint:foobar";
+
+        assertThatThrownBy(() -> s3Client.listObjects(ListObjectsRequest.builder().bucket(accessPointArn).build()))
+            .isInstanceOf(IllegalArgumentException.class)
+            .hasMessageContaining("endpoint override");
+    }
+
+    @Test
+    public void accessPointArn_differentRegion_useArnRegionFalse_throwsIllegalArgumentException() throws Exception {
+        mockHttpClient.stubNextResponse(mockListObjectsResponse());
+        S3Client s3Client = clientBuilder().build();
+        String accessPointArn = "arn:aws:s3:us-west-2:12345678910:accesspoint:foobar";
+
+        assertThatThrownBy(() -> s3Client.listObjects(ListObjectsRequest.builder().bucket(accessPointArn).build()))
+            .isInstanceOf(IllegalArgumentException.class)
+            .hasMessageContaining("region");
+    }
+
+    @Test
+    public void accessPointArn_differentRegion_useArnRegionTrue() throws Exception {
+        URI customEndpoint = URI.create("https://foobar-12345678910.s3-accesspoint.us-west-2.amazonaws.com");
+        mockHttpClient.stubNextResponse(mockListObjectsResponse());
+        S3Client s3Client = clientBuilder().serviceConfiguration(b -> b.useArnRegionEnabled(true)).build();
+        String accessPointArn = "arn:aws:s3:us-west-2:12345678910:accesspoint:foobar";
+
+        s3Client.listObjects(ListObjectsRequest.builder().bucket(accessPointArn).build());
+
+        assertEndpointMatches(mockHttpClient.getLastRequest(), customEndpoint.toString());
+    }
+
     /**
      * If a custom, non-s3 endpoint is used we revert to path style addressing. This is useful for alternative S3 implementations
      * like Ceph that do not support virtual style addressing.
@@ -289,6 +341,95 @@ public void accelerateAndPathStyleEnabled_ThrowsIllegalArgumentException() {
                                    .build());
     }
 
+    @Test
+    public void regionalSettingEnabled_usesRegionalIadEndpoint() throws UnsupportedEncodingException {
+        EnvironmentVariableHelper environmentVariableHelper = new EnvironmentVariableHelper();
+        environmentVariableHelper.set(SdkSystemSetting.AWS_S3_US_EAST_1_REGIONAL_ENDPOINT.environmentVariable(), "regional");
+
+        mockHttpClient.stubNextResponse(mockListObjectsResponse());
+
+        S3Client s3Client = S3Client.builder()
+                .credentialsProvider(StaticCredentialsProvider.create(AwsBasicCredentials.create("akid", "skid")))
+                .httpClient(mockHttpClient)
+                .region(Region.US_EAST_1)
+                .serviceConfiguration(S3Configuration.builder()
+                        .pathStyleAccessEnabled(true)
+                        .build())
+                .build();
+        try {
+            s3Client.listObjects(ListObjectsRequest.builder().bucket(BUCKET).build());
+            assertThat(mockHttpClient.getLastRequest().getUri().getHost()).isEqualTo("s3.us-east-1.amazonaws.com");
+        } finally {
+            environmentVariableHelper.reset();
+        }
+    }
+
+    @Test
+    public void regionalSettingEnabledViaProfile_usesRegionalIadEndpoint() throws UnsupportedEncodingException {
+        String profile =
+            "[profile test]\n" +
+            "s3_us_east_1_regional_endpoint = regional";
+
+        ProfileFile profileFile = ProfileFile.builder()
+                                             .content(new StringInputStream(profile))
+                                             .type(ProfileFile.Type.CONFIGURATION)
+                                             .build();
+
+        mockHttpClient.stubNextResponse(mockListObjectsResponse());
+
+        S3Client s3Client = S3Client.builder()
+                                    .credentialsProvider(StaticCredentialsProvider.create(AwsBasicCredentials.create("akid", "skid")))
+                                    .httpClient(mockHttpClient)
+                                    .region(Region.US_EAST_1)
+                                    .overrideConfiguration(c -> c.defaultProfileFile(profileFile)
+                                                                 .defaultProfileName("test"))
+                                    .serviceConfiguration(c -> c.pathStyleAccessEnabled(true))
+                                    .build();
+
+        s3Client.listObjects(ListObjectsRequest.builder().bucket(BUCKET).build());
+        assertThat(mockHttpClient.getLastRequest().getUri().getHost()).isEqualTo("s3.us-east-1.amazonaws.com");
+    }
+
+    @Test
+    public void regionalSettingDisabled_usesGlobalEndpoint() throws UnsupportedEncodingException {
+        EnvironmentVariableHelper environmentVariableHelper = new EnvironmentVariableHelper();
+        environmentVariableHelper.set(SdkSystemSetting.AWS_S3_US_EAST_1_REGIONAL_ENDPOINT.environmentVariable(), "nonregional");
+
+        mockHttpClient.stubNextResponse(mockListObjectsResponse());
+
+        S3Client s3Client = S3Client.builder()
+                .credentialsProvider(StaticCredentialsProvider.create(AwsBasicCredentials.create("akid", "skid")))
+                .httpClient(mockHttpClient)
+                .region(Region.US_EAST_1)
+                .serviceConfiguration(S3Configuration.builder()
+                        .pathStyleAccessEnabled(true)
+                        .build())
+                .build();
+        try {
+            s3Client.listObjects(ListObjectsRequest.builder().bucket(BUCKET).build());
+            assertThat(mockHttpClient.getLastRequest().getUri().getHost()).isEqualTo("s3.amazonaws.com");
+        } finally {
+            environmentVariableHelper.reset();
+        }
+    }
+
+    @Test
+    public void regionalSettingUnset_usesGlobalEndpoint() throws UnsupportedEncodingException {
+        mockHttpClient.stubNextResponse(mockListObjectsResponse());
+
+        S3Client s3Client = S3Client.builder()
+                .credentialsProvider(StaticCredentialsProvider.create(AwsBasicCredentials.create("akid", "skid")))
+                .httpClient(mockHttpClient)
+                .region(Region.US_EAST_1)
+                .serviceConfiguration(S3Configuration.builder()
+                        .pathStyleAccessEnabled(true)
+                        .build())
+                .build();
+
+        s3Client.listObjects(ListObjectsRequest.builder().bucket(BUCKET).build());
+        assertThat(mockHttpClient.getLastRequest().getUri().getHost()).isEqualTo("s3.amazonaws.com");
+    }
+
     /**
      * Assert that the provided request would have gone to the given endpoint.
      *
diff --git a/services/s3/src/test/resources/log4j.properties b/services/s3/src/test/resources/log4j.properties
index b821297c6731..012eb6e372f3 100644
--- a/services/s3/src/test/resources/log4j.properties
+++ b/services/s3/src/test/resources/log4j.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/s3/src/test/resources/software/amazon/awssdk/services/s3/internal/usearnregion/UseArnRegionSet_mixedSpace b/services/s3/src/test/resources/software/amazon/awssdk/services/s3/internal/usearnregion/UseArnRegionSet_mixedSpace
new file mode 100644
index 000000000000..c7556917d2f2
--- /dev/null
+++ b/services/s3/src/test/resources/software/amazon/awssdk/services/s3/internal/usearnregion/UseArnRegionSet_mixedSpace
@@ -0,0 +1,2 @@
+[default]
+s3_use_arn_region=fAlSE
diff --git a/services/s3/src/test/resources/software/amazon/awssdk/services/s3/internal/usearnregion/UseArnRegionSet_noSpace b/services/s3/src/test/resources/software/amazon/awssdk/services/s3/internal/usearnregion/UseArnRegionSet_noSpace
new file mode 100644
index 000000000000..5a3114eaf6db
--- /dev/null
+++ b/services/s3/src/test/resources/software/amazon/awssdk/services/s3/internal/usearnregion/UseArnRegionSet_noSpace
@@ -0,0 +1,2 @@
+[default]
+s3_use_arn_region=false
diff --git a/services/s3/src/test/resources/software/amazon/awssdk/services/s3/internal/usearnregion/UseArnRegionSet_true b/services/s3/src/test/resources/software/amazon/awssdk/services/s3/internal/usearnregion/UseArnRegionSet_true
new file mode 100644
index 000000000000..a70cbb59a9ed
--- /dev/null
+++ b/services/s3/src/test/resources/software/amazon/awssdk/services/s3/internal/usearnregion/UseArnRegionSet_true
@@ -0,0 +1,2 @@
+[default]
+s3_use_arn_region = true
diff --git a/services/s3/src/test/resources/software/amazon/awssdk/services/s3/internal/usearnregion/UseArnRegionSet_unsupportedValue b/services/s3/src/test/resources/software/amazon/awssdk/services/s3/internal/usearnregion/UseArnRegionSet_unsupportedValue
new file mode 100644
index 000000000000..72a689233754
--- /dev/null
+++ b/services/s3/src/test/resources/software/amazon/awssdk/services/s3/internal/usearnregion/UseArnRegionSet_unsupportedValue
@@ -0,0 +1,2 @@
+[default]
+s3_use_arn_region=unsupported-value
diff --git a/services/s3control/pom.xml b/services/s3control/pom.xml
index 223d801ab612..02cee30492be 100644
--- a/services/s3control/pom.xml
+++ b/services/s3control/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>s3control</artifactId>
     <name>AWS Java SDK :: Services :: Amazon S3 Control</name>
@@ -56,6 +56,11 @@
             <artifactId>protocol-core</artifactId>
             <version>${awsjavasdk.version}</version>
         </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>profiles</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
         <!-- Test Dependencies -->
         <dependency>
             <artifactId>commons-io</artifactId>
diff --git a/services/s3control/src/it/java/software.amazon.awssdk.services.s3control/S3ControlIntegrationTest.java b/services/s3control/src/it/java/software.amazon.awssdk.services.s3control/S3ControlIntegrationTest.java
index 6cf33e0195b2..48954def06cd 100644
--- a/services/s3control/src/it/java/software.amazon.awssdk.services.s3control/S3ControlIntegrationTest.java
+++ b/services/s3control/src/it/java/software.amazon.awssdk.services.s3control/S3ControlIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/s3control/src/main/java/software/amazon/awssdk/services/s3control/S3ControlConfiguration.java b/services/s3control/src/main/java/software/amazon/awssdk/services/s3control/S3ControlConfiguration.java
index 0c234733cb51..090f949ea499 100644
--- a/services/s3control/src/main/java/software/amazon/awssdk/services/s3control/S3ControlConfiguration.java
+++ b/services/s3control/src/main/java/software/amazon/awssdk/services/s3control/S3ControlConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -20,6 +20,7 @@
 import software.amazon.awssdk.annotations.SdkPublicApi;
 import software.amazon.awssdk.annotations.ThreadSafe;
 import software.amazon.awssdk.core.ServiceConfiguration;
+import software.amazon.awssdk.profiles.ProfileFile;
 import software.amazon.awssdk.utils.builder.CopyableBuilder;
 import software.amazon.awssdk.utils.builder.ToCopyableBuilder;
 
@@ -42,12 +43,16 @@ public final class S3ControlConfiguration implements ServiceConfiguration,
      */
     private static final boolean DEFAULT_DUALSTACK_ENABLED = false;
 
-    private final boolean fipsModeEnabled;
-    private final boolean dualstackEnabled;
+    private final Boolean fipsModeEnabled;
+    private final Boolean dualstackEnabled;
+    private final ProfileFile profileFile;
+    private final String profileName;
 
     private S3ControlConfiguration(DefaultS3ServiceConfigurationBuilder builder) {
-        this.dualstackEnabled = resolveBoolean(builder.dualstackEnabled, DEFAULT_DUALSTACK_ENABLED);
-        this.fipsModeEnabled = resolveBoolean(builder.fipsModeEnabled, DEFAULT_FIPS_MODE_ENABLED);
+        this.dualstackEnabled = builder.dualstackEnabled;
+        this.fipsModeEnabled = builder.fipsModeEnabled;
+        this.profileFile = builder.profileFile;
+        this.profileName = builder.profileName;
     }
 
     /**
@@ -64,7 +69,7 @@ public static Builder builder() {
      * @return True if client will use FIPS mode.
      */
     public boolean fipsModeEnabled() {
-        return fipsModeEnabled;
+        return resolveBoolean(fipsModeEnabled, DEFAULT_FIPS_MODE_ENABLED);
     }
 
     /**
@@ -81,7 +86,7 @@ public boolean fipsModeEnabled() {
      * @return True if the client will use the dualstack endpoints
      */
     public boolean dualstackEnabled() {
-        return dualstackEnabled;
+        return resolveBoolean(dualstackEnabled, DEFAULT_DUALSTACK_ENABLED);
     }
 
     private boolean resolveBoolean(Boolean suppliedValue, boolean defaultValue) {
@@ -92,11 +97,15 @@ private boolean resolveBoolean(Boolean suppliedValue, boolean defaultValue) {
     public Builder toBuilder() {
         return builder()
                 .dualstackEnabled(dualstackEnabled)
-                .fipsModeEnabled(fipsModeEnabled);
+                .fipsModeEnabled(fipsModeEnabled)
+                .profileFile(profileFile)
+                .profileName(profileName);
     }
 
     @NotThreadSafe
     public interface Builder extends CopyableBuilder<Builder, S3ControlConfiguration> {
+        Boolean dualstackEnabled();
+
         /**
          * Option to enable using the dualstack endpoints when accessing S3. Dualstack
          * should be enabled if you want to use IPv6.
@@ -109,6 +118,8 @@ public interface Builder extends CopyableBuilder<Builder, S3ControlConfiguration
          */
         Builder dualstackEnabled(Boolean dualstackEnabled);
 
+        Boolean fipsModeEnabled();
+
         /**
          * Option to enable using the fips endpoint when accessing S3 Control.
          *
@@ -119,12 +130,34 @@ public interface Builder extends CopyableBuilder<Builder, S3ControlConfiguration
          * @see S3ControlConfiguration#fipsModeEnabled().
          */
         Builder fipsModeEnabled(Boolean fipsModeEnabled);
+
+        ProfileFile profileFile();
+
+        /**
+         * The profile file that should be consulted to determine the service-specific default configuration. This is not
+         * currently used by S3 control, but may be in a future SDK version.
+         */
+        Builder profileFile(ProfileFile profileFile);
+
+        String profileName();
+
+        /**
+         * The profile name that should be consulted to determine the service-specific default configuration. This is not
+         * currently used by S3 control, but may be in a future SDK version.
+         */
+        Builder profileName(String profileName);
     }
 
     private static final class DefaultS3ServiceConfigurationBuilder implements Builder {
 
         private Boolean dualstackEnabled;
         private Boolean fipsModeEnabled;
+        private ProfileFile profileFile;
+        private String profileName;
+
+        public Boolean dualstackEnabled() {
+            return dualstackEnabled;
+        }
 
         public Builder dualstackEnabled(Boolean dualstackEnabled) {
             this.dualstackEnabled = dualstackEnabled;
@@ -135,6 +168,10 @@ public void setDualstackEnabled(Boolean dualstackEnabled) {
             dualstackEnabled(dualstackEnabled);
         }
 
+        public Boolean fipsModeEnabled() {
+            return fipsModeEnabled;
+        }
+
         public Builder fipsModeEnabled(Boolean fipsModeEnabled) {
             this.fipsModeEnabled = fipsModeEnabled;
             return this;
@@ -144,6 +181,28 @@ public void setFipsModeEnabled(Boolean fipsModeEnabled) {
             fipsModeEnabled(fipsModeEnabled);
         }
 
+        @Override
+        public ProfileFile profileFile() {
+            return profileFile;
+        }
+
+        @Override
+        public Builder profileFile(ProfileFile profileFile) {
+            this.profileFile = profileFile;
+            return this;
+        }
+
+        @Override
+        public String profileName() {
+            return profileName;
+        }
+
+        @Override
+        public Builder profileName(String profileName) {
+            this.profileName = profileName;
+            return this;
+        }
+
         public S3ControlConfiguration build() {
             return new S3ControlConfiguration(this);
         }
diff --git a/services/s3control/src/main/java/software/amazon/awssdk/services/s3control/internal/interceptors/EndpointAddressInterceptor.java b/services/s3control/src/main/java/software/amazon/awssdk/services/s3control/internal/interceptors/EndpointAddressInterceptor.java
index 86afc1440364..e0a0eeeafddb 100644
--- a/services/s3control/src/main/java/software/amazon/awssdk/services/s3control/internal/interceptors/EndpointAddressInterceptor.java
+++ b/services/s3control/src/main/java/software/amazon/awssdk/services/s3control/internal/interceptors/EndpointAddressInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -15,7 +15,8 @@
 
 package software.amazon.awssdk.services.s3control.internal.interceptors;
 
-import java.net.URI;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import software.amazon.awssdk.annotations.SdkInternalApi;
 import software.amazon.awssdk.auth.signer.AwsSignerExecutionAttribute;
 import software.amazon.awssdk.core.exception.SdkClientException;
@@ -32,6 +33,8 @@
  */
 @SdkInternalApi
 public class EndpointAddressInterceptor implements ExecutionInterceptor {
+    private static final Pattern HOSTNAME_COMPLIANT_PATTERN = Pattern.compile("[A-Za-z0-9\\-]+");
+    private static final int HOSTNAME_MAX_LENGTH = 63;
 
     private static final String ENDPOINT_PREFIX = "s3-control";
 
@@ -47,7 +50,6 @@ public SdkHttpRequest modifyHttpRequest(Context.ModifyHttpRequest context,
         }
 
         String accountId = request.headers().get(X_AMZ_ACCOUNT_ID).get(0);
-        URI endpoint = request.getUri();
 
         S3ControlConfiguration config = (S3ControlConfiguration) executionAttributes.getAttribute(
             AwsSignerExecutionAttribute.SERVICE_CONFIG);
@@ -78,6 +80,7 @@ private String resolveHost(SdkHttpRequest request, String accountId, S3ControlCo
             host = host.replace(ENDPOINT_PREFIX, String.format("%s-%s", ENDPOINT_PREFIX, "fips"));
 
         }
+        validateComponentIsHostnameCompliant(accountId, "account id");
         return String.format("%s.%s", accountId, host);
     }
 
@@ -88,4 +91,26 @@ private boolean isDualstackEnabled(S3ControlConfiguration configuration) {
     private boolean isFipsEnabled(S3ControlConfiguration configuration) {
         return configuration != null && configuration.fipsModeEnabled();
     }
+
+    private static void validateComponentIsHostnameCompliant(String component, String componentName) {
+        if (component.isEmpty()) {
+            throw new IllegalArgumentException(
+                String.format("An argument has been passed that is not valid: the required '%s' "
+                              + "component is missing.", componentName));
+        }
+
+        if (component.length() > HOSTNAME_MAX_LENGTH) {
+            throw new IllegalArgumentException(
+                String.format("An argument has been passed that is not valid: the '%s' "
+                              + "component exceeds the maximum length of %d characters.", componentName,
+                              HOSTNAME_MAX_LENGTH));
+        }
+
+        Matcher m = HOSTNAME_COMPLIANT_PATTERN.matcher(component);
+        if (!m.matches()) {
+            throw new IllegalArgumentException(
+                String.format("An argument has been passed that is not valid: the '%s' "
+                              + "component must only contain alphanumeric characters and dashes.", componentName));
+        }
+    }
 }
diff --git a/services/s3control/src/main/java/software/amazon/awssdk/services/s3control/internal/interceptors/PayloadSigningInterceptor.java b/services/s3control/src/main/java/software/amazon/awssdk/services/s3control/internal/interceptors/PayloadSigningInterceptor.java
index f46a4627881d..38e1a815aee3 100644
--- a/services/s3control/src/main/java/software/amazon/awssdk/services/s3control/internal/interceptors/PayloadSigningInterceptor.java
+++ b/services/s3control/src/main/java/software/amazon/awssdk/services/s3control/internal/interceptors/PayloadSigningInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/s3control/src/main/resources/codegen-resources/paginators-1.json b/services/s3control/src/main/resources/codegen-resources/paginators-1.json
index 886110429dda..b725a739c2b6 100644
--- a/services/s3control/src/main/resources/codegen-resources/paginators-1.json
+++ b/services/s3control/src/main/resources/codegen-resources/paginators-1.json
@@ -1,5 +1,10 @@
 {
   "pagination": {
+    "ListAccessPoints": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "MaxResults"
+    },
     "ListJobs": {
       "input_token": "NextToken",
       "output_token": "NextToken",
diff --git a/services/s3control/src/main/resources/codegen-resources/service-2.json b/services/s3control/src/main/resources/codegen-resources/service-2.json
index 6314cf841fe4..b235e6e3618d 100644
--- a/services/s3control/src/main/resources/codegen-resources/service-2.json
+++ b/services/s3control/src/main/resources/codegen-resources/service-2.json
@@ -11,6 +11,19 @@
     "uid":"s3control-2018-08-20"
   },
   "operations":{
+    "CreateAccessPoint":{
+      "name":"CreateAccessPoint",
+      "http":{
+        "method":"PUT",
+        "requestUri":"/v20180820/accesspoint/{name}"
+      },
+      "input":{
+        "shape":"CreateAccessPointRequest",
+        "locationName":"CreateAccessPointRequest",
+        "xmlNamespace":{"uri":"http://awss3control.amazonaws.com/doc/2018-08-20/"}
+      },
+      "documentation":"<p>Creates an access point and associates it with the specified bucket.</p>"
+    },
     "CreateJob":{
       "name":"CreateJob",
       "http":{
@@ -31,6 +44,39 @@
       ],
       "documentation":"<p>Creates an Amazon S3 batch operations job.</p>"
     },
+    "DeleteAccessPoint":{
+      "name":"DeleteAccessPoint",
+      "http":{
+        "method":"DELETE",
+        "requestUri":"/v20180820/accesspoint/{name}"
+      },
+      "input":{"shape":"DeleteAccessPointRequest"},
+      "documentation":"<p>Deletes the specified access point.</p>"
+    },
+    "DeleteAccessPointPolicy":{
+      "name":"DeleteAccessPointPolicy",
+      "http":{
+        "method":"DELETE",
+        "requestUri":"/v20180820/accesspoint/{name}/policy"
+      },
+      "input":{"shape":"DeleteAccessPointPolicyRequest"},
+      "documentation":"<p>Deletes the access point policy for the specified access point.</p>"
+    },
+    "DeleteJobTagging":{
+      "name":"DeleteJobTagging",
+      "http":{
+        "method":"DELETE",
+        "requestUri":"/v20180820/jobs/{id}/tagging"
+      },
+      "input":{"shape":"DeleteJobTaggingRequest"},
+      "output":{"shape":"DeleteJobTaggingResult"},
+      "errors":[
+        {"shape":"InternalServiceException"},
+        {"shape":"TooManyRequestsException"},
+        {"shape":"NotFoundException"}
+      ],
+      "documentation":"<p>Delete the tags on a Amazon S3 batch operations job, if any.</p>"
+    },
     "DeletePublicAccessBlock":{
       "name":"DeletePublicAccessBlock",
       "http":{
@@ -38,7 +84,7 @@
         "requestUri":"/v20180820/configuration/publicAccessBlock"
       },
       "input":{"shape":"DeletePublicAccessBlockRequest"},
-      "documentation":"<p>Deletes the block public access configuration for the specified account.</p>"
+      "documentation":"<p>Removes the <code>PublicAccessBlock</code> configuration for an Amazon Web Services account.</p>"
     },
     "DescribeJob":{
       "name":"DescribeJob",
@@ -56,6 +102,51 @@
       ],
       "documentation":"<p>Retrieves the configuration parameters and status for a batch operations job.</p>"
     },
+    "GetAccessPoint":{
+      "name":"GetAccessPoint",
+      "http":{
+        "method":"GET",
+        "requestUri":"/v20180820/accesspoint/{name}"
+      },
+      "input":{"shape":"GetAccessPointRequest"},
+      "output":{"shape":"GetAccessPointResult"},
+      "documentation":"<p>Returns configuration information about the specified access point.</p>"
+    },
+    "GetAccessPointPolicy":{
+      "name":"GetAccessPointPolicy",
+      "http":{
+        "method":"GET",
+        "requestUri":"/v20180820/accesspoint/{name}/policy"
+      },
+      "input":{"shape":"GetAccessPointPolicyRequest"},
+      "output":{"shape":"GetAccessPointPolicyResult"},
+      "documentation":"<p>Returns the access point policy associated with the specified access point.</p>"
+    },
+    "GetAccessPointPolicyStatus":{
+      "name":"GetAccessPointPolicyStatus",
+      "http":{
+        "method":"GET",
+        "requestUri":"/v20180820/accesspoint/{name}/policyStatus"
+      },
+      "input":{"shape":"GetAccessPointPolicyStatusRequest"},
+      "output":{"shape":"GetAccessPointPolicyStatusResult"},
+      "documentation":"<p>Indicates whether the specified access point currently has a policy that allows public access. For more information about public access through access points, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/access-points.html\">Managing Data Access with Amazon S3 Access Points</a> in the <i>Amazon Simple Storage Service Developer Guide</i>.</p>"
+    },
+    "GetJobTagging":{
+      "name":"GetJobTagging",
+      "http":{
+        "method":"GET",
+        "requestUri":"/v20180820/jobs/{id}/tagging"
+      },
+      "input":{"shape":"GetJobTaggingRequest"},
+      "output":{"shape":"GetJobTaggingResult"},
+      "errors":[
+        {"shape":"InternalServiceException"},
+        {"shape":"TooManyRequestsException"},
+        {"shape":"NotFoundException"}
+      ],
+      "documentation":"<p>Retrieve the tags on a Amazon S3 batch operations job.</p>"
+    },
     "GetPublicAccessBlock":{
       "name":"GetPublicAccessBlock",
       "http":{
@@ -67,7 +158,17 @@
       "errors":[
         {"shape":"NoSuchPublicAccessBlockConfiguration"}
       ],
-      "documentation":"<p/>"
+      "documentation":"<p>Retrieves the <code>PublicAccessBlock</code> configuration for an Amazon Web Services account.</p>"
+    },
+    "ListAccessPoints":{
+      "name":"ListAccessPoints",
+      "http":{
+        "method":"GET",
+        "requestUri":"/v20180820/accesspoint"
+      },
+      "input":{"shape":"ListAccessPointsRequest"},
+      "output":{"shape":"ListAccessPointsResult"},
+      "documentation":"<p>Returns a list of the access points currently associated with the specified bucket. You can retrieve up to 1000 access points per call. If the specified bucket has more than 1000 access points (or the number specified in <code>maxResults</code>, whichever is less), then the response will include a continuation token that you can use to list the additional access points.</p>"
     },
     "ListJobs":{
       "name":"ListJobs",
@@ -84,6 +185,39 @@
       ],
       "documentation":"<p>Lists current jobs and jobs that have ended within the last 30 days for the AWS account making the request.</p>"
     },
+    "PutAccessPointPolicy":{
+      "name":"PutAccessPointPolicy",
+      "http":{
+        "method":"PUT",
+        "requestUri":"/v20180820/accesspoint/{name}/policy"
+      },
+      "input":{
+        "shape":"PutAccessPointPolicyRequest",
+        "locationName":"PutAccessPointPolicyRequest",
+        "xmlNamespace":{"uri":"http://awss3control.amazonaws.com/doc/2018-08-20/"}
+      },
+      "documentation":"<p>Associates an access policy with the specified access point. Each access point can have only one policy, so a request made to this API replaces any existing policy associated with the specified access point.</p>"
+    },
+    "PutJobTagging":{
+      "name":"PutJobTagging",
+      "http":{
+        "method":"PUT",
+        "requestUri":"/v20180820/jobs/{id}/tagging"
+      },
+      "input":{
+        "shape":"PutJobTaggingRequest",
+        "locationName":"PutJobTaggingRequest",
+        "xmlNamespace":{"uri":"http://awss3control.amazonaws.com/doc/2018-08-20/"}
+      },
+      "output":{"shape":"PutJobTaggingResult"},
+      "errors":[
+        {"shape":"InternalServiceException"},
+        {"shape":"TooManyRequestsException"},
+        {"shape":"NotFoundException"},
+        {"shape":"TooManyTagsException"}
+      ],
+      "documentation":"<p>Replace the set of tags on a Amazon S3 batch operations job.</p>"
+    },
     "PutPublicAccessBlock":{
       "name":"PutPublicAccessBlock",
       "http":{
@@ -91,7 +225,7 @@
         "requestUri":"/v20180820/configuration/publicAccessBlock"
       },
       "input":{"shape":"PutPublicAccessBlockRequest"},
-      "documentation":"<p/>"
+      "documentation":"<p>Creates or modifies the <code>PublicAccessBlock</code> configuration for an Amazon Web Services account.</p>"
     },
     "UpdateJobPriority":{
       "name":"UpdateJobPriority",
@@ -128,6 +262,45 @@
     }
   },
   "shapes":{
+    "AccessPoint":{
+      "type":"structure",
+      "required":[
+        "Name",
+        "NetworkOrigin",
+        "Bucket"
+      ],
+      "members":{
+        "Name":{
+          "shape":"AccessPointName",
+          "documentation":"<p>The name of this access point.</p>"
+        },
+        "NetworkOrigin":{
+          "shape":"NetworkOrigin",
+          "documentation":"<p>Indicates whether this access point allows access from the public Internet. If <code>VpcConfiguration</code> is specified for this access point, then <code>NetworkOrigin</code> is <code>VPC</code>, and the access point doesn't allow access from the public Internet. Otherwise, <code>NetworkOrigin</code> is <code>Internet</code>, and the access point allows access from the public Internet, subject to the access point and bucket access policies.</p>"
+        },
+        "VpcConfiguration":{
+          "shape":"VpcConfiguration",
+          "documentation":"<p>The Virtual Private Cloud (VPC) configuration for this access point, if one exists.</p>"
+        },
+        "Bucket":{
+          "shape":"BucketName",
+          "documentation":"<p>The name of the bucket associated with this access point.</p>"
+        }
+      },
+      "documentation":"<p>An access point used to access a bucket.</p>"
+    },
+    "AccessPointList":{
+      "type":"list",
+      "member":{
+        "shape":"AccessPoint",
+        "locationName":"AccessPoint"
+      }
+    },
+    "AccessPointName":{
+      "type":"string",
+      "max":50,
+      "min":3
+    },
     "AccountId":{
       "type":"string",
       "max":64
@@ -141,7 +314,43 @@
       "exception":true
     },
     "Boolean":{"type":"boolean"},
+    "BucketName":{
+      "type":"string",
+      "max":255,
+      "min":3
+    },
     "ConfirmationRequired":{"type":"boolean"},
+    "CreateAccessPointRequest":{
+      "type":"structure",
+      "required":[
+        "AccountId",
+        "Name",
+        "Bucket"
+      ],
+      "members":{
+        "AccountId":{
+          "shape":"AccountId",
+          "documentation":"<p>The AWS account ID for the owner of the bucket for which you want to create an access point.</p>",
+          "location":"header",
+          "locationName":"x-amz-account-id"
+        },
+        "Name":{
+          "shape":"AccessPointName",
+          "documentation":"<p>The name you want to assign to this access point.</p>",
+          "location":"uri",
+          "locationName":"name"
+        },
+        "Bucket":{
+          "shape":"BucketName",
+          "documentation":"<p>The name of the bucket that you want to associate this access point with.</p>"
+        },
+        "VpcConfiguration":{
+          "shape":"VpcConfiguration",
+          "documentation":"<p>If you include this field, Amazon S3 restricts access to this access point to requests from the specified Virtual Private Cloud (VPC).</p>"
+        },
+        "PublicAccessBlockConfiguration":{"shape":"PublicAccessBlockConfiguration"}
+      }
+    },
     "CreateJobRequest":{
       "type":"structure",
       "required":[
@@ -194,6 +403,10 @@
         "RoleArn":{
           "shape":"IAMRoleArn",
           "documentation":"<p>The Amazon Resource Name (ARN) for the Identity and Access Management (IAM) Role that batch operations will use to execute this job's operation on each object in the manifest.</p>"
+        },
+        "Tags":{
+          "shape":"S3TagSet",
+          "documentation":"<p>An optional set of tags to associate with the job when it is created.</p>"
         }
       }
     },
@@ -206,13 +419,82 @@
         }
       }
     },
+    "CreationDate":{"type":"timestamp"},
+    "DeleteAccessPointPolicyRequest":{
+      "type":"structure",
+      "required":[
+        "AccountId",
+        "Name"
+      ],
+      "members":{
+        "AccountId":{
+          "shape":"AccountId",
+          "documentation":"<p>The account ID for the account that owns the specified access point.</p>",
+          "location":"header",
+          "locationName":"x-amz-account-id"
+        },
+        "Name":{
+          "shape":"AccessPointName",
+          "documentation":"<p>The name of the access point whose policy you want to delete.</p>",
+          "location":"uri",
+          "locationName":"name"
+        }
+      }
+    },
+    "DeleteAccessPointRequest":{
+      "type":"structure",
+      "required":[
+        "AccountId",
+        "Name"
+      ],
+      "members":{
+        "AccountId":{
+          "shape":"AccountId",
+          "documentation":"<p>The account ID for the account that owns the specified access point.</p>",
+          "location":"header",
+          "locationName":"x-amz-account-id"
+        },
+        "Name":{
+          "shape":"AccessPointName",
+          "documentation":"<p>The name of the access point you want to delete.</p>",
+          "location":"uri",
+          "locationName":"name"
+        }
+      }
+    },
+    "DeleteJobTaggingRequest":{
+      "type":"structure",
+      "required":[
+        "AccountId",
+        "JobId"
+      ],
+      "members":{
+        "AccountId":{
+          "shape":"AccountId",
+          "documentation":"<p>The account ID for the Amazon Web Services account associated with the Amazon S3 batch operations job you want to remove tags from.</p>",
+          "location":"header",
+          "locationName":"x-amz-account-id"
+        },
+        "JobId":{
+          "shape":"JobId",
+          "documentation":"<p>The ID for the job whose tags you want to delete.</p>",
+          "location":"uri",
+          "locationName":"id"
+        }
+      }
+    },
+    "DeleteJobTaggingResult":{
+      "type":"structure",
+      "members":{
+      }
+    },
     "DeletePublicAccessBlockRequest":{
       "type":"structure",
       "required":["AccountId"],
       "members":{
         "AccountId":{
           "shape":"AccountId",
-          "documentation":"<p>The account ID for the AWS account whose block public access configuration you want to delete.</p>",
+          "documentation":"<p>The account ID for the Amazon Web Services account whose <code>PublicAccessBlock</code> configuration you want to remove.</p>",
           "location":"header",
           "locationName":"x-amz-account-id"
         }
@@ -253,12 +535,149 @@
       "max":1024,
       "min":1
     },
+    "GetAccessPointPolicyRequest":{
+      "type":"structure",
+      "required":[
+        "AccountId",
+        "Name"
+      ],
+      "members":{
+        "AccountId":{
+          "shape":"AccountId",
+          "documentation":"<p>The account ID for the account that owns the specified access point.</p>",
+          "location":"header",
+          "locationName":"x-amz-account-id"
+        },
+        "Name":{
+          "shape":"AccessPointName",
+          "documentation":"<p>The name of the access point whose policy you want to retrieve.</p>",
+          "location":"uri",
+          "locationName":"name"
+        }
+      }
+    },
+    "GetAccessPointPolicyResult":{
+      "type":"structure",
+      "members":{
+        "Policy":{
+          "shape":"Policy",
+          "documentation":"<p>The access point policy associated with the specified access point.</p>"
+        }
+      }
+    },
+    "GetAccessPointPolicyStatusRequest":{
+      "type":"structure",
+      "required":[
+        "AccountId",
+        "Name"
+      ],
+      "members":{
+        "AccountId":{
+          "shape":"AccountId",
+          "documentation":"<p>The account ID for the account that owns the specified access point.</p>",
+          "location":"header",
+          "locationName":"x-amz-account-id"
+        },
+        "Name":{
+          "shape":"AccessPointName",
+          "documentation":"<p>The name of the access point whose policy status you want to retrieve.</p>",
+          "location":"uri",
+          "locationName":"name"
+        }
+      }
+    },
+    "GetAccessPointPolicyStatusResult":{
+      "type":"structure",
+      "members":{
+        "PolicyStatus":{
+          "shape":"PolicyStatus",
+          "documentation":"<p>Indicates the current policy status of the specified access point.</p>"
+        }
+      }
+    },
+    "GetAccessPointRequest":{
+      "type":"structure",
+      "required":[
+        "AccountId",
+        "Name"
+      ],
+      "members":{
+        "AccountId":{
+          "shape":"AccountId",
+          "documentation":"<p>The account ID for the account that owns the specified access point.</p>",
+          "location":"header",
+          "locationName":"x-amz-account-id"
+        },
+        "Name":{
+          "shape":"AccessPointName",
+          "documentation":"<p>The name of the access point whose configuration information you want to retrieve.</p>",
+          "location":"uri",
+          "locationName":"name"
+        }
+      }
+    },
+    "GetAccessPointResult":{
+      "type":"structure",
+      "members":{
+        "Name":{
+          "shape":"AccessPointName",
+          "documentation":"<p>The name of the specified access point.</p>"
+        },
+        "Bucket":{
+          "shape":"BucketName",
+          "documentation":"<p>The name of the bucket associated with the specified access point.</p>"
+        },
+        "NetworkOrigin":{
+          "shape":"NetworkOrigin",
+          "documentation":"<p>Indicates whether this access point allows access from the public Internet. If <code>VpcConfiguration</code> is specified for this access point, then <code>NetworkOrigin</code> is <code>VPC</code>, and the access point doesn't allow access from the public Internet. Otherwise, <code>NetworkOrigin</code> is <code>Internet</code>, and the access point allows access from the public Internet, subject to the access point and bucket access policies.</p>"
+        },
+        "VpcConfiguration":{
+          "shape":"VpcConfiguration",
+          "documentation":"<p>Contains the Virtual Private Cloud (VPC) configuration for the specified access point.</p>"
+        },
+        "PublicAccessBlockConfiguration":{"shape":"PublicAccessBlockConfiguration"},
+        "CreationDate":{
+          "shape":"CreationDate",
+          "documentation":"<p>The date and time when the specified access point was created.</p>"
+        }
+      }
+    },
+    "GetJobTaggingRequest":{
+      "type":"structure",
+      "required":[
+        "AccountId",
+        "JobId"
+      ],
+      "members":{
+        "AccountId":{
+          "shape":"AccountId",
+          "documentation":"<p>The account ID for the Amazon Web Services account associated with the Amazon S3 batch operations job you want to retrieve tags for.</p>",
+          "location":"header",
+          "locationName":"x-amz-account-id"
+        },
+        "JobId":{
+          "shape":"JobId",
+          "documentation":"<p>The ID for the job whose tags you want to retrieve.</p>",
+          "location":"uri",
+          "locationName":"id"
+        }
+      }
+    },
+    "GetJobTaggingResult":{
+      "type":"structure",
+      "members":{
+        "Tags":{
+          "shape":"S3TagSet",
+          "documentation":"<p>The set of tags associated with the job.</p>"
+        }
+      }
+    },
     "GetPublicAccessBlockOutput":{
       "type":"structure",
       "members":{
         "PublicAccessBlockConfiguration":{
           "shape":"PublicAccessBlockConfiguration",
-          "documentation":"<p/>"
+          "documentation":"<p>The <code>PublicAccessBlock</code> configuration currently in effect for this Amazon Web Services account.</p>"
         }
       },
       "payload":"PublicAccessBlockConfiguration"
@@ -269,7 +688,7 @@
       "members":{
         "AccountId":{
           "shape":"AccountId",
-          "documentation":"<p/>",
+          "documentation":"<p>The account ID for the Amazon Web Services account whose <code>PublicAccessBlock</code> configuration you want to retrieve.</p>",
           "location":"header",
           "locationName":"x-amz-account-id"
         }
@@ -313,6 +732,7 @@
       "documentation":"<p/>",
       "exception":true
     },
+    "IsPublic":{"type":"boolean"},
     "JobArn":{
       "type":"string",
       "max":1024,
@@ -629,7 +1049,7 @@
       "members":{
         "Bucket":{
           "shape":"S3BucketArnString",
-          "documentation":"<p>The bucket where specified job-completion report will be stored.</p>",
+          "documentation":"<p>The Amazon Resource Name (ARN) for the bucket where specified job-completion report will be stored.</p>",
           "box":true
         },
         "Format":{
@@ -720,6 +1140,49 @@
       },
       "documentation":"<p>Contains the configuration parameters for a <code>Lambda Invoke</code> operation.</p>"
     },
+    "ListAccessPointsRequest":{
+      "type":"structure",
+      "required":["AccountId"],
+      "members":{
+        "AccountId":{
+          "shape":"AccountId",
+          "documentation":"<p>The AWS account ID for owner of the bucket whose access points you want to list.</p>",
+          "location":"header",
+          "locationName":"x-amz-account-id"
+        },
+        "Bucket":{
+          "shape":"BucketName",
+          "documentation":"<p>The name of the bucket whose associated access points you want to list.</p>",
+          "location":"querystring",
+          "locationName":"bucket"
+        },
+        "NextToken":{
+          "shape":"NonEmptyMaxLength1024String",
+          "documentation":"<p>A continuation token. If a previous call to <code>ListAccessPoints</code> returned a continuation token in the <code>NextToken</code> field, then providing that value here causes Amazon S3 to retrieve the next page of results.</p>",
+          "location":"querystring",
+          "locationName":"nextToken"
+        },
+        "MaxResults":{
+          "shape":"MaxResults",
+          "documentation":"<p>The maximum number of access points that you want to include in the list. If the specified bucket has more than this number of access points, then the response will include a continuation token in the <code>NextToken</code> field that you can use to retrieve the next page of access points.</p>",
+          "location":"querystring",
+          "locationName":"maxResults"
+        }
+      }
+    },
+    "ListAccessPointsResult":{
+      "type":"structure",
+      "members":{
+        "AccessPointList":{
+          "shape":"AccessPointList",
+          "documentation":"<p>Contains identification and configuration information for one or more access points associated with the specified bucket.</p>"
+        },
+        "NextToken":{
+          "shape":"NonEmptyMaxLength1024String",
+          "documentation":"<p>If the specified bucket has more access points than can be returned in one call to this API, then this field contains a continuation token that you can provide in subsequent calls to this API to retrieve additional access points.</p>"
+        }
+      }
+    },
     "ListJobsRequest":{
       "type":"structure",
       "required":["AccountId"],
@@ -773,12 +1236,19 @@
       "max":1000,
       "min":1
     },
+    "NetworkOrigin":{
+      "type":"string",
+      "enum":[
+        "Internet",
+        "VPC"
+      ]
+    },
     "NoSuchPublicAccessBlockConfiguration":{
       "type":"structure",
       "members":{
         "Message":{"shape":"NoSuchPublicAccessBlockConfigurationMessage"}
       },
-      "documentation":"<p/>",
+      "documentation":"<p>Amazon S3 throws this exception if you make a <code>GetPublicAccessBlock</code> request against an account that doesn't have a <code>PublicAccessBlockConfiguration</code> set.</p>",
       "error":{"httpStatusCode":404},
       "exception":true
     },
@@ -821,31 +1291,100 @@
         "S3InitiateRestoreObject"
       ]
     },
+    "Policy":{"type":"string"},
+    "PolicyStatus":{
+      "type":"structure",
+      "members":{
+        "IsPublic":{
+          "shape":"IsPublic",
+          "documentation":"<p/>",
+          "locationName":"IsPublic"
+        }
+      },
+      "documentation":"<p>Indicates whether this access point policy is public. For more information about how Amazon S3 evaluates policies to determine whether they are public, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/access-control-block-public-access.html#access-control-block-public-access-policy-status\">The Meaning of \"Public\"</a> in the <i>Amazon Simple Storage Service Developer Guide</i>. </p>"
+    },
     "PublicAccessBlockConfiguration":{
       "type":"structure",
       "members":{
         "BlockPublicAcls":{
           "shape":"Setting",
-          "documentation":"<p/>",
+          "documentation":"<p>Specifies whether Amazon S3 should block public access control lists (ACLs) for buckets in this account. Setting this element to <code>TRUE</code> causes the following behavior:</p> <ul> <li> <p>PUT Bucket acl and PUT Object acl calls fail if the specified ACL is public.</p> </li> <li> <p>PUT Object calls fail if the request includes a public ACL.</p> </li> <li> <p>PUT Bucket calls fail if the request includes a public ACL.</p> </li> </ul> <p>Enabling this setting doesn't affect existing policies or ACLs.</p>",
           "locationName":"BlockPublicAcls"
         },
         "IgnorePublicAcls":{
           "shape":"Setting",
-          "documentation":"<p/>",
+          "documentation":"<p>Specifies whether Amazon S3 should ignore public ACLs for buckets in this account. Setting this element to <code>TRUE</code> causes Amazon S3 to ignore all public ACLs on buckets in this account and any objects that they contain. </p> <p>Enabling this setting doesn't affect the persistence of any existing ACLs and doesn't prevent new public ACLs from being set.</p>",
           "locationName":"IgnorePublicAcls"
         },
         "BlockPublicPolicy":{
           "shape":"Setting",
-          "documentation":"<p/>",
+          "documentation":"<p>Specifies whether Amazon S3 should block public bucket policies for buckets in this account. Setting this element to <code>TRUE</code> causes Amazon S3 to reject calls to PUT Bucket policy if the specified bucket policy allows public access. </p> <p>Enabling this setting doesn't affect existing bucket policies.</p>",
           "locationName":"BlockPublicPolicy"
         },
         "RestrictPublicBuckets":{
           "shape":"Setting",
-          "documentation":"<p/>",
+          "documentation":"<p>Specifies whether Amazon S3 should restrict public bucket policies for buckets in this account. Setting this element to <code>TRUE</code> restricts access to buckets with public policies to only AWS services and authorized users within this account.</p> <p>Enabling this setting doesn't affect previously stored bucket policies, except that public and cross-account access within any public bucket policy, including non-public delegation to specific accounts, is blocked.</p>",
           "locationName":"RestrictPublicBuckets"
         }
       },
-      "documentation":"<p/>"
+      "documentation":"<p>The <code>PublicAccessBlock</code> configuration that you want to apply to this Amazon S3 bucket. You can enable the configuration options in any combination. For more information about when Amazon S3 considers a bucket or object public, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/access-control-block-public-access.html#access-control-block-public-access-policy-status\">The Meaning of \"Public\"</a> in the Amazon Simple Storage Service Developer Guide.</p>"
+    },
+    "PutAccessPointPolicyRequest":{
+      "type":"structure",
+      "required":[
+        "AccountId",
+        "Name",
+        "Policy"
+      ],
+      "members":{
+        "AccountId":{
+          "shape":"AccountId",
+          "documentation":"<p>The AWS account ID for owner of the bucket associated with the specified access point.</p>",
+          "location":"header",
+          "locationName":"x-amz-account-id"
+        },
+        "Name":{
+          "shape":"AccessPointName",
+          "documentation":"<p>The name of the access point that you want to associate with the specified policy.</p>",
+          "location":"uri",
+          "locationName":"name"
+        },
+        "Policy":{
+          "shape":"Policy",
+          "documentation":"<p>The policy that you want to apply to the specified access point. For more information about access point policies, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/access-points.html\">Managing Data Access with Amazon S3 Access Points</a> in the <i>Amazon Simple Storage Service Developer Guide</i>.</p>"
+        }
+      }
+    },
+    "PutJobTaggingRequest":{
+      "type":"structure",
+      "required":[
+        "AccountId",
+        "JobId",
+        "Tags"
+      ],
+      "members":{
+        "AccountId":{
+          "shape":"AccountId",
+          "documentation":"<p>The account ID for the Amazon Web Services account associated with the Amazon S3 batch operations job you want to replace tags on.</p>",
+          "location":"header",
+          "locationName":"x-amz-account-id"
+        },
+        "JobId":{
+          "shape":"JobId",
+          "documentation":"<p>The ID for the job whose tags you want to replace.</p>",
+          "location":"uri",
+          "locationName":"id"
+        },
+        "Tags":{
+          "shape":"S3TagSet",
+          "documentation":"<p>The set of tags to associate with the job.</p>"
+        }
+      }
+    },
+    "PutJobTaggingResult":{
+      "type":"structure",
+      "members":{
+      }
     },
     "PutPublicAccessBlockRequest":{
       "type":"structure",
@@ -856,13 +1395,13 @@
       "members":{
         "PublicAccessBlockConfiguration":{
           "shape":"PublicAccessBlockConfiguration",
-          "documentation":"<p/>",
+          "documentation":"<p>The <code>PublicAccessBlock</code> configuration that you want to apply to the specified Amazon Web Services account.</p>",
           "locationName":"PublicAccessBlockConfiguration",
           "xmlNamespace":{"uri":"http://awss3control.amazonaws.com/doc/2018-08-20/"}
         },
         "AccountId":{
           "shape":"AccountId",
-          "documentation":"<p/>",
+          "documentation":"<p>The account ID for the Amazon Web Services account whose <code>PublicAccessBlock</code> configuration you want to set.</p>",
           "location":"header",
           "locationName":"x-amz-account-id"
         }
@@ -986,10 +1525,22 @@
           "shape":"KmsKeyArnString",
           "documentation":"<p/>"
         },
-        "TargetKeyPrefix":{"shape":"NonEmptyMaxLength1024String"},
-        "ObjectLockLegalHoldStatus":{"shape":"S3ObjectLockLegalHoldStatus"},
-        "ObjectLockMode":{"shape":"S3ObjectLockMode"},
-        "ObjectLockRetainUntilDate":{"shape":"TimeStamp"}
+        "TargetKeyPrefix":{
+          "shape":"NonEmptyMaxLength1024String",
+          "documentation":"<p/>"
+        },
+        "ObjectLockLegalHoldStatus":{
+          "shape":"S3ObjectLockLegalHoldStatus",
+          "documentation":"<p/>"
+        },
+        "ObjectLockMode":{
+          "shape":"S3ObjectLockMode",
+          "documentation":"<p/>"
+        },
+        "ObjectLockRetainUntilDate":{
+          "shape":"TimeStamp",
+          "documentation":"<p/>"
+        }
       },
       "documentation":"<p>Contains the configuration parameters for a PUT Copy object operation. Amazon S3 batch operations passes each value through to the underlying PUT Copy object API. For more information about the parameters for this operation, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/API/RESTObjectCOPY.html\">PUT Object - Copy</a>.</p>"
     },
@@ -1251,6 +1802,13 @@
       "documentation":"<p/>",
       "exception":true
     },
+    "TooManyTagsException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"ExceptionMessage"}
+      },
+      "exception":true
+    },
     "UpdateJobPriorityRequest":{
       "type":"structure",
       "required":[
@@ -1346,6 +1904,22 @@
           "documentation":"<p>The reason that the specified job's status was updated.</p>"
         }
       }
+    },
+    "VpcConfiguration":{
+      "type":"structure",
+      "required":["VpcId"],
+      "members":{
+        "VpcId":{
+          "shape":"VpcId",
+          "documentation":"<p>If this field is specified, this access point will only allow connections from the specified VPC ID.</p>"
+        }
+      },
+      "documentation":"<p>The Virtual Private Cloud (VPC) configuration for an access point.</p>"
+    },
+    "VpcId":{
+      "type":"string",
+      "max":1024,
+      "min":1
     }
   },
   "documentation":"<p> AWS S3 Control provides access to Amazon S3 control plane operations. </p>"
diff --git a/services/s3control/src/test/java/software/amazon/awssdk/services/s3control/internal/interceptors/EndpointAddressInterceptorTest.java b/services/s3control/src/test/java/software/amazon/awssdk/services/s3control/internal/interceptors/EndpointAddressInterceptorTest.java
index b78646701afc..a064ebaa40fa 100644
--- a/services/s3control/src/test/java/software/amazon/awssdk/services/s3control/internal/interceptors/EndpointAddressInterceptorTest.java
+++ b/services/s3control/src/test/java/software/amazon/awssdk/services/s3control/internal/interceptors/EndpointAddressInterceptorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -15,6 +15,7 @@
 package software.amazon.awssdk.services.s3control.internal.interceptors;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import java.util.Optional;
 import org.junit.Before;
@@ -50,6 +51,19 @@ public void setup() {
                                     .build();
     }
 
+    @Test
+    public void modifyHttpRequest_illegalCharacterInAccountId_throwsException() {
+        SdkHttpRequest modifiedRequest = SdkHttpFullRequest.builder()
+                                                           .appendHeader(X_AMZ_ACCOUNT_ID, "1234/#")
+                                                           .protocol(Protocol.HTTPS.toString())
+                                                           .method(SdkHttpMethod.POST)
+                                                           .host(S3ControlClient.serviceMetadata().endpointFor(Region.US_EAST_1).toString())
+                                                           .build();
+        EndpointAddressInterceptor interceptor = new EndpointAddressInterceptor();
+        assertThatThrownBy(() -> interceptor.modifyHttpRequest(new Context(modifiedRequest), new ExecutionAttributes()))
+            .isInstanceOf(IllegalArgumentException.class).hasMessageContaining("account id");
+    }
+
     @Test
     public void modifyHttpRequest_ResolvesCorrectHost_StandardSettings() {
         EndpointAddressInterceptor interceptor = new EndpointAddressInterceptor();
diff --git a/services/s3control/src/test/java/software/amazon/awssdk/services/s3control/internal/interceptors/PayloadSigningInterceptorTest.java b/services/s3control/src/test/java/software/amazon/awssdk/services/s3control/internal/interceptors/PayloadSigningInterceptorTest.java
index 6e0b39d1d8aa..f64cb21f188a 100644
--- a/services/s3control/src/test/java/software/amazon/awssdk/services/s3control/internal/interceptors/PayloadSigningInterceptorTest.java
+++ b/services/s3control/src/test/java/software/amazon/awssdk/services/s3control/internal/interceptors/PayloadSigningInterceptorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/sagemaker/pom.xml b/services/sagemaker/pom.xml
index 603171a8c593..40f673163d12 100644
--- a/services/sagemaker/pom.xml
+++ b/services/sagemaker/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>services</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>sagemaker</artifactId>
diff --git a/services/sagemaker/src/main/resources/codegen-resources/paginators-1.json b/services/sagemaker/src/main/resources/codegen-resources/paginators-1.json
index 45db07863cb9..0d5eb8803924 100644
--- a/services/sagemaker/src/main/resources/codegen-resources/paginators-1.json
+++ b/services/sagemaker/src/main/resources/codegen-resources/paginators-1.json
@@ -1,84 +1,196 @@
 {
   "pagination": {
+    "ListAlgorithms": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "MaxResults",
+      "result_key": "AlgorithmSummaryList"
+    },
+    "ListApps": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "MaxResults",
+      "result_key": "Apps"
+    },
+    "ListAutoMLJobs": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "MaxResults",
+      "result_key": "AutoMLJobSummaries"
+    },
+    "ListCandidatesForAutoMLJob": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "MaxResults",
+      "result_key": "Candidates"
+    },
+    "ListCodeRepositories": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "MaxResults",
+      "result_key": "CodeRepositorySummaryList"
+    },
     "ListCompilationJobs": {
       "input_token": "NextToken",
       "output_token": "NextToken",
-      "limit_key": "MaxResults"
+      "limit_key": "MaxResults",
+      "result_key": "CompilationJobSummaries"
+    },
+    "ListDomains": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "MaxResults",
+      "result_key": "Domains"
     },
     "ListEndpointConfigs": {
       "input_token": "NextToken",
       "output_token": "NextToken",
-      "limit_key": "MaxResults"
+      "limit_key": "MaxResults",
+      "result_key": "EndpointConfigs"
     },
     "ListEndpoints": {
       "input_token": "NextToken",
       "output_token": "NextToken",
-      "limit_key": "MaxResults"
+      "limit_key": "MaxResults",
+      "result_key": "Endpoints"
+    },
+    "ListExperiments": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "MaxResults",
+      "result_key": "ExperimentSummaries"
+    },
+    "ListFlowDefinitions": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "MaxResults",
+      "result_key": "FlowDefinitionSummaries"
+    },
+    "ListHumanTaskUis": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "MaxResults",
+      "result_key": "HumanTaskUiSummaries"
     },
     "ListHyperParameterTuningJobs": {
       "input_token": "NextToken",
       "output_token": "NextToken",
-      "limit_key": "MaxResults"
+      "limit_key": "MaxResults",
+      "result_key": "HyperParameterTuningJobSummaries"
     },
     "ListLabelingJobs": {
       "input_token": "NextToken",
       "output_token": "NextToken",
-      "limit_key": "MaxResults"
+      "limit_key": "MaxResults",
+      "result_key": "LabelingJobSummaryList"
     },
     "ListLabelingJobsForWorkteam": {
       "input_token": "NextToken",
       "output_token": "NextToken",
-      "limit_key": "MaxResults"
+      "limit_key": "MaxResults",
+      "result_key": "LabelingJobSummaryList"
+    },
+    "ListModelPackages": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "MaxResults",
+      "result_key": "ModelPackageSummaryList"
     },
     "ListModels": {
       "input_token": "NextToken",
       "output_token": "NextToken",
-      "limit_key": "MaxResults"
+      "limit_key": "MaxResults",
+      "result_key": "Models"
+    },
+    "ListMonitoringExecutions": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "MaxResults",
+      "result_key": "MonitoringExecutionSummaries"
+    },
+    "ListMonitoringSchedules": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "MaxResults",
+      "result_key": "MonitoringScheduleSummaries"
     },
     "ListNotebookInstanceLifecycleConfigs": {
       "input_token": "NextToken",
       "output_token": "NextToken",
-      "limit_key": "MaxResults"
+      "limit_key": "MaxResults",
+      "result_key": "NotebookInstanceLifecycleConfigs"
     },
     "ListNotebookInstances": {
       "input_token": "NextToken",
       "output_token": "NextToken",
-      "limit_key": "MaxResults"
+      "limit_key": "MaxResults",
+      "result_key": "NotebookInstances"
+    },
+    "ListProcessingJobs": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "MaxResults",
+      "result_key": "ProcessingJobSummaries"
     },
     "ListSubscribedWorkteams": {
       "input_token": "NextToken",
       "output_token": "NextToken",
-      "limit_key": "MaxResults"
+      "limit_key": "MaxResults",
+      "result_key": "SubscribedWorkteams"
     },
     "ListTags": {
       "input_token": "NextToken",
       "output_token": "NextToken",
-      "limit_key": "MaxResults"
+      "limit_key": "MaxResults",
+      "result_key": "Tags"
     },
     "ListTrainingJobs": {
       "input_token": "NextToken",
       "output_token": "NextToken",
-      "limit_key": "MaxResults"
+      "limit_key": "MaxResults",
+      "result_key": "TrainingJobSummaries"
     },
     "ListTrainingJobsForHyperParameterTuningJob": {
       "input_token": "NextToken",
       "output_token": "NextToken",
-      "limit_key": "MaxResults"
+      "limit_key": "MaxResults",
+      "result_key": "TrainingJobSummaries"
     },
     "ListTransformJobs": {
       "input_token": "NextToken",
       "output_token": "NextToken",
-      "limit_key": "MaxResults"
+      "limit_key": "MaxResults",
+      "result_key": "TransformJobSummaries"
+    },
+    "ListTrialComponents": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "MaxResults",
+      "result_key": "TrialComponentSummaries"
+    },
+    "ListTrials": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "MaxResults",
+      "result_key": "TrialSummaries"
+    },
+    "ListUserProfiles": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "MaxResults",
+      "result_key": "UserProfiles"
     },
     "ListWorkteams": {
       "input_token": "NextToken",
       "output_token": "NextToken",
-      "limit_key": "MaxResults"
+      "limit_key": "MaxResults",
+      "result_key": "Workteams"
     },
     "Search": {
       "input_token": "NextToken",
       "output_token": "NextToken",
-      "limit_key": "MaxResults"
+      "limit_key": "MaxResults",
+      "result_key": "Results"
     }
   }
 }
diff --git a/services/sagemaker/src/main/resources/codegen-resources/service-2.json b/services/sagemaker/src/main/resources/codegen-resources/service-2.json
index 47335c7dce52..3a007f8e1679 100644
--- a/services/sagemaker/src/main/resources/codegen-resources/service-2.json
+++ b/services/sagemaker/src/main/resources/codegen-resources/service-2.json
@@ -24,6 +24,20 @@
       "output":{"shape":"AddTagsOutput"},
       "documentation":"<p>Adds or overwrites one or more tags for the specified Amazon SageMaker resource. You can add tags to notebook instances, training jobs, hyperparameter tuning jobs, batch transform jobs, models, labeling jobs, work teams, endpoint configurations, and endpoints.</p> <p>Each tag consists of a key and an optional value. Tag keys must be unique per resource. For more information about tags, see For more information, see <a href=\"https://aws.amazon.com/answers/account-management/aws-tagging-strategies/\">AWS Tagging Strategies</a>.</p> <note> <p>Tags that you add to a hyperparameter tuning job by calling this API are also added to any training jobs that the hyperparameter tuning job launches after you call this API, but not to training jobs that the hyperparameter tuning job launched before you called this API. To make sure that the tags associated with a hyperparameter tuning job are also added to all training jobs that the hyperparameter tuning job launches, add the tags when you first create the tuning job by specifying them in the <code>Tags</code> parameter of <a>CreateHyperParameterTuningJob</a> </p> </note>"
     },
+    "AssociateTrialComponent":{
+      "name":"AssociateTrialComponent",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"AssociateTrialComponentRequest"},
+      "output":{"shape":"AssociateTrialComponentResponse"},
+      "errors":[
+        {"shape":"ResourceNotFound"},
+        {"shape":"ResourceLimitExceeded"}
+      ],
+      "documentation":"<p>Associates a trial component with a trial. A trial component can be associated with multiple trials. To disassociate a trial component from a trial, call the <a>DisassociateTrialComponent</a> API.</p>"
+    },
     "CreateAlgorithm":{
       "name":"CreateAlgorithm",
       "http":{
@@ -34,6 +48,34 @@
       "output":{"shape":"CreateAlgorithmOutput"},
       "documentation":"<p>Create a machine learning algorithm that you can use in Amazon SageMaker and list in the AWS Marketplace.</p>"
     },
+    "CreateApp":{
+      "name":"CreateApp",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"CreateAppRequest"},
+      "output":{"shape":"CreateAppResponse"},
+      "errors":[
+        {"shape":"ResourceLimitExceeded"},
+        {"shape":"ResourceInUse"}
+      ],
+      "documentation":"<p>Creates a running App for the specified UserProfile. Supported Apps are JupyterServer and KernelGateway. This operation is automatically invoked by Amazon SageMaker Amazon SageMaker Studio (Studio) upon access to the associated Studio Domain, and when new kernel configurations are selected by the user. A user may have multiple Apps active simultaneously. Apps will automatically terminate and be deleted when stopped from within Studio, or when the DeleteApp API is manually called. UserProfiles are limited to 5 concurrently running Apps at a time.</p>"
+    },
+    "CreateAutoMLJob":{
+      "name":"CreateAutoMLJob",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"CreateAutoMLJobRequest"},
+      "output":{"shape":"CreateAutoMLJobResponse"},
+      "errors":[
+        {"shape":"ResourceInUse"},
+        {"shape":"ResourceLimitExceeded"}
+      ],
+      "documentation":"<p>Creates an AutoPilot job.</p> <p>After you run an AutoPilot job, you can find the best performing model by calling , and then deploy that model by following the steps described in <a href=\"https://docs.aws.amazon.com/sagemaker/latest/dg/ex1-deploy-model.html\">Step 6.1: Deploy the Model to Amazon SageMaker Hosting Services</a>.</p> <p>For information about how to use AutoPilot, see <a href=\"https://docs.aws.amazon.com/sagemaker/latest/dg/autopilot-automate-model-development.html\">Use AutoPilot to Automate Model Development</a>.</p>"
+    },
     "CreateCodeRepository":{
       "name":"CreateCodeRepository",
       "http":{
@@ -58,6 +100,20 @@
       ],
       "documentation":"<p>Starts a model compilation job. After the model has been compiled, Amazon SageMaker saves the resulting model artifacts to an Amazon Simple Storage Service (Amazon S3) bucket that you specify. </p> <p>If you choose to host your model using Amazon SageMaker hosting services, you can use the resulting model artifacts as part of the model. You can also use the artifacts with AWS IoT Greengrass. In that case, deploy them as an ML resource.</p> <p>In the request body, you provide the following:</p> <ul> <li> <p>A name for the compilation job</p> </li> <li> <p> Information about the input model artifacts </p> </li> <li> <p>The output location for the compiled model and the device (target) that the model runs on </p> </li> <li> <p> <code>The Amazon Resource Name (ARN) of the IAM role that Amazon SageMaker assumes to perform the model compilation job</code> </p> </li> </ul> <p>You can also provide a <code>Tag</code> to track the model compilation job's resource use and costs. The response body contains the <code>CompilationJobArn</code> for the compiled job.</p> <p>To stop a model compilation job, use <a>StopCompilationJob</a>. To get information about a particular model compilation job, use <a>DescribeCompilationJob</a>. To get information about multiple model compilation jobs, use <a>ListCompilationJobs</a>.</p>"
     },
+    "CreateDomain":{
+      "name":"CreateDomain",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"CreateDomainRequest"},
+      "output":{"shape":"CreateDomainResponse"},
+      "errors":[
+        {"shape":"ResourceLimitExceeded"},
+        {"shape":"ResourceInUse"}
+      ],
+      "documentation":"<p>Creates a Domain for Amazon SageMaker Amazon SageMaker Studio (Studio), which can be accessed by end-users in a web browser. A Domain has an associated directory, list of authorized users, and a variety of security, application, policies, and Amazon Virtual Private Cloud configurations. An AWS account is limited to one Domain, per region. Users within a domain can share notebook files and other artifacts with each other. When a Domain is created, an Amazon Elastic File System (EFS) is also created for use by all of the users within the Domain. Each user receives a private home directory within the EFS for notebooks, Git repositories, and data files. </p>"
+    },
     "CreateEndpoint":{
       "name":"CreateEndpoint",
       "http":{
@@ -69,7 +125,7 @@
       "errors":[
         {"shape":"ResourceLimitExceeded"}
       ],
-      "documentation":"<p>Creates an endpoint using the endpoint configuration specified in the request. Amazon SageMaker uses the endpoint to provision resources and deploy models. You create the endpoint configuration with the <a href=\"https://docs.aws.amazon.com/sagemaker/latest/dg/API_CreateEndpointConfig.html\">CreateEndpointConfig</a> API. </p> <note> <p> Use this API only for hosting models using Amazon SageMaker hosting services. </p> <p> You must not delete an <code>EndpointConfig</code> in use by an endpoint that is live or while the <code>UpdateEndpoint</code> or <code>CreateEndpoint</code> operations are being performed on the endpoint. To update an endpoint, you must create a new <code>EndpointConfig</code>.</p> </note> <p>The endpoint name must be unique within an AWS Region in your AWS account. </p> <p>When it receives the request, Amazon SageMaker creates the endpoint, launches the resources (ML compute instances), and deploys the model(s) on them. </p> <p>When Amazon SageMaker receives the request, it sets the endpoint status to <code>Creating</code>. After it creates the endpoint, it sets the status to <code>InService</code>. Amazon SageMaker can then process incoming requests for inferences. To check the status of an endpoint, use the <a href=\"https://docs.aws.amazon.com/sagemaker/latest/dg/API_DescribeEndpoint.html\">DescribeEndpoint</a> API.</p> <p>For an example, see <a href=\"https://docs.aws.amazon.com/sagemaker/latest/dg/ex1.html\">Exercise 1: Using the K-Means Algorithm Provided by Amazon SageMaker</a>. </p> <p>If any of the models hosted at this endpoint get model data from an Amazon S3 location, Amazon SageMaker uses AWS Security Token Service to download model artifacts from the S3 path you provided. AWS STS is activated in your IAM user account by default. If you previously deactivated AWS STS for a region, you need to reactivate AWS STS for that region. For more information, see <a href=\"IAM/latest/UserGuide/id_credentials_temp_enable-regions.html\">Activating and Deactivating AWS STS i an AWS Region</a> in the <i>AWS Identity and Access Management User Guide</i>.</p>"
+      "documentation":"<p>Creates an endpoint using the endpoint configuration specified in the request. Amazon SageMaker uses the endpoint to provision resources and deploy models. You create the endpoint configuration with the <a>CreateEndpointConfig</a> API. </p> <p> Use this API to deploy models using Amazon SageMaker hosting services. </p> <p>For an example that calls this method when deploying a model to Amazon SageMaker hosting services, see <a href=\"https://docs.aws.amazon.com/sagemaker/latest/dg/ex1-deploy-model.html#ex1-deploy-model-boto\">Deploy the Model to Amazon SageMaker Hosting Services (AWS SDK for Python (Boto 3)).</a> </p> <note> <p> You must not delete an <code>EndpointConfig</code> that is in use by an endpoint that is live or while the <code>UpdateEndpoint</code> or <code>CreateEndpoint</code> operations are being performed on the endpoint. To update an endpoint, you must create a new <code>EndpointConfig</code>.</p> </note> <p>The endpoint name must be unique within an AWS Region in your AWS account. </p> <p>When it receives the request, Amazon SageMaker creates the endpoint, launches the resources (ML compute instances), and deploys the model(s) on them. </p> <p>When Amazon SageMaker receives the request, it sets the endpoint status to <code>Creating</code>. After it creates the endpoint, it sets the status to <code>InService</code>. Amazon SageMaker can then process incoming requests for inferences. To check the status of an endpoint, use the <a>DescribeEndpoint</a> API.</p> <p>If any of the models hosted at this endpoint get model data from an Amazon S3 location, Amazon SageMaker uses AWS Security Token Service to download model artifacts from the S3 path you provided. AWS STS is activated in your IAM user account by default. If you previously deactivated AWS STS for a region, you need to reactivate AWS STS for that region. For more information, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_enable-regions.html\">Activating and Deactivating AWS STS in an AWS Region</a> in the <i>AWS Identity and Access Management User Guide</i>.</p>"
     },
     "CreateEndpointConfig":{
       "name":"CreateEndpointConfig",
@@ -82,7 +138,48 @@
       "errors":[
         {"shape":"ResourceLimitExceeded"}
       ],
-      "documentation":"<p>Creates an endpoint configuration that Amazon SageMaker hosting services uses to deploy models. In the configuration, you identify one or more models, created using the <code>CreateModel</code> API, to deploy and the resources that you want Amazon SageMaker to provision. Then you call the <a href=\"https://docs.aws.amazon.com/sagemaker/latest/dg/API_CreateEndpoint.html\">CreateEndpoint</a> API.</p> <note> <p> Use this API only if you want to use Amazon SageMaker hosting services to deploy models into production. </p> </note> <p>In the request, you define one or more <code>ProductionVariant</code>s, each of which identifies a model. Each <code>ProductionVariant</code> parameter also describes the resources that you want Amazon SageMaker to provision. This includes the number and type of ML compute instances to deploy. </p> <p>If you are hosting multiple models, you also assign a <code>VariantWeight</code> to specify how much traffic you want to allocate to each model. For example, suppose that you want to host two models, A and B, and you assign traffic weight 2 for model A and 1 for model B. Amazon SageMaker distributes two-thirds of the traffic to Model A, and one-third to model B. </p>"
+      "documentation":"<p>Creates an endpoint configuration that Amazon SageMaker hosting services uses to deploy models. In the configuration, you identify one or more models, created using the <code>CreateModel</code> API, to deploy and the resources that you want Amazon SageMaker to provision. Then you call the <a>CreateEndpoint</a> API.</p> <note> <p> Use this API if you want to use Amazon SageMaker hosting services to deploy models into production. </p> </note> <p>In the request, you define a <code>ProductionVariant</code>, for each model that you want to deploy. Each <code>ProductionVariant</code> parameter also describes the resources that you want Amazon SageMaker to provision. This includes the number and type of ML compute instances to deploy. </p> <p>If you are hosting multiple models, you also assign a <code>VariantWeight</code> to specify how much traffic you want to allocate to each model. For example, suppose that you want to host two models, A and B, and you assign traffic weight 2 for model A and 1 for model B. Amazon SageMaker distributes two-thirds of the traffic to Model A, and one-third to model B. </p> <p>For an example that calls this method when deploying a model to Amazon SageMaker hosting services, see <a href=\"https://docs.aws.amazon.com/sagemaker/latest/dg/ex1-deploy-model.html#ex1-deploy-model-boto\">Deploy the Model to Amazon SageMaker Hosting Services (AWS SDK for Python (Boto 3)).</a> </p>"
+    },
+    "CreateExperiment":{
+      "name":"CreateExperiment",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"CreateExperimentRequest"},
+      "output":{"shape":"CreateExperimentResponse"},
+      "errors":[
+        {"shape":"ResourceLimitExceeded"}
+      ],
+      "documentation":"<p>Creates an Amazon SageMaker <i>experiment</i>. An experiment is a collection of <i>trials</i> that are observed, compared and evaluated as a group. A trial is a set of steps, called <i>trial components</i>, that produce a machine learning model.</p> <p>The goal of an experiment is to determine the components that produce the best model. Multiple trials are performed, each one isolating and measuring the impact of a change to one or more inputs, while keeping the remaining inputs constant.</p> <p>When you use Amazon SageMaker Studio or the Amazon SageMaker Python SDK, all experiments, trials, and trial components are automatically tracked, logged, and indexed. When you use the AWS SDK for Python (Boto), you must use the logging APIs provided by the SDK.</p> <p>You can add tags to experiments, trials, trial components and then use the <a>Search</a> API to search for the tags.</p> <p>To add a description to an experiment, specify the optional <code>Description</code> parameter. To add a description later, or to change the description, call the <a>UpdateExperiment</a> API.</p> <p>To get a list of all your experiments, call the <a>ListExperiments</a> API. To view an experiment's properties, call the <a>DescribeExperiment</a> API. To get a list of all the trials associated with an experiment, call the <a>ListTrials</a> API. To create a trial call the <a>CreateTrial</a> API.</p>"
+    },
+    "CreateFlowDefinition":{
+      "name":"CreateFlowDefinition",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"CreateFlowDefinitionRequest"},
+      "output":{"shape":"CreateFlowDefinitionResponse"},
+      "errors":[
+        {"shape":"ResourceLimitExceeded"},
+        {"shape":"ResourceInUse"}
+      ],
+      "documentation":"<p>Creates a flow definition.</p>"
+    },
+    "CreateHumanTaskUi":{
+      "name":"CreateHumanTaskUi",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"CreateHumanTaskUiRequest"},
+      "output":{"shape":"CreateHumanTaskUiResponse"},
+      "errors":[
+        {"shape":"ResourceLimitExceeded"},
+        {"shape":"ResourceInUse"}
+      ],
+      "documentation":"<p>Defines the settings you will use for the human review workflow user interface. Reviewers will see a three-panel interface with an instruction area, the item to review, and an input area.</p>"
     },
     "CreateHyperParameterTuningJob":{
       "name":"CreateHyperParameterTuningJob",
@@ -123,7 +220,7 @@
       "errors":[
         {"shape":"ResourceLimitExceeded"}
       ],
-      "documentation":"<p>Creates a model in Amazon SageMaker. In the request, you name the model and describe a primary container. For the primary container, you specify the docker image containing inference code, artifacts (from prior training), and custom environment map that the inference code uses when you deploy the model for predictions.</p> <p>Use this API to create a model if you want to use Amazon SageMaker hosting services or run a batch transform job.</p> <p>To host your model, you create an endpoint configuration with the <code>CreateEndpointConfig</code> API, and then create an endpoint with the <code>CreateEndpoint</code> API. Amazon SageMaker then deploys all of the containers that you defined for the model in the hosting environment. </p> <p>To run a batch transform using your model, you start a job with the <code>CreateTransformJob</code> API. Amazon SageMaker uses your model and your dataset to get inferences which are then saved to a specified S3 location.</p> <p>In the <code>CreateModel</code> request, you must define a container with the <code>PrimaryContainer</code> parameter.</p> <p>In the request, you also provide an IAM role that Amazon SageMaker can assume to access model artifacts and docker image for deployment on ML compute hosting instances or for batch transform jobs. In addition, you also use the IAM role to manage permissions the inference code needs. For example, if the inference code access any other AWS resources, you grant necessary permissions via this role.</p>"
+      "documentation":"<p>Creates a model in Amazon SageMaker. In the request, you name the model and describe a primary container. For the primary container, you specify the Docker image that contains inference code, artifacts (from prior training), and a custom environment map that the inference code uses when you deploy the model for predictions.</p> <p>Use this API to create a model if you want to use Amazon SageMaker hosting services or run a batch transform job.</p> <p>To host your model, you create an endpoint configuration with the <code>CreateEndpointConfig</code> API, and then create an endpoint with the <code>CreateEndpoint</code> API. Amazon SageMaker then deploys all of the containers that you defined for the model in the hosting environment. </p> <p>For an example that calls this method when deploying a model to Amazon SageMaker hosting services, see <a href=\"https://docs.aws.amazon.com/sagemaker/latest/dg/ex1-deploy-model.html#ex1-deploy-model-boto\">Deploy the Model to Amazon SageMaker Hosting Services (AWS SDK for Python (Boto 3)).</a> </p> <p>To run a batch transform using your model, you start a job with the <code>CreateTransformJob</code> API. Amazon SageMaker uses your model and your dataset to get inferences which are then saved to a specified S3 location.</p> <p>In the <code>CreateModel</code> request, you must define a container with the <code>PrimaryContainer</code> parameter.</p> <p>In the request, you also provide an IAM role that Amazon SageMaker can assume to access model artifacts and docker image for deployment on ML compute hosting instances or for batch transform jobs. In addition, you also use the IAM role to manage permissions the inference code needs. For example, if the inference code access any other AWS resources, you grant necessary permissions via this role.</p>"
     },
     "CreateModelPackage":{
       "name":"CreateModelPackage",
@@ -135,6 +232,20 @@
       "output":{"shape":"CreateModelPackageOutput"},
       "documentation":"<p>Creates a model package that you can use to create Amazon SageMaker models or list on AWS Marketplace. Buyers can subscribe to model packages listed on AWS Marketplace to create models in Amazon SageMaker.</p> <p>To create a model package by specifying a Docker container that contains your inference code and the Amazon S3 location of your model artifacts, provide values for <code>InferenceSpecification</code>. To create a model from an algorithm resource that you created or subscribed to in AWS Marketplace, provide a value for <code>SourceAlgorithmSpecification</code>.</p>"
     },
+    "CreateMonitoringSchedule":{
+      "name":"CreateMonitoringSchedule",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"CreateMonitoringScheduleRequest"},
+      "output":{"shape":"CreateMonitoringScheduleResponse"},
+      "errors":[
+        {"shape":"ResourceLimitExceeded"},
+        {"shape":"ResourceInUse"}
+      ],
+      "documentation":"<p>Creates a schedule that regularly starts Amazon SageMaker Processing Jobs to monitor the data captured for an Amazon SageMaker Endoint.</p>"
+    },
     "CreateNotebookInstance":{
       "name":"CreateNotebookInstance",
       "http":{
@@ -161,6 +272,19 @@
       ],
       "documentation":"<p>Creates a lifecycle configuration that you can associate with a notebook instance. A <i>lifecycle configuration</i> is a collection of shell scripts that run when you create or start a notebook instance.</p> <p>Each lifecycle configuration script has a limit of 16384 characters.</p> <p>The value of the <code>$PATH</code> environment variable that is available to both scripts is <code>/sbin:bin:/usr/sbin:/usr/bin</code>.</p> <p>View CloudWatch Logs for notebook instance lifecycle configurations in log group <code>/aws/sagemaker/NotebookInstances</code> in log stream <code>[notebook-instance-name]/[LifecycleConfigHook]</code>.</p> <p>Lifecycle configuration scripts cannot run for longer than 5 minutes. If a script runs for longer than 5 minutes, it fails and the notebook instance is not created or started.</p> <p>For information about notebook instance lifestyle configurations, see <a href=\"https://docs.aws.amazon.com/sagemaker/latest/dg/notebook-lifecycle-config.html\">Step 2.1: (Optional) Customize a Notebook Instance</a>.</p>"
     },
+    "CreatePresignedDomainUrl":{
+      "name":"CreatePresignedDomainUrl",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"CreatePresignedDomainUrlRequest"},
+      "output":{"shape":"CreatePresignedDomainUrlResponse"},
+      "errors":[
+        {"shape":"ResourceNotFound"}
+      ],
+      "documentation":"<p>Creates a URL for a specified UserProfile in a Domain. When accessed in a web browser, the user will be automatically signed in to Amazon SageMaker Amazon SageMaker Studio (Studio), and granted access to all of the Apps and files associated with that Amazon Elastic File System (EFS). This operation can only be called when AuthMode equals IAM. </p>"
+    },
     "CreatePresignedNotebookInstanceUrl":{
       "name":"CreatePresignedNotebookInstanceUrl",
       "http":{
@@ -169,7 +293,22 @@
       },
       "input":{"shape":"CreatePresignedNotebookInstanceUrlInput"},
       "output":{"shape":"CreatePresignedNotebookInstanceUrlOutput"},
-      "documentation":"<p>Returns a URL that you can use to connect to the Jupyter server from a notebook instance. In the Amazon SageMaker console, when you choose <code>Open</code> next to a notebook instance, Amazon SageMaker opens a new tab showing the Jupyter server home page from the notebook instance. The console uses this API to get the URL and show the page.</p> <p>IAM authorization policies for this API are also enforced for every HTTP request and WebSocket frame that attempts to connect to the notebook instance.For example, you can restrict access to this API and to the URL that it returns to a list of IP addresses that you specify. Use the <code>NotIpAddress</code> condition operator and the <code>aws:SourceIP</code> condition context key to specify the list of IP addresses that you want to have access to the notebook instance. For more information, see <a href=\"https://docs.aws.amazon.com/sagemaker/latest/dg/nbi-ip-filter.html\">Limit Access to a Notebook Instance by IP Address</a>.</p> <note> <p>The URL that you get from a call to is valid only for 5 minutes. If you try to use the URL after the 5-minute limit expires, you are directed to the AWS console sign-in page.</p> </note>"
+      "documentation":"<p>Returns a URL that you can use to connect to the Jupyter server from a notebook instance. In the Amazon SageMaker console, when you choose <code>Open</code> next to a notebook instance, Amazon SageMaker opens a new tab showing the Jupyter server home page from the notebook instance. The console uses this API to get the URL and show the page.</p> <p>IAM authorization policies for this API are also enforced for every HTTP request and WebSocket frame that attempts to connect to the notebook instance.For example, you can restrict access to this API and to the URL that it returns to a list of IP addresses that you specify. Use the <code>NotIpAddress</code> condition operator and the <code>aws:SourceIP</code> condition context key to specify the list of IP addresses that you want to have access to the notebook instance. For more information, see <a href=\"https://docs.aws.amazon.com/sagemaker/latest/dg/security_iam_id-based-policy-examples.html#nbi-ip-filter\">Limit Access to a Notebook Instance by IP Address</a>.</p> <note> <p>The URL that you get from a call to <a>CreatePresignedNotebookInstanceUrl</a> is valid only for 5 minutes. If you try to use the URL after the 5-minute limit expires, you are directed to the AWS console sign-in page.</p> </note>"
+    },
+    "CreateProcessingJob":{
+      "name":"CreateProcessingJob",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"CreateProcessingJobRequest"},
+      "output":{"shape":"CreateProcessingJobResponse"},
+      "errors":[
+        {"shape":"ResourceInUse"},
+        {"shape":"ResourceLimitExceeded"},
+        {"shape":"ResourceNotFound"}
+      ],
+      "documentation":"<p>Creates a processing job.</p>"
     },
     "CreateTrainingJob":{
       "name":"CreateTrainingJob",
@@ -181,9 +320,10 @@
       "output":{"shape":"CreateTrainingJobResponse"},
       "errors":[
         {"shape":"ResourceInUse"},
-        {"shape":"ResourceLimitExceeded"}
+        {"shape":"ResourceLimitExceeded"},
+        {"shape":"ResourceNotFound"}
       ],
-      "documentation":"<p>Starts a model training job. After training completes, Amazon SageMaker saves the resulting model artifacts to an Amazon S3 location that you specify. </p> <p>If you choose to host your model using Amazon SageMaker hosting services, you can use the resulting model artifacts as part of the model. You can also use the artifacts in a machine learning service other than Amazon SageMaker, provided that you know how to use them for inferences. </p> <p>In the request body, you provide the following: </p> <ul> <li> <p> <code>AlgorithmSpecification</code> - Identifies the training algorithm to use. </p> </li> <li> <p> <code>HyperParameters</code> - Specify these algorithm-specific parameters to enable the estimation of model parameters during training. Hyperparameters can be tuned to optimize this learning process. For a list of hyperparameters for each training algorithm provided by Amazon SageMaker, see <a href=\"https://docs.aws.amazon.com/sagemaker/latest/dg/algos.html\">Algorithms</a>. </p> </li> <li> <p> <code>InputDataConfig</code> - Describes the training dataset and the Amazon S3, EFS, or FSx location where it is stored.</p> </li> <li> <p> <code>OutputDataConfig</code> - Identifies the Amazon S3 bucket where you want Amazon SageMaker to save the results of model training. </p> <p/> </li> <li> <p> <code>ResourceConfig</code> - Identifies the resources, ML compute instances, and ML storage volumes to deploy for model training. In distributed training, you specify more than one instance. </p> </li> <li> <p> <code>EnableManagedSpotTraining</code> - Optimize the cost of training machine learning models by up to 80% by using Amazon EC2 Spot instances. For more information, see <a href=\"https://docs.aws.amazon.com/sagemaker/latest/dg/model-managed-spot-training.html\">Managed Spot Training</a>. </p> </li> <li> <p> <code>RoleARN</code> - The Amazon Resource Number (ARN) that Amazon SageMaker assumes to perform tasks on your behalf during model training. You must grant this role the necessary permissions so that Amazon SageMaker can successfully complete model training. </p> </li> <li> <p> <code>StoppingCondition</code> - To help cap training costs, use <code>MaxRuntimeInSeconds</code> to set a time limit for training. Use <code>MaxWaitTimeInSeconds</code> to specify how long you are willing to to wait for a managed spot training job to complete. </p> </li> </ul> <p> For more information about Amazon SageMaker, see <a href=\"https://docs.aws.amazon.com/sagemaker/latest/dg/how-it-works.html\">How It Works</a>. </p>"
+      "documentation":"<p>Starts a model training job. After training completes, Amazon SageMaker saves the resulting model artifacts to an Amazon S3 location that you specify. </p> <p>If you choose to host your model using Amazon SageMaker hosting services, you can use the resulting model artifacts as part of the model. You can also use the artifacts in a machine learning service other than Amazon SageMaker, provided that you know how to use them for inferences. </p> <p>In the request body, you provide the following: </p> <ul> <li> <p> <code>AlgorithmSpecification</code> - Identifies the training algorithm to use. </p> </li> <li> <p> <code>HyperParameters</code> - Specify these algorithm-specific parameters to enable the estimation of model parameters during training. Hyperparameters can be tuned to optimize this learning process. For a list of hyperparameters for each training algorithm provided by Amazon SageMaker, see <a href=\"https://docs.aws.amazon.com/sagemaker/latest/dg/algos.html\">Algorithms</a>. </p> </li> <li> <p> <code>InputDataConfig</code> - Describes the training dataset and the Amazon S3, EFS, or FSx location where it is stored.</p> </li> <li> <p> <code>OutputDataConfig</code> - Identifies the Amazon S3 bucket where you want Amazon SageMaker to save the results of model training. </p> <p/> </li> <li> <p> <code>ResourceConfig</code> - Identifies the resources, ML compute instances, and ML storage volumes to deploy for model training. In distributed training, you specify more than one instance. </p> </li> <li> <p> <code>EnableManagedSpotTraining</code> - Optimize the cost of training machine learning models by up to 80% by using Amazon EC2 Spot instances. For more information, see <a href=\"https://docs.aws.amazon.com/sagemaker/latest/dg/model-managed-spot-training.html\">Managed Spot Training</a>. </p> </li> <li> <p> <code>RoleARN</code> - The Amazon Resource Number (ARN) that Amazon SageMaker assumes to perform tasks on your behalf during model training. You must grant this role the necessary permissions so that Amazon SageMaker can successfully complete model training. </p> </li> <li> <p> <code>StoppingCondition</code> - To help cap training costs, use <code>MaxRuntimeInSeconds</code> to set a time limit for training. Use <code>MaxWaitTimeInSeconds</code> to specify how long you are willing to wait for a managed spot training job to complete. </p> </li> </ul> <p> For more information about Amazon SageMaker, see <a href=\"https://docs.aws.amazon.com/sagemaker/latest/dg/how-it-works.html\">How It Works</a>. </p>"
     },
     "CreateTransformJob":{
       "name":"CreateTransformJob",
@@ -195,9 +335,51 @@
       "output":{"shape":"CreateTransformJobResponse"},
       "errors":[
         {"shape":"ResourceInUse"},
+        {"shape":"ResourceLimitExceeded"},
+        {"shape":"ResourceNotFound"}
+      ],
+      "documentation":"<p>Starts a transform job. A transform job uses a trained model to get inferences on a dataset and saves these results to an Amazon S3 location that you specify.</p> <p>To perform batch transformations, you create a transform job and use the data that you have readily available.</p> <p>In the request body, you provide the following:</p> <ul> <li> <p> <code>TransformJobName</code> - Identifies the transform job. The name must be unique within an AWS Region in an AWS account.</p> </li> <li> <p> <code>ModelName</code> - Identifies the model to use. <code>ModelName</code> must be the name of an existing Amazon SageMaker model in the same AWS Region and AWS account. For information on creating a model, see <a>CreateModel</a>.</p> </li> <li> <p> <code>TransformInput</code> - Describes the dataset to be transformed and the Amazon S3 location where it is stored.</p> </li> <li> <p> <code>TransformOutput</code> - Identifies the Amazon S3 location where you want Amazon SageMaker to save the results from the transform job.</p> </li> <li> <p> <code>TransformResources</code> - Identifies the ML compute instances for the transform job.</p> </li> </ul> <p>For more information about how batch transformation works, see <a href=\"https://docs.aws.amazon.com/sagemaker/latest/dg/batch-transform.html\">Batch Transform</a>.</p>"
+    },
+    "CreateTrial":{
+      "name":"CreateTrial",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"CreateTrialRequest"},
+      "output":{"shape":"CreateTrialResponse"},
+      "errors":[
+        {"shape":"ResourceNotFound"},
+        {"shape":"ResourceLimitExceeded"}
+      ],
+      "documentation":"<p>Creates an Amazon SageMaker <i>trial</i>. A trial is a set of steps called <i>trial components</i> that produce a machine learning model. A trial is part of a single Amazon SageMaker <i>experiment</i>.</p> <p>When you use Amazon SageMaker Studio or the Amazon SageMaker Python SDK, all experiments, trials, and trial components are automatically tracked, logged, and indexed. When you use the AWS SDK for Python (Boto), you must use the logging APIs provided by the SDK.</p> <p>You can add tags to a trial and then use the <a>Search</a> API to search for the tags.</p> <p>To get a list of all your trials, call the <a>ListTrials</a> API. To view a trial's properties, call the <a>DescribeTrial</a> API. To create a trial component, call the <a>CreateTrialComponent</a> API.</p>"
+    },
+    "CreateTrialComponent":{
+      "name":"CreateTrialComponent",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"CreateTrialComponentRequest"},
+      "output":{"shape":"CreateTrialComponentResponse"},
+      "errors":[
         {"shape":"ResourceLimitExceeded"}
       ],
-      "documentation":"<p>Starts a transform job. A transform job uses a trained model to get inferences on a dataset and saves these results to an Amazon S3 location that you specify.</p> <p>To perform batch transformations, you create a transform job and use the data that you have readily available.</p> <p>In the request body, you provide the following:</p> <ul> <li> <p> <code>TransformJobName</code> - Identifies the transform job. The name must be unique within an AWS Region in an AWS account.</p> </li> <li> <p> <code>ModelName</code> - Identifies the model to use. <code>ModelName</code> must be the name of an existing Amazon SageMaker model in the same AWS Region and AWS account. For information on creating a model, see <a>CreateModel</a>.</p> </li> <li> <p> <code>TransformInput</code> - Describes the dataset to be transformed and the Amazon S3 location where it is stored.</p> </li> <li> <p> <code>TransformOutput</code> - Identifies the Amazon S3 location where you want Amazon SageMaker to save the results from the transform job.</p> </li> <li> <p> <code>TransformResources</code> - Identifies the ML compute instances for the transform job.</p> </li> </ul> <p> For more information about how batch transformation works Amazon SageMaker, see <a href=\"https://docs.aws.amazon.com/sagemaker/latest/dg/batch-transform.html\">How It Works</a>. </p>"
+      "documentation":"<p>Creates a <i>trial component</i>, which is a stage of a machine learning <i>trial</i>. A trial is composed of one or more trial components. A trial component can be used in multiple trials.</p> <p>Trial components include pre-processing jobs, training jobs, and batch transform jobs.</p> <p>When you use Amazon SageMaker Studio or the Amazon SageMaker Python SDK, all experiments, trials, and trial components are automatically tracked, logged, and indexed. When you use the AWS SDK for Python (Boto), you must use the logging APIs provided by the SDK.</p> <p>You can add tags to a trial component and then use the <a>Search</a> API to search for the tags.</p> <note> <p> <code>CreateTrialComponent</code> can only be invoked from within an Amazon SageMaker managed environment. This includes Amazon SageMaker training jobs, processing jobs, transform jobs, and Amazon SageMaker notebooks. A call to <code>CreateTrialComponent</code> from outside one of these environments results in an error.</p> </note>"
+    },
+    "CreateUserProfile":{
+      "name":"CreateUserProfile",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"CreateUserProfileRequest"},
+      "output":{"shape":"CreateUserProfileResponse"},
+      "errors":[
+        {"shape":"ResourceLimitExceeded"},
+        {"shape":"ResourceInUse"}
+      ],
+      "documentation":"<p>Creates a new user profile. A user profile represents a single user within a Domain, and is the main way to reference a \"person\" for the purposes of sharing, reporting and other user-oriented features. This entity is created during on-boarding. If an administrator invites a person by email or imports them from SSO, a new UserProfile is automatically created. This entity is the primary holder of settings for an individual user and has a reference to the user's private Amazon Elastic File System (EFS) home directory. </p>"
     },
     "CreateWorkteam":{
       "name":"CreateWorkteam",
@@ -222,6 +404,19 @@
       "input":{"shape":"DeleteAlgorithmInput"},
       "documentation":"<p>Removes the specified algorithm from your account.</p>"
     },
+    "DeleteApp":{
+      "name":"DeleteApp",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DeleteAppRequest"},
+      "errors":[
+        {"shape":"ResourceInUse"},
+        {"shape":"ResourceNotFound"}
+      ],
+      "documentation":"<p>Used to stop and delete an app.</p>"
+    },
     "DeleteCodeRepository":{
       "name":"DeleteCodeRepository",
       "http":{
@@ -231,6 +426,19 @@
       "input":{"shape":"DeleteCodeRepositoryInput"},
       "documentation":"<p>Deletes the specified Git repository from your account.</p>"
     },
+    "DeleteDomain":{
+      "name":"DeleteDomain",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DeleteDomainRequest"},
+      "errors":[
+        {"shape":"ResourceInUse"},
+        {"shape":"ResourceNotFound"}
+      ],
+      "documentation":"<p>Used to delete a domain. If you on-boarded with IAM mode, you will need to delete your domain to on-board again using SSO. Use with caution. All of the members of the domain will lose access to their EFS volume, including data, notebooks, and other artifacts. </p>"
+    },
     "DeleteEndpoint":{
       "name":"DeleteEndpoint",
       "http":{
@@ -249,6 +457,32 @@
       "input":{"shape":"DeleteEndpointConfigInput"},
       "documentation":"<p>Deletes an endpoint configuration. The <code>DeleteEndpointConfig</code> API deletes only the specified configuration. It does not delete endpoints created using the configuration. </p>"
     },
+    "DeleteExperiment":{
+      "name":"DeleteExperiment",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DeleteExperimentRequest"},
+      "output":{"shape":"DeleteExperimentResponse"},
+      "errors":[
+        {"shape":"ResourceNotFound"}
+      ],
+      "documentation":"<p>Deletes an Amazon SageMaker experiment. All trials associated with the experiment must be deleted first. Use the <a>ListTrials</a> API to get a list of the trials associated with the experiment.</p>"
+    },
+    "DeleteFlowDefinition":{
+      "name":"DeleteFlowDefinition",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DeleteFlowDefinitionRequest"},
+      "output":{"shape":"DeleteFlowDefinitionResponse"},
+      "errors":[
+        {"shape":"ResourceNotFound"}
+      ],
+      "documentation":"<p>Deletes the specified flow definition.</p>"
+    },
     "DeleteModel":{
       "name":"DeleteModel",
       "http":{
@@ -256,7 +490,7 @@
         "requestUri":"/"
       },
       "input":{"shape":"DeleteModelInput"},
-      "documentation":"<p>Deletes a model. The <code>DeleteModel</code> API deletes only the model entry that was created in Amazon SageMaker when you called the <a href=\"https://docs.aws.amazon.com/sagemaker/latest/dg/API_CreateModel.html\">CreateModel</a> API. It does not delete model artifacts, inference code, or the IAM role that you specified when creating the model. </p>"
+      "documentation":"<p>Deletes a model. The <code>DeleteModel</code> API deletes only the model entry that was created in Amazon SageMaker when you called the <a>CreateModel</a> API. It does not delete model artifacts, inference code, or the IAM role that you specified when creating the model. </p>"
     },
     "DeleteModelPackage":{
       "name":"DeleteModelPackage",
@@ -267,6 +501,18 @@
       "input":{"shape":"DeleteModelPackageInput"},
       "documentation":"<p>Deletes a model package.</p> <p>A model package is used to create Amazon SageMaker models or list on AWS Marketplace. Buyers can subscribe to model packages listed on AWS Marketplace to create models in Amazon SageMaker.</p>"
     },
+    "DeleteMonitoringSchedule":{
+      "name":"DeleteMonitoringSchedule",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DeleteMonitoringScheduleRequest"},
+      "errors":[
+        {"shape":"ResourceNotFound"}
+      ],
+      "documentation":"<p>Deletes a monitoring schedule. Also stops the schedule had not already been stopped. This does not delete the job execution history of the monitoring schedule. </p>"
+    },
     "DeleteNotebookInstance":{
       "name":"DeleteNotebookInstance",
       "http":{
@@ -295,6 +541,45 @@
       "output":{"shape":"DeleteTagsOutput"},
       "documentation":"<p>Deletes the specified tags from an Amazon SageMaker resource.</p> <p>To list a resource's tags, use the <code>ListTags</code> API. </p> <note> <p>When you call this API to delete tags from a hyperparameter tuning job, the deleted tags are not removed from training jobs that the hyperparameter tuning job launched before you called this API.</p> </note>"
     },
+    "DeleteTrial":{
+      "name":"DeleteTrial",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DeleteTrialRequest"},
+      "output":{"shape":"DeleteTrialResponse"},
+      "errors":[
+        {"shape":"ResourceNotFound"}
+      ],
+      "documentation":"<p>Deletes the specified trial. All trial components that make up the trial must be deleted first. Use the <a>DescribeTrialComponent</a> API to get the list of trial components.</p>"
+    },
+    "DeleteTrialComponent":{
+      "name":"DeleteTrialComponent",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DeleteTrialComponentRequest"},
+      "output":{"shape":"DeleteTrialComponentResponse"},
+      "errors":[
+        {"shape":"ResourceNotFound"}
+      ],
+      "documentation":"<p>Deletes the specified trial component. A trial component must be disassociated from all trials before the trial component can be deleted. To disassociate a trial component from a trial, call the <a>DisassociateTrialComponent</a> API.</p>"
+    },
+    "DeleteUserProfile":{
+      "name":"DeleteUserProfile",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DeleteUserProfileRequest"},
+      "errors":[
+        {"shape":"ResourceInUse"},
+        {"shape":"ResourceNotFound"}
+      ],
+      "documentation":"<p>Deletes a user profile.</p>"
+    },
     "DeleteWorkteam":{
       "name":"DeleteWorkteam",
       "http":{
@@ -318,6 +603,32 @@
       "output":{"shape":"DescribeAlgorithmOutput"},
       "documentation":"<p>Returns a description of the specified algorithm that is in your account.</p>"
     },
+    "DescribeApp":{
+      "name":"DescribeApp",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DescribeAppRequest"},
+      "output":{"shape":"DescribeAppResponse"},
+      "errors":[
+        {"shape":"ResourceNotFound"}
+      ],
+      "documentation":"<p>Describes the app.</p>"
+    },
+    "DescribeAutoMLJob":{
+      "name":"DescribeAutoMLJob",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DescribeAutoMLJobRequest"},
+      "output":{"shape":"DescribeAutoMLJobResponse"},
+      "errors":[
+        {"shape":"ResourceNotFound"}
+      ],
+      "documentation":"<p>Returns information about an Amazon SageMaker job.</p>"
+    },
     "DescribeCodeRepository":{
       "name":"DescribeCodeRepository",
       "http":{
@@ -341,6 +652,19 @@
       ],
       "documentation":"<p>Returns information about a model compilation job.</p> <p>To create a model compilation job, use <a>CreateCompilationJob</a>. To get information about multiple model compilation jobs, use <a>ListCompilationJobs</a>.</p>"
     },
+    "DescribeDomain":{
+      "name":"DescribeDomain",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DescribeDomainRequest"},
+      "output":{"shape":"DescribeDomainResponse"},
+      "errors":[
+        {"shape":"ResourceNotFound"}
+      ],
+      "documentation":"<p>The desciption of the domain.</p>"
+    },
     "DescribeEndpoint":{
       "name":"DescribeEndpoint",
       "http":{
@@ -361,6 +685,45 @@
       "output":{"shape":"DescribeEndpointConfigOutput"},
       "documentation":"<p>Returns the description of an endpoint configuration created using the <code>CreateEndpointConfig</code> API.</p>"
     },
+    "DescribeExperiment":{
+      "name":"DescribeExperiment",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DescribeExperimentRequest"},
+      "output":{"shape":"DescribeExperimentResponse"},
+      "errors":[
+        {"shape":"ResourceNotFound"}
+      ],
+      "documentation":"<p>Provides a list of an experiment's properties.</p>"
+    },
+    "DescribeFlowDefinition":{
+      "name":"DescribeFlowDefinition",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DescribeFlowDefinitionRequest"},
+      "output":{"shape":"DescribeFlowDefinitionResponse"},
+      "errors":[
+        {"shape":"ResourceNotFound"}
+      ],
+      "documentation":"<p>Returns information about the specified flow definition.</p>"
+    },
+    "DescribeHumanTaskUi":{
+      "name":"DescribeHumanTaskUi",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DescribeHumanTaskUiRequest"},
+      "output":{"shape":"DescribeHumanTaskUiResponse"},
+      "errors":[
+        {"shape":"ResourceNotFound"}
+      ],
+      "documentation":"<p>Returns information about the requested human task user interface.</p>"
+    },
     "DescribeHyperParameterTuningJob":{
       "name":"DescribeHyperParameterTuningJob",
       "http":{
@@ -407,6 +770,19 @@
       "output":{"shape":"DescribeModelPackageOutput"},
       "documentation":"<p>Returns a description of the specified model package, which is used to create Amazon SageMaker models or list them on AWS Marketplace.</p> <p>To create models in Amazon SageMaker, buyers can subscribe to model packages listed on AWS Marketplace.</p>"
     },
+    "DescribeMonitoringSchedule":{
+      "name":"DescribeMonitoringSchedule",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DescribeMonitoringScheduleRequest"},
+      "output":{"shape":"DescribeMonitoringScheduleResponse"},
+      "errors":[
+        {"shape":"ResourceNotFound"}
+      ],
+      "documentation":"<p>Describes the schedule for a monitoring job.</p>"
+    },
     "DescribeNotebookInstance":{
       "name":"DescribeNotebookInstance",
       "http":{
@@ -427,6 +803,19 @@
       "output":{"shape":"DescribeNotebookInstanceLifecycleConfigOutput"},
       "documentation":"<p>Returns a description of a notebook instance lifecycle configuration.</p> <p>For information about notebook instance lifestyle configurations, see <a href=\"https://docs.aws.amazon.com/sagemaker/latest/dg/notebook-lifecycle-config.html\">Step 2.1: (Optional) Customize a Notebook Instance</a>.</p>"
     },
+    "DescribeProcessingJob":{
+      "name":"DescribeProcessingJob",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DescribeProcessingJobRequest"},
+      "output":{"shape":"DescribeProcessingJobResponse"},
+      "errors":[
+        {"shape":"ResourceNotFound"}
+      ],
+      "documentation":"<p>Returns a description of a processing job.</p>"
+    },
     "DescribeSubscribedWorkteam":{
       "name":"DescribeSubscribedWorkteam",
       "http":{
@@ -463,37 +852,132 @@
       ],
       "documentation":"<p>Returns information about a transform job.</p>"
     },
-    "DescribeWorkteam":{
-      "name":"DescribeWorkteam",
+    "DescribeTrial":{
+      "name":"DescribeTrial",
       "http":{
         "method":"POST",
         "requestUri":"/"
       },
-      "input":{"shape":"DescribeWorkteamRequest"},
-      "output":{"shape":"DescribeWorkteamResponse"},
-      "documentation":"<p>Gets information about a specific work team. You can see information such as the create date, the last updated date, membership information, and the work team's Amazon Resource Name (ARN).</p>"
+      "input":{"shape":"DescribeTrialRequest"},
+      "output":{"shape":"DescribeTrialResponse"},
+      "errors":[
+        {"shape":"ResourceNotFound"}
+      ],
+      "documentation":"<p>Provides a list of a trial's properties.</p>"
     },
-    "GetSearchSuggestions":{
-      "name":"GetSearchSuggestions",
+    "DescribeTrialComponent":{
+      "name":"DescribeTrialComponent",
       "http":{
         "method":"POST",
         "requestUri":"/"
       },
-      "input":{"shape":"GetSearchSuggestionsRequest"},
-      "output":{"shape":"GetSearchSuggestionsResponse"},
-      "documentation":"<p>An auto-complete API for the search functionality in the Amazon SageMaker console. It returns suggestions of possible matches for the property name to use in <code>Search</code> queries. Provides suggestions for <code>HyperParameters</code>, <code>Tags</code>, and <code>Metrics</code>.</p>"
+      "input":{"shape":"DescribeTrialComponentRequest"},
+      "output":{"shape":"DescribeTrialComponentResponse"},
+      "errors":[
+        {"shape":"ResourceNotFound"}
+      ],
+      "documentation":"<p>Provides a list of a trials component's properties.</p>"
     },
-    "ListAlgorithms":{
-      "name":"ListAlgorithms",
+    "DescribeUserProfile":{
+      "name":"DescribeUserProfile",
       "http":{
         "method":"POST",
         "requestUri":"/"
       },
-      "input":{"shape":"ListAlgorithmsInput"},
-      "output":{"shape":"ListAlgorithmsOutput"},
-      "documentation":"<p>Lists the machine learning algorithms that have been created.</p>"
-    },
-    "ListCodeRepositories":{
+      "input":{"shape":"DescribeUserProfileRequest"},
+      "output":{"shape":"DescribeUserProfileResponse"},
+      "errors":[
+        {"shape":"ResourceNotFound"}
+      ],
+      "documentation":"<p>Describes the user profile.</p>"
+    },
+    "DescribeWorkforce":{
+      "name":"DescribeWorkforce",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DescribeWorkforceRequest"},
+      "output":{"shape":"DescribeWorkforceResponse"},
+      "documentation":"<p>Lists private workforce information, including workforce name, Amazon Resource Name (ARN), and, if applicable, allowed IP address ranges (<a href=\"https://docs.aws.amazon.com/vpc/latest/userguide/VPC_Subnets.html\">CIDRs</a>). Allowable IP address ranges are the IP addresses that workers can use to access tasks. </p> <important> <p>This operation applies only to private workforces.</p> </important>"
+    },
+    "DescribeWorkteam":{
+      "name":"DescribeWorkteam",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DescribeWorkteamRequest"},
+      "output":{"shape":"DescribeWorkteamResponse"},
+      "documentation":"<p>Gets information about a specific work team. You can see information such as the create date, the last updated date, membership information, and the work team's Amazon Resource Name (ARN).</p>"
+    },
+    "DisassociateTrialComponent":{
+      "name":"DisassociateTrialComponent",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DisassociateTrialComponentRequest"},
+      "output":{"shape":"DisassociateTrialComponentResponse"},
+      "errors":[
+        {"shape":"ResourceNotFound"}
+      ],
+      "documentation":"<p>Disassociates a trial component from a trial. This doesn't effect other trials the component is associated with. Before you can delete a component, you must disassociate the component from all trials it is associated with. To associate a trial component with a trial, call the <a>AssociateTrialComponent</a> API.</p> <p>To get a list of the trials a component is associated with, use the <a>Search</a> API. Specify <code>ExperimentTrialComponent</code> for the <code>Resource</code> parameter. The list appears in the response under <code>Results.TrialComponent.Parents</code>.</p>"
+    },
+    "GetSearchSuggestions":{
+      "name":"GetSearchSuggestions",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"GetSearchSuggestionsRequest"},
+      "output":{"shape":"GetSearchSuggestionsResponse"},
+      "documentation":"<p>An auto-complete API for the search functionality in the Amazon SageMaker console. It returns suggestions of possible matches for the property name to use in <code>Search</code> queries. Provides suggestions for <code>HyperParameters</code>, <code>Tags</code>, and <code>Metrics</code>.</p>"
+    },
+    "ListAlgorithms":{
+      "name":"ListAlgorithms",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"ListAlgorithmsInput"},
+      "output":{"shape":"ListAlgorithmsOutput"},
+      "documentation":"<p>Lists the machine learning algorithms that have been created.</p>"
+    },
+    "ListApps":{
+      "name":"ListApps",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"ListAppsRequest"},
+      "output":{"shape":"ListAppsResponse"},
+      "documentation":"<p>Lists apps.</p>"
+    },
+    "ListAutoMLJobs":{
+      "name":"ListAutoMLJobs",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"ListAutoMLJobsRequest"},
+      "output":{"shape":"ListAutoMLJobsResponse"},
+      "documentation":"<p>Request a list of jobs.</p>"
+    },
+    "ListCandidatesForAutoMLJob":{
+      "name":"ListCandidatesForAutoMLJob",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"ListCandidatesForAutoMLJobRequest"},
+      "output":{"shape":"ListCandidatesForAutoMLJobResponse"},
+      "errors":[
+        {"shape":"ResourceNotFound"}
+      ],
+      "documentation":"<p>List the Candidates created for the job.</p>"
+    },
+    "ListCodeRepositories":{
       "name":"ListCodeRepositories",
       "http":{
         "method":"POST",
@@ -513,6 +997,16 @@
       "output":{"shape":"ListCompilationJobsResponse"},
       "documentation":"<p>Lists model compilation jobs that satisfy various filters.</p> <p>To create a model compilation job, use <a>CreateCompilationJob</a>. To get information about a particular model compilation job you have created, use <a>DescribeCompilationJob</a>.</p>"
     },
+    "ListDomains":{
+      "name":"ListDomains",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"ListDomainsRequest"},
+      "output":{"shape":"ListDomainsResponse"},
+      "documentation":"<p>Lists the domains.</p>"
+    },
     "ListEndpointConfigs":{
       "name":"ListEndpointConfigs",
       "http":{
@@ -533,6 +1027,36 @@
       "output":{"shape":"ListEndpointsOutput"},
       "documentation":"<p>Lists endpoints.</p>"
     },
+    "ListExperiments":{
+      "name":"ListExperiments",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"ListExperimentsRequest"},
+      "output":{"shape":"ListExperimentsResponse"},
+      "documentation":"<p>Lists all the experiments in your account. The list can be filtered to show only experiments that were created in a specific time range. The list can be sorted by experiment name or creation time.</p>"
+    },
+    "ListFlowDefinitions":{
+      "name":"ListFlowDefinitions",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"ListFlowDefinitionsRequest"},
+      "output":{"shape":"ListFlowDefinitionsResponse"},
+      "documentation":"<p>Returns information about the flow definitions in your account.</p>"
+    },
+    "ListHumanTaskUis":{
+      "name":"ListHumanTaskUis",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"ListHumanTaskUisRequest"},
+      "output":{"shape":"ListHumanTaskUisResponse"},
+      "documentation":"<p>Returns information about the human task user interfaces in your account.</p>"
+    },
     "ListHyperParameterTuningJobs":{
       "name":"ListHyperParameterTuningJobs",
       "http":{
@@ -584,7 +1108,27 @@
       },
       "input":{"shape":"ListModelsInput"},
       "output":{"shape":"ListModelsOutput"},
-      "documentation":"<p>Lists models created with the <a href=\"https://docs.aws.amazon.com/sagemaker/latest/dg/API_CreateModel.html\">CreateModel</a> API.</p>"
+      "documentation":"<p>Lists models created with the <a>CreateModel</a> API.</p>"
+    },
+    "ListMonitoringExecutions":{
+      "name":"ListMonitoringExecutions",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"ListMonitoringExecutionsRequest"},
+      "output":{"shape":"ListMonitoringExecutionsResponse"},
+      "documentation":"<p>Returns list of all monitoring job executions.</p>"
+    },
+    "ListMonitoringSchedules":{
+      "name":"ListMonitoringSchedules",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"ListMonitoringSchedulesRequest"},
+      "output":{"shape":"ListMonitoringSchedulesResponse"},
+      "documentation":"<p>Returns list of all monitoring schedules.</p>"
     },
     "ListNotebookInstanceLifecycleConfigs":{
       "name":"ListNotebookInstanceLifecycleConfigs",
@@ -606,6 +1150,16 @@
       "output":{"shape":"ListNotebookInstancesOutput"},
       "documentation":"<p>Returns a list of the Amazon SageMaker notebook instances in the requester's account in an AWS Region. </p>"
     },
+    "ListProcessingJobs":{
+      "name":"ListProcessingJobs",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"ListProcessingJobsRequest"},
+      "output":{"shape":"ListProcessingJobsResponse"},
+      "documentation":"<p>Lists processing jobs that satisfy various filters.</p>"
+    },
     "ListSubscribedWorkteams":{
       "name":"ListSubscribedWorkteams",
       "http":{
@@ -659,6 +1213,42 @@
       "output":{"shape":"ListTransformJobsResponse"},
       "documentation":"<p>Lists transform jobs.</p>"
     },
+    "ListTrialComponents":{
+      "name":"ListTrialComponents",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"ListTrialComponentsRequest"},
+      "output":{"shape":"ListTrialComponentsResponse"},
+      "errors":[
+        {"shape":"ResourceNotFound"}
+      ],
+      "documentation":"<p>Lists the trial components in your account. You can sort the list by trial component name or creation time. You can filter the list to show only components that were created in a specific time range. You can also filter on one of the following:</p> <ul> <li> <p> <code>ExperimentName</code> </p> </li> <li> <p> <code>SourceArn</code> </p> </li> <li> <p> <code>TrialName</code> </p> </li> </ul>"
+    },
+    "ListTrials":{
+      "name":"ListTrials",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"ListTrialsRequest"},
+      "output":{"shape":"ListTrialsResponse"},
+      "errors":[
+        {"shape":"ResourceNotFound"}
+      ],
+      "documentation":"<p>Lists the trials in your account. Specify an experiment name to limit the list to the trials that are part of that experiment. Specify a trial component name to limit the list to the trials that associated with that trial component. The list can be filtered to show only trials that were created in a specific time range. The list can be sorted by trial name or creation time.</p>"
+    },
+    "ListUserProfiles":{
+      "name":"ListUserProfiles",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"ListUserProfilesRequest"},
+      "output":{"shape":"ListUserProfilesResponse"},
+      "documentation":"<p>Lists user profiles.</p>"
+    },
     "ListWorkteams":{
       "name":"ListWorkteams",
       "http":{
@@ -687,7 +1277,19 @@
       },
       "input":{"shape":"SearchRequest"},
       "output":{"shape":"SearchResponse"},
-      "documentation":"<p>Finds Amazon SageMaker resources that match a search query. Matching resource objects are returned as a list of <code>SearchResult</code> objects in the response. You can sort the search results by any resource property in a ascending or descending order.</p> <p>You can query against the following value types: numerical, text, Booleans, and timestamps.</p>"
+      "documentation":"<p>Finds Amazon SageMaker resources that match a search query. Matching resource objects are returned as a list of <code>SearchResult</code> objects in the response. You can sort the search results by any resource property in a ascending or descending order.</p> <p>You can query against the following value types: numeric, text, Boolean, and timestamp.</p>"
+    },
+    "StartMonitoringSchedule":{
+      "name":"StartMonitoringSchedule",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"StartMonitoringScheduleRequest"},
+      "errors":[
+        {"shape":"ResourceNotFound"}
+      ],
+      "documentation":"<p>Starts a previously stopped monitoring schedule.</p> <note> <p>New monitoring schedules are immediately started after creation.</p> </note>"
     },
     "StartNotebookInstance":{
       "name":"StartNotebookInstance",
@@ -701,6 +1303,18 @@
       ],
       "documentation":"<p>Launches an ML compute instance with the latest version of the libraries and attaches your ML storage volume. After configuring the notebook instance, Amazon SageMaker sets the notebook instance status to <code>InService</code>. A notebook instance's status must be <code>InService</code> before you can connect to your Jupyter notebook. </p>"
     },
+    "StopAutoMLJob":{
+      "name":"StopAutoMLJob",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"StopAutoMLJobRequest"},
+      "errors":[
+        {"shape":"ResourceNotFound"}
+      ],
+      "documentation":"<p>A method for forcing the termination of a running job.</p>"
+    },
     "StopCompilationJob":{
       "name":"StopCompilationJob",
       "http":{
@@ -737,6 +1351,18 @@
       ],
       "documentation":"<p>Stops a running labeling job. A job that is stopped cannot be restarted. Any results obtained before the job is stopped are placed in the Amazon S3 output bucket.</p>"
     },
+    "StopMonitoringSchedule":{
+      "name":"StopMonitoringSchedule",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"StopMonitoringScheduleRequest"},
+      "errors":[
+        {"shape":"ResourceNotFound"}
+      ],
+      "documentation":"<p>Stops a previously started monitoring schedule.</p>"
+    },
     "StopNotebookInstance":{
       "name":"StopNotebookInstance",
       "http":{
@@ -746,6 +1372,18 @@
       "input":{"shape":"StopNotebookInstanceInput"},
       "documentation":"<p>Terminates the ML compute instance. Before terminating the instance, Amazon SageMaker disconnects the ML storage volume from it. Amazon SageMaker preserves the ML storage volume. Amazon SageMaker stops charging you for the ML compute instance when you call <code>StopNotebookInstance</code>.</p> <p>To access data on the ML storage volume for a notebook instance that has been terminated, call the <code>StartNotebookInstance</code> API. <code>StartNotebookInstance</code> launches another ML compute instance, configures it, and attaches the preserved ML storage volume so you can continue your work. </p>"
     },
+    "StopProcessingJob":{
+      "name":"StopProcessingJob",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"StopProcessingJobRequest"},
+      "errors":[
+        {"shape":"ResourceNotFound"}
+      ],
+      "documentation":"<p>Stops a processing job.</p>"
+    },
     "StopTrainingJob":{
       "name":"StopTrainingJob",
       "http":{
@@ -780,6 +1418,21 @@
       "output":{"shape":"UpdateCodeRepositoryOutput"},
       "documentation":"<p>Updates the specified Git repository with the specified values.</p>"
     },
+    "UpdateDomain":{
+      "name":"UpdateDomain",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"UpdateDomainRequest"},
+      "output":{"shape":"UpdateDomainResponse"},
+      "errors":[
+        {"shape":"ResourceLimitExceeded"},
+        {"shape":"ResourceInUse"},
+        {"shape":"ResourceNotFound"}
+      ],
+      "documentation":"<p>Updates a domain. Changes will impact all of the people in the domain.</p>"
+    },
     "UpdateEndpoint":{
       "name":"UpdateEndpoint",
       "http":{
@@ -791,7 +1444,7 @@
       "errors":[
         {"shape":"ResourceLimitExceeded"}
       ],
-      "documentation":"<p>Deploys the new <code>EndpointConfig</code> specified in the request, switches to using newly created endpoint, and then deletes resources provisioned for the endpoint using the previous <code>EndpointConfig</code> (there is no availability loss). </p> <p>When Amazon SageMaker receives the request, it sets the endpoint status to <code>Updating</code>. After updating the endpoint, it sets the status to <code>InService</code>. To check the status of an endpoint, use the <a href=\"https://docs.aws.amazon.com/sagemaker/latest/dg/API_DescribeEndpoint.html\">DescribeEndpoint</a> API. </p> <note> <p>You must not delete an <code>EndpointConfig</code> in use by an endpoint that is live or while the <code>UpdateEndpoint</code> or <code>CreateEndpoint</code> operations are being performed on the endpoint. To update an endpoint, you must create a new <code>EndpointConfig</code>.</p> </note>"
+      "documentation":"<p>Deploys the new <code>EndpointConfig</code> specified in the request, switches to using newly created endpoint, and then deletes resources provisioned for the endpoint using the previous <code>EndpointConfig</code> (there is no availability loss). </p> <p>When Amazon SageMaker receives the request, it sets the endpoint status to <code>Updating</code>. After updating the endpoint, it sets the status to <code>InService</code>. To check the status of an endpoint, use the <a>DescribeEndpoint</a> API. </p> <note> <p>You must not delete an <code>EndpointConfig</code> in use by an endpoint that is live or while the <code>UpdateEndpoint</code> or <code>CreateEndpoint</code> operations are being performed on the endpoint. To update an endpoint, you must create a new <code>EndpointConfig</code>.</p> </note>"
     },
     "UpdateEndpointWeightsAndCapacities":{
       "name":"UpdateEndpointWeightsAndCapacities",
@@ -804,7 +1457,35 @@
       "errors":[
         {"shape":"ResourceLimitExceeded"}
       ],
-      "documentation":"<p>Updates variant weight of one or more variants associated with an existing endpoint, or capacity of one variant associated with an existing endpoint. When it receives the request, Amazon SageMaker sets the endpoint status to <code>Updating</code>. After updating the endpoint, it sets the status to <code>InService</code>. To check the status of an endpoint, use the <a href=\"https://docs.aws.amazon.com/sagemaker/latest/dg/API_DescribeEndpoint.html\">DescribeEndpoint</a> API. </p>"
+      "documentation":"<p>Updates variant weight of one or more variants associated with an existing endpoint, or capacity of one variant associated with an existing endpoint. When it receives the request, Amazon SageMaker sets the endpoint status to <code>Updating</code>. After updating the endpoint, it sets the status to <code>InService</code>. To check the status of an endpoint, use the <a>DescribeEndpoint</a> API. </p>"
+    },
+    "UpdateExperiment":{
+      "name":"UpdateExperiment",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"UpdateExperimentRequest"},
+      "output":{"shape":"UpdateExperimentResponse"},
+      "errors":[
+        {"shape":"ConflictException"},
+        {"shape":"ResourceNotFound"}
+      ],
+      "documentation":"<p>Adds, updates, or removes the description of an experiment. Updates the display name of an experiment.</p>"
+    },
+    "UpdateMonitoringSchedule":{
+      "name":"UpdateMonitoringSchedule",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"UpdateMonitoringScheduleRequest"},
+      "output":{"shape":"UpdateMonitoringScheduleResponse"},
+      "errors":[
+        {"shape":"ResourceLimitExceeded"},
+        {"shape":"ResourceNotFound"}
+      ],
+      "documentation":"<p>Updates a previously created schedule.</p>"
     },
     "UpdateNotebookInstance":{
       "name":"UpdateNotebookInstance",
@@ -832,6 +1513,59 @@
       ],
       "documentation":"<p>Updates a notebook instance lifecycle configuration created with the <a>CreateNotebookInstanceLifecycleConfig</a> API.</p>"
     },
+    "UpdateTrial":{
+      "name":"UpdateTrial",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"UpdateTrialRequest"},
+      "output":{"shape":"UpdateTrialResponse"},
+      "errors":[
+        {"shape":"ConflictException"},
+        {"shape":"ResourceNotFound"}
+      ],
+      "documentation":"<p>Updates the display name of a trial.</p>"
+    },
+    "UpdateTrialComponent":{
+      "name":"UpdateTrialComponent",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"UpdateTrialComponentRequest"},
+      "output":{"shape":"UpdateTrialComponentResponse"},
+      "errors":[
+        {"shape":"ConflictException"},
+        {"shape":"ResourceNotFound"}
+      ],
+      "documentation":"<p>Updates one or more properties of a trial component.</p>"
+    },
+    "UpdateUserProfile":{
+      "name":"UpdateUserProfile",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"UpdateUserProfileRequest"},
+      "output":{"shape":"UpdateUserProfileResponse"},
+      "errors":[
+        {"shape":"ResourceLimitExceeded"},
+        {"shape":"ResourceInUse"},
+        {"shape":"ResourceNotFound"}
+      ],
+      "documentation":"<p>Updates a user profile.</p>"
+    },
+    "UpdateWorkforce":{
+      "name":"UpdateWorkforce",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"UpdateWorkforceRequest"},
+      "output":{"shape":"UpdateWorkforceResponse"},
+      "documentation":"<p>Restricts access to tasks assigned to workers in the specified workforce to those within specific ranges of IP addresses. You specify allowed IP addresses by creating a list of up to four <a href=\"https://docs.aws.amazon.com/vpc/latest/userguide/VPC_Subnets.html\">CIDRs</a>.</p> <p>By default, a workforce isn't restricted to specific IP addresses. If you specify a range of IP addresses, workers who attempt to access tasks using any IP address outside the specified range are denied access and get a <code>Not Found</code> error message on the worker portal. After restricting access with this operation, you can see the allowed IP values for a private workforce with the operation.</p> <important> <p>This operation applies only to private workforces.</p> </important>"
+    },
     "UpdateWorkteam":{
       "name":"UpdateWorkteam",
       "http":{
@@ -924,9 +1658,13 @@
         "MetricDefinitions":{
           "shape":"MetricDefinitionList",
           "documentation":"<p>A list of metric definition objects. Each object specifies the metric name and regular expressions used to parse algorithm logs. Amazon SageMaker publishes each metric to Amazon CloudWatch.</p>"
+        },
+        "EnableSageMakerMetricsTimeSeries":{
+          "shape":"Boolean",
+          "documentation":"<p>To generate and save time-series metrics during training, set to <code>true</code>. The default is <code>false</code> and time-series metrics aren't generated except in the following cases:</p> <ul> <li> <p>You use one of the Amazon SageMaker built-in algorithms</p> </li> <li> <p>You use one of the following <a href=\"https://docs.aws.amazon.com/sagemaker/latest/dg/pre-built-containers-frameworks-deep-learning.html\">Prebuilt Amazon SageMaker Docker Images</a>:</p> <ul> <li> <p>Tensorflow (version &gt;= 1.15)</p> </li> <li> <p>MXNet (version &gt;= 1.6)</p> </li> <li> <p>PyTorch (version &gt;= 1.3)</p> </li> </ul> </li> <li> <p>You specify at least one <a>MetricDefinition</a> </p> </li> </ul>"
         }
       },
-      "documentation":"<p>Specifies the training algorithm to use in a <a href=\"https://docs.aws.amazon.com/sagemaker/latest/dg/API_CreateTrainingJob.html\">CreateTrainingJob</a> request.</p> <p>For more information about algorithms provided by Amazon SageMaker, see <a href=\"https://docs.aws.amazon.com/sagemaker/latest/dg/algos.html\">Algorithms</a>. For information about using your own algorithms, see <a href=\"https://docs.aws.amazon.com/sagemaker/latest/dg/your-algorithms.html\">Using Your Own Algorithms with Amazon SageMaker</a>. </p>"
+      "documentation":"<p>Specifies the training algorithm to use in a <a>CreateTrainingJob</a> request.</p> <p>For more information about algorithms provided by Amazon SageMaker, see <a href=\"https://docs.aws.amazon.com/sagemaker/latest/dg/algos.html\">Algorithms</a>. For information about using your own algorithms, see <a href=\"https://docs.aws.amazon.com/sagemaker/latest/dg/your-algorithms.html\">Using Your Own Algorithms with Amazon SageMaker</a>. </p>"
     },
     "AlgorithmStatus":{
       "type":"string",
@@ -1066,59 +1804,711 @@
       "members":{
         "AnnotationConsolidationLambdaArn":{
           "shape":"LambdaFunctionArn",
-          "documentation":"<p>The Amazon Resource Name (ARN) of a Lambda function implements the logic for annotation consolidation.</p> <p>For the built-in bounding box, image classification, semantic segmentation, and text classification task types, Amazon SageMaker Ground Truth provides the following Lambda functions:</p> <ul> <li> <p> <i>Bounding box</i> - Finds the most similar boxes from different workers based on the Jaccard index of the boxes.</p> <p> <code>arn:aws:lambda:us-east-1:432418664414:function:ACS-BoundingBox</code> </p> <p> <code>arn:aws:lambda:us-east-2:266458841044:function:ACS-BoundingBox</code> </p> <p> <code>arn:aws:lambda:us-west-2:081040173940:function:ACS-BoundingBox</code> </p> <p> <code>arn:aws:lambda:eu-west-1:568282634449:function:ACS-BoundingBox</code> </p> <p> <code>arn:aws:lambda:ap-northeast-1:477331159723:function:ACS-BoundingBox</code> </p> <p> <code>arn:aws:lambda:ap-southeast-2:454466003867:function:ACS-BoundingBox</code> </p> <p> <code>arn:aws:lambda:ap-south-1:565803892007:function:ACS-BoundingBox</code> </p> <p> <code>arn:aws:lambda:eu-central-1:203001061592:function:ACS-BoundingBox</code> </p> <p> <code>arn:aws:lambda:ap-northeast-2:845288260483:function:ACS-BoundingBox</code> </p> <p> <code>arn:aws:lambda:eu-west-2:487402164563:function:ACS-BoundingBox</code> </p> <p> <code>arn:aws:lambda:ap-southeast-1:377565633583:function:ACS-BoundingBox</code> </p> <p> <code>arn:aws:lambda:ca-central-1:918755190332:function:ACS-BoundingBox</code> </p> </li> <li> <p> <i>Image classification</i> - Uses a variant of the Expectation Maximization approach to estimate the true class of an image based on annotations from individual workers.</p> <p> <code>arn:aws:lambda:us-east-1:432418664414:function:ACS-ImageMultiClass</code> </p> <p> <code>arn:aws:lambda:us-east-2:266458841044:function:ACS-ImageMultiClass</code> </p> <p> <code>arn:aws:lambda:us-west-2:081040173940:function:ACS-ImageMultiClass</code> </p> <p> <code>arn:aws:lambda:eu-west-1:568282634449:function:ACS-ImageMultiClass</code> </p> <p> <code>arn:aws:lambda:ap-northeast-1:477331159723:function:ACS-ImageMultiClass</code> </p> <p> <code>arn:aws:lambda:ap-southeast-2:454466003867:function:ACS-ImageMultiClass</code> </p> <p> <code>arn:aws:lambda:ap-south-1:565803892007:function:ACS-ImageMultiClass</code> </p> <p> <code>arn:aws:lambda:eu-central-1:203001061592:function:ACS-ImageMultiClass</code> </p> <p> <code>arn:aws:lambda:ap-northeast-2:845288260483:function:ACS-ImageMultiClass</code> </p> <p> <code>arn:aws:lambda:eu-west-2:487402164563:function:ACS-ImageMultiClass</code> </p> <p> <code>arn:aws:lambda:ap-southeast-1:377565633583:function:ACS-ImageMultiClass</code> </p> <p> <code>arn:aws:lambda:ca-central-1:918755190332:function:ACS-ImageMultiClass</code> </p> </li> <li> <p> <i>Semantic segmentation</i> - Treats each pixel in an image as a multi-class classification and treats pixel annotations from workers as \"votes\" for the correct label.</p> <p> <code>arn:aws:lambda:us-east-1:432418664414:function:ACS-SemanticSegmentation</code> </p> <p> <code>arn:aws:lambda:us-east-2:266458841044:function:ACS-SemanticSegmentation</code> </p> <p> <code>arn:aws:lambda:us-west-2:081040173940:function:ACS-SemanticSegmentation</code> </p> <p> <code>arn:aws:lambda:eu-west-1:568282634449:function:ACS-SemanticSegmentation</code> </p> <p> <code>arn:aws:lambda:ap-northeast-1:477331159723:function:ACS-SemanticSegmentation</code> </p> <p> <code>arn:aws:lambda:ap-southeast-2:454466003867:function:ACS-SemanticSegmentation</code> </p> <p> <code>arn:aws:lambda:ap-south-1:565803892007:function:ACS-SemanticSegmentation</code> </p> <p> <code>arn:aws:lambda:eu-central-1:203001061592:function:ACS-SemanticSegmentation</code> </p> <p> <code>arn:aws:lambda:ap-northeast-2:845288260483:function:ACS-SemanticSegmentation</code> </p> <p> <code>arn:aws:lambda:eu-west-2:487402164563:function:ACS-SemanticSegmentation</code> </p> <p> <code>arn:aws:lambda:ap-southeast-1:377565633583:function:ACS-SemanticSegmentation</code> </p> <p> <code>arn:aws:lambda:ca-central-1:918755190332:function:ACS-SemanticSegmentation</code> </p> </li> <li> <p> <i>Text classification</i> - Uses a variant of the Expectation Maximization approach to estimate the true class of text based on annotations from individual workers.</p> <p> <code>arn:aws:lambda:us-east-1:432418664414:function:ACS-TextMultiClass</code> </p> <p> <code>arn:aws:lambda:us-east-2:266458841044:function:ACS-TextMultiClass</code> </p> <p> <code>arn:aws:lambda:us-west-2:081040173940:function:ACS-TextMultiClass</code> </p> <p> <code>arn:aws:lambda:eu-west-1:568282634449:function:ACS-TextMultiClass</code> </p> <p> <code>arn:aws:lambda:ap-northeast-1:477331159723:function:ACS-TextMultiClass</code> </p> <p> <code>arn:aws:lambda:ap-southeast-2:454466003867:function:ACS-TextMultiClass</code> </p> <p> <code>arn:aws:lambda:ap-south-1:565803892007:function:ACS-TextMultiClass</code> </p> <p> <code>arn:aws:lambda:eu-central-1:203001061592:function:ACS-TextMultiClass</code> </p> <p> <code>arn:aws:lambda:ap-northeast-2:845288260483:function:ACS-TextMultiClass</code> </p> <p> <code>arn:aws:lambda:eu-west-2:487402164563:function:ACS-TextMultiClass</code> </p> <p> <code>arn:aws:lambda:ap-southeast-1:377565633583:function:ACS-TextMultiClass</code> </p> <p> <code>arn:aws:lambda:ca-central-1:918755190332:function:ACS-TextMultiClass</code> </p> </li> <li> <p> <i>Named entity eecognition</i> - Groups similar selections and calculates aggregate boundaries, resolving to most-assigned label.</p> <p> <code>arn:aws:lambda:us-east-1:432418664414:function:ACS-NamedEntityRecognition</code> </p> <p> <code>arn:aws:lambda:us-east-2:266458841044:function:ACS-NamedEntityRecognition</code> </p> <p> <code>arn:aws:lambda:us-west-2:081040173940:function:ACS-NamedEntityRecognition</code> </p> <p> <code>arn:aws:lambda:eu-west-1:568282634449:function:ACS-NamedEntityRecognition</code> </p> <p> <code>arn:aws:lambda:ap-northeast-1:477331159723:function:ACS-NamedEntityRecognition</code> </p> <p> <code>arn:aws:lambda:ap-southeast-2:454466003867:function:ACS-NamedEntityRecognition</code> </p> <p> <code>arn:aws:lambda:ap-south-1:565803892007:function:ACS-NamedEntityRecognition</code> </p> <p> <code>arn:aws:lambda:eu-central-1:203001061592:function:ACS-NamedEntityRecognition</code> </p> <p> <code>arn:aws:lambda:ap-northeast-2:845288260483:function:ACS-NamedEntityRecognition</code> </p> <p> <code>arn:aws:lambda:eu-west-2:487402164563:function:ACS-NamedEntityRecognition</code> </p> <p> <code>arn:aws:lambda:ap-southeast-1:377565633583:function:ACS-NamedEntityRecognition</code> </p> <p> <code>arn:aws:lambda:ca-central-1:918755190332:function:ACS-NamedEntityRecognition</code> </p> </li> </ul> <p>For more information, see <a href=\"https://docs.aws.amazon.com/sagemaker/latest/dg/sms-annotation-consolidation.html\">Annotation Consolidation</a>.</p>"
+          "documentation":"<p>The Amazon Resource Name (ARN) of a Lambda function implements the logic for annotation consolidation.</p> <p>For the built-in bounding box, image classification, semantic segmentation, and text classification task types, Amazon SageMaker Ground Truth provides the following Lambda functions:</p> <ul> <li> <p> <i>Bounding box</i> - Finds the most similar boxes from different workers based on the Jaccard index of the boxes.</p> <p> <code>arn:aws:lambda:us-east-1:432418664414:function:ACS-BoundingBox</code> </p> <p> <code>arn:aws:lambda:us-east-2:266458841044:function:ACS-BoundingBox</code> </p> <p> <code>arn:aws:lambda:us-west-2:081040173940:function:ACS-BoundingBox</code> </p> <p> <code>arn:aws:lambda:eu-west-1:568282634449:function:ACS-BoundingBox</code> </p> <p> <code>arn:aws:lambda:ap-northeast-1:477331159723:function:ACS-BoundingBox</code> </p> <p> <code>arn:aws:lambda:ap-southeast-2:454466003867:function:ACS-BoundingBox</code> </p> <p> <code>arn:aws:lambda:ap-south-1:565803892007:function:ACS-BoundingBox</code> </p> <p> <code>arn:aws:lambda:eu-central-1:203001061592:function:ACS-BoundingBox</code> </p> <p> <code>arn:aws:lambda:ap-northeast-2:845288260483:function:ACS-BoundingBox</code> </p> <p> <code>arn:aws:lambda:eu-west-2:487402164563:function:ACS-BoundingBox</code> </p> <p> <code>arn:aws:lambda:ap-southeast-1:377565633583:function:ACS-BoundingBox</code> </p> <p> <code>arn:aws:lambda:ca-central-1:918755190332:function:ACS-BoundingBox</code> </p> </li> <li> <p> <i>Image classification</i> - Uses a variant of the Expectation Maximization approach to estimate the true class of an image based on annotations from individual workers.</p> <p> <code>arn:aws:lambda:us-east-1:432418664414:function:ACS-ImageMultiClass</code> </p> <p> <code>arn:aws:lambda:us-east-2:266458841044:function:ACS-ImageMultiClass</code> </p> <p> <code>arn:aws:lambda:us-west-2:081040173940:function:ACS-ImageMultiClass</code> </p> <p> <code>arn:aws:lambda:eu-west-1:568282634449:function:ACS-ImageMultiClass</code> </p> <p> <code>arn:aws:lambda:ap-northeast-1:477331159723:function:ACS-ImageMultiClass</code> </p> <p> <code>arn:aws:lambda:ap-southeast-2:454466003867:function:ACS-ImageMultiClass</code> </p> <p> <code>arn:aws:lambda:ap-south-1:565803892007:function:ACS-ImageMultiClass</code> </p> <p> <code>arn:aws:lambda:eu-central-1:203001061592:function:ACS-ImageMultiClass</code> </p> <p> <code>arn:aws:lambda:ap-northeast-2:845288260483:function:ACS-ImageMultiClass</code> </p> <p> <code>arn:aws:lambda:eu-west-2:487402164563:function:ACS-ImageMultiClass</code> </p> <p> <code>arn:aws:lambda:ap-southeast-1:377565633583:function:ACS-ImageMultiClass</code> </p> <p> <code>arn:aws:lambda:ca-central-1:918755190332:function:ACS-ImageMultiClass</code> </p> </li> <li> <p> <i>Multi-label image classification</i> - Uses a variant of the Expectation Maximization approach to estimate the true classes of an image based on annotations from individual workers.</p> <p> <code>arn:aws:lambda:us-east-1:432418664414:function:ACS-ImageMultiClassMultiLabel</code> </p> <p> <code>arn:aws:lambda:us-east-2:266458841044:function:ACS-ImageMultiClassMultiLabel</code> </p> <p> <code>arn:aws:lambda:us-west-2:081040173940:function:ACS-ImageMultiClassMultiLabel</code> </p> <p> <code>arn:aws:lambda:eu-west-1:568282634449:function:ACS-ImageMultiClassMultiLabel</code> </p> <p> <code>arn:aws:lambda:ap-northeast-1:477331159723:function:ACS-ImageMultiClassMultiLabel</code> </p> <p> <code>arn:aws:lambda:ap-southeast-2:454466003867:function:ACS-ImageMultiClassMultiLabel</code> </p> <p> <code>arn:aws:lambda:ap-south-1:565803892007:function:ACS-ImageMultiClassMultiLabel</code> </p> <p> <code>arn:aws:lambda:eu-central-1:203001061592:function:ACS-ImageMultiClassMultiLabel</code> </p> <p> <code>arn:aws:lambda:ap-northeast-2:845288260483:function:ACS-ImageMultiClassMultiLabel</code> </p> <p> <code>arn:aws:lambda:eu-west-2:487402164563:function:ACS-ImageMultiClassMultiLabel</code> </p> <p> <code>arn:aws:lambda:ap-southeast-1:377565633583:function:ACS-ImageMultiClassMultiLabel</code> </p> <p> <code>arn:aws:lambda:ca-central-1:918755190332:function:ACS-ImageMultiClassMultiLabel</code> </p> </li> <li> <p> <i>Semantic segmentation</i> - Treats each pixel in an image as a multi-class classification and treats pixel annotations from workers as \"votes\" for the correct label.</p> <p> <code>arn:aws:lambda:us-east-1:432418664414:function:ACS-SemanticSegmentation</code> </p> <p> <code>arn:aws:lambda:us-east-2:266458841044:function:ACS-SemanticSegmentation</code> </p> <p> <code>arn:aws:lambda:us-west-2:081040173940:function:ACS-SemanticSegmentation</code> </p> <p> <code>arn:aws:lambda:eu-west-1:568282634449:function:ACS-SemanticSegmentation</code> </p> <p> <code>arn:aws:lambda:ap-northeast-1:477331159723:function:ACS-SemanticSegmentation</code> </p> <p> <code>arn:aws:lambda:ap-southeast-2:454466003867:function:ACS-SemanticSegmentation</code> </p> <p> <code>arn:aws:lambda:ap-south-1:565803892007:function:ACS-SemanticSegmentation</code> </p> <p> <code>arn:aws:lambda:eu-central-1:203001061592:function:ACS-SemanticSegmentation</code> </p> <p> <code>arn:aws:lambda:ap-northeast-2:845288260483:function:ACS-SemanticSegmentation</code> </p> <p> <code>arn:aws:lambda:eu-west-2:487402164563:function:ACS-SemanticSegmentation</code> </p> <p> <code>arn:aws:lambda:ap-southeast-1:377565633583:function:ACS-SemanticSegmentation</code> </p> <p> <code>arn:aws:lambda:ca-central-1:918755190332:function:ACS-SemanticSegmentation</code> </p> </li> <li> <p> <i>Text classification</i> - Uses a variant of the Expectation Maximization approach to estimate the true class of text based on annotations from individual workers.</p> <p> <code>arn:aws:lambda:us-east-1:432418664414:function:ACS-TextMultiClass</code> </p> <p> <code>arn:aws:lambda:us-east-2:266458841044:function:ACS-TextMultiClass</code> </p> <p> <code>arn:aws:lambda:us-west-2:081040173940:function:ACS-TextMultiClass</code> </p> <p> <code>arn:aws:lambda:eu-west-1:568282634449:function:ACS-TextMultiClass</code> </p> <p> <code>arn:aws:lambda:ap-northeast-1:477331159723:function:ACS-TextMultiClass</code> </p> <p> <code>arn:aws:lambda:ap-southeast-2:454466003867:function:ACS-TextMultiClass</code> </p> <p> <code>arn:aws:lambda:ap-south-1:565803892007:function:ACS-TextMultiClass</code> </p> <p> <code>arn:aws:lambda:eu-central-1:203001061592:function:ACS-TextMultiClass</code> </p> <p> <code>arn:aws:lambda:ap-northeast-2:845288260483:function:ACS-TextMultiClass</code> </p> <p> <code>arn:aws:lambda:eu-west-2:487402164563:function:ACS-TextMultiClass</code> </p> <p> <code>arn:aws:lambda:ap-southeast-1:377565633583:function:ACS-TextMultiClass</code> </p> <p> <code>arn:aws:lambda:ca-central-1:918755190332:function:ACS-TextMultiClass</code> </p> </li> <li> <p> <i>Multi-label text classification</i> - Uses a variant of the Expectation Maximization approach to estimate the true classes of text based on annotations from individual workers.</p> <p> <code>arn:aws:lambda:us-east-1:432418664414:function:ACS-TextMultiClassMultiLabel</code> </p> <p> <code>arn:aws:lambda:us-east-2:266458841044:function:ACS-TextMultiClassMultiLabel</code> </p> <p> <code>arn:aws:lambda:us-west-2:081040173940:function:ACS-TextMultiClassMultiLabel</code> </p> <p> <code>arn:aws:lambda:eu-west-1:568282634449:function:ACS-TextMultiClassMultiLabel</code> </p> <p> <code>arn:aws:lambda:ap-northeast-1:477331159723:function:ACS-TextMultiClassMultiLabel</code> </p> <p> <code>arn:aws:lambda:ap-southeast-2:454466003867:function:ACS-TextMultiClassMultiLabel</code> </p> <p> <code>arn:aws:lambda:ap-south-1:565803892007:function:ACS-TextMultiClassMultiLabel</code> </p> <p> <code>arn:aws:lambda:eu-central-1:203001061592:function:ACS-TextMultiClassMultiLabel</code> </p> <p> <code>arn:aws:lambda:ap-northeast-2:845288260483:function:ACS-TextMultiClassMultiLabel</code> </p> <p> <code>arn:aws:lambda:eu-west-2:487402164563:function:ACS-TextMultiClassMultiLabel</code> </p> <p> <code>arn:aws:lambda:ap-southeast-1:377565633583:function:ACS-TextMultiClassMultiLabel</code> </p> <p> <code>arn:aws:lambda:ca-central-1:918755190332:function:ACS-TextMultiClassMultiLabel</code> </p> </li> <li> <p> <i>Named entity recognition</i> - Groups similar selections and calculates aggregate boundaries, resolving to most-assigned label.</p> <p> <code>arn:aws:lambda:us-east-1:432418664414:function:ACS-NamedEntityRecognition</code> </p> <p> <code>arn:aws:lambda:us-east-2:266458841044:function:ACS-NamedEntityRecognition</code> </p> <p> <code>arn:aws:lambda:us-west-2:081040173940:function:ACS-NamedEntityRecognition</code> </p> <p> <code>arn:aws:lambda:eu-west-1:568282634449:function:ACS-NamedEntityRecognition</code> </p> <p> <code>arn:aws:lambda:ap-northeast-1:477331159723:function:ACS-NamedEntityRecognition</code> </p> <p> <code>arn:aws:lambda:ap-southeast-2:454466003867:function:ACS-NamedEntityRecognition</code> </p> <p> <code>arn:aws:lambda:ap-south-1:565803892007:function:ACS-NamedEntityRecognition</code> </p> <p> <code>arn:aws:lambda:eu-central-1:203001061592:function:ACS-NamedEntityRecognition</code> </p> <p> <code>arn:aws:lambda:ap-northeast-2:845288260483:function:ACS-NamedEntityRecognition</code> </p> <p> <code>arn:aws:lambda:eu-west-2:487402164563:function:ACS-NamedEntityRecognition</code> </p> <p> <code>arn:aws:lambda:ap-southeast-1:377565633583:function:ACS-NamedEntityRecognition</code> </p> <p> <code>arn:aws:lambda:ca-central-1:918755190332:function:ACS-NamedEntityRecognition</code> </p> </li> <li> <p> <i>Bounding box verification</i> - Uses a variant of the Expectation Maximization approach to estimate the true class of verification judgement for bounding box labels based on annotations from individual workers.</p> <p> <code>arn:aws:lambda:us-east-1:432418664414:function:ACS-VerificationBoundingBox</code> </p> <p> <code>arn:aws:lambda:us-east-2:266458841044:function:ACS-VerificationBoundingBox</code> </p> <p> <code>arn:aws:lambda:us-west-2:081040173940:function:ACS-VerificationBoundingBox</code> </p> <p> <code>arn:aws:lambda:eu-west-1:568282634449:function:ACS-VerificationBoundingBox</code> </p> <p> <code>arn:aws:lambda:ap-northeast-1:477331159723:function:ACS-VerificationBoundingBox</code> </p> <p> <code>arn:aws:lambda:ap-southeast-2:454466003867:function:ACS-VerificationBoundingBox</code> </p> <p> <code>arn:aws:lambda:ap-south-1:565803892007:function:ACS-VerificationBoundingBox</code> </p> <p> <code>arn:aws:lambda:eu-central-1:203001061592:function:ACS-VerificationBoundingBox</code> </p> <p> <code>arn:aws:lambda:ap-northeast-2:845288260483:function:ACS-VerificationBoundingBox</code> </p> <p> <code>arn:aws:lambda:eu-west-2:487402164563:function:ACS-VerificationBoundingBox</code> </p> <p> <code>arn:aws:lambda:ap-southeast-1:377565633583:function:ACS-VerificationBoundingBox</code> </p> <p> <code>arn:aws:lambda:ca-central-1:918755190332:function:ACS-VerificationBoundingBox</code> </p> </li> <li> <p> <i>Semantic segmentation verification</i> - Uses a variant of the Expectation Maximization approach to estimate the true class of verification judgment for semantic segmentation labels based on annotations from individual workers.</p> <p> <code>arn:aws:lambda:us-east-1:432418664414:function:ACS-VerificationSemanticSegmentation</code> </p> <p> <code>arn:aws:lambda:us-east-2:266458841044:function:ACS-VerificationSemanticSegmentation</code> </p> <p> <code>arn:aws:lambda:us-west-2:081040173940:function:ACS-VerificationSemanticSegmentation</code> </p> <p> <code>arn:aws:lambda:eu-west-1:568282634449:function:ACS-VerificationSemanticSegmentation</code> </p> <p> <code>arn:aws:lambda:ap-northeast-1:477331159723:function:ACS-VerificationSemanticSegmentation</code> </p> <p> <code>arn:aws:lambda:ap-southeast-2:454466003867:function:ACS-VerificationSemanticSegmentation</code> </p> <p> <code>arn:aws:lambda:ap-south-1:565803892007:function:ACS-VerificationSemanticSegmentation</code> </p> <p> <code>arn:aws:lambda:eu-central-1:203001061592:function:ACS-VerificationSemanticSegmentation</code> </p> <p> <code>arn:aws:lambda:ap-northeast-2:845288260483:function:ACS-VerificationSemanticSegmentation</code> </p> <p> <code>arn:aws:lambda:eu-west-2:487402164563:function:ACS-VerificationSemanticSegmentation</code> </p> <p> <code>arn:aws:lambda:ap-southeast-1:377565633583:function:ACS-VerificationSemanticSegmentation</code> </p> <p> <code>arn:aws:lambda:ca-central-1:918755190332:function:ACS-VerificationSemanticSegmentation</code> </p> </li> <li> <p> <i>Bounding box adjustment</i> - Finds the most similar boxes from different workers based on the Jaccard index of the adjusted annotations.</p> <p> <code>arn:aws:lambda:us-east-1:432418664414:function:ACS-AdjustmentBoundingBox</code> </p> <p> <code>arn:aws:lambda:us-east-2:266458841044:function:ACS-AdjustmentBoundingBox</code> </p> <p> <code>arn:aws:lambda:us-west-2:081040173940:function:ACS-AdjustmentBoundingBox</code> </p> <p> <code>arn:aws:lambda:eu-west-1:568282634449:function:ACS-AdjustmentBoundingBox</code> </p> <p> <code>arn:aws:lambda:ap-northeast-1:477331159723:function:ACS-AdjustmentBoundingBox</code> </p> <p> <code>arn:aws:lambda:ap-southeast-2:454466003867:function:ACS-AdjustmentBoundingBox</code> </p> <p> <code>arn:aws:lambda:ap-south-1:565803892007:function:ACS-AdjustmentBoundingBox</code> </p> <p> <code>arn:aws:lambda:eu-central-1:203001061592:function:ACS-AdjustmentBoundingBox</code> </p> <p> <code>arn:aws:lambda:ap-northeast-2:845288260483:function:ACS-AdjustmentBoundingBox</code> </p> <p> <code>arn:aws:lambda:eu-west-2:487402164563:function:ACS-AdjustmentBoundingBox</code> </p> <p> <code>arn:aws:lambda:ap-southeast-1:377565633583:function:ACS-AdjustmentBoundingBox</code> </p> <p> <code>arn:aws:lambda:ca-central-1:918755190332:function:ACS-AdjustmentBoundingBox</code> </p> </li> <li> <p> <i>Semantic segmentation adjustment</i> - Treats each pixel in an image as a multi-class classification and treats pixel adjusted annotations from workers as \"votes\" for the correct label.</p> <p> <code>arn:aws:lambda:us-east-1:432418664414:function:ACS-AdjustmentSemanticSegmentation</code> </p> <p> <code>arn:aws:lambda:us-east-2:266458841044:function:ACS-AdjustmentSemanticSegmentation</code> </p> <p> <code>arn:aws:lambda:us-west-2:081040173940:function:ACS-AdjustmentSemanticSegmentation</code> </p> <p> <code>arn:aws:lambda:eu-west-1:568282634449:function:ACS-AdjustmentSemanticSegmentation</code> </p> <p> <code>arn:aws:lambda:ap-northeast-1:477331159723:function:ACS-AdjustmentSemanticSegmentation</code> </p> <p> <code>arn:aws:lambda:ap-southeast-2:454466003867:function:ACS-AdjustmentSemanticSegmentation</code> </p> <p> <code>arn:aws:lambda:ap-south-1:565803892007:function:ACS-AdjustmentSemanticSegmentation</code> </p> <p> <code>arn:aws:lambda:eu-central-1:203001061592:function:ACS-AdjustmentSemanticSegmentation</code> </p> <p> <code>arn:aws:lambda:ap-northeast-2:845288260483:function:ACS-AdjustmentSemanticSegmentation</code> </p> <p> <code>arn:aws:lambda:eu-west-2:487402164563:function:ACS-AdjustmentSemanticSegmentation</code> </p> <p> <code>arn:aws:lambda:ap-southeast-1:377565633583:function:ACS-AdjustmentSemanticSegmentation</code> </p> <p> <code>arn:aws:lambda:ca-central-1:918755190332:function:ACS-AdjustmentSemanticSegmentation</code> </p> </li> </ul> <p>For more information, see <a href=\"https://docs.aws.amazon.com/sagemaker/latest/dg/sms-annotation-consolidation.html\">Annotation Consolidation</a>.</p>"
         }
       },
       "documentation":"<p>Configures how labels are consolidated across human workers.</p>"
     },
-    "ArnOrName":{
-      "type":"string",
-      "max":170,
-      "min":1,
-      "pattern":"(arn:aws[a-z\\-]*:sagemaker:[a-z0-9\\-]*:[0-9]{12}:[a-z\\-]*\\/)?([a-zA-Z0-9]([a-zA-Z0-9-]){0,62})(?<!-)$"
-    },
-    "AssemblyType":{
-      "type":"string",
-      "enum":[
-        "None",
-        "Line"
-      ]
-    },
-    "AttributeName":{
+    "AppArn":{
       "type":"string",
       "max":256,
-      "min":1,
-      "pattern":".+"
-    },
-    "AttributeNames":{
-      "type":"list",
-      "member":{"shape":"AttributeName"},
-      "max":16
+      "pattern":"arn:aws[a-z\\-]*:sagemaker:[a-z0-9\\-]*:[0-9]{12}:app/.*"
     },
-    "BatchStrategy":{
-      "type":"string",
-      "enum":[
-        "MultiRecord",
-        "SingleRecord"
-      ]
-    },
-    "BillableTimeInSeconds":{
-      "type":"integer",
-      "min":1
+    "AppDetails":{
+      "type":"structure",
+      "members":{
+        "DomainId":{
+          "shape":"DomainId",
+          "documentation":"<p>The domain ID.</p>"
+        },
+        "UserProfileName":{
+          "shape":"UserProfileName",
+          "documentation":"<p>The user profile name.</p>"
+        },
+        "AppType":{
+          "shape":"AppType",
+          "documentation":"<p>The type of app.</p>"
+        },
+        "AppName":{
+          "shape":"AppName",
+          "documentation":"<p>The name of the app.</p>"
+        },
+        "Status":{
+          "shape":"AppStatus",
+          "documentation":"<p>The status.</p>"
+        },
+        "CreationTime":{
+          "shape":"CreationTime",
+          "documentation":"<p>The creation time.</p>"
+        }
+      },
+      "documentation":"<p>The app's details.</p>"
     },
-    "Boolean":{"type":"boolean"},
-    "BooleanOperator":{
+    "AppInstanceType":{
+      "type":"string",
+      "enum":[
+        "system",
+        "ml.t3.micro",
+        "ml.t3.small",
+        "ml.t3.medium",
+        "ml.t3.large",
+        "ml.t3.xlarge",
+        "ml.t3.2xlarge",
+        "ml.m5.large",
+        "ml.m5.xlarge",
+        "ml.m5.2xlarge",
+        "ml.m5.4xlarge",
+        "ml.m5.8xlarge",
+        "ml.m5.12xlarge",
+        "ml.m5.16xlarge",
+        "ml.m5.24xlarge",
+        "ml.c5.large",
+        "ml.c5.xlarge",
+        "ml.c5.2xlarge",
+        "ml.c5.4xlarge",
+        "ml.c5.9xlarge",
+        "ml.c5.12xlarge",
+        "ml.c5.18xlarge",
+        "ml.c5.24xlarge",
+        "ml.p3.2xlarge",
+        "ml.p3.8xlarge",
+        "ml.p3.16xlarge",
+        "ml.g4dn.xlarge",
+        "ml.g4dn.2xlarge",
+        "ml.g4dn.4xlarge",
+        "ml.g4dn.8xlarge",
+        "ml.g4dn.12xlarge",
+        "ml.g4dn.16xlarge"
+      ]
+    },
+    "AppList":{
+      "type":"list",
+      "member":{"shape":"AppDetails"}
+    },
+    "AppName":{
+      "type":"string",
+      "max":63,
+      "pattern":"^[a-zA-Z0-9](-*[a-zA-Z0-9])*"
+    },
+    "AppSortKey":{
+      "type":"string",
+      "enum":["CreationTime"]
+    },
+    "AppSpecification":{
+      "type":"structure",
+      "required":["ImageUri"],
+      "members":{
+        "ImageUri":{
+          "shape":"ImageUri",
+          "documentation":"<p>The container image to be run by the processing job.</p>"
+        },
+        "ContainerEntrypoint":{
+          "shape":"ContainerEntrypoint",
+          "documentation":"<p>The entrypoint for a container used to run a processing job.</p>"
+        },
+        "ContainerArguments":{
+          "shape":"ContainerArguments",
+          "documentation":"<p>The arguments for a container used to run a processing job.</p>"
+        }
+      },
+      "documentation":"<p>Configuration to run a processing job in a specified container image.</p>"
+    },
+    "AppStatus":{
+      "type":"string",
+      "enum":[
+        "Deleted",
+        "Deleting",
+        "Failed",
+        "InService",
+        "Pending"
+      ]
+    },
+    "AppType":{
+      "type":"string",
+      "enum":[
+        "JupyterServer",
+        "KernelGateway",
+        "TensorBoard"
+      ]
+    },
+    "ArnOrName":{
+      "type":"string",
+      "max":170,
+      "min":1,
+      "pattern":"(arn:aws[a-z\\-]*:sagemaker:[a-z0-9\\-]*:[0-9]{12}:[a-z\\-]*\\/)?([a-zA-Z0-9]([a-zA-Z0-9-]){0,62})(?<!-)$"
+    },
+    "AssemblyType":{
+      "type":"string",
+      "enum":[
+        "None",
+        "Line"
+      ]
+    },
+    "AssociateTrialComponentRequest":{
+      "type":"structure",
+      "required":[
+        "TrialComponentName",
+        "TrialName"
+      ],
+      "members":{
+        "TrialComponentName":{
+          "shape":"ExperimentEntityName",
+          "documentation":"<p>The name of the component to associated with the trial.</p>"
+        },
+        "TrialName":{
+          "shape":"ExperimentEntityName",
+          "documentation":"<p>The name of the trial to associate with.</p>"
+        }
+      }
+    },
+    "AssociateTrialComponentResponse":{
+      "type":"structure",
+      "members":{
+        "TrialComponentArn":{
+          "shape":"TrialComponentArn",
+          "documentation":"<p>The ARN of the trial component.</p>"
+        },
+        "TrialArn":{
+          "shape":"TrialArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the trial.</p>"
+        }
+      }
+    },
+    "AttributeName":{
+      "type":"string",
+      "max":256,
+      "min":1,
+      "pattern":".+"
+    },
+    "AttributeNames":{
+      "type":"list",
+      "member":{"shape":"AttributeName"},
+      "max":16
+    },
+    "AuthMode":{
+      "type":"string",
+      "enum":[
+        "SSO",
+        "IAM"
+      ]
+    },
+    "AutoMLCandidate":{
+      "type":"structure",
+      "required":[
+        "CandidateName",
+        "ObjectiveStatus",
+        "CandidateSteps",
+        "CandidateStatus",
+        "CreationTime",
+        "LastModifiedTime"
+      ],
+      "members":{
+        "CandidateName":{
+          "shape":"CandidateName",
+          "documentation":"<p>The candidate name.</p>"
+        },
+        "FinalAutoMLJobObjectiveMetric":{"shape":"FinalAutoMLJobObjectiveMetric"},
+        "ObjectiveStatus":{
+          "shape":"ObjectiveStatus",
+          "documentation":"<p>The objective status.</p>"
+        },
+        "CandidateSteps":{
+          "shape":"CandidateSteps",
+          "documentation":"<p>The candidate's steps.</p>"
+        },
+        "CandidateStatus":{
+          "shape":"CandidateStatus",
+          "documentation":"<p>The candidate's status.</p>"
+        },
+        "InferenceContainers":{
+          "shape":"AutoMLContainerDefinitions",
+          "documentation":"<p>The inference containers.</p>"
+        },
+        "CreationTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>The creation time.</p>"
+        },
+        "EndTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>The end time.</p>"
+        },
+        "LastModifiedTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>The last modified time.</p>"
+        },
+        "FailureReason":{
+          "shape":"AutoMLFailureReason",
+          "documentation":"<p>The failure reason.</p>"
+        }
+      },
+      "documentation":"<p>An AutoPilot job will return recommendations, or candidates. Each candidate has futher details about the steps involed, and the status.</p>"
+    },
+    "AutoMLCandidateStep":{
+      "type":"structure",
+      "required":[
+        "CandidateStepType",
+        "CandidateStepArn",
+        "CandidateStepName"
+      ],
+      "members":{
+        "CandidateStepType":{
+          "shape":"CandidateStepType",
+          "documentation":"<p>Whether the Candidate is at the transform, training, or processing step.</p>"
+        },
+        "CandidateStepArn":{
+          "shape":"CandidateStepArn",
+          "documentation":"<p>The ARN for the Candidate's step.</p>"
+        },
+        "CandidateStepName":{
+          "shape":"CandidateStepName",
+          "documentation":"<p>The name for the Candidate's step.</p>"
+        }
+      },
+      "documentation":"<p>Information about the steps for a Candidate, and what step it is working on.</p>"
+    },
+    "AutoMLCandidates":{
+      "type":"list",
+      "member":{"shape":"AutoMLCandidate"}
+    },
+    "AutoMLChannel":{
+      "type":"structure",
+      "required":[
+        "DataSource",
+        "TargetAttributeName"
+      ],
+      "members":{
+        "DataSource":{
+          "shape":"AutoMLDataSource",
+          "documentation":"<p>The data source.</p>"
+        },
+        "CompressionType":{
+          "shape":"CompressionType",
+          "documentation":"<p>You can use Gzip or None. The default value is None.</p>"
+        },
+        "TargetAttributeName":{
+          "shape":"TargetAttributeName",
+          "documentation":"<p>The name of the target variable in supervised learning, a.k.a. 'y'.</p>"
+        }
+      },
+      "documentation":"<p>Similar to Channel. A channel is a named input source that training algorithms can consume. Refer to Channel for detailed descriptions.</p>"
+    },
+    "AutoMLContainerDefinition":{
+      "type":"structure",
+      "required":[
+        "Image",
+        "ModelDataUrl"
+      ],
+      "members":{
+        "Image":{
+          "shape":"Image",
+          "documentation":"<p>The ECR path of the container. Refer to ContainerDefinition for more details.</p>"
+        },
+        "ModelDataUrl":{
+          "shape":"Url",
+          "documentation":"<p>The location of the model artifacts. Refer to ContainerDefinition for more details.</p>"
+        },
+        "Environment":{
+          "shape":"EnvironmentMap",
+          "documentation":"<p>Environment variables to set in the container. Refer to ContainerDefinition for more details.</p>"
+        }
+      },
+      "documentation":"<p>A list of container definitions that describe the different containers that make up one AutoML candidate. Refer to ContainerDefinition for more details.</p>"
+    },
+    "AutoMLContainerDefinitions":{
+      "type":"list",
+      "member":{"shape":"AutoMLContainerDefinition"},
+      "max":5
+    },
+    "AutoMLDataSource":{
+      "type":"structure",
+      "required":["S3DataSource"],
+      "members":{
+        "S3DataSource":{
+          "shape":"AutoMLS3DataSource",
+          "documentation":"<p>The Amazon S3 location of the input data.</p> <note> <p>The input data must be in CSV format and contain at least 1000 rows.</p> </note>"
+        }
+      },
+      "documentation":"<p>The data source for the AutoPilot job.</p>"
+    },
+    "AutoMLFailureReason":{
+      "type":"string",
+      "max":1024
+    },
+    "AutoMLInputDataConfig":{
+      "type":"list",
+      "member":{"shape":"AutoMLChannel"},
+      "max":20,
+      "min":1
+    },
+    "AutoMLJobArn":{
+      "type":"string",
+      "max":256,
+      "min":1,
+      "pattern":"arn:aws[a-z\\-]*:sagemaker:[a-z0-9\\-]*:[0-9]{12}:automl-job/.*"
+    },
+    "AutoMLJobArtifacts":{
+      "type":"structure",
+      "members":{
+        "CandidateDefinitionNotebookLocation":{
+          "shape":"CandidateDefinitionNotebookLocation",
+          "documentation":"<p>The URL to the notebook location.</p>"
+        },
+        "DataExplorationNotebookLocation":{
+          "shape":"DataExplorationNotebookLocation",
+          "documentation":"<p>The URL to the notebook location.</p>"
+        }
+      },
+      "documentation":"<p>Artifacts that are generation during a job.</p>"
+    },
+    "AutoMLJobCompletionCriteria":{
+      "type":"structure",
+      "members":{
+        "MaxCandidates":{
+          "shape":"MaxCandidates",
+          "documentation":"<p>The maximum number of times a training job is allowed to run.</p>"
+        },
+        "MaxRuntimePerTrainingJobInSeconds":{
+          "shape":"MaxRuntimePerTrainingJobInSeconds",
+          "documentation":"<p>The maximum time, in seconds, a job is allowed to run.</p>"
+        },
+        "MaxAutoMLJobRuntimeInSeconds":{
+          "shape":"MaxAutoMLJobRuntimeInSeconds",
+          "documentation":"<p>The maximum time, in seconds, an AutoML job is allowed to wait for a trial to complete. It must be equal to or greater than MaxRuntimePerTrainingJobInSeconds.</p>"
+        }
+      },
+      "documentation":"<p>How long a job is allowed to run, or how many candidates a job is allowed to generate.</p>"
+    },
+    "AutoMLJobConfig":{
+      "type":"structure",
+      "members":{
+        "CompletionCriteria":{
+          "shape":"AutoMLJobCompletionCriteria",
+          "documentation":"<p>How long a job is allowed to run, or how many candidates a job is allowed to generate.</p>"
+        },
+        "SecurityConfig":{
+          "shape":"AutoMLSecurityConfig",
+          "documentation":"<p>Security configuration for traffic encryption or Amazon VPC settings.</p>"
+        }
+      },
+      "documentation":"<p>A collection of settings used for a job.</p>"
+    },
+    "AutoMLJobName":{
+      "type":"string",
+      "max":32,
+      "min":1,
+      "pattern":"^[a-zA-Z0-9](-*[a-zA-Z0-9])*"
+    },
+    "AutoMLJobObjective":{
+      "type":"structure",
+      "required":["MetricName"],
+      "members":{
+        "MetricName":{
+          "shape":"AutoMLMetricEnum",
+          "documentation":"<p>The name of the metric.</p>"
+        }
+      },
+      "documentation":"<p>Applies a metric to minimize or maximize for the job's objective.</p>"
+    },
+    "AutoMLJobObjectiveType":{
+      "type":"string",
+      "enum":[
+        "Maximize",
+        "Minimize"
+      ]
+    },
+    "AutoMLJobSecondaryStatus":{
+      "type":"string",
+      "enum":[
+        "Starting",
+        "AnalyzingData",
+        "FeatureEngineering",
+        "ModelTuning",
+        "MaxCandidatesReached",
+        "Failed",
+        "Stopped",
+        "MaxAutoMLJobRuntimeReached",
+        "Stopping",
+        "CandidateDefinitionsGenerated"
+      ]
+    },
+    "AutoMLJobStatus":{
+      "type":"string",
+      "enum":[
+        "Completed",
+        "InProgress",
+        "Failed",
+        "Stopped",
+        "Stopping"
+      ]
+    },
+    "AutoMLJobSummaries":{
+      "type":"list",
+      "member":{"shape":"AutoMLJobSummary"}
+    },
+    "AutoMLJobSummary":{
+      "type":"structure",
+      "required":[
+        "AutoMLJobName",
+        "AutoMLJobArn",
+        "AutoMLJobStatus",
+        "AutoMLJobSecondaryStatus",
+        "CreationTime",
+        "LastModifiedTime"
+      ],
+      "members":{
+        "AutoMLJobName":{
+          "shape":"AutoMLJobName",
+          "documentation":"<p>The name of the object you are requesting.</p>"
+        },
+        "AutoMLJobArn":{
+          "shape":"AutoMLJobArn",
+          "documentation":"<p>The ARN of the job.</p>"
+        },
+        "AutoMLJobStatus":{
+          "shape":"AutoMLJobStatus",
+          "documentation":"<p>The job's status.</p>"
+        },
+        "AutoMLJobSecondaryStatus":{
+          "shape":"AutoMLJobSecondaryStatus",
+          "documentation":"<p>The job's secondary status.</p>"
+        },
+        "CreationTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>When the job was created.</p>"
+        },
+        "EndTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>The end time.</p>"
+        },
+        "LastModifiedTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>When the job was last modified.</p>"
+        },
+        "FailureReason":{
+          "shape":"AutoMLFailureReason",
+          "documentation":"<p>The failure reason.</p>"
+        }
+      },
+      "documentation":"<p>Provides a summary about a job.</p>"
+    },
+    "AutoMLMaxResults":{
+      "type":"integer",
+      "max":100,
+      "min":1
+    },
+    "AutoMLMetricEnum":{
+      "type":"string",
+      "enum":[
+        "Accuracy",
+        "MSE",
+        "F1",
+        "F1macro"
+      ]
+    },
+    "AutoMLNameContains":{
+      "type":"string",
+      "max":63,
+      "pattern":"[a-zA-Z0-9\\-]+"
+    },
+    "AutoMLOutputDataConfig":{
+      "type":"structure",
+      "required":["S3OutputPath"],
+      "members":{
+        "KmsKeyId":{
+          "shape":"KmsKeyId",
+          "documentation":"<p>The AWS KMS encryption key ID.</p>"
+        },
+        "S3OutputPath":{
+          "shape":"S3Uri",
+          "documentation":"<p>The Amazon S3 output path. Must be 128 characters or less.</p>"
+        }
+      },
+      "documentation":"<p>The output data configuration.</p>"
+    },
+    "AutoMLS3DataSource":{
+      "type":"structure",
+      "required":[
+        "S3DataType",
+        "S3Uri"
+      ],
+      "members":{
+        "S3DataType":{
+          "shape":"AutoMLS3DataType",
+          "documentation":"<p>The data type.</p>"
+        },
+        "S3Uri":{
+          "shape":"S3Uri",
+          "documentation":"<p>The URL to the Amazon S3 data source.</p>"
+        }
+      },
+      "documentation":"<p>The Amazon S3 data source.</p>"
+    },
+    "AutoMLS3DataType":{
+      "type":"string",
+      "enum":[
+        "ManifestFile",
+        "S3Prefix"
+      ]
+    },
+    "AutoMLSecurityConfig":{
+      "type":"structure",
+      "members":{
+        "VolumeKmsKeyId":{
+          "shape":"KmsKeyId",
+          "documentation":"<p>The key used to encrypt stored data.</p>"
+        },
+        "EnableInterContainerTrafficEncryption":{
+          "shape":"Boolean",
+          "documentation":"<p>Whether to use traffic encryption between the container layers.</p>"
+        },
+        "VpcConfig":{
+          "shape":"VpcConfig",
+          "documentation":"<p>VPC configuration.</p>"
+        }
+      },
+      "documentation":"<p>Security options.</p>"
+    },
+    "AutoMLSortBy":{
+      "type":"string",
+      "enum":[
+        "Name",
+        "CreationTime",
+        "Status"
+      ]
+    },
+    "AutoMLSortOrder":{
+      "type":"string",
+      "enum":[
+        "Ascending",
+        "Descending"
+      ]
+    },
+    "AwsManagedHumanLoopRequestSource":{
+      "type":"string",
+      "enum":[
+        "AWS/Rekognition/DetectModerationLabels/Image/V3",
+        "AWS/Textract/AnalyzeDocument/Forms/V1"
+      ]
+    },
+    "BatchStrategy":{
+      "type":"string",
+      "enum":[
+        "MultiRecord",
+        "SingleRecord"
+      ]
+    },
+    "BillableTimeInSeconds":{
+      "type":"integer",
+      "min":1
+    },
+    "Boolean":{"type":"boolean"},
+    "BooleanOperator":{
       "type":"string",
       "enum":[
         "And",
         "Or"
       ]
     },
-    "Branch":{
+    "Branch":{
+      "type":"string",
+      "max":1024,
+      "min":1,
+      "pattern":"[^ ~^:?*\\[]+"
+    },
+    "CandidateDefinitionNotebookLocation":{
+      "type":"string",
+      "min":1
+    },
+    "CandidateName":{
+      "type":"string",
+      "max":64,
+      "min":1
+    },
+    "CandidateSortBy":{
+      "type":"string",
+      "enum":[
+        "CreationTime",
+        "Status",
+        "FinalObjectiveMetricValue"
+      ]
+    },
+    "CandidateStatus":{
+      "type":"string",
+      "enum":[
+        "Completed",
+        "InProgress",
+        "Failed",
+        "Stopped",
+        "Stopping"
+      ]
+    },
+    "CandidateStepArn":{
       "type":"string",
-      "max":1024,
+      "max":256,
       "min":1,
-      "pattern":"[^ ~^:?*\\[]+"
+      "pattern":"arn:aws[a-z\\-]*:sagemaker:[a-z0-9\\-]*:[0-9]{12}:.*/.*"
+    },
+    "CandidateStepName":{
+      "type":"string",
+      "max":64,
+      "min":1
+    },
+    "CandidateStepType":{
+      "type":"string",
+      "enum":[
+        "AWS::SageMaker::TrainingJob",
+        "AWS::SageMaker::TransformJob",
+        "AWS::SageMaker::ProcessingJob"
+      ]
+    },
+    "CandidateSteps":{
+      "type":"list",
+      "member":{"shape":"AutoMLCandidateStep"}
+    },
+    "CaptureContentTypeHeader":{
+      "type":"structure",
+      "members":{
+        "CsvContentTypes":{
+          "shape":"CsvContentTypes",
+          "documentation":"<p/>"
+        },
+        "JsonContentTypes":{
+          "shape":"JsonContentTypes",
+          "documentation":"<p/>"
+        }
+      },
+      "documentation":"<p/>"
+    },
+    "CaptureMode":{
+      "type":"string",
+      "enum":[
+        "Input",
+        "Output"
+      ]
+    },
+    "CaptureOption":{
+      "type":"structure",
+      "required":["CaptureMode"],
+      "members":{
+        "CaptureMode":{
+          "shape":"CaptureMode",
+          "documentation":"<p/>"
+        }
+      },
+      "documentation":"<p/>"
+    },
+    "CaptureOptionList":{
+      "type":"list",
+      "member":{"shape":"CaptureOption"},
+      "max":2,
+      "min":1
+    },
+    "CaptureStatus":{
+      "type":"string",
+      "enum":[
+        "Started",
+        "Stopped"
+      ]
     },
     "CategoricalParameterRange":{
       "type":"structure",
@@ -1186,7 +2576,7 @@
         },
         "RecordWrapperType":{
           "shape":"RecordWrapper",
-          "documentation":"<p/> <p>Specify RecordIO as the value when input data is in raw format but the training algorithm requires the RecordIO format. In this case, Amazon SageMaker wraps each individual S3 object in a RecordIO record. If the input data is already in RecordIO format, you don't need to set this attribute. For more information, see <a href=\"https://mxnet.incubator.apache.org/architecture/note_data_loading.html#data-format\">Create a Dataset Using RecordIO</a>. </p> <p>In File mode, leave this field unset or set it to None.</p>"
+          "documentation":"<p/> <p>Specify RecordIO as the value when input data is in raw format but the training algorithm requires the RecordIO format. In this case, Amazon SageMaker wraps each individual S3 object in a RecordIO record. If the input data is already in RecordIO format, you don't need to set this attribute. For more information, see <a href=\"https://mxnet.apache.org/api/architecture/note_data_loading#data-format\">Create a Dataset Using RecordIO</a>. </p> <p>In File mode, leave this field unset or set it to None.</p>"
         },
         "InputMode":{
           "shape":"TrainingInputMode",
@@ -1261,6 +2651,16 @@
       },
       "documentation":"<p>Contains information about the output location for managed spot training checkpoint data. </p>"
     },
+    "Cidr":{
+      "type":"string",
+      "max":64,
+      "min":4,
+      "pattern":"(^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])(\\/(3[0-2]|[1-2][0-9]|[0-9]))$)|(^s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:)))(%.+)?s*(\\/(12[0-8]|1[0-1][0-9]|[1-9][0-9]|[0-9]))$)"
+    },
+    "Cidrs":{
+      "type":"list",
+      "member":{"shape":"Cidr"}
+    },
     "CodeRepositoryArn":{
       "type":"string",
       "max":2048,
@@ -1375,6 +2775,39 @@
       "min":1,
       "pattern":"[\\w-]+_[0-9a-zA-Z]+"
     },
+    "CollectionConfiguration":{
+      "type":"structure",
+      "members":{
+        "CollectionName":{
+          "shape":"CollectionName",
+          "documentation":"<p>The name of the tensor collection. The name must be unique relative to other rule configuration names.</p>"
+        },
+        "CollectionParameters":{
+          "shape":"CollectionParameters",
+          "documentation":"<p>Parameter values for the tensor collection. The allowed parameters are <code>\"name\"</code>, <code>\"include_regex\"</code>, <code>\"reduction_config\"</code>, <code>\"save_config\"</code>, <code>\"tensor_names\"</code>, and <code>\"save_histogram\"</code>.</p>"
+        }
+      },
+      "documentation":"<p>Configuration information for tensor collections.</p>"
+    },
+    "CollectionConfigurations":{
+      "type":"list",
+      "member":{"shape":"CollectionConfiguration"},
+      "max":20,
+      "min":0
+    },
+    "CollectionName":{
+      "type":"string",
+      "max":256,
+      "min":1,
+      "pattern":".*"
+    },
+    "CollectionParameters":{
+      "type":"map",
+      "key":{"shape":"ConfigKey"},
+      "value":{"shape":"ConfigValue"},
+      "max":20,
+      "min":0
+    },
     "CompilationJobArn":{
       "type":"string",
       "max":256,
@@ -1451,17 +2884,51 @@
       "type":"list",
       "member":{"shape":"CompressionType"}
     },
+    "ConfigKey":{
+      "type":"string",
+      "max":256,
+      "min":1,
+      "pattern":".*"
+    },
+    "ConfigValue":{
+      "type":"string",
+      "max":256,
+      "pattern":".*"
+    },
+    "ConflictException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"FailureReason"}
+      },
+      "documentation":"<p>There was a conflict when you attempted to modify an experiment, trial, or trial component.</p>",
+      "exception":true
+    },
+    "ContainerArgument":{
+      "type":"string",
+      "max":256,
+      "pattern":".*"
+    },
+    "ContainerArguments":{
+      "type":"list",
+      "member":{"shape":"ContainerArgument"},
+      "max":100,
+      "min":1
+    },
     "ContainerDefinition":{
       "type":"structure",
       "members":{
         "ContainerHostname":{
           "shape":"ContainerHostname",
-          "documentation":"<p>This parameter is ignored for models that contain only a <code>PrimaryContainer</code>.</p> <p>When a <code>ContainerDefinition</code> is part of an inference pipeline, the value of ths parameter uniquely identifies the container for the purposes of logging and metrics. For information, see <a href=\"https://docs.aws.amazon.com/sagemaker/latest/dg/inference-pipeline-logs-metrics.html\">Use Logs and Metrics to Monitor an Inference Pipeline</a>. If you don't specify a value for this parameter for a <code>ContainerDefinition</code> that is part of an inference pipeline, a unique name is automatically assigned based on the position of the <code>ContainerDefinition</code> in the pipeline. If you specify a value for the <code>ContainerHostName</code> for any <code>ContainerDefinition</code> that is part of an inference pipeline, you must specify a value for the <code>ContainerHostName</code> parameter of every <code>ContainerDefinition</code> in that pipeline.</p>"
+          "documentation":"<p>This parameter is ignored for models that contain only a <code>PrimaryContainer</code>.</p> <p>When a <code>ContainerDefinition</code> is part of an inference pipeline, the value of the parameter uniquely identifies the container for the purposes of logging and metrics. For information, see <a href=\"https://docs.aws.amazon.com/sagemaker/latest/dg/inference-pipeline-logs-metrics.html\">Use Logs and Metrics to Monitor an Inference Pipeline</a>. If you don't specify a value for this parameter for a <code>ContainerDefinition</code> that is part of an inference pipeline, a unique name is automatically assigned based on the position of the <code>ContainerDefinition</code> in the pipeline. If you specify a value for the <code>ContainerHostName</code> for any <code>ContainerDefinition</code> that is part of an inference pipeline, you must specify a value for the <code>ContainerHostName</code> parameter of every <code>ContainerDefinition</code> in that pipeline.</p>"
         },
         "Image":{
           "shape":"Image",
           "documentation":"<p>The Amazon EC2 Container Registry (Amazon ECR) path where inference code is stored. If you are using your own custom algorithm instead of an algorithm provided by Amazon SageMaker, the inference code must meet Amazon SageMaker requirements. Amazon SageMaker supports both <code>registry/repository[:tag]</code> and <code>registry/repository[@digest]</code> image path formats. For more information, see <a href=\"https://docs.aws.amazon.com/sagemaker/latest/dg/your-algorithms.html\">Using Your Own Algorithms with Amazon SageMaker</a> </p>"
         },
+        "Mode":{
+          "shape":"ContainerMode",
+          "documentation":"<p>Whether the container hosts a single model or multiple models.</p>"
+        },
         "ModelDataUrl":{
           "shape":"Url",
           "documentation":"<p>The S3 path where the model artifacts, which result from model training, are stored. This path must point to a single gzip compressed tar archive (.tar.gz suffix). The S3 path is required for Amazon SageMaker built-in algorithms, but not if you use your own algorithms. For more information on built-in algorithms, see <a href=\"https://docs.aws.amazon.com/sagemaker/latest/dg/sagemaker-algo-docker-registry-paths.html\">Common Parameters</a>. </p> <p>If you provide a value for this parameter, Amazon SageMaker uses AWS Security Token Service to download model artifacts from the S3 path you provide. AWS STS is activated in your IAM user account by default. If you previously deactivated AWS STS for a region, you need to reactivate AWS STS for that region. For more information, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_enable-regions.html\">Activating and Deactivating AWS STS in an AWS Region</a> in the <i>AWS Identity and Access Management User Guide</i>.</p> <important> <p>If you use a built-in algorithm to create a model, Amazon SageMaker requires that you provide a S3 path to the model artifacts in <code>ModelDataUrl</code>.</p> </important>"
@@ -1482,11 +2949,29 @@
       "member":{"shape":"ContainerDefinition"},
       "max":5
     },
+    "ContainerEntrypoint":{
+      "type":"list",
+      "member":{"shape":"ContainerEntrypointString"},
+      "max":100,
+      "min":1
+    },
+    "ContainerEntrypointString":{
+      "type":"string",
+      "max":256,
+      "pattern":".*"
+    },
     "ContainerHostname":{
       "type":"string",
       "max":63,
       "pattern":"^[a-zA-Z0-9](-*[a-zA-Z0-9])*"
     },
+    "ContainerMode":{
+      "type":"string",
+      "enum":[
+        "SingleModel",
+        "MultiModel"
+      ]
+    },
     "ContentClassifier":{
       "type":"string",
       "enum":[
@@ -1530,7 +3015,7 @@
         },
         "ScalingType":{
           "shape":"HyperParameterScalingType",
-          "documentation":"<p>The scale that hyperparameter tuning uses to search the hyperparameter range. For information about choosing a hyperparameter scale, see <a href=\"https://docs.aws.amazon.com/sagemaker/latest/dg/automatic-model-tuning-define-ranges.html#scaling-type\">Hyperparameter Scaling</a>. One of the following values:</p> <dl> <dt>Auto</dt> <dd> <p>Amazon SageMaker hyperparameter tuning chooses the best scale for the hyperparameter.</p> </dd> <dt>Linear</dt> <dd> <p>Hyperparameter tuning searches the values in the hyperparameter range by using a linear scale.</p> </dd> <dt>Logarithmic</dt> <dd> <p>Hyperparameter tuning searches the values in the hyperparameter range by using a logarithmic scale.</p> <p>Logarithmic scaling works only for ranges that have only values greater than 0.</p> </dd> <dt>ReverseLogarithmic</dt> <dd> <p>Hyperparemeter tuning searches the values in the hyperparameter range by using a reverse logarithmic scale.</p> <p>Reverse logarithmic scaling works only for ranges that are entirely within the range 0&lt;=x&lt;1.0.</p> </dd> </dl>"
+          "documentation":"<p>The scale that hyperparameter tuning uses to search the hyperparameter range. For information about choosing a hyperparameter scale, see <a href=\"https://docs.aws.amazon.com/sagemaker/latest/dg/automatic-model-tuning-define-ranges.html#scaling-type\">Hyperparameter Scaling</a>. One of the following values:</p> <dl> <dt>Auto</dt> <dd> <p>Amazon SageMaker hyperparameter tuning chooses the best scale for the hyperparameter.</p> </dd> <dt>Linear</dt> <dd> <p>Hyperparameter tuning searches the values in the hyperparameter range by using a linear scale.</p> </dd> <dt>Logarithmic</dt> <dd> <p>Hyperparameter tuning searches the values in the hyperparameter range by using a logarithmic scale.</p> <p>Logarithmic scaling works only for ranges that have only values greater than 0.</p> </dd> <dt>ReverseLogarithmic</dt> <dd> <p>Hyperparameter tuning searches the values in the hyperparameter range by using a reverse logarithmic scale.</p> <p>Reverse logarithmic scaling works only for ranges that are entirely within the range 0&lt;=x&lt;1.0.</p> </dd> </dl>"
         }
       },
       "documentation":"<p>A list of continuous hyperparameters to tune.</p>"
@@ -1602,6 +3087,107 @@
         }
       }
     },
+    "CreateAppRequest":{
+      "type":"structure",
+      "required":[
+        "DomainId",
+        "UserProfileName",
+        "AppType",
+        "AppName"
+      ],
+      "members":{
+        "DomainId":{
+          "shape":"DomainId",
+          "documentation":"<p>The domain ID.</p>"
+        },
+        "UserProfileName":{
+          "shape":"UserProfileName",
+          "documentation":"<p>The user profile name.</p>"
+        },
+        "AppType":{
+          "shape":"AppType",
+          "documentation":"<p>The type of app.</p>"
+        },
+        "AppName":{
+          "shape":"AppName",
+          "documentation":"<p>The name of the app.</p>"
+        },
+        "Tags":{
+          "shape":"TagList",
+          "documentation":"<p>Each tag consists of a key and an optional value. Tag keys must be unique per resource.</p>"
+        },
+        "ResourceSpec":{
+          "shape":"ResourceSpec",
+          "documentation":"<p>The instance type and quantity.</p>"
+        }
+      }
+    },
+    "CreateAppResponse":{
+      "type":"structure",
+      "members":{
+        "AppArn":{
+          "shape":"AppArn",
+          "documentation":"<p>The app's Amazon Resource Name (ARN).</p>"
+        }
+      }
+    },
+    "CreateAutoMLJobRequest":{
+      "type":"structure",
+      "required":[
+        "AutoMLJobName",
+        "InputDataConfig",
+        "OutputDataConfig",
+        "RoleArn"
+      ],
+      "members":{
+        "AutoMLJobName":{
+          "shape":"AutoMLJobName",
+          "documentation":"<p>Identifies an AutoPilot job. Must be unique to your account and is case-insensitive.</p>"
+        },
+        "InputDataConfig":{
+          "shape":"AutoMLInputDataConfig",
+          "documentation":"<p>Similar to InputDataConfig supported by Tuning. Format(s) supported: CSV. Minimum of 1000 rows.</p>"
+        },
+        "OutputDataConfig":{
+          "shape":"AutoMLOutputDataConfig",
+          "documentation":"<p>Similar to OutputDataConfig supported by Tuning. Format(s) supported: CSV.</p>"
+        },
+        "ProblemType":{
+          "shape":"ProblemType",
+          "documentation":"<p>Defines the kind of preprocessing and algorithms intended for the candidates. Options include: BinaryClassification, MulticlassClassification, and Regression.</p>"
+        },
+        "AutoMLJobObjective":{
+          "shape":"AutoMLJobObjective",
+          "documentation":"<p>Defines the job's objective. You provide a MetricName and AutoML will infer minimize or maximize. If this is not provided, the most commonly used ObjectiveMetric for problem type will be selected.</p>"
+        },
+        "AutoMLJobConfig":{
+          "shape":"AutoMLJobConfig",
+          "documentation":"<p>Contains CompletionCriteria and SecurityConfig.</p>"
+        },
+        "RoleArn":{
+          "shape":"RoleArn",
+          "documentation":"<p>The ARN of the role that will be used to access the data.</p>"
+        },
+        "GenerateCandidateDefinitionsOnly":{
+          "shape":"GenerateCandidateDefinitionsOnly",
+          "documentation":"<p>This will generate possible candidates without training a model. A candidate is a combination of data preprocessors, algorithms, and algorithm parameter settings.</p>"
+        },
+        "Tags":{
+          "shape":"TagList",
+          "documentation":"<p>Each tag consists of a key and an optional value. Tag keys must be unique per resource.</p>"
+        }
+      }
+    },
+    "CreateAutoMLJobResponse":{
+      "type":"structure",
+      "required":["AutoMLJobArn"],
+      "members":{
+        "AutoMLJobArn":{
+          "shape":"AutoMLJobArn",
+          "documentation":"<p>When a job is created, it is assigned a unique ARN.</p>"
+        }
+      }
+    },
     "CreateCodeRepositoryInput":{
       "type":"structure",
       "required":[
@@ -1671,6 +3257,59 @@
         }
       }
     },
+    "CreateDomainRequest":{
+      "type":"structure",
+      "required":[
+        "DomainName",
+        "AuthMode",
+        "DefaultUserSettings",
+        "SubnetIds",
+        "VpcId"
+      ],
+      "members":{
+        "DomainName":{
+          "shape":"DomainName",
+          "documentation":"<p>A name for the domain.</p>"
+        },
+        "AuthMode":{
+          "shape":"AuthMode",
+          "documentation":"<p>The mode of authentication that member use to access the domain.</p>"
+        },
+        "DefaultUserSettings":{
+          "shape":"UserSettings",
+          "documentation":"<p>The default user settings.</p>"
+        },
+        "SubnetIds":{
+          "shape":"Subnets",
+          "documentation":"<p>Security setting to limit to a set of subnets.</p>"
+        },
+        "VpcId":{
+          "shape":"VpcId",
+          "documentation":"<p>Security setting to limit the domain's communication to a Amazon Virtual Private Cloud.</p>"
+        },
+        "Tags":{
+          "shape":"TagList",
+          "documentation":"<p>Each tag consists of a key and an optional value. Tag keys must be unique per resource.</p>"
+        },
+        "HomeEfsFileSystemKmsKeyId":{
+          "shape":"KmsKeyId",
+          "documentation":"<p>The AWS Key Management Service encryption key ID.</p>"
+        }
+      }
+    },
+    "CreateDomainResponse":{
+      "type":"structure",
+      "members":{
+        "DomainArn":{
+          "shape":"DomainArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the created domain.</p>"
+        },
+        "Url":{
+          "shape":"String1024",
+          "documentation":"<p>The URL to the created domain.</p>"
+        }
+      }
+    },
     "CreateEndpointConfigInput":{
       "type":"structure",
       "required":[
@@ -1680,60 +3319,166 @@
       "members":{
         "EndpointConfigName":{
           "shape":"EndpointConfigName",
-          "documentation":"<p>The name of the endpoint configuration. You specify this name in a <a href=\"https://docs.aws.amazon.com/sagemaker/latest/dg/API_CreateEndpoint.html\">CreateEndpoint</a> request. </p>"
+          "documentation":"<p>The name of the endpoint configuration. You specify this name in a <a>CreateEndpoint</a> request. </p>"
         },
         "ProductionVariants":{
           "shape":"ProductionVariantList",
           "documentation":"<p>An list of <code>ProductionVariant</code> objects, one for each model that you want to host at this endpoint.</p>"
         },
+        "DataCaptureConfig":{"shape":"DataCaptureConfig"},
+        "Tags":{
+          "shape":"TagList",
+          "documentation":"<p>A list of key-value pairs. For more information, see <a href=\"https://docs.aws.amazon.com/awsaccountbilling/latest/aboutv2/cost-alloc-tags.html#allocation-what\">Using Cost Allocation Tags</a> in the <i> AWS Billing and Cost Management User Guide</i>. </p>"
+        },
+        "KmsKeyId":{
+          "shape":"KmsKeyId",
+          "documentation":"<p>The Amazon Resource Name (ARN) of a AWS Key Management Service key that Amazon SageMaker uses to encrypt data on the storage volume attached to the ML compute instance that hosts the endpoint.</p> <p>The KmsKeyId can be any of the following formats: </p> <ul> <li> <p>Key ID: <code>1234abcd-12ab-34cd-56ef-1234567890ab</code> </p> </li> <li> <p>Key ARN: <code>arn:aws:kms:us-west-2:111122223333:key/1234abcd-12ab-34cd-56ef-1234567890ab</code> </p> </li> <li> <p>Alias name: <code>alias/ExampleAlias</code> </p> </li> <li> <p>Alias name ARN: <code>arn:aws:kms:us-west-2:111122223333:alias/ExampleAlias</code> </p> </li> </ul> <p>The KMS key policy must grant permission to the IAM role that you specify in your <code>CreateEndpoint</code>, <code>UpdateEndpoint</code> requests. For more information, refer to the AWS Key Management Service section<a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/key-policies.html\"> Using Key Policies in AWS KMS </a> </p> <note> <p>Certain Nitro-based instances include local storage, dependent on the instance type. Local storage volumes are encrypted using a hardware module on the instance. You can't request a <code>KmsKeyId</code> when using an instance type with local storage. If any of the models that you specify in the <code>ProductionVariants</code> parameter use nitro-based instances with local storage, do not specify a value for the <code>KmsKeyId</code> parameter. If you specify a value for <code>KmsKeyId</code> when using any nitro-based instances with local storage, the call to <code>CreateEndpointConfig</code> fails.</p> <p>For a list of instance types that support local instance storage, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/InstanceStorage.html#instance-store-volumes\">Instance Store Volumes</a>.</p> <p>For more information about local instance storage encryption, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ssd-instance-store.html\">SSD Instance Store Volumes</a>.</p> </note>"
+        }
+      }
+    },
+    "CreateEndpointConfigOutput":{
+      "type":"structure",
+      "required":["EndpointConfigArn"],
+      "members":{
+        "EndpointConfigArn":{
+          "shape":"EndpointConfigArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the endpoint configuration. </p>"
+        }
+      }
+    },
+    "CreateEndpointInput":{
+      "type":"structure",
+      "required":[
+        "EndpointName",
+        "EndpointConfigName"
+      ],
+      "members":{
+        "EndpointName":{
+          "shape":"EndpointName",
+          "documentation":"<p>The name of the endpoint. The name must be unique within an AWS Region in your AWS account.</p>"
+        },
+        "EndpointConfigName":{
+          "shape":"EndpointConfigName",
+          "documentation":"<p>The name of an endpoint configuration. For more information, see <a>CreateEndpointConfig</a>. </p>"
+        },
+        "Tags":{
+          "shape":"TagList",
+          "documentation":"<p>An array of key-value pairs. For more information, see <a href=\"https://docs.aws.amazon.com/awsaccountbilling/latest/aboutv2/cost-alloc-tags.html#allocation-what\">Using Cost Allocation Tags</a>in the <i>AWS Billing and Cost Management User Guide</i>. </p>"
+        }
+      }
+    },
+    "CreateEndpointOutput":{
+      "type":"structure",
+      "required":["EndpointArn"],
+      "members":{
+        "EndpointArn":{
+          "shape":"EndpointArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the endpoint.</p>"
+        }
+      }
+    },
+    "CreateExperimentRequest":{
+      "type":"structure",
+      "required":["ExperimentName"],
+      "members":{
+        "ExperimentName":{
+          "shape":"ExperimentEntityName",
+          "documentation":"<p>The name of the experiment. The name must be unique in your AWS account and is not case-sensitive.</p>"
+        },
+        "DisplayName":{
+          "shape":"ExperimentEntityName",
+          "documentation":"<p>The name of the experiment as displayed. The name doesn't need to be unique. If you don't specify <code>DisplayName</code>, the value in <code>ExperimentName</code> is displayed.</p>"
+        },
+        "Description":{
+          "shape":"ExperimentDescription",
+          "documentation":"<p>The description of the experiment.</p>"
+        },
+        "Tags":{
+          "shape":"TagList",
+          "documentation":"<p>A list of tags to associate with the experiment. You can use <a>Search</a> API to search on the tags.</p>"
+        }
+      }
+    },
+    "CreateExperimentResponse":{
+      "type":"structure",
+      "members":{
+        "ExperimentArn":{
+          "shape":"ExperimentArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the experiment.</p>"
+        }
+      }
+    },
+    "CreateFlowDefinitionRequest":{
+      "type":"structure",
+      "required":[
+        "FlowDefinitionName",
+        "HumanLoopConfig",
+        "OutputConfig",
+        "RoleArn"
+      ],
+      "members":{
+        "FlowDefinitionName":{
+          "shape":"FlowDefinitionName",
+          "documentation":"<p>The name of your flow definition.</p>"
+        },
+        "HumanLoopRequestSource":{"shape":"HumanLoopRequestSource"},
+        "HumanLoopActivationConfig":{
+          "shape":"HumanLoopActivationConfig",
+          "documentation":"<p>An object containing information about the events that trigger a human workflow.</p>"
+        },
+        "HumanLoopConfig":{
+          "shape":"HumanLoopConfig",
+          "documentation":"<p>An object containing information about the tasks the human reviewers will perform.</p>"
+        },
+        "OutputConfig":{
+          "shape":"FlowDefinitionOutputConfig",
+          "documentation":"<p>An object containing information about where the human review results will be uploaded.</p>"
+        },
+        "RoleArn":{
+          "shape":"RoleArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the role needed to call other services on your behalf. For example, <code>arn:aws:iam::1234567890:role/service-role/AmazonSageMaker-ExecutionRole-20180111T151298</code>.</p>"
+        },
         "Tags":{
           "shape":"TagList",
-          "documentation":"<p>A list of key-value pairs. For more information, see <a href=\"https://docs.aws.amazon.com/awsaccountbilling/latest/aboutv2/cost-alloc-tags.html#allocation-what\">Using Cost Allocation Tags</a> in the <i> AWS Billing and Cost Management User Guide</i>. </p>"
-        },
-        "KmsKeyId":{
-          "shape":"KmsKeyId",
-          "documentation":"<p>The Amazon Resource Name (ARN) of a AWS Key Management Service key that Amazon SageMaker uses to encrypt data on the storage volume attached to the ML compute instance that hosts the endpoint.</p> <note> <p>Nitro-based instances do not support encryption with AWS KMS. If any of the models that you specify in the <code>ProductionVariants</code> parameter use nitro-based instances, do not specify a value for the <code>KmsKeyId</code> parameter. If you specify a value for <code>KmsKeyId</code> when using any nitro-based instances, the call to <code>CreateEndpointConfig</code> fails.</p> <p>For a list of nitro-based instances, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/instance-types.html#ec2-nitro-instances\">Nitro-based Instances</a> in the <i>Amazon Elastic Compute Cloud User Guide for Linux Instances</i>.</p> <p>For more information about storage volumes on nitro-based instances, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/nvme-ebs-volumes.html\">Amazon EBS and NVMe on Linux Instances</a>.</p> </note>"
+          "documentation":"<p>An array of key-value pairs that contain metadata to help you categorize and organize a flow definition. Each tag consists of a key and a value, both of which you define.</p>"
         }
       }
     },
-    "CreateEndpointConfigOutput":{
+    "CreateFlowDefinitionResponse":{
       "type":"structure",
-      "required":["EndpointConfigArn"],
+      "required":["FlowDefinitionArn"],
       "members":{
-        "EndpointConfigArn":{
-          "shape":"EndpointConfigArn",
-          "documentation":"<p>The Amazon Resource Name (ARN) of the endpoint configuration. </p>"
+        "FlowDefinitionArn":{
+          "shape":"FlowDefinitionArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the flow definition you create.</p>"
         }
       }
     },
-    "CreateEndpointInput":{
+    "CreateHumanTaskUiRequest":{
       "type":"structure",
       "required":[
-        "EndpointName",
-        "EndpointConfigName"
+        "HumanTaskUiName",
+        "UiTemplate"
       ],
       "members":{
-        "EndpointName":{
-          "shape":"EndpointName",
-          "documentation":"<p>The name of the endpoint. The name must be unique within an AWS Region in your AWS account.</p>"
-        },
-        "EndpointConfigName":{
-          "shape":"EndpointConfigName",
-          "documentation":"<p>The name of an endpoint configuration. For more information, see <a href=\"https://docs.aws.amazon.com/sagemaker/latest/dg/API_CreateEndpointConfig.html\">CreateEndpointConfig</a>. </p>"
+        "HumanTaskUiName":{
+          "shape":"HumanTaskUiName",
+          "documentation":"<p>The name of the user interface you are creating.</p>"
         },
+        "UiTemplate":{"shape":"UiTemplate"},
         "Tags":{
           "shape":"TagList",
-          "documentation":"<p>An array of key-value pairs. For more information, see <a href=\"https://docs.aws.amazon.com/awsaccountbilling/latest/aboutv2/cost-alloc-tags.html#allocation-what\">Using Cost Allocation Tags</a>in the <i>AWS Billing and Cost Management User Guide</i>. </p>"
+          "documentation":"<p>An array of key-value pairs that contain metadata to help you categorize and organize a human review workflow user interface. Each tag consists of a key and a value, both of which you define.</p>"
         }
       }
     },
-    "CreateEndpointOutput":{
+    "CreateHumanTaskUiResponse":{
       "type":"structure",
-      "required":["EndpointArn"],
+      "required":["HumanTaskUiArn"],
       "members":{
-        "EndpointArn":{
-          "shape":"EndpointArn",
-          "documentation":"<p>The Amazon Resource Name (ARN) of the endpoint.</p>"
+        "HumanTaskUiArn":{
+          "shape":"HumanTaskUiArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the human review workflow user interface you create.</p>"
         }
       }
     },
@@ -1750,19 +3495,23 @@
         },
         "HyperParameterTuningJobConfig":{
           "shape":"HyperParameterTuningJobConfig",
-          "documentation":"<p>The <a>HyperParameterTuningJobConfig</a> object that describes the tuning job, including the search strategy, the objective metric used to evaluate training jobs, ranges of parameters to search, and resource limits for the tuning job. For more information, see <a>automatic-model-tuning</a> </p>"
+          "documentation":"<p>The <a>HyperParameterTuningJobConfig</a> object that describes the tuning job, including the search strategy, the objective metric used to evaluate training jobs, ranges of parameters to search, and resource limits for the tuning job. For more information, see <a href=\"https://docs.aws.amazon.com/sagemaker/latest/dg/automatic-model-tuning-how-it-works.html\">How Hyperparameter Tuning Works</a>.</p>"
         },
         "TrainingJobDefinition":{
           "shape":"HyperParameterTrainingJobDefinition",
           "documentation":"<p>The <a>HyperParameterTrainingJobDefinition</a> object that describes the training jobs that this tuning job launches, including static hyperparameters, input data configuration, output data configuration, resource configuration, and stopping condition.</p>"
         },
+        "TrainingJobDefinitions":{
+          "shape":"HyperParameterTrainingJobDefinitions",
+          "documentation":"<p/>"
+        },
         "WarmStartConfig":{
           "shape":"HyperParameterTuningJobWarmStartConfig",
           "documentation":"<p>Specifies the configuration for starting the hyperparameter tuning job using one or more previous tuning jobs as a starting point. The results of previous tuning jobs are used to inform which combinations of hyperparameters to search over in the new tuning job.</p> <p>All training jobs launched by the new hyperparameter tuning job are evaluated by using the objective metric. If you specify <code>IDENTICAL_DATA_AND_ALGORITHM</code> as the <code>WarmStartType</code> value for the warm start configuration, the training job that performs the best in the new tuning job is compared to the best training jobs from the parent tuning jobs. From these, the training job that performs the best as measured by the objective metric is returned as the overall best training job.</p> <note> <p>All training jobs launched by parent hyperparameter tuning jobs and the new hyperparameter tuning jobs count against the limit of training jobs for the tuning job.</p> </note>"
         },
         "Tags":{
           "shape":"TagList",
-          "documentation":"<p>An array of key-value pairs. You can use tags to categorize your AWS resources in different ways, for example, by purpose, owner, or environment. For more information, see <a href=\"https://docs.aws.amazon.com/https:/aws.amazon.com/answers/account-management/aws-tagging-strategies/\">AWS Tagging Strategies</a>.</p> <p>Tags that you specify for the tuning job are also added to all training jobs that the tuning job launches.</p>"
+          "documentation":"<p>An array of key-value pairs. You can use tags to categorize your AWS resources in different ways, for example, by purpose, owner, or environment. For more information, see <a href=\"https://aws.amazon.com/answers/account-management/aws-tagging-strategies/\">AWS Tagging Strategies</a>.</p> <p>Tags that you specify for the tuning job are also added to all training jobs that the tuning job launches.</p>"
         }
       }
     },
@@ -1821,7 +3570,7 @@
         },
         "HumanTaskConfig":{
           "shape":"HumanTaskConfig",
-          "documentation":"<p>Configures the information required for human workers to complete a labeling task.</p>"
+          "documentation":"<p>Configures the labeling task and how it is presented to workers; including, but not limited to price, keywords, and batch size (task count).</p>"
         },
         "Tags":{
           "shape":"TagList",
@@ -1868,11 +3617,11 @@
         },
         "VpcConfig":{
           "shape":"VpcConfig",
-          "documentation":"<p>A <a href=\"https://docs.aws.amazon.com/sagemaker/latest/dg/API_VpcConfig.html\">VpcConfig</a> object that specifies the VPC that you want your model to connect to. Control access to and from your model container by configuring the VPC. <code>VpcConfig</code> is used in hosting services and in batch transform. For more information, see <a href=\"https://docs.aws.amazon.com/sagemaker/latest/dg/host-vpc.html\">Protect Endpoints by Using an Amazon Virtual Private Cloud</a> and <a href=\"https://docs.aws.amazon.com/sagemaker/latest/dg/batch-vpc.html\">Protect Data in Batch Transform Jobs by Using an Amazon Virtual Private Cloud</a>.</p>"
+          "documentation":"<p>A <a>VpcConfig</a> object that specifies the VPC that you want your model to connect to. Control access to and from your model container by configuring the VPC. <code>VpcConfig</code> is used in hosting services and in batch transform. For more information, see <a href=\"https://docs.aws.amazon.com/sagemaker/latest/dg/host-vpc.html\">Protect Endpoints by Using an Amazon Virtual Private Cloud</a> and <a href=\"https://docs.aws.amazon.com/sagemaker/latest/dg/batch-vpc.html\">Protect Data in Batch Transform Jobs by Using an Amazon Virtual Private Cloud</a>.</p>"
         },
         "EnableNetworkIsolation":{
           "shape":"Boolean",
-          "documentation":"<p>Isolates the model container. No inbound or outbound network calls can be made to or from the model container.</p> <note> <p>The Semantic Segmentation built-in algorithm does not support network isolation.</p> </note>"
+          "documentation":"<p>Isolates the model container. No inbound or outbound network calls can be made to or from the model container.</p>"
         }
       }
     },
@@ -1926,6 +3675,37 @@
         }
       }
     },
+    "CreateMonitoringScheduleRequest":{
+      "type":"structure",
+      "required":[
+        "MonitoringScheduleName",
+        "MonitoringScheduleConfig"
+      ],
+      "members":{
+        "MonitoringScheduleName":{
+          "shape":"MonitoringScheduleName",
+          "documentation":"<p>The name of the monitoring schedule. The name must be unique within an AWS Region within an AWS account.</p>"
+        },
+        "MonitoringScheduleConfig":{
+          "shape":"MonitoringScheduleConfig",
+          "documentation":"<p>The configuration object that specifies the monitoring schedule and defines the monitoring job.</p>"
+        },
+        "Tags":{
+          "shape":"TagList",
+          "documentation":"<p>(Optional) An array of key-value pairs. For more information, see <a href=\" https://docs.aws.amazon.com/awsaccountbilling/latest/aboutv2/cost-alloc-tags.html#allocation-whatURL\">Using Cost Allocation Tags</a> in the <i>AWS Billing and Cost Management User Guide</i>.</p>"
+        }
+      }
+    },
+    "CreateMonitoringScheduleResponse":{
+      "type":"structure",
+      "required":["MonitoringScheduleArn"],
+      "members":{
+        "MonitoringScheduleArn":{
+          "shape":"MonitoringScheduleArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the monitoring schedule.</p>"
+        }
+      }
+    },
     "CreateNotebookInstanceInput":{
       "type":"structure",
       "required":[
@@ -1952,7 +3732,7 @@
         },
         "RoleArn":{
           "shape":"RoleArn",
-          "documentation":"<p> When you send any requests to AWS resources from the notebook instance, Amazon SageMaker assumes this role to perform tasks on your behalf. You must grant this role necessary permissions so Amazon SageMaker can perform these tasks. The policy must allow the Amazon SageMaker service principal (sagemaker.amazonaws.com) permissionsto to assume this role. For more information, see <a href=\"https://docs.aws.amazon.com/sagemaker/latest/dg/sagemaker-roles.html\">Amazon SageMaker Roles</a>. </p> <note> <p>To be able to pass this role to Amazon SageMaker, the caller of this API must have the <code>iam:PassRole</code> permission.</p> </note>"
+          "documentation":"<p> When you send any requests to AWS resources from the notebook instance, Amazon SageMaker assumes this role to perform tasks on your behalf. You must grant this role necessary permissions so Amazon SageMaker can perform these tasks. The policy must allow the Amazon SageMaker service principal (sagemaker.amazonaws.com) permissions to assume this role. For more information, see <a href=\"https://docs.aws.amazon.com/sagemaker/latest/dg/sagemaker-roles.html\">Amazon SageMaker Roles</a>. </p> <note> <p>To be able to pass this role to Amazon SageMaker, the caller of this API must have the <code>iam:PassRole</code> permission.</p> </note>"
         },
         "KmsKeyId":{
           "shape":"KmsKeyId",
@@ -1984,7 +3764,7 @@
         },
         "AdditionalCodeRepositories":{
           "shape":"AdditionalCodeRepositoryNamesOrUrls",
-          "documentation":"<p>An array of up to three Git repositories to associate with the notebook instance. These can be either the names of Git repositories stored as resources in your account, or the URL of Git repositories in <a href=\"codecommit/latest/userguide/welcome.html\">AWS CodeCommit</a> or in any other Git repository. These repositories are cloned at the same level as the default repository of your notebook instance. For more information, see <a href=\"https://docs.aws.amazon.com/sagemaker/latest/dg/nbi-git-repo.html\">Associating Git Repositories with Amazon SageMaker Notebook Instances</a>.</p>"
+          "documentation":"<p>An array of up to three Git repositories to associate with the notebook instance. These can be either the names of Git repositories stored as resources in your account, or the URL of Git repositories in <a href=\"https://docs.aws.amazon.com/codecommit/latest/userguide/welcome.html\">AWS CodeCommit</a> or in any other Git repository. These repositories are cloned at the same level as the default repository of your notebook instance. For more information, see <a href=\"https://docs.aws.amazon.com/sagemaker/latest/dg/nbi-git-repo.html\">Associating Git Repositories with Amazon SageMaker Notebook Instances</a>.</p>"
         },
         "RootAccess":{
           "shape":"RootAccess",
@@ -2028,6 +3808,36 @@
         }
       }
     },
+    "CreatePresignedDomainUrlRequest":{
+      "type":"structure",
+      "required":[
+        "DomainId",
+        "UserProfileName"
+      ],
+      "members":{
+        "DomainId":{
+          "shape":"DomainId",
+          "documentation":"<p>The domain ID.</p>"
+        },
+        "UserProfileName":{
+          "shape":"UserProfileName",
+          "documentation":"<p>The name of the UserProfile to sign-in as.</p>"
+        },
+        "SessionExpirationDurationInSeconds":{
+          "shape":"SessionExpirationDurationInSeconds",
+          "documentation":"<p>The session expiration duration in seconds.</p>"
+        }
+      }
+    },
+    "CreatePresignedDomainUrlResponse":{
+      "type":"structure",
+      "members":{
+        "AuthorizedUrl":{
+          "shape":"PresignedDomainUrl",
+          "documentation":"<p>The presigned URL.</p>"
+        }
+      }
+    },
     "CreatePresignedNotebookInstanceUrlInput":{
       "type":"structure",
       "required":["NotebookInstanceName"],
@@ -2051,6 +3861,68 @@
         }
       }
     },
+    "CreateProcessingJobRequest":{
+      "type":"structure",
+      "required":[
+        "ProcessingJobName",
+        "ProcessingResources",
+        "AppSpecification",
+        "RoleArn"
+      ],
+      "members":{
+        "ProcessingInputs":{
+          "shape":"ProcessingInputs",
+          "documentation":"<p>For each input, data is downloaded from S3 into the processing container before the processing job begins running if \"S3InputMode\" is set to <code>File</code>.</p>"
+        },
+        "ProcessingOutputConfig":{
+          "shape":"ProcessingOutputConfig",
+          "documentation":"<p>Output configuration for the processing job.</p>"
+        },
+        "ProcessingJobName":{
+          "shape":"ProcessingJobName",
+          "documentation":"<p> The name of the processing job. The name must be unique within an AWS Region in the AWS account.</p>"
+        },
+        "ProcessingResources":{
+          "shape":"ProcessingResources",
+          "documentation":"<p>Identifies the resources, ML compute instances, and ML storage volumes to deploy for a processing job. In distributed training, you specify more than one instance.</p>"
+        },
+        "StoppingCondition":{
+          "shape":"ProcessingStoppingCondition",
+          "documentation":"<p>The time limit for how long the processing job is allowed to run.</p>"
+        },
+        "AppSpecification":{
+          "shape":"AppSpecification",
+          "documentation":"<p>Configures the processing job to run a specified Docker container image.</p>"
+        },
+        "Environment":{
+          "shape":"ProcessingEnvironmentMap",
+          "documentation":"<p>Sets the environment variables in the Docker container.</p>"
+        },
+        "NetworkConfig":{
+          "shape":"NetworkConfig",
+          "documentation":"<p>Networking options for a processing job.</p>"
+        },
+        "RoleArn":{
+          "shape":"RoleArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of an IAM role that Amazon SageMaker can assume to perform tasks on your behalf.</p>"
+        },
+        "Tags":{
+          "shape":"TagList",
+          "documentation":"<p>(Optional) An array of key-value pairs. For more information, see <a href=\"https://docs.aws.amazon.com/awsaccountbilling/latest/aboutv2/cost-alloc-tags.html#allocation-whatURL\">Using Cost Allocation Tags</a> in the <i>AWS Billing and Cost Management User Guide</i>.</p>"
+        },
+        "ExperimentConfig":{"shape":"ExperimentConfig"}
+      }
+    },
+    "CreateProcessingJobResponse":{
+      "type":"structure",
+      "required":["ProcessingJobArn"],
+      "members":{
+        "ProcessingJobArn":{
+          "shape":"ProcessingJobArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the processing job.</p>"
+        }
+      }
+    },
     "CreateTrainingJobRequest":{
       "type":"structure",
       "required":[
@@ -2104,7 +3976,7 @@
         },
         "EnableNetworkIsolation":{
           "shape":"Boolean",
-          "documentation":"<p>Isolates the training container. No inbound or outbound network calls can be made, except for calls between peers within a training cluster for distributed training. If you enable network isolation for training jobs that are configured to use a VPC, Amazon SageMaker downloads and uploads customer data and model artifacts through the specified VPC, but the training container does not have network access.</p> <note> <p>The Semantic Segmentation built-in algorithm does not support network isolation.</p> </note>"
+          "documentation":"<p>Isolates the training container. No inbound or outbound network calls can be made, except for calls between peers within a training cluster for distributed training. If you enable network isolation for training jobs that are configured to use a VPC, Amazon SageMaker downloads and uploads customer data and model artifacts through the specified VPC, but the training container does not have network access.</p>"
         },
         "EnableInterContainerTrafficEncryption":{
           "shape":"Boolean",
@@ -2117,7 +3989,14 @@
         "CheckpointConfig":{
           "shape":"CheckpointConfig",
           "documentation":"<p>Contains information about the output location for managed spot training checkpoint data.</p>"
-        }
+        },
+        "DebugHookConfig":{"shape":"DebugHookConfig"},
+        "DebugRuleConfigurations":{
+          "shape":"DebugRuleConfigurations",
+          "documentation":"<p>Configuration information for debugging rules.</p>"
+        },
+        "TensorBoardOutputConfig":{"shape":"TensorBoardOutputConfig"},
+        "ExperimentConfig":{"shape":"ExperimentConfig"}
       }
     },
     "CreateTrainingJobResponse":{
@@ -2150,7 +4029,7 @@
         },
         "MaxConcurrentTransforms":{
           "shape":"MaxConcurrentTransforms",
-          "documentation":"<p>The maximum number of parallel requests that can be sent to each instance in a transform job. If <code>MaxConcurrentTransforms</code> is set to <code>0</code> or left unset, Amazon SageMaker checks the optional execution-parameters to determine the optimal settings for your chosen algorithm. If the execution-parameters endpoint is not enabled, the default value is <code>1</code>. For more information on execution-parameters, see <a href=\"https://docs.aws.amazon.com/sagemaker/latest/dg/your-algorithms-batch-code.html#your-algorithms-batch-code-how-containe-serves-requests\">How Containers Serve Requests</a>. For built-in algorithms, you don't need to set a value for <code>MaxConcurrentTransforms</code>.</p>"
+          "documentation":"<p>The maximum number of parallel requests that can be sent to each instance in a transform job. If <code>MaxConcurrentTransforms</code> is set to <code>0</code> or left unset, Amazon SageMaker checks the optional execution-parameters to determine the settings for your chosen algorithm. If the execution-parameters endpoint is not enabled, the default value is <code>1</code>. For more information on execution-parameters, see <a href=\"https://docs.aws.amazon.com/sagemaker/latest/dg/your-algorithms-batch-code.html#your-algorithms-batch-code-how-containe-serves-requests\">How Containers Serve Requests</a>. For built-in algorithms, you don't need to set a value for <code>MaxConcurrentTransforms</code>.</p>"
         },
         "MaxPayloadInMB":{
           "shape":"MaxPayloadInMB",
@@ -2158,7 +4037,7 @@
         },
         "BatchStrategy":{
           "shape":"BatchStrategy",
-          "documentation":"<p>Specifies the number of records to include in a mini-batch for an HTTP inference request. A <i>record</i> <i/> is a single unit of input data that inference can be made on. For example, a single line in a CSV file is a record. </p> <p>To enable the batch strategy, you must set <code>SplitType</code> to <code>Line</code>, <code>RecordIO</code>, or <code>TFRecord</code>.</p> <p>To use only one record when making an HTTP invocation request to a container, set <code>BatchStrategy</code> to <code>SingleRecord</code> and <code>SplitType</code> to <code>Line</code>.</p> <p>To fit as many records in a mini-batch as can fit within the <code>MaxPayloadInMB</code> limit, set <code>BatchStrategy</code> to <code>MultiRecord</code> and <code>SplitType</code> to <code>Line</code>.</p>"
+          "documentation":"<p>Specifies the number of records to include in a mini-batch for an HTTP inference request. A <i>record</i> <i/> is a single unit of input data that inference can be made on. For example, a single line in a CSV file is a record. </p> <p>To enable the batch strategy, you must set the <code>SplitType</code> property to <code>Line</code>, <code>RecordIO</code>, or <code>TFRecord</code>.</p> <p>To use only one record when making an HTTP invocation request to a container, set <code>BatchStrategy</code> to <code>SingleRecord</code> and <code>SplitType</code> to <code>Line</code>.</p> <p>To fit as many records in a mini-batch as can fit within the <code>MaxPayloadInMB</code> limit, set <code>BatchStrategy</code> to <code>MultiRecord</code> and <code>SplitType</code> to <code>Line</code>.</p>"
         },
         "Environment":{
           "shape":"TransformEnvironmentMap",
@@ -2183,7 +4062,8 @@
         "Tags":{
           "shape":"TagList",
           "documentation":"<p>(Optional) An array of key-value pairs. For more information, see <a href=\"https://docs.aws.amazon.com/awsaccountbilling/latest/aboutv2/cost-alloc-tags.html#allocation-what\">Using Cost Allocation Tags</a> in the <i>AWS Billing and Cost Management User Guide</i>.</p>"
-        }
+        },
+        "ExperimentConfig":{"shape":"ExperimentConfig"}
       }
     },
     "CreateTransformJobResponse":{
@@ -2196,6 +4076,133 @@
         }
       }
     },
+    "CreateTrialComponentRequest":{
+      "type":"structure",
+      "required":["TrialComponentName"],
+      "members":{
+        "TrialComponentName":{
+          "shape":"ExperimentEntityName",
+          "documentation":"<p>The name of the component. The name must be unique in your AWS account and is not case-sensitive.</p>"
+        },
+        "DisplayName":{
+          "shape":"ExperimentEntityName",
+          "documentation":"<p>The name of the component as displayed. The name doesn't need to be unique. If <code>DisplayName</code> isn't specified, <code>TrialComponentName</code> is displayed.</p>"
+        },
+        "Status":{
+          "shape":"TrialComponentStatus",
+          "documentation":"<p>The status of the component. States include:</p> <ul> <li> <p>InProgress</p> </li> <li> <p>Completed</p> </li> <li> <p>Failed</p> </li> </ul>"
+        },
+        "StartTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>When the component started.</p>"
+        },
+        "EndTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>When the component ended.</p>"
+        },
+        "Parameters":{
+          "shape":"TrialComponentParameters",
+          "documentation":"<p>The hyperparameters for the component.</p>"
+        },
+        "InputArtifacts":{
+          "shape":"TrialComponentArtifacts",
+          "documentation":"<p>The input artifacts for the component. Examples of input artifacts are datasets, algorithms, hyperparameters, source code, and instance types.</p>"
+        },
+        "OutputArtifacts":{
+          "shape":"TrialComponentArtifacts",
+          "documentation":"<p>The output artifacts for the component. Examples of output artifacts are metrics, snapshots, logs, and images.</p>"
+        },
+        "Tags":{
+          "shape":"TagList",
+          "documentation":"<p>A list of tags to associate with the component. You can use <a>Search</a> API to search on the tags.</p>"
+        }
+      }
+    },
+    "CreateTrialComponentResponse":{
+      "type":"structure",
+      "members":{
+        "TrialComponentArn":{
+          "shape":"TrialComponentArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the trial component.</p>"
+        }
+      }
+    },
+    "CreateTrialRequest":{
+      "type":"structure",
+      "required":[
+        "TrialName",
+        "ExperimentName"
+      ],
+      "members":{
+        "TrialName":{
+          "shape":"ExperimentEntityName",
+          "documentation":"<p>The name of the trial. The name must be unique in your AWS account and is not case-sensitive.</p>"
+        },
+        "DisplayName":{
+          "shape":"ExperimentEntityName",
+          "documentation":"<p>The name of the trial as displayed. The name doesn't need to be unique. If <code>DisplayName</code> isn't specified, <code>TrialName</code> is displayed.</p>"
+        },
+        "ExperimentName":{
+          "shape":"ExperimentEntityName",
+          "documentation":"<p>The name of the experiment to associate the trial with.</p>"
+        },
+        "Tags":{
+          "shape":"TagList",
+          "documentation":"<p>A list of tags to associate with the trial. You can use <a>Search</a> API to search on the tags.</p>"
+        }
+      }
+    },
+    "CreateTrialResponse":{
+      "type":"structure",
+      "members":{
+        "TrialArn":{
+          "shape":"TrialArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the trial.</p>"
+        }
+      }
+    },
+    "CreateUserProfileRequest":{
+      "type":"structure",
+      "required":[
+        "DomainId",
+        "UserProfileName"
+      ],
+      "members":{
+        "DomainId":{
+          "shape":"DomainId",
+          "documentation":"<p>The ID of the associated Domain.</p>"
+        },
+        "UserProfileName":{
+          "shape":"UserProfileName",
+          "documentation":"<p>A name for the UserProfile.</p>"
+        },
+        "SingleSignOnUserIdentifier":{
+          "shape":"SingleSignOnUserIdentifier",
+          "documentation":"<p>A specifier for the type of value specified in SingleSignOnUserValue. Currently, the only supported value is \"UserName\". If the Domain's AuthMode is SSO, this field is required. If the Domain's AuthMode is not SSO, this field cannot be specified. </p>"
+        },
+        "SingleSignOnUserValue":{
+          "shape":"String256",
+          "documentation":"<p>The username of the associated AWS Single Sign-On User for this UserProfile. If the Domain's AuthMode is SSO, this field is required, and must match a valid username of a user in your directory. If the Domain's AuthMode is not SSO, this field cannot be specified. </p>"
+        },
+        "Tags":{
+          "shape":"TagList",
+          "documentation":"<p>Each tag consists of a key and an optional value. Tag keys must be unique per resource.</p>"
+        },
+        "UserSettings":{
+          "shape":"UserSettings",
+          "documentation":"<p>A collection of settings.</p>"
+        }
+      }
+    },
+    "CreateUserProfileResponse":{
+      "type":"structure",
+      "members":{
+        "UserProfileArn":{
+          "shape":"UserProfileArn",
+          "documentation":"<p>The user profile Amazon Resource Name (ARN).</p>"
+        }
+      }
+    },
     "CreateWorkteamRequest":{
       "type":"structure",
       "required":[
@@ -2236,6 +4243,90 @@
       }
     },
     "CreationTime":{"type":"timestamp"},
+    "CsvContentType":{
+      "type":"string",
+      "max":256,
+      "min":1,
+      "pattern":"^[a-zA-Z0-9](-*[a-zA-Z0-9])*\\/[a-zA-Z0-9](-*[a-zA-Z0-9.])*"
+    },
+    "CsvContentTypes":{
+      "type":"list",
+      "member":{"shape":"CsvContentType"},
+      "max":10,
+      "min":1
+    },
+    "DataCaptureConfig":{
+      "type":"structure",
+      "required":[
+        "InitialSamplingPercentage",
+        "DestinationS3Uri",
+        "CaptureOptions"
+      ],
+      "members":{
+        "EnableCapture":{
+          "shape":"EnableCapture",
+          "documentation":"<p/>"
+        },
+        "InitialSamplingPercentage":{
+          "shape":"SamplingPercentage",
+          "documentation":"<p/>"
+        },
+        "DestinationS3Uri":{
+          "shape":"DestinationS3Uri",
+          "documentation":"<p/>"
+        },
+        "KmsKeyId":{
+          "shape":"KmsKeyId",
+          "documentation":"<p/>"
+        },
+        "CaptureOptions":{
+          "shape":"CaptureOptionList",
+          "documentation":"<p/>"
+        },
+        "CaptureContentTypeHeader":{
+          "shape":"CaptureContentTypeHeader",
+          "documentation":"<p/>"
+        }
+      },
+      "documentation":"<p/>"
+    },
+    "DataCaptureConfigSummary":{
+      "type":"structure",
+      "required":[
+        "EnableCapture",
+        "CaptureStatus",
+        "CurrentSamplingPercentage",
+        "DestinationS3Uri",
+        "KmsKeyId"
+      ],
+      "members":{
+        "EnableCapture":{
+          "shape":"EnableCapture",
+          "documentation":"<p/>"
+        },
+        "CaptureStatus":{
+          "shape":"CaptureStatus",
+          "documentation":"<p/>"
+        },
+        "CurrentSamplingPercentage":{
+          "shape":"SamplingPercentage",
+          "documentation":"<p/>"
+        },
+        "DestinationS3Uri":{
+          "shape":"DestinationS3Uri",
+          "documentation":"<p/>"
+        },
+        "KmsKeyId":{
+          "shape":"KmsKeyId",
+          "documentation":"<p/>"
+        }
+      },
+      "documentation":"<p/>"
+    },
+    "DataExplorationNotebookLocation":{
+      "type":"string",
+      "min":1
+    },
     "DataInputConfig":{
       "type":"string",
       "max":1024,
@@ -2255,7 +4346,7 @@
         },
         "JoinSource":{
           "shape":"JoinSource",
-          "documentation":"<p>Specifies the source of the data to join with the transformed data. The valid values are <code>None</code> and <code>Input</code> The default value is <code>None</code> which specifies not to join the input with the transformed data. If you want the batch transform job to join the original input data with the transformed data, set <code>JoinSource</code> to <code>Input</code>. </p> <p>For JSON or JSONLines objects, such as a JSON array, Amazon SageMaker adds the transformed data to the input JSON object in an attribute called <code>SageMakerOutput</code>. The joined result for JSON must be a key-value pair object. If the input is not a key-value pair object, Amazon SageMaker creates a new JSON file. In the new JSON file, and the input data is stored under the <code>SageMakerInput</code> key and the results are stored in <code>SageMakerOutput</code>.</p> <p>For CSV files, Amazon SageMaker combines the transformed data with the input data at the end of the input data and stores it in the output file. The joined data has the joined input data followed by the transformed data and the output is a CSV file. </p>"
+          "documentation":"<p>Specifies the source of the data to join with the transformed data. The valid values are <code>None</code> and <code>Input</code>. The default value is <code>None</code>, which specifies not to join the input with the transformed data. If you want the batch transform job to join the original input data with the transformed data, set <code>JoinSource</code> to <code>Input</code>. </p> <p>For JSON or JSONLines objects, such as a JSON array, Amazon SageMaker adds the transformed data to the input JSON object in an attribute called <code>SageMakerOutput</code>. The joined result for JSON must be a key-value pair object. If the input is not a key-value pair object, Amazon SageMaker creates a new JSON file. In the new JSON file, and the input data is stored under the <code>SageMakerInput</code> key and the results are stored in <code>SageMakerOutput</code>.</p> <p>For CSV files, Amazon SageMaker combines the transformed data with the input data at the end of the input data and stores it in the output file. The joined data has the joined input data followed by the transformed data and the output is a CSV file. </p>"
         }
       },
       "documentation":"<p>The data structure used to specify the data to be used for inference in a batch transform job and to associate the data that is relevant to the prediction results in the output. The input filter provided allows you to exclude input data that is not needed for inference in a batch transform job. The output filter provided allows you to include input data relevant to interpreting the predictions in the output from the job. For more information, see <a href=\"https://docs.aws.amazon.com/sagemaker/latest/dg/batch-transform-data-processing.html\">Associate Prediction Results with their Corresponding Input Records</a>.</p>"
@@ -2274,6 +4365,105 @@
       },
       "documentation":"<p>Describes the location of the channel data.</p>"
     },
+    "DebugHookConfig":{
+      "type":"structure",
+      "required":["S3OutputPath"],
+      "members":{
+        "LocalPath":{
+          "shape":"DirectoryPath",
+          "documentation":"<p>Path to local storage location for tensors. Defaults to <code>/opt/ml/output/tensors/</code>.</p>"
+        },
+        "S3OutputPath":{
+          "shape":"S3Uri",
+          "documentation":"<p>Path to Amazon S3 storage location for tensors.</p>"
+        },
+        "HookParameters":{
+          "shape":"HookParameters",
+          "documentation":"<p>Configuration information for the debug hook parameters.</p>"
+        },
+        "CollectionConfigurations":{
+          "shape":"CollectionConfigurations",
+          "documentation":"<p>Configuration information for tensor collections.</p>"
+        }
+      },
+      "documentation":"<p>Configuration information for the debug hook parameters, collection configuration, and storage paths.</p>"
+    },
+    "DebugRuleConfiguration":{
+      "type":"structure",
+      "required":[
+        "RuleConfigurationName",
+        "RuleEvaluatorImage"
+      ],
+      "members":{
+        "RuleConfigurationName":{
+          "shape":"RuleConfigurationName",
+          "documentation":"<p>The name of the rule configuration. It must be unique relative to other rule configuration names.</p>"
+        },
+        "LocalPath":{
+          "shape":"DirectoryPath",
+          "documentation":"<p>Path to local storage location for output of rules. Defaults to <code>/opt/ml/processing/output/rule/</code>.</p>"
+        },
+        "S3OutputPath":{
+          "shape":"S3Uri",
+          "documentation":"<p>Path to Amazon S3 storage location for rules.</p>"
+        },
+        "RuleEvaluatorImage":{
+          "shape":"AlgorithmImage",
+          "documentation":"<p>The Amazon Elastic Container (ECR) Image for the managed rule evaluation.</p>"
+        },
+        "InstanceType":{
+          "shape":"ProcessingInstanceType",
+          "documentation":"<p>The instance type to deploy for a training job.</p>"
+        },
+        "VolumeSizeInGB":{
+          "shape":"OptionalVolumeSizeInGB",
+          "documentation":"<p>The size, in GB, of the ML storage volume attached to the processing instance.</p>"
+        },
+        "RuleParameters":{
+          "shape":"RuleParameters",
+          "documentation":"<p> Runtime configuration for rule container.</p>"
+        }
+      },
+      "documentation":"<p>Configuration information for debugging rules.</p>"
+    },
+    "DebugRuleConfigurations":{
+      "type":"list",
+      "member":{"shape":"DebugRuleConfiguration"},
+      "max":20,
+      "min":0
+    },
+    "DebugRuleEvaluationStatus":{
+      "type":"structure",
+      "members":{
+        "RuleConfigurationName":{
+          "shape":"RuleConfigurationName",
+          "documentation":"<p>The name of the rule configuration</p>"
+        },
+        "RuleEvaluationJobArn":{
+          "shape":"ProcessingJobArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the rule evaluation job.</p>"
+        },
+        "RuleEvaluationStatus":{
+          "shape":"RuleEvaluationStatus",
+          "documentation":"<p>Status of the rule evaluation.</p>"
+        },
+        "StatusDetails":{
+          "shape":"StatusDetails",
+          "documentation":"<p>Details from the rule evaluation.</p>"
+        },
+        "LastModifiedTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>Timestamp when the rule evaluation status was last modified.</p>"
+        }
+      },
+      "documentation":"<p>Information about the status of the rule evaluation.</p>"
+    },
+    "DebugRuleEvaluationStatuses":{
+      "type":"list",
+      "member":{"shape":"DebugRuleEvaluationStatus"},
+      "max":20,
+      "min":0
+    },
     "DeleteAlgorithmInput":{
       "type":"structure",
       "required":["AlgorithmName"],
@@ -2284,6 +4474,33 @@
         }
       }
     },
+    "DeleteAppRequest":{
+      "type":"structure",
+      "required":[
+        "DomainId",
+        "UserProfileName",
+        "AppType",
+        "AppName"
+      ],
+      "members":{
+        "DomainId":{
+          "shape":"DomainId",
+          "documentation":"<p>The domain ID.</p>"
+        },
+        "UserProfileName":{
+          "shape":"UserProfileName",
+          "documentation":"<p>The user profile name.</p>"
+        },
+        "AppType":{
+          "shape":"AppType",
+          "documentation":"<p>The type of app.</p>"
+        },
+        "AppName":{
+          "shape":"AppName",
+          "documentation":"<p>The name of the app.</p>"
+        }
+      }
+    },
     "DeleteCodeRepositoryInput":{
       "type":"structure",
       "required":["CodeRepositoryName"],
@@ -2294,6 +4511,20 @@
         }
       }
     },
+    "DeleteDomainRequest":{
+      "type":"structure",
+      "required":["DomainId"],
+      "members":{
+        "DomainId":{
+          "shape":"DomainId",
+          "documentation":"<p>The domain ID.</p>"
+        },
+        "RetentionPolicy":{
+          "shape":"RetentionPolicy",
+          "documentation":"<p>The retention policy for this domain, which specifies which resources will be retained after the Domain is deleted. By default, all resources are retained (not automatically deleted). </p>"
+        }
+      }
+    },
     "DeleteEndpointConfigInput":{
       "type":"structure",
       "required":["EndpointConfigName"],
@@ -2314,6 +4545,40 @@
         }
       }
     },
+    "DeleteExperimentRequest":{
+      "type":"structure",
+      "required":["ExperimentName"],
+      "members":{
+        "ExperimentName":{
+          "shape":"ExperimentEntityName",
+          "documentation":"<p>The name of the experiment to delete.</p>"
+        }
+      }
+    },
+    "DeleteExperimentResponse":{
+      "type":"structure",
+      "members":{
+        "ExperimentArn":{
+          "shape":"ExperimentArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the experiment that is being deleted.</p>"
+        }
+      }
+    },
+    "DeleteFlowDefinitionRequest":{
+      "type":"structure",
+      "required":["FlowDefinitionName"],
+      "members":{
+        "FlowDefinitionName":{
+          "shape":"FlowDefinitionName",
+          "documentation":"<p>The name of the flow definition you are deleting.</p>"
+        }
+      }
+    },
+    "DeleteFlowDefinitionResponse":{
+      "type":"structure",
+      "members":{
+      }
+    },
     "DeleteModelInput":{
       "type":"structure",
       "required":["ModelName"],
@@ -2334,6 +4599,16 @@
         }
       }
     },
+    "DeleteMonitoringScheduleRequest":{
+      "type":"structure",
+      "required":["MonitoringScheduleName"],
+      "members":{
+        "MonitoringScheduleName":{
+          "shape":"MonitoringScheduleName",
+          "documentation":"<p>The name of the monitoring schedule to delete.</p>"
+        }
+      }
+    },
     "DeleteNotebookInstanceInput":{
       "type":"structure",
       "required":["NotebookInstanceName"],
@@ -2376,6 +4651,61 @@
       "members":{
       }
     },
+    "DeleteTrialComponentRequest":{
+      "type":"structure",
+      "required":["TrialComponentName"],
+      "members":{
+        "TrialComponentName":{
+          "shape":"ExperimentEntityName",
+          "documentation":"<p>The name of the component to delete.</p>"
+        }
+      }
+    },
+    "DeleteTrialComponentResponse":{
+      "type":"structure",
+      "members":{
+        "TrialComponentArn":{
+          "shape":"TrialComponentArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the component is being deleted.</p>"
+        }
+      }
+    },
+    "DeleteTrialRequest":{
+      "type":"structure",
+      "required":["TrialName"],
+      "members":{
+        "TrialName":{
+          "shape":"ExperimentEntityName",
+          "documentation":"<p>The name of the trial to delete.</p>"
+        }
+      }
+    },
+    "DeleteTrialResponse":{
+      "type":"structure",
+      "members":{
+        "TrialArn":{
+          "shape":"TrialArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the trial that is being deleted.</p>"
+        }
+      }
+    },
+    "DeleteUserProfileRequest":{
+      "type":"structure",
+      "required":[
+        "DomainId",
+        "UserProfileName"
+      ],
+      "members":{
+        "DomainId":{
+          "shape":"DomainId",
+          "documentation":"<p>The domain ID.</p>"
+        },
+        "UserProfileName":{
+          "shape":"UserProfileName",
+          "documentation":"<p>The user profile name.</p>"
+        }
+      }
+    },
     "DeleteWorkteamRequest":{
       "type":"structure",
       "required":["WorkteamName"],
@@ -2485,6 +4815,180 @@
         }
       }
     },
+    "DescribeAppRequest":{
+      "type":"structure",
+      "required":[
+        "DomainId",
+        "UserProfileName",
+        "AppType",
+        "AppName"
+      ],
+      "members":{
+        "DomainId":{
+          "shape":"DomainId",
+          "documentation":"<p>The domain ID.</p>"
+        },
+        "UserProfileName":{
+          "shape":"UserProfileName",
+          "documentation":"<p>The user profile name.</p>"
+        },
+        "AppType":{
+          "shape":"AppType",
+          "documentation":"<p>The type of app.</p>"
+        },
+        "AppName":{
+          "shape":"AppName",
+          "documentation":"<p>The name of the app.</p>"
+        }
+      }
+    },
+    "DescribeAppResponse":{
+      "type":"structure",
+      "members":{
+        "AppArn":{
+          "shape":"AppArn",
+          "documentation":"<p>The app's Amazon Resource Name (ARN).</p>"
+        },
+        "AppType":{
+          "shape":"AppType",
+          "documentation":"<p>The type of app.</p>"
+        },
+        "AppName":{
+          "shape":"AppName",
+          "documentation":"<p>The name of the app.</p>"
+        },
+        "DomainId":{
+          "shape":"DomainId",
+          "documentation":"<p>The domain ID.</p>"
+        },
+        "UserProfileName":{
+          "shape":"UserProfileName",
+          "documentation":"<p>The user profile name.</p>"
+        },
+        "Status":{
+          "shape":"AppStatus",
+          "documentation":"<p>The status.</p>"
+        },
+        "LastHealthCheckTimestamp":{
+          "shape":"Timestamp",
+          "documentation":"<p>The timestamp of the last health check.</p>"
+        },
+        "LastUserActivityTimestamp":{
+          "shape":"Timestamp",
+          "documentation":"<p>The timestamp of the last user's activity.</p>"
+        },
+        "CreationTime":{
+          "shape":"CreationTime",
+          "documentation":"<p>The creation time.</p>"
+        },
+        "FailureReason":{
+          "shape":"FailureReason",
+          "documentation":"<p>The failure reason.</p>"
+        },
+        "ResourceSpec":{
+          "shape":"ResourceSpec",
+          "documentation":"<p>The instance type and quantity.</p>"
+        }
+      }
+    },
+    "DescribeAutoMLJobRequest":{
+      "type":"structure",
+      "required":["AutoMLJobName"],
+      "members":{
+        "AutoMLJobName":{
+          "shape":"AutoMLJobName",
+          "documentation":"<p>Request information about a job using that job's unique name.</p>"
+        }
+      }
+    },
+    "DescribeAutoMLJobResponse":{
+      "type":"structure",
+      "required":[
+        "AutoMLJobName",
+        "AutoMLJobArn",
+        "InputDataConfig",
+        "OutputDataConfig",
+        "RoleArn",
+        "CreationTime",
+        "LastModifiedTime",
+        "AutoMLJobStatus",
+        "AutoMLJobSecondaryStatus"
+      ],
+      "members":{
+        "AutoMLJobName":{
+          "shape":"AutoMLJobName",
+          "documentation":"<p>Returns the name of a job.</p>"
+        },
+        "AutoMLJobArn":{
+          "shape":"AutoMLJobArn",
+          "documentation":"<p>Returns the job's ARN.</p>"
+        },
+        "InputDataConfig":{
+          "shape":"AutoMLInputDataConfig",
+          "documentation":"<p>Returns the job's input data config.</p>"
+        },
+        "OutputDataConfig":{
+          "shape":"AutoMLOutputDataConfig",
+          "documentation":"<p>Returns the job's output data config.</p>"
+        },
+        "RoleArn":{
+          "shape":"RoleArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the AWS Identity and Access Management (IAM) role that has read permission to the input data location and write permission to the output data location in Amazon S3.</p>"
+        },
+        "AutoMLJobObjective":{
+          "shape":"AutoMLJobObjective",
+          "documentation":"<p>Returns the job's objective.</p>"
+        },
+        "ProblemType":{
+          "shape":"ProblemType",
+          "documentation":"<p>Returns the job's problem type.</p>"
+        },
+        "AutoMLJobConfig":{
+          "shape":"AutoMLJobConfig",
+          "documentation":"<p>Returns the job's config.</p>"
+        },
+        "CreationTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>Returns the job's creation time.</p>"
+        },
+        "EndTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>Returns the job's end time.</p>"
+        },
+        "LastModifiedTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>Returns the job's last modified time.</p>"
+        },
+        "FailureReason":{
+          "shape":"AutoMLFailureReason",
+          "documentation":"<p>Returns the job's FailureReason.</p>"
+        },
+        "BestCandidate":{
+          "shape":"AutoMLCandidate",
+          "documentation":"<p>Returns the job's BestCandidate.</p>"
+        },
+        "AutoMLJobStatus":{
+          "shape":"AutoMLJobStatus",
+          "documentation":"<p>Returns the job's AutoMLJobStatus.</p>"
+        },
+        "AutoMLJobSecondaryStatus":{
+          "shape":"AutoMLJobSecondaryStatus",
+          "documentation":"<p>Returns the job's AutoMLJobSecondaryStatus.</p>"
+        },
+        "GenerateCandidateDefinitionsOnly":{
+          "shape":"GenerateCandidateDefinitionsOnly",
+          "documentation":"<p>Returns the job's output from GenerateCandidateDefinitionsOnly.</p>"
+        },
+        "AutoMLJobArtifacts":{
+          "shape":"AutoMLJobArtifacts",
+          "documentation":"<p>Returns information on the job's artifacts found in AutoMLJobArtifacts.</p>"
+        },
+        "ResolvedAttributes":{
+          "shape":"ResolvedAttributes",
+          "documentation":"<p>This contains ProblemType, AutoMLJobObjective and CompletionCriteria. They're auto-inferred values, if not provided by you. If you do provide them, then they'll be the same as provided.</p>"
+        }
+      }
+    },
     "DescribeCodeRepositoryInput":{
       "type":"structure",
       "required":["CodeRepositoryName"],
@@ -2606,6 +5110,81 @@
         }
       }
     },
+    "DescribeDomainRequest":{
+      "type":"structure",
+      "required":["DomainId"],
+      "members":{
+        "DomainId":{
+          "shape":"DomainId",
+          "documentation":"<p>The domain ID.</p>"
+        }
+      }
+    },
+    "DescribeDomainResponse":{
+      "type":"structure",
+      "members":{
+        "DomainArn":{
+          "shape":"DomainArn",
+          "documentation":"<p>The domain's Amazon Resource Name (ARN).</p>"
+        },
+        "DomainId":{
+          "shape":"DomainId",
+          "documentation":"<p>The domain ID.</p>"
+        },
+        "DomainName":{
+          "shape":"DomainName",
+          "documentation":"<p>The domain name.</p>"
+        },
+        "HomeEfsFileSystemId":{
+          "shape":"ResourceId",
+          "documentation":"<p>The ID of the Amazon Elastic File System (EFS) managed by this Domain.</p>"
+        },
+        "SingleSignOnManagedApplicationInstanceId":{
+          "shape":"String256",
+          "documentation":"<p>The SSO managed application instance ID.</p>"
+        },
+        "Status":{
+          "shape":"DomainStatus",
+          "documentation":"<p>The status.</p>"
+        },
+        "CreationTime":{
+          "shape":"CreationTime",
+          "documentation":"<p>The creation time.</p>"
+        },
+        "LastModifiedTime":{
+          "shape":"LastModifiedTime",
+          "documentation":"<p>The last modified time.</p>"
+        },
+        "FailureReason":{
+          "shape":"FailureReason",
+          "documentation":"<p>The failure reason.</p>"
+        },
+        "AuthMode":{
+          "shape":"AuthMode",
+          "documentation":"<p>The domain's authentication mode.</p>"
+        },
+        "DefaultUserSettings":{
+          "shape":"UserSettings",
+          "documentation":"<p>Settings which are applied to all UserProfile in this domain, if settings are not explicitly specified in a given UserProfile. </p>"
+        },
+        "HomeEfsFileSystemKmsKeyId":{
+          "shape":"KmsKeyId",
+          "documentation":"<p>The AWS Key Management Service encryption key ID.</p>"
+        },
+        "SubnetIds":{
+          "shape":"Subnets",
+          "documentation":"<p>Security setting to limit to a set of subnets.</p>"
+        },
+        "Url":{
+          "shape":"String1024",
+          "documentation":"<p>The domain's URL.</p>"
+        },
+        "VpcId":{
+          "shape":"VpcId",
+          "documentation":"<p>The ID of the Amazon Virtual Private Cloud.</p>"
+        }
+      }
+    },
     "DescribeEndpointConfigInput":{
       "type":"structure",
       "required":["EndpointConfigName"],
@@ -2637,6 +5216,7 @@
           "shape":"ProductionVariantList",
           "documentation":"<p>An array of <code>ProductionVariant</code> objects, one for each model that you want to host at this endpoint.</p>"
         },
+        "DataCaptureConfig":{"shape":"DataCaptureConfig"},
         "KmsKeyId":{
           "shape":"KmsKeyId",
           "documentation":"<p>AWS KMS key ID Amazon SageMaker uses to encrypt data when storing it on the ML storage volume attached to the instance.</p>"
@@ -2684,22 +5264,169 @@
           "shape":"ProductionVariantSummaryList",
           "documentation":"<p> An array of <a>ProductionVariantSummary</a> objects, one for each model hosted behind this endpoint. </p>"
         },
+        "DataCaptureConfig":{"shape":"DataCaptureConfigSummary"},
         "EndpointStatus":{
           "shape":"EndpointStatus",
           "documentation":"<p>The status of the endpoint.</p> <ul> <li> <p> <code>OutOfService</code>: Endpoint is not available to take incoming requests.</p> </li> <li> <p> <code>Creating</code>: <a>CreateEndpoint</a> is executing.</p> </li> <li> <p> <code>Updating</code>: <a>UpdateEndpoint</a> or <a>UpdateEndpointWeightsAndCapacities</a> is executing.</p> </li> <li> <p> <code>SystemUpdating</code>: Endpoint is undergoing maintenance and cannot be updated or deleted or re-scaled until it has completed. This maintenance operation does not change any customer-specified values such as VPC config, KMS encryption, model, instance type, or instance count.</p> </li> <li> <p> <code>RollingBack</code>: Endpoint fails to scale up or down or change its variant weight and is in the process of rolling back to its previous configuration. Once the rollback completes, endpoint returns to an <code>InService</code> status. This transitional status only applies to an endpoint that has autoscaling enabled and is undergoing variant weight or capacity changes as part of an <a>UpdateEndpointWeightsAndCapacities</a> call or when the <a>UpdateEndpointWeightsAndCapacities</a> operation is called explicitly.</p> </li> <li> <p> <code>InService</code>: Endpoint is available to process incoming requests.</p> </li> <li> <p> <code>Deleting</code>: <a>DeleteEndpoint</a> is executing.</p> </li> <li> <p> <code>Failed</code>: Endpoint could not be created, updated, or re-scaled. Use <a>DescribeEndpointOutput$FailureReason</a> for information about the failure. <a>DeleteEndpoint</a> is the only operation that can be performed on a failed endpoint.</p> </li> </ul>"
         },
-        "FailureReason":{
-          "shape":"FailureReason",
-          "documentation":"<p>If the status of the endpoint is <code>Failed</code>, the reason why it failed. </p>"
+        "FailureReason":{
+          "shape":"FailureReason",
+          "documentation":"<p>If the status of the endpoint is <code>Failed</code>, the reason why it failed. </p>"
+        },
+        "CreationTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>A timestamp that shows when the endpoint was created.</p>"
+        },
+        "LastModifiedTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>A timestamp that shows when the endpoint was last modified.</p>"
+        }
+      }
+    },
+    "DescribeExperimentRequest":{
+      "type":"structure",
+      "required":["ExperimentName"],
+      "members":{
+        "ExperimentName":{
+          "shape":"ExperimentEntityName",
+          "documentation":"<p>The name of the experiment to describe.</p>"
+        }
+      }
+    },
+    "DescribeExperimentResponse":{
+      "type":"structure",
+      "members":{
+        "ExperimentName":{
+          "shape":"ExperimentEntityName",
+          "documentation":"<p>The name of the experiment.</p>"
+        },
+        "ExperimentArn":{
+          "shape":"ExperimentArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the experiment.</p>"
+        },
+        "DisplayName":{
+          "shape":"ExperimentEntityName",
+          "documentation":"<p>The name of the experiment as displayed. If <code>DisplayName</code> isn't specified, <code>ExperimentName</code> is displayed.</p>"
+        },
+        "Source":{
+          "shape":"ExperimentSource",
+          "documentation":"<p>The ARN of the source and, optionally, the type.</p>"
+        },
+        "Description":{
+          "shape":"ExperimentDescription",
+          "documentation":"<p>The description of the experiment.</p>"
+        },
+        "CreationTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>When the experiment was created.</p>"
+        },
+        "CreatedBy":{
+          "shape":"UserContext",
+          "documentation":"<p>Who created the experiment.</p>"
+        },
+        "LastModifiedTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>When the experiment was last modified.</p>"
+        },
+        "LastModifiedBy":{
+          "shape":"UserContext",
+          "documentation":"<p>Who last modified the experiment.</p>"
+        }
+      }
+    },
+    "DescribeFlowDefinitionRequest":{
+      "type":"structure",
+      "required":["FlowDefinitionName"],
+      "members":{
+        "FlowDefinitionName":{
+          "shape":"FlowDefinitionName",
+          "documentation":"<p>The name of the flow definition.</p>"
+        }
+      }
+    },
+    "DescribeFlowDefinitionResponse":{
+      "type":"structure",
+      "required":[
+        "FlowDefinitionArn",
+        "FlowDefinitionName",
+        "FlowDefinitionStatus",
+        "CreationTime",
+        "HumanLoopConfig",
+        "OutputConfig",
+        "RoleArn"
+      ],
+      "members":{
+        "FlowDefinitionArn":{
+          "shape":"FlowDefinitionArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the flow defintion.</p>"
+        },
+        "FlowDefinitionName":{
+          "shape":"FlowDefinitionName",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the flow definition.</p>"
+        },
+        "FlowDefinitionStatus":{
+          "shape":"FlowDefinitionStatus",
+          "documentation":"<p>The status of the flow definition. Valid values are listed below.</p>"
+        },
+        "CreationTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>The timestamp when the flow definition was created.</p>"
+        },
+        "HumanLoopRequestSource":{"shape":"HumanLoopRequestSource"},
+        "HumanLoopActivationConfig":{
+          "shape":"HumanLoopActivationConfig",
+          "documentation":"<p>An object containing information about what triggers a human review workflow.</p>"
+        },
+        "HumanLoopConfig":{
+          "shape":"HumanLoopConfig",
+          "documentation":"<p>An object containing information about who works on the task, the workforce task price, and other task details.</p>"
+        },
+        "OutputConfig":{
+          "shape":"FlowDefinitionOutputConfig",
+          "documentation":"<p>An object containing information about the output file.</p>"
+        },
+        "RoleArn":{
+          "shape":"RoleArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the AWS Identity and Access Management (IAM) execution role for the flow definition.</p>"
+        },
+        "FailureReason":{
+          "shape":"FailureReason",
+          "documentation":"<p/>"
+        }
+      }
+    },
+    "DescribeHumanTaskUiRequest":{
+      "type":"structure",
+      "required":["HumanTaskUiName"],
+      "members":{
+        "HumanTaskUiName":{
+          "shape":"HumanTaskUiName",
+          "documentation":"<p>The name of the human task user interface you want information about.</p>"
+        }
+      }
+    },
+    "DescribeHumanTaskUiResponse":{
+      "type":"structure",
+      "required":[
+        "HumanTaskUiArn",
+        "HumanTaskUiName",
+        "CreationTime",
+        "UiTemplate"
+      ],
+      "members":{
+        "HumanTaskUiArn":{
+          "shape":"HumanTaskUiArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the human task user interface.</p>"
+        },
+        "HumanTaskUiName":{
+          "shape":"HumanTaskUiName",
+          "documentation":"<p>The name of the human task user interface.</p>"
         },
         "CreationTime":{
           "shape":"Timestamp",
-          "documentation":"<p>A timestamp that shows when the endpoint was created.</p>"
+          "documentation":"<p>The timestamp when the human task user interface was created.</p>"
         },
-        "LastModifiedTime":{
-          "shape":"Timestamp",
-          "documentation":"<p>A timestamp that shows when the endpoint was last modified.</p>"
-        }
+        "UiTemplate":{"shape":"UiTemplateInfo"}
       }
     },
     "DescribeHyperParameterTuningJobRequest":{
@@ -2740,6 +5467,10 @@
           "shape":"HyperParameterTrainingJobDefinition",
           "documentation":"<p>The <a>HyperParameterTrainingJobDefinition</a> object that specifies the definition of the training jobs that this tuning job launches.</p>"
         },
+        "TrainingJobDefinitions":{
+          "shape":"HyperParameterTrainingJobDefinitions",
+          "documentation":"<p/>"
+        },
         "HyperParameterTuningJobStatus":{
           "shape":"HyperParameterTuningJobStatus",
           "documentation":"<p>The status of the tuning job: InProgress, Completed, Failed, Stopping, or Stopped.</p>"
@@ -2858,7 +5589,7 @@
         },
         "LabelCategoryConfigS3Uri":{
           "shape":"S3Uri",
-          "documentation":"<p>The S3 location of the JSON file that defines the categories used to label data objects.</p> <p>The file is a JSON structure in the following format:</p> <p> <code>{</code> </p> <p> <code> \"document-version\": \"2018-11-28\"</code> </p> <p> <code> \"labels\": [</code> </p> <p> <code> {</code> </p> <p> <code> \"label\": \"<i>label 1</i>\"</code> </p> <p> <code> },</code> </p> <p> <code> {</code> </p> <p> <code> \"label\": \"<i>label 2</i>\"</code> </p> <p> <code> },</code> </p> <p> <code> ...</code> </p> <p> <code> {</code> </p> <p> <code> \"label\": \"<i>label n</i>\"</code> </p> <p> <code> }</code> </p> <p> <code> ]</code> </p> <p> <code>}</code> </p>"
+          "documentation":"<p>The S3 location of the JSON file that defines the categories used to label data objects. Please note the following label-category limits:</p> <ul> <li> <p>Semantic segmentation labeling jobs using automated labeling: 20 labels</p> </li> <li> <p>Box bounding labeling jobs (all): 10 labels</p> </li> </ul> <p>The file is a JSON structure in the following format:</p> <p> <code>{</code> </p> <p> <code> \"document-version\": \"2018-11-28\"</code> </p> <p> <code> \"labels\": [</code> </p> <p> <code> {</code> </p> <p> <code> \"label\": \"<i>label 1</i>\"</code> </p> <p> <code> },</code> </p> <p> <code> {</code> </p> <p> <code> \"label\": \"<i>label 2</i>\"</code> </p> <p> <code> },</code> </p> <p> <code> ...</code> </p> <p> <code> {</code> </p> <p> <code> \"label\": \"<i>label n</i>\"</code> </p> <p> <code> }</code> </p> <p> <code> ]</code> </p> <p> <code>}</code> </p>"
         },
         "StoppingConditions":{
           "shape":"LabelingJobStoppingConditions",
@@ -2931,7 +5662,7 @@
         },
         "EnableNetworkIsolation":{
           "shape":"Boolean",
-          "documentation":"<p>If <code>True</code>, no inbound or outbound network calls can be made to or from the model container.</p> <note> <p>The Semantic Segmentation built-in algorithm does not support network isolation.</p> </note>"
+          "documentation":"<p>If <code>True</code>, no inbound or outbound network calls can be made to or from the model container.</p>"
         }
       }
     },
@@ -2997,6 +5728,65 @@
         }
       }
     },
+    "DescribeMonitoringScheduleRequest":{
+      "type":"structure",
+      "required":["MonitoringScheduleName"],
+      "members":{
+        "MonitoringScheduleName":{
+          "shape":"MonitoringScheduleName",
+          "documentation":"<p>Name of a previously created monitoring schedule.</p>"
+        }
+      }
+    },
+    "DescribeMonitoringScheduleResponse":{
+      "type":"structure",
+      "required":[
+        "MonitoringScheduleArn",
+        "MonitoringScheduleName",
+        "MonitoringScheduleStatus",
+        "CreationTime",
+        "LastModifiedTime",
+        "MonitoringScheduleConfig"
+      ],
+      "members":{
+        "MonitoringScheduleArn":{
+          "shape":"MonitoringScheduleArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the monitoring schedule.</p>"
+        },
+        "MonitoringScheduleName":{
+          "shape":"MonitoringScheduleName",
+          "documentation":"<p>Name of the monitoring schedule.</p>"
+        },
+        "MonitoringScheduleStatus":{
+          "shape":"ScheduleStatus",
+          "documentation":"<p>The status of an monitoring job.</p>"
+        },
+        "FailureReason":{
+          "shape":"FailureReason",
+          "documentation":"<p>A string, up to one KB in size, that contains the reason a monitoring job failed, if it failed.</p>"
+        },
+        "CreationTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>The time at which the monitoring job was created.</p>"
+        },
+        "LastModifiedTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>The time at which the monitoring job was last modified.</p>"
+        },
+        "MonitoringScheduleConfig":{
+          "shape":"MonitoringScheduleConfig",
+          "documentation":"<p>The configuration object that specifies the monitoring schedule and defines the monitoring job.</p>"
+        },
+        "EndpointName":{
+          "shape":"EndpointName",
+          "documentation":"<p> The name of the endpoint for the monitoring job.</p>"
+        },
+        "LastMonitoringExecutionSummary":{
+          "shape":"MonitoringExecutionSummary",
+          "documentation":"<p>Describes metadata on the last execution to run, if there was one.</p>"
+        }
+      }
+    },
     "DescribeNotebookInstanceInput":{
       "type":"structure",
       "required":["NotebookInstanceName"],
@@ -3115,7 +5905,7 @@
         },
         "AcceleratorTypes":{
           "shape":"NotebookInstanceAcceleratorTypes",
-          "documentation":"<p>A list of the Elastic Inference (EI) instance types associated with this notebook instance. Currently only one EI instance type can be associated with a notebook instance. For more information, see <a href=\"sagemaker/latest/dg/ei.html\">Using Elastic Inference in Amazon SageMaker</a>.</p>"
+          "documentation":"<p>A list of the Elastic Inference (EI) instance types associated with this notebook instance. Currently only one EI instance type can be associated with a notebook instance. For more information, see <a href=\"https://docs.aws.amazon.com/sagemaker/latest/dg/ei.html\">Using Elastic Inference in Amazon SageMaker</a>.</p>"
         },
         "DefaultCodeRepository":{
           "shape":"CodeRepositoryNameOrUrl",
@@ -3131,6 +5921,113 @@
         }
       }
     },
+    "DescribeProcessingJobRequest":{
+      "type":"structure",
+      "required":["ProcessingJobName"],
+      "members":{
+        "ProcessingJobName":{
+          "shape":"ProcessingJobName",
+          "documentation":"<p>The name of the processing job. The name must be unique within an AWS Region in the AWS account.</p>"
+        }
+      }
+    },
+    "DescribeProcessingJobResponse":{
+      "type":"structure",
+      "required":[
+        "ProcessingJobName",
+        "ProcessingResources",
+        "AppSpecification",
+        "ProcessingJobArn",
+        "ProcessingJobStatus",
+        "CreationTime"
+      ],
+      "members":{
+        "ProcessingInputs":{
+          "shape":"ProcessingInputs",
+          "documentation":"<p>The inputs for a processing job.</p>"
+        },
+        "ProcessingOutputConfig":{
+          "shape":"ProcessingOutputConfig",
+          "documentation":"<p>Output configuration for the processing job.</p>"
+        },
+        "ProcessingJobName":{
+          "shape":"ProcessingJobName",
+          "documentation":"<p>The name of the processing job. The name must be unique within an AWS Region in the AWS account.</p>"
+        },
+        "ProcessingResources":{
+          "shape":"ProcessingResources",
+          "documentation":"<p>Identifies the resources, ML compute instances, and ML storage volumes to deploy for a processing job. In distributed training, you specify more than one instance.</p>"
+        },
+        "StoppingCondition":{
+          "shape":"ProcessingStoppingCondition",
+          "documentation":"<p>The time limit for how long the processing job is allowed to run.</p>"
+        },
+        "AppSpecification":{
+          "shape":"AppSpecification",
+          "documentation":"<p>Configures the processing job to run a specified container image.</p>"
+        },
+        "Environment":{
+          "shape":"ProcessingEnvironmentMap",
+          "documentation":"<p>The environment variables set in the Docker container.</p>"
+        },
+        "NetworkConfig":{
+          "shape":"NetworkConfig",
+          "documentation":"<p>Networking options for a processing job.</p>"
+        },
+        "RoleArn":{
+          "shape":"RoleArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of an IAM role that Amazon SageMaker can assume to perform tasks on your behalf.</p>"
+        },
+        "ExperimentConfig":{
+          "shape":"ExperimentConfig",
+          "documentation":"<p>The configuration information used to create an experiment.</p>"
+        },
+        "ProcessingJobArn":{
+          "shape":"ProcessingJobArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the processing job.</p>"
+        },
+        "ProcessingJobStatus":{
+          "shape":"ProcessingJobStatus",
+          "documentation":"<p>Provides the status of a processing job.</p>"
+        },
+        "ExitMessage":{
+          "shape":"ExitMessage",
+          "documentation":"<p>An optional string, up to one KB in size, that contains metadata from the processing container when the processing job exits.</p>"
+        },
+        "FailureReason":{
+          "shape":"FailureReason",
+          "documentation":"<p>A string, up to one KB in size, that contains the reason a processing job failed, if it failed.</p>"
+        },
+        "ProcessingEndTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>The time at which the processing job completed.</p>"
+        },
+        "ProcessingStartTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>The time at which the processing job started.</p>"
+        },
+        "LastModifiedTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>The time at which the processing job was last modified.</p>"
+        },
+        "CreationTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>The time at which the processing job was created.</p>"
+        },
+        "MonitoringScheduleArn":{
+          "shape":"MonitoringScheduleArn",
+          "documentation":"<p>The ARN of a monitoring schedule for an endpoint associated with this processing job.</p>"
+        },
+        "AutoMLJobArn":{
+          "shape":"AutoMLJobArn",
+          "documentation":"<p>The ARN of an AutoML job associated with this processing job.</p>"
+        },
+        "TrainingJobArn":{
+          "shape":"TrainingJobArn",
+          "documentation":"<p>The ARN of a training job associated with this processing job.</p>"
+        }
+      }
+    },
     "DescribeSubscribedWorkteamRequest":{
       "type":"structure",
       "required":["WorkteamArn"],
@@ -3191,6 +6088,10 @@
           "shape":"LabelingJobArn",
           "documentation":"<p>The Amazon Resource Name (ARN) of the Amazon SageMaker Ground Truth labeling job that created the transform or training job.</p>"
         },
+        "AutoMLJobArn":{
+          "shape":"AutoMLJobArn",
+          "documentation":"<p/>"
+        },
         "ModelArtifacts":{
           "shape":"ModelArtifacts",
           "documentation":"<p>Information about the Amazon S3 location that is configured for storing model artifacts. </p>"
@@ -3265,7 +6166,7 @@
         },
         "EnableNetworkIsolation":{
           "shape":"Boolean",
-          "documentation":"<p>If you want to allow inbound or outbound network calls, except for calls between peers within a training cluster for distributed training, choose <code>True</code>. If you enable network isolation for training jobs that are configured to use a VPC, Amazon SageMaker downloads and uploads customer data and model artifacts through the specified VPC, but the training container does not have network access.</p> <note> <p>The Semantic Segmentation built-in algorithm does not support network isolation.</p> </note>"
+          "documentation":"<p>If you want to allow inbound or outbound network calls, except for calls between peers within a training cluster for distributed training, choose <code>True</code>. If you enable network isolation for training jobs that are configured to use a VPC, Amazon SageMaker downloads and uploads customer data and model artifacts through the specified VPC, but the training container does not have network access.</p>"
         },
         "EnableInterContainerTrafficEncryption":{
           "shape":"Boolean",
@@ -3283,6 +6184,17 @@
         "BillableTimeInSeconds":{
           "shape":"BillableTimeInSeconds",
           "documentation":"<p>The billable time in seconds.</p> <p>You can calculate the savings from using managed spot training using the formula <code>(1 - BillableTimeInSeconds / TrainingTimeInSeconds) * 100</code>. For example, if <code>BillableTimeInSeconds</code> is 100 and <code>TrainingTimeInSeconds</code> is 500, the savings is 80%.</p>"
+        },
+        "DebugHookConfig":{"shape":"DebugHookConfig"},
+        "ExperimentConfig":{"shape":"ExperimentConfig"},
+        "DebugRuleConfigurations":{
+          "shape":"DebugRuleConfigurations",
+          "documentation":"<p>Configuration information for debugging rules.</p>"
+        },
+        "TensorBoardOutputConfig":{"shape":"TensorBoardOutputConfig"},
+        "DebugRuleEvaluationStatuses":{
+          "shape":"DebugRuleEvaluationStatuses",
+          "documentation":"<p>Status about the debug rule evaluation.</p>"
         }
       }
     },
@@ -3372,7 +6284,224 @@
           "shape":"LabelingJobArn",
           "documentation":"<p>The Amazon Resource Name (ARN) of the Amazon SageMaker Ground Truth labeling job that created the transform or training job.</p>"
         },
-        "DataProcessing":{"shape":"DataProcessing"}
+        "AutoMLJobArn":{
+          "shape":"AutoMLJobArn",
+          "documentation":"<p/>"
+        },
+        "DataProcessing":{"shape":"DataProcessing"},
+        "ExperimentConfig":{"shape":"ExperimentConfig"}
+      }
+    },
+    "DescribeTrialComponentRequest":{
+      "type":"structure",
+      "required":["TrialComponentName"],
+      "members":{
+        "TrialComponentName":{
+          "shape":"ExperimentEntityName",
+          "documentation":"<p>The name of the trial component to describe.</p>"
+        }
+      }
+    },
+    "DescribeTrialComponentResponse":{
+      "type":"structure",
+      "members":{
+        "TrialComponentName":{
+          "shape":"ExperimentEntityName",
+          "documentation":"<p>The name of the trial component.</p>"
+        },
+        "TrialComponentArn":{
+          "shape":"TrialComponentArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the trial component.</p>"
+        },
+        "DisplayName":{
+          "shape":"ExperimentEntityName",
+          "documentation":"<p>The name of the component as displayed. If <code>DisplayName</code> isn't specified, <code>TrialComponentName</code> is displayed.</p>"
+        },
+        "Source":{
+          "shape":"TrialComponentSource",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the source and, optionally, the job type.</p>"
+        },
+        "Status":{
+          "shape":"TrialComponentStatus",
+          "documentation":"<p>The status of the component. States include:</p> <ul> <li> <p>InProgress</p> </li> <li> <p>Completed</p> </li> <li> <p>Failed</p> </li> </ul>"
+        },
+        "StartTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>When the component started.</p>"
+        },
+        "EndTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>When the component ended.</p>"
+        },
+        "CreationTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>When the component was created.</p>"
+        },
+        "CreatedBy":{
+          "shape":"UserContext",
+          "documentation":"<p>Who created the component.</p>"
+        },
+        "LastModifiedTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>When the component was last modified.</p>"
+        },
+        "LastModifiedBy":{
+          "shape":"UserContext",
+          "documentation":"<p>Who last modified the component.</p>"
+        },
+        "Parameters":{
+          "shape":"TrialComponentParameters",
+          "documentation":"<p>The hyperparameters of the component.</p>"
+        },
+        "InputArtifacts":{
+          "shape":"TrialComponentArtifacts",
+          "documentation":"<p>The input artifacts of the component.</p>"
+        },
+        "OutputArtifacts":{
+          "shape":"TrialComponentArtifacts",
+          "documentation":"<p>The output artifacts of the component.</p>"
+        },
+        "Metrics":{
+          "shape":"TrialComponentMetricSummaries",
+          "documentation":"<p>The metrics for the component.</p>"
+        }
+      }
+    },
+    "DescribeTrialRequest":{
+      "type":"structure",
+      "required":["TrialName"],
+      "members":{
+        "TrialName":{
+          "shape":"ExperimentEntityName",
+          "documentation":"<p>The name of the trial to describe.</p>"
+        }
+      }
+    },
+    "DescribeTrialResponse":{
+      "type":"structure",
+      "members":{
+        "TrialName":{
+          "shape":"ExperimentEntityName",
+          "documentation":"<p>The name of the trial.</p>"
+        },
+        "TrialArn":{
+          "shape":"TrialArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the trial.</p>"
+        },
+        "DisplayName":{
+          "shape":"ExperimentEntityName",
+          "documentation":"<p>The name of the trial as displayed. If <code>DisplayName</code> isn't specified, <code>TrialName</code> is displayed.</p>"
+        },
+        "ExperimentName":{
+          "shape":"ExperimentEntityName",
+          "documentation":"<p>The name of the experiment the trial is part of.</p>"
+        },
+        "Source":{
+          "shape":"TrialSource",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the source and, optionally, the job type.</p>"
+        },
+        "CreationTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>When the trial was created.</p>"
+        },
+        "CreatedBy":{
+          "shape":"UserContext",
+          "documentation":"<p>Who created the trial.</p>"
+        },
+        "LastModifiedTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>When the trial was last modified.</p>"
+        },
+        "LastModifiedBy":{
+          "shape":"UserContext",
+          "documentation":"<p>Who last modified the trial.</p>"
+        }
+      }
+    },
+    "DescribeUserProfileRequest":{
+      "type":"structure",
+      "required":[
+        "DomainId",
+        "UserProfileName"
+      ],
+      "members":{
+        "DomainId":{
+          "shape":"DomainId",
+          "documentation":"<p>The domain ID.</p>"
+        },
+        "UserProfileName":{
+          "shape":"UserProfileName",
+          "documentation":"<p>The user profile name.</p>"
+        }
+      }
+    },
+    "DescribeUserProfileResponse":{
+      "type":"structure",
+      "members":{
+        "DomainId":{
+          "shape":"DomainId",
+          "documentation":"<p>The domain ID.</p>"
+        },
+        "UserProfileArn":{
+          "shape":"UserProfileArn",
+          "documentation":"<p>The user profile Amazon Resource Name (ARN).</p>"
+        },
+        "UserProfileName":{
+          "shape":"UserProfileName",
+          "documentation":"<p>The user profile name.</p>"
+        },
+        "HomeEfsFileSystemUid":{
+          "shape":"EfsUid",
+          "documentation":"<p>The homa Amazon Elastic File System (EFS) Uid.</p>"
+        },
+        "Status":{
+          "shape":"UserProfileStatus",
+          "documentation":"<p>The status.</p>"
+        },
+        "LastModifiedTime":{
+          "shape":"LastModifiedTime",
+          "documentation":"<p>The last modified time.</p>"
+        },
+        "CreationTime":{
+          "shape":"CreationTime",
+          "documentation":"<p>The creation time.</p>"
+        },
+        "FailureReason":{
+          "shape":"FailureReason",
+          "documentation":"<p>The failure reason.</p>"
+        },
+        "SingleSignOnUserIdentifier":{
+          "shape":"SingleSignOnUserIdentifier",
+          "documentation":"<p>The SSO user identifier.</p>"
+        },
+        "SingleSignOnUserValue":{
+          "shape":"String256",
+          "documentation":"<p>The SSO user value.</p>"
+        },
+        "UserSettings":{
+          "shape":"UserSettings",
+          "documentation":"<p>A collection of settings.</p>"
+        }
+      }
+    },
+    "DescribeWorkforceRequest":{
+      "type":"structure",
+      "required":["WorkforceName"],
+      "members":{
+        "WorkforceName":{
+          "shape":"WorkforceName",
+          "documentation":"<p>The name of the private workforce whose access you want to restrict. <code>WorkforceName</code> is automatically set to <code>default</code> when a workforce is created and cannot be modified. </p>"
+        }
+      }
+    },
+    "DescribeWorkforceResponse":{
+      "type":"structure",
+      "required":["Workforce"],
+      "members":{
+        "Workforce":{
+          "shape":"Workforce",
+          "documentation":"<p>A single private workforce, which is automatically created when you create your first private work team. You can create one private work force in each AWS Region. By default, any workforce-related API operation used in a specific region will apply to the workforce created in that region. To learn how to create a private workforce, see <a href=\"https://docs.aws.amazon.com/sagemaker/latest/dg/sms-workforce-create-private.html\">Create a Private Workforce</a>.</p>"
+        }
       }
     },
     "DescribeWorkteamRequest":{
@@ -3419,6 +6548,11 @@
       "member":{"shape":"DesiredWeightAndCapacity"},
       "min":1
     },
+    "DestinationS3Uri":{
+      "type":"string",
+      "max":512,
+      "pattern":"^(https|s3)://([^/])/?(.*)$"
+    },
     "DetailedAlgorithmStatus":{
       "type":"string",
       "enum":[
@@ -3444,20 +6578,118 @@
         "Disabled"
       ]
     },
-    "DirectoryPath":{
+    "DirectoryPath":{
+      "type":"string",
+      "max":4096,
+      "pattern":".*"
+    },
+    "DisassociateAdditionalCodeRepositories":{"type":"boolean"},
+    "DisassociateDefaultCodeRepository":{"type":"boolean"},
+    "DisassociateNotebookInstanceAcceleratorTypes":{"type":"boolean"},
+    "DisassociateNotebookInstanceLifecycleConfig":{"type":"boolean"},
+    "DisassociateTrialComponentRequest":{
+      "type":"structure",
+      "required":[
+        "TrialComponentName",
+        "TrialName"
+      ],
+      "members":{
+        "TrialComponentName":{
+          "shape":"ExperimentEntityName",
+          "documentation":"<p>The name of the component to disassociate from the trial.</p>"
+        },
+        "TrialName":{
+          "shape":"ExperimentEntityName",
+          "documentation":"<p>The name of the trial to disassociate from.</p>"
+        }
+      }
+    },
+    "DisassociateTrialComponentResponse":{
+      "type":"structure",
+      "members":{
+        "TrialComponentArn":{
+          "shape":"TrialComponentArn",
+          "documentation":"<p>The ARN of the trial component.</p>"
+        },
+        "TrialArn":{
+          "shape":"TrialArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the trial.</p>"
+        }
+      }
+    },
+    "Dollars":{
+      "type":"integer",
+      "max":2,
+      "min":0
+    },
+    "DomainArn":{
+      "type":"string",
+      "max":256,
+      "pattern":"arn:aws[a-z\\-]*:sagemaker:[a-z0-9\\-]*:[0-9]{12}:domain/.*"
+    },
+    "DomainDetails":{
+      "type":"structure",
+      "members":{
+        "DomainArn":{
+          "shape":"DomainArn",
+          "documentation":"<p>The domain's Amazon Resource Name (ARN).</p>"
+        },
+        "DomainId":{
+          "shape":"DomainId",
+          "documentation":"<p>The domain ID.</p>"
+        },
+        "DomainName":{
+          "shape":"DomainName",
+          "documentation":"<p>The domain name.</p>"
+        },
+        "Status":{
+          "shape":"DomainStatus",
+          "documentation":"<p>The status.</p>"
+        },
+        "CreationTime":{
+          "shape":"CreationTime",
+          "documentation":"<p>The creation time.</p>"
+        },
+        "LastModifiedTime":{
+          "shape":"LastModifiedTime",
+          "documentation":"<p>The last modified time.</p>"
+        },
+        "Url":{
+          "shape":"String1024",
+          "documentation":"<p>The domain's URL.</p>"
+        }
+      },
+      "documentation":"<p>The domain's details.</p>"
+    },
+    "DomainId":{
+      "type":"string",
+      "max":63
+    },
+    "DomainList":{
+      "type":"list",
+      "member":{"shape":"DomainDetails"}
+    },
+    "DomainName":{
+      "type":"string",
+      "max":63,
+      "pattern":"^[a-zA-Z0-9](-*[a-zA-Z0-9])*"
+    },
+    "DomainStatus":{
+      "type":"string",
+      "enum":[
+        "Deleting",
+        "Failed",
+        "InService",
+        "Pending"
+      ]
+    },
+    "DoubleParameterValue":{"type":"double"},
+    "EfsUid":{
       "type":"string",
-      "max":4096,
-      "pattern":".*"
-    },
-    "DisassociateAdditionalCodeRepositories":{"type":"boolean"},
-    "DisassociateDefaultCodeRepository":{"type":"boolean"},
-    "DisassociateNotebookInstanceAcceleratorTypes":{"type":"boolean"},
-    "DisassociateNotebookInstanceLifecycleConfig":{"type":"boolean"},
-    "Dollars":{
-      "type":"integer",
-      "max":1,
-      "min":0
+      "max":10,
+      "pattern":"\\d+"
     },
+    "EnableCapture":{"type":"boolean"},
     "EndpointArn":{
       "type":"string",
       "max":2048,
@@ -3514,6 +6746,32 @@
       "type":"list",
       "member":{"shape":"EndpointConfigSummary"}
     },
+    "EndpointInput":{
+      "type":"structure",
+      "required":[
+        "EndpointName",
+        "LocalPath"
+      ],
+      "members":{
+        "EndpointName":{
+          "shape":"EndpointName",
+          "documentation":"<p>An endpoint in customer's account which has enabled <code>DataCaptureConfig</code> enabled.</p>"
+        },
+        "LocalPath":{
+          "shape":"ProcessingLocalPath",
+          "documentation":"<p>Path to the filesystem where the endpoint data is available to the container.</p>"
+        },
+        "S3InputMode":{
+          "shape":"ProcessingS3InputMode",
+          "documentation":"<p>Whether the <code>Pipe</code> or <code>File</code> is used as the input mode for transfering data for the monitoring job. <code>Pipe</code> mode is recommended for large datasets. <code>File</code> mode is useful for small files that fit in memory. Defaults to <code>File</code>.</p>"
+        },
+        "S3DataDistributionType":{
+          "shape":"ProcessingS3DataDistributionType",
+          "documentation":"<p>Whether input data distributed in Amazon S3 is fully replicated or sharded by an S3 key. Defauts to <code>FullyReplicated</code> </p>"
+        }
+      },
+      "documentation":"<p>Input object for the endpoint</p>"
+    },
     "EndpointName":{
       "type":"string",
       "max":63,
@@ -3593,6 +6851,11 @@
       "min":1,
       "pattern":"^[a-zA-Z0-9](-*[a-zA-Z0-9])*$"
     },
+    "EnvironmentArn":{
+      "type":"string",
+      "max":256,
+      "pattern":"^arn:aws(-[\\w]+)*:sagemaker:.+:[0-9]{12}:environment/[a-z0-9](-*[a-z0-9]){0,62}$"
+    },
     "EnvironmentKey":{
       "type":"string",
       "max":1024,
@@ -3609,6 +6872,145 @@
       "max":1024,
       "pattern":"[\\S\\s]*"
     },
+    "ExecutionStatus":{
+      "type":"string",
+      "enum":[
+        "Pending",
+        "Completed",
+        "CompletedWithViolations",
+        "InProgress",
+        "Failed",
+        "Stopping",
+        "Stopped"
+      ]
+    },
+    "ExitMessage":{
+      "type":"string",
+      "max":1024,
+      "pattern":"[\\S\\s]*"
+    },
+    "Experiment":{
+      "type":"structure",
+      "members":{
+        "ExperimentName":{
+          "shape":"ExperimentEntityName",
+          "documentation":"<p>The name of the experiment.</p>"
+        },
+        "ExperimentArn":{
+          "shape":"ExperimentArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the experiment.</p>"
+        },
+        "DisplayName":{
+          "shape":"ExperimentEntityName",
+          "documentation":"<p>The name of the experiment as displayed. If <code>DisplayName</code> isn't specified, <code>ExperimentName</code> is displayed.</p>"
+        },
+        "Source":{"shape":"ExperimentSource"},
+        "Description":{
+          "shape":"ExperimentDescription",
+          "documentation":"<p>The description of the experiment.</p>"
+        },
+        "CreationTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>When the experiment was created.</p>"
+        },
+        "CreatedBy":{"shape":"UserContext"},
+        "LastModifiedTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>When the experiment was last modified.</p>"
+        },
+        "LastModifiedBy":{"shape":"UserContext"},
+        "Tags":{
+          "shape":"TagList",
+          "documentation":"<p>The list of tags that are associated with the experiment. You can use <a>Search</a> API to search on the tags.</p>"
+        }
+      },
+      "documentation":"<p>A summary of the properties of an experiment as returned by the <a>Search</a> API.</p>"
+    },
+    "ExperimentArn":{
+      "type":"string",
+      "max":256,
+      "pattern":"arn:aws[a-z\\-]*:sagemaker:[a-z0-9\\-]*:[0-9]{12}:experiment/.*"
+    },
+    "ExperimentConfig":{
+      "type":"structure",
+      "members":{
+        "ExperimentName":{
+          "shape":"ExperimentEntityName",
+          "documentation":"<p>The name of the experiment.</p>"
+        },
+        "TrialName":{
+          "shape":"ExperimentEntityName",
+          "documentation":"<p>The name of the trial.</p>"
+        },
+        "TrialComponentDisplayName":{
+          "shape":"ExperimentEntityName",
+          "documentation":"<p>Display name for the trial component.</p>"
+        }
+      },
+      "documentation":"<p>Configuration for the experiment.</p>"
+    },
+    "ExperimentDescription":{
+      "type":"string",
+      "max":3072,
+      "pattern":".*"
+    },
+    "ExperimentEntityName":{
+      "type":"string",
+      "max":82,
+      "min":1,
+      "pattern":"^[a-zA-Z0-9](-*[a-zA-Z0-9])*"
+    },
+    "ExperimentSource":{
+      "type":"structure",
+      "required":["SourceArn"],
+      "members":{
+        "SourceArn":{
+          "shape":"ExperimentSourceArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the source.</p>"
+        },
+        "SourceType":{
+          "shape":"SourceType",
+          "documentation":"<p>The source type.</p>"
+        }
+      },
+      "documentation":"<p>The source of the experiment.</p>"
+    },
+    "ExperimentSourceArn":{
+      "type":"string",
+      "max":256,
+      "pattern":"arn:aws[a-z\\-]*:sagemaker:[a-z0-9\\-]*:[0-9]{12}:.*"
+    },
+    "ExperimentSummaries":{
+      "type":"list",
+      "member":{"shape":"ExperimentSummary"}
+    },
+    "ExperimentSummary":{
+      "type":"structure",
+      "members":{
+        "ExperimentArn":{
+          "shape":"ExperimentArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the experiment.</p>"
+        },
+        "ExperimentName":{
+          "shape":"ExperimentEntityName",
+          "documentation":"<p>The name of the experiment.</p>"
+        },
+        "DisplayName":{
+          "shape":"ExperimentEntityName",
+          "documentation":"<p>The name of the experiment as displayed. If <code>DisplayName</code> isn't specified, <code>ExperimentName</code> is displayed.</p>"
+        },
+        "ExperimentSource":{"shape":"ExperimentSource"},
+        "CreationTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>When the experiment was created.</p>"
+        },
+        "LastModifiedTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>When the experiment was last modified.</p>"
+        }
+      },
+      "documentation":"<p>A summary of the properties of an experiment. To get the complete set of properties, call the <a>DescribeExperiment</a> API and provide the <code>ExperimentName</code>.</p>"
+    },
     "FailureReason":{
       "type":"string",
       "max":1024
@@ -3670,14 +7072,14 @@
         },
         "Operator":{
           "shape":"Operator",
-          "documentation":"<p>A Boolean binary operator that is used to evaluate the filter. The operator field contains one of the following values:</p> <dl> <dt>Equals</dt> <dd> <p>The specified resource in <code>Name</code> equals the specified <code>Value</code>.</p> </dd> <dt>NotEquals</dt> <dd> <p>The specified resource in <code>Name</code> does not equal the specified <code>Value</code>.</p> </dd> <dt>GreaterThan</dt> <dd> <p>The specified resource in <code>Name</code> is greater than the specified <code>Value</code>. Not supported for text-based properties.</p> </dd> <dt>GreaterThanOrEqualTo</dt> <dd> <p>The specified resource in <code>Name</code> is greater than or equal to the specified <code>Value</code>. Not supported for text-based properties.</p> </dd> <dt>LessThan</dt> <dd> <p>The specified resource in <code>Name</code> is less than the specified <code>Value</code>. Not supported for text-based properties.</p> </dd> <dt>LessThanOrEqualTo</dt> <dd> <p>The specified resource in <code>Name</code> is less than or equal to the specified <code>Value</code>. Not supported for text-based properties.</p> </dd> <dt>Contains</dt> <dd> <p>Only supported for text-based properties. The word-list of the property contains the specified <code>Value</code>.</p> </dd> </dl> <p>If you have specified a filter <code>Value</code>, the default is <code>Equals</code>.</p>"
+          "documentation":"<p>A Boolean binary operator that is used to evaluate the filter. The operator field contains one of the following values:</p> <dl> <dt>Equals</dt> <dd> <p>The specified resource in <code>Name</code> equals the specified <code>Value</code>.</p> </dd> <dt>NotEquals</dt> <dd> <p>The specified resource in <code>Name</code> does not equal the specified <code>Value</code>.</p> </dd> <dt>GreaterThan</dt> <dd> <p>The specified resource in <code>Name</code> is greater than the specified <code>Value</code>. Not supported for text-based properties.</p> </dd> <dt>GreaterThanOrEqualTo</dt> <dd> <p>The specified resource in <code>Name</code> is greater than or equal to the specified <code>Value</code>. Not supported for text-based properties.</p> </dd> <dt>LessThan</dt> <dd> <p>The specified resource in <code>Name</code> is less than the specified <code>Value</code>. Not supported for text-based properties.</p> </dd> <dt>LessThanOrEqualTo</dt> <dd> <p>The specified resource in <code>Name</code> is less than or equal to the specified <code>Value</code>. Not supported for text-based properties.</p> </dd> <dt>Contains</dt> <dd> <p>Only supported for text-based properties. The word-list of the property contains the specified <code>Value</code>. A <code>SearchExpression</code> can include only one <code>Contains</code> operator.</p> </dd> </dl> <p>If you have specified a filter <code>Value</code>, the default is <code>Equals</code>.</p>"
         },
         "Value":{
           "shape":"FilterValue",
           "documentation":"<p>A value used with <code>Resource</code> and <code>Operator</code> to determine if objects satisfy the filter's condition. For numerical properties, <code>Value</code> must be an integer or floating-point decimal. For timestamp properties, <code>Value</code> must be an ISO 8601 date-time string of the following format: <code>YYYY-mm-dd'T'HH:MM:SS</code>.</p>"
         }
       },
-      "documentation":"<p>A conditional statement for a search expression that includes a Boolean operator, a resource property, and a value.</p> <p>If you don't specify an <code>Operator</code> and a <code>Value</code>, the filter searches for only the specified property. For example, defining a <code>Filter</code> for the <code>FailureReason</code> for the <code>TrainingJob</code> <code>Resource</code> searches for training job objects that have a value in the <code>FailureReason</code> field.</p> <p>If you specify a <code>Value</code>, but not an <code>Operator</code>, Amazon SageMaker uses the equals operator as the default.</p> <p>In search, there are several property types:</p> <dl> <dt>Metrics</dt> <dd> <p>To define a metric filter, enter a value using the form <code>\"Metrics.&lt;name&gt;\"</code>, where <code>&lt;name&gt;</code> is a metric name. For example, the following filter searches for training jobs with an <code>\"accuracy\"</code> metric greater than <code>\"0.9\"</code>:</p> <p> <code>{</code> </p> <p> <code>\"Name\": \"Metrics.accuracy\",</code> </p> <p> <code>\"Operator\": \"GREATER_THAN\",</code> </p> <p> <code>\"Value\": \"0.9\"</code> </p> <p> <code>}</code> </p> </dd> <dt>HyperParameters</dt> <dd> <p>To define a hyperparameter filter, enter a value with the form <code>\"HyperParameters.&lt;name&gt;\"</code>. Decimal hyperparameter values are treated as a decimal in a comparison if the specified <code>Value</code> is also a decimal value. If the specified <code>Value</code> is an integer, the decimal hyperparameter values are treated as integers. For example, the following filter is satisfied by training jobs with a <code>\"learning_rate\"</code> hyperparameter that is less than <code>\"0.5\"</code>:</p> <p> <code> {</code> </p> <p> <code> \"Name\": \"HyperParameters.learning_rate\",</code> </p> <p> <code> \"Operator\": \"LESS_THAN\",</code> </p> <p> <code> \"Value\": \"0.5\"</code> </p> <p> <code> }</code> </p> </dd> <dt>Tags</dt> <dd> <p>To define a tag filter, enter a value with the form <code>\"Tags.&lt;key&gt;\"</code>.</p> </dd> </dl>"
+      "documentation":"<p>A conditional statement for a search expression that includes a resource property, a Boolean operator, and a value.</p> <p>If you don't specify an <code>Operator</code> and a <code>Value</code>, the filter searches for only the specified property. For example, defining a <code>Filter</code> for the <code>FailureReason</code> for the <code>TrainingJob</code> <code>Resource</code> searches for training job objects that have a value in the <code>FailureReason</code> field.</p> <p>If you specify a <code>Value</code>, but not an <code>Operator</code>, Amazon SageMaker uses the equals operator as the default.</p> <p>In search, there are several property types:</p> <dl> <dt>Metrics</dt> <dd> <p>To define a metric filter, enter a value using the form <code>\"Metrics.&lt;name&gt;\"</code>, where <code>&lt;name&gt;</code> is a metric name. For example, the following filter searches for training jobs with an <code>\"accuracy\"</code> metric greater than <code>\"0.9\"</code>:</p> <p> <code>{</code> </p> <p> <code>\"Name\": \"Metrics.accuracy\",</code> </p> <p> <code>\"Operator\": \"GREATER_THAN\",</code> </p> <p> <code>\"Value\": \"0.9\"</code> </p> <p> <code>}</code> </p> </dd> <dt>HyperParameters</dt> <dd> <p>To define a hyperparameter filter, enter a value with the form <code>\"HyperParameters.&lt;name&gt;\"</code>. Decimal hyperparameter values are treated as a decimal in a comparison if the specified <code>Value</code> is also a decimal value. If the specified <code>Value</code> is an integer, the decimal hyperparameter values are treated as integers. For example, the following filter is satisfied by training jobs with a <code>\"learning_rate\"</code> hyperparameter that is less than <code>\"0.5\"</code>:</p> <p> <code> {</code> </p> <p> <code> \"Name\": \"HyperParameters.learning_rate\",</code> </p> <p> <code> \"Operator\": \"LESS_THAN\",</code> </p> <p> <code> \"Value\": \"0.5\"</code> </p> <p> <code> }</code> </p> </dd> <dt>Tags</dt> <dd> <p>To define a tag filter, enter a value with the form <code>\"Tags.&lt;key&gt;\"</code>.</p> </dd> </dl>"
     },
     "FilterList":{
       "type":"list",
@@ -3691,6 +7093,28 @@
       "min":1,
       "pattern":".+"
     },
+    "FinalAutoMLJobObjectiveMetric":{
+      "type":"structure",
+      "required":[
+        "MetricName",
+        "Value"
+      ],
+      "members":{
+        "Type":{
+          "shape":"AutoMLJobObjectiveType",
+          "documentation":"<p>The metric type used.</p>"
+        },
+        "MetricName":{
+          "shape":"AutoMLMetricEnum",
+          "documentation":"<p>The name of the metric.</p>"
+        },
+        "Value":{
+          "shape":"MetricValue",
+          "documentation":"<p>The value of the metric.</p>"
+        }
+      },
+      "documentation":"<p>The candidate result from a job.</p>"
+    },
     "FinalHyperParameterTuningJobObjectiveMetric":{
       "type":"structure",
       "required":[
@@ -3720,23 +7144,135 @@
       "min":0
     },
     "Float":{"type":"float"},
+    "FlowDefinitionArn":{
+      "type":"string",
+      "max":1024,
+      "pattern":"arn:aws[a-z\\-]*:sagemaker:[a-z0-9\\-]*:[0-9]{12}:flow-definition/.*"
+    },
+    "FlowDefinitionName":{
+      "type":"string",
+      "max":63,
+      "min":1,
+      "pattern":"^[a-z0-9](-*[a-z0-9])*"
+    },
+    "FlowDefinitionOutputConfig":{
+      "type":"structure",
+      "required":["S3OutputPath"],
+      "members":{
+        "S3OutputPath":{
+          "shape":"S3Uri",
+          "documentation":"<p>The Amazon S3 path where the object containing human output will be made available.</p>"
+        },
+        "KmsKeyId":{
+          "shape":"KmsKeyId",
+          "documentation":"<p>The Amazon Key Management Service (KMS) key ID for server-side encryption.</p>"
+        }
+      },
+      "documentation":"<p>Contains information about where human output will be stored.</p>"
+    },
+    "FlowDefinitionStatus":{
+      "type":"string",
+      "enum":[
+        "Initializing",
+        "Active",
+        "Failed",
+        "Deleting"
+      ]
+    },
+    "FlowDefinitionSummaries":{
+      "type":"list",
+      "member":{"shape":"FlowDefinitionSummary"}
+    },
+    "FlowDefinitionSummary":{
+      "type":"structure",
+      "required":[
+        "FlowDefinitionName",
+        "FlowDefinitionArn",
+        "FlowDefinitionStatus",
+        "CreationTime"
+      ],
+      "members":{
+        "FlowDefinitionName":{
+          "shape":"FlowDefinitionName",
+          "documentation":"<p>The name of the flow definition.</p>"
+        },
+        "FlowDefinitionArn":{
+          "shape":"FlowDefinitionArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the flow definition.</p>"
+        },
+        "FlowDefinitionStatus":{
+          "shape":"FlowDefinitionStatus",
+          "documentation":"<p>The status of the flow definition. Valid values:</p>"
+        },
+        "CreationTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>The timestamp when SageMaker created the flow definition.</p>"
+        },
+        "FailureReason":{
+          "shape":"FailureReason",
+          "documentation":"<p>The reason why the flow definition creation failed. A failure reason is returned only when the flow definition status is <code>Failed</code>.</p>"
+        }
+      },
+      "documentation":"<p>Contains summary information about the flow definition.</p>"
+    },
+    "FlowDefinitionTaskAvailabilityLifetimeInSeconds":{
+      "type":"integer",
+      "max":864000,
+      "min":1
+    },
+    "FlowDefinitionTaskCount":{
+      "type":"integer",
+      "max":3,
+      "min":1
+    },
+    "FlowDefinitionTaskDescription":{
+      "type":"string",
+      "max":255,
+      "min":1,
+      "pattern":".+"
+    },
+    "FlowDefinitionTaskKeyword":{
+      "type":"string",
+      "max":30,
+      "min":1,
+      "pattern":"^[A-Za-z0-9]+( [A-Za-z0-9]+)*$"
+    },
+    "FlowDefinitionTaskKeywords":{
+      "type":"list",
+      "member":{"shape":"FlowDefinitionTaskKeyword"},
+      "max":5,
+      "min":1
+    },
+    "FlowDefinitionTaskTimeLimitInSeconds":{
+      "type":"integer",
+      "max":28800,
+      "min":30
+    },
+    "FlowDefinitionTaskTitle":{
+      "type":"string",
+      "max":128,
+      "min":1,
+      "pattern":"^[\\t\\n\\r -\\uD7FF\\uE000-\\uFFFD]*$"
+    },
     "Framework":{
       "type":"string",
       "enum":[
         "TENSORFLOW",
+        "KERAS",
         "MXNET",
         "ONNX",
         "PYTORCH",
         "XGBOOST"
       ]
     },
+    "GenerateCandidateDefinitionsOnly":{"type":"boolean"},
     "GetSearchSuggestionsRequest":{
       "type":"structure",
       "required":["Resource"],
       "members":{
         "Resource":{
           "shape":"ResourceType",
-          "documentation":"<p>The name of the Amazon SageMaker resource to Search for. The only valid <code>Resource</code> value is <code>TrainingJob</code>.</p>"
+          "documentation":"<p>The name of the Amazon SageMaker resource to Search for.</p>"
         },
         "SuggestionQuery":{
           "shape":"SuggestionQuery",
@@ -3761,30 +7297,121 @@
           "shape":"GitConfigUrl",
           "documentation":"<p>The URL where the Git repository is located.</p>"
         },
-        "Branch":{
-          "shape":"Branch",
-          "documentation":"<p>The default branch for the Git repository.</p>"
+        "Branch":{
+          "shape":"Branch",
+          "documentation":"<p>The default branch for the Git repository.</p>"
+        },
+        "SecretArn":{
+          "shape":"SecretArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the AWS Secrets Manager secret that contains the credentials used to access the git repository. The secret must have a staging label of <code>AWSCURRENT</code> and must be in the following format:</p> <p> <code>{\"username\": <i>UserName</i>, \"password\": <i>Password</i>}</code> </p>"
+        }
+      },
+      "documentation":"<p>Specifies configuration details for a Git repository in your AWS account.</p>"
+    },
+    "GitConfigForUpdate":{
+      "type":"structure",
+      "members":{
+        "SecretArn":{
+          "shape":"SecretArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the AWS Secrets Manager secret that contains the credentials used to access the git repository. The secret must have a staging label of <code>AWSCURRENT</code> and must be in the following format:</p> <p> <code>{\"username\": <i>UserName</i>, \"password\": <i>Password</i>}</code> </p>"
+        }
+      },
+      "documentation":"<p>Specifies configuration details for a Git repository when the repository is updated.</p>"
+    },
+    "GitConfigUrl":{
+      "type":"string",
+      "pattern":"^https://([^/]+)/?(.*)$"
+    },
+    "HookParameters":{
+      "type":"map",
+      "key":{"shape":"ConfigKey"},
+      "value":{"shape":"ConfigValue"},
+      "max":20,
+      "min":0
+    },
+    "HumanLoopActivationConditions":{
+      "type":"string",
+      "max":10240
+    },
+    "HumanLoopActivationConditionsConfig":{
+      "type":"structure",
+      "required":["HumanLoopActivationConditions"],
+      "members":{
+        "HumanLoopActivationConditions":{
+          "shape":"HumanLoopActivationConditions",
+          "documentation":"<p>JSON expressing use-case specific conditions declaratively. If any condition is matched, atomic tasks are created against the configured work team. The set of conditions is different for Rekognition and Textract. For more information about how to structure the JSON, see <a href=\"https://docs.aws.amazon.com/sagemaker/latest/dg/a2i-human-fallback-conditions-json-schema.html\">JSON Schema for Human Loop Activation Conditions in Amazon Augmented AI</a> in the <i>Amazon SageMaker Developer Guide</i>.</p>",
+          "jsonvalue":true
+        }
+      },
+      "documentation":"<p>Defines under what conditions SageMaker creates a human loop. Used within . See for the required format of activation conditions.</p>"
+    },
+    "HumanLoopActivationConfig":{
+      "type":"structure",
+      "required":["HumanLoopActivationConditionsConfig"],
+      "members":{
+        "HumanLoopActivationConditionsConfig":{
+          "shape":"HumanLoopActivationConditionsConfig",
+          "documentation":"<p>Container structure for defining under what conditions SageMaker creates a human loop.</p>"
+        }
+      },
+      "documentation":"<p>Provides information about how and under what conditions SageMaker creates a human loop. If <code>HumanLoopActivationConfig</code> is not given, then all requests go to humans.</p>"
+    },
+    "HumanLoopConfig":{
+      "type":"structure",
+      "required":[
+        "WorkteamArn",
+        "HumanTaskUiArn",
+        "TaskTitle",
+        "TaskDescription",
+        "TaskCount"
+      ],
+      "members":{
+        "WorkteamArn":{
+          "shape":"WorkteamArn",
+          "documentation":"<p>Amazon Resource Name (ARN) of a team of workers.</p>"
+        },
+        "HumanTaskUiArn":{
+          "shape":"HumanTaskUiArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the human task user interface.</p>"
+        },
+        "TaskTitle":{
+          "shape":"FlowDefinitionTaskTitle",
+          "documentation":"<p>A title for the human worker task.</p>"
+        },
+        "TaskDescription":{
+          "shape":"FlowDefinitionTaskDescription",
+          "documentation":"<p>A description for the human worker task.</p>"
+        },
+        "TaskCount":{
+          "shape":"FlowDefinitionTaskCount",
+          "documentation":"<p>The number of distinct workers who will perform the same task on each object. For example, if <code>TaskCount</code> is set to <code>3</code> for an image classification labeling job, three workers will classify each input image. Increasing <code>TaskCount</code> can improve label accuracy.</p>"
+        },
+        "TaskAvailabilityLifetimeInSeconds":{
+          "shape":"FlowDefinitionTaskAvailabilityLifetimeInSeconds",
+          "documentation":"<p>The length of time that a task remains available for labeling by human workers.</p>"
+        },
+        "TaskTimeLimitInSeconds":{
+          "shape":"FlowDefinitionTaskTimeLimitInSeconds",
+          "documentation":"<p>The amount of time that a worker has to complete a task.</p>"
+        },
+        "TaskKeywords":{
+          "shape":"FlowDefinitionTaskKeywords",
+          "documentation":"<p>Keywords used to describe the task so that workers can discover the task.</p>"
         },
-        "SecretArn":{
-          "shape":"SecretArn",
-          "documentation":"<p>The Amazon Resource Name (ARN) of the AWS Secrets Manager secret that contains the credentials used to access the git repository. The secret must have a staging label of <code>AWSCURRENT</code> and must be in the following format:</p> <p> <code>{\"username\": <i>UserName</i>, \"password\": <i>Password</i>}</code> </p>"
-        }
+        "PublicWorkforceTaskPrice":{"shape":"PublicWorkforceTaskPrice"}
       },
-      "documentation":"<p>Specifies configuration details for a Git repository in your AWS account.</p>"
+      "documentation":"<p>Describes the work to be performed by human workers.</p>"
     },
-    "GitConfigForUpdate":{
+    "HumanLoopRequestSource":{
       "type":"structure",
+      "required":["AwsManagedHumanLoopRequestSource"],
       "members":{
-        "SecretArn":{
-          "shape":"SecretArn",
-          "documentation":"<p>The Amazon Resource Name (ARN) of the AWS Secrets Manager secret that contains the credentials used to access the git repository. The secret must have a staging label of <code>AWSCURRENT</code> and must be in the following format:</p> <p> <code>{\"username\": <i>UserName</i>, \"password\": <i>Password</i>}</code> </p>"
+        "AwsManagedHumanLoopRequestSource":{
+          "shape":"AwsManagedHumanLoopRequestSource",
+          "documentation":"<p>Specifies whether Amazon Rekognition or Amazon Textract are used as the integration source. The default field settings and JSON parsing rules are different based on the integration source. Valid values:</p>"
         }
       },
-      "documentation":"<p>Specifies configuration details for a Git repository when the repository is updated.</p>"
-    },
-    "GitConfigUrl":{
-      "type":"string",
-      "pattern":"^https://([^/]+)/?(.*)$"
+      "documentation":"<p>Container for configuring the source of human task requests.</p>"
     },
     "HumanTaskConfig":{
       "type":"structure",
@@ -3809,7 +7436,7 @@
         },
         "PreHumanTaskLambdaArn":{
           "shape":"LambdaFunctionArn",
-          "documentation":"<p>The Amazon Resource Name (ARN) of a Lambda function that is run before a data object is sent to a human worker. Use this function to provide input to a custom labeling job.</p> <p>For the built-in bounding box, image classification, semantic segmentation, and text classification task types, Amazon SageMaker Ground Truth provides the following Lambda functions:</p> <p> <b>US East (Northern Virginia) (us-east-1):</b> </p> <ul> <li> <p> <code>arn:aws:lambda:us-east-1:432418664414:function:PRE-BoundingBox</code> </p> </li> <li> <p> <code>arn:aws:lambda:us-east-1:432418664414:function:PRE-ImageMultiClass</code> </p> </li> <li> <p> <code>arn:aws:lambda:us-east-1:432418664414:function:PRE-SemanticSegmentation</code> </p> </li> <li> <p> <code>arn:aws:lambda:us-east-1:432418664414:function:PRE-TextMultiClass</code> </p> </li> <li> <p> <code>arn:aws:lambda:us-east-1:432418664414:function:PRE-NamedEntityRecognition</code> </p> </li> </ul> <p> <b>US East (Ohio) (us-east-2):</b> </p> <ul> <li> <p> <code>arn:aws:lambda:us-east-2:266458841044:function:PRE-BoundingBox</code> </p> </li> <li> <p> <code>arn:aws:lambda:us-east-2:266458841044:function:PRE-ImageMultiClass</code> </p> </li> <li> <p> <code>arn:aws:lambda:us-east-2:266458841044:function:PRE-SemanticSegmentation</code> </p> </li> <li> <p> <code>arn:aws:lambda:us-east-2:266458841044:function:PRE-TextMultiClass</code> </p> </li> <li> <p> <code>arn:aws:lambda:us-east-2:266458841044:function:PRE-NamedEntityRecognition</code> </p> </li> </ul> <p> <b>US West (Oregon) (us-west-2):</b> </p> <ul> <li> <p> <code>arn:aws:lambda:us-west-2:081040173940:function:PRE-BoundingBox</code> </p> </li> <li> <p> <code>arn:aws:lambda:us-west-2:081040173940:function:PRE-ImageMultiClass</code> </p> </li> <li> <p> <code>arn:aws:lambda:us-west-2:081040173940:function:PRE-SemanticSegmentation</code> </p> </li> <li> <p> <code>arn:aws:lambda:us-west-2:081040173940:function:PRE-TextMultiClass</code> </p> </li> <li> <p> <code>arn:aws:lambda:us-west-2:081040173940:function:PRE-NamedEntityRecognition</code> </p> </li> </ul> <p> <b>Canada (Central) (ca-central-1):</b> </p> <ul> <li> <p> <code>arn:awslambda:ca-central-1:918755190332:function:PRE-BoundingBox</code> </p> </li> <li> <p> <code>arn:awslambda:ca-central-1:918755190332:function:PRE-ImageMultiClass</code> </p> </li> <li> <p> <code>arn:awslambda:ca-central-1:918755190332:function:PRE-SemanticSegmentation</code> </p> </li> <li> <p> <code>arn:awslambda:ca-central-1:918755190332:function:PRE-TextMultiClass</code> </p> </li> <li> <p> <code>arn:awslambda:ca-central-1:918755190332:function:PRE-NamedEntityRecognition</code> </p> </li> </ul> <p> <b>EU (Ireland) (eu-west-1):</b> </p> <ul> <li> <p> <code>arn:aws:lambda:eu-west-1:568282634449:function:PRE-BoundingBox</code> </p> </li> <li> <p> <code>arn:aws:lambda:eu-west-1:568282634449:function:PRE-ImageMultiClass</code> </p> </li> <li> <p> <code>arn:aws:lambda:eu-west-1:568282634449:function:PRE-SemanticSegmentation</code> </p> </li> <li> <p> <code>arn:aws:lambda:eu-west-1:568282634449:function:PRE-TextMultiClass</code> </p> </li> <li> <p> <code>arn:aws:lambda:eu-west-1:568282634449:function:PRE-NamedEntityRecognition</code> </p> </li> </ul> <p> <b>EU (London) (eu-west-2):</b> </p> <ul> <li> <p> <code>arn:awslambda:eu-west-2:487402164563:function:PRE-BoundingBox</code> </p> </li> <li> <p> <code>arn:awslambda:eu-west-2:487402164563:function:PRE-ImageMultiClass</code> </p> </li> <li> <p> <code>arn:awslambda:eu-west-2:487402164563:function:PRE-SemanticSegmentation</code> </p> </li> <li> <p> <code>arn:awslambda:eu-west-2:487402164563:function:PRE-TextMultiClass</code> </p> </li> <li> <p> <code>arn:awslambda:eu-west-2:487402164563:function:PRE-NamedEntityRecognition</code> </p> </li> </ul> <p> <b>EU Frankfurt (eu-central-1):</b> </p> <ul> <li> <p> <code>arn:awslambda:eu-central-1:203001061592:function:PRE-BoundingBox</code> </p> </li> <li> <p> <code>arn:awslambda:eu-central-1:203001061592:function:PRE-ImageMultiClass</code> </p> </li> <li> <p> <code>arn:awslambda:eu-central-1:203001061592:function:PRE-SemanticSegmentation</code> </p> </li> <li> <p> <code>arn:awslambda:eu-central-1:203001061592:function:PRE-TextMultiClass</code> </p> </li> <li> <p> <code>arn:awslambda:eu-central-1:203001061592:function:PRE-NamedEntityRecognition</code> </p> </li> </ul> <p> <b>Asia Pacific (Tokyo) (ap-northeast-1):</b> </p> <ul> <li> <p> <code>arn:aws:lambda:ap-northeast-1:477331159723:function:PRE-BoundingBox</code> </p> </li> <li> <p> <code>arn:aws:lambda:ap-northeast-1:477331159723:function:PRE-ImageMultiClass</code> </p> </li> <li> <p> <code>arn:aws:lambda:ap-northeast-1:477331159723:function:PRE-SemanticSegmentation</code> </p> </li> <li> <p> <code>arn:aws:lambda:ap-northeast-1:477331159723:function:PRE-TextMultiClass</code> </p> </li> <li> <p> <code>arn:aws:lambda:ap-northeast-1:477331159723:function:PRE-NamedEntityRecognition</code> </p> </li> </ul> <p> <b>Asia Pacific (Seoul) (ap-northeast-2):</b> </p> <ul> <li> <p> <code>arn:awslambda:ap-northeast-2:845288260483:function:PRE-BoundingBox</code> </p> </li> <li> <p> <code>arn:awslambda:ap-northeast-2:845288260483:function:PRE-ImageMultiClass</code> </p> </li> <li> <p> <code>arn:awslambda:ap-northeast-2:845288260483:function:PRE-SemanticSegmentation</code> </p> </li> <li> <p> <code>arn:awslambda:ap-northeast-2:845288260483:function:PRE-TextMultiClass</code> </p> </li> <li> <p> <code>arn:awslambda:ap-northeast-2:845288260483:function:PRE-NamedEntityRecognition</code> </p> </li> </ul> <p> <b>Asia Pacific (Mumbai) (ap-south-1):</b> </p> <ul> <li> <p> <code>arn:awslambda:ap-south-1:565803892007:function:PRE-BoundingBox</code> </p> </li> <li> <p> <code>arn:awslambda:ap-south-1:565803892007:function:PRE-ImageMultiClass</code> </p> </li> <li> <p> <code>arn:awslambda:ap-south-1:565803892007:function:PRE-SemanticSegmentation</code> </p> </li> <li> <p> <code>arn:awslambda:ap-south-1:565803892007:function:PRE-TextMultiClass</code> </p> </li> <li> <p> <code>arn:awslambda:ap-south-1:565803892007:function:PRE-NamedEntityRecognition</code> </p> </li> </ul> <p> <b>Asia Pacific (Singapore) (ap-southeast-1):</b> </p> <ul> <li> <p> <code>arn:awslambda:ap-southeast-1:377565633583:function:PRE-BoundingBox</code> </p> </li> <li> <p> <code>arn:awslambda:ap-southeast-1:377565633583:function:PRE-ImageMultiClass</code> </p> </li> <li> <p> <code>arn:awslambda:ap-southeast-1:377565633583:function:PRE-SemanticSegmentation</code> </p> </li> <li> <p> <code>arn:awslambda:ap-southeast-1:377565633583:function:PRE-TextMultiClass</code> </p> </li> <li> <p> <code>arn:awslambda:ap-southeast-1:377565633583:function:PRE-NamedEntityRecognition</code> </p> </li> </ul> <p> <b>Asia Pacific (Sydney) (ap-southeast-2):</b> </p> <ul> <li> <p> <code>arn:aws:lambda:ap-southeast-2:454466003867:function:PRE-BoundingBox</code> </p> </li> <li> <p> <code>arn:aws:lambda:ap-southeast-2:454466003867:function:PRE-ImageMultiClass</code> </p> </li> <li> <p> <code>arn:aws:lambda:ap-southeast-2:454466003867:function:PRE-SemanticSegmentation</code> </p> </li> <li> <p> <code>arn:aws:lambda:ap-southeast-2:454466003867:function:PRE-TextMultiClass</code> </p> </li> <li> <p> <code>arn:aws:lambda:ap-southeast-2:454466003867:function:PRE-NamedEntityRecognition</code> </p> </li> </ul>"
+          "documentation":"<p>The Amazon Resource Name (ARN) of a Lambda function that is run before a data object is sent to a human worker. Use this function to provide input to a custom labeling job.</p> <p>For the built-in bounding box, image classification, semantic segmentation, and text classification task types, Amazon SageMaker Ground Truth provides the following Lambda functions:</p> <p> <b>US East (Northern Virginia) (us-east-1):</b> </p> <ul> <li> <p> <code>arn:aws:lambda:us-east-1:432418664414:function:PRE-BoundingBox</code> </p> </li> <li> <p> <code>arn:aws:lambda:us-east-1:432418664414:function:PRE-ImageMultiClass</code> </p> </li> <li> <p> <code>arn:aws:lambda:us-east-1:432418664414:function:PRE-ImageMultiClassMultiLabel</code> </p> </li> <li> <p> <code>arn:aws:lambda:us-east-1:432418664414:function:PRE-SemanticSegmentation</code> </p> </li> <li> <p> <code>arn:aws:lambda:us-east-1:432418664414:function:PRE-TextMultiClass</code> </p> </li> <li> <p> <code>arn:aws:lambda:us-east-1:432418664414:function:PRE-TextMultiClassMultiLabel</code> </p> </li> <li> <p> <code>arn:aws:lambda:us-east-1:432418664414:function:PRE-NamedEntityRecognition</code> </p> </li> <li> <p> <code>arn:aws:lambda:us-east-1:432418664414:function:PRE-VerificationBoundingBox</code> </p> </li> <li> <p> <code>arn:aws:lambda:us-east-1:432418664414:function:PRE-VerificationSemanticSegmentation</code> </p> </li> <li> <p> <code>arn:aws:lambda:us-east-1:432418664414:function:PRE-AdjustmentBoundingBox</code> </p> </li> <li> <p> <code>arn:aws:lambda:us-east-1:432418664414:function:PRE-AdjustmentSemanticSegmentation</code> </p> </li> </ul> <p> <b>US East (Ohio) (us-east-2):</b> </p> <ul> <li> <p> <code>arn:aws:lambda:us-east-2:266458841044:function:PRE-BoundingBox</code> </p> </li> <li> <p> <code>arn:aws:lambda:us-east-2:266458841044:function:PRE-ImageMultiClass</code> </p> </li> <li> <p> <code>arn:aws:lambda:us-east-2:266458841044:function:PRE-ImageMultiClassMultiLabel</code> </p> </li> <li> <p> <code>arn:aws:lambda:us-east-2:266458841044:function:PRE-SemanticSegmentation</code> </p> </li> <li> <p> <code>arn:aws:lambda:us-east-2:266458841044:function:PRE-TextMultiClass</code> </p> </li> <li> <p> <code>arn:aws:lambda:us-east-2:266458841044:function:PRE-TextMultiClassMultiLabel</code> </p> </li> <li> <p> <code>arn:aws:lambda:us-east-2:266458841044:function:PRE-NamedEntityRecognition</code> </p> </li> <li> <p> <code>arn:aws:lambda:us-east-2:266458841044:function:PRE-VerificationBoundingBox</code> </p> </li> <li> <p> <code>arn:aws:lambda:us-east-2:266458841044:function:PRE-VerificationSemanticSegmentation</code> </p> </li> <li> <p> <code>arn:aws:lambda:us-east-2:266458841044:function:PRE-AdjustmentBoundingBox</code> </p> </li> <li> <p> <code>arn:aws:lambda:us-east-2:266458841044:function:PRE-AdjustmentSemanticSegmentation</code> </p> </li> </ul> <p> <b>US West (Oregon) (us-west-2):</b> </p> <ul> <li> <p> <code>arn:aws:lambda:us-west-2:081040173940:function:PRE-BoundingBox</code> </p> </li> <li> <p> <code>arn:aws:lambda:us-west-2:081040173940:function:PRE-ImageMultiClass</code> </p> </li> <li> <p> <code>arn:aws:lambda:us-west-2:081040173940:function:PRE-ImageMultiClassMultiLabel</code> </p> </li> <li> <p> <code>arn:aws:lambda:us-west-2:081040173940:function:PRE-SemanticSegmentation</code> </p> </li> <li> <p> <code>arn:aws:lambda:us-west-2:081040173940:function:PRE-TextMultiClass</code> </p> </li> <li> <p> <code>arn:aws:lambda:us-west-2:081040173940:function:PRE-TextMultiClassMultiLabel</code> </p> </li> <li> <p> <code>arn:aws:lambda:us-west-2:081040173940:function:PRE-NamedEntityRecognition</code> </p> </li> <li> <p> <code>arn:aws:lambda:us-west-2:081040173940:function:PRE-VerificationBoundingBox</code> </p> </li> <li> <p> <code>arn:aws:lambda:us-west-2:081040173940:function:PRE-VerificationSemanticSegmentation</code> </p> </li> <li> <p> <code>arn:aws:lambda:us-west-2:081040173940:function:PRE-AdjustmentBoundingBox</code> </p> </li> <li> <p> <code>arn:aws:lambda:us-west-2:081040173940:function:PRE-AdjustmentSemanticSegmentation</code> </p> </li> </ul> <p> <b>Canada (Central) (ca-central-1):</b> </p> <ul> <li> <p> <code>arn:aws:lambda:ca-central-1:918755190332:function:PRE-BoundingBox</code> </p> </li> <li> <p> <code>arn:aws:lambda:ca-central-1:918755190332:function:PRE-ImageMultiClass</code> </p> </li> <li> <p> <code>arn:aws:lambda:ca-central-1:918755190332:function:PRE-ImageMultiClassMultiLabel</code> </p> </li> <li> <p> <code>arn:aws:lambda:ca-central-1:918755190332:function:PRE-SemanticSegmentation</code> </p> </li> <li> <p> <code>arn:aws:lambda:ca-central-1:918755190332:function:PRE-TextMultiClass</code> </p> </li> <li> <p> <code>arn:aws:lambda:ca-central-1:918755190332:function:PRE-TextMultiClassMultiLabel</code> </p> </li> <li> <p> <code>arn:aws:lambda:ca-central-1:918755190332:function:PRE-NamedEntityRecognition</code> </p> </li> <li> <p> <code>arn:aws:lambda:ca-central-1:918755190332:function:PRE-VerificationBoundingBox</code> </p> </li> <li> <p> <code>arn:aws:lambda:ca-central-1:918755190332:function:PRE-VerificationSemanticSegmentation</code> </p> </li> <li> <p> <code>arn:aws:lambda:ca-central-1:918755190332:function:PRE-AdjustmentBoundingBox</code> </p> </li> <li> <p> <code>arn:aws:lambda:ca-central-1:918755190332:function:PRE-AdjustmentSemanticSegmentation</code> </p> </li> </ul> <p> <b>EU (Ireland) (eu-west-1):</b> </p> <ul> <li> <p> <code>arn:aws:lambda:eu-west-1:568282634449:function:PRE-BoundingBox</code> </p> </li> <li> <p> <code>arn:aws:lambda:eu-west-1:568282634449:function:PRE-ImageMultiClass</code> </p> </li> <li> <p> <code>arn:aws:lambda:eu-west-1:568282634449:function:PRE-ImageMultiClassMultiLabel</code> </p> </li> <li> <p> <code>arn:aws:lambda:eu-west-1:568282634449:function:PRE-SemanticSegmentation</code> </p> </li> <li> <p> <code>arn:aws:lambda:eu-west-1:568282634449:function:PRE-TextMultiClass</code> </p> </li> <li> <p> <code>arn:aws:lambda:eu-west-1:568282634449:function:PRE-TextMultiClassMultiLabel</code> </p> </li> <li> <p> <code>arn:aws:lambda:eu-west-1:568282634449:function:PRE-NamedEntityRecognition</code> </p> </li> <li> <p> <code>arn:aws:lambda:eu-west-1:568282634449:function:PRE-VerificationBoundingBox</code> </p> </li> <li> <p> <code>arn:aws:lambda:eu-west-1:568282634449:function:PRE-VerificationSemanticSegmentation</code> </p> </li> <li> <p> <code>arn:aws:lambda:eu-west-1:568282634449:function:PRE-AdjustmentBoundingBox</code> </p> </li> <li> <p> <code>arn:aws:lambda:eu-west-1:568282634449:function:PRE-AdjustmentSemanticSegmentation</code> </p> </li> </ul> <p> <b>EU (London) (eu-west-2):</b> </p> <ul> <li> <p> <code>arn:aws:lambda:eu-west-2:487402164563:function:PRE-BoundingBox</code> </p> </li> <li> <p> <code>arn:aws:lambda:eu-west-2:487402164563:function:PRE-ImageMultiClass</code> </p> </li> <li> <p> <code>arn:aws:lambda:eu-west-2:487402164563:function:PRE-ImageMultiClassMultiLabel</code> </p> </li> <li> <p> <code>arn:aws:lambda:eu-west-2:487402164563:function:PRE-SemanticSegmentation</code> </p> </li> <li> <p> <code>arn:aws:lambda:eu-west-2:487402164563:function:PRE-TextMultiClass</code> </p> </li> <li> <p> <code>arn:aws:lambda:eu-west-2:487402164563:function:PRE-TextMultiClassMultiLabel</code> </p> </li> <li> <p> <code>arn:aws:lambda:eu-west-2:487402164563:function:PRE-NamedEntityRecognition</code> </p> </li> <li> <p> <code>arn:aws:lambda:eu-west-2:487402164563:function:PRE-VerificationBoundingBox</code> </p> </li> <li> <p> <code>arn:aws:lambda:eu-west-2:487402164563:function:PRE-VerificationSemanticSegmentation</code> </p> </li> <li> <p> <code>arn:aws:lambda:eu-west-2:487402164563:function:PRE-AdjustmentBoundingBox</code> </p> </li> <li> <p> <code>arn:aws:lambda:eu-west-2:487402164563:function:PRE-AdjustmentSemanticSegmentation</code> </p> </li> </ul> <p> <b>EU Frankfurt (eu-central-1):</b> </p> <ul> <li> <p> <code>arn:aws:lambda:eu-central-1:203001061592:function:PRE-BoundingBox</code> </p> </li> <li> <p> <code>arn:aws:lambda:eu-central-1:203001061592:function:PRE-ImageMultiClass</code> </p> </li> <li> <p> <code>arn:aws:lambda:eu-central-1:203001061592:function:PRE-ImageMultiClassMultiLabel</code> </p> </li> <li> <p> <code>arn:aws:lambda:eu-central-1:203001061592:function:PRE-SemanticSegmentation</code> </p> </li> <li> <p> <code>arn:aws:lambda:eu-central-1:203001061592:function:PRE-TextMultiClass</code> </p> </li> <li> <p> <code>arn:aws:lambda:eu-central-1:203001061592:function:PRE-TextMultiClassMultiLabel</code> </p> </li> <li> <p> <code>arn:aws:lambda:eu-central-1:203001061592:function:PRE-NamedEntityRecognition</code> </p> </li> <li> <p> <code>arn:aws:lambda:eu-central-1:203001061592:function:PRE-VerificationBoundingBox</code> </p> </li> <li> <p> <code>arn:aws:lambda:eu-central-1:203001061592:function:PRE-VerificationSemanticSegmentation</code> </p> </li> <li> <p> <code>arn:aws:lambda:eu-central-1:203001061592:function:PRE-AdjustmentBoundingBox</code> </p> </li> <li> <p> <code>arn:aws:lambda:eu-central-1:203001061592:function:PRE-AdjustmentSemanticSegmentation</code> </p> </li> </ul> <p> <b>Asia Pacific (Tokyo) (ap-northeast-1):</b> </p> <ul> <li> <p> <code>arn:aws:lambda:ap-northeast-1:477331159723:function:PRE-BoundingBox</code> </p> </li> <li> <p> <code>arn:aws:lambda:ap-northeast-1:477331159723:function:PRE-ImageMultiClass</code> </p> </li> <li> <p> <code>arn:aws:lambda:ap-northeast-1:477331159723:function:PRE-ImageMultiClassMultiLabel</code> </p> </li> <li> <p> <code>arn:aws:lambda:ap-northeast-1:477331159723:function:PRE-SemanticSegmentation</code> </p> </li> <li> <p> <code>arn:aws:lambda:ap-northeast-1:477331159723:function:PRE-TextMultiClass</code> </p> </li> <li> <p> <code>arn:aws:lambda:ap-northeast-1:477331159723:function:PRE-TextMultiClassMultiLabel</code> </p> </li> <li> <p> <code>arn:aws:lambda:ap-northeast-1:477331159723:function:PRE-NamedEntityRecognition</code> </p> </li> <li> <p> <code>arn:aws:lambda:ap-northeast-1:477331159723:function:PRE-VerificationBoundingBox</code> </p> </li> <li> <p> <code>arn:aws:lambda:ap-northeast-1:477331159723:function:PRE-VerificationSemanticSegmentation</code> </p> </li> <li> <p> <code>arn:aws:lambda:ap-northeast-1:477331159723:function:PRE-AdjustmentBoundingBox</code> </p> </li> <li> <p> <code>arn:aws:lambda:ap-northeast-1:477331159723:function:PRE-AdjustmentSemanticSegmentation</code> </p> </li> </ul> <p> <b>Asia Pacific (Seoul) (ap-northeast-2):</b> </p> <ul> <li> <p> <code>arn:aws:lambda:ap-northeast-2:845288260483:function:PRE-BoundingBox</code> </p> </li> <li> <p> <code>arn:aws:lambda:ap-northeast-2:845288260483:function:PRE-ImageMultiClass</code> </p> </li> <li> <p> <code>arn:aws:lambda:ap-northeast-2:845288260483:function:PRE-ImageMultiClassMultiLabel</code> </p> </li> <li> <p> <code>arn:aws:lambda:ap-northeast-2:845288260483:function:PRE-SemanticSegmentation</code> </p> </li> <li> <p> <code>arn:aws:lambda:ap-northeast-2:845288260483:function:PRE-TextMultiClass</code> </p> </li> <li> <p> <code>arn:aws:lambda:ap-northeast-2:845288260483:function:PRE-TextMultiClassMultiLabel</code> </p> </li> <li> <p> <code>arn:aws:lambda:ap-northeast-2:845288260483:function:PRE-NamedEntityRecognition</code> </p> </li> <li> <p> <code>arn:aws:lambda:ap-northeast-2:845288260483:function:PRE-VerificationBoundingBox</code> </p> </li> <li> <p> <code>arn:aws:lambda:ap-northeast-2:845288260483:function:PRE-VerificationSemanticSegmentation</code> </p> </li> <li> <p> <code>arn:aws:lambda:ap-northeast-2:845288260483:function:PRE-AdjustmentBoundingBox</code> </p> </li> <li> <p> <code>arn:aws:lambda:ap-northeast-2:845288260483:function:PRE-AdjustmentSemanticSegmentation</code> </p> </li> </ul> <p> <b>Asia Pacific (Mumbai) (ap-south-1):</b> </p> <ul> <li> <p> <code>arn:aws:lambda:ap-south-1:565803892007:function:PRE-BoundingBox</code> </p> </li> <li> <p> <code>arn:aws:lambda:ap-south-1:565803892007:function:PRE-ImageMultiClass</code> </p> </li> <li> <p> <code>arn:aws:lambda:ap-south-1:565803892007:function:PRE-ImageMultiClassMultiLabel</code> </p> </li> <li> <p> <code>arn:aws:lambda:ap-south-1:565803892007:function:PRE-SemanticSegmentation</code> </p> </li> <li> <p> <code>arn:aws:lambda:ap-south-1:565803892007:function:PRE-TextMultiClass</code> </p> </li> <li> <p> <code>arn:aws:lambda:ap-south-1:565803892007:function:PRE-TextMultiClassMultiLabel</code> </p> </li> <li> <p> <code>arn:aws:lambda:ap-south-1:565803892007:function:PRE-NamedEntityRecognition</code> </p> </li> <li> <p> <code>arn:aws:lambda:ap-south-1:565803892007:function:PRE-VerificationBoundingBox</code> </p> </li> <li> <p> <code>arn:aws:lambda:ap-south-1:565803892007:function:PRE-VerificationSemanticSegmentation</code> </p> </li> <li> <p> <code>arn:aws:lambda:ap-south-1:565803892007:function:PRE-AdjustmentBoundingBox</code> </p> </li> <li> <p> <code>arn:aws:lambda:ap-south-1:565803892007:function:PRE-AdjustmentSemanticSegmentation</code> </p> </li> </ul> <p> <b>Asia Pacific (Singapore) (ap-southeast-1):</b> </p> <ul> <li> <p> <code>arn:aws:lambda:ap-southeast-1:377565633583:function:PRE-BoundingBox</code> </p> </li> <li> <p> <code>arn:aws:lambda:ap-southeast-1:377565633583:function:PRE-ImageMultiClass</code> </p> </li> <li> <p> <code>arn:aws:lambda:ap-southeast-1:377565633583:function:PRE-ImageMultiClassMultiLabel</code> </p> </li> <li> <p> <code>arn:aws:lambda:ap-southeast-1:377565633583:function:PRE-SemanticSegmentation</code> </p> </li> <li> <p> <code>arn:aws:lambda:ap-southeast-1:377565633583:function:PRE-TextMultiClass</code> </p> </li> <li> <p> <code>arn:aws:lambda:ap-southeast-1:377565633583:function:PRE-TextMultiClassMultiLabel</code> </p> </li> <li> <p> <code>arn:aws:lambda:ap-southeast-1:377565633583:function:PRE-NamedEntityRecognition</code> </p> </li> <li> <p> <code>arn:aws:lambda:ap-southeast-1:377565633583:function:PRE-VerificationBoundingBox</code> </p> </li> <li> <p> <code>arn:aws:lambda:ap-southeast-1:377565633583:function:PRE-VerificationSemanticSegmentation</code> </p> </li> <li> <p> <code>arn:aws:lambda:ap-southeast-1:377565633583:function:PRE-AdjustmentBoundingBox</code> </p> </li> <li> <p> <code>arn:aws:lambda:ap-southeast-1:377565633583:function:PRE-AdjustmentSemanticSegmentation</code> </p> </li> </ul> <p> <b>Asia Pacific (Sydney) (ap-southeast-2):</b> </p> <ul> <li> <p> <code>arn:aws:lambda:ap-southeast-2:454466003867:function:PRE-BoundingBox</code> </p> </li> <li> <p> <code>arn:aws:lambda:ap-southeast-2:454466003867:function:PRE-ImageMultiClass</code> </p> </li> <li> <p> <code>arn:aws:lambda:ap-southeast-2:454466003867:function:PRE-ImageMultiClassMultiLabel</code> </p> </li> <li> <p> <code>arn:aws:lambda:ap-southeast-2:454466003867:function:PRE-SemanticSegmentation</code> </p> </li> <li> <p> <code>arn:aws:lambda:ap-southeast-2:454466003867:function:PRE-TextMultiClass</code> </p> </li> <li> <p> <code>arn:aws:lambda:ap-southeast-2:454466003867:function:PRE-TextMultiClassMultiLabel</code> </p> </li> <li> <p> <code>arn:aws:lambda:ap-southeast-2:454466003867:function:PRE-NamedEntityRecognition</code> </p> </li> <li> <p> <code>arn:aws:lambda:ap-southeast-2:454466003867:function:PRE-VerificationBoundingBox</code> </p> </li> <li> <p> <code>arn:aws:lambda:ap-southeast-2:454466003867:function:PRE-VerificationSemanticSegmentation</code> </p> </li> <li> <p> <code>arn:aws:lambda:ap-southeast-2:454466003867:function:PRE-AdjustmentBoundingBox</code> </p> </li> <li> <p> <code>arn:aws:lambda:ap-southeast-2:454466003867:function:PRE-AdjustmentSemanticSegmentation</code> </p> </li> </ul>"
         },
         "TaskKeywords":{
           "shape":"TaskKeywords",
@@ -3833,11 +7460,11 @@
         },
         "TaskAvailabilityLifetimeInSeconds":{
           "shape":"TaskAvailabilityLifetimeInSeconds",
-          "documentation":"<p>The length of time that a task remains available for labeling by human workers. <b>If you choose the Amazon Mechanical Turk workforce, the maximum is 12 hours (43200)</b>. For private and vendor workforces, the maximum is as listed.</p>"
+          "documentation":"<p>The length of time that a task remains available for labeling by human workers. <b>If you choose the Amazon Mechanical Turk workforce, the maximum is 12 hours (43200)</b>. The default value is 864000 seconds (10 days). For private and vendor workforces, the maximum is as listed.</p>"
         },
         "MaxConcurrentTaskCount":{
           "shape":"MaxConcurrentTaskCount",
-          "documentation":"<p>Defines the maximum number of data objects that can be labeled by human workers at the same time. Each object may have more than one worker at one time.</p>"
+          "documentation":"<p>Defines the maximum number of data objects that can be labeled by human workers at the same time. Also referred to as batch size. Each object may have more than one worker at one time. The default value is 1000 objects.</p>"
         },
         "AnnotationConsolidationConfig":{
           "shape":"AnnotationConsolidationConfig",
@@ -3850,6 +7477,44 @@
       },
       "documentation":"<p>Information required for human workers to complete a labeling task.</p>"
     },
+    "HumanTaskUiArn":{
+      "type":"string",
+      "max":1024,
+      "pattern":"arn:aws[a-z\\-]*:sagemaker:[a-z0-9\\-]*:[0-9]{12}:human-task-ui/.*"
+    },
+    "HumanTaskUiName":{
+      "type":"string",
+      "max":63,
+      "min":1,
+      "pattern":"^[a-z0-9](-*[a-z0-9])*"
+    },
+    "HumanTaskUiSummaries":{
+      "type":"list",
+      "member":{"shape":"HumanTaskUiSummary"}
+    },
+    "HumanTaskUiSummary":{
+      "type":"structure",
+      "required":[
+        "HumanTaskUiName",
+        "HumanTaskUiArn",
+        "CreationTime"
+      ],
+      "members":{
+        "HumanTaskUiName":{
+          "shape":"HumanTaskUiName",
+          "documentation":"<p>The name of the human task user interface.</p>"
+        },
+        "HumanTaskUiArn":{
+          "shape":"HumanTaskUiArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the human task user interface.</p>"
+        },
+        "CreationTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>A timestamp when SageMaker created the human task user interface.</p>"
+        }
+      },
+      "documentation":"<p>Container for human task user interface information.</p>"
+    },
     "HyperParameterAlgorithmSpecification":{
       "type":"structure",
       "required":["TrainingInputMode"],
@@ -3936,6 +7601,12 @@
         "StoppingCondition"
       ],
       "members":{
+        "DefinitionName":{
+          "shape":"HyperParameterTrainingJobDefinitionName",
+          "documentation":"<p>The job definition name.</p>"
+        },
+        "TuningObjective":{"shape":"HyperParameterTuningJobObjective"},
+        "HyperParameterRanges":{"shape":"ParameterRanges"},
         "StaticHyperParameters":{
           "shape":"HyperParameters",
           "documentation":"<p>Specifies the values of hyperparameters that do not change for the tuning job.</p>"
@@ -3970,7 +7641,7 @@
         },
         "EnableNetworkIsolation":{
           "shape":"Boolean",
-          "documentation":"<p>Isolates the training container. No inbound or outbound network calls can be made, except for calls between peers within a training cluster for distributed training. If network isolation is used for training jobs that are configured to use a VPC, Amazon SageMaker downloads and uploads customer data and model artifacts through the specified VPC, but the training container does not have network access.</p> <note> <p>The Semantic Segmentation built-in algorithm does not support network isolation.</p> </note>"
+          "documentation":"<p>Isolates the training container. No inbound or outbound network calls can be made, except for calls between peers within a training cluster for distributed training. If network isolation is used for training jobs that are configured to use a VPC, Amazon SageMaker downloads and uploads customer data and model artifacts through the specified VPC, but the training container does not have network access.</p>"
         },
         "EnableInterContainerTrafficEncryption":{
           "shape":"Boolean",
@@ -3984,6 +7655,18 @@
       },
       "documentation":"<p>Defines the training jobs launched by a hyperparameter tuning job.</p>"
     },
+    "HyperParameterTrainingJobDefinitionName":{
+      "type":"string",
+      "max":64,
+      "min":1,
+      "pattern":"^[a-zA-Z0-9](-*[a-zA-Z0-9])*"
+    },
+    "HyperParameterTrainingJobDefinitions":{
+      "type":"list",
+      "member":{"shape":"HyperParameterTrainingJobDefinition"},
+      "max":10,
+      "min":1
+    },
     "HyperParameterTrainingJobSummaries":{
       "type":"list",
       "member":{"shape":"HyperParameterTrainingJobSummary"}
@@ -3998,6 +7681,10 @@
         "TunedHyperParameters"
       ],
       "members":{
+        "TrainingJobDefinitionName":{
+          "shape":"HyperParameterTrainingJobDefinitionName",
+          "documentation":"<p>The training job definition name.</p>"
+        },
         "TrainingJobName":{
           "shape":"TrainingJobName",
           "documentation":"<p>The name of the training job.</p>"
@@ -4059,7 +7746,7 @@
       "members":{
         "Strategy":{
           "shape":"HyperParameterTuningJobStrategyType",
-          "documentation":"<p>Specifies how hyperparameter tuning chooses the combinations of hyperparameter values to use for the training job it launches. To use the Bayesian search stategy, set this to <code>Bayesian</code>. To randomly search, set it to <code>Random</code>. For information about search strategies, see <a href=\"https://docs.aws.amazon.com/sagemaker/latest/dg/automatic-model-tuning-how-it-works.html\">How Hyperparameter Tuning Works</a>.</p>"
+          "documentation":"<p>Specifies how hyperparameter tuning chooses the combinations of hyperparameter values to use for the training job it launches. To use the Bayesian search strategy, set this to <code>Bayesian</code>. To randomly search, set it to <code>Random</code>. For information about search strategies, see <a href=\"https://docs.aws.amazon.com/sagemaker/latest/dg/automatic-model-tuning-how-it-works.html\">How Hyperparameter Tuning Works</a>.</p>"
         },
         "HyperParameterTuningJobObjective":{
           "shape":"HyperParameterTuningJobObjective",
@@ -4076,6 +7763,10 @@
         "TrainingJobEarlyStoppingType":{
           "shape":"TrainingJobEarlyStoppingType",
           "documentation":"<p>Specifies whether to use early stopping for training jobs launched by the hyperparameter tuning job. This can be one of the following values (the default value is <code>OFF</code>):</p> <dl> <dt>OFF</dt> <dd> <p>Training jobs launched by the hyperparameter tuning job do not use early stopping.</p> </dd> <dt>AUTO</dt> <dd> <p>Amazon SageMaker stops training jobs launched by the hyperparameter tuning job when they are unlikely to perform better than previously completed training jobs. For more information, see <a href=\"https://docs.aws.amazon.com/sagemaker/latest/dg/automatic-model-tuning-early-stopping.html\">Stop Training Jobs Early</a>.</p> </dd> </dl>"
+        },
+        "TuningJobCompletionCriteria":{
+          "shape":"TuningJobCompletionCriteria",
+          "documentation":"<p>The tuning job's completion criteria.</p>"
         }
       },
       "documentation":"<p>Configures a hyperparameter tuning job.</p>"
@@ -4242,6 +7933,11 @@
       "max":72,
       "pattern":"^[Ss][Hh][Aa]256:[0-9a-fA-F]{64}$"
     },
+    "ImageUri":{
+      "type":"string",
+      "max":255,
+      "pattern":".*"
+    },
     "InferenceSpecification":{
       "type":"structure",
       "required":[
@@ -4289,7 +7985,7 @@
         },
         "DataInputConfig":{
           "shape":"DataInputConfig",
-          "documentation":"<p>Specifies the name and shape of the expected data inputs for your trained model with a JSON dictionary form. The data inputs are <a>InputConfig$Framework</a> specific. </p> <ul> <li> <p> <code>TensorFlow</code>: You must specify the name and shape (NHWC format) of the expected data inputs using a dictionary format for your trained model. The dictionary formats required for the console and CLI are different.</p> <ul> <li> <p>Examples for one input:</p> <ul> <li> <p>If using the console, <code>{\"input\":[1,1024,1024,3]}</code> </p> </li> <li> <p>If using the CLI, <code>{\\\"input\\\":[1,1024,1024,3]}</code> </p> </li> </ul> </li> <li> <p>Examples for two inputs:</p> <ul> <li> <p>If using the console, <code>{\"data1\": [1,28,28,1], \"data2\":[1,28,28,1]}</code> </p> </li> <li> <p>If using the CLI, <code>{\\\"data1\\\": [1,28,28,1], \\\"data2\\\":[1,28,28,1]}</code> </p> </li> </ul> </li> </ul> </li> <li> <p> <code>MXNET/ONNX</code>: You must specify the name and shape (NCHW format) of the expected data inputs in order using a dictionary format for your trained model. The dictionary formats required for the console and CLI are different.</p> <ul> <li> <p>Examples for one input:</p> <ul> <li> <p>If using the console, <code>{\"data\":[1,3,1024,1024]}</code> </p> </li> <li> <p>If using the CLI, <code>{\\\"data\\\":[1,3,1024,1024]}</code> </p> </li> </ul> </li> <li> <p>Examples for two inputs:</p> <ul> <li> <p>If using the console, <code>{\"var1\": [1,1,28,28], \"var2\":[1,1,28,28]} </code> </p> </li> <li> <p>If using the CLI, <code>{\\\"var1\\\": [1,1,28,28], \\\"var2\\\":[1,1,28,28]}</code> </p> </li> </ul> </li> </ul> </li> <li> <p> <code>PyTorch</code>: You can either specify the name and shape (NCHW format) of expected data inputs in order using a dictionary format for your trained model or you can specify the shape only using a list format. The dictionary formats required for the console and CLI are different. The list formats for the console and CLI are the same.</p> <ul> <li> <p>Examples for one input in dictionary format:</p> <ul> <li> <p>If using the console, <code>{\"input0\":[1,3,224,224]}</code> </p> </li> <li> <p>If using the CLI, <code>{\\\"input0\\\":[1,3,224,224]}</code> </p> </li> </ul> </li> <li> <p>Example for one input in list format: <code>[[1,3,224,224]]</code> </p> </li> <li> <p>Examples for two inputs in dictionary format:</p> <ul> <li> <p>If using the console, <code>{\"input0\":[1,3,224,224], \"input1\":[1,3,224,224]}</code> </p> </li> <li> <p>If using the CLI, <code>{\\\"input0\\\":[1,3,224,224], \\\"input1\\\":[1,3,224,224]} </code> </p> </li> </ul> </li> <li> <p>Example for two inputs in list format: <code>[[1,3,224,224], [1,3,224,224]]</code> </p> </li> </ul> </li> <li> <p> <code>XGBOOST</code>: input data name and shape are not needed.</p> </li> </ul>"
+          "documentation":"<p>Specifies the name and shape of the expected data inputs for your trained model with a JSON dictionary form. The data inputs are <a>InputConfig$Framework</a> specific. </p> <ul> <li> <p> <code>TensorFlow</code>: You must specify the name and shape (NHWC format) of the expected data inputs using a dictionary format for your trained model. The dictionary formats required for the console and CLI are different.</p> <ul> <li> <p>Examples for one input:</p> <ul> <li> <p>If using the console, <code>{\"input\":[1,1024,1024,3]}</code> </p> </li> <li> <p>If using the CLI, <code>{\\\"input\\\":[1,1024,1024,3]}</code> </p> </li> </ul> </li> <li> <p>Examples for two inputs:</p> <ul> <li> <p>If using the console, <code>{\"data1\": [1,28,28,1], \"data2\":[1,28,28,1]}</code> </p> </li> <li> <p>If using the CLI, <code>{\\\"data1\\\": [1,28,28,1], \\\"data2\\\":[1,28,28,1]}</code> </p> </li> </ul> </li> </ul> </li> <li> <p> <code>KERAS</code>: You must specify the name and shape (NCHW format) of expected data inputs using a dictionary format for your trained model. Note that while Keras model artifacts should be uploaded in NHWC (channel-last) format, <code>DataInputConfig</code> should be specified in NCHW (channel-first) format. The dictionary formats required for the console and CLI are different.</p> <ul> <li> <p>Examples for one input:</p> <ul> <li> <p>If using the console, <code>{\"input_1\":[1,3,224,224]}</code> </p> </li> <li> <p>If using the CLI, <code>{\\\"input_1\\\":[1,3,224,224]}</code> </p> </li> </ul> </li> <li> <p>Examples for two inputs:</p> <ul> <li> <p>If using the console, <code>{\"input_1\": [1,3,224,224], \"input_2\":[1,3,224,224]} </code> </p> </li> <li> <p>If using the CLI, <code>{\\\"input_1\\\": [1,3,224,224], \\\"input_2\\\":[1,3,224,224]}</code> </p> </li> </ul> </li> </ul> </li> <li> <p> <code>MXNET/ONNX</code>: You must specify the name and shape (NCHW format) of the expected data inputs in order using a dictionary format for your trained model. The dictionary formats required for the console and CLI are different.</p> <ul> <li> <p>Examples for one input:</p> <ul> <li> <p>If using the console, <code>{\"data\":[1,3,1024,1024]}</code> </p> </li> <li> <p>If using the CLI, <code>{\\\"data\\\":[1,3,1024,1024]}</code> </p> </li> </ul> </li> <li> <p>Examples for two inputs:</p> <ul> <li> <p>If using the console, <code>{\"var1\": [1,1,28,28], \"var2\":[1,1,28,28]} </code> </p> </li> <li> <p>If using the CLI, <code>{\\\"var1\\\": [1,1,28,28], \\\"var2\\\":[1,1,28,28]}</code> </p> </li> </ul> </li> </ul> </li> <li> <p> <code>PyTorch</code>: You can either specify the name and shape (NCHW format) of expected data inputs in order using a dictionary format for your trained model or you can specify the shape only using a list format. The dictionary formats required for the console and CLI are different. The list formats for the console and CLI are the same.</p> <ul> <li> <p>Examples for one input in dictionary format:</p> <ul> <li> <p>If using the console, <code>{\"input0\":[1,3,224,224]}</code> </p> </li> <li> <p>If using the CLI, <code>{\\\"input0\\\":[1,3,224,224]}</code> </p> </li> </ul> </li> <li> <p>Example for one input in list format: <code>[[1,3,224,224]]</code> </p> </li> <li> <p>Examples for two inputs in dictionary format:</p> <ul> <li> <p>If using the console, <code>{\"input0\":[1,3,224,224], \"input1\":[1,3,224,224]}</code> </p> </li> <li> <p>If using the CLI, <code>{\\\"input0\\\":[1,3,224,224], \\\"input1\\\":[1,3,224,224]} </code> </p> </li> </ul> </li> <li> <p>Example for two inputs in list format: <code>[[1,3,224,224], [1,3,224,224]]</code> </p> </li> </ul> </li> <li> <p> <code>XGBOOST</code>: input data name and shape are not needed.</p> </li> </ul>"
         },
         "Framework":{
           "shape":"Framework",
@@ -4374,7 +8070,7 @@
         },
         "ScalingType":{
           "shape":"HyperParameterScalingType",
-          "documentation":"<p>The scale that hyperparameter tuning uses to search the hyperparameter range. For information about choosing a hyperparameter scale, see <a href=\"https://docs.aws.amazon.com/sagemaker/latest/dg/automatic-model-tuning-define-ranges.html#scaling-type\">Hyperparameter Scaling</a>. One of the following values:</p> <dl> <dt>Auto</dt> <dd> <p>Amazon SageMaker hyperparameter tuning chooses the best scale for the hyperparameter.</p> </dd> <dt>Linear</dt> <dd> <p>Hyperparameter tuning searches the values in the hyperparameter range by using a linear scale.</p> </dd> <dt>Logarithmic</dt> <dd> <p>Hyperparemeter tuning searches the values in the hyperparameter range by using a logarithmic scale.</p> <p>Logarithmic scaling works only for ranges that have only values greater than 0.</p> </dd> </dl>"
+          "documentation":"<p>The scale that hyperparameter tuning uses to search the hyperparameter range. For information about choosing a hyperparameter scale, see <a href=\"https://docs.aws.amazon.com/sagemaker/latest/dg/automatic-model-tuning-define-ranges.html#scaling-type\">Hyperparameter Scaling</a>. One of the following values:</p> <dl> <dt>Auto</dt> <dd> <p>Amazon SageMaker hyperparameter tuning chooses the best scale for the hyperparameter.</p> </dd> <dt>Linear</dt> <dd> <p>Hyperparameter tuning searches the values in the hyperparameter range by using a linear scale.</p> </dd> <dt>Logarithmic</dt> <dd> <p>Hyperparameter tuning searches the values in the hyperparameter range by using a logarithmic scale.</p> <p>Logarithmic scaling works only for ranges that have only values greater than 0.</p> </dd> </dl>"
         }
       },
       "documentation":"<p>For a hyperparameter of the integer type, specifies the range that a hyperparameter tuning job searches.</p>"
@@ -4421,11 +8117,43 @@
         "None"
       ]
     },
+    "JsonContentType":{
+      "type":"string",
+      "max":256,
+      "min":1,
+      "pattern":"^[a-zA-Z0-9](-*[a-zA-Z0-9])*\\/[a-zA-Z0-9](-*[a-zA-Z0-9.])*"
+    },
+    "JsonContentTypes":{
+      "type":"list",
+      "member":{"shape":"JsonContentType"},
+      "max":10,
+      "min":1
+    },
     "JsonPath":{
       "type":"string",
       "max":63,
       "min":0
     },
+    "JupyterServerAppSettings":{
+      "type":"structure",
+      "members":{
+        "DefaultResourceSpec":{
+          "shape":"ResourceSpec",
+          "documentation":"<p>The instance type and quantity.</p>"
+        }
+      },
+      "documentation":"<p>Jupyter server's app settings.</p>"
+    },
+    "KernelGatewayAppSettings":{
+      "type":"structure",
+      "members":{
+        "DefaultResourceSpec":{
+          "shape":"ResourceSpec",
+          "documentation":"<p>The instance type and quantity.</p>"
+        }
+      },
+      "documentation":"<p>The kernel gateway app settings.</p>"
+    },
     "KmsKeyId":{
       "type":"string",
       "max":2048,
@@ -4668,7 +8396,7 @@
           "documentation":"<p>The maximum number of input data objects that should be labeled.</p>"
         }
       },
-      "documentation":"<p>A set of conditions for stopping a labeling job. If any of the conditions are met, the job is automatically stopped. You can use these conditions to control the cost of data labeling.</p>"
+      "documentation":"<p>A set of conditions for stopping a labeling job. If any of the conditions are met, the job is automatically stopped. You can use these conditions to control the cost of data labeling.</p> <note> <p>Labeling jobs fail after 30 days with an appropriate client error message.</p> </note>"
     },
     "LabelingJobSummary":{
       "type":"structure",
@@ -4791,6 +8519,157 @@
         }
       }
     },
+    "ListAppsRequest":{
+      "type":"structure",
+      "members":{
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>If the previous response was truncated, you will receive this token. Use it in your next request to receive the next set of results.</p>"
+        },
+        "MaxResults":{
+          "shape":"MaxResults",
+          "documentation":"<p>Returns a list up to a specified limit.</p>"
+        },
+        "SortOrder":{
+          "shape":"SortOrder",
+          "documentation":"<p>The sort order for the results. The default is Ascending.</p>"
+        },
+        "SortBy":{
+          "shape":"AppSortKey",
+          "documentation":"<p>The parameter by which to sort the results. The default is CreationTime.</p>"
+        },
+        "DomainIdEquals":{
+          "shape":"DomainId",
+          "documentation":"<p>A parameter to search for the domain ID.</p>"
+        },
+        "UserProfileNameEquals":{
+          "shape":"UserProfileName",
+          "documentation":"<p>A parameter to search by user profile name.</p>"
+        }
+      }
+    },
+    "ListAppsResponse":{
+      "type":"structure",
+      "members":{
+        "Apps":{
+          "shape":"AppList",
+          "documentation":"<p>The list of apps.</p>"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>If the previous response was truncated, you will receive this token. Use it in your next request to receive the next set of results.</p>"
+        }
+      }
+    },
+    "ListAutoMLJobsRequest":{
+      "type":"structure",
+      "members":{
+        "CreationTimeAfter":{
+          "shape":"Timestamp",
+          "documentation":"<p>Request a list of jobs, using a filter for time.</p>"
+        },
+        "CreationTimeBefore":{
+          "shape":"Timestamp",
+          "documentation":"<p>Request a list of jobs, using a filter for time.</p>"
+        },
+        "LastModifiedTimeAfter":{
+          "shape":"Timestamp",
+          "documentation":"<p>Request a list of jobs, using a filter for time.</p>"
+        },
+        "LastModifiedTimeBefore":{
+          "shape":"Timestamp",
+          "documentation":"<p>Request a list of jobs, using a filter for time.</p>"
+        },
+        "NameContains":{
+          "shape":"AutoMLNameContains",
+          "documentation":"<p>Request a list of jobs, using a search filter for name.</p>"
+        },
+        "StatusEquals":{
+          "shape":"AutoMLJobStatus",
+          "documentation":"<p>Request a list of jobs, using a filter for status.</p>"
+        },
+        "SortOrder":{
+          "shape":"AutoMLSortOrder",
+          "documentation":"<p>The sort order for the results. The default is Descending.</p>"
+        },
+        "SortBy":{
+          "shape":"AutoMLSortBy",
+          "documentation":"<p>The parameter by which to sort the results. The default is AutoMLJobName.</p>"
+        },
+        "MaxResults":{
+          "shape":"AutoMLMaxResults",
+          "documentation":"<p>Request a list of jobs up to a specified limit.</p>",
+          "box":true
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>If the previous response was truncated, you will receive this token. Use it in your next request to receive the next set of results.</p>"
+        }
+      }
+    },
+    "ListAutoMLJobsResponse":{
+      "type":"structure",
+      "required":["AutoMLJobSummaries"],
+      "members":{
+        "AutoMLJobSummaries":{
+          "shape":"AutoMLJobSummaries",
+          "documentation":"<p>Returns a summary list of jobs.</p>"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>If the previous response was truncated, you will receive this token. Use it in your next request to receive the next set of results.</p>"
+        }
+      }
+    },
+    "ListCandidatesForAutoMLJobRequest":{
+      "type":"structure",
+      "required":["AutoMLJobName"],
+      "members":{
+        "AutoMLJobName":{
+          "shape":"AutoMLJobName",
+          "documentation":"<p>List the Candidates created for the job by providing the job's name.</p>"
+        },
+        "StatusEquals":{
+          "shape":"CandidateStatus",
+          "documentation":"<p>List the Candidates for the job and filter by status.</p>"
+        },
+        "CandidateNameEquals":{
+          "shape":"CandidateName",
+          "documentation":"<p>List the Candidates for the job and filter by candidate name.</p>"
+        },
+        "SortOrder":{
+          "shape":"AutoMLSortOrder",
+          "documentation":"<p>The sort order for the results. The default is Ascending.</p>"
+        },
+        "SortBy":{
+          "shape":"CandidateSortBy",
+          "documentation":"<p>The parameter by which to sort the results. The default is Descending.</p>"
+        },
+        "MaxResults":{
+          "shape":"AutoMLMaxResults",
+          "documentation":"<p>List the job's Candidates up to a specified limit.</p>",
+          "box":true
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>If the previous response was truncated, you will receive this token. Use it in your next request to receive the next set of results.</p>"
+        }
+      }
+    },
+    "ListCandidatesForAutoMLJobResponse":{
+      "type":"structure",
+      "required":["Candidates"],
+      "members":{
+        "Candidates":{
+          "shape":"AutoMLCandidates",
+          "documentation":"<p>Summaries about the Candidates.</p>"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>If the previous response was truncated, you will receive this token. Use it in your next request to receive the next set of results.</p>"
+        }
+      }
+    },
     "ListCodeRepositoriesInput":{
       "type":"structure",
       "members":{
@@ -4914,6 +8793,32 @@
         "Status"
       ]
     },
+    "ListDomainsRequest":{
+      "type":"structure",
+      "members":{
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>If the previous response was truncated, you will receive this token. Use it in your next request to receive the next set of results.</p>"
+        },
+        "MaxResults":{
+          "shape":"MaxResults",
+          "documentation":"<p>Returns a list up to a specified limit.</p>"
+        }
+      }
+    },
+    "ListDomainsResponse":{
+      "type":"structure",
+      "members":{
+        "Domains":{
+          "shape":"DomainList",
+          "documentation":"<p>The list of domains.</p>"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>If the previous response was truncated, you will receive this token. Use it in your next request to receive the next set of results.</p>"
+        }
+      }
+    },
     "ListEndpointConfigsInput":{
       "type":"structure",
       "members":{
@@ -4984,39 +8889,161 @@
           "shape":"EndpointNameContains",
           "documentation":"<p>A string in endpoint names. This filter returns only endpoints whose name contains the specified string.</p>"
         },
-        "CreationTimeBefore":{
-          "shape":"Timestamp",
-          "documentation":"<p>A filter that returns only endpoints that were created before the specified time (timestamp).</p>"
+        "CreationTimeBefore":{
+          "shape":"Timestamp",
+          "documentation":"<p>A filter that returns only endpoints that were created before the specified time (timestamp).</p>"
+        },
+        "CreationTimeAfter":{
+          "shape":"Timestamp",
+          "documentation":"<p>A filter that returns only endpoints with a creation time greater than or equal to the specified time (timestamp).</p>"
+        },
+        "LastModifiedTimeBefore":{
+          "shape":"Timestamp",
+          "documentation":"<p> A filter that returns only endpoints that were modified before the specified timestamp. </p>"
+        },
+        "LastModifiedTimeAfter":{
+          "shape":"Timestamp",
+          "documentation":"<p> A filter that returns only endpoints that were modified after the specified timestamp. </p>"
+        },
+        "StatusEquals":{
+          "shape":"EndpointStatus",
+          "documentation":"<p> A filter that returns only endpoints with the specified status.</p>"
+        }
+      }
+    },
+    "ListEndpointsOutput":{
+      "type":"structure",
+      "required":["Endpoints"],
+      "members":{
+        "Endpoints":{
+          "shape":"EndpointSummaryList",
+          "documentation":"<p> An array or endpoint objects. </p>"
+        },
+        "NextToken":{
+          "shape":"PaginationToken",
+          "documentation":"<p> If the response is truncated, Amazon SageMaker returns this token. To retrieve the next set of training jobs, use it in the subsequent request. </p>"
+        }
+      }
+    },
+    "ListExperimentsRequest":{
+      "type":"structure",
+      "members":{
+        "CreatedAfter":{
+          "shape":"Timestamp",
+          "documentation":"<p>A filter that returns only experiments created after the specified time.</p>"
+        },
+        "CreatedBefore":{
+          "shape":"Timestamp",
+          "documentation":"<p>A filter that returns only experiments created before the specified time.</p>"
+        },
+        "SortBy":{
+          "shape":"SortExperimentsBy",
+          "documentation":"<p>The property used to sort results. The default value is <code>CreationTime</code>.</p>"
+        },
+        "SortOrder":{
+          "shape":"SortOrder",
+          "documentation":"<p>The sort order. The default value is <code>Descending</code>.</p>"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>If the previous call to <code>ListExperiments</code> didn't return the full set of experiments, the call returns a token for getting the next set of experiments.</p>"
+        },
+        "MaxResults":{
+          "shape":"MaxResults",
+          "documentation":"<p>The maximum number of experiments to return in the response. The default value is 10.</p>"
+        }
+      }
+    },
+    "ListExperimentsResponse":{
+      "type":"structure",
+      "members":{
+        "ExperimentSummaries":{
+          "shape":"ExperimentSummaries",
+          "documentation":"<p>A list of the summaries of your experiments.</p>"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>A token for getting the next set of experiments, if there are any.</p>"
+        }
+      }
+    },
+    "ListFlowDefinitionsRequest":{
+      "type":"structure",
+      "members":{
+        "CreationTimeAfter":{
+          "shape":"Timestamp",
+          "documentation":"<p>A filter that returns only flow definitions with a creation time greater than or equal to the specified timestamp.</p>"
+        },
+        "CreationTimeBefore":{
+          "shape":"Timestamp",
+          "documentation":"<p>A filter that returns only flow definitions that were created before the specified timestamp.</p>"
+        },
+        "SortOrder":{
+          "shape":"SortOrder",
+          "documentation":"<p>An optional value that specifies whether you want the results sorted in <code>Ascending</code> or <code>Descending</code> order.</p>"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>A token to resume pagination.</p>"
+        },
+        "MaxResults":{
+          "shape":"MaxResults",
+          "documentation":"<p>The total number of items to return. If the total number of available items is more than the value specified in <code>MaxResults</code>, then a <code>NextToken</code> will be provided in the output that you can use to resume pagination.</p>",
+          "box":true
+        }
+      }
+    },
+    "ListFlowDefinitionsResponse":{
+      "type":"structure",
+      "required":["FlowDefinitionSummaries"],
+      "members":{
+        "FlowDefinitionSummaries":{
+          "shape":"FlowDefinitionSummaries",
+          "documentation":"<p>An array of objects describing the flow definitions.</p>"
         },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>A token to resume pagination.</p>"
+        }
+      }
+    },
+    "ListHumanTaskUisRequest":{
+      "type":"structure",
+      "members":{
         "CreationTimeAfter":{
           "shape":"Timestamp",
-          "documentation":"<p>A filter that returns only endpoints with a creation time greater than or equal to the specified time (timestamp).</p>"
+          "documentation":"<p>A filter that returns only human task user interfaces with a creation time greater than or equal to the specified timestamp.</p>"
         },
-        "LastModifiedTimeBefore":{
+        "CreationTimeBefore":{
           "shape":"Timestamp",
-          "documentation":"<p> A filter that returns only endpoints that were modified before the specified timestamp. </p>"
+          "documentation":"<p>A filter that returns only human task user interfaces that were created before the specified timestamp.</p>"
         },
-        "LastModifiedTimeAfter":{
-          "shape":"Timestamp",
-          "documentation":"<p> A filter that returns only endpoints that were modified after the specified timestamp. </p>"
+        "SortOrder":{
+          "shape":"SortOrder",
+          "documentation":"<p>An optional value that specifies whether you want the results sorted in <code>Ascending</code> or <code>Descending</code> order.</p>"
         },
-        "StatusEquals":{
-          "shape":"EndpointStatus",
-          "documentation":"<p> A filter that returns only endpoints with the specified status.</p>"
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>A token to resume pagination.</p>"
+        },
+        "MaxResults":{
+          "shape":"MaxResults",
+          "documentation":"<p>The total number of items to return. If the total number of available items is more than the value specified in <code>MaxResults</code>, then a <code>NextToken</code> will be provided in the output that you can use to resume pagination.</p>",
+          "box":true
         }
       }
     },
-    "ListEndpointsOutput":{
+    "ListHumanTaskUisResponse":{
       "type":"structure",
-      "required":["Endpoints"],
+      "required":["HumanTaskUiSummaries"],
       "members":{
-        "Endpoints":{
-          "shape":"EndpointSummaryList",
-          "documentation":"<p> An array or endpoint objects. </p>"
+        "HumanTaskUiSummaries":{
+          "shape":"HumanTaskUiSummaries",
+          "documentation":"<p>An array of objects describing the human task user interfaces.</p>"
         },
         "NextToken":{
-          "shape":"PaginationToken",
-          "documentation":"<p> If the response is truncated, Amazon SageMaker returns this token. To retrieve the next set of training jobs, use it in the subsequent request. </p>"
+          "shape":"NextToken",
+          "documentation":"<p>A token to resume pagination.</p>"
         }
       }
     },
@@ -5288,6 +9315,140 @@
         }
       }
     },
+    "ListMonitoringExecutionsRequest":{
+      "type":"structure",
+      "members":{
+        "MonitoringScheduleName":{
+          "shape":"MonitoringScheduleName",
+          "documentation":"<p>Name of a specific schedule to fetch jobs for.</p>"
+        },
+        "EndpointName":{
+          "shape":"EndpointName",
+          "documentation":"<p>Name of a specific endpoint to fetch jobs for.</p>"
+        },
+        "SortBy":{
+          "shape":"MonitoringExecutionSortKey",
+          "documentation":"<p>Whether to sort results by <code>Status</code>, <code>CreationTime</code>, <code>ScheduledTime</code> field. The default is <code>CreationTime</code>.</p>"
+        },
+        "SortOrder":{
+          "shape":"SortOrder",
+          "documentation":"<p>Whether to sort the results in <code>Ascending</code> or <code>Descending</code> order. The default is <code>Descending</code>.</p>"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>The token returned if the response is truncated. To retrieve the next set of job executions, use it in the next request.</p>"
+        },
+        "MaxResults":{
+          "shape":"MaxResults",
+          "documentation":"<p>The maximum number of jobs to return in the response. The default value is 10.</p>"
+        },
+        "ScheduledTimeBefore":{
+          "shape":"Timestamp",
+          "documentation":"<p>Filter for jobs scheduled before a specified time.</p>"
+        },
+        "ScheduledTimeAfter":{
+          "shape":"Timestamp",
+          "documentation":"<p>Filter for jobs scheduled after a specified time.</p>"
+        },
+        "CreationTimeBefore":{
+          "shape":"Timestamp",
+          "documentation":"<p>A filter that returns only jobs created before a specified time.</p>"
+        },
+        "CreationTimeAfter":{
+          "shape":"Timestamp",
+          "documentation":"<p>A filter that returns only jobs created after a specified time.</p>"
+        },
+        "LastModifiedTimeBefore":{
+          "shape":"Timestamp",
+          "documentation":"<p>A filter that returns only jobs modified after a specified time.</p>"
+        },
+        "LastModifiedTimeAfter":{
+          "shape":"Timestamp",
+          "documentation":"<p>A filter that returns only jobs modified before a specified time.</p>"
+        },
+        "StatusEquals":{
+          "shape":"ExecutionStatus",
+          "documentation":"<p>A filter that retrieves only jobs with a specific status.</p>"
+        }
+      }
+    },
+    "ListMonitoringExecutionsResponse":{
+      "type":"structure",
+      "required":["MonitoringExecutionSummaries"],
+      "members":{
+        "MonitoringExecutionSummaries":{
+          "shape":"MonitoringExecutionSummaryList",
+          "documentation":"<p>A JSON array in which each element is a summary for a monitoring execution.</p>"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>If the response is truncated, Amazon SageMaker returns this token. To retrieve the next set of jobs, use it in the subsequent reques</p>"
+        }
+      }
+    },
+    "ListMonitoringSchedulesRequest":{
+      "type":"structure",
+      "members":{
+        "EndpointName":{
+          "shape":"EndpointName",
+          "documentation":"<p>Name of a specific endpoint to fetch schedules for.</p>"
+        },
+        "SortBy":{
+          "shape":"MonitoringScheduleSortKey",
+          "documentation":"<p>Whether to sort results by <code>Status</code>, <code>CreationTime</code>, <code>ScheduledTime</code> field. The default is <code>CreationTime</code>.</p>"
+        },
+        "SortOrder":{
+          "shape":"SortOrder",
+          "documentation":"<p>Whether to sort the results in <code>Ascending</code> or <code>Descending</code> order. The default is <code>Descending</code>.</p>"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>The token returned if the response is truncated. To retrieve the next set of job executions, use it in the next request.</p>"
+        },
+        "MaxResults":{
+          "shape":"MaxResults",
+          "documentation":"<p>The maximum number of jobs to return in the response. The default value is 10.</p>"
+        },
+        "NameContains":{
+          "shape":"NameContains",
+          "documentation":"<p>Filter for monitoring schedules whose name contains a specified string.</p>"
+        },
+        "CreationTimeBefore":{
+          "shape":"Timestamp",
+          "documentation":"<p>A filter that returns only monitoring schedules created before a specified time.</p>"
+        },
+        "CreationTimeAfter":{
+          "shape":"Timestamp",
+          "documentation":"<p>A filter that returns only monitoring schedules created after a specified time.</p>"
+        },
+        "LastModifiedTimeBefore":{
+          "shape":"Timestamp",
+          "documentation":"<p>A filter that returns only monitoring schedules modified before a specified time.</p>"
+        },
+        "LastModifiedTimeAfter":{
+          "shape":"Timestamp",
+          "documentation":"<p>A filter that returns only monitoring schedules modified after a specified time.</p>"
+        },
+        "StatusEquals":{
+          "shape":"ScheduleStatus",
+          "documentation":"<p>A filter that returns only monitoring schedules modified before a specified time.</p>"
+        }
+      }
+    },
+    "ListMonitoringSchedulesResponse":{
+      "type":"structure",
+      "required":["MonitoringScheduleSummaries"],
+      "members":{
+        "MonitoringScheduleSummaries":{
+          "shape":"MonitoringScheduleSummaryList",
+          "documentation":"<p>A JSON array in which each element is a summary for a monitoring schedule.</p>"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>If the response is truncated, Amazon SageMaker returns this token. To retrieve the next set of jobs, use it in the subsequent reques</p>"
+        }
+      }
+    },
     "ListNotebookInstanceLifecycleConfigsInput":{
       "type":"structure",
       "members":{
@@ -5412,6 +9573,66 @@
         }
       }
     },
+    "ListProcessingJobsRequest":{
+      "type":"structure",
+      "members":{
+        "CreationTimeAfter":{
+          "shape":"Timestamp",
+          "documentation":"<p>A filter that returns only processing jobs created after the specified time.</p>"
+        },
+        "CreationTimeBefore":{
+          "shape":"Timestamp",
+          "documentation":"<p>A filter that returns only processing jobs created after the specified time.</p>"
+        },
+        "LastModifiedTimeAfter":{
+          "shape":"Timestamp",
+          "documentation":"<p>A filter that returns only processing jobs modified after the specified time.</p>"
+        },
+        "LastModifiedTimeBefore":{
+          "shape":"Timestamp",
+          "documentation":"<p>A filter that returns only processing jobs modified before the specified time.</p>"
+        },
+        "NameContains":{
+          "shape":"String",
+          "documentation":"<p>A string in the processing job name. This filter returns only processing jobs whose name contains the specified string.</p>"
+        },
+        "StatusEquals":{
+          "shape":"ProcessingJobStatus",
+          "documentation":"<p>A filter that retrieves only processing jobs with a specific status.</p>"
+        },
+        "SortBy":{
+          "shape":"SortBy",
+          "documentation":"<p>The field to sort results by. The default is <code>CreationTime</code>.</p>"
+        },
+        "SortOrder":{
+          "shape":"SortOrder",
+          "documentation":"<p>The sort order for results. The default is <code>Ascending</code>.</p>"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>If the result of the previous <code>ListProcessingJobs</code> request was truncated, the response includes a <code>NextToken</code>. To retrieve the next set of processing jobs, use the token in the next request.</p>"
+        },
+        "MaxResults":{
+          "shape":"MaxResults",
+          "documentation":"<p>The maximum number of processing jobs to return in the response.</p>",
+          "box":true
+        }
+      }
+    },
+    "ListProcessingJobsResponse":{
+      "type":"structure",
+      "required":["ProcessingJobSummaries"],
+      "members":{
+        "ProcessingJobSummaries":{
+          "shape":"ProcessingJobSummaries",
+          "documentation":"<p>An array of <code>ProcessingJobSummary</code> objects, each listing a processing job.</p>"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>If the response is truncated, Amazon SageMaker returns this token. To retrieve the next set of processing jobs, use it in the subsequent request.</p>"
+        }
+      }
+    },
     "ListSubscribedWorkteamsRequest":{
       "type":"structure",
       "members":{
@@ -5620,26 +9841,176 @@
         },
         "NextToken":{
           "shape":"NextToken",
-          "documentation":"<p>If the result of the previous <code>ListTransformJobs</code> request was truncated, the response includes a <code>NextToken</code>. To retrieve the next set of transform jobs, use the token in the next request.</p>"
+          "documentation":"<p>If the result of the previous <code>ListTransformJobs</code> request was truncated, the response includes a <code>NextToken</code>. To retrieve the next set of transform jobs, use the token in the next request.</p>"
+        },
+        "MaxResults":{
+          "shape":"MaxResults",
+          "documentation":"<p>The maximum number of transform jobs to return in the response. The default value is <code>10</code>.</p>",
+          "box":true
+        }
+      }
+    },
+    "ListTransformJobsResponse":{
+      "type":"structure",
+      "required":["TransformJobSummaries"],
+      "members":{
+        "TransformJobSummaries":{
+          "shape":"TransformJobSummaries",
+          "documentation":"<p>An array of <code>TransformJobSummary</code> objects.</p>"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>If the response is truncated, Amazon SageMaker returns this token. To retrieve the next set of transform jobs, use it in the next request.</p>"
+        }
+      }
+    },
+    "ListTrialComponentKey256":{
+      "type":"list",
+      "member":{"shape":"TrialComponentKey256"}
+    },
+    "ListTrialComponentsRequest":{
+      "type":"structure",
+      "members":{
+        "ExperimentName":{
+          "shape":"ExperimentEntityName",
+          "documentation":"<p>A filter that returns only components that are part of the specified experiment. If you specify <code>ExperimentName</code>, you can't filter by <code>SourceArn</code> or <code>TrialName</code>.</p>"
+        },
+        "TrialName":{
+          "shape":"ExperimentEntityName",
+          "documentation":"<p>A filter that returns only components that are part of the specified trial. If you specify <code>TrialName</code>, you can't filter by <code>ExperimentName</code> or <code>SourceArn</code>.</p>"
+        },
+        "SourceArn":{
+          "shape":"String256",
+          "documentation":"<p>A filter that returns only components that have the specified source Amazon Resource Name (ARN). If you specify <code>SourceArn</code>, you can't filter by <code>ExperimentName</code> or <code>TrialName</code>.</p>"
+        },
+        "CreatedAfter":{
+          "shape":"Timestamp",
+          "documentation":"<p>A filter that returns only components created after the specified time.</p>"
+        },
+        "CreatedBefore":{
+          "shape":"Timestamp",
+          "documentation":"<p>A filter that returns only components created before the specified time.</p>"
+        },
+        "SortBy":{
+          "shape":"SortTrialComponentsBy",
+          "documentation":"<p>The property used to sort results. The default value is <code>CreationTime</code>.</p>"
+        },
+        "SortOrder":{
+          "shape":"SortOrder",
+          "documentation":"<p>The sort order. The default value is <code>Descending</code>.</p>"
+        },
+        "MaxResults":{
+          "shape":"MaxResults",
+          "documentation":"<p>The maximum number of components to return in the response. The default value is 10.</p>"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>If the previous call to <code>ListTrialComponents</code> didn't return the full set of components, the call returns a token for getting the next set of components.</p>"
+        }
+      }
+    },
+    "ListTrialComponentsResponse":{
+      "type":"structure",
+      "members":{
+        "TrialComponentSummaries":{
+          "shape":"TrialComponentSummaries",
+          "documentation":"<p>A list of the summaries of your trial components.</p>"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>A token for getting the next set of components, if there are any.</p>"
+        }
+      }
+    },
+    "ListTrialsRequest":{
+      "type":"structure",
+      "members":{
+        "ExperimentName":{
+          "shape":"ExperimentEntityName",
+          "documentation":"<p>A filter that returns only trials that are part of the specified experiment.</p>"
+        },
+        "TrialComponentName":{
+          "shape":"ExperimentEntityName",
+          "documentation":"<p>A filter that returns only trials that are associated with the specified trial component.</p>"
+        },
+        "CreatedAfter":{
+          "shape":"Timestamp",
+          "documentation":"<p>A filter that returns only trials created after the specified time.</p>"
+        },
+        "CreatedBefore":{
+          "shape":"Timestamp",
+          "documentation":"<p>A filter that returns only trials created before the specified time.</p>"
+        },
+        "SortBy":{
+          "shape":"SortTrialsBy",
+          "documentation":"<p>The property used to sort results. The default value is <code>CreationTime</code>.</p>"
+        },
+        "SortOrder":{
+          "shape":"SortOrder",
+          "documentation":"<p>The sort order. The default value is <code>Descending</code>.</p>"
+        },
+        "MaxResults":{
+          "shape":"MaxResults",
+          "documentation":"<p>The maximum number of trials to return in the response. The default value is 10.</p>"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>If the previous call to <code>ListTrials</code> didn't return the full set of trials, the call returns a token for getting the next set of trials.</p>"
+        }
+      }
+    },
+    "ListTrialsResponse":{
+      "type":"structure",
+      "members":{
+        "TrialSummaries":{
+          "shape":"TrialSummaries",
+          "documentation":"<p>A list of the summaries of your trials.</p>"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>A token for getting the next set of trials, if there are any.</p>"
+        }
+      }
+    },
+    "ListUserProfilesRequest":{
+      "type":"structure",
+      "members":{
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>If the previous response was truncated, you will receive this token. Use it in your next request to receive the next set of results.</p>"
         },
         "MaxResults":{
           "shape":"MaxResults",
-          "documentation":"<p>The maximum number of transform jobs to return in the response. The default value is <code>10</code>.</p>",
-          "box":true
+          "documentation":"<p>Returns a list up to a specified limit.</p>"
+        },
+        "SortOrder":{
+          "shape":"SortOrder",
+          "documentation":"<p>The sort order for the results. The default is Ascending.</p>"
+        },
+        "SortBy":{
+          "shape":"UserProfileSortKey",
+          "documentation":"<p>The parameter by which to sort the results. The default is CreationTime.</p>"
+        },
+        "DomainIdEquals":{
+          "shape":"DomainId",
+          "documentation":"<p>A parameter by which to filter the results.</p>"
+        },
+        "UserProfileNameContains":{
+          "shape":"UserProfileName",
+          "documentation":"<p>A parameter by which to filter the results.</p>"
         }
       }
     },
-    "ListTransformJobsResponse":{
+    "ListUserProfilesResponse":{
       "type":"structure",
-      "required":["TransformJobSummaries"],
       "members":{
-        "TransformJobSummaries":{
-          "shape":"TransformJobSummaries",
-          "documentation":"<p>An array of <code>TransformJobSummary</code> objects.</p>"
+        "UserProfiles":{
+          "shape":"UserProfileList",
+          "documentation":"<p>The list of user profiles.</p>"
         },
         "NextToken":{
           "shape":"NextToken",
-          "documentation":"<p>If the response is truncated, Amazon SageMaker returns this token. To retrieve the next set of transform jobs, use it in the next request.</p>"
+          "documentation":"<p>If the previous response was truncated, you will receive this token. Use it in your next request to receive the next set of results.</p>"
         }
       }
     },
@@ -5690,6 +10061,14 @@
         "CreateDate"
       ]
     },
+    "MaxAutoMLJobRuntimeInSeconds":{
+      "type":"integer",
+      "min":1
+    },
+    "MaxCandidates":{
+      "type":"integer",
+      "min":1
+    },
     "MaxConcurrentTaskCount":{
       "type":"integer",
       "max":1000,
@@ -5729,10 +10108,19 @@
       "type":"integer",
       "min":1
     },
+    "MaxRuntimePerTrainingJobInSeconds":{
+      "type":"integer",
+      "min":1
+    },
     "MaxWaitTimeInSeconds":{
       "type":"integer",
       "min":1
     },
+    "MediaType":{
+      "type":"string",
+      "max":64,
+      "pattern":"^[\\w]+\\/[\\w+]+$"
+    },
     "MemberDefinition":{
       "type":"structure",
       "members":{
@@ -6040,6 +10428,390 @@
       "type":"list",
       "member":{"shape":"ModelSummary"}
     },
+    "MonitoringAppSpecification":{
+      "type":"structure",
+      "required":["ImageUri"],
+      "members":{
+        "ImageUri":{
+          "shape":"ImageUri",
+          "documentation":"<p>The container image to be run by the monitoring job.</p>"
+        },
+        "ContainerEntrypoint":{
+          "shape":"ContainerEntrypoint",
+          "documentation":"<p>Specifies the entrypoint for a container used to run the monitoring job.</p>"
+        },
+        "ContainerArguments":{
+          "shape":"MonitoringContainerArguments",
+          "documentation":"<p>An array of arguments for the container used to run the monitoring job.</p>"
+        },
+        "RecordPreprocessorSourceUri":{
+          "shape":"S3Uri",
+          "documentation":"<p>An Amazon S3 URI to a script that is called per row prior to running analysis. It can base64 decode the payload and convert it into a flatted json so that the built-in container can use the converted data. Applicable only for the built-in (first party) containers.</p>"
+        },
+        "PostAnalyticsProcessorSourceUri":{
+          "shape":"S3Uri",
+          "documentation":"<p>An Amazon S3 URI to a script that is called after analysis has been performed. Applicable only for the built-in (first party) containers.</p>"
+        }
+      },
+      "documentation":"<p>Container image configuration object for the monitoring job.</p>"
+    },
+    "MonitoringBaselineConfig":{
+      "type":"structure",
+      "members":{
+        "ConstraintsResource":{
+          "shape":"MonitoringConstraintsResource",
+          "documentation":"<p>The baseline constraint file in Amazon S3 that the current monitoring job should validated against.</p>"
+        },
+        "StatisticsResource":{
+          "shape":"MonitoringStatisticsResource",
+          "documentation":"<p>The baseline statistics file in Amazon S3 that the current monitoring job should be validated against.</p>"
+        }
+      },
+      "documentation":"<p>Configuration for monitoring constraints and monitoring statistics. These baseline resources are compared against the results of the current job from the series of jobs scheduled to collect data periodically.</p>"
+    },
+    "MonitoringClusterConfig":{
+      "type":"structure",
+      "required":[
+        "InstanceCount",
+        "InstanceType",
+        "VolumeSizeInGB"
+      ],
+      "members":{
+        "InstanceCount":{
+          "shape":"ProcessingInstanceCount",
+          "documentation":"<p>The number of ML compute instances to use in the model monitoring job. For distributed processing jobs, specify a value greater than 1. The default value is 1.</p>"
+        },
+        "InstanceType":{
+          "shape":"ProcessingInstanceType",
+          "documentation":"<p>The ML compute instance type for the processing job.</p>"
+        },
+        "VolumeSizeInGB":{
+          "shape":"ProcessingVolumeSizeInGB",
+          "documentation":"<p>The size of the ML storage volume, in gigabytes, that you want to provision. You must specify sufficient ML storage for your scenario.</p>"
+        },
+        "VolumeKmsKeyId":{
+          "shape":"KmsKeyId",
+          "documentation":"<p>The AWS Key Management Service (AWS KMS) key that Amazon SageMaker uses to encrypt data on the storage volume attached to the ML compute instance(s) that run the model monitoring job.</p>"
+        }
+      },
+      "documentation":"<p>Configuration for the cluster used to run model monitoring jobs.</p>"
+    },
+    "MonitoringConstraintsResource":{
+      "type":"structure",
+      "members":{
+        "S3Uri":{
+          "shape":"S3Uri",
+          "documentation":"<p>The Amazon S3 URI for the constraints resource.</p>"
+        }
+      },
+      "documentation":"<p>The constraints resource for a monitoring job.</p>"
+    },
+    "MonitoringContainerArguments":{
+      "type":"list",
+      "member":{"shape":"ContainerArgument"},
+      "max":50,
+      "min":1
+    },
+    "MonitoringEnvironmentMap":{
+      "type":"map",
+      "key":{"shape":"ProcessingEnvironmentKey"},
+      "value":{"shape":"ProcessingEnvironmentValue"},
+      "max":50
+    },
+    "MonitoringExecutionSortKey":{
+      "type":"string",
+      "enum":[
+        "CreationTime",
+        "ScheduledTime",
+        "Status"
+      ]
+    },
+    "MonitoringExecutionSummary":{
+      "type":"structure",
+      "required":[
+        "MonitoringScheduleName",
+        "ScheduledTime",
+        "CreationTime",
+        "LastModifiedTime",
+        "MonitoringExecutionStatus"
+      ],
+      "members":{
+        "MonitoringScheduleName":{
+          "shape":"MonitoringScheduleName",
+          "documentation":"<p>The name of the monitoring schedule.</p>"
+        },
+        "ScheduledTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>The time the monitoring job was scheduled.</p>"
+        },
+        "CreationTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>The time at which the monitoring job was created.</p>"
+        },
+        "LastModifiedTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>A timestamp that indicates the last time the monitoring job was modified.</p>"
+        },
+        "MonitoringExecutionStatus":{
+          "shape":"ExecutionStatus",
+          "documentation":"<p>The status of the monitoring job.</p>"
+        },
+        "ProcessingJobArn":{
+          "shape":"ProcessingJobArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the monitoring job.</p>"
+        },
+        "EndpointName":{
+          "shape":"EndpointName",
+          "documentation":"<p>The name of teh endpoint used to run the monitoring job.</p>"
+        },
+        "FailureReason":{
+          "shape":"FailureReason",
+          "documentation":"<p>Contains the reason a monitoring job failed, if it failed.</p>"
+        }
+      },
+      "documentation":"<p>Summary of information about the last monitoring job to run.</p>"
+    },
+    "MonitoringExecutionSummaryList":{
+      "type":"list",
+      "member":{"shape":"MonitoringExecutionSummary"}
+    },
+    "MonitoringInput":{
+      "type":"structure",
+      "required":["EndpointInput"],
+      "members":{
+        "EndpointInput":{
+          "shape":"EndpointInput",
+          "documentation":"<p>The endpoint for a monitoring job.</p>"
+        }
+      },
+      "documentation":"<p>The inputs for a monitoring job.</p>"
+    },
+    "MonitoringInputs":{
+      "type":"list",
+      "member":{"shape":"MonitoringInput"},
+      "max":1,
+      "min":1
+    },
+    "MonitoringJobDefinition":{
+      "type":"structure",
+      "required":[
+        "MonitoringInputs",
+        "MonitoringOutputConfig",
+        "MonitoringResources",
+        "MonitoringAppSpecification",
+        "RoleArn"
+      ],
+      "members":{
+        "BaselineConfig":{
+          "shape":"MonitoringBaselineConfig",
+          "documentation":"<p>Baseline configuration used to validate that the data conforms to the specified constraints and statistics</p>"
+        },
+        "MonitoringInputs":{
+          "shape":"MonitoringInputs",
+          "documentation":"<p>The array of inputs for the monitoring job. Currently we support monitoring an Amazon SageMaker Endpoint.</p>"
+        },
+        "MonitoringOutputConfig":{
+          "shape":"MonitoringOutputConfig",
+          "documentation":"<p>The array of outputs from the monitoring job to be uploaded to Amazon Simple Storage Service (Amazon S3).</p>"
+        },
+        "MonitoringResources":{
+          "shape":"MonitoringResources",
+          "documentation":"<p>Identifies the resources, ML compute instances, and ML storage volumes to deploy for a monitoring job. In distributed processing, you specify more than one instance.</p>"
+        },
+        "MonitoringAppSpecification":{
+          "shape":"MonitoringAppSpecification",
+          "documentation":"<p>Configures the monitoring job to run a specified Docker container image.</p>"
+        },
+        "StoppingCondition":{
+          "shape":"MonitoringStoppingCondition",
+          "documentation":"<p>Specifies a time limit for how long the monitoring job is allowed to run.</p>"
+        },
+        "Environment":{
+          "shape":"MonitoringEnvironmentMap",
+          "documentation":"<p>Sets the environment variables in the Docker container.</p>"
+        },
+        "NetworkConfig":{
+          "shape":"NetworkConfig",
+          "documentation":"<p>Specifies networking options for an monitoring job.</p>"
+        },
+        "RoleArn":{
+          "shape":"RoleArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of an IAM role that Amazon SageMaker can assume to perform tasks on your behalf.</p>"
+        }
+      },
+      "documentation":"<p>Defines the monitoring job.</p>"
+    },
+    "MonitoringMaxRuntimeInSeconds":{
+      "type":"integer",
+      "max":86400,
+      "min":1
+    },
+    "MonitoringOutput":{
+      "type":"structure",
+      "required":["S3Output"],
+      "members":{
+        "S3Output":{
+          "shape":"MonitoringS3Output",
+          "documentation":"<p>The Amazon S3 storage location where the results of a monitoring job are saved.</p>"
+        }
+      },
+      "documentation":"<p>The output object for a monitoring job.</p>"
+    },
+    "MonitoringOutputConfig":{
+      "type":"structure",
+      "required":["MonitoringOutputs"],
+      "members":{
+        "MonitoringOutputs":{
+          "shape":"MonitoringOutputs",
+          "documentation":"<p>Monitoring outputs for monitoring jobs. This is where the output of the periodic monitoring jobs is uploaded.</p>"
+        },
+        "KmsKeyId":{
+          "shape":"KmsKeyId",
+          "documentation":"<p>The AWS Key Management Service (AWS KMS) key that Amazon SageMaker uses to encrypt the model artifacts at rest using Amazon S3 server-side encryption.</p>"
+        }
+      },
+      "documentation":"<p>The output configuration for monitoring jobs.</p>"
+    },
+    "MonitoringOutputs":{
+      "type":"list",
+      "member":{"shape":"MonitoringOutput"},
+      "max":1,
+      "min":1
+    },
+    "MonitoringResources":{
+      "type":"structure",
+      "required":["ClusterConfig"],
+      "members":{
+        "ClusterConfig":{
+          "shape":"MonitoringClusterConfig",
+          "documentation":"<p>The configuration for the cluster resources used to run the processing job.</p>"
+        }
+      },
+      "documentation":"<p>Identifies the resources to deploy for a monitoring job.</p>"
+    },
+    "MonitoringS3Output":{
+      "type":"structure",
+      "required":[
+        "S3Uri",
+        "LocalPath"
+      ],
+      "members":{
+        "S3Uri":{
+          "shape":"MonitoringS3Uri",
+          "documentation":"<p>A URI that identifies the Amazon S3 storage location where Amazon SageMaker saves the results of a monitoring job.</p>"
+        },
+        "LocalPath":{
+          "shape":"ProcessingLocalPath",
+          "documentation":"<p>The local path to the Amazon S3 storage location where Amazon SageMaker saves the results of a monitoring job. LocalPath is an absolute path for the output data.</p>"
+        },
+        "S3UploadMode":{
+          "shape":"ProcessingS3UploadMode",
+          "documentation":"<p>Whether to upload the results of the monitoring job continuously or after the job completes.</p>"
+        }
+      },
+      "documentation":"<p>Information about where and how you want to store the results of a monitoring job.</p>"
+    },
+    "MonitoringS3Uri":{
+      "type":"string",
+      "max":512,
+      "pattern":"^(https|s3)://([^/]+)/?(.*)$"
+    },
+    "MonitoringScheduleArn":{
+      "type":"string",
+      "max":256,
+      "pattern":".*"
+    },
+    "MonitoringScheduleConfig":{
+      "type":"structure",
+      "required":["MonitoringJobDefinition"],
+      "members":{
+        "ScheduleConfig":{
+          "shape":"ScheduleConfig",
+          "documentation":"<p>Configures the monitoring schedule.</p>"
+        },
+        "MonitoringJobDefinition":{
+          "shape":"MonitoringJobDefinition",
+          "documentation":"<p>Defines the monitoring job.</p>"
+        }
+      },
+      "documentation":"<p>Configures the monitoring schedule and defines the monitoring job.</p>"
+    },
+    "MonitoringScheduleName":{
+      "type":"string",
+      "max":63,
+      "min":1,
+      "pattern":"^[a-zA-Z0-9](-*[a-zA-Z0-9])*$"
+    },
+    "MonitoringScheduleSortKey":{
+      "type":"string",
+      "enum":[
+        "Name",
+        "CreationTime",
+        "Status"
+      ]
+    },
+    "MonitoringScheduleSummary":{
+      "type":"structure",
+      "required":[
+        "MonitoringScheduleName",
+        "MonitoringScheduleArn",
+        "CreationTime",
+        "LastModifiedTime",
+        "MonitoringScheduleStatus"
+      ],
+      "members":{
+        "MonitoringScheduleName":{
+          "shape":"MonitoringScheduleName",
+          "documentation":"<p>The name of the monitoring schedule.</p>"
+        },
+        "MonitoringScheduleArn":{
+          "shape":"MonitoringScheduleArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the monitoring schedule.</p>"
+        },
+        "CreationTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>The creation time of the monitoring schedule.</p>"
+        },
+        "LastModifiedTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>The last time the monitoring schedule was modified.</p>"
+        },
+        "MonitoringScheduleStatus":{
+          "shape":"ScheduleStatus",
+          "documentation":"<p>The status of the monitoring schedule.</p>"
+        },
+        "EndpointName":{
+          "shape":"EndpointName",
+          "documentation":"<p>The name of the endpoint using the monitoring schedule.</p>"
+        }
+      },
+      "documentation":"<p>Summarizes the monitoring schedule.</p>"
+    },
+    "MonitoringScheduleSummaryList":{
+      "type":"list",
+      "member":{"shape":"MonitoringScheduleSummary"}
+    },
+    "MonitoringStatisticsResource":{
+      "type":"structure",
+      "members":{
+        "S3Uri":{
+          "shape":"S3Uri",
+          "documentation":"<p>The Amazon S3 URI for the statistics resource.</p>"
+        }
+      },
+      "documentation":"<p>The statistics resource for a monitoring job.</p>"
+    },
+    "MonitoringStoppingCondition":{
+      "type":"structure",
+      "required":["MaxRuntimeInSeconds"],
+      "members":{
+        "MaxRuntimeInSeconds":{
+          "shape":"MonitoringMaxRuntimeInSeconds",
+          "documentation":"<p>The maximum runtime allowed in seconds.</p>"
+        }
+      },
+      "documentation":"<p>A time limit for how long the monitoring job is allowed to run before stopping.</p>"
+    },
     "NameContains":{
       "type":"string",
       "max":63,
@@ -6054,7 +10826,7 @@
       "members":{
         "NestedPropertyName":{
           "shape":"ResourcePropertyName",
-          "documentation":"<p>The name of the property to use in the nested filters. The value must match a listed property name, such as <code>InputDataConfig</code> .</p>"
+          "documentation":"<p>The name of the property to use in the nested filters. The value must match a listed property name, such as <code>InputDataConfig</code>.</p>"
         },
         "Filters":{
           "shape":"FilterList",
@@ -6069,6 +10841,17 @@
       "max":20,
       "min":1
     },
+    "NetworkConfig":{
+      "type":"structure",
+      "members":{
+        "EnableNetworkIsolation":{
+          "shape":"Boolean",
+          "documentation":"<p>Whether to allow inbound and outbound network calls to and from the containers used for the processing job.</p>"
+        },
+        "VpcConfig":{"shape":"VpcConfig"}
+      },
+      "documentation":"<p>Networking options for a job, such as network traffic encryption between containers, whether to allow inbound and outbound network calls to and from containers, and the VPC subnets and security groups to use for VPC-enabled jobs.</p>"
+    },
     "NetworkInterfaceId":{"type":"string"},
     "NextToken":{
       "type":"string",
@@ -6271,6 +11054,13 @@
       "max":16384,
       "min":5
     },
+    "NotebookOutputOption":{
+      "type":"string",
+      "enum":[
+        "Allowed",
+        "Disabled"
+      ]
+    },
     "NotificationConfiguration":{
       "type":"structure",
       "members":{
@@ -6329,9 +11119,18 @@
         "GreaterThanOrEqualTo",
         "LessThan",
         "LessThanOrEqualTo",
-        "Contains"
+        "Contains",
+        "Exists",
+        "NotExists",
+        "In"
       ]
     },
+    "OptionalDouble":{"type":"double"},
+    "OptionalInteger":{"type":"integer"},
+    "OptionalVolumeSizeInGB":{
+      "type":"integer",
+      "min":0
+    },
     "OrderKey":{
       "type":"string",
       "enum":[
@@ -6363,100 +11162,481 @@
       "members":{
         "KmsKeyId":{
           "shape":"KmsKeyId",
-          "documentation":"<p>The AWS Key Management Service (AWS KMS) key that Amazon SageMaker uses to encrypt the model artifacts at rest using Amazon S3 server-side encryption. The <code>KmsKeyId</code> can be any of the following formats: </p> <ul> <li> <p>// KMS Key ID</p> <p> <code>\"1234abcd-12ab-34cd-56ef-1234567890ab\"</code> </p> </li> <li> <p>// Amazon Resource Name (ARN) of a KMS Key</p> <p> <code>\"arn:aws:kms:us-west-2:111122223333:key/1234abcd-12ab-34cd-56ef-1234567890ab\"</code> </p> </li> <li> <p>// KMS Key Alias</p> <p> <code>\"alias/ExampleAlias\"</code> </p> </li> <li> <p>// Amazon Resource Name (ARN) of a KMS Key Alias</p> <p> <code>\"arn:aws:kms:us-west-2:111122223333:alias/ExampleAlias\"</code> </p> </li> </ul> <p>If you use a KMS key ID or an alias of your master key, the Amazon SageMaker execution role must include permissions to call <code>kms:Encrypt</code>. If you don't provide a KMS key ID, Amazon SageMaker uses the default KMS key for Amazon S3 for your role's account. Amazon SageMaker uses server-side encryption with KMS-managed keys for <code>OutputDataConfig</code>. If you use a bucket policy with an <code>s3:PutObject</code> permission that only allows objects with server-side encryption, set the condition key of <code>s3:x-amz-server-side-encryption</code> to <code>\"aws:kms\"</code>. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/UsingKMSEncryption.html\">KMS-Managed Encryption Keys</a> in the <i>Amazon Simple Storage Service Developer Guide.</i> </p> <p>The KMS key policy must grant permission to the IAM role that you specify in your <code>CreateTrainingJob</code>, <code>CreateTransformJob</code>, or <code>CreateHyperParameterTuningJob</code> requests. For more information, see <a href=\"https://docs.aws.amazon.com/http:/docs.aws.amazon.com/kms/latest/developerguide/key-policies.html\">Using Key Policies in AWS KMS</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
+          "documentation":"<p>The AWS Key Management Service (AWS KMS) key that Amazon SageMaker uses to encrypt the model artifacts at rest using Amazon S3 server-side encryption. The <code>KmsKeyId</code> can be any of the following formats: </p> <ul> <li> <p>// KMS Key ID</p> <p> <code>\"1234abcd-12ab-34cd-56ef-1234567890ab\"</code> </p> </li> <li> <p>// Amazon Resource Name (ARN) of a KMS Key</p> <p> <code>\"arn:aws:kms:us-west-2:111122223333:key/1234abcd-12ab-34cd-56ef-1234567890ab\"</code> </p> </li> <li> <p>// KMS Key Alias</p> <p> <code>\"alias/ExampleAlias\"</code> </p> </li> <li> <p>// Amazon Resource Name (ARN) of a KMS Key Alias</p> <p> <code>\"arn:aws:kms:us-west-2:111122223333:alias/ExampleAlias\"</code> </p> </li> </ul> <p>If you use a KMS key ID or an alias of your master key, the Amazon SageMaker execution role must include permissions to call <code>kms:Encrypt</code>. If you don't provide a KMS key ID, Amazon SageMaker uses the default KMS key for Amazon S3 for your role's account. Amazon SageMaker uses server-side encryption with KMS-managed keys for <code>OutputDataConfig</code>. If you use a bucket policy with an <code>s3:PutObject</code> permission that only allows objects with server-side encryption, set the condition key of <code>s3:x-amz-server-side-encryption</code> to <code>\"aws:kms\"</code>. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/UsingKMSEncryption.html\">KMS-Managed Encryption Keys</a> in the <i>Amazon Simple Storage Service Developer Guide.</i> </p> <p>The KMS key policy must grant permission to the IAM role that you specify in your <code>CreateTrainingJob</code>, <code>CreateTransformJob</code>, or <code>CreateHyperParameterTuningJob</code> requests. For more information, see <a href=\"http://docs.aws.amazon.com/kms/latest/developerguide/key-policies.html\">Using Key Policies in AWS KMS</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
         },
         "S3OutputPath":{
           "shape":"S3Uri",
           "documentation":"<p>Identifies the S3 path where you want Amazon SageMaker to store the model artifacts. For example, <code>s3://bucket-name/key-name-prefix</code>. </p>"
         }
       },
-      "documentation":"<p>Provides information about how to store model training results (model artifacts).</p>"
+      "documentation":"<p>Provides information about how to store model training results (model artifacts).</p>"
+    },
+    "PaginationToken":{
+      "type":"string",
+      "max":8192,
+      "pattern":".*"
+    },
+    "ParameterKey":{
+      "type":"string",
+      "max":256,
+      "pattern":".*"
+    },
+    "ParameterName":{
+      "type":"string",
+      "max":256,
+      "pattern":"[\\p{L}\\p{M}\\p{Z}\\p{S}\\p{N}\\p{P}]*"
+    },
+    "ParameterRange":{
+      "type":"structure",
+      "members":{
+        "IntegerParameterRangeSpecification":{
+          "shape":"IntegerParameterRangeSpecification",
+          "documentation":"<p>A <code>IntegerParameterRangeSpecification</code> object that defines the possible values for an integer hyperparameter.</p>"
+        },
+        "ContinuousParameterRangeSpecification":{
+          "shape":"ContinuousParameterRangeSpecification",
+          "documentation":"<p>A <code>ContinuousParameterRangeSpecification</code> object that defines the possible values for a continuous hyperparameter.</p>"
+        },
+        "CategoricalParameterRangeSpecification":{
+          "shape":"CategoricalParameterRangeSpecification",
+          "documentation":"<p>A <code>CategoricalParameterRangeSpecification</code> object that defines the possible values for a categorical hyperparameter.</p>"
+        }
+      },
+      "documentation":"<p>Defines the possible values for categorical, continuous, and integer hyperparameters to be used by an algorithm.</p>"
+    },
+    "ParameterRanges":{
+      "type":"structure",
+      "members":{
+        "IntegerParameterRanges":{
+          "shape":"IntegerParameterRanges",
+          "documentation":"<p>The array of <a>IntegerParameterRange</a> objects that specify ranges of integer hyperparameters that a hyperparameter tuning job searches.</p>"
+        },
+        "ContinuousParameterRanges":{
+          "shape":"ContinuousParameterRanges",
+          "documentation":"<p>The array of <a>ContinuousParameterRange</a> objects that specify ranges of continuous hyperparameters that a hyperparameter tuning job searches.</p>"
+        },
+        "CategoricalParameterRanges":{
+          "shape":"CategoricalParameterRanges",
+          "documentation":"<p>The array of <a>CategoricalParameterRange</a> objects that specify ranges of categorical hyperparameters that a hyperparameter tuning job searches.</p>"
+        }
+      },
+      "documentation":"<p>Specifies ranges of integer, continuous, and categorical hyperparameters that a hyperparameter tuning job searches. The hyperparameter tuning job launches training jobs with hyperparameter values within these ranges to find the combination of values that result in the training job with the best performance as measured by the objective metric of the hyperparameter tuning job.</p> <note> <p>You can specify a maximum of 20 hyperparameters that a hyperparameter tuning job can search over. Every possible value of a categorical parameter range counts against this limit.</p> </note>"
+    },
+    "ParameterType":{
+      "type":"string",
+      "enum":[
+        "Integer",
+        "Continuous",
+        "Categorical",
+        "FreeText"
+      ]
+    },
+    "ParameterValue":{
+      "type":"string",
+      "max":256,
+      "pattern":".*"
+    },
+    "ParameterValues":{
+      "type":"list",
+      "member":{"shape":"ParameterValue"},
+      "max":20,
+      "min":1
+    },
+    "Parent":{
+      "type":"structure",
+      "members":{
+        "TrialName":{
+          "shape":"ExperimentEntityName",
+          "documentation":"<p>The name of the trial.</p>"
+        },
+        "ExperimentName":{
+          "shape":"ExperimentEntityName",
+          "documentation":"<p>The name of the experiment.</p>"
+        }
+      },
+      "documentation":"<p>The trial that a trial component is associated with and the experiment the trial is part of. A component might not be associated with a trial. A component can be associated with multiple trials.</p>"
+    },
+    "ParentHyperParameterTuningJob":{
+      "type":"structure",
+      "members":{
+        "HyperParameterTuningJobName":{
+          "shape":"HyperParameterTuningJobName",
+          "documentation":"<p>The name of the hyperparameter tuning job to be used as a starting point for a new hyperparameter tuning job.</p>"
+        }
+      },
+      "documentation":"<p>A previously completed or stopped hyperparameter tuning job to be used as a starting point for a new hyperparameter tuning job.</p>"
+    },
+    "ParentHyperParameterTuningJobs":{
+      "type":"list",
+      "member":{"shape":"ParentHyperParameterTuningJob"},
+      "max":5,
+      "min":1
+    },
+    "Parents":{
+      "type":"list",
+      "member":{"shape":"Parent"}
+    },
+    "PresignedDomainUrl":{"type":"string"},
+    "ProblemType":{
+      "type":"string",
+      "enum":[
+        "BinaryClassification",
+        "MulticlassClassification",
+        "Regression"
+      ]
+    },
+    "ProcessingClusterConfig":{
+      "type":"structure",
+      "required":[
+        "InstanceCount",
+        "InstanceType",
+        "VolumeSizeInGB"
+      ],
+      "members":{
+        "InstanceCount":{
+          "shape":"ProcessingInstanceCount",
+          "documentation":"<p>The number of ML compute instances to use in the processing job. For distributed processing jobs, specify a value greater than 1. The default value is 1.</p>"
+        },
+        "InstanceType":{
+          "shape":"ProcessingInstanceType",
+          "documentation":"<p>The ML compute instance type for the processing job.</p>"
+        },
+        "VolumeSizeInGB":{
+          "shape":"ProcessingVolumeSizeInGB",
+          "documentation":"<p>The size of the ML storage volume in gigabytes that you want to provision. You must specify sufficient ML storage for your scenario.</p>"
+        },
+        "VolumeKmsKeyId":{
+          "shape":"KmsKeyId",
+          "documentation":"<p>The AWS Key Management Service (AWS KMS) key that Amazon SageMaker uses to encrypt data on the storage volume attached to the ML compute instance(s) that run the processing job. </p>"
+        }
+      },
+      "documentation":"<p>Configuration for the cluster used to run a processing job.</p>"
+    },
+    "ProcessingEnvironmentKey":{
+      "type":"string",
+      "max":256,
+      "pattern":"[a-zA-Z_][a-zA-Z0-9_]*"
+    },
+    "ProcessingEnvironmentMap":{
+      "type":"map",
+      "key":{"shape":"ProcessingEnvironmentKey"},
+      "value":{"shape":"ProcessingEnvironmentValue"},
+      "max":100
+    },
+    "ProcessingEnvironmentValue":{
+      "type":"string",
+      "max":256,
+      "pattern":"[\\S\\s]*"
+    },
+    "ProcessingInput":{
+      "type":"structure",
+      "required":[
+        "InputName",
+        "S3Input"
+      ],
+      "members":{
+        "InputName":{
+          "shape":"String",
+          "documentation":"<p>The name of the inputs for the processing job.</p>"
+        },
+        "S3Input":{
+          "shape":"ProcessingS3Input",
+          "documentation":"<p>The S3 inputs for the processing job. </p>"
+        }
+      },
+      "documentation":"<p>The inputs for a processing job.</p>"
+    },
+    "ProcessingInputs":{
+      "type":"list",
+      "member":{"shape":"ProcessingInput"},
+      "max":10,
+      "min":0
+    },
+    "ProcessingInstanceCount":{
+      "type":"integer",
+      "max":100,
+      "min":1
+    },
+    "ProcessingInstanceType":{
+      "type":"string",
+      "enum":[
+        "ml.t3.medium",
+        "ml.t3.large",
+        "ml.t3.xlarge",
+        "ml.t3.2xlarge",
+        "ml.m4.xlarge",
+        "ml.m4.2xlarge",
+        "ml.m4.4xlarge",
+        "ml.m4.10xlarge",
+        "ml.m4.16xlarge",
+        "ml.c4.xlarge",
+        "ml.c4.2xlarge",
+        "ml.c4.4xlarge",
+        "ml.c4.8xlarge",
+        "ml.p2.xlarge",
+        "ml.p2.8xlarge",
+        "ml.p2.16xlarge",
+        "ml.p3.2xlarge",
+        "ml.p3.8xlarge",
+        "ml.p3.16xlarge",
+        "ml.c5.xlarge",
+        "ml.c5.2xlarge",
+        "ml.c5.4xlarge",
+        "ml.c5.9xlarge",
+        "ml.c5.18xlarge",
+        "ml.m5.large",
+        "ml.m5.xlarge",
+        "ml.m5.2xlarge",
+        "ml.m5.4xlarge",
+        "ml.m5.12xlarge",
+        "ml.m5.24xlarge",
+        "ml.r5.large",
+        "ml.r5.xlarge",
+        "ml.r5.2xlarge",
+        "ml.r5.4xlarge",
+        "ml.r5.8xlarge",
+        "ml.r5.12xlarge",
+        "ml.r5.16xlarge",
+        "ml.r5.24xlarge"
+      ]
+    },
+    "ProcessingJobArn":{
+      "type":"string",
+      "max":256,
+      "pattern":"arn:aws[a-z\\-]*:sagemaker:[a-z0-9\\-]*:[0-9]{12}:processing-job/.*"
+    },
+    "ProcessingJobName":{
+      "type":"string",
+      "max":63,
+      "min":1,
+      "pattern":"^[a-zA-Z0-9](-*[a-zA-Z0-9])*"
+    },
+    "ProcessingJobStatus":{
+      "type":"string",
+      "enum":[
+        "InProgress",
+        "Completed",
+        "Failed",
+        "Stopping",
+        "Stopped"
+      ]
+    },
+    "ProcessingJobSummaries":{
+      "type":"list",
+      "member":{"shape":"ProcessingJobSummary"}
+    },
+    "ProcessingJobSummary":{
+      "type":"structure",
+      "required":[
+        "ProcessingJobName",
+        "ProcessingJobArn",
+        "CreationTime",
+        "ProcessingJobStatus"
+      ],
+      "members":{
+        "ProcessingJobName":{
+          "shape":"ProcessingJobName",
+          "documentation":"<p>The name of the processing job.</p>"
+        },
+        "ProcessingJobArn":{
+          "shape":"ProcessingJobArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the processing job..</p>"
+        },
+        "CreationTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>The time at which the processing job was created.</p>"
+        },
+        "ProcessingEndTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>The time at which the processing job completed.</p>"
+        },
+        "LastModifiedTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>A timestamp that indicates the last time the processing job was modified.</p>"
+        },
+        "ProcessingJobStatus":{
+          "shape":"ProcessingJobStatus",
+          "documentation":"<p>The status of the processing job.</p>"
+        },
+        "FailureReason":{
+          "shape":"FailureReason",
+          "documentation":"<p>A string, up to one KB in size, that contains the reason a processing job failed, if it failed.</p>"
+        },
+        "ExitMessage":{
+          "shape":"ExitMessage",
+          "documentation":"<p>An optional string, up to one KB in size, that contains metadata from the processing container when the processing job exits.</p>"
+        }
+      },
+      "documentation":"<p>Summary of information about a processing job.</p>"
+    },
+    "ProcessingLocalPath":{
+      "type":"string",
+      "max":256,
+      "pattern":".*"
+    },
+    "ProcessingMaxRuntimeInSeconds":{
+      "type":"integer",
+      "max":604800,
+      "min":1
+    },
+    "ProcessingOutput":{
+      "type":"structure",
+      "required":[
+        "OutputName",
+        "S3Output"
+      ],
+      "members":{
+        "OutputName":{
+          "shape":"String",
+          "documentation":"<p>The name for the processing job output.</p>"
+        },
+        "S3Output":{
+          "shape":"ProcessingS3Output",
+          "documentation":"<p>Configuration for processing job outputs in Amazon S3.</p>"
+        }
+      },
+      "documentation":"<p>Describes the results of a processing job.</p>"
+    },
+    "ProcessingOutputConfig":{
+      "type":"structure",
+      "required":["Outputs"],
+      "members":{
+        "Outputs":{
+          "shape":"ProcessingOutputs",
+          "documentation":"<p>Output configuration information for a processing job.</p>"
+        },
+        "KmsKeyId":{
+          "shape":"KmsKeyId",
+          "documentation":"<p>The AWS Key Management Service (AWS KMS) key that Amazon SageMaker uses to encrypt the processing job output. <code>KmsKeyId</code> can be an ID of a KMS key, ARN of a KMS key, alias of a KMS key, or alias of a KMS key. The <code>KmsKeyId</code> is applied to all outputs.</p>"
+        }
+      },
+      "documentation":"<p>The output configuration for the processing job.</p>"
+    },
+    "ProcessingOutputs":{
+      "type":"list",
+      "member":{"shape":"ProcessingOutput"},
+      "max":10,
+      "min":0
+    },
+    "ProcessingResources":{
+      "type":"structure",
+      "required":["ClusterConfig"],
+      "members":{
+        "ClusterConfig":{
+          "shape":"ProcessingClusterConfig",
+          "documentation":"<p>The configuration for the resources in a cluster used to run the processing job.</p>"
+        }
+      },
+      "documentation":"<p>Identifies the resources, ML compute instances, and ML storage volumes to deploy for a processing job. In distributed training, you specify more than one instance.</p>"
     },
-    "PaginationToken":{
+    "ProcessingS3CompressionType":{
       "type":"string",
-      "max":8192,
-      "pattern":".*"
+      "enum":[
+        "None",
+        "Gzip"
+      ]
     },
-    "ParameterKey":{
+    "ProcessingS3DataDistributionType":{
       "type":"string",
-      "max":256,
-      "pattern":".*"
+      "enum":[
+        "FullyReplicated",
+        "ShardedByS3Key"
+      ]
     },
-    "ParameterName":{
+    "ProcessingS3DataType":{
       "type":"string",
-      "max":256,
-      "pattern":"[\\p{L}\\p{M}\\p{Z}\\p{S}\\p{N}\\p{P}]*"
+      "enum":[
+        "ManifestFile",
+        "S3Prefix"
+      ]
     },
-    "ParameterRange":{
+    "ProcessingS3Input":{
       "type":"structure",
+      "required":[
+        "S3Uri",
+        "LocalPath",
+        "S3DataType",
+        "S3InputMode"
+      ],
       "members":{
-        "IntegerParameterRangeSpecification":{
-          "shape":"IntegerParameterRangeSpecification",
-          "documentation":"<p>A <code>IntegerParameterRangeSpecification</code> object that defines the possible values for an integer hyperparameter.</p>"
+        "S3Uri":{
+          "shape":"S3Uri",
+          "documentation":"<p>The URI for the Amazon S3 storage where you want Amazon SageMaker to download the artifacts needed to run a processing job.</p>"
         },
-        "ContinuousParameterRangeSpecification":{
-          "shape":"ContinuousParameterRangeSpecification",
-          "documentation":"<p>A <code>ContinuousParameterRangeSpecification</code> object that defines the possible values for a continuous hyperparameter.</p>"
+        "LocalPath":{
+          "shape":"ProcessingLocalPath",
+          "documentation":"<p>The local path to the Amazon S3 bucket where you want Amazon SageMaker to download the inputs to run a processing job. <code>LocalPath</code> is an absolute path to the input data.</p>"
         },
-        "CategoricalParameterRangeSpecification":{
-          "shape":"CategoricalParameterRangeSpecification",
-          "documentation":"<p>A <code>CategoricalParameterRangeSpecification</code> object that defines the possible values for a categorical hyperparameter.</p>"
+        "S3DataType":{
+          "shape":"ProcessingS3DataType",
+          "documentation":"<p>Whether you use an <code>S3Prefix</code> or a <code>ManifestFile</code> for the data type. If you choose <code>S3Prefix</code>, <code>S3Uri</code> identifies a key name prefix. Amazon SageMaker uses all objects with the specified key name prefix for the processing job. If you choose <code>ManifestFile</code>, <code>S3Uri</code> identifies an object that is a manifest file containing a list of object keys that you want Amazon SageMaker to use for the processing job.</p>"
+        },
+        "S3InputMode":{
+          "shape":"ProcessingS3InputMode",
+          "documentation":"<p>Wether to use <code>File</code> or <code>Pipe</code> input mode. In <code>File</code> mode, Amazon SageMaker copies the data from the input source onto the local Amazon Elastic Block Store (Amazon EBS) volumes before starting your training algorithm. This is the most commonly used input mode. In <code>Pipe</code> mode, Amazon SageMaker streams input data from the source directly to your algorithm without using the EBS volume.</p>"
+        },
+        "S3DataDistributionType":{
+          "shape":"ProcessingS3DataDistributionType",
+          "documentation":"<p>Whether the data stored in Amazon S3 is <code>FullyReplicated</code> or <code>ShardedByS3Key</code>.</p>"
+        },
+        "S3CompressionType":{
+          "shape":"ProcessingS3CompressionType",
+          "documentation":"<p>Whether to use <code>Gzip</code> compresion for Amazon S3 storage.</p>"
         }
       },
-      "documentation":"<p>Defines the possible values for categorical, continuous, and integer hyperparameters to be used by an algorithm.</p>"
+      "documentation":"<p>Information about where and how you want to obtain the inputs for an processing job.</p>"
     },
-    "ParameterRanges":{
+    "ProcessingS3InputMode":{
+      "type":"string",
+      "enum":[
+        "Pipe",
+        "File"
+      ]
+    },
+    "ProcessingS3Output":{
       "type":"structure",
+      "required":[
+        "S3Uri",
+        "LocalPath",
+        "S3UploadMode"
+      ],
       "members":{
-        "IntegerParameterRanges":{
-          "shape":"IntegerParameterRanges",
-          "documentation":"<p>The array of <a>IntegerParameterRange</a> objects that specify ranges of integer hyperparameters that a hyperparameter tuning job searches.</p>"
+        "S3Uri":{
+          "shape":"S3Uri",
+          "documentation":"<p>A URI that identifies the Amazon S3 bucket where you want Amazon SageMaker to save the results of a processing job.</p>"
         },
-        "ContinuousParameterRanges":{
-          "shape":"ContinuousParameterRanges",
-          "documentation":"<p>The array of <a>ContinuousParameterRange</a> objects that specify ranges of continuous hyperparameters that a hyperparameter tuning job searches.</p>"
+        "LocalPath":{
+          "shape":"ProcessingLocalPath",
+          "documentation":"<p>The local path to the Amazon S3 bucket where you want Amazon SageMaker to save the results of an processing job. <code>LocalPath</code> is an absolute path to the input data.</p>"
         },
-        "CategoricalParameterRanges":{
-          "shape":"CategoricalParameterRanges",
-          "documentation":"<p>The array of <a>CategoricalParameterRange</a> objects that specify ranges of categorical hyperparameters that a hyperparameter tuning job searches.</p>"
+        "S3UploadMode":{
+          "shape":"ProcessingS3UploadMode",
+          "documentation":"<p>Whether to upload the results of the processing job continuously or after the job completes.</p>"
         }
       },
-      "documentation":"<p>Specifies ranges of integer, continuous, and categorical hyperparameters that a hyperparameter tuning job searches. The hyperparameter tuning job launches training jobs with hyperparameter values within these ranges to find the combination of values that result in the training job with the best performance as measured by the objective metric of the hyperparameter tuning job.</p> <note> <p>You can specify a maximum of 20 hyperparameters that a hyperparameter tuning job can search over. Every possible value of a categorical parameter range counts against this limit.</p> </note>"
+      "documentation":"<p>Information about where and how you want to store the results of an processing job.</p>"
     },
-    "ParameterType":{
+    "ProcessingS3UploadMode":{
       "type":"string",
       "enum":[
-        "Integer",
         "Continuous",
-        "Categorical",
-        "FreeText"
+        "EndOfJob"
       ]
     },
-    "ParameterValue":{
-      "type":"string",
-      "max":256,
-      "pattern":".*"
-    },
-    "ParameterValues":{
-      "type":"list",
-      "member":{"shape":"ParameterValue"},
-      "max":20,
-      "min":1
-    },
-    "ParentHyperParameterTuningJob":{
+    "ProcessingStoppingCondition":{
       "type":"structure",
+      "required":["MaxRuntimeInSeconds"],
       "members":{
-        "HyperParameterTuningJobName":{
-          "shape":"HyperParameterTuningJobName",
-          "documentation":"<p>The name of the hyperparameter tuning job to be used as a starting point for a new hyperparameter tuning job.</p>"
+        "MaxRuntimeInSeconds":{
+          "shape":"ProcessingMaxRuntimeInSeconds",
+          "documentation":"<p>Specifies the maximum runtime in seconds.</p>"
         }
       },
-      "documentation":"<p>A previously completed or stopped hyperparameter tuning job to be used as a starting point for a new hyperparameter tuning job.</p>"
+      "documentation":"<p>Specifies a time limit for how long the processing job is allowed to run.</p>"
     },
-    "ParentHyperParameterTuningJobs":{
-      "type":"list",
-      "member":{"shape":"ParentHyperParameterTuningJob"},
-      "max":5,
+    "ProcessingVolumeSizeInGB":{
+      "type":"integer",
+      "max":16384,
       "min":1
     },
     "ProductId":{
@@ -6579,7 +11759,11 @@
         "ml.r5d.2xlarge",
         "ml.r5d.4xlarge",
         "ml.r5d.12xlarge",
-        "ml.r5d.24xlarge"
+        "ml.r5d.24xlarge",
+        "ml.inf1.xlarge",
+        "ml.inf1.2xlarge",
+        "ml.inf1.6xlarge",
+        "ml.inf1.24xlarge"
       ]
     },
     "ProductionVariantList":{
@@ -6636,10 +11820,10 @@
       "members":{
         "PropertyNameHint":{
           "shape":"PropertyNameHint",
-          "documentation":"<p>Text that is part of a property's name. The property names of hyperparameter, metric, and tag key names that begin with the specified text in the <code>PropertyNameHint</code>.</p>"
+          "documentation":"<p>Text that begins a property's name.</p>"
         }
       },
-      "documentation":"<p>A type of <code>SuggestionQuery</code>. A suggestion query for retrieving property names that match the specified hint.</p>"
+      "documentation":"<p>Part of the <code>SuggestionQuery</code> type. Specifies a hint for retrieving property names that begin with the specified text.</p>"
     },
     "PropertyNameSuggestion":{
       "type":"structure",
@@ -6663,7 +11847,7 @@
           "documentation":"<p>Defines the amount of money paid to an Amazon Mechanical Turk worker in United States dollars.</p>"
         }
       },
-      "documentation":"<p>Defines the amount of money paid to an Amazon Mechanical Turk worker for each task performed. </p> <p>Use one of the following prices for bounding box tasks. Prices are in US dollars and should be based on the complexity of the task; the longer it takes in your initial testing, the more you should offer.</p> <ul> <li> <p>0.036</p> </li> <li> <p>0.048</p> </li> <li> <p>0.060</p> </li> <li> <p>0.072</p> </li> <li> <p>0.120</p> </li> <li> <p>0.240</p> </li> <li> <p>0.360</p> </li> <li> <p>0.480</p> </li> <li> <p>0.600</p> </li> <li> <p>0.720</p> </li> <li> <p>0.840</p> </li> <li> <p>0.960</p> </li> <li> <p>1.080</p> </li> <li> <p>1.200</p> </li> </ul> <p>Use one of the following prices for image classification, text classification, and custom tasks. Prices are in US dollars.</p> <ul> <li> <p>0.012</p> </li> <li> <p>0.024</p> </li> <li> <p>0.036</p> </li> <li> <p>0.048</p> </li> <li> <p>0.060</p> </li> <li> <p>0.072</p> </li> <li> <p>0.120</p> </li> <li> <p>0.240</p> </li> <li> <p>0.360</p> </li> <li> <p>0.480</p> </li> <li> <p>0.600</p> </li> <li> <p>0.720</p> </li> <li> <p>0.840</p> </li> <li> <p>0.960</p> </li> <li> <p>1.080</p> </li> <li> <p>1.200</p> </li> </ul> <p>Use one of the following prices for semantic segmentation tasks. Prices are in US dollars.</p> <ul> <li> <p>0.840</p> </li> <li> <p>0.960</p> </li> <li> <p>1.080</p> </li> <li> <p>1.200</p> </li> </ul>"
+      "documentation":"<p>Defines the amount of money paid to an Amazon Mechanical Turk worker for each task performed. </p> <p>Use one of the following prices for bounding box tasks. Prices are in US dollars and should be based on the complexity of the task; the longer it takes in your initial testing, the more you should offer.</p> <ul> <li> <p>0.036</p> </li> <li> <p>0.048</p> </li> <li> <p>0.060</p> </li> <li> <p>0.072</p> </li> <li> <p>0.120</p> </li> <li> <p>0.240</p> </li> <li> <p>0.360</p> </li> <li> <p>0.480</p> </li> <li> <p>0.600</p> </li> <li> <p>0.720</p> </li> <li> <p>0.840</p> </li> <li> <p>0.960</p> </li> <li> <p>1.080</p> </li> <li> <p>1.200</p> </li> </ul> <p>Use one of the following prices for image classification, text classification, and custom tasks. Prices are in US dollars.</p> <ul> <li> <p>0.012</p> </li> <li> <p>0.024</p> </li> <li> <p>0.036</p> </li> <li> <p>0.048</p> </li> <li> <p>0.060</p> </li> <li> <p>0.072</p> </li> <li> <p>0.120</p> </li> <li> <p>0.240</p> </li> <li> <p>0.360</p> </li> <li> <p>0.480</p> </li> <li> <p>0.600</p> </li> <li> <p>0.720</p> </li> <li> <p>0.840</p> </li> <li> <p>0.960</p> </li> <li> <p>1.080</p> </li> <li> <p>1.200</p> </li> </ul> <p>Use one of the following prices for semantic segmentation tasks. Prices are in US dollars.</p> <ul> <li> <p>0.840</p> </li> <li> <p>0.960</p> </li> <li> <p>1.080</p> </li> <li> <p>1.200</p> </li> </ul> <p>Use one of the following prices for Textract AnalyzeDocument Important Form Key Amazon Augmented AI review tasks. Prices are in US dollars.</p> <ul> <li> <p>2.400 </p> </li> <li> <p>2.280 </p> </li> <li> <p>2.160 </p> </li> <li> <p>2.040 </p> </li> <li> <p>1.920 </p> </li> <li> <p>1.800 </p> </li> <li> <p>1.680 </p> </li> <li> <p>1.560 </p> </li> <li> <p>1.440 </p> </li> <li> <p>1.320 </p> </li> <li> <p>1.200 </p> </li> <li> <p>1.080 </p> </li> <li> <p>0.960 </p> </li> <li> <p>0.840 </p> </li> <li> <p>0.720 </p> </li> <li> <p>0.600 </p> </li> <li> <p>0.480 </p> </li> <li> <p>0.360 </p> </li> <li> <p>0.240 </p> </li> <li> <p>0.120 </p> </li> <li> <p>0.072 </p> </li> <li> <p>0.060 </p> </li> <li> <p>0.048 </p> </li> <li> <p>0.036 </p> </li> <li> <p>0.024 </p> </li> <li> <p>0.012 </p> </li> </ul> <p>Use one of the following prices for Rekognition DetectModerationLabels Amazon Augmented AI review tasks. Prices are in US dollars.</p> <ul> <li> <p>1.200 </p> </li> <li> <p>1.080 </p> </li> <li> <p>0.960 </p> </li> <li> <p>0.840 </p> </li> <li> <p>0.720 </p> </li> <li> <p>0.600 </p> </li> <li> <p>0.480 </p> </li> <li> <p>0.360 </p> </li> <li> <p>0.240 </p> </li> <li> <p>0.120 </p> </li> <li> <p>0.072 </p> </li> <li> <p>0.060 </p> </li> <li> <p>0.048 </p> </li> <li> <p>0.036 </p> </li> <li> <p>0.024 </p> </li> <li> <p>0.012 </p> </li> </ul> <p>Use one of the following prices for Amazon Augmented AI custom human review tasks. Prices are in US dollars.</p> <ul> <li> <p>1.200 </p> </li> <li> <p>1.080 </p> </li> <li> <p>0.960 </p> </li> <li> <p>0.840 </p> </li> <li> <p>0.720 </p> </li> <li> <p>0.600 </p> </li> <li> <p>0.480 </p> </li> <li> <p>0.360 </p> </li> <li> <p>0.240 </p> </li> <li> <p>0.120 </p> </li> <li> <p>0.072 </p> </li> <li> <p>0.060 </p> </li> <li> <p>0.048 </p> </li> <li> <p>0.036 </p> </li> <li> <p>0.024 </p> </li> <li> <p>0.012 </p> </li> </ul>"
     },
     "RealtimeInferenceInstanceTypes":{
       "type":"list",
@@ -6748,6 +11932,18 @@
       "type":"list",
       "member":{"shape":"RenderingError"}
     },
+    "ResolvedAttributes":{
+      "type":"structure",
+      "members":{
+        "AutoMLJobObjective":{"shape":"AutoMLJobObjective"},
+        "ProblemType":{
+          "shape":"ProblemType",
+          "documentation":"<p>The problem type.</p>"
+        },
+        "CompletionCriteria":{"shape":"AutoMLJobCompletionCriteria"}
+      },
+      "documentation":"<p>The resolved attributes.</p>"
+    },
     "ResourceArn":{
       "type":"string",
       "max":256,
@@ -6771,15 +11967,19 @@
         },
         "VolumeSizeInGB":{
           "shape":"VolumeSizeInGB",
-          "documentation":"<p>The size of the ML storage volume that you want to provision. </p> <p>ML storage volumes store model artifacts and incremental states. Training algorithms might also use the ML storage volume for scratch space. If you want to store the training data in the ML storage volume, choose <code>File</code> as the <code>TrainingInputMode</code> in the algorithm specification. </p> <p>You must specify sufficient ML storage for your scenario. </p> <note> <p> Amazon SageMaker supports only the General Purpose SSD (gp2) ML storage volume type. </p> </note>"
+          "documentation":"<p>The size of the ML storage volume that you want to provision. </p> <p>ML storage volumes store model artifacts and incremental states. Training algorithms might also use the ML storage volume for scratch space. If you want to store the training data in the ML storage volume, choose <code>File</code> as the <code>TrainingInputMode</code> in the algorithm specification. </p> <p>You must specify sufficient ML storage for your scenario. </p> <note> <p> Amazon SageMaker supports only the General Purpose SSD (gp2) ML storage volume type. </p> </note> <note> <p>Certain Nitro-based instances include local storage with a fixed total size, dependent on the instance type. When using these instances for training, Amazon SageMaker mounts the local instance storage instead of Amazon EBS gp2 storage. You can't request a <code>VolumeSizeInGB</code> greater than the total size of the local instance storage.</p> <p>For a list of instance types that support local instance storage, including the total size per instance type, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/InstanceStorage.html#instance-store-volumes\">Instance Store Volumes</a>.</p> </note>"
         },
         "VolumeKmsKeyId":{
           "shape":"KmsKeyId",
-          "documentation":"<p>The AWS Key Management Service (AWS KMS) key that Amazon SageMaker uses to encrypt data on the storage volume attached to the ML compute instance(s) that run the training job. The <code>VolumeKmsKeyId</code> can be any of the following formats:</p> <ul> <li> <p>// KMS Key ID</p> <p> <code>\"1234abcd-12ab-34cd-56ef-1234567890ab\"</code> </p> </li> <li> <p>// Amazon Resource Name (ARN) of a KMS Key</p> <p> <code>\"arn:aws:kms:us-west-2:111122223333:key/1234abcd-12ab-34cd-56ef-1234567890ab\"</code> </p> </li> </ul>"
+          "documentation":"<p>The AWS KMS key that Amazon SageMaker uses to encrypt data on the storage volume attached to the ML compute instance(s) that run the training job.</p> <note> <p>Certain Nitro-based instances include local storage, dependent on the instance type. Local storage volumes are encrypted using a hardware module on the instance. You can't request a <code>VolumeKmsKeyId</code> when using an instance type with local storage.</p> <p>For a list of instance types that support local instance storage, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/InstanceStorage.html#instance-store-volumes\">Instance Store Volumes</a>.</p> <p>For more information about local instance storage encryption, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ssd-instance-store.html\">SSD Instance Store Volumes</a>.</p> </note> <p>The <code>VolumeKmsKeyId</code> can be in any of the following formats:</p> <ul> <li> <p>// KMS Key ID</p> <p> <code>\"1234abcd-12ab-34cd-56ef-1234567890ab\"</code> </p> </li> <li> <p>// Amazon Resource Name (ARN) of a KMS Key</p> <p> <code>\"arn:aws:kms:us-west-2:111122223333:key/1234abcd-12ab-34cd-56ef-1234567890ab\"</code> </p> </li> </ul>"
         }
       },
       "documentation":"<p>Describes the resources, including ML compute instances and ML storage volumes, to use for model training. </p>"
     },
+    "ResourceId":{
+      "type":"string",
+      "max":32
+    },
     "ResourceInUse":{
       "type":"structure",
       "members":{
@@ -6828,9 +12028,28 @@
       "min":1,
       "pattern":".+"
     },
+    "ResourceSpec":{
+      "type":"structure",
+      "members":{
+        "EnvironmentArn":{
+          "shape":"EnvironmentArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the environment.</p>"
+        },
+        "InstanceType":{
+          "shape":"AppInstanceType",
+          "documentation":"<p>The instance type.</p>"
+        }
+      },
+      "documentation":"<p>The instance type and quantity.</p>"
+    },
     "ResourceType":{
       "type":"string",
-      "enum":["TrainingJob"]
+      "enum":[
+        "TrainingJob",
+        "Experiment",
+        "ExperimentTrial",
+        "ExperimentTrialComponent"
+      ]
     },
     "ResponseMIMEType":{
       "type":"string",
@@ -6841,6 +12060,23 @@
       "type":"list",
       "member":{"shape":"ResponseMIMEType"}
     },
+    "RetentionPolicy":{
+      "type":"structure",
+      "members":{
+        "HomeEfsFileSystem":{
+          "shape":"RetentionType",
+          "documentation":"<p>The home Amazon Elastic File System (EFS).</p>"
+        }
+      },
+      "documentation":"<p>The retention policy.</p>"
+    },
+    "RetentionType":{
+      "type":"string",
+      "enum":[
+        "Retain",
+        "Delete"
+      ]
+    },
     "RoleArn":{
       "type":"string",
       "max":2048,
@@ -6854,6 +12090,30 @@
         "Disabled"
       ]
     },
+    "RuleConfigurationName":{
+      "type":"string",
+      "max":256,
+      "min":1,
+      "pattern":".*"
+    },
+    "RuleEvaluationStatus":{
+      "type":"string",
+      "enum":[
+        "InProgress",
+        "NoIssuesFound",
+        "IssuesFound",
+        "Error",
+        "Stopping",
+        "Stopped"
+      ]
+    },
+    "RuleParameters":{
+      "type":"map",
+      "key":{"shape":"ConfigKey"},
+      "value":{"shape":"ConfigValue"},
+      "max":20,
+      "min":0
+    },
     "S3DataDistribution":{
       "type":"string",
       "enum":[
@@ -6874,7 +12134,7 @@
         },
         "S3Uri":{
           "shape":"S3Uri",
-          "documentation":"<p>Depending on the value specified for the <code>S3DataType</code>, identifies either a key name prefix or a manifest. For example: </p> <ul> <li> <p> A key name prefix might look like this: <code>s3://bucketname/exampleprefix</code>. </p> </li> <li> <p> A manifest might look like this: <code>s3://bucketname/example.manifest</code> </p> <p> The manifest is an S3 object which is a JSON file with the following format: </p> <p> <code>[</code> </p> <p> <code> {\"prefix\": \"s3://customer_bucket/some/prefix/\"},</code> </p> <p> <code> \"relative/path/to/custdata-1\",</code> </p> <p> <code> \"relative/path/custdata-2\",</code> </p> <p> <code> ...</code> </p> <p> <code> ]</code> </p> <p> The preceding JSON matches the following <code>s3Uris</code>: </p> <p> <code>s3://customer_bucket/some/prefix/relative/path/to/custdata-1</code> </p> <p> <code>s3://customer_bucket/some/prefix/relative/path/custdata-2</code> </p> <p> <code>...</code> </p> <p>The complete set of <code>s3uris</code> in this manifest is the input data for the channel for this datasource. The object that each <code>s3uris</code> points to must be readable by the IAM role that Amazon SageMaker uses to perform tasks on your behalf. </p> </li> </ul>"
+          "documentation":"<p>Depending on the value specified for the <code>S3DataType</code>, identifies either a key name prefix or a manifest. For example: </p> <ul> <li> <p> A key name prefix might look like this: <code>s3://bucketname/exampleprefix</code>. </p> </li> <li> <p> A manifest might look like this: <code>s3://bucketname/example.manifest</code> </p> <p> The manifest is an S3 object which is a JSON file with the following format: </p> <p> The preceding JSON matches the following <code>s3Uris</code>: </p> <p> <code>[ {\"prefix\": \"s3://customer_bucket/some/prefix/\"},</code> </p> <p> <code>\"relative/path/to/custdata-1\",</code> </p> <p> <code>\"relative/path/custdata-2\",</code> </p> <p> <code>...</code> </p> <p> <code>\"relative/path/custdata-N\"</code> </p> <p> <code>]</code> </p> <p> The preceding JSON matches the following <code>s3Uris</code>: </p> <p> <code>s3://customer_bucket/some/prefix/relative/path/to/custdata-1</code> </p> <p> <code>s3://customer_bucket/some/prefix/relative/path/custdata-2</code> </p> <p> <code>...</code> </p> <p> <code>s3://customer_bucket/some/prefix/relative/path/custdata-N</code> </p> <p>The complete set of <code>s3uris</code> in this manifest is the input data for the channel for this datasource. The object that each <code>s3uris</code> points to must be readable by the IAM role that Amazon SageMaker uses to perform tasks on your behalf. </p> </li> </ul>"
         },
         "S3DataDistributionType":{
           "shape":"S3DataDistribution",
@@ -6900,6 +12160,36 @@
       "max":1024,
       "pattern":"^(https|s3)://([^/]+)/?(.*)$"
     },
+    "SamplingPercentage":{
+      "type":"integer",
+      "max":100,
+      "min":0
+    },
+    "ScheduleConfig":{
+      "type":"structure",
+      "required":["ScheduleExpression"],
+      "members":{
+        "ScheduleExpression":{
+          "shape":"ScheduleExpression",
+          "documentation":"<p>A cron expression that describes details about the monitoring schedule.</p> <p>Currently the only supported cron expressions are:</p> <ul> <li> <p>If you want to set the job to start every hour, please use the following:</p> <p> <code>Hourly: cron(0 * ? * * *)</code> </p> </li> <li> <p>If you want to start the job daily:</p> <p> <code>cron(0 [00-23] ? * * *)</code> </p> </li> </ul> <p>For example, the following are valid cron expressions:</p> <ul> <li> <p>Daily at noon UTC: <code>cron(0 12 ? * * *)</code> </p> </li> <li> <p>Daily at midnight UTC: <code>cron(0 0 ? * * *)</code> </p> </li> </ul> <p>To support running every 6, 12 hours, the following are also supported:</p> <p> <code>cron(0 [00-23]/[01-24] ? * * *)</code> </p> <p>For example, the following are valid cron expressions:</p> <ul> <li> <p>Every 12 hours, starting at 5pm UTC: <code>cron(0 17/12 ? * * *)</code> </p> </li> <li> <p>Every two hours starting at midnight: <code>cron(0 0/2 ? * * *)</code> </p> </li> </ul> <note> <ul> <li> <p>Even though the cron expression is set to start at 5PM UTC, note that there could be a delay of 0-20 minutes from the actual requested time to run the execution. </p> </li> <li> <p>We recommend that if you would like a daily schedule, you do not provide this parameter. Amazon SageMaker will pick a time for running every day.</p> </li> </ul> </note>"
+        }
+      },
+      "documentation":"<p>Configuration details about the monitoring schedule.</p>"
+    },
+    "ScheduleExpression":{
+      "type":"string",
+      "max":256,
+      "min":1
+    },
+    "ScheduleStatus":{
+      "type":"string",
+      "enum":[
+        "Pending",
+        "Failed",
+        "Scheduled",
+        "Stopped"
+      ]
+    },
     "SearchExpression":{
       "type":"structure",
       "members":{
@@ -6920,7 +12210,7 @@
           "documentation":"<p>A Boolean operator used to evaluate the search expression. If you want every conditional statement in all lists to be satisfied for the entire search expression to be true, specify <code>And</code>. If only a single conditional statement needs to be true for the entire search expression to be true, specify <code>Or</code>. The default value is <code>And</code>.</p>"
         }
       },
-      "documentation":"<p>A multi-expression that searches for the specified resource or resources in a search. All resource objects that satisfy the expression's condition are included in the search results. You must specify at least one subexpression, filter, or nested filter. A <code>SearchExpression</code> can contain up to twenty elements.</p> <p>A <code>SearchExpression</code> contains the following components:</p> <ul> <li> <p>A list of <code>Filter</code> objects. Each filter defines a simple Boolean expression comprised of a resource property name, Boolean operator, and value.</p> </li> <li> <p>A list of <code>NestedFilter</code> objects. Each nested filter defines a list of Boolean expressions using a list of resource properties. A nested filter is satisfied if a single object in the list satisfies all Boolean expressions.</p> </li> <li> <p>A list of <code>SearchExpression</code> objects. A search expression object can be nested in a list of search expression objects.</p> </li> <li> <p>A Boolean operator: <code>And</code> or <code>Or</code>.</p> </li> </ul>"
+      "documentation":"<p>A multi-expression that searches for the specified resource or resources in a search. All resource objects that satisfy the expression's condition are included in the search results. You must specify at least one subexpression, filter, or nested filter. A <code>SearchExpression</code> can contain up to twenty elements.</p> <p>A <code>SearchExpression</code> contains the following components:</p> <ul> <li> <p>A list of <code>Filter</code> objects. Each filter defines a simple Boolean expression comprised of a resource property name, Boolean operator, and value. A <code>SearchExpression</code> can include only one <code>Contains</code> operator.</p> </li> <li> <p>A list of <code>NestedFilter</code> objects. Each nested filter defines a list of Boolean expressions using a list of resource properties. A nested filter is satisfied if a single object in the list satisfies all Boolean expressions.</p> </li> <li> <p>A list of <code>SearchExpression</code> objects. A search expression object can be nested in a list of search expression objects.</p> </li> <li> <p>A Boolean operator: <code>And</code> or <code>Or</code>.</p> </li> </ul>"
     },
     "SearchExpressionList":{
       "type":"list",
@@ -6934,6 +12224,18 @@
         "TrainingJob":{
           "shape":"TrainingJob",
           "documentation":"<p>A <code>TrainingJob</code> object that is returned as part of a <code>Search</code> request.</p>"
+        },
+        "Experiment":{
+          "shape":"Experiment",
+          "documentation":"<p>A summary of the properties of an experiment.</p>"
+        },
+        "Trial":{
+          "shape":"Trial",
+          "documentation":"<p>A summary of the properties of a trial.</p>"
+        },
+        "TrialComponent":{
+          "shape":"TrialComponent",
+          "documentation":"<p>A summary of the properties of a trial component.</p>"
         }
       },
       "documentation":"<p>An individual search result record that contains a single resource object.</p>"
@@ -6944,7 +12246,7 @@
       "members":{
         "Resource":{
           "shape":"ResourceType",
-          "documentation":"<p>The name of the Amazon SageMaker resource to search for. Currently, the only valid <code>Resource</code> value is <code>TrainingJob</code>.</p>"
+          "documentation":"<p>The name of the Amazon SageMaker resource to search for.</p>"
         },
         "SearchExpression":{
           "shape":"SearchExpression",
@@ -7064,6 +12366,24 @@
       "max":43200,
       "min":1800
     },
+    "SharingSettings":{
+      "type":"structure",
+      "members":{
+        "NotebookOutputOption":{
+          "shape":"NotebookOutputOption",
+          "documentation":"<p>The notebook output option.</p>"
+        },
+        "S3OutputPath":{
+          "shape":"S3Uri",
+          "documentation":"<p>The Amazon S3 output path.</p>"
+        },
+        "S3KmsKeyId":{
+          "shape":"KmsKeyId",
+          "documentation":"<p>The AWS Key Management Service encryption key ID.</p>"
+        }
+      },
+      "documentation":"<p>The sharing settings.</p>"
+    },
     "ShuffleConfig":{
       "type":"structure",
       "required":["Seed"],
@@ -7073,7 +12393,11 @@
           "documentation":"<p>Determines the shuffling order in <code>ShuffleConfig</code> value.</p>"
         }
       },
-      "documentation":"<p>A configuration for a shuffle option for input data in a channel. If you use <code>S3Prefix</code> for <code>S3DataType</code>, the results of the S3 key prefix matches are shuffled. If you use <code>ManifestFile</code>, the order of the S3 object references in the <code>ManifestFile</code> is shuffled. If you use <code>AugmentedManifestFile</code>, the order of the JSON lines in the <code>AugmentedManifestFile</code> is shuffled. The shuffling order is determined using the <code>Seed</code> value.</p> <p>For Pipe input mode, shuffling is done at the start of every epoch. With large datasets, this ensures that the order of the training data is different for each epoch, and it helps reduce bias and possible overfitting. In a multi-node training job when <code>ShuffleConfig</code> is combined with <code>S3DataDistributionType</code> of <code>ShardedByS3Key</code>, the data is shuffled across nodes so that the content sent to a particular node on the first epoch might be sent to a different node on the second epoch.</p>"
+      "documentation":"<p>A configuration for a shuffle option for input data in a channel. If you use <code>S3Prefix</code> for <code>S3DataType</code>, the results of the S3 key prefix matches are shuffled. If you use <code>ManifestFile</code>, the order of the S3 object references in the <code>ManifestFile</code> is shuffled. If you use <code>AugmentedManifestFile</code>, the order of the JSON lines in the <code>AugmentedManifestFile</code> is shuffled. The shuffling order is determined using the <code>Seed</code> value.</p> <p>For Pipe input mode, when <code>ShuffleConfig</code> is specified shuffling is done at the start of every epoch. With large datasets, this ensures that the order of the training data is different for each epoch, and it helps reduce bias and possible overfitting. In a multi-node training job when <code>ShuffleConfig</code> is combined with <code>S3DataDistributionType</code> of <code>ShardedByS3Key</code>, the data is shuffled across nodes so that the content sent to a particular node on the first epoch might be sent to a different node on the second epoch.</p>"
+    },
+    "SingleSignOnUserIdentifier":{
+      "type":"string",
+      "pattern":"UserName"
     },
     "SortBy":{
       "type":"string",
@@ -7083,6 +12407,13 @@
         "Status"
       ]
     },
+    "SortExperimentsBy":{
+      "type":"string",
+      "enum":[
+        "Name",
+        "CreationTime"
+      ]
+    },
     "SortOrder":{
       "type":"string",
       "enum":[
@@ -7090,6 +12421,20 @@
         "Descending"
       ]
     },
+    "SortTrialComponentsBy":{
+      "type":"string",
+      "enum":[
+        "Name",
+        "CreationTime"
+      ]
+    },
+    "SortTrialsBy":{
+      "type":"string",
+      "enum":[
+        "Name",
+        "CreationTime"
+      ]
+    },
     "SourceAlgorithm":{
       "type":"structure",
       "required":["AlgorithmName"],
@@ -7122,6 +12467,21 @@
       },
       "documentation":"<p>A list of algorithms that were used to create a model package.</p>"
     },
+    "SourceIpConfig":{
+      "type":"structure",
+      "required":["Cidrs"],
+      "members":{
+        "Cidrs":{
+          "shape":"Cidrs",
+          "documentation":"<p>A list of one to four <a href=\"https://docs.aws.amazon.com/vpc/latest/userguide/VPC_Subnets.html\">Classless Inter-Domain Routing</a> (CIDR) values.</p> <p>Maximum: Four CIDR values</p> <note> <p>The following Length Constraints apply to individual CIDR values in the CIDR value list.</p> </note>"
+        }
+      },
+      "documentation":"<p>A list of IP address ranges (<a href=\"https://docs.aws.amazon.com/vpc/latest/userguide/VPC_Subnets.html\">CIDRs</a>). Used to create an allow list of IP addresses for a private workforce. For more information, see .</p>"
+    },
+    "SourceType":{
+      "type":"string",
+      "max":128
+    },
     "SplitType":{
       "type":"string",
       "enum":[
@@ -7131,6 +12491,16 @@
         "TFRecord"
       ]
     },
+    "StartMonitoringScheduleRequest":{
+      "type":"structure",
+      "required":["MonitoringScheduleName"],
+      "members":{
+        "MonitoringScheduleName":{
+          "shape":"MonitoringScheduleName",
+          "documentation":"<p>The name of the schedule to start.</p>"
+        }
+      }
+    },
     "StartNotebookInstanceInput":{
       "type":"structure",
       "required":["NotebookInstanceName"],
@@ -7141,7 +12511,22 @@
         }
       }
     },
+    "StatusDetails":{
+      "type":"string",
+      "max":1024,
+      "pattern":".*"
+    },
     "StatusMessage":{"type":"string"},
+    "StopAutoMLJobRequest":{
+      "type":"structure",
+      "required":["AutoMLJobName"],
+      "members":{
+        "AutoMLJobName":{
+          "shape":"AutoMLJobName",
+          "documentation":"<p>The name of the object you are requesting.</p>"
+        }
+      }
+    },
     "StopCompilationJobRequest":{
       "type":"structure",
       "required":["CompilationJobName"],
@@ -7172,6 +12557,16 @@
         }
       }
     },
+    "StopMonitoringScheduleRequest":{
+      "type":"structure",
+      "required":["MonitoringScheduleName"],
+      "members":{
+        "MonitoringScheduleName":{
+          "shape":"MonitoringScheduleName",
+          "documentation":"<p>The name of the schedule to stop.</p>"
+        }
+      }
+    },
     "StopNotebookInstanceInput":{
       "type":"structure",
       "required":["NotebookInstanceName"],
@@ -7182,6 +12577,16 @@
         }
       }
     },
+    "StopProcessingJobRequest":{
+      "type":"structure",
+      "required":["ProcessingJobName"],
+      "members":{
+        "ProcessingJobName":{
+          "shape":"ProcessingJobName",
+          "documentation":"<p>The name of the processing job to stop.</p>"
+        }
+      }
+    },
     "StopTrainingJobRequest":{
       "type":"structure",
       "required":["TrainingJobName"],
@@ -7217,12 +12622,25 @@
       "documentation":"<p>Specifies a limit to how long a model training or compilation job can run. It also specifies how long you are willing to wait for a managed spot training job to complete. When the job reaches the time limit, Amazon SageMaker ends the training or compilation job. Use this API to cap model training costs.</p> <p>To stop a job, Amazon SageMaker sends the algorithm the <code>SIGTERM</code> signal, which delays job termination for 120 seconds. Algorithms can use this 120-second window to save the model artifacts, so the results of training are not lost. </p> <p>The training algorithms provided by Amazon SageMaker automatically save the intermediate results of a model training job when possible. This attempt to save artifacts is only a best effort case as model might not be in a state from which it can be saved. For example, if training has just started, the model might not be ready to save. When saved, this intermediate data is a valid model artifact. You can use it to create a model with <code>CreateModel</code>.</p> <note> <p>The Neural Topic Model (NTM) currently does not support saving intermediate model artifacts. When training NTMs, make sure that the maximum runtime is sufficient for the training job to complete.</p> </note>"
     },
     "String":{"type":"string"},
+    "String1024":{
+      "type":"string",
+      "max":1024
+    },
     "String200":{
       "type":"string",
       "max":200,
       "min":1,
       "pattern":".+"
     },
+    "String256":{
+      "type":"string",
+      "max":256
+    },
+    "StringParameterValue":{
+      "type":"string",
+      "max":256,
+      "pattern":".*"
+    },
     "SubnetId":{
       "type":"string",
       "max":32,
@@ -7271,10 +12689,10 @@
       "members":{
         "PropertyNameQuery":{
           "shape":"PropertyNameQuery",
-          "documentation":"<p>A type of <code>SuggestionQuery</code>. Defines a property name hint. Only property names that match the specified hint are included in the response.</p>"
+          "documentation":"<p>Defines a property name hint. Only property names that begin with the specified hint are included in the response.</p>"
         }
       },
-      "documentation":"<p>Limits the property names that are included in the response.</p>"
+      "documentation":"<p>Specified in the <a>GetSearchSuggestions</a> request. Limits the property names that are included in the response.</p>"
     },
     "Tag":{
       "type":"structure",
@@ -7318,6 +12736,10 @@
       "min":0,
       "pattern":"^([\\p{L}\\p{Z}\\p{N}_.:/=+\\-@]*)$"
     },
+    "TargetAttributeName":{
+      "type":"string",
+      "min":1
+    },
     "TargetDevice":{
       "type":"string",
       "enum":[
@@ -7328,23 +12750,29 @@
         "ml_c5",
         "ml_p2",
         "ml_p3",
+        "ml_inf1",
         "jetson_tx1",
         "jetson_tx2",
         "jetson_nano",
+        "jetson_xavier",
         "rasp3b",
+        "imx8qm",
         "deeplens",
         "rk3399",
         "rk3288",
         "aisage",
         "sbe_c",
         "qcs605",
-        "qcs603"
+        "qcs603",
+        "sitara_am57x",
+        "amba_cv22"
       ]
     },
+    "TargetObjectiveMetricValue":{"type":"float"},
     "TaskAvailabilityLifetimeInSeconds":{
       "type":"integer",
       "max":864000,
-      "min":1
+      "min":60
     },
     "TaskCount":{
       "type":"integer",
@@ -7391,6 +12819,41 @@
       "min":1,
       "pattern":"[\\S\\s]+"
     },
+    "TemplateContentSha256":{
+      "type":"string",
+      "max":128000,
+      "min":1
+    },
+    "TemplateUrl":{
+      "type":"string",
+      "max":2048,
+      "min":1
+    },
+    "TensorBoardAppSettings":{
+      "type":"structure",
+      "members":{
+        "DefaultResourceSpec":{
+          "shape":"ResourceSpec",
+          "documentation":"<p>The instance type and quantity.</p>"
+        }
+      },
+      "documentation":"<p>The TensorBoard app settings.</p>"
+    },
+    "TensorBoardOutputConfig":{
+      "type":"structure",
+      "required":["S3OutputPath"],
+      "members":{
+        "LocalPath":{
+          "shape":"DirectoryPath",
+          "documentation":"<p>Path to local storage location for tensorBoard output. Defaults to <code>/opt/ml/output/tensorboard</code>.</p>"
+        },
+        "S3OutputPath":{
+          "shape":"S3Uri",
+          "documentation":"<p>Path to Amazon S3 storage location for TensorBoard output.</p>"
+        }
+      },
+      "documentation":"<p>Configuration of storage locations for TensorBoard output.</p>"
+    },
     "TenthFractionsOfACent":{
       "type":"integer",
       "max":9,
@@ -7416,6 +12879,12 @@
         "ml.m4.4xlarge",
         "ml.m4.10xlarge",
         "ml.m4.16xlarge",
+        "ml.g4dn.xlarge",
+        "ml.g4dn.2xlarge",
+        "ml.g4dn.4xlarge",
+        "ml.g4dn.8xlarge",
+        "ml.g4dn.12xlarge",
+        "ml.g4dn.16xlarge",
         "ml.m5.large",
         "ml.m5.xlarge",
         "ml.m5.2xlarge",
@@ -7463,6 +12932,10 @@
           "shape":"LabelingJobArn",
           "documentation":"<p>The Amazon Resource Name (ARN) of the labeling job.</p>"
         },
+        "AutoMLJobArn":{
+          "shape":"AutoMLJobArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the job.</p>"
+        },
         "ModelArtifacts":{
           "shape":"ModelArtifacts",
           "documentation":"<p>Information about the Amazon S3 location that is configured for storing model artifacts.</p>"
@@ -7543,6 +13016,30 @@
           "shape":"Boolean",
           "documentation":"<p>To encrypt all communications between ML compute instances in distributed training, choose <code>True</code>. Encryption provides greater security for distributed training, but training might take longer. How long it takes depends on the amount of communication between compute instances, especially if you use a deep learning algorithm in distributed training.</p>"
         },
+        "EnableManagedSpotTraining":{
+          "shape":"Boolean",
+          "documentation":"<p>When true, enables managed spot training using Amazon EC2 Spot instances to run training jobs instead of on-demand instances. For more information, see <a href=\"https://docs.aws.amazon.com/sagemaker/latest/dg/model-managed-spot-training.html\">Managed Spot Training</a>.</p>"
+        },
+        "CheckpointConfig":{"shape":"CheckpointConfig"},
+        "TrainingTimeInSeconds":{
+          "shape":"TrainingTimeInSeconds",
+          "documentation":"<p>The training time in seconds.</p>"
+        },
+        "BillableTimeInSeconds":{
+          "shape":"BillableTimeInSeconds",
+          "documentation":"<p>The billable time in seconds.</p>"
+        },
+        "DebugHookConfig":{"shape":"DebugHookConfig"},
+        "ExperimentConfig":{"shape":"ExperimentConfig"},
+        "DebugRuleConfigurations":{
+          "shape":"DebugRuleConfigurations",
+          "documentation":"<p>Information about the debug rule configuration.</p>"
+        },
+        "TensorBoardOutputConfig":{"shape":"TensorBoardOutputConfig"},
+        "DebugRuleEvaluationStatuses":{
+          "shape":"DebugRuleEvaluationStatuses",
+          "documentation":"<p>Information about the evaluation status of the rules for the training job.</p>"
+        },
         "Tags":{
           "shape":"TagList",
           "documentation":"<p>An array of key-value pairs. For more information, see <a href=\"https://docs.aws.amazon.com/awsaccountbilling/latest/aboutv2/cost-alloc-tags.html#allocation-what\">Using Cost Allocation Tags</a> in the <i>AWS Billing and Cost Management User Guide</i>.</p>"
@@ -7720,7 +13217,7 @@
         },
         "SupportsDistributedTraining":{
           "shape":"Boolean",
-          "documentation":"<p>Indicates whether the algorithm supports distributed training. If set to false, buyers can’t request more than one instance during training.</p>"
+          "documentation":"<p>Indicates whether the algorithm supports distributed training. If set to false, buyers can't request more than one instance during training.</p>"
         },
         "MetricDefinitions":{
           "shape":"MetricDefinitionList",
@@ -7786,7 +13283,7 @@
         },
         "SplitType":{
           "shape":"SplitType",
-          "documentation":"<p>The method to use to split the transform job's data files into smaller batches. Splitting is necessary when the total size of each object is too large to fit in a single request. You can also use data splitting to improve performance by processing multiple concurrent mini-batches. The default value for <code>SplitType</code> is <code>None</code>, which indicates that input data files are not split, and request payloads contain the entire contents of an input object. Set the value of this parameter to <code>Line</code> to split records on a newline character boundary. <code>SplitType</code> also supports a number of record-oriented binary data formats.</p> <p>When splitting is enabled, the size of a mini-batch depends on the values of the <code>BatchStrategy</code> and <code>MaxPayloadInMB</code> parameters. When the value of <code>BatchStrategy</code> is <code>MultiRecord</code>, Amazon SageMaker sends the maximum number of records in each request, up to the <code>MaxPayloadInMB</code> limit. If the value of <code>BatchStrategy</code> is <code>SingleRecord</code>, Amazon SageMaker sends individual records in each request.</p> <note> <p>Some data formats represent a record as a binary payload wrapped with extra padding bytes. When splitting is applied to a binary data format, padding is removed if the value of <code>BatchStrategy</code> is set to <code>SingleRecord</code>. Padding is not removed if the value of <code>BatchStrategy</code> is set to <code>MultiRecord</code>.</p> <p>For more information about the RecordIO, see <a href=\"http://mxnet.io/architecture/note_data_loading.html#data-format\">Data Format</a> in the MXNet documentation. For more information about the TFRecord, see <a href=\"https://www.tensorflow.org/guide/datasets#consuming_tfrecord_data\">Consuming TFRecord data</a> in the TensorFlow documentation.</p> </note>"
+          "documentation":"<p>The method to use to split the transform job's data files into smaller batches. Splitting is necessary when the total size of each object is too large to fit in a single request. You can also use data splitting to improve performance by processing multiple concurrent mini-batches. The default value for <code>SplitType</code> is <code>None</code>, which indicates that input data files are not split, and request payloads contain the entire contents of an input object. Set the value of this parameter to <code>Line</code> to split records on a newline character boundary. <code>SplitType</code> also supports a number of record-oriented binary data formats.</p> <p>When splitting is enabled, the size of a mini-batch depends on the values of the <code>BatchStrategy</code> and <code>MaxPayloadInMB</code> parameters. When the value of <code>BatchStrategy</code> is <code>MultiRecord</code>, Amazon SageMaker sends the maximum number of records in each request, up to the <code>MaxPayloadInMB</code> limit. If the value of <code>BatchStrategy</code> is <code>SingleRecord</code>, Amazon SageMaker sends individual records in each request.</p> <note> <p>Some data formats represent a record as a binary payload wrapped with extra padding bytes. When splitting is applied to a binary data format, padding is removed if the value of <code>BatchStrategy</code> is set to <code>SingleRecord</code>. Padding is not removed if the value of <code>BatchStrategy</code> is set to <code>MultiRecord</code>.</p> <p>For more information about <code>RecordIO</code>, see <a href=\"https://mxnet.apache.org/api/faq/recordio\">Create a Dataset Using RecordIO</a> in the MXNet documentation. For more information about <code>TFRecord</code>, see <a href=\"https://www.tensorflow.org/guide/datasets#consuming_tfrecord_data\">Consuming TFRecord data</a> in the TensorFlow documentation.</p> </note>"
         }
       },
       "documentation":"<p>Describes the input source of a transform job and the way the transform job consumes it.</p>"
@@ -7933,70 +13430,484 @@
           "documentation":"<p>If the transform job failed, the reason it failed.</p>"
         }
       },
-      "documentation":"<p>Provides a summary of a transform job. Multiple <code>TransformJobSummary</code> objects are returned as a list after in response to a <a>ListTransformJobs</a> call.</p>"
+      "documentation":"<p>Provides a summary of a transform job. Multiple <code>TransformJobSummary</code> objects are returned as a list after in response to a <a>ListTransformJobs</a> call.</p>"
+    },
+    "TransformOutput":{
+      "type":"structure",
+      "required":["S3OutputPath"],
+      "members":{
+        "S3OutputPath":{
+          "shape":"S3Uri",
+          "documentation":"<p>The Amazon S3 path where you want Amazon SageMaker to store the results of the transform job. For example, <code>s3://bucket-name/key-name-prefix</code>.</p> <p>For every S3 object used as input for the transform job, batch transform stores the transformed data with an .<code>out</code> suffix in a corresponding subfolder in the location in the output prefix. For example, for the input data stored at <code>s3://bucket-name/input-name-prefix/dataset01/data.csv</code>, batch transform stores the transformed data at <code>s3://bucket-name/output-name-prefix/input-name-prefix/data.csv.out</code>. Batch transform doesn't upload partially processed objects. For an input S3 object that contains multiple records, it creates an .<code>out</code> file only if the transform job succeeds on the entire file. When the input contains multiple S3 objects, the batch transform job processes the listed S3 objects and uploads only the output for successfully processed objects. If any object fails in the transform job batch transform marks the job as failed to prompt investigation.</p>"
+        },
+        "Accept":{
+          "shape":"Accept",
+          "documentation":"<p>The MIME type used to specify the output data. Amazon SageMaker uses the MIME type with each http call to transfer data from the transform job.</p>"
+        },
+        "AssembleWith":{
+          "shape":"AssemblyType",
+          "documentation":"<p>Defines how to assemble the results of the transform job as a single S3 object. Choose a format that is most convenient to you. To concatenate the results in binary format, specify <code>None</code>. To add a newline character at the end of every transformed record, specify <code>Line</code>.</p>"
+        },
+        "KmsKeyId":{
+          "shape":"KmsKeyId",
+          "documentation":"<p>The AWS Key Management Service (AWS KMS) key that Amazon SageMaker uses to encrypt the model artifacts at rest using Amazon S3 server-side encryption. The <code>KmsKeyId</code> can be any of the following formats: </p> <ul> <li> <p>Key ID: <code>1234abcd-12ab-34cd-56ef-1234567890ab</code> </p> </li> <li> <p>Key ARN: <code>arn:aws:kms:us-west-2:111122223333:key/1234abcd-12ab-34cd-56ef-1234567890ab</code> </p> </li> <li> <p>Alias name: <code>alias/ExampleAlias</code> </p> </li> <li> <p>Alias name ARN: <code>arn:aws:kms:us-west-2:111122223333:alias/ExampleAlias</code> </p> </li> </ul> <p>If you don't provide a KMS key ID, Amazon SageMaker uses the default KMS key for Amazon S3 for your role's account. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/UsingKMSEncryption.html\">KMS-Managed Encryption Keys</a> in the <i>Amazon Simple Storage Service Developer Guide.</i> </p> <p>The KMS key policy must grant permission to the IAM role that you specify in your <a>CreateModel</a> request. For more information, see <a href=\"http://docs.aws.amazon.com/kms/latest/developerguide/key-policies.html\">Using Key Policies in AWS KMS</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
+        }
+      },
+      "documentation":"<p>Describes the results of a transform job.</p>"
+    },
+    "TransformResources":{
+      "type":"structure",
+      "required":[
+        "InstanceType",
+        "InstanceCount"
+      ],
+      "members":{
+        "InstanceType":{
+          "shape":"TransformInstanceType",
+          "documentation":"<p>The ML compute instance type for the transform job. If you are using built-in algorithms to transform moderately sized datasets, we recommend using ml.m4.xlarge or <code>ml.m5.large</code> instance types.</p>"
+        },
+        "InstanceCount":{
+          "shape":"TransformInstanceCount",
+          "documentation":"<p>The number of ML compute instances to use in the transform job. For distributed transform jobs, specify a value greater than 1. The default value is <code>1</code>.</p>"
+        },
+        "VolumeKmsKeyId":{
+          "shape":"KmsKeyId",
+          "documentation":"<p>The AWS Key Management Service (AWS KMS) key that Amazon SageMaker uses to encrypt model data on the storage volume attached to the ML compute instance(s) that run the batch transform job. The <code>VolumeKmsKeyId</code> can be any of the following formats:</p> <ul> <li> <p>Key ID: <code>1234abcd-12ab-34cd-56ef-1234567890ab</code> </p> </li> <li> <p>Key ARN: <code>arn:aws:kms:us-west-2:111122223333:key/1234abcd-12ab-34cd-56ef-1234567890ab</code> </p> </li> <li> <p>Alias name: <code>alias/ExampleAlias</code> </p> </li> <li> <p>Alias name ARN: <code>arn:aws:kms:us-west-2:111122223333:alias/ExampleAlias</code> </p> </li> </ul>"
+        }
+      },
+      "documentation":"<p>Describes the resources, including ML instance types and ML instance count, to use for transform job.</p>"
+    },
+    "TransformS3DataSource":{
+      "type":"structure",
+      "required":[
+        "S3DataType",
+        "S3Uri"
+      ],
+      "members":{
+        "S3DataType":{
+          "shape":"S3DataType",
+          "documentation":"<p>If you choose <code>S3Prefix</code>, <code>S3Uri</code> identifies a key name prefix. Amazon SageMaker uses all objects with the specified key name prefix for batch transform. </p> <p>If you choose <code>ManifestFile</code>, <code>S3Uri</code> identifies an object that is a manifest file containing a list of object keys that you want Amazon SageMaker to use for batch transform. </p> <p>The following values are compatible: <code>ManifestFile</code>, <code>S3Prefix</code> </p> <p>The following value is not compatible: <code>AugmentedManifestFile</code> </p>"
+        },
+        "S3Uri":{
+          "shape":"S3Uri",
+          "documentation":"<p>Depending on the value specified for the <code>S3DataType</code>, identifies either a key name prefix or a manifest. For example:</p> <ul> <li> <p> A key name prefix might look like this: <code>s3://bucketname/exampleprefix</code>. </p> </li> <li> <p> A manifest might look like this: <code>s3://bucketname/example.manifest</code> </p> <p> The manifest is an S3 object which is a JSON file with the following format: </p> <p> <code>[ {\"prefix\": \"s3://customer_bucket/some/prefix/\"},</code> </p> <p> <code>\"relative/path/to/custdata-1\",</code> </p> <p> <code>\"relative/path/custdata-2\",</code> </p> <p> <code>...</code> </p> <p> <code>\"relative/path/custdata-N\"</code> </p> <p> <code>]</code> </p> <p> The preceding JSON matches the following <code>s3Uris</code>: </p> <p> <code>s3://customer_bucket/some/prefix/relative/path/to/custdata-1</code> </p> <p> <code>s3://customer_bucket/some/prefix/relative/path/custdata-2</code> </p> <p> <code>...</code> </p> <p> <code>s3://customer_bucket/some/prefix/relative/path/custdata-N</code> </p> <p> The complete set of <code>S3Uris</code> in this manifest constitutes the input data for the channel for this datasource. The object that each <code>S3Uris</code> points to must be readable by the IAM role that Amazon SageMaker uses to perform tasks on your behalf.</p> </li> </ul>"
+        }
+      },
+      "documentation":"<p>Describes the S3 data source.</p>"
+    },
+    "Trial":{
+      "type":"structure",
+      "members":{
+        "TrialName":{
+          "shape":"ExperimentEntityName",
+          "documentation":"<p>The name of the trial.</p>"
+        },
+        "TrialArn":{
+          "shape":"TrialArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the trial.</p>"
+        },
+        "DisplayName":{
+          "shape":"ExperimentEntityName",
+          "documentation":"<p>The name of the trial as displayed. If <code>DisplayName</code> isn't specified, <code>TrialName</code> is displayed.</p>"
+        },
+        "ExperimentName":{
+          "shape":"ExperimentEntityName",
+          "documentation":"<p>The name of the experiment the trial is part of.</p>"
+        },
+        "Source":{"shape":"TrialSource"},
+        "CreationTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>When the trial was created.</p>"
+        },
+        "CreatedBy":{"shape":"UserContext"},
+        "LastModifiedTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>Who last modified the trial.</p>"
+        },
+        "LastModifiedBy":{"shape":"UserContext"},
+        "Tags":{
+          "shape":"TagList",
+          "documentation":"<p>The list of tags that are associated with the trial. You can use <a>Search</a> API to search on the tags.</p>"
+        },
+        "TrialComponentSummaries":{
+          "shape":"TrialComponentSimpleSummaries",
+          "documentation":"<p>A list of the components associated with the trial. For each component, a summary of the component's properties is included.</p>"
+        }
+      },
+      "documentation":"<p>A summary of the properties of a trial as returned by the <a>Search</a> API.</p>"
+    },
+    "TrialArn":{
+      "type":"string",
+      "max":256,
+      "pattern":"arn:aws[a-z\\-]*:sagemaker:[a-z0-9\\-]*:[0-9]{12}:experiment-trial/.*"
+    },
+    "TrialComponent":{
+      "type":"structure",
+      "members":{
+        "TrialComponentName":{
+          "shape":"ExperimentEntityName",
+          "documentation":"<p>The name of the trial component.</p>"
+        },
+        "DisplayName":{
+          "shape":"ExperimentEntityName",
+          "documentation":"<p>The name of the component as displayed. If <code>DisplayName</code> isn't specified, <code>TrialComponentName</code> is displayed.</p>"
+        },
+        "TrialComponentArn":{
+          "shape":"TrialComponentArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the trial component.</p>"
+        },
+        "Source":{"shape":"TrialComponentSource"},
+        "Status":{"shape":"TrialComponentStatus"},
+        "StartTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>When the component started.</p>"
+        },
+        "EndTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>When the component ended.</p>"
+        },
+        "CreationTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>When the component was created.</p>"
+        },
+        "CreatedBy":{"shape":"UserContext"},
+        "LastModifiedTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>When the component was last modified.</p>"
+        },
+        "LastModifiedBy":{"shape":"UserContext"},
+        "Parameters":{
+          "shape":"TrialComponentParameters",
+          "documentation":"<p>The hyperparameters of the component.</p>"
+        },
+        "InputArtifacts":{
+          "shape":"TrialComponentArtifacts",
+          "documentation":"<p>The input artifacts of the component.</p>"
+        },
+        "OutputArtifacts":{
+          "shape":"TrialComponentArtifacts",
+          "documentation":"<p>The output artifacts of the component.</p>"
+        },
+        "Metrics":{
+          "shape":"TrialComponentMetricSummaries",
+          "documentation":"<p>The metrics for the component.</p>"
+        },
+        "SourceDetail":{
+          "shape":"TrialComponentSourceDetail",
+          "documentation":"<p>The source of the trial component.&gt;</p>"
+        },
+        "Tags":{
+          "shape":"TagList",
+          "documentation":"<p>The list of tags that are associated with the component. You can use <a>Search</a> API to search on the tags.</p>"
+        },
+        "Parents":{
+          "shape":"Parents",
+          "documentation":"<p>An array of the parents of the component. A parent is a trial the component is associated with and the experiment the trial is part of. A component might not have any parents.</p>"
+        }
+      },
+      "documentation":"<p>A summary of the properties of a trial component as returned by the <a>Search</a> API.</p>"
+    },
+    "TrialComponentArn":{
+      "type":"string",
+      "max":256,
+      "pattern":"arn:aws[a-z\\-]*:sagemaker:[a-z0-9\\-]*:[0-9]{12}:experiment-trial-component/.*"
+    },
+    "TrialComponentArtifact":{
+      "type":"structure",
+      "required":["Value"],
+      "members":{
+        "MediaType":{
+          "shape":"MediaType",
+          "documentation":"<p>The media type of the artifact, which indicates the type of data in the artifact file. The media type consists of a <i>type</i> and a <i>subtype</i> concatenated with a slash (/) character, for example, text/csv, image/jpeg, and s3/uri. The type specifies the category of the media. The subtype specifies the kind of data.</p>"
+        },
+        "Value":{
+          "shape":"TrialComponentArtifactValue",
+          "documentation":"<p>The location of the artifact.</p>"
+        }
+      },
+      "documentation":"<p>Represents an input or output artifact of a trial component. You specify <code>TrialComponentArtifact</code> as part of the <code>InputArtifacts</code> and <code>OutputArtifacts</code> parameters in the <a>CreateTrialComponent</a> request.</p> <p>Examples of input artifacts are datasets, algorithms, hyperparameters, source code, and instance types. Examples of output artifacts are metrics, snapshots, logs, and images.</p>"
+    },
+    "TrialComponentArtifactValue":{
+      "type":"string",
+      "max":2048,
+      "pattern":".*"
+    },
+    "TrialComponentArtifacts":{
+      "type":"map",
+      "key":{"shape":"TrialComponentKey64"},
+      "value":{"shape":"TrialComponentArtifact"},
+      "max":30
+    },
+    "TrialComponentKey256":{
+      "type":"string",
+      "max":256,
+      "pattern":".*"
+    },
+    "TrialComponentKey64":{
+      "type":"string",
+      "max":64,
+      "pattern":".*"
+    },
+    "TrialComponentMetricSummaries":{
+      "type":"list",
+      "member":{"shape":"TrialComponentMetricSummary"}
+    },
+    "TrialComponentMetricSummary":{
+      "type":"structure",
+      "members":{
+        "MetricName":{
+          "shape":"MetricName",
+          "documentation":"<p>The name of the metric.</p>"
+        },
+        "SourceArn":{
+          "shape":"TrialComponentSourceArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the source.</p>"
+        },
+        "TimeStamp":{
+          "shape":"Timestamp",
+          "documentation":"<p>When the metric was last updated.</p>"
+        },
+        "Max":{
+          "shape":"OptionalDouble",
+          "documentation":"<p>The maximum value of the metric.</p>"
+        },
+        "Min":{
+          "shape":"OptionalDouble",
+          "documentation":"<p>The minimum value of the metric.</p>"
+        },
+        "Last":{
+          "shape":"OptionalDouble",
+          "documentation":"<p>The most recent value of the metric.</p>"
+        },
+        "Count":{
+          "shape":"OptionalInteger",
+          "documentation":"<p>The number of samples used to generate the metric.</p>"
+        },
+        "Avg":{
+          "shape":"OptionalDouble",
+          "documentation":"<p>The average value of the metric.</p>"
+        },
+        "StdDev":{
+          "shape":"OptionalDouble",
+          "documentation":"<p>The standard deviation of the metric.</p>"
+        }
+      },
+      "documentation":"<p>A summary of the metrics of a trial component.</p>"
+    },
+    "TrialComponentParameterValue":{
+      "type":"structure",
+      "members":{
+        "StringValue":{
+          "shape":"StringParameterValue",
+          "documentation":"<p>The string value of a categorical hyperparameter. If you specify a value for this parameter, you can't specify the <code>NumberValue</code> parameter.</p>"
+        },
+        "NumberValue":{
+          "shape":"DoubleParameterValue",
+          "documentation":"<p>The numeric value of a numeric hyperparameter. If you specify a value for this parameter, you can't specify the <code>StringValue</code> parameter.</p>"
+        }
+      },
+      "documentation":"<p>The value of a hyperparameter. Only one of <code>NumberValue</code> or <code>StringValue</code> can be specified.</p> <p>This object is specified in the <a>CreateTrialComponent</a> request.</p>"
+    },
+    "TrialComponentParameters":{
+      "type":"map",
+      "key":{"shape":"TrialComponentKey256"},
+      "value":{"shape":"TrialComponentParameterValue"},
+      "max":150
+    },
+    "TrialComponentPrimaryStatus":{
+      "type":"string",
+      "enum":[
+        "InProgress",
+        "Completed",
+        "Failed"
+      ]
+    },
+    "TrialComponentSimpleSummaries":{
+      "type":"list",
+      "member":{"shape":"TrialComponentSimpleSummary"}
+    },
+    "TrialComponentSimpleSummary":{
+      "type":"structure",
+      "members":{
+        "TrialComponentName":{
+          "shape":"ExperimentEntityName",
+          "documentation":"<p>The name of the trial component.</p>"
+        },
+        "TrialComponentArn":{
+          "shape":"TrialComponentArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the trial component.</p>"
+        },
+        "TrialComponentSource":{"shape":"TrialComponentSource"},
+        "CreationTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>When the component was created.</p>"
+        },
+        "CreatedBy":{"shape":"UserContext"}
+      },
+      "documentation":"<p>A short summary of a trial component.</p>"
+    },
+    "TrialComponentSource":{
+      "type":"structure",
+      "required":["SourceArn"],
+      "members":{
+        "SourceArn":{
+          "shape":"TrialComponentSourceArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the source.</p>"
+        },
+        "SourceType":{
+          "shape":"SourceType",
+          "documentation":"<p>The source job type.</p>"
+        }
+      },
+      "documentation":"<p>The source of the trial component.</p>"
+    },
+    "TrialComponentSourceArn":{
+      "type":"string",
+      "max":256,
+      "pattern":"arn:aws[a-z\\-]*:sagemaker:[a-z0-9\\-]*:[0-9]{12}:.*"
+    },
+    "TrialComponentSourceDetail":{
+      "type":"structure",
+      "members":{
+        "SourceArn":{
+          "shape":"TrialComponentSourceArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the source.</p>"
+        },
+        "TrainingJob":{"shape":"TrainingJob"}
+      },
+      "documentation":"<p>Detailed information about the source of a trial component.</p>"
+    },
+    "TrialComponentStatus":{
+      "type":"structure",
+      "members":{
+        "PrimaryStatus":{
+          "shape":"TrialComponentPrimaryStatus",
+          "documentation":"<p>The status of the trial component.</p>"
+        },
+        "Message":{
+          "shape":"TrialComponentStatusMessage",
+          "documentation":"<p>If the component failed, a message describing why.</p>"
+        }
+      },
+      "documentation":"<p>The status of the trial component.</p>"
+    },
+    "TrialComponentStatusMessage":{
+      "type":"string",
+      "max":1024,
+      "pattern":".*"
+    },
+    "TrialComponentSummaries":{
+      "type":"list",
+      "member":{"shape":"TrialComponentSummary"}
+    },
+    "TrialComponentSummary":{
+      "type":"structure",
+      "members":{
+        "TrialComponentName":{
+          "shape":"ExperimentEntityName",
+          "documentation":"<p>The name of the trial component.</p>"
+        },
+        "TrialComponentArn":{
+          "shape":"TrialComponentArn",
+          "documentation":"<p>The ARN of the trial component.</p>"
+        },
+        "DisplayName":{
+          "shape":"ExperimentEntityName",
+          "documentation":"<p>The name of the component as displayed. If <code>DisplayName</code> isn't specified, <code>TrialComponentName</code> is displayed.</p>"
+        },
+        "TrialComponentSource":{"shape":"TrialComponentSource"},
+        "Status":{
+          "shape":"TrialComponentStatus",
+          "documentation":"<p>The status of the component. States include:</p> <ul> <li> <p>InProgress</p> </li> <li> <p>Completed</p> </li> <li> <p>Failed</p> </li> </ul>"
+        },
+        "StartTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>When the component started.</p>"
+        },
+        "EndTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>When the component ended.</p>"
+        },
+        "CreationTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>When the component was created.</p>"
+        },
+        "CreatedBy":{
+          "shape":"UserContext",
+          "documentation":"<p>Who created the component.</p>"
+        },
+        "LastModifiedTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>When the component was last modified.</p>"
+        },
+        "LastModifiedBy":{
+          "shape":"UserContext",
+          "documentation":"<p>Who last modified the component.</p>"
+        }
+      },
+      "documentation":"<p>A summary of the properties of a trial component. To get all the properties, call the <a>DescribeTrialComponent</a> API and provide the <code>TrialComponentName</code>.</p>"
     },
-    "TransformOutput":{
+    "TrialSource":{
       "type":"structure",
-      "required":["S3OutputPath"],
+      "required":["SourceArn"],
       "members":{
-        "S3OutputPath":{
-          "shape":"S3Uri",
-          "documentation":"<p>The Amazon S3 path where you want Amazon SageMaker to store the results of the transform job. For example, <code>s3://bucket-name/key-name-prefix</code>.</p> <p>For every S3 object used as input for the transform job, batch transform stores the transformed data with an .<code>out</code> suffix in a corresponding subfolder in the location in the output prefix. For example, for the input data stored at <code>s3://bucket-name/input-name-prefix/dataset01/data.csv</code>, batch transform stores the transformed data at <code>s3://bucket-name/output-name-prefix/input-name-prefix/data.csv.out</code>. Batch transform doesn't upload partially processed objects. For an input S3 object that contains multiple records, it creates an .<code>out</code> file only if the transform job succeeds on the entire file. When the input contains multiple S3 objects, the batch transform job processes the listed S3 objects and uploads only the output for successfully processed objects. If any object fails in the transform job batch transform marks the job as failed to prompt investigation.</p>"
-        },
-        "Accept":{
-          "shape":"Accept",
-          "documentation":"<p>The MIME type used to specify the output data. Amazon SageMaker uses the MIME type with each http call to transfer data from the transform job.</p>"
-        },
-        "AssembleWith":{
-          "shape":"AssemblyType",
-          "documentation":"<p>Defines how to assemble the results of the transform job as a single S3 object. Choose a format that is most convenient to you. To concatenate the results in binary format, specify <code>None</code>. To add a newline character at the end of every transformed record, specify <code>Line</code>.</p>"
+        "SourceArn":{
+          "shape":"TrialSourceArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the source.</p>"
         },
-        "KmsKeyId":{
-          "shape":"KmsKeyId",
-          "documentation":"<p>The AWS Key Management Service (AWS KMS) key that Amazon SageMaker uses to encrypt the model artifacts at rest using Amazon S3 server-side encryption. The <code>KmsKeyId</code> can be any of the following formats: </p> <ul> <li> <p>// KMS Key ID</p> <p> <code>\"1234abcd-12ab-34cd-56ef-1234567890ab\"</code> </p> </li> <li> <p>// Amazon Resource Name (ARN) of a KMS Key</p> <p> <code>\"arn:aws:kms:us-west-2:111122223333:key/1234abcd-12ab-34cd-56ef-1234567890ab\"</code> </p> </li> <li> <p>// KMS Key Alias</p> <p> <code>\"alias/ExampleAlias\"</code> </p> </li> <li> <p>// Amazon Resource Name (ARN) of a KMS Key Alias</p> <p> <code>\"arn:aws:kms:us-west-2:111122223333:alias/ExampleAlias\"</code> </p> </li> </ul> <p>If you don't provide a KMS key ID, Amazon SageMaker uses the default KMS key for Amazon S3 for your role's account. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/dev/UsingKMSEncryption.html\">KMS-Managed Encryption Keys</a> in the <i>Amazon Simple Storage Service Developer Guide.</i> </p> <p>The KMS key policy must grant permission to the IAM role that you specify in your <code>CreateTramsformJob</code> request. For more information, see <a href=\"http://docs.aws.amazon.com/kms/latest/developerguide/key-policies.html\">Using Key Policies in AWS KMS</a> in the <i>AWS Key Management Service Developer Guide</i>.</p>"
+        "SourceType":{
+          "shape":"SourceType",
+          "documentation":"<p>The source job type.</p>"
         }
       },
-      "documentation":"<p>Describes the results of a transform job.</p>"
+      "documentation":"<p>The source of the trial.</p>"
     },
-    "TransformResources":{
+    "TrialSourceArn":{
+      "type":"string",
+      "max":256,
+      "pattern":"arn:aws[a-z\\-]*:sagemaker:[a-z0-9\\-]*:[0-9]{12}:.*"
+    },
+    "TrialSummaries":{
+      "type":"list",
+      "member":{"shape":"TrialSummary"}
+    },
+    "TrialSummary":{
       "type":"structure",
-      "required":[
-        "InstanceType",
-        "InstanceCount"
-      ],
       "members":{
-        "InstanceType":{
-          "shape":"TransformInstanceType",
-          "documentation":"<p>The ML compute instance type for the transform job. If you are using built-in algorithms to transform moderately sized datasets, we recommend using ml.m4.xlarge or <code>ml.m5.large</code> instance types.</p>"
+        "TrialArn":{
+          "shape":"TrialArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the trial.</p>"
         },
-        "InstanceCount":{
-          "shape":"TransformInstanceCount",
-          "documentation":"<p>The number of ML compute instances to use in the transform job. For distributed transform jobs, specify a value greater than 1. The default value is <code>1</code>.</p>"
+        "TrialName":{
+          "shape":"ExperimentEntityName",
+          "documentation":"<p>The name of the trial.</p>"
         },
-        "VolumeKmsKeyId":{
-          "shape":"KmsKeyId",
-          "documentation":"<p>The AWS Key Management Service (AWS KMS) key that Amazon SageMaker uses to encrypt data on the storage volume attached to the ML compute instance(s) that run the batch transform job. The <code>VolumeKmsKeyId</code> can be any of the following formats:</p> <ul> <li> <p>// KMS Key ID</p> <p> <code>\"1234abcd-12ab-34cd-56ef-1234567890ab\"</code> </p> </li> <li> <p>// Amazon Resource Name (ARN) of a KMS Key</p> <p> <code>\"arn:aws:kms:us-west-2:111122223333:key/1234abcd-12ab-34cd-56ef-1234567890ab\"</code> </p> </li> </ul>"
+        "DisplayName":{
+          "shape":"ExperimentEntityName",
+          "documentation":"<p>The name of the trial as displayed. If <code>DisplayName</code> isn't specified, <code>TrialName</code> is displayed.</p>"
+        },
+        "TrialSource":{"shape":"TrialSource"},
+        "CreationTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>When the trial was created.</p>"
+        },
+        "LastModifiedTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>When the trial was last modified.</p>"
         }
       },
-      "documentation":"<p>Describes the resources, including ML instance types and ML instance count, to use for transform job.</p>"
+      "documentation":"<p>A summary of the properties of a trial. To get the complete set of properties, call the <a>DescribeTrial</a> API and provide the <code>TrialName</code>.</p>"
     },
-    "TransformS3DataSource":{
+    "TuningJobCompletionCriteria":{
       "type":"structure",
-      "required":[
-        "S3DataType",
-        "S3Uri"
-      ],
+      "required":["TargetObjectiveMetricValue"],
       "members":{
-        "S3DataType":{
-          "shape":"S3DataType",
-          "documentation":"<p>If you choose <code>S3Prefix</code>, <code>S3Uri</code> identifies a key name prefix. Amazon SageMaker uses all objects with the specified key name prefix for batch transform. </p> <p>If you choose <code>ManifestFile</code>, <code>S3Uri</code> identifies an object that is a manifest file containing a list of object keys that you want Amazon SageMaker to use for batch transform. </p> <p>The following values are compatible: <code>ManifestFile</code>, <code>S3Prefix</code> </p> <p>The following value is not compatible: <code>AugmentedManifestFile</code> </p>"
-        },
-        "S3Uri":{
-          "shape":"S3Uri",
-          "documentation":"<p>Depending on the value specified for the <code>S3DataType</code>, identifies either a key name prefix or a manifest. For example:</p> <ul> <li> <p> A key name prefix might look like this: <code>s3://bucketname/exampleprefix</code>. </p> </li> <li> <p> A manifest might look like this: <code>s3://bucketname/example.manifest</code> </p> <p> The manifest is an S3 object which is a JSON file with the following format: </p> <p> <code>[</code> </p> <p> <code> {\"prefix\": \"s3://customer_bucket/some/prefix/\"},</code> </p> <p> <code> \"relative/path/to/custdata-1\",</code> </p> <p> <code> \"relative/path/custdata-2\",</code> </p> <p> <code> ...</code> </p> <p> <code> ]</code> </p> <p> The preceding JSON matches the following <code>S3Uris</code>: </p> <p> <code>s3://customer_bucket/some/prefix/relative/path/to/custdata-1</code> </p> <p> <code>s3://customer_bucket/some/prefix/relative/path/custdata-1</code> </p> <p> <code>...</code> </p> <p> The complete set of <code>S3Uris</code> in this manifest constitutes the input data for the channel for this datasource. The object that each <code>S3Uris</code> points to must be readable by the IAM role that Amazon SageMaker uses to perform tasks on your behalf.</p> </li> </ul>"
+        "TargetObjectiveMetricValue":{
+          "shape":"TargetObjectiveMetricValue",
+          "documentation":"<p>The objective metric's value.</p>"
         }
       },
-      "documentation":"<p>Describes the S3 data source.</p>"
+      "documentation":"<p>The job completion criteria.</p>"
     },
     "USD":{
       "type":"structure",
@@ -8038,6 +13949,20 @@
       },
       "documentation":"<p>The Liquid template for the worker user interface.</p>"
     },
+    "UiTemplateInfo":{
+      "type":"structure",
+      "members":{
+        "Url":{
+          "shape":"TemplateUrl",
+          "documentation":"<p>The URL for the user interface template.</p>"
+        },
+        "ContentSha256":{
+          "shape":"TemplateContentSha256",
+          "documentation":"<p>The SHA-256 digest of the contents of the template.</p>"
+        }
+      },
+      "documentation":"<p>Container for user interface template information.</p>"
+    },
     "UpdateCodeRepositoryInput":{
       "type":"structure",
       "required":["CodeRepositoryName"],
@@ -8062,6 +13987,29 @@
         }
       }
     },
+    "UpdateDomainRequest":{
+      "type":"structure",
+      "required":["DomainId"],
+      "members":{
+        "DomainId":{
+          "shape":"DomainId",
+          "documentation":"<p>The domain ID.</p>"
+        },
+        "DefaultUserSettings":{
+          "shape":"UserSettings",
+          "documentation":"<p>A collection of settings.</p>"
+        }
+      }
+    },
+    "UpdateDomainResponse":{
+      "type":"structure",
+      "members":{
+        "DomainArn":{
+          "shape":"DomainArn",
+          "documentation":"<p>The domain Amazon Resource Name (ARN).</p>"
+        }
+      }
+    },
     "UpdateEndpointInput":{
       "type":"structure",
       "required":[
@@ -8076,6 +14024,14 @@
         "EndpointConfigName":{
           "shape":"EndpointConfigName",
           "documentation":"<p>The name of the new endpoint configuration.</p>"
+        },
+        "RetainAllVariantProperties":{
+          "shape":"Boolean",
+          "documentation":"<p>When updating endpoint resources, enables or disables the retention of variant properties, such as the instance count or the variant weight. To retain the variant properties of an endpoint when updating it, set <code>RetainAllVariantProperties</code> to <code>true</code>. To use the variant properties specified in a new <code>EndpointConfig</code> call when updating an endpoint, set <code>RetainAllVariantProperties</code> to <code>false</code>.</p>"
+        },
+        "ExcludeRetainedVariantProperties":{
+          "shape":"VariantPropertyList",
+          "documentation":"<p>When you are updating endpoint resources with <a>UpdateEndpointInput$RetainAllVariantProperties</a>, whose value is set to <code>true</code>, <code>ExcludeRetainedVariantProperties</code> specifies the list of type <a>VariantProperty</a> to override with the values provided by <code>EndpointConfig</code>. If you don't specify a value for <code>ExcludeAllVariantProperties</code>, no variant properties are overridden. </p>"
         }
       }
     },
@@ -8116,6 +14072,60 @@
         }
       }
     },
+    "UpdateExperimentRequest":{
+      "type":"structure",
+      "required":["ExperimentName"],
+      "members":{
+        "ExperimentName":{
+          "shape":"ExperimentEntityName",
+          "documentation":"<p>The name of the experiment to update.</p>"
+        },
+        "DisplayName":{
+          "shape":"ExperimentEntityName",
+          "documentation":"<p>The name of the experiment as displayed. The name doesn't need to be unique. If <code>DisplayName</code> isn't specified, <code>ExperimentName</code> is displayed.</p>"
+        },
+        "Description":{
+          "shape":"ExperimentDescription",
+          "documentation":"<p>The description of the experiment.</p>"
+        }
+      }
+    },
+    "UpdateExperimentResponse":{
+      "type":"structure",
+      "members":{
+        "ExperimentArn":{
+          "shape":"ExperimentArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the experiment.</p>"
+        }
+      }
+    },
+    "UpdateMonitoringScheduleRequest":{
+      "type":"structure",
+      "required":[
+        "MonitoringScheduleName",
+        "MonitoringScheduleConfig"
+      ],
+      "members":{
+        "MonitoringScheduleName":{
+          "shape":"MonitoringScheduleName",
+          "documentation":"<p>The name of the monitoring schedule. The name must be unique within an AWS Region within an AWS account.</p>"
+        },
+        "MonitoringScheduleConfig":{
+          "shape":"MonitoringScheduleConfig",
+          "documentation":"<p>The configuration object that specifies the monitoring schedule and defines the monitoring job.</p>"
+        }
+      }
+    },
+    "UpdateMonitoringScheduleResponse":{
+      "type":"structure",
+      "required":["MonitoringScheduleArn"],
+      "members":{
+        "MonitoringScheduleArn":{
+          "shape":"MonitoringScheduleArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the monitoring schedule.</p>"
+        }
+      }
+    },
     "UpdateNotebookInstanceInput":{
       "type":"structure",
       "required":["NotebookInstanceName"],
@@ -8154,7 +14164,7 @@
         },
         "AcceleratorTypes":{
           "shape":"NotebookInstanceAcceleratorTypes",
-          "documentation":"<p>A list of the Elastic Inference (EI) instance types to associate with this notebook instance. Currently only one EI instance type can be associated with a notebook instance. For more information, see <a href=\"sagemaker/latest/dg/ei.html\">Using Elastic Inference in Amazon SageMaker</a>.</p>"
+          "documentation":"<p>A list of the Elastic Inference (EI) instance types to associate with this notebook instance. Currently only one EI instance type can be associated with a notebook instance. For more information, see <a href=\"https://docs.aws.amazon.com/sagemaker/latest/dg/ei.html\">Using Elastic Inference in Amazon SageMaker</a>.</p>"
         },
         "DisassociateAcceleratorTypes":{
           "shape":"DisassociateNotebookInstanceAcceleratorTypes",
@@ -8202,6 +14212,142 @@
       "members":{
       }
     },
+    "UpdateTrialComponentRequest":{
+      "type":"structure",
+      "required":["TrialComponentName"],
+      "members":{
+        "TrialComponentName":{
+          "shape":"ExperimentEntityName",
+          "documentation":"<p>The name of the component to update.</p>"
+        },
+        "DisplayName":{
+          "shape":"ExperimentEntityName",
+          "documentation":"<p>The name of the component as displayed. The name doesn't need to be unique. If <code>DisplayName</code> isn't specified, <code>TrialComponentName</code> is displayed.</p>"
+        },
+        "Status":{
+          "shape":"TrialComponentStatus",
+          "documentation":"<p>The new status of the component.</p>"
+        },
+        "StartTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>When the component started.</p>"
+        },
+        "EndTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>When the component ended.</p>"
+        },
+        "Parameters":{
+          "shape":"TrialComponentParameters",
+          "documentation":"<p>Replaces all of the component's hyperparameters with the specified hyperparameters.</p>"
+        },
+        "ParametersToRemove":{
+          "shape":"ListTrialComponentKey256",
+          "documentation":"<p>The hyperparameters to remove from the component.</p>"
+        },
+        "InputArtifacts":{
+          "shape":"TrialComponentArtifacts",
+          "documentation":"<p>Replaces all of the component's input artifacts with the specified artifacts.</p>"
+        },
+        "InputArtifactsToRemove":{
+          "shape":"ListTrialComponentKey256",
+          "documentation":"<p>The input artifacts to remove from the component.</p>"
+        },
+        "OutputArtifacts":{
+          "shape":"TrialComponentArtifacts",
+          "documentation":"<p>Replaces all of the component's output artifacts with the specified artifacts.</p>"
+        },
+        "OutputArtifactsToRemove":{
+          "shape":"ListTrialComponentKey256",
+          "documentation":"<p>The output artifacts to remove from the component.</p>"
+        }
+      }
+    },
+    "UpdateTrialComponentResponse":{
+      "type":"structure",
+      "members":{
+        "TrialComponentArn":{
+          "shape":"TrialComponentArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the trial component.</p>"
+        }
+      }
+    },
+    "UpdateTrialRequest":{
+      "type":"structure",
+      "required":["TrialName"],
+      "members":{
+        "TrialName":{
+          "shape":"ExperimentEntityName",
+          "documentation":"<p>The name of the trial to update.</p>"
+        },
+        "DisplayName":{
+          "shape":"ExperimentEntityName",
+          "documentation":"<p>The name of the trial as displayed. The name doesn't need to be unique. If <code>DisplayName</code> isn't specified, <code>TrialName</code> is displayed.</p>"
+        }
+      }
+    },
+    "UpdateTrialResponse":{
+      "type":"structure",
+      "members":{
+        "TrialArn":{
+          "shape":"TrialArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the trial.</p>"
+        }
+      }
+    },
+    "UpdateUserProfileRequest":{
+      "type":"structure",
+      "required":[
+        "DomainId",
+        "UserProfileName"
+      ],
+      "members":{
+        "DomainId":{
+          "shape":"DomainId",
+          "documentation":"<p>The domain ID.</p>"
+        },
+        "UserProfileName":{
+          "shape":"UserProfileName",
+          "documentation":"<p>The user profile name.</p>"
+        },
+        "UserSettings":{
+          "shape":"UserSettings",
+          "documentation":"<p>A collection of settings.</p>"
+        }
+      }
+    },
+    "UpdateUserProfileResponse":{
+      "type":"structure",
+      "members":{
+        "UserProfileArn":{
+          "shape":"UserProfileArn",
+          "documentation":"<p>The user profile Amazon Resource Name (ARN).</p>"
+        }
+      }
+    },
+    "UpdateWorkforceRequest":{
+      "type":"structure",
+      "required":["WorkforceName"],
+      "members":{
+        "WorkforceName":{
+          "shape":"WorkforceName",
+          "documentation":"<p>The name of the private workforce whose access you want to restrict. <code>WorkforceName</code> is automatically set to <code>default</code> when a workforce is created and cannot be modified. </p>"
+        },
+        "SourceIpConfig":{
+          "shape":"SourceIpConfig",
+          "documentation":"<p>A list of one to four worker IP address ranges (<a href=\"https://docs.aws.amazon.com/vpc/latest/userguide/VPC_Subnets.html\">CIDRs</a>) that can be used to access tasks assigned to this workforce.</p> <p>Maximum: Four CIDR values</p>"
+        }
+      }
+    },
+    "UpdateWorkforceResponse":{
+      "type":"structure",
+      "required":["Workforce"],
+      "members":{
+        "Workforce":{
+          "shape":"Workforce",
+          "documentation":"<p>A single private workforce, which is automatically created when you create your first private work team. You can create one private work force in each AWS Region. By default, any workforce-related API operation used in a specific region will apply to the workforce created in that region. To learn how to create a private workforce, see <a href=\"https://docs.aws.amazon.com/sagemaker/latest/dg/sms-workforce-create-private.html\">Create a Private Workforce</a>.</p>"
+        }
+      }
+    },
     "UpdateWorkteamRequest":{
       "type":"structure",
       "required":["WorkteamName"],
@@ -8239,11 +14385,140 @@
       "max":1024,
       "pattern":"^(https|s3)://([^/]+)/?(.*)$"
     },
+    "UserContext":{
+      "type":"structure",
+      "members":{
+        "UserProfileArn":{
+          "shape":"String",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the user's profile.</p>"
+        },
+        "UserProfileName":{
+          "shape":"String",
+          "documentation":"<p>The name of the user's profile.</p>"
+        },
+        "DomainId":{
+          "shape":"String",
+          "documentation":"<p>The domain associated with the user.</p>"
+        }
+      },
+      "documentation":"<p>Information about the user who created or modified an experiment, trial, or trial component.</p>"
+    },
+    "UserProfileArn":{
+      "type":"string",
+      "max":256,
+      "pattern":"arn:aws[a-z\\-]*:sagemaker:[a-z0-9\\-]*:[0-9]{12}:user-profile/.*"
+    },
+    "UserProfileDetails":{
+      "type":"structure",
+      "members":{
+        "DomainId":{
+          "shape":"DomainId",
+          "documentation":"<p>The domain ID.</p>"
+        },
+        "UserProfileName":{
+          "shape":"UserProfileName",
+          "documentation":"<p>The user profile name.</p>"
+        },
+        "Status":{
+          "shape":"UserProfileStatus",
+          "documentation":"<p>The status.</p>"
+        },
+        "CreationTime":{
+          "shape":"CreationTime",
+          "documentation":"<p>The creation time.</p>"
+        },
+        "LastModifiedTime":{
+          "shape":"LastModifiedTime",
+          "documentation":"<p>The last modified time.</p>"
+        }
+      },
+      "documentation":"<p>The user profile details.</p>"
+    },
+    "UserProfileList":{
+      "type":"list",
+      "member":{"shape":"UserProfileDetails"}
+    },
+    "UserProfileName":{
+      "type":"string",
+      "max":63,
+      "pattern":"^[a-zA-Z0-9](-*[a-zA-Z0-9])*"
+    },
+    "UserProfileSortKey":{
+      "type":"string",
+      "enum":[
+        "CreationTime",
+        "LastModifiedTime"
+      ]
+    },
+    "UserProfileStatus":{
+      "type":"string",
+      "enum":[
+        "Deleting",
+        "Failed",
+        "InService",
+        "Pending"
+      ]
+    },
+    "UserSettings":{
+      "type":"structure",
+      "members":{
+        "ExecutionRole":{
+          "shape":"RoleArn",
+          "documentation":"<p>The execution role for the user.</p>"
+        },
+        "SecurityGroups":{
+          "shape":"SecurityGroupIds",
+          "documentation":"<p>The security groups.</p>"
+        },
+        "SharingSettings":{
+          "shape":"SharingSettings",
+          "documentation":"<p>The sharing settings.</p>"
+        },
+        "JupyterServerAppSettings":{
+          "shape":"JupyterServerAppSettings",
+          "documentation":"<p>The Jupyter server's app settings.</p>"
+        },
+        "KernelGatewayAppSettings":{
+          "shape":"KernelGatewayAppSettings",
+          "documentation":"<p>The kernel gateway app settings.</p>"
+        },
+        "TensorBoardAppSettings":{
+          "shape":"TensorBoardAppSettings",
+          "documentation":"<p>The TensorBoard app settings.</p>"
+        }
+      },
+      "documentation":"<p>A collection of settings.</p>"
+    },
     "VariantName":{
       "type":"string",
       "max":63,
       "pattern":"^[a-zA-Z0-9](-*[a-zA-Z0-9])*"
     },
+    "VariantProperty":{
+      "type":"structure",
+      "required":["VariantPropertyType"],
+      "members":{
+        "VariantPropertyType":{
+          "shape":"VariantPropertyType",
+          "documentation":"<p>The type of variant property. The supported values are:</p> <ul> <li> <p> <code>DesiredInstanceCount</code>: Overrides the existing variant instance counts using the <a>ProductionVariant$InitialInstanceCount</a> values in the <a>CreateEndpointConfigInput$ProductionVariants</a>.</p> </li> <li> <p> <code>DesiredWeight</code>: Overrides the existing variant weights using the <a>ProductionVariant$InitialVariantWeight</a> values in the <a>CreateEndpointConfigInput$ProductionVariants</a>.</p> </li> <li> <p> <code>DataCaptureConfig</code>: (Not currently supported.)</p> </li> </ul>"
+        }
+      },
+      "documentation":"<p>Specifies a production variant property type for an Endpoint.</p> <p>If you are updating an endpoint with the <a>UpdateEndpointInput$RetainAllVariantProperties</a> option set to <code>true</code>, the <code>VariantProperty</code> objects listed in <a>UpdateEndpointInput$ExcludeRetainedVariantProperties</a> override the existing variant properties of the endpoint.</p>"
+    },
+    "VariantPropertyList":{
+      "type":"list",
+      "member":{"shape":"VariantProperty"},
+      "max":3,
+      "min":0
+    },
+    "VariantPropertyType":{
+      "type":"string",
+      "enum":[
+        "DesiredInstanceCount",
+        "DesiredWeight",
+        "DataCaptureConfig"
+      ]
+    },
     "VariantWeight":{
       "type":"float",
       "min":0
@@ -8265,17 +14540,59 @@
         },
         "Subnets":{
           "shape":"Subnets",
-          "documentation":"<p>The ID of the subnets in the VPC to which you want to connect your training job or model. </p> <note> <p>Amazon EC2 P3 accelerated computing instances are not available in the c/d/e availability zones of region us-east-1. If you want to create endpoints with P3 instances in VPC mode in region us-east-1, create subnets in a/b/f availability zones instead.</p> </note>"
+          "documentation":"<p>The ID of the subnets in the VPC to which you want to connect your training job or model. For information about the availability of specific instance types, see <a href=\"https://docs.aws.amazon.com/sagemaker/latest/dg/instance-types-az.html\">Supported Instance Types and Availability Zones</a>.</p>"
         }
       },
       "documentation":"<p>Specifies a VPC that your training jobs and hosted models have access to. Control access to and from your training and model containers by configuring the VPC. For more information, see <a href=\"https://docs.aws.amazon.com/sagemaker/latest/dg/host-vpc.html\">Protect Endpoints by Using an Amazon Virtual Private Cloud</a> and <a href=\"https://docs.aws.amazon.com/sagemaker/latest/dg/train-vpc.html\">Protect Training Jobs by Using an Amazon Virtual Private Cloud</a>. </p>"
     },
+    "VpcId":{
+      "type":"string",
+      "max":32,
+      "pattern":"[-0-9a-zA-Z]+"
+    },
     "VpcSecurityGroupIds":{
       "type":"list",
       "member":{"shape":"SecurityGroupId"},
       "max":5,
       "min":1
     },
+    "Workforce":{
+      "type":"structure",
+      "required":[
+        "WorkforceName",
+        "WorkforceArn"
+      ],
+      "members":{
+        "WorkforceName":{
+          "shape":"WorkforceName",
+          "documentation":"<p>The name of the private workforce whose access you want to restrict. <code>WorkforceName</code> is automatically set to <code>default</code> when a workforce is created and cannot be modified. </p>"
+        },
+        "WorkforceArn":{
+          "shape":"WorkforceArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the private workforce.</p>"
+        },
+        "LastUpdatedDate":{
+          "shape":"Timestamp",
+          "documentation":"<p>The most recent date that was used to successfully add one or more IP address ranges (<a href=\"https://docs.aws.amazon.com/vpc/latest/userguide/VPC_Subnets.html\">CIDRs</a>) to a private workforce's allow list.</p>"
+        },
+        "SourceIpConfig":{
+          "shape":"SourceIpConfig",
+          "documentation":"<p>A list of one to four IP address ranges (<a href=\"https://docs.aws.amazon.com/vpc/latest/userguide/VPC_Subnets.html\">CIDRs</a>) to be added to the workforce allow list.</p>"
+        }
+      },
+      "documentation":"<p>A single private workforce, which is automatically created when you create your first private work team. You can create one private work force in each AWS Region. By default, any workforce-related API operation used in a specific region will apply to the workforce created in that region. To learn how to create a private workforce, see <a href=\"https://docs.aws.amazon.com/sagemaker/latest/dg/sms-workforce-create-private.html\">Create a Private Workforce</a>.</p>"
+    },
+    "WorkforceArn":{
+      "type":"string",
+      "max":256,
+      "pattern":"arn:aws[a-z\\-]*:sagemaker:[a-z0-9\\-]*:[0-9]{12}:workforce/.*"
+    },
+    "WorkforceName":{
+      "type":"string",
+      "max":63,
+      "min":1,
+      "pattern":"^[a-zA-Z0-9]([a-zA-Z0-9\\-])*$"
+    },
     "Workteam":{
       "type":"structure",
       "required":[
diff --git a/services/sagemaker/src/main/resources/codegen-resources/waiters-2.json b/services/sagemaker/src/main/resources/codegen-resources/waiters-2.json
index d033ea33f48e..c462ff9ca9bf 100644
--- a/services/sagemaker/src/main/resources/codegen-resources/waiters-2.json
+++ b/services/sagemaker/src/main/resources/codegen-resources/waiters-2.json
@@ -158,6 +158,36 @@
           "state": "failure"
         }
       ]
+    },
+    "ProcessingJobCompletedOrStopped": {
+      "delay": 60,
+      "maxAttempts": 60,
+      "operation": "DescribeProcessingJob",
+      "acceptors": [
+        {
+          "expected": "Completed",
+          "matcher": "path",
+          "state": "success",
+          "argument": "ProcessingJobStatus"
+        },
+        {
+          "expected": "Stopped",
+          "matcher": "path",
+          "state": "success",
+          "argument": "ProcessingJobStatus"
+        },
+        {
+          "expected": "Failed",
+          "matcher": "path",
+          "state": "failure",
+          "argument": "ProcessingJobStatus"
+        },
+        {
+          "expected": "ValidationException",
+          "matcher": "error",
+          "state": "failure"
+        }
+      ]
     }
   }
 }
diff --git a/services/sagemakera2iruntime/pom.xml b/services/sagemakera2iruntime/pom.xml
new file mode 100644
index 000000000000..31aedf41413b
--- /dev/null
+++ b/services/sagemakera2iruntime/pom.xml
@@ -0,0 +1,60 @@
+<?xml version="1.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.
+  -->
+
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>software.amazon.awssdk</groupId>
+        <artifactId>services</artifactId>
+        <version>2.11.8-SNAPSHOT</version>
+    </parent>
+    <artifactId>sagemakera2iruntime</artifactId>
+    <name>AWS Java SDK :: Services :: SageMaker A2I Runtime</name>
+    <description>The AWS Java SDK for SageMaker A2I Runtime module holds the client classes that are used for
+        communicating with SageMaker A2I Runtime.
+    </description>
+    <url>https://aws.amazon.com/sdkforjava</url>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifestEntries>
+                            <Automatic-Module-Name>software.amazon.awssdk.services.sagemakera2iruntime</Automatic-Module-Name>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>protocol-core</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>aws-json-protocol</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/services/sagemakera2iruntime/src/main/resources/codegen-resources/paginators-1.json b/services/sagemakera2iruntime/src/main/resources/codegen-resources/paginators-1.json
new file mode 100644
index 000000000000..b19128c2626a
--- /dev/null
+++ b/services/sagemakera2iruntime/src/main/resources/codegen-resources/paginators-1.json
@@ -0,0 +1,10 @@
+{
+  "pagination": {
+    "ListHumanLoops": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "MaxResults",
+      "result_key": "HumanLoopSummaries"
+    }
+  }
+}
diff --git a/services/sagemakera2iruntime/src/main/resources/codegen-resources/service-2.json b/services/sagemakera2iruntime/src/main/resources/codegen-resources/service-2.json
new file mode 100644
index 000000000000..701d101c785e
--- /dev/null
+++ b/services/sagemakera2iruntime/src/main/resources/codegen-resources/service-2.json
@@ -0,0 +1,461 @@
+{
+  "version":"2.0",
+  "metadata":{
+    "apiVersion":"2019-11-07",
+    "endpointPrefix":"a2i-runtime.sagemaker",
+    "jsonVersion":"1.1",
+    "protocol":"rest-json",
+    "serviceFullName":"Amazon Augmented AI Runtime",
+    "serviceId":"SageMaker A2I Runtime",
+    "signatureVersion":"v4",
+    "signingName":"sagemaker",
+    "uid":"sagemaker-a2i-runtime-2019-11-07"
+  },
+  "operations":{
+    "DeleteHumanLoop":{
+      "name":"DeleteHumanLoop",
+      "http":{
+        "method":"DELETE",
+        "requestUri":"/human-loops/{HumanLoopName}"
+      },
+      "input":{"shape":"DeleteHumanLoopRequest"},
+      "output":{"shape":"DeleteHumanLoopResponse"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Deletes the specified human loop for a flow definition.</p>"
+    },
+    "DescribeHumanLoop":{
+      "name":"DescribeHumanLoop",
+      "http":{
+        "method":"GET",
+        "requestUri":"/human-loops/{HumanLoopName}"
+      },
+      "input":{"shape":"DescribeHumanLoopRequest"},
+      "output":{"shape":"DescribeHumanLoopResponse"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Returns information about the specified human loop.</p>"
+    },
+    "ListHumanLoops":{
+      "name":"ListHumanLoops",
+      "http":{
+        "method":"GET",
+        "requestUri":"/human-loops"
+      },
+      "input":{"shape":"ListHumanLoopsRequest"},
+      "output":{"shape":"ListHumanLoopsResponse"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Returns information about human loops, given the specified parameters. If a human loop was deleted, it will not be included.</p>"
+    },
+    "StartHumanLoop":{
+      "name":"StartHumanLoop",
+      "http":{
+        "method":"POST",
+        "requestUri":"/human-loops"
+      },
+      "input":{"shape":"StartHumanLoopRequest"},
+      "output":{"shape":"StartHumanLoopResponse"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"ServiceQuotaExceededException"},
+        {"shape":"InternalServerException"},
+        {"shape":"ConflictException"}
+      ],
+      "documentation":"<p>Starts a human loop, provided that at least one activation condition is met.</p>"
+    },
+    "StopHumanLoop":{
+      "name":"StopHumanLoop",
+      "http":{
+        "method":"POST",
+        "requestUri":"/human-loops/stop"
+      },
+      "input":{"shape":"StopHumanLoopRequest"},
+      "output":{"shape":"StopHumanLoopResponse"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Stops the specified human loop.</p>"
+    }
+  },
+  "shapes":{
+    "ConflictException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"FailureReason"}
+      },
+      "documentation":"<p>Your request has the same name as another active human loop but has different input data. You cannot start two human loops with the same name and different input data.</p>",
+      "error":{"httpStatusCode":409},
+      "exception":true
+    },
+    "ContentClassifier":{
+      "type":"string",
+      "enum":[
+        "FreeOfPersonallyIdentifiableInformation",
+        "FreeOfAdultContent"
+      ]
+    },
+    "ContentClassifiers":{
+      "type":"list",
+      "member":{"shape":"ContentClassifier"},
+      "max":256
+    },
+    "DeleteHumanLoopRequest":{
+      "type":"structure",
+      "required":["HumanLoopName"],
+      "members":{
+        "HumanLoopName":{
+          "shape":"HumanLoopName",
+          "documentation":"<p>The name of the human loop you want to delete.</p>",
+          "location":"uri",
+          "locationName":"HumanLoopName"
+        }
+      }
+    },
+    "DeleteHumanLoopResponse":{
+      "type":"structure",
+      "members":{
+      }
+    },
+    "DescribeHumanLoopRequest":{
+      "type":"structure",
+      "required":["HumanLoopName"],
+      "members":{
+        "HumanLoopName":{
+          "shape":"HumanLoopName",
+          "documentation":"<p>The unique name of the human loop.</p>",
+          "location":"uri",
+          "locationName":"HumanLoopName"
+        }
+      }
+    },
+    "DescribeHumanLoopResponse":{
+      "type":"structure",
+      "required":[
+        "CreationTime",
+        "HumanLoopStatus",
+        "HumanLoopName",
+        "HumanLoopArn",
+        "FlowDefinitionArn"
+      ],
+      "members":{
+        "CreationTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>The creation time when Amazon Augmented AI created the human loop.</p>"
+        },
+        "FailureReason":{
+          "shape":"String",
+          "documentation":"<p>The reason why a human loop has failed. The failure reason is returned when the human loop status is <code>Failed</code>.</p>"
+        },
+        "FailureCode":{
+          "shape":"String",
+          "documentation":"<p>A failure code denoting a specific type of failure.</p>"
+        },
+        "HumanLoopStatus":{
+          "shape":"HumanLoopStatus",
+          "documentation":"<p>The status of the human loop. Valid values:</p>"
+        },
+        "HumanLoopName":{
+          "shape":"HumanLoopName",
+          "documentation":"<p>The name of the human loop.</p>"
+        },
+        "HumanLoopArn":{
+          "shape":"HumanLoopArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the human loop.</p>"
+        },
+        "FlowDefinitionArn":{
+          "shape":"FlowDefinitionArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the flow definition.</p>"
+        },
+        "HumanLoopOutput":{
+          "shape":"HumanLoopOutput",
+          "documentation":"<p>An object containing information about the output of the human loop.</p>"
+        }
+      }
+    },
+    "FailureReason":{
+      "type":"string",
+      "max":1024
+    },
+    "FlowDefinitionArn":{
+      "type":"string",
+      "max":1024,
+      "pattern":"arn:aws[a-z\\-]*:sagemaker:[a-z0-9\\-]*:[0-9]{12}:flow-definition/.*"
+    },
+    "HumanLoopArn":{
+      "type":"string",
+      "max":1024,
+      "pattern":"arn:aws[a-z\\-]*:sagemaker:[a-z0-9\\-]*:[0-9]{12}:human-loop/.*"
+    },
+    "HumanLoopDataAttributes":{
+      "type":"structure",
+      "required":["ContentClassifiers"],
+      "members":{
+        "ContentClassifiers":{
+          "shape":"ContentClassifiers",
+          "documentation":"<p>Declares that your content is free of personally identifiable information or adult content.</p> <p>Amazon SageMaker can restrict the Amazon Mechanical Turk workers who can view your task based on this information.</p>"
+        }
+      },
+      "documentation":"<p>Attributes of the data specified by the customer. Use these to describe the data to be labeled.</p>"
+    },
+    "HumanLoopInput":{
+      "type":"structure",
+      "required":["InputContent"],
+      "members":{
+        "InputContent":{
+          "shape":"InputContent",
+          "documentation":"<p>Serialized input from the human loop. The input must be a string representation of a file in JSON format.</p>"
+        }
+      },
+      "documentation":"<p>An object containing the human loop input in JSON format.</p>"
+    },
+    "HumanLoopName":{
+      "type":"string",
+      "max":63,
+      "min":1,
+      "pattern":"^[a-z0-9](-*[a-z0-9])*$"
+    },
+    "HumanLoopOutput":{
+      "type":"structure",
+      "required":["OutputS3Uri"],
+      "members":{
+        "OutputS3Uri":{
+          "shape":"String",
+          "documentation":"<p>The location of the Amazon S3 object where Amazon Augmented AI stores your human loop output.</p>"
+        }
+      },
+      "documentation":"<p>Information about where the human output will be stored.</p>"
+    },
+    "HumanLoopStatus":{
+      "type":"string",
+      "enum":[
+        "InProgress",
+        "Failed",
+        "Completed",
+        "Stopped",
+        "Stopping"
+      ]
+    },
+    "HumanLoopSummaries":{
+      "type":"list",
+      "member":{"shape":"HumanLoopSummary"}
+    },
+    "HumanLoopSummary":{
+      "type":"structure",
+      "members":{
+        "HumanLoopName":{
+          "shape":"HumanLoopName",
+          "documentation":"<p>The name of the human loop.</p>"
+        },
+        "HumanLoopStatus":{
+          "shape":"HumanLoopStatus",
+          "documentation":"<p>The status of the human loop. Valid values:</p>"
+        },
+        "CreationTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>When Amazon Augmented AI created the human loop.</p>"
+        },
+        "FailureReason":{
+          "shape":"FailureReason",
+          "documentation":"<p>The reason why the human loop failed. A failure reason is returned only when the status of the human loop is <code>Failed</code>.</p>"
+        },
+        "FlowDefinitionArn":{
+          "shape":"FlowDefinitionArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the flow definition.</p>"
+        }
+      },
+      "documentation":"<p>Summary information about the human loop.</p>"
+    },
+    "InputContent":{
+      "type":"string",
+      "max":4194304
+    },
+    "InternalServerException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"FailureReason"}
+      },
+      "documentation":"<p>Your request could not be processed.</p>",
+      "error":{"httpStatusCode":500},
+      "exception":true
+    },
+    "ListHumanLoopsRequest":{
+      "type":"structure",
+      "required":["FlowDefinitionArn"],
+      "members":{
+        "CreationTimeAfter":{
+          "shape":"Timestamp",
+          "documentation":"<p>(Optional) The timestamp of the date when you want the human loops to begin in ISO 8601 format. For example, <code>2020-02-24</code>.</p>",
+          "location":"querystring",
+          "locationName":"CreationTimeAfter"
+        },
+        "CreationTimeBefore":{
+          "shape":"Timestamp",
+          "documentation":"<p>(Optional) The timestamp of the date before which you want the human loops to begin in ISO 8601 format. For example, <code>2020-02-24</code>.</p>",
+          "location":"querystring",
+          "locationName":"CreationTimeBefore"
+        },
+        "FlowDefinitionArn":{
+          "shape":"FlowDefinitionArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of a flow definition.</p>",
+          "location":"querystring",
+          "locationName":"FlowDefinitionArn"
+        },
+        "SortOrder":{
+          "shape":"SortOrder",
+          "documentation":"<p>An optional value that specifies whether you want the results sorted in <code>Ascending</code> or <code>Descending</code> order.</p>",
+          "location":"querystring",
+          "locationName":"SortOrder"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>A token to resume pagination.</p>",
+          "location":"querystring",
+          "locationName":"NextToken"
+        },
+        "MaxResults":{
+          "shape":"MaxResults",
+          "documentation":"<p>The total number of items to return. If the total number of available items is more than the value specified in <code>MaxResults</code>, then a <code>NextToken</code> will be provided in the output that you can use to resume pagination.</p>",
+          "box":true,
+          "location":"querystring",
+          "locationName":"MaxResults"
+        }
+      }
+    },
+    "ListHumanLoopsResponse":{
+      "type":"structure",
+      "required":["HumanLoopSummaries"],
+      "members":{
+        "HumanLoopSummaries":{
+          "shape":"HumanLoopSummaries",
+          "documentation":"<p>An array of objects containing information about the human loops.</p>"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>A token to resume pagination.</p>"
+        }
+      }
+    },
+    "MaxResults":{
+      "type":"integer",
+      "max":100,
+      "min":1
+    },
+    "NextToken":{
+      "type":"string",
+      "max":8192,
+      "pattern":".*"
+    },
+    "ResourceNotFoundException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"FailureReason"}
+      },
+      "documentation":"<p>We were unable to find the requested resource.</p>",
+      "error":{"httpStatusCode":404},
+      "exception":true
+    },
+    "ServiceQuotaExceededException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"FailureReason"}
+      },
+      "documentation":"<p>You have exceeded your service quota. To perform the requested action, remove some of the relevant resources, or request a service quota increase.</p>",
+      "error":{"httpStatusCode":402},
+      "exception":true
+    },
+    "SortOrder":{
+      "type":"string",
+      "enum":[
+        "Ascending",
+        "Descending"
+      ]
+    },
+    "StartHumanLoopRequest":{
+      "type":"structure",
+      "required":[
+        "HumanLoopName",
+        "FlowDefinitionArn",
+        "HumanLoopInput"
+      ],
+      "members":{
+        "HumanLoopName":{
+          "shape":"HumanLoopName",
+          "documentation":"<p>The name of the human loop.</p>"
+        },
+        "FlowDefinitionArn":{
+          "shape":"FlowDefinitionArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the flow definition.</p>"
+        },
+        "HumanLoopInput":{
+          "shape":"HumanLoopInput",
+          "documentation":"<p>An object containing information about the human loop.</p>"
+        },
+        "DataAttributes":{
+          "shape":"HumanLoopDataAttributes",
+          "documentation":"<p>Attributes of the data specified by the customer.</p>"
+        }
+      }
+    },
+    "StartHumanLoopResponse":{
+      "type":"structure",
+      "members":{
+        "HumanLoopArn":{
+          "shape":"HumanLoopArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the human loop.</p>"
+        }
+      }
+    },
+    "StopHumanLoopRequest":{
+      "type":"structure",
+      "required":["HumanLoopName"],
+      "members":{
+        "HumanLoopName":{
+          "shape":"HumanLoopName",
+          "documentation":"<p>The name of the human loop you want to stop.</p>"
+        }
+      }
+    },
+    "StopHumanLoopResponse":{
+      "type":"structure",
+      "members":{
+      }
+    },
+    "String":{"type":"string"},
+    "ThrottlingException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"FailureReason"}
+      },
+      "documentation":"<p>Your request has exceeded the allowed amount of requests.</p>",
+      "error":{"httpStatusCode":429},
+      "exception":true
+    },
+    "Timestamp":{"type":"timestamp"},
+    "ValidationException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"FailureReason"}
+      },
+      "documentation":"<p>Your request was not valid. Check the syntax and try again.</p>",
+      "error":{"httpStatusCode":400},
+      "exception":true
+    }
+  },
+  "documentation":"<p>Amazon Augmented AI (Augmented AI) (Preview) is a service that adds human judgment to any machine learning application. Human reviewers can take over when an AI application can't evaluate data with a high degree of confidence.</p> <p>From fraudulent bank transaction identification to document processing to image analysis, machine learning models can be trained to make decisions as well as or better than a human. Nevertheless, some decisions require contextual interpretation, such as when you need to decide whether an image is appropriate for a given audience. Content moderation guidelines are nuanced and highly dependent on context, and they vary between countries. When trying to apply AI in these situations, you can be forced to choose between \"ML only\" systems with unacceptably high error rates or \"human only\" systems that are expensive and difficult to scale, and that slow down decision making.</p> <p>This API reference includes information about API actions and data types you can use to interact with Augmented AI programmatically. </p> <p>You can create a flow definition against the Augmented AI API. Provide the Amazon Resource Name (ARN) of a flow definition to integrate AI service APIs, such as <code>Textract.AnalyzeDocument</code> and <code>Rekognition.DetectModerationLabels</code>. These AI services, in turn, invoke the <a>StartHumanLoop</a> API, which evaluates conditions under which humans will be invoked. If humans are required, Augmented AI creates a human loop. Results of human work are available asynchronously in Amazon Simple Storage Service (Amazon S3). You can use Amazon CloudWatch Events to detect human work results.</p> <p>You can find additional Augmented AI API documentation in the following reference guides: <a href=\"https://docs.aws.amazon.com/rekognition/latest/dg/API_Reference.html\">Amazon Rekognition</a>, <a href=\"https://docs.aws.amazon.com/sagemaker/latest/dg/API_Reference.html\">Amazon SageMaker</a>, and <a href=\"https://docs.aws.amazon.com/textract/latest/dg/API_Reference.html\">Amazon Textract</a>.</p>"
+}
diff --git a/services/sagemakerruntime/pom.xml b/services/sagemakerruntime/pom.xml
index 32a880718d48..cb2db7011048 100644
--- a/services/sagemakerruntime/pom.xml
+++ b/services/sagemakerruntime/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>sagemakerruntime</artifactId>
     <name>AWS Java SDK :: Services :: SageMaker Runtime</name>
diff --git a/services/sagemakerruntime/src/main/resources/codegen-resources/service-2.json b/services/sagemakerruntime/src/main/resources/codegen-resources/service-2.json
index 6de0f98bd862..41224d5ffce4 100644
--- a/services/sagemakerruntime/src/main/resources/codegen-resources/service-2.json
+++ b/services/sagemakerruntime/src/main/resources/codegen-resources/service-2.json
@@ -26,7 +26,7 @@
         {"shape":"ValidationError"},
         {"shape":"ModelError"}
       ],
-      "documentation":"<p>After you deploy a model into production using Amazon SageMaker hosting services, your client applications use this API to get inferences from the model hosted at the specified endpoint. </p> <p>For an overview of Amazon SageMaker, see <a href=\"http://docs.aws.amazon.com/sagemaker/latest/dg/how-it-works.html\">How It Works</a>. </p> <p>Amazon SageMaker strips all POST headers except those supported by the API. Amazon SageMaker might add additional headers. You should not rely on the behavior of headers outside those enumerated in the request syntax. </p> <p>Cals to <code>InvokeEndpoint</code> are authenticated by using AWS Signature Version 4. For information, see <a href=\"http://docs.aws.amazon.com/AmazonS3/latest/API/sig-v4-authenticating-requests.html\">Authenticating Requests (AWS Signature Version 4)</a> in the <i>Amazon S3 API Reference</i>.</p> <note> <p>Endpoints are scoped to an individual account, and are not public. The URL does not contain the account ID, but Amazon SageMaker determines the account ID from the authentication token that is supplied by the caller.</p> </note>"
+      "documentation":"<p>After you deploy a model into production using Amazon SageMaker hosting services, your client applications use this API to get inferences from the model hosted at the specified endpoint. </p> <p>For an overview of Amazon SageMaker, see <a href=\"https://docs.aws.amazon.com/sagemaker/latest/dg/how-it-works.html\">How It Works</a>. </p> <p>Amazon SageMaker strips all POST headers except those supported by the API. Amazon SageMaker might add additional headers. You should not rely on the behavior of headers outside those enumerated in the request syntax. </p> <p>Calls to <code>InvokeEndpoint</code> are authenticated by using AWS Signature Version 4. For information, see <a href=\"http://docs.aws.amazon.com/AmazonS3/latest/API/sig-v4-authenticating-requests.html\">Authenticating Requests (AWS Signature Version 4)</a> in the <i>Amazon S3 API Reference</i>.</p> <p>A customer's model containers must respond to requests within 60 seconds. The model itself can have a maximum processing time of 60 seconds before responding to the /invocations. If your model is going to take 50-60 seconds of processing time, the SDK socket timeout should be set to be 70 seconds.</p> <note> <p>Endpoints are scoped to an individual account, and are not public. The URL does not contain the account ID, but Amazon SageMaker determines the account ID from the authentication token that is supplied by the caller.</p> </note>"
     }
   },
   "shapes":{
@@ -38,6 +38,7 @@
     "CustomAttributesHeader":{
       "type":"string",
       "max":1024,
+      "pattern":"\\p{ASCII}*",
       "sensitive":true
     },
     "EndpointName":{
@@ -47,7 +48,8 @@
     },
     "Header":{
       "type":"string",
-      "max":1024
+      "max":1024,
+      "pattern":"\\p{ASCII}*"
     },
     "InternalFailure":{
       "type":"structure",
@@ -69,13 +71,13 @@
       "members":{
         "EndpointName":{
           "shape":"EndpointName",
-          "documentation":"<p>The name of the endpoint that you specified when you created the endpoint using the <a href=\"http://docs.aws.amazon.com/sagemaker/latest/dg/API_CreateEndpoint.html\">CreateEndpoint</a> API. </p>",
+          "documentation":"<p>The name of the endpoint that you specified when you created the endpoint using the <a href=\"https://docs.aws.amazon.com/sagemaker/latest/dg/API_CreateEndpoint.html\">CreateEndpoint</a> API. </p>",
           "location":"uri",
           "locationName":"EndpointName"
         },
         "Body":{
           "shape":"BodyBlob",
-          "documentation":"<p>Provides input data, in the format specified in the <code>ContentType</code> request header. Amazon SageMaker passes all of the data in the body to the model. </p> <p>For information about the format of the request body, see <a href=\"http://docs.aws.amazon.com/sagemaker/latest/dg/cdf-inference.html\">Common Data Formats—Inference</a>.</p>"
+          "documentation":"<p>Provides input data, in the format specified in the <code>ContentType</code> request header. Amazon SageMaker passes all of the data in the body to the model. </p> <p>For information about the format of the request body, see <a href=\"https://docs.aws.amazon.com/sagemaker/latest/dg/cdf-inference.html\">Common Data Formats—Inference</a>.</p>"
         },
         "ContentType":{
           "shape":"Header",
@@ -91,9 +93,15 @@
         },
         "CustomAttributes":{
           "shape":"CustomAttributesHeader",
-          "documentation":"<p/>",
+          "documentation":"<p>Provides additional information about a request for an inference submitted to a model hosted at an Amazon SageMaker endpoint. The information is an opaque value that is forwarded verbatim. You could use this value, for example, to provide an ID that you can use to track a request or to provide other metadata that a service endpoint was programmed to process. The value must consist of no more than 1024 visible US-ASCII characters as specified in <a href=\"https://tools.ietf.org/html/rfc7230#section-3.2.6\">Section 3.3.6. Field Value Components</a> of the Hypertext Transfer Protocol (HTTP/1.1). This feature is currently supported in the AWS SDKs but not in the Amazon SageMaker Python SDK.</p>",
           "location":"header",
           "locationName":"X-Amzn-SageMaker-Custom-Attributes"
+        },
+        "TargetModel":{
+          "shape":"TargetModelHeader",
+          "documentation":"<p>Specifies the model to be requested for an inference when invoking a multi-model endpoint. </p>",
+          "location":"header",
+          "locationName":"X-Amzn-SageMaker-Target-Model"
         }
       },
       "payload":"Body"
@@ -104,7 +112,7 @@
       "members":{
         "Body":{
           "shape":"BodyBlob",
-          "documentation":"<p>Includes the inference provided by the model.</p> <p>For information about the format of the response body, see <a href=\"http://docs.aws.amazon.com/sagemaker/latest/dg/cdf-inference.html\">Common Data Formats—Inference</a>.</p>"
+          "documentation":"<p>Includes the inference provided by the model.</p> <p>For information about the format of the response body, see <a href=\"https://docs.aws.amazon.com/sagemaker/latest/dg/cdf-inference.html\">Common Data Formats—Inference</a>.</p>"
         },
         "ContentType":{
           "shape":"Header",
@@ -120,7 +128,7 @@
         },
         "CustomAttributes":{
           "shape":"CustomAttributesHeader",
-          "documentation":"<p/>",
+          "documentation":"<p>Provides additional information in the response about the inference returned by a model hosted at an Amazon SageMaker endpoint. The information is an opaque value that is forwarded verbatim. You could use this value, for example, to return an ID received in the <code>CustomAttributes</code> header of a request or other metadata that a service endpoint was programmed to produce. The value must consist of no more than 1024 visible US-ASCII characters as specified in <a href=\"https://tools.ietf.org/html/rfc7230#section-3.2.6\">Section 3.3.6. Field Value Components</a> of the Hypertext Transfer Protocol (HTTP/1.1). If the customer wants the custom attribute returned, the model must set the custom attribute to be included on the way back. </p> <p>This feature is currently supported in the AWS SDKs but not in the Amazon SageMaker Python SDK.</p>",
           "location":"header",
           "locationName":"X-Amzn-SageMaker-Custom-Attributes"
         }
@@ -149,7 +157,7 @@
           "documentation":"<p> The Amazon Resource Name (ARN) of the log stream. </p>"
         }
       },
-      "documentation":"<p> Model (owned by the customer in the container) returned an error 500. </p>",
+      "documentation":"<p> Model (owned by the customer in the container) returned 4xx or 5xx error code. </p>",
       "error":{"httpStatusCode":424},
       "exception":true
     },
@@ -165,6 +173,12 @@
       "synthetic":true
     },
     "StatusCode":{"type":"integer"},
+    "TargetModelHeader":{
+      "type":"string",
+      "max":1024,
+      "min":1,
+      "pattern":"\\A\\S[\\p{Print}]*\\z"
+    },
     "ValidationError":{
       "type":"structure",
       "members":{
diff --git a/services/savingsplans/pom.xml b/services/savingsplans/pom.xml
new file mode 100644
index 000000000000..78c4f90dcebc
--- /dev/null
+++ b/services/savingsplans/pom.xml
@@ -0,0 +1,60 @@
+<?xml version="1.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.
+  -->
+
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>software.amazon.awssdk</groupId>
+        <artifactId>services</artifactId>
+        <version>2.11.8-SNAPSHOT</version>
+    </parent>
+    <artifactId>savingsplans</artifactId>
+    <name>AWS Java SDK :: Services :: Savingsplans</name>
+    <description>The AWS Java SDK for Savingsplans module holds the client classes that are used for
+        communicating with Savingsplans.
+    </description>
+    <url>https://aws.amazon.com/sdkforjava</url>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifestEntries>
+                            <Automatic-Module-Name>software.amazon.awssdk.services.savingsplans</Automatic-Module-Name>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>protocol-core</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>aws-json-protocol</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/services/savingsplans/src/main/resources/codegen-resources/paginators-1.json b/services/savingsplans/src/main/resources/codegen-resources/paginators-1.json
new file mode 100644
index 000000000000..5677bd8e4a2d
--- /dev/null
+++ b/services/savingsplans/src/main/resources/codegen-resources/paginators-1.json
@@ -0,0 +1,4 @@
+{
+  "pagination": {
+  }
+}
diff --git a/services/savingsplans/src/main/resources/codegen-resources/service-2.json b/services/savingsplans/src/main/resources/codegen-resources/service-2.json
new file mode 100644
index 000000000000..7287a3b9697e
--- /dev/null
+++ b/services/savingsplans/src/main/resources/codegen-resources/service-2.json
@@ -0,0 +1,1135 @@
+{
+  "version":"2.0",
+  "metadata":{
+    "apiVersion":"2019-06-28",
+    "endpointPrefix":"savingsplans",
+    "globalEndpoint":"savingsplans.amazonaws.com",
+    "jsonVersion":"1.0",
+    "protocol":"rest-json",
+    "serviceAbbreviation":"AWSSavingsPlans",
+    "serviceFullName":"AWS Savings Plans",
+    "serviceId":"savingsplans",
+    "signatureVersion":"v4",
+    "uid":"savingsplans-2019-06-28"
+  },
+  "operations":{
+    "CreateSavingsPlan":{
+      "name":"CreateSavingsPlan",
+      "http":{
+        "method":"POST",
+        "requestUri":"/CreateSavingsPlan"
+      },
+      "input":{"shape":"CreateSavingsPlanRequest"},
+      "output":{"shape":"CreateSavingsPlanResponse"},
+      "errors":[
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ValidationException"},
+        {"shape":"InternalServerException"},
+        {"shape":"ServiceQuotaExceededException"}
+      ],
+      "documentation":"<p>Creates a Savings Plan.</p>"
+    },
+    "DescribeSavingsPlanRates":{
+      "name":"DescribeSavingsPlanRates",
+      "http":{
+        "method":"POST",
+        "requestUri":"/DescribeSavingsPlanRates"
+      },
+      "input":{"shape":"DescribeSavingsPlanRatesRequest"},
+      "output":{"shape":"DescribeSavingsPlanRatesResponse"},
+      "errors":[
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ValidationException"}
+      ],
+      "documentation":"<p>Describes the specified Savings Plans rates.</p>"
+    },
+    "DescribeSavingsPlans":{
+      "name":"DescribeSavingsPlans",
+      "http":{
+        "method":"POST",
+        "requestUri":"/DescribeSavingsPlans"
+      },
+      "input":{"shape":"DescribeSavingsPlansRequest"},
+      "output":{"shape":"DescribeSavingsPlansResponse"},
+      "errors":[
+        {"shape":"InternalServerException"},
+        {"shape":"ValidationException"}
+      ],
+      "documentation":"<p>Describes the specified Savings Plans.</p>"
+    },
+    "DescribeSavingsPlansOfferingRates":{
+      "name":"DescribeSavingsPlansOfferingRates",
+      "http":{
+        "method":"POST",
+        "requestUri":"/DescribeSavingsPlansOfferingRates"
+      },
+      "input":{"shape":"DescribeSavingsPlansOfferingRatesRequest"},
+      "output":{"shape":"DescribeSavingsPlansOfferingRatesResponse"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Describes the specified Savings Plans offering rates.</p>"
+    },
+    "DescribeSavingsPlansOfferings":{
+      "name":"DescribeSavingsPlansOfferings",
+      "http":{
+        "method":"POST",
+        "requestUri":"/DescribeSavingsPlansOfferings"
+      },
+      "input":{"shape":"DescribeSavingsPlansOfferingsRequest"},
+      "output":{"shape":"DescribeSavingsPlansOfferingsResponse"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Describes the specified Savings Plans offerings.</p>"
+    },
+    "ListTagsForResource":{
+      "name":"ListTagsForResource",
+      "http":{
+        "method":"POST",
+        "requestUri":"/ListTagsForResource"
+      },
+      "input":{"shape":"ListTagsForResourceRequest"},
+      "output":{"shape":"ListTagsForResourceResponse"},
+      "errors":[
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ValidationException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Lists the tags for the specified resource.</p>"
+    },
+    "TagResource":{
+      "name":"TagResource",
+      "http":{
+        "method":"POST",
+        "requestUri":"/TagResource"
+      },
+      "input":{"shape":"TagResourceRequest"},
+      "output":{"shape":"TagResourceResponse"},
+      "errors":[
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ServiceQuotaExceededException"},
+        {"shape":"ValidationException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Adds the specified tags to the specified resource.</p>"
+    },
+    "UntagResource":{
+      "name":"UntagResource",
+      "http":{
+        "method":"POST",
+        "requestUri":"/UntagResource"
+      },
+      "input":{"shape":"UntagResourceRequest"},
+      "output":{"shape":"UntagResourceResponse"},
+      "errors":[
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ValidationException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Removes the specified tags from the specified resource.</p>"
+    }
+  },
+  "shapes":{
+    "Amount":{"type":"string"},
+    "ClientToken":{"type":"string"},
+    "CreateSavingsPlanRequest":{
+      "type":"structure",
+      "required":[
+        "savingsPlanOfferingId",
+        "commitment"
+      ],
+      "members":{
+        "savingsPlanOfferingId":{
+          "shape":"SavingsPlanOfferingId",
+          "documentation":"<p>The ID of the offering.</p>"
+        },
+        "commitment":{
+          "shape":"Amount",
+          "documentation":"<p>The hourly commitment, in USD. This is a value between 0.001 and 1 million. You cannot specify more than three digits after the decimal point.</p>"
+        },
+        "upfrontPaymentAmount":{
+          "shape":"Amount",
+          "documentation":"<p>The up-front payment amount. This is a whole number between 50 and 99 percent of the total value of the Savings Plan. This parameter is supported only if the payment option is <code>Partial Upfront</code>.</p>"
+        },
+        "clientToken":{
+          "shape":"ClientToken",
+          "documentation":"<p>Unique, case-sensitive identifier that you provide to ensure the idempotency of the request.</p>",
+          "idempotencyToken":true
+        },
+        "tags":{
+          "shape":"TagMap",
+          "documentation":"<p>One or more tags.</p>"
+        }
+      }
+    },
+    "CreateSavingsPlanResponse":{
+      "type":"structure",
+      "members":{
+        "savingsPlanId":{
+          "shape":"SavingsPlanId",
+          "documentation":"<p>The ID of the Savings Plan.</p>"
+        }
+      }
+    },
+    "CurrencyCode":{
+      "type":"string",
+      "enum":[
+        "CNY",
+        "USD"
+      ]
+    },
+    "CurrencyList":{
+      "type":"list",
+      "member":{"shape":"CurrencyCode"}
+    },
+    "DescribeSavingsPlanRatesRequest":{
+      "type":"structure",
+      "required":["savingsPlanId"],
+      "members":{
+        "savingsPlanId":{
+          "shape":"SavingsPlanId",
+          "documentation":"<p>The ID of the Savings Plan.</p>"
+        },
+        "filters":{
+          "shape":"SavingsPlanRateFilterList",
+          "documentation":"<p>The filters.</p>"
+        },
+        "nextToken":{
+          "shape":"PaginationToken",
+          "documentation":"<p>The token for the next page of results.</p>"
+        },
+        "maxResults":{
+          "shape":"MaxResults",
+          "documentation":"<p>The maximum number of results to return with a single call. To retrieve additional results, make another call with the returned token value.</p>"
+        }
+      }
+    },
+    "DescribeSavingsPlanRatesResponse":{
+      "type":"structure",
+      "members":{
+        "savingsPlanId":{
+          "shape":"SavingsPlanId",
+          "documentation":"<p>The ID of the Savings Plan.</p>"
+        },
+        "searchResults":{
+          "shape":"SavingsPlanRateList",
+          "documentation":"<p>Information about the Savings Plans rates.</p>"
+        },
+        "nextToken":{
+          "shape":"PaginationToken",
+          "documentation":"<p>The token to use to retrieve the next page of results. This value is null when there are no more results to return.</p>"
+        }
+      }
+    },
+    "DescribeSavingsPlansOfferingRatesRequest":{
+      "type":"structure",
+      "members":{
+        "savingsPlanOfferingIds":{
+          "shape":"UUIDs",
+          "documentation":"<p>The IDs of the offerings.</p>"
+        },
+        "savingsPlanPaymentOptions":{
+          "shape":"SavingsPlanPaymentOptionList",
+          "documentation":"<p>The payment options.</p>"
+        },
+        "savingsPlanTypes":{
+          "shape":"SavingsPlanTypeList",
+          "documentation":"<p>The plan types.</p>"
+        },
+        "products":{
+          "shape":"SavingsPlanProductTypeList",
+          "documentation":"<p>The AWS products.</p>"
+        },
+        "serviceCodes":{
+          "shape":"SavingsPlanRateServiceCodeList",
+          "documentation":"<p>The services.</p>"
+        },
+        "usageTypes":{
+          "shape":"SavingsPlanRateUsageTypeList",
+          "documentation":"<p>The usage details of the line item in the billing report.</p>"
+        },
+        "operations":{
+          "shape":"SavingsPlanRateOperationList",
+          "documentation":"<p>The specific AWS operation for the line item in the billing report.</p>"
+        },
+        "filters":{
+          "shape":"SavingsPlanOfferingRateFiltersList",
+          "documentation":"<p>The filters.</p>"
+        },
+        "nextToken":{
+          "shape":"PaginationToken",
+          "documentation":"<p>The token for the next page of results.</p>"
+        },
+        "maxResults":{
+          "shape":"PageSize",
+          "documentation":"<p>The maximum number of results to return with a single call. To retrieve additional results, make another call with the returned token value.</p>"
+        }
+      }
+    },
+    "DescribeSavingsPlansOfferingRatesResponse":{
+      "type":"structure",
+      "members":{
+        "searchResults":{
+          "shape":"SavingsPlanOfferingRatesList",
+          "documentation":"<p>Information about the Savings Plans offering rates.</p>"
+        },
+        "nextToken":{
+          "shape":"PaginationToken",
+          "documentation":"<p>The token to use to retrieve the next page of results. This value is null when there are no more results to return.</p>"
+        }
+      }
+    },
+    "DescribeSavingsPlansOfferingsRequest":{
+      "type":"structure",
+      "members":{
+        "offeringIds":{
+          "shape":"UUIDs",
+          "documentation":"<p>The IDs of the offerings.</p>"
+        },
+        "paymentOptions":{
+          "shape":"SavingsPlanPaymentOptionList",
+          "documentation":"<p>The payment options.</p>"
+        },
+        "productType":{
+          "shape":"SavingsPlanProductType",
+          "documentation":"<p>The product type.</p>"
+        },
+        "planTypes":{
+          "shape":"SavingsPlanTypeList",
+          "documentation":"<p>The plan type.</p>"
+        },
+        "durations":{
+          "shape":"DurationsList",
+          "documentation":"<p>The durations, in seconds.</p>"
+        },
+        "currencies":{
+          "shape":"CurrencyList",
+          "documentation":"<p>The currencies.</p>"
+        },
+        "descriptions":{
+          "shape":"SavingsPlanDescriptionsList",
+          "documentation":"<p>The descriptions.</p>"
+        },
+        "serviceCodes":{
+          "shape":"SavingsPlanServiceCodeList",
+          "documentation":"<p>The services.</p>"
+        },
+        "usageTypes":{
+          "shape":"SavingsPlanUsageTypeList",
+          "documentation":"<p>The usage details of the line item in the billing report.</p>"
+        },
+        "operations":{
+          "shape":"SavingsPlanOperationList",
+          "documentation":"<p>The specific AWS operation for the line item in the billing report.</p>"
+        },
+        "filters":{
+          "shape":"SavingsPlanOfferingFiltersList",
+          "documentation":"<p>The filters.</p>"
+        },
+        "nextToken":{
+          "shape":"PaginationToken",
+          "documentation":"<p>The token for the next page of results.</p>"
+        },
+        "maxResults":{
+          "shape":"PageSize",
+          "documentation":"<p>The maximum number of results to return with a single call. To retrieve additional results, make another call with the returned token value.</p>"
+        }
+      }
+    },
+    "DescribeSavingsPlansOfferingsResponse":{
+      "type":"structure",
+      "members":{
+        "searchResults":{
+          "shape":"SavingsPlanOfferingsList",
+          "documentation":"<p>Information about the Savings Plans offerings.</p>"
+        },
+        "nextToken":{
+          "shape":"PaginationToken",
+          "documentation":"<p>The token to use to retrieve the next page of results. This value is null when there are no more results to return.</p>"
+        }
+      }
+    },
+    "DescribeSavingsPlansRequest":{
+      "type":"structure",
+      "members":{
+        "savingsPlanArns":{
+          "shape":"SavingsPlanArnList",
+          "documentation":"<p>The Amazon Resource Names (ARN) of the Savings Plans.</p>"
+        },
+        "savingsPlanIds":{
+          "shape":"SavingsPlanIdList",
+          "documentation":"<p>The IDs of the Savings Plans.</p>"
+        },
+        "nextToken":{
+          "shape":"PaginationToken",
+          "documentation":"<p>The token for the next page of results.</p>"
+        },
+        "maxResults":{
+          "shape":"MaxResults",
+          "documentation":"<p>The maximum number of results to return with a single call. To retrieve additional results, make another call with the returned token value.</p>"
+        },
+        "states":{
+          "shape":"SavingsPlanStateList",
+          "documentation":"<p>The states.</p>"
+        },
+        "filters":{
+          "shape":"SavingsPlanFilterList",
+          "documentation":"<p>The filters.</p>"
+        }
+      }
+    },
+    "DescribeSavingsPlansResponse":{
+      "type":"structure",
+      "members":{
+        "savingsPlans":{
+          "shape":"SavingsPlanList",
+          "documentation":"<p>Information about the Savings Plans.</p>"
+        },
+        "nextToken":{
+          "shape":"PaginationToken",
+          "documentation":"<p>The token to use to retrieve the next page of results. This value is null when there are no more results to return.</p>"
+        }
+      }
+    },
+    "DurationsList":{
+      "type":"list",
+      "member":{"shape":"SavingsPlansDuration"}
+    },
+    "EC2InstanceFamily":{"type":"string"},
+    "FilterValuesList":{
+      "type":"list",
+      "member":{"shape":"JsonSafeFilterValueString"}
+    },
+    "InternalServerException":{
+      "type":"structure",
+      "required":["message"],
+      "members":{
+        "message":{"shape":"String"}
+      },
+      "documentation":"<p>An unexpected error occurred.</p>",
+      "error":{"httpStatusCode":500},
+      "exception":true
+    },
+    "JsonSafeFilterValueString":{
+      "type":"string",
+      "pattern":"^[a-zA-Z0-9_ \\/.\\:\\-\\(\\)]+$"
+    },
+    "ListOfStrings":{
+      "type":"list",
+      "member":{"shape":"String"}
+    },
+    "ListTagsForResourceRequest":{
+      "type":"structure",
+      "required":["resourceArn"],
+      "members":{
+        "resourceArn":{
+          "shape":"SavingsPlanArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the resource.</p>"
+        }
+      }
+    },
+    "ListTagsForResourceResponse":{
+      "type":"structure",
+      "members":{
+        "tags":{
+          "shape":"TagMap",
+          "documentation":"<p>Information about the tags.</p>"
+        }
+      }
+    },
+    "MaxResults":{
+      "type":"integer",
+      "max":1000,
+      "min":1
+    },
+    "PageSize":{
+      "type":"integer",
+      "max":1000,
+      "min":0
+    },
+    "PaginationToken":{
+      "type":"string",
+      "max":1024,
+      "pattern":"^[A-Za-z0-9/=\\+]+$"
+    },
+    "ParentSavingsPlanOffering":{
+      "type":"structure",
+      "members":{
+        "offeringId":{
+          "shape":"UUID",
+          "documentation":"<p>The ID of the offering.</p>"
+        },
+        "paymentOption":{
+          "shape":"SavingsPlanPaymentOption",
+          "documentation":"<p>The payment option.</p>"
+        },
+        "planType":{
+          "shape":"SavingsPlanType",
+          "documentation":"<p>The plan type.</p>"
+        },
+        "durationSeconds":{
+          "shape":"SavingsPlansDuration",
+          "documentation":"<p>The duration, in seconds.</p>"
+        },
+        "currency":{
+          "shape":"CurrencyCode",
+          "documentation":"<p>The currency.</p>"
+        },
+        "planDescription":{
+          "shape":"SavingsPlanDescription",
+          "documentation":"<p>The description.</p>"
+        }
+      },
+      "documentation":"<p>Information about a Savings Plan offering.</p>"
+    },
+    "Region":{"type":"string"},
+    "ResourceNotFoundException":{
+      "type":"structure",
+      "required":["message"],
+      "members":{
+        "message":{"shape":"String"}
+      },
+      "documentation":"<p>The specified resource was not found.</p>",
+      "error":{"httpStatusCode":404},
+      "exception":true
+    },
+    "SavingsPlan":{
+      "type":"structure",
+      "members":{
+        "offeringId":{
+          "shape":"SavingsPlanOfferingId",
+          "documentation":"<p>The ID of the offering.</p>"
+        },
+        "savingsPlanId":{
+          "shape":"SavingsPlanId",
+          "documentation":"<p>The ID of the Savings Plan.</p>"
+        },
+        "savingsPlanArn":{
+          "shape":"SavingsPlanArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the Savings Plan.</p>"
+        },
+        "description":{
+          "shape":"String",
+          "documentation":"<p>The description.</p>"
+        },
+        "start":{
+          "shape":"String",
+          "documentation":"<p>The start time.</p>"
+        },
+        "end":{
+          "shape":"String",
+          "documentation":"<p>The end time.</p>"
+        },
+        "state":{
+          "shape":"SavingsPlanState",
+          "documentation":"<p>The state.</p>"
+        },
+        "region":{
+          "shape":"Region",
+          "documentation":"<p>The AWS Region.</p>"
+        },
+        "ec2InstanceFamily":{
+          "shape":"EC2InstanceFamily",
+          "documentation":"<p>The EC2 instance family.</p>"
+        },
+        "savingsPlanType":{
+          "shape":"SavingsPlanType",
+          "documentation":"<p>The plan type.</p>"
+        },
+        "paymentOption":{
+          "shape":"SavingsPlanPaymentOption",
+          "documentation":"<p>The payment option.</p>"
+        },
+        "productTypes":{
+          "shape":"SavingsPlanProductTypeList",
+          "documentation":"<p>The product types.</p>"
+        },
+        "currency":{
+          "shape":"CurrencyCode",
+          "documentation":"<p>The currency.</p>"
+        },
+        "commitment":{
+          "shape":"Amount",
+          "documentation":"<p>The hourly commitment, in USD.</p>"
+        },
+        "upfrontPaymentAmount":{
+          "shape":"Amount",
+          "documentation":"<p>The up-front payment amount.</p>"
+        },
+        "recurringPaymentAmount":{
+          "shape":"Amount",
+          "documentation":"<p>The recurring payment amount.</p>"
+        },
+        "termDurationInSeconds":{
+          "shape":"TermDurationInSeconds",
+          "documentation":"<p>The duration of the term, in seconds.</p>"
+        },
+        "tags":{
+          "shape":"TagMap",
+          "documentation":"<p>One or more tags.</p>"
+        }
+      },
+      "documentation":"<p>Information about a Savings Plan.</p>"
+    },
+    "SavingsPlanArn":{
+      "type":"string",
+      "pattern":"arn:aws:[a-z]+:([a-z]{2}-[a-z]+-\\d{1}|):(\\d{12}):savingsplan\\/([0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12})$"
+    },
+    "SavingsPlanArnList":{
+      "type":"list",
+      "member":{"shape":"SavingsPlanArn"},
+      "max":100
+    },
+    "SavingsPlanDescription":{
+      "type":"string",
+      "pattern":"^[a-zA-Z0-9_\\- ]+$"
+    },
+    "SavingsPlanDescriptionsList":{
+      "type":"list",
+      "member":{"shape":"SavingsPlanDescription"}
+    },
+    "SavingsPlanFilter":{
+      "type":"structure",
+      "members":{
+        "name":{
+          "shape":"SavingsPlansFilterName",
+          "documentation":"<p>The filter name.</p>"
+        },
+        "values":{
+          "shape":"ListOfStrings",
+          "documentation":"<p>The filter value.</p>"
+        }
+      },
+      "documentation":"<p>Information about a filter.</p>"
+    },
+    "SavingsPlanFilterList":{
+      "type":"list",
+      "member":{"shape":"SavingsPlanFilter"}
+    },
+    "SavingsPlanId":{"type":"string"},
+    "SavingsPlanIdList":{
+      "type":"list",
+      "member":{"shape":"SavingsPlanId"}
+    },
+    "SavingsPlanList":{
+      "type":"list",
+      "member":{"shape":"SavingsPlan"}
+    },
+    "SavingsPlanOffering":{
+      "type":"structure",
+      "members":{
+        "offeringId":{
+          "shape":"UUID",
+          "documentation":"<p>The ID of the offering.</p>"
+        },
+        "productTypes":{
+          "shape":"SavingsPlanProductTypeList",
+          "documentation":"<p>The product type.</p>"
+        },
+        "planType":{
+          "shape":"SavingsPlanType",
+          "documentation":"<p>The plan type.</p>"
+        },
+        "description":{
+          "shape":"SavingsPlanDescription",
+          "documentation":"<p>The description.</p>"
+        },
+        "paymentOption":{
+          "shape":"SavingsPlanPaymentOption",
+          "documentation":"<p>The payment option.</p>"
+        },
+        "durationSeconds":{
+          "shape":"SavingsPlansDuration",
+          "documentation":"<p>The duration, in seconds.</p>"
+        },
+        "currency":{
+          "shape":"CurrencyCode",
+          "documentation":"<p>The currency.</p>"
+        },
+        "serviceCode":{
+          "shape":"SavingsPlanServiceCode",
+          "documentation":"<p>The service.</p>"
+        },
+        "usageType":{
+          "shape":"SavingsPlanUsageType",
+          "documentation":"<p>The usage details of the line item in the billing report.</p>"
+        },
+        "operation":{
+          "shape":"SavingsPlanOperation",
+          "documentation":"<p>The specific AWS operation for the line item in the billing report.</p>"
+        },
+        "properties":{
+          "shape":"SavingsPlanOfferingPropertyList",
+          "documentation":"<p>The properties.</p>"
+        }
+      },
+      "documentation":"<p>Information about a Savings Plan offering.</p>"
+    },
+    "SavingsPlanOfferingFilterAttribute":{
+      "type":"string",
+      "enum":[
+        "region",
+        "instanceFamily"
+      ]
+    },
+    "SavingsPlanOfferingFilterElement":{
+      "type":"structure",
+      "members":{
+        "name":{
+          "shape":"SavingsPlanOfferingFilterAttribute",
+          "documentation":"<p>The filter name.</p>"
+        },
+        "values":{
+          "shape":"FilterValuesList",
+          "documentation":"<p>The filter values.</p>"
+        }
+      },
+      "documentation":"<p>Information about a filter.</p>"
+    },
+    "SavingsPlanOfferingFiltersList":{
+      "type":"list",
+      "member":{"shape":"SavingsPlanOfferingFilterElement"}
+    },
+    "SavingsPlanOfferingId":{"type":"string"},
+    "SavingsPlanOfferingProperty":{
+      "type":"structure",
+      "members":{
+        "name":{
+          "shape":"SavingsPlanOfferingPropertyKey",
+          "documentation":"<p>The property name.</p>"
+        },
+        "value":{
+          "shape":"JsonSafeFilterValueString",
+          "documentation":"<p>The property value.</p>"
+        }
+      },
+      "documentation":"<p>Information about a property.</p>"
+    },
+    "SavingsPlanOfferingPropertyKey":{
+      "type":"string",
+      "enum":[
+        "region",
+        "instanceFamily"
+      ]
+    },
+    "SavingsPlanOfferingPropertyList":{
+      "type":"list",
+      "member":{"shape":"SavingsPlanOfferingProperty"}
+    },
+    "SavingsPlanOfferingRate":{
+      "type":"structure",
+      "members":{
+        "savingsPlanOffering":{
+          "shape":"ParentSavingsPlanOffering",
+          "documentation":"<p>The Savings Plan offering.</p>"
+        },
+        "rate":{
+          "shape":"SavingsPlanRatePricePerUnit",
+          "documentation":"<p>The Savings Plan rate.</p>"
+        },
+        "unit":{
+          "shape":"SavingsPlanRateUnit",
+          "documentation":"<p>The unit.</p>"
+        },
+        "productType":{
+          "shape":"SavingsPlanProductType",
+          "documentation":"<p>The product type.</p>"
+        },
+        "serviceCode":{
+          "shape":"SavingsPlanRateServiceCode",
+          "documentation":"<p>The service.</p>"
+        },
+        "usageType":{
+          "shape":"SavingsPlanRateUsageType",
+          "documentation":"<p>The usage details of the line item in the billing report.</p>"
+        },
+        "operation":{
+          "shape":"SavingsPlanRateOperation",
+          "documentation":"<p>The specific AWS operation for the line item in the billing report.</p>"
+        },
+        "properties":{
+          "shape":"SavingsPlanOfferingRatePropertyList",
+          "documentation":"<p>The properties.</p>"
+        }
+      },
+      "documentation":"<p>Information about a Savings Plan offering rate.</p>"
+    },
+    "SavingsPlanOfferingRateFilterElement":{
+      "type":"structure",
+      "members":{
+        "name":{
+          "shape":"SavingsPlanRateFilterAttribute",
+          "documentation":"<p>The filter name.</p>"
+        },
+        "values":{
+          "shape":"FilterValuesList",
+          "documentation":"<p>The filter values.</p>"
+        }
+      },
+      "documentation":"<p>Information about a filter.</p>"
+    },
+    "SavingsPlanOfferingRateFiltersList":{
+      "type":"list",
+      "member":{"shape":"SavingsPlanOfferingRateFilterElement"}
+    },
+    "SavingsPlanOfferingRateProperty":{
+      "type":"structure",
+      "members":{
+        "name":{
+          "shape":"JsonSafeFilterValueString",
+          "documentation":"<p>The property name.</p>"
+        },
+        "value":{
+          "shape":"JsonSafeFilterValueString",
+          "documentation":"<p>The property value.</p>"
+        }
+      },
+      "documentation":"<p>Information about a property.</p>"
+    },
+    "SavingsPlanOfferingRatePropertyList":{
+      "type":"list",
+      "member":{"shape":"SavingsPlanOfferingRateProperty"}
+    },
+    "SavingsPlanOfferingRatesList":{
+      "type":"list",
+      "member":{"shape":"SavingsPlanOfferingRate"}
+    },
+    "SavingsPlanOfferingsList":{
+      "type":"list",
+      "member":{"shape":"SavingsPlanOffering"}
+    },
+    "SavingsPlanOperation":{
+      "type":"string",
+      "max":255,
+      "pattern":"^[a-zA-Z0-9_ \\/.:-]*$"
+    },
+    "SavingsPlanOperationList":{
+      "type":"list",
+      "member":{"shape":"SavingsPlanOperation"}
+    },
+    "SavingsPlanPaymentOption":{
+      "type":"string",
+      "enum":[
+        "All Upfront",
+        "Partial Upfront",
+        "No Upfront"
+      ]
+    },
+    "SavingsPlanPaymentOptionList":{
+      "type":"list",
+      "member":{"shape":"SavingsPlanPaymentOption"}
+    },
+    "SavingsPlanProductType":{
+      "type":"string",
+      "enum":[
+        "EC2",
+        "Fargate",
+        "Lambda"
+      ]
+    },
+    "SavingsPlanProductTypeList":{
+      "type":"list",
+      "member":{"shape":"SavingsPlanProductType"}
+    },
+    "SavingsPlanRate":{
+      "type":"structure",
+      "members":{
+        "rate":{
+          "shape":"Amount",
+          "documentation":"<p>The rate.</p>"
+        },
+        "currency":{
+          "shape":"CurrencyCode",
+          "documentation":"<p>The currency.</p>"
+        },
+        "unit":{
+          "shape":"SavingsPlanRateUnit",
+          "documentation":"<p>The unit.</p>"
+        },
+        "productType":{
+          "shape":"SavingsPlanProductType",
+          "documentation":"<p>The product type.</p>"
+        },
+        "serviceCode":{
+          "shape":"SavingsPlanRateServiceCode",
+          "documentation":"<p>The service.</p>"
+        },
+        "usageType":{
+          "shape":"SavingsPlanRateUsageType",
+          "documentation":"<p>The usage details of the line item in the billing report.</p>"
+        },
+        "operation":{
+          "shape":"SavingsPlanRateOperation",
+          "documentation":"<p>The specific AWS operation for the line item in the billing report.</p>"
+        },
+        "properties":{
+          "shape":"SavingsPlanRatePropertyList",
+          "documentation":"<p>The properties.</p>"
+        }
+      },
+      "documentation":"<p>Information about a Savings Plan rate.</p>"
+    },
+    "SavingsPlanRateFilter":{
+      "type":"structure",
+      "members":{
+        "name":{
+          "shape":"SavingsPlanRateFilterName",
+          "documentation":"<p>The filter name.</p>"
+        },
+        "values":{
+          "shape":"ListOfStrings",
+          "documentation":"<p>The filter values.</p>"
+        }
+      },
+      "documentation":"<p>Information about a filter.</p>"
+    },
+    "SavingsPlanRateFilterAttribute":{
+      "type":"string",
+      "enum":[
+        "region",
+        "instanceFamily",
+        "instanceType",
+        "productDescription",
+        "tenancy",
+        "productId"
+      ]
+    },
+    "SavingsPlanRateFilterList":{
+      "type":"list",
+      "member":{"shape":"SavingsPlanRateFilter"}
+    },
+    "SavingsPlanRateFilterName":{
+      "type":"string",
+      "enum":[
+        "region",
+        "instanceType",
+        "productDescription",
+        "tenancy",
+        "productType",
+        "serviceCode",
+        "usageType",
+        "operation"
+      ]
+    },
+    "SavingsPlanRateList":{
+      "type":"list",
+      "member":{"shape":"SavingsPlanRate"}
+    },
+    "SavingsPlanRateOperation":{
+      "type":"string",
+      "max":255,
+      "pattern":"^[a-zA-Z0-9_ \\/.:-]*$"
+    },
+    "SavingsPlanRateOperationList":{
+      "type":"list",
+      "member":{"shape":"SavingsPlanRateOperation"}
+    },
+    "SavingsPlanRatePricePerUnit":{"type":"string"},
+    "SavingsPlanRateProperty":{
+      "type":"structure",
+      "members":{
+        "name":{
+          "shape":"SavingsPlanRatePropertyKey",
+          "documentation":"<p>The property name.</p>"
+        },
+        "value":{
+          "shape":"JsonSafeFilterValueString",
+          "documentation":"<p>The property value.</p>"
+        }
+      },
+      "documentation":"<p>Information about a property.</p>"
+    },
+    "SavingsPlanRatePropertyKey":{
+      "type":"string",
+      "enum":[
+        "region",
+        "instanceType",
+        "instanceFamily",
+        "productDescription",
+        "tenancy"
+      ]
+    },
+    "SavingsPlanRatePropertyList":{
+      "type":"list",
+      "member":{"shape":"SavingsPlanRateProperty"}
+    },
+    "SavingsPlanRateServiceCode":{
+      "type":"string",
+      "enum":[
+        "AmazonEC2",
+        "AmazonECS",
+        "AWSLambda"
+      ]
+    },
+    "SavingsPlanRateServiceCodeList":{
+      "type":"list",
+      "member":{"shape":"SavingsPlanRateServiceCode"}
+    },
+    "SavingsPlanRateUnit":{
+      "type":"string",
+      "enum":[
+        "Hrs",
+        "Lambda-GB-Second",
+        "Request"
+      ]
+    },
+    "SavingsPlanRateUsageType":{
+      "type":"string",
+      "max":255,
+      "pattern":"^[a-zA-Z0-9_ \\/.:-]+$"
+    },
+    "SavingsPlanRateUsageTypeList":{
+      "type":"list",
+      "member":{"shape":"SavingsPlanRateUsageType"}
+    },
+    "SavingsPlanServiceCode":{
+      "type":"string",
+      "max":255,
+      "pattern":"^[a-zA-Z]+$"
+    },
+    "SavingsPlanServiceCodeList":{
+      "type":"list",
+      "member":{"shape":"SavingsPlanServiceCode"}
+    },
+    "SavingsPlanState":{
+      "type":"string",
+      "enum":[
+        "payment-pending",
+        "payment-failed",
+        "active",
+        "retired"
+      ]
+    },
+    "SavingsPlanStateList":{
+      "type":"list",
+      "member":{"shape":"SavingsPlanState"}
+    },
+    "SavingsPlanType":{
+      "type":"string",
+      "enum":[
+        "Compute",
+        "EC2Instance"
+      ]
+    },
+    "SavingsPlanTypeList":{
+      "type":"list",
+      "member":{"shape":"SavingsPlanType"}
+    },
+    "SavingsPlanUsageType":{
+      "type":"string",
+      "max":255,
+      "pattern":"^[a-zA-Z0-9_ \\/.:-]+$"
+    },
+    "SavingsPlanUsageTypeList":{
+      "type":"list",
+      "member":{"shape":"SavingsPlanUsageType"}
+    },
+    "SavingsPlansDuration":{
+      "type":"long",
+      "min":0
+    },
+    "SavingsPlansFilterName":{
+      "type":"string",
+      "enum":[
+        "region",
+        "ec2-instance-family",
+        "commitment",
+        "upfront",
+        "term",
+        "savings-plan-type",
+        "payment-option",
+        "start",
+        "end"
+      ]
+    },
+    "ServiceQuotaExceededException":{
+      "type":"structure",
+      "required":["message"],
+      "members":{
+        "message":{"shape":"String"}
+      },
+      "documentation":"<p>A service quota has been exceeded.</p>",
+      "error":{"httpStatusCode":402},
+      "exception":true
+    },
+    "String":{"type":"string"},
+    "TagKey":{"type":"string"},
+    "TagKeyList":{
+      "type":"list",
+      "member":{"shape":"TagKey"}
+    },
+    "TagMap":{
+      "type":"map",
+      "key":{"shape":"TagKey"},
+      "value":{"shape":"TagValue"}
+    },
+    "TagResourceRequest":{
+      "type":"structure",
+      "required":[
+        "resourceArn",
+        "tags"
+      ],
+      "members":{
+        "resourceArn":{
+          "shape":"SavingsPlanArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the resource.</p>"
+        },
+        "tags":{
+          "shape":"TagMap",
+          "documentation":"<p>One or more tags. For example, { \"tags\": {\"key1\":\"value1\", \"key2\":\"value2\"} }.</p>"
+        }
+      }
+    },
+    "TagResourceResponse":{
+      "type":"structure",
+      "members":{
+      }
+    },
+    "TagValue":{"type":"string"},
+    "TermDurationInSeconds":{"type":"long"},
+    "UUID":{
+      "type":"string",
+      "pattern":"^(([0-9a-f]+)(-?))+$"
+    },
+    "UUIDs":{
+      "type":"list",
+      "member":{"shape":"UUID"}
+    },
+    "UntagResourceRequest":{
+      "type":"structure",
+      "required":[
+        "resourceArn",
+        "tagKeys"
+      ],
+      "members":{
+        "resourceArn":{
+          "shape":"SavingsPlanArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the resource.</p>"
+        },
+        "tagKeys":{
+          "shape":"TagKeyList",
+          "documentation":"<p>The tag keys.</p>"
+        }
+      }
+    },
+    "UntagResourceResponse":{
+      "type":"structure",
+      "members":{
+      }
+    },
+    "ValidationException":{
+      "type":"structure",
+      "required":["message"],
+      "members":{
+        "message":{"shape":"String"}
+      },
+      "documentation":"<p>One of the input parameters is not valid.</p>",
+      "error":{"httpStatusCode":400},
+      "exception":true
+    }
+  },
+  "documentation":"<p>Savings Plans are a pricing model that offer significant savings on AWS usage (for example, on Amazon EC2 instances). You commit to a consistent amount of usage, in USD per hour, for a term of 1 or 3 years, and receive a lower price for that usage. For more information, see the <a href=\"https://docs.aws.amazon.com/savingsplans/latest/userguide/\">AWS Savings Plans User Guide</a>.</p>"
+}
diff --git a/services/schemas/pom.xml b/services/schemas/pom.xml
new file mode 100644
index 000000000000..4b7b358eef5a
--- /dev/null
+++ b/services/schemas/pom.xml
@@ -0,0 +1,60 @@
+<?xml version="1.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.
+  -->
+
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>software.amazon.awssdk</groupId>
+        <artifactId>services</artifactId>
+        <version>2.11.8-SNAPSHOT</version>
+    </parent>
+    <artifactId>schemas</artifactId>
+    <name>AWS Java SDK :: Services :: Schemas</name>
+    <description>The AWS Java SDK for Schemas module holds the client classes that are used for
+        communicating with Schemas.
+    </description>
+    <url>https://aws.amazon.com/sdkforjava</url>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifestEntries>
+                            <Automatic-Module-Name>software.amazon.awssdk.services.schemas</Automatic-Module-Name>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>protocol-core</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>aws-json-protocol</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/services/schemas/src/main/resources/codegen-resources/paginators-1.json b/services/schemas/src/main/resources/codegen-resources/paginators-1.json
new file mode 100644
index 000000000000..ef2fe19d1957
--- /dev/null
+++ b/services/schemas/src/main/resources/codegen-resources/paginators-1.json
@@ -0,0 +1,34 @@
+{
+  "pagination": {
+    "ListDiscoverers": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "Limit",
+      "result_key": "Discoverers"
+    },
+    "ListRegistries": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "Limit",
+      "result_key": "Registries"
+    },
+    "ListSchemaVersions": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "Limit",
+      "result_key": "SchemaVersions"
+    },
+    "ListSchemas": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "Limit",
+      "result_key": "Schemas"
+    },
+    "SearchSchemas": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "Limit",
+      "result_key": "Schemas"
+    }
+  }
+}
diff --git a/services/schemas/src/main/resources/codegen-resources/service-2.json b/services/schemas/src/main/resources/codegen-resources/service-2.json
new file mode 100644
index 000000000000..89dbc62272d3
--- /dev/null
+++ b/services/schemas/src/main/resources/codegen-resources/service-2.json
@@ -0,0 +1,2916 @@
+{
+  "metadata": {
+    "apiVersion": "2019-12-02",
+    "endpointPrefix": "schemas",
+    "signingName": "schemas",
+    "serviceFullName": "Schemas",
+    "serviceId": "schemas",
+    "protocol": "rest-json",
+    "jsonVersion": "1.1",
+    "uid": "schemas-2019-12-02",
+    "signatureVersion": "v4"
+  },
+  "operations": {
+    "CreateDiscoverer": {
+      "name": "CreateDiscoverer",
+      "http": {
+        "method": "POST",
+        "requestUri": "/v1/discoverers",
+        "responseCode": 201
+      },
+      "input": {
+        "shape": "CreateDiscovererRequest"
+      },
+      "output": {
+        "shape": "CreateDiscovererResponse"
+      },
+      "errors": [
+        {
+          "shape": "BadRequestException"
+        },
+        {
+          "shape": "InternalServerErrorException"
+        },
+        {
+          "shape": "UnauthorizedException"
+        },
+        {
+          "shape": "ForbiddenException"
+        },
+        {
+          "shape": "ServiceUnavailableException"
+        },
+        {
+          "shape": "ConflictException"
+        }
+      ],
+      "documentation": "<p>Creates a discoverer.</p>"
+    },
+    "CreateRegistry": {
+      "name": "CreateRegistry",
+      "http": {
+        "method": "POST",
+        "requestUri": "/v1/registries/name/{registryName}",
+        "responseCode": 201
+      },
+      "input": {
+        "shape": "CreateRegistryRequest"
+      },
+      "output": {
+        "shape": "CreateRegistryResponse"
+      },
+      "errors": [
+        {
+          "shape": "BadRequestException"
+        },
+        {
+          "shape": "InternalServerErrorException"
+        },
+        {
+          "shape": "UnauthorizedException"
+        },
+        {
+          "shape": "ForbiddenException"
+        },
+        {
+          "shape": "ServiceUnavailableException"
+        },
+        {
+          "shape": "ConflictException"
+        }
+      ],
+      "documentation": "<p>Creates a registry.</p>"
+    },
+    "CreateSchema": {
+      "name": "CreateSchema",
+      "http": {
+        "method": "POST",
+        "requestUri": "/v1/registries/name/{registryName}/schemas/name/{schemaName}",
+        "responseCode": 201
+      },
+      "input": {
+        "shape": "CreateSchemaRequest"
+      },
+      "output": {
+        "shape": "CreateSchemaResponse"
+      },
+      "errors": [
+        {
+          "shape": "ServiceUnavailableException"
+        },
+        {
+          "shape": "BadRequestException"
+        },
+        {
+          "shape": "InternalServerErrorException"
+        },
+        {
+          "shape": "ForbiddenException"
+        }
+      ],
+      "documentation": "<p>Creates a schema definition.</p>"
+    },
+    "DeleteDiscoverer": {
+      "name": "DeleteDiscoverer",
+      "http": {
+        "method": "DELETE",
+        "requestUri": "/v1/discoverers/id/{discovererId}",
+        "responseCode": 204
+      },
+      "input": {
+        "shape": "DeleteDiscovererRequest"
+      },
+      "errors": [
+        {
+          "shape": "BadRequestException"
+        },
+        {
+          "shape": "UnauthorizedException"
+        },
+        {
+          "shape": "InternalServerErrorException"
+        },
+        {
+          "shape": "ForbiddenException"
+        },
+        {
+          "shape": "NotFoundException"
+        },
+        {
+          "shape": "ServiceUnavailableException"
+        }
+      ],
+      "documentation": "<p>Deletes a discoverer.</p>"
+    },
+    "DeleteRegistry": {
+      "name": "DeleteRegistry",
+      "http": {
+        "method": "DELETE",
+        "requestUri": "/v1/registries/name/{registryName}",
+        "responseCode": 204
+      },
+      "input": {
+        "shape": "DeleteRegistryRequest"
+      },
+      "errors": [
+        {
+          "shape": "BadRequestException"
+        },
+        {
+          "shape": "UnauthorizedException"
+        },
+        {
+          "shape": "InternalServerErrorException"
+        },
+        {
+          "shape": "ForbiddenException"
+        },
+        {
+          "shape": "NotFoundException"
+        },
+        {
+          "shape": "ServiceUnavailableException"
+        }
+      ],
+      "documentation": "<p>Deletes a Registry.</p>"
+    },
+    "DeleteSchema": {
+      "name": "DeleteSchema",
+      "http": {
+        "method": "DELETE",
+        "requestUri": "/v1/registries/name/{registryName}/schemas/name/{schemaName}",
+        "responseCode": 204
+      },
+      "input": {
+        "shape": "DeleteSchemaRequest"
+      },
+      "errors": [
+        {
+          "shape": "BadRequestException"
+        },
+        {
+          "shape": "UnauthorizedException"
+        },
+        {
+          "shape": "InternalServerErrorException"
+        },
+        {
+          "shape": "ForbiddenException"
+        },
+        {
+          "shape": "NotFoundException"
+        },
+        {
+          "shape": "ServiceUnavailableException"
+        }
+      ],
+      "documentation": "<p>Delete a schema definition.</p>"
+    },
+    "DeleteSchemaVersion": {
+      "name": "DeleteSchemaVersion",
+      "http": {
+        "method": "DELETE",
+        "requestUri": "/v1/registries/name/{registryName}/schemas/name/{schemaName}/version/{schemaVersion}",
+        "responseCode": 204
+      },
+      "input": {
+        "shape": "DeleteSchemaVersionRequest"
+      },
+      "errors": [
+        {
+          "shape": "BadRequestException"
+        },
+        {
+          "shape": "UnauthorizedException"
+        },
+        {
+          "shape": "InternalServerErrorException"
+        },
+        {
+          "shape": "ForbiddenException"
+        },
+        {
+          "shape": "NotFoundException"
+        },
+        {
+          "shape": "ServiceUnavailableException"
+        }
+      ],
+      "documentation": "<p>Delete the schema version definition</p>"
+    },
+    "DescribeCodeBinding": {
+      "name": "DescribeCodeBinding",
+      "http": {
+        "method": "GET",
+        "requestUri": "/v1/registries/name/{registryName}/schemas/name/{schemaName}/language/{language}",
+        "responseCode": 200
+      },
+      "input": {
+        "shape": "DescribeCodeBindingRequest"
+      },
+      "output": {
+        "shape": "DescribeCodeBindingResponse"
+      },
+      "errors": [
+        {
+          "shape": "BadRequestException"
+        },
+        {
+          "shape": "UnauthorizedException"
+        },
+        {
+          "shape": "InternalServerErrorException"
+        },
+        {
+          "shape": "ForbiddenException"
+        },
+        {
+          "shape": "NotFoundException"
+        },
+        {
+          "shape": "TooManyRequestsException"
+        }
+      ],
+      "documentation": "<p>Describe the code binding URI.</p>"
+    },
+    "DescribeDiscoverer": {
+      "name": "DescribeDiscoverer",
+      "http": {
+        "method": "GET",
+        "requestUri": "/v1/discoverers/id/{discovererId}",
+        "responseCode": 200
+      },
+      "input": {
+        "shape": "DescribeDiscovererRequest"
+      },
+      "output": {
+        "shape": "DescribeDiscovererResponse"
+      },
+      "errors": [
+        {
+          "shape": "BadRequestException"
+        },
+        {
+          "shape": "UnauthorizedException"
+        },
+        {
+          "shape": "InternalServerErrorException"
+        },
+        {
+          "shape": "ForbiddenException"
+        },
+        {
+          "shape": "NotFoundException"
+        },
+        {
+          "shape": "ServiceUnavailableException"
+        }
+      ],
+      "documentation": "<p>Describes the discoverer.</p>"
+    },
+    "DescribeRegistry": {
+      "name": "DescribeRegistry",
+      "http": {
+        "method": "GET",
+        "requestUri": "/v1/registries/name/{registryName}",
+        "responseCode": 200
+      },
+      "input": {
+        "shape": "DescribeRegistryRequest"
+      },
+      "output": {
+        "shape": "DescribeRegistryResponse"
+      },
+      "errors": [
+        {
+          "shape": "BadRequestException"
+        },
+        {
+          "shape": "UnauthorizedException"
+        },
+        {
+          "shape": "InternalServerErrorException"
+        },
+        {
+          "shape": "ForbiddenException"
+        },
+        {
+          "shape": "NotFoundException"
+        },
+        {
+          "shape": "ServiceUnavailableException"
+        }
+      ],
+      "documentation": "<p>Describes the registry.</p>"
+    },
+    "DescribeSchema": {
+      "name": "DescribeSchema",
+      "http": {
+        "method": "GET",
+        "requestUri": "/v1/registries/name/{registryName}/schemas/name/{schemaName}",
+        "responseCode": 200
+      },
+      "input": {
+        "shape": "DescribeSchemaRequest"
+      },
+      "output": {
+        "shape": "DescribeSchemaResponse"
+      },
+      "errors": [
+        {
+          "shape": "BadRequestException"
+        },
+        {
+          "shape": "UnauthorizedException"
+        },
+        {
+          "shape": "InternalServerErrorException"
+        },
+        {
+          "shape": "ForbiddenException"
+        },
+        {
+          "shape": "NotFoundException"
+        },
+        {
+          "shape": "ServiceUnavailableException"
+        }
+      ],
+      "documentation": "<p>Retrieve the schema definition.</p>"
+    },
+    "GetCodeBindingSource": {
+      "name": "GetCodeBindingSource",
+      "http": {
+        "method": "GET",
+        "requestUri": "/v1/registries/name/{registryName}/schemas/name/{schemaName}/language/{language}/source",
+        "responseCode": 200
+      },
+      "input": {
+        "shape": "GetCodeBindingSourceRequest"
+      },
+      "output": {
+        "shape": "GetCodeBindingSourceResponse"
+      },
+      "errors": [
+        {
+          "shape": "BadRequestException"
+        },
+        {
+          "shape": "UnauthorizedException"
+        },
+        {
+          "shape": "InternalServerErrorException"
+        },
+        {
+          "shape": "ForbiddenException"
+        },
+        {
+          "shape": "NotFoundException"
+        },
+        {
+          "shape": "TooManyRequestsException"
+        }
+      ],
+      "documentation": "<p>Get the code binding source URI.</p>"
+    },
+    "GetDiscoveredSchema": {
+      "name": "GetDiscoveredSchema",
+      "http": {
+        "method": "POST",
+        "requestUri": "/v1/discover",
+        "responseCode": 200
+      },
+      "input": {
+        "shape": "GetDiscoveredSchemaRequest"
+      },
+      "output": {
+        "shape": "GetDiscoveredSchemaResponse"
+      },
+      "errors": [
+        {
+          "shape": "ServiceUnavailableException"
+        },
+        {
+          "shape": "BadRequestException"
+        },
+        {
+          "shape": "UnauthorizedException"
+        },
+        {
+          "shape": "InternalServerErrorException"
+        },
+        {
+          "shape": "ForbiddenException"
+        }
+      ],
+      "documentation": "<p>Get the discovered schema that was generated based on sampled events.</p>"
+    },
+    "ListDiscoverers": {
+      "name": "ListDiscoverers",
+      "http": {
+        "method": "GET",
+        "requestUri": "/v1/discoverers",
+        "responseCode": 200
+      },
+      "input": {
+        "shape": "ListDiscoverersRequest"
+      },
+      "output": {
+        "shape": "ListDiscoverersResponse"
+      },
+      "errors": [
+        {
+          "shape": "ServiceUnavailableException"
+        },
+        {
+          "shape": "BadRequestException"
+        },
+        {
+          "shape": "UnauthorizedException"
+        },
+        {
+          "shape": "InternalServerErrorException"
+        },
+        {
+          "shape": "ForbiddenException"
+        }
+      ],
+      "documentation": "<p>List the discoverers.</p>"
+    },
+    "ListRegistries": {
+      "name": "ListRegistries",
+      "http": {
+        "method": "GET",
+        "requestUri": "/v1/registries",
+        "responseCode": 200
+      },
+      "input": {
+        "shape": "ListRegistriesRequest"
+      },
+      "output": {
+        "shape": "ListRegistriesResponse"
+      },
+      "errors": [
+        {
+          "shape": "ServiceUnavailableException"
+        },
+        {
+          "shape": "BadRequestException"
+        },
+        {
+          "shape": "UnauthorizedException"
+        },
+        {
+          "shape": "InternalServerErrorException"
+        },
+        {
+          "shape": "ForbiddenException"
+        }
+      ],
+      "documentation": "<p>List the registries.</p>"
+    },
+    "ListSchemaVersions": {
+      "name": "ListSchemaVersions",
+      "http": {
+        "method": "GET",
+        "requestUri": "/v1/registries/name/{registryName}/schemas/name/{schemaName}/versions",
+        "responseCode": 200
+      },
+      "input": {
+        "shape": "ListSchemaVersionsRequest"
+      },
+      "output": {
+        "shape": "ListSchemaVersionsResponse"
+      },
+      "errors": [
+        {
+          "shape": "BadRequestException"
+        },
+        {
+          "shape": "UnauthorizedException"
+        },
+        {
+          "shape": "InternalServerErrorException"
+        },
+        {
+          "shape": "ForbiddenException"
+        },
+        {
+          "shape": "NotFoundException"
+        },
+        {
+          "shape": "ServiceUnavailableException"
+        }
+      ],
+      "documentation": "<p>Provides a list of the schema versions and related information.</p>"
+    },
+    "ListSchemas": {
+      "name": "ListSchemas",
+      "http": {
+        "method": "GET",
+        "requestUri": "/v1/registries/name/{registryName}/schemas",
+        "responseCode": 200
+      },
+      "input": {
+        "shape": "ListSchemasRequest"
+      },
+      "output": {
+        "shape": "ListSchemasResponse"
+      },
+      "errors": [
+        {
+          "shape": "ServiceUnavailableException"
+        },
+        {
+          "shape": "BadRequestException"
+        },
+        {
+          "shape": "UnauthorizedException"
+        },
+        {
+          "shape": "InternalServerErrorException"
+        },
+        {
+          "shape": "ForbiddenException"
+        }
+      ],
+      "documentation": "<p>List the schemas.</p>"
+    },
+    "ListTagsForResource": {
+      "name": "ListTagsForResource",
+      "http": {
+        "method": "GET",
+        "requestUri": "/tags/{resource-arn}",
+        "responseCode": 200
+      },
+      "input": {
+        "shape": "ListTagsForResourceRequest"
+      },
+      "output": {
+        "shape": "ListTagsForResourceResponse"
+      },
+      "errors": [
+        {
+          "shape": "NotFoundException"
+        },
+        {
+          "shape": "BadRequestException"
+        },
+        {
+          "shape": "InternalServerErrorException"
+        },
+        {
+          "shape": "ForbiddenException"
+        }
+      ],
+      "documentation": "<p>Get tags for resource.</p>"
+    },
+    "LockServiceLinkedRole": {
+      "name": "LockServiceLinkedRole",
+      "http": {
+        "method": "POST",
+        "requestUri": "/slr-deletion/lock",
+        "responseCode": 200
+      },
+      "input": {
+        "shape": "LockServiceLinkedRoleRequest"
+      },
+      "output": {
+        "shape": "LockServiceLinkedRoleResponse"
+      },
+      "errors": [
+        {
+          "shape": "ServiceUnavailableException"
+        },
+        {
+          "shape": "BadRequestException"
+        },
+        {
+          "shape": "UnauthorizedException"
+        },
+        {
+          "shape": "InternalServerErrorException"
+        },
+        {
+          "shape": "ForbiddenException"
+        }
+      ],
+      "internal": true
+    },
+    "PutCodeBinding": {
+      "name": "PutCodeBinding",
+      "http": {
+        "method": "POST",
+        "requestUri": "/v1/registries/name/{registryName}/schemas/name/{schemaName}/language/{language}",
+        "responseCode": 202
+      },
+      "input": {
+        "shape": "PutCodeBindingRequest"
+      },
+      "output": {
+        "shape": "PutCodeBindingResponse"
+      },
+      "errors": [
+        {
+          "shape": "GoneException"
+        },
+        {
+          "shape": "BadRequestException"
+        },
+        {
+          "shape": "UnauthorizedException"
+        },
+        {
+          "shape": "InternalServerErrorException"
+        },
+        {
+          "shape": "ForbiddenException"
+        },
+        {
+          "shape": "NotFoundException"
+        },
+        {
+          "shape": "TooManyRequestsException"
+        }
+      ],
+      "documentation": "<p>Put code binding URI</p>"
+    },
+    "SearchSchemas": {
+      "name": "SearchSchemas",
+      "http": {
+        "method": "GET",
+        "requestUri": "/v1/registries/name/{registryName}/schemas/search",
+        "responseCode": 200
+      },
+      "input": {
+        "shape": "SearchSchemasRequest"
+      },
+      "output": {
+        "shape": "SearchSchemasResponse"
+      },
+      "errors": [
+        {
+          "shape": "ServiceUnavailableException"
+        },
+        {
+          "shape": "BadRequestException"
+        },
+        {
+          "shape": "UnauthorizedException"
+        },
+        {
+          "shape": "InternalServerErrorException"
+        },
+        {
+          "shape": "ForbiddenException"
+        }
+      ],
+      "documentation": "<p>Search the schemas</p>"
+    },
+    "StartDiscoverer": {
+      "name": "StartDiscoverer",
+      "http": {
+        "method": "POST",
+        "requestUri": "/v1/discoverers/id/{discovererId}/start",
+        "responseCode": 200
+      },
+      "input": {
+        "shape": "StartDiscovererRequest"
+      },
+      "output": {
+        "shape": "StartDiscovererResponse"
+      },
+      "errors": [
+        {
+          "shape": "BadRequestException"
+        },
+        {
+          "shape": "UnauthorizedException"
+        },
+        {
+          "shape": "InternalServerErrorException"
+        },
+        {
+          "shape": "ForbiddenException"
+        },
+        {
+          "shape": "NotFoundException"
+        },
+        {
+          "shape": "ServiceUnavailableException"
+        }
+      ],
+      "documentation": "<p>Starts the discoverer</p>"
+    },
+    "StopDiscoverer": {
+      "name": "StopDiscoverer",
+      "http": {
+        "method": "POST",
+        "requestUri": "/v1/discoverers/id/{discovererId}/stop",
+        "responseCode": 200
+      },
+      "input": {
+        "shape": "StopDiscovererRequest"
+      },
+      "output": {
+        "shape": "StopDiscovererResponse"
+      },
+      "errors": [
+        {
+          "shape": "BadRequestException"
+        },
+        {
+          "shape": "UnauthorizedException"
+        },
+        {
+          "shape": "InternalServerErrorException"
+        },
+        {
+          "shape": "ForbiddenException"
+        },
+        {
+          "shape": "NotFoundException"
+        },
+        {
+          "shape": "ServiceUnavailableException"
+        }
+      ],
+      "documentation": "<p>Stops the discoverer</p>"
+    },
+    "TagResource": {
+      "name": "TagResource",
+      "http": {
+        "method": "POST",
+        "requestUri": "/tags/{resource-arn}",
+        "responseCode": 204
+      },
+      "input": {
+        "shape": "TagResourceRequest"
+      },
+      "errors": [
+        {
+          "shape": "NotFoundException"
+        },
+        {
+          "shape": "BadRequestException"
+        },
+        {
+          "shape": "InternalServerErrorException"
+        },
+        {
+          "shape": "ForbiddenException"
+        }
+      ],
+      "documentation": "<p>Add tags to a resource.</p>"
+    },
+    "UnlockServiceLinkedRole": {
+      "name": "UnlockServiceLinkedRole",
+      "http": {
+        "method": "POST",
+        "requestUri": "/slr-deletion/unlock",
+        "responseCode": 200
+      },
+      "input": {
+        "shape": "UnlockServiceLinkedRoleRequest"
+      },
+      "output": {
+        "shape": "UnlockServiceLinkedRoleResponse"
+      },
+      "errors": [
+        {
+          "shape": "ServiceUnavailableException"
+        },
+        {
+          "shape": "BadRequestException"
+        },
+        {
+          "shape": "UnauthorizedException"
+        },
+        {
+          "shape": "InternalServerErrorException"
+        },
+        {
+          "shape": "ForbiddenException"
+        }
+      ],
+      "internal": true
+    },
+    "UntagResource": {
+      "name": "UntagResource",
+      "http": {
+        "method": "DELETE",
+        "requestUri": "/tags/{resource-arn}",
+        "responseCode": 204
+      },
+      "input": {
+        "shape": "UntagResourceRequest"
+      },
+      "errors": [
+        {
+          "shape": "NotFoundException"
+        },
+        {
+          "shape": "BadRequestException"
+        },
+        {
+          "shape": "InternalServerErrorException"
+        },
+        {
+          "shape": "ForbiddenException"
+        }
+      ],
+      "documentation": "<p>Removes tags from a resource.</p>"
+    },
+    "UpdateDiscoverer": {
+      "name": "UpdateDiscoverer",
+      "http": {
+        "method": "PUT",
+        "requestUri": "/v1/discoverers/id/{discovererId}",
+        "responseCode": 200
+      },
+      "input": {
+        "shape": "UpdateDiscovererRequest"
+      },
+      "output": {
+        "shape": "UpdateDiscovererResponse"
+      },
+      "errors": [
+        {
+          "shape": "BadRequestException"
+        },
+        {
+          "shape": "UnauthorizedException"
+        },
+        {
+          "shape": "InternalServerErrorException"
+        },
+        {
+          "shape": "ForbiddenException"
+        },
+        {
+          "shape": "NotFoundException"
+        },
+        {
+          "shape": "ServiceUnavailableException"
+        }
+      ],
+      "documentation": "<p>Updates the discoverer</p>"
+    },
+    "UpdateRegistry": {
+      "name": "UpdateRegistry",
+      "http": {
+        "method": "PUT",
+        "requestUri": "/v1/registries/name/{registryName}",
+        "responseCode": 200
+      },
+      "input": {
+        "shape": "UpdateRegistryRequest"
+      },
+      "output": {
+        "shape": "UpdateRegistryResponse"
+      },
+      "errors": [
+        {
+          "shape": "BadRequestException"
+        },
+        {
+          "shape": "UnauthorizedException"
+        },
+        {
+          "shape": "InternalServerErrorException"
+        },
+        {
+          "shape": "ForbiddenException"
+        },
+        {
+          "shape": "NotFoundException"
+        },
+        {
+          "shape": "ServiceUnavailableException"
+        }
+      ],
+      "documentation": "<p>Updates a registry.</p>"
+    },
+    "UpdateSchema": {
+      "name": "UpdateSchema",
+      "http": {
+        "method": "PUT",
+        "requestUri": "/v1/registries/name/{registryName}/schemas/name/{schemaName}",
+        "responseCode": 200
+      },
+      "input": {
+        "shape": "UpdateSchemaRequest"
+      },
+      "output": {
+        "shape": "UpdateSchemaResponse"
+      },
+      "errors": [
+        {
+          "shape": "BadRequestException"
+        },
+        {
+          "shape": "InternalServerErrorException"
+        },
+        {
+          "shape": "ForbiddenException"
+        },
+        {
+          "shape": "NotFoundException"
+        },
+        {
+          "shape": "ServiceUnavailableException"
+        }
+      ],
+      "documentation": "<p>Updates the schema definition</p>"
+    }
+  },
+  "shapes": {
+    "BadRequestException": {
+      "type": "structure",
+      "members": {
+        "Code": {
+          "shape": "__string",
+          "documentation": "<p>The error code.</p>"
+        },
+        "Message": {
+          "shape": "__string",
+          "documentation": "<p>The message string of the error output.</p>"
+        }
+      },
+      "required": [
+        "Message",
+        "Code"
+      ],
+      "exception": true,
+      "error": {
+        "httpStatusCode": 400
+      }
+    },
+    "CodeBindingOutput": {
+      "type": "structure",
+      "members": {
+        "CreationDate": {
+          "shape": "__timestampIso8601",
+          "documentation": "<p>The time and date that the code binding was created.</p>"
+        },
+        "LastModified": {
+          "shape": "__timestampIso8601",
+          "documentation": "<p>The date and time that code bindings were modified.</p>"
+        },
+        "SchemaVersion": {
+          "shape": "__string",
+          "documentation": "<p>The version number of the schema.</p>"
+        },
+        "Status": {
+          "shape": "CodeGenerationStatus",
+          "documentation": "<p>The current status of code binding generation.</p>"
+        }
+      }
+    },
+    "CodeGenerationStatus": {
+      "type": "string",
+      "enum": [
+        "CREATE_IN_PROGRESS",
+        "CREATE_COMPLETE",
+        "CREATE_FAILED"
+      ]
+    },
+    "ConflictException": {
+      "type": "structure",
+      "members": {
+        "Code": {
+          "shape": "__string",
+          "documentation": "<p>The error code.</p>"
+        },
+        "Message": {
+          "shape": "__string",
+          "documentation": "<p>The message string of the error output.</p>"
+        }
+      },
+      "required": [
+        "Message",
+        "Code"
+      ],
+      "exception": true,
+      "error": {
+        "httpStatusCode": 409
+      }
+    },
+    "CreateDiscovererInput": {
+      "type": "structure",
+      "members": {
+        "Description": {
+          "shape": "__stringMin0Max256",
+          "documentation": "<p>A description for the discoverer.</p>"
+        },
+        "SourceArn": {
+          "shape": "__stringMin20Max1600",
+          "documentation": "<p>The ARN of the event bus.</p>"
+        },
+        "Tags": {
+          "shape": "Tags",
+          "locationName": "tags",
+          "documentation": "<p>Tags associated with the resource.</p>"
+        }
+      },
+      "required": [
+        "SourceArn"
+      ]
+    },
+    "CreateDiscovererRequest": {
+      "type": "structure",
+      "members": {
+        "Description": {
+          "shape": "__stringMin0Max256",
+          "documentation": "<p>A description for the discoverer.</p>"
+        },
+        "SourceArn": {
+          "shape": "__stringMin20Max1600",
+          "documentation": "<p>The ARN of the event bus.</p>"
+        },
+        "Tags": {
+          "shape": "Tags",
+          "locationName": "tags",
+          "documentation": "<p>Tags associated with the resource.</p>"
+        }
+      },
+      "required": [
+        "SourceArn"
+      ]
+    },
+    "CreateDiscovererResponse": {
+      "type": "structure",
+      "members": {
+        "Description": {
+          "shape": "__string",
+          "documentation": "<p>The description of the discoverer.</p>"
+        },
+        "DiscovererArn": {
+          "shape": "__string",
+          "documentation": "<p>The ARN of the discoverer.</p>"
+        },
+        "DiscovererId": {
+          "shape": "__string",
+          "documentation": "<p>The ID of the discoverer.</p>"
+        },
+        "SourceArn": {
+          "shape": "__string",
+          "documentation": "<p>The ARN of the event bus.</p>"
+        },
+        "State": {
+          "shape": "DiscovererState",
+          "documentation": "<p>The state of the discoverer.</p>"
+        },
+        "Tags": {
+          "shape": "Tags",
+          "locationName": "tags",
+          "documentation": "<p>Tags associated with the resource.</p>"
+        }
+      }
+    },
+    "CreateRegistryInput": {
+      "type": "structure",
+      "members": {
+        "Description": {
+          "shape": "__stringMin0Max256",
+          "documentation": "<p>A description of the registry to be created.</p>"
+        },
+        "Tags": {
+          "shape": "Tags",
+          "locationName": "tags",
+          "documentation": "<p>Tags to associate with the registry.</p>"
+        }
+      }
+    },
+    "CreateRegistryRequest": {
+      "type": "structure",
+      "members": {
+        "Description": {
+          "shape": "__stringMin0Max256",
+          "documentation": "<p>A description of the registry to be created.</p>"
+        },
+        "RegistryName": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "registryName"
+        },
+        "Tags": {
+          "shape": "Tags",
+          "locationName": "tags",
+          "documentation": "<p>Tags to associate with the registry.</p>"
+        }
+      },
+      "required": [
+        "RegistryName"
+      ]
+    },
+    "CreateRegistryResponse": {
+      "type": "structure",
+      "members": {
+        "Description": {
+          "shape": "__string",
+          "documentation": "<p>The description of the registry.</p>"
+        },
+        "RegistryArn": {
+          "shape": "__string",
+          "documentation": "<p>The ARN of the registry.</p>"
+        },
+        "RegistryName": {
+          "shape": "__string",
+          "documentation": "<p>The name of the registry.</p>"
+        },
+        "Tags": {
+          "shape": "Tags",
+          "locationName": "tags",
+          "documentation": "<p>Tags associated with the registry.</p>"
+        }
+      }
+    },
+    "CreateSchemaInput": {
+      "type": "structure",
+      "members": {
+        "Content": {
+          "shape": "__stringMin1Max100000"
+        },
+        "Description": {
+          "shape": "__stringMin0Max256",
+          "documentation": "<p>A description of the schema.</p>"
+        },
+        "Tags": {
+          "shape": "Tags",
+          "locationName": "tags",
+          "documentation": "<p>Tags associated with the schema.</p>"
+        },
+        "Type": {
+          "shape": "Type"
+        }
+      },
+      "required": [
+        "Type",
+        "Content"
+      ]
+    },
+    "CreateSchemaRequest": {
+      "type": "structure",
+      "members": {
+        "Content": {
+          "shape": "__stringMin1Max100000"
+        },
+        "Description": {
+          "shape": "__stringMin0Max256",
+          "documentation": "<p>A description of the schema.</p>"
+        },
+        "RegistryName": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "registryName"
+        },
+        "SchemaName": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "schemaName"
+        },
+        "Tags": {
+          "shape": "Tags",
+          "locationName": "tags",
+          "documentation": "<p>Tags associated with the schema.</p>"
+        },
+        "Type": {
+          "shape": "Type"
+        }
+      },
+      "required": [
+        "RegistryName",
+        "SchemaName",
+        "Type",
+        "Content"
+      ]
+    },
+    "CreateSchemaResponse": {
+      "type": "structure",
+      "members": {
+        "Description": {
+          "shape": "__string",
+          "documentation": "<p>The description of the schema.</p>"
+        },
+        "LastModified": {
+          "shape": "__timestampIso8601",
+          "documentation": "<p>The date and time that schema was modified.</p>"
+        },
+        "SchemaArn": {
+          "shape": "__string",
+          "documentation": "<p>The ARN of the schema.</p>"
+        },
+        "SchemaName": {
+          "shape": "__string",
+          "documentation": "<p>The name of the schema.</p>"
+        },
+        "SchemaVersion": {
+          "shape": "__string",
+          "documentation": "<p>The version number of the schema</p>"
+        },
+        "Tags": {
+          "shape": "Tags",
+          "locationName": "tags"
+        },
+        "Type": {
+          "shape": "__string",
+          "documentation": "<p>The type of the schema.</p>"
+        },
+        "VersionCreatedDate": {
+          "shape": "__timestampIso8601",
+          "documentation": "<p>The date the schema version was created.</p>"
+        }
+      }
+    },
+    "DeleteDiscovererRequest": {
+      "type": "structure",
+      "members": {
+        "DiscovererId": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "discovererId"
+        }
+      },
+      "required": [
+        "DiscovererId"
+      ]
+    },
+    "DeleteRegistryRequest": {
+      "type": "structure",
+      "members": {
+        "RegistryName": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "registryName"
+        }
+      },
+      "required": [
+        "RegistryName"
+      ]
+    },
+    "DeleteSchemaRequest": {
+      "type": "structure",
+      "members": {
+        "RegistryName": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "registryName"
+        },
+        "SchemaName": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "schemaName"
+        }
+      },
+      "required": [
+        "RegistryName",
+        "SchemaName"
+      ]
+    },
+    "DeleteSchemaVersionRequest": {
+      "type": "structure",
+      "members": {
+        "RegistryName": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "registryName"
+        },
+        "SchemaName": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "schemaName"
+        },
+        "SchemaVersion": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "schemaVersion"
+        }
+      },
+      "required": [
+        "SchemaVersion",
+        "RegistryName",
+        "SchemaName"
+      ]
+    },
+    "DescribeCodeBindingRequest": {
+      "type": "structure",
+      "members": {
+        "Language": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "language"
+        },
+        "RegistryName": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "registryName"
+        },
+        "SchemaName": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "schemaName"
+        },
+        "SchemaVersion": {
+          "shape": "__string",
+          "location": "querystring",
+          "locationName": "schemaVersion"
+        }
+      },
+      "required": [
+        "RegistryName",
+        "SchemaName",
+        "Language"
+      ]
+    },
+    "DescribeCodeBindingResponse": {
+      "type": "structure",
+      "members": {
+        "CreationDate": {
+          "shape": "__timestampIso8601",
+          "documentation": "<p>The time and date that the code binding was created.</p>"
+        },
+        "LastModified": {
+          "shape": "__timestampIso8601",
+          "documentation": "<p>The date and time that code bindings were modified.</p>"
+        },
+        "SchemaVersion": {
+          "shape": "__string",
+          "documentation": "<p>The version number of the schema.</p>"
+        },
+        "Status": {
+          "shape": "CodeGenerationStatus",
+          "documentation": "<p>The current status of code binding generation.</p>"
+        }
+      }
+    },
+    "DescribeDiscovererRequest": {
+      "type": "structure",
+      "members": {
+        "DiscovererId": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "discovererId"
+        }
+      },
+      "required": [
+        "DiscovererId"
+      ]
+    },
+    "DescribeDiscovererResponse": {
+      "type": "structure",
+      "members": {
+        "Description": {
+          "shape": "__string",
+          "documentation": "<p>The description of the discoverer.</p>"
+        },
+        "DiscovererArn": {
+          "shape": "__string",
+          "documentation": "<p>The ARN of the discoverer.</p>"
+        },
+        "DiscovererId": {
+          "shape": "__string",
+          "documentation": "<p>The ID of the discoverer.</p>"
+        },
+        "SourceArn": {
+          "shape": "__string",
+          "documentation": "<p>The ARN of the event bus.</p>"
+        },
+        "State": {
+          "shape": "DiscovererState",
+          "documentation": "<p>The state of the discoverer.</p>"
+        },
+        "Tags": {
+          "shape": "Tags",
+          "locationName": "tags",
+          "documentation": "<p>Tags associated with the resource.</p>"
+        }
+      }
+    },
+    "DescribeRegistryRequest": {
+      "type": "structure",
+      "members": {
+        "RegistryName": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "registryName"
+        }
+      },
+      "required": [
+        "RegistryName"
+      ]
+    },
+    "DescribeRegistryResponse": {
+      "type": "structure",
+      "members": {
+        "Description": {
+          "shape": "__string",
+          "documentation": "<p>The description of the registry.</p>"
+        },
+        "RegistryArn": {
+          "shape": "__string",
+          "documentation": "<p>The ARN of the registry.</p>"
+        },
+        "RegistryName": {
+          "shape": "__string",
+          "documentation": "<p>The name of the registry.</p>"
+        },
+        "Tags": {
+          "shape": "Tags",
+          "locationName": "tags",
+          "documentation": "<p>Tags associated with the registry.</p>"
+        }
+      }
+    },
+    "DescribeSchemaOutput": {
+      "type": "structure",
+      "members": {
+        "Content": {
+          "shape": "__string"
+        },
+        "Description": {
+          "shape": "__string",
+          "documentation": "<p>The description of the schema.</p>"
+        },
+        "LastModified": {
+          "shape": "__timestampIso8601",
+          "documentation": "<p>The date and time that schema was modified.</p>"
+        },
+        "SchemaArn": {
+          "shape": "__string",
+          "documentation": "<p>The ARN of the schema.</p>"
+        },
+        "SchemaName": {
+          "shape": "__string",
+          "documentation": "<p>The name of the schema.</p>"
+        },
+        "SchemaVersion": {
+          "shape": "__string",
+          "documentation": "<p>The version number of the schema</p>"
+        },
+        "Tags": {
+          "shape": "Tags",
+          "locationName": "tags",
+          "documentation": "<p>Tags associated with the resource.</p>"
+        },
+        "Type": {
+          "shape": "__string",
+          "documentation": "<p>The type of the schema.</p>"
+        },
+        "VersionCreatedDate": {
+          "shape": "__timestampIso8601",
+          "documentation": "<p>The date the schema version was created.</p>"
+        }
+      }
+    },
+    "DescribeSchemaRequest": {
+      "type": "structure",
+      "members": {
+        "RegistryName": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "registryName"
+        },
+        "SchemaName": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "schemaName"
+        },
+        "SchemaVersion": {
+          "shape": "__string",
+          "location": "querystring",
+          "locationName": "schemaVersion"
+        }
+      },
+      "required": [
+        "RegistryName",
+        "SchemaName"
+      ]
+    },
+    "DescribeSchemaResponse": {
+      "type": "structure",
+      "members": {
+        "Content": {
+          "shape": "__string"
+        },
+        "Description": {
+          "shape": "__string",
+          "documentation": "<p>The description of the schema.</p>"
+        },
+        "LastModified": {
+          "shape": "__timestampIso8601",
+          "documentation": "<p>The date and time that schema was modified.</p>"
+        },
+        "SchemaArn": {
+          "shape": "__string",
+          "documentation": "<p>The ARN of the schema.</p>"
+        },
+        "SchemaName": {
+          "shape": "__string",
+          "documentation": "<p>The name of the schema.</p>"
+        },
+        "SchemaVersion": {
+          "shape": "__string",
+          "documentation": "<p>The version number of the schema</p>"
+        },
+        "Tags": {
+          "shape": "Tags",
+          "locationName": "tags",
+          "documentation": "<p>Tags associated with the resource.</p>"
+        },
+        "Type": {
+          "shape": "__string",
+          "documentation": "<p>The type of the schema.</p>"
+        },
+        "VersionCreatedDate": {
+          "shape": "__timestampIso8601",
+          "documentation": "<p>The date the schema version was created.</p>"
+        }
+      }
+    },
+    "DiscovererOutput": {
+      "type": "structure",
+      "members": {
+        "Description": {
+          "shape": "__string",
+          "documentation": "<p>The description of the discoverer.</p>"
+        },
+        "DiscovererArn": {
+          "shape": "__string",
+          "documentation": "<p>The ARN of the discoverer.</p>"
+        },
+        "DiscovererId": {
+          "shape": "__string",
+          "documentation": "<p>The ID of the discoverer.</p>"
+        },
+        "SourceArn": {
+          "shape": "__string",
+          "documentation": "<p>The ARN of the event bus.</p>"
+        },
+        "State": {
+          "shape": "DiscovererState",
+          "documentation": "<p>The state of the discoverer.</p>"
+        },
+        "Tags": {
+          "shape": "Tags",
+          "locationName": "tags",
+          "documentation": "<p>Tags associated with the resource.</p>"
+        }
+      }
+    },
+    "DiscovererState": {
+      "type": "string",
+      "enum": [
+        "STARTED",
+        "STOPPED"
+      ]
+    },
+    "DiscovererStateOutput": {
+      "type": "structure",
+      "members": {
+        "DiscovererId": {
+          "shape": "__string",
+          "documentation": "<p>The ID of the discoverer.</p>"
+        },
+        "State": {
+          "shape": "DiscovererState",
+          "documentation": "<p>The state of the discoverer.</p>"
+        }
+      }
+    },
+    "DiscovererSummary": {
+      "type": "structure",
+      "members": {
+        "DiscovererArn": {
+          "shape": "__string",
+          "documentation": "<p>The ARN of the discoverer.</p>"
+        },
+        "DiscovererId": {
+          "shape": "__string",
+          "documentation": "<p>The ID of the discoverer.</p>"
+        },
+        "SourceArn": {
+          "shape": "__string",
+          "documentation": "<p>The ARN of the event bus.</p>"
+        },
+        "State": {
+          "shape": "DiscovererState"
+        },
+        "Tags": {
+          "shape": "Tags",
+          "locationName": "tags",
+          "documentation": "<p>Tags associated with the resource.</p>"
+        }
+      }
+    },
+    "ErrorOutput": {
+      "type": "structure",
+      "members": {
+        "Code": {
+          "shape": "__string",
+          "documentation": "<p>The error code.</p>"
+        },
+        "Message": {
+          "shape": "__string",
+          "documentation": "<p>The message string of the error output.</p>"
+        }
+      },
+      "required": [
+        "Message",
+        "Code"
+      ]
+    },
+    "ForbiddenException": {
+      "type": "structure",
+      "members": {
+        "Code": {
+          "shape": "__string",
+          "documentation": "<p>The error code.</p>"
+        },
+        "Message": {
+          "shape": "__string",
+          "documentation": "<p>The message string of the error output.</p>"
+        }
+      },
+      "required": [
+        "Message",
+        "Code"
+      ],
+      "exception": true,
+      "error": {
+        "httpStatusCode": 403
+      }
+    },
+    "GetCodeBindingSourceOutput": {
+      "type": "string"
+    },
+    "GetCodeBindingSourceRequest": {
+      "type": "structure",
+      "members": {
+        "Language": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "language"
+        },
+        "RegistryName": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "registryName"
+        },
+        "SchemaName": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "schemaName"
+        },
+        "SchemaVersion": {
+          "shape": "__string",
+          "location": "querystring",
+          "locationName": "schemaVersion"
+        }
+      },
+      "required": [
+        "RegistryName",
+        "SchemaName",
+        "Language"
+      ]
+    },
+    "GetCodeBindingSourceResponse": {
+      "type": "structure",
+      "members": {
+        "Body": {
+          "shape": "Body"
+        }
+      },
+      "payload": "Body"
+    },
+    "GetDiscoveredSchemaInput": {
+      "type": "structure",
+      "members": {
+        "Events": {
+          "shape": "__listOfGetDiscoveredSchemaVersionItemInput",
+          "documentation": "<p>An array of strings that</p>"
+        },
+        "Type": {
+          "shape": "Type",
+          "documentation": "<p>The type of event.</p>"
+        }
+      },
+      "required": [
+        "Type",
+        "Events"
+      ]
+    },
+    "GetDiscoveredSchemaOutput": {
+      "type": "structure",
+      "members": {
+        "Content": {
+          "shape": "__string"
+        }
+      }
+    },
+    "GetDiscoveredSchemaRequest": {
+      "type": "structure",
+      "members": {
+        "Events": {
+          "shape": "__listOfGetDiscoveredSchemaVersionItemInput",
+          "documentation": "<p>An array of strings that</p>"
+        },
+        "Type": {
+          "shape": "Type",
+          "documentation": "<p>The type of event.</p>"
+        }
+      },
+      "required": [
+        "Type",
+        "Events"
+      ]
+    },
+    "GetDiscoveredSchemaResponse": {
+      "type": "structure",
+      "members": {
+        "Content": {
+          "shape": "__string"
+        }
+      }
+    },
+    "GetDiscoveredSchemaVersionItemInput": {
+      "type": "string",
+      "min": 1,
+      "max": 100000
+    },
+    "GoneException": {
+      "type": "structure",
+      "members": {
+        "Code": {
+          "shape": "__string",
+          "documentation": "<p>The error code.</p>"
+        },
+        "Message": {
+          "shape": "__string",
+          "documentation": "<p>The message string of the error output.</p>"
+        }
+      },
+      "required": [
+        "Message",
+        "Code"
+      ],
+      "exception": true,
+      "error": {
+        "httpStatusCode": 410
+      }
+    },
+    "InternalServerErrorException": {
+      "type": "structure",
+      "members": {
+        "Code": {
+          "shape": "__string",
+          "documentation": "<p>The error code.</p>"
+        },
+        "Message": {
+          "shape": "__string",
+          "documentation": "<p>The message string of the error output.</p>"
+        }
+      },
+      "required": [
+        "Message",
+        "Code"
+      ],
+      "exception": true,
+      "error": {
+        "httpStatusCode": 500
+      }
+    },
+    "Limit": {
+      "type": "integer",
+      "min": 1,
+      "max": 100
+    },
+    "ListDiscoverersOutput": {
+      "type": "structure",
+      "members": {
+        "Discoverers": {
+          "shape": "__listOfDiscovererSummary",
+          "documentation": "<p>An array of DiscovererSummary information.</p>"
+        },
+        "NextToken": {
+          "shape": "__string",
+          "documentation": "<p>The token that specifies the next page of results to return. To request the first page, leave NextToken empty. The token will expire in 24 hours, and cannot be shared with other accounts.</p>"
+        }
+      }
+    },
+    "ListDiscoverersRequest": {
+      "type": "structure",
+      "members": {
+        "DiscovererIdPrefix": {
+          "shape": "__string",
+          "location": "querystring",
+          "locationName": "discovererIdPrefix"
+        },
+        "Limit": {
+          "shape": "__integer",
+          "location": "querystring",
+          "locationName": "limit"
+        },
+        "NextToken": {
+          "shape": "__string",
+          "location": "querystring",
+          "locationName": "nextToken"
+        },
+        "SourceArnPrefix": {
+          "shape": "__string",
+          "location": "querystring",
+          "locationName": "sourceArnPrefix"
+        }
+      }
+    },
+    "ListDiscoverersResponse": {
+      "type": "structure",
+      "members": {
+        "Discoverers": {
+          "shape": "__listOfDiscovererSummary",
+          "documentation": "<p>An array of DiscovererSummary information.</p>"
+        },
+        "NextToken": {
+          "shape": "__string",
+          "documentation": "<p>The token that specifies the next page of results to return. To request the first page, leave NextToken empty. The token will expire in 24 hours, and cannot be shared with other accounts.</p>"
+        }
+      }
+    },
+    "ListRegistriesOutput": {
+      "type": "structure",
+      "members": {
+        "NextToken": {
+          "shape": "__string",
+          "documentation": "<p>The token that specifies the next page of results to return. To request the first page, leave NextToken empty. The token will expire in 24 hours, and cannot be shared with other accounts.</p>"
+        },
+        "Registries": {
+          "shape": "__listOfRegistrySummary",
+          "documentation": "<p>An array of registry summaries.</p>"
+        }
+      },
+      "documentation": "<p>List the registries.</p>"
+    },
+    "ListRegistriesRequest": {
+      "type": "structure",
+      "members": {
+        "Limit": {
+          "shape": "__integer",
+          "location": "querystring",
+          "locationName": "limit"
+        },
+        "NextToken": {
+          "shape": "__string",
+          "location": "querystring",
+          "locationName": "nextToken"
+        },
+        "RegistryNamePrefix": {
+          "shape": "__string",
+          "location": "querystring",
+          "locationName": "registryNamePrefix"
+        },
+        "Scope": {
+          "shape": "__string",
+          "location": "querystring",
+          "locationName": "scope"
+        }
+      }
+    },
+    "ListRegistriesResponse": {
+      "type": "structure",
+      "members": {
+        "NextToken": {
+          "shape": "__string",
+          "documentation": "<p>The token that specifies the next page of results to return. To request the first page, leave NextToken empty. The token will expire in 24 hours, and cannot be shared with other accounts.</p>"
+        },
+        "Registries": {
+          "shape": "__listOfRegistrySummary",
+          "documentation": "<p>An array of registry summaries.</p>"
+        }
+      }
+    },
+    "ListSchemaVersionsOutput": {
+      "type": "structure",
+      "members": {
+        "NextToken": {
+          "shape": "__string",
+          "documentation": "<p>The token that specifies the next page of results to return. To request the first page, leave NextToken empty. The token will expire in 24 hours, and cannot be shared with other accounts.</p>"
+        },
+        "SchemaVersions": {
+          "shape": "__listOfSchemaVersionSummary",
+          "documentation": "<p>An array of schema version summaries.</p>"
+        }
+      }
+    },
+    "ListSchemaVersionsRequest": {
+      "type": "structure",
+      "members": {
+        "Limit": {
+          "shape": "__integer",
+          "location": "querystring",
+          "locationName": "limit"
+        },
+        "NextToken": {
+          "shape": "__string",
+          "location": "querystring",
+          "locationName": "nextToken"
+        },
+        "RegistryName": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "registryName"
+        },
+        "SchemaName": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "schemaName"
+        }
+      },
+      "required": [
+        "RegistryName",
+        "SchemaName"
+      ]
+    },
+    "ListSchemaVersionsResponse": {
+      "type": "structure",
+      "members": {
+        "NextToken": {
+          "shape": "__string",
+          "documentation": "<p>The token that specifies the next page of results to return. To request the first page, leave NextToken empty. The token will expire in 24 hours, and cannot be shared with other accounts.</p>"
+        },
+        "SchemaVersions": {
+          "shape": "__listOfSchemaVersionSummary",
+          "documentation": "<p>An array of schema version summaries.</p>"
+        }
+      }
+    },
+    "ListSchemasOutput": {
+      "type": "structure",
+      "members": {
+        "NextToken": {
+          "shape": "__string",
+          "documentation": "<p>The token that specifies the next page of results to return. To request the first page, leave NextToken empty. The token will expire in 24 hours, and cannot be shared with other accounts.</p>"
+        },
+        "Schemas": {
+          "shape": "__listOfSchemaSummary",
+          "documentation": "<p>An array of schema summaries.</p>"
+        }
+      }
+    },
+    "ListSchemasRequest": {
+      "type": "structure",
+      "members": {
+        "Limit": {
+          "shape": "__integer",
+          "location": "querystring",
+          "locationName": "limit"
+        },
+        "NextToken": {
+          "shape": "__string",
+          "location": "querystring",
+          "locationName": "nextToken"
+        },
+        "RegistryName": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "registryName"
+        },
+        "SchemaNamePrefix": {
+          "shape": "__string",
+          "location": "querystring",
+          "locationName": "schemaNamePrefix"
+        }
+      },
+      "required": [
+        "RegistryName"
+      ]
+    },
+    "ListSchemasResponse": {
+      "type": "structure",
+      "members": {
+        "NextToken": {
+          "shape": "__string",
+          "documentation": "<p>The token that specifies the next page of results to return. To request the first page, leave NextToken empty. The token will expire in 24 hours, and cannot be shared with other accounts.</p>"
+        },
+        "Schemas": {
+          "shape": "__listOfSchemaSummary",
+          "documentation": "<p>An array of schema summaries.</p>"
+        }
+      }
+    },
+    "ListTagsForResourceRequest": {
+      "type": "structure",
+      "members": {
+        "ResourceArn": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "resource-arn"
+        }
+      },
+      "required": [
+        "ResourceArn"
+      ]
+    },
+    "ListTagsForResourceResponse": {
+      "type": "structure",
+      "members": {
+        "Tags": {
+          "shape": "Tags"
+        }
+      },
+      "required": [
+        "Tags"
+      ]
+    },
+    "LockServiceLinkedRoleInput": {
+      "type": "structure",
+      "members": {
+        "RoleArn": {
+          "shape": "__stringMin1Max1600"
+        },
+        "Timeout": {
+          "shape": "__integerMin1Max29000"
+        }
+      },
+      "required": [
+        "Timeout",
+        "RoleArn"
+      ]
+    },
+    "LockServiceLinkedRoleOutput": {
+      "type": "structure",
+      "members": {
+        "CanBeDeleted": {
+          "shape": "__boolean"
+        },
+        "ReasonOfFailure": {
+          "shape": "__stringMin1Max1600"
+        },
+        "RelatedResources": {
+          "shape": "__listOfDiscovererSummary"
+        }
+      }
+    },
+    "LockServiceLinkedRoleRequest": {
+      "type": "structure",
+      "members": {
+        "RoleArn": {
+          "shape": "__stringMin1Max1600"
+        },
+        "Timeout": {
+          "shape": "__integerMin1Max29000"
+        }
+      },
+      "required": [
+        "Timeout",
+        "RoleArn"
+      ]
+    },
+    "LockServiceLinkedRoleResponse": {
+      "type": "structure",
+      "members": {
+        "CanBeDeleted": {
+          "shape": "__boolean"
+        },
+        "ReasonOfFailure": {
+          "shape": "__stringMin1Max1600"
+        },
+        "RelatedResources": {
+          "shape": "__listOfDiscovererSummary"
+        }
+      }
+    },
+    "NotFoundException": {
+      "type": "structure",
+      "members": {
+        "Code": {
+          "shape": "__string",
+          "documentation": "<p>The error code.</p>"
+        },
+        "Message": {
+          "shape": "__string",
+          "documentation": "<p>The message string of the error output.</p>"
+        }
+      },
+      "required": [
+        "Message",
+        "Code"
+      ],
+      "exception": true,
+      "error": {
+        "httpStatusCode": 404
+      }
+    },
+    "PutCodeBindingRequest": {
+      "type": "structure",
+      "members": {
+        "Language": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "language"
+        },
+        "RegistryName": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "registryName"
+        },
+        "SchemaName": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "schemaName"
+        },
+        "SchemaVersion": {
+          "shape": "__string",
+          "location": "querystring",
+          "locationName": "schemaVersion"
+        }
+      },
+      "required": [
+        "RegistryName",
+        "SchemaName",
+        "Language"
+      ]
+    },
+    "PutCodeBindingResponse": {
+      "type": "structure",
+      "members": {
+        "CreationDate": {
+          "shape": "__timestampIso8601",
+          "documentation": "<p>The time and date that the code binding was created.</p>"
+        },
+        "LastModified": {
+          "shape": "__timestampIso8601",
+          "documentation": "<p>The date and time that code bindings were modified.</p>"
+        },
+        "SchemaVersion": {
+          "shape": "__string",
+          "documentation": "<p>The version number of the schema.</p>"
+        },
+        "Status": {
+          "shape": "CodeGenerationStatus",
+          "documentation": "<p>The current status of code binding generation.</p>"
+        }
+      }
+    },
+    "RegistryOutput": {
+      "type": "structure",
+      "members": {
+        "Description": {
+          "shape": "__string",
+          "documentation": "<p>The description of the registry.</p>"
+        },
+        "RegistryArn": {
+          "shape": "__string",
+          "documentation": "<p>The ARN of the registry.</p>"
+        },
+        "RegistryName": {
+          "shape": "__string",
+          "documentation": "<p>The name of the registry.</p>"
+        },
+        "Tags": {
+          "shape": "Tags",
+          "locationName": "tags",
+          "documentation": "<p>Tags associated with the registry.</p>"
+        }
+      }
+    },
+    "RegistrySummary": {
+      "type": "structure",
+      "members": {
+        "RegistryArn": {
+          "shape": "__string",
+          "documentation": "<p>The ARN of the registry.</p>"
+        },
+        "RegistryName": {
+          "shape": "__string",
+          "documentation": "<p>The name of the registry.</p>"
+        },
+        "Tags": {
+          "shape": "Tags",
+          "locationName": "tags",
+          "documentation": "<p>Tags associated with the registry.</p>"
+        }
+      }
+    },
+    "SchemaOutput": {
+      "type": "structure",
+      "members": {
+        "Description": {
+          "shape": "__string",
+          "documentation": "<p>The description of the schema.</p>"
+        },
+        "LastModified": {
+          "shape": "__timestampIso8601",
+          "documentation": "<p>The date and time that schema was modified.</p>"
+        },
+        "SchemaArn": {
+          "shape": "__string",
+          "documentation": "<p>The ARN of the schema.</p>"
+        },
+        "SchemaName": {
+          "shape": "__string",
+          "documentation": "<p>The name of the schema.</p>"
+        },
+        "SchemaVersion": {
+          "shape": "__string",
+          "documentation": "<p>The version number of the schema</p>"
+        },
+        "Tags": {
+          "shape": "Tags",
+          "locationName": "tags"
+        },
+        "Type": {
+          "shape": "__string",
+          "documentation": "<p>The type of the schema.</p>"
+        },
+        "VersionCreatedDate": {
+          "shape": "__timestampIso8601",
+          "documentation": "<p>The date the schema version was created.</p>"
+        }
+      }
+    },
+    "SchemaSummary": {
+      "type": "structure",
+      "members": {
+        "LastModified": {
+          "shape": "__timestampIso8601",
+          "documentation": "<p>The date and time that schema was modified.</p>"
+        },
+        "SchemaArn": {
+          "shape": "__string",
+          "documentation": "<p>The ARN of the schema.</p>"
+        },
+        "SchemaName": {
+          "shape": "__string",
+          "documentation": "<p>The name of the schema.</p>"
+        },
+        "Tags": {
+          "shape": "Tags",
+          "locationName": "tags",
+          "documentation": "<p>Tags associated with the schema.</p>"
+        },
+        "VersionCount": {
+          "shape": "__long",
+          "documentation": "<p>The number of versions available for the schema.</p>"
+        }
+      },
+      "documentation": "<p>A summary of schema details.</p>"
+    },
+    "SchemaVersionSummary": {
+      "type": "structure",
+      "members": {
+        "SchemaArn": {
+          "shape": "__string",
+          "documentation": "<p>The ARN of the schema version.</p>"
+        },
+        "SchemaName": {
+          "shape": "__string",
+          "documentation": "<p>The name of the schema.</p>"
+        },
+        "SchemaVersion": {
+          "shape": "__string",
+          "documentation": "<p>The version number of the schema.</p>"
+        }
+      }
+    },
+    "SearchSchemaSummary": {
+      "type": "structure",
+      "members": {
+        "RegistryName": {
+          "shape": "__string",
+          "documentation": "<p>The name of the registry.</p>"
+        },
+        "SchemaArn": {
+          "shape": "__string",
+          "documentation": "<p>The ARN of the schema.</p>"
+        },
+        "SchemaName": {
+          "shape": "__string",
+          "documentation": "<p>The name of the schema.</p>"
+        },
+        "SchemaVersions": {
+          "shape": "__listOfSearchSchemaVersionSummary",
+          "documentation": "<p>An array of schema version summaries.</p>"
+        }
+      }
+    },
+    "SearchSchemaVersionSummary": {
+      "type": "structure",
+      "members": {
+        "CreatedDate": {
+          "shape": "__timestampIso8601"
+        },
+        "SchemaVersion": {
+          "shape": "__string",
+          "documentation": "<p>The version number of the schema</p>"
+        }
+      }
+    },
+    "SearchSchemasOutput": {
+      "type": "structure",
+      "members": {
+        "NextToken": {
+          "shape": "__string",
+          "documentation": "<p>The token that specifies the next page of results to return. To request the first page, leave NextToken empty. The token will expire in 24 hours, and cannot be shared with other accounts.</p>"
+        },
+        "Schemas": {
+          "shape": "__listOfSearchSchemaSummary",
+          "documentation": "<p>An array of SearchSchemaSummary information.</p>"
+        }
+      }
+    },
+    "SearchSchemasRequest": {
+      "type": "structure",
+      "members": {
+        "Keywords": {
+          "shape": "__string",
+          "location": "querystring",
+          "locationName": "keywords"
+        },
+        "Limit": {
+          "shape": "__integer",
+          "location": "querystring",
+          "locationName": "limit"
+        },
+        "NextToken": {
+          "shape": "__string",
+          "location": "querystring",
+          "locationName": "nextToken"
+        },
+        "RegistryName": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "registryName"
+        }
+      },
+      "required": [
+        "RegistryName",
+        "Keywords"
+      ]
+    },
+    "SearchSchemasResponse": {
+      "type": "structure",
+      "members": {
+        "NextToken": {
+          "shape": "__string",
+          "documentation": "<p>The token that specifies the next page of results to return. To request the first page, leave NextToken empty. The token will expire in 24 hours, and cannot be shared with other accounts.</p>"
+        },
+        "Schemas": {
+          "shape": "__listOfSearchSchemaSummary",
+          "documentation": "<p>An array of SearchSchemaSummary information.</p>"
+        }
+      }
+    },
+    "ServiceUnavailableException": {
+      "type": "structure",
+      "members": {
+        "Code": {
+          "shape": "__string",
+          "documentation": "<p>The error code.</p>"
+        },
+        "Message": {
+          "shape": "__string",
+          "documentation": "<p>The message string of the error output.</p>"
+        }
+      },
+      "required": [
+        "Message",
+        "Code"
+      ],
+      "exception": true,
+      "error": {
+        "httpStatusCode": 503
+      }
+    },
+    "StartDiscovererRequest": {
+      "type": "structure",
+      "members": {
+        "DiscovererId": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "discovererId"
+        }
+      },
+      "required": [
+        "DiscovererId"
+      ]
+    },
+    "StartDiscovererResponse": {
+      "type": "structure",
+      "members": {
+        "DiscovererId": {
+          "shape": "__string",
+          "documentation": "<p>The ID of the discoverer.</p>"
+        },
+        "State": {
+          "shape": "DiscovererState",
+          "documentation": "<p>The state of the discoverer.</p>"
+        }
+      }
+    },
+    "StopDiscovererRequest": {
+      "type": "structure",
+      "members": {
+        "DiscovererId": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "discovererId"
+        }
+      },
+      "required": [
+        "DiscovererId"
+      ]
+    },
+    "StopDiscovererResponse": {
+      "type": "structure",
+      "members": {
+        "DiscovererId": {
+          "shape": "__string",
+          "documentation": "<p>The ID of the discoverer.</p>"
+        },
+        "State": {
+          "shape": "DiscovererState",
+          "documentation": "<p>The state of the discoverer.</p>"
+        }
+      }
+    },
+    "TagResourceInput": {
+      "type": "structure",
+      "members": {
+        "Tags": {
+          "shape": "Tags",
+          "locationName": "tags"
+        }
+      },
+      "required": [
+        "Tags"
+      ]
+    },
+    "TagResourceRequest": {
+      "type": "structure",
+      "members": {
+        "ResourceArn": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "resource-arn"
+        },
+        "Tags": {
+          "shape": "Tags",
+          "locationName": "tags"
+        }
+      },
+      "required": [
+        "ResourceArn",
+        "Tags"
+      ]
+    },
+    "Tags": {
+      "type": "map",
+      "documentation": "<p>Key-value pairs associated with a resource.</p>",
+      "key": {
+        "shape": "__string"
+      },
+      "value": {
+        "shape": "__string"
+      }
+    },
+    "TooManyRequestsException": {
+      "type": "structure",
+      "members": {
+        "Code": {
+          "shape": "__string",
+          "documentation": "<p>The error code.</p>"
+        },
+        "Message": {
+          "shape": "__string",
+          "documentation": "<p>The message string of the error output.</p>"
+        }
+      },
+      "required": [
+        "Message",
+        "Code"
+      ],
+      "exception": true,
+      "error": {
+        "httpStatusCode": 429
+      }
+    },
+    "Type": {
+      "type": "string",
+      "enum": [
+        "OpenApi3"
+      ]
+    },
+    "UnauthorizedException": {
+      "type": "structure",
+      "members": {
+        "Code": {
+          "shape": "__string",
+          "documentation": "<p>The error code.</p>"
+        },
+        "Message": {
+          "shape": "__string",
+          "documentation": "<p>The message string of the error output.</p>"
+        }
+      },
+      "required": [
+        "Message",
+        "Code"
+      ],
+      "exception": true,
+      "error": {
+        "httpStatusCode": 401
+      }
+    },
+    "UnlockServiceLinkedRoleInput": {
+      "type": "structure",
+      "members": {
+        "RoleArn": {
+          "shape": "__stringMin1Max1600"
+        }
+      },
+      "required": [
+        "RoleArn"
+      ]
+    },
+    "UnlockServiceLinkedRoleRequest": {
+      "type": "structure",
+      "members": {
+        "RoleArn": {
+          "shape": "__stringMin1Max1600"
+        }
+      },
+      "required": [
+        "RoleArn"
+      ]
+    },
+    "UnlockServiceLinkedRoleResponse": {
+      "type": "structure",
+      "members": {}
+    },
+    "UntagResourceRequest": {
+      "type": "structure",
+      "members": {
+        "ResourceArn": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "resource-arn"
+        },
+        "TagKeys": {
+          "shape": "__listOf__string",
+          "location": "querystring",
+          "locationName": "tagKeys"
+        }
+      },
+      "required": [
+        "TagKeys",
+        "ResourceArn"
+      ]
+    },
+    "UpdateDiscovererInput": {
+      "type": "structure",
+      "members": {
+        "Description": {
+          "shape": "__stringMin0Max256",
+          "documentation": "<p>The description of the discoverer to update.</p>"
+        }
+      }
+    },
+    "UpdateDiscovererRequest": {
+      "type": "structure",
+      "members": {
+        "Description": {
+          "shape": "__stringMin0Max256",
+          "documentation": "<p>The description of the discoverer to update.</p>"
+        },
+        "DiscovererId": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "discovererId"
+        }
+      },
+      "required": [
+        "DiscovererId"
+      ]
+    },
+    "UpdateDiscovererResponse": {
+      "type": "structure",
+      "members": {
+        "Description": {
+          "shape": "__string",
+          "documentation": "<p>The description of the discoverer.</p>"
+        },
+        "DiscovererArn": {
+          "shape": "__string",
+          "documentation": "<p>The ARN of the discoverer.</p>"
+        },
+        "DiscovererId": {
+          "shape": "__string",
+          "documentation": "<p>The ID of the discoverer.</p>"
+        },
+        "SourceArn": {
+          "shape": "__string",
+          "documentation": "<p>The ARN of the event bus.</p>"
+        },
+        "State": {
+          "shape": "DiscovererState",
+          "documentation": "<p>The state of the discoverer.</p>"
+        },
+        "Tags": {
+          "shape": "Tags",
+          "locationName": "tags",
+          "documentation": "<p>Tags associated with the resource.</p>"
+        }
+      }
+    },
+    "UpdateRegistryInput": {
+      "type": "structure",
+      "members": {
+        "Description": {
+          "shape": "__stringMin0Max256",
+          "documentation": "<p>The description of the registry to update.</p>"
+        }
+      }
+    },
+    "UpdateRegistryRequest": {
+      "type": "structure",
+      "members": {
+        "Description": {
+          "shape": "__stringMin0Max256",
+          "documentation": "<p>The description of the registry to update.</p>"
+        },
+        "RegistryName": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "registryName"
+        }
+      },
+      "required": [
+        "RegistryName"
+      ]
+    },
+    "UpdateRegistryResponse": {
+      "type": "structure",
+      "members": {
+        "Description": {
+          "shape": "__string",
+          "documentation": "<p>The description of the registry.</p>"
+        },
+        "RegistryArn": {
+          "shape": "__string",
+          "documentation": "<p>The ARN of the registry.</p>"
+        },
+        "RegistryName": {
+          "shape": "__string",
+          "documentation": "<p>The name of the registry.</p>"
+        },
+        "Tags": {
+          "shape": "Tags",
+          "locationName": "tags",
+          "documentation": "<p>Tags associated with the registry.</p>"
+        }
+      }
+    },
+    "UpdateSchemaInput": {
+      "type": "structure",
+      "members": {
+        "ClientTokenId": {
+          "shape": "__stringMin0Max36",
+          "documentation": "<p>The ID of the client token.</p>",
+          "idempotencyToken": true
+        },
+        "Content": {
+          "shape": "__stringMin1Max100000",
+          "documentation": "<p>The source of the schema definition.</p>"
+        },
+        "Description": {
+          "shape": "__stringMin0Max256",
+          "documentation": "<p>The description of the schema.</p>"
+        },
+        "Type": {
+          "shape": "Type",
+          "documentation": "<p>The schema type for the events schema.</p>"
+        }
+      }
+    },
+    "UpdateSchemaRequest": {
+      "type": "structure",
+      "members": {
+        "ClientTokenId": {
+          "shape": "__stringMin0Max36",
+          "documentation": "<p>The ID of the client token.</p>",
+          "idempotencyToken": true
+        },
+        "Content": {
+          "shape": "__stringMin1Max100000",
+          "documentation": "<p>The source of the schema definition.</p>"
+        },
+        "Description": {
+          "shape": "__stringMin0Max256",
+          "documentation": "<p>The description of the schema.</p>"
+        },
+        "RegistryName": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "registryName"
+        },
+        "SchemaName": {
+          "shape": "__string",
+          "location": "uri",
+          "locationName": "schemaName"
+        },
+        "Type": {
+          "shape": "Type",
+          "documentation": "<p>The schema type for the events schema.</p>"
+        }
+      },
+      "required": [
+        "RegistryName",
+        "SchemaName"
+      ]
+    },
+    "UpdateSchemaResponse": {
+      "type": "structure",
+      "members": {
+        "Description": {
+          "shape": "__string",
+          "documentation": "<p>The description of the schema.</p>"
+        },
+        "LastModified": {
+          "shape": "__timestampIso8601",
+          "documentation": "<p>The date and time that schema was modified.</p>"
+        },
+        "SchemaArn": {
+          "shape": "__string",
+          "documentation": "<p>The ARN of the schema.</p>"
+        },
+        "SchemaName": {
+          "shape": "__string",
+          "documentation": "<p>The name of the schema.</p>"
+        },
+        "SchemaVersion": {
+          "shape": "__string",
+          "documentation": "<p>The version number of the schema</p>"
+        },
+        "Tags": {
+          "shape": "Tags",
+          "locationName": "tags"
+        },
+        "Type": {
+          "shape": "__string",
+          "documentation": "<p>The type of the schema.</p>"
+        },
+        "VersionCreatedDate": {
+          "shape": "__timestampIso8601",
+          "documentation": "<p>The date the schema version was created.</p>"
+        }
+      }
+    },
+    "__boolean": {
+      "type": "boolean"
+    },
+    "__double": {
+      "type": "double"
+    },
+    "__integer": {
+      "type": "integer"
+    },
+    "__integerMin1Max29000": {
+      "type": "integer",
+      "min": 1,
+      "max": 29000
+    },
+    "__listOfDiscovererSummary": {
+      "type": "list",
+      "member": {
+        "shape": "DiscovererSummary"
+      }
+    },
+    "__listOfGetDiscoveredSchemaVersionItemInput": {
+      "type": "list",
+      "min": 1,
+      "max": 10,
+      "member": {
+        "shape": "GetDiscoveredSchemaVersionItemInput"
+      }
+    },
+    "__listOfRegistrySummary": {
+      "type": "list",
+      "member": {
+        "shape": "RegistrySummary"
+      }
+    },
+    "__listOfSchemaSummary": {
+      "type": "list",
+      "member": {
+        "shape": "SchemaSummary"
+      }
+    },
+    "__listOfSchemaVersionSummary": {
+      "type": "list",
+      "member": {
+        "shape": "SchemaVersionSummary"
+      }
+    },
+    "__listOfSearchSchemaSummary": {
+      "type": "list",
+      "member": {
+        "shape": "SearchSchemaSummary"
+      }
+    },
+    "__listOfSearchSchemaVersionSummary": {
+      "type": "list",
+      "member": {
+        "shape": "SearchSchemaVersionSummary"
+      }
+    },
+    "__listOf__string": {
+      "type": "list",
+      "member": {
+        "shape": "__string"
+      }
+    },
+    "__long": {
+      "type": "long"
+    },
+    "__string": {
+      "type": "string"
+    },
+    "__stringMin0Max256": {
+      "type": "string",
+      "min": 0,
+      "max": 256
+    },
+    "__stringMin0Max36": {
+      "type": "string",
+      "min": 0,
+      "max": 36
+    },
+    "__stringMin1Max100000": {
+      "type": "string",
+      "min": 1,
+      "max": 100000
+    },
+    "__stringMin1Max1600": {
+      "type": "string",
+      "min": 1,
+      "max": 1600
+    },
+    "__stringMin20Max1600": {
+      "type": "string",
+      "min": 20,
+      "max": 1600
+    },
+    "__timestampIso8601": {
+      "type": "timestamp",
+      "timestampFormat": "iso8601"
+    },
+    "__timestampUnix": {
+      "type": "timestamp",
+      "timestampFormat": "unixTimestamp"
+    },
+    "Body": {
+      "type": "blob"
+    }
+  },
+  "documentation": "<p>AWS EventBridge Schemas</p>"
+}
diff --git a/services/schemas/src/main/resources/codegen-resources/waiters-2.json b/services/schemas/src/main/resources/codegen-resources/waiters-2.json
new file mode 100644
index 000000000000..4f642f615c44
--- /dev/null
+++ b/services/schemas/src/main/resources/codegen-resources/waiters-2.json
@@ -0,0 +1,36 @@
+{
+  "version": 2,
+  "waiters": {
+    "CodeBindingExists": {
+      "description": "Wait until code binding is generated",
+      "delay": 2,
+      "operation": "DescribeCodeBinding",
+      "maxAttempts": 30,
+      "acceptors": [
+        {
+          "expected": "CREATE_COMPLETE",
+          "matcher": "path",
+          "state": "success",
+          "argument": "Status"
+        },
+        {
+          "expected": "CREATE_IN_PROGRESS",
+          "matcher": "path",
+          "state": "retry",
+          "argument": "Status"
+        },
+        {
+          "expected": "CREATE_FAILED",
+          "matcher": "path",
+          "state": "failure",
+          "argument": "Status"
+        },
+        {
+          "matcher": "error",
+          "expected": "NotFoundException",
+          "state": "failure"
+        }
+      ]
+    }
+  }
+}
diff --git a/services/secretsmanager/pom.xml b/services/secretsmanager/pom.xml
index 86a4e123bb31..b38acf0441e3 100644
--- a/services/secretsmanager/pom.xml
+++ b/services/secretsmanager/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -22,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>secretsmanager</artifactId>
     <name>AWS Java SDK :: Services :: AWS Secrets Manager</name>
diff --git a/services/secretsmanager/src/main/resources/codegen-resources/service-2.json b/services/secretsmanager/src/main/resources/codegen-resources/service-2.json
index ec3075e59aa1..b39a887620e1 100644
--- a/services/secretsmanager/src/main/resources/codegen-resources/service-2.json
+++ b/services/secretsmanager/src/main/resources/codegen-resources/service-2.json
@@ -542,7 +542,10 @@
           "shape":"SecretVersionsToStagesMapType",
           "documentation":"<p>A list of all of the currently assigned <code>VersionStage</code> staging labels and the <code>VersionId</code> that each is attached to. Staging labels are used to keep track of the different versions during the rotation process.</p> <note> <p>A version that does not have any staging labels attached is considered deprecated and subject to deletion. Such versions are not included in this list.</p> </note>"
         },
-        "OwningService":{"shape":"OwningServiceType"}
+        "OwningService":{
+          "shape":"OwningServiceType",
+          "documentation":"<p>Returns the name of the service that created this secret.</p>"
+        }
       }
     },
     "DescriptionType":{
@@ -1057,7 +1060,7 @@
     },
     "SecretBinaryType":{
       "type":"blob",
-      "max":10240,
+      "max":65536,
       "min":0,
       "sensitive":true
     },
@@ -1087,7 +1090,7 @@
         },
         "RotationEnabled":{
           "shape":"RotationEnabledType",
-          "documentation":"<p>Indicated whether automatic, scheduled rotation is enabled for this secret.</p>",
+          "documentation":"<p>Indicates whether automatic, scheduled rotation is enabled for this secret.</p>",
           "box":true
         },
         "RotationLambdaARN":{
@@ -1125,7 +1128,10 @@
           "shape":"SecretVersionsToStagesMapType",
           "documentation":"<p>A list of all of the currently assigned <code>SecretVersionStage</code> staging labels and the <code>SecretVersionId</code> that each is attached to. Staging labels are used to keep track of the different versions during the rotation process.</p> <note> <p>A version that does not have any <code>SecretVersionStage</code> is considered deprecated and subject to deletion. Such versions are not included in this list.</p> </note>"
         },
-        "OwningService":{"shape":"OwningServiceType"}
+        "OwningService":{
+          "shape":"OwningServiceType",
+          "documentation":"<p>Returns the name of the service that created the secret.</p>"
+        }
       },
       "documentation":"<p>A structure that contains the details about a secret. It does not include the encrypted <code>SecretString</code> and <code>SecretBinary</code> values. To get those values, use the <a>GetSecretValue</a> operation.</p>"
     },
@@ -1140,7 +1146,7 @@
     },
     "SecretStringType":{
       "type":"string",
-      "max":10240,
+      "max":65536,
       "min":0,
       "sensitive":true
     },
diff --git a/services/securityhub/pom.xml b/services/securityhub/pom.xml
index 14e131d40d90..d038682e7bdf 100644
--- a/services/securityhub/pom.xml
+++ b/services/securityhub/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>securityhub</artifactId>
     <name>AWS Java SDK :: Services :: SecurityHub</name>
diff --git a/services/securityhub/src/main/resources/codegen-resources/paginators-1.json b/services/securityhub/src/main/resources/codegen-resources/paginators-1.json
index ba58ab3c94d9..c7924802d10c 100644
--- a/services/securityhub/src/main/resources/codegen-resources/paginators-1.json
+++ b/services/securityhub/src/main/resources/codegen-resources/paginators-1.json
@@ -10,6 +10,21 @@
       "output_token": "NextToken",
       "limit_key": "MaxResults"
     },
+    "DescribeStandards": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "MaxResults"
+    },
+    "DescribeStandardsControls": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "MaxResults"
+    },
+    "GetEnabledStandards": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "MaxResults"
+    },
     "GetFindings": {
       "input_token": "NextToken",
       "output_token": "NextToken",
@@ -24,6 +39,16 @@
       "input_token": "NextToken",
       "output_token": "NextToken",
       "limit_key": "MaxResults"
+    },
+    "ListInvitations": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "MaxResults"
+    },
+    "ListMembers": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "MaxResults"
     }
   }
 }
diff --git a/services/securityhub/src/main/resources/codegen-resources/service-2.json b/services/securityhub/src/main/resources/codegen-resources/service-2.json
index ea899ddf0b85..8c2ee729de07 100644
--- a/services/securityhub/src/main/resources/codegen-resources/service-2.json
+++ b/services/securityhub/src/main/resources/codegen-resources/service-2.json
@@ -27,7 +27,7 @@
         {"shape":"ResourceNotFoundException"},
         {"shape":"InvalidAccessException"}
       ],
-      "documentation":"<p>Accepts the invitation to be a member account and be monitored by the Security Hub master account that the invitation was sent from. When the member account accepts the invitation, permission is granted to the master account to view findings generated in the member account.</p>"
+      "documentation":"<p>Accepts the invitation to be a member account and be monitored by the Security Hub master account that the invitation was sent from.</p> <p>When the member account accepts the invitation, permission is granted to the master account to view findings generated in the member account.</p>"
     },
     "BatchDisableStandards":{
       "name":"BatchDisableStandards",
@@ -43,7 +43,7 @@
         {"shape":"InvalidAccessException"},
         {"shape":"LimitExceededException"}
       ],
-      "documentation":"<p>Disables the standards specified by the provided <code>StandardsSubscriptionArns</code>. For more information, see <a href=\"https://docs.aws.amazon.com/securityhub/latest/userguide/securityhub-standards.html\">Standards Supported in AWS Security Hub</a>.</p>"
+      "documentation":"<p>Disables the standards specified by the provided <code>StandardsSubscriptionArns</code>.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/securityhub/latest/userguide/securityhub-standards.html\">Security Standards</a> section of the <i>AWS Security Hub User Guide</i>.</p>"
     },
     "BatchEnableStandards":{
       "name":"BatchEnableStandards",
@@ -59,7 +59,7 @@
         {"shape":"InvalidAccessException"},
         {"shape":"LimitExceededException"}
       ],
-      "documentation":"<p>Enables the standards specified by the provided <code>standardsArn</code>. In this release, only CIS AWS Foundations standards are supported. For more information, see <a href=\"https://docs.aws.amazon.com/securityhub/latest/userguide/securityhub-standards.html\">Standards Supported in AWS Security Hub</a>.</p>"
+      "documentation":"<p>Enables the standards specified by the provided <code>StandardsArn</code>. To obtain the ARN for a standard, use the <code> <a>DescribeStandards</a> </code> operation.</p> <p>For more information, see the <a href=\"https://docs.aws.amazon.com/securityhub/latest/userguide/securityhub-standards.html\">Security Standards</a> section of the <i>AWS Security Hub User Guide</i>.</p>"
     },
     "BatchImportFindings":{
       "name":"BatchImportFindings",
@@ -75,7 +75,7 @@
         {"shape":"LimitExceededException"},
         {"shape":"InvalidAccessException"}
       ],
-      "documentation":"<p>Imports security findings generated from an integrated third-party product into Security Hub. This action is requested by the integrated product to import its findings into Security Hub. The maximum allowed size for a finding is 240 Kb. An error is returned for any finding larger than 240 Kb.</p>"
+      "documentation":"<p>Imports security findings generated from an integrated third-party product into Security Hub. This action is requested by the integrated product to import its findings into Security Hub.</p> <p>The maximum allowed size for a finding is 240 Kb. An error is returned for any finding larger than 240 Kb.</p>"
     },
     "CreateActionTarget":{
       "name":"CreateActionTarget",
@@ -92,7 +92,7 @@
         {"shape":"LimitExceededException"},
         {"shape":"ResourceConflictException"}
       ],
-      "documentation":"<p>Creates a custom action target in Security Hub. You can use custom actions on findings and insights in Security Hub to trigger target actions in Amazon CloudWatch Events.</p>"
+      "documentation":"<p>Creates a custom action target in Security Hub.</p> <p>You can use custom actions on findings and insights in Security Hub to trigger target actions in Amazon CloudWatch Events.</p>"
     },
     "CreateInsight":{
       "name":"CreateInsight",
@@ -109,7 +109,7 @@
         {"shape":"InvalidAccessException"},
         {"shape":"ResourceConflictException"}
       ],
-      "documentation":"<p>Creates a custom insight in Security Hub. An insight is a consolidation of findings that relate to a security issue that requires attention or remediation. Use the <code>GroupByAttribute</code> to group the related findings in the insight.</p>"
+      "documentation":"<p>Creates a custom insight in Security Hub. An insight is a consolidation of findings that relate to a security issue that requires attention or remediation.</p> <p>To group the related findings in the insight, use the <code>GroupByAttribute</code>.</p>"
     },
     "CreateMembers":{
       "name":"CreateMembers",
@@ -126,7 +126,7 @@
         {"shape":"InvalidAccessException"},
         {"shape":"ResourceConflictException"}
       ],
-      "documentation":"<p>Creates a member association in Security Hub between the specified accounts and the account used to make the request, which is the master account. To successfully create a member, you must use this action from an account that already has Security Hub enabled. You can use the <a>EnableSecurityHub</a> to enable Security Hub.</p> <p>After you use <code>CreateMembers</code> to create member account associations in Security Hub, you need to use the <a>InviteMembers</a> action, which invites the accounts to enable Security Hub and become member accounts in Security Hub. If the invitation is accepted by the account owner, the account becomes a member account in Security Hub, and a permission policy is added that permits the master account to view the findings generated in the member account. When Security Hub is enabled in the invited account, findings start being sent to both the member and master accounts.</p> <p>You can remove the association between the master and member accounts by using the <a>DisassociateFromMasterAccount</a> or <a>DisassociateMembers</a> operation.</p>"
+      "documentation":"<p>Creates a member association in Security Hub between the specified accounts and the account used to make the request, which is the master account. To successfully create a member, you must use this action from an account that already has Security Hub enabled. To enable Security Hub, you can use the <code> <a>EnableSecurityHub</a> </code> operation.</p> <p>After you use <code>CreateMembers</code> to create member account associations in Security Hub, you must use the <code> <a>InviteMembers</a> </code> operation to invite the accounts to enable Security Hub and become member accounts in Security Hub.</p> <p>If the account owner accepts the invitation, the account becomes a member account in Security Hub, and a permission policy is added that permits the master account to view the findings generated in the member account. When Security Hub is enabled in the invited account, findings start to be sent to both the member and master accounts.</p> <p>To remove the association between the master and member accounts, use the <code> <a>DisassociateFromMasterAccount</a> </code> or <code> <a>DisassociateMembers</a> </code> operation.</p>"
     },
     "DeclineInvitations":{
       "name":"DeclineInvitations",
@@ -158,7 +158,7 @@
         {"shape":"InvalidAccessException"},
         {"shape":"ResourceNotFoundException"}
       ],
-      "documentation":"<p>Deletes a custom action target from Security Hub. Deleting a custom action target doesn't affect any findings or insights that were already sent to Amazon CloudWatch Events using the custom action.</p>"
+      "documentation":"<p>Deletes a custom action target from Security Hub.</p> <p>Deleting a custom action target does not affect any findings or insights that were already sent to Amazon CloudWatch Events using the custom action.</p>"
     },
     "DeleteInsight":{
       "name":"DeleteInsight",
@@ -258,7 +258,38 @@
         {"shape":"InvalidAccessException"},
         {"shape":"InvalidInputException"}
       ],
-      "documentation":"<p>Returns information about the products available that you can subscribe to and integrate with Security Hub to consolidate findings.</p>"
+      "documentation":"<p>Returns information about the available products that you can subscribe to and integrate with Security Hub in order to consolidate findings.</p>"
+    },
+    "DescribeStandards":{
+      "name":"DescribeStandards",
+      "http":{
+        "method":"GET",
+        "requestUri":"/standards"
+      },
+      "input":{"shape":"DescribeStandardsRequest"},
+      "output":{"shape":"DescribeStandardsResponse"},
+      "errors":[
+        {"shape":"InternalException"},
+        {"shape":"InvalidInputException"},
+        {"shape":"InvalidAccessException"}
+      ],
+      "documentation":"<p>Returns a list of the available standards in Security Hub.</p> <p>For each standard, the results include the standard ARN, the name, and a description. </p>"
+    },
+    "DescribeStandardsControls":{
+      "name":"DescribeStandardsControls",
+      "http":{
+        "method":"GET",
+        "requestUri":"/standards/controls/{StandardsSubscriptionArn+}"
+      },
+      "input":{"shape":"DescribeStandardsControlsRequest"},
+      "output":{"shape":"DescribeStandardsControlsResponse"},
+      "errors":[
+        {"shape":"InternalException"},
+        {"shape":"InvalidInputException"},
+        {"shape":"InvalidAccessException"},
+        {"shape":"ResourceNotFoundException"}
+      ],
+      "documentation":"<p>Returns a list of security standards controls.</p> <p>For each control, the results include information about whether it is currently enabled, the severity, and a link to remediation information.</p>"
     },
     "DisableImportFindingsForProduct":{
       "name":"DisableImportFindingsForProduct",
@@ -275,7 +306,7 @@
         {"shape":"InvalidAccessException"},
         {"shape":"LimitExceededException"}
       ],
-      "documentation":"<p>Disables the integration of the specified product with Security Hub. Findings from that product are no longer sent to Security Hub after the integration is disabled.</p>"
+      "documentation":"<p>Disables the integration of the specified product with Security Hub. After the integration is disabled, findings from that product are no longer sent to Security Hub.</p>"
     },
     "DisableSecurityHub":{
       "name":"DisableSecurityHub",
@@ -291,7 +322,7 @@
         {"shape":"InvalidAccessException"},
         {"shape":"ResourceNotFoundException"}
       ],
-      "documentation":"<p>Disables Security Hub in your account only in the current Region. To disable Security Hub in all Regions, you must submit one request per Region where you have enabled Security Hub. When you disable Security Hub for a master account, it doesn't disable Security Hub for any associated member accounts.</p> <p>When you disable Security Hub, your existing findings and insights and any Security Hub configuration settings are deleted after 90 days and can't be recovered. Any standards that were enabled are disabled, and your master and member account associations are removed. If you want to save your existing findings, you must export them before you disable Security Hub.</p>"
+      "documentation":"<p>Disables Security Hub in your account only in the current Region. To disable Security Hub in all Regions, you must submit one request per Region where you have enabled Security Hub.</p> <p>When you disable Security Hub for a master account, it doesn't disable Security Hub for any associated member accounts.</p> <p>When you disable Security Hub, your existing findings and insights and any Security Hub configuration settings are deleted after 90 days and cannot be recovered. Any standards that were enabled are disabled, and your master and member account associations are removed.</p> <p>If you want to save your existing findings, you must export them before you disable Security Hub.</p>"
     },
     "DisassociateFromMasterAccount":{
       "name":"DisassociateFromMasterAccount",
@@ -342,7 +373,7 @@
         {"shape":"ResourceConflictException"},
         {"shape":"LimitExceededException"}
       ],
-      "documentation":"<p>Enables the integration of a partner product with Security Hub. Integrated products send findings to Security Hub. When you enable a product integration, a permission policy that grants permission for the product to send findings to Security Hub is applied.</p>"
+      "documentation":"<p>Enables the integration of a partner product with Security Hub. Integrated products send findings to Security Hub.</p> <p>When you enable a product integration, a permission policy that grants permission for the product to send findings to Security Hub is applied.</p>"
     },
     "EnableSecurityHub":{
       "name":"EnableSecurityHub",
@@ -359,7 +390,7 @@
         {"shape":"ResourceConflictException"},
         {"shape":"AccessDeniedException"}
       ],
-      "documentation":"<p>Enables Security Hub for your account in the current Region or the Region you specify in the request. When you enable Security Hub, you grant to Security Hub the permissions necessary to gather findings from AWS Config, Amazon GuardDuty, Amazon Inspector, and Amazon Macie. To learn more, see <a href=\"https://docs.aws.amazon.com/securityhub/latest/userguide/securityhub-settingup.html\">Setting Up AWS Security Hub</a>.</p>"
+      "documentation":"<p>Enables Security Hub for your account in the current Region or the Region you specify in the request.</p> <p>When you enable Security Hub, you grant to Security Hub the permissions necessary to gather findings from other services that are integrated with Security Hub.</p> <p>When you use the <code>EnableSecurityHub</code> operation to enable Security Hub, you also automatically enable the CIS AWS Foundations standard. You do not enable the Payment Card Industry Data Security Standard (PCI DSS) standard. To not enable the CIS AWS Foundations standard, set <code>EnableDefaultStandards</code> to <code>false</code>.</p> <p>After you enable Security Hub, to enable a standard, use the <code> <a>BatchEnableStandards</a> </code> operation. To disable a standard, use the <code> <a>BatchDisableStandards</a> </code> operation.</p> <p>To learn more, see <a href=\"https://docs.aws.amazon.com/securityhub/latest/userguide/securityhub-settingup.html\">Setting Up AWS Security Hub</a> in the <i>AWS Security Hub User Guide</i>.</p>"
     },
     "GetEnabledStandards":{
       "name":"GetEnabledStandards",
@@ -408,7 +439,7 @@
         {"shape":"LimitExceededException"},
         {"shape":"ResourceNotFoundException"}
       ],
-      "documentation":"<p>Lists the results of the Security Hub insight that the insight ARN specifies.</p>"
+      "documentation":"<p>Lists the results of the Security Hub insight specified by the insight ARN.</p>"
     },
     "GetInsights":{
       "name":"GetInsights",
@@ -425,7 +456,7 @@
         {"shape":"LimitExceededException"},
         {"shape":"ResourceNotFoundException"}
       ],
-      "documentation":"<p>Lists and describes insights that insight ARNs specify.</p>"
+      "documentation":"<p>Lists and describes insights for the specified insight ARNs.</p>"
     },
     "GetInvitationsCount":{
       "name":"GetInvitationsCount",
@@ -458,7 +489,7 @@
         {"shape":"LimitExceededException"},
         {"shape":"ResourceNotFoundException"}
       ],
-      "documentation":"<p>Provides the details for the Security Hub master account to the current member account. </p>"
+      "documentation":"<p>Provides the details for the Security Hub master account for the current member account. </p>"
     },
     "GetMembers":{
       "name":"GetMembers",
@@ -475,7 +506,7 @@
         {"shape":"LimitExceededException"},
         {"shape":"ResourceNotFoundException"}
       ],
-      "documentation":"<p>Returns the details on the Security Hub member accounts that the account IDs specify.</p>"
+      "documentation":"<p>Returns the details for the Security Hub member accounts for the specified account IDs.</p>"
     },
     "InviteMembers":{
       "name":"InviteMembers",
@@ -492,7 +523,7 @@
         {"shape":"LimitExceededException"},
         {"shape":"ResourceNotFoundException"}
       ],
-      "documentation":"<p>Invites other AWS accounts to become member accounts for the Security Hub master account that the invitation is sent from. Before you can use this action to invite a member, you must first create the member account in Security Hub by using the <a>CreateMembers</a> action. When the account owner accepts the invitation to become a member account and enables Security Hub, the master account can view the findings generated from member account.</p>"
+      "documentation":"<p>Invites other AWS accounts to become member accounts for the Security Hub master account that the invitation is sent from.</p> <p>Before you can use this action to invite a member, you must first use the <code> <a>CreateMembers</a> </code> action to create the member account in Security Hub.</p> <p>When the account owner accepts the invitation to become a member account and enables Security Hub, the master account can view the findings generated from the member account.</p>"
     },
     "ListEnabledProductsForImport":{
       "name":"ListEnabledProductsForImport",
@@ -507,7 +538,7 @@
         {"shape":"LimitExceededException"},
         {"shape":"InvalidAccessException"}
       ],
-      "documentation":"<p>Lists all findings-generating solutions (products) whose findings you have subscribed to receive in Security Hub.</p>"
+      "documentation":"<p>Lists all findings-generating solutions (products) that you are subscribed to receive findings from in Security Hub.</p>"
     },
     "ListInvitations":{
       "name":"ListInvitations",
@@ -635,7 +666,23 @@
         {"shape":"LimitExceededException"},
         {"shape":"ResourceNotFoundException"}
       ],
-      "documentation":"<p>Updates the Security Hub insight that the insight ARN specifies.</p>"
+      "documentation":"<p>Updates the Security Hub insight identified by the specified insight ARN.</p>"
+    },
+    "UpdateStandardsControl":{
+      "name":"UpdateStandardsControl",
+      "http":{
+        "method":"PATCH",
+        "requestUri":"/standards/control/{StandardsControlArn+}"
+      },
+      "input":{"shape":"UpdateStandardsControlRequest"},
+      "output":{"shape":"UpdateStandardsControlResponse"},
+      "errors":[
+        {"shape":"InternalException"},
+        {"shape":"InvalidInputException"},
+        {"shape":"InvalidAccessException"},
+        {"shape":"ResourceNotFoundException"}
+      ],
+      "documentation":"<p>Used to control whether an individual security standard control is enabled or disabled.</p>"
     }
   },
   "shapes":{
@@ -725,6 +772,218 @@
       "type":"list",
       "member":{"shape":"NonEmptyString"}
     },
+    "AvailabilityZone":{
+      "type":"structure",
+      "members":{
+        "ZoneName":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The name of the Availability Zone.</p>"
+        },
+        "SubnetId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The ID of the subnet. You can specify one subnet per Availability Zone.</p>"
+        }
+      },
+      "documentation":"<p>Information about an Availability Zone.</p>"
+    },
+    "AvailabilityZones":{
+      "type":"list",
+      "member":{"shape":"AvailabilityZone"}
+    },
+    "AwsCloudFrontDistributionDetails":{
+      "type":"structure",
+      "members":{
+        "DomainName":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The domain name corresponding to the distribution.</p>"
+        },
+        "ETag":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The entity tag is a hash of the object.</p>"
+        },
+        "LastModifiedTime":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The date and time that the distribution was last modified.</p>"
+        },
+        "Logging":{
+          "shape":"AwsCloudFrontDistributionLogging",
+          "documentation":"<p>A complex type that controls whether access logs are written for the distribution.</p>"
+        },
+        "Origins":{
+          "shape":"AwsCloudFrontDistributionOrigins",
+          "documentation":"<p>A complex type that contains information about origins for this distribution.</p>"
+        },
+        "Status":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>Indicates the current status of the distribution.</p>"
+        },
+        "WebAclId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>A unique identifier that specifies the AWS WAF web ACL, if any, to associate with this distribution.</p>"
+        }
+      },
+      "documentation":"<p>A distribution configuration.</p>"
+    },
+    "AwsCloudFrontDistributionLogging":{
+      "type":"structure",
+      "members":{
+        "Bucket":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The Amazon S3 bucket to store the access logs in.</p>"
+        },
+        "Enabled":{
+          "shape":"Boolean",
+          "documentation":"<p>With this field, you can enable or disable the selected distribution.</p>"
+        },
+        "IncludeCookies":{
+          "shape":"Boolean",
+          "documentation":"<p>Specifies whether you want CloudFront to include cookies in access logs.</p>"
+        },
+        "Prefix":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>An optional string that you want CloudFront to use as a prefix to the access log filenames for this distribution.</p>"
+        }
+      },
+      "documentation":"<p>A complex type that controls whether access logs are written for the distribution.</p>"
+    },
+    "AwsCloudFrontDistributionOriginItem":{
+      "type":"structure",
+      "members":{
+        "DomainName":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>Amazon S3 origins: The DNS name of the Amazon S3 bucket from which you want CloudFront to get objects for this origin.</p>"
+        },
+        "Id":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>A unique identifier for the origin or origin group.</p>"
+        },
+        "OriginPath":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>An optional element that causes CloudFront to request your content from a directory in your Amazon S3 bucket or your custom origin.</p>"
+        }
+      },
+      "documentation":"<p>A complex type that describes the Amazon S3 bucket, HTTP server (for example, a web server), Amazon MediaStore, or other server from which CloudFront gets your files.</p>"
+    },
+    "AwsCloudFrontDistributionOriginItemList":{
+      "type":"list",
+      "member":{"shape":"AwsCloudFrontDistributionOriginItem"}
+    },
+    "AwsCloudFrontDistributionOrigins":{
+      "type":"structure",
+      "members":{
+        "Items":{
+          "shape":"AwsCloudFrontDistributionOriginItemList",
+          "documentation":"<p>A complex type that contains origins or origin groups for this distribution.</p>"
+        }
+      },
+      "documentation":"<p>A complex type that contains information about origins and origin groups for this distribution.</p>"
+    },
+    "AwsCodeBuildProjectDetails":{
+      "type":"structure",
+      "members":{
+        "EncryptionKey":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The AWS Key Management Service (AWS KMS) customer master key (CMK) used to encrypt the build output artifacts.</p> <p>You can specify either the Amazon Resource Name (ARN) of the CMK or, if available, the CMK alias (using the format alias/alias-name). </p>"
+        },
+        "Environment":{
+          "shape":"AwsCodeBuildProjectEnvironment",
+          "documentation":"<p>Information about the build environment for this build project.</p>"
+        },
+        "Name":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The name of the build project.</p>"
+        },
+        "Source":{
+          "shape":"AwsCodeBuildProjectSource",
+          "documentation":"<p>Information about the build input source code for this build project.</p>"
+        },
+        "ServiceRole":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The ARN of the IAM role that enables AWS CodeBuild to interact with dependent AWS services on behalf of the AWS account.</p>"
+        },
+        "VpcConfig":{
+          "shape":"AwsCodeBuildProjectVpcConfig",
+          "documentation":"<p>Information about the VPC configuration that AWS CodeBuild accesses.</p>"
+        }
+      },
+      "documentation":"<p>Information about an AWS CodeBuild project.</p>"
+    },
+    "AwsCodeBuildProjectEnvironment":{
+      "type":"structure",
+      "members":{
+        "Certificate":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The certificate to use with this build project.</p>"
+        },
+        "ImagePullCredentialsType":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The type of credentials AWS CodeBuild uses to pull images in your build.</p> <p>Valid values:</p> <ul> <li> <p> <code>CODEBUILD</code> specifies that AWS CodeBuild uses its own credentials. This requires that you modify your ECR repository policy to trust the AWS CodeBuild service principal.</p> </li> <li> <p> <code>SERVICE_ROLE</code> specifies that AWS CodeBuild uses your build project's service role.</p> </li> </ul> <p>When you use a cross-account or private registry image, you must use <code>SERVICE_ROLE</code> credentials. When you use an AWS CodeBuild curated image, you must use <code>CODEBUILD</code> credentials.</p>"
+        },
+        "RegistryCredential":{
+          "shape":"AwsCodeBuildProjectEnvironmentRegistryCredential",
+          "documentation":"<p>The credentials for access to a private registry.</p>"
+        },
+        "Type":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The type of build environment to use for related builds.</p> <p>The environment type <code>ARM_CONTAINER</code> is available only in regions US East (N. Virginia), US East (Ohio), US West (Oregon), Europe (Ireland), Asia Pacific (Mumbai), Asia Pacific (Tokyo), Asia Pacific (Sydney), and Europe (Frankfurt).</p> <p>The environment type <code>LINUX_CONTAINER</code> with compute type build.general1.2xlarge is available only in regions US East (N. Virginia), US East (N. Virginia), US West (Oregon), Canada (Central), Europe (Ireland), Europe (London), Europe (Frankfurt), Asia Pacific (Tokyo), Asia Pacific (Seoul), Asia Pacific (Singapore), Asia Pacific (Sydney), China (Beijing), and China (Ningxia).</p> <p>The environment type <code>LINUX_GPU_CONTAINER</code> is available only in regions US East (N. Virginia), US East (N. Virginia), US West (Oregon), Canada (Central), Europe (Ireland), Europe (London), Europe (Frankfurt), Asia Pacific (Tokyo), Asia Pacific (Seoul), Asia Pacific (Singapore), Asia Pacific (Sydney) , China (Beijing), and China (Ningxia).</p> <p>Valid values: <code>WINDOWS_CONTAINER</code> | <code>LINUX_CONTAINER</code> | <code>LINUX_GPU_CONTAINER</code> | <code>ARM_CONTAINER</code> </p>"
+        }
+      },
+      "documentation":"<p>Information about the build environment for this build project.</p>"
+    },
+    "AwsCodeBuildProjectEnvironmentRegistryCredential":{
+      "type":"structure",
+      "members":{
+        "Credential":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The Amazon Resource Name (ARN) or name of credentials created using AWS Secrets Manager.</p> <note> <p>The credential can use the name of the credentials only if they exist in your current AWS Region. </p> </note>"
+        },
+        "CredentialProvider":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The service that created the credentials to access a private Docker registry.</p> <p>The valid value,<code> SECRETS_MANAGER</code>, is for AWS Secrets Manager.</p>"
+        }
+      },
+      "documentation":"<p>The credentials for access to a private registry.</p>"
+    },
+    "AwsCodeBuildProjectSource":{
+      "type":"structure",
+      "members":{
+        "Type":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The type of repository that contains the source code to be built. Valid values are:</p> <ul> <li> <p> <code>BITBUCKET</code> - The source code is in a Bitbucket repository.</p> </li> <li> <p> <code>CODECOMMIT</code> - The source code is in an AWS CodeCommit repository.</p> </li> <li> <p> <code>CODEPIPELINE</code> - The source code settings are specified in the source action of a pipeline in AWS CodePipeline.</p> </li> <li> <p> <code>GITHUB</code> - The source code is in a GitHub repository.</p> </li> <li> <p> <code>GITHUB_ENTERPRISE</code> - The source code is in a GitHub Enterprise repository.</p> </li> <li> <p> <code>NO_SOURCE</code> - The project does not have input source code.</p> </li> <li> <p> <code>S3</code> - The source code is in an S3 input bucket. </p> </li> </ul>"
+        },
+        "Location":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>Information about the location of the source code to be built.</p> <p>Valid values include:</p> <ul> <li> <p>For source code settings that are specified in the source action of a pipeline in AWS CodePipeline, location should not be specified. If it is specified, AWS CodePipeline ignores it. This is because AWS CodePipeline uses the settings in a pipeline's source action instead of this value.</p> </li> <li> <p>For source code in an AWS CodeCommit repository, the HTTPS clone URL to the repository that contains the source code and the buildspec file (for example, <code>https://git-codecommit.region-ID.amazonaws.com/v1/repos/repo-name</code> ).</p> </li> <li> <p>For source code in an S3 input bucket, one of the following.</p> <ul> <li> <p>The path to the ZIP file that contains the source code (for example, <code>bucket-name/path/to/object-name.zip</code>).</p> </li> <li> <p> The path to the folder that contains the source code (for example, <code>bucket-name/path/to/source-code/folder/</code>).</p> </li> </ul> </li> <li> <p>For source code in a GitHub repository, the HTTPS clone URL to the repository that contains the source and the buildspec file.</p> </li> <li> <p>For source code in a Bitbucket repository, the HTTPS clone URL to the repository that contains the source and the buildspec file. </p> </li> </ul>"
+        },
+        "GitCloneDepth":{
+          "shape":"Integer",
+          "documentation":"<p>Information about the Git clone depth for the build project.</p>"
+        },
+        "InsecureSsl":{
+          "shape":"Boolean",
+          "documentation":"<p>Whether to ignore SSL warnings while connecting to the project source code.</p>"
+        }
+      },
+      "documentation":"<p>Information about the build input source code for this build project.</p>"
+    },
+    "AwsCodeBuildProjectVpcConfig":{
+      "type":"structure",
+      "members":{
+        "VpcId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The ID of the VPC.</p>"
+        },
+        "Subnets":{
+          "shape":"NonEmptyStringList",
+          "documentation":"<p>A list of one or more subnet IDs in your Amazon VPC.</p>"
+        },
+        "SecurityGroupIds":{
+          "shape":"NonEmptyStringList",
+          "documentation":"<p>A list of one or more security group IDs in your Amazon VPC.</p>"
+        }
+      },
+      "documentation":"<p>Information about the VPC configuration that AWS CodeBuild accesses.</p>"
+    },
     "AwsEc2InstanceDetails":{
       "type":"structure",
       "members":{
@@ -767,133 +1026,1002 @@
       },
       "documentation":"<p>The details of an Amazon EC2 instance.</p>"
     },
-    "AwsIamAccessKeyDetails":{
+    "AwsEc2NetworkInterfaceAttachment":{
       "type":"structure",
       "members":{
-        "UserName":{
+        "AttachTime":{
           "shape":"NonEmptyString",
-          "documentation":"<p>The user associated with the IAM access key related to a finding.</p>"
+          "documentation":"<p>The timestamp indicating when the attachment initiated.</p>"
         },
-        "Status":{
-          "shape":"AwsIamAccessKeyStatus",
-          "documentation":"<p>The status of the IAM access key related to a finding.</p>"
+        "AttachmentId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The identifier of the network interface attachment</p>"
         },
-        "CreatedAt":{
+        "DeleteOnTermination":{
+          "shape":"Boolean",
+          "documentation":"<p>Indicates whether the network interface is deleted when the instance is terminated.</p>"
+        },
+        "DeviceIndex":{
+          "shape":"Integer",
+          "documentation":"<p>The device index of the network interface attachment on the instance.</p>"
+        },
+        "InstanceId":{
           "shape":"NonEmptyString",
-          "documentation":"<p>The creation date/time of the IAM access key related to a finding.</p>"
+          "documentation":"<p>The ID of the instance.</p>"
+        },
+        "InstanceOwnerId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The AWS account ID of the owner of the instance.</p>"
+        },
+        "Status":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The attachment state.</p> <p>Valid values: <code>attaching</code> | <code>attached</code> | <code>detaching</code> | <code>detached</code> </p>"
         }
       },
-      "documentation":"<p>IAM access key details related to a finding.</p>"
-    },
-    "AwsIamAccessKeyStatus":{
-      "type":"string",
-      "enum":[
-        "Active",
-        "Inactive"
-      ]
+      "documentation":"<p>Information about the network interface attachment.</p>"
     },
-    "AwsS3BucketDetails":{
+    "AwsEc2NetworkInterfaceDetails":{
       "type":"structure",
       "members":{
-        "OwnerId":{
-          "shape":"NonEmptyString",
-          "documentation":"<p>The canonical user ID of the owner of the S3 bucket.</p>"
+        "Attachment":{
+          "shape":"AwsEc2NetworkInterfaceAttachment",
+          "documentation":"<p>The network interface attachment.</p>"
         },
-        "OwnerName":{
+        "NetworkInterfaceId":{
           "shape":"NonEmptyString",
-          "documentation":"<p>The display name of the owner of the S3 bucket.</p>"
+          "documentation":"<p>The ID of the network interface.</p>"
+        },
+        "SecurityGroups":{
+          "shape":"AwsEc2NetworkInterfaceSecurityGroupList",
+          "documentation":"<p>Security groups for the network interface.</p>"
+        },
+        "SourceDestCheck":{
+          "shape":"Boolean",
+          "documentation":"<p>Indicates whether traffic to or from the instance is validated.</p>"
         }
       },
-      "documentation":"<p>The details of an Amazon S3 bucket.</p>"
+      "documentation":"<p>Details about the network interface</p>"
     },
-    "AwsSecurityFinding":{
+    "AwsEc2NetworkInterfaceSecurityGroup":{
       "type":"structure",
-      "required":[
-        "SchemaVersion",
-        "Id",
-        "ProductArn",
-        "GeneratorId",
-        "AwsAccountId",
-        "Types",
-        "CreatedAt",
-        "UpdatedAt",
-        "Severity",
-        "Title",
-        "Description",
-        "Resources"
-      ],
       "members":{
-        "SchemaVersion":{
-          "shape":"NonEmptyString",
-          "documentation":"<p>The schema version that a finding is formatted for.</p>"
-        },
-        "Id":{
+        "GroupName":{
           "shape":"NonEmptyString",
-          "documentation":"<p>The security findings provider-specific identifier for a finding.</p>"
+          "documentation":"<p>The name of the security group.</p>"
         },
-        "ProductArn":{
+        "GroupId":{
           "shape":"NonEmptyString",
-          "documentation":"<p>The ARN generated by Security Hub that uniquely identifies a third-party company (security-findings provider) after this provider's product (solution that generates findings) is registered with Security Hub. </p>"
-        },
-        "GeneratorId":{
+          "documentation":"<p>The ID of the security group.</p>"
+        }
+      },
+      "documentation":"<p>A security group associated with the network interface.</p>"
+    },
+    "AwsEc2NetworkInterfaceSecurityGroupList":{
+      "type":"list",
+      "member":{"shape":"AwsEc2NetworkInterfaceSecurityGroup"}
+    },
+    "AwsEc2SecurityGroupDetails":{
+      "type":"structure",
+      "members":{
+        "GroupName":{
           "shape":"NonEmptyString",
-          "documentation":"<p>The identifier for the solution-specific component (a discrete unit of logic) that generated a finding. In various security-findings providers' solutions, this generator can be called a rule, a check, a detector, a plug-in, etc. </p>"
+          "documentation":"<p>The name of the security group.</p>"
         },
-        "AwsAccountId":{
+        "GroupId":{
           "shape":"NonEmptyString",
-          "documentation":"<p>The AWS account ID that a finding is generated in.</p>"
-        },
-        "Types":{
-          "shape":"TypeList",
-          "documentation":"<p>One or more finding types in the format of <code>namespace/category/classifier</code> that classify a finding.</p> <p>Valid namespace values are: Software and Configuration Checks | TTPs | Effects | Unusual Behaviors | Sensitive Data Identifications</p>"
+          "documentation":"<p>The ID of the security group.</p>"
         },
-        "FirstObservedAt":{
+        "OwnerId":{
           "shape":"NonEmptyString",
-          "documentation":"<p>An ISO8601-formatted timestamp that indicates when the security-findings provider first observed the potential security issue that a finding captured.</p>"
+          "documentation":"<p>The AWS account ID of the owner of the security group.</p>"
         },
-        "LastObservedAt":{
+        "VpcId":{
           "shape":"NonEmptyString",
-          "documentation":"<p>An ISO8601-formatted timestamp that indicates when the security-findings provider most recently observed the potential security issue that a finding captured.</p>"
+          "documentation":"<p>[VPC only] The ID of the VPC for the security group.</p>"
         },
-        "CreatedAt":{
-          "shape":"NonEmptyString",
-          "documentation":"<p>An ISO8601-formatted timestamp that indicates when the security-findings provider created the potential security issue that a finding captured.</p>"
+        "IpPermissions":{
+          "shape":"AwsEc2SecurityGroupIpPermissionList",
+          "documentation":"<p>The inbound rules associated with the security group.</p>"
         },
-        "UpdatedAt":{
+        "IpPermissionsEgress":{
+          "shape":"AwsEc2SecurityGroupIpPermissionList",
+          "documentation":"<p>[VPC only] The outbound rules associated with the security group.</p>"
+        }
+      },
+      "documentation":"<p>Details about an EC2 security group.</p>"
+    },
+    "AwsEc2SecurityGroupIpPermission":{
+      "type":"structure",
+      "members":{
+        "IpProtocol":{
           "shape":"NonEmptyString",
-          "documentation":"<p>An ISO8601-formatted timestamp that indicates when the security-findings provider last updated the finding record. </p>"
-        },
-        "Severity":{
-          "shape":"Severity",
-          "documentation":"<p>A finding's severity.</p>"
+          "documentation":"<p>The IP protocol name (<code>tcp</code>, <code>udp</code>, <code>icmp</code>, <code>icmpv6</code>) or number.</p> <p>[VPC only] Use <code>-1</code> to specify all protocols.</p> <p>When authorizing security group rules, specifying -1 or a protocol number other than <code>tcp</code>, <code>udp</code>, <code>icmp</code>, or <code>icmpv6</code> allows traffic on all ports, regardless of any port range you specify.</p> <p>For <code>tcp</code>, <code>udp</code>, and <code>icmp</code>, you must specify a port range.</p> <p>For <code>icmpv6</code>, the port range is optional. If you omit the port range, traffic for all types and codes is allowed. </p>"
         },
-        "Confidence":{
+        "FromPort":{
           "shape":"Integer",
-          "documentation":"<p>A finding's confidence. Confidence is defined as the likelihood that a finding accurately identifies the behavior or issue that it was intended to identify. Confidence is scored on a 0-100 basis using a ratio scale, where 0 means zero percent confidence and 100 means 100 percent confidence.</p>"
+          "documentation":"<p>The start of the port range for the TCP and UDP protocols, or an ICMP/ICMPv6 type number.</p> <p>A value of -1 indicates all ICMP/ICMPv6 types. If you specify all ICMP/ICMPv6 types, you must specify all codes. </p>"
         },
-        "Criticality":{
+        "ToPort":{
           "shape":"Integer",
-          "documentation":"<p>The level of importance assigned to the resources associated with the finding. A score of 0 means that the underlying resources have no criticality, and a score of 100 is reserved for the most critical resources.</p>"
+          "documentation":"<p>The end of the port range for the TCP and UDP protocols, or an ICMP/ICMPv6 code.</p> <p>A value of -1 indicates all ICMP/ICMPv6 codes. If you specify all ICMP/ICMPv6 types, you must specify all codes.</p>"
         },
-        "Title":{
-          "shape":"NonEmptyString",
-          "documentation":"<p>A finding's title.</p> <note> <p>In this release, <code>Title</code> is a required property.</p> </note>"
-        },
-        "Description":{
-          "shape":"NonEmptyString",
-          "documentation":"<p>A finding's description.</p> <note> <p>In this release, <code>Description</code> is a required property.</p> </note>"
+        "UserIdGroupPairs":{
+          "shape":"AwsEc2SecurityGroupUserIdGroupPairList",
+          "documentation":"<p>The security group and AWS account ID pairs.</p>"
         },
-        "Remediation":{
-          "shape":"Remediation",
-          "documentation":"<p>A data type that describes the remediation options for a finding.</p>"
+        "IpRanges":{
+          "shape":"AwsEc2SecurityGroupIpRangeList",
+          "documentation":"<p>The IPv4 ranges.</p>"
         },
-        "SourceUrl":{
-          "shape":"NonEmptyString",
-          "documentation":"<p>A URL that links to a page about the current finding in the security-findings provider's solution.</p>"
+        "Ipv6Ranges":{
+          "shape":"AwsEc2SecurityGroupIpv6RangeList",
+          "documentation":"<p>The IPv6 ranges.</p>"
         },
-        "ProductFields":{
-          "shape":"FieldMap",
-          "documentation":"<p>A data type where security-findings providers can include additional solution-specific details that aren't part of the defined <code>AwsSecurityFinding</code> format.</p>"
+        "PrefixListIds":{
+          "shape":"AwsEc2SecurityGroupPrefixListIdList",
+          "documentation":"<p>[VPC only] The prefix list IDs for an AWS service. With outbound rules, this is the AWS service to access through a VPC endpoint from instances associated with the security group.</p>"
+        }
+      },
+      "documentation":"<p>An IP permission for an EC2 security group.</p>"
+    },
+    "AwsEc2SecurityGroupIpPermissionList":{
+      "type":"list",
+      "member":{"shape":"AwsEc2SecurityGroupIpPermission"}
+    },
+    "AwsEc2SecurityGroupIpRange":{
+      "type":"structure",
+      "members":{
+        "CidrIp":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The IPv4 CIDR range. You can either specify either a CIDR range or a source security group, but not both. To specify a single IPv4 address, use the /32 prefix length.</p>"
+        }
+      },
+      "documentation":"<p>A range of IPv4 addresses.</p>"
+    },
+    "AwsEc2SecurityGroupIpRangeList":{
+      "type":"list",
+      "member":{"shape":"AwsEc2SecurityGroupIpRange"}
+    },
+    "AwsEc2SecurityGroupIpv6Range":{
+      "type":"structure",
+      "members":{
+        "CidrIpv6":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The IPv6 CIDR range. You can either specify either a CIDR range or a source security group, but not both. To specify a single IPv6 address, use the /128 prefix length.</p>"
+        }
+      },
+      "documentation":"<p>A range of IPv6 addresses.</p>"
+    },
+    "AwsEc2SecurityGroupIpv6RangeList":{
+      "type":"list",
+      "member":{"shape":"AwsEc2SecurityGroupIpv6Range"}
+    },
+    "AwsEc2SecurityGroupPrefixListId":{
+      "type":"structure",
+      "members":{
+        "PrefixListId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The ID of the prefix.</p>"
+        }
+      },
+      "documentation":"<p>A prefix list ID.</p>"
+    },
+    "AwsEc2SecurityGroupPrefixListIdList":{
+      "type":"list",
+      "member":{"shape":"AwsEc2SecurityGroupPrefixListId"}
+    },
+    "AwsEc2SecurityGroupUserIdGroupPair":{
+      "type":"structure",
+      "members":{
+        "GroupId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The ID of the security group.</p>"
+        },
+        "GroupName":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The name of the security group.</p>"
+        },
+        "PeeringStatus":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The status of a VPC peering connection, if applicable.</p>"
+        },
+        "UserId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The ID of an AWS account.</p> <p>For a referenced security group in another VPC, the account ID of the referenced security group is returned in the response. If the referenced security group is deleted, this value is not returned.</p> <p>[EC2-Classic] Required when adding or removing rules that reference a security group in another AWS. </p>"
+        },
+        "VpcId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The ID of the VPC for the referenced security group, if applicable.</p>"
+        },
+        "VpcPeeringConnectionId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The ID of the VPC peering connection, if applicable.</p>"
+        }
+      },
+      "documentation":"<p>A relationship between a security group and a user.</p>"
+    },
+    "AwsEc2SecurityGroupUserIdGroupPairList":{
+      "type":"list",
+      "member":{"shape":"AwsEc2SecurityGroupUserIdGroupPair"}
+    },
+    "AwsElasticsearchDomainDetails":{
+      "type":"structure",
+      "members":{
+        "AccessPolicies":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>IAM policy document specifying the access policies for the new Amazon ES domain.</p>"
+        },
+        "DomainEndpointOptions":{
+          "shape":"AwsElasticsearchDomainDomainEndpointOptions",
+          "documentation":"<p>Additional options for the domain endpoint.</p>"
+        },
+        "DomainId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>Unique identifier for an Amazon ES domain.</p>"
+        },
+        "DomainName":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>Name of an Amazon ES domain.</p> <p>Domain names are unique across all domains owned by the same account within an AWS Region.</p> <p>Domain names must start with a lowercase letter and must be between 3 and 28 characters.</p> <p>Valid characters are a-z (lowercase only), 0-9, and – (hyphen). </p>"
+        },
+        "Endpoint":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>Domain-specific endpoint used to submit index, search, and data upload requests to an Amazon ES domain.</p> <p>The endpoint is a service URL. </p>"
+        },
+        "Endpoints":{
+          "shape":"FieldMap",
+          "documentation":"<p>The key-value pair that exists if the Amazon ES domain uses VPC endpoints.</p>"
+        },
+        "ElasticsearchVersion":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>Elasticsearch version.</p>"
+        },
+        "EncryptionAtRestOptions":{
+          "shape":"AwsElasticsearchDomainEncryptionAtRestOptions",
+          "documentation":"<p>Details about the configuration for encryption at rest.</p>"
+        },
+        "NodeToNodeEncryptionOptions":{
+          "shape":"AwsElasticsearchDomainNodeToNodeEncryptionOptions",
+          "documentation":"<p>Details about the configuration for node-to-node encryption.</p>"
+        },
+        "VPCOptions":{
+          "shape":"AwsElasticsearchDomainVPCOptions",
+          "documentation":"<p>Information that Amazon ES derives based on <code>VPCOptions</code> for the domain.</p>"
+        }
+      },
+      "documentation":"<p>Information about an Elasticsearch domain.</p>"
+    },
+    "AwsElasticsearchDomainDomainEndpointOptions":{
+      "type":"structure",
+      "members":{
+        "EnforceHTTPS":{
+          "shape":"Boolean",
+          "documentation":"<p>Whether to require that all traffic to the domain arrive over HTTPS.</p>"
+        },
+        "TLSSecurityPolicy":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The TLS security policy to apply to the HTTPS endpoint of the Elasticsearch domain.</p> <p>Valid values:</p> <ul> <li> <p> <code>Policy-Min-TLS-1-0-2019-07</code>, which supports TLSv1.0 and higher</p> </li> <li> <p> <code>Policy-Min-TLS-1-2-2019-07</code>, which only supports TLSv1.2</p> </li> </ul>"
+        }
+      },
+      "documentation":"<p>Additional options for the domain endpoint, such as whether to require HTTPS for all traffic.</p>"
+    },
+    "AwsElasticsearchDomainEncryptionAtRestOptions":{
+      "type":"structure",
+      "members":{
+        "Enabled":{
+          "shape":"Boolean",
+          "documentation":"<p>Whether encryption at rest is enabled.</p>"
+        },
+        "KmsKeyId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The KMS key ID. Takes the form 1a2a3a4-1a2a-3a4a-5a6a-1a2a3a4a5a6a.</p>"
+        }
+      },
+      "documentation":"<p>Details about the configuration for encryption at rest.</p>"
+    },
+    "AwsElasticsearchDomainNodeToNodeEncryptionOptions":{
+      "type":"structure",
+      "members":{
+        "Enabled":{
+          "shape":"Boolean",
+          "documentation":"<p>Whether node-to-node encryption is enabled.</p>"
+        }
+      },
+      "documentation":"<p>Details about the configuration for node-to-node encryption.</p>"
+    },
+    "AwsElasticsearchDomainVPCOptions":{
+      "type":"structure",
+      "members":{
+        "AvailabilityZones":{
+          "shape":"NonEmptyStringList",
+          "documentation":"<p>The list of Availability Zones associated with the VPC subnets.</p>"
+        },
+        "SecurityGroupIds":{
+          "shape":"NonEmptyStringList",
+          "documentation":"<p>The list of security group IDs associated with the VPC endpoints for the domain.</p>"
+        },
+        "SubnetIds":{
+          "shape":"NonEmptyStringList",
+          "documentation":"<p>A list of subnet IDs associated with the VPC endpoints for the domain.</p>"
+        },
+        "VPCId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>ID for the VPC.</p>"
+        }
+      },
+      "documentation":"<p>Information that Amazon ES derives based on <code>VPCOptions</code> for the domain.</p>"
+    },
+    "AwsElbv2LoadBalancerDetails":{
+      "type":"structure",
+      "members":{
+        "AvailabilityZones":{
+          "shape":"AvailabilityZones",
+          "documentation":"<p>The Availability Zones for the load balancer.</p>"
+        },
+        "CanonicalHostedZoneId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The ID of the Amazon Route 53 hosted zone associated with the load balancer.</p>"
+        },
+        "CreatedTime":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The date and time the load balancer was created.</p>"
+        },
+        "DNSName":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The public DNS name of the load balancer.</p>"
+        },
+        "IpAddressType":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The type of IP addresses used by the subnets for your load balancer. The possible values are <code>ipv4</code> (for IPv4 addresses) and <code>dualstack</code> (for IPv4 and IPv6 addresses).</p>"
+        },
+        "Scheme":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The nodes of an Internet-facing load balancer have public IP addresses.</p>"
+        },
+        "SecurityGroups":{
+          "shape":"SecurityGroups",
+          "documentation":"<p>The IDs of the security groups for the load balancer.</p>"
+        },
+        "State":{
+          "shape":"LoadBalancerState",
+          "documentation":"<p>The state of the load balancer.</p>"
+        },
+        "Type":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The type of load balancer.</p>"
+        },
+        "VpcId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The ID of the VPC for the load balancer.</p>"
+        }
+      },
+      "documentation":"<p>Information about a load balancer.</p>"
+    },
+    "AwsIamAccessKeyDetails":{
+      "type":"structure",
+      "members":{
+        "UserName":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The user associated with the IAM access key related to a finding.</p> <p>The <code>UserName</code> parameter has been replaced with the <code>PrincipalName</code> parameter because access keys can also be assigned to principals that are not IAM users.</p>",
+          "deprecated":true,
+          "deprecatedMessage":"This field is deprecated, use PrincipalName instead."
+        },
+        "Status":{
+          "shape":"AwsIamAccessKeyStatus",
+          "documentation":"<p>The status of the IAM access key related to a finding.</p>"
+        },
+        "CreatedAt":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The creation date/time of the IAM access key related to a finding.</p>"
+        },
+        "PrincipalId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The ID of the principal associated with an access key.</p>"
+        },
+        "PrincipalType":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The type of principal associated with an access key.</p>"
+        },
+        "PrincipalName":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The name of the principal.</p>"
+        }
+      },
+      "documentation":"<p>IAM access key details related to a finding.</p>"
+    },
+    "AwsIamAccessKeyStatus":{
+      "type":"string",
+      "enum":[
+        "Active",
+        "Inactive"
+      ]
+    },
+    "AwsIamRoleAssumeRolePolicyDocument":{
+      "type":"string",
+      "max":131072,
+      "min":1,
+      "pattern":"[\\u0009\\u000A\\u000D\\u0020-\\u007E\\u00A1-\\u00FF]+"
+    },
+    "AwsIamRoleDetails":{
+      "type":"structure",
+      "members":{
+        "AssumeRolePolicyDocument":{
+          "shape":"AwsIamRoleAssumeRolePolicyDocument",
+          "documentation":"<p>The trust policy that grants permission to assume the role.</p>"
+        },
+        "CreateDate":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The date and time, in ISO 8601 date-time format, when the role was created.</p>"
+        },
+        "RoleId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The stable and unique string identifying the role.</p>"
+        },
+        "RoleName":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The friendly name that identifies the role.</p>"
+        },
+        "MaxSessionDuration":{
+          "shape":"Integer",
+          "documentation":"<p>The maximum session duration (in seconds) that you want to set for the specified role.</p>"
+        },
+        "Path":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The path to the role.</p>"
+        }
+      },
+      "documentation":"<p>Contains information about an IAM role, including all of the role's policies.</p>"
+    },
+    "AwsKmsKeyDetails":{
+      "type":"structure",
+      "members":{
+        "AWSAccountId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The twelve-digit account ID of the AWS account that owns the CMK.</p>"
+        },
+        "CreationDate":{
+          "shape":"Double",
+          "documentation":"<p>The date and time when the CMK was created.</p>"
+        },
+        "KeyId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The globally unique identifier for the CMK.</p>"
+        },
+        "KeyManager":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The manager of the CMK. CMKs in your AWS account are either customer managed or AWS managed.</p>"
+        },
+        "KeyState":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The state of the CMK.</p>"
+        },
+        "Origin":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The source of the CMK's key material.</p> <p>When this value is <code>AWS_KMS</code>, AWS KMS created the key material.</p> <p>When this value is <code>EXTERNAL</code>, the key material was imported from your existing key management infrastructure or the CMK lacks key material.</p> <p>When this value is <code>AWS_CLOUDHSM</code>, the key material was created in the AWS CloudHSM cluster associated with a custom key store.</p>"
+        }
+      },
+      "documentation":"<p>Contains metadata about a customer master key (CMK).</p>"
+    },
+    "AwsLambdaFunctionCode":{
+      "type":"structure",
+      "members":{
+        "S3Bucket":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>An Amazon S3 bucket in the same AWS Region as your function. The bucket can be in a different AWS account.</p>"
+        },
+        "S3Key":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The Amazon S3 key of the deployment package.</p>"
+        },
+        "S3ObjectVersion":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>For versioned objects, the version of the deployment package object to use.</p>"
+        },
+        "ZipFile":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The base64-encoded contents of the deployment package. AWS SDK and AWS CLI clients handle the encoding for you.</p>"
+        }
+      },
+      "documentation":"<p>The code for the Lambda function. You can specify either an object in Amazon S3, or upload a deployment package directly.</p>"
+    },
+    "AwsLambdaFunctionDeadLetterConfig":{
+      "type":"structure",
+      "members":{
+        "TargetArn":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The Amazon Resource Name (ARN) of an Amazon SQS queue or Amazon SNS topic.</p>"
+        }
+      },
+      "documentation":"<p>The dead-letter queue for failed asynchronous invocations.</p>"
+    },
+    "AwsLambdaFunctionDetails":{
+      "type":"structure",
+      "members":{
+        "Code":{
+          "shape":"AwsLambdaFunctionCode",
+          "documentation":"<p>An <code>AwsLambdaFunctionCode</code> object.</p>"
+        },
+        "CodeSha256":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The SHA256 hash of the function's deployment package.</p>"
+        },
+        "DeadLetterConfig":{
+          "shape":"AwsLambdaFunctionDeadLetterConfig",
+          "documentation":"<p>The function's dead letter queue.</p>"
+        },
+        "Environment":{
+          "shape":"AwsLambdaFunctionEnvironment",
+          "documentation":"<p>The function's environment variables.</p>"
+        },
+        "FunctionName":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The name of the function.</p>"
+        },
+        "Handler":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The function that Lambda calls to begin executing your function.</p>"
+        },
+        "KmsKeyArn":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The KMS key that's used to encrypt the function's environment variables. This key is only returned if you've configured a customer managed CMK.</p>"
+        },
+        "LastModified":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The date and time that the function was last updated, in ISO-8601 format (YYYY-MM-DDThh:mm:ss.sTZD).</p>"
+        },
+        "Layers":{
+          "shape":"AwsLambdaFunctionLayerList",
+          "documentation":"<p>The function's layers.</p>"
+        },
+        "MasterArn":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>For Lambda@Edge functions, the ARN of the master function.</p>"
+        },
+        "MemorySize":{
+          "shape":"Integer",
+          "documentation":"<p>The memory that's allocated to the function.</p>"
+        },
+        "RevisionId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The latest updated revision of the function or alias.</p>"
+        },
+        "Role":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The function's execution role.</p>"
+        },
+        "Runtime":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The runtime environment for the Lambda function.</p>"
+        },
+        "Timeout":{
+          "shape":"Integer",
+          "documentation":"<p>The amount of time that Lambda allows a function to run before stopping it.</p>"
+        },
+        "TracingConfig":{
+          "shape":"AwsLambdaFunctionTracingConfig",
+          "documentation":"<p>The function's AWS X-Ray tracing configuration.</p>"
+        },
+        "VpcConfig":{
+          "shape":"AwsLambdaFunctionVpcConfig",
+          "documentation":"<p>The function's networking configuration.</p>"
+        },
+        "Version":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The version of the Lambda function.</p>"
+        }
+      },
+      "documentation":"<p>Details about a function's configuration.</p>"
+    },
+    "AwsLambdaFunctionEnvironment":{
+      "type":"structure",
+      "members":{
+        "Variables":{
+          "shape":"FieldMap",
+          "documentation":"<p>Environment variable key-value pairs.</p>"
+        },
+        "Error":{
+          "shape":"AwsLambdaFunctionEnvironmentError",
+          "documentation":"<p>An <code>AwsLambdaFunctionEnvironmentError</code> object.</p>"
+        }
+      },
+      "documentation":"<p>A function's environment variable settings.</p>"
+    },
+    "AwsLambdaFunctionEnvironmentError":{
+      "type":"structure",
+      "members":{
+        "ErrorCode":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The error code.</p>"
+        },
+        "Message":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The error message.</p>"
+        }
+      },
+      "documentation":"<p>Error messages for environment variables that couldn't be applied.</p>"
+    },
+    "AwsLambdaFunctionLayer":{
+      "type":"structure",
+      "members":{
+        "Arn":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the function layer.</p>"
+        },
+        "CodeSize":{
+          "shape":"Integer",
+          "documentation":"<p>The size of the layer archive in bytes.</p>"
+        }
+      },
+      "documentation":"<p>An AWS Lambda layer.</p>"
+    },
+    "AwsLambdaFunctionLayerList":{
+      "type":"list",
+      "member":{"shape":"AwsLambdaFunctionLayer"}
+    },
+    "AwsLambdaFunctionTracingConfig":{
+      "type":"structure",
+      "members":{
+        "Mode":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The tracing mode.</p>"
+        }
+      },
+      "documentation":"<p>The function's AWS X-Ray tracing configuration.</p>"
+    },
+    "AwsLambdaFunctionVpcConfig":{
+      "type":"structure",
+      "members":{
+        "SecurityGroupIds":{
+          "shape":"NonEmptyStringList",
+          "documentation":"<p>A list of VPC security groups IDs.</p>"
+        },
+        "SubnetIds":{
+          "shape":"NonEmptyStringList",
+          "documentation":"<p>A list of VPC subnet IDs.</p>"
+        },
+        "VpcId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The ID of the VPC.</p>"
+        }
+      },
+      "documentation":"<p>The VPC security groups and subnets that are attached to a Lambda function. For more information, see VPC Settings.</p>"
+    },
+    "AwsLambdaLayerVersionDetails":{
+      "type":"structure",
+      "members":{
+        "Version":{
+          "shape":"AwsLambdaLayerVersionNumber",
+          "documentation":"<p>The version number.</p>"
+        },
+        "CompatibleRuntimes":{
+          "shape":"NonEmptyStringList",
+          "documentation":"<p>The layer's compatible runtimes. Maximum number of 5 items.</p> <p>Valid values: <code>nodejs10.x</code> | <code>nodejs12.x</code> | <code>java8</code> | <code>java11</code> | <code>python2.7</code> | <code>python3.6</code> | <code>python3.7</code> | <code>python3.8</code> | <code>dotnetcore1.0</code> | <code>dotnetcore2.1</code> | <code>go1.x</code> | <code>ruby2.5</code> | <code>provided</code> </p>"
+        },
+        "CreatedDate":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The date that the version was created, in ISO 8601 format. For example, 2018-11-27T15:10:45.123+0000. </p>"
+        }
+      },
+      "documentation":"<p>Details about a Lambda layer version.</p>"
+    },
+    "AwsLambdaLayerVersionNumber":{"type":"long"},
+    "AwsRdsDbInstanceAssociatedRole":{
+      "type":"structure",
+      "members":{
+        "RoleArn":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the IAM role that is associated with the DB instance.</p>"
+        },
+        "FeatureName":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The name of the feature associated with the IAM)role.</p>"
+        },
+        "Status":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>Describes the state of the association between the IAM role and the DB instance. The <code>Status</code> property returns one of the following values:</p> <ul> <li> <p> <code>ACTIVE</code> - the IAM role ARN is associated with the DB instance and can be used to access other AWS services on your behalf.</p> </li> <li> <p> <code>PENDING</code> - the IAM role ARN is being associated with the DB instance.</p> </li> <li> <p> <code>INVALID</code> - the IAM role ARN is associated with the DB instance, but the DB instance is unable to assume the IAM role in order to access other AWS services on your behalf. </p> </li> </ul>"
+        }
+      },
+      "documentation":"<p>An AWS Identity and Access Management (IAM) role associated with the DB instance.</p>"
+    },
+    "AwsRdsDbInstanceAssociatedRoles":{
+      "type":"list",
+      "member":{"shape":"AwsRdsDbInstanceAssociatedRole"}
+    },
+    "AwsRdsDbInstanceDetails":{
+      "type":"structure",
+      "members":{
+        "AssociatedRoles":{
+          "shape":"AwsRdsDbInstanceAssociatedRoles",
+          "documentation":"<p>The AWS Identity and Access Management (IAM) roles associated with the DB instance.</p>"
+        },
+        "CACertificateIdentifier":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The identifier of the CA certificate for this DB instance.</p>"
+        },
+        "DBClusterIdentifier":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>If the DB instance is a member of a DB cluster, contains the name of the DB cluster that the DB instance is a member of.</p>"
+        },
+        "DBInstanceIdentifier":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>Contains a user-supplied database identifier. This identifier is the unique key that identifies a DB instance.</p>"
+        },
+        "DBInstanceClass":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>Contains the name of the compute and memory capacity class of the DB instance.</p>"
+        },
+        "DbInstancePort":{
+          "shape":"Integer",
+          "documentation":"<p>Specifies the port that the DB instance listens on. If the DB instance is part of a DB cluster, this can be a different port than the DB cluster port.</p>"
+        },
+        "DbiResourceId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The AWS Region-unique, immutable identifier for the DB instance. This identifier is found in AWS CloudTrail log entries whenever the AWS KMS key for the DB instance is accessed. </p>"
+        },
+        "DBName":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The meaning of this parameter differs according to the database engine you use.</p> <p> <b>MySQL, MariaDB, SQL Server, PostgreSQL</b> </p> <p>Contains the name of the initial database of this instance that was provided at create time, if one was specified when the DB instance was created. This same name is returned for the life of the DB instance.</p> <p> <b>Oracle</b> </p> <p>Contains the Oracle System ID (SID) of the created DB instance. Not shown when the returned parameters do not apply to an Oracle DB instance. </p>"
+        },
+        "DeletionProtection":{
+          "shape":"Boolean",
+          "documentation":"<p>Indicates whether the DB instance has deletion protection enabled.</p> <p>When deletion protection is enabled, the database cannot be deleted.</p>"
+        },
+        "Endpoint":{
+          "shape":"AwsRdsDbInstanceEndpoint",
+          "documentation":"<p>Specifies the connection endpoint.</p>"
+        },
+        "Engine":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>Provides the name of the database engine to use for this DB instance.</p>"
+        },
+        "EngineVersion":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>Indicates the database engine version.</p>"
+        },
+        "IAMDatabaseAuthenticationEnabled":{
+          "shape":"Boolean",
+          "documentation":"<p>True if mapping of AWS Identity and Access Management (IAM) accounts to database accounts is enabled, and otherwise false.</p> <p>IAM database authentication can be enabled for the following database engines.</p> <ul> <li> <p>For MySQL 5.6, minor version 5.6.34 or higher</p> </li> <li> <p>For MySQL 5.7, minor version 5.7.16 or higher</p> </li> <li> <p>Aurora 5.6 or higher</p> </li> </ul>"
+        },
+        "InstanceCreateTime":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>Provides the date and time the DB instance was created.</p>"
+        },
+        "KmsKeyId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>If <code>StorageEncrypted</code> is true, the AWS KMS key identifier for the encrypted DB instance.</p>"
+        },
+        "PubliclyAccessible":{
+          "shape":"Boolean",
+          "documentation":"<p>Specifies the accessibility options for the DB instance.</p> <p>A value of true specifies an Internet-facing instance with a publicly resolvable DNS name, which resolves to a public IP address.</p> <p>A value of false specifies an internal instance with a DNS name that resolves to a private IP address. </p>"
+        },
+        "StorageEncrypted":{
+          "shape":"Boolean",
+          "documentation":"<p>Specifies whether the DB instance is encrypted.</p>"
+        },
+        "TdeCredentialArn":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The ARN from the key store with which the instance is associated for TDE encryption.</p>"
+        },
+        "VpcSecurityGroups":{
+          "shape":"AwsRdsDbInstanceVpcSecurityGroups",
+          "documentation":"<p>A list of VPC security groups that the DB instance belongs to.</p>"
+        }
+      },
+      "documentation":"<p>Contains the details of an Amazon RDS DB instance.</p>"
+    },
+    "AwsRdsDbInstanceEndpoint":{
+      "type":"structure",
+      "members":{
+        "Address":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>Specifies the DNS address of the DB instance.</p>"
+        },
+        "Port":{
+          "shape":"Integer",
+          "documentation":"<p>Specifies the port that the database engine is listening on.</p>"
+        },
+        "HostedZoneId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>Specifies the ID that Amazon Route 53 assigns when you create a hosted zone.</p>"
+        }
+      },
+      "documentation":"<p>Specifies the connection endpoint.</p>"
+    },
+    "AwsRdsDbInstanceVpcSecurityGroup":{
+      "type":"structure",
+      "members":{
+        "VpcSecurityGroupId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The name of the VPC security group.</p>"
+        },
+        "Status":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The status of the VPC security group.</p>"
+        }
+      },
+      "documentation":"<p>A VPC security groups that the DB instance belongs to.</p>"
+    },
+    "AwsRdsDbInstanceVpcSecurityGroups":{
+      "type":"list",
+      "member":{"shape":"AwsRdsDbInstanceVpcSecurityGroup"}
+    },
+    "AwsS3BucketDetails":{
+      "type":"structure",
+      "members":{
+        "OwnerId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The canonical user ID of the owner of the S3 bucket.</p>"
+        },
+        "OwnerName":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The display name of the owner of the S3 bucket.</p>"
+        },
+        "CreatedAt":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The date and time when the S3 bucket was created.</p>"
+        },
+        "ServerSideEncryptionConfiguration":{
+          "shape":"AwsS3BucketServerSideEncryptionConfiguration",
+          "documentation":"<p>The encryption rules that are applied to the S3 bucket.</p>"
+        }
+      },
+      "documentation":"<p>The details of an Amazon S3 bucket.</p>"
+    },
+    "AwsS3BucketServerSideEncryptionByDefault":{
+      "type":"structure",
+      "members":{
+        "SSEAlgorithm":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>Server-side encryption algorithm to use for the default encryption.</p>"
+        },
+        "KMSMasterKeyID":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>AWS KMS customer master key (CMK) ID to use for the default encryption.</p>"
+        }
+      },
+      "documentation":"<p>Specifies the default server-side encryption to apply to new objects in the bucket.</p>"
+    },
+    "AwsS3BucketServerSideEncryptionConfiguration":{
+      "type":"structure",
+      "members":{
+        "Rules":{
+          "shape":"AwsS3BucketServerSideEncryptionRules",
+          "documentation":"<p>The encryption rules that are applied to the S3 bucket.</p>"
+        }
+      },
+      "documentation":"<p>The encryption configuration for the S3 bucket.</p>"
+    },
+    "AwsS3BucketServerSideEncryptionRule":{
+      "type":"structure",
+      "members":{
+        "ApplyServerSideEncryptionByDefault":{
+          "shape":"AwsS3BucketServerSideEncryptionByDefault",
+          "documentation":"<p>Specifies the default server-side encryption to apply to new objects in the bucket. If a <code>PUT</code> Object request doesn't specify any server-side encryption, this default encryption is applied.</p>"
+        }
+      },
+      "documentation":"<p>An encryption rule to apply to the S3 bucket.</p>"
+    },
+    "AwsS3BucketServerSideEncryptionRules":{
+      "type":"list",
+      "member":{"shape":"AwsS3BucketServerSideEncryptionRule"}
+    },
+    "AwsS3ObjectDetails":{
+      "type":"structure",
+      "members":{
+        "LastModified":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The date and time when the object was last modified.</p>"
+        },
+        "ETag":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The opaque identifier assigned by a web server to a specific version of a resource found at a URL.</p>"
+        },
+        "VersionId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The version of the object.</p>"
+        },
+        "ContentType":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>A standard MIME type describing the format of the object data.</p>"
+        },
+        "ServerSideEncryption":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>If the object is stored using server-side encryption, the value of the server-side encryption algorithm used when storing this object in Amazon S3.</p>"
+        },
+        "SSEKMSKeyId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The identifier of the AWS Key Management Service (AWS KMS) symmetric customer managed customer master key (CMK) that was used for the object.</p>"
+        }
+      },
+      "documentation":"<p>Details about an AWS S3 object.</p>"
+    },
+    "AwsSecurityFinding":{
+      "type":"structure",
+      "required":[
+        "SchemaVersion",
+        "Id",
+        "ProductArn",
+        "GeneratorId",
+        "AwsAccountId",
+        "Types",
+        "CreatedAt",
+        "UpdatedAt",
+        "Severity",
+        "Title",
+        "Description",
+        "Resources"
+      ],
+      "members":{
+        "SchemaVersion":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The schema version that a finding is formatted for.</p>"
+        },
+        "Id":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The security findings provider-specific identifier for a finding.</p>"
+        },
+        "ProductArn":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The ARN generated by Security Hub that uniquely identifies a product that generates findings. This can be the ARN for a third-party product that is integrated with Security Hub, or the ARN for a custom integration.</p>"
+        },
+        "GeneratorId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The identifier for the solution-specific component (a discrete unit of logic) that generated a finding. In various security-findings providers' solutions, this generator can be called a rule, a check, a detector, a plug-in, etc. </p>"
+        },
+        "AwsAccountId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The AWS account ID that a finding is generated in.</p>"
+        },
+        "Types":{
+          "shape":"TypeList",
+          "documentation":"<p>One or more finding types in the format of <code>namespace/category/classifier</code> that classify a finding.</p> <p>Valid namespace values are: Software and Configuration Checks | TTPs | Effects | Unusual Behaviors | Sensitive Data Identifications</p>"
+        },
+        "FirstObservedAt":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>An ISO8601-formatted timestamp that indicates when the security-findings provider first observed the potential security issue that a finding captured.</p>"
+        },
+        "LastObservedAt":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>An ISO8601-formatted timestamp that indicates when the security-findings provider most recently observed the potential security issue that a finding captured.</p>"
+        },
+        "CreatedAt":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>An ISO8601-formatted timestamp that indicates when the security-findings provider created the potential security issue that a finding captured.</p>"
+        },
+        "UpdatedAt":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>An ISO8601-formatted timestamp that indicates when the security-findings provider last updated the finding record. </p>"
+        },
+        "Severity":{
+          "shape":"Severity",
+          "documentation":"<p>A finding's severity.</p>"
+        },
+        "Confidence":{
+          "shape":"Integer",
+          "documentation":"<p>A finding's confidence. Confidence is defined as the likelihood that a finding accurately identifies the behavior or issue that it was intended to identify.</p> <p>Confidence is scored on a 0-100 basis using a ratio scale, where 0 means zero percent confidence and 100 means 100 percent confidence.</p>"
+        },
+        "Criticality":{
+          "shape":"Integer",
+          "documentation":"<p>The level of importance assigned to the resources associated with the finding.</p> <p>A score of 0 means that the underlying resources have no criticality, and a score of 100 is reserved for the most critical resources.</p>"
+        },
+        "Title":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>A finding's title.</p> <note> <p>In this release, <code>Title</code> is a required property.</p> </note>"
+        },
+        "Description":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>A finding's description.</p> <note> <p>In this release, <code>Description</code> is a required property.</p> </note>"
+        },
+        "Remediation":{
+          "shape":"Remediation",
+          "documentation":"<p>A data type that describes the remediation options for a finding.</p>"
+        },
+        "SourceUrl":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>A URL that links to a page about the current finding in the security-findings provider's solution.</p>"
+        },
+        "ProductFields":{
+          "shape":"FieldMap",
+          "documentation":"<p>A data type where security-findings providers can include additional solution-specific details that aren't part of the defined <code>AwsSecurityFinding</code> format.</p>"
         },
         "UserDefinedFields":{
           "shape":"FieldMap",
@@ -913,7 +2041,7 @@
         },
         "ThreatIntelIndicators":{
           "shape":"ThreatIntelIndicatorList",
-          "documentation":"<p>Threat intel details related to a finding.</p>"
+          "documentation":"<p>Threat intelligence details related to a finding.</p>"
         },
         "Resources":{
           "shape":"ResourceList",
@@ -921,7 +2049,7 @@
         },
         "Compliance":{
           "shape":"Compliance",
-          "documentation":"<p>This data type is exclusive to findings that are generated as the result of a check run against a specific rule in a supported standard (for example, CIS AWS Foundations). Contains compliance-related finding details.</p>"
+          "documentation":"<p>This data type is exclusive to findings that are generated as the result of a check run against a specific rule in a supported security standard, such as CIS AWS Foundations. Contains security standard-related finding details.</p>"
         },
         "VerificationState":{
           "shape":"VerificationState",
@@ -931,6 +2059,10 @@
           "shape":"WorkflowState",
           "documentation":"<p>The workflow state of a finding. </p>"
         },
+        "Workflow":{
+          "shape":"Workflow",
+          "documentation":"<p>Provides information about the status of the investigation into a finding.</p>"
+        },
         "RecordState":{
           "shape":"RecordState",
           "documentation":"<p>The record state of a finding.</p>"
@@ -944,7 +2076,7 @@
           "documentation":"<p>A user-defined note added to a finding.</p>"
         }
       },
-      "documentation":"<p>Provides consistent format for the contents of the Security Hub-aggregated findings. <code>AwsSecurityFinding</code> format enables you to share findings between AWS security services and third-party solutions, and compliance checks.</p> <note> <p>A finding is a potential security issue generated either by AWS services (Amazon GuardDuty, Amazon Inspector, and Amazon Macie) or by the integrated third-party solutions and compliance checks.</p> </note>"
+      "documentation":"<p>Provides consistent format for the contents of the Security Hub-aggregated findings. <code>AwsSecurityFinding</code> format enables you to share findings between AWS security services and third-party solutions, and security standards checks.</p> <note> <p>A finding is a potential security issue generated either by AWS services (Amazon GuardDuty, Amazon Inspector, and Amazon Macie) or by the integrated third-party solutions and standards checks.</p> </note>"
     },
     "AwsSecurityFindingFilters":{
       "type":"structure",
@@ -999,11 +2131,11 @@
         },
         "Confidence":{
           "shape":"NumberFilterList",
-          "documentation":"<p>A finding's confidence. Confidence is defined as the likelihood that a finding accurately identifies the behavior or issue that it was intended to identify. Confidence is scored on a 0-100 basis using a ratio scale, where 0 means zero percent confidence and 100 means 100 percent confidence.</p>"
+          "documentation":"<p>A finding's confidence. Confidence is defined as the likelihood that a finding accurately identifies the behavior or issue that it was intended to identify.</p> <p>Confidence is scored on a 0-100 basis using a ratio scale, where 0 means zero percent confidence and 100 means 100 percent confidence.</p>"
         },
         "Criticality":{
           "shape":"NumberFilterList",
-          "documentation":"<p>The level of importance assigned to the resources associated with the finding. A score of 0 means that the underlying resources have no criticality, and a score of 100 is reserved for the most critical resources.</p>"
+          "documentation":"<p>The level of importance assigned to the resources associated with the finding.</p> <p>A score of 0 means that the underlying resources have no criticality, and a score of 100 is reserved for the most critical resources.</p>"
         },
         "Title":{
           "shape":"StringFilterList",
@@ -1123,27 +2255,27 @@
         },
         "ThreatIntelIndicatorType":{
           "shape":"StringFilterList",
-          "documentation":"<p>The type of a threat intel indicator.</p>"
+          "documentation":"<p>The type of a threat intelligence indicator.</p>"
         },
         "ThreatIntelIndicatorValue":{
           "shape":"StringFilterList",
-          "documentation":"<p>The value of a threat intel indicator.</p>"
+          "documentation":"<p>The value of a threat intelligence indicator.</p>"
         },
         "ThreatIntelIndicatorCategory":{
           "shape":"StringFilterList",
-          "documentation":"<p>The category of a threat intel indicator.</p>"
+          "documentation":"<p>The category of a threat intelligence indicator.</p>"
         },
         "ThreatIntelIndicatorLastObservedAt":{
           "shape":"DateFilterList",
-          "documentation":"<p>The date/time of the last observation of a threat intel indicator.</p>"
+          "documentation":"<p>The date/time of the last observation of a threat intelligence indicator.</p>"
         },
         "ThreatIntelIndicatorSource":{
           "shape":"StringFilterList",
-          "documentation":"<p>The source of the threat intel.</p>"
+          "documentation":"<p>The source of the threat intelligence.</p>"
         },
         "ThreatIntelIndicatorSourceUrl":{
           "shape":"StringFilterList",
-          "documentation":"<p>The URL for more details from the source of the threat intel.</p>"
+          "documentation":"<p>The URL for more details from the source of the threat intelligence.</p>"
         },
         "ResourceType":{
           "shape":"StringFilterList",
@@ -1199,7 +2331,7 @@
         },
         "ResourceAwsEc2InstanceLaunchedAt":{
           "shape":"DateFilterList",
-          "documentation":"<p>The date/time the instance was launched.</p>"
+          "documentation":"<p>The date and time the instance was launched.</p>"
         },
         "ResourceAwsS3BucketOwnerId":{
           "shape":"StringFilterList",
@@ -1243,7 +2375,7 @@
         },
         "ComplianceStatus":{
           "shape":"StringFilterList",
-          "documentation":"<p>Exclusive to findings that are generated as the result of a check run against a specific rule in a supported standard (for example, CIS AWS Foundations). Contains compliance-related finding details.</p>"
+          "documentation":"<p>Exclusive to findings that are generated as the result of a check run against a specific rule in a supported standard, such as CIS AWS Foundations. Contains security standard-related finding details.</p>"
         },
         "VerificationState":{
           "shape":"StringFilterList",
@@ -1251,7 +2383,11 @@
         },
         "WorkflowState":{
           "shape":"StringFilterList",
-          "documentation":"<p>The workflow state of a finding.</p>"
+          "documentation":"<p>The workflow state of a finding.</p>"
+        },
+        "WorkflowStatus":{
+          "shape":"StringFilterList",
+          "documentation":"<p>The status of the investigation into a finding. Allowed values are the following.</p> <ul> <li> <p> <code>NEW</code> - The initial state of a finding, before it is reviewed.</p> </li> <li> <p> <code>NOTIFIED</code> - Indicates that the resource owner has been notified about the security issue. Used when the initial reviewer is not the resource owner, and needs intervention from the resource owner.</p> </li> <li> <p> <code>SUPPRESSED</code> - The finding will not be reviewed again and will not be acted upon.</p> </li> <li> <p> <code>RESOLVED</code> - The finding was reviewed and remediated and is now considered resolved. </p> </li> </ul>"
         },
         "RecordState":{
           "shape":"StringFilterList",
@@ -1282,12 +2418,130 @@
           "documentation":"<p>A keyword for a finding.</p>"
         }
       },
-      "documentation":"<p>A collection of attributes that are applied to all active Security Hub-aggregated findings and that result in a subset of findings that are included in this insight. </p>"
+      "documentation":"<p>A collection of attributes that are applied to all active Security Hub-aggregated findings and that result in a subset of findings that are included in this insight.</p>"
     },
     "AwsSecurityFindingList":{
       "type":"list",
       "member":{"shape":"AwsSecurityFinding"}
     },
+    "AwsSnsTopicDetails":{
+      "type":"structure",
+      "members":{
+        "KmsMasterKeyId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The ID of an AWS-managed customer master key (CMK) for Amazon SNS or a custom CMK.</p>"
+        },
+        "Subscription":{
+          "shape":"AwsSnsTopicSubscriptionList",
+          "documentation":"<p>Subscription is an embedded property that describes the subscription endpoints of an Amazon SNS topic.</p>"
+        },
+        "TopicName":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The name of the topic.</p>"
+        },
+        "Owner":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The subscription's owner.</p>"
+        }
+      },
+      "documentation":"<p>A wrapper type for the topic's Amazon Resource Name (ARN).</p>"
+    },
+    "AwsSnsTopicSubscription":{
+      "type":"structure",
+      "members":{
+        "Endpoint":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The subscription's endpoint (format depends on the protocol).</p>"
+        },
+        "Protocol":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The subscription's protocol.</p>"
+        }
+      },
+      "documentation":"<p>A wrapper type for the attributes of an Amazon SNS subscription.</p>"
+    },
+    "AwsSnsTopicSubscriptionList":{
+      "type":"list",
+      "member":{"shape":"AwsSnsTopicSubscription"}
+    },
+    "AwsSqsQueueDetails":{
+      "type":"structure",
+      "members":{
+        "KmsDataKeyReusePeriodSeconds":{
+          "shape":"Integer",
+          "documentation":"<p>The length of time, in seconds, for which Amazon SQS can reuse a data key to encrypt or decrypt messages before calling AWS KMS again.</p>"
+        },
+        "KmsMasterKeyId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The ID of an AWS-managed customer master key (CMK) for Amazon SQS or a custom CMK.</p>"
+        },
+        "QueueName":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The name of the new queue.</p>"
+        },
+        "DeadLetterTargetArn":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the dead-letter queue to which Amazon SQS moves messages after the value of <code>maxReceiveCount</code> is exceeded. </p>"
+        }
+      },
+      "documentation":"<p>Data about a queue.</p>"
+    },
+    "AwsWafWebAclDetails":{
+      "type":"structure",
+      "members":{
+        "Name":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>A friendly name or description of the WebACL. You can't change the name of a WebACL after you create it.</p>"
+        },
+        "DefaultAction":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The action to perform if none of the Rules contained in the WebACL match.</p>"
+        },
+        "Rules":{
+          "shape":"AwsWafWebAclRuleList",
+          "documentation":"<p>An array that contains the action for each rule in a WebACL, the priority of the rule, and the ID of the rule.</p>"
+        },
+        "WebAclId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>A unique identifier for a WebACL.</p>"
+        }
+      },
+      "documentation":"<p>Details about a WAF WebACL.</p>"
+    },
+    "AwsWafWebAclRule":{
+      "type":"structure",
+      "members":{
+        "Action":{
+          "shape":"WafAction",
+          "documentation":"<p>Specifies the action that CloudFront or AWS WAF takes when a web request matches the conditions in the Rule. </p>"
+        },
+        "ExcludedRules":{
+          "shape":"WafExcludedRuleList",
+          "documentation":"<p>Rules to exclude from a rule group.</p>"
+        },
+        "OverrideAction":{
+          "shape":"WafOverrideAction",
+          "documentation":"<p>Use the <code>OverrideAction</code> to test your RuleGroup.</p> <p>Any rule in a RuleGroup can potentially block a request. If you set the <code>OverrideAction</code> to <code>None</code>, the RuleGroup blocks a request if any individual rule in the RuleGroup matches the request and is configured to block that request.</p> <p>However, if you first want to test the RuleGroup, set the <code>OverrideAction</code> to <code>Count</code>. The RuleGroup then overrides any block action specified by individual rules contained within the group. Instead of blocking matching requests, those requests are counted.</p> <p> <code>ActivatedRule</code>|<code>OverrideAction</code> applies only when updating or adding a RuleGroup to a WebACL. In this case you do not use <code>ActivatedRule</code>|<code>Action</code>. For all other update requests, <code>ActivatedRule</code>|<code>Action</code> is used instead of <code>ActivatedRule</code>|<code>OverrideAction</code>. </p>"
+        },
+        "Priority":{
+          "shape":"Integer",
+          "documentation":"<p>Specifies the order in which the Rules in a WebACL are evaluated. Rules with a lower value for Priority are evaluated before Rules with a higher value. The value must be a unique integer. If you add multiple Rules to a WebACL, the values do not need to be consecutive.</p>"
+        },
+        "RuleId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The identifier for a Rule.</p>"
+        },
+        "Type":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The rule type.</p> <p>Valid values: <code>REGULAR</code> | <code>RATE_BASED</code> | <code>GROUP</code> </p> <p>The default is <code>REGULAR</code>.</p>"
+        }
+      },
+      "documentation":"<p>Details for a rule in a WAF WebACL.</p>"
+    },
+    "AwsWafWebAclRuleList":{
+      "type":"list",
+      "member":{"shape":"AwsWafWebAclRule"}
+    },
     "BatchDisableStandardsRequest":{
       "type":"structure",
       "required":["StandardsSubscriptionArns"],
@@ -1313,7 +2567,7 @@
       "members":{
         "StandardsSubscriptionRequests":{
           "shape":"StandardsSubscriptionRequests",
-          "documentation":"<p>The list of standards compliance checks to enable.</p> <important> <p>In this release, Security Hub supports only the CIS AWS Foundations standard.</p> <p>The ARN for the standard is <code>arn:aws:securityhub:::ruleset/cis-aws-foundations-benchmark/v/1.2.0</code>.</p> </important>"
+          "documentation":"<p>The list of standards checks to enable.</p>"
         }
       }
     },
@@ -1332,7 +2586,7 @@
       "members":{
         "Findings":{
           "shape":"AwsSecurityFindingList",
-          "documentation":"<p>A list of findings to import. To successfully import a finding, it must follow the <a href=\"https://docs.aws.amazon.com/securityhub/latest/userguide/securityhub-findings-format.html\">AWS Security Finding Format</a>.</p>"
+          "documentation":"<p>A list of findings to import. To successfully import a finding, it must follow the <a href=\"https://docs.aws.amazon.com/securityhub/latest/userguide/securityhub-findings-format.html\">AWS Security Finding Format</a>. Maximum of 100 findings per request.</p>"
         }
       }
     },
@@ -1353,7 +2607,7 @@
         },
         "FailedFindings":{
           "shape":"ImportFindingsErrorList",
-          "documentation":"<p>The list of the findings that failed to import.</p>"
+          "documentation":"<p>The list of findings that failed to import.</p>"
         }
       }
     },
@@ -1367,10 +2621,14 @@
       "members":{
         "Status":{
           "shape":"ComplianceStatus",
-          "documentation":"<p>The result of a compliance check.</p>"
+          "documentation":"<p>The result of a standards check.</p>"
+        },
+        "RelatedRequirements":{
+          "shape":"RelatedRequirementsList",
+          "documentation":"<p>List of requirements that are related to a standards control.</p>"
         }
       },
-      "documentation":"<p>Exclusive to findings that are generated as the result of a check run against a specific rule in a supported standard (for example, CIS AWS Foundations). Contains compliance-related finding details.</p>"
+      "documentation":"<p>Exclusive to findings that are generated as the result of a check run against a specific rule in a supported security standard, such as CIS AWS Foundations. Contains security standard-related finding details.</p> <p>Values include the following:</p> <ul> <li> <p>Allowed values are the following:</p> <ul> <li> <p> <code>PASSED</code> - Standards check passed for all evaluated resources.</p> </li> <li> <p> <code>WARNING</code> - Some information is missing or this check is not supported given your configuration.</p> </li> <li> <p> <code>FAILED</code> - Standards check failed for at least one evaluated resource.</p> </li> <li> <p> <code>NOT_AVAILABLE</code> - Check could not be performed due to a service outage, API error, or because the result of the AWS Config evaluation was <code>NOT_APPLICABLE</code>. If the AWS Config evaluation result was <code> NOT_APPLICABLE</code>, then after 3 days, Security Hub automatically archives the finding.</p> </li> </ul> </li> </ul>"
     },
     "ComplianceStatus":{
       "type":"string",
@@ -1403,6 +2661,13 @@
       },
       "documentation":"<p>Container details related to a finding.</p>"
     },
+    "ControlStatus":{
+      "type":"string",
+      "enum":[
+        "ENABLED",
+        "DISABLED"
+      ]
+    },
     "CreateActionTargetRequest":{
       "type":"structure",
       "required":[
@@ -1449,11 +2714,11 @@
         },
         "Filters":{
           "shape":"AwsSecurityFindingFilters",
-          "documentation":"<p>One or more attributes used to filter the findings included in the insight. Only findings that match the criteria defined in the filters are included in the insight.</p>"
+          "documentation":"<p>One or more attributes used to filter the findings included in the insight. The insight only includes findings that match the criteria defined in the filters.</p>"
         },
         "GroupByAttribute":{
           "shape":"NonEmptyString",
-          "documentation":"<p>The attribute used as the aggregator to group related findings for the insight.</p>"
+          "documentation":"<p>The attribute used to group the findings for the insight. The grouping attribute identifies the type of item that the insight applies to. For example, if an insight is grouped by resource identifier, then the insight produces a list of resource identifiers.</p>"
         }
       }
     },
@@ -1472,7 +2737,7 @@
       "members":{
         "AccountDetails":{
           "shape":"AccountDetailsList",
-          "documentation":"<p>A list of account ID and email address pairs of the accounts to associate with the Security Hub master account.</p>"
+          "documentation":"<p>The list of accounts to associate with the Security Hub master account. For each account, the list includes the account ID and the email address.</p>"
         }
       }
     },
@@ -1481,7 +2746,7 @@
       "members":{
         "UnprocessedAccounts":{
           "shape":"ResultList",
-          "documentation":"<p>A list of account ID and email address pairs of the AWS accounts that weren't processed.</p>"
+          "documentation":"<p>The list of AWS accounts that were not processed. For each account, the list includes the account ID and the email address.</p>"
         }
       }
     },
@@ -1531,7 +2796,7 @@
       "members":{
         "AccountIds":{
           "shape":"AccountIdList",
-          "documentation":"<p>A list of account IDs that specify the accounts that invitations to Security Hub are declined from.</p>"
+          "documentation":"<p>The list of account IDs for the accounts from which to decline the invitations to Security Hub.</p>"
         }
       }
     },
@@ -1540,7 +2805,7 @@
       "members":{
         "UnprocessedAccounts":{
           "shape":"ResultList",
-          "documentation":"<p>A list of account ID and email address pairs of the AWS accounts that weren't processed.</p>"
+          "documentation":"<p>The list of AWS accounts that were not processed. For each account, the list includes the account ID and the email address.</p>"
         }
       }
     },
@@ -1594,7 +2859,7 @@
       "members":{
         "AccountIds":{
           "shape":"AccountIdList",
-          "documentation":"<p>A list of the account IDs that sent the invitations to delete.</p>"
+          "documentation":"<p>The list of the account IDs that sent the invitations to delete.</p>"
         }
       }
     },
@@ -1603,7 +2868,7 @@
       "members":{
         "UnprocessedAccounts":{
           "shape":"ResultList",
-          "documentation":"<p>A list of account ID and email address pairs of the AWS accounts that invitations weren't deleted for.</p>"
+          "documentation":"<p>The list of AWS accounts for which the invitations were not deleted. For each account, the list includes the account ID and the email address.</p>"
         }
       }
     },
@@ -1612,7 +2877,7 @@
       "members":{
         "AccountIds":{
           "shape":"AccountIdList",
-          "documentation":"<p>A list of account IDs of the member accounts to delete.</p>"
+          "documentation":"<p>The list of account IDs for the member accounts to delete.</p>"
         }
       }
     },
@@ -1621,7 +2886,7 @@
       "members":{
         "UnprocessedAccounts":{
           "shape":"ResultList",
-          "documentation":"<p>A list of account ID and email address pairs of the AWS accounts that weren't deleted.</p>"
+          "documentation":"<p>The list of AWS accounts that were not deleted. For each account, the list includes the account ID and the email address.</p>"
         }
       }
     },
@@ -1634,7 +2899,7 @@
         },
         "NextToken":{
           "shape":"NextToken",
-          "documentation":"<p>The token that is required for pagination.</p>"
+          "documentation":"<p>The token that is required for pagination. On your first call to the <code>DescribeActionTargets</code> operation, set the value of this parameter to <code>NULL</code>.</p> <p>For subsequent calls to the operation, to continue listing data, set the value of this parameter to the value returned from the previous response.</p>"
         },
         "MaxResults":{
           "shape":"MaxResults",
@@ -1652,7 +2917,7 @@
         },
         "NextToken":{
           "shape":"NextToken",
-          "documentation":"<p>The token that is required for pagination.</p>"
+          "documentation":"<p>The pagination token to use to request the next page of results.</p>"
         }
       }
     },
@@ -1672,7 +2937,7 @@
       "members":{
         "HubArn":{
           "shape":"NonEmptyString",
-          "documentation":"<p>The ARN of the Hub resource retrieved.</p>"
+          "documentation":"<p>The ARN of the Hub resource that was retrieved.</p>"
         },
         "SubscribedAt":{
           "shape":"NonEmptyString",
@@ -1685,7 +2950,7 @@
       "members":{
         "NextToken":{
           "shape":"NextToken",
-          "documentation":"<p>The token that is required for pagination.</p>",
+          "documentation":"<p>The token that is required for pagination. On your first call to the <code>DescribeProducts</code> operation, set the value of this parameter to <code>NULL</code>.</p> <p>For subsequent calls to the operation, to continue listing data, set the value of this parameter to the value returned from the previous response.</p>",
           "location":"querystring",
           "locationName":"NextToken"
         },
@@ -1707,7 +2972,74 @@
         },
         "NextToken":{
           "shape":"NextToken",
-          "documentation":"<p>The token that is required for pagination.</p>"
+          "documentation":"<p>The pagination token to use to request the next page of results.</p>"
+        }
+      }
+    },
+    "DescribeStandardsControlsRequest":{
+      "type":"structure",
+      "required":["StandardsSubscriptionArn"],
+      "members":{
+        "StandardsSubscriptionArn":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The ARN of a resource that represents your subscription to a supported standard.</p>",
+          "location":"uri",
+          "locationName":"StandardsSubscriptionArn"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>The token that is required for pagination. On your first call to the <code>DescribeStandardsControls</code> operation, set the value of this parameter to <code>NULL</code>.</p> <p>For subsequent calls to the operation, to continue listing data, set the value of this parameter to the value returned from the previous response.</p>",
+          "location":"querystring",
+          "locationName":"NextToken"
+        },
+        "MaxResults":{
+          "shape":"MaxResults",
+          "documentation":"<p>The maximum number of security standard controls to return.</p>",
+          "location":"querystring",
+          "locationName":"MaxResults"
+        }
+      }
+    },
+    "DescribeStandardsControlsResponse":{
+      "type":"structure",
+      "members":{
+        "Controls":{
+          "shape":"StandardsControls",
+          "documentation":"<p>A list of security standards controls.</p>"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>The pagination token to use to request the next page of results.</p>"
+        }
+      }
+    },
+    "DescribeStandardsRequest":{
+      "type":"structure",
+      "members":{
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>The token that is required for pagination. On your first call to the <code>DescribeStandards</code> operation, set the value of this parameter to <code>NULL</code>.</p> <p>For subsequent calls to the operation, to continue listing data, set the value of this parameter to the value returned from the previous response.</p>",
+          "location":"querystring",
+          "locationName":"NextToken"
+        },
+        "MaxResults":{
+          "shape":"MaxResults",
+          "documentation":"<p>The maximum number of standards to return.</p>",
+          "location":"querystring",
+          "locationName":"MaxResults"
+        }
+      }
+    },
+    "DescribeStandardsResponse":{
+      "type":"structure",
+      "members":{
+        "Standards":{
+          "shape":"Standards",
+          "documentation":"<p>A list of available standards.</p>"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>The pagination token to use to request the next page of results.</p>"
         }
       }
     },
@@ -1788,6 +3120,10 @@
         "Tags":{
           "shape":"TagMap",
           "documentation":"<p>The tags to add to the Hub resource when you enable Security Hub.</p>"
+        },
+        "EnableDefaultStandards":{
+          "shape":"Boolean",
+          "documentation":"<p>Whether to enable the security standards that Security Hub has designated as automatically enabled. If you do not provide a value for <code>EnableDefaultStandards</code>, it is set to <code>true</code>. To not enable the automatically enabled standards, set <code>EnableDefaultStandards</code> to <code>false</code>.</p>"
         }
       }
     },
@@ -1806,11 +3142,11 @@
       "members":{
         "StandardsSubscriptionArns":{
           "shape":"StandardsSubscriptionArns",
-          "documentation":"<p>A list of the standards subscription ARNs for the standards to retrieve.</p>"
+          "documentation":"<p>The list of the standards subscription ARNs for the standards to retrieve.</p>"
         },
         "NextToken":{
           "shape":"NextToken",
-          "documentation":"<p>Paginates results. On your first call to the <code>GetEnabledStandards</code> operation, set the value of this parameter to <code>NULL</code>. For subsequent calls to the operation, fill <code>nextToken</code> in the request with the value of <code>nextToken</code> from the previous response to continue listing data.</p>"
+          "documentation":"<p>The token that is required for pagination. On your first call to the <code>GetEnabledStandards</code> operation, set the value of this parameter to <code>NULL</code>.</p> <p>For subsequent calls to the operation, to continue listing data, set the value of this parameter to the value returned from the previous response.</p>"
         },
         "MaxResults":{
           "shape":"MaxResults",
@@ -1823,11 +3159,11 @@
       "members":{
         "StandardsSubscriptions":{
           "shape":"StandardsSubscriptions",
-          "documentation":"<p>A list of <code>StandardsSubscriptions</code> objects that include information about the enabled standards.</p>"
+          "documentation":"<p>The list of <code>StandardsSubscriptions</code> objects that include information about the enabled standards.</p>"
         },
         "NextToken":{
           "shape":"NextToken",
-          "documentation":"<p>The token that is required for pagination.</p>"
+          "documentation":"<p>The pagination token to use to request the next page of results.</p>"
         }
       }
     },
@@ -1836,15 +3172,15 @@
       "members":{
         "Filters":{
           "shape":"AwsSecurityFindingFilters",
-          "documentation":"<p>The findings attributes used to define a condition to filter the findings returned.</p>"
+          "documentation":"<p>The finding attributes used to define a condition to filter the returned findings.</p>"
         },
         "SortCriteria":{
           "shape":"SortCriteria",
-          "documentation":"<p>Findings attributes used to sort the list of findings returned.</p>"
+          "documentation":"<p>The finding attributes used to sort the list of returned findings.</p>"
         },
         "NextToken":{
           "shape":"NextToken",
-          "documentation":"<p>Paginates results. On your first call to the <code>GetFindings</code> operation, set the value of this parameter to <code>NULL</code>. For subsequent calls to the operation, fill <code>nextToken</code> in the request with the value of <code>nextToken</code> from the previous response to continue listing data.</p>"
+          "documentation":"<p>The token that is required for pagination. On your first call to the <code>GetFindings</code> operation, set the value of this parameter to <code>NULL</code>.</p> <p>For subsequent calls to the operation, to continue listing data, set the value of this parameter to the value returned from the previous response.</p>"
         },
         "MaxResults":{
           "shape":"MaxResults",
@@ -1862,7 +3198,7 @@
         },
         "NextToken":{
           "shape":"NextToken",
-          "documentation":"<p>The token that is required for pagination.</p>"
+          "documentation":"<p>The pagination token to use to request the next page of results.</p>"
         }
       }
     },
@@ -1872,7 +3208,7 @@
       "members":{
         "InsightArn":{
           "shape":"NonEmptyString",
-          "documentation":"<p>The ARN of the insight whose results you want to see.</p>",
+          "documentation":"<p>The ARN of the insight for which to return results.</p>",
           "location":"uri",
           "locationName":"InsightArn"
         }
@@ -1893,15 +3229,15 @@
       "members":{
         "InsightArns":{
           "shape":"ArnList",
-          "documentation":"<p>The ARNs of the insights that you want to describe.</p>"
+          "documentation":"<p>The ARNs of the insights to describe. If you do not provide any insight ARNs, then <code>GetInsights</code> returns all of your custom insights. It does not return any managed insights.</p>"
         },
         "NextToken":{
           "shape":"NextToken",
-          "documentation":"<p>Paginates results. On your first call to the <code>GetInsights</code> operation, set the value of this parameter to <code>NULL</code>. For subsequent calls to the operation, fill <code>nextToken</code> in the request with the value of <code>nextToken</code> from the previous response to continue listing data.</p>"
+          "documentation":"<p>The token that is required for pagination. On your first call to the <code>GetInsights</code> operation, set the value of this parameter to <code>NULL</code>.</p> <p>For subsequent calls to the operation, to continue listing data, set the value of this parameter to the value returned from the previous response.</p>"
         },
         "MaxResults":{
           "shape":"MaxResults",
-          "documentation":"<p>The maximum number of items that you want in the response.</p>"
+          "documentation":"<p>The maximum number of items to return in the response.</p>"
         }
       }
     },
@@ -1915,7 +3251,7 @@
         },
         "NextToken":{
           "shape":"NextToken",
-          "documentation":"<p>The token that is required for pagination.</p>"
+          "documentation":"<p>The pagination token to use to request the next page of results.</p>"
         }
       }
     },
@@ -1929,7 +3265,7 @@
       "members":{
         "InvitationsCount":{
           "shape":"Integer",
-          "documentation":"<p>The number of all membership invitations sent to this Security Hub member account, not including the currently accepted invitation. </p>"
+          "documentation":"<p>The number of all membership invitations sent to this Security Hub member account, not including the currently accepted invitation.</p>"
         }
       }
     },
@@ -1953,7 +3289,7 @@
       "members":{
         "AccountIds":{
           "shape":"AccountIdList",
-          "documentation":"<p>A list of account IDs for the Security Hub member accounts that you want to return the details for. </p>"
+          "documentation":"<p>The list of account IDs for the Security Hub member accounts to return the details for. </p>"
         }
       }
     },
@@ -1962,11 +3298,11 @@
       "members":{
         "Members":{
           "shape":"MemberList",
-          "documentation":"<p>A list of details about the Security Hub member accounts.</p>"
+          "documentation":"<p>The list of details about the Security Hub member accounts.</p>"
         },
         "UnprocessedAccounts":{
           "shape":"ResultList",
-          "documentation":"<p>A list of account ID and email address pairs of the AWS accounts that couldn't be processed.</p>"
+          "documentation":"<p>The list of AWS accounts that could not be processed. For each account, the list includes the account ID and the email address.</p>"
         }
       }
     },
@@ -1980,18 +3316,18 @@
       "members":{
         "Id":{
           "shape":"NonEmptyString",
-          "documentation":"<p>The ID of the error made during the <code>BatchImportFindings</code> operation.</p>"
+          "documentation":"<p>The identifier of the finding that could not be updated.</p>"
         },
         "ErrorCode":{
           "shape":"NonEmptyString",
-          "documentation":"<p>The code of the error made during the <code>BatchImportFindings</code> operation.</p>"
+          "documentation":"<p>The code of the error returned by the <code>BatchImportFindings</code> operation.</p>"
         },
         "ErrorMessage":{
           "shape":"NonEmptyString",
-          "documentation":"<p>The message of the error made during the <code>BatchImportFindings</code> operation.</p>"
+          "documentation":"<p>The message of the error returned by the <code>BatchImportFindings</code> operation.</p>"
         }
       },
-      "documentation":"<p>Includes details of the list of the findings that can't be imported.</p>"
+      "documentation":"<p>The list of the findings that cannot be imported. For each finding, the list provides the error.</p>"
     },
     "ImportFindingsErrorList":{
       "type":"list",
@@ -2016,11 +3352,11 @@
         },
         "Filters":{
           "shape":"AwsSecurityFindingFilters",
-          "documentation":"<p>One or more attributes used to filter the findings included in the insight. Only findings that match the criteria defined in the filters are included in the insight.</p>"
+          "documentation":"<p>One or more attributes used to filter the findings included in the insight. The insight only includes findings that match the criteria defined in the filters.</p>"
         },
         "GroupByAttribute":{
           "shape":"NonEmptyString",
-          "documentation":"<p>The attribute that the insight's findings are grouped by. This attribute is used as a findings aggregator for the purposes of viewing and managing multiple related findings under a single operand.</p>"
+          "documentation":"<p>The grouping attribute for the insight's findings. Indicates how to group the matching findings, and identifies the type of item that the insight applies to. For example, if an insight is grouped by resource identifier, then the insight produces a list of resource identifiers.</p>"
         }
       },
       "documentation":"<p>Contains information about a Security Hub insight.</p>"
@@ -2075,6 +3411,17 @@
       "documentation":"<p>The insight results returned by the <code>GetInsightResults</code> operation.</p>"
     },
     "Integer":{"type":"integer"},
+    "IntegrationType":{
+      "type":"string",
+      "enum":[
+        "SEND_FINDINGS_TO_SECURITY_HUB",
+        "RECEIVE_FINDINGS_FROM_SECURITY_HUB"
+      ]
+    },
+    "IntegrationTypeList":{
+      "type":"list",
+      "member":{"shape":"IntegrationType"}
+    },
     "InternalException":{
       "type":"structure",
       "members":{
@@ -2122,7 +3469,7 @@
         },
         "MemberStatus":{
           "shape":"NonEmptyString",
-          "documentation":"<p>The current status of the association between member and master accounts.</p>"
+          "documentation":"<p>The current status of the association between the member and master accounts.</p>"
         }
       },
       "documentation":"<p>Details about an invitation.</p>"
@@ -2136,7 +3483,7 @@
       "members":{
         "AccountIds":{
           "shape":"AccountIdList",
-          "documentation":"<p>A list of IDs of the AWS accounts that you want to invite to Security Hub as members. </p>"
+          "documentation":"<p>The list of account IDs of the AWS accounts to invite to Security Hub as members. </p>"
         }
       }
     },
@@ -2145,7 +3492,7 @@
       "members":{
         "UnprocessedAccounts":{
           "shape":"ResultList",
-          "documentation":"<p>A list of account ID and email address pairs of the AWS accounts that couldn't be processed. </p>"
+          "documentation":"<p>The list of AWS accounts that could not be processed. For each account, the list includes the account ID and the email address.</p>"
         }
       }
     },
@@ -2192,13 +3539,13 @@
       "members":{
         "NextToken":{
           "shape":"NextToken",
-          "documentation":"<p>Paginates results. On your first call to the <code>ListEnabledProductsForImport</code> operation, set the value of this parameter to <code>NULL</code>. For subsequent calls to the operation, fill <code>nextToken</code> in the request with the value of <code>NextToken</code> from the previous response to continue listing data.</p>",
+          "documentation":"<p>The token that is required for pagination. On your first call to the <code>ListEnabledProductsForImport</code> operation, set the value of this parameter to <code>NULL</code>.</p> <p>For subsequent calls to the operation, to continue listing data, set the value of this parameter to the value returned from the previous response.</p>",
           "location":"querystring",
           "locationName":"NextToken"
         },
         "MaxResults":{
           "shape":"MaxResults",
-          "documentation":"<p>The maximum number of items that you want in the response.</p>",
+          "documentation":"<p>The maximum number of items to return in the response.</p>",
           "location":"querystring",
           "locationName":"MaxResults"
         }
@@ -2209,11 +3556,11 @@
       "members":{
         "ProductSubscriptions":{
           "shape":"ProductSubscriptionArnList",
-          "documentation":"<p>A list of ARNs for the resources that represent your subscriptions to products. </p>"
+          "documentation":"<p>The list of ARNs for the resources that represent your subscriptions to products. </p>"
         },
         "NextToken":{
           "shape":"NextToken",
-          "documentation":"<p>The token that is required for pagination.</p>"
+          "documentation":"<p>The pagination token to use to request the next page of results.</p>"
         }
       }
     },
@@ -2222,13 +3569,13 @@
       "members":{
         "MaxResults":{
           "shape":"MaxResults",
-          "documentation":"<p>The maximum number of items that you want in the response. </p>",
+          "documentation":"<p>The maximum number of items to return in the response. </p>",
           "location":"querystring",
           "locationName":"MaxResults"
         },
         "NextToken":{
           "shape":"NextToken",
-          "documentation":"<p>Paginates results. On your first call to the <code>ListInvitations</code> operation, set the value of this parameter to <code>NULL</code>. For subsequent calls to the operation, fill <code>nextToken</code> in the request with the value of <code>NextToken</code> from the previous response to continue listing data. </p>",
+          "documentation":"<p>The token that is required for pagination. On your first call to the <code>ListInvitations</code> operation, set the value of this parameter to <code>NULL</code>.</p> <p>For subsequent calls to the operation, to continue listing data, set the value of this parameter to the value returned from the previous response.</p>",
           "location":"querystring",
           "locationName":"NextToken"
         }
@@ -2243,7 +3590,7 @@
         },
         "NextToken":{
           "shape":"NonEmptyString",
-          "documentation":"<p>The token that is required for pagination.</p>"
+          "documentation":"<p>The pagination token to use to request the next page of results.</p>"
         }
       }
     },
@@ -2252,19 +3599,19 @@
       "members":{
         "OnlyAssociated":{
           "shape":"Boolean",
-          "documentation":"<p>Specifies which member accounts the response includes based on their relationship status with the master account. The default value is <code>TRUE</code>. If <code>onlyAssociated</code> is set to <code>TRUE</code>, the response includes member accounts whose relationship status with the master is set to <code>ENABLED</code> or <code>DISABLED</code>. If <code>onlyAssociated</code> is set to <code>FALSE</code>, the response includes all existing member accounts. </p>",
+          "documentation":"<p>Specifies which member accounts to include in the response based on their relationship status with the master account. The default value is <code>TRUE</code>.</p> <p>If <code>OnlyAssociated</code> is set to <code>TRUE</code>, the response includes member accounts whose relationship status with the master is set to <code>ENABLED</code> or <code>DISABLED</code>.</p> <p>If <code>OnlyAssociated</code> is set to <code>FALSE</code>, the response includes all existing member accounts. </p>",
           "location":"querystring",
           "locationName":"OnlyAssociated"
         },
         "MaxResults":{
           "shape":"MaxResults",
-          "documentation":"<p>The maximum number of items that you want in the response. </p>",
+          "documentation":"<p>The maximum number of items to return in the response. </p>",
           "location":"querystring",
           "locationName":"MaxResults"
         },
         "NextToken":{
           "shape":"NextToken",
-          "documentation":"<p>Paginates results. Set the value of this parameter to <code>NULL</code> on your first call to the <code>ListMembers</code> operation. For subsequent calls to the operation, fill <code>nextToken</code> in the request with the value of <code>nextToken</code> from the previous response to continue listing data. </p>",
+          "documentation":"<p>The token that is required for pagination. On your first call to the <code>ListMembers</code> operation, set the value of this parameter to <code>NULL</code>.</p> <p>For subsequent calls to the operation, to continue listing data, set the value of this parameter to the value returned from the previous response.</p>",
           "location":"querystring",
           "locationName":"NextToken"
         }
@@ -2279,7 +3626,7 @@
         },
         "NextToken":{
           "shape":"NonEmptyString",
-          "documentation":"<p>The token that is required for pagination.</p>"
+          "documentation":"<p>The pagination token to use to request the next page of results.</p>"
         }
       }
     },
@@ -2304,6 +3651,20 @@
         }
       }
     },
+    "LoadBalancerState":{
+      "type":"structure",
+      "members":{
+        "Code":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The state code. The initial state of the load balancer is provisioning.</p> <p>After the load balancer is fully set up and ready to route traffic, its state is active.</p> <p>If the load balancer could not be set up, its state is failed. </p>"
+        },
+        "Reason":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>A description of the state.</p>"
+        }
+      },
+      "documentation":"<p>Information about the state of the load balancer.</p>"
+    },
     "Malware":{
       "type":"structure",
       "required":["Name"],
@@ -2486,6 +3847,10 @@
       "type":"string",
       "pattern":".*\\S.*"
     },
+    "NonEmptyStringList":{
+      "type":"list",
+      "member":{"shape":"NonEmptyString"}
+    },
     "Note":{
       "type":"structure",
       "required":[
@@ -2611,6 +3976,10 @@
           "shape":"CategoryList",
           "documentation":"<p>The categories assigned to the product.</p>"
         },
+        "IntegrationTypes":{
+          "shape":"IntegrationTypeList",
+          "documentation":"<p>The types of integration that the product supports. Available values are the following.</p> <ul> <li> <p> <code>SEND_FINDINGS_TO_SECURITY_HUB</code> - Indicates that the integration sends findings to Security Hub.</p> </li> <li> <p> <code>RECEIVE_FINDINGS_FROM_SECURITY_HUB</code> - Indicates that the integration receives findings from Security Hub.</p> </li> </ul>"
+        },
         "MarketplaceUrl":{
           "shape":"NonEmptyString",
           "documentation":"<p>The URL for the page that contains more information about the product.</p>"
@@ -2677,6 +4046,10 @@
       "type":"list",
       "member":{"shape":"RelatedFinding"}
     },
+    "RelatedRequirementsList":{
+      "type":"list",
+      "member":{"shape":"NonEmptyString"}
+    },
     "Remediation":{
       "type":"structure",
       "members":{
@@ -2696,7 +4069,7 @@
       "members":{
         "Type":{
           "shape":"NonEmptyString",
-          "documentation":"<p>The type of the resource that details are provided for.</p>"
+          "documentation":"<p>The type of the resource that details are provided for. If possible, set <code>Type</code> to one of the supported resource types. For example, if the resource is an EC2 instance, then set <code>Type</code> to <code>AwsEc2Instance</code>.</p> <p>If the resource does not match any of the provided types, then set <code>Type</code> to <code>Other</code>. </p>"
         },
         "Id":{
           "shape":"NonEmptyString",
@@ -2738,28 +4111,88 @@
     "ResourceDetails":{
       "type":"structure",
       "members":{
+        "AwsCodeBuildProject":{
+          "shape":"AwsCodeBuildProjectDetails",
+          "documentation":"<p>Details for an AWS CodeBuild project.</p>"
+        },
+        "AwsCloudFrontDistribution":{
+          "shape":"AwsCloudFrontDistributionDetails",
+          "documentation":"<p>Details about a CloudFront distribution.</p>"
+        },
         "AwsEc2Instance":{
           "shape":"AwsEc2InstanceDetails",
           "documentation":"<p>Details about an Amazon EC2 instance related to a finding.</p>"
         },
+        "AwsEc2NetworkInterface":{
+          "shape":"AwsEc2NetworkInterfaceDetails",
+          "documentation":"<p>Details for an AWS EC2 network interface.</p>"
+        },
+        "AwsEc2SecurityGroup":{
+          "shape":"AwsEc2SecurityGroupDetails",
+          "documentation":"<p>Details for an EC2 security group.</p>"
+        },
+        "AwsElbv2LoadBalancer":{
+          "shape":"AwsElbv2LoadBalancerDetails",
+          "documentation":"<p>Details about a load balancer.</p>"
+        },
+        "AwsElasticsearchDomain":{
+          "shape":"AwsElasticsearchDomainDetails",
+          "documentation":"<p>Details for an Elasticsearch domain.</p>"
+        },
         "AwsS3Bucket":{
           "shape":"AwsS3BucketDetails",
           "documentation":"<p>Details about an Amazon S3 Bucket related to a finding.</p>"
         },
+        "AwsS3Object":{
+          "shape":"AwsS3ObjectDetails",
+          "documentation":"<p>Details about an Amazon S3 object related to a finding.</p>"
+        },
         "AwsIamAccessKey":{
           "shape":"AwsIamAccessKeyDetails",
           "documentation":"<p>Details about an IAM access key related to a finding.</p>"
         },
+        "AwsIamRole":{
+          "shape":"AwsIamRoleDetails",
+          "documentation":"<p>Details about an IAM role.</p>"
+        },
+        "AwsKmsKey":{
+          "shape":"AwsKmsKeyDetails",
+          "documentation":"<p>Details about a KMS key.</p>"
+        },
+        "AwsLambdaFunction":{
+          "shape":"AwsLambdaFunctionDetails",
+          "documentation":"<p>Details about a Lambda function.</p>"
+        },
+        "AwsLambdaLayerVersion":{
+          "shape":"AwsLambdaLayerVersionDetails",
+          "documentation":"<p>Details for a Lambda layer version.</p>"
+        },
+        "AwsRdsDbInstance":{
+          "shape":"AwsRdsDbInstanceDetails",
+          "documentation":"<p>Details for an RDS database instance.</p>"
+        },
+        "AwsSnsTopic":{
+          "shape":"AwsSnsTopicDetails",
+          "documentation":"<p>Details about an SNS topic.</p>"
+        },
+        "AwsSqsQueue":{
+          "shape":"AwsSqsQueueDetails",
+          "documentation":"<p>Details about an SQS queue.</p>"
+        },
+        "AwsWafWebAcl":{
+          "shape":"AwsWafWebAclDetails",
+          "documentation":"<p>Details for a WAF WebACL.</p>"
+        },
         "Container":{
           "shape":"ContainerDetails",
           "documentation":"<p>Details about a container resource related to a finding.</p>"
         },
         "Other":{
           "shape":"FieldMap",
-          "documentation":"<p>Details about a resource that doesn't have a specific type defined.</p>"
+          "documentation":"<p>Details about a resource that are not available in a type-specific details object. Use the <code>Other</code> object in the following cases.</p> <ul> <li> <p>The type-specific object does not contain all of the fields that you want to populate. In this case, first use the type-specific object to populate those fields. Use the <code>Other</code> object to populate the fields that are missing from the type-specific object.</p> </li> <li> <p>The resource type does not have a corresponding object. This includes resources for which the type is <code>Other</code>. </p> </li> </ul>"
         }
       },
-      "documentation":"<p>Additional details about a resource related to a finding.</p>"
+      "documentation":"<p>Additional details about a resource related to a finding.</p> <p>To provide the details, use the object that corresponds to the resource type. For example, if the resource type is <code>AwsEc2Instance</code>, then you use the <code>AwsEc2Instance</code> object to provide the details.</p> <p>If the type-specific object does not contain all of the fields you want to populate, then you use the <code>Other</code> object to populate those additional fields.</p> <p>You also use the <code>Other</code> object to populate the details when the selected type does not have a corresponding object.</p>"
     },
     "ResourceList":{
       "type":"list",
@@ -2780,34 +4213,60 @@
       "members":{
         "AccountId":{
           "shape":"AccountId",
-          "documentation":"<p>An AWS account ID of the account that wasn't be processed.</p>"
+          "documentation":"<p>An AWS account ID of the account that was not processed.</p>"
         },
         "ProcessingResult":{
           "shape":"NonEmptyString",
-          "documentation":"<p>The reason that the account wasn't be processed.</p>"
+          "documentation":"<p>The reason that the account was not processed.</p>"
         }
       },
-      "documentation":"<p>Details about the account that wasn't processed.</p>"
+      "documentation":"<p>Details about the account that was not processed.</p>"
     },
     "ResultList":{
       "type":"list",
       "member":{"shape":"Result"}
     },
+    "SecurityGroups":{
+      "type":"list",
+      "member":{"shape":"NonEmptyString"}
+    },
     "Severity":{
       "type":"structure",
-      "required":["Normalized"],
       "members":{
         "Product":{
           "shape":"Double",
           "documentation":"<p>The native severity as defined by the AWS service or integrated partner product that generated the finding.</p>"
         },
+        "Label":{
+          "shape":"SeverityLabel",
+          "documentation":"<p>The severity value of the finding. The allowed values are the following.</p> <ul> <li> <p> <code>INFORMATIONAL</code> - No issue was found.</p> </li> <li> <p> <code>LOW</code> - The issue does not require action on its own.</p> </li> <li> <p> <code>MEDIUM</code> - The issue must be addressed but not urgently.</p> </li> <li> <p> <code>HIGH</code> - The issue must be addressed as a priority.</p> </li> <li> <p> <code>CRITICAL</code> - The issue must be remediated immediately to avoid it escalating.</p> </li> </ul>"
+        },
         "Normalized":{
           "shape":"Integer",
-          "documentation":"<p>The normalized severity of a finding.</p>"
+          "documentation":"<p>Deprecated. This attribute is being deprecated. Instead of providing <code>Normalized</code>, provide <code>Label</code>.</p> <p>If you provide <code>Normalized</code> and do not provide <code>Label</code>, <code>Label</code> is set automatically as follows. </p> <ul> <li> <p>0 - <code>INFORMATIONAL</code> </p> </li> <li> <p>1–39 - <code>LOW</code> </p> </li> <li> <p>40–69 - <code>MEDIUM</code> </p> </li> <li> <p>70–89 - <code>HIGH</code> </p> </li> <li> <p>90–100 - <code>CRITICAL</code> </p> </li> </ul>"
         }
       },
       "documentation":"<p>The severity of the finding.</p>"
     },
+    "SeverityLabel":{
+      "type":"string",
+      "enum":[
+        "INFORMATIONAL",
+        "LOW",
+        "MEDIUM",
+        "HIGH",
+        "CRITICAL"
+      ]
+    },
+    "SeverityRating":{
+      "type":"string",
+      "enum":[
+        "LOW",
+        "MEDIUM",
+        "HIGH",
+        "CRITICAL"
+      ]
+    },
     "SortCriteria":{
       "type":"list",
       "member":{"shape":"SortCriterion"}
@@ -2833,6 +4292,82 @@
         "desc"
       ]
     },
+    "Standard":{
+      "type":"structure",
+      "members":{
+        "StandardsArn":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The ARN of a standard.</p>"
+        },
+        "Name":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The name of the standard.</p>"
+        },
+        "Description":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>A description of the standard.</p>"
+        },
+        "EnabledByDefault":{
+          "shape":"Boolean",
+          "documentation":"<p>Whether the standard is enabled by default. When Security Hub is enabled from the console, if a standard is enabled by default, the check box for that standard is selected by default.</p> <p>When Security Hub is enabled using the <code>EnableSecurityHub</code> API operation, the standard is enabled by default unless <code>EnableDefaultStandards</code> is set to <code>false</code>.</p>"
+        }
+      },
+      "documentation":"<p>Provides information about a specific standard.</p>"
+    },
+    "Standards":{
+      "type":"list",
+      "member":{"shape":"Standard"}
+    },
+    "StandardsControl":{
+      "type":"structure",
+      "members":{
+        "StandardsControlArn":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The ARN of the security standard control.</p>"
+        },
+        "ControlStatus":{
+          "shape":"ControlStatus",
+          "documentation":"<p>The current status of the security standard control. Indicates whether the control is enabled or disabled. Security Hub does not check against disabled controls.</p>"
+        },
+        "DisabledReason":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The reason provided for the most recent change in status for the control.</p>"
+        },
+        "ControlStatusUpdatedAt":{
+          "shape":"Timestamp",
+          "documentation":"<p>The date and time that the status of the security standard control was most recently updated.</p>"
+        },
+        "ControlId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The identifier of the security standard control.</p>"
+        },
+        "Title":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The title of the security standard control.</p>"
+        },
+        "Description":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The longer description of the security standard control. Provides information about what the control is checking for.</p>"
+        },
+        "RemediationUrl":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>A link to remediation information for the control in the Security Hub user documentation.</p>"
+        },
+        "SeverityRating":{
+          "shape":"SeverityRating",
+          "documentation":"<p>The severity of findings generated from this security standard control.</p> <p>The finding severity is based on an assessment of how easy it would be to compromise AWS resources if the issue is detected.</p>"
+        },
+        "RelatedRequirements":{
+          "shape":"RelatedRequirementsList",
+          "documentation":"<p>The list of requirements that are related to this control.</p>"
+        }
+      },
+      "documentation":"<p>Details for an individual security standard control.</p>"
+    },
+    "StandardsControls":{
+      "type":"list",
+      "member":{"shape":"StandardsControl"}
+    },
     "StandardsInputParameterMap":{
       "type":"map",
       "key":{"shape":"NonEmptyString"},
@@ -2863,7 +4398,7 @@
         },
         "StandardsArn":{
           "shape":"NonEmptyString",
-          "documentation":"<p>The ARN of a standard.</p> <p>In this release, Security Hub supports only the CIS AWS Foundations standard, which uses the following ARN: <code>arn:aws:securityhub:::ruleset/cis-aws-foundations-benchmark/v/1.2.0.</code> </p>"
+          "documentation":"<p>The ARN of a standard.</p>"
         },
         "StandardsInput":{
           "shape":"StandardsInputParameterMap",
@@ -2888,7 +4423,7 @@
       "members":{
         "StandardsArn":{
           "shape":"NonEmptyString",
-          "documentation":"<p>The ARN of the standard that you want to enable.</p> <important> <p>In this release, Security Hub only supports the CIS AWS Foundations standard. </p> <p>Its ARN is <code>arn:aws:securityhub:::ruleset/cis-aws-foundations-benchmark/v/1.2.0</code>.</p> </important>"
+          "documentation":"<p>The ARN of the standard that you want to enable. To view the list of available standards and their ARNs, use the <code> <a>DescribeStandards</a> </code> operation.</p>"
         },
         "StandardsInput":{
           "shape":"StandardsInputParameterMap",
@@ -2988,30 +4523,30 @@
       "members":{
         "Type":{
           "shape":"ThreatIntelIndicatorType",
-          "documentation":"<p>The type of a threat intel indicator.</p>"
+          "documentation":"<p>The type of threat intelligence indicator.</p>"
         },
         "Value":{
           "shape":"NonEmptyString",
-          "documentation":"<p>The value of a threat intel indicator.</p>"
+          "documentation":"<p>The value of a threat intelligence indicator.</p>"
         },
         "Category":{
           "shape":"ThreatIntelIndicatorCategory",
-          "documentation":"<p>The category of a threat intel indicator.</p>"
+          "documentation":"<p>The category of a threat intelligence indicator.</p>"
         },
         "LastObservedAt":{
           "shape":"NonEmptyString",
-          "documentation":"<p>The date and time when the most recent instance of a threat intel indicator was observed.</p>"
+          "documentation":"<p>The date and time when the most recent instance of a threat intelligence indicator was observed.</p>"
         },
         "Source":{
           "shape":"NonEmptyString",
-          "documentation":"<p>The source of the threat intel indicator.</p>"
+          "documentation":"<p>The source of the threat intelligence indicator.</p>"
         },
         "SourceUrl":{
           "shape":"NonEmptyString",
-          "documentation":"<p>The URL to the page or site where you can get more information about the threat intel indicator.</p>"
+          "documentation":"<p>The URL to the page or site where you can get more information about the threat intelligence indicator.</p>"
         }
       },
-      "documentation":"<p>Details about the threat intel related to a finding.</p>"
+      "documentation":"<p>Details about the threat intelligence related to a finding.</p>"
     },
     "ThreatIntelIndicatorCategory":{
       "type":"string",
@@ -3155,6 +4690,31 @@
       "members":{
       }
     },
+    "UpdateStandardsControlRequest":{
+      "type":"structure",
+      "required":["StandardsControlArn"],
+      "members":{
+        "StandardsControlArn":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The ARN of the security standard control to enable or disable.</p>",
+          "location":"uri",
+          "locationName":"StandardsControlArn"
+        },
+        "ControlStatus":{
+          "shape":"ControlStatus",
+          "documentation":"<p>The updated status of the security standard control.</p>"
+        },
+        "DisabledReason":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>A description of the reason why you are disabling a security standard control.</p>"
+        }
+      }
+    },
+    "UpdateStandardsControlResponse":{
+      "type":"structure",
+      "members":{
+      }
+    },
     "VerificationState":{
       "type":"string",
       "enum":[
@@ -3164,8 +4724,54 @@
         "BENIGN_POSITIVE"
       ]
     },
+    "WafAction":{
+      "type":"structure",
+      "members":{
+        "Type":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>Specifies how you want AWS WAF to respond to requests that match the settings in a Rule.</p> <p>Valid settings include the following:</p> <ul> <li> <p> <code>ALLOW</code> - AWS WAF allows requests</p> </li> <li> <p> <code>BLOCK</code> - AWS WAF blocks requests</p> </li> <li> <p> <code>COUNT</code> - AWS WAF increments a counter of the requests that match all of the conditions in the rule. AWS WAF then continues to inspect the web request based on the remaining rules in the web ACL. You can't specify <code>COUNT</code> for the default action for a WebACL.</p> </li> </ul>"
+        }
+      },
+      "documentation":"<p>Details about the action that CloudFront or AWS WAF takes when a web request matches the conditions in the Rule. </p>"
+    },
+    "WafExcludedRule":{
+      "type":"structure",
+      "members":{
+        "RuleId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The unique identifier for the rule to exclude from the rule group.</p>"
+        }
+      },
+      "documentation":"<p>Details about a rule to exclude from a rule group.</p>"
+    },
+    "WafExcludedRuleList":{
+      "type":"list",
+      "member":{"shape":"WafExcludedRule"}
+    },
+    "WafOverrideAction":{
+      "type":"structure",
+      "members":{
+        "Type":{
+          "shape":"NonEmptyString",
+          "documentation":"<p> <code>COUNT</code> overrides the action specified by the individual rule within a RuleGroup .</p> <p>If set to <code>NONE</code>, the rule's action takes place.</p>"
+        }
+      },
+      "documentation":"<p>Details about an override action for a rule.</p>"
+    },
+    "Workflow":{
+      "type":"structure",
+      "members":{
+        "Status":{
+          "shape":"WorkflowStatus",
+          "documentation":"<p>The status of the investigation into the finding. The allowed values are the following.</p> <ul> <li> <p> <code>NEW</code> - The initial state of a finding, before it is reviewed.</p> </li> <li> <p> <code>NOTIFIED</code> - Indicates that you notified the resource owner about the security issue. Used when the initial reviewer is not the resource owner, and needs intervention from the resource owner.</p> </li> <li> <p> <code>SUPPRESSED</code> - The finding will not be reviewed again and will not be acted upon.</p> </li> <li> <p> <code>RESOLVED</code> - The finding was reviewed and remediated and is now considered resolved. </p> </li> </ul>"
+        }
+      },
+      "documentation":"<p>Provides information about the status of the investigation into a finding.</p>"
+    },
     "WorkflowState":{
       "type":"string",
+      "deprecated":true,
+      "deprecatedMessage":"This field is deprecated, use Workflow.Status instead.",
       "enum":[
         "NEW",
         "ASSIGNED",
@@ -3173,7 +4779,16 @@
         "DEFERRED",
         "RESOLVED"
       ]
+    },
+    "WorkflowStatus":{
+      "type":"string",
+      "enum":[
+        "NEW",
+        "NOTIFIED",
+        "RESOLVED",
+        "SUPPRESSED"
+      ]
     }
   },
-  "documentation":"<p>Security Hub provides you with a comprehensive view of the security state of your AWS environment and resources. It also provides you with the compliance status of your environment based on CIS AWS Foundations compliance checks. Security Hub collects security data from AWS accounts, services, and integrated third-party products and helps you analyze security trends in your environment to identify the highest priority security issues. For more information about Security Hub, see the <i> <a href=\"https://docs.aws.amazon.com/securityhub/latest/userguide/what-is-securityhub.html\">AWS Security Hub User Guide</a> </i>.</p> <p>When you use operations in the Security Hub API, the requests are executed only in the AWS Region that is currently active or in the specific AWS Region that you specify in your request. Any configuration or settings change that results from the operation is applied only to that Region. To make the same change in other Regions, execute the same command for each Region to apply the change to. For example, if your Region is set to <code>us-west-2</code>, when you use <code>CreateMembers</code> to add a member account to Security Hub, the association of the member account with the master account is created only in the us-west-2 Region. Security Hub must be enabled for the member account in the same Region that the invite was sent from.</p>"
+  "documentation":"<p>Security Hub provides you with a comprehensive view of the security state of your AWS environment and resources. It also provides you with the readiness status of your environment based on controls from supported security standards. Security Hub collects security data from AWS accounts, services, and integrated third-party products and helps you analyze security trends in your environment to identify the highest priority security issues. For more information about Security Hub, see the <i> <a href=\"https://docs.aws.amazon.com/securityhub/latest/userguide/what-is-securityhub.html\">AWS Security Hub User Guide</a> </i>.</p> <p>When you use operations in the Security Hub API, the requests are executed only in the AWS Region that is currently active or in the specific AWS Region that you specify in your request. Any configuration or settings change that results from the operation is applied only to that Region. To make the same change in other Regions, execute the same command for each Region to apply the change to.</p> <p>For example, if your Region is set to <code>us-west-2</code>, when you use <code> <a>CreateMembers</a> </code> to add a member account to Security Hub, the association of the member account with the master account is created only in the <code>us-west-2</code> Region. Security Hub must be enabled for the member account in the same Region that the invitation was sent from.</p> <p>The following throttling limits apply to using Security Hub API operations.</p> <ul> <li> <p> <code> <a>GetFindings</a> </code> - <code>RateLimit</code> of 3 requests per second. <code>BurstLimit</code> of 6 requests per second.</p> </li> <li> <p> <code> <a>UpdateFindings</a> </code> - <code>RateLimit</code> of 1 request per second. <code>BurstLimit</code> of 5 requests per second.</p> </li> <li> <p>All other operations - <code>RateLimit</code> of 10 requests per second. <code>BurstLimit</code> of 30 requests per second.</p> </li> </ul>"
 }
diff --git a/services/serverlessapplicationrepository/pom.xml b/services/serverlessapplicationrepository/pom.xml
index b34665deab2e..bdd25cbad1bf 100644
--- a/services/serverlessapplicationrepository/pom.xml
+++ b/services/serverlessapplicationrepository/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>services</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>serverlessapplicationrepository</artifactId>
diff --git a/services/serverlessapplicationrepository/src/main/resources/codegen-resources/service-2.json b/services/serverlessapplicationrepository/src/main/resources/codegen-resources/service-2.json
index 6158adc7635d..0cbcbfb55247 100644
--- a/services/serverlessapplicationrepository/src/main/resources/codegen-resources/service-2.json
+++ b/services/serverlessapplicationrepository/src/main/resources/codegen-resources/service-2.json
@@ -388,6 +388,34 @@
       } ],
       "documentation" : "<p>Sets the permission policy for an application. For the list of actions supported for this operation, see\n <a href=\"https://docs.aws.amazon.com/serverlessrepo/latest/devguide/access-control-resource-based.html#application-permissions\">Application \n Permissions</a>\n .</p>"
     },
+    "UnshareApplication" : {
+      "name" : "UnshareApplication",
+      "http" : {
+        "method" : "POST",
+        "requestUri" : "/applications/{applicationId}/unshare",
+        "responseCode" : 204
+      },
+      "input" : {
+        "shape" : "UnshareApplicationRequest"
+      },
+      "errors" : [ {
+        "shape" : "NotFoundException",
+        "documentation" : "<p>The resource (for example, an access policy statement) specified in the request doesn't exist.</p>"
+      }, {
+        "shape" : "TooManyRequestsException",
+        "documentation" : "<p>The client is sending more than the allowed number of requests per unit of time.</p>"
+      }, {
+        "shape" : "BadRequestException",
+        "documentation" : "<p>One of the parameters in the request is invalid.</p>"
+      }, {
+        "shape" : "InternalServerErrorException",
+        "documentation" : "<p>The AWS Serverless Application Repository service encountered an internal error.</p>"
+      }, {
+        "shape" : "ForbiddenException",
+        "documentation" : "<p>The client is not authenticated.</p>"
+      } ],
+      "documentation" : "<p>Unshares an application from an AWS Organization.</p><p>This operation can be called only from the organization's master account.</p>"
+    },
     "UpdateApplication" : {
       "name" : "UpdateApplication",
       "http" : {
@@ -453,6 +481,11 @@
           "locationName" : "homePageUrl",
           "documentation" : "<p>A URL with more information about the application, for example the location of your GitHub repository for the application.</p>"
         },
+        "IsVerifiedAuthor" : {
+          "shape" : "__boolean",
+          "locationName" : "isVerifiedAuthor",
+          "documentation" : "<p>Whether the author of this application has been verified. This means means that AWS has made a good faith review, as a reasonable and prudent service provider, of the information provided by the requester and has confirmed that the requester's identity is as claimed.</p>"
+        },
         "Labels" : {
           "shape" : "__listOf__string",
           "locationName" : "labels",
@@ -478,6 +511,11 @@
           "locationName" : "spdxLicenseId",
           "documentation" : "<p>A valid identifier from https://spdx.org/licenses/.</p>"
         },
+        "VerifiedAuthorUrl" : {
+          "shape" : "__string",
+          "locationName" : "verifiedAuthorUrl",
+          "documentation" : "<p>The URL to the public profile of a verified author. This URL is submitted by the author.</p>"
+        },
         "Version" : {
           "shape" : "Version",
           "locationName" : "version",
@@ -558,6 +596,11 @@
           "locationName" : "actions",
           "documentation" : "<p>For the list of actions supported for this operation, see <a href=\"https://docs.aws.amazon.com/serverlessrepo/latest/devguide/access-control-resource-based.html#application-permissions\">Application \n Permissions</a>.</p>"
         },
+        "PrincipalOrgIDs" : {
+          "shape" : "__listOf__string",
+          "locationName" : "principalOrgIDs",
+          "documentation" : "<p>An array of PrinciplalOrgIDs, which corresponds to AWS IAM <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/reference_policies_condition-keys.html#principal-org-id\">aws:PrincipalOrgID</a> global condition key.</p>"
+        },
         "Principals" : {
           "shape" : "__listOf__string",
           "locationName" : "principals",
@@ -899,6 +942,11 @@
           "locationName" : "homePageUrl",
           "documentation" : "<p>A URL with more information about the application, for example the location of your GitHub repository for the application.</p>"
         },
+        "IsVerifiedAuthor" : {
+          "shape" : "__boolean",
+          "locationName" : "isVerifiedAuthor",
+          "documentation" : "<p>Whether the author of this application has been verified. This means means that AWS has made a good faith review, as a reasonable and prudent service provider, of the information provided by the requester and has confirmed that the requester's identity is as claimed.</p>"
+        },
         "Labels" : {
           "shape" : "__listOf__string",
           "locationName" : "labels",
@@ -924,6 +972,11 @@
           "locationName" : "spdxLicenseId",
           "documentation" : "<p>A valid identifier from https://spdx.org/licenses/.</p>"
         },
+        "VerifiedAuthorUrl" : {
+          "shape" : "__string",
+          "locationName" : "verifiedAuthorUrl",
+          "documentation" : "<p>The URL to the public profile of a verified author. This URL is submitted by the author.</p>"
+        },
         "Version" : {
           "shape" : "Version",
           "locationName" : "version",
@@ -1366,6 +1419,11 @@
           "locationName" : "homePageUrl",
           "documentation" : "<p>A URL with more information about the application, for example the location of your GitHub repository for the application.</p>"
         },
+        "IsVerifiedAuthor" : {
+          "shape" : "__boolean",
+          "locationName" : "isVerifiedAuthor",
+          "documentation" : "<p>Whether the author of this application has been verified. This means means that AWS has made a good faith review, as a reasonable and prudent service provider, of the information provided by the requester and has confirmed that the requester's identity is as claimed.</p>"
+        },
         "Labels" : {
           "shape" : "__listOf__string",
           "locationName" : "labels",
@@ -1391,6 +1449,11 @@
           "locationName" : "spdxLicenseId",
           "documentation" : "<p>A valid identifier from https://spdx.org/licenses/.</p>"
         },
+        "VerifiedAuthorUrl" : {
+          "shape" : "__string",
+          "locationName" : "verifiedAuthorUrl",
+          "documentation" : "<p>The URL to the public profile of a verified author. This URL is submitted by the author.</p>"
+        },
         "Version" : {
           "shape" : "Version",
           "locationName" : "version",
@@ -1849,6 +1912,35 @@
         "httpStatusCode" : 429
       }
     },
+    "UnshareApplicationInput" : {
+      "type" : "structure",
+      "members" : {
+        "OrganizationId" : {
+          "shape" : "__string",
+          "locationName" : "organizationId",
+          "documentation" : "<p>The AWS Organization ID to unshare the application from.</p>"
+        }
+      },
+      "required" : [ "OrganizationId" ],
+      "documentation":"<p>Unshare application request.</p>"
+    },
+    "UnshareApplicationRequest" : {
+      "type" : "structure",
+      "members" : {
+        "ApplicationId" : {
+          "shape" : "__string",
+          "location" : "uri",
+          "locationName" : "applicationId",
+          "documentation" : "<p>The Amazon Resource Name (ARN) of the application.</p>"
+        },
+        "OrganizationId" : {
+          "shape" : "__string",
+          "locationName" : "organizationId",
+          "documentation" : "<p>The AWS Organization ID to unshare the application from.</p>"
+        }
+      },
+      "required" : [ "ApplicationId", "OrganizationId" ]
+    },
     "UpdateApplicationInput" : {
       "type" : "structure",
       "members" : {
@@ -1955,6 +2047,11 @@
           "locationName" : "homePageUrl",
           "documentation" : "<p>A URL with more information about the application, for example the location of your GitHub repository for the application.</p>"
         },
+        "IsVerifiedAuthor" : {
+          "shape" : "__boolean",
+          "locationName" : "isVerifiedAuthor",
+          "documentation" : "<p>Whether the author of this application has been verified. This means means that AWS has made a good faith review, as a reasonable and prudent service provider, of the information provided by the requester and has confirmed that the requester's identity is as claimed.</p>"
+        },
         "Labels" : {
           "shape" : "__listOf__string",
           "locationName" : "labels",
@@ -1980,6 +2077,11 @@
           "locationName" : "spdxLicenseId",
           "documentation" : "<p>A valid identifier from https://spdx.org/licenses/.</p>"
         },
+        "VerifiedAuthorUrl" : {
+          "shape" : "__string",
+          "locationName" : "verifiedAuthorUrl",
+          "documentation" : "<p>The URL to the public profile of a verified author. This URL is submitted by the author.</p>"
+        },
         "Version" : {
           "shape" : "Version",
           "locationName" : "version",
diff --git a/services/servicecatalog/build.properties b/services/servicecatalog/build.properties
index ecf2dae6fcb1..15ec2da1fc71 100644
--- a/services/servicecatalog/build.properties
+++ b/services/servicecatalog/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/servicecatalog/pom.xml b/services/servicecatalog/pom.xml
index 7d5c07b65c8d..0403062d8559 100644
--- a/services/servicecatalog/pom.xml
+++ b/services/servicecatalog/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>servicecatalog</artifactId>
     <name>AWS Java SDK :: Services :: AWS Service Catalog</name>
diff --git a/services/servicecatalog/src/it/java/software/amazon/awssdk/services/servicecatalog/ServiceCatalogIntegrationTest.java b/services/servicecatalog/src/it/java/software/amazon/awssdk/services/servicecatalog/ServiceCatalogIntegrationTest.java
index dbffe0bf93b5..701f0e4e0ebb 100644
--- a/services/servicecatalog/src/it/java/software/amazon/awssdk/services/servicecatalog/ServiceCatalogIntegrationTest.java
+++ b/services/servicecatalog/src/it/java/software/amazon/awssdk/services/servicecatalog/ServiceCatalogIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/servicecatalog/src/main/resources/codegen-resources/paginators-1.json b/services/servicecatalog/src/main/resources/codegen-resources/paginators-1.json
index fc6c7ba55404..0476c1e94632 100644
--- a/services/servicecatalog/src/main/resources/codegen-resources/paginators-1.json
+++ b/services/servicecatalog/src/main/resources/codegen-resources/paginators-1.json
@@ -25,6 +25,11 @@
       "output_token": "NextPageToken",
       "limit_key": "PageSize"
     },
+    "ListPortfolioAccess": {
+      "input_token": "PageToken",
+      "output_token": "NextPageToken",
+      "limit_key": "PageSize"
+    },
     "ListPortfolios": {
       "input_token": "PageToken",
       "output_token": "NextPageToken",
diff --git a/services/servicecatalog/src/main/resources/codegen-resources/service-2.json b/services/servicecatalog/src/main/resources/codegen-resources/service-2.json
index b8fb691f00ac..47c01ef045d3 100644
--- a/services/servicecatalog/src/main/resources/codegen-resources/service-2.json
+++ b/services/servicecatalog/src/main/resources/codegen-resources/service-2.json
@@ -574,7 +574,8 @@
       "errors":[
         {"shape":"InvalidParametersException"},
         {"shape":"ResourceNotFoundException"}
-      ]
+      ],
+      "documentation":"<p>Finds the default parameters for a specific self-service action on a specific provisioned product and returns a map of the results to the user.</p>"
     },
     "DescribeTagOption":{
       "name":"DescribeTagOption",
@@ -813,7 +814,8 @@
       "input":{"shape":"ListPortfolioAccessInput"},
       "output":{"shape":"ListPortfolioAccessOutput"},
       "errors":[
-        {"shape":"ResourceNotFoundException"}
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InvalidParametersException"}
       ],
       "documentation":"<p>Lists the account IDs that have access to the specified portfolio.</p>"
     },
@@ -1522,6 +1524,14 @@
         "Owner":{
           "shape":"AccountId",
           "documentation":"<p>The owner of the constraint.</p>"
+        },
+        "ProductId":{
+          "shape":"Id",
+          "documentation":"<p>The identifier of the product the constraint applies to. Note that a constraint applies to a specific instance of a product within a certain portfolio.</p>"
+        },
+        "PortfolioId":{
+          "shape":"Id",
+          "documentation":"<p>The identifier of the portfolio the product resides in. The constraint applies only to the instance of the product that lives within this portfolio.</p>"
         }
       },
       "documentation":"<p>Information about a constraint.</p>"
@@ -1641,7 +1651,7 @@
         },
         "Parameters":{
           "shape":"ConstraintParameters",
-          "documentation":"<p>The constraint parameters, in JSON format. The syntax depends on the constraint type as follows:</p> <dl> <dt>LAUNCH</dt> <dd> <p>Specify the <code>RoleArn</code> property as follows:</p> <p> <code>{\"RoleArn\" : \"arn:aws:iam::123456789012:role/LaunchRole\"}</code> </p> <p>You cannot have both a <code>LAUNCH</code> and a <code>STACKSET</code> constraint.</p> <p>You also cannot have more than one <code>LAUNCH</code> constraint on a product and portfolio.</p> </dd> <dt>NOTIFICATION</dt> <dd> <p>Specify the <code>NotificationArns</code> property as follows:</p> <p> <code>{\"NotificationArns\" : [\"arn:aws:sns:us-east-1:123456789012:Topic\"]}</code> </p> </dd> <dt>RESOURCE_UPDATE</dt> <dd> <p>Specify the <code>TagUpdatesOnProvisionedProduct</code> property as follows:</p> <p> <code>{\"Version\":\"2.0\",\"Properties\":{\"TagUpdateOnProvisionedProduct\":\"String\"}}</code> </p> <p>The <code>TagUpdatesOnProvisionedProduct</code> property accepts a string value of <code>ALLOWED</code> or <code>NOT_ALLOWED</code>.</p> </dd> <dt>STACKSET</dt> <dd> <p>Specify the <code>Parameters</code> property as follows:</p> <p> <code>{\"Version\": \"String\", \"Properties\": {\"AccountList\": [ \"String\" ], \"RegionList\": [ \"String\" ], \"AdminRole\": \"String\", \"ExecutionRole\": \"String\"}}</code> </p> <p>You cannot have both a <code>LAUNCH</code> and a <code>STACKSET</code> constraint.</p> <p>You also cannot have more than one <code>STACKSET</code> constraint on a product and portfolio.</p> <p>Products with a <code>STACKSET</code> constraint will launch an AWS CloudFormation stack set.</p> </dd> <dt>TEMPLATE</dt> <dd> <p>Specify the <code>Rules</code> property. For more information, see <a href=\"http://docs.aws.amazon.com/servicecatalog/latest/adminguide/reference-template_constraint_rules.html\">Template Constraint Rules</a>.</p> </dd> </dl>"
+          "documentation":"<p>The constraint parameters, in JSON format. The syntax depends on the constraint type as follows:</p> <dl> <dt>LAUNCH</dt> <dd> <p>You are required to specify either the <code>RoleArn</code> or the <code>LocalRoleName</code> but can't use both.</p> <p>Specify the <code>RoleArn</code> property as follows:</p> <p> <code>{\"RoleArn\" : \"arn:aws:iam::123456789012:role/LaunchRole\"}</code> </p> <p>Specify the <code>LocalRoleName</code> property as follows:</p> <p> <code>{\"LocalRoleName\": \"SCBasicLaunchRole\"}</code> </p> <p>If you specify the <code>LocalRoleName</code> property, when an account uses the launch constraint, the IAM role with that name in the account will be used. This allows launch-role constraints to be account-agnostic so the administrator can create fewer resources per shared account.</p> <note> <p>The given role name must exist in the account used to create the launch constraint and the account of the user who launches a product with this launch constraint.</p> </note> <p>You cannot have both a <code>LAUNCH</code> and a <code>STACKSET</code> constraint.</p> <p>You also cannot have more than one <code>LAUNCH</code> constraint on a product and portfolio.</p> </dd> <dt>NOTIFICATION</dt> <dd> <p>Specify the <code>NotificationArns</code> property as follows:</p> <p> <code>{\"NotificationArns\" : [\"arn:aws:sns:us-east-1:123456789012:Topic\"]}</code> </p> </dd> <dt>RESOURCE_UPDATE</dt> <dd> <p>Specify the <code>TagUpdatesOnProvisionedProduct</code> property as follows:</p> <p> <code>{\"Version\":\"2.0\",\"Properties\":{\"TagUpdateOnProvisionedProduct\":\"String\"}}</code> </p> <p>The <code>TagUpdatesOnProvisionedProduct</code> property accepts a string value of <code>ALLOWED</code> or <code>NOT_ALLOWED</code>.</p> </dd> <dt>STACKSET</dt> <dd> <p>Specify the <code>Parameters</code> property as follows:</p> <p> <code>{\"Version\": \"String\", \"Properties\": {\"AccountList\": [ \"String\" ], \"RegionList\": [ \"String\" ], \"AdminRole\": \"String\", \"ExecutionRole\": \"String\"}}</code> </p> <p>You cannot have both a <code>LAUNCH</code> and a <code>STACKSET</code> constraint.</p> <p>You also cannot have more than one <code>STACKSET</code> constraint on a product and portfolio.</p> <p>Products with a <code>STACKSET</code> constraint will launch an AWS CloudFormation stack set.</p> </dd> <dt>TEMPLATE</dt> <dd> <p>Specify the <code>Rules</code> property. For more information, see <a href=\"http://docs.aws.amazon.com/servicecatalog/latest/adminguide/reference-template_constraint_rules.html\">Template Constraint Rules</a>.</p> </dd> </dl>"
         },
         "Type":{
           "shape":"ConstraintType",
@@ -1978,7 +1988,7 @@
         },
         "Definition":{
           "shape":"ServiceActionDefinitionMap",
-          "documentation":"<p>The self-service action definition. Can be one of the following:</p> <dl> <dt>Name</dt> <dd> <p>The name of the AWS Systems Manager Document. For example, <code>AWS-RestartEC2Instance</code>.</p> </dd> <dt>Version</dt> <dd> <p>The AWS Systems Manager automation document version. For example, <code>\"Version\": \"1\"</code> </p> </dd> <dt>AssumeRole</dt> <dd> <p>The Amazon Resource Name (ARN) of the role that performs the self-service actions on your behalf. For example, <code>\"AssumeRole\": \"arn:aws:iam::12345678910:role/ActionRole\"</code>.</p> <p>To reuse the provisioned product launch role, set to <code>\"AssumeRole\": \"LAUNCH_ROLE\"</code>.</p> </dd> <dt>Parameters</dt> <dd> <p>The list of parameters in JSON format.</p> <p>For example: <code>[{\\\"Name\\\":\\\"InstanceId\\\",\\\"Type\\\":\\\"TARGET\\\"}]</code>.</p> </dd> </dl>"
+          "documentation":"<p>The self-service action definition. Can be one of the following:</p> <dl> <dt>Name</dt> <dd> <p>The name of the AWS Systems Manager Document. For example, <code>AWS-RestartEC2Instance</code>.</p> </dd> <dt>Version</dt> <dd> <p>The AWS Systems Manager automation document version. For example, <code>\"Version\": \"1\"</code> </p> </dd> <dt>AssumeRole</dt> <dd> <p>The Amazon Resource Name (ARN) of the role that performs the self-service actions on your behalf. For example, <code>\"AssumeRole\": \"arn:aws:iam::12345678910:role/ActionRole\"</code>.</p> <p>To reuse the provisioned product launch role, set to <code>\"AssumeRole\": \"LAUNCH_ROLE\"</code>.</p> </dd> <dt>Parameters</dt> <dd> <p>The list of parameters in JSON format.</p> <p>For example: <code>[{\\\"Name\\\":\\\"InstanceId\\\",\\\"Type\\\":\\\"TARGET\\\"}]</code> or <code>[{\\\"Name\\\":\\\"InstanceId\\\",\\\"Type\\\":\\\"TEXT_VALUE\\\"}]</code>.</p> </dd> </dl>"
         },
         "Description":{
           "shape":"ServiceActionDescription",
@@ -2637,15 +2647,27 @@
         "ServiceActionId"
       ],
       "members":{
-        "ProvisionedProductId":{"shape":"Id"},
-        "ServiceActionId":{"shape":"Id"},
-        "AcceptLanguage":{"shape":"AcceptLanguage"}
+        "ProvisionedProductId":{
+          "shape":"Id",
+          "documentation":"<p>The identifier of the provisioned product.</p>"
+        },
+        "ServiceActionId":{
+          "shape":"Id",
+          "documentation":"<p>The self-service action identifier.</p>"
+        },
+        "AcceptLanguage":{
+          "shape":"AcceptLanguage",
+          "documentation":"<p>The language code.</p> <ul> <li> <p> <code>en</code> - English (default)</p> </li> <li> <p> <code>jp</code> - Japanese</p> </li> <li> <p> <code>zh</code> - Chinese</p> </li> </ul>"
+        }
       }
     },
     "DescribeServiceActionExecutionParametersOutput":{
       "type":"structure",
       "members":{
-        "ServiceActionParameters":{"shape":"ExecutionParameters"}
+        "ServiceActionParameters":{
+          "shape":"ExecutionParameters",
+          "documentation":"<p>The parameters of the self-service action.</p>"
+        }
       }
     },
     "DescribeServiceActionInput":{
@@ -2912,7 +2934,10 @@
           "shape":"AcceptLanguage",
           "documentation":"<p>The language code.</p> <ul> <li> <p> <code>en</code> - English (default)</p> </li> <li> <p> <code>jp</code> - Japanese</p> </li> <li> <p> <code>zh</code> - Chinese</p> </li> </ul>"
         },
-        "Parameters":{"shape":"ExecutionParameterMap"}
+        "Parameters":{
+          "shape":"ExecutionParameterMap",
+          "documentation":"<p>A map of all self-service action parameters and their values. If a provided parameter is of a special type, such as <code>TARGET</code>, the provided value will override the default value generated by AWS Service Catalog. If the parameters field is not provided, no additional parameters are passed and default values will be used for any special parameters such as <code>TARGET</code>.</p>"
+        }
       }
     },
     "ExecuteProvisionedProductServiceActionOutput":{
@@ -2927,10 +2952,20 @@
     "ExecutionParameter":{
       "type":"structure",
       "members":{
-        "Name":{"shape":"ExecutionParameterKey"},
-        "Type":{"shape":"ExecutionParameterType"},
-        "DefaultValues":{"shape":"ExecutionParameterValueList"}
-      }
+        "Name":{
+          "shape":"ExecutionParameterKey",
+          "documentation":"<p>The name of the execution parameter.</p>"
+        },
+        "Type":{
+          "shape":"ExecutionParameterType",
+          "documentation":"<p>The execution parameter type.</p>"
+        },
+        "DefaultValues":{
+          "shape":"ExecutionParameterValueList",
+          "documentation":"<p>The default values for the execution parameter.</p>"
+        }
+      },
+      "documentation":"<p>Details of an execution parameter value that is passed to a self-service action when executed on a provisioned product.</p>"
     },
     "ExecutionParameterKey":{
       "type":"string",
@@ -3269,6 +3304,18 @@
         "PortfolioId":{
           "shape":"Id",
           "documentation":"<p>The portfolio identifier.</p>"
+        },
+        "OrganizationParentId":{
+          "shape":"Id",
+          "documentation":"<p>The ID of an organization node the portfolio is shared with. All children of this node with an inherited portfolio share will be returned.</p>"
+        },
+        "PageToken":{
+          "shape":"PageToken",
+          "documentation":"<p>The page token for the next set of results. To retrieve the first set of results, use null.</p>"
+        },
+        "PageSize":{
+          "shape":"PageSize",
+          "documentation":"<p>The maximum number of items to return with this call.</p>"
         }
       }
     },
@@ -5660,7 +5707,7 @@
         },
         "Parameters":{
           "shape":"ConstraintParameters",
-          "documentation":"<p>The constraint parameters, in JSON format. The syntax depends on the constraint type as follows:</p> <dl> <dt>LAUNCH</dt> <dd> <p>Specify the <code>RoleArn</code> property as follows:</p> <p> <code>{\"RoleArn\" : \"arn:aws:iam::123456789012:role/LaunchRole\"}</code> </p> <p>You cannot have both a <code>LAUNCH</code> and a <code>STACKSET</code> constraint.</p> <p>You also cannot have more than one <code>LAUNCH</code> constraint on a product and portfolio.</p> </dd> <dt>NOTIFICATION</dt> <dd> <p>Specify the <code>NotificationArns</code> property as follows:</p> <p> <code>{\"NotificationArns\" : [\"arn:aws:sns:us-east-1:123456789012:Topic\"]}</code> </p> </dd> <dt>RESOURCE_UPDATE</dt> <dd> <p>Specify the <code>TagUpdatesOnProvisionedProduct</code> property as follows:</p> <p> <code>{\"Version\":\"2.0\",\"Properties\":{\"TagUpdateOnProvisionedProduct\":\"String\"}}</code> </p> <p>The <code>TagUpdatesOnProvisionedProduct</code> property accepts a string value of <code>ALLOWED</code> or <code>NOT_ALLOWED</code>.</p> </dd> <dt>STACKSET</dt> <dd> <p>Specify the <code>Parameters</code> property as follows:</p> <p> <code>{\"Version\": \"String\", \"Properties\": {\"AccountList\": [ \"String\" ], \"RegionList\": [ \"String\" ], \"AdminRole\": \"String\", \"ExecutionRole\": \"String\"}}</code> </p> <p>You cannot have both a <code>LAUNCH</code> and a <code>STACKSET</code> constraint.</p> <p>You also cannot have more than one <code>STACKSET</code> constraint on a product and portfolio.</p> <p>Products with a <code>STACKSET</code> constraint will launch an AWS CloudFormation stack set.</p> </dd> <dt>TEMPLATE</dt> <dd> <p>Specify the <code>Rules</code> property. For more information, see <a href=\"http://docs.aws.amazon.com/servicecatalog/latest/adminguide/reference-template_constraint_rules.html\">Template Constraint Rules</a>.</p> </dd> </dl>"
+          "documentation":"<p>The constraint parameters, in JSON format. The syntax depends on the constraint type as follows:</p> <dl> <dt>LAUNCH</dt> <dd> <p>You are required to specify either the <code>RoleArn</code> or the <code>LocalRoleName</code> but can't use both.</p> <p>Specify the <code>RoleArn</code> property as follows:</p> <p> <code>{\"RoleArn\" : \"arn:aws:iam::123456789012:role/LaunchRole\"}</code> </p> <p>Specify the <code>LocalRoleName</code> property as follows:</p> <p> <code>{\"LocalRoleName\": \"SCBasicLaunchRole\"}</code> </p> <p>If you specify the <code>LocalRoleName</code> property, when an account uses the launch constraint, the IAM role with that name in the account will be used. This allows launch-role constraints to be account-agnostic so the administrator can create fewer resources per shared account.</p> <note> <p>The given role name must exist in the account used to create the launch constraint and the account of the user who launches a product with this launch constraint.</p> </note> <p>You cannot have both a <code>LAUNCH</code> and a <code>STACKSET</code> constraint.</p> <p>You also cannot have more than one <code>LAUNCH</code> constraint on a product and portfolio.</p> </dd> <dt>NOTIFICATION</dt> <dd> <p>Specify the <code>NotificationArns</code> property as follows:</p> <p> <code>{\"NotificationArns\" : [\"arn:aws:sns:us-east-1:123456789012:Topic\"]}</code> </p> </dd> <dt>RESOURCE_UPDATE</dt> <dd> <p>Specify the <code>TagUpdatesOnProvisionedProduct</code> property as follows:</p> <p> <code>{\"Version\":\"2.0\",\"Properties\":{\"TagUpdateOnProvisionedProduct\":\"String\"}}</code> </p> <p>The <code>TagUpdatesOnProvisionedProduct</code> property accepts a string value of <code>ALLOWED</code> or <code>NOT_ALLOWED</code>.</p> </dd> <dt>STACKSET</dt> <dd> <p>Specify the <code>Parameters</code> property as follows:</p> <p> <code>{\"Version\": \"String\", \"Properties\": {\"AccountList\": [ \"String\" ], \"RegionList\": [ \"String\" ], \"AdminRole\": \"String\", \"ExecutionRole\": \"String\"}}</code> </p> <p>You cannot have both a <code>LAUNCH</code> and a <code>STACKSET</code> constraint.</p> <p>You also cannot have more than one <code>STACKSET</code> constraint on a product and portfolio.</p> <p>Products with a <code>STACKSET</code> constraint will launch an AWS CloudFormation stack set.</p> </dd> <dt>TEMPLATE</dt> <dd> <p>Specify the <code>Rules</code> property. For more information, see <a href=\"http://docs.aws.amazon.com/servicecatalog/latest/adminguide/reference-template_constraint_rules.html\">Template Constraint Rules</a>.</p> </dd> </dl>"
         }
       }
     },
@@ -5924,7 +5971,7 @@
         },
         "Active":{
           "shape":"ProvisioningArtifactActive",
-          "documentation":"<p>Indicates whether the product version is active.</p>"
+          "documentation":"<p>Indicates whether the product version is active.</p> <p>Inactive provisioning artifacts are invisible to end users. End users cannot launch or update a provisioned product from an inactive provisioning artifact.</p>"
         },
         "Guidance":{
           "shape":"ProvisioningArtifactGuidance",
diff --git a/services/servicecatalog/src/test/resources/cucumber.properties b/services/servicecatalog/src/test/resources/cucumber.properties
index 52871907d934..5e5434ee4f25 100644
--- a/services/servicecatalog/src/test/resources/cucumber.properties
+++ b/services/servicecatalog/src/test/resources/cucumber.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/servicediscovery/pom.xml b/services/servicediscovery/pom.xml
index 7e12852e1f5b..90e99f77c45d 100644
--- a/services/servicediscovery/pom.xml
+++ b/services/servicediscovery/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>services</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>servicediscovery</artifactId>
diff --git a/services/servicequotas/pom.xml b/services/servicequotas/pom.xml
index 4efaf3dff19b..441c7beadbe9 100644
--- a/services/servicequotas/pom.xml
+++ b/services/servicequotas/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>servicequotas</artifactId>
     <name>AWS Java SDK :: Services :: Service Quotas</name>
diff --git a/services/ses/build.properties b/services/ses/build.properties
index ecf2dae6fcb1..15ec2da1fc71 100644
--- a/services/ses/build.properties
+++ b/services/ses/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/ses/pom.xml b/services/ses/pom.xml
index fdd3578b798d..3efa87c85801 100644
--- a/services/ses/pom.xml
+++ b/services/ses/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>ses</artifactId>
     <name>AWS Java SDK :: Services :: Amazon SES</name>
diff --git a/services/ses/src/it/java/software/amazon/awssdk/services/ses/EmailIntegrationTest.java b/services/ses/src/it/java/software/amazon/awssdk/services/ses/EmailIntegrationTest.java
index 18058f6e0705..42dea0b108ef 100644
--- a/services/ses/src/it/java/software/amazon/awssdk/services/ses/EmailIntegrationTest.java
+++ b/services/ses/src/it/java/software/amazon/awssdk/services/ses/EmailIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/ses/src/it/java/software/amazon/awssdk/services/ses/IntegrationTestBase.java b/services/ses/src/it/java/software/amazon/awssdk/services/ses/IntegrationTestBase.java
index 2da62558777b..0823dde2c4a7 100644
--- a/services/ses/src/it/java/software/amazon/awssdk/services/ses/IntegrationTestBase.java
+++ b/services/ses/src/it/java/software/amazon/awssdk/services/ses/IntegrationTestBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/ses/src/main/resources/META-INF/javamail.providers b/services/ses/src/main/resources/META-INF/javamail.providers
deleted file mode 100644
index c45392eb38ef..000000000000
--- a/services/ses/src/main/resources/META-INF/javamail.providers
+++ /dev/null
@@ -1,3 +0,0 @@
-# AWS Mail Provider
-protocol=aws; type=transport; class=com.amazonaws.services.simpleemail.AWSJavaMailTransport; vendor=Amazon Web Services LLC;
-
diff --git a/services/ses/src/test/resources/cucumber.properties b/services/ses/src/test/resources/cucumber.properties
index 0931c19257b1..39d7b7154be2 100644
--- a/services/ses/src/test/resources/cucumber.properties
+++ b/services/ses/src/test/resources/cucumber.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/ses/src/test/resources/log4j.properties b/services/ses/src/test/resources/log4j.properties
index 4c6af7e07a34..5e3baf14a4df 100644
--- a/services/ses/src/test/resources/log4j.properties
+++ b/services/ses/src/test/resources/log4j.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/sesv2/pom.xml b/services/sesv2/pom.xml
new file mode 100644
index 000000000000..db977dc5f484
--- /dev/null
+++ b/services/sesv2/pom.xml
@@ -0,0 +1,60 @@
+<?xml version="1.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.
+  -->
+
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>software.amazon.awssdk</groupId>
+        <artifactId>services</artifactId>
+        <version>2.11.8-SNAPSHOT</version>
+    </parent>
+    <artifactId>sesv2</artifactId>
+    <name>AWS Java SDK :: Services :: SESv2</name>
+    <description>The AWS Java SDK for SESv2 module holds the client classes that are used for
+        communicating with SESv2.
+    </description>
+    <url>https://aws.amazon.com/sdkforjava</url>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifestEntries>
+                            <Automatic-Module-Name>software.amazon.awssdk.services.sesv2</Automatic-Module-Name>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>protocol-core</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>aws-json-protocol</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/services/sesv2/src/main/resources/codegen-resources/paginators-1.json b/services/sesv2/src/main/resources/codegen-resources/paginators-1.json
new file mode 100644
index 000000000000..c5e4de2551c2
--- /dev/null
+++ b/services/sesv2/src/main/resources/codegen-resources/paginators-1.json
@@ -0,0 +1,39 @@
+{
+  "pagination": {
+    "GetDedicatedIps": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "PageSize"
+    },
+    "ListConfigurationSets": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "PageSize"
+    },
+    "ListDedicatedIpPools": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "PageSize"
+    },
+    "ListDeliverabilityTestReports": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "PageSize"
+    },
+    "ListDomainDeliverabilityCampaigns": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "PageSize"
+    },
+    "ListEmailIdentities": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "PageSize"
+    },
+    "ListSuppressedDestinations": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "PageSize"
+    }
+  }
+}
diff --git a/services/sesv2/src/main/resources/codegen-resources/service-2.json b/services/sesv2/src/main/resources/codegen-resources/service-2.json
new file mode 100644
index 000000000000..9a5139e977a0
--- /dev/null
+++ b/services/sesv2/src/main/resources/codegen-resources/service-2.json
@@ -0,0 +1,3467 @@
+{
+  "version":"2.0",
+  "metadata":{
+    "apiVersion":"2019-09-27",
+    "endpointPrefix":"email",
+    "jsonVersion":"1.1",
+    "protocol":"rest-json",
+    "serviceAbbreviation":"Amazon SES V2",
+    "serviceFullName":"Amazon Simple Email Service",
+    "serviceId":"SESv2",
+    "signatureVersion":"v4",
+    "signingName":"ses",
+    "uid":"sesv2-2019-09-27"
+  },
+  "operations":{
+    "CreateConfigurationSet":{
+      "name":"CreateConfigurationSet",
+      "http":{
+        "method":"POST",
+        "requestUri":"/v2/email/configuration-sets"
+      },
+      "input":{"shape":"CreateConfigurationSetRequest"},
+      "output":{"shape":"CreateConfigurationSetResponse"},
+      "errors":[
+        {"shape":"AlreadyExistsException"},
+        {"shape":"NotFoundException"},
+        {"shape":"TooManyRequestsException"},
+        {"shape":"LimitExceededException"},
+        {"shape":"BadRequestException"},
+        {"shape":"ConcurrentModificationException"}
+      ],
+      "documentation":"<p>Create a configuration set. <i>Configuration sets</i> are groups of rules that you can apply to the emails that you send. You apply a configuration set to an email by specifying the name of the configuration set when you call the Amazon SES API v2. When you apply a configuration set to an email, all of the rules in that configuration set are applied to the email. </p>"
+    },
+    "CreateConfigurationSetEventDestination":{
+      "name":"CreateConfigurationSetEventDestination",
+      "http":{
+        "method":"POST",
+        "requestUri":"/v2/email/configuration-sets/{ConfigurationSetName}/event-destinations"
+      },
+      "input":{"shape":"CreateConfigurationSetEventDestinationRequest"},
+      "output":{"shape":"CreateConfigurationSetEventDestinationResponse"},
+      "errors":[
+        {"shape":"NotFoundException"},
+        {"shape":"AlreadyExistsException"},
+        {"shape":"LimitExceededException"},
+        {"shape":"TooManyRequestsException"},
+        {"shape":"BadRequestException"}
+      ],
+      "documentation":"<p>Create an event destination. <i>Events</i> include message sends, deliveries, opens, clicks, bounces, and complaints. <i>Event destinations</i> are places that you can send information about these events to. For example, you can send event data to Amazon SNS to receive notifications when you receive bounces or complaints, or you can use Amazon Kinesis Data Firehose to stream data to Amazon S3 for long-term storage.</p> <p>A single configuration set can include more than one event destination.</p>"
+    },
+    "CreateDedicatedIpPool":{
+      "name":"CreateDedicatedIpPool",
+      "http":{
+        "method":"POST",
+        "requestUri":"/v2/email/dedicated-ip-pools"
+      },
+      "input":{"shape":"CreateDedicatedIpPoolRequest"},
+      "output":{"shape":"CreateDedicatedIpPoolResponse"},
+      "errors":[
+        {"shape":"AlreadyExistsException"},
+        {"shape":"LimitExceededException"},
+        {"shape":"TooManyRequestsException"},
+        {"shape":"BadRequestException"},
+        {"shape":"ConcurrentModificationException"}
+      ],
+      "documentation":"<p>Create a new pool of dedicated IP addresses. A pool can include one or more dedicated IP addresses that are associated with your AWS account. You can associate a pool with a configuration set. When you send an email that uses that configuration set, the message is sent from one of the addresses in the associated pool.</p>"
+    },
+    "CreateDeliverabilityTestReport":{
+      "name":"CreateDeliverabilityTestReport",
+      "http":{
+        "method":"POST",
+        "requestUri":"/v2/email/deliverability-dashboard/test"
+      },
+      "input":{"shape":"CreateDeliverabilityTestReportRequest"},
+      "output":{"shape":"CreateDeliverabilityTestReportResponse"},
+      "errors":[
+        {"shape":"AccountSuspendedException"},
+        {"shape":"SendingPausedException"},
+        {"shape":"MessageRejected"},
+        {"shape":"MailFromDomainNotVerifiedException"},
+        {"shape":"NotFoundException"},
+        {"shape":"TooManyRequestsException"},
+        {"shape":"LimitExceededException"},
+        {"shape":"BadRequestException"},
+        {"shape":"ConcurrentModificationException"}
+      ],
+      "documentation":"<p>Create a new predictive inbox placement test. Predictive inbox placement tests can help you predict how your messages will be handled by various email providers around the world. When you perform a predictive inbox placement test, you provide a sample message that contains the content that you plan to send to your customers. Amazon SES then sends that message to special email addresses spread across several major email providers. After about 24 hours, the test is complete, and you can use the <code>GetDeliverabilityTestReport</code> operation to view the results of the test.</p>"
+    },
+    "CreateEmailIdentity":{
+      "name":"CreateEmailIdentity",
+      "http":{
+        "method":"POST",
+        "requestUri":"/v2/email/identities"
+      },
+      "input":{"shape":"CreateEmailIdentityRequest"},
+      "output":{"shape":"CreateEmailIdentityResponse"},
+      "errors":[
+        {"shape":"AlreadyExistsException"},
+        {"shape":"LimitExceededException"},
+        {"shape":"TooManyRequestsException"},
+        {"shape":"BadRequestException"},
+        {"shape":"ConcurrentModificationException"}
+      ],
+      "documentation":"<p>Starts the process of verifying an email identity. An <i>identity</i> is an email address or domain that you use when you send email. Before you can use an identity to send email, you first have to verify it. By verifying an identity, you demonstrate that you're the owner of the identity, and that you've given Amazon SES API v2 permission to send email from the identity.</p> <p>When you verify an email address, Amazon SES sends an email to the address. Your email address is verified as soon as you follow the link in the verification email. </p> <p>When you verify a domain without specifying the <code>DkimSigningAttributes</code> object, this operation provides a set of DKIM tokens. You can convert these tokens into CNAME records, which you then add to the DNS configuration for your domain. Your domain is verified when Amazon SES detects these records in the DNS configuration for your domain. This verification method is known as <a href=\"https://docs.aws.amazon.com/ses/latest/DeveloperGuide/easy-dkim.html\">Easy DKIM</a>.</p> <p>Alternatively, you can perform the verification process by providing your own public-private key pair. This verification method is known as Bring Your Own DKIM (BYODKIM). To use BYODKIM, your call to the <code>CreateEmailIdentity</code> operation has to include the <code>DkimSigningAttributes</code> object. When you specify this object, you provide a selector (a component of the DNS record name that identifies the public key that you want to use for DKIM authentication) and a private key.</p>"
+    },
+    "DeleteConfigurationSet":{
+      "name":"DeleteConfigurationSet",
+      "http":{
+        "method":"DELETE",
+        "requestUri":"/v2/email/configuration-sets/{ConfigurationSetName}"
+      },
+      "input":{"shape":"DeleteConfigurationSetRequest"},
+      "output":{"shape":"DeleteConfigurationSetResponse"},
+      "errors":[
+        {"shape":"NotFoundException"},
+        {"shape":"TooManyRequestsException"},
+        {"shape":"BadRequestException"},
+        {"shape":"ConcurrentModificationException"}
+      ],
+      "documentation":"<p>Delete an existing configuration set.</p> <p> <i>Configuration sets</i> are groups of rules that you can apply to the emails you send. You apply a configuration set to an email by including a reference to the configuration set in the headers of the email. When you apply a configuration set to an email, all of the rules in that configuration set are applied to the email.</p>"
+    },
+    "DeleteConfigurationSetEventDestination":{
+      "name":"DeleteConfigurationSetEventDestination",
+      "http":{
+        "method":"DELETE",
+        "requestUri":"/v2/email/configuration-sets/{ConfigurationSetName}/event-destinations/{EventDestinationName}"
+      },
+      "input":{"shape":"DeleteConfigurationSetEventDestinationRequest"},
+      "output":{"shape":"DeleteConfigurationSetEventDestinationResponse"},
+      "errors":[
+        {"shape":"NotFoundException"},
+        {"shape":"TooManyRequestsException"},
+        {"shape":"BadRequestException"}
+      ],
+      "documentation":"<p>Delete an event destination.</p> <p> <i>Events</i> include message sends, deliveries, opens, clicks, bounces, and complaints. <i>Event destinations</i> are places that you can send information about these events to. For example, you can send event data to Amazon SNS to receive notifications when you receive bounces or complaints, or you can use Amazon Kinesis Data Firehose to stream data to Amazon S3 for long-term storage.</p>"
+    },
+    "DeleteDedicatedIpPool":{
+      "name":"DeleteDedicatedIpPool",
+      "http":{
+        "method":"DELETE",
+        "requestUri":"/v2/email/dedicated-ip-pools/{PoolName}"
+      },
+      "input":{"shape":"DeleteDedicatedIpPoolRequest"},
+      "output":{"shape":"DeleteDedicatedIpPoolResponse"},
+      "errors":[
+        {"shape":"NotFoundException"},
+        {"shape":"TooManyRequestsException"},
+        {"shape":"BadRequestException"},
+        {"shape":"ConcurrentModificationException"}
+      ],
+      "documentation":"<p>Delete a dedicated IP pool.</p>"
+    },
+    "DeleteEmailIdentity":{
+      "name":"DeleteEmailIdentity",
+      "http":{
+        "method":"DELETE",
+        "requestUri":"/v2/email/identities/{EmailIdentity}"
+      },
+      "input":{"shape":"DeleteEmailIdentityRequest"},
+      "output":{"shape":"DeleteEmailIdentityResponse"},
+      "errors":[
+        {"shape":"NotFoundException"},
+        {"shape":"TooManyRequestsException"},
+        {"shape":"BadRequestException"},
+        {"shape":"ConcurrentModificationException"}
+      ],
+      "documentation":"<p>Deletes an email identity. An identity can be either an email address or a domain name.</p>"
+    },
+    "DeleteSuppressedDestination":{
+      "name":"DeleteSuppressedDestination",
+      "http":{
+        "method":"DELETE",
+        "requestUri":"/v2/email/suppression/addresses/{EmailAddress}"
+      },
+      "input":{"shape":"DeleteSuppressedDestinationRequest"},
+      "output":{"shape":"DeleteSuppressedDestinationResponse"},
+      "errors":[
+        {"shape":"NotFoundException"},
+        {"shape":"BadRequestException"},
+        {"shape":"TooManyRequestsException"}
+      ],
+      "documentation":"<p>Removes an email address from the suppression list for your account.</p>"
+    },
+    "GetAccount":{
+      "name":"GetAccount",
+      "http":{
+        "method":"GET",
+        "requestUri":"/v2/email/account"
+      },
+      "input":{"shape":"GetAccountRequest"},
+      "output":{"shape":"GetAccountResponse"},
+      "errors":[
+        {"shape":"TooManyRequestsException"},
+        {"shape":"BadRequestException"}
+      ],
+      "documentation":"<p>Obtain information about the email-sending status and capabilities of your Amazon SES account in the current AWS Region.</p>"
+    },
+    "GetBlacklistReports":{
+      "name":"GetBlacklistReports",
+      "http":{
+        "method":"GET",
+        "requestUri":"/v2/email/deliverability-dashboard/blacklist-report"
+      },
+      "input":{"shape":"GetBlacklistReportsRequest"},
+      "output":{"shape":"GetBlacklistReportsResponse"},
+      "errors":[
+        {"shape":"TooManyRequestsException"},
+        {"shape":"NotFoundException"},
+        {"shape":"BadRequestException"}
+      ],
+      "documentation":"<p>Retrieve a list of the blacklists that your dedicated IP addresses appear on.</p>"
+    },
+    "GetConfigurationSet":{
+      "name":"GetConfigurationSet",
+      "http":{
+        "method":"GET",
+        "requestUri":"/v2/email/configuration-sets/{ConfigurationSetName}"
+      },
+      "input":{"shape":"GetConfigurationSetRequest"},
+      "output":{"shape":"GetConfigurationSetResponse"},
+      "errors":[
+        {"shape":"NotFoundException"},
+        {"shape":"TooManyRequestsException"},
+        {"shape":"BadRequestException"}
+      ],
+      "documentation":"<p>Get information about an existing configuration set, including the dedicated IP pool that it's associated with, whether or not it's enabled for sending email, and more.</p> <p> <i>Configuration sets</i> are groups of rules that you can apply to the emails you send. You apply a configuration set to an email by including a reference to the configuration set in the headers of the email. When you apply a configuration set to an email, all of the rules in that configuration set are applied to the email.</p>"
+    },
+    "GetConfigurationSetEventDestinations":{
+      "name":"GetConfigurationSetEventDestinations",
+      "http":{
+        "method":"GET",
+        "requestUri":"/v2/email/configuration-sets/{ConfigurationSetName}/event-destinations"
+      },
+      "input":{"shape":"GetConfigurationSetEventDestinationsRequest"},
+      "output":{"shape":"GetConfigurationSetEventDestinationsResponse"},
+      "errors":[
+        {"shape":"NotFoundException"},
+        {"shape":"TooManyRequestsException"},
+        {"shape":"BadRequestException"}
+      ],
+      "documentation":"<p>Retrieve a list of event destinations that are associated with a configuration set.</p> <p> <i>Events</i> include message sends, deliveries, opens, clicks, bounces, and complaints. <i>Event destinations</i> are places that you can send information about these events to. For example, you can send event data to Amazon SNS to receive notifications when you receive bounces or complaints, or you can use Amazon Kinesis Data Firehose to stream data to Amazon S3 for long-term storage.</p>"
+    },
+    "GetDedicatedIp":{
+      "name":"GetDedicatedIp",
+      "http":{
+        "method":"GET",
+        "requestUri":"/v2/email/dedicated-ips/{IP}"
+      },
+      "input":{"shape":"GetDedicatedIpRequest"},
+      "output":{"shape":"GetDedicatedIpResponse"},
+      "errors":[
+        {"shape":"TooManyRequestsException"},
+        {"shape":"NotFoundException"},
+        {"shape":"BadRequestException"}
+      ],
+      "documentation":"<p>Get information about a dedicated IP address, including the name of the dedicated IP pool that it's associated with, as well information about the automatic warm-up process for the address.</p>"
+    },
+    "GetDedicatedIps":{
+      "name":"GetDedicatedIps",
+      "http":{
+        "method":"GET",
+        "requestUri":"/v2/email/dedicated-ips"
+      },
+      "input":{"shape":"GetDedicatedIpsRequest"},
+      "output":{"shape":"GetDedicatedIpsResponse"},
+      "errors":[
+        {"shape":"TooManyRequestsException"},
+        {"shape":"NotFoundException"},
+        {"shape":"BadRequestException"}
+      ],
+      "documentation":"<p>List the dedicated IP addresses that are associated with your AWS account.</p>"
+    },
+    "GetDeliverabilityDashboardOptions":{
+      "name":"GetDeliverabilityDashboardOptions",
+      "http":{
+        "method":"GET",
+        "requestUri":"/v2/email/deliverability-dashboard"
+      },
+      "input":{"shape":"GetDeliverabilityDashboardOptionsRequest"},
+      "output":{"shape":"GetDeliverabilityDashboardOptionsResponse"},
+      "errors":[
+        {"shape":"TooManyRequestsException"},
+        {"shape":"LimitExceededException"},
+        {"shape":"BadRequestException"}
+      ],
+      "documentation":"<p>Retrieve information about the status of the Deliverability dashboard for your account. When the Deliverability dashboard is enabled, you gain access to reputation, deliverability, and other metrics for the domains that you use to send email. You also gain the ability to perform predictive inbox placement tests.</p> <p>When you use the Deliverability dashboard, you pay a monthly subscription charge, in addition to any other fees that you accrue by using Amazon SES and other AWS services. For more information about the features and cost of a Deliverability dashboard subscription, see <a href=\"http://aws.amazon.com/ses/pricing/\">Amazon SES Pricing</a>.</p>"
+    },
+    "GetDeliverabilityTestReport":{
+      "name":"GetDeliverabilityTestReport",
+      "http":{
+        "method":"GET",
+        "requestUri":"/v2/email/deliverability-dashboard/test-reports/{ReportId}"
+      },
+      "input":{"shape":"GetDeliverabilityTestReportRequest"},
+      "output":{"shape":"GetDeliverabilityTestReportResponse"},
+      "errors":[
+        {"shape":"TooManyRequestsException"},
+        {"shape":"NotFoundException"},
+        {"shape":"BadRequestException"}
+      ],
+      "documentation":"<p>Retrieve the results of a predictive inbox placement test.</p>"
+    },
+    "GetDomainDeliverabilityCampaign":{
+      "name":"GetDomainDeliverabilityCampaign",
+      "http":{
+        "method":"GET",
+        "requestUri":"/v2/email/deliverability-dashboard/campaigns/{CampaignId}"
+      },
+      "input":{"shape":"GetDomainDeliverabilityCampaignRequest"},
+      "output":{"shape":"GetDomainDeliverabilityCampaignResponse"},
+      "errors":[
+        {"shape":"TooManyRequestsException"},
+        {"shape":"BadRequestException"},
+        {"shape":"NotFoundException"}
+      ],
+      "documentation":"<p>Retrieve all the deliverability data for a specific campaign. This data is available for a campaign only if the campaign sent email by using a domain that the Deliverability dashboard is enabled for.</p>"
+    },
+    "GetDomainStatisticsReport":{
+      "name":"GetDomainStatisticsReport",
+      "http":{
+        "method":"GET",
+        "requestUri":"/v2/email/deliverability-dashboard/statistics-report/{Domain}"
+      },
+      "input":{"shape":"GetDomainStatisticsReportRequest"},
+      "output":{"shape":"GetDomainStatisticsReportResponse"},
+      "errors":[
+        {"shape":"TooManyRequestsException"},
+        {"shape":"NotFoundException"},
+        {"shape":"BadRequestException"}
+      ],
+      "documentation":"<p>Retrieve inbox placement and engagement rates for the domains that you use to send email.</p>"
+    },
+    "GetEmailIdentity":{
+      "name":"GetEmailIdentity",
+      "http":{
+        "method":"GET",
+        "requestUri":"/v2/email/identities/{EmailIdentity}"
+      },
+      "input":{"shape":"GetEmailIdentityRequest"},
+      "output":{"shape":"GetEmailIdentityResponse"},
+      "errors":[
+        {"shape":"NotFoundException"},
+        {"shape":"TooManyRequestsException"},
+        {"shape":"BadRequestException"}
+      ],
+      "documentation":"<p>Provides information about a specific identity, including the identity's verification status, its DKIM authentication status, and its custom Mail-From settings.</p>"
+    },
+    "GetSuppressedDestination":{
+      "name":"GetSuppressedDestination",
+      "http":{
+        "method":"GET",
+        "requestUri":"/v2/email/suppression/addresses/{EmailAddress}"
+      },
+      "input":{"shape":"GetSuppressedDestinationRequest"},
+      "output":{"shape":"GetSuppressedDestinationResponse"},
+      "errors":[
+        {"shape":"BadRequestException"},
+        {"shape":"TooManyRequestsException"},
+        {"shape":"NotFoundException"}
+      ],
+      "documentation":"<p>Retrieves information about a specific email address that's on the suppression list for your account.</p>"
+    },
+    "ListConfigurationSets":{
+      "name":"ListConfigurationSets",
+      "http":{
+        "method":"GET",
+        "requestUri":"/v2/email/configuration-sets"
+      },
+      "input":{"shape":"ListConfigurationSetsRequest"},
+      "output":{"shape":"ListConfigurationSetsResponse"},
+      "errors":[
+        {"shape":"TooManyRequestsException"},
+        {"shape":"BadRequestException"}
+      ],
+      "documentation":"<p>List all of the configuration sets associated with your account in the current region.</p> <p> <i>Configuration sets</i> are groups of rules that you can apply to the emails you send. You apply a configuration set to an email by including a reference to the configuration set in the headers of the email. When you apply a configuration set to an email, all of the rules in that configuration set are applied to the email.</p>"
+    },
+    "ListDedicatedIpPools":{
+      "name":"ListDedicatedIpPools",
+      "http":{
+        "method":"GET",
+        "requestUri":"/v2/email/dedicated-ip-pools"
+      },
+      "input":{"shape":"ListDedicatedIpPoolsRequest"},
+      "output":{"shape":"ListDedicatedIpPoolsResponse"},
+      "errors":[
+        {"shape":"TooManyRequestsException"},
+        {"shape":"BadRequestException"}
+      ],
+      "documentation":"<p>List all of the dedicated IP pools that exist in your AWS account in the current Region.</p>"
+    },
+    "ListDeliverabilityTestReports":{
+      "name":"ListDeliverabilityTestReports",
+      "http":{
+        "method":"GET",
+        "requestUri":"/v2/email/deliverability-dashboard/test-reports"
+      },
+      "input":{"shape":"ListDeliverabilityTestReportsRequest"},
+      "output":{"shape":"ListDeliverabilityTestReportsResponse"},
+      "errors":[
+        {"shape":"TooManyRequestsException"},
+        {"shape":"NotFoundException"},
+        {"shape":"BadRequestException"}
+      ],
+      "documentation":"<p>Show a list of the predictive inbox placement tests that you've performed, regardless of their statuses. For predictive inbox placement tests that are complete, you can use the <code>GetDeliverabilityTestReport</code> operation to view the results.</p>"
+    },
+    "ListDomainDeliverabilityCampaigns":{
+      "name":"ListDomainDeliverabilityCampaigns",
+      "http":{
+        "method":"GET",
+        "requestUri":"/v2/email/deliverability-dashboard/domains/{SubscribedDomain}/campaigns"
+      },
+      "input":{"shape":"ListDomainDeliverabilityCampaignsRequest"},
+      "output":{"shape":"ListDomainDeliverabilityCampaignsResponse"},
+      "errors":[
+        {"shape":"TooManyRequestsException"},
+        {"shape":"BadRequestException"},
+        {"shape":"NotFoundException"}
+      ],
+      "documentation":"<p>Retrieve deliverability data for all the campaigns that used a specific domain to send email during a specified time range. This data is available for a domain only if you enabled the Deliverability dashboard for the domain.</p>"
+    },
+    "ListEmailIdentities":{
+      "name":"ListEmailIdentities",
+      "http":{
+        "method":"GET",
+        "requestUri":"/v2/email/identities"
+      },
+      "input":{"shape":"ListEmailIdentitiesRequest"},
+      "output":{"shape":"ListEmailIdentitiesResponse"},
+      "errors":[
+        {"shape":"TooManyRequestsException"},
+        {"shape":"BadRequestException"}
+      ],
+      "documentation":"<p>Returns a list of all of the email identities that are associated with your AWS account. An identity can be either an email address or a domain. This operation returns identities that are verified as well as those that aren't. This operation returns identities that are associated with Amazon SES and Amazon Pinpoint.</p>"
+    },
+    "ListSuppressedDestinations":{
+      "name":"ListSuppressedDestinations",
+      "http":{
+        "method":"GET",
+        "requestUri":"/v2/email/suppression/addresses"
+      },
+      "input":{"shape":"ListSuppressedDestinationsRequest"},
+      "output":{"shape":"ListSuppressedDestinationsResponse"},
+      "errors":[
+        {"shape":"BadRequestException"},
+        {"shape":"TooManyRequestsException"},
+        {"shape":"InvalidNextTokenException"}
+      ],
+      "documentation":"<p>Retrieves a list of email addresses that are on the suppression list for your account.</p>"
+    },
+    "ListTagsForResource":{
+      "name":"ListTagsForResource",
+      "http":{
+        "method":"GET",
+        "requestUri":"/v2/email/tags"
+      },
+      "input":{"shape":"ListTagsForResourceRequest"},
+      "output":{"shape":"ListTagsForResourceResponse"},
+      "errors":[
+        {"shape":"BadRequestException"},
+        {"shape":"NotFoundException"},
+        {"shape":"TooManyRequestsException"}
+      ],
+      "documentation":"<p>Retrieve a list of the tags (keys and values) that are associated with a specified resource. A <i>tag</i> is a label that you optionally define and associate with a resource. Each tag consists of a required <i>tag key</i> and an optional associated <i>tag value</i>. A tag key is a general label that acts as a category for more specific tag values. A tag value acts as a descriptor within a tag key.</p>"
+    },
+    "PutAccountDedicatedIpWarmupAttributes":{
+      "name":"PutAccountDedicatedIpWarmupAttributes",
+      "http":{
+        "method":"PUT",
+        "requestUri":"/v2/email/account/dedicated-ips/warmup"
+      },
+      "input":{"shape":"PutAccountDedicatedIpWarmupAttributesRequest"},
+      "output":{"shape":"PutAccountDedicatedIpWarmupAttributesResponse"},
+      "errors":[
+        {"shape":"TooManyRequestsException"},
+        {"shape":"BadRequestException"}
+      ],
+      "documentation":"<p>Enable or disable the automatic warm-up feature for dedicated IP addresses.</p>"
+    },
+    "PutAccountSendingAttributes":{
+      "name":"PutAccountSendingAttributes",
+      "http":{
+        "method":"PUT",
+        "requestUri":"/v2/email/account/sending"
+      },
+      "input":{"shape":"PutAccountSendingAttributesRequest"},
+      "output":{"shape":"PutAccountSendingAttributesResponse"},
+      "errors":[
+        {"shape":"TooManyRequestsException"},
+        {"shape":"BadRequestException"}
+      ],
+      "documentation":"<p>Enable or disable the ability of your account to send email.</p>"
+    },
+    "PutAccountSuppressionAttributes":{
+      "name":"PutAccountSuppressionAttributes",
+      "http":{
+        "method":"PUT",
+        "requestUri":"/v2/email/account/suppression"
+      },
+      "input":{"shape":"PutAccountSuppressionAttributesRequest"},
+      "output":{"shape":"PutAccountSuppressionAttributesResponse"},
+      "errors":[
+        {"shape":"TooManyRequestsException"},
+        {"shape":"BadRequestException"}
+      ],
+      "documentation":"<p>Change the settings for the account-level suppression list.</p>"
+    },
+    "PutConfigurationSetDeliveryOptions":{
+      "name":"PutConfigurationSetDeliveryOptions",
+      "http":{
+        "method":"PUT",
+        "requestUri":"/v2/email/configuration-sets/{ConfigurationSetName}/delivery-options"
+      },
+      "input":{"shape":"PutConfigurationSetDeliveryOptionsRequest"},
+      "output":{"shape":"PutConfigurationSetDeliveryOptionsResponse"},
+      "errors":[
+        {"shape":"NotFoundException"},
+        {"shape":"TooManyRequestsException"},
+        {"shape":"BadRequestException"}
+      ],
+      "documentation":"<p>Associate a configuration set with a dedicated IP pool. You can use dedicated IP pools to create groups of dedicated IP addresses for sending specific types of email.</p>"
+    },
+    "PutConfigurationSetReputationOptions":{
+      "name":"PutConfigurationSetReputationOptions",
+      "http":{
+        "method":"PUT",
+        "requestUri":"/v2/email/configuration-sets/{ConfigurationSetName}/reputation-options"
+      },
+      "input":{"shape":"PutConfigurationSetReputationOptionsRequest"},
+      "output":{"shape":"PutConfigurationSetReputationOptionsResponse"},
+      "errors":[
+        {"shape":"NotFoundException"},
+        {"shape":"TooManyRequestsException"},
+        {"shape":"BadRequestException"}
+      ],
+      "documentation":"<p>Enable or disable collection of reputation metrics for emails that you send using a particular configuration set in a specific AWS Region.</p>"
+    },
+    "PutConfigurationSetSendingOptions":{
+      "name":"PutConfigurationSetSendingOptions",
+      "http":{
+        "method":"PUT",
+        "requestUri":"/v2/email/configuration-sets/{ConfigurationSetName}/sending"
+      },
+      "input":{"shape":"PutConfigurationSetSendingOptionsRequest"},
+      "output":{"shape":"PutConfigurationSetSendingOptionsResponse"},
+      "errors":[
+        {"shape":"NotFoundException"},
+        {"shape":"TooManyRequestsException"},
+        {"shape":"BadRequestException"}
+      ],
+      "documentation":"<p>Enable or disable email sending for messages that use a particular configuration set in a specific AWS Region.</p>"
+    },
+    "PutConfigurationSetSuppressionOptions":{
+      "name":"PutConfigurationSetSuppressionOptions",
+      "http":{
+        "method":"PUT",
+        "requestUri":"/v2/email/configuration-sets/{ConfigurationSetName}/suppression-options"
+      },
+      "input":{"shape":"PutConfigurationSetSuppressionOptionsRequest"},
+      "output":{"shape":"PutConfigurationSetSuppressionOptionsResponse"},
+      "errors":[
+        {"shape":"NotFoundException"},
+        {"shape":"TooManyRequestsException"},
+        {"shape":"BadRequestException"}
+      ],
+      "documentation":"<p>Specify the account suppression list preferences for a configuration set.</p>"
+    },
+    "PutConfigurationSetTrackingOptions":{
+      "name":"PutConfigurationSetTrackingOptions",
+      "http":{
+        "method":"PUT",
+        "requestUri":"/v2/email/configuration-sets/{ConfigurationSetName}/tracking-options"
+      },
+      "input":{"shape":"PutConfigurationSetTrackingOptionsRequest"},
+      "output":{"shape":"PutConfigurationSetTrackingOptionsResponse"},
+      "errors":[
+        {"shape":"NotFoundException"},
+        {"shape":"TooManyRequestsException"},
+        {"shape":"BadRequestException"}
+      ],
+      "documentation":"<p>Specify a custom domain to use for open and click tracking elements in email that you send.</p>"
+    },
+    "PutDedicatedIpInPool":{
+      "name":"PutDedicatedIpInPool",
+      "http":{
+        "method":"PUT",
+        "requestUri":"/v2/email/dedicated-ips/{IP}/pool"
+      },
+      "input":{"shape":"PutDedicatedIpInPoolRequest"},
+      "output":{"shape":"PutDedicatedIpInPoolResponse"},
+      "errors":[
+        {"shape":"NotFoundException"},
+        {"shape":"TooManyRequestsException"},
+        {"shape":"BadRequestException"}
+      ],
+      "documentation":"<p>Move a dedicated IP address to an existing dedicated IP pool.</p> <note> <p>The dedicated IP address that you specify must already exist, and must be associated with your AWS account. </p> <p>The dedicated IP pool you specify must already exist. You can create a new pool by using the <code>CreateDedicatedIpPool</code> operation.</p> </note>"
+    },
+    "PutDedicatedIpWarmupAttributes":{
+      "name":"PutDedicatedIpWarmupAttributes",
+      "http":{
+        "method":"PUT",
+        "requestUri":"/v2/email/dedicated-ips/{IP}/warmup"
+      },
+      "input":{"shape":"PutDedicatedIpWarmupAttributesRequest"},
+      "output":{"shape":"PutDedicatedIpWarmupAttributesResponse"},
+      "errors":[
+        {"shape":"NotFoundException"},
+        {"shape":"TooManyRequestsException"},
+        {"shape":"BadRequestException"}
+      ],
+      "documentation":"<p/>"
+    },
+    "PutDeliverabilityDashboardOption":{
+      "name":"PutDeliverabilityDashboardOption",
+      "http":{
+        "method":"PUT",
+        "requestUri":"/v2/email/deliverability-dashboard"
+      },
+      "input":{"shape":"PutDeliverabilityDashboardOptionRequest"},
+      "output":{"shape":"PutDeliverabilityDashboardOptionResponse"},
+      "errors":[
+        {"shape":"AlreadyExistsException"},
+        {"shape":"NotFoundException"},
+        {"shape":"TooManyRequestsException"},
+        {"shape":"LimitExceededException"},
+        {"shape":"BadRequestException"}
+      ],
+      "documentation":"<p>Enable or disable the Deliverability dashboard. When you enable the Deliverability dashboard, you gain access to reputation, deliverability, and other metrics for the domains that you use to send email. You also gain the ability to perform predictive inbox placement tests.</p> <p>When you use the Deliverability dashboard, you pay a monthly subscription charge, in addition to any other fees that you accrue by using Amazon SES and other AWS services. For more information about the features and cost of a Deliverability dashboard subscription, see <a href=\"http://aws.amazon.com/ses/pricing/\">Amazon SES Pricing</a>.</p>"
+    },
+    "PutEmailIdentityDkimAttributes":{
+      "name":"PutEmailIdentityDkimAttributes",
+      "http":{
+        "method":"PUT",
+        "requestUri":"/v2/email/identities/{EmailIdentity}/dkim"
+      },
+      "input":{"shape":"PutEmailIdentityDkimAttributesRequest"},
+      "output":{"shape":"PutEmailIdentityDkimAttributesResponse"},
+      "errors":[
+        {"shape":"NotFoundException"},
+        {"shape":"TooManyRequestsException"},
+        {"shape":"BadRequestException"}
+      ],
+      "documentation":"<p>Used to enable or disable DKIM authentication for an email identity.</p>"
+    },
+    "PutEmailIdentityDkimSigningAttributes":{
+      "name":"PutEmailIdentityDkimSigningAttributes",
+      "http":{
+        "method":"PUT",
+        "requestUri":"/v1/email/identities/{EmailIdentity}/dkim/signing"
+      },
+      "input":{"shape":"PutEmailIdentityDkimSigningAttributesRequest"},
+      "output":{"shape":"PutEmailIdentityDkimSigningAttributesResponse"},
+      "errors":[
+        {"shape":"NotFoundException"},
+        {"shape":"TooManyRequestsException"},
+        {"shape":"BadRequestException"}
+      ],
+      "documentation":"<p>Used to configure or change the DKIM authentication settings for an email domain identity. You can use this operation to do any of the following:</p> <ul> <li> <p>Update the signing attributes for an identity that uses Bring Your Own DKIM (BYODKIM).</p> </li> <li> <p>Change from using no DKIM authentication to using Easy DKIM.</p> </li> <li> <p>Change from using no DKIM authentication to using BYODKIM.</p> </li> <li> <p>Change from using Easy DKIM to using BYODKIM.</p> </li> <li> <p>Change from using BYODKIM to using Easy DKIM.</p> </li> </ul>"
+    },
+    "PutEmailIdentityFeedbackAttributes":{
+      "name":"PutEmailIdentityFeedbackAttributes",
+      "http":{
+        "method":"PUT",
+        "requestUri":"/v2/email/identities/{EmailIdentity}/feedback"
+      },
+      "input":{"shape":"PutEmailIdentityFeedbackAttributesRequest"},
+      "output":{"shape":"PutEmailIdentityFeedbackAttributesResponse"},
+      "errors":[
+        {"shape":"NotFoundException"},
+        {"shape":"TooManyRequestsException"},
+        {"shape":"BadRequestException"}
+      ],
+      "documentation":"<p>Used to enable or disable feedback forwarding for an identity. This setting determines what happens when an identity is used to send an email that results in a bounce or complaint event.</p> <p>If the value is <code>true</code>, you receive email notifications when bounce or complaint events occur. These notifications are sent to the address that you specified in the <code>Return-Path</code> header of the original email.</p> <p>You're required to have a method of tracking bounces and complaints. If you haven't set up another mechanism for receiving bounce or complaint notifications (for example, by setting up an event destination), you receive an email notification when these events occur (even if this setting is disabled).</p>"
+    },
+    "PutEmailIdentityMailFromAttributes":{
+      "name":"PutEmailIdentityMailFromAttributes",
+      "http":{
+        "method":"PUT",
+        "requestUri":"/v2/email/identities/{EmailIdentity}/mail-from"
+      },
+      "input":{"shape":"PutEmailIdentityMailFromAttributesRequest"},
+      "output":{"shape":"PutEmailIdentityMailFromAttributesResponse"},
+      "errors":[
+        {"shape":"NotFoundException"},
+        {"shape":"TooManyRequestsException"},
+        {"shape":"BadRequestException"}
+      ],
+      "documentation":"<p>Used to enable or disable the custom Mail-From domain configuration for an email identity.</p>"
+    },
+    "PutSuppressedDestination":{
+      "name":"PutSuppressedDestination",
+      "http":{
+        "method":"PUT",
+        "requestUri":"/v2/email/suppression/addresses"
+      },
+      "input":{"shape":"PutSuppressedDestinationRequest"},
+      "output":{"shape":"PutSuppressedDestinationResponse"},
+      "errors":[
+        {"shape":"BadRequestException"},
+        {"shape":"TooManyRequestsException"}
+      ],
+      "documentation":"<p>Adds an email address to the suppression list for your account.</p>"
+    },
+    "SendEmail":{
+      "name":"SendEmail",
+      "http":{
+        "method":"POST",
+        "requestUri":"/v2/email/outbound-emails"
+      },
+      "input":{"shape":"SendEmailRequest"},
+      "output":{"shape":"SendEmailResponse"},
+      "errors":[
+        {"shape":"TooManyRequestsException"},
+        {"shape":"LimitExceededException"},
+        {"shape":"AccountSuspendedException"},
+        {"shape":"SendingPausedException"},
+        {"shape":"MessageRejected"},
+        {"shape":"MailFromDomainNotVerifiedException"},
+        {"shape":"NotFoundException"},
+        {"shape":"BadRequestException"}
+      ],
+      "documentation":"<p>Sends an email message. You can use the Amazon SES API v2 to send two types of messages:</p> <ul> <li> <p> <b>Simple</b> – A standard email message. When you create this type of message, you specify the sender, the recipient, and the message body, and Amazon SES assembles the message for you.</p> </li> <li> <p> <b>Raw</b> – A raw, MIME-formatted email message. When you send this type of email, you have to specify all of the message headers, as well as the message body. You can use this message type to send messages that contain attachments. The message that you specify has to be a valid MIME message.</p> </li> </ul>"
+    },
+    "TagResource":{
+      "name":"TagResource",
+      "http":{
+        "method":"POST",
+        "requestUri":"/v2/email/tags"
+      },
+      "input":{"shape":"TagResourceRequest"},
+      "output":{"shape":"TagResourceResponse"},
+      "errors":[
+        {"shape":"BadRequestException"},
+        {"shape":"ConcurrentModificationException"},
+        {"shape":"NotFoundException"},
+        {"shape":"TooManyRequestsException"}
+      ],
+      "documentation":"<p>Add one or more tags (keys and values) to a specified resource. A <i>tag</i> is a label that you optionally define and associate with a resource. Tags can help you categorize and manage resources in different ways, such as by purpose, owner, environment, or other criteria. A resource can have as many as 50 tags.</p> <p>Each tag consists of a required <i>tag key</i> and an associated <i>tag value</i>, both of which you define. A tag key is a general label that acts as a category for more specific tag values. A tag value acts as a descriptor within a tag key.</p>"
+    },
+    "UntagResource":{
+      "name":"UntagResource",
+      "http":{
+        "method":"DELETE",
+        "requestUri":"/v2/email/tags"
+      },
+      "input":{"shape":"UntagResourceRequest"},
+      "output":{"shape":"UntagResourceResponse"},
+      "errors":[
+        {"shape":"BadRequestException"},
+        {"shape":"ConcurrentModificationException"},
+        {"shape":"NotFoundException"},
+        {"shape":"TooManyRequestsException"}
+      ],
+      "documentation":"<p>Remove one or more tags (keys and values) from a specified resource.</p>"
+    },
+    "UpdateConfigurationSetEventDestination":{
+      "name":"UpdateConfigurationSetEventDestination",
+      "http":{
+        "method":"PUT",
+        "requestUri":"/v2/email/configuration-sets/{ConfigurationSetName}/event-destinations/{EventDestinationName}"
+      },
+      "input":{"shape":"UpdateConfigurationSetEventDestinationRequest"},
+      "output":{"shape":"UpdateConfigurationSetEventDestinationResponse"},
+      "errors":[
+        {"shape":"NotFoundException"},
+        {"shape":"TooManyRequestsException"},
+        {"shape":"BadRequestException"}
+      ],
+      "documentation":"<p>Update the configuration of an event destination for a configuration set.</p> <p> <i>Events</i> include message sends, deliveries, opens, clicks, bounces, and complaints. <i>Event destinations</i> are places that you can send information about these events to. For example, you can send event data to Amazon SNS to receive notifications when you receive bounces or complaints, or you can use Amazon Kinesis Data Firehose to stream data to Amazon S3 for long-term storage.</p>"
+    }
+  },
+  "shapes":{
+    "AccountSuspendedException":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>The message can't be sent because the account's ability to send email has been permanently restricted.</p>",
+      "error":{"httpStatusCode":400},
+      "exception":true
+    },
+    "AlreadyExistsException":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>The resource specified in your request already exists.</p>",
+      "error":{"httpStatusCode":400},
+      "exception":true
+    },
+    "AmazonResourceName":{"type":"string"},
+    "BadRequestException":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>The input you provided is invalid.</p>",
+      "error":{"httpStatusCode":400},
+      "exception":true
+    },
+    "BehaviorOnMxFailure":{
+      "type":"string",
+      "documentation":"<p>The action that you want to take if the required MX record can't be found when you send an email. When you set this value to <code>UseDefaultValue</code>, the mail is sent using <i>amazonses.com</i> as the MAIL FROM domain. When you set this value to <code>RejectMessage</code>, the Amazon SES API v2 returns a <code>MailFromDomainNotVerified</code> error, and doesn't attempt to deliver the email.</p> <p>These behaviors are taken when the custom MAIL FROM domain configuration is in the <code>Pending</code>, <code>Failed</code>, and <code>TemporaryFailure</code> states.</p>",
+      "enum":[
+        "USE_DEFAULT_VALUE",
+        "REJECT_MESSAGE"
+      ]
+    },
+    "BlacklistEntries":{
+      "type":"list",
+      "member":{"shape":"BlacklistEntry"}
+    },
+    "BlacklistEntry":{
+      "type":"structure",
+      "members":{
+        "RblName":{
+          "shape":"RblName",
+          "documentation":"<p>The name of the blacklist that the IP address appears on.</p>"
+        },
+        "ListingTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>The time when the blacklisting event occurred, shown in Unix time format.</p>"
+        },
+        "Description":{
+          "shape":"BlacklistingDescription",
+          "documentation":"<p>Additional information about the blacklisting event, as provided by the blacklist maintainer.</p>"
+        }
+      },
+      "documentation":"<p>An object that contains information about a blacklisting event that impacts one of the dedicated IP addresses that is associated with your account.</p>"
+    },
+    "BlacklistItemName":{
+      "type":"string",
+      "documentation":"<p>An IP address that you want to obtain blacklist information for.</p>"
+    },
+    "BlacklistItemNames":{
+      "type":"list",
+      "member":{"shape":"BlacklistItemName"}
+    },
+    "BlacklistReport":{
+      "type":"map",
+      "key":{"shape":"BlacklistItemName"},
+      "value":{"shape":"BlacklistEntries"}
+    },
+    "BlacklistingDescription":{
+      "type":"string",
+      "documentation":"<p>A description of the blacklisting event.</p>"
+    },
+    "Body":{
+      "type":"structure",
+      "members":{
+        "Text":{
+          "shape":"Content",
+          "documentation":"<p>An object that represents the version of the message that is displayed in email clients that don't support HTML, or clients where the recipient has disabled HTML rendering.</p>"
+        },
+        "Html":{
+          "shape":"Content",
+          "documentation":"<p>An object that represents the version of the message that is displayed in email clients that support HTML. HTML messages can include formatted text, hyperlinks, images, and more. </p>"
+        }
+      },
+      "documentation":"<p>Represents the body of the email message.</p>"
+    },
+    "CampaignId":{"type":"string"},
+    "Charset":{"type":"string"},
+    "CloudWatchDestination":{
+      "type":"structure",
+      "required":["DimensionConfigurations"],
+      "members":{
+        "DimensionConfigurations":{
+          "shape":"CloudWatchDimensionConfigurations",
+          "documentation":"<p>An array of objects that define the dimensions to use when you send email events to Amazon CloudWatch.</p>"
+        }
+      },
+      "documentation":"<p>An object that defines an Amazon CloudWatch destination for email events. You can use Amazon CloudWatch to monitor and gain insights on your email sending metrics.</p>"
+    },
+    "CloudWatchDimensionConfiguration":{
+      "type":"structure",
+      "required":[
+        "DimensionName",
+        "DimensionValueSource",
+        "DefaultDimensionValue"
+      ],
+      "members":{
+        "DimensionName":{
+          "shape":"DimensionName",
+          "documentation":"<p>The name of an Amazon CloudWatch dimension associated with an email sending metric. The name has to meet the following criteria:</p> <ul> <li> <p>It can only contain ASCII letters (a–z, A–Z), numbers (0–9), underscores (_), or dashes (-).</p> </li> <li> <p>It can contain no more than 256 characters.</p> </li> </ul>"
+        },
+        "DimensionValueSource":{
+          "shape":"DimensionValueSource",
+          "documentation":"<p>The location where the Amazon SES API v2 finds the value of a dimension to publish to Amazon CloudWatch. If you want to use the message tags that you specify using an <code>X-SES-MESSAGE-TAGS</code> header or a parameter to the <code>SendEmail</code> or <code>SendRawEmail</code> API, choose <code>messageTag</code>. If you want to use your own email headers, choose <code>emailHeader</code>. If you want to use link tags, choose <code>linkTags</code>.</p>"
+        },
+        "DefaultDimensionValue":{
+          "shape":"DefaultDimensionValue",
+          "documentation":"<p>The default value of the dimension that is published to Amazon CloudWatch if you don't provide the value of the dimension when you send an email. This value has to meet the following criteria:</p> <ul> <li> <p>It can only contain ASCII letters (a–z, A–Z), numbers (0–9), underscores (_), or dashes (-).</p> </li> <li> <p>It can contain no more than 256 characters.</p> </li> </ul>"
+        }
+      },
+      "documentation":"<p>An object that defines the dimension configuration to use when you send email events to Amazon CloudWatch.</p>"
+    },
+    "CloudWatchDimensionConfigurations":{
+      "type":"list",
+      "member":{"shape":"CloudWatchDimensionConfiguration"}
+    },
+    "ConcurrentModificationException":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>The resource is being modified by another operation or thread.</p>",
+      "error":{"httpStatusCode":500},
+      "exception":true
+    },
+    "ConfigurationSetName":{
+      "type":"string",
+      "documentation":"<p>The name of a configuration set.</p> <p> <i>Configuration sets</i> are groups of rules that you can apply to the emails you send. You apply a configuration set to an email by including a reference to the configuration set in the headers of the email. When you apply a configuration set to an email, all of the rules in that configuration set are applied to the email.</p>"
+    },
+    "ConfigurationSetNameList":{
+      "type":"list",
+      "member":{"shape":"ConfigurationSetName"}
+    },
+    "Content":{
+      "type":"structure",
+      "required":["Data"],
+      "members":{
+        "Data":{
+          "shape":"MessageData",
+          "documentation":"<p>The content of the message itself.</p>"
+        },
+        "Charset":{
+          "shape":"Charset",
+          "documentation":"<p>The character set for the content. Because of the constraints of the SMTP protocol, Amazon SES uses 7-bit ASCII by default. If the text includes characters outside of the ASCII range, you have to specify a character set. For example, you could specify <code>UTF-8</code>, <code>ISO-8859-1</code>, or <code>Shift_JIS</code>.</p>"
+        }
+      },
+      "documentation":"<p>An object that represents the content of the email, and optionally a character set specification.</p>"
+    },
+    "CreateConfigurationSetEventDestinationRequest":{
+      "type":"structure",
+      "required":[
+        "ConfigurationSetName",
+        "EventDestinationName",
+        "EventDestination"
+      ],
+      "members":{
+        "ConfigurationSetName":{
+          "shape":"ConfigurationSetName",
+          "documentation":"<p>The name of the configuration set that you want to add an event destination to.</p>",
+          "location":"uri",
+          "locationName":"ConfigurationSetName"
+        },
+        "EventDestinationName":{
+          "shape":"EventDestinationName",
+          "documentation":"<p>A name that identifies the event destination within the configuration set.</p>"
+        },
+        "EventDestination":{
+          "shape":"EventDestinationDefinition",
+          "documentation":"<p>An object that defines the event destination.</p>"
+        }
+      },
+      "documentation":"<p>A request to add an event destination to a configuration set.</p>"
+    },
+    "CreateConfigurationSetEventDestinationResponse":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>An HTTP 200 response if the request succeeds, or an error message if the request fails.</p>"
+    },
+    "CreateConfigurationSetRequest":{
+      "type":"structure",
+      "required":["ConfigurationSetName"],
+      "members":{
+        "ConfigurationSetName":{
+          "shape":"ConfigurationSetName",
+          "documentation":"<p>The name of the configuration set.</p>"
+        },
+        "TrackingOptions":{
+          "shape":"TrackingOptions",
+          "documentation":"<p>An object that defines the open and click tracking options for emails that you send using the configuration set.</p>"
+        },
+        "DeliveryOptions":{
+          "shape":"DeliveryOptions",
+          "documentation":"<p>An object that defines the dedicated IP pool that is used to send emails that you send using the configuration set.</p>"
+        },
+        "ReputationOptions":{
+          "shape":"ReputationOptions",
+          "documentation":"<p>An object that defines whether or not Amazon SES collects reputation metrics for the emails that you send that use the configuration set.</p>"
+        },
+        "SendingOptions":{
+          "shape":"SendingOptions",
+          "documentation":"<p>An object that defines whether or not Amazon SES can send email that you send using the configuration set.</p>"
+        },
+        "Tags":{
+          "shape":"TagList",
+          "documentation":"<p>An array of objects that define the tags (keys and values) that you want to associate with the configuration set.</p>"
+        },
+        "SuppressionOptions":{"shape":"SuppressionOptions"}
+      },
+      "documentation":"<p>A request to create a configuration set.</p>"
+    },
+    "CreateConfigurationSetResponse":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>An HTTP 200 response if the request succeeds, or an error message if the request fails.</p>"
+    },
+    "CreateDedicatedIpPoolRequest":{
+      "type":"structure",
+      "required":["PoolName"],
+      "members":{
+        "PoolName":{
+          "shape":"PoolName",
+          "documentation":"<p>The name of the dedicated IP pool.</p>"
+        },
+        "Tags":{
+          "shape":"TagList",
+          "documentation":"<p>An object that defines the tags (keys and values) that you want to associate with the pool.</p>"
+        }
+      },
+      "documentation":"<p>A request to create a new dedicated IP pool.</p>"
+    },
+    "CreateDedicatedIpPoolResponse":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>An HTTP 200 response if the request succeeds, or an error message if the request fails.</p>"
+    },
+    "CreateDeliverabilityTestReportRequest":{
+      "type":"structure",
+      "required":[
+        "FromEmailAddress",
+        "Content"
+      ],
+      "members":{
+        "ReportName":{
+          "shape":"ReportName",
+          "documentation":"<p>A unique name that helps you to identify the predictive inbox placement test when you retrieve the results.</p>"
+        },
+        "FromEmailAddress":{
+          "shape":"EmailAddress",
+          "documentation":"<p>The email address that the predictive inbox placement test email was sent from.</p>"
+        },
+        "Content":{
+          "shape":"EmailContent",
+          "documentation":"<p>The HTML body of the message that you sent when you performed the predictive inbox placement test.</p>"
+        },
+        "Tags":{
+          "shape":"TagList",
+          "documentation":"<p>An array of objects that define the tags (keys and values) that you want to associate with the predictive inbox placement test.</p>"
+        }
+      },
+      "documentation":"<p>A request to perform a predictive inbox placement test. Predictive inbox placement tests can help you predict how your messages will be handled by various email providers around the world. When you perform a predictive inbox placement test, you provide a sample message that contains the content that you plan to send to your customers. We send that message to special email addresses spread across several major email providers around the world. The test takes about 24 hours to complete. When the test is complete, you can use the <code>GetDeliverabilityTestReport</code> operation to view the results of the test.</p>"
+    },
+    "CreateDeliverabilityTestReportResponse":{
+      "type":"structure",
+      "required":[
+        "ReportId",
+        "DeliverabilityTestStatus"
+      ],
+      "members":{
+        "ReportId":{
+          "shape":"ReportId",
+          "documentation":"<p>A unique string that identifies the predictive inbox placement test.</p>"
+        },
+        "DeliverabilityTestStatus":{
+          "shape":"DeliverabilityTestStatus",
+          "documentation":"<p>The status of the predictive inbox placement test. If the status is <code>IN_PROGRESS</code>, then the predictive inbox placement test is currently running. Predictive inbox placement tests are usually complete within 24 hours of creating the test. If the status is <code>COMPLETE</code>, then the test is finished, and you can use the <code>GetDeliverabilityTestReport</code> to view the results of the test.</p>"
+        }
+      },
+      "documentation":"<p>Information about the predictive inbox placement test that you created.</p>"
+    },
+    "CreateEmailIdentityRequest":{
+      "type":"structure",
+      "required":["EmailIdentity"],
+      "members":{
+        "EmailIdentity":{
+          "shape":"Identity",
+          "documentation":"<p>The email address or domain that you want to verify.</p>"
+        },
+        "Tags":{
+          "shape":"TagList",
+          "documentation":"<p>An array of objects that define the tags (keys and values) that you want to associate with the email identity.</p>"
+        },
+        "DkimSigningAttributes":{
+          "shape":"DkimSigningAttributes",
+          "documentation":"<p>If your request includes this object, Amazon SES configures the identity to use Bring Your Own DKIM (BYODKIM) for DKIM authentication purposes, as opposed to the default method, <a href=\"https://docs.aws.amazon.com/ses/latest/DeveloperGuide/easy-dkim.html\">Easy DKIM</a>.</p> <p>You can only specify this object if the email identity is a domain, as opposed to an address.</p>"
+        }
+      },
+      "documentation":"<p>A request to begin the verification process for an email identity (an email address or domain).</p>"
+    },
+    "CreateEmailIdentityResponse":{
+      "type":"structure",
+      "members":{
+        "IdentityType":{
+          "shape":"IdentityType",
+          "documentation":"<p>The email identity type.</p>"
+        },
+        "VerifiedForSendingStatus":{
+          "shape":"Enabled",
+          "documentation":"<p>Specifies whether or not the identity is verified. You can only send email from verified email addresses or domains. For more information about verifying identities, see the <a href=\"https://docs.aws.amazon.com/pinpoint/latest/userguide/channels-email-manage-verify.html\">Amazon Pinpoint User Guide</a>.</p>"
+        },
+        "DkimAttributes":{
+          "shape":"DkimAttributes",
+          "documentation":"<p>An object that contains information about the DKIM attributes for the identity.</p>"
+        }
+      },
+      "documentation":"<p>If the email identity is a domain, this object contains information about the DKIM verification status for the domain.</p> <p>If the email identity is an email address, this object is empty. </p>"
+    },
+    "CustomRedirectDomain":{
+      "type":"string",
+      "documentation":"<p>The domain that you want to use for tracking open and click events.</p>"
+    },
+    "DailyVolume":{
+      "type":"structure",
+      "members":{
+        "StartDate":{
+          "shape":"Timestamp",
+          "documentation":"<p>The date that the DailyVolume metrics apply to, in Unix time.</p>"
+        },
+        "VolumeStatistics":{
+          "shape":"VolumeStatistics",
+          "documentation":"<p>An object that contains inbox placement metrics for a specific day in the analysis period.</p>"
+        },
+        "DomainIspPlacements":{
+          "shape":"DomainIspPlacements",
+          "documentation":"<p>An object that contains inbox placement metrics for a specified day in the analysis period, broken out by the recipient's email provider.</p>"
+        }
+      },
+      "documentation":"<p>An object that contains information about the volume of email sent on each day of the analysis period.</p>"
+    },
+    "DailyVolumes":{
+      "type":"list",
+      "member":{"shape":"DailyVolume"}
+    },
+    "DedicatedIp":{
+      "type":"structure",
+      "required":[
+        "Ip",
+        "WarmupStatus",
+        "WarmupPercentage"
+      ],
+      "members":{
+        "Ip":{
+          "shape":"Ip",
+          "documentation":"<p>An IPv4 address.</p>"
+        },
+        "WarmupStatus":{
+          "shape":"WarmupStatus",
+          "documentation":"<p>The warm-up status of a dedicated IP address. The status can have one of the following values:</p> <ul> <li> <p> <code>IN_PROGRESS</code> – The IP address isn't ready to use because the dedicated IP warm-up process is ongoing.</p> </li> <li> <p> <code>DONE</code> – The dedicated IP warm-up process is complete, and the IP address is ready to use.</p> </li> </ul>"
+        },
+        "WarmupPercentage":{
+          "shape":"Percentage100Wrapper",
+          "documentation":"<p>Indicates how complete the dedicated IP warm-up process is. When this value equals 1, the address has completed the warm-up process and is ready for use.</p>"
+        },
+        "PoolName":{
+          "shape":"PoolName",
+          "documentation":"<p>The name of the dedicated IP pool that the IP address is associated with.</p>"
+        }
+      },
+      "documentation":"<p>Contains information about a dedicated IP address that is associated with your Amazon SES account.</p> <p>To learn more about requesting dedicated IP addresses, see <a href=\"https://docs.aws.amazon.com/ses/latest/DeveloperGuide/dedicated-ip-case.html\">Requesting and Relinquishing Dedicated IP Addresses</a> in the <i>Amazon SES Developer Guide</i>.</p>"
+    },
+    "DedicatedIpList":{
+      "type":"list",
+      "member":{"shape":"DedicatedIp"},
+      "documentation":"<p>A list of dedicated IP addresses that are associated with your AWS account.</p>"
+    },
+    "DefaultDimensionValue":{
+      "type":"string",
+      "documentation":"<p>The default value of the dimension that is published to Amazon CloudWatch if you don't provide the value of the dimension when you send an email. This value has to meet the following criteria:</p> <ul> <li> <p>It can only contain ASCII letters (a–z, A–Z), numbers (0–9), underscores (_), or dashes (-).</p> </li> <li> <p>It can contain no more than 256 characters.</p> </li> </ul>"
+    },
+    "DeleteConfigurationSetEventDestinationRequest":{
+      "type":"structure",
+      "required":[
+        "ConfigurationSetName",
+        "EventDestinationName"
+      ],
+      "members":{
+        "ConfigurationSetName":{
+          "shape":"ConfigurationSetName",
+          "documentation":"<p>The name of the configuration set that contains the event destination that you want to delete.</p>",
+          "location":"uri",
+          "locationName":"ConfigurationSetName"
+        },
+        "EventDestinationName":{
+          "shape":"EventDestinationName",
+          "documentation":"<p>The name of the event destination that you want to delete.</p>",
+          "location":"uri",
+          "locationName":"EventDestinationName"
+        }
+      },
+      "documentation":"<p>A request to delete an event destination from a configuration set.</p>"
+    },
+    "DeleteConfigurationSetEventDestinationResponse":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>An HTTP 200 response if the request succeeds, or an error message if the request fails.</p>"
+    },
+    "DeleteConfigurationSetRequest":{
+      "type":"structure",
+      "required":["ConfigurationSetName"],
+      "members":{
+        "ConfigurationSetName":{
+          "shape":"ConfigurationSetName",
+          "documentation":"<p>The name of the configuration set that you want to delete.</p>",
+          "location":"uri",
+          "locationName":"ConfigurationSetName"
+        }
+      },
+      "documentation":"<p>A request to delete a configuration set.</p>"
+    },
+    "DeleteConfigurationSetResponse":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>An HTTP 200 response if the request succeeds, or an error message if the request fails.</p>"
+    },
+    "DeleteDedicatedIpPoolRequest":{
+      "type":"structure",
+      "required":["PoolName"],
+      "members":{
+        "PoolName":{
+          "shape":"PoolName",
+          "documentation":"<p>The name of the dedicated IP pool that you want to delete.</p>",
+          "location":"uri",
+          "locationName":"PoolName"
+        }
+      },
+      "documentation":"<p>A request to delete a dedicated IP pool.</p>"
+    },
+    "DeleteDedicatedIpPoolResponse":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>An HTTP 200 response if the request succeeds, or an error message if the request fails.</p>"
+    },
+    "DeleteEmailIdentityRequest":{
+      "type":"structure",
+      "required":["EmailIdentity"],
+      "members":{
+        "EmailIdentity":{
+          "shape":"Identity",
+          "documentation":"<p>The identity (that is, the email address or domain) that you want to delete.</p>",
+          "location":"uri",
+          "locationName":"EmailIdentity"
+        }
+      },
+      "documentation":"<p>A request to delete an existing email identity. When you delete an identity, you lose the ability to send email from that identity. You can restore your ability to send email by completing the verification process for the identity again.</p>"
+    },
+    "DeleteEmailIdentityResponse":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>An HTTP 200 response if the request succeeds, or an error message if the request fails.</p>"
+    },
+    "DeleteSuppressedDestinationRequest":{
+      "type":"structure",
+      "required":["EmailAddress"],
+      "members":{
+        "EmailAddress":{
+          "shape":"EmailAddress",
+          "documentation":"<p>The suppressed email destination to remove from the account suppression list.</p>",
+          "location":"uri",
+          "locationName":"EmailAddress"
+        }
+      },
+      "documentation":"<p>A request to remove an email address from the suppression list for your account.</p>"
+    },
+    "DeleteSuppressedDestinationResponse":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>An HTTP 200 response if the request succeeds, or an error message if the request fails.</p>"
+    },
+    "DeliverabilityDashboardAccountStatus":{
+      "type":"string",
+      "documentation":"<p>The current status of your Deliverability dashboard subscription. If this value is <code>PENDING_EXPIRATION</code>, your subscription is scheduled to expire at the end of the current calendar month.</p>",
+      "enum":[
+        "ACTIVE",
+        "PENDING_EXPIRATION",
+        "DISABLED"
+      ]
+    },
+    "DeliverabilityTestReport":{
+      "type":"structure",
+      "members":{
+        "ReportId":{
+          "shape":"ReportId",
+          "documentation":"<p>A unique string that identifies the predictive inbox placement test.</p>"
+        },
+        "ReportName":{
+          "shape":"ReportName",
+          "documentation":"<p>A name that helps you identify a predictive inbox placement test report.</p>"
+        },
+        "Subject":{
+          "shape":"DeliverabilityTestSubject",
+          "documentation":"<p>The subject line for an email that you submitted in a predictive inbox placement test.</p>"
+        },
+        "FromEmailAddress":{
+          "shape":"EmailAddress",
+          "documentation":"<p>The sender address that you specified for the predictive inbox placement test.</p>"
+        },
+        "CreateDate":{
+          "shape":"Timestamp",
+          "documentation":"<p>The date and time when the predictive inbox placement test was created, in Unix time format.</p>"
+        },
+        "DeliverabilityTestStatus":{
+          "shape":"DeliverabilityTestStatus",
+          "documentation":"<p>The status of the predictive inbox placement test. If the status is <code>IN_PROGRESS</code>, then the predictive inbox placement test is currently running. Predictive inbox placement tests are usually complete within 24 hours of creating the test. If the status is <code>COMPLETE</code>, then the test is finished, and you can use the <code>GetDeliverabilityTestReport</code> to view the results of the test.</p>"
+        }
+      },
+      "documentation":"<p>An object that contains metadata related to a predictive inbox placement test.</p>"
+    },
+    "DeliverabilityTestReports":{
+      "type":"list",
+      "member":{"shape":"DeliverabilityTestReport"}
+    },
+    "DeliverabilityTestStatus":{
+      "type":"string",
+      "documentation":"<p>The status of a predictive inbox placement test. If the status is <code>IN_PROGRESS</code>, then the predictive inbox placement test is currently running. Predictive inbox placement tests are usually complete within 24 hours of creating the test. If the status is <code>COMPLETE</code>, then the test is finished, and you can use the <code>GetDeliverabilityTestReport</code> operation to view the results of the test.</p>",
+      "enum":[
+        "IN_PROGRESS",
+        "COMPLETED"
+      ]
+    },
+    "DeliverabilityTestSubject":{
+      "type":"string",
+      "documentation":"<p>The subject line for an email that you submitted in a predictive inbox placement test.</p>"
+    },
+    "DeliveryOptions":{
+      "type":"structure",
+      "members":{
+        "TlsPolicy":{
+          "shape":"TlsPolicy",
+          "documentation":"<p>Specifies whether messages that use the configuration set are required to use Transport Layer Security (TLS). If the value is <code>Require</code>, messages are only delivered if a TLS connection can be established. If the value is <code>Optional</code>, messages can be delivered in plain text if a TLS connection can't be established.</p>"
+        },
+        "SendingPoolName":{
+          "shape":"PoolName",
+          "documentation":"<p>The name of the dedicated IP pool that you want to associate with the configuration set.</p>"
+        }
+      },
+      "documentation":"<p>Used to associate a configuration set with a dedicated IP pool.</p>"
+    },
+    "Destination":{
+      "type":"structure",
+      "members":{
+        "ToAddresses":{
+          "shape":"EmailAddressList",
+          "documentation":"<p>An array that contains the email addresses of the \"To\" recipients for the email.</p>"
+        },
+        "CcAddresses":{
+          "shape":"EmailAddressList",
+          "documentation":"<p>An array that contains the email addresses of the \"CC\" (carbon copy) recipients for the email.</p>"
+        },
+        "BccAddresses":{
+          "shape":"EmailAddressList",
+          "documentation":"<p>An array that contains the email addresses of the \"BCC\" (blind carbon copy) recipients for the email.</p>"
+        }
+      },
+      "documentation":"<p>An object that describes the recipients for an email.</p>"
+    },
+    "DimensionName":{
+      "type":"string",
+      "documentation":"<p>The name of an Amazon CloudWatch dimension associated with an email sending metric. The name has to meet the following criteria:</p> <ul> <li> <p>It can only contain ASCII letters (a-z, A-Z), numbers (0-9), underscores (_), or dashes (-).</p> </li> <li> <p>It can contain no more than 256 characters.</p> </li> </ul>"
+    },
+    "DimensionValueSource":{
+      "type":"string",
+      "documentation":"<p>The location where the Amazon SES API v2 finds the value of a dimension to publish to Amazon CloudWatch. If you want to use the message tags that you specify using an <code>X-SES-MESSAGE-TAGS</code> header or a parameter to the <code>SendEmail</code> or <code>SendRawEmail</code> API, choose <code>messageTag</code>. If you want to use your own email headers, choose <code>emailHeader</code>. If you want to use link tags, choose <code>linkTags</code>.</p>",
+      "enum":[
+        "MESSAGE_TAG",
+        "EMAIL_HEADER",
+        "LINK_TAG"
+      ]
+    },
+    "DkimAttributes":{
+      "type":"structure",
+      "members":{
+        "SigningEnabled":{
+          "shape":"Enabled",
+          "documentation":"<p>If the value is <code>true</code>, then the messages that you send from the identity are signed using DKIM. If the value is <code>false</code>, then the messages that you send from the identity aren't DKIM-signed.</p>"
+        },
+        "Status":{
+          "shape":"DkimStatus",
+          "documentation":"<p>Describes whether or not Amazon SES has successfully located the DKIM records in the DNS records for the domain. The status can be one of the following:</p> <ul> <li> <p> <code>PENDING</code> – The verification process was initiated, but Amazon SES hasn't yet detected the DKIM records in the DNS configuration for the domain.</p> </li> <li> <p> <code>SUCCESS</code> – The verification process completed successfully.</p> </li> <li> <p> <code>FAILED</code> – The verification process failed. This typically occurs when Amazon SES fails to find the DKIM records in the DNS configuration of the domain.</p> </li> <li> <p> <code>TEMPORARY_FAILURE</code> – A temporary issue is preventing Amazon SES from determining the DKIM authentication status of the domain.</p> </li> <li> <p> <code>NOT_STARTED</code> – The DKIM verification process hasn't been initiated for the domain.</p> </li> </ul>"
+        },
+        "Tokens":{
+          "shape":"DnsTokenList",
+          "documentation":"<p>If you used <a href=\"https://docs.aws.amazon.com/ses/latest/DeveloperGuide/easy-dkim.html\">Easy DKIM</a> to configure DKIM authentication for the domain, then this object contains a set of unique strings that you use to create a set of CNAME records that you add to the DNS configuration for your domain. When Amazon SES detects these records in the DNS configuration for your domain, the DKIM authentication process is complete.</p> <p>If you configured DKIM authentication for the domain by providing your own public-private key pair, then this object contains the selector for the public key.</p> <p>Regardless of the DKIM authentication method you use, Amazon SES searches for the appropriate records in the DNS configuration of the domain for up to 72 hours.</p>"
+        },
+        "SigningAttributesOrigin":{
+          "shape":"DkimSigningAttributesOrigin",
+          "documentation":"<p>A string that indicates how DKIM was configured for the identity. There are two possible values:</p> <ul> <li> <p> <code>AWS_SES</code> – Indicates that DKIM was configured for the identity by using <a href=\"https://docs.aws.amazon.com/ses/latest/DeveloperGuide/easy-dkim.html\">Easy DKIM</a>.</p> </li> <li> <p> <code>EXTERNAL</code> – Indicates that DKIM was configured for the identity by using Bring Your Own DKIM (BYODKIM).</p> </li> </ul>"
+        }
+      },
+      "documentation":"<p>An object that contains information about the DKIM authentication status for an email identity.</p> <p>Amazon SES determines the authentication status by searching for specific records in the DNS configuration for the domain. If you used <a href=\"https://docs.aws.amazon.com/ses/latest/DeveloperGuide/easy-dkim.html\">Easy DKIM</a> to set up DKIM authentication, Amazon SES tries to find three unique CNAME records in the DNS configuration for your domain. If you provided a public key to perform DKIM authentication, Amazon SES tries to find a TXT record that uses the selector that you specified. The value of the TXT record must be a public key that's paired with the private key that you specified in the process of creating the identity</p>"
+    },
+    "DkimSigningAttributes":{
+      "type":"structure",
+      "required":[
+        "DomainSigningSelector",
+        "DomainSigningPrivateKey"
+      ],
+      "members":{
+        "DomainSigningSelector":{
+          "shape":"Selector",
+          "documentation":"<p>A string that's used to identify a public key in the DNS configuration for a domain.</p>"
+        },
+        "DomainSigningPrivateKey":{
+          "shape":"PrivateKey",
+          "documentation":"<p>A private key that's used to generate a DKIM signature.</p> <p>The private key must use 1024-bit RSA encryption, and must be encoded using base64 encoding.</p>"
+        }
+      },
+      "documentation":"<p>An object that contains information about the tokens used for setting up Bring Your Own DKIM (BYODKIM).</p>"
+    },
+    "DkimSigningAttributesOrigin":{
+      "type":"string",
+      "enum":[
+        "AWS_SES",
+        "EXTERNAL"
+      ]
+    },
+    "DkimStatus":{
+      "type":"string",
+      "documentation":"<p>The DKIM authentication status of the identity. The status can be one of the following:</p> <ul> <li> <p> <code>PENDING</code> – The verification process was initiated, but Amazon SES hasn't yet detected the DKIM records in the DNS configuration for the domain.</p> </li> <li> <p> <code>SUCCESS</code> – The verification process completed successfully.</p> </li> <li> <p> <code>FAILED</code> – The verification process failed. This typically occurs when Amazon SES fails to find the DKIM records in the DNS configuration of the domain.</p> </li> <li> <p> <code>TEMPORARY_FAILURE</code> – A temporary issue is preventing Amazon SES from determining the DKIM authentication status of the domain.</p> </li> <li> <p> <code>NOT_STARTED</code> – The DKIM verification process hasn't been initiated for the domain.</p> </li> </ul>",
+      "enum":[
+        "PENDING",
+        "SUCCESS",
+        "FAILED",
+        "TEMPORARY_FAILURE",
+        "NOT_STARTED"
+      ]
+    },
+    "DnsToken":{"type":"string"},
+    "DnsTokenList":{
+      "type":"list",
+      "member":{"shape":"DnsToken"}
+    },
+    "Domain":{"type":"string"},
+    "DomainDeliverabilityCampaign":{
+      "type":"structure",
+      "members":{
+        "CampaignId":{
+          "shape":"CampaignId",
+          "documentation":"<p>The unique identifier for the campaign. The Deliverability dashboard automatically generates and assigns this identifier to a campaign.</p>"
+        },
+        "ImageUrl":{
+          "shape":"ImageUrl",
+          "documentation":"<p>The URL of an image that contains a snapshot of the email message that was sent.</p>"
+        },
+        "Subject":{
+          "shape":"Subject",
+          "documentation":"<p>The subject line, or title, of the email message.</p>"
+        },
+        "FromAddress":{
+          "shape":"Identity",
+          "documentation":"<p>The verified email address that the email message was sent from.</p>"
+        },
+        "SendingIps":{
+          "shape":"IpList",
+          "documentation":"<p>The IP addresses that were used to send the email message.</p>"
+        },
+        "FirstSeenDateTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>The first time, in Unix time format, when the email message was delivered to any recipient's inbox. This value can help you determine how long it took for a campaign to deliver an email message.</p>"
+        },
+        "LastSeenDateTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>The last time, in Unix time format, when the email message was delivered to any recipient's inbox. This value can help you determine how long it took for a campaign to deliver an email message.</p>"
+        },
+        "InboxCount":{
+          "shape":"Volume",
+          "documentation":"<p>The number of email messages that were delivered to recipients’ inboxes.</p>"
+        },
+        "SpamCount":{
+          "shape":"Volume",
+          "documentation":"<p>The number of email messages that were delivered to recipients' spam or junk mail folders.</p>"
+        },
+        "ReadRate":{
+          "shape":"Percentage",
+          "documentation":"<p>The percentage of email messages that were opened by recipients. Due to technical limitations, this value only includes recipients who opened the message by using an email client that supports images.</p>"
+        },
+        "DeleteRate":{
+          "shape":"Percentage",
+          "documentation":"<p>The percentage of email messages that were deleted by recipients, without being opened first. Due to technical limitations, this value only includes recipients who opened the message by using an email client that supports images.</p>"
+        },
+        "ReadDeleteRate":{
+          "shape":"Percentage",
+          "documentation":"<p>The percentage of email messages that were opened and then deleted by recipients. Due to technical limitations, this value only includes recipients who opened the message by using an email client that supports images.</p>"
+        },
+        "ProjectedVolume":{
+          "shape":"Volume",
+          "documentation":"<p>The projected number of recipients that the email message was sent to.</p>"
+        },
+        "Esps":{
+          "shape":"Esps",
+          "documentation":"<p>The major email providers who handled the email message.</p>"
+        }
+      },
+      "documentation":"<p>An object that contains the deliverability data for a specific campaign. This data is available for a campaign only if the campaign sent email by using a domain that the Deliverability dashboard is enabled for (<code>PutDeliverabilityDashboardOption</code> operation).</p>"
+    },
+    "DomainDeliverabilityCampaignList":{
+      "type":"list",
+      "member":{"shape":"DomainDeliverabilityCampaign"},
+      "documentation":"<p/>"
+    },
+    "DomainDeliverabilityTrackingOption":{
+      "type":"structure",
+      "members":{
+        "Domain":{
+          "shape":"Domain",
+          "documentation":"<p>A verified domain that’s associated with your AWS account and currently has an active Deliverability dashboard subscription.</p>"
+        },
+        "SubscriptionStartDate":{
+          "shape":"Timestamp",
+          "documentation":"<p>The date, in Unix time format, when you enabled the Deliverability dashboard for the domain.</p>"
+        },
+        "InboxPlacementTrackingOption":{
+          "shape":"InboxPlacementTrackingOption",
+          "documentation":"<p>An object that contains information about the inbox placement data settings for the domain.</p>"
+        }
+      },
+      "documentation":"<p>An object that contains information about the Deliverability dashboard subscription for a verified domain that you use to send email and currently has an active Deliverability dashboard subscription. If a Deliverability dashboard subscription is active for a domain, you gain access to reputation, inbox placement, and other metrics for the domain.</p>"
+    },
+    "DomainDeliverabilityTrackingOptions":{
+      "type":"list",
+      "member":{"shape":"DomainDeliverabilityTrackingOption"},
+      "documentation":"<p>An object that contains information about the Deliverability dashboard subscription for a verified domain that you use to send email and currently has an active Deliverability dashboard subscription. If a Deliverability dashboard subscription is active for a domain, you gain access to reputation, inbox placement, and other metrics for the domain.</p>"
+    },
+    "DomainIspPlacement":{
+      "type":"structure",
+      "members":{
+        "IspName":{
+          "shape":"IspName",
+          "documentation":"<p>The name of the email provider that the inbox placement data applies to.</p>"
+        },
+        "InboxRawCount":{
+          "shape":"Volume",
+          "documentation":"<p>The total number of messages that were sent from the selected domain to the specified email provider that arrived in recipients' inboxes.</p>"
+        },
+        "SpamRawCount":{
+          "shape":"Volume",
+          "documentation":"<p>The total number of messages that were sent from the selected domain to the specified email provider that arrived in recipients' spam or junk mail folders.</p>"
+        },
+        "InboxPercentage":{
+          "shape":"Percentage",
+          "documentation":"<p>The percentage of messages that were sent from the selected domain to the specified email provider that arrived in recipients' inboxes.</p>"
+        },
+        "SpamPercentage":{
+          "shape":"Percentage",
+          "documentation":"<p>The percentage of messages that were sent from the selected domain to the specified email provider that arrived in recipients' spam or junk mail folders.</p>"
+        }
+      },
+      "documentation":"<p>An object that contains inbox placement data for email sent from one of your email domains to a specific email provider.</p>"
+    },
+    "DomainIspPlacements":{
+      "type":"list",
+      "member":{"shape":"DomainIspPlacement"}
+    },
+    "EmailAddress":{"type":"string"},
+    "EmailAddressList":{
+      "type":"list",
+      "member":{"shape":"EmailAddress"}
+    },
+    "EmailContent":{
+      "type":"structure",
+      "members":{
+        "Simple":{
+          "shape":"Message",
+          "documentation":"<p>The simple email message. The message consists of a subject and a message body.</p>"
+        },
+        "Raw":{
+          "shape":"RawMessage",
+          "documentation":"<p>The raw email message. The message has to meet the following criteria:</p> <ul> <li> <p>The message has to contain a header and a body, separated by one blank line.</p> </li> <li> <p>All of the required header fields must be present in the message.</p> </li> <li> <p>Each part of a multipart MIME message must be formatted properly.</p> </li> <li> <p>If you include attachments, they must be in a file format that the Amazon SES API v2 supports. </p> </li> <li> <p>The entire message must be Base64 encoded.</p> </li> <li> <p>If any of the MIME parts in your message contain content that is outside of the 7-bit ASCII character range, you should encode that content to ensure that recipients' email clients render the message properly.</p> </li> <li> <p>The length of any single line of text in the message can't exceed 1,000 characters. This restriction is defined in <a href=\"https://tools.ietf.org/html/rfc5321\">RFC 5321</a>.</p> </li> </ul>"
+        },
+        "Template":{
+          "shape":"Template",
+          "documentation":"<p>The template to use for the email message.</p>"
+        }
+      },
+      "documentation":"<p>An object that defines the entire content of the email, including the message headers and the body content. You can create a simple email message, in which you specify the subject and the text and HTML versions of the message body. You can also create raw messages, in which you specify a complete MIME-formatted message. Raw messages can include attachments and custom headers.</p>"
+    },
+    "Enabled":{"type":"boolean"},
+    "Esp":{"type":"string"},
+    "Esps":{
+      "type":"list",
+      "member":{"shape":"Esp"}
+    },
+    "EventDestination":{
+      "type":"structure",
+      "required":[
+        "Name",
+        "MatchingEventTypes"
+      ],
+      "members":{
+        "Name":{
+          "shape":"EventDestinationName",
+          "documentation":"<p>A name that identifies the event destination.</p>"
+        },
+        "Enabled":{
+          "shape":"Enabled",
+          "documentation":"<p>If <code>true</code>, the event destination is enabled. When the event destination is enabled, the specified event types are sent to the destinations in this <code>EventDestinationDefinition</code>.</p> <p>If <code>false</code>, the event destination is disabled. When the event destination is disabled, events aren't sent to the specified destinations.</p>"
+        },
+        "MatchingEventTypes":{
+          "shape":"EventTypes",
+          "documentation":"<p>The types of events that Amazon SES sends to the specified event destinations.</p>"
+        },
+        "KinesisFirehoseDestination":{
+          "shape":"KinesisFirehoseDestination",
+          "documentation":"<p>An object that defines an Amazon Kinesis Data Firehose destination for email events. You can use Amazon Kinesis Data Firehose to stream data to other services, such as Amazon S3 and Amazon Redshift.</p>"
+        },
+        "CloudWatchDestination":{
+          "shape":"CloudWatchDestination",
+          "documentation":"<p>An object that defines an Amazon CloudWatch destination for email events. You can use Amazon CloudWatch to monitor and gain insights on your email sending metrics.</p>"
+        },
+        "SnsDestination":{
+          "shape":"SnsDestination",
+          "documentation":"<p>An object that defines an Amazon SNS destination for email events. You can use Amazon SNS to send notification when certain email events occur.</p>"
+        },
+        "PinpointDestination":{
+          "shape":"PinpointDestination",
+          "documentation":"<p>An object that defines an Amazon Pinpoint project destination for email events. You can send email event data to a Amazon Pinpoint project to view metrics using the Transactional Messaging dashboards that are built in to Amazon Pinpoint. For more information, see <a href=\"https://docs.aws.amazon.com/pinpoint/latest/userguide/analytics-transactional-messages.html\">Transactional Messaging Charts</a> in the <i>Amazon Pinpoint User Guide</i>.</p>"
+        }
+      },
+      "documentation":"<p>In the Amazon SES API v2, <i>events</i> include message sends, deliveries, opens, clicks, bounces, and complaints. <i>Event destinations</i> are places that you can send information about these events to. For example, you can send event data to Amazon SNS to receive notifications when you receive bounces or complaints, or you can use Amazon Kinesis Data Firehose to stream data to Amazon S3 for long-term storage.</p>"
+    },
+    "EventDestinationDefinition":{
+      "type":"structure",
+      "members":{
+        "Enabled":{
+          "shape":"Enabled",
+          "documentation":"<p>If <code>true</code>, the event destination is enabled. When the event destination is enabled, the specified event types are sent to the destinations in this <code>EventDestinationDefinition</code>.</p> <p>If <code>false</code>, the event destination is disabled. When the event destination is disabled, events aren't sent to the specified destinations.</p>"
+        },
+        "MatchingEventTypes":{
+          "shape":"EventTypes",
+          "documentation":"<p>An array that specifies which events the Amazon SES API v2 should send to the destinations in this <code>EventDestinationDefinition</code>.</p>"
+        },
+        "KinesisFirehoseDestination":{
+          "shape":"KinesisFirehoseDestination",
+          "documentation":"<p>An object that defines an Amazon Kinesis Data Firehose destination for email events. You can use Amazon Kinesis Data Firehose to stream data to other services, such as Amazon S3 and Amazon Redshift.</p>"
+        },
+        "CloudWatchDestination":{
+          "shape":"CloudWatchDestination",
+          "documentation":"<p>An object that defines an Amazon CloudWatch destination for email events. You can use Amazon CloudWatch to monitor and gain insights on your email sending metrics.</p>"
+        },
+        "SnsDestination":{
+          "shape":"SnsDestination",
+          "documentation":"<p>An object that defines an Amazon SNS destination for email events. You can use Amazon SNS to send notification when certain email events occur.</p>"
+        },
+        "PinpointDestination":{
+          "shape":"PinpointDestination",
+          "documentation":"<p>An object that defines an Amazon Pinpoint project destination for email events. You can send email event data to a Amazon Pinpoint project to view metrics using the Transactional Messaging dashboards that are built in to Amazon Pinpoint. For more information, see <a href=\"https://docs.aws.amazon.com/pinpoint/latest/userguide/analytics-transactional-messages.html\">Transactional Messaging Charts</a> in the <i>Amazon Pinpoint User Guide</i>.</p>"
+        }
+      },
+      "documentation":"<p>An object that defines the event destination. Specifically, it defines which services receive events from emails sent using the configuration set that the event destination is associated with. Also defines the types of events that are sent to the event destination.</p>"
+    },
+    "EventDestinationName":{
+      "type":"string",
+      "documentation":"<p>The name of an event destination.</p> <p> <i>Events</i> include message sends, deliveries, opens, clicks, bounces, and complaints. <i>Event destinations</i> are places that you can send information about these events to. For example, you can send event data to Amazon SNS to receive notifications when you receive bounces or complaints, or you can use Amazon Kinesis Data Firehose to stream data to Amazon S3 for long-term storage.</p>"
+    },
+    "EventDestinations":{
+      "type":"list",
+      "member":{"shape":"EventDestination"}
+    },
+    "EventType":{
+      "type":"string",
+      "documentation":"<p>An email sending event type. For example, email sends, opens, and bounces are all email events.</p>",
+      "enum":[
+        "SEND",
+        "REJECT",
+        "BOUNCE",
+        "COMPLAINT",
+        "DELIVERY",
+        "OPEN",
+        "CLICK",
+        "RENDERING_FAILURE"
+      ]
+    },
+    "EventTypes":{
+      "type":"list",
+      "member":{"shape":"EventType"}
+    },
+    "FeedbackId":{"type":"string"},
+    "GeneralEnforcementStatus":{"type":"string"},
+    "GetAccountRequest":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>A request to obtain information about the email-sending capabilities of your Amazon SES account.</p>"
+    },
+    "GetAccountResponse":{
+      "type":"structure",
+      "members":{
+        "DedicatedIpAutoWarmupEnabled":{
+          "shape":"Enabled",
+          "documentation":"<p>Indicates whether or not the automatic warm-up feature is enabled for dedicated IP addresses that are associated with your account.</p>"
+        },
+        "EnforcementStatus":{
+          "shape":"GeneralEnforcementStatus",
+          "documentation":"<p>The reputation status of your Amazon SES account. The status can be one of the following:</p> <ul> <li> <p> <code>HEALTHY</code> – There are no reputation-related issues that currently impact your account.</p> </li> <li> <p> <code>PROBATION</code> – We've identified potential issues with your Amazon SES account. We're placing your account under review while you work on correcting these issues.</p> </li> <li> <p> <code>SHUTDOWN</code> – Your account's ability to send email is currently paused because of an issue with the email sent from your account. When you correct the issue, you can contact us and request that your account's ability to send email is resumed.</p> </li> </ul>"
+        },
+        "ProductionAccessEnabled":{
+          "shape":"Enabled",
+          "documentation":"<p>Indicates whether or not your account has production access in the current AWS Region.</p> <p>If the value is <code>false</code>, then your account is in the <i>sandbox</i>. When your account is in the sandbox, you can only send email to verified identities. Additionally, the maximum number of emails you can send in a 24-hour period (your sending quota) is 200, and the maximum number of emails you can send per second (your maximum sending rate) is 1.</p> <p>If the value is <code>true</code>, then your account has production access. When your account has production access, you can send email to any address. The sending quota and maximum sending rate for your account vary based on your specific use case.</p>"
+        },
+        "SendQuota":{
+          "shape":"SendQuota",
+          "documentation":"<p>An object that contains information about the per-day and per-second sending limits for your Amazon SES account in the current AWS Region.</p>"
+        },
+        "SendingEnabled":{
+          "shape":"Enabled",
+          "documentation":"<p>Indicates whether or not email sending is enabled for your Amazon SES account in the current AWS Region.</p>"
+        },
+        "SuppressionAttributes":{
+          "shape":"SuppressionAttributes",
+          "documentation":"<p>An object that contains information about the email address suppression preferences for your account in the current AWS Region.</p>"
+        }
+      },
+      "documentation":"<p>A list of details about the email-sending capabilities of your Amazon SES account in the current AWS Region.</p>"
+    },
+    "GetBlacklistReportsRequest":{
+      "type":"structure",
+      "required":["BlacklistItemNames"],
+      "members":{
+        "BlacklistItemNames":{
+          "shape":"BlacklistItemNames",
+          "documentation":"<p>A list of IP addresses that you want to retrieve blacklist information about. You can only specify the dedicated IP addresses that you use to send email using Amazon SES or Amazon Pinpoint.</p>",
+          "location":"querystring",
+          "locationName":"BlacklistItemNames"
+        }
+      },
+      "documentation":"<p>A request to retrieve a list of the blacklists that your dedicated IP addresses appear on.</p>"
+    },
+    "GetBlacklistReportsResponse":{
+      "type":"structure",
+      "required":["BlacklistReport"],
+      "members":{
+        "BlacklistReport":{
+          "shape":"BlacklistReport",
+          "documentation":"<p>An object that contains information about a blacklist that one of your dedicated IP addresses appears on.</p>"
+        }
+      },
+      "documentation":"<p>An object that contains information about blacklist events.</p>"
+    },
+    "GetConfigurationSetEventDestinationsRequest":{
+      "type":"structure",
+      "required":["ConfigurationSetName"],
+      "members":{
+        "ConfigurationSetName":{
+          "shape":"ConfigurationSetName",
+          "documentation":"<p>The name of the configuration set that contains the event destination.</p>",
+          "location":"uri",
+          "locationName":"ConfigurationSetName"
+        }
+      },
+      "documentation":"<p>A request to obtain information about the event destinations for a configuration set.</p>"
+    },
+    "GetConfigurationSetEventDestinationsResponse":{
+      "type":"structure",
+      "members":{
+        "EventDestinations":{
+          "shape":"EventDestinations",
+          "documentation":"<p>An array that includes all of the events destinations that have been configured for the configuration set.</p>"
+        }
+      },
+      "documentation":"<p>Information about an event destination for a configuration set.</p>"
+    },
+    "GetConfigurationSetRequest":{
+      "type":"structure",
+      "required":["ConfigurationSetName"],
+      "members":{
+        "ConfigurationSetName":{
+          "shape":"ConfigurationSetName",
+          "documentation":"<p>The name of the configuration set that you want to obtain more information about.</p>",
+          "location":"uri",
+          "locationName":"ConfigurationSetName"
+        }
+      },
+      "documentation":"<p>A request to obtain information about a configuration set.</p>"
+    },
+    "GetConfigurationSetResponse":{
+      "type":"structure",
+      "members":{
+        "ConfigurationSetName":{
+          "shape":"ConfigurationSetName",
+          "documentation":"<p>The name of the configuration set.</p>"
+        },
+        "TrackingOptions":{
+          "shape":"TrackingOptions",
+          "documentation":"<p>An object that defines the open and click tracking options for emails that you send using the configuration set.</p>"
+        },
+        "DeliveryOptions":{
+          "shape":"DeliveryOptions",
+          "documentation":"<p>An object that defines the dedicated IP pool that is used to send emails that you send using the configuration set.</p>"
+        },
+        "ReputationOptions":{
+          "shape":"ReputationOptions",
+          "documentation":"<p>An object that defines whether or not Amazon SES collects reputation metrics for the emails that you send that use the configuration set.</p>"
+        },
+        "SendingOptions":{
+          "shape":"SendingOptions",
+          "documentation":"<p>An object that defines whether or not Amazon SES can send email that you send using the configuration set.</p>"
+        },
+        "Tags":{
+          "shape":"TagList",
+          "documentation":"<p>An array of objects that define the tags (keys and values) that are associated with the configuration set.</p>"
+        },
+        "SuppressionOptions":{
+          "shape":"SuppressionOptions",
+          "documentation":"<p>An object that contains information about the suppression list preferences for your account.</p>"
+        }
+      },
+      "documentation":"<p>Information about a configuration set.</p>"
+    },
+    "GetDedicatedIpRequest":{
+      "type":"structure",
+      "required":["Ip"],
+      "members":{
+        "Ip":{
+          "shape":"Ip",
+          "documentation":"<p>The IP address that you want to obtain more information about. The value you specify has to be a dedicated IP address that's assocaited with your AWS account.</p>",
+          "location":"uri",
+          "locationName":"IP"
+        }
+      },
+      "documentation":"<p>A request to obtain more information about a dedicated IP address.</p>"
+    },
+    "GetDedicatedIpResponse":{
+      "type":"structure",
+      "members":{
+        "DedicatedIp":{
+          "shape":"DedicatedIp",
+          "documentation":"<p>An object that contains information about a dedicated IP address.</p>"
+        }
+      },
+      "documentation":"<p>Information about a dedicated IP address.</p>"
+    },
+    "GetDedicatedIpsRequest":{
+      "type":"structure",
+      "members":{
+        "PoolName":{
+          "shape":"PoolName",
+          "documentation":"<p>The name of the IP pool that the dedicated IP address is associated with.</p>",
+          "location":"querystring",
+          "locationName":"PoolName"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>A token returned from a previous call to <code>GetDedicatedIps</code> to indicate the position of the dedicated IP pool in the list of IP pools.</p>",
+          "location":"querystring",
+          "locationName":"NextToken"
+        },
+        "PageSize":{
+          "shape":"MaxItems",
+          "documentation":"<p>The number of results to show in a single call to <code>GetDedicatedIpsRequest</code>. If the number of results is larger than the number you specified in this parameter, then the response includes a <code>NextToken</code> element, which you can use to obtain additional results.</p>",
+          "location":"querystring",
+          "locationName":"PageSize"
+        }
+      },
+      "documentation":"<p>A request to obtain more information about dedicated IP pools.</p>"
+    },
+    "GetDedicatedIpsResponse":{
+      "type":"structure",
+      "members":{
+        "DedicatedIps":{
+          "shape":"DedicatedIpList",
+          "documentation":"<p>A list of dedicated IP addresses that are associated with your AWS account.</p>"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>A token that indicates that there are additional dedicated IP addresses to list. To view additional addresses, issue another request to <code>GetDedicatedIps</code>, passing this token in the <code>NextToken</code> parameter.</p>"
+        }
+      },
+      "documentation":"<p>Information about the dedicated IP addresses that are associated with your AWS account.</p>"
+    },
+    "GetDeliverabilityDashboardOptionsRequest":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>Retrieve information about the status of the Deliverability dashboard for your AWS account. When the Deliverability dashboard is enabled, you gain access to reputation, deliverability, and other metrics for your domains. You also gain the ability to perform predictive inbox placement tests.</p> <p>When you use the Deliverability dashboard, you pay a monthly subscription charge, in addition to any other fees that you accrue by using Amazon SES and other AWS services. For more information about the features and cost of a Deliverability dashboard subscription, see <a href=\"http://aws.amazon.com/pinpoint/pricing/\">Amazon Pinpoint Pricing</a>.</p>"
+    },
+    "GetDeliverabilityDashboardOptionsResponse":{
+      "type":"structure",
+      "required":["DashboardEnabled"],
+      "members":{
+        "DashboardEnabled":{
+          "shape":"Enabled",
+          "documentation":"<p>Specifies whether the Deliverability dashboard is enabled. If this value is <code>true</code>, the dashboard is enabled.</p>"
+        },
+        "SubscriptionExpiryDate":{
+          "shape":"Timestamp",
+          "documentation":"<p>The date, in Unix time format, when your current subscription to the Deliverability dashboard is scheduled to expire, if your subscription is scheduled to expire at the end of the current calendar month. This value is null if you have an active subscription that isn’t due to expire at the end of the month.</p>"
+        },
+        "AccountStatus":{
+          "shape":"DeliverabilityDashboardAccountStatus",
+          "documentation":"<p>The current status of your Deliverability dashboard subscription. If this value is <code>PENDING_EXPIRATION</code>, your subscription is scheduled to expire at the end of the current calendar month.</p>"
+        },
+        "ActiveSubscribedDomains":{
+          "shape":"DomainDeliverabilityTrackingOptions",
+          "documentation":"<p>An array of objects, one for each verified domain that you use to send email and currently has an active Deliverability dashboard subscription that isn’t scheduled to expire at the end of the current calendar month.</p>"
+        },
+        "PendingExpirationSubscribedDomains":{
+          "shape":"DomainDeliverabilityTrackingOptions",
+          "documentation":"<p>An array of objects, one for each verified domain that you use to send email and currently has an active Deliverability dashboard subscription that's scheduled to expire at the end of the current calendar month.</p>"
+        }
+      },
+      "documentation":"<p>An object that shows the status of the Deliverability dashboard.</p>"
+    },
+    "GetDeliverabilityTestReportRequest":{
+      "type":"structure",
+      "required":["ReportId"],
+      "members":{
+        "ReportId":{
+          "shape":"ReportId",
+          "documentation":"<p>A unique string that identifies the predictive inbox placement test.</p>",
+          "location":"uri",
+          "locationName":"ReportId"
+        }
+      },
+      "documentation":"<p>A request to retrieve the results of a predictive inbox placement test.</p>"
+    },
+    "GetDeliverabilityTestReportResponse":{
+      "type":"structure",
+      "required":[
+        "DeliverabilityTestReport",
+        "OverallPlacement",
+        "IspPlacements"
+      ],
+      "members":{
+        "DeliverabilityTestReport":{
+          "shape":"DeliverabilityTestReport",
+          "documentation":"<p>An object that contains the results of the predictive inbox placement test.</p>"
+        },
+        "OverallPlacement":{
+          "shape":"PlacementStatistics",
+          "documentation":"<p>An object that specifies how many test messages that were sent during the predictive inbox placement test were delivered to recipients' inboxes, how many were sent to recipients' spam folders, and how many weren't delivered.</p>"
+        },
+        "IspPlacements":{
+          "shape":"IspPlacements",
+          "documentation":"<p>An object that describes how the test email was handled by several email providers, including Gmail, Hotmail, Yahoo, AOL, and others.</p>"
+        },
+        "Message":{
+          "shape":"MessageContent",
+          "documentation":"<p>An object that contains the message that you sent when you performed this predictive inbox placement test.</p>"
+        },
+        "Tags":{
+          "shape":"TagList",
+          "documentation":"<p>An array of objects that define the tags (keys and values) that are associated with the predictive inbox placement test.</p>"
+        }
+      },
+      "documentation":"<p>The results of the predictive inbox placement test.</p>"
+    },
+    "GetDomainDeliverabilityCampaignRequest":{
+      "type":"structure",
+      "required":["CampaignId"],
+      "members":{
+        "CampaignId":{
+          "shape":"CampaignId",
+          "documentation":"<p>The unique identifier for the campaign. The Deliverability dashboard automatically generates and assigns this identifier to a campaign.</p>",
+          "location":"uri",
+          "locationName":"CampaignId"
+        }
+      },
+      "documentation":"<p>Retrieve all the deliverability data for a specific campaign. This data is available for a campaign only if the campaign sent email by using a domain that the Deliverability dashboard is enabled for (<code>PutDeliverabilityDashboardOption</code> operation).</p>"
+    },
+    "GetDomainDeliverabilityCampaignResponse":{
+      "type":"structure",
+      "required":["DomainDeliverabilityCampaign"],
+      "members":{
+        "DomainDeliverabilityCampaign":{
+          "shape":"DomainDeliverabilityCampaign",
+          "documentation":"<p>An object that contains the deliverability data for the campaign.</p>"
+        }
+      },
+      "documentation":"<p>An object that contains all the deliverability data for a specific campaign. This data is available for a campaign only if the campaign sent email by using a domain that the Deliverability dashboard is enabled for.</p>"
+    },
+    "GetDomainStatisticsReportRequest":{
+      "type":"structure",
+      "required":[
+        "Domain",
+        "StartDate",
+        "EndDate"
+      ],
+      "members":{
+        "Domain":{
+          "shape":"Identity",
+          "documentation":"<p>The domain that you want to obtain deliverability metrics for.</p>",
+          "location":"uri",
+          "locationName":"Domain"
+        },
+        "StartDate":{
+          "shape":"Timestamp",
+          "documentation":"<p>The first day (in Unix time) that you want to obtain domain deliverability metrics for.</p>",
+          "location":"querystring",
+          "locationName":"StartDate"
+        },
+        "EndDate":{
+          "shape":"Timestamp",
+          "documentation":"<p>The last day (in Unix time) that you want to obtain domain deliverability metrics for. The <code>EndDate</code> that you specify has to be less than or equal to 30 days after the <code>StartDate</code>.</p>",
+          "location":"querystring",
+          "locationName":"EndDate"
+        }
+      },
+      "documentation":"<p>A request to obtain deliverability metrics for a domain.</p>"
+    },
+    "GetDomainStatisticsReportResponse":{
+      "type":"structure",
+      "required":[
+        "OverallVolume",
+        "DailyVolumes"
+      ],
+      "members":{
+        "OverallVolume":{
+          "shape":"OverallVolume",
+          "documentation":"<p>An object that contains deliverability metrics for the domain that you specified. The data in this object is a summary of all of the data that was collected from the <code>StartDate</code> to the <code>EndDate</code>.</p>"
+        },
+        "DailyVolumes":{
+          "shape":"DailyVolumes",
+          "documentation":"<p>An object that contains deliverability metrics for the domain that you specified. This object contains data for each day, starting on the <code>StartDate</code> and ending on the <code>EndDate</code>.</p>"
+        }
+      },
+      "documentation":"<p>An object that includes statistics that are related to the domain that you specified.</p>"
+    },
+    "GetEmailIdentityRequest":{
+      "type":"structure",
+      "required":["EmailIdentity"],
+      "members":{
+        "EmailIdentity":{
+          "shape":"Identity",
+          "documentation":"<p>The email identity that you want to retrieve details for.</p>",
+          "location":"uri",
+          "locationName":"EmailIdentity"
+        }
+      },
+      "documentation":"<p>A request to return details about an email identity.</p>"
+    },
+    "GetEmailIdentityResponse":{
+      "type":"structure",
+      "members":{
+        "IdentityType":{
+          "shape":"IdentityType",
+          "documentation":"<p>The email identity type.</p>"
+        },
+        "FeedbackForwardingStatus":{
+          "shape":"Enabled",
+          "documentation":"<p>The feedback forwarding configuration for the identity.</p> <p>If the value is <code>true</code>, you receive email notifications when bounce or complaint events occur. These notifications are sent to the address that you specified in the <code>Return-Path</code> header of the original email.</p> <p>You're required to have a method of tracking bounces and complaints. If you haven't set up another mechanism for receiving bounce or complaint notifications (for example, by setting up an event destination), you receive an email notification when these events occur (even if this setting is disabled).</p>"
+        },
+        "VerifiedForSendingStatus":{
+          "shape":"Enabled",
+          "documentation":"<p>Specifies whether or not the identity is verified. You can only send email from verified email addresses or domains. For more information about verifying identities, see the <a href=\"https://docs.aws.amazon.com/pinpoint/latest/userguide/channels-email-manage-verify.html\">Amazon Pinpoint User Guide</a>.</p>"
+        },
+        "DkimAttributes":{
+          "shape":"DkimAttributes",
+          "documentation":"<p>An object that contains information about the DKIM attributes for the identity.</p>"
+        },
+        "MailFromAttributes":{
+          "shape":"MailFromAttributes",
+          "documentation":"<p>An object that contains information about the Mail-From attributes for the email identity.</p>"
+        },
+        "Tags":{
+          "shape":"TagList",
+          "documentation":"<p>An array of objects that define the tags (keys and values) that are associated with the email identity.</p>"
+        }
+      },
+      "documentation":"<p>Details about an email identity.</p>"
+    },
+    "GetSuppressedDestinationRequest":{
+      "type":"structure",
+      "required":["EmailAddress"],
+      "members":{
+        "EmailAddress":{
+          "shape":"EmailAddress",
+          "documentation":"<p>The email address that's on the account suppression list.</p>",
+          "location":"uri",
+          "locationName":"EmailAddress"
+        }
+      },
+      "documentation":"<p>A request to retrieve information about an email address that's on the suppression list for your account.</p>"
+    },
+    "GetSuppressedDestinationResponse":{
+      "type":"structure",
+      "required":["SuppressedDestination"],
+      "members":{
+        "SuppressedDestination":{
+          "shape":"SuppressedDestination",
+          "documentation":"<p>An object containing information about the suppressed email address.</p>"
+        }
+      },
+      "documentation":"<p>Information about the suppressed email address.</p>"
+    },
+    "Identity":{"type":"string"},
+    "IdentityInfo":{
+      "type":"structure",
+      "members":{
+        "IdentityType":{
+          "shape":"IdentityType",
+          "documentation":"<p>The email identity type. The identity type can be one of the following:</p> <ul> <li> <p> <code>EMAIL_ADDRESS</code> – The identity is an email address.</p> </li> <li> <p> <code>DOMAIN</code> – The identity is a domain.</p> </li> <li> <p> <code>MANAGED_DOMAIN</code> – The identity is a domain that is managed by AWS.</p> </li> </ul>"
+        },
+        "IdentityName":{
+          "shape":"Identity",
+          "documentation":"<p>The address or domain of the identity.</p>"
+        },
+        "SendingEnabled":{
+          "shape":"Enabled",
+          "documentation":"<p>Indicates whether or not you can send email from the identity.</p> <p>An <i>identity</i> is an email address or domain that you send email from. Before you can send email from an identity, you have to demostrate that you own the identity, and that you authorize Amazon SES to send email from that identity.</p>"
+        }
+      },
+      "documentation":"<p>Information about an email identity.</p>"
+    },
+    "IdentityInfoList":{
+      "type":"list",
+      "member":{"shape":"IdentityInfo"}
+    },
+    "IdentityType":{
+      "type":"string",
+      "documentation":"<p>The email identity type. The identity type can be one of the following:</p> <ul> <li> <p> <code>EMAIL_ADDRESS</code> – The identity is an email address.</p> </li> <li> <p> <code>DOMAIN</code> – The identity is a domain.</p> </li> </ul>",
+      "enum":[
+        "EMAIL_ADDRESS",
+        "DOMAIN",
+        "MANAGED_DOMAIN"
+      ]
+    },
+    "ImageUrl":{"type":"string"},
+    "InboxPlacementTrackingOption":{
+      "type":"structure",
+      "members":{
+        "Global":{
+          "shape":"Enabled",
+          "documentation":"<p>Specifies whether inbox placement data is being tracked for the domain.</p>"
+        },
+        "TrackedIsps":{
+          "shape":"IspNameList",
+          "documentation":"<p>An array of strings, one for each major email provider that the inbox placement data applies to.</p>"
+        }
+      },
+      "documentation":"<p>An object that contains information about the inbox placement data settings for a verified domain that’s associated with your AWS account. This data is available only if you enabled the Deliverability dashboard for the domain.</p>"
+    },
+    "InvalidNextTokenException":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>The specified request includes an invalid or expired token.</p>",
+      "error":{"httpStatusCode":400},
+      "exception":true
+    },
+    "Ip":{
+      "type":"string",
+      "documentation":"<p>An IPv4 address.</p>"
+    },
+    "IpList":{
+      "type":"list",
+      "member":{"shape":"Ip"}
+    },
+    "IspName":{
+      "type":"string",
+      "documentation":"<p>The name of an email provider.</p>"
+    },
+    "IspNameList":{
+      "type":"list",
+      "member":{"shape":"IspName"}
+    },
+    "IspPlacement":{
+      "type":"structure",
+      "members":{
+        "IspName":{
+          "shape":"IspName",
+          "documentation":"<p>The name of the email provider that the inbox placement data applies to.</p>"
+        },
+        "PlacementStatistics":{
+          "shape":"PlacementStatistics",
+          "documentation":"<p>An object that contains inbox placement metrics for a specific email provider.</p>"
+        }
+      },
+      "documentation":"<p>An object that describes how email sent during the predictive inbox placement test was handled by a certain email provider.</p>"
+    },
+    "IspPlacements":{
+      "type":"list",
+      "member":{"shape":"IspPlacement"}
+    },
+    "KinesisFirehoseDestination":{
+      "type":"structure",
+      "required":[
+        "IamRoleArn",
+        "DeliveryStreamArn"
+      ],
+      "members":{
+        "IamRoleArn":{
+          "shape":"AmazonResourceName",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the IAM role that the Amazon SES API v2 uses to send email events to the Amazon Kinesis Data Firehose stream.</p>"
+        },
+        "DeliveryStreamArn":{
+          "shape":"AmazonResourceName",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the Amazon Kinesis Data Firehose stream that the Amazon SES API v2 sends email events to.</p>"
+        }
+      },
+      "documentation":"<p>An object that defines an Amazon Kinesis Data Firehose destination for email events. You can use Amazon Kinesis Data Firehose to stream data to other services, such as Amazon S3 and Amazon Redshift.</p>"
+    },
+    "LastFreshStart":{
+      "type":"timestamp",
+      "documentation":"<p>The date and time (in Unix time) when the reputation metrics were last given a fresh start. When your account is given a fresh start, your reputation metrics are calculated starting from the date of the fresh start.</p>"
+    },
+    "LimitExceededException":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>There are too many instances of the specified resource type.</p>",
+      "error":{"httpStatusCode":400},
+      "exception":true
+    },
+    "ListConfigurationSetsRequest":{
+      "type":"structure",
+      "members":{
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>A token returned from a previous call to <code>ListConfigurationSets</code> to indicate the position in the list of configuration sets.</p>",
+          "location":"querystring",
+          "locationName":"NextToken"
+        },
+        "PageSize":{
+          "shape":"MaxItems",
+          "documentation":"<p>The number of results to show in a single call to <code>ListConfigurationSets</code>. If the number of results is larger than the number you specified in this parameter, then the response includes a <code>NextToken</code> element, which you can use to obtain additional results.</p>",
+          "location":"querystring",
+          "locationName":"PageSize"
+        }
+      },
+      "documentation":"<p>A request to obtain a list of configuration sets for your Amazon SES account in the current AWS Region.</p>"
+    },
+    "ListConfigurationSetsResponse":{
+      "type":"structure",
+      "members":{
+        "ConfigurationSets":{
+          "shape":"ConfigurationSetNameList",
+          "documentation":"<p>An array that contains all of the configuration sets in your Amazon SES account in the current AWS Region.</p>"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>A token that indicates that there are additional configuration sets to list. To view additional configuration sets, issue another request to <code>ListConfigurationSets</code>, and pass this token in the <code>NextToken</code> parameter.</p>"
+        }
+      },
+      "documentation":"<p>A list of configuration sets in your Amazon SES account in the current AWS Region.</p>"
+    },
+    "ListDedicatedIpPoolsRequest":{
+      "type":"structure",
+      "members":{
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>A token returned from a previous call to <code>ListDedicatedIpPools</code> to indicate the position in the list of dedicated IP pools.</p>",
+          "location":"querystring",
+          "locationName":"NextToken"
+        },
+        "PageSize":{
+          "shape":"MaxItems",
+          "documentation":"<p>The number of results to show in a single call to <code>ListDedicatedIpPools</code>. If the number of results is larger than the number you specified in this parameter, then the response includes a <code>NextToken</code> element, which you can use to obtain additional results.</p>",
+          "location":"querystring",
+          "locationName":"PageSize"
+        }
+      },
+      "documentation":"<p>A request to obtain a list of dedicated IP pools.</p>"
+    },
+    "ListDedicatedIpPoolsResponse":{
+      "type":"structure",
+      "members":{
+        "DedicatedIpPools":{
+          "shape":"ListOfDedicatedIpPools",
+          "documentation":"<p>A list of all of the dedicated IP pools that are associated with your AWS account in the current Region.</p>"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>A token that indicates that there are additional IP pools to list. To view additional IP pools, issue another request to <code>ListDedicatedIpPools</code>, passing this token in the <code>NextToken</code> parameter.</p>"
+        }
+      },
+      "documentation":"<p>A list of dedicated IP pools.</p>"
+    },
+    "ListDeliverabilityTestReportsRequest":{
+      "type":"structure",
+      "members":{
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>A token returned from a previous call to <code>ListDeliverabilityTestReports</code> to indicate the position in the list of predictive inbox placement tests.</p>",
+          "location":"querystring",
+          "locationName":"NextToken"
+        },
+        "PageSize":{
+          "shape":"MaxItems",
+          "documentation":"<p>The number of results to show in a single call to <code>ListDeliverabilityTestReports</code>. If the number of results is larger than the number you specified in this parameter, then the response includes a <code>NextToken</code> element, which you can use to obtain additional results.</p> <p>The value you specify has to be at least 0, and can be no more than 1000.</p>",
+          "location":"querystring",
+          "locationName":"PageSize"
+        }
+      },
+      "documentation":"<p>A request to list all of the predictive inbox placement tests that you've performed.</p>"
+    },
+    "ListDeliverabilityTestReportsResponse":{
+      "type":"structure",
+      "required":["DeliverabilityTestReports"],
+      "members":{
+        "DeliverabilityTestReports":{
+          "shape":"DeliverabilityTestReports",
+          "documentation":"<p>An object that contains a lists of predictive inbox placement tests that you've performed.</p>"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>A token that indicates that there are additional predictive inbox placement tests to list. To view additional predictive inbox placement tests, issue another request to <code>ListDeliverabilityTestReports</code>, and pass this token in the <code>NextToken</code> parameter.</p>"
+        }
+      },
+      "documentation":"<p>A list of the predictive inbox placement test reports that are available for your account, regardless of whether or not those tests are complete.</p>"
+    },
+    "ListDomainDeliverabilityCampaignsRequest":{
+      "type":"structure",
+      "required":[
+        "StartDate",
+        "EndDate",
+        "SubscribedDomain"
+      ],
+      "members":{
+        "StartDate":{
+          "shape":"Timestamp",
+          "documentation":"<p>The first day, in Unix time format, that you want to obtain deliverability data for.</p>",
+          "location":"querystring",
+          "locationName":"StartDate"
+        },
+        "EndDate":{
+          "shape":"Timestamp",
+          "documentation":"<p>The last day, in Unix time format, that you want to obtain deliverability data for. This value has to be less than or equal to 30 days after the value of the <code>StartDate</code> parameter.</p>",
+          "location":"querystring",
+          "locationName":"EndDate"
+        },
+        "SubscribedDomain":{
+          "shape":"Domain",
+          "documentation":"<p>The domain to obtain deliverability data for.</p>",
+          "location":"uri",
+          "locationName":"SubscribedDomain"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>A token that’s returned from a previous call to the <code>ListDomainDeliverabilityCampaigns</code> operation. This token indicates the position of a campaign in the list of campaigns.</p>",
+          "location":"querystring",
+          "locationName":"NextToken"
+        },
+        "PageSize":{
+          "shape":"MaxItems",
+          "documentation":"<p>The maximum number of results to include in response to a single call to the <code>ListDomainDeliverabilityCampaigns</code> operation. If the number of results is larger than the number that you specify in this parameter, the response includes a <code>NextToken</code> element, which you can use to obtain additional results.</p>",
+          "location":"querystring",
+          "locationName":"PageSize"
+        }
+      },
+      "documentation":"<p>Retrieve deliverability data for all the campaigns that used a specific domain to send email during a specified time range. This data is available for a domain only if you enabled the Deliverability dashboard.</p>"
+    },
+    "ListDomainDeliverabilityCampaignsResponse":{
+      "type":"structure",
+      "required":["DomainDeliverabilityCampaigns"],
+      "members":{
+        "DomainDeliverabilityCampaigns":{
+          "shape":"DomainDeliverabilityCampaignList",
+          "documentation":"<p>An array of responses, one for each campaign that used the domain to send email during the specified time range.</p>"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>A token that’s returned from a previous call to the <code>ListDomainDeliverabilityCampaigns</code> operation. This token indicates the position of the campaign in the list of campaigns.</p>"
+        }
+      },
+      "documentation":"<p>An array of objects that provide deliverability data for all the campaigns that used a specific domain to send email during a specified time range. This data is available for a domain only if you enabled the Deliverability dashboard for the domain.</p>"
+    },
+    "ListEmailIdentitiesRequest":{
+      "type":"structure",
+      "members":{
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>A token returned from a previous call to <code>ListEmailIdentities</code> to indicate the position in the list of identities.</p>",
+          "location":"querystring",
+          "locationName":"NextToken"
+        },
+        "PageSize":{
+          "shape":"MaxItems",
+          "documentation":"<p>The number of results to show in a single call to <code>ListEmailIdentities</code>. If the number of results is larger than the number you specified in this parameter, then the response includes a <code>NextToken</code> element, which you can use to obtain additional results.</p> <p>The value you specify has to be at least 0, and can be no more than 1000.</p>",
+          "location":"querystring",
+          "locationName":"PageSize"
+        }
+      },
+      "documentation":"<p>A request to list all of the email identities associated with your AWS account. This list includes identities that you've already verified, identities that are unverified, and identities that were verified in the past, but are no longer verified.</p>"
+    },
+    "ListEmailIdentitiesResponse":{
+      "type":"structure",
+      "members":{
+        "EmailIdentities":{
+          "shape":"IdentityInfoList",
+          "documentation":"<p>An array that includes all of the email identities associated with your AWS account.</p>"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>A token that indicates that there are additional configuration sets to list. To view additional configuration sets, issue another request to <code>ListEmailIdentities</code>, and pass this token in the <code>NextToken</code> parameter.</p>"
+        }
+      },
+      "documentation":"<p>A list of all of the identities that you've attempted to verify, regardless of whether or not those identities were successfully verified.</p>"
+    },
+    "ListOfDedicatedIpPools":{
+      "type":"list",
+      "member":{"shape":"PoolName"},
+      "documentation":"<p>A list of dedicated IP pools that are associated with your AWS account.</p>"
+    },
+    "ListSuppressedDestinationsRequest":{
+      "type":"structure",
+      "members":{
+        "Reasons":{
+          "shape":"SuppressionListReasons",
+          "documentation":"<p>The factors that caused the email address to be added to .</p>",
+          "location":"querystring",
+          "locationName":"Reason"
+        },
+        "StartDate":{
+          "shape":"Timestamp",
+          "documentation":"<p>Used to filter the list of suppressed email destinations so that it only includes addresses that were added to the list after a specific date. The date that you specify should be in Unix time format.</p>",
+          "location":"querystring",
+          "locationName":"StartDate"
+        },
+        "EndDate":{
+          "shape":"Timestamp",
+          "documentation":"<p>Used to filter the list of suppressed email destinations so that it only includes addresses that were added to the list before a specific date. The date that you specify should be in Unix time format.</p>",
+          "location":"querystring",
+          "locationName":"EndDate"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>A token returned from a previous call to <code>ListSuppressedDestinations</code> to indicate the position in the list of suppressed email addresses.</p>",
+          "location":"querystring",
+          "locationName":"NextToken"
+        },
+        "PageSize":{
+          "shape":"MaxItems",
+          "documentation":"<p>The number of results to show in a single call to <code>ListSuppressedDestinations</code>. If the number of results is larger than the number you specified in this parameter, then the response includes a <code>NextToken</code> element, which you can use to obtain additional results.</p>",
+          "location":"querystring",
+          "locationName":"PageSize"
+        }
+      },
+      "documentation":"<p>A request to obtain a list of email destinations that are on the suppression list for your account.</p>"
+    },
+    "ListSuppressedDestinationsResponse":{
+      "type":"structure",
+      "members":{
+        "SuppressedDestinationSummaries":{
+          "shape":"SuppressedDestinationSummaries",
+          "documentation":"<p>A list of summaries, each containing a summary for a suppressed email destination.</p>"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>A token that indicates that there are additional email addresses on the suppression list for your account. To view additional suppressed addresses, issue another request to <code>ListSuppressedDestinations</code>, and pass this token in the <code>NextToken</code> parameter.</p>"
+        }
+      },
+      "documentation":"<p>A list of suppressed email addresses.</p>"
+    },
+    "ListTagsForResourceRequest":{
+      "type":"structure",
+      "required":["ResourceArn"],
+      "members":{
+        "ResourceArn":{
+          "shape":"AmazonResourceName",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the resource that you want to retrieve tag information for.</p>",
+          "location":"querystring",
+          "locationName":"ResourceArn"
+        }
+      }
+    },
+    "ListTagsForResourceResponse":{
+      "type":"structure",
+      "required":["Tags"],
+      "members":{
+        "Tags":{
+          "shape":"TagList",
+          "documentation":"<p>An array that lists all the tags that are associated with the resource. Each tag consists of a required tag key (<code>Key</code>) and an associated tag value (<code>Value</code>)</p>"
+        }
+      }
+    },
+    "MailFromAttributes":{
+      "type":"structure",
+      "required":[
+        "MailFromDomain",
+        "MailFromDomainStatus",
+        "BehaviorOnMxFailure"
+      ],
+      "members":{
+        "MailFromDomain":{
+          "shape":"MailFromDomainName",
+          "documentation":"<p>The name of a domain that an email identity uses as a custom MAIL FROM domain.</p>"
+        },
+        "MailFromDomainStatus":{
+          "shape":"MailFromDomainStatus",
+          "documentation":"<p>The status of the MAIL FROM domain. This status can have the following values:</p> <ul> <li> <p> <code>PENDING</code> – Amazon SES hasn't started searching for the MX record yet.</p> </li> <li> <p> <code>SUCCESS</code> – Amazon SES detected the required MX record for the MAIL FROM domain.</p> </li> <li> <p> <code>FAILED</code> – Amazon SES can't find the required MX record, or the record no longer exists.</p> </li> <li> <p> <code>TEMPORARY_FAILURE</code> – A temporary issue occurred, which prevented Amazon SES from determining the status of the MAIL FROM domain.</p> </li> </ul>"
+        },
+        "BehaviorOnMxFailure":{
+          "shape":"BehaviorOnMxFailure",
+          "documentation":"<p>The action that you want to take if the required MX record can't be found when you send an email. When you set this value to <code>UseDefaultValue</code>, the mail is sent using <i>amazonses.com</i> as the MAIL FROM domain. When you set this value to <code>RejectMessage</code>, the Amazon SES API v2 returns a <code>MailFromDomainNotVerified</code> error, and doesn't attempt to deliver the email.</p> <p>These behaviors are taken when the custom MAIL FROM domain configuration is in the <code>Pending</code>, <code>Failed</code>, and <code>TemporaryFailure</code> states.</p>"
+        }
+      },
+      "documentation":"<p>A list of attributes that are associated with a MAIL FROM domain.</p>"
+    },
+    "MailFromDomainName":{
+      "type":"string",
+      "documentation":"<p>The domain that you want to use as a MAIL FROM domain.</p>"
+    },
+    "MailFromDomainNotVerifiedException":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>The message can't be sent because the sending domain isn't verified.</p>",
+      "error":{"httpStatusCode":400},
+      "exception":true
+    },
+    "MailFromDomainStatus":{
+      "type":"string",
+      "documentation":"<p>The status of the MAIL FROM domain. This status can have the following values:</p> <ul> <li> <p> <code>PENDING</code> – Amazon SES hasn't started searching for the MX record yet.</p> </li> <li> <p> <code>SUCCESS</code> – Amazon SES detected the required MX record for the MAIL FROM domain.</p> </li> <li> <p> <code>FAILED</code> – Amazon SES can't find the required MX record, or the record no longer exists.</p> </li> <li> <p> <code>TEMPORARY_FAILURE</code> – A temporary issue occurred, which prevented Amazon SES from determining the status of the MAIL FROM domain.</p> </li> </ul>",
+      "enum":[
+        "PENDING",
+        "SUCCESS",
+        "FAILED",
+        "TEMPORARY_FAILURE"
+      ]
+    },
+    "Max24HourSend":{"type":"double"},
+    "MaxItems":{"type":"integer"},
+    "MaxSendRate":{"type":"double"},
+    "Message":{
+      "type":"structure",
+      "required":[
+        "Subject",
+        "Body"
+      ],
+      "members":{
+        "Subject":{
+          "shape":"Content",
+          "documentation":"<p>The subject line of the email. The subject line can only contain 7-bit ASCII characters. However, you can specify non-ASCII characters in the subject line by using encoded-word syntax, as described in <a href=\"https://tools.ietf.org/html/rfc2047\">RFC 2047</a>.</p>"
+        },
+        "Body":{
+          "shape":"Body",
+          "documentation":"<p>The body of the message. You can specify an HTML version of the message, a text-only version of the message, or both.</p>"
+        }
+      },
+      "documentation":"<p>Represents the email message that you're sending. The <code>Message</code> object consists of a subject line and a message body.</p>"
+    },
+    "MessageContent":{
+      "type":"string",
+      "documentation":"<p>The body of an email message.</p>"
+    },
+    "MessageData":{"type":"string"},
+    "MessageRejected":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>The message can't be sent because it contains invalid content.</p>",
+      "error":{"httpStatusCode":400},
+      "exception":true
+    },
+    "MessageTag":{
+      "type":"structure",
+      "required":[
+        "Name",
+        "Value"
+      ],
+      "members":{
+        "Name":{
+          "shape":"MessageTagName",
+          "documentation":"<p>The name of the message tag. The message tag name has to meet the following criteria:</p> <ul> <li> <p>It can only contain ASCII letters (a–z, A–Z), numbers (0–9), underscores (_), or dashes (-).</p> </li> <li> <p>It can contain no more than 256 characters.</p> </li> </ul>"
+        },
+        "Value":{
+          "shape":"MessageTagValue",
+          "documentation":"<p>The value of the message tag. The message tag value has to meet the following criteria:</p> <ul> <li> <p>It can only contain ASCII letters (a–z, A–Z), numbers (0–9), underscores (_), or dashes (-).</p> </li> <li> <p>It can contain no more than 256 characters.</p> </li> </ul>"
+        }
+      },
+      "documentation":"<p>Contains the name and value of a tag that you apply to an email. You can use message tags when you publish email sending events. </p>"
+    },
+    "MessageTagList":{
+      "type":"list",
+      "member":{"shape":"MessageTag"},
+      "documentation":"<p>A list of message tags.</p>"
+    },
+    "MessageTagName":{
+      "type":"string",
+      "documentation":"<p>The name of the message tag. The message tag name has to meet the following criteria:</p> <ul> <li> <p>It can only contain ASCII letters (a–z, A–Z), numbers (0–9), underscores (_), or dashes (-).</p> </li> <li> <p>It can contain no more than 256 characters.</p> </li> </ul>"
+    },
+    "MessageTagValue":{
+      "type":"string",
+      "documentation":"<p>The value of the message tag. The message tag value has to meet the following criteria:</p> <ul> <li> <p>It can only contain ASCII letters (a–z, A–Z), numbers (0–9), underscores (_), or dashes (-).</p> </li> <li> <p>It can contain no more than 256 characters.</p> </li> </ul>"
+    },
+    "NextToken":{"type":"string"},
+    "NotFoundException":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>The resource you attempted to access doesn't exist.</p>",
+      "error":{"httpStatusCode":404},
+      "exception":true
+    },
+    "OutboundMessageId":{"type":"string"},
+    "OverallVolume":{
+      "type":"structure",
+      "members":{
+        "VolumeStatistics":{
+          "shape":"VolumeStatistics",
+          "documentation":"<p>An object that contains information about the numbers of messages that arrived in recipients' inboxes and junk mail folders.</p>"
+        },
+        "ReadRatePercent":{
+          "shape":"Percentage",
+          "documentation":"<p>The percentage of emails that were sent from the domain that were read by their recipients.</p>"
+        },
+        "DomainIspPlacements":{
+          "shape":"DomainIspPlacements",
+          "documentation":"<p>An object that contains inbox and junk mail placement metrics for individual email providers.</p>"
+        }
+      },
+      "documentation":"<p>An object that contains information about email that was sent from the selected domain.</p>"
+    },
+    "Percentage":{
+      "type":"double",
+      "documentation":"<p>An object that contains information about inbox placement percentages.</p>"
+    },
+    "Percentage100Wrapper":{"type":"integer"},
+    "PinpointDestination":{
+      "type":"structure",
+      "members":{
+        "ApplicationArn":{
+          "shape":"AmazonResourceName",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the Amazon Pinpoint project that you want to send email events to.</p>"
+        }
+      },
+      "documentation":"<p>An object that defines an Amazon Pinpoint project destination for email events. You can send email event data to a Amazon Pinpoint project to view metrics using the Transactional Messaging dashboards that are built in to Amazon Pinpoint. For more information, see <a href=\"https://docs.aws.amazon.com/pinpoint/latest/userguide/analytics-transactional-messages.html\">Transactional Messaging Charts</a> in the <i>Amazon Pinpoint User Guide</i>.</p>"
+    },
+    "PlacementStatistics":{
+      "type":"structure",
+      "members":{
+        "InboxPercentage":{
+          "shape":"Percentage",
+          "documentation":"<p>The percentage of emails that arrived in recipients' inboxes during the predictive inbox placement test.</p>"
+        },
+        "SpamPercentage":{
+          "shape":"Percentage",
+          "documentation":"<p>The percentage of emails that arrived in recipients' spam or junk mail folders during the predictive inbox placement test.</p>"
+        },
+        "MissingPercentage":{
+          "shape":"Percentage",
+          "documentation":"<p>The percentage of emails that didn't arrive in recipients' inboxes at all during the predictive inbox placement test.</p>"
+        },
+        "SpfPercentage":{
+          "shape":"Percentage",
+          "documentation":"<p>The percentage of emails that were authenticated by using Sender Policy Framework (SPF) during the predictive inbox placement test.</p>"
+        },
+        "DkimPercentage":{
+          "shape":"Percentage",
+          "documentation":"<p>The percentage of emails that were authenticated by using DomainKeys Identified Mail (DKIM) during the predictive inbox placement test.</p>"
+        }
+      },
+      "documentation":"<p>An object that contains inbox placement data for an email provider.</p>"
+    },
+    "PoolName":{
+      "type":"string",
+      "documentation":"<p>The name of a dedicated IP pool.</p>"
+    },
+    "PrivateKey":{
+      "type":"string",
+      "max":20480,
+      "min":1,
+      "pattern":"^[a-zA-Z0-9+\\/]+={0,2}$",
+      "sensitive":true
+    },
+    "PutAccountDedicatedIpWarmupAttributesRequest":{
+      "type":"structure",
+      "members":{
+        "AutoWarmupEnabled":{
+          "shape":"Enabled",
+          "documentation":"<p>Enables or disables the automatic warm-up feature for dedicated IP addresses that are associated with your Amazon SES account in the current AWS Region. Set to <code>true</code> to enable the automatic warm-up feature, or set to <code>false</code> to disable it.</p>"
+        }
+      },
+      "documentation":"<p>A request to enable or disable the automatic IP address warm-up feature.</p>"
+    },
+    "PutAccountDedicatedIpWarmupAttributesResponse":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>An HTTP 200 response if the request succeeds, or an error message if the request fails.</p>"
+    },
+    "PutAccountSendingAttributesRequest":{
+      "type":"structure",
+      "members":{
+        "SendingEnabled":{
+          "shape":"Enabled",
+          "documentation":"<p>Enables or disables your account's ability to send email. Set to <code>true</code> to enable email sending, or set to <code>false</code> to disable email sending.</p> <note> <p>If AWS paused your account's ability to send email, you can't use this operation to resume your account's ability to send email.</p> </note>"
+        }
+      },
+      "documentation":"<p>A request to change the ability of your account to send email.</p>"
+    },
+    "PutAccountSendingAttributesResponse":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>An HTTP 200 response if the request succeeds, or an error message if the request fails.</p>"
+    },
+    "PutAccountSuppressionAttributesRequest":{
+      "type":"structure",
+      "members":{
+        "SuppressedReasons":{
+          "shape":"SuppressionListReasons",
+          "documentation":"<p>A list that contains the reasons that email addresses will be automatically added to the suppression list for your account. This list can contain any or all of the following:</p> <ul> <li> <p> <code>COMPLAINT</code> – Amazon SES adds an email address to the suppression list for your account when a message sent to that address results in a complaint.</p> </li> <li> <p> <code>BOUNCE</code> – Amazon SES adds an email address to the suppression list for your account when a message sent to that address results in a hard bounce.</p> </li> </ul>"
+        }
+      },
+      "documentation":"<p>A request to change your account's suppression preferences.</p>"
+    },
+    "PutAccountSuppressionAttributesResponse":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>An HTTP 200 response if the request succeeds, or an error message if the request fails.</p>"
+    },
+    "PutConfigurationSetDeliveryOptionsRequest":{
+      "type":"structure",
+      "required":["ConfigurationSetName"],
+      "members":{
+        "ConfigurationSetName":{
+          "shape":"ConfigurationSetName",
+          "documentation":"<p>The name of the configuration set that you want to associate with a dedicated IP pool.</p>",
+          "location":"uri",
+          "locationName":"ConfigurationSetName"
+        },
+        "TlsPolicy":{
+          "shape":"TlsPolicy",
+          "documentation":"<p>Specifies whether messages that use the configuration set are required to use Transport Layer Security (TLS). If the value is <code>Require</code>, messages are only delivered if a TLS connection can be established. If the value is <code>Optional</code>, messages can be delivered in plain text if a TLS connection can't be established.</p>"
+        },
+        "SendingPoolName":{
+          "shape":"SendingPoolName",
+          "documentation":"<p>The name of the dedicated IP pool that you want to associate with the configuration set.</p>"
+        }
+      },
+      "documentation":"<p>A request to associate a configuration set with a dedicated IP pool.</p>"
+    },
+    "PutConfigurationSetDeliveryOptionsResponse":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>An HTTP 200 response if the request succeeds, or an error message if the request fails.</p>"
+    },
+    "PutConfigurationSetReputationOptionsRequest":{
+      "type":"structure",
+      "required":["ConfigurationSetName"],
+      "members":{
+        "ConfigurationSetName":{
+          "shape":"ConfigurationSetName",
+          "documentation":"<p>The name of the configuration set that you want to enable or disable reputation metric tracking for.</p>",
+          "location":"uri",
+          "locationName":"ConfigurationSetName"
+        },
+        "ReputationMetricsEnabled":{
+          "shape":"Enabled",
+          "documentation":"<p>If <code>true</code>, tracking of reputation metrics is enabled for the configuration set. If <code>false</code>, tracking of reputation metrics is disabled for the configuration set.</p>"
+        }
+      },
+      "documentation":"<p>A request to enable or disable tracking of reputation metrics for a configuration set.</p>"
+    },
+    "PutConfigurationSetReputationOptionsResponse":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>An HTTP 200 response if the request succeeds, or an error message if the request fails.</p>"
+    },
+    "PutConfigurationSetSendingOptionsRequest":{
+      "type":"structure",
+      "required":["ConfigurationSetName"],
+      "members":{
+        "ConfigurationSetName":{
+          "shape":"ConfigurationSetName",
+          "documentation":"<p>The name of the configuration set that you want to enable or disable email sending for.</p>",
+          "location":"uri",
+          "locationName":"ConfigurationSetName"
+        },
+        "SendingEnabled":{
+          "shape":"Enabled",
+          "documentation":"<p>If <code>true</code>, email sending is enabled for the configuration set. If <code>false</code>, email sending is disabled for the configuration set.</p>"
+        }
+      },
+      "documentation":"<p>A request to enable or disable the ability of Amazon SES to send emails that use a specific configuration set.</p>"
+    },
+    "PutConfigurationSetSendingOptionsResponse":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>An HTTP 200 response if the request succeeds, or an error message if the request fails.</p>"
+    },
+    "PutConfigurationSetSuppressionOptionsRequest":{
+      "type":"structure",
+      "required":["ConfigurationSetName"],
+      "members":{
+        "ConfigurationSetName":{
+          "shape":"ConfigurationSetName",
+          "documentation":"<p>The name of the configuration set that you want to change the suppression list preferences for.</p>",
+          "location":"uri",
+          "locationName":"ConfigurationSetName"
+        },
+        "SuppressedReasons":{
+          "shape":"SuppressionListReasons",
+          "documentation":"<p>A list that contains the reasons that email addresses are automatically added to the suppression list for your account. This list can contain any or all of the following:</p> <ul> <li> <p> <code>COMPLAINT</code> – Amazon SES adds an email address to the suppression list for your account when a message sent to that address results in a complaint.</p> </li> <li> <p> <code>BOUNCE</code> – Amazon SES adds an email address to the suppression list for your account when a message sent to that address results in a hard bounce.</p> </li> </ul>"
+        }
+      },
+      "documentation":"<p>A request to change the account suppression list preferences for a specific configuration set.</p>"
+    },
+    "PutConfigurationSetSuppressionOptionsResponse":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>An HTTP 200 response if the request succeeds, or an error message if the request fails.</p>"
+    },
+    "PutConfigurationSetTrackingOptionsRequest":{
+      "type":"structure",
+      "required":["ConfigurationSetName"],
+      "members":{
+        "ConfigurationSetName":{
+          "shape":"ConfigurationSetName",
+          "documentation":"<p>The name of the configuration set that you want to add a custom tracking domain to.</p>",
+          "location":"uri",
+          "locationName":"ConfigurationSetName"
+        },
+        "CustomRedirectDomain":{
+          "shape":"CustomRedirectDomain",
+          "documentation":"<p>The domain that you want to use to track open and click events.</p>"
+        }
+      },
+      "documentation":"<p>A request to add a custom domain for tracking open and click events to a configuration set.</p>"
+    },
+    "PutConfigurationSetTrackingOptionsResponse":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>An HTTP 200 response if the request succeeds, or an error message if the request fails.</p>"
+    },
+    "PutDedicatedIpInPoolRequest":{
+      "type":"structure",
+      "required":[
+        "Ip",
+        "DestinationPoolName"
+      ],
+      "members":{
+        "Ip":{
+          "shape":"Ip",
+          "documentation":"<p>The IP address that you want to move to the dedicated IP pool. The value you specify has to be a dedicated IP address that's associated with your AWS account.</p>",
+          "location":"uri",
+          "locationName":"IP"
+        },
+        "DestinationPoolName":{
+          "shape":"PoolName",
+          "documentation":"<p>The name of the IP pool that you want to add the dedicated IP address to. You have to specify an IP pool that already exists.</p>"
+        }
+      },
+      "documentation":"<p>A request to move a dedicated IP address to a dedicated IP pool.</p>"
+    },
+    "PutDedicatedIpInPoolResponse":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>An HTTP 200 response if the request succeeds, or an error message if the request fails.</p>"
+    },
+    "PutDedicatedIpWarmupAttributesRequest":{
+      "type":"structure",
+      "required":[
+        "Ip",
+        "WarmupPercentage"
+      ],
+      "members":{
+        "Ip":{
+          "shape":"Ip",
+          "documentation":"<p>The dedicated IP address that you want to update the warm-up attributes for.</p>",
+          "location":"uri",
+          "locationName":"IP"
+        },
+        "WarmupPercentage":{
+          "shape":"Percentage100Wrapper",
+          "documentation":"<p>The warm-up percentage that you want to associate with the dedicated IP address.</p>"
+        }
+      },
+      "documentation":"<p>A request to change the warm-up attributes for a dedicated IP address. This operation is useful when you want to resume the warm-up process for an existing IP address.</p>"
+    },
+    "PutDedicatedIpWarmupAttributesResponse":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>An HTTP 200 response if the request succeeds, or an error message if the request fails.</p>"
+    },
+    "PutDeliverabilityDashboardOptionRequest":{
+      "type":"structure",
+      "required":["DashboardEnabled"],
+      "members":{
+        "DashboardEnabled":{
+          "shape":"Enabled",
+          "documentation":"<p>Specifies whether to enable the Deliverability dashboard. To enable the dashboard, set this value to <code>true</code>.</p>"
+        },
+        "SubscribedDomains":{
+          "shape":"DomainDeliverabilityTrackingOptions",
+          "documentation":"<p>An array of objects, one for each verified domain that you use to send email and enabled the Deliverability dashboard for.</p>"
+        }
+      },
+      "documentation":"<p>Enable or disable the Deliverability dashboard. When you enable the Deliverability dashboard, you gain access to reputation, deliverability, and other metrics for the domains that you use to send email using Amazon SES API v2. You also gain the ability to perform predictive inbox placement tests.</p> <p>When you use the Deliverability dashboard, you pay a monthly subscription charge, in addition to any other fees that you accrue by using Amazon SES and other AWS services. For more information about the features and cost of a Deliverability dashboard subscription, see <a href=\"http://aws.amazon.com/pinpoint/pricing/\">Amazon Pinpoint Pricing</a>.</p>"
+    },
+    "PutDeliverabilityDashboardOptionResponse":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>A response that indicates whether the Deliverability dashboard is enabled.</p>"
+    },
+    "PutEmailIdentityDkimAttributesRequest":{
+      "type":"structure",
+      "required":["EmailIdentity"],
+      "members":{
+        "EmailIdentity":{
+          "shape":"Identity",
+          "documentation":"<p>The email identity that you want to change the DKIM settings for.</p>",
+          "location":"uri",
+          "locationName":"EmailIdentity"
+        },
+        "SigningEnabled":{
+          "shape":"Enabled",
+          "documentation":"<p>Sets the DKIM signing configuration for the identity.</p> <p>When you set this value <code>true</code>, then the messages that are sent from the identity are signed using DKIM. If you set this value to <code>false</code>, your messages are sent without DKIM signing.</p>"
+        }
+      },
+      "documentation":"<p>A request to enable or disable DKIM signing of email that you send from an email identity.</p>"
+    },
+    "PutEmailIdentityDkimAttributesResponse":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>An HTTP 200 response if the request succeeds, or an error message if the request fails.</p>"
+    },
+    "PutEmailIdentityDkimSigningAttributesRequest":{
+      "type":"structure",
+      "required":[
+        "EmailIdentity",
+        "SigningAttributesOrigin"
+      ],
+      "members":{
+        "EmailIdentity":{
+          "shape":"Identity",
+          "documentation":"<p>The email identity that you want to configure DKIM for.</p>",
+          "location":"uri",
+          "locationName":"EmailIdentity"
+        },
+        "SigningAttributesOrigin":{
+          "shape":"DkimSigningAttributesOrigin",
+          "documentation":"<p>The method that you want to use to configure DKIM for the identity. There are two possible values:</p> <ul> <li> <p> <code>AWS_SES</code> – Configure DKIM for the identity by using <a href=\"https://docs.aws.amazon.com/ses/latest/DeveloperGuide/easy-dkim.html\">Easy DKIM</a>.</p> </li> <li> <p> <code>EXTERNAL</code> – Configure DKIM for the identity by using Bring Your Own DKIM (BYODKIM).</p> </li> </ul>"
+        },
+        "SigningAttributes":{
+          "shape":"DkimSigningAttributes",
+          "documentation":"<p>An object that contains information about the private key and selector that you want to use to configure DKIM for the identity. This object is only required if you want to configure Bring Your Own DKIM (BYODKIM) for the identity.</p>"
+        }
+      },
+      "documentation":"<p>A request to change the DKIM attributes for an email identity.</p>"
+    },
+    "PutEmailIdentityDkimSigningAttributesResponse":{
+      "type":"structure",
+      "members":{
+        "DkimStatus":{
+          "shape":"DkimStatus",
+          "documentation":"<p>The DKIM authentication status of the identity. Amazon SES determines the authentication status by searching for specific records in the DNS configuration for your domain. If you used <a href=\"https://docs.aws.amazon.com/ses/latest/DeveloperGuide/easy-dkim.html\">Easy DKIM</a> to set up DKIM authentication, Amazon SES tries to find three unique CNAME records in the DNS configuration for your domain.</p> <p>If you provided a public key to perform DKIM authentication, Amazon SES tries to find a TXT record that uses the selector that you specified. The value of the TXT record must be a public key that's paired with the private key that you specified in the process of creating the identity.</p> <p>The status can be one of the following:</p> <ul> <li> <p> <code>PENDING</code> – The verification process was initiated, but Amazon SES hasn't yet detected the DKIM records in the DNS configuration for the domain.</p> </li> <li> <p> <code>SUCCESS</code> – The verification process completed successfully.</p> </li> <li> <p> <code>FAILED</code> – The verification process failed. This typically occurs when Amazon SES fails to find the DKIM records in the DNS configuration of the domain.</p> </li> <li> <p> <code>TEMPORARY_FAILURE</code> – A temporary issue is preventing Amazon SES from determining the DKIM authentication status of the domain.</p> </li> <li> <p> <code>NOT_STARTED</code> – The DKIM verification process hasn't been initiated for the domain.</p> </li> </ul>"
+        },
+        "DkimTokens":{
+          "shape":"DnsTokenList",
+          "documentation":"<p>If you used <a href=\"https://docs.aws.amazon.com/ses/latest/DeveloperGuide/easy-dkim.html\">Easy DKIM</a> to configure DKIM authentication for the domain, then this object contains a set of unique strings that you use to create a set of CNAME records that you add to the DNS configuration for your domain. When Amazon SES detects these records in the DNS configuration for your domain, the DKIM authentication process is complete.</p> <p>If you configured DKIM authentication for the domain by providing your own public-private key pair, then this object contains the selector that's associated with your public key.</p> <p>Regardless of the DKIM authentication method you use, Amazon SES searches for the appropriate records in the DNS configuration of the domain for up to 72 hours.</p>"
+        }
+      },
+      "documentation":"<p>If the action is successful, the service sends back an HTTP 200 response.</p> <p>The following data is returned in JSON format by the service.</p>"
+    },
+    "PutEmailIdentityFeedbackAttributesRequest":{
+      "type":"structure",
+      "required":["EmailIdentity"],
+      "members":{
+        "EmailIdentity":{
+          "shape":"Identity",
+          "documentation":"<p>The email identity that you want to configure bounce and complaint feedback forwarding for.</p>",
+          "location":"uri",
+          "locationName":"EmailIdentity"
+        },
+        "EmailForwardingEnabled":{
+          "shape":"Enabled",
+          "documentation":"<p>Sets the feedback forwarding configuration for the identity.</p> <p>If the value is <code>true</code>, you receive email notifications when bounce or complaint events occur. These notifications are sent to the address that you specified in the <code>Return-Path</code> header of the original email.</p> <p>You're required to have a method of tracking bounces and complaints. If you haven't set up another mechanism for receiving bounce or complaint notifications (for example, by setting up an event destination), you receive an email notification when these events occur (even if this setting is disabled).</p>"
+        }
+      },
+      "documentation":"<p>A request to set the attributes that control how bounce and complaint events are processed.</p>"
+    },
+    "PutEmailIdentityFeedbackAttributesResponse":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>An HTTP 200 response if the request succeeds, or an error message if the request fails.</p>"
+    },
+    "PutEmailIdentityMailFromAttributesRequest":{
+      "type":"structure",
+      "required":["EmailIdentity"],
+      "members":{
+        "EmailIdentity":{
+          "shape":"Identity",
+          "documentation":"<p>The verified email identity that you want to set up the custom MAIL FROM domain for.</p>",
+          "location":"uri",
+          "locationName":"EmailIdentity"
+        },
+        "MailFromDomain":{
+          "shape":"MailFromDomainName",
+          "documentation":"<p> The custom MAIL FROM domain that you want the verified identity to use. The MAIL FROM domain must meet the following criteria:</p> <ul> <li> <p>It has to be a subdomain of the verified identity.</p> </li> <li> <p>It can't be used to receive email.</p> </li> <li> <p>It can't be used in a \"From\" address if the MAIL FROM domain is a destination for feedback forwarding emails.</p> </li> </ul>"
+        },
+        "BehaviorOnMxFailure":{
+          "shape":"BehaviorOnMxFailure",
+          "documentation":"<p>The action that you want to take if the required MX record isn't found when you send an email. When you set this value to <code>UseDefaultValue</code>, the mail is sent using <i>amazonses.com</i> as the MAIL FROM domain. When you set this value to <code>RejectMessage</code>, the Amazon SES API v2 returns a <code>MailFromDomainNotVerified</code> error, and doesn't attempt to deliver the email.</p> <p>These behaviors are taken when the custom MAIL FROM domain configuration is in the <code>Pending</code>, <code>Failed</code>, and <code>TemporaryFailure</code> states.</p>"
+        }
+      },
+      "documentation":"<p>A request to configure the custom MAIL FROM domain for a verified identity.</p>"
+    },
+    "PutEmailIdentityMailFromAttributesResponse":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>An HTTP 200 response if the request succeeds, or an error message if the request fails.</p>"
+    },
+    "PutSuppressedDestinationRequest":{
+      "type":"structure",
+      "required":[
+        "EmailAddress",
+        "Reason"
+      ],
+      "members":{
+        "EmailAddress":{
+          "shape":"EmailAddress",
+          "documentation":"<p>The email address that should be added to the suppression list for your account.</p>"
+        },
+        "Reason":{
+          "shape":"SuppressionListReason",
+          "documentation":"<p>The factors that should cause the email address to be added to the suppression list for your account.</p>"
+        }
+      },
+      "documentation":"<p>A request to add an email destination to the suppression list for your account.</p>"
+    },
+    "PutSuppressedDestinationResponse":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>An HTTP 200 response if the request succeeds, or an error message if the request fails.</p>"
+    },
+    "RawMessage":{
+      "type":"structure",
+      "required":["Data"],
+      "members":{
+        "Data":{
+          "shape":"RawMessageData",
+          "documentation":"<p>The raw email message. The message has to meet the following criteria:</p> <ul> <li> <p>The message has to contain a header and a body, separated by one blank line.</p> </li> <li> <p>All of the required header fields must be present in the message.</p> </li> <li> <p>Each part of a multipart MIME message must be formatted properly.</p> </li> <li> <p>Attachments must be in a file format that the Amazon SES supports.</p> </li> <li> <p>The entire message must be Base64 encoded.</p> </li> <li> <p>If any of the MIME parts in your message contain content that is outside of the 7-bit ASCII character range, you should encode that content to ensure that recipients' email clients render the message properly.</p> </li> <li> <p>The length of any single line of text in the message can't exceed 1,000 characters. This restriction is defined in <a href=\"https://tools.ietf.org/html/rfc5321\">RFC 5321</a>.</p> </li> </ul>"
+        }
+      },
+      "documentation":"<p>Represents the raw content of an email message.</p>"
+    },
+    "RawMessageData":{
+      "type":"blob",
+      "documentation":"<p>The raw email message. The message has to meet the following criteria:</p> <ul> <li> <p>The message has to contain a header and a body, separated by one blank line.</p> </li> <li> <p>All of the required header fields must be present in the message.</p> </li> <li> <p>Each part of a multipart MIME message must be formatted properly.</p> </li> <li> <p>Attachments must be in a file format that the Amazon SES API v2 supports. </p> </li> <li> <p>The entire message must be Base64 encoded.</p> </li> <li> <p>If any of the MIME parts in your message contain content that is outside of the 7-bit ASCII character range, you should encode that content to ensure that recipients' email clients render the message properly.</p> </li> <li> <p>The length of any single line of text in the message can't exceed 1,000 characters. This restriction is defined in <a href=\"https://tools.ietf.org/html/rfc5321\">RFC 5321</a>.</p> </li> </ul>"
+    },
+    "RblName":{
+      "type":"string",
+      "documentation":"<p>The name of a blacklist that an IP address was found on.</p>"
+    },
+    "ReportId":{
+      "type":"string",
+      "documentation":"<p>A unique string that identifies a Deliverability dashboard report.</p>"
+    },
+    "ReportName":{
+      "type":"string",
+      "documentation":"<p>A name that helps you identify a report generated by the Deliverability dashboard.</p>"
+    },
+    "ReputationOptions":{
+      "type":"structure",
+      "members":{
+        "ReputationMetricsEnabled":{
+          "shape":"Enabled",
+          "documentation":"<p>If <code>true</code>, tracking of reputation metrics is enabled for the configuration set. If <code>false</code>, tracking of reputation metrics is disabled for the configuration set.</p>"
+        },
+        "LastFreshStart":{
+          "shape":"LastFreshStart",
+          "documentation":"<p>The date and time (in Unix time) when the reputation metrics were last given a fresh start. When your account is given a fresh start, your reputation metrics are calculated starting from the date of the fresh start.</p>"
+        }
+      },
+      "documentation":"<p>Enable or disable collection of reputation metrics for emails that you send using this configuration set in the current AWS Region. </p>"
+    },
+    "Selector":{
+      "type":"string",
+      "max":63,
+      "min":1,
+      "pattern":"^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\\-]*[a-zA-Z0-9]))$"
+    },
+    "SendEmailRequest":{
+      "type":"structure",
+      "required":[
+        "Destination",
+        "Content"
+      ],
+      "members":{
+        "FromEmailAddress":{
+          "shape":"EmailAddress",
+          "documentation":"<p>The email address that you want to use as the \"From\" address for the email. The address that you specify has to be verified. </p>"
+        },
+        "Destination":{
+          "shape":"Destination",
+          "documentation":"<p>An object that contains the recipients of the email message.</p>"
+        },
+        "ReplyToAddresses":{
+          "shape":"EmailAddressList",
+          "documentation":"<p>The \"Reply-to\" email addresses for the message. When the recipient replies to the message, each Reply-to address receives the reply.</p>"
+        },
+        "FeedbackForwardingEmailAddress":{
+          "shape":"EmailAddress",
+          "documentation":"<p>The address that you want bounce and complaint notifications to be sent to.</p>"
+        },
+        "Content":{
+          "shape":"EmailContent",
+          "documentation":"<p>An object that contains the body of the message. You can send either a Simple message or a Raw message.</p>"
+        },
+        "EmailTags":{
+          "shape":"MessageTagList",
+          "documentation":"<p>A list of tags, in the form of name/value pairs, to apply to an email that you send using the <code>SendEmail</code> operation. Tags correspond to characteristics of the email that you define, so that you can publish email sending events. </p>"
+        },
+        "ConfigurationSetName":{
+          "shape":"ConfigurationSetName",
+          "documentation":"<p>The name of the configuration set that you want to use when sending the email.</p>"
+        }
+      },
+      "documentation":"<p>A request to send an email message.</p>"
+    },
+    "SendEmailResponse":{
+      "type":"structure",
+      "members":{
+        "MessageId":{
+          "shape":"OutboundMessageId",
+          "documentation":"<p>A unique identifier for the message that is generated when the message is accepted.</p> <note> <p>It's possible for Amazon SES to accept a message without sending it. This can happen when the message that you're trying to send has an attachment contains a virus, or when you send a templated email that contains invalid personalization content, for example.</p> </note>"
+        }
+      },
+      "documentation":"<p>A unique message ID that you receive when an email is accepted for sending.</p>"
+    },
+    "SendQuota":{
+      "type":"structure",
+      "members":{
+        "Max24HourSend":{
+          "shape":"Max24HourSend",
+          "documentation":"<p>The maximum number of emails that you can send in the current AWS Region over a 24-hour period. This value is also called your <i>sending quota</i>.</p>"
+        },
+        "MaxSendRate":{
+          "shape":"MaxSendRate",
+          "documentation":"<p>The maximum number of emails that you can send per second in the current AWS Region. This value is also called your <i>maximum sending rate</i> or your <i>maximum TPS (transactions per second) rate</i>.</p>"
+        },
+        "SentLast24Hours":{
+          "shape":"SentLast24Hours",
+          "documentation":"<p>The number of emails sent from your Amazon SES account in the current AWS Region over the past 24 hours.</p>"
+        }
+      },
+      "documentation":"<p>An object that contains information about the per-day and per-second sending limits for your Amazon SES account in the current AWS Region.</p>"
+    },
+    "SendingOptions":{
+      "type":"structure",
+      "members":{
+        "SendingEnabled":{
+          "shape":"Enabled",
+          "documentation":"<p>If <code>true</code>, email sending is enabled for the configuration set. If <code>false</code>, email sending is disabled for the configuration set.</p>"
+        }
+      },
+      "documentation":"<p>Used to enable or disable email sending for messages that use this configuration set in the current AWS Region.</p>"
+    },
+    "SendingPausedException":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>The message can't be sent because the account's ability to send email is currently paused.</p>",
+      "error":{"httpStatusCode":400},
+      "exception":true
+    },
+    "SendingPoolName":{
+      "type":"string",
+      "documentation":"<p>The name of the dedicated IP pool that you want to associate with the configuration set.</p>"
+    },
+    "SentLast24Hours":{"type":"double"},
+    "SnsDestination":{
+      "type":"structure",
+      "required":["TopicArn"],
+      "members":{
+        "TopicArn":{
+          "shape":"AmazonResourceName",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the Amazon SNS topic that you want to publish email events to. For more information about Amazon SNS topics, see the <a href=\"https://docs.aws.amazon.com/sns/latest/dg/CreateTopic.html\">Amazon SNS Developer Guide</a>.</p>"
+        }
+      },
+      "documentation":"<p>An object that defines an Amazon SNS destination for email events. You can use Amazon SNS to send notification when certain email events occur.</p>"
+    },
+    "Subject":{"type":"string"},
+    "SuppressedDestination":{
+      "type":"structure",
+      "required":[
+        "EmailAddress",
+        "Reason",
+        "LastUpdateTime"
+      ],
+      "members":{
+        "EmailAddress":{
+          "shape":"EmailAddress",
+          "documentation":"<p>The email address that is on the suppression list for your account.</p>"
+        },
+        "Reason":{
+          "shape":"SuppressionListReason",
+          "documentation":"<p>The reason that the address was added to the suppression list for your account.</p>"
+        },
+        "LastUpdateTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>The date and time when the suppressed destination was last updated, shown in Unix time format.</p>"
+        },
+        "Attributes":{
+          "shape":"SuppressedDestinationAttributes",
+          "documentation":"<p>An optional value that can contain additional information about the reasons that the address was added to the suppression list for your account.</p>"
+        }
+      },
+      "documentation":"<p>An object that contains information about an email address that is on the suppression list for your account.</p>"
+    },
+    "SuppressedDestinationAttributes":{
+      "type":"structure",
+      "members":{
+        "MessageId":{
+          "shape":"OutboundMessageId",
+          "documentation":"<p>The unique identifier of the email message that caused the email address to be added to the suppression list for your account.</p>"
+        },
+        "FeedbackId":{
+          "shape":"FeedbackId",
+          "documentation":"<p>A unique identifier that's generated when an email address is added to the suppression list for your account.</p>"
+        }
+      },
+      "documentation":"<p>An object that contains additional attributes that are related an email address that is on the suppression list for your account.</p>"
+    },
+    "SuppressedDestinationSummaries":{
+      "type":"list",
+      "member":{"shape":"SuppressedDestinationSummary"}
+    },
+    "SuppressedDestinationSummary":{
+      "type":"structure",
+      "required":[
+        "EmailAddress",
+        "Reason",
+        "LastUpdateTime"
+      ],
+      "members":{
+        "EmailAddress":{
+          "shape":"EmailAddress",
+          "documentation":"<p>The email address that's on the suppression list for your account.</p>"
+        },
+        "Reason":{
+          "shape":"SuppressionListReason",
+          "documentation":"<p>The reason that the address was added to the suppression list for your account.</p>"
+        },
+        "LastUpdateTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>The date and time when the suppressed destination was last updated, shown in Unix time format.</p>"
+        }
+      },
+      "documentation":"<p>A summary that describes the suppressed email address.</p>"
+    },
+    "SuppressionAttributes":{
+      "type":"structure",
+      "members":{
+        "SuppressedReasons":{
+          "shape":"SuppressionListReasons",
+          "documentation":"<p>A list that contains the reasons that email addresses will be automatically added to the suppression list for your account. This list can contain any or all of the following:</p> <ul> <li> <p> <code>COMPLAINT</code> – Amazon SES adds an email address to the suppression list for your account when a message sent to that address results in a complaint.</p> </li> <li> <p> <code>BOUNCE</code> – Amazon SES adds an email address to the suppression list for your account when a message sent to that address results in a hard bounce.</p> </li> </ul>"
+        }
+      },
+      "documentation":"<p>An object that contains information about the email address suppression preferences for your account in the current AWS Region.</p>"
+    },
+    "SuppressionListReason":{
+      "type":"string",
+      "documentation":"<p>The reason that the address was added to the suppression list for your account. The value can be one of the following:</p> <ul> <li> <p> <code>COMPLAINT</code> – Amazon SES added an email address to the suppression list for your account because a message sent to that address results in a complaint.</p> </li> <li> <p> <code>BOUNCE</code> – Amazon SES added an email address to the suppression list for your account because a message sent to that address results in a hard bounce.</p> </li> </ul>",
+      "enum":[
+        "BOUNCE",
+        "COMPLAINT"
+      ]
+    },
+    "SuppressionListReasons":{
+      "type":"list",
+      "member":{"shape":"SuppressionListReason"}
+    },
+    "SuppressionOptions":{
+      "type":"structure",
+      "members":{
+        "SuppressedReasons":{
+          "shape":"SuppressionListReasons",
+          "documentation":"<p>A list that contains the reasons that email addresses are automatically added to the suppression list for your account. This list can contain any or all of the following:</p> <ul> <li> <p> <code>COMPLAINT</code> – Amazon SES adds an email address to the suppression list for your account when a message sent to that address results in a complaint.</p> </li> <li> <p> <code>BOUNCE</code> – Amazon SES adds an email address to the suppression list for your account when a message sent to that address results in a hard bounce.</p> </li> </ul>"
+        }
+      },
+      "documentation":"<p>An object that contains information about the suppression list preferences for your account.</p>"
+    },
+    "Tag":{
+      "type":"structure",
+      "required":[
+        "Key",
+        "Value"
+      ],
+      "members":{
+        "Key":{
+          "shape":"TagKey",
+          "documentation":"<p>One part of a key-value pair that defines a tag. The maximum length of a tag key is 128 characters. The minimum length is 1 character.</p>"
+        },
+        "Value":{
+          "shape":"TagValue",
+          "documentation":"<p>The optional part of a key-value pair that defines a tag. The maximum length of a tag value is 256 characters. The minimum length is 0 characters. If you don't want a resource to have a specific tag value, don't specify a value for this parameter. If you don't specify a value, Amazon SES sets the value to an empty string.</p>"
+        }
+      },
+      "documentation":"<p>An object that defines the tags that are associated with a resource. A <i>tag</i> is a label that you optionally define and associate with a resource. Tags can help you categorize and manage resources in different ways, such as by purpose, owner, environment, or other criteria. A resource can have as many as 50 tags.</p> <p>Each tag consists of a required <i>tag key</i> and an associated <i>tag value</i>, both of which you define. A tag key is a general label that acts as a category for a more specific tag value. A tag value acts as a descriptor within a tag key. A tag key can contain as many as 128 characters. A tag value can contain as many as 256 characters. The characters can be Unicode letters, digits, white space, or one of the following symbols: _ . : / = + -. The following additional restrictions apply to tags:</p> <ul> <li> <p>Tag keys and values are case sensitive.</p> </li> <li> <p>For each associated resource, each tag key must be unique and it can have only one value.</p> </li> <li> <p>The <code>aws:</code> prefix is reserved for use by AWS; you can’t use it in any tag keys or values that you define. In addition, you can't edit or remove tag keys or values that use this prefix. Tags that use this prefix don’t count against the limit of 50 tags per resource.</p> </li> <li> <p>You can associate tags with public or shared resources, but the tags are available only for your AWS account, not any other accounts that share the resource. In addition, the tags are available only for resources that are located in the specified AWS Region for your AWS account.</p> </li> </ul>"
+    },
+    "TagKey":{"type":"string"},
+    "TagKeyList":{
+      "type":"list",
+      "member":{"shape":"TagKey"}
+    },
+    "TagList":{
+      "type":"list",
+      "member":{"shape":"Tag"}
+    },
+    "TagResourceRequest":{
+      "type":"structure",
+      "required":[
+        "ResourceArn",
+        "Tags"
+      ],
+      "members":{
+        "ResourceArn":{
+          "shape":"AmazonResourceName",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the resource that you want to add one or more tags to.</p>"
+        },
+        "Tags":{
+          "shape":"TagList",
+          "documentation":"<p>A list of the tags that you want to add to the resource. A tag consists of a required tag key (<code>Key</code>) and an associated tag value (<code>Value</code>). The maximum length of a tag key is 128 characters. The maximum length of a tag value is 256 characters.</p>"
+        }
+      }
+    },
+    "TagResourceResponse":{
+      "type":"structure",
+      "members":{
+      }
+    },
+    "TagValue":{"type":"string"},
+    "Template":{
+      "type":"structure",
+      "members":{
+        "TemplateArn":{
+          "shape":"TemplateArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the template.</p>"
+        },
+        "TemplateData":{
+          "shape":"TemplateData",
+          "documentation":"<p>An object that defines the values to use for message variables in the template. This object is a set of key-value pairs. Each key defines a message variable in the template. The corresponding value defines the value to use for that variable.</p>"
+        }
+      },
+      "documentation":"<p>An object that defines the email template to use for an email message, and the values to use for any message variables in that template. An <i>email template</i> is a type of message template that contains content that you want to define, save, and reuse in email messages that you send.</p>"
+    },
+    "TemplateArn":{"type":"string"},
+    "TemplateData":{
+      "type":"string",
+      "max":262144
+    },
+    "Timestamp":{"type":"timestamp"},
+    "TlsPolicy":{
+      "type":"string",
+      "documentation":"<p>Specifies whether messages that use the configuration set are required to use Transport Layer Security (TLS). If the value is <code>Require</code>, messages are only delivered if a TLS connection can be established. If the value is <code>Optional</code>, messages can be delivered in plain text if a TLS connection can't be established.</p>",
+      "enum":[
+        "REQUIRE",
+        "OPTIONAL"
+      ]
+    },
+    "TooManyRequestsException":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>Too many requests have been made to the operation.</p>",
+      "error":{"httpStatusCode":429},
+      "exception":true
+    },
+    "TrackingOptions":{
+      "type":"structure",
+      "required":["CustomRedirectDomain"],
+      "members":{
+        "CustomRedirectDomain":{
+          "shape":"CustomRedirectDomain",
+          "documentation":"<p>The domain that you want to use for tracking open and click events.</p>"
+        }
+      },
+      "documentation":"<p>An object that defines the tracking options for a configuration set. When you use the Amazon SES API v2 to send an email, it contains an invisible image that's used to track when recipients open your email. If your email contains links, those links are changed slightly in order to track when recipients click them.</p> <p>These images and links include references to a domain operated by AWS. You can optionally configure the Amazon SES to use a domain that you operate for these images and links.</p>"
+    },
+    "UntagResourceRequest":{
+      "type":"structure",
+      "required":[
+        "ResourceArn",
+        "TagKeys"
+      ],
+      "members":{
+        "ResourceArn":{
+          "shape":"AmazonResourceName",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the resource that you want to remove one or more tags from.</p>",
+          "location":"querystring",
+          "locationName":"ResourceArn"
+        },
+        "TagKeys":{
+          "shape":"TagKeyList",
+          "documentation":"<p>The tags (tag keys) that you want to remove from the resource. When you specify a tag key, the action removes both that key and its associated tag value.</p> <p>To remove more than one tag from the resource, append the <code>TagKeys</code> parameter and argument for each additional tag to remove, separated by an ampersand. For example: <code>/v2/email/tags?ResourceArn=ResourceArn&amp;TagKeys=Key1&amp;TagKeys=Key2</code> </p>",
+          "location":"querystring",
+          "locationName":"TagKeys"
+        }
+      }
+    },
+    "UntagResourceResponse":{
+      "type":"structure",
+      "members":{
+      }
+    },
+    "UpdateConfigurationSetEventDestinationRequest":{
+      "type":"structure",
+      "required":[
+        "ConfigurationSetName",
+        "EventDestinationName",
+        "EventDestination"
+      ],
+      "members":{
+        "ConfigurationSetName":{
+          "shape":"ConfigurationSetName",
+          "documentation":"<p>The name of the configuration set that contains the event destination that you want to modify.</p>",
+          "location":"uri",
+          "locationName":"ConfigurationSetName"
+        },
+        "EventDestinationName":{
+          "shape":"EventDestinationName",
+          "documentation":"<p>The name of the event destination that you want to modify.</p>",
+          "location":"uri",
+          "locationName":"EventDestinationName"
+        },
+        "EventDestination":{
+          "shape":"EventDestinationDefinition",
+          "documentation":"<p>An object that defines the event destination.</p>"
+        }
+      },
+      "documentation":"<p>A request to change the settings for an event destination for a configuration set.</p>"
+    },
+    "UpdateConfigurationSetEventDestinationResponse":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>An HTTP 200 response if the request succeeds, or an error message if the request fails.</p>"
+    },
+    "Volume":{
+      "type":"long",
+      "documentation":"<p>An object that contains information about inbox placement volume.</p>"
+    },
+    "VolumeStatistics":{
+      "type":"structure",
+      "members":{
+        "InboxRawCount":{
+          "shape":"Volume",
+          "documentation":"<p>The total number of emails that arrived in recipients' inboxes.</p>"
+        },
+        "SpamRawCount":{
+          "shape":"Volume",
+          "documentation":"<p>The total number of emails that arrived in recipients' spam or junk mail folders.</p>"
+        },
+        "ProjectedInbox":{
+          "shape":"Volume",
+          "documentation":"<p>An estimate of the percentage of emails sent from the current domain that will arrive in recipients' inboxes.</p>"
+        },
+        "ProjectedSpam":{
+          "shape":"Volume",
+          "documentation":"<p>An estimate of the percentage of emails sent from the current domain that will arrive in recipients' spam or junk mail folders.</p>"
+        }
+      },
+      "documentation":"<p>An object that contains information about the amount of email that was delivered to recipients.</p>"
+    },
+    "WarmupStatus":{
+      "type":"string",
+      "documentation":"<p>The warmup status of a dedicated IP.</p>",
+      "enum":[
+        "IN_PROGRESS",
+        "DONE"
+      ]
+    }
+  },
+  "documentation":"<fullname>Amazon SES API v2</fullname> <p>Welcome to the Amazon SES API v2 Reference. This guide provides information about the Amazon SES API v2, including supported operations, data types, parameters, and schemas.</p> <p> <a href=\"https://aws.amazon.com/pinpoint\">Amazon SES</a> is an AWS service that you can use to send email messages to your customers.</p> <p>If you're new to Amazon SES API v2, you might find it helpful to also review the <a href=\"https://docs.aws.amazon.com/ses/latest/DeveloperGuide/\">Amazon Simple Email Service Developer Guide</a>. The <i>Amazon SES Developer Guide</i> provides information and code samples that demonstrate how to use Amazon SES API v2 features programmatically.</p> <p>The Amazon SES API v2 is available in several AWS Regions and it provides an endpoint for each of these Regions. For a list of all the Regions and endpoints where the API is currently available, see <a href=\"https://docs.aws.amazon.com/general/latest/gr/rande.html#ses_region\">AWS Service Endpoints</a> in the <i>Amazon Web Services General Reference</i>. To learn more about AWS Regions, see <a href=\"https://docs.aws.amazon.com/general/latest/gr/rande-manage.html\">Managing AWS Regions</a> in the <i>Amazon Web Services General Reference</i>.</p> <p>In each Region, AWS maintains multiple Availability Zones. These Availability Zones are physically isolated from each other, but are united by private, low-latency, high-throughput, and highly redundant network connections. These Availability Zones enable us to provide very high levels of availability and redundancy, while also minimizing latency. To learn more about the number of Availability Zones that are available in each Region, see <a href=\"http://aws.amazon.com/about-aws/global-infrastructure/\">AWS Global Infrastructure</a>.</p>"
+}
diff --git a/services/sfn/build.properties b/services/sfn/build.properties
index ecf2dae6fcb1..15ec2da1fc71 100644
--- a/services/sfn/build.properties
+++ b/services/sfn/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/sfn/pom.xml b/services/sfn/pom.xml
index d9e5ed8d1418..e8f5feb0291c 100644
--- a/services/sfn/pom.xml
+++ b/services/sfn/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>sfn</artifactId>
     <name>AWS Java SDK :: Services :: AWS Step Functions</name>
diff --git a/services/sfn/src/it/java/software/amazon/awssdk/services/sfn/SfnIntegrationTest.java b/services/sfn/src/it/java/software/amazon/awssdk/services/sfn/SfnIntegrationTest.java
new file mode 100644
index 000000000000..153d5d5f7587
--- /dev/null
+++ b/services/sfn/src/it/java/software/amazon/awssdk/services/sfn/SfnIntegrationTest.java
@@ -0,0 +1,47 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.services.sfn;
+
+import static org.junit.Assert.assertNotNull;
+
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import software.amazon.awssdk.testutils.service.AwsIntegrationTestBase;
+
+public class SfnIntegrationTest extends AwsIntegrationTestBase {
+
+    private static SfnClient sfnClient;
+    private static String activityArn;
+
+    @BeforeClass
+    public static void setUpClient() {
+        sfnClient = SfnClient.builder().credentialsProvider(CREDENTIALS_PROVIDER_CHAIN).build();
+        activityArn = sfnClient.createActivity(b -> b.name("test")).activityArn();
+    }
+
+    @AfterClass
+    public static void cleanUp() {
+        if (activityArn != null) {
+            sfnClient.deleteActivity(b -> b.activityArn(activityArn));
+        }
+    }
+
+    @Test
+    public void getActivityTask_shouldWorkByDefault(){
+        assertNotNull(sfnClient.getActivityTask(b -> b.activityArn(activityArn)));
+    }
+}
diff --git a/services/sfn/src/main/java/software/amazon/awssdk/services/sfn/internal/SfnHttpConfigurationOptions.java b/services/sfn/src/main/java/software/amazon/awssdk/services/sfn/internal/SfnHttpConfigurationOptions.java
new file mode 100644
index 000000000000..77781828d240
--- /dev/null
+++ b/services/sfn/src/main/java/software/amazon/awssdk/services/sfn/internal/SfnHttpConfigurationOptions.java
@@ -0,0 +1,42 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.services.sfn.internal;
+
+import java.time.Duration;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.http.SdkHttpConfigurationOption;
+import software.amazon.awssdk.utils.AttributeMap;
+
+/**
+ * Sfn specific http configurations.
+ */
+@SdkInternalApi
+public final class SfnHttpConfigurationOptions {
+
+    private static final AttributeMap OPTIONS = AttributeMap
+        .builder()
+        // Sfn has long polling APIs such as getActivityTask that could take up to
+        // 60 seconds to respond
+        .put(SdkHttpConfigurationOption.READ_TIMEOUT, Duration.ofSeconds(65))
+        .build();
+
+    private SfnHttpConfigurationOptions() {
+    }
+
+    public static AttributeMap defaultHttpConfig() {
+        return OPTIONS;
+    }
+}
diff --git a/services/sfn/src/main/resources/codegen-resources/customization.config b/services/sfn/src/main/resources/codegen-resources/customization.config
index 1a5191bbd702..4e8192563f3e 100644
--- a/services/sfn/src/main/resources/codegen-resources/customization.config
+++ b/services/sfn/src/main/resources/codegen-resources/customization.config
@@ -2,5 +2,6 @@
     "verifiedSimpleMethods" : [
         "listActivities",
         "listStateMachines"
-    ]
+    ],
+    "serviceSpecificHttpConfig": "software.amazon.awssdk.services.sfn.internal.SfnHttpConfigurationOptions"
 }
diff --git a/services/sfn/src/main/resources/codegen-resources/service-2.json b/services/sfn/src/main/resources/codegen-resources/service-2.json
index a715453d8bd2..3bc9a331c395 100644
--- a/services/sfn/src/main/resources/codegen-resources/service-2.json
+++ b/services/sfn/src/main/resources/codegen-resources/service-2.json
@@ -41,12 +41,14 @@
         {"shape":"InvalidArn"},
         {"shape":"InvalidDefinition"},
         {"shape":"InvalidName"},
+        {"shape":"InvalidLoggingConfiguration"},
         {"shape":"StateMachineAlreadyExists"},
         {"shape":"StateMachineDeleting"},
         {"shape":"StateMachineLimitExceeded"},
+        {"shape":"StateMachineTypeNotSupported"},
         {"shape":"TooManyTags"}
       ],
-      "documentation":"<p>Creates a state machine. A state machine consists of a collection of states that can do work (<code>Task</code> states), determine to which states to transition next (<code>Choice</code> states), stop an execution with an error (<code>Fail</code> states), and so on. State machines are specified using a JSON-based, structured language.</p> <note> <p>This operation is eventually consistent. The results are best effort and may not reflect very recent updates and changes.</p> </note> <note> <p> <code>CreateStateMachine</code> is an idempotent API. Subsequent requests won’t create a duplicate resource if it was already created. <code>CreateStateMachine</code>'s idempotency check is based on the state machine <code>name</code> and <code>definition</code>. If a following request has a different <code>roleArn</code> or <code>tags</code>, Step Functions will ignore these differences and treat it as an idempotent request of the previous. In this case, <code>roleArn</code> and <code>tags</code> will not be updated, even if they are different.</p> </note>",
+      "documentation":"<p>Creates a state machine. A state machine consists of a collection of states that can do work (<code>Task</code> states), determine to which states to transition next (<code>Choice</code> states), stop an execution with an error (<code>Fail</code> states), and so on. State machines are specified using a JSON-based, structured language. For more information, see <a href=\"https://docs.aws.amazon.com/step-functions/latest/dg/concepts-amazon-states-language.html\">Amazon States Language</a> in the AWS Step Functions User Guide.</p> <note> <p>This operation is eventually consistent. The results are best effort and may not reflect very recent updates and changes.</p> </note> <note> <p> <code>CreateStateMachine</code> is an idempotent API. Subsequent requests won’t create a duplicate resource if it was already created. <code>CreateStateMachine</code>'s idempotency check is based on the state machine <code>name</code>, <code>definition</code>, <code>type</code>, and <code>LoggingConfiguration</code>. If a following request has a different <code>roleArn</code> or <code>tags</code>, Step Functions will ignore these differences and treat it as an idempotent request of the previous. In this case, <code>roleArn</code> and <code>tags</code> will not be updated, even if they are different.</p> </note>",
       "idempotent":true
     },
     "DeleteActivity":{
@@ -73,7 +75,7 @@
       "errors":[
         {"shape":"InvalidArn"}
       ],
-      "documentation":"<p>Deletes a state machine. This is an asynchronous operation: It sets the state machine's status to <code>DELETING</code> and begins the deletion process. Each state machine execution is deleted the next time it makes a state transition.</p> <note> <p>The state machine itself is deleted after all executions are completed or deleted.</p> </note>"
+      "documentation":"<p>Deletes a state machine. This is an asynchronous operation: It sets the state machine's status to <code>DELETING</code> and begins the deletion process. </p> <note> <p>For <code>EXPRESS</code>state machines, the deletion will happen eventually (usually less than a minute). Running executions may emit logs after <code>DeleteStateMachine</code> API is called.</p> </note>"
     },
     "DescribeActivity":{
       "name":"DescribeActivity",
@@ -101,7 +103,7 @@
         {"shape":"ExecutionDoesNotExist"},
         {"shape":"InvalidArn"}
       ],
-      "documentation":"<p>Describes an execution.</p> <note> <p>This operation is eventually consistent. The results are best effort and may not reflect very recent updates and changes.</p> </note>"
+      "documentation":"<p>Describes an execution.</p> <note> <p>This operation is eventually consistent. The results are best effort and may not reflect very recent updates and changes.</p> </note> <p>This API action is not supported by <code>EXPRESS</code> state machines.</p>"
     },
     "DescribeStateMachine":{
       "name":"DescribeStateMachine",
@@ -129,7 +131,7 @@
         {"shape":"ExecutionDoesNotExist"},
         {"shape":"InvalidArn"}
       ],
-      "documentation":"<p>Describes the state machine associated with a specific execution.</p> <note> <p>This operation is eventually consistent. The results are best effort and may not reflect very recent updates and changes.</p> </note>"
+      "documentation":"<p>Describes the state machine associated with a specific execution.</p> <note> <p>This operation is eventually consistent. The results are best effort and may not reflect very recent updates and changes.</p> </note> <p>This API action is not supported by <code>EXPRESS</code> state machines.</p>"
     },
     "GetActivityTask":{
       "name":"GetActivityTask",
@@ -159,7 +161,7 @@
         {"shape":"InvalidArn"},
         {"shape":"InvalidToken"}
       ],
-      "documentation":"<p>Returns the history of the specified execution as a list of events. By default, the results are returned in ascending order of the <code>timeStamp</code> of the events. Use the <code>reverseOrder</code> parameter to get the latest events first.</p> <p>If <code>nextToken</code> is returned, there are more results available. The value of <code>nextToken</code> is a unique pagination token for each page. Make the call again using the returned token to retrieve the next page. Keep all other arguments unchanged. Each pagination token expires after 24 hours. Using an expired pagination token will return an <i>HTTP 400 InvalidToken</i> error.</p>"
+      "documentation":"<p>Returns the history of the specified execution as a list of events. By default, the results are returned in ascending order of the <code>timeStamp</code> of the events. Use the <code>reverseOrder</code> parameter to get the latest events first.</p> <p>If <code>nextToken</code> is returned, there are more results available. The value of <code>nextToken</code> is a unique pagination token for each page. Make the call again using the returned token to retrieve the next page. Keep all other arguments unchanged. Each pagination token expires after 24 hours. Using an expired pagination token will return an <i>HTTP 400 InvalidToken</i> error.</p> <p>This API action is not supported by <code>EXPRESS</code> state machines.</p>"
     },
     "ListActivities":{
       "name":"ListActivities",
@@ -185,9 +187,10 @@
       "errors":[
         {"shape":"InvalidArn"},
         {"shape":"InvalidToken"},
-        {"shape":"StateMachineDoesNotExist"}
+        {"shape":"StateMachineDoesNotExist"},
+        {"shape":"StateMachineTypeNotSupported"}
       ],
-      "documentation":"<p>Lists the executions of a state machine that meet the filtering criteria. Results are sorted by time, with the most recent execution first.</p> <p>If <code>nextToken</code> is returned, there are more results available. The value of <code>nextToken</code> is a unique pagination token for each page. Make the call again using the returned token to retrieve the next page. Keep all other arguments unchanged. Each pagination token expires after 24 hours. Using an expired pagination token will return an <i>HTTP 400 InvalidToken</i> error.</p> <note> <p>This operation is eventually consistent. The results are best effort and may not reflect very recent updates and changes.</p> </note>"
+      "documentation":"<p>Lists the executions of a state machine that meet the filtering criteria. Results are sorted by time, with the most recent execution first.</p> <p>If <code>nextToken</code> is returned, there are more results available. The value of <code>nextToken</code> is a unique pagination token for each page. Make the call again using the returned token to retrieve the next page. Keep all other arguments unchanged. Each pagination token expires after 24 hours. Using an expired pagination token will return an <i>HTTP 400 InvalidToken</i> error.</p> <note> <p>This operation is eventually consistent. The results are best effort and may not reflect very recent updates and changes.</p> </note> <p>This API action is not supported by <code>EXPRESS</code> state machines.</p>"
     },
     "ListStateMachines":{
       "name":"ListStateMachines",
@@ -294,7 +297,7 @@
         {"shape":"ExecutionDoesNotExist"},
         {"shape":"InvalidArn"}
       ],
-      "documentation":"<p>Stops an execution.</p>"
+      "documentation":"<p>Stops an execution.</p> <p>This API action is not supported by <code>EXPRESS</code> state machines.</p>"
     },
     "TagResource":{
       "name":"TagResource",
@@ -336,11 +339,12 @@
       "errors":[
         {"shape":"InvalidArn"},
         {"shape":"InvalidDefinition"},
+        {"shape":"InvalidLoggingConfiguration"},
         {"shape":"MissingRequiredParameter"},
         {"shape":"StateMachineDeleting"},
         {"shape":"StateMachineDoesNotExist"}
       ],
-      "documentation":"<p>Updates an existing state machine by modifying its <code>definition</code> and/or <code>roleArn</code>. Running executions will continue to use the previous <code>definition</code> and <code>roleArn</code>. You must include at least one of <code>definition</code> or <code>roleArn</code> or you will receive a <code>MissingRequiredParameter</code> error.</p> <note> <p>All <code>StartExecution</code> calls within a few seconds will use the updated <code>definition</code> and <code>roleArn</code>. Executions started immediately after calling <code>UpdateStateMachine</code> may use the previous state machine <code>definition</code> and <code>roleArn</code>. </p> </note>",
+      "documentation":"<p>Updates an existing state machine by modifying its <code>definition</code>, <code>roleArn</code>, or <code>loggingConfiguration</code>. Running executions will continue to use the previous <code>definition</code> and <code>roleArn</code>. You must include at least one of <code>definition</code> or <code>roleArn</code> or you will receive a <code>MissingRequiredParameter</code> error.</p> <note> <p>All <code>StartExecution</code> calls within a few seconds will use the updated <code>definition</code> and <code>roleArn</code>. Executions started immediately after calling <code>UpdateStateMachine</code> may use the previous state machine <code>definition</code> and <code>roleArn</code>. </p> </note>",
       "idempotent":true
     }
   },
@@ -393,7 +397,7 @@
         },
         "name":{
           "shape":"Name",
-          "documentation":"<p>The name of the activity.</p> <p>A name must <i>not</i> contain:</p> <ul> <li> <p>white space</p> </li> <li> <p>brackets <code>&lt; &gt; { } [ ]</code> </p> </li> <li> <p>wildcard characters <code>? *</code> </p> </li> <li> <p>special characters <code>\" # % \\ ^ | ~ ` $ &amp; , ; : /</code> </p> </li> <li> <p>control characters (<code>U+0000-001F</code>, <code>U+007F-009F</code>)</p> </li> </ul>"
+          "documentation":"<p>The name of the activity.</p> <p>A name must <i>not</i> contain:</p> <ul> <li> <p>white space</p> </li> <li> <p>brackets <code>&lt; &gt; { } [ ]</code> </p> </li> <li> <p>wildcard characters <code>? *</code> </p> </li> <li> <p>special characters <code>\" # % \\ ^ | ~ ` $ &amp; , ; : /</code> </p> </li> <li> <p>control characters (<code>U+0000-001F</code>, <code>U+007F-009F</code>)</p> </li> </ul> <p>To enable logging with CloudWatch Logs, the name should only contain 0-9, A-Z, a-z, - and _.</p>"
         },
         "creationDate":{
           "shape":"Timestamp",
@@ -488,6 +492,16 @@
       "max":256,
       "min":1
     },
+    "CloudWatchLogsLogGroup":{
+      "type":"structure",
+      "members":{
+        "logGroupArn":{
+          "shape":"Arn",
+          "documentation":"<p>The ARN of the the CloudWatch log group to which you want your logs emitted to. The ARN must end with <code>:*</code> </p>"
+        }
+      },
+      "documentation":"<p/>"
+    },
     "ConnectorParameters":{
       "type":"string",
       "max":32768,
@@ -500,7 +514,7 @@
       "members":{
         "name":{
           "shape":"Name",
-          "documentation":"<p>The name of the activity to create. This name must be unique for your AWS account and region for 90 days. For more information, see <a href=\"https://docs.aws.amazon.com/step-functions/latest/dg/limits.html#service-limits-state-machine-executions\"> Limits Related to State Machine Executions</a> in the <i>AWS Step Functions Developer Guide</i>.</p> <p>A name must <i>not</i> contain:</p> <ul> <li> <p>white space</p> </li> <li> <p>brackets <code>&lt; &gt; { } [ ]</code> </p> </li> <li> <p>wildcard characters <code>? *</code> </p> </li> <li> <p>special characters <code>\" # % \\ ^ | ~ ` $ &amp; , ; : /</code> </p> </li> <li> <p>control characters (<code>U+0000-001F</code>, <code>U+007F-009F</code>)</p> </li> </ul>"
+          "documentation":"<p>The name of the activity to create. This name must be unique for your AWS account and region for 90 days. For more information, see <a href=\"https://docs.aws.amazon.com/step-functions/latest/dg/limits.html#service-limits-state-machine-executions\"> Limits Related to State Machine Executions</a> in the <i>AWS Step Functions Developer Guide</i>.</p> <p>A name must <i>not</i> contain:</p> <ul> <li> <p>white space</p> </li> <li> <p>brackets <code>&lt; &gt; { } [ ]</code> </p> </li> <li> <p>wildcard characters <code>? *</code> </p> </li> <li> <p>special characters <code>\" # % \\ ^ | ~ ` $ &amp; , ; : /</code> </p> </li> <li> <p>control characters (<code>U+0000-001F</code>, <code>U+007F-009F</code>)</p> </li> </ul> <p>To enable logging with CloudWatch Logs, the name should only contain 0-9, A-Z, a-z, - and _.</p>"
         },
         "tags":{
           "shape":"TagList",
@@ -535,7 +549,7 @@
       "members":{
         "name":{
           "shape":"Name",
-          "documentation":"<p>The name of the state machine. </p> <p>A name must <i>not</i> contain:</p> <ul> <li> <p>white space</p> </li> <li> <p>brackets <code>&lt; &gt; { } [ ]</code> </p> </li> <li> <p>wildcard characters <code>? *</code> </p> </li> <li> <p>special characters <code>\" # % \\ ^ | ~ ` $ &amp; , ; : /</code> </p> </li> <li> <p>control characters (<code>U+0000-001F</code>, <code>U+007F-009F</code>)</p> </li> </ul>"
+          "documentation":"<p>The name of the state machine. </p> <p>A name must <i>not</i> contain:</p> <ul> <li> <p>white space</p> </li> <li> <p>brackets <code>&lt; &gt; { } [ ]</code> </p> </li> <li> <p>wildcard characters <code>? *</code> </p> </li> <li> <p>special characters <code>\" # % \\ ^ | ~ ` $ &amp; , ; : /</code> </p> </li> <li> <p>control characters (<code>U+0000-001F</code>, <code>U+007F-009F</code>)</p> </li> </ul> <p>To enable logging with CloudWatch Logs, the name should only contain 0-9, A-Z, a-z, - and _.</p>"
         },
         "definition":{
           "shape":"Definition",
@@ -545,6 +559,14 @@
           "shape":"Arn",
           "documentation":"<p>The Amazon Resource Name (ARN) of the IAM role to use for this state machine.</p>"
         },
+        "type":{
+          "shape":"StateMachineType",
+          "documentation":"<p>Determines whether a Standard or Express state machine is created. The default is <code>STANDARD</code>. You cannot update the <code>type</code> of a state machine once it has been created.</p>"
+        },
+        "loggingConfiguration":{
+          "shape":"LoggingConfiguration",
+          "documentation":"<p>Defines what execution history events are logged and where they are logged.</p> <note> <p>By default, the <code>level</code> is set to <code>OFF</code>. For more information see <a href=\"https://docs.aws.amazon.com/step-functions/latest/dg/cloudwatch-log-level.html\">Log Levels</a> in the AWS Step Functions User Guide.</p> </note>"
+        },
         "tags":{
           "shape":"TagList",
           "documentation":"<p>Tags to be added when creating a state machine.</p> <p>An array of key-value pairs. For more information, see <a href=\"https://docs.aws.amazon.com/awsaccountbilling/latest/aboutv2/cost-alloc-tags.html\">Using Cost Allocation Tags</a> in the <i>AWS Billing and Cost Management User Guide</i>, and <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/access_iam-tags.html\">Controlling Access Using IAM Tags</a>.</p> <p>Tags may only contain Unicode letters, digits, white space, or these symbols: <code>_ . : / = + - @</code>.</p>"
@@ -628,7 +650,7 @@
         },
         "name":{
           "shape":"Name",
-          "documentation":"<p>The name of the activity.</p> <p>A name must <i>not</i> contain:</p> <ul> <li> <p>white space</p> </li> <li> <p>brackets <code>&lt; &gt; { } [ ]</code> </p> </li> <li> <p>wildcard characters <code>? *</code> </p> </li> <li> <p>special characters <code>\" # % \\ ^ | ~ ` $ &amp; , ; : /</code> </p> </li> <li> <p>control characters (<code>U+0000-001F</code>, <code>U+007F-009F</code>)</p> </li> </ul>"
+          "documentation":"<p>The name of the activity.</p> <p>A name must <i>not</i> contain:</p> <ul> <li> <p>white space</p> </li> <li> <p>brackets <code>&lt; &gt; { } [ ]</code> </p> </li> <li> <p>wildcard characters <code>? *</code> </p> </li> <li> <p>special characters <code>\" # % \\ ^ | ~ ` $ &amp; , ; : /</code> </p> </li> <li> <p>control characters (<code>U+0000-001F</code>, <code>U+007F-009F</code>)</p> </li> </ul> <p>To enable logging with CloudWatch Logs, the name should only contain 0-9, A-Z, a-z, - and _.</p>"
         },
         "creationDate":{
           "shape":"Timestamp",
@@ -658,7 +680,7 @@
       "members":{
         "executionArn":{
           "shape":"Arn",
-          "documentation":"<p>The Amazon Resource Name (ARN) that identifies the execution.</p>"
+          "documentation":"<p>The Amazon Resource Name (ARN) that id entifies the execution.</p>"
         },
         "stateMachineArn":{
           "shape":"Arn",
@@ -666,7 +688,7 @@
         },
         "name":{
           "shape":"Name",
-          "documentation":"<p>The name of the execution.</p> <p>A name must <i>not</i> contain:</p> <ul> <li> <p>white space</p> </li> <li> <p>brackets <code>&lt; &gt; { } [ ]</code> </p> </li> <li> <p>wildcard characters <code>? *</code> </p> </li> <li> <p>special characters <code>\" # % \\ ^ | ~ ` $ &amp; , ; : /</code> </p> </li> <li> <p>control characters (<code>U+0000-001F</code>, <code>U+007F-009F</code>)</p> </li> </ul>"
+          "documentation":"<p>The name of the execution.</p> <p>A name must <i>not</i> contain:</p> <ul> <li> <p>white space</p> </li> <li> <p>brackets <code>&lt; &gt; { } [ ]</code> </p> </li> <li> <p>wildcard characters <code>? *</code> </p> </li> <li> <p>special characters <code>\" # % \\ ^ | ~ ` $ &amp; , ; : /</code> </p> </li> <li> <p>control characters (<code>U+0000-001F</code>, <code>U+007F-009F</code>)</p> </li> </ul> <p>To enable logging with CloudWatch Logs, the name should only contain 0-9, A-Z, a-z, - and _.</p>"
         },
         "status":{
           "shape":"ExecutionStatus",
@@ -729,7 +751,8 @@
         "updateDate":{
           "shape":"Timestamp",
           "documentation":"<p>The date and time the state machine associated with an execution was updated. For a newly created state machine, this is the creation date.</p>"
-        }
+        },
+        "loggingConfiguration":{"shape":"LoggingConfiguration"}
       }
     },
     "DescribeStateMachineInput":{
@@ -749,6 +772,7 @@
         "name",
         "definition",
         "roleArn",
+        "type",
         "creationDate"
       ],
       "members":{
@@ -758,7 +782,7 @@
         },
         "name":{
           "shape":"Name",
-          "documentation":"<p>The name of the state machine.</p> <p>A name must <i>not</i> contain:</p> <ul> <li> <p>white space</p> </li> <li> <p>brackets <code>&lt; &gt; { } [ ]</code> </p> </li> <li> <p>wildcard characters <code>? *</code> </p> </li> <li> <p>special characters <code>\" # % \\ ^ | ~ ` $ &amp; , ; : /</code> </p> </li> <li> <p>control characters (<code>U+0000-001F</code>, <code>U+007F-009F</code>)</p> </li> </ul>"
+          "documentation":"<p>The name of the state machine.</p> <p>A name must <i>not</i> contain:</p> <ul> <li> <p>white space</p> </li> <li> <p>brackets <code>&lt; &gt; { } [ ]</code> </p> </li> <li> <p>wildcard characters <code>? *</code> </p> </li> <li> <p>special characters <code>\" # % \\ ^ | ~ ` $ &amp; , ; : /</code> </p> </li> <li> <p>control characters (<code>U+0000-001F</code>, <code>U+007F-009F</code>)</p> </li> </ul> <p>To enable logging with CloudWatch Logs, the name should only contain 0-9, A-Z, a-z, - and _.</p>"
         },
         "status":{
           "shape":"StateMachineStatus",
@@ -772,10 +796,15 @@
           "shape":"Arn",
           "documentation":"<p>The Amazon Resource Name (ARN) of the IAM role used when creating this state machine. (The IAM role maintains security by granting Step Functions access to AWS resources.)</p>"
         },
+        "type":{
+          "shape":"StateMachineType",
+          "documentation":"<p>The <code>type</code> of the state machine (<code>STANDARD</code> or <code>EXPRESS</code>).</p>"
+        },
         "creationDate":{
           "shape":"Timestamp",
           "documentation":"<p>The date the state machine is created.</p>"
-        }
+        },
+        "loggingConfiguration":{"shape":"LoggingConfiguration"}
       }
     },
     "ErrorMessage":{"type":"string"},
@@ -848,7 +877,7 @@
       "members":{
         "executionArn":{
           "shape":"Arn",
-          "documentation":"<p>The Amazon Resource Name (ARN) that identifies the execution.</p>"
+          "documentation":"<p>The Amazon Resource Name (ARN) that id entifies the execution.</p>"
         },
         "stateMachineArn":{
           "shape":"Arn",
@@ -856,7 +885,7 @@
         },
         "name":{
           "shape":"Name",
-          "documentation":"<p>The name of the execution.</p> <p>A name must <i>not</i> contain:</p> <ul> <li> <p>white space</p> </li> <li> <p>brackets <code>&lt; &gt; { } [ ]</code> </p> </li> <li> <p>wildcard characters <code>? *</code> </p> </li> <li> <p>special characters <code>\" # % \\ ^ | ~ ` $ &amp; , ; : /</code> </p> </li> <li> <p>control characters (<code>U+0000-001F</code>, <code>U+007F-009F</code>)</p> </li> </ul>"
+          "documentation":"<p>The name of the execution.</p> <p>A name must <i>not</i> contain:</p> <ul> <li> <p>white space</p> </li> <li> <p>brackets <code>&lt; &gt; { } [ ]</code> </p> </li> <li> <p>wildcard characters <code>? *</code> </p> </li> <li> <p>special characters <code>\" # % \\ ^ | ~ ` $ &amp; , ; : /</code> </p> </li> <li> <p>control characters (<code>U+0000-001F</code>, <code>U+007F-009F</code>)</p> </li> </ul> <p>To enable logging with CloudWatch Logs, the name should only contain 0-9, A-Z, a-z, - and _.</p>"
         },
         "status":{
           "shape":"ExecutionStatus",
@@ -1160,6 +1189,7 @@
       "type":"string",
       "max":256
     },
+    "IncludeExecutionData":{"type":"boolean"},
     "InvalidArn":{
       "type":"structure",
       "members":{
@@ -1184,6 +1214,14 @@
       "documentation":"<p>The provided JSON input data is invalid.</p>",
       "exception":true
     },
+    "InvalidLoggingConfiguration":{
+      "type":"structure",
+      "members":{
+        "message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p/>",
+      "exception":true
+    },
     "InvalidName":{
       "type":"structure",
       "members":{
@@ -1405,6 +1443,47 @@
         }
       }
     },
+    "LogDestination":{
+      "type":"structure",
+      "members":{
+        "cloudWatchLogsLogGroup":{
+          "shape":"CloudWatchLogsLogGroup",
+          "documentation":"<p>An object describing a CloudWatch log group. For more information, see <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-logs-loggroup.html\">AWS::Logs::LogGroup</a> in the AWS CloudFormation User Guide.</p>"
+        }
+      },
+      "documentation":"<p/>"
+    },
+    "LogDestinationList":{
+      "type":"list",
+      "member":{"shape":"LogDestination"}
+    },
+    "LogLevel":{
+      "type":"string",
+      "enum":[
+        "ALL",
+        "ERROR",
+        "FATAL",
+        "OFF"
+      ]
+    },
+    "LoggingConfiguration":{
+      "type":"structure",
+      "members":{
+        "level":{
+          "shape":"LogLevel",
+          "documentation":"<p>Defines which category of execution history events are logged.</p>"
+        },
+        "includeExecutionData":{
+          "shape":"IncludeExecutionData",
+          "documentation":"<p>Determines whether execution data is included in your log. When set to <code>FALSE</code>, data is excluded.</p>"
+        },
+        "destinations":{
+          "shape":"LogDestinationList",
+          "documentation":"<p>An array of objects that describes where your execution history events will be logged. Limited to size 1. Required, if your log level is not set to <code>OFF</code>.</p>"
+        }
+      },
+      "documentation":"<p>The <code>LoggingConfiguration</code> data type is used to set CloudWatch Logs options.</p>"
+    },
     "MapIterationEventDetails":{
       "type":"structure",
       "members":{
@@ -1554,7 +1633,7 @@
         },
         "name":{
           "shape":"Name",
-          "documentation":"<p>The name of the execution. This name must be unique for your AWS account, region, and state machine for 90 days. For more information, see <a href=\"https://docs.aws.amazon.com/step-functions/latest/dg/limits.html#service-limits-state-machine-executions\"> Limits Related to State Machine Executions</a> in the <i>AWS Step Functions Developer Guide</i>.</p> <p>A name must <i>not</i> contain:</p> <ul> <li> <p>white space</p> </li> <li> <p>brackets <code>&lt; &gt; { } [ ]</code> </p> </li> <li> <p>wildcard characters <code>? *</code> </p> </li> <li> <p>special characters <code>\" # % \\ ^ | ~ ` $ &amp; , ; : /</code> </p> </li> <li> <p>control characters (<code>U+0000-001F</code>, <code>U+007F-009F</code>)</p> </li> </ul>"
+          "documentation":"<p>The name of the execution. This name must be unique for your AWS account, region, and state machine for 90 days. For more information, see <a href=\"https://docs.aws.amazon.com/step-functions/latest/dg/limits.html#service-limits-state-machine-executions\"> Limits Related to State Machine Executions</a> in the <i>AWS Step Functions Developer Guide</i>.</p> <p>A name must <i>not</i> contain:</p> <ul> <li> <p>white space</p> </li> <li> <p>brackets <code>&lt; &gt; { } [ ]</code> </p> </li> <li> <p>wildcard characters <code>? *</code> </p> </li> <li> <p>special characters <code>\" # % \\ ^ | ~ ` $ &amp; , ; : /</code> </p> </li> <li> <p>control characters (<code>U+0000-001F</code>, <code>U+007F-009F</code>)</p> </li> </ul> <p>To enable logging with CloudWatch Logs, the name should only contain 0-9, A-Z, a-z, - and _.</p>"
         },
         "input":{
           "shape":"SensitiveData",
@@ -1571,7 +1650,7 @@
       "members":{
         "executionArn":{
           "shape":"Arn",
-          "documentation":"<p>The Amazon Resource Name (ARN) that identifies the execution.</p>"
+          "documentation":"<p>The Amazon Resource Name (ARN) that id entifies the execution.</p>"
         },
         "startDate":{
           "shape":"Timestamp",
@@ -1600,7 +1679,7 @@
       "members":{
         "name":{
           "shape":"Name",
-          "documentation":"<p>The name of the state.</p> <p>A name must <i>not</i> contain:</p> <ul> <li> <p>white space</p> </li> <li> <p>brackets <code>&lt; &gt; { } [ ]</code> </p> </li> <li> <p>wildcard characters <code>? *</code> </p> </li> <li> <p>special characters <code>\" # % \\ ^ | ~ ` $ &amp; , ; : /</code> </p> </li> <li> <p>control characters (<code>U+0000-001F</code>, <code>U+007F-009F</code>)</p> </li> </ul>"
+          "documentation":"<p>The name of the state.</p> <p>A name must <i>not</i> contain:</p> <ul> <li> <p>white space</p> </li> <li> <p>brackets <code>&lt; &gt; { } [ ]</code> </p> </li> <li> <p>wildcard characters <code>? *</code> </p> </li> <li> <p>special characters <code>\" # % \\ ^ | ~ ` $ &amp; , ; : /</code> </p> </li> <li> <p>control characters (<code>U+0000-001F</code>, <code>U+007F-009F</code>)</p> </li> </ul> <p>To enable logging with CloudWatch Logs, the name should only contain 0-9, A-Z, a-z, - and _.</p>"
         },
         "output":{
           "shape":"SensitiveData",
@@ -1650,6 +1729,7 @@
       "required":[
         "stateMachineArn",
         "name",
+        "type",
         "creationDate"
       ],
       "members":{
@@ -1659,7 +1739,11 @@
         },
         "name":{
           "shape":"Name",
-          "documentation":"<p>The name of the state machine.</p> <p>A name must <i>not</i> contain:</p> <ul> <li> <p>white space</p> </li> <li> <p>brackets <code>&lt; &gt; { } [ ]</code> </p> </li> <li> <p>wildcard characters <code>? *</code> </p> </li> <li> <p>special characters <code>\" # % \\ ^ | ~ ` $ &amp; , ; : /</code> </p> </li> <li> <p>control characters (<code>U+0000-001F</code>, <code>U+007F-009F</code>)</p> </li> </ul>"
+          "documentation":"<p>The name of the state machine.</p> <p>A name must <i>not</i> contain:</p> <ul> <li> <p>white space</p> </li> <li> <p>brackets <code>&lt; &gt; { } [ ]</code> </p> </li> <li> <p>wildcard characters <code>? *</code> </p> </li> <li> <p>special characters <code>\" # % \\ ^ | ~ ` $ &amp; , ; : /</code> </p> </li> <li> <p>control characters (<code>U+0000-001F</code>, <code>U+007F-009F</code>)</p> </li> </ul> <p>To enable logging with CloudWatch Logs, the name should only contain 0-9, A-Z, a-z, - and _.</p>"
+        },
+        "type":{
+          "shape":"StateMachineType",
+          "documentation":"<p/>"
         },
         "creationDate":{
           "shape":"Timestamp",
@@ -1675,6 +1759,21 @@
         "DELETING"
       ]
     },
+    "StateMachineType":{
+      "type":"string",
+      "enum":[
+        "STANDARD",
+        "EXPRESS"
+      ]
+    },
+    "StateMachineTypeNotSupported":{
+      "type":"structure",
+      "members":{
+        "message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p/>",
+      "exception":true
+    },
     "StopExecutionInput":{
       "type":"structure",
       "required":["executionArn"],
@@ -2027,6 +2126,10 @@
         "roleArn":{
           "shape":"Arn",
           "documentation":"<p>The Amazon Resource Name (ARN) of the IAM role of the state machine.</p>"
+        },
+        "loggingConfiguration":{
+          "shape":"LoggingConfiguration",
+          "documentation":"<p>The <code>LoggingConfiguration</code> data type is used to set CloudWatch Logs options.</p>"
         }
       }
     },
diff --git a/services/shield/build.properties b/services/shield/build.properties
index ecf2dae6fcb1..15ec2da1fc71 100644
--- a/services/shield/build.properties
+++ b/services/shield/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/shield/pom.xml b/services/shield/pom.xml
index a69899570787..3a3f5ca5e4a1 100644
--- a/services/shield/pom.xml
+++ b/services/shield/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>shield</artifactId>
     <name>AWS Java SDK :: Services :: AWS Shield</name>
diff --git a/services/shield/src/main/resources/codegen-resources/service-2.json b/services/shield/src/main/resources/codegen-resources/service-2.json
index 711c053eacae..c9226f462c28 100644
--- a/services/shield/src/main/resources/codegen-resources/service-2.json
+++ b/services/shield/src/main/resources/codegen-resources/service-2.json
@@ -51,6 +51,23 @@
       ],
       "documentation":"<p>Authorizes the DDoS Response team (DRT), using the specified role, to access your AWS account to assist with DDoS attack mitigation during potential attacks. This enables the DRT to inspect your AWS WAF configuration and create or update AWS WAF rules and web ACLs.</p> <p>You can associate only one <code>RoleArn</code> with your subscription. If you submit an <code>AssociateDRTRole</code> request for an account that already has an associated role, the new <code>RoleArn</code> will replace the existing <code>RoleArn</code>. </p> <p>Prior to making the <code>AssociateDRTRole</code> request, you must attach the <a href=\"https://console.aws.amazon.com/iam/home?#/policies/arn:aws:iam::aws:policy/service-role/AWSShieldDRTAccessPolicy\">AWSShieldDRTAccessPolicy</a> managed policy to the role you will specify in the request. For more information see <a href=\" https://docs.aws.amazon.com/IAM/latest/UserGuide/access_policies_manage-attach-detach.html\">Attaching and Detaching IAM Policies</a>. The role must also trust the service principal <code> drt.shield.amazonaws.com</code>. For more information, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/reference_policies_elements_principal.html\">IAM JSON Policy Elements: Principal</a>.</p> <p>The DRT will have access only to your AWS WAF and Shield resources. By submitting this request, you authorize the DRT to inspect your AWS WAF and Shield configuration and create and update AWS WAF rules and web ACLs on your behalf. The DRT takes these actions only if explicitly authorized by you.</p> <p>You must have the <code>iam:PassRole</code> permission to make an <code>AssociateDRTRole</code> request. For more information, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use_passrole.html\">Granting a User Permissions to Pass a Role to an AWS Service</a>. </p> <p>To use the services of the DRT and make an <code>AssociateDRTRole</code> request, you must be subscribed to the <a href=\"https://aws.amazon.com/premiumsupport/business-support/\">Business Support plan</a> or the <a href=\"https://aws.amazon.com/premiumsupport/enterprise-support/\">Enterprise Support plan</a>.</p>"
     },
+    "AssociateHealthCheck":{
+      "name":"AssociateHealthCheck",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"AssociateHealthCheckRequest"},
+      "output":{"shape":"AssociateHealthCheckResponse"},
+      "errors":[
+        {"shape":"InternalErrorException"},
+        {"shape":"LimitsExceededException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InvalidParameterException"},
+        {"shape":"OptimisticLockException"}
+      ],
+      "documentation":"<p>Adds health-based detection to the Shield Advanced protection for a resource. Shield Advanced health-based detection uses the health of your AWS resource to improve responsiveness and accuracy in attack detection and mitigation. </p> <p>You define the health check in Route 53 and then associate it with your Shield Advanced protection. For more information, see <a href=\"https://docs.aws.amazon.com/waf/latest/developerguide/ddos-overview.html#ddos-advanced-health-check-option\">Shield Advanced Health-Based Detection</a> in the <a href=\"https://docs.aws.amazon.com/waf/latest/developerguide/\">AWS WAF and AWS Shield Developer Guide</a>. </p>"
+    },
     "CreateProtection":{
       "name":"CreateProtection",
       "http":{
@@ -220,6 +237,22 @@
       ],
       "documentation":"<p>Removes the DDoS Response team's (DRT) access to your AWS account.</p> <p>To make a <code>DisassociateDRTRole</code> request, you must be subscribed to the <a href=\"https://aws.amazon.com/premiumsupport/business-support/\">Business Support plan</a> or the <a href=\"https://aws.amazon.com/premiumsupport/enterprise-support/\">Enterprise Support plan</a>. However, if you are not subscribed to one of these support plans, but had been previously and had granted the DRT access to your account, you can submit a <code>DisassociateDRTRole</code> request to remove this access.</p>"
     },
+    "DisassociateHealthCheck":{
+      "name":"DisassociateHealthCheck",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DisassociateHealthCheckRequest"},
+      "output":{"shape":"DisassociateHealthCheckResponse"},
+      "errors":[
+        {"shape":"InternalErrorException"},
+        {"shape":"InvalidParameterException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"OptimisticLockException"}
+      ],
+      "documentation":"<p>Removes health-based detection from the Shield Advanced protection for a resource. Shield Advanced health-based detection uses the health of your AWS resource to improve responsiveness and accuracy in attack detection and mitigation. </p> <p>You define the health check in Route 53 and then associate or disassociate it with your Shield Advanced protection. For more information, see <a href=\"https://docs.aws.amazon.com/waf/latest/developerguide/ddos-overview.html#ddos-advanced-health-check-option\">Shield Advanced Health-Based Detection</a> in the <a href=\"https://docs.aws.amazon.com/waf/latest/developerguide/\">AWS WAF and AWS Shield Developer Guide</a>. </p>"
+    },
     "GetSubscriptionState":{
       "name":"GetSubscriptionState",
       "http":{
@@ -311,7 +344,7 @@
       "members":{
         "message":{"shape":"errorMessage"}
       },
-      "documentation":"<p>In order to grant the necessary access to the DDoS Response Team, the user submitting <code>AssociateDRTRole</code> must have the <code>iam:PassRole</code> permission. This error indicates the user did not have the appropriate permissions. For more information, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use_passrole.html\">Granting a User Permissions to Pass a Role to an AWS Service</a>. </p>",
+      "documentation":"<p>In order to grant the necessary access to the DDoS Response Team, the user submitting the request must have the <code>iam:PassRole</code> permission. This error indicates the user did not have the appropriate permissions. For more information, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use_passrole.html\">Granting a User Permissions to Pass a Role to an AWS Service</a>. </p>",
       "exception":true
     },
     "AssociateDRTLogBucketRequest":{
@@ -344,6 +377,28 @@
       "members":{
       }
     },
+    "AssociateHealthCheckRequest":{
+      "type":"structure",
+      "required":[
+        "ProtectionId",
+        "HealthCheckArn"
+      ],
+      "members":{
+        "ProtectionId":{
+          "shape":"ProtectionId",
+          "documentation":"<p>The unique identifier (ID) for the <a>Protection</a> object to add the health check association to. </p>"
+        },
+        "HealthCheckArn":{
+          "shape":"HealthCheckArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the health check to associate with the protection.</p>"
+        }
+      }
+    },
+    "AssociateHealthCheckResponse":{
+      "type":"structure",
+      "members":{
+      }
+    },
     "AttackDetail":{
       "type":"structure",
       "members":{
@@ -680,6 +735,28 @@
       "members":{
       }
     },
+    "DisassociateHealthCheckRequest":{
+      "type":"structure",
+      "required":[
+        "ProtectionId",
+        "HealthCheckArn"
+      ],
+      "members":{
+        "ProtectionId":{
+          "shape":"ProtectionId",
+          "documentation":"<p>The unique identifier (ID) for the <a>Protection</a> object to remove the health check association from. </p>"
+        },
+        "HealthCheckArn":{
+          "shape":"HealthCheckArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the health check that is associated with the protection.</p>"
+        }
+      }
+    },
+    "DisassociateHealthCheckResponse":{
+      "type":"structure",
+      "members":{
+      }
+    },
     "Double":{"type":"double"},
     "DurationInSeconds":{
       "type":"long",
@@ -723,6 +800,17 @@
         }
       }
     },
+    "HealthCheckArn":{
+      "type":"string",
+      "max":2048,
+      "min":1,
+      "pattern":"^arn:aws:route53:::healthcheck/\\S{36}$"
+    },
+    "HealthCheckId":{"type":"string"},
+    "HealthCheckIds":{
+      "type":"list",
+      "member":{"shape":"HealthCheckId"}
+    },
     "Integer":{"type":"integer"},
     "InternalErrorException":{
       "type":"structure",
@@ -930,6 +1018,10 @@
         "ResourceArn":{
           "shape":"ResourceArn",
           "documentation":"<p>The ARN (Amazon Resource Name) of the AWS resource that is protected.</p>"
+        },
+        "HealthCheckIds":{
+          "shape":"HealthCheckIds",
+          "documentation":"<p>The unique identifier (ID) for the Route 53 health check that's associated with the protection. </p>"
         }
       },
       "documentation":"<p>An object that represents a resource that is under DDoS protection.</p>"
diff --git a/services/shield/src/test/resources/cucumber.properties b/services/shield/src/test/resources/cucumber.properties
index ee9b6310f4ec..746b04154a06 100644
--- a/services/shield/src/test/resources/cucumber.properties
+++ b/services/shield/src/test/resources/cucumber.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/signer/pom.xml b/services/signer/pom.xml
index 00ced8f3035f..0e679a824282 100644
--- a/services/signer/pom.xml
+++ b/services/signer/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,12 +21,12 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>signer</artifactId>
-    <name>AWS Java SDK :: Services :: signer</name>
-    <description>The AWS Java SDK for signer module holds the client classes that are used for
-        communicating with signer.
+    <name>AWS Java SDK :: Services :: Signer</name>
+    <description>The AWS Java SDK for Signer module holds the client classes that are used for
+        communicating with Signer.
     </description>
     <url>https://aws.amazon.com/sdkforjava</url>
     <build>
diff --git a/services/signer/src/main/resources/codegen-resources/service-2.json b/services/signer/src/main/resources/codegen-resources/service-2.json
index c9df5c966a36..c72da71cf41a 100644
--- a/services/signer/src/main/resources/codegen-resources/service-2.json
+++ b/services/signer/src/main/resources/codegen-resources/service-2.json
@@ -88,7 +88,7 @@
         {"shape":"ThrottlingException"},
         {"shape":"InternalServiceErrorException"}
       ],
-      "documentation":"<p>Lists all your signing jobs. You can use the <code>maxResults</code> parameter to limit the number of signing jobs that are returned in the response. If additional jobs remain to be listed, AWS Signer returns a <code>nextToken</code> value. Use this value in subsequent calls to <code>ListSigningJobs</code> to fetch the remaining values. You can continue calling <code>ListSigningJobs</code> with your <code>maxResults</code> parameter and with new values that AWS Signer returns in the <code>nextToken</code> parameter until all of your signing jobs have been returned. </p>"
+      "documentation":"<p>Lists all your signing jobs. You can use the <code>maxResults</code> parameter to limit the number of signing jobs that are returned in the response. If additional jobs remain to be listed, code signing returns a <code>nextToken</code> value. Use this value in subsequent calls to <code>ListSigningJobs</code> to fetch the remaining values. You can continue calling <code>ListSigningJobs</code> with your <code>maxResults</code> parameter and with new values that code signing returns in the <code>nextToken</code> parameter until all of your signing jobs have been returned. </p>"
     },
     "ListSigningPlatforms":{
       "name":"ListSigningPlatforms",
@@ -104,7 +104,7 @@
         {"shape":"ThrottlingException"},
         {"shape":"InternalServiceErrorException"}
       ],
-      "documentation":"<p>Lists all signing platforms available in AWS Signer that match the request parameters. If additional jobs remain to be listed, AWS Signer returns a <code>nextToken</code> value. Use this value in subsequent calls to <code>ListSigningJobs</code> to fetch the remaining values. You can continue calling <code>ListSigningJobs</code> with your <code>maxResults</code> parameter and with new values that AWS Signer returns in the <code>nextToken</code> parameter until all of your signing jobs have been returned.</p>"
+      "documentation":"<p>Lists all signing platforms available in code signing that match the request parameters. If additional jobs remain to be listed, code signing returns a <code>nextToken</code> value. Use this value in subsequent calls to <code>ListSigningJobs</code> to fetch the remaining values. You can continue calling <code>ListSigningJobs</code> with your <code>maxResults</code> parameter and with new values that code signing returns in the <code>nextToken</code> parameter until all of your signing jobs have been returned.</p>"
     },
     "ListSigningProfiles":{
       "name":"ListSigningProfiles",
@@ -119,7 +119,22 @@
         {"shape":"ThrottlingException"},
         {"shape":"InternalServiceErrorException"}
       ],
-      "documentation":"<p>Lists all available signing profiles in your AWS account. Returns only profiles with an <code>ACTIVE</code> status unless the <code>includeCanceled</code> request field is set to <code>true</code>. If additional jobs remain to be listed, AWS Signer returns a <code>nextToken</code> value. Use this value in subsequent calls to <code>ListSigningJobs</code> to fetch the remaining values. You can continue calling <code>ListSigningJobs</code> with your <code>maxResults</code> parameter and with new values that AWS Signer returns in the <code>nextToken</code> parameter until all of your signing jobs have been returned.</p>"
+      "documentation":"<p>Lists all available signing profiles in your AWS account. Returns only profiles with an <code>ACTIVE</code> status unless the <code>includeCanceled</code> request field is set to <code>true</code>. If additional jobs remain to be listed, code signing returns a <code>nextToken</code> value. Use this value in subsequent calls to <code>ListSigningJobs</code> to fetch the remaining values. You can continue calling <code>ListSigningJobs</code> with your <code>maxResults</code> parameter and with new values that code signing returns in the <code>nextToken</code> parameter until all of your signing jobs have been returned.</p>"
+    },
+    "ListTagsForResource":{
+      "name":"ListTagsForResource",
+      "http":{
+        "method":"GET",
+        "requestUri":"/tags/{resourceArn}"
+      },
+      "input":{"shape":"ListTagsForResourceRequest"},
+      "output":{"shape":"ListTagsForResourceResponse"},
+      "errors":[
+        {"shape":"InternalServiceErrorException"},
+        {"shape":"BadRequestException"},
+        {"shape":"NotFoundException"}
+      ],
+      "documentation":"<p>Returns a list of the tags associated with a signing profile resource.</p>"
     },
     "PutSigningProfile":{
       "name":"PutSigningProfile",
@@ -136,7 +151,7 @@
         {"shape":"ThrottlingException"},
         {"shape":"InternalServiceErrorException"}
       ],
-      "documentation":"<p>Creates a signing profile. A signing profile is an AWS Signer template that can be used to carry out a pre-defined signing job. For more information, see <a href=\"http://docs.aws.amazon.com/signer/latest/developerguide/gs-profile.html\">http://docs.aws.amazon.com/signer/latest/developerguide/gs-profile.html</a> </p>"
+      "documentation":"<p>Creates a signing profile. A signing profile is a code signing template that can be used to carry out a pre-defined signing job. For more information, see <a href=\"http://docs.aws.amazon.com/signer/latest/developerguide/gs-profile.html\">http://docs.aws.amazon.com/signer/latest/developerguide/gs-profile.html</a> </p>"
     },
     "StartSigningJob":{
       "name":"StartSigningJob",
@@ -153,7 +168,37 @@
         {"shape":"ThrottlingException"},
         {"shape":"InternalServiceErrorException"}
       ],
-      "documentation":"<p>Initiates a signing job to be performed on the code provided. Signing jobs are viewable by the <code>ListSigningJobs</code> operation for two years after they are performed. Note the following requirements: </p> <ul> <li> <p> You must create an Amazon S3 source bucket. For more information, see <a href=\"http://docs.aws.amazon.com/AmazonS3/latest/gsg/CreatingABucket.html\">Create a Bucket</a> in the <i>Amazon S3 Getting Started Guide</i>. </p> </li> <li> <p>Your S3 source bucket must be version enabled.</p> </li> <li> <p>You must create an S3 destination bucket. AWS Signer uses your S3 destination bucket to write your signed code.</p> </li> <li> <p>You specify the name of the source and destination buckets when calling the <code>StartSigningJob</code> operation.</p> </li> <li> <p>You must also specify a request token that identifies your request to AWS Signer. </p> </li> </ul> <p>You can call the <a>DescribeSigningJob</a> and the <a>ListSigningJobs</a> actions after you call <code>StartSigningJob</code>.</p> <p>For a Java example that shows how to use this action, see <a href=\"http://docs.aws.amazon.com/acm/latest/userguide/\">http://docs.aws.amazon.com/acm/latest/userguide/</a> </p>"
+      "documentation":"<p>Initiates a signing job to be performed on the code provided. Signing jobs are viewable by the <code>ListSigningJobs</code> operation for two years after they are performed. Note the following requirements: </p> <ul> <li> <p> You must create an Amazon S3 source bucket. For more information, see <a href=\"http://docs.aws.amazon.com/AmazonS3/latest/gsg/CreatingABucket.html\">Create a Bucket</a> in the <i>Amazon S3 Getting Started Guide</i>. </p> </li> <li> <p>Your S3 source bucket must be version enabled.</p> </li> <li> <p>You must create an S3 destination bucket. Code signing uses your S3 destination bucket to write your signed code.</p> </li> <li> <p>You specify the name of the source and destination buckets when calling the <code>StartSigningJob</code> operation.</p> </li> <li> <p>You must also specify a request token that identifies your request to code signing.</p> </li> </ul> <p>You can call the <a>DescribeSigningJob</a> and the <a>ListSigningJobs</a> actions after you call <code>StartSigningJob</code>.</p> <p>For a Java example that shows how to use this action, see <a href=\"http://docs.aws.amazon.com/acm/latest/userguide/\">http://docs.aws.amazon.com/acm/latest/userguide/</a> </p>"
+    },
+    "TagResource":{
+      "name":"TagResource",
+      "http":{
+        "method":"POST",
+        "requestUri":"/tags/{resourceArn}"
+      },
+      "input":{"shape":"TagResourceRequest"},
+      "output":{"shape":"TagResourceResponse"},
+      "errors":[
+        {"shape":"InternalServiceErrorException"},
+        {"shape":"BadRequestException"},
+        {"shape":"NotFoundException"}
+      ],
+      "documentation":"<p>Adds one or more tags to a signing profile. Tags are labels that you can use to identify and organize your AWS resources. Each tag consists of a key and an optional value. To specify the signing profile, use its Amazon Resource Name (ARN). To specify the tag, use a key-value pair.</p>"
+    },
+    "UntagResource":{
+      "name":"UntagResource",
+      "http":{
+        "method":"DELETE",
+        "requestUri":"/tags/{resourceArn}"
+      },
+      "input":{"shape":"UntagResourceRequest"},
+      "output":{"shape":"UntagResourceResponse"},
+      "errors":[
+        {"shape":"InternalServiceErrorException"},
+        {"shape":"BadRequestException"},
+        {"shape":"NotFoundException"}
+      ],
+      "documentation":"<p>Removes one or more tags from a signing profile. To remove the tags, specify a list of tag keys.</p>"
     }
   },
   "shapes":{
@@ -167,6 +212,15 @@
       "error":{"httpStatusCode":403},
       "exception":true
     },
+    "BadRequestException":{
+      "type":"structure",
+      "members":{
+        "message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p>The request contains invalid parameters for the ARN or tags. This exception also occurs when you call a tagging API on a cancelled signing profile.</p>",
+      "error":{"httpStatusCode":400},
+      "exception":true
+    },
     "BucketName":{"type":"string"},
     "CancelSigningProfileRequest":{
       "type":"structure",
@@ -213,7 +267,7 @@
         },
         "signingMaterial":{
           "shape":"SigningMaterial",
-          "documentation":"<p>Amazon Resource Name (ARN) of your code signing certificate.</p>"
+          "documentation":"<p>The Amazon Resource Name (ARN) of your code signing certificate.</p>"
         },
         "platformId":{
           "shape":"PlatformId",
@@ -253,7 +307,7 @@
         },
         "signedObject":{
           "shape":"SignedObject",
-          "documentation":"<p>Name of the S3 bucket where the signed code image is saved by AWS Signer.</p>"
+          "documentation":"<p>Name of the S3 bucket where the signed code image is saved by code signing.</p>"
         }
       }
     },
@@ -284,14 +338,14 @@
       "members":{
         "allowedValues":{
           "shape":"EncryptionAlgorithms",
-          "documentation":"<p>The set of accepted encryption algorithms that are allowed in an AWS Signer job.</p>"
+          "documentation":"<p>The set of accepted encryption algorithms that are allowed in a code signing job.</p>"
         },
         "defaultValue":{
           "shape":"EncryptionAlgorithm",
-          "documentation":"<p>The default encryption algorithm that is used by an AWS Signer job.</p>"
+          "documentation":"<p>The default encryption algorithm that is used by a code signing job.</p>"
         }
       },
-      "documentation":"<p>The encryption algorithm options that are available to an AWS Signer job.</p>"
+      "documentation":"<p>The encryption algorithm options that are available to a code signing job.</p>"
     },
     "EncryptionAlgorithms":{
       "type":"list",
@@ -385,6 +439,14 @@
         "status":{
           "shape":"SigningProfileStatus",
           "documentation":"<p>The status of the target signing profile.</p>"
+        },
+        "arn":{
+          "shape":"string",
+          "documentation":"<p>The Amazon Resource Name (ARN) for the signing profile.</p>"
+        },
+        "tags":{
+          "shape":"TagMap",
+          "documentation":"<p>A list of tags associated with the signing profile.</p>"
         }
       }
     },
@@ -404,14 +466,14 @@
       "members":{
         "allowedValues":{
           "shape":"HashAlgorithms",
-          "documentation":"<p>The set of accepted hash algorithms allowed in an AWS Signer job.</p>"
+          "documentation":"<p>The set of accepted hash algorithms allowed in a code signing job.</p>"
         },
         "defaultValue":{
           "shape":"HashAlgorithm",
-          "documentation":"<p>The default hash algorithm that is used in an AWS Signer job.</p>"
+          "documentation":"<p>The default hash algorithm that is used in a code signing job.</p>"
         }
       },
-      "documentation":"<p>The hash algorithms that are available to an AWS Signer job.</p>"
+      "documentation":"<p>The hash algorithms that are available to a code signing job.</p>"
     },
     "HashAlgorithms":{
       "type":"list",
@@ -419,7 +481,11 @@
     },
     "ImageFormat":{
       "type":"string",
-      "enum":["JSON"]
+      "enum":[
+        "JSON",
+        "JSONEmbedded",
+        "JSONDetached"
+      ]
     },
     "ImageFormats":{
       "type":"list",
@@ -568,6 +634,27 @@
         }
       }
     },
+    "ListTagsForResourceRequest":{
+      "type":"structure",
+      "required":["resourceArn"],
+      "members":{
+        "resourceArn":{
+          "shape":"String",
+          "documentation":"<p>The Amazon Resource Name (ARN) for the signing profile.</p>",
+          "location":"uri",
+          "locationName":"resourceArn"
+        }
+      }
+    },
+    "ListTagsForResourceResponse":{
+      "type":"structure",
+      "members":{
+        "tags":{
+          "shape":"TagMap",
+          "documentation":"<p>A list of tags associated with the signing profile.</p>"
+        }
+      }
+    },
     "MaxResults":{
       "type":"integer",
       "box":true,
@@ -576,11 +663,20 @@
     },
     "MaxSizeInMB":{"type":"integer"},
     "NextToken":{"type":"string"},
+    "NotFoundException":{
+      "type":"structure",
+      "members":{
+        "message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p>The signing profile was not found.</p>",
+      "error":{"httpStatusCode":404},
+      "exception":true
+    },
     "PlatformId":{"type":"string"},
     "Prefix":{"type":"string"},
     "ProfileName":{
       "type":"string",
-      "max":20,
+      "max":64,
       "min":2,
       "pattern":"^[a-zA-Z0-9_]{2,}"
     },
@@ -604,7 +700,7 @@
         },
         "platformId":{
           "shape":"PlatformId",
-          "documentation":"<p>The ID of the signing profile to be created.</p>"
+          "documentation":"<p>The ID of the signing platform to be created.</p>"
         },
         "overrides":{
           "shape":"SigningPlatformOverrides",
@@ -613,6 +709,10 @@
         "signingParameters":{
           "shape":"SigningParameters",
           "documentation":"<p>Map of key-value pairs for signing. These can include any information that you want to use during signing.</p>"
+        },
+        "tags":{
+          "shape":"TagMap",
+          "documentation":"<p>Tags to be associated with the signing profile that is being created.</p>"
         }
       }
     },
@@ -647,7 +747,7 @@
           "documentation":"<p>An Amazon S3 prefix that you can use to limit responses to those that begin with the specified prefix.</p>"
         }
       },
-      "documentation":"<p>The name and prefix of the S3 bucket where AWS Signer saves your signed objects.</p>"
+      "documentation":"<p>The name and prefix of the S3 bucket where code signing saves your signed objects.</p>"
     },
     "S3SignedObject":{
       "type":"structure",
@@ -661,7 +761,7 @@
           "documentation":"<p>Key name that uniquely identifies a signed code image in your bucket.</p>"
         }
       },
-      "documentation":"<p>The S3 bucket name and key where AWS Signer saved your signed code image.</p>"
+      "documentation":"<p>The S3 bucket name and key where code signing saved your signed code image.</p>"
     },
     "S3Source":{
       "type":"structure",
@@ -705,25 +805,25 @@
       "members":{
         "encryptionAlgorithmOptions":{
           "shape":"EncryptionAlgorithmOptions",
-          "documentation":"<p>The encryption algorithm options that are available for an AWS Signer job.</p>"
+          "documentation":"<p>The encryption algorithm options that are available for a code signing job.</p>"
         },
         "hashAlgorithmOptions":{
           "shape":"HashAlgorithmOptions",
-          "documentation":"<p>The hash algorithm options that are available for an AWS Signer job.</p>"
+          "documentation":"<p>The hash algorithm options that are available for a code signing job.</p>"
         }
       },
-      "documentation":"<p>The configuration of an AWS Signer operation.</p>"
+      "documentation":"<p>The configuration of a code signing operation.</p>"
     },
     "SigningConfigurationOverrides":{
       "type":"structure",
       "members":{
         "encryptionAlgorithm":{
           "shape":"EncryptionAlgorithm",
-          "documentation":"<p>A specified override of the default encryption algorithm that is used in an AWS Signer job.</p>"
+          "documentation":"<p>A specified override of the default encryption algorithm that is used in a code signing job.</p>"
         },
         "hashAlgorithm":{
           "shape":"HashAlgorithm",
-          "documentation":"<p>A specified override of the default hash algorithm that is used in an AWS Signer job.</p>"
+          "documentation":"<p>A specified override of the default hash algorithm that is used in a code signing job.</p>"
         }
       },
       "documentation":"<p>A signing configuration that overrides the default encryption or hash algorithm of a signing job.</p>"
@@ -737,14 +837,14 @@
       "members":{
         "supportedFormats":{
           "shape":"ImageFormats",
-          "documentation":"<p>The supported formats of an AWS Signer signing image.</p>"
+          "documentation":"<p>The supported formats of a code signing image.</p>"
         },
         "defaultFormat":{
           "shape":"ImageFormat",
-          "documentation":"<p>The default format of an AWS Signer signing image.</p>"
+          "documentation":"<p>The default format of a code signing image.</p>"
         }
       },
-      "documentation":"<p>The image format of an AWS Signer platform or profile.</p>"
+      "documentation":"<p>The image format of a code signing platform or profile.</p>"
     },
     "SigningJob":{
       "type":"structure",
@@ -803,45 +903,49 @@
       "members":{
         "platformId":{
           "shape":"String",
-          "documentation":"<p>The ID of an AWS Signer platform.</p>"
+          "documentation":"<p>The ID of a code signing; platform.</p>"
         },
         "displayName":{
           "shape":"String",
-          "documentation":"<p>The display name of an AWS Signer platform.</p>"
+          "documentation":"<p>The display name of a code signing platform.</p>"
         },
         "partner":{
           "shape":"String",
-          "documentation":"<p>Any partner entities linked to an AWS Signer platform.</p>"
+          "documentation":"<p>Any partner entities linked to a code signing platform.</p>"
         },
         "target":{
           "shape":"String",
-          "documentation":"<p>The types of targets that can be signed by an AWS Signer platform.</p>"
+          "documentation":"<p>The types of targets that can be signed by a code signing platform.</p>"
         },
         "category":{
           "shape":"Category",
-          "documentation":"<p>The category of an AWS Signer platform.</p>"
+          "documentation":"<p>The category of a code signing platform.</p>"
         },
         "signingConfiguration":{
           "shape":"SigningConfiguration",
-          "documentation":"<p>The configuration of an AWS Signer platform. This includes the designated hash algorithm and encryption algorithm of a signing platform.</p>"
-        },
-        "signingImageFormat":{
-          "shape":"SigningImageFormat",
-          "documentation":"<p>The signing image format that is used by an AWS Signer platform.</p>"
+          "documentation":"<p>The configuration of a code signing platform. This includes the designated hash algorithm and encryption algorithm of a signing platform.</p>"
         },
+        "signingImageFormat":{"shape":"SigningImageFormat"},
         "maxSizeInMB":{
           "shape":"MaxSizeInMB",
-          "documentation":"<p>The maximum size (in MB) of code that can be signed by a AWS Signer platform.</p>"
+          "documentation":"<p>The maximum size (in MB) of code that can be signed by a code signing platform.</p>"
         }
       },
-      "documentation":"<p>Contains information about the signing configurations and parameters that is used to perform an AWS Signer job.</p>"
+      "documentation":"<p>Contains information about the signing configurations and parameters that are used to perform a code signing job.</p>"
     },
     "SigningPlatformOverrides":{
       "type":"structure",
       "members":{
-        "signingConfiguration":{"shape":"SigningConfigurationOverrides"}
+        "signingConfiguration":{
+          "shape":"SigningConfigurationOverrides",
+          "documentation":"<p>A signing configuration that overrides the default encryption or hash algorithm of a signing job.</p>"
+        },
+        "signingImageFormat":{
+          "shape":"ImageFormat",
+          "documentation":"<p>A signed image is a JSON object. When overriding the default signing platform configuration, a customer can select either of two signing formats, <code>JSONEmbedded</code> or <code>JSONDetached</code>. (A third format value, <code>JSON</code>, is reserved for future use.) With <code>JSONEmbedded</code>, the signing image has the payload embedded in it. With <code>JSONDetached</code>, the payload is not be embedded in the signing image.</p>"
+        }
       },
-      "documentation":"<p>Any overrides that are applied to the signing configuration of an AWS Signer platform.</p>"
+      "documentation":"<p>Any overrides that are applied to the signing configuration of a code signing platform.</p>"
     },
     "SigningPlatforms":{
       "type":"list",
@@ -852,7 +956,7 @@
       "members":{
         "profileName":{
           "shape":"ProfileName",
-          "documentation":"<p>The name of the AWS Signer profile.</p>"
+          "documentation":"<p>The name of the signing profile.</p>"
         },
         "signingMaterial":{
           "shape":"SigningMaterial",
@@ -864,14 +968,22 @@
         },
         "signingParameters":{
           "shape":"SigningParameters",
-          "documentation":"<p>The parameters that are available for use by an AWS Signer user.</p>"
+          "documentation":"<p>The parameters that are available for use by a code signing user.</p>"
         },
         "status":{
           "shape":"SigningProfileStatus",
-          "documentation":"<p>The status of an AWS Signer profile.</p>"
+          "documentation":"<p>The status of a code signing profile.</p>"
+        },
+        "arn":{
+          "shape":"string",
+          "documentation":"<p>The Amazon Resource Name (ARN) for the signing profile.</p>"
+        },
+        "tags":{
+          "shape":"TagMap",
+          "documentation":"<p>A list of tags associated with the signing profile.</p>"
         }
       },
-      "documentation":"<p>Contains information about the ACM certificates and AWS Signer configuration parameters that can be used by a given AWS Signer user.</p>"
+      "documentation":"<p>Contains information about the ACM certificates and code signing configuration parameters that can be used by a given code signing user.</p>"
     },
     "SigningProfileStatus":{
       "type":"string",
@@ -940,6 +1052,53 @@
     },
     "StatusReason":{"type":"string"},
     "String":{"type":"string"},
+    "TagKey":{
+      "type":"string",
+      "max":128,
+      "min":1,
+      "pattern":"^(?!aws:)[a-zA-Z+-=._:/]+$"
+    },
+    "TagKeyList":{
+      "type":"list",
+      "member":{"shape":"TagKey"},
+      "max":200,
+      "min":1
+    },
+    "TagMap":{
+      "type":"map",
+      "key":{"shape":"TagKey"},
+      "value":{"shape":"TagValue"},
+      "max":200,
+      "min":1
+    },
+    "TagResourceRequest":{
+      "type":"structure",
+      "required":[
+        "resourceArn",
+        "tags"
+      ],
+      "members":{
+        "resourceArn":{
+          "shape":"String",
+          "documentation":"<p>The Amazon Resource Name (ARN) for the signing profile.</p>",
+          "location":"uri",
+          "locationName":"resourceArn"
+        },
+        "tags":{
+          "shape":"TagMap",
+          "documentation":"<p>One or more tags to be associated with the signing profile.</p>"
+        }
+      }
+    },
+    "TagResourceResponse":{
+      "type":"structure",
+      "members":{
+      }
+    },
+    "TagValue":{
+      "type":"string",
+      "max":256
+    },
     "ThrottlingException":{
       "type":"structure",
       "members":{
@@ -949,6 +1108,32 @@
       "error":{"httpStatusCode":429},
       "exception":true
     },
+    "UntagResourceRequest":{
+      "type":"structure",
+      "required":[
+        "resourceArn",
+        "tagKeys"
+      ],
+      "members":{
+        "resourceArn":{
+          "shape":"String",
+          "documentation":"<p>The Amazon Resource Name (ARN) for the signing profile.</p>",
+          "location":"uri",
+          "locationName":"resourceArn"
+        },
+        "tagKeys":{
+          "shape":"TagKeyList",
+          "documentation":"<p>A list of tag keys to be removed from the signing profile.</p>",
+          "location":"querystring",
+          "locationName":"tagKeys"
+        }
+      }
+    },
+    "UntagResourceResponse":{
+      "type":"structure",
+      "members":{
+      }
+    },
     "ValidationException":{
       "type":"structure",
       "members":{
@@ -962,5 +1147,5 @@
     "bool":{"type":"boolean"},
     "string":{"type":"string"}
   },
-  "documentation":"<p>You can use Code Signing for Amazon FreeRTOS (AWS Signer) to sign code that you created for any of the IoT devices that Amazon Web Services supports. AWS Signer is integrated with Amazon FreeRTOS, AWS Certificate Manager, and AWS CloudTrail. Amazon FreeRTOS customers can use AWS Signer to sign code images before making them available for microcontrollers. You can use ACM to import third-party certificates to be used by AWS Signer. For general information about using AWS Signer, see the <a href=\"http://docs.aws.amazon.com/signer/latest/developerguide/Welcome.html\">Code Signing for Amazon FreeRTOS Developer Guide</a>.</p>"
+  "documentation":"<p>With code signing for IoT, you can sign code that you create for any IoT device that is supported by Amazon Web Services (AWS). Code signing is available through <a href=\"http://docs.aws.amazon.com/freertos/latest/userguide/\">Amazon FreeRTOS</a> and <a href=\"http://docs.aws.amazon.com/iot/latest/developerguide/\">AWS IoT Device Management</a>, and integrated with <a href=\"http://docs.aws.amazon.com/acm/latest/userguide/\">AWS Certificate Manager (ACM)</a>. In order to sign code, you import a third-party code signing certificate with ACM that is used to sign updates in Amazon FreeRTOS and AWS IoT Device Management. For general information about using code signing, see the <a href=\"http://docs.aws.amazon.com/signer/latest/developerguide/Welcome.html\">Code Signing for IoT Developer Guide</a>.</p>"
 }
diff --git a/services/sms/build.properties b/services/sms/build.properties
index ecf2dae6fcb1..15ec2da1fc71 100644
--- a/services/sms/build.properties
+++ b/services/sms/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/sms/pom.xml b/services/sms/pom.xml
index 13d9783dd092..645644804c84 100644
--- a/services/sms/pom.xml
+++ b/services/sms/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>sms</artifactId>
     <name>AWS Java SDK :: Services :: AWS Server Migration</name>
diff --git a/services/sms/src/test/resources/cucumber.properties b/services/sms/src/test/resources/cucumber.properties
index 9a6ea7496bb5..557475c220b1 100644
--- a/services/sms/src/test/resources/cucumber.properties
+++ b/services/sms/src/test/resources/cucumber.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/snowball/build.properties b/services/snowball/build.properties
index ecf2dae6fcb1..15ec2da1fc71 100644
--- a/services/snowball/build.properties
+++ b/services/snowball/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/snowball/pom.xml b/services/snowball/pom.xml
index 97fa73a71c9d..28ad4041c934 100644
--- a/services/snowball/pom.xml
+++ b/services/snowball/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>snowball</artifactId>
     <name>AWS Java SDK :: Services :: Amazon Snowball</name>
diff --git a/services/snowball/src/main/resources/codegen-resources/service-2.json b/services/snowball/src/main/resources/codegen-resources/service-2.json
index c170a64129c3..1063cd63014c 100644
--- a/services/snowball/src/main/resources/codegen-resources/service-2.json
+++ b/services/snowball/src/main/resources/codegen-resources/service-2.json
@@ -464,7 +464,7 @@
         },
         "SnowballType":{
           "shape":"SnowballType",
-          "documentation":"<p>The type of AWS Snowball device to use for this cluster. Currently, the only supported device type for cluster jobs is <code>EDGE</code>.</p>"
+          "documentation":"<p>The type of AWS Snowball device to use for this cluster. Currently, the only supported device type for cluster jobs is <code>EDGE</code>.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/snowball/latest/developer-guide/device-differences.html\">Snowball Edge Device Options</a> in the Snowball Edge Developer Guide.</p>"
         },
         "CreationDate":{
           "shape":"Timestamp",
@@ -489,6 +489,10 @@
         "ForwardingAddressId":{
           "shape":"AddressId",
           "documentation":"<p>The ID of the address that you want a cluster shipped to, after it will be shipped to its primary address. This field is not supported in most regions.</p>"
+        },
+        "TaxDocuments":{
+          "shape":"TaxDocuments",
+          "documentation":"<p>The tax documents required in your AWS Region.</p>"
         }
       },
       "documentation":"<p>Contains metadata about a specific cluster.</p>"
@@ -576,7 +580,7 @@
         },
         "SnowballType":{
           "shape":"SnowballType",
-          "documentation":"<p>The type of AWS Snowball device to use for this cluster. Currently, the only supported device type for cluster jobs is <code>EDGE</code>.</p>"
+          "documentation":"<p>The type of AWS Snowball device to use for this cluster. Currently, the only supported device type for cluster jobs is <code>EDGE</code>.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/snowball/latest/developer-guide/device-differences.html\">Snowball Edge Device Options</a> in the Snowball Edge Developer Guide.</p>"
         },
         "ShippingOption":{
           "shape":"ShippingOption",
@@ -589,6 +593,10 @@
         "ForwardingAddressId":{
           "shape":"AddressId",
           "documentation":"<p>The forwarding address ID for a cluster. This field is not supported in most regions.</p>"
+        },
+        "TaxDocuments":{
+          "shape":"TaxDocuments",
+          "documentation":"<p>The tax documents required in your AWS Region.</p>"
         }
       }
     },
@@ -646,11 +654,15 @@
         },
         "SnowballType":{
           "shape":"SnowballType",
-          "documentation":"<p>The type of AWS Snowball device to use for this job. Currently, the only supported device type for cluster jobs is <code>EDGE</code>.</p>"
+          "documentation":"<p>The type of AWS Snowball device to use for this job. Currently, the only supported device type for cluster jobs is <code>EDGE</code>.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/snowball/latest/developer-guide/device-differences.html\">Snowball Edge Device Options</a> in the Snowball Edge Developer Guide.</p>"
         },
         "ForwardingAddressId":{
           "shape":"AddressId",
           "documentation":"<p>The forwarding address ID for a job. This field is not supported in most regions.</p>"
+        },
+        "TaxDocuments":{
+          "shape":"TaxDocuments",
+          "documentation":"<p>The tax documents required in your AWS Region.</p>"
         }
       }
     },
@@ -813,6 +825,10 @@
       "type":"list",
       "member":{"shape":"EventTriggerDefinition"}
     },
+    "GSTIN":{
+      "type":"string",
+      "pattern":"\\d{2}[A-Z]{5}\\d{4}[A-Z]{1}[A-Z\\d]{1}[Z]{1}[A-Z\\d]{1}"
+    },
     "GetJobManifestRequest":{
       "type":"structure",
       "required":["JobId"],
@@ -888,6 +904,16 @@
         }
       }
     },
+    "INDTaxDocuments":{
+      "type":"structure",
+      "members":{
+        "GSTIN":{
+          "shape":"GSTIN",
+          "documentation":"<p>The Goods and Services Tax (GST) documents required in AWS Regions in India.</p>"
+        }
+      },
+      "documentation":"<p>The tax documents required in AWS Regions in India.</p>"
+    },
     "Integer":{"type":"integer"},
     "InvalidAddressException":{
       "type":"structure",
@@ -1065,6 +1091,10 @@
         "ForwardingAddressId":{
           "shape":"AddressId",
           "documentation":"<p>The ID of the address that you want a job shipped to, after it will be shipped to its primary address. This field is not supported in most regions.</p>"
+        },
+        "TaxDocuments":{
+          "shape":"TaxDocuments",
+          "documentation":"<p>The metadata associated with the tax documents required in your AWS Region.</p>"
         }
       },
       "documentation":"<p>Contains information about a specific job including shipping information, job status, and other important metadata. This information is returned as a part of the response syntax of the <code>DescribeJob</code> action.</p>"
@@ -1395,6 +1425,16 @@
       "type":"string",
       "min":1
     },
+    "TaxDocuments":{
+      "type":"structure",
+      "members":{
+        "IND":{
+          "shape":"INDTaxDocuments",
+          "documentation":"<p>The tax documents required in AWS Regions in India.</p>"
+        }
+      },
+      "documentation":"<p>The tax documents required in your AWS Region.</p>"
+    },
     "Timestamp":{"type":"timestamp"},
     "UnsupportedAddressException":{
       "type":"structure",
diff --git a/services/snowball/src/test/resources/cucumber.properties b/services/snowball/src/test/resources/cucumber.properties
index 8446a86987ae..8c01b26d5882 100644
--- a/services/snowball/src/test/resources/cucumber.properties
+++ b/services/snowball/src/test/resources/cucumber.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/sns/build.properties b/services/sns/build.properties
index ecf2dae6fcb1..15ec2da1fc71 100644
--- a/services/sns/build.properties
+++ b/services/sns/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/sns/pom.xml b/services/sns/pom.xml
index 8ad7c656aebc..70ae9728a50d 100644
--- a/services/sns/pom.xml
+++ b/services/sns/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>sns</artifactId>
     <name>AWS Java SDK :: Services :: Amazon SNS</name>
diff --git a/services/sns/src/it/java/software/amazon/awssdk/core/auth/policy/SnsPolicyIntegrationTest.java b/services/sns/src/it/java/software/amazon/awssdk/core/auth/policy/SnsPolicyIntegrationTest.java
index 17cc59cf0c3b..28be0c3e7858 100644
--- a/services/sns/src/it/java/software/amazon/awssdk/core/auth/policy/SnsPolicyIntegrationTest.java
+++ b/services/sns/src/it/java/software/amazon/awssdk/core/auth/policy/SnsPolicyIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/sns/src/it/java/software/amazon/awssdk/services/sns/IntegrationTestBase.java b/services/sns/src/it/java/software/amazon/awssdk/services/sns/IntegrationTestBase.java
index 0ea663ee2977..b73c549aa4de 100644
--- a/services/sns/src/it/java/software/amazon/awssdk/services/sns/IntegrationTestBase.java
+++ b/services/sns/src/it/java/software/amazon/awssdk/services/sns/IntegrationTestBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/sns/src/it/java/software/amazon/awssdk/services/sns/MobilePushIntegrationTest.java b/services/sns/src/it/java/software/amazon/awssdk/services/sns/MobilePushIntegrationTest.java
index 141e82af4400..054b4c4e6610 100644
--- a/services/sns/src/it/java/software/amazon/awssdk/services/sns/MobilePushIntegrationTest.java
+++ b/services/sns/src/it/java/software/amazon/awssdk/services/sns/MobilePushIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/sns/src/it/java/software/amazon/awssdk/services/sns/SNSIntegrationTest.java b/services/sns/src/it/java/software/amazon/awssdk/services/sns/SNSIntegrationTest.java
index 5bb597c44d44..d1f9ab38154a 100644
--- a/services/sns/src/it/java/software/amazon/awssdk/services/sns/SNSIntegrationTest.java
+++ b/services/sns/src/it/java/software/amazon/awssdk/services/sns/SNSIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/sns/src/it/java/software/amazon/awssdk/services/sns/SessionBasedAuthenticationIntegrationTest.java b/services/sns/src/it/java/software/amazon/awssdk/services/sns/SessionBasedAuthenticationIntegrationTest.java
index a0852001cc89..6c030cb0891c 100644
--- a/services/sns/src/it/java/software/amazon/awssdk/services/sns/SessionBasedAuthenticationIntegrationTest.java
+++ b/services/sns/src/it/java/software/amazon/awssdk/services/sns/SessionBasedAuthenticationIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/sns/src/it/java/software/amazon/awssdk/services/sns/SignatureChecker.java b/services/sns/src/it/java/software/amazon/awssdk/services/sns/SignatureChecker.java
index 664a4ed11089..48ec473a0659 100644
--- a/services/sns/src/it/java/software/amazon/awssdk/services/sns/SignatureChecker.java
+++ b/services/sns/src/it/java/software/amazon/awssdk/services/sns/SignatureChecker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/sns/src/it/java/software/amazon/awssdk/services/sns/Topics.java b/services/sns/src/it/java/software/amazon/awssdk/services/sns/Topics.java
index 2a089cc8b959..fcbb7a46d76e 100644
--- a/services/sns/src/it/java/software/amazon/awssdk/services/sns/Topics.java
+++ b/services/sns/src/it/java/software/amazon/awssdk/services/sns/Topics.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/sns/src/main/resources/codegen-resources/service-2.json b/services/sns/src/main/resources/codegen-resources/service-2.json
index 44aea81ce211..e470c03fa049 100755
--- a/services/sns/src/main/resources/codegen-resources/service-2.json
+++ b/services/sns/src/main/resources/codegen-resources/service-2.json
@@ -83,7 +83,7 @@
         {"shape":"InternalErrorException"},
         {"shape":"AuthorizationErrorException"}
       ],
-      "documentation":"<p>Creates a platform application object for one of the supported push notification services, such as APNS and FCM, to which devices and mobile apps may register. You must specify PlatformPrincipal and PlatformCredential attributes when using the <code>CreatePlatformApplication</code> action. The PlatformPrincipal is received from the notification service. For APNS/APNS_SANDBOX, PlatformPrincipal is \"SSL certificate\". For GCM, PlatformPrincipal is not applicable. For ADM, PlatformPrincipal is \"client id\". The PlatformCredential is also received from the notification service. For WNS, PlatformPrincipal is \"Package Security Identifier\". For MPNS, PlatformPrincipal is \"TLS certificate\". For Baidu, PlatformPrincipal is \"API key\".</p> <p>For APNS/APNS_SANDBOX, PlatformCredential is \"private key\". For GCM, PlatformCredential is \"API key\". For ADM, PlatformCredential is \"client secret\". For WNS, PlatformCredential is \"secret key\". For MPNS, PlatformCredential is \"private key\". For Baidu, PlatformCredential is \"secret key\". The PlatformApplicationArn that is returned when using <code>CreatePlatformApplication</code> is then used as an attribute for the <code>CreatePlatformEndpoint</code> action. For more information, see <a href=\"https://docs.aws.amazon.com/sns/latest/dg/SNSMobilePush.html\">Using Amazon SNS Mobile Push Notifications</a>. For more information about obtaining the PlatformPrincipal and PlatformCredential for each of the supported push notification services, see <a href=\"https://docs.aws.amazon.com/sns/latest/dg/mobile-push-apns.html\">Getting Started with Apple Push Notification Service</a>, <a href=\"https://docs.aws.amazon.com/sns/latest/dg/mobile-push-adm.html\">Getting Started with Amazon Device Messaging</a>, <a href=\"https://docs.aws.amazon.com/sns/latest/dg/mobile-push-baidu.html\">Getting Started with Baidu Cloud Push</a>, <a href=\"https://docs.aws.amazon.com/sns/latest/dg/mobile-push-gcm.html\">Getting Started with Google Cloud Messaging for Android</a>, <a href=\"https://docs.aws.amazon.com/sns/latest/dg/mobile-push-mpns.html\">Getting Started with MPNS</a>, or <a href=\"https://docs.aws.amazon.com/sns/latest/dg/mobile-push-wns.html\">Getting Started with WNS</a>. </p>"
+      "documentation":"<p>Creates a platform application object for one of the supported push notification services, such as APNS and FCM, to which devices and mobile apps may register. You must specify PlatformPrincipal and PlatformCredential attributes when using the <code>CreatePlatformApplication</code> action. The PlatformPrincipal is received from the notification service. For APNS/APNS_SANDBOX, PlatformPrincipal is \"SSL certificate\". For FCM, PlatformPrincipal is not applicable. For ADM, PlatformPrincipal is \"client id\". The PlatformCredential is also received from the notification service. For WNS, PlatformPrincipal is \"Package Security Identifier\". For MPNS, PlatformPrincipal is \"TLS certificate\". For Baidu, PlatformPrincipal is \"API key\".</p> <p>For APNS/APNS_SANDBOX, PlatformCredential is \"private key\". For FCM, PlatformCredential is \"API key\". For ADM, PlatformCredential is \"client secret\". For WNS, PlatformCredential is \"secret key\". For MPNS, PlatformCredential is \"private key\". For Baidu, PlatformCredential is \"secret key\". The PlatformApplicationArn that is returned when using <code>CreatePlatformApplication</code> is then used as an attribute for the <code>CreatePlatformEndpoint</code> action.</p>"
     },
     "CreatePlatformEndpoint":{
       "name":"CreatePlatformEndpoint",
@@ -102,7 +102,7 @@
         {"shape":"AuthorizationErrorException"},
         {"shape":"NotFoundException"}
       ],
-      "documentation":"<p>Creates an endpoint for a device and mobile app on one of the supported push notification services, such as GCM and APNS. <code>CreatePlatformEndpoint</code> requires the PlatformApplicationArn that is returned from <code>CreatePlatformApplication</code>. The EndpointArn that is returned when using <code>CreatePlatformEndpoint</code> can then be used by the <code>Publish</code> action to send a message to a mobile app or by the <code>Subscribe</code> action for subscription to a topic. The <code>CreatePlatformEndpoint</code> action is idempotent, so if the requester already owns an endpoint with the same device token and attributes, that endpoint's ARN is returned without creating a new endpoint. For more information, see <a href=\"https://docs.aws.amazon.com/sns/latest/dg/SNSMobilePush.html\">Using Amazon SNS Mobile Push Notifications</a>. </p> <p>When using <code>CreatePlatformEndpoint</code> with Baidu, two attributes must be provided: ChannelId and UserId. The token field must also contain the ChannelId. For more information, see <a href=\"https://docs.aws.amazon.com/sns/latest/dg/SNSMobilePushBaiduEndpoint.html\">Creating an Amazon SNS Endpoint for Baidu</a>. </p>"
+      "documentation":"<p>Creates an endpoint for a device and mobile app on one of the supported push notification services, such as FCM and APNS. <code>CreatePlatformEndpoint</code> requires the PlatformApplicationArn that is returned from <code>CreatePlatformApplication</code>. The EndpointArn that is returned when using <code>CreatePlatformEndpoint</code> can then be used by the <code>Publish</code> action to send a message to a mobile app or by the <code>Subscribe</code> action for subscription to a topic. The <code>CreatePlatformEndpoint</code> action is idempotent, so if the requester already owns an endpoint with the same device token and attributes, that endpoint's ARN is returned without creating a new endpoint. For more information, see <a href=\"https://docs.aws.amazon.com/sns/latest/dg/SNSMobilePush.html\">Using Amazon SNS Mobile Push Notifications</a>. </p> <p>When using <code>CreatePlatformEndpoint</code> with Baidu, two attributes must be provided: ChannelId and UserId. The token field must also contain the ChannelId. For more information, see <a href=\"https://docs.aws.amazon.com/sns/latest/dg/SNSMobilePushBaiduEndpoint.html\">Creating an Amazon SNS Endpoint for Baidu</a>. </p>"
     },
     "CreateTopic":{
       "name":"CreateTopic",
@@ -154,7 +154,7 @@
         {"shape":"InternalErrorException"},
         {"shape":"AuthorizationErrorException"}
       ],
-      "documentation":"<p>Deletes a platform application object for one of the supported push notification services, such as APNS and GCM. For more information, see <a href=\"https://docs.aws.amazon.com/sns/latest/dg/SNSMobilePush.html\">Using Amazon SNS Mobile Push Notifications</a>. </p>"
+      "documentation":"<p>Deletes a platform application object for one of the supported push notification services, such as APNS and FCM. For more information, see <a href=\"https://docs.aws.amazon.com/sns/latest/dg/SNSMobilePush.html\">Using Amazon SNS Mobile Push Notifications</a>. </p>"
     },
     "DeleteTopic":{
       "name":"DeleteTopic",
@@ -191,7 +191,7 @@
         {"shape":"AuthorizationErrorException"},
         {"shape":"NotFoundException"}
       ],
-      "documentation":"<p>Retrieves the endpoint attributes for a device on one of the supported push notification services, such as GCM and APNS. For more information, see <a href=\"https://docs.aws.amazon.com/sns/latest/dg/SNSMobilePush.html\">Using Amazon SNS Mobile Push Notifications</a>. </p>"
+      "documentation":"<p>Retrieves the endpoint attributes for a device on one of the supported push notification services, such as FCM and APNS. For more information, see <a href=\"https://docs.aws.amazon.com/sns/latest/dg/SNSMobilePush.html\">Using Amazon SNS Mobile Push Notifications</a>. </p>"
     },
     "GetPlatformApplicationAttributes":{
       "name":"GetPlatformApplicationAttributes",
@@ -210,7 +210,7 @@
         {"shape":"AuthorizationErrorException"},
         {"shape":"NotFoundException"}
       ],
-      "documentation":"<p>Retrieves the attributes of the platform application object for the supported push notification services, such as APNS and GCM. For more information, see <a href=\"https://docs.aws.amazon.com/sns/latest/dg/SNSMobilePush.html\">Using Amazon SNS Mobile Push Notifications</a>. </p>"
+      "documentation":"<p>Retrieves the attributes of the platform application object for the supported push notification services, such as APNS and FCM. For more information, see <a href=\"https://docs.aws.amazon.com/sns/latest/dg/SNSMobilePush.html\">Using Amazon SNS Mobile Push Notifications</a>. </p>"
     },
     "GetSMSAttributes":{
       "name":"GetSMSAttributes",
@@ -287,7 +287,7 @@
         {"shape":"AuthorizationErrorException"},
         {"shape":"NotFoundException"}
       ],
-      "documentation":"<p>Lists the endpoints and endpoint attributes for devices in a supported push notification service, such as GCM and APNS. The results for <code>ListEndpointsByPlatformApplication</code> are paginated and return a limited list of endpoints, up to 100. If additional records are available after the first page results, then a NextToken string will be returned. To receive the next page, you call <code>ListEndpointsByPlatformApplication</code> again using the NextToken string received from the previous call. When there are no more records to return, NextToken will be null. For more information, see <a href=\"https://docs.aws.amazon.com/sns/latest/dg/SNSMobilePush.html\">Using Amazon SNS Mobile Push Notifications</a>. </p> <p>This action is throttled at 30 transactions per second (TPS).</p>"
+      "documentation":"<p>Lists the endpoints and endpoint attributes for devices in a supported push notification service, such as FCM and APNS. The results for <code>ListEndpointsByPlatformApplication</code> are paginated and return a limited list of endpoints, up to 100. If additional records are available after the first page results, then a NextToken string will be returned. To receive the next page, you call <code>ListEndpointsByPlatformApplication</code> again using the NextToken string received from the previous call. When there are no more records to return, NextToken will be null. For more information, see <a href=\"https://docs.aws.amazon.com/sns/latest/dg/SNSMobilePush.html\">Using Amazon SNS Mobile Push Notifications</a>. </p> <p>This action is throttled at 30 transactions per second (TPS).</p>"
     },
     "ListPhoneNumbersOptedOut":{
       "name":"ListPhoneNumbersOptedOut",
@@ -324,7 +324,7 @@
         {"shape":"InternalErrorException"},
         {"shape":"AuthorizationErrorException"}
       ],
-      "documentation":"<p>Lists the platform application objects for the supported push notification services, such as APNS and GCM. The results for <code>ListPlatformApplications</code> are paginated and return a limited list of applications, up to 100. If additional records are available after the first page results, then a NextToken string will be returned. To receive the next page, you call <code>ListPlatformApplications</code> using the NextToken string received from the previous call. When there are no more records to return, NextToken will be null. For more information, see <a href=\"https://docs.aws.amazon.com/sns/latest/dg/SNSMobilePush.html\">Using Amazon SNS Mobile Push Notifications</a>. </p> <p>This action is throttled at 15 transactions per second (TPS).</p>"
+      "documentation":"<p>Lists the platform application objects for the supported push notification services, such as APNS and FCM. The results for <code>ListPlatformApplications</code> are paginated and return a limited list of applications, up to 100. If additional records are available after the first page results, then a NextToken string will be returned. To receive the next page, you call <code>ListPlatformApplications</code> using the NextToken string received from the previous call. When there are no more records to return, NextToken will be null. For more information, see <a href=\"https://docs.aws.amazon.com/sns/latest/dg/SNSMobilePush.html\">Using Amazon SNS Mobile Push Notifications</a>. </p> <p>This action is throttled at 15 transactions per second (TPS).</p>"
     },
     "ListSubscriptions":{
       "name":"ListSubscriptions",
@@ -477,7 +477,7 @@
         {"shape":"AuthorizationErrorException"},
         {"shape":"NotFoundException"}
       ],
-      "documentation":"<p>Sets the attributes for an endpoint for a device on one of the supported push notification services, such as GCM and APNS. For more information, see <a href=\"https://docs.aws.amazon.com/sns/latest/dg/SNSMobilePush.html\">Using Amazon SNS Mobile Push Notifications</a>. </p>"
+      "documentation":"<p>Sets the attributes for an endpoint for a device on one of the supported push notification services, such as FCM and APNS. For more information, see <a href=\"https://docs.aws.amazon.com/sns/latest/dg/SNSMobilePush.html\">Using Amazon SNS Mobile Push Notifications</a>. </p>"
     },
     "SetPlatformApplicationAttributes":{
       "name":"SetPlatformApplicationAttributes",
@@ -492,7 +492,7 @@
         {"shape":"AuthorizationErrorException"},
         {"shape":"NotFoundException"}
       ],
-      "documentation":"<p>Sets the attributes of the platform application object for the supported push notification services, such as APNS and GCM. For more information, see <a href=\"https://docs.aws.amazon.com/sns/latest/dg/SNSMobilePush.html\">Using Amazon SNS Mobile Push Notifications</a>. For information on configuring attributes for message delivery status, see <a href=\"https://docs.aws.amazon.com/sns/latest/dg/sns-msg-status.html\">Using Amazon SNS Application Attributes for Message Delivery Status</a>. </p>"
+      "documentation":"<p>Sets the attributes of the platform application object for the supported push notification services, such as APNS and FCM. For more information, see <a href=\"https://docs.aws.amazon.com/sns/latest/dg/SNSMobilePush.html\">Using Amazon SNS Mobile Push Notifications</a>. For information on configuring attributes for message delivery status, see <a href=\"https://docs.aws.amazon.com/sns/latest/dg/sns-msg-status.html\">Using Amazon SNS Application Attributes for Message Delivery Status</a>. </p>"
     },
     "SetSMSAttributes":{
       "name":"SetSMSAttributes",
@@ -587,7 +587,7 @@
         {"shape":"AuthorizationErrorException"},
         {"shape":"ConcurrentAccessException"}
       ],
-      "documentation":"<p>Add tags to the specified Amazon SNS topic. For an overview, see <a href=\"https://docs.aws.amazon.com/sns/latest/dg/sns-tags.html\">Amazon SNS Tags</a> in the <i>Amazon SNS Developer Guide</i>.</p> <p>When you use topic tags, keep the following guidelines in mind:</p> <ul> <li> <p>Adding more than 50 tags to a topic isn't recommended.</p> </li> <li> <p>Tags don't have any semantic meaning. Amazon SNS interprets tags as character strings.</p> </li> <li> <p>Tags are case-sensitive.</p> </li> <li> <p>A new tag with a key identical to that of an existing tag overwrites the existing tag.</p> </li> <li> <p>Tagging actions are limited to 10 TPS per AWS account. If your application requires a higher throughput, file a <a href=\"https://console.aws.amazon.com/support/home#/case/create?issueType=technical\">technical support request</a>.</p> </li> </ul> <p>For a full list of tag restrictions, see <a href=\"https://docs.aws.amazon.com/sns/latest/dg/sns-limits.html#limits-topics\">Limits Related to Topics</a> in the <i>Amazon SNS Developer Guide</i>.</p>"
+      "documentation":"<p>Add tags to the specified Amazon SNS topic. For an overview, see <a href=\"https://docs.aws.amazon.com/sns/latest/dg/sns-tags.html\">Amazon SNS Tags</a> in the <i>Amazon SNS Developer Guide</i>.</p> <p>When you use topic tags, keep the following guidelines in mind:</p> <ul> <li> <p>Adding more than 50 tags to a topic isn't recommended.</p> </li> <li> <p>Tags don't have any semantic meaning. Amazon SNS interprets tags as character strings.</p> </li> <li> <p>Tags are case-sensitive.</p> </li> <li> <p>A new tag with a key identical to that of an existing tag overwrites the existing tag.</p> </li> <li> <p>Tagging actions are limited to 10 TPS per AWS account, per AWS region. If your application requires a higher throughput, file a <a href=\"https://console.aws.amazon.com/support/home#/case/create?issueType=technical\">technical support request</a>.</p> </li> </ul>"
     },
     "Unsubscribe":{
       "name":"Unsubscribe",
@@ -656,7 +656,7 @@
         },
         "ActionName":{
           "shape":"ActionsList",
-          "documentation":"<p>The action you want to allow for the specified principal(s).</p> <p>Valid values: any Amazon SNS action name.</p>"
+          "documentation":"<p>The action you want to allow for the specified principal(s).</p> <p>Valid values: Any Amazon SNS action name, for example <code>Publish</code>.</p>"
         }
       }
     },
@@ -769,7 +769,7 @@
         },
         "Platform":{
           "shape":"String",
-          "documentation":"<p>The following platforms are supported: ADM (Amazon Device Messaging), APNS (Apple Push Notification Service), APNS_SANDBOX, and GCM (Google Cloud Messaging).</p>"
+          "documentation":"<p>The following platforms are supported: ADM (Amazon Device Messaging), APNS (Apple Push Notification Service), APNS_SANDBOX, and FCM (Firebase Cloud Messaging).</p>"
         },
         "Attributes":{
           "shape":"MapStringToString",
@@ -801,7 +801,7 @@
         },
         "Token":{
           "shape":"String",
-          "documentation":"<p>Unique identifier created by the notification service for an app on a device. The specific name for Token will vary, depending on which notification service is being used. For example, when using APNS as the notification service, you need the device token. Alternatively, when using GCM or ADM, the device token equivalent is called the registration ID.</p>"
+          "documentation":"<p>Unique identifier created by the notification service for an app on a device. The specific name for Token will vary, depending on which notification service is being used. For example, when using APNS as the notification service, you need the device token. Alternatively, when using FCM or ADM, the device token equivalent is called the registration ID.</p>"
         },
         "CustomUserData":{
           "shape":"String",
@@ -828,7 +828,7 @@
         },
         "Tags":{
           "shape":"TagList",
-          "documentation":"<p>The list of tags to add to a new topic.</p>"
+          "documentation":"<p>The list of tags to add to a new topic.</p> <note> <p>To be able to tag a topic on creation, you must have the <code>sns:CreateTopic</code> and <code>sns:TagResource</code> permissions.</p> </note>"
         }
       },
       "documentation":"<p>Input for CreateTopic action.</p>"
@@ -938,7 +938,7 @@
       "members":{
         "Attributes":{
           "shape":"MapStringToString",
-          "documentation":"<p>Attributes include the following:</p> <ul> <li> <p> <code>CustomUserData</code> – arbitrary user data to associate with the endpoint. Amazon SNS does not use this data. The data must be in UTF-8 format and less than 2KB.</p> </li> <li> <p> <code>Enabled</code> – flag that enables/disables delivery to the endpoint. Amazon SNS will set this to false when a notification service indicates to Amazon SNS that the endpoint is invalid. Users can set it back to true, typically after updating Token.</p> </li> <li> <p> <code>Token</code> – device token, also referred to as a registration id, for an app and mobile device. This is returned from the notification service when an app and mobile device are registered with the notification service.</p> </li> </ul>"
+          "documentation":"<p>Attributes include the following:</p> <ul> <li> <p> <code>CustomUserData</code> – arbitrary user data to associate with the endpoint. Amazon SNS does not use this data. The data must be in UTF-8 format and less than 2KB.</p> </li> <li> <p> <code>Enabled</code> – flag that enables/disables delivery to the endpoint. Amazon SNS will set this to false when a notification service indicates to Amazon SNS that the endpoint is invalid. Users can set it back to true, typically after updating Token.</p> </li> <li> <p> <code>Token</code> – device token, also referred to as a registration id, for an app and mobile device. This is returned from the notification service when an app and mobile device are registered with the notification service.</p> <note> <p>The device token for the iOS platform is returned in lowercase.</p> </note> </li> </ul>"
         }
       },
       "documentation":"<p>Response from GetEndpointAttributes of the EndpointArn.</p>"
@@ -1000,7 +1000,7 @@
       "members":{
         "Attributes":{
           "shape":"SubscriptionAttributesMap",
-          "documentation":"<p>A map of the subscription's attributes. Attributes in this map include the following:</p> <ul> <li> <p> <code>ConfirmationWasAuthenticated</code> – <code>true</code> if the subscription confirmation request was authenticated.</p> </li> <li> <p> <code>DeliveryPolicy</code> – The JSON serialization of the subscription's delivery policy.</p> </li> <li> <p> <code>EffectiveDeliveryPolicy</code> – The JSON serialization of the effective delivery policy that takes into account the topic delivery policy and account system defaults.</p> </li> <li> <p> <code>FilterPolicy</code> – The filter policy JSON that is assigned to the subscription.</p> </li> <li> <p> <code>Owner</code> – The AWS account ID of the subscription's owner.</p> </li> <li> <p> <code>PendingConfirmation</code> – <code>true</code> if the subscription hasn't been confirmed. To confirm a pending subscription, call the <code>ConfirmSubscription</code> action with a confirmation token.</p> </li> <li> <p> <code>RawMessageDelivery</code> – <code>true</code> if raw message delivery is enabled for the subscription. Raw messages are free of JSON formatting and can be sent to HTTP/S and Amazon SQS endpoints.</p> </li> <li> <p> <code>SubscriptionArn</code> – The subscription's ARN.</p> </li> <li> <p> <code>TopicArn</code> – The topic ARN that the subscription is associated with.</p> </li> </ul>"
+          "documentation":"<p>A map of the subscription's attributes. Attributes in this map include the following:</p> <ul> <li> <p> <code>ConfirmationWasAuthenticated</code> – <code>true</code> if the subscription confirmation request was authenticated.</p> </li> <li> <p> <code>DeliveryPolicy</code> – The JSON serialization of the subscription's delivery policy.</p> </li> <li> <p> <code>EffectiveDeliveryPolicy</code> – The JSON serialization of the effective delivery policy that takes into account the topic delivery policy and account system defaults.</p> </li> <li> <p> <code>FilterPolicy</code> – The filter policy JSON that is assigned to the subscription.</p> </li> <li> <p> <code>Owner</code> – The AWS account ID of the subscription's owner.</p> </li> <li> <p> <code>PendingConfirmation</code> – <code>true</code> if the subscription hasn't been confirmed. To confirm a pending subscription, call the <code>ConfirmSubscription</code> action with a confirmation token.</p> </li> <li> <p> <code>RawMessageDelivery</code> – <code>true</code> if raw message delivery is enabled for the subscription. Raw messages are free of JSON formatting and can be sent to HTTP/S and Amazon SQS endpoints.</p> </li> <li> <p> <code>RedrivePolicy</code> – When specified, sends undeliverable messages to the specified Amazon SQS dead-letter queue. Messages that can't be delivered due to client errors (for example, when the subscribed endpoint is unreachable) or server errors (for example, when the service that powers the subscribed endpoint becomes unavailable) are held in the dead-letter queue for further analysis or reprocessing.</p> </li> <li> <p> <code>SubscriptionArn</code> – The subscription's ARN.</p> </li> <li> <p> <code>TopicArn</code> – The topic ARN that the subscription is associated with.</p> </li> </ul>"
         }
       },
       "documentation":"<p>Response for GetSubscriptionAttributes action.</p>"
@@ -1021,7 +1021,7 @@
       "members":{
         "Attributes":{
           "shape":"TopicAttributesMap",
-          "documentation":"<p>A map of the topic's attributes. Attributes in this map include the following:</p> <ul> <li> <p> <code>TopicArn</code> – the topic's ARN</p> </li> <li> <p> <code>Owner</code> – the AWS account ID of the topic's owner</p> </li> <li> <p> <code>Policy</code> – the JSON serialization of the topic's access control policy</p> </li> <li> <p> <code>DisplayName</code> – the human-readable name used in the \"From\" field for notifications to email and email-json endpoints</p> </li> <li> <p> <code>SubscriptionsPending</code> – the number of subscriptions pending confirmation on this topic</p> </li> <li> <p> <code>SubscriptionsConfirmed</code> – the number of confirmed subscriptions on this topic</p> </li> <li> <p> <code>SubscriptionsDeleted</code> – the number of deleted subscriptions on this topic</p> </li> <li> <p> <code>DeliveryPolicy</code> – the JSON serialization of the topic's delivery policy</p> </li> <li> <p> <code>EffectiveDeliveryPolicy</code> – the JSON serialization of the effective delivery policy that takes into account system defaults</p> </li> </ul>"
+          "documentation":"<p>A map of the topic's attributes. Attributes in this map include the following:</p> <ul> <li> <p> <code>DeliveryPolicy</code> – The JSON serialization of the topic's delivery policy.</p> </li> <li> <p> <code>DisplayName</code> – The human-readable name used in the <code>From</code> field for notifications to <code>email</code> and <code>email-json</code> endpoints.</p> </li> <li> <p> <code>Owner</code> – The AWS account ID of the topic's owner.</p> </li> <li> <p> <code>Policy</code> – The JSON serialization of the topic's access control policy.</p> </li> <li> <p> <code>SubscriptionsConfirmed</code> – The number of confirmed subscriptions for the topic.</p> </li> <li> <p> <code>SubscriptionsDeleted</code> – The number of deleted subscriptions for the topic.</p> </li> <li> <p> <code>SubscriptionsPending</code> – The number of subscriptions pending confirmation for the topic.</p> </li> <li> <p> <code>TopicArn</code> – The topic's ARN.</p> </li> <li> <p> <code>EffectiveDeliveryPolicy</code> – Yhe JSON serialization of the effective delivery policy, taking system defaults into account.</p> </li> </ul> <p>The following attribute applies only to <a href=\"https://docs.aws.amazon.com/sns/latest/dg/sns-server-side-encryption.html\">server-side-encryption</a>:</p> <ul> <li> <p> <code>KmsMasterKeyId</code> - The ID of an AWS-managed customer master key (CMK) for Amazon SNS or a custom CMK. For more information, see <a href=\"https://docs.aws.amazon.com/sns/latest/dg/sns-server-side-encryption.html#sse-key-terms\">Key Terms</a>. For more examples, see <a href=\"https://docs.aws.amazon.com/kms/latest/APIReference/API_DescribeKey.html#API_DescribeKey_RequestParameters\">KeyId</a> in the <i>AWS Key Management Service API Reference</i>.</p> </li> </ul>"
         }
       },
       "documentation":"<p>Response for GetTopicAttributes action.</p>"
@@ -1461,7 +1461,7 @@
         },
         "Message":{
           "shape":"message",
-          "documentation":"<p>The message you want to send.</p> <important> <p>The <code>Message</code> parameter is always a string. If you set <code>MessageStructure</code> to <code>json</code>, you must string-encode the <code>Message</code> parameter.</p> </important> <p>If you are publishing to a topic and you want to send the same message to all transport protocols, include the text of the message as a String value. If you want to send different messages for each transport protocol, set the value of the <code>MessageStructure</code> parameter to <code>json</code> and use a JSON object for the <code>Message</code> parameter. </p> <p/> <p>Constraints:</p> <ul> <li> <p>With the exception of SMS, messages must be UTF-8 encoded strings and at most 256 KB in size (262,144 bytes, not 262,144 characters).</p> </li> <li> <p>For SMS, each message can contain up to 140 characters. This character limit depends on the encoding schema. For example, an SMS message can contain 160 GSM characters, 140 ASCII characters, or 70 UCS-2 characters.</p> <p>If you publish a message that exceeds this size limit, Amazon SNS sends the message as multiple messages, each fitting within the size limit. Messages aren't truncated mid-word but are cut off at whole-word boundaries.</p> <p>The total size limit for a single SMS <code>Publish</code> action is 1,600 characters.</p> </li> </ul> <p>JSON-specific constraints:</p> <ul> <li> <p>Keys in the JSON object that correspond to supported transport protocols must have simple JSON string values.</p> </li> <li> <p>The values will be parsed (unescaped) before they are used in outgoing messages.</p> </li> <li> <p>Outbound notifications are JSON encoded (meaning that the characters will be reescaped for sending).</p> </li> <li> <p>Values have a minimum length of 0 (the empty string, \"\", is allowed).</p> </li> <li> <p>Values have a maximum length bounded by the overall message size (so, including multiple protocols may limit message sizes).</p> </li> <li> <p>Non-string values will cause the key to be ignored.</p> </li> <li> <p>Keys that do not correspond to supported transport protocols are ignored.</p> </li> <li> <p>Duplicate keys are not allowed.</p> </li> <li> <p>Failure to parse or validate any key or value in the message will cause the <code>Publish</code> call to return an error (no partial delivery).</p> </li> </ul>"
+          "documentation":"<p>The message you want to send.</p> <p>If you are publishing to a topic and you want to send the same message to all transport protocols, include the text of the message as a String value. If you want to send different messages for each transport protocol, set the value of the <code>MessageStructure</code> parameter to <code>json</code> and use a JSON object for the <code>Message</code> parameter. </p> <p/> <p>Constraints:</p> <ul> <li> <p>With the exception of SMS, messages must be UTF-8 encoded strings and at most 256 KB in size (262,144 bytes, not 262,144 characters).</p> </li> <li> <p>For SMS, each message can contain up to 140 characters. This character limit depends on the encoding schema. For example, an SMS message can contain 160 GSM characters, 140 ASCII characters, or 70 UCS-2 characters.</p> <p>If you publish a message that exceeds this size limit, Amazon SNS sends the message as multiple messages, each fitting within the size limit. Messages aren't truncated mid-word but are cut off at whole-word boundaries.</p> <p>The total size limit for a single SMS <code>Publish</code> action is 1,600 characters.</p> </li> </ul> <p>JSON-specific constraints:</p> <ul> <li> <p>Keys in the JSON object that correspond to supported transport protocols must have simple JSON string values.</p> </li> <li> <p>The values will be parsed (unescaped) before they are used in outgoing messages.</p> </li> <li> <p>Outbound notifications are JSON encoded (meaning that the characters will be reescaped for sending).</p> </li> <li> <p>Values have a minimum length of 0 (the empty string, \"\", is allowed).</p> </li> <li> <p>Values have a maximum length bounded by the overall message size (so, including multiple protocols may limit message sizes).</p> </li> <li> <p>Non-string values will cause the key to be ignored.</p> </li> <li> <p>Keys that do not correspond to supported transport protocols are ignored.</p> </li> <li> <p>Duplicate keys are not allowed.</p> </li> <li> <p>Failure to parse or validate any key or value in the message will cause the <code>Publish</code> call to return an error (no partial delivery).</p> </li> </ul>"
         },
         "Subject":{
           "shape":"subject",
@@ -1469,7 +1469,7 @@
         },
         "MessageStructure":{
           "shape":"messageStructure",
-          "documentation":"<p>Set <code>MessageStructure</code> to <code>json</code> if you want to send a different message for each protocol. For example, using one publish action, you can send a short message to your SMS subscribers and a longer message to your email subscribers. If you set <code>MessageStructure</code> to <code>json</code>, the value of the <code>Message</code> parameter must: </p> <ul> <li> <p>be a syntactically valid JSON object; and</p> </li> <li> <p>contain at least a top-level JSON key of \"default\" with a value that is a string.</p> </li> </ul> <p>You can define other top-level keys that define the message you want to send to a specific transport protocol (e.g., \"http\").</p> <p>For information about sending different messages for each protocol using the AWS Management Console, go to <a href=\"https://docs.aws.amazon.com/sns/latest/gsg/Publish.html#sns-message-formatting-by-protocol\">Create Different Messages for Each Protocol</a> in the <i>Amazon Simple Notification Service Getting Started Guide</i>. </p> <p>Valid value: <code>json</code> </p>"
+          "documentation":"<p>Set <code>MessageStructure</code> to <code>json</code> if you want to send a different message for each protocol. For example, using one publish action, you can send a short message to your SMS subscribers and a longer message to your email subscribers. If you set <code>MessageStructure</code> to <code>json</code>, the value of the <code>Message</code> parameter must: </p> <ul> <li> <p>be a syntactically valid JSON object; and</p> </li> <li> <p>contain at least a top-level JSON key of \"default\" with a value that is a string.</p> </li> </ul> <p>You can define other top-level keys that define the message you want to send to a specific transport protocol (e.g., \"http\").</p> <p>Valid value: <code>json</code> </p>"
         },
         "MessageAttributes":{
           "shape":"MessageAttributeMap",
@@ -1550,7 +1550,7 @@
         },
         "Attributes":{
           "shape":"MapStringToString",
-          "documentation":"<p>A map of the platform application attributes. Attributes in this map include the following:</p> <ul> <li> <p> <code>PlatformCredential</code> – The credential received from the notification service. For APNS/APNS_SANDBOX, PlatformCredential is private key. For GCM, PlatformCredential is \"API key\". For ADM, PlatformCredential is \"client secret\".</p> </li> <li> <p> <code>PlatformPrincipal</code> – The principal received from the notification service. For APNS/APNS_SANDBOX, PlatformPrincipal is SSL certificate. For GCM, PlatformPrincipal is not applicable. For ADM, PlatformPrincipal is \"client id\".</p> </li> <li> <p> <code>EventEndpointCreated</code> – Topic ARN to which EndpointCreated event notifications should be sent.</p> </li> <li> <p> <code>EventEndpointDeleted</code> – Topic ARN to which EndpointDeleted event notifications should be sent.</p> </li> <li> <p> <code>EventEndpointUpdated</code> – Topic ARN to which EndpointUpdate event notifications should be sent.</p> </li> <li> <p> <code>EventDeliveryFailure</code> – Topic ARN to which DeliveryFailure event notifications should be sent upon Direct Publish delivery failure (permanent) to one of the application's endpoints.</p> </li> <li> <p> <code>SuccessFeedbackRoleArn</code> – IAM role ARN used to give Amazon SNS write access to use CloudWatch Logs on your behalf.</p> </li> <li> <p> <code>FailureFeedbackRoleArn</code> – IAM role ARN used to give Amazon SNS write access to use CloudWatch Logs on your behalf.</p> </li> <li> <p> <code>SuccessFeedbackSampleRate</code> – Sample rate percentage (0-100) of successfully delivered messages.</p> </li> </ul>"
+          "documentation":"<p>A map of the platform application attributes. Attributes in this map include the following:</p> <ul> <li> <p> <code>PlatformCredential</code> – The credential received from the notification service. For APNS/APNS_SANDBOX, PlatformCredential is private key. For FCM, PlatformCredential is \"API key\". For ADM, PlatformCredential is \"client secret\".</p> </li> <li> <p> <code>PlatformPrincipal</code> – The principal received from the notification service. For APNS/APNS_SANDBOX, PlatformPrincipal is SSL certificate. For FCM, PlatformPrincipal is not applicable. For ADM, PlatformPrincipal is \"client id\".</p> </li> <li> <p> <code>EventEndpointCreated</code> – Topic ARN to which EndpointCreated event notifications should be sent.</p> </li> <li> <p> <code>EventEndpointDeleted</code> – Topic ARN to which EndpointDeleted event notifications should be sent.</p> </li> <li> <p> <code>EventEndpointUpdated</code> – Topic ARN to which EndpointUpdate event notifications should be sent.</p> </li> <li> <p> <code>EventDeliveryFailure</code> – Topic ARN to which DeliveryFailure event notifications should be sent upon Direct Publish delivery failure (permanent) to one of the application's endpoints.</p> </li> <li> <p> <code>SuccessFeedbackRoleArn</code> – IAM role ARN used to give Amazon SNS write access to use CloudWatch Logs on your behalf.</p> </li> <li> <p> <code>FailureFeedbackRoleArn</code> – IAM role ARN used to give Amazon SNS write access to use CloudWatch Logs on your behalf.</p> </li> <li> <p> <code>SuccessFeedbackSampleRate</code> – Sample rate percentage (0-100) of successfully delivered messages.</p> </li> </ul>"
         }
       },
       "documentation":"<p>Input for SetPlatformApplicationAttributes action.</p>"
@@ -1585,7 +1585,7 @@
         },
         "AttributeName":{
           "shape":"attributeName",
-          "documentation":"<p>A map of attributes with their corresponding values.</p> <p>The following lists the names, descriptions, and values of the special request parameters that the <code>SetTopicAttributes</code> action uses:</p> <ul> <li> <p> <code>DeliveryPolicy</code> – The policy that defines how Amazon SNS retries failed deliveries to HTTP/S endpoints.</p> </li> <li> <p> <code>FilterPolicy</code> – The simple JSON object that lets your subscriber receive only a subset of messages, rather than receiving every message published to the topic.</p> </li> <li> <p> <code>RawMessageDelivery</code> – When set to <code>true</code>, enables raw message delivery to Amazon SQS or HTTP/S endpoints. This eliminates the need for the endpoints to process JSON formatting, which is otherwise created for Amazon SNS metadata.</p> </li> </ul>"
+          "documentation":"<p>A map of attributes with their corresponding values.</p> <p>The following lists the names, descriptions, and values of the special request parameters that the <code>SetTopicAttributes</code> action uses:</p> <ul> <li> <p> <code>DeliveryPolicy</code> – The policy that defines how Amazon SNS retries failed deliveries to HTTP/S endpoints.</p> </li> <li> <p> <code>FilterPolicy</code> – The simple JSON object that lets your subscriber receive only a subset of messages, rather than receiving every message published to the topic.</p> </li> <li> <p> <code>RawMessageDelivery</code> – When set to <code>true</code>, enables raw message delivery to Amazon SQS or HTTP/S endpoints. This eliminates the need for the endpoints to process JSON formatting, which is otherwise created for Amazon SNS metadata.</p> </li> <li> <p> <code>RedrivePolicy</code> – When specified, sends undeliverable messages to the specified Amazon SQS dead-letter queue. Messages that can't be delivered due to client errors (for example, when the subscribed endpoint is unreachable) or server errors (for example, when the service that powers the subscribed endpoint becomes unavailable) are held in the dead-letter queue for further analysis or reprocessing.</p> </li> </ul>"
         },
         "AttributeValue":{
           "shape":"attributeValue",
@@ -1643,19 +1643,19 @@
         },
         "Protocol":{
           "shape":"protocol",
-          "documentation":"<p>The protocol you want to use. Supported protocols include:</p> <ul> <li> <p> <code>http</code> – delivery of JSON-encoded message via HTTP POST</p> </li> <li> <p> <code>https</code> – delivery of JSON-encoded message via HTTPS POST</p> </li> <li> <p> <code>email</code> – delivery of message via SMTP</p> </li> <li> <p> <code>email-json</code> – delivery of JSON-encoded message via SMTP</p> </li> <li> <p> <code>sms</code> – delivery of message via SMS</p> </li> <li> <p> <code>sqs</code> – delivery of JSON-encoded message to an Amazon SQS queue</p> </li> <li> <p> <code>application</code> – delivery of JSON-encoded message to an EndpointArn for a mobile app and device.</p> </li> <li> <p> <code>lambda</code> – delivery of JSON-encoded message to an AWS Lambda function.</p> </li> </ul>"
+          "documentation":"<p>The protocol you want to use. Supported protocols include:</p> <ul> <li> <p> <code>http</code> – delivery of JSON-encoded message via HTTP POST</p> </li> <li> <p> <code>https</code> – delivery of JSON-encoded message via HTTPS POST</p> </li> <li> <p> <code>email</code> – delivery of message via SMTP</p> </li> <li> <p> <code>email-json</code> – delivery of JSON-encoded message via SMTP</p> </li> <li> <p> <code>sms</code> – delivery of message via SMS</p> </li> <li> <p> <code>sqs</code> – delivery of JSON-encoded message to an Amazon SQS queue</p> </li> <li> <p> <code>application</code> – delivery of JSON-encoded message to an EndpointArn for a mobile app and device.</p> </li> <li> <p> <code>lambda</code> – delivery of JSON-encoded message to an Amazon Lambda function.</p> </li> </ul>"
         },
         "Endpoint":{
           "shape":"endpoint",
-          "documentation":"<p>The endpoint that you want to receive notifications. Endpoints vary by protocol:</p> <ul> <li> <p>For the <code>http</code> protocol, the endpoint is an URL beginning with \"https://\"</p> </li> <li> <p>For the <code>https</code> protocol, the endpoint is a URL beginning with \"https://\"</p> </li> <li> <p>For the <code>email</code> protocol, the endpoint is an email address</p> </li> <li> <p>For the <code>email-json</code> protocol, the endpoint is an email address</p> </li> <li> <p>For the <code>sms</code> protocol, the endpoint is a phone number of an SMS-enabled device</p> </li> <li> <p>For the <code>sqs</code> protocol, the endpoint is the ARN of an Amazon SQS queue</p> </li> <li> <p>For the <code>application</code> protocol, the endpoint is the EndpointArn of a mobile app and device.</p> </li> <li> <p>For the <code>lambda</code> protocol, the endpoint is the ARN of an AWS Lambda function.</p> </li> </ul>"
+          "documentation":"<p>The endpoint that you want to receive notifications. Endpoints vary by protocol:</p> <ul> <li> <p>For the <code>http</code> protocol, the endpoint is an URL beginning with <code>http://</code> </p> </li> <li> <p>For the <code>https</code> protocol, the endpoint is a URL beginning with <code>https://</code> </p> </li> <li> <p>For the <code>email</code> protocol, the endpoint is an email address</p> </li> <li> <p>For the <code>email-json</code> protocol, the endpoint is an email address</p> </li> <li> <p>For the <code>sms</code> protocol, the endpoint is a phone number of an SMS-enabled device</p> </li> <li> <p>For the <code>sqs</code> protocol, the endpoint is the ARN of an Amazon SQS queue</p> </li> <li> <p>For the <code>application</code> protocol, the endpoint is the EndpointArn of a mobile app and device.</p> </li> <li> <p>For the <code>lambda</code> protocol, the endpoint is the ARN of an Amazon Lambda function.</p> </li> </ul>"
         },
         "Attributes":{
           "shape":"SubscriptionAttributesMap",
-          "documentation":"<p>A map of attributes with their corresponding values.</p> <p>The following lists the names, descriptions, and values of the special request parameters that the <code>SetTopicAttributes</code> action uses:</p> <ul> <li> <p> <code>DeliveryPolicy</code> – The policy that defines how Amazon SNS retries failed deliveries to HTTP/S endpoints.</p> </li> <li> <p> <code>FilterPolicy</code> – The simple JSON object that lets your subscriber receive only a subset of messages, rather than receiving every message published to the topic.</p> </li> <li> <p> <code>RawMessageDelivery</code> – When set to <code>true</code>, enables raw message delivery to Amazon SQS or HTTP/S endpoints. This eliminates the need for the endpoints to process JSON formatting, which is otherwise created for Amazon SNS metadata.</p> </li> </ul>"
+          "documentation":"<p>A map of attributes with their corresponding values.</p> <p>The following lists the names, descriptions, and values of the special request parameters that the <code>SetTopicAttributes</code> action uses:</p> <ul> <li> <p> <code>DeliveryPolicy</code> – The policy that defines how Amazon SNS retries failed deliveries to HTTP/S endpoints.</p> </li> <li> <p> <code>FilterPolicy</code> – The simple JSON object that lets your subscriber receive only a subset of messages, rather than receiving every message published to the topic.</p> </li> <li> <p> <code>RawMessageDelivery</code> – When set to <code>true</code>, enables raw message delivery to Amazon SQS or HTTP/S endpoints. This eliminates the need for the endpoints to process JSON formatting, which is otherwise created for Amazon SNS metadata.</p> </li> <li> <p> <code>RedrivePolicy</code> – When specified, sends undeliverable messages to the specified Amazon SQS dead-letter queue. Messages that can't be delivered due to client errors (for example, when the subscribed endpoint is unreachable) or server errors (for example, when the service that powers the subscribed endpoint becomes unavailable) are held in the dead-letter queue for further analysis or reprocessing.</p> </li> </ul>"
         },
         "ReturnSubscriptionArn":{
           "shape":"boolean",
-          "documentation":"<p>Sets whether the response from the <code>Subscribe</code> request includes the subscription ARN, even if the subscription is not yet confirmed.</p> <p>If you set this parameter to <code>false</code>, the response includes the ARN for confirmed subscriptions, but it includes an ARN value of \"pending subscription\" for subscriptions that are not yet confirmed. A subscription becomes confirmed when the subscriber calls the <code>ConfirmSubscription</code> action with a confirmation token.</p> <p>If you set this parameter to <code>true</code>, the response includes the ARN in all cases, even if the subscription is not yet confirmed.</p> <p>The default value is <code>false</code>.</p>"
+          "documentation":"<p>Sets whether the response from the <code>Subscribe</code> request includes the subscription ARN, even if the subscription is not yet confirmed.</p> <ul> <li> <p>If you have the subscription ARN returned, the response includes the ARN in all cases, even if the subscription is not yet confirmed.</p> </li> <li> <p>If you don't have the subscription ARN returned, in addition to the ARN for confirmed subscriptions, the response also includes the <code>pending subscription</code> ARN value for subscriptions that aren't yet confirmed. A subscription becomes confirmed when the subscriber calls the <code>ConfirmSubscription</code> action with a confirmation token.</p> </li> </ul> <p>If you set this parameter to <code>true</code>, .</p> <p>The default value is <code>false</code>.</p>"
         }
       },
       "documentation":"<p>Input for Subscribe action.</p>"
diff --git a/services/sns/src/test/java/software/amazon/awssdk/services/sns/SnsSignatureCheckerTest.java b/services/sns/src/test/java/software/amazon/awssdk/services/sns/SnsSignatureCheckerTest.java
index 6f92bc7802de..73a72d91aef6 100644
--- a/services/sns/src/test/java/software/amazon/awssdk/services/sns/SnsSignatureCheckerTest.java
+++ b/services/sns/src/test/java/software/amazon/awssdk/services/sns/SnsSignatureCheckerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/sns/src/test/java/software/amazon/awssdk/services/sns/SnsTestResources.java b/services/sns/src/test/java/software/amazon/awssdk/services/sns/SnsTestResources.java
index e726f1ad5b2c..81f57b480a14 100644
--- a/services/sns/src/test/java/software/amazon/awssdk/services/sns/SnsTestResources.java
+++ b/services/sns/src/test/java/software/amazon/awssdk/services/sns/SnsTestResources.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/sns/src/test/resources/cucumber.properties b/services/sns/src/test/resources/cucumber.properties
index a7dcec66bd2a..8ef94c9ca228 100644
--- a/services/sns/src/test/resources/cucumber.properties
+++ b/services/sns/src/test/resources/cucumber.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/sqs/build.properties b/services/sqs/build.properties
index ecf2dae6fcb1..15ec2da1fc71 100644
--- a/services/sqs/build.properties
+++ b/services/sqs/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/sqs/pom.xml b/services/sqs/pom.xml
index d6d36a05e100..05f018ae1b98 100644
--- a/services/sqs/pom.xml
+++ b/services/sqs/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>sqs</artifactId>
     <name>AWS Java SDK :: Services :: Amazon SQS</name>
diff --git a/services/sqs/src/it/java/software/amazon/awssdk/services/sqs/IntegrationTestBase.java b/services/sqs/src/it/java/software/amazon/awssdk/services/sqs/IntegrationTestBase.java
index 1cbd921be578..b6d7629a9497 100644
--- a/services/sqs/src/it/java/software/amazon/awssdk/services/sqs/IntegrationTestBase.java
+++ b/services/sqs/src/it/java/software/amazon/awssdk/services/sqs/IntegrationTestBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/sqs/src/it/java/software/amazon/awssdk/services/sqs/MessageAttributesIntegrationTest.java b/services/sqs/src/it/java/software/amazon/awssdk/services/sqs/MessageAttributesIntegrationTest.java
index 37a233b2dfa9..e94312d0e1f0 100644
--- a/services/sqs/src/it/java/software/amazon/awssdk/services/sqs/MessageAttributesIntegrationTest.java
+++ b/services/sqs/src/it/java/software/amazon/awssdk/services/sqs/MessageAttributesIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/sqs/src/it/java/software/amazon/awssdk/services/sqs/SqsConcurrentPerformanceIntegrationTest.java b/services/sqs/src/it/java/software/amazon/awssdk/services/sqs/SqsConcurrentPerformanceIntegrationTest.java
index d429010cd171..605adab6a221 100644
--- a/services/sqs/src/it/java/software/amazon/awssdk/services/sqs/SqsConcurrentPerformanceIntegrationTest.java
+++ b/services/sqs/src/it/java/software/amazon/awssdk/services/sqs/SqsConcurrentPerformanceIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/sqs/src/it/java/software/amazon/awssdk/services/sqs/SqsIntegrationTest.java b/services/sqs/src/it/java/software/amazon/awssdk/services/sqs/SqsIntegrationTest.java
index a49995388591..1db8566cc12a 100644
--- a/services/sqs/src/it/java/software/amazon/awssdk/services/sqs/SqsIntegrationTest.java
+++ b/services/sqs/src/it/java/software/amazon/awssdk/services/sqs/SqsIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/sqs/src/it/java/software/amazon/awssdk/services/sqs/SqsQueueResource.java b/services/sqs/src/it/java/software/amazon/awssdk/services/sqs/SqsQueueResource.java
index 7cf2e4daf1e8..baf836c3fe5b 100644
--- a/services/sqs/src/it/java/software/amazon/awssdk/services/sqs/SqsQueueResource.java
+++ b/services/sqs/src/it/java/software/amazon/awssdk/services/sqs/SqsQueueResource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/sqs/src/it/java/software/amazon/awssdk/services/sqs/auth/policy/SqsPolicyIntegrationTest.java b/services/sqs/src/it/java/software/amazon/awssdk/services/sqs/auth/policy/SqsPolicyIntegrationTest.java
index 14be5a4001b5..6eeb642a4233 100644
--- a/services/sqs/src/it/java/software/amazon/awssdk/services/sqs/auth/policy/SqsPolicyIntegrationTest.java
+++ b/services/sqs/src/it/java/software/amazon/awssdk/services/sqs/auth/policy/SqsPolicyIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/sqs/src/main/java/software/amazon/awssdk/services/sqs/internal/MessageMD5ChecksumInterceptor.java b/services/sqs/src/main/java/software/amazon/awssdk/services/sqs/internal/MessageMD5ChecksumInterceptor.java
index 513451e04400..ee0b8022a2af 100644
--- a/services/sqs/src/main/java/software/amazon/awssdk/services/sqs/internal/MessageMD5ChecksumInterceptor.java
+++ b/services/sqs/src/main/java/software/amazon/awssdk/services/sqs/internal/MessageMD5ChecksumInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/sqs/src/test/java/software/amazon/awssdk/services/sqs/MessageMD5ChecksumInterceptorTest.java b/services/sqs/src/test/java/software/amazon/awssdk/services/sqs/MessageMD5ChecksumInterceptorTest.java
index 410ab7165701..683ef2975c4c 100644
--- a/services/sqs/src/test/java/software/amazon/awssdk/services/sqs/MessageMD5ChecksumInterceptorTest.java
+++ b/services/sqs/src/test/java/software/amazon/awssdk/services/sqs/MessageMD5ChecksumInterceptorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/sqs/src/test/resources/cucumber.properties b/services/sqs/src/test/resources/cucumber.properties
index 40f64b9f60bb..9e03142ce770 100644
--- a/services/sqs/src/test/resources/cucumber.properties
+++ b/services/sqs/src/test/resources/cucumber.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/ssm/build.properties b/services/ssm/build.properties
index ecf2dae6fcb1..15ec2da1fc71 100644
--- a/services/ssm/build.properties
+++ b/services/ssm/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/ssm/pom.xml b/services/ssm/pom.xml
index b9381eea26a3..6aac23d1790f 100644
--- a/services/ssm/pom.xml
+++ b/services/ssm/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>ssm</artifactId>
     <name>AWS Java SDK :: Services :: AWS Simple Systems Management (SSM)</name>
diff --git a/services/ssm/src/it/java/software/amazon/awssdk/services/ssm/IntegrationTestBase.java b/services/ssm/src/it/java/software/amazon/awssdk/services/ssm/IntegrationTestBase.java
index ed280876f3ba..af6423c26d36 100644
--- a/services/ssm/src/it/java/software/amazon/awssdk/services/ssm/IntegrationTestBase.java
+++ b/services/ssm/src/it/java/software/amazon/awssdk/services/ssm/IntegrationTestBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/ssm/src/it/java/software/amazon/awssdk/services/ssm/SSMServiceIntegrationTest.java b/services/ssm/src/it/java/software/amazon/awssdk/services/ssm/SSMServiceIntegrationTest.java
index 350040a89c1a..3753fbe8b6e7 100644
--- a/services/ssm/src/it/java/software/amazon/awssdk/services/ssm/SSMServiceIntegrationTest.java
+++ b/services/ssm/src/it/java/software/amazon/awssdk/services/ssm/SSMServiceIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/ssm/src/main/resources/codegen-resources/service-2.json b/services/ssm/src/main/resources/codegen-resources/service-2.json
index 5876506213da..0415aaf95f6b 100644
--- a/services/ssm/src/main/resources/codegen-resources/service-2.json
+++ b/services/ssm/src/main/resources/codegen-resources/service-2.json
@@ -71,7 +71,7 @@
       "errors":[
         {"shape":"InternalServerError"}
       ],
-      "documentation":"<p>Registers your on-premises server or virtual machine with Amazon EC2 so that you can manage these resources using Run Command. An on-premises server or virtual machine that has been registered with EC2 is called a managed instance. For more information about activations, see <a href=\"http://docs.aws.amazon.com/systems-manager/latest/userguide/systems-manager-managedinstances.html\">Setting Up AWS Systems Manager for Hybrid Environments</a>.</p>"
+      "documentation":"<p>Generates an activation code and activation ID you can use to register your on-premises server or virtual machine (VM) with Systems Manager. Registering these machines with Systems Manager makes it possible to manage them using Systems Manager capabilities. You use the activation code and ID when installing SSM Agent on machines in your hybrid environment. For more information about requirements for managing on-premises instances and VMs using Systems Manager, see <a href=\"http://docs.aws.amazon.com/systems-manager/latest/userguide/systems-manager-managedinstances.html\">Setting Up AWS Systems Manager for Hybrid Environments</a> in the <i>AWS Systems Manager User Guide</i>. </p> <note> <p>On-premises servers or VMs that are registered with Systems Manager and Amazon EC2 instances that you manage with Systems Manager are all called <i>managed instances</i>.</p> </note>"
     },
     "CreateAssociation":{
       "name":"CreateAssociation",
@@ -197,7 +197,7 @@
         {"shape":"ResourceDataSyncAlreadyExistsException"},
         {"shape":"ResourceDataSyncInvalidConfigurationException"}
       ],
-      "documentation":"<p>Creates a resource data sync configuration to a single bucket in Amazon S3. This is an asynchronous operation that returns immediately. After a successful initial sync is completed, the system continuously syncs data to the Amazon S3 bucket. To check the status of the sync, use the <a>ListResourceDataSync</a>.</p> <p>By default, data is not encrypted in Amazon S3. We strongly recommend that you enable encryption in Amazon S3 to ensure secure data storage. We also recommend that you secure access to the Amazon S3 bucket by creating a restrictive bucket policy. For more information, see <a href=\"http://docs.aws.amazon.com/systems-manager/latest/userguide/sysman-inventory-datasync.html\">Configuring Resource Data Sync for Inventory</a> in the <i>AWS Systems Manager User Guide</i>.</p>"
+      "documentation":"<p>A resource data sync helps you view data from multiple sources in a single location. Systems Manager offers two types of resource data sync: <code>SyncToDestination</code> and <code>SyncFromSource</code>.</p> <p>You can configure Systems Manager Inventory to use the <code>SyncToDestination</code> type to synchronize Inventory data from multiple AWS Regions to a single Amazon S3 bucket. For more information, see <a href=\"http://docs.aws.amazon.com/systems-manager/latest/userguide/sysman-inventory-datasync.html\">Configuring Resource Data Sync for Inventory</a> in the <i>AWS Systems Manager User Guide</i>.</p> <p>You can configure Systems Manager Explorer to use the <code>SyncFromSource</code> type to synchronize operational work items (OpsItems) and operational data (OpsData) from multiple AWS Regions to a single Amazon S3 bucket. This type can synchronize OpsItems and OpsData from multiple AWS accounts and Regions or <code>EntireOrganization</code> by using AWS Organizations. For more information, see <a href=\"http://docs.aws.amazon.com/systems-manager/latest/userguide/Explorer-resource-data-sync.html\">Setting Up Explorer to Display Data from Multiple Accounts and Regions</a> in the <i>AWS Systems Manager User Guide</i>.</p> <p>A resource data sync is an asynchronous operation that returns immediately. After a successful initial sync is completed, the system continuously syncs data. To check the status of a sync, use the <a>ListResourceDataSync</a>.</p> <note> <p>By default, data is not encrypted in Amazon S3. We strongly recommend that you enable encryption in Amazon S3 to ensure secure data storage. We also recommend that you secure access to the Amazon S3 bucket by creating a restrictive bucket policy. </p> </note>"
     },
     "DeleteActivation":{
       "name":"DeleteActivation",
@@ -329,9 +329,10 @@
       "output":{"shape":"DeleteResourceDataSyncResult"},
       "errors":[
         {"shape":"InternalServerError"},
-        {"shape":"ResourceDataSyncNotFoundException"}
+        {"shape":"ResourceDataSyncNotFoundException"},
+        {"shape":"ResourceDataSyncInvalidConfigurationException"}
       ],
-      "documentation":"<p>Deletes a Resource Data Sync configuration. After the configuration is deleted, changes to inventory data on managed instances are no longer synced with the target Amazon S3 bucket. Deleting a sync configuration does not delete data in the target Amazon S3 bucket.</p>"
+      "documentation":"<p>Deletes a Resource Data Sync configuration. After the configuration is deleted, changes to data on managed instances are no longer synced to or from the target. Deleting a sync configuration does not delete data.</p>"
     },
     "DeregisterManagedInstance":{
       "name":"DeregisterManagedInstance",
@@ -789,7 +790,7 @@
         {"shape":"InvalidFilterValue"},
         {"shape":"InvalidNextToken"}
       ],
-      "documentation":"<p>Get information about a parameter.</p> <p>Request results are returned on a best-effort basis. If you specify <code>MaxResults</code> in the request, the response includes information up to the limit specified. The number of items returned, however, can be between zero and the value of <code>MaxResults</code>. If the service reaches an internal limit while processing the results, it stops the operation and returns the matching values up to that point and a <code>NextToken</code>. You can specify the <code>NextToken</code> in a subsequent call to get the next set of results.</p>"
+      "documentation":"<p>Get information about a parameter.</p> <note> <p>Request results are returned on a best-effort basis. If you specify <code>MaxResults</code> in the request, the response includes information up to the limit specified. The number of items returned, however, can be between zero and the value of <code>MaxResults</code>. If the service reaches an internal limit while processing the results, it stops the operation and returns the matching values up to that point and a <code>NextToken</code>. You can specify the <code>NextToken</code> in a subsequent call to get the next set of results.</p> </note>"
     },
     "DescribePatchBaselines":{
       "name":"DescribePatchBaselines",
@@ -873,6 +874,22 @@
       ],
       "documentation":"<p>Get detailed information about a particular Automation execution.</p>"
     },
+    "GetCalendarState":{
+      "name":"GetCalendarState",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"GetCalendarStateRequest"},
+      "output":{"shape":"GetCalendarStateResponse"},
+      "errors":[
+        {"shape":"InternalServerError"},
+        {"shape":"InvalidDocument"},
+        {"shape":"InvalidDocumentType"},
+        {"shape":"UnsupportedCalendarException"}
+      ],
+      "documentation":"<p>Gets the state of the AWS Systems Manager Change Calendar at an optional, specified time. If you specify a time, <code>GetCalendarState</code> returns the state of the calendar at a specific time, and returns the next time that the Change Calendar state will transition. If you do not specify a time, <code>GetCalendarState</code> assumes the current time. Change Calendar entries have two possible states: <code>OPEN</code> or <code>CLOSED</code>. For more information about Systems Manager Change Calendar, see <a href=\"https://docs.aws.amazon.com/systems-manager/latest/userguide/systems-manager-change-calendar.html\">AWS Systems Manager Change Calendar</a> in the <i>AWS Systems Manager User Guide</i>.</p>"
+    },
     "GetCommandInvocation":{
       "name":"GetCommandInvocation",
       "http":{
@@ -1074,6 +1091,7 @@
       "output":{"shape":"GetOpsSummaryResult"},
       "errors":[
         {"shape":"InternalServerError"},
+        {"shape":"ResourceDataSyncNotFoundException"},
         {"shape":"InvalidFilter"},
         {"shape":"InvalidNextToken"},
         {"shape":"InvalidTypeNameException"},
@@ -1143,7 +1161,7 @@
         {"shape":"InvalidKeyId"},
         {"shape":"InvalidNextToken"}
       ],
-      "documentation":"<p>Retrieve parameters in a specific hierarchy. For more information, see <a href=\"http://docs.aws.amazon.com/systems-manager/latest/userguide/sysman-paramstore-working.html\">Working with Systems Manager Parameters</a> in the <i>AWS Systems Manager User Guide</i>. </p> <p>Request results are returned on a best-effort basis. If you specify <code>MaxResults</code> in the request, the response includes information up to the limit specified. The number of items returned, however, can be between zero and the value of <code>MaxResults</code>. If the service reaches an internal limit while processing the results, it stops the operation and returns the matching values up to that point and a <code>NextToken</code>. You can specify the <code>NextToken</code> in a subsequent call to get the next set of results.</p> <note> <p>This API action doesn't support filtering by tags. </p> </note>"
+      "documentation":"<p>Retrieve information about one or more parameters in a specific hierarchy. </p> <note> <p>Request results are returned on a best-effort basis. If you specify <code>MaxResults</code> in the request, the response includes information up to the limit specified. The number of items returned, however, can be between zero and the value of <code>MaxResults</code>. If the service reaches an internal limit while processing the results, it stops the operation and returns the matching values up to that point and a <code>NextToken</code>. You can specify the <code>NextToken</code> in a subsequent call to get the next set of results.</p> </note>"
     },
     "GetPatchBaseline":{
       "name":"GetPatchBaseline",
@@ -1231,7 +1249,7 @@
         {"shape":"InternalServerError"},
         {"shape":"InvalidNextToken"}
       ],
-      "documentation":"<p>Lists the associations for the specified Systems Manager document or instance.</p>"
+      "documentation":"<p>Returns all State Manager associations in the current AWS account and Region. You can limit the results to a specific State Manager association document or instance by specifying a filter.</p>"
     },
     "ListCommandInvocations":{
       "name":"ListCommandInvocations",
@@ -1327,7 +1345,7 @@
         {"shape":"InvalidNextToken"},
         {"shape":"InvalidFilterKey"}
       ],
-      "documentation":"<p>Describes one or more of your Systems Manager documents.</p>"
+      "documentation":"<p>Returns all Systems Manager (SSM) documents in the current AWS account and Region. You can limit the results of this request by using a filter.</p>"
     },
     "ListInventoryEntries":{
       "name":"ListInventoryEntries",
@@ -1370,6 +1388,7 @@
       "input":{"shape":"ListResourceDataSyncRequest"},
       "output":{"shape":"ListResourceDataSyncResult"},
       "errors":[
+        {"shape":"ResourceDataSyncInvalidConfigurationException"},
         {"shape":"InternalServerError"},
         {"shape":"InvalidNextToken"}
       ],
@@ -1870,6 +1889,22 @@
       ],
       "documentation":"<p>Modifies an existing patch baseline. Fields not specified in the request are left unchanged.</p> <note> <p>For information about valid key and value pairs in <code>PatchFilters</code> for each supported operating system type, see <a href=\"http://docs.aws.amazon.com/systems-manager/latest/APIReference/API_PatchFilter.html\">PatchFilter</a>.</p> </note>"
     },
+    "UpdateResourceDataSync":{
+      "name":"UpdateResourceDataSync",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"UpdateResourceDataSyncRequest"},
+      "output":{"shape":"UpdateResourceDataSyncResult"},
+      "errors":[
+        {"shape":"ResourceDataSyncNotFoundException"},
+        {"shape":"ResourceDataSyncInvalidConfigurationException"},
+        {"shape":"ResourceDataSyncConflictException"},
+        {"shape":"InternalServerError"}
+      ],
+      "documentation":"<p>Update a resource data sync. After you create a resource data sync for a Region, you can't change the account options for that sync. For example, if you create a sync in the us-east-2 (Ohio) Region and you choose the Include only the current account option, you can't edit that sync later and choose the Include all accounts from my AWS Organizations configuration option. Instead, you must delete the first resource data sync, and create a new one.</p>"
+    },
     "UpdateServiceSetting":{
       "name":"UpdateServiceSetting",
       "http":{
@@ -1897,6 +1932,25 @@
       "member":{"shape":"AccountId"},
       "max":20
     },
+    "AccountSharingInfo":{
+      "type":"structure",
+      "members":{
+        "AccountId":{
+          "shape":"AccountId",
+          "documentation":"<p>The AWS account ID where the current document is shared.</p>"
+        },
+        "SharedDocumentVersion":{
+          "shape":"SharedDocumentVersion",
+          "documentation":"<p>The version of the current document shared with the account.</p>"
+        }
+      },
+      "documentation":"<p>Information includes the AWS account ID where the current document is shared and the version shared with that account.</p>"
+    },
+    "AccountSharingInfoList":{
+      "type":"list",
+      "member":{"shape":"AccountSharingInfo"},
+      "documentation":"<p>A list of of AWS accounts where the current document is shared and the version shared with each account.</p>"
+    },
     "Accounts":{
       "type":"list",
       "member":{"shape":"Account"},
@@ -2613,6 +2667,10 @@
       "type":"string",
       "enum":["Sha256"]
     },
+    "AttachmentIdentifier":{
+      "type":"string",
+      "pattern":"^[a-zA-Z0-9_\\-.]{3,128}$"
+    },
     "AttachmentInformation":{
       "type":"structure",
       "members":{
@@ -2637,23 +2695,31 @@
       "members":{
         "Key":{
           "shape":"AttachmentsSourceKey",
-          "documentation":"<p>The key of a key and value pair that identifies the location of an attachment to a document.</p>"
+          "documentation":"<p>The key of a key-value pair that identifies the location of an attachment to a document.</p>"
         },
         "Values":{
           "shape":"AttachmentsSourceValues",
-          "documentation":"<p>The URL of the location of a document attachment, such as the URL of an Amazon S3 bucket.</p>"
+          "documentation":"<p>The value of a key-value pair that identifies the location of an attachment to a document. The format for <b>Value</b> depends on the type of key you specify.</p> <ul> <li> <p>For the key <i>SourceUrl</i>, the value is an S3 bucket location. For example:</p> <p> <code>\"Values\": [ \"s3://my-bucket/my-folder\" ]</code> </p> </li> <li> <p>For the key <i>S3FileUrl</i>, the value is a file in an S3 bucket. For example:</p> <p> <code>\"Values\": [ \"s3://my-bucket/my-folder/my-file.py\" ]</code> </p> </li> <li> <p>For the key <i>AttachmentReference</i>, the value is constructed from the name of another SSM document in your account, a version number of that document, and a file attached to that document version that you want to reuse. For example:</p> <p> <code>\"Values\": [ \"MyOtherDocument/3/my-other-file.py\" ]</code> </p> <p>However, if the SSM document is shared with you from another account, the full SSM document ARN must be specified instead of the document name only. For example:</p> <p> <code>\"Values\": [ \"arn:aws:ssm:us-east-2:111122223333:document/OtherAccountDocument/3/their-file.py\" ]</code> </p> </li> </ul>"
+        },
+        "Name":{
+          "shape":"AttachmentIdentifier",
+          "documentation":"<p>The name of the document attachment file.</p>"
         }
       },
-      "documentation":"<p>A key and value pair that identifies the location of an attachment to a document.</p>"
+      "documentation":"<p>Identifying information about a document attachment, including the file name and a key-value pair that identifies the location of an attachment to a document.</p>"
     },
     "AttachmentsSourceKey":{
       "type":"string",
-      "enum":["SourceUrl"]
+      "enum":[
+        "SourceUrl",
+        "S3FileUrl",
+        "AttachmentReference"
+      ]
     },
     "AttachmentsSourceList":{
       "type":"list",
       "member":{"shape":"AttachmentsSource"},
-      "max":1,
+      "max":20,
       "min":0
     },
     "AttachmentsSourceValue":{
@@ -2832,7 +2898,8 @@
         "CurrentAction",
         "StartTimeBefore",
         "StartTimeAfter",
-        "AutomationType"
+        "AutomationType",
+        "TagKey"
       ]
     },
     "AutomationExecutionFilterList":{
@@ -2882,11 +2949,11 @@
         },
         "AutomationExecutionStatus":{
           "shape":"AutomationExecutionStatus",
-          "documentation":"<p>The status of the execution. Valid values include: Running, Succeeded, Failed, Timed out, or Cancelled.</p>"
+          "documentation":"<p>The status of the execution.</p>"
         },
         "ExecutionStartTime":{
           "shape":"DateTime",
-          "documentation":"<p>The time the execution started.&gt;</p>"
+          "documentation":"<p>The time the execution started.</p>"
         },
         "ExecutionEndTime":{
           "shape":"DateTime",
@@ -3046,6 +3113,18 @@
     },
     "BatchErrorMessage":{"type":"string"},
     "Boolean":{"type":"boolean"},
+    "CalendarNameOrARN":{"type":"string"},
+    "CalendarNameOrARNList":{
+      "type":"list",
+      "member":{"shape":"CalendarNameOrARN"}
+    },
+    "CalendarState":{
+      "type":"string",
+      "enum":[
+        "OPEN",
+        "CLOSED"
+      ]
+    },
     "CancelCommandRequest":{
       "type":"structure",
       "required":["CommandId"],
@@ -3094,8 +3173,7 @@
     "CloudWatchLogGroupName":{
       "type":"string",
       "max":512,
-      "min":1,
-      "pattern":"[\\.\\-_/#A-Za-z0-9]+"
+      "min":1
     },
     "CloudWatchOutputConfig":{
       "type":"structure",
@@ -3556,11 +3634,7 @@
       "max":10000,
       "min":0
     },
-    "ComplianceItemId":{
-      "type":"string",
-      "max":100,
-      "min":1
-    },
+    "ComplianceItemId":{"type":"string"},
     "ComplianceItemList":{
       "type":"list",
       "member":{"shape":"ComplianceItem"}
@@ -3720,15 +3794,15 @@
       "members":{
         "Description":{
           "shape":"ActivationDescription",
-          "documentation":"<p>A user-defined description of the resource that you want to register with Amazon EC2. </p> <important> <p>Do not enter personally identifiable information in this field.</p> </important>"
+          "documentation":"<p>A user-defined description of the resource that you want to register with Systems Manager. </p> <important> <p>Do not enter personally identifiable information in this field.</p> </important>"
         },
         "DefaultInstanceName":{
           "shape":"DefaultInstanceName",
-          "documentation":"<p>The name of the registered, managed instance as it will appear in the Amazon EC2 console or when you use the AWS command line tools to list EC2 resources.</p> <important> <p>Do not enter personally identifiable information in this field.</p> </important>"
+          "documentation":"<p>The name of the registered, managed instance as it will appear in the Systems Manager console or when you use the AWS command line tools to list Systems Manager resources.</p> <important> <p>Do not enter personally identifiable information in this field.</p> </important>"
         },
         "IamRole":{
           "shape":"IamRole",
-          "documentation":"<p>The Amazon Identity and Access Management (IAM) role that you want to assign to the managed instance. </p>"
+          "documentation":"<p>The Amazon Identity and Access Management (IAM) role that you want to assign to the managed instance. This IAM role must provide AssumeRole permissions for the Systems Manager service principal <code>ssm.amazonaws.com</code>. For more information, see <a href=\"http://docs.aws.amazon.com/systems-manager/latest/userguide/sysman-service-role.html\">Create an IAM Service Role for a Hybrid Environment</a> in the <i>AWS Systems Manager User Guide</i>.</p>"
         },
         "RegistrationLimit":{
           "shape":"RegistrationLimit",
@@ -3855,7 +3929,7 @@
         },
         "InstanceId":{
           "shape":"InstanceId",
-          "documentation":"<p>The instance ID.</p> <note> <p> <code>InstanceId</code> has been deprecated. To specify an instance ID for an association, use the <code>Targets</code> parameter. If you use the parameter <code>InstanceId</code>, you cannot use the parameters <code>AssociationName</code>, <code>DocumentVersion</code>, <code>MaxErrors</code>, <code>MaxConcurrency</code>, <code>OutputLocation</code>, or <code>ScheduleExpression</code>. To use these parameters, you must use the <code>Targets</code> parameter.</p> </note>"
+          "documentation":"<p>The instance ID.</p> <note> <p> <code>InstanceId</code> has been deprecated. To specify an instance ID for an association, use the <code>Targets</code> parameter. Requests that include the parameter <code>InstanceID</code> with SSM documents that use schema version 2.0 or later will fail. In addition, if you use the parameter <code>InstanceId</code>, you cannot use the parameters <code>AssociationName</code>, <code>DocumentVersion</code>, <code>MaxErrors</code>, <code>MaxConcurrency</code>, <code>OutputLocation</code>, or <code>ScheduleExpression</code>. To use these parameters, you must use the <code>Targets</code> parameter.</p> </note>"
         },
         "Parameters":{
           "shape":"Parameters",
@@ -3915,6 +3989,10 @@
           "shape":"DocumentContent",
           "documentation":"<p>A valid JSON or YAML string.</p>"
         },
+        "Requires":{
+          "shape":"DocumentRequiresList",
+          "documentation":"<p>A list of SSM documents required by a document. For example, an <code>ApplicationConfiguration</code> document requires an <code>ApplicationConfigurationSchema</code> document.</p>"
+        },
         "Attachments":{
           "shape":"AttachmentsSourceList",
           "documentation":"<p>A list of key and value pairs that describe attachments to a version of a document.</p>"
@@ -3929,11 +4007,11 @@
         },
         "DocumentType":{
           "shape":"DocumentType",
-          "documentation":"<p>The type of document to create. Valid document types include: <code>Command</code>, <code>Policy</code>, <code>Automation</code>, <code>Session</code>, and <code>Package</code>.</p>"
+          "documentation":"<p>The type of document to create.</p>"
         },
         "DocumentFormat":{
           "shape":"DocumentFormat",
-          "documentation":"<p>Specify the document format for the request. The document format can be either JSON or YAML. JSON is the default format.</p>"
+          "documentation":"<p>Specify the document format for the request. The document format can be JSON, YAML, or TEXT. JSON is the default format.</p>"
         },
         "TargetType":{
           "shape":"TargetType",
@@ -4059,6 +4137,14 @@
         "Tags":{
           "shape":"TagList",
           "documentation":"<p>Optional metadata that you assign to a resource. You can restrict access to OpsItems by using an inline IAM policy that specifies tags. For more information, see <a href=\"http://docs.aws.amazon.com/systems-manager/latest/userguide/OpsCenter-getting-started.html#OpsCenter-getting-started-user-permissions\">Getting Started with OpsCenter</a> in the <i>AWS Systems Manager User Guide</i>.</p> <p>Tags use a key-value pair. For example:</p> <p> <code>Key=Department,Value=Finance</code> </p> <note> <p>To add tags to an existing OpsItem, use the <a>AddTagsToResource</a> action.</p> </note>"
+        },
+        "Category":{
+          "shape":"OpsItemCategory",
+          "documentation":"<p>Specify a category to assign to an OpsItem. </p>"
+        },
+        "Severity":{
+          "shape":"OpsItemSeverity",
+          "documentation":"<p>Specify a severity to assign to an OpsItem.</p>"
         }
       }
     },
@@ -4142,10 +4228,7 @@
     },
     "CreateResourceDataSyncRequest":{
       "type":"structure",
-      "required":[
-        "SyncName",
-        "S3Destination"
-      ],
+      "required":["SyncName"],
       "members":{
         "SyncName":{
           "shape":"ResourceDataSyncName",
@@ -4154,6 +4237,14 @@
         "S3Destination":{
           "shape":"ResourceDataSyncS3Destination",
           "documentation":"<p>Amazon S3 configuration details for the sync.</p>"
+        },
+        "SyncType":{
+          "shape":"ResourceDataSyncType",
+          "documentation":"<p>Specify <code>SyncToDestination</code> to create a resource data sync that synchronizes data from multiple AWS Regions to an Amazon S3 bucket. Specify <code>SyncFromSource</code> to synchronize data from multiple AWS accounts and Regions, as listed in AWS Organizations.</p>"
+        },
+        "SyncSource":{
+          "shape":"ResourceDataSyncSource",
+          "documentation":"<p>Specify information about the data sources to synchronize.</p>"
         }
       }
     },
@@ -4231,6 +4322,10 @@
         "VersionName":{
           "shape":"DocumentVersionName",
           "documentation":"<p>The version name of the document that you want to delete. If not provided, all versions of the document are deleted.</p>"
+        },
+        "Force":{
+          "shape":"Boolean",
+          "documentation":"<p>Some SSM document types require that you specify a <code>Force</code> flag before you can delete the document. For example, you must specify a <code>Force</code> flag to delete a document of type <code>ApplicationConfigurationSchema</code>. You can restrict access to the <code>Force</code> flag in an AWS Identity and Access Management (IAM) policy.</p>"
         }
       }
     },
@@ -4362,6 +4457,10 @@
         "SyncName":{
           "shape":"ResourceDataSyncName",
           "documentation":"<p>The name of the configuration to delete.</p>"
+        },
+        "SyncType":{
+          "shape":"ResourceDataSyncType",
+          "documentation":"<p>Specify the type of resource data sync to delete.</p>"
         }
       }
     },
@@ -4773,6 +4872,10 @@
         "AccountIds":{
           "shape":"AccountIdList",
           "documentation":"<p>The account IDs that have permission to use this document. The ID can be either an AWS account or <i>All</i>.</p>"
+        },
+        "AccountSharingInfoList":{
+          "shape":"AccountSharingInfoList",
+          "documentation":"<p>A list of of AWS accounts where the current document is shared and the version shared with each account.</p>"
         }
       }
     },
@@ -5404,7 +5507,7 @@
       "members":{
         "Filters":{
           "shape":"ParametersFilterList",
-          "documentation":"<p>One or more filters. Use a filter to return a more specific list of results.</p>"
+          "documentation":"<p>This data type is deprecated. Instead, use <code>ParameterFilters</code>.</p>"
         },
         "ParameterFilters":{
           "shape":"ParameterStringFilterList",
@@ -5430,7 +5533,7 @@
         },
         "NextToken":{
           "shape":"NextToken",
-          "documentation":"<p>The token to use when requesting the next set of items. If there are no additional items to return, the string is empty.</p>"
+          "documentation":"<p>The token to use when requesting the next set of items.</p>"
         }
       }
     },
@@ -5490,6 +5593,11 @@
           "shape":"Integer",
           "documentation":"<p>The number of instances with patches installed that aren't defined in the patch baseline.</p>"
         },
+        "InstancesWithInstalledPendingRebootPatches":{
+          "shape":"InstancesCount",
+          "documentation":"<p>The number of instances with patches installed by Patch Manager that have not been rebooted after the patch installation. The status of these instances is NON_COMPLIANT.</p>",
+          "box":true
+        },
         "InstancesWithInstalledRejectedPatches":{
           "shape":"InstancesCount",
           "documentation":"<p>The number of instances with patches installed that are specified in a RejectedPatches list. Patches with a status of <i>INSTALLED_REJECTED</i> were typically installed before they were added to a RejectedPatches list.</p> <note> <p>If ALLOW_AS_DEPENDENCY is the specified option for RejectedPatchesAction, the value of InstancesWithInstalledRejectedPatches will always be 0 (zero).</p> </note>",
@@ -5745,6 +5853,10 @@
         "AttachmentsInformation":{
           "shape":"AttachmentInformationList",
           "documentation":"<p>Details about the document attachments, including names, locations, sizes, etc.</p>"
+        },
+        "Requires":{
+          "shape":"DocumentRequiresList",
+          "documentation":"<p>A list of SSM documents required by a document. For example, an <code>ApplicationConfiguration</code> document requires an <code>ApplicationConfigurationSchema</code> document.</p>"
         }
       },
       "documentation":"<p>Describes a Systems Manager document. </p>"
@@ -5789,7 +5901,8 @@
       "type":"string",
       "enum":[
         "YAML",
-        "JSON"
+        "JSON",
+        "TEXT"
       ]
     },
     "DocumentHash":{
@@ -5845,6 +5958,10 @@
         "Tags":{
           "shape":"TagList",
           "documentation":"<p>The tags, or metadata, that have been applied to the document.</p>"
+        },
+        "Requires":{
+          "shape":"DocumentRequiresList",
+          "documentation":"<p>A list of SSM documents required by a document. For example, an <code>ApplicationConfiguration</code> document requires an <code>ApplicationConfigurationSchema</code> document.</p>"
         }
       },
       "documentation":"<p>Describes the name of a Systems Manager document.</p>"
@@ -5948,6 +6065,26 @@
       "type":"string",
       "enum":["Share"]
     },
+    "DocumentRequires":{
+      "type":"structure",
+      "required":["Name"],
+      "members":{
+        "Name":{
+          "shape":"DocumentARN",
+          "documentation":"<p>The name of the required SSM document. The name can be an Amazon Resource Name (ARN).</p>"
+        },
+        "Version":{
+          "shape":"DocumentVersion",
+          "documentation":"<p>The document version required by the current document.</p>"
+        }
+      },
+      "documentation":"<p>An SSM document required by the current document.</p>"
+    },
+    "DocumentRequiresList":{
+      "type":"list",
+      "member":{"shape":"DocumentRequires"},
+      "min":1
+    },
     "DocumentSchemaVersion":{
       "type":"string",
       "pattern":"([0-9]+)\\.([0-9]+)"
@@ -5972,7 +6109,11 @@
         "Policy",
         "Automation",
         "Session",
-        "Package"
+        "Package",
+        "ApplicationConfiguration",
+        "ApplicationConfigurationSchema",
+        "DeploymentStrategy",
+        "ChangeCalendar"
       ]
     },
     "DocumentVersion":{
@@ -6043,7 +6184,7 @@
       "members":{
         "Message":{"shape":"String"}
       },
-      "documentation":"<p>Error returned when the ID specified for a resource, such as a maintenance window or Patch baseline, doesn't exist.</p> <p>For information about resource limits in Systems Manager, see <a href=\"http://docs.aws.amazon.com/general/latest/gr/aws_service_limits.html#limits_ssm\">AWS Systems Manager Limits</a>.</p>",
+      "documentation":"<p>Error returned when the ID specified for a resource, such as a maintenance window or Patch baseline, doesn't exist.</p> <p>For information about resource quotas in Systems Manager, see <a href=\"http://docs.aws.amazon.com/general/latest/gr/ssm.html#limits_ssm\">Systems Manager Service Quotas</a> in the <i>AWS General Reference</i>.</p>",
       "exception":true
     },
     "DryRun":{"type":"boolean"},
@@ -6182,6 +6323,37 @@
         }
       }
     },
+    "GetCalendarStateRequest":{
+      "type":"structure",
+      "required":["CalendarNames"],
+      "members":{
+        "CalendarNames":{
+          "shape":"CalendarNameOrARNList",
+          "documentation":"<p>The names or Amazon Resource Names (ARNs) of the Systems Manager documents that represent the calendar entries for which you want to get the state.</p>"
+        },
+        "AtTime":{
+          "shape":"ISO8601String",
+          "documentation":"<p>(Optional) The specific time for which you want to get calendar state information, in <a href=\"https://en.wikipedia.org/wiki/ISO_8601\">ISO 8601</a> format. If you do not add <code>AtTime</code>, the current time is assumed.</p>"
+        }
+      }
+    },
+    "GetCalendarStateResponse":{
+      "type":"structure",
+      "members":{
+        "State":{
+          "shape":"CalendarState",
+          "documentation":"<p>The state of the calendar. An <code>OPEN</code> calendar indicates that actions are allowed to proceed, and a <code>CLOSED</code> calendar indicates that actions are not allowed to proceed.</p>"
+        },
+        "AtTime":{
+          "shape":"ISO8601String",
+          "documentation":"<p>The time, as an <a href=\"https://en.wikipedia.org/wiki/ISO_8601\">ISO 8601</a> string, that you specified in your command. If you did not specify a time, <code>GetCalendarState</code> uses the current time.</p>"
+        },
+        "NextTransitionTime":{
+          "shape":"ISO8601String",
+          "documentation":"<p>The time, as an <a href=\"https://en.wikipedia.org/wiki/ISO_8601\">ISO 8601</a> string, that the calendar state will change. If the current calendar state is <code>OPEN</code>, <code>NextTransitionTime</code> indicates when the calendar state changes to <code>CLOSED</code>, and vice-versa.</p>"
+        }
+      }
+    },
     "GetCommandInvocationRequest":{
       "type":"structure",
       "required":[
@@ -6416,6 +6588,10 @@
           "shape":"DocumentFormat",
           "documentation":"<p>The document format, either JSON or YAML.</p>"
         },
+        "Requires":{
+          "shape":"DocumentRequiresList",
+          "documentation":"<p>A list of SSM documents required by a document. For example, an <code>ApplicationConfiguration</code> document requires an <code>ApplicationConfigurationSchema</code> document.</p>"
+        },
         "AttachmentsContent":{
           "shape":"AttachmentContentList",
           "documentation":"<p>A description of the document attachments, including names, locations, sizes, etc.</p>"
@@ -6864,8 +7040,11 @@
     },
     "GetOpsSummaryRequest":{
       "type":"structure",
-      "required":["Aggregators"],
       "members":{
+        "SyncName":{
+          "shape":"ResourceDataSyncName",
+          "documentation":"<p>Specify the name of a resource data sync to get.</p>"
+        },
         "Filters":{
           "shape":"OpsFilterList",
           "documentation":"<p>Optional filters used to scope down the returned OpsItems. </p>"
@@ -6874,6 +7053,10 @@
           "shape":"OpsAggregatorList",
           "documentation":"<p>Optional aggregators that return counts of OpsItems based on one or more expressions.</p>"
         },
+        "ResultAttributes":{
+          "shape":"OpsResultAttributeList",
+          "documentation":"<p>The OpsItem data type to return.</p>"
+        },
         "NextToken":{
           "shape":"NextToken",
           "documentation":"<p>A token to start the list. Use this token to get the next set of results. </p>"
@@ -6979,7 +7162,7 @@
         },
         "ParameterFilters":{
           "shape":"ParameterStringFilterList",
-          "documentation":"<p>Filters to limit the request results.</p> <note> <p>You can't filter using the parameter name.</p> </note>"
+          "documentation":"<p>Filters to limit the request results.</p>"
         },
         "WithDecryption":{
           "shape":"Boolean",
@@ -7193,6 +7376,7 @@
       "max":46,
       "min":1
     },
+    "ISO8601String":{"type":"string"},
     "IamRole":{
       "type":"string",
       "max":64
@@ -7569,6 +7753,11 @@
           "shape":"PatchInstalledOtherCount",
           "documentation":"<p>The number of patches not specified in the patch baseline that are installed on the instance.</p>"
         },
+        "InstalledPendingRebootCount":{
+          "shape":"PatchInstalledPendingRebootCount",
+          "documentation":"<p>The number of patches installed by Patch Manager since the last time the instance was rebooted.</p>",
+          "box":true
+        },
         "InstalledRejectedCount":{
           "shape":"PatchInstalledRejectedCount",
           "documentation":"<p>The number of instances with patches installed that are specified in a RejectedPatches list. Patches with a status of <i>InstalledRejected</i> were typically installed before they were added to a RejectedPatches list.</p> <note> <p>If ALLOW_AS_DEPENDENCY is the specified option for RejectedPatchesAction, the value of InstalledRejectedCount will always be 0 (zero).</p> </note>",
@@ -7602,6 +7791,14 @@
         "Operation":{
           "shape":"PatchOperationType",
           "documentation":"<p>The type of patching operation that was performed: SCAN (assess patch compliance state) or INSTALL (install missing patches).</p>"
+        },
+        "LastNoRebootInstallOperationTime":{
+          "shape":"DateTime",
+          "documentation":"<p>The time of the last attempt to patch the instance with <code>NoReboot</code> specified as the reboot option.</p>"
+        },
+        "RebootOption":{
+          "shape":"RebootOption",
+          "documentation":"<p>Indicates the reboot option specified in the patch baseline.</p> <note> <p>Reboot options apply to <code>Install</code> operations only. Reboots are not attempted for Patch Manager <code>Scan</code> operations.</p> </note> <ul> <li> <p> <b>RebootIfNeeded</b>: Patch Manager tries to reboot the instance if it installed any patches, or if any patches are detected with a status of <code>InstalledPendingReboot</code>.</p> </li> <li> <p> <b>NoReboot</b>: Patch Manager attempts to install missing packages without trying to reboot the system. Patches installed with this option are assigned a status of <code>InstalledPendingReboot</code>. These patches might not be in effect until a reboot is performed.</p> </li> </ul>"
         }
       },
       "documentation":"<p>Defines the high-level patch compliance state for a managed instance, providing information about the number of installed, missing, not applicable, and failed patches along with metadata about the operation when this information was gathered for the instance.</p>"
@@ -7816,6 +8013,14 @@
       "documentation":"<p>The version of the document schema is not supported.</p>",
       "exception":true
     },
+    "InvalidDocumentType":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"String"}
+      },
+      "documentation":"<p>The document type is not valid. Valid document types are described in the <code>DocumentType</code> property.</p>",
+      "exception":true
+    },
     "InvalidDocumentVersion":{
       "type":"structure",
       "members":{
@@ -8196,7 +8401,7 @@
         },
         "Type":{
           "shape":"InventoryQueryOperatorType",
-          "documentation":"<p>The type of filter. Valid values include the following: \"Equal\"|\"NotEqual\"|\"BeginWith\"|\"LessThan\"|\"GreaterThan\"</p>"
+          "documentation":"<p>The type of filter.</p>"
         }
       },
       "documentation":"<p>One or more filters. Use a filter to return a more specific list of results.</p>"
@@ -8627,7 +8832,7 @@
         },
         "Filters":{
           "shape":"CommandFilterList",
-          "documentation":"<p>(Optional) One or more filters. Use a filter to return a more specific list of results.</p>"
+          "documentation":"<p>(Optional) One or more filters. Use a filter to return a more specific list of results. Note that the <code>DocumentName</code> filter is not supported for ListCommandInvocations.</p>"
         },
         "Details":{
           "shape":"Boolean",
@@ -8762,8 +8967,8 @@
       "required":["Name"],
       "members":{
         "Name":{
-          "shape":"DocumentName",
-          "documentation":"<p>The name of the document about which you want version information.</p>"
+          "shape":"DocumentARN",
+          "documentation":"<p>The name of the document. You can specify an Amazon Resource Name (ARN).</p>"
         },
         "MaxResults":{
           "shape":"MaxResults",
@@ -8917,6 +9122,10 @@
     "ListResourceDataSyncRequest":{
       "type":"structure",
       "members":{
+        "SyncType":{
+          "shape":"ResourceDataSyncType",
+          "documentation":"<p>View a list of resource data syncs according to the sync type. Specify <code>SyncToDestination</code> to view resource data syncs that synchronize data to an Amazon S3 buckets. Specify <code>SyncFromSource</code> to view resource data syncs from AWS Organizations or from multiple AWS Regions. </p>"
+        },
         "NextToken":{
           "shape":"NextToken",
           "documentation":"<p>A token to start the list. Use this token to get the next set of results. </p>"
@@ -9367,6 +9576,7 @@
           "shape":"Comment",
           "documentation":"<p>Information about the commands to run.</p>"
         },
+        "CloudWatchOutputConfig":{"shape":"CloudWatchOutputConfig"},
         "DocumentHash":{
           "shape":"DocumentHash",
           "documentation":"<p>The SHA-256 or SHA-1 hash created by the system when the document was created. SHA-1 hashes have been deprecated.</p>"
@@ -9375,6 +9585,10 @@
           "shape":"DocumentHashType",
           "documentation":"<p>SHA-256 or SHA-1. SHA-1 hashes have been deprecated.</p>"
         },
+        "DocumentVersion":{
+          "shape":"DocumentVersion",
+          "documentation":"<p>The SSM document version to use in the request. You can specify $DEFAULT, $LATEST, or a specific version number. If you run commands by using the AWS CLI, then you must escape the first two options by using a backslash. If you specify a version number, then you don't need to use the backslash. For example:</p> <p>--document-version \"\\$DEFAULT\"</p> <p>--document-version \"\\$LATEST\"</p> <p>--document-version \"3\"</p>"
+        },
         "NotificationConfig":{
           "shape":"NotificationConfig",
           "documentation":"<p>Configurations for sending notifications about command status changes on a per-instance basis.</p>"
@@ -9692,6 +9906,10 @@
         "AccountIdsToRemove":{
           "shape":"AccountIdList",
           "documentation":"<p>The AWS user accounts that should no longer have access to the document. The AWS user account can either be a group of account IDs or <i>All</i>. This action has a higher priority than <i>AccountIdsToAdd</i>. If you specify an account ID to add and the same ID to remove, the system removes access to the document.</p>"
+        },
+        "SharedDocumentVersion":{
+          "shape":"SharedDocumentVersion",
+          "documentation":"<p>(Optional) The version of the document to share. If it's not specified, the system choose the <code>Default</code> version to share.</p>"
         }
       }
     },
@@ -9813,11 +10031,11 @@
       "type":"string",
       "max":20,
       "min":1,
-      "pattern":"^(range|count)"
+      "pattern":"^(range|count|sum)"
     },
     "OpsAggregatorValue":{
       "type":"string",
-      "max":512,
+      "max":2048,
       "min":0
     },
     "OpsAggregatorValueKey":{
@@ -9857,6 +10075,10 @@
     "OpsEntityItem":{
       "type":"structure",
       "members":{
+        "CaptureTime":{
+          "shape":"OpsEntityItemCaptureTime",
+          "documentation":"<p>The time OpsItem data was captured.</p>"
+        },
         "Content":{
           "shape":"OpsEntityItemEntryList",
           "documentation":"<p>The detailed data content for an OpsItem summaries result item.</p>"
@@ -9864,6 +10086,10 @@
       },
       "documentation":"<p>The OpsItem summaries result item.</p>"
     },
+    "OpsEntityItemCaptureTime":{
+      "type":"string",
+      "pattern":"^(20)[0-9][0-9]-(0[1-9]|1[012])-([12][0-9]|3[01]|0[1-9])(T)(2[0-3]|[0-1][0-9])(:[0-5][0-9])(:[0-5][0-9])(Z)$"
+    },
     "OpsEntityItemEntry":{
       "type":"map",
       "key":{"shape":"AttributeName"},
@@ -9996,6 +10222,14 @@
         "OperationalData":{
           "shape":"OpsItemOperationalData",
           "documentation":"<p>Operational data is custom data that provides useful reference details about the OpsItem. For example, you can specify log files, error strings, license keys, troubleshooting tips, or other relevant data. You enter operational data as key-value pairs. The key has a maximum length of 128 characters. The value has a maximum size of 20 KB.</p> <important> <p>Operational data keys <i>can't</i> begin with the following: amazon, aws, amzn, ssm, /amazon, /aws, /amzn, /ssm.</p> </important> <p>You can choose to make the data searchable by other users in the account or you can restrict search access. Searchable data means that all users with access to the OpsItem Overview page (as provided by the <a>DescribeOpsItems</a> API action) can view and search on the specified data. Operational data that is not searchable is only viewable by users who have access to the OpsItem (as provided by the <a>GetOpsItem</a> API action).</p> <p>Use the <code>/aws/resources</code> key in OperationalData to specify a related resource in the request. Use the <code>/aws/automations</code> key in OperationalData to associate an Automation runbook with the OpsItem. To view AWS CLI example commands that use these keys, see <a href=\"http://docs.aws.amazon.com/systems-manager/latest/userguide/OpsCenter-creating-OpsItems.html#OpsCenter-manually-create-OpsItems\">Creating OpsItems Manually</a> in the <i>AWS Systems Manager User Guide</i>.</p>"
+        },
+        "Category":{
+          "shape":"OpsItemCategory",
+          "documentation":"<p>An OpsItem category. Category options include: Availability, Cost, Performance, Recovery, Security.</p>"
+        },
+        "Severity":{
+          "shape":"OpsItemSeverity",
+          "documentation":"<p>The severity of the OpsItem. Severity options range from 1 to 4.</p>"
         }
       },
       "documentation":"<p>Operations engineers and IT professionals use OpsCenter to view, investigate, and remediate operational issues impacting the performance and health of their AWS resources. For more information, see <a href=\"http://docs.aws.amazon.com/systems-manager/latest/userguide/OpsCenter.html\">AWS Systems Manager OpsCenter</a> in the <i>AWS Systems Manager User Guide</i>. </p>"
@@ -10009,6 +10243,11 @@
       "documentation":"<p>The OpsItem already exists.</p>",
       "exception":true
     },
+    "OpsItemCategory":{
+      "type":"string",
+      "max":64,
+      "min":1
+    },
     "OpsItemDataKey":{
       "type":"string",
       "max":128,
@@ -10079,7 +10318,9 @@
         "OperationalDataKey",
         "OperationalDataValue",
         "ResourceId",
-        "AutomationId"
+        "AutomationId",
+        "Category",
+        "Severity"
       ]
     },
     "OpsItemFilterOperator":{
@@ -10121,7 +10362,7 @@
         "LimitType":{"shape":"String"},
         "Message":{"shape":"String"}
       },
-      "documentation":"<p>The request caused OpsItems to exceed one or more limits. For information about OpsItem limits, see <a href=\"http://docs.aws.amazon.com/systems-manager/latest/userguide/OpsCenter-learn-more.html#OpsCenter-learn-more-limits\">What are the resource limits for OpsCenter?</a>.</p>",
+      "documentation":"<p>The request caused OpsItems to exceed one or more quotas. For information about OpsItem quotas, see <a href=\"http://docs.aws.amazon.com/systems-manager/latest/userguide/OpsCenter-learn-more.html#OpsCenter-learn-more-limits\">What are the resource limits for OpsCenter?</a>.</p>",
       "exception":true
     },
     "OpsItemMaxResults":{
@@ -10169,6 +10410,11 @@
       "max":5,
       "min":1
     },
+    "OpsItemSeverity":{
+      "type":"string",
+      "max":64,
+      "min":1
+    },
     "OpsItemSource":{
       "type":"string",
       "max":64,
@@ -10228,6 +10474,14 @@
         "OperationalData":{
           "shape":"OpsItemOperationalData",
           "documentation":"<p>Operational data is custom data that provides useful reference details about the OpsItem. </p>"
+        },
+        "Category":{
+          "shape":"OpsItemCategory",
+          "documentation":"<p>A list of OpsItems by category.</p>"
+        },
+        "Severity":{
+          "shape":"OpsItemSeverity",
+          "documentation":"<p>A list of OpsItems by severity.</p>"
         }
       },
       "documentation":"<p>A count of OpsItems.</p>"
@@ -10237,6 +10491,23 @@
       "max":1024,
       "min":1
     },
+    "OpsResultAttribute":{
+      "type":"structure",
+      "required":["TypeName"],
+      "members":{
+        "TypeName":{
+          "shape":"OpsDataTypeName",
+          "documentation":"<p>Name of the data type. Valid value: AWS:OpsItem, AWS:EC2InstanceInformation, AWS:OpsItemTrendline, or AWS:ComplianceSummary.</p>"
+        }
+      },
+      "documentation":"<p>The OpsItem data type to return.</p>"
+    },
+    "OpsResultAttributeList":{
+      "type":"list",
+      "member":{"shape":"OpsResultAttribute"},
+      "max":1,
+      "min":1
+    },
     "OutputSource":{
       "type":"structure",
       "members":{
@@ -10534,14 +10805,14 @@
         },
         "Option":{
           "shape":"ParameterStringQueryOption",
-          "documentation":"<p>Valid options are Equals and BeginsWith. For Path filter, valid options are Recursive and OneLevel.</p>"
+          "documentation":"<p>For all filters used with <a>DescribeParameters</a>, valid options include <code>Equals</code> and <code>BeginsWith</code>. The <code>Name</code> filter additionally supports the <code>Contains</code> option. (Exception: For filters using the key <code>Path</code>, valid options include <code>Recursive</code> and <code>OneLevel</code>.)</p> <p>For filters used with <a>GetParametersByPath</a>, valid options include <code>Equals</code> and <code>BeginsWith</code>. (Exception: For filters using the key <code>Label</code>, the only valid option is <code>Equals</code>.)</p>"
         },
         "Values":{
           "shape":"ParameterStringFilterValueList",
           "documentation":"<p>The value you want to search for.</p>"
         }
       },
-      "documentation":"<p>One or more filters. Use a filter to return a more specific list of results.</p> <note> <p>The <code>Name</code> and <code>Tier</code> filter keys can't be used with the <a>GetParametersByPath</a> API action. Also, the <code>Label</code> filter key can't be used with the <a>DescribeParameters</a> API action.</p> </note>"
+      "documentation":"<p>One or more filters. Use a filter to return a more specific list of results.</p> <important> <p>The <code>ParameterStringFilter</code> object is used by the <a>DescribeParameters</a> and <a>GetParametersByPath</a> API actions. However, not all of the pattern values listed for <code>Key</code> can be used with both actions.</p> <p>For <code>DescribeActions</code>, all of the listed patterns are valid, with the exception of <code>Label</code>.</p> <p>For <code>GetParametersByPath</code>, the following patterns listed for <code>Key</code> are not valid: <code>Name</code>, <code>Path</code>, and <code>Tier</code>.</p> <p>For examples of CLI commands demonstrating valid parameter filter constructions, see <a href=\"http://docs.aws.amazon.com/systems-manager/latest/userguide/parameter-search.html\">Searching for Systems Manager Parameters</a> in the <i>AWS Systems Manager User Guide</i>.</p> </important>"
     },
     "ParameterStringFilterKey":{
       "type":"string",
@@ -10800,6 +11071,7 @@
       "enum":[
         "INSTALLED",
         "INSTALLED_OTHER",
+        "INSTALLED_PENDING_REBOOT",
         "INSTALLED_REJECTED",
         "MISSING",
         "NOT_APPLICABLE",
@@ -10935,6 +11207,7 @@
     },
     "PatchInstalledCount":{"type":"integer"},
     "PatchInstalledOtherCount":{"type":"integer"},
+    "PatchInstalledPendingRebootCount":{"type":"integer"},
     "PatchInstalledRejectedCount":{"type":"integer"},
     "PatchKbNumber":{"type":"string"},
     "PatchLanguage":{"type":"string"},
@@ -11011,10 +11284,7 @@
     },
     "PatchRule":{
       "type":"structure",
-      "required":[
-        "PatchFilterGroup",
-        "ApproveAfterDays"
-      ],
+      "required":["PatchFilterGroup"],
       "members":{
         "PatchFilterGroup":{
           "shape":"PatchFilterGroup",
@@ -11029,6 +11299,11 @@
           "documentation":"<p>The number of days after the release date of each patch matched by the rule that the patch is marked as approved in the patch baseline. For example, a value of <code>7</code> means that patches are approved seven days after they are released. </p>",
           "box":true
         },
+        "ApproveUntilDate":{
+          "shape":"PatchStringDateTime",
+          "documentation":"<p>Example API</p>",
+          "box":true
+        },
         "EnableNonSecurity":{
           "shape":"Boolean",
           "documentation":"<p>For instances identified by the approval rule filters, enables a patch baseline to apply non-security updates available in the specified repository. The default value is 'false'. Applies to Linux instances only.</p>",
@@ -11130,6 +11405,11 @@
       },
       "documentation":"<p>Information about the approval status of a patch.</p>"
     },
+    "PatchStringDateTime":{
+      "type":"string",
+      "max":10,
+      "min":1
+    },
     "PatchTitle":{"type":"string"},
     "PatchUnreportedNotApplicableCount":{"type":"integer"},
     "PatchVendor":{"type":"string"},
@@ -11238,7 +11518,7 @@
       "members":{
         "InstanceId":{
           "shape":"InstanceId",
-          "documentation":"<p>One or more instance IDs where you want to add or update inventory items.</p>"
+          "documentation":"<p>An instance ID where you want to add or update inventory items.</p>"
         },
         "Items":{
           "shape":"InventoryItemList",
@@ -11265,7 +11545,7 @@
       "members":{
         "Name":{
           "shape":"PSParameterName",
-          "documentation":"<p>The fully qualified name of the parameter that you want to add to the system. The fully qualified name includes the complete hierarchy of the parameter path and name. For example: <code>/Dev/DBServer/MySQL/db-string13</code> </p> <p>Naming Constraints:</p> <ul> <li> <p>Parameter names are case sensitive.</p> </li> <li> <p>A parameter name must be unique within an AWS Region</p> </li> <li> <p>A parameter name can't be prefixed with \"aws\" or \"ssm\" (case-insensitive).</p> </li> <li> <p>Parameter names can include only the following symbols and letters: <code>a-zA-Z0-9_.-/</code> </p> </li> <li> <p>A parameter name can't include spaces.</p> </li> <li> <p>Parameter hierarchies are limited to a maximum depth of fifteen levels.</p> </li> </ul> <p>For additional information about valid values for parameter names, see <a href=\"http://docs.aws.amazon.com/systems-manager/latest/userguide/sysman-parameter-name-constraints.html\">Requirements and Constraints for Parameter Names</a> in the <i>AWS Systems Manager User Guide</i>.</p> <note> <p>The maximum length constraint listed below includes capacity for additional system attributes that are not part of the name. The maximum length for the fully qualified parameter name is 1011 characters. </p> </note>"
+          "documentation":"<p>The fully qualified name of the parameter that you want to add to the system. The fully qualified name includes the complete hierarchy of the parameter path and name. For parameters in a hierarchy, you must include a leading forward slash character (/) when you create or reference a parameter. For example: <code>/Dev/DBServer/MySQL/db-string13</code> </p> <p>Naming Constraints:</p> <ul> <li> <p>Parameter names are case sensitive.</p> </li> <li> <p>A parameter name must be unique within an AWS Region</p> </li> <li> <p>A parameter name can't be prefixed with \"aws\" or \"ssm\" (case-insensitive).</p> </li> <li> <p>Parameter names can include only the following symbols and letters: <code>a-zA-Z0-9_.-/</code> </p> </li> <li> <p>A parameter name can't include spaces.</p> </li> <li> <p>Parameter hierarchies are limited to a maximum depth of fifteen levels.</p> </li> </ul> <p>For additional information about valid values for parameter names, see <a href=\"http://docs.aws.amazon.com/systems-manager/latest/userguide/sysman-parameter-name-constraints.html\">Requirements and Constraints for Parameter Names</a> in the <i>AWS Systems Manager User Guide</i>.</p> <note> <p>The maximum length constraint listed below includes capacity for additional system attributes that are not part of the name. The maximum length for a parameter name, including the full length of the parameter ARN, is 1011 characters. For example, the length of the following parameter name is 65 characters, not 20 characters:</p> <p> <code>arn:aws:ssm:us-east-2:111122223333:parameter/ExampleParameterName</code> </p> </note>"
         },
         "Description":{
           "shape":"ParameterDescription",
@@ -11319,6 +11599,13 @@
         }
       }
     },
+    "RebootOption":{
+      "type":"string",
+      "enum":[
+        "RebootIfNeeded",
+        "NoReboot"
+      ]
+    },
     "Region":{"type":"string"},
     "Regions":{
       "type":"list",
@@ -11649,6 +11936,29 @@
       "documentation":"<p>A sync configuration with the same name already exists.</p>",
       "exception":true
     },
+    "ResourceDataSyncAwsOrganizationsSource":{
+      "type":"structure",
+      "required":["OrganizationSourceType"],
+      "members":{
+        "OrganizationSourceType":{
+          "shape":"ResourceDataSyncOrganizationSourceType",
+          "documentation":"<p>If an AWS Organization is present, this is either <code>OrganizationalUnits</code> or <code>EntireOrganization</code>. For <code>OrganizationalUnits</code>, the data is aggregated from a set of organization units. For <code>EntireOrganization</code>, the data is aggregated from the entire AWS Organization. </p>"
+        },
+        "OrganizationalUnits":{
+          "shape":"ResourceDataSyncOrganizationalUnitList",
+          "documentation":"<p>The AWS Organizations organization units included in the sync.</p>"
+        }
+      },
+      "documentation":"<p>Information about the AwsOrganizationsSource resource data sync source. A sync source of this type can synchronize data from AWS Organizations or, if an AWS Organization is not present, from multiple AWS Regions.</p>"
+    },
+    "ResourceDataSyncConflictException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"String"}
+      },
+      "documentation":"<p>Another <code>UpdateResourceDataSync</code> request is being processed. Wait a few minutes and try again.</p>",
+      "exception":true
+    },
     "ResourceDataSyncCountExceededException":{
       "type":"structure",
       "members":{
@@ -11658,6 +11968,22 @@
       "exception":true
     },
     "ResourceDataSyncCreatedTime":{"type":"timestamp"},
+    "ResourceDataSyncDestinationDataSharing":{
+      "type":"structure",
+      "members":{
+        "DestinationDataSharingType":{
+          "shape":"ResourceDataSyncDestinationDataSharingType",
+          "documentation":"<p>The sharing data type. Only <code>Organization</code> is supported.</p>"
+        }
+      },
+      "documentation":"<p>Synchronize Systems Manager Inventory data from multiple AWS accounts defined in AWS Organizations to a centralized Amazon S3 bucket. Data is synchronized to individual key prefixes in the central bucket. Each key prefix represents a different AWS account ID.</p>"
+    },
+    "ResourceDataSyncDestinationDataSharingType":{
+      "type":"string",
+      "max":64,
+      "min":1
+    },
+    "ResourceDataSyncIncludeFutureRegions":{"type":"boolean"},
     "ResourceDataSyncInvalidConfigurationException":{
       "type":"structure",
       "members":{
@@ -11673,6 +11999,14 @@
           "shape":"ResourceDataSyncName",
           "documentation":"<p>The name of the Resource Data Sync.</p>"
         },
+        "SyncType":{
+          "shape":"ResourceDataSyncType",
+          "documentation":"<p>The type of resource data sync. If <code>SyncType</code> is <code>SyncToDestination</code>, then the resource data sync synchronizes data to an Amazon S3 bucket. If the <code>SyncType</code> is <code>SyncFromSource</code> then the resource data sync synchronizes data from AWS Organizations or from multiple AWS Regions.</p>"
+        },
+        "SyncSource":{
+          "shape":"ResourceDataSyncSourceWithState",
+          "documentation":"<p>Information about the source where the data was synchronized. </p>"
+        },
         "S3Destination":{
           "shape":"ResourceDataSyncS3Destination",
           "documentation":"<p>Configuration information for the target Amazon S3 bucket.</p>"
@@ -11685,6 +12019,10 @@
           "shape":"LastSuccessfulResourceDataSyncTime",
           "documentation":"<p>The last time the sync operations returned a status of <code>SUCCESSFUL</code> (UTC).</p>"
         },
+        "SyncLastModifiedTime":{
+          "shape":"ResourceDataSyncLastModifiedTime",
+          "documentation":"<p>The date and time the resource data sync was changed. </p>"
+        },
         "LastStatus":{
           "shape":"LastResourceDataSyncStatus",
           "documentation":"<p>The status reported by the last sync.</p>"
@@ -11704,6 +12042,7 @@
       "type":"list",
       "member":{"shape":"ResourceDataSyncItem"}
     },
+    "ResourceDataSyncLastModifiedTime":{"type":"timestamp"},
     "ResourceDataSyncName":{
       "type":"string",
       "max":64,
@@ -11712,11 +12051,40 @@
     "ResourceDataSyncNotFoundException":{
       "type":"structure",
       "members":{
-        "SyncName":{"shape":"ResourceDataSyncName"}
+        "SyncName":{"shape":"ResourceDataSyncName"},
+        "SyncType":{"shape":"ResourceDataSyncType"},
+        "Message":{"shape":"String"}
       },
       "documentation":"<p>The specified sync name was not found.</p>",
       "exception":true
     },
+    "ResourceDataSyncOrganizationSourceType":{
+      "type":"string",
+      "max":64,
+      "min":1
+    },
+    "ResourceDataSyncOrganizationalUnit":{
+      "type":"structure",
+      "members":{
+        "OrganizationalUnitId":{
+          "shape":"ResourceDataSyncOrganizationalUnitId",
+          "documentation":"<p>The AWS Organization unit ID data source for the sync.</p>"
+        }
+      },
+      "documentation":"<p>The AWS Organizations organizational unit data source for the sync.</p>"
+    },
+    "ResourceDataSyncOrganizationalUnitId":{
+      "type":"string",
+      "max":128,
+      "min":1,
+      "pattern":"^ou-[0-9a-z]{4,32}-[a-z0-9]{8,32}$"
+    },
+    "ResourceDataSyncOrganizationalUnitList":{
+      "type":"list",
+      "member":{"shape":"ResourceDataSyncOrganizationalUnit"},
+      "max":1000,
+      "min":1
+    },
     "ResourceDataSyncS3BucketName":{
       "type":"string",
       "max":2048,
@@ -11749,6 +12117,10 @@
         "AWSKMSKeyARN":{
           "shape":"ResourceDataSyncAWSKMSKeyARN",
           "documentation":"<p>The ARN of an encryption key for a destination in Amazon S3. Must belong to the same Region as the destination Amazon S3 bucket.</p>"
+        },
+        "DestinationDataSharing":{
+          "shape":"ResourceDataSyncDestinationDataSharing",
+          "documentation":"<p>Enables destination data sharing. By default, this field is <code>null</code>.</p>"
         }
       },
       "documentation":"<p>Information about the target Amazon S3 bucket for the Resource Data Sync.</p>"
@@ -11767,6 +12139,82 @@
       "max":64,
       "min":1
     },
+    "ResourceDataSyncSource":{
+      "type":"structure",
+      "required":[
+        "SourceType",
+        "SourceRegions"
+      ],
+      "members":{
+        "SourceType":{
+          "shape":"ResourceDataSyncSourceType",
+          "documentation":"<p>The type of data source for the resource data sync. <code>SourceType</code> is either <code>AwsOrganizations</code> (if an organization is present in AWS Organizations) or <code>singleAccountMultiRegions</code>.</p>"
+        },
+        "AwsOrganizationsSource":{
+          "shape":"ResourceDataSyncAwsOrganizationsSource",
+          "documentation":"<p>Information about the AwsOrganizationsSource resource data sync source. A sync source of this type can synchronize data from AWS Organizations.</p>"
+        },
+        "SourceRegions":{
+          "shape":"ResourceDataSyncSourceRegionList",
+          "documentation":"<p>The <code>SyncSource</code> AWS Regions included in the resource data sync.</p>"
+        },
+        "IncludeFutureRegions":{
+          "shape":"ResourceDataSyncIncludeFutureRegions",
+          "documentation":"<p>Whether to automatically synchronize and aggregate data from new AWS Regions when those Regions come online.</p>"
+        }
+      },
+      "documentation":"<p>Information about the source of the data included in the resource data sync.</p>"
+    },
+    "ResourceDataSyncSourceRegion":{
+      "type":"string",
+      "max":64,
+      "min":1
+    },
+    "ResourceDataSyncSourceRegionList":{
+      "type":"list",
+      "member":{"shape":"ResourceDataSyncSourceRegion"}
+    },
+    "ResourceDataSyncSourceType":{
+      "type":"string",
+      "max":64,
+      "min":1
+    },
+    "ResourceDataSyncSourceWithState":{
+      "type":"structure",
+      "members":{
+        "SourceType":{
+          "shape":"ResourceDataSyncSourceType",
+          "documentation":"<p>The type of data source for the resource data sync. <code>SourceType</code> is either <code>AwsOrganizations</code> (if an organization is present in AWS Organizations) or <code>singleAccountMultiRegions</code>.</p>"
+        },
+        "AwsOrganizationsSource":{
+          "shape":"ResourceDataSyncAwsOrganizationsSource",
+          "documentation":"<p>The field name in <code>SyncSource</code> for the <code>ResourceDataSyncAwsOrganizationsSource</code> type.</p>"
+        },
+        "SourceRegions":{
+          "shape":"ResourceDataSyncSourceRegionList",
+          "documentation":"<p>The <code>SyncSource</code> AWS Regions included in the resource data sync.</p>"
+        },
+        "IncludeFutureRegions":{
+          "shape":"ResourceDataSyncIncludeFutureRegions",
+          "documentation":"<p>Whether to automatically synchronize and aggregate data from new AWS Regions when those Regions come online.</p>"
+        },
+        "State":{
+          "shape":"ResourceDataSyncState",
+          "documentation":"<p>The data type name for including resource data sync state. There are four sync states:</p> <p> <code>OrganizationNotExists</code>: Your organization doesn't exist.</p> <p> <code>NoPermissions</code>: The system can't locate the service-linked role. This role is automatically created when a user creates a resource data sync in Explorer.</p> <p> <code>InvalidOrganizationalUnit</code>: You specified or selected an invalid unit in the resource data sync configuration.</p> <p> <code>TrustedAccessDisabled</code>: You disabled Systems Manager access in the organization in AWS Organizations.</p>"
+        }
+      },
+      "documentation":"<p>The data type name for including resource data sync state. There are four sync states:</p> <p> <code>OrganizationNotExists</code> (Your organization doesn't exist)</p> <p> <code>NoPermissions</code> (The system can't locate the service-linked role. This role is automatically created when a user creates a resource data sync in Explorer.)</p> <p> <code>InvalidOrganizationalUnit</code> (You specified or selected an invalid unit in the resource data sync configuration.)</p> <p> <code>TrustedAccessDisabled</code> (You disabled Systems Manager access in the organization in AWS Organizations.)</p>"
+    },
+    "ResourceDataSyncState":{
+      "type":"string",
+      "max":64,
+      "min":1
+    },
+    "ResourceDataSyncType":{
+      "type":"string",
+      "max":64,
+      "min":1
+    },
     "ResourceId":{"type":"string"},
     "ResourceInUseException":{
       "type":"structure",
@@ -11781,7 +12229,7 @@
       "members":{
         "Message":{"shape":"String"}
       },
-      "documentation":"<p>Error returned when the caller has exceeded the default resource limits. For example, too many maintenance windows or patch baselines have been created.</p> <p>For information about resource limits in Systems Manager, see <a href=\"http://docs.aws.amazon.com/general/latest/gr/aws_service_limits.html#limits_ssm\">AWS Systems Manager Limits</a>.</p>",
+      "documentation":"<p>Error returned when the caller has exceeded the default resource quotas. For example, too many maintenance windows or patch baselines have been created.</p> <p>For information about resource quotas in Systems Manager, see <a href=\"http://docs.aws.amazon.com/general/latest/gr/ssm.html#limits_ssm\">Systems Manager Service Quotas</a> in the <i>AWS General Reference</i>.</p>",
       "exception":true
     },
     "ResourceType":{
@@ -11844,7 +12292,7 @@
         },
         "StreamUrl":{
           "shape":"StreamUrl",
-          "documentation":"<p>A URL back to SSM Agent on the instance that the Session Manager client uses to send commands and receive output from the instance. Format: <code>wss://ssmmessages.<b>region</b>.amazonaws.com/v1/data-channel/<b>session-id</b>?stream=(input|output)</code>.</p> <p> <b>region</b> represents the Region identifier for an AWS Region supported by AWS Systems Manager, such as <code>us-east-2</code> for the US East (Ohio) Region. For a list of supported <b>region</b> values, see the <b>Region</b> column in the <a href=\"http://docs.aws.amazon.com/general/latest/gr/rande.html#ssm_region\">AWS Systems Manager table of regions and endpoints</a> in the <i>AWS General Reference</i>.</p> <p> <b>session-id</b> represents the ID of a Session Manager session, such as <code>1a2b3c4dEXAMPLE</code>.</p>"
+          "documentation":"<p>A URL back to SSM Agent on the instance that the Session Manager client uses to send commands and receive output from the instance. Format: <code>wss://ssmmessages.<b>region</b>.amazonaws.com/v1/data-channel/<b>session-id</b>?stream=(input|output)</code>.</p> <p> <b>region</b> represents the Region identifier for an AWS Region supported by AWS Systems Manager, such as <code>us-east-2</code> for the US East (Ohio) Region. For a list of supported <b>region</b> values, see the <b>Region</b> column in <a href=\"http://docs.aws.amazon.com/general/latest/gr/ssm.html#ssm_region\">Systems Manager Service Endpoints</a> in the <i>AWS General Reference</i>.</p> <p> <b>session-id</b> represents the ID of a Session Manager session, such as <code>1a2b3c4dEXAMPLE</code>.</p>"
         }
       }
     },
@@ -12159,7 +12607,7 @@
     },
     "SessionFilterValue":{
       "type":"string",
-      "max":200,
+      "max":400,
       "min":1
     },
     "SessionId":{
@@ -12244,7 +12692,7 @@
     },
     "SessionTarget":{
       "type":"string",
-      "max":50,
+      "max":400,
       "min":1
     },
     "SeveritySummary":{
@@ -12277,6 +12725,12 @@
       },
       "documentation":"<p>The number of managed instances found for each patch severity level defined in the request filter.</p>"
     },
+    "SharedDocumentVersion":{
+      "type":"string",
+      "documentation":"<p>The document version shared with other accounts. You can share <code>Latest</code>, <code>Default</code> or <code>All versions</code>.</p>",
+      "max":8,
+      "pattern":"([$]LATEST|[$]DEFAULT|[$]ALL)"
+    },
     "SignalType":{
       "type":"string",
       "enum":[
@@ -12366,6 +12820,10 @@
           "shape":"TargetLocations",
           "documentation":"<p>A location is a combination of AWS Regions and/or AWS accounts where you want to run the Automation. Use this action to start an Automation in multiple Regions and multiple accounts. For more information, see <a href=\"http://docs.aws.amazon.com/systems-manager/latest/userguide/systems-manager-automation-multiple-accounts-and-regions.html\">Executing Automations in Multiple AWS Regions and Accounts</a> in the <i>AWS Systems Manager User Guide</i>. </p>",
           "box":true
+        },
+        "Tags":{
+          "shape":"TagList",
+          "documentation":"<p>Optional metadata that you assign to a resource. You can specify a maximum of five tags for an automation. Tags enable you to categorize a resource in different ways, such as by purpose, owner, or environment. For example, you might want to tag an automation to identify an environment or operating system. In this case, you could specify the following key name/value pairs:</p> <ul> <li> <p> <code>Key=environment,Value=test</code> </p> </li> <li> <p> <code>Key=OS,Value=Windows</code> </p> </li> </ul> <note> <p>To add tags to an existing patch baseline, use the <a>AddTagsToResource</a> action.</p> </note>"
         }
       }
     },
@@ -12409,7 +12867,7 @@
         },
         "StreamUrl":{
           "shape":"StreamUrl",
-          "documentation":"<p>A URL back to SSM Agent on the instance that the Session Manager client uses to send commands and receive output from the instance. Format: <code>wss://ssmmessages.<b>region</b>.amazonaws.com/v1/data-channel/<b>session-id</b>?stream=(input|output)</code> </p> <p> <b>region</b> represents the Region identifier for an AWS Region supported by AWS Systems Manager, such as <code>us-east-2</code> for the US East (Ohio) Region. For a list of supported <b>region</b> values, see the <b>Region</b> column in the <a href=\"http://docs.aws.amazon.com/general/latest/gr/rande.html#ssm_region\">AWS Systems Manager table of regions and endpoints</a> in the <i>AWS General Reference</i>.</p> <p> <b>session-id</b> represents the ID of a Session Manager session, such as <code>1a2b3c4dEXAMPLE</code>.</p>"
+          "documentation":"<p>A URL back to SSM Agent on the instance that the Session Manager client uses to send commands and receive output from the instance. Format: <code>wss://ssmmessages.<b>region</b>.amazonaws.com/v1/data-channel/<b>session-id</b>?stream=(input|output)</code> </p> <p> <b>region</b> represents the Region identifier for an AWS Region supported by AWS Systems Manager, such as <code>us-east-2</code> for the US East (Ohio) Region. For a list of supported <b>region</b> values, see the <b>Region</b> column in <a href=\"http://docs.aws.amazon.com/general/latest/gr/ssm.html#ssm_region\">Systems Manager Service Endpoints</a> in the <i>AWS General Reference</i>.</p> <p> <b>session-id</b> represents the ID of a Session Manager session, such as <code>1a2b3c4dEXAMPLE</code>.</p>"
         }
       }
     },
@@ -12470,7 +12928,7 @@
         },
         "StepStatus":{
           "shape":"AutomationExecutionStatus",
-          "documentation":"<p>The execution status for this step. Valid values include: Pending, InProgress, Success, Cancelled, Failed, and TimedOut.</p>"
+          "documentation":"<p>The execution status for this step.</p>"
         },
         "ResponseCode":{
           "shape":"String",
@@ -12677,7 +13135,7 @@
           "documentation":"<p>User-defined criteria that maps to <code>Key</code>. For example, if you specified <code>tag:ServerRole</code>, you could specify <code>value:WebServer</code> to run a command on instances that include Amazon EC2 tags of <code>ServerRole,WebServer</code>. </p>"
         }
       },
-      "documentation":"<p>An array of search criteria that targets instances using a Key,Value combination that you specify. </p> <p>Supported formats include the following.</p> <ul> <li> <p> <code>Key=InstanceIds,Values=<i>instance-id-1</i>,<i>instance-id-2</i>,<i>instance-id-3</i> </code> </p> </li> <li> <p> <code>Key=tag:<i>my-tag-key</i>,Values=<i>my-tag-value-1</i>,<i>my-tag-value-2</i> </code> </p> </li> <li> <p> <code>Key=tag-key,Values=<i>my-tag-key-1</i>,<i>my-tag-key-2</i> </code> </p> </li> <li> <p>(Maintenance window targets only) <code>Key=resource-groups:Name,Values=<i>resource-group-name</i> </code> </p> </li> <li> <p>(Maintenance window targets only) <code>Key=resource-groups:ResourceTypeFilters,Values=<i>resource-type-1</i>,<i>resource-type-2</i> </code> </p> </li> </ul> <p>For example:</p> <ul> <li> <p> <code>Key=InstanceIds,Values=i-02573cafcfEXAMPLE,i-0471e04240EXAMPLE,i-07782c72faEXAMPLE</code> </p> </li> <li> <p> <code>Key=tag:CostCenter,Values=CostCenter1,CostCenter2,CostCenter3</code> </p> </li> <li> <p> <code>Key=tag-key,Values=Name,Instance-Type,CostCenter</code> </p> </li> <li> <p>(Maintenance window targets only) <code>Key=resource-groups:Name,Values=ProductionResourceGroup</code> </p> </li> <li> <p>(Maintenance window targets only) <code>Key=resource-groups:ResourceTypeFilters,Values=<i>AWS::EC2::INSTANCE</i>,<i>AWS::EC2::VPC</i> </code> </p> </li> </ul> <p>For information about how to send commands that target instances using <code>Key,Value</code> parameters, see <a href=\"https://docs.aws.amazon.com/systems-manager/latest/userguide/send-commands-multiple.html#send-commands-targeting\">Using Targets and Rate Controls to Send Commands to a Fleet</a> in the <i>AWS Systems Manager User Guide</i>.</p>"
+      "documentation":"<p>An array of search criteria that targets instances using a Key,Value combination that you specify. </p> <p>Supported formats include the following.</p> <ul> <li> <p> <code>Key=InstanceIds,Values=<i>instance-id-1</i>,<i>instance-id-2</i>,<i>instance-id-3</i> </code> </p> </li> <li> <p> <code>Key=tag:<i>my-tag-key</i>,Values=<i>my-tag-value-1</i>,<i>my-tag-value-2</i> </code> </p> </li> <li> <p> <code>Key=tag-key,Values=<i>my-tag-key-1</i>,<i>my-tag-key-2</i> </code> </p> </li> <li> <p>(Maintenance window targets only) <code>Key=resource-groups:Name,Values=<i>resource-group-name</i> </code> </p> </li> <li> <p>(Maintenance window targets only) <code>Key=resource-groups:ResourceTypeFilters,Values=<i>resource-type-1</i>,<i>resource-type-2</i> </code> </p> </li> </ul> <p>For example:</p> <ul> <li> <p> <code>Key=InstanceIds,Values=i-02573cafcfEXAMPLE,i-0471e04240EXAMPLE,i-07782c72faEXAMPLE</code> </p> </li> <li> <p> <code>Key=tag:CostCenter,Values=CostCenter1,CostCenter2,CostCenter3</code> </p> </li> <li> <p> <code>Key=tag-key,Values=Name,Instance-Type,CostCenter</code> </p> </li> <li> <p>(Maintenance window targets only) <code>Key=resource-groups:Name,Values=ProductionResourceGroup</code> </p> <p>This example demonstrates how to target all resources in the resource group <b>ProductionResourceGroup</b> in your maintenance window.</p> </li> <li> <p>(Maintenance window targets only) <code>Key=resource-groups:ResourceTypeFilters,Values=<i>AWS::EC2::INSTANCE</i>,<i>AWS::EC2::VPC</i> </code> </p> <p>This example demonstrates how to target only Amazon EC2 instances and VPCs in your maintenance window.</p> </li> <li> <p>(State Manager association targets only) <code>Key=InstanceIds,Values=<i>*</i> </code> </p> <p>This example demonstrates how to target all managed instances in the AWS Region where the association was created.</p> </li> </ul> <p>For information about how to send commands that target instances using <code>Key,Value</code> parameters, see <a href=\"https://docs.aws.amazon.com/systems-manager/latest/userguide/send-commands-multiple.html#send-commands-targeting\">Using Targets and Rate Controls to Send Commands to a Fleet</a> in the <i>AWS Systems Manager User Guide</i>.</p>"
     },
     "TargetCount":{"type":"integer"},
     "TargetInUseException":{
@@ -12841,6 +13299,14 @@
       "documentation":"<p>The size of inventory data has exceeded the total size limit for the resource.</p>",
       "exception":true
     },
+    "UnsupportedCalendarException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"String"}
+      },
+      "documentation":"<p>The calendar entry contained in the specified Systems Manager document is not supported.</p>",
+      "exception":true
+    },
     "UnsupportedFeatureRequiredException":{
       "type":"structure",
       "members":{
@@ -13420,6 +13886,14 @@
         "Title":{
           "shape":"OpsItemTitle",
           "documentation":"<p>A short heading that describes the nature of the OpsItem and the impacted resource.</p>"
+        },
+        "Category":{
+          "shape":"OpsItemCategory",
+          "documentation":"<p>Specify a new category for an OpsItem.</p>"
+        },
+        "Severity":{
+          "shape":"OpsItemSeverity",
+          "documentation":"<p>Specify a new severity for an OpsItem.</p>"
         }
       }
     },
@@ -13546,6 +14020,33 @@
         }
       }
     },
+    "UpdateResourceDataSyncRequest":{
+      "type":"structure",
+      "required":[
+        "SyncName",
+        "SyncType",
+        "SyncSource"
+      ],
+      "members":{
+        "SyncName":{
+          "shape":"ResourceDataSyncName",
+          "documentation":"<p>The name of the resource data sync you want to update.</p>"
+        },
+        "SyncType":{
+          "shape":"ResourceDataSyncType",
+          "documentation":"<p>The type of resource data sync. If <code>SyncType</code> is <code>SyncToDestination</code>, then the resource data sync synchronizes data to an Amazon S3 bucket. If the <code>SyncType</code> is <code>SyncFromSource</code> then the resource data sync synchronizes data from AWS Organizations or from multiple AWS Regions.</p>"
+        },
+        "SyncSource":{
+          "shape":"ResourceDataSyncSource",
+          "documentation":"<p>Specify information about the data sources to synchronize.</p>"
+        }
+      }
+    },
+    "UpdateResourceDataSyncResult":{
+      "type":"structure",
+      "members":{
+      }
+    },
     "UpdateServiceSettingRequest":{
       "type":"structure",
       "required":[
diff --git a/services/ssm/src/test/resources/cucumber.properties b/services/ssm/src/test/resources/cucumber.properties
index f2bf035d6516..d1726b960ed0 100644
--- a/services/ssm/src/test/resources/cucumber.properties
+++ b/services/ssm/src/test/resources/cucumber.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/sso/pom.xml b/services/sso/pom.xml
new file mode 100644
index 000000000000..733955fde6a9
--- /dev/null
+++ b/services/sso/pom.xml
@@ -0,0 +1,60 @@
+<?xml version="1.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.
+  -->
+
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>software.amazon.awssdk</groupId>
+        <artifactId>services</artifactId>
+        <version>2.11.8-SNAPSHOT</version>
+    </parent>
+    <artifactId>sso</artifactId>
+    <name>AWS Java SDK :: Services :: SSO</name>
+    <description>The AWS Java SDK for SSO module holds the client classes that are used for
+        communicating with SSO.
+    </description>
+    <url>https://aws.amazon.com/sdkforjava</url>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifestEntries>
+                            <Automatic-Module-Name>software.amazon.awssdk.services.sso</Automatic-Module-Name>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>protocol-core</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>aws-json-protocol</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/services/sso/src/main/resources/codegen-resources/paginators-1.json b/services/sso/src/main/resources/codegen-resources/paginators-1.json
new file mode 100644
index 000000000000..daaed6fe69df
--- /dev/null
+++ b/services/sso/src/main/resources/codegen-resources/paginators-1.json
@@ -0,0 +1,16 @@
+{
+  "pagination": {
+    "ListAccountRoles": {
+      "input_token": "nextToken",
+      "output_token": "nextToken",
+      "limit_key": "maxResults",
+      "result_key": "roleList"
+    },
+    "ListAccounts": {
+      "input_token": "nextToken",
+      "output_token": "nextToken",
+      "limit_key": "maxResults",
+      "result_key": "accountList"
+    }
+  }
+}
diff --git a/services/sso/src/main/resources/codegen-resources/service-2.json b/services/sso/src/main/resources/codegen-resources/service-2.json
new file mode 100644
index 000000000000..84e4fa40f792
--- /dev/null
+++ b/services/sso/src/main/resources/codegen-resources/service-2.json
@@ -0,0 +1,346 @@
+{
+  "version":"2.0",
+  "metadata":{
+    "apiVersion":"2019-06-10",
+    "endpointPrefix":"portal.sso",
+    "jsonVersion":"1.1",
+    "protocol":"rest-json",
+    "serviceAbbreviation":"SSO",
+    "serviceFullName":"AWS Single Sign-On",
+    "serviceId":"SSO",
+    "signatureVersion":"v4",
+    "signingName":"awsssoportal",
+    "uid":"sso-2019-06-10"
+  },
+  "operations":{
+    "GetRoleCredentials":{
+      "name":"GetRoleCredentials",
+      "http":{
+        "method":"GET",
+        "requestUri":"/federation/credentials"
+      },
+      "input":{"shape":"GetRoleCredentialsRequest"},
+      "output":{"shape":"GetRoleCredentialsResponse"},
+      "errors":[
+        {"shape":"InvalidRequestException"},
+        {"shape":"UnauthorizedException"},
+        {"shape":"TooManyRequestsException"},
+        {"shape":"ResourceNotFoundException"}
+      ],
+      "documentation":"<p>Returns the STS short-term credentials for a given role name that is assigned to the user.</p>",
+      "authtype":"none"
+    },
+    "ListAccountRoles":{
+      "name":"ListAccountRoles",
+      "http":{
+        "method":"GET",
+        "requestUri":"/assignment/roles"
+      },
+      "input":{"shape":"ListAccountRolesRequest"},
+      "output":{"shape":"ListAccountRolesResponse"},
+      "errors":[
+        {"shape":"InvalidRequestException"},
+        {"shape":"UnauthorizedException"},
+        {"shape":"TooManyRequestsException"},
+        {"shape":"ResourceNotFoundException"}
+      ],
+      "documentation":"<p>Lists all roles that are assigned to the user for a given AWS account.</p>",
+      "authtype":"none"
+    },
+    "ListAccounts":{
+      "name":"ListAccounts",
+      "http":{
+        "method":"GET",
+        "requestUri":"/assignment/accounts"
+      },
+      "input":{"shape":"ListAccountsRequest"},
+      "output":{"shape":"ListAccountsResponse"},
+      "errors":[
+        {"shape":"InvalidRequestException"},
+        {"shape":"UnauthorizedException"},
+        {"shape":"TooManyRequestsException"},
+        {"shape":"ResourceNotFoundException"}
+      ],
+      "documentation":"<p>Lists all AWS accounts assigned to the user. These AWS accounts are assigned by the administrator of the account. For more information, see <a href=\"https://docs.aws.amazon.com/singlesignon/latest/userguide/useraccess.html#assignusers\">Assign User Access</a> in the <i>AWS SSO User Guide</i>. This operation returns a paginated response.</p>",
+      "authtype":"none"
+    },
+    "Logout":{
+      "name":"Logout",
+      "http":{
+        "method":"POST",
+        "requestUri":"/logout"
+      },
+      "input":{"shape":"LogoutRequest"},
+      "errors":[
+        {"shape":"InvalidRequestException"},
+        {"shape":"UnauthorizedException"},
+        {"shape":"TooManyRequestsException"}
+      ],
+      "documentation":"<p>Removes the client- and server-side session that is associated with the user.</p>",
+      "authtype":"none"
+    }
+  },
+  "shapes":{
+    "AccessKeyType":{"type":"string"},
+    "AccessTokenType":{
+      "type":"string",
+      "sensitive":true
+    },
+    "AccountIdType":{"type":"string"},
+    "AccountInfo":{
+      "type":"structure",
+      "members":{
+        "accountId":{
+          "shape":"AccountIdType",
+          "documentation":"<p>The identifier of the AWS account that is assigned to the user.</p>"
+        },
+        "accountName":{
+          "shape":"AccountNameType",
+          "documentation":"<p>The display name of the AWS account that is assigned to the user.</p>"
+        },
+        "emailAddress":{
+          "shape":"EmailAddressType",
+          "documentation":"<p>The email address of the AWS account that is assigned to the user.</p>"
+        }
+      },
+      "documentation":"<p>Provides information about your AWS account.</p>"
+    },
+    "AccountListType":{
+      "type":"list",
+      "member":{"shape":"AccountInfo"}
+    },
+    "AccountNameType":{"type":"string"},
+    "EmailAddressType":{
+      "type":"string",
+      "max":254,
+      "min":1
+    },
+    "ErrorDescription":{"type":"string"},
+    "ExpirationTimestampType":{"type":"long"},
+    "GetRoleCredentialsRequest":{
+      "type":"structure",
+      "required":[
+        "roleName",
+        "accountId",
+        "accessToken"
+      ],
+      "members":{
+        "roleName":{
+          "shape":"RoleNameType",
+          "documentation":"<p>The friendly name of the role that is assigned to the user.</p>",
+          "location":"querystring",
+          "locationName":"role_name"
+        },
+        "accountId":{
+          "shape":"AccountIdType",
+          "documentation":"<p>The identifier for the AWS account that is assigned to the user.</p>",
+          "location":"querystring",
+          "locationName":"account_id"
+        },
+        "accessToken":{
+          "shape":"AccessTokenType",
+          "documentation":"<p>The token issued by the <code>CreateToken</code> API call. For more information, see <a href=\"https://docs.aws.amazon.com/singlesignon/latest/OIDCAPIReference/API_CreateToken.html\">CreateToken</a> in the <i>AWS SSO OIDC API Reference Guide</i>.</p>",
+          "location":"header",
+          "locationName":"x-amz-sso_bearer_token"
+        }
+      }
+    },
+    "GetRoleCredentialsResponse":{
+      "type":"structure",
+      "members":{
+        "roleCredentials":{
+          "shape":"RoleCredentials",
+          "documentation":"<p>The credentials for the role that is assigned to the user.</p>"
+        }
+      }
+    },
+    "InvalidRequestException":{
+      "type":"structure",
+      "members":{
+        "message":{"shape":"ErrorDescription"}
+      },
+      "documentation":"<p>Indicates that a problem occurred with the input to the request. For example, a required parameter might be missing or out of range.</p>",
+      "error":{"httpStatusCode":400},
+      "exception":true
+    },
+    "ListAccountRolesRequest":{
+      "type":"structure",
+      "required":[
+        "accessToken",
+        "accountId"
+      ],
+      "members":{
+        "nextToken":{
+          "shape":"NextTokenType",
+          "documentation":"<p>The page token from the previous response output when you request subsequent pages.</p>",
+          "location":"querystring",
+          "locationName":"next_token"
+        },
+        "maxResults":{
+          "shape":"MaxResultType",
+          "documentation":"<p>The number of items that clients can request per page.</p>",
+          "location":"querystring",
+          "locationName":"max_result"
+        },
+        "accessToken":{
+          "shape":"AccessTokenType",
+          "documentation":"<p>The token issued by the <code>CreateToken</code> API call. For more information, see <a href=\"https://docs.aws.amazon.com/singlesignon/latest/OIDCAPIReference/API_CreateToken.html\">CreateToken</a> in the <i>AWS SSO OIDC API Reference Guide</i>.</p>",
+          "location":"header",
+          "locationName":"x-amz-sso_bearer_token"
+        },
+        "accountId":{
+          "shape":"AccountIdType",
+          "documentation":"<p>The identifier for the AWS account that is assigned to the user.</p>",
+          "location":"querystring",
+          "locationName":"account_id"
+        }
+      }
+    },
+    "ListAccountRolesResponse":{
+      "type":"structure",
+      "members":{
+        "nextToken":{
+          "shape":"NextTokenType",
+          "documentation":"<p>The page token client that is used to retrieve the list of accounts.</p>"
+        },
+        "roleList":{
+          "shape":"RoleListType",
+          "documentation":"<p>A paginated response with the list of roles and the next token if more results are available.</p>"
+        }
+      }
+    },
+    "ListAccountsRequest":{
+      "type":"structure",
+      "required":["accessToken"],
+      "members":{
+        "nextToken":{
+          "shape":"NextTokenType",
+          "documentation":"<p>(Optional) When requesting subsequent pages, this is the page token from the previous response output.</p>",
+          "location":"querystring",
+          "locationName":"next_token"
+        },
+        "maxResults":{
+          "shape":"MaxResultType",
+          "documentation":"<p>This is the number of items clients can request per page.</p>",
+          "location":"querystring",
+          "locationName":"max_result"
+        },
+        "accessToken":{
+          "shape":"AccessTokenType",
+          "documentation":"<p>The token issued by the <code>CreateToken</code> API call. For more information, see <a href=\"https://docs.aws.amazon.com/singlesignon/latest/OIDCAPIReference/API_CreateToken.html\">CreateToken</a> in the <i>AWS SSO OIDC API Reference Guide</i>.</p>",
+          "location":"header",
+          "locationName":"x-amz-sso_bearer_token"
+        }
+      }
+    },
+    "ListAccountsResponse":{
+      "type":"structure",
+      "members":{
+        "nextToken":{
+          "shape":"NextTokenType",
+          "documentation":"<p>The page token client that is used to retrieve the list of accounts.</p>"
+        },
+        "accountList":{
+          "shape":"AccountListType",
+          "documentation":"<p>A paginated response with the list of account information and the next token if more results are available.</p>"
+        }
+      }
+    },
+    "LogoutRequest":{
+      "type":"structure",
+      "required":["accessToken"],
+      "members":{
+        "accessToken":{
+          "shape":"AccessTokenType",
+          "documentation":"<p>The token issued by the <code>CreateToken</code> API call. For more information, see <a href=\"https://docs.aws.amazon.com/singlesignon/latest/OIDCAPIReference/API_CreateToken.html\">CreateToken</a> in the <i>AWS SSO OIDC API Reference Guide</i>.</p>",
+          "location":"header",
+          "locationName":"x-amz-sso_bearer_token"
+        }
+      }
+    },
+    "MaxResultType":{
+      "type":"integer",
+      "box":true,
+      "max":100,
+      "min":1
+    },
+    "NextTokenType":{"type":"string"},
+    "ResourceNotFoundException":{
+      "type":"structure",
+      "members":{
+        "message":{"shape":"ErrorDescription"}
+      },
+      "documentation":"<p>The specified resource doesn't exist.</p>",
+      "error":{"httpStatusCode":404},
+      "exception":true
+    },
+    "RoleCredentials":{
+      "type":"structure",
+      "members":{
+        "accessKeyId":{
+          "shape":"AccessKeyType",
+          "documentation":"<p>The identifier used for the temporary security credentials. For more information, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_use-resources.html\">Using Temporary Security Credentials to Request Access to AWS Resources</a> in the <i>AWS IAM User Guide</i>.</p>"
+        },
+        "secretAccessKey":{
+          "shape":"SecretAccessKeyType",
+          "documentation":"<p>The key that is used to sign the request. For more information, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_use-resources.html\">Using Temporary Security Credentials to Request Access to AWS Resources</a> in the <i>AWS IAM User Guide</i>.</p>"
+        },
+        "sessionToken":{
+          "shape":"SessionTokenType",
+          "documentation":"<p>The token used for temporary credentials. For more information, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_use-resources.html\">Using Temporary Security Credentials to Request Access to AWS Resources</a> in the <i>AWS IAM User Guide</i>.</p>"
+        },
+        "expiration":{
+          "shape":"ExpirationTimestampType",
+          "documentation":"<p>The date on which temporary security credentials expire.</p>"
+        }
+      },
+      "documentation":"<p>Provides information about the role credentials that are assigned to the user.</p>"
+    },
+    "RoleInfo":{
+      "type":"structure",
+      "members":{
+        "roleName":{
+          "shape":"RoleNameType",
+          "documentation":"<p>The friendly name of the role that is assigned to the user.</p>"
+        },
+        "accountId":{
+          "shape":"AccountIdType",
+          "documentation":"<p>The identifier of the AWS account assigned to the user.</p>"
+        }
+      },
+      "documentation":"<p>Provides information about the role that is assigned to the user.</p>"
+    },
+    "RoleListType":{
+      "type":"list",
+      "member":{"shape":"RoleInfo"}
+    },
+    "RoleNameType":{"type":"string"},
+    "SecretAccessKeyType":{
+      "type":"string",
+      "sensitive":true
+    },
+    "SessionTokenType":{
+      "type":"string",
+      "sensitive":true
+    },
+    "TooManyRequestsException":{
+      "type":"structure",
+      "members":{
+        "message":{"shape":"ErrorDescription"}
+      },
+      "documentation":"<p>Indicates that the request is being made too frequently and is more than what the server can handle.</p>",
+      "error":{"httpStatusCode":429},
+      "exception":true
+    },
+    "UnauthorizedException":{
+      "type":"structure",
+      "members":{
+        "message":{"shape":"ErrorDescription"}
+      },
+      "documentation":"<p>Indicates that the request is not authorized. This can happen due to an invalid access token in the request.</p>",
+      "error":{"httpStatusCode":401},
+      "exception":true
+    }
+  },
+  "documentation":"<p>AWS Single Sign-On Portal is a web service that makes it easy for you to assign user access to AWS SSO resources such as the user portal. Users can get AWS account applications and roles assigned to them and get federated into the application.</p> <p>For general information about AWS SSO, see <a href=\"https://docs.aws.amazon.com/singlesignon/latest/userguide/what-is.html\">What is AWS Single Sign-On?</a> in the <i>AWS SSO User Guide</i>.</p> <p>This API reference guide describes the AWS SSO Portal operations that you can call programatically and includes detailed information on data types and errors.</p> <note> <p>AWS provides SDKs that consist of libraries and sample code for various programming languages and platforms, such as Java, Ruby, .Net, iOS, or Android. The SDKs provide a convenient way to create programmatic access to AWS SSO and other AWS services. For more information about the AWS SDKs, including how to download and install them, see <a href=\"http://aws.amazon.com/tools/\">Tools for Amazon Web Services</a>.</p> </note>"
+}
diff --git a/services/ssooidc/pom.xml b/services/ssooidc/pom.xml
new file mode 100644
index 000000000000..4ff0ccf65032
--- /dev/null
+++ b/services/ssooidc/pom.xml
@@ -0,0 +1,60 @@
+<?xml version="1.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.
+  -->
+
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>software.amazon.awssdk</groupId>
+        <artifactId>services</artifactId>
+        <version>2.11.8-SNAPSHOT</version>
+    </parent>
+    <artifactId>ssooidc</artifactId>
+    <name>AWS Java SDK :: Services :: SSO OIDC</name>
+    <description>The AWS Java SDK for SSO OIDC module holds the client classes that are used for
+        communicating with SSO OIDC.
+    </description>
+    <url>https://aws.amazon.com/sdkforjava</url>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifestEntries>
+                            <Automatic-Module-Name>software.amazon.awssdk.services.ssooidc</Automatic-Module-Name>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>protocol-core</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>aws-json-protocol</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/services/ssooidc/src/main/resources/codegen-resources/paginators-1.json b/services/ssooidc/src/main/resources/codegen-resources/paginators-1.json
new file mode 100644
index 000000000000..5677bd8e4a2d
--- /dev/null
+++ b/services/ssooidc/src/main/resources/codegen-resources/paginators-1.json
@@ -0,0 +1,4 @@
+{
+  "pagination": {
+  }
+}
diff --git a/services/ssooidc/src/main/resources/codegen-resources/service-2.json b/services/ssooidc/src/main/resources/codegen-resources/service-2.json
new file mode 100644
index 000000000000..79b2efe1304d
--- /dev/null
+++ b/services/ssooidc/src/main/resources/codegen-resources/service-2.json
@@ -0,0 +1,392 @@
+{
+  "version":"2.0",
+  "metadata":{
+    "apiVersion":"2019-06-10",
+    "endpointPrefix":"oidc",
+    "jsonVersion":"1.1",
+    "protocol":"rest-json",
+    "serviceAbbreviation":"SSO OIDC",
+    "serviceFullName":"AWS SSO OIDC",
+    "serviceId":"SSO OIDC",
+    "signatureVersion":"v4",
+    "signingName":"awsssooidc",
+    "uid":"sso-oidc-2019-06-10"
+  },
+  "operations":{
+    "CreateToken":{
+      "name":"CreateToken",
+      "http":{
+        "method":"POST",
+        "requestUri":"/token"
+      },
+      "input":{"shape":"CreateTokenRequest"},
+      "output":{"shape":"CreateTokenResponse"},
+      "errors":[
+        {"shape":"InvalidRequestException"},
+        {"shape":"InvalidClientException"},
+        {"shape":"InvalidGrantException"},
+        {"shape":"UnauthorizedClientException"},
+        {"shape":"UnsupportedGrantTypeException"},
+        {"shape":"InvalidScopeException"},
+        {"shape":"AuthorizationPendingException"},
+        {"shape":"SlowDownException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"ExpiredTokenException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Creates and returns an access token for the authorized client. The access token issued will be used to fetch short-term credentials for the assigned roles in the AWS account.</p>",
+      "authtype":"none"
+    },
+    "RegisterClient":{
+      "name":"RegisterClient",
+      "http":{
+        "method":"POST",
+        "requestUri":"/client/register"
+      },
+      "input":{"shape":"RegisterClientRequest"},
+      "output":{"shape":"RegisterClientResponse"},
+      "errors":[
+        {"shape":"InvalidRequestException"},
+        {"shape":"InvalidScopeException"},
+        {"shape":"InvalidClientMetadataException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Registers a client with AWS SSO. This allows clients to initiate device authorization. The output should be persisted for reuse through many authentication requests.</p>",
+      "authtype":"none"
+    },
+    "StartDeviceAuthorization":{
+      "name":"StartDeviceAuthorization",
+      "http":{
+        "method":"POST",
+        "requestUri":"/device_authorization"
+      },
+      "input":{"shape":"StartDeviceAuthorizationRequest"},
+      "output":{"shape":"StartDeviceAuthorizationResponse"},
+      "errors":[
+        {"shape":"InvalidRequestException"},
+        {"shape":"InvalidClientException"},
+        {"shape":"UnauthorizedClientException"},
+        {"shape":"SlowDownException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Initiates device authorization by requesting a pair of verification codes from the authorization service.</p>",
+      "authtype":"none"
+    }
+  },
+  "shapes":{
+    "AccessDeniedException":{
+      "type":"structure",
+      "members":{
+        "error":{"shape":"Error"},
+        "error_description":{"shape":"ErrorDescription"}
+      },
+      "documentation":"<p>You do not have sufficient access to perform this action.</p>",
+      "error":{"httpStatusCode":400},
+      "exception":true
+    },
+    "AccessToken":{"type":"string"},
+    "AuthCode":{"type":"string"},
+    "AuthorizationPendingException":{
+      "type":"structure",
+      "members":{
+        "error":{"shape":"Error"},
+        "error_description":{"shape":"ErrorDescription"}
+      },
+      "documentation":"<p>Indicates that a request to authorize a client with an access user session token is pending.</p>",
+      "error":{"httpStatusCode":400},
+      "exception":true
+    },
+    "ClientId":{"type":"string"},
+    "ClientName":{"type":"string"},
+    "ClientSecret":{"type":"string"},
+    "ClientType":{"type":"string"},
+    "CreateTokenRequest":{
+      "type":"structure",
+      "required":[
+        "clientId",
+        "clientSecret",
+        "grantType",
+        "deviceCode"
+      ],
+      "members":{
+        "clientId":{
+          "shape":"ClientId",
+          "documentation":"<p>The unique identifier string for each client. This value should come from the persisted result of the <a>RegisterClient</a> API.</p>"
+        },
+        "clientSecret":{
+          "shape":"ClientSecret",
+          "documentation":"<p>A secret string generated for the client. This value should come from the persisted result of the <a>RegisterClient</a> API.</p>"
+        },
+        "grantType":{
+          "shape":"GrantType",
+          "documentation":"<p>Supports grant types for authorization code, refresh token, and device code request.</p>"
+        },
+        "deviceCode":{
+          "shape":"DeviceCode",
+          "documentation":"<p>Used only when calling this API for the device code grant type. This short-term code is used to identify this authentication attempt. This should come from an in-memory reference to the result of the <a>StartDeviceAuthorization</a> API.</p>"
+        },
+        "code":{
+          "shape":"AuthCode",
+          "documentation":"<p>The authorization code received from the authorization service. This parameter is required to perform an authorization grant request to get access to a token.</p>"
+        },
+        "refreshToken":{
+          "shape":"RefreshToken",
+          "documentation":"<p>The token used to obtain an access token in the event that the access token is invalid or expired. This token is not issued by the service.</p>"
+        },
+        "scope":{
+          "shape":"Scopes",
+          "documentation":"<p>The list of scopes that is defined by the client. Upon authorization, this list is used to restrict permissions when granting an access token.</p>"
+        },
+        "redirectUri":{
+          "shape":"URI",
+          "documentation":"<p>The location of the application that will receive the authorization code. Users authorize the service to send the request to this location.</p>"
+        }
+      }
+    },
+    "CreateTokenResponse":{
+      "type":"structure",
+      "members":{
+        "accessToken":{
+          "shape":"AccessToken",
+          "documentation":"<p>An opaque token to access AWS SSO resources assigned to a user.</p>"
+        },
+        "tokenType":{
+          "shape":"TokenType",
+          "documentation":"<p>Used to notify the client that the returned token is an access token. The supported type is <code>BearerToken</code>.</p>"
+        },
+        "expiresIn":{
+          "shape":"ExpirationInSeconds",
+          "documentation":"<p>Indicates the time in seconds when an access token will expire.</p>"
+        },
+        "refreshToken":{
+          "shape":"RefreshToken",
+          "documentation":"<p>A token that, if present, can be used to refresh a previously issued access token that might have expired.</p>"
+        },
+        "idToken":{
+          "shape":"IdToken",
+          "documentation":"<p>The identifier of the user that associated with the access token, if present.</p>"
+        }
+      }
+    },
+    "DeviceCode":{"type":"string"},
+    "Error":{"type":"string"},
+    "ErrorDescription":{"type":"string"},
+    "ExpirationInSeconds":{"type":"integer"},
+    "ExpiredTokenException":{
+      "type":"structure",
+      "members":{
+        "error":{"shape":"Error"},
+        "error_description":{"shape":"ErrorDescription"}
+      },
+      "documentation":"<p>Indicates that the token issued by the service is expired and is no longer valid.</p>",
+      "error":{"httpStatusCode":400},
+      "exception":true
+    },
+    "GrantType":{"type":"string"},
+    "IdToken":{"type":"string"},
+    "InternalServerException":{
+      "type":"structure",
+      "members":{
+        "error":{"shape":"Error"},
+        "error_description":{"shape":"ErrorDescription"}
+      },
+      "documentation":"<p>Indicates that an error from the service occurred while trying to process a request.</p>",
+      "error":{"httpStatusCode":500},
+      "exception":true,
+      "fault":true
+    },
+    "IntervalInSeconds":{"type":"integer"},
+    "InvalidClientException":{
+      "type":"structure",
+      "members":{
+        "error":{"shape":"Error"},
+        "error_description":{"shape":"ErrorDescription"}
+      },
+      "documentation":"<p>Indicates that the <code>clientId</code> or <code>clientSecret</code> in the request is invalid. For example, this can occur when a client sends an incorrect <code>clientId</code> or an expired <code>clientSecret</code>.</p>",
+      "error":{"httpStatusCode":401},
+      "exception":true
+    },
+    "InvalidClientMetadataException":{
+      "type":"structure",
+      "members":{
+        "error":{"shape":"Error"},
+        "error_description":{"shape":"ErrorDescription"}
+      },
+      "documentation":"<p>Indicates that the client information sent in the request during registration is invalid.</p>",
+      "error":{"httpStatusCode":400},
+      "exception":true
+    },
+    "InvalidGrantException":{
+      "type":"structure",
+      "members":{
+        "error":{"shape":"Error"},
+        "error_description":{"shape":"ErrorDescription"}
+      },
+      "documentation":"<p>Indicates that a request contains an invalid grant. This can occur if a client makes a <a>CreateToken</a> request with an invalid grant type.</p>",
+      "error":{"httpStatusCode":400},
+      "exception":true
+    },
+    "InvalidRequestException":{
+      "type":"structure",
+      "members":{
+        "error":{"shape":"Error"},
+        "error_description":{"shape":"ErrorDescription"}
+      },
+      "documentation":"<p>Indicates that something is wrong with the input to the request. For example, a required parameter might be missing or out of range.</p>",
+      "error":{"httpStatusCode":400},
+      "exception":true
+    },
+    "InvalidScopeException":{
+      "type":"structure",
+      "members":{
+        "error":{"shape":"Error"},
+        "error_description":{"shape":"ErrorDescription"}
+      },
+      "documentation":"<p>Indicates that the scope provided in the request is invalid.</p>",
+      "error":{"httpStatusCode":400},
+      "exception":true
+    },
+    "LongTimeStampType":{"type":"long"},
+    "RefreshToken":{"type":"string"},
+    "RegisterClientRequest":{
+      "type":"structure",
+      "required":[
+        "clientName",
+        "clientType"
+      ],
+      "members":{
+        "clientName":{
+          "shape":"ClientName",
+          "documentation":"<p>The friendly name of the client.</p>"
+        },
+        "clientType":{
+          "shape":"ClientType",
+          "documentation":"<p>The type of client. The service supports only <code>public</code> as a client type. Anything other than public will be rejected by the service.</p>"
+        },
+        "scopes":{
+          "shape":"Scopes",
+          "documentation":"<p>The list of scopes that are defined by the client. Upon authorization, this list is used to restrict permissions when granting an access token.</p>"
+        }
+      }
+    },
+    "RegisterClientResponse":{
+      "type":"structure",
+      "members":{
+        "clientId":{
+          "shape":"ClientId",
+          "documentation":"<p>The unique identifier string for each client. This client uses this identifier to get authenticated by the service in subsequent calls.</p>"
+        },
+        "clientSecret":{
+          "shape":"ClientSecret",
+          "documentation":"<p>A secret string generated for the client. The client will use this string to get authenticated by the service in subsequent calls.</p>"
+        },
+        "clientIdIssuedAt":{
+          "shape":"LongTimeStampType",
+          "documentation":"<p>Indicates the time at which the <code>clientId</code> and <code>clientSecret</code> were issued.</p>"
+        },
+        "clientSecretExpiresAt":{
+          "shape":"LongTimeStampType",
+          "documentation":"<p>Indicates the time at which the <code>clientId</code> and <code>clientSecret</code> will become invalid.</p>"
+        },
+        "authorizationEndpoint":{
+          "shape":"URI",
+          "documentation":"<p>The endpoint where the client can request authorization.</p>"
+        },
+        "tokenEndpoint":{
+          "shape":"URI",
+          "documentation":"<p>The endpoint where the client can get an access token.</p>"
+        }
+      }
+    },
+    "Scope":{"type":"string"},
+    "Scopes":{
+      "type":"list",
+      "member":{"shape":"Scope"}
+    },
+    "SlowDownException":{
+      "type":"structure",
+      "members":{
+        "error":{"shape":"Error"},
+        "error_description":{"shape":"ErrorDescription"}
+      },
+      "documentation":"<p>Indicates that the client is making the request too frequently and is more than the service can handle. </p>",
+      "error":{"httpStatusCode":400},
+      "exception":true
+    },
+    "StartDeviceAuthorizationRequest":{
+      "type":"structure",
+      "required":[
+        "clientId",
+        "clientSecret",
+        "startUrl"
+      ],
+      "members":{
+        "clientId":{
+          "shape":"ClientId",
+          "documentation":"<p>The unique identifier string for the client that is registered with AWS SSO. This value should come from the persisted result of the <a>RegisterClient</a> API operation.</p>"
+        },
+        "clientSecret":{
+          "shape":"ClientSecret",
+          "documentation":"<p>A secret string that is generated for the client. This value should come from the persisted result of the <a>RegisterClient</a> API operation.</p>"
+        },
+        "startUrl":{
+          "shape":"URI",
+          "documentation":"<p>The URL for the AWS SSO user portal. For more information, see <a href=\"https://docs.aws.amazon.com/singlesignon/latest/userguide/using-the-portal.html\">Using the User Portal</a> in the <i>AWS Single Sign-On User Guide</i>.</p>"
+        }
+      }
+    },
+    "StartDeviceAuthorizationResponse":{
+      "type":"structure",
+      "members":{
+        "deviceCode":{
+          "shape":"DeviceCode",
+          "documentation":"<p>The short-lived code that is used by the device when polling for a session token.</p>"
+        },
+        "userCode":{
+          "shape":"UserCode",
+          "documentation":"<p>A one-time user verification code. This is needed to authorize an in-use device.</p>"
+        },
+        "verificationUri":{
+          "shape":"URI",
+          "documentation":"<p>The URI of the verification page that takes the <code>userCode</code> to authorize the device.</p>"
+        },
+        "verificationUriComplete":{
+          "shape":"URI",
+          "documentation":"<p>An alternate URL that the client can use to automatically launch a browser. This process skips the manual step in which the user visits the verification page and enters their code.</p>"
+        },
+        "expiresIn":{
+          "shape":"ExpirationInSeconds",
+          "documentation":"<p>Indicates the number of seconds in which the verification code will become invalid.</p>"
+        },
+        "interval":{
+          "shape":"IntervalInSeconds",
+          "documentation":"<p>Indicates the number of seconds the client must wait between attempts when polling for a session.</p>"
+        }
+      }
+    },
+    "TokenType":{"type":"string"},
+    "URI":{"type":"string"},
+    "UnauthorizedClientException":{
+      "type":"structure",
+      "members":{
+        "error":{"shape":"Error"},
+        "error_description":{"shape":"ErrorDescription"}
+      },
+      "documentation":"<p>Indicates that the client is not currently authorized to make the request. This can happen when a <code>clientId</code> is not issued for a public client.</p>",
+      "error":{"httpStatusCode":400},
+      "exception":true
+    },
+    "UnsupportedGrantTypeException":{
+      "type":"structure",
+      "members":{
+        "error":{"shape":"Error"},
+        "error_description":{"shape":"ErrorDescription"}
+      },
+      "documentation":"<p>Indicates that the grant type in the request is not supported by the service.</p>",
+      "error":{"httpStatusCode":400},
+      "exception":true
+    },
+    "UserCode":{"type":"string"}
+  },
+  "documentation":"<p>AWS Single Sign-On (SSO) OpenID Connect (OIDC) is a web service that enables a client (such as AWS CLI or a native application) to register with AWS SSO. The service also enables the client to fetch the user’s access token upon successful authentication and authorization with AWS SSO. This service conforms with the OAuth 2.0 based implementation of the device authorization grant standard (<a href=\"https://tools.ietf.org/html/rfc8628\">https://tools.ietf.org/html/rfc8628</a>).</p> <p>For general information about AWS SSO, see <a href=\"https://docs.aws.amazon.com/singlesignon/latest/userguide/what-is.html\">What is AWS Single Sign-On?</a> in the <i>AWS SSO User Guide</i>.</p> <p>This API reference guide describes the AWS SSO OIDC operations that you can call programatically and includes detailed information on data types and errors.</p> <note> <p>AWS provides SDKs that consist of libraries and sample code for various programming languages and platforms such as Java, Ruby, .Net, iOS, and Android. The SDKs provide a convenient way to create programmatic access to AWS SSO and other AWS services. For more information about the AWS SDKs, including how to download and install them, see <a href=\"http://aws.amazon.com/tools/\">Tools for Amazon Web Services</a>.</p> </note>"
+}
diff --git a/services/storagegateway/build.properties b/services/storagegateway/build.properties
index ecf2dae6fcb1..15ec2da1fc71 100644
--- a/services/storagegateway/build.properties
+++ b/services/storagegateway/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/storagegateway/pom.xml b/services/storagegateway/pom.xml
index fb2d6173673d..97282925f0d6 100644
--- a/services/storagegateway/pom.xml
+++ b/services/storagegateway/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>storagegateway</artifactId>
     <name>AWS Java SDK :: Services :: AWS Storage Gateway</name>
diff --git a/services/storagegateway/src/it/java/software/amazon/awssdk/services/storagegateway/ServiceIntegrationTest.java b/services/storagegateway/src/it/java/software/amazon/awssdk/services/storagegateway/ServiceIntegrationTest.java
index fb99732aca9f..43862b0d2d6d 100644
--- a/services/storagegateway/src/it/java/software/amazon/awssdk/services/storagegateway/ServiceIntegrationTest.java
+++ b/services/storagegateway/src/it/java/software/amazon/awssdk/services/storagegateway/ServiceIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/storagegateway/src/main/resources/codegen-resources/service-2.json b/services/storagegateway/src/main/resources/codegen-resources/service-2.json
index f7ee221e9c13..0ecdfba9907f 100644
--- a/services/storagegateway/src/main/resources/codegen-resources/service-2.json
+++ b/services/storagegateway/src/main/resources/codegen-resources/service-2.json
@@ -264,7 +264,7 @@
         {"shape":"InvalidGatewayRequestException"},
         {"shape":"InternalServerError"}
       ],
-      "documentation":"<p>Deletes the bandwidth rate limits of a gateway. You can delete either the upload and download bandwidth rate limit, or you can delete both. If you delete only one of the limits, the other limit remains unchanged. To specify which gateway to work with, use the Amazon Resource Name (ARN) of the gateway in your request.</p>"
+      "documentation":"<p>Deletes the bandwidth rate limits of a gateway. You can delete either the upload and download bandwidth rate limit, or you can delete both. If you delete only one of the limits, the other limit remains unchanged. To specify which gateway to work with, use the Amazon Resource Name (ARN) of the gateway in your request. This operation is supported for the stored volume, cached volume and tape gateway types.</p>"
     },
     "DeleteChapCredentials":{
       "name":"DeleteChapCredentials",
@@ -278,7 +278,7 @@
         {"shape":"InvalidGatewayRequestException"},
         {"shape":"InternalServerError"}
       ],
-      "documentation":"<p>Deletes Challenge-Handshake Authentication Protocol (CHAP) credentials for a specified iSCSI target and initiator pair.</p>"
+      "documentation":"<p>Deletes Challenge-Handshake Authentication Protocol (CHAP) credentials for a specified iSCSI target and initiator pair. This operation is supported in volume and tape gateway types.</p>"
     },
     "DeleteFileShare":{
       "name":"DeleteFileShare",
@@ -364,6 +364,20 @@
       ],
       "documentation":"<p>Deletes the specified storage volume that you previously created using the <a>CreateCachediSCSIVolume</a> or <a>CreateStorediSCSIVolume</a> API. This operation is only supported in the cached volume and stored volume types. For stored volume gateways, the local disk that was configured as the storage volume is not deleted. You can reuse the local disk to create another storage volume. </p> <p>Before you delete a volume, make sure there are no iSCSI connections to the volume you are deleting. You should also make sure there is no snapshot in progress. You can use the Amazon Elastic Compute Cloud (Amazon EC2) API to query snapshots on the volume you are deleting and check the snapshot status. For more information, go to <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeSnapshots.html\">DescribeSnapshots</a> in the <i>Amazon Elastic Compute Cloud API Reference</i>.</p> <p>In the request, you must provide the Amazon Resource Name (ARN) of the storage volume you want to delete.</p>"
     },
+    "DescribeAvailabilityMonitorTest":{
+      "name":"DescribeAvailabilityMonitorTest",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DescribeAvailabilityMonitorTestInput"},
+      "output":{"shape":"DescribeAvailabilityMonitorTestOutput"},
+      "errors":[
+        {"shape":"InvalidGatewayRequestException"},
+        {"shape":"InternalServerError"}
+      ],
+      "documentation":"<p>Returns information about the most recent High Availability monitoring test that was performed on the host in a cluster. If a test isn't performed, the status and start time in the response would be null.</p>"
+    },
     "DescribeBandwidthRateLimit":{
       "name":"DescribeBandwidthRateLimit",
       "http":{
@@ -376,7 +390,7 @@
         {"shape":"InvalidGatewayRequestException"},
         {"shape":"InternalServerError"}
       ],
-      "documentation":"<p>Returns the bandwidth rate limits of a gateway. By default, these limits are not set, which means no bandwidth rate limiting is in effect.</p> <p>This operation only returns a value for a bandwidth rate limit only if the limit is set. If no limits are set for the gateway, then this operation returns only the gateway ARN in the response body. To specify which gateway to describe, use the Amazon Resource Name (ARN) of the gateway in your request.</p>"
+      "documentation":"<p>Returns the bandwidth rate limits of a gateway. By default, these limits are not set, which means no bandwidth rate limiting is in effect. This operation is supported for the stored volume, cached volume and tape gateway types.'</p> <p>This operation only returns a value for a bandwidth rate limit only if the limit is set. If no limits are set for the gateway, then this operation returns only the gateway ARN in the response body. To specify which gateway to describe, use the Amazon Resource Name (ARN) of the gateway in your request.</p>"
     },
     "DescribeCache":{
       "name":"DescribeCache",
@@ -418,7 +432,7 @@
         {"shape":"InvalidGatewayRequestException"},
         {"shape":"InternalServerError"}
       ],
-      "documentation":"<p>Returns an array of Challenge-Handshake Authentication Protocol (CHAP) credentials information for a specified iSCSI target, one for each target-initiator pair.</p>"
+      "documentation":"<p>Returns an array of Challenge-Handshake Authentication Protocol (CHAP) credentials information for a specified iSCSI target, one for each target-initiator pair. This operation is supported in the volume and tape gateway types.</p>"
     },
     "DescribeGatewayInformation":{
       "name":"DescribeGatewayInformation",
@@ -614,7 +628,7 @@
         {"shape":"InvalidGatewayRequestException"},
         {"shape":"InternalServerError"}
       ],
-      "documentation":"<p>Disconnects a volume from an iSCSI connection and then detaches the volume from the specified gateway. Detaching and attaching a volume enables you to recover your data from one gateway to a different gateway without creating a snapshot. It also makes it easier to move your volumes from an on-premises gateway to a gateway hosted on an Amazon EC2 instance.</p>"
+      "documentation":"<p>Disconnects a volume from an iSCSI connection and then detaches the volume from the specified gateway. Detaching and attaching a volume enables you to recover your data from one gateway to a different gateway without creating a snapshot. It also makes it easier to move your volumes from an on-premises gateway to a gateway hosted on an Amazon EC2 instance. This operation is only supported in the volume gateway type.</p>"
     },
     "DisableGateway":{
       "name":"DisableGateway",
@@ -698,7 +712,7 @@
         {"shape":"InvalidGatewayRequestException"},
         {"shape":"InternalServerError"}
       ],
-      "documentation":"<p>Lists the tags that have been added to the specified resource. This operation is only supported in the cached volume, stored volume and tape gateway type.</p>"
+      "documentation":"<p>Lists the tags that have been added to the specified resource. This operation is supported in storage gateways of all types.</p>"
     },
     "ListTapes":{
       "name":"ListTapes",
@@ -782,7 +796,7 @@
         {"shape":"InvalidGatewayRequestException"},
         {"shape":"InternalServerError"}
       ],
-      "documentation":"<p>Refreshes the cache for the specified file share. This operation finds objects in the Amazon S3 bucket that were added, removed or replaced since the gateway last listed the bucket's contents and cached the results. This operation is only supported in the file gateway type. You can subscribe to be notified through an Amazon CloudWatch event when your RefreshCache operation completes. For more information, see <a href=\"https://docs.aws.amazon.com/storagegateway/latest/userguide/monitoring-file-gateway.html#get-notification\">Getting Notified About File Operations</a>.</p> <p>When this API is called, it only initiates the refresh operation. When the API call completes and returns a success code, it doesn't necessarily mean that the file refresh has completed. You should use the refresh-complete notification to determine that the operation has completed before you check for new files on the gateway file share. You can subscribe to be notified through an CloudWatch event when your <code>RefreshCache</code> operation completes. </p>"
+      "documentation":"<p>Refreshes the cache for the specified file share. This operation finds objects in the Amazon S3 bucket that were added, removed or replaced since the gateway last listed the bucket's contents and cached the results. This operation is only supported in the file gateway type. You can subscribe to be notified through an Amazon CloudWatch event when your RefreshCache operation completes. For more information, see <a href=\"https://docs.aws.amazon.com/storagegateway/latest/userguide/monitoring-file-gateway.html#get-notification\">Getting Notified About File Operations</a>.</p> <p>When this API is called, it only initiates the refresh operation. When the API call completes and returns a success code, it doesn't necessarily mean that the file refresh has completed. You should use the refresh-complete notification to determine that the operation has completed before you check for new files on the gateway file share. You can subscribe to be notified through an CloudWatch event when your <code>RefreshCache</code> operation completes. </p> <p>Throttle limit: This API is asynchronous so the gateway will accept no more than two refreshes at any time. We recommend using the refresh-complete CloudWatch event notification before issuing additional requests. For more information, see <a href=\"https://docs.aws.amazon.com/storagegateway/latest/userguide/monitoring-file-gateway.html#get-notification\">Getting Notified About File Operations</a>.</p> <p>If you invoke the RefreshCache API when two requests are already being processed, any new request will cause an <code>InvalidGatewayRequestException</code> error because too many requests were sent to the server.</p> <p>For more information, see \"https://docs.aws.amazon.com/storagegateway/latest/userguide/monitoring-file-gateway.html#get-notification\".</p>"
     },
     "RemoveTagsFromResource":{
       "name":"RemoveTagsFromResource",
@@ -796,7 +810,7 @@
         {"shape":"InvalidGatewayRequestException"},
         {"shape":"InternalServerError"}
       ],
-      "documentation":"<p>Removes one or more tags from the specified resource. This operation is only supported in the cached volume, stored volume and tape gateway types.</p>"
+      "documentation":"<p>Removes one or more tags from the specified resource. This operation is supported in storage gateways of all types.</p>"
     },
     "ResetCache":{
       "name":"ResetCache",
@@ -882,6 +896,20 @@
       ],
       "documentation":"<p>Shuts down a gateway. To specify which gateway to shut down, use the Amazon Resource Name (ARN) of the gateway in the body of your request.</p> <p>The operation shuts down the gateway service component running in the gateway's virtual machine (VM) and not the host VM.</p> <note> <p>If you want to shut down the VM, it is recommended that you first shut down the gateway component in the VM to avoid unpredictable conditions.</p> </note> <p>After the gateway is shutdown, you cannot call any other API except <a>StartGateway</a>, <a>DescribeGatewayInformation</a>, and <a>ListGateways</a>. For more information, see <a>ActivateGateway</a>. Your applications cannot read from or write to the gateway's storage volumes, and there are no snapshots taken.</p> <note> <p>When you make a shutdown request, you will get a <code>200 OK</code> success response immediately. However, it might take some time for the gateway to shut down. You can call the <a>DescribeGatewayInformation</a> API to check the status. For more information, see <a>ActivateGateway</a>.</p> </note> <p>If do not intend to use the gateway again, you must delete the gateway (using <a>DeleteGateway</a>) to no longer pay software charges associated with the gateway.</p>"
     },
+    "StartAvailabilityMonitorTest":{
+      "name":"StartAvailabilityMonitorTest",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"StartAvailabilityMonitorTestInput"},
+      "output":{"shape":"StartAvailabilityMonitorTestOutput"},
+      "errors":[
+        {"shape":"InvalidGatewayRequestException"},
+        {"shape":"InternalServerError"}
+      ],
+      "documentation":"<p>Start a test that verifies that the specified gateway is configured for High Availability monitoring in your host environment. This request only initiates the test and that a successful response only indicates that the test was started. It doesn't indicate that the test passed. For the status of the test, invoke the <code>DescribeAvailabilityMonitorTest</code> API. </p> <note> <p>Starting this test will cause your gateway to go offline for a brief period.</p> </note>"
+    },
     "StartGateway":{
       "name":"StartGateway",
       "http":{
@@ -908,7 +936,7 @@
         {"shape":"InvalidGatewayRequestException"},
         {"shape":"InternalServerError"}
       ],
-      "documentation":"<p>Updates the bandwidth rate limits of a gateway. You can update both the upload and download bandwidth rate limit or specify only one of the two. If you don't set a bandwidth rate limit, the existing rate limit remains.</p> <p>By default, a gateway's bandwidth rate limits are not set. If you don't set any limit, the gateway does not have any limitations on its bandwidth usage and could potentially use the maximum available bandwidth.</p> <p>To specify which gateway to update, use the Amazon Resource Name (ARN) of the gateway in your request.</p>"
+      "documentation":"<p>Updates the bandwidth rate limits of a gateway. You can update both the upload and download bandwidth rate limit or specify only one of the two. If you don't set a bandwidth rate limit, the existing rate limit remains. This operation is supported for the stored volume, cached volume and tape gateway types.'</p> <p>By default, a gateway's bandwidth rate limits are not set. If you don't set any limit, the gateway does not have any limitations on its bandwidth usage and could potentially use the maximum available bandwidth.</p> <p>To specify which gateway to update, use the Amazon Resource Name (ARN) of the gateway in your request.</p>"
     },
     "UpdateChapCredentials":{
       "name":"UpdateChapCredentials",
@@ -922,7 +950,7 @@
         {"shape":"InvalidGatewayRequestException"},
         {"shape":"InternalServerError"}
       ],
-      "documentation":"<p>Updates the Challenge-Handshake Authentication Protocol (CHAP) credentials for a specified iSCSI target. By default, a gateway does not have CHAP enabled; however, for added security, you might use it.</p> <important> <p>When you update CHAP credentials, all existing connections on the target are closed and initiators must reconnect with the new credentials.</p> </important>"
+      "documentation":"<p>Updates the Challenge-Handshake Authentication Protocol (CHAP) credentials for a specified iSCSI target. By default, a gateway does not have CHAP enabled; however, for added security, you might use it. This operation is supported in the volume and tape gateway types.</p> <important> <p>When you update CHAP credentials, all existing connections on the target are closed and initiators must reconnect with the new credentials.</p> </important>"
     },
     "UpdateGatewayInformation":{
       "name":"UpdateGatewayInformation",
@@ -1094,6 +1122,18 @@
       "max":50,
       "min":1
     },
+    "ActiveDirectoryStatus":{
+      "type":"string",
+      "enum":[
+        "ACCESS_DENIED",
+        "DETACHED",
+        "JOINED",
+        "JOINING",
+        "NETWORK_ERROR",
+        "TIMEOUT",
+        "UNKNOWN_ERROR"
+      ]
+    },
     "AddCacheInput":{
       "type":"structure",
       "required":[
@@ -1255,12 +1295,24 @@
       },
       "documentation":"<p>AttachVolumeOutput</p>"
     },
+    "AuditDestinationARN":{
+      "type":"string",
+      "max":1024
+    },
     "Authentication":{
       "type":"string",
       "documentation":"<p>The authentication method of the file share.</p> <p>Valid values are <code>ActiveDirectory</code> or <code>GuestAccess</code>. The default is <code>ActiveDirectory</code>.</p>",
       "max":15,
       "min":5
     },
+    "AvailabilityMonitorTestStatus":{
+      "type":"string",
+      "enum":[
+        "COMPLETE",
+        "FAILED",
+        "PENDING"
+      ]
+    },
     "BandwidthDownloadRateLimit":{
       "type":"long",
       "min":102400
@@ -1584,7 +1636,7 @@
         },
         "GatewayARN":{
           "shape":"GatewayARN",
-          "documentation":"<p>The Amazon Resource Name (ARN) of the file gateway on which you want to create a file share.</p>"
+          "documentation":"<p>The ARN of the file gateway on which you want to create a file share.</p>"
         },
         "KMSEncrypted":{
           "shape":"Boolean",
@@ -1638,6 +1690,10 @@
           "shape":"FileShareUserList",
           "documentation":"<p>A list of users or groups in the Active Directory that are not allowed to access the file share. A group must be prefixed with the @ character. For example <code>@group1</code>. Can only be set if Authentication is set to <code>ActiveDirectory</code>.</p>"
         },
+        "AuditDestinationARN":{
+          "shape":"AuditDestinationARN",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the storage used for the audit logs.</p>"
+        },
         "Authentication":{
           "shape":"Authentication",
           "documentation":"<p>The authentication method that users use to access the file share.</p> <p>Valid values are <code>ActiveDirectory</code> or <code>GuestAccess</code>. The default is <code>ActiveDirectory</code>.</p>"
@@ -2099,6 +2155,27 @@
       },
       "documentation":"<p>A JSON object containing the of the storage volume that was deleted</p>"
     },
+    "DescribeAvailabilityMonitorTestInput":{
+      "type":"structure",
+      "required":["GatewayARN"],
+      "members":{
+        "GatewayARN":{"shape":"GatewayARN"}
+      }
+    },
+    "DescribeAvailabilityMonitorTestOutput":{
+      "type":"structure",
+      "members":{
+        "GatewayARN":{"shape":"GatewayARN"},
+        "Status":{
+          "shape":"AvailabilityMonitorTestStatus",
+          "documentation":"<p>The status of the High Availability monitoring test. If a test hasn't been performed, the value of this field is null.</p>"
+        },
+        "StartTime":{
+          "shape":"Time",
+          "documentation":"<p>The time the High Availability monitoring test was started. If a test hasn't been performed, the value of this field is null.</p>"
+        }
+      }
+    },
     "DescribeBandwidthRateLimitInput":{
       "type":"structure",
       "required":["GatewayARN"],
@@ -2262,7 +2339,11 @@
         },
         "CloudWatchLogGroupARN":{
           "shape":"CloudWatchLogGroupARN",
-          "documentation":"<p>The Amazon Resource Name (ARN) of the Amazon CloudWatch log group that was used to monitor and log events in the gateway.</p>"
+          "documentation":"<p>The Amazon Resource Name (ARN) of the Amazon CloudWatch Log Group that is used to monitor events in the gateway.</p>"
+        },
+        "HostEnvironment":{
+          "shape":"HostEnvironment",
+          "documentation":"<p>The type of hypervisor environment used by the host.</p>"
         }
       },
       "documentation":"<p>A JSON object containing the following fields:</p>"
@@ -2359,6 +2440,10 @@
           "shape":"DomainName",
           "documentation":"<p>The name of the domain that the gateway is joined to.</p>"
         },
+        "ActiveDirectoryStatus":{
+          "shape":"ActiveDirectoryStatus",
+          "documentation":"<p>Indicates the status of a gateway that is a member of the Active Directory domain.</p> <ul> <li> <p>ACCESS_DENIED: Indicates that the <code>JoinDomain</code> operation failed due to an authentication error.</p> </li> <li> <p>DETACHED: Indicates that gateway is not joined to a domain.</p> </li> <li> <p>JOINED: Indicates that the gateway has successfully joined a domain.</p> </li> <li> <p>JOINING: Indicates that a <code>JoinDomain</code> operation is in progress.</p> </li> <li> <p>NETWORK_ERROR: Indicates that <code>JoinDomain</code> operation failed due to a network or connectivity error.</p> </li> <li> <p>TIMEOUT: Indicates that the <code>JoinDomain</code> operation failed because the operation didn't complete within the allotted time.</p> </li> <li> <p>UNKNOWN_ERROR: Indicates that the <code>JoinDomain</code> operation failed due to another type of error.</p> </li> </ul>"
+        },
         "SMBGuestPasswordSet":{
           "shape":"Boolean",
           "documentation":"<p>This value is true if a password for the guest user “smbguest” is set, and otherwise false.</p>"
@@ -2807,6 +2892,7 @@
         "LocalStorageLimitExceeded",
         "LunAlreadyAllocated ",
         "LunInvalid",
+        "JoinDomainInProgress",
         "MaximumContentLengthExceeded",
         "MaximumTapeCartridgeCountExceeded",
         "MaximumVolumeCountExceeded",
@@ -2999,6 +3085,16 @@
       "type":"string",
       "pattern":"^(([a-zA-Z0-9\\-]*[a-zA-Z0-9])\\.)*([A-Za-z0-9\\-]*[A-Za-z0-9])(:(\\d+))?$"
     },
+    "HostEnvironment":{
+      "type":"string",
+      "enum":[
+        "VMWARE",
+        "HYPER-V",
+        "EC2",
+        "KVM",
+        "OTHER"
+      ]
+    },
     "Hosts":{
       "type":"list",
       "member":{"shape":"Host"}
@@ -3082,9 +3178,13 @@
           "shape":"Hosts",
           "documentation":"<p>List of IPv4 addresses, NetBIOS names, or host names of your domain server. If you need to specify the port number include it after the colon (“:”). For example, <code>mydc.mydomain.com:389</code>.</p>"
         },
+        "TimeoutInSeconds":{
+          "shape":"TimeoutInSeconds",
+          "documentation":"<p>Specifies the time in seconds, in which the <code>JoinDomain</code> operation must complete. The default is 20 seconds.</p>"
+        },
         "UserName":{
           "shape":"DomainUserName",
-          "documentation":"<p>Sets the user name of user who has permission to add the gateway to the Active Directory domain.</p>"
+          "documentation":"<p>Sets the user name of user who has permission to add the gateway to the Active Directory domain. The domain user account should be enabled to join computers to the domain. For example, you can use the domain administrator account or an account with delegated permissions to join computers to the domain.</p>"
         },
         "Password":{
           "shape":"DomainUserPassword",
@@ -3099,6 +3199,10 @@
         "GatewayARN":{
           "shape":"GatewayARN",
           "documentation":"<p>The unique Amazon Resource Name (ARN) of the gateway that joined the domain.</p>"
+        },
+        "ActiveDirectoryStatus":{
+          "shape":"ActiveDirectoryStatus",
+          "documentation":"<p>Indicates the status of the gateway as a member of the Active Directory domain.</p> <ul> <li> <p>ACCESS_DENIED: Indicates that the <code>JoinDomain</code> operation failed due to an authentication error.</p> </li> <li> <p>DETACHED: Indicates that gateway is not joined to a domain.</p> </li> <li> <p>JOINED: Indicates that the gateway has successfully joined a domain.</p> </li> <li> <p>JOINING: Indicates that a <code>JoinDomain</code> operation is in progress.</p> </li> <li> <p>NETWORK_ERROR: Indicates that <code>JoinDomain</code> operation failed due to a network or connectivity error.</p> </li> <li> <p>TIMEOUT: Indicates that the <code>JoinDomain</code> operation failed because the operation didn't complete within the allotted time.</p> </li> <li> <p>UNKNOWN_ERROR: Indicates that the <code>JoinDomain</code> operation failed due to another type of error.</p> </li> </ul>"
         }
       },
       "documentation":"<p>JoinDomainOutput</p>"
@@ -3709,6 +3813,10 @@
           "shape":"FileShareUserList",
           "documentation":"<p>A list of users or groups in the Active Directory that are not allowed to access the file share. A group must be prefixed with the @ character. For example <code>@group1</code>. Can only be set if Authentication is set to <code>ActiveDirectory</code>.</p>"
         },
+        "AuditDestinationARN":{
+          "shape":"AuditDestinationARN",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the storage used for the audit logs.</p>"
+        },
         "Authentication":{"shape":"Authentication"},
         "Tags":{
           "shape":"Tags",
@@ -3826,6 +3934,19 @@
       "max":15,
       "min":5
     },
+    "StartAvailabilityMonitorTestInput":{
+      "type":"structure",
+      "required":["GatewayARN"],
+      "members":{
+        "GatewayARN":{"shape":"GatewayARN"}
+      }
+    },
+    "StartAvailabilityMonitorTestOutput":{
+      "type":"structure",
+      "members":{
+        "GatewayARN":{"shape":"GatewayARN"}
+      }
+    },
     "StartGatewayInput":{
       "type":"structure",
       "required":["GatewayARN"],
@@ -4164,6 +4285,11 @@
       "pattern":"^[-\\.;a-z0-9]+$"
     },
     "Time":{"type":"timestamp"},
+    "TimeoutInSeconds":{
+      "type":"integer",
+      "max":3600,
+      "min":0
+    },
     "UpdateBandwidthRateLimitInput":{
       "type":"structure",
       "required":["GatewayARN"],
@@ -4417,6 +4543,10 @@
         "InvalidUserList":{
           "shape":"FileShareUserList",
           "documentation":"<p>A list of users or groups in the Active Directory that are not allowed to access the file share. A group must be prefixed with the @ character. For example <code>@group1</code>. Can only be set if Authentication is set to <code>ActiveDirectory</code>.</p>"
+        },
+        "AuditDestinationARN":{
+          "shape":"AuditDestinationARN",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the storage used for the audit logs.</p>"
         }
       },
       "documentation":"<p>UpdateSMBFileShareInput</p>"
diff --git a/services/storagegateway/src/test/resources/cucumber.properties b/services/storagegateway/src/test/resources/cucumber.properties
index 089ebe4774bc..ce316e3113cc 100644
--- a/services/storagegateway/src/test/resources/cucumber.properties
+++ b/services/storagegateway/src/test/resources/cucumber.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/sts/build.properties b/services/sts/build.properties
index ecf2dae6fcb1..15ec2da1fc71 100644
--- a/services/sts/build.properties
+++ b/services/sts/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/sts/pom.xml b/services/sts/pom.xml
index e90946ba4abf..3169f51bfee5 100644
--- a/services/sts/pom.xml
+++ b/services/sts/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>sts</artifactId>
     <name>AWS Java SDK :: Services :: AWS STS</name>
diff --git a/services/sts/src/it/java/software/amazon/awssdk/services/sts/AssumeRoleIntegrationTest.java b/services/sts/src/it/java/software/amazon/awssdk/services/sts/AssumeRoleIntegrationTest.java
index 39fd23371f2b..67e960c0ee6e 100644
--- a/services/sts/src/it/java/software/amazon/awssdk/services/sts/AssumeRoleIntegrationTest.java
+++ b/services/sts/src/it/java/software/amazon/awssdk/services/sts/AssumeRoleIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/sts/src/it/java/software/amazon/awssdk/services/sts/IntegrationTestBase.java b/services/sts/src/it/java/software/amazon/awssdk/services/sts/IntegrationTestBase.java
index 5476c34930ef..a83ed5a94697 100644
--- a/services/sts/src/it/java/software/amazon/awssdk/services/sts/IntegrationTestBase.java
+++ b/services/sts/src/it/java/software/amazon/awssdk/services/sts/IntegrationTestBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/sts/src/it/java/software/amazon/awssdk/services/sts/IntegrationTestBaseWithIAM.java b/services/sts/src/it/java/software/amazon/awssdk/services/sts/IntegrationTestBaseWithIAM.java
index 9f1eca076137..5be0156e5523 100644
--- a/services/sts/src/it/java/software/amazon/awssdk/services/sts/IntegrationTestBaseWithIAM.java
+++ b/services/sts/src/it/java/software/amazon/awssdk/services/sts/IntegrationTestBaseWithIAM.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/sts/src/it/java/software/amazon/awssdk/services/sts/SecurityTokenServiceIntegrationTest.java b/services/sts/src/it/java/software/amazon/awssdk/services/sts/SecurityTokenServiceIntegrationTest.java
index e6308b8e9ed9..7e237a424793 100644
--- a/services/sts/src/it/java/software/amazon/awssdk/services/sts/SecurityTokenServiceIntegrationTest.java
+++ b/services/sts/src/it/java/software/amazon/awssdk/services/sts/SecurityTokenServiceIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/sts/src/main/java/software/amazon/awssdk/services/sts/auth/SessionCredentialsHolder.java b/services/sts/src/main/java/software/amazon/awssdk/services/sts/auth/SessionCredentialsHolder.java
index 5736a26d66c9..7f6a003e7aeb 100644
--- a/services/sts/src/main/java/software/amazon/awssdk/services/sts/auth/SessionCredentialsHolder.java
+++ b/services/sts/src/main/java/software/amazon/awssdk/services/sts/auth/SessionCredentialsHolder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/sts/src/main/java/software/amazon/awssdk/services/sts/auth/StsAssumeRoleCredentialsProvider.java b/services/sts/src/main/java/software/amazon/awssdk/services/sts/auth/StsAssumeRoleCredentialsProvider.java
index 253faaf9e294..af6c13eb5b6d 100644
--- a/services/sts/src/main/java/software/amazon/awssdk/services/sts/auth/StsAssumeRoleCredentialsProvider.java
+++ b/services/sts/src/main/java/software/amazon/awssdk/services/sts/auth/StsAssumeRoleCredentialsProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -17,7 +17,6 @@
 
 import java.util.function.Consumer;
 import java.util.function.Supplier;
-
 import software.amazon.awssdk.annotations.NotThreadSafe;
 import software.amazon.awssdk.annotations.SdkPublicApi;
 import software.amazon.awssdk.annotations.ThreadSafe;
diff --git a/services/sts/src/main/java/software/amazon/awssdk/services/sts/auth/StsAssumeRoleWithSamlCredentialsProvider.java b/services/sts/src/main/java/software/amazon/awssdk/services/sts/auth/StsAssumeRoleWithSamlCredentialsProvider.java
index 2618851e696d..ba6f44436405 100644
--- a/services/sts/src/main/java/software/amazon/awssdk/services/sts/auth/StsAssumeRoleWithSamlCredentialsProvider.java
+++ b/services/sts/src/main/java/software/amazon/awssdk/services/sts/auth/StsAssumeRoleWithSamlCredentialsProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/sts/src/main/java/software/amazon/awssdk/services/sts/auth/StsAssumeRoleWithWebIdentityCredentialsProvider.java b/services/sts/src/main/java/software/amazon/awssdk/services/sts/auth/StsAssumeRoleWithWebIdentityCredentialsProvider.java
index cf7629295653..326cced6b1a1 100644
--- a/services/sts/src/main/java/software/amazon/awssdk/services/sts/auth/StsAssumeRoleWithWebIdentityCredentialsProvider.java
+++ b/services/sts/src/main/java/software/amazon/awssdk/services/sts/auth/StsAssumeRoleWithWebIdentityCredentialsProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/sts/src/main/java/software/amazon/awssdk/services/sts/auth/StsCredentialsProvider.java b/services/sts/src/main/java/software/amazon/awssdk/services/sts/auth/StsCredentialsProvider.java
index 138cf18989d3..af69e2eeaa00 100644
--- a/services/sts/src/main/java/software/amazon/awssdk/services/sts/auth/StsCredentialsProvider.java
+++ b/services/sts/src/main/java/software/amazon/awssdk/services/sts/auth/StsCredentialsProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/sts/src/main/java/software/amazon/awssdk/services/sts/auth/StsGetFederationTokenCredentialsProvider.java b/services/sts/src/main/java/software/amazon/awssdk/services/sts/auth/StsGetFederationTokenCredentialsProvider.java
index 1dcdcc5beb04..247d84b40605 100644
--- a/services/sts/src/main/java/software/amazon/awssdk/services/sts/auth/StsGetFederationTokenCredentialsProvider.java
+++ b/services/sts/src/main/java/software/amazon/awssdk/services/sts/auth/StsGetFederationTokenCredentialsProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/sts/src/main/java/software/amazon/awssdk/services/sts/auth/StsGetSessionTokenCredentialsProvider.java b/services/sts/src/main/java/software/amazon/awssdk/services/sts/auth/StsGetSessionTokenCredentialsProvider.java
index 5ebf7057e1eb..43e51cac30c2 100644
--- a/services/sts/src/main/java/software/amazon/awssdk/services/sts/auth/StsGetSessionTokenCredentialsProvider.java
+++ b/services/sts/src/main/java/software/amazon/awssdk/services/sts/auth/StsGetSessionTokenCredentialsProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/sts/src/main/java/software/amazon/awssdk/services/sts/internal/StsProfileCredentialsProviderFactory.java b/services/sts/src/main/java/software/amazon/awssdk/services/sts/internal/StsProfileCredentialsProviderFactory.java
index bcf3cd7d9e50..4e5559e73680 100644
--- a/services/sts/src/main/java/software/amazon/awssdk/services/sts/internal/StsProfileCredentialsProviderFactory.java
+++ b/services/sts/src/main/java/software/amazon/awssdk/services/sts/internal/StsProfileCredentialsProviderFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/sts/src/main/java/software/amazon/awssdk/services/sts/internal/StsWebIdentityCredentialsProviderFactory.java b/services/sts/src/main/java/software/amazon/awssdk/services/sts/internal/StsWebIdentityCredentialsProviderFactory.java
index 3c2dd606376c..2fb12e11912d 100644
--- a/services/sts/src/main/java/software/amazon/awssdk/services/sts/internal/StsWebIdentityCredentialsProviderFactory.java
+++ b/services/sts/src/main/java/software/amazon/awssdk/services/sts/internal/StsWebIdentityCredentialsProviderFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/sts/src/main/resources/codegen-resources/service-2.json b/services/sts/src/main/resources/codegen-resources/service-2.json
index acfdbc9555bb..7e8282c38a55 100644
--- a/services/sts/src/main/resources/codegen-resources/service-2.json
+++ b/services/sts/src/main/resources/codegen-resources/service-2.json
@@ -29,7 +29,7 @@
         {"shape":"PackedPolicyTooLargeException"},
         {"shape":"RegionDisabledException"}
       ],
-      "documentation":"<p>Returns a set of temporary security credentials that you can use to access AWS resources that you might not normally have access to. These temporary credentials consist of an access key ID, a secret access key, and a security token. Typically, you use <code>AssumeRole</code> within your account or for cross-account access. For a comparison of <code>AssumeRole</code> with other API operations that produce temporary credentials, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_request.html\">Requesting Temporary Security Credentials</a> and <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_request.html#stsapi_comparison\">Comparing the AWS STS API operations</a> in the <i>IAM User Guide</i>.</p> <important> <p>You cannot use AWS account root user credentials to call <code>AssumeRole</code>. You must use credentials for an IAM user or an IAM role to call <code>AssumeRole</code>.</p> </important> <p>For cross-account access, imagine that you own multiple accounts and need to access resources in each account. You could create long-term credentials in each account to access those resources. However, managing all those credentials and remembering which one can access which account can be time consuming. Instead, you can create one set of long-term credentials in one account. Then use temporary security credentials to access all the other accounts by assuming roles in those accounts. For more information about roles, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles.html\">IAM Roles</a> in the <i>IAM User Guide</i>. </p> <p>By default, the temporary security credentials created by <code>AssumeRole</code> last for one hour. However, you can use the optional <code>DurationSeconds</code> parameter to specify the duration of your session. You can provide a value from 900 seconds (15 minutes) up to the maximum session duration setting for the role. This setting can have a value from 1 hour to 12 hours. To learn how to view the maximum value for your role, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use.html#id_roles_use_view-role-max-session\">View the Maximum Session Duration Setting for a Role</a> in the <i>IAM User Guide</i>. The maximum session duration limit applies when you use the <code>AssumeRole*</code> API operations or the <code>assume-role*</code> CLI commands. However the limit does not apply when you use those operations to create a console URL. For more information, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use.html\">Using IAM Roles</a> in the <i>IAM User Guide</i>.</p> <p>The temporary security credentials created by <code>AssumeRole</code> can be used to make API calls to any AWS service with the following exception: You cannot call the AWS STS <code>GetFederationToken</code> or <code>GetSessionToken</code> API operations.</p> <p>(Optional) You can pass inline or managed <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/access_policies.html#policies_session\">session policies</a> to this operation. You can pass a single JSON policy document to use as an inline session policy. You can also specify up to 10 managed policies to use as managed session policies. The plain text that you use for both inline and managed session policies shouldn't exceed 2048 characters. Passing policies to this operation returns new temporary credentials. The resulting session's permissions are the intersection of the role's identity-based policy and the session policies. You can use the role's temporary credentials in subsequent AWS API calls to access resources in the account that owns the role. You cannot use session policies to grant more permissions than those allowed by the identity-based policy of the role that is being assumed. For more information, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/access_policies.html#policies_session\">Session Policies</a> in the <i>IAM User Guide</i>.</p> <p>To assume a role from a different account, your AWS account must be trusted by the role. The trust relationship is defined in the role's trust policy when the role is created. That trust policy states which accounts are allowed to delegate that access to users in the account. </p> <p>A user who wants to access a role in a different account must also have permissions that are delegated from the user account administrator. The administrator must attach a policy that allows the user to call <code>AssumeRole</code> for the ARN of the role in the other account. If the user is in the same account as the role, then you can do either of the following:</p> <ul> <li> <p>Attach a policy to the user (identical to the previous user in a different account).</p> </li> <li> <p>Add the user as a principal directly in the role's trust policy.</p> </li> </ul> <p>In this case, the trust policy acts as an IAM resource-based policy. Users in the same account as the role do not need explicit permission to assume the role. For more information about trust policies and resource-based policies, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/access_policies.html\">IAM Policies</a> in the <i>IAM User Guide</i>.</p> <p> <b>Using MFA with AssumeRole</b> </p> <p>(Optional) You can include multi-factor authentication (MFA) information when you call <code>AssumeRole</code>. This is useful for cross-account scenarios to ensure that the user that assumes the role has been authenticated with an AWS MFA device. In that scenario, the trust policy of the role being assumed includes a condition that tests for MFA authentication. If the caller does not include valid MFA information, the request to assume the role is denied. The condition in a trust policy that tests for MFA authentication might look like the following example.</p> <p> <code>\"Condition\": {\"Bool\": {\"aws:MultiFactorAuthPresent\": true}}</code> </p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/MFAProtectedAPI.html\">Configuring MFA-Protected API Access</a> in the <i>IAM User Guide</i> guide.</p> <p>To use MFA with <code>AssumeRole</code>, you pass values for the <code>SerialNumber</code> and <code>TokenCode</code> parameters. The <code>SerialNumber</code> value identifies the user's hardware or virtual MFA device. The <code>TokenCode</code> is the time-based one-time password (TOTP) that the MFA device produces. </p>"
+      "documentation":"<p>Returns a set of temporary security credentials that you can use to access AWS resources that you might not normally have access to. These temporary credentials consist of an access key ID, a secret access key, and a security token. Typically, you use <code>AssumeRole</code> within your account or for cross-account access. For a comparison of <code>AssumeRole</code> with other API operations that produce temporary credentials, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_request.html\">Requesting Temporary Security Credentials</a> and <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_request.html#stsapi_comparison\">Comparing the AWS STS API operations</a> in the <i>IAM User Guide</i>.</p> <important> <p>You cannot use AWS account root user credentials to call <code>AssumeRole</code>. You must use credentials for an IAM user or an IAM role to call <code>AssumeRole</code>.</p> </important> <p>For cross-account access, imagine that you own multiple accounts and need to access resources in each account. You could create long-term credentials in each account to access those resources. However, managing all those credentials and remembering which one can access which account can be time consuming. Instead, you can create one set of long-term credentials in one account. Then use temporary security credentials to access all the other accounts by assuming roles in those accounts. For more information about roles, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles.html\">IAM Roles</a> in the <i>IAM User Guide</i>. </p> <p> <b>Session Duration</b> </p> <p>By default, the temporary security credentials created by <code>AssumeRole</code> last for one hour. However, you can use the optional <code>DurationSeconds</code> parameter to specify the duration of your session. You can provide a value from 900 seconds (15 minutes) up to the maximum session duration setting for the role. This setting can have a value from 1 hour to 12 hours. To learn how to view the maximum value for your role, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use.html#id_roles_use_view-role-max-session\">View the Maximum Session Duration Setting for a Role</a> in the <i>IAM User Guide</i>. The maximum session duration limit applies when you use the <code>AssumeRole*</code> API operations or the <code>assume-role*</code> CLI commands. However the limit does not apply when you use those operations to create a console URL. For more information, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use.html\">Using IAM Roles</a> in the <i>IAM User Guide</i>.</p> <p> <b>Permissions</b> </p> <p>The temporary security credentials created by <code>AssumeRole</code> can be used to make API calls to any AWS service with the following exception: You cannot call the AWS STS <code>GetFederationToken</code> or <code>GetSessionToken</code> API operations.</p> <p>(Optional) You can pass inline or managed <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/access_policies.html#policies_session\">session policies</a> to this operation. You can pass a single JSON policy document to use as an inline session policy. You can also specify up to 10 managed policies to use as managed session policies. The plain text that you use for both inline and managed session policies can't exceed 2,048 characters. Passing policies to this operation returns new temporary credentials. The resulting session's permissions are the intersection of the role's identity-based policy and the session policies. You can use the role's temporary credentials in subsequent AWS API calls to access resources in the account that owns the role. You cannot use session policies to grant more permissions than those allowed by the identity-based policy of the role that is being assumed. For more information, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/access_policies.html#policies_session\">Session Policies</a> in the <i>IAM User Guide</i>.</p> <p>To assume a role from a different account, your AWS account must be trusted by the role. The trust relationship is defined in the role's trust policy when the role is created. That trust policy states which accounts are allowed to delegate that access to users in the account. </p> <p>A user who wants to access a role in a different account must also have permissions that are delegated from the user account administrator. The administrator must attach a policy that allows the user to call <code>AssumeRole</code> for the ARN of the role in the other account. If the user is in the same account as the role, then you can do either of the following:</p> <ul> <li> <p>Attach a policy to the user (identical to the previous user in a different account).</p> </li> <li> <p>Add the user as a principal directly in the role's trust policy.</p> </li> </ul> <p>In this case, the trust policy acts as an IAM resource-based policy. Users in the same account as the role do not need explicit permission to assume the role. For more information about trust policies and resource-based policies, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/access_policies.html\">IAM Policies</a> in the <i>IAM User Guide</i>.</p> <p> <b>Tags</b> </p> <p>(Optional) You can pass tag key-value pairs to your session. These tags are called session tags. For more information about session tags, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/id_session-tags.html\">Passing Session Tags in STS</a> in the <i>IAM User Guide</i>.</p> <p>An administrator must grant you the permissions necessary to pass session tags. The administrator can also create granular permissions to allow you to pass only specific session tags. For more information, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/tutorial_attribute-based-access-control.html\">Tutorial: Using Tags for Attribute-Based Access Control</a> in the <i>IAM User Guide</i>.</p> <p>You can set the session tags as transitive. Transitive tags persist during role chaining. For more information, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/id_session-tags.html#id_session-tags_role-chaining\">Chaining Roles with Session Tags</a> in the <i>IAM User Guide</i>.</p> <p> <b>Using MFA with AssumeRole</b> </p> <p>(Optional) You can include multi-factor authentication (MFA) information when you call <code>AssumeRole</code>. This is useful for cross-account scenarios to ensure that the user that assumes the role has been authenticated with an AWS MFA device. In that scenario, the trust policy of the role being assumed includes a condition that tests for MFA authentication. If the caller does not include valid MFA information, the request to assume the role is denied. The condition in a trust policy that tests for MFA authentication might look like the following example.</p> <p> <code>\"Condition\": {\"Bool\": {\"aws:MultiFactorAuthPresent\": true}}</code> </p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/MFAProtectedAPI.html\">Configuring MFA-Protected API Access</a> in the <i>IAM User Guide</i> guide.</p> <p>To use MFA with <code>AssumeRole</code>, you pass values for the <code>SerialNumber</code> and <code>TokenCode</code> parameters. The <code>SerialNumber</code> value identifies the user's hardware or virtual MFA device. The <code>TokenCode</code> is the time-based one-time password (TOTP) that the MFA device produces. </p>"
     },
     "AssumeRoleWithSAML":{
       "name":"AssumeRoleWithSAML",
@@ -50,7 +50,7 @@
         {"shape":"ExpiredTokenException"},
         {"shape":"RegionDisabledException"}
       ],
-      "documentation":"<p>Returns a set of temporary security credentials for users who have been authenticated via a SAML authentication response. This operation provides a mechanism for tying an enterprise identity store or directory to role-based AWS access without user-specific credentials or configuration. For a comparison of <code>AssumeRoleWithSAML</code> with the other API operations that produce temporary credentials, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_request.html\">Requesting Temporary Security Credentials</a> and <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_request.html#stsapi_comparison\">Comparing the AWS STS API operations</a> in the <i>IAM User Guide</i>.</p> <p>The temporary security credentials returned by this operation consist of an access key ID, a secret access key, and a security token. Applications can use these temporary security credentials to sign calls to AWS services.</p> <p>By default, the temporary security credentials created by <code>AssumeRoleWithSAML</code> last for one hour. However, you can use the optional <code>DurationSeconds</code> parameter to specify the duration of your session. Your role session lasts for the duration that you specify, or until the time specified in the SAML authentication response's <code>SessionNotOnOrAfter</code> value, whichever is shorter. You can provide a <code>DurationSeconds</code> value from 900 seconds (15 minutes) up to the maximum session duration setting for the role. This setting can have a value from 1 hour to 12 hours. To learn how to view the maximum value for your role, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use.html#id_roles_use_view-role-max-session\">View the Maximum Session Duration Setting for a Role</a> in the <i>IAM User Guide</i>. The maximum session duration limit applies when you use the <code>AssumeRole*</code> API operations or the <code>assume-role*</code> CLI commands. However the limit does not apply when you use those operations to create a console URL. For more information, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use.html\">Using IAM Roles</a> in the <i>IAM User Guide</i>.</p> <p>The temporary security credentials created by <code>AssumeRoleWithSAML</code> can be used to make API calls to any AWS service with the following exception: you cannot call the STS <code>GetFederationToken</code> or <code>GetSessionToken</code> API operations.</p> <p>(Optional) You can pass inline or managed <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/access_policies.html#policies_session\">session policies</a> to this operation. You can pass a single JSON policy document to use as an inline session policy. You can also specify up to 10 managed policies to use as managed session policies. The plain text that you use for both inline and managed session policies shouldn't exceed 2048 characters. Passing policies to this operation returns new temporary credentials. The resulting session's permissions are the intersection of the role's identity-based policy and the session policies. You can use the role's temporary credentials in subsequent AWS API calls to access resources in the account that owns the role. You cannot use session policies to grant more permissions than those allowed by the identity-based policy of the role that is being assumed. For more information, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/access_policies.html#policies_session\">Session Policies</a> in the <i>IAM User Guide</i>.</p> <p>Before your application can call <code>AssumeRoleWithSAML</code>, you must configure your SAML identity provider (IdP) to issue the claims required by AWS. Additionally, you must use AWS Identity and Access Management (IAM) to create a SAML provider entity in your AWS account that represents your identity provider. You must also create an IAM role that specifies this SAML provider in its trust policy. </p> <p>Calling <code>AssumeRoleWithSAML</code> does not require the use of AWS security credentials. The identity of the caller is validated by using keys in the metadata document that is uploaded for the SAML provider entity for your identity provider. </p> <important> <p>Calling <code>AssumeRoleWithSAML</code> can result in an entry in your AWS CloudTrail logs. The entry includes the value in the <code>NameID</code> element of the SAML assertion. We recommend that you use a <code>NameIDType</code> that is not associated with any personally identifiable information (PII). For example, you could instead use the Persistent Identifier (<code>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</code>).</p> </important> <p>For more information, see the following resources:</p> <ul> <li> <p> <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_providers_saml.html\">About SAML 2.0-based Federation</a> in the <i>IAM User Guide</i>. </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_providers_create_saml.html\">Creating SAML Identity Providers</a> in the <i>IAM User Guide</i>. </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_providers_create_saml_relying-party.html\">Configuring a Relying Party and Claims</a> in the <i>IAM User Guide</i>. </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_create_for-idp_saml.html\">Creating a Role for SAML 2.0 Federation</a> in the <i>IAM User Guide</i>. </p> </li> </ul>"
+      "documentation":"<p>Returns a set of temporary security credentials for users who have been authenticated via a SAML authentication response. This operation provides a mechanism for tying an enterprise identity store or directory to role-based AWS access without user-specific credentials or configuration. For a comparison of <code>AssumeRoleWithSAML</code> with the other API operations that produce temporary credentials, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_request.html\">Requesting Temporary Security Credentials</a> and <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_request.html#stsapi_comparison\">Comparing the AWS STS API operations</a> in the <i>IAM User Guide</i>.</p> <p>The temporary security credentials returned by this operation consist of an access key ID, a secret access key, and a security token. Applications can use these temporary security credentials to sign calls to AWS services.</p> <p> <b>Session Duration</b> </p> <p>By default, the temporary security credentials created by <code>AssumeRoleWithSAML</code> last for one hour. However, you can use the optional <code>DurationSeconds</code> parameter to specify the duration of your session. Your role session lasts for the duration that you specify, or until the time specified in the SAML authentication response's <code>SessionNotOnOrAfter</code> value, whichever is shorter. You can provide a <code>DurationSeconds</code> value from 900 seconds (15 minutes) up to the maximum session duration setting for the role. This setting can have a value from 1 hour to 12 hours. To learn how to view the maximum value for your role, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use.html#id_roles_use_view-role-max-session\">View the Maximum Session Duration Setting for a Role</a> in the <i>IAM User Guide</i>. The maximum session duration limit applies when you use the <code>AssumeRole*</code> API operations or the <code>assume-role*</code> CLI commands. However the limit does not apply when you use those operations to create a console URL. For more information, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use.html\">Using IAM Roles</a> in the <i>IAM User Guide</i>.</p> <p> <b>Permissions</b> </p> <p>The temporary security credentials created by <code>AssumeRoleWithSAML</code> can be used to make API calls to any AWS service with the following exception: you cannot call the STS <code>GetFederationToken</code> or <code>GetSessionToken</code> API operations.</p> <p>(Optional) You can pass inline or managed <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/access_policies.html#policies_session\">session policies</a> to this operation. You can pass a single JSON policy document to use as an inline session policy. You can also specify up to 10 managed policies to use as managed session policies. The plain text that you use for both inline and managed session policies can't exceed 2,048 characters. Passing policies to this operation returns new temporary credentials. The resulting session's permissions are the intersection of the role's identity-based policy and the session policies. You can use the role's temporary credentials in subsequent AWS API calls to access resources in the account that owns the role. You cannot use session policies to grant more permissions than those allowed by the identity-based policy of the role that is being assumed. For more information, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/access_policies.html#policies_session\">Session Policies</a> in the <i>IAM User Guide</i>.</p> <p>Calling <code>AssumeRoleWithSAML</code> does not require the use of AWS security credentials. The identity of the caller is validated by using keys in the metadata document that is uploaded for the SAML provider entity for your identity provider. </p> <important> <p>Calling <code>AssumeRoleWithSAML</code> can result in an entry in your AWS CloudTrail logs. The entry includes the value in the <code>NameID</code> element of the SAML assertion. We recommend that you use a <code>NameIDType</code> that is not associated with any personally identifiable information (PII). For example, you could instead use the persistent identifier (<code>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</code>).</p> </important> <p> <b>Tags</b> </p> <p>(Optional) You can configure your IdP to pass attributes into your SAML assertion as session tags. Each session tag consists of a key name and an associated value. For more information about session tags, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/id_session-tags.html\">Passing Session Tags in STS</a> in the <i>IAM User Guide</i>.</p> <p>You can pass up to 50 session tags. The plain text session tag keys can’t exceed 128 characters and the values can’t exceed 256 characters. For these and additional limits, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/reference_iam-limits.html#reference_iam-limits-entity-length\">IAM and STS Character Limits</a> in the <i>IAM User Guide</i>.</p> <note> <p>An AWS conversion compresses the passed session policies and session tags into a packed binary format that has a separate limit. Your request can fail for this limit even if your plain text meets the other requirements. The <code>PackedPolicySize</code> response element indicates by percentage how close the policies and tags for your request are to the upper size limit. </p> </note> <p>You can pass a session tag with the same key as a tag that is attached to the role. When you do, session tags override the role's tags with the same key.</p> <p>An administrator must grant you the permissions necessary to pass session tags. The administrator can also create granular permissions to allow you to pass only specific session tags. For more information, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/tutorial_attribute-based-access-control.html\">Tutorial: Using Tags for Attribute-Based Access Control</a> in the <i>IAM User Guide</i>.</p> <p>You can set the session tags as transitive. Transitive tags persist during role chaining. For more information, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/id_session-tags.html#id_session-tags_role-chaining\">Chaining Roles with Session Tags</a> in the <i>IAM User Guide</i>.</p> <p> <b>SAML Configuration</b> </p> <p>Before your application can call <code>AssumeRoleWithSAML</code>, you must configure your SAML identity provider (IdP) to issue the claims required by AWS. Additionally, you must use AWS Identity and Access Management (IAM) to create a SAML provider entity in your AWS account that represents your identity provider. You must also create an IAM role that specifies this SAML provider in its trust policy. </p> <p>For more information, see the following resources:</p> <ul> <li> <p> <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_providers_saml.html\">About SAML 2.0-based Federation</a> in the <i>IAM User Guide</i>. </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_providers_create_saml.html\">Creating SAML Identity Providers</a> in the <i>IAM User Guide</i>. </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_providers_create_saml_relying-party.html\">Configuring a Relying Party and Claims</a> in the <i>IAM User Guide</i>. </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_create_for-idp_saml.html\">Creating a Role for SAML 2.0 Federation</a> in the <i>IAM User Guide</i>. </p> </li> </ul>"
     },
     "AssumeRoleWithWebIdentity":{
       "name":"AssumeRoleWithWebIdentity",
@@ -72,7 +72,7 @@
         {"shape":"ExpiredTokenException"},
         {"shape":"RegionDisabledException"}
       ],
-      "documentation":"<p>Returns a set of temporary security credentials for users who have been authenticated in a mobile or web application with a web identity provider. Example providers include Amazon Cognito, Login with Amazon, Facebook, Google, or any OpenID Connect-compatible identity provider.</p> <note> <p>For mobile applications, we recommend that you use Amazon Cognito. You can use Amazon Cognito with the <a href=\"http://aws.amazon.com/sdkforios/\">AWS SDK for iOS Developer Guide</a> and the <a href=\"http://aws.amazon.com/sdkforandroid/\">AWS SDK for Android Developer Guide</a> to uniquely identify a user. You can also supply the user with a consistent identity throughout the lifetime of an application.</p> <p>To learn more about Amazon Cognito, see <a href=\"https://docs.aws.amazon.com/mobile/sdkforandroid/developerguide/cognito-auth.html#d0e840\">Amazon Cognito Overview</a> in <i>AWS SDK for Android Developer Guide</i> and <a href=\"https://docs.aws.amazon.com/mobile/sdkforios/developerguide/cognito-auth.html#d0e664\">Amazon Cognito Overview</a> in the <i>AWS SDK for iOS Developer Guide</i>.</p> </note> <p>Calling <code>AssumeRoleWithWebIdentity</code> does not require the use of AWS security credentials. Therefore, you can distribute an application (for example, on mobile devices) that requests temporary security credentials without including long-term AWS credentials in the application. You also don't need to deploy server-based proxy services that use long-term AWS credentials. Instead, the identity of the caller is validated by using a token from the web identity provider. For a comparison of <code>AssumeRoleWithWebIdentity</code> with the other API operations that produce temporary credentials, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_request.html\">Requesting Temporary Security Credentials</a> and <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_request.html#stsapi_comparison\">Comparing the AWS STS API operations</a> in the <i>IAM User Guide</i>.</p> <p>The temporary security credentials returned by this API consist of an access key ID, a secret access key, and a security token. Applications can use these temporary security credentials to sign calls to AWS service API operations.</p> <p>By default, the temporary security credentials created by <code>AssumeRoleWithWebIdentity</code> last for one hour. However, you can use the optional <code>DurationSeconds</code> parameter to specify the duration of your session. You can provide a value from 900 seconds (15 minutes) up to the maximum session duration setting for the role. This setting can have a value from 1 hour to 12 hours. To learn how to view the maximum value for your role, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use.html#id_roles_use_view-role-max-session\">View the Maximum Session Duration Setting for a Role</a> in the <i>IAM User Guide</i>. The maximum session duration limit applies when you use the <code>AssumeRole*</code> API operations or the <code>assume-role*</code> CLI commands. However the limit does not apply when you use those operations to create a console URL. For more information, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use.html\">Using IAM Roles</a> in the <i>IAM User Guide</i>. </p> <p>The temporary security credentials created by <code>AssumeRoleWithWebIdentity</code> can be used to make API calls to any AWS service with the following exception: you cannot call the STS <code>GetFederationToken</code> or <code>GetSessionToken</code> API operations.</p> <p>(Optional) You can pass inline or managed <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/access_policies.html#policies_session\">session policies</a> to this operation. You can pass a single JSON policy document to use as an inline session policy. You can also specify up to 10 managed policies to use as managed session policies. The plain text that you use for both inline and managed session policies shouldn't exceed 2048 characters. Passing policies to this operation returns new temporary credentials. The resulting session's permissions are the intersection of the role's identity-based policy and the session policies. You can use the role's temporary credentials in subsequent AWS API calls to access resources in the account that owns the role. You cannot use session policies to grant more permissions than those allowed by the identity-based policy of the role that is being assumed. For more information, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/access_policies.html#policies_session\">Session Policies</a> in the <i>IAM User Guide</i>.</p> <p>Before your application can call <code>AssumeRoleWithWebIdentity</code>, you must have an identity token from a supported identity provider and create a role that the application can assume. The role that your application assumes must trust the identity provider that is associated with the identity token. In other words, the identity provider must be specified in the role's trust policy. </p> <important> <p>Calling <code>AssumeRoleWithWebIdentity</code> can result in an entry in your AWS CloudTrail logs. The entry includes the <a href=\"http://openid.net/specs/openid-connect-core-1_0.html#Claims\">Subject</a> of the provided Web Identity Token. We recommend that you avoid using any personally identifiable information (PII) in this field. For example, you could instead use a GUID or a pairwise identifier, as <a href=\"http://openid.net/specs/openid-connect-core-1_0.html#SubjectIDTypes\">suggested in the OIDC specification</a>.</p> </important> <p>For more information about how to use web identity federation and the <code>AssumeRoleWithWebIdentity</code> API, see the following resources: </p> <ul> <li> <p> <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_providers_oidc_manual.html\">Using Web Identity Federation API Operations for Mobile Apps</a> and <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_request.html#api_assumerolewithwebidentity\">Federation Through a Web-based Identity Provider</a>. </p> </li> <li> <p> <a href=\"https://web-identity-federation-playground.s3.amazonaws.com/index.html\"> Web Identity Federation Playground</a>. Walk through the process of authenticating through Login with Amazon, Facebook, or Google, getting temporary security credentials, and then using those credentials to make a request to AWS. </p> </li> <li> <p> <a href=\"http://aws.amazon.com/sdkforios/\">AWS SDK for iOS Developer Guide</a> and <a href=\"http://aws.amazon.com/sdkforandroid/\">AWS SDK for Android Developer Guide</a>. These toolkits contain sample apps that show how to invoke the identity providers, and then how to use the information from these providers to get and use temporary security credentials. </p> </li> <li> <p> <a href=\"http://aws.amazon.com/articles/web-identity-federation-with-mobile-applications\">Web Identity Federation with Mobile Applications</a>. This article discusses web identity federation and shows an example of how to use web identity federation to get access to content in Amazon S3. </p> </li> </ul>"
+      "documentation":"<p>Returns a set of temporary security credentials for users who have been authenticated in a mobile or web application with a web identity provider. Example providers include Amazon Cognito, Login with Amazon, Facebook, Google, or any OpenID Connect-compatible identity provider.</p> <note> <p>For mobile applications, we recommend that you use Amazon Cognito. You can use Amazon Cognito with the <a href=\"http://aws.amazon.com/sdkforios/\">AWS SDK for iOS Developer Guide</a> and the <a href=\"http://aws.amazon.com/sdkforandroid/\">AWS SDK for Android Developer Guide</a> to uniquely identify a user. You can also supply the user with a consistent identity throughout the lifetime of an application.</p> <p>To learn more about Amazon Cognito, see <a href=\"https://docs.aws.amazon.com/mobile/sdkforandroid/developerguide/cognito-auth.html#d0e840\">Amazon Cognito Overview</a> in <i>AWS SDK for Android Developer Guide</i> and <a href=\"https://docs.aws.amazon.com/mobile/sdkforios/developerguide/cognito-auth.html#d0e664\">Amazon Cognito Overview</a> in the <i>AWS SDK for iOS Developer Guide</i>.</p> </note> <p>Calling <code>AssumeRoleWithWebIdentity</code> does not require the use of AWS security credentials. Therefore, you can distribute an application (for example, on mobile devices) that requests temporary security credentials without including long-term AWS credentials in the application. You also don't need to deploy server-based proxy services that use long-term AWS credentials. Instead, the identity of the caller is validated by using a token from the web identity provider. For a comparison of <code>AssumeRoleWithWebIdentity</code> with the other API operations that produce temporary credentials, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_request.html\">Requesting Temporary Security Credentials</a> and <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_request.html#stsapi_comparison\">Comparing the AWS STS API operations</a> in the <i>IAM User Guide</i>.</p> <p>The temporary security credentials returned by this API consist of an access key ID, a secret access key, and a security token. Applications can use these temporary security credentials to sign calls to AWS service API operations.</p> <p> <b>Session Duration</b> </p> <p>By default, the temporary security credentials created by <code>AssumeRoleWithWebIdentity</code> last for one hour. However, you can use the optional <code>DurationSeconds</code> parameter to specify the duration of your session. You can provide a value from 900 seconds (15 minutes) up to the maximum session duration setting for the role. This setting can have a value from 1 hour to 12 hours. To learn how to view the maximum value for your role, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use.html#id_roles_use_view-role-max-session\">View the Maximum Session Duration Setting for a Role</a> in the <i>IAM User Guide</i>. The maximum session duration limit applies when you use the <code>AssumeRole*</code> API operations or the <code>assume-role*</code> CLI commands. However the limit does not apply when you use those operations to create a console URL. For more information, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use.html\">Using IAM Roles</a> in the <i>IAM User Guide</i>. </p> <p> <b>Permissions</b> </p> <p>The temporary security credentials created by <code>AssumeRoleWithWebIdentity</code> can be used to make API calls to any AWS service with the following exception: you cannot call the STS <code>GetFederationToken</code> or <code>GetSessionToken</code> API operations.</p> <p>(Optional) You can pass inline or managed <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/access_policies.html#policies_session\">session policies</a> to this operation. You can pass a single JSON policy document to use as an inline session policy. You can also specify up to 10 managed policies to use as managed session policies. The plain text that you use for both inline and managed session policies can't exceed 2,048 characters. Passing policies to this operation returns new temporary credentials. The resulting session's permissions are the intersection of the role's identity-based policy and the session policies. You can use the role's temporary credentials in subsequent AWS API calls to access resources in the account that owns the role. You cannot use session policies to grant more permissions than those allowed by the identity-based policy of the role that is being assumed. For more information, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/access_policies.html#policies_session\">Session Policies</a> in the <i>IAM User Guide</i>.</p> <p> <b>Tags</b> </p> <p>(Optional) You can configure your IdP to pass attributes into your web identity token as session tags. Each session tag consists of a key name and an associated value. For more information about session tags, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/id_session-tags.html\">Passing Session Tags in STS</a> in the <i>IAM User Guide</i>.</p> <p>You can pass up to 50 session tags. The plain text session tag keys can’t exceed 128 characters and the values can’t exceed 256 characters. For these and additional limits, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/reference_iam-limits.html#reference_iam-limits-entity-length\">IAM and STS Character Limits</a> in the <i>IAM User Guide</i>.</p> <note> <p>An AWS conversion compresses the passed session policies and session tags into a packed binary format that has a separate limit. Your request can fail for this limit even if your plain text meets the other requirements. The <code>PackedPolicySize</code> response element indicates by percentage how close the policies and tags for your request are to the upper size limit. </p> </note> <p>You can pass a session tag with the same key as a tag that is attached to the role. When you do, the session tag overrides the role tag with the same key.</p> <p>An administrator must grant you the permissions necessary to pass session tags. The administrator can also create granular permissions to allow you to pass only specific session tags. For more information, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/tutorial_attribute-based-access-control.html\">Tutorial: Using Tags for Attribute-Based Access Control</a> in the <i>IAM User Guide</i>.</p> <p>You can set the session tags as transitive. Transitive tags persist during role chaining. For more information, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/id_session-tags.html#id_session-tags_role-chaining\">Chaining Roles with Session Tags</a> in the <i>IAM User Guide</i>.</p> <p> <b>Identities</b> </p> <p>Before your application can call <code>AssumeRoleWithWebIdentity</code>, you must have an identity token from a supported identity provider and create a role that the application can assume. The role that your application assumes must trust the identity provider that is associated with the identity token. In other words, the identity provider must be specified in the role's trust policy. </p> <important> <p>Calling <code>AssumeRoleWithWebIdentity</code> can result in an entry in your AWS CloudTrail logs. The entry includes the <a href=\"http://openid.net/specs/openid-connect-core-1_0.html#Claims\">Subject</a> of the provided Web Identity Token. We recommend that you avoid using any personally identifiable information (PII) in this field. For example, you could instead use a GUID or a pairwise identifier, as <a href=\"http://openid.net/specs/openid-connect-core-1_0.html#SubjectIDTypes\">suggested in the OIDC specification</a>.</p> </important> <p>For more information about how to use web identity federation and the <code>AssumeRoleWithWebIdentity</code> API, see the following resources: </p> <ul> <li> <p> <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_providers_oidc_manual.html\">Using Web Identity Federation API Operations for Mobile Apps</a> and <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_request.html#api_assumerolewithwebidentity\">Federation Through a Web-based Identity Provider</a>. </p> </li> <li> <p> <a href=\"https://web-identity-federation-playground.s3.amazonaws.com/index.html\"> Web Identity Federation Playground</a>. Walk through the process of authenticating through Login with Amazon, Facebook, or Google, getting temporary security credentials, and then using those credentials to make a request to AWS. </p> </li> <li> <p> <a href=\"http://aws.amazon.com/sdkforios/\">AWS SDK for iOS Developer Guide</a> and <a href=\"http://aws.amazon.com/sdkforandroid/\">AWS SDK for Android Developer Guide</a>. These toolkits contain sample apps that show how to invoke the identity providers. The toolkits then show how to use the information from these providers to get and use temporary security credentials. </p> </li> <li> <p> <a href=\"http://aws.amazon.com/articles/web-identity-federation-with-mobile-applications\">Web Identity Federation with Mobile Applications</a>. This article discusses web identity federation and shows an example of how to use web identity federation to get access to content in Amazon S3. </p> </li> </ul>"
     },
     "DecodeAuthorizationMessage":{
       "name":"DecodeAuthorizationMessage",
@@ -101,7 +101,7 @@
         "shape":"GetAccessKeyInfoResponse",
         "resultWrapper":"GetAccessKeyInfoResult"
       },
-      "documentation":"<p>Returns the account identifier for the specified access key ID.</p> <p>Access keys consist of two parts: an access key ID (for example, <code>AKIAIOSFODNN7EXAMPLE</code>) and a secret access key (for example, <code>wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY</code>). For more information about access keys, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_access-keys.html\">Managing Access Keys for IAM Users</a> in the <i>IAM User Guide</i>.</p> <p>When you pass an access key ID to this operation, it returns the ID of the AWS account to which the keys belong. Access key IDs beginning with <code>AKIA</code> are long-term credentials for an IAM user or the AWS account root user. Access key IDs beginning with <code>ASIA</code> are temporary credentials that are created using STS operations. If the account in the response belongs to you, you can sign in as the root user and review your root user access keys. Then, you can pull a <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_getting-report.html\">credentials report</a> to learn which IAM user owns the keys. To learn who requested the temporary credentials for an <code>ASIA</code> access key, view the STS events in your <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/cloudtrail-integration.html\">CloudTrail logs</a>.</p> <p>This operation does not indicate the state of the access key. The key might be active, inactive, or deleted. Active keys might not have permissions to perform an operation. Providing a deleted access key might return an error that the key doesn't exist.</p>"
+      "documentation":"<p>Returns the account identifier for the specified access key ID.</p> <p>Access keys consist of two parts: an access key ID (for example, <code>AKIAIOSFODNN7EXAMPLE</code>) and a secret access key (for example, <code>wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY</code>). For more information about access keys, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_access-keys.html\">Managing Access Keys for IAM Users</a> in the <i>IAM User Guide</i>.</p> <p>When you pass an access key ID to this operation, it returns the ID of the AWS account to which the keys belong. Access key IDs beginning with <code>AKIA</code> are long-term credentials for an IAM user or the AWS account root user. Access key IDs beginning with <code>ASIA</code> are temporary credentials that are created using STS operations. If the account in the response belongs to you, you can sign in as the root user and review your root user access keys. Then, you can pull a <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_getting-report.html\">credentials report</a> to learn which IAM user owns the keys. To learn who requested the temporary credentials for an <code>ASIA</code> access key, view the STS events in your <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/cloudtrail-integration.html\">CloudTrail logs</a> in the <i>IAM User Guide</i>.</p> <p>This operation does not indicate the state of the access key. The key might be active, inactive, or deleted. Active keys might not have permissions to perform an operation. Providing a deleted access key might return an error that the key doesn't exist.</p>"
     },
     "GetCallerIdentity":{
       "name":"GetCallerIdentity",
@@ -114,7 +114,7 @@
         "shape":"GetCallerIdentityResponse",
         "resultWrapper":"GetCallerIdentityResult"
       },
-      "documentation":"<p>Returns details about the IAM user or role whose credentials are used to call the operation.</p> <note> <p>No permissions are required to perform this operation. If an administrator adds a policy to your IAM user or role that explicitly denies access to the <code>sts:GetCallerIdentity</code> action, you can still perform this operation. Permissions are not required because the same information is returned when an IAM user or role is denied access. To view an example response, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/troubleshoot_general.html#troubleshoot_general_access-denied-delete-mfa\">I Am Not Authorized to Perform: iam:DeleteVirtualMFADevice</a>.</p> </note>"
+      "documentation":"<p>Returns details about the IAM user or role whose credentials are used to call the operation.</p> <note> <p>No permissions are required to perform this operation. If an administrator adds a policy to your IAM user or role that explicitly denies access to the <code>sts:GetCallerIdentity</code> action, you can still perform this operation. Permissions are not required because the same information is returned when an IAM user or role is denied access. To view an example response, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/troubleshoot_general.html#troubleshoot_general_access-denied-delete-mfa\">I Am Not Authorized to Perform: iam:DeleteVirtualMFADevice</a> in the <i>IAM User Guide</i>.</p> </note>"
     },
     "GetFederationToken":{
       "name":"GetFederationToken",
@@ -132,7 +132,7 @@
         {"shape":"PackedPolicyTooLargeException"},
         {"shape":"RegionDisabledException"}
       ],
-      "documentation":"<p>Returns a set of temporary security credentials (consisting of an access key ID, a secret access key, and a security token) for a federated user. A typical use is in a proxy application that gets temporary security credentials on behalf of distributed applications inside a corporate network. You must call the <code>GetFederationToken</code> operation using the long-term security credentials of an IAM user. As a result, this call is appropriate in contexts where those credentials can be safely stored, usually in a server-based application. For a comparison of <code>GetFederationToken</code> with the other API operations that produce temporary credentials, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_request.html\">Requesting Temporary Security Credentials</a> and <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_request.html#stsapi_comparison\">Comparing the AWS STS API operations</a> in the <i>IAM User Guide</i>.</p> <note> <p>You can create a mobile-based or browser-based app that can authenticate users using a web identity provider like Login with Amazon, Facebook, Google, or an OpenID Connect-compatible identity provider. In this case, we recommend that you use <a href=\"http://aws.amazon.com/cognito/\">Amazon Cognito</a> or <code>AssumeRoleWithWebIdentity</code>. For more information, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_request.html#api_assumerolewithwebidentity\">Federation Through a Web-based Identity Provider</a>.</p> </note> <p>You can also call <code>GetFederationToken</code> using the security credentials of an AWS account root user, but we do not recommend it. Instead, we recommend that you create an IAM user for the purpose of the proxy application. Then attach a policy to the IAM user that limits federated users to only the actions and resources that they need to access. For more information, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/best-practices.html\">IAM Best Practices</a> in the <i>IAM User Guide</i>. </p> <p>The temporary credentials are valid for the specified duration, from 900 seconds (15 minutes) up to a maximum of 129,600 seconds (36 hours). The default is 43,200 seconds (12 hours). Temporary credentials that are obtained by using AWS account root user credentials have a maximum duration of 3,600 seconds (1 hour).</p> <p>The temporary security credentials created by <code>GetFederationToken</code> can be used to make API calls to any AWS service with the following exceptions:</p> <ul> <li> <p>You cannot use these credentials to call any IAM API operations.</p> </li> <li> <p>You cannot call any STS API operations except <code>GetCallerIdentity</code>.</p> </li> </ul> <p> <b>Permissions</b> </p> <p>You must pass an inline or managed <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/access_policies.html#policies_session\">session policy</a> to this operation. You can pass a single JSON policy document to use as an inline session policy. You can also specify up to 10 managed policies to use as managed session policies. The plain text that you use for both inline and managed session policies shouldn't exceed 2048 characters.</p> <p>Though the session policy parameters are optional, if you do not pass a policy, then the resulting federated user session has no permissions. The only exception is when the credentials are used to access a resource that has a resource-based policy that specifically references the federated user session in the <code>Principal</code> element of the policy. When you pass session policies, the session permissions are the intersection of the IAM user policies and the session policies that you pass. This gives you a way to further restrict the permissions for a federated user. You cannot use session policies to grant more permissions than those that are defined in the permissions policy of the IAM user. For more information, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/access_policies.html#policies_session\">Session Policies</a> in the <i>IAM User Guide</i>. For information about using <code>GetFederationToken</code> to create temporary security credentials, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_request.html#api_getfederationtoken\">GetFederationToken—Federation Through a Custom Identity Broker</a>. </p>"
+      "documentation":"<p>Returns a set of temporary security credentials (consisting of an access key ID, a secret access key, and a security token) for a federated user. A typical use is in a proxy application that gets temporary security credentials on behalf of distributed applications inside a corporate network. You must call the <code>GetFederationToken</code> operation using the long-term security credentials of an IAM user. As a result, this call is appropriate in contexts where those credentials can be safely stored, usually in a server-based application. For a comparison of <code>GetFederationToken</code> with the other API operations that produce temporary credentials, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_request.html\">Requesting Temporary Security Credentials</a> and <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_request.html#stsapi_comparison\">Comparing the AWS STS API operations</a> in the <i>IAM User Guide</i>.</p> <note> <p>You can create a mobile-based or browser-based app that can authenticate users using a web identity provider like Login with Amazon, Facebook, Google, or an OpenID Connect-compatible identity provider. In this case, we recommend that you use <a href=\"http://aws.amazon.com/cognito/\">Amazon Cognito</a> or <code>AssumeRoleWithWebIdentity</code>. For more information, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_request.html#api_assumerolewithwebidentity\">Federation Through a Web-based Identity Provider</a> in the <i>IAM User Guide</i>.</p> </note> <p>You can also call <code>GetFederationToken</code> using the security credentials of an AWS account root user, but we do not recommend it. Instead, we recommend that you create an IAM user for the purpose of the proxy application. Then attach a policy to the IAM user that limits federated users to only the actions and resources that they need to access. For more information, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/best-practices.html\">IAM Best Practices</a> in the <i>IAM User Guide</i>. </p> <p> <b>Session duration</b> </p> <p>The temporary credentials are valid for the specified duration, from 900 seconds (15 minutes) up to a maximum of 129,600 seconds (36 hours). The default session duration is 43,200 seconds (12 hours). Temporary credentials that are obtained by using AWS account root user credentials have a maximum duration of 3,600 seconds (1 hour).</p> <p> <b>Permissions</b> </p> <p>You can use the temporary credentials created by <code>GetFederationToken</code> in any AWS service except the following:</p> <ul> <li> <p>You cannot call any IAM operations using the AWS CLI or the AWS API. </p> </li> <li> <p>You cannot call any STS operations except <code>GetCallerIdentity</code>.</p> </li> </ul> <p>You must pass an inline or managed <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/access_policies.html#policies_session\">session policy</a> to this operation. You can pass a single JSON policy document to use as an inline session policy. You can also specify up to 10 managed policies to use as managed session policies. The plain text that you use for both inline and managed session policies can't exceed 2,048 characters.</p> <p>Though the session policy parameters are optional, if you do not pass a policy, then the resulting federated user session has no permissions. When you pass session policies, the session permissions are the intersection of the IAM user policies and the session policies that you pass. This gives you a way to further restrict the permissions for a federated user. You cannot use session policies to grant more permissions than those that are defined in the permissions policy of the IAM user. For more information, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/access_policies.html#policies_session\">Session Policies</a> in the <i>IAM User Guide</i>. For information about using <code>GetFederationToken</code> to create temporary security credentials, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_request.html#api_getfederationtoken\">GetFederationToken—Federation Through a Custom Identity Broker</a>. </p> <p>You can use the credentials to access a resource that has a resource-based policy. If that policy specifically references the federated user session in the <code>Principal</code> element of the policy, the session has the permissions allowed by the policy. These permissions are granted in addition to the permissions granted by the session policies.</p> <p> <b>Tags</b> </p> <p>(Optional) You can pass tag key-value pairs to your session. These are called session tags. For more information about session tags, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/id_session-tags.html\">Passing Session Tags in STS</a> in the <i>IAM User Guide</i>.</p> <p>An administrator must grant you the permissions necessary to pass session tags. The administrator can also create granular permissions to allow you to pass only specific session tags. For more information, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/tutorial_attribute-based-access-control.html\">Tutorial: Using Tags for Attribute-Based Access Control</a> in the <i>IAM User Guide</i>.</p> <p>Tag key–value pairs are not case sensitive, but case is preserved. This means that you cannot have separate <code>Department</code> and <code>department</code> tag keys. Assume that the user that you are federating has the <code>Department</code>=<code>Marketing</code> tag and you pass the <code>department</code>=<code>engineering</code> session tag. <code>Department</code> and <code>department</code> are not saved as separate tags, and the session tag passed in the request takes precedence over the user tag.</p>"
     },
     "GetSessionToken":{
       "name":"GetSessionToken",
@@ -148,7 +148,7 @@
       "errors":[
         {"shape":"RegionDisabledException"}
       ],
-      "documentation":"<p>Returns a set of temporary credentials for an AWS account or IAM user. The credentials consist of an access key ID, a secret access key, and a security token. Typically, you use <code>GetSessionToken</code> if you want to use MFA to protect programmatic calls to specific AWS API operations like Amazon EC2 <code>StopInstances</code>. MFA-enabled IAM users would need to call <code>GetSessionToken</code> and submit an MFA code that is associated with their MFA device. Using the temporary security credentials that are returned from the call, IAM users can then make programmatic calls to API operations that require MFA authentication. If you do not supply a correct MFA code, then the API returns an access denied error. For a comparison of <code>GetSessionToken</code> with the other API operations that produce temporary credentials, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_request.html\">Requesting Temporary Security Credentials</a> and <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_request.html#stsapi_comparison\">Comparing the AWS STS API operations</a> in the <i>IAM User Guide</i>.</p> <p>The <code>GetSessionToken</code> operation must be called by using the long-term AWS security credentials of the AWS account root user or an IAM user. Credentials that are created by IAM users are valid for the duration that you specify. This duration can range from 900 seconds (15 minutes) up to a maximum of 129,600 seconds (36 hours), with a default of 43,200 seconds (12 hours). Credentials based on account credentials can range from 900 seconds (15 minutes) up to 3,600 seconds (1 hour), with a default of 1 hour. </p> <p>The temporary security credentials created by <code>GetSessionToken</code> can be used to make API calls to any AWS service with the following exceptions:</p> <ul> <li> <p>You cannot call any IAM API operations unless MFA authentication information is included in the request.</p> </li> <li> <p>You cannot call any STS API <i>except</i> <code>AssumeRole</code> or <code>GetCallerIdentity</code>.</p> </li> </ul> <note> <p>We recommend that you do not call <code>GetSessionToken</code> with AWS account root user credentials. Instead, follow our <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/best-practices.html#create-iam-users\">best practices</a> by creating one or more IAM users, giving them the necessary permissions, and using IAM users for everyday interaction with AWS. </p> </note> <p>The credentials that are returned by <code>GetSessionToken</code> are based on permissions associated with the user whose credentials were used to call the operation. If <code>GetSessionToken</code> is called using AWS account root user credentials, the temporary credentials have root user permissions. Similarly, if <code>GetSessionToken</code> is called using the credentials of an IAM user, the temporary credentials have the same permissions as the IAM user. </p> <p>For more information about using <code>GetSessionToken</code> to create temporary credentials, go to <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_request.html#api_getsessiontoken\">Temporary Credentials for Users in Untrusted Environments</a> in the <i>IAM User Guide</i>. </p>"
+      "documentation":"<p>Returns a set of temporary credentials for an AWS account or IAM user. The credentials consist of an access key ID, a secret access key, and a security token. Typically, you use <code>GetSessionToken</code> if you want to use MFA to protect programmatic calls to specific AWS API operations like Amazon EC2 <code>StopInstances</code>. MFA-enabled IAM users would need to call <code>GetSessionToken</code> and submit an MFA code that is associated with their MFA device. Using the temporary security credentials that are returned from the call, IAM users can then make programmatic calls to API operations that require MFA authentication. If you do not supply a correct MFA code, then the API returns an access denied error. For a comparison of <code>GetSessionToken</code> with the other API operations that produce temporary credentials, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_request.html\">Requesting Temporary Security Credentials</a> and <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_request.html#stsapi_comparison\">Comparing the AWS STS API operations</a> in the <i>IAM User Guide</i>.</p> <p> <b>Session Duration</b> </p> <p>The <code>GetSessionToken</code> operation must be called by using the long-term AWS security credentials of the AWS account root user or an IAM user. Credentials that are created by IAM users are valid for the duration that you specify. This duration can range from 900 seconds (15 minutes) up to a maximum of 129,600 seconds (36 hours), with a default of 43,200 seconds (12 hours). Credentials based on account credentials can range from 900 seconds (15 minutes) up to 3,600 seconds (1 hour), with a default of 1 hour. </p> <p> <b>Permissions</b> </p> <p>The temporary security credentials created by <code>GetSessionToken</code> can be used to make API calls to any AWS service with the following exceptions:</p> <ul> <li> <p>You cannot call any IAM API operations unless MFA authentication information is included in the request.</p> </li> <li> <p>You cannot call any STS API <i>except</i> <code>AssumeRole</code> or <code>GetCallerIdentity</code>.</p> </li> </ul> <note> <p>We recommend that you do not call <code>GetSessionToken</code> with AWS account root user credentials. Instead, follow our <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/best-practices.html#create-iam-users\">best practices</a> by creating one or more IAM users, giving them the necessary permissions, and using IAM users for everyday interaction with AWS. </p> </note> <p>The credentials that are returned by <code>GetSessionToken</code> are based on permissions associated with the user whose credentials were used to call the operation. If <code>GetSessionToken</code> is called using AWS account root user credentials, the temporary credentials have root user permissions. Similarly, if <code>GetSessionToken</code> is called using the credentials of an IAM user, the temporary credentials have the same permissions as the IAM user. </p> <p>For more information about using <code>GetSessionToken</code> to create temporary credentials, go to <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_request.html#api_getsessiontoken\">Temporary Credentials for Users in Untrusted Environments</a> in the <i>IAM User Guide</i>. </p>"
     }
   },
   "shapes":{
@@ -169,16 +169,24 @@
         },
         "PolicyArns":{
           "shape":"policyDescriptorListType",
-          "documentation":"<p>The Amazon Resource Names (ARNs) of the IAM managed policies that you want to use as managed session policies. The policies must exist in the same account as the role.</p> <p>This parameter is optional. You can provide up to 10 managed policy ARNs. However, the plain text that you use for both inline and managed session policies shouldn't exceed 2048 characters. For more information about ARNs, see <a href=\"https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html\">Amazon Resource Names (ARNs) and AWS Service Namespaces</a> in the AWS General Reference.</p> <note> <p>The characters in this parameter count towards the 2048 character session policy guideline. However, an AWS conversion compresses the session policies into a packed binary format that has a separate limit. This is the enforced limit. The <code>PackedPolicySize</code> response element indicates by percentage how close the policy is to the upper size limit.</p> </note> <p>Passing policies to this operation returns new temporary credentials. The resulting session's permissions are the intersection of the role's identity-based policy and the session policies. You can use the role's temporary credentials in subsequent AWS API calls to access resources in the account that owns the role. You cannot use session policies to grant more permissions than those allowed by the identity-based policy of the role that is being assumed. For more information, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/access_policies.html#policies_session\">Session Policies</a> in the <i>IAM User Guide</i>.</p>"
+          "documentation":"<p>The Amazon Resource Names (ARNs) of the IAM managed policies that you want to use as managed session policies. The policies must exist in the same account as the role.</p> <p>This parameter is optional. You can provide up to 10 managed policy ARNs. However, the plain text that you use for both inline and managed session policies can't exceed 2,048 characters. For more information about ARNs, see <a href=\"https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html\">Amazon Resource Names (ARNs) and AWS Service Namespaces</a> in the AWS General Reference.</p> <note> <p>An AWS conversion compresses the passed session policies and session tags into a packed binary format that has a separate limit. Your request can fail for this limit even if your plain text meets the other requirements. The <code>PackedPolicySize</code> response element indicates by percentage how close the policies and tags for your request are to the upper size limit. </p> </note> <p>Passing policies to this operation returns new temporary credentials. The resulting session's permissions are the intersection of the role's identity-based policy and the session policies. You can use the role's temporary credentials in subsequent AWS API calls to access resources in the account that owns the role. You cannot use session policies to grant more permissions than those allowed by the identity-based policy of the role that is being assumed. For more information, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/access_policies.html#policies_session\">Session Policies</a> in the <i>IAM User Guide</i>.</p>"
         },
         "Policy":{
           "shape":"sessionPolicyDocumentType",
-          "documentation":"<p>An IAM policy in JSON format that you want to use as an inline session policy.</p> <p>This parameter is optional. Passing policies to this operation returns new temporary credentials. The resulting session's permissions are the intersection of the role's identity-based policy and the session policies. You can use the role's temporary credentials in subsequent AWS API calls to access resources in the account that owns the role. You cannot use session policies to grant more permissions than those allowed by the identity-based policy of the role that is being assumed. For more information, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/access_policies.html#policies_session\">Session Policies</a> in the <i>IAM User Guide</i>.</p> <p>The plain text that you use for both inline and managed session policies shouldn't exceed 2048 characters. The JSON policy characters can be any ASCII character from the space character to the end of the valid character list (\\u0020 through \\u00FF). It can also include the tab (\\u0009), linefeed (\\u000A), and carriage return (\\u000D) characters.</p> <note> <p>The characters in this parameter count towards the 2048 character session policy guideline. However, an AWS conversion compresses the session policies into a packed binary format that has a separate limit. This is the enforced limit. The <code>PackedPolicySize</code> response element indicates by percentage how close the policy is to the upper size limit.</p> </note>"
+          "documentation":"<p>An IAM policy in JSON format that you want to use as an inline session policy.</p> <p>This parameter is optional. Passing policies to this operation returns new temporary credentials. The resulting session's permissions are the intersection of the role's identity-based policy and the session policies. You can use the role's temporary credentials in subsequent AWS API calls to access resources in the account that owns the role. You cannot use session policies to grant more permissions than those allowed by the identity-based policy of the role that is being assumed. For more information, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/access_policies.html#policies_session\">Session Policies</a> in the <i>IAM User Guide</i>.</p> <p>The plain text that you use for both inline and managed session policies can't exceed 2,048 characters. The JSON policy characters can be any ASCII character from the space character to the end of the valid character list (\\u0020 through \\u00FF). It can also include the tab (\\u0009), linefeed (\\u000A), and carriage return (\\u000D) characters.</p> <note> <p>An AWS conversion compresses the passed session policies and session tags into a packed binary format that has a separate limit. Your request can fail for this limit even if your plain text meets the other requirements. The <code>PackedPolicySize</code> response element indicates by percentage how close the policies and tags for your request are to the upper size limit. </p> </note>"
         },
         "DurationSeconds":{
           "shape":"roleDurationSecondsType",
           "documentation":"<p>The duration, in seconds, of the role session. The value can range from 900 seconds (15 minutes) up to the maximum session duration setting for the role. This setting can have a value from 1 hour to 12 hours. If you specify a value higher than this setting, the operation fails. For example, if you specify a session duration of 12 hours, but your administrator set the maximum session duration to 6 hours, your operation fails. To learn how to view the maximum value for your role, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use.html#id_roles_use_view-role-max-session\">View the Maximum Session Duration Setting for a Role</a> in the <i>IAM User Guide</i>.</p> <p>By default, the value is set to <code>3600</code> seconds. </p> <note> <p>The <code>DurationSeconds</code> parameter is separate from the duration of a console session that you might request using the returned credentials. The request to the federation endpoint for a console sign-in token takes a <code>SessionDuration</code> parameter that specifies the maximum length of the console session. For more information, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_providers_enable-console-custom-url.html\">Creating a URL that Enables Federated Users to Access the AWS Management Console</a> in the <i>IAM User Guide</i>.</p> </note>"
         },
+        "Tags":{
+          "shape":"tagListType",
+          "documentation":"<p>A list of session tags that you want to pass. Each session tag consists of a key name and an associated value. For more information about session tags, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/id_session-tags.html\">Tagging AWS STS Sessions</a> in the <i>IAM User Guide</i>.</p> <p>This parameter is optional. You can pass up to 50 session tags. The plain text session tag keys can’t exceed 128 characters, and the values can’t exceed 256 characters. For these and additional limits, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/reference_iam-limits.html#reference_iam-limits-entity-length\">IAM and STS Character Limits</a> in the <i>IAM User Guide</i>.</p> <note> <p>An AWS conversion compresses the passed session policies and session tags into a packed binary format that has a separate limit. Your request can fail for this limit even if your plain text meets the other requirements. The <code>PackedPolicySize</code> response element indicates by percentage how close the policies and tags for your request are to the upper size limit. </p> </note> <p>You can pass a session tag with the same key as a tag that is already attached to the role. When you do, session tags override a role tag with the same key. </p> <p>Tag key–value pairs are not case sensitive, but case is preserved. This means that you cannot have separate <code>Department</code> and <code>department</code> tag keys. Assume that the role has the <code>Department</code>=<code>Marketing</code> tag and you pass the <code>department</code>=<code>engineering</code> session tag. <code>Department</code> and <code>department</code> are not saved as separate tags, and the session tag passed in the request takes precedence over the role tag.</p> <p>Additionally, if you used temporary credentials to perform this operation, the new session inherits any transitive session tags from the calling session. If you pass a session tag with the same key as an inherited tag, the operation fails. To view the inherited tags for a session, see the AWS CloudTrail logs. For more information, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/session-tags.html#id_session-tags_ctlogs\">Viewing Session Tags in CloudTrail</a> in the <i>IAM User Guide</i>.</p>"
+        },
+        "TransitiveTagKeys":{
+          "shape":"tagKeyListType",
+          "documentation":"<p>A list of keys for session tags that you want to set as transitive. If you set a tag key as transitive, the corresponding key and value passes to subsequent sessions in a role chain. For more information, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/id_session-tags.html#id_session-tags_role-chaining\">Chaining Roles with Session Tags</a> in the <i>IAM User Guide</i>.</p> <p>This parameter is optional. When you set session tags as transitive, the session policy and session tags packed binary limit is not affected.</p> <p>If you choose not to specify a transitive tag key, then no tags are passed from this session to any subsequent sessions.</p>"
+        },
         "ExternalId":{
           "shape":"externalIdType",
           "documentation":"<p>A unique identifier that might be required when you assume a role in another account. If the administrator of the account to which the role belongs provided you with an external ID, then provide that value in the <code>ExternalId</code> parameter. This value can be any string, such as a passphrase or account number. A cross-account role is usually set up to trust everyone in an account. Therefore, the administrator of the trusting account might send an external ID to the administrator of the trusted account. That way, only someone with the ID can assume the role, rather than everyone in the account. For more information about the external ID, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_create_for-user_externalid.html\">How to Use an External ID When Granting Access to Your AWS Resources to a Third Party</a> in the <i>IAM User Guide</i>.</p> <p>The regex used to validate this parameter is a string of characters consisting of upper- and lower-case alphanumeric characters with no spaces. You can also include underscores or any of the following characters: =,.@:/-</p>"
@@ -206,7 +214,7 @@
         },
         "PackedPolicySize":{
           "shape":"nonNegativeIntegerType",
-          "documentation":"<p>A percentage value that indicates the size of the policy in packed form. The service rejects any policy with a packed size greater than 100 percent, which means the policy exceeded the allowed space.</p>"
+          "documentation":"<p>A percentage value that indicates the packed size of the session policies and session tags combined passed in the request. The request fails if the packed size is greater than 100 percent, which means the policies and tags exceeded the allowed space.</p>"
         }
       },
       "documentation":"<p>Contains the response to a successful <a>AssumeRole</a> request, including temporary AWS credentials that can be used to make AWS requests. </p>"
@@ -233,11 +241,11 @@
         },
         "PolicyArns":{
           "shape":"policyDescriptorListType",
-          "documentation":"<p>The Amazon Resource Names (ARNs) of the IAM managed policies that you want to use as managed session policies. The policies must exist in the same account as the role.</p> <p>This parameter is optional. You can provide up to 10 managed policy ARNs. However, the plain text that you use for both inline and managed session policies shouldn't exceed 2048 characters. For more information about ARNs, see <a href=\"https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html\">Amazon Resource Names (ARNs) and AWS Service Namespaces</a> in the AWS General Reference.</p> <note> <p>The characters in this parameter count towards the 2048 character session policy guideline. However, an AWS conversion compresses the session policies into a packed binary format that has a separate limit. This is the enforced limit. The <code>PackedPolicySize</code> response element indicates by percentage how close the policy is to the upper size limit.</p> </note> <p>Passing policies to this operation returns new temporary credentials. The resulting session's permissions are the intersection of the role's identity-based policy and the session policies. You can use the role's temporary credentials in subsequent AWS API calls to access resources in the account that owns the role. You cannot use session policies to grant more permissions than those allowed by the identity-based policy of the role that is being assumed. For more information, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/access_policies.html#policies_session\">Session Policies</a> in the <i>IAM User Guide</i>.</p>"
+          "documentation":"<p>The Amazon Resource Names (ARNs) of the IAM managed policies that you want to use as managed session policies. The policies must exist in the same account as the role.</p> <p>This parameter is optional. You can provide up to 10 managed policy ARNs. However, the plain text that you use for both inline and managed session policies can't exceed 2,048 characters. For more information about ARNs, see <a href=\"https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html\">Amazon Resource Names (ARNs) and AWS Service Namespaces</a> in the AWS General Reference.</p> <note> <p>An AWS conversion compresses the passed session policies and session tags into a packed binary format that has a separate limit. Your request can fail for this limit even if your plain text meets the other requirements. The <code>PackedPolicySize</code> response element indicates by percentage how close the policies and tags for your request are to the upper size limit. </p> </note> <p>Passing policies to this operation returns new temporary credentials. The resulting session's permissions are the intersection of the role's identity-based policy and the session policies. You can use the role's temporary credentials in subsequent AWS API calls to access resources in the account that owns the role. You cannot use session policies to grant more permissions than those allowed by the identity-based policy of the role that is being assumed. For more information, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/access_policies.html#policies_session\">Session Policies</a> in the <i>IAM User Guide</i>.</p>"
         },
         "Policy":{
           "shape":"sessionPolicyDocumentType",
-          "documentation":"<p>An IAM policy in JSON format that you want to use as an inline session policy.</p> <p>This parameter is optional. Passing policies to this operation returns new temporary credentials. The resulting session's permissions are the intersection of the role's identity-based policy and the session policies. You can use the role's temporary credentials in subsequent AWS API calls to access resources in the account that owns the role. You cannot use session policies to grant more permissions than those allowed by the identity-based policy of the role that is being assumed. For more information, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/access_policies.html#policies_session\">Session Policies</a> in the <i>IAM User Guide</i>. </p> <p>The plain text that you use for both inline and managed session policies shouldn't exceed 2048 characters. The JSON policy characters can be any ASCII character from the space character to the end of the valid character list (\\u0020 through \\u00FF). It can also include the tab (\\u0009), linefeed (\\u000A), and carriage return (\\u000D) characters.</p> <note> <p>The characters in this parameter count towards the 2048 character session policy guideline. However, an AWS conversion compresses the session policies into a packed binary format that has a separate limit. This is the enforced limit. The <code>PackedPolicySize</code> response element indicates by percentage how close the policy is to the upper size limit.</p> </note>"
+          "documentation":"<p>An IAM policy in JSON format that you want to use as an inline session policy.</p> <p>This parameter is optional. Passing policies to this operation returns new temporary credentials. The resulting session's permissions are the intersection of the role's identity-based policy and the session policies. You can use the role's temporary credentials in subsequent AWS API calls to access resources in the account that owns the role. You cannot use session policies to grant more permissions than those allowed by the identity-based policy of the role that is being assumed. For more information, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/access_policies.html#policies_session\">Session Policies</a> in the <i>IAM User Guide</i>. </p> <p>The plain text that you use for both inline and managed session policies can't exceed 2,048 characters. The JSON policy characters can be any ASCII character from the space character to the end of the valid character list (\\u0020 through \\u00FF). It can also include the tab (\\u0009), linefeed (\\u000A), and carriage return (\\u000D) characters.</p> <note> <p>An AWS conversion compresses the passed session policies and session tags into a packed binary format that has a separate limit. Your request can fail for this limit even if your plain text meets the other requirements. The <code>PackedPolicySize</code> response element indicates by percentage how close the policies and tags for your request are to the upper size limit. </p> </note>"
         },
         "DurationSeconds":{
           "shape":"roleDurationSecondsType",
@@ -258,7 +266,7 @@
         },
         "PackedPolicySize":{
           "shape":"nonNegativeIntegerType",
-          "documentation":"<p>A percentage value that indicates the size of the policy in packed form. The service rejects any policy with a packed size greater than 100 percent, which means the policy exceeded the allowed space.</p>"
+          "documentation":"<p>A percentage value that indicates the packed size of the session policies and session tags combined passed in the request. The request fails if the packed size is greater than 100 percent, which means the policies and tags exceeded the allowed space.</p>"
         },
         "Subject":{
           "shape":"Subject",
@@ -309,11 +317,11 @@
         },
         "PolicyArns":{
           "shape":"policyDescriptorListType",
-          "documentation":"<p>The Amazon Resource Names (ARNs) of the IAM managed policies that you want to use as managed session policies. The policies must exist in the same account as the role.</p> <p>This parameter is optional. You can provide up to 10 managed policy ARNs. However, the plain text that you use for both inline and managed session policies shouldn't exceed 2048 characters. For more information about ARNs, see <a href=\"https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html\">Amazon Resource Names (ARNs) and AWS Service Namespaces</a> in the AWS General Reference.</p> <note> <p>The characters in this parameter count towards the 2048 character session policy guideline. However, an AWS conversion compresses the session policies into a packed binary format that has a separate limit. This is the enforced limit. The <code>PackedPolicySize</code> response element indicates by percentage how close the policy is to the upper size limit.</p> </note> <p>Passing policies to this operation returns new temporary credentials. The resulting session's permissions are the intersection of the role's identity-based policy and the session policies. You can use the role's temporary credentials in subsequent AWS API calls to access resources in the account that owns the role. You cannot use session policies to grant more permissions than those allowed by the identity-based policy of the role that is being assumed. For more information, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/access_policies.html#policies_session\">Session Policies</a> in the <i>IAM User Guide</i>.</p>"
+          "documentation":"<p>The Amazon Resource Names (ARNs) of the IAM managed policies that you want to use as managed session policies. The policies must exist in the same account as the role.</p> <p>This parameter is optional. You can provide up to 10 managed policy ARNs. However, the plain text that you use for both inline and managed session policies can't exceed 2,048 characters. For more information about ARNs, see <a href=\"https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html\">Amazon Resource Names (ARNs) and AWS Service Namespaces</a> in the AWS General Reference.</p> <note> <p>An AWS conversion compresses the passed session policies and session tags into a packed binary format that has a separate limit. Your request can fail for this limit even if your plain text meets the other requirements. The <code>PackedPolicySize</code> response element indicates by percentage how close the policies and tags for your request are to the upper size limit. </p> </note> <p>Passing policies to this operation returns new temporary credentials. The resulting session's permissions are the intersection of the role's identity-based policy and the session policies. You can use the role's temporary credentials in subsequent AWS API calls to access resources in the account that owns the role. You cannot use session policies to grant more permissions than those allowed by the identity-based policy of the role that is being assumed. For more information, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/access_policies.html#policies_session\">Session Policies</a> in the <i>IAM User Guide</i>.</p>"
         },
         "Policy":{
           "shape":"sessionPolicyDocumentType",
-          "documentation":"<p>An IAM policy in JSON format that you want to use as an inline session policy.</p> <p>This parameter is optional. Passing policies to this operation returns new temporary credentials. The resulting session's permissions are the intersection of the role's identity-based policy and the session policies. You can use the role's temporary credentials in subsequent AWS API calls to access resources in the account that owns the role. You cannot use session policies to grant more permissions than those allowed by the identity-based policy of the role that is being assumed. For more information, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/access_policies.html#policies_session\">Session Policies</a> in the <i>IAM User Guide</i>.</p> <p>The plain text that you use for both inline and managed session policies shouldn't exceed 2048 characters. The JSON policy characters can be any ASCII character from the space character to the end of the valid character list (\\u0020 through \\u00FF). It can also include the tab (\\u0009), linefeed (\\u000A), and carriage return (\\u000D) characters.</p> <note> <p>The characters in this parameter count towards the 2048 character session policy guideline. However, an AWS conversion compresses the session policies into a packed binary format that has a separate limit. This is the enforced limit. The <code>PackedPolicySize</code> response element indicates by percentage how close the policy is to the upper size limit.</p> </note>"
+          "documentation":"<p>An IAM policy in JSON format that you want to use as an inline session policy.</p> <p>This parameter is optional. Passing policies to this operation returns new temporary credentials. The resulting session's permissions are the intersection of the role's identity-based policy and the session policies. You can use the role's temporary credentials in subsequent AWS API calls to access resources in the account that owns the role. You cannot use session policies to grant more permissions than those allowed by the identity-based policy of the role that is being assumed. For more information, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/access_policies.html#policies_session\">Session Policies</a> in the <i>IAM User Guide</i>.</p> <p>The plain text that you use for both inline and managed session policies can't exceed 2,048 characters. The JSON policy characters can be any ASCII character from the space character to the end of the valid character list (\\u0020 through \\u00FF). It can also include the tab (\\u0009), linefeed (\\u000A), and carriage return (\\u000D) characters.</p> <note> <p>An AWS conversion compresses the passed session policies and session tags into a packed binary format that has a separate limit. Your request can fail for this limit even if your plain text meets the other requirements. The <code>PackedPolicySize</code> response element indicates by percentage how close the policies and tags for your request are to the upper size limit. </p> </note>"
         },
         "DurationSeconds":{
           "shape":"roleDurationSecondsType",
@@ -338,7 +346,7 @@
         },
         "PackedPolicySize":{
           "shape":"nonNegativeIntegerType",
-          "documentation":"<p>A percentage value that indicates the size of the policy in packed form. The service rejects any policy with a packed size greater than 100 percent, which means the policy exceeded the allowed space.</p>"
+          "documentation":"<p>A percentage value that indicates the packed size of the session policies and session tags combined passed in the request. The request fails if the packed size is greater than 100 percent, which means the policies and tags exceeded the allowed space.</p>"
         },
         "Provider":{
           "shape":"Issuer",
@@ -364,7 +372,7 @@
         },
         "Arn":{
           "shape":"arnType",
-          "documentation":"<p>The ARN of the temporary security credentials that are returned from the <a>AssumeRole</a> action. For more information about ARNs and how to use them in policies, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/reference_identifiers.html\">IAM Identifiers</a> in <i>Using IAM</i>. </p>"
+          "documentation":"<p>The ARN of the temporary security credentials that are returned from the <a>AssumeRole</a> action. For more information about ARNs and how to use them in policies, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/reference_identifiers.html\">IAM Identifiers</a> in the <i>IAM User Guide</i>.</p>"
         }
       },
       "documentation":"<p>The identifiers for the temporary security credentials that the operation returns.</p>"
@@ -444,7 +452,7 @@
         },
         "Arn":{
           "shape":"arnType",
-          "documentation":"<p>The ARN that specifies the federated user that is associated with the credentials. For more information about ARNs and how to use them in policies, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/reference_identifiers.html\">IAM Identifiers</a> in <i>Using IAM</i>. </p>"
+          "documentation":"<p>The ARN that specifies the federated user that is associated with the credentials. For more information about ARNs and how to use them in policies, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/reference_identifiers.html\">IAM Identifiers</a> in the <i>IAM User Guide</i>. </p>"
         }
       },
       "documentation":"<p>Identifiers for the federated user that is associated with the credentials.</p>"
@@ -455,7 +463,7 @@
       "members":{
         "AccessKeyId":{
           "shape":"accessKeyIdType",
-          "documentation":"<p>The identifier of an access key.</p> <p>This parameter allows (through its regex pattern) a string of characters that can consist of any upper- or lowercased letter or digit.</p>"
+          "documentation":"<p>The identifier of an access key.</p> <p>This parameter allows (through its regex pattern) a string of characters that can consist of any upper- or lowercase letter or digit.</p>"
         }
       }
     },
@@ -501,15 +509,19 @@
         },
         "Policy":{
           "shape":"sessionPolicyDocumentType",
-          "documentation":"<p>An IAM policy in JSON format that you want to use as an inline session policy.</p> <p>You must pass an inline or managed <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/access_policies.html#policies_session\">session policy</a> to this operation. You can pass a single JSON policy document to use as an inline session policy. You can also specify up to 10 managed policies to use as managed session policies.</p> <p>This parameter is optional. However, if you do not pass any session policies, then the resulting federated user session has no permissions. The only exception is when the credentials are used to access a resource that has a resource-based policy that specifically references the federated user session in the <code>Principal</code> element of the policy.</p> <p>When you pass session policies, the session permissions are the intersection of the IAM user policies and the session policies that you pass. This gives you a way to further restrict the permissions for a federated user. You cannot use session policies to grant more permissions than those that are defined in the permissions policy of the IAM user. For more information, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/access_policies.html#policies_session\">Session Policies</a> in the <i>IAM User Guide</i>.</p> <p>The plain text that you use for both inline and managed session policies shouldn't exceed 2048 characters. The JSON policy characters can be any ASCII character from the space character to the end of the valid character list (\\u0020 through \\u00FF). It can also include the tab (\\u0009), linefeed (\\u000A), and carriage return (\\u000D) characters.</p> <note> <p>The characters in this parameter count towards the 2048 character session policy guideline. However, an AWS conversion compresses the session policies into a packed binary format that has a separate limit. This is the enforced limit. The <code>PackedPolicySize</code> response element indicates by percentage how close the policy is to the upper size limit.</p> </note>"
+          "documentation":"<p>An IAM policy in JSON format that you want to use as an inline session policy.</p> <p>You must pass an inline or managed <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/access_policies.html#policies_session\">session policy</a> to this operation. You can pass a single JSON policy document to use as an inline session policy. You can also specify up to 10 managed policies to use as managed session policies.</p> <p>This parameter is optional. However, if you do not pass any session policies, then the resulting federated user session has no permissions.</p> <p>When you pass session policies, the session permissions are the intersection of the IAM user policies and the session policies that you pass. This gives you a way to further restrict the permissions for a federated user. You cannot use session policies to grant more permissions than those that are defined in the permissions policy of the IAM user. For more information, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/access_policies.html#policies_session\">Session Policies</a> in the <i>IAM User Guide</i>.</p> <p>The resulting credentials can be used to access a resource that has a resource-based policy. If that policy specifically references the federated user session in the <code>Principal</code> element of the policy, the session has the permissions allowed by the policy. These permissions are granted in addition to the permissions that are granted by the session policies.</p> <p>The plain text that you use for both inline and managed session policies can't exceed 2,048 characters. The JSON policy characters can be any ASCII character from the space character to the end of the valid character list (\\u0020 through \\u00FF). It can also include the tab (\\u0009), linefeed (\\u000A), and carriage return (\\u000D) characters.</p> <note> <p>An AWS conversion compresses the passed session policies and session tags into a packed binary format that has a separate limit. Your request can fail for this limit even if your plain text meets the other requirements. The <code>PackedPolicySize</code> response element indicates by percentage how close the policies and tags for your request are to the upper size limit. </p> </note>"
         },
         "PolicyArns":{
           "shape":"policyDescriptorListType",
-          "documentation":"<p>The Amazon Resource Names (ARNs) of the IAM managed policies that you want to use as a managed session policy. The policies must exist in the same account as the IAM user that is requesting federated access.</p> <p>You must pass an inline or managed <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/access_policies.html#policies_session\">session policy</a> to this operation. You can pass a single JSON policy document to use as an inline session policy. You can also specify up to 10 managed policies to use as managed session policies. The plain text that you use for both inline and managed session policies shouldn't exceed 2048 characters. You can provide up to 10 managed policy ARNs. For more information about ARNs, see <a href=\"https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html\">Amazon Resource Names (ARNs) and AWS Service Namespaces</a> in the AWS General Reference.</p> <p>This parameter is optional. However, if you do not pass any session policies, then the resulting federated user session has no permissions. The only exception is when the credentials are used to access a resource that has a resource-based policy that specifically references the federated user session in the <code>Principal</code> element of the policy.</p> <p>When you pass session policies, the session permissions are the intersection of the IAM user policies and the session policies that you pass. This gives you a way to further restrict the permissions for a federated user. You cannot use session policies to grant more permissions than those that are defined in the permissions policy of the IAM user. For more information, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/access_policies.html#policies_session\">Session Policies</a> in the <i>IAM User Guide</i>.</p> <note> <p>The characters in this parameter count towards the 2048 character session policy guideline. However, an AWS conversion compresses the session policies into a packed binary format that has a separate limit. This is the enforced limit. The <code>PackedPolicySize</code> response element indicates by percentage how close the policy is to the upper size limit.</p> </note>"
+          "documentation":"<p>The Amazon Resource Names (ARNs) of the IAM managed policies that you want to use as a managed session policy. The policies must exist in the same account as the IAM user that is requesting federated access.</p> <p>You must pass an inline or managed <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/access_policies.html#policies_session\">session policy</a> to this operation. You can pass a single JSON policy document to use as an inline session policy. You can also specify up to 10 managed policies to use as managed session policies. The plain text that you use for both inline and managed session policies can't exceed 2,048 characters. You can provide up to 10 managed policy ARNs. For more information about ARNs, see <a href=\"https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html\">Amazon Resource Names (ARNs) and AWS Service Namespaces</a> in the AWS General Reference.</p> <p>This parameter is optional. However, if you do not pass any session policies, then the resulting federated user session has no permissions.</p> <p>When you pass session policies, the session permissions are the intersection of the IAM user policies and the session policies that you pass. This gives you a way to further restrict the permissions for a federated user. You cannot use session policies to grant more permissions than those that are defined in the permissions policy of the IAM user. For more information, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/access_policies.html#policies_session\">Session Policies</a> in the <i>IAM User Guide</i>.</p> <p>The resulting credentials can be used to access a resource that has a resource-based policy. If that policy specifically references the federated user session in the <code>Principal</code> element of the policy, the session has the permissions allowed by the policy. These permissions are granted in addition to the permissions that are granted by the session policies.</p> <note> <p>An AWS conversion compresses the passed session policies and session tags into a packed binary format that has a separate limit. Your request can fail for this limit even if your plain text meets the other requirements. The <code>PackedPolicySize</code> response element indicates by percentage how close the policies and tags for your request are to the upper size limit. </p> </note>"
         },
         "DurationSeconds":{
           "shape":"durationSecondsType",
           "documentation":"<p>The duration, in seconds, that the session should last. Acceptable durations for federation sessions range from 900 seconds (15 minutes) to 129,600 seconds (36 hours), with 43,200 seconds (12 hours) as the default. Sessions obtained using AWS account root user credentials are restricted to a maximum of 3,600 seconds (one hour). If the specified duration is longer than one hour, the session obtained by using root user credentials defaults to one hour.</p>"
+        },
+        "Tags":{
+          "shape":"tagListType",
+          "documentation":"<p>A list of session tags. Each session tag consists of a key name and an associated value. For more information about session tags, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/id_session-tags.html\">Passing Session Tags in STS</a> in the <i>IAM User Guide</i>.</p> <p>This parameter is optional. You can pass up to 50 session tags. The plain text session tag keys can’t exceed 128 characters and the values can’t exceed 256 characters. For these and additional limits, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/reference_iam-limits.html#reference_iam-limits-entity-length\">IAM and STS Character Limits</a> in the <i>IAM User Guide</i>.</p> <note> <p>An AWS conversion compresses the passed session policies and session tags into a packed binary format that has a separate limit. Your request can fail for this limit even if your plain text meets the other requirements. The <code>PackedPolicySize</code> response element indicates by percentage how close the policies and tags for your request are to the upper size limit. </p> </note> <p>You can pass a session tag with the same key as a tag that is already attached to the user you are federating. When you do, session tags override a user tag with the same key. </p> <p>Tag key–value pairs are not case sensitive, but case is preserved. This means that you cannot have separate <code>Department</code> and <code>department</code> tag keys. Assume that the role has the <code>Department</code>=<code>Marketing</code> tag and you pass the <code>department</code>=<code>engineering</code> session tag. <code>Department</code> and <code>department</code> are not saved as separate tags, and the session tag passed in the request takes precedence over the role tag.</p>"
         }
       }
     },
@@ -526,7 +538,7 @@
         },
         "PackedPolicySize":{
           "shape":"nonNegativeIntegerType",
-          "documentation":"<p>A percentage value indicating the size of the policy in packed form. The service rejects policies for which the packed size is greater than 100 percent of the allowed value.</p>"
+          "documentation":"<p>A percentage value that indicates the packed size of the session policies and session tags combined passed in the request. The request fails if the packed size is greater than 100 percent, which means the policies and tags exceeded the allowed space.</p>"
         }
       },
       "documentation":"<p>Contains the response to a successful <a>GetFederationToken</a> request, including temporary AWS credentials that can be used to make AWS requests. </p>"
@@ -563,7 +575,7 @@
       "members":{
         "message":{"shape":"idpCommunicationErrorMessage"}
       },
-      "documentation":"<p>The request could not be fulfilled because the non-AWS identity provider (IDP) that was asked to verify the incoming identity token could not be reached. This is often a transient error caused by network conditions. Retry the request a limited number of times so that you don't exceed the request rate. If the error persists, the non-AWS identity provider might be down or not responding.</p>",
+      "documentation":"<p>The request could not be fulfilled because the identity provider (IDP) that was asked to verify the incoming identity token could not be reached. This is often a transient error caused by network conditions. Retry the request a limited number of times so that you don't exceed the request rate. If the error persists, the identity provider might be down or not responding.</p>",
       "error":{
         "code":"IDPCommunicationError",
         "httpStatusCode":400,
@@ -589,7 +601,7 @@
       "members":{
         "message":{"shape":"invalidAuthorizationMessage"}
       },
-      "documentation":"<p>This error is returned if the message passed to <code>DecodeAuthorizationMessage</code> was invalid. This can happen if the token contains invalid characters, such as linebreaks. </p>",
+      "documentation":"<p>The error returned if the message passed to <code>DecodeAuthorizationMessage</code> was invalid. This can happen if the token contains invalid characters, such as linebreaks. </p>",
       "error":{
         "code":"InvalidAuthorizationMessageException",
         "httpStatusCode":400,
@@ -630,7 +642,7 @@
       "members":{
         "message":{"shape":"packedPolicyTooLargeMessage"}
       },
-      "documentation":"<p>The request was rejected because the policy document was too large. The error message describes how big the policy document is, in packed form, as a percentage of what the API allows.</p>",
+      "documentation":"<p>The request was rejected because the total packed size of the session policies and session tags combined was too large. An AWS conversion compresses the session policy document, session policy ARNs, and session tags into a packed binary format that has a separate limit. The error message indicates by percentage how close the policies and tags are to the upper size limit. For more information, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/id_session-tags.html\">Passing Session Tags in STS</a> in the <i>IAM User Guide</i>.</p> <p>You could receive this error even though you meet other defined session policy and session tag limits. For more information, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_enable-regions.html\">IAM and STS Entity Character Limits</a> in the <i>IAM User Guide</i>.</p>",
       "error":{
         "code":"PackedPolicyTooLarge",
         "httpStatusCode":400,
@@ -668,6 +680,24 @@
     },
     "Subject":{"type":"string"},
     "SubjectType":{"type":"string"},
+    "Tag":{
+      "type":"structure",
+      "required":[
+        "Key",
+        "Value"
+      ],
+      "members":{
+        "Key":{
+          "shape":"tagKeyType",
+          "documentation":"<p>The key for a session tag.</p> <p>You can pass up to 50 session tags. The plain text session tag keys can’t exceed 128 characters. For these and additional limits, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/reference_iam-limits.html#reference_iam-limits-entity-length\">IAM and STS Character Limits</a> in the <i>IAM User Guide</i>.</p>"
+        },
+        "Value":{
+          "shape":"tagValueType",
+          "documentation":"<p>The value for a session tag.</p> <p>You can pass up to 50 session tags. The plain text session tag values can’t exceed 256 characters. For these and additional limits, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/reference_iam-limits.html#reference_iam-limits-entity-length\">IAM and STS Character Limits</a> in the <i>IAM User Guide</i>.</p>"
+        }
+      },
+      "documentation":"<p>You can pass custom key-value pair attributes when you assume a role or federate a user. These are called session tags. You can then use the session tags to control access to resources. For more information, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/id_session-tags.html\">Tagging AWS STS Sessions</a> in the <i>IAM User Guide</i>.</p>"
+    },
     "accessKeyIdType":{
       "type":"string",
       "max":128,
@@ -756,6 +786,28 @@
       "min":1,
       "pattern":"[\\u0009\\u000A\\u000D\\u0020-\\u00FF]+"
     },
+    "tagKeyListType":{
+      "type":"list",
+      "member":{"shape":"tagKeyType"},
+      "max":50
+    },
+    "tagKeyType":{
+      "type":"string",
+      "max":128,
+      "min":1,
+      "pattern":"[\\p{L}\\p{Z}\\p{N}_.:/=+\\-@]+"
+    },
+    "tagListType":{
+      "type":"list",
+      "member":{"shape":"Tag"},
+      "max":50
+    },
+    "tagValueType":{
+      "type":"string",
+      "max":256,
+      "min":0,
+      "pattern":"[\\p{L}\\p{Z}\\p{N}_.:/=+\\-@]*"
+    },
     "tokenCodeType":{
       "type":"string",
       "max":6,
diff --git a/services/sts/src/test/java/software/amazon/awssdk/services/sts/auth/StsAssumeRoleCredentialsProviderTest.java b/services/sts/src/test/java/software/amazon/awssdk/services/sts/auth/StsAssumeRoleCredentialsProviderTest.java
index 139e2e6ef61d..03a76ad3d519 100644
--- a/services/sts/src/test/java/software/amazon/awssdk/services/sts/auth/StsAssumeRoleCredentialsProviderTest.java
+++ b/services/sts/src/test/java/software/amazon/awssdk/services/sts/auth/StsAssumeRoleCredentialsProviderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/sts/src/test/java/software/amazon/awssdk/services/sts/auth/StsAssumeRoleWithSamlCredentialsProviderTest.java b/services/sts/src/test/java/software/amazon/awssdk/services/sts/auth/StsAssumeRoleWithSamlCredentialsProviderTest.java
index e6f4b8495325..efae4de54547 100644
--- a/services/sts/src/test/java/software/amazon/awssdk/services/sts/auth/StsAssumeRoleWithSamlCredentialsProviderTest.java
+++ b/services/sts/src/test/java/software/amazon/awssdk/services/sts/auth/StsAssumeRoleWithSamlCredentialsProviderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/sts/src/test/java/software/amazon/awssdk/services/sts/auth/StsAssumeRoleWithWebIdentityCredentialsProviderTest.java b/services/sts/src/test/java/software/amazon/awssdk/services/sts/auth/StsAssumeRoleWithWebIdentityCredentialsProviderTest.java
index fa031f563ac3..d7f5510976d8 100644
--- a/services/sts/src/test/java/software/amazon/awssdk/services/sts/auth/StsAssumeRoleWithWebIdentityCredentialsProviderTest.java
+++ b/services/sts/src/test/java/software/amazon/awssdk/services/sts/auth/StsAssumeRoleWithWebIdentityCredentialsProviderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/sts/src/test/java/software/amazon/awssdk/services/sts/auth/StsCredentialsProviderTestBase.java b/services/sts/src/test/java/software/amazon/awssdk/services/sts/auth/StsCredentialsProviderTestBase.java
index 0a4df624a1a6..4f6173cd898d 100644
--- a/services/sts/src/test/java/software/amazon/awssdk/services/sts/auth/StsCredentialsProviderTestBase.java
+++ b/services/sts/src/test/java/software/amazon/awssdk/services/sts/auth/StsCredentialsProviderTestBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/sts/src/test/java/software/amazon/awssdk/services/sts/auth/StsGetFederationTokenCredentialsProviderTest.java b/services/sts/src/test/java/software/amazon/awssdk/services/sts/auth/StsGetFederationTokenCredentialsProviderTest.java
index 07d459395b19..2663afacf18d 100644
--- a/services/sts/src/test/java/software/amazon/awssdk/services/sts/auth/StsGetFederationTokenCredentialsProviderTest.java
+++ b/services/sts/src/test/java/software/amazon/awssdk/services/sts/auth/StsGetFederationTokenCredentialsProviderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/sts/src/test/java/software/amazon/awssdk/services/sts/auth/StsGetSessionTokenCredentialsProviderTest.java b/services/sts/src/test/java/software/amazon/awssdk/services/sts/auth/StsGetSessionTokenCredentialsProviderTest.java
index 5b283725eab3..ee2679ec1bf6 100644
--- a/services/sts/src/test/java/software/amazon/awssdk/services/sts/auth/StsGetSessionTokenCredentialsProviderTest.java
+++ b/services/sts/src/test/java/software/amazon/awssdk/services/sts/auth/StsGetSessionTokenCredentialsProviderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/sts/src/test/java/software/amazon/awssdk/services/sts/internal/AssumeRoleProfileTest.java b/services/sts/src/test/java/software/amazon/awssdk/services/sts/internal/AssumeRoleProfileTest.java
index fc6c870bafa6..fd2fa6ebb776 100644
--- a/services/sts/src/test/java/software/amazon/awssdk/services/sts/internal/AssumeRoleProfileTest.java
+++ b/services/sts/src/test/java/software/amazon/awssdk/services/sts/internal/AssumeRoleProfileTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/sts/src/test/java/software/amazon/awssdk/services/sts/internal/WebIdentityTokenCredentialProviderTest.java b/services/sts/src/test/java/software/amazon/awssdk/services/sts/internal/WebIdentityTokenCredentialProviderTest.java
index bec258c50033..564d1dafae5e 100644
--- a/services/sts/src/test/java/software/amazon/awssdk/services/sts/internal/WebIdentityTokenCredentialProviderTest.java
+++ b/services/sts/src/test/java/software/amazon/awssdk/services/sts/internal/WebIdentityTokenCredentialProviderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/sts/src/test/resources/log4j.properties b/services/sts/src/test/resources/log4j.properties
index d0bd83a2b956..f06008342946 100644
--- a/services/sts/src/test/resources/log4j.properties
+++ b/services/sts/src/test/resources/log4j.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/support/build.properties b/services/support/build.properties
index ecf2dae6fcb1..15ec2da1fc71 100644
--- a/services/support/build.properties
+++ b/services/support/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/support/pom.xml b/services/support/pom.xml
index 2db5c6aa259d..5b740e18c449 100644
--- a/services/support/pom.xml
+++ b/services/support/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>support</artifactId>
     <name>AWS Java SDK :: Services :: AWS Support</name>
diff --git a/services/swf/build.properties b/services/swf/build.properties
index ecf2dae6fcb1..15ec2da1fc71 100644
--- a/services/swf/build.properties
+++ b/services/swf/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/swf/pom.xml b/services/swf/pom.xml
index f3bebd07dbbb..99d8f06fdabe 100644
--- a/services/swf/pom.xml
+++ b/services/swf/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>swf</artifactId>
     <name>AWS Java SDK :: Services :: Amazon SWF</name>
diff --git a/services/swf/src/main/java/software/amazon/awssdk/services/swf/internal/SwfHttpConfigurationOptions.java b/services/swf/src/main/java/software/amazon/awssdk/services/swf/internal/SwfHttpConfigurationOptions.java
index 7e6fb33848e5..af3ee8f79892 100644
--- a/services/swf/src/main/java/software/amazon/awssdk/services/swf/internal/SwfHttpConfigurationOptions.java
+++ b/services/swf/src/main/java/software/amazon/awssdk/services/swf/internal/SwfHttpConfigurationOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/swf/src/main/java/software/amazon/awssdk/services/swf/package-info.java b/services/swf/src/main/java/software/amazon/awssdk/services/swf/package-info.java
index e6c079366e72..0cf86437c3e7 100644
--- a/services/swf/src/main/java/software/amazon/awssdk/services/swf/package-info.java
+++ b/services/swf/src/main/java/software/amazon/awssdk/services/swf/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/swf/src/test/resources/cucumber.properties b/services/swf/src/test/resources/cucumber.properties
index 63cbea0821aa..b7c7d710f04b 100644
--- a/services/swf/src/test/resources/cucumber.properties
+++ b/services/swf/src/test/resources/cucumber.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/textract/pom.xml b/services/textract/pom.xml
index ef458553781a..7e29b686c9b3 100644
--- a/services/textract/pom.xml
+++ b/services/textract/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>textract</artifactId>
     <name>AWS Java SDK :: Services :: Textract</name>
diff --git a/services/textract/src/main/resources/codegen-resources/service-2.json b/services/textract/src/main/resources/codegen-resources/service-2.json
index 6e0a40810696..7b99ea1ac365 100644
--- a/services/textract/src/main/resources/codegen-resources/service-2.json
+++ b/services/textract/src/main/resources/codegen-resources/service-2.json
@@ -29,9 +29,10 @@
         {"shape":"AccessDeniedException"},
         {"shape":"ProvisionedThroughputExceededException"},
         {"shape":"InternalServerError"},
-        {"shape":"ThrottlingException"}
+        {"shape":"ThrottlingException"},
+        {"shape":"HumanLoopQuotaExceededException"}
       ],
-      "documentation":"<p>Analyzes an input document for relationships between detected items. </p> <p>The types of information returned are as follows: </p> <ul> <li> <p>Words and lines that are related to nearby lines and words. The related information is returned in two <a>Block</a> objects each of type <code>KEY_VALUE_SET</code>: a KEY Block object and a VALUE Block object. For example, <i>Name: Ana Silva Carolina</i> contains a key and value. <i>Name:</i> is the key. <i>Ana Silva Carolina</i> is the value.</p> </li> <li> <p>Table and table cell data. A TABLE Block object contains information about a detected table. A CELL Block object is returned for each cell in a table.</p> </li> <li> <p>Selectable elements such as checkboxes and radio buttons. A SELECTION_ELEMENT Block object contains information about a selectable element.</p> </li> <li> <p>Lines and words of text. A LINE Block object contains one or more WORD Block objects.</p> </li> </ul> <p>You can choose which type of analysis to perform by specifying the <code>FeatureTypes</code> list. </p> <p>The output is returned in a list of <code>BLOCK</code> objects.</p> <p> <code>AnalyzeDocument</code> is a synchronous operation. To analyze documents asynchronously, use <a>StartDocumentAnalysis</a>.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/textract/latest/dg/how-it-works-analyzing.html\">Document Text Analysis</a>.</p>"
+      "documentation":"<p>Analyzes an input document for relationships between detected items. </p> <p>The types of information returned are as follows: </p> <ul> <li> <p>Form data (key-value pairs). The related information is returned in two <a>Block</a> objects, each of type <code>KEY_VALUE_SET</code>: a KEY <code>Block</code> object and a VALUE <code>Block</code> object. For example, <i>Name: Ana Silva Carolina</i> contains a key and value. <i>Name:</i> is the key. <i>Ana Silva Carolina</i> is the value.</p> </li> <li> <p>Table and table cell data. A TABLE <code>Block</code> object contains information about a detected table. A CELL <code>Block</code> object is returned for each cell in a table.</p> </li> <li> <p>Lines and words of text. A LINE <code>Block</code> object contains one or more WORD <code>Block</code> objects. All lines and words that are detected in the document are returned (including text that doesn't have a relationship with the value of <code>FeatureTypes</code>). </p> </li> </ul> <p>Selection elements such as check boxes and option buttons (radio buttons) can be detected in form data and in tables. A SELECTION_ELEMENT <code>Block</code> object contains information about a selection element, including the selection status.</p> <p>You can choose which type of analysis to perform by specifying the <code>FeatureTypes</code> list. </p> <p>The output is returned in a list of <code>Block</code> objects.</p> <p> <code>AnalyzeDocument</code> is a synchronous operation. To analyze documents asynchronously, use <a>StartDocumentAnalysis</a>.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/textract/latest/dg/how-it-works-analyzing.html\">Document Text Analysis</a>.</p>"
     },
     "DetectDocumentText":{
       "name":"DetectDocumentText",
@@ -52,7 +53,7 @@
         {"shape":"InternalServerError"},
         {"shape":"ThrottlingException"}
       ],
-      "documentation":"<p>Detects text in the input document. Amazon Textract can detect lines of text and the words that make up a line of text. The input document must be an image in JPG or PNG format. <code>DetectDocumentText</code> returns the detected text in an array of <a>Block</a> objects. </p> <p>Each document page has as an associated <code>Block</code> of type PAGE. Each PAGE <code>Block</code> object is the parent of LINE <code>Block</code> objects that represent the lines of detected text on a page. A LINE <code>Block</code> object is a parent for each word that makes up the line. Words are represented by <code>Block</code> objects of type WORD.</p> <p> <code>DetectDocumentText</code> is a synchronous operation. To analyze documents asynchronously, use <a>StartDocumentTextDetection</a>.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/textract/latest/dg/how-it-works-detecting.html\">Document Text Detection</a>.</p>"
+      "documentation":"<p>Detects text in the input document. Amazon Textract can detect lines of text and the words that make up a line of text. The input document must be an image in JPEG or PNG format. <code>DetectDocumentText</code> returns the detected text in an array of <a>Block</a> objects. </p> <p>Each document page has as an associated <code>Block</code> of type PAGE. Each PAGE <code>Block</code> object is the parent of LINE <code>Block</code> objects that represent the lines of detected text on a page. A LINE <code>Block</code> object is a parent for each word that makes up the line. Words are represented by <code>Block</code> objects of type WORD.</p> <p> <code>DetectDocumentText</code> is a synchronous operation. To analyze documents asynchronously, use <a>StartDocumentTextDetection</a>.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/textract/latest/dg/how-it-works-detecting.html\">Document Text Detection</a>.</p>"
     },
     "GetDocumentAnalysis":{
       "name":"GetDocumentAnalysis",
@@ -70,7 +71,7 @@
         {"shape":"InternalServerError"},
         {"shape":"ThrottlingException"}
       ],
-      "documentation":"<p>Gets the results for an Amazon Textract asynchronous operation that analyzes text in a document.</p> <p>You start asynchronous text analysis by calling <a>StartDocumentAnalysis</a>, which returns a job identifier (<code>JobId</code>). When the text analysis operation finishes, Amazon Textract publishes a completion status to the Amazon Simple Notification Service (Amazon SNS) topic that's registered in the initial call to <code>StartDocumentAnalysis</code>. To get the results of the text-detection operation, first check that the status value published to the Amazon SNS topic is <code>SUCCEEDED</code>. If so, call <code>GetDocumentAnalysis</code>, and pass the job identifier (<code>JobId</code>) from the initial call to <code>StartDocumentAnalysis</code>.</p> <p> <code>GetDocumentAnalysis</code> returns an array of <a>Block</a> objects. The following types of information are returned: </p> <ul> <li> <p>Words and lines that are related to nearby lines and words. The related information is returned in two <a>Block</a> objects each of type <code>KEY_VALUE_SET</code>: a KEY Block object and a VALUE Block object. For example, <i>Name: Ana Silva Carolina</i> contains a key and value. <i>Name:</i> is the key. <i>Ana Silva Carolina</i> is the value.</p> </li> <li> <p>Table and table cell data. A TABLE Block object contains information about a detected table. A CELL Block object is returned for each cell in a table.</p> </li> <li> <p>Selectable elements such as checkboxes and radio buttons. A SELECTION_ELEMENT Block object contains information about a selectable element.</p> </li> <li> <p>Lines and words of text. A LINE Block object contains one or more WORD Block objects.</p> </li> </ul> <p>Use the <code>MaxResults</code> parameter to limit the number of blocks returned. If there are more results than specified in <code>MaxResults</code>, the value of <code>NextToken</code> in the operation response contains a pagination token for getting the next set of results. To get the next page of results, call <code>GetDocumentAnalysis</code>, and populate the <code>NextToken</code> request parameter with the token value that's returned from the previous call to <code>GetDocumentAnalysis</code>.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/textract/latest/dg/how-it-works-analyzing.html\">Document Text Analysis</a>.</p>"
+      "documentation":"<p>Gets the results for an Amazon Textract asynchronous operation that analyzes text in a document.</p> <p>You start asynchronous text analysis by calling <a>StartDocumentAnalysis</a>, which returns a job identifier (<code>JobId</code>). When the text analysis operation finishes, Amazon Textract publishes a completion status to the Amazon Simple Notification Service (Amazon SNS) topic that's registered in the initial call to <code>StartDocumentAnalysis</code>. To get the results of the text-detection operation, first check that the status value published to the Amazon SNS topic is <code>SUCCEEDED</code>. If so, call <code>GetDocumentAnalysis</code>, and pass the job identifier (<code>JobId</code>) from the initial call to <code>StartDocumentAnalysis</code>.</p> <p> <code>GetDocumentAnalysis</code> returns an array of <a>Block</a> objects. The following types of information are returned: </p> <ul> <li> <p>Form data (key-value pairs). The related information is returned in two <a>Block</a> objects, each of type <code>KEY_VALUE_SET</code>: a KEY <code>Block</code> object and a VALUE <code>Block</code> object. For example, <i>Name: Ana Silva Carolina</i> contains a key and value. <i>Name:</i> is the key. <i>Ana Silva Carolina</i> is the value.</p> </li> <li> <p>Table and table cell data. A TABLE <code>Block</code> object contains information about a detected table. A CELL <code>Block</code> object is returned for each cell in a table.</p> </li> <li> <p>Lines and words of text. A LINE <code>Block</code> object contains one or more WORD <code>Block</code> objects. All lines and words that are detected in the document are returned (including text that doesn't have a relationship with the value of the <code>StartDocumentAnalysis</code> <code>FeatureTypes</code> input parameter). </p> </li> </ul> <p>Selection elements such as check boxes and option buttons (radio buttons) can be detected in form data and in tables. A SELECTION_ELEMENT <code>Block</code> object contains information about a selection element, including the selection status.</p> <p>Use the <code>MaxResults</code> parameter to limit the number of blocks that are returned. If there are more results than specified in <code>MaxResults</code>, the value of <code>NextToken</code> in the operation response contains a pagination token for getting the next set of results. To get the next page of results, call <code>GetDocumentAnalysis</code>, and populate the <code>NextToken</code> request parameter with the token value that's returned from the previous call to <code>GetDocumentAnalysis</code>.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/textract/latest/dg/how-it-works-analyzing.html\">Document Text Analysis</a>.</p>"
     },
     "GetDocumentTextDetection":{
       "name":"GetDocumentTextDetection",
@@ -111,7 +112,7 @@
         {"shape":"ThrottlingException"},
         {"shape":"LimitExceededException"}
       ],
-      "documentation":"<p>Starts asynchronous analysis of an input document for relationships between detected items such as key and value pairs, tables, and selection elements.</p> <p> <code>StartDocumentAnalysis</code> can analyze text in documents that are in JPG, PNG, and PDF format. The documents are stored in an Amazon S3 bucket. Use <a>DocumentLocation</a> to specify the bucket name and file name of the document. </p> <p> <code>StartDocumentAnalysis</code> returns a job identifier (<code>JobId</code>) that you use to get the results of the operation. When text analysis is finished, Amazon Textract publishes a completion status to the Amazon Simple Notification Service (Amazon SNS) topic that you specify in <code>NotificationChannel</code>. To get the results of the text analysis operation, first check that the status value published to the Amazon SNS topic is <code>SUCCEEDED</code>. If so, call <a>GetDocumentAnalysis</a>, and pass the job identifier (<code>JobId</code>) from the initial call to <code>StartDocumentAnalysis</code>.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/textract/latest/dg/how-it-works-analyzing.html\">Document Text Analysis</a>.</p>"
+      "documentation":"<p>Starts the asynchronous analysis of an input document for relationships between detected items such as key-value pairs, tables, and selection elements.</p> <p> <code>StartDocumentAnalysis</code> can analyze text in documents that are in JPEG, PNG, and PDF format. The documents are stored in an Amazon S3 bucket. Use <a>DocumentLocation</a> to specify the bucket name and file name of the document. </p> <p> <code>StartDocumentAnalysis</code> returns a job identifier (<code>JobId</code>) that you use to get the results of the operation. When text analysis is finished, Amazon Textract publishes a completion status to the Amazon Simple Notification Service (Amazon SNS) topic that you specify in <code>NotificationChannel</code>. To get the results of the text analysis operation, first check that the status value published to the Amazon SNS topic is <code>SUCCEEDED</code>. If so, call <a>GetDocumentAnalysis</a>, and pass the job identifier (<code>JobId</code>) from the initial call to <code>StartDocumentAnalysis</code>.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/textract/latest/dg/how-it-works-analyzing.html\">Document Text Analysis</a>.</p>"
     },
     "StartDocumentTextDetection":{
       "name":"StartDocumentTextDetection",
@@ -134,7 +135,7 @@
         {"shape":"ThrottlingException"},
         {"shape":"LimitExceededException"}
       ],
-      "documentation":"<p>Starts the asynchronous detection of text in a document. Amazon Textract can detect lines of text and the words that make up a line of text.</p> <p> <code>StartDocumentTextDetection</code> can analyze text in documents that are in JPG, PNG, and PDF format. The documents are stored in an Amazon S3 bucket. Use <a>DocumentLocation</a> to specify the bucket name and file name of the document. </p> <p> <code>StartTextDetection</code> returns a job identifier (<code>JobId</code>) that you use to get the results of the operation. When text detection is finished, Amazon Textract publishes a completion status to the Amazon Simple Notification Service (Amazon SNS) topic that you specify in <code>NotificationChannel</code>. To get the results of the text detection operation, first check that the status value published to the Amazon SNS topic is <code>SUCCEEDED</code>. If so, call <a>GetDocumentTextDetection</a>, and pass the job identifier (<code>JobId</code>) from the initial call to <code>StartDocumentTextDetection</code>.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/textract/latest/dg/how-it-works-detecting.html\">Document Text Detection</a>.</p>"
+      "documentation":"<p>Starts the asynchronous detection of text in a document. Amazon Textract can detect lines of text and the words that make up a line of text.</p> <p> <code>StartDocumentTextDetection</code> can analyze text in documents that are in JPEG, PNG, and PDF format. The documents are stored in an Amazon S3 bucket. Use <a>DocumentLocation</a> to specify the bucket name and file name of the document. </p> <p> <code>StartTextDetection</code> returns a job identifier (<code>JobId</code>) that you use to get the results of the operation. When text detection is finished, Amazon Textract publishes a completion status to the Amazon Simple Notification Service (Amazon SNS) topic that you specify in <code>NotificationChannel</code>. To get the results of the text detection operation, first check that the status value published to the Amazon SNS topic is <code>SUCCEEDED</code>. If so, call <a>GetDocumentTextDetection</a>, and pass the job identifier (<code>JobId</code>) from the initial call to <code>StartDocumentTextDetection</code>.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/textract/latest/dg/how-it-works-detecting.html\">Document Text Detection</a>.</p>"
     }
   },
   "shapes":{
@@ -154,11 +155,15 @@
       "members":{
         "Document":{
           "shape":"Document",
-          "documentation":"<p>The input document as base64-encoded bytes or an Amazon S3 object. If you use the AWS CLI to call Amazon Textract operations, you can't pass image bytes. The document must be an image in JPG or PNG format.</p> <p>If you are using an AWS SDK to call Amazon Textract, you might not need to base64-encode image bytes passed using the <code>Bytes</code> field. </p>"
+          "documentation":"<p>The input document as base64-encoded bytes or an Amazon S3 object. If you use the AWS CLI to call Amazon Textract operations, you can't pass image bytes. The document must be an image in JPEG or PNG format.</p> <p>If you're using an AWS SDK to call Amazon Textract, you might not need to base64-encode image bytes that are passed using the <code>Bytes</code> field. </p>"
         },
         "FeatureTypes":{
           "shape":"FeatureTypes",
-          "documentation":"<p>A list of the types of analysis to perform. Add TABLES to the list to return information about the tables detected in the input document. Add FORMS to return detected fields and the associated text. To perform both types of analysis, add TABLES and FORMS to <code>FeatureTypes</code>.</p>"
+          "documentation":"<p>A list of the types of analysis to perform. Add TABLES to the list to return information about the tables that are detected in the input document. Add FORMS to return detected form data. To perform both types of analysis, add TABLES and FORMS to <code>FeatureTypes</code>. All lines and words detected in the document are included in the response (including text that isn't related to the value of <code>FeatureTypes</code>). </p>"
+        },
+        "HumanLoopConfig":{
+          "shape":"HumanLoopConfig",
+          "documentation":"<p>Sets the configuration for the human in the loop workflow for analyzing documents.</p>"
         }
       }
     },
@@ -171,7 +176,15 @@
         },
         "Blocks":{
           "shape":"BlockList",
-          "documentation":"<p>The text that's detected and analyzed by <code>AnalyzeDocument</code>.</p>"
+          "documentation":"<p>The items that are detected and analyzed by <code>AnalyzeDocument</code>.</p>"
+        },
+        "HumanLoopActivationOutput":{
+          "shape":"HumanLoopActivationOutput",
+          "documentation":"<p>Shows the results of the human in the loop evaluation.</p>"
+        },
+        "AnalyzeDocumentModelVersion":{
+          "shape":"String",
+          "documentation":"<p>The version of the model used to analyze the document.</p>"
         }
       }
     },
@@ -187,11 +200,11 @@
       "members":{
         "BlockType":{
           "shape":"BlockType",
-          "documentation":"<p>The type of text that's recognized in a block. In text-detection operations, the following types are returned:</p> <ul> <li> <p> <i>PAGE</i> - Contains a list of the LINE Block objects that are detected on a document page.</p> </li> <li> <p> <i>WORD</i> - A word detected on a document page. A word is one or more ISO basic Latin script characters that aren't separated by spaces.</p> </li> <li> <p> <i>LINE</i> - A string of tab-delimited, contiguous words that's detected on a document page.</p> </li> </ul> <p>In text analysis operations, the following types are returned:</p> <ul> <li> <p> <i>PAGE</i> - Contains a list of child Block objects that are detected on a document page.</p> </li> <li> <p> <i>KEY_VALUE_SET</i> - Stores the KEY and VALUE Block objects for a field that's detected on a document page. Use the <code>EntityType</code> field to determine if a KEY_VALUE_SET object is a KEY Block object or a VALUE Block object. </p> </li> <li> <p> <i>WORD</i> - A word detected on a document page. A word is one or more ISO basic Latin script characters that aren't separated by spaces that's detected on a document page.</p> </li> <li> <p> <i>LINE</i> - A string of tab-delimited, contiguous words that's detected on a document page.</p> </li> <li> <p> <i>TABLE</i> - A table that's detected on a document page. A table is any grid-based information with 2 or more rows or columns with a cell span of 1 row and 1 column each. </p> </li> <li> <p> <i>CELL</i> - A cell within a detected table. The cell is the parent of the block that contains the text in the cell.</p> </li> <li> <p> <i>SELECTION_ELEMENT</i> - A selectable element such as a radio button or checkbox that's detected on a document page. Use the value of <code>SelectionStatus</code> to determine the status of the selection element.</p> </li> </ul>"
+          "documentation":"<p>The type of text item that's recognized. In operations for text detection, the following types are returned:</p> <ul> <li> <p> <i>PAGE</i> - Contains a list of the LINE <code>Block</code> objects that are detected on a document page.</p> </li> <li> <p> <i>WORD</i> - A word detected on a document page. A word is one or more ISO basic Latin script characters that aren't separated by spaces.</p> </li> <li> <p> <i>LINE</i> - A string of tab-delimited, contiguous words that are detected on a document page.</p> </li> </ul> <p>In text analysis operations, the following types are returned:</p> <ul> <li> <p> <i>PAGE</i> - Contains a list of child <code>Block</code> objects that are detected on a document page.</p> </li> <li> <p> <i>KEY_VALUE_SET</i> - Stores the KEY and VALUE <code>Block</code> objects for linked text that's detected on a document page. Use the <code>EntityType</code> field to determine if a KEY_VALUE_SET object is a KEY <code>Block</code> object or a VALUE <code>Block</code> object. </p> </li> <li> <p> <i>WORD</i> - A word that's detected on a document page. A word is one or more ISO basic Latin script characters that aren't separated by spaces.</p> </li> <li> <p> <i>LINE</i> - A string of tab-delimited, contiguous words that are detected on a document page.</p> </li> <li> <p> <i>TABLE</i> - A table that's detected on a document page. A table is grid-based information with two or more rows or columns, with a cell span of one row and one column each. </p> </li> <li> <p> <i>CELL</i> - A cell within a detected table. The cell is the parent of the block that contains the text in the cell.</p> </li> <li> <p> <i>SELECTION_ELEMENT</i> - A selection element such as an option button (radio button) or a check box that's detected on a document page. Use the value of <code>SelectionStatus</code> to determine the status of the selection element.</p> </li> </ul>"
         },
         "Confidence":{
           "shape":"Percent",
-          "documentation":"<p>The confidence that Amazon Textract has in the accuracy of the recognized text and the accuracy of the geometry points around the recognized text.</p>"
+          "documentation":"<p>The confidence score that Amazon Textract has in the accuracy of the recognized text and the accuracy of the geometry points around the recognized text.</p>"
         },
         "Text":{
           "shape":"String",
@@ -207,11 +220,11 @@
         },
         "RowSpan":{
           "shape":"UInteger",
-          "documentation":"<p>The number of rows that a table spans. <code>RowSpan</code> isn't returned by <code>DetectDocumentText</code> and <code>GetDocumentTextDetection</code>.</p>"
+          "documentation":"<p>The number of rows that a table cell spans. Currently this value is always 1, even if the number of rows spanned is greater than 1. <code>RowSpan</code> isn't returned by <code>DetectDocumentText</code> and <code>GetDocumentTextDetection</code>.</p>"
         },
         "ColumnSpan":{
           "shape":"UInteger",
-          "documentation":"<p>The number of columns that a table cell spans. <code>ColumnSpan</code> isn't returned by <code>DetectDocumentText</code> and <code>GetDocumentTextDetection</code>. </p>"
+          "documentation":"<p>The number of columns that a table cell spans. Currently this value is always 1, even if the number of columns spanned is greater than 1. <code>ColumnSpan</code> isn't returned by <code>DetectDocumentText</code> and <code>GetDocumentTextDetection</code>. </p>"
         },
         "Geometry":{
           "shape":"Geometry",
@@ -223,7 +236,7 @@
         },
         "Relationships":{
           "shape":"RelationshipList",
-          "documentation":"<p>A list of child blocks of the current block. For example a LINE object has child blocks for each WORD block that's part of the line of text. There aren't Relationship objects in the list for relationships that don't exist, such as when the current block has no child blocks. The list size can be the following:</p> <ul> <li> <p>0 - The block has no child blocks.</p> </li> <li> <p>1 - The block has child blocks.</p> </li> </ul>"
+          "documentation":"<p>A list of child blocks of the current block. For example, a LINE object has child blocks for each WORD block that's part of the line of text. There aren't Relationship objects in the list for relationships that don't exist, such as when the current block has no child blocks. The list size can be the following:</p> <ul> <li> <p>0 - The block has no child blocks.</p> </li> <li> <p>1 - The block has child blocks.</p> </li> </ul>"
         },
         "EntityTypes":{
           "shape":"EntityTypes",
@@ -231,14 +244,14 @@
         },
         "SelectionStatus":{
           "shape":"SelectionStatus",
-          "documentation":"<p>The selection status of a selectable element such as a radio button or checkbox. </p>"
+          "documentation":"<p>The selection status of a selection element, such as an option button or check box. </p>"
         },
         "Page":{
           "shape":"UInteger",
-          "documentation":"<p>The page in which a block was detected. <code>Page</code> is returned by asynchronous operations. Page values greater than 1 are only returned for multi-page documents that are in PDF format. A scanned image (JPG/PNG), even if it contains multiple document pages, is always considered to be a single-page document and the value of <code>Page</code> is always 1. Synchronous operations don't return <code>Page</code> as every input document is considered to be a single-page document.</p>"
+          "documentation":"<p>The page on which a block was detected. <code>Page</code> is returned by asynchronous operations. Page values greater than 1 are only returned for multipage documents that are in PDF format. A scanned image (JPEG/PNG), even if it contains multiple document pages, is considered to be a single-page document. The value of <code>Page</code> is always 1. Synchronous operations don't return <code>Page</code> because every input document is considered to be a single-page document.</p>"
         }
       },
-      "documentation":"<p>A <code>Block</code> represents items that are recognized in a document within a group of pixels close to each other. The information returned in a <code>Block</code> depends on the type of operation. In document-text detection (for example <a>DetectDocumentText</a>), you get information about the detected words and lines of text. In text analysis (for example <a>AnalyzeDocument</a>), you can also get information about the fields, tables and selection elements that are detected in the document.</p> <p>An array of <code>Block</code> objects is returned by both synchronous and asynchronous operations. In synchronous operations, such as <a>DetectDocumentText</a>, the array of <code>Block</code> objects is the entire set of results. In asynchronous operations, such as <a>GetDocumentAnalysis</a>, the array is returned over one or more responses.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/textract/latest/dg/how-it-works.html\">How Amazon Textract Works</a>.</p>"
+      "documentation":"<p>A <code>Block</code> represents items that are recognized in a document within a group of pixels close to each other. The information returned in a <code>Block</code> object depends on the type of operation. In text detection for documents (for example <a>DetectDocumentText</a>), you get information about the detected words and lines of text. In text analysis (for example <a>AnalyzeDocument</a>), you can also get information about the fields, tables, and selection elements that are detected in the document.</p> <p>An array of <code>Block</code> objects is returned by both synchronous and asynchronous operations. In synchronous operations, such as <a>DetectDocumentText</a>, the array of <code>Block</code> objects is the entire set of results. In asynchronous operations, such as <a>GetDocumentAnalysis</a>, the array is returned over one or more responses.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/textract/latest/dg/how-it-works.html\">How Amazon Textract Works</a>.</p>"
     },
     "BlockList":{
       "type":"list",
@@ -276,7 +289,7 @@
           "documentation":"<p>The top coordinate of the bounding box as a ratio of overall document page height.</p>"
         }
       },
-      "documentation":"<p>The bounding box around the recognized text, key, value, table or table cell on a document page. The <code>left</code> (x-coordinate) and <code>top</code> (y-coordinate) are coordinates that represent the top and left sides of the bounding box. Note that the upper-left corner of the image is the origin (0,0). </p> <p>The <code>top</code> and <code>left</code> values returned are ratios of the overall document page size. For example, if the input image is 700 x 200 pixels, and the top-left coordinate of the bounding box is 350 x 50 pixels, the API returns a <code>left</code> value of 0.5 (350/700) and a <code>top</code> value of 0.25 (50/200).</p> <p>The <code>width</code> and <code>height</code> values represent the dimensions of the bounding box as a ratio of the overall document page dimension. For example, if the document page size is 700 x 200 pixels, and the bounding box width is 70 pixels, the width returned is 0.1. </p>"
+      "documentation":"<p>The bounding box around the detected page, text, key-value pair, table, table cell, or selection element on a document page. The <code>left</code> (x-coordinate) and <code>top</code> (y-coordinate) are coordinates that represent the top and left sides of the bounding box. Note that the upper-left corner of the image is the origin (0,0). </p> <p>The <code>top</code> and <code>left</code> values returned are ratios of the overall document page size. For example, if the input image is 700 x 200 pixels, and the top-left coordinate of the bounding box is 350 x 50 pixels, the API returns a <code>left</code> value of 0.5 (350/700) and a <code>top</code> value of 0.25 (50/200).</p> <p>The <code>width</code> and <code>height</code> values represent the dimensions of the bounding box as a ratio of the overall document page dimension. For example, if the document page size is 700 x 200 pixels, and the bounding box width is 70 pixels, the width returned is 0.1. </p>"
     },
     "ClientRequestToken":{
       "type":"string",
@@ -284,13 +297,25 @@
       "min":1,
       "pattern":"^[a-zA-Z0-9-_]+$"
     },
+    "ContentClassifier":{
+      "type":"string",
+      "enum":[
+        "FreeOfPersonallyIdentifiableInformation",
+        "FreeOfAdultContent"
+      ]
+    },
+    "ContentClassifiers":{
+      "type":"list",
+      "member":{"shape":"ContentClassifier"},
+      "max":256
+    },
     "DetectDocumentTextRequest":{
       "type":"structure",
       "required":["Document"],
       "members":{
         "Document":{
           "shape":"Document",
-          "documentation":"<p>The input document as base64-encoded bytes or an Amazon S3 object. If you use the AWS CLI to call Amazon Textract operations, you can't pass image bytes. The document must be an image in JPG or PNG format.</p> <p>If you are using an AWS SDK to call Amazon Textract, you might not need to base64-encode image bytes passed using the <code>Bytes</code> field. </p>"
+          "documentation":"<p>The input document as base64-encoded bytes or an Amazon S3 object. If you use the AWS CLI to call Amazon Textract operations, you can't pass image bytes. The document must be an image in JPEG or PNG format.</p> <p>If you're using an AWS SDK to call Amazon Textract, you might not need to base64-encode image bytes that are passed using the <code>Bytes</code> field. </p>"
         }
       }
     },
@@ -299,11 +324,15 @@
       "members":{
         "DocumentMetadata":{
           "shape":"DocumentMetadata",
-          "documentation":"<p>Metadata about the document. Contains the number of pages that are detected in the document.</p>"
+          "documentation":"<p>Metadata about the document. It contains the number of pages that are detected in the document.</p>"
         },
         "Blocks":{
           "shape":"BlockList",
-          "documentation":"<p>An array of Block objects containing the text detected in the document.</p>"
+          "documentation":"<p>An array of <code>Block</code> objects that contain the text that's detected in the document.</p>"
+        },
+        "DetectDocumentTextModelVersion":{
+          "shape":"String",
+          "documentation":"<p/>"
         }
       }
     },
@@ -312,11 +341,11 @@
       "members":{
         "Bytes":{
           "shape":"ImageBlob",
-          "documentation":"<p>A blob of base-64 encoded documents bytes. The maximum size of a document that's provided in a blob of bytes is 5 MB. The document bytes must be in PNG or JPG format.</p> <p>If you are using an AWS SDK to call Amazon Textract, you might not need to base64-encode image bytes passed using the <code>Bytes</code> field. </p>"
+          "documentation":"<p>A blob of base64-encoded document bytes. The maximum size of a document that's provided in a blob of bytes is 5 MB. The document bytes must be in PNG or JPEG format.</p> <p>If you're using an AWS SDK to call Amazon Textract, you might not need to base64-encode image bytes passed using the <code>Bytes</code> field. </p>"
         },
         "S3Object":{
           "shape":"S3Object",
-          "documentation":"<p>Identifies an S3 object as the document source. The maximum size of a document stored in an S3 bucket is 5 MB.</p>"
+          "documentation":"<p>Identifies an S3 object as the document source. The maximum size of a document that's stored in an S3 bucket is 5 MB.</p>"
         }
       },
       "documentation":"<p>The input document, either as bytes or as an S3 object.</p> <p>You pass image bytes to an Amazon Textract API operation by using the <code>Bytes</code> property. For example, you would use the <code>Bytes</code> property to pass a document loaded from a local file system. Image bytes passed by using the <code>Bytes</code> property must be base64 encoded. Your code might not need to encode document file bytes if you're using an AWS SDK to call Amazon Textract API operations. </p> <p>You pass images stored in an S3 bucket to an Amazon Textract API operation by using the <code>S3Object</code> property. Documents stored in an S3 bucket don't need to be base64 encoded.</p> <p>The AWS Region for the S3 bucket that contains the S3 object must match the AWS Region that you use for Amazon Textract operations.</p> <p>If you use the AWS CLI to call Amazon Textract operations, passing image bytes using the Bytes property isn't supported. You must first upload the document to an Amazon S3 bucket, and then call the operation using the S3Object property.</p> <p>For Amazon Textract to process an S3 object, the user must have permission to access the S3 object. </p>"
@@ -329,14 +358,14 @@
           "documentation":"<p>The Amazon S3 bucket that contains the input document.</p>"
         }
       },
-      "documentation":"<p>The Amazon S3 bucket that contains the document to be processed. It's used by asynchronous operations such as <a>StartDocumentTextDetection</a>.</p> <p>The input document can be an image file in JPG or PNG format. It can also be a file in PDF format.</p>"
+      "documentation":"<p>The Amazon S3 bucket that contains the document to be processed. It's used by asynchronous operations such as <a>StartDocumentTextDetection</a>.</p> <p>The input document can be an image file in JPEG or PNG format. It can also be a file in PDF format.</p>"
     },
     "DocumentMetadata":{
       "type":"structure",
       "members":{
         "Pages":{
           "shape":"UInteger",
-          "documentation":"<p>The number of pages detected in the document.</p>"
+          "documentation":"<p>The number of pages that are detected in the document.</p>"
         }
       },
       "documentation":"<p>Information about the input document.</p>"
@@ -345,7 +374,7 @@
       "type":"structure",
       "members":{
       },
-      "documentation":"<p>The document can't be processed because it's too large. The maximum document size for synchronous operations 5 MB. The maximum document size for asynchronous operations is 500 MB for PDF format files.</p>",
+      "documentation":"<p>The document can't be processed because it's too large. The maximum document size for synchronous operations 5 MB. The maximum document size for asynchronous operations is 500 MB for PDF files.</p>",
       "exception":true
     },
     "EntityType":{
@@ -372,19 +401,23 @@
       "member":{"shape":"FeatureType"}
     },
     "Float":{"type":"float"},
+    "FlowDefinitionArn":{
+      "type":"string",
+      "max":256
+    },
     "Geometry":{
       "type":"structure",
       "members":{
         "BoundingBox":{
           "shape":"BoundingBox",
-          "documentation":"<p>An axis-aligned coarse representation of the location of the recognized text on the document page.</p>"
+          "documentation":"<p>An axis-aligned coarse representation of the location of the recognized item on the document page.</p>"
         },
         "Polygon":{
           "shape":"Polygon",
-          "documentation":"<p>Within the bounding box, a fine-grained polygon around the recognized text.</p>"
+          "documentation":"<p>Within the bounding box, a fine-grained polygon around the recognized item.</p>"
         }
       },
-      "documentation":"<p>Information about where a recognized text, key, value, table, or table cell is located on a document page.</p>"
+      "documentation":"<p>Information about where the following items are located on a document page: detected page, text, key-value pairs, tables, table cells, and selection elements.</p>"
     },
     "GetDocumentAnalysisRequest":{
       "type":"structure",
@@ -392,7 +425,7 @@
       "members":{
         "JobId":{
           "shape":"JobId",
-          "documentation":"<p>A unique identifier for the text-detection job. The <code>JobId</code> is returned from <code>StartDocumentAnalysis</code>.</p>"
+          "documentation":"<p>A unique identifier for the text-detection job. The <code>JobId</code> is returned from <code>StartDocumentAnalysis</code>. A <code>JobId</code> value is only valid for 7 days.</p>"
         },
         "MaxResults":{
           "shape":"MaxResults",
@@ -421,15 +454,19 @@
         },
         "Blocks":{
           "shape":"BlockList",
-          "documentation":"<p>The results of the text analysis operation.</p>"
+          "documentation":"<p>The results of the text-analysis operation.</p>"
         },
         "Warnings":{
           "shape":"Warnings",
-          "documentation":"<p>A list of warnings that occurred during the document analysis operation.</p>"
+          "documentation":"<p>A list of warnings that occurred during the document-analysis operation.</p>"
         },
         "StatusMessage":{
           "shape":"StatusMessage",
-          "documentation":"<p>The current status of an asynchronous document analysis operation.</p>"
+          "documentation":"<p>The current status of an asynchronous document-analysis operation.</p>"
+        },
+        "AnalyzeDocumentModelVersion":{
+          "shape":"String",
+          "documentation":"<p/>"
         }
       }
     },
@@ -439,7 +476,7 @@
       "members":{
         "JobId":{
           "shape":"JobId",
-          "documentation":"<p>A unique identifier for the text detection job. The <code>JobId</code> is returned from <code>StartDocumentTextDetection</code>.</p>"
+          "documentation":"<p>A unique identifier for the text detection job. The <code>JobId</code> is returned from <code>StartDocumentTextDetection</code>. A <code>JobId</code> value is only valid for 7 days.</p>"
         },
         "MaxResults":{
           "shape":"MaxResults",
@@ -472,14 +509,99 @@
         },
         "Warnings":{
           "shape":"Warnings",
-          "documentation":"<p>A list of warnings that occurred during the document text-detection operation.</p>"
+          "documentation":"<p>A list of warnings that occurred during the text-detection operation for the document.</p>"
         },
         "StatusMessage":{
           "shape":"StatusMessage",
-          "documentation":"<p>The current status of an asynchronous document text-detection operation. </p>"
+          "documentation":"<p>The current status of an asynchronous text-detection operation for the document. </p>"
+        },
+        "DetectDocumentTextModelVersion":{
+          "shape":"String",
+          "documentation":"<p/>"
         }
       }
     },
+    "HumanLoopActivationConditionsEvaluationResults":{
+      "type":"string",
+      "max":10240
+    },
+    "HumanLoopActivationOutput":{
+      "type":"structure",
+      "members":{
+        "HumanLoopArn":{
+          "shape":"HumanLoopArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the HumanLoop created.</p>"
+        },
+        "HumanLoopActivationReasons":{
+          "shape":"HumanLoopActivationReasons",
+          "documentation":"<p>Shows if and why human review was needed.</p>"
+        },
+        "HumanLoopActivationConditionsEvaluationResults":{
+          "shape":"HumanLoopActivationConditionsEvaluationResults",
+          "documentation":"<p>Shows the result of condition evaluations, including those conditions which activated a human review.</p>",
+          "jsonvalue":true
+        }
+      },
+      "documentation":"<p>Shows the results of the human in the loop evaluation. If there is no HumanLoopArn, the input did not trigger human review.</p>"
+    },
+    "HumanLoopActivationReason":{"type":"string"},
+    "HumanLoopActivationReasons":{
+      "type":"list",
+      "member":{"shape":"HumanLoopActivationReason"},
+      "min":1
+    },
+    "HumanLoopArn":{
+      "type":"string",
+      "max":256
+    },
+    "HumanLoopConfig":{
+      "type":"structure",
+      "required":[
+        "HumanLoopName",
+        "FlowDefinitionArn"
+      ],
+      "members":{
+        "HumanLoopName":{
+          "shape":"HumanLoopName",
+          "documentation":"<p>The name of the human workflow used for this image. This should be kept unique within a region.</p>"
+        },
+        "FlowDefinitionArn":{
+          "shape":"FlowDefinitionArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the flow definition.</p>"
+        },
+        "DataAttributes":{
+          "shape":"HumanLoopDataAttributes",
+          "documentation":"<p>Sets attributes of the input data.</p>"
+        }
+      },
+      "documentation":"<p>Sets up the human review workflow the document will be sent to if one of the conditions is met. You can also set certain attributes of the image before review. </p>"
+    },
+    "HumanLoopDataAttributes":{
+      "type":"structure",
+      "members":{
+        "ContentClassifiers":{
+          "shape":"ContentClassifiers",
+          "documentation":"<p>Sets whether the input image is free of personally identifiable information or adult content.</p>"
+        }
+      },
+      "documentation":"<p>Allows you to set attributes of the image. Currently, you can declare an image as free of personally identifiable information and adult content. </p>"
+    },
+    "HumanLoopName":{
+      "type":"string",
+      "max":63,
+      "min":1,
+      "pattern":"^[a-z0-9](-*[a-z0-9])*"
+    },
+    "HumanLoopQuotaExceededException":{
+      "type":"structure",
+      "members":{
+        "ResourceType":{"shape":"String"},
+        "QuotaCode":{"shape":"String"},
+        "ServiceCode":{"shape":"String"}
+      },
+      "documentation":"<p>Indicates you have exceeded the maximum number of active human in the loop workflows available</p>",
+      "exception":true
+    },
     "IdList":{
       "type":"list",
       "member":{"shape":"NonEmptyString"}
@@ -493,7 +615,7 @@
     },
     "ImageBlob":{
       "type":"blob",
-      "max":5242880,
+      "max":10485760,
       "min":1
     },
     "InternalServerError":{
@@ -606,7 +728,7 @@
           "documentation":"<p>The value of the Y coordinate for a point on a <code>Polygon</code>.</p>"
         }
       },
-      "documentation":"<p>The X and Y coordinates of a point on a document page. The X and Y values returned are ratios of the overall document page size. For example, if the input document is 700 x 200 and the operation returns X=0.5 and Y=0.25, then the point is at the (350,50) pixel coordinate on the document page.</p> <p>An array of <code>Point</code> objects, <code>Polygon</code>, is returned by <a>DetectDocumentText</a>. <code>Polygon</code> represents a fine-grained polygon around detected text. For more information, see Geometry in the Amazon Textract Developer Guide. </p>"
+      "documentation":"<p>The X and Y coordinates of a point on a document page. The X and Y values that are returned are ratios of the overall document page size. For example, if the input document is 700 x 200 and the operation returns X=0.5 and Y=0.25, then the point is at the (350,50) pixel coordinate on the document page.</p> <p>An array of <code>Point</code> objects, <code>Polygon</code>, is returned by <a>DetectDocumentText</a>. <code>Polygon</code> represents a fine-grained polygon around detected text. For more information, see Geometry in the Amazon Textract Developer Guide. </p>"
     },
     "Polygon":{
       "type":"list",
@@ -624,7 +746,7 @@
       "members":{
         "Type":{
           "shape":"RelationshipType",
-          "documentation":"<p>The type of relationship that the blocks in the IDs array have with the current block. The relationship can be <code>VALUE</code> or <code>CHILD</code>.</p>"
+          "documentation":"<p>The type of relationship that the blocks in the IDs array have with the current block. The relationship can be <code>VALUE</code> or <code>CHILD</code>. A relationship of type VALUE is a list that contains the ID of the VALUE block that's associated with the KEY of a key-value pair. A relationship of type CHILD is a list of IDs that identify WORD blocks.</p>"
         },
         "Ids":{
           "shape":"IdList",
@@ -665,7 +787,7 @@
         },
         "Name":{
           "shape":"S3ObjectName",
-          "documentation":"<p>The file name of the input document. It must be an image file (.JPG or .PNG format). Asynchronous operations also support PDF files.</p>"
+          "documentation":"<p>The file name of the input document. Synchronous operations can use image files that are in JPEG or PNG format. Asynchronous operations also support PDF format files.</p>"
         },
         "Version":{
           "shape":"S3ObjectVersion",
@@ -712,15 +834,15 @@
         },
         "FeatureTypes":{
           "shape":"FeatureTypes",
-          "documentation":"<p>A list of the types of analysis to perform. Add TABLES to the list to return information about the tables that are detected in the input document. Add FORMS to return detected fields and the associated text. To perform both types of analysis, add TABLES and FORMS to <code>FeatureTypes</code>. All selectable elements (<code>SELECTION_ELEMENT</code>) that are detected are returned, whatever the value of <code>FeatureTypes</code>. </p>"
+          "documentation":"<p>A list of the types of analysis to perform. Add TABLES to the list to return information about the tables that are detected in the input document. Add FORMS to return detected form data. To perform both types of analysis, add TABLES and FORMS to <code>FeatureTypes</code>. All lines and words detected in the document are included in the response (including text that isn't related to the value of <code>FeatureTypes</code>). </p>"
         },
         "ClientRequestToken":{
           "shape":"ClientRequestToken",
-          "documentation":"<p>The idempotent token that you use to identify the start request. If you use the same token with multiple <code>StartDocumentAnalysis</code> requests, the same <code>JobId</code> is returned. Use <code>ClientRequestToken</code> to prevent the same job from being accidentally started more than once. </p>"
+          "documentation":"<p>The idempotent token that you use to identify the start request. If you use the same token with multiple <code>StartDocumentAnalysis</code> requests, the same <code>JobId</code> is returned. Use <code>ClientRequestToken</code> to prevent the same job from being accidentally started more than once. For more information, see <a href=\"https://docs.aws.amazon.com/textract/latest/dg/api-async.html\">Calling Amazon Textract Asynchronous Operations</a>.</p>"
         },
         "JobTag":{
           "shape":"JobTag",
-          "documentation":"<p>An identifier you specify that's included in the completion notification that's published to the Amazon SNS topic. For example, you can use <code>JobTag</code> to identify the type of document, such as a tax form or a receipt, that the completion notification corresponds to.</p>"
+          "documentation":"<p>An identifier that you specify that's included in the completion notification published to the Amazon SNS topic. For example, you can use <code>JobTag</code> to identify the type of document that the completion notification corresponds to (such as a tax form or a receipt).</p>"
         },
         "NotificationChannel":{
           "shape":"NotificationChannel",
@@ -733,7 +855,7 @@
       "members":{
         "JobId":{
           "shape":"JobId",
-          "documentation":"<p>The identifier for the document text detection job. Use <code>JobId</code> to identify the job in a subsequent call to <code>GetDocumentAnalysis</code>.</p>"
+          "documentation":"<p>The identifier for the document text detection job. Use <code>JobId</code> to identify the job in a subsequent call to <code>GetDocumentAnalysis</code>. A <code>JobId</code> value is only valid for 7 days.</p>"
         }
       }
     },
@@ -747,11 +869,11 @@
         },
         "ClientRequestToken":{
           "shape":"ClientRequestToken",
-          "documentation":"<p>The idempotent token that's used to identify the start request. If you use the same token with multiple <code>StartDocumentTextDetection</code> requests, the same <code>JobId</code> is returned. Use <code>ClientRequestToken</code> to prevent the same job from being accidentally started more than once. </p>"
+          "documentation":"<p>The idempotent token that's used to identify the start request. If you use the same token with multiple <code>StartDocumentTextDetection</code> requests, the same <code>JobId</code> is returned. Use <code>ClientRequestToken</code> to prevent the same job from being accidentally started more than once. For more information, see <a href=\"https://docs.aws.amazon.com/textract/latest/dg/api-async.html\">Calling Amazon Textract Asynchronous Operations</a>.</p>"
         },
         "JobTag":{
           "shape":"JobTag",
-          "documentation":"<p>An identifier you specify that's included in the completion notification that's published to the Amazon SNS topic. For example, you can use <code>JobTag</code> to identify the type of document, such as a tax form or a receipt, that the completion notification corresponds to.</p>"
+          "documentation":"<p>An identifier that you specify that's included in the completion notification published to the Amazon SNS topic. For example, you can use <code>JobTag</code> to identify the type of document that the completion notification corresponds to (such as a tax form or a receipt).</p>"
         },
         "NotificationChannel":{
           "shape":"NotificationChannel",
@@ -764,7 +886,7 @@
       "members":{
         "JobId":{
           "shape":"JobId",
-          "documentation":"<p>The identifier for the document text-detection job. Use <code>JobId</code> to identify the job in a subsequent call to <code>GetDocumentTextDetection</code>.</p>"
+          "documentation":"<p>The identifier of the text detection job for the document. Use <code>JobId</code> to identify the job in a subsequent call to <code>GetDocumentTextDetection</code>. A <code>JobId</code> value is only valid for 7 days.</p>"
         }
       }
     },
@@ -786,7 +908,7 @@
       "type":"structure",
       "members":{
       },
-      "documentation":"<p>The format of the input document isn't supported. Amazon Textract supports documents that are .png or .jpg format.</p>",
+      "documentation":"<p>The format of the input document isn't supported. Documents for synchronous operations can be in PNG or JPEG format. Documents for asynchronous operations can also be in PDF format.</p>",
       "exception":true
     },
     "Warning":{
@@ -801,7 +923,7 @@
           "documentation":"<p>A list of the pages that the warning applies to.</p>"
         }
       },
-      "documentation":"<p>A warning about an issue that occurred during asynchronous text analysis (<a>StartDocumentAnalysis</a>) or asynchronous document-text detection (<a>StartDocumentTextDetection</a>). </p>"
+      "documentation":"<p>A warning about an issue that occurred during asynchronous text analysis (<a>StartDocumentAnalysis</a>) or asynchronous document text detection (<a>StartDocumentTextDetection</a>). </p>"
     },
     "Warnings":{
       "type":"list",
diff --git a/services/transcribe/pom.xml b/services/transcribe/pom.xml
index eb61a84b7fa3..d591d7e7a95e 100644
--- a/services/transcribe/pom.xml
+++ b/services/transcribe/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>transcribe</artifactId>
     <name>AWS Java SDK :: Services :: Transcribe</name>
diff --git a/services/transcribe/src/main/resources/codegen-resources/paginators-1.json b/services/transcribe/src/main/resources/codegen-resources/paginators-1.json
index cdf0f1f38bda..aded8e376efe 100644
--- a/services/transcribe/src/main/resources/codegen-resources/paginators-1.json
+++ b/services/transcribe/src/main/resources/codegen-resources/paginators-1.json
@@ -9,6 +9,11 @@
       "input_token": "NextToken",
       "output_token": "NextToken",
       "limit_key": "MaxResults"
+    },
+    "ListVocabularyFilters": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "MaxResults"
     }
   }
 }
diff --git a/services/transcribe/src/main/resources/codegen-resources/service-2.json b/services/transcribe/src/main/resources/codegen-resources/service-2.json
index fbd5f99a0f72..fc8743b79d19 100644
--- a/services/transcribe/src/main/resources/codegen-resources/service-2.json
+++ b/services/transcribe/src/main/resources/codegen-resources/service-2.json
@@ -29,6 +29,22 @@
       ],
       "documentation":"<p>Creates a new custom vocabulary that you can use to change the way Amazon Transcribe handles transcription of an audio file. </p>"
     },
+    "CreateVocabularyFilter":{
+      "name":"CreateVocabularyFilter",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"CreateVocabularyFilterRequest"},
+      "output":{"shape":"CreateVocabularyFilterResponse"},
+      "errors":[
+        {"shape":"BadRequestException"},
+        {"shape":"LimitExceededException"},
+        {"shape":"InternalFailureException"},
+        {"shape":"ConflictException"}
+      ],
+      "documentation":"<p>Creates a new vocabulary filter that you can use to filter words, such as profane words, from the output of a transcription job.</p>"
+    },
     "DeleteTranscriptionJob":{
       "name":"DeleteTranscriptionJob",
       "http":{
@@ -58,6 +74,21 @@
       ],
       "documentation":"<p>Deletes a vocabulary from Amazon Transcribe. </p>"
     },
+    "DeleteVocabularyFilter":{
+      "name":"DeleteVocabularyFilter",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DeleteVocabularyFilterRequest"},
+      "errors":[
+        {"shape":"NotFoundException"},
+        {"shape":"LimitExceededException"},
+        {"shape":"BadRequestException"},
+        {"shape":"InternalFailureException"}
+      ],
+      "documentation":"<p>Removes a vocabulary filter.</p>"
+    },
     "GetTranscriptionJob":{
       "name":"GetTranscriptionJob",
       "http":{
@@ -72,7 +103,7 @@
         {"shape":"InternalFailureException"},
         {"shape":"NotFoundException"}
       ],
-      "documentation":"<p>Returns information about a transcription job. To see the status of the job, check the <code>TranscriptionJobStatus</code> field. If the status is <code>COMPLETED</code>, the job is finished and you can find the results at the location specified in the <code>TranscriptionFileUri</code> field.</p>"
+      "documentation":"<p>Returns information about a transcription job. To see the status of the job, check the <code>TranscriptionJobStatus</code> field. If the status is <code>COMPLETED</code>, the job is finished and you can find the results at the location specified in the <code>TranscriptFileUri</code> field. If you enable content redaction, the redacted transcript appears in <code>RedactedTranscriptFileUri</code>.</p>"
     },
     "GetVocabulary":{
       "name":"GetVocabulary",
@@ -90,6 +121,22 @@
       ],
       "documentation":"<p>Gets information about a vocabulary. </p>"
     },
+    "GetVocabularyFilter":{
+      "name":"GetVocabularyFilter",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"GetVocabularyFilterRequest"},
+      "output":{"shape":"GetVocabularyFilterResponse"},
+      "errors":[
+        {"shape":"NotFoundException"},
+        {"shape":"LimitExceededException"},
+        {"shape":"InternalFailureException"},
+        {"shape":"BadRequestException"}
+      ],
+      "documentation":"<p>Returns information about a vocabulary filter.</p>"
+    },
     "ListTranscriptionJobs":{
       "name":"ListTranscriptionJobs",
       "http":{
@@ -120,6 +167,21 @@
       ],
       "documentation":"<p>Returns a list of vocabularies that match the specified criteria. If no criteria are specified, returns the entire list of vocabularies.</p>"
     },
+    "ListVocabularyFilters":{
+      "name":"ListVocabularyFilters",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"ListVocabularyFiltersRequest"},
+      "output":{"shape":"ListVocabularyFiltersResponse"},
+      "errors":[
+        {"shape":"BadRequestException"},
+        {"shape":"LimitExceededException"},
+        {"shape":"InternalFailureException"}
+      ],
+      "documentation":"<p>Gets information about vocabulary filters.</p>"
+    },
     "StartTranscriptionJob":{
       "name":"StartTranscriptionJob",
       "http":{
@@ -152,6 +214,22 @@
         {"shape":"ConflictException"}
       ],
       "documentation":"<p>Updates an existing vocabulary with new values. The <code>UpdateVocabulary</code> operation overwrites all of the existing information with the values that you provide in the request. </p>"
+    },
+    "UpdateVocabularyFilter":{
+      "name":"UpdateVocabularyFilter",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"UpdateVocabularyFilterRequest"},
+      "output":{"shape":"UpdateVocabularyFilterResponse"},
+      "errors":[
+        {"shape":"BadRequestException"},
+        {"shape":"LimitExceededException"},
+        {"shape":"InternalFailureException"},
+        {"shape":"NotFoundException"}
+      ],
+      "documentation":"<p>Updates a vocabulary filter with a new list of filtered words.</p>"
     }
   },
   "shapes":{
@@ -169,9 +247,69 @@
       "members":{
         "Message":{"shape":"String"}
       },
-      "documentation":"<p>When you are using the <code>StartTranscriptionJob</code> operation, the <code>JobName</code> field is a duplicate of a previously entered job name. Resend your request with a different name.</p> <p>When you are using the <code>UpdateVocabulary</code> operation, there are two jobs running at the same time. Resend the second request later.</p>",
+      "documentation":"<p>When you are using the <code>CreateVocabulary</code> operation, the <code>JobName</code> field is a duplicate of a previously entered job name. Resend your request with a different name.</p> <p>When you are using the <code>UpdateVocabulary</code> operation, there are two jobs running at the same time. Resend the second request later.</p>",
       "exception":true
     },
+    "ContentRedaction":{
+      "type":"structure",
+      "required":[
+        "RedactionType",
+        "RedactionOutput"
+      ],
+      "members":{
+        "RedactionType":{
+          "shape":"RedactionType",
+          "documentation":"<p>Request parameter that defines the entities to be redacted. The only accepted value is <code>PII</code>.</p>"
+        },
+        "RedactionOutput":{
+          "shape":"RedactionOutput",
+          "documentation":"<p>Request parameter where you choose whether to output only the redacted transcript or generate an additional unredacted transcript.</p> <p>When you choose <code>redacted</code> Amazon Transcribe outputs a JSON file with only the redacted transcript and related information.</p> <p>When you choose <code>redacted_and_unredacted</code> Amazon Transcribe outputs a JSON file with the unredacted transcript and related information in addition to the JSON file with the redacted transcript.</p>"
+        }
+      },
+      "documentation":"<p>Settings for content redaction within a transcription job.</p> <p>You can redact transcripts in US English (en-us). For more information see: <a href=\"https://docs.aws.amazon.com/transcribe/latest/dg/content-redaction.html\">Automatic Content Redaction</a> </p>"
+    },
+    "CreateVocabularyFilterRequest":{
+      "type":"structure",
+      "required":[
+        "VocabularyFilterName",
+        "LanguageCode"
+      ],
+      "members":{
+        "VocabularyFilterName":{
+          "shape":"VocabularyFilterName",
+          "documentation":"<p>The vocabulary filter name. The name must be unique within the account that contains it.</p>"
+        },
+        "LanguageCode":{
+          "shape":"LanguageCode",
+          "documentation":"<p>The language code of the words in the vocabulary filter. All words in the filter must be in the same language. The vocabulary filter can only be used with transcription jobs in the specified language.</p>"
+        },
+        "Words":{
+          "shape":"Words",
+          "documentation":"<p>The words to use in the vocabulary filter. Only use characters from the character set defined for custom vocabularies. For a list of character sets, see <a href=\"https://docs.aws.amazon.com/transcribe/latest/dg/how-vocabulary.html#charsets\">Character Sets for Custom Vocabularies</a>.</p> <p>If you provide a list of words in the <code>Words</code> parameter, you can't use the <code>VocabularyFilterFileUri</code> parameter.</p>"
+        },
+        "VocabularyFilterFileUri":{
+          "shape":"Uri",
+          "documentation":"<p>The Amazon S3 location of a text file used as input to create the vocabulary filter. Only use characters from the character set defined for custom vocabularies. For a list of character sets, see <a href=\"https://docs.aws.amazon.com/transcribe/latest/dg/how-vocabulary.html#charsets\">Character Sets for Custom Vocabularies</a>.</p> <p>The specified file must be less than 50 KB of UTF-8 characters.</p> <p>If you provide the location of a list of words in the <code>VocabularyFilterFileUri</code> parameter, you can't use the <code>Words</code> parameter.</p>"
+        }
+      }
+    },
+    "CreateVocabularyFilterResponse":{
+      "type":"structure",
+      "members":{
+        "VocabularyFilterName":{
+          "shape":"VocabularyFilterName",
+          "documentation":"<p>The name of the vocabulary filter.</p>"
+        },
+        "LanguageCode":{
+          "shape":"LanguageCode",
+          "documentation":"<p>The language code of the words in the collection.</p>"
+        },
+        "LastModifiedTime":{
+          "shape":"DateTime",
+          "documentation":"<p>The date and time that the vocabulary filter was modified.</p>"
+        }
+      }
+    },
     "CreateVocabularyRequest":{
       "type":"structure",
       "required":[
@@ -193,7 +331,7 @@
         },
         "VocabularyFileUri":{
           "shape":"Uri",
-          "documentation":"<p>The S3 location of the text file that contains the definition of the custom vocabulary. The URI must be in the same region as the API endpoint that you are calling. The general form is </p> <p> <code> https://s3-&lt;aws-region&gt;.amazonaws.com/&lt;bucket-name&gt;/&lt;keyprefix&gt;/&lt;objectkey&gt; </code> </p> <p>For example:</p> <p> <code>https://s3-us-east-1.amazonaws.com/examplebucket/vocab.txt</code> </p> <p>For more information about S3 object names, see <a href=\"http://docs.aws.amazon.com/AmazonS3/latest/dev/UsingMetadata.html#object-keys\">Object Keys</a> in the <i>Amazon S3 Developer Guide</i>.</p> <p>For more information about custom vocabularies, see <a href=\"http://docs.aws.amazon.com/transcribe/latest/dg/how-it-works.html#how-vocabulary\">Custom Vocabularies</a>.</p>"
+          "documentation":"<p>The S3 location of the text file that contains the definition of the custom vocabulary. The URI must be in the same region as the API endpoint that you are calling. The general form is </p> <p> <code> https://s3.&lt;aws-region&gt;.amazonaws.com/&lt;bucket-name&gt;/&lt;keyprefix&gt;/&lt;objectkey&gt; </code> </p> <p>For example:</p> <p> <code>https://s3.us-east-1.amazonaws.com/examplebucket/vocab.txt</code> </p> <p>For more information about S3 object names, see <a href=\"http://docs.aws.amazon.com/AmazonS3/latest/dev/UsingMetadata.html#object-keys\">Object Keys</a> in the <i>Amazon S3 Developer Guide</i>.</p> <p>For more information about custom vocabularies, see <a href=\"http://docs.aws.amazon.com/transcribe/latest/dg/how-it-works.html#how-vocabulary\">Custom Vocabularies</a>.</p>"
         }
       }
     },
@@ -222,6 +360,10 @@
         }
       }
     },
+    "DataAccessRoleArn":{
+      "type":"string",
+      "pattern":"^arn:aws:iam::[0-9]{0,63}:role/[A-Za-z0-9:_/+=,@.-]{0,1023}$"
+    },
     "DateTime":{"type":"timestamp"},
     "DeleteTranscriptionJobRequest":{
       "type":"structure",
@@ -233,6 +375,16 @@
         }
       }
     },
+    "DeleteVocabularyFilterRequest":{
+      "type":"structure",
+      "required":["VocabularyFilterName"],
+      "members":{
+        "VocabularyFilterName":{
+          "shape":"VocabularyFilterName",
+          "documentation":"<p>The name of the vocabulary filter to remove.</p>"
+        }
+      }
+    },
     "DeleteVocabularyRequest":{
       "type":"structure",
       "required":["VocabularyName"],
@@ -263,6 +415,37 @@
         }
       }
     },
+    "GetVocabularyFilterRequest":{
+      "type":"structure",
+      "required":["VocabularyFilterName"],
+      "members":{
+        "VocabularyFilterName":{
+          "shape":"VocabularyFilterName",
+          "documentation":"<p>The name of the vocabulary filter for which to return information.</p>"
+        }
+      }
+    },
+    "GetVocabularyFilterResponse":{
+      "type":"structure",
+      "members":{
+        "VocabularyFilterName":{
+          "shape":"VocabularyFilterName",
+          "documentation":"<p>The name of the vocabulary filter.</p>"
+        },
+        "LanguageCode":{
+          "shape":"LanguageCode",
+          "documentation":"<p>The language code of the words in the vocabulary filter.</p>"
+        },
+        "LastModifiedTime":{
+          "shape":"DateTime",
+          "documentation":"<p>The date and time that the contents of the vocabulary filter were updated.</p>"
+        },
+        "DownloadUri":{
+          "shape":"Uri",
+          "documentation":"<p>The URI of the list of words in the vocabulary filter. You can use this URI to get the list of words.</p>"
+        }
+      }
+    },
     "GetVocabularyRequest":{
       "type":"structure",
       "required":["VocabularyName"],
@@ -311,6 +494,20 @@
       "exception":true,
       "fault":true
     },
+    "JobExecutionSettings":{
+      "type":"structure",
+      "members":{
+        "AllowDeferredExecution":{
+          "shape":"Boolean",
+          "documentation":"<p>Indicates whether a job should be queued by Amazon Transcribe when the concurrent execution limit is exceeded. When the <code>AllowDeferredExecution</code> field is true, jobs are queued and will be executed when the number of executing jobs falls below the concurrent execution limit. If the field is false, Amazon Transcribe returns a <code>LimitExceededException</code> exception.</p> <p>If you specify the <code>AllowDeferredExecution</code> field, you must specify the <code>DataAccessRoleArn</code> field.</p>"
+        },
+        "DataAccessRoleArn":{
+          "shape":"DataAccessRoleArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of a role that has access to the S3 bucket that contains the input files. Amazon Transcribe will assume this role to read queued media files. If you have specified an output S3 bucket for the transcription results, this role should have access to the output bucket as well.</p> <p>If you specify the <code>AllowDeferredExecution</code> field, you must specify the <code>DataAccessRoleArn</code> field.</p>"
+        }
+      },
+      "documentation":"<p>Provides information about when a transcription job should be executed.</p>"
+    },
     "KMSKeyId":{
       "type":"string",
       "max":2048,
@@ -335,7 +532,22 @@
         "hi-IN",
         "ar-SA",
         "ru-RU",
-        "zh-CN"
+        "zh-CN",
+        "nl-NL",
+        "id-ID",
+        "ta-IN",
+        "fa-IR",
+        "en-IE",
+        "en-AB",
+        "en-WL",
+        "pt-PT",
+        "te-IN",
+        "tr-TR",
+        "de-CH",
+        "he-IL",
+        "ms-MY",
+        "ja-JP",
+        "ar-AE"
       ]
     },
     "LimitExceededException":{
@@ -422,6 +634,41 @@
         }
       }
     },
+    "ListVocabularyFiltersRequest":{
+      "type":"structure",
+      "members":{
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>If the result of the previous request to <code>ListVocabularyFilters</code> was truncated, include the <code>NextToken</code> to fetch the next set of collections.</p>"
+        },
+        "MaxResults":{
+          "shape":"MaxResults",
+          "documentation":"<p>The maximum number of filters to return in the response. If there are fewer results in the list, this response contains only the actual results.</p>"
+        },
+        "NameContains":{
+          "shape":"VocabularyFilterName",
+          "documentation":"<p>Filters the response so that it only contains vocabulary filters whose name contains the specified string.</p>"
+        }
+      }
+    },
+    "ListVocabularyFiltersResponse":{
+      "type":"structure",
+      "members":{
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>The <code>ListVocabularyFilters</code> operation returns a page of collections at a time. The maximum size of the page is set by the <code>MaxResults</code> parameter. If there are more jobs in the list than the page size, Amazon Transcribe returns the <code>NextPage</code> token. Include the token in the next request to the <code>ListVocabularyFilters</code> operation to return in the next page of jobs.</p>"
+        },
+        "VocabularyFilters":{
+          "shape":"VocabularyFilters",
+          "documentation":"<p>The list of vocabulary filters. It will contain at most <code>MaxResults</code> number of filters. If there are more filters, call the <code>ListVocabularyFilters</code> operation again with the <code>NextToken</code> parameter in the request set to the value of the <code>NextToken</code> field in the response.</p>"
+        }
+      }
+    },
+    "MaxAlternatives":{
+      "type":"integer",
+      "max":10,
+      "min":2
+    },
     "MaxResults":{
       "type":"integer",
       "max":100,
@@ -437,7 +684,7 @@
       "members":{
         "MediaFileUri":{
           "shape":"Uri",
-          "documentation":"<p>The S3 location of the input media file. The URI must be in the same region as the API endpoint that you are calling. The general form is:</p> <p> <code> https://s3-&lt;aws-region&gt;.amazonaws.com/&lt;bucket-name&gt;/&lt;keyprefix&gt;/&lt;objectkey&gt; </code> </p> <p>For example:</p> <p> <code>https://s3-us-east-1.amazonaws.com/examplebucket/example.mp4</code> </p> <p> <code>https://s3-us-east-1.amazonaws.com/examplebucket/mediadocs/example.mp4</code> </p> <p>For more information about S3 object names, see <a href=\"http://docs.aws.amazon.com/AmazonS3/latest/dev/UsingMetadata.html#object-keys\">Object Keys</a> in the <i>Amazon S3 Developer Guide</i>.</p>"
+          "documentation":"<p>The S3 object location of the input media file. The URI must be in the same region as the API endpoint that you are calling. The general form is:</p> <p> <code> s3://&lt;bucket-name&gt;/&lt;keyprefix&gt;/&lt;objectkey&gt; </code> </p> <p>For example:</p> <p> <code>s3://examplebucket/example.mp4</code> </p> <p> <code>s3://examplebucket/mediadocs/example.mp4</code> </p> <p>For more information about S3 object names, see <a href=\"http://docs.aws.amazon.com/AmazonS3/latest/dev/UsingMetadata.html#object-keys\">Object Keys</a> in the <i>Amazon S3 Developer Guide</i>.</p>"
         }
       },
       "documentation":"<p>Describes the input media file in a transcription request.</p>"
@@ -491,6 +738,17 @@
       "type":"list",
       "member":{"shape":"Phrase"}
     },
+    "RedactionOutput":{
+      "type":"string",
+      "enum":[
+        "redacted",
+        "redacted_and_unredacted"
+      ]
+    },
+    "RedactionType":{
+      "type":"string",
+      "enum":["PII"]
+    },
     "Settings":{
       "type":"structure",
       "members":{
@@ -509,6 +767,22 @@
         "ChannelIdentification":{
           "shape":"Boolean",
           "documentation":"<p>Instructs Amazon Transcribe to process each audio channel separately and then merge the transcription output of each channel into a single transcription. </p> <p>Amazon Transcribe also produces a transcription of each item detected on an audio channel, including the start time and end time of the item and alternative transcriptions of the item including the confidence that Amazon Transcribe has in the transcription.</p> <p>You can't set both <code>ShowSpeakerLabels</code> and <code>ChannelIdentification</code> in the same request. If you set both, your request returns a <code>BadRequestException</code>.</p>"
+        },
+        "ShowAlternatives":{
+          "shape":"Boolean",
+          "documentation":"<p>Determines whether the transcription contains alternative transcriptions. If you set the <code>ShowAlternatives</code> field to true, you must also set the maximum number of alternatives to return in the <code>MaxAlternatives</code> field.</p>"
+        },
+        "MaxAlternatives":{
+          "shape":"MaxAlternatives",
+          "documentation":"<p>The number of alternative transcriptions that the service should return. If you specify the <code>MaxAlternatives</code> field, you must set the <code>ShowAlternatives</code> field to true.</p>"
+        },
+        "VocabularyFilterName":{
+          "shape":"VocabularyFilterName",
+          "documentation":"<p>The name of the vocabulary filter to use when transcribing the audio. The filter that you specify must have the same language code as the transcription job.</p>"
+        },
+        "VocabularyFilterMethod":{
+          "shape":"VocabularyFilterMethod",
+          "documentation":"<p>Set to <code>mask</code> to remove filtered text from the transcript and replace it with three asterisks (\"***\") as placeholder text. Set to <code>remove</code> to remove filtered text from the transcript without using placeholder text.</p>"
         }
       },
       "documentation":"<p>Provides optional settings for the <code>StartTranscriptionJob</code> operation.</p>"
@@ -543,12 +817,23 @@
         },
         "OutputBucketName":{
           "shape":"OutputBucketName",
-          "documentation":"<p>The location where the transcription is stored.</p> <p>If you set the <code>OutputBucketName</code>, Amazon Transcribe puts the transcription in the specified S3 bucket. When you call the <a>GetTranscriptionJob</a> operation, the operation returns this location in the <code>TranscriptFileUri</code> field. The S3 bucket must have permissions that allow Amazon Transcribe to put files in the bucket. For more information, see <a href=\"https://docs.aws.amazon.com/transcribe/latest/dg/security_iam_id-based-policy-examples.html#auth-role-iam-user\">Permissions Required for IAM User Roles</a>.</p> <p>Amazon Transcribe uses the default Amazon S3 key for server-side encryption of transcripts that are placed in your S3 bucket. You can't specify your own encryption key.</p> <p>If you don't set the <code>OutputBucketName</code>, Amazon Transcribe generates a pre-signed URL, a shareable URL that provides secure access to your transcription, and returns it in the <code>TranscriptFileUri</code> field. Use this URL to download the transcription.</p>"
+          "documentation":"<p>The location where the transcription is stored.</p> <p>If you set the <code>OutputBucketName</code>, Amazon Transcribe puts the transcript in the specified S3 bucket. When you call the <a>GetTranscriptionJob</a> operation, the operation returns this location in the <code>TranscriptFileUri</code> field. If you enable content redaction, the redacted transcript appears in <code>RedactedTranscriptFileUri</code>. If you enable content redaction and choose to output an unredacted transcript, that transcript's location still appears in the <code>TranscriptFileUri</code>. The S3 bucket must have permissions that allow Amazon Transcribe to put files in the bucket. For more information, see <a href=\"https://docs.aws.amazon.com/transcribe/latest/dg/security_iam_id-based-policy-examples.html#auth-role-iam-user\">Permissions Required for IAM User Roles</a>.</p> <p>You can specify an AWS Key Management Service (KMS) key to encrypt the output of your transcription using the <code>OutputEncryptionKMSKeyId</code> parameter. If you don't specify a KMS key, Amazon Transcribe uses the default Amazon S3 key for server-side encryption of transcripts that are placed in your S3 bucket.</p> <p>If you don't set the <code>OutputBucketName</code>, Amazon Transcribe generates a pre-signed URL, a shareable URL that provides secure access to your transcription, and returns it in the <code>TranscriptFileUri</code> field. Use this URL to download the transcription.</p>"
+        },
+        "OutputEncryptionKMSKeyId":{
+          "shape":"KMSKeyId",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the AWS Key Management Service (KMS) key used to encrypt the output of the transcription job. The user calling the <code>StartTranscriptionJob</code> operation must have permission to use the specified KMS key.</p> <p>You can use either of the following to identify a KMS key in the current account:</p> <ul> <li> <p>KMS Key ID: \"1234abcd-12ab-34cd-56ef-1234567890ab\"</p> </li> <li> <p>KMS Key Alias: \"alias/ExampleAlias\"</p> </li> </ul> <p>You can use either of the following to identify a KMS key in the current account or another account:</p> <ul> <li> <p>Amazon Resource Name (ARN) of a KMS Key: \"arn:aws:kms:region:account ID:key/1234abcd-12ab-34cd-56ef-1234567890ab\"</p> </li> <li> <p>ARN of a KMS Key Alias: \"arn:aws:kms:region:account ID:alias/ExampleAlias\"</p> </li> </ul> <p>If you don't specify an encryption key, the output of the transcription job is encrypted with the default Amazon S3 key (SSE-S3). </p> <p>If you specify a KMS key to encrypt your output, you must also specify an output location in the <code>OutputBucketName</code> parameter.</p>"
         },
-        "OutputEncryptionKMSKeyId":{"shape":"KMSKeyId"},
         "Settings":{
           "shape":"Settings",
           "documentation":"<p>A <code>Settings</code> object that provides optional settings for a transcription job.</p>"
+        },
+        "JobExecutionSettings":{
+          "shape":"JobExecutionSettings",
+          "documentation":"<p>Provides information about how a transcription job is executed. Use this field to indicate that the job can be queued for deferred execution if the concurrency limit is reached and there are no slots available to immediately run the job.</p>"
+        },
+        "ContentRedaction":{
+          "shape":"ContentRedaction",
+          "documentation":"<p>An object that contains the request parameters for content redaction.</p>"
         }
       }
     },
@@ -567,7 +852,11 @@
       "members":{
         "TranscriptFileUri":{
           "shape":"Uri",
-          "documentation":"<p>The location where the transcription is stored.</p> <p>Use this URI to access the transcription. If you specified an S3 bucket in the <code>OutputBucketName</code> field when you created the job, this is the URI of that bucket. If you chose to store the transcription in Amazon Transcribe, this is a shareable URL that provides secure access to that location.</p>"
+          "documentation":"<p>The S3 object location of the the transcript.</p> <p>Use this URI to access the transcript. If you specified an S3 bucket in the <code>OutputBucketName</code> field when you created the job, this is the URI of that bucket. If you chose to store the transcript in Amazon Transcribe, this is a shareable URL that provides secure access to that location.</p>"
+        },
+        "RedactedTranscriptFileUri":{
+          "shape":"Uri",
+          "documentation":"<p>The S3 object location of the redacted transcript.</p> <p>Use this URI to access the redacated transcript. If you specified an S3 bucket in the <code>OutputBucketName</code> field when you created the job, this is the URI of that bucket. If you chose to store the transcript in Amazon Transcribe, this is a shareable URL that provides secure access to that location.</p>"
         }
       },
       "documentation":"<p>Identifies the location of a transcription.</p>"
@@ -603,6 +892,10 @@
           "shape":"Transcript",
           "documentation":"<p>An object that describes the output of the transcription job.</p>"
         },
+        "StartTime":{
+          "shape":"DateTime",
+          "documentation":"<p>A timestamp that shows with the job was started processing.</p>"
+        },
         "CreationTime":{
           "shape":"DateTime",
           "documentation":"<p>A timestamp that shows when the job was created.</p>"
@@ -618,6 +911,14 @@
         "Settings":{
           "shape":"Settings",
           "documentation":"<p>Optional settings for the transcription job. Use these settings to turn on speaker recognition, to set the maximum number of speakers that should be identified and to specify a custom vocabulary to use when processing the transcription job.</p>"
+        },
+        "JobExecutionSettings":{
+          "shape":"JobExecutionSettings",
+          "documentation":"<p>Provides information about how a transcription job is executed.</p>"
+        },
+        "ContentRedaction":{
+          "shape":"ContentRedaction",
+          "documentation":"<p>An object that describes content redaction settings for the transcription job.</p>"
         }
       },
       "documentation":"<p>Describes an asynchronous transcription job that was created with the <code>StartTranscriptionJob</code> operation. </p>"
@@ -631,6 +932,7 @@
     "TranscriptionJobStatus":{
       "type":"string",
       "enum":[
+        "QUEUED",
         "IN_PROGRESS",
         "FAILED",
         "COMPLETED"
@@ -651,6 +953,10 @@
           "shape":"DateTime",
           "documentation":"<p>A timestamp that shows when the job was created.</p>"
         },
+        "StartTime":{
+          "shape":"DateTime",
+          "documentation":"<p>A timestamp that shows when the job started processing.</p>"
+        },
         "CompletionTime":{
           "shape":"DateTime",
           "documentation":"<p>A timestamp that shows when the job was completed.</p>"
@@ -670,10 +976,49 @@
         "OutputLocationType":{
           "shape":"OutputLocationType",
           "documentation":"<p>Indicates the location of the output of the transcription job.</p> <p>If the value is <code>CUSTOMER_BUCKET</code> then the location is the S3 bucket specified in the <code>outputBucketName</code> field when the transcription job was started with the <code>StartTranscriptionJob</code> operation.</p> <p>If the value is <code>SERVICE_BUCKET</code> then the output is stored by Amazon Transcribe and can be retrieved using the URI in the <code>GetTranscriptionJob</code> response's <code>TranscriptFileUri</code> field.</p>"
+        },
+        "ContentRedaction":{
+          "shape":"ContentRedaction",
+          "documentation":"<p>The content redaction settings of the transcription job.</p>"
         }
       },
       "documentation":"<p>Provides a summary of information about a transcription job.</p>"
     },
+    "UpdateVocabularyFilterRequest":{
+      "type":"structure",
+      "required":["VocabularyFilterName"],
+      "members":{
+        "VocabularyFilterName":{
+          "shape":"VocabularyFilterName",
+          "documentation":"<p>The name of the vocabulary filter to update.</p>"
+        },
+        "Words":{
+          "shape":"Words",
+          "documentation":"<p>The words to use in the vocabulary filter. Only use characters from the character set defined for custom vocabularies. For a list of character sets, see <a href=\"https://docs.aws.amazon.com/transcribe/latest/dg/how-vocabulary.html#charsets\">Character Sets for Custom Vocabularies</a>.</p> <p>If you provide a list of words in the <code>Words</code> parameter, you can't use the <code>VocabularyFilterFileUri</code> parameter.</p>"
+        },
+        "VocabularyFilterFileUri":{
+          "shape":"Uri",
+          "documentation":"<p>The Amazon S3 location of a text file used as input to create the vocabulary filter. Only use characters from the character set defined for custom vocabularies. For a list of character sets, see <a href=\"https://docs.aws.amazon.com/transcribe/latest/dg/how-vocabulary.html#charsets\">Character Sets for Custom Vocabularies</a>.</p> <p>The specified file must be less than 50 KB of UTF-8 characters.</p> <p>If you provide the location of a list of words in the <code>VocabularyFilterFileUri</code> parameter, you can't use the <code>Words</code> parameter.</p>"
+        }
+      }
+    },
+    "UpdateVocabularyFilterResponse":{
+      "type":"structure",
+      "members":{
+        "VocabularyFilterName":{
+          "shape":"VocabularyFilterName",
+          "documentation":"<p>The name of the updated vocabulary filter.</p>"
+        },
+        "LanguageCode":{
+          "shape":"LanguageCode",
+          "documentation":"<p>The language code of the words in the vocabulary filter.</p>"
+        },
+        "LastModifiedTime":{
+          "shape":"DateTime",
+          "documentation":"<p>The date and time that the vocabulary filter was updated.</p>"
+        }
+      }
+    },
     "UpdateVocabularyRequest":{
       "type":"structure",
       "required":[
@@ -695,7 +1040,7 @@
         },
         "VocabularyFileUri":{
           "shape":"Uri",
-          "documentation":"<p>The S3 location of the text file that contains the definition of the custom vocabulary. The URI must be in the same region as the API endpoint that you are calling. The general form is </p> <p> <code> https://s3-&lt;aws-region&gt;.amazonaws.com/&lt;bucket-name&gt;/&lt;keyprefix&gt;/&lt;objectkey&gt; </code> </p> <p>For example:</p> <p> <code>https://s3-us-east-1.amazonaws.com/examplebucket/vocab.txt</code> </p> <p>For more information about S3 object names, see <a href=\"http://docs.aws.amazon.com/AmazonS3/latest/dev/UsingMetadata.html#object-keys\">Object Keys</a> in the <i>Amazon S3 Developer Guide</i>.</p> <p>For more information about custom vocabularies, see <a href=\"http://docs.aws.amazon.com/transcribe/latest/dg/how-it-works.html#how-vocabulary\">Custom Vocabularies</a>.</p>"
+          "documentation":"<p>The S3 location of the text file that contains the definition of the custom vocabulary. The URI must be in the same region as the API endpoint that you are calling. The general form is </p> <p> <code> https://s3.&lt;aws-region&gt;.amazonaws.com/&lt;bucket-name&gt;/&lt;keyprefix&gt;/&lt;objectkey&gt; </code> </p> <p>For example:</p> <p> <code>https://s3.us-east-1.amazonaws.com/examplebucket/vocab.txt</code> </p> <p>For more information about S3 object names, see <a href=\"http://docs.aws.amazon.com/AmazonS3/latest/dev/UsingMetadata.html#object-keys\">Object Keys</a> in the <i>Amazon S3 Developer Guide</i>.</p> <p>For more information about custom vocabularies, see <a href=\"http://docs.aws.amazon.com/transcribe/latest/dg/how-it-works.html#how-vocabulary\">Custom Vocabularies</a>.</p>"
         }
       }
     },
@@ -730,6 +1075,41 @@
       "type":"list",
       "member":{"shape":"VocabularyInfo"}
     },
+    "VocabularyFilterInfo":{
+      "type":"structure",
+      "members":{
+        "VocabularyFilterName":{
+          "shape":"VocabularyFilterName",
+          "documentation":"<p>The name of the vocabulary filter. The name must be unique in the account that holds the filter.</p>"
+        },
+        "LanguageCode":{
+          "shape":"LanguageCode",
+          "documentation":"<p>The language code of the words in the vocabulary filter.</p>"
+        },
+        "LastModifiedTime":{
+          "shape":"DateTime",
+          "documentation":"<p>The date and time that the vocabulary was last updated.</p>"
+        }
+      },
+      "documentation":"<p>Provides information about a vocabulary filter.</p>"
+    },
+    "VocabularyFilterMethod":{
+      "type":"string",
+      "enum":[
+        "remove",
+        "mask"
+      ]
+    },
+    "VocabularyFilterName":{
+      "type":"string",
+      "max":200,
+      "min":1,
+      "pattern":"^[0-9a-zA-Z._-]+"
+    },
+    "VocabularyFilters":{
+      "type":"list",
+      "member":{"shape":"VocabularyFilterInfo"}
+    },
     "VocabularyInfo":{
       "type":"structure",
       "members":{
@@ -765,6 +1145,16 @@
         "READY",
         "FAILED"
       ]
+    },
+    "Word":{
+      "type":"string",
+      "max":256,
+      "min":1
+    },
+    "Words":{
+      "type":"list",
+      "member":{"shape":"Word"},
+      "min":1
     }
   },
   "documentation":"<p>Operations and objects for transcribing speech to text.</p>"
diff --git a/services/transcribestreaming/pom.xml b/services/transcribestreaming/pom.xml
index 5c101c56c938..ece6203e26be 100644
--- a/services/transcribestreaming/pom.xml
+++ b/services/transcribestreaming/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>transcribestreaming</artifactId>
     <name>AWS Java SDK :: Services :: AWS Transcribe Streaming</name>
diff --git a/services/transcribestreaming/src/it/java/software/amazon/awssdk/services/transcribestreaming/TestResponseHandlers.java b/services/transcribestreaming/src/it/java/software/amazon/awssdk/services/transcribestreaming/TestResponseHandlers.java
index 0f38e4f1948a..92ffa2fe45b2 100644
--- a/services/transcribestreaming/src/it/java/software/amazon/awssdk/services/transcribestreaming/TestResponseHandlers.java
+++ b/services/transcribestreaming/src/it/java/software/amazon/awssdk/services/transcribestreaming/TestResponseHandlers.java
@@ -1,3 +1,18 @@
+/*
+ * 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.
+ */
+
 package software.amazon.awssdk.services.transcribestreaming;
 
 import static software.amazon.awssdk.core.http.HttpResponseHandler.X_AMZN_REQUEST_ID_HEADER;
diff --git a/services/transcribestreaming/src/it/java/software/amazon/awssdk/services/transcribestreaming/TestSubscription.java b/services/transcribestreaming/src/it/java/software/amazon/awssdk/services/transcribestreaming/TestSubscription.java
index 730a1ad5ccab..4c45e4d327df 100644
--- a/services/transcribestreaming/src/it/java/software/amazon/awssdk/services/transcribestreaming/TestSubscription.java
+++ b/services/transcribestreaming/src/it/java/software/amazon/awssdk/services/transcribestreaming/TestSubscription.java
@@ -1,3 +1,18 @@
+/*
+ * 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.
+ */
+
 package software.amazon.awssdk.services.transcribestreaming;
 
 import java.io.IOException;
diff --git a/services/transcribestreaming/src/it/java/software/amazon/awssdk/services/transcribestreaming/TranscribeStreamingIntegrationTest.java b/services/transcribestreaming/src/it/java/software/amazon/awssdk/services/transcribestreaming/TranscribeStreamingIntegrationTest.java
index a301c40440eb..fc2c6129f3e9 100644
--- a/services/transcribestreaming/src/it/java/software/amazon/awssdk/services/transcribestreaming/TranscribeStreamingIntegrationTest.java
+++ b/services/transcribestreaming/src/it/java/software/amazon/awssdk/services/transcribestreaming/TranscribeStreamingIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/transcribestreaming/src/main/java/software/amazon/awssdk/services/transcribestreaming/internal/DefaultHttpConfigurationOptions.java b/services/transcribestreaming/src/main/java/software/amazon/awssdk/services/transcribestreaming/internal/DefaultHttpConfigurationOptions.java
index 524613c9bfb7..6a2f365fbd89 100644
--- a/services/transcribestreaming/src/main/java/software/amazon/awssdk/services/transcribestreaming/internal/DefaultHttpConfigurationOptions.java
+++ b/services/transcribestreaming/src/main/java/software/amazon/awssdk/services/transcribestreaming/internal/DefaultHttpConfigurationOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/transcribestreaming/src/test/resources/log4j.properties b/services/transcribestreaming/src/test/resources/log4j.properties
index cbc8cf5f8f8d..eb26fd703083 100644
--- a/services/transcribestreaming/src/test/resources/log4j.properties
+++ b/services/transcribestreaming/src/test/resources/log4j.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/transfer/pom.xml b/services/transfer/pom.xml
index 18faa25b11bb..89e618fb722f 100644
--- a/services/transfer/pom.xml
+++ b/services/transfer/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>transfer</artifactId>
     <name>AWS Java SDK :: Services :: Transfer</name>
diff --git a/services/transfer/src/main/resources/codegen-resources/service-2.json b/services/transfer/src/main/resources/codegen-resources/service-2.json
index dfc84fccda2f..63b3b0b26de2 100644
--- a/services/transfer/src/main/resources/codegen-resources/service-2.json
+++ b/services/transfer/src/main/resources/codegen-resources/service-2.json
@@ -107,7 +107,7 @@
         {"shape":"InvalidRequestException"},
         {"shape":"ResourceNotFoundException"}
       ],
-      "documentation":"<p>Describes the server that you specify by passing the <code>ServerId</code> parameter.</p> <p>The response contains a description of the server's properties.</p>"
+      "documentation":"<p>Describes the server that you specify by passing the <code>ServerId</code> parameter.</p> <p>The response contains a description of the server's properties. When you set <code>EndpointType</code> to VPC, the response will contain the <code>EndpointDetails</code>.</p>"
     },
     "DescribeUser":{
       "name":"DescribeUser",
@@ -280,6 +280,7 @@
       "output":{"shape":"UpdateServerResponse"},
       "errors":[
         {"shape":"ServiceUnavailableException"},
+        {"shape":"ConflictException"},
         {"shape":"InternalServiceError"},
         {"shape":"InvalidRequestException"},
         {"shape":"ResourceExistsException"},
@@ -307,22 +308,36 @@
     }
   },
   "shapes":{
+    "AddressAllocationId":{"type":"string"},
+    "AddressAllocationIds":{
+      "type":"list",
+      "member":{"shape":"AddressAllocationId"}
+    },
     "Arn":{
       "type":"string",
       "max":1600,
       "min":20,
       "pattern":"arn:.*"
     },
+    "ConflictException":{
+      "type":"structure",
+      "required":["Message"],
+      "members":{
+        "Message":{"shape":"Message"}
+      },
+      "documentation":"<p>This exception is thrown when the <code>UpdatServer</code> is called for a server that has VPC as the endpoint type and the server's <code>VpcEndpointID</code> is not in the available state.</p>",
+      "exception":true
+    },
     "CreateServerRequest":{
       "type":"structure",
       "members":{
         "EndpointDetails":{
           "shape":"EndpointDetails",
-          "documentation":"<p>The virtual private cloud (VPC) endpoint settings that you want to configure for your SFTP server. This parameter is required when you specify a value for the <code>EndpointType</code> parameter.</p>"
+          "documentation":"<p>The virtual private cloud (VPC) endpoint settings that are configured for your SFTP server. With a VPC endpoint, you can restrict access to your SFTP server to resources only within your VPC. To control incoming internet traffic, you will need to invoke the <code>UpdateServer</code> API and attach an Elastic IP to your server's endpoint. </p>"
         },
         "EndpointType":{
           "shape":"EndpointType",
-          "documentation":"<p>The type of VPC endpoint that you want your SFTP server to connect to. If you connect to a VPC endpoint, your SFTP server isn't accessible over the public internet.</p>"
+          "documentation":"<p>The type of VPC endpoint that you want your SFTP server to connect to. You can choose to connect to the public internet or a virtual private cloud (VPC) endpoint. With a VPC endpoint, you can restrict access to your SFTP server and resources only within your VPC.</p>"
         },
         "HostKey":{
           "shape":"HostKey",
@@ -374,7 +389,7 @@
         },
         "HomeDirectoryMappings":{
           "shape":"HomeDirectoryMappings",
-          "documentation":"<p>Logical directory mappings that specify what S3 paths and keys should be visible to your user and how you want to make them visible. You will need to specify the \"<code>Entry</code>\" and \"<code>Target</code>\" pair, where <code>Entry</code> shows how the path is made visible and <code>Target</code> is the actual S3 path. If you only specify a target, it will be displayed as is. You will need to also make sure that your AWS IAM Role provides access to paths in <code>Target</code>. The following is an example.</p> <p> <code>'[ \"/bucket2/documentation\", { \"Entry\": \"your-personal-report.pdf\", \"Target\": \"/bucket3/customized-reports/${transfer:UserName}.pdf\" } ]'</code> </p> <p>In most cases, you can use this value instead of the scope down policy to lock your user down to the designated home directory (\"chroot\"). To do this, you can set <code>Entry</code> to '/' and set <code>Target</code> to the HomeDirectory parameter value. </p>"
+          "documentation":"<p>Logical directory mappings that specify what S3 paths and keys should be visible to your user and how you want to make them visible. You will need to specify the \"<code>Entry</code>\" and \"<code>Target</code>\" pair, where <code>Entry</code> shows how the path is made visible and <code>Target</code> is the actual S3 path. If you only specify a target, it will be displayed as is. You will need to also make sure that your AWS IAM Role provides access to paths in <code>Target</code>. The following is an example.</p> <p> <code>'[ \"/bucket2/documentation\", { \"Entry\": \"your-personal-report.pdf\", \"Target\": \"/bucket3/customized-reports/${transfer:UserName}.pdf\" } ]'</code> </p> <p>In most cases, you can use this value instead of the scope down policy to lock your user down to the designated home directory (\"chroot\"). To do this, you can set <code>Entry</code> to '/' and set <code>Target</code> to the HomeDirectory parameter value. </p> <note> <p>If the target of a logical directory entry does not exist in S3, the entry will be ignored. As a workaround, you can use the S3 api to create 0 byte objects as place holders for your directory. If using the CLI, use the s3api call instead of s3 so you can use the put-object operation. For example, you use the following: <code>aws s3api put-object --bucket bucketname --key path/to/folder/</code>. Make sure that the end of the key name ends in a / for it to be considered a folder. </p> </note>"
         },
         "Policy":{
           "shape":"Policy",
@@ -620,17 +635,30 @@
     "EndpointDetails":{
       "type":"structure",
       "members":{
+        "AddressAllocationIds":{
+          "shape":"AddressAllocationIds",
+          "documentation":"<p>A list of address allocation IDs that are required to attach an Elastic IP address to your SFTP server's endpoint. This is only valid in the <code>UpdateServer</code> API.</p> <note> <p>This property can only be use when <code>EndpointType</code> is set to <code>VPC</code>.</p> </note>"
+        },
+        "SubnetIds":{
+          "shape":"SubnetIds",
+          "documentation":"<p>A list of subnet IDs that are required to host your SFTP server endpoint in your VPC.</p>"
+        },
         "VpcEndpointId":{
           "shape":"VpcEndpointId",
           "documentation":"<p>The ID of the VPC endpoint.</p>"
+        },
+        "VpcId":{
+          "shape":"VpcId",
+          "documentation":"<p>The VPC ID of the virtual private cloud in which the SFTP server's endpoint will be hosted.</p>"
         }
       },
-      "documentation":"<p>The configuration settings for the virtual private cloud (VPC) endpoint for your SFTP server.</p>"
+      "documentation":"<p>The virtual private cloud (VPC) endpoint settings that are configured for your SFTP server. With a VPC endpoint, you can restrict access to your SFTP server and resources only within your VPC. To control incoming internet traffic, invoke the <code>UpdateServer</code> API and attach an Elastic IP to your server's endpoint. </p>"
     },
     "EndpointType":{
       "type":"string",
       "enum":[
         "PUBLIC",
+        "VPC",
         "VPC_ENDPOINT"
       ]
     },
@@ -1106,6 +1134,11 @@
         }
       }
     },
+    "SubnetId":{"type":"string"},
+    "SubnetIds":{
+      "type":"list",
+      "member":{"shape":"SubnetId"}
+    },
     "Tag":{
       "type":"structure",
       "required":[
@@ -1238,7 +1271,7 @@
       "members":{
         "EndpointDetails":{
           "shape":"EndpointDetails",
-          "documentation":"<p>The virtual private cloud (VPC) endpoint settings that are configured for your SFTP server. With a VPC endpoint, your SFTP server isn't accessible over the public internet.</p>"
+          "documentation":"<p>The virtual private cloud (VPC) endpoint settings that are configured for your SFTP server. With a VPC endpoint, you can restrict access to your SFTP server to resources only within your VPC. To control incoming internet traffic, you will need to associate one or more Elastic IP addresses with your server's endpoint. </p>"
         },
         "EndpointType":{
           "shape":"EndpointType",
@@ -1289,7 +1322,7 @@
         },
         "HomeDirectoryMappings":{
           "shape":"HomeDirectoryMappings",
-          "documentation":"<p>Logical directory mappings that specify what S3 paths and keys should be visible to your user and how you want to make them visible. You will need to specify the \"<code>Entry</code>\" and \"<code>Target</code>\" pair, where <code>Entry</code> shows how the path is made visible and <code>Target</code> is the actual S3 path. If you only specify a target, it will be displayed as is. You will need to also make sure that your AWS IAM Role provides access to paths in <code>Target</code>. The following is an example.</p> <p> <code>'[ \"/bucket2/documentation\", { \"Entry\": \"your-personal-report.pdf\", \"Target\": \"/bucket3/customized-reports/${transfer:UserName}.pdf\" } ]'</code> </p> <p>In most cases, you can use this value instead of the scope down policy to lock your user down to the designated home directory (\"chroot\"). To do this, you can set <code>Entry</code> to '/' and set <code>Target</code> to the HomeDirectory parameter value. </p> <p> </p>"
+          "documentation":"<p>Logical directory mappings that specify what S3 paths and keys should be visible to your user and how you want to make them visible. You will need to specify the \"<code>Entry</code>\" and \"<code>Target</code>\" pair, where <code>Entry</code> shows how the path is made visible and <code>Target</code> is the actual S3 path. If you only specify a target, it will be displayed as is. You will need to also make sure that your AWS IAM Role provides access to paths in <code>Target</code>. The following is an example.</p> <p> <code>'[ \"/bucket2/documentation\", { \"Entry\": \"your-personal-report.pdf\", \"Target\": \"/bucket3/customized-reports/${transfer:UserName}.pdf\" } ]'</code> </p> <p>In most cases, you can use this value instead of the scope down policy to lock your user down to the designated home directory (\"chroot\"). To do this, you can set <code>Entry</code> to '/' and set <code>Target</code> to the HomeDirectory parameter value. </p> <note> <p>If the target of a logical directory entry does not exist in S3, the entry will be ignored. As a workaround, you can use the S3 api to create 0 byte objects as place holders for your directory. If using the CLI, use the s3api call instead of s3 so you can use the put-object operation. For example, you use the following: <code>aws s3api put-object --bucket bucketname --key path/to/folder/</code>. Make sure that the end of the key name ends in a / for it to be considered a folder. </p> </note>"
         },
         "Policy":{
           "shape":"Policy",
@@ -1348,7 +1381,8 @@
       "max":22,
       "min":22,
       "pattern":"^vpce-[0-9a-f]{17}$"
-    }
+    },
+    "VpcId":{"type":"string"}
   },
   "documentation":"<p>AWS Transfer for SFTP is a fully managed service that enables the transfer of files directly into and out of Amazon S3 using the Secure File Transfer Protocol (SFTP)—also known as Secure Shell (SSH) File Transfer Protocol. AWS helps you seamlessly migrate your file transfer workflows to AWS Transfer for SFTP—by integrating with existing authentication systems, and providing DNS routing with Amazon Route 53—so nothing changes for your customers and partners, or their applications. With your data in S3, you can use it with AWS services for processing, analytics, machine learning, and archiving. Getting started with AWS Transfer for SFTP (AWS SFTP) is easy; there is no infrastructure to buy and set up. </p>"
 }
diff --git a/services/translate/pom.xml b/services/translate/pom.xml
index 7d007de86f08..c6094474a60d 100644
--- a/services/translate/pom.xml
+++ b/services/translate/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>services</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>translate</artifactId>
diff --git a/services/translate/src/main/resources/codegen-resources/paginators-1.json b/services/translate/src/main/resources/codegen-resources/paginators-1.json
index 5677bd8e4a2d..67f44714aca2 100644
--- a/services/translate/src/main/resources/codegen-resources/paginators-1.json
+++ b/services/translate/src/main/resources/codegen-resources/paginators-1.json
@@ -1,4 +1,14 @@
 {
   "pagination": {
+    "ListTerminologies": {
+      "input_token": "NextToken",
+      "limit_key": "MaxResults",
+      "output_token": "NextToken"
+    },
+    "ListTextTranslationJobs": {
+      "input_token": "NextToken",
+      "limit_key": "MaxResults",
+      "output_token": "NextToken"
+    }
   }
-}
+}
\ No newline at end of file
diff --git a/services/translate/src/main/resources/codegen-resources/service-2.json b/services/translate/src/main/resources/codegen-resources/service-2.json
index 22360d03417b..520bfb03830a 100644
--- a/services/translate/src/main/resources/codegen-resources/service-2.json
+++ b/services/translate/src/main/resources/codegen-resources/service-2.json
@@ -27,6 +27,21 @@
       ],
       "documentation":"<p>A synchronous action that deletes a custom terminology.</p>"
     },
+    "DescribeTextTranslationJob":{
+      "name":"DescribeTextTranslationJob",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DescribeTextTranslationJobRequest"},
+      "output":{"shape":"DescribeTextTranslationJobResponse"},
+      "errors":[
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"TooManyRequestsException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Gets the properties associated with an asycnhronous batch translation job including name, ID, status, source and target languages, input/output S3 buckets, and so on.</p>"
+    },
     "GetTerminology":{
       "name":"GetTerminology",
       "http":{
@@ -74,6 +89,54 @@
       ],
       "documentation":"<p>Provides a list of custom terminologies associated with your account.</p>"
     },
+    "ListTextTranslationJobs":{
+      "name":"ListTextTranslationJobs",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"ListTextTranslationJobsRequest"},
+      "output":{"shape":"ListTextTranslationJobsResponse"},
+      "errors":[
+        {"shape":"InvalidRequestException"},
+        {"shape":"TooManyRequestsException"},
+        {"shape":"InvalidFilterException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Gets a list of the batch translation jobs that you have submitted.</p>"
+    },
+    "StartTextTranslationJob":{
+      "name":"StartTextTranslationJob",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"StartTextTranslationJobRequest"},
+      "output":{"shape":"StartTextTranslationJobResponse"},
+      "errors":[
+        {"shape":"TooManyRequestsException"},
+        {"shape":"UnsupportedLanguagePairException"},
+        {"shape":"InvalidRequestException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Starts an asynchronous batch translation job. Batch translation jobs can be used to translate large volumes of text across multiple documents at once. For more information, see <a>async</a>.</p> <p>Batch translation jobs can be described with the <a>DescribeTextTranslationJob</a> operation, listed with the <a>ListTextTranslationJobs</a> operation, and stopped with the <a>StopTextTranslationJob</a> operation.</p> <note> <p>Amazon Translate does not support batch translation of multiple source languages at once.</p> </note>"
+    },
+    "StopTextTranslationJob":{
+      "name":"StopTextTranslationJob",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"StopTextTranslationJobRequest"},
+      "output":{"shape":"StopTextTranslationJobResponse"},
+      "errors":[
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"TooManyRequestsException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Stops an asynchronous batch translation job that is in progress.</p> <p>If the job's state is <code>IN_PROGRESS</code>, the job will be marked for termination and put into the <code>STOP_REQUESTED</code> state. If the job completes before it can be stopped, it is put into the <code>COMPLETED</code> state. Otherwise, the job is put into the <code>STOPPED</code> state.</p> <p>Asynchronous batch translation jobs are started with the <a>StartTextTranslationJob</a> operation. You can use the <a>DescribeTextTranslationJob</a> or <a>ListTextTranslationJobs</a> operations to get a batch translation job's <code>JobId</code>.</p>"
+    },
     "TranslateText":{
       "name":"TranslateText",
       "http":{
@@ -92,7 +155,7 @@
         {"shape":"InternalServerException"},
         {"shape":"ServiceUnavailableException"}
       ],
-      "documentation":"<p>Translates input text from the source language to the target language. It is not necessary to use English (en) as either the source or the target language but not all language combinations are supported by Amazon Translate. For more information, see <a href=\"http://docs.aws.amazon.com/translate/latest/dg/pairs.html\">Supported Language Pairs</a>.</p> <ul> <li> <p>Arabic (ar)</p> </li> <li> <p>Chinese (Simplified) (zh)</p> </li> <li> <p>Chinese (Traditional) (zh-TW)</p> </li> <li> <p>Czech (cs)</p> </li> <li> <p>Danish (da)</p> </li> <li> <p>Dutch (nl)</p> </li> <li> <p>English (en)</p> </li> <li> <p>Finnish (fi)</p> </li> <li> <p>French (fr)</p> </li> <li> <p>German (de)</p> </li> <li> <p>Hebrew (he)</p> </li> <li> <p>Indonesian (id)</p> </li> <li> <p>Italian (it)</p> </li> <li> <p>Japanese (ja)</p> </li> <li> <p>Korean (ko)</p> </li> <li> <p>Polish (pl)</p> </li> <li> <p>Portuguese (pt)</p> </li> <li> <p>Russian (ru)</p> </li> <li> <p>Spanish (es)</p> </li> <li> <p>Swedish (sv)</p> </li> <li> <p>Turkish (tr)</p> </li> </ul> <p>To have Amazon Translate determine the source language of your text, you can specify <code>auto</code> in the <code>SourceLanguageCode</code> field. If you specify <code>auto</code>, Amazon Translate will call Amazon Comprehend to determine the source language.</p>"
+      "documentation":"<p>Translates input text from the source language to the target language. For a list of available languages and language codes, see <a>what-is-languages</a>.</p>"
     }
   },
   "shapes":{
@@ -120,6 +183,17 @@
       "min":1,
       "pattern":"[\\P{M}\\p{M}]{1,5000}"
     },
+    "ClientTokenString":{
+      "type":"string",
+      "max":64,
+      "min":1,
+      "pattern":"^[a-zA-Z0-9-]+$"
+    },
+    "ContentType":{
+      "type":"string",
+      "max":256,
+      "pattern":"^[-\\w.]+\\/[-\\w.+]+$"
+    },
     "DeleteTerminologyRequest":{
       "type":"structure",
       "required":["Name"],
@@ -130,6 +204,25 @@
         }
       }
     },
+    "DescribeTextTranslationJobRequest":{
+      "type":"structure",
+      "required":["JobId"],
+      "members":{
+        "JobId":{
+          "shape":"JobId",
+          "documentation":"<p>The identifier that Amazon Translate generated for the job. The <a>StartTextTranslationJob</a> operation returns this identifier in its response.</p>"
+        }
+      }
+    },
+    "DescribeTextTranslationJobResponse":{
+      "type":"structure",
+      "members":{
+        "TextTranslationJobProperties":{
+          "shape":"TextTranslationJobProperties",
+          "documentation":"<p>An object that contains the properties associated with an asynchronous batch translation job.</p>"
+        }
+      }
+    },
     "Description":{
       "type":"string",
       "max":256,
@@ -169,7 +262,7 @@
       "type":"string",
       "max":400,
       "min":1,
-      "pattern":"(arn:aws((-us-gov)|(-cn))?:kms:)?([a-z]{2}-[a-z]+-\\d:)?(\\d{12}:)?(((key/)?[a-zA-Z0-9-_]+)|(alias/[a-zA-Z0-9:/_-]+))"
+      "pattern":"(arn:aws((-us-gov)|(-iso)|(-iso-b)|(-cn))?:kms:)?([a-z]{2}-[a-z]+(-[a-z]+)?-\\d:)?(\\d{12}:)?(((key/)?[a-zA-Z0-9-_]+)|(alias/[a-zA-Z0-9:/_-]+))"
     },
     "EncryptionKeyType":{
       "type":"string",
@@ -205,6 +298,12 @@
         }
       }
     },
+    "IamRoleArn":{
+      "type":"string",
+      "max":2048,
+      "min":20,
+      "pattern":"arn:aws(-[^:]+)?:iam::[0-9]{12}:role/.+"
+    },
     "ImportTerminologyRequest":{
       "type":"structure",
       "required":[
@@ -244,16 +343,42 @@
         }
       }
     },
+    "InputDataConfig":{
+      "type":"structure",
+      "required":[
+        "S3Uri",
+        "ContentType"
+      ],
+      "members":{
+        "S3Uri":{
+          "shape":"S3Uri",
+          "documentation":"<p>The URI of the AWS S3 folder that contains the input file. The folder must be in the same Region as the API endpoint you are calling.</p>"
+        },
+        "ContentType":{
+          "shape":"ContentType",
+          "documentation":"<p>The multipurpose internet mail extension (MIME) type of the input files. Valid values are <code>text/plain</code> for plaintext files and <code>text/html</code> for HTML files.</p>"
+        }
+      },
+      "documentation":"<p>The input configuration properties for requesting a batch translation job.</p>"
+    },
     "Integer":{"type":"integer"},
     "InternalServerException":{
       "type":"structure",
       "members":{
         "Message":{"shape":"String"}
       },
-      "documentation":"<p> An internal server error occurred. Retry your request.</p>",
+      "documentation":"<p>An internal server error occurred. Retry your request.</p>",
       "exception":true,
       "fault":true
     },
+    "InvalidFilterException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"String"}
+      },
+      "documentation":"<p>The filter specified for the operation is invalid. Specify a different filter.</p>",
+      "exception":true
+    },
     "InvalidParameterValueException":{
       "type":"structure",
       "members":{
@@ -270,6 +395,48 @@
       "documentation":"<p> The request that you made is invalid. Check your request to determine why it's invalid and then retry the request. </p>",
       "exception":true
     },
+    "JobDetails":{
+      "type":"structure",
+      "members":{
+        "TranslatedDocumentsCount":{
+          "shape":"Integer",
+          "documentation":"<p>The number of documents successfully processed during a translation job.</p>"
+        },
+        "DocumentsWithErrorsCount":{
+          "shape":"Integer",
+          "documentation":"<p>The number of documents that could not be processed during a translation job.</p>"
+        },
+        "InputDocumentsCount":{
+          "shape":"Integer",
+          "documentation":"<p>The number of documents used as input in a translation job.</p>"
+        }
+      },
+      "documentation":"<p>The number of documents successfully and unsuccessfully processed during a translation job.</p>"
+    },
+    "JobId":{
+      "type":"string",
+      "max":32,
+      "min":1,
+      "pattern":"^([\\p{L}\\p{Z}\\p{N}_.:/=+\\-%@]*)$"
+    },
+    "JobName":{
+      "type":"string",
+      "max":256,
+      "min":1,
+      "pattern":"^([\\p{L}\\p{Z}\\p{N}_.:/=+\\-%@]*)$"
+    },
+    "JobStatus":{
+      "type":"string",
+      "enum":[
+        "SUBMITTED",
+        "IN_PROGRESS",
+        "COMPLETED",
+        "COMPLETED_WITH_ERROR",
+        "FAILED",
+        "STOP_REQUESTED",
+        "STOPPED"
+      ]
+    },
     "LanguageCodeString":{
       "type":"string",
       "max":5,
@@ -309,7 +476,37 @@
         },
         "NextToken":{
           "shape":"NextToken",
-          "documentation":"<p> If the response to the ListTerminologies was truncated, the NextToken fetches the next group of custom terminologies. </p>"
+          "documentation":"<p> If the response to the ListTerminologies was truncated, the NextToken fetches the next group of custom terminologies.</p>"
+        }
+      }
+    },
+    "ListTextTranslationJobsRequest":{
+      "type":"structure",
+      "members":{
+        "Filter":{
+          "shape":"TextTranslationJobFilter",
+          "documentation":"<p>The parameters that specify which batch translation jobs to retrieve. Filters include job name, job status, and submission time. You can only set one filter at a time.</p>"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>The token to request the next page of results.</p>"
+        },
+        "MaxResults":{
+          "shape":"MaxResultsInteger",
+          "documentation":"<p>The maximum number of results to return in each page. The default value is 100.</p>"
+        }
+      }
+    },
+    "ListTextTranslationJobsResponse":{
+      "type":"structure",
+      "members":{
+        "TextTranslationJobPropertiesList":{
+          "shape":"TextTranslationJobPropertiesList",
+          "documentation":"<p>A list containing the properties of each job that is returned.</p>"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>The token to use to retreive the next page of results. This value is <code>null</code> when there are no more results to return.</p>"
         }
       }
     },
@@ -327,6 +524,17 @@
       "max":8192,
       "pattern":"\\p{ASCII}{0,8192}"
     },
+    "OutputDataConfig":{
+      "type":"structure",
+      "required":["S3Uri"],
+      "members":{
+        "S3Uri":{
+          "shape":"S3Uri",
+          "documentation":"<p>The URI of the S3 folder that contains a translation job's output file. The folder must be in the same Region as the API endpoint that you are calling.</p>"
+        }
+      },
+      "documentation":"<p>The output configuration properties for a batch translation job.</p>"
+    },
     "ResourceName":{
       "type":"string",
       "max":256,
@@ -342,22 +550,116 @@
       "members":{
         "Message":{"shape":"String"}
       },
-      "documentation":"<p>The resource you are looking for has not been found. Review the resource you're looking for and see if a different resource will accomplish your needs before retrying the revised request. .</p>",
+      "documentation":"<p>The resource you are looking for has not been found. Review the resource you're looking for and see if a different resource will accomplish your needs before retrying the revised request.</p>",
       "exception":true
     },
+    "S3Uri":{
+      "type":"string",
+      "max":1024,
+      "pattern":"s3://[a-z0-9][\\.\\-a-z0-9]{1,61}[a-z0-9](/.*)?"
+    },
     "ServiceUnavailableException":{
       "type":"structure",
       "members":{
         "Message":{"shape":"String"}
       },
       "documentation":"<p>The Amazon Translate service is temporarily unavailable. Please wait a bit and then retry your request.</p>",
-      "exception":true
+      "exception":true,
+      "fault":true
+    },
+    "StartTextTranslationJobRequest":{
+      "type":"structure",
+      "required":[
+        "InputDataConfig",
+        "OutputDataConfig",
+        "DataAccessRoleArn",
+        "SourceLanguageCode",
+        "TargetLanguageCodes",
+        "ClientToken"
+      ],
+      "members":{
+        "JobName":{
+          "shape":"JobName",
+          "documentation":"<p>The name of the batch translation job to be performed.</p>"
+        },
+        "InputDataConfig":{
+          "shape":"InputDataConfig",
+          "documentation":"<p>Specifies the format and S3 location of the input documents for the translation job.</p>"
+        },
+        "OutputDataConfig":{
+          "shape":"OutputDataConfig",
+          "documentation":"<p>Specifies the S3 folder to which your job output will be saved. </p>"
+        },
+        "DataAccessRoleArn":{
+          "shape":"IamRoleArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of an AWS Identity Access and Management (IAM) role that grants Amazon Translate read access to your input data. For more nformation, see <a>identity-and-access-management</a>.</p>"
+        },
+        "SourceLanguageCode":{
+          "shape":"LanguageCodeString",
+          "documentation":"<p>The language code of the input language. For a list of language codes, see <a>what-is-languages</a>.</p> <p>Amazon Translate does not automatically detect a source language during batch translation jobs.</p>"
+        },
+        "TargetLanguageCodes":{
+          "shape":"TargetLanguageCodeStringList",
+          "documentation":"<p>The language code of the output language.</p>"
+        },
+        "TerminologyNames":{
+          "shape":"ResourceNameList",
+          "documentation":"<p>The name of the terminology to use in the batch translation job. For a list of available terminologies, use the <a>ListTerminologies</a> operation.</p>"
+        },
+        "ClientToken":{
+          "shape":"ClientTokenString",
+          "documentation":"<p>The client token of the EC2 instance calling the request. This token is auto-generated when using the Amazon Translate SDK. Otherwise, use the <a href=\"docs.aws.amazon.com/AWSEC2/latest/APIReference/API_DescribeInstances.html\">DescribeInstances</a> EC2 operation to retreive an instance's client token. For more information, see <a href=\"docs.aws.amazon.com/AWSEC2/latest/APIReference/Run_Instance_Idempotency.html#client-tokens\">Client Tokens</a> in the EC2 User Guide.</p>",
+          "idempotencyToken":true
+        }
+      }
+    },
+    "StartTextTranslationJobResponse":{
+      "type":"structure",
+      "members":{
+        "JobId":{
+          "shape":"JobId",
+          "documentation":"<p>The identifier generated for the job. To get the status of a job, use this ID with the <a>DescribeTextTranslationJob</a> operation.</p>"
+        },
+        "JobStatus":{
+          "shape":"JobStatus",
+          "documentation":"<p>The status of the job. Possible values include:</p> <ul> <li> <p> <code>SUBMITTED</code> - The job has been received and is queued for processing.</p> </li> <li> <p> <code>IN_PROGRESS</code> - Amazon Translate is processing the job.</p> </li> <li> <p> <code>COMPLETED</code> - The job was successfully completed and the output is available.</p> </li> <li> <p> <code>COMPLETED_WITH_ERRORS</code> - The job was completed with errors. The errors can be analyzed in the job's output.</p> </li> <li> <p> <code>FAILED</code> - The job did not complete. To get details, use the <a>DescribeTextTranslationJob</a> operation.</p> </li> <li> <p> <code>STOP_REQUESTED</code> - The user who started the job has requested that it be stopped.</p> </li> <li> <p> <code>STOPPED</code> - The job has been stopped.</p> </li> </ul>"
+        }
+      }
+    },
+    "StopTextTranslationJobRequest":{
+      "type":"structure",
+      "required":["JobId"],
+      "members":{
+        "JobId":{
+          "shape":"JobId",
+          "documentation":"<p>The job ID of the job to be stopped.</p>"
+        }
+      }
+    },
+    "StopTextTranslationJobResponse":{
+      "type":"structure",
+      "members":{
+        "JobId":{
+          "shape":"JobId",
+          "documentation":"<p>The job ID of the stopped batch translation job.</p>"
+        },
+        "JobStatus":{
+          "shape":"JobStatus",
+          "documentation":"<p>The status of the designated job. Upon successful completion, the job's status will be <code>STOPPED</code>.</p>"
+        }
+      }
     },
     "String":{
       "type":"string",
       "max":10000,
       "pattern":"[\\P{M}\\p{M}]{0,10000}"
     },
+    "TargetLanguageCodeStringList":{
+      "type":"list",
+      "member":{"shape":"LanguageCodeString"},
+      "max":1,
+      "min":1
+    },
     "Term":{
       "type":"structure",
       "members":{
@@ -378,7 +680,7 @@
     },
     "TerminologyArn":{
       "type":"string",
-      "pattern":"^arn:aws((-us-gov)|(-cn))?:translate:[a-zA-Z0-9-]+:[0-9]{12}:terminology/.+?/.+?$"
+      "pattern":"^arn:aws((-us-gov)|(-iso)|(-iso-b)|(-cn))?:translate:[a-zA-Z0-9-]+:[0-9]{12}:terminology/.+?/.+?$"
     },
     "TerminologyData":{
       "type":"structure",
@@ -389,7 +691,7 @@
       "members":{
         "File":{
           "shape":"TerminologyFile",
-          "documentation":"<p>The file containing the custom terminology data.</p>"
+          "documentation":"<p>The file containing the custom terminology data. Your version of the AWS SDK performs a Base64-encoding on this field before sending a request to the AWS service. Users of the SDK should not perform Base64-encoding themselves.</p>"
         },
         "Format":{
           "shape":"TerminologyDataFormat",
@@ -486,6 +788,90 @@
       "documentation":"<p> The size of the text you submitted exceeds the size limit. Reduce the size of the text or use a smaller document and then retry your request. </p>",
       "exception":true
     },
+    "TextTranslationJobFilter":{
+      "type":"structure",
+      "members":{
+        "JobName":{
+          "shape":"JobName",
+          "documentation":"<p>Filters the list of jobs by name.</p>"
+        },
+        "JobStatus":{
+          "shape":"JobStatus",
+          "documentation":"<p>Filters the list of jobs based by job status.</p>"
+        },
+        "SubmittedBeforeTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>Filters the list of jobs based on the time that the job was submitted for processing and returns only the jobs submitted before the specified time. Jobs are returned in ascending order, oldest to newest.</p>"
+        },
+        "SubmittedAfterTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>Filters the list of jobs based on the time that the job was submitted for processing and returns only the jobs submitted after the specified time. Jobs are returned in descending order, newest to oldest.</p>"
+        }
+      },
+      "documentation":"<p>Provides information for filtering a list of translation jobs. For more information, see <a>ListTextTranslationJobs</a>.</p>"
+    },
+    "TextTranslationJobProperties":{
+      "type":"structure",
+      "members":{
+        "JobId":{
+          "shape":"JobId",
+          "documentation":"<p>The ID of the translation job.</p>"
+        },
+        "JobName":{
+          "shape":"JobName",
+          "documentation":"<p>The user-defined name of the translation job.</p>"
+        },
+        "JobStatus":{
+          "shape":"JobStatus",
+          "documentation":"<p>The status of the translation job.</p>"
+        },
+        "JobDetails":{
+          "shape":"JobDetails",
+          "documentation":"<p>The number of documents successfully and unsuccessfully processed during the translation job.</p>"
+        },
+        "SourceLanguageCode":{
+          "shape":"LanguageCodeString",
+          "documentation":"<p>The language code of the language of the source text. The language must be a language supported by Amazon Translate.</p>"
+        },
+        "TargetLanguageCodes":{
+          "shape":"TargetLanguageCodeStringList",
+          "documentation":"<p>The language code of the language of the target text. The language must be a language supported by Amazon Translate.</p>"
+        },
+        "TerminologyNames":{
+          "shape":"ResourceNameList",
+          "documentation":"<p>A list containing the names of the terminologies applied to a translation job. Only one terminology can be applied per <a>StartTextTranslationJob</a> request at this time.</p>"
+        },
+        "Message":{
+          "shape":"UnboundedLengthString",
+          "documentation":"<p>An explanation of any errors that may have occured during the translation job.</p>"
+        },
+        "SubmittedTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>The time at which the translation job was submitted.</p>"
+        },
+        "EndTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>The time at which the translation job ended.</p>"
+        },
+        "InputDataConfig":{
+          "shape":"InputDataConfig",
+          "documentation":"<p>The input configuration properties that were specified when the job was requested.</p>"
+        },
+        "OutputDataConfig":{
+          "shape":"OutputDataConfig",
+          "documentation":"<p>The output configuration properties that were specified when the job was requested.</p>"
+        },
+        "DataAccessRoleArn":{
+          "shape":"IamRoleArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of an AWS Identity Access and Management (IAM) role that granted Amazon Translate read access to the job's input data.</p>"
+        }
+      },
+      "documentation":"<p>Provides information about a translation job.</p>"
+    },
+    "TextTranslationJobPropertiesList":{
+      "type":"list",
+      "member":{"shape":"TextTranslationJobProperties"}
+    },
     "Timestamp":{"type":"timestamp"},
     "TooManyRequestsException":{
       "type":"structure",
@@ -509,11 +895,11 @@
         },
         "TerminologyNames":{
           "shape":"ResourceNameList",
-          "documentation":"<p>The TerminologyNames list that is taken as input to the TranslateText request. This has a minimum length of 0 and a maximum length of 1.</p>"
+          "documentation":"<p>The name of the terminology list file to be used in the TranslateText request. You can use 1 terminology list at most in a <code>TranslateText</code> request. Terminology lists can contain a maximum of 256 terms.</p>"
         },
         "SourceLanguageCode":{
           "shape":"LanguageCodeString",
-          "documentation":"<p>The language code for the language of the source text. The language must be a language supported by Amazon Translate. </p> <p>To have Amazon Translate determine the source language of your text, you can specify <code>auto</code> in the <code>SourceLanguageCode</code> field. If you specify <code>auto</code>, Amazon Translate will call Amazon Comprehend to determine the source language.</p>"
+          "documentation":"<p>The language code for the language of the source text. The language must be a language supported by Amazon Translate. For a list of language codes, see <a>what-is-languages</a>.</p> <p>To have Amazon Translate determine the source language of your text, you can specify <code>auto</code> in the <code>SourceLanguageCode</code> field. If you specify <code>auto</code>, Amazon Translate will call <a href=\"https://docs.aws.amazon.com/comprehend/latest/dg/comprehend-general.html\">Amazon Comprehend</a> to determine the source language.</p>"
         },
         "TargetLanguageCode":{
           "shape":"LanguageCodeString",
@@ -531,11 +917,11 @@
       "members":{
         "TranslatedText":{
           "shape":"String",
-          "documentation":"<p>The the translated text. The maximum length of this text is 5kb.</p>"
+          "documentation":"<p>The translated text.</p>"
         },
         "SourceLanguageCode":{
           "shape":"LanguageCodeString",
-          "documentation":"<p>The language code for the language of the source text. </p>"
+          "documentation":"<p>The language code for the language of the source text.</p>"
         },
         "TargetLanguageCode":{
           "shape":"LanguageCodeString",
@@ -547,6 +933,7 @@
         }
       }
     },
+    "UnboundedLengthString":{"type":"string"},
     "UnsupportedLanguagePairException":{
       "type":"structure",
       "members":{
diff --git a/services/waf/build.properties b/services/waf/build.properties
index ecf2dae6fcb1..15ec2da1fc71 100644
--- a/services/waf/build.properties
+++ b/services/waf/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/waf/pom.xml b/services/waf/pom.xml
index 34234b37ce2b..dd59a9c1dfed 100644
--- a/services/waf/pom.xml
+++ b/services/waf/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>waf</artifactId>
     <name>AWS Java SDK :: Services :: AWS WAF</name>
diff --git a/services/waf/src/it/java/software/amazon/awssdk/services/waf/WafIntegrationTest.java b/services/waf/src/it/java/software/amazon/awssdk/services/waf/WafIntegrationTest.java
index aba899d66400..fcf279ecfc9b 100644
--- a/services/waf/src/it/java/software/amazon/awssdk/services/waf/WafIntegrationTest.java
+++ b/services/waf/src/it/java/software/amazon/awssdk/services/waf/WafIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/waf/src/it/java/software/amazon/awssdk/services/waf/regional/WafRegionalIntegrationTest.java b/services/waf/src/it/java/software/amazon/awssdk/services/waf/regional/WafRegionalIntegrationTest.java
index 13538628adca..e34b28fc82e5 100644
--- a/services/waf/src/it/java/software/amazon/awssdk/services/waf/regional/WafRegionalIntegrationTest.java
+++ b/services/waf/src/it/java/software/amazon/awssdk/services/waf/regional/WafRegionalIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/waf/src/test/resources/cucumber.properties b/services/waf/src/test/resources/cucumber.properties
index 961a7d8a0c1f..a6883399a8cf 100644
--- a/services/waf/src/test/resources/cucumber.properties
+++ b/services/waf/src/test/resources/cucumber.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/wafv2/pom.xml b/services/wafv2/pom.xml
new file mode 100644
index 000000000000..9a724742e7b4
--- /dev/null
+++ b/services/wafv2/pom.xml
@@ -0,0 +1,60 @@
+<?xml version="1.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.
+  -->
+
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>software.amazon.awssdk</groupId>
+        <artifactId>services</artifactId>
+        <version>2.11.8-SNAPSHOT</version>
+    </parent>
+    <artifactId>wafv2</artifactId>
+    <name>AWS Java SDK :: Services :: WAFV2</name>
+    <description>The AWS Java SDK for WAFV2 module holds the client classes that are used for
+        communicating with WAFV2.
+    </description>
+    <url>https://aws.amazon.com/sdkforjava</url>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifestEntries>
+                            <Automatic-Module-Name>software.amazon.awssdk.services.wafv2</Automatic-Module-Name>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>protocol-core</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>aws-json-protocol</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/services/wafv2/src/main/resources/codegen-resources/paginators-1.json b/services/wafv2/src/main/resources/codegen-resources/paginators-1.json
new file mode 100644
index 000000000000..5677bd8e4a2d
--- /dev/null
+++ b/services/wafv2/src/main/resources/codegen-resources/paginators-1.json
@@ -0,0 +1,4 @@
+{
+  "pagination": {
+  }
+}
diff --git a/services/wafv2/src/main/resources/codegen-resources/service-2.json b/services/wafv2/src/main/resources/codegen-resources/service-2.json
new file mode 100644
index 000000000000..6b2dbf9d250a
--- /dev/null
+++ b/services/wafv2/src/main/resources/codegen-resources/service-2.json
@@ -0,0 +1,3728 @@
+{
+  "version":"2.0",
+  "metadata":{
+    "apiVersion":"2019-07-29",
+    "endpointPrefix":"wafv2",
+    "jsonVersion":"1.1",
+    "protocol":"json",
+    "serviceAbbreviation":"WAFV2",
+    "serviceFullName":"AWS WAFV2",
+    "serviceId":"WAFV2",
+    "signatureVersion":"v4",
+    "targetPrefix":"AWSWAF_20190729",
+    "uid":"wafv2-2019-07-29"
+  },
+  "operations":{
+    "AssociateWebACL":{
+      "name":"AssociateWebACL",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"AssociateWebACLRequest"},
+      "output":{"shape":"AssociateWebACLResponse"},
+      "errors":[
+        {"shape":"WAFInternalErrorException"},
+        {"shape":"WAFInvalidParameterException"},
+        {"shape":"WAFNonexistentItemException"},
+        {"shape":"WAFUnavailableEntityException"},
+        {"shape":"WAFInvalidOperationException"}
+      ],
+      "documentation":"<note> <p>This is the latest version of <b>AWS WAF</b>, named AWS WAFV2, released in November, 2019. For information, including how to migrate your AWS WAF resources from the prior release, see the <a href=\"https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html\">AWS WAF Developer Guide</a>. </p> </note> <p>Associates a Web ACL with a regional application resource, to protect the resource. A regional application can be an Application Load Balancer (ALB) or an API Gateway stage. </p> <p>For AWS CloudFront, don't use this call. Instead, use your CloudFront distribution configuration. To associate a Web ACL, in the CloudFront call <code>UpdateDistribution</code>, set the web ACL ID to the Amazon Resource Name (ARN) of the Web ACL. For information, see <a href=\"https://docs.aws.amazon.com/cloudfront/latest/APIReference/API_UpdateDistribution.html\">UpdateDistribution</a>.</p>"
+    },
+    "CheckCapacity":{
+      "name":"CheckCapacity",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"CheckCapacityRequest"},
+      "output":{"shape":"CheckCapacityResponse"},
+      "errors":[
+        {"shape":"WAFInternalErrorException"},
+        {"shape":"WAFInvalidParameterException"},
+        {"shape":"WAFNonexistentItemException"},
+        {"shape":"WAFLimitsExceededException"},
+        {"shape":"WAFInvalidResourceException"},
+        {"shape":"WAFUnavailableEntityException"},
+        {"shape":"WAFSubscriptionNotFoundException"}
+      ],
+      "documentation":"<note> <p>This is the latest version of <b>AWS WAF</b>, named AWS WAFV2, released in November, 2019. For information, including how to migrate your AWS WAF resources from the prior release, see the <a href=\"https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html\">AWS WAF Developer Guide</a>. </p> </note> <p>Returns the web ACL capacity unit (WCU) requirements for a specified scope and set of rules. You can use this to check the capacity requirements for the rules you want to use in a <a>RuleGroup</a> or <a>WebACL</a>. </p> <p>AWS WAF uses WCUs to calculate and control the operating resources that are used to run your rules, rule groups, and web ACLs. AWS WAF calculates capacity differently for each rule type, to reflect the relative cost of each rule. Simple rules that cost little to run use fewer WCUs than more complex rules that use more processing power. Rule group capacity is fixed at creation, which helps users plan their web ACL WCU usage when they use a rule group. The WCU limit for web ACLs is 1,500. </p>"
+    },
+    "CreateIPSet":{
+      "name":"CreateIPSet",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"CreateIPSetRequest"},
+      "output":{"shape":"CreateIPSetResponse"},
+      "errors":[
+        {"shape":"WAFInternalErrorException"},
+        {"shape":"WAFInvalidParameterException"},
+        {"shape":"WAFDuplicateItemException"},
+        {"shape":"WAFOptimisticLockException"},
+        {"shape":"WAFLimitsExceededException"},
+        {"shape":"WAFTagOperationException"},
+        {"shape":"WAFTagOperationInternalErrorException"},
+        {"shape":"WAFInvalidOperationException"}
+      ],
+      "documentation":"<note> <p>This is the latest version of <b>AWS WAF</b>, named AWS WAFV2, released in November, 2019. For information, including how to migrate your AWS WAF resources from the prior release, see the <a href=\"https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html\">AWS WAF Developer Guide</a>. </p> </note> <p>Creates an <a>IPSet</a>, which you use to identify web requests that originate from specific IP addresses or ranges of IP addresses. For example, if you're receiving a lot of requests from a ranges of IP addresses, you can configure AWS WAF to block them using an IPSet that lists those IP addresses. </p>"
+    },
+    "CreateRegexPatternSet":{
+      "name":"CreateRegexPatternSet",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"CreateRegexPatternSetRequest"},
+      "output":{"shape":"CreateRegexPatternSetResponse"},
+      "errors":[
+        {"shape":"WAFInternalErrorException"},
+        {"shape":"WAFInvalidParameterException"},
+        {"shape":"WAFDuplicateItemException"},
+        {"shape":"WAFOptimisticLockException"},
+        {"shape":"WAFLimitsExceededException"},
+        {"shape":"WAFTagOperationException"},
+        {"shape":"WAFTagOperationInternalErrorException"},
+        {"shape":"WAFInvalidOperationException"}
+      ],
+      "documentation":"<note> <p>This is the latest version of <b>AWS WAF</b>, named AWS WAFV2, released in November, 2019. For information, including how to migrate your AWS WAF resources from the prior release, see the <a href=\"https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html\">AWS WAF Developer Guide</a>. </p> </note> <p>Creates a <a>RegexPatternSet</a>, which you reference in a <a>RegexPatternSetReferenceStatement</a>, to have AWS WAF inspect a web request component for the specified patterns.</p>"
+    },
+    "CreateRuleGroup":{
+      "name":"CreateRuleGroup",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"CreateRuleGroupRequest"},
+      "output":{"shape":"CreateRuleGroupResponse"},
+      "errors":[
+        {"shape":"WAFInternalErrorException"},
+        {"shape":"WAFInvalidParameterException"},
+        {"shape":"WAFDuplicateItemException"},
+        {"shape":"WAFOptimisticLockException"},
+        {"shape":"WAFLimitsExceededException"},
+        {"shape":"WAFUnavailableEntityException"},
+        {"shape":"WAFTagOperationException"},
+        {"shape":"WAFTagOperationInternalErrorException"},
+        {"shape":"WAFSubscriptionNotFoundException"},
+        {"shape":"WAFNonexistentItemException"},
+        {"shape":"WAFInvalidOperationException"}
+      ],
+      "documentation":"<note> <p>This is the latest version of <b>AWS WAF</b>, named AWS WAFV2, released in November, 2019. For information, including how to migrate your AWS WAF resources from the prior release, see the <a href=\"https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html\">AWS WAF Developer Guide</a>. </p> </note> <p>Creates a <a>RuleGroup</a> per the specifications provided. </p> <p> A rule group defines a collection of rules to inspect and control web requests that you can use in a <a>WebACL</a>. When you create a rule group, you define an immutable capacity limit. If you update a rule group, you must stay within the capacity. This allows others to reuse the rule group with confidence in its capacity requirements. </p>"
+    },
+    "CreateWebACL":{
+      "name":"CreateWebACL",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"CreateWebACLRequest"},
+      "output":{"shape":"CreateWebACLResponse"},
+      "errors":[
+        {"shape":"WAFInternalErrorException"},
+        {"shape":"WAFInvalidParameterException"},
+        {"shape":"WAFDuplicateItemException"},
+        {"shape":"WAFOptimisticLockException"},
+        {"shape":"WAFLimitsExceededException"},
+        {"shape":"WAFInvalidResourceException"},
+        {"shape":"WAFUnavailableEntityException"},
+        {"shape":"WAFNonexistentItemException"},
+        {"shape":"WAFTagOperationException"},
+        {"shape":"WAFTagOperationInternalErrorException"},
+        {"shape":"WAFSubscriptionNotFoundException"},
+        {"shape":"WAFInvalidOperationException"}
+      ],
+      "documentation":"<note> <p>This is the latest version of <b>AWS WAF</b>, named AWS WAFV2, released in November, 2019. For information, including how to migrate your AWS WAF resources from the prior release, see the <a href=\"https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html\">AWS WAF Developer Guide</a>. </p> </note> <p>Creates a <a>WebACL</a> per the specifications provided.</p> <p> A Web ACL defines a collection of rules to use to inspect and control web requests. Each rule has an action defined (allow, block, or count) for requests that match the statement of the rule. In the Web ACL, you assign a default action to take (allow, block) for any request that does not match any of the rules. The rules in a Web ACL can be a combination of the types <a>Rule</a>, <a>RuleGroup</a>, and managed rule group. You can associate a Web ACL with one or more AWS resources to protect. The resources can be Amazon CloudFront, an Amazon API Gateway API, or an Application Load Balancer. </p>"
+    },
+    "DeleteFirewallManagerRuleGroups":{
+      "name":"DeleteFirewallManagerRuleGroups",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DeleteFirewallManagerRuleGroupsRequest"},
+      "output":{"shape":"DeleteFirewallManagerRuleGroupsResponse"},
+      "errors":[
+        {"shape":"WAFInternalErrorException"},
+        {"shape":"WAFInvalidParameterException"},
+        {"shape":"WAFNonexistentItemException"},
+        {"shape":"WAFOptimisticLockException"},
+        {"shape":"WAFInvalidOperationException"}
+      ],
+      "documentation":"<p>Deletes all rule groups that are managed by AWS Firewall Manager for the specified web ACL. </p> <p>You can only use this if <code>ManagedByFirewallManager</code> is false in the specified <a>WebACL</a>. </p>"
+    },
+    "DeleteIPSet":{
+      "name":"DeleteIPSet",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DeleteIPSetRequest"},
+      "output":{"shape":"DeleteIPSetResponse"},
+      "errors":[
+        {"shape":"WAFInternalErrorException"},
+        {"shape":"WAFInvalidParameterException"},
+        {"shape":"WAFNonexistentItemException"},
+        {"shape":"WAFOptimisticLockException"},
+        {"shape":"WAFAssociatedItemException"},
+        {"shape":"WAFTagOperationException"},
+        {"shape":"WAFTagOperationInternalErrorException"},
+        {"shape":"WAFInvalidOperationException"}
+      ],
+      "documentation":"<note> <p>This is the latest version of <b>AWS WAF</b>, named AWS WAFV2, released in November, 2019. For information, including how to migrate your AWS WAF resources from the prior release, see the <a href=\"https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html\">AWS WAF Developer Guide</a>. </p> </note> <p>Deletes the specified <a>IPSet</a>. </p>"
+    },
+    "DeleteLoggingConfiguration":{
+      "name":"DeleteLoggingConfiguration",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DeleteLoggingConfigurationRequest"},
+      "output":{"shape":"DeleteLoggingConfigurationResponse"},
+      "errors":[
+        {"shape":"WAFInternalErrorException"},
+        {"shape":"WAFNonexistentItemException"},
+        {"shape":"WAFOptimisticLockException"},
+        {"shape":"WAFInvalidParameterException"},
+        {"shape":"WAFInvalidOperationException"}
+      ],
+      "documentation":"<note> <p>This is the latest version of <b>AWS WAF</b>, named AWS WAFV2, released in November, 2019. For information, including how to migrate your AWS WAF resources from the prior release, see the <a href=\"https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html\">AWS WAF Developer Guide</a>. </p> </note> <p>Deletes the <a>LoggingConfiguration</a> from the specified web ACL.</p>"
+    },
+    "DeletePermissionPolicy":{
+      "name":"DeletePermissionPolicy",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DeletePermissionPolicyRequest"},
+      "output":{"shape":"DeletePermissionPolicyResponse"},
+      "errors":[
+        {"shape":"WAFNonexistentItemException"},
+        {"shape":"WAFInternalErrorException"},
+        {"shape":"WAFInvalidParameterException"}
+      ],
+      "documentation":"<p>Permanently deletes an IAM policy from the specified rule group.</p> <p>You must be the owner of the rule group to perform this operation.</p>"
+    },
+    "DeleteRegexPatternSet":{
+      "name":"DeleteRegexPatternSet",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DeleteRegexPatternSetRequest"},
+      "output":{"shape":"DeleteRegexPatternSetResponse"},
+      "errors":[
+        {"shape":"WAFInternalErrorException"},
+        {"shape":"WAFInvalidParameterException"},
+        {"shape":"WAFNonexistentItemException"},
+        {"shape":"WAFOptimisticLockException"},
+        {"shape":"WAFAssociatedItemException"},
+        {"shape":"WAFTagOperationException"},
+        {"shape":"WAFTagOperationInternalErrorException"},
+        {"shape":"WAFInvalidOperationException"}
+      ],
+      "documentation":"<note> <p>This is the latest version of <b>AWS WAF</b>, named AWS WAFV2, released in November, 2019. For information, including how to migrate your AWS WAF resources from the prior release, see the <a href=\"https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html\">AWS WAF Developer Guide</a>. </p> </note> <p>Deletes the specified <a>RegexPatternSet</a>.</p>"
+    },
+    "DeleteRuleGroup":{
+      "name":"DeleteRuleGroup",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DeleteRuleGroupRequest"},
+      "output":{"shape":"DeleteRuleGroupResponse"},
+      "errors":[
+        {"shape":"WAFInternalErrorException"},
+        {"shape":"WAFInvalidParameterException"},
+        {"shape":"WAFNonexistentItemException"},
+        {"shape":"WAFOptimisticLockException"},
+        {"shape":"WAFAssociatedItemException"},
+        {"shape":"WAFTagOperationException"},
+        {"shape":"WAFTagOperationInternalErrorException"},
+        {"shape":"WAFInvalidOperationException"}
+      ],
+      "documentation":"<note> <p>This is the latest version of <b>AWS WAF</b>, named AWS WAFV2, released in November, 2019. For information, including how to migrate your AWS WAF resources from the prior release, see the <a href=\"https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html\">AWS WAF Developer Guide</a>. </p> </note> <p>Deletes the specified <a>RuleGroup</a>.</p>"
+    },
+    "DeleteWebACL":{
+      "name":"DeleteWebACL",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DeleteWebACLRequest"},
+      "output":{"shape":"DeleteWebACLResponse"},
+      "errors":[
+        {"shape":"WAFInternalErrorException"},
+        {"shape":"WAFInvalidParameterException"},
+        {"shape":"WAFNonexistentItemException"},
+        {"shape":"WAFOptimisticLockException"},
+        {"shape":"WAFAssociatedItemException"},
+        {"shape":"WAFTagOperationException"},
+        {"shape":"WAFTagOperationInternalErrorException"},
+        {"shape":"WAFInvalidOperationException"}
+      ],
+      "documentation":"<note> <p>This is the latest version of <b>AWS WAF</b>, named AWS WAFV2, released in November, 2019. For information, including how to migrate your AWS WAF resources from the prior release, see the <a href=\"https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html\">AWS WAF Developer Guide</a>. </p> </note> <p>Deletes the specified <a>WebACL</a>.</p> <p>You can only use this if <code>ManagedByFirewallManager</code> is false in the specified <a>WebACL</a>. </p>"
+    },
+    "DescribeManagedRuleGroup":{
+      "name":"DescribeManagedRuleGroup",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DescribeManagedRuleGroupRequest"},
+      "output":{"shape":"DescribeManagedRuleGroupResponse"},
+      "errors":[
+        {"shape":"WAFInternalErrorException"},
+        {"shape":"WAFInvalidParameterException"},
+        {"shape":"WAFInvalidResourceException"},
+        {"shape":"WAFNonexistentItemException"},
+        {"shape":"WAFInvalidOperationException"}
+      ],
+      "documentation":"<note> <p>This is the latest version of <b>AWS WAF</b>, named AWS WAFV2, released in November, 2019. For information, including how to migrate your AWS WAF resources from the prior release, see the <a href=\"https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html\">AWS WAF Developer Guide</a>. </p> </note> <p>Provides high-level information for a managed rule group, including descriptions of the rules. </p>"
+    },
+    "DisassociateWebACL":{
+      "name":"DisassociateWebACL",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DisassociateWebACLRequest"},
+      "output":{"shape":"DisassociateWebACLResponse"},
+      "errors":[
+        {"shape":"WAFInternalErrorException"},
+        {"shape":"WAFInvalidParameterException"},
+        {"shape":"WAFNonexistentItemException"},
+        {"shape":"WAFInvalidOperationException"}
+      ],
+      "documentation":"<note> <p>This is the latest version of <b>AWS WAF</b>, named AWS WAFV2, released in November, 2019. For information, including how to migrate your AWS WAF resources from the prior release, see the <a href=\"https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html\">AWS WAF Developer Guide</a>. </p> </note> <p>Disassociates a Web ACL from a regional application resource. A regional application can be an Application Load Balancer (ALB) or an API Gateway stage. </p> <p>For AWS CloudFront, don't use this call. Instead, use your CloudFront distribution configuration. To disassociate a Web ACL, provide an empty web ACL ID in the CloudFront call <code>UpdateDistribution</code>. For information, see <a href=\"https://docs.aws.amazon.com/cloudfront/latest/APIReference/API_UpdateDistribution.html\">UpdateDistribution</a>.</p>"
+    },
+    "GetIPSet":{
+      "name":"GetIPSet",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"GetIPSetRequest"},
+      "output":{"shape":"GetIPSetResponse"},
+      "errors":[
+        {"shape":"WAFInternalErrorException"},
+        {"shape":"WAFInvalidParameterException"},
+        {"shape":"WAFNonexistentItemException"},
+        {"shape":"WAFInvalidOperationException"}
+      ],
+      "documentation":"<note> <p>This is the latest version of <b>AWS WAF</b>, named AWS WAFV2, released in November, 2019. For information, including how to migrate your AWS WAF resources from the prior release, see the <a href=\"https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html\">AWS WAF Developer Guide</a>. </p> </note> <p>Retrieves the specified <a>IPSet</a>.</p>"
+    },
+    "GetLoggingConfiguration":{
+      "name":"GetLoggingConfiguration",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"GetLoggingConfigurationRequest"},
+      "output":{"shape":"GetLoggingConfigurationResponse"},
+      "errors":[
+        {"shape":"WAFInternalErrorException"},
+        {"shape":"WAFNonexistentItemException"},
+        {"shape":"WAFInvalidParameterException"},
+        {"shape":"WAFInvalidOperationException"}
+      ],
+      "documentation":"<note> <p>This is the latest version of <b>AWS WAF</b>, named AWS WAFV2, released in November, 2019. For information, including how to migrate your AWS WAF resources from the prior release, see the <a href=\"https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html\">AWS WAF Developer Guide</a>. </p> </note> <p>Returns the <a>LoggingConfiguration</a> for the specified web ACL.</p>"
+    },
+    "GetPermissionPolicy":{
+      "name":"GetPermissionPolicy",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"GetPermissionPolicyRequest"},
+      "output":{"shape":"GetPermissionPolicyResponse"},
+      "errors":[
+        {"shape":"WAFNonexistentItemException"},
+        {"shape":"WAFInternalErrorException"},
+        {"shape":"WAFInvalidParameterException"}
+      ],
+      "documentation":"<p>Returns the IAM policy that is attached to the specified rule group.</p> <p>You must be the owner of the rule group to perform this operation.</p>"
+    },
+    "GetRateBasedStatementManagedKeys":{
+      "name":"GetRateBasedStatementManagedKeys",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"GetRateBasedStatementManagedKeysRequest"},
+      "output":{"shape":"GetRateBasedStatementManagedKeysResponse"},
+      "errors":[
+        {"shape":"WAFInternalErrorException"},
+        {"shape":"WAFInvalidParameterException"},
+        {"shape":"WAFNonexistentItemException"},
+        {"shape":"WAFInvalidOperationException"}
+      ],
+      "documentation":"<note> <p>This is the latest version of <b>AWS WAF</b>, named AWS WAFV2, released in November, 2019. For information, including how to migrate your AWS WAF resources from the prior release, see the <a href=\"https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html\">AWS WAF Developer Guide</a>. </p> </note> <p>Retrieves the keys that are currently blocked by a rate-based rule. The maximum number of managed keys that can be blocked for a single rate-based rule is 10,000. If more than 10,000 addresses exceed the rate limit, those with the highest rates are blocked.</p>"
+    },
+    "GetRegexPatternSet":{
+      "name":"GetRegexPatternSet",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"GetRegexPatternSetRequest"},
+      "output":{"shape":"GetRegexPatternSetResponse"},
+      "errors":[
+        {"shape":"WAFInternalErrorException"},
+        {"shape":"WAFInvalidParameterException"},
+        {"shape":"WAFNonexistentItemException"},
+        {"shape":"WAFInvalidOperationException"}
+      ],
+      "documentation":"<note> <p>This is the latest version of <b>AWS WAF</b>, named AWS WAFV2, released in November, 2019. For information, including how to migrate your AWS WAF resources from the prior release, see the <a href=\"https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html\">AWS WAF Developer Guide</a>. </p> </note> <p>Retrieves the specified <a>RegexPatternSet</a>.</p>"
+    },
+    "GetRuleGroup":{
+      "name":"GetRuleGroup",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"GetRuleGroupRequest"},
+      "output":{"shape":"GetRuleGroupResponse"},
+      "errors":[
+        {"shape":"WAFInternalErrorException"},
+        {"shape":"WAFInvalidParameterException"},
+        {"shape":"WAFNonexistentItemException"},
+        {"shape":"WAFInvalidOperationException"}
+      ],
+      "documentation":"<note> <p>This is the latest version of <b>AWS WAF</b>, named AWS WAFV2, released in November, 2019. For information, including how to migrate your AWS WAF resources from the prior release, see the <a href=\"https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html\">AWS WAF Developer Guide</a>. </p> </note> <p>Retrieves the specified <a>RuleGroup</a>.</p>"
+    },
+    "GetSampledRequests":{
+      "name":"GetSampledRequests",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"GetSampledRequestsRequest"},
+      "output":{"shape":"GetSampledRequestsResponse"},
+      "errors":[
+        {"shape":"WAFNonexistentItemException"},
+        {"shape":"WAFInternalErrorException"},
+        {"shape":"WAFInvalidParameterException"}
+      ],
+      "documentation":"<note> <p>This is the latest version of <b>AWS WAF</b>, named AWS WAFV2, released in November, 2019. For information, including how to migrate your AWS WAF resources from the prior release, see the <a href=\"https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html\">AWS WAF Developer Guide</a>. </p> </note> <p>Gets detailed information about a specified number of requests--a sample--that AWS WAF randomly selects from among the first 5,000 requests that your AWS resource received during a time range that you choose. You can specify a sample size of up to 500 requests, and you can specify any time range in the previous three hours.</p> <p> <code>GetSampledRequests</code> returns a time range, which is usually the time range that you specified. However, if your resource (such as a CloudFront distribution) received 5,000 requests before the specified time range elapsed, <code>GetSampledRequests</code> returns an updated time range. This new time range indicates the actual period during which AWS WAF selected the requests in the sample.</p>"
+    },
+    "GetWebACL":{
+      "name":"GetWebACL",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"GetWebACLRequest"},
+      "output":{"shape":"GetWebACLResponse"},
+      "errors":[
+        {"shape":"WAFInternalErrorException"},
+        {"shape":"WAFInvalidParameterException"},
+        {"shape":"WAFNonexistentItemException"},
+        {"shape":"WAFInvalidOperationException"}
+      ],
+      "documentation":"<note> <p>This is the latest version of <b>AWS WAF</b>, named AWS WAFV2, released in November, 2019. For information, including how to migrate your AWS WAF resources from the prior release, see the <a href=\"https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html\">AWS WAF Developer Guide</a>. </p> </note> <p>Retrieves the specified <a>WebACL</a>.</p>"
+    },
+    "GetWebACLForResource":{
+      "name":"GetWebACLForResource",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"GetWebACLForResourceRequest"},
+      "output":{"shape":"GetWebACLForResourceResponse"},
+      "errors":[
+        {"shape":"WAFInternalErrorException"},
+        {"shape":"WAFNonexistentItemException"},
+        {"shape":"WAFInvalidParameterException"},
+        {"shape":"WAFUnavailableEntityException"},
+        {"shape":"WAFInvalidOperationException"}
+      ],
+      "documentation":"<note> <p>This is the latest version of <b>AWS WAF</b>, named AWS WAFV2, released in November, 2019. For information, including how to migrate your AWS WAF resources from the prior release, see the <a href=\"https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html\">AWS WAF Developer Guide</a>. </p> </note> <p>Retrieves the <a>WebACL</a> for the specified resource. </p>"
+    },
+    "ListAvailableManagedRuleGroups":{
+      "name":"ListAvailableManagedRuleGroups",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"ListAvailableManagedRuleGroupsRequest"},
+      "output":{"shape":"ListAvailableManagedRuleGroupsResponse"},
+      "errors":[
+        {"shape":"WAFInternalErrorException"},
+        {"shape":"WAFInvalidParameterException"},
+        {"shape":"WAFInvalidOperationException"}
+      ],
+      "documentation":"<note> <p>This is the latest version of <b>AWS WAF</b>, named AWS WAFV2, released in November, 2019. For information, including how to migrate your AWS WAF resources from the prior release, see the <a href=\"https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html\">AWS WAF Developer Guide</a>. </p> </note> <p>Retrieves an array of managed rule groups that are available for you to use. This list includes all AWS Managed Rules rule groups and the AWS Marketplace managed rule groups that you're subscribed to.</p>"
+    },
+    "ListIPSets":{
+      "name":"ListIPSets",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"ListIPSetsRequest"},
+      "output":{"shape":"ListIPSetsResponse"},
+      "errors":[
+        {"shape":"WAFInternalErrorException"},
+        {"shape":"WAFInvalidParameterException"},
+        {"shape":"WAFInvalidOperationException"}
+      ],
+      "documentation":"<note> <p>This is the latest version of <b>AWS WAF</b>, named AWS WAFV2, released in November, 2019. For information, including how to migrate your AWS WAF resources from the prior release, see the <a href=\"https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html\">AWS WAF Developer Guide</a>. </p> </note> <p>Retrieves an array of <a>IPSetSummary</a> objects for the IP sets that you manage.</p>"
+    },
+    "ListLoggingConfigurations":{
+      "name":"ListLoggingConfigurations",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"ListLoggingConfigurationsRequest"},
+      "output":{"shape":"ListLoggingConfigurationsResponse"},
+      "errors":[
+        {"shape":"WAFInternalErrorException"},
+        {"shape":"WAFInvalidParameterException"},
+        {"shape":"WAFInvalidOperationException"}
+      ],
+      "documentation":"<note> <p>This is the latest version of <b>AWS WAF</b>, named AWS WAFV2, released in November, 2019. For information, including how to migrate your AWS WAF resources from the prior release, see the <a href=\"https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html\">AWS WAF Developer Guide</a>. </p> </note> <p>Retrieves an array of your <a>LoggingConfiguration</a> objects.</p>"
+    },
+    "ListRegexPatternSets":{
+      "name":"ListRegexPatternSets",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"ListRegexPatternSetsRequest"},
+      "output":{"shape":"ListRegexPatternSetsResponse"},
+      "errors":[
+        {"shape":"WAFInternalErrorException"},
+        {"shape":"WAFInvalidParameterException"},
+        {"shape":"WAFInvalidOperationException"}
+      ],
+      "documentation":"<note> <p>This is the latest version of <b>AWS WAF</b>, named AWS WAFV2, released in November, 2019. For information, including how to migrate your AWS WAF resources from the prior release, see the <a href=\"https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html\">AWS WAF Developer Guide</a>. </p> </note> <p>Retrieves an array of <a>RegexPatternSetSummary</a> objects for the regex pattern sets that you manage.</p>"
+    },
+    "ListResourcesForWebACL":{
+      "name":"ListResourcesForWebACL",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"ListResourcesForWebACLRequest"},
+      "output":{"shape":"ListResourcesForWebACLResponse"},
+      "errors":[
+        {"shape":"WAFInternalErrorException"},
+        {"shape":"WAFNonexistentItemException"},
+        {"shape":"WAFInvalidParameterException"},
+        {"shape":"WAFInvalidOperationException"}
+      ],
+      "documentation":"<note> <p>This is the latest version of <b>AWS WAF</b>, named AWS WAFV2, released in November, 2019. For information, including how to migrate your AWS WAF resources from the prior release, see the <a href=\"https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html\">AWS WAF Developer Guide</a>. </p> </note> <p>Retrieves an array of the Amazon Resource Names (ARNs) for the regional resources that are associated with the specified web ACL. If you want the list of AWS CloudFront resources, use the AWS CloudFront call <code>ListDistributionsByWebACLId</code>. </p>"
+    },
+    "ListRuleGroups":{
+      "name":"ListRuleGroups",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"ListRuleGroupsRequest"},
+      "output":{"shape":"ListRuleGroupsResponse"},
+      "errors":[
+        {"shape":"WAFInternalErrorException"},
+        {"shape":"WAFInvalidParameterException"},
+        {"shape":"WAFInvalidOperationException"}
+      ],
+      "documentation":"<note> <p>This is the latest version of <b>AWS WAF</b>, named AWS WAFV2, released in November, 2019. For information, including how to migrate your AWS WAF resources from the prior release, see the <a href=\"https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html\">AWS WAF Developer Guide</a>. </p> </note> <p>Retrieves an array of <a>RuleGroupSummary</a> objects for the rule groups that you manage. </p>"
+    },
+    "ListTagsForResource":{
+      "name":"ListTagsForResource",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"ListTagsForResourceRequest"},
+      "output":{"shape":"ListTagsForResourceResponse"},
+      "errors":[
+        {"shape":"WAFInternalErrorException"},
+        {"shape":"WAFInvalidParameterException"},
+        {"shape":"WAFNonexistentItemException"},
+        {"shape":"WAFTagOperationException"},
+        {"shape":"WAFTagOperationInternalErrorException"},
+        {"shape":"WAFInvalidOperationException"}
+      ],
+      "documentation":"<note> <p>This is the latest version of <b>AWS WAF</b>, named AWS WAFV2, released in November, 2019. For information, including how to migrate your AWS WAF resources from the prior release, see the <a href=\"https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html\">AWS WAF Developer Guide</a>. </p> </note> <p>Retrieves the <a>TagInfoForResource</a> for the specified resource. </p>"
+    },
+    "ListWebACLs":{
+      "name":"ListWebACLs",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"ListWebACLsRequest"},
+      "output":{"shape":"ListWebACLsResponse"},
+      "errors":[
+        {"shape":"WAFInternalErrorException"},
+        {"shape":"WAFInvalidParameterException"},
+        {"shape":"WAFInvalidOperationException"}
+      ],
+      "documentation":"<note> <p>This is the latest version of <b>AWS WAF</b>, named AWS WAFV2, released in November, 2019. For information, including how to migrate your AWS WAF resources from the prior release, see the <a href=\"https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html\">AWS WAF Developer Guide</a>. </p> </note> <p>Retrieves an array of <a>WebACLSummary</a> objects for the web ACLs that you manage.</p>"
+    },
+    "PutLoggingConfiguration":{
+      "name":"PutLoggingConfiguration",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"PutLoggingConfigurationRequest"},
+      "output":{"shape":"PutLoggingConfigurationResponse"},
+      "errors":[
+        {"shape":"WAFInternalErrorException"},
+        {"shape":"WAFNonexistentItemException"},
+        {"shape":"WAFOptimisticLockException"},
+        {"shape":"WAFServiceLinkedRoleErrorException"},
+        {"shape":"WAFInvalidParameterException"},
+        {"shape":"WAFInvalidOperationException"}
+      ],
+      "documentation":"<note> <p>This is the latest version of <b>AWS WAF</b>, named AWS WAFV2, released in November, 2019. For information, including how to migrate your AWS WAF resources from the prior release, see the <a href=\"https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html\">AWS WAF Developer Guide</a>. </p> </note> <p>Enables the specified <a>LoggingConfiguration</a>, to start logging from a web ACL, according to the configuration provided.</p> <p>You can access information about all traffic that AWS WAF inspects using the following steps:</p> <ol> <li> <p>Create an Amazon Kinesis Data Firehose. </p> <p>Create the data firehose with a PUT source and in the Region that you are operating. If you are capturing logs for Amazon CloudFront, always create the firehose in US East (N. Virginia). </p> <note> <p>Do not create the data firehose using a <code>Kinesis stream</code> as your source.</p> </note> </li> <li> <p>Associate that firehose to your web ACL using a <code>PutLoggingConfiguration</code> request.</p> </li> </ol> <p>When you successfully enable logging using a <code>PutLoggingConfiguration</code> request, AWS WAF will create a service linked role with the necessary permissions to write logs to the Amazon Kinesis Data Firehose. For more information, see <a href=\"https://docs.aws.amazon.com/waf/latest/developerguide/logging.html\">Logging Web ACL Traffic Information</a> in the <i>AWS WAF Developer Guide</i>.</p>"
+    },
+    "PutPermissionPolicy":{
+      "name":"PutPermissionPolicy",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"PutPermissionPolicyRequest"},
+      "output":{"shape":"PutPermissionPolicyResponse"},
+      "errors":[
+        {"shape":"WAFNonexistentItemException"},
+        {"shape":"WAFInternalErrorException"},
+        {"shape":"WAFInvalidParameterException"},
+        {"shape":"WAFInvalidPermissionPolicyException"}
+      ],
+      "documentation":"<p>Attaches an IAM policy to the specified resource. Use this to share a rule group across accounts.</p> <p>You must be the owner of the rule group to perform this operation.</p> <p>This action is subject to the following restrictions:</p> <ul> <li> <p>You can attach only one policy with each <code>PutPermissionPolicy</code> request.</p> </li> <li> <p>The ARN in the request must be a valid WAF <a>RuleGroup</a> ARN and the rule group must exist in the same region.</p> </li> <li> <p>The user making the request must be the owner of the rule group.</p> </li> </ul>"
+    },
+    "TagResource":{
+      "name":"TagResource",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"TagResourceRequest"},
+      "output":{"shape":"TagResourceResponse"},
+      "errors":[
+        {"shape":"WAFInternalErrorException"},
+        {"shape":"WAFInvalidParameterException"},
+        {"shape":"WAFLimitsExceededException"},
+        {"shape":"WAFNonexistentItemException"},
+        {"shape":"WAFTagOperationException"},
+        {"shape":"WAFTagOperationInternalErrorException"},
+        {"shape":"WAFInvalidOperationException"}
+      ],
+      "documentation":"<note> <p>This is the latest version of <b>AWS WAF</b>, named AWS WAFV2, released in November, 2019. For information, including how to migrate your AWS WAF resources from the prior release, see the <a href=\"https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html\">AWS WAF Developer Guide</a>. </p> </note> <p>Associates tags with the specified AWS resource. Tags are key:value pairs that you can associate with AWS resources. For example, the tag key might be \"customer\" and the tag value might be \"companyA.\" You can specify one or more tags to add to each container. You can add up to 50 tags to each AWS resource.</p>"
+    },
+    "UntagResource":{
+      "name":"UntagResource",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"UntagResourceRequest"},
+      "output":{"shape":"UntagResourceResponse"},
+      "errors":[
+        {"shape":"WAFInternalErrorException"},
+        {"shape":"WAFInvalidParameterException"},
+        {"shape":"WAFNonexistentItemException"},
+        {"shape":"WAFTagOperationException"},
+        {"shape":"WAFTagOperationInternalErrorException"},
+        {"shape":"WAFInvalidOperationException"}
+      ],
+      "documentation":"<note> <p>This is the latest version of <b>AWS WAF</b>, named AWS WAFV2, released in November, 2019. For information, including how to migrate your AWS WAF resources from the prior release, see the <a href=\"https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html\">AWS WAF Developer Guide</a>. </p> </note> <p>Disassociates tags from an AWS resource. Tags are key:value pairs that you can associate with AWS resources. For example, the tag key might be \"customer\" and the tag value might be \"companyA.\" You can specify one or more tags to add to each container. You can add up to 50 tags to each AWS resource.</p>"
+    },
+    "UpdateIPSet":{
+      "name":"UpdateIPSet",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"UpdateIPSetRequest"},
+      "output":{"shape":"UpdateIPSetResponse"},
+      "errors":[
+        {"shape":"WAFInternalErrorException"},
+        {"shape":"WAFInvalidParameterException"},
+        {"shape":"WAFNonexistentItemException"},
+        {"shape":"WAFDuplicateItemException"},
+        {"shape":"WAFOptimisticLockException"},
+        {"shape":"WAFLimitsExceededException"},
+        {"shape":"WAFInvalidOperationException"}
+      ],
+      "documentation":"<note> <p>This is the latest version of <b>AWS WAF</b>, named AWS WAFV2, released in November, 2019. For information, including how to migrate your AWS WAF resources from the prior release, see the <a href=\"https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html\">AWS WAF Developer Guide</a>. </p> </note> <p>Updates the specified <a>IPSet</a>.</p>"
+    },
+    "UpdateRegexPatternSet":{
+      "name":"UpdateRegexPatternSet",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"UpdateRegexPatternSetRequest"},
+      "output":{"shape":"UpdateRegexPatternSetResponse"},
+      "errors":[
+        {"shape":"WAFInternalErrorException"},
+        {"shape":"WAFInvalidParameterException"},
+        {"shape":"WAFNonexistentItemException"},
+        {"shape":"WAFDuplicateItemException"},
+        {"shape":"WAFOptimisticLockException"},
+        {"shape":"WAFLimitsExceededException"},
+        {"shape":"WAFInvalidOperationException"}
+      ],
+      "documentation":"<note> <p>This is the latest version of <b>AWS WAF</b>, named AWS WAFV2, released in November, 2019. For information, including how to migrate your AWS WAF resources from the prior release, see the <a href=\"https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html\">AWS WAF Developer Guide</a>. </p> </note> <p>Updates the specified <a>RegexPatternSet</a>.</p>"
+    },
+    "UpdateRuleGroup":{
+      "name":"UpdateRuleGroup",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"UpdateRuleGroupRequest"},
+      "output":{"shape":"UpdateRuleGroupResponse"},
+      "errors":[
+        {"shape":"WAFInternalErrorException"},
+        {"shape":"WAFInvalidParameterException"},
+        {"shape":"WAFNonexistentItemException"},
+        {"shape":"WAFDuplicateItemException"},
+        {"shape":"WAFOptimisticLockException"},
+        {"shape":"WAFLimitsExceededException"},
+        {"shape":"WAFUnavailableEntityException"},
+        {"shape":"WAFSubscriptionNotFoundException"},
+        {"shape":"WAFInvalidOperationException"}
+      ],
+      "documentation":"<note> <p>This is the latest version of <b>AWS WAF</b>, named AWS WAFV2, released in November, 2019. For information, including how to migrate your AWS WAF resources from the prior release, see the <a href=\"https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html\">AWS WAF Developer Guide</a>. </p> </note> <p>Updates the specified <a>RuleGroup</a>.</p> <p> A rule group defines a collection of rules to inspect and control web requests that you can use in a <a>WebACL</a>. When you create a rule group, you define an immutable capacity limit. If you update a rule group, you must stay within the capacity. This allows others to reuse the rule group with confidence in its capacity requirements. </p>"
+    },
+    "UpdateWebACL":{
+      "name":"UpdateWebACL",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"UpdateWebACLRequest"},
+      "output":{"shape":"UpdateWebACLResponse"},
+      "errors":[
+        {"shape":"WAFInternalErrorException"},
+        {"shape":"WAFInvalidParameterException"},
+        {"shape":"WAFNonexistentItemException"},
+        {"shape":"WAFDuplicateItemException"},
+        {"shape":"WAFOptimisticLockException"},
+        {"shape":"WAFLimitsExceededException"},
+        {"shape":"WAFInvalidResourceException"},
+        {"shape":"WAFUnavailableEntityException"},
+        {"shape":"WAFSubscriptionNotFoundException"},
+        {"shape":"WAFInvalidOperationException"}
+      ],
+      "documentation":"<note> <p>This is the latest version of <b>AWS WAF</b>, named AWS WAFV2, released in November, 2019. For information, including how to migrate your AWS WAF resources from the prior release, see the <a href=\"https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html\">AWS WAF Developer Guide</a>. </p> </note> <p>Updates the specified <a>WebACL</a>.</p> <p> A Web ACL defines a collection of rules to use to inspect and control web requests. Each rule has an action defined (allow, block, or count) for requests that match the statement of the rule. In the Web ACL, you assign a default action to take (allow, block) for any request that does not match any of the rules. The rules in a Web ACL can be a combination of the types <a>Rule</a>, <a>RuleGroup</a>, and managed rule group. You can associate a Web ACL with one or more AWS resources to protect. The resources can be Amazon CloudFront, an Amazon API Gateway API, or an Application Load Balancer. </p>"
+    }
+  },
+  "shapes":{
+    "Action":{"type":"string"},
+    "AllQueryArguments":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<note> <p>This is the latest version of <b>AWS WAF</b>, named AWS WAFV2, released in November, 2019. For information, including how to migrate your AWS WAF resources from the prior release, see the <a href=\"https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html\">AWS WAF Developer Guide</a>. </p> </note> <p>All query arguments of a web request. </p> <p>This is used only to indicate the web request component for AWS WAF to inspect, in the <a>FieldToMatch</a> specification. </p>"
+    },
+    "AllowAction":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<note> <p>This is the latest version of <b>AWS WAF</b>, named AWS WAFV2, released in November, 2019. For information, including how to migrate your AWS WAF resources from the prior release, see the <a href=\"https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html\">AWS WAF Developer Guide</a>. </p> </note> <p>Specifies that AWS WAF should allow requests.</p> <p>This is used only in the context of other settings, for example to specify values for <a>RuleAction</a> and web ACL <a>DefaultAction</a>. </p>"
+    },
+    "AndStatement":{
+      "type":"structure",
+      "required":["Statements"],
+      "members":{
+        "Statements":{
+          "shape":"Statements",
+          "documentation":"<p>The statements to combine with AND logic. You can use any statements that can be nested. </p>"
+        }
+      },
+      "documentation":"<note> <p>This is the latest version of <b>AWS WAF</b>, named AWS WAFV2, released in November, 2019. For information, including how to migrate your AWS WAF resources from the prior release, see the <a href=\"https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html\">AWS WAF Developer Guide</a>. </p> </note> <p>A logical rule statement used to combine other rule statements with AND logic. You provide more than one <a>Statement</a> within the <code>AndStatement</code>. </p>"
+    },
+    "AssociateWebACLRequest":{
+      "type":"structure",
+      "required":[
+        "WebACLArn",
+        "ResourceArn"
+      ],
+      "members":{
+        "WebACLArn":{
+          "shape":"ResourceArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the Web ACL that you want to associate with the resource.</p>"
+        },
+        "ResourceArn":{
+          "shape":"ResourceArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the resource to associate with the web ACL. </p> <p>The ARN must be in one of the following formats:</p> <ul> <li> <p>For an Application Load Balancer: <code>arn:aws:elasticloadbalancing:<i>region</i>:<i>account-id</i>:loadbalancer/app/<i>load-balancer-name</i>/<i>load-balancer-id</i> </code> </p> </li> <li> <p>For an Amazon API Gateway stage: <code>arn:aws:apigateway:<i>region</i>::/restapis/<i>api-id</i>/stages/<i>stage-name</i> </code> </p> </li> </ul>"
+        }
+      }
+    },
+    "AssociateWebACLResponse":{
+      "type":"structure",
+      "members":{
+      }
+    },
+    "BlockAction":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<note> <p>This is the latest version of <b>AWS WAF</b>, named AWS WAFV2, released in November, 2019. For information, including how to migrate your AWS WAF resources from the prior release, see the <a href=\"https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html\">AWS WAF Developer Guide</a>. </p> </note> <p>Specifies that AWS WAF should block requests.</p> <p>This is used only in the context of other settings, for example to specify values for <a>RuleAction</a> and web ACL <a>DefaultAction</a>. </p>"
+    },
+    "Body":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<note> <p>This is the latest version of <b>AWS WAF</b>, named AWS WAFV2, released in November, 2019. For information, including how to migrate your AWS WAF resources from the prior release, see the <a href=\"https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html\">AWS WAF Developer Guide</a>. </p> </note> <p>The body of a web request. This immediately follows the request headers.</p> <p>This is used only to indicate the web request component for AWS WAF to inspect, in the <a>FieldToMatch</a> specification. </p>"
+    },
+    "Boolean":{"type":"boolean"},
+    "ByteMatchStatement":{
+      "type":"structure",
+      "required":[
+        "SearchString",
+        "FieldToMatch",
+        "TextTransformations",
+        "PositionalConstraint"
+      ],
+      "members":{
+        "SearchString":{
+          "shape":"SearchString",
+          "documentation":"<p>A string value that you want AWS WAF to search for. AWS WAF searches only in the part of web requests that you designate for inspection in <a>FieldToMatch</a>. The maximum length of the value is 50 bytes.</p> <p>Valid values depend on the component that you specify for inspection in <code>FieldToMatch</code>:</p> <ul> <li> <p> <code>Method</code>: The HTTP method that you want AWS WAF to search for. This indicates the type of operation specified in the request. </p> </li> <li> <p> <code>UriPath</code>: The value that you want AWS WAF to search for in the URI path, for example, <code>/images/daily-ad.jpg</code>. </p> </li> </ul> <p>If <code>SearchString</code> includes alphabetic characters A-Z and a-z, note that the value is case sensitive.</p> <p> <b>If you're using the AWS WAF API</b> </p> <p>Specify a base64-encoded version of the value. The maximum length of the value before you base64-encode it is 50 bytes.</p> <p>For example, suppose the value of <code>Type</code> is <code>HEADER</code> and the value of <code>Data</code> is <code>User-Agent</code>. If you want to search the <code>User-Agent</code> header for the value <code>BadBot</code>, you base64-encode <code>BadBot</code> using MIME base64-encoding and include the resulting value, <code>QmFkQm90</code>, in the value of <code>SearchString</code>.</p> <p> <b>If you're using the AWS CLI or one of the AWS SDKs</b> </p> <p>The value that you want AWS WAF to search for. The SDK automatically base64 encodes the value.</p>"
+        },
+        "FieldToMatch":{
+          "shape":"FieldToMatch",
+          "documentation":"<p>The part of a web request that you want AWS WAF to inspect. For more information, see <a>FieldToMatch</a>. </p>"
+        },
+        "TextTransformations":{
+          "shape":"TextTransformations",
+          "documentation":"<p>Text transformations eliminate some of the unusual formatting that attackers use in web requests in an effort to bypass detection. If you specify one or more transformations in a rule statement, AWS WAF performs all transformations on the content of the request component identified by <code>FieldToMatch</code>, starting from the lowest priority setting, before inspecting the content for a match.</p>"
+        },
+        "PositionalConstraint":{
+          "shape":"PositionalConstraint",
+          "documentation":"<p>The area within the portion of a web request that you want AWS WAF to search for <code>SearchString</code>. Valid values include the following:</p> <p> <b>CONTAINS</b> </p> <p>The specified part of the web request must include the value of <code>SearchString</code>, but the location doesn't matter.</p> <p> <b>CONTAINS_WORD</b> </p> <p>The specified part of the web request must include the value of <code>SearchString</code>, and <code>SearchString</code> must contain only alphanumeric characters or underscore (A-Z, a-z, 0-9, or _). In addition, <code>SearchString</code> must be a word, which means that both of the following are true:</p> <ul> <li> <p> <code>SearchString</code> is at the beginning of the specified part of the web request or is preceded by a character other than an alphanumeric character or underscore (_). Examples include the value of a header and <code>;BadBot</code>.</p> </li> <li> <p> <code>SearchString</code> is at the end of the specified part of the web request or is followed by a character other than an alphanumeric character or underscore (_), for example, <code>BadBot;</code> and <code>-BadBot;</code>.</p> </li> </ul> <p> <b>EXACTLY</b> </p> <p>The value of the specified part of the web request must exactly match the value of <code>SearchString</code>.</p> <p> <b>STARTS_WITH</b> </p> <p>The value of <code>SearchString</code> must appear at the beginning of the specified part of the web request.</p> <p> <b>ENDS_WITH</b> </p> <p>The value of <code>SearchString</code> must appear at the end of the specified part of the web request.</p>"
+        }
+      },
+      "documentation":"<note> <p>This is the latest version of <b>AWS WAF</b>, named AWS WAFV2, released in November, 2019. For information, including how to migrate your AWS WAF resources from the prior release, see the <a href=\"https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html\">AWS WAF Developer Guide</a>. </p> </note> <p>A rule statement that defines a string match search for AWS WAF to apply to web requests. The byte match statement provides the bytes to search for, the location in requests that you want AWS WAF to search, and other settings. The bytes to search for are typically a string that corresponds with ASCII characters. In the AWS WAF console and the developer guide, this is refered to as a string match statement.</p>"
+    },
+    "CapacityUnit":{
+      "type":"long",
+      "min":1
+    },
+    "CheckCapacityRequest":{
+      "type":"structure",
+      "required":[
+        "Scope",
+        "Rules"
+      ],
+      "members":{
+        "Scope":{
+          "shape":"Scope",
+          "documentation":"<p>Specifies whether this is for an AWS CloudFront distribution or for a regional application. A regional application can be an Application Load Balancer (ALB) or an API Gateway stage. </p> <p>To work with CloudFront, you must also specify the Region US East (N. Virginia) as follows: </p> <ul> <li> <p>CLI - Specify the Region when you use the CloudFront scope: <code>--scope=CLOUDFRONT --region=us-east-1</code>. </p> </li> <li> <p>API and SDKs - For all calls, use the Region endpoint us-east-1. </p> </li> </ul>"
+        },
+        "Rules":{
+          "shape":"Rules",
+          "documentation":"<p>An array of <a>Rule</a> that you're configuring to use in a rule group or web ACL. </p>"
+        }
+      }
+    },
+    "CheckCapacityResponse":{
+      "type":"structure",
+      "members":{
+        "Capacity":{
+          "shape":"ConsumedCapacity",
+          "documentation":"<p>The capacity required by the rules and scope.</p>"
+        }
+      }
+    },
+    "ComparisonOperator":{
+      "type":"string",
+      "enum":[
+        "EQ",
+        "NE",
+        "LE",
+        "LT",
+        "GE",
+        "GT"
+      ]
+    },
+    "ConsumedCapacity":{
+      "type":"long",
+      "min":0
+    },
+    "CountAction":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<note> <p>This is the latest version of <b>AWS WAF</b>, named AWS WAFV2, released in November, 2019. For information, including how to migrate your AWS WAF resources from the prior release, see the <a href=\"https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html\">AWS WAF Developer Guide</a>. </p> </note> <p>Specifies that AWS WAF should count requests.</p> <p>This is used only in the context of other settings, for example to specify values for <a>RuleAction</a> and web ACL <a>DefaultAction</a>. </p>"
+    },
+    "Country":{"type":"string"},
+    "CountryCode":{
+      "type":"string",
+      "enum":[
+        "AF",
+        "AX",
+        "AL",
+        "DZ",
+        "AS",
+        "AD",
+        "AO",
+        "AI",
+        "AQ",
+        "AG",
+        "AR",
+        "AM",
+        "AW",
+        "AU",
+        "AT",
+        "AZ",
+        "BS",
+        "BH",
+        "BD",
+        "BB",
+        "BY",
+        "BE",
+        "BZ",
+        "BJ",
+        "BM",
+        "BT",
+        "BO",
+        "BQ",
+        "BA",
+        "BW",
+        "BV",
+        "BR",
+        "IO",
+        "BN",
+        "BG",
+        "BF",
+        "BI",
+        "KH",
+        "CM",
+        "CA",
+        "CV",
+        "KY",
+        "CF",
+        "TD",
+        "CL",
+        "CN",
+        "CX",
+        "CC",
+        "CO",
+        "KM",
+        "CG",
+        "CD",
+        "CK",
+        "CR",
+        "CI",
+        "HR",
+        "CU",
+        "CW",
+        "CY",
+        "CZ",
+        "DK",
+        "DJ",
+        "DM",
+        "DO",
+        "EC",
+        "EG",
+        "SV",
+        "GQ",
+        "ER",
+        "EE",
+        "ET",
+        "FK",
+        "FO",
+        "FJ",
+        "FI",
+        "FR",
+        "GF",
+        "PF",
+        "TF",
+        "GA",
+        "GM",
+        "GE",
+        "DE",
+        "GH",
+        "GI",
+        "GR",
+        "GL",
+        "GD",
+        "GP",
+        "GU",
+        "GT",
+        "GG",
+        "GN",
+        "GW",
+        "GY",
+        "HT",
+        "HM",
+        "VA",
+        "HN",
+        "HK",
+        "HU",
+        "IS",
+        "IN",
+        "ID",
+        "IR",
+        "IQ",
+        "IE",
+        "IM",
+        "IL",
+        "IT",
+        "JM",
+        "JP",
+        "JE",
+        "JO",
+        "KZ",
+        "KE",
+        "KI",
+        "KP",
+        "KR",
+        "KW",
+        "KG",
+        "LA",
+        "LV",
+        "LB",
+        "LS",
+        "LR",
+        "LY",
+        "LI",
+        "LT",
+        "LU",
+        "MO",
+        "MK",
+        "MG",
+        "MW",
+        "MY",
+        "MV",
+        "ML",
+        "MT",
+        "MH",
+        "MQ",
+        "MR",
+        "MU",
+        "YT",
+        "MX",
+        "FM",
+        "MD",
+        "MC",
+        "MN",
+        "ME",
+        "MS",
+        "MA",
+        "MZ",
+        "MM",
+        "NA",
+        "NR",
+        "NP",
+        "NL",
+        "NC",
+        "NZ",
+        "NI",
+        "NE",
+        "NG",
+        "NU",
+        "NF",
+        "MP",
+        "NO",
+        "OM",
+        "PK",
+        "PW",
+        "PS",
+        "PA",
+        "PG",
+        "PY",
+        "PE",
+        "PH",
+        "PN",
+        "PL",
+        "PT",
+        "PR",
+        "QA",
+        "RE",
+        "RO",
+        "RU",
+        "RW",
+        "BL",
+        "SH",
+        "KN",
+        "LC",
+        "MF",
+        "PM",
+        "VC",
+        "WS",
+        "SM",
+        "ST",
+        "SA",
+        "SN",
+        "RS",
+        "SC",
+        "SL",
+        "SG",
+        "SX",
+        "SK",
+        "SI",
+        "SB",
+        "SO",
+        "ZA",
+        "GS",
+        "SS",
+        "ES",
+        "LK",
+        "SD",
+        "SR",
+        "SJ",
+        "SZ",
+        "SE",
+        "CH",
+        "SY",
+        "TW",
+        "TJ",
+        "TZ",
+        "TH",
+        "TL",
+        "TG",
+        "TK",
+        "TO",
+        "TT",
+        "TN",
+        "TR",
+        "TM",
+        "TC",
+        "TV",
+        "UG",
+        "UA",
+        "AE",
+        "GB",
+        "US",
+        "UM",
+        "UY",
+        "UZ",
+        "VU",
+        "VE",
+        "VN",
+        "VG",
+        "VI",
+        "WF",
+        "EH",
+        "YE",
+        "ZM",
+        "ZW"
+      ]
+    },
+    "CountryCodes":{
+      "type":"list",
+      "member":{"shape":"CountryCode"},
+      "min":1
+    },
+    "CreateIPSetRequest":{
+      "type":"structure",
+      "required":[
+        "Name",
+        "Scope",
+        "IPAddressVersion",
+        "Addresses"
+      ],
+      "members":{
+        "Name":{
+          "shape":"EntityName",
+          "documentation":"<p>The name of the IP set. You cannot change the name of an <code>IPSet</code> after you create it.</p>"
+        },
+        "Scope":{
+          "shape":"Scope",
+          "documentation":"<p>Specifies whether this is for an AWS CloudFront distribution or for a regional application. A regional application can be an Application Load Balancer (ALB) or an API Gateway stage. </p> <p>To work with CloudFront, you must also specify the Region US East (N. Virginia) as follows: </p> <ul> <li> <p>CLI - Specify the Region when you use the CloudFront scope: <code>--scope=CLOUDFRONT --region=us-east-1</code>. </p> </li> <li> <p>API and SDKs - For all calls, use the Region endpoint us-east-1. </p> </li> </ul>"
+        },
+        "Description":{
+          "shape":"EntityDescription",
+          "documentation":"<p>A description of the IP set that helps with identification. You cannot change the description of an IP set after you create it.</p>"
+        },
+        "IPAddressVersion":{
+          "shape":"IPAddressVersion",
+          "documentation":"<p>Specify IPV4 or IPV6. </p>"
+        },
+        "Addresses":{
+          "shape":"IPAddresses",
+          "documentation":"<p>Contains an array of strings that specify one or more IP addresses or blocks of IP addresses in Classless Inter-Domain Routing (CIDR) notation. AWS WAF supports all address ranges for IP versions IPv4 and IPv6. </p> <p>Examples: </p> <ul> <li> <p>To configure AWS WAF to allow, block, or count requests that originated from the IP address 192.0.2.44, specify <code>192.0.2.44/32</code>.</p> </li> <li> <p>To configure AWS WAF to allow, block, or count requests that originated from IP addresses from 192.0.2.0 to 192.0.2.255, specify <code>192.0.2.0/24</code>.</p> </li> <li> <p>To configure AWS WAF to allow, block, or count requests that originated from the IP address 1111:0000:0000:0000:0000:0000:0000:0111, specify <code>1111:0000:0000:0000:0000:0000:0000:0111/128</code>.</p> </li> <li> <p>To configure AWS WAF to allow, block, or count requests that originated from IP addresses 1111:0000:0000:0000:0000:0000:0000:0000 to 1111:0000:0000:0000:ffff:ffff:ffff:ffff, specify <code>1111:0000:0000:0000:0000:0000:0000:0000/64</code>.</p> </li> </ul> <p>For more information about CIDR notation, see the Wikipedia entry <a href=\"https://en.wikipedia.org/wiki/Classless_Inter-Domain_Routing\">Classless Inter-Domain Routing</a>.</p>"
+        },
+        "Tags":{
+          "shape":"TagList",
+          "documentation":"<p>An array of key:value pairs to associate with the resource.</p>"
+        }
+      }
+    },
+    "CreateIPSetResponse":{
+      "type":"structure",
+      "members":{
+        "Summary":{
+          "shape":"IPSetSummary",
+          "documentation":"<p>High-level information about an <a>IPSet</a>, returned by operations like create and list. This provides information like the ID, that you can use to retrieve and manage an <code>IPSet</code>, and the ARN, that you provide to the <a>IPSetReferenceStatement</a> to use the address set in a <a>Rule</a>.</p>"
+        }
+      }
+    },
+    "CreateRegexPatternSetRequest":{
+      "type":"structure",
+      "required":[
+        "Name",
+        "Scope",
+        "RegularExpressionList"
+      ],
+      "members":{
+        "Name":{
+          "shape":"EntityName",
+          "documentation":"<p>The name of the set. You cannot change the name after you create the set.</p>"
+        },
+        "Scope":{
+          "shape":"Scope",
+          "documentation":"<p>Specifies whether this is for an AWS CloudFront distribution or for a regional application. A regional application can be an Application Load Balancer (ALB) or an API Gateway stage. </p> <p>To work with CloudFront, you must also specify the Region US East (N. Virginia) as follows: </p> <ul> <li> <p>CLI - Specify the Region when you use the CloudFront scope: <code>--scope=CLOUDFRONT --region=us-east-1</code>. </p> </li> <li> <p>API and SDKs - For all calls, use the Region endpoint us-east-1. </p> </li> </ul>"
+        },
+        "Description":{
+          "shape":"EntityDescription",
+          "documentation":"<p>A description of the set that helps with identification. You cannot change the description of a set after you create it.</p>"
+        },
+        "RegularExpressionList":{
+          "shape":"RegularExpressionList",
+          "documentation":"<p>Array of regular expression strings. </p>"
+        },
+        "Tags":{
+          "shape":"TagList",
+          "documentation":"<p>An array of key:value pairs to associate with the resource.</p>"
+        }
+      }
+    },
+    "CreateRegexPatternSetResponse":{
+      "type":"structure",
+      "members":{
+        "Summary":{
+          "shape":"RegexPatternSetSummary",
+          "documentation":"<p>High-level information about a <a>RegexPatternSet</a>, returned by operations like create and list. This provides information like the ID, that you can use to retrieve and manage a <code>RegexPatternSet</code>, and the ARN, that you provide to the <a>RegexPatternSetReferenceStatement</a> to use the pattern set in a <a>Rule</a>.</p>"
+        }
+      }
+    },
+    "CreateRuleGroupRequest":{
+      "type":"structure",
+      "required":[
+        "Name",
+        "Scope",
+        "Capacity",
+        "VisibilityConfig"
+      ],
+      "members":{
+        "Name":{
+          "shape":"EntityName",
+          "documentation":"<p>The name of the rule group. You cannot change the name of a rule group after you create it.</p>"
+        },
+        "Scope":{
+          "shape":"Scope",
+          "documentation":"<p>Specifies whether this is for an AWS CloudFront distribution or for a regional application. A regional application can be an Application Load Balancer (ALB) or an API Gateway stage. </p> <p>To work with CloudFront, you must also specify the Region US East (N. Virginia) as follows: </p> <ul> <li> <p>CLI - Specify the Region when you use the CloudFront scope: <code>--scope=CLOUDFRONT --region=us-east-1</code>. </p> </li> <li> <p>API and SDKs - For all calls, use the Region endpoint us-east-1. </p> </li> </ul>"
+        },
+        "Capacity":{
+          "shape":"CapacityUnit",
+          "documentation":"<p>The web ACL capacity units (WCUs) required for this rule group.</p> <p>When you create your own rule group, you define this, and you cannot change it after creation. When you add or modify the rules in a rule group, AWS WAF enforces this limit. You can check the capacity for a set of rules using <a>CheckCapacity</a>.</p> <p>AWS WAF uses WCUs to calculate and control the operating resources that are used to run your rules, rule groups, and web ACLs. AWS WAF calculates capacity differently for each rule type, to reflect the relative cost of each rule. Simple rules that cost little to run use fewer WCUs than more complex rules that use more processing power. Rule group capacity is fixed at creation, which helps users plan their web ACL WCU usage when they use a rule group. The WCU limit for web ACLs is 1,500. </p>"
+        },
+        "Description":{
+          "shape":"EntityDescription",
+          "documentation":"<p>A description of the rule group that helps with identification. You cannot change the description of a rule group after you create it.</p>"
+        },
+        "Rules":{
+          "shape":"Rules",
+          "documentation":"<p>The <a>Rule</a> statements used to identify the web requests that you want to allow, block, or count. Each rule includes one top-level statement that AWS WAF uses to identify matching web requests, and parameters that govern how AWS WAF handles them. </p>"
+        },
+        "VisibilityConfig":{
+          "shape":"VisibilityConfig",
+          "documentation":"<p>Defines and enables Amazon CloudWatch metrics and web request sample collection. </p>"
+        },
+        "Tags":{
+          "shape":"TagList",
+          "documentation":"<p>An array of key:value pairs to associate with the resource.</p>"
+        }
+      }
+    },
+    "CreateRuleGroupResponse":{
+      "type":"structure",
+      "members":{
+        "Summary":{
+          "shape":"RuleGroupSummary",
+          "documentation":"<p>High-level information about a <a>RuleGroup</a>, returned by operations like create and list. This provides information like the ID, that you can use to retrieve and manage a <code>RuleGroup</code>, and the ARN, that you provide to the <a>RuleGroupReferenceStatement</a> to use the rule group in a <a>Rule</a>.</p>"
+        }
+      }
+    },
+    "CreateWebACLRequest":{
+      "type":"structure",
+      "required":[
+        "Name",
+        "Scope",
+        "DefaultAction",
+        "VisibilityConfig"
+      ],
+      "members":{
+        "Name":{
+          "shape":"EntityName",
+          "documentation":"<p>The name of the Web ACL. You cannot change the name of a Web ACL after you create it.</p>"
+        },
+        "Scope":{
+          "shape":"Scope",
+          "documentation":"<p>Specifies whether this is for an AWS CloudFront distribution or for a regional application. A regional application can be an Application Load Balancer (ALB) or an API Gateway stage. </p> <p>To work with CloudFront, you must also specify the Region US East (N. Virginia) as follows: </p> <ul> <li> <p>CLI - Specify the Region when you use the CloudFront scope: <code>--scope=CLOUDFRONT --region=us-east-1</code>. </p> </li> <li> <p>API and SDKs - For all calls, use the Region endpoint us-east-1. </p> </li> </ul>"
+        },
+        "DefaultAction":{
+          "shape":"DefaultAction",
+          "documentation":"<p>The action to perform if none of the <code>Rules</code> contained in the <code>WebACL</code> match. </p>"
+        },
+        "Description":{
+          "shape":"EntityDescription",
+          "documentation":"<p>A description of the Web ACL that helps with identification. You cannot change the description of a Web ACL after you create it.</p>"
+        },
+        "Rules":{
+          "shape":"Rules",
+          "documentation":"<p>The <a>Rule</a> statements used to identify the web requests that you want to allow, block, or count. Each rule includes one top-level statement that AWS WAF uses to identify matching web requests, and parameters that govern how AWS WAF handles them. </p>"
+        },
+        "VisibilityConfig":{
+          "shape":"VisibilityConfig",
+          "documentation":"<p>Defines and enables Amazon CloudWatch metrics and web request sample collection. </p>"
+        },
+        "Tags":{
+          "shape":"TagList",
+          "documentation":"<p>An array of key:value pairs to associate with the resource.</p>"
+        }
+      }
+    },
+    "CreateWebACLResponse":{
+      "type":"structure",
+      "members":{
+        "Summary":{
+          "shape":"WebACLSummary",
+          "documentation":"<p>High-level information about a <a>WebACL</a>, returned by operations like create and list. This provides information like the ID, that you can use to retrieve and manage a <code>WebACL</code>, and the ARN, that you provide to operations like <a>AssociateWebACL</a>.</p>"
+        }
+      }
+    },
+    "DefaultAction":{
+      "type":"structure",
+      "members":{
+        "Block":{
+          "shape":"BlockAction",
+          "documentation":"<p>Specifies that AWS WAF should block requests by default. </p>"
+        },
+        "Allow":{
+          "shape":"AllowAction",
+          "documentation":"<p>Specifies that AWS WAF should allow requests by default.</p>"
+        }
+      },
+      "documentation":"<note> <p>This is the latest version of <b>AWS WAF</b>, named AWS WAFV2, released in November, 2019. For information, including how to migrate your AWS WAF resources from the prior release, see the <a href=\"https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html\">AWS WAF Developer Guide</a>. </p> </note> <p>In a <a>WebACL</a>, this is the action that you want AWS WAF to perform when a web request doesn't match any of the rules in the <code>WebACL</code>. The default action must be a terminating action, so count is not allowed.</p>"
+    },
+    "DeleteFirewallManagerRuleGroupsRequest":{
+      "type":"structure",
+      "required":[
+        "WebACLArn",
+        "WebACLLockToken"
+      ],
+      "members":{
+        "WebACLArn":{
+          "shape":"ResourceArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the web ACL.</p>"
+        },
+        "WebACLLockToken":{
+          "shape":"LockToken",
+          "documentation":"<p>A token used for optimistic locking. AWS WAF returns a token to your get and list requests, to mark the state of the entity at the time of the request. To make changes to the entity associated with the token, you provide the token to operations like update and delete. AWS WAF uses the token to ensure that no changes have been made to the entity since you last retrieved it. If a change has been made, the update fails with a <code>WAFOptimisticLockException</code>. If this happens, perform another get, and use the new token returned by that operation. </p>"
+        }
+      }
+    },
+    "DeleteFirewallManagerRuleGroupsResponse":{
+      "type":"structure",
+      "members":{
+        "NextWebACLLockToken":{
+          "shape":"LockToken",
+          "documentation":"<p>A token used for optimistic locking. AWS WAF returns a token to your get and list requests, to mark the state of the entity at the time of the request. To make changes to the entity associated with the token, you provide the token to operations like update and delete. AWS WAF uses the token to ensure that no changes have been made to the entity since you last retrieved it. If a change has been made, the update fails with a <code>WAFOptimisticLockException</code>. If this happens, perform another get, and use the new token returned by that operation. </p>"
+        }
+      }
+    },
+    "DeleteIPSetRequest":{
+      "type":"structure",
+      "required":[
+        "Name",
+        "Scope",
+        "Id",
+        "LockToken"
+      ],
+      "members":{
+        "Name":{
+          "shape":"EntityName",
+          "documentation":"<p>The name of the IP set. You cannot change the name of an <code>IPSet</code> after you create it.</p>"
+        },
+        "Scope":{
+          "shape":"Scope",
+          "documentation":"<p>Specifies whether this is for an AWS CloudFront distribution or for a regional application. A regional application can be an Application Load Balancer (ALB) or an API Gateway stage. </p> <p>To work with CloudFront, you must also specify the Region US East (N. Virginia) as follows: </p> <ul> <li> <p>CLI - Specify the Region when you use the CloudFront scope: <code>--scope=CLOUDFRONT --region=us-east-1</code>. </p> </li> <li> <p>API and SDKs - For all calls, use the Region endpoint us-east-1. </p> </li> </ul>"
+        },
+        "Id":{
+          "shape":"EntityId",
+          "documentation":"<p>A unique identifier for the set. This ID is returned in the responses to create and list commands. You provide it to operations like update and delete.</p>"
+        },
+        "LockToken":{
+          "shape":"LockToken",
+          "documentation":"<p>A token used for optimistic locking. AWS WAF returns a token to your get and list requests, to mark the state of the entity at the time of the request. To make changes to the entity associated with the token, you provide the token to operations like update and delete. AWS WAF uses the token to ensure that no changes have been made to the entity since you last retrieved it. If a change has been made, the update fails with a <code>WAFOptimisticLockException</code>. If this happens, perform another get, and use the new token returned by that operation. </p>"
+        }
+      }
+    },
+    "DeleteIPSetResponse":{
+      "type":"structure",
+      "members":{
+      }
+    },
+    "DeleteLoggingConfigurationRequest":{
+      "type":"structure",
+      "required":["ResourceArn"],
+      "members":{
+        "ResourceArn":{
+          "shape":"ResourceArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the web ACL from which you want to delete the <a>LoggingConfiguration</a>.</p>"
+        }
+      }
+    },
+    "DeleteLoggingConfigurationResponse":{
+      "type":"structure",
+      "members":{
+      }
+    },
+    "DeletePermissionPolicyRequest":{
+      "type":"structure",
+      "required":["ResourceArn"],
+      "members":{
+        "ResourceArn":{
+          "shape":"ResourceArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the rule group from which you want to delete the policy.</p> <p>You must be the owner of the rule group to perform this operation.</p>"
+        }
+      }
+    },
+    "DeletePermissionPolicyResponse":{
+      "type":"structure",
+      "members":{
+      }
+    },
+    "DeleteRegexPatternSetRequest":{
+      "type":"structure",
+      "required":[
+        "Name",
+        "Scope",
+        "Id",
+        "LockToken"
+      ],
+      "members":{
+        "Name":{
+          "shape":"EntityName",
+          "documentation":"<p>The name of the set. You cannot change the name after you create the set.</p>"
+        },
+        "Scope":{
+          "shape":"Scope",
+          "documentation":"<p>Specifies whether this is for an AWS CloudFront distribution or for a regional application. A regional application can be an Application Load Balancer (ALB) or an API Gateway stage. </p> <p>To work with CloudFront, you must also specify the Region US East (N. Virginia) as follows: </p> <ul> <li> <p>CLI - Specify the Region when you use the CloudFront scope: <code>--scope=CLOUDFRONT --region=us-east-1</code>. </p> </li> <li> <p>API and SDKs - For all calls, use the Region endpoint us-east-1. </p> </li> </ul>"
+        },
+        "Id":{
+          "shape":"EntityId",
+          "documentation":"<p>A unique identifier for the set. This ID is returned in the responses to create and list commands. You provide it to operations like update and delete.</p>"
+        },
+        "LockToken":{
+          "shape":"LockToken",
+          "documentation":"<p>A token used for optimistic locking. AWS WAF returns a token to your get and list requests, to mark the state of the entity at the time of the request. To make changes to the entity associated with the token, you provide the token to operations like update and delete. AWS WAF uses the token to ensure that no changes have been made to the entity since you last retrieved it. If a change has been made, the update fails with a <code>WAFOptimisticLockException</code>. If this happens, perform another get, and use the new token returned by that operation. </p>"
+        }
+      }
+    },
+    "DeleteRegexPatternSetResponse":{
+      "type":"structure",
+      "members":{
+      }
+    },
+    "DeleteRuleGroupRequest":{
+      "type":"structure",
+      "required":[
+        "Name",
+        "Scope",
+        "Id",
+        "LockToken"
+      ],
+      "members":{
+        "Name":{
+          "shape":"EntityName",
+          "documentation":"<p>The name of the rule group. You cannot change the name of a rule group after you create it.</p>"
+        },
+        "Scope":{
+          "shape":"Scope",
+          "documentation":"<p>Specifies whether this is for an AWS CloudFront distribution or for a regional application. A regional application can be an Application Load Balancer (ALB) or an API Gateway stage. </p> <p>To work with CloudFront, you must also specify the Region US East (N. Virginia) as follows: </p> <ul> <li> <p>CLI - Specify the Region when you use the CloudFront scope: <code>--scope=CLOUDFRONT --region=us-east-1</code>. </p> </li> <li> <p>API and SDKs - For all calls, use the Region endpoint us-east-1. </p> </li> </ul>"
+        },
+        "Id":{
+          "shape":"EntityId",
+          "documentation":"<p>A unique identifier for the rule group. This ID is returned in the responses to create and list commands. You provide it to operations like update and delete.</p>"
+        },
+        "LockToken":{
+          "shape":"LockToken",
+          "documentation":"<p>A token used for optimistic locking. AWS WAF returns a token to your get and list requests, to mark the state of the entity at the time of the request. To make changes to the entity associated with the token, you provide the token to operations like update and delete. AWS WAF uses the token to ensure that no changes have been made to the entity since you last retrieved it. If a change has been made, the update fails with a <code>WAFOptimisticLockException</code>. If this happens, perform another get, and use the new token returned by that operation. </p>"
+        }
+      }
+    },
+    "DeleteRuleGroupResponse":{
+      "type":"structure",
+      "members":{
+      }
+    },
+    "DeleteWebACLRequest":{
+      "type":"structure",
+      "required":[
+        "Name",
+        "Scope",
+        "Id",
+        "LockToken"
+      ],
+      "members":{
+        "Name":{
+          "shape":"EntityName",
+          "documentation":"<p>The name of the Web ACL. You cannot change the name of a Web ACL after you create it.</p>"
+        },
+        "Scope":{
+          "shape":"Scope",
+          "documentation":"<p>Specifies whether this is for an AWS CloudFront distribution or for a regional application. A regional application can be an Application Load Balancer (ALB) or an API Gateway stage. </p> <p>To work with CloudFront, you must also specify the Region US East (N. Virginia) as follows: </p> <ul> <li> <p>CLI - Specify the Region when you use the CloudFront scope: <code>--scope=CLOUDFRONT --region=us-east-1</code>. </p> </li> <li> <p>API and SDKs - For all calls, use the Region endpoint us-east-1. </p> </li> </ul>"
+        },
+        "Id":{
+          "shape":"EntityId",
+          "documentation":"<p>The unique identifier for the Web ACL. This ID is returned in the responses to create and list commands. You provide it to operations like update and delete.</p>"
+        },
+        "LockToken":{
+          "shape":"LockToken",
+          "documentation":"<p>A token used for optimistic locking. AWS WAF returns a token to your get and list requests, to mark the state of the entity at the time of the request. To make changes to the entity associated with the token, you provide the token to operations like update and delete. AWS WAF uses the token to ensure that no changes have been made to the entity since you last retrieved it. If a change has been made, the update fails with a <code>WAFOptimisticLockException</code>. If this happens, perform another get, and use the new token returned by that operation. </p>"
+        }
+      }
+    },
+    "DeleteWebACLResponse":{
+      "type":"structure",
+      "members":{
+      }
+    },
+    "DescribeManagedRuleGroupRequest":{
+      "type":"structure",
+      "required":[
+        "VendorName",
+        "Name",
+        "Scope"
+      ],
+      "members":{
+        "VendorName":{
+          "shape":"VendorName",
+          "documentation":"<p>The name of the managed rule group vendor. You use this, along with the rule group name, to identify the rule group.</p>"
+        },
+        "Name":{
+          "shape":"EntityName",
+          "documentation":"<p>The name of the managed rule group. You use this, along with the vendor name, to identify the rule group.</p>"
+        },
+        "Scope":{
+          "shape":"Scope",
+          "documentation":"<p>Specifies whether this is for an AWS CloudFront distribution or for a regional application. A regional application can be an Application Load Balancer (ALB) or an API Gateway stage. </p> <p>To work with CloudFront, you must also specify the Region US East (N. Virginia) as follows: </p> <ul> <li> <p>CLI - Specify the Region when you use the CloudFront scope: <code>--scope=CLOUDFRONT --region=us-east-1</code>. </p> </li> <li> <p>API and SDKs - For all calls, use the Region endpoint us-east-1. </p> </li> </ul>"
+        }
+      }
+    },
+    "DescribeManagedRuleGroupResponse":{
+      "type":"structure",
+      "members":{
+        "Capacity":{
+          "shape":"CapacityUnit",
+          "documentation":"<p>The web ACL capacity units (WCUs) required for this rule group. AWS WAF uses web ACL capacity units (WCU) to calculate and control the operating resources that are used to run your rules, rule groups, and web ACLs. AWS WAF calculates capacity differently for each rule type, to reflect each rule's relative cost. Rule group capacity is fixed at creation, so users can plan their web ACL WCU usage when they use a rule group. The WCU limit for web ACLs is 1,500. </p>"
+        },
+        "Rules":{
+          "shape":"RuleSummaries",
+          "documentation":"<p/>"
+        }
+      }
+    },
+    "DisassociateWebACLRequest":{
+      "type":"structure",
+      "required":["ResourceArn"],
+      "members":{
+        "ResourceArn":{
+          "shape":"ResourceArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the resource to disassociate from the web ACL. </p> <p>The ARN must be in one of the following formats:</p> <ul> <li> <p>For an Application Load Balancer: <code>arn:aws:elasticloadbalancing:<i>region</i>:<i>account-id</i>:loadbalancer/app/<i>load-balancer-name</i>/<i>load-balancer-id</i> </code> </p> </li> <li> <p>For an Amazon API Gateway stage: <code>arn:aws:apigateway:<i>region</i>::/restapis/<i>api-id</i>/stages/<i>stage-name</i> </code> </p> </li> </ul>"
+        }
+      }
+    },
+    "DisassociateWebACLResponse":{
+      "type":"structure",
+      "members":{
+      }
+    },
+    "EntityDescription":{
+      "type":"string",
+      "max":256,
+      "min":1,
+      "pattern":"^[\\w+=:#@/\\-,\\.][\\w+=:#@/\\-,\\.\\s]+[\\w+=:#@/\\-,\\.]$"
+    },
+    "EntityId":{
+      "type":"string",
+      "max":36,
+      "min":1,
+      "pattern":"^[0-9a-f]{8}-(?:[0-9a-f]{4}-){3}[0-9a-f]{12}$"
+    },
+    "EntityName":{
+      "type":"string",
+      "max":128,
+      "min":1,
+      "pattern":"^[\\w\\-]+$"
+    },
+    "ErrorMessage":{"type":"string"},
+    "ErrorReason":{"type":"string"},
+    "ExcludedRule":{
+      "type":"structure",
+      "required":["Name"],
+      "members":{
+        "Name":{
+          "shape":"EntityName",
+          "documentation":"<p>The name of the rule to exclude.</p>"
+        }
+      },
+      "documentation":"<note> <p>This is the latest version of <b>AWS WAF</b>, named AWS WAFV2, released in November, 2019. For information, including how to migrate your AWS WAF resources from the prior release, see the <a href=\"https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html\">AWS WAF Developer Guide</a>. </p> </note> <p>Specifies a single rule to exclude from the rule group. Excluding a rule overrides its action setting for the rule group in the web ACL, setting it to <code>COUNT</code>. This effectively excludes the rule from acting on web requests. </p>"
+    },
+    "ExcludedRules":{
+      "type":"list",
+      "member":{"shape":"ExcludedRule"}
+    },
+    "FieldToMatch":{
+      "type":"structure",
+      "members":{
+        "SingleHeader":{
+          "shape":"SingleHeader",
+          "documentation":"<p>Inspect a single header. Provide the name of the header to inspect, for example, <code>User-Agent</code> or <code>Referer</code>. This setting isn't case sensitive.</p>"
+        },
+        "SingleQueryArgument":{
+          "shape":"SingleQueryArgument",
+          "documentation":"<p>Inspect a single query argument. Provide the name of the query argument to inspect, such as <i>UserName</i> or <i>SalesRegion</i>. The name can be up to 30 characters long and isn't case sensitive. </p> <p>This is used only to indicate the web request component for AWS WAF to inspect, in the <a>FieldToMatch</a> specification. </p>"
+        },
+        "AllQueryArguments":{
+          "shape":"AllQueryArguments",
+          "documentation":"<p>Inspect all query arguments. </p>"
+        },
+        "UriPath":{
+          "shape":"UriPath",
+          "documentation":"<p>Inspect the request URI path. This is the part of a web request that identifies a resource, for example, <code>/images/daily-ad.jpg</code>.</p>"
+        },
+        "QueryString":{
+          "shape":"QueryString",
+          "documentation":"<p>Inspect the query string. This is the part of a URL that appears after a <code>?</code> character, if any.</p>"
+        },
+        "Body":{
+          "shape":"Body",
+          "documentation":"<p>Inspect the request body, which immediately follows the request headers. This is the part of a request that contains any additional data that you want to send to your web server as the HTTP request body, such as data from a form. </p> <p>Note that only the first 8 KB (8192 bytes) of the request body are forwarded to AWS WAF for inspection by the underlying host service. If you don't need to inspect more than 8 KB, you can guarantee that you don't allow additional bytes in by combining a statement that inspects the body of the web request, such as <a>ByteMatchStatement</a> or <a>RegexPatternSetReferenceStatement</a>, with a <a>SizeConstraintStatement</a> that enforces an 8 KB size limit on the body of the request. AWS WAF doesn't support inspecting the entire contents of web requests whose bodies exceed the 8 KB limit.</p>"
+        },
+        "Method":{
+          "shape":"Method",
+          "documentation":"<p>Inspect the HTTP method. The method indicates the type of operation that the request is asking the origin to perform. </p>"
+        }
+      },
+      "documentation":"<note> <p>This is the latest version of <b>AWS WAF</b>, named AWS WAFV2, released in November, 2019. For information, including how to migrate your AWS WAF resources from the prior release, see the <a href=\"https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html\">AWS WAF Developer Guide</a>. </p> </note> <p>The part of a web request that you want AWS WAF to inspect. Include the single <code>FieldToMatch</code> type that you want to inspect, with additional specifications as needed, according to the type. You specify a single request component in <code>FieldToMatch</code> for each rule statement that requires it. To inspect more than one component of a web request, create a separate rule statement for each component.</p>"
+    },
+    "FieldToMatchData":{
+      "type":"string",
+      "max":64,
+      "min":1,
+      "pattern":".*\\S.*"
+    },
+    "FirewallManagerRuleGroup":{
+      "type":"structure",
+      "required":[
+        "Name",
+        "Priority",
+        "FirewallManagerStatement",
+        "OverrideAction",
+        "VisibilityConfig"
+      ],
+      "members":{
+        "Name":{
+          "shape":"EntityName",
+          "documentation":"<p>The name of the rule group. You cannot change the name of a rule group after you create it.</p>"
+        },
+        "Priority":{
+          "shape":"RulePriority",
+          "documentation":"<p>If you define more than one rule group in the first or last Firewall Manager rule groups, AWS WAF evaluates each request against the rule groups in order, starting from the lowest priority setting. The priorities don't need to be consecutive, but they must all be different.</p>"
+        },
+        "FirewallManagerStatement":{
+          "shape":"FirewallManagerStatement",
+          "documentation":"<p>The processing guidance for an AWS Firewall Manager rule. This is like a regular rule <a>Statement</a>, but it can only contain a rule group reference.</p>"
+        },
+        "OverrideAction":{"shape":"OverrideAction"},
+        "VisibilityConfig":{"shape":"VisibilityConfig"}
+      },
+      "documentation":"<p>A rule group that's defined for an AWS Firewall Manager WAF policy.</p>"
+    },
+    "FirewallManagerRuleGroups":{
+      "type":"list",
+      "member":{"shape":"FirewallManagerRuleGroup"}
+    },
+    "FirewallManagerStatement":{
+      "type":"structure",
+      "members":{
+        "ManagedRuleGroupStatement":{"shape":"ManagedRuleGroupStatement"},
+        "RuleGroupReferenceStatement":{"shape":"RuleGroupReferenceStatement"}
+      },
+      "documentation":"<p>The processing guidance for an AWS Firewall Manager rule. This is like a regular rule <a>Statement</a>, but it can only contain a rule group reference.</p>"
+    },
+    "GeoMatchStatement":{
+      "type":"structure",
+      "members":{
+        "CountryCodes":{
+          "shape":"CountryCodes",
+          "documentation":"<p>An array of two-character country codes, for example, <code>[ \"US\", \"CN\" ]</code>, from the alpha-2 country ISO codes of the ISO 3166 international standard. </p>"
+        }
+      },
+      "documentation":"<note> <p>This is the latest version of <b>AWS WAF</b>, named AWS WAFV2, released in November, 2019. For information, including how to migrate your AWS WAF resources from the prior release, see the <a href=\"https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html\">AWS WAF Developer Guide</a>. </p> </note> <p>A rule statement used to identify web requests based on country of origin. </p>"
+    },
+    "GetIPSetRequest":{
+      "type":"structure",
+      "required":[
+        "Name",
+        "Scope",
+        "Id"
+      ],
+      "members":{
+        "Name":{
+          "shape":"EntityName",
+          "documentation":"<p>The name of the IP set. You cannot change the name of an <code>IPSet</code> after you create it.</p>"
+        },
+        "Scope":{
+          "shape":"Scope",
+          "documentation":"<p>Specifies whether this is for an AWS CloudFront distribution or for a regional application. A regional application can be an Application Load Balancer (ALB) or an API Gateway stage. </p> <p>To work with CloudFront, you must also specify the Region US East (N. Virginia) as follows: </p> <ul> <li> <p>CLI - Specify the Region when you use the CloudFront scope: <code>--scope=CLOUDFRONT --region=us-east-1</code>. </p> </li> <li> <p>API and SDKs - For all calls, use the Region endpoint us-east-1. </p> </li> </ul>"
+        },
+        "Id":{
+          "shape":"EntityId",
+          "documentation":"<p>A unique identifier for the set. This ID is returned in the responses to create and list commands. You provide it to operations like update and delete.</p>"
+        }
+      }
+    },
+    "GetIPSetResponse":{
+      "type":"structure",
+      "members":{
+        "IPSet":{
+          "shape":"IPSet",
+          "documentation":"<p/>"
+        },
+        "LockToken":{
+          "shape":"LockToken",
+          "documentation":"<p>A token used for optimistic locking. AWS WAF returns a token to your get and list requests, to mark the state of the entity at the time of the request. To make changes to the entity associated with the token, you provide the token to operations like update and delete. AWS WAF uses the token to ensure that no changes have been made to the entity since you last retrieved it. If a change has been made, the update fails with a <code>WAFOptimisticLockException</code>. If this happens, perform another get, and use the new token returned by that operation. </p>"
+        }
+      }
+    },
+    "GetLoggingConfigurationRequest":{
+      "type":"structure",
+      "required":["ResourceArn"],
+      "members":{
+        "ResourceArn":{
+          "shape":"ResourceArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the web ACL for which you want to get the <a>LoggingConfiguration</a>.</p>"
+        }
+      }
+    },
+    "GetLoggingConfigurationResponse":{
+      "type":"structure",
+      "members":{
+        "LoggingConfiguration":{
+          "shape":"LoggingConfiguration",
+          "documentation":"<p>The <a>LoggingConfiguration</a> for the specified web ACL.</p>"
+        }
+      }
+    },
+    "GetPermissionPolicyRequest":{
+      "type":"structure",
+      "required":["ResourceArn"],
+      "members":{
+        "ResourceArn":{
+          "shape":"ResourceArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the rule group for which you want to get the policy.</p>"
+        }
+      }
+    },
+    "GetPermissionPolicyResponse":{
+      "type":"structure",
+      "members":{
+        "Policy":{
+          "shape":"PolicyString",
+          "documentation":"<p>The IAM policy that is attached to the specified rule group.</p>"
+        }
+      }
+    },
+    "GetRateBasedStatementManagedKeysRequest":{
+      "type":"structure",
+      "required":[
+        "Scope",
+        "WebACLName",
+        "WebACLId",
+        "RuleName"
+      ],
+      "members":{
+        "Scope":{
+          "shape":"Scope",
+          "documentation":"<p>Specifies whether this is for an AWS CloudFront distribution or for a regional application. A regional application can be an Application Load Balancer (ALB) or an API Gateway stage. </p> <p>To work with CloudFront, you must also specify the Region US East (N. Virginia) as follows: </p> <ul> <li> <p>CLI - Specify the Region when you use the CloudFront scope: <code>--scope=CLOUDFRONT --region=us-east-1</code>. </p> </li> <li> <p>API and SDKs - For all calls, use the Region endpoint us-east-1. </p> </li> </ul>"
+        },
+        "WebACLName":{
+          "shape":"EntityName",
+          "documentation":"<p>The name of the Web ACL. You cannot change the name of a Web ACL after you create it.</p>"
+        },
+        "WebACLId":{
+          "shape":"EntityId",
+          "documentation":"<p>The unique identifier for the Web ACL. This ID is returned in the responses to create and list commands. You provide it to operations like update and delete.</p>"
+        },
+        "RuleName":{
+          "shape":"EntityName",
+          "documentation":"<p>The name of the rate-based rule to get the keys for.</p>"
+        }
+      }
+    },
+    "GetRateBasedStatementManagedKeysResponse":{
+      "type":"structure",
+      "members":{
+        "ManagedKeysIPV4":{
+          "shape":"RateBasedStatementManagedKeysIPSet",
+          "documentation":"<p>The keys that are of Internet Protocol version 4 (IPv4). </p>"
+        },
+        "ManagedKeysIPV6":{
+          "shape":"RateBasedStatementManagedKeysIPSet",
+          "documentation":"<p>The keys that are of Internet Protocol version 6 (IPv6). </p>"
+        }
+      }
+    },
+    "GetRegexPatternSetRequest":{
+      "type":"structure",
+      "required":[
+        "Name",
+        "Scope",
+        "Id"
+      ],
+      "members":{
+        "Name":{
+          "shape":"EntityName",
+          "documentation":"<p>The name of the set. You cannot change the name after you create the set.</p>"
+        },
+        "Scope":{
+          "shape":"Scope",
+          "documentation":"<p>Specifies whether this is for an AWS CloudFront distribution or for a regional application. A regional application can be an Application Load Balancer (ALB) or an API Gateway stage. </p> <p>To work with CloudFront, you must also specify the Region US East (N. Virginia) as follows: </p> <ul> <li> <p>CLI - Specify the Region when you use the CloudFront scope: <code>--scope=CLOUDFRONT --region=us-east-1</code>. </p> </li> <li> <p>API and SDKs - For all calls, use the Region endpoint us-east-1. </p> </li> </ul>"
+        },
+        "Id":{
+          "shape":"EntityId",
+          "documentation":"<p>A unique identifier for the set. This ID is returned in the responses to create and list commands. You provide it to operations like update and delete.</p>"
+        }
+      }
+    },
+    "GetRegexPatternSetResponse":{
+      "type":"structure",
+      "members":{
+        "RegexPatternSet":{
+          "shape":"RegexPatternSet",
+          "documentation":"<p/>"
+        },
+        "LockToken":{
+          "shape":"LockToken",
+          "documentation":"<p>A token used for optimistic locking. AWS WAF returns a token to your get and list requests, to mark the state of the entity at the time of the request. To make changes to the entity associated with the token, you provide the token to operations like update and delete. AWS WAF uses the token to ensure that no changes have been made to the entity since you last retrieved it. If a change has been made, the update fails with a <code>WAFOptimisticLockException</code>. If this happens, perform another get, and use the new token returned by that operation. </p>"
+        }
+      }
+    },
+    "GetRuleGroupRequest":{
+      "type":"structure",
+      "required":[
+        "Name",
+        "Scope",
+        "Id"
+      ],
+      "members":{
+        "Name":{
+          "shape":"EntityName",
+          "documentation":"<p>The name of the rule group. You cannot change the name of a rule group after you create it.</p>"
+        },
+        "Scope":{
+          "shape":"Scope",
+          "documentation":"<p>Specifies whether this is for an AWS CloudFront distribution or for a regional application. A regional application can be an Application Load Balancer (ALB) or an API Gateway stage. </p> <p>To work with CloudFront, you must also specify the Region US East (N. Virginia) as follows: </p> <ul> <li> <p>CLI - Specify the Region when you use the CloudFront scope: <code>--scope=CLOUDFRONT --region=us-east-1</code>. </p> </li> <li> <p>API and SDKs - For all calls, use the Region endpoint us-east-1. </p> </li> </ul>"
+        },
+        "Id":{
+          "shape":"EntityId",
+          "documentation":"<p>A unique identifier for the rule group. This ID is returned in the responses to create and list commands. You provide it to operations like update and delete.</p>"
+        }
+      }
+    },
+    "GetRuleGroupResponse":{
+      "type":"structure",
+      "members":{
+        "RuleGroup":{
+          "shape":"RuleGroup",
+          "documentation":"<p/>"
+        },
+        "LockToken":{
+          "shape":"LockToken",
+          "documentation":"<p>A token used for optimistic locking. AWS WAF returns a token to your get and list requests, to mark the state of the entity at the time of the request. To make changes to the entity associated with the token, you provide the token to operations like update and delete. AWS WAF uses the token to ensure that no changes have been made to the entity since you last retrieved it. If a change has been made, the update fails with a <code>WAFOptimisticLockException</code>. If this happens, perform another get, and use the new token returned by that operation. </p>"
+        }
+      }
+    },
+    "GetSampledRequestsRequest":{
+      "type":"structure",
+      "required":[
+        "WebAclArn",
+        "RuleMetricName",
+        "Scope",
+        "TimeWindow",
+        "MaxItems"
+      ],
+      "members":{
+        "WebAclArn":{
+          "shape":"ResourceArn",
+          "documentation":"<p>The Amazon resource name (ARN) of the <code>WebACL</code> for which you want a sample of requests.</p>"
+        },
+        "RuleMetricName":{
+          "shape":"MetricName",
+          "documentation":"<p>The metric name assigned to the <code>Rule</code> or <code>RuleGroup</code> for which you want a sample of requests.</p>"
+        },
+        "Scope":{
+          "shape":"Scope",
+          "documentation":"<p>Specifies whether this is for an AWS CloudFront distribution or for a regional application. A regional application can be an Application Load Balancer (ALB) or an API Gateway stage. </p> <p>To work with CloudFront, you must also specify the Region US East (N. Virginia) as follows: </p> <ul> <li> <p>CLI - Specify the Region when you use the CloudFront scope: <code>--scope=CLOUDFRONT --region=us-east-1</code>. </p> </li> <li> <p>API and SDKs - For all calls, use the Region endpoint us-east-1. </p> </li> </ul>"
+        },
+        "TimeWindow":{
+          "shape":"TimeWindow",
+          "documentation":"<p>The start date and time and the end date and time of the range for which you want <code>GetSampledRequests</code> to return a sample of requests. Specify the date and time in the following format: <code>\"2016-09-27T14:50Z\"</code>. You can specify any time range in the previous three hours.</p>"
+        },
+        "MaxItems":{
+          "shape":"ListMaxItems",
+          "documentation":"<p>The number of requests that you want AWS WAF to return from among the first 5,000 requests that your AWS resource received during the time range. If your resource received fewer requests than the value of <code>MaxItems</code>, <code>GetSampledRequests</code> returns information about all of them. </p>"
+        }
+      }
+    },
+    "GetSampledRequestsResponse":{
+      "type":"structure",
+      "members":{
+        "SampledRequests":{
+          "shape":"SampledHTTPRequests",
+          "documentation":"<p>A complex type that contains detailed information about each of the requests in the sample.</p>"
+        },
+        "PopulationSize":{
+          "shape":"PopulationSize",
+          "documentation":"<p>The total number of requests from which <code>GetSampledRequests</code> got a sample of <code>MaxItems</code> requests. If <code>PopulationSize</code> is less than <code>MaxItems</code>, the sample includes every request that your AWS resource received during the specified time range.</p>"
+        },
+        "TimeWindow":{
+          "shape":"TimeWindow",
+          "documentation":"<p>Usually, <code>TimeWindow</code> is the time range that you specified in the <code>GetSampledRequests</code> request. However, if your AWS resource received more than 5,000 requests during the time range that you specified in the request, <code>GetSampledRequests</code> returns the time range for the first 5,000 requests.</p>"
+        }
+      }
+    },
+    "GetWebACLForResourceRequest":{
+      "type":"structure",
+      "required":["ResourceArn"],
+      "members":{
+        "ResourceArn":{
+          "shape":"ResourceArn",
+          "documentation":"<p>The ARN (Amazon Resource Name) of the resource.</p>"
+        }
+      }
+    },
+    "GetWebACLForResourceResponse":{
+      "type":"structure",
+      "members":{
+        "WebACL":{
+          "shape":"WebACL",
+          "documentation":"<p>The Web ACL that is associated with the resource. If there is no associated resource, AWS WAF returns a null Web ACL.</p>"
+        }
+      }
+    },
+    "GetWebACLRequest":{
+      "type":"structure",
+      "required":[
+        "Name",
+        "Scope",
+        "Id"
+      ],
+      "members":{
+        "Name":{
+          "shape":"EntityName",
+          "documentation":"<p>The name of the Web ACL. You cannot change the name of a Web ACL after you create it.</p>"
+        },
+        "Scope":{
+          "shape":"Scope",
+          "documentation":"<p>Specifies whether this is for an AWS CloudFront distribution or for a regional application. A regional application can be an Application Load Balancer (ALB) or an API Gateway stage. </p> <p>To work with CloudFront, you must also specify the Region US East (N. Virginia) as follows: </p> <ul> <li> <p>CLI - Specify the Region when you use the CloudFront scope: <code>--scope=CLOUDFRONT --region=us-east-1</code>. </p> </li> <li> <p>API and SDKs - For all calls, use the Region endpoint us-east-1. </p> </li> </ul>"
+        },
+        "Id":{
+          "shape":"EntityId",
+          "documentation":"<p>The unique identifier for the Web ACL. This ID is returned in the responses to create and list commands. You provide it to operations like update and delete.</p>"
+        }
+      }
+    },
+    "GetWebACLResponse":{
+      "type":"structure",
+      "members":{
+        "WebACL":{
+          "shape":"WebACL",
+          "documentation":"<p>The Web ACL specification. You can modify the settings in this Web ACL and use it to update this Web ACL or create a new one.</p>"
+        },
+        "LockToken":{
+          "shape":"LockToken",
+          "documentation":"<p>A token used for optimistic locking. AWS WAF returns a token to your get and list requests, to mark the state of the entity at the time of the request. To make changes to the entity associated with the token, you provide the token to operations like update and delete. AWS WAF uses the token to ensure that no changes have been made to the entity since you last retrieved it. If a change has been made, the update fails with a <code>WAFOptimisticLockException</code>. If this happens, perform another get, and use the new token returned by that operation. </p>"
+        }
+      }
+    },
+    "HTTPHeader":{
+      "type":"structure",
+      "members":{
+        "Name":{
+          "shape":"HeaderName",
+          "documentation":"<p>The name of the HTTP header.</p>"
+        },
+        "Value":{
+          "shape":"HeaderValue",
+          "documentation":"<p>The value of the HTTP header.</p>"
+        }
+      },
+      "documentation":"<note> <p>This is the latest version of <b>AWS WAF</b>, named AWS WAFV2, released in November, 2019. For information, including how to migrate your AWS WAF resources from the prior release, see the <a href=\"https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html\">AWS WAF Developer Guide</a>. </p> </note> <p>Part of the response from <a>GetSampledRequests</a>. This is a complex type that appears as <code>Headers</code> in the response syntax. <code>HTTPHeader</code> contains the names and values of all of the headers that appear in one of the web requests. </p>"
+    },
+    "HTTPHeaders":{
+      "type":"list",
+      "member":{"shape":"HTTPHeader"}
+    },
+    "HTTPMethod":{"type":"string"},
+    "HTTPRequest":{
+      "type":"structure",
+      "members":{
+        "ClientIP":{
+          "shape":"IPString",
+          "documentation":"<p>The IP address that the request originated from. If the web ACL is associated with a CloudFront distribution, this is the value of one of the following fields in CloudFront access logs:</p> <ul> <li> <p> <code>c-ip</code>, if the viewer did not use an HTTP proxy or a load balancer to send the request</p> </li> <li> <p> <code>x-forwarded-for</code>, if the viewer did use an HTTP proxy or a load balancer to send the request</p> </li> </ul>"
+        },
+        "Country":{
+          "shape":"Country",
+          "documentation":"<p>The two-letter country code for the country that the request originated from. For a current list of country codes, see the Wikipedia entry <a href=\"https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2\">ISO 3166-1 alpha-2</a>.</p>"
+        },
+        "URI":{
+          "shape":"URIString",
+          "documentation":"<p>The URI path of the request, which identifies the resource, for example, <code>/images/daily-ad.jpg</code>.</p>"
+        },
+        "Method":{
+          "shape":"HTTPMethod",
+          "documentation":"<p>The HTTP method specified in the sampled web request. </p>"
+        },
+        "HTTPVersion":{
+          "shape":"HTTPVersion",
+          "documentation":"<p>The HTTP version specified in the sampled web request, for example, <code>HTTP/1.1</code>.</p>"
+        },
+        "Headers":{
+          "shape":"HTTPHeaders",
+          "documentation":"<p>A complex type that contains the name and value for each header in the sampled web request.</p>"
+        }
+      },
+      "documentation":"<note> <p>This is the latest version of <b>AWS WAF</b>, named AWS WAFV2, released in November, 2019. For information, including how to migrate your AWS WAF resources from the prior release, see the <a href=\"https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html\">AWS WAF Developer Guide</a>. </p> </note> <p>Part of the response from <a>GetSampledRequests</a>. This is a complex type that appears as <code>Request</code> in the response syntax. <code>HTTPRequest</code> contains information about one of the web requests. </p>"
+    },
+    "HTTPVersion":{"type":"string"},
+    "HeaderName":{"type":"string"},
+    "HeaderValue":{"type":"string"},
+    "IPAddress":{
+      "type":"string",
+      "max":50,
+      "min":1,
+      "pattern":".*\\S.*"
+    },
+    "IPAddressVersion":{
+      "type":"string",
+      "enum":[
+        "IPV4",
+        "IPV6"
+      ]
+    },
+    "IPAddresses":{
+      "type":"list",
+      "member":{"shape":"IPAddress"}
+    },
+    "IPSet":{
+      "type":"structure",
+      "required":[
+        "Name",
+        "Id",
+        "ARN",
+        "IPAddressVersion",
+        "Addresses"
+      ],
+      "members":{
+        "Name":{
+          "shape":"EntityName",
+          "documentation":"<p>The name of the IP set. You cannot change the name of an <code>IPSet</code> after you create it.</p>"
+        },
+        "Id":{
+          "shape":"EntityId",
+          "documentation":"<p>A unique identifier for the set. This ID is returned in the responses to create and list commands. You provide it to operations like update and delete.</p>"
+        },
+        "ARN":{
+          "shape":"ResourceArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the entity.</p>"
+        },
+        "Description":{
+          "shape":"EntityDescription",
+          "documentation":"<p>A description of the IP set that helps with identification. You cannot change the description of an IP set after you create it.</p>"
+        },
+        "IPAddressVersion":{
+          "shape":"IPAddressVersion",
+          "documentation":"<p>Specify IPV4 or IPV6. </p>"
+        },
+        "Addresses":{
+          "shape":"IPAddresses",
+          "documentation":"<p>Contains an array of strings that specify one or more IP addresses or blocks of IP addresses in Classless Inter-Domain Routing (CIDR) notation. AWS WAF supports all address ranges for IP versions IPv4 and IPv6. </p> <p>Examples: </p> <ul> <li> <p>To configure AWS WAF to allow, block, or count requests that originated from the IP address 192.0.2.44, specify <code>192.0.2.44/32</code>.</p> </li> <li> <p>To configure AWS WAF to allow, block, or count requests that originated from IP addresses from 192.0.2.0 to 192.0.2.255, specify <code>192.0.2.0/24</code>.</p> </li> <li> <p>To configure AWS WAF to allow, block, or count requests that originated from the IP address 1111:0000:0000:0000:0000:0000:0000:0111, specify <code>1111:0000:0000:0000:0000:0000:0000:0111/128</code>.</p> </li> <li> <p>To configure AWS WAF to allow, block, or count requests that originated from IP addresses 1111:0000:0000:0000:0000:0000:0000:0000 to 1111:0000:0000:0000:ffff:ffff:ffff:ffff, specify <code>1111:0000:0000:0000:0000:0000:0000:0000/64</code>.</p> </li> </ul> <p>For more information about CIDR notation, see the Wikipedia entry <a href=\"https://en.wikipedia.org/wiki/Classless_Inter-Domain_Routing\">Classless Inter-Domain Routing</a>.</p>"
+        }
+      },
+      "documentation":"<note> <p>This is the latest version of <b>AWS WAF</b>, named AWS WAFV2, released in November, 2019. For information, including how to migrate your AWS WAF resources from the prior release, see the <a href=\"https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html\">AWS WAF Developer Guide</a>. </p> </note> <p>Contains one or more IP addresses or blocks of IP addresses specified in Classless Inter-Domain Routing (CIDR) notation. AWS WAF supports any CIDR range. For information about CIDR notation, see the Wikipedia entry <a href=\"https://en.wikipedia.org/wiki/Classless_Inter-Domain_Routing\">Classless Inter-Domain Routing</a>. </p> <p>AWS WAF assigns an ARN to each <code>IPSet</code> that you create. To use an IP set in a rule, you provide the ARN to the <a>Rule</a> statement <a>IPSetReferenceStatement</a>. </p>"
+    },
+    "IPSetReferenceStatement":{
+      "type":"structure",
+      "required":["ARN"],
+      "members":{
+        "ARN":{
+          "shape":"ResourceArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the <a>IPSet</a> that this statement references.</p>"
+        }
+      },
+      "documentation":"<note> <p>This is the latest version of <b>AWS WAF</b>, named AWS WAFV2, released in November, 2019. For information, including how to migrate your AWS WAF resources from the prior release, see the <a href=\"https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html\">AWS WAF Developer Guide</a>. </p> </note> <p>A rule statement used to detect web requests coming from particular IP addresses or address ranges. To use this, create an <a>IPSet</a> that specifies the addresses you want to detect, then use the ARN of that set in this statement. To create an IP set, see <a>CreateIPSet</a>.</p> <p>Each IP set rule statement references an IP set. You create and maintain the set independent of your rules. This allows you to use the single set in multiple rules. When you update the referenced set, AWS WAF automatically updates all rules that reference it.</p>"
+    },
+    "IPSetSummaries":{
+      "type":"list",
+      "member":{"shape":"IPSetSummary"}
+    },
+    "IPSetSummary":{
+      "type":"structure",
+      "members":{
+        "Name":{
+          "shape":"EntityName",
+          "documentation":"<p>The name of the IP set. You cannot change the name of an <code>IPSet</code> after you create it.</p>"
+        },
+        "Id":{
+          "shape":"EntityId",
+          "documentation":"<p>A unique identifier for the set. This ID is returned in the responses to create and list commands. You provide it to operations like update and delete.</p>"
+        },
+        "Description":{
+          "shape":"EntityDescription",
+          "documentation":"<p>A description of the IP set that helps with identification. You cannot change the description of an IP set after you create it.</p>"
+        },
+        "LockToken":{
+          "shape":"LockToken",
+          "documentation":"<p>A token used for optimistic locking. AWS WAF returns a token to your get and list requests, to mark the state of the entity at the time of the request. To make changes to the entity associated with the token, you provide the token to operations like update and delete. AWS WAF uses the token to ensure that no changes have been made to the entity since you last retrieved it. If a change has been made, the update fails with a <code>WAFOptimisticLockException</code>. If this happens, perform another get, and use the new token returned by that operation. </p>"
+        },
+        "ARN":{
+          "shape":"ResourceArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the entity.</p>"
+        }
+      },
+      "documentation":"<note> <p>This is the latest version of <b>AWS WAF</b>, named AWS WAFV2, released in November, 2019. For information, including how to migrate your AWS WAF resources from the prior release, see the <a href=\"https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html\">AWS WAF Developer Guide</a>. </p> </note> <p>High-level information about an <a>IPSet</a>, returned by operations like create and list. This provides information like the ID, that you can use to retrieve and manage an <code>IPSet</code>, and the ARN, that you provide to the <a>IPSetReferenceStatement</a> to use the address set in a <a>Rule</a>.</p>"
+    },
+    "IPString":{"type":"string"},
+    "ListAvailableManagedRuleGroupsRequest":{
+      "type":"structure",
+      "required":["Scope"],
+      "members":{
+        "Scope":{
+          "shape":"Scope",
+          "documentation":"<p>Specifies whether this is for an AWS CloudFront distribution or for a regional application. A regional application can be an Application Load Balancer (ALB) or an API Gateway stage. </p> <p>To work with CloudFront, you must also specify the Region US East (N. Virginia) as follows: </p> <ul> <li> <p>CLI - Specify the Region when you use the CloudFront scope: <code>--scope=CLOUDFRONT --region=us-east-1</code>. </p> </li> <li> <p>API and SDKs - For all calls, use the Region endpoint us-east-1. </p> </li> </ul>"
+        },
+        "NextMarker":{
+          "shape":"NextMarker",
+          "documentation":"<p>When you request a list of objects with a <code>Limit</code> setting, if the number of objects that are still available for retrieval exceeds the limit, AWS WAF returns a <code>NextMarker</code> value in the response. To retrieve the next batch of objects, provide the marker from the prior call in your next request.</p>"
+        },
+        "Limit":{
+          "shape":"PaginationLimit",
+          "documentation":"<p>The maximum number of objects that you want AWS WAF to return for this request. If more objects are available, in the response, AWS WAF provides a <code>NextMarker</code> value that you can use in a subsequent call to get the next batch of objects.</p>"
+        }
+      }
+    },
+    "ListAvailableManagedRuleGroupsResponse":{
+      "type":"structure",
+      "members":{
+        "NextMarker":{
+          "shape":"NextMarker",
+          "documentation":"<p>When you request a list of objects with a <code>Limit</code> setting, if the number of objects that are still available for retrieval exceeds the limit, AWS WAF returns a <code>NextMarker</code> value in the response. To retrieve the next batch of objects, provide the marker from the prior call in your next request.</p>"
+        },
+        "ManagedRuleGroups":{
+          "shape":"ManagedRuleGroupSummaries",
+          "documentation":"<p/>"
+        }
+      }
+    },
+    "ListIPSetsRequest":{
+      "type":"structure",
+      "required":["Scope"],
+      "members":{
+        "Scope":{
+          "shape":"Scope",
+          "documentation":"<p>Specifies whether this is for an AWS CloudFront distribution or for a regional application. A regional application can be an Application Load Balancer (ALB) or an API Gateway stage. </p> <p>To work with CloudFront, you must also specify the Region US East (N. Virginia) as follows: </p> <ul> <li> <p>CLI - Specify the Region when you use the CloudFront scope: <code>--scope=CLOUDFRONT --region=us-east-1</code>. </p> </li> <li> <p>API and SDKs - For all calls, use the Region endpoint us-east-1. </p> </li> </ul>"
+        },
+        "NextMarker":{
+          "shape":"NextMarker",
+          "documentation":"<p>When you request a list of objects with a <code>Limit</code> setting, if the number of objects that are still available for retrieval exceeds the limit, AWS WAF returns a <code>NextMarker</code> value in the response. To retrieve the next batch of objects, provide the marker from the prior call in your next request.</p>"
+        },
+        "Limit":{
+          "shape":"PaginationLimit",
+          "documentation":"<p>The maximum number of objects that you want AWS WAF to return for this request. If more objects are available, in the response, AWS WAF provides a <code>NextMarker</code> value that you can use in a subsequent call to get the next batch of objects.</p>"
+        }
+      }
+    },
+    "ListIPSetsResponse":{
+      "type":"structure",
+      "members":{
+        "NextMarker":{
+          "shape":"NextMarker",
+          "documentation":"<p>When you request a list of objects with a <code>Limit</code> setting, if the number of objects that are still available for retrieval exceeds the limit, AWS WAF returns a <code>NextMarker</code> value in the response. To retrieve the next batch of objects, provide the marker from the prior call in your next request.</p>"
+        },
+        "IPSets":{
+          "shape":"IPSetSummaries",
+          "documentation":"<p>Array of IPSets. This may not be the full list of IPSets that you have defined. See the <code>Limit</code> specification for this request.</p>"
+        }
+      }
+    },
+    "ListLoggingConfigurationsRequest":{
+      "type":"structure",
+      "members":{
+        "Scope":{
+          "shape":"Scope",
+          "documentation":"<p>Specifies whether this is for an AWS CloudFront distribution or for a regional application. A regional application can be an Application Load Balancer (ALB) or an API Gateway stage. </p> <p>To work with CloudFront, you must also specify the Region US East (N. Virginia) as follows: </p> <ul> <li> <p>CLI - Specify the Region when you use the CloudFront scope: <code>--scope=CLOUDFRONT --region=us-east-1</code>. </p> </li> <li> <p>API and SDKs - For all calls, use the Region endpoint us-east-1. </p> </li> </ul>"
+        },
+        "NextMarker":{
+          "shape":"NextMarker",
+          "documentation":"<p>When you request a list of objects with a <code>Limit</code> setting, if the number of objects that are still available for retrieval exceeds the limit, AWS WAF returns a <code>NextMarker</code> value in the response. To retrieve the next batch of objects, provide the marker from the prior call in your next request.</p>"
+        },
+        "Limit":{
+          "shape":"PaginationLimit",
+          "documentation":"<p>The maximum number of objects that you want AWS WAF to return for this request. If more objects are available, in the response, AWS WAF provides a <code>NextMarker</code> value that you can use in a subsequent call to get the next batch of objects.</p>"
+        }
+      }
+    },
+    "ListLoggingConfigurationsResponse":{
+      "type":"structure",
+      "members":{
+        "LoggingConfigurations":{
+          "shape":"LoggingConfigurations",
+          "documentation":"<p/>"
+        },
+        "NextMarker":{
+          "shape":"NextMarker",
+          "documentation":"<p>When you request a list of objects with a <code>Limit</code> setting, if the number of objects that are still available for retrieval exceeds the limit, AWS WAF returns a <code>NextMarker</code> value in the response. To retrieve the next batch of objects, provide the marker from the prior call in your next request.</p>"
+        }
+      }
+    },
+    "ListMaxItems":{
+      "type":"long",
+      "max":500,
+      "min":1
+    },
+    "ListRegexPatternSetsRequest":{
+      "type":"structure",
+      "required":["Scope"],
+      "members":{
+        "Scope":{
+          "shape":"Scope",
+          "documentation":"<p>Specifies whether this is for an AWS CloudFront distribution or for a regional application. A regional application can be an Application Load Balancer (ALB) or an API Gateway stage. </p> <p>To work with CloudFront, you must also specify the Region US East (N. Virginia) as follows: </p> <ul> <li> <p>CLI - Specify the Region when you use the CloudFront scope: <code>--scope=CLOUDFRONT --region=us-east-1</code>. </p> </li> <li> <p>API and SDKs - For all calls, use the Region endpoint us-east-1. </p> </li> </ul>"
+        },
+        "NextMarker":{
+          "shape":"NextMarker",
+          "documentation":"<p>When you request a list of objects with a <code>Limit</code> setting, if the number of objects that are still available for retrieval exceeds the limit, AWS WAF returns a <code>NextMarker</code> value in the response. To retrieve the next batch of objects, provide the marker from the prior call in your next request.</p>"
+        },
+        "Limit":{
+          "shape":"PaginationLimit",
+          "documentation":"<p>The maximum number of objects that you want AWS WAF to return for this request. If more objects are available, in the response, AWS WAF provides a <code>NextMarker</code> value that you can use in a subsequent call to get the next batch of objects.</p>"
+        }
+      }
+    },
+    "ListRegexPatternSetsResponse":{
+      "type":"structure",
+      "members":{
+        "NextMarker":{
+          "shape":"NextMarker",
+          "documentation":"<p>When you request a list of objects with a <code>Limit</code> setting, if the number of objects that are still available for retrieval exceeds the limit, AWS WAF returns a <code>NextMarker</code> value in the response. To retrieve the next batch of objects, provide the marker from the prior call in your next request.</p>"
+        },
+        "RegexPatternSets":{
+          "shape":"RegexPatternSetSummaries",
+          "documentation":"<p/>"
+        }
+      }
+    },
+    "ListResourcesForWebACLRequest":{
+      "type":"structure",
+      "required":["WebACLArn"],
+      "members":{
+        "WebACLArn":{
+          "shape":"ResourceArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the Web ACL.</p>"
+        },
+        "ResourceType":{
+          "shape":"ResourceType",
+          "documentation":"<p>Used for web ACLs that are scoped for regional applications. A regional application can be an Application Load Balancer (ALB) or an API Gateway stage. </p>"
+        }
+      }
+    },
+    "ListResourcesForWebACLResponse":{
+      "type":"structure",
+      "members":{
+        "ResourceArns":{
+          "shape":"ResourceArns",
+          "documentation":"<p>The array of Amazon Resource Names (ARNs) of the associated resources.</p>"
+        }
+      }
+    },
+    "ListRuleGroupsRequest":{
+      "type":"structure",
+      "required":["Scope"],
+      "members":{
+        "Scope":{
+          "shape":"Scope",
+          "documentation":"<p>Specifies whether this is for an AWS CloudFront distribution or for a regional application. A regional application can be an Application Load Balancer (ALB) or an API Gateway stage. </p> <p>To work with CloudFront, you must also specify the Region US East (N. Virginia) as follows: </p> <ul> <li> <p>CLI - Specify the Region when you use the CloudFront scope: <code>--scope=CLOUDFRONT --region=us-east-1</code>. </p> </li> <li> <p>API and SDKs - For all calls, use the Region endpoint us-east-1. </p> </li> </ul>"
+        },
+        "NextMarker":{
+          "shape":"NextMarker",
+          "documentation":"<p>When you request a list of objects with a <code>Limit</code> setting, if the number of objects that are still available for retrieval exceeds the limit, AWS WAF returns a <code>NextMarker</code> value in the response. To retrieve the next batch of objects, provide the marker from the prior call in your next request.</p>"
+        },
+        "Limit":{
+          "shape":"PaginationLimit",
+          "documentation":"<p>The maximum number of objects that you want AWS WAF to return for this request. If more objects are available, in the response, AWS WAF provides a <code>NextMarker</code> value that you can use in a subsequent call to get the next batch of objects.</p>"
+        }
+      }
+    },
+    "ListRuleGroupsResponse":{
+      "type":"structure",
+      "members":{
+        "NextMarker":{
+          "shape":"NextMarker",
+          "documentation":"<p>When you request a list of objects with a <code>Limit</code> setting, if the number of objects that are still available for retrieval exceeds the limit, AWS WAF returns a <code>NextMarker</code> value in the response. To retrieve the next batch of objects, provide the marker from the prior call in your next request.</p>"
+        },
+        "RuleGroups":{
+          "shape":"RuleGroupSummaries",
+          "documentation":"<p/>"
+        }
+      }
+    },
+    "ListTagsForResourceRequest":{
+      "type":"structure",
+      "required":["ResourceARN"],
+      "members":{
+        "NextMarker":{
+          "shape":"NextMarker",
+          "documentation":"<p>When you request a list of objects with a <code>Limit</code> setting, if the number of objects that are still available for retrieval exceeds the limit, AWS WAF returns a <code>NextMarker</code> value in the response. To retrieve the next batch of objects, provide the marker from the prior call in your next request.</p>"
+        },
+        "Limit":{
+          "shape":"PaginationLimit",
+          "documentation":"<p>The maximum number of objects that you want AWS WAF to return for this request. If more objects are available, in the response, AWS WAF provides a <code>NextMarker</code> value that you can use in a subsequent call to get the next batch of objects.</p>"
+        },
+        "ResourceARN":{
+          "shape":"ResourceArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the resource.</p>"
+        }
+      }
+    },
+    "ListTagsForResourceResponse":{
+      "type":"structure",
+      "members":{
+        "NextMarker":{
+          "shape":"NextMarker",
+          "documentation":"<p>When you request a list of objects with a <code>Limit</code> setting, if the number of objects that are still available for retrieval exceeds the limit, AWS WAF returns a <code>NextMarker</code> value in the response. To retrieve the next batch of objects, provide the marker from the prior call in your next request.</p>"
+        },
+        "TagInfoForResource":{
+          "shape":"TagInfoForResource",
+          "documentation":"<p>The collection of tagging definitions for the resource. </p>"
+        }
+      }
+    },
+    "ListWebACLsRequest":{
+      "type":"structure",
+      "required":["Scope"],
+      "members":{
+        "Scope":{
+          "shape":"Scope",
+          "documentation":"<p>Specifies whether this is for an AWS CloudFront distribution or for a regional application. A regional application can be an Application Load Balancer (ALB) or an API Gateway stage. </p> <p>To work with CloudFront, you must also specify the Region US East (N. Virginia) as follows: </p> <ul> <li> <p>CLI - Specify the Region when you use the CloudFront scope: <code>--scope=CLOUDFRONT --region=us-east-1</code>. </p> </li> <li> <p>API and SDKs - For all calls, use the Region endpoint us-east-1. </p> </li> </ul>"
+        },
+        "NextMarker":{
+          "shape":"NextMarker",
+          "documentation":"<p>When you request a list of objects with a <code>Limit</code> setting, if the number of objects that are still available for retrieval exceeds the limit, AWS WAF returns a <code>NextMarker</code> value in the response. To retrieve the next batch of objects, provide the marker from the prior call in your next request.</p>"
+        },
+        "Limit":{
+          "shape":"PaginationLimit",
+          "documentation":"<p>The maximum number of objects that you want AWS WAF to return for this request. If more objects are available, in the response, AWS WAF provides a <code>NextMarker</code> value that you can use in a subsequent call to get the next batch of objects.</p>"
+        }
+      }
+    },
+    "ListWebACLsResponse":{
+      "type":"structure",
+      "members":{
+        "NextMarker":{
+          "shape":"NextMarker",
+          "documentation":"<p>When you request a list of objects with a <code>Limit</code> setting, if the number of objects that are still available for retrieval exceeds the limit, AWS WAF returns a <code>NextMarker</code> value in the response. To retrieve the next batch of objects, provide the marker from the prior call in your next request.</p>"
+        },
+        "WebACLs":{
+          "shape":"WebACLSummaries",
+          "documentation":"<p/>"
+        }
+      }
+    },
+    "LockToken":{
+      "type":"string",
+      "max":36,
+      "min":1,
+      "pattern":"^[0-9a-f]{8}-(?:[0-9a-f]{4}-){3}[0-9a-f]{12}$"
+    },
+    "LogDestinationConfigs":{
+      "type":"list",
+      "member":{"shape":"ResourceArn"},
+      "max":100,
+      "min":1
+    },
+    "LoggingConfiguration":{
+      "type":"structure",
+      "required":[
+        "ResourceArn",
+        "LogDestinationConfigs"
+      ],
+      "members":{
+        "ResourceArn":{
+          "shape":"ResourceArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the web ACL that you want to associate with <code>LogDestinationConfigs</code>.</p>"
+        },
+        "LogDestinationConfigs":{
+          "shape":"LogDestinationConfigs",
+          "documentation":"<p>The Amazon Kinesis Data Firehose Amazon Resource Name (ARNs) that you want to associate with the web ACL.</p>"
+        },
+        "RedactedFields":{
+          "shape":"RedactedFields",
+          "documentation":"<p>The parts of the request that you want to keep out of the logs. For example, if you redact the cookie field, the cookie field in the firehose will be <code>xxx</code>. </p>"
+        }
+      },
+      "documentation":"<note> <p>This is the latest version of <b>AWS WAF</b>, named AWS WAFV2, released in November, 2019. For information, including how to migrate your AWS WAF resources from the prior release, see the <a href=\"https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html\">AWS WAF Developer Guide</a>. </p> </note> <p>Defines an association between Amazon Kinesis Data Firehose destinations and a web ACL resource, for logging from AWS WAF. As part of the association, you can specify parts of the standard logging fields to keep out of the logs. </p>"
+    },
+    "LoggingConfigurations":{
+      "type":"list",
+      "member":{"shape":"LoggingConfiguration"}
+    },
+    "ManagedRuleGroupStatement":{
+      "type":"structure",
+      "required":[
+        "VendorName",
+        "Name"
+      ],
+      "members":{
+        "VendorName":{
+          "shape":"VendorName",
+          "documentation":"<p>The name of the managed rule group vendor. You use this, along with the rule group name, to identify the rule group.</p>"
+        },
+        "Name":{
+          "shape":"EntityName",
+          "documentation":"<p>The name of the managed rule group. You use this, along with the vendor name, to identify the rule group.</p>"
+        },
+        "ExcludedRules":{
+          "shape":"ExcludedRules",
+          "documentation":"<p>The rules whose actions are set to <code>COUNT</code> by the web ACL, regardless of the action that is set on the rule. This effectively excludes the rule from acting on web requests. </p>"
+        }
+      },
+      "documentation":"<note> <p>This is the latest version of <b>AWS WAF</b>, named AWS WAFV2, released in November, 2019. For information, including how to migrate your AWS WAF resources from the prior release, see the <a href=\"https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html\">AWS WAF Developer Guide</a>. </p> </note> <p>A rule statement used to run the rules that are defined in a managed rule group. To use this, provide the vendor name and the name of the rule group in this statement. You can retrieve the required names by calling <a>ListAvailableManagedRuleGroups</a>.</p> <p>You can't nest a <code>ManagedRuleGroupStatement</code>, for example for use inside a <code>NotStatement</code> or <code>OrStatement</code>. It can only be referenced as a top-level statement within a rule.</p>"
+    },
+    "ManagedRuleGroupSummaries":{
+      "type":"list",
+      "member":{"shape":"ManagedRuleGroupSummary"}
+    },
+    "ManagedRuleGroupSummary":{
+      "type":"structure",
+      "members":{
+        "VendorName":{
+          "shape":"VendorName",
+          "documentation":"<p>The name of the managed rule group vendor. You use this, along with the rule group name, to identify the rule group.</p>"
+        },
+        "Name":{
+          "shape":"EntityName",
+          "documentation":"<p>The name of the managed rule group. You use this, along with the vendor name, to identify the rule group.</p>"
+        },
+        "Description":{
+          "shape":"EntityDescription",
+          "documentation":"<p>The description of the managed rule group, provided by AWS Managed Rules or the AWS Marketplace seller who manages it.</p>"
+        }
+      },
+      "documentation":"<note> <p>This is the latest version of <b>AWS WAF</b>, named AWS WAFV2, released in November, 2019. For information, including how to migrate your AWS WAF resources from the prior release, see the <a href=\"https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html\">AWS WAF Developer Guide</a>. </p> </note> <p>High-level information about a managed rule group, returned by <a>ListAvailableManagedRuleGroups</a>. This provides information like the name and vendor name, that you provide when you add a <a>ManagedRuleGroupStatement</a> to a web ACL. Managed rule groups include AWS Managed Rules rule groups, which are free of charge to AWS WAF customers, and AWS Marketplace managed rule groups, which you can subscribe to through AWS Marketplace. </p>"
+    },
+    "Method":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<note> <p>This is the latest version of <b>AWS WAF</b>, named AWS WAFV2, released in November, 2019. For information, including how to migrate your AWS WAF resources from the prior release, see the <a href=\"https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html\">AWS WAF Developer Guide</a>. </p> </note> <p>The HTTP method of a web request. The method indicates the type of operation that the request is asking the origin to perform. </p> <p>This is used only to indicate the web request component for AWS WAF to inspect, in the <a>FieldToMatch</a> specification. </p>"
+    },
+    "MetricName":{
+      "type":"string",
+      "max":255,
+      "min":1,
+      "pattern":"^[\\w#:\\.\\-/]+$"
+    },
+    "NextMarker":{
+      "type":"string",
+      "max":256,
+      "min":1,
+      "pattern":".*\\S.*"
+    },
+    "NoneAction":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<note> <p>This is the latest version of <b>AWS WAF</b>, named AWS WAFV2, released in November, 2019. For information, including how to migrate your AWS WAF resources from the prior release, see the <a href=\"https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html\">AWS WAF Developer Guide</a>. </p> </note> <p>Specifies that AWS WAF should do nothing. This is generally used to try out a rule without performing any actions. You set the <code>OverrideAction</code> on the <a>Rule</a>. </p> <p>This is used only in the context of other settings, for example to specify values for <a>RuleAction</a> and web ACL <a>DefaultAction</a>. </p>"
+    },
+    "NotStatement":{
+      "type":"structure",
+      "required":["Statement"],
+      "members":{
+        "Statement":{
+          "shape":"Statement",
+          "documentation":"<p>The statement to negate. You can use any statement that can be nested.</p>"
+        }
+      },
+      "documentation":"<note> <p>This is the latest version of <b>AWS WAF</b>, named AWS WAFV2, released in November, 2019. For information, including how to migrate your AWS WAF resources from the prior release, see the <a href=\"https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html\">AWS WAF Developer Guide</a>. </p> </note> <p>A logical rule statement used to negate the results of another rule statement. You provide one <a>Statement</a> within the <code>NotStatement</code>.</p>"
+    },
+    "OrStatement":{
+      "type":"structure",
+      "required":["Statements"],
+      "members":{
+        "Statements":{
+          "shape":"Statements",
+          "documentation":"<p>The statements to combine with OR logic. You can use any statements that can be nested.</p>"
+        }
+      },
+      "documentation":"<note> <p>This is the latest version of <b>AWS WAF</b>, named AWS WAFV2, released in November, 2019. For information, including how to migrate your AWS WAF resources from the prior release, see the <a href=\"https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html\">AWS WAF Developer Guide</a>. </p> </note> <p>A logical rule statement used to combine other rule statements with OR logic. You provide more than one <a>Statement</a> within the <code>OrStatement</code>. </p>"
+    },
+    "OverrideAction":{
+      "type":"structure",
+      "members":{
+        "Count":{
+          "shape":"CountAction",
+          "documentation":"<p>Override the rule action setting to count.</p>"
+        },
+        "None":{
+          "shape":"NoneAction",
+          "documentation":"<p>Don't override the rule action setting.</p>"
+        }
+      },
+      "documentation":"<p>The override action to apply to the rules in a rule group. Used only for rule statements that reference a rule group, like <code>RuleGroupReferenceStatement</code> and <code>ManagedRuleGroupStatement</code>. </p> <p>Set the override action to none to leave the rule actions in effect. Set it to count to only count matches, regardless of the rule action settings. </p> <p>In a <a>Rule</a>, you must specify either this <code>OverrideAction</code> setting or the rule <code>Action</code> setting, but not both:</p> <ul> <li> <p>If the rule statement references a rule group, use this override action setting and not the action setting. </p> </li> <li> <p>If the rule statement does not reference a rule group, use the rule action setting and not this rule override action setting. </p> </li> </ul>"
+    },
+    "PaginationLimit":{
+      "type":"integer",
+      "max":100,
+      "min":1
+    },
+    "ParameterExceptionField":{
+      "type":"string",
+      "enum":[
+        "WEB_ACL",
+        "RULE_GROUP",
+        "REGEX_PATTERN_SET",
+        "IP_SET",
+        "MANAGED_RULE_SET",
+        "RULE",
+        "EXCLUDED_RULE",
+        "STATEMENT",
+        "BYTE_MATCH_STATEMENT",
+        "SQLI_MATCH_STATEMENT",
+        "XSS_MATCH_STATEMENT",
+        "SIZE_CONSTRAINT_STATEMENT",
+        "GEO_MATCH_STATEMENT",
+        "RATE_BASED_STATEMENT",
+        "RULE_GROUP_REFERENCE_STATEMENT",
+        "REGEX_PATTERN_REFERENCE_STATEMENT",
+        "IP_SET_REFERENCE_STATEMENT",
+        "MANAGED_RULE_SET_STATEMENT",
+        "AND_STATEMENT",
+        "OR_STATEMENT",
+        "NOT_STATEMENT",
+        "IP_ADDRESS",
+        "IP_ADDRESS_VERSION",
+        "FIELD_TO_MATCH",
+        "TEXT_TRANSFORMATION",
+        "SINGLE_QUERY_ARGUMENT",
+        "SINGLE_HEADER",
+        "DEFAULT_ACTION",
+        "RULE_ACTION",
+        "ENTITY_LIMIT",
+        "OVERRIDE_ACTION",
+        "SCOPE_VALUE",
+        "RESOURCE_ARN",
+        "RESOURCE_TYPE",
+        "TAGS",
+        "TAG_KEYS",
+        "METRIC_NAME",
+        "FIREWALL_MANAGER_STATEMENT"
+      ]
+    },
+    "ParameterExceptionParameter":{
+      "type":"string",
+      "min":1
+    },
+    "PolicyString":{
+      "type":"string",
+      "min":1
+    },
+    "PopulationSize":{"type":"long"},
+    "PositionalConstraint":{
+      "type":"string",
+      "enum":[
+        "EXACTLY",
+        "STARTS_WITH",
+        "ENDS_WITH",
+        "CONTAINS",
+        "CONTAINS_WORD"
+      ]
+    },
+    "PutLoggingConfigurationRequest":{
+      "type":"structure",
+      "required":["LoggingConfiguration"],
+      "members":{
+        "LoggingConfiguration":{
+          "shape":"LoggingConfiguration",
+          "documentation":"<p/>"
+        }
+      }
+    },
+    "PutLoggingConfigurationResponse":{
+      "type":"structure",
+      "members":{
+        "LoggingConfiguration":{
+          "shape":"LoggingConfiguration",
+          "documentation":"<p/>"
+        }
+      }
+    },
+    "PutPermissionPolicyRequest":{
+      "type":"structure",
+      "required":[
+        "ResourceArn",
+        "Policy"
+      ],
+      "members":{
+        "ResourceArn":{
+          "shape":"ResourceArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the <a>RuleGroup</a> to which you want to attach the policy.</p>"
+        },
+        "Policy":{
+          "shape":"PolicyString",
+          "documentation":"<p>The policy to attach to the specified rule group. </p> <p>The policy specifications must conform to the following:</p> <ul> <li> <p>The policy must be composed using IAM Policy version 2012-10-17 or version 2015-01-01.</p> </li> <li> <p>The policy must include specifications for <code>Effect</code>, <code>Action</code>, and <code>Principal</code>.</p> </li> <li> <p> <code>Effect</code> must specify <code>Allow</code>.</p> </li> <li> <p> <code>Action</code> must specify <code>wafv2:CreateWebACL</code>, <code>wafv2:UpdateWebACL</code>, and <code>wafv2:PutFirewallManagerRuleGroups</code>. AWS WAF rejects any extra actions or wildcard actions in the policy.</p> </li> <li> <p>The policy must not include a <code>Resource</code> parameter.</p> </li> </ul> <p>For more information, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/access_policies.html\">IAM Policies</a>. </p>"
+        }
+      }
+    },
+    "PutPermissionPolicyResponse":{
+      "type":"structure",
+      "members":{
+      }
+    },
+    "QueryString":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<note> <p>This is the latest version of <b>AWS WAF</b>, named AWS WAFV2, released in November, 2019. For information, including how to migrate your AWS WAF resources from the prior release, see the <a href=\"https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html\">AWS WAF Developer Guide</a>. </p> </note> <p>The query string of a web request. This is the part of a URL that appears after a <code>?</code> character, if any.</p> <p>This is used only to indicate the web request component for AWS WAF to inspect, in the <a>FieldToMatch</a> specification. </p>"
+    },
+    "RateBasedStatement":{
+      "type":"structure",
+      "required":[
+        "Limit",
+        "AggregateKeyType"
+      ],
+      "members":{
+        "Limit":{
+          "shape":"RateLimit",
+          "documentation":"<p>The limit on requests per 5-minute period for a single originating IP address. If the statement includes a <code>ScopDownStatement</code>, this limit is applied only to the requests that match the statement.</p>"
+        },
+        "AggregateKeyType":{
+          "shape":"RateBasedStatementAggregateKeyType",
+          "documentation":"<p>Setting that indicates how to aggregate the request counts. Currently, you must set this to <code>IP</code>. The request counts are aggregated on IP addresses. </p>"
+        },
+        "ScopeDownStatement":{
+          "shape":"Statement",
+          "documentation":"<p>An optional nested statement that narrows the scope of the rate-based statement to matching web requests. This can be any nestable statement, and you can nest statements at any level below this scope-down statement.</p>"
+        }
+      },
+      "documentation":"<note> <p>This is the latest version of <b>AWS WAF</b>, named AWS WAFV2, released in November, 2019. For information, including how to migrate your AWS WAF resources from the prior release, see the <a href=\"https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html\">AWS WAF Developer Guide</a>. </p> </note> <p>A rate-based rule tracks the rate of requests for each originating IP address, and triggers the rule action when the rate exceeds a limit that you specify on the number of requests in any 5-minute time span. You can use this to put a temporary block on requests from an IP address that is sending excessive requests.</p> <p>When the rule action triggers, AWS WAF blocks additional requests from the IP address until the request rate falls below the limit.</p> <p>You can optionally nest another statement inside the rate-based statement, to narrow the scope of the rule so that it only counts requests that match the nested statement. For example, based on recent requests that you have seen from an attacker, you might create a rate-based rule with a nested AND rule statement that contains the following nested statements:</p> <ul> <li> <p>An IP match statement with an IP set that specified the address 192.0.2.44.</p> </li> <li> <p>A string match statement that searches in the User-Agent header for the string BadBot.</p> </li> </ul> <p>In this rate-based rule, you also define a rate limit. For this example, the rate limit is 1,000. Requests that meet both of the conditions in the statements are counted. If the count exceeds 1,000 requests per five minutes, the rule action triggers. Requests that do not meet both conditions are not counted towards the rate limit and are not affected by this rule.</p> <p>You cannot nest a <code>RateBasedStatement</code>, for example for use inside a <code>NotStatement</code> or <code>OrStatement</code>. It can only be referenced as a top-level statement within a rule.</p>"
+    },
+    "RateBasedStatementAggregateKeyType":{
+      "type":"string",
+      "enum":["IP"]
+    },
+    "RateBasedStatementManagedKeysIPSet":{
+      "type":"structure",
+      "members":{
+        "IPAddressVersion":{"shape":"IPAddressVersion"},
+        "Addresses":{
+          "shape":"IPAddresses",
+          "documentation":"<p>The IP addresses that are currently blocked.</p>"
+        }
+      },
+      "documentation":"<note> <p>This is the latest version of <b>AWS WAF</b>, named AWS WAFV2, released in November, 2019. For information, including how to migrate your AWS WAF resources from the prior release, see the <a href=\"https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html\">AWS WAF Developer Guide</a>. </p> </note> <p>The set of IP addresses that are currently blocked for a rate-based statement.</p>"
+    },
+    "RateLimit":{
+      "type":"long",
+      "max":2000000000,
+      "min":100
+    },
+    "RedactedFields":{
+      "type":"list",
+      "member":{"shape":"FieldToMatch"},
+      "max":100
+    },
+    "Regex":{
+      "type":"structure",
+      "members":{
+        "RegexString":{
+          "shape":"RegexPatternString",
+          "documentation":"<p>The string representing the regular expression.</p>"
+        }
+      },
+      "documentation":"<note> <p>This is the latest version of <b>AWS WAF</b>, named AWS WAFV2, released in November, 2019. For information, including how to migrate your AWS WAF resources from the prior release, see the <a href=\"https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html\">AWS WAF Developer Guide</a>. </p> </note> <p>A single regular expression. This is used in a <a>RegexPatternSet</a>.</p>"
+    },
+    "RegexPatternSet":{
+      "type":"structure",
+      "members":{
+        "Name":{
+          "shape":"EntityName",
+          "documentation":"<p>The name of the set. You cannot change the name after you create the set.</p>"
+        },
+        "Id":{
+          "shape":"EntityId",
+          "documentation":"<p>A unique identifier for the set. This ID is returned in the responses to create and list commands. You provide it to operations like update and delete.</p>"
+        },
+        "ARN":{
+          "shape":"ResourceArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the entity.</p>"
+        },
+        "Description":{
+          "shape":"EntityDescription",
+          "documentation":"<p>A description of the set that helps with identification. You cannot change the description of a set after you create it.</p>"
+        },
+        "RegularExpressionList":{
+          "shape":"RegularExpressionList",
+          "documentation":"<p>The regular expression patterns in the set.</p>"
+        }
+      },
+      "documentation":"<note> <p>This is the latest version of <b>AWS WAF</b>, named AWS WAFV2, released in November, 2019. For information, including how to migrate your AWS WAF resources from the prior release, see the <a href=\"https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html\">AWS WAF Developer Guide</a>. </p> </note> <p>Contains one or more regular expressions. </p> <p>AWS WAF assigns an ARN to each <code>RegexPatternSet</code> that you create. To use a set in a rule, you provide the ARN to the <a>Rule</a> statement <a>RegexPatternSetReferenceStatement</a>. </p>"
+    },
+    "RegexPatternSetReferenceStatement":{
+      "type":"structure",
+      "required":[
+        "ARN",
+        "FieldToMatch",
+        "TextTransformations"
+      ],
+      "members":{
+        "ARN":{
+          "shape":"ResourceArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the <a>RegexPatternSet</a> that this statement references.</p>"
+        },
+        "FieldToMatch":{
+          "shape":"FieldToMatch",
+          "documentation":"<p>The part of a web request that you want AWS WAF to inspect. For more information, see <a>FieldToMatch</a>. </p>"
+        },
+        "TextTransformations":{
+          "shape":"TextTransformations",
+          "documentation":"<p>Text transformations eliminate some of the unusual formatting that attackers use in web requests in an effort to bypass detection. If you specify one or more transformations in a rule statement, AWS WAF performs all transformations on the content of the request component identified by <code>FieldToMatch</code>, starting from the lowest priority setting, before inspecting the content for a match.</p>"
+        }
+      },
+      "documentation":"<note> <p>This is the latest version of <b>AWS WAF</b>, named AWS WAFV2, released in November, 2019. For information, including how to migrate your AWS WAF resources from the prior release, see the <a href=\"https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html\">AWS WAF Developer Guide</a>. </p> </note> <p>A rule statement used to search web request components for matches with regular expressions. To use this, create a <a>RegexPatternSet</a> that specifies the expressions that you want to detect, then use the ARN of that set in this statement. A web request matches the pattern set rule statement if the request component matches any of the patterns in the set. To create a regex pattern set, see <a>CreateRegexPatternSet</a>.</p> <p>Each regex pattern set rule statement references a regex pattern set. You create and maintain the set independent of your rules. This allows you to use the single set in multiple rules. When you update the referenced set, AWS WAF automatically updates all rules that reference it.</p>"
+    },
+    "RegexPatternSetSummaries":{
+      "type":"list",
+      "member":{"shape":"RegexPatternSetSummary"}
+    },
+    "RegexPatternSetSummary":{
+      "type":"structure",
+      "members":{
+        "Name":{
+          "shape":"EntityName",
+          "documentation":"<p>The name of the data type instance. You cannot change the name after you create the instance.</p>"
+        },
+        "Id":{
+          "shape":"EntityId",
+          "documentation":"<p>A unique identifier for the set. This ID is returned in the responses to create and list commands. You provide it to operations like update and delete.</p>"
+        },
+        "Description":{
+          "shape":"EntityDescription",
+          "documentation":"<p>A description of the set that helps with identification. You cannot change the description of a set after you create it.</p>"
+        },
+        "LockToken":{
+          "shape":"LockToken",
+          "documentation":"<p>A token used for optimistic locking. AWS WAF returns a token to your get and list requests, to mark the state of the entity at the time of the request. To make changes to the entity associated with the token, you provide the token to operations like update and delete. AWS WAF uses the token to ensure that no changes have been made to the entity since you last retrieved it. If a change has been made, the update fails with a <code>WAFOptimisticLockException</code>. If this happens, perform another get, and use the new token returned by that operation. </p>"
+        },
+        "ARN":{
+          "shape":"ResourceArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the entity.</p>"
+        }
+      },
+      "documentation":"<note> <p>This is the latest version of <b>AWS WAF</b>, named AWS WAFV2, released in November, 2019. For information, including how to migrate your AWS WAF resources from the prior release, see the <a href=\"https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html\">AWS WAF Developer Guide</a>. </p> </note> <p>High-level information about a <a>RegexPatternSet</a>, returned by operations like create and list. This provides information like the ID, that you can use to retrieve and manage a <code>RegexPatternSet</code>, and the ARN, that you provide to the <a>RegexPatternSetReferenceStatement</a> to use the pattern set in a <a>Rule</a>.</p>"
+    },
+    "RegexPatternString":{
+      "type":"string",
+      "max":512,
+      "min":1,
+      "pattern":".*"
+    },
+    "RegularExpressionList":{
+      "type":"list",
+      "member":{"shape":"Regex"}
+    },
+    "ResourceArn":{
+      "type":"string",
+      "max":2048,
+      "min":20,
+      "pattern":".*\\S.*"
+    },
+    "ResourceArns":{
+      "type":"list",
+      "member":{"shape":"ResourceArn"}
+    },
+    "ResourceType":{
+      "type":"string",
+      "enum":[
+        "APPLICATION_LOAD_BALANCER",
+        "API_GATEWAY"
+      ]
+    },
+    "Rule":{
+      "type":"structure",
+      "required":[
+        "Name",
+        "Priority",
+        "Statement",
+        "VisibilityConfig"
+      ],
+      "members":{
+        "Name":{
+          "shape":"EntityName",
+          "documentation":"<p>The name of the rule. You can't change the name of a <code>Rule</code> after you create it. </p>"
+        },
+        "Priority":{
+          "shape":"RulePriority",
+          "documentation":"<p>If you define more than one <code>Rule</code> in a <code>WebACL</code>, AWS WAF evaluates each request against the <code>Rules</code> in order based on the value of <code>Priority</code>. AWS WAF processes rules with lower priority first. The priorities don't need to be consecutive, but they must all be different.</p>"
+        },
+        "Statement":{
+          "shape":"Statement",
+          "documentation":"<p>The AWS WAF processing statement for the rule, for example <a>ByteMatchStatement</a> or <a>SizeConstraintStatement</a>. </p>"
+        },
+        "Action":{
+          "shape":"RuleAction",
+          "documentation":"<p>The action that AWS WAF should take on a web request when it matches the rule statement. Settings at the web ACL level can override the rule action setting. </p> <p>This is used only for rules whose statements do not reference a rule group. Rule statements that reference a rule group include <code>RuleGroupReferenceStatement</code> and <code>ManagedRuleGroupStatement</code>. </p> <p>You must specify either this <code>Action</code> setting or the rule <code>OverrideAction</code> setting, but not both:</p> <ul> <li> <p>If the rule statement does not reference a rule group, use this rule action setting and not the rule override action setting. </p> </li> <li> <p>If the rule statement references a rule group, use the override action setting and not this action setting. </p> </li> </ul>"
+        },
+        "OverrideAction":{
+          "shape":"OverrideAction",
+          "documentation":"<p>The override action to apply to the rules in a rule group. Used only for rule statements that reference a rule group, like <code>RuleGroupReferenceStatement</code> and <code>ManagedRuleGroupStatement</code>. </p> <p>Set the override action to none to leave the rule actions in effect. Set it to count to only count matches, regardless of the rule action settings. </p> <p>In a <a>Rule</a>, you must specify either this <code>OverrideAction</code> setting or the rule <code>Action</code> setting, but not both:</p> <ul> <li> <p>If the rule statement references a rule group, use this override action setting and not the action setting. </p> </li> <li> <p>If the rule statement does not reference a rule group, use the rule action setting and not this rule override action setting. </p> </li> </ul>"
+        },
+        "VisibilityConfig":{
+          "shape":"VisibilityConfig",
+          "documentation":"<p>Defines and enables Amazon CloudWatch metrics and web request sample collection. </p>"
+        }
+      },
+      "documentation":"<note> <p>This is the latest version of <b>AWS WAF</b>, named AWS WAFV2, released in November, 2019. For information, including how to migrate your AWS WAF resources from the prior release, see the <a href=\"https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html\">AWS WAF Developer Guide</a>. </p> </note> <p>A single rule, which you can use in a <a>WebACL</a> or <a>RuleGroup</a> to identify web requests that you want to allow, block, or count. Each rule includes one top-level <a>Statement</a> that AWS WAF uses to identify matching web requests, and parameters that govern how AWS WAF handles them. </p>"
+    },
+    "RuleAction":{
+      "type":"structure",
+      "members":{
+        "Block":{
+          "shape":"BlockAction",
+          "documentation":"<p>Instructs AWS WAF to block the web request.</p>"
+        },
+        "Allow":{
+          "shape":"AllowAction",
+          "documentation":"<p>Instructs AWS WAF to allow the web request.</p>"
+        },
+        "Count":{
+          "shape":"CountAction",
+          "documentation":"<p>Instructs AWS WAF to count the web request and allow it.</p>"
+        }
+      },
+      "documentation":"<note> <p>This is the latest version of <b>AWS WAF</b>, named AWS WAFV2, released in November, 2019. For information, including how to migrate your AWS WAF resources from the prior release, see the <a href=\"https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html\">AWS WAF Developer Guide</a>. </p> </note> <p>The action that AWS WAF should take on a web request when it matches a rule's statement. Settings at the web ACL level can override the rule action setting. </p>"
+    },
+    "RuleGroup":{
+      "type":"structure",
+      "required":[
+        "Name",
+        "Id",
+        "Capacity",
+        "ARN",
+        "VisibilityConfig"
+      ],
+      "members":{
+        "Name":{
+          "shape":"EntityName",
+          "documentation":"<p>The name of the rule group. You cannot change the name of a rule group after you create it.</p>"
+        },
+        "Id":{
+          "shape":"EntityId",
+          "documentation":"<p>A unique identifier for the rule group. This ID is returned in the responses to create and list commands. You provide it to operations like update and delete.</p>"
+        },
+        "Capacity":{
+          "shape":"CapacityUnit",
+          "documentation":"<p>The web ACL capacity units (WCUs) required for this rule group.</p> <p>When you create your own rule group, you define this, and you cannot change it after creation. When you add or modify the rules in a rule group, AWS WAF enforces this limit. You can check the capacity for a set of rules using <a>CheckCapacity</a>.</p> <p>AWS WAF uses WCUs to calculate and control the operating resources that are used to run your rules, rule groups, and web ACLs. AWS WAF calculates capacity differently for each rule type, to reflect the relative cost of each rule. Simple rules that cost little to run use fewer WCUs than more complex rules that use more processing power. Rule group capacity is fixed at creation, which helps users plan their web ACL WCU usage when they use a rule group. The WCU limit for web ACLs is 1,500. </p>"
+        },
+        "ARN":{
+          "shape":"ResourceArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the entity.</p>"
+        },
+        "Description":{
+          "shape":"EntityDescription",
+          "documentation":"<p>A description of the rule group that helps with identification. You cannot change the description of a rule group after you create it.</p>"
+        },
+        "Rules":{
+          "shape":"Rules",
+          "documentation":"<p>The <a>Rule</a> statements used to identify the web requests that you want to allow, block, or count. Each rule includes one top-level statement that AWS WAF uses to identify matching web requests, and parameters that govern how AWS WAF handles them. </p>"
+        },
+        "VisibilityConfig":{
+          "shape":"VisibilityConfig",
+          "documentation":"<p>Defines and enables Amazon CloudWatch metrics and web request sample collection. </p>"
+        }
+      },
+      "documentation":"<note> <p>This is the latest version of <b>AWS WAF</b>, named AWS WAFV2, released in November, 2019. For information, including how to migrate your AWS WAF resources from the prior release, see the <a href=\"https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html\">AWS WAF Developer Guide</a>. </p> </note> <p> A rule group defines a collection of rules to inspect and control web requests that you can use in a <a>WebACL</a>. When you create a rule group, you define an immutable capacity limit. If you update a rule group, you must stay within the capacity. This allows others to reuse the rule group with confidence in its capacity requirements. </p>"
+    },
+    "RuleGroupReferenceStatement":{
+      "type":"structure",
+      "required":["ARN"],
+      "members":{
+        "ARN":{
+          "shape":"ResourceArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the entity.</p>"
+        },
+        "ExcludedRules":{
+          "shape":"ExcludedRules",
+          "documentation":"<p>The names of rules that are in the referenced rule group, but that you want AWS WAF to exclude from processing for this rule statement. </p>"
+        }
+      },
+      "documentation":"<note> <p>This is the latest version of <b>AWS WAF</b>, named AWS WAFV2, released in November, 2019. For information, including how to migrate your AWS WAF resources from the prior release, see the <a href=\"https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html\">AWS WAF Developer Guide</a>. </p> </note> <p>A rule statement used to run the rules that are defined in a <a>RuleGroup</a>. To use this, create a rule group with your rules, then provide the ARN of the rule group in this statement.</p> <p>You cannot nest a <code>RuleGroupReferenceStatement</code>, for example for use inside a <code>NotStatement</code> or <code>OrStatement</code>. It can only be referenced as a top-level statement within a rule.</p>"
+    },
+    "RuleGroupSummaries":{
+      "type":"list",
+      "member":{"shape":"RuleGroupSummary"}
+    },
+    "RuleGroupSummary":{
+      "type":"structure",
+      "members":{
+        "Name":{
+          "shape":"EntityName",
+          "documentation":"<p>The name of the data type instance. You cannot change the name after you create the instance.</p>"
+        },
+        "Id":{
+          "shape":"EntityId",
+          "documentation":"<p>A unique identifier for the rule group. This ID is returned in the responses to create and list commands. You provide it to operations like update and delete.</p>"
+        },
+        "Description":{
+          "shape":"EntityDescription",
+          "documentation":"<p>A description of the rule group that helps with identification. You cannot change the description of a rule group after you create it.</p>"
+        },
+        "LockToken":{
+          "shape":"LockToken",
+          "documentation":"<p>A token used for optimistic locking. AWS WAF returns a token to your get and list requests, to mark the state of the entity at the time of the request. To make changes to the entity associated with the token, you provide the token to operations like update and delete. AWS WAF uses the token to ensure that no changes have been made to the entity since you last retrieved it. If a change has been made, the update fails with a <code>WAFOptimisticLockException</code>. If this happens, perform another get, and use the new token returned by that operation. </p>"
+        },
+        "ARN":{
+          "shape":"ResourceArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the entity.</p>"
+        }
+      },
+      "documentation":"<note> <p>This is the latest version of <b>AWS WAF</b>, named AWS WAFV2, released in November, 2019. For information, including how to migrate your AWS WAF resources from the prior release, see the <a href=\"https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html\">AWS WAF Developer Guide</a>. </p> </note> <p>High-level information about a <a>RuleGroup</a>, returned by operations like create and list. This provides information like the ID, that you can use to retrieve and manage a <code>RuleGroup</code>, and the ARN, that you provide to the <a>RuleGroupReferenceStatement</a> to use the rule group in a <a>Rule</a>.</p>"
+    },
+    "RulePriority":{
+      "type":"integer",
+      "min":0
+    },
+    "RuleSummaries":{
+      "type":"list",
+      "member":{"shape":"RuleSummary"}
+    },
+    "RuleSummary":{
+      "type":"structure",
+      "members":{
+        "Name":{
+          "shape":"EntityName",
+          "documentation":"<p>The name of the rule. </p>"
+        },
+        "Action":{"shape":"RuleAction"}
+      },
+      "documentation":"<note> <p>This is the latest version of <b>AWS WAF</b>, named AWS WAFV2, released in November, 2019. For information, including how to migrate your AWS WAF resources from the prior release, see the <a href=\"https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html\">AWS WAF Developer Guide</a>. </p> </note> <p>High-level information about a <a>Rule</a>, returned by operations like <a>DescribeManagedRuleGroup</a>. This provides information like the ID, that you can use to retrieve and manage a <code>RuleGroup</code>, and the ARN, that you provide to the <a>RuleGroupReferenceStatement</a> to use the rule group in a <a>Rule</a>.</p>"
+    },
+    "Rules":{
+      "type":"list",
+      "member":{"shape":"Rule"}
+    },
+    "SampleWeight":{
+      "type":"long",
+      "min":0
+    },
+    "SampledHTTPRequest":{
+      "type":"structure",
+      "required":[
+        "Request",
+        "Weight"
+      ],
+      "members":{
+        "Request":{
+          "shape":"HTTPRequest",
+          "documentation":"<p>A complex type that contains detailed information about the request.</p>"
+        },
+        "Weight":{
+          "shape":"SampleWeight",
+          "documentation":"<p>A value that indicates how one result in the response relates proportionally to other results in the response. For example, a result that has a weight of <code>2</code> represents roughly twice as many web requests as a result that has a weight of <code>1</code>.</p>"
+        },
+        "Timestamp":{
+          "shape":"Timestamp",
+          "documentation":"<p>The time at which AWS WAF received the request from your AWS resource, in Unix time format (in seconds).</p>"
+        },
+        "Action":{
+          "shape":"Action",
+          "documentation":"<p>The action for the <code>Rule</code> that the request matched: <code>ALLOW</code>, <code>BLOCK</code>, or <code>COUNT</code>.</p>"
+        },
+        "RuleNameWithinRuleGroup":{
+          "shape":"EntityName",
+          "documentation":"<p>The name of the <code>Rule</code> that the request matched. For managed rule groups, the format for this name is <code>&lt;vendor name&gt;#&lt;managed rule group name&gt;#&lt;rule name&gt;</code>. For your own rule groups, the format for this name is <code>&lt;rule group name&gt;#&lt;rule name&gt;</code>. If the rule is not in a rule group, the format is <code>&lt;rule name&gt;</code>. </p>"
+        }
+      },
+      "documentation":"<note> <p>This is the latest version of <b>AWS WAF</b>, named AWS WAFV2, released in November, 2019. For information, including how to migrate your AWS WAF resources from the prior release, see the <a href=\"https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html\">AWS WAF Developer Guide</a>. </p> </note> <p>Represents a single sampled web request. The response from <a>GetSampledRequests</a> includes a <code>SampledHTTPRequests</code> complex type that appears as <code>SampledRequests</code> in the response syntax. <code>SampledHTTPRequests</code> contains an array of <code>SampledHTTPRequest</code> objects.</p>"
+    },
+    "SampledHTTPRequests":{
+      "type":"list",
+      "member":{"shape":"SampledHTTPRequest"}
+    },
+    "Scope":{
+      "type":"string",
+      "enum":[
+        "CLOUDFRONT",
+        "REGIONAL"
+      ]
+    },
+    "SearchString":{"type":"blob"},
+    "SingleHeader":{
+      "type":"structure",
+      "required":["Name"],
+      "members":{
+        "Name":{
+          "shape":"FieldToMatchData",
+          "documentation":"<p>The name of the query header to inspect.</p>"
+        }
+      },
+      "documentation":"<note> <p>This is the latest version of <b>AWS WAF</b>, named AWS WAFV2, released in November, 2019. For information, including how to migrate your AWS WAF resources from the prior release, see the <a href=\"https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html\">AWS WAF Developer Guide</a>. </p> </note> <p>One of the headers in a web request, identified by name, for example, <code>User-Agent</code> or <code>Referer</code>. This setting isn't case sensitive.</p> <p>This is used only to indicate the web request component for AWS WAF to inspect, in the <a>FieldToMatch</a> specification. </p>"
+    },
+    "SingleQueryArgument":{
+      "type":"structure",
+      "required":["Name"],
+      "members":{
+        "Name":{
+          "shape":"FieldToMatchData",
+          "documentation":"<p>The name of the query argument to inspect.</p>"
+        }
+      },
+      "documentation":"<note> <p>This is the latest version of <b>AWS WAF</b>, named AWS WAFV2, released in November, 2019. For information, including how to migrate your AWS WAF resources from the prior release, see the <a href=\"https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html\">AWS WAF Developer Guide</a>. </p> </note> <p>One query argument in a web request, identified by name, for example <i>UserName</i> or <i>SalesRegion</i>. The name can be up to 30 characters long and isn't case sensitive. </p>"
+    },
+    "Size":{
+      "type":"long",
+      "max":21474836480,
+      "min":0
+    },
+    "SizeConstraintStatement":{
+      "type":"structure",
+      "required":[
+        "FieldToMatch",
+        "ComparisonOperator",
+        "Size",
+        "TextTransformations"
+      ],
+      "members":{
+        "FieldToMatch":{
+          "shape":"FieldToMatch",
+          "documentation":"<p>The part of a web request that you want AWS WAF to inspect. For more information, see <a>FieldToMatch</a>. </p>"
+        },
+        "ComparisonOperator":{
+          "shape":"ComparisonOperator",
+          "documentation":"<p>The operator to use to compare the request part to the size setting. </p>"
+        },
+        "Size":{
+          "shape":"Size",
+          "documentation":"<p>The size, in byte, to compare to the request part, after any transformations.</p>"
+        },
+        "TextTransformations":{
+          "shape":"TextTransformations",
+          "documentation":"<p>Text transformations eliminate some of the unusual formatting that attackers use in web requests in an effort to bypass detection. If you specify one or more transformations in a rule statement, AWS WAF performs all transformations on the content of the request component identified by <code>FieldToMatch</code>, starting from the lowest priority setting, before inspecting the content for a match.</p>"
+        }
+      },
+      "documentation":"<note> <p>This is the latest version of <b>AWS WAF</b>, named AWS WAFV2, released in November, 2019. For information, including how to migrate your AWS WAF resources from the prior release, see the <a href=\"https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html\">AWS WAF Developer Guide</a>. </p> </note> <p>A rule statement that compares a number of bytes against the size of a request component, using a comparison operator, such as greater than (&gt;) or less than (&lt;). For example, you can use a size constraint statement to look for query strings that are longer than 100 bytes. </p> <p>If you configure AWS WAF to inspect the request body, AWS WAF inspects only the first 8192 bytes (8 KB). If the request body for your web requests never exceeds 8192 bytes, you can create a size constraint condition and block requests that have a request body greater than 8192 bytes.</p> <p>If you choose URI for the value of Part of the request to filter on, the slash (/) in the URI counts as one character. For example, the URI <code>/logo.jpg</code> is nine characters long.</p>"
+    },
+    "SqliMatchStatement":{
+      "type":"structure",
+      "required":[
+        "FieldToMatch",
+        "TextTransformations"
+      ],
+      "members":{
+        "FieldToMatch":{
+          "shape":"FieldToMatch",
+          "documentation":"<p>The part of a web request that you want AWS WAF to inspect. For more information, see <a>FieldToMatch</a>. </p>"
+        },
+        "TextTransformations":{
+          "shape":"TextTransformations",
+          "documentation":"<p>Text transformations eliminate some of the unusual formatting that attackers use in web requests in an effort to bypass detection. If you specify one or more transformations in a rule statement, AWS WAF performs all transformations on the content of the request component identified by <code>FieldToMatch</code>, starting from the lowest priority setting, before inspecting the content for a match.</p>"
+        }
+      },
+      "documentation":"<note> <p>This is the latest version of <b>AWS WAF</b>, named AWS WAFV2, released in November, 2019. For information, including how to migrate your AWS WAF resources from the prior release, see the <a href=\"https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html\">AWS WAF Developer Guide</a>. </p> </note> <p>Attackers sometimes insert malicious SQL code into web requests in an effort to extract data from your database. To allow or block web requests that appear to contain malicious SQL code, create one or more SQL injection match conditions. An SQL injection match condition identifies the part of web requests, such as the URI or the query string, that you want AWS WAF to inspect. Later in the process, when you create a web ACL, you specify whether to allow or block requests that appear to contain malicious SQL code.</p>"
+    },
+    "Statement":{
+      "type":"structure",
+      "members":{
+        "ByteMatchStatement":{
+          "shape":"ByteMatchStatement",
+          "documentation":"<p>A rule statement that defines a string match search for AWS WAF to apply to web requests. The byte match statement provides the bytes to search for, the location in requests that you want AWS WAF to search, and other settings. The bytes to search for are typically a string that corresponds with ASCII characters. In the AWS WAF console and the developer guide, this is refered to as a string match statement.</p>"
+        },
+        "SqliMatchStatement":{
+          "shape":"SqliMatchStatement",
+          "documentation":"<p>Attackers sometimes insert malicious SQL code into web requests in an effort to extract data from your database. To allow or block web requests that appear to contain malicious SQL code, create one or more SQL injection match conditions. An SQL injection match condition identifies the part of web requests, such as the URI or the query string, that you want AWS WAF to inspect. Later in the process, when you create a web ACL, you specify whether to allow or block requests that appear to contain malicious SQL code.</p>"
+        },
+        "XssMatchStatement":{
+          "shape":"XssMatchStatement",
+          "documentation":"<p>A rule statement that defines a cross-site scripting (XSS) match search for AWS WAF to apply to web requests. XSS attacks are those where the attacker uses vulnerabilities in a benign website as a vehicle to inject malicious client-site scripts into other legitimate web browsers. The XSS match statement provides the location in requests that you want AWS WAF to search and text transformations to use on the search area before AWS WAF searches for character sequences that are likely to be malicious strings. </p>"
+        },
+        "SizeConstraintStatement":{
+          "shape":"SizeConstraintStatement",
+          "documentation":"<p>A rule statement that compares a number of bytes against the size of a request component, using a comparison operator, such as greater than (&gt;) or less than (&lt;). For example, you can use a size constraint statement to look for query strings that are longer than 100 bytes. </p> <p>If you configure AWS WAF to inspect the request body, AWS WAF inspects only the first 8192 bytes (8 KB). If the request body for your web requests never exceeds 8192 bytes, you can create a size constraint condition and block requests that have a request body greater than 8192 bytes.</p> <p>If you choose URI for the value of Part of the request to filter on, the slash (/) in the URI counts as one character. For example, the URI <code>/logo.jpg</code> is nine characters long.</p>"
+        },
+        "GeoMatchStatement":{
+          "shape":"GeoMatchStatement",
+          "documentation":"<p>A rule statement used to identify web requests based on country of origin. </p>"
+        },
+        "RuleGroupReferenceStatement":{
+          "shape":"RuleGroupReferenceStatement",
+          "documentation":"<p>A rule statement used to run the rules that are defined in a <a>RuleGroup</a>. To use this, create a rule group with your rules, then provide the ARN of the rule group in this statement.</p> <p>You cannot nest a <code>RuleGroupReferenceStatement</code>, for example for use inside a <code>NotStatement</code> or <code>OrStatement</code>. It can only be referenced as a top-level statement within a rule.</p>"
+        },
+        "IPSetReferenceStatement":{
+          "shape":"IPSetReferenceStatement",
+          "documentation":"<p>A rule statement used to detect web requests coming from particular IP addresses or address ranges. To use this, create an <a>IPSet</a> that specifies the addresses you want to detect, then use the ARN of that set in this statement. To create an IP set, see <a>CreateIPSet</a>.</p> <p>Each IP set rule statement references an IP set. You create and maintain the set independent of your rules. This allows you to use the single set in multiple rules. When you update the referenced set, AWS WAF automatically updates all rules that reference it.</p>"
+        },
+        "RegexPatternSetReferenceStatement":{
+          "shape":"RegexPatternSetReferenceStatement",
+          "documentation":"<p>A rule statement used to search web request components for matches with regular expressions. To use this, create a <a>RegexPatternSet</a> that specifies the expressions that you want to detect, then use the ARN of that set in this statement. A web request matches the pattern set rule statement if the request component matches any of the patterns in the set. To create a regex pattern set, see <a>CreateRegexPatternSet</a>.</p> <p>Each regex pattern set rule statement references a regex pattern set. You create and maintain the set independent of your rules. This allows you to use the single set in multiple rules. When you update the referenced set, AWS WAF automatically updates all rules that reference it.</p>"
+        },
+        "RateBasedStatement":{
+          "shape":"RateBasedStatement",
+          "documentation":"<p>A rate-based rule tracks the rate of requests for each originating IP address, and triggers the rule action when the rate exceeds a limit that you specify on the number of requests in any 5-minute time span. You can use this to put a temporary block on requests from an IP address that is sending excessive requests.</p> <p>When the rule action triggers, AWS WAF blocks additional requests from the IP address until the request rate falls below the limit.</p> <p>You can optionally nest another statement inside the rate-based statement, to narrow the scope of the rule so that it only counts requests that match the nested statement. For example, based on recent requests that you have seen from an attacker, you might create a rate-based rule with a nested AND rule statement that contains the following nested statements:</p> <ul> <li> <p>An IP match statement with an IP set that specified the address 192.0.2.44.</p> </li> <li> <p>A string match statement that searches in the User-Agent header for the string BadBot.</p> </li> </ul> <p>In this rate-based rule, you also define a rate limit. For this example, the rate limit is 1,000. Requests that meet both of the conditions in the statements are counted. If the count exceeds 1,000 requests per five minutes, the rule action triggers. Requests that do not meet both conditions are not counted towards the rate limit and are not affected by this rule.</p> <p>You cannot nest a <code>RateBasedStatement</code>, for example for use inside a <code>NotStatement</code> or <code>OrStatement</code>. It can only be referenced as a top-level statement within a rule.</p>"
+        },
+        "AndStatement":{
+          "shape":"AndStatement",
+          "documentation":"<p>A logical rule statement used to combine other rule statements with AND logic. You provide more than one <a>Statement</a> within the <code>AndStatement</code>. </p>"
+        },
+        "OrStatement":{
+          "shape":"OrStatement",
+          "documentation":"<p>A logical rule statement used to combine other rule statements with OR logic. You provide more than one <a>Statement</a> within the <code>OrStatement</code>. </p>"
+        },
+        "NotStatement":{
+          "shape":"NotStatement",
+          "documentation":"<p>A logical rule statement used to negate the results of another rule statement. You provide one <a>Statement</a> within the <code>NotStatement</code>.</p>"
+        },
+        "ManagedRuleGroupStatement":{
+          "shape":"ManagedRuleGroupStatement",
+          "documentation":"<p>A rule statement used to run the rules that are defined in a managed rule group. To use this, provide the vendor name and the name of the rule group in this statement. You can retrieve the required names by calling <a>ListAvailableManagedRuleGroups</a>.</p> <p>You can't nest a <code>ManagedRuleGroupStatement</code>, for example for use inside a <code>NotStatement</code> or <code>OrStatement</code>. It can only be referenced as a top-level statement within a rule.</p>"
+        }
+      },
+      "documentation":"<note> <p>This is the latest version of <b>AWS WAF</b>, named AWS WAFV2, released in November, 2019. For information, including how to migrate your AWS WAF resources from the prior release, see the <a href=\"https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html\">AWS WAF Developer Guide</a>. </p> </note> <p>The processing guidance for a <a>Rule</a>, used by AWS WAF to determine whether a web request matches the rule. </p>"
+    },
+    "Statements":{
+      "type":"list",
+      "member":{"shape":"Statement"}
+    },
+    "Tag":{
+      "type":"structure",
+      "required":[
+        "Key",
+        "Value"
+      ],
+      "members":{
+        "Key":{
+          "shape":"TagKey",
+          "documentation":"<p>Part of the key:value pair that defines a tag. You can use a tag key to describe a category of information, such as \"customer.\" Tag keys are case-sensitive.</p>"
+        },
+        "Value":{
+          "shape":"TagValue",
+          "documentation":"<p>Part of the key:value pair that defines a tag. You can use a tag value to describe a specific value within a category, such as \"companyA\" or \"companyB.\" Tag values are case-sensitive.</p>"
+        }
+      },
+      "documentation":"<note> <p>This is the latest version of <b>AWS WAF</b>, named AWS WAFV2, released in November, 2019. For information, including how to migrate your AWS WAF resources from the prior release, see the <a href=\"https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html\">AWS WAF Developer Guide</a>. </p> </note> <p>A collection of key:value pairs associated with an AWS resource. The key:value pair can be anything you define. Typically, the tag key represents a category (such as \"environment\") and the tag value represents a specific value within that category (such as \"test,\" \"development,\" or \"production\"). You can add up to 50 tags to each AWS resource. </p>"
+    },
+    "TagInfoForResource":{
+      "type":"structure",
+      "members":{
+        "ResourceARN":{
+          "shape":"ResourceArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the resource.</p>"
+        },
+        "TagList":{
+          "shape":"TagList",
+          "documentation":"<p>The array of <a>Tag</a> objects defined for the resource. </p>"
+        }
+      },
+      "documentation":"<note> <p>This is the latest version of <b>AWS WAF</b>, named AWS WAFV2, released in November, 2019. For information, including how to migrate your AWS WAF resources from the prior release, see the <a href=\"https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html\">AWS WAF Developer Guide</a>. </p> </note> <p>The collection of tagging definitions for an AWS resource. </p>"
+    },
+    "TagKey":{
+      "type":"string",
+      "max":128,
+      "min":1,
+      "pattern":".*\\S.*"
+    },
+    "TagKeyList":{
+      "type":"list",
+      "member":{"shape":"TagKey"},
+      "min":1
+    },
+    "TagList":{
+      "type":"list",
+      "member":{"shape":"Tag"},
+      "min":1
+    },
+    "TagResourceRequest":{
+      "type":"structure",
+      "required":[
+        "ResourceARN",
+        "Tags"
+      ],
+      "members":{
+        "ResourceARN":{
+          "shape":"ResourceArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the resource.</p>"
+        },
+        "Tags":{
+          "shape":"TagList",
+          "documentation":"<p>An array of key:value pairs to associate with the resource.</p>"
+        }
+      }
+    },
+    "TagResourceResponse":{
+      "type":"structure",
+      "members":{
+      }
+    },
+    "TagValue":{
+      "type":"string",
+      "max":256,
+      "min":0,
+      "pattern":".*"
+    },
+    "TextTransformation":{
+      "type":"structure",
+      "required":[
+        "Priority",
+        "Type"
+      ],
+      "members":{
+        "Priority":{
+          "shape":"TextTransformationPriority",
+          "documentation":"<p>Sets the relative processing order for multiple transformations that are defined for a rule statement. AWS WAF processes all transformations, from lowest priority to highest, before inspecting the transformed content. The priorities don't need to be consecutive, but they must all be different. </p>"
+        },
+        "Type":{
+          "shape":"TextTransformationType",
+          "documentation":"<p>You can specify the following transformation types:</p> <p> <b>CMD_LINE</b> </p> <p>When you're concerned that attackers are injecting an operating system command line command and using unusual formatting to disguise some or all of the command, use this option to perform the following transformations:</p> <ul> <li> <p>Delete the following characters: \\ \" ' ^</p> </li> <li> <p>Delete spaces before the following characters: / (</p> </li> <li> <p>Replace the following characters with a space: , ;</p> </li> <li> <p>Replace multiple spaces with one space</p> </li> <li> <p>Convert uppercase letters (A-Z) to lowercase (a-z)</p> </li> </ul> <p> <b>COMPRESS_WHITE_SPACE</b> </p> <p>Use this option to replace the following characters with a space character (decimal 32):</p> <ul> <li> <p>\\f, formfeed, decimal 12</p> </li> <li> <p>\\t, tab, decimal 9</p> </li> <li> <p>\\n, newline, decimal 10</p> </li> <li> <p>\\r, carriage return, decimal 13</p> </li> <li> <p>\\v, vertical tab, decimal 11</p> </li> <li> <p>non-breaking space, decimal 160</p> </li> </ul> <p> <code>COMPRESS_WHITE_SPACE</code> also replaces multiple spaces with one space.</p> <p> <b>HTML_ENTITY_DECODE</b> </p> <p>Use this option to replace HTML-encoded characters with unencoded characters. <code>HTML_ENTITY_DECODE</code> performs the following operations:</p> <ul> <li> <p>Replaces <code>(ampersand)quot;</code> with <code>\"</code> </p> </li> <li> <p>Replaces <code>(ampersand)nbsp;</code> with a non-breaking space, decimal 160</p> </li> <li> <p>Replaces <code>(ampersand)lt;</code> with a \"less than\" symbol</p> </li> <li> <p>Replaces <code>(ampersand)gt;</code> with <code>&gt;</code> </p> </li> <li> <p>Replaces characters that are represented in hexadecimal format, <code>(ampersand)#xhhhh;</code>, with the corresponding characters</p> </li> <li> <p>Replaces characters that are represented in decimal format, <code>(ampersand)#nnnn;</code>, with the corresponding characters</p> </li> </ul> <p> <b>LOWERCASE</b> </p> <p>Use this option to convert uppercase letters (A-Z) to lowercase (a-z).</p> <p> <b>URL_DECODE</b> </p> <p>Use this option to decode a URL-encoded value.</p> <p> <b>NONE</b> </p> <p>Specify <code>NONE</code> if you don't want any text transformations.</p>"
+        }
+      },
+      "documentation":"<note> <p>This is the latest version of <b>AWS WAF</b>, named AWS WAFV2, released in November, 2019. For information, including how to migrate your AWS WAF resources from the prior release, see the <a href=\"https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html\">AWS WAF Developer Guide</a>. </p> </note> <p>Text transformations eliminate some of the unusual formatting that attackers use in web requests in an effort to bypass detection. </p>"
+    },
+    "TextTransformationPriority":{
+      "type":"integer",
+      "min":0
+    },
+    "TextTransformationType":{
+      "type":"string",
+      "enum":[
+        "NONE",
+        "COMPRESS_WHITE_SPACE",
+        "HTML_ENTITY_DECODE",
+        "LOWERCASE",
+        "CMD_LINE",
+        "URL_DECODE"
+      ]
+    },
+    "TextTransformations":{
+      "type":"list",
+      "member":{"shape":"TextTransformation"},
+      "min":1
+    },
+    "TimeWindow":{
+      "type":"structure",
+      "required":[
+        "StartTime",
+        "EndTime"
+      ],
+      "members":{
+        "StartTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>The beginning of the time range from which you want <code>GetSampledRequests</code> to return a sample of the requests that your AWS resource received. Specify the date and time in the following format: <code>\"2016-09-27T14:50Z\"</code>. You can specify any time range in the previous three hours.</p>"
+        },
+        "EndTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>The end of the time range from which you want <code>GetSampledRequests</code> to return a sample of the requests that your AWS resource received. Specify the date and time in the following format: <code>\"2016-09-27T14:50Z\"</code>. You can specify any time range in the previous three hours.</p>"
+        }
+      },
+      "documentation":"<note> <p>This is the latest version of <b>AWS WAF</b>, named AWS WAFV2, released in November, 2019. For information, including how to migrate your AWS WAF resources from the prior release, see the <a href=\"https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html\">AWS WAF Developer Guide</a>. </p> </note> <p>In a <a>GetSampledRequests</a> request, the <code>StartTime</code> and <code>EndTime</code> objects specify the time range for which you want AWS WAF to return a sample of web requests.</p> <p>In a <a>GetSampledRequests</a> response, the <code>StartTime</code> and <code>EndTime</code> objects specify the time range for which AWS WAF actually returned a sample of web requests. AWS WAF gets the specified number of requests from among the first 5,000 requests that your AWS resource receives during the specified time period. If your resource receives more than 5,000 requests during that period, AWS WAF stops sampling after the 5,000th request. In that case, <code>EndTime</code> is the time that AWS WAF received the 5,000th request. </p>"
+    },
+    "Timestamp":{"type":"timestamp"},
+    "URIString":{"type":"string"},
+    "UntagResourceRequest":{
+      "type":"structure",
+      "required":[
+        "ResourceARN",
+        "TagKeys"
+      ],
+      "members":{
+        "ResourceARN":{
+          "shape":"ResourceArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the resource.</p>"
+        },
+        "TagKeys":{
+          "shape":"TagKeyList",
+          "documentation":"<p>An array of keys identifying the tags to disassociate from the resource.</p>"
+        }
+      }
+    },
+    "UntagResourceResponse":{
+      "type":"structure",
+      "members":{
+      }
+    },
+    "UpdateIPSetRequest":{
+      "type":"structure",
+      "required":[
+        "Name",
+        "Scope",
+        "Id",
+        "Addresses",
+        "LockToken"
+      ],
+      "members":{
+        "Name":{
+          "shape":"EntityName",
+          "documentation":"<p>The name of the IP set. You cannot change the name of an <code>IPSet</code> after you create it.</p>"
+        },
+        "Scope":{
+          "shape":"Scope",
+          "documentation":"<p>Specifies whether this is for an AWS CloudFront distribution or for a regional application. A regional application can be an Application Load Balancer (ALB) or an API Gateway stage. </p> <p>To work with CloudFront, you must also specify the Region US East (N. Virginia) as follows: </p> <ul> <li> <p>CLI - Specify the Region when you use the CloudFront scope: <code>--scope=CLOUDFRONT --region=us-east-1</code>. </p> </li> <li> <p>API and SDKs - For all calls, use the Region endpoint us-east-1. </p> </li> </ul>"
+        },
+        "Id":{
+          "shape":"EntityId",
+          "documentation":"<p>A unique identifier for the set. This ID is returned in the responses to create and list commands. You provide it to operations like update and delete.</p>"
+        },
+        "Description":{
+          "shape":"EntityDescription",
+          "documentation":"<p>A description of the IP set that helps with identification. You cannot change the description of an IP set after you create it.</p>"
+        },
+        "Addresses":{
+          "shape":"IPAddresses",
+          "documentation":"<p>Contains an array of strings that specify one or more IP addresses or blocks of IP addresses in Classless Inter-Domain Routing (CIDR) notation. AWS WAF supports all address ranges for IP versions IPv4 and IPv6. </p> <p>Examples: </p> <ul> <li> <p>To configure AWS WAF to allow, block, or count requests that originated from the IP address 192.0.2.44, specify <code>192.0.2.44/32</code>.</p> </li> <li> <p>To configure AWS WAF to allow, block, or count requests that originated from IP addresses from 192.0.2.0 to 192.0.2.255, specify <code>192.0.2.0/24</code>.</p> </li> <li> <p>To configure AWS WAF to allow, block, or count requests that originated from the IP address 1111:0000:0000:0000:0000:0000:0000:0111, specify <code>1111:0000:0000:0000:0000:0000:0000:0111/128</code>.</p> </li> <li> <p>To configure AWS WAF to allow, block, or count requests that originated from IP addresses 1111:0000:0000:0000:0000:0000:0000:0000 to 1111:0000:0000:0000:ffff:ffff:ffff:ffff, specify <code>1111:0000:0000:0000:0000:0000:0000:0000/64</code>.</p> </li> </ul> <p>For more information about CIDR notation, see the Wikipedia entry <a href=\"https://en.wikipedia.org/wiki/Classless_Inter-Domain_Routing\">Classless Inter-Domain Routing</a>.</p>"
+        },
+        "LockToken":{
+          "shape":"LockToken",
+          "documentation":"<p>A token used for optimistic locking. AWS WAF returns a token to your get and list requests, to mark the state of the entity at the time of the request. To make changes to the entity associated with the token, you provide the token to operations like update and delete. AWS WAF uses the token to ensure that no changes have been made to the entity since you last retrieved it. If a change has been made, the update fails with a <code>WAFOptimisticLockException</code>. If this happens, perform another get, and use the new token returned by that operation. </p>"
+        }
+      }
+    },
+    "UpdateIPSetResponse":{
+      "type":"structure",
+      "members":{
+        "NextLockToken":{
+          "shape":"LockToken",
+          "documentation":"<p>A token used for optimistic locking. AWS WAF returns this token to your update requests. You use <code>NextLockToken</code> in the same manner as you use <code>LockToken</code>. </p>"
+        }
+      }
+    },
+    "UpdateRegexPatternSetRequest":{
+      "type":"structure",
+      "required":[
+        "Name",
+        "Scope",
+        "Id",
+        "RegularExpressionList",
+        "LockToken"
+      ],
+      "members":{
+        "Name":{
+          "shape":"EntityName",
+          "documentation":"<p>The name of the set. You cannot change the name after you create the set.</p>"
+        },
+        "Scope":{
+          "shape":"Scope",
+          "documentation":"<p>Specifies whether this is for an AWS CloudFront distribution or for a regional application. A regional application can be an Application Load Balancer (ALB) or an API Gateway stage. </p> <p>To work with CloudFront, you must also specify the Region US East (N. Virginia) as follows: </p> <ul> <li> <p>CLI - Specify the Region when you use the CloudFront scope: <code>--scope=CLOUDFRONT --region=us-east-1</code>. </p> </li> <li> <p>API and SDKs - For all calls, use the Region endpoint us-east-1. </p> </li> </ul>"
+        },
+        "Id":{
+          "shape":"EntityId",
+          "documentation":"<p>A unique identifier for the set. This ID is returned in the responses to create and list commands. You provide it to operations like update and delete.</p>"
+        },
+        "Description":{
+          "shape":"EntityDescription",
+          "documentation":"<p>A description of the set that helps with identification. You cannot change the description of a set after you create it.</p>"
+        },
+        "RegularExpressionList":{
+          "shape":"RegularExpressionList",
+          "documentation":"<p/>"
+        },
+        "LockToken":{
+          "shape":"LockToken",
+          "documentation":"<p>A token used for optimistic locking. AWS WAF returns a token to your get and list requests, to mark the state of the entity at the time of the request. To make changes to the entity associated with the token, you provide the token to operations like update and delete. AWS WAF uses the token to ensure that no changes have been made to the entity since you last retrieved it. If a change has been made, the update fails with a <code>WAFOptimisticLockException</code>. If this happens, perform another get, and use the new token returned by that operation. </p>"
+        }
+      }
+    },
+    "UpdateRegexPatternSetResponse":{
+      "type":"structure",
+      "members":{
+        "NextLockToken":{
+          "shape":"LockToken",
+          "documentation":"<p>A token used for optimistic locking. AWS WAF returns this token to your update requests. You use <code>NextLockToken</code> in the same manner as you use <code>LockToken</code>. </p>"
+        }
+      }
+    },
+    "UpdateRuleGroupRequest":{
+      "type":"structure",
+      "required":[
+        "Name",
+        "Scope",
+        "Id",
+        "VisibilityConfig",
+        "LockToken"
+      ],
+      "members":{
+        "Name":{
+          "shape":"EntityName",
+          "documentation":"<p>The name of the rule group. You cannot change the name of a rule group after you create it.</p>"
+        },
+        "Scope":{
+          "shape":"Scope",
+          "documentation":"<p>Specifies whether this is for an AWS CloudFront distribution or for a regional application. A regional application can be an Application Load Balancer (ALB) or an API Gateway stage. </p> <p>To work with CloudFront, you must also specify the Region US East (N. Virginia) as follows: </p> <ul> <li> <p>CLI - Specify the Region when you use the CloudFront scope: <code>--scope=CLOUDFRONT --region=us-east-1</code>. </p> </li> <li> <p>API and SDKs - For all calls, use the Region endpoint us-east-1. </p> </li> </ul>"
+        },
+        "Id":{
+          "shape":"EntityId",
+          "documentation":"<p>A unique identifier for the rule group. This ID is returned in the responses to create and list commands. You provide it to operations like update and delete.</p>"
+        },
+        "Description":{
+          "shape":"EntityDescription",
+          "documentation":"<p>A description of the rule group that helps with identification. You cannot change the description of a rule group after you create it.</p>"
+        },
+        "Rules":{
+          "shape":"Rules",
+          "documentation":"<p>The <a>Rule</a> statements used to identify the web requests that you want to allow, block, or count. Each rule includes one top-level statement that AWS WAF uses to identify matching web requests, and parameters that govern how AWS WAF handles them. </p>"
+        },
+        "VisibilityConfig":{
+          "shape":"VisibilityConfig",
+          "documentation":"<p>Defines and enables Amazon CloudWatch metrics and web request sample collection. </p>"
+        },
+        "LockToken":{
+          "shape":"LockToken",
+          "documentation":"<p>A token used for optimistic locking. AWS WAF returns a token to your get and list requests, to mark the state of the entity at the time of the request. To make changes to the entity associated with the token, you provide the token to operations like update and delete. AWS WAF uses the token to ensure that no changes have been made to the entity since you last retrieved it. If a change has been made, the update fails with a <code>WAFOptimisticLockException</code>. If this happens, perform another get, and use the new token returned by that operation. </p>"
+        }
+      }
+    },
+    "UpdateRuleGroupResponse":{
+      "type":"structure",
+      "members":{
+        "NextLockToken":{
+          "shape":"LockToken",
+          "documentation":"<p>A token used for optimistic locking. AWS WAF returns this token to your update requests. You use <code>NextLockToken</code> in the same manner as you use <code>LockToken</code>. </p>"
+        }
+      }
+    },
+    "UpdateWebACLRequest":{
+      "type":"structure",
+      "required":[
+        "Name",
+        "Scope",
+        "Id",
+        "DefaultAction",
+        "VisibilityConfig",
+        "LockToken"
+      ],
+      "members":{
+        "Name":{
+          "shape":"EntityName",
+          "documentation":"<p>The name of the Web ACL. You cannot change the name of a Web ACL after you create it.</p>"
+        },
+        "Scope":{
+          "shape":"Scope",
+          "documentation":"<p>Specifies whether this is for an AWS CloudFront distribution or for a regional application. A regional application can be an Application Load Balancer (ALB) or an API Gateway stage. </p> <p>To work with CloudFront, you must also specify the Region US East (N. Virginia) as follows: </p> <ul> <li> <p>CLI - Specify the Region when you use the CloudFront scope: <code>--scope=CLOUDFRONT --region=us-east-1</code>. </p> </li> <li> <p>API and SDKs - For all calls, use the Region endpoint us-east-1. </p> </li> </ul>"
+        },
+        "Id":{
+          "shape":"EntityId",
+          "documentation":"<p>The unique identifier for the Web ACL. This ID is returned in the responses to create and list commands. You provide it to operations like update and delete.</p>"
+        },
+        "DefaultAction":{
+          "shape":"DefaultAction",
+          "documentation":"<p>The action to perform if none of the <code>Rules</code> contained in the <code>WebACL</code> match. </p>"
+        },
+        "Description":{
+          "shape":"EntityDescription",
+          "documentation":"<p>A description of the Web ACL that helps with identification. You cannot change the description of a Web ACL after you create it.</p>"
+        },
+        "Rules":{
+          "shape":"Rules",
+          "documentation":"<p>The <a>Rule</a> statements used to identify the web requests that you want to allow, block, or count. Each rule includes one top-level statement that AWS WAF uses to identify matching web requests, and parameters that govern how AWS WAF handles them. </p>"
+        },
+        "VisibilityConfig":{
+          "shape":"VisibilityConfig",
+          "documentation":"<p>Defines and enables Amazon CloudWatch metrics and web request sample collection. </p>"
+        },
+        "LockToken":{
+          "shape":"LockToken",
+          "documentation":"<p>A token used for optimistic locking. AWS WAF returns a token to your get and list requests, to mark the state of the entity at the time of the request. To make changes to the entity associated with the token, you provide the token to operations like update and delete. AWS WAF uses the token to ensure that no changes have been made to the entity since you last retrieved it. If a change has been made, the update fails with a <code>WAFOptimisticLockException</code>. If this happens, perform another get, and use the new token returned by that operation. </p>"
+        }
+      }
+    },
+    "UpdateWebACLResponse":{
+      "type":"structure",
+      "members":{
+        "NextLockToken":{
+          "shape":"LockToken",
+          "documentation":"<p>A token used for optimistic locking. AWS WAF returns this token to your update requests. You use <code>NextLockToken</code> in the same manner as you use <code>LockToken</code>. </p>"
+        }
+      }
+    },
+    "UriPath":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<note> <p>This is the latest version of <b>AWS WAF</b>, named AWS WAFV2, released in November, 2019. For information, including how to migrate your AWS WAF resources from the prior release, see the <a href=\"https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html\">AWS WAF Developer Guide</a>. </p> </note> <p>The path component of the URI of a web request. This is the part of a web request that identifies a resource, for example, <code>/images/daily-ad.jpg</code>.</p> <p>This is used only to indicate the web request component for AWS WAF to inspect, in the <a>FieldToMatch</a> specification. </p>"
+    },
+    "VendorName":{
+      "type":"string",
+      "max":128,
+      "min":1,
+      "pattern":".*\\S.*"
+    },
+    "VisibilityConfig":{
+      "type":"structure",
+      "required":[
+        "SampledRequestsEnabled",
+        "CloudWatchMetricsEnabled",
+        "MetricName"
+      ],
+      "members":{
+        "SampledRequestsEnabled":{
+          "shape":"Boolean",
+          "documentation":"<p>A boolean indicating whether AWS WAF should store a sampling of the web requests that match the rules. You can view the sampled requests through the AWS WAF console. </p>"
+        },
+        "CloudWatchMetricsEnabled":{
+          "shape":"Boolean",
+          "documentation":"<p>A boolean indicating whether the associated resource sends metrics to CloudWatch. For the list of available metrics, see <a href=\"https://docs.aws.amazon.com/waf/latest/developerguide/monitoring-cloudwatch.html#waf-metrics\">AWS WAF Metrics</a>.</p>"
+        },
+        "MetricName":{
+          "shape":"MetricName",
+          "documentation":"<p>A name of the CloudWatch metric. The name can contain only alphanumeric characters (A-Z, a-z, 0-9), with length from one to 128 characters. It can't contain whitespace or metric names reserved for AWS WAF, for example \"All\" and \"Default_Action.\" You can't change a <code>MetricName</code> after you create a <code>VisibilityConfig</code>.</p>"
+        }
+      },
+      "documentation":"<note> <p>This is the latest version of <b>AWS WAF</b>, named AWS WAFV2, released in November, 2019. For information, including how to migrate your AWS WAF resources from the prior release, see the <a href=\"https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html\">AWS WAF Developer Guide</a>. </p> </note> <p>Defines and enables Amazon CloudWatch metrics and web request sample collection. </p>"
+    },
+    "WAFAssociatedItemException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p>AWS WAF couldn’t perform the operation because your resource is being used by another resource or it’s associated with another resource. </p>",
+      "exception":true
+    },
+    "WAFDuplicateItemException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p>AWS WAF couldn’t perform the operation because the resource that you tried to save is a duplicate of an existing one.</p>",
+      "exception":true
+    },
+    "WAFInternalErrorException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p>Your request is valid, but AWS WAF couldn’t perform the operation because of a system problem. Retry your request. </p>",
+      "exception":true,
+      "fault":true
+    },
+    "WAFInvalidOperationException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p>The operation isn't valid. </p>",
+      "exception":true
+    },
+    "WAFInvalidParameterException":{
+      "type":"structure",
+      "members":{
+        "message":{"shape":"ErrorMessage"},
+        "Field":{"shape":"ParameterExceptionField"},
+        "Parameter":{"shape":"ParameterExceptionParameter"},
+        "Reason":{"shape":"ErrorReason"}
+      },
+      "documentation":"<p>The operation failed because AWS WAF didn't recognize a parameter in the request. For example: </p> <ul> <li> <p>You specified an invalid parameter name or value.</p> </li> <li> <p>Your nested statement isn't valid. You might have tried to nest a statement that can’t be nested. </p> </li> <li> <p>You tried to update a <code>WebACL</code> with a <code>DefaultAction</code> that isn't among the types available at <a>DefaultAction</a>.</p> </li> <li> <p>Your request references an ARN that is malformed, or corresponds to a resource with which a Web ACL cannot be associated.</p> </li> </ul>",
+      "exception":true
+    },
+    "WAFInvalidPermissionPolicyException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p>The operation failed because the specified policy isn't in the proper format. </p> <p>The policy specifications must conform to the following:</p> <ul> <li> <p>The policy must be composed using IAM Policy version 2012-10-17 or version 2015-01-01.</p> </li> <li> <p>The policy must include specifications for <code>Effect</code>, <code>Action</code>, and <code>Principal</code>.</p> </li> <li> <p> <code>Effect</code> must specify <code>Allow</code>.</p> </li> <li> <p> <code>Action</code> must specify <code>wafv2:CreateWebACL</code>, <code>wafv2:UpdateWebACL</code>, and <code>wafv2:PutFirewallManagerRuleGroups</code>. AWS WAF rejects any extra actions or wildcard actions in the policy.</p> </li> <li> <p>The policy must not include a <code>Resource</code> parameter.</p> </li> </ul> <p>For more information, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/access_policies.html\">IAM Policies</a>. </p>",
+      "exception":true
+    },
+    "WAFInvalidResourceException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p>AWS WAF couldn’t perform the operation because the resource that you requested isn’t valid. Check the resource, and try again.</p>",
+      "exception":true
+    },
+    "WAFLimitsExceededException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p>AWS WAF couldn’t perform the operation because you exceeded your resource limit. For example, the maximum number of <code>WebACL</code> objects that you can create for an AWS account. For more information, see <a href=\"https://docs.aws.amazon.com/waf/latest/developerguide/limits.html\">Limits</a> in the <i>AWS WAF Developer Guide</i>.</p>",
+      "exception":true
+    },
+    "WAFNonexistentItemException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p>AWS WAF couldn’t perform the operation because your resource doesn’t exist. </p>",
+      "exception":true
+    },
+    "WAFOptimisticLockException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p>AWS WAF couldn’t save your changes because you tried to update or delete a resource that has changed since you last retrieved it. Get the resource again, make any changes you need to make to the new copy, and retry your operation. </p>",
+      "exception":true
+    },
+    "WAFServiceLinkedRoleErrorException":{
+      "type":"structure",
+      "members":{
+        "message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p>AWS WAF is not able to access the service linked role. This can be caused by a previous <code>PutLoggingConfiguration</code> request, which can lock the service linked role for about 20 seconds. Please try your request again. The service linked role can also be locked by a previous <code>DeleteServiceLinkedRole</code> request, which can lock the role for 15 minutes or more. If you recently made a call to <code>DeleteServiceLinkedRole</code>, wait at least 15 minutes and try the request again. If you receive this same exception again, you will have to wait additional time until the role is unlocked.</p>",
+      "exception":true
+    },
+    "WAFSubscriptionNotFoundException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p/>",
+      "exception":true
+    },
+    "WAFTagOperationException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p>An error occurred during the tagging operation. Retry your request.</p>",
+      "exception":true
+    },
+    "WAFTagOperationInternalErrorException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p>AWS WAF couldn’t perform your tagging operation because of an internal error. Retry your request.</p>",
+      "exception":true,
+      "fault":true
+    },
+    "WAFUnavailableEntityException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p>AWS WAF couldn’t retrieve the resource that you requested. Retry your request.</p>",
+      "exception":true
+    },
+    "WebACL":{
+      "type":"structure",
+      "required":[
+        "Name",
+        "Id",
+        "ARN",
+        "DefaultAction",
+        "VisibilityConfig"
+      ],
+      "members":{
+        "Name":{
+          "shape":"EntityName",
+          "documentation":"<p>The name of the Web ACL. You cannot change the name of a Web ACL after you create it.</p>"
+        },
+        "Id":{
+          "shape":"EntityId",
+          "documentation":"<p>A unique identifier for the <code>WebACL</code>. This ID is returned in the responses to create and list commands. You use this ID to do things like get, update, and delete a <code>WebACL</code>.</p>"
+        },
+        "ARN":{
+          "shape":"ResourceArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the Web ACL that you want to associate with the resource.</p>"
+        },
+        "DefaultAction":{
+          "shape":"DefaultAction",
+          "documentation":"<p>The action to perform if none of the <code>Rules</code> contained in the <code>WebACL</code> match. </p>"
+        },
+        "Description":{
+          "shape":"EntityDescription",
+          "documentation":"<p>A description of the Web ACL that helps with identification. You cannot change the description of a Web ACL after you create it.</p>"
+        },
+        "Rules":{
+          "shape":"Rules",
+          "documentation":"<p>The <a>Rule</a> statements used to identify the web requests that you want to allow, block, or count. Each rule includes one top-level statement that AWS WAF uses to identify matching web requests, and parameters that govern how AWS WAF handles them. </p>"
+        },
+        "VisibilityConfig":{
+          "shape":"VisibilityConfig",
+          "documentation":"<p>Defines and enables Amazon CloudWatch metrics and web request sample collection. </p>"
+        },
+        "Capacity":{
+          "shape":"ConsumedCapacity",
+          "documentation":"<p>The web ACL capacity units (WCUs) currently being used by this web ACL. </p> <p>AWS WAF uses WCUs to calculate and control the operating resources that are used to run your rules, rule groups, and web ACLs. AWS WAF calculates capacity differently for each rule type, to reflect the relative cost of each rule. Simple rules that cost little to run use fewer WCUs than more complex rules that use more processing power. Rule group capacity is fixed at creation, which helps users plan their web ACL WCU usage when they use a rule group. The WCU limit for web ACLs is 1,500. </p>"
+        },
+        "PreProcessFirewallManagerRuleGroups":{
+          "shape":"FirewallManagerRuleGroups",
+          "documentation":"<p>The first set of rules for AWS WAF to process in the web ACL. This is defined in an AWS Firewall Manager WAF policy and contains only rule group references. You can't alter these. Any rules and rule groups that you define for the web ACL are prioritized after these. </p> <p>In the Firewall Manager WAF policy, the Firewall Manager administrator can define a set of rule groups to run first in the web ACL and a set of rule groups to run last. Within each set, the administrator prioritizes the rule groups, to determine their relative processing order.</p>"
+        },
+        "PostProcessFirewallManagerRuleGroups":{
+          "shape":"FirewallManagerRuleGroups",
+          "documentation":"<p>The last set of rules for AWS WAF to process in the web ACL. This is defined in an AWS Firewall Manager WAF policy and contains only rule group references. You can't alter these. Any rules and rule groups that you define for the web ACL are prioritized before these. </p> <p>In the Firewall Manager WAF policy, the Firewall Manager administrator can define a set of rule groups to run first in the web ACL and a set of rule groups to run last. Within each set, the administrator prioritizes the rule groups, to determine their relative processing order.</p>"
+        },
+        "ManagedByFirewallManager":{
+          "shape":"Boolean",
+          "documentation":"<p>Indicates whether this web ACL is managed by AWS Firewall Manager. If true, then only AWS Firewall Manager can delete the web ACL or any Firewall Manager rule groups in the web ACL. </p>"
+        }
+      },
+      "documentation":"<note> <p>This is the latest version of <b>AWS WAF</b>, named AWS WAFV2, released in November, 2019. For information, including how to migrate your AWS WAF resources from the prior release, see the <a href=\"https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html\">AWS WAF Developer Guide</a>. </p> </note> <p> A Web ACL defines a collection of rules to use to inspect and control web requests. Each rule has an action defined (allow, block, or count) for requests that match the statement of the rule. In the Web ACL, you assign a default action to take (allow, block) for any request that does not match any of the rules. The rules in a Web ACL can be a combination of the types <a>Rule</a>, <a>RuleGroup</a>, and managed rule group. You can associate a Web ACL with one or more AWS resources to protect. The resources can be Amazon CloudFront, an Amazon API Gateway API, or an Application Load Balancer. </p>"
+    },
+    "WebACLSummaries":{
+      "type":"list",
+      "member":{"shape":"WebACLSummary"}
+    },
+    "WebACLSummary":{
+      "type":"structure",
+      "members":{
+        "Name":{
+          "shape":"EntityName",
+          "documentation":"<p>The name of the Web ACL. You cannot change the name of a Web ACL after you create it.</p>"
+        },
+        "Id":{
+          "shape":"EntityId",
+          "documentation":"<p>The unique identifier for the Web ACL. This ID is returned in the responses to create and list commands. You provide it to operations like update and delete.</p>"
+        },
+        "Description":{
+          "shape":"EntityDescription",
+          "documentation":"<p>A description of the Web ACL that helps with identification. You cannot change the description of a Web ACL after you create it.</p>"
+        },
+        "LockToken":{
+          "shape":"LockToken",
+          "documentation":"<p>A token used for optimistic locking. AWS WAF returns a token to your get and list requests, to mark the state of the entity at the time of the request. To make changes to the entity associated with the token, you provide the token to operations like update and delete. AWS WAF uses the token to ensure that no changes have been made to the entity since you last retrieved it. If a change has been made, the update fails with a <code>WAFOptimisticLockException</code>. If this happens, perform another get, and use the new token returned by that operation. </p>"
+        },
+        "ARN":{
+          "shape":"ResourceArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the entity.</p>"
+        }
+      },
+      "documentation":"<note> <p>This is the latest version of <b>AWS WAF</b>, named AWS WAFV2, released in November, 2019. For information, including how to migrate your AWS WAF resources from the prior release, see the <a href=\"https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html\">AWS WAF Developer Guide</a>. </p> </note> <p>High-level information about a <a>WebACL</a>, returned by operations like create and list. This provides information like the ID, that you can use to retrieve and manage a <code>WebACL</code>, and the ARN, that you provide to operations like <a>AssociateWebACL</a>.</p>"
+    },
+    "XssMatchStatement":{
+      "type":"structure",
+      "required":[
+        "FieldToMatch",
+        "TextTransformations"
+      ],
+      "members":{
+        "FieldToMatch":{
+          "shape":"FieldToMatch",
+          "documentation":"<p>The part of a web request that you want AWS WAF to inspect. For more information, see <a>FieldToMatch</a>. </p>"
+        },
+        "TextTransformations":{
+          "shape":"TextTransformations",
+          "documentation":"<p>Text transformations eliminate some of the unusual formatting that attackers use in web requests in an effort to bypass detection. If you specify one or more transformations in a rule statement, AWS WAF performs all transformations on the content of the request component identified by <code>FieldToMatch</code>, starting from the lowest priority setting, before inspecting the content for a match.</p>"
+        }
+      },
+      "documentation":"<note> <p>This is the latest version of <b>AWS WAF</b>, named AWS WAFV2, released in November, 2019. For information, including how to migrate your AWS WAF resources from the prior release, see the <a href=\"https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html\">AWS WAF Developer Guide</a>. </p> </note> <p>A rule statement that defines a cross-site scripting (XSS) match search for AWS WAF to apply to web requests. XSS attacks are those where the attacker uses vulnerabilities in a benign website as a vehicle to inject malicious client-site scripts into other legitimate web browsers. The XSS match statement provides the location in requests that you want AWS WAF to search and text transformations to use on the search area before AWS WAF searches for character sequences that are likely to be malicious strings. </p>"
+    }
+  },
+  "documentation":"<note> <p>This is the latest version of the <b>AWS WAF</b> API, released in November, 2019. The names of the entities that you use to access this API, like endpoints and namespaces, all have the versioning information added, like \"V2\" or \"v2\", to distinguish from the prior version. We recommend migrating your resources to this version, because it has a number of significant improvements.</p> <p>If you used AWS WAF prior to this release, you can't use this AWS WAFV2 API to access any AWS WAF resources that you created before. You can access your old rules, web ACLs, and other AWS WAF resources only through the AWS WAF Classic APIs. The AWS WAF Classic APIs have retained the prior names, endpoints, and namespaces. </p> <p>For information, including how to migrate your AWS WAF resources to this version, see the <a href=\"https://docs.aws.amazon.com/waf/latest/developerguide/waf-chapter.html\">AWS WAF Developer Guide</a>. </p> </note> <p>AWS WAF is a web application firewall that lets you monitor the HTTP and HTTPS requests that are forwarded to Amazon CloudFront, an Amazon API Gateway API, or an Application Load Balancer. AWS WAF also lets you control access to your content. Based on conditions that you specify, such as the IP addresses that requests originate from or the values of query strings, API Gateway, CloudFront, or the Application Load Balancer responds to requests either with the requested content or with an HTTP 403 status code (Forbidden). You also can configure CloudFront to return a custom error page when a request is blocked.</p> <p>This API guide is for developers who need detailed information about AWS WAF API actions, data types, and errors. For detailed information about AWS WAF features and an overview of how to use AWS WAF, see the <a href=\"https://docs.aws.amazon.com/waf/latest/developerguide/\">AWS WAF Developer Guide</a>.</p> <p>You can make calls using the endpoints listed in <a href=\"https://docs.aws.amazon.com/general/latest/gr/rande.html#waf_region\">AWS Service Endpoints for AWS WAF</a>. </p> <ul> <li> <p>For regional applications, you can use any of the endpoints in the list. A regional application can be an Application Load Balancer (ALB) or an API Gateway stage. </p> </li> <li> <p>For AWS CloudFront applications, you must use the API endpoint listed for US East (N. Virginia): us-east-1.</p> </li> </ul> <p>Alternatively, you can use one of the AWS SDKs to access an API that's tailored to the programming language or platform that you're using. For more information, see <a href=\"http://aws.amazon.com/tools/#SDKs\">AWS SDKs</a>.</p> <p>We currently provide two versions of the AWS WAF API: this API and the prior versions, the classic AWS WAF APIs. This new API provides the same functionality as the older versions, with the following major improvements:</p> <ul> <li> <p>You use one API for both global and regional applications. Where you need to distinguish the scope, you specify a <code>Scope</code> parameter and set it to <code>CLOUDFRONT</code> or <code>REGIONAL</code>. </p> </li> <li> <p>You can define a Web ACL or rule group with a single call, and update it with a single call. You define all rule specifications in JSON format, and pass them to your rule group or Web ACL calls.</p> </li> <li> <p>The limits AWS WAF places on the use of rules more closely reflects the cost of running each type of rule. Rule groups include capacity settings, so you know the maximum cost of a rule group when you use it.</p> </li> </ul>"
+}
diff --git a/services/workdocs/build.properties b/services/workdocs/build.properties
index ecf2dae6fcb1..15ec2da1fc71 100644
--- a/services/workdocs/build.properties
+++ b/services/workdocs/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/workdocs/pom.xml b/services/workdocs/pom.xml
index e4b75cf8d5af..0f9b7247ce62 100644
--- a/services/workdocs/pom.xml
+++ b/services/workdocs/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>workdocs</artifactId>
     <name>AWS Java SDK :: Services :: Amazon WorkDocs</name>
diff --git a/services/workdocs/src/main/resources/codegen-resources/service-2.json b/services/workdocs/src/main/resources/codegen-resources/service-2.json
index 84fdf10c3dbe..c36e3d95524e 100644
--- a/services/workdocs/src/main/resources/codegen-resources/service-2.json
+++ b/services/workdocs/src/main/resources/codegen-resources/service-2.json
@@ -525,7 +525,7 @@
         {"shape":"FailedDependencyException"},
         {"shape":"ServiceUnavailableException"}
       ],
-      "documentation":"<p>Retrieves details of the current user for whom the authentication token was generated. This is not a valid action for SigV4 (administrative API) clients.</p>"
+      "documentation":"<p>Retrieves details of the current user for whom the authentication token was generated. This is not a valid action for SigV4 (administrative API) clients.</p> <p>This action requires an authentication token. To get an authentication token, register an application with Amazon WorkDocs. For more information, see <a href=\"https://docs.aws.amazon.com/workdocs/latest/developerguide/wd-auth-user.html\">Authentication and Access Control for User Applications</a> in the <i>Amazon WorkDocs Developer Guide</i>.</p>"
     },
     "GetDocument":{
       "name":"GetDocument",
@@ -793,7 +793,7 @@
       "members":{
         "AuthenticationToken":{
           "shape":"AuthenticationHeaderType",
-          "documentation":"<p>Amazon WorkDocs authentication token. Do not set this field when using administrative API actions, as in accessing the API using AWS credentials.</p>",
+          "documentation":"<p>Amazon WorkDocs authentication token. Not required when using AWS administrator credentials to access the API.</p>",
           "location":"header",
           "locationName":"Authentication"
         },
@@ -823,7 +823,7 @@
         },
         "AuthenticationToken":{
           "shape":"AuthenticationHeaderType",
-          "documentation":"<p>Amazon WorkDocs authentication token. Do not set this field when using administrative API actions, as in accessing the API using AWS credentials.</p>",
+          "documentation":"<p>Amazon WorkDocs authentication token. Not required when using AWS administrator credentials to access the API.</p>",
           "location":"header",
           "locationName":"Authentication"
         }
@@ -933,7 +933,7 @@
       "members":{
         "AuthenticationToken":{
           "shape":"AuthenticationHeaderType",
-          "documentation":"<p>Amazon WorkDocs authentication token. Do not set this field when using administrative API actions, as in accessing the API using AWS credentials.</p>",
+          "documentation":"<p>Amazon WorkDocs authentication token. Not required when using AWS administrator credentials to access the API.</p>",
           "location":"header",
           "locationName":"Authentication"
         },
@@ -1104,7 +1104,7 @@
       "members":{
         "AuthenticationToken":{
           "shape":"AuthenticationHeaderType",
-          "documentation":"<p>Amazon WorkDocs authentication token. Do not set this field when using administrative API actions, as in accessing the API using AWS credentials.</p>",
+          "documentation":"<p>Amazon WorkDocs authentication token. Not required when using AWS administrator credentials to access the API.</p>",
           "location":"header",
           "locationName":"Authentication"
         },
@@ -1160,7 +1160,7 @@
       "members":{
         "AuthenticationToken":{
           "shape":"AuthenticationHeaderType",
-          "documentation":"<p>Amazon WorkDocs authentication token. Do not set this field when using administrative API actions, as in accessing the API using AWS credentials.</p>",
+          "documentation":"<p>Amazon WorkDocs authentication token. Not required when using AWS administrator credentials to access the API.</p>",
           "location":"header",
           "locationName":"Authentication"
         },
@@ -1193,7 +1193,7 @@
       "members":{
         "AuthenticationToken":{
           "shape":"AuthenticationHeaderType",
-          "documentation":"<p>Amazon WorkDocs authentication token. Do not set this field when using administrative API actions, as in accessing the API using AWS credentials.</p>",
+          "documentation":"<p>Amazon WorkDocs authentication token. Not required when using AWS administrator credentials to access the API.</p>",
           "location":"header",
           "locationName":"Authentication"
         },
@@ -1235,7 +1235,7 @@
         },
         "AuthenticationToken":{
           "shape":"AuthenticationHeaderType",
-          "documentation":"<p>Amazon WorkDocs authentication token. Do not set this field when using administrative API actions, as in accessing the API using AWS credentials.</p>",
+          "documentation":"<p>Amazon WorkDocs authentication token. Not required when using AWS administrator credentials to access the API.</p>",
           "location":"header",
           "locationName":"Authentication"
         }
@@ -1327,7 +1327,7 @@
         },
         "AuthenticationToken":{
           "shape":"AuthenticationHeaderType",
-          "documentation":"<p>Amazon WorkDocs authentication token. Do not set this field when using administrative API actions, as in accessing the API using AWS credentials.</p>",
+          "documentation":"<p>Amazon WorkDocs authentication token. Not required when using AWS administrator credentials to access the API.</p>",
           "location":"header",
           "locationName":"Authentication"
         }
@@ -1387,7 +1387,7 @@
         },
         "AuthenticationToken":{
           "shape":"AuthenticationHeaderType",
-          "documentation":"<p>Amazon WorkDocs authentication token. Do not set this field when using administrative API actions, as in accessing the API using AWS credentials.</p>",
+          "documentation":"<p>Amazon WorkDocs authentication token. Not required when using AWS administrator credentials to access the API.</p>",
           "location":"header",
           "locationName":"Authentication"
         }
@@ -1411,7 +1411,7 @@
       "members":{
         "AuthenticationToken":{
           "shape":"AuthenticationHeaderType",
-          "documentation":"<p>Amazon WorkDocs authentication token. Do not set this field when using administrative API actions, as in accessing the API using AWS credentials.</p>",
+          "documentation":"<p>Amazon WorkDocs authentication token. Not required when using AWS administrator credentials to access the API.</p>",
           "location":"header",
           "locationName":"Authentication"
         },
@@ -1441,7 +1441,7 @@
       "members":{
         "AuthenticationToken":{
           "shape":"AuthenticationHeaderType",
-          "documentation":"<p>Amazon WorkDocs authentication token. Do not set this field when using administrative API actions, as in accessing the API using AWS credentials.</p>",
+          "documentation":"<p>Amazon WorkDocs authentication token. Not required when using AWS administrator credentials to access the API.</p>",
           "location":"header",
           "locationName":"Authentication"
         },
@@ -1482,7 +1482,7 @@
       "members":{
         "AuthenticationToken":{
           "shape":"AuthenticationHeaderType",
-          "documentation":"<p>Amazon WorkDocs authentication token. Do not set this field when using administrative API actions, as in accessing the API using AWS credentials.</p>",
+          "documentation":"<p>Amazon WorkDocs authentication token. Not required when using AWS administrator credentials to access the API.</p>",
           "location":"header",
           "locationName":"Authentication"
         },
@@ -1500,7 +1500,7 @@
       "members":{
         "AuthenticationToken":{
           "shape":"AuthenticationHeaderType",
-          "documentation":"<p>Amazon WorkDocs authentication token. Do not set this field when using administrative API actions, as in accessing the API using AWS credentials.</p>",
+          "documentation":"<p>Amazon WorkDocs authentication token. Not required when using AWS administrator credentials to access the API.</p>",
           "location":"header",
           "locationName":"Authentication"
         },
@@ -1518,7 +1518,7 @@
       "members":{
         "AuthenticationToken":{
           "shape":"AuthenticationHeaderType",
-          "documentation":"<p>Amazon WorkDocs authentication token. Do not set this field when using administrative API actions, as in accessing the API using AWS credentials.</p>",
+          "documentation":"<p>Amazon WorkDocs authentication token. Not required when using AWS administrator credentials to access the API.</p>",
           "location":"header",
           "locationName":"Authentication"
         },
@@ -1542,7 +1542,7 @@
         },
         "AuthenticationToken":{
           "shape":"AuthenticationHeaderType",
-          "documentation":"<p>Amazon WorkDocs authentication token. Do not set this field when using administrative API actions, as in accessing the API using AWS credentials.</p>",
+          "documentation":"<p>Amazon WorkDocs authentication token. Not required when using AWS administrator credentials to access the API.</p>",
           "location":"header",
           "locationName":"Authentication"
         },
@@ -1609,7 +1609,7 @@
       "members":{
         "AuthenticationToken":{
           "shape":"AuthenticationHeaderType",
-          "documentation":"<p>Amazon WorkDocs authentication token. Do not set this field when using administrative API actions, as in accessing the API using AWS credentials.</p>",
+          "documentation":"<p>Amazon WorkDocs authentication token. Not required when using AWS administrator credentials to access the API.</p>",
           "location":"header",
           "locationName":"Authentication"
         },
@@ -1691,7 +1691,7 @@
       "members":{
         "AuthenticationToken":{
           "shape":"AuthenticationHeaderType",
-          "documentation":"<p>Amazon WorkDocs authentication token. Do not set this field when using administrative API actions, as in accessing the API using AWS credentials.</p>",
+          "documentation":"<p>Amazon WorkDocs authentication token. Not required when using AWS administrator credentials to access the API.</p>",
           "location":"header",
           "locationName":"Authentication"
         },
@@ -1740,7 +1740,7 @@
       "members":{
         "AuthenticationToken":{
           "shape":"AuthenticationHeaderType",
-          "documentation":"<p>Amazon WorkDocs authentication token. Do not set this field when using administrative API actions, as in accessing the API using AWS credentials.</p>",
+          "documentation":"<p>Amazon WorkDocs authentication token. Not required when using AWS administrator credentials to access the API.</p>",
           "location":"header",
           "locationName":"Authentication"
         },
@@ -1795,7 +1795,7 @@
       "members":{
         "AuthenticationToken":{
           "shape":"AuthenticationHeaderType",
-          "documentation":"<p>Amazon WorkDocs authentication token. Do not set this field when using administrative API actions, as in accessing the API using AWS credentials.</p>",
+          "documentation":"<p>Amazon WorkDocs authentication token. Not required when using AWS administrator credentials to access the API.</p>",
           "location":"header",
           "locationName":"Authentication"
         },
@@ -1866,7 +1866,7 @@
       "members":{
         "AuthenticationToken":{
           "shape":"AuthenticationHeaderType",
-          "documentation":"<p>Amazon WorkDocs authentication token. Do not set this field when using administrative API actions, as in accessing the API using AWS credentials.</p>",
+          "documentation":"<p>Amazon WorkDocs authentication token. Not required when using AWS administrator credentials to access the API.</p>",
           "location":"header",
           "locationName":"Authentication"
         },
@@ -1952,7 +1952,7 @@
       "members":{
         "AuthenticationToken":{
           "shape":"AuthenticationHeaderType",
-          "documentation":"<p>Amazon WorkDocs authentication token. Do not set this field when using administrative API actions, as in accessing the API using AWS credentials.</p>",
+          "documentation":"<p>Amazon WorkDocs authentication token. Not required when using AWS administrator credentials to access the API.</p>",
           "location":"header",
           "locationName":"Authentication"
         },
@@ -2001,7 +2001,7 @@
       "members":{
         "AuthenticationToken":{
           "shape":"AuthenticationHeaderType",
-          "documentation":"<p>Amazon WorkDocs authentication token. Do not set this field when using administrative API actions, as in accessing the API using AWS credentials.</p>",
+          "documentation":"<p>Amazon WorkDocs authentication token.</p>",
           "location":"header",
           "locationName":"Authentication"
         },
@@ -2037,7 +2037,7 @@
       "members":{
         "AuthenticationToken":{
           "shape":"AuthenticationHeaderType",
-          "documentation":"<p>Amazon WorkDocs authentication token. Do not set this field when using administrative API actions, as in accessing the API using AWS credentials.</p>",
+          "documentation":"<p>Amazon WorkDocs authentication token. Not required when using AWS administrator credentials to access the API.</p>",
           "location":"header",
           "locationName":"Authentication"
         },
@@ -2397,7 +2397,7 @@
       "members":{
         "AuthenticationToken":{
           "shape":"AuthenticationHeaderType",
-          "documentation":"<p>Amazon WorkDocs authentication token. Do not set this field when using administrative API actions, as in accessing the API using AWS credentials.</p>",
+          "documentation":"<p>Amazon WorkDocs authentication token.</p>",
           "location":"header",
           "locationName":"Authentication"
         }
@@ -2418,7 +2418,7 @@
       "members":{
         "AuthenticationToken":{
           "shape":"AuthenticationHeaderType",
-          "documentation":"<p>Amazon WorkDocs authentication token. Do not set this field when using administrative API actions, as in accessing the API using AWS credentials.</p>",
+          "documentation":"<p>Amazon WorkDocs authentication token. Not required when using AWS administrator credentials to access the API.</p>",
           "location":"header",
           "locationName":"Authentication"
         },
@@ -2463,7 +2463,7 @@
       "members":{
         "AuthenticationToken":{
           "shape":"AuthenticationHeaderType",
-          "documentation":"<p>Amazon WorkDocs authentication token. Do not set this field when using administrative API actions, as in accessing the API using AWS credentials.</p>",
+          "documentation":"<p>Amazon WorkDocs authentication token. Not required when using AWS administrator credentials to access the API.</p>",
           "location":"header",
           "locationName":"Authentication"
         },
@@ -2503,7 +2503,7 @@
       "members":{
         "AuthenticationToken":{
           "shape":"AuthenticationHeaderType",
-          "documentation":"<p>Amazon WorkDocs authentication token. Do not set this field when using administrative API actions, as in accessing the API using AWS credentials.</p>",
+          "documentation":"<p>Amazon WorkDocs authentication token. Not required when using AWS administrator credentials to access the API.</p>",
           "location":"header",
           "locationName":"Authentication"
         },
@@ -2552,7 +2552,7 @@
       "members":{
         "AuthenticationToken":{
           "shape":"AuthenticationHeaderType",
-          "documentation":"<p>Amazon WorkDocs authentication token. Do not set this field when using administrative API actions, as in accessing the API using AWS credentials.</p>",
+          "documentation":"<p>Amazon WorkDocs authentication token. Not required when using AWS administrator credentials to access the API.</p>",
           "location":"header",
           "locationName":"Authentication"
         },
@@ -2597,7 +2597,7 @@
       "members":{
         "AuthenticationToken":{
           "shape":"AuthenticationHeaderType",
-          "documentation":"<p>Amazon WorkDocs authentication token. Do not set this field when using administrative API actions, as in accessing the API using AWS credentials.</p>",
+          "documentation":"<p>Amazon WorkDocs authentication token. Not required when using AWS administrator credentials to access the API.</p>",
           "location":"header",
           "locationName":"Authentication"
         },
@@ -2633,7 +2633,7 @@
       "members":{
         "AuthenticationToken":{
           "shape":"AuthenticationHeaderType",
-          "documentation":"<p>The Amazon WorkDocs authentication token. Do not set this field when using administrative API actions, as in accessing the API operation using AWS credentials.</p>",
+          "documentation":"<p>The Amazon WorkDocs authentication token. Not required when using AWS administrator credentials to access the API.</p>",
           "location":"header",
           "locationName":"Authentication"
         },
@@ -2737,7 +2737,7 @@
       "members":{
         "AuthenticationToken":{
           "shape":"AuthenticationHeaderType",
-          "documentation":"<p>Amazon WorkDocs authentication token. Do not set this field when using administrative API actions, as in accessing the API using AWS credentials.</p>",
+          "documentation":"<p>Amazon WorkDocs authentication token. Not required when using AWS administrator credentials to access the API.</p>",
           "location":"header",
           "locationName":"Authentication"
         },
@@ -2986,7 +2986,7 @@
       "members":{
         "AuthenticationToken":{
           "shape":"AuthenticationHeaderType",
-          "documentation":"<p>Amazon WorkDocs authentication token. Do not set this field when using administrative API actions, as in accessing the API using AWS credentials.</p>",
+          "documentation":"<p>Amazon WorkDocs authentication token. Not required when using AWS administrator credentials to access the API.</p>",
           "location":"header",
           "locationName":"Authentication"
         },
@@ -3007,7 +3007,7 @@
       "members":{
         "AuthenticationToken":{
           "shape":"AuthenticationHeaderType",
-          "documentation":"<p>Amazon WorkDocs authentication token. Do not set this field when using administrative API actions, as in accessing the API using AWS credentials.</p>",
+          "documentation":"<p>Amazon WorkDocs authentication token. Not required when using AWS administrator credentials to access the API.</p>",
           "location":"header",
           "locationName":"Authentication"
         },
@@ -3390,7 +3390,7 @@
       "members":{
         "AuthenticationToken":{
           "shape":"AuthenticationHeaderType",
-          "documentation":"<p>Amazon WorkDocs authentication token. Do not set this field when using administrative API actions, as in accessing the API using AWS credentials.</p>",
+          "documentation":"<p>Amazon WorkDocs authentication token. Not required when using AWS administrator credentials to access the API.</p>",
           "location":"header",
           "locationName":"Authentication"
         },
@@ -3423,7 +3423,7 @@
       "members":{
         "AuthenticationToken":{
           "shape":"AuthenticationHeaderType",
-          "documentation":"<p>Amazon WorkDocs authentication token. Do not set this field when using administrative API actions, as in accessing the API using AWS credentials.</p>",
+          "documentation":"<p>Amazon WorkDocs authentication token. Not required when using AWS administrator credentials to access the API.</p>",
           "location":"header",
           "locationName":"Authentication"
         },
@@ -3451,7 +3451,7 @@
       "members":{
         "AuthenticationToken":{
           "shape":"AuthenticationHeaderType",
-          "documentation":"<p>Amazon WorkDocs authentication token. Do not set this field when using administrative API actions, as in accessing the API using AWS credentials.</p>",
+          "documentation":"<p>Amazon WorkDocs authentication token. Not required when using AWS administrator credentials to access the API.</p>",
           "location":"header",
           "locationName":"Authentication"
         },
@@ -3481,7 +3481,7 @@
       "members":{
         "AuthenticationToken":{
           "shape":"AuthenticationHeaderType",
-          "documentation":"<p>Amazon WorkDocs authentication token. Do not set this field when using administrative API actions, as in accessing the API using AWS credentials.</p>",
+          "documentation":"<p>Amazon WorkDocs authentication token. Not required when using AWS administrator credentials to access the API.</p>",
           "location":"header",
           "locationName":"Authentication"
         },
diff --git a/services/worklink/pom.xml b/services/worklink/pom.xml
index 2691bb6e8789..9f975b00e8c6 100644
--- a/services/worklink/pom.xml
+++ b/services/worklink/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>worklink</artifactId>
     <name>AWS Java SDK :: Services :: WorkLink</name>
diff --git a/services/workmail/pom.xml b/services/workmail/pom.xml
index 30a6f20d0076..ed9b1b110056 100644
--- a/services/workmail/pom.xml
+++ b/services/workmail/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>services</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>workmail</artifactId>
diff --git a/services/workmail/src/main/resources/codegen-resources/service-2.json b/services/workmail/src/main/resources/codegen-resources/service-2.json
index b9ca62787314..58289d38c4ef 100644
--- a/services/workmail/src/main/resources/codegen-resources/service-2.json
+++ b/services/workmail/src/main/resources/codegen-resources/service-2.json
@@ -67,7 +67,8 @@
         {"shape":"MailDomainNotFoundException"},
         {"shape":"MailDomainStateException"},
         {"shape":"OrganizationNotFoundException"},
-        {"shape":"OrganizationStateException"}
+        {"shape":"OrganizationStateException"},
+        {"shape":"LimitExceededException"}
       ],
       "documentation":"<p>Adds an alias to the set of a given member (user or group) of Amazon WorkMail.</p>",
       "idempotent":true
@@ -135,6 +136,20 @@
       "documentation":"<p>Creates a user who can be used in Amazon WorkMail by calling the <a>RegisterToWorkMail</a> operation.</p>",
       "idempotent":true
     },
+    "DeleteAccessControlRule":{
+      "name":"DeleteAccessControlRule",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DeleteAccessControlRuleRequest"},
+      "output":{"shape":"DeleteAccessControlRuleResponse"},
+      "errors":[
+        {"shape":"OrganizationNotFoundException"},
+        {"shape":"OrganizationStateException"}
+      ],
+      "documentation":"<p>Deletes an access control rule for the specified WorkMail organization.</p>"
+    },
     "DeleteAlias":{
       "name":"DeleteAlias",
       "http":{
@@ -351,6 +366,22 @@
       "documentation":"<p>Removes a member from a group.</p>",
       "idempotent":true
     },
+    "GetAccessControlEffect":{
+      "name":"GetAccessControlEffect",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"GetAccessControlEffectRequest"},
+      "output":{"shape":"GetAccessControlEffectResponse"},
+      "errors":[
+        {"shape":"EntityNotFoundException"},
+        {"shape":"InvalidParameterException"},
+        {"shape":"OrganizationNotFoundException"},
+        {"shape":"OrganizationStateException"}
+      ],
+      "documentation":"<p>Gets the effects of an organization's access control rules as they apply to a specified IPv4 address, access protocol action, or user ID. </p>"
+    },
     "GetMailboxDetails":{
       "name":"GetMailboxDetails",
       "http":{
@@ -367,6 +398,20 @@
       "documentation":"<p>Requests a user's mailbox details for a specified organization and user.</p>",
       "idempotent":true
     },
+    "ListAccessControlRules":{
+      "name":"ListAccessControlRules",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"ListAccessControlRulesRequest"},
+      "output":{"shape":"ListAccessControlRulesResponse"},
+      "errors":[
+        {"shape":"OrganizationNotFoundException"},
+        {"shape":"OrganizationStateException"}
+      ],
+      "documentation":"<p>Lists the access control rules for the specified organization.</p>"
+    },
     "ListAliases":{
       "name":"ListAliases",
       "http":{
@@ -485,6 +530,19 @@
       "documentation":"<p>Returns summaries of the organization's resources.</p>",
       "idempotent":true
     },
+    "ListTagsForResource":{
+      "name":"ListTagsForResource",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"ListTagsForResourceRequest"},
+      "output":{"shape":"ListTagsForResourceResponse"},
+      "errors":[
+        {"shape":"ResourceNotFoundException"}
+      ],
+      "documentation":"<p>Lists the tags applied to an Amazon WorkMail organization resource.</p>"
+    },
     "ListUsers":{
       "name":"ListUsers",
       "http":{
@@ -501,6 +559,23 @@
       "documentation":"<p>Returns summaries of the organization's users.</p>",
       "idempotent":true
     },
+    "PutAccessControlRule":{
+      "name":"PutAccessControlRule",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"PutAccessControlRuleRequest"},
+      "output":{"shape":"PutAccessControlRuleResponse"},
+      "errors":[
+        {"shape":"LimitExceededException"},
+        {"shape":"InvalidParameterException"},
+        {"shape":"EntityNotFoundException"},
+        {"shape":"OrganizationNotFoundException"},
+        {"shape":"OrganizationStateException"}
+      ],
+      "documentation":"<p>Adds a new access control rule for the specified organization. The rule allows or denies access to the organization for the specified IPv4 addresses, access protocol actions, and user IDs. Adding a new rule with the same name as an existing rule replaces the older rule.</p>"
+    },
     "PutMailboxPermissions":{
       "name":"PutMailboxPermissions",
       "http":{
@@ -540,7 +615,7 @@
         {"shape":"OrganizationNotFoundException"},
         {"shape":"OrganizationStateException"}
       ],
-      "documentation":"<p>Registers an existing and disabled user, group, or resource for Amazon WorkMail use by associating a mailbox and calendaring capabilities. It performs no change if the user, group, or resource is enabled and fails if the user, group, or resource is deleted. This operation results in the accumulation of costs. For more information, see <a href=\"https://aws.amazon.com//workmail/pricing\">Pricing</a>. The equivalent console functionality for this operation is <i>Enable</i>. </p> <p>Users can either be created by calling the <a>CreateUser</a> API operation or they can be synchronized from your directory. For more information, see <a>DeregisterFromWorkMail</a>.</p>",
+      "documentation":"<p>Registers an existing and disabled user, group, or resource for Amazon WorkMail use by associating a mailbox and calendaring capabilities. It performs no change if the user, group, or resource is enabled and fails if the user, group, or resource is deleted. This operation results in the accumulation of costs. For more information, see <a href=\"https://aws.amazon.com/workmail/pricing\">Pricing</a>. The equivalent console functionality for this operation is <i>Enable</i>. </p> <p>Users can either be created by calling the <a>CreateUser</a> API operation or they can be synchronized from your directory. For more information, see <a>DeregisterFromWorkMail</a>.</p>",
       "idempotent":true
     },
     "ResetPassword":{
@@ -565,6 +640,34 @@
       "documentation":"<p>Allows the administrator to reset the password for a user.</p>",
       "idempotent":true
     },
+    "TagResource":{
+      "name":"TagResource",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"TagResourceRequest"},
+      "output":{"shape":"TagResourceResponse"},
+      "errors":[
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"TooManyTagsException"},
+        {"shape":"OrganizationStateException"}
+      ],
+      "documentation":"<p>Applies the specified tags to the specified Amazon WorkMail organization resource.</p>"
+    },
+    "UntagResource":{
+      "name":"UntagResource",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"UntagResourceRequest"},
+      "output":{"shape":"UntagResourceResponse"},
+      "errors":[
+        {"shape":"ResourceNotFoundException"}
+      ],
+      "documentation":"<p>Untags the specified tags from the specified Amazon WorkMail organization resource.</p>"
+    },
     "UpdateMailboxQuota":{
       "name":"UpdateMailboxQuota",
       "http":{
@@ -633,10 +736,108 @@
     }
   },
   "shapes":{
+    "AccessControlRule":{
+      "type":"structure",
+      "members":{
+        "Name":{
+          "shape":"AccessControlRuleName",
+          "documentation":"<p>The rule name.</p>"
+        },
+        "Effect":{
+          "shape":"AccessControlRuleEffect",
+          "documentation":"<p>The rule effect.</p>"
+        },
+        "Description":{
+          "shape":"AccessControlRuleDescription",
+          "documentation":"<p>The rule description.</p>"
+        },
+        "IpRanges":{
+          "shape":"IpRangeList",
+          "documentation":"<p>IPv4 CIDR ranges to include in the rule.</p>"
+        },
+        "NotIpRanges":{
+          "shape":"IpRangeList",
+          "documentation":"<p>IPv4 CIDR ranges to exclude from the rule.</p>"
+        },
+        "Actions":{
+          "shape":"ActionsList",
+          "documentation":"<p>Access protocol actions to include in the rule. Valid values include <code>ActiveSync</code>, <code>AutoDiscover</code>, <code>EWS</code>, <code>IMAP</code>, <code>SMTP</code>, <code>WindowsOutlook</code>, and <code>WebMail</code>.</p>"
+        },
+        "NotActions":{
+          "shape":"ActionsList",
+          "documentation":"<p>Access protocol actions to exclude from the rule. Valid values include <code>ActiveSync</code>, <code>AutoDiscover</code>, <code>EWS</code>, <code>IMAP</code>, <code>SMTP</code>, <code>WindowsOutlook</code>, and <code>WebMail</code>.</p>"
+        },
+        "UserIds":{
+          "shape":"UserIdList",
+          "documentation":"<p>User IDs to include in the rule.</p>"
+        },
+        "NotUserIds":{
+          "shape":"UserIdList",
+          "documentation":"<p>User IDs to exclude from the rule.</p>"
+        },
+        "DateCreated":{
+          "shape":"Timestamp",
+          "documentation":"<p>The date that the rule was created.</p>"
+        },
+        "DateModified":{
+          "shape":"Timestamp",
+          "documentation":"<p>The date that the rule was modified.</p>"
+        }
+      },
+      "documentation":"<p>A rule that controls access to an Amazon WorkMail organization.</p>"
+    },
+    "AccessControlRuleAction":{
+      "type":"string",
+      "max":64,
+      "min":1,
+      "pattern":"[a-zA-Z]+"
+    },
+    "AccessControlRuleDescription":{
+      "type":"string",
+      "max":255,
+      "min":0,
+      "pattern":"[\\u0020-\\u00FF]+"
+    },
+    "AccessControlRuleEffect":{
+      "type":"string",
+      "enum":[
+        "ALLOW",
+        "DENY"
+      ]
+    },
+    "AccessControlRuleName":{
+      "type":"string",
+      "max":64,
+      "min":1,
+      "pattern":"[a-zA-Z0-9_-]+"
+    },
+    "AccessControlRuleNameList":{
+      "type":"list",
+      "member":{"shape":"AccessControlRuleName"},
+      "max":10,
+      "min":0
+    },
+    "AccessControlRulesList":{
+      "type":"list",
+      "member":{"shape":"AccessControlRule"},
+      "max":10,
+      "min":0
+    },
+    "ActionsList":{
+      "type":"list",
+      "member":{"shape":"AccessControlRuleAction"},
+      "max":10,
+      "min":0
+    },
     "Aliases":{
       "type":"list",
       "member":{"shape":"EmailAddress"}
     },
+    "AmazonResourceName":{
+      "type":"string",
+      "max":1011,
+      "min":1
+    },
     "AssociateDelegateToResourceRequest":{
       "type":"structure",
       "required":[
@@ -848,6 +1049,25 @@
       },
       "documentation":"<p>The name of the attribute, which is one of the values defined in the UserAttribute enumeration.</p>"
     },
+    "DeleteAccessControlRuleRequest":{
+      "type":"structure",
+      "required":["Name"],
+      "members":{
+        "OrganizationId":{
+          "shape":"OrganizationId",
+          "documentation":"<p>The identifier for the organization.</p>"
+        },
+        "Name":{
+          "shape":"AccessControlRuleName",
+          "documentation":"<p>The name of the access control rule.</p>"
+        }
+      }
+    },
+    "DeleteAccessControlRuleResponse":{
+      "type":"structure",
+      "members":{
+      }
+    },
     "DeleteAliasRequest":{
       "type":"structure",
       "required":[
@@ -1080,6 +1300,10 @@
         "ErrorMessage":{
           "shape":"String",
           "documentation":"<p>(Optional) The error message indicating if unexpected behavior was encountered with regards to the organization.</p>"
+        },
+        "ARN":{
+          "shape":"AmazonResourceName",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the organization.</p>"
         }
       }
     },
@@ -1125,7 +1349,7 @@
         },
         "State":{
           "shape":"EntityState",
-          "documentation":"<p>The state of the resource: enabled (registered to Amazon WorkMail) or disabled (deregistered or never registered to WorkMail).</p>"
+          "documentation":"<p>The state of the resource: enabled (registered to Amazon WorkMail), disabled (deregistered or never registered to WorkMail), or deleted.</p>"
         },
         "EnabledDate":{
           "shape":"Timestamp",
@@ -1307,6 +1531,46 @@
       "documentation":"<p>You are performing an operation on a user, group, or resource that isn't in the expected state, such as trying to delete an active user.</p>",
       "exception":true
     },
+    "GetAccessControlEffectRequest":{
+      "type":"structure",
+      "required":[
+        "OrganizationId",
+        "IpAddress",
+        "Action",
+        "UserId"
+      ],
+      "members":{
+        "OrganizationId":{
+          "shape":"OrganizationId",
+          "documentation":"<p>The identifier for the organization.</p>"
+        },
+        "IpAddress":{
+          "shape":"IpAddress",
+          "documentation":"<p>The IPv4 address.</p>"
+        },
+        "Action":{
+          "shape":"AccessControlRuleAction",
+          "documentation":"<p>The access protocol action. Valid values include <code>ActiveSync</code>, <code>AutoDiscover</code>, <code>EWS</code>, <code>IMAP</code>, <code>SMTP</code>, <code>WindowsOutlook</code>, and <code>WebMail</code>.</p>"
+        },
+        "UserId":{
+          "shape":"WorkMailIdentifier",
+          "documentation":"<p>The user ID.</p>"
+        }
+      }
+    },
+    "GetAccessControlEffectResponse":{
+      "type":"structure",
+      "members":{
+        "Effect":{
+          "shape":"AccessControlRuleEffect",
+          "documentation":"<p>The rule effect.</p>"
+        },
+        "MatchedRules":{
+          "shape":"AccessControlRuleNameList",
+          "documentation":"<p>The rules that match the given parameters, resulting in an effect.</p>"
+        }
+      }
+    },
     "GetMailboxDetailsRequest":{
       "type":"structure",
       "required":[
@@ -1401,6 +1665,51 @@
       "documentation":"<p>The supplied password doesn't match the minimum security constraints, such as length or use of special characters.</p>",
       "exception":true
     },
+    "IpAddress":{
+      "type":"string",
+      "max":15,
+      "min":1,
+      "pattern":"^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$"
+    },
+    "IpRange":{
+      "type":"string",
+      "max":18,
+      "min":1,
+      "pattern":"^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])/([0-9]|[12][0-9]|3[0-2])$"
+    },
+    "IpRangeList":{
+      "type":"list",
+      "member":{"shape":"IpRange"},
+      "max":10,
+      "min":0
+    },
+    "LimitExceededException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"String"}
+      },
+      "documentation":"<p>The request exceeds the limit of the resource.</p>",
+      "exception":true
+    },
+    "ListAccessControlRulesRequest":{
+      "type":"structure",
+      "required":["OrganizationId"],
+      "members":{
+        "OrganizationId":{
+          "shape":"OrganizationId",
+          "documentation":"<p>The identifier for the organization.</p>"
+        }
+      }
+    },
+    "ListAccessControlRulesResponse":{
+      "type":"structure",
+      "members":{
+        "Rules":{
+          "shape":"AccessControlRulesList",
+          "documentation":"<p>The access control rules.</p>"
+        }
+      }
+    },
     "ListAliasesRequest":{
       "type":"structure",
       "required":[
@@ -1641,6 +1950,25 @@
         }
       }
     },
+    "ListTagsForResourceRequest":{
+      "type":"structure",
+      "required":["ResourceARN"],
+      "members":{
+        "ResourceARN":{
+          "shape":"AmazonResourceName",
+          "documentation":"<p>The resource ARN.</p>"
+        }
+      }
+    },
+    "ListTagsForResourceResponse":{
+      "type":"structure",
+      "members":{
+        "Tags":{
+          "shape":"TagList",
+          "documentation":"<p>A list of tag key-value pairs.</p>"
+        }
+      }
+    },
     "ListUsersRequest":{
       "type":"structure",
       "required":["OrganizationId"],
@@ -1854,6 +2182,62 @@
       "type":"list",
       "member":{"shape":"Permission"}
     },
+    "PutAccessControlRuleRequest":{
+      "type":"structure",
+      "required":[
+        "Name",
+        "Effect",
+        "Description",
+        "OrganizationId"
+      ],
+      "members":{
+        "Name":{
+          "shape":"AccessControlRuleName",
+          "documentation":"<p>The rule name.</p>"
+        },
+        "Effect":{
+          "shape":"AccessControlRuleEffect",
+          "documentation":"<p>The rule effect.</p>"
+        },
+        "Description":{
+          "shape":"AccessControlRuleDescription",
+          "documentation":"<p>The rule description.</p>"
+        },
+        "IpRanges":{
+          "shape":"IpRangeList",
+          "documentation":"<p>IPv4 CIDR ranges to include in the rule.</p>"
+        },
+        "NotIpRanges":{
+          "shape":"IpRangeList",
+          "documentation":"<p>IPv4 CIDR ranges to exclude from the rule.</p>"
+        },
+        "Actions":{
+          "shape":"ActionsList",
+          "documentation":"<p>Access protocol actions to include in the rule. Valid values include <code>ActiveSync</code>, <code>AutoDiscover</code>, <code>EWS</code>, <code>IMAP</code>, <code>SMTP</code>, <code>WindowsOutlook</code>, and <code>WebMail</code>.</p>"
+        },
+        "NotActions":{
+          "shape":"ActionsList",
+          "documentation":"<p>Access protocol actions to exclude from the rule. Valid values include <code>ActiveSync</code>, <code>AutoDiscover</code>, <code>EWS</code>, <code>IMAP</code>, <code>SMTP</code>, <code>WindowsOutlook</code>, and <code>WebMail</code>.</p>"
+        },
+        "UserIds":{
+          "shape":"UserIdList",
+          "documentation":"<p>User IDs to include in the rule.</p>"
+        },
+        "NotUserIds":{
+          "shape":"UserIdList",
+          "documentation":"<p>User IDs to exclude from the rule.</p>"
+        },
+        "OrganizationId":{
+          "shape":"OrganizationId",
+          "documentation":"<p>The identifier of the organization.</p>"
+        }
+      }
+    },
+    "PutAccessControlRuleResponse":{
+      "type":"structure",
+      "members":{
+      }
+    },
     "PutMailboxPermissionsRequest":{
       "type":"structure",
       "required":[
@@ -1996,6 +2380,14 @@
       "min":1,
       "pattern":"[\\w\\-.]+(@[a-zA-Z0-9.\\-]+\\.[a-zA-Z0-9]{2,})?"
     },
+    "ResourceNotFoundException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"String"}
+      },
+      "documentation":"<p>The resource cannot be found.</p>",
+      "exception":true
+    },
     "ResourceType":{
       "type":"string",
       "enum":[
@@ -2011,7 +2403,77 @@
       "type":"string",
       "max":256
     },
+    "Tag":{
+      "type":"structure",
+      "required":[
+        "Key",
+        "Value"
+      ],
+      "members":{
+        "Key":{
+          "shape":"TagKey",
+          "documentation":"<p>The key of the tag.</p>"
+        },
+        "Value":{
+          "shape":"TagValue",
+          "documentation":"<p>The value of the tag.</p>"
+        }
+      },
+      "documentation":"<p>Describes a tag applied to a resource.</p>"
+    },
+    "TagKey":{
+      "type":"string",
+      "max":128,
+      "min":1
+    },
+    "TagKeyList":{
+      "type":"list",
+      "member":{"shape":"TagKey"},
+      "max":50,
+      "min":0
+    },
+    "TagList":{
+      "type":"list",
+      "member":{"shape":"Tag"},
+      "max":50,
+      "min":0
+    },
+    "TagResourceRequest":{
+      "type":"structure",
+      "required":[
+        "ResourceARN",
+        "Tags"
+      ],
+      "members":{
+        "ResourceARN":{
+          "shape":"AmazonResourceName",
+          "documentation":"<p>The resource ARN.</p>"
+        },
+        "Tags":{
+          "shape":"TagList",
+          "documentation":"<p>The tag key-value pairs.</p>"
+        }
+      }
+    },
+    "TagResourceResponse":{
+      "type":"structure",
+      "members":{
+      }
+    },
+    "TagValue":{
+      "type":"string",
+      "max":256,
+      "min":0
+    },
     "Timestamp":{"type":"timestamp"},
+    "TooManyTagsException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"String"}
+      },
+      "documentation":"<p>The resource can have up to 50 user-applied tags.</p>",
+      "exception":true
+    },
     "UnsupportedOperationException":{
       "type":"structure",
       "members":{
@@ -2020,6 +2482,28 @@
       "documentation":"<p>You can't perform a write operation against a read-only directory.</p>",
       "exception":true
     },
+    "UntagResourceRequest":{
+      "type":"structure",
+      "required":[
+        "ResourceARN",
+        "TagKeys"
+      ],
+      "members":{
+        "ResourceARN":{
+          "shape":"AmazonResourceName",
+          "documentation":"<p>The resource ARN.</p>"
+        },
+        "TagKeys":{
+          "shape":"TagKeyList",
+          "documentation":"<p>The tag keys.</p>"
+        }
+      }
+    },
+    "UntagResourceResponse":{
+      "type":"structure",
+      "members":{
+      }
+    },
     "UpdateMailboxQuotaRequest":{
       "type":"structure",
       "required":[
@@ -2142,6 +2626,12 @@
       },
       "documentation":"<p>The representation of an Amazon WorkMail user.</p>"
     },
+    "UserIdList":{
+      "type":"list",
+      "member":{"shape":"WorkMailIdentifier"},
+      "max":10,
+      "min":0
+    },
     "UserName":{
       "type":"string",
       "max":64,
diff --git a/services/workmailmessageflow/pom.xml b/services/workmailmessageflow/pom.xml
index 18a1f4d470a6..1449cb1f516e 100644
--- a/services/workmailmessageflow/pom.xml
+++ b/services/workmailmessageflow/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>workmailmessageflow</artifactId>
     <name>AWS Java SDK :: Services :: WorkMailMessageFlow</name>
diff --git a/services/workspaces/build.properties b/services/workspaces/build.properties
index ecf2dae6fcb1..15ec2da1fc71 100644
--- a/services/workspaces/build.properties
+++ b/services/workspaces/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/workspaces/pom.xml b/services/workspaces/pom.xml
index 71260ae95aad..591874223c81 100644
--- a/services/workspaces/pom.xml
+++ b/services/workspaces/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>workspaces</artifactId>
     <name>AWS Java SDK :: Services :: Amazon WorkSpaces</name>
diff --git a/services/workspaces/src/it/java/software/amazon/awssdk/services/workspaces/IntegrationTestBase.java b/services/workspaces/src/it/java/software/amazon/awssdk/services/workspaces/IntegrationTestBase.java
index 756c79087a30..2324bf261689 100644
--- a/services/workspaces/src/it/java/software/amazon/awssdk/services/workspaces/IntegrationTestBase.java
+++ b/services/workspaces/src/it/java/software/amazon/awssdk/services/workspaces/IntegrationTestBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/workspaces/src/it/java/software/amazon/awssdk/services/workspaces/ServiceIntegrationTest.java b/services/workspaces/src/it/java/software/amazon/awssdk/services/workspaces/ServiceIntegrationTest.java
index 13a51d5eea9a..6a7499289427 100644
--- a/services/workspaces/src/it/java/software/amazon/awssdk/services/workspaces/ServiceIntegrationTest.java
+++ b/services/workspaces/src/it/java/software/amazon/awssdk/services/workspaces/ServiceIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/services/workspaces/src/main/resources/codegen-resources/service-2.json b/services/workspaces/src/main/resources/codegen-resources/service-2.json
index e756294374b9..fbbb2b5e32d8 100644
--- a/services/workspaces/src/main/resources/codegen-resources/service-2.json
+++ b/services/workspaces/src/main/resources/codegen-resources/service-2.json
@@ -157,6 +157,23 @@
       ],
       "documentation":"<p>Deletes the specified image from your account. To delete an image, you must first delete any bundles that are associated with the image and un-share the image if it is shared with other accounts. </p>"
     },
+    "DeregisterWorkspaceDirectory":{
+      "name":"DeregisterWorkspaceDirectory",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DeregisterWorkspaceDirectoryRequest"},
+      "output":{"shape":"DeregisterWorkspaceDirectoryResult"},
+      "errors":[
+        {"shape":"AccessDeniedException"},
+        {"shape":"InvalidParameterValuesException"},
+        {"shape":"OperationNotSupportedException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InvalidResourceStateException"}
+      ],
+      "documentation":"<p>Deregisters the specified directory. This operation is asynchronous and returns before the WorkSpace directory is deregistered. If any WorkSpaces are registered to this directory, you must remove them before you can deregister the directory.</p>"
+    },
     "DescribeAccount":{
       "name":"DescribeAccount",
       "http":{
@@ -168,7 +185,7 @@
       "errors":[
         {"shape":"AccessDeniedException"}
       ],
-      "documentation":"<p>Retrieves a list that describes the configuration of bring your own license (BYOL) for the specified account.</p>"
+      "documentation":"<p>Retrieves a list that describes the configuration of Bring Your Own License (BYOL) for the specified account.</p>"
     },
     "DescribeAccountModifications":{
       "name":"DescribeAccountModifications",
@@ -181,7 +198,7 @@
       "errors":[
         {"shape":"AccessDeniedException"}
       ],
-      "documentation":"<p>Retrieves a list that describes modifications to the configuration of bring your own license (BYOL) for the specified account.</p>"
+      "documentation":"<p>Retrieves a list that describes modifications to the configuration of Bring Your Own License (BYOL) for the specified account.</p>"
     },
     "DescribeClientProperties":{
       "name":"DescribeClientProperties",
@@ -249,7 +266,7 @@
       "errors":[
         {"shape":"InvalidParameterValuesException"}
       ],
-      "documentation":"<p>Describes the available AWS Directory Service directories that are registered with Amazon WorkSpaces.</p>"
+      "documentation":"<p>Describes the available directories that are registered with Amazon WorkSpaces.</p>"
     },
     "DescribeWorkspaceImages":{
       "name":"DescribeWorkspaceImages",
@@ -338,7 +355,7 @@
         {"shape":"AccessDeniedException"},
         {"shape":"InvalidParameterValuesException"}
       ],
-      "documentation":"<p>Imports the specified Windows 7 or Windows 10 bring your own license (BYOL) image into Amazon WorkSpaces. The image must be an already licensed EC2 image that is in your AWS account, and you must own the image. </p>"
+      "documentation":"<p>Imports the specified Windows 7 or Windows 10 Bring Your Own License (BYOL) image into Amazon WorkSpaces. The image must be an already licensed EC2 image that is in your AWS account, and you must own the image. </p>"
     },
     "ListAvailableManagementCidrRanges":{
       "name":"ListAvailableManagementCidrRanges",
@@ -352,7 +369,25 @@
         {"shape":"InvalidParameterValuesException"},
         {"shape":"AccessDeniedException"}
       ],
-      "documentation":"<p>Retrieves a list of IP address ranges, specified as IPv4 CIDR blocks, that you can use for the network management interface when you enable bring your own license (BYOL). </p> <p>The management network interface is connected to a secure Amazon WorkSpaces management network. It is used for interactive streaming of the WorkSpace desktop to Amazon WorkSpaces clients, and to allow Amazon WorkSpaces to manage the WorkSpace.</p>"
+      "documentation":"<p>Retrieves a list of IP address ranges, specified as IPv4 CIDR blocks, that you can use for the network management interface when you enable Bring Your Own License (BYOL). </p> <p>The management network interface is connected to a secure Amazon WorkSpaces management network. It is used for interactive streaming of the WorkSpace desktop to Amazon WorkSpaces clients, and to allow Amazon WorkSpaces to manage the WorkSpace.</p>"
+    },
+    "MigrateWorkspace":{
+      "name":"MigrateWorkspace",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"MigrateWorkspaceRequest"},
+      "output":{"shape":"MigrateWorkspaceResult"},
+      "errors":[
+        {"shape":"InvalidParameterValuesException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"OperationNotSupportedException"},
+        {"shape":"OperationInProgressException"},
+        {"shape":"ResourceUnavailableException"}
+      ],
+      "documentation":"<p>Migrates a WorkSpace from one operating system or bundle type to another, while retaining the data on the user volume.</p> <p>The migration process recreates the WorkSpace by using a new root volume from the target bundle image and the user volume from the last available snapshot of the original WorkSpace. During migration, the original <code>D:\\Users\\%USERNAME%</code> user profile folder is renamed to <code>D:\\Users\\%USERNAME%MMddyyTHHmmss%.NotMigrated</code>. A new <code>D:\\Users\\%USERNAME%\\</code> folder is generated by the new OS. Certain files in the old user profile are moved to the new user profile.</p> <p>For available migration scenarios, details about what happens during migration, and best practices, see <a href=\"https://docs.aws.amazon.com/workspaces/latest/adminguide/migrate-workspaces.html\">Migrate a WorkSpace</a>.</p>"
     },
     "ModifyAccount":{
       "name":"ModifyAccount",
@@ -369,7 +404,7 @@
         {"shape":"ResourceUnavailableException"},
         {"shape":"ResourceNotFoundException"}
       ],
-      "documentation":"<p>Modifies the configuration of bring your own license (BYOL) for the specified account.</p>"
+      "documentation":"<p>Modifies the configuration of Bring Your Own License (BYOL) for the specified account.</p>"
     },
     "ModifyClientProperties":{
       "name":"ModifyClientProperties",
@@ -386,6 +421,50 @@
       ],
       "documentation":"<p>Modifies the properties of the specified Amazon WorkSpaces clients.</p>"
     },
+    "ModifySelfservicePermissions":{
+      "name":"ModifySelfservicePermissions",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"ModifySelfservicePermissionsRequest"},
+      "output":{"shape":"ModifySelfservicePermissionsResult"},
+      "errors":[
+        {"shape":"AccessDeniedException"},
+        {"shape":"InvalidParameterValuesException"},
+        {"shape":"ResourceNotFoundException"}
+      ],
+      "documentation":"<p>Modifies the self-service WorkSpace management capabilities for your users. For more information, see <a href=\"https://docs.aws.amazon.com/workspaces/latest/adminguide/enable-user-self-service-workspace-management.html\">Enable Self-Service WorkSpace Management Capabilities for Your Users</a>.</p>"
+    },
+    "ModifyWorkspaceAccessProperties":{
+      "name":"ModifyWorkspaceAccessProperties",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"ModifyWorkspaceAccessPropertiesRequest"},
+      "output":{"shape":"ModifyWorkspaceAccessPropertiesResult"},
+      "errors":[
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"AccessDeniedException"}
+      ],
+      "documentation":"<p>Specifies which devices and operating systems users can use to access their WorkSpaces. For more information, see <a href=\"https://docs.aws.amazon.com/workspaces/latest/adminguide/update-directory-details.html#control-device-access\"> Control Device Access</a>.</p>"
+    },
+    "ModifyWorkspaceCreationProperties":{
+      "name":"ModifyWorkspaceCreationProperties",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"ModifyWorkspaceCreationPropertiesRequest"},
+      "output":{"shape":"ModifyWorkspaceCreationPropertiesResult"},
+      "errors":[
+        {"shape":"AccessDeniedException"},
+        {"shape":"InvalidParameterValuesException"},
+        {"shape":"ResourceNotFoundException"}
+      ],
+      "documentation":"<p>Modify the default properties used to create WorkSpaces.</p>"
+    },
     "ModifyWorkspaceProperties":{
       "name":"ModifyWorkspaceProperties",
       "http":{
@@ -438,7 +517,27 @@
       },
       "input":{"shape":"RebuildWorkspacesRequest"},
       "output":{"shape":"RebuildWorkspacesResult"},
-      "documentation":"<p>Rebuilds the specified WorkSpace.</p> <p>You cannot rebuild a WorkSpace unless its state is <code>AVAILABLE</code>, <code>ERROR</code>, or <code>UNHEALTHY</code>.</p> <p>Rebuilding a WorkSpace is a potentially destructive action that can result in the loss of data. For more information, see <a href=\"https://docs.aws.amazon.com/workspaces/latest/adminguide/reset-workspace.html\">Rebuild a WorkSpace</a>.</p> <p>This operation is asynchronous and returns before the WorkSpaces have been completely rebuilt.</p>"
+      "documentation":"<p>Rebuilds the specified WorkSpace.</p> <p>You cannot rebuild a WorkSpace unless its state is <code>AVAILABLE</code>, <code>ERROR</code>, <code>UNHEALTHY</code>, or <code>STOPPED</code>.</p> <p>Rebuilding a WorkSpace is a potentially destructive action that can result in the loss of data. For more information, see <a href=\"https://docs.aws.amazon.com/workspaces/latest/adminguide/reset-workspace.html\">Rebuild a WorkSpace</a>.</p> <p>This operation is asynchronous and returns before the WorkSpaces have been completely rebuilt.</p>"
+    },
+    "RegisterWorkspaceDirectory":{
+      "name":"RegisterWorkspaceDirectory",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"RegisterWorkspaceDirectoryRequest"},
+      "output":{"shape":"RegisterWorkspaceDirectoryResult"},
+      "errors":[
+        {"shape":"InvalidParameterValuesException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ResourceLimitExceededException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"WorkspacesDefaultRoleNotFoundException"},
+        {"shape":"InvalidResourceStateException"},
+        {"shape":"UnsupportedNetworkConfigurationException"},
+        {"shape":"OperationNotSupportedException"}
+      ],
+      "documentation":"<p>Registers the specified directory. This operation is asynchronous and returns before the WorkSpace directory is registered. If this is the first time you are registering a directory, you will need to create the workspaces_DefaultRole role before you can register a directory. For more information, see <a href=\"https://docs.aws.amazon.com/workspaces/latest/adminguide/workspaces-access-control.html#create-default-role\"> Creating the workspaces_DefaultRole Role</a>.</p>"
     },
     "RestoreWorkspace":{
       "name":"RestoreWorkspace",
@@ -453,7 +552,7 @@
         {"shape":"ResourceNotFoundException"},
         {"shape":"AccessDeniedException"}
       ],
-      "documentation":"<p>Restores the specified WorkSpace to its last known healthy state.</p> <p>You cannot restore a WorkSpace unless its state is <code> AVAILABLE</code>, <code>ERROR</code>, or <code>UNHEALTHY</code>.</p> <p>Restoring a WorkSpace is a potentially destructive action that can result in the loss of data. For more information, see <a href=\"https://docs.aws.amazon.com/workspaces/latest/adminguide/restore-workspace.html\">Restore a WorkSpace</a>.</p> <p>This operation is asynchronous and returns before the WorkSpace is completely restored.</p>"
+      "documentation":"<p>Restores the specified WorkSpace to its last known healthy state.</p> <p>You cannot restore a WorkSpace unless its state is <code> AVAILABLE</code>, <code>ERROR</code>, <code>UNHEALTHY</code>, or <code>STOPPED</code>.</p> <p>Restoring a WorkSpace is a potentially destructive action that can result in the loss of data. For more information, see <a href=\"https://docs.aws.amazon.com/workspaces/latest/adminguide/restore-workspace.html\">Restore a WorkSpace</a>.</p> <p>This operation is asynchronous and returns before the WorkSpace is completely restored.</p>"
     },
     "RevokeIpRules":{
       "name":"RevokeIpRules",
@@ -532,6 +631,13 @@
       "documentation":"<p>The user is not authorized to access a resource.</p>",
       "exception":true
     },
+    "AccessPropertyValue":{
+      "type":"string",
+      "enum":[
+        "ALLOW",
+        "DENY"
+      ]
+    },
     "AccountModification":{
       "type":"structure",
       "members":{
@@ -560,7 +666,7 @@
           "documentation":"<p>The text of the error message that is returned if the configuration of BYOL cannot be modified.</p>"
         }
       },
-      "documentation":"<p>Describes a modification to the configuration of bring your own license (BYOL) for the specified account. </p>"
+      "documentation":"<p>Describes a modification to the configuration of Bring Your Own License (BYOL) for the specified account. </p>"
     },
     "AccountModificationList":{
       "type":"list",
@@ -769,7 +875,7 @@
         },
         "Tags":{
           "shape":"TagList",
-          "documentation":"<p>The tags. Each WorkSpaces resource can have a maximum of 50 tags.</p>"
+          "documentation":"<p>The tags. Each WorkSpaces resource can have a maximum of 50 tags. If you want to add new tags to a set of existing tags, you must submit all of the existing tags along with the new ones.</p>"
         }
       }
     },
@@ -838,7 +944,7 @@
         },
         "EnableInternetAccess":{
           "shape":"BooleanObject",
-          "documentation":"<p>Specifies whether to automatically assign a public IP address to WorkSpaces in this directory by default. If enabled, the public IP address allows outbound internet access from your WorkSpaces when you’re using an internet gateway in the Amazon VPC in which your WorkSpaces are located. If you're using a Network Address Translation (NAT) gateway for outbound internet access from your VPC, or if your WorkSpaces are in public subnets and you manually assign them Elastic IP addresses, you should disable this setting. This setting applies to new WorkSpaces that you launch or to existing WorkSpaces that you rebuild. For more information, see <a href=\"https://docs.aws.amazon.com/workspaces/latest/adminguide/amazon-workspaces-vpc.html\"> Configure a VPC for Amazon WorkSpaces</a>.</p>"
+          "documentation":"<p>Specifies whether to automatically assign an Elastic public IP address to WorkSpaces in this directory by default. If enabled, the Elastic public IP address allows outbound internet access from your WorkSpaces when you’re using an internet gateway in the Amazon VPC in which your WorkSpaces are located. If you're using a Network Address Translation (NAT) gateway for outbound internet access from your VPC, or if your WorkSpaces are in public subnets and you manually assign them Elastic IP addresses, you should disable this setting. This setting applies to new WorkSpaces that you launch or to existing WorkSpaces that you rebuild. For more information, see <a href=\"https://docs.aws.amazon.com/workspaces/latest/adminguide/amazon-workspaces-vpc.html\"> Configure a VPC for Amazon WorkSpaces</a>.</p>"
         },
         "DefaultOu":{
           "shape":"DefaultOu",
@@ -850,10 +956,14 @@
         },
         "UserEnabledAsLocalAdministrator":{
           "shape":"BooleanObject",
-          "documentation":"<p>Specifies whether the WorkSpace user is an administrator on the WorkSpace.</p>"
+          "documentation":"<p>Specifies whether WorkSpace users are local administrators on their WorkSpaces.</p>"
+        },
+        "EnableMaintenanceMode":{
+          "shape":"BooleanObject",
+          "documentation":"<p>Specifies whether maintenance mode is enabled for WorkSpaces. For more information, see <a href=\"https://docs.aws.amazon.com/workspaces/latest/adminguide/workspace-maintenance.html\">WorkSpace Maintenance</a>.</p>"
         }
       },
-      "documentation":"<p>Describes the default values used to create a WorkSpace.</p>"
+      "documentation":"<p>Describes the default values that are used to create WorkSpaces. For more information, see <a href=\"https://docs.aws.amazon.com/workspaces/latest/adminguide/update-directory-details.html\">Update Directory Details for Your WorkSpaces</a>.</p>"
     },
     "DeleteIpGroupRequest":{
       "type":"structure",
@@ -907,6 +1017,21 @@
       "members":{
       }
     },
+    "DeregisterWorkspaceDirectoryRequest":{
+      "type":"structure",
+      "required":["DirectoryId"],
+      "members":{
+        "DirectoryId":{
+          "shape":"DirectoryId",
+          "documentation":"<p>The identifier of the directory. If any WorkSpaces are registered to this directory, you must remove them before you deregister the directory, or you will receive an OperationNotSupportedException error.</p>"
+        }
+      }
+    },
+    "DeregisterWorkspaceDirectoryResult":{
+      "type":"structure",
+      "members":{
+      }
+    },
     "DescribeAccountModificationsRequest":{
       "type":"structure",
       "members":{
@@ -1052,6 +1177,10 @@
           "shape":"DirectoryIdList",
           "documentation":"<p>The identifiers of the directories. If the value is null, all directories are retrieved.</p>"
         },
+        "Limit":{
+          "shape":"Limit",
+          "documentation":"<p>The maximum number of directories to return.</p>"
+        },
         "NextToken":{
           "shape":"PaginationToken",
           "documentation":"<p>If you received a <code>NextToken</code> from a previous call that was paginated, provide this token to receive the next set of results.</p>"
@@ -1195,6 +1324,8 @@
     "Description":{"type":"string"},
     "DirectoryId":{
       "type":"string",
+      "max":65,
+      "min":10,
       "pattern":"^d-[0-9a-f]{8,63}$"
     },
     "DirectoryIdList":{
@@ -1439,6 +1570,36 @@
       "max":5,
       "min":1
     },
+    "MigrateWorkspaceRequest":{
+      "type":"structure",
+      "required":[
+        "SourceWorkspaceId",
+        "BundleId"
+      ],
+      "members":{
+        "SourceWorkspaceId":{
+          "shape":"WorkspaceId",
+          "documentation":"<p>The identifier of the WorkSpace to migrate from.</p>"
+        },
+        "BundleId":{
+          "shape":"BundleId",
+          "documentation":"<p>The identifier of the target bundle type to migrate the WorkSpace to.</p>"
+        }
+      }
+    },
+    "MigrateWorkspaceResult":{
+      "type":"structure",
+      "members":{
+        "SourceWorkspaceId":{
+          "shape":"WorkspaceId",
+          "documentation":"<p>The original identifier of the WorkSpace that is being migrated.</p>"
+        },
+        "TargetWorkspaceId":{
+          "shape":"WorkspaceId",
+          "documentation":"<p>The new identifier of the WorkSpace that is being migrated. If the migration does not succeed, the target WorkSpace ID will not be used, and the WorkSpace will still have the original WorkSpace ID.</p>"
+        }
+      }
+    },
     "ModificationResourceEnum":{
       "type":"string",
       "enum":[
@@ -1512,6 +1673,72 @@
       "members":{
       }
     },
+    "ModifySelfservicePermissionsRequest":{
+      "type":"structure",
+      "required":[
+        "ResourceId",
+        "SelfservicePermissions"
+      ],
+      "members":{
+        "ResourceId":{
+          "shape":"DirectoryId",
+          "documentation":"<p>The identifier of the directory.</p>"
+        },
+        "SelfservicePermissions":{
+          "shape":"SelfservicePermissions",
+          "documentation":"<p>The permissions to enable or disable self-service capabilities.</p>"
+        }
+      }
+    },
+    "ModifySelfservicePermissionsResult":{
+      "type":"structure",
+      "members":{
+      }
+    },
+    "ModifyWorkspaceAccessPropertiesRequest":{
+      "type":"structure",
+      "required":[
+        "ResourceId",
+        "WorkspaceAccessProperties"
+      ],
+      "members":{
+        "ResourceId":{
+          "shape":"DirectoryId",
+          "documentation":"<p>The identifier of the directory.</p>"
+        },
+        "WorkspaceAccessProperties":{
+          "shape":"WorkspaceAccessProperties",
+          "documentation":"<p>The device types and operating systems to enable or disable for access.</p>"
+        }
+      }
+    },
+    "ModifyWorkspaceAccessPropertiesResult":{
+      "type":"structure",
+      "members":{
+      }
+    },
+    "ModifyWorkspaceCreationPropertiesRequest":{
+      "type":"structure",
+      "required":[
+        "ResourceId",
+        "WorkspaceCreationProperties"
+      ],
+      "members":{
+        "ResourceId":{
+          "shape":"DirectoryId",
+          "documentation":"<p>The identifier of the directory.</p>"
+        },
+        "WorkspaceCreationProperties":{
+          "shape":"WorkspaceCreationProperties",
+          "documentation":"<p>The default properties for creating WorkSpaces.</p>"
+        }
+      }
+    },
+    "ModifyWorkspaceCreationPropertiesResult":{
+      "type":"structure",
+      "members":{
+      }
+    },
     "ModifyWorkspacePropertiesRequest":{
       "type":"structure",
       "required":[
@@ -1683,6 +1910,44 @@
       "min":1,
       "pattern":"^[-0-9a-z]{1,31}$"
     },
+    "RegisterWorkspaceDirectoryRequest":{
+      "type":"structure",
+      "required":[
+        "DirectoryId",
+        "EnableWorkDocs"
+      ],
+      "members":{
+        "DirectoryId":{
+          "shape":"DirectoryId",
+          "documentation":"<p>The identifier of the directory. You cannot register a directory if it does not have a status of Active. If the directory does not have a status of Active, you will receive an InvalidResourceStateException error. If you have already registered the maximum number of directories that you can register with Amazon WorkSpaces, you will receive a ResourceLimitExceededException error. Deregister directories that you are not using for WorkSpaces, and try again.</p>"
+        },
+        "SubnetIds":{
+          "shape":"SubnetIds",
+          "documentation":"<p>The identifiers of the subnets for your virtual private cloud (VPC). Make sure that the subnets are in supported Availability Zones. The subnets must also be in separate Availability Zones. If these conditions are not met, you will receive an OperationNotSupportedException error.</p>"
+        },
+        "EnableWorkDocs":{
+          "shape":"BooleanObject",
+          "documentation":"<p>Indicates whether Amazon WorkDocs is enabled or disabled. If you have enabled this parameter and WorkDocs is not available in the Region, you will receive an OperationNotSupportedException error. Set <code>EnableWorkDocs</code> to disabled, and try again.</p>"
+        },
+        "EnableSelfService":{
+          "shape":"BooleanObject",
+          "documentation":"<p>Indicates whether self-service capabilities are enabled or disabled.</p>"
+        },
+        "Tenancy":{
+          "shape":"Tenancy",
+          "documentation":"<p>Indicates whether your WorkSpace directory is dedicated or shared. To use Bring Your Own License (BYOL) images, this value must be set to <code>DEDICATED</code> and your AWS account must be enabled for BYOL. If your account has not been enabled for BYOL, you will receive an InvalidParameterValuesException error. For more information about BYOL images, see <a href=\"https://docs.aws.amazon.com/workspaces/latest/adminguide/byol-windows-images.html\">Bring Your Own Windows Desktop Images</a>.</p>"
+        },
+        "Tags":{
+          "shape":"TagList",
+          "documentation":"<p>The tags associated with the directory.</p>"
+        }
+      }
+    },
+    "RegisterWorkspaceDirectoryResult":{
+      "type":"structure",
+      "members":{
+      }
+    },
     "RegistrationCode":{
       "type":"string",
       "max":20,
@@ -1817,7 +2082,35 @@
     "RunningModeAutoStopTimeoutInMinutes":{"type":"integer"},
     "SecurityGroupId":{
       "type":"string",
-      "pattern":"^(sg-[0-9a-f]{8})$"
+      "max":20,
+      "min":11,
+      "pattern":"^(sg-([0-9a-f]{8}|[0-9a-f]{17}))$"
+    },
+    "SelfservicePermissions":{
+      "type":"structure",
+      "members":{
+        "RestartWorkspace":{
+          "shape":"ReconnectEnum",
+          "documentation":"<p>Specifies whether users can restart their WorkSpace.</p>"
+        },
+        "IncreaseVolumeSize":{
+          "shape":"ReconnectEnum",
+          "documentation":"<p>Specifies whether users can increase the volume size of the drives on their WorkSpace.</p>"
+        },
+        "ChangeComputeType":{
+          "shape":"ReconnectEnum",
+          "documentation":"<p>Specifies whether users can change the compute type (bundle) for their WorkSpace.</p>"
+        },
+        "SwitchRunningMode":{
+          "shape":"ReconnectEnum",
+          "documentation":"<p>Specifies whether users can switch the running mode of their WorkSpace.</p>"
+        },
+        "RebuildWorkspace":{
+          "shape":"ReconnectEnum",
+          "documentation":"<p>Specifies whether users can rebuild the operating system of a WorkSpace to its original state.</p>"
+        }
+      },
+      "documentation":"<p>Describes the self-service permissions for a directory. For more information, see <a href=\"https://docs.aws.amazon.com/workspaces/latest/adminguide/enable-user-self-service-workspace-management.html\">Enable Self-Service WorkSpace Management Capabilities for Your Users</a>.</p>"
     },
     "Snapshot":{
       "type":"structure",
@@ -1905,11 +2198,14 @@
     },
     "SubnetId":{
       "type":"string",
-      "pattern":"^(subnet-[0-9a-f]{8})$"
+      "max":24,
+      "min":15,
+      "pattern":"^(subnet-([0-9a-f]{8}|[0-9a-f]{17}))$"
     },
     "SubnetIds":{
       "type":"list",
-      "member":{"shape":"SubnetId"}
+      "member":{"shape":"SubnetId"},
+      "max":2
     },
     "Tag":{
       "type":"structure",
@@ -1950,6 +2246,13 @@
         "ADMIN_MAINTENANCE"
       ]
     },
+    "Tenancy":{
+      "type":"string",
+      "enum":[
+        "DEDICATED",
+        "SHARED"
+      ]
+    },
     "TerminateRequest":{
       "type":"structure",
       "required":["WorkspaceId"],
@@ -1987,12 +2290,20 @@
       }
     },
     "Timestamp":{"type":"timestamp"},
+    "UnsupportedNetworkConfigurationException":{
+      "type":"structure",
+      "members":{
+        "message":{"shape":"ExceptionMessage"}
+      },
+      "documentation":"<p>The configuration of this network is not supported for this operation, or your network configuration conflicts with the Amazon WorkSpaces management network IP range. For more information, see <a href=\"https://docs.aws.amazon.com/workspaces/latest/adminguide/amazon-workspaces-vpc.html\"> Configure a VPC for Amazon WorkSpaces</a>.</p>",
+      "exception":true
+    },
     "UnsupportedWorkspaceConfigurationException":{
       "type":"structure",
       "members":{
         "message":{"shape":"ExceptionMessage"}
       },
-      "documentation":"<p>The configuration of this WorkSpace is not supported for this operation. For more information, see the <a href=\"https://docs.aws.amazon.com/workspaces/latest/adminguide/\">Amazon WorkSpaces Administration Guide</a>. </p>",
+      "documentation":"<p>The configuration of this WorkSpace is not supported for this operation. For more information, see <a href=\"https://docs.aws.amazon.com/workspaces/latest/adminguide/required-service-components.html\">Required Configuration and Service Components for WorkSpaces </a>.</p>",
       "exception":true
     },
     "UpdateRulesOfIpGroupRequest":{
@@ -2079,7 +2390,7 @@
         },
         "VolumeEncryptionKey":{
           "shape":"VolumeEncryptionKey",
-          "documentation":"<p>The KMS key used to encrypt data stored on your WorkSpace.</p>"
+          "documentation":"<p>The symmetric AWS KMS customer master key (CMK) used to encrypt data stored on your WorkSpace. Amazon WorkSpaces does not support asymmetric CMKs.</p>"
         },
         "UserVolumeEncryptionEnabled":{
           "shape":"BooleanObject",
@@ -2100,6 +2411,40 @@
       },
       "documentation":"<p>Describes a WorkSpace.</p>"
     },
+    "WorkspaceAccessProperties":{
+      "type":"structure",
+      "members":{
+        "DeviceTypeWindows":{
+          "shape":"AccessPropertyValue",
+          "documentation":"<p>Indicates whether users can use Windows clients to access their WorkSpaces. To restrict WorkSpaces access to trusted devices (also known as managed devices) with valid certificates, specify a value of <code>TRUST</code>. For more information, see <a href=\"https://docs.aws.amazon.com/workspaces/latest/adminguide/trusted-devices.html\">Restrict WorkSpaces Access to Trusted Devices</a>. </p>"
+        },
+        "DeviceTypeOsx":{
+          "shape":"AccessPropertyValue",
+          "documentation":"<p>Indicates whether users can use macOS clients to access their WorkSpaces. To restrict WorkSpaces access to trusted devices (also known as managed devices) with valid certificates, specify a value of <code>TRUST</code>. For more information, see <a href=\"https://docs.aws.amazon.com/workspaces/latest/adminguide/trusted-devices.html\">Restrict WorkSpaces Access to Trusted Devices</a>. </p>"
+        },
+        "DeviceTypeWeb":{
+          "shape":"AccessPropertyValue",
+          "documentation":"<p>Indicates whether users can access their WorkSpaces through a web browser.</p>"
+        },
+        "DeviceTypeIos":{
+          "shape":"AccessPropertyValue",
+          "documentation":"<p>Indicates whether users can use iOS devices to access their WorkSpaces.</p>"
+        },
+        "DeviceTypeAndroid":{
+          "shape":"AccessPropertyValue",
+          "documentation":"<p>Indicates whether users can use Android devices to access their WorkSpaces.</p>"
+        },
+        "DeviceTypeChromeOs":{
+          "shape":"AccessPropertyValue",
+          "documentation":"<p>Indicates whether users can use Chromebooks to access their WorkSpaces.</p>"
+        },
+        "DeviceTypeZeroClient":{
+          "shape":"AccessPropertyValue",
+          "documentation":"<p>Indicates whether users can use zero client devices to access their WorkSpaces.</p>"
+        }
+      },
+      "documentation":"<p>The device types and operating systems that can be used to access a WorkSpace. For more information, see <a href=\"https://docs.aws.amazon.com/workspaces/latest/adminguide/workspaces-network-requirements.html\">Amazon WorkSpaces Client Network Requirements</a>.</p>"
+    },
     "WorkspaceBundle":{
       "type":"structure",
       "members":{
@@ -2119,6 +2464,10 @@
           "shape":"Description",
           "documentation":"<p>A description.</p>"
         },
+        "ImageId":{
+          "shape":"WorkspaceImageId",
+          "documentation":"<p>The image identifier of the bundle.</p>"
+        },
         "RootStorage":{
           "shape":"RootStorage",
           "documentation":"<p>The size of the root volume.</p>"
@@ -2130,6 +2479,10 @@
         "ComputeType":{
           "shape":"ComputeType",
           "documentation":"<p>The compute type. For more information, see <a href=\"http://aws.amazon.com/workspaces/details/#Amazon_WorkSpaces_Bundles\">Amazon WorkSpaces Bundles</a>.</p>"
+        },
+        "LastUpdatedTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>The last time that the bundle was updated.</p>"
         }
       },
       "documentation":"<p>Describes a WorkSpace bundle.</p>"
@@ -2160,6 +2513,32 @@
       "type":"list",
       "member":{"shape":"WorkspaceConnectionStatus"}
     },
+    "WorkspaceCreationProperties":{
+      "type":"structure",
+      "members":{
+        "EnableInternetAccess":{
+          "shape":"BooleanObject",
+          "documentation":"<p>Indicates whether internet access is enabled for your WorkSpaces.</p>"
+        },
+        "DefaultOu":{
+          "shape":"DefaultOu",
+          "documentation":"<p>The default organizational unit (OU) for your WorkSpace directories.</p>"
+        },
+        "CustomSecurityGroupId":{
+          "shape":"SecurityGroupId",
+          "documentation":"<p>The identifier of your custom security group.</p>"
+        },
+        "UserEnabledAsLocalAdministrator":{
+          "shape":"BooleanObject",
+          "documentation":"<p>Indicates whether users are local administrators of their WorkSpaces.</p>"
+        },
+        "EnableMaintenanceMode":{
+          "shape":"BooleanObject",
+          "documentation":"<p>Indicates whether maintenance mode is enabled for your WorkSpaces. For more information, see <a href=\"https://docs.aws.amazon.com/workspaces/latest/adminguide/workspace-maintenance.html\">WorkSpace Maintenance</a>. </p>"
+        }
+      },
+      "documentation":"<p>Describes the default properties that are used for creating WorkSpaces. For more information, see <a href=\"https://docs.aws.amazon.com/workspaces/latest/adminguide/update-directory-details.html\">Update Directory Details for Your WorkSpaces</a>. </p>"
+    },
     "WorkspaceDirectory":{
       "type":"structure",
       "members":{
@@ -2205,7 +2584,7 @@
         },
         "State":{
           "shape":"WorkspaceDirectoryState",
-          "documentation":"<p>The state of the directory's registration with Amazon WorkSpaces</p>"
+          "documentation":"<p>The state of the directory's registration with Amazon WorkSpaces.</p>"
         },
         "WorkspaceCreationProperties":{
           "shape":"DefaultWorkspaceCreationProperties",
@@ -2214,9 +2593,21 @@
         "ipGroupIds":{
           "shape":"IpGroupIdList",
           "documentation":"<p>The identifiers of the IP access control groups associated with the directory.</p>"
+        },
+        "WorkspaceAccessProperties":{
+          "shape":"WorkspaceAccessProperties",
+          "documentation":"<p>The devices and operating systems that users can use to access WorkSpaces.</p>"
+        },
+        "Tenancy":{
+          "shape":"Tenancy",
+          "documentation":"<p>Specifies whether the directory is dedicated or shared. To use Bring Your Own License (BYOL), this value must be set to <code>DEDICATED</code>. For more information, see <a href=\"https://docs.aws.amazon.com/workspaces/latest/adminguide/byol-windows-images.html\">Bring Your Own Windows Desktop Images</a>.</p>"
+        },
+        "SelfservicePermissions":{
+          "shape":"SelfservicePermissions",
+          "documentation":"<p>The default self-service permissions for WorkSpaces in the directory.</p>"
         }
       },
-      "documentation":"<p>Describes an AWS Directory Service directory that is used with Amazon WorkSpaces.</p>"
+      "documentation":"<p>Describes a directory that is used with Amazon WorkSpaces.</p>"
     },
     "WorkspaceDirectoryState":{
       "type":"string",
@@ -2271,7 +2662,7 @@
         },
         "RequiredTenancy":{
           "shape":"WorkspaceImageRequiredTenancy",
-          "documentation":"<p>Specifies whether the image is running on dedicated hardware. When bring your own license (BYOL) is enabled, this value is set to DEDICATED. </p>"
+          "documentation":"<p>Specifies whether the image is running on dedicated hardware. When Bring Your Own License (BYOL) is enabled, this value is set to <code>DEDICATED</code>. For more information, see <a href=\"https://docs.aws.amazon.com/workspaces/latest/adminguide/byol-windows-images.html\">Bring Your Own Windows Desktop Images</a>.</p>"
         },
         "ErrorCode":{
           "shape":"WorkspaceImageErrorCode",
@@ -2378,7 +2769,7 @@
         },
         "UserName":{
           "shape":"UserName",
-          "documentation":"<p>The username of the user for the WorkSpace. This username must exist in the AWS Directory Service directory for the WorkSpace.</p>"
+          "documentation":"<p>The user name of the user for the WorkSpace. This user name must exist in the AWS Directory Service directory for the WorkSpace.</p>"
         },
         "BundleId":{
           "shape":"BundleId",
@@ -2386,7 +2777,7 @@
         },
         "VolumeEncryptionKey":{
           "shape":"VolumeEncryptionKey",
-          "documentation":"<p>The KMS key used to encrypt data stored on your WorkSpace.</p>"
+          "documentation":"<p>The symmetric AWS KMS customer master key (CMK) used to encrypt data stored on your WorkSpace. Amazon WorkSpaces does not support asymmetric CMKs.</p>"
         },
         "UserVolumeEncryptionEnabled":{
           "shape":"BooleanObject",
@@ -2435,6 +2826,14 @@
         "ERROR"
       ]
     },
+    "WorkspacesDefaultRoleNotFoundException":{
+      "type":"structure",
+      "members":{
+        "message":{"shape":"ExceptionMessage"}
+      },
+      "documentation":"<p>The workspaces_DefaultRole role could not be found. If this is the first time you are registering a directory, you will need to create the workspaces_DefaultRole role before you can register a directory. For more information, see <a href=\"https://docs.aws.amazon.com/workspaces/latest/adminguide/workspaces-access-control.html#create-default-role\">Creating the workspaces_DefaultRole Role</a>.</p>",
+      "exception":true
+    },
     "WorkspacesIpGroup":{
       "type":"structure",
       "members":{
diff --git a/services/workspaces/src/test/resources/cucumber.properties b/services/workspaces/src/test/resources/cucumber.properties
index a08982bde84d..b45e0eb9e248 100644
--- a/services/workspaces/src/test/resources/cucumber.properties
+++ b/services/workspaces/src/test/resources/cucumber.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/xray/build.properties b/services/xray/build.properties
index ecf2dae6fcb1..15ec2da1fc71 100644
--- a/services/xray/build.properties
+++ b/services/xray/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/services/xray/pom.xml b/services/xray/pom.xml
index 72985365bf32..d1ddbdcf5df8 100644
--- a/services/xray/pom.xml
+++ b/services/xray/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>services</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <artifactId>xray</artifactId>
     <name>AWS Java SDK :: Services :: AWS X-Ray</name>
diff --git a/services/xray/src/main/resources/codegen-resources/service-2.json b/services/xray/src/main/resources/codegen-resources/service-2.json
index 9271ab6f2e51..6331d686608a 100644
--- a/services/xray/src/main/resources/codegen-resources/service-2.json
+++ b/services/xray/src/main/resources/codegen-resources/service-2.json
@@ -177,7 +177,7 @@
         {"shape":"InvalidRequestException"},
         {"shape":"ThrottledException"}
       ],
-      "documentation":"<p>Retrieves a document that describes services that process incoming requests, and downstream services that they call as a result. Root services process incoming requests and make calls to downstream services. Root services are applications that use the AWS X-Ray SDK. Downstream services can be other applications, AWS resources, HTTP web APIs, or SQL databases.</p>"
+      "documentation":"<p>Retrieves a document that describes services that process incoming requests, and downstream services that they call as a result. Root services process incoming requests and make calls to downstream services. Root services are applications that use the <a href=\"https://docs.aws.amazon.com/xray/index.html\">AWS X-Ray SDK</a>. Downstream services can be other applications, AWS resources, HTTP web APIs, or SQL databases.</p>"
     },
     "GetTimeSeriesServiceStatistics":{
       "name":"GetTimeSeriesServiceStatistics",
@@ -219,7 +219,7 @@
         {"shape":"InvalidRequestException"},
         {"shape":"ThrottledException"}
       ],
-      "documentation":"<p>Retrieves IDs and metadata for traces available for a specified time frame using an optional filter. To get the full traces, pass the trace IDs to <code>BatchGetTraces</code>.</p> <p>A filter expression can target traced requests that hit specific service nodes or edges, have errors, or come from a known user. For example, the following filter expression targets traces that pass through <code>api.example.com</code>:</p> <p> <code>service(\"api.example.com\")</code> </p> <p>This filter expression finds traces that have an annotation named <code>account</code> with the value <code>12345</code>:</p> <p> <code>annotation.account = \"12345\"</code> </p> <p>For a full list of indexed fields and keywords that you can use in filter expressions, see <a href=\"https://docs.aws.amazon.com/xray/latest/devguide/xray-console-filters.html\">Using Filter Expressions</a> in the <i>AWS X-Ray Developer Guide</i>.</p>"
+      "documentation":"<p>Retrieves IDs and annotations for traces available for a specified time frame using an optional filter. To get the full traces, pass the trace IDs to <code>BatchGetTraces</code>.</p> <p>A filter expression can target traced requests that hit specific service nodes or edges, have errors, or come from a known user. For example, the following filter expression targets traces that pass through <code>api.example.com</code>:</p> <p> <code>service(\"api.example.com\")</code> </p> <p>This filter expression finds traces that have an annotation named <code>account</code> with the value <code>12345</code>:</p> <p> <code>annotation.account = \"12345\"</code> </p> <p>For a full list of indexed fields and keywords that you can use in filter expressions, see <a href=\"https://docs.aws.amazon.com/xray/latest/devguide/xray-console-filters.html\">Using Filter Expressions</a> in the <i>AWS X-Ray Developer Guide</i>.</p>"
     },
     "PutEncryptionConfig":{
       "name":"PutEncryptionConfig",
@@ -261,7 +261,7 @@
         {"shape":"InvalidRequestException"},
         {"shape":"ThrottledException"}
       ],
-      "documentation":"<p>Uploads segment documents to AWS X-Ray. The X-Ray SDK generates segment documents and sends them to the X-Ray daemon, which uploads them in batches. A segment document can be a completed segment, an in-progress segment, or an array of subsegments.</p> <p>Segments must include the following fields. For the full segment document schema, see <a href=\"https://docs.aws.amazon.com/xray/latest/devguide/xray-api-segmentdocuments.html\">AWS X-Ray Segment Documents</a> in the <i>AWS X-Ray Developer Guide</i>.</p> <p class=\"title\"> <b>Required Segment Document Fields</b> </p> <ul> <li> <p> <code>name</code> - The name of the service that handled the request.</p> </li> <li> <p> <code>id</code> - A 64-bit identifier for the segment, unique among segments in the same trace, in 16 hexadecimal digits.</p> </li> <li> <p> <code>trace_id</code> - A unique identifier that connects all segments and subsegments originating from a single client request.</p> </li> <li> <p> <code>start_time</code> - Time the segment or subsegment was created, in floating point seconds in epoch time, accurate to milliseconds. For example, <code>1480615200.010</code> or <code>1.480615200010E9</code>.</p> </li> <li> <p> <code>end_time</code> - Time the segment or subsegment was closed. For example, <code>1480615200.090</code> or <code>1.480615200090E9</code>. Specify either an <code>end_time</code> or <code>in_progress</code>.</p> </li> <li> <p> <code>in_progress</code> - Set to <code>true</code> instead of specifying an <code>end_time</code> to record that a segment has been started, but is not complete. Send an in progress segment when your application receives a request that will take a long time to serve, to trace the fact that the request was received. When the response is sent, send the complete segment to overwrite the in-progress segment.</p> </li> </ul> <p>A <code>trace_id</code> consists of three numbers separated by hyphens. For example, 1-58406520-a006649127e371903a2de979. This includes:</p> <p class=\"title\"> <b>Trace ID Format</b> </p> <ul> <li> <p>The version number, i.e. <code>1</code>.</p> </li> <li> <p>The time of the original request, in Unix epoch time, in 8 hexadecimal digits. For example, 10:00AM December 2nd, 2016 PST in epoch time is <code>1480615200</code> seconds, or <code>58406520</code> in hexadecimal.</p> </li> <li> <p>A 96-bit identifier for the trace, globally unique, in 24 hexadecimal digits.</p> </li> </ul>"
+      "documentation":"<p>Uploads segment documents to AWS X-Ray. The <a href=\"https://docs.aws.amazon.com/xray/index.html\">X-Ray SDK</a> generates segment documents and sends them to the X-Ray daemon, which uploads them in batches. A segment document can be a completed segment, an in-progress segment, or an array of subsegments.</p> <p>Segments must include the following fields. For the full segment document schema, see <a href=\"https://docs.aws.amazon.com/xray/latest/devguide/xray-api-segmentdocuments.html\">AWS X-Ray Segment Documents</a> in the <i>AWS X-Ray Developer Guide</i>.</p> <p class=\"title\"> <b>Required Segment Document Fields</b> </p> <ul> <li> <p> <code>name</code> - The name of the service that handled the request.</p> </li> <li> <p> <code>id</code> - A 64-bit identifier for the segment, unique among segments in the same trace, in 16 hexadecimal digits.</p> </li> <li> <p> <code>trace_id</code> - A unique identifier that connects all segments and subsegments originating from a single client request.</p> </li> <li> <p> <code>start_time</code> - Time the segment or subsegment was created, in floating point seconds in epoch time, accurate to milliseconds. For example, <code>1480615200.010</code> or <code>1.480615200010E9</code>.</p> </li> <li> <p> <code>end_time</code> - Time the segment or subsegment was closed. For example, <code>1480615200.090</code> or <code>1.480615200090E9</code>. Specify either an <code>end_time</code> or <code>in_progress</code>.</p> </li> <li> <p> <code>in_progress</code> - Set to <code>true</code> instead of specifying an <code>end_time</code> to record that a segment has been started, but is not complete. Send an in progress segment when your application receives a request that will take a long time to serve, to trace the fact that the request was received. When the response is sent, send the complete segment to overwrite the in-progress segment.</p> </li> </ul> <p>A <code>trace_id</code> consists of three numbers separated by hyphens. For example, 1-58406520-a006649127e371903a2de979. This includes:</p> <p class=\"title\"> <b>Trace ID Format</b> </p> <ul> <li> <p>The version number, i.e. <code>1</code>.</p> </li> <li> <p>The time of the original request, in Unix epoch time, in 8 hexadecimal digits. For example, 10:00AM December 2nd, 2016 PST in epoch time is <code>1480615200</code> seconds, or <code>58406520</code> in hexadecimal.</p> </li> <li> <p>A 96-bit identifier for the trace, globally unique, in 24 hexadecimal digits.</p> </li> </ul>"
     },
     "UpdateGroup":{
       "name":"UpdateGroup",
@@ -409,7 +409,7 @@
         },
         "NextToken":{
           "shape":"String",
-          "documentation":"<p>Pagination token. Not used.</p>"
+          "documentation":"<p>Pagination token.</p>"
         }
       }
     },
@@ -426,7 +426,7 @@
         },
         "NextToken":{
           "shape":"String",
-          "documentation":"<p>Pagination token. Not used.</p>"
+          "documentation":"<p>Pagination token.</p>"
         }
       }
     },
@@ -636,6 +636,10 @@
         "Services":{
           "shape":"ErrorRootCauseServices",
           "documentation":"<p>A list of services corresponding to an error. A service identifies a segment and it contains a name, account ID, type, and inferred flag.</p>"
+        },
+        "ClientImpacting":{
+          "shape":"NullableBoolean",
+          "documentation":"<p>A flag that denotes that the root cause impacts the trace client.</p>"
         }
       },
       "documentation":"<p>The root cause of a trace summary error.</p>"
@@ -724,6 +728,10 @@
         "Services":{
           "shape":"FaultRootCauseServices",
           "documentation":"<p>A list of corresponding services. A service identifies a segment and it contains a name, account ID, type, and inferred flag.</p>"
+        },
+        "ClientImpacting":{
+          "shape":"NullableBoolean",
+          "documentation":"<p>A flag that denotes that the root cause impacts the trace client.</p>"
         }
       },
       "documentation":"<p>The root cause information for a trace summary fault.</p>"
@@ -854,7 +862,7 @@
       "members":{
         "NextToken":{
           "shape":"GetGroupsNextToken",
-          "documentation":"<p>Pagination token. Not used.</p>"
+          "documentation":"<p>Pagination token.</p>"
         }
       }
     },
@@ -867,7 +875,7 @@
         },
         "NextToken":{
           "shape":"String",
-          "documentation":"<p>Pagination token. Not used.</p>"
+          "documentation":"<p>Pagination token.</p>"
         }
       }
     },
@@ -876,7 +884,7 @@
       "members":{
         "NextToken":{
           "shape":"String",
-          "documentation":"<p>Pagination token. Not used.</p>"
+          "documentation":"<p>Pagination token.</p>"
         }
       }
     },
@@ -889,7 +897,7 @@
         },
         "NextToken":{
           "shape":"String",
-          "documentation":"<p>Pagination token. Not used.</p>"
+          "documentation":"<p>Pagination token.</p>"
         }
       }
     },
@@ -898,7 +906,7 @@
       "members":{
         "NextToken":{
           "shape":"String",
-          "documentation":"<p>Pagination token. Not used.</p>"
+          "documentation":"<p>Pagination token.</p>"
         }
       }
     },
@@ -911,7 +919,7 @@
         },
         "NextToken":{
           "shape":"String",
-          "documentation":"<p>Pagination token. Not used.</p>"
+          "documentation":"<p>Pagination token.</p>"
         }
       }
     },
@@ -967,7 +975,7 @@
         },
         "NextToken":{
           "shape":"String",
-          "documentation":"<p>Pagination token. Not used.</p>"
+          "documentation":"<p>Pagination token.</p>"
         }
       }
     },
@@ -992,7 +1000,7 @@
         },
         "NextToken":{
           "shape":"String",
-          "documentation":"<p>Pagination token. Not used.</p>"
+          "documentation":"<p>Pagination token.</p>"
         }
       }
     },
@@ -1029,7 +1037,7 @@
         },
         "NextToken":{
           "shape":"String",
-          "documentation":"<p>Pagination token. Not used.</p>"
+          "documentation":"<p>Pagination token.</p>"
         }
       }
     },
@@ -1046,7 +1054,7 @@
         },
         "NextToken":{
           "shape":"String",
-          "documentation":"<p>Pagination token. Not used.</p>"
+          "documentation":"<p>Pagination token.</p>"
         }
       }
     },
@@ -1060,7 +1068,7 @@
         },
         "NextToken":{
           "shape":"String",
-          "documentation":"<p>Pagination token. Not used.</p>"
+          "documentation":"<p>Pagination token.</p>"
         }
       }
     },
@@ -1073,7 +1081,7 @@
         },
         "NextToken":{
           "shape":"String",
-          "documentation":"<p>Pagination token. Not used.</p>"
+          "documentation":"<p>Pagination token.</p>"
         }
       }
     },
@@ -1119,7 +1127,7 @@
       "members":{
         "TraceSummaries":{
           "shape":"TraceSummaryList",
-          "documentation":"<p>Trace IDs and metadata for traces that were found in the specified time frame.</p>"
+          "documentation":"<p>Trace IDs and annotations for traces that were found in the specified time frame.</p>"
         },
         "ApproximateTime":{
           "shape":"Timestamp",
@@ -1275,7 +1283,7 @@
       "members":{
         "KeyId":{
           "shape":"EncryptionKeyId",
-          "documentation":"<p>An AWS KMS customer master key (CMK) in one of the following formats:</p> <ul> <li> <p> <b>Alias</b> - The name of the key. For example, <code>alias/MyKey</code>.</p> </li> <li> <p> <b>Key ID</b> - The KMS key ID of the key. For example, <code>ae4aa6d49-a4d8-9df9-a475-4ff6d7898456</code>.</p> </li> <li> <p> <b>ARN</b> - The full Amazon Resource Name of the key ID or alias. For example, <code>arn:aws:kms:us-east-2:123456789012:key/ae4aa6d49-a4d8-9df9-a475-4ff6d7898456</code>. Use this format to specify a key in a different account.</p> </li> </ul> <p>Omit this key if you set <code>Type</code> to <code>NONE</code>.</p>"
+          "documentation":"<p>An AWS KMS customer master key (CMK) in one of the following formats:</p> <ul> <li> <p> <b>Alias</b> - The name of the key. For example, <code>alias/MyKey</code>.</p> </li> <li> <p> <b>Key ID</b> - The KMS key ID of the key. For example, <code>ae4aa6d49-a4d8-9df9-a475-4ff6d7898456</code>. AWS X-Ray does not support asymmetric CMKs.</p> </li> <li> <p> <b>ARN</b> - The full Amazon Resource Name of the key ID or alias. For example, <code>arn:aws:kms:us-east-2:123456789012:key/ae4aa6d49-a4d8-9df9-a475-4ff6d7898456</code>. Use this format to specify a key in a different account.</p> </li> </ul> <p>Omit this key if you set <code>Type</code> to <code>NONE</code>.</p>"
         },
         "Type":{
           "shape":"EncryptionType",
@@ -1366,6 +1374,10 @@
         "Services":{
           "shape":"ResponseTimeRootCauseServices",
           "documentation":"<p>A list of corresponding services. A service identifies a segment and contains a name, account ID, type, and inferred flag.</p>"
+        },
+        "ClientImpacting":{
+          "shape":"NullableBoolean",
+          "documentation":"<p>A flag that denotes that the root cause impacts the trace client.</p>"
         }
       },
       "documentation":"<p>The root cause information for a response time warning.</p>"
@@ -2021,11 +2033,11 @@
         },
         "HasFault":{
           "shape":"NullableBoolean",
-          "documentation":"<p>One or more of the segment documents has a 500 series error.</p>"
+          "documentation":"<p>The root segment document has a 500 series error.</p>"
         },
         "HasError":{
           "shape":"NullableBoolean",
-          "documentation":"<p>One or more of the segment documents has a 400 series error.</p>"
+          "documentation":"<p>The root segment document has a 400 series error.</p>"
         },
         "HasThrottle":{
           "shape":"NullableBoolean",
diff --git a/test/codegen-generated-classes-test/pom.xml b/test/codegen-generated-classes-test/pom.xml
index 56901147d508..815c6b4c8ba1 100644
--- a/test/codegen-generated-classes-test/pom.xml
+++ b/test/codegen-generated-classes-test/pom.xml
@@ -1,4 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ 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.
+  -->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -6,7 +21,7 @@
     <parent>
         <artifactId>aws-sdk-java-pom</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -85,6 +100,11 @@
             <artifactId>utils</artifactId>
             <version>${awsjavasdk.version}</version>
         </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>profiles</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
         <dependency>
             <artifactId>netty-nio-client</artifactId>
             <groupId>software.amazon.awssdk</groupId>
diff --git a/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/ProfileFileConfigurationTest.java b/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/ProfileFileConfigurationTest.java
new file mode 100644
index 000000000000..a70bb0f2a40f
--- /dev/null
+++ b/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/ProfileFileConfigurationTest.java
@@ -0,0 +1,100 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.services;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.mock;
+
+import org.junit.Test;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mockito;
+import software.amazon.awssdk.auth.credentials.AwsCredentials;
+import software.amazon.awssdk.auth.signer.AwsSignerExecutionAttribute;
+import software.amazon.awssdk.awscore.AwsExecutionAttribute;
+import software.amazon.awssdk.core.SdkSystemSetting;
+import software.amazon.awssdk.core.client.config.ClientOverrideConfiguration;
+import software.amazon.awssdk.core.client.config.SdkAdvancedClientOption;
+import software.amazon.awssdk.core.exception.SdkClientException;
+import software.amazon.awssdk.core.interceptor.ExecutionAttributes;
+import software.amazon.awssdk.core.signer.NoOpSigner;
+import software.amazon.awssdk.core.signer.Signer;
+import software.amazon.awssdk.http.SdkHttpFullRequest;
+import software.amazon.awssdk.profiles.ProfileFile;
+import software.amazon.awssdk.regions.Region;
+import software.amazon.awssdk.services.protocolrestjson.ProtocolRestJsonClient;
+import software.amazon.awssdk.testutils.EnvironmentVariableHelper;
+import software.amazon.awssdk.utils.StringInputStream;
+
+public class ProfileFileConfigurationTest {
+    @Test
+    public void profileIsHonoredForCredentialsAndRegion() {
+        EnvironmentVariableHelper.run(env -> {
+            env.remove(SdkSystemSetting.AWS_REGION);
+            env.remove(SdkSystemSetting.AWS_ACCESS_KEY_ID);
+            env.remove(SdkSystemSetting.AWS_SECRET_ACCESS_KEY);
+
+            String profileContent = "[profile foo]\n" +
+                                    "region = us-banana-46\n" +
+                                    "aws_access_key_id = profileIsHonoredForCredentials_akid\n" +
+                                    "aws_secret_access_key = profileIsHonoredForCredentials_skid";
+            String profileName = "foo";
+            Signer signer = mock(NoOpSigner.class);
+
+            ProtocolRestJsonClient client =
+                ProtocolRestJsonClient.builder()
+                                      .overrideConfiguration(overrideConfig(profileContent, profileName, signer))
+                                      .build();
+
+            Mockito.when(signer.sign(any(), any())).thenCallRealMethod();
+
+            try {
+                client.allTypes();
+            } catch (SdkClientException e) {
+                // expected
+            }
+
+            ArgumentCaptor<SdkHttpFullRequest> httpRequest = ArgumentCaptor.forClass(SdkHttpFullRequest.class);
+            ArgumentCaptor<ExecutionAttributes> attributes = ArgumentCaptor.forClass(ExecutionAttributes.class);
+            Mockito.verify(signer).sign(httpRequest.capture(), attributes.capture());
+
+            AwsCredentials credentials = attributes.getValue().getAttribute(AwsSignerExecutionAttribute.AWS_CREDENTIALS);
+            assertThat(credentials.accessKeyId()).isEqualTo("profileIsHonoredForCredentials_akid");
+            assertThat(credentials.secretAccessKey()).isEqualTo("profileIsHonoredForCredentials_skid");
+
+            Region region = attributes.getValue().getAttribute(AwsExecutionAttribute.AWS_REGION);
+            assertThat(region.id()).isEqualTo("us-banana-46");
+
+            assertThat(httpRequest.getValue().getUri().getHost()).contains("us-banana-46");
+        });
+    }
+
+    private ClientOverrideConfiguration overrideConfig(String profileContent, String profileName, Signer signer) {
+        return ClientOverrideConfiguration.builder()
+                                          .defaultProfileFile(profileFile(profileContent))
+                                          .defaultProfileName(profileName)
+                                          .retryPolicy(r -> r.numRetries(0))
+                                          .putAdvancedOption(SdkAdvancedClientOption.SIGNER, signer)
+                                          .build();
+    }
+
+    private ProfileFile profileFile(String content) {
+        return ProfileFile.builder()
+                          .content(new StringInputStream(content))
+                          .type(ProfileFile.Type.CONFIGURATION)
+                          .build();
+    }
+}
diff --git a/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/codegenerationjsonrpccustomized/model/GetValueForFieldTest.java b/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/codegenerationjsonrpccustomized/model/GetValueForFieldTest.java
index 73a311ab5981..17a4f033d290 100644
--- a/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/codegenerationjsonrpccustomized/model/GetValueForFieldTest.java
+++ b/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/codegenerationjsonrpccustomized/model/GetValueForFieldTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/codegenerationjsonrpccustomized/model/ListCopierTest.java b/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/codegenerationjsonrpccustomized/model/ListCopierTest.java
index dc6a5a69ba6f..0e66060e0824 100644
--- a/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/codegenerationjsonrpccustomized/model/ListCopierTest.java
+++ b/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/codegenerationjsonrpccustomized/model/ListCopierTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/codegenerationjsonrpccustomized/model/MapCopierTest.java b/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/codegenerationjsonrpccustomized/model/MapCopierTest.java
index 0e0acbefa72e..21b49b13fe87 100644
--- a/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/codegenerationjsonrpccustomized/model/MapCopierTest.java
+++ b/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/codegenerationjsonrpccustomized/model/MapCopierTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/codegenerationjsonrpccustomized/model/ModelBuilderListMemberTest.java b/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/codegenerationjsonrpccustomized/model/ModelBuilderListMemberTest.java
index bae54df6f057..333f60f71ff5 100644
--- a/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/codegenerationjsonrpccustomized/model/ModelBuilderListMemberTest.java
+++ b/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/codegenerationjsonrpccustomized/model/ModelBuilderListMemberTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/codegenerationjsonrpccustomized/model/ModelBuilderMapMemberTest.java b/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/codegenerationjsonrpccustomized/model/ModelBuilderMapMemberTest.java
index febc413ad718..232e1ec3b9b5 100644
--- a/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/codegenerationjsonrpccustomized/model/ModelBuilderMapMemberTest.java
+++ b/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/codegenerationjsonrpccustomized/model/ModelBuilderMapMemberTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/customresponsemetadata/CustomResponseMetadataTest.java b/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/customresponsemetadata/CustomResponseMetadataTest.java
index 85af47742483..e0104a254ff3 100644
--- a/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/customresponsemetadata/CustomResponseMetadataTest.java
+++ b/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/customresponsemetadata/CustomResponseMetadataTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/protocolquery/AsyncOperationCancelTest.java b/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/protocolquery/AsyncOperationCancelTest.java
index b5cf7c96734c..b6552bb96c9c 100644
--- a/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/protocolquery/AsyncOperationCancelTest.java
+++ b/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/protocolquery/AsyncOperationCancelTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/protocolrestjson/AsyncOperationCancelTest.java b/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/protocolrestjson/AsyncOperationCancelTest.java
index 096c2853f3e6..5af311ab04eb 100644
--- a/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/protocolrestjson/AsyncOperationCancelTest.java
+++ b/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/protocolrestjson/AsyncOperationCancelTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/protocolrestjson/HashCodeEqualsTest.java b/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/protocolrestjson/HashCodeEqualsTest.java
index 338085fb4455..46da01f4cb14 100644
--- a/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/protocolrestjson/HashCodeEqualsTest.java
+++ b/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/protocolrestjson/HashCodeEqualsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/protocolrestxml/AsyncOperationCancelTest.java b/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/protocolrestxml/AsyncOperationCancelTest.java
index 42edb6ed190b..ce17d2380ba1 100644
--- a/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/protocolrestxml/AsyncOperationCancelTest.java
+++ b/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/protocolrestxml/AsyncOperationCancelTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/retry/AsyncClientRetryModeTest.java b/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/retry/AsyncClientRetryModeTest.java
new file mode 100644
index 000000000000..1151107bb359
--- /dev/null
+++ b/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/retry/AsyncClientRetryModeTest.java
@@ -0,0 +1,42 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.services.retry;
+
+import java.util.concurrent.CompletionException;
+import software.amazon.awssdk.services.protocolrestjson.ProtocolRestJsonAsyncClient;
+import software.amazon.awssdk.services.protocolrestjson.ProtocolRestJsonAsyncClientBuilder;
+import software.amazon.awssdk.services.protocolrestjson.model.AllTypesResponse;
+
+public class AsyncClientRetryModeTest
+    extends ClientRetryModeTestSuite<ProtocolRestJsonAsyncClient, ProtocolRestJsonAsyncClientBuilder> {
+    @Override
+    protected ProtocolRestJsonAsyncClientBuilder newClientBuilder() {
+        return ProtocolRestJsonAsyncClient.builder();
+    }
+
+    @Override
+    protected AllTypesResponse callAllTypes(ProtocolRestJsonAsyncClient client) {
+        try {
+            return client.allTypes().join();
+        } catch (CompletionException e) {
+            if (e.getCause() instanceof RuntimeException) {
+                throw (RuntimeException) e.getCause();
+            }
+
+            throw e;
+        }
+    }
+}
diff --git a/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/retry/ClientRetryModeTestSuite.java b/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/retry/ClientRetryModeTestSuite.java
new file mode 100644
index 000000000000..35d5d70e23f8
--- /dev/null
+++ b/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/retry/ClientRetryModeTestSuite.java
@@ -0,0 +1,131 @@
+/*
+ * Copyright 2010-2020 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.
+ */
+
+package software.amazon.awssdk.services.retry;
+
+import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
+import static com.github.tomakehurst.wiremock.client.WireMock.anyRequestedFor;
+import static com.github.tomakehurst.wiremock.client.WireMock.anyUrl;
+import static com.github.tomakehurst.wiremock.client.WireMock.post;
+import static com.github.tomakehurst.wiremock.client.WireMock.proxyAllTo;
+import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
+import static com.github.tomakehurst.wiremock.client.WireMock.verify;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+import com.github.tomakehurst.wiremock.junit.WireMockRule;
+import java.net.URI;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+import org.junit.Rule;
+import org.junit.Test;
+import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
+import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
+import software.amazon.awssdk.awscore.client.builder.AwsClientBuilder;
+import software.amazon.awssdk.core.exception.SdkException;
+import software.amazon.awssdk.core.retry.RetryMode;
+import software.amazon.awssdk.profiles.ProfileFile;
+import software.amazon.awssdk.regions.Region;
+import software.amazon.awssdk.services.protocolrestjson.model.AllTypesResponse;
+import software.amazon.awssdk.utils.StringInputStream;
+
+public abstract class ClientRetryModeTestSuite<ClientT, BuilderT extends AwsClientBuilder<BuilderT, ClientT>> {
+    @Rule
+    public WireMockRule wireMock = new WireMockRule(0);
+
+    @Test
+    public void legacyRetryModeIsFourAttempts() {
+        stubThrottlingResponse();
+        ClientT client = clientBuilder().overrideConfiguration(o -> o.retryPolicy(RetryMode.LEGACY)).build();
+        assertThatThrownBy(() -> callAllTypes(client)).isInstanceOf(SdkException.class);
+        verifyRequestCount(4);
+    }
+
+    @Test
+    public void standardRetryModeIsThreeAttempts() {
+        stubThrottlingResponse();
+        ClientT client = clientBuilder().overrideConfiguration(o -> o.retryPolicy(RetryMode.STANDARD)).build();
+        assertThatThrownBy(() -> callAllTypes(client)).isInstanceOf(SdkException.class);
+        verifyRequestCount(3);
+    }
+
+    @Test
+    public void retryModeCanBeSetByProfileFile() {
+        ProfileFile profileFile = ProfileFile.builder()
+                                             .content(new StringInputStream("[profile foo]\n" +
+                                                                            "retry_mode = standard"))
+                                             .type(ProfileFile.Type.CONFIGURATION)
+                                             .build();
+        stubThrottlingResponse();
+        ClientT client = clientBuilder().overrideConfiguration(o -> o.defaultProfileFile(profileFile)
+                                                                     .defaultProfileName("foo")).build();
+        assertThatThrownBy(() -> callAllTypes(client)).isInstanceOf(SdkException.class);
+        verifyRequestCount(3);
+    }
+
+    @Test
+    public void legacyRetryModeExcludesThrottlingExceptions() throws InterruptedException {
+        stubThrottlingResponse();
+
+        ExecutorService executor = Executors.newFixedThreadPool(51);
+        ClientT client = clientBuilder().overrideConfiguration(o -> o.retryPolicy(RetryMode.LEGACY)).build();
+
+        for (int i = 0; i < 51; ++i) {
+            executor.execute(() -> assertThatThrownBy(() -> callAllTypes(client)).isInstanceOf(SdkException.class));
+        }
+        executor.shutdown();
+        assertThat(executor.awaitTermination(30, TimeUnit.SECONDS)).isTrue();
+
+        // 51 requests * 4 attempts = 204 requests
+        verifyRequestCount(204);
+    }
+
+    @Test
+    public void standardRetryModeIncludesThrottlingExceptions() throws InterruptedException {
+        stubThrottlingResponse();
+
+        ExecutorService executor = Executors.newFixedThreadPool(51);
+        ClientT client = clientBuilder().overrideConfiguration(o -> o.retryPolicy(RetryMode.STANDARD)).build();
+
+        for (int i = 0; i < 51; ++i) {
+            executor.execute(() -> assertThatThrownBy(() -> callAllTypes(client)).isInstanceOf(SdkException.class));
+        }
+        executor.shutdown();
+        assertThat(executor.awaitTermination(30, TimeUnit.SECONDS)).isTrue();
+
+        // Would receive 153 without throttling (51 requests * 3 attempts = 153 requests)
+        verifyRequestCount(151);
+    }
+
+    private BuilderT clientBuilder() {
+        return newClientBuilder().credentialsProvider(StaticCredentialsProvider.create(AwsBasicCredentials.create("akid", "skid")))
+                                 .region(Region.US_EAST_1)
+                                 .endpointOverride(URI.create("http://localhost:" + wireMock.port()));
+    }
+
+    protected abstract BuilderT newClientBuilder();
+
+    protected abstract AllTypesResponse callAllTypes(ClientT client);
+
+    private void verifyRequestCount(int count) {
+        verify(count, anyRequestedFor(anyUrl()));
+    }
+
+    private void stubThrottlingResponse() {
+        stubFor(post(anyUrl())
+                    .willReturn(aResponse().withStatus(429)));
+    }
+}
diff --git a/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/retry/SyncClientRetryModeTest.java b/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/retry/SyncClientRetryModeTest.java
new file mode 100644
index 000000000000..1d6f4e60adb4
--- /dev/null
+++ b/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/retry/SyncClientRetryModeTest.java
@@ -0,0 +1,32 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.services.retry;
+
+import software.amazon.awssdk.services.protocolrestjson.ProtocolRestJsonClient;
+import software.amazon.awssdk.services.protocolrestjson.ProtocolRestJsonClientBuilder;
+import software.amazon.awssdk.services.protocolrestjson.model.AllTypesResponse;
+
+public class SyncClientRetryModeTest extends ClientRetryModeTestSuite<ProtocolRestJsonClient, ProtocolRestJsonClientBuilder> {
+    @Override
+    protected ProtocolRestJsonClientBuilder newClientBuilder() {
+        return ProtocolRestJsonClient.builder();
+    }
+
+    @Override
+    protected AllTypesResponse callAllTypes(ProtocolRestJsonClient client) {
+        return client.allTypes();
+    }
+}
diff --git a/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/tostring/SensitiveDataRedactedTest.java b/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/tostring/SensitiveDataRedactedTest.java
index 5eda86056e17..48b4fc5deba0 100644
--- a/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/tostring/SensitiveDataRedactedTest.java
+++ b/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/tostring/SensitiveDataRedactedTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/dynamodbdocument-v1/pom.xml b/test/dynamodbdocument-v1/pom.xml
deleted file mode 100644
index fb275f491d05..000000000000
--- a/test/dynamodbdocument-v1/pom.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  ~ Copyright 2010-2019 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.
-  -->
-
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-         xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <artifactId>aws-sdk-java-pom</artifactId>
-        <groupId>software.amazon.awssdk</groupId>
-        <version>2.10.7-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <artifactId>dynamodbdocument-v1</artifactId>
-    <name>AWS Java SDK :: Test :: Amazon DynamoDB Document API v1</name>
-    <description>DynamoDB Document API largely unchanged from v1. The v1 API is kept for testing purposes only. All classes are in the test directories to prevent use in application code.</description>
-    <url>https://aws.amazon.com/sdkforjava</url>
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>software.amazon.awssdk</groupId>
-                <artifactId>bom-internal</artifactId>
-                <version>${project.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
-    <dependencies>
-        <dependency>
-            <groupId>software.amazon.awssdk</groupId>
-            <artifactId>regions</artifactId>
-            <version>${awsjavasdk.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>software.amazon.awssdk</groupId>
-            <artifactId>annotations</artifactId>
-            <version>${awsjavasdk.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>software.amazon.awssdk</groupId>
-            <artifactId>utils</artifactId>
-            <version>${awsjavasdk.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>software.amazon.awssdk</groupId>
-            <artifactId>sdk-core</artifactId>
-            <version>${awsjavasdk.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>software.amazon.awssdk</groupId>
-            <artifactId>aws-core</artifactId>
-            <version>${awsjavasdk.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <artifactId>dynamodb</artifactId>
-            <groupId>software.amazon.awssdk</groupId>
-            <version>${awsjavasdk.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <artifactId>s3</artifactId>
-            <groupId>software.amazon.awssdk</groupId>
-            <version>${awsjavasdk.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <artifactId>service-test-utils</artifactId>
-            <groupId>software.amazon.awssdk</groupId>
-            <version>${awsjavasdk.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <artifactId>junit</artifactId>
-            <groupId>junit</groupId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <artifactId>mockito-core</artifactId>
-            <groupId>org.mockito</groupId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/test/dynamodbdocument-v1/src/it/java/software/amazon/awssdk/services/dynamodb/NestedJsonDocumentIntegrationTest.java b/test/dynamodbdocument-v1/src/it/java/software/amazon/awssdk/services/dynamodb/NestedJsonDocumentIntegrationTest.java
deleted file mode 100644
index 05846a36a350..000000000000
--- a/test/dynamodbdocument-v1/src/it/java/software/amazon/awssdk/services/dynamodb/NestedJsonDocumentIntegrationTest.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import software.amazon.awssdk.core.exception.SdkServiceException;
-import software.amazon.awssdk.core.util.SdkAutoConstructMap;
-import software.amazon.awssdk.services.dynamodb.model.AttributeDefinition;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-import software.amazon.awssdk.services.dynamodb.model.CreateTableRequest;
-import software.amazon.awssdk.services.dynamodb.model.DeleteTableRequest;
-import software.amazon.awssdk.services.dynamodb.model.GetItemRequest;
-import software.amazon.awssdk.services.dynamodb.model.GetItemResponse;
-import software.amazon.awssdk.services.dynamodb.model.KeySchemaElement;
-import software.amazon.awssdk.services.dynamodb.model.KeyType;
-import software.amazon.awssdk.services.dynamodb.model.ProvisionedThroughput;
-import software.amazon.awssdk.services.dynamodb.model.PutItemRequest;
-import software.amazon.awssdk.services.dynamodb.model.ScalarAttributeType;
-import software.amazon.awssdk.services.dynamodb.util.TableUtils;
-import software.amazon.awssdk.testutils.service.AwsTestBase;
-
-/**
- * DynamoDB supports nested attributes up to 32 levels deep.
- * http://docs.aws.amazon.com/amazondynamodb/latest/developerguide/Limits.html
- */
-public class NestedJsonDocumentIntegrationTest extends AwsTestBase {
-
-    private static final String TABLE = "java-sdk-nested-json-document-" + System.currentTimeMillis();
-    private static final String HASH = "hash";
-    private static final String JSON_MAP_ATTRIBUTE = "json";
-    private static final String JSON_MAP_NESTED_KEY = "key";
-    /*
-     * DynamoDB supports nested attributes up to 32 levels deep.
-     * http://docs.aws.amazon.com/amazondynamodb/latest/developerguide/Limits.html
-     */
-    private static final int MAX_JSON_PATH_DEPTH = 32;
-    private static DynamoDbClient ddb;
-
-    @BeforeClass
-    public static void setup() throws Exception {
-        setUpCredentials();
-        ddb = DynamoDbClient.builder().credentialsProvider(CREDENTIALS_PROVIDER_CHAIN).build();
-
-        ddb.createTable(CreateTableRequest.builder()
-                .tableName(TABLE)
-                .keySchema(KeySchemaElement.builder().attributeName(HASH).keyType(KeyType.HASH).build())
-                .attributeDefinitions(AttributeDefinition.builder().attributeName(HASH).attributeType(ScalarAttributeType.S).build())
-                .provisionedThroughput(ProvisionedThroughput.builder().readCapacityUnits(1L).writeCapacityUnits(1L).build()).build());
-
-        TableUtils.waitUntilActive(ddb, TABLE);
-    }
-
-    @AfterClass
-    public static void tearDown() {
-        ddb.deleteTable(DeleteTableRequest.builder().tableName(TABLE).build());
-    }
-
-    @Test
-    public void testMaxNestedDepth() {
-        // minus 1 to account for the top-level attribute
-        int MAX_MAP_DEPTH = MAX_JSON_PATH_DEPTH - 1;
-
-        AttributeValue nestedJson = buildNestedMapAttribute(MAX_MAP_DEPTH);
-
-        Map<String, AttributeValue> item = new HashMap<String, AttributeValue>();
-        item.put(HASH, AttributeValue.builder().s("foo").build());
-        item.put(JSON_MAP_ATTRIBUTE, nestedJson);
-
-        ddb.putItem(PutItemRequest.builder()
-                .tableName(TABLE)
-                .item(item)
-                .build());
-
-        // Make sure we can read the max-depth item
-        GetItemResponse itemResult = ddb.getItem(GetItemRequest.builder()
-                .tableName(TABLE)
-                .key(Collections.singletonMap(HASH,
-                        AttributeValue.builder().s("foo").build()))
-                .build());
-        int mapDepth = computeDepthOfNestedMapAttribute(
-                itemResult.item().get(JSON_MAP_ATTRIBUTE));
-        Assert.assertEquals(MAX_MAP_DEPTH, mapDepth);
-
-
-        // Attempt to put a JSON document with over-limit depth
-        AttributeValue nestedJson_OverLimit = buildNestedMapAttribute(MAX_MAP_DEPTH + 1);
-
-        Map<String, AttributeValue> item_OverLimit = new HashMap<String, AttributeValue>();
-        item_OverLimit.put(HASH, AttributeValue.builder().s("foo").build());
-        item_OverLimit.put("json", nestedJson_OverLimit);
-
-        try {
-            ddb.putItem(PutItemRequest.builder()
-                    .tableName(TABLE)
-                    .item(item_OverLimit).build());
-            Assert.fail("ValidationException is expected, since the depth exceeds the service limit.");
-        } catch (SdkServiceException expected) {
-            // Ignored or expected.
-        }
-    }
-
-    private AttributeValue buildNestedMapAttribute(int depth) {
-        AttributeValue value = AttributeValue.builder().s("foo").build();
-        while (depth-- > 0) {
-            value = AttributeValue.builder().m(Collections.singletonMap(JSON_MAP_NESTED_KEY, value)).build();
-        }
-        return value;
-    }
-
-    private int computeDepthOfNestedMapAttribute(AttributeValue mapAttr) {
-        int depth = 0;
-        while (mapAttr != null && mapAttr.m() != null && !(mapAttr.m() instanceof SdkAutoConstructMap)) {
-            depth++;
-            mapAttr = mapAttr.m().get(JSON_MAP_NESTED_KEY);
-        }
-        return depth;
-    }
-}
diff --git a/test/dynamodbdocument-v1/src/it/java/software/amazon/awssdk/services/dynamodb/TableUtilsIntegrationTest.java b/test/dynamodbdocument-v1/src/it/java/software/amazon/awssdk/services/dynamodb/TableUtilsIntegrationTest.java
deleted file mode 100644
index 28a574b32300..000000000000
--- a/test/dynamodbdocument-v1/src/it/java/software/amazon/awssdk/services/dynamodb/TableUtilsIntegrationTest.java
+++ /dev/null
@@ -1,197 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import software.amazon.awssdk.core.exception.SdkClientException;
-import software.amazon.awssdk.services.dynamodb.model.AttributeDefinition;
-import software.amazon.awssdk.services.dynamodb.model.CreateTableRequest;
-import software.amazon.awssdk.services.dynamodb.model.DeleteTableRequest;
-import software.amazon.awssdk.services.dynamodb.model.DescribeTableRequest;
-import software.amazon.awssdk.services.dynamodb.model.KeySchemaElement;
-import software.amazon.awssdk.services.dynamodb.model.KeyType;
-import software.amazon.awssdk.services.dynamodb.model.ProvisionedThroughput;
-import software.amazon.awssdk.services.dynamodb.model.ResourceNotFoundException;
-import software.amazon.awssdk.services.dynamodb.model.ScalarAttributeType;
-import software.amazon.awssdk.services.dynamodb.model.TableStatus;
-import software.amazon.awssdk.services.dynamodb.util.TableUtils;
-import software.amazon.awssdk.services.dynamodb.util.TableUtils.TableNeverTransitionedToStateException;
-import software.amazon.awssdk.testutils.service.AwsIntegrationTestBase;
-
-public class TableUtilsIntegrationTest extends AwsIntegrationTestBase {
-
-    private static final int CUSTOM_TIMEOUT = 5 * 1000;
-
-    /**
-     * Wait a generous amount of time after the custom timeout to account for
-     * variance due to polling interval. This is only used in tests that use
-     * {@link TableUtilsIntegrationTest#CUSTOM_TIMEOUT}
-     */
-    private static final int TEST_TIMEOUT = CUSTOM_TIMEOUT * 2;
-
-    private static final int CUSTOM_POLLING_INTERVAL = 1 * 1000;
-    private static final long READ_CAPACITY = 5L;
-    private static final long WRITE_CAPACITY = 5L;
-    private static final String HASH_KEY_NAME = "someHash";
-
-    private static DynamoDbClient ddb;
-    private String tableName;
-
-    @BeforeClass
-    public static void setupFixture() {
-        ddb = DynamoDbClient.builder().credentialsProvider(CREDENTIALS_PROVIDER_CHAIN).build();
-    }
-
-    private CreateTableRequest createTableRequest() {
-        return CreateTableRequest.builder()
-                .tableName(tableName)
-                .keySchema(KeySchemaElement.builder()
-                        .keyType(KeyType.HASH)
-                        .attributeName(HASH_KEY_NAME).build())
-                .attributeDefinitions(AttributeDefinition.builder()
-                        .attributeName(HASH_KEY_NAME)
-                        .attributeType(ScalarAttributeType.S).build())
-                .provisionedThroughput(ProvisionedThroughput.builder()
-                        .readCapacityUnits(READ_CAPACITY)
-                        .writeCapacityUnits(WRITE_CAPACITY).build())
-                .build();
-    }
-
-    private DeleteTableRequest deleteTableRequest() {
-        return DeleteTableRequest.builder().tableName(tableName).build();
-    }
-
-    private void createTable() {
-        ddb.createTable(createTableRequest());
-    }
-
-    @Before
-    public void setup() {
-        tableName = "TableUtilsTest-" + System.currentTimeMillis();
-    }
-
-    @After
-    public void tearDown() throws InterruptedException {
-        if (tableStatus() != null) {
-            if (!tableStatus().equals(TableStatus.DELETING)) {
-                TableUtils.waitUntilActive(ddb, tableName);
-                ddb.deleteTable(DeleteTableRequest.builder().tableName(tableName).build());
-            }
-            waitUntilTableDeleted();
-        }
-    }
-
-    /**
-     * @return Table status or null if it doesn't exist.
-     */
-    private String tableStatus() {
-        try {
-            return ddb.describeTable(DescribeTableRequest.builder().tableName(tableName).build()).table().tableStatusAsString();
-        } catch (ResourceNotFoundException e) {
-            return null;
-        }
-    }
-
-    // TODO replace with waiters when available.
-    private void waitUntilTableDeleted() throws InterruptedException {
-        long startTime = System.currentTimeMillis();
-        // Wait up to five minutes for a table to be deleted.
-        long endTime = startTime + 5 * 60 * 1000;
-        while (System.currentTimeMillis() < endTime) {
-            try {
-                ddb.describeTable(DescribeTableRequest.builder().tableName(tableName).build());
-                Thread.sleep(1000);
-            } catch (ResourceNotFoundException e) {
-                return;
-            }
-        }
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void waitUntilActive_InvalidTimeout_ThrowsException() throws Exception {
-        TableUtils.waitUntilActive(ddb, tableName, -1, 10);
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void waitUntilActive_InvalidInterval_ThrowsException() throws Exception {
-        TableUtils.waitUntilActive(ddb, tableName, 10, -1);
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void waitUntilActive_IntervalGreaterThanTimeout_ThrowsException() throws Exception {
-        TableUtils.waitUntilActive(ddb, tableName, 10, 100);
-    }
-
-    @Test
-    public void waitUntilActive_MethodBlocksUntilTableIsActive() throws Exception {
-        createTable();
-        TableUtils.waitUntilActive(ddb, tableName);
-        assertEquals(TableStatus.ACTIVE,
-                     ddb.describeTable(DescribeTableRequest.builder().tableName(tableName).build()).table().tableStatus());
-    }
-
-    @Test(expected = TableNeverTransitionedToStateException.class, timeout = TEST_TIMEOUT)
-    public void waitUntilActive_TableNeverTransitionsToActive_ThrowsException() throws Exception {
-        createTable();
-        // We wait long enough for DescribeTable to return something but not
-        // long enough for the table to transition to active
-        TableUtils.waitUntilActive(ddb, tableName, 1 * 1000, 500);
-    }
-
-    @Test(expected = TableNeverTransitionedToStateException.class, timeout = TEST_TIMEOUT)
-    public void waitUntilActive_NoSuchTable_BlocksUntilTimeoutThenThrowsException() throws
-                                                                                    InterruptedException {
-        TableUtils.waitUntilActive(ddb, tableName, CUSTOM_TIMEOUT, CUSTOM_POLLING_INTERVAL);
-    }
-
-    @Test
-    public void waitUntilExists_MethodBlocksUntilTableExists() throws InterruptedException {
-        createTable();
-        TableUtils.waitUntilExists(ddb, tableName);
-        assertNotNull(ddb.describeTable(DescribeTableRequest.builder().tableName(tableName).build()));
-    }
-
-    @Test(expected = SdkClientException.class, timeout = TEST_TIMEOUT)
-    public void waitUntilExists_NoSuchTable_BlocksUntilTimeoutThenThrowsException() throws
-                                                                                    InterruptedException {
-        TableUtils.waitUntilExists(ddb, tableName, CUSTOM_TIMEOUT, CUSTOM_POLLING_INTERVAL);
-    }
-
-    @Test
-    public void testCreateTableIfNotExists() throws InterruptedException {
-        assertTrue(TableUtils.createTableIfNotExists(ddb, createTableRequest()));
-        TableUtils.waitUntilExists(ddb, tableName);
-        assertFalse(TableUtils.createTableIfNotExists(ddb, createTableRequest()));
-    }
-
-    @Test
-    public void testDeleteTableIfExists() throws InterruptedException {
-        assertFalse(TableUtils.deleteTableIfExists(ddb, deleteTableRequest()));
-        createTable();
-        TableUtils.waitUntilActive(ddb, tableName);
-        assertTrue(TableUtils.deleteTableIfExists(ddb, deleteTableRequest()));
-        waitUntilTableDeleted();
-    }
-
-}
diff --git a/test/dynamodbdocument-v1/src/it/java/software/amazon/awssdk/services/dynamodb/document/UpdateItemIntegrationTest.java b/test/dynamodbdocument-v1/src/it/java/software/amazon/awssdk/services/dynamodb/document/UpdateItemIntegrationTest.java
deleted file mode 100644
index 195b905c9a89..000000000000
--- a/test/dynamodbdocument-v1/src/it/java/software/amazon/awssdk/services/dynamodb/document/UpdateItemIntegrationTest.java
+++ /dev/null
@@ -1,275 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.document;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import software.amazon.awssdk.core.exception.SdkServiceException;
-import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
-import software.amazon.awssdk.services.dynamodb.document.spec.GetItemSpec;
-import software.amazon.awssdk.services.dynamodb.document.utils.NameMap;
-import software.amazon.awssdk.services.dynamodb.document.utils.ValueMap;
-import software.amazon.awssdk.services.dynamodb.model.AttributeDefinition;
-import software.amazon.awssdk.services.dynamodb.model.CreateTableRequest;
-import software.amazon.awssdk.services.dynamodb.model.KeySchemaElement;
-import software.amazon.awssdk.services.dynamodb.model.KeyType;
-import software.amazon.awssdk.services.dynamodb.model.ProvisionedThroughput;
-import software.amazon.awssdk.services.dynamodb.model.ScalarAttributeType;
-import software.amazon.awssdk.services.dynamodb.model.TableDescription;
-import software.amazon.awssdk.testutils.service.AwsIntegrationTestBase;
-
-public class UpdateItemIntegrationTest {
-
-    private static final long READ_CAPACITY = 1;
-    private static final long WRITE_CAPACITY = 1;
-    private static final Long FIRST_CUSTOMER_ID = 1000L;
-    private static final String ADDRESS_TYPE_HOME = "home";
-    private static final String ADDRESS_TYPE_WORK = "work";
-    private static DynamoDb dynamoDb;
-    private static String TABLE_NAME = "UpdateItemIntegrationTest";
-    private static String HASH_KEY = "customer_id";
-    private static String RANGE_KEY = "address_type";
-
-    @BeforeClass
-    public static void setUp() throws Exception {
-        DynamoDbClient client = DynamoDbClient.builder()
-                                              .credentialsProvider(AwsIntegrationTestBase.CREDENTIALS_PROVIDER_CHAIN)
-                                              .build();
-        dynamoDb = new DynamoDb(client);
-
-        createTable();
-        fillInData();
-    }
-
-    private static void createTable() throws Exception {
-        Table table = dynamoDb.getTable(TABLE_NAME);
-        TableDescription desc = table.waitForActiveOrDelete();
-        if (desc == null) {
-            // table doesn't exist; let's create it
-            KeySchemaElement hashKey =
-                    KeySchemaElement.builder().attributeName(HASH_KEY).keyType(KeyType.HASH).build();
-            KeySchemaElement rangeKey =
-                    KeySchemaElement.builder().attributeName(RANGE_KEY).keyType(KeyType.RANGE).build();
-            CreateTableRequest createTableRequest = CreateTableRequest.builder().
-                    tableName(TABLE_NAME)
-                    .keySchema(Arrays.asList(hashKey, rangeKey))
-                    .attributeDefinitions(
-                                    AttributeDefinition.builder().attributeName(HASH_KEY).attributeType(ScalarAttributeType.N).build(),
-                                    AttributeDefinition.builder().attributeName(RANGE_KEY).attributeType(ScalarAttributeType.S).build())
-                    .provisionedThroughput(
-                                    ProvisionedThroughput.builder().readCapacityUnits(READ_CAPACITY).writeCapacityUnits(WRITE_CAPACITY).build())
-                    .build();
-            table = dynamoDb.createTable(createTableRequest);
-            table.waitForActive();
-        }
-    }
-
-    private static void fillInData() {
-        Table table = dynamoDb.getTable(TABLE_NAME);
-        table.putItem(new Item().with(HASH_KEY, FIRST_CUSTOMER_ID)
-                                .with(RANGE_KEY, ADDRESS_TYPE_WORK)
-                                .with("AddressLine1", "1918 8th Aven")
-                                .with("city", "seattle")
-                                .with("state", "WA")
-                                .with("zipcode", 98104));
-        table.putItem(new Item().with(HASH_KEY, FIRST_CUSTOMER_ID)
-                                .with(RANGE_KEY, ADDRESS_TYPE_HOME)
-                                .with("AddressLine1", "15606 NE 40th ST")
-                                .with("city", "redmond")
-                                .with("state", "WA")
-                                .with("zipcode", 98052));
-    }
-
-    @AfterClass
-    public static void shutDown() throws Exception {
-        //        Table table = dynamoDB.getTable(TABLE_NAME);
-        //        table.delete();
-        dynamoDb.shutdown();
-    }
-
-    /**
-     * This test case tests the various methods in AttributeUpdate class. At
-     * each phase, retrieves the items and compares its values.
-     */
-    @Test
-    public void testAddingNewAttributeToExistingRow() {
-        final String phoneNumber1 = "123-456-7890";
-        final Set<String> phoneNumbers = new HashSet<String>();
-        phoneNumbers.add(phoneNumber1);
-
-        // Adds a new attribute to the row.
-        Table table = dynamoDb.getTable(TABLE_NAME);
-        table.updateItem(HASH_KEY, FIRST_CUSTOMER_ID, RANGE_KEY, ADDRESS_TYPE_WORK,
-                         new AttributeUpdate("phone").put(phoneNumbers));
-        Item item = table.getItem(new GetItemSpec()
-                                          .withPrimaryKey(HASH_KEY, FIRST_CUSTOMER_ID, RANGE_KEY, ADDRESS_TYPE_WORK)
-                                          .withConsistentRead(true)
-                                 );
-        Set<String> phoneNumbersRetrieved = item.getStringSet("phone");
-        assertEquals(phoneNumbers, phoneNumbersRetrieved);
-        assertTrue(phoneNumbersRetrieved.contains(phoneNumber1));
-        assertTrue(phoneNumbersRetrieved.size() == 1);
-
-        // Adds a new element to the attribute
-        final String phoneNumber2 = "987-654-3210";
-        table.updateItem(HASH_KEY, FIRST_CUSTOMER_ID, RANGE_KEY, ADDRESS_TYPE_WORK,
-                         new AttributeUpdate("phone").addElements(phoneNumber2));
-        item = table.getItem(new GetItemSpec()
-                                     .withPrimaryKey(HASH_KEY, FIRST_CUSTOMER_ID, RANGE_KEY, ADDRESS_TYPE_WORK)
-                                     .withConsistentRead(true));
-        phoneNumbersRetrieved = item.getStringSet("phone");
-        assertTrue(phoneNumbersRetrieved.contains(phoneNumber2));
-        assertTrue(phoneNumbersRetrieved.contains(phoneNumber1));
-        assertTrue(phoneNumbersRetrieved.size() == 2);
-
-        // removes an element from the attribute
-        table.updateItem(HASH_KEY, FIRST_CUSTOMER_ID, RANGE_KEY, ADDRESS_TYPE_WORK,
-                         new AttributeUpdate("phone").removeElements(phoneNumber2));
-        item = table.getItem(new GetItemSpec()
-                                     .withPrimaryKey(HASH_KEY, FIRST_CUSTOMER_ID, RANGE_KEY, ADDRESS_TYPE_WORK)
-                                     .withConsistentRead(true));
-        phoneNumbersRetrieved = item.getStringSet("phone");
-        assertFalse(phoneNumbersRetrieved.contains(phoneNumber2));
-        assertTrue(phoneNumbersRetrieved.contains(phoneNumber1));
-        assertTrue(phoneNumbersRetrieved.size() == 1);
-
-        // deletes the attribute
-        table.updateItem(HASH_KEY, FIRST_CUSTOMER_ID, RANGE_KEY, ADDRESS_TYPE_WORK, new AttributeUpdate("phone").delete());
-        item = table.getItem(new GetItemSpec()
-                                     .withPrimaryKey(HASH_KEY, FIRST_CUSTOMER_ID, RANGE_KEY, ADDRESS_TYPE_WORK)
-                                     .withConsistentRead(true));
-        phoneNumbersRetrieved = item.getStringSet("phone");
-        assertNull(phoneNumbersRetrieved);
-
-        final Number oldValue = item.getNumber("zipcode");
-
-        // Increments the zip code attribute
-        table.updateItem(HASH_KEY, FIRST_CUSTOMER_ID, RANGE_KEY, ADDRESS_TYPE_WORK,
-                         new AttributeUpdate("zipcode").addNumeric(1));
-        item = table.getItem(new GetItemSpec()
-                                     .withPrimaryKey(HASH_KEY, FIRST_CUSTOMER_ID, RANGE_KEY, ADDRESS_TYPE_WORK)
-                                     .withConsistentRead(true));
-        Number newValue = item.getNumber("zipcode");
-        assertEquals(oldValue.longValue() + 1, newValue.longValue());
-
-        // Decrements the zip code attribute
-        table.updateItem(HASH_KEY, FIRST_CUSTOMER_ID, RANGE_KEY, ADDRESS_TYPE_WORK,
-                         new AttributeUpdate("zipcode").addNumeric(-1));
-        item = table.getItem(new GetItemSpec()
-                                     .withPrimaryKey(HASH_KEY, FIRST_CUSTOMER_ID, RANGE_KEY, ADDRESS_TYPE_WORK)
-                                     .withConsistentRead(true));
-        newValue = item.getNumber("zipcode");
-        assertEquals(oldValue.longValue(), newValue.longValue());
-    }
-
-    /**
-     * This test cases performs an update item with expected set. The update
-     * must fail as the expected condition is not met.
-     */
-    @Test
-    public void testUpdateItemWithExpectedSet() {
-        final String phoneNumber1 = "123-456-7890";
-        final String phoneNumber2 = "987-654-3210";
-        final Set<String> phoneNumbers = new HashSet<String>();
-        phoneNumbers.add(phoneNumber1);
-        Table table = dynamoDb.getTable(TABLE_NAME);
-        try {
-            table.updateItem(
-                    HASH_KEY, FIRST_CUSTOMER_ID,
-                    RANGE_KEY, ADDRESS_TYPE_WORK,
-                    Arrays.asList(new Expected("phone").eq(phoneNumbers)),
-                    new AttributeUpdate("phone").addElements(phoneNumber2));
-            fail("Update Should fail as the phone number attribute is not present in the row");
-        } catch (Exception e) {
-            assertTrue(e instanceof SdkServiceException);
-        }
-    }
-
-    /**
-     * Performs an update using the update expression. Asserts by retrieving the
-     * item and checking if the update values are present in the record.
-     */
-    @Test
-    public void testUpdateItemWithUpdateExpression() {
-        final String phoneNumber1 = "123-456-7890";
-        final String phoneNumber2 = "987-654-3210";
-        final Set<String> phoneNumbers = new HashSet<String>();
-        phoneNumbers.add(phoneNumber1);
-        phoneNumbers.add(phoneNumber2);
-        final String updateExpression = "set #phoneAttributeName = :phoneAtributeValue";
-
-        final Map<String, String> nameMap = new HashMap<String, String>();
-        nameMap.put("#phoneAttributeName", "phone");
-        final Map<String, Object> valueMap = new HashMap<String, Object>();
-        valueMap.put(":phoneAtributeValue", phoneNumbers);
-
-        Table table = dynamoDb.getTable(TABLE_NAME);
-        table.updateItem(
-                HASH_KEY, FIRST_CUSTOMER_ID,
-                RANGE_KEY, ADDRESS_TYPE_WORK,
-                updateExpression, nameMap, valueMap);
-        Item item = table.getItem(new GetItemSpec()
-                                          .withPrimaryKey(
-                                                  HASH_KEY, FIRST_CUSTOMER_ID,
-                                                  RANGE_KEY, ADDRESS_TYPE_WORK)
-                                          .withConsistentRead(true));
-        Set<String> phoneNumbersRetrieved = item.getStringSet("phone");
-        assertNotNull(phoneNumbersRetrieved);
-        assertTrue(phoneNumbersRetrieved.size() == 2);
-        assertTrue(phoneNumbersRetrieved.contains(phoneNumber1));
-        assertTrue(phoneNumbersRetrieved.contains(phoneNumber2));
-    }
-
-    /**
-     * Performs an update using the update and conditional expression. The
-     * update should fail as the conditional expression fails to true.
-     */
-    @Test
-    public void testUpdateItemWithConditionExpression() {
-        Table table = dynamoDb.getTable(TABLE_NAME);
-        try {
-            table.updateItem(
-                    HASH_KEY, FIRST_CUSTOMER_ID,
-                    RANGE_KEY, ADDRESS_TYPE_WORK,
-                    "set #mno = list_append(:phoneNumber, :phoneNumber)",
-                    "zipcode = :zipcode",
-                    new NameMap().with("#mno", "phone"),
-                    new ValueMap()
-                            .withList(":phoneNumber", "987-654-3210")
-                            // compare zipecode, which is of type int, to string
-                            // leading to an intentional failure in the update condition
-                            .withString(":zipcode", "98104")
-                            );
-            fail("Update Should fail as the zip code mentioned in the condition expression doesn't match");
-        } catch (SdkServiceException e) {
-            assertTrue(e.getMessage().contains("conditional request failed"));
-        }
-    }
-
-}
diff --git a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/Attribute.java b/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/Attribute.java
deleted file mode 100644
index 43c0678426ff..000000000000
--- a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/Attribute.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.document;
-
-import software.amazon.awssdk.services.dynamodb.document.internal.InternalUtils;
-
-/**
- * A key/value pair.
- */
-public class Attribute {
-    private final String name;
-    private final Object value;
-
-    public Attribute(String attrName, Object value) {
-        InternalUtils.checkInvalidAttrName(attrName);
-        this.name = attrName;
-        this.value = value;
-    }
-
-    public String name() {
-        return name;
-    }
-
-    public Object value() {
-        return value;
-    }
-
-    @Override
-    public String toString() {
-        return "{" + name + ": " + value + "}";
-    }
-
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int hashCode = 1;
-        // attribute name is never null as enforced in ctor
-        hashCode = prime * hashCode + name().hashCode();
-        hashCode = prime * hashCode
-                   + ((value() == null) ? 0 : value().hashCode());
-        return hashCode;
-    }
-
-    @Override
-    public boolean equals(Object in) {
-        if (in instanceof Attribute) {
-            Attribute that = (Attribute) in;
-            if (this.name.equals(that.name)) {
-                if (this.value == null) {
-                    return that.value == null;
-                } else {
-                    return this.value.equals(that.value);
-                }
-            }
-        }
-        return false;
-    }
-}
diff --git a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/AttributeTest.java b/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/AttributeTest.java
deleted file mode 100644
index 1de470ca0d02..000000000000
--- a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/AttributeTest.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.document;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import java.util.HashSet;
-import java.util.Set;
-import org.junit.Test;
-
-public class AttributeTest {
-
-    @Test(expected = IllegalArgumentException.class)
-    public void nullAttributeName() {
-        new Attribute(null, "invalid attribute name");
-    }
-
-    @Test
-    public void nullAttributeValue() {
-        Attribute a = new Attribute("null attribute value is fine", null);
-        assertTrue(a.hashCode() != 0);
-    }
-
-    @Test
-    public void testHashCode() {
-        Attribute a1 = new Attribute("name", null);
-        Attribute a2 = new Attribute("name", "a2");
-        Attribute a3 = new Attribute("name", "a3");
-        Attribute a4 = new Attribute("name4", "a3");
-        Set<Integer> checkUniqueness = new HashSet<Integer>();
-        checkUniqueness.add(a1.hashCode());
-        checkUniqueness.add(a2.hashCode());
-        checkUniqueness.add(a3.hashCode());
-        checkUniqueness.add(a4.hashCode());
-        assertTrue(checkUniqueness.size() == 4);
-    }
-
-    @Test
-    public void testEquals() {
-        Attribute a1 = new Attribute("name", null);
-        Attribute a2 = new Attribute("name", "a2");
-        Attribute a3 = new Attribute("name", "a3");
-        Attribute a4 = new Attribute("name4", "a3");
-        Set<Attribute> checkUniqueness = new HashSet<Attribute>();
-        checkUniqueness.add(a1);
-        checkUniqueness.add(a2);
-        checkUniqueness.add(a3);
-        checkUniqueness.add(a4);
-        assertTrue(checkUniqueness.size() == 4);
-
-        assertTrue(checkUniqueness.contains(new Attribute("name", null)));
-        assertTrue(checkUniqueness.contains(new Attribute("name", "a2")));
-        assertTrue(checkUniqueness.contains(new Attribute("name", "a3")));
-        assertTrue(checkUniqueness.contains(new Attribute("name4", "a3")));
-
-        assertFalse(checkUniqueness.contains(new Attribute("not", "exist")));
-        assertFalse(a1.equals("name"));
-        assertFalse(a1.equals(null));
-    }
-}
diff --git a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/AttributeUpdate.java b/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/AttributeUpdate.java
deleted file mode 100644
index b50afc0da81c..000000000000
--- a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/AttributeUpdate.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.document;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.LinkedHashSet;
-import java.util.Set;
-import software.amazon.awssdk.services.dynamodb.model.AttributeAction;
-
-/**
- * Used to update an attribute. Each instance of AttributeUpdate includes the
- * name, action and new value to be used for modifying the attribute.
- * <p>
- * Typical usages:
- * <blockquote>
- * <code>new AttributeUpdate("strAttr").put("attrValue");</code>
- * <p>
- * <code>new AttributeUpdate("intAttr").addNumeric(42);</code>
- * <p>
- * ...
- * </blockquote>
- * <p>
- * See http://docs.aws.amazon.com/amazondynamodb/latest/APIReference/
- * API_UpdateItem.html#DDB-UpdateItem-request-AttributeUpdates
- */
-public class AttributeUpdate {
-
-    private final String attributeName;
-
-    private AttributeAction action;
-
-    private Set<Object> attributeValues;
-
-    private Object value;
-
-    /**
-     * Used to update an attribute. Each instance of AttributeUpdate includes the
-     * name, action and new value to be used for modifying the attribute.
-     * <p>
-     * Typical usages:
-     * <blockquote>
-     * <code>new AttributeUpdate("strAttr").put("attrValue");</code>
-     * <p>
-     * <code>new AttributeUpdate("intAttr").addNumeric(42);</code>
-     * <p>
-     * ...
-     * </blockquote>
-     * <p>
-     * See http://docs.aws.amazon.com/amazondynamodb/latest/APIReference/
-     * API_UpdateItem.html#DDB-UpdateItem-request-AttributeUpdates
-     */
-    public AttributeUpdate(String attributeName) {
-        this.attributeName = attributeName;
-    }
-
-    /**
-     * Used to update an attribute. Each instance of AttributeUpdate includes the
-     * name, action and new value to be used for modifying the attribute.
-     * <p>
-     * Typical usages:
-     * <blockquote>
-     * <code>new AttributeUpdate("strAttr").put("attrValue");</code>
-     * <p>
-     * <code>new AttributeUpdate("intAttr").addNumeric(42);</code>
-     * <p>
-     * ...
-     * </blockquote>
-     * <p>
-     * See http://docs.aws.amazon.com/amazondynamodb/latest/APIReference/
-     * API_UpdateItem.html#DDB-UpdateItem-request-AttributeUpdates
-     */
-    public AttributeUpdate put(Object attributeValue) {
-        action = AttributeAction.PUT;
-        this.value = attributeValue;
-        return this;
-    }
-
-    public AttributeUpdate delete() {
-        action = AttributeAction.DELETE;
-        return this;
-    }
-
-    public AttributeUpdate removeElements(Object... elementsToBeRemoved) {
-        action = AttributeAction.DELETE;
-        this.attributeValues = Collections.unmodifiableSet(new LinkedHashSet<Object>(
-                Arrays.asList(elementsToBeRemoved)));
-        return this;
-    }
-
-    public AttributeUpdate addNumeric(Number value) {
-        action = AttributeAction.ADD;
-        this.value = value;
-        return this;
-    }
-
-    public AttributeUpdate addElements(Object... newElements) {
-        action = AttributeAction.ADD;
-        this.attributeValues = Collections.unmodifiableSet(new LinkedHashSet<Object>(
-                Arrays.asList(newElements)));
-        return this;
-    }
-
-    public String getAttributeName() {
-        return attributeName;
-    }
-
-    public AttributeAction getAction() {
-        return action;
-    }
-
-    public Set<Object> getAttributeValues() {
-        return attributeValues;
-    }
-
-    public Object value() {
-        return value;
-    }
-}
diff --git a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/BatchGetItemOutcome.java b/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/BatchGetItemOutcome.java
deleted file mode 100644
index 3e141fc9fb8d..000000000000
--- a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/BatchGetItemOutcome.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.document;
-
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import software.amazon.awssdk.services.dynamodb.document.api.BatchGetItemApi;
-import software.amazon.awssdk.services.dynamodb.document.internal.InternalUtils;
-import software.amazon.awssdk.services.dynamodb.document.spec.BatchGetItemSpec;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-import software.amazon.awssdk.services.dynamodb.model.BatchGetItemResponse;
-import software.amazon.awssdk.services.dynamodb.model.KeysAndAttributes;
-
-/**
- * The outcome of a batch get-item operation from DynamoDB.
- */
-public class BatchGetItemOutcome {
-    private final BatchGetItemResponse result;
-
-    /**
-     * @param result the low-level result; must not be null
-     */
-    public BatchGetItemOutcome(BatchGetItemResponse result) {
-        if (result == null) {
-            throw new IllegalArgumentException();
-        }
-        this.result = result;
-    }
-
-    /**
-     * Returns a map of table name to the list of retrieved items
-     */
-    public Map<String, List<Item>> getTableItems() {
-        Map<String, List<Map<String, AttributeValue>>> res =
-                result.responses();
-        Map<String, List<Item>> map = new LinkedHashMap<String, List<Item>>(res.size());
-        for (Map.Entry<String, List<Map<String, AttributeValue>>> e
-                : res.entrySet()) {
-            String tableName = e.getKey();
-            List<Map<String, AttributeValue>> items = e.getValue();
-            map.put(tableName, InternalUtils.toItemList(items));
-        }
-        return map;
-    }
-
-    /**
-     * Convenient method to return the low-level unprocessed keys.
-     *
-     * @see BatchGetItemApi#batchGetItemUnprocessed(Map)
-     * @see BatchGetItemApi#batchGetItemUnprocessed(software.amazon.awssdk.services.dynamodb.model.ReturnConsumedCapacity,
-     *      Map)
-     * @see BatchGetItemSpec#withUnprocessedKeys(Map)
-     */
-    public Map<String, KeysAndAttributes> getUnprocessedKeys() {
-        return result.unprocessedKeys();
-    }
-
-    /**
-     * Returns a non-null low-level result returned from the server side.
-     */
-    public BatchGetItemResponse batchGetItemResponse() {
-        return result;
-    }
-
-    @Override
-    public String toString() {
-        return String.valueOf(result);
-    }
-}
diff --git a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/BatchWriteItemOutcome.java b/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/BatchWriteItemOutcome.java
deleted file mode 100644
index 64749efaef06..000000000000
--- a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/BatchWriteItemOutcome.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.document;
-
-import java.util.List;
-import java.util.Map;
-import software.amazon.awssdk.services.dynamodb.document.api.BatchWriteItemApi;
-import software.amazon.awssdk.services.dynamodb.document.spec.BatchWriteItemSpec;
-import software.amazon.awssdk.services.dynamodb.model.BatchWriteItemResponse;
-import software.amazon.awssdk.services.dynamodb.model.WriteRequest;
-
-/**
- * The outcome of a batch write-item operation from DynamoDB.
- */
-public class BatchWriteItemOutcome {
-    private final BatchWriteItemResponse result;
-
-    /**
-     * @param result the low-level result; must not be null
-     */
-    public BatchWriteItemOutcome(BatchWriteItemResponse result) {
-        if (result == null) {
-            throw new IllegalArgumentException();
-        }
-        this.result = result;
-    }
-
-    /**
-     * Convenient method to return the low-level unprocessed items.
-     *
-     * @see BatchWriteItemApi#batchWriteItemUnprocessed(Map)
-     * @see BatchWriteItemSpec#withUnprocessedItems(Map)
-     */
-    public Map<String, List<WriteRequest>> getUnprocessedItems() {
-        return result.unprocessedItems();
-    }
-
-    /**
-     * Returns a non-null low-level result returned from the server side.
-     */
-    public BatchWriteItemResponse batchWriteItemResult() {
-        return result;
-    }
-
-    @Override
-    public String toString() {
-        return String.valueOf(result);
-    }
-}
diff --git a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/DeleteItemOutcome.java b/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/DeleteItemOutcome.java
deleted file mode 100644
index d726ee198238..000000000000
--- a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/DeleteItemOutcome.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.document;
-
-import java.util.Map;
-import software.amazon.awssdk.services.dynamodb.document.internal.InternalUtils;
-import software.amazon.awssdk.services.dynamodb.model.DeleteItemResponse;
-
-/**
- * The outcome of deleting an item from a DynamoDB table.
- */
-public class DeleteItemOutcome {
-    private final DeleteItemResponse result;
-
-    /**
-     * @param result the low-level result; must not be null
-     */
-    public DeleteItemOutcome(DeleteItemResponse result) {
-        if (result == null) {
-            throw new IllegalArgumentException();
-        }
-        this.result = result;
-    }
-
-    /**
-     * Returns all the returned attributes as a (non-null) {@link Item}.
-     */
-    public Item getItem() {
-        Map<String, Object> attributes =
-                InternalUtils.toSimpleMapValue(result.attributes());
-        Item item = Item.fromMap(attributes);
-        return item;
-    }
-
-    /**
-     * Returns a non-null low-level result returned from the server side.
-     */
-    public DeleteItemResponse getDeleteItemResponse() {
-        return result;
-    }
-
-    @Override
-    public String toString() {
-        return String.valueOf(result);
-    }
-}
diff --git a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/DynamoDb.java b/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/DynamoDb.java
deleted file mode 100644
index eae87598278e..000000000000
--- a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/DynamoDb.java
+++ /dev/null
@@ -1,196 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.document;
-
-import java.util.List;
-import java.util.Map;
-import software.amazon.awssdk.annotations.ThreadSafe;
-import software.amazon.awssdk.regions.Region;
-import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
-import software.amazon.awssdk.services.dynamodb.document.api.BatchGetItemApi;
-import software.amazon.awssdk.services.dynamodb.document.api.BatchWriteItemApi;
-import software.amazon.awssdk.services.dynamodb.document.api.ListTablesApi;
-import software.amazon.awssdk.services.dynamodb.document.internal.BatchGetItemImpl;
-import software.amazon.awssdk.services.dynamodb.document.internal.BatchWriteItemImpl;
-import software.amazon.awssdk.services.dynamodb.document.internal.ListTablesImpl;
-import software.amazon.awssdk.services.dynamodb.document.spec.BatchGetItemSpec;
-import software.amazon.awssdk.services.dynamodb.document.spec.BatchWriteItemSpec;
-import software.amazon.awssdk.services.dynamodb.document.spec.ListTablesSpec;
-import software.amazon.awssdk.services.dynamodb.model.AttributeDefinition;
-import software.amazon.awssdk.services.dynamodb.model.CreateTableRequest;
-import software.amazon.awssdk.services.dynamodb.model.CreateTableResponse;
-import software.amazon.awssdk.services.dynamodb.model.KeySchemaElement;
-import software.amazon.awssdk.services.dynamodb.model.KeysAndAttributes;
-import software.amazon.awssdk.services.dynamodb.model.ListTablesResponse;
-import software.amazon.awssdk.services.dynamodb.model.ProvisionedThroughput;
-import software.amazon.awssdk.services.dynamodb.model.ReturnConsumedCapacity;
-import software.amazon.awssdk.services.dynamodb.model.WriteRequest;
-
-/**
- * DynamoDB Document API. This class is the entry point to make use of this
- * library.
- */
-@ThreadSafe
-public class DynamoDb implements ListTablesApi, BatchGetItemApi,
-                                 BatchWriteItemApi {
-    private final DynamoDbClient client;
-
-    private final ListTablesImpl listTablesDelegate;
-    private final BatchGetItemImpl batchGetItemDelegate;
-    private final BatchWriteItemImpl batchWriteItemDelegate;
-
-    public DynamoDb(DynamoDbClient client) {
-        if (client == null) {
-            throw new IllegalArgumentException();
-        }
-        this.client = client;
-        this.listTablesDelegate = new ListTablesImpl(client);
-        this.batchGetItemDelegate = new BatchGetItemImpl(client);
-        this.batchWriteItemDelegate = new BatchWriteItemImpl(client);
-    }
-
-    /**
-     * Create a DynamoDB object that talks to the specified AWS region. The
-     * underlying service client will use all the default client configurations,
-     * including the default credentials provider chain. See
-     * {@link DynamoDbClient#DynamoDbClient()} for more information.
-     * <p>BatchWriteRetryStrategyTest
-     * If you need more control over the client configuration, use
-     * {@link DynamoDb#DynamoDb(DynamoDbClient)} instead.
-     *
-     * @param regionEnum
-     *            the AWS region enum
-     * @see DynamoDbClient#DynamoDbClient()
-     */
-    public DynamoDb(Region regionEnum) {
-        this(DynamoDbClient.builder().region(regionEnum).build());
-    }
-
-    /**
-     * Returns the specified DynamoDB table.  No network call is involved.
-     */
-    public Table getTable(String tableName) {
-        return new Table(client, tableName);
-    }
-
-    /**
-     * Creates the specified table in DynamoDB.
-     */
-    public Table createTable(CreateTableRequest req) {
-        CreateTableResponse result = client.createTable(req);
-        return new Table(client, req.tableName(),
-                         result.tableDescription());
-    }
-
-    /**
-     * Creates the specified table in DynamoDB.
-     */
-    public Table createTable(String tableName,
-                             List<KeySchemaElement> keySchema,
-                             List<AttributeDefinition> attributeDefinitions,
-                             ProvisionedThroughput provisionedThroughput) {
-        return createTable(CreateTableRequest.builder()
-                        .tableName(tableName)
-                        .keySchema(keySchema)
-                        .attributeDefinitions(attributeDefinitions)
-                        .provisionedThroughput(provisionedThroughput)
-                        .build());
-    }
-
-    @Override
-    public TableCollection<ListTablesResponse> listTables() {
-        return listTablesDelegate.listTables();
-    }
-
-    @Override
-    public TableCollection<ListTablesResponse> listTables(String exclusiveStartTableName) {
-        return listTablesDelegate.listTables(exclusiveStartTableName);
-    }
-
-    @Override
-    public TableCollection<ListTablesResponse> listTables(String exclusiveStartTableName,
-                                                        int maxResultSize) {
-        return listTablesDelegate.listTables(exclusiveStartTableName,
-                                             maxResultSize);
-    }
-
-    @Override
-    public TableCollection<ListTablesResponse> listTables(int maxResultSize) {
-        return listTablesDelegate.listTables(maxResultSize);
-    }
-
-    @Override
-    public TableCollection<ListTablesResponse> listTables(ListTablesSpec spec) {
-        return listTablesDelegate.listTables(spec);
-    }
-
-    @Override
-    public BatchGetItemOutcome batchGetItem(
-            ReturnConsumedCapacity returnConsumedCapacity,
-            TableKeysAndAttributes... tableKeysAndAttributes) {
-        return batchGetItemDelegate.batchGetItem(returnConsumedCapacity,
-                                                 tableKeysAndAttributes);
-    }
-
-    @Override
-    public BatchGetItemOutcome batchGetItem(
-            TableKeysAndAttributes... tableKeysAndAttributes) {
-        return batchGetItemDelegate.batchGetItem(tableKeysAndAttributes);
-    }
-
-    @Override
-    public BatchGetItemOutcome batchGetItem(BatchGetItemSpec spec) {
-        return batchGetItemDelegate.batchGetItem(spec);
-    }
-
-    @Override
-    public BatchGetItemOutcome batchGetItemUnprocessed(
-            ReturnConsumedCapacity returnConsumedCapacity,
-            Map<String, KeysAndAttributes> unprocessedKeys) {
-        return batchGetItemDelegate.batchGetItemUnprocessed(
-                returnConsumedCapacity, unprocessedKeys);
-    }
-
-    @Override
-    public BatchGetItemOutcome batchGetItemUnprocessed(
-            Map<String, KeysAndAttributes> unprocessedKeys) {
-        return batchGetItemDelegate.batchGetItemUnprocessed(unprocessedKeys);
-    }
-
-    @Override
-    public BatchWriteItemOutcome batchWriteItem(
-            TableWriteItems... tableWriteItems) {
-        return batchWriteItemDelegate.batchWriteItem(tableWriteItems);
-    }
-
-    @Override
-    public BatchWriteItemOutcome batchWriteItem(BatchWriteItemSpec spec) {
-        return batchWriteItemDelegate.batchWriteItem(spec);
-    }
-
-    @Override
-    public BatchWriteItemOutcome batchWriteItemUnprocessed(
-            Map<String, List<WriteRequest>> unprocessedItems) {
-        return batchWriteItemDelegate.batchWriteItemUnprocessed(unprocessedItems);
-    }
-
-    /**
-     * Shuts down and release all resources.
-     */
-    public void shutdown() throws Exception {
-        client.close();
-    }
-}
diff --git a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/Expected.java b/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/Expected.java
deleted file mode 100644
index f1d0e718c563..000000000000
--- a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/Expected.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.document;
-
-import software.amazon.awssdk.services.dynamodb.document.internal.InternalUtils;
-import software.amazon.awssdk.services.dynamodb.model.ComparisonOperator;
-
-
-/**
- * Represents a condition to be compared with an attribute value.
- * <p>
- * Typical usages:
- * <blockquote>
- * <code>new Expected("strAttr").eq("attrValue");</code>
- * <p>
- * <code>new Expected("intAttr").gt(42);</code>
- * <p>
- * ...
- * </blockquote>
- * <p>
- * See
- * http://docs.aws.amazon.com/amazondynamodb/latest/APIReference/
- * API_ExpectedAttributeValue.html.
- */
-public class Expected {
-    private final String attribute;
-    private ComparisonOperator op;
-    private Object[] values;
-
-    public Expected(String attrName) {
-        InternalUtils.checkInvalidAttrName(attrName);
-        this.attribute = attrName;
-    }
-
-    /** Returns the attribute. */
-    public String getAttribute() {
-        return attribute;
-    }
-
-    public ComparisonOperator getComparisonOperator() {
-        return op;
-    }
-
-    public Object[] values() {
-        return values == null ? null : values.clone();
-    }
-
-    private Expected values(Object... values) {
-        this.values = values.clone();
-        return this;
-    }
-
-    private Expected withComparisonOperator(ComparisonOperator op) {
-        this.op = op;
-        return this;
-    }
-
-    /**
-     * Creates and returns a condition of the range key being equal to the given
-     * value.
-     */
-    public Expected eq(Object val) {
-        return withComparisonOperator(ComparisonOperator.EQ).values(val);
-    }
-
-    public Expected ne(Object val) {
-        return withComparisonOperator(ComparisonOperator.NE).values(val);
-    }
-
-    /**
-     * Expects the attribute be an existing attribute.
-     */
-    public Expected exists() {
-        return withComparisonOperator(ComparisonOperator.NOT_NULL);
-    }
-
-    /**
-     * Expects the attribute be non-existing.
-     */
-    public Expected notExist() {
-        return withComparisonOperator(ComparisonOperator.NULL);
-    }
-
-    public Expected contains(Object val) {
-        return withComparisonOperator(ComparisonOperator.CONTAINS).values(val);
-    }
-
-    public Expected notContains(Object val) {
-        return withComparisonOperator(ComparisonOperator.NOT_CONTAINS).values(val);
-    }
-
-    /**
-     * Creates and returns a condition of the range key with a value that begins
-     * with the given value.
-     */
-    public Expected beginsWith(String val) {
-        return withComparisonOperator(ComparisonOperator.BEGINS_WITH).values(val);
-    }
-
-    public Expected in(Object... values) {
-        if (values == null || values.length == 0) {
-            throw new IllegalArgumentException("values must not be null or empty.");
-        }
-
-        return withComparisonOperator(ComparisonOperator.IN).values(values);
-    }
-
-    /**
-     * Creates and returns a condition of the range key that has a value between
-     * the given values.
-     */
-    public Expected between(Object low, Object hi) {
-        return withComparisonOperator(ComparisonOperator.BETWEEN).values(low, hi);
-    }
-
-    /**
-     * Creates and returns a condition of the range key being greater than or
-     * equal to the given value.
-     */
-    public Expected ge(Object val) {
-        return withComparisonOperator(ComparisonOperator.GE).values(val);
-    }
-
-    /**
-     * Creates and returns a condition of the range key being greater than the
-     * given value.
-     */
-    public Expected gt(Object val) {
-        return withComparisonOperator(ComparisonOperator.GT).values(val);
-    }
-
-    /**
-     * Creates and returns a condition of the range key being less than or equal
-     * to the given value.
-     */
-    public Expected le(Object val) {
-        return withComparisonOperator(ComparisonOperator.LE).values(val);
-    }
-
-    /**
-     * Creates and returns a condition of the range key being less than the
-     * given value.
-     */
-    public Expected lt(Object val) {
-        return withComparisonOperator(ComparisonOperator.LT).values(val);
-    }
-}
diff --git a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/ExpectedTest.java b/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/ExpectedTest.java
deleted file mode 100644
index 83e8625deea6..000000000000
--- a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/ExpectedTest.java
+++ /dev/null
@@ -1,309 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.document;
-
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Map.Entry;
-import org.junit.Assert;
-import org.junit.Test;
-import software.amazon.awssdk.core.util.SdkAutoConstructList;
-import software.amazon.awssdk.regions.Region;
-import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
-import software.amazon.awssdk.services.dynamodb.document.internal.InternalUtils;
-import software.amazon.awssdk.services.dynamodb.model.ComparisonOperator;
-import software.amazon.awssdk.services.dynamodb.model.ExpectedAttributeValue;
-
-public class ExpectedTest {
-
-    private static Entry<String, ExpectedAttributeValue> toExpectedAttributeValue(Expected expected) {
-        Map<String, ExpectedAttributeValue> map = InternalUtils
-                .toExpectedAttributeValueMap(Arrays.asList(expected));
-        Assert.assertEquals(1, map.size());
-
-        Iterator<Entry<String, ExpectedAttributeValue>> iter = map.entrySet().iterator();
-        return iter.next();
-    }
-
-    @Test
-    public void testExpected_EQ() {
-        Expected expected = new Expected("foo").eq("bar");
-        Entry<String, ExpectedAttributeValue> ddbExpected = toExpectedAttributeValue(expected);
-        String ddbExpected_attrName = ddbExpected.getKey();
-        ExpectedAttributeValue ddbExpected_value = ddbExpected.getValue();
-
-        Assert.assertEquals("foo", ddbExpected_attrName);
-        Assert.assertEquals(ComparisonOperator.EQ, ddbExpected_value.comparisonOperator());
-        Assert.assertEquals(1, ddbExpected_value.attributeValueList().size());
-        Assert.assertEquals("bar", ddbExpected_value.attributeValueList().get(0).s());
-        Assert.assertEquals(null, ddbExpected_value.value());
-        Assert.assertEquals(null, ddbExpected_value.exists());
-
-        expected = new Expected("foo").eq(null);
-        ddbExpected = toExpectedAttributeValue(expected);
-        ddbExpected_attrName = ddbExpected.getKey();
-        ddbExpected_value = ddbExpected.getValue();
-
-        Assert.assertEquals("foo", ddbExpected_attrName);
-        Assert.assertEquals(ComparisonOperator.EQ, ddbExpected_value.comparisonOperator());
-        Assert.assertEquals(1, ddbExpected_value.attributeValueList().size());
-        Assert.assertEquals(true, ddbExpected_value.attributeValueList().get(0).nul());
-        Assert.assertEquals(null, ddbExpected_value.value());
-        Assert.assertEquals(null, ddbExpected_value.exists());
-    }
-
-    @Test
-    public void testExpected_NE() {
-        Expected expected = new Expected("foo").ne("bar");
-        Entry<String, ExpectedAttributeValue> ddbExpected = toExpectedAttributeValue(expected);
-        String ddbExpected_attrName = ddbExpected.getKey();
-        ExpectedAttributeValue ddbExpected_value = ddbExpected.getValue();
-
-        Assert.assertEquals("foo", ddbExpected_attrName);
-        Assert.assertEquals(ComparisonOperator.NE, ddbExpected_value.comparisonOperator());
-        Assert.assertEquals(1, ddbExpected_value.attributeValueList().size());
-        Assert.assertEquals("bar", ddbExpected_value.attributeValueList().get(0).s());
-        Assert.assertEquals(null, ddbExpected_value.value());
-        Assert.assertEquals(null, ddbExpected_value.exists());
-    }
-
-    @Test
-    public void testExpected_EXISTS() {
-        Expected expected = new Expected("foo").exists();
-        Entry<String, ExpectedAttributeValue> ddbExpected = toExpectedAttributeValue(expected);
-        String ddbExpected_attrName = ddbExpected.getKey();
-        ExpectedAttributeValue ddbExpected_value = ddbExpected.getValue();
-
-        Assert.assertEquals("foo", ddbExpected_attrName);
-        Assert.assertEquals(ComparisonOperator.NOT_NULL, ddbExpected_value.comparisonOperator());
-        Assert.assertTrue(ddbExpected_value.attributeValueList() instanceof SdkAutoConstructList);
-        Assert.assertEquals(null, ddbExpected_value.value());
-        Assert.assertEquals(null, ddbExpected_value.exists());
-    }
-
-    @Test
-    public void testExpected_NOTEXISTS() {
-        Expected expected = new Expected("foo").notExist();
-        Entry<String, ExpectedAttributeValue> ddbExpected = toExpectedAttributeValue(expected);
-        String ddbExpected_attrName = ddbExpected.getKey();
-        ExpectedAttributeValue ddbExpected_value = ddbExpected.getValue();
-
-        Assert.assertEquals("foo", ddbExpected_attrName);
-        Assert.assertEquals(ComparisonOperator.NULL, ddbExpected_value.comparisonOperator());
-        Assert.assertTrue(ddbExpected_value.attributeValueList() instanceof SdkAutoConstructList);
-        Assert.assertEquals(null, ddbExpected_value.value());
-        Assert.assertEquals(null, ddbExpected_value.exists());
-    }
-
-    @Test
-    public void testExpected_CONTAINS() {
-        Expected expected = new Expected("foo").contains("bar");
-        Entry<String, ExpectedAttributeValue> ddbExpected = toExpectedAttributeValue(expected);
-        String ddbExpected_attrName = ddbExpected.getKey();
-        ExpectedAttributeValue ddbExpected_value = ddbExpected.getValue();
-
-        Assert.assertEquals("foo", ddbExpected_attrName);
-        Assert.assertEquals(ComparisonOperator.CONTAINS, ddbExpected_value.comparisonOperator());
-        Assert.assertEquals(1, ddbExpected_value.attributeValueList().size());
-        Assert.assertEquals("bar", ddbExpected_value.attributeValueList().get(0).s());
-        Assert.assertEquals(null, ddbExpected_value.value());
-        Assert.assertEquals(null, ddbExpected_value.exists());
-    }
-
-    @Test
-    public void testExpected_NOTCONTAINS() {
-        Expected expected = new Expected("foo").notContains("bar");
-        Entry<String, ExpectedAttributeValue> ddbExpected = toExpectedAttributeValue(expected);
-        String ddbExpected_attrName = ddbExpected.getKey();
-        ExpectedAttributeValue ddbExpected_value = ddbExpected.getValue();
-
-        Assert.assertEquals("foo", ddbExpected_attrName);
-        Assert.assertEquals(ComparisonOperator.NOT_CONTAINS, ddbExpected_value.comparisonOperator());
-        Assert.assertEquals(1, ddbExpected_value.attributeValueList().size());
-        Assert.assertEquals("bar", ddbExpected_value.attributeValueList().get(0).s());
-        Assert.assertEquals(null, ddbExpected_value.value());
-        Assert.assertEquals(null, ddbExpected_value.exists());
-    }
-
-    @Test
-    public void testExpected_BEGINSWITH() {
-        Expected expected = new Expected("foo").beginsWith("bar");
-        Entry<String, ExpectedAttributeValue> ddbExpected = toExpectedAttributeValue(expected);
-        String ddbExpected_attrName = ddbExpected.getKey();
-        ExpectedAttributeValue ddbExpected_value = ddbExpected.getValue();
-
-        Assert.assertEquals("foo", ddbExpected_attrName);
-        Assert.assertEquals(ComparisonOperator.BEGINS_WITH, ddbExpected_value.comparisonOperator());
-        Assert.assertEquals(1, ddbExpected_value.attributeValueList().size());
-        Assert.assertEquals("bar", ddbExpected_value.attributeValueList().get(0).s());
-        Assert.assertEquals(null, ddbExpected_value.value());
-        Assert.assertEquals(null, ddbExpected_value.exists());
-    }
-
-    @Test
-    public void testExpected_IN() {
-        // Single value
-        Expected expected = new Expected("foo").in("bar");
-        Entry<String, ExpectedAttributeValue> ddbExpected = toExpectedAttributeValue(expected);
-        String ddbExpected_attrName = ddbExpected.getKey();
-        ExpectedAttributeValue ddbExpected_value = ddbExpected.getValue();
-
-        Assert.assertEquals("foo", ddbExpected_attrName);
-        Assert.assertEquals(ComparisonOperator.IN, ddbExpected_value.comparisonOperator());
-        Assert.assertEquals(1, ddbExpected_value.attributeValueList().size());
-        Assert.assertEquals("bar", ddbExpected_value.attributeValueList().get(0).s());
-        Assert.assertEquals(null, ddbExpected_value.value());
-        Assert.assertEquals(null, ddbExpected_value.exists());
-
-        // Multi-value
-        expected = new Expected("foo").in("bar", "charlie", null);
-        ddbExpected = toExpectedAttributeValue(expected);
-        ddbExpected_attrName = ddbExpected.getKey();
-        ddbExpected_value = ddbExpected.getValue();
-
-        Assert.assertEquals("foo", ddbExpected_attrName);
-        Assert.assertEquals(3, ddbExpected_value.attributeValueList().size());
-        Assert.assertEquals("bar", ddbExpected_value.attributeValueList().get(0).s());
-        Assert.assertEquals("charlie", ddbExpected_value.attributeValueList().get(1).s());
-        Assert.assertEquals(true, ddbExpected_value.attributeValueList().get(2).nul());
-        Assert.assertEquals(ComparisonOperator.IN, ddbExpected_value.comparisonOperator());
-        Assert.assertEquals(null, ddbExpected_value.value());
-        Assert.assertEquals(null, ddbExpected_value.exists());
-
-        // Null values
-        try {
-            expected = new Expected("foo").in((Object[]) null);
-            Assert.fail();
-        } catch (IllegalArgumentException e) {
-            // Ignored or expected.
-        }
-
-        // Empty values
-        try {
-            expected = new Expected("foo").in();
-            Assert.fail();
-        } catch (IllegalArgumentException e) {
-            // Ignored or expected.
-        }
-    }
-
-    @Test
-    public void testExpected_BETWEEN() {
-        Expected expected = new Expected("foo").between(0, 100);
-        Entry<String, ExpectedAttributeValue> ddbExpected = toExpectedAttributeValue(expected);
-        String ddbExpected_attrName = ddbExpected.getKey();
-        ExpectedAttributeValue ddbExpected_value = ddbExpected.getValue();
-
-        Assert.assertEquals("foo", ddbExpected_attrName);
-        Assert.assertEquals(2, ddbExpected_value.attributeValueList().size());
-        Assert.assertEquals("0", ddbExpected_value.attributeValueList().get(0).n());
-        Assert.assertEquals("100", ddbExpected_value.attributeValueList().get(1).n());
-        Assert.assertEquals(ComparisonOperator.BETWEEN, ddbExpected_value.comparisonOperator());
-        Assert.assertEquals(null, ddbExpected_value.value());
-        Assert.assertEquals(null, ddbExpected_value.exists());
-    }
-
-    @Test
-    public void testExpected_GE() {
-        Expected expected = new Expected("foo").ge("bar");
-        Entry<String, ExpectedAttributeValue> ddbExpected = toExpectedAttributeValue(expected);
-        String ddbExpected_attrName = ddbExpected.getKey();
-        ExpectedAttributeValue ddbExpected_value = ddbExpected.getValue();
-
-        Assert.assertEquals("foo", ddbExpected_attrName);
-        Assert.assertEquals(ComparisonOperator.GE, ddbExpected_value.comparisonOperator());
-        Assert.assertEquals(1, ddbExpected_value.attributeValueList().size());
-        Assert.assertEquals("bar", ddbExpected_value.attributeValueList().get(0).s());
-        Assert.assertEquals(null, ddbExpected_value.value());
-        Assert.assertEquals(null, ddbExpected_value.exists());
-    }
-
-    @Test
-    public void testExpected_GT() {
-        Expected expected = new Expected("foo").gt("bar");
-        Entry<String, ExpectedAttributeValue> ddbExpected = toExpectedAttributeValue(expected);
-        String ddbExpected_attrName = ddbExpected.getKey();
-        ExpectedAttributeValue ddbExpected_value = ddbExpected.getValue();
-
-        Assert.assertEquals("foo", ddbExpected_attrName);
-        Assert.assertEquals(ComparisonOperator.GT, ddbExpected_value.comparisonOperator());
-        Assert.assertEquals(1, ddbExpected_value.attributeValueList().size());
-        Assert.assertEquals("bar", ddbExpected_value.attributeValueList().get(0).s());
-        Assert.assertEquals(null, ddbExpected_value.value());
-        Assert.assertEquals(null, ddbExpected_value.exists());
-    }
-
-    @Test
-    public void testExpected_LE() {
-        Expected expected = new Expected("foo").le("bar");
-        Entry<String, ExpectedAttributeValue> ddbExpected = toExpectedAttributeValue(expected);
-        String ddbExpected_attrName = ddbExpected.getKey();
-        ExpectedAttributeValue ddbExpected_value = ddbExpected.getValue();
-
-        Assert.assertEquals("foo", ddbExpected_attrName);
-        Assert.assertEquals(ComparisonOperator.LE, ddbExpected_value.comparisonOperator());
-        Assert.assertEquals(1, ddbExpected_value.attributeValueList().size());
-        Assert.assertEquals("bar", ddbExpected_value.attributeValueList().get(0).s());
-        Assert.assertEquals(null, ddbExpected_value.value());
-        Assert.assertEquals(null, ddbExpected_value.exists());
-    }
-
-    @Test
-    public void testExpected_LT() {
-        Expected expected = new Expected("foo").lt("bar");
-        Entry<String, ExpectedAttributeValue> ddbExpected = toExpectedAttributeValue(expected);
-        String ddbExpected_attrName = ddbExpected.getKey();
-        ExpectedAttributeValue ddbExpected_value = ddbExpected.getValue();
-
-        Assert.assertEquals("foo", ddbExpected_attrName);
-        Assert.assertEquals(ComparisonOperator.LT, ddbExpected_value.comparisonOperator());
-        Assert.assertEquals(1, ddbExpected_value.attributeValueList().size());
-        Assert.assertEquals("bar", ddbExpected_value.attributeValueList().get(0).s());
-        Assert.assertEquals(null, ddbExpected_value.value());
-        Assert.assertEquals(null, ddbExpected_value.exists());
-    }
-
-    @Test
-    public void testExpected_EmptyAttributeName() {
-        try {
-            new Expected(null);
-            Assert.fail();
-        } catch (IllegalArgumentException expected) {
-            // Ignored or expected.
-        }
-
-        try {
-            new Expected("");
-            Assert.fail();
-        } catch (IllegalArgumentException expected) {
-            // Ignored or expected.
-        }
-    }
-
-    @Test
-    public void testExpected_DuplicateAttribute() {
-        Table fakeTable = new Table(DynamoDbClient.builder().region(Region.US_WEST_2).build(), "fake-table");
-        try {
-            fakeTable.putItem(new Item(),
-                              new Expected("foo").eq("bar"),
-                              new Expected("foo").eq("charlie"));
-            Assert.fail();
-        } catch (IllegalArgumentException expected) {
-            // Ignored or expected.
-        }
-    }
-}
diff --git a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/FilterConditionTest.java b/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/FilterConditionTest.java
deleted file mode 100644
index 42f8c4e7a822..000000000000
--- a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/FilterConditionTest.java
+++ /dev/null
@@ -1,282 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.document;
-
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Map.Entry;
-import org.junit.Assert;
-import org.junit.Test;
-import software.amazon.awssdk.core.util.SdkAutoConstructList;
-import software.amazon.awssdk.regions.Region;
-import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
-import software.amazon.awssdk.services.dynamodb.document.internal.InternalUtils;
-import software.amazon.awssdk.services.dynamodb.model.ComparisonOperator;
-import software.amazon.awssdk.services.dynamodb.model.Condition;
-
-/**
- * Covers ScanFilter, which shares the same underlying implementation as QueryFilter.
- */
-public class FilterConditionTest {
-
-    private static Entry<String, Condition> toAttributeCondition(ScanFilter ScanFilter) {
-        Map<String, Condition> map = InternalUtils
-                .toAttributeConditionMap(Arrays.asList(ScanFilter));
-        Assert.assertEquals(1, map.size());
-
-        Iterator<Entry<String, Condition>> iter = map.entrySet().iterator();
-        return iter.next();
-    }
-
-    @Test
-    public void testScanFilter_EQ() {
-        ScanFilter ScanFilter = new ScanFilter("foo").eq("bar");
-        Entry<String, Condition> ddbscanFilter = toAttributeCondition(ScanFilter);
-        String ddbscanFilter_attrName = ddbscanFilter.getKey();
-        Condition ddbscanFilter_value = ddbscanFilter.getValue();
-
-        Assert.assertEquals("foo", ddbscanFilter_attrName);
-        Assert.assertEquals(ComparisonOperator.EQ, ddbscanFilter_value.comparisonOperator());
-        Assert.assertEquals(1, ddbscanFilter_value.attributeValueList().size());
-        Assert.assertEquals("bar", ddbscanFilter_value.attributeValueList().get(0).s());
-
-        ScanFilter = new ScanFilter("foo").eq(null);
-        ddbscanFilter = toAttributeCondition(ScanFilter);
-        ddbscanFilter_attrName = ddbscanFilter.getKey();
-        ddbscanFilter_value = ddbscanFilter.getValue();
-
-        Assert.assertEquals("foo", ddbscanFilter_attrName);
-        Assert.assertEquals(ComparisonOperator.EQ, ddbscanFilter_value.comparisonOperator());
-        Assert.assertEquals(1, ddbscanFilter_value.attributeValueList().size());
-        Assert.assertEquals(true, ddbscanFilter_value.attributeValueList().get(0).nul());
-    }
-
-    @Test
-    public void testScanFilter_NE() {
-        ScanFilter ScanFilter = new ScanFilter("foo").ne("bar");
-        Entry<String, Condition> ddbscanFilter = toAttributeCondition(ScanFilter);
-        String ddbscanFilter_attrName = ddbscanFilter.getKey();
-        Condition ddbscanFilter_value = ddbscanFilter.getValue();
-
-        Assert.assertEquals("foo", ddbscanFilter_attrName);
-        Assert.assertEquals(ComparisonOperator.NE, ddbscanFilter_value.comparisonOperator());
-        Assert.assertEquals(1, ddbscanFilter_value.attributeValueList().size());
-        Assert.assertEquals("bar", ddbscanFilter_value.attributeValueList().get(0).s());
-    }
-
-    @Test
-    public void testScanFilter_EXISTS() {
-        ScanFilter ScanFilter = new ScanFilter("foo").exists();
-        Entry<String, Condition> ddbscanFilter = toAttributeCondition(ScanFilter);
-        String ddbscanFilter_attrName = ddbscanFilter.getKey();
-        Condition ddbscanFilter_value = ddbscanFilter.getValue();
-
-        Assert.assertEquals("foo", ddbscanFilter_attrName);
-        Assert.assertEquals(ComparisonOperator.NOT_NULL, ddbscanFilter_value.comparisonOperator());
-        Assert.assertTrue(ddbscanFilter_value.attributeValueList() instanceof SdkAutoConstructList);
-    }
-
-    @Test
-    public void testScanFilter_NOTEXISTS() {
-        ScanFilter ScanFilter = new ScanFilter("foo").notExist();
-        Entry<String, Condition> ddbscanFilter = toAttributeCondition(ScanFilter);
-        String ddbscanFilter_attrName = ddbscanFilter.getKey();
-        Condition ddbscanFilter_value = ddbscanFilter.getValue();
-
-        Assert.assertEquals("foo", ddbscanFilter_attrName);
-        Assert.assertEquals(ComparisonOperator.NULL, ddbscanFilter_value.comparisonOperator());
-        Assert.assertTrue(ddbscanFilter_value.attributeValueList() instanceof SdkAutoConstructList);
-    }
-
-    @Test
-    public void testScanFilter_CONTAINS() {
-        ScanFilter ScanFilter = new ScanFilter("foo").contains("bar");
-        Entry<String, Condition> ddbscanFilter = toAttributeCondition(ScanFilter);
-        String ddbscanFilter_attrName = ddbscanFilter.getKey();
-        Condition ddbscanFilter_value = ddbscanFilter.getValue();
-
-        Assert.assertEquals("foo", ddbscanFilter_attrName);
-        Assert.assertEquals(ComparisonOperator.CONTAINS, ddbscanFilter_value.comparisonOperator());
-        Assert.assertEquals(1, ddbscanFilter_value.attributeValueList().size());
-        Assert.assertEquals("bar", ddbscanFilter_value.attributeValueList().get(0).s());
-    }
-
-    @Test
-    public void testScanFilter_NOTCONTAINS() {
-        ScanFilter ScanFilter = new ScanFilter("foo").notContains("bar");
-        Entry<String, Condition> ddbscanFilter = toAttributeCondition(ScanFilter);
-        String ddbscanFilter_attrName = ddbscanFilter.getKey();
-        Condition ddbscanFilter_value = ddbscanFilter.getValue();
-
-        Assert.assertEquals("foo", ddbscanFilter_attrName);
-        Assert.assertEquals(ComparisonOperator.NOT_CONTAINS, ddbscanFilter_value.comparisonOperator());
-        Assert.assertEquals(1, ddbscanFilter_value.attributeValueList().size());
-        Assert.assertEquals("bar", ddbscanFilter_value.attributeValueList().get(0).s());
-    }
-
-    @Test
-    public void testScanFilter_BEGINSWITH() {
-        ScanFilter ScanFilter = new ScanFilter("foo").beginsWith("bar");
-        Entry<String, Condition> ddbscanFilter = toAttributeCondition(ScanFilter);
-        String ddbscanFilter_attrName = ddbscanFilter.getKey();
-        Condition ddbscanFilter_value = ddbscanFilter.getValue();
-
-        Assert.assertEquals("foo", ddbscanFilter_attrName);
-        Assert.assertEquals(ComparisonOperator.BEGINS_WITH, ddbscanFilter_value.comparisonOperator());
-        Assert.assertEquals(1, ddbscanFilter_value.attributeValueList().size());
-        Assert.assertEquals("bar", ddbscanFilter_value.attributeValueList().get(0).s());
-    }
-
-    @Test
-    public void testScanFilter_IN() {
-        // Single value
-        ScanFilter ScanFilter = new ScanFilter("foo").in("bar");
-        Entry<String, Condition> ddbscanFilter = toAttributeCondition(ScanFilter);
-        String ddbscanFilter_attrName = ddbscanFilter.getKey();
-        Condition ddbscanFilter_value = ddbscanFilter.getValue();
-
-        Assert.assertEquals("foo", ddbscanFilter_attrName);
-        Assert.assertEquals(ComparisonOperator.IN, ddbscanFilter_value.comparisonOperator());
-        Assert.assertEquals(1, ddbscanFilter_value.attributeValueList().size());
-        Assert.assertEquals("bar", ddbscanFilter_value.attributeValueList().get(0).s());
-
-        // Multi-value
-        ScanFilter = new ScanFilter("foo").in("bar", "charlie", null);
-        ddbscanFilter = toAttributeCondition(ScanFilter);
-        ddbscanFilter_attrName = ddbscanFilter.getKey();
-        ddbscanFilter_value = ddbscanFilter.getValue();
-
-        Assert.assertEquals("foo", ddbscanFilter_attrName);
-        Assert.assertEquals(3, ddbscanFilter_value.attributeValueList().size());
-        Assert.assertEquals("bar", ddbscanFilter_value.attributeValueList().get(0).s());
-        Assert.assertEquals("charlie", ddbscanFilter_value.attributeValueList().get(1).s());
-        Assert.assertEquals(true, ddbscanFilter_value.attributeValueList().get(2).nul());
-        Assert.assertEquals(ComparisonOperator.IN, ddbscanFilter_value.comparisonOperator());
-
-        // Null values
-        try {
-            ScanFilter = new ScanFilter("foo").in((Object[]) null);
-            Assert.fail();
-        } catch (IllegalArgumentException e) {
-            // Ignored or expected.
-        }
-
-        // Empty values
-        try {
-            ScanFilter = new ScanFilter("foo").in();
-            Assert.fail();
-        } catch (IllegalArgumentException e) {
-            // Ignored or expected.
-        }
-    }
-
-    @Test
-    public void testScanFilter_BETWEEN() {
-        ScanFilter ScanFilter = new ScanFilter("foo").between(0, 100);
-        Entry<String, Condition> ddbscanFilter = toAttributeCondition(ScanFilter);
-        String ddbscanFilter_attrName = ddbscanFilter.getKey();
-        Condition ddbscanFilter_value = ddbscanFilter.getValue();
-
-        Assert.assertEquals("foo", ddbscanFilter_attrName);
-        Assert.assertEquals(2, ddbscanFilter_value.attributeValueList().size());
-        Assert.assertEquals("0", ddbscanFilter_value.attributeValueList().get(0).n());
-        Assert.assertEquals("100", ddbscanFilter_value.attributeValueList().get(1).n());
-        Assert.assertEquals(ComparisonOperator.BETWEEN, ddbscanFilter_value.comparisonOperator());
-    }
-
-    @Test
-    public void testScanFilter_GE() {
-        ScanFilter ScanFilter = new ScanFilter("foo").ge("bar");
-        Entry<String, Condition> ddbscanFilter = toAttributeCondition(ScanFilter);
-        String ddbscanFilter_attrName = ddbscanFilter.getKey();
-        Condition ddbscanFilter_value = ddbscanFilter.getValue();
-
-        Assert.assertEquals("foo", ddbscanFilter_attrName);
-        Assert.assertEquals(ComparisonOperator.GE, ddbscanFilter_value.comparisonOperator());
-        Assert.assertEquals(1, ddbscanFilter_value.attributeValueList().size());
-        Assert.assertEquals("bar", ddbscanFilter_value.attributeValueList().get(0).s());
-    }
-
-    @Test
-    public void testScanFilter_GT() {
-        ScanFilter ScanFilter = new ScanFilter("foo").gt("bar");
-        Entry<String, Condition> ddbscanFilter = toAttributeCondition(ScanFilter);
-        String ddbscanFilter_attrName = ddbscanFilter.getKey();
-        Condition ddbscanFilter_value = ddbscanFilter.getValue();
-
-        Assert.assertEquals("foo", ddbscanFilter_attrName);
-        Assert.assertEquals(ComparisonOperator.GT, ddbscanFilter_value.comparisonOperator());
-        Assert.assertEquals(1, ddbscanFilter_value.attributeValueList().size());
-        Assert.assertEquals("bar", ddbscanFilter_value.attributeValueList().get(0).s());
-    }
-
-    @Test
-    public void testScanFilter_LE() {
-        ScanFilter ScanFilter = new ScanFilter("foo").le("bar");
-        Entry<String, Condition> ddbscanFilter = toAttributeCondition(ScanFilter);
-        String ddbscanFilter_attrName = ddbscanFilter.getKey();
-        Condition ddbscanFilter_value = ddbscanFilter.getValue();
-
-        Assert.assertEquals("foo", ddbscanFilter_attrName);
-        Assert.assertEquals(ComparisonOperator.LE, ddbscanFilter_value.comparisonOperator());
-        Assert.assertEquals(1, ddbscanFilter_value.attributeValueList().size());
-        Assert.assertEquals("bar", ddbscanFilter_value.attributeValueList().get(0).s());
-    }
-
-    @Test
-    public void testScanFilter_LT() {
-        ScanFilter ScanFilter = new ScanFilter("foo").lt("bar");
-        Entry<String, Condition> ddbscanFilter = toAttributeCondition(ScanFilter);
-        String ddbscanFilter_attrName = ddbscanFilter.getKey();
-        Condition ddbscanFilter_value = ddbscanFilter.getValue();
-
-        Assert.assertEquals("foo", ddbscanFilter_attrName);
-        Assert.assertEquals(ComparisonOperator.LT, ddbscanFilter_value.comparisonOperator());
-        Assert.assertEquals(1, ddbscanFilter_value.attributeValueList().size());
-        Assert.assertEquals("bar", ddbscanFilter_value.attributeValueList().get(0).s());
-    }
-
-    @Test
-    public void testScanFilter_EmptyAttributeName() {
-        try {
-            new ScanFilter(null);
-            Assert.fail();
-        } catch (IllegalArgumentException ScanFilter) {
-            // Ignored or expected.
-        }
-
-        try {
-            new ScanFilter("");
-            Assert.fail();
-        } catch (IllegalArgumentException ScanFilter) {
-            // Ignored or expected.
-        }
-    }
-
-    @Test
-    public void testScanFilter_DuplicateAttribute() {
-        Table fakeTable = new Table(DynamoDbClient.builder().region(Region.US_WEST_2).build(), "fake-table");
-        try {
-            fakeTable.scan(
-                    new ScanFilter("foo").eq("bar"),
-                    new ScanFilter("foo").eq("charlie"));
-            Assert.fail();
-        } catch (IllegalArgumentException ScanFilter) {
-            // Ignored or expected.
-        }
-    }
-}
diff --git a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/GetItemOutcome.java b/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/GetItemOutcome.java
deleted file mode 100644
index 8f542961c5de..000000000000
--- a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/GetItemOutcome.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.document;
-
-import java.util.Map;
-import software.amazon.awssdk.services.dynamodb.document.internal.InternalUtils;
-import software.amazon.awssdk.services.dynamodb.model.GetItemResponse;
-
-/**
- * The outcome of getting an item from DynamoDB table.
- */
-public class GetItemOutcome {
-    private final GetItemResponse result;
-
-    /**
-     * @param result the low-level result; must not be null
-     */
-    public GetItemOutcome(GetItemResponse result) {
-        if (result == null) {
-            throw new IllegalArgumentException();
-        }
-        this.result = result;
-    }
-
-    /**
-     * Returns all the returned attributes as an {@link Item}; or null if the
-     * item doesn't exist.
-     */
-    public Item getItem() {
-        Map<String, Object> attributes =
-                InternalUtils.toSimpleMapValue(result.item());
-        Item item = Item.fromMap(attributes);
-        return item;
-    }
-
-    /**
-     * Returns a non-null low-level result returned from the server side.
-     */
-    public GetItemResponse getGetItemResponse() {
-        return result;
-    }
-
-    @Override
-    public String toString() {
-        return String.valueOf(result);
-    }
-}
diff --git a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/IncompatibleTypeException.java b/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/IncompatibleTypeException.java
deleted file mode 100644
index 3bb5918b3d55..000000000000
--- a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/IncompatibleTypeException.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.document;
-
-import software.amazon.awssdk.core.exception.SdkClientException;
-
-/**
- * Thrown upon incompatible type during data conversion.
- */
-public class IncompatibleTypeException extends SdkClientException {
-    private static final long serialVersionUID = 1L;
-
-    public IncompatibleTypeException(String message) {
-        super(SdkClientException.builder().message(message));
-    }
-}
diff --git a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/Index.java b/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/Index.java
deleted file mode 100644
index dee44e58f814..000000000000
--- a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/Index.java
+++ /dev/null
@@ -1,361 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.document;
-
-import java.util.List;
-import java.util.Map;
-import software.amazon.awssdk.annotations.ThreadSafe;
-import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
-import software.amazon.awssdk.services.dynamodb.document.api.QueryApi;
-import software.amazon.awssdk.services.dynamodb.document.api.ScanApi;
-import software.amazon.awssdk.services.dynamodb.document.internal.IndexQueryImpl;
-import software.amazon.awssdk.services.dynamodb.document.internal.IndexScanImpl;
-import software.amazon.awssdk.services.dynamodb.document.internal.ScanImpl;
-import software.amazon.awssdk.services.dynamodb.document.spec.QuerySpec;
-import software.amazon.awssdk.services.dynamodb.document.spec.ScanSpec;
-import software.amazon.awssdk.services.dynamodb.document.spec.UpdateTableSpec;
-import software.amazon.awssdk.services.dynamodb.model.DeleteGlobalSecondaryIndexAction;
-import software.amazon.awssdk.services.dynamodb.model.GlobalSecondaryIndexDescription;
-import software.amazon.awssdk.services.dynamodb.model.GlobalSecondaryIndexUpdate;
-import software.amazon.awssdk.services.dynamodb.model.IndexStatus;
-import software.amazon.awssdk.services.dynamodb.model.ProvisionedThroughput;
-import software.amazon.awssdk.services.dynamodb.model.ResourceNotFoundException;
-import software.amazon.awssdk.services.dynamodb.model.TableDescription;
-import software.amazon.awssdk.services.dynamodb.model.UpdateGlobalSecondaryIndexAction;
-
-/**
- * Represents a secondary index on a DynamoDB table. This covers
- * both GSI (Global Secondary Index) and LSI (Local Secondary Index). Instance
- * of this class can be obtained via {@link Table#getIndex(String)}.
- */
-@ThreadSafe
-public class Index implements QueryApi, ScanApi {
-    private static final long SLEEP_TIME_MILLIS = 5000;
-    private final Table table;
-    private final String indexName;
-    private final QueryApi queryDelegate;
-    private final ScanImpl scanDelegate;
-
-    Index(DynamoDbClient client, String indexName, Table table) {
-        if (client == null) {
-            throw new IllegalArgumentException("client must be specified");
-        }
-        if (indexName == null || indexName.trim().length() == 0) {
-            throw new IllegalArgumentException("index name must not be null or empty");
-        }
-        if (table == null) {
-            throw new IllegalArgumentException("table must be specified");
-        }
-        this.table = table;
-        this.indexName = indexName;
-        this.queryDelegate = new IndexQueryImpl(client, this);
-        this.scanDelegate = new IndexScanImpl(client, this);
-    }
-
-    /**
-     * Returns the owning table.
-     */
-    public final Table getTable() {
-        return table;
-    }
-
-    /**
-     * @return the name of this index
-     */
-    public final String getIndexName() {
-        return indexName;
-    }
-
-    @Override
-    public ItemCollection<QueryOutcome> query(KeyAttribute hashKey,
-                                              RangeKeyCondition rangeKeyCondition) {
-        return queryDelegate.query(hashKey, rangeKeyCondition);
-    }
-
-    @Override
-    public ItemCollection<QueryOutcome> query(KeyAttribute hashKey,
-                                              RangeKeyCondition rangeKeyCondition, QueryFilter... queryFilters) {
-        return queryDelegate.query(hashKey, rangeKeyCondition, queryFilters);
-    }
-
-    @Override
-    public ItemCollection<QueryOutcome> query(KeyAttribute hashKey,
-                                              RangeKeyCondition rangeKeyCondition, String filterExpression,
-                                              Map<String, String> nameMap, Map<String, Object> valueMap) {
-        return queryDelegate.query(hashKey, rangeKeyCondition,
-                                   filterExpression, nameMap, valueMap);
-    }
-
-    @Override
-    public ItemCollection<QueryOutcome> query(KeyAttribute hashKey,
-                                              RangeKeyCondition rangeKeyCondition, String projectionExpression,
-                                              String filterExpression, Map<String, String> nameMap,
-                                              Map<String, Object> valueMap) {
-        return queryDelegate.query(hashKey, rangeKeyCondition,
-                                   projectionExpression, filterExpression, nameMap, valueMap);
-    }
-
-    @Override
-    public ItemCollection<QueryOutcome> query(QuerySpec spec) {
-        return queryDelegate.query(spec);
-    }
-
-    @Override
-    public ItemCollection<QueryOutcome> query(
-            String hashKeyName, Object hashKeyValue) {
-        return queryDelegate.query(hashKeyName, hashKeyValue);
-    }
-
-    @Override
-    public ItemCollection<QueryOutcome> query(String hashKeyName,
-                                              Object hashKeyValue, RangeKeyCondition rangeKeyCondition) {
-        return queryDelegate.query(hashKeyName, hashKeyValue, rangeKeyCondition);
-    }
-
-    @Override
-    public ItemCollection<QueryOutcome> query(String hashKeyName,
-                                              Object hashKeyValue, RangeKeyCondition rangeKeyCondition,
-                                              QueryFilter... queryFilters) {
-        return queryDelegate.query(hashKeyName, hashKeyValue,
-                                   rangeKeyCondition, queryFilters);
-    }
-
-    @Override
-    public ItemCollection<QueryOutcome> query(String hashKeyName,
-                                              Object hashKeyValue, RangeKeyCondition rangeKeyCondition,
-                                              String filterExpression, Map<String, String> nameMap,
-                                              Map<String, Object> valueMap) {
-        return queryDelegate.query(hashKeyName, hashKeyValue,
-                                   rangeKeyCondition, filterExpression, nameMap, valueMap);
-    }
-
-    @Override
-    public ItemCollection<QueryOutcome> query(String hashKeyName,
-                                              Object hashKeyValue, RangeKeyCondition rangeKeyCondition,
-                                              String filterExpression, String projectionExpression,
-                                              Map<String, String> nameMap, Map<String, Object> valueMap) {
-        return queryDelegate.query(hashKeyName, hashKeyValue,
-                                   rangeKeyCondition, filterExpression, projectionExpression,
-                                   nameMap, valueMap);
-    }
-
-    @Override
-    public ItemCollection<QueryOutcome> query(KeyAttribute hashKey) {
-        return queryDelegate.query(hashKey);
-    }
-
-    /**
-     * Updates the provisioned throughput for this global secondary index (GSI).
-     * Setting the throughput for an index helps you manage performance and is
-     * part of the provisioned throughput feature of DynamoDB.
-     * <p>
-     * The provisioned throughput values can be upgraded or downgraded based on
-     * the maximums and minimums listed in the <a href=
-     * "http://docs.aws.amazon.com/amazondynamodb/latest/developerguide/Limits.html"
-     * > Limits </a> section in the Amazon DynamoDB Developer Guide.
-     * <p>
-     * This index must be a global secondary index and in the
-     * <code>ACTIVE</code> state for this operation to succeed. Updating a GSI
-     * is an asynchronous operation; while executing the operation, the index is
-     * in the <code>UPDATING</code> state. While the index is in the
-     * <code>UPDATING</code> state, the index still has the provisioned
-     * throughput from before the call. The new provisioned throughput setting
-     * is in effect only when the index returns to the <code>ACTIVE</code> state
-     * after the update is complete.
-     *
-     * @param provisionedThroughput
-     *            target provisioned throughput
-     *
-     * @return the updated table description returned from DynamoDB.
-     */
-    public TableDescription updateGsi(
-            ProvisionedThroughput provisionedThroughput) {
-        return table.updateTable(new UpdateTableSpec()
-                .withGlobalSecondaryIndexUpdates(GlobalSecondaryIndexUpdate.builder()
-                        .update(UpdateGlobalSecondaryIndexAction.builder()
-                                .indexName(indexName)
-                                .provisionedThroughput(provisionedThroughput).build())
-                        .build()));
-    }
-
-    /**
-     * Deletes this global secondary index (GSI) from the DynamoDB table.
-     * Involves network calls.
-     * <p>
-     * This index must be a global secondary index and in the
-     * <code>ACTIVE</code> state for this operation to succeed. Deleting a GSI
-     * is an asynchronous operation; while executing the operation, the index is
-     * in the <code>DELETING</code> state.
-     *
-     * @return the updated table description returned from DynamoDB.
-     */
-    public TableDescription deleteGsi() {
-        return table.updateTable(new UpdateTableSpec()
-                .withGlobalSecondaryIndexUpdates(
-                        GlobalSecondaryIndexUpdate.builder()
-                                .delete(DeleteGlobalSecondaryIndexAction.builder()
-                                        .indexName(indexName).build())
-                                .build()));
-    }
-
-    /**
-     * A convenient blocking call that can be used, typically during index
-     * creation, to wait for the index to become active by polling the table
-     * every 5 seconds.
-     * <p>
-     * Currently online index creation is only supported for Global Secondary
-     * Index (GSI). Calling this method on a Local Secondary Index (LSI) would
-     * result in <code>IllegalArgumentException</code>.
-     *
-     * @return the table description when the index has become active
-     *
-     * @throws IllegalArgumentException if the table is being deleted, or if
-     *     the GSI is not being created or updated, or if the GSI doesn't exist
-     * @throws ResourceNotFoundException if the table doesn't exist
-     */
-    public TableDescription waitForActive() throws InterruptedException {
-        final Table table = getTable();
-        final String tableName = table.getTableName();
-        final String indexName = getIndexName();
-        retry:
-        for (; ; ) {
-            TableDescription desc = table.waitForActive();
-            final List<GlobalSecondaryIndexDescription> list = desc.globalSecondaryIndexes();
-            if (list != null) {
-                for (GlobalSecondaryIndexDescription d : list) {
-                    if (d.indexName().equals(indexName)) {
-                        switch (d.indexStatus()) {
-                            case ACTIVE:
-                                return desc;
-                            case CREATING:
-                            case UPDATING:
-                                Thread.sleep(SLEEP_TIME_MILLIS);
-                                continue retry;
-                            default:
-                                throw new IllegalArgumentException(
-                                        "Global Secondary Index "
-                                        + indexName
-                                        + " is not being created or updated (with status="
-                                        + d.indexStatusAsString() + ")");
-                        }
-                    }
-                }
-            }
-            throw new IllegalArgumentException("Global Secondary Index "
-                                               + indexName + " does not exist in Table " + tableName + ")");
-        }
-    }
-
-    /**
-     * A convenient blocking call that can be used, typically during index
-     * deletion on an active table, to wait for the index to become deleted by
-     * polling the table every 5 seconds.
-     * <p>
-     * Currently online index deletion is only supported for Global Secondary
-     * Index (GSI). The behavior of calling this method on a Local Secondary
-     * Index (LSI) would result in returning the latest table description.
-     *
-     * @return the table description if this GSI has been deleted; or null if
-     *         the underlying table has been deleted.
-     *
-     * @throws IllegalArgumentException if the table is being deleted, or if the
-     *     GSI is not being deleted.
-     * @throws ResourceNotFoundException if the table doesn't exist
-     */
-    public TableDescription waitForDelete() throws InterruptedException {
-        final String indexName = getIndexName();
-        retry:
-        for (; ; ) {
-            final TableDescription desc = getTable().waitForActive();
-            List<GlobalSecondaryIndexDescription> list = desc.globalSecondaryIndexes();
-            if (list != null) {
-                for (GlobalSecondaryIndexDescription d : list) {
-                    if (d.indexName().equals(indexName)) {
-                        if (d.indexStatus() == IndexStatus.DELETING) {
-                            Thread.sleep(SLEEP_TIME_MILLIS);
-                            continue retry;
-                        }
-                        throw new IllegalArgumentException(
-                                "Global Secondary Index " + indexName
-                                + " is not being deleted (with status=" + d.indexStatusAsString() + ")");
-                    }
-                }
-            }
-            return desc;
-        }
-    }
-
-    /**
-     * A convenient blocking call that can be used to wait on an index until it
-     * has either become active or deleted (ie no longer exists) by polling the
-     * table every 5 seconds.
-     * <p>
-     * Currently online index creation/deletion is only supported for Global
-     * Secondary Index (GSI). The behavior of calling this method on a Local
-     * Secondary Index (LSI) would result in returning the latest table
-     * description.
-     *
-     * @return the table description when the index has become either active
-     *     or deleted
-     *
-     * @throws IllegalArgumentException if the table is being deleted
-     * @throws ResourceNotFoundException if the table doesn't exist
-     */
-    public TableDescription waitForActiveOrDelete() throws InterruptedException {
-        final Table table = getTable();
-        final String indexName = getIndexName();
-        retry:
-        for (; ; ) {
-            TableDescription desc = table.waitForActive();
-            List<GlobalSecondaryIndexDescription> list = desc.globalSecondaryIndexes();
-            if (list != null) {
-                for (GlobalSecondaryIndexDescription d : desc.globalSecondaryIndexes()) {
-                    if (d.indexName().equals(indexName)) {
-                        if (d.indexStatus() == IndexStatus.ACTIVE) {
-                            return desc;
-                        }
-                        Thread.sleep(SLEEP_TIME_MILLIS);
-                        continue retry;
-                    }
-                }
-            }
-            return desc;
-        }
-    }
-
-    @Override
-    public ItemCollection<ScanOutcome> scan(ScanFilter... scanFilters) {
-        return scanDelegate.scan(scanFilters);
-    }
-
-    @Override
-    public ItemCollection<ScanOutcome> scan(String filterExpression,
-                                            Map<String, String> nameMap, Map<String, Object> valueMap) {
-        return scanDelegate.scan(filterExpression, nameMap, valueMap);
-    }
-
-    @Override
-    public ItemCollection<ScanOutcome> scan(String filterExpression,
-                                            String projectionExpression, Map<String, String> nameMap,
-                                            Map<String, Object> valueMap) {
-        return scanDelegate.scan(filterExpression, projectionExpression, nameMap, valueMap);
-    }
-
-    @Override
-    public ItemCollection<ScanOutcome> scan(ScanSpec params) {
-        return scanDelegate.scan(params);
-    }
-}
diff --git a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/Item.java b/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/Item.java
deleted file mode 100644
index 5c135de56989..000000000000
--- a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/Item.java
+++ /dev/null
@@ -1,1445 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.document;
-
-import static java.util.Arrays.asList;
-import static software.amazon.awssdk.services.dynamodb.document.internal.InternalUtils.checkInvalidAttrName;
-import static software.amazon.awssdk.services.dynamodb.document.internal.InternalUtils.checkInvalidAttribute;
-import static software.amazon.awssdk.services.dynamodb.document.internal.InternalUtils.rejectNullInput;
-import static software.amazon.awssdk.services.dynamodb.document.internal.InternalUtils.rejectNullOrEmptyInput;
-import static software.amazon.awssdk.services.dynamodb.document.internal.InternalUtils.rejectNullValue;
-import static software.amazon.awssdk.services.dynamodb.document.internal.InternalUtils.valToString;
-import static software.amazon.awssdk.utils.BinaryUtils.copyAllBytesFrom;
-import static software.amazon.awssdk.utils.BinaryUtils.copyBytesFrom;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import software.amazon.awssdk.core.util.json.JacksonUtils;
-import software.amazon.awssdk.services.dynamodb.document.internal.InternalUtils;
-import software.amazon.awssdk.services.dynamodb.document.internal.ItemValueConformer;
-import software.amazon.awssdk.utils.BinaryUtils;
-
-/**
- * An <a href=
- * "http://docs.aws.amazon.com/amazondynamodb/latest/developerguide/WorkingWithItems.html"
- * >item</a> in DynamoDB. An item is a collection of attributes. Each attribute
- * has a name and a value. An attribute value can be one of the followings:
- * <ul>
- * <li>String</li>
- * <li>Set&lt;String></li>
- * <li>Number (including any subtypes and primitive types)</li>
- * <li>Set&lt;Number></li>
- * <li>byte[]</li>
- * <li>Set&lt;byte[]></li>
- * <li>ByteBuffer</li>
- * <li>Set&lt;ByteBuffer></li>
- * <li>Boolean or boolean</li>
- * <li>null</li>
- * <li>Map&lt;String,T>, where T can be any type on this list but must not
- * induce any circular reference</li>
- * <li>List&lt;T>, where T can be any type on this list but must not induce
- * any circular reference</li>
- * </ul>
- * For an <code>Item</code> to be successfully persisted in DynamoDB, at a
- * minimum the respective attributes for the primary key must be specified.
- */
-public class Item {
-    private static final String DUPLICATE_VALUES_FOUND_IN_INPUT = "Duplicate values found in input";
-    private static final ItemValueConformer VALUE_CONFORMER = new ItemValueConformer();
-    private final Map<String, Object> attributes = new LinkedHashMap<String, Object>();
-
-    /**
-     * Convenient factory method - instantiates an <code>Item</code> from the
-     * given map.
-     *
-     * @param attributes
-     *            simple Java types; not the DyanmoDB types
-     */
-    public static Item fromMap(Map<String, Object> attributes) {
-        if (attributes == null) {
-            return null;
-        }
-        Item item = new Item();
-        for (Map.Entry<String, Object> e : attributes.entrySet()) {
-            item.with(e.getKey(), e.getValue());
-        }
-        return item;
-    }
-
-    /**
-     * Convenient factory method - instantiates an <code>Item</code> from the
-     * given JSON string.
-     *
-     * @return an <code>Item</code> initialized from the given JSON document;
-     *     or null if the input is null.
-     */
-    public static Item fromJson(String json) {
-        if (json == null) {
-            return null;
-        }
-        @SuppressWarnings("unchecked")
-        Map<String, Object> map = (Map<String, Object>)
-                VALUE_CONFORMER.transform(JacksonUtils.fromJsonString(json, Map.class));
-        return fromMap(map);
-    }
-
-    /**
-     * Returns true if the specified attribute exists with a null value; false
-     * otherwise.
-     */
-    public boolean isNull(String attrName) {
-        return attributes.containsKey(attrName)
-                && attributes.get(attrName) == null;
-    }
-
-    /**
-     * Returns true if this item contains the specified attribute; false
-     * otherwise.
-     */
-    public boolean isPresent(String attrName) {
-        return attributes.containsKey(attrName);
-    }
-
-    /**
-     * Returns the value of the specified attribute in the current item as a
-     * string; or null if the attribute either doesn't exist or the attribute
-     * value is null.
-     *
-     * @see #isNull(String) #isNull(String) to check if the attribute value is
-     *      null.
-     * @see #isPresent(String) #isPresent(String) to check if the attribute
-     *      value is present.
-     */
-    public String getString(String attrName) {
-        Object val = attributes.get(attrName);
-        return valToString(val);
-    }
-
-    /**
-     * Sets the value of the specified attribute in the current item to the
-     * given string value.
-     */
-    public Item withString(String attrName, String val) {
-        checkInvalidAttribute(attrName, val);
-        attributes.put(attrName, val);
-        return this;
-    }
-
-    /**
-     * Returns the value of the specified attribute in the current item as a
-     * <code>BigDecimal</code>; or null if the attribute either doesn't exist or
-     * the attribute value is null.
-     *
-     * @see #isNull(String) #isNull(String) to check if the attribute value is
-     *      null.
-     * @see #isPresent(String) #isPresent(String) to check if the attribute
-     *      value is present.
-     *
-     * @throws NumberFormatException if the attribute value is not a valid
-     *         representation of a {@code BigDecimal}.
-     */
-    public BigDecimal getNumber(String attrName) {
-        Object val = attributes.get(attrName);
-        return toBigDecimal(val);
-    }
-
-    private BigDecimal toBigDecimal(Object val) {
-        if (val == null) {
-            return null;
-        }
-        return val instanceof BigDecimal
-                ? (BigDecimal) val
-                : new BigDecimal(val.toString())
-                ;
-    }
-
-    /**
-     * Returns the value of the specified attribute in the current item as an
-     * <code>BigInteger</code>; or null if the attribute doesn't exist.
-     *
-     * @see #isNull(String) #isNull(String) to check if the attribute value is
-     *      null.
-     * @see #isPresent(String) #isPresent(String) to check if the attribute
-     *      value is present.
-     *
-     * @throws NumberFormatException
-     *             if the attribute value is null or not a valid representation
-     *             of a {@code BigDecimal}.
-     */
-    public BigInteger getBigInteger(String attrName) {
-        BigDecimal bd = getNumber(attrName);
-        return bd == null ? null : bd.toBigInteger();
-    }
-
-    /**
-     * Returns the value of the specified attribute in the current item as a
-     * <code>short</code>.
-     *
-     * @see #isNull(String) #isNull(String) to check if the attribute value is
-     *      null.
-     * @see #isPresent(String) #isPresent(String) to check if the attribute
-     *      value is present.
-     *
-     * @throws NumberFormatException
-     *             if the attribute value is null or not a valid representation
-     *             of a {@code BigDecimal}.
-     */
-    public short getShort(String attrName) {
-        BigDecimal bd = getNumber(attrName);
-        if (bd == null) {
-            throw new NumberFormatException("value of " + attrName + " is null");
-        }
-        return bd.shortValue();
-    }
-
-    /**
-     * Returns the value of the specified attribute in the current item as an
-     * <code>int</code>.
-     *
-     * @see #isNull(String) #isNull(String) to check if the attribute value is
-     *      null.
-     * @see #isPresent(String) #isPresent(String) to check if the attribute
-     *      value is present.
-     *
-     * @throws NumberFormatException
-     *             if the attribute value is null or not a valid representation
-     *             of a {@code BigDecimal}.
-     */
-    public int getInt(String attrName) {
-        BigDecimal bd = getNumber(attrName);
-        if (bd == null) {
-            throw new NumberFormatException("value of " + attrName + " is null");
-        }
-        return bd.intValue();
-    }
-
-    /**
-     * Returns the value of the specified attribute in the current item as an
-     * <code>long</code>.
-     *
-     * @see #isNull(String) #isNull(String) to check if the attribute value is
-     *      null.
-     * @see #isPresent(String) #isPresent(String) to check if the attribute
-     *      value is present.
-     *
-     * @throws NumberFormatException
-     *             if the attribute value is null or not a valid representation
-     *             of a {@code BigDecimal}.
-     */
-    public long getLong(String attrName) {
-        BigDecimal bd = getNumber(attrName);
-        if (bd == null) {
-            throw new NumberFormatException("value of " + attrName + " is null");
-        }
-        return bd.longValue();
-    }
-
-    /**
-     * Returns the value of the specified attribute in the current item as a
-     * <code>float</code>.
-     *
-     * @see #isNull(String) #isNull(String) to check if the attribute value is
-     *      null.
-     * @see #isPresent(String) #isPresent(String) to check if the attribute
-     *      value is present.
-     *
-     * @throws NumberFormatException
-     *             if the attribute value is null or not a valid representation
-     *             of a {@code BigDecimal}.
-     */
-    public float getFloat(String attrName) {
-        BigDecimal bd = getNumber(attrName);
-        if (bd == null) {
-            throw new NumberFormatException("value of " + attrName + " is null");
-        }
-        return bd.floatValue();
-    }
-
-    /**
-     * Returns the value of the specified attribute in the current item as a
-     * <code>double</code>.
-     *
-     * @see #isNull(String) #isNull(String) to check if the attribute value is
-     *      null.
-     * @see #isPresent(String) #isPresent(String) to check if the attribute
-     *      value is present.
-     *
-     * @throws NumberFormatException
-     *             if the attribute value is null or not a valid representation
-     *             of a {@code BigDecimal}.
-     */
-    public double getDouble(String attrName) {
-        BigDecimal bd = getNumber(attrName);
-        if (bd == null) {
-            throw new NumberFormatException("value of " + attrName + " is null");
-        }
-        return bd.doubleValue();
-    }
-
-    /**
-     * Sets the value of the specified attribute in the current item to the
-     * given value.
-     */
-    public Item withNumber(String attrName, BigDecimal val) {
-        checkInvalidAttribute(attrName, val);
-        attributes.put(attrName, val);
-        return this;
-    }
-
-    /**
-     * Sets the value of the specified attribute in the current item to the
-     * given value.
-     */
-    public Item withNumber(String attrName, Number val) {
-        checkInvalidAttribute(attrName, val);
-        attributes.put(attrName, toBigDecimal(val));
-        return this;
-    }
-
-    /**
-     * Sets the value of the specified attribute in the current item to the
-     * given value.
-     */
-    public Item withInt(String attrName, int val) {
-        checkInvalidAttrName(attrName);
-        return withNumber(attrName, Integer.valueOf(val));
-    }
-
-    /**
-     * Sets the value of the specified attribute in the current item to the
-     * given value.
-     */
-    public Item withBigInteger(String attrName, BigInteger val) {
-        checkInvalidAttrName(attrName);
-        return withNumber(attrName, val);
-    }
-
-    /**
-     * Sets the value of the specified attribute in the current item to the
-     * given value.
-     */
-    public Item withShort(String attrName, short val) {
-        checkInvalidAttrName(attrName);
-        return withNumber(attrName, Short.valueOf(val));
-    }
-
-    /**
-     * Sets the value of the specified attribute in the current item to the
-     * given value.
-     */
-    public Item withFloat(String attrName, float val) {
-        checkInvalidAttrName(attrName);
-        return withNumber(attrName, Float.valueOf(val));
-    }
-
-    /**
-     * Sets the value of the specified attribute in the current item to the
-     * given value.
-     */
-    public Item withDouble(String attrName, double val) {
-        checkInvalidAttrName(attrName);
-        return withNumber(attrName, Double.valueOf(val));
-    }
-
-    /**
-     * Sets the value of the specified attribute in the current item to the
-     * given value.
-     */
-    public Item withLong(String attrName, long val) {
-        checkInvalidAttrName(attrName);
-        return withNumber(attrName, Long.valueOf(val));
-    }
-
-    /**
-     * Returns the value of the specified attribute in the current item as a
-     * byte array; or null if the attribute either doesn't exist or the
-     * attribute value is null.
-     *
-     * @throws UnsupportedOperationException
-     *             If the attribute value involves a byte buffer which is not
-     *             backed by an accessible array
-     *
-     * @throws IncompatibleTypeException
-     *             if the attribute value cannot be converted into a byte array
-     *
-     * @see #isNull(String) #isNull(String) to check if the attribute value is
-     *      null.
-     * @see #isPresent(String) #isPresent(String) to check if the attribute
-     *      value is present.
-     */
-    public byte[] getBinary(String attrName) {
-        Object val = attributes.get(attrName);
-        return toByteArray(val);
-    }
-
-    /**
-     * Returns the value of the specified attribute in the current item as a
-     * <code>ByteBuffer</code>; or null if the attribute either doesn't exist or
-     * the attribute value is null.
-     *
-     * @throws IncompatibleTypeException
-     *             if the attribute value cannot be converted into a byte array
-     *
-     * @see #isNull(String) #isNull(String) to check if the attribute value is
-     *      null.
-     * @see #isPresent(String) #isPresent(String) to check if the attribute
-     *      value is present.
-     */
-    public ByteBuffer getByteBuffer(String attrName) {
-        Object val = attributes.get(attrName);
-        return toByteBuffer(val);
-    }
-
-    /**
-     * This method is assumed to be only called from a getter method, but NOT
-     * from a setter method.
-     */
-    private byte[] toByteArray(Object val) {
-        if (val == null) {
-            return null;
-        }
-        if (val instanceof byte[]) {
-            return (byte[]) val;
-        }
-        if (val instanceof ByteBuffer) {
-            // Defensive code but execution should never get here. The internal
-            // representation of binary should always be
-            // byte[], not ByteBuffer. This allows Item to be converted into
-            // a JSON string via Jackson without causing trouble.
-            return copyAllBytesFrom((ByteBuffer) val);
-        }
-        throw new IncompatibleTypeException(val.getClass()
-                + " cannot be converted into a byte array");
-    }
-
-    private ByteBuffer toByteBuffer(Object val) {
-        if (val == null) {
-            return null;
-        }
-        if (val instanceof byte[]) {
-            return ByteBuffer.wrap((byte[]) val);
-        }
-        if (val instanceof ByteBuffer) {
-            // Defensive code but execution should never get here. The internal
-            // representation of binary should always be
-            // byte[], not ByteBuffer. This allows Item to be converted into
-            // a JSON string via Jackson without causing trouble.
-            return (ByteBuffer) val;
-        }
-        throw new IncompatibleTypeException(val.getClass()
-                + " cannot be converted into a ByteBuffer");
-    }
-
-    /**
-     * Sets the value of the specified attribute in the current item to the
-     * given value.
-     */
-    public Item withBinary(String attrName, byte[] val) {
-        checkInvalidAttribute(attrName, val);
-        attributes.put(attrName, val);
-        return this;
-    }
-
-    /**
-     * Sets the value of the specified attribute in the current item to the
-     * given value.
-     */
-    public Item withBinary(String attrName, ByteBuffer val) {
-        checkInvalidAttribute(attrName, val);
-        // convert ByteBuffer to bytes to keep Jackson happy
-        attributes.put(attrName, copyBytesFrom(val));
-        return this;
-    }
-
-    /**
-     * Returns the value of the specified attribute in the current item as a set
-     * of strings; or null if the attribute either doesn't exist or the
-     * attribute value is null.
-     *
-     * @throws IncompatibleTypeException
-     *             if the attribute value cannot be converted into a set of
-     *             strings because of duplicate elements
-     *
-     * @see #isNull(String) #isNull(String) to check if the attribute value is
-     *      null.
-     * @see #isPresent(String) #isPresent(String) to check if the attribute
-     *      value is present.
-     */
-    public Set<String> getStringSet(String attrName) {
-        Object val = attributes.get(attrName);
-        if (val == null) {
-            return null;
-        }
-        Set<String> stringSet = new LinkedHashSet<String>();
-        if (val instanceof Collection) {
-            Collection<?> col = (Collection<?>) val;
-            if (col.size() == 0) {
-                return stringSet;
-            }
-            for (Object element : col) {
-                String s = element == null ? null : valToString(element);
-                if (!stringSet.add(s)) {
-                    throw new IncompatibleTypeException(val.getClass() + " cannot be converted into a set of strings because " +
-                            "of duplicate elements");
-                }
-            }
-            return stringSet;
-        }
-        stringSet.add(valToString(val));
-        return stringSet;
-    }
-
-    /**
-     * Sets the value of the specified attribute in the current item to the
-     * given value.
-     */
-    public Item withStringSet(String attrName, Set<String> val) {
-        checkInvalidAttribute(attrName, val);
-        attributes.put(attrName, val);
-        return this;
-    }
-
-    /**
-     * Sets the value of the specified attribute in the current item to the
-     * given value.
-     */
-    public Item withStringSet(String attrName, String... val) {
-        checkInvalidAttribute(attrName, val);
-        Set<String> strSet = new LinkedHashSet<String>(asList(val));
-        if (strSet.size() != val.length) {
-            throw new IllegalArgumentException(DUPLICATE_VALUES_FOUND_IN_INPUT);
-        }
-        attributes.put(attrName, strSet);
-        return this;
-    }
-
-    /**
-     * Returns the value of the specified attribute in the current item as a set
-     * of BigDecimal's; or null if the attribute either doesn't exist or the
-     * attribute value is null.
-     *
-     * @throws NumberFormatException
-     *             if the attribute involves a value that is not a valid
-     *             representation of a {@code BigDecimal}.
-     *
-     * @throws IncompatibleTypeException
-     *             if the attribute value cannot be converted into a set of
-     *             <code>BigDecimal</code>'s because of duplicate elements
-     *
-     * @see #isNull(String) #isNull(String) to check if the attribute value is
-     *      null.
-     * @see #isPresent(String) #isPresent(String) to check if the attribute
-     *      value is present.
-     */
-    public Set<BigDecimal> getNumberSet(String attrName) {
-        Object val = attributes.get(attrName);
-        if (val == null) {
-            return null;
-        }
-        Set<BigDecimal> numSet = new LinkedHashSet<BigDecimal>();
-        if (val instanceof Collection) {
-            Collection<?> col = (Collection<?>) val;
-            if (col.size() == 0) {
-                return numSet;
-            }
-            for (Object element : col) {
-                BigDecimal bd = toBigDecimal(element);
-                if (!numSet.add(bd)) {
-                    throw new IncompatibleTypeException(val.getClass() + " cannot be converted into a set of BigDecimal's " +
-                            "because of duplicate elements");
-                }
-            }
-            return numSet;
-        } else if (val instanceof BigDecimal) {
-            numSet.add((BigDecimal) val);
-            return numSet;
-        } else {
-            numSet.add(new BigDecimal(val.toString()));
-            return numSet;
-        }
-    }
-
-    /**
-     * Sets the value of the specified attribute in the current item to the
-     * given value.
-     */
-    public Item withBigDecimalSet(String attrName, Set<BigDecimal> val) {
-        checkInvalidAttribute(attrName, val);
-        attributes.put(attrName, val);
-        return this;
-    }
-
-    /**
-     * Sets the value of the specified attribute in the current item to the
-     * given value.
-     */
-    public Item withBigDecimalSet(String attrName, BigDecimal... vals) {
-        checkInvalidAttribute(attrName, vals);
-        Set<BigDecimal> set = new LinkedHashSet<BigDecimal>(asList(vals));
-        if (set.size() != vals.length) {
-            throw new IllegalArgumentException(DUPLICATE_VALUES_FOUND_IN_INPUT);
-        }
-        attributes.put(attrName, set);
-        return this;
-    }
-
-    /**
-     * Sets the value of the specified attribute in the current item to the
-     * given value.
-     */
-    public Item withNumberSet(String attrName, Number... vals) {
-        checkInvalidAttribute(attrName, vals);
-        Set<BigDecimal> set = InternalUtils.toBigDecimalSet(vals);
-        if (set.size() != vals.length) {
-            throw new IllegalArgumentException(DUPLICATE_VALUES_FOUND_IN_INPUT);
-        }
-        return withBigDecimalSet(attrName, set);
-    }
-
-    /**
-     * Sets the value of the specified attribute in the current item to the
-     * given value.
-     */
-    public Item withNumberSet(String attrName, Set<Number> vals) {
-        checkInvalidAttribute(attrName, vals);
-        Set<BigDecimal> set = InternalUtils.toBigDecimalSet(vals);
-        if (set.size() != vals.size()) {
-            throw new IllegalArgumentException(DUPLICATE_VALUES_FOUND_IN_INPUT);
-        }
-        return withBigDecimalSet(attrName, set);
-    }
-
-    /**
-     * Returns the value of the specified attribute in the current item as a set
-     * of byte arrays; or null if the attribute either doesn't exist or the
-     * attribute value is null.
-     *
-     * @throws IncompatibleTypeException
-     *             if the attribute value cannot be converted into a set of byte
-     *             arrays
-     *
-     * @see #isNull(String) #isNull(String) to check if the attribute value is
-     *      null.
-     * @see #isPresent(String) #isPresent(String) to check if the attribute
-     *      value is present.
-     */
-    public Set<byte[]> getBinarySet(String attrName) {
-        Object val = attributes.get(attrName);
-        if (val == null) {
-            return null;
-        }
-        Set<byte[]> binarySet = new LinkedHashSet<byte[]>();
-        if (val instanceof Collection) {
-            Collection<?> col = (Collection<?>) val;
-            if (col.size() == 0) {
-                return binarySet;
-            }
-            for (Object element : col) {
-                byte[] ba = toByteArray(element);
-                if (!binarySet.add(ba)) {
-                    throw new IncompatibleTypeException(val.getClass() + " cannot be converted into a set of byte arrays " +
-                            "because of duplicate elements");
-                }
-            }
-            return binarySet;
-        } else if (val instanceof byte[]) {
-            binarySet.add((byte[]) val);
-            return binarySet;
-        } else if (val instanceof ByteBuffer) {
-            // Defensive code but execution should never get here. The internal
-            // representation of binary should always be
-            // byte[], not ByteBuffer. This allows Item to be converted into
-            // a JSON string via Jackson without causing trouble.
-            ByteBuffer bb = (ByteBuffer) val;
-            binarySet.add(copyAllBytesFrom(bb));
-            return binarySet;
-        }
-        throw new IncompatibleTypeException(val.getClass()
-                + " cannot be converted into a set of byte arrays");
-    }
-
-    /**
-     * Returns the value of the specified attribute in the current item as a set
-     * of <code>ByteBuffer</code>; or null if the attribute either doesn't exist
-     * or the attribute value is null.
-     *
-     * @throws IncompatibleTypeException
-     *             if the attribute value cannot be converted into a set of
-     *             <code>ByteBuffer</code>
-     *
-     * @see #isNull(String) #isNull(String) to check if the attribute value is
-     *      null.
-     * @see #isPresent(String) #isPresent(String) to check if the attribute
-     *      value is present.
-     */
-    public Set<ByteBuffer> getByteBufferSet(String attrName) {
-        Object val = attributes.get(attrName);
-        if (val == null) {
-            return null;
-        }
-        Set<ByteBuffer> binarySet = new LinkedHashSet<ByteBuffer>();
-        if (val instanceof Collection) {
-            Collection<?> col = (Collection<?>) val;
-            if (col.size() == 0) {
-                return binarySet;
-            }
-            for (Object element : col) {
-                ByteBuffer ba = toByteBuffer(element);
-                if (!binarySet.add(ba)) {
-                    throw new IncompatibleTypeException(val.getClass() + " cannot be converted into a set of ByteBuffer " +
-                            "because of duplicate elements");
-                }
-            }
-            return binarySet;
-        } else if (val instanceof ByteBuffer) {
-            // Defensive code but execution should never get here. The internal
-            // representation of binary should always be
-            // byte[], not ByteBuffer. This allows Item to be converted into
-            // a JSON string via Jackson without causing trouble.
-            binarySet.add((ByteBuffer) val);
-            return binarySet;
-        } else if (val instanceof byte[]) {
-            binarySet.add(ByteBuffer.wrap((byte[]) val));
-            return binarySet;
-        }
-        throw new IncompatibleTypeException(val.getClass()
-                + " cannot be converted into a set of ByteBuffer");
-    }
-
-    /**
-     * Sets the value of the specified attribute in the current item to the
-     * given value.
-     */
-    public Item withBinarySet(String attrName, Set<byte[]> val) {
-        checkInvalidAttribute(attrName, val);
-        attributes.put(attrName, val);
-        return this;
-    }
-
-    /**
-     * Sets the value of the specified attribute in the current item to the
-     * given value.
-     */
-    public Item withByteBufferSet(String attrName, Set<ByteBuffer> val) {
-        checkInvalidAttribute(attrName, val);
-        // convert ByteBuffer to bytes to keep Jackson happy
-        Set<byte[]> set = new LinkedHashSet<byte[]>(val.size());
-        for (ByteBuffer bb : val) {
-            set.add(copyBytesFrom(bb));
-        }
-        attributes.put(attrName, set);
-        return this;
-    }
-
-    /**
-     * Sets the value of the specified attribute in the current item to the
-     * given value.
-     */
-    public Item withBinarySet(String attrName, byte[]... vals) {
-        checkInvalidAttribute(attrName, vals);
-        Set<byte[]> set = new LinkedHashSet<byte[]>(asList(vals));
-        if (set.size() != vals.length) {
-            throw new IllegalArgumentException(DUPLICATE_VALUES_FOUND_IN_INPUT);
-        }
-        attributes.put(attrName, set);
-        return this;
-    }
-
-    /**
-     * Sets the value of the specified attribute in the current item to the
-     * given value.
-     */
-    public Item withBinarySet(String attrName, ByteBuffer... vals) {
-        checkInvalidAttribute(attrName, vals);
-        // convert ByteBuffer to bytes to keep Jackson happy
-        Set<byte[]> set = new LinkedHashSet<byte[]>(vals.length);
-        for (ByteBuffer bb : vals) {
-            set.add(copyBytesFrom(bb));
-        }
-        if (set.size() != vals.length) {
-            throw new IllegalArgumentException(DUPLICATE_VALUES_FOUND_IN_INPUT);
-        }
-        attributes.put(attrName, set);
-        return this;
-    }
-
-    /**
-     * Returns the value of the specified attribute in the current item as a set
-     * of <code>T</code>'s.; or null if the attribute either doesn't exist or
-     * the attribute value is null.
-     *
-     * @throws ClassCastException
-     *             if the attribute involves a value that cannot be casted to
-     *             <code>T</code>
-     *
-     * @see #isNull(String) #isNull(String) to check if the attribute value is
-     *      null.
-     * @see #isPresent(String) #isPresent(String) to check if the attribute
-     *      value is present.
-     */
-    public <T> List<T> getList(String attrName) {
-        Object val = attributes.get(attrName);
-        if (val == null) {
-            return null;
-        }
-        if (val instanceof List) {
-            @SuppressWarnings("unchecked")
-            List<T> ret = (List<T>) val;
-            return ret;
-        }
-        List<T> list = new ArrayList<T>();
-        if (val instanceof Collection) {
-            Collection<?> col = (Collection<?>) val;
-            for (Object element : col) {
-                @SuppressWarnings("unchecked")
-                T t = (T) element;
-                list.add(t);
-            }
-            return list;
-        }
-        @SuppressWarnings("unchecked")
-        T t = (T) val;
-        list.add(t);
-        return list;
-    }
-
-    /**
-     * Sets the value of the specified attribute in the current item to the
-     * given value.
-     */
-    public Item withList(String attrName, List<?> val) {
-        checkInvalidAttribute(attrName, val);
-        attributes.put(attrName, VALUE_CONFORMER.transform(val));
-        return this;
-    }
-
-    /**
-     * Sets the value of the specified attribute in the current item to the
-     * given values as a list.
-     */
-    public Item withList(String attrName, Object... vals) {
-        checkInvalidAttribute(attrName, vals);
-        List<Object> listIn = asList(vals);
-        attributes.put(attrName, VALUE_CONFORMER.transform(listIn));
-        return this;
-    }
-
-    /**
-     * Returns the value of the specified attribute in the current item as a map
-     * of string-to-<code>T</code>'s; or null if the attribute either doesn't
-     * exist or the attribute value is null. Note that any numeric type of a
-     * map is always canonicalized into <code>BigDecimal</code>, and therefore
-     * if <code>T</code> referred to a <code>Number</code> type, it would need
-     * to be <code>BigDecimal</code> to avoid a class cast exception.
-     *
-     * @see #isNull(String) #isNull(String) to check if the attribute value is
-     *      null.
-     * @see #isPresent(String) #isPresent(String) to check if the attribute
-     *      value is present.
-     *
-     * @throws ClassCastException
-     *             if the attribute is not a map of string to <code>T</code>
-     */
-    @SuppressWarnings("unchecked")
-    public <T> Map<String, T> getMap(String attrName) {
-        return (Map<String, T>) attributes.get(attrName);
-    }
-
-    /**
-     * Convenient method to return the specified attribute in the current item
-     * as a (copy of) map of string-to-<code>T</code>'s where T must be a
-     * subclass of <code>Number</code>; or null if the attribute doesn't
-     * exist.
-     *
-     * @param attrName
-     *            the attribute name
-     * @param valueType
-     *            the specific number type of the value to be returned.
-     *            Currently, only<ul>
-     *            <li><code>Short</code></li>
-     *            <li><code>Integer</code></li>
-     *            <li><code>Long</code></li>
-     *            <li><code>Float</code></li>
-     *            <li><code>Double</code></li>
-     *            <li><code>Number</code></li>
-     *            <li><code>BigDecimal</code></li>
-     *            <li><code>BigInteger</code></li>
-     *            </ul>are supported.
-     *
-     * @throws UnsupportedOperationException
-     *             if the value type is not supported
-     * @throws ClassCastException
-     *             if the attribute is not a map of string to numbers
-     */
-    @SuppressWarnings("unchecked")
-    public <T extends Number> Map<String, T> getMapOfNumbers(String attrName,
-                                                             Class<T> valueType) {
-        if (valueType == Short.class
-                || valueType == Integer.class
-                || valueType == Long.class
-                || valueType == Float.class
-                || valueType == Double.class
-                || valueType == Number.class
-                || valueType == BigDecimal.class
-                || valueType == BigInteger.class) {
-            final Map<String, BigDecimal> src =
-                    (Map<String, BigDecimal>) attributes.get(attrName);
-            if (src == null) {
-                return null;
-            }
-            final Map<String, T> dst = new LinkedHashMap<String, T>(src.size());
-            for (Map.Entry<String, BigDecimal> e : src.entrySet()) {
-                final String key = e.getKey();
-                final BigDecimal val = e.getValue();
-                if (val == null) {
-                    dst.put(key, null);
-                } else if (valueType == Short.class) {
-                    dst.put(key, (T) Short.valueOf(val.shortValue()));
-                } else if (valueType == Integer.class) {
-                    dst.put(key, (T) Integer.valueOf(val.intValue()));
-                } else if (valueType == Long.class) {
-                    dst.put(key, (T) Long.valueOf(val.longValue()));
-                } else if (valueType == Float.class) {
-                    dst.put(key, (T) Float.valueOf(val.floatValue()));
-                } else if (valueType == Double.class) {
-                    dst.put(key, (T) Double.valueOf(val.doubleValue()));
-                } else if (valueType == BigDecimal.class || valueType == Number.class) {
-                    dst.put(key, (T) val);
-                } else if (valueType == BigInteger.class) {
-                    dst.put(key, (T) val.toBigInteger());
-                }
-            }
-            return dst;
-        } else {
-            throw new UnsupportedOperationException("Value type " + valueType
-                    + " is not currently supported");
-        }
-    }
-
-    /**
-     * Convenient method to return the value of the specified attribute in the
-     * current item as a map of string-to-<code>Object</code>'s; or null if the
-     * attribute either doesn't exist or the attribute value is null. Note that
-     * any numeric type of the map will be returned as <code>BigDecimal</code>.
-     *
-     * @see #isNull(String) #isNull(String) to check if the attribute value is
-     *      null.
-     * @see #isPresent(String) #isPresent(String) to check if the attribute
-     *      value is present.
-     *
-     * @throws ClassCastException if the attribute is not a map
-     */
-    @SuppressWarnings("unchecked")
-    public Map<String, Object> getRawMap(String attrName) {
-        return (Map<String, Object>) attributes.get(attrName);
-    }
-
-    /**
-     * Sets the value of the specified attribute in the current item to the
-     * given value.
-     */
-    public Item withMap(String attrName, Map<String, ?> val) {
-        checkInvalidAttribute(attrName, val);
-        attributes.put(attrName, VALUE_CONFORMER.transform(val));
-        return this;
-    }
-
-    /**
-     * Sets the value of the specified attribute in the current item to the
-     * given JSON document in the form of a string.
-     */
-    public Item withJson(String attrName, String json) {
-        checkInvalidAttribute(attrName, json);
-        attributes.put(attrName,
-                VALUE_CONFORMER.transform(JacksonUtils.fromJsonString(json, Object.class)));
-        return this;
-    }
-
-    /**
-     * Returns the value of the specified attribute in the current item as a
-     * JSON string; or null if the attribute either doesn't
-     * exist or the attribute value is null.
-     *
-     * @see #isNull(String) #isNull(String) to check if the attribute value is
-     *      null.
-     * @see #isPresent(String) #isPresent(String) to check if the attribute
-     *      value is present.
-     */
-    public String getJson(String attrName) {
-        checkInvalidAttrName(attrName);
-        Object val = attributes.get(attrName);
-        return val == null ? null : JacksonUtils.toJsonString(val);
-    }
-
-    /**
-     * Returns the value of the specified attribute in the current item as a
-     * JSON string with pretty indentation; or null if the attribute either
-     * doesn't exist or the attribute value is null.
-     *
-     * @see #isNull(String) #isNull(String) to check if the attribute value is
-     *      null.
-     * @see #isPresent(String) #isPresent(String) to check if the attribute
-     *      value is present.
-     */
-    public String getJsonPretty(String attrName) {
-        checkInvalidAttrName(attrName);
-        Object val = attributes.get(attrName);
-        return val == null ? null : JacksonUtils.toJsonPrettyString(val);
-    }
-
-    /**
-     * Returns the value of the specified attribute in the current item as a
-     * non-null Boolean.
-     *
-     * @throws IncompatibleTypeException
-     *             if either the attribute doesn't exist or if the attribute
-     *             value cannot be converted into a non-null Boolean value
-     *
-     * @see #isNull(String) #isNull(String) to check if the attribute value is
-     *      null.
-     * @see #isPresent(String) #isPresent(String) to check if the attribute
-     *      value is present.
-     */
-    public Boolean getBool(String attrName) {
-        final Object val = attributes.get(attrName);
-        if (val instanceof Boolean) {
-            return (Boolean) val;
-        }
-        if (val instanceof String) {
-            if ("1".equals(val)) {
-                return true;
-            }
-            if ("0".equals(val)) {
-                return false;
-            }
-            return Boolean.valueOf((String) val);
-        }
-        throw new IncompatibleTypeException("Value of attribute " + attrName
-                + " of type " + getTypeOf(attrName)
-                + " cannot be converted into a boolean value");
-    }
-
-    /**
-     * Returns the value of the specified attribute in the current item as a
-     * primitive boolean.
-     *
-     * @throws IncompatibleTypeException
-     *             if either the attribute doesn't exist or if the attribute
-     *             value cannot be converted into a boolean value
-     */
-    public boolean getBoolean(String attrName) {
-        final Boolean b = getBool(attrName);
-        return b.booleanValue();
-    }
-
-    /**
-     * Sets the value of the specified attribute in the current item to the
-     * boolean value.
-     */
-    public Item withBoolean(String attrName, boolean val) {
-        checkInvalidAttrName(attrName);
-        attributes.put(attrName, Boolean.valueOf(val));
-        return this;
-    }
-
-    /**
-     * Sets the value of the specified attribute to null.
-     */
-    public Item withNull(String attrName) {
-        checkInvalidAttrName(attrName);
-        attributes.put(attrName, null);
-        return this;
-    }
-
-    /**
-     * Sets the value of the specified attribute to the given value. An
-     * attribute value can be a
-     * <ul>
-     * <li>Number</li>
-     * <li>String</li>
-     * <li>binary (ie byte array or byte buffer)</li>
-     * <li>boolean</li>
-     * <li>null</li>
-     * <li>list (of any of the types on this list)</li>
-     * <li>map (with string key to value of any of the types on this list)</li>
-     * <li>set (of any of the types on this list)</li>
-     * </ul>
-     */
-    public Item with(String attrName, Object val) {
-        if (val == null) {
-            return withNull(attrName);
-        }
-        if (val instanceof String) {
-            return withString(attrName, (String) val);
-        }
-        if (val instanceof Number) {
-            return withNumber(attrName, (Number) val);
-        }
-        if (val instanceof byte[]) {
-            return withBinary(attrName, (byte[]) val);
-        }
-        if (val instanceof ByteBuffer) {
-            return withBinary(attrName, (ByteBuffer) val);
-        }
-        if (val instanceof Boolean) {
-            return withBoolean(attrName, (Boolean) val);
-        }
-        if (val instanceof List) {
-            return withList(attrName, (List<?>) val);
-        }
-        if (val instanceof Map) {
-            @SuppressWarnings("unchecked")
-            Map<String, ?> map = (Map<String, ?>) val;
-            return withMap(attrName, map);
-        }
-        if (val instanceof Set) {
-            Set<?> set = (Set<?>) val;
-            // Treat an empty set as a set of String
-            if (set.size() == 0) {
-                @SuppressWarnings("unchecked")
-                Set<String> ss = (Set<String>) val;
-                return withStringSet(attrName, ss);
-            }
-            // Try to locate the first non-null element and use that as the
-            // representative type
-            Object representative = null;
-            for (Object o : set) {
-                if (o != null) {
-                    representative = o;
-                }
-            }
-            // If all elements are null, treat the element type as String
-            if (representative == null || representative instanceof String) {
-                @SuppressWarnings("unchecked")
-                Set<String> ss = (Set<String>) val;
-                return withStringSet(attrName, ss);
-            }
-            if (representative instanceof Number) {
-                @SuppressWarnings("unchecked")
-                Set<Number> ns = (Set<Number>) val;
-                return withNumberSet(attrName, ns);
-            }
-            if (representative instanceof byte[]) {
-                @SuppressWarnings("unchecked")
-                Set<byte[]> bs = (Set<byte[]>) val;
-                return withBinarySet(attrName, bs);
-            }
-            if (representative instanceof ByteBuffer) {
-                @SuppressWarnings("unchecked")
-                Set<ByteBuffer> bs = (Set<ByteBuffer>) val;
-                return withByteBufferSet(attrName, bs);
-            }
-            throw new UnsupportedOperationException("Set of "
-                    + representative.getClass() + " is not currently supported");
-        }
-        throw new UnsupportedOperationException("Input type "
-                + val.getClass() + " is not currently supported");
-    }
-
-    /**
-     * Convenient methods - sets the attributes of this item from the given
-     * key attributes.
-     */
-    public Item withPrimaryKey(PrimaryKey primaryKey) {
-        rejectNullValue(primaryKey);
-        if (primaryKey.getComponents().size() == 0) {
-            throw new IllegalArgumentException("primary key must not be empty");
-        }
-        for (KeyAttribute ka : primaryKey.getComponents()) {
-            this.with(ka.name(), ka.value());
-        }
-        return this;
-    }
-
-    /**
-     * Convenient method to set the attributes of this item from the given
-     * hash-only primary key name and value.
-     */
-    public Item withPrimaryKey(String hashKeyName, Object hashKeyValue) {
-        return withKeyComponent(hashKeyName, hashKeyValue);
-    }
-
-    /**
-     * Convenient method to set the attributes of this item from the given
-     * hash and range primary key.
-     */
-    public Item withPrimaryKey(String hashKeyName, Object hashKeyValue,
-                               String rangeKeyName, Object rangeKeyValue) {
-        return withKeyComponent(hashKeyName, hashKeyValue)
-                .withKeyComponent(rangeKeyName, rangeKeyValue);
-    }
-
-    /**
-     * Convenient methods - sets the attributes of this item from the specified
-     * key components.
-     */
-    public Item withKeyComponents(KeyAttribute... components) {
-        rejectNullOrEmptyInput(components);
-        for (KeyAttribute ka : components) {
-            rejectNullValue(ka);
-            this.with(ka.name(), ka.value());
-        }
-        return this;
-    }
-
-    /**
-     * Convenient methods - sets an attribute of this item for the specified
-     * key attribute name and value.
-     */
-    public Item withKeyComponent(String keyAttrName, Object keyAttrValue) {
-        return with(keyAttrName, keyAttrValue);
-    }
-
-    /**
-     * Returns the value of the specified attribute in the current item as an
-     * object; or null if the attribute either doesn't exist or the attribute
-     * value is null.
-     * <p>
-     * An attribute value can be a
-     * <ul>
-     * <li>Number</li>
-     * <li>String</li>
-     * <li>binary (ie byte array or byte buffer)</li>
-     * <li>boolean</li>
-     * <li>null</li>
-     * <li>list (of any of the types on this list)</li>
-     * <li>map (with string key to value of any of the types on this list)</li>
-     * <li>set (of any of the types on this list)</li>
-     * </ul>
-     *
-     * @see #isNull(String) #isNull(String) to check if the attribute value is
-     *      null.
-     * @see #isPresent(String) #isPresent(String) to check if the attribute
-     *      value is present.
-     */
-    public Object get(String attrName) {
-        return attributes.get(attrName);
-    }
-
-    /**
-     * Returns the type of the specified attribute in the current item; or null
-     * if the attribute either doesn't exist or the attribute value is null.
-     *
-     * @see #isNull(String) #isNull(String) to check if the attribute value is
-     *      null.
-     * @see #isPresent(String) #isPresent(String) to check if the attribute
-     *      value is present.
-     */
-    public Class<?> getTypeOf(String attrName) {
-        Object val = attributes.get(attrName);
-        return val == null ? null : val.getClass();
-    }
-
-    /**
-     * Removes the specified attribute from the current item.
-     */
-    public Item removeAttribute(String attrName) {
-        checkInvalidAttrName(attrName);
-        attributes.remove(attrName);
-        return this;
-    }
-
-    /**
-     * Returns all attributes of the current item.
-     */
-    public Iterable<Entry<String, Object>> attributes() {
-        return new LinkedHashMap<String, Object>(attributes).entrySet();
-    }
-
-    /**
-     * Returns true if this item has the specified attribute; false otherwise.
-     */
-    public boolean hasAttribute(String attrName) {
-        return attributes.containsKey(attrName);
-    }
-
-    /**
-     * Returns all attributes of the current item as a map.
-     */
-    public Map<String, Object> asMap() {
-        return new LinkedHashMap<String, Object>(attributes);
-    }
-
-    /**
-     * Returns the number of attributes of this item.
-     */
-    public int numberOfAttributes() {
-        return attributes.size();
-    }
-
-    /**
-     * Returns this item as a JSON string.  Note all binary data will become
-     * base-64 encoded in the resultant string.
-     */
-    public String toJson() {
-        return JacksonUtils.toJsonString(this.attributes);
-    }
-
-    /**
-     * Utility method to decode the designated binary attributes from base-64
-     * encoding; converting binary lists into binary sets.
-     *
-     * @param binaryAttrNames
-     *            names of binary attributes or binary set attributes currently
-     *            base-64 encoded (typically when converted from a JSON string.)
-     *
-     * @see #fromJson(String)
-     */
-    public Item base64Decode(String... binaryAttrNames) {
-        rejectNullInput(binaryAttrNames);
-        // Verify all attributes are good
-        for (String attrName : binaryAttrNames) {
-            checkInvalidAttrName(attrName);
-            if (String.class == getTypeOf(attrName)) {
-                String b64 = getString(attrName);
-                BinaryUtils.fromBase64(b64);
-            } else {
-                Set<String> b64s = getStringSet(attrName);
-                for (String b64 : b64s) {
-                    BinaryUtils.fromBase64(b64);
-                }
-            }
-        }
-        // Decodes b64 into binary
-        for (String attrName : binaryAttrNames) {
-            if (String.class == getTypeOf(attrName)) {
-                String b64 = getString(attrName);
-                byte[] bytes = BinaryUtils.fromBase64(b64);
-                withBinary(attrName, bytes);
-            } else {
-                Set<String> b64s = getStringSet(attrName);
-                Set<byte[]> binarySet = new LinkedHashSet<byte[]>(b64s.size());
-                for (String b64 : b64s) {
-                    binarySet.add(BinaryUtils.fromBase64(b64));
-                }
-                withBinarySet(attrName, binarySet);
-            }
-        }
-        return this;
-    }
-
-    /**
-     * Utility method to converts the designated attributes from
-     * <code>List</code> into <code>Set</code>, throwing
-     * <code>IllegalArgumentException</code> should there be duplicate elements.
-     *
-     * @param listAttrNames
-     *            names of attributes to be converted.
-     *
-     * @see #fromJson(String)
-     */
-    public Item convertListsToSets(String... listAttrNames) {
-        rejectNullInput(listAttrNames);
-        // Verify all attributes are good
-        for (String attrName : listAttrNames) {
-            checkInvalidAttrName(attrName);
-            if (List.class.isAssignableFrom(getTypeOf(attrName))) {
-                List<?> list = getList(attrName);
-                if (list != null) {
-                    for (Object e : list) {
-                        if (e instanceof String) {
-                            Set<String> ss = getStringSet(attrName);
-                            if (list.size() != ss.size()) {
-                                throw new IllegalArgumentException("List cannot be converted to Set due to duplicate elements");
-                            }
-                        } else if (e instanceof Number) {
-                            Set<BigDecimal> ss = getNumberSet(attrName);
-                            if (list.size() != ss.size()) {
-                                throw new IllegalArgumentException("List cannot be converted to Set due to duplicate elements");
-                            }
-                        } else if (e instanceof byte[]) {
-                            Set<byte[]> ss = getBinarySet(attrName);
-                            if (list.size() != ss.size()) {
-                                throw new IllegalArgumentException("List cannot be converted to Set due to duplicate elements");
-                            }
-                        }
-                    }
-                }
-            } else {
-                throw new IllegalArgumentException("Attribute " + attrName + " is not a list");
-            }
-        }
-        // Do the conversion
-        for (String attrName : listAttrNames) {
-            checkInvalidAttrName(attrName);
-            List<?> list = getList(attrName);
-            if (list != null) {
-                boolean converted = false;
-                for (Object e : list) {
-                    if (e instanceof String) {
-                        Set<String> set = getStringSet(attrName);
-                        withStringSet(attrName, set);
-                        converted = true;
-                        break;
-                    } else if (e instanceof Number) {
-                        Set<BigDecimal> set = getNumberSet(attrName);
-                        withBigDecimalSet(attrName, set);
-                        converted = true;
-                        break;
-                    } else if (e instanceof byte[]) {
-                        Set<byte[]> set = getBinarySet(attrName);
-                        withBinarySet(attrName, set);
-                        converted = true;
-                        break;
-                    }
-                }
-                if (!converted) {
-                    // All elements are null.  So treat it as a String set.
-                    Set<String> set = getStringSet(attrName);
-                    withStringSet(attrName, set);
-                }
-            }
-        }
-        return this;
-    }
-
-    /**
-     * Returns this item as a pretty JSON string. Note all binary data will
-     * become base-64 encoded in the resultant string.
-     */
-    public String toJsonPretty() {
-        return JacksonUtils.toJsonPrettyString(this.attributes);
-    }
-
-    @Override
-    public String toString() {
-        return "{ Item: " + attributes.toString() + " }";
-    }
-
-    @Override
-    public int hashCode() {
-        return attributes.hashCode();
-    }
-
-    @Override
-    public boolean equals(Object in) {
-        if (in instanceof Item) {
-            Item that = (Item) in;
-            return this.attributes.equals(that.attributes);
-        } else {
-            return false;
-        }
-    }
-}
diff --git a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/ItemCollection.java b/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/ItemCollection.java
deleted file mode 100644
index 1f655209c04b..000000000000
--- a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/ItemCollection.java
+++ /dev/null
@@ -1,278 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.document;
-
-import java.util.HashMap;
-import java.util.Map;
-import software.amazon.awssdk.services.dynamodb.document.internal.PageBasedCollection;
-import software.amazon.awssdk.services.dynamodb.document.internal.PageIterable;
-import software.amazon.awssdk.services.dynamodb.model.Capacity;
-import software.amazon.awssdk.services.dynamodb.model.ConsumedCapacity;
-
-/**
- * A collection of <code>Item</code>'s.
- *
- * An <code>ItemCollection</code> object maintains a cursor pointing to its
- * current pages of data. Initially the cursor is positioned before the first page.
- * The next method moves the cursor to the next row, and because it returns
- * false when there are no more rows in the <code>ItemCollection</code> object,
- * it can be used in a while loop to iterate through the collection.
- *
- * Network calls can be triggered when the collection is iterated across page
- * boundaries.
- *
- * @param <R> low level result type
- */
-public abstract class ItemCollection<R> extends PageBasedCollection<Item, R> {
-    private int accumulatedItemCount;
-    private int accumulatedScannedCount;
-    private ConsumedCapacity accumulatedConsumedCapacity;
-
-    protected final void accumulateStats(ConsumedCapacity consumedCapacity,
-                                         Integer count, Integer scannedCount) {
-        if (consumedCapacity != null) {
-            if (accumulatedConsumedCapacity == null) {
-                // Create a new consumed capacity by cloning the one passed in
-                ConsumedCapacity.Builder cloneBuilder = ConsumedCapacity.builder();
-
-                cloneBuilder.capacityUnits(consumedCapacity.capacityUnits());
-                cloneBuilder.globalSecondaryIndexes(
-                        clone(consumedCapacity.globalSecondaryIndexes()));
-                cloneBuilder.localSecondaryIndexes(
-                        clone(consumedCapacity.localSecondaryIndexes()));
-                cloneBuilder.table(clone(consumedCapacity.table()));
-                cloneBuilder.tableName(consumedCapacity.tableName());
-
-                this.accumulatedConsumedCapacity = cloneBuilder.build();
-            } else {
-                // Accumulate the capacity units
-                final Double capunit = accumulatedConsumedCapacity.capacityUnits();
-                final Double delta = consumedCapacity.capacityUnits();
-                if (capunit == null) {
-                    accumulatedConsumedCapacity = accumulatedConsumedCapacity.toBuilder().capacityUnits(delta).build();
-                } else {
-                    accumulatedConsumedCapacity = accumulatedConsumedCapacity.toBuilder().capacityUnits(capunit.doubleValue()
-                            + (delta == null ? 0 : delta.doubleValue())).build();
-                }
-                // Accumulate the GSI capacities
-                final Map<String, Capacity> gsi = accumulatedConsumedCapacity.globalSecondaryIndexes();
-                if (gsi == null) {
-                    accumulatedConsumedCapacity = accumulatedConsumedCapacity.toBuilder().globalSecondaryIndexes(
-                            clone(consumedCapacity.globalSecondaryIndexes())).build();
-                } else {
-                    accumulatedConsumedCapacity = accumulatedConsumedCapacity.toBuilder().globalSecondaryIndexes(add(
-                            consumedCapacity.globalSecondaryIndexes(),
-                            clone(accumulatedConsumedCapacity.globalSecondaryIndexes()))).build();
-                }
-                // Accumulate the LSI capacities
-                final Map<String, Capacity> lsi = accumulatedConsumedCapacity.localSecondaryIndexes();
-                if (lsi == null) {
-                    accumulatedConsumedCapacity = accumulatedConsumedCapacity.toBuilder().localSecondaryIndexes(
-                            clone(consumedCapacity.localSecondaryIndexes())).build();
-                } else {
-                    accumulatedConsumedCapacity = accumulatedConsumedCapacity.toBuilder().localSecondaryIndexes(add(
-                            consumedCapacity.localSecondaryIndexes(),
-                            clone(accumulatedConsumedCapacity.localSecondaryIndexes()))).build();
-                }
-                // Accumulate table capacity
-                final Capacity tableCapacity = accumulatedConsumedCapacity.table();
-                if (tableCapacity == null) {
-                    accumulatedConsumedCapacity = accumulatedConsumedCapacity.toBuilder()
-                            .table(clone(consumedCapacity.table()))
-                            .build();
-                } else {
-                    accumulatedConsumedCapacity = accumulatedConsumedCapacity.toBuilder()
-                            .table(add(consumedCapacity.table(),
-                                    accumulatedConsumedCapacity.table())).build();
-                }
-            }
-        }
-        if (count != null) {
-            this.accumulatedItemCount += count.intValue();
-        }
-        if (scannedCount != null) {
-            this.accumulatedScannedCount += scannedCount.intValue();
-        }
-    }
-
-    private Map<String, Capacity> add(Map<String, Capacity> from, Map<String, Capacity> to) {
-        if (to == null) {
-            return clone(from);
-        }
-        if (from != null) {
-            for (Map.Entry<String, Capacity> entryFrom : from.entrySet()) {
-                final String key = entryFrom.getKey();
-                final Capacity tocap = to.get(key);
-                final Capacity fromcap = entryFrom.getValue();
-                if (tocap == null) {
-                    to.put(key, clone(fromcap));
-                } else {
-                    to.put(key, Capacity.builder().capacityUnits(
-                            doubleOf(tocap) + doubleOf(fromcap)).build());
-                }
-            }
-        }
-        return to;
-    }
-
-    private Capacity add(final Capacity from, final Capacity to) {
-        return Capacity.builder().capacityUnits(doubleOf(from) + doubleOf(to)).build();
-    }
-
-    private Map<String, Capacity> clone(Map<String, Capacity> capacityMap) {
-        if (capacityMap == null) {
-            return null;
-        }
-        Map<String, Capacity> clone =
-                new HashMap<String, Capacity>(capacityMap.size());
-        for (Map.Entry<String, Capacity> e : capacityMap.entrySet()) {
-            clone.put(e.getKey(), clone(e.getValue()));
-        }
-        return clone;
-    }
-
-    private Capacity clone(Capacity capacity) {
-        return capacity == null
-                ? null
-                : Capacity.builder().capacityUnits(capacity.capacityUnits()).build();
-    }
-
-    private double doubleOf(Capacity cap) {
-        if (cap == null) {
-            return 0.0;
-        }
-        Double val = cap.capacityUnits();
-        return val == null ? 0.0 : val.doubleValue();
-    }
-
-    /**
-     * Returns the count of items accumulated so far.
-     * @deprecated This method returns the accumulated count and not the total count.
-     *     Use {@link #getAccumulatedItemCount} instead.
-     */
-    @Deprecated
-    public int getTotalCount() {
-        return getAccumulatedItemCount();
-    }
-
-    /**
-     * Returns the count of items accumulated so far.
-     */
-    public int getAccumulatedItemCount() {
-        return accumulatedItemCount;
-    }
-
-    /**
-     * Returns the scanned count accumulated so far.
-     * @deprecated This method returns the accumulated count and not the total count.
-     *     Use {@link #getAccumulatedScannedCount} instead.
-     */
-    @Deprecated
-    public int getTotalScannedCount() {
-        return getAccumulatedScannedCount();
-    }
-
-    /**
-     * Returns the scanned count accumulated so far.
-     */
-    public int getAccumulatedScannedCount() {
-        return accumulatedScannedCount;
-    }
-
-    /**
-     * Returns the consumed capacity accumulated so far.
-     * @deprecated This method returns the accumulated consumed capacity and not the total.
-     *     Use {@link #getAccumulatedScannedCount} instead.
-     */
-    @Deprecated
-    public ConsumedCapacity getTotalConsumedCapacity() {
-        return getAccumulatedConsumedCapacity();
-    }
-
-    /**
-     * Returns the consumed capacity accumulated so far.
-     */
-    public ConsumedCapacity getAccumulatedConsumedCapacity() {
-        return accumulatedConsumedCapacity;
-    }
-
-    // Overriding these just so javadocs will show up.
-
-    /**
-     * Returns an {@code Iterable<Page<Item, R>>} that iterates over pages of
-     * items from this collection. Each call to {@code Iterator.next} on an
-     * {@code Iterator} returned from this {@code Iterable} results in exactly
-     * one call to DynamoDB to retrieve a single page of results.
-     * <p>
-     * <code>
-     * ItemCollection&lt;QueryResponse&gt; collection = ...;
-     * for (Page&lt;Item&gt; page : collection.pages()) {
-     *     processItems(page);
-     *
-     *     ConsumedCapacity consumedCapacity =
-     *             page.getLowLevelResult().getConsumedCapacity();
-     *
-     *     Thread.sleep(getBackoff(consumedCapacity.getCapacityUnits()));
-     * }
-     * </code>
-     * <p>
-     * The use of the internal/undocumented {@code PageIterable} class instead
-     * of {@code Iterable} in the public interface here is retained for
-     * backwards compatibility. It doesn't expose any methods beyond those
-     * of the {@code Iterable} interface. This method will be changed to return
-     * an {@code Iterable<Page<Item, R>>} directly in a future release of the
-     * SDK.
-     *
-     * @see Page
-     */
-    @Override
-    public PageIterable<Item, R> pages() {
-        return super.pages();
-    }
-
-    /**
-     * Returns the maximum number of resources to be retrieved in this
-     * collection; or null if there is no limit.
-     */
-    @Override
-    public abstract Integer getMaxResultSize();
-
-    /**
-     * Returns the low-level result last retrieved (for the current page) from
-     * the server side; or null if there has yet no calls to the server.
-     */
-    @Override
-    public R getLastLowLevelResult() {
-        return super.getLastLowLevelResult();
-    }
-
-    /**
-     * Used to register a listener for the event of receiving a low-level result
-     * from the server side.
-     *
-     * @param listener
-     *            listener to be registered. If null, a "none" listener will be
-     *            set.
-     * @return the previously registered listener. The return value is never
-     *         null.
-     */
-    @Override
-    public LowLevelResultListener<R> registerLowLevelResultListener(
-            LowLevelResultListener<R> listener) {
-
-        return super.registerLowLevelResultListener(listener);
-    }
-}
diff --git a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/ItemTest.java b/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/ItemTest.java
deleted file mode 100644
index 95c62194a295..000000000000
--- a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/ItemTest.java
+++ /dev/null
@@ -1,921 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.document;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import org.junit.Assert;
-import org.junit.Test;
-import software.amazon.awssdk.services.dynamodb.document.utils.FluentArrayList;
-import software.amazon.awssdk.services.dynamodb.document.utils.FluentHashSet;
-import software.amazon.awssdk.services.dynamodb.document.utils.ValueMap;
-import software.amazon.awssdk.utils.BinaryUtils;
-
-public class ItemTest {
-
-    @Test
-    public void jsonDoubleMax() {
-        double[] values = {
-                Double.MAX_VALUE, Double.MIN_NORMAL, Double.MIN_VALUE, Double.MIN_NORMAL
-        };
-        for (double val : values) {
-            doJsonDoubleTest(val);
-        }
-    }
-
-    private void doJsonDoubleTest(double value) {
-        Item item1 = new Item().withDouble("double", value);
-        final String json = item1.toJsonPretty();
-        System.out.println(json);
-        Item item2 = Item.fromJson(json);
-        assertEquals(json, item2.toJsonPretty());
-    }
-
-    @Test
-    public void isNull() {
-        Item item = new Item();
-        assertFalse(item.isNull("test"));
-
-        item.withNull("test");
-        assertTrue(item.isNull("test"));
-
-        item.removeAttribute("test");
-        assertFalse(item.isNull("test"));
-
-        item.withString("test", "foo");
-        assertFalse(item.isNull("test"));
-        assertEquals("foo", item.getString("test"));
-    }
-
-    @Test
-    public void is_null() {
-        Item item = new Item();
-        assertFalse(item.isNull("test"));
-
-        item.with("test", null);
-        assertTrue(item.isNull("test"));
-
-        assertNull(item.get("test"));
-
-        item.removeAttribute("test");
-        assertFalse(item.isNull("test"));
-
-        assertNull(item.get("test"));
-    }
-
-    @Test
-    public void isPresent() {
-        Item item = new Item();
-        assertFalse(item.isPresent("test"));
-
-        item.withNull("test");
-        assertTrue(item.isPresent("test"));
-
-        item.removeAttribute("test");
-        assertFalse(item.isPresent("test"));
-
-        item.withString("test", "foo");
-        assertTrue(item.isPresent("test"));
-    }
-
-    @Test
-    public void toBigDecimal_Null() {
-        Item item = new Item();
-        assertNull(item.getNumber("test"));
-    }
-
-    @Test(expected = NumberFormatException.class)
-    public void getInt_Null() {
-        Item item = new Item();
-        item.getInt("test");
-    }
-
-    @Test(expected = NumberFormatException.class)
-    public void getLong_Null() {
-        Item item = new Item();
-        item.getLong("test");
-    }
-
-    @Test(expected = NumberFormatException.class)
-    public void getNumber_NonNumber() {
-        Item item = new Item();
-        item.withString("test", "foo");
-        item.getNumber("test");
-    }
-
-    @Test
-    public void withNumber() {
-        Item item = new Item();
-        item.withNumber("test", BigDecimal.ONE);
-        assertSame(BigDecimal.ONE, item.getNumber("test"));
-        assertTrue(1 == item.getInt("test"));
-        assertTrue(1L == item.getLong("test"));
-    }
-
-    @Test
-    public void withLong() {
-        Item item = new Item();
-        item.withLong("test", 123L);
-        assertTrue(123L == item.getLong("test"));
-    }
-
-    @Test
-    public void toByteArray() {
-        Item item = new Item();
-        assertNull(item.getBinary("test"));
-        byte[] bytes = {1, 2, 3};
-        item.withBinary("test", bytes);
-        assertTrue(Arrays.equals(bytes, item.getBinary("test")));
-        ByteBuffer bb = ByteBuffer.wrap(bytes);
-        item.withBinary("test", bb);
-        assertTrue(byte[].class == item.getTypeOf("test"));
-        assertTrue(Arrays.equals(bytes, item.getBinary("test")));
-        assertTrue(Arrays.equals(bytes, item.getByteBuffer("test").array()));
-    }
-
-    @Test(expected = IncompatibleTypeException.class)
-    public void toByteArray_IncompatibleTypeException() {
-        Item item = new Item();
-        item.withString("test", "foo");
-        item.getBinary("test");
-    }
-
-    @Test
-    public void toByteBuffer() {
-        Item item = new Item();
-        assertNull(item.getByteBuffer("test"));
-        byte[] bytes = {1, 2, 3};
-        item.withBinary("test", ByteBuffer.wrap(bytes));
-        ByteBuffer toByteBuffer = item.getByteBuffer("test");
-        assertTrue(Arrays.equals(bytes, toByteBuffer.array()));
-        assertTrue(Arrays.equals(bytes, item.getBinary("test")));
-        item.withBinary("test", bytes);
-        assertSame(byte[].class, item.getTypeOf("test"));
-        assertTrue(Arrays.equals(bytes, item.getByteBuffer("test").array()));
-    }
-
-    @Test(expected = IncompatibleTypeException.class)
-    public void toByteBuffer_IncompatibleTypeException() {
-        Item item = new Item();
-        item.withString("test", "foo");
-        item.getByteBuffer("test");
-    }
-
-    @Test
-    public void valToString() {
-        Item item = new Item();
-        item.withNumber("test", BigDecimal.ONE);
-        assertEquals("1", item.getString("test"));
-        assertNull(item.getString("foo"));
-        item.withBoolean("test", false);
-        assertEquals("false", item.getString("test"));
-    }
-
-    @Test
-    public void getStringSet_fromList() {
-        Item item = new Item();
-        item.withList("test", "a", "b", "c");
-        Set<String> ss = item.getStringSet("test");
-        assertTrue(ss.size() == 3);
-        assertTrue(ss.contains("a"));
-        assertTrue(ss.contains("b"));
-        assertTrue(ss.contains("c"));
-    }
-
-    @Test
-    public void getStringSet_fromNumbers() {
-        Item item = new Item();
-        item.withNumberSet("test", 1, 2);
-        Set<String> ss = item.getStringSet("test");
-        assertTrue(ss.size() == 2);
-        assertTrue(ss.contains("1"));
-        assertTrue(ss.contains("2"));
-    }
-
-    @Test
-    public void getStringSet_fromBooleans() {
-        Item item = new Item();
-        item.withList("test", true, false);
-        Set<String> ss = item.getStringSet("test");
-        assertTrue(ss.size() == 2);
-        assertTrue(ss.contains("true"));
-        assertTrue(ss.contains("false"));
-    }
-
-    @Test
-    public void getStringSet_fromBoolean() {
-        Item item = new Item();
-        item.withBoolean("test", true);
-        Set<String> ss = item.getStringSet("test");
-        assertTrue(ss.size() == 1);
-        assertTrue(ss.contains("true"));
-    }
-
-    @Test(expected = IncompatibleTypeException.class)
-    public void getStringSet_fromBinary() {
-        Item item = new Item();
-        item.withBinary("test", new byte[] {1, 2});
-        item.getStringSet("test");
-    }
-
-    @Test
-    public void getStringSet_empty() {
-        Item item = new Item();
-        item.with("test", new FluentArrayList<String>());
-        Set<String> ss = item.getStringSet("test");
-        assertTrue(ss.size() == 0);
-    }
-
-    @Test(expected = IncompatibleTypeException.class)
-    public void getStringSet_duplicateElements() {
-        Item item = new Item();
-        item.withList("test", "a", "b", "a");
-        item.getStringSet("test");
-    }
-
-    @Test
-    public void getStringSet_nullElement() {
-        Item item = new Item();
-        item.withList("test", "a", null, "c");
-        Set<String> ss = item.getStringSet("test");
-        assertTrue(ss.size() == 3);
-        assertTrue(ss.contains("a"));
-        assertTrue(ss.contains(null));
-        assertTrue(ss.contains("c"));
-    }
-
-    @Test
-    public void getNumberSet() {
-        Item item = new Item();
-        assertNull(item.getNumberSet("test"));
-        item.withList("test", BigDecimal.ZERO, BigDecimal.ONE, BigDecimal.TEN);
-        Set<BigDecimal> ss = item.getNumberSet("test");
-        assertTrue(ss.size() == 3);
-        assertTrue(ss.contains(BigDecimal.ZERO));
-        assertTrue(ss.contains(BigDecimal.ONE));
-        assertTrue(ss.contains(BigDecimal.TEN));
-    }
-
-    @Test
-    public void getNumberSet_number() {
-        Item item = new Item();
-        item.withNumber("test", 123);
-        Set<BigDecimal> ss = item.getNumberSet("test");
-        assertTrue(ss.size() == 1);
-        assertTrue(ss.contains(new BigDecimal("123")));
-    }
-
-    @Test
-    public void getNumberSet_string() {
-        Item item = new Item();
-        item.withString("test", "123");
-        Set<BigDecimal> ss = item.getNumberSet("test");
-        assertTrue(ss.size() == 1);
-        assertTrue(ss.contains(new BigDecimal("123")));
-    }
-
-    @Test
-    public void getNumberSet_empty() {
-        Item item = new Item();
-        item.with("test", new FluentArrayList<BigDecimal>());
-        Set<BigDecimal> ss = item.getNumberSet("test");
-        assertTrue(ss.size() == 0);
-    }
-
-    @Test(expected = IncompatibleTypeException.class)
-    public void getNumberSet_duplicateElements() {
-        Item item = new Item();
-        item.withList("test", BigDecimal.ZERO, BigDecimal.ONE, BigDecimal.ZERO);
-        item.getNumberSet("test");
-    }
-
-    @Test
-    public void getNumberSet_nullElement() {
-        Item item = new Item();
-        item.withList("test", BigDecimal.ZERO, null, BigDecimal.TEN);
-        Set<BigDecimal> ss = item.getNumberSet("test");
-        assertTrue(ss.size() == 3);
-        assertTrue(ss.contains(BigDecimal.ZERO));
-        assertTrue(ss.contains(null));
-        assertTrue(ss.contains(BigDecimal.TEN));
-    }
-
-    @Test
-    public void getBinarySet_bytes() {
-        Item item = new Item();
-        assertNull(item.getBinarySet("test"));
-        item.withList("test", new byte[] {1, 2}, new byte[] {3, 4});
-        Set<byte[]> bas = item.getBinarySet("test");
-        assertTrue(bas.size() == 2);
-        boolean a = false;
-        boolean b = false;
-        for (byte[] ba : bas) {
-            if (Arrays.equals(ba, new byte[] {1, 2})) {
-                a = true;
-            } else if (Arrays.equals(ba, new byte[] {3, 4})) {
-                b = true;
-            }
-        }
-        assertTrue(a);
-        assertTrue(b);
-    }
-
-    @Test
-    public void getBinarySet_singleByteArray() {
-        Item item = new Item();
-        item.with("test", new byte[] {1, 2});
-        Set<byte[]> bs = item.getBinarySet("test");
-        assertTrue(bs.size() == 1);
-        boolean a = false;
-        for (byte[] ba : bs) {
-            if (Arrays.equals(ba, new byte[] {1, 2})) {
-                a = true;
-            }
-        }
-        assertTrue(a);
-
-        Set<ByteBuffer> bbs = item.getByteBufferSet("test");
-        assertTrue(bbs.size() == 1);
-        a = false;
-        for (ByteBuffer ba : bbs) {
-            if (Arrays.equals(ba.array(), new byte[] {1, 2})) {
-                a = true;
-            }
-        }
-        assertTrue(a);
-    }
-
-    @Test
-    public void getBinarySet_singleByteBuffer() {
-        Item item = new Item();
-        item.with("test", ByteBuffer.wrap(new byte[] {1, 2}));
-        Set<ByteBuffer> bbs = item.getByteBufferSet("test");
-        assertTrue(bbs.size() == 1);
-        boolean a = false;
-        for (ByteBuffer ba : bbs) {
-            if (Arrays.equals(ba.array(), new byte[] {1, 2})) {
-                a = true;
-            }
-        }
-        assertTrue(a);
-        Set<byte[]> bs = item.getBinarySet("test");
-        assertTrue(bs.size() == 1);
-        a = false;
-        for (byte[] ba : bs) {
-            if (Arrays.equals(ba, new byte[] {1, 2})) {
-                a = true;
-            }
-        }
-        assertTrue(a);
-    }
-
-    @Test
-    public void getBinarySet_empty() {
-        Item item = new Item();
-        item.with("test", new FluentHashSet<byte[]>());
-        Set<byte[]> bs = item.getBinarySet("test");
-        assertTrue(bs.size() == 0);
-
-        Set<ByteBuffer> bbs = item.getByteBufferSet("test");
-        assertTrue(bbs.size() == 0);
-    }
-
-    @Test(expected = IncompatibleTypeException.class)
-    public void getBinarySet_Incompatible() {
-        Item item = new Item();
-        item.withString("test", "foo");
-        item.getBinarySet("test");
-    }
-
-    @Test
-    public void getByteBufferSet_empty() {
-        Item item = new Item();
-        assertNull(item.getByteBufferSet("test"));
-        item.with("test", new FluentHashSet<ByteBuffer>());
-        Set<byte[]> bs = item.getBinarySet("test");
-        assertTrue(bs.size() == 0);
-
-        Set<ByteBuffer> bbs = item.getByteBufferSet("test");
-        assertTrue(bbs.size() == 0);
-    }
-
-    @Test(expected = IncompatibleTypeException.class)
-    public void getByteBufferSet_Incompatible() {
-        Item item = new Item();
-        item.withString("test", "foo");
-        item.getByteBufferSet("test");
-    }
-
-    @Test
-    public void getByteBufferSet() {
-        Item item = new Item();
-        item.withList("test", new byte[] {1, 2, 3}, new byte[] {4, 5, 6});
-        Set<ByteBuffer> bs = item.getByteBufferSet("test");
-        assertTrue(bs.size() == 2);
-        boolean a = false, b = false;
-        for (ByteBuffer bb : bs) {
-            if (Arrays.equals(bb.array(), new byte[] {1, 2, 3})) {
-                a = true;
-            } else if (Arrays.equals(bb.array(), new byte[] {4, 5, 6})) {
-                b = true;
-            }
-        }
-        assertTrue(a);
-        assertTrue(b);
-    }
-
-    @Test
-    public void getList_null() {
-        Item item = new Item();
-        assertNull(item.getList("test"));
-    }
-
-    @Test
-    public void getList_list() {
-        Item item = new Item().withList("test", "abc", "def");
-        List<String> list = item.getList("test");
-        assertTrue(list.size() == 2);
-        assertEquals("abc", list.get(0));
-        assertEquals("def", list.get(1));
-    }
-
-    @Test
-    public void getList_string() {
-        Item item = new Item().withString("test", "foo");
-        List<String> list = item.getList("test");
-        assertTrue(list.size() == 1);
-        assertEquals("foo", list.get(0));
-    }
-
-    @Test
-    public void toJSON_null() {
-        assertNull(new Item().getJson("test"));
-        assertNull(new Item().getJsonPretty("test"));
-    }
-
-    @Test
-    public void fromJSON_null() {
-        assertNull(Item.fromJson(null));
-    }
-
-    @Test
-    public void fromJSON_array() {
-        Item item = new Item()
-                .withJson("arrayJson", "[\"foo\", \"bar\"]");
-        List<String> arrayJson = item.getList("arrayJson");
-        String[] expectedArray = new String[] {"foo", "bar"};
-        Assert.assertArrayEquals(expectedArray, arrayJson.toArray());
-    }
-
-    @Test
-    public void fromJSON_map() {
-        Item item = new Item()
-                .withJson("mapJson", "{\"foo\": \"bar\"}");
-        Map<String, String> mapJson = item.getMap("mapJson");
-        Assert.assertEquals("bar", mapJson.get("foo"));
-    }
-
-    @Test
-    public void toFromJSON() {
-        Item item = new Item()
-                .withString("stringA", "stringV")
-                .withFloat("floatA", 123.45f)
-                // Jackson will convert byte[] into Base64-encoded binary data
-                .withBinary("binaryA", new byte[] {1, 2, 3})
-                .withBoolean("booleanA", true)
-                .withNull("nullA")
-                .withJson("jsonA", "{\"myjson\": 321}")
-                .withList("listA", "a", "b", "c")
-                .withMap("mapA", new ValueMap().with("map-a", "a").with("map-b", "b"))
-                .withStringSet("strSetA", "sa", "sb", "sc")
-                .withNumberSet("numSetA", BigDecimal.ONE, BigDecimal.ZERO)
-                .withBinarySet("binarySetA", new byte[] {00, 11}, new byte[] {22, 33})
-                .withBinarySet("byteBufferSetA",
-                        ByteBuffer.wrap(new byte[] {44, 55}),
-                        ByteBuffer.wrap(new byte[] {66, 77}));
-        String json = item.toJsonPretty();
-        System.out.println(json);
-        System.out.println("byte[]{1,2,3} => " + BinaryUtils.toBase64(new byte[] {1, 2, 3}));
-        System.out.println("byte[]{00,11} => " + BinaryUtils.toBase64(new byte[] {00, 11}));
-        System.out.println("byte[]{22,33} => " + BinaryUtils.toBase64(new byte[] {22, 33}));
-        System.out.println("byte[]{44,44} => " + BinaryUtils.toBase64(new byte[] {44, 55}));
-        System.out.println("byte[]{66,77} => " + BinaryUtils.toBase64(new byte[] {66, 77}));
-        Item itemTo = Item.fromJson(json);
-        System.out.println(itemTo);
-        assertTrue(List.class.isAssignableFrom(itemTo.getTypeOf("binarySetA")));
-        assertTrue(List.class.isAssignableFrom(itemTo.getTypeOf("byteBufferSetA")));
-        itemTo.base64Decode("binaryA", "binarySetA", "byteBufferSetA");
-        assertTrue(Arrays.equals(itemTo.getBinary("binaryA"), item.getBinary("binaryA")));
-        assertTrue(itemTo.getBinarySet("binarySetA").size() == 2);
-        {   // verity the binary content of "binarySetA"
-            boolean a = false, b = false;
-            for (byte[] bytes : itemTo.getBinarySet("binarySetA")) {
-                if (Arrays.equals(bytes, new byte[] {00, 11})) {
-                    a = true;
-                } else if (Arrays.equals(bytes, new byte[] {22, 33})) {
-                    b = true;
-                }
-            }
-            assertTrue(a);
-            assertTrue(b);
-            assertTrue(Set.class.isAssignableFrom(itemTo.getTypeOf("binarySetA")));
-        }
-        assertTrue(itemTo.getBinarySet("byteBufferSetA").size() == 2);
-        {   // verity the binary content of "byteBufferSetA"
-            boolean a = false, b = false;
-            for (byte[] bytes : itemTo.getBinarySet("byteBufferSetA")) {
-                if (Arrays.equals(bytes, new byte[] {44, 55})) {
-                    a = true;
-                } else if (Arrays.equals(bytes, new byte[] {66, 77})) {
-                    b = true;
-                }
-            }
-            assertTrue(a);
-            assertTrue(b);
-            assertTrue(Set.class.isAssignableFrom(itemTo.getTypeOf("byteBufferSetA")));
-        }
-        // JSON doesn't support Set, so all all sets now become lists
-        assertTrue(List.class.isAssignableFrom(itemTo.getTypeOf("strSetA")));
-        assertTrue(List.class.isAssignableFrom(itemTo.getTypeOf("numSetA")));
-        itemTo.convertListsToSets("strSetA", "numSetA");
-        assertTrue(Set.class.isAssignableFrom(itemTo.getTypeOf("strSetA")));
-        assertTrue(Set.class.isAssignableFrom(itemTo.getTypeOf("numSetA")));
-        {
-            Set<String> set = itemTo.getStringSet("strSetA");
-            assertTrue(set.size() == item.getStringSet("strSetA").size());
-            set.containsAll(item.getStringSet("strSetA"));
-        }
-        {
-            Set<BigDecimal> set = itemTo.getNumberSet("numSetA");
-            assertTrue(set.size() == item.getStringSet("numSetA").size());
-            set.containsAll(item.getNumberSet("numSetA"));
-        }
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void withStringSet_duplicates() {
-        new Item().withStringSet("test", "a", "b", "a");
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void withBigDecimalSet_duplicates() {
-        new Item().withBigDecimalSet("test", new BigDecimal("1"), BigDecimal.ONE);
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void withNumberSet_duplicates() {
-        new Item().withNumberSet("test", new BigDecimal("1"), new BigInteger("1"));
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void withNumberSet_duplicates2() {
-        new Item().withNumberSet("test", new BigDecimal("1.0"), new Float("1"));
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void withNumberSet_duplicates3() {
-        Set<Number> set = new FluentHashSet<Number>().withAll(
-                new BigDecimal("1.0"), new Float("1"));
-        assertTrue(set.size() == 2);
-        // Become duplicates when get converted into BigDecimal
-        new Item().withNumberSet("test", set);
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void invalidNullInput() {
-        new Item().withNumber("test", null);
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void nullAttrName() {
-        new Item().withNull(null);
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void blankAttrName() {
-        new Item().withNull("   ");
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void withKeyComponents_null() {
-        new Item().withKeyComponents();
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void withKeyComponents_nullComponent() {
-        new Item().withKeyComponents((KeyAttribute) null);
-    }
-
-    @Test
-    public void withKeyComponents() {
-        Item item = new Item().withKeyComponents(new KeyAttribute("name", 123));
-        Assert.assertTrue(123 == item.getInt("name"));
-        Assert.assertTrue(BigDecimal.class == item.getTypeOf("name"));
-    }
-
-    @Test(expected = IncompatibleTypeException.class)
-    public void getBOOL_null() {
-        Item item = new Item();
-        item.getBool("test");
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void withPrimaryKey_null() {
-        new Item().withPrimaryKey(null);
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void withPrimaryKey_empty() {
-        new Item().withPrimaryKey(new PrimaryKey());
-    }
-
-    @Test(expected = IncompatibleTypeException.class)
-    public void getBOOL_invalidValue() {
-        Item item = new Item().withInt("test", 123);
-        item.getBool("test");
-    }
-
-    @Test
-    public void getBOOL_Boolean() {
-        Item item = new Item().withBoolean("test", Boolean.TRUE);
-        assertEquals(Boolean.TRUE, item.getBool("test"));
-        item.withBoolean("test", Boolean.FALSE);
-        assertEquals(Boolean.FALSE, item.getBool("test"));
-    }
-
-    @Test
-    public void getBOOL_01() {
-        Item item = new Item().withString("test", "1");
-        assertEquals(Boolean.TRUE, item.getBool("test"));
-        item.withString("test", "0");
-        assertEquals(Boolean.FALSE, item.getBool("test"));
-        item.withString("test", "true");
-        assertEquals(Boolean.TRUE, item.getBool("test"));
-        item.withString("test", "false");
-        assertEquals(Boolean.FALSE, item.getBool("test"));
-    }
-
-    @Test
-    public void withShort() {
-        assertTrue(1 == new Item().withShort("test", (short) 1).getInt("test"));
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void withShort_emptyName() {
-        new Item().withShort(" ", (short) 1);
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void withShort_nullName() {
-        new Item().withShort(null, (short) 1);
-    }
-
-    @Test
-    public void withDouble() {
-        assertTrue(1 == new Item().withDouble("test", 1.0).getInt("test"));
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void withDouble_emptyName() {
-        new Item().withDouble(" ", 1.0);
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void withDouble_nullName() {
-        new Item().withDouble(null, 1.0);
-    }
-
-    // https://github.com/aws/aws-sdk-java/issues/311#issuecomment-64474230
-    @Test(expected = ClassCastException.class)
-    public void issues311() {
-        Map<String, BigInteger> bigIntMap_input = new HashMap<String, BigInteger>();
-        bigIntMap_input.put("map_key", new BigInteger("123"));
-
-        Item i = new Item().withMap("item_key", bigIntMap_input);
-        Map<String, BigInteger> mapout = i.getMap("item_key");
-        @SuppressWarnings("unused")
-        BigInteger b = mapout.get("map_key");
-    }
-
-    @Test
-    public void getRawMap() {
-        Map<String, BigInteger> bigIntMap_input = new HashMap<String, BigInteger>();
-        bigIntMap_input.put("map_key", new BigInteger("123"));
-
-        Item i = new Item().withMap("item_key", bigIntMap_input);
-        Map<String, Object> mapout = i.getRawMap("item_key");
-        Object b = mapout.get("map_key");
-        assertEquals("123", b.toString());
-    }
-
-    @Test
-    public void getMapOfNumbers_BigInteger() {
-        Map<String, BigInteger> bigIntMap_input = new HashMap<String, BigInteger>();
-        bigIntMap_input.put("map_key", new BigInteger("123"));
-
-        Item i = new Item().withMap("item_key", bigIntMap_input);
-        Map<String, BigInteger> mapout = i.getMapOfNumbers("item_key", BigInteger.class);
-        BigInteger b = mapout.get("map_key");
-        assertEquals("123", b.toString());
-    }
-
-    @Test
-    public void getMapOfNumbers_BigDecimal() {
-        Map<String, BigInteger> bigIntMap_input = new HashMap<String, BigInteger>();
-        bigIntMap_input.put("map_key", new BigInteger("123"));
-
-        Item i = new Item().withMap("item_key", bigIntMap_input);
-        Map<String, BigDecimal> mapout = i.getMapOfNumbers("item_key", BigDecimal.class);
-        BigDecimal b = mapout.get("map_key");
-        assertEquals("123", b.toString());
-    }
-
-    @Test
-    public void getMapOfNumbers_Short() {
-        Map<String, BigInteger> bigIntMap_input = new HashMap<String, BigInteger>();
-        bigIntMap_input.put("map_key", new BigInteger("123"));
-
-        Item i = new Item().withMap("item_key", bigIntMap_input);
-        Map<String, Short> mapout = i.getMapOfNumbers("item_key", Short.class);
-        Short b = mapout.get("map_key");
-        assertEquals("123", b.toString());
-    }
-
-    @Test
-    public void getMapOfNumbers_Integer() {
-        Map<String, BigInteger> bigIntMap_input = new HashMap<String, BigInteger>();
-        bigIntMap_input.put("map_key", new BigInteger("123"));
-
-        Item i = new Item().withMap("item_key", bigIntMap_input);
-        Map<String, Integer> mapout = i.getMapOfNumbers("item_key", Integer.class);
-        Integer b = mapout.get("map_key");
-        assertEquals("123", b.toString());
-    }
-
-    @Test
-    public void getMapOfNumbers_Long() {
-        Map<String, BigInteger> bigIntMap_input = new HashMap<String, BigInteger>();
-        bigIntMap_input.put("map_key", new BigInteger("123"));
-
-        Item i = new Item().withMap("item_key", bigIntMap_input);
-        Map<String, Long> mapout = i.getMapOfNumbers("item_key", Long.class);
-        Long b = mapout.get("map_key");
-        assertEquals("123", b.toString());
-    }
-
-    @Test
-    public void getMapOfNumbers_Float() {
-        Map<String, BigInteger> bigIntMap_input = new HashMap<String, BigInteger>();
-        bigIntMap_input.put("map_key", new BigInteger("123"));
-
-        Item i = new Item().withMap("item_key", bigIntMap_input);
-        Map<String, Float> mapout = i.getMapOfNumbers("item_key", Float.class);
-        Float b = mapout.get("map_key");
-        assertEquals(b.toString(), "123.0", b.toString());
-    }
-
-    @Test
-    public void getMapOfNumbers_Double() {
-        Map<String, BigInteger> bigIntMap_input = new HashMap<String, BigInteger>();
-        bigIntMap_input.put("map_key", new BigInteger("123"));
-
-        Item i = new Item().withMap("item_key", bigIntMap_input);
-        Map<String, Double> mapout = i.getMapOfNumbers("item_key", Double.class);
-        Double b = mapout.get("map_key");
-        assertEquals(b.toString(), "123.0", b.toString());
-    }
-
-    @Test
-    public void getMapOfNumbers_Number() {
-        Map<String, BigInteger> bigIntMap_input = new HashMap<String, BigInteger>();
-        bigIntMap_input.put("map_key", new BigInteger("123"));
-
-        Item i = new Item().withMap("item_key", bigIntMap_input);
-        Map<String, Number> mapout = i.getMapOfNumbers("item_key", Number.class);
-        Number b = mapout.get("map_key");
-        assertEquals("123", b.toString());
-    }
-
-    @Test
-    public void getMapOfNumbers_NotExist() {
-        Item i = new Item();
-        assertNull(i.getMapOfNumbers("item_key", Short.class));
-    }
-
-    @Test
-    public void getBigInteger() {
-        Item i = new Item().withInt("item_key", 123);
-        BigInteger b = i.getBigInteger("item_key");
-        assertEquals("123", b.toString());
-
-        assertNull(i.getBigInteger("foo"));
-    }
-
-    @Test
-    public void getShort() {
-        Item i = new Item().withInt("item_key", 123);
-        short b = i.getShort("item_key");
-        assertTrue(b == 123);
-    }
-
-    @Test(expected = NumberFormatException.class)
-    public void getShortNotExist() {
-        Item i = new Item();
-        i.getShort("item_key");
-    }
-
-    @Test
-    public void getFloat() {
-        Item i = new Item().withFloat("item_key", 123.45f);
-        float b = i.getFloat("item_key");
-        assertTrue(b == 123.45f);
-    }
-
-    @Test(expected = NumberFormatException.class)
-    public void getFloatNotExist() {
-        Item i = new Item();
-        i.getFloat("item_key");
-    }
-
-    @Test
-    public void getDouble() {
-        Item i = new Item().withDouble("item_key", 123.45);
-        double b = i.getFloat("item_key");
-        assertTrue(b + "", b > 123.44 && b <= 123.45);
-    }
-
-    @Test(expected = NumberFormatException.class)
-    public void getDoubleNotExist() {
-        Item i = new Item();
-        i.getDouble("item_key");
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void withNullBigInteger() {
-        new Item().withBigInteger("foo", null);
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void withNullNumber() {
-        new Item().withNumber("foo", null);
-    }
-
-    @Test
-    public void hasAttribute() {
-        assertFalse(new Item().hasAttribute("foo"));
-        assertTrue(new Item().with("foo", null).hasAttribute("foo"));
-        assertTrue(new Item().with("foo", "fooval").hasAttribute("foo"));
-        assertTrue(new Item().with("foo", "fooval").with("bar", "barval").hasAttribute("foo"));
-        assertTrue(new Item().with("foo", "fooval").with("bar", "barval").hasAttribute("bar"));
-        assertFalse(new Item().with("foo", "fooval").with("bar", "barval").hasAttribute("notExist"));
-    }
-
-    @Test
-    public void testEquals() {
-        assertEquals(new Item().with("foo", "fooval").with("bar", "barval"),
-                new Item().with("foo", "fooval").with("bar", "barval"));
-        assertEquals(new Item().with("foo", "fooval").with("bar", "barval"),
-                new Item().withPrimaryKey(new PrimaryKey("foo", "fooval", "bar", "barval")));
-
-        assertFalse(new Item().equals(new Object()));
-        assertFalse(new Item().equals(null));
-
-        Set<Item> items = new HashSet<Item>();
-        items.add(new Item().with("foo", "fooval").with("bar", "barval"));
-        items.add(new Item().with("foo", "fooval"));
-        assertTrue(items.size() == 2);
-
-        assertTrue(items.contains(new Item().with("foo", "fooval")));
-        assertTrue(items.contains(new Item().with("foo", "fooval").with("bar", "barval")));
-        assertFalse(items.contains(new Item()));
-
-        items.add(new Item());
-        assertTrue(items.contains(new Item()));
-    }
-}
diff --git a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/ItemTestUtils.java b/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/ItemTestUtils.java
deleted file mode 100644
index e0a3e73f3b71..000000000000
--- a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/ItemTestUtils.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.document;
-
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import software.amazon.awssdk.services.dynamodb.document.internal.InternalUtils;
-
-public class ItemTestUtils {
-    /**
-     * Used for testing purposes.
-     */
-    public static boolean equalsItem(Item itemFrom, Item itemTo) {
-        return equalsSimpleValue(itemFrom.asMap(), itemTo.asMap());
-    }
-
-    /**
-     * Used for testing purposes.
-     */
-    @SuppressWarnings("unchecked")
-    public static boolean equalsSimpleValue(Object v0, Object v1) {
-        if (v0 == null || v1 == null) {
-            return v0 == null && v1 == null;
-        }
-        // Byte buffer or byte array
-        if (v0 instanceof ByteBuffer) {
-            return equalsByteBuffer((ByteBuffer) v0, v1);
-        } else if (v1 instanceof ByteBuffer) {
-            return equalsByteBuffer((ByteBuffer) v1, v0);
-        } else if (v0 instanceof byte[]) {
-            return equalsByteArray((byte[]) v0, v1);
-        } else if (v1 instanceof byte[]) {
-            return equalsByteArray((byte[]) v1, v0);
-        }
-        // Number
-        if (v0 instanceof Number && v1 instanceof Number) {
-            String s0 = InternalUtils.valToString(v0);
-            String s1 = InternalUtils.valToString(v1);
-            return s0.equals(s1);
-        }
-        // Map
-        if (v0 instanceof Map && v1 instanceof Map) {
-            Map<String, Object> map0 = (Map<String, Object>) v0;
-            Map<String, Object> map1 = (Map<String, Object>) v1;
-
-            if (map0.size() != map1.size()) {
-                return false;
-            }
-
-            for (Entry<String, Object> e : map0.entrySet()) {
-                if (!equalsSimpleValue(
-                        e.getValue(),
-                        map1.get(e.getKey()))) {
-                    return false;
-                }
-            }
-            return true;
-        }
-        if (v0 instanceof List && v1 instanceof List) {
-            List<Object> map0 = (List<Object>) v0;
-            List<Object> map1 = (List<Object>) v1;
-
-            if (map0.size() != map1.size()) {
-                return false;
-            }
-            for (int i = 0; i < map0.size(); i++) {
-                if (!equalsSimpleValue(map0.get(i), map1.get(i))) {
-                    return false;
-                }
-            }
-            return true;
-        }
-        // Set
-        // Currently this works only if both set have the elements in the same
-        // iteration order.  Can we do better ?
-        if (v0 instanceof Set && v1 instanceof Set) {
-            Set<Object> set0 = (Set<Object>) v0;
-            Set<Object> set1 = (Set<Object>) v1;
-
-            if (set0.size() != set1.size()) {
-                return false;
-            }
-
-            for (Object element0 : set0) {
-                boolean matchFound = false;
-
-                for (Object element1 : set1) {
-                    if (equalsSimpleValue(element0, element1)) {
-                        matchFound = true;
-                        break;
-                    }
-                }
-
-                if (!matchFound) {
-                    return false;
-                }
-            }
-
-            return true;
-        }
-
-        return v0.equals(v1);
-    }
-
-    /**
-     * Used for testing purposes.
-     */
-    private static boolean equalsByteBuffer(ByteBuffer fromByteBuffer, Object o) {
-        byte[] from = fromByteBuffer.array();
-        return equalsByteArray(from, o);
-    }
-
-    /**
-     * Used for testing purposes.
-     */
-    private static boolean equalsByteArray(byte[] from, Object o) {
-        if (o instanceof ByteBuffer) {
-            byte[] to = ((ByteBuffer) o).array();
-            return Arrays.equals(from, to);
-        } else {
-            return (o instanceof byte[])
-                   && Arrays.equals(from, ((byte[]) o));
-        }
-    }
-}
diff --git a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/KeyAttribute.java b/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/KeyAttribute.java
deleted file mode 100644
index b55993a6337d..000000000000
--- a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/KeyAttribute.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.document;
-
-import software.amazon.awssdk.services.dynamodb.document.internal.InternalUtils;
-
-/**
- * A key attribute which consists of an attribute name and value.
- */
-public class KeyAttribute extends Attribute {
-
-    /**
-     * A key attribute which consists of an attribute name and value.
-     */
-    public KeyAttribute(String attrName, Object value) {
-        super(attrName, value);
-        InternalUtils.checkInvalidAttrName(attrName);
-    }
-}
diff --git a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/KeyCondition.java b/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/KeyCondition.java
deleted file mode 100644
index e85bb813ba4d..000000000000
--- a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/KeyCondition.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.document;
-
-import software.amazon.awssdk.services.dynamodb.model.ComparisonOperator;
-
-/**
- * Simple key conditions.
- */
-public enum KeyCondition {
-    EQ(ComparisonOperator.EQ),
-    LE(ComparisonOperator.LE),
-    LT(ComparisonOperator.LT),
-    GE(ComparisonOperator.GE),
-    GT(ComparisonOperator.GT),
-    BEGINS_WITH(ComparisonOperator.BEGINS_WITH),
-    BETWEEN(ComparisonOperator.BETWEEN),;
-
-    private final ComparisonOperator comparisonOperator;
-
-    KeyCondition(ComparisonOperator comparisonOperator) {
-        this.comparisonOperator = comparisonOperator;
-    }
-
-    public ComparisonOperator toComparisonOperator() {
-        return comparisonOperator;
-    }
-}
diff --git a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/LowLevelResultListener.java b/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/LowLevelResultListener.java
deleted file mode 100644
index d628b310ea4c..000000000000
--- a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/LowLevelResultListener.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.document;
-
-/**
- * Can be used to listen to the event of receiving a low level result of type R
- * from the server side.
- *
- * @param <R>
- *            low level result type
- */
-public abstract class LowLevelResultListener<R> {
-    public static final LowLevelResultListener<?> NONE =
-        new LowLevelResultListener<Object>() {
-            @Override
-            public void onLowLevelResult(Object result) {
-            }
-        };
-
-    @SuppressWarnings("unchecked")
-    public static <T> LowLevelResultListener<T> none() {
-        return (LowLevelResultListener<T>) NONE;
-    }
-
-    public abstract void onLowLevelResult(R lowLevelResult);
-}
diff --git a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/Page.java b/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/Page.java
deleted file mode 100644
index 7c5d5d938503..000000000000
--- a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/Page.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.document;
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.NoSuchElementException;
-import software.amazon.awssdk.core.exception.SdkServiceException;
-
-/**
- * A page contains a list of items; accessing methods on the list are
- * guaranteed to be purely in-memory operations that will not block or throw
- * exceptions because of transient network issues. A page also knows whether it
- * has a "next page", and if so knows how to retrieve it (which
- * will almost certainly involve a remote network call that may block or
- * fail).
- *
- * @param <T> item type
- * @param <R> low level result type
- */
-public abstract class Page<T, R> implements Iterable<T> {
-    private final List<T> content;
-    private final R lowLevelResult;
-
-    /**
-     * @param content an unmodifiable list of content
-     * @param lowLevelResult the low level (response) result from AWS
-     */
-    public Page(List<T> content, R lowLevelResult) {
-        if (content == null || lowLevelResult == null) {
-            throw new IllegalArgumentException("both content and lowLevelResult must be specified");
-        }
-        this.content = content;
-        this.lowLevelResult = lowLevelResult;
-    }
-
-    /**
-     * Checks whether this page has a "next page." If this method returns
-     * true, the next page can be retrieved by calling {@code next}. If it
-     * returns false, any call to {@code next} will be guaranteed to throw an
-     * {@code IllegalStateException}.
-     *
-     * @return true if there is next page; false otherwise
-     */
-    public abstract boolean hasNextPage();
-
-    /**
-     * Retrieves the next page.
-     *
-     * @return the next page
-     * @throws NoSuchElementException if there is no next page
-     * @throws SdkServiceException on error making the remote call
-     */
-    public abstract Page<T, R> nextPage();
-
-    public final int size() {
-        return content.size();
-    }
-
-    @Override
-    public final Iterator<T> iterator() {
-        return content.iterator();
-    }
-
-    @Override
-    public String toString() {
-        return content.toString();
-    }
-
-    public final R lowLevelResult() {
-        return lowLevelResult;
-    }
-}
diff --git a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/PageTest.java b/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/PageTest.java
deleted file mode 100644
index 517c7906b787..000000000000
--- a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/PageTest.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.document;
-
-import java.util.ArrayList;
-import java.util.List;
-import org.junit.Test;
-
-public class PageTest {
-
-    @Test(expected = IllegalArgumentException.class)
-    public void testNull_content() {
-        new TestPage(null, new Object());
-    }
-
-    ;
-
-    @Test(expected = IllegalArgumentException.class)
-    public void testNull_result() {
-        new TestPage(new ArrayList<String>(), null);
-    }
-
-    @Test
-    public void test_toString() {
-        System.out.println(new TestPage(new ArrayList<String>(), new Object())
-                                   .toString());
-    }
-
-    private static class TestPage extends Page<String, Object> {
-        TestPage(List<String> content, Object result) {
-            super(content, result);
-        }
-
-        ;
-
-        @Override
-        public boolean hasNextPage() {
-            return false;
-        }
-
-        @Override
-        public TestPage nextPage() {
-            return null;
-        }
-    }
-}
diff --git a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/PrimaryKey.java b/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/PrimaryKey.java
deleted file mode 100644
index ad4236ee5283..000000000000
--- a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/PrimaryKey.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.document;
-
-import java.util.Collection;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.Set;
-import software.amazon.awssdk.services.dynamodb.document.internal.InternalUtils;
-
-/**
- * Used to represent a primary key that has one or multiple key components.
- */
-public class PrimaryKey {
-    private final Map<String, KeyAttribute> components = new LinkedHashMap<String, KeyAttribute>();
-
-    public PrimaryKey() {
-    }
-
-    /**
-     * Constructs with the specified key components.
-     */
-    public PrimaryKey(KeyAttribute... components) {
-        addComponents(components);
-    }
-
-    /**
-     * Constructs with a hash key.
-     */
-    public PrimaryKey(String hashKeyName, Object hashKeyValue) {
-        addComponent(hashKeyName, hashKeyValue);
-    }
-
-    /**
-     * Constructs with a hash key and a range key.
-     */
-    public PrimaryKey(String hashKeyName, Object hashKeyValue,
-                      String rangeKeyName, Object rangeKeyValue) {
-        if (hashKeyName.equals(rangeKeyName)) {
-            throw new IllegalArgumentException("hashKyeName must not be the same as the rangeKeyName");
-        }
-        addComponent(hashKeyName, hashKeyValue);
-        addComponent(rangeKeyName, rangeKeyValue);
-    }
-
-    /**
-     * Returns all the key components of this primary key.
-     */
-    public Collection<KeyAttribute> getComponents() {
-        return components.values();
-    }
-
-    /**
-     * Returns all the key component names of this primary key as a set.
-     */
-    public Set<String> getComponentNameSet() {
-        return components.keySet();
-    }
-
-    /**
-     * Returns true if this primary has the specified key attribute name;
-     * false otherwise.
-     */
-    public boolean hasComponent(String attrName) {
-        return components.containsKey(attrName);
-    }
-
-    /**
-     * Add one or multiple key components to this primary key.
-     *
-     * Note adding a key component with the same name as that of an existing
-     * one would overwrite and become a single key component instead of two.
-     */
-    public PrimaryKey addComponents(KeyAttribute... components) {
-        if (components != null) {
-            for (KeyAttribute ka : components) {
-                InternalUtils.rejectNullInput(ka);
-                this.components.put(ka.name(), ka);
-            }
-        }
-        return this;
-    }
-
-    /**
-     * Add a key component to this primary key.
-     *
-     * Note adding a key component with the same name as that of an existing
-     * one would overwrite and become a single key component instead of two.
-     */
-    public PrimaryKey addComponent(String keyAttributeName, Object keyAttributeValue) {
-        components.put(keyAttributeName,
-                       new KeyAttribute(keyAttributeName, keyAttributeValue));
-        return this;
-    }
-
-    @Override
-    public String toString() {
-        return String.valueOf(components);
-    }
-
-    @Override
-    public int hashCode() {
-        return components.hashCode();
-    }
-
-    @Override
-    public boolean equals(Object in) {
-        if (in instanceof PrimaryKey) {
-            PrimaryKey that = (PrimaryKey) in;
-            return this.components.equals(that.components);
-        } else {
-            return false;
-        }
-    }
-}
diff --git a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/PrimaryKeyTest.java b/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/PrimaryKeyTest.java
deleted file mode 100644
index dea5cbce36c9..000000000000
--- a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/PrimaryKeyTest.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.document;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import java.util.HashSet;
-import java.util.Set;
-import org.junit.Test;
-
-public class PrimaryKeyTest {
-
-    @Test
-    public void ctor_KeyAttributes() {
-        new PrimaryKey();
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void ctor_nullKeyAttributes() {
-        new PrimaryKey((KeyAttribute) null);
-    }
-
-    @Test
-    public void ctor_nullValue() {
-        new PrimaryKey("name", null);
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void ctor_nullName() {
-        new PrimaryKey(null, "val");
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void ctor_emptyName() {
-        new PrimaryKey("  ", "val");
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void ctor_sameHashRangeKeyNames() {
-        new PrimaryKey("key", "val1", "key", "val2");
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void ctor_badHashKeyName() {
-        new PrimaryKey("", "val1", "key", "val2");
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void ctor_badRangeKeyName() {
-        new PrimaryKey("key1", "val1", "", "val2");
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void addComponents_nullElement() {
-        new PrimaryKey().addComponents((KeyAttribute) null);
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void addComponent_nullName() {
-        new PrimaryKey().addComponent(null, "val");
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void addComponent_emptyName() {
-        new PrimaryKey().addComponent("  ", "val");
-    }
-
-    @Test
-    public void addComponent_nullVal() {
-        new PrimaryKey().addComponent("key", null);
-    }
-
-    @Test
-    public void addComponents_null() {
-        new PrimaryKey().addComponents((KeyAttribute[]) null);
-    }
-
-    @Test
-    public void ctor_nullHashRangeKeys() {
-        new PrimaryKey("hashkey", null, "rangekey", null);
-    }
-
-    @Test
-    public void testEquals() {
-        assertEquals(new PrimaryKey("hashkey", null, "rangekey", null),
-                     new PrimaryKey("hashkey", null, "rangekey", null));
-
-        assertEquals(new PrimaryKey("k1", "v1", "k2", "v2"),
-                     new PrimaryKey("k1", "v1", "k2", "v2"));
-        assertFalse(new PrimaryKey("k1", "v1").equals(new Attribute("k1", "v1")));
-        assertFalse(new PrimaryKey("k1", "v1").equals(null));
-
-        Set<PrimaryKey> set = new HashSet<PrimaryKey>();
-        set.add(new PrimaryKey("k1", "v1", "k2", "v2"));
-        set.add(new PrimaryKey("k1", "v1", "k2", "v2"));
-        assertTrue(set.size() == 1);
-
-        set.add(new PrimaryKey("k1", "v1"));
-        assertTrue(set.size() == 2);
-    }
-
-    @Test
-    public void hasComponent() {
-        assertTrue(new PrimaryKey("hashkey", null, "rangekey", null).hasComponent("hashkey"));
-        assertTrue(new PrimaryKey("hashkey", null, "rangekey", null).hasComponent("rangekey"));
-        assertFalse(new PrimaryKey("hashkey", null, "rangekey", null).hasComponent("notExist"));
-        assertTrue(new PrimaryKey("k1", "v1", "k2", "v2").hasComponent("k1"));
-        assertTrue(new PrimaryKey("k1", "v1", "k2", "v2").hasComponent("k2"));
-        assertFalse(new PrimaryKey("k1", "v1", "k2", "v2").hasComponent("notExist"));
-    }
-}
diff --git a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/PutItemOutcome.java b/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/PutItemOutcome.java
deleted file mode 100644
index e13067f7a945..000000000000
--- a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/PutItemOutcome.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.document;
-
-import java.util.Map;
-import software.amazon.awssdk.services.dynamodb.document.internal.InternalUtils;
-import software.amazon.awssdk.services.dynamodb.model.PutItemResponse;
-
-/**
- * The outcome of putting an item to a DynamoDB table.
- */
-public class PutItemOutcome {
-    private final PutItemResponse result;
-
-    /**
-     * @param result the low-level result; must not be null
-     */
-    public PutItemOutcome(PutItemResponse result) {
-        if (result == null) {
-            throw new IllegalArgumentException();
-        }
-        this.result = result;
-    }
-
-    /**
-     * Returns all the returned attributes as a (non-null) {@link Item}.
-     */
-    public Item getItem() {
-        Map<String, Object> attributes =
-                InternalUtils.toSimpleMapValue(result.attributes());
-        Item item = Item.fromMap(attributes);
-        return item;
-    }
-
-    /**
-     * Returns a non-null low-level result returned from the server side.
-     */
-    public PutItemResponse getPutItemResponse() {
-        return result;
-    }
-
-    @Override
-    public String toString() {
-        return String.valueOf(result);
-    }
-}
diff --git a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/QueryFilter.java b/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/QueryFilter.java
deleted file mode 100644
index 920efe49eecc..000000000000
--- a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/QueryFilter.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.document;
-
-import software.amazon.awssdk.services.dynamodb.document.internal.Filter;
-
-/**
- * A <a href=
- * "http://docs.aws.amazon.com/amazondynamodb/latest/APIReference/API_Query.html#DDB-Query-request-QueryFilter"
- * >query filter</a>.
- *
- * Typical usages:
- * <blockquote>
- * <code>new QueryFilter("strAttr").eq("attrValue");</code>
- * <p>
- * <code>new QueryFilter("intAttr").gt(42);</code>
- * <p>
- * ...
- * </blockquote>
- */
-public class QueryFilter extends Filter<QueryFilter> {
-
-    /**
-     * A <a href=
-     * "http://docs.aws.amazon.com/amazondynamodb/latest/APIReference/API_Query.html#DDB-Query-request-QueryFilter"
-     * >query filter</a>.
-     *
-     * Typical usages:
-     * <blockquote>
-     * <code>new QueryFilter("strAttr").eq("attrValue");</code>
-     * <p>
-     * <code>new QueryFilter("intAttr").gt(42);</code>
-     * <p>
-     * ...
-     * </blockquote>
-     */
-    public QueryFilter(String attr) {
-        super(attr);
-    }
-}
diff --git a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/QueryOutcome.java b/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/QueryOutcome.java
deleted file mode 100644
index 7f0176996bf0..000000000000
--- a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/QueryOutcome.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.document;
-
-import java.util.List;
-import software.amazon.awssdk.services.dynamodb.document.internal.InternalUtils;
-import software.amazon.awssdk.services.dynamodb.model.QueryResponse;
-
-/**
- * The outcome of query on DynamoDB table.
- */
-public class QueryOutcome {
-    private final QueryResponse result;
-
-    /**
-     * @param result the low-level result; must not be null
-     */
-    public QueryOutcome(QueryResponse result) {
-        if (result == null) {
-            throw new IllegalArgumentException();
-        }
-        this.result = result;
-    }
-
-    /**
-     * Returns a non-null list of the returned items; can be empty.
-     */
-    public List<Item> getItems() {
-        return InternalUtils.toItemList(result.items());
-    }
-
-    /**
-     * Returns a non-null low-level result returned from the server side.
-     */
-    public QueryResponse getQueryResponse() {
-        return result;
-    }
-
-    @Override
-    public String toString() {
-        return String.valueOf(result);
-    }
-}
diff --git a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/RangeKeyCondition.java b/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/RangeKeyCondition.java
deleted file mode 100644
index 81c1208ef05d..000000000000
--- a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/RangeKeyCondition.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.document;
-
-import software.amazon.awssdk.services.dynamodb.document.internal.InternalUtils;
-
-
-/**
- * A condition for selecting items with a range key.  Typical usages:
- * <blockquote>
- * <code>new RangeKeyCondition("strAttr").eq("attrValue");</code>
- * <p>
- * <code>new RangeKeyCondition("intAttr").gt(42);</code>
- * <p>
- * ...
- * </blockquote>
- */
-public class RangeKeyCondition {
-    private final String attrName;
-    private KeyCondition kcond;
-    private Object[] values;
-
-    /**
-     * A condition for selecting items with a range key.  Typical usages:
-     * <blockquote>
-     * <code>new RangeKeyCondition("strAttr").eq("attrValue");</code>
-     * <p>
-     * <code>new RangeKeyCondition("intAttr").gt(42);</code>
-     * <p>
-     * ...
-     * </blockquote>
-     */
-    public RangeKeyCondition(String attrName) {
-        InternalUtils.checkInvalidAttrName(attrName);
-        this.attrName = attrName;
-    }
-
-    public String getAttrName() {
-        return attrName;
-    }
-
-    public KeyCondition getKeyCondition() {
-        return kcond;
-    }
-
-    public Object[] values() {
-        return values == null ? null : values.clone();
-    }
-
-    /**
-     * Creates and returns a condition of the range key being equal to the given
-     * value.
-     */
-    public RangeKeyCondition eq(Object val) {
-        kcond = KeyCondition.EQ;
-        return values(val);
-    }
-
-    /**
-     * Creates and returns a condition of the range key with a value that begins
-     * with the given value.
-     */
-    public RangeKeyCondition beginsWith(String val) {
-        kcond = KeyCondition.BEGINS_WITH;
-        return values(val);
-    }
-
-    /**
-     * Creates and returns a condition of the range key that has a value between
-     * the given values.
-     */
-    public RangeKeyCondition between(Object low, Object hi) {
-        kcond = KeyCondition.BETWEEN;
-        return values(low, hi);
-    }
-
-    /**
-     * Creates and returns a condition of the range key being greater than or
-     * equal to the given value.
-     */
-    public RangeKeyCondition ge(Object val) {
-        kcond = KeyCondition.GE;
-        return values(val);
-    }
-
-    /**
-     * Creates and returns a condition of the range key being greater than the
-     * given value.
-     */
-    public RangeKeyCondition gt(Object val) {
-        kcond = KeyCondition.GT;
-        return values(val);
-    }
-
-    /**
-     * Creates and returns a condition of the range key being less than or equal
-     * to the given value.
-     */
-    public RangeKeyCondition le(Object val) {
-        kcond = KeyCondition.LE;
-        return values(val);
-    }
-
-    /**
-     * Creates and returns a condition of the range key being less than the
-     * given value.
-     */
-    public RangeKeyCondition lt(Object val) {
-        kcond = KeyCondition.LT;
-        return values(val);
-    }
-
-    private RangeKeyCondition values(Object... values) {
-        this.values = values;
-        return this;
-    }
-}
diff --git a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/ScanFilter.java b/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/ScanFilter.java
deleted file mode 100644
index 99753f842374..000000000000
--- a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/ScanFilter.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.document;
-
-import software.amazon.awssdk.services.dynamodb.document.internal.Filter;
-
-/**
- * A <a href="http://docs.aws.amazon.com/amazondynamodb/latest/APIReference/API_Scan.html#DDB-Scan-request-ScanFilter"
- * >scan filter</a>.
- *
- * Typical usages:
- * <blockquote>
- * <code>new ScanFilter("strAttr").eq("attrValue");</code>
- * <p>
- * <code>new ScanFilter("intAttr").gt(42);</code>
- * <p>
- * ...
- * </blockquote>
- */
-public class ScanFilter extends Filter<ScanFilter> {
-
-    /**
-     * A <a href="http://docs.aws.amazon.com/amazondynamodb/latest/APIReference/API_Scan.html#DDB-Scan-request-ScanFilter"
-     * >scan filter</a>.
-     *
-     * Typical usages:
-     * <blockquote>
-     * <code>new ScanFilter("strAttr").eq("attrValue");</code>
-     * <p>
-     * <code>new ScanFilter("intAttr").gt(42);</code>
-     * <p>
-     * ...
-     * </blockquote>
-     */
-    public ScanFilter(String attr) {
-        super(attr);
-    }
-}
diff --git a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/ScanOutcome.java b/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/ScanOutcome.java
deleted file mode 100644
index 834e46a7a7f9..000000000000
--- a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/ScanOutcome.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.document;
-
-import java.util.List;
-import software.amazon.awssdk.services.dynamodb.document.internal.InternalUtils;
-import software.amazon.awssdk.services.dynamodb.model.ScanResponse;
-
-/**
- * The outcome of scanning the DynamoDB table.
- */
-public class ScanOutcome {
-    private final ScanResponse result;
-
-    /**
-     * @param result the low-level result; must not be null
-     */
-    public ScanOutcome(ScanResponse result) {
-        if (result == null) {
-            throw new IllegalArgumentException();
-        }
-        this.result = result;
-    }
-
-    /**
-     * Returns a non-null list of the returned items; can be empty.
-     */
-    public List<Item> getItems() {
-        return InternalUtils.toItemList(result.items());
-    }
-
-    /**
-     * Returns a non-null low-level result returned from the server side.
-     */
-    public ScanResponse scanResult() {
-        return result;
-    }
-
-    @Override
-    public String toString() {
-        return String.valueOf(result);
-    }
-}
diff --git a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/Table.java b/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/Table.java
deleted file mode 100644
index 7761cf4d0c89..000000000000
--- a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/Table.java
+++ /dev/null
@@ -1,776 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.document;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import software.amazon.awssdk.annotations.ThreadSafe;
-import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
-import software.amazon.awssdk.services.dynamodb.document.api.DeleteItemApi;
-import software.amazon.awssdk.services.dynamodb.document.api.GetItemApi;
-import software.amazon.awssdk.services.dynamodb.document.api.PutItemApi;
-import software.amazon.awssdk.services.dynamodb.document.api.QueryApi;
-import software.amazon.awssdk.services.dynamodb.document.api.ScanApi;
-import software.amazon.awssdk.services.dynamodb.document.api.UpdateItemApi;
-import software.amazon.awssdk.services.dynamodb.document.internal.DeleteItemImpl;
-import software.amazon.awssdk.services.dynamodb.document.internal.GetItemImpl;
-import software.amazon.awssdk.services.dynamodb.document.internal.InternalUtils;
-import software.amazon.awssdk.services.dynamodb.document.internal.PutItemImpl;
-import software.amazon.awssdk.services.dynamodb.document.internal.QueryImpl;
-import software.amazon.awssdk.services.dynamodb.document.internal.ScanImpl;
-import software.amazon.awssdk.services.dynamodb.document.internal.UpdateItemImpl;
-import software.amazon.awssdk.services.dynamodb.document.spec.DeleteItemSpec;
-import software.amazon.awssdk.services.dynamodb.document.spec.GetItemSpec;
-import software.amazon.awssdk.services.dynamodb.document.spec.PutItemSpec;
-import software.amazon.awssdk.services.dynamodb.document.spec.QuerySpec;
-import software.amazon.awssdk.services.dynamodb.document.spec.ScanSpec;
-import software.amazon.awssdk.services.dynamodb.document.spec.UpdateItemSpec;
-import software.amazon.awssdk.services.dynamodb.document.spec.UpdateTableSpec;
-import software.amazon.awssdk.services.dynamodb.model.AttributeDefinition;
-import software.amazon.awssdk.services.dynamodb.model.CreateGlobalSecondaryIndexAction;
-import software.amazon.awssdk.services.dynamodb.model.CreateTableRequest;
-import software.amazon.awssdk.services.dynamodb.model.DeleteTableRequest;
-import software.amazon.awssdk.services.dynamodb.model.DeleteTableResponse;
-import software.amazon.awssdk.services.dynamodb.model.DescribeTableRequest;
-import software.amazon.awssdk.services.dynamodb.model.DescribeTableResponse;
-import software.amazon.awssdk.services.dynamodb.model.GlobalSecondaryIndexDescription;
-import software.amazon.awssdk.services.dynamodb.model.GlobalSecondaryIndexUpdate;
-import software.amazon.awssdk.services.dynamodb.model.IndexStatus;
-import software.amazon.awssdk.services.dynamodb.model.ProvisionedThroughput;
-import software.amazon.awssdk.services.dynamodb.model.ResourceNotFoundException;
-import software.amazon.awssdk.services.dynamodb.model.TableDescription;
-import software.amazon.awssdk.services.dynamodb.model.TableStatus;
-import software.amazon.awssdk.services.dynamodb.model.UpdateTableRequest;
-import software.amazon.awssdk.services.dynamodb.model.UpdateTableResponse;
-
-/**
- * A DynamoDB table. Instance of this class is typically obtained via
- * {@link DynamoDb#getTable(String)}.
- */
-@ThreadSafe
-public class Table implements PutItemApi, GetItemApi, QueryApi, ScanApi,
-                              UpdateItemApi, DeleteItemApi {
-    private static final long SLEEP_TIME_MILLIS = 5000;
-    private final String tableName;
-    private final DynamoDbClient client;
-    private final PutItemImpl putItemDelegate;
-    private final GetItemImpl getItemDelegate;
-    private final UpdateItemImpl updateItemDelegate;
-    private final DeleteItemImpl deleteItemDelegate;
-    private final QueryImpl queryDelegate;
-    private final ScanImpl scanDelegate;
-    private volatile TableDescription tableDescription;
-
-    public Table(DynamoDbClient client, String tableName) {
-        this(client, tableName, null);
-    }
-
-    public Table(DynamoDbClient client, String tableName,
-                 TableDescription tableDescription) {
-        if (client == null) {
-            throw new IllegalArgumentException("client must be specified");
-        }
-        if (tableName == null || tableName.trim().length() == 0) {
-            throw new IllegalArgumentException("table name must not be null or empty");
-        }
-        this.client = client;
-        this.tableName = tableName;
-        this.tableDescription = tableDescription;
-
-        this.putItemDelegate = new PutItemImpl(client, this);
-        this.getItemDelegate = new GetItemImpl(client, this);
-        this.updateItemDelegate = new UpdateItemImpl(client, this);
-        this.deleteItemDelegate = new DeleteItemImpl(client, this);
-
-        this.queryDelegate = new QueryImpl(client, this);
-        this.scanDelegate = new ScanImpl(client, this);
-    }
-
-    public String getTableName() {
-        return tableName;
-    }
-
-    /**
-     * Returns the table description; or null if the table description has not
-     * yet been described via {@link #describe()}.  No network call.
-     */
-    public TableDescription getDescription() {
-        return tableDescription;
-    }
-
-    /**
-     * Retrieves the table description from DynamoDB. Involves network calls.
-     * Meant to be called as infrequently as possible to avoid throttling
-     * exception from the server side.
-     *
-     * @return a non-null table description
-     *
-     * @throws ResourceNotFoundException if the table doesn't exist
-     */
-    public TableDescription describe() {
-        DescribeTableResponse result = client.describeTable(
-                InternalUtils.applyUserAgent(DescribeTableRequest.builder().tableName(tableName).build()));
-        TableDescription description = result.table();
-        tableDescription = description;
-        return description;
-    }
-
-    /**
-     * Gets a reference to the specified index. No network call.
-     */
-    public Index getIndex(String indexName) {
-        return new Index(client, indexName, this);
-    }
-
-    @Override
-    public PutItemOutcome putItem(Item item) {
-        return putItemDelegate.putItem(item);
-    }
-
-    @Override
-    public PutItemOutcome putItem(Item item, Expected... expected) {
-        return putItemDelegate.putItem(item, expected);
-    }
-
-    @Override
-    public PutItemOutcome putItem(Item item, String conditionExpression,
-                                  Map<String, String> nameMap, Map<String, Object> valueMap) {
-        return putItemDelegate.putItem(item, conditionExpression, nameMap,
-                                       valueMap);
-    }
-
-    @Override
-    public PutItemOutcome putItem(PutItemSpec spec) {
-        return putItemDelegate.putItem(spec);
-    }
-
-    @Override
-    public GetItemOutcome getItemOutcome(KeyAttribute... primaryKeyComponents) {
-        return getItemDelegate.getItemOutcome(primaryKeyComponents);
-    }
-
-    @Override
-    public GetItemOutcome getItemOutcome(PrimaryKey primaryKey) {
-        return getItemDelegate.getItemOutcome(primaryKey);
-    }
-
-    @Override
-    public GetItemOutcome getItemOutcome(PrimaryKey primaryKey,
-                                         String projectionExpression, Map<String, String> nameMap) {
-        return getItemDelegate.getItemOutcome(primaryKey, projectionExpression,
-                                              nameMap);
-    }
-
-    @Override
-    public GetItemOutcome getItemOutcome(GetItemSpec params) {
-        return getItemDelegate.getItemOutcome(params);
-    }
-
-    @Override
-    public UpdateItemOutcome updateItem(PrimaryKey primaryKey,
-                                        AttributeUpdate... attributeUpdates) {
-        return updateItemDelegate.updateItem(primaryKey, attributeUpdates);
-    }
-
-    @Override
-    public UpdateItemOutcome updateItem(PrimaryKey primaryKey,
-                                        Collection<Expected> expected, AttributeUpdate... attributeUpdates) {
-        return updateItemDelegate.updateItem(primaryKey, expected,
-                                             attributeUpdates);
-
-    }
-
-    @Override
-    public UpdateItemOutcome updateItem(PrimaryKey primaryKey,
-                                        String updateExpression, Map<String, String> nameMap,
-                                        Map<String, Object> valueMap) {
-        return updateItemDelegate.updateItem(primaryKey, updateExpression,
-                                             nameMap, valueMap);
-    }
-
-    @Override
-    public UpdateItemOutcome updateItem(PrimaryKey primaryKey,
-                                        String updateExpression, String conditionExpression,
-                                        Map<String, String> nameMap, Map<String, Object> valueMap) {
-        return updateItemDelegate.updateItem(primaryKey, updateExpression,
-                                             conditionExpression, nameMap, valueMap);
-    }
-
-    @Override
-    public UpdateItemOutcome updateItem(UpdateItemSpec updateItemSpec) {
-        return updateItemDelegate.updateItem(updateItemSpec);
-    }
-
-    @Override
-    public ItemCollection<QueryOutcome> query(String hashKeyName, Object hashKeyValue) {
-        return queryDelegate.query(hashKeyName, hashKeyValue);
-    }
-
-    @Override
-    public ItemCollection<QueryOutcome> query(KeyAttribute hashKey) {
-        return queryDelegate.query(hashKey);
-    }
-
-    @Override
-    public ItemCollection<QueryOutcome> query(KeyAttribute hashKey,
-                                              RangeKeyCondition rangeKeyCondition) {
-        return queryDelegate.query(hashKey, rangeKeyCondition);
-    }
-
-    @Override
-    public ItemCollection<QueryOutcome> query(KeyAttribute hashKey,
-                                              RangeKeyCondition rangeKeyCondition, String filterExpression,
-                                              String projectionExpression, Map<String, String> nameMap,
-                                              Map<String, Object> valueMap) {
-        return queryDelegate.query(hashKey, rangeKeyCondition,
-                                   filterExpression, projectionExpression, nameMap, valueMap);
-    }
-
-    @Override
-    public ItemCollection<QueryOutcome> query(KeyAttribute hashKey,
-                                              RangeKeyCondition rangeKeyCondition, QueryFilter... queryFilters) {
-        return queryDelegate.query(hashKey, rangeKeyCondition, queryFilters);
-    }
-
-    @Override
-    public ItemCollection<QueryOutcome> query(KeyAttribute hashKey,
-                                              RangeKeyCondition rangeKeyCondition, String filterExpression,
-                                              Map<String, String> nameMap, Map<String, Object> valueMap) {
-        return queryDelegate.query(hashKey, rangeKeyCondition,
-                                   filterExpression, nameMap, valueMap);
-    }
-
-    @Override
-    public ItemCollection<QueryOutcome> query(QuerySpec spec) {
-        return queryDelegate.query(spec);
-    }
-
-    @Override
-    public ItemCollection<ScanOutcome> scan(ScanFilter... scanFilters) {
-        return scanDelegate.scan(scanFilters);
-    }
-
-    @Override
-    public ItemCollection<ScanOutcome> scan(String filterExpression,
-                                            Map<String, String> nameMap, Map<String, Object> valueMap) {
-        return scanDelegate.scan(filterExpression, nameMap, valueMap);
-    }
-
-    @Override
-    public ItemCollection<ScanOutcome> scan(String filterExpression,
-                                            String projectionExpression, Map<String, String> nameMap,
-                                            Map<String, Object> valueMap) {
-        return scanDelegate.scan(filterExpression, projectionExpression, nameMap, valueMap);
-    }
-
-    @Override
-    public ItemCollection<ScanOutcome> scan(ScanSpec params) {
-        return scanDelegate.scan(params);
-    }
-
-    @Override
-    public DeleteItemOutcome deleteItem(KeyAttribute... primaryKeyComponents) {
-        return deleteItemDelegate.deleteItem(primaryKeyComponents);
-    }
-
-    @Override
-    public DeleteItemOutcome deleteItem(PrimaryKey primaryKey) {
-        return deleteItemDelegate.deleteItem(primaryKey);
-    }
-
-    @Override
-    public DeleteItemOutcome deleteItem(PrimaryKey primaryKey,
-                                        Expected... expected) {
-        return deleteItemDelegate.deleteItem(primaryKey, expected);
-    }
-
-    @Override
-    public DeleteItemOutcome deleteItem(PrimaryKey primaryKey,
-                                        String conditionExpression, Map<String, String> nameMap,
-                                        Map<String, Object> valueMap) {
-        return deleteItemDelegate.deleteItem(primaryKey,
-                                             conditionExpression, nameMap, valueMap);
-    }
-
-    @Override
-    public DeleteItemOutcome deleteItem(DeleteItemSpec spec) {
-        return deleteItemDelegate.deleteItem(spec);
-    }
-
-    /**
-     * Updates the provisioned throughput for this table. Setting the
-     * throughput for a table helps you manage performance and is part of the
-     * provisioned throughput feature of DynamoDB.
-     * <p>
-     * The provisioned throughput values can be upgraded or downgraded based
-     * on the maximums and minimums listed in the
-     * <a href="http://docs.aws.amazon.com/amazondynamodb/latest/developerguide/Limits.html"> Limits </a>
-     * section in the Amazon DynamoDB Developer Guide.
-     * <p>
-     * This table must be in the <code>ACTIVE</code> state for this operation
-     * to succeed. <i>UpdateTable</i> is an asynchronous operation; while
-     * executing the operation, the table is in the <code>UPDATING</code>
-     * state. While the table is in the <code>UPDATING</code> state, the
-     * table still has the provisioned throughput from before the call. The
-     * new provisioned throughput setting is in effect only when the table
-     * returns to the <code>ACTIVE</code> state after the <i>UpdateTable</i>
-     * operation.
-     * <p>
-     * You can create, update or delete indexes using <i>UpdateTable</i>.
-     * </p>
-     *
-     * @param spec used to specify all the detailed parameters
-     *
-     * @return the updated table description returned from DynamoDB.
-     */
-    public TableDescription updateTable(UpdateTableSpec spec) {
-        UpdateTableRequest.Builder reqBuilder = spec.getRequest().toBuilder();
-        reqBuilder.tableName(getTableName());
-        UpdateTableRequest updated = reqBuilder.build();
-        UpdateTableResponse result = client.updateTable(updated);
-        TableDescription description = result.tableDescription();
-        this.tableDescription = description;
-
-        return description;
-    }
-
-    /**
-     * Creates a global secondary index (GSI) with only a hash key on this
-     * table. Involves network calls. This table must be in the
-     * <code>ACTIVE</code> state for this operation to succeed. Creating a
-     * global secondary index is an asynchronous operation; while executing the
-     * operation, the index is in the <code>CREATING</code> state. Once created,
-     * the index will be in <code>ACTIVE</code> state.
-     *
-     * @param create
-     *            used to specify the details of the index creation
-     * @param hashKeyDefinition
-     *            used to specify the attribute for describing the key schema
-     *            for the hash key of the GSI to be created for this table.
-     *
-     * @return the index being created
-     */
-    public Index createGsi(
-            CreateGlobalSecondaryIndexAction create,
-            AttributeDefinition hashKeyDefinition) {
-        return doCreateGsi(create, hashKeyDefinition);
-    }
-
-    /**
-     * Creates a global secondary index (GSI) with both a hash key and a range
-     * key on this table. Involves network calls. This table must be in the
-     * <code>ACTIVE</code> state for this operation to succeed. Creating a
-     * global secondary index is an asynchronous operation; while executing the
-     * operation, the index is in the <code>CREATING</code> state. Once created,
-     * the index will be in <code>ACTIVE</code> state.
-     *
-     * @param create
-     *            used to specify the details of the index creation
-     * @param hashKeyDefinition
-     *            used to specify the attribute for describing the key schema
-     *            for the hash key of the GSI to be created for this table.
-     * @param rangeKeyDefinition
-     *            used to specify the attribute for describing the key schema
-     *            for the range key of the GSI to be created for this table.
-     *
-     * @return the index being created
-     */
-    public Index createGsi(
-            CreateGlobalSecondaryIndexAction create,
-            AttributeDefinition hashKeyDefinition,
-            AttributeDefinition rangeKeyDefinition) {
-        return doCreateGsi(create, hashKeyDefinition, rangeKeyDefinition);
-    }
-
-    private Index doCreateGsi(
-            CreateGlobalSecondaryIndexAction create,
-            AttributeDefinition... keyDefinitions) {
-        UpdateTableSpec spec = new UpdateTableSpec()
-                .withAttributeDefinitions(keyDefinitions)
-                .withGlobalSecondaryIndexUpdates(GlobalSecondaryIndexUpdate.builder()
-                        .create(create).build());
-        updateTable(spec);
-        return this.getIndex(create.indexName());
-    }
-
-    /**
-     * Updates the provisioned throughput for this table. Setting the
-     * throughput for a table helps you manage performance and is part of the
-     * provisioned throughput feature of DynamoDB.
-     * <p>
-     * The provisioned throughput values can be upgraded or downgraded based
-     * on the maximums and minimums listed in the
-     * <a href="http://docs.aws.amazon.com/amazondynamodb/latest/developerguide/Limits.html"> Limits </a>
-     * section in the Amazon DynamoDB Developer Guide.
-     * <p>
-     * This table must be in the <code>ACTIVE</code> state for this operation
-     * to succeed. <i>UpdateTable</i> is an asynchronous operation; while
-     * executing the operation, the table is in the <code>UPDATING</code>
-     * state. While the table is in the <code>UPDATING</code> state, the
-     * table still has the provisioned throughput from before the call. The
-     * new provisioned throughput setting is in effect only when the table
-     * returns to the <code>ACTIVE</code> state after the <i>UpdateTable</i>
-     * operation.
-     * <p>
-     * You can create, update or delete indexes using <i>UpdateTable</i>.
-     * </p>
-     *
-     * @param provisionedThroughput target provisioned throughput
-     *
-     * @return the updated table description returned from DynamoDB.
-     */
-    public TableDescription updateTable(
-            ProvisionedThroughput provisionedThroughput) {
-        return updateTable(new UpdateTableSpec()
-                                   .withProvisionedThroughput(provisionedThroughput));
-    }
-
-    /**
-     * A convenient blocking call that can be used, typically during table
-     * creation, to wait for the table to become active. This method uses
-     * {@link software.amazon.awssdk.services.dynamodb.waiters.AmazonDynamoDBWaiters}
-     * to poll the status of the table every 5 seconds.
-     *
-     * @return the table description when the table has become active
-     *
-     * @throws IllegalArgumentException if the table is being deleted
-     * @throws ResourceNotFoundException if the table doesn't exist
-     */
-    public TableDescription waitForActive() throws InterruptedException {
-        throw new UnsupportedOperationException();
-    }
-
-    /**
-     * A convenient blocking call that can be used, typically during table
-     * deletion, to wait for the table to become deleted. This method uses
-     * {@link software.amazon.awssdk.services.dynamodb.waiters.AmazonDynamoDBWaiters}
-     * to poll the status of the table every 5 seconds.
-     */
-    public void waitForDelete() throws InterruptedException {
-        throw new UnsupportedOperationException();
-    }
-
-    /**
-     * A convenient blocking call that can be used to wait on a table until it
-     * has either become active or deleted (ie no longer exists) by polling the
-     * table every 5 seconds.
-     *
-     * @return the table description if the table has become active; or null
-     *     if the table has been deleted.
-     *
-     * @deprecated If this method is called immediately after
-     *     {@link DynamoDbClient#createTable(CreateTableRequest)} or
-     *     {@link DynamoDbClient#deleteTable(DeleteTableRequest)} operation,
-     *     the result might be incorrect as all {@link DynamoDbClient}
-     *     operations are eventually consistent and might have a few seconds delay before the status is changed.
-     */
-    @Deprecated
-    public TableDescription waitForActiveOrDelete() throws InterruptedException {
-        try {
-            for (; ; ) {
-                TableDescription desc = describe();
-                if (desc.tableStatus() == TableStatus.ACTIVE) {
-                    return desc;
-                } else {
-                    Thread.sleep(SLEEP_TIME_MILLIS);
-                }
-            }
-        } catch (ResourceNotFoundException deleted) {
-            // Ignored or expected.
-        }
-        return null;
-    }
-
-    /**
-     * A convenient blocking call that can be used to wait on a table and all
-     * it's indexes until both the table and it's indexes have either become
-     * active or deleted (ie no longer exists) by polling the table every 5
-     * seconds.
-     *
-     * @return the table description if the table and all it's indexes have
-     *         become active; or null if the table has been deleted.
-     *
-     * @deprecated If this method is called immediately after
-     *     {@link DynamoDbClient#createTable(CreateTableRequest)} or
-     *     {@link DynamoDbClient#deleteTable(DeleteTableRequest)} operation,
-     *     the result might be incorrect as all {@link DynamoDbClient}
-     *     operations are eventually consistent and might have a few seconds delay before the status is changed.
-     */
-    @Deprecated
-    public TableDescription waitForAllActiveOrDelete() throws InterruptedException {
-        try {
-            retry:
-            for (; ; ) {
-                TableDescription desc = describe();
-                if (desc.tableStatus() == TableStatus.ACTIVE) {
-                    List<GlobalSecondaryIndexDescription> descriptions =
-                            desc.globalSecondaryIndexes();
-                    if (descriptions != null) {
-                        for (GlobalSecondaryIndexDescription d : descriptions) {
-                            if (d.indexStatus() != IndexStatus.ACTIVE) {
-                                // Some index is not active.  Keep waiting.
-                                Thread.sleep(SLEEP_TIME_MILLIS);
-                                continue retry;
-                            }
-                        }
-                    }
-                    return desc;
-                }
-                Thread.sleep(SLEEP_TIME_MILLIS);
-                continue;
-            }
-        } catch (ResourceNotFoundException deleted) {
-            // Ignored or expected.
-        }
-        return null;
-    }
-
-    /**
-     * Deletes the table from DynamoDB. Involves network calls.
-     */
-    public DeleteTableResponse delete() {
-        return client.deleteTable(DeleteTableRequest.builder().tableName(tableName).build());
-    }
-
-    @Override
-    public Item getItem(KeyAttribute... primaryKeyComponents) {
-        return getItemDelegate.getItem(primaryKeyComponents);
-    }
-
-    @Override
-    public Item getItem(PrimaryKey primaryKey) {
-        return getItemDelegate.getItem(primaryKey);
-    }
-
-    @Override
-    public Item getItem(PrimaryKey primaryKey, String projectionExpression,
-                        Map<String, String> nameMap) {
-        return getItemDelegate.getItem(primaryKey, projectionExpression, nameMap);
-    }
-
-    @Override
-    public Item getItem(GetItemSpec spec) {
-        return getItemDelegate.getItem(spec);
-    }
-
-    @Override
-    public GetItemOutcome getItemOutcome(String hashKeyName, Object hashKeyValue) {
-        return getItemDelegate.getItemOutcome(hashKeyName, hashKeyValue);
-    }
-
-    @Override
-    public GetItemOutcome getItemOutcome(String hashKeyName, Object hashKeyValue,
-                                         String rangeKeyName, Object rangeKeyValue) {
-        return getItemDelegate.getItemOutcome(hashKeyName, hashKeyValue, rangeKeyName, rangeKeyValue);
-    }
-
-    @Override
-    public Item getItem(String hashKeyName, Object hashKeyValue) {
-        return getItemDelegate.getItem(hashKeyName, hashKeyValue);
-    }
-
-    @Override
-    public Item getItem(String hashKeyName, Object hashKeyValue,
-                        String rangeKeyName, Object rangeKeyValue) {
-        return getItemDelegate.getItem(hashKeyName, hashKeyValue, rangeKeyName, rangeKeyValue);
-    }
-
-    @Override
-    public ItemCollection<QueryOutcome> query(String hashKeyName,
-                                              Object hashKeyValue, RangeKeyCondition rangeKeyCondition) {
-        return queryDelegate.query(hashKeyName, hashKeyValue, rangeKeyCondition);
-    }
-
-    @Override
-    public ItemCollection<QueryOutcome> query(String hashKeyName,
-                                              Object hashKeyValue, RangeKeyCondition rangeKeyCondition,
-                                              QueryFilter... queryFilters) {
-        return queryDelegate.query(hashKeyName, hashKeyValue,
-                                   rangeKeyCondition, queryFilters);
-    }
-
-    @Override
-    public ItemCollection<QueryOutcome> query(String hashKeyName,
-                                              Object hashKeyValue, RangeKeyCondition rangeKeyCondition,
-                                              String filterExpression, Map<String, String> nameMap,
-                                              Map<String, Object> valueMap) {
-        return queryDelegate.query(hashKeyName, hashKeyValue,
-                                   rangeKeyCondition, filterExpression, nameMap, valueMap);
-    }
-
-    @Override
-    public ItemCollection<QueryOutcome> query(String hashKeyName,
-                                              Object hashKeyValue, RangeKeyCondition rangeKeyCondition,
-                                              String filterExpression, String projectionExpression,
-                                              Map<String, String> nameMap, Map<String, Object> valueMap) {
-        return queryDelegate.query(hashKeyName, hashKeyValue,
-                                   rangeKeyCondition, filterExpression, projectionExpression,
-                                   nameMap, valueMap);
-    }
-
-    @Override
-    public UpdateItemOutcome updateItem(String hashKeyName,
-                                        Object hashKeyValue, AttributeUpdate... attributeUpdates) {
-        return updateItemDelegate.updateItem(hashKeyName, hashKeyValue,
-                                             attributeUpdates);
-    }
-
-    @Override
-    public UpdateItemOutcome updateItem(String hashKeyName,
-                                        Object hashKeyValue, String rangeKeyName, Object rangeKeyValue,
-                                        AttributeUpdate... attributeUpdates) {
-        return updateItemDelegate.updateItem(hashKeyName, hashKeyValue,
-                                             rangeKeyName, rangeKeyValue, attributeUpdates);
-    }
-
-    @Override
-    public UpdateItemOutcome updateItem(String hashKeyName,
-                                        Object hashKeyValue, Collection<Expected> expected,
-                                        AttributeUpdate... attributeUpdates) {
-        return updateItemDelegate.updateItem(hashKeyName, hashKeyValue,
-                                             expected, attributeUpdates);
-    }
-
-    @Override
-    public UpdateItemOutcome updateItem(String hashKeyName,
-                                        Object hashKeyValue, String rangeKeyName, Object rangeKeyValue,
-                                        Collection<Expected> expected, AttributeUpdate... attributeUpdates) {
-        return updateItemDelegate.updateItem(hashKeyName, hashKeyValue,
-                                             rangeKeyName, rangeKeyValue,
-                                             expected, attributeUpdates);
-    }
-
-    @Override
-    public UpdateItemOutcome updateItem(String hashKeyName,
-                                        Object hashKeyValue, String updateExpression,
-                                        Map<String, String> nameMap, Map<String, Object> valueMap) {
-        return updateItemDelegate.updateItem(hashKeyName, hashKeyValue,
-                                             updateExpression, nameMap, valueMap);
-    }
-
-    @Override
-    public UpdateItemOutcome updateItem(String hashKeyName, Object hashKeyValue,
-                                        String rangeKeyName, Object rangeKeyValue,
-                                        String updateExpression,
-                                        Map<String, String> nameMap,
-                                        Map<String, Object> valueMap) {
-        return updateItemDelegate.updateItem(hashKeyName, hashKeyValue,
-                                             rangeKeyName, rangeKeyValue,
-                                             updateExpression, nameMap, valueMap);
-    }
-
-    @Override
-    public UpdateItemOutcome updateItem(String hashKeyName, Object hashKeyValue,
-                                        String updateExpression, String conditionExpression,
-                                        Map<String, String> nameMap, Map<String, Object> valueMap) {
-        return updateItemDelegate.updateItem(hashKeyName, hashKeyValue,
-                                             updateExpression, conditionExpression,
-                                             nameMap, valueMap);
-    }
-
-    @Override
-    public UpdateItemOutcome updateItem(String hashKeyName, Object hashKeyValue,
-                                        String rangeKeyName, Object rangeKeyValue,
-                                        String updateExpression, String conditionExpression,
-                                        Map<String, String> nameMap, Map<String, Object> valueMap) {
-        return updateItemDelegate.updateItem(hashKeyName, hashKeyValue,
-                                             rangeKeyName, rangeKeyValue,
-                                             updateExpression, conditionExpression,
-                                             nameMap, valueMap);
-    }
-
-    @Override
-    public GetItemOutcome getItemOutcome(String hashKeyName,
-                                         Object hashKeyValue, String projectionExpression,
-                                         Map<String, String> nameMap) {
-        return getItemDelegate.getItemOutcome(hashKeyName, hashKeyValue,
-                                              projectionExpression, nameMap);
-    }
-
-    @Override
-    public GetItemOutcome getItemOutcome(String hashKeyName,
-                                         Object hashKeyValue, String rangeKeyName, Object rangeKeyValue,
-                                         String projectionExpression, Map<String, String> nameMap) {
-        return getItemDelegate.getItemOutcome(hashKeyName, hashKeyValue,
-                                              rangeKeyName, rangeKeyValue, projectionExpression, nameMap);
-    }
-
-    @Override
-    public Item getItem(String hashKeyName, Object hashKeyValue,
-                        String projectionExpression, Map<String, String> nameMap) {
-        return getItemDelegate.getItem(hashKeyName, hashKeyValue,
-                                       projectionExpression, nameMap);
-    }
-
-    @Override
-    public Item getItem(String hashKeyName, Object hashKeyValue,
-                        String rangeKeyName, Object rangeKeyValue,
-                        String projectionExpression, Map<String, String> nameMap) {
-        return getItemDelegate.getItem(hashKeyName, hashKeyValue,
-                                       rangeKeyName, rangeKeyValue, projectionExpression, nameMap);
-    }
-
-    @Override
-    public DeleteItemOutcome deleteItem(String hashKeyName, Object hashKeyValue) {
-        return deleteItemDelegate.deleteItem(hashKeyName, hashKeyValue);
-    }
-
-    @Override
-    public DeleteItemOutcome deleteItem(String hashKeyName,
-                                        Object hashKeyValue, String rangeKeyName, Object rangeKeyValue) {
-        return deleteItemDelegate.deleteItem(hashKeyName, hashKeyValue,
-                                             rangeKeyName, rangeKeyValue);
-    }
-
-    @Override
-    public DeleteItemOutcome deleteItem(String hashKeyName,
-                                        Object hashKeyValue, Expected... expected) {
-        return deleteItemDelegate.deleteItem(hashKeyName, hashKeyValue,
-                                             expected);
-    }
-
-    @Override
-    public DeleteItemOutcome deleteItem(String hashKeyName,
-                                        Object hashKeyValue, String rangeKeyName, Object rangeKeyValue,
-                                        Expected... expected) {
-        return deleteItemDelegate.deleteItem(hashKeyName, hashKeyValue,
-                                             rangeKeyName, rangeKeyValue, expected);
-    }
-
-    @Override
-    public DeleteItemOutcome deleteItem(String hashKeyName,
-                                        Object hashKeyValue, String conditionExpression,
-                                        Map<String, String> nameMap, Map<String, Object> valueMap) {
-        return deleteItemDelegate.deleteItem(hashKeyName, hashKeyValue,
-                                             conditionExpression, nameMap, valueMap);
-    }
-
-    @Override
-    public DeleteItemOutcome deleteItem(String hashKeyName,
-                                        Object hashKeyValue, String rangeKeyName, Object rangeKeyValue,
-                                        String conditionExpression, Map<String, String> nameMap,
-                                        Map<String, Object> valueMap) {
-        return deleteItemDelegate.deleteItem(hashKeyName, hashKeyValue,
-                                             rangeKeyName, rangeKeyValue,
-                                             conditionExpression, nameMap, valueMap);
-    }
-
-    @Override
-    public String toString() {
-        return "{" + tableName + ": " + tableDescription + "}";
-    }
-}
diff --git a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/TableCollection.java b/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/TableCollection.java
deleted file mode 100644
index 7e7fe5ddd8c3..000000000000
--- a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/TableCollection.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.document;
-
-import software.amazon.awssdk.services.dynamodb.document.internal.PageBasedCollection;
-import software.amazon.awssdk.services.dynamodb.document.internal.PageIterable;
-
-/**
- * A collection of <code>Table</code>'s (initialized with the respective table
- * names).
- *
- * An <code>TableCollection</code> object maintains a cursor pointing to its
- * current pages of data. Initially the cursor is positioned before the first
- * page. The next method moves the cursor to the next row, and because it
- * returns false when there are no more rows in the <code>TableCollection</code>
- * object, it can be used in a while loop to iterate through the collection.
- *
- * Network calls can be triggered when the collection is iterated across page
- * boundaries.
- *
- * @param <R> low level result type
- */
-public abstract class TableCollection<R> extends PageBasedCollection<Table, R> {
-
-    // Overriding these just so javadocs will show up.
-
-    /**
-     * Returns an {@code Iterable<Page<Table, R>>} that iterates over pages of
-     * tables from this collection. Each call to {@code Iterator.next} on an
-     * {@code Iterator} returned from this {@code Iterable} results in exactly
-     * one call to DynamoDB to retrieve a single page of results.
-     * <p>
-     * <code>
-     * TableCollection&lt;?&gt; collection = ...;
-     * for (Page&lt;Table&gt; page : collection.pages()) {
-     *     processTables(page);
-     * }
-     * </code>
-     * <p>
-     * The use of the internal/undocumented {@code PageIterable} class instead
-     * of {@code Iterable} in the public interface here is retained for
-     * backwards compatibility. It doesn't expose any methods beyond those
-     * of the {@code Iterable} interface. This method will be changed to return
-     * an {@code Iterable<Page<Table, R>>} directly in a future release of the
-     * SDK.
-     *
-     * @see Page
-     */
-    @Override
-    public PageIterable<Table, R> pages() {
-        return super.pages();
-    }
-
-    /**
-     * Returns the maximum number of resources to be retrieved in this
-     * collection; or null if there is no limit.
-     */
-    @Override
-    public abstract Integer getMaxResultSize();
-
-    /**
-     * Returns the low-level result last retrieved (for the current page) from
-     * the server side; or null if there has yet no calls to the server.
-     */
-    @Override
-    public R getLastLowLevelResult() {
-        return super.getLastLowLevelResult();
-    }
-
-    /**
-     * Used to register a listener for the event of receiving a low-level result
-     * from the server side.
-     *
-     * @param listener
-     *            listener to be registered. If null, a "none" listener will be
-     *            set.
-     * @return the previously registered listener. The return value is never
-     *         null.
-     */
-    @Override
-    public LowLevelResultListener<R> registerLowLevelResultListener(
-            LowLevelResultListener<R> listener) {
-
-        return super.registerLowLevelResultListener(listener);
-    }
-}
diff --git a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/TableKeysAndAttributes.java b/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/TableKeysAndAttributes.java
deleted file mode 100644
index d5fadcb866a0..000000000000
--- a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/TableKeysAndAttributes.java
+++ /dev/null
@@ -1,300 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.document;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * Used to specify one or multiple primary keys of a specific table, the
- * attributes to be retrieved from that table, and the consistency of the read
- * operation in a <code>BatchGetItem</code> request.
- */
-public class TableKeysAndAttributes {
-    private final String tableName;
-    private List<PrimaryKey> primaryKeys;
-    private Set<String> attributeNames;
-    private boolean consistentRead;
-
-    private String projectionExpression;
-    private Map<String, String> nameMap;
-
-    public TableKeysAndAttributes(String tableName) {
-        if (tableName == null || tableName.trim().length() == 0) {
-            throw new IllegalArgumentException("table name must not be null or empty");
-        }
-        this.tableName = tableName;
-    }
-
-    /**
-     * Return the list of primary keys (of the current table) to be included in
-     * a batch get-item operation.
-     */
-    public List<PrimaryKey> getPrimaryKeys() {
-        return primaryKeys;
-    }
-
-    /**
-     * Used to specify multiple primary keys. A primary key could consist of
-     * either a hash-key or both a hash-key and a range-key depending on the
-     * schema of the table.
-     */
-    public TableKeysAndAttributes withPrimaryKeys(PrimaryKey... primaryKeys) {
-        if (primaryKeys == null) {
-            this.primaryKeys = null;
-        } else {
-            Set<String> pkNameSet = null;
-            for (PrimaryKey pk : primaryKeys) {
-                if (pkNameSet == null) {
-                    pkNameSet = pk.getComponentNameSet();
-                } else {
-                    if (!pkNameSet.equals(pk.getComponentNameSet())) {
-                        throw new IllegalArgumentException(
-                                "primary key attribute names must be consistent for the specified primary keys");
-                    }
-                }
-            }
-            this.primaryKeys = new ArrayList<PrimaryKey>(Arrays.asList(primaryKeys));
-        }
-        return this;
-    }
-
-    /**
-     * Used to specify multiple hash-only primary keys.
-     * @param hashKeyName hash-only key name
-     * @param hashKeyValues a list of hash key values
-     */
-    public TableKeysAndAttributes withHashOnlyKeys(String hashKeyName, Object... hashKeyValues) {
-        if (hashKeyName == null) {
-            throw new IllegalArgumentException();
-        }
-        PrimaryKey[] primaryKeys = new PrimaryKey[hashKeyValues.length];
-        for (int i = 0; i < hashKeyValues.length; i++) {
-            primaryKeys[i] = new PrimaryKey(hashKeyName, hashKeyValues[i]);
-        }
-        return withPrimaryKeys(primaryKeys);
-    }
-
-    /**
-     * Used to specify multiple hash-and-range primary keys.
-     *
-     * @param hashKeyName
-     *            hash key name
-     * @param rangeKeyName
-     *            range key name
-     * @param alternatingHashAndRangeKeyValues
-     *            a list of alternating hash key value and range key value
-     */
-    public TableKeysAndAttributes withHashAndRangeKeys(
-            String hashKeyName, String rangeKeyName,
-            Object... alternatingHashAndRangeKeyValues) {
-        if (hashKeyName == null) {
-            throw new IllegalArgumentException("hash key name must be specified");
-        }
-        if (rangeKeyName == null) {
-            throw new IllegalArgumentException("range key name must be specified");
-        }
-        if (alternatingHashAndRangeKeyValues.length % 2 != 0) {
-            throw new IllegalArgumentException("number of hash and range key values must be the same");
-        }
-        final int len = alternatingHashAndRangeKeyValues.length / 2;
-        PrimaryKey[] primaryKeys = new PrimaryKey[len];
-        for (int i = 0; i < alternatingHashAndRangeKeyValues.length; i += 2) {
-            primaryKeys[i >> 1] = new PrimaryKey(
-                    hashKeyName, alternatingHashAndRangeKeyValues[i],
-                    rangeKeyName, alternatingHashAndRangeKeyValues[i + 1]);
-        }
-        return withPrimaryKeys(primaryKeys);
-    }
-
-    /**
-     * Adds a primary key to be included in the batch get-item operation. A
-     * primary key could consist of either a hash-key or both a
-     * hash-key and a range-key depending on the schema of the table.
-     */
-    public TableKeysAndAttributes addPrimaryKey(PrimaryKey primaryKey) {
-        if (primaryKey != null) {
-            if (primaryKeys == null) {
-                primaryKeys = new ArrayList<PrimaryKey>();
-            }
-            checkConsistency(primaryKey);
-            this.primaryKeys.add(primaryKey);
-        }
-        return this;
-    }
-
-    private void checkConsistency(PrimaryKey primaryKey) {
-        if (this.primaryKeys.size() > 0) {
-            // use the first one as the representative
-            final Set<String> nameSet = primaryKeys.get(0).getComponentNameSet();
-            if (!nameSet.equals(primaryKey.getComponentNameSet())) {
-                throw new IllegalArgumentException(
-                        "primary key must be added with consistent key attribute name(s)");
-            }
-        }
-    }
-
-    /**
-     * Adds a hash-only primary key to be included in the batch get-item
-     * operation.
-     *
-     * @param hashKeyName name of the hash key attribute name
-     * @param hashKeyValue name of the hash key value
-     * @return the current instance for method chaining purposes
-     */
-    public TableKeysAndAttributes addHashOnlyPrimaryKey(
-            String hashKeyName, Object hashKeyValue) {
-        this.addPrimaryKey(new PrimaryKey(hashKeyName, hashKeyValue));
-        return this;
-    }
-
-    /**
-     * Adds multiple hash-only primary keys to be included in the batch get-item
-     * operation.
-     *
-     * @param hashKeyName name of the hash key attribute name
-     * @param hashKeyValues multiple hash key values
-     * @return the current instance for method chaining purposes
-     */
-    public TableKeysAndAttributes addHashOnlyPrimaryKeys(String hashKeyName,
-                                                         Object... hashKeyValues) {
-        for (Object hashKeyValue : hashKeyValues) {
-            this.addPrimaryKey(new PrimaryKey(hashKeyName, hashKeyValue));
-        }
-        return this;
-    }
-
-    /**
-     * Adds multiple hash-and-range primary keys to be included in the batch
-     * get-item operation.
-     *
-     * @param hashKeyName
-     *            name of the hash key attribute name
-     * @param rangeKeyName
-     *            name of the range key attribute name
-     * @param alternatingHashRangeKeyValues
-     *            used to specify multiple alternating hash key and range key
-     *            values
-     * @return the current instance for method chaining purposes
-     */
-    public TableKeysAndAttributes addHashAndRangePrimaryKeys(
-            String hashKeyName, String rangeKeyName,
-            Object... alternatingHashRangeKeyValues) {
-        if (alternatingHashRangeKeyValues.length % 2 != 0) {
-            throw new IllegalArgumentException(
-                    "The multiple hash and range key values must alternate");
-        }
-        for (int i = 0; i < alternatingHashRangeKeyValues.length; i += 2) {
-            Object hashKeyValue = alternatingHashRangeKeyValues[i];
-            Object rangeKeyValue = alternatingHashRangeKeyValues[i + 1];
-            this.addPrimaryKey(
-                    new PrimaryKey()
-                            .addComponent(hashKeyName, hashKeyValue)
-                            .addComponent(rangeKeyName, rangeKeyValue));
-        }
-        return this;
-    }
-
-    /**
-     * Adds a primary key (that consists of a hash-key and a range-key) to be
-     * included in the batch get-item operation.
-     *
-     * @param hashKeyName hash key attribute name
-     * @param hashKeyValue hash key value
-     * @param rangeKeyName range key attribute name
-     * @param rangeKeyValue range key value
-     * @return the current instance for method chaining purposes
-     */
-    public TableKeysAndAttributes addHashAndRangePrimaryKey(
-            String hashKeyName, Object hashKeyValue,
-            String rangeKeyName, Object rangeKeyValue) {
-        this.addPrimaryKey(
-                new PrimaryKey()
-                        .addComponent(hashKeyName, hashKeyValue)
-                        .addComponent(rangeKeyName, rangeKeyValue));
-        return this;
-    }
-
-    /**
-     * Used to specify the attributes to be retrieved in each item returned
-     * from the batch get-item operation.
-     *
-     * @param attributeNames names of the attributes to be retrieved in each
-     *     item returned from the batch get-item operation.
-     * @return the current instance for method chaining purposes
-     */
-    public TableKeysAndAttributes withAttributeNames(String... attributeNames) {
-        if (attributeNames == null) {
-            this.attributeNames = null;
-        } else {
-            this.attributeNames = Collections.unmodifiableSet(
-                    new LinkedHashSet<String>(Arrays.asList(attributeNames)));
-        }
-        return this;
-    }
-
-    public TableKeysAndAttributes withAttributeNames(List<String> attributeNames) {
-        if (attributeNames == null) {
-            this.attributeNames = null;
-        } else {
-            this.attributeNames = Collections.unmodifiableSet(
-                    new LinkedHashSet<String>(attributeNames));
-        }
-        return this;
-    }
-
-    public Set<String> getAttributeNames() {
-        return attributeNames;
-    }
-
-    public String getTableName() {
-        return tableName;
-    }
-
-    public boolean isConsistentRead() {
-        return consistentRead;
-    }
-
-    public TableKeysAndAttributes withConsistentRead(boolean consistentRead) {
-        this.consistentRead = consistentRead;
-        return this;
-    }
-
-    public String getProjectionExpression() {
-        return projectionExpression;
-    }
-
-    public TableKeysAndAttributes withProjectionExpression(String projectionExpression) {
-        this.projectionExpression = projectionExpression;
-        return this;
-    }
-
-    public Map<String, String> nameMap() {
-        return nameMap;
-    }
-
-    public TableKeysAndAttributes withNameMap(Map<String, String> nameMap) {
-        this.nameMap = nameMap == null
-                       ? null : Collections.unmodifiableMap(new LinkedHashMap<String, String>(nameMap));
-        return this;
-    }
-}
diff --git a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/TableKeysAndAttributesTest.java b/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/TableKeysAndAttributesTest.java
deleted file mode 100644
index 7c98d7f2985e..000000000000
--- a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/TableKeysAndAttributesTest.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.document;
-
-import java.util.List;
-import org.junit.Assert;
-import org.junit.Test;
-
-public class TableKeysAndAttributesTest {
-
-    @Test
-    public void testNameSetConsistency() {
-        TableKeysAndAttributes t = new TableKeysAndAttributes("myTable")
-                .withHashAndRangeKeys(
-                        // specify the hash key name and range key name once
-                        "foo", "bar",
-                        // followed by multiple values
-                        123, 1,
-                        123, 2,
-                        456, 1,
-                        456, 2,
-                        456, 3);
-        List<PrimaryKey> keys = t.getPrimaryKeys();
-        Assert.assertTrue(5 == keys.size());
-        for (PrimaryKey key : keys) {
-            Assert.assertTrue(key.getComponentNameSet().contains("foo"));
-            Assert.assertTrue(key.getComponentNameSet().contains("bar"));
-            System.out.println(key);
-        }
-        System.out.println(keys);
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void testNameSetInConsistency() {
-        new TableKeysAndAttributes("myTable")
-                .withPrimaryKeys(
-                        new PrimaryKey("foo", 123, "bar", 345),
-                        new PrimaryKey("foo", 123, "ba", 345));
-    }
-}
diff --git a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/TableWriteItems.java b/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/TableWriteItems.java
deleted file mode 100644
index d0bcc2e6bf28..000000000000
--- a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/TableWriteItems.java
+++ /dev/null
@@ -1,294 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.document;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
-
-/**
- * Used to specify items to be put and/or primary keys to be deleted from a
- * specific table in a <code>BatchWriteItem</code> request.
- */
-public class TableWriteItems {
-    private final String tableName;
-    private List<PrimaryKey> primaryKeysToDelete;
-    private Collection<Item> itemsToPut;
-
-    public TableWriteItems(String tableName) {
-        if (tableName == null || tableName.trim().length() == 0) {
-            throw new IllegalArgumentException("table name must not be null or empty");
-        }
-        this.tableName = tableName;
-    }
-
-    /**
-     * Return the list of primary keys (of the current table) to be deleted in
-     * a batch write operation.
-     */
-    public List<PrimaryKey> getPrimaryKeysToDelete() {
-        return primaryKeysToDelete;
-    }
-
-    /**
-     * Used to specify multiple primary keys to be deleted from the current
-     * table. A primary key could consist of either a hash-key or both a
-     * hash-key and a range-key depending on the schema of the table.
-     */
-    public TableWriteItems withPrimaryKeysToDelete(
-            PrimaryKey... primaryKeysToDelete) {
-        if (primaryKeysToDelete == null) {
-            this.primaryKeysToDelete = null;
-        } else {
-            Set<String> pkNameSet = null;
-            for (PrimaryKey pk : primaryKeysToDelete) {
-                if (pkNameSet == null) {
-                    pkNameSet = pk.getComponentNameSet();
-                } else {
-                    if (!pkNameSet.equals(pk.getComponentNameSet())) {
-                        throw new IllegalArgumentException(
-                                "primary key attribute names must be consistent for the specified primary keys");
-                    }
-                }
-            }
-            this.primaryKeysToDelete = new ArrayList<PrimaryKey>(
-                    Arrays.asList(primaryKeysToDelete));
-        }
-        return this;
-    }
-
-    /**
-     * Used to specify multiple hash-only primary keys to be deleted from the
-     * current table.
-     *
-     * @param hashKeyName
-     *            hash-only key name
-     * @param hashKeyValues
-     *            a list of hash key values
-     */
-    public TableWriteItems withHashOnlyKeysToDelete(String hashKeyName,
-                                                    Object... hashKeyValues) {
-        if (hashKeyName == null) {
-            throw new IllegalArgumentException();
-        }
-        PrimaryKey[] primaryKeys = new PrimaryKey[hashKeyValues.length];
-        for (int i = 0; i < hashKeyValues.length; i++) {
-            primaryKeys[i] = new PrimaryKey(hashKeyName, hashKeyValues[i]);
-        }
-        return withPrimaryKeysToDelete(primaryKeys);
-    }
-
-    /**
-     * Used to specify multiple hash-and-range primary keys to be deleted
-     * from the current table.
-     *
-     * @param hashKeyName
-     *            hash key name
-     * @param rangeKeyName
-     *            range key name
-     * @param alternatingHashAndRangeKeyValues
-     *            a list of alternating hash key value and range key value
-     */
-    public TableWriteItems withHashAndRangeKeysToDelete(
-            String hashKeyName, String rangeKeyName,
-            Object... alternatingHashAndRangeKeyValues) {
-        if (hashKeyName == null) {
-            throw new IllegalArgumentException("hash key name must be specified");
-        }
-        if (rangeKeyName == null) {
-            throw new IllegalArgumentException("range key name must be specified");
-        }
-        if (alternatingHashAndRangeKeyValues.length % 2 != 0) {
-            throw new IllegalArgumentException("number of hash and range key values must be the same");
-        }
-        final int len = alternatingHashAndRangeKeyValues.length / 2;
-        PrimaryKey[] primaryKeys = new PrimaryKey[len];
-        for (int i = 0; i < alternatingHashAndRangeKeyValues.length; i += 2) {
-            primaryKeys[i >> 1] = new PrimaryKey(
-                    hashKeyName, alternatingHashAndRangeKeyValues[i],
-                    rangeKeyName, alternatingHashAndRangeKeyValues[i + 1]);
-        }
-        return withPrimaryKeysToDelete(primaryKeys);
-    }
-
-    /**
-     * Adds a primary key to be deleted in a batch write-item operation. A
-     * primary key could consist of either a hash-key or both a
-     * hash-key and a range-key depending on the schema of the table.
-     */
-    public TableWriteItems addPrimaryKeyToDelete(PrimaryKey primaryKey) {
-        if (primaryKey != null) {
-            if (primaryKeysToDelete == null) {
-                primaryKeysToDelete = new ArrayList<PrimaryKey>();
-            }
-            checkConsistency(primaryKey);
-            this.primaryKeysToDelete.add(primaryKey);
-        }
-        return this;
-    }
-
-    private void checkConsistency(PrimaryKey primaryKey) {
-        if (this.primaryKeysToDelete.size() > 0) {
-            // use the first one as the representative
-            final Set<String> nameSet = primaryKeysToDelete.get(0).getComponentNameSet();
-            if (!nameSet.equals(primaryKey.getComponentNameSet())) {
-                throw new IllegalArgumentException(
-                        "primary key must be added with consistent key attribute name(s)");
-            }
-        }
-    }
-
-    /**
-     * Adds a hash-only primary key to be deleted in a batch write
-     * operation.
-     *
-     * @param hashKeyName name of the hash key attribute name
-     * @param hashKeyValue name of the hash key value
-     * @return the current instance for method chaining purposes
-     */
-    public TableWriteItems addHashOnlyPrimaryKeyToDelete(
-            String hashKeyName, Object hashKeyValue) {
-        this.addPrimaryKeyToDelete(new PrimaryKey(hashKeyName, hashKeyValue));
-        return this;
-    }
-
-    /**
-     * Adds multiple hash-only primary keys to be deleted in a batch write
-     * operation.
-     *
-     * @param hashKeyName name of the hash key attribute name
-     * @param hashKeyValues multiple hash key values
-     * @return the current instance for method chaining purposes
-     */
-    public TableWriteItems addHashOnlyPrimaryKeysToDelete(String hashKeyName,
-                                                          Object... hashKeyValues) {
-        for (Object hashKeyValue : hashKeyValues) {
-            this.addPrimaryKeyToDelete(new PrimaryKey(hashKeyName, hashKeyValue));
-        }
-        return this;
-    }
-
-    /**
-     * Adds multiple hash-and-range primary keys to be deleted in a batch
-     * write operation.
-     *
-     * @param hashKeyName
-     *            name of the hash key attribute name
-     * @param rangeKeyName
-     *            name of the range key attribute name
-     * @param alternatingHashRangeKeyValues
-     *            used to specify multiple alternating hash key and range key
-     *            values
-     * @return the current instance for method chaining purposes
-     */
-    public TableWriteItems addHashAndRangePrimaryKeysToDelete(
-            String hashKeyName, String rangeKeyName,
-            Object... alternatingHashRangeKeyValues) {
-        if (alternatingHashRangeKeyValues.length % 2 != 0) {
-            throw new IllegalArgumentException(
-                    "The multiple hash and range key values must alternate");
-        }
-        for (int i = 0; i < alternatingHashRangeKeyValues.length; i += 2) {
-            Object hashKeyValue = alternatingHashRangeKeyValues[i];
-            Object rangeKeyValue = alternatingHashRangeKeyValues[i + 1];
-            this.addPrimaryKeyToDelete(
-                    new PrimaryKey()
-                            .addComponent(hashKeyName, hashKeyValue)
-                            .addComponent(rangeKeyName, rangeKeyValue));
-        }
-        return this;
-    }
-
-    /**
-     * Adds a primary key (that consists of a hash-key and a range-key) to be
-     * deleted in a batch write operation.
-     *
-     * @param hashKeyName hash key attribute name
-     * @param hashKeyValue hash key value
-     * @param rangeKeyName range key attribute name
-     * @param rangeKeyValue range key value
-     * @return the current instance for method chaining purposes
-     */
-    public TableWriteItems addHashAndRangePrimaryKeyToDelete(
-            String hashKeyName, Object hashKeyValue,
-            String rangeKeyName, Object rangeKeyValue) {
-        this.addPrimaryKeyToDelete(
-                new PrimaryKey()
-                        .addComponent(hashKeyName, hashKeyValue)
-                        .addComponent(rangeKeyName, rangeKeyValue));
-        return this;
-    }
-
-    /**
-     * Used to specify the items to be put in the current table in a batch write
-     * operation.
-     *
-     * @return the current instance for method chaining purposes
-     */
-    public TableWriteItems withItemsToPut(Item... itemsToPut) {
-        if (itemsToPut == null) {
-            this.itemsToPut = null;
-        } else {
-            this.itemsToPut = new ArrayList<Item>(Arrays.asList(itemsToPut));
-        }
-        return this;
-    }
-
-    /**
-     * Used to specify the collection of items to be put in the current table in
-     * a batch write operation.
-     *
-     * @return the current instance for method chaining purposes
-     */
-    public TableWriteItems withItemsToPut(Collection<Item> itemsToPut) {
-        if (itemsToPut == null) {
-            this.itemsToPut = null;
-        } else {
-            this.itemsToPut = new ArrayList<Item>(itemsToPut);
-        }
-        return this;
-    }
-
-    /**
-     * Returns the collection of items to be put in the current table in
-     * a batch write operation.
-     */
-    public Collection<Item> getItemsToPut() {
-        return itemsToPut == null
-               ? null
-               : Collections.unmodifiableCollection(itemsToPut);
-    }
-
-    public String getTableName() {
-        return tableName;
-    }
-
-    /**
-     * Adds an item to be put to the current table in a batch write operation.
-     */
-    public TableWriteItems addItemToPut(Item item) {
-        if (item != null) {
-            if (itemsToPut == null) {
-                itemsToPut = new ArrayList<Item>();
-            }
-            this.itemsToPut.add(item);
-        }
-        return this;
-    }
-}
diff --git a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/UpdateItemOutcome.java b/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/UpdateItemOutcome.java
deleted file mode 100644
index 6169b8906d44..000000000000
--- a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/UpdateItemOutcome.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.document;
-
-import java.util.Map;
-import software.amazon.awssdk.services.dynamodb.document.internal.InternalUtils;
-import software.amazon.awssdk.services.dynamodb.model.UpdateItemResponse;
-
-/**
- * The outcome of updating an item in a DynamoDB table.
- */
-public class UpdateItemOutcome {
-    private final UpdateItemResponse result;
-
-    /**
-     * @param result the low-level result; must not be null
-     */
-    public UpdateItemOutcome(UpdateItemResponse result) {
-        if (result == null) {
-            throw new IllegalArgumentException();
-        }
-        this.result = result;
-    }
-
-    /**
-     * Returns all the returned attributes as a (non-null) {@link Item}.
-     */
-    public Item getItem() {
-        Map<String, Object> attributes =
-                InternalUtils.toSimpleMapValue(result.attributes());
-        Item item = Item.fromMap(attributes);
-        return item;
-    }
-
-    /**
-     * Returns a non-null low-level result returned from the server side.
-     */
-    public UpdateItemResponse getUpdateItemResponse() {
-        return result;
-    }
-
-    @Override
-    public String toString() {
-        return String.valueOf(result);
-    }
-}
diff --git a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/api/BatchGetItemApi.java b/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/api/BatchGetItemApi.java
deleted file mode 100644
index 599c4f35c7c5..000000000000
--- a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/api/BatchGetItemApi.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.document.api;
-
-import java.util.Map;
-import software.amazon.awssdk.annotations.ThreadSafe;
-import software.amazon.awssdk.services.dynamodb.document.BatchGetItemOutcome;
-import software.amazon.awssdk.services.dynamodb.document.TableKeysAndAttributes;
-import software.amazon.awssdk.services.dynamodb.document.spec.BatchGetItemSpec;
-import software.amazon.awssdk.services.dynamodb.model.KeysAndAttributes;
-import software.amazon.awssdk.services.dynamodb.model.ReturnConsumedCapacity;
-
-/**
- * DynamoDB BatchGetItem API that can be used to retrieve multiple items from
- * multiple tables in one request/response by specifying one or multiple primary
- * keys per table in the request.
- */
-@ThreadSafe
-public interface BatchGetItemApi {
-    /**
-     * Used to perform a batch get-item operation from DynamoDB.
-     *
-     * @param returnConsumedCapacity
-     *            returned capacity to be returned
-     * @param tableKeyAndAttributes
-     *            the tables, keys, and attributes specification to be used to
-     *            retrieve the items.
-     */
-    BatchGetItemOutcome batchGetItem(
-        ReturnConsumedCapacity returnConsumedCapacity,
-        TableKeysAndAttributes... tableKeyAndAttributes);
-
-    /**
-     * Used to perform a batch get-item operation from DynamoDB.
-     *
-     * @param tableKeyAndAttributes
-     *            the tables, keys, and attributes specification to be used to
-     *            retrieve the items.
-     */
-    BatchGetItemOutcome batchGetItem(
-        TableKeysAndAttributes... tableKeyAndAttributes);
-
-    /**
-     * Used to perform a batch get-item operation from DynamoDB with full
-     * parameter specification.
-     */
-    BatchGetItemOutcome batchGetItem(BatchGetItemSpec spec);
-
-    /**
-     * Used to perform a batch get-item for the unprocessed keys returned from a
-     * previous batch get-item operation.
-     *
-     * @param returnConsumedCapacity
-     *            returned capacity to be returned
-     * @param unprocessedKeys
-     *            the unprocessed keys returned from the result of a previous
-     *            batch-get-item operation.
-     *
-     * @see BatchGetItemOutcome#getUnprocessedKeys()
-     */
-    BatchGetItemOutcome batchGetItemUnprocessed(
-        ReturnConsumedCapacity returnConsumedCapacity,
-        Map<String, KeysAndAttributes> unprocessedKeys);
-
-    /**
-     * Used to perform a batch get-item for the unprocessed keys returned from a
-     * previous batch get-item operation.
-     *
-     * @param unprocessedKeys
-     *            the unprocessed keys returned from the result of a previous
-     *            batch-get-item operation.
-     *
-     * @see BatchGetItemOutcome#getUnprocessedKeys()
-     */
-    BatchGetItemOutcome batchGetItemUnprocessed(
-        Map<String, KeysAndAttributes> unprocessedKeys);
-}
diff --git a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/api/BatchWriteItemApi.java b/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/api/BatchWriteItemApi.java
deleted file mode 100644
index de51ec95b11c..000000000000
--- a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/api/BatchWriteItemApi.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.document.api;
-
-import java.util.List;
-import java.util.Map;
-import software.amazon.awssdk.annotations.ThreadSafe;
-import software.amazon.awssdk.services.dynamodb.document.BatchWriteItemOutcome;
-import software.amazon.awssdk.services.dynamodb.document.TableWriteItems;
-import software.amazon.awssdk.services.dynamodb.document.spec.BatchWriteItemSpec;
-import software.amazon.awssdk.services.dynamodb.model.WriteRequest;
-
-/**
- * DynamoDB BatchWriteItem API that can be used to put multiple items to and/or
- * delete multiple items from multiple tables in a single request-response
- * to/from DynamoDB.
- */
-@ThreadSafe
-public interface BatchWriteItemApi {
-
-    /**
-     * Used to perform a batch write operation to DynamoDB.
-     *
-     * @param tableWriteItems
-     *            the tables and the respective keys to delete from and/or the
-     *            respective items to be put.
-     */
-    BatchWriteItemOutcome batchWriteItem(
-        TableWriteItems... tableWriteItems);
-
-    /**
-     * Used to perform a batch write operation to DynamoDB with full parameter
-     * specification.
-     */
-    BatchWriteItemOutcome batchWriteItem(BatchWriteItemSpec spec);
-
-    /**
-     * Used to perform a batch write operation for the unprocessed items
-     * returned from a previous batch write operation.
-     *
-     * @param unprocessedItems
-     *            the unprocessed items returned from the result of a previous
-     *            batch write operation
-     *
-     * @see BatchWriteItemOutcome#getUnprocessedItems()
-     */
-    BatchWriteItemOutcome batchWriteItemUnprocessed(
-        Map<String, List<WriteRequest>> unprocessedItems);
-}
diff --git a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/api/DeleteItemApi.java b/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/api/DeleteItemApi.java
deleted file mode 100644
index 292707b45103..000000000000
--- a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/api/DeleteItemApi.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.document.api;
-
-import java.util.Map;
-import software.amazon.awssdk.annotations.ThreadSafe;
-import software.amazon.awssdk.services.dynamodb.document.DeleteItemOutcome;
-import software.amazon.awssdk.services.dynamodb.document.Expected;
-import software.amazon.awssdk.services.dynamodb.document.KeyAttribute;
-import software.amazon.awssdk.services.dynamodb.document.PrimaryKey;
-import software.amazon.awssdk.services.dynamodb.document.spec.DeleteItemSpec;
-
-/**
- * A Table-centric DeleteItem API.
- */
-@ThreadSafe
-public interface DeleteItemApi {
-    /** Deletes an item by primary key. */
-    DeleteItemOutcome deleteItem(KeyAttribute... primaryKeyComponents);
-
-    /** Deletes an item by primary key. */
-    DeleteItemOutcome deleteItem(PrimaryKey primaryKey);
-
-    /** Deletes an item by hash-only primary key. */
-    DeleteItemOutcome deleteItem(String hashKeyName, Object hashKeyValue);
-
-    /** Deletes an item by hash key-and-range primary key. */
-    DeleteItemOutcome deleteItem(String hashKeyName, Object hashKeyValue,
-                                 String rangeKeyName, Object rangeKeyValue);
-
-    /**
-     * Conditional delete with the specified primary key and expected
-     * conditions.
-     */
-    DeleteItemOutcome deleteItem(PrimaryKey primaryKey,
-                                 Expected... expected);
-
-    /**
-     * Conditional delete with the specified hash-only primary key and expected
-     * conditions.
-     */
-    DeleteItemOutcome deleteItem(String hashKeyName, Object hashKeyValue,
-                                 Expected... expected);
-
-    /**
-     * Conditional delete with the specified hash-and-range primary key and
-     * expected conditions.
-     */
-    DeleteItemOutcome deleteItem(String hashKeyName, Object hashKeyValue,
-                                 String rangeKeyName, Object rangeKeyValue,
-                                 Expected... expected);
-
-    /**
-     * Conditional delete with the specified primary key and condition
-     * expression.
-     */
-    DeleteItemOutcome deleteItem(PrimaryKey primaryKey,
-                                 String conditionExpression,
-                                 Map<String, String> nameMap,
-                                 Map<String, Object> valueMap);
-
-    /**
-     * Conditional delete with the specified hash-only primary key and condition
-     * expression.
-     */
-    DeleteItemOutcome deleteItem(String hashKeyName, Object hashKeyValue,
-                                 String conditionExpression,
-                                 Map<String, String> nameMap,
-                                 Map<String, Object> valueMap);
-
-    /**
-     * Conditional delete with the specified hash-and-range primary key and
-     * condition expression.
-     */
-    DeleteItemOutcome deleteItem(String hashKeyName, Object hashKeyValue,
-                                 String rangeKeyName, Object rangeKeyValue,
-                                 String conditionExpression,
-                                 Map<String, String> nameMap,
-                                 Map<String, Object> valueMap);
-
-    /** Deletes an item by specifying all the details. */
-    DeleteItemOutcome deleteItem(DeleteItemSpec spec);
-}
diff --git a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/api/GetItemApi.java b/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/api/GetItemApi.java
deleted file mode 100644
index 262e5fcff6fc..000000000000
--- a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/api/GetItemApi.java
+++ /dev/null
@@ -1,185 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.document.api;
-
-import java.util.Map;
-import software.amazon.awssdk.annotations.ThreadSafe;
-import software.amazon.awssdk.services.dynamodb.document.GetItemOutcome;
-import software.amazon.awssdk.services.dynamodb.document.Item;
-import software.amazon.awssdk.services.dynamodb.document.KeyAttribute;
-import software.amazon.awssdk.services.dynamodb.document.PrimaryKey;
-import software.amazon.awssdk.services.dynamodb.document.spec.GetItemSpec;
-
-/**
- * A Table-centric GetItem API.
- * <p>
- * In general, all getter methods in this library incur no network.
- * <code>GetItemApi</code> is the only exception due to the fact that the
- * web service API is indistinguishable from a Java getter method.
- */
-@ThreadSafe
-public interface GetItemApi {
-
-    /**
-     * Retrieves an item and the associated information by primary key. Incurs
-     * network access.
-     *
-     * @return the (non-null) result of item retrieval.
-     */
-    GetItemOutcome getItemOutcome(PrimaryKey primaryKey);
-
-    /**
-     * Retrieves an item and the associated information by primary key when the
-     * primary key is a hash-only key. Incurs network access.
-     *
-     * @return the (non-null) result of item retrieval.
-     */
-    GetItemOutcome getItemOutcome(KeyAttribute... primaryKeyComponents);
-
-    /**
-     * Retrieves an item and the associated information by primary key when the
-     * primary key is a hash-only key. Incurs network access.
-     *
-     * @return the (non-null) result of item retrieval.
-     */
-    GetItemOutcome getItemOutcome(String hashKeyName, Object hashKeyValue);
-
-    /**
-     * Retrieves an item and the associated information by primary key when the
-     * primary key consists of both a hash-key and a range-key. Incurs network
-     * access.
-     *
-     * @return the (non-null) result of item retrieval.
-     */
-    GetItemOutcome getItemOutcome(String hashKeyName, Object hashKeyValue,
-                                  String rangeKeyName, Object rangeKeyValue);
-
-    /**
-     * Retrieves an item and the associated information using projection
-     * expression. Incurs network access.
-     *
-     * @param projectionExpression
-     *            projection expression, example: "a.b , c[0].e"
-     *
-     * @param nameMap
-     *            actual values for the attribute-name place holders; can be
-     *            null if there is no attribute-name placeholder.
-     *
-     * @return the (non-null) result of item retrieval.
-     */
-    GetItemOutcome getItemOutcome(PrimaryKey primaryKey,
-                                  String projectionExpression, Map<String, String> nameMap);
-
-    /**
-     * Retrieves an item and the associated information via the specified hash
-     * key using projection expression. Incurs network access.
-     *
-     * @return the (non-null) result of item retrieval.
-     */
-    GetItemOutcome getItemOutcome(String hashKeyName, Object hashKeyValue,
-                                  String projectionExpression, Map<String, String> nameMap);
-
-    /**
-     * Retrieves an item and the associated information via the specified hash
-     * key and range key using projection expression. Incurs network access.
-     *
-     * @return the (non-null) result of item retrieval.
-     */
-    GetItemOutcome getItemOutcome(String hashKeyName, Object hashKeyValue,
-                                  String rangeKeyName, Object rangeKeyValue,
-                                  String projectionExpression, Map<String, String> nameMap);
-
-    /**
-     * Retrieves an item via the specified hash key using projection expression.
-     * Incurs network access.
-     *
-     * @return the retrieved item; or null if the item doesn't exist.
-     */
-    Item getItem(String hashKeyName, Object hashKeyValue,
-                 String projectionExpression, Map<String, String> nameMap);
-
-    /**
-     * Retrieves an item via the specified hash key and range key using
-     * projection expression. Incurs network access.
-     *
-     * @return the retrieved item; or null if the item doesn't exist.
-     */
-    Item getItem(String hashKeyName, Object hashKeyValue,
-                 String rangeKeyName, Object rangeKeyValue,
-                 String projectionExpression, Map<String, String> nameMap);
-
-    /**
-     * Retrieves an item and the associated information by specifying all the
-     * details. Incurs network access.
-     *
-     * @return the (non-null) result of item retrieval.
-     */
-    GetItemOutcome getItemOutcome(GetItemSpec spec);
-
-    /**
-     * Retrieves an item by primary key; or null if the item doesn't exist.
-     * Incurs network access.
-     *
-     * @return the retrieved item; or null if the item doesn't exist.
-     */
-    Item getItem(PrimaryKey primaryKey);
-
-    /**
-     * Retrieves an item by primary key. Incurs network access.
-     *
-     * @return the retrieved item; or null if the item doesn't exist.
-     */
-    Item getItem(KeyAttribute... primaryKeyComponents);
-
-    /**
-     * Retrieves an item by primary key when the primary key is a hash-only key.
-     * Incurs network access.
-     *
-     * @return the retrieved item; or null if the item doesn't exist.
-     */
-    Item getItem(String hashKeyName, Object hashKey);
-
-    /**
-     * Retrieves an item by primary key when the primary key consists of both a
-     * hash-key and a range-key. Incurs network access.
-     *
-     * @return the retrieved item; or null if the item doesn't exist.
-     */
-    Item getItem(String hashKeyName, Object hashKeyValue,
-                 String rangeKeyName, Object rangeKeyValue);
-
-    /**
-     * Retrieves an item using projection expression. Incurs network access.
-     *
-     * @param projectionExpression
-     *            projection expression, example: "a.b , c[0].e"
-     *
-     * @param nameMap
-     *            actual values for the attribute-name place holders; can be
-     *            null if there is no attribute-name placeholder.
-     *
-     * @return the retrieved item; or null if the item doesn't exist.
-     */
-    Item getItem(PrimaryKey primaryKey, String projectionExpression,
-                 Map<String, String> nameMap);
-
-    /**
-     * Retrieves an item by specifying all the details. Incurs network access.
-     *
-     * @return the retrieved item; or null if the item doesn't exist.
-     */
-    Item getItem(GetItemSpec spec);
-}
diff --git a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/api/ListTablesApi.java b/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/api/ListTablesApi.java
deleted file mode 100644
index 2c16e9792010..000000000000
--- a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/api/ListTablesApi.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.document.api;
-
-import software.amazon.awssdk.annotations.ThreadSafe;
-import software.amazon.awssdk.services.dynamodb.document.TableCollection;
-import software.amazon.awssdk.services.dynamodb.document.spec.ListTablesSpec;
-import software.amazon.awssdk.services.dynamodb.model.ListTablesResponse;
-
-/**
- * DynamoDB ListTables API.
- */
-@ThreadSafe
-public interface ListTablesApi {
-    /**
-     * Returns a collection of all the tables (initialized with the respective
-     * table names) associated with the current account and endpoint. The
-     * underlying collection is paginated with a page size of 100. A network
-     * call is made whenever the collection is iterated across a page boundary.
-     */
-    TableCollection<ListTablesResponse> listTables();
-
-    /**
-     * Returns a collection of tables (initialized with the respective table
-     * names) associated with the current account and endpoint, starting with a
-     * name after the specified <code>exclusiveStartTableName</code> . The
-     * underlying collection is paginated with a page size of 100. A network
-     * call is made whenever the collection is iterated across a page boundary.
-     *
-     * @param exclusiveStartTableName
-     *            The first table name that this operation will evaluate,
-     *            exclusive of the specified
-     *            <code>exclusiveStartTableName</code>. Use the value that was
-     *            returned for <i>LastEvaluatedTableName</i> in a previous
-     *            operation, so that you can obtain the next page of results.
-     */
-    TableCollection<ListTablesResponse> listTables(String exclusiveStartTableName);
-
-    /**
-     * Returns a collection of tables (initialized with the respective table
-     * names) up to the specified <code>maxResultSize</code> associated with
-     * the current account and endpoint, starting with a name after the
-     * specified <code>exclusiveStartTableName</code>. The underlying collection
-     * is paginated with a page size of 100. A network call is made whenever the
-     * collection is iterated across a page boundary.
-     *
-     * @param exclusiveStartTableName
-     *            The first table name that this operation will evaluate
-     *            exclusive of the specified
-     *            <code>exclusiveStartTableName</code>. Use the value that was
-     *            returned for <i>LastEvaluatedTableName</i> in a previous
-     *            operation, so that you can obtain the next page of results.
-     * @param maxResultSize
-     *            A maximum number of table names to return.
-     */
-    TableCollection<ListTablesResponse> listTables(String exclusiveStartTableName, int maxResultSize);
-
-    /**
-     * Returns a collection of tables (initialized with the respective table
-     * names) up to the specified <code>maxResultSize</code> associated with
-     * the current account and endpoint. The underlying collection
-     * is paginated with a page size of 100. A network call is made whenever the
-     * collection is iterated across a page boundary.
-     *
-     * @param maxResultSize
-     *            A maximum number of table names to return.
-     */
-    TableCollection<ListTablesResponse> listTables(int maxResultSize);
-
-    /**
-     * List tables by specifying all the details. The underlying collection is
-     * paginated with the specified page size (which defaults to 100). A network
-     * call is made whenever the collection is iterated across a page boundary.
-     *
-     *
-     * @param spec
-     *            can be used to specify all the detailed parameters of listing
-     *            tables.
-     *
-     * @return a collection of tables associated with the current account and
-     *         endpoint.
-     */
-    TableCollection<ListTablesResponse> listTables(ListTablesSpec spec);
-}
diff --git a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/api/PutItemApi.java b/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/api/PutItemApi.java
deleted file mode 100644
index b7485c186848..000000000000
--- a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/api/PutItemApi.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.document.api;
-
-import java.util.Map;
-import software.amazon.awssdk.annotations.ThreadSafe;
-import software.amazon.awssdk.services.dynamodb.document.Expected;
-import software.amazon.awssdk.services.dynamodb.document.Item;
-import software.amazon.awssdk.services.dynamodb.document.PutItemOutcome;
-import software.amazon.awssdk.services.dynamodb.document.spec.PutItemSpec;
-
-/**
- * A Table-centric PutItem API.
- */
-@ThreadSafe
-public interface PutItemApi {
-    /**
-     * Unconditional put.
-     */
-    PutItemOutcome putItem(Item item);
-
-    /**
-     * Conditional put.
-     */
-    PutItemOutcome putItem(Item item, Expected... expected);
-
-    /**
-     * Conditional put via condition expression.
-     */
-    PutItemOutcome putItem(Item item, String conditionExpression,
-                           Map<String, String> nameMap, Map<String, Object> valueMap);
-
-    /** Puts an item by specifying all the details. */
-    PutItemOutcome putItem(PutItemSpec spec);
-}
diff --git a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/api/QueryApi.java b/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/api/QueryApi.java
deleted file mode 100644
index 0d79bb211228..000000000000
--- a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/api/QueryApi.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.document.api;
-
-import java.util.Map;
-import software.amazon.awssdk.annotations.ThreadSafe;
-import software.amazon.awssdk.services.dynamodb.document.ItemCollection;
-import software.amazon.awssdk.services.dynamodb.document.KeyAttribute;
-import software.amazon.awssdk.services.dynamodb.document.QueryFilter;
-import software.amazon.awssdk.services.dynamodb.document.QueryOutcome;
-import software.amazon.awssdk.services.dynamodb.document.RangeKeyCondition;
-import software.amazon.awssdk.services.dynamodb.document.spec.QuerySpec;
-
-/**
- * A Table-centric Query API.
- */
-@ThreadSafe
-public interface QueryApi {
-    /**
-     * Retrieves items by the specified hash key.
-     */
-    ItemCollection<QueryOutcome> query(String hashKeyName, Object hashKeyValue);
-
-    /**
-     * Retrieves items by the specified hash key.
-     */
-    ItemCollection<QueryOutcome> query(KeyAttribute hashKey);
-
-    /**
-     * Retrieves items by the specified hash key and a range key condition.
-     */
-    ItemCollection<QueryOutcome> query(KeyAttribute hashKey,
-                                       RangeKeyCondition rangeKeyCondition);
-
-    ItemCollection<QueryOutcome> query(String hashKeyName, Object hashKeyValue,
-                                       RangeKeyCondition rangeKeyCondition);
-
-    /**
-     * Retrieves items by the specified hash key, a range key condition
-     * and a list of query filters.
-     */
-    ItemCollection<QueryOutcome> query(KeyAttribute hashKey,
-                                       RangeKeyCondition rangeKeyCondition, QueryFilter... queryFilters);
-
-    ItemCollection<QueryOutcome> query(String hashKeyName, Object hashKeyValue,
-                                       RangeKeyCondition rangeKeyCondition, QueryFilter... queryFilters);
-
-    /**
-     * Retrieves items by the specified hash key, a range key condition, and
-     * a filter expression string.
-     *
-     * @param filterExpression filter expression
-     *     example: "(#a > :a) AND (#c > :c OR #e < :e)"
-     *
-     * @param nameMap actual values for the attribute-name place holders;
-     *                can be null if there is no attribute-name placeholder.
-     * @param valueMap actual values for the value place holders
-     *                can be null if there is no attribute-value placeholder.
-     */
-    ItemCollection<QueryOutcome> query(KeyAttribute hashKey,
-                                       RangeKeyCondition rangeKeyCondition,
-                                       String filterExpression,
-                                       Map<String, String> nameMap,
-                                       Map<String, Object> valueMap);
-
-    ItemCollection<QueryOutcome> query(String hashKeyName, Object hashKeyValue,
-                                       RangeKeyCondition rangeKeyCondition,
-                                       String filterExpression,
-                                       Map<String, String> nameMap,
-                                       Map<String, Object> valueMap);
-
-    /**
-     * Retrieves items by the specified hash key, a range key condition,
-     * a filter expression and a projection expression.
-     *
-     * @param filterExpression filter expression
-     *     example: "(#a > :a) AND (#c > :c OR #e < :e)"
-     *
-     * @param projectionExpression projection expression
-     *     example: "a.b, c[0].e"
-     *
-     * @param nameMap actual values for the attribute-name place holders;
-     *                can be null if there is no attribute-name placeholder.
-     * @param valueMap actual values for the value place holders
-     *                can be null if there is no attribute-value placeholder.
-     */
-    ItemCollection<QueryOutcome> query(KeyAttribute hashKey,
-                                       RangeKeyCondition rangeKeyCondition,
-                                       String filterExpression,
-                                       String projectionExpression,
-                                       Map<String, String> nameMap,
-                                       Map<String, Object> valueMap);
-
-    /**
-     * Retrieves items by the specified hash key, a range key condition,
-     * a filter expression and a projection expression.
-     *
-     * @param filterExpression filter expression
-     *     example: "(#a > :a) AND (#c > :c OR #e < :e)"
-     *
-     * @param projectionExpression projection expression
-     *     example: "a.b, c[0].e"
-     *
-     * @param nameMap actual values for the attribute-name place holders;
-     *                can be null if there is no attribute-name placeholder.
-     * @param valueMap actual values for the value place holders
-     *                can be null if there is no attribute-value placeholder.
-     */
-    ItemCollection<QueryOutcome> query(String hashKeyName, Object hashKeyValue,
-                                       RangeKeyCondition rangeKeyCondition,
-                                       String filterExpression,
-                                       String projectionExpression,
-                                       Map<String, String> nameMap,
-                                       Map<String, Object> valueMap);
-
-    /**
-     * Queries table by specifying all the details.
-     */
-    ItemCollection<QueryOutcome> query(QuerySpec spec);
-}
diff --git a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/api/ScanApi.java b/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/api/ScanApi.java
deleted file mode 100644
index f423e927ec9c..000000000000
--- a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/api/ScanApi.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.document.api;
-
-import java.util.Map;
-import software.amazon.awssdk.annotations.ThreadSafe;
-import software.amazon.awssdk.services.dynamodb.document.ItemCollection;
-import software.amazon.awssdk.services.dynamodb.document.ScanFilter;
-import software.amazon.awssdk.services.dynamodb.document.ScanOutcome;
-import software.amazon.awssdk.services.dynamodb.document.spec.ScanSpec;
-
-/**
- * A Table-centric Scan API.
- */
-@ThreadSafe
-public interface ScanApi {
-    /**
-     * Retrieves items by the specified list of scan filters.
-     */
-    ItemCollection<ScanOutcome> scan(ScanFilter... scanFilters);
-
-    /**
-     * Scans table using a Filter Expression.
-     *
-     * @param filterExpression
-     *            condition expression example:
-     *            "(#a > :a) AND (#c > :c OR #e < :e)"
-     *
-     * @param nameMap
-     *            actual values for the attribute-name place holders; can be
-     *            null if there is no attribute-name placeholder.
-     * @param valueMap
-     *            actual values for the value place holders can be null if there
-     *            is no attribute-value placeholder.
-     */
-    ItemCollection<ScanOutcome> scan(String filterExpression,
-                                     Map<String, String> nameMap,
-                                     Map<String, Object> valueMap);
-
-    /**
-     * Scans table using a Filter Expression and a Projection Expression.
-     *
-     * @param filterExpression
-     *            condition expression example:
-     *            "(#a > :a) AND (#c > :c OR #e < :e)"
-     * @param projectionExpression
-     *            projection expression example: "a.b , c[0].e"
-     *
-     * @param nameMap actual values for the attribute-name place holders;
-     *                can be null if there is no attribute-name placeholder.
-     * @param valueMap actual values for the value place holders
-     *                can be null if there is no attribute-value placeholder.
-     */
-    ItemCollection<ScanOutcome> scan(
-        String filterExpression,
-        String projectionExpression,
-        Map<String, String> nameMap,
-        Map<String, Object> valueMap);
-
-    /**
-     * Scans table by specifying all the details.
-     */
-    ItemCollection<ScanOutcome> scan(ScanSpec params);
-}
diff --git a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/api/UpdateItemApi.java b/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/api/UpdateItemApi.java
deleted file mode 100644
index 6a3bd4661bbb..000000000000
--- a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/api/UpdateItemApi.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.document.api;
-
-import java.util.Collection;
-import java.util.Map;
-import software.amazon.awssdk.annotations.ThreadSafe;
-import software.amazon.awssdk.services.dynamodb.document.AttributeUpdate;
-import software.amazon.awssdk.services.dynamodb.document.Expected;
-import software.amazon.awssdk.services.dynamodb.document.PrimaryKey;
-import software.amazon.awssdk.services.dynamodb.document.UpdateItemOutcome;
-import software.amazon.awssdk.services.dynamodb.document.spec.UpdateItemSpec;
-
-/**
- * A Table-centric UpdateItem API.
- */
-@ThreadSafe
-public interface UpdateItemApi {
-
-    /**
-     * Updates an item with the attributes specified.
-     *
-     * @param primaryKey
-     *            primary key of the item to be updated
-     * @param attributeUpdates
-     *            attributes to be updated
-     */
-    UpdateItemOutcome updateItem(PrimaryKey primaryKey,
-                                 AttributeUpdate... attributeUpdates);
-
-    UpdateItemOutcome updateItem(String hashKeyName, Object hashKeyValue,
-                                 AttributeUpdate... attributeUpdates);
-
-    UpdateItemOutcome updateItem(String hashKeyName, Object hashKeyValue,
-                                 String rangeKeyName, Object rangeKeyValue,
-                                 AttributeUpdate... attributeUpdates);
-
-    /**
-     * Updates an item with the attributes specified.
-     *
-     * @param primaryKey
-     *            primary key of the item to be updated
-     * @param expected
-     *            the condition to match for the update to succeed.
-     * @param attributeUpdates
-     *            attributes to be updated
-     */
-    UpdateItemOutcome updateItem(PrimaryKey primaryKey,
-                                 Collection<Expected> expected, AttributeUpdate... attributeUpdates);
-
-    /**
-     * Updates an item with the specified hash-only key and attributes.
-     */
-    UpdateItemOutcome updateItem(String hashKeyName, Object hashKeyValue,
-                                 Collection<Expected> expected, AttributeUpdate... attributeUpdates);
-
-    /**
-     * Updates an item with the specified hash key, range key and attributes.
-     */
-    UpdateItemOutcome updateItem(String hashKeyName, Object hashKeyValue,
-                                 String rangeKeyName, Object rangeKeyValue,
-                                 Collection<Expected> expected, AttributeUpdate... attributeUpdates);
-
-    /**
-     * Performs an update on an item in the table using the given update
-     * expression string.
-     *
-     * @param primaryKey
-     *            primary key of the item to be updated
-     * @param updateExpression
-     *            the update expression that specifies the attributes to be
-     *            updated.
-     * @param nameMap
-     *            the map containing the mapping between attribute names used in
-     *            update expression and the actual name of the attributes
-     * @param valueMap
-     *            the map containing the mapping between the attribute value
-     *            used in update expression and the actual value of the
-     *            attribute
-     */
-    UpdateItemOutcome updateItem(PrimaryKey primaryKey,
-                                 String updateExpression, Map<String, String> nameMap,
-                                 Map<String, Object> valueMap);
-
-    UpdateItemOutcome updateItem(String hashKeyName, Object hashKeyValue,
-                                 String updateExpression, Map<String, String> nameMap,
-                                 Map<String, Object> valueMap);
-
-    UpdateItemOutcome updateItem(String hashKeyName, Object hashKeyValue,
-                                 String rangeKeyName, Object rangeKeyValue,
-                                 String updateExpression, Map<String, String> nameMap,
-                                 Map<String, Object> valueMap);
-
-    /**
-     * Updates an item with the specified primary key using the given
-     * update expression provided the condition expression evaluates to true.
-     *
-     * @param primaryKey
-     *            primary key of the item to be updated
-     * @param updateExpression
-     *            the update expression that specifies the attributes to be
-     *            updated.
-     * @param conditionExpression
-     *            the condition expression that specifies the condition that
-     *            needs to be evaluated to true
-     * @param nameMap
-     *            the map containing the mapping between attribute names used in
-     *            update and condition expression and the actual name of the
-     *            attributes
-     * @param valueMap
-     *            the map containing the mapping between the attribute value
-     *            used in update and condition expression and the actual value
-     *            of the attribute
-     */
-    UpdateItemOutcome updateItem(PrimaryKey primaryKey,
-                                 String updateExpression, String conditionExpression,
-                                 Map<String, String> nameMap, Map<String, Object> valueMap);
-
-    /**
-     * Updates an item with the specified hash key using the given
-     * update expression provided the condition expression evaluates to true.
-     */
-    UpdateItemOutcome updateItem(String hashKeyName, Object hashKeyValue,
-                                 String updateExpression, String conditionExpression,
-                                 Map<String, String> nameMap, Map<String, Object> valueMap);
-
-    /**
-     * Updates an item with the specified hash key and range key using the given
-     * update expression provided the condition expression evaluates to true.
-     */
-    UpdateItemOutcome updateItem(String hashKeyName, Object hashKeyValue,
-                                 String rangeKeyName, Object rangeKeyValue,
-                                 String updateExpression, String conditionExpression,
-                                 Map<String, String> nameMap, Map<String, Object> valueMap);
-
-    /**
-     * Performs an update on an item in the table by specifying all the details.
-     *
-     * @param updateItemSpec
-     *            the update specification for the item to be updated.
-     */
-    UpdateItemOutcome updateItem(UpdateItemSpec updateItemSpec);
-}
diff --git a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/internal/AbstractImpl.java b/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/internal/AbstractImpl.java
deleted file mode 100644
index d20545047122..000000000000
--- a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/internal/AbstractImpl.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.document.internal;
-
-import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
-import software.amazon.awssdk.services.dynamodb.document.Table;
-
-/**
- * Internal common base class for API implementations.
- */
-abstract class AbstractImpl {
-    private final Table table;
-    private final DynamoDbClient client;
-
-    protected AbstractImpl(DynamoDbClient client, Table table) {
-        this.client = client;
-        this.table = table;
-    }
-
-    /**
-     * Returns the owning table.
-     */
-    public final Table getTable() {
-        return table;
-    }
-
-    final DynamoDbClient getClient() {
-        return client;
-    }
-}
diff --git a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/internal/BatchGetItemImpl.java b/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/internal/BatchGetItemImpl.java
deleted file mode 100644
index cd6d81bf41cc..000000000000
--- a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/internal/BatchGetItemImpl.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.document.internal;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
-import software.amazon.awssdk.services.dynamodb.document.BatchGetItemOutcome;
-import software.amazon.awssdk.services.dynamodb.document.PrimaryKey;
-import software.amazon.awssdk.services.dynamodb.document.TableKeysAndAttributes;
-import software.amazon.awssdk.services.dynamodb.document.api.BatchGetItemApi;
-import software.amazon.awssdk.services.dynamodb.document.spec.BatchGetItemSpec;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-import software.amazon.awssdk.services.dynamodb.model.BatchGetItemRequest;
-import software.amazon.awssdk.services.dynamodb.model.BatchGetItemResponse;
-import software.amazon.awssdk.services.dynamodb.model.KeysAndAttributes;
-import software.amazon.awssdk.services.dynamodb.model.ReturnConsumedCapacity;
-
-/**
- * The implementation for <code>BatchGetItemApi</code>.
- */
-public class BatchGetItemImpl implements BatchGetItemApi {
-    private final DynamoDbClient client;
-
-    public BatchGetItemImpl(DynamoDbClient client) {
-        this.client = client;
-    }
-
-    @Override
-    public BatchGetItemOutcome batchGetItem(
-            ReturnConsumedCapacity returnConsumedCapacity,
-            TableKeysAndAttributes... tableKeysAndAttributes) {
-        return doBatchGetItem(new BatchGetItemSpec()
-                                      .withReturnConsumedCapacity(returnConsumedCapacity)
-                                      .withTableKeyAndAttributes(tableKeysAndAttributes));
-    }
-
-    @Override
-    public BatchGetItemOutcome batchGetItem(
-            TableKeysAndAttributes... tableKeysAndAttributes) {
-        return doBatchGetItem(new BatchGetItemSpec()
-                                      .withTableKeyAndAttributes(tableKeysAndAttributes));
-    }
-
-    @Override
-    public BatchGetItemOutcome batchGetItem(BatchGetItemSpec spec) {
-        return doBatchGetItem(spec);
-    }
-
-    private BatchGetItemOutcome doBatchGetItem(BatchGetItemSpec spec) {
-        final Collection<TableKeysAndAttributes> tableKeysAndAttributesCol =
-                spec.getTableKeysAndAttributes();
-        // Unprocessed keys take precedence
-        Map<String, KeysAndAttributes> requestItems = spec.getUnprocessedKeys();
-        if (requestItems == null || requestItems.size() == 0) {
-            // handle new requests only if there is no unprocessed keys
-            requestItems = new LinkedHashMap<String, KeysAndAttributes>();
-        }
-        if (tableKeysAndAttributesCol != null) {
-            for (TableKeysAndAttributes tableKeysAndAttributes : tableKeysAndAttributesCol) {
-                // attributes against one table
-                final Set<String> attrNames = tableKeysAndAttributes.getAttributeNames();
-                // primary keys against one table
-                final List<PrimaryKey> pks = tableKeysAndAttributes.getPrimaryKeys();
-                final List<Map<String, AttributeValue>> keys = new ArrayList<Map<String, AttributeValue>>(pks.size());
-                for (PrimaryKey pk : pks) {
-                    keys.add(InternalUtils.toAttributeValueMap(pk));
-                }
-                final KeysAndAttributes keysAndAttrs = KeysAndAttributes.builder()
-                        .attributesToGet(attrNames)
-                        .consistentRead(tableKeysAndAttributes.isConsistentRead())
-                        .keys(keys)
-                        .projectionExpression(tableKeysAndAttributes.getProjectionExpression())
-                        .expressionAttributeNames(tableKeysAndAttributes.nameMap())
-                        .build();
-                requestItems.put(tableKeysAndAttributes.getTableName(), keysAndAttrs);
-            }
-        }
-        BatchGetItemRequest req = spec.getRequest()
-                .toBuilder()
-                .requestItems(requestItems)
-                .build();
-        spec.setRequest(req);
-        BatchGetItemResponse result = client.batchGetItem(req);
-        return new BatchGetItemOutcome(result);
-    }
-
-    @Override
-    public BatchGetItemOutcome batchGetItemUnprocessed(
-            ReturnConsumedCapacity returnConsumedCapacity,
-            Map<String, KeysAndAttributes> unprocessedKeys) {
-        return doBatchGetItem(new BatchGetItemSpec()
-                                      .withReturnConsumedCapacity(returnConsumedCapacity)
-                                      .withUnprocessedKeys(unprocessedKeys));
-    }
-
-    @Override
-    public BatchGetItemOutcome batchGetItemUnprocessed(
-            Map<String, KeysAndAttributes> unprocessedKeys) {
-        return doBatchGetItem(new BatchGetItemSpec()
-                                      .withUnprocessedKeys(unprocessedKeys));
-    }
-}
diff --git a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/internal/BatchWriteItemImpl.java b/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/internal/BatchWriteItemImpl.java
deleted file mode 100644
index 787371d0452e..000000000000
--- a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/internal/BatchWriteItemImpl.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.document.internal;
-
-import static software.amazon.awssdk.services.dynamodb.document.internal.InternalUtils.toAttributeValueMap;
-import static software.amazon.awssdk.services.dynamodb.document.internal.InternalUtils.toAttributeValues;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
-import software.amazon.awssdk.services.dynamodb.document.BatchWriteItemOutcome;
-import software.amazon.awssdk.services.dynamodb.document.Item;
-import software.amazon.awssdk.services.dynamodb.document.PrimaryKey;
-import software.amazon.awssdk.services.dynamodb.document.TableWriteItems;
-import software.amazon.awssdk.services.dynamodb.document.api.BatchWriteItemApi;
-import software.amazon.awssdk.services.dynamodb.document.spec.BatchWriteItemSpec;
-import software.amazon.awssdk.services.dynamodb.model.BatchWriteItemRequest;
-import software.amazon.awssdk.services.dynamodb.model.BatchWriteItemResponse;
-import software.amazon.awssdk.services.dynamodb.model.DeleteRequest;
-import software.amazon.awssdk.services.dynamodb.model.PutRequest;
-import software.amazon.awssdk.services.dynamodb.model.WriteRequest;
-
-/**
- * The implementation for <code>BatchWriteItemApi</code>.
- */
-public class BatchWriteItemImpl implements BatchWriteItemApi {
-    private final DynamoDbClient client;
-
-    public BatchWriteItemImpl(DynamoDbClient client) {
-        this.client = client;
-    }
-
-    @Override
-    public BatchWriteItemOutcome batchWriteItem(
-            TableWriteItems... tableWriteItems) {
-        return doBatchWriteItem(new BatchWriteItemSpec()
-                                        .withTableWriteItems(tableWriteItems));
-    }
-
-    @Override
-    public BatchWriteItemOutcome batchWriteItem(BatchWriteItemSpec spec) {
-        return doBatchWriteItem(spec);
-    }
-
-    @Override
-    public BatchWriteItemOutcome batchWriteItemUnprocessed(
-            Map<String, List<WriteRequest>> unprocessedItems) {
-        return doBatchWriteItem(new BatchWriteItemSpec()
-                                        .withUnprocessedItems(unprocessedItems));
-    }
-
-    private BatchWriteItemOutcome doBatchWriteItem(BatchWriteItemSpec spec) {
-        final Collection<TableWriteItems> tableWriteItemsCol =
-                spec.getTableWriteItems();
-        // Unprocessed items take precedence
-        Map<String, List<WriteRequest>> requestItems =
-                spec.getUnprocessedItems();
-        if (requestItems == null || requestItems.size() == 0) {
-            // handle new requests only if there is no unprocessed items
-            requestItems = new LinkedHashMap<String, List<WriteRequest>>();
-        }
-        if (tableWriteItemsCol != null) {
-            for (TableWriteItems tableWriteItems : tableWriteItemsCol) {
-                // items to be put to a single table
-                Collection<Item> itemsToPut = tableWriteItems.getItemsToPut();
-                // primary keys to deleted in a single table
-                final List<PrimaryKey> pksToDelete =
-                        tableWriteItems.getPrimaryKeysToDelete();
-                // Merge them into a list of write requests to a single table
-                final int numPut = itemsToPut == null ? 0 : itemsToPut.size();
-                final int numDel = pksToDelete == null ? 0 : pksToDelete.size();
-                final List<WriteRequest> writeRequests =
-                        new ArrayList<WriteRequest>(numPut + numDel);
-                // Put requests for a single table
-                if (itemsToPut != null) {
-                    for (Item item : itemsToPut) {
-                        writeRequests.add(WriteRequest.builder()
-                                                  .putRequest(PutRequest.builder()
-                                                          .item(toAttributeValues(item))
-                                                          .build())
-                                .build());
-                    }
-                }
-                // Delete requests for a single table
-                if (pksToDelete != null) {
-                    for (PrimaryKey pkToDelete : pksToDelete) {
-                        writeRequests.add(WriteRequest.builder()
-                                                  .deleteRequest(DeleteRequest.builder()
-                                                          .key(toAttributeValueMap(pkToDelete))
-                                                          .build())
-                                .build());
-                    }
-                }
-                requestItems.put(tableWriteItems.getTableName(), writeRequests);
-            }
-        }
-        BatchWriteItemRequest req = spec.getRequest().toBuilder()
-                                        .requestItems(requestItems).build();
-        BatchWriteItemResponse result = client.batchWriteItem(req);
-        return new BatchWriteItemOutcome(result);
-    }
-}
diff --git a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/internal/DeleteItemImpl.java b/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/internal/DeleteItemImpl.java
deleted file mode 100644
index 7e70b43e436e..000000000000
--- a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/internal/DeleteItemImpl.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.document.internal;
-
-import java.util.Collection;
-import java.util.Map;
-import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
-import software.amazon.awssdk.services.dynamodb.document.DeleteItemOutcome;
-import software.amazon.awssdk.services.dynamodb.document.Expected;
-import software.amazon.awssdk.services.dynamodb.document.KeyAttribute;
-import software.amazon.awssdk.services.dynamodb.document.PrimaryKey;
-import software.amazon.awssdk.services.dynamodb.document.Table;
-import software.amazon.awssdk.services.dynamodb.document.api.DeleteItemApi;
-import software.amazon.awssdk.services.dynamodb.document.spec.DeleteItemSpec;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-import software.amazon.awssdk.services.dynamodb.model.DeleteItemRequest;
-import software.amazon.awssdk.services.dynamodb.model.DeleteItemResponse;
-import software.amazon.awssdk.services.dynamodb.model.ExpectedAttributeValue;
-
-/**
- * The implementation for <code>DeleteItemApi</code>.
- */
-public class DeleteItemImpl extends AbstractImpl implements DeleteItemApi {
-    public DeleteItemImpl(DynamoDbClient client, Table table) {
-        super(client, table);
-    }
-
-    @Override
-    public DeleteItemOutcome deleteItem(KeyAttribute... primaryKeyComponents) {
-        return doDeleteItem(new DeleteItemSpec()
-                                    .withPrimaryKey(primaryKeyComponents));
-    }
-
-    @Override
-    public DeleteItemOutcome deleteItem(PrimaryKey primaryKey) {
-        return doDeleteItem(new DeleteItemSpec()
-                                    .withPrimaryKey(primaryKey));
-    }
-
-    @Override
-    public DeleteItemOutcome deleteItem(PrimaryKey primaryKeys,
-                                        Expected... expected) {
-        return doDeleteItem(new DeleteItemSpec()
-                                    .withPrimaryKey(primaryKeys)
-                                    .withExpected(expected));
-    }
-
-    @Override
-    public DeleteItemOutcome deleteItem(PrimaryKey primaryKeys,
-                                        String conditionExpression, Map<String, String> nameMap,
-                                        Map<String, Object> valueMap) {
-        return doDeleteItem(new DeleteItemSpec()
-                                    .withPrimaryKey(primaryKeys)
-                                    .withConditionExpression(conditionExpression)
-                                    .withNameMap(nameMap)
-                                    .valueMap(valueMap))
-                ;
-    }
-
-    @Override
-    public DeleteItemOutcome deleteItem(DeleteItemSpec spec) {
-        return doDeleteItem(spec);
-    }
-
-    private DeleteItemOutcome doDeleteItem(DeleteItemSpec spec) {
-        // set the table name
-        final String tableName = getTable().getTableName();
-        // set up the keys
-        DeleteItemRequest.Builder requestBuilder = spec.getRequest().toBuilder()
-                .tableName(tableName)
-                .key(InternalUtils.toAttributeValueMap(spec.getKeyComponents()));
-        // set up the expected attribute map, if any
-        final Collection<Expected> expected = spec.getExpected();
-        final Map<String, ExpectedAttributeValue> expectedMap =
-                InternalUtils.toExpectedAttributeValueMap(expected);
-        // set up the value map, if any (when expression API is used)
-        final Map<String, AttributeValue> attrValMap =
-                InternalUtils.fromSimpleMap(spec.valueMap());
-        // set up the request
-        requestBuilder.expected(expectedMap)
-               .expressionAttributeNames(spec.nameMap())
-               .expressionAttributeValues(attrValMap);
-        DeleteItemResponse result = getClient().deleteItem(requestBuilder.build());
-        return new DeleteItemOutcome(result);
-    }
-
-    @Override
-    public DeleteItemOutcome deleteItem(String hashKeyName, Object hashKeyValue) {
-        return deleteItem(new PrimaryKey(hashKeyName, hashKeyValue));
-    }
-
-    @Override
-    public DeleteItemOutcome deleteItem(String hashKeyName,
-                                        Object hashKeyValue, String rangeKeyName, Object rangeKeyValue) {
-        return deleteItem(
-                new PrimaryKey(hashKeyName, hashKeyValue, rangeKeyName, rangeKeyValue));
-    }
-
-    @Override
-    public DeleteItemOutcome deleteItem(String hashKeyName,
-                                        Object hashKeyValue, Expected... expected) {
-        return deleteItem(new PrimaryKey(hashKeyName, hashKeyValue), expected);
-    }
-
-    @Override
-    public DeleteItemOutcome deleteItem(String hashKeyName,
-                                        Object hashKeyValue, String rangeKeyName, Object rangeKeyValue,
-                                        Expected... expected) {
-        return deleteItem(
-                new PrimaryKey(hashKeyName, hashKeyValue, rangeKeyName, rangeKeyValue),
-                expected);
-    }
-
-    @Override
-    public DeleteItemOutcome deleteItem(String hashKeyName,
-                                        Object hashKeyValue, String conditionExpression,
-                                        Map<String, String> nameMap, Map<String, Object> valueMap) {
-        return deleteItem(new PrimaryKey(hashKeyName, hashKeyValue),
-                          conditionExpression, nameMap, valueMap);
-    }
-
-    @Override
-    public DeleteItemOutcome deleteItem(String hashKeyName,
-                                        Object hashKeyValue, String rangeKeyName, Object rangeKeyValue,
-                                        String conditionExpression, Map<String, String> nameMap,
-                                        Map<String, Object> valueMap) {
-        return deleteItem(
-                new PrimaryKey(hashKeyName, hashKeyValue, rangeKeyName, rangeKeyValue),
-                conditionExpression, nameMap, valueMap);
-    }
-}
diff --git a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/internal/Filter.java b/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/internal/Filter.java
deleted file mode 100644
index c0671c942dcc..000000000000
--- a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/internal/Filter.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.document.internal;
-
-import software.amazon.awssdk.services.dynamodb.model.ComparisonOperator;
-
-/**
- * Abstract base class for both query filters and scan filters.
- */
-public abstract class Filter<T extends Filter<T>> {
-    private final String attribute;
-    private ComparisonOperator op;
-    private Object[] values;
-
-    /**
-     * Create a filter for the specified top-level attribute.
-     *
-     * @param attrName
-     *            attribute name
-     */
-    protected Filter(String attrName) {
-        InternalUtils.checkInvalidAttrName(attrName);
-        this.attribute = attrName;
-    }
-
-    /** Returns the attribute name. */
-    public String getAttribute() {
-        return attribute;
-    }
-
-    public ComparisonOperator getComparisonOperator() {
-        return op;
-    }
-
-    public Object[] values() {
-        return values == null ? null : values.clone();
-    }
-
-    @SuppressWarnings("unchecked")
-    protected T values(Object... values) {
-        this.values = values.clone();
-        return (T) this;
-    }
-
-    @SuppressWarnings("unchecked")
-    private T withComparisonOperator(ComparisonOperator op) {
-        this.op = op;
-        return (T) this;
-    }
-
-    /**
-     * Creates and returns a condition of the range key being equal to the given
-     * value.
-     */
-    public T eq(Object val) {
-        return withComparisonOperator(ComparisonOperator.EQ).values(val);
-    }
-
-    public T ne(Object val) {
-        return withComparisonOperator(ComparisonOperator.NE).values(val);
-    }
-
-    /**
-     * Expects the attribute be an existing attribute.
-     */
-    public T exists() {
-        return withComparisonOperator(ComparisonOperator.NOT_NULL);
-    }
-
-    /**
-     * Expects the attribute be non-existing.
-     */
-    public T notExist() {
-        return withComparisonOperator(ComparisonOperator.NULL);
-    }
-
-    public T contains(Object val) {
-        return withComparisonOperator(ComparisonOperator.CONTAINS).values(val);
-    }
-
-    public T notContains(Object val) {
-        return withComparisonOperator(ComparisonOperator.NOT_CONTAINS).values(val);
-    }
-
-    /**
-     * Creates and returns a condition of the range key with a value that begins
-     * with the given value.
-     */
-    public T beginsWith(String val) {
-        return withComparisonOperator(ComparisonOperator.BEGINS_WITH).values(val);
-    }
-
-    public T in(Object... values) {
-        if (values == null || values.length == 0) {
-            throw new IllegalArgumentException("values must not be null or empty.");
-        }
-
-        return withComparisonOperator(ComparisonOperator.IN).values(values);
-    }
-
-    /**
-     * Creates and returns a condition of the range key that has a value between
-     * the given values.
-     */
-    public T between(Object low, Object hi) {
-        return withComparisonOperator(ComparisonOperator.BETWEEN).values(low, hi);
-    }
-
-    /**
-     * Creates and returns a condition of the range key being greater than or
-     * equal to the given value.
-     */
-    public T ge(Object val) {
-        return withComparisonOperator(ComparisonOperator.GE).values(val);
-    }
-
-    /**
-     * Creates and returns a condition of the range key being greater than the
-     * given value.
-     */
-    public T gt(Object val) {
-        return withComparisonOperator(ComparisonOperator.GT).values(val);
-    }
-
-    /**
-     * Creates and returns a condition of the range key being less than or equal
-     * to the given value.
-     */
-    public T le(Object val) {
-        return withComparisonOperator(ComparisonOperator.LE).values(val);
-    }
-
-    /**
-     * Creates and returns a condition of the range key being less than the
-     * given value.
-     */
-    public T lt(Object val) {
-        return withComparisonOperator(ComparisonOperator.LT).values(val);
-    }
-}
diff --git a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/internal/GetItemImpl.java b/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/internal/GetItemImpl.java
deleted file mode 100644
index 3ea0bd0a9835..000000000000
--- a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/internal/GetItemImpl.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.document.internal;
-
-import java.util.Map;
-import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
-import software.amazon.awssdk.services.dynamodb.document.GetItemOutcome;
-import software.amazon.awssdk.services.dynamodb.document.Item;
-import software.amazon.awssdk.services.dynamodb.document.KeyAttribute;
-import software.amazon.awssdk.services.dynamodb.document.PrimaryKey;
-import software.amazon.awssdk.services.dynamodb.document.Table;
-import software.amazon.awssdk.services.dynamodb.document.api.GetItemApi;
-import software.amazon.awssdk.services.dynamodb.document.spec.GetItemSpec;
-import software.amazon.awssdk.services.dynamodb.model.GetItemRequest;
-import software.amazon.awssdk.services.dynamodb.model.GetItemResponse;
-
-/**
- * The implementation for <code>GetItemApi</code>.
- */
-public class GetItemImpl extends AbstractImpl implements GetItemApi {
-    public GetItemImpl(DynamoDbClient client, Table table) {
-        super(client, table);
-    }
-
-    @Override
-    public GetItemOutcome getItemOutcome(KeyAttribute... primaryKeyComponents) {
-        return doLoadItem(new GetItemSpec()
-                                  .withPrimaryKey(primaryKeyComponents));
-    }
-
-    @Override
-    public GetItemOutcome getItemOutcome(PrimaryKey primaryKey) {
-        return doLoadItem(new GetItemSpec()
-                                  .withPrimaryKey(primaryKey));
-    }
-
-    @Override
-    public GetItemOutcome getItemOutcome(PrimaryKey primaryKey,
-                                         String projectionExpression, Map<String, String> nameMap) {
-        return doLoadItem(new GetItemSpec()
-                                  .withPrimaryKey(primaryKey)
-                                  .withProjectionExpression(projectionExpression)
-                                  .withNameMap(nameMap));
-    }
-
-    @Override
-    public GetItemOutcome getItemOutcome(GetItemSpec spec) {
-        return doLoadItem(spec);
-    }
-
-    @Override
-    public Item getItem(GetItemSpec spec) {
-        return doLoadItem(spec).getItem();
-    }
-
-    private GetItemOutcome doLoadItem(GetItemSpec spec) {
-        String tableName = getTable().getTableName();
-        // Set up the key attributes
-        GetItemRequest req = spec.getRequest().toBuilder()
-                .tableName(tableName)
-                .key(InternalUtils.toAttributeValueMap(spec.getKeyComponents()))
-                .expressionAttributeNames(spec.nameMap())
-                .build();
-
-        GetItemResponse result = getClient().getItem(req);
-        return new GetItemOutcome(result);
-    }
-
-    @Override
-    public Item getItem(KeyAttribute... primaryKey) {
-        return getItemOutcome(primaryKey).getItem();
-    }
-
-    @Override
-    public Item getItem(PrimaryKey primaryKey) {
-        return getItemOutcome(primaryKey).getItem();
-    }
-
-    @Override
-    public Item getItem(PrimaryKey primaryKey, String projectionExpression,
-                        Map<String, String> nameMap) {
-        return getItemOutcome(primaryKey, projectionExpression, nameMap).getItem();
-    }
-
-    @Override
-    public GetItemOutcome getItemOutcome(String hashKeyName, Object hashKeyValue) {
-        return getItemOutcome(new KeyAttribute(hashKeyName, hashKeyValue));
-    }
-
-    @Override
-    public GetItemOutcome getItemOutcome(String hashKeyName, Object hashKeyValue,
-                                         String rangeKeyName, Object rangeKeyValue) {
-        return getItemOutcome(new KeyAttribute(hashKeyName, hashKeyValue),
-                              new KeyAttribute(rangeKeyName, rangeKeyValue));
-    }
-
-    @Override
-    public Item getItem(String hashKeyName, Object hashKeyValue) {
-        return getItemOutcome(hashKeyName, hashKeyValue).getItem();
-    }
-
-    @Override
-    public Item getItem(String hashKeyName, Object hashKeyValue,
-                        String rangeKeyName, Object rangeKeyValue) {
-        return getItemOutcome(hashKeyName, hashKeyValue, rangeKeyName, rangeKeyValue).getItem();
-    }
-
-    @Override
-    public GetItemOutcome getItemOutcome(String hashKeyName, Object hashKeyValue,
-                                         String projectionExpression, Map<String, String> nameMap) {
-        return getItemOutcome(new PrimaryKey(hashKeyName, hashKeyValue),
-                              projectionExpression, nameMap);
-    }
-
-    @Override
-    public GetItemOutcome getItemOutcome(String hashKeyName, Object hashKeyValue,
-                                         String rangeKeyName, Object rangeKeyValue,
-                                         String projectionExpression, Map<String, String> nameMap) {
-        return getItemOutcome(
-                new PrimaryKey(hashKeyName, hashKeyValue, rangeKeyName, rangeKeyValue),
-                projectionExpression, nameMap);
-    }
-
-    @Override
-    public Item getItem(String hashKeyName, Object hashKeyValue,
-                        String projectionExpression, Map<String, String> nameMap) {
-        return getItemOutcome(new PrimaryKey(hashKeyName, hashKeyValue),
-                              projectionExpression, nameMap).getItem();
-    }
-
-    @Override
-    public Item getItem(String hashKeyName, Object hashKeyValue,
-                        String rangeKeyName, Object rangeKeyValue,
-                        String projectionExpression, Map<String, String> nameMap) {
-        return getItemOutcome(
-                new PrimaryKey(hashKeyName, hashKeyValue, rangeKeyName, rangeKeyValue),
-                projectionExpression, nameMap).getItem();
-    }
-}
diff --git a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/internal/IndexQueryImpl.java b/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/internal/IndexQueryImpl.java
deleted file mode 100644
index 11313cc5e192..000000000000
--- a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/internal/IndexQueryImpl.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.document.internal;
-
-import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
-import software.amazon.awssdk.services.dynamodb.document.Index;
-import software.amazon.awssdk.services.dynamodb.document.ItemCollection;
-import software.amazon.awssdk.services.dynamodb.document.QueryOutcome;
-import software.amazon.awssdk.services.dynamodb.document.spec.QuerySpec;
-
-/**
- * The implementation for <code>QueryApi</code> for an index.
- */
-public class IndexQueryImpl extends QueryImpl {
-    private final Index index;
-
-    public IndexQueryImpl(DynamoDbClient client, Index index) {
-        super(client, index.getTable());
-        this.index = index;
-    }
-
-    @Override
-    protected ItemCollection<QueryOutcome> doQuery(QuerySpec spec) {
-        spec.setRequest(spec.getRequest().toBuilder().indexName(index.getIndexName()).build());
-        return super.doQuery(spec);
-    }
-}
diff --git a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/internal/IndexScanImpl.java b/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/internal/IndexScanImpl.java
deleted file mode 100644
index 225fc1d2766c..000000000000
--- a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/internal/IndexScanImpl.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.document.internal;
-
-import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
-import software.amazon.awssdk.services.dynamodb.document.Index;
-import software.amazon.awssdk.services.dynamodb.document.ItemCollection;
-import software.amazon.awssdk.services.dynamodb.document.ScanOutcome;
-import software.amazon.awssdk.services.dynamodb.document.spec.ScanSpec;
-
-/**
- * The implementation for <code>ScanApi</code> for an index.
- */
-public class IndexScanImpl extends ScanImpl {
-    private final Index index;
-
-    public IndexScanImpl(DynamoDbClient client, Index index) {
-        super(client, index.getTable());
-        this.index = index;
-    }
-
-    @Override
-    protected ItemCollection<ScanOutcome> doScan(ScanSpec spec) {
-        spec.setRequest(spec.getRequest().toBuilder().indexName(index.getIndexName()).build());
-        return super.doScan(spec);
-    }
-}
diff --git a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/internal/InternalUtils.java b/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/internal/InternalUtils.java
deleted file mode 100644
index 05459b48eb14..000000000000
--- a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/internal/InternalUtils.java
+++ /dev/null
@@ -1,662 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.document.internal;
-
-import static software.amazon.awssdk.utils.BinaryUtils.copyAllBytesFrom;
-
-import java.math.BigDecimal;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import software.amazon.awssdk.awscore.AwsRequest;
-import software.amazon.awssdk.awscore.AwsRequestOverrideConfiguration;
-import software.amazon.awssdk.core.SdkBytes;
-import software.amazon.awssdk.core.util.SdkAutoConstructList;
-import software.amazon.awssdk.core.util.SdkAutoConstructMap;
-import software.amazon.awssdk.core.util.VersionInfo;
-import software.amazon.awssdk.services.dynamodb.document.AttributeUpdate;
-import software.amazon.awssdk.services.dynamodb.document.Expected;
-import software.amazon.awssdk.services.dynamodb.document.IncompatibleTypeException;
-import software.amazon.awssdk.services.dynamodb.document.Item;
-import software.amazon.awssdk.services.dynamodb.document.KeyAttribute;
-import software.amazon.awssdk.services.dynamodb.document.PrimaryKey;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValueUpdate;
-import software.amazon.awssdk.services.dynamodb.model.ComparisonOperator;
-import software.amazon.awssdk.services.dynamodb.model.Condition;
-import software.amazon.awssdk.services.dynamodb.model.ExpectedAttributeValue;
-
-/**
- * Internal utilities.  Not meant for general use.  May change without notice.
- */
-public final class InternalUtils {
-
-    private InternalUtils() {
-    }
-
-    /**
-     * Returns a non-null list of <code>Item</code>'s given the low level
-     * list of item information.
-     */
-    public static List<Item> toItemList(List<Map<String, AttributeValue>> items) {
-        if (items == null) {
-            return Collections.emptyList();
-        }
-        List<Item> result = new ArrayList<Item>(items.size());
-        for (Map<String, AttributeValue> item : items) {
-            result.add(Item.fromMap(toSimpleMapValue(item)));
-        }
-        return result;
-    }
-
-    /**
-     * Converts an <code>Item</code> into the low-level representation;
-     * or null if the input is null.
-     */
-    public static Map<String, AttributeValue> toAttributeValues(Item item) {
-        if (item == null) {
-            return null;
-        }
-        // row with multiple attributes
-        Map<String, AttributeValue> result = new LinkedHashMap<String, AttributeValue>();
-        for (Map.Entry<String, Object> entry : item.attributes()) {
-            result.put(entry.getKey(), toAttributeValue(entry.getValue()));
-        }
-        return result;
-    }
-
-    /**
-     * Converts a map of string to simple objects into the low-level
-     * representation; or null if the input is null.
-     */
-    public static Map<String, AttributeValue> fromSimpleMap(
-            Map<String, Object> map) {
-        if (map == null) {
-            return null;
-        }
-        // row with multiple attributes
-        Map<String, AttributeValue> result = new LinkedHashMap<String, AttributeValue>();
-        for (Map.Entry<String, Object> entry : map.entrySet()) {
-            result.put(entry.getKey(), toAttributeValue(entry.getValue()));
-        }
-        return result;
-    }
-
-    /**
-     * Converts a list of <code>AttributeUpdate</code> into the low-level
-     * representation; or null if the input is null.
-     */
-    public static Map<String, AttributeValueUpdate> toAttributeValueUpdate(
-            List<AttributeUpdate> attributesToUpdate) {
-        if (attributesToUpdate == null) {
-            return null;
-        }
-
-        Map<String, AttributeValueUpdate> result = new LinkedHashMap<String, AttributeValueUpdate>();
-
-        for (AttributeUpdate attribute : attributesToUpdate) {
-            AttributeValueUpdate.Builder attributeToUpdateBuilder = AttributeValueUpdate.builder()
-                    .action(attribute.getAction());
-            if (attribute.value() != null) {
-                attributeToUpdateBuilder.value(toAttributeValue(attribute.value()));
-            } else if (attribute.getAttributeValues() != null) {
-                attributeToUpdateBuilder.value(toAttributeValue(attribute
-                                                                     .getAttributeValues()));
-            }
-            result.put(attribute.getAttributeName(), attributeToUpdateBuilder.build());
-        }
-
-        return result;
-    }
-
-    /**
-     * Converts a simple value into the low-level {@code <AttributeValue/>}
-     * representation.
-     *
-     * @param value
-     *            the given value which can be one of the followings:
-     * <ul>
-     * <li>String</li>
-     * <li>Set&lt;String></li>
-     * <li>Number (including any subtypes and primitive types)</li>
-     * <li>Set&lt;Number></li>
-     * <li>byte[]</li>
-     * <li>Set&lt;byte[]></li>
-     * <li>ByteBuffer</li>
-     * <li>Set&lt;ByteBuffer></li>
-     * <li>Boolean or boolean</li>
-     * <li>null</li>
-     * <li>Map&lt;String,T>, where T can be any type on this list but must not
-     * induce any circular reference</li>
-     * <li>List&lt;T>, where T can be any type on this list but must not induce
-     * any circular reference</li>
-     * </ul>
-     * @return a non-null low level representation of the input object value
-     *
-     * @throws UnsupportedOperationException
-     *             if the input object type is not supported
-     */
-    public static AttributeValue toAttributeValue(Object value) {
-        AttributeValue.Builder resultBuilder = AttributeValue.builder();
-        if (value == null) {
-            return resultBuilder.nul(Boolean.TRUE).build();
-        } else if (value instanceof Boolean) {
-            return resultBuilder.bool((Boolean) value).build();
-        } else if (value instanceof String) {
-            return resultBuilder.s((String) value).build();
-        } else if (value instanceof BigDecimal) {
-            BigDecimal bd = (BigDecimal) value;
-            return resultBuilder.n(bd.toPlainString()).build();
-        } else if (value instanceof Number) {
-            return resultBuilder.n(value.toString()).build();
-        } else if (value instanceof byte[]) {
-            return resultBuilder.b(SdkBytes.fromByteArray((byte[]) value)).build();
-        } else if (value instanceof ByteBuffer) {
-            return resultBuilder.b(SdkBytes.fromByteBuffer((ByteBuffer) value)).build();
-        } else if (value instanceof Set) {
-            // default to an empty string set if there is no element
-            @SuppressWarnings("unchecked")
-            Set<Object> set = (Set<Object>) value;
-            if (set.size() == 0) {
-                resultBuilder.ss(new ArrayList<>());
-                return resultBuilder.build();
-            }
-            Object element = set.iterator().next();
-            if (element instanceof String) {
-                @SuppressWarnings("unchecked")
-                Set<String> ss = (Set<String>) value;
-                resultBuilder.ss(new ArrayList<String>(ss));
-            } else if (element instanceof Number) {
-                @SuppressWarnings("unchecked")
-                Set<Number> in = (Set<Number>) value;
-                List<String> out = new ArrayList<String>(set.size());
-                for (Number n : in) {
-                    BigDecimal bd = InternalUtils.toBigDecimal(n);
-                    out.add(bd.toPlainString());
-                }
-                resultBuilder.ns(out);
-            } else if (element instanceof byte[]) {
-                @SuppressWarnings("unchecked")
-                Set<byte[]> in = (Set<byte[]>) value;
-                List<SdkBytes> out = new ArrayList<>(set.size());
-                for (byte[] buf : in) {
-                    out.add(SdkBytes.fromByteArray(buf));
-                }
-                resultBuilder.bs(out);
-            } else if (element instanceof ByteBuffer) {
-                @SuppressWarnings("unchecked")
-                Set<ByteBuffer> in = (Set<ByteBuffer>) value;
-                List<SdkBytes> out = new ArrayList<>(set.size());
-                for (ByteBuffer buf : in) {
-                    out.add(SdkBytes.fromByteBuffer(buf));
-                }
-                resultBuilder.bs(out);
-            } else {
-                throw new UnsupportedOperationException("element type: "
-                                                        + element.getClass());
-            }
-        } else if (value instanceof List) {
-            @SuppressWarnings("unchecked")
-            List<Object> in = (List<Object>) value;
-            List<AttributeValue> out = new ArrayList<AttributeValue>();
-            for (Object v : in) {
-                out.add(toAttributeValue(v));
-            }
-            resultBuilder.l(out);
-        } else if (value instanceof Map) {
-            @SuppressWarnings("unchecked")
-            Map<String, Object> in = (Map<String, Object>) value;
-            Map<String, AttributeValue> attrs = new HashMap<>();
-            for (Map.Entry<String, Object> e : in.entrySet()) {
-                attrs.put(e.getKey(), toAttributeValue(e.getValue()));
-                //resultBuilder.addMEntry(e.getKey(), toAttributeValue(e.getValue()));
-            }
-            resultBuilder.m(attrs);
-        } else {
-            throw new UnsupportedOperationException("value type: "
-                                                    + value.getClass());
-        }
-        return resultBuilder.build();
-    }
-
-    /**
-     * Converts a list of low-level <code>AttributeValue</code> into a list of
-     * simple values. Each value in the returned list can be one of the
-     * followings:
-     *
-     * <ul>
-     * <li>String</li>
-     * <li>Set&lt;String></li>
-     * <li>Number (including any subtypes and primitive types)</li>
-     * <li>Set&lt;Number></li>
-     * <li>byte[]</li>
-     * <li>Set&lt;byte[]></li>
-     * <li>ByteBuffer</li>
-     * <li>Set&lt;ByteBuffer></li>
-     * <li>Boolean or boolean</li>
-     * <li>null</li>
-     * <li>Map&lt;String,T>, where T can be any type on this list but must not
-     * induce any circular reference</li>
-     * <li>List&lt;T>, where T can be any type on this list but must not induce
-     * any circular reference</li>
-     * </ul>
-     */
-    public static List<Object> toSimpleList(List<AttributeValue> attrValues) {
-        if (attrValues == null) {
-            return null;
-        }
-        List<Object> result = new ArrayList<Object>(attrValues.size());
-        for (AttributeValue attrValue : attrValues) {
-            Object value = toSimpleValue(attrValue);
-            result.add(value);
-        }
-        return result;
-    }
-
-    /**
-     * Convenient method to convert a list of low-level
-     * <code>AttributeValue</code> into a list of values of the same type T.
-     * Each value in the returned list can be one of the followings:
-     * <ul>
-     * <li>String</li>
-     * <li>Set&lt;String></li>
-     * <li>Number (including any subtypes and primitive types)</li>
-     * <li>Set&lt;Number></li>
-     * <li>byte[]</li>
-     * <li>Set&lt;byte[]></li>
-     * <li>ByteBuffer</li>
-     * <li>Set&lt;ByteBuffer></li>
-     * <li>Boolean or boolean</li>
-     * <li>null</li>
-     * <li>Map&lt;String,T>, where T can be any type on this list but must not
-     * induce any circular reference</li>
-     * <li>List&lt;T>, where T can be any type on this list but must not induce
-     * any circular reference</li>
-     * </ul>
-     */
-    public static <T> List<T> toSimpleListValue(List<AttributeValue> values) {
-        if (values == null) {
-            return null;
-        }
-
-        List<T> result = new ArrayList<T>(values.size());
-        for (AttributeValue v : values) {
-            T t = toSimpleValue(v);
-            result.add(t);
-        }
-        return result;
-    }
-
-    public static <T> Map<String, T> toSimpleMapValue(
-            Map<String, AttributeValue> values) {
-        if (values == null) {
-            return null;
-        }
-
-        Map<String, T> result = new LinkedHashMap<String, T>(values.size());
-        for (Map.Entry<String, AttributeValue> entry : values.entrySet()) {
-            T t = toSimpleValue(entry.getValue());
-            result.put(entry.getKey(), t);
-        }
-        return result;
-    }
-
-    /**
-     * Returns the string representation of the given value; or null if the
-     * value is null. For <code>BigDecimal</code> it will be the string
-     * representation without an exponent field.
-     */
-    public static String valToString(Object val) {
-        if (val instanceof BigDecimal) {
-            BigDecimal bd = (BigDecimal) val;
-            return bd.toPlainString();
-        }
-        if (val == null) {
-            return null;
-        }
-        if (val instanceof String
-            || val instanceof Boolean
-            || val instanceof Number) {
-            return val.toString();
-        }
-        throw new IncompatibleTypeException("Cannot convert " + val.getClass() + " into a string");
-    }
-
-    /**
-     * Converts a low-level <code>AttributeValue</code> into a simple value,
-     * which can be one of the followings:
-     *
-     * <ul>
-     * <li>String</li>
-     * <li>Set&lt;String></li>
-     * <li>Number (including any subtypes and primitive types)</li>
-     * <li>Set&lt;Number></li>
-     * <li>byte[]</li>
-     * <li>Set&lt;byte[]></li>
-     * <li>ByteBuffer</li>
-     * <li>Set&lt;ByteBuffer></li>
-     * <li>Boolean or boolean</li>
-     * <li>null</li>
-     * <li>Map&lt;String,T>, where T can be any type on this list but must not
-     * induce any circular reference</li>
-     * <li>List&lt;T>, where T can be any type on this list but must not induce
-     * any circular reference</li>
-     * </ul>
-     *
-     * @throws IllegalArgumentException
-     *             if an empty <code>AttributeValue</code> value is specified
-     */
-    static <T> T toSimpleValue(AttributeValue value) {
-        if (value == null) {
-            return null;
-        }
-        if (Boolean.TRUE.equals(value.nul())) {
-            return null;
-        } else if (Boolean.FALSE.equals(value.nul())) {
-            throw new UnsupportedOperationException("False-NULL is not supported in DynamoDB");
-        } else if (value.bool() != null) {
-            @SuppressWarnings("unchecked")
-            T t = (T) value.bool();
-            return t;
-        } else if (value.s() != null) {
-            @SuppressWarnings("unchecked")
-            T t = (T) value.s();
-            return t;
-        } else if (value.n() != null) {
-            @SuppressWarnings("unchecked")
-            T t = (T) new BigDecimal(value.n());
-            return t;
-        } else if (value.b() != null) {
-            @SuppressWarnings("unchecked")
-            T t = (T) value.b().asByteArray();
-            return t;
-        } else if (value.ss() != null && !(value.ss() instanceof SdkAutoConstructList)) {
-            @SuppressWarnings("unchecked")
-            T t = (T) new LinkedHashSet<String>(value.ss());
-            return t;
-        } else if (value.ns() != null && !(value.ns() instanceof SdkAutoConstructList)) {
-            Set<BigDecimal> set = new LinkedHashSet<BigDecimal>(value.ns().size());
-            for (String s : value.ns()) {
-                set.add(new BigDecimal(s));
-            }
-            @SuppressWarnings("unchecked")
-            T t = (T) set;
-            return t;
-        } else if (value.bs() != null && !(value.bs() instanceof SdkAutoConstructList)) {
-            Set<byte[]> set = new LinkedHashSet<byte[]>(value.bs().size());
-            for (SdkBytes bb : value.bs()) {
-                set.add(copyAllBytesFrom(bb.asByteBuffer()));
-            }
-            @SuppressWarnings("unchecked")
-            T t = (T) set;
-            return t;
-        } else if (value.l() != null && !(value.l() instanceof SdkAutoConstructList)) {
-            @SuppressWarnings("unchecked")
-            T t = (T) toSimpleList(value.l());
-            return t;
-        } else if (value.m() != null && !(value.m() instanceof SdkAutoConstructMap)) {
-            @SuppressWarnings("unchecked")
-            T t = (T) toSimpleMapValue(value.m());
-            return t;
-        } else {
-            throw new IllegalArgumentException(
-                    "Attribute value must not be empty: " + value);
-        }
-    }
-
-    /**
-     * Returns the minimum of the two input integers taking null into account.
-     * Returns null if both integers are null. Otherwise, a null Integer is
-     * treated as infinity.
-     */
-    public static Integer minimum(Integer one, Integer two) {
-        if (one == null) {
-            return two;
-        } else if (two == null) {
-            return one;
-        } else if (one < two) {
-            return one;
-        } else {
-            return two;
-        }
-    }
-
-    /**
-     * Returns the low level representation of a collection of <code>Expected</code>.
-     */
-    public static Map<String, ExpectedAttributeValue> toExpectedAttributeValueMap(
-            Collection<Expected> expectedSet) {
-        if (expectedSet == null) {
-            return null;
-        }
-        Map<String, ExpectedAttributeValue> expectedMap =
-                new LinkedHashMap<String, ExpectedAttributeValue>();
-        for (Expected expected : expectedSet) {
-            final String attr = expected.getAttribute();
-            final Object[] values = expected.values();
-            ExpectedAttributeValue.Builder eavBuilder = ExpectedAttributeValue.builder();
-            if (values != null) {
-                if (values.length > 0) {
-                    // convert from list of object values to list of AttributeValues
-                    AttributeValue[] avs = InternalUtils.toAttributeValues(values);
-                    eavBuilder.attributeValueList(avs);
-                } else {
-                    throw new IllegalStateException("Bug!");
-                }
-            }
-            ComparisonOperator op = expected.getComparisonOperator();
-            if (op == null) {
-                throw new IllegalArgumentException(
-                        "Comparison operator for attribute " + expected.getAttribute()
-                        + " must be specified");
-            }
-            eavBuilder.comparisonOperator(op);
-            expectedMap.put(attr, eavBuilder.build());
-        }
-        if (expectedSet.size() != expectedMap.size()) {
-            throw new IllegalArgumentException("duplicates attribute names not allowed in input");
-        }
-        return Collections.unmodifiableMap(expectedMap);
-    }
-
-    /**
-     * Returns the low level representation of a collection of <code>Filter</code>.
-     */
-    public static Map<String, Condition> toAttributeConditionMap(Collection<? extends Filter<?>> filters) {
-        if (filters == null) {
-            return null;
-        }
-        Map<String, Condition> conditionMap = new LinkedHashMap<String, Condition>();
-        for (Filter<?> filter : filters) {
-            final String attr = filter.getAttribute();
-            final Object[] values = filter.values();
-            Condition.Builder conditionBuilder = Condition.builder();
-            if (values != null) {
-                if (values.length > 0) {
-                    // convert from list of object values to list of AttributeValues
-                    AttributeValue[] avs = InternalUtils.toAttributeValues(values);
-                    conditionBuilder.attributeValueList(avs);
-                } else {
-                    throw new IllegalStateException("Bug!");
-                }
-            }
-            ComparisonOperator op = filter.getComparisonOperator();
-            if (op == null) {
-                throw new IllegalArgumentException(
-                        "Comparison operator for attribute " + filter.getAttribute()
-                        + " must be specified");
-            }
-            conditionBuilder.comparisonOperator(op);
-            conditionMap.put(attr, conditionBuilder.build());
-        }
-        if (filters.size() != conditionMap.size()) {
-            throw new IllegalArgumentException("duplicates attribute names not allowed in input");
-        }
-        return Collections.unmodifiableMap(conditionMap);
-    }
-
-    /**
-     * Converts the input array of values into an array of low level
-     * representation of those values.
-     *
-     * A value in the input array can be one of the followings:
-     *
-     * <ul>
-     * <li>String</li>
-     * <li>Set&lt;String></li>
-     * <li>Number (including any subtypes and primitive types)</li>
-     * <li>Set&lt;Number></li>
-     * <li>byte[]</li>
-     * <li>Set&lt;byte[]></li>
-     * <li>ByteBuffer</li>
-     * <li>Set&lt;ByteBuffer></li>
-     * <li>Boolean or boolean</li>
-     * <li>null</li>
-     * <li>Map&lt;String,T>, where T can be any type on this list but must not
-     * induce any circular reference</li>
-     * <li>List&lt;T>, where T can be any type on this list but must not induce
-     * any circular reference</li>
-     * </ul>
-     */
-    public static AttributeValue[] toAttributeValues(Object[] values) {
-        AttributeValue[] attrValues = new AttributeValue[values.length];
-        for (int i = 0; i < values.length; i++) {
-            attrValues[i] = InternalUtils.toAttributeValue(values[i]);
-        }
-        return attrValues;
-    }
-
-    /**
-     * Converts the specified primary key into the low-level representation.
-     */
-    public static Map<String, AttributeValue> toAttributeValueMap(
-            Collection<KeyAttribute> primaryKey) {
-        if (primaryKey == null) {
-            return null;
-        }
-        Map<String, AttributeValue> keys = new LinkedHashMap<String, AttributeValue>();
-        for (KeyAttribute keyAttr : primaryKey) {
-            keys.put(keyAttr.name(),
-                     InternalUtils.toAttributeValue(keyAttr.value()));
-        }
-        return Collections.unmodifiableMap(keys);
-    }
-
-    /**
-     * Converts the specified primary key into the low-level representation.
-     */
-    public static Map<String, AttributeValue> toAttributeValueMap(
-            PrimaryKey primaryKey) {
-        if (primaryKey == null) {
-            return null;
-        }
-        return toAttributeValueMap(primaryKey.getComponents());
-    }
-
-    /**
-     * Converts the specified primary key into the low-level representation.
-     */
-    public static Map<String, AttributeValue> toAttributeValueMap(
-            KeyAttribute... primaryKey) {
-        if (primaryKey == null) {
-            return null;
-        }
-        return toAttributeValueMap(Arrays.asList(primaryKey));
-    }
-
-    /**
-     * Converts a number into BigDecimal representation.
-     */
-    public static BigDecimal toBigDecimal(Number n) {
-        if (n instanceof BigDecimal) {
-            return (BigDecimal) n;
-        }
-        return new BigDecimal(n.toString());
-    }
-
-    public static Set<BigDecimal> toBigDecimalSet(Number... val) {
-        Set<BigDecimal> set = new LinkedHashSet<BigDecimal>(val.length);
-        for (Number n : val) {
-            set.add(InternalUtils.toBigDecimal(n));
-        }
-        return set;
-    }
-
-    public static Set<BigDecimal> toBigDecimalSet(Set<Number> vals) {
-        Set<BigDecimal> set = new LinkedHashSet<BigDecimal>(vals.size());
-        for (Number n : vals) {
-            set.add(InternalUtils.toBigDecimal(n));
-        }
-        return set;
-    }
-
-    /**
-     * Append the custom user-agent string.
-     */
-    public static <X extends AwsRequest> X applyUserAgent(X request) {
-        final AwsRequestOverrideConfiguration newCfg = request.overrideConfiguration()
-                                                              .map(AwsRequestOverrideConfiguration::toBuilder)
-                                                              .orElse(AwsRequestOverrideConfiguration.builder())
-                                                              .addApiName(apiName -> apiName.name("dynamodb-table-api").version(VersionInfo.SDK_VERSION))
-                                                              .build();
-
-        return (X) request.toBuilder()
-                .overrideConfiguration(newCfg)
-                .build();
-    }
-
-    public static void rejectNullValue(Object val) {
-        if (val == null) {
-            throw new IllegalArgumentException("Input value must not be null");
-        }
-    }
-
-    public static void rejectNullInput(Object input) {
-        if (input == null) {
-            throw new IllegalArgumentException("Input must not be null");
-        }
-    }
-
-    public static void rejectEmptyInput(Object[] input) {
-        if (input.length == 0) {
-            throw new IllegalArgumentException("At least one input must be specified");
-        }
-    }
-
-    public static void rejectNullOrEmptyInput(Object[] input) {
-        rejectNullInput(input);
-        rejectEmptyInput(input);
-    }
-
-    public static void checkInvalidAttrName(String attrName) {
-        if (attrName == null || attrName.trim().length() == 0) {
-            throw new IllegalArgumentException("Attribute name must not be null or empty");
-        }
-    }
-
-    public static void checkInvalidAttribute(String attrName, Object val) {
-        checkInvalidAttrName(attrName);
-        rejectNullValue(val);
-    }
-}
diff --git a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/internal/InternalUtilsTest.java b/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/internal/InternalUtilsTest.java
deleted file mode 100644
index 40917e2f6d98..000000000000
--- a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/internal/InternalUtilsTest.java
+++ /dev/null
@@ -1,366 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.document.internal;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-import static software.amazon.awssdk.services.dynamodb.document.internal.InternalUtils.toAttributeValues;
-import static software.amazon.awssdk.services.dynamodb.document.internal.InternalUtils.toItemList;
-import static software.amazon.awssdk.services.dynamodb.document.internal.InternalUtils.toSimpleList;
-import static software.amazon.awssdk.services.dynamodb.document.internal.InternalUtils.toSimpleValue;
-import static software.amazon.awssdk.services.dynamodb.document.internal.InternalUtils.valToString;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import org.junit.Ignore;
-import org.junit.Test;
-import software.amazon.awssdk.core.SdkBytes;
-import software.amazon.awssdk.core.util.SdkAutoConstructList;
-import software.amazon.awssdk.services.dynamodb.document.Expected;
-import software.amazon.awssdk.services.dynamodb.document.Item;
-import software.amazon.awssdk.services.dynamodb.document.KeyAttribute;
-import software.amazon.awssdk.services.dynamodb.document.PrimaryKey;
-import software.amazon.awssdk.services.dynamodb.document.utils.FluentHashSet;
-import software.amazon.awssdk.services.dynamodb.document.utils.ValueMap;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-import software.amazon.awssdk.services.dynamodb.model.ExpectedAttributeValue;
-
-public class InternalUtilsTest {
-
-    @Test
-    public void nullInput() {
-        assertTrue(toItemList(null).size() == 0);
-        assertNull(toAttributeValues((Item) null));
-        assertNull(toSimpleList(null));
-        assertNull(toSimpleValue(null));
-        assertNull(valToString(null));
-    }
-
-    @Test
-    @Ignore // Does not pass anymore because the builder will create a duplicate of the BB
-    public void toAttributeValue_ByteBuffer() {
-        ByteBuffer bbFrom = ByteBuffer.allocate(10);
-        AttributeValue av = InternalUtils.toAttributeValue(bbFrom);
-        ByteBuffer bbTo = av.b().asByteBuffer();
-        assertSame(bbFrom, bbTo);
-    }
-
-    @Test
-    public void toAttributeValue_byteArray() {
-        byte[] bytesFrom = {1, 2, 3, 4};
-        AttributeValue av = InternalUtils.toAttributeValue(bytesFrom);
-        ByteBuffer bbTo = av.b().asByteBuffer();
-        assertTrue(ByteBuffer.wrap(bytesFrom).compareTo(bbTo) == 0);
-    }
-
-    @Test
-    public void toAttributeValue_Number() {
-        {
-            AttributeValue av = InternalUtils.toAttributeValue(123);
-            String num = av.n();
-            assertEquals("123", num);
-        }
-        {   // 17 decimal places
-            AttributeValue av = InternalUtils.toAttributeValue(0.99999999999999999);
-            String num = av.n();
-            assertEquals("1.0", num);
-        }
-        {   // 16 decimal places
-            AttributeValue av = InternalUtils.toAttributeValue(0.9999999999999999);
-            String num = av.n();
-            assertEquals("0.9999999999999999", num);
-        }
-        {
-            String numFrom = "0.99999999999999999999999999999999999999";
-            AttributeValue av = InternalUtils.toAttributeValue(
-                    new BigDecimal(numFrom));
-            String numTo = av.n();
-            assertEquals(numFrom, numTo);
-        }
-    }
-
-    @Test
-    public void toAttributeValue_emptySet() {
-        AttributeValue av = InternalUtils.toAttributeValue(new HashSet<Object>());
-        List<String> ss = av.ss();
-        assertTrue(ss.size() == 0);
-        assertTrue(av.ns() instanceof SdkAutoConstructList);
-    }
-
-    @Test
-    public void toAttributeValue_NumberSet() {
-        Set<Number> nsFrom = new FluentHashSet<Number>()
-                .with(123)
-                .with(123.45)
-                .with(Integer.valueOf(678))
-                .with(new BigInteger("1234567890123456789012345678901234567890"))
-                .with(new BigDecimal("0.99999999999999999999999999999999999999"));
-        AttributeValue av = InternalUtils.toAttributeValue(nsFrom);
-        assertTrue(av.ss() instanceof SdkAutoConstructList);
-        List<String> ns = av.ns();
-        assertTrue(ns.size() == 5);
-        assertTrue(ns.contains("123"));
-        assertTrue(ns.contains("123.45"));
-        assertTrue(ns.contains("678"));
-        assertTrue(ns.contains("1234567890123456789012345678901234567890"));
-        assertTrue(ns.contains("0.99999999999999999999999999999999999999"));
-    }
-
-    @Test
-    public void toAttributeValue_ByteArraySet() {
-        byte[] ba1From = new byte[] {1, 2, 3};
-        byte[] ba2From = new byte[] {4, 5, 6};
-        Set<byte[]> nsFrom = new FluentHashSet<byte[]>()
-                .with(ba1From)
-                .with(ba2From);
-        AttributeValue av = InternalUtils.toAttributeValue(nsFrom);
-        assertTrue(av.ss() instanceof SdkAutoConstructList);
-        List<SdkBytes> bs = av.bs();
-        assertTrue(bs.size() == 2);
-        boolean bool1 = false;
-        boolean bool2 = false;
-        for (SdkBytes b : bs) {
-            if (ByteBuffer.wrap(ba1From).compareTo(b.asByteBuffer()) == 0) {
-                bool1 = true;
-            } else if (ByteBuffer.wrap(ba2From).compareTo(b.asByteBuffer()) == 0) {
-                bool2 = true;
-            }
-        }
-        assertTrue(bool1);
-        assertTrue(bool2);
-    }
-
-    @Test
-    public void toAttributeValue_ByteBufferSet() {
-        byte[] ba1From = new byte[] {1, 2, 3};
-        byte[] ba2From = new byte[] {4, 5, 6};
-        Set<ByteBuffer> nsFrom = new FluentHashSet<ByteBuffer>()
-                .with(ByteBuffer.wrap(ba1From))
-                .with(ByteBuffer.wrap(ba2From));
-        AttributeValue av = InternalUtils.toAttributeValue(nsFrom);
-        assertTrue(av.ss() instanceof SdkAutoConstructList);
-        List<SdkBytes> bs = av.bs();
-        assertTrue(bs.size() == 2);
-        boolean bool1 = false;
-        boolean bool2 = false;
-        for (SdkBytes b : bs) {
-            if (ByteBuffer.wrap(ba1From).compareTo(b.asByteBuffer()) == 0) {
-                bool1 = true;
-            } else if (ByteBuffer.wrap(ba2From).compareTo(b.asByteBuffer()) == 0) {
-                bool2 = true;
-            }
-        }
-        assertTrue(bool1);
-        assertTrue(bool2);
-    }
-
-    @Test
-    public void toAttributeValue_null() {
-        AttributeValue av = InternalUtils.toAttributeValue(null);
-        assertEquals(Boolean.TRUE, av.nul());
-    }
-
-    @Test(expected = UnsupportedOperationException.class)
-    public void toAttributeValue_UnsupportedOperationException() {
-        InternalUtils.toAttributeValue(new Object());
-    }
-
-    @Test
-    public void toAttributeValue_emptyMap() {
-        AttributeValue av = InternalUtils.toAttributeValue(new HashMap<String, String>());
-        Map<String, AttributeValue> m = av.m();
-        assertTrue(m.size() == 0);
-    }
-
-    @Test
-    public void toAttributeValue_emptyList() {
-        AttributeValue av = InternalUtils.toAttributeValue(new ArrayList<String>());
-        List<AttributeValue> l = av.l();
-        assertTrue(l.size() == 0);
-    }
-
-    @Test
-    public void toAttributeValue_MapOfMap() {
-        AttributeValue av = InternalUtils.toAttributeValue(new ValueMap()
-                                                                   .with("emptyMap", new ValueMap()));
-        Map<String, AttributeValue> m = av.m();
-        assertTrue(m.size() == 1);
-        AttributeValue emptyMap = m.get("emptyMap");
-        Map<String, AttributeValue> mInner = emptyMap.m();
-        assertTrue(0 == mInner.size());
-    }
-
-    @Test
-    public void toSimpleListValue_empty() {
-        List<AttributeValue> listFrom = new ArrayList<AttributeValue>();
-        List<Object> listTo = toSimpleList(listFrom);
-        assertTrue(listTo.size() == 0);
-    }
-
-    @Test
-    public void toSimpleListValue_null() {
-        assertNull(InternalUtils.toSimpleListValue(null));
-    }
-
-    @Test
-    public void toSimpleListValue() {
-        List<AttributeValue> listFrom = new ArrayList<AttributeValue>();
-        listFrom.add(AttributeValue.builder().s("test").build());
-        listFrom.add(AttributeValue.builder().n("123").build());
-        List<Object> listTo = InternalUtils.toSimpleListValue(listFrom);
-        assertTrue(listTo.size() == 2);
-        assertEquals("test", listTo.get(0));
-        assertEquals(new BigDecimal("123"), listTo.get(1));
-    }
-
-    @Test
-    public void toSimpleValue_null() {
-        assertNull(toSimpleValue(null));
-        assertNull(toSimpleValue(AttributeValue.builder().nul(Boolean.TRUE).build()));
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void toSimpleValue_empty() {
-        toSimpleValue(AttributeValue.builder().build());
-    }
-
-    @Test(expected = UnsupportedOperationException.class)
-    public void toSimpleValue_FalseNull() {
-        toSimpleValue(AttributeValue.builder().nul(Boolean.FALSE).build());
-    }
-
-    @Test
-    public void toSimpleValue_NS() {
-        Set<BigDecimal> numset = toSimpleValue(
-                AttributeValue.builder().ns("123", "456").build());
-        assertTrue(numset.size() == 2);
-        assertTrue(numset.contains(new BigDecimal("123")));
-        assertTrue(numset.contains(new BigDecimal("456")));
-    }
-
-    @Test
-    public void toSimpleValue_emptyNS() {
-        Set<BigDecimal> numset = toSimpleValue(
-                AttributeValue.builder().ns(new ArrayList<String>()).build());
-        assertTrue(numset.size() == 0);
-    }
-
-    @Test
-    public void toSimpleValue_M() {
-        Map<String, AttributeValue> mapFrom = new HashMap<String, AttributeValue>();
-        mapFrom.put("fooBOOL", AttributeValue.builder().bool(Boolean.TRUE).build());
-        mapFrom.put("fooString", AttributeValue.builder().s("bar").build());
-        Map<String, Object> mapTo = toSimpleValue(
-                AttributeValue.builder().m(mapFrom).build());
-        assertTrue(mapTo.size() == 2);
-        assertEquals(Boolean.TRUE, mapTo.get("fooBOOL"));
-        assertEquals("bar", mapTo.get("fooString"));
-    }
-
-    @Test
-    public void toSimpleValue_emptyM() {
-        Map<String, AttributeValue> mapFrom = new HashMap<String, AttributeValue>();
-        Map<String, Object> mapTo = toSimpleValue(
-                AttributeValue.builder().m(mapFrom).build());
-        assertTrue(mapTo.size() == 0);
-    }
-
-    @Test
-    public void toSimpleValue_ByteArray() {
-        byte[] bytesFrom = new byte[] {1, 2, 3};
-        ByteBuffer byteBufferTo = ByteBuffer.allocate(3).put(bytesFrom);
-        byteBufferTo.rewind();
-        byte[] bytesTo = toSimpleValue(
-                AttributeValue.builder().b(SdkBytes.fromByteBuffer(byteBufferTo)).build());
-        assertTrue(Arrays.equals(bytesTo, bytesFrom));
-    }
-
-    @Test
-    public void toSimpleValue_DirectByteBuffer() {
-        byte[] bytesFrom = new byte[] {1, 2, 3};
-        ByteBuffer byteBufferTo = ByteBuffer.allocateDirect(3).put(bytesFrom);
-        byteBufferTo.rewind();
-        byte[] bytesTo = toSimpleValue(
-                AttributeValue.builder().b(SdkBytes.fromByteBuffer(byteBufferTo)).build());
-        assertTrue(Arrays.equals(bytesTo, bytesFrom));
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void toExpectedAttributeValueMap_missingComparisonOperator() {
-        InternalUtils.toExpectedAttributeValueMap(Arrays.asList(new Expected("attrName")));
-    }
-
-    @Test
-    public void toExpectedAttributeValueMap() {
-        Map<String, ExpectedAttributeValue> to =
-                InternalUtils.toExpectedAttributeValueMap(Arrays.asList(
-                        new Expected("attr1").exists(),
-                        new Expected("attr2").exists()
-                                                                       ));
-        assertTrue(to.size() == 2);
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void toExpectedAttributeValueMap_duplicateAttributeNames() {
-        InternalUtils.toExpectedAttributeValueMap(Arrays.asList(
-                new Expected("attr1").exists(),
-                new Expected("attr1").ge(1)
-                                                               ));
-    }
-
-    @Test
-    public void toAttributeValueMap_nullKeyAttributeCollection() {
-        assertNull(InternalUtils.toAttributeValueMap((Collection<KeyAttribute>) null));
-    }
-
-    @Test
-    public void toAttributeValueMap_nullPrimaryKey() {
-        assertNull(InternalUtils.toAttributeValueMap((PrimaryKey) null));
-    }
-
-    @Test
-    public void toAttributeValueMap_nullKeyAttributes() {
-        assertNull(InternalUtils.toAttributeValueMap((KeyAttribute[]) null));
-    }
-
-    @Test
-    public void toAttributeValueMap_KeyAttributes() {
-        Map<String, AttributeValue> map = InternalUtils.toAttributeValueMap(
-                new KeyAttribute("hashname", "hashvalue"),
-                new KeyAttribute("rangekey", 123));
-        AttributeValue av = map.get("hashname");
-        assertEquals("hashvalue", av.s());
-        av = map.get("rangekey");
-        assertEquals("123", av.n());
-    }
-
-    @Test
-    public void valToString_int() {
-        String s = valToString(123.456);
-        assertEquals("123.456", s);
-    }
-}
diff --git a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/internal/ItemValueConformer.java b/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/internal/ItemValueConformer.java
deleted file mode 100644
index 5d76d8c32fc7..000000000000
--- a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/internal/ItemValueConformer.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.document.internal;
-
-import static software.amazon.awssdk.utils.BinaryUtils.copyBytesFrom;
-
-import java.math.BigDecimal;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * Used to standardize a given <code>Item</code>'s value into a standard
- * internal representation (for purposes such as equality comparison.)
- */
-public class ItemValueConformer extends ValueTransformer {
-    /**
-     * This method is assumed to be called for the purpose of a setter method
-     * invocation, but NOT a getter method invocation.
-     */
-    @Override
-    public Object transform(Object value) {
-        if (value == null) {
-            return value;
-        } else if (value instanceof Boolean) {
-            return value;
-        } else if (value instanceof String) {
-            return value;
-        } else if (value instanceof Number) {
-            return InternalUtils.toBigDecimal((Number) value);
-        } else if (value instanceof byte[]) {
-            return value;
-        } else if (value instanceof ByteBuffer) {
-            return copyBytesFrom((ByteBuffer) value);
-        } else if (value instanceof Set) {
-            @SuppressWarnings("unchecked")
-            Set<Object> set = (Set<Object>) value;
-            if (set.size() == 0) {
-                return value;
-            }
-            Object element = set.iterator().next();
-            if (element instanceof String) {
-                return value;
-            } else if (element instanceof BigDecimal) {
-                return value;
-            } else if (element instanceof Number) {
-                @SuppressWarnings("unchecked")
-                Set<Number> in = (Set<Number>) value;
-                Set<BigDecimal> out = new LinkedHashSet<BigDecimal>(set.size());
-                for (Number n : in) {
-                    out.add(InternalUtils.toBigDecimal(n));
-                }
-                return out;
-            } else if (element instanceof byte[]) {
-                return value;
-            } else if (element instanceof ByteBuffer) {
-                @SuppressWarnings("unchecked")
-                Set<ByteBuffer> bs = (Set<ByteBuffer>) value;
-                Set<byte[]> out = new LinkedHashSet<byte[]>(bs.size());
-                for (ByteBuffer bb : bs) {
-                    out.add(copyBytesFrom(bb));
-                }
-                return out;
-            } else {
-                throw new UnsupportedOperationException("element type: "
-                                                        + element.getClass());
-            }
-        } else if (value instanceof List) {
-            @SuppressWarnings("unchecked")
-            List<Object> in = (List<Object>) value;
-            if (in.size() == 0) {
-                return in;
-            }
-            List<Object> out = new ArrayList<Object>();
-            for (Object v : in) {
-                out.add(transform(v));
-            }
-            return out;
-        } else if (value instanceof Map) {
-            @SuppressWarnings("unchecked")
-            Map<String, Object> in = (Map<String, Object>) value;
-            if (in.size() == 0) {
-                return in;
-            }
-            Map<String, Object> out = new LinkedHashMap<String, Object>(in.size());
-            for (Map.Entry<String, Object> e : in.entrySet()) {
-                out.put(e.getKey(), transform(e.getValue()));
-            }
-            return out;
-        } else {
-            throw new UnsupportedOperationException("value type: "
-                                                    + value.getClass());
-        }
-    }
-}
diff --git a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/internal/ItemValueConformerTest.java b/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/internal/ItemValueConformerTest.java
deleted file mode 100644
index 81bb2de283e1..000000000000
--- a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/internal/ItemValueConformerTest.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.document.internal;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import java.math.BigDecimal;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import org.junit.Test;
-import software.amazon.awssdk.services.dynamodb.document.utils.FluentHashSet;
-
-public class ItemValueConformerTest {
-
-    @Test
-    public void byteBuffer() {
-        byte[] bytes = {1, 2, 3};
-        ByteBuffer bb = ByteBuffer.wrap(bytes);
-        byte[] bytesTo = (byte[]) new ItemValueConformer().transform(bb);
-        assertTrue(Arrays.equals(bytesTo, bytes));
-    }
-
-    @Test
-    public void emptySet() {
-        Set<?> from = new HashSet<Object>();
-        Set<?> to = (Set<?>) new ItemValueConformer().transform(from);
-        assertTrue(to.size() == 0);
-    }
-
-    @Test
-    public void stringSet() {
-        Set<?> from = new FluentHashSet<String>("a", "b");
-        Set<?> to = (Set<?>) new ItemValueConformer().transform(from);
-        assertTrue(to.size() == 2);
-        assertTrue(to.contains("a"));
-        assertTrue(to.contains("b"));
-    }
-
-    @Test
-    public void bytesSet() {
-        byte[] bytes123 = {1, 2, 3};
-        byte[] bytes456 = {4, 5, 6};
-        Set<?> from = new FluentHashSet<byte[]>(bytes123, bytes456);
-        @SuppressWarnings("unchecked")
-        Set<byte[]> to = (Set<byte[]>) new ItemValueConformer().transform(from);
-        assertTrue(to.size() == 2);
-        boolean a = false, b = false;
-        for (byte[] bytes : to) {
-            if (Arrays.equals(bytes123, bytes)) {
-                a = true;
-            } else if (Arrays.equals(bytes456, bytes)) {
-                b = true;
-            }
-        }
-        assertTrue(a);
-        assertTrue(b);
-    }
-
-    @Test
-    public void byteBufferSet() {
-        byte[] bytes123 = {1, 2, 3};
-        byte[] bytes456 = {4, 5, 6};
-        Set<?> from = new FluentHashSet<ByteBuffer>(ByteBuffer.wrap(bytes123), ByteBuffer.wrap(bytes456));
-        @SuppressWarnings("unchecked")
-        Set<byte[]> to = (Set<byte[]>) new ItemValueConformer().transform(from);
-        assertTrue(to.size() == 2);
-        boolean a = false, b = false;
-        for (byte[] bytes : to) {
-            if (Arrays.equals(bytes123, bytes)) {
-                a = true;
-            } else if (Arrays.equals(bytes456, bytes)) {
-                b = true;
-            }
-        }
-        assertTrue(a);
-        assertTrue(b);
-    }
-
-    @Test
-    public void bigDecimalSet() {
-        Set<?> from = new FluentHashSet<BigDecimal>(BigDecimal.ZERO, BigDecimal.TEN);
-        Set<?> to = (Set<?>) new ItemValueConformer().transform(from);
-        assertTrue(to.size() == 2);
-        assertTrue(to.contains(BigDecimal.ZERO));
-        assertTrue(to.contains(BigDecimal.TEN));
-    }
-
-    @Test
-    public void bigNumberSet() {
-        Set<?> from = new FluentHashSet<Number>(Integer.MAX_VALUE, Double.MAX_VALUE);
-        Set<?> to = (Set<?>) new ItemValueConformer().transform(from);
-        assertTrue(to.size() == 2);
-
-        assertFalse(to.contains(Integer.MAX_VALUE));
-        assertFalse(to.contains(Double.MAX_VALUE));
-
-        assertTrue(to.contains(new BigDecimal(String.valueOf(Integer.MAX_VALUE))));
-        assertTrue(to.contains(new BigDecimal(String.valueOf(Double.MAX_VALUE))));
-    }
-
-    @Test
-    public void emptyMap() {
-        Map<?, ?> from = new HashMap<Object, Object>();
-        Map<?, ?> to = (Map<?, ?>) new ItemValueConformer().transform(from);
-        assertTrue(to.size() == 0);
-    }
-
-    @Test(expected = UnsupportedOperationException.class)
-    public void uknownType() {
-        new ItemValueConformer().transform(new Object());
-    }
-
-    @Test(expected = UnsupportedOperationException.class)
-    public void uknownsetType() {
-        new ItemValueConformer().transform(new FluentHashSet<Object>(new Object()));
-    }
-}
diff --git a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/internal/IteratorSupport.java b/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/internal/IteratorSupport.java
deleted file mode 100644
index b84bb37c67b1..000000000000
--- a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/internal/IteratorSupport.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.document.internal;
-
-import java.util.Iterator;
-import java.util.NoSuchElementException;
-import software.amazon.awssdk.services.dynamodb.document.Page;
-
-/**
- * An internal iterator implementation for {@link PageBasedCollection}.
- * <p>
- * <b>NOTE</b>: this internal class is marked as public since it has been incorrectly
- * exposed in the public method {@link PageBasedCollection#iterator()}, and it
- * will be changed to be package private in the next major version.
- *
- * @param <T>
- *            resource type
- * @param <R>
- *            low level result type
- */
-public class IteratorSupport<T, R> implements Iterator<T> {
-    /**
-     * Used to iterate through the resource pages, dynamically making network
-     * calls as needed.
-     */
-    final PageIterator<T, R> resourcePageIterator;
-    /**
-     * Used to iterate through a list of resources already retrieved.
-     */
-    private Iterator<T> localResourceIterator;
-    private T resource;
-
-    IteratorSupport(PageIterator<T, R> resourcePageIterator) {
-        this.resourcePageIterator = resourcePageIterator;
-    }
-
-    @Override
-    public boolean hasNext() {
-        if (resource != null) {
-            return true;
-        }
-        resource = nextResource();
-        return (resource != null);
-    }
-
-    @Override
-    public T next() {
-        T rval = resource;
-        if (rval == null) {
-            rval = nextResource();
-            if (rval == null) {
-                throw new NoSuchElementException("No more elements");
-            }
-        } else {
-            resource = null;
-        }
-        return rval;
-    }
-
-    @Override
-    public void remove() {
-        throw new UnsupportedOperationException(
-                "Collection is read-only");
-    }
-
-    private T nextResource() {
-        while (true) {
-            if (localResourceIterator != null && localResourceIterator.hasNext()) {
-                return localResourceIterator.next();
-            }
-            if (!resourcePageIterator.hasNext()) {
-                return null;
-            }
-            Page<T, R> resourcePage = resourcePageIterator.next();
-            localResourceIterator = resourcePage.iterator();
-        }
-    }
-}
diff --git a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/internal/ListTablesCollection.java b/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/internal/ListTablesCollection.java
deleted file mode 100644
index 6f91c0312ac1..000000000000
--- a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/internal/ListTablesCollection.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.document.internal;
-
-import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
-import software.amazon.awssdk.services.dynamodb.document.Page;
-import software.amazon.awssdk.services.dynamodb.document.Table;
-import software.amazon.awssdk.services.dynamodb.document.TableCollection;
-import software.amazon.awssdk.services.dynamodb.document.spec.ListTablesSpec;
-import software.amazon.awssdk.services.dynamodb.model.ListTablesRequest;
-import software.amazon.awssdk.services.dynamodb.model.ListTablesResponse;
-
-class ListTablesCollection extends TableCollection<ListTablesResponse> {
-
-    private final DynamoDbClient client;
-    private final ListTablesSpec spec;
-    private final String startKey;
-
-    ListTablesCollection(DynamoDbClient client, ListTablesSpec spec) {
-        this.client = client;
-        this.spec = spec;
-        this.startKey = spec.getExclusiveStartTableName();
-    }
-
-    @Override
-    public Page<Table, ListTablesResponse> firstPage() {
-        ListTablesRequest request = spec.getRequest()
-                .toBuilder()
-                .exclusiveStartTableName(startKey)
-                .limit(InternalUtils.minimum(
-                    spec.maxResultSize(),
-                    spec.maxPageSize()))
-                .build();
-        spec.setRequest(request);
-        ListTablesResponse result = client.listTables(request);
-        setLastLowLevelResult(result);
-        return new ListTablesPage(client, spec, request, 0, result);
-    }
-
-    @Override
-    public Integer getMaxResultSize() {
-        return spec.maxResultSize();
-    }
-}
diff --git a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/internal/ListTablesImpl.java b/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/internal/ListTablesImpl.java
deleted file mode 100644
index 9c488233e6e3..000000000000
--- a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/internal/ListTablesImpl.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.document.internal;
-
-import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
-import software.amazon.awssdk.services.dynamodb.document.TableCollection;
-import software.amazon.awssdk.services.dynamodb.document.api.ListTablesApi;
-import software.amazon.awssdk.services.dynamodb.document.spec.ListTablesSpec;
-import software.amazon.awssdk.services.dynamodb.model.ListTablesResponse;
-
-/**
- * The implementation for <code>ListTablesApi</code>.
- */
-public class ListTablesImpl implements ListTablesApi {
-    private final DynamoDbClient client;
-
-    public ListTablesImpl(DynamoDbClient client) {
-        this.client = client;
-    }
-
-    @Override
-    public TableCollection<ListTablesResponse> listTables(ListTablesSpec spec) {
-        return doList(spec);
-    }
-
-    @Override
-    public TableCollection<ListTablesResponse> listTables() {
-        return doList(new ListTablesSpec());
-    }
-
-    @Override
-    public TableCollection<ListTablesResponse> listTables(String exclusiveStartTableName) {
-        return doList(new ListTablesSpec()
-                              .withExclusiveStartTableName(exclusiveStartTableName));
-    }
-
-    @Override
-    public TableCollection<ListTablesResponse> listTables(String exclusiveStartTableName,
-                                                        int maxResultSize) {
-        return doList(new ListTablesSpec()
-                              .withExclusiveStartTableName(exclusiveStartTableName)
-                              .withMaxResultSize(maxResultSize));
-    }
-
-    @Override
-    public TableCollection<ListTablesResponse> listTables(int maxResultSize) {
-        return doList(new ListTablesSpec()
-                              .withMaxResultSize(maxResultSize));
-    }
-
-    private TableCollection<ListTablesResponse> doList(ListTablesSpec spec) {
-        return new ListTablesCollection(client, spec);
-    }
-}
diff --git a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/internal/ListTablesPage.java b/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/internal/ListTablesPage.java
deleted file mode 100644
index 0e08ecd951cf..000000000000
--- a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/internal/ListTablesPage.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.document.internal;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.NoSuchElementException;
-import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
-import software.amazon.awssdk.services.dynamodb.document.Page;
-import software.amazon.awssdk.services.dynamodb.document.Table;
-import software.amazon.awssdk.services.dynamodb.document.spec.ListTablesSpec;
-import software.amazon.awssdk.services.dynamodb.model.ListTablesRequest;
-import software.amazon.awssdk.services.dynamodb.model.ListTablesResponse;
-
-class ListTablesPage extends Page<Table, ListTablesResponse> {
-    private final DynamoDbClient client;
-    private final ListTablesSpec spec;
-    private ListTablesRequest request;
-    private final int index;
-    private final String lastEvaluatedKey;
-
-    ListTablesPage(
-        DynamoDbClient client,
-        ListTablesSpec spec,
-        ListTablesRequest request,
-        int index,
-        ListTablesResponse result) {
-        super(Collections.unmodifiableList(
-                toTableList(client, result.tableNames())),
-              result);
-        this.client = client;
-        this.spec = spec;
-        this.request = request;
-        this.index = index;
-        Integer max = spec.maxResultSize();
-        if (max != null && (index + result.tableNames().size()) > max) {
-            this.lastEvaluatedKey = null;
-        } else {
-            this.lastEvaluatedKey = result.lastEvaluatedTableName();
-        }
-    }
-
-    private static List<Table> toTableList(DynamoDbClient client, List<String> tableNames) {
-        if (tableNames == null) {
-            return null;
-        }
-        List<Table> result = new ArrayList<Table>(tableNames.size());
-        for (String tableName : tableNames) {
-            result.add(new Table(client, tableName));
-        }
-        return result;
-    }
-
-    @Override
-    public boolean hasNextPage() {
-        if (lastEvaluatedKey == null) {
-            return false;
-        }
-        Integer max = spec.maxResultSize();
-        if (max == null) {
-            return true;
-        }
-        return nextRequestLimit(max.intValue()) > 0;
-    }
-
-    private int nextRequestLimit(int max) {
-        int nextIndex = index + this.size();
-        return InternalUtils.minimum(
-                max - nextIndex,
-                spec.maxPageSize());
-    }
-
-    @Override
-    public Page<Table, ListTablesResponse> nextPage() {
-        if (lastEvaluatedKey == null) {
-            throw new NoSuchElementException("No more pages");
-        }
-        final Integer max = spec.maxResultSize();
-        if (max != null) {
-            int nextLimit = nextRequestLimit(max.intValue());
-            if (nextLimit == 0) {
-                throw new NoSuchElementException("No more pages");
-            }
-            request = request.toBuilder().limit(nextLimit).build();
-        }
-        request = request.toBuilder().exclusiveStartTableName(lastEvaluatedKey).build();
-        ListTablesResponse result = client.listTables(request);
-        final int nextIndex = index + this.size();
-        return new ListTablesPage(client, spec, request, nextIndex, result);
-    }
-}
diff --git a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/internal/PageBasedCollection.java b/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/internal/PageBasedCollection.java
deleted file mode 100644
index 96c2380056b8..000000000000
--- a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/internal/PageBasedCollection.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.document.internal;
-
-import software.amazon.awssdk.services.dynamodb.document.LowLevelResultListener;
-import software.amazon.awssdk.services.dynamodb.document.Page;
-
-/**
- * Abstract base class for all page-based collections.
- *
- * @param <T> resource type
- * @param <R> low level outcome/result type
- */
-public abstract class PageBasedCollection<T, R> implements Iterable<T> {
-    private volatile R lastLowLevelResult;
-    private volatile LowLevelResultListener<R> listener = LowLevelResultListener.none();
-
-    @Override
-    public IteratorSupport<T, R> iterator() {
-        PageIterable<T, R> pageIterable = pages();
-        final PageIterator<T, R> pageIterator = pageIterable.iterator();
-        return new IteratorSupport<T, R>(pageIterator);
-    }
-
-    public PageIterable<T, R> pages() {
-        return new PageIterable<T, R>(this);
-    }
-
-    public abstract Page<T, R> firstPage();
-
-    /**
-     * Returns the maximum number of resources to be retrieved in this
-     * collection; or null if there is no limit.
-     */
-    public abstract Integer getMaxResultSize();
-
-    /**
-     * Returns the low-level result last retrieved (for the current page) from
-     * the server side; or null if there has yet no calls to the server.
-     */
-    public R getLastLowLevelResult() {
-        return lastLowLevelResult;
-    }
-
-    /**
-     * Internal method used by the implementation layer for setting
-     * the low level result received from the server side.
-     */
-    protected void setLastLowLevelResult(R lowLevelResult) {
-        this.lastLowLevelResult = lowLevelResult;
-        // deliver the event of receiving a low level result from the server side
-        listener.onLowLevelResult(lowLevelResult);
-    }
-
-    /**
-     * Used to register a listener for the event of receiving a low-level result
-     * from the server side.
-     *
-     * @param listener
-     *            listener to be registered. If null, a "none" listener will be
-     *            set.
-     * @return the previously registered listener. The return value is never
-     *         null.
-     */
-    public LowLevelResultListener<R> registerLowLevelResultListener(LowLevelResultListener<R> listener) {
-        LowLevelResultListener<R> prev = this.listener;
-        if (listener == null) {
-            this.listener = LowLevelResultListener.none();
-        } else {
-            this.listener = listener;
-        }
-        return prev;
-    }
-}
diff --git a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/internal/PageIterable.java b/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/internal/PageIterable.java
deleted file mode 100644
index 82255f6fcb43..000000000000
--- a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/internal/PageIterable.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.document.internal;
-
-import software.amazon.awssdk.services.dynamodb.document.Page;
-
-
-/**
- * @param <T> resource type
- * @param <R> low level result type
- */
-public class PageIterable<T, R> implements Iterable<Page<T, R>> {
-    private final PageBasedCollection<T, R> col;
-
-    PageIterable(PageBasedCollection<T, R> col) {
-        this.col = col;
-    }
-
-    @Override
-    public PageIterator<T, R> iterator() {
-        return new PageIterator<T, R>(col);
-    }
-}
diff --git a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/internal/PageIterator.java b/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/internal/PageIterator.java
deleted file mode 100644
index 90815c52f4ba..000000000000
--- a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/internal/PageIterator.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.document.internal;
-
-import java.util.Iterator;
-import software.amazon.awssdk.services.dynamodb.document.Page;
-
-/**
- * @param <T> resource type
- * @param <R> low level result type
- */
-class PageIterator<T, R> implements Iterator<Page<T, R>> {
-
-    private final PageBasedCollection<T, R> col;
-    private Page<T, R> page;
-
-    PageIterator(PageBasedCollection<T, R> col) {
-        this.col = col;
-    }
-
-    @Override
-    public boolean hasNext() {
-        Integer max = col.getMaxResultSize();
-        if (max != null && max.intValue() <= 0) {
-            return false;
-        }
-        return page == null || page.hasNextPage();
-    }
-
-    @Override
-    public Page<T, R> next() {
-        if (page == null) {
-            page = col.firstPage();
-        } else {
-            page = page.nextPage();
-            col.setLastLowLevelResult(page.lowLevelResult());
-        }
-        return page;
-    }
-
-    @Override
-    public void remove() {
-        throw new UnsupportedOperationException("Collection is read-only");
-    }
-}
diff --git a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/internal/PutItemImpl.java b/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/internal/PutItemImpl.java
deleted file mode 100644
index 52c0e2a37905..000000000000
--- a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/internal/PutItemImpl.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.document.internal;
-
-import java.util.Map;
-import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
-import software.amazon.awssdk.services.dynamodb.document.Expected;
-import software.amazon.awssdk.services.dynamodb.document.Item;
-import software.amazon.awssdk.services.dynamodb.document.PutItemOutcome;
-import software.amazon.awssdk.services.dynamodb.document.Table;
-import software.amazon.awssdk.services.dynamodb.document.api.PutItemApi;
-import software.amazon.awssdk.services.dynamodb.document.spec.PutItemSpec;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-import software.amazon.awssdk.services.dynamodb.model.ExpectedAttributeValue;
-import software.amazon.awssdk.services.dynamodb.model.PutItemRequest;
-import software.amazon.awssdk.services.dynamodb.model.PutItemResponse;
-
-/**
- * The implementation for <code>PutItemApi</code>.
- */
-public class PutItemImpl extends AbstractImpl implements PutItemApi {
-    public PutItemImpl(DynamoDbClient client, Table table) {
-        super(client, table);
-    }
-
-    @Override
-    public PutItemOutcome putItem(Item item) {
-        return doPutItem(new PutItemSpec().withItem(item));
-    }
-
-    @Override
-    public PutItemOutcome putItem(Item item, Expected... expected) {
-        return doPutItem(new PutItemSpec()
-                                 .withItem(item)
-                                 .withExpected(expected));
-    }
-
-    @Override
-    public PutItemOutcome putItem(Item item, String conditionExpression,
-                                  Map<String, String> nameMap, Map<String, Object> valueMap) {
-        return doPutItem(new PutItemSpec()
-                                 .withItem(item)
-                                 .withConditionExpression(conditionExpression)
-                                 .withNameMap(nameMap)
-                                 .valueMap(valueMap));
-    }
-
-    @Override
-    public PutItemOutcome putItem(PutItemSpec spec) {
-        return doPutItem(spec);
-    }
-
-    private PutItemOutcome doPutItem(PutItemSpec spec) {
-        // set the table name
-        String tableName = getTable().getTableName();
-        PutItemRequest.Builder requestBuilder = spec.getRequest().toBuilder().tableName(tableName);
-        // set up the item
-        Item item = spec.getItem();
-        final Map<String, AttributeValue> attributes = InternalUtils.toAttributeValues(item);
-        // set up the expected attribute map, if any
-        final Map<String, ExpectedAttributeValue> expectedMap =
-                InternalUtils.toExpectedAttributeValueMap(spec.getExpected());
-        // set up the value map, if any (when expression API is used)
-        final Map<String, AttributeValue> attrValMap =
-                InternalUtils.fromSimpleMap(spec.valueMap());
-        // set up the request
-        requestBuilder.item(attributes)
-               .expected(expectedMap)
-               .expressionAttributeNames(spec.nameMap())
-               .expressionAttributeValues(attrValMap)
-        ;
-        PutItemResponse result = getClient().putItem(requestBuilder.build());
-        return new PutItemOutcome(result);
-    }
-}
diff --git a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/internal/QueryCollection.java b/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/internal/QueryCollection.java
deleted file mode 100644
index 0b00f0479ccb..000000000000
--- a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/internal/QueryCollection.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.document.internal;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
-import software.amazon.awssdk.services.dynamodb.document.Item;
-import software.amazon.awssdk.services.dynamodb.document.ItemCollection;
-import software.amazon.awssdk.services.dynamodb.document.Page;
-import software.amazon.awssdk.services.dynamodb.document.QueryOutcome;
-import software.amazon.awssdk.services.dynamodb.document.spec.QuerySpec;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-import software.amazon.awssdk.services.dynamodb.model.QueryRequest;
-import software.amazon.awssdk.services.dynamodb.model.QueryResponse;
-
-class QueryCollection extends ItemCollection<QueryOutcome> {
-    private final DynamoDbClient client;
-    private final QuerySpec spec;
-    private final Map<String, AttributeValue> startKey;
-
-    QueryCollection(DynamoDbClient client, QuerySpec spec) {
-        this.client = client;
-        this.spec = spec;
-        Map<String, AttributeValue> startKey =
-                spec.getRequest().exclusiveStartKey();
-        this.startKey = startKey == null
-                        ? null
-                        : new LinkedHashMap<String, AttributeValue>(startKey);
-    }
-
-    @Override
-    public Page<Item, QueryOutcome> firstPage() {
-        QueryRequest request = spec.getRequest().toBuilder()
-                .exclusiveStartKey(startKey)
-                .limit(InternalUtils.minimum(
-                    spec.maxResultSize(),
-                    spec.maxPageSize()))
-                .build();
-        spec.setRequest(request);
-        QueryResponse result = client.query(request);
-        QueryOutcome outcome = new QueryOutcome(result);
-        setLastLowLevelResult(outcome);
-        return new QueryPage(client, spec, request, 0, outcome);
-    }
-
-    @Override
-    public Integer getMaxResultSize() {
-        return spec.maxResultSize();
-    }
-
-    protected void setLastLowLevelResult(QueryOutcome lowLevelResult) {
-        super.setLastLowLevelResult(lowLevelResult);
-        QueryResponse result = lowLevelResult.getQueryResponse();
-        accumulateStats(result.consumedCapacity(), result.count(),
-                        result.scannedCount());
-    }
-}
diff --git a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/internal/QueryCollectionTest.java b/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/internal/QueryCollectionTest.java
deleted file mode 100644
index 7d7bfff6399d..000000000000
--- a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/internal/QueryCollectionTest.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.document.internal;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Random;
-import org.junit.Test;
-import software.amazon.awssdk.services.dynamodb.document.QueryOutcome;
-import software.amazon.awssdk.services.dynamodb.document.spec.QuerySpec;
-import software.amazon.awssdk.services.dynamodb.model.Capacity;
-import software.amazon.awssdk.services.dynamodb.model.ConsumedCapacity;
-import software.amazon.awssdk.services.dynamodb.model.QueryResponse;
-
-public class QueryCollectionTest {
-    private static final Random rand = new Random();
-
-    @Test
-    public void testEmptyResult() {
-        QueryCollection col = new QueryCollection(null, new QuerySpec());
-        col.setLastLowLevelResult(new QueryOutcome(QueryResponse.builder().build()));
-        assertTrue(0 == col.getTotalCount());
-        assertTrue(0 == col.getTotalScannedCount());
-        assertNull(col.getTotalConsumedCapacity());
-    }
-
-    @Test
-    public void setLastLowLevelResult() {
-        QueryCollection col = new QueryCollection(null, new QuerySpec());
-        QueryResponse result = QueryResponse.builder()
-                .count(rand.nextInt())
-                .scannedCount(rand.nextInt()).build();
-
-        Map<String, Capacity> gsi = new HashMap<String, Capacity>();
-        gsi.put("gsi1", Capacity.builder().capacityUnits(rand.nextDouble()).build());
-        gsi.put("gsi2", Capacity.builder().capacityUnits(rand.nextDouble()).build());
-
-        Map<String, Capacity> lsi = new HashMap<String, Capacity>();
-        lsi.put("lsi1", Capacity.builder().capacityUnits(rand.nextDouble()).build());
-        lsi.put("lsi2", Capacity.builder().capacityUnits(rand.nextDouble()).build());
-
-        ConsumedCapacity consumedCapacity = ConsumedCapacity.builder()
-                .capacityUnits(rand.nextDouble())
-                .table(Capacity.builder().capacityUnits(rand.nextDouble()).build())
-                .tableName("tableName")
-                .globalSecondaryIndexes(gsi)
-                .localSecondaryIndexes(lsi)
-                .build();
-        // Once
-        result = result.toBuilder().consumedCapacity(consumedCapacity).build();
-        col.setLastLowLevelResult(new QueryOutcome(result));
-
-        assertTrue(result.count() == col.getTotalCount());
-        assertTrue(result.scannedCount() == col.getTotalScannedCount());
-
-        ConsumedCapacity total = col.getTotalConsumedCapacity();
-        assertNotSame(total, consumedCapacity);
-        assertEquals(total, consumedCapacity);
-
-        assertNotSame(gsi, total.globalSecondaryIndexes());
-        assertNotSame(lsi, total.localSecondaryIndexes());
-
-        // Twice
-        col.setLastLowLevelResult(new QueryOutcome(result));
-
-        assertTrue(result.count() * 2 == col.getTotalCount());
-        assertTrue(result.scannedCount() * 2 == col.getTotalScannedCount());
-
-        total = col.getTotalConsumedCapacity();
-        assertTrue(total.capacityUnits() == 2 * consumedCapacity.capacityUnits());
-
-        Map<String, Capacity> gsiTotal = total.globalSecondaryIndexes();
-        Map<String, Capacity> lsiTotal = total.localSecondaryIndexes();
-        assertTrue(2 == gsiTotal.size());
-        assertTrue(2 == lsiTotal.size());
-
-        assertTrue(gsi.get("gsi1").capacityUnits() * 2 == gsiTotal.get("gsi1").capacityUnits());
-        assertTrue(gsi.get("gsi2").capacityUnits() * 2 == gsiTotal.get("gsi2").capacityUnits());
-
-        assertTrue(lsi.get("lsi1").capacityUnits() * 2 == lsiTotal.get("lsi1").capacityUnits());
-        assertTrue(lsi.get("lsi2").capacityUnits() * 2 == lsiTotal.get("lsi2").capacityUnits());
-
-        // A different one
-        QueryResponse result3 = QueryResponse.builder()
-                .count(rand.nextInt())
-                .scannedCount(rand.nextInt())
-                .build();
-
-        Map<String, Capacity> gsi3 = new HashMap<String, Capacity>();
-        gsi3.put("gsi3", Capacity.builder().capacityUnits(rand.nextDouble()).build());
-
-        Map<String, Capacity> lsi3 = new HashMap<String, Capacity>();
-        lsi3.put("lsi3", Capacity.builder().capacityUnits(rand.nextDouble()).build());
-
-        ConsumedCapacity consumedCapacity3 = ConsumedCapacity.builder()
-                .capacityUnits(rand.nextDouble())
-                .table(Capacity.builder().capacityUnits(rand.nextDouble()).build())
-                .tableName("tableName")
-                .globalSecondaryIndexes(gsi3)
-                .localSecondaryIndexes(lsi3)
-                .build();
-        result3 = result3.toBuilder().consumedCapacity(consumedCapacity3).build();
-        col.setLastLowLevelResult(new QueryOutcome(result3));
-
-        assertTrue(result.count() * 2 + result3.count() == col.getTotalCount());
-        assertTrue(result.scannedCount() * 2 + result3.scannedCount() == col.getTotalScannedCount());
-
-        total = col.getTotalConsumedCapacity();
-        assertTrue(total.capacityUnits() ==
-                   2 * consumedCapacity.capacityUnits()
-                   + consumedCapacity3.capacityUnits());
-
-        gsiTotal = total.globalSecondaryIndexes();
-        lsiTotal = total.localSecondaryIndexes();
-        assertTrue(3 == gsiTotal.size());
-        assertTrue(3 == lsiTotal.size());
-
-        assertTrue(gsi.get("gsi1").capacityUnits() * 2 == gsiTotal.get("gsi1").capacityUnits());
-        assertTrue(gsi.get("gsi2").capacityUnits() * 2 == gsiTotal.get("gsi2").capacityUnits());
-        assertTrue(gsi3.get("gsi3").capacityUnits() == gsiTotal.get("gsi3").capacityUnits());
-
-        assertTrue(lsi.get("lsi1").capacityUnits() * 2 == lsiTotal.get("lsi1").capacityUnits());
-        assertTrue(lsi.get("lsi2").capacityUnits() * 2 == lsiTotal.get("lsi2").capacityUnits());
-        assertTrue(lsi3.get("lsi3").capacityUnits() == lsiTotal.get("lsi3").capacityUnits());
-
-        // An empty one
-        QueryResponse result4 = QueryResponse.builder().build();
-        ConsumedCapacity consumedCapacity4 = ConsumedCapacity.builder().build();
-        result4 = result4.toBuilder().consumedCapacity(consumedCapacity4).build();
-        col.setLastLowLevelResult(new QueryOutcome(result4));
-
-        // all assertions are expected to be the same as the last set of assertions
-        assertTrue(result.count() * 2 + result3.count() == col.getTotalCount());
-        assertTrue(result.scannedCount() * 2 + result3.scannedCount() == col.getTotalScannedCount());
-
-        total = col.getTotalConsumedCapacity();
-        assertTrue(total.capacityUnits() ==
-                   2 * consumedCapacity.capacityUnits()
-                   + consumedCapacity3.capacityUnits());
-
-        gsiTotal = total.globalSecondaryIndexes();
-        lsiTotal = total.localSecondaryIndexes();
-        assertTrue(3 == gsiTotal.size());
-        assertTrue(3 == lsiTotal.size());
-
-        assertTrue(gsi.get("gsi1").capacityUnits() * 2 == gsiTotal.get("gsi1").capacityUnits());
-        assertTrue(gsi.get("gsi2").capacityUnits() * 2 == gsiTotal.get("gsi2").capacityUnits());
-        assertTrue(gsi3.get("gsi3").capacityUnits() == gsiTotal.get("gsi3").capacityUnits());
-
-        assertTrue(lsi.get("lsi1").capacityUnits() * 2 == lsiTotal.get("lsi1").capacityUnits());
-        assertTrue(lsi.get("lsi2").capacityUnits() * 2 == lsiTotal.get("lsi2").capacityUnits());
-        assertTrue(lsi3.get("lsi3").capacityUnits() == lsiTotal.get("lsi3").capacityUnits());
-    }
-}
diff --git a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/internal/QueryImpl.java b/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/internal/QueryImpl.java
deleted file mode 100644
index 764b0fc27f32..000000000000
--- a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/internal/QueryImpl.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.document.internal;
-
-import java.util.Collection;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
-import software.amazon.awssdk.services.dynamodb.document.ItemCollection;
-import software.amazon.awssdk.services.dynamodb.document.KeyAttribute;
-import software.amazon.awssdk.services.dynamodb.document.KeyCondition;
-import software.amazon.awssdk.services.dynamodb.document.QueryFilter;
-import software.amazon.awssdk.services.dynamodb.document.QueryOutcome;
-import software.amazon.awssdk.services.dynamodb.document.RangeKeyCondition;
-import software.amazon.awssdk.services.dynamodb.document.Table;
-import software.amazon.awssdk.services.dynamodb.document.api.QueryApi;
-import software.amazon.awssdk.services.dynamodb.document.spec.QuerySpec;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-import software.amazon.awssdk.services.dynamodb.model.ComparisonOperator;
-import software.amazon.awssdk.services.dynamodb.model.Condition;
-import software.amazon.awssdk.services.dynamodb.model.QueryRequest;
-
-/**
- * The implementation for <code>QueryApi</code> of a table.
- */
-public class QueryImpl extends AbstractImpl implements QueryApi {
-    public QueryImpl(DynamoDbClient client, Table table) {
-        super(client, table);
-    }
-
-    @Override
-    public ItemCollection<QueryOutcome> query(String hashKeyName, Object hashKey) {
-        return doQuery(new QuerySpec()
-                               .withHashKey(new KeyAttribute(hashKeyName, hashKey)));
-    }
-
-    @Override
-    public ItemCollection<QueryOutcome> query(KeyAttribute hashKey) {
-        return doQuery(new QuerySpec().withHashKey(hashKey));
-    }
-
-    @Override
-    public ItemCollection<QueryOutcome> query(KeyAttribute hashKey,
-                                              RangeKeyCondition rangeKeyCondition) {
-        return doQuery(new QuerySpec().withHashKey(hashKey)
-                                      .withRangeKeyCondition(rangeKeyCondition));
-    }
-
-    @Override
-    public ItemCollection<QueryOutcome> query(KeyAttribute hashKey,
-                                              RangeKeyCondition rangeKeyCondition, QueryFilter... queryFilters) {
-        return doQuery(new QuerySpec().withHashKey(hashKey)
-                                      .withRangeKeyCondition(rangeKeyCondition)
-                                      .withQueryFilters(queryFilters));
-    }
-
-    @Override
-    public ItemCollection<QueryOutcome> query(KeyAttribute hashKey,
-                                              RangeKeyCondition rangeKeyCondition, String filterExpression,
-                                              Map<String, String> nameMap, Map<String, Object> valueMap) {
-        return doQuery(new QuerySpec().withHashKey(hashKey)
-                                      .withRangeKeyCondition(rangeKeyCondition)
-                                      .withFilterExpression(filterExpression)
-                                      .withNameMap(nameMap)
-                                      .valueMap(valueMap));
-    }
-
-    @Override
-    public ItemCollection<QueryOutcome> query(KeyAttribute hashKey,
-                                              RangeKeyCondition rangeKeyCondition, String filterExpression,
-                                              String projectionExpression, Map<String, String> nameMap,
-                                              Map<String, Object> valueMap) {
-        return doQuery(new QuerySpec().withHashKey(hashKey)
-                                      .withRangeKeyCondition(rangeKeyCondition)
-                                      .withFilterExpression(filterExpression)
-                                      .withProjectionExpression(projectionExpression)
-                                      .withNameMap(nameMap)
-                                      .valueMap(valueMap));
-    }
-
-    @Override
-    public ItemCollection<QueryOutcome> query(QuerySpec spec) {
-        return doQuery(spec);
-    }
-
-    protected ItemCollection<QueryOutcome> doQuery(QuerySpec spec) {
-        // set the table name
-        String tableName = getTable().getTableName();
-        QueryRequest.Builder requestBuilder = spec.getRequest().toBuilder().tableName(tableName);
-
-        Map<String, Condition> conditions = new LinkedHashMap<>();
-
-        if (spec.getRequest().keyConditions() != null) {
-            conditions.putAll(spec.getRequest().keyConditions());
-        }
-
-        // hash key
-        final KeyAttribute hashKey = spec.getHashKey();
-        if (hashKey != null) {
-            conditions.put(hashKey.name(),
-                    Condition.builder()
-                            .comparisonOperator(ComparisonOperator.EQ)
-                            .attributeValueList(InternalUtils.toAttributeValue(hashKey.value())).build());
-        }
-        // range key condition
-        RangeKeyCondition rangeKeyCond = spec.getRangeKeyCondition();
-        if (rangeKeyCond != null) {
-            KeyCondition keyCond = rangeKeyCond.getKeyCondition();
-            if (keyCond == null) {
-                throw new IllegalArgumentException("key condition not specified in range key condition");
-            }
-            Object[] values = rangeKeyCond.values();
-            if (values == null) {
-                throw new IllegalArgumentException("key condition values not specified in range key condition");
-            }
-            conditions.put(rangeKeyCond.getAttrName(),
-                    Condition.builder()
-                            .comparisonOperator(keyCond.toComparisonOperator())
-                            .attributeValueList(InternalUtils.toAttributeValues(values)).build());
-        }
-
-        requestBuilder.keyConditions(conditions);
-
-        // query filters;
-        Collection<QueryFilter> filters = spec.getQueryFilters();
-        if (filters != null) {
-            requestBuilder.queryFilter(InternalUtils.toAttributeConditionMap(filters));
-        }
-
-        // set up the start key, if any
-        Collection<KeyAttribute> startKey = spec.getExclusiveStartKey();
-        if (startKey != null) {
-            requestBuilder.exclusiveStartKey(InternalUtils.toAttributeValueMap(startKey));
-        }
-
-        // set up the value map, if any (when expression API is used)
-        final Map<String, AttributeValue> attrValMap = InternalUtils.fromSimpleMap(spec.valueMap());
-        // set up expressions, if any
-        requestBuilder.expressionAttributeNames(spec.nameMap())
-               .expressionAttributeValues(attrValMap);
-
-        spec.setRequest(requestBuilder.build());
-        return new QueryCollection(getClient(), spec);
-    }
-
-    @Override
-    public ItemCollection<QueryOutcome> query(String hashKeyName,
-                                              Object hashKeyValue, RangeKeyCondition rangeKeyCondition) {
-        return query(new KeyAttribute(hashKeyName, hashKeyValue), rangeKeyCondition);
-    }
-
-    @Override
-    public ItemCollection<QueryOutcome> query(String hashKeyName,
-                                              Object hashKeyValue, RangeKeyCondition rangeKeyCondition,
-                                              QueryFilter... queryFilters) {
-        return query(new KeyAttribute(hashKeyName, hashKeyValue),
-                     rangeKeyCondition, queryFilters);
-    }
-
-    @Override
-    public ItemCollection<QueryOutcome> query(String hashKeyName,
-                                              Object hashKeyValue, RangeKeyCondition rangeKeyCondition,
-                                              String filterExpression, Map<String, String> nameMap,
-                                              Map<String, Object> valueMap) {
-        return query(new KeyAttribute(hashKeyName, hashKeyValue),
-                     rangeKeyCondition, filterExpression, nameMap, valueMap);
-    }
-
-    @Override
-    public ItemCollection<QueryOutcome> query(String hashKeyName,
-                                              Object hashKeyValue, RangeKeyCondition rangeKeyCondition,
-                                              String filterExpression, String projectionExpression,
-                                              Map<String, String> nameMap, Map<String, Object> valueMap) {
-        return query(new KeyAttribute(hashKeyName, hashKeyValue),
-                     rangeKeyCondition, filterExpression, projectionExpression,
-                     nameMap, valueMap);
-    }
-}
diff --git a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/internal/QueryPage.java b/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/internal/QueryPage.java
deleted file mode 100644
index d27e56d89587..000000000000
--- a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/internal/QueryPage.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.document.internal;
-
-import static software.amazon.awssdk.services.dynamodb.document.internal.InternalUtils.toItemList;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.NoSuchElementException;
-import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
-import software.amazon.awssdk.services.dynamodb.document.Item;
-import software.amazon.awssdk.services.dynamodb.document.Page;
-import software.amazon.awssdk.services.dynamodb.document.QueryOutcome;
-import software.amazon.awssdk.services.dynamodb.document.spec.QuerySpec;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-import software.amazon.awssdk.services.dynamodb.model.QueryRequest;
-import software.amazon.awssdk.services.dynamodb.model.QueryResponse;
-
-class QueryPage extends Page<Item, QueryOutcome> {
-    private final DynamoDbClient client;
-    private final QuerySpec spec;
-    private QueryRequest request;
-    private final int index;
-    private final Map<String, AttributeValue> lastEvaluatedKey;
-
-    QueryPage(
-        DynamoDbClient client,
-        QuerySpec spec,
-        QueryRequest request,
-        int index,
-        QueryOutcome outcome) {
-        super(Collections.unmodifiableList(
-                toItemList(outcome.getQueryResponse().items())),
-              outcome);
-        this.client = client;
-        this.spec = spec;
-        this.request = request;
-        this.index = index;
-
-        final Integer max = spec.maxResultSize();
-        final QueryResponse result = outcome.getQueryResponse();
-        final List<?> ilist = result.items();
-        final int size = ilist == null ? 0 : ilist.size();
-        if (max != null && (index + size) > max) {
-            this.lastEvaluatedKey = null;
-        } else {
-            this.lastEvaluatedKey = result.lastEvaluatedKey();
-        }
-    }
-
-    @Override
-    public boolean hasNextPage() {
-        if (lastEvaluatedKey == null) {
-            return false;
-        }
-        Integer max = spec.maxResultSize();
-        if (max == null) {
-            return true;
-        }
-        return nextRequestLimit(max.intValue()) > 0;
-    }
-
-    private int nextRequestLimit(int max) {
-        int nextIndex = index + this.size();
-        return InternalUtils.minimum(
-                max - nextIndex,
-                spec.maxPageSize());
-    }
-
-    @Override
-    public Page<Item, QueryOutcome> nextPage() {
-        if (lastEvaluatedKey == null) {
-            throw new NoSuchElementException("No more pages");
-        }
-        final Integer max = spec.maxResultSize();
-        if (max != null) {
-            int nextLimit = nextRequestLimit(max.intValue());
-            if (nextLimit == 0) {
-                throw new NoSuchElementException("No more pages");
-            }
-            request = request.toBuilder().limit(nextLimit).build();
-        }
-        request = request.toBuilder().exclusiveStartKey(lastEvaluatedKey).build();
-        QueryResponse result = client.query(request);
-        final int nextIndex = index + this.size();
-        return new QueryPage(client, spec, request, nextIndex,
-                             new QueryOutcome(result));
-    }
-}
diff --git a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/internal/ScanCollection.java b/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/internal/ScanCollection.java
deleted file mode 100644
index 3eba543f89e8..000000000000
--- a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/internal/ScanCollection.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.document.internal;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
-import software.amazon.awssdk.services.dynamodb.document.Item;
-import software.amazon.awssdk.services.dynamodb.document.ItemCollection;
-import software.amazon.awssdk.services.dynamodb.document.Page;
-import software.amazon.awssdk.services.dynamodb.document.ScanOutcome;
-import software.amazon.awssdk.services.dynamodb.document.spec.ScanSpec;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-import software.amazon.awssdk.services.dynamodb.model.ScanRequest;
-import software.amazon.awssdk.services.dynamodb.model.ScanResponse;
-
-class ScanCollection extends ItemCollection<ScanOutcome> {
-
-    private final DynamoDbClient client;
-    private final ScanSpec spec;
-    private final Map<String, AttributeValue> startKey;
-
-    ScanCollection(DynamoDbClient client, ScanSpec spec) {
-        this.client = client;
-        this.spec = spec;
-        Map<String, AttributeValue> startKey = spec.getRequest()
-                                                   .exclusiveStartKey();
-        this.startKey = startKey == null ? null : new LinkedHashMap<String, AttributeValue>(startKey);
-    }
-
-    @Override
-    public Page<Item, ScanOutcome> firstPage() {
-        ScanRequest request = spec.getRequest();
-        request = request.toBuilder()
-                .exclusiveStartKey(startKey)
-                .limit(InternalUtils.minimum(
-                        spec.maxResultSize(),
-                        spec.maxPageSize()))
-                .build();
-
-        spec.setRequest(request);
-
-        ScanResponse result = client.scan(request);
-        ScanOutcome outcome = new ScanOutcome(result);
-        setLastLowLevelResult(outcome);
-        return new ScanPage(client, spec, request, 0, outcome);
-    }
-
-    @Override
-    public Integer getMaxResultSize() {
-        return spec.maxResultSize();
-    }
-
-    protected void setLastLowLevelResult(ScanOutcome lowLevelResult) {
-        super.setLastLowLevelResult(lowLevelResult);
-        ScanResponse result = lowLevelResult.scanResult();
-        accumulateStats(result.consumedCapacity(), result.count(),
-                        result.scannedCount());
-    }
-}
diff --git a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/internal/ScanCollectionTest.java b/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/internal/ScanCollectionTest.java
deleted file mode 100644
index 6c0e87fad17e..000000000000
--- a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/internal/ScanCollectionTest.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.document.internal;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Random;
-import org.junit.Test;
-import software.amazon.awssdk.services.dynamodb.document.ScanOutcome;
-import software.amazon.awssdk.services.dynamodb.document.spec.ScanSpec;
-import software.amazon.awssdk.services.dynamodb.model.Capacity;
-import software.amazon.awssdk.services.dynamodb.model.ConsumedCapacity;
-import software.amazon.awssdk.services.dynamodb.model.ScanResponse;
-
-public class ScanCollectionTest {
-    private static final Random rand = new Random();
-
-    @Test
-    public void testEmptyResult() {
-        ScanCollection col = new ScanCollection(null, new ScanSpec());
-        col.setLastLowLevelResult(new ScanOutcome(ScanResponse.builder().build()));
-        assertTrue(0 == col.getTotalCount());
-        assertTrue(0 == col.getTotalScannedCount());
-        assertNull(col.getTotalConsumedCapacity());
-    }
-
-    @Test
-    public void setLastLowLevelResult() {
-        ScanCollection col = new ScanCollection(null, new ScanSpec());
-        ScanResponse result = ScanResponse.builder()
-                .count(rand.nextInt())
-                .scannedCount(rand.nextInt()).build();
-
-        Map<String, Capacity> gsi = new HashMap<String, Capacity>();
-        gsi.put("gsi1", Capacity.builder().capacityUnits(rand.nextDouble()).build());
-        gsi.put("gsi2", Capacity.builder().capacityUnits(rand.nextDouble()).build());
-
-        Map<String, Capacity> lsi = new HashMap<String, Capacity>();
-        lsi.put("lsi1", Capacity.builder().capacityUnits(rand.nextDouble()).build());
-        lsi.put("lsi2", Capacity.builder().capacityUnits(rand.nextDouble()).build());
-
-        ConsumedCapacity consumedCapacity = ConsumedCapacity.builder()
-                .capacityUnits(rand.nextDouble())
-                .table(Capacity.builder().capacityUnits(rand.nextDouble()).build())
-                .tableName("tableName")
-                .globalSecondaryIndexes(gsi)
-                .localSecondaryIndexes(lsi).build();
-        // Once
-        result = result.toBuilder().consumedCapacity(consumedCapacity).build();
-        col.setLastLowLevelResult(new ScanOutcome(result));
-
-        assertTrue(result.count() == col.getTotalCount());
-        assertTrue(result.scannedCount() == col.getTotalScannedCount());
-
-        ConsumedCapacity total = col.getTotalConsumedCapacity();
-        assertNotSame(total, consumedCapacity);
-        assertEquals(total, consumedCapacity);
-
-        assertNotSame(gsi, total.globalSecondaryIndexes());
-        assertNotSame(lsi, total.localSecondaryIndexes());
-
-        // Twice
-        col.setLastLowLevelResult(new ScanOutcome(result));
-
-        assertTrue(result.count() * 2 == col.getTotalCount());
-        assertTrue(result.scannedCount() * 2 == col.getTotalScannedCount());
-
-        total = col.getTotalConsumedCapacity();
-        assertTrue(total.capacityUnits() == 2 * consumedCapacity.capacityUnits());
-
-        Map<String, Capacity> gsiTotal = total.globalSecondaryIndexes();
-        Map<String, Capacity> lsiTotal = total.localSecondaryIndexes();
-        assertTrue(2 == gsiTotal.size());
-        assertTrue(2 == lsiTotal.size());
-
-        assertTrue(gsi.get("gsi1").capacityUnits() * 2 == gsiTotal.get("gsi1").capacityUnits());
-        assertTrue(gsi.get("gsi2").capacityUnits() * 2 == gsiTotal.get("gsi2").capacityUnits());
-
-        assertTrue(lsi.get("lsi1").capacityUnits() * 2 == lsiTotal.get("lsi1").capacityUnits());
-        assertTrue(lsi.get("lsi2").capacityUnits() * 2 == lsiTotal.get("lsi2").capacityUnits());
-
-        // A different one
-        ScanResponse result3 = ScanResponse.builder()
-                .count(rand.nextInt())
-                .scannedCount(rand.nextInt())
-                .build();
-
-        Map<String, Capacity> gsi3 = new HashMap<String, Capacity>();
-        gsi3.put("gsi3", Capacity.builder().capacityUnits(rand.nextDouble()).build());
-
-        Map<String, Capacity> lsi3 = new HashMap<String, Capacity>();
-        lsi3.put("lsi3", Capacity.builder().capacityUnits(rand.nextDouble()).build());
-
-        ConsumedCapacity consumedCapacity3 = ConsumedCapacity.builder()
-                .capacityUnits(rand.nextDouble())
-                .table(Capacity.builder().capacityUnits(rand.nextDouble()).build())
-                .tableName("tableName")
-                .globalSecondaryIndexes(gsi3)
-                .localSecondaryIndexes(lsi3)
-                .build();
-        result3 = result3.toBuilder().consumedCapacity(consumedCapacity3).build();
-        col.setLastLowLevelResult(new ScanOutcome(result3));
-
-        assertTrue(result.count() * 2 + result3.count() == col.getTotalCount());
-        assertTrue(result.scannedCount() * 2 + result3.scannedCount() == col.getTotalScannedCount());
-
-        total = col.getTotalConsumedCapacity();
-        assertTrue(total.capacityUnits() ==
-                   2 * consumedCapacity.capacityUnits()
-                   + consumedCapacity3.capacityUnits());
-
-        gsiTotal = total.globalSecondaryIndexes();
-        lsiTotal = total.localSecondaryIndexes();
-        assertTrue(3 == gsiTotal.size());
-        assertTrue(3 == lsiTotal.size());
-
-        assertTrue(gsi.get("gsi1").capacityUnits() * 2 == gsiTotal.get("gsi1").capacityUnits());
-        assertTrue(gsi.get("gsi2").capacityUnits() * 2 == gsiTotal.get("gsi2").capacityUnits());
-        assertTrue(gsi3.get("gsi3").capacityUnits() == gsiTotal.get("gsi3").capacityUnits());
-
-        assertTrue(lsi.get("lsi1").capacityUnits() * 2 == lsiTotal.get("lsi1").capacityUnits());
-        assertTrue(lsi.get("lsi2").capacityUnits() * 2 == lsiTotal.get("lsi2").capacityUnits());
-        assertTrue(lsi3.get("lsi3").capacityUnits() == lsiTotal.get("lsi3").capacityUnits());
-
-        // An empty one
-        ScanResponse result4 = ScanResponse.builder().build();
-        ConsumedCapacity consumedCapacity4 = ConsumedCapacity.builder().build();
-        result4 = result4.toBuilder().consumedCapacity(consumedCapacity4).build();
-        col.setLastLowLevelResult(new ScanOutcome(result4));
-
-        // all assertions are expected to be the same as the last set of assertions
-        assertTrue(result.count() * 2 + result3.count() == col.getTotalCount());
-        assertTrue(result.scannedCount() * 2 + result3.scannedCount() == col.getTotalScannedCount());
-
-        total = col.getTotalConsumedCapacity();
-        assertTrue(total.capacityUnits() ==
-                   2 * consumedCapacity.capacityUnits()
-                   + consumedCapacity3.capacityUnits());
-
-        gsiTotal = total.globalSecondaryIndexes();
-        lsiTotal = total.localSecondaryIndexes();
-        assertTrue(3 == gsiTotal.size());
-        assertTrue(3 == lsiTotal.size());
-
-        assertTrue(gsi.get("gsi1").capacityUnits() * 2 == gsiTotal.get("gsi1").capacityUnits());
-        assertTrue(gsi.get("gsi2").capacityUnits() * 2 == gsiTotal.get("gsi2").capacityUnits());
-        assertTrue(gsi3.get("gsi3").capacityUnits() == gsiTotal.get("gsi3").capacityUnits());
-
-        assertTrue(lsi.get("lsi1").capacityUnits() * 2 == lsiTotal.get("lsi1").capacityUnits());
-        assertTrue(lsi.get("lsi2").capacityUnits() * 2 == lsiTotal.get("lsi2").capacityUnits());
-        assertTrue(lsi3.get("lsi3").capacityUnits() == lsiTotal.get("lsi3").capacityUnits());
-    }
-}
diff --git a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/internal/ScanImpl.java b/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/internal/ScanImpl.java
deleted file mode 100644
index 9a84ae4c83c3..000000000000
--- a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/internal/ScanImpl.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.document.internal;
-
-import java.util.Collection;
-import java.util.Map;
-import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
-import software.amazon.awssdk.services.dynamodb.document.ItemCollection;
-import software.amazon.awssdk.services.dynamodb.document.KeyAttribute;
-import software.amazon.awssdk.services.dynamodb.document.ScanFilter;
-import software.amazon.awssdk.services.dynamodb.document.ScanOutcome;
-import software.amazon.awssdk.services.dynamodb.document.Table;
-import software.amazon.awssdk.services.dynamodb.document.api.ScanApi;
-import software.amazon.awssdk.services.dynamodb.document.spec.ScanSpec;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-import software.amazon.awssdk.services.dynamodb.model.ScanRequest;
-
-/**
- * The implementation for <code>ScanApi</code>.
- */
-public class ScanImpl extends AbstractImpl implements ScanApi {
-    public ScanImpl(DynamoDbClient client, Table table) {
-        super(client, table);
-    }
-
-    @Override
-    public ItemCollection<ScanOutcome> scan(ScanFilter... scanFilters) {
-        return doScan(new ScanSpec()
-                              .withScanFilters(scanFilters));
-    }
-
-
-    @Override
-    public ItemCollection<ScanOutcome> scan(String filterExpression,
-                                            Map<String, String> nameMap, Map<String, Object> valueMap) {
-        return doScan(new ScanSpec()
-                              .withFilterExpression(filterExpression)
-                              .withNameMap(nameMap)
-                              .valueMap(valueMap));
-    }
-
-
-    @Override
-    public ItemCollection<ScanOutcome> scan(String filterExpression,
-                                            String projectionExpression, Map<String, String> nameMap,
-                                            Map<String, Object> valueMap) {
-        return doScan(new ScanSpec()
-                              .withFilterExpression(filterExpression)
-                              .withProjectionExpression(projectionExpression)
-                              .withNameMap(nameMap)
-                              .valueMap(valueMap));
-    }
-
-    @Override
-    public ItemCollection<ScanOutcome> scan(ScanSpec spec) {
-        return doScan(spec);
-    }
-
-    protected ItemCollection<ScanOutcome> doScan(ScanSpec spec) {
-        // set the table name
-        String tableName = getTable().getTableName();
-        ScanRequest.Builder requestBuilder = spec.getRequest().toBuilder().tableName(tableName);
-
-        // set up the start key, if any
-        Collection<KeyAttribute> startKey = spec.getExclusiveStartKey();
-        if (startKey != null) {
-            requestBuilder.exclusiveStartKey(InternalUtils.toAttributeValueMap(startKey));
-        }
-
-        // scan filters;
-        Collection<ScanFilter> filters = spec.scanFilters();
-        if (filters != null) {
-            requestBuilder.scanFilter(InternalUtils.toAttributeConditionMap(filters));
-        }
-
-        // set up the value map, if any (when expression API is used)
-        final Map<String, AttributeValue> attrValMap = InternalUtils.fromSimpleMap(spec.valueMap());
-        // set up expressions, if any
-        requestBuilder.expressionAttributeNames(spec.nameMap())
-               .expressionAttributeValues(attrValMap);
-
-        spec.setRequest(requestBuilder.build());
-        return new ScanCollection(getClient(), spec);
-    }
-}
diff --git a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/internal/ScanPage.java b/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/internal/ScanPage.java
deleted file mode 100644
index 2935f80a6713..000000000000
--- a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/internal/ScanPage.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.document.internal;
-
-import static software.amazon.awssdk.services.dynamodb.document.internal.InternalUtils.toItemList;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.NoSuchElementException;
-import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
-import software.amazon.awssdk.services.dynamodb.document.Item;
-import software.amazon.awssdk.services.dynamodb.document.Page;
-import software.amazon.awssdk.services.dynamodb.document.ScanOutcome;
-import software.amazon.awssdk.services.dynamodb.document.spec.ScanSpec;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-import software.amazon.awssdk.services.dynamodb.model.ScanRequest;
-import software.amazon.awssdk.services.dynamodb.model.ScanResponse;
-
-class ScanPage extends Page<Item, ScanOutcome> {
-
-    private final DynamoDbClient client;
-    private final ScanSpec spec;
-    private ScanRequest request;
-    private final int index;
-    private final Map<String, AttributeValue> lastEvaluatedKey;
-
-    ScanPage(
-        DynamoDbClient client,
-        ScanSpec spec,
-        ScanRequest request,
-        int index,
-        ScanOutcome outcome) {
-        super(Collections.unmodifiableList(
-                toItemList(outcome.scanResult().items())),
-              outcome);
-        this.client = client;
-        this.spec = spec;
-        this.request = request;
-        this.index = index;
-
-        final Integer max = spec.maxResultSize();
-        final ScanResponse result = outcome.scanResult();
-        final List<?> ilist = result.items();
-        final int size = ilist == null ? 0 : ilist.size();
-        if (max != null && (index + size) > max) {
-            this.lastEvaluatedKey = null;
-        } else {
-            this.lastEvaluatedKey = result.lastEvaluatedKey();
-        }
-    }
-
-    @Override
-    public boolean hasNextPage() {
-        if (lastEvaluatedKey == null) {
-            return false;
-        }
-        Integer max = spec.maxResultSize();
-        if (max == null) {
-            return true;
-        }
-        return nextRequestLimit(max.intValue()) > 0;
-    }
-
-    private int nextRequestLimit(int max) {
-        int nextIndex = index + this.size();
-        return InternalUtils.minimum(
-                max - nextIndex,
-                spec.maxPageSize());
-    }
-
-    @Override
-    public Page<Item, ScanOutcome> nextPage() {
-        if (lastEvaluatedKey == null) {
-            throw new NoSuchElementException("No more pages");
-        }
-        final Integer max = spec.maxResultSize();
-        if (max != null) {
-            int nextLimit = nextRequestLimit(max.intValue());
-            if (nextLimit == 0) {
-                throw new NoSuchElementException("No more pages");
-            }
-            request = request.toBuilder().limit(nextLimit).build();
-        }
-        request = request.toBuilder().exclusiveStartKey(lastEvaluatedKey).build();
-        // fire off request to the server side
-        ScanResponse result = client.scan(request);
-        final int nextIndex = index + this.size();
-        return new ScanPage(client, spec, request, nextIndex,
-                            new ScanOutcome(result));
-    }
-}
diff --git a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/internal/UpdateItemImpl.java b/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/internal/UpdateItemImpl.java
deleted file mode 100644
index c6ecad296a81..000000000000
--- a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/internal/UpdateItemImpl.java
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.document.internal;
-
-import java.util.Collection;
-import java.util.Map;
-import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
-import software.amazon.awssdk.services.dynamodb.document.AttributeUpdate;
-import software.amazon.awssdk.services.dynamodb.document.Expected;
-import software.amazon.awssdk.services.dynamodb.document.PrimaryKey;
-import software.amazon.awssdk.services.dynamodb.document.Table;
-import software.amazon.awssdk.services.dynamodb.document.UpdateItemOutcome;
-import software.amazon.awssdk.services.dynamodb.document.api.UpdateItemApi;
-import software.amazon.awssdk.services.dynamodb.document.spec.UpdateItemSpec;
-import software.amazon.awssdk.services.dynamodb.model.ExpectedAttributeValue;
-import software.amazon.awssdk.services.dynamodb.model.UpdateItemRequest;
-
-/**
- * The implementation for <code>UpdateItemApi</code>.
- */
-public class UpdateItemImpl implements UpdateItemApi {
-
-    private final Table table;
-    private final DynamoDbClient client;
-
-    public UpdateItemImpl(DynamoDbClient client, Table table) {
-        this.client = client;
-        this.table = table;
-    }
-
-    @Override
-    public UpdateItemOutcome updateItem(PrimaryKey primaryKey,
-                                        AttributeUpdate... attributeUpdates) {
-        return updateItem(new UpdateItemSpec()
-                                  .withPrimaryKey(primaryKey)
-                                  .withAttributeUpdate(attributeUpdates));
-    }
-
-    @Override
-    public UpdateItemOutcome updateItem(PrimaryKey primaryKey,
-                                        Collection<Expected> expected, AttributeUpdate... attributeUpdates) {
-        return updateItem(new UpdateItemSpec()
-                                  .withPrimaryKey(primaryKey)
-                                  .withExpected(expected)
-                                  .withAttributeUpdate(attributeUpdates));
-    }
-
-    @Override
-    public UpdateItemOutcome updateItem(PrimaryKey primaryKey,
-                                        String updateExpression, Map<String, String> nameMap,
-                                        Map<String, Object> valueMap) {
-        return updateItem(new UpdateItemSpec()
-                                  .withPrimaryKey(primaryKey)
-                                  .withUpdateExpression(updateExpression)
-                                  .withNameMap(nameMap)
-                                  .valueMap(valueMap));
-    }
-
-    @Override
-    public UpdateItemOutcome updateItem(PrimaryKey primaryKey,
-                                        String updateExpression, String conditionExpression,
-                                        Map<String, String> nameMap, Map<String, Object> valueMap) {
-
-        return updateItem(new UpdateItemSpec().withPrimaryKey(primaryKey)
-                                              .withUpdateExpression(updateExpression)
-                                              .withConditionExpression(conditionExpression)
-                                              .withNameMap(nameMap)
-                                              .valueMap(valueMap));
-    }
-
-    @Override
-    public UpdateItemOutcome updateItem(UpdateItemSpec spec) {
-        return doUpdateItem(spec);
-    }
-
-    private UpdateItemOutcome doUpdateItem(UpdateItemSpec spec) {
-        final UpdateItemRequest.Builder requestBuilder = spec.getRequest().toBuilder();
-        requestBuilder.key(InternalUtils.toAttributeValueMap(spec.getKeyComponents()));
-        requestBuilder.tableName(table.getTableName());
-        final Collection<Expected> expected = spec.getExpected();
-        final Map<String, ExpectedAttributeValue> expectedMap =
-                InternalUtils.toExpectedAttributeValueMap(expected);
-        requestBuilder.expected(expectedMap);
-        requestBuilder.attributeUpdates(
-                InternalUtils.toAttributeValueUpdate(spec.getAttributeUpdate()));
-        requestBuilder.expressionAttributeNames(spec.nameMap());
-        requestBuilder.expressionAttributeValues(
-                InternalUtils.fromSimpleMap(spec.valueMap()));
-        return new UpdateItemOutcome(client.updateItem(requestBuilder.build()));
-    }
-
-    @Override
-    public UpdateItemOutcome updateItem(String hashKeyName,
-                                        Object hashKeyValue, AttributeUpdate... attributeUpdates) {
-        return updateItem(new PrimaryKey(hashKeyName, hashKeyValue),
-                          attributeUpdates);
-    }
-
-    @Override
-    public UpdateItemOutcome updateItem(String hashKeyName,
-                                        Object hashKeyValue, String rangeKeyName, Object rangeKeyValue,
-                                        AttributeUpdate... attributeUpdates) {
-        return updateItem(new PrimaryKey(hashKeyName, hashKeyValue,
-                                         rangeKeyName, rangeKeyValue), attributeUpdates);
-    }
-
-    @Override
-    public UpdateItemOutcome updateItem(String hashKeyName,
-                                        Object hashKeyValue, Collection<Expected> expected,
-                                        AttributeUpdate... attributeUpdates) {
-        return updateItem(new PrimaryKey(hashKeyName, hashKeyValue),
-                          expected,
-                          attributeUpdates);
-    }
-
-    @Override
-    public UpdateItemOutcome updateItem(
-            String hashKeyName, Object hashKeyValue,
-            String rangeKeyName, Object rangeKeyValue,
-            Collection<Expected> expected,
-            AttributeUpdate... attributeUpdates) {
-        return updateItem(new PrimaryKey(hashKeyName, hashKeyValue,
-                                         rangeKeyName, rangeKeyValue),
-                          expected,
-                          attributeUpdates);
-    }
-
-    @Override
-    public UpdateItemOutcome updateItem(String hashKeyName,
-                                        Object hashKeyValue, String updateExpression,
-                                        Map<String, String> nameMap, Map<String, Object> valueMap) {
-        return updateItem(new PrimaryKey(hashKeyName, hashKeyValue),
-                          updateExpression, nameMap, valueMap);
-    }
-
-    @Override
-    public UpdateItemOutcome updateItem(String hashKeyName, Object hashKeyValue,
-                                        String rangeKeyName, Object rangeKeyValue,
-                                        String updateExpression, Map<String, String> nameMap,
-                                        Map<String, Object> valueMap) {
-        return updateItem(new PrimaryKey(hashKeyName, hashKeyValue,
-                                         rangeKeyName, rangeKeyValue),
-                          updateExpression, nameMap, valueMap);
-    }
-
-    @Override
-    public UpdateItemOutcome updateItem(String hashKeyName,
-                                        Object hashKeyValue, String updateExpression,
-                                        String conditionExpression, Map<String, String> nameMap,
-                                        Map<String, Object> valueMap) {
-        return updateItem(new PrimaryKey(hashKeyName, hashKeyValue),
-                          updateExpression, conditionExpression, nameMap, valueMap);
-    }
-
-    @Override
-    public UpdateItemOutcome updateItem(String hashKeyName, Object hashKeyValue,
-                                        String rangeKeyName, Object rangeKeyValue,
-                                        String updateExpression, String conditionExpression,
-                                        Map<String, String> nameMap, Map<String, Object> valueMap) {
-        return updateItem(new PrimaryKey(hashKeyName, hashKeyValue,
-                                         rangeKeyName, rangeKeyValue),
-                          updateExpression, conditionExpression, nameMap, valueMap);
-    }
-}
diff --git a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/internal/ValueTransformer.java b/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/internal/ValueTransformer.java
deleted file mode 100644
index 3cd5f1502a8e..000000000000
--- a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/internal/ValueTransformer.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.document.internal;
-
-/**
- * Internal value transformer SPI.
- */
-abstract class ValueTransformer {
-    abstract Object transform(Object value);
-}
diff --git a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/spec/AbstractCollectionSpec.java b/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/spec/AbstractCollectionSpec.java
deleted file mode 100644
index fabb06929542..000000000000
--- a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/spec/AbstractCollectionSpec.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.document.spec;
-
-
-import software.amazon.awssdk.awscore.AwsRequest;
-
-/**
- * Abstract implementation class for parameter specification that involves
- * collection of results.
- *
- * @param <T> request type
- */
-abstract class AbstractCollectionSpec<T extends AwsRequest>
-        extends AbstractSpec<T> {
-
-    private Integer maxPageSize;
-    /**
-     * The maximum number of resources to be retrieved; or null if there is no
-     * limit.
-     */
-    private Integer maxResultSize;
-
-
-    AbstractCollectionSpec(T req) {
-        super(req);
-    }
-
-    public AbstractCollectionSpec<T> withMaxResultSize(
-            Integer maxResultSize) {
-        this.maxResultSize = maxResultSize;
-        return this;
-    }
-
-    public AbstractCollectionSpec<T> withMaxResultSize(
-            int maxResultSize) {
-        this.maxResultSize = maxResultSize;
-        return this;
-    }
-
-    public AbstractCollectionSpec<T> withMaxPageSize(Integer maxPageSize) {
-        this.maxPageSize = maxPageSize;
-        return this;
-    }
-
-    public AbstractCollectionSpec<T> withMaxPageSize(int maxPageSize) {
-        this.maxPageSize = maxPageSize;
-        return this;
-    }
-
-    /**
-     * The maximum number of resources to be retrieved in this query, including
-     * all the resources in all pages to be retrieved.
-     */
-    public Integer maxResultSize() {
-        return maxResultSize;
-    }
-
-    public void setMaxResultSize(Integer maxResultSize) {
-        this.maxResultSize = maxResultSize;
-    }
-
-    public void setMaxResultSize(int maxResultSize) {
-        this.maxResultSize = maxResultSize;
-    }
-
-    /**
-     * The maximum number of resources to be retrieved in a single page; used
-     * for pagination purposes.
-     */
-    public Integer maxPageSize() {
-        return maxPageSize;
-    }
-
-    public void setMaxPageSize(Integer value) {
-        maxPageSize = value;
-    }
-}
diff --git a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/spec/AbstractSpec.java b/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/spec/AbstractSpec.java
deleted file mode 100644
index ffbd202afa6c..000000000000
--- a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/spec/AbstractSpec.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.document.spec;
-
-import software.amazon.awssdk.awscore.AwsRequest;
-import software.amazon.awssdk.services.dynamodb.document.internal.InternalUtils;
-
-/**
- * Abstract implementation base class for parameter specification.
- *
- * @param <T> request type
- */
-class AbstractSpec<T extends AwsRequest> {
-    private T req;
-
-    AbstractSpec(T req) {
-        setRequest(req);
-    }
-
-    public void setRequest(T req) {
-        InternalUtils.applyUserAgent(req);
-        this.req = req;
-    }
-
-    /**
-     * Internal method.  Not meant to be called directly.  May change without notice.
-     */
-    public T getRequest() {
-        return req;
-    }
-}
diff --git a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/spec/AbstractSpecWithPrimaryKey.java b/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/spec/AbstractSpecWithPrimaryKey.java
deleted file mode 100644
index 4e46f55727f8..000000000000
--- a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/spec/AbstractSpecWithPrimaryKey.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.document.spec;
-
-import java.util.Arrays;
-import java.util.Collection;
-import software.amazon.awssdk.awscore.AwsRequest;
-import software.amazon.awssdk.services.dynamodb.document.KeyAttribute;
-import software.amazon.awssdk.services.dynamodb.document.PrimaryKey;
-
-/**
- * Common base class for parameter specification that involves a primary key.
- */
-public class AbstractSpecWithPrimaryKey<T extends AwsRequest>
-        extends AbstractSpec<T> {
-    private Collection<KeyAttribute> keyComponents;
-
-    protected AbstractSpecWithPrimaryKey(T request) {
-        super(request);
-    }
-
-    /**
-     * Returns the primary key components that has been specified.
-     */
-    public final Collection<KeyAttribute> getKeyComponents() {
-        return keyComponents;
-    }
-
-    /**
-     * Sets the primary key with the specified key components.
-     */
-    public AbstractSpecWithPrimaryKey<T> withPrimaryKey(KeyAttribute... components) {
-        if (components == null) {
-            this.keyComponents = null;
-        } else {
-            this.keyComponents = Arrays.asList(components);
-        }
-        return this;
-    }
-
-    /**
-     * Sets the primary key.
-     */
-    public AbstractSpecWithPrimaryKey<T> withPrimaryKey(PrimaryKey primaryKey) {
-        if (primaryKey == null) {
-            this.keyComponents = null;
-        } else {
-            this.keyComponents = primaryKey.getComponents();
-        }
-        return this;
-    }
-
-    /**
-     * Sets the primary key with the specified hash-only key name and value.
-     */
-    public AbstractSpecWithPrimaryKey<T> withPrimaryKey(String hashKeyName, Object hashKeyValue) {
-        if (hashKeyName == null) {
-            throw new IllegalArgumentException();
-        }
-        withPrimaryKey(new PrimaryKey(hashKeyName, hashKeyValue));
-        return this;
-    }
-
-    /**
-     * Sets the primary key with the specified hash key and range key.
-     */
-    public AbstractSpecWithPrimaryKey<T> withPrimaryKey(String hashKeyName, Object hashKeyValue,
-                                                        String rangeKeyName, Object rangeKeyValue) {
-        if (hashKeyName == null) {
-            throw new IllegalArgumentException("Invalid hash key name");
-        }
-        if (rangeKeyName == null) {
-            throw new IllegalArgumentException("Invalid range key name");
-        }
-        if (hashKeyName.equals(rangeKeyName)) {
-            throw new IllegalArgumentException("Names of hash and range keys must not be the same");
-        }
-        withPrimaryKey(new PrimaryKey(hashKeyName, hashKeyValue,
-                                      rangeKeyName, rangeKeyValue));
-        return this;
-    }
-}
diff --git a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/spec/BatchGetItemSpec.java b/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/spec/BatchGetItemSpec.java
deleted file mode 100644
index 998df0aba0ac..000000000000
--- a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/spec/BatchGetItemSpec.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.document.spec;
-
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.Map;
-import java.util.Set;
-import software.amazon.awssdk.services.dynamodb.document.TableKeysAndAttributes;
-import software.amazon.awssdk.services.dynamodb.model.BatchGetItemRequest;
-import software.amazon.awssdk.services.dynamodb.model.KeysAndAttributes;
-import software.amazon.awssdk.services.dynamodb.model.ReturnConsumedCapacity;
-
-/**
- * Full parameter specification for the BatchGetItem API.
- */
-public class BatchGetItemSpec extends AbstractSpec<BatchGetItemRequest> {
-    private Collection<TableKeysAndAttributes> tableKeyAndAttributes;
-    private Map<String, KeysAndAttributes> unprocessedKeys;
-
-    public BatchGetItemSpec() {
-        super(BatchGetItemRequest.builder().build());
-    }
-
-    public Collection<TableKeysAndAttributes> getTableKeysAndAttributes() {
-        return tableKeyAndAttributes;
-    }
-
-    public BatchGetItemSpec withTableKeyAndAttributes(
-            TableKeysAndAttributes... tableKeyAndAttributes) {
-        if (tableKeyAndAttributes == null) {
-            this.tableKeyAndAttributes = null;
-        } else {
-            Set<String> names = new LinkedHashSet<String>();
-            for (TableKeysAndAttributes e : tableKeyAndAttributes) {
-                names.add(e.getTableName());
-            }
-            if (names.size() != tableKeyAndAttributes.length) {
-                throw new IllegalArgumentException(
-                        "table names must not duplicate in the list of TableKeysAndAttributes");
-            }
-            this.tableKeyAndAttributes = Arrays.asList(tableKeyAndAttributes);
-        }
-        return this;
-    }
-
-
-    public String getReturnConsumedCapacity() {
-        return getRequest().returnConsumedCapacityAsString();
-    }
-
-
-    public BatchGetItemSpec withReturnConsumedCapacity(ReturnConsumedCapacity capacity) {
-        setRequest(getRequest().toBuilder().returnConsumedCapacity(capacity).build());
-        return this;
-    }
-
-    public Map<String, KeysAndAttributes> getUnprocessedKeys() {
-        return unprocessedKeys;
-    }
-
-    public BatchGetItemSpec withUnprocessedKeys(
-            Map<String, KeysAndAttributes> unprocessedKeys) {
-        this.unprocessedKeys = Collections.unmodifiableMap(
-                new LinkedHashMap<String, KeysAndAttributes>(unprocessedKeys));
-        return this;
-    }
-}
diff --git a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/spec/BatchWriteItemSpec.java b/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/spec/BatchWriteItemSpec.java
deleted file mode 100644
index 5123f30b92ec..000000000000
--- a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/spec/BatchWriteItemSpec.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.document.spec;
-
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import software.amazon.awssdk.services.dynamodb.document.TableWriteItems;
-import software.amazon.awssdk.services.dynamodb.model.BatchWriteItemRequest;
-import software.amazon.awssdk.services.dynamodb.model.ReturnConsumedCapacity;
-import software.amazon.awssdk.services.dynamodb.model.WriteRequest;
-
-/**
- * Full parameter specification for the BatchWriteItem API.
- */
-public class BatchWriteItemSpec extends AbstractSpec<BatchWriteItemRequest> {
-    private Collection<TableWriteItems> tableWriteItems;
-    private Map<String, List<WriteRequest>> unprocessedItems;
-
-    public BatchWriteItemSpec() {
-        super(BatchWriteItemRequest.builder().build());
-    }
-
-    public Collection<TableWriteItems> getTableWriteItems() {
-        return tableWriteItems;
-    }
-
-    public BatchWriteItemSpec withTableWriteItems(
-            TableWriteItems... tableWriteItems) {
-        if (tableWriteItems == null) {
-            this.tableWriteItems = null;
-        } else {
-            Set<String> names = new LinkedHashSet<String>();
-            for (TableWriteItems e : tableWriteItems) {
-                names.add(e.getTableName());
-            }
-            if (names.size() != tableWriteItems.length) {
-                throw new IllegalArgumentException(
-                        "table names must not duplicate in the list of TableWriteItems");
-            }
-            this.tableWriteItems = Arrays.asList(tableWriteItems);
-        }
-        return this;
-    }
-
-
-    public String getReturnConsumedCapacity() {
-        return getRequest().returnConsumedCapacityAsString();
-    }
-
-
-    public BatchWriteItemSpec withReturnConsumedCapacity(ReturnConsumedCapacity capacity) {
-        setRequest(getRequest().toBuilder().returnConsumedCapacity(capacity).build());
-        return this;
-    }
-
-    public Map<String, List<WriteRequest>> getUnprocessedItems() {
-        return unprocessedItems;
-    }
-
-    public BatchWriteItemSpec withUnprocessedItems(
-            Map<String, List<WriteRequest>> unprocessedItems) {
-        this.unprocessedItems = Collections.unmodifiableMap(
-                new LinkedHashMap<String, List<WriteRequest>>(unprocessedItems));
-        return this;
-    }
-}
diff --git a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/spec/DeleteItemSpec.java b/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/spec/DeleteItemSpec.java
deleted file mode 100644
index 4c450da62340..000000000000
--- a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/spec/DeleteItemSpec.java
+++ /dev/null
@@ -1,185 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.document.spec;
-
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.Map;
-import java.util.Set;
-import software.amazon.awssdk.services.dynamodb.document.Expected;
-import software.amazon.awssdk.services.dynamodb.document.KeyAttribute;
-import software.amazon.awssdk.services.dynamodb.document.PrimaryKey;
-import software.amazon.awssdk.services.dynamodb.model.ConditionalOperator;
-import software.amazon.awssdk.services.dynamodb.model.DeleteItemRequest;
-import software.amazon.awssdk.services.dynamodb.model.ReturnConsumedCapacity;
-import software.amazon.awssdk.services.dynamodb.model.ReturnItemCollectionMetrics;
-import software.amazon.awssdk.services.dynamodb.model.ReturnValue;
-
-/**
- * Full parameter specification for the DeleteItem API.
- */
-public class DeleteItemSpec extends AbstractSpecWithPrimaryKey<DeleteItemRequest> {
-    private Collection<Expected> expected;
-
-    private Map<String, String> nameMap;
-    private Map<String, Object> valueMap;
-
-    public DeleteItemSpec() {
-        super(DeleteItemRequest.builder().build());
-    }
-
-    @Override
-    public DeleteItemSpec withPrimaryKey(KeyAttribute... components) {
-        super.withPrimaryKey(components);
-        return this;
-    }
-
-    @Override
-    public DeleteItemSpec withPrimaryKey(PrimaryKey primaryKey) {
-        super.withPrimaryKey(primaryKey);
-        return this;
-    }
-
-    @Override
-    public DeleteItemSpec withPrimaryKey(String hashKeyName, Object hashKeyValue) {
-        super.withPrimaryKey(hashKeyName, hashKeyValue);
-        return this;
-    }
-
-    @Override
-    public DeleteItemSpec withPrimaryKey(String hashKeyName, Object hashKeyValue,
-                                         String rangeKeyName, Object rangeKeyValue) {
-        super.withPrimaryKey(hashKeyName, hashKeyValue, rangeKeyName, rangeKeyValue);
-        return this;
-    }
-
-    public Collection<Expected> getExpected() {
-        return expected;
-    }
-
-    public DeleteItemSpec withExpected(Expected... expected) {
-        if (expected == null) {
-            this.expected = null;
-            return this;
-        }
-        return withExpected(Arrays.asList(expected));
-    }
-
-    public DeleteItemSpec withExpected(Collection<Expected> expected) {
-        if (expected == null) {
-            this.expected = null;
-            return this;
-        }
-        Set<String> names = new LinkedHashSet<String>();
-        for (Expected e : expected) {
-            names.add(e.getAttribute());
-        }
-        if (names.size() != expected.size()) {
-            throw new IllegalArgumentException(
-                    "attribute names must not duplicate in the list of expected");
-        }
-        this.expected = Collections.unmodifiableCollection(expected);
-        return this;
-    }
-
-    public String getConditionExpression() {
-        return getRequest().conditionExpression();
-    }
-
-    public DeleteItemSpec withConditionExpression(String conditionExpression) {
-        setRequest(getRequest().toBuilder().conditionExpression(conditionExpression).build());
-        return this;
-    }
-
-    public Map<String, String> nameMap() {
-        return nameMap;
-    }
-
-    /**
-     * Applicable only when an expression has been specified.
-     * Used to specify the actual values for the attribute-name placeholders,
-     * where the value in the map can either be string for simple attribute
-     * name, or a JSON path expression.
-     */
-    public DeleteItemSpec withNameMap(Map<String, String> nameMap) {
-        if (nameMap == null) {
-            this.nameMap = null;
-        } else {
-            this.nameMap = Collections.unmodifiableMap(
-                    new LinkedHashMap<String, String>(nameMap));
-        }
-        return this;
-    }
-
-    public Map<String, Object> valueMap() {
-        return valueMap;
-    }
-
-    /**
-     * Applicable only when an expression has been specified. Used to
-     * specify the actual values for the attribute-value placeholders.
-     */
-    public DeleteItemSpec valueMap(Map<String, Object> valueMap) {
-        if (valueMap == null) {
-            this.valueMap = null;
-        } else {
-            this.valueMap = Collections.unmodifiableMap(
-                    new LinkedHashMap<String, Object>(valueMap));
-        }
-        return this;
-    }
-
-    public String getConditionalOperator() {
-        return getRequest().conditionalOperatorAsString();
-    }
-
-    public DeleteItemSpec withConditionalOperator(ConditionalOperator conditionalOperator) {
-        setRequest(getRequest().toBuilder().conditionalOperator(conditionalOperator).build());
-        return this;
-    }
-
-    public String getReturnConsumedCapacity() {
-        return getRequest().returnConsumedCapacityAsString();
-    }
-
-    public DeleteItemSpec withReturnConsumedCapacity(
-            ReturnConsumedCapacity returnConsumedCapacity) {
-        setRequest(getRequest().toBuilder().returnConsumedCapacity(returnConsumedCapacity).build());
-        return this;
-    }
-
-    public String getReturnItemCollectionMetrics() {
-        return getRequest().returnItemCollectionMetricsAsString();
-    }
-
-    public DeleteItemSpec withReturnItemCollectionMetrics(
-            ReturnItemCollectionMetrics returnItemCollectionMetrics) {
-        setRequest(getRequest().toBuilder().returnItemCollectionMetrics(returnItemCollectionMetrics).build());
-        return this;
-    }
-
-    public String getReturnValues() {
-        return getRequest().returnValuesAsString();
-    }
-
-    public DeleteItemSpec withReturnValues(ReturnValue returnValues) {
-        setRequest(getRequest().toBuilder().returnValues(returnValues).build());
-        return this;
-    }
-}
diff --git a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/spec/GetItemSpec.java b/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/spec/GetItemSpec.java
deleted file mode 100644
index 14d621f424b0..000000000000
--- a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/spec/GetItemSpec.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.document.spec;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import software.amazon.awssdk.services.dynamodb.document.KeyAttribute;
-import software.amazon.awssdk.services.dynamodb.document.PrimaryKey;
-import software.amazon.awssdk.services.dynamodb.model.GetItemRequest;
-import software.amazon.awssdk.services.dynamodb.model.ReturnConsumedCapacity;
-
-/**
- * Full parameter specification for the GetItem API.
- */
-public class GetItemSpec extends AbstractSpecWithPrimaryKey<GetItemRequest> {
-    private Map<String, String> nameMap;
-
-    public GetItemSpec() {
-        super(GetItemRequest.builder().build());
-    }
-
-    @Override
-    public GetItemSpec withPrimaryKey(KeyAttribute... components) {
-        super.withPrimaryKey(components);
-        return this;
-    }
-
-    @Override
-    public GetItemSpec withPrimaryKey(PrimaryKey primaryKey) {
-        super.withPrimaryKey(primaryKey);
-        return this;
-    }
-
-    @Override
-    public GetItemSpec withPrimaryKey(String hashKeyName, Object hashKeyValue) {
-        super.withPrimaryKey(hashKeyName, hashKeyValue);
-        return this;
-    }
-
-    @Override
-    public GetItemSpec withPrimaryKey(String hashKeyName, Object hashKeyValue,
-                                      String rangeKeyName, Object rangeKeyValue) {
-        super.withPrimaryKey(hashKeyName, hashKeyValue, rangeKeyName, rangeKeyValue);
-        return this;
-    }
-
-    public String getReturnConsumedCapacity() {
-        return getRequest().returnConsumedCapacityAsString();
-    }
-
-    public GetItemSpec withReturnConsumedCapacity(ReturnConsumedCapacity capacity) {
-        setRequest(getRequest().toBuilder().returnConsumedCapacity(capacity).build());
-        return this;
-    }
-
-    public List<String> getAttributesToGet() {
-        return getRequest().attributesToGet();
-    }
-
-    public GetItemSpec withAttributesToGet(String... attrNames) {
-        if (attrNames == null) {
-            setRequest(getRequest().toBuilder().attributesToGet((String[]) null).build());
-        } else {
-            setRequest(getRequest().toBuilder().attributesToGet(Arrays.asList(attrNames)).build());
-        }
-        return this;
-    }
-
-    public Boolean isConsistentRead() {
-        return getRequest().consistentRead();
-    }
-
-    public GetItemSpec withConsistentRead(boolean consistentRead) {
-        setRequest(getRequest().toBuilder().consistentRead(consistentRead).build());
-        return this;
-    }
-
-    public String getProjectionExpression() {
-        return getRequest().projectionExpression();
-    }
-
-    /**
-     * When a projection expression is specified, the corresponding name-map can
-     * optionally be specified via { {@link #withNameMap(Map)}. (Note
-     * attributes-to-get must not be specified if a projection expression has
-     * been specified.)
-     */
-    public GetItemSpec withProjectionExpression(String projectionExpression) {
-        setRequest(getRequest().toBuilder().projectionExpression(projectionExpression).build());
-        return this;
-    }
-
-    public Map<String, String> nameMap() {
-        return nameMap;
-    }
-
-    /**
-     * Applicable only when an expression has been specified.
-     * Used to specify the actual values for the attribute-name placeholders,
-     * where the value in the map can either be string for simple attribute
-     * name, or a JSON path expression.
-     */
-    public GetItemSpec withNameMap(Map<String, String> nameMap) {
-        if (nameMap == null) {
-            this.nameMap = null;
-        } else {
-            this.nameMap = Collections.unmodifiableMap(
-                    new LinkedHashMap<String, String>(nameMap));
-        }
-        return this;
-    }
-}
diff --git a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/spec/ListTablesSpec.java b/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/spec/ListTablesSpec.java
deleted file mode 100644
index d14db7007fea..000000000000
--- a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/spec/ListTablesSpec.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.document.spec;
-
-import software.amazon.awssdk.services.dynamodb.model.ListTablesRequest;
-
-/**
- * Full parameter specification for the ListTables API.
- */
-public class ListTablesSpec extends AbstractCollectionSpec<ListTablesRequest> {
-
-    public ListTablesSpec() {
-        super(ListTablesRequest.builder().build());
-    }
-
-    public String getExclusiveStartTableName() {
-        return getRequest().exclusiveStartTableName();
-    }
-
-    public ListTablesSpec withExclusiveStartTableName(String exclusiveStartTableName) {
-        setRequest(getRequest().toBuilder().exclusiveStartTableName(exclusiveStartTableName).build());
-        return this;
-    }
-
-    @Override
-    public ListTablesSpec withMaxResultSize(Integer maxResultSize) {
-        setMaxResultSize(maxResultSize);
-        return this;
-    }
-
-    @Override
-    public ListTablesSpec withMaxResultSize(int maxResultSize) {
-        setMaxResultSize(maxResultSize);
-        return this;
-    }
-
-    @Override
-    public ListTablesSpec withMaxPageSize(Integer maxPageSize) {
-        setMaxPageSize(maxPageSize);
-        return this;
-    }
-
-    @Override
-    public ListTablesSpec withMaxPageSize(int maxPageSize) {
-        setMaxPageSize(maxPageSize);
-        return this;
-    }
-}
diff --git a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/spec/PutItemSpec.java b/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/spec/PutItemSpec.java
deleted file mode 100644
index 86770b9d4ee0..000000000000
--- a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/spec/PutItemSpec.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.document.spec;
-
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.Map;
-import java.util.Set;
-import software.amazon.awssdk.services.dynamodb.document.Expected;
-import software.amazon.awssdk.services.dynamodb.document.Item;
-import software.amazon.awssdk.services.dynamodb.model.ConditionalOperator;
-import software.amazon.awssdk.services.dynamodb.model.PutItemRequest;
-import software.amazon.awssdk.services.dynamodb.model.ReturnConsumedCapacity;
-import software.amazon.awssdk.services.dynamodb.model.ReturnItemCollectionMetrics;
-import software.amazon.awssdk.services.dynamodb.model.ReturnValue;
-
-/**
- * Full parameter specification for the PutItem API.
- */
-public class PutItemSpec extends AbstractSpec<PutItemRequest> {
-    private Item item;
-    private Collection<Expected> expected;
-    private Map<String, String> nameMap;
-    private Map<String, Object> valueMap;
-
-    public PutItemSpec() {
-        super(PutItemRequest.builder().build());
-    }
-
-    public Item getItem() {
-        return item;
-    }
-
-    public PutItemSpec withItem(Item item) {
-        this.item = item;
-        return this;
-    }
-
-    public Collection<Expected> getExpected() {
-        return expected;
-    }
-
-    public PutItemSpec withExpected(Expected... expected) {
-        if (expected == null) {
-            this.expected = null;
-            return this;
-        }
-        return withExpected(Arrays.asList(expected));
-    }
-
-    public PutItemSpec withExpected(Collection<Expected> expected) {
-        if (expected == null) {
-            this.expected = null;
-            return this;
-        }
-        Set<String> names = new LinkedHashSet<String>();
-        for (Expected e : expected) {
-            names.add(e.getAttribute());
-        }
-        if (names.size() != expected.size()) {
-            throw new IllegalArgumentException(
-                    "attribute names must not duplicate in the list of expected");
-        }
-        this.expected = Collections.unmodifiableCollection(expected);
-        return this;
-    }
-
-    public String getConditionExpression() {
-        return getRequest().conditionExpression();
-    }
-
-    public PutItemSpec withConditionExpression(String conditionExpression) {
-        setRequest(getRequest().toBuilder().conditionExpression(conditionExpression).build());
-        return this;
-    }
-
-    public Map<String, String> nameMap() {
-        return nameMap;
-    }
-
-    /**
-     * Applicable only when an expression has been specified.
-     * Used to specify the actual values for the attribute-name placeholders,
-     * where the value in the map can either be string for simple attribute
-     * name, or a JSON path expression.
-     */
-    public PutItemSpec withNameMap(Map<String, String> nameMap) {
-        if (nameMap == null) {
-            this.nameMap = null;
-        } else {
-            this.nameMap = Collections.unmodifiableMap(
-                    new LinkedHashMap<String, String>(nameMap));
-        }
-        return this;
-    }
-
-    public Map<String, Object> valueMap() {
-        return valueMap;
-    }
-
-    /**
-     * Applicable only when an expression has been specified. Used to
-     * specify the actual values for the attribute-value placeholders.
-     */
-    public PutItemSpec valueMap(Map<String, Object> valueMap) {
-        if (valueMap == null) {
-            this.valueMap = null;
-        } else {
-            this.valueMap = Collections.unmodifiableMap(
-                    new LinkedHashMap<String, Object>(valueMap));
-        }
-        return this;
-    }
-
-    public String getConditionalOperator() {
-        return getRequest().conditionalOperatorAsString();
-    }
-
-    public PutItemSpec withConditionalOperator(
-            ConditionalOperator conditionalOperator) {
-        setRequest(getRequest().toBuilder().conditionalOperator(conditionalOperator).build());
-        return this;
-    }
-
-    public String getReturnConsumedCapacity() {
-        return getRequest().returnConsumedCapacityAsString();
-    }
-
-    public PutItemSpec withReturnConsumedCapacity(
-            ReturnConsumedCapacity returnConsumedCapacity) {
-        setRequest(getRequest().toBuilder().returnConsumedCapacity(returnConsumedCapacity).build());
-        return this;
-    }
-
-    public String getReturnItemCollectionMetrics() {
-        return getRequest().returnItemCollectionMetricsAsString();
-    }
-
-    public PutItemSpec withReturnItemCollectionMetrics(
-            ReturnItemCollectionMetrics returnItemCollectionMetrics) {
-        setRequest(getRequest().toBuilder()
-                .returnItemCollectionMetrics(returnItemCollectionMetrics)
-                .build());
-        return this;
-    }
-
-    public String getReturnValues() {
-        return getRequest().returnValuesAsString();
-    }
-
-    public PutItemSpec withReturnValues(ReturnValue returnValues) {
-        setRequest(getRequest().toBuilder().returnValues(returnValues).build());
-        return this;
-    }
-}
diff --git a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/spec/QuerySpec.java b/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/spec/QuerySpec.java
deleted file mode 100644
index 2ddea07383bc..000000000000
--- a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/spec/QuerySpec.java
+++ /dev/null
@@ -1,294 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.document.spec;
-
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import software.amazon.awssdk.services.dynamodb.document.KeyAttribute;
-import software.amazon.awssdk.services.dynamodb.document.PrimaryKey;
-import software.amazon.awssdk.services.dynamodb.document.QueryFilter;
-import software.amazon.awssdk.services.dynamodb.document.RangeKeyCondition;
-import software.amazon.awssdk.services.dynamodb.model.ConditionalOperator;
-import software.amazon.awssdk.services.dynamodb.model.QueryRequest;
-import software.amazon.awssdk.services.dynamodb.model.ReturnConsumedCapacity;
-import software.amazon.awssdk.services.dynamodb.model.Select;
-
-/**
- * Full parameter specification for the Query API.
- */
-public class QuerySpec extends AbstractCollectionSpec<QueryRequest> {
-    private KeyAttribute hashKey;
-    private RangeKeyCondition rangeKeyCondition;
-    private Collection<QueryFilter> queryFilters;
-    private Map<String, String> nameMap;
-    private Map<String, Object> valueMap;
-
-    private Collection<KeyAttribute> exclusiveStartKey;
-
-    public QuerySpec() {
-        super(QueryRequest.builder().build());
-    }
-
-    public KeyAttribute getHashKey() {
-        return hashKey;
-    }
-
-    public QuerySpec withHashKey(KeyAttribute hashKey) {
-        this.hashKey = hashKey;
-        return this;
-    }
-
-    public QuerySpec withHashKey(String hashKeyName, Object hashKeyValue) {
-        this.hashKey = new KeyAttribute(hashKeyName, hashKeyValue);
-        return this;
-    }
-
-    public RangeKeyCondition getRangeKeyCondition() {
-        return rangeKeyCondition;
-    }
-
-    public QuerySpec withRangeKeyCondition(RangeKeyCondition rangeKeyCondition) {
-        this.rangeKeyCondition = rangeKeyCondition;
-        return this;
-    }
-
-    /**
-     * When a key condition expression is specified, the corresponding name-map
-     * and value-map can optionally be specified via {@link #withNameMap(Map)}
-     * and {@link #valueMap(Map)}. (Note the hash key and range key
-     * conditions must not be specified if a key condition expression has been
-     * specified.)
-     */
-    public QuerySpec withKeyConditionExpression(String keyConditionExpression) {
-        setRequest(getRequest().toBuilder().keyConditionExpression(keyConditionExpression).build());
-        return this;
-    }
-
-    public String getKeyConditionExpression() {
-        return getRequest().keyConditionExpression();
-    }
-
-    public QuerySpec withAttributesToGet(String... attributes) {
-        setRequest(getRequest().toBuilder().attributesToGet(Arrays.asList(attributes)).build());
-        return this;
-    }
-
-    public List<String> getAttributesToGet() {
-        return getRequest().attributesToGet();
-    }
-
-    public QuerySpec withConditionalOperator(ConditionalOperator op) {
-        setRequest(getRequest().toBuilder().conditionalOperator(op).build());
-        return this;
-    }
-
-    public String getConditionalOperator() {
-        return getRequest().conditionalOperatorAsString();
-    }
-
-    public QuerySpec withConsistentRead(boolean consistentRead) {
-        setRequest(getRequest().toBuilder().consistentRead(consistentRead).build());
-        return this;
-    }
-
-    public boolean isConsistentRead() {
-        return getRequest().consistentRead();
-    }
-
-    public QuerySpec withQueryFilters(QueryFilter... queryFilters) {
-        if (queryFilters == null) {
-            this.queryFilters = null;
-        } else {
-            Set<String> names = new LinkedHashSet<String>();
-            for (QueryFilter e : queryFilters) {
-                names.add(e.getAttribute());
-            }
-            if (names.size() != queryFilters.length) {
-                throw new IllegalArgumentException(
-                        "attribute names must not duplicate in the list of query filters");
-            }
-            this.queryFilters = Arrays.asList(queryFilters);
-        }
-        return this;
-    }
-
-    public Collection<QueryFilter> getQueryFilters() {
-        return queryFilters;
-    }
-
-    /**
-     * When a filter expression is specified, the corresponding name-map and
-     * value-map can optionally be specified via {@link #withNameMap(Map)} and
-     * {@link #valueMap(Map)}. (Note query filters must not be specified if
-     * a filter expression has been specified.)
-     */
-    public QuerySpec withFilterExpression(String filterExpression) {
-        setRequest(getRequest().toBuilder().filterExpression(filterExpression).build());
-        return this;
-    }
-
-    public String getFilterExpression() {
-        return getRequest().filterExpression();
-    }
-
-    /**
-     * When a projection expression is specified, the corresponding name-map and
-     * value-map can optionally be specified via {@link #withNameMap(Map)} and
-     * {@link #valueMap(Map)}. (Note attributes-to-get must not be specified
-     * if a projection expression has been specified.)
-     */
-    public QuerySpec withProjectionExpression(String projectionExpression) {
-        setRequest(getRequest().toBuilder().projectionExpression(projectionExpression).build());
-        return this;
-    }
-
-    public String getProjectionExpression() {
-        return getRequest().projectionExpression();
-    }
-
-    public Map<String, String> nameMap() {
-        return nameMap;
-    }
-
-    /**
-     * Applicable only when an expression has been specified.
-     * Used to specify the actual values for the attribute-name placeholders,
-     * where the value in the map can either be string for simple attribute
-     * name, or a JSON path expression.
-     */
-    public QuerySpec withNameMap(Map<String, String> nameMap) {
-        if (nameMap == null) {
-            this.nameMap = null;
-        } else {
-            this.nameMap = Collections.unmodifiableMap(new LinkedHashMap<String, String>(nameMap));
-        }
-        return this;
-    }
-
-    public Map<String, Object> valueMap() {
-        return valueMap;
-    }
-
-    /**
-     * Applicable only when an expression has been specified. Used to
-     * specify the actual values for the attribute-value placeholders.
-     */
-    public QuerySpec valueMap(Map<String, Object> valueMap) {
-        if (valueMap == null) {
-            this.valueMap = null;
-        } else {
-            this.valueMap = Collections.unmodifiableMap(new LinkedHashMap<String, Object>(valueMap));
-        }
-        return this;
-    }
-
-    public String getReturnConsumedCapacity() {
-        return getRequest().returnConsumedCapacityAsString();
-    }
-
-    public QuerySpec withReturnConsumedCapacity(
-            ReturnConsumedCapacity returnConsumedCapacity) {
-        setRequest(getRequest().toBuilder().returnConsumedCapacity(returnConsumedCapacity).build());
-        return this;
-    }
-
-    public QuerySpec withScanIndexForward(boolean scanIndexForward) {
-        setRequest(getRequest().toBuilder().scanIndexForward(scanIndexForward).build());
-        return this;
-    }
-
-    public boolean isScanIndexForward() {
-        return getRequest().scanIndexForward();
-    }
-
-    public QuerySpec withSelect(Select select) {
-        setRequest(getRequest().toBuilder().select(select).build());
-        return this;
-    }
-
-    public String select() {
-        return getRequest().selectAsString();
-    }
-
-    // Exclusive start key
-
-    public Collection<KeyAttribute> getExclusiveStartKey() {
-        return exclusiveStartKey;
-    }
-
-    public QuerySpec withExclusiveStartKey(KeyAttribute... exclusiveStartKey) {
-        if (exclusiveStartKey == null) {
-            this.exclusiveStartKey = null;
-        } else {
-            this.exclusiveStartKey = Arrays.asList(exclusiveStartKey);
-        }
-        return this;
-    }
-
-    public QuerySpec withExclusiveStartKey(PrimaryKey exclusiveStartKey) {
-        if (exclusiveStartKey == null) {
-            this.exclusiveStartKey = null;
-        } else {
-            this.exclusiveStartKey = exclusiveStartKey.getComponents();
-        }
-        return this;
-    }
-
-    public QuerySpec withExclusiveStartKey(
-            String hashKeyName, Object hashKeyValue) {
-        return withExclusiveStartKey(new KeyAttribute(hashKeyName, hashKeyValue));
-    }
-
-    public QuerySpec withExclusiveStartKey(
-            String hashKeyName, Object hashKeyValue,
-            String rangeKeyName, Object rangeKeyValue) {
-        return withExclusiveStartKey(
-                new KeyAttribute(hashKeyName, hashKeyValue),
-                new KeyAttribute(rangeKeyName, rangeKeyValue));
-    }
-
-    // Max result size
-
-    @Override
-    public QuerySpec withMaxResultSize(Integer maxResultSize) {
-        setMaxResultSize(maxResultSize);
-        return this;
-    }
-
-    @Override
-    public QuerySpec withMaxResultSize(int maxResultSize) {
-        setMaxResultSize(maxResultSize);
-        return this;
-    }
-
-    @Override
-    public QuerySpec withMaxPageSize(Integer maxPageSize) {
-        setMaxPageSize(maxPageSize);
-        return this;
-    }
-
-    @Override
-    public QuerySpec withMaxPageSize(int maxPageSize) {
-        setMaxPageSize(maxPageSize);
-        return this;
-    }
-}
diff --git a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/spec/ScanSpec.java b/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/spec/ScanSpec.java
deleted file mode 100644
index e40b43c4a4c9..000000000000
--- a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/spec/ScanSpec.java
+++ /dev/null
@@ -1,347 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.document.spec;
-
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import software.amazon.awssdk.services.dynamodb.document.KeyAttribute;
-import software.amazon.awssdk.services.dynamodb.document.PrimaryKey;
-import software.amazon.awssdk.services.dynamodb.document.ScanFilter;
-import software.amazon.awssdk.services.dynamodb.model.ConditionalOperator;
-import software.amazon.awssdk.services.dynamodb.model.ReturnConsumedCapacity;
-import software.amazon.awssdk.services.dynamodb.model.ScanRequest;
-import software.amazon.awssdk.services.dynamodb.model.Select;
-
-/**
- * API for fully specifying all the parameters of a Table-centric Scan API.
- */
-public class ScanSpec extends AbstractCollectionSpec<ScanRequest> {
-    private Collection<ScanFilter> scanFilters;
-    private Map<String, String> nameMap;
-    private Map<String, Object> valueMap;
-
-    private Collection<KeyAttribute> exclusiveStartKey;
-
-    public ScanSpec() {
-        super(ScanRequest.builder().build());
-    }
-
-    /**
-     * @see ScanRequest#scanFilter()
-     */
-    public Collection<ScanFilter> scanFilters() {
-        return scanFilters;
-    }
-
-    /**
-     * @see ScanRequest#withScanFilter(Map)
-     */
-    public ScanSpec withScanFilters(ScanFilter... scanFilters) {
-        if (scanFilters == null) {
-            this.scanFilters = null;
-        } else {
-            Set<String> names = new LinkedHashSet<String>();
-            for (ScanFilter e : scanFilters) {
-                names.add(e.getAttribute());
-            }
-            if (names.size() != scanFilters.length) {
-                throw new IllegalArgumentException(
-                        "attribute names must not duplicate in the list of scan filters");
-            }
-            this.scanFilters = Arrays.asList(scanFilters);
-        }
-        return this;
-    }
-
-    /**
-     * AND|OR that applies to all the conditions in the ScanFilters.
-     *
-     * @see ScanRequest#getConditionalOperator()
-     */
-    public String getConditionalOperator() {
-        return getRequest().conditionalOperatorAsString();
-    }
-
-    /**
-     * @see ScanRequest#withConditionalOperator(ConditionalOperator)
-     */
-    public ScanSpec withConditionalOperator(ConditionalOperator op) {
-        setRequest(getRequest().toBuilder().conditionalOperator(op).build());
-        return this;
-    }
-
-    /**
-     * @see ScanRequest#getAttributesToGet()
-     */
-    public List<String> getAttributesToGet() {
-        return getRequest().attributesToGet();
-    }
-
-    /**
-     * @see ScanRequest#withAttributesToGet(String...)
-     */
-    public ScanSpec withAttributesToGet(String... attributes) {
-        if (attributes == null) {
-            setRequest(getRequest().toBuilder().attributesToGet((String []) null).build());
-        } else {
-            setRequest(getRequest().toBuilder().attributesToGet(Arrays.asList(attributes)).build());
-        }
-        return this;
-    }
-
-    /**
-     * Any query filters will be ignored if a filter expression has been
-     * specified. When a filter expression is specified, the corresponding
-     * name-map and value-map can also be specified via
-     * {@link #withNameMap(Map)} and {@link #valueMap(Map)}.
-     *
-     * @see ScanRequest#getFilterExpression()
-     */
-    public String getFilterExpression() {
-        return getRequest().filterExpression();
-    }
-
-    /**
-     * @see ScanRequest#withFilterExpression(String)
-     */
-    public ScanSpec withFilterExpression(String filterExpression) {
-        setRequest(getRequest().toBuilder().filterExpression(filterExpression).build());
-        return this;
-    }
-
-    /**
-     * @see ScanRequest#getProjectionExpression()
-     */
-    public String getProjectionExpression() {
-        return getRequest().projectionExpression();
-    }
-
-    /**
-     * @see ScanRequest#withProjectionExpression(String)
-     */
-    public ScanSpec withProjectionExpression(String projectionExpression) {
-        setRequest(getRequest().toBuilder().projectionExpression(projectionExpression).build());
-        return this;
-    }
-
-    /**
-     * @see ScanRequest#getExpressionAttributeNames()
-     */
-    public Map<String, String> nameMap() {
-        return nameMap;
-    }
-
-    /**
-     * Applicable only when an expression has been specified.
-     * Used to specify the actual values for the attribute-name placeholders,
-     * where the value in the map can either be string for simple attribute
-     * name, or a JSON path expression.
-     *
-     * @see ScanRequest#withExpressionAttributeNames(Map)
-     */
-    public ScanSpec withNameMap(Map<String, String> nameMap) {
-        if (nameMap == null) {
-            this.nameMap = null;
-        } else {
-            this.nameMap = Collections.unmodifiableMap(new LinkedHashMap<String, String>(nameMap));
-        }
-        return this;
-    }
-
-    /**
-     * @see ScanRequest#getExpressionAttributeValues()
-     */
-    public Map<String, Object> valueMap() {
-        return valueMap;
-    }
-
-    /**
-     * Applicable only when an expression has been specified. Used to
-     * specify the actual values for the attribute-value placeholders.
-     *
-     * @see ScanRequest#withExpressionAttributeValues(Map)
-     */
-    public ScanSpec valueMap(Map<String, Object> valueMap) {
-        if (valueMap == null) {
-            this.valueMap = null;
-        } else {
-            this.valueMap = Collections.unmodifiableMap(new LinkedHashMap<String, Object>(valueMap));
-        }
-        return this;
-    }
-
-    /**
-     * @see ScanRequest#getReturnConsumedCapacity()
-     */
-    public String getReturnConsumedCapacity() {
-        return getRequest().returnConsumedCapacityAsString();
-    }
-
-    /**
-     * @see ScanRequest#withReturnConsumedCapacity(ReturnConsumedCapacity)
-     */
-    public ScanSpec withReturnConsumedCapacity(ReturnConsumedCapacity capacity) {
-        setRequest(getRequest().toBuilder().returnConsumedCapacity(capacity).build());
-        return this;
-    }
-
-    /**
-     * Specifies the attributes to be returned.
-     *
-     * @see ScanRequest#select()
-     */
-    // ALL_ATTRIBUTES | ALL_PROJECTED_ATTRIBUTES | SPECIFIC_ATTRIBUTES | COUNT
-    public String select() {
-        return getRequest().selectAsString();
-    }
-
-    /**
-     * @see ScanRequest#withSelect(Select)
-     */
-    public ScanSpec withSelect(Select select) {
-        setRequest(getRequest().toBuilder().select(select).build());
-        return this;
-    }
-
-    /**
-     * @see ScanRequest#segment()
-     */
-    public Integer segment() {
-        return getRequest().segment();
-    }
-
-    /**
-     * @see ScanRequest#withSegment(Integer)
-     */
-    public ScanSpec withSegment(Integer segment) {
-        setRequest(getRequest().toBuilder().segment(segment).build());
-        return this;
-    }
-
-    /**
-     * @see ScanRequest#getTotalSegments()
-     */
-    public Integer getTotalSegments() {
-        return getRequest().totalSegments();
-    }
-
-    /**
-     * @see ScanRequest#withTotalSegments(Integer)
-     */
-    public ScanSpec withTotalSegments(Integer totalSegments) {
-        setRequest(getRequest().toBuilder().totalSegments(totalSegments).build());
-        return this;
-    }
-
-    /**
-     * @see ScanRequest#isConsistentRead()
-     */
-    public Boolean isConsistentRead() {
-        return getRequest().consistentRead();
-    }
-
-    /**
-     * @see ScanRequest#withConsistentRead(Boolean)
-     */
-    public ScanSpec withConsistentRead(Boolean consistentRead) {
-        setRequest(getRequest().toBuilder().consistentRead(consistentRead).build());
-        return this;
-    }
-
-    // Exclusive start key
-
-    /**
-     * @see ScanRequest#getExclusiveStartKey()
-     */
-    public Collection<KeyAttribute> getExclusiveStartKey() {
-        return exclusiveStartKey;
-    }
-
-    /**
-     * @see ScanRequest#withExclusiveStartKey(Map)
-     */
-    public ScanSpec withExclusiveStartKey(KeyAttribute... exclusiveStartKey) {
-        if (exclusiveStartKey == null) {
-            this.exclusiveStartKey = null;
-        } else {
-            this.exclusiveStartKey = Arrays.asList(exclusiveStartKey);
-        }
-        return this;
-    }
-
-    /**
-     * @see ScanRequest#withExclusiveStartKey(Map)
-     */
-    public ScanSpec withExclusiveStartKey(PrimaryKey exclusiveStartKey) {
-        if (exclusiveStartKey == null) {
-            this.exclusiveStartKey = null;
-        } else {
-            this.exclusiveStartKey = exclusiveStartKey.getComponents();
-        }
-        return this;
-    }
-
-    /**
-     * @see ScanRequest#withExclusiveStartKey(Map)
-     */
-    public ScanSpec withExclusiveStartKey(
-            String hashKeyName, Object hashKeyValue) {
-        return withExclusiveStartKey(new KeyAttribute(hashKeyName, hashKeyValue));
-    }
-
-    /**
-     * @see ScanRequest#withExclusiveStartKey(Map)
-     */
-    public ScanSpec withExclusiveStartKey(
-            String hashKeyName, Object hashKeyValue,
-            String rangeKeyName, Object rangeKeyValue) {
-        return withExclusiveStartKey(
-                new KeyAttribute(hashKeyName, hashKeyValue),
-                new KeyAttribute(rangeKeyName, rangeKeyValue));
-    }
-
-    // Max result size
-
-    @Override
-    public ScanSpec withMaxResultSize(Integer maxResultSize) {
-        setMaxResultSize(maxResultSize);
-        return this;
-    }
-
-    @Override
-    public ScanSpec withMaxResultSize(int maxResultSize) {
-        setMaxResultSize(maxResultSize);
-        return this;
-    }
-
-    @Override
-    public ScanSpec withMaxPageSize(Integer maxPageSize) {
-        setMaxPageSize(maxPageSize);
-        return this;
-    }
-
-    @Override
-    public ScanSpec withMaxPageSize(int maxPageSize) {
-        setMaxPageSize(maxPageSize);
-        return this;
-    }
-}
diff --git a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/spec/UpdateItemSpec.java b/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/spec/UpdateItemSpec.java
deleted file mode 100644
index b2beecab7e77..000000000000
--- a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/spec/UpdateItemSpec.java
+++ /dev/null
@@ -1,238 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.document.spec;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import software.amazon.awssdk.services.dynamodb.document.AttributeUpdate;
-import software.amazon.awssdk.services.dynamodb.document.Expected;
-import software.amazon.awssdk.services.dynamodb.document.KeyAttribute;
-import software.amazon.awssdk.services.dynamodb.document.PrimaryKey;
-import software.amazon.awssdk.services.dynamodb.model.ReturnConsumedCapacity;
-import software.amazon.awssdk.services.dynamodb.model.ReturnItemCollectionMetrics;
-import software.amazon.awssdk.services.dynamodb.model.ReturnValue;
-import software.amazon.awssdk.services.dynamodb.model.UpdateItemRequest;
-
-/**
- * Full parameter specification for the UpdateItem API.
- */
-public class UpdateItemSpec extends AbstractSpecWithPrimaryKey<UpdateItemRequest> {
-    private List<AttributeUpdate> attributes;
-    private Collection<Expected> expected;
-
-    private Map<String, String> nameMap;
-    private Map<String, Object> valueMap;
-
-    public UpdateItemSpec() {
-        super(UpdateItemRequest.builder().build());
-    }
-
-    @Override
-    public UpdateItemSpec withPrimaryKey(KeyAttribute... components) {
-        super.withPrimaryKey(components);
-        return this;
-    }
-
-    @Override
-    public UpdateItemSpec withPrimaryKey(PrimaryKey primaryKey) {
-        super.withPrimaryKey(primaryKey);
-        return this;
-    }
-
-    @Override
-    public UpdateItemSpec withPrimaryKey(String hashKeyName, Object hashKeyValue) {
-        super.withPrimaryKey(hashKeyName, hashKeyValue);
-        return this;
-    }
-
-    @Override
-    public UpdateItemSpec withPrimaryKey(String hashKeyName, Object hashKeyValue,
-                                         String rangeKeyName, Object rangeKeyValue) {
-        super.withPrimaryKey(hashKeyName, hashKeyValue, rangeKeyName, rangeKeyValue);
-        return this;
-    }
-
-    public List<AttributeUpdate> getAttributeUpdate() {
-        return attributes;
-    }
-
-    public UpdateItemSpec withAttributeUpdate(
-            List<AttributeUpdate> attributeUpdates) {
-        this.attributes = attributeUpdates;
-        return this;
-    }
-
-    public UpdateItemSpec withAttributeUpdate(
-            AttributeUpdate... attributeUpdates) {
-        this.attributes = new ArrayList<AttributeUpdate>(Arrays.asList(attributeUpdates));
-        return this;
-    }
-
-    public UpdateItemSpec addAttributeUpdate(AttributeUpdate attributeUpdate) {
-        if (null == this.attributes) {
-            this.attributes = new ArrayList<AttributeUpdate>();
-        }
-        this.attributes.add(attributeUpdate);
-        return this;
-    }
-
-    public UpdateItemSpec clearAttributeUpdate() {
-        this.attributes = null;
-        return this;
-    }
-
-    public Collection<Expected> getExpected() {
-        return expected;
-    }
-
-    public UpdateItemSpec withExpected(Expected... expected) {
-        if (expected == null) {
-            this.expected = null;
-            return this;
-        }
-        return withExpected(Arrays.asList(expected));
-    }
-
-    public UpdateItemSpec withExpected(Collection<Expected> expected) {
-        if (expected == null) {
-            this.expected = null;
-            return this;
-        }
-        Set<String> names = new LinkedHashSet<String>();
-        for (Expected e : expected) {
-            names.add(e.getAttribute());
-        }
-        if (names.size() != expected.size()) {
-            throw new IllegalArgumentException(
-                    "attribute names must not duplicate in the list of expected");
-        }
-        this.expected = Collections.unmodifiableCollection(expected);
-        return this;
-    }
-
-    public String getUpdateExpression() {
-        return getRequest().updateExpression();
-    }
-
-    public UpdateItemSpec withUpdateExpression(String updateExpression) {
-        setRequest(getRequest().toBuilder().updateExpression(updateExpression).build());
-        return this;
-    }
-
-    public String getConditionExpression() {
-        return getRequest().conditionExpression();
-    }
-
-    public UpdateItemSpec withConditionExpression(String conditionExpression) {
-        setRequest(getRequest().toBuilder().conditionExpression(conditionExpression).build());
-        return this;
-    }
-
-    public Map<String, String> nameMap() {
-        return nameMap;
-    }
-
-    /**
-     * Applicable only when an expression has been specified.
-     * Used to specify the actual values for the attribute-name placeholders,
-     * where the value in the map can either be string for simple attribute
-     * name, or a JSON path expression.
-     */
-    public UpdateItemSpec withNameMap(Map<String, String> nameMap) {
-        if (nameMap == null) {
-            this.nameMap = null;
-        } else {
-            this.nameMap = Collections.unmodifiableMap(
-                    new LinkedHashMap<String, String>(nameMap));
-        }
-        return this;
-    }
-
-    public Map<String, Object> valueMap() {
-        return valueMap;
-    }
-
-    /**
-     * Applicable only when an expression has been specified. Used to
-     * specify the actual values for the attribute-value placeholders.
-     */
-    public UpdateItemSpec valueMap(Map<String, Object> valueMap) {
-        if (valueMap == null) {
-            this.valueMap = null;
-        } else {
-            this.valueMap = Collections.unmodifiableMap(
-                    new LinkedHashMap<String, Object>(valueMap));
-        }
-        return this;
-    }
-
-    public String getConditionalOperator() {
-        return getRequest().conditionalOperatorAsString();
-    }
-
-    public String getReturnConsumedCapacity() {
-        return getRequest().returnConsumedCapacityAsString();
-    }
-
-    public UpdateItemSpec withReturnConsumedCapacity(
-            String returnConsumedCapacity) {
-        setRequest(getRequest().toBuilder().returnConsumedCapacity(returnConsumedCapacity).build());
-        return this;
-    }
-
-    public UpdateItemSpec withReturnConsumedCapacity(
-            ReturnConsumedCapacity returnConsumedCapacity) {
-        setRequest(getRequest().toBuilder().returnConsumedCapacity(returnConsumedCapacity).build());
-        return this;
-    }
-
-    public String getReturnItemCollectionMetrics() {
-        return getRequest().returnItemCollectionMetricsAsString();
-    }
-
-    public UpdateItemSpec withReturnItemCollectionMetrics(
-            ReturnItemCollectionMetrics returnItemCollectionMetrics) {
-        setRequest(getRequest().toBuilder().returnItemCollectionMetrics(returnItemCollectionMetrics).build());
-        return this;
-    }
-
-    public UpdateItemSpec withReturnItemCollectionMetrics(
-            String returnItemCollectionMetrics) {
-        setRequest(getRequest().toBuilder().returnItemCollectionMetrics(returnItemCollectionMetrics).build());
-        return this;
-    }
-
-    public String getReturnValues() {
-        return getRequest().returnValuesAsString();
-    }
-
-    public UpdateItemSpec withReturnValues(ReturnValue returnValues) {
-        setRequest(getRequest().toBuilder().returnValues(returnValues).build());
-        return this;
-    }
-
-    public UpdateItemSpec withReturnValues(String returnValues) {
-        setRequest(getRequest().toBuilder().returnValues(returnValues).build());
-        return this;
-    }
-}
diff --git a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/spec/UpdateTableSpec.java b/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/spec/UpdateTableSpec.java
deleted file mode 100644
index daba71deb2b4..000000000000
--- a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/spec/UpdateTableSpec.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.document.spec;
-
-import java.util.Collection;
-import java.util.List;
-import software.amazon.awssdk.services.dynamodb.model.AttributeDefinition;
-import software.amazon.awssdk.services.dynamodb.model.GlobalSecondaryIndexUpdate;
-import software.amazon.awssdk.services.dynamodb.model.ProvisionedThroughput;
-import software.amazon.awssdk.services.dynamodb.model.UpdateTableRequest;
-
-/**
- * Full parameter specification for the UpdateTable API.
- */
-public class UpdateTableSpec extends AbstractSpec<UpdateTableRequest> {
-    public UpdateTableSpec() {
-        super(UpdateTableRequest.builder().build());
-    }
-
-    public ProvisionedThroughput getProvisionedThroughput() {
-        return getRequest().provisionedThroughput();
-    }
-
-    public UpdateTableSpec withProvisionedThroughput(
-            ProvisionedThroughput provisionedThroughput) {
-        setRequest(getRequest().toBuilder().provisionedThroughput(provisionedThroughput).build());
-        return this;
-    }
-
-    public List<AttributeDefinition> getAttributeDefinitions() {
-        return getRequest().attributeDefinitions();
-    }
-
-    public UpdateTableSpec withAttributeDefinitions(
-            AttributeDefinition... attributeDefinitions) {
-        setRequest(getRequest().toBuilder().attributeDefinitions(attributeDefinitions).build());
-        return this;
-    }
-
-    public UpdateTableSpec withAttributeDefinitions(
-            Collection<AttributeDefinition> attributeDefinitions) {
-        setRequest(getRequest().toBuilder().attributeDefinitions(attributeDefinitions).build());
-        return this;
-    }
-
-    public UpdateTableSpec withGlobalSecondaryIndexUpdates(
-            GlobalSecondaryIndexUpdate... globalSecondaryIndexUpdates) {
-        setRequest(getRequest().toBuilder().globalSecondaryIndexUpdates(
-                globalSecondaryIndexUpdates).build());
-        return this;
-    }
-
-    public UpdateTableSpec withGlobalSecondaryIndexUpdates(
-            Collection<GlobalSecondaryIndexUpdate> globalSecondaryIndexUpdates) {
-        setRequest(getRequest().toBuilder().globalSecondaryIndexUpdates(
-                globalSecondaryIndexUpdates)
-                .build());
-        return this;
-    }
-}
diff --git a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/utils/FluentArrayList.java b/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/utils/FluentArrayList.java
deleted file mode 100644
index 3e3ea920d218..000000000000
--- a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/utils/FluentArrayList.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.document.utils;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-/**
- * Utility subclass of {@link ArrayList} that supports fluent API.
- */
-public class FluentArrayList<E> extends ArrayList<E> {
-    private static final long serialVersionUID = -8269850815375778149L;
-
-    public FluentArrayList(int initialCapacity) {
-        super(initialCapacity);
-    }
-
-    public FluentArrayList() {
-        super();
-    }
-
-    //    @SafeVarargs
-    public FluentArrayList(E... elements) {
-        appendAll(elements);
-    }
-
-    public FluentArrayList(Collection<? extends E> c) {
-        super(c);
-    }
-
-    /**
-     * Fluent method to add the specified element to this list.
-     */
-    public FluentArrayList<E> append(E e) {
-        super.add(e);
-        return this;
-    }
-
-    /**
-     * Fluent method to remove the specified element from this list.
-     */
-    public FluentArrayList<E> delete(Object o) {
-        super.remove(o);
-        return this;
-    }
-
-    /**
-     * Fluent method to add the elements from the specified collection to this
-     * list.
-     */
-    public FluentArrayList<E> appendAll(Collection<? extends E> c) {
-        super.addAll(c);
-        return this;
-    }
-
-    /**
-     * Fluent method to add the elements to this list.
-     */
-    //    @SuppressWarnings("unchecked")
-    public FluentArrayList<E> appendAll(E... elements) {
-        if (elements != null) {
-            for (E e : elements) {
-                add(e);
-            }
-        }
-        return this;
-    }
-}
diff --git a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/utils/FluentHashMap.java b/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/utils/FluentHashMap.java
deleted file mode 100644
index 8574d7c7e106..000000000000
--- a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/utils/FluentHashMap.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.document.utils;
-
-import java.util.LinkedHashMap;
-
-/**
- * Utility subclass of {@link LinkedHashMap} that supports fluent API.
- */
-public class FluentHashMap<K, V> extends LinkedHashMap<K, V> {
-    private static final long serialVersionUID = 4857340227048063855L;
-
-    /**
-     * Fluent method to remove the specified key from this map.
-     */
-    public FluentHashMap<K, V> delete(Object key) {
-        remove(key);
-        return this;
-    }
-}
diff --git a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/utils/FluentHashSet.java b/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/utils/FluentHashSet.java
deleted file mode 100644
index 17b6a1bc4fac..000000000000
--- a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/utils/FluentHashSet.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.document.utils;
-
-import java.util.Collection;
-import java.util.LinkedHashSet;
-
-/**
- * Utility subclass of {@link LinkedHashSet} that supports fluent API.
- */
-public class FluentHashSet<E> extends LinkedHashSet<E> {
-    private static final long serialVersionUID = -549868294257559427L;
-
-    public FluentHashSet() {
-        super();
-    }
-
-    public FluentHashSet(Collection<? extends E> c) {
-        super(c);
-    }
-
-    //    @SafeVarargs
-    public FluentHashSet(E... elements) {
-        withAll(elements);
-    }
-
-    public FluentHashSet(int initialCapacity, float loadFactor) {
-        super(initialCapacity, loadFactor);
-    }
-
-    public FluentHashSet(int initialCapacity) {
-        super(initialCapacity);
-    }
-
-    /**
-     * Fluent method to add the specified element to this set.
-     */
-    public FluentHashSet<E> with(E e) {
-        super.add(e);
-        return this;
-    }
-
-    /**
-     * Fluent method to add the elements from the specified collection to this
-     * set.
-     */
-    public FluentHashSet<E> withAll(Collection<? extends E> c) {
-        super.addAll(c);
-        return this;
-    }
-
-    /**
-     * Fluent method to add the elements to this set.
-     */
-    //    @SuppressWarnings("unchecked")
-    public FluentHashSet<E> withAll(E... elements) {
-        if (elements != null) {
-            for (E e : elements) {
-                add(e);
-            }
-        }
-        return this;
-    }
-
-    /**
-     * Fluent method to remove the specified element from this set.
-     */
-    public FluentHashSet<E> delete(Object o) {
-        super.remove(o);
-        return this;
-    }
-}
diff --git a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/utils/NameMap.java b/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/utils/NameMap.java
deleted file mode 100644
index a9be53a62b5e..000000000000
--- a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/utils/NameMap.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.document.utils;
-
-
-/**
- * Utility class for name maps.
- */
-public class NameMap extends FluentHashMap<String, String> {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * Fluent method to sets the given key (attribute name place holder) to the
-     * specified value (the actual attribute name.)
-     */
-    public NameMap with(String key, String value) {
-        super.put(key, value);
-        return this;
-    }
-}
diff --git a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/utils/ValueList.java b/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/utils/ValueList.java
deleted file mode 100644
index c5fe0cb78bdb..000000000000
--- a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/utils/ValueList.java
+++ /dev/null
@@ -1,219 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.document.utils;
-
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import software.amazon.awssdk.services.dynamodb.document.internal.InternalUtils;
-
-/**
- * Utility value list.
- */
-public class ValueList extends FluentArrayList<Object> {
-    private static final long serialVersionUID = 1L;
-
-    public ValueList(int initialCapacity) {
-        super(initialCapacity);
-    }
-
-    public ValueList(Object... elements) {
-        super(elements);
-    }
-
-    public ValueList() {
-        super();
-    }
-
-    public ValueList(Collection<?> c) {
-        super(c);
-    }
-
-    public ValueList appendAll(Object... elements) {
-        super.appendAll(elements);
-        return this;
-    }
-
-    /**
-     * Appends the given value to this list.
-     */
-    public ValueList appendString(String val) {
-        super.append(val);
-        return this;
-    }
-
-    /**
-     * Appends the given value to this list.
-     */
-    public ValueList appendNumber(BigDecimal val) {
-        super.append(val);
-        return this;
-    }
-
-    /**
-     * Appends the given value to this list.
-     */
-    public ValueList appendNumber(Number val) {
-        super.append(InternalUtils.toBigDecimal(val));
-        return this;
-    }
-
-    /**
-     * Appends the given value to this list.
-     */
-    public ValueList appendInt(int val) {
-        return appendNumber(Integer.valueOf(val));
-    }
-
-    /**
-     * Appends the given value to this list.
-     */
-    public ValueList appendLong(long val) {
-        return appendNumber(Long.valueOf(val));
-    }
-
-    /**
-     * Appends the given value to this list.
-     */
-    public ValueList appendBinary(byte[] val) {
-        super.append(val);
-        return this;
-    }
-
-    /**
-     * Appends the given value to this list.
-     */
-    public ValueList appendStringSet(Set<String> val) {
-        super.append(val);
-        return this;
-    }
-
-    /**
-     * Appends the given values to this list as a string set.
-     */
-    public ValueList appendStringSet(String... val) {
-        super.append(new LinkedHashSet<String>(Arrays.asList(val)));
-        return this;
-    }
-
-    /**
-     * Appends the given value to this list.
-     */
-    public ValueList appendNumberSet(Set<BigDecimal> val) {
-        super.append(val);
-        return this;
-    }
-
-    /**
-     * Appends the given value to this list as a set of BigDecimals.
-     */
-    public ValueList appendNumberSet(BigDecimal... val) {
-        super.append(new LinkedHashSet<BigDecimal>(Arrays.asList(val)));
-        return this;
-    }
-
-    /**
-     * Appends the given values to this list as a number set.
-     */
-    public ValueList appendNumberSet(Number... val) {
-        super.append(InternalUtils.toBigDecimalSet(val));
-        return this;
-    }
-
-    /**
-     * Appends the given value to this list.
-     */
-    public ValueList appendBinarySet(Set<byte[]> val) {
-        super.append(val);
-        return this;
-    }
-
-    /**
-     * Appends the given values to this list as a set of byte arrays.
-     */
-    public ValueList appendBinarySet(byte[]... val) {
-        super.append(new LinkedHashSet<byte[]>(Arrays.asList(val)));
-        return this;
-    }
-
-    /**
-     * Appends the given value to this list.
-     */
-    public ValueList appendList(List<?> val) {
-        super.append(new ArrayList<Object>(val));
-        return this;
-    }
-
-    /**
-     * Appends the given values to this list as a list.
-     */
-    public ValueList appendList(Object... vals) {
-        super.append(new ArrayList<Object>(Arrays.asList(vals)));
-        return this;
-    }
-
-    /**
-     * Appends the given value to this list.
-     */
-    public ValueList appendMap(Map<String, ?> val) {
-        super.append(val);
-        return this;
-    }
-
-    /**
-     * Appends the given value to this list.
-     */
-    public ValueList appendBoolean(boolean val) {
-        super.append(Boolean.valueOf(val));
-        return this;
-    }
-
-    /**
-     * Appends a null value to this list.
-     */
-    public ValueList appendNull() {
-        super.append(null);
-        return this;
-    }
-
-    /**
-     * Appends the given value to this list. A value can be a
-     * <ul>
-     * <li>Number</li>
-     * <li>String</li>
-     * <li>binary (ie byte array or byte buffer)</li>
-     * <li>boolean</li>
-     * <li>null</li>
-     * <li>list (of any of the types on this list)</li>
-     * <li>map (append string key to value of any of the types on this list)</li>
-     * <li>set (of any of the types on this list)</li>
-     * </ul>
-     */
-    public ValueList append(Object val) {
-        if (val == this) {
-            throw new IllegalArgumentException("Self reference is not allowed");
-        }
-        // TODO: fail fast if val is not a supported type
-        super.append(val);
-        return this;
-    }
-
-}
diff --git a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/utils/ValueMap.java b/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/utils/ValueMap.java
deleted file mode 100644
index c11ee95d5de8..000000000000
--- a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/utils/ValueMap.java
+++ /dev/null
@@ -1,230 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.document.utils;
-
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import software.amazon.awssdk.core.util.json.JacksonUtils;
-import software.amazon.awssdk.services.dynamodb.document.internal.InternalUtils;
-import software.amazon.awssdk.services.dynamodb.document.internal.ItemValueConformer;
-
-
-/**
- * Utility class for value maps.
- */
-public class ValueMap extends FluentHashMap<String, Object> {
-    private static final long serialVersionUID = 1L;
-    private static final ItemValueConformer VALUE_CONFORMER = new ItemValueConformer();
-
-    /**
-     * Sets the value of the specified key in the current ValueMap to the
-     * given value.
-     */
-    public ValueMap withString(String key, String val) {
-        super.put(key, val);
-        return this;
-    }
-
-    /**
-     * Sets the value of the specified key in the current ValueMap to the
-     * given value.
-     */
-    public ValueMap withNumber(String key, BigDecimal val) {
-        super.put(key, val);
-        return this;
-    }
-
-    /**
-     * Sets the value of the specified key in the current ValueMap to the
-     * given value.
-     */
-    public ValueMap withNumber(String key, Number val) {
-        super.put(key, InternalUtils.toBigDecimal(val));
-        return this;
-    }
-
-    /**
-     * Sets the value of the specified key in the current ValueMap to the
-     * given value.
-     */
-    public ValueMap withInt(String key, int val) {
-        return withNumber(key, Integer.valueOf(val));
-    }
-
-    /**
-     * Sets the value of the specified key in the current ValueMap to the
-     * given value.
-     */
-    public ValueMap withLong(String key, long val) {
-        return withNumber(key, Long.valueOf(val));
-    }
-
-
-    /**
-     * Sets the value of the specified key in the current ValueMap to the
-     * given value.
-     */
-    public ValueMap withBinary(String key, byte[] val) {
-        super.put(key, val);
-        return this;
-    }
-
-    /**
-     * Sets the value of the specified key in the current ValueMap to the
-     * given value.
-     */
-    public ValueMap withStringSet(String key, Set<String> val) {
-        super.put(key, val);
-        return this;
-    }
-
-    /**
-     * Sets the value of the specified key in the current ValueMap to the
-     * given value.
-     */
-    public ValueMap withStringSet(String key, String... val) {
-        super.put(key, new LinkedHashSet<String>(Arrays.asList(val)));
-        return this;
-    }
-
-
-    /**
-     * Sets the value of the specified key in the current ValueMap to the
-     * given value.
-     */
-    public ValueMap withNumberSet(String key, Set<BigDecimal> val) {
-        super.put(key, val);
-        return this;
-    }
-
-    /**
-     * Sets the value of the specified key in the current ValueMap to the
-     * given value.
-     */
-    public ValueMap withNumberSet(String key, BigDecimal... val) {
-        super.put(key, new LinkedHashSet<BigDecimal>(Arrays.asList(val)));
-        return this;
-    }
-
-    /**
-     * Sets the value of the specified key in the current ValueMap to the
-     * given value.
-     */
-    public ValueMap withNumberSet(String key, Number... val) {
-        super.put(key, InternalUtils.toBigDecimalSet(val));
-        return this;
-    }
-
-    /**
-     * Sets the value of the specified key in the current ValueMap to the
-     * given value.
-     */
-    public ValueMap withBinarySet(String key, Set<byte[]> val) {
-        super.put(key, val);
-        return this;
-    }
-
-    /**
-     * Sets the value of the specified key in the current ValueMap to the
-     * given value.
-     */
-    public ValueMap withBinarySet(String key, byte[]... val) {
-        super.put(key, new LinkedHashSet<byte[]>(Arrays.asList(val)));
-        return this;
-    }
-
-    /**
-     * Sets the value of the specified key in the current ValueMap to the
-     * given value.
-     */
-    public ValueMap withList(String key, List<?> val) {
-        super.put(key, val == null ? null : new ArrayList<Object>(val));
-        return this;
-    }
-
-    /**
-     * Sets the value of the specified key in the current ValueMap to the
-     * given values as a list.
-     */
-    public ValueMap withList(String key, Object... vals) {
-        super.put(key,
-                  vals == null ? null : new ArrayList<Object>(Arrays.asList(vals)));
-        return this;
-    }
-
-    /**
-     * Sets the value of the specified key in the current ValueMap to the
-     * given value.
-     */
-    public ValueMap withMap(String key, Map<String, ?> val) {
-        super.put(key, val);
-        return this;
-    }
-
-    /**
-     * Sets the value of the specified key in the current ValueMap to the
-     * boolean value.
-     */
-    public ValueMap withBoolean(String key, boolean val) {
-        super.put(key, Boolean.valueOf(val));
-        return this;
-    }
-
-    /**
-     * Sets the value of the specified key to null.
-     */
-    public ValueMap withNull(String key) {
-        super.put(key, null);
-        return this;
-    }
-
-    /**
-     * Sets the value of the specified key to an object represented by the JSON
-     * structure passed.
-     */
-    public ValueMap withJson(String key, String jsonValue) {
-        super.put(key, VALUE_CONFORMER.transform(JacksonUtils.fromJsonString(jsonValue, Object.class)));
-        return this;
-    }
-
-    /**
-     * Sets the value of the specified key to the given value. A
-     * value can be a
-     * <ul>
-     * <li>Number</li>
-     * <li>String</li>DefaultMetricCollectorFactory
-     * <li>binary (ie byte array or byte buffer)</li>
-     * <li>boolean</li>
-     * <li>null</li>
-     * <li>list (of any of the types on this list)</li>
-     * <li>map (with string key to value of any of the types on this list)</li>
-     * <li>set (of any of the types on this list)</li>
-     * </ul>
-     */
-    public ValueMap with(String key, Object val) {
-        if (val == this) {
-            throw new IllegalArgumentException("Self reference is not allowed");
-        }
-        // TODO: fail fast if val is not a supported type
-        super.put(key, val);
-        return this;
-    }
-}
diff --git a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/utils/ValueMapAndWithJsonSupportTest.java b/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/utils/ValueMapAndWithJsonSupportTest.java
deleted file mode 100644
index 022ae23ec5b1..000000000000
--- a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/document/utils/ValueMapAndWithJsonSupportTest.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.document.utils;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.core.IsCollectionContaining.hasItems;
-import static org.junit.Assert.assertThat;
-
-import java.util.List;
-import java.util.Map;
-import org.junit.Test;
-import software.amazon.awssdk.core.exception.SdkClientException;
-
-
-public class ValueMapAndWithJsonSupportTest {
-
-    private static final String NO_JSON_STRING = "nojson";
-    private static final String KEY = "somekey";
-
-    @Test(expected = SdkClientException.class)
-    public void valueMapCreationshouldFailIfNoJsonstringIsUsedAsValue() {
-        new ValueMap().withJson("a", NO_JSON_STRING);
-    }
-
-    @Test
-    @SuppressWarnings("unchecked")
-    public void valueMapShouldReturnAProperDeserializedJsonMap() {
-        String json = "{ \"fruit\" : \"pear\" , \"color\" : \"green\" }";
-
-        ValueMap valueMap = new ValueMap().withJson(KEY, json);
-        Map<String, Object> actual = (Map<String, Object>) valueMap.get(KEY);
-
-        assertThat(actual.size(), is(2));
-        assertThat((String) actual.get("fruit"), is("pear"));
-        assertThat((String) actual.get("color"), is("green"));
-    }
-
-    @Test
-    @SuppressWarnings("unchecked")
-    public void valueMapShouldReturnAProperDeserializedJsonList() {
-        String json = "[\"red\",\"green\",\"blue\"]";
-
-        ValueMap valueMap = new ValueMap().withJson(KEY, json);
-        List<String> actual = (List<String>) valueMap.get(KEY);
-
-        assertThat(actual.size(), is(3));
-        assertThat(actual, hasItems("red", "green", "blue"));
-    }
-
-}
diff --git a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/util/TableUtils.java b/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/util/TableUtils.java
deleted file mode 100644
index c85b577d77b0..000000000000
--- a/test/dynamodbdocument-v1/src/test/java/software/amazon/awssdk/services/dynamodb/util/TableUtils.java
+++ /dev/null
@@ -1,263 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.util;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import software.amazon.awssdk.core.exception.SdkClientException;
-import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
-import software.amazon.awssdk.services.dynamodb.model.CreateTableRequest;
-import software.amazon.awssdk.services.dynamodb.model.DeleteTableRequest;
-import software.amazon.awssdk.services.dynamodb.model.DescribeTableRequest;
-import software.amazon.awssdk.services.dynamodb.model.ResourceInUseException;
-import software.amazon.awssdk.services.dynamodb.model.ResourceNotFoundException;
-import software.amazon.awssdk.services.dynamodb.model.TableDescription;
-import software.amazon.awssdk.services.dynamodb.model.TableStatus;
-
-/**
- * Utility methods for working with DynamoDB tables.
- *
- * <pre class="brush: java">
- * // ... create DynamoDB table ...
- * try {
- *     waitUntilActive(dynamoDB, myTableName());
- * } catch (SdkClientException e) {
- *     // table didn't become active
- * }
- * // ... start making calls to table ...
- * </pre>
- */
-public class TableUtils {
-
-    private static final int DEFAULT_WAIT_TIMEOUT = 10 * 60 * 1000;
-    private static final int DEFAULT_WAIT_INTERVAL = 20 * 1000;
-    /**
-     * The logging utility.
-     */
-    private static final Logger log = LoggerFactory.getLogger(TableUtils.class);
-
-    /**
-     * Waits up to 10 minutes for a specified DynamoDB table to resolve,
-     * indicating that it exists. If the table doesn't return a result after
-     * this time, a SdkClientException is thrown.
-     *
-     * @param dynamo
-     *            The DynamoDB client to use to make requests.
-     * @param tableName
-     *            The name of the table being resolved.
-     *
-     * @throws SdkClientException
-     *             If the specified table does not resolve before this method
-     *             times out and stops polling.
-     * @throws InterruptedException
-     *             If the thread is interrupted while waiting for the table to
-     *             resolve.
-     */
-    public static void waitUntilExists(final DynamoDbClient dynamo, final String tableName)
-            throws InterruptedException {
-        waitUntilExists(dynamo, tableName, DEFAULT_WAIT_TIMEOUT, DEFAULT_WAIT_INTERVAL);
-    }
-
-    /**
-     * Waits up to a specified amount of time for a specified DynamoDB table to
-     * resolve, indicating that it exists. If the table doesn't return a result
-     * after this time, a SdkClientException is thrown.
-     *
-     * @param dynamo
-     *            The DynamoDB client to use to make requests.
-     * @param tableName
-     *            The name of the table being resolved.
-     * @param timeout
-     *            The maximum number of milliseconds to wait.
-     * @param interval
-     *            The poll interval in milliseconds.
-     *
-     * @throws SdkClientException
-     *             If the specified table does not resolve before this method
-     *             times out and stops polling.
-     * @throws InterruptedException
-     *             If the thread is interrupted while waiting for the table to
-     *             resolve.
-     */
-    public static void waitUntilExists(final DynamoDbClient dynamo, final String tableName, final int timeout,
-                                       final int interval) throws InterruptedException {
-        TableDescription table = waitForTableDescription(dynamo, tableName, null, timeout, interval);
-
-        if (table == null) {
-            throw SdkClientException.builder().message("Table " + tableName + " never returned a result").build();
-        }
-    }
-
-    /**
-     * Waits up to 10 minutes for a specified DynamoDB table to move into the
-     * <code>ACTIVE</code> state. If the table does not exist or does not
-     * transition to the <code>ACTIVE</code> state after this time, then
-     * SdkClientException is thrown.
-     *
-     * @param dynamo
-     *            The DynamoDB client to use to make requests.
-     * @param tableName
-     *            The name of the table whose status is being checked.
-     *
-     * @throws TableNeverTransitionedToStateException
-     *             If the specified table does not exist or does not transition
-     *             into the <code>ACTIVE</code> state before this method times
-     *             out and stops polling.
-     * @throws InterruptedException
-     *             If the thread is interrupted while waiting for the table to
-     *             transition into the <code>ACTIVE</code> state.
-     */
-    public static void waitUntilActive(final DynamoDbClient dynamo, final String tableName)
-            throws InterruptedException, TableNeverTransitionedToStateException {
-        waitUntilActive(dynamo, tableName, DEFAULT_WAIT_TIMEOUT, DEFAULT_WAIT_INTERVAL);
-    }
-
-    /**
-     * Waits up to a specified amount of time for a specified DynamoDB table to
-     * move into the <code>ACTIVE</code> state. If the table does not exist or
-     * does not transition to the <code>ACTIVE</code> state after this time,
-     * then a SdkClientException is thrown.
-     *
-     * @param dynamo
-     *            The DynamoDB client to use to make requests.
-     * @param tableName
-     *            The name of the table whose status is being checked.
-     * @param timeout
-     *            The maximum number of milliseconds to wait.
-     * @param interval
-     *            The poll interval in milliseconds.
-     *
-     * @throws TableNeverTransitionedToStateException
-     *             If the specified table does not exist or does not transition
-     *             into the <code>ACTIVE</code> state before this method times
-     *             out and stops polling.
-     * @throws InterruptedException
-     *             If the thread is interrupted while waiting for the table to
-     *             transition into the <code>ACTIVE</code> state.
-     */
-    public static void waitUntilActive(final DynamoDbClient dynamo, final String tableName, final int timeout,
-                                       final int interval) throws InterruptedException, TableNeverTransitionedToStateException {
-        TableDescription table = waitForTableDescription(dynamo, tableName, TableStatus.ACTIVE, timeout, interval);
-
-        if (table == null || !table.tableStatus().equals(TableStatus.ACTIVE)) {
-            throw new TableNeverTransitionedToStateException(tableName, TableStatus.ACTIVE);
-        }
-    }
-
-    /**
-     * Wait for the table to reach the desired status and returns the table
-     * description
-     *
-     * @param dynamo
-     *            Dynamo client to use
-     * @param tableName
-     *            Table name to poll status of
-     * @param desiredStatus
-     *            Desired {@link TableStatus} to wait for. If null this method
-     *            simply waits until DescribeTable returns something non-null
-     *            (i.e. any status)
-     * @param timeout
-     *            Timeout in milliseconds to continue to poll for desired status
-     * @param interval
-     *            Time to wait in milliseconds between poll attempts
-     * @return Null if DescribeTables never returns a result, otherwise the
-     *         result of the last poll attempt (which may or may not have the
-     *         desired state)
-     * @throws {@link
-     *             IllegalArgumentException} If timeout or interval is invalid
-     */
-    private static TableDescription waitForTableDescription(final DynamoDbClient dynamo, final String tableName,
-                                                            TableStatus desiredStatus, final int timeout, final int interval)
-            throws InterruptedException, IllegalArgumentException {
-        if (timeout < 0) {
-            throw new IllegalArgumentException("Timeout must be >= 0");
-        }
-        if (interval <= 0 || interval >= timeout) {
-            throw new IllegalArgumentException("Interval must be > 0 and < timeout");
-        }
-        long startTime = System.currentTimeMillis();
-        long endTime = startTime + timeout;
-
-        TableDescription table = null;
-        while (System.currentTimeMillis() < endTime) {
-            try {
-                table = dynamo.describeTable(DescribeTableRequest.builder().tableName(tableName).build()).table();
-                if (desiredStatus == null || table.tableStatus().equals(desiredStatus)) {
-                    return table;
-
-                }
-            } catch (ResourceNotFoundException rnfe) {
-                // ResourceNotFound means the table doesn't exist yet,
-                // so ignore this error and just keep polling.
-            }
-
-            Thread.sleep(interval);
-        }
-        return table;
-    }
-
-    /**
-     * Creates the table and ignores any errors if it already exists.
-     * @param dynamo The Dynamo client to use.
-     * @param createTableRequest The create table request.
-     * @return True if created, false otherwise.
-     */
-    public static boolean createTableIfNotExists(final DynamoDbClient dynamo, final CreateTableRequest createTableRequest) {
-        try {
-            dynamo.createTable(createTableRequest);
-            return true;
-        } catch (final ResourceInUseException e) {
-            if (log.isTraceEnabled()) {
-                log.trace("Table " + createTableRequest.tableName() + " already exists", e);
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Deletes the table and ignores any errors if it doesn't exist.
-     * @param dynamo The Dynamo client to use.
-     * @param deleteTableRequest The delete table request.
-     * @return True if deleted, false otherwise.
-     */
-    public static boolean deleteTableIfExists(final DynamoDbClient dynamo, final DeleteTableRequest deleteTableRequest) {
-        try {
-            dynamo.deleteTable(deleteTableRequest);
-            return true;
-        } catch (final ResourceNotFoundException e) {
-            if (log.isTraceEnabled()) {
-                log.trace("Table " + deleteTableRequest.tableName() + " does not exist", e);
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Thrown by {@link TableUtils} when a table never reaches a desired state
-     */
-    public static class TableNeverTransitionedToStateException extends SdkClientException {
-
-        private static final long serialVersionUID = 8920567021104846647L;
-
-        public TableNeverTransitionedToStateException(String tableName, TableStatus desiredStatus) {
-            super(SdkClientException.builder()
-                                    .message("Table " + tableName + " never transitioned to desired state of " +
-                                             desiredStatus.toString()));
-        }
-
-    }
-
-}
diff --git a/test/dynamodbmapper-v1/pom.xml b/test/dynamodbmapper-v1/pom.xml
deleted file mode 100644
index 086abd733ae6..000000000000
--- a/test/dynamodbmapper-v1/pom.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  ~ Copyright 2010-2019 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.
-  -->
-
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-         xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <artifactId>aws-sdk-java-pom</artifactId>
-        <groupId>software.amazon.awssdk</groupId>
-        <version>2.10.7-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <artifactId>dynamodbmapper-v1</artifactId>
-    <name>AWS Java SDK :: Test :: Amazon DynamoDB Mapper v1</name>
-    <description>DynamoDB Mapper largely unchanged from v1. The v1 Mapper is kept for testing purposes only. All classes are in the test directories to prevent use in application code.</description>
-    <url>https://aws.amazon.com/sdkforjava</url>
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>software.amazon.awssdk</groupId>
-                <artifactId>bom-internal</artifactId>
-                <version>${project.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
-    <dependencies>
-        <dependency>
-            <groupId>software.amazon.awssdk</groupId>
-            <artifactId>auth</artifactId>
-            <version>${awsjavasdk.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>software.amazon.awssdk</groupId>
-            <artifactId>regions</artifactId>
-            <version>${awsjavasdk.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>software.amazon.awssdk</groupId>
-            <artifactId>annotations</artifactId>
-            <version>${awsjavasdk.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>software.amazon.awssdk</groupId>
-            <artifactId>utils</artifactId>
-            <version>${awsjavasdk.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>software.amazon.awssdk</groupId>
-            <artifactId>sdk-core</artifactId>
-            <version>${awsjavasdk.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>software.amazon.awssdk</groupId>
-            <artifactId>aws-core</artifactId>
-            <version>${awsjavasdk.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <artifactId>test-utils</artifactId>
-            <groupId>software.amazon.awssdk</groupId>
-            <version>${awsjavasdk.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.assertj</groupId>
-            <artifactId>assertj-core</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <artifactId>dynamodb</artifactId>
-            <groupId>software.amazon.awssdk</groupId>
-            <version>${awsjavasdk.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <artifactId>s3</artifactId>
-            <groupId>software.amazon.awssdk</groupId>
-            <version>${awsjavasdk.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <artifactId>service-test-utils</artifactId>
-            <groupId>software.amazon.awssdk</groupId>
-            <version>${awsjavasdk.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <artifactId>junit</artifactId>
-            <groupId>junit</groupId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <artifactId>mockito-core</artifactId>
-            <groupId>org.mockito</groupId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/DynamoDBMapperIntegrationTestBase.java b/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/DynamoDBMapperIntegrationTestBase.java
deleted file mode 100644
index 2e47fbc9e3f5..000000000000
--- a/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/DynamoDBMapperIntegrationTestBase.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb;
-
-import java.nio.ByteBuffer;
-import java.util.HashSet;
-import java.util.Set;
-import software.amazon.awssdk.services.dynamodb.pojos.BinaryAttributeByteBufferClass;
-import utils.test.util.DynamoDBIntegrationTestBase;
-import utils.test.util.DynamoDBTestBase;
-
-public class DynamoDBMapperIntegrationTestBase extends DynamoDBIntegrationTestBase {
-
-    public static void setUpMapperTestBase() {
-        DynamoDBTestBase.setUpTestBase();
-    }
-
-    /*
-     * Utility methods
-     */
-    protected static BinaryAttributeByteBufferClass getUniqueByteBufferObject(int contentLength) {
-        BinaryAttributeByteBufferClass obj = new BinaryAttributeByteBufferClass();
-        obj.setKey(String.valueOf(startKey++));
-        obj.setBinaryAttribute(ByteBuffer.wrap(generateByteArray(contentLength)));
-        Set<ByteBuffer> byteBufferSet = new HashSet<ByteBuffer>();
-        byteBufferSet.add(ByteBuffer.wrap(generateByteArray(contentLength)));
-        obj.setBinarySetAttribute(byteBufferSet);
-        return obj;
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/GsiAlwaysUpdateIntegrationTest.java b/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/GsiAlwaysUpdateIntegrationTest.java
deleted file mode 100644
index 99836b9b2813..000000000000
--- a/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/GsiAlwaysUpdateIntegrationTest.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb;
-
-import static org.junit.Assert.assertNotEquals;
-
-import java.util.UUID;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import software.amazon.awssdk.regions.Region;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMapper;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMapperConfig;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbTableMapper;
-import software.amazon.awssdk.services.dynamodb.model.ProvisionedThroughput;
-import software.amazon.awssdk.services.dynamodb.model.ResourceNotFoundException;
-import software.amazon.awssdk.services.dynamodb.model.TableStatus;
-import software.amazon.awssdk.services.dynamodb.pojos.GsiWithAlwaysUpdateTimestamp;
-import software.amazon.awssdk.testutils.Waiter;
-
-public class GsiAlwaysUpdateIntegrationTest extends DynamoDBMapperIntegrationTestBase {
-
-    private static final String TABLE_NAME =
-            GsiAlwaysUpdateIntegrationTest.class.getSimpleName() + "-" + System.currentTimeMillis();
-
-    private DynamoDbClient ddb;
-    private DynamoDbTableMapper<GsiWithAlwaysUpdateTimestamp, String, String> mapper;
-
-    @Before
-    public void setup() {
-        ddb = DynamoDbClient.builder()
-                .region(Region.US_WEST_2)
-                .credentialsProvider(CREDENTIALS_PROVIDER_CHAIN)
-                .build();
-        mapper = new DynamoDbMapper(ddb, DynamoDbMapperConfig.builder()
-                .withTableNameOverride(new DynamoDbMapperConfig.TableNameOverride(TABLE_NAME))
-                .build()).newTableMapper(GsiWithAlwaysUpdateTimestamp.class);
-        mapper.createTable(ProvisionedThroughput.builder().readCapacityUnits(5L).writeCapacityUnits(5L).build());
-        Waiter.run(() -> ddb.describeTable(r -> r.tableName(TABLE_NAME)))
-              .ignoringException(ResourceNotFoundException.class)
-              .until(r -> r.table().tableStatus() == TableStatus.ACTIVE)
-              .orFail();
-    }
-
-    @After
-    public void tearDown() {
-        mapper.deleteTableIfExists();
-        Waiter.run(() -> ddb.describeTable(r -> r.tableName(TABLE_NAME)))
-              .untilException(ResourceNotFoundException.class)
-              .orFail();
-    }
-
-    @Test
-    public void pojoWithAlwaysGenerateGsi_SavesCorrectly() throws InterruptedException {
-        final String hashKey = UUID.randomUUID().toString();
-        final String rangeKey = UUID.randomUUID().toString();
-
-        mapper.save(new GsiWithAlwaysUpdateTimestamp()
-                .setHashKey(hashKey)
-                .setRangeKey(rangeKey));
-        final GsiWithAlwaysUpdateTimestamp created = mapper.load(hashKey, rangeKey);
-        // Have to store it since the mapper will auto update any generated values in the saved object.
-        Long createdDate = created.getLastModifiedDate();
-        // Need to wait a bit for the timestamps to actually be different
-        Thread.sleep(1000);
-        mapper.save(created);
-        final GsiWithAlwaysUpdateTimestamp updated = mapper.load(hashKey, rangeKey);
-        assertNotEquals(createdDate, updated.getLastModifiedDate());
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/TableUtils.java b/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/TableUtils.java
deleted file mode 100644
index 87919310b889..000000000000
--- a/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/TableUtils.java
+++ /dev/null
@@ -1,262 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import software.amazon.awssdk.core.exception.SdkClientException;
-import software.amazon.awssdk.services.dynamodb.model.CreateTableRequest;
-import software.amazon.awssdk.services.dynamodb.model.DeleteTableRequest;
-import software.amazon.awssdk.services.dynamodb.model.DescribeTableRequest;
-import software.amazon.awssdk.services.dynamodb.model.ResourceInUseException;
-import software.amazon.awssdk.services.dynamodb.model.ResourceNotFoundException;
-import software.amazon.awssdk.services.dynamodb.model.TableDescription;
-import software.amazon.awssdk.services.dynamodb.model.TableStatus;
-
-/**
- * Utility methods for working with DynamoDB tables.
- *
- * <pre class="brush: java">
- * // ... create DynamoDB table ...
- * try {
- *     waitUntilActive(dynamoDB, myTableName());
- * } catch (SdkClientException e) {
- *     // table didn't become active
- * }
- * // ... start making calls to table ...
- * </pre>
- */
-public class TableUtils {
-
-    private static final int DEFAULT_WAIT_TIMEOUT = 10 * 60 * 1000;
-    private static final int DEFAULT_WAIT_INTERVAL = 20 * 1000;
-    /**
-     * The logging utility.
-     */
-    private static final Logger log = LoggerFactory.getLogger(TableUtils.class);
-
-    /**
-     * Waits up to 10 minutes for a specified DynamoDB table to resolve,
-     * indicating that it exists. If the table doesn't return a result after
-     * this time, a SdkClientException is thrown.
-     *
-     * @param dynamo
-     *            The DynamoDB client to use to make requests.
-     * @param tableName
-     *            The name of the table being resolved.
-     *
-     * @throws SdkClientException
-     *             If the specified table does not resolve before this method
-     *             times out and stops polling.
-     * @throws InterruptedException
-     *             If the thread is interrupted while waiting for the table to
-     *             resolve.
-     */
-    public static void waitUntilExists(final DynamoDbClient dynamo, final String tableName)
-            throws InterruptedException {
-        waitUntilExists(dynamo, tableName, DEFAULT_WAIT_TIMEOUT, DEFAULT_WAIT_INTERVAL);
-    }
-
-    /**
-     * Waits up to a specified amount of time for a specified DynamoDB table to
-     * resolve, indicating that it exists. If the table doesn't return a result
-     * after this time, a SdkClientException is thrown.
-     *
-     * @param dynamo
-     *            The DynamoDB client to use to make requests.
-     * @param tableName
-     *            The name of the table being resolved.
-     * @param timeout
-     *            The maximum number of milliseconds to wait.
-     * @param interval
-     *            The poll interval in milliseconds.
-     *
-     * @throws SdkClientException
-     *             If the specified table does not resolve before this method
-     *             times out and stops polling.
-     * @throws InterruptedException
-     *             If the thread is interrupted while waiting for the table to
-     *             resolve.
-     */
-    public static void waitUntilExists(final DynamoDbClient dynamo, final String tableName, final int timeout,
-                                       final int interval) throws InterruptedException {
-        TableDescription table = waitForTableDescription(dynamo, tableName, null, timeout, interval);
-
-        if (table == null) {
-            throw SdkClientException.builder().message("Table " + tableName + " never returned a result").build();
-        }
-    }
-
-    /**
-     * Waits up to 10 minutes for a specified DynamoDB table to move into the
-     * <code>ACTIVE</code> state. If the table does not exist or does not
-     * transition to the <code>ACTIVE</code> state after this time, then
-     * SdkClientException is thrown.
-     *
-     * @param dynamo
-     *            The DynamoDB client to use to make requests.
-     * @param tableName
-     *            The name of the table whose status is being checked.
-     *
-     * @throws TableNeverTransitionedToStateException
-     *             If the specified table does not exist or does not transition
-     *             into the <code>ACTIVE</code> state before this method times
-     *             out and stops polling.
-     * @throws InterruptedException
-     *             If the thread is interrupted while waiting for the table to
-     *             transition into the <code>ACTIVE</code> state.
-     */
-    public static void waitUntilActive(final DynamoDbClient dynamo, final String tableName)
-            throws InterruptedException, TableNeverTransitionedToStateException {
-        waitUntilActive(dynamo, tableName, DEFAULT_WAIT_TIMEOUT, DEFAULT_WAIT_INTERVAL);
-    }
-
-    /**
-     * Waits up to a specified amount of time for a specified DynamoDB table to
-     * move into the <code>ACTIVE</code> state. If the table does not exist or
-     * does not transition to the <code>ACTIVE</code> state after this time,
-     * then a SdkClientException is thrown.
-     *
-     * @param dynamo
-     *            The DynamoDB client to use to make requests.
-     * @param tableName
-     *            The name of the table whose status is being checked.
-     * @param timeout
-     *            The maximum number of milliseconds to wait.
-     * @param interval
-     *            The poll interval in milliseconds.
-     *
-     * @throws TableNeverTransitionedToStateException
-     *             If the specified table does not exist or does not transition
-     *             into the <code>ACTIVE</code> state before this method times
-     *             out and stops polling.
-     * @throws InterruptedException
-     *             If the thread is interrupted while waiting for the table to
-     *             transition into the <code>ACTIVE</code> state.
-     */
-    public static void waitUntilActive(final DynamoDbClient dynamo, final String tableName, final int timeout,
-                                       final int interval) throws InterruptedException, TableNeverTransitionedToStateException {
-        TableDescription table = waitForTableDescription(dynamo, tableName, TableStatus.ACTIVE, timeout, interval);
-
-        if (table == null || !table.tableStatus().equals(TableStatus.ACTIVE)) {
-            throw new TableNeverTransitionedToStateException(tableName, TableStatus.ACTIVE);
-        }
-    }
-
-    /**
-     * Wait for the table to reach the desired status and returns the table
-     * description
-     *
-     * @param dynamo
-     *            Dynamo client to use
-     * @param tableName
-     *            Table name to poll status of
-     * @param desiredStatus
-     *            Desired {@link TableStatus} to wait for. If null this method
-     *            simply waits until DescribeTable returns something non-null
-     *            (i.e. any status)
-     * @param timeout
-     *            Timeout in milliseconds to continue to poll for desired status
-     * @param interval
-     *            Time to wait in milliseconds between poll attempts
-     * @return Null if DescribeTables never returns a result, otherwise the
-     *         result of the last poll attempt (which may or may not have the
-     *         desired state)
-     * @throws {@link
-     *             IllegalArgumentException} If timeout or interval is invalid
-     */
-    private static TableDescription waitForTableDescription(final DynamoDbClient dynamo, final String tableName,
-                                                            TableStatus desiredStatus, final int timeout, final int interval)
-            throws InterruptedException, IllegalArgumentException {
-        if (timeout < 0) {
-            throw new IllegalArgumentException("Timeout must be >= 0");
-        }
-        if (interval <= 0 || interval >= timeout) {
-            throw new IllegalArgumentException("Interval must be > 0 and < timeout");
-        }
-        long startTime = System.currentTimeMillis();
-        long endTime = startTime + timeout;
-
-        TableDescription table = null;
-        while (System.currentTimeMillis() < endTime) {
-            try {
-                table = dynamo.describeTable(DescribeTableRequest.builder().tableName(tableName).build()).table();
-                if (desiredStatus == null || table.tableStatus().equals(desiredStatus)) {
-                    return table;
-
-                }
-            } catch (ResourceNotFoundException rnfe) {
-                // ResourceNotFound means the table doesn't exist yet,
-                // so ignore this error and just keep polling.
-            }
-
-            Thread.sleep(interval);
-        }
-        return table;
-    }
-
-    /**
-     * Creates the table and ignores any errors if it already exists.
-     * @param dynamo The Dynamo client to use.
-     * @param createTableRequest The create table request.
-     * @return True if created, false otherwise.
-     */
-    public static boolean createTableIfNotExists(final DynamoDbClient dynamo, final CreateTableRequest createTableRequest) {
-        try {
-            dynamo.createTable(createTableRequest);
-            return true;
-        } catch (final ResourceInUseException e) {
-            if (log.isTraceEnabled()) {
-                log.trace("Table " + createTableRequest.tableName() + " already exists", e);
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Deletes the table and ignores any errors if it doesn't exist.
-     * @param dynamo The Dynamo client to use.
-     * @param deleteTableRequest The delete table request.
-     * @return True if deleted, false otherwise.
-     */
-    public static boolean deleteTableIfExists(final DynamoDbClient dynamo, final DeleteTableRequest deleteTableRequest) {
-        try {
-            dynamo.deleteTable(deleteTableRequest);
-            return true;
-        } catch (final ResourceNotFoundException e) {
-            if (log.isTraceEnabled()) {
-                log.trace("Table " + deleteTableRequest.tableName() + " does not exist", e);
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Thrown by {@link TableUtils} when a table never reaches a desired state
-     */
-    public static class TableNeverTransitionedToStateException extends SdkClientException {
-
-        private static final long serialVersionUID = 8920567021104846647L;
-
-        public TableNeverTransitionedToStateException(String tableName, TableStatus desiredStatus) {
-            super(SdkClientException.builder()
-                                    .message("Table " + tableName + " never transitioned to desired state of " +
-                                             desiredStatus.toString()));
-        }
-
-    }
-
-}
diff --git a/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/datamodeling/BatchLoadIntegrationTest.java b/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/datamodeling/BatchLoadIntegrationTest.java
deleted file mode 100644
index 166ab59766ef..000000000000
--- a/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/datamodeling/BatchLoadIntegrationTest.java
+++ /dev/null
@@ -1,252 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Collections;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
-import software.amazon.awssdk.services.dynamodb.DynamoDBMapperIntegrationTestBase;
-import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMapperConfig.ConsistentRead;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMapperConfig.SaveBehavior;
-import software.amazon.awssdk.services.dynamodb.mapper.NumberSetAttributeClass;
-import software.amazon.awssdk.services.dynamodb.model.BatchGetItemRequest;
-import software.amazon.awssdk.services.dynamodb.model.BatchGetItemResponse;
-import software.amazon.awssdk.services.dynamodb.model.DeleteTableRequest;
-import software.amazon.awssdk.services.dynamodb.pojos.RangeKeyClass;
-
-public class BatchLoadIntegrationTest extends DynamoDBMapperIntegrationTestBase {
-
-    // We don't start with the current system millis like other tests because
-    // it's out of the range of some data types
-    private static int start = 1;
-    private static int byteStart = 1;
-    private static int startKeyDebug = 1;
-    DynamoDbMapper mapper = new DynamoDbMapper(dynamo, DynamoDbMapperConfig.builder()
-                                                                           .withSaveBehavior(SaveBehavior.UPDATE)
-                                                                           .withConsistentReads(ConsistentRead.CONSISTENT)
-                                                                           .build());
-
-    @BeforeClass
-    public static void setUp() throws Exception {
-        setUpTableWithRangeAttribute();
-    }
-
-    @AfterClass
-    public static void tearDown() {
-        try {
-            dynamo.deleteTable(DeleteTableRequest.builder().tableName(TABLE_WITH_RANGE_ATTRIBUTE).build());
-        } catch (Exception e) {
-            // Ignore.
-        }
-        waitForTableToBecomeDeleted(TABLE_WITH_RANGE_ATTRIBUTE);
-    }
-
-    @Test
-    public void testBatchLoad() throws InterruptedException {
-        // To see whether batchGet can handle more than 100 items per request
-        final int numItems = 200;
-        List<NumberSetAttributeClass> objs = new ArrayList<NumberSetAttributeClass>();
-        List<KeyPair> keyPairs = new LinkedList<KeyPair>();
-        Class<?> clazz = null;
-        for (int i = 0; i < numItems; i++) {
-            NumberSetAttributeClass obj = getUniqueNumericObject();
-            objs.add(obj);
-            clazz = obj.getClass();
-            keyPairs.add(new KeyPair().withHashKey(obj.getKey()));
-        }
-
-        mapper.batchSave(objs);
-
-        Map<Class<?>, List<KeyPair>> itemsToGet = new HashMap<Class<?>, List<KeyPair>>();
-        Map<String, List<Object>> response = null;
-        itemsToGet.put(clazz, keyPairs);
-        response = mapper.batchLoad(itemsToGet);
-        List<Object> items = response.get(TABLE_NAME);
-        assertEquals(numItems, items.size());
-
-        for (Object item : items) {
-            assertTrue(objs.contains(item));
-        }
-    }
-
-    @Test
-    public void testMultipleTables() {
-        final int numItems = 55;
-        Map<Class<?>, List<KeyPair>> itemsToGet = new HashMap<Class<?>, List<KeyPair>>();
-        Class<?> clazz = null;
-        List<KeyPair> keyPairs = new LinkedList<KeyPair>();
-        List<Object> objs = new ArrayList<Object>();
-        for (int i = 0; i < numItems * 2; i++) {
-            NumberSetAttributeClass obj = getUniqueNumericObject();
-            clazz = obj.getClass();
-            keyPairs.add(new KeyPair().withHashKey(obj.getKey()));
-            objs.add(obj);
-        }
-        itemsToGet.put(clazz, keyPairs);
-        keyPairs = new LinkedList<KeyPair>();
-        for (int i = 0; i < numItems; i++) {
-            RangeKeyClass obj = getUniqueRangeKeyObject();
-            clazz = obj.getClass();
-            keyPairs.add(new KeyPair().withHashKey(obj.getKey()).withRangeKey(obj.getRangeKey()));
-            objs.add(obj);
-        }
-        itemsToGet.put(clazz, keyPairs);
-        Collections.shuffle(objs);
-
-        mapper.batchSave(objs);
-
-        Map<String, List<Object>> response = null;
-        itemsToGet.put(clazz, keyPairs);
-        response = mapper.batchLoad(itemsToGet);
-
-        List<Object> itemsFromTableOne = response.get(TABLE_NAME);
-        List<Object> itemsFromTableTwo = response.get(TABLE_WITH_RANGE_ATTRIBUTE);
-
-        assertEquals(numItems * 2, itemsFromTableOne.size());
-        assertEquals(numItems, itemsFromTableTwo.size());
-
-        for (Object item : itemsFromTableOne) {
-            assertTrue(objs.contains(item));
-        }
-
-        for (Object item : itemsFromTableTwo) {
-            assertTrue(objs.contains(item));
-        }
-    }
-
-    @Test
-    public void testBoudaryCases() {
-        // The request is an empty Map.
-        Map<Class<?>, List<KeyPair>> itemsToGet = new HashMap<Class<?>, List<KeyPair>>();
-        Map<String, List<Object>> response = null;
-        response = mapper.batchLoad(itemsToGet);
-        assertTrue(response.isEmpty());
-
-        // The request only contains invalid key pairs
-        List<KeyPair> keyPairs = new LinkedList<KeyPair>();
-        Class<?> clazz = getUniqueNumericObject().getClass();
-        keyPairs.add(new KeyPair().withHashKey("non-existent-key"));
-        itemsToGet.clear();
-        itemsToGet.put(clazz, keyPairs);
-        response = mapper.batchLoad(itemsToGet);
-        assertNotNull(response);
-        List<Object> items = response.get(TABLE_NAME);
-        assertNotNull(items);
-        assertEquals(0, items.size());
-
-        // The request does not contain any key pairs.
-        itemsToGet.put(clazz, new LinkedList<KeyPair>());
-        response = mapper.batchLoad(itemsToGet);
-        assertTrue(response.isEmpty());
-    }
-
-    @Test
-    public void testExponentialBackOffForBatchGetInMapper()
-            throws NoSuchFieldException, SecurityException,
-                   IllegalArgumentException, IllegalAccessException {
-        long startTime = System.currentTimeMillis();
-        long maxBackOffTimePerRetry = DynamoDbMapper.MAX_BACKOFF_IN_MILLISECONDS;
-        int NoOfRetries = DynamoDbMapper.BATCH_GET_MAX_RETRY_COUNT_ALL_KEYS;
-
-        List<Object> objs = new ArrayList<Object>();
-        NumberSetAttributeClass obj = getUniqueNumericObject();
-        objs.add(obj);
-        DynamoDbClient mockClient = mock(DynamoDbClient.class);
-        when(mockClient.batchGetItem(any(BatchGetItemRequest.class))).thenAnswer(new Answer<BatchGetItemResponse>() {
-            @Override
-            public BatchGetItemResponse answer(InvocationOnMock invocation) throws Throwable {
-                Thread.sleep(3000);
-                BatchGetItemResponse result = BatchGetItemResponse.builder()
-                        .responses(new HashMap<>())
-                        .unprocessedKeys(((BatchGetItemRequest) invocation.getArguments()[0]).requestItems())
-                        .build();
-                return result;
-            }
-        });
-        DynamoDbMapper mapper = new DynamoDbMapper(mockClient);
-        try {
-            mapper.batchLoad(objs);
-            fail("Expecting an exception due to exceed of number of retries.");
-        } catch (Exception e) {
-            e.printStackTrace();
-            long endTime = System.currentTimeMillis();
-            assertTrue(((endTime - startTime)) > (maxBackOffTimePerRetry
-                                                  * NoOfRetries));
-        }
-    }
-
-    private NumberSetAttributeClass getUniqueNumericObject() {
-        NumberSetAttributeClass obj = new NumberSetAttributeClass();
-        obj.setKey(String.valueOf(startKeyDebug++));
-        obj.setBigDecimalAttribute(toSet(new BigDecimal(startKey++), new BigDecimal(startKey++), new BigDecimal(startKey++)));
-        obj.setBigIntegerAttribute(
-                toSet(new BigInteger("" + startKey++), new BigInteger("" + startKey++), new BigInteger("" + startKey++)));
-        obj.setByteObjectAttribute(toSet(new Byte(nextByte()), new Byte(nextByte()), new Byte(nextByte())));
-        obj.setDoubleObjectAttribute(toSet(new Double("" + start++), new Double("" + start++), new Double("" + start++)));
-        obj.setFloatObjectAttribute(toSet(new Float("" + start++), new Float("" + start++), new Float("" + start++)));
-        obj.setIntegerAttribute(toSet(new Integer("" + start++), new Integer("" + start++), new Integer("" + start++)));
-        obj.setLongObjectAttribute(toSet(new Long("" + start++), new Long("" + start++), new Long("" + start++)));
-        obj.setBooleanAttribute(toSet(true, false));
-        obj.setDateAttribute(toSet(new Date(startKey++), new Date(startKey++), new Date(startKey++)));
-        Set<Calendar> cals = new HashSet<Calendar>();
-        for (Date d : obj.getDateAttribute()) {
-            Calendar cal = GregorianCalendar.getInstance();
-            cal.setTime(d);
-            cals.add(cal);
-        }
-        obj.setCalendarAttribute(toSet(cals));
-        return obj;
-    }
-
-    private RangeKeyClass getUniqueRangeKeyObject() {
-        RangeKeyClass obj = new RangeKeyClass();
-        obj.setKey(startKey++);
-        obj.setIntegerAttribute(toSet(start++, start++, start++));
-        obj.setBigDecimalAttribute(new BigDecimal(startKey++));
-        obj.setRangeKey(start++);
-        obj.setStringAttribute("" + startKey++);
-        obj.setStringSetAttribute(toSet("" + startKey++, "" + startKey++, "" + startKey++));
-        return obj;
-    }
-
-    private String nextByte() {
-        return "" + byteStart++ % Byte.MAX_VALUE;
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDBS3IntegrationTest.java b/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDBS3IntegrationTest.java
deleted file mode 100644
index c9e448162bf2..000000000000
--- a/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDBS3IntegrationTest.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-import static org.junit.Assert.assertEquals;
-
-import java.io.ByteArrayOutputStream;
-import java.util.UUID;
-import org.junit.Ignore;
-import org.junit.Test;
-import software.amazon.awssdk.core.sync.RequestBody;
-import software.amazon.awssdk.regions.Region;
-import software.amazon.awssdk.services.dynamodb.pojos.S3LinksTestClass;
-import software.amazon.awssdk.services.s3.model.PutObjectRequest;
-import software.amazon.awssdk.testutils.RandomTempFile;
-
-@Ignore
-// Revisit S3
-public class DynamoDBS3IntegrationTest extends DynamoDBS3IntegrationTestBase {
-
-    private static final long OBJECT_SIZE = 123;
-
-    @Test
-    public void testCredentialContext() throws Exception {
-        tryCreateItem(new DynamoDbMapper(dynamo, CREDENTIALS_PROVIDER_CHAIN));
-    }
-
-    @Test
-    public void testManuallyFilledContext() throws Exception {
-        DynamoDbMapper mapper = new DynamoDbMapper(dynamo, CREDENTIALS_PROVIDER_CHAIN);
-        S3ClientCache s3cc = mapper.s3ClientCache();
-        s3cc.useClient(s3East, Region.US_EAST_1);
-        s3cc.useClient(s3West, Region.US_WEST_2);
-        tryCreateItem(mapper);
-    }
-
-    public void tryCreateItem(DynamoDbMapper mapper) throws Exception {
-        String westKey = UUID.randomUUID().toString();
-        String eastKey = UUID.randomUUID().toString();
-
-        S3LinksTestClass obj = new S3LinksTestClass();
-        obj.setKey("" + ++startKey);
-        S3Link linkWest = mapper.createS3Link(Region.US_WEST_2, DynamoDBS3IntegrationTestBase.WEST_BUCKET, westKey);
-        obj.setS3LinkWest(linkWest);
-        mapper.save(obj);
-        obj = mapper.load(S3LinksTestClass.class, obj.getKey());
-
-        assertObjectDoesntExist(s3West, obj.s3LinkWest().bucketName(), westKey);
-
-        linkWest.getAmazonS3Client().putObject(PutObjectRequest.builder()
-                                                               .bucket(linkWest.bucketName())
-                                                               .key(linkWest.getKey())
-                                                               .build(),
-                                               RequestBody.fromFile(new RandomTempFile(westKey, OBJECT_SIZE)));
-
-        assertObjectExists(s3West, obj.s3LinkWest().bucketName(), westKey);
-
-        S3Link linkEast = mapper.createS3Link(Region.US_EAST_1, DynamoDBS3IntegrationTestBase.EAST_BUCKET, eastKey);
-        obj.setS3LinkEast(linkEast);
-        assertObjectDoesntExist(s3East, obj.s3LinkEast().bucketName(), eastKey);
-
-        linkEast.getAmazonS3Client().putObject(PutObjectRequest.builder()
-                                                               .bucket(linkEast.bucketName())
-                                                               .key(linkEast.getKey())
-                                                               .build(),
-                                               RequestBody.fromFile(new RandomTempFile(westKey, OBJECT_SIZE)));
-        mapper.save(obj);
-
-        assertObjectExists(s3West, obj.s3LinkWest().bucketName(), westKey);
-        assertObjectExists(s3East, obj.s3LinkEast().bucketName(), eastKey);
-
-        obj = mapper.load(S3LinksTestClass.class, obj.getKey());
-
-        assertEquals(westKey, obj.s3LinkWest().getKey());
-        assertEquals(eastKey, obj.s3LinkEast().getKey());
-        System.err.println(obj.s3LinkWest().toJson());
-        System.err.println(obj.s3LinkEast().toJson());
-        mapper.delete(obj);
-
-        // Test the convenience methods on S3Link
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        linkEast.downloadTo(baos);
-        assertEquals(OBJECT_SIZE, baos.toByteArray().length);
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDBS3IntegrationTestBase.java b/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDBS3IntegrationTestBase.java
deleted file mode 100644
index c344783974dd..000000000000
--- a/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDBS3IntegrationTestBase.java
+++ /dev/null
@@ -1,201 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-/*
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *    http://aws.amazon.com/apache2.0
- *
- * 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-import static org.junit.Assert.fail;
-import static software.amazon.awssdk.testutils.service.S3BucketUtils.temporaryBucketName;
-
-import java.util.Iterator;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import software.amazon.awssdk.core.exception.SdkServiceException;
-import software.amazon.awssdk.regions.Region;
-import software.amazon.awssdk.services.s3.S3Client;
-import software.amazon.awssdk.services.s3.model.CreateBucketConfiguration;
-import software.amazon.awssdk.services.s3.model.CreateBucketRequest;
-import software.amazon.awssdk.services.s3.model.DeleteBucketRequest;
-import software.amazon.awssdk.services.s3.model.DeleteObjectRequest;
-import software.amazon.awssdk.services.s3.model.HeadObjectRequest;
-import software.amazon.awssdk.services.s3.model.ListObjectsRequest;
-import software.amazon.awssdk.services.s3.model.ListObjectsResponse;
-import software.amazon.awssdk.services.s3.model.S3Object;
-import utils.test.util.DynamoDBIntegrationTestBase;
-
-public class DynamoDBS3IntegrationTestBase extends DynamoDBIntegrationTestBase {
-    public static final String WEST_BUCKET = temporaryBucketName("java-dynamo-s3-integ-test-west");
-    public static final String EAST_BUCKET = temporaryBucketName("java-dynamo-s3-integ-test-east");
-
-    protected static S3Client s3East;
-    protected static S3Client s3West;
-
-    @BeforeClass
-    public static void setUp() throws Exception {
-        DynamoDBIntegrationTestBase.setUp();
-        s3East = S3Client.builder()
-                         .credentialsProvider(CREDENTIALS_PROVIDER_CHAIN)
-                         .region(Region.US_EAST_1)
-                         .build();
-
-        s3West = S3Client.builder()
-                         .credentialsProvider(CREDENTIALS_PROVIDER_CHAIN)
-                         .region(Region.US_WEST_2)
-                         .build();
-
-        createBucket(s3East, EAST_BUCKET, null);
-        createBucket(s3West, WEST_BUCKET, Region.US_WEST_2.id());
-    }
-
-    @AfterClass
-    public static void tearDown() {
-        deleteBucketAndAllContents(s3East, EAST_BUCKET);
-        deleteBucketAndAllContents(s3West, WEST_BUCKET);
-    }
-
-    /**
-     * Deletes all objects in the specified bucket, and then deletes the bucket.
-     *
-     * @param s3         The AmazonS3 client to use.
-     * @param bucketName The bucket to empty and delete.
-     */
-    protected static void deleteBucketAndAllContents(S3Client s3, String bucketName) {
-        ListObjectsResponse response = s3.listObjects(ListObjectsRequest.builder()
-                                                                        .bucket(bucketName)
-                                                                        .build());
-
-        while (true) {
-            for (Iterator<?> iterator = response.contents().iterator(); iterator.hasNext(); ) {
-                S3Object objectSummary = (S3Object) iterator.next();
-                s3.deleteObject(DeleteObjectRequest.builder()
-                                                   .bucket(bucketName)
-                                                   .key(objectSummary.key())
-                                                   .build());
-            }
-
-            if (response.isTruncated()) {
-                response = s3.listObjects(ListObjectsRequest.builder()
-                                                            .marker(response.nextMarker())
-                                                            .bucket(bucketName)
-                                                            .build());
-            } else {
-                break;
-            }
-        }
-        ;
-
-        s3.deleteBucket(DeleteBucketRequest.builder().bucket(bucketName).build());
-    }
-
-    /**
-     * Creates a bucket and waits for it to exist.
-     *
-     * @param s3         The AmazonS# client to use.
-     * @param bucketName The name of the bucket to create.
-     */
-    protected static void createBucket(S3Client s3, String bucketName, String region) throws InterruptedException {
-        s3.createBucket(CreateBucketRequest.builder()
-                                           .bucket(bucketName)
-                                           .createBucketConfiguration(CreateBucketConfiguration.builder()
-                                                                                               .locationConstraint(region)
-                                                                                               .build())
-                                           .build());
-
-        Thread.sleep(1000);
-    }
-
-    protected static void maxPollTimeExceeded() {
-        throw new RuntimeException("Max poll time exceeded");
-    }
-
-    /**
-     * Asserts that the object stored in the specified bucket and key doesn't
-     * exist If it does exist, this method will fail the current test.
-     *
-     * @param s3         The AmazonS3 client to use.
-     * @param bucketName The name of the bucket containing the object to test.
-     * @param key        The key under which the object is stored in the specified
-     *                   bucket.
-     */
-    protected void assertObjectDoesntExist(S3Client s3, String bucketName, String key) throws Exception {
-        long timeoutTime = System.currentTimeMillis() + 10000;
-
-        while (true) {
-            try {
-                s3.headObject(HeadObjectRequest.builder().bucket(bucketName).key(key).build());
-                Thread.sleep(1000);
-                if (System.currentTimeMillis() > timeoutTime) {
-                    fail("object " + bucketName + "/" + key + " still exists");
-                }
-            } catch (SdkServiceException exception) {
-                /*
-                 * We expect a 404 indicating that the object version we requested
-                 * doesn't exist. If we get anything other than that, then we want
-                 * to let the exception keep going up the chain.
-                 */
-                if (exception.statusCode() != 404) {
-                    throw exception;
-                }
-                return; // doesn't exist!
-            }
-        }
-    }
-
-    /**
-     * Asserts that the object stored in the specified bucket and key exists. If
-     * it doesn't exist, this method will fail the current test.
-     *
-     * @param s3         The AmazonS3 client to use.
-     * @param bucketName The name of the bucket containing the object to test.
-     * @param key        The key under which the object is stored in the specified
-     *                   bucket.
-     */
-    protected void assertObjectExists(S3Client s3, String bucketName, String key) throws Exception {
-        long timeoutTime = System.currentTimeMillis() + 10000;
-
-        while (true) {
-            try {
-                s3.headObject(HeadObjectRequest.builder().bucket(bucketName).key(key).build());
-                return; // exists!
-            } catch (SdkServiceException exception) {
-                /*
-                 * We expect a 404 indicating that the object version we requested
-                 * doesn't exist. If we get anything other than that, then we want
-                 * to let the exception keep going up the chain.
-                 */
-                if (exception.statusCode() != 404) {
-                    throw exception;
-                }
-                Thread.sleep(1000);
-                if (System.currentTimeMillis() > timeoutTime) {
-                    fail("object " + bucketName + "/" + key + " doesn't exist");
-                }
-            }
-        }
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbMapperExpressionsIntegrationTest.java b/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbMapperExpressionsIntegrationTest.java
deleted file mode 100644
index 465ddf6a0894..000000000000
--- a/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbMapperExpressionsIntegrationTest.java
+++ /dev/null
@@ -1,368 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-import static org.junit.Assert.assertTrue;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import software.amazon.awssdk.utils.ImmutableMap;
-import software.amazon.awssdk.utils.ImmutableMap.Builder;
-import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
-import software.amazon.awssdk.services.dynamodb.model.AttributeDefinition;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-import software.amazon.awssdk.services.dynamodb.model.ComparisonOperator;
-import software.amazon.awssdk.services.dynamodb.model.Condition;
-import software.amazon.awssdk.services.dynamodb.model.ConditionalCheckFailedException;
-import software.amazon.awssdk.services.dynamodb.model.CreateTableRequest;
-import software.amazon.awssdk.services.dynamodb.model.DeleteTableRequest;
-import software.amazon.awssdk.services.dynamodb.model.ExpectedAttributeValue;
-import software.amazon.awssdk.services.dynamodb.model.KeySchemaElement;
-import software.amazon.awssdk.services.dynamodb.model.KeyType;
-import software.amazon.awssdk.services.dynamodb.model.ProvisionedThroughput;
-import software.amazon.awssdk.services.dynamodb.model.PutItemRequest;
-import software.amazon.awssdk.services.dynamodb.model.ResourceInUseException;
-import software.amazon.awssdk.services.dynamodb.model.ScalarAttributeType;
-import software.amazon.awssdk.services.dynamodb.model.TableStatus;
-import software.amazon.awssdk.testutils.Waiter;
-import software.amazon.awssdk.testutils.service.AwsTestBase;
-
-public class DynamoDbMapperExpressionsIntegrationTest extends AwsTestBase {
-
-    /**
-     * Reference to the mapper used for this testing
-     */
-    protected static DynamoDbMapper mapper;
-
-    /**
-     * Reference to the client being used by the mapper.
-     */
-    protected static DynamoDbClient client;
-
-    /**
-     * Table name to be used for this testing
-     */
-    static final String TABLENAME = "java-sdk-mapper-customer";
-
-    /**
-     * Attribute name of the hash key
-     */
-    private static final String HASH_KEY = "customerId";
-
-    /**
-     * Attribute name of the range key
-     */
-    private static final String RANGE_KEY = "addressType";
-
-    /**
-     * Status of the table
-     */
-    private static final String TABLE_STATUS_ACTIVE = "ACTIVE";
-
-    /**
-     * Sleep time in milli seconds for the table to become active.
-     */
-    private static final long SLEEP_TIME_IN_MILLIS = 5000;
-
-    /**
-     * Provisioned Throughput read capacity for the table.
-     */
-    private static final long READ_CAPACITY = 10;
-
-    /**
-     * Provisioned Throughput write capacity for the table.
-     */
-    private static final long WRITE_CAPACITY = 10;
-
-    private static final String FIRST_CUSTOMER_ID = "1000";
-    private static final String ADDRESS_TYPE_HOME = "home";
-    private static final String ADDRESS_TYPE_WORK = "work";
-
-    @BeforeClass
-    public static void setUp() throws FileNotFoundException, IOException,
-                                      InterruptedException {
-        setUpCredentials();
-        client = DynamoDbClient.builder().credentialsProvider(CREDENTIALS_PROVIDER_CHAIN).build();
-        mapper = new DynamoDbMapper(client);
-        try {
-            client.createTable(CreateTableRequest.builder()
-                                       .tableName(TABLENAME)
-                                       .keySchema(KeySchemaElement.builder().attributeName(HASH_KEY).keyType(KeyType.HASH).build(),
-                                                      KeySchemaElement.builder().attributeName(RANGE_KEY).keyType(KeyType.RANGE).build())
-                                       .attributeDefinitions(
-                                               AttributeDefinition.builder().attributeName(HASH_KEY).attributeType(ScalarAttributeType.N).build(),
-                                               AttributeDefinition.builder().attributeName(RANGE_KEY).attributeType(ScalarAttributeType.S).build())
-                                       .provisionedThroughput(ProvisionedThroughput.builder()
-                                               .readCapacityUnits(READ_CAPACITY)
-                                               .writeCapacityUnits(WRITE_CAPACITY)
-                                               .build())
-                    .build());
-        } catch (ResourceInUseException ex) {
-            ex.printStackTrace();
-        }
-        waitForTableCreation();
-        fillInData();
-    }
-
-    public static void fillInData() {
-        final Builder<String, AttributeValue> record1 = ImmutableMap
-                .builder();
-        record1.put(HASH_KEY, AttributeValue.builder().n(FIRST_CUSTOMER_ID).build())
-               .put(RANGE_KEY, AttributeValue.builder().s(ADDRESS_TYPE_WORK).build())
-               .put("AddressLine1",
-                    AttributeValue.builder().s("1918 8th Aven").build())
-               .put("city", AttributeValue.builder().s("seattle").build())
-               .put("state", AttributeValue.builder().s("WA").build())
-               .put("zipcode", AttributeValue.builder().n("98104").build());
-        final Builder<String, AttributeValue> record2 = ImmutableMap
-                .builder();
-        record2.put(HASH_KEY, AttributeValue.builder().n(FIRST_CUSTOMER_ID).build())
-               .put(RANGE_KEY, AttributeValue.builder().s(ADDRESS_TYPE_HOME).build())
-               .put("AddressLine1",
-                    AttributeValue.builder().s("15606 NE 40th ST").build())
-               .put("city", AttributeValue.builder().s("redmond").build())
-               .put("state", AttributeValue.builder().s("WA").build())
-               .put("zipcode", AttributeValue.builder().n("98052").build());
-
-        client.putItem(PutItemRequest.builder().tableName(TABLENAME).item(record1.build()).build());
-        client.putItem(PutItemRequest.builder().tableName(TABLENAME).item(record2.build()).build());
-    }
-
-    public static void waitForTableCreation() throws InterruptedException {
-        Waiter.run(() -> client.describeTable(r -> r.tableName(TABLENAME)))
-              .until(r -> r.table().tableStatus() == TableStatus.ACTIVE)
-              .orFail();
-    }
-
-    @AfterClass
-    public static void tearDown() throws Exception {
-        try {
-            if (client != null) {
-                client.deleteTable(DeleteTableRequest.builder().tableName(TABLENAME).build());
-            }
-        } catch (Exception e) {
-            // Ignored or expected.
-        } finally {
-            if (client != null) {
-                client.close();
-            }
-        }
-    }
-
-    /**
-     * Queries for a record based on hash and range key. Provider a filter
-     * expression that filters results.
-     */
-    @Test
-    public void testQueryFilterExpression() {
-        Customer customer = new Customer();
-        customer.setCustomerId(Long.valueOf(FIRST_CUSTOMER_ID));
-
-        DynamoDbQueryExpression<Customer> queryExpression =
-                new DynamoDbQueryExpression<Customer>()
-                        .withHashKeyValues(customer)
-                        .withRangeKeyCondition(RANGE_KEY, Condition.builder()
-                                .comparisonOperator(ComparisonOperator.EQ)
-                                .attributeValueList(AttributeValue.builder().s(ADDRESS_TYPE_HOME).build())
-                                .build());
-        PaginatedQueryList<Customer> results = mapper.query(Customer.class,
-                                                            queryExpression);
-        assertTrue(results.size() == 1);
-
-        final Builder<String, AttributeValue> builder = ImmutableMap
-                .builder();
-        builder.put(":zipcode", AttributeValue.builder().n("98109").build());
-
-        queryExpression = queryExpression
-                .withFilterExpression("zipcode = :zipcode")
-                .withExpressionAttributeValues(builder.build());
-        results = mapper.query(Customer.class, queryExpression);
-        assertTrue(results.size() == 0);
-    }
-
-    /**
-     * Queries using key condition expression.
-     */
-    @Test
-    public void testKeyConditionExpression() {
-        Customer customer = new Customer();
-        customer.setCustomerId(Long.valueOf(FIRST_CUSTOMER_ID));
-
-        DynamoDbQueryExpression<Customer> query =
-                new DynamoDbQueryExpression<Customer>()
-                        .withKeyConditionExpression(
-                                "customerId = :customerId AND addressType = :addressType");
-        final Builder<String, AttributeValue> builder =
-                ImmutableMap.builder();
-        builder.put(":customerId", AttributeValue.builder().n(FIRST_CUSTOMER_ID).build())
-               .put(":addressType", AttributeValue.builder().s(ADDRESS_TYPE_HOME).build())
-        ;
-        query.withExpressionAttributeValues(builder.build());
-
-        PaginatedQueryList<Customer> results = mapper.query(Customer.class, query);
-        assertTrue(results.size() == 1);
-
-        builder.put(":zipcode", AttributeValue.builder().n("98109").build());
-        query.withFilterExpression("zipcode = :zipcode")
-             .withExpressionAttributeValues(builder.build());
-
-        results = mapper.query(Customer.class, query);
-        assertTrue(results.size() == 0);
-    }
-
-    /**
-     * Scan the table and filters the results based on the filter expression
-     * provided.
-     */
-    @Test
-    public void testScanFilterExpression() {
-        Customer customer = new Customer();
-        customer.setCustomerId(Long.valueOf(FIRST_CUSTOMER_ID));
-
-        DynamoDbScanExpression scanExpression = new DynamoDbScanExpression();
-
-        PaginatedScanList<Customer> results = mapper.scan(Customer.class,
-                                                          scanExpression);
-        assertTrue(results.size() == 2);
-
-        final Builder<String, AttributeValue> attributeValueMapBuilder = ImmutableMap
-                .builder();
-        attributeValueMapBuilder
-                .put(":state", AttributeValue.builder().s("WA").build());
-
-        final Builder<String, String> attributeNameMapBuilder = ImmutableMap
-                .builder();
-        attributeNameMapBuilder.put("#statename", "state");
-
-        scanExpression = scanExpression
-                .withFilterExpression("#statename = :state")
-                .withExpressionAttributeValues(attributeValueMapBuilder.build())
-                .withExpressionAttributeNames(attributeNameMapBuilder.build());
-        results = mapper.scan(Customer.class, scanExpression);
-        assertTrue(results.size() == 2);
-    }
-
-    /**
-     * Performs delete operation with a condition expression specified. Delete
-     * should fail as the condition in the conditional expression evaluates to
-     * false.
-     */
-    @Test
-    public void testDeleteConditionalExpression() {
-        Customer customer = new Customer();
-        customer.setCustomerId(Long.valueOf(FIRST_CUSTOMER_ID));
-        customer.setAddressType(ADDRESS_TYPE_WORK);
-
-        Builder<String, ExpectedAttributeValue> expectedMapBuilder = ImmutableMap
-                .builder();
-        expectedMapBuilder.put("zipcode", ExpectedAttributeValue.builder()
-                .attributeValueList(AttributeValue.builder().n("98052").build())
-                .comparisonOperator(ComparisonOperator.EQ).build());
-
-        DynamoDbDeleteExpression deleteExpression = new DynamoDbDeleteExpression();
-        deleteExpression.setConditionExpression("zipcode = :zipcode");
-
-        final Builder<String, AttributeValue> attributeValueMapBuilder = ImmutableMap
-                .builder();
-        attributeValueMapBuilder.put(":zipcode",
-                                     AttributeValue.builder().n("98052").build());
-        deleteExpression.setExpressionAttributeValues(attributeValueMapBuilder
-                                                              .build());
-        try {
-            mapper.delete(customer, deleteExpression);
-        } catch (Exception e) {
-            assertTrue(e instanceof ConditionalCheckFailedException);
-        }
-    }
-
-    // Note don't move Customer to top level, or else it would break the release
-    // pipeline, as the integration test will not be copied over causing
-    // compilation failure
-    @DynamoDbTable(tableName = DynamoDbMapperExpressionsIntegrationTest.TABLENAME)
-    public static class Customer {
-
-        private long customerId;
-
-        private String addressType;
-
-        private String addressLine1;
-
-        private String city;
-
-        private String state;
-
-        private int zipcode;
-
-        @DynamoDbAttribute(attributeName = "customerId")
-        @DynamoDbHashKey(attributeName = "customerId")
-        public long getCustomerId() {
-            return customerId;
-        }
-
-        public void setCustomerId(long customerId) {
-            this.customerId = customerId;
-        }
-
-        @DynamoDbAttribute(attributeName = "addressType")
-        @DynamoDbRangeKey(attributeName = "addressType")
-        public String getAddressType() {
-            return addressType;
-        }
-
-        public void setAddressType(String addressType) {
-            this.addressType = addressType;
-        }
-
-        @DynamoDbAttribute(attributeName = "AddressLine1")
-        public String getAddressLine1() {
-            return addressLine1;
-        }
-
-        public void setAddressLine1(String addressLine1) {
-            this.addressLine1 = addressLine1;
-        }
-
-        @DynamoDbAttribute(attributeName = "city")
-        public String getCity() {
-            return city;
-        }
-
-        public void setCity(String city) {
-            this.city = city;
-        }
-
-        @DynamoDbAttribute(attributeName = "state")
-        public String state() {
-            return state;
-        }
-
-        public void setState(String state) {
-            this.state = state;
-        }
-
-        @DynamoDbAttribute(attributeName = "zipcode")
-        public int getZipcode() {
-            return zipcode;
-        }
-
-        public void setZipcode(int zipcode) {
-            this.zipcode = zipcode;
-        }
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/datamodeling/EnumMarshallerIntegrationTest.java b/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/datamodeling/EnumMarshallerIntegrationTest.java
deleted file mode 100644
index 4a27f4184592..000000000000
--- a/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/datamodeling/EnumMarshallerIntegrationTest.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-
-import org.junit.Test;
-import software.amazon.awssdk.services.dynamodb.DynamoDBMapperIntegrationTestBase;
-
-/**
- * Status tests for {@code EnumMarshaller}.
- */
-public class EnumMarshallerIntegrationTest extends DynamoDBMapperIntegrationTestBase {
-
-    @Test
-    public void testNullEnumValue() {
-        final DynamoDbMapper mapper = new DynamoDbMapper(dynamo);
-
-        final TestObject object1 = new TestObject();
-
-        assertNull(object1.getStatus());
-
-        mapper.save(object1);
-
-        final TestObject object2 = mapper.load(TestObject.class, object1.getKey());
-
-        assertNull(object2.getStatus());
-    }
-
-    @Test
-    public void testMarshalling() {
-        final DynamoDbMapper mapper = new DynamoDbMapper(dynamo);
-
-        final TestObject object1 = new TestObject();
-
-        object1.setStatus(TestObject.Status.Y);
-
-        mapper.save(object1);
-
-        assertNotNull(object1.getKey());
-        assertNotNull(object1.getStatus());
-
-        final TestObject object2 = mapper.load(TestObject.class, object1.getKey());
-
-        assertEquals(object1.getKey(), object2.getKey());
-        assertEquals(object1.getStatus(), object2.getStatus());
-    }
-
-    @DynamoDbTable(tableName = "aws-java-sdk-util")
-    public static class TestObject {
-        private String key;
-
-
-        private Status status;
-
-
-
-        @DynamoDbHashKey
-        @DynamoDbAutoGeneratedKey
-        public String getKey() {
-            return this.key;
-        }
-
-        public void setKey(String key) {
-            this.key = key;
-        }
-
-        @DynamoDbMarshalling(marshallerClass = StatusEnumMarshaller.class)
-        public Status getStatus() {
-            return this.status;
-        }
-
-        public void setStatus(Status status) {
-            this.status = status;
-        }
-
-        public static enum Status {
-            X,
-            Y,
-            Z
-        }
-
-        public static class StatusEnumMarshaller extends AbstractEnumMarshaller<Status> {
-        }
-    }
-
-}
diff --git a/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/datamodeling/JsonIntegrationTest.java b/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/datamodeling/JsonIntegrationTest.java
deleted file mode 100644
index 2f9b1db9f33f..000000000000
--- a/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/datamodeling/JsonIntegrationTest.java
+++ /dev/null
@@ -1,242 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
-import software.amazon.awssdk.regions.Region;
-import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMapperConfig.TableNameOverride;
-import software.amazon.awssdk.services.dynamodb.model.CreateTableRequest;
-import software.amazon.awssdk.services.dynamodb.model.DeleteTableRequest;
-import software.amazon.awssdk.services.dynamodb.model.ProvisionedThroughput;
-import software.amazon.awssdk.services.dynamodb.model.ResourceNotFoundException;
-import software.amazon.awssdk.services.dynamodb.model.TableStatus;
-import software.amazon.awssdk.testutils.Waiter;
-import software.amazon.awssdk.testutils.service.AwsTestBase;
-
-public class JsonIntegrationTest extends AwsTestBase {
-
-    private static final String TABLE_NAME = "test-table-"
-                                             + UUID.randomUUID().toString();
-
-    private static DynamoDbClient client;
-    private static DynamoDbMapper mapper;
-
-    @BeforeClass
-    public static void setup() throws Exception {
-        setUpCredentials();
-        client = DynamoDbClient.builder().credentialsProvider(CREDENTIALS_PROVIDER_CHAIN).region(Region.US_WEST_2).build();
-
-        mapper = new DynamoDbMapper(
-                client,
-                new DynamoDbMapperConfig.Builder()
-                        .withConversionSchema(ConversionSchemas.V2)
-                        .withTableNameOverride(TableNameOverride
-                                                       .withTableNameReplacement(TABLE_NAME))
-                        .withConsistentReads(DynamoDbMapperConfig.ConsistentRead.CONSISTENT)
-                        .build());
-
-        CreateTableRequest request = mapper
-                .generateCreateTableRequest(TestClass.class).toBuilder()
-                .provisionedThroughput(ProvisionedThroughput.builder().readCapacityUnits(1L).writeCapacityUnits(1L).build())
-                .build();
-
-        client.createTable(request);
-
-        Waiter.run(() -> client.describeTable(r -> r.tableName(TABLE_NAME)))
-              .until(r -> r.table().tableStatus() == TableStatus.ACTIVE)
-              .orFail();
-    }
-
-    @AfterClass
-    public static void cleanup() {
-        if (client == null) {
-            return;
-        }
-
-        try {
-            client.deleteTable(DeleteTableRequest.builder().tableName(TABLE_NAME).build());
-        } catch (ResourceNotFoundException e) {
-            // Ignored or expected.
-        }
-    }
-
-    private static <T> boolean eq(T one, T two) {
-        if (one == null) {
-            return (two == null);
-        } else {
-            return one.equals(two);
-        }
-    }
-
-    @Test
-    @Ignore
-    public void testIt() {
-        final ChildClass child1 = new ChildClass();
-        child1.setBool(true);
-
-        final ChildClass child2 = new ChildClass();
-        child2.setBool(true);
-
-        final ChildClass parent = new ChildClass();
-        parent.setFirstChild(child1);
-        parent.setOtherChildren(Arrays.asList(child1, child2));
-        parent.setNamedChildren(new HashMap<String, ChildClass>() {{
-            put("one", child1);
-            put("two", child2);
-        }});
-
-        TestClass test = new TestClass();
-        test.setId("test");
-        test.setListOfMaps(Arrays.<Map<String, ChildClass>>asList(
-                new HashMap<String, ChildClass>() {{
-                    put("parent", parent);
-                }},
-                new HashMap<String, ChildClass>() {{
-                    put("parent", parent);
-                }},
-                null
-                                                                 ));
-        test.setMapOfLists(new HashMap<String, List<ChildClass>>() {{
-            put("parent", Arrays.asList(child1, child2));
-            put("child2", Collections.<ChildClass>emptyList());
-            put("child1", null);
-        }});
-
-        mapper.save(test);
-
-        TestClass result = mapper.load(TestClass.class, "test");
-
-        Assert.assertEquals(test, result);
-    }
-
-    @DynamoDbTable(tableName = "")
-    public static class TestClass {
-
-        private String id;
-        private List<Map<String, ChildClass>> listOfMaps;
-        private Map<String, List<ChildClass>> mapOfLists;
-
-        @DynamoDbHashKey
-        public String getId() {
-            return id;
-        }
-
-        public void setId(String id) {
-            this.id = id;
-        }
-
-        public List<Map<String, ChildClass>> getListOfMaps() {
-            return listOfMaps;
-        }
-
-        public void setListOfMaps(List<Map<String, ChildClass>> listOfMaps) {
-            this.listOfMaps = listOfMaps;
-        }
-
-        public Map<String, List<ChildClass>> getMapOfLists() {
-            return mapOfLists;
-        }
-
-        public void setMapOfLists(Map<String, List<ChildClass>> mapOfLists) {
-            this.mapOfLists = mapOfLists;
-        }
-
-        @Override
-        public boolean equals(Object obj) {
-            TestClass other = (TestClass) obj;
-
-            return (eq(id, other.id)
-                    && eq(listOfMaps, other.listOfMaps)
-                    && eq(mapOfLists, other.mapOfLists));
-        }
-
-        @Override
-        public String toString() {
-            return "{id=" + id + ", listOfMaps=" + listOfMaps + ", mapOfLists="
-                   + mapOfLists + "}";
-        }
-    }
-
-    @DynamoDbDocument
-    public static class ChildClass {
-
-        private boolean bool;
-
-        private ChildClass firstChild;
-        private List<ChildClass> otherChildren;
-        private Map<String, ChildClass> namedChildren;
-
-        public boolean isBool() {
-            return bool;
-        }
-
-        public void setBool(boolean bool) {
-            this.bool = bool;
-        }
-
-        public ChildClass getFirstChild() {
-            return firstChild;
-        }
-
-        public void setFirstChild(ChildClass firstChild) {
-            this.firstChild = firstChild;
-        }
-
-        public List<ChildClass> getOtherChildren() {
-            return otherChildren;
-        }
-
-        public void setOtherChildren(List<ChildClass> otherChildren) {
-            this.otherChildren = otherChildren;
-        }
-
-        public Map<String, ChildClass> getNamedChildren() {
-            return namedChildren;
-        }
-
-        public void setNamedChildren(Map<String, ChildClass> namedChildren) {
-            this.namedChildren = namedChildren;
-        }
-
-        @Override
-        public boolean equals(Object obj) {
-            ChildClass other = (ChildClass) obj;
-
-            return (eq(bool, other.bool)
-                    && eq(firstChild, other.firstChild)
-                    && eq(otherChildren, other.otherChildren)
-                    && eq(namedChildren, other.namedChildren));
-        }
-
-        @Override
-        public String toString() {
-            return "{bool=" + bool + ", firstChild=" + firstChild
-                   + ", otherChildren=" + otherChildren + ", namedChildren="
-                   + namedChildren + "}";
-        }
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/datamodeling/JsonMarshallerIntegrationTest.java b/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/datamodeling/JsonMarshallerIntegrationTest.java
deleted file mode 100644
index 29863e4130a6..000000000000
--- a/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/datamodeling/JsonMarshallerIntegrationTest.java
+++ /dev/null
@@ -1,244 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.UUID;
-import org.junit.Test;
-import software.amazon.awssdk.services.dynamodb.DynamoDBMapperIntegrationTestBase;
-
-/**
- * Status tests for {@code JsonMarshaller}.
- */
-public class JsonMarshallerIntegrationTest extends DynamoDBMapperIntegrationTestBase {
-
-    @Test
-    public void testMarshalling() {
-        final DynamoDbMapper mapper = new DynamoDbMapper(dynamo);
-
-        final TestObject object1 = new TestObject();
-        object1.setOneItem(new TestObject.OneItem());
-        object1.addOneItem(new TestObject.OneItem(UUID.randomUUID().toString(), 1));
-        object1.addOneItem(new TestObject.OneItem(UUID.randomUUID().toString(), 2));
-        object1.addOneItem(new TestObject.OneItem(UUID.randomUUID().toString(), 3));
-        object1.setTwoItem(new TestObject.TwoItem());
-        object1.addTwoItem(new TestObject.TwoItem(UUID.randomUUID().toString(), new Date()));
-
-        mapper.save(object1);
-
-        assertNotNull(object1.getKey());
-
-        assertNotNull(object1.getOneItem());
-        assertNotNull(object1.getOneItems());
-        assertEquals(3, object1.getOneItems().size());
-
-        assertNotNull(object1.getTwoItem());
-        assertNotNull(object1.getTwoItems());
-        assertEquals(1, object1.getTwoItems().size());
-
-        final TestObject object2 = mapper.load(TestObject.class, object1.getKey());
-
-        assertEquals(object1.getKey(), object2.getKey());
-
-        assertEquals(object1.getOneItem().getId(), object2.getOneItem().getId());
-        assertEquals(object1.getOneItem().getQuantity(), object2.getOneItem().getQuantity());
-        assertEquals(object1.getOneItems().size(), object2.getOneItems().size());
-
-        for (int i = 0, its = object1.getOneItems().size(); i < its; i++) {
-            assertEquals(object1.getOneItems().get(i).getId(), object2.getOneItems().get(i).getId());
-            assertEquals(object1.getOneItems().get(i).getQuantity(), object2.getOneItems().get(i).getQuantity());
-        }
-
-        assertEquals(object1.getTwoItem().getId(), object2.getTwoItem().getId());
-        assertEquals(object1.getTwoItem().getDate(), object2.getTwoItem().getDate());
-        assertEquals(object1.getTwoItems().size(), object2.getTwoItems().size());
-
-        for (int i = 0, its = object1.getTwoItems().size(); i < its; i++) {
-            assertEquals(object1.getTwoItems().get(i).getId(), object2.getTwoItems().get(i).getId());
-            assertEquals(object1.getTwoItems().get(i).getDate(), object2.getTwoItems().get(i).getDate());
-        }
-    }
-
-    @DynamoDbTable(tableName = "aws-java-sdk-util")
-    public static class TestObject {
-        private String key;
-
-
-        private OneItem aitem;
-
-
-        private List<OneItem> oneItems;
-
-
-        private TwoItem bitem;
-
-
-        private List<TwoItem> twoItems;
-
-        @DynamoDbHashKey
-        @DynamoDbAutoGeneratedKey
-        public String getKey() {
-            return this.key;
-        }
-
-        public void setKey(String key) {
-            this.key = key;
-        }
-
-        @DynamoDbMarshalling(marshallerClass = OneItemJsonMarshaller.class)
-        public OneItem getOneItem() {
-            return this.aitem;
-        }
-
-        public void setOneItem(OneItem aitem) {
-            this.aitem = aitem;
-        }
-
-        @DynamoDbMarshalling(marshallerClass = OneListJsonMarshaller.class)
-        public List<OneItem> getOneItems() {
-            return this.oneItems;
-        }
-
-        public void setOneItems(List<OneItem> oneItems) {
-            this.oneItems = oneItems;
-        }
-
-        public void addOneItem(OneItem aitem) {
-            if (this.oneItems == null) {
-                this.oneItems = new ArrayList<OneItem>();
-            }
-            this.oneItems.add(aitem);
-        }
-
-        @DynamoDbMarshalling(marshallerClass = TwoItemJsonMarshaller.class)
-        public TwoItem getTwoItem() {
-            return this.bitem;
-        }
-
-        public void setTwoItem(TwoItem bitem) {
-            this.bitem = bitem;
-        }
-
-        @DynamoDbMarshalling(marshallerClass = TwoListJsonMarshaller.class)
-        public List<TwoItem> getTwoItems() {
-            return this.twoItems;
-        }
-
-        public void setTwoItems(List<TwoItem> twoItems) {
-            this.twoItems = twoItems;
-        }
-
-        public void addTwoItem(TwoItem bitem) {
-            if (this.twoItems == null) {
-                this.twoItems = new ArrayList<TwoItem>();
-            }
-            this.twoItems.add(bitem);
-        }
-
-        public static class OneItemJsonMarshaller extends JsonMarshaller<OneItem> {
-        }
-
-        public static class OneListJsonMarshaller extends JsonMarshaller<OneListJsonMarshaller.Type> {
-            public OneListJsonMarshaller() {
-                super(Type.class);
-            }
-
-            ;
-
-            public static final class Type extends ArrayList<OneItem> {
-            }
-        }
-
-        public static class TwoItemJsonMarshaller extends JsonMarshaller<TwoItem> {
-        }
-
-        public static class TwoListJsonMarshaller extends JsonMarshaller<TwoListJsonMarshaller.Type> {
-            public TwoListJsonMarshaller() {
-                super(Type.class);
-            }
-
-            ;
-
-            public static final class Type extends ArrayList<TwoItem> {
-            }
-        }
-
-        public static class OneItem {
-            private String id;
-            private Integer quantity;
-
-            public OneItem(String id, Integer quantity) {
-                this.id = id;
-                this.quantity = quantity;
-            }
-
-            public OneItem() {
-                this(null, null);
-            }
-
-            public String getId() {
-                return this.id;
-            }
-
-            public void setId(String id) {
-                this.id = id;
-            }
-
-            public Integer getQuantity() {
-                return this.quantity;
-            }
-
-            public void setQuantity(Integer quantity) {
-                this.quantity = quantity;
-            }
-        }
-
-        public static class TwoItem {
-            private String id;
-            private Date date;
-
-            public TwoItem(String id, Date date) {
-                this.id = id;
-                this.date = date;
-            }
-
-            public TwoItem() {
-                this(null, null);
-            }
-
-            public String getId() {
-                return this.id;
-            }
-
-            public void setId(String id) {
-                this.id = id;
-            }
-
-            public Date getDate() {
-                return this.date;
-            }
-
-            public void setDate(Date date) {
-                this.date = date;
-            }
-        }
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/datamodeling/S3ClientCacheIntegrationTest.java b/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/datamodeling/S3ClientCacheIntegrationTest.java
deleted file mode 100644
index d20d9cd134fb..000000000000
--- a/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/datamodeling/S3ClientCacheIntegrationTest.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.net.URI;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
-import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
-import software.amazon.awssdk.regions.Region;
-import software.amazon.awssdk.services.s3.S3Client;
-
-@Ignore
-// FIXME: Depends on S3 properly parsing region information from the endpoint (see AmazonS3#getRegionName())
-public class S3ClientCacheIntegrationTest {
-    private AwsBasicCredentials credentials;
-
-    @Before
-    public void setUp() {
-        credentials = AwsBasicCredentials.create("mock", "mock");
-    }
-
-    @Test
-    public void testBadClientCache() throws Exception {
-        S3ClientCache s3cc = new S3ClientCache(credentials);
-        S3Client notAnAWSEndpoint = S3Client.builder()
-                                            .credentialsProvider(StaticCredentialsProvider.create(credentials))
-                                            .endpointOverride(new URI("i.am.an.invalid.aws.endpoint.com"))
-                                            .build();
-
-        try {
-            s3cc.useClient(notAnAWSEndpoint, Region.US_EAST_2);
-        } catch (IllegalStateException e) {
-            assertTrue(e.getMessage().contains("No valid region has been specified. Unable to return region name"));
-            return;
-        }
-
-        fail("Expected exception to be thrown");
-    }
-
-    @Test
-    public void testNonExistantRegion() throws Exception {
-        S3ClientCache s3cc = new S3ClientCache(credentials);
-        S3Client notAnAWSEndpoint = S3Client.builder()
-                .credentialsProvider(StaticCredentialsProvider.create(credentials))
-                .endpointOverride(new URI("s3.mordor.amazonaws.com"))
-                .build();
-
-        try {
-            s3cc.useClient(notAnAWSEndpoint, Region.US_EAST_2);
-        } catch (IllegalStateException e) {
-            assertEquals("No valid region has been specified. Unable to return region name", e.getMessage());
-            return;
-        }
-
-        fail("Expected IllegalStateException to be thrown");
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/document/QueryIntegrationTest.java b/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/document/QueryIntegrationTest.java
deleted file mode 100644
index def8a2fcdd40..000000000000
--- a/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/document/QueryIntegrationTest.java
+++ /dev/null
@@ -1,185 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.document;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Random;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import software.amazon.awssdk.services.dynamodb.DynamoDBMapperIntegrationTestBase;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMapper;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMapperConfig;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbQueryExpression;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-import software.amazon.awssdk.services.dynamodb.model.ComparisonOperator;
-import software.amazon.awssdk.services.dynamodb.model.Condition;
-import software.amazon.awssdk.services.dynamodb.pojos.RangeKeyClass;
-
-/**
- * Integration tests for the query operation on DynamoDBMapper.
- */
-public class QueryIntegrationTest extends DynamoDBMapperIntegrationTestBase {
-
-    private static final long HASH_KEY = System.currentTimeMillis();
-    private static final int TEST_ITEM_NUMBER = 500;
-    private static RangeKeyClass hashKeyObject;
-    private static DynamoDbMapper mapper;
-
-    @BeforeClass
-    public static void setUp() throws Exception {
-        setUpTableWithRangeAttribute();
-
-        DynamoDbMapperConfig mapperConfig = new DynamoDbMapperConfig(DynamoDbMapperConfig.ConsistentRead.CONSISTENT);
-        mapper = new DynamoDbMapper(dynamo, mapperConfig);
-
-        putTestData(mapper, TEST_ITEM_NUMBER);
-
-        hashKeyObject = new RangeKeyClass();
-        hashKeyObject.setKey(HASH_KEY);
-    }
-
-    /**
-     * Use BatchSave to put some test data into the tested table. Each item is
-     * hash-keyed by the same value, and range-keyed by numbers starting from 0.
-     */
-    private static void putTestData(DynamoDbMapper mapper, int itemNumber) {
-        List<RangeKeyClass> objs = new ArrayList<RangeKeyClass>();
-        for (int i = 0; i < itemNumber; i++) {
-            RangeKeyClass obj = new RangeKeyClass();
-            obj.setKey(HASH_KEY);
-            obj.setRangeKey(i);
-            obj.setBigDecimalAttribute(new BigDecimal(i));
-            objs.add(obj);
-        }
-        mapper.batchSave(objs);
-    }
-
-    @Test
-    public void testQueryWithPrimaryRangeKey() throws Exception {
-        DynamoDbQueryExpression<RangeKeyClass> queryExpression =
-                new DynamoDbQueryExpression<RangeKeyClass>()
-                        .withHashKeyValues(hashKeyObject)
-                        .withRangeKeyCondition(
-                                "rangeKey",
-                                Condition.builder()
-                                        .comparisonOperator(ComparisonOperator.GT)
-                                        .attributeValueList(AttributeValue.builder().n("1.0").build())
-                                        .build())
-                        .withLimit(11);
-        List<RangeKeyClass> list = mapper.query(RangeKeyClass.class, queryExpression);
-
-        int count = 0;
-        Iterator<RangeKeyClass> iterator = list.iterator();
-        while (iterator.hasNext()) {
-            count++;
-            RangeKeyClass next = iterator.next();
-            assertTrue(next.getRangeKey() > 1.00);
-        }
-
-        int numMatchingObjects = TEST_ITEM_NUMBER - 2;
-        assertEquals(count, numMatchingObjects);
-        assertEquals(numMatchingObjects, list.size());
-
-        assertNotNull(list.get(list.size() / 2));
-        assertTrue(list.contains(list.get(list.size() / 2)));
-        assertEquals(numMatchingObjects, list.toArray().length);
-
-        Thread.sleep(250);
-        int totalCount = mapper.count(RangeKeyClass.class, queryExpression);
-        assertEquals(numMatchingObjects, totalCount);
-
-        /**
-         * Tests query with only hash key
-         */
-        queryExpression = new DynamoDbQueryExpression<RangeKeyClass>().withHashKeyValues(hashKeyObject);
-        list = mapper.query(RangeKeyClass.class, queryExpression);
-        assertEquals(TEST_ITEM_NUMBER, list.size());
-    }
-
-    /**
-     * Tests making queries using query filter on non-key attributes.
-     */
-    @Test
-    public void testQueryFilter() {
-        // A random filter condition to be applied to the query.
-        Random random = new Random();
-        int randomFilterValue = random.nextInt(TEST_ITEM_NUMBER);
-        Condition filterCondition = Condition.builder()
-                .comparisonOperator(ComparisonOperator.LT)
-                .attributeValueList(
-                        AttributeValue.builder().n(Integer.toString(randomFilterValue)).build()).build();
-
-        /*
-         * (1) Apply the filter on the range key, in form of key condition
-         */
-        DynamoDbQueryExpression<RangeKeyClass> queryWithRangeKeyCondition =
-                new DynamoDbQueryExpression<RangeKeyClass>()
-                        .withHashKeyValues(hashKeyObject)
-                        .withRangeKeyCondition("rangeKey", filterCondition);
-        List<RangeKeyClass> rangeKeyConditionResult = mapper.query(RangeKeyClass.class, queryWithRangeKeyCondition);
-
-        /*
-         * (2) Apply the filter on the bigDecimalAttribute, in form of query filter
-         */
-        DynamoDbQueryExpression<RangeKeyClass> queryWithQueryFilterCondition =
-                new DynamoDbQueryExpression<RangeKeyClass>()
-                        .withHashKeyValues(hashKeyObject)
-                        .withQueryFilter(Collections.singletonMap("bigDecimalAttribute", filterCondition));
-        List<RangeKeyClass> queryFilterResult = mapper.query(RangeKeyClass.class, queryWithQueryFilterCondition);
-
-        assertEquals(rangeKeyConditionResult.size(), queryFilterResult.size());
-        for (int i = 0; i < rangeKeyConditionResult.size(); i++) {
-            assertEquals(rangeKeyConditionResult.get(i), queryFilterResult.get(i));
-        }
-    }
-
-    /**
-     * Tests that exception should be raised when user provides an index name
-     * when making query with the primary range key.
-     */
-    @Test
-    public void testUnnecessaryIndexNameException() {
-        try {
-            DynamoDbMapper mapper = new DynamoDbMapper(dynamo);
-            long hashKey = System.currentTimeMillis();
-            RangeKeyClass keyObject = new RangeKeyClass();
-            keyObject.setKey(hashKey);
-            DynamoDbQueryExpression<RangeKeyClass> queryExpression = new DynamoDbQueryExpression<RangeKeyClass>()
-                    .withHashKeyValues(keyObject);
-            queryExpression.withRangeKeyCondition("rangeKey",
-                    Condition.builder().comparisonOperator(ComparisonOperator.GT.toString())
-                            .attributeValueList(
-                                    AttributeValue.builder().n("1.0").build()).build()).withLimit(11)
-                    .withIndexName("some_index");
-            mapper.query(RangeKeyClass.class, queryExpression);
-            fail("User should not provide index name when making query with the primary range key");
-        } catch (IllegalArgumentException expected) {
-            System.out.println(expected.getMessage());
-        } catch (Exception e) {
-            fail("Should trigger SdkClientException.");
-        }
-
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/AbstractKeyAndValIntegrationTestCase.java b/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/AbstractKeyAndValIntegrationTestCase.java
deleted file mode 100644
index 3b9f495f3b73..000000000000
--- a/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/AbstractKeyAndValIntegrationTestCase.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.mapper;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-
-import java.util.ArrayList;
-import java.util.List;
-import org.junit.After;
-import org.junit.Before;
-import software.amazon.awssdk.services.dynamodb.DynamoDBMapperIntegrationTestBase;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMapper;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMapperConfig;
-import software.amazon.awssdk.services.dynamodb.pojos.KeyAndVal;
-
-/**
- * Tests updating component attribute fields correctly.
- */
-public abstract class AbstractKeyAndValIntegrationTestCase extends DynamoDBMapperIntegrationTestBase {
-
-    /**
-     * The DynamoDBMapper instance.
-     */
-    protected DynamoDbMapper util;
-
-    /**
-     * Sets up the test case.
-     */
-    protected final void setUpTest(final DynamoDbMapperConfig.SaveBehavior saveBehavior) {
-        this.util = new DynamoDbMapper(dynamo, new DynamoDbMapperConfig.Builder().withSaveBehavior(saveBehavior).build());
-    }
-
-    /**
-     * Sets up the test case.
-     */
-    @Before
-    public void setUpTest() {
-        setUpTest(DynamoDbMapperConfig.DEFAULT.saveBehavior());
-    }
-
-    /**
-     * Tears down the test case.
-     */
-    @After
-    public void tearDownTest() {
-        this.util = null;
-    }
-
-    /**
-     * Assert that the object updated appropriately.
-     *
-     * @param changeExpected True if a change is expected.
-     * @param objects        The objects.
-     */
-    protected final <K, V> void assertBeforeAndAfterChange(final boolean changeExpected,
-                                                           final List<? extends KeyAndVal<K, V>> objects) {
-        final List<V> befores = new ArrayList<V>(objects.size());
-        for (final KeyAndVal<K, V> object : objects) {
-            befores.add(object.getVal());
-        }
-        this.util.batchSave(objects);
-        for (int i = 0, its = objects.size(); i < its; i++) {
-            assertBeforeAndAfterChange(changeExpected, befores.get(i), objects.get(i).getVal());
-        }
-    }
-
-    /**
-     * Assert that the object updated appropriately.
-     *
-     * @param changeExpected True if a change is expected.
-     * @param object         The object.
-     * @return The value if more assertions are required.
-     */
-    protected final <K, V> V assertBeforeAndAfterChange(final Boolean changeExpected, final KeyAndVal<K, V> object) {
-        final V before = object.getVal();
-        this.util.save(object);
-        final V after = object.getVal();
-        if (changeExpected != null) {
-            assertBeforeAndAfterChange(changeExpected, before, after);
-        }
-        final KeyAndVal<K, V> reload = this.util.load(object.getClass(), object.getKey());
-        assertNotNull(reload);
-        if (changeExpected != null) {
-            assertBeforeAndAfterChange(false, after, reload.getVal());
-            assertBeforeAndAfterChange(changeExpected, before, reload.getVal());
-        }
-        return reload.getVal();
-    }
-
-    /**
-     * Assert that the object updated appropriately.
-     *
-     * @param changeExpected True if a change is expected.
-     * @param before         The before value.
-     * @param after          The after value.
-     */
-    protected final <V> void assertBeforeAndAfterChange(final boolean changeExpected, final V before, final V after) {
-        if (!changeExpected) {
-            assertEquals(String.format("Expected before[%s] and after[%s] to be equal", before, after), before, after);
-        } else if (before == null) {
-            assertNotNull(String.format("Expected after[%s] to not be null", after), after);
-        } else {
-            assertFalse(String.format("Expected before[%s] and after[%s] to not be equal", before, after), before.equals(after));
-        }
-    }
-
-}
diff --git a/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/AutoGeneratedKeysIntegrationTest.java b/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/AutoGeneratedKeysIntegrationTest.java
deleted file mode 100644
index f582c9d1d3f3..000000000000
--- a/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/AutoGeneratedKeysIntegrationTest.java
+++ /dev/null
@@ -1,1112 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.mapper;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.fail;
-
-import java.util.Collections;
-import java.util.UUID;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import software.amazon.awssdk.utils.ImmutableMap;
-import software.amazon.awssdk.services.dynamodb.DynamoDBMapperIntegrationTestBase;
-import software.amazon.awssdk.services.dynamodb.TableUtils;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbAutoGeneratedKey;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbHashKey;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbIndexHashKey;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbIndexRangeKey;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMapper;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMappingException;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbRangeKey;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbSaveExpression;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbTable;
-import software.amazon.awssdk.services.dynamodb.model.AttributeDefinition;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-import software.amazon.awssdk.services.dynamodb.model.ConditionalCheckFailedException;
-import software.amazon.awssdk.services.dynamodb.model.ConditionalOperator;
-import software.amazon.awssdk.services.dynamodb.model.CreateTableRequest;
-import software.amazon.awssdk.services.dynamodb.model.ExpectedAttributeValue;
-import software.amazon.awssdk.services.dynamodb.model.GlobalSecondaryIndex;
-import software.amazon.awssdk.services.dynamodb.model.KeySchemaElement;
-import software.amazon.awssdk.services.dynamodb.model.KeyType;
-import software.amazon.awssdk.services.dynamodb.model.Projection;
-import software.amazon.awssdk.services.dynamodb.model.ProjectionType;
-import software.amazon.awssdk.services.dynamodb.model.ProvisionedThroughput;
-import software.amazon.awssdk.services.dynamodb.model.ScalarAttributeType;
-
-/**
- * Tests using auto-generated keys for range keys, hash keys, or both.
- */
-public class AutoGeneratedKeysIntegrationTest extends DynamoDBMapperIntegrationTestBase {
-
-    private static final String TABLE_NAME = "aws-java-sdk-string-range";
-
-    private static final String GSI_NAME = "gsi-with-autogenerated-keys";
-    private static final String GSI_HASH_KEY = "gis-hash-key";
-    private static final String GSI_RANGE_KEY = "gis-range-key";
-
-    @BeforeClass
-    public static void setUp() throws Exception {
-        DynamoDBMapperIntegrationTestBase.setUp();
-
-        String keyName = DynamoDBMapperIntegrationTestBase.KEY_NAME;
-        String rangeKeyAttributeName = "rangeKey";
-
-        CreateTableRequest createTableRequest = CreateTableRequest.builder()
-                .tableName(TABLE_NAME)
-                .keySchema(
-                        KeySchemaElement.builder().attributeName(keyName).keyType(KeyType.HASH).build(),
-                        KeySchemaElement.builder().attributeName(rangeKeyAttributeName).keyType(KeyType.RANGE).build())
-                .globalSecondaryIndexes(GlobalSecondaryIndex.builder()
-                                                    .indexName(GSI_NAME)
-                                                    .keySchema(
-                                                            KeySchemaElement.builder().attributeName(GSI_HASH_KEY).keyType(KeyType.HASH).build(),
-                                                            KeySchemaElement.builder().attributeName(GSI_RANGE_KEY).keyType(KeyType.RANGE).build())
-                                                    .projection(Projection.builder().projectionType(ProjectionType.ALL).build())
-                                                    .provisionedThroughput(ProvisionedThroughput.builder().readCapacityUnits(3L).writeCapacityUnits(3L).build()).build())
-                .attributeDefinitions(
-                        AttributeDefinition.builder().attributeName(keyName).attributeType(ScalarAttributeType.S).build(),
-                        AttributeDefinition.builder().attributeName(rangeKeyAttributeName).attributeType(ScalarAttributeType.S).build(),
-                        AttributeDefinition.builder().attributeName(GSI_HASH_KEY).attributeType(ScalarAttributeType.S).build(),
-                        AttributeDefinition.builder().attributeName(GSI_RANGE_KEY).attributeType(ScalarAttributeType.S).build())
-                .provisionedThroughput(ProvisionedThroughput.builder().readCapacityUnits(10L).writeCapacityUnits(5L).build()).build();
-
-        if (TableUtils.createTableIfNotExists(dynamo, createTableRequest)) {
-            TableUtils.waitUntilActive(dynamo, TABLE_NAME);
-        }
-    }
-
-    @Test
-    public void testHashKeyRangeKeyBothAutogenerated() {
-        DynamoDbMapper mapper = new DynamoDbMapper(dynamo);
-        HashKeyRangeKeyBothAutoGenerated obj = new HashKeyRangeKeyBothAutoGenerated();
-        obj.setOtherAttribute("blah");
-
-        assertNull(obj.getKey());
-        assertNull(obj.getRangeKey());
-        mapper.save(obj);
-        assertNotNull(obj.getKey());
-        assertNotNull(obj.getRangeKey());
-
-        HashKeyRangeKeyBothAutoGenerated other = mapper.load(HashKeyRangeKeyBothAutoGenerated.class, obj.getKey(),
-                                                             obj.getRangeKey());
-        assertEquals(other, obj);
-    }
-
-    @Test
-    public void testHashKeyRangeKeyBothAutogeneratedBatchWrite() {
-        DynamoDbMapper mapper = new DynamoDbMapper(dynamo);
-        HashKeyRangeKeyBothAutoGenerated obj = new HashKeyRangeKeyBothAutoGenerated();
-        obj.setOtherAttribute("blah");
-        HashKeyRangeKeyBothAutoGenerated obj2 = new HashKeyRangeKeyBothAutoGenerated();
-        obj2.setOtherAttribute("blah");
-
-        assertNull(obj.getKey());
-        assertNull(obj.getRangeKey());
-        assertNull(obj2.getKey());
-        assertNull(obj2.getRangeKey());
-        mapper.batchSave(obj, obj2);
-        assertNotNull(obj.getKey());
-        assertNotNull(obj.getRangeKey());
-        assertNotNull(obj2.getKey());
-        assertNotNull(obj2.getRangeKey());
-
-        assertEquals(mapper.load(HashKeyRangeKeyBothAutoGenerated.class, obj.getKey(),
-                                 obj.getRangeKey()), obj);
-        assertEquals(mapper.load(HashKeyRangeKeyBothAutoGenerated.class, obj2.getKey(),
-                                 obj2.getRangeKey()), obj2);
-    }
-
-    /**
-     * Tests providing additional expected conditions when saving item with
-     * auto-generated keys.
-     */
-    @Test
-    public void testAutogeneratedKeyWithUserProvidedExpectedConditions() {
-        DynamoDbMapper mapper = new DynamoDbMapper(dynamo);
-        HashKeyRangeKeyBothAutoGenerated obj = new HashKeyRangeKeyBothAutoGenerated();
-        obj.setOtherAttribute("blah");
-
-        assertNull(obj.getKey());
-        assertNull(obj.getRangeKey());
-
-        // Add additional expected conditions via DynamoDBSaveExpression.
-        // Expected conditions joined by AND are compatible with the conditions
-        // for auto-generated keys.
-        DynamoDbSaveExpression saveExpression = new DynamoDbSaveExpression();
-        saveExpression
-                .withExpected(Collections.singletonMap(
-                        "otherAttribute", ExpectedAttributeValue.builder().exists(false).build()))
-                .withConditionalOperator(ConditionalOperator.AND);
-        // The save should succeed since the user provided conditions are joined by AND.
-        mapper.save(obj, saveExpression);
-        assertNotNull(obj.getKey());
-        assertNotNull(obj.getRangeKey());
-
-        HashKeyRangeKeyBothAutoGenerated other = mapper.load(HashKeyRangeKeyBothAutoGenerated.class, obj.getKey(),
-                                                             obj.getRangeKey());
-        assertEquals(other, obj);
-
-        // Change the conditional operator to OR.
-        // IllegalArgumentException is expected since the additional expected
-        // conditions cannot be joined with the conditions for auto-generated
-        // keys.
-        saveExpression.setConditionalOperator(ConditionalOperator.OR);
-        try {
-            mapper.save(new HashKeyRangeKeyBothAutoGenerated(), saveExpression);
-        } catch (IllegalArgumentException expected) {
-            // Expected.
-        }
-
-        // User-provided OR conditions should work if they completely override the generated conditions.
-        saveExpression
-                .withExpected(ImmutableMap.of(
-                        "otherAttribute", ExpectedAttributeValue.builder().exists(false).build(),
-                        "key", ExpectedAttributeValue.builder().exists(false).build(),
-                        "rangeKey", ExpectedAttributeValue.builder().exists(false).build()))
-                .withConditionalOperator(ConditionalOperator.OR);
-        mapper.save(new HashKeyRangeKeyBothAutoGenerated(), saveExpression);
-
-        saveExpression
-                .withExpected(ImmutableMap.of(
-                        "otherAttribute", ExpectedAttributeValue.builder().value(AttributeValue.builder().s("non-existent-value").build()).build(),
-                        "key", ExpectedAttributeValue.builder().value(AttributeValue.builder().s("non-existent-value").build()).build(),
-                        "rangeKey", ExpectedAttributeValue.builder().value(AttributeValue.builder().s("non-existent-value").build()).build()))
-                .withConditionalOperator(ConditionalOperator.OR);
-        try {
-            mapper.save(new HashKeyRangeKeyBothAutoGenerated(), saveExpression);
-        } catch (ConditionalCheckFailedException expected) {
-            // Expected.
-        }
-    }
-
-    @Test
-    public void testHashKeyAutogenerated() {
-        DynamoDbMapper mapper = new DynamoDbMapper(dynamo);
-        HashKeyAutoGenerated obj = new HashKeyAutoGenerated();
-        obj.setOtherAttribute("blah");
-        obj.setRangeKey("" + System.currentTimeMillis());
-
-        assertNull(obj.getKey());
-        assertNotNull(obj.getRangeKey());
-        mapper.save(obj);
-        assertNotNull(obj.getKey());
-        assertNotNull(obj.getRangeKey());
-
-        HashKeyAutoGenerated other = mapper.load(HashKeyAutoGenerated.class, obj.getKey(), obj.getRangeKey());
-        assertEquals(other, obj);
-    }
-
-    @Test
-    public void testRangeKeyAutogenerated() {
-        DynamoDbMapper mapper = new DynamoDbMapper(dynamo);
-        RangeKeyAutoGenerated obj = new RangeKeyAutoGenerated();
-        obj.setOtherAttribute("blah");
-        obj.setKey("" + System.currentTimeMillis());
-
-        assertNotNull(obj.getKey());
-        assertNull(obj.getRangeKey());
-        mapper.save(obj);
-        assertNotNull(obj.getKey());
-        assertNotNull(obj.getRangeKey());
-
-        RangeKeyAutoGenerated other = mapper.load(RangeKeyAutoGenerated.class, obj.getKey(), obj.getRangeKey());
-        assertEquals(other, obj);
-    }
-
-    @Test
-    public void testNothingAutogenerated() {
-        DynamoDbMapper mapper = new DynamoDbMapper(dynamo);
-        NothingAutoGenerated obj = new NothingAutoGenerated();
-        obj.setOtherAttribute("blah");
-        obj.setKey("" + System.currentTimeMillis());
-        obj.setRangeKey("" + System.currentTimeMillis());
-
-        assertNotNull(obj.getKey());
-        assertNotNull(obj.getRangeKey());
-        mapper.save(obj);
-        assertNotNull(obj.getKey());
-        assertNotNull(obj.getRangeKey());
-
-        NothingAutoGenerated other = mapper.load(NothingAutoGenerated.class, obj.getKey(), obj.getRangeKey());
-        assertEquals(other, obj);
-    }
-
-    @Test
-    public void testNothingAutogeneratedErrors() {
-        DynamoDbMapper mapper = new DynamoDbMapper(dynamo);
-        NothingAutoGenerated obj = new NothingAutoGenerated();
-
-        try {
-            mapper.save(obj);
-            fail("Expected a mapping exception");
-        } catch (DynamoDbMappingException expected) {
-            // Expected.
-        }
-
-        obj.setKey("" + System.currentTimeMillis());
-        try {
-            mapper.save(obj);
-            fail("Expected a mapping exception");
-        } catch (DynamoDbMappingException expected) {
-            // Expected.
-        }
-
-        obj.setRangeKey("" + System.currentTimeMillis());
-        obj.setKey(null);
-        try {
-            mapper.save(obj);
-            fail("Expected a mapping exception");
-        } catch (DynamoDbMappingException expected) {
-            // Expected.
-        }
-
-        obj.setRangeKey("");
-        obj.setKey("" + System.currentTimeMillis());
-        try {
-            mapper.save(obj);
-            fail("Expected a mapping exception");
-        } catch (DynamoDbMappingException expected) {
-            // Expected.
-        }
-
-        obj.setRangeKey("" + System.currentTimeMillis());
-        mapper.save(obj);
-    }
-
-    @Test
-    public void testHashKeyRangeKeyBothAutogeneratedKeyOnly() {
-        DynamoDbMapper mapper = new DynamoDbMapper(dynamo);
-        HashKeyRangeKeyBothAutoGeneratedKeyOnly obj = new HashKeyRangeKeyBothAutoGeneratedKeyOnly();
-
-        assertNull(obj.getKey());
-        assertNull(obj.getRangeKey());
-        mapper.save(obj);
-        assertNotNull(obj.getKey());
-        assertNotNull(obj.getRangeKey());
-
-        HashKeyRangeKeyBothAutoGeneratedKeyOnly other = mapper.load(HashKeyRangeKeyBothAutoGeneratedKeyOnly.class, obj.getKey(),
-                                                                    obj.getRangeKey());
-        assertEquals(other, obj);
-    }
-
-    @Test
-    public void testHashKeyAutogeneratedKeyOnly() {
-        DynamoDbMapper mapper = new DynamoDbMapper(dynamo);
-        HashKeyAutoGeneratedKeyOnly obj = new HashKeyAutoGeneratedKeyOnly();
-        obj.setRangeKey("" + System.currentTimeMillis());
-
-        assertNull(obj.getKey());
-        assertNotNull(obj.getRangeKey());
-        mapper.save(obj);
-        assertNotNull(obj.getKey());
-        assertNotNull(obj.getRangeKey());
-
-        HashKeyAutoGeneratedKeyOnly other = mapper.load(HashKeyAutoGeneratedKeyOnly.class, obj.getKey(), obj.getRangeKey());
-        assertEquals(other, obj);
-    }
-
-    @Test
-    public void testRangeKeyAutogeneratedKeyOnly() {
-        DynamoDbMapper mapper = new DynamoDbMapper(dynamo);
-        RangeKeyAutoGeneratedKeyOnly obj = new RangeKeyAutoGeneratedKeyOnly();
-        obj.setKey("" + System.currentTimeMillis());
-
-        assertNotNull(obj.getKey());
-        assertNull(obj.getRangeKey());
-        mapper.save(obj);
-        assertNotNull(obj.getKey());
-        assertNotNull(obj.getRangeKey());
-
-        RangeKeyAutoGeneratedKeyOnly other = mapper.load(RangeKeyAutoGeneratedKeyOnly.class, obj.getKey(), obj.getRangeKey());
-        assertEquals(other, obj);
-    }
-
-    @Test
-    public void testNothingAutogeneratedKeyOnly() {
-        DynamoDbMapper mapper = new DynamoDbMapper(dynamo);
-        NothingAutoGeneratedKeyOnly obj = new NothingAutoGeneratedKeyOnly();
-        obj.setKey("" + System.currentTimeMillis());
-        obj.setRangeKey("" + System.currentTimeMillis());
-
-        assertNotNull(obj.getKey());
-        assertNotNull(obj.getRangeKey());
-        mapper.save(obj);
-        assertNotNull(obj.getKey());
-        assertNotNull(obj.getRangeKey());
-
-        NothingAutoGeneratedKeyOnly other = mapper.load(NothingAutoGeneratedKeyOnly.class, obj.getKey(), obj.getRangeKey());
-        assertEquals(other, obj);
-    }
-
-    @Test
-    public void testNothingAutogeneratedKeyOnlyErrors() {
-        DynamoDbMapper mapper = new DynamoDbMapper(dynamo);
-        NothingAutoGeneratedKeyOnly obj = new NothingAutoGeneratedKeyOnly();
-
-        try {
-            mapper.save(obj);
-            fail("Expected a mapping exception");
-        } catch (DynamoDbMappingException expected) {
-            // Expected.
-        }
-
-        obj.setKey("" + System.currentTimeMillis());
-        try {
-            mapper.save(obj);
-            fail("Expected a mapping exception");
-        } catch (DynamoDbMappingException expected) {
-            // Expected.
-        }
-
-        obj.setRangeKey("" + System.currentTimeMillis());
-        obj.setKey(null);
-        try {
-            mapper.save(obj);
-            fail("Expected a mapping exception");
-        } catch (DynamoDbMappingException expected) {
-            // Expected.
-        }
-
-        obj.setRangeKey("");
-        obj.setKey("" + System.currentTimeMillis());
-        try {
-            mapper.save(obj);
-            fail("Expected a mapping exception");
-        } catch (DynamoDbMappingException expected) {
-            // Expected.
-        }
-
-        obj.setRangeKey("" + System.currentTimeMillis());
-        mapper.save(obj);
-    }
-
-    @Test
-    public void testIndexKeyWithAutogeneratedAnnotation_StillRequirePrimaryKeyValue() {
-        DynamoDbMapper mapper = new DynamoDbMapper(dynamo);
-        PrimaryKeysNotAutogeneratedIndexKeysAutogenerated obj = new PrimaryKeysNotAutogeneratedIndexKeysAutogenerated();
-
-        try {
-            mapper.save(obj);
-            fail("DynamoDBMappingException is expected.");
-        } catch (DynamoDbMappingException expected) {
-            // Expected.
-        }
-
-        obj.setGsiHashKey("foo");
-        obj.setGsiRangeKey("foo");
-        try {
-            mapper.save(obj);
-            fail("DynamoDBMappingException is expected.");
-        } catch (DynamoDbMappingException expected) {
-            // Expected.
-        }
-    }
-
-    @Test
-    public void testIndexKeyWithAutogeneratedAnnotation_AutogenerateIndexKeyValueIfNull() {
-        DynamoDbMapper mapper = new DynamoDbMapper(dynamo);
-        PrimaryKeysNotAutogeneratedIndexKeysAutogenerated obj = new PrimaryKeysNotAutogeneratedIndexKeysAutogenerated();
-
-        String randomPrimaryKeyValue = UUID.randomUUID().toString();
-        obj.setKey(randomPrimaryKeyValue);
-        obj.setRangeKey(randomPrimaryKeyValue);
-
-        assertNull(obj.getGsiHashKey());
-        assertNull(obj.getGsiRangeKey());
-        mapper.save(obj);
-
-        // check in-memory value
-        assertNotNull(obj.getGsiHashKey());
-        assertNotNull(obj.getGsiRangeKey());
-
-        PrimaryKeysNotAutogeneratedIndexKeysAutogenerated retrieved = mapper.load(obj);
-        assertEquals(obj, retrieved);
-    }
-
-    @Test
-    public void testIndexKeyWithAutogeneratedAnnotation_DoNotAutogenerateIndexKeyValueIfAlreadySpecified() {
-        DynamoDbMapper mapper = new DynamoDbMapper(dynamo);
-        PrimaryKeysNotAutogeneratedIndexKeysAutogenerated obj = new PrimaryKeysNotAutogeneratedIndexKeysAutogenerated();
-
-        String randomValue = UUID.randomUUID().toString();
-        obj.setKey(randomValue);
-        obj.setRangeKey(randomValue);
-        obj.setGsiHashKey(randomValue);
-        obj.setGsiRangeKey(randomValue);
-        mapper.save(obj);
-
-        // check in-memory value
-        assertEquals(randomValue, obj.getGsiHashKey());
-        assertEquals(randomValue, obj.getGsiRangeKey());
-
-        PrimaryKeysNotAutogeneratedIndexKeysAutogenerated retrieved = mapper.load(obj);
-        assertEquals(obj, retrieved);
-    }
-
-    @DynamoDbTable(tableName = TABLE_NAME)
-    public static class HashKeyRangeKeyBothAutoGenerated {
-
-        private String key;
-        private String rangeKey;
-        private String otherAttribute;
-
-        @DynamoDbAutoGeneratedKey
-        @DynamoDbHashKey
-        public String getKey() {
-            return key;
-        }
-
-        public void setKey(String key) {
-            this.key = key;
-        }
-
-        @DynamoDbAutoGeneratedKey
-        @DynamoDbRangeKey
-        public String getRangeKey() {
-            return rangeKey;
-        }
-
-        public void setRangeKey(String rangeKey) {
-            this.rangeKey = rangeKey;
-        }
-
-        public String getOtherAttribute() {
-            return otherAttribute;
-        }
-
-        public void setOtherAttribute(String otherAttribute) {
-            this.otherAttribute = otherAttribute;
-        }
-
-        @Override
-        public int hashCode() {
-            final int prime = 31;
-            int result = 1;
-            result = prime * result + ((key == null) ? 0 : key.hashCode());
-            result = prime * result + ((otherAttribute == null) ? 0 : otherAttribute.hashCode());
-            result = prime * result + ((rangeKey == null) ? 0 : rangeKey.hashCode());
-            return result;
-        }
-
-        @Override
-        public boolean equals(Object obj) {
-            if (this == obj) {
-                return true;
-            }
-            if (obj == null) {
-                return false;
-            }
-            if (getClass() != obj.getClass()) {
-                return false;
-            }
-            HashKeyRangeKeyBothAutoGenerated other = (HashKeyRangeKeyBothAutoGenerated) obj;
-            if (key == null) {
-                if (other.key != null) {
-                    return false;
-                }
-            } else if (!key.equals(other.key)) {
-                return false;
-            }
-            if (otherAttribute == null) {
-                if (other.otherAttribute != null) {
-                    return false;
-                }
-            } else if (!otherAttribute.equals(other.otherAttribute)) {
-                return false;
-            }
-            if (rangeKey == null) {
-                if (other.rangeKey != null) {
-                    return false;
-                }
-            } else if (!rangeKey.equals(other.rangeKey)) {
-                return false;
-            }
-            return true;
-        }
-    }
-
-    @DynamoDbTable(tableName = TABLE_NAME)
-    public static class HashKeyAutoGenerated {
-
-        private String key;
-        private String rangeKey;
-        private String otherAttribute;
-
-        @DynamoDbAutoGeneratedKey
-        @DynamoDbHashKey
-        public String getKey() {
-            return key;
-        }
-
-        public void setKey(String key) {
-            this.key = key;
-        }
-
-        @DynamoDbRangeKey
-        public String getRangeKey() {
-            return rangeKey;
-        }
-
-        public void setRangeKey(String rangeKey) {
-            this.rangeKey = rangeKey;
-        }
-
-        public String getOtherAttribute() {
-            return otherAttribute;
-        }
-
-        public void setOtherAttribute(String otherAttribute) {
-            this.otherAttribute = otherAttribute;
-        }
-
-        @Override
-        public int hashCode() {
-            final int prime = 31;
-            int result = 1;
-            result = prime * result + ((key == null) ? 0 : key.hashCode());
-            result = prime * result + ((otherAttribute == null) ? 0 : otherAttribute.hashCode());
-            result = prime * result + ((rangeKey == null) ? 0 : rangeKey.hashCode());
-            return result;
-        }
-
-        @Override
-        public boolean equals(Object obj) {
-            if (this == obj) {
-                return true;
-            }
-            if (obj == null) {
-                return false;
-            }
-            if (getClass() != obj.getClass()) {
-                return false;
-            }
-            HashKeyAutoGenerated other = (HashKeyAutoGenerated) obj;
-            if (key == null) {
-                if (other.key != null) {
-                    return false;
-                }
-            } else if (!key.equals(other.key)) {
-                return false;
-            }
-            if (otherAttribute == null) {
-                if (other.otherAttribute != null) {
-                    return false;
-                }
-            } else if (!otherAttribute.equals(other.otherAttribute)) {
-                return false;
-            }
-            if (rangeKey == null) {
-                if (other.rangeKey != null) {
-                    return false;
-                }
-            } else if (!rangeKey.equals(other.rangeKey)) {
-                return false;
-            }
-            return true;
-        }
-    }
-
-    @DynamoDbTable(tableName = "aws-java-sdk-string-range")
-    public static class RangeKeyAutoGenerated {
-
-        private String key;
-        private String rangeKey;
-        private String otherAttribute;
-
-        @DynamoDbHashKey
-        public String getKey() {
-            return key;
-        }
-
-        public void setKey(String key) {
-            this.key = key;
-        }
-
-        @DynamoDbAutoGeneratedKey
-        @DynamoDbRangeKey
-        public String getRangeKey() {
-            return rangeKey;
-        }
-
-        public void setRangeKey(String rangeKey) {
-            this.rangeKey = rangeKey;
-        }
-
-        public String getOtherAttribute() {
-            return otherAttribute;
-        }
-
-        public void setOtherAttribute(String otherAttribute) {
-            this.otherAttribute = otherAttribute;
-        }
-
-        @Override
-        public int hashCode() {
-            final int prime = 31;
-            int result = 1;
-            result = prime * result + ((key == null) ? 0 : key.hashCode());
-            result = prime * result + ((otherAttribute == null) ? 0 : otherAttribute.hashCode());
-            result = prime * result + ((rangeKey == null) ? 0 : rangeKey.hashCode());
-            return result;
-        }
-
-        @Override
-        public boolean equals(Object obj) {
-            if (this == obj) {
-                return true;
-            }
-            if (obj == null) {
-                return false;
-            }
-            if (getClass() != obj.getClass()) {
-                return false;
-            }
-            RangeKeyAutoGenerated other = (RangeKeyAutoGenerated) obj;
-            if (key == null) {
-                if (other.key != null) {
-                    return false;
-                }
-            } else if (!key.equals(other.key)) {
-                return false;
-            }
-            if (otherAttribute == null) {
-                if (other.otherAttribute != null) {
-                    return false;
-                }
-            } else if (!otherAttribute.equals(other.otherAttribute)) {
-                return false;
-            }
-            if (rangeKey == null) {
-                if (other.rangeKey != null) {
-                    return false;
-                }
-            } else if (!rangeKey.equals(other.rangeKey)) {
-                return false;
-            }
-            return true;
-        }
-    }
-
-    @DynamoDbTable(tableName = TABLE_NAME)
-    public static class NothingAutoGenerated {
-
-        private String key;
-        private String rangeKey;
-        private String otherAttribute;
-
-        @DynamoDbHashKey
-        public String getKey() {
-            return key;
-        }
-
-        public void setKey(String key) {
-            this.key = key;
-        }
-
-        @DynamoDbRangeKey
-        public String getRangeKey() {
-            return rangeKey;
-        }
-
-        public void setRangeKey(String rangeKey) {
-            this.rangeKey = rangeKey;
-        }
-
-        public String getOtherAttribute() {
-            return otherAttribute;
-        }
-
-        public void setOtherAttribute(String otherAttribute) {
-            this.otherAttribute = otherAttribute;
-        }
-
-        @Override
-        public int hashCode() {
-            final int prime = 31;
-            int result = 1;
-            result = prime * result + ((key == null) ? 0 : key.hashCode());
-            result = prime * result + ((otherAttribute == null) ? 0 : otherAttribute.hashCode());
-            result = prime * result + ((rangeKey == null) ? 0 : rangeKey.hashCode());
-            return result;
-        }
-
-        @Override
-        public boolean equals(Object obj) {
-            if (this == obj) {
-                return true;
-            }
-            if (obj == null) {
-                return false;
-            }
-            if (getClass() != obj.getClass()) {
-                return false;
-            }
-            NothingAutoGenerated other = (NothingAutoGenerated) obj;
-            if (key == null) {
-                if (other.key != null) {
-                    return false;
-                }
-            } else if (!key.equals(other.key)) {
-                return false;
-            }
-            if (otherAttribute == null) {
-                if (other.otherAttribute != null) {
-                    return false;
-                }
-            } else if (!otherAttribute.equals(other.otherAttribute)) {
-                return false;
-            }
-            if (rangeKey == null) {
-                if (other.rangeKey != null) {
-                    return false;
-                }
-            } else if (!rangeKey.equals(other.rangeKey)) {
-                return false;
-            }
-            return true;
-        }
-    }
-
-    @DynamoDbTable(tableName = TABLE_NAME)
-    public static class HashKeyRangeKeyBothAutoGeneratedKeyOnly {
-
-        private String key;
-        private String rangeKey;
-
-        @DynamoDbAutoGeneratedKey
-        @DynamoDbHashKey
-        public String getKey() {
-            return key;
-        }
-
-        public void setKey(String key) {
-            this.key = key;
-        }
-
-        @DynamoDbAutoGeneratedKey
-        @DynamoDbRangeKey
-        public String getRangeKey() {
-            return rangeKey;
-        }
-
-        public void setRangeKey(String rangeKey) {
-            this.rangeKey = rangeKey;
-        }
-
-        @Override
-        public int hashCode() {
-            final int prime = 31;
-            int result = 1;
-            result = prime * result + ((key == null) ? 0 : key.hashCode());
-            result = prime * result + ((rangeKey == null) ? 0 : rangeKey.hashCode());
-            return result;
-        }
-
-        @Override
-        public boolean equals(Object obj) {
-            if (this == obj) {
-                return true;
-            }
-            if (obj == null) {
-                return false;
-            }
-            if (getClass() != obj.getClass()) {
-                return false;
-            }
-            HashKeyRangeKeyBothAutoGeneratedKeyOnly other = (HashKeyRangeKeyBothAutoGeneratedKeyOnly) obj;
-            if (key == null) {
-                if (other.key != null) {
-                    return false;
-                }
-            } else if (!key.equals(other.key)) {
-                return false;
-            }
-            if (rangeKey == null) {
-                if (other.rangeKey != null) {
-                    return false;
-                }
-            } else if (!rangeKey.equals(other.rangeKey)) {
-                return false;
-            }
-            return true;
-        }
-    }
-
-    @DynamoDbTable(tableName = TABLE_NAME)
-    public static class HashKeyAutoGeneratedKeyOnly {
-
-        private String key;
-        private String rangeKey;
-
-        @DynamoDbAutoGeneratedKey
-        @DynamoDbHashKey
-        public String getKey() {
-            return key;
-        }
-
-        public void setKey(String key) {
-            this.key = key;
-        }
-
-        @DynamoDbRangeKey
-        public String getRangeKey() {
-            return rangeKey;
-        }
-
-        public void setRangeKey(String rangeKey) {
-            this.rangeKey = rangeKey;
-        }
-
-        @Override
-        public int hashCode() {
-            final int prime = 31;
-            int result = 1;
-            result = prime * result + ((key == null) ? 0 : key.hashCode());
-            result = prime * result + ((rangeKey == null) ? 0 : rangeKey.hashCode());
-            return result;
-        }
-
-        @Override
-        public boolean equals(Object obj) {
-            if (this == obj) {
-                return true;
-            }
-            if (obj == null) {
-                return false;
-            }
-            if (getClass() != obj.getClass()) {
-                return false;
-            }
-            HashKeyAutoGeneratedKeyOnly other = (HashKeyAutoGeneratedKeyOnly) obj;
-            if (key == null) {
-                if (other.key != null) {
-                    return false;
-                }
-            } else if (!key.equals(other.key)) {
-                return false;
-            }
-            if (rangeKey == null) {
-                if (other.rangeKey != null) {
-                    return false;
-                }
-            } else if (!rangeKey.equals(other.rangeKey)) {
-                return false;
-            }
-            return true;
-        }
-
-    }
-
-    @DynamoDbTable(tableName = TABLE_NAME)
-    public static class RangeKeyAutoGeneratedKeyOnly {
-
-        private String key;
-        private String rangeKey;
-
-        @DynamoDbHashKey
-        public String getKey() {
-            return key;
-        }
-
-        public void setKey(String key) {
-            this.key = key;
-        }
-
-        @DynamoDbAutoGeneratedKey
-        @DynamoDbRangeKey
-        public String getRangeKey() {
-            return rangeKey;
-        }
-
-        public void setRangeKey(String rangeKey) {
-            this.rangeKey = rangeKey;
-        }
-
-        @Override
-        public int hashCode() {
-            final int prime = 31;
-            int result = 1;
-            result = prime * result + ((key == null) ? 0 : key.hashCode());
-            result = prime * result + ((rangeKey == null) ? 0 : rangeKey.hashCode());
-            return result;
-        }
-
-        @Override
-        public boolean equals(Object obj) {
-            if (this == obj) {
-                return true;
-            }
-            if (obj == null) {
-                return false;
-            }
-            if (getClass() != obj.getClass()) {
-                return false;
-            }
-            RangeKeyAutoGeneratedKeyOnly other = (RangeKeyAutoGeneratedKeyOnly) obj;
-            if (key == null) {
-                if (other.key != null) {
-                    return false;
-                }
-            } else if (!key.equals(other.key)) {
-                return false;
-            }
-            if (rangeKey == null) {
-                if (other.rangeKey != null) {
-                    return false;
-                }
-            } else if (!rangeKey.equals(other.rangeKey)) {
-                return false;
-            }
-            return true;
-        }
-
-    }
-
-    @DynamoDbTable(tableName = TABLE_NAME)
-    public static class NothingAutoGeneratedKeyOnly {
-
-        private String key;
-        private String rangeKey;
-
-        @DynamoDbHashKey
-        public String getKey() {
-            return key;
-        }
-
-        public void setKey(String key) {
-            this.key = key;
-        }
-
-        @DynamoDbRangeKey
-        public String getRangeKey() {
-            return rangeKey;
-        }
-
-        public void setRangeKey(String rangeKey) {
-            this.rangeKey = rangeKey;
-        }
-
-        @Override
-        public int hashCode() {
-            final int prime = 31;
-            int result = 1;
-            result = prime * result + ((key == null) ? 0 : key.hashCode());
-            result = prime * result + ((rangeKey == null) ? 0 : rangeKey.hashCode());
-            return result;
-        }
-
-        @Override
-        public boolean equals(Object obj) {
-            if (this == obj) {
-                return true;
-            }
-            if (obj == null) {
-                return false;
-            }
-            if (getClass() != obj.getClass()) {
-                return false;
-            }
-            NothingAutoGeneratedKeyOnly other = (NothingAutoGeneratedKeyOnly) obj;
-            if (key == null) {
-                if (other.key != null) {
-                    return false;
-                }
-            } else if (!key.equals(other.key)) {
-                return false;
-            }
-            if (rangeKey == null) {
-                if (other.rangeKey != null) {
-                    return false;
-                }
-            } else if (!rangeKey.equals(other.rangeKey)) {
-                return false;
-            }
-            return true;
-        }
-    }
-
-    @DynamoDbTable(tableName = TABLE_NAME)
-    public static class PrimaryKeysNotAutogeneratedIndexKeysAutogenerated {
-
-        private String key;
-        private String rangeKey;
-        private String gsiHashKey;
-        private String gsiRangeKey;
-
-        private static boolean isEqual(Object a, Object b) {
-            if (a == null || b == null) {
-                return a == null && b == null;
-            }
-            return a.equals(b);
-        }
-
-        @DynamoDbHashKey
-        public String getKey() {
-            return key;
-        }
-
-        public void setKey(String key) {
-            this.key = key;
-        }
-
-        @DynamoDbRangeKey
-        public String getRangeKey() {
-            return rangeKey;
-        }
-
-        public void setRangeKey(String rangeKey) {
-            this.rangeKey = rangeKey;
-        }
-
-        @DynamoDbIndexHashKey(globalSecondaryIndexName = GSI_NAME, attributeName = GSI_HASH_KEY)
-        @DynamoDbAutoGeneratedKey
-        public String getGsiHashKey() {
-            return gsiHashKey;
-        }
-
-        public void setGsiHashKey(String gsiHashKey) {
-            this.gsiHashKey = gsiHashKey;
-        }
-
-        @DynamoDbIndexRangeKey(globalSecondaryIndexName = GSI_NAME, attributeName = GSI_RANGE_KEY)
-        @DynamoDbAutoGeneratedKey
-        public String getGsiRangeKey() {
-            return gsiRangeKey;
-        }
-
-        public void setGsiRangeKey(String gsiRangeKey) {
-            this.gsiRangeKey = gsiRangeKey;
-        }
-
-        @Override
-        public boolean equals(Object object) {
-            if (!(object instanceof PrimaryKeysNotAutogeneratedIndexKeysAutogenerated)) {
-                return false;
-            }
-            PrimaryKeysNotAutogeneratedIndexKeysAutogenerated other = (PrimaryKeysNotAutogeneratedIndexKeysAutogenerated) object;
-
-            return isEqual(this.getKey(), other.getKey())
-                   && isEqual(this.getRangeKey(), other.getRangeKey())
-                   && isEqual(this.getGsiHashKey(), other.getGsiHashKey())
-                   && isEqual(this.getGsiRangeKey(), other.getGsiRangeKey());
-        }
-
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/AutoGeneratedTimestampIntegrationTest.java b/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/AutoGeneratedTimestampIntegrationTest.java
deleted file mode 100644
index 03048dd2d003..000000000000
--- a/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/AutoGeneratedTimestampIntegrationTest.java
+++ /dev/null
@@ -1,418 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.mapper;
-
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
-import java.util.UUID;
-import org.junit.Test;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbAutoGenerateStrategy;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbAutoGeneratedTimestamp;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbHashKey;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMapperConfig.SaveBehavior;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbTable;
-import software.amazon.awssdk.services.dynamodb.pojos.AutoKeyAndVal;
-import software.amazon.awssdk.services.dynamodb.pojos.KeyAndVal;
-
-/**
- * Tests updating component attribute fields correctly.
- */
-public class AutoGeneratedTimestampIntegrationTest extends AbstractKeyAndValIntegrationTestCase {
-
-    /**
-     * Test using {@code Calendar}.
-     */
-    @Test
-    public void testCalendarType() {
-        final KeyAndCalendarTimestamp object = new KeyAndCalendarTimestamp();
-        assertBeforeAndAfterChange(true, object);
-    }
-
-    /**
-     * Test using {@code Date}.
-     */
-    @Test
-    public void testDateType() {
-        final KeyAndDateTimestamp object = new KeyAndDateTimestamp();
-
-        assertBeforeAndAfterChange(true, object);
-    }
-
-    /**
-     * Test using a {@code Long}.
-     */
-    @Test
-    public void testLongType() {
-        final KeyAndLongTimestamp object = new KeyAndLongTimestamp();
-
-        assertBeforeAndAfterChange(true, object);
-    }
-
-    /**
-     * Test {@code DynamoDBAutoGenerateStrategy} of {@code ALWAYS}.
-     */
-    @Test
-    public void testAlwaysStrategy() {
-        final KeyAndDateTimestamp object = new KeyAndDateTimestamp();
-
-        assertBeforeAndAfterChange(true, object);
-        assertBeforeAndAfterChange(true, object);
-        assertBeforeAndAfterChange(true, object);
-    }
-
-    /**
-     * Test {@code DynamoDBAutoGenerateStrategy} of {@code ALWAYS}.
-     */
-    @Test
-    public void testAlwaysStrategyUpdateSkipNullAttribute() {
-        setUpTest(SaveBehavior.UPDATE_SKIP_NULL_ATTRIBUTES);
-
-        final KeyAndDateTimestamp object = new KeyAndDateTimestamp();
-
-        assertBeforeAndAfterChange(true, object);
-        assertBeforeAndAfterChange(true, object);
-        assertBeforeAndAfterChange(true, object);
-    }
-
-    /**
-     * Test {@code DynamoDBAutoGenerateStrategy} of {@code CREATE}.
-     */
-    @Test
-    public void testCreateStrategy() {
-        final KeyAndOnCreateDateTimestamp object = new KeyAndOnCreateDateTimestamp();
-
-        assertBeforeAndAfterChange(true, object);
-        assertBeforeAndAfterChange(false, object);
-        assertBeforeAndAfterChange(false, object);
-    }
-
-    /**
-     * Test {@code DynamoDBAutoGenerateStrategy} of {@code CREATE}.
-     */
-    @Test
-    public void testCreateStrategyUpdateSkipNullAttributes() {
-        setUpTest(SaveBehavior.UPDATE_SKIP_NULL_ATTRIBUTES);
-
-        final KeyAndOnCreateDateTimestamp object = new KeyAndOnCreateDateTimestamp();
-
-        assertBeforeAndAfterChange(true, object);
-        assertBeforeAndAfterChange(false, object);
-        assertBeforeAndAfterChange(false, object);
-    }
-
-    /**
-     * Test {@code DynamoDBAutoGenerateStrategy} of {@code ALWAYS}.
-     */
-    @Test
-    public void testAlwaysNoKey() {
-        final NoKeyAndOnAlwaysDateTimestamp object = new NoKeyAndOnAlwaysDateTimestamp();
-        object.setKey(UUID.randomUUID().toString());
-
-        assertBeforeAndAfterChange(true, object);
-        assertBeforeAndAfterChange(true, object);
-        assertBeforeAndAfterChange(true, object);
-    }
-
-    /**
-     * Test {@code DynamoDBAutoGenerateStrategy} of {@code ALWAYS}.
-     */
-    @Test
-    public void testAlwaysNoKeyUpdateSkipNullAttributes() {
-        setUpTest(SaveBehavior.UPDATE_SKIP_NULL_ATTRIBUTES);
-
-        final NoKeyAndOnAlwaysDateTimestamp object = new NoKeyAndOnAlwaysDateTimestamp();
-        object.setKey(UUID.randomUUID().toString());
-
-        assertBeforeAndAfterChange(true, object);
-        assertBeforeAndAfterChange(true, object);
-        assertBeforeAndAfterChange(true, object);
-    }
-
-    /**
-     * Test {@code DynamoDBAutoGenerateStrategy} of {@code CREATE}.
-     */
-    @Test
-    public void testCreateNoKey() {
-        final NoKeyAndOnCreateDateTimestamp object = new NoKeyAndOnCreateDateTimestamp();
-        object.setKey(UUID.randomUUID().toString());
-
-        assertBeforeAndAfterChange(true, object);
-        assertBeforeAndAfterChange(false, object);
-        assertBeforeAndAfterChange(false, object);
-    }
-
-    /**
-     * Test {@code DynamoDBAutoGenerateStrategy} of {@code CREATE}.
-     */
-    @Test
-    public void testCreateNoKeyUpdateSkipNullAttributes() {
-        setUpTest(SaveBehavior.UPDATE_SKIP_NULL_ATTRIBUTES);
-
-        final NoKeyAndOnCreateDateTimestamp object = new NoKeyAndOnCreateDateTimestamp();
-        object.setKey(UUID.randomUUID().toString());
-
-        assertBeforeAndAfterChange(false, object);
-        assertBeforeAndAfterChange(false, object);
-        assertBeforeAndAfterChange(false, object);
-    }
-
-    /**
-     * Test the batch save.
-     */
-    @Test
-    public void testAlwaysOnBatchSave() {
-        final List<KeyAndDateTimestamp> objects = new ArrayList<KeyAndDateTimestamp>();
-        for (int i = 0; i < 10; i++) {
-            objects.add(new KeyAndDateTimestamp());
-        }
-
-        assertBeforeAndAfterChange(true, objects);
-        assertBeforeAndAfterChange(true, objects);
-        assertBeforeAndAfterChange(true, objects);
-    }
-
-    /**
-     * Test the batch save.
-     */
-    @Test
-    public void testAlwaysOnBatchSaveUpdateSkipNullAttributes() {
-        setUpTest(SaveBehavior.UPDATE_SKIP_NULL_ATTRIBUTES);
-
-        final List<KeyAndDateTimestamp> objects = new ArrayList<KeyAndDateTimestamp>();
-        for (int i = 0; i < 10; i++) {
-            objects.add(new KeyAndDateTimestamp());
-        }
-
-        assertBeforeAndAfterChange(true, objects);
-        assertBeforeAndAfterChange(true, objects);
-        assertBeforeAndAfterChange(true, objects);
-    }
-
-    /**
-     * Test the batch save.
-     */
-    @Test
-    public void testCreateOnBatchSave() {
-        final List<KeyAndOnCreateDateTimestamp> objects = new ArrayList<KeyAndOnCreateDateTimestamp>();
-        for (int i = 0; i < 10; i++) {
-            objects.add(new KeyAndOnCreateDateTimestamp());
-        }
-
-        assertBeforeAndAfterChange(true, objects);
-        assertBeforeAndAfterChange(false, objects);
-        assertBeforeAndAfterChange(false, objects);
-    }
-
-    /**
-     * Test the batch save.
-     */
-    @Test
-    public void testCreateOnBatchSaveUpdateSkipNullAttributes() {
-        setUpTest(SaveBehavior.UPDATE_SKIP_NULL_ATTRIBUTES);
-
-        final List<KeyAndOnCreateDateTimestamp> objects = new ArrayList<KeyAndOnCreateDateTimestamp>();
-        for (int i = 0; i < 10; i++) {
-            objects.add(new KeyAndOnCreateDateTimestamp());
-        }
-
-        assertBeforeAndAfterChange(true, objects);
-        assertBeforeAndAfterChange(false, objects);
-        assertBeforeAndAfterChange(false, objects);
-    }
-
-    /**
-     * Test the batch save.
-     */
-    @Test
-    public void testAlwaysNoKeyOnBatchSave() {
-        final List<NoKeyAndOnAlwaysDateTimestamp> objects = new ArrayList<NoKeyAndOnAlwaysDateTimestamp>();
-        for (int i = 0; i < 10; i++) {
-            final NoKeyAndOnAlwaysDateTimestamp object = new NoKeyAndOnAlwaysDateTimestamp();
-            object.setKey(UUID.randomUUID().toString());
-            objects.add(object);
-        }
-
-        assertBeforeAndAfterChange(true, objects);
-        assertBeforeAndAfterChange(true, objects);
-        assertBeforeAndAfterChange(true, objects);
-    }
-
-    /**
-     * Test the batch save.
-     */
-    @Test
-    public void testAlwaysNoKeyOnBatchSaveUpdateSkipNullAttributes() {
-        setUpTest(SaveBehavior.UPDATE_SKIP_NULL_ATTRIBUTES);
-
-        final List<NoKeyAndOnAlwaysDateTimestamp> objects = new ArrayList<NoKeyAndOnAlwaysDateTimestamp>();
-        for (int i = 0; i < 10; i++) {
-            final NoKeyAndOnAlwaysDateTimestamp object = new NoKeyAndOnAlwaysDateTimestamp();
-            object.setKey(UUID.randomUUID().toString());
-            objects.add(object);
-        }
-
-        assertBeforeAndAfterChange(true, objects);
-        assertBeforeAndAfterChange(true, objects);
-        assertBeforeAndAfterChange(true, objects);
-    }
-
-    /**
-     * Test the batch save.
-     */
-    @Test
-    public void testCreateNoKeyOnBatchSave() {
-        final List<NoKeyAndOnCreateDateTimestamp> objects = new ArrayList<NoKeyAndOnCreateDateTimestamp>();
-        for (int i = 0; i < 10; i++) {
-            final NoKeyAndOnCreateDateTimestamp object = new NoKeyAndOnCreateDateTimestamp();
-            object.setKey(UUID.randomUUID().toString());
-            objects.add(object);
-        }
-
-        assertBeforeAndAfterChange(true, objects);
-        assertBeforeAndAfterChange(false, objects);
-        assertBeforeAndAfterChange(false, objects);
-    }
-
-    /**
-     * Test the batch save.
-     */
-    @Test
-    public void testCreateNoKeyOnBatchSaveUpdateSkipNullAttributes() {
-        setUpTest(SaveBehavior.UPDATE_SKIP_NULL_ATTRIBUTES);
-
-        final List<NoKeyAndOnCreateDateTimestamp> objects = new ArrayList<NoKeyAndOnCreateDateTimestamp>();
-        for (int i = 0; i < 10; i++) {
-            final NoKeyAndOnCreateDateTimestamp object = new NoKeyAndOnCreateDateTimestamp();
-            object.setKey(UUID.randomUUID().toString());
-            objects.add(object);
-        }
-
-        assertBeforeAndAfterChange(false, objects);
-        assertBeforeAndAfterChange(false, objects);
-        assertBeforeAndAfterChange(false, objects);
-    }
-
-    /**
-     * An object with {@code Calendar}.
-     */
-    @DynamoDbTable(tableName = "aws-java-sdk-util")
-    public static class KeyAndCalendarTimestamp extends AutoKeyAndVal<Calendar> {
-        @DynamoDbAutoGeneratedTimestamp
-        public Calendar getVal() {
-            return super.getVal();
-        }
-
-        public void setVal(final Calendar val) {
-            super.setVal(val);
-        }
-    }
-
-    /**
-     * An object with {@code Date}.
-     */
-    @DynamoDbTable(tableName = "aws-java-sdk-util")
-    public static class KeyAndDateTimestamp extends AutoKeyAndVal<Date> {
-        @DynamoDbAutoGeneratedTimestamp
-        public Date getVal() {
-            return super.getVal();
-        }
-
-        public void setVal(final Date val) {
-            super.setVal(val);
-        }
-    }
-
-    /**
-     * An object with {@code Long}.
-     */
-    @DynamoDbTable(tableName = "aws-java-sdk-util")
-    public static class KeyAndLongTimestamp extends AutoKeyAndVal<Long> {
-        @DynamoDbAutoGeneratedTimestamp
-        public Long getVal() {
-            return super.getVal();
-        }
-
-        public void setVal(final Long val) {
-            super.setVal(val);
-        }
-    }
-
-    /**
-     * An object with {@code Date} only on {@code CREATE}.
-     */
-    @DynamoDbTable(tableName = "aws-java-sdk-util")
-    public static class KeyAndOnCreateDateTimestamp extends AutoKeyAndVal<Date> {
-        @DynamoDbAutoGeneratedTimestamp(strategy = DynamoDbAutoGenerateStrategy.CREATE)
-        public Date getVal() {
-            return super.getVal();
-        }
-
-        public void setVal(final Date val) {
-            super.setVal(val);
-        }
-    }
-
-    /**
-     * An object with {@code Date} not auto-generted key.
-     */
-    @DynamoDbTable(tableName = "aws-java-sdk-util")
-    public static class NoKeyAndOnAlwaysDateTimestamp extends KeyAndVal<String, Date> {
-        @DynamoDbHashKey
-        public String getKey() {
-            return super.getKey();
-        }
-
-        public void setKey(final String key) {
-            super.setKey(key);
-        }
-
-        @DynamoDbAutoGeneratedTimestamp
-        public Date getVal() {
-            return super.getVal();
-        }
-
-        public void setVal(final Date val) {
-            super.setVal(val);
-        }
-    }
-
-    /**
-     * An object with {@code Date} not auto-generted key.
-     */
-    @DynamoDbTable(tableName = "aws-java-sdk-util")
-    public static class NoKeyAndOnCreateDateTimestamp extends KeyAndVal<String, Date> {
-        @DynamoDbHashKey
-        public String getKey() {
-            return super.getKey();
-        }
-
-        public void setKey(final String key) {
-            super.setKey(key);
-        }
-
-        @DynamoDbAutoGeneratedTimestamp(strategy = DynamoDbAutoGenerateStrategy.CREATE)
-        public Date getVal() {
-            return super.getVal();
-        }
-
-        public void setVal(final Date val) {
-            super.setVal(val);
-        }
-    }
-
-}
diff --git a/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/BatchWriteIntegrationTest.java b/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/BatchWriteIntegrationTest.java
deleted file mode 100644
index d17b90385d4f..000000000000
--- a/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/BatchWriteIntegrationTest.java
+++ /dev/null
@@ -1,438 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.mapper;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.fail;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Calendar;
-import java.util.Collections;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Set;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import software.amazon.awssdk.services.dynamodb.DynamoDBMapperIntegrationTestBase;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMapper;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMapper.FailedBatch;
-import software.amazon.awssdk.services.dynamodb.pojos.BinaryAttributeByteBufferClass;
-import software.amazon.awssdk.services.dynamodb.pojos.RangeKeyClass;
-
-/**
- * Tests batch write calls
- */
-public class BatchWriteIntegrationTest extends DynamoDBMapperIntegrationTestBase {
-
-    // We don't start with the current system millis like other tests because
-    // it's out of the range of some data types
-    private static int start = 1;
-    private static int byteStart = 1;
-    private static int startKeyDebug = 1;
-
-    @BeforeClass
-    public static void setUp() throws Exception {
-        setUpTableWithRangeAttribute();
-    }
-
-    @Test
-    public void testBatchSave() throws Exception {
-        List<NumberSetAttributeClass> objs = new ArrayList<NumberSetAttributeClass>();
-        for (int i = 0; i < 40; i++) {
-            NumberSetAttributeClass obj = getUniqueNumericObject();
-            objs.add(obj);
-        }
-
-        DynamoDbMapper mapper = new DynamoDbMapper(dynamo);
-        List<FailedBatch> failedBatches = mapper.batchSave(objs);
-
-        assertEquals(0, failedBatches.size());
-
-        for (NumberSetAttributeClass obj : objs) {
-            NumberSetAttributeClass loaded = mapper.load(NumberSetAttributeClass.class, obj.getKey());
-            assertEquals(obj, loaded);
-        }
-    }
-
-    @Test
-    public void testBatchSaveAsArray() throws Exception {
-        List<NumberSetAttributeClass> objs = new ArrayList<NumberSetAttributeClass>();
-        for (int i = 0; i < 40; i++) {
-            NumberSetAttributeClass obj = getUniqueNumericObject();
-            objs.add(obj);
-        }
-
-        DynamoDbMapper mapper = new DynamoDbMapper(dynamo);
-        NumberSetAttributeClass[] objsArray = objs.toArray(new NumberSetAttributeClass[objs.size()]);
-        mapper.batchSave((Object[]) objsArray);
-
-        for (NumberSetAttributeClass obj : objs) {
-            NumberSetAttributeClass loaded = mapper.load(NumberSetAttributeClass.class, obj.getKey());
-            assertEquals(obj, loaded);
-        }
-    }
-
-    @Test
-    public void testBatchSaveAsListFromArray() throws Exception {
-        List<NumberSetAttributeClass> objs = new ArrayList<NumberSetAttributeClass>();
-        for (int i = 0; i < 40; i++) {
-            NumberSetAttributeClass obj = getUniqueNumericObject();
-            objs.add(obj);
-        }
-
-        DynamoDbMapper mapper = new DynamoDbMapper(dynamo);
-        NumberSetAttributeClass[] objsArray = objs.toArray(new NumberSetAttributeClass[objs.size()]);
-        mapper.batchSave(Arrays.asList(objsArray));
-
-        for (NumberSetAttributeClass obj : objs) {
-            NumberSetAttributeClass loaded = mapper.load(NumberSetAttributeClass.class, obj.getKey());
-            assertEquals(obj, loaded);
-        }
-    }
-
-    @Test
-    public void testBatchDelete() throws Exception {
-        List<NumberSetAttributeClass> objs = new ArrayList<NumberSetAttributeClass>();
-        for (int i = 0; i < 40; i++) {
-            NumberSetAttributeClass obj = getUniqueNumericObject();
-            objs.add(obj);
-        }
-
-        DynamoDbMapper mapper = new DynamoDbMapper(dynamo);
-        mapper.batchSave(objs);
-
-        for (NumberSetAttributeClass obj : objs) {
-            NumberSetAttributeClass loaded = mapper.load(NumberSetAttributeClass.class, obj.getKey());
-            assertEquals(obj, loaded);
-        }
-
-        // Delete the odd ones
-        int i = 0;
-        List<NumberSetAttributeClass> toDelete = new LinkedList<NumberSetAttributeClass>();
-        for (NumberSetAttributeClass obj : objs) {
-            if (i++ % 2 == 0) {
-                toDelete.add(obj);
-            }
-        }
-
-        mapper.batchDelete(toDelete);
-
-        i = 0;
-        for (NumberSetAttributeClass obj : objs) {
-            NumberSetAttributeClass loaded = mapper.load(NumberSetAttributeClass.class, obj.getKey());
-            if (i++ % 2 == 0) {
-                assertNull(loaded);
-            } else {
-                assertEquals(obj, loaded);
-            }
-        }
-    }
-
-    @Test
-    public void testBatchSaveAndDelete() throws Exception {
-        List<NumberSetAttributeClass> objs = new ArrayList<NumberSetAttributeClass>();
-        for (int i = 0; i < 40; i++) {
-            NumberSetAttributeClass obj = getUniqueNumericObject();
-            objs.add(obj);
-        }
-
-        DynamoDbMapper mapper = new DynamoDbMapper(dynamo);
-        mapper.batchSave(objs);
-
-        for (NumberSetAttributeClass obj : objs) {
-            NumberSetAttributeClass loaded = mapper.load(NumberSetAttributeClass.class, obj.getKey());
-            assertEquals(obj, loaded);
-        }
-
-        // Delete the odd ones
-        int i = 0;
-        List<NumberSetAttributeClass> toDelete = new LinkedList<NumberSetAttributeClass>();
-        for (NumberSetAttributeClass obj : objs) {
-            if (i++ % 2 == 0) {
-                toDelete.add(obj);
-            }
-        }
-
-        // And add a bunch of new ones
-        List<NumberSetAttributeClass> toSave = new LinkedList<NumberSetAttributeClass>();
-        for (i = 0; i < 50; i++) {
-            NumberSetAttributeClass obj = getUniqueNumericObject();
-            toSave.add(obj);
-        }
-
-        mapper.batchWrite(toSave, toDelete);
-
-        i = 0;
-        for (NumberSetAttributeClass obj : objs) {
-            NumberSetAttributeClass loaded = mapper.load(NumberSetAttributeClass.class, obj.getKey());
-            if (i++ % 2 == 0) {
-                assertNull(loaded);
-            } else {
-                assertEquals(obj, loaded);
-            }
-        }
-
-        for (NumberSetAttributeClass obj : toSave) {
-            NumberSetAttributeClass loaded = mapper.load(NumberSetAttributeClass.class, obj.getKey());
-            assertEquals(obj, loaded);
-        }
-    }
-
-    @Test
-    public void testMultipleTables() throws Exception {
-
-        List<Object> objs = new ArrayList<Object>();
-        int numItems = 10;
-        for (int i = 0; i < numItems; i++) {
-            NumberSetAttributeClass obj = getUniqueNumericObject();
-            objs.add(obj);
-        }
-        for (int i = 0; i < numItems; i++) {
-            RangeKeyClass obj = getUniqueRangeKeyObject();
-            objs.add(obj);
-        }
-        Collections.shuffle(objs);
-
-        DynamoDbMapper mapper = new DynamoDbMapper(dynamo);
-        List<FailedBatch> failedBatches = mapper.batchSave(objs);
-        assertEquals(failedBatches.size(), 0);
-
-        for (Object obj : objs) {
-            Object loaded = null;
-            if (obj instanceof NumberSetAttributeClass) {
-                loaded = mapper.load(NumberSetAttributeClass.class, ((NumberSetAttributeClass) obj).getKey());
-            } else if (obj instanceof RangeKeyClass) {
-                loaded = mapper.load(RangeKeyClass.class, ((RangeKeyClass) obj).getKey(),
-                                     ((RangeKeyClass) obj).getRangeKey());
-            } else {
-                fail();
-            }
-            assertEquals(obj, loaded);
-        }
-
-        // Delete the odd ones
-        int i = 0;
-        List<Object> toDelete = new LinkedList<Object>();
-        for (Object obj : objs) {
-            if (i++ % 2 == 0) {
-                toDelete.add(obj);
-            }
-        }
-
-        // And add a bunch of new ones
-        List<Object> toSave = new LinkedList<Object>();
-        for (i = 0; i < numItems; i++) {
-            if (i % 2 == 0) {
-                toSave.add(getUniqueNumericObject());
-            } else {
-                toSave.add(getUniqueRangeKeyObject());
-            }
-        }
-
-        failedBatches = mapper.batchWrite(toSave, toDelete);
-        assertEquals(0, failedBatches.size());
-
-        i = 0;
-        for (Object obj : objs) {
-            Object loaded = null;
-            if (obj instanceof NumberSetAttributeClass) {
-                loaded = mapper.load(NumberSetAttributeClass.class, ((NumberSetAttributeClass) obj).getKey());
-            } else if (obj instanceof RangeKeyClass) {
-                loaded = mapper.load(RangeKeyClass.class, ((RangeKeyClass) obj).getKey(),
-                                     ((RangeKeyClass) obj).getRangeKey());
-            } else {
-                fail();
-            }
-
-            if (i++ % 2 == 0) {
-                assertNull(loaded);
-            } else {
-                assertEquals(obj, loaded);
-            }
-        }
-
-        for (Object obj : toSave) {
-            Object loaded = null;
-            if (obj instanceof NumberSetAttributeClass) {
-                loaded = mapper.load(NumberSetAttributeClass.class, ((NumberSetAttributeClass) obj).getKey());
-            } else if (obj instanceof RangeKeyClass) {
-                loaded = mapper.load(RangeKeyClass.class, ((RangeKeyClass) obj).getKey(),
-                                     ((RangeKeyClass) obj).getRangeKey());
-            } else {
-                fail();
-            }
-            assertEquals(obj, loaded);
-        }
-    }
-
-    /**
-     * Test whether it finish processing all the items even if the first batch is failed.
-     */
-    @Test
-    public void testErrorHandling() {
-
-        List<Object> objs = new ArrayList<Object>();
-        int numItems = 25;
-
-        for (int i = 0; i < numItems; i++) {
-            NoSuchTableClass obj = getuniqueBadObject();
-            objs.add(obj);
-        }
-
-        for (int i = 0; i < numItems; i++) {
-            RangeKeyClass obj = getUniqueRangeKeyObject();
-            objs.add(obj);
-        }
-
-        DynamoDbMapper mapper = new DynamoDbMapper(dynamo);
-
-        // The failed batch
-        List<FailedBatch> failedBatches = mapper.batchSave(objs);
-        assertEquals(1, failedBatches.size());
-        assertEquals(numItems, failedBatches.get(0).getUnprocessedItems().get("tableNotExist").size());
-
-        // The second batch succeeds, get them back
-        for (Object obj : objs.subList(25, 50)) {
-            RangeKeyClass loaded = mapper
-                    .load(RangeKeyClass.class, ((RangeKeyClass) obj).getKey(), ((RangeKeyClass) obj).getRangeKey());
-            assertEquals(obj, loaded);
-        }
-    }
-
-    /**
-     * Test whether we can split large batch request into small pieces.
-     */
-    // DynamoDB changed their error for requests that are too large from a
-    // 413 (RequestEntityTooLarge) to a generic 400 (ValidationException), so
-    // the mapper's batch-splitting logic is broken. Not sure there's a good
-    // fix client-side without the service changing back to 413 so we can
-    // distinguish this case from other ValidationExceptions.
-    // @Test
-    public void testLargeRequestEntity() {
-
-        // The total batch size is beyond 1M, test whether our client can split
-        // the batch correctly
-        List<BinaryAttributeByteBufferClass> objs = new ArrayList<BinaryAttributeByteBufferClass>();
-
-        int numItems = 25;
-        final int CONTENT_LENGTH = 1024 * 25;
-
-        for (int i = 0; i < numItems; i++) {
-            BinaryAttributeByteBufferClass obj = getUniqueByteBufferObject(CONTENT_LENGTH);
-            objs.add(obj);
-        }
-
-        DynamoDbMapper mapper = new DynamoDbMapper(dynamo);
-        List<FailedBatch> failedBatches = mapper.batchSave(objs);
-        assertEquals(0, failedBatches.size());
-
-        // Get these objects back
-        for (BinaryAttributeByteBufferClass obj : objs) {
-            BinaryAttributeByteBufferClass loaded = mapper.load(BinaryAttributeByteBufferClass.class, obj.getKey());
-            assertEquals(obj, loaded);
-        }
-
-        // There are three super large item together with some small ones, test
-        // whether we can successfully
-        // save these small items.
-        objs.clear();
-        numItems = 10;
-        List<BinaryAttributeByteBufferClass> largeObjs = new ArrayList<BinaryAttributeByteBufferClass>();
-
-        // Put three super large item(beyond 64k)
-        largeObjs.add(getUniqueByteBufferObject(CONTENT_LENGTH * 30));
-        largeObjs.add(getUniqueByteBufferObject(CONTENT_LENGTH * 30));
-        largeObjs.add(getUniqueByteBufferObject(CONTENT_LENGTH * 30));
-        for (int i = 0; i < numItems - 3; i++) {
-            BinaryAttributeByteBufferClass obj = getUniqueByteBufferObject(CONTENT_LENGTH / 25);
-            objs.add(obj);
-        }
-
-        objs.addAll(largeObjs);
-
-        failedBatches = mapper.batchSave(objs);
-        assertEquals(3, failedBatches.size());
-        objs.removeAll(largeObjs);
-
-        // Get these small objects back
-        for (BinaryAttributeByteBufferClass obj : objs) {
-            BinaryAttributeByteBufferClass loaded = mapper.load(BinaryAttributeByteBufferClass.class, obj.getKey());
-            assertEquals(obj, loaded);
-        }
-
-        // The whole batch is super large objects, none of them will be
-        // processed
-        largeObjs.clear();
-        for (int i = 0; i < 5; i++) {
-            BinaryAttributeByteBufferClass obj = getUniqueByteBufferObject(CONTENT_LENGTH * 30);
-            largeObjs.add(obj);
-        }
-        failedBatches = mapper.batchSave(largeObjs);
-        assertEquals(5, failedBatches.size());
-    }
-
-
-    private NoSuchTableClass getuniqueBadObject() {
-        NoSuchTableClass obj = new NoSuchTableClass();
-        obj.setKey(String.valueOf(startKeyDebug++));
-        return obj;
-    }
-
-    private NumberSetAttributeClass getUniqueNumericObject() {
-        NumberSetAttributeClass obj = new NumberSetAttributeClass();
-        obj.setKey(String.valueOf(startKeyDebug++));
-        obj.setBigDecimalAttribute(toSet(new BigDecimal(startKey++), new BigDecimal(startKey++), new BigDecimal(startKey++)));
-        obj.setBigIntegerAttribute(
-                toSet(new BigInteger("" + startKey++), new BigInteger("" + startKey++), new BigInteger("" + startKey++)));
-        obj.setByteObjectAttribute(toSet(new Byte(nextByte()), new Byte(nextByte()), new Byte(nextByte())));
-        obj.setDoubleObjectAttribute(toSet(new Double("" + start++), new Double("" + start++), new Double("" + start++)));
-        obj.setFloatObjectAttribute(toSet(new Float("" + start++), new Float("" + start++), new Float("" + start++)));
-        obj.setIntegerAttribute(toSet(new Integer("" + start++), new Integer("" + start++), new Integer("" + start++)));
-        obj.setLongObjectAttribute(toSet(new Long("" + start++), new Long("" + start++), new Long("" + start++)));
-        obj.setBooleanAttribute(toSet(true, false));
-        obj.setDateAttribute(toSet(new Date(startKey++), new Date(startKey++), new Date(startKey++)));
-        Set<Calendar> cals = new HashSet<Calendar>();
-        for (Date d : obj.getDateAttribute()) {
-            Calendar cal = GregorianCalendar.getInstance();
-            cal.setTime(d);
-            cals.add(cal);
-        }
-        obj.setCalendarAttribute(toSet(cals));
-        return obj;
-    }
-
-    private RangeKeyClass getUniqueRangeKeyObject() {
-        RangeKeyClass obj = new RangeKeyClass();
-        obj.setKey(startKey++);
-        obj.setIntegerAttribute(toSet(start++, start++, start++));
-        obj.setBigDecimalAttribute(new BigDecimal(startKey++));
-        obj.setRangeKey(start++);
-        obj.setStringAttribute("" + startKey++);
-        obj.setStringSetAttribute(toSet("" + startKey++, "" + startKey++, "" + startKey++));
-        return obj;
-    }
-
-    private String nextByte() {
-        return "" + byteStart++ % Byte.MAX_VALUE;
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/BinaryAttributesIntegrationTest.java b/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/BinaryAttributesIntegrationTest.java
deleted file mode 100644
index 32a95998d2be..000000000000
--- a/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/BinaryAttributesIntegrationTest.java
+++ /dev/null
@@ -1,281 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.mapper;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
-import software.amazon.awssdk.core.SdkBytes;
-import software.amazon.awssdk.services.dynamodb.DynamoDBMapperIntegrationTestBase;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMapper;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-import software.amazon.awssdk.services.dynamodb.model.PutItemRequest;
-import software.amazon.awssdk.services.dynamodb.pojos.BinaryAttributeByteArrayClass;
-import software.amazon.awssdk.services.dynamodb.pojos.BinaryAttributeByteBufferClass;
-
-/**
- * Tests simple string attributes
- */
-public class BinaryAttributesIntegrationTest extends DynamoDBMapperIntegrationTestBase {
-
-    private static final String BINARY_ATTRIBUTE = "binaryAttribute";
-    private static final String BINARY_SET_ATTRIBUTE = "binarySetAttribute";
-    private static final List<Map<String, AttributeValue>> ATTRIBUTES = new LinkedList<Map<String, AttributeValue>>();
-    private static final int CONTENT_LENGTH = 512;
-
-    // Test data
-    static {
-        Map<String, AttributeValue> attr = new HashMap<String, AttributeValue>();
-        attr.put(KEY_NAME, AttributeValue.builder().s("" + startKey++).build());
-        attr.put(BINARY_ATTRIBUTE, AttributeValue.builder().b(SdkBytes.fromByteArray(generateByteArray(CONTENT_LENGTH))).build());
-        attr.put(BINARY_SET_ATTRIBUTE, AttributeValue.builder().bs(SdkBytes.fromByteArray(generateByteArray(CONTENT_LENGTH)),
-                                                                   SdkBytes.fromByteArray(generateByteArray(CONTENT_LENGTH + 1))).build());
-        ATTRIBUTES.add(attr);
-
-    }
-
-    ;
-
-    @BeforeClass
-    public static void setUp() throws Exception {
-        DynamoDBMapperIntegrationTestBase.setUp();
-
-        // Insert the data
-        for (Map<String, AttributeValue> attr : ATTRIBUTES) {
-            dynamo.putItem(PutItemRequest.builder().tableName(TABLE_NAME).item(attr).build());
-        }
-    }
-
-    @Test
-    public void testLoad() throws Exception {
-        DynamoDbMapper util = new DynamoDbMapper(dynamo);
-
-        for (Map<String, AttributeValue> attr : ATTRIBUTES) {
-            // test BinaryAttributeClass
-            BinaryAttributeByteBufferClass x = util.load(BinaryAttributeByteBufferClass.class, attr.get(KEY_NAME).s());
-            assertEquals(x.getKey(), attr.get(KEY_NAME).s());
-            assertEquals(x.getBinaryAttribute(), ByteBuffer.wrap(generateByteArray(CONTENT_LENGTH)));
-            assertTrue(x.getBinarySetAttribute().contains(ByteBuffer.wrap(generateByteArray(CONTENT_LENGTH))));
-            assertTrue(x.getBinarySetAttribute().contains(ByteBuffer.wrap(generateByteArray(CONTENT_LENGTH + 1))));
-
-            // test BinaryAttributeByteArrayClass
-            BinaryAttributeByteArrayClass y = util.load(BinaryAttributeByteArrayClass.class, attr.get(KEY_NAME).s());
-            assertEquals(y.getKey(), attr.get(KEY_NAME).s());
-            assertTrue(Arrays.equals(y.getBinaryAttribute(), (generateByteArray(CONTENT_LENGTH))));
-            assertEquals(2, y.getBinarySetAttribute().size());
-            assertTrue(setContainsBytes(y.getBinarySetAttribute(), generateByteArray(CONTENT_LENGTH)));
-            assertTrue(setContainsBytes(y.getBinarySetAttribute(), generateByteArray(CONTENT_LENGTH + 1)));
-        }
-
-    }
-
-    @Test
-    public void testSave() {
-        // test BinaryAttributeClass
-        List<BinaryAttributeByteBufferClass> byteBufferObjs = new ArrayList<BinaryAttributeByteBufferClass>();
-        for (int i = 0; i < 5; i++) {
-            BinaryAttributeByteBufferClass obj = getUniqueByteBufferObject(CONTENT_LENGTH);
-            byteBufferObjs.add(obj);
-        }
-
-        DynamoDbMapper util = new DynamoDbMapper(dynamo);
-        for (BinaryAttributeByteBufferClass obj : byteBufferObjs) {
-            util.save(obj);
-        }
-
-        for (BinaryAttributeByteBufferClass obj : byteBufferObjs) {
-            BinaryAttributeByteBufferClass loaded = util.load(BinaryAttributeByteBufferClass.class, obj.getKey());
-            assertEquals(loaded.getKey(), obj.getKey());
-            assertEquals(loaded.getBinaryAttribute(), ByteBuffer.wrap(generateByteArray(CONTENT_LENGTH)));
-            assertTrue(loaded.getBinarySetAttribute().contains(ByteBuffer.wrap(generateByteArray(CONTENT_LENGTH))));
-        }
-
-        // test BinaryAttributeByteArrayClass
-        List<BinaryAttributeByteArrayClass> bytesObjs = new ArrayList<BinaryAttributeByteArrayClass>();
-        for (int i = 0; i < 5; i++) {
-            BinaryAttributeByteArrayClass obj = getUniqueBytesObject(CONTENT_LENGTH);
-            bytesObjs.add(obj);
-        }
-
-        for (BinaryAttributeByteArrayClass obj : bytesObjs) {
-            util.save(obj);
-        }
-
-        for (BinaryAttributeByteArrayClass obj : bytesObjs) {
-            BinaryAttributeByteArrayClass loaded = util.load(BinaryAttributeByteArrayClass.class, obj.getKey());
-            assertEquals(loaded.getKey(), obj.getKey());
-            assertTrue(Arrays.equals(loaded.getBinaryAttribute(), (generateByteArray(CONTENT_LENGTH))));
-            assertEquals(1, loaded.getBinarySetAttribute().size());
-            assertTrue(setContainsBytes(loaded.getBinarySetAttribute(), generateByteArray(CONTENT_LENGTH)));
-        }
-    }
-
-    /**
-     * Tests saving an incomplete object into DynamoDB
-     */
-    @Test
-    public void testIncompleteObject() {
-        // test BinaryAttributeClass
-        BinaryAttributeByteBufferClass byteBufferObj = getUniqueByteBufferObject(CONTENT_LENGTH);
-        byteBufferObj.setBinarySetAttribute(null);
-        DynamoDbMapper util = new DynamoDbMapper(dynamo);
-        util.save(byteBufferObj);
-
-        BinaryAttributeByteBufferClass loadedX = util.load(BinaryAttributeByteBufferClass.class, byteBufferObj.getKey());
-        assertEquals(loadedX.getKey(), byteBufferObj.getKey());
-        assertEquals(loadedX.getBinaryAttribute(), ByteBuffer.wrap(generateByteArray(CONTENT_LENGTH)));
-        assertEquals(loadedX.getBinarySetAttribute(), null);
-
-
-        // test removing an attribute
-        assertNotNull(byteBufferObj.getBinaryAttribute());
-        byteBufferObj.setBinaryAttribute(null);
-        util.save(byteBufferObj);
-
-        loadedX = util.load(BinaryAttributeByteBufferClass.class, byteBufferObj.getKey());
-        assertEquals(loadedX.getKey(), byteBufferObj.getKey());
-        assertEquals(loadedX.getBinaryAttribute(), null);
-        assertEquals(loadedX.getBinarySetAttribute(), null);
-
-        // test BinaryAttributeByteArrayClass
-        BinaryAttributeByteArrayClass bytesObj = getUniqueBytesObject(CONTENT_LENGTH);
-        bytesObj.setBinarySetAttribute(null);
-        util.save(bytesObj);
-
-        BinaryAttributeByteArrayClass loadedY = util.load(BinaryAttributeByteArrayClass.class, bytesObj.getKey());
-        assertEquals(loadedY.getKey(), bytesObj.getKey());
-        assertTrue(Arrays.equals(loadedY.getBinaryAttribute(), generateByteArray(CONTENT_LENGTH)));
-        assertEquals(loadedY.getBinarySetAttribute(), null);
-
-
-        // test removing an attribute
-        assertNotNull(bytesObj.getBinaryAttribute());
-        bytesObj.setBinaryAttribute(null);
-        util.save(bytesObj);
-
-        loadedY = util.load(BinaryAttributeByteArrayClass.class, bytesObj.getKey());
-        assertEquals(loadedY.getKey(), bytesObj.getKey());
-        assertEquals(loadedY.getBinaryAttribute(), null);
-        assertEquals(loadedY.getBinarySetAttribute(), null);
-    }
-
-    @Test
-    public void testUpdate() {
-        // test BinaryAttributeClass
-        List<BinaryAttributeByteBufferClass> byteBufferObjs = new ArrayList<BinaryAttributeByteBufferClass>();
-        for (int i = 0; i < 5; i++) {
-            BinaryAttributeByteBufferClass obj = getUniqueByteBufferObject(CONTENT_LENGTH);
-            byteBufferObjs.add(obj);
-        }
-
-        DynamoDbMapper util = new DynamoDbMapper(dynamo);
-        for (BinaryAttributeByteBufferClass obj : byteBufferObjs) {
-            util.save(obj);
-        }
-
-        for (BinaryAttributeByteBufferClass obj : byteBufferObjs) {
-            BinaryAttributeByteBufferClass replacement = getUniqueByteBufferObject(CONTENT_LENGTH - 1);
-            replacement.setKey(obj.getKey());
-            util.save(replacement);
-
-            BinaryAttributeByteBufferClass loaded = util.load(BinaryAttributeByteBufferClass.class, obj.getKey());
-            assertEquals(loaded.getKey(), obj.getKey());
-            assertEquals(loaded.getBinaryAttribute(), ByteBuffer.wrap(generateByteArray(CONTENT_LENGTH - 1)));
-            assertTrue(loaded.getBinarySetAttribute().contains(ByteBuffer.wrap(generateByteArray(CONTENT_LENGTH - 1))));
-
-        }
-
-        // test BinaryAttributeByteArrayClass
-        List<BinaryAttributeByteArrayClass> bytesObj = new ArrayList<BinaryAttributeByteArrayClass>();
-        for (int i = 0; i < 5; i++) {
-            BinaryAttributeByteArrayClass obj = getUniqueBytesObject(CONTENT_LENGTH);
-            bytesObj.add(obj);
-        }
-
-        for (BinaryAttributeByteArrayClass obj : bytesObj) {
-            util.save(obj);
-        }
-
-        for (BinaryAttributeByteArrayClass obj : bytesObj) {
-            BinaryAttributeByteArrayClass replacement = getUniqueBytesObject(CONTENT_LENGTH - 1);
-            replacement.setKey(obj.getKey());
-            util.save(replacement);
-
-            BinaryAttributeByteArrayClass loaded = util.load(BinaryAttributeByteArrayClass.class, obj.getKey());
-            assertEquals(loaded.getKey(), obj.getKey());
-            assertTrue(Arrays.equals(loaded.getBinaryAttribute(), (generateByteArray(CONTENT_LENGTH - 1))));
-            assertEquals(1, loaded.getBinarySetAttribute().size());
-            assertTrue(setContainsBytes(loaded.getBinarySetAttribute(), generateByteArray(CONTENT_LENGTH - 1)));
-
-        }
-    }
-
-    @Test
-    @Ignore // FIXME: Mapper needs to be be updated to be aware of AutoConstructMap
-    public void testDelete() throws Exception {
-        // test BinaryAttributeClass
-        BinaryAttributeByteBufferClass byteBufferObj = getUniqueByteBufferObject(CONTENT_LENGTH);
-        DynamoDbMapper util = new DynamoDbMapper(dynamo);
-        util.save(byteBufferObj);
-
-        util.delete(byteBufferObj);
-        assertNull(util.load(BinaryAttributeByteBufferClass.class, byteBufferObj.getKey()));
-
-        // test BinaryAttributeByteArrayClass
-        BinaryAttributeByteArrayClass bytesObj = getUniqueBytesObject(CONTENT_LENGTH);
-        util.save(bytesObj);
-
-        util.delete(bytesObj);
-        assertNull(util.load(BinaryAttributeByteArrayClass.class, bytesObj.getKey()));
-
-    }
-
-    private BinaryAttributeByteArrayClass getUniqueBytesObject(int contentLength) {
-        BinaryAttributeByteArrayClass obj = new BinaryAttributeByteArrayClass();
-        obj.setKey(String.valueOf(startKey++));
-        obj.setBinaryAttribute(generateByteArray(contentLength));
-        Set<byte[]> byteArray = new HashSet<byte[]>();
-        byteArray.add(generateByteArray(contentLength));
-        obj.setBinarySetAttribute(byteArray);
-        return obj;
-    }
-
-    private boolean setContainsBytes(Set<byte[]> set, byte[] bytes) {
-        Iterator<byte[]> iter = set.iterator();
-        while (iter.hasNext()) {
-            if (Arrays.equals(iter.next(), bytes)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-}
diff --git a/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/ComplexTypeIntegrationTest.java b/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/ComplexTypeIntegrationTest.java
deleted file mode 100644
index 91cc92f72c57..000000000000
--- a/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/ComplexTypeIntegrationTest.java
+++ /dev/null
@@ -1,384 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.mapper;
-
-import static org.junit.Assert.assertEquals;
-
-import com.fasterxml.jackson.core.JsonFactory;
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.MappingJsonFactory;
-import java.io.StringReader;
-import java.io.StringWriter;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.List;
-import org.junit.Test;
-import software.amazon.awssdk.services.dynamodb.DynamoDBMapperIntegrationTestBase;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbHashKey;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMapper;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbTable;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbTypeConverted;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbTypeConvertedJson;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbTypeConverter;
-
-/**
- * Tests of the configuration object
- */
-public class ComplexTypeIntegrationTest extends DynamoDBMapperIntegrationTestBase {
-
-    // We don't start with the current system millis like other tests because
-    // it's out of the range of some data types
-    private static int start = 1;
-    private static int byteStart = -127;
-
-    @Test
-    public void testComplexTypes() throws Exception {
-        DynamoDbMapper util = new DynamoDbMapper(dynamo);
-
-        ComplexClass obj = getUniqueObject();
-        util.save(obj);
-        ComplexClass loaded = util.load(ComplexClass.class, obj.getKey());
-        assertEquals(obj, loaded);
-    }
-
-    private ComplexClass getUniqueObject() {
-        ComplexClass obj = new ComplexClass();
-        obj.setKey(String.valueOf(startKey++));
-        obj.setBigDecimalAttribute(new BigDecimal(startKey++));
-        obj.setBigIntegerAttribute(new BigInteger("" + startKey++));
-        obj.setByteAttribute((byte) byteStart++);
-        obj.setByteObjectAttribute(new Byte("" + byteStart++));
-        obj.setDoubleAttribute(new Double("" + start++));
-        obj.setDoubleObjectAttribute(new Double("" + start++));
-        obj.setFloatAttribute(new Float("" + start++));
-        obj.setFloatObjectAttribute(new Float("" + start++));
-        obj.setIntAttribute(new Integer("" + start++));
-        obj.setIntegerAttribute(new Integer("" + start++));
-        obj.setLongAttribute(new Long("" + start++));
-        obj.setLongObjectAttribute(new Long("" + start++));
-        obj.setDateAttribute(new Date(startKey++));
-        obj.setBooleanAttribute(start++ % 2 == 0);
-        obj.setBooleanObjectAttribute(start++ % 2 == 0);
-        obj.setExtraField("" + startKey++);
-        Calendar cal = GregorianCalendar.getInstance();
-        cal.setTime(new Date(startKey++));
-        obj.setCalendarAttribute(cal);
-        obj.setComplexNestedType(new ComplexNestedType("" + start++, start++, new ComplexNestedType("" + start++,
-                                                                                                    start++, null)));
-        List<ComplexNestedType> complexTypes = new ArrayList<ComplexNestedType>();
-        complexTypes.add(new ComplexNestedType("" + start++, start++,
-                                               new ComplexNestedType("" + start++, start++, null)));
-        complexTypes.add(new ComplexNestedType("" + start++, start++, new ComplexNestedType("" + start++, start++, null)));
-        complexTypes.add(new ComplexNestedType("" + start++, start++, new ComplexNestedType("" + start++, start++, null)));
-        obj.setComplexNestedTypeList(complexTypes);
-        return obj;
-    }
-
-    /**
-     * Tests using a complex type for a (string) key
-     */
-    @Test
-    public void testComplexKey() throws Exception {
-        ComplexKey obj = new ComplexKey();
-        ComplexNestedType key = new ComplexNestedType();
-        key.setIntValue(start++);
-        key.setStringValue("" + start++);
-        obj.setKey(key);
-        obj.setOtherAttribute("" + start++);
-
-        DynamoDbMapper mapper = new DynamoDbMapper(dynamo);
-
-        mapper.save(obj);
-        ComplexKey loaded = mapper.load(ComplexKey.class, obj.getKey());
-        assertEquals(obj, loaded);
-    }
-
-    public static final class ComplexNestedListTypeMarshaller implements DynamoDbTypeConverter<String, List<ComplexNestedType>> {
-        @Override
-        public String convert(final List<ComplexNestedType> object) {
-            try {
-                StringWriter writer = new StringWriter();
-                JsonFactory jsonFactory = new MappingJsonFactory();
-                JsonGenerator jsonGenerator = jsonFactory.createJsonGenerator(writer);
-                jsonGenerator.writeObject(object);
-                return writer.toString();
-            } catch (Exception e) {
-                throw new RuntimeException(e);
-            }
-        }
-
-        @Override
-        public List<ComplexNestedType> unconvert(String obj) {
-            try {
-                JsonFactory jsonFactory = new MappingJsonFactory();
-                JsonParser jsonParser = jsonFactory.createJsonParser(new StringReader(obj));
-                return jsonParser.readValueAs(new TypeReference<List<ComplexNestedType>>() {
-                });
-            } catch (Exception e) {
-                throw new RuntimeException(e);
-            }
-        }
-    }
-
-    @DynamoDbTable(tableName = "aws-java-sdk-util")
-    public static final class ComplexClass extends NumberAttributeClass {
-
-        private String extraField;
-        private ComplexNestedType complexNestedType;
-        private List<ComplexNestedType> complexNestedTypeList;
-
-        @DynamoDbTypeConvertedJson
-        public ComplexNestedType getComplexNestedType() {
-            return complexNestedType;
-        }
-
-        public void setComplexNestedType(ComplexNestedType complexNestedType) {
-            this.complexNestedType = complexNestedType;
-        }
-
-        @DynamoDbTypeConverted(converter = ComplexNestedListTypeMarshaller.class)
-        public List<ComplexNestedType> getComplexNestedTypeList() {
-            return complexNestedTypeList;
-        }
-
-        public void setComplexNestedTypeList(List<ComplexNestedType> complexNestedTypeList) {
-            this.complexNestedTypeList = complexNestedTypeList;
-        }
-
-        public String getExtraField() {
-            return extraField;
-        }
-
-        public void setExtraField(String extraField) {
-            this.extraField = extraField;
-        }
-
-        /*
-         * (non-Javadoc)
-         *
-         * @see java.lang.Object#hashCode()
-         */
-        @Override
-        public int hashCode() {
-            final int prime = 31;
-            int result = super.hashCode();
-            result = prime * result + ((complexNestedType == null) ? 0 : complexNestedType.hashCode());
-            result = prime * result + ((complexNestedTypeList == null) ? 0 : complexNestedTypeList.hashCode());
-            result = prime * result + ((extraField == null) ? 0 : extraField.hashCode());
-            return result;
-        }
-
-        /*
-         * (non-Javadoc)
-         *
-         * @see java.lang.Object#equals(java.lang.Object)
-         */
-        @Override
-        public boolean equals(Object obj) {
-            if (this == obj) {
-                return true;
-            }
-            if (!super.equals(obj)) {
-                return false;
-            }
-            if (getClass() != obj.getClass()) {
-                return false;
-            }
-            ComplexClass other = (ComplexClass) obj;
-            if (complexNestedType == null) {
-                if (other.complexNestedType != null) {
-                    return false;
-                }
-            } else if (!complexNestedType.equals(other.complexNestedType)) {
-                return false;
-            }
-            if (complexNestedTypeList == null) {
-                if (other.complexNestedTypeList != null) {
-                    return false;
-                }
-            } else if (!complexNestedTypeList.equals(other.complexNestedTypeList)) {
-                return false;
-            }
-            if (extraField == null) {
-                if (other.extraField != null) {
-                    return false;
-                }
-            } else if (!extraField.equals(other.extraField)) {
-                return false;
-            }
-            return true;
-        }
-
-    }
-
-    public static final class ComplexNestedType {
-
-        private String stringValue;
-        private Integer intValue;
-        private ComplexNestedType nestedType;
-
-        public ComplexNestedType() {
-        }
-
-        public ComplexNestedType(String stringValue, Integer intValue, ComplexNestedType nestedType) {
-            super();
-            this.stringValue = stringValue;
-            this.intValue = intValue;
-            this.nestedType = nestedType;
-        }
-
-        public String getStringValue() {
-            return stringValue;
-        }
-
-        public void setStringValue(String stringValue) {
-            this.stringValue = stringValue;
-        }
-
-        public Integer getIntValue() {
-            return intValue;
-        }
-
-        public void setIntValue(Integer intValue) {
-            this.intValue = intValue;
-        }
-
-        public ComplexNestedType getNestedType() {
-            return nestedType;
-        }
-
-        public void setNestedType(ComplexNestedType nestedType) {
-            this.nestedType = nestedType;
-        }
-
-        @Override
-        public int hashCode() {
-            final int prime = 31;
-            int result = 1;
-            result = prime * result + ((intValue == null) ? 0 : intValue.hashCode());
-            result = prime * result + ((nestedType == null) ? 0 : nestedType.hashCode());
-            result = prime * result + ((stringValue == null) ? 0 : stringValue.hashCode());
-            return result;
-        }
-
-        @Override
-        public boolean equals(Object obj) {
-            if (this == obj) {
-                return true;
-            }
-            if (obj == null) {
-                return false;
-            }
-            if (getClass() != obj.getClass()) {
-                return false;
-            }
-            ComplexNestedType other = (ComplexNestedType) obj;
-            if (intValue == null) {
-                if (other.intValue != null) {
-                    return false;
-                }
-            } else if (!intValue.equals(other.intValue)) {
-                return false;
-            }
-            if (nestedType == null) {
-                if (other.nestedType != null) {
-                    return false;
-                }
-            } else if (!nestedType.equals(other.nestedType)) {
-                return false;
-            }
-            if (stringValue == null) {
-                if (other.stringValue != null) {
-                    return false;
-                }
-            } else if (!stringValue.equals(other.stringValue)) {
-                return false;
-            }
-            return true;
-        }
-
-    }
-
-    @DynamoDbTable(tableName = "aws-java-sdk-util")
-    public static final class ComplexKey {
-
-        private ComplexNestedType key;
-        private String otherAttribute;
-
-        @DynamoDbHashKey
-        @DynamoDbTypeConvertedJson
-        public ComplexNestedType getKey() {
-            return key;
-        }
-
-        public void setKey(ComplexNestedType key) {
-            this.key = key;
-        }
-
-        public String getOtherAttribute() {
-            return otherAttribute;
-        }
-
-        public void setOtherAttribute(String otherAttribute) {
-            this.otherAttribute = otherAttribute;
-        }
-
-        @Override
-        public int hashCode() {
-            final int prime = 31;
-            int result = 1;
-            result = prime * result + ((key == null) ? 0 : key.hashCode());
-            result = prime * result + ((otherAttribute == null) ? 0 : otherAttribute.hashCode());
-            return result;
-        }
-
-        @Override
-        public boolean equals(Object obj) {
-            if (this == obj) {
-                return true;
-            }
-            if (obj == null) {
-                return false;
-            }
-            if (getClass() != obj.getClass()) {
-                return false;
-            }
-            ComplexKey other = (ComplexKey) obj;
-            if (key == null) {
-                if (other.key != null) {
-                    return false;
-                }
-            } else if (!key.equals(other.key)) {
-                return false;
-            }
-            if (otherAttribute == null) {
-                if (other.otherAttribute != null) {
-                    return false;
-                }
-            } else if (!otherAttribute.equals(other.otherAttribute)) {
-                return false;
-            }
-            return true;
-        }
-    }
-
-}
diff --git a/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/ConfigurationIntegrationTest.java b/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/ConfigurationIntegrationTest.java
deleted file mode 100644
index ebb4eb1f7a40..000000000000
--- a/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/ConfigurationIntegrationTest.java
+++ /dev/null
@@ -1,343 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.mapper;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.fail;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.UUID;
-import org.junit.Test;
-import software.amazon.awssdk.services.dynamodb.DynamoDBMapperIntegrationTestBase;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbAutoGeneratedKey;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbHashKey;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMapper;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMapperConfig;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMapperConfig.ObjectTableNameResolver;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMapperConfig.SaveBehavior;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMapperConfig.TableNameOverride;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMapperConfig.TableNameResolver;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbTable;
-
-/**
- * Tests of the configuration object
- */
-public class ConfigurationIntegrationTest extends DynamoDBMapperIntegrationTestBase {
-
-    // We don't start with the current system millis like other tests because
-    // it's out of the range of some data types
-    private static int start = 1;
-    private static int byteStart = -127;
-
-    @Test
-    public void testClobber() throws Exception {
-        DynamoDbMapper util = new DynamoDbMapper(dynamo, new DynamoDbMapperConfig(SaveBehavior.CLOBBER));
-
-        NumberAttributeClassExtended obj = getUniqueObject();
-        util.save(obj);
-        assertEquals(obj, util.load(obj.getClass(), obj.getKey()));
-
-        NumberAttributeClass copy = copy(obj);
-        util.save(copy);
-        assertEquals(copy, util.load(copy.getClass(), obj.getKey()));
-
-        // We should have lost the extra field because of the clobber behavior
-        assertNull(util.load(NumberAttributeClassExtended.class, obj.getKey()).getExtraField());
-
-        // Now test overriding the clobber behavior on a per-save basis
-        obj = getUniqueObject();
-        util.save(obj);
-        assertEquals(obj, util.load(obj.getClass(), obj.getKey()));
-
-        copy = copy(obj);
-        util.save(copy, new DynamoDbMapperConfig(SaveBehavior.UPDATE));
-        assertEquals(copy, util.load(copy.getClass(), obj.getKey()));
-
-        // We shouldn't have lost any extra info
-        assertNotNull(util.load(NumberAttributeClassExtended.class, obj.getKey()).getExtraField());
-    }
-
-    @Test
-    public void testTableOverride() throws Exception {
-        DynamoDbMapper util = new DynamoDbMapper(dynamo);
-
-        TableOverrideTestClass obj = new TableOverrideTestClass();
-        obj.setOtherField(UUID.randomUUID().toString());
-
-        try {
-            util.save(obj);
-            fail("Expected an exception");
-        } catch (Exception e) {
-            // Ignored or expected.
-        }
-
-        util.save(obj, new DynamoDbMapperConfig(new TableNameOverride("aws-java-sdk-util")));
-
-        try {
-            util.load(TableOverrideTestClass.class, obj.getKey());
-            fail("Expected an exception");
-        } catch (Exception e) {
-            // Ignored or expected.
-        }
-
-        Object loaded = util.load(TableOverrideTestClass.class, obj.getKey(),
-                                  new DynamoDbMapperConfig(TableNameOverride.withTableNamePrefix("aws-")));
-        assertEquals(loaded, obj);
-
-        try {
-            util.delete(obj);
-            fail("Expected an exception");
-        } catch (Exception e) {
-            // Ignored or expected.
-        }
-
-        util.delete(obj, new DynamoDbMapperConfig(TableNameOverride.withTableNamePrefix("aws-")));
-    }
-
-    @Test
-    public void testTableNameResolver() {
-        final String REAL_TABLE_NAME = "aws-java-sdk-util";
-
-        DynamoDbMapper mapper = new DynamoDbMapper(dynamo);
-
-        final TableOverrideTestClass obj = new TableOverrideTestClass();
-        obj.setOtherField(UUID.randomUUID().toString());
-
-        try {
-            mapper.save(obj);
-            fail("Expected an exception, because the POJO is annotated with a non-existent table.");
-        } catch (Exception e) {
-            // Ignored or expected.
-        }
-
-        // Use TableNameResolver to save to the real table
-        mapper.save(obj, new DynamoDbMapperConfig(new TableNameResolver() {
-            @Override
-            public String getTableName(Class<?> clazz, DynamoDbMapperConfig config) {
-                if (clazz.equals(TableOverrideTestClass.class)) {
-                    return REAL_TABLE_NAME;
-                }
-                throw new RuntimeException("Unexpected data object type.");
-            }
-        }));
-
-        try {
-            mapper.load(TableOverrideTestClass.class, obj.getKey());
-            fail("Expected an exception, because the POJO is annotated with a non-existent table.");
-        } catch (Exception e) {
-            // Ignored or expected.
-        }
-
-        // Use ObjectTableNameResolver to load from the real table
-        Object loaded = mapper.load(obj,
-                                    new DynamoDbMapperConfig(new ObjectTableNameResolver() {
-                                        @Override
-                                        public String getTableName(Object objectToLoad, DynamoDbMapperConfig config) {
-                                            if (objectToLoad == obj) {
-                                                return REAL_TABLE_NAME;
-                                            }
-                                            throw new RuntimeException("Unexpected data object.");
-                                        }
-                                    }));
-        assertEquals(loaded, obj);
-
-        try {
-            mapper.delete(obj);
-            fail("Expected an exception, because the POJO is annotated with a non-existent table.");
-        } catch (Exception e) {
-            // Ignored or expected.
-        }
-
-        // When used at the same time, ObjectTableNameResolver should have the highest priority
-
-        final String NON_EXISTENT_TABLE_NAME = UUID.randomUUID().toString();
-        mapper.delete(obj, new DynamoDbMapperConfig.Builder()
-                .withTableNameOverride(new TableNameOverride(NON_EXISTENT_TABLE_NAME))
-                .withTableNameResolver(new TableNameResolver() {
-                    @Override
-                    public String getTableName(Class<?> clazz, DynamoDbMapperConfig config) {
-                        return NON_EXISTENT_TABLE_NAME;
-                    }
-                })
-                .withObjectTableNameResolver(new ObjectTableNameResolver() {
-                    @Override
-                    public String getTableName(Object object, DynamoDbMapperConfig config) {
-                        return REAL_TABLE_NAME;
-                    }
-                }).build());
-    }
-
-    private NumberAttributeClassExtended getUniqueObject() {
-        NumberAttributeClassExtended obj = new NumberAttributeClassExtended();
-        obj.setKey(String.valueOf(startKey++));
-        obj.setBigDecimalAttribute(new BigDecimal(startKey++));
-        obj.setBigIntegerAttribute(new BigInteger("" + startKey++));
-        obj.setByteAttribute((byte) byteStart++);
-        obj.setByteObjectAttribute(new Byte("" + byteStart++));
-        obj.setDoubleAttribute(new Double("" + start++));
-        obj.setDoubleObjectAttribute(new Double("" + start++));
-        obj.setFloatAttribute(new Float("" + start++));
-        obj.setFloatObjectAttribute(new Float("" + start++));
-        obj.setIntAttribute(new Integer("" + start++));
-        obj.setIntegerAttribute(new Integer("" + start++));
-        obj.setLongAttribute(new Long("" + start++));
-        obj.setLongObjectAttribute(new Long("" + start++));
-        obj.setDateAttribute(new Date(startKey++));
-        obj.setBooleanAttribute(start++ % 2 == 0);
-        obj.setBooleanObjectAttribute(start++ % 2 == 0);
-        obj.setExtraField("" + startKey++);
-        Calendar cal = GregorianCalendar.getInstance();
-        cal.setTime(new Date(startKey++));
-        obj.setCalendarAttribute(cal);
-        return obj;
-    }
-
-    private NumberAttributeClass copy(NumberAttributeClassExtended obj) {
-        NumberAttributeClass copy = new NumberAttributeClass();
-        copy.setKey(obj.getKey());
-        copy.setBigDecimalAttribute(obj.getBigDecimalAttribute());
-        copy.setBigIntegerAttribute(obj.getBigIntegerAttribute());
-        copy.setByteAttribute(obj.getByteAttribute());
-        copy.setByteObjectAttribute(obj.getByteObjectAttribute());
-        copy.setDoubleAttribute(obj.getDoubleAttribute());
-        copy.setDoubleObjectAttribute(obj.getDoubleObjectAttribute());
-        copy.setFloatAttribute(obj.getFloatAttribute());
-        copy.setFloatObjectAttribute(obj.getFloatObjectAttribute());
-        copy.setIntAttribute(obj.getIntAttribute());
-        copy.setIntegerAttribute(obj.getIntegerAttribute());
-        copy.setLongAttribute(obj.getLongAttribute());
-        copy.setLongObjectAttribute(obj.getLongObjectAttribute());
-        copy.setDateAttribute(obj.getDateAttribute());
-        copy.setBooleanAttribute(obj.isBooleanAttribute());
-        copy.setBooleanObjectAttribute(obj.getBooleanObjectAttribute());
-        return copy;
-    }
-
-    @DynamoDbTable(tableName = "aws-java-sdk-util")
-    public static final class NumberAttributeClassExtended extends NumberAttributeClass {
-
-        private String extraField;
-
-        public String getExtraField() {
-            return extraField;
-        }
-
-        public void setExtraField(String extraField) {
-            this.extraField = extraField;
-        }
-
-        @Override
-        public int hashCode() {
-            final int prime = 31;
-            int result = super.hashCode();
-            result = prime * result + ((extraField == null) ? 0 : extraField.hashCode());
-            return result;
-        }
-
-        @Override
-        public boolean equals(Object obj) {
-            if (this == obj) {
-                return true;
-            }
-            if (!super.equals(obj)) {
-                return false;
-            }
-            if (getClass() != obj.getClass()) {
-                return false;
-            }
-            NumberAttributeClassExtended other = (NumberAttributeClassExtended) obj;
-            if (extraField == null) {
-                if (other.extraField != null) {
-                    return false;
-                }
-            } else if (!extraField.equals(other.extraField)) {
-                return false;
-            }
-            return true;
-        }
-    }
-
-    @DynamoDbTable(tableName = "java-sdk-util") // doesn't exist
-    public static final class TableOverrideTestClass {
-
-        private String key;
-        private String otherField;
-
-        @DynamoDbAutoGeneratedKey
-        @DynamoDbHashKey
-        public String getKey() {
-            return key;
-        }
-
-        public void setKey(String key) {
-            this.key = key;
-        }
-
-        public String getOtherField() {
-            return otherField;
-        }
-
-        public void setOtherField(String otherField) {
-            this.otherField = otherField;
-        }
-
-        @Override
-        public int hashCode() {
-            final int prime = 31;
-            int result = 1;
-            result = prime * result + ((key == null) ? 0 : key.hashCode());
-            result = prime * result + ((otherField == null) ? 0 : otherField.hashCode());
-            return result;
-        }
-
-        @Override
-        public boolean equals(Object obj) {
-            if (this == obj) {
-                return true;
-            }
-            if (obj == null) {
-                return false;
-            }
-            if (getClass() != obj.getClass()) {
-                return false;
-            }
-            TableOverrideTestClass other = (TableOverrideTestClass) obj;
-            if (key == null) {
-                if (other.key != null) {
-                    return false;
-                }
-            } else if (!key.equals(other.key)) {
-                return false;
-            }
-            if (otherField == null) {
-                if (other.otherField != null) {
-                    return false;
-                }
-            } else if (!otherField.equals(other.otherField)) {
-                return false;
-            }
-            return true;
-        }
-
-    }
-
-}
diff --git a/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/CrossSdkIntegrationTest.java b/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/CrossSdkIntegrationTest.java
deleted file mode 100644
index b6830c4acb60..000000000000
--- a/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/CrossSdkIntegrationTest.java
+++ /dev/null
@@ -1,255 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.mapper;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.UUID;
-import org.junit.Test;
-import software.amazon.awssdk.services.dynamodb.DynamoDBMapperIntegrationTestBase;
-import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
-import software.amazon.awssdk.services.dynamodb.TableUtils;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMapper;
-import software.amazon.awssdk.services.dynamodb.model.AttributeDefinition;
-import software.amazon.awssdk.services.dynamodb.model.CreateTableRequest;
-import software.amazon.awssdk.services.dynamodb.model.KeySchemaElement;
-import software.amazon.awssdk.services.dynamodb.model.KeyType;
-import software.amazon.awssdk.services.dynamodb.model.ProvisionedThroughput;
-import software.amazon.awssdk.services.dynamodb.model.ScalarAttributeType;
-import software.amazon.awssdk.services.dynamodb.pojos.CrossSdkVerificationClass;
-
-
-/**
- * Cross-SDK acceptance test. More of a smoke test, verifies that the formats
- * used by each program's ORM can be read by the others.
- */
-public class CrossSdkIntegrationTest extends DynamoDBMapperIntegrationTestBase {
-
-    private static final String TABLE_NAME = "aws-xsdk";
-
-    private static final String HASH_KEY = "3530a51a-0760-47d2-bfcb-158320d6188a";
-    private static final String RANGE_KEY = "61cdf81e-792f-4dd8-a812-a16185bfbf60";
-
-    private static int start = 1;
-
-    // @BeforeClass
-    public static void setUp() throws Exception {
-        setUpCredentials();
-        dynamo = DynamoDbClient.builder().credentialsProvider(CREDENTIALS_PROVIDER_CHAIN).build();
-
-        // Create a table
-        String keyName = DynamoDBMapperIntegrationTestBase.KEY_NAME;
-        String rangeKey = "rangeKey";
-        CreateTableRequest createTableRequest = CreateTableRequest.builder()
-                .tableName(TABLE_NAME)
-                .keySchema(KeySchemaElement.builder().attributeName(keyName).keyType(KeyType.HASH).build(),
-                               KeySchemaElement.builder().attributeName(rangeKey).keyType(KeyType.RANGE).build())
-                .attributeDefinitions(
-                        AttributeDefinition.builder().attributeName(keyName).attributeType(
-                                ScalarAttributeType.S).build(),
-                        AttributeDefinition.builder().attributeName(rangeKey).attributeType(
-                                ScalarAttributeType.S).build())
-                .provisionedThroughput(ProvisionedThroughput.builder().readCapacityUnits(10L)
-                                                                               .writeCapacityUnits(10L).build())
-                .build();
-
-        if (TableUtils.createTableIfNotExists(dynamo, createTableRequest)) {
-            TableUtils.waitUntilActive(dynamo, TABLE_NAME);
-        }
-    }
-
-    @Test
-    public void disabled() {
-    }
-
-    // This record written by the .NET mapper no longer exists, so this test
-    // NPEs. If we want to add back something similar we should generate some
-    // items using the .NET mapper and check a serialized form of them into
-    // this package so this can be run as a unit test.
-    // @Test
-    public void testLoad() throws Exception {
-        DynamoDbMapper mapper = new DynamoDbMapper(dynamo);
-
-        CrossSdkVerificationClass obj = mapper.load(CrossSdkVerificationClass.class, HASH_KEY, RANGE_KEY);
-
-        Long originalVersion = obj.getVersion();
-
-        assertNotNull(obj);
-        assertNotNull(obj.getKey());
-        assertEquals(obj.getKey(), HASH_KEY);
-        assertNotNull(obj.getRangeKey());
-        assertEquals(obj.getRangeKey(), RANGE_KEY);
-        assertNotNull(originalVersion);
-        assertNotNull(obj.bigDecimalAttribute());
-        assertNotNull(obj.bigDecimalSetAttribute());
-        assertEquals(3, obj.bigDecimalSetAttribute().size());
-        assertNotNull(obj.bigIntegerAttribute());
-        assertNotNull(obj.bigIntegerSetAttribute());
-        assertEquals(3, obj.bigIntegerSetAttribute().size());
-        assertNotNull(obj.booleanAttribute());
-        assertNotNull(obj.booleanSetAttribute());
-        assertEquals(2, obj.booleanSetAttribute().size());
-        assertNotNull(obj.byteAttribute());
-        assertNotNull(obj.byteSetAttribute());
-        assertEquals(3, obj.byteSetAttribute().size());
-        assertNotNull(obj.getCalendarAttribute());
-        assertNotNull(obj.getCalendarSetAttribute());
-        assertEquals(3, obj.getCalendarSetAttribute().size());
-        assertNotNull(obj.getDateAttribute());
-        assertNotNull(obj.getDateSetAttribute());
-        assertEquals(3, obj.getDateSetAttribute().size());
-        assertNotNull(obj.getDoubleAttribute());
-        assertNotNull(obj.getDoubleSetAttribute());
-        assertEquals(3, obj.getDoubleSetAttribute().size());
-        assertNotNull(obj.getFloatAttribute());
-        assertNotNull(obj.getFloatSetAttribute());
-        assertEquals(3, obj.getFloatSetAttribute().size());
-        assertNotNull(obj.getIntegerAttribute());
-        assertNotNull(obj.getIntegerSetAttribute());
-        assertEquals(3, obj.getIntegerSetAttribute().size());
-        assertNotNull(obj.longAttribute());
-        assertNotNull(obj.longSetAttribute());
-        assertEquals(3, obj.longSetAttribute().size());
-        assertNotNull(obj.stringSetAttribute());
-        assertEquals(3, obj.stringSetAttribute().size());
-
-        updateObjectValues(obj);
-
-        mapper.save(obj);
-        assertFalse(originalVersion.equals(obj.getVersion()));
-
-        CrossSdkVerificationClass loaded = mapper.load(CrossSdkVerificationClass.class, HASH_KEY, RANGE_KEY);
-        assertEquals(loaded, obj);
-    }
-
-    /**
-     * Updates all values in the object (except for the keys and version)
-     */
-    private void updateObjectValues(CrossSdkVerificationClass obj) {
-        obj.setBigDecimalAttribute(obj.bigDecimalAttribute().add(BigDecimal.ONE));
-        Set<BigDecimal> bigDecimals = new HashSet<BigDecimal>();
-        for (BigDecimal d : obj.bigDecimalSetAttribute()) {
-            bigDecimals.add(d.add(BigDecimal.ONE));
-        }
-        obj.setBigDecimalSetAttribute(bigDecimals);
-
-        obj.setBigIntegerAttribute(obj.bigIntegerAttribute().add(BigInteger.ONE));
-        Set<BigInteger> bigInts = new HashSet<BigInteger>();
-        for (BigInteger d : obj.bigIntegerSetAttribute()) {
-            bigInts.add(d.add(BigInteger.ONE));
-        }
-        obj.setBigIntegerSetAttribute(bigInts);
-
-        obj.setBooleanAttribute(!obj.booleanAttribute());
-
-        obj.setByteAttribute((byte) ((obj.byteAttribute() + 1) % Byte.MAX_VALUE));
-        Set<Byte> bytes = new HashSet<Byte>();
-        for (Byte b : obj.byteSetAttribute()) {
-            bytes.add((byte) ((b + 1) % Byte.MAX_VALUE));
-        }
-
-        obj.getCalendarAttribute().setTime(new Date(obj.getCalendarAttribute().getTimeInMillis() + 1000));
-        for (Calendar c : obj.getCalendarSetAttribute()) {
-            c.setTime(new Date(c.getTimeInMillis() + 1000));
-        }
-
-        obj.getDateAttribute().setTime(obj.getDateAttribute().getTime() + 1000);
-        for (Date d : obj.getDateSetAttribute()) {
-            d.setTime(d.getTime() + 1000);
-        }
-
-        obj.setDoubleAttribute(obj.getDoubleAttribute() + 1.0);
-        Set<Double> doubleSet = new HashSet<Double>();
-        for (Double d : obj.getDoubleSetAttribute()) {
-            doubleSet.add(d + 1.0);
-        }
-        obj.setDoubleSetAttribute(doubleSet);
-
-        obj.setFloatAttribute((float) (obj.getFloatAttribute() + 1.0));
-        Set<Float> floatSet = new HashSet<Float>();
-        for (Float f : obj.getFloatSetAttribute()) {
-            floatSet.add(f + 1.0f);
-        }
-        obj.setFloatSetAttribute(floatSet);
-
-        obj.setIntegerAttribute(obj.getIntegerAttribute() + 1);
-        Set<Integer> intSet = new HashSet<Integer>();
-        for (Integer i : obj.getIntegerSetAttribute()) {
-            intSet.add(i + 1);
-        }
-        obj.setIntegerSetAttribute(intSet);
-
-        obj.setLastUpdater("java-sdk");
-
-        obj.setLongAttribute(obj.longAttribute() + 1);
-        Set<Long> longSet = new HashSet<Long>();
-        for (Long l : obj.longSetAttribute()) {
-            longSet.add(l + 1);
-        }
-        obj.setLongSetAttribute(longSet);
-
-        obj.setStringSetAttribute(
-                toSet(UUID.randomUUID().toString(), UUID.randomUUID().toString(), UUID.randomUUID().toString()));
-    }
-
-    /**
-     * Used to set up the original object, no longer used.
-     */
-    @SuppressWarnings("unused")
-    private CrossSdkVerificationClass getUniqueObject() {
-        CrossSdkVerificationClass obj = new CrossSdkVerificationClass();
-        obj.setKey(HASH_KEY);
-        obj.setRangeKey(RANGE_KEY);
-        obj.setBigDecimalAttribute(new BigDecimal(start++));
-        obj.setBigDecimalSetAttribute(toSet(new BigDecimal(start++), new BigDecimal(start++), new BigDecimal(start++)));
-        obj.setBigIntegerAttribute(new BigInteger("" + start++));
-        obj.setBigIntegerSetAttribute(
-                toSet(new BigInteger("" + start++), new BigInteger("" + start++), new BigInteger("" + start++)));
-        obj.setBooleanAttribute(start++ % 2 == 0);
-        obj.setBooleanSetAttribute(toSet(true, false));
-        obj.setByteAttribute((byte) start++);
-        obj.setByteSetAttribute(toSet((byte) start++, (byte) start++, (byte) start++));
-        obj.setCalendarAttribute(getUniqueCalendar());
-        obj.setCalendarSetAttribute(toSet(getUniqueCalendar(), getUniqueCalendar(), getUniqueCalendar()));
-        obj.setDateAttribute(new Date(start++));
-        obj.setDateSetAttribute(toSet(new Date(start++), new Date(start++), new Date(start++)));
-        obj.setDoubleAttribute((double) start++);
-        obj.setDoubleSetAttribute(toSet((double) start++, (double) start++, (double) start++));
-        obj.setFloatAttribute((float) start++);
-        obj.setFloatSetAttribute(toSet((float) start++, (float) start++, (float) start++));
-        obj.setIntegerAttribute(start++);
-        obj.setIntegerSetAttribute(toSet(start++, start++, start++));
-        obj.setLongAttribute((long) start++);
-        obj.setLongSetAttribute(toSet((long) start++, (long) start++, (long) start++));
-        obj.setStringSetAttribute(toSet("" + start++, "" + start++, "" + start++));
-        return obj;
-    }
-
-    private Calendar getUniqueCalendar() {
-        Calendar cal = Calendar.getInstance();
-        cal.setTime(new Date(start++));
-        return cal;
-    }
-
-}
diff --git a/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/DelimitedIntegrationTest.java b/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/DelimitedIntegrationTest.java
deleted file mode 100644
index 2aff58fdef8e..000000000000
--- a/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/DelimitedIntegrationTest.java
+++ /dev/null
@@ -1,486 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.mapper;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-
-import java.util.Collections;
-import java.util.Date;
-import java.util.Set;
-import java.util.UUID;
-import org.junit.Ignore;
-import org.junit.Test;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbAutoGeneratedTimestamp;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbDelimited;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbHashKey;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMappingException;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbTable;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbTypeConvertedTimestamp;
-import software.amazon.awssdk.services.dynamodb.pojos.AutoKeyAndVal;
-import software.amazon.awssdk.services.dynamodb.pojos.Currency;
-import software.amazon.awssdk.services.dynamodb.pojos.DateRange;
-import software.amazon.awssdk.services.dynamodb.pojos.KeyAndVal;
-import software.amazon.awssdk.services.dynamodb.pojos.PhoneNumber;
-
-/**
- * Tests updating component attribute fields correctly.
- */
-public class DelimitedIntegrationTest extends AbstractKeyAndValIntegrationTestCase {
-
-    /**
-     * Test using {@code PhoneNumber}.
-     */
-    @Test
-    public void testPhoneNumber() {
-        final KeyAndPhoneNumber object = new KeyAndPhoneNumber();
-        object.setVal(new PhoneNumber("206", "266", "1000"));
-        assertBeforeAndAfterChange(false, object);
-    }
-
-    /**
-     * Test using {@code PhoneNumber}.
-     */
-    @Test
-    public void testPhoneNumberAreaCodeNull() {
-        final KeyAndPhoneNumber object = new KeyAndPhoneNumber();
-        object.setVal(new PhoneNumber(null, "266", "1000"));
-        assertBeforeAndAfterChange(false, object);
-    }
-
-    /**
-     * Test using {@code PhoneNumber}.
-     */
-    @Test
-    public void testPhoneNumberAreaCodeEmpty() {
-        final KeyAndPhoneNumber object = new KeyAndPhoneNumber();
-        object.setVal(new PhoneNumber("", "266", "1000"));
-
-        final PhoneNumber after = assertBeforeAndAfterChange(null, object);
-        assertNotNull(after);
-        assertNull(after.getAreaCode());
-        assertEquals(object.getVal().getExchange(), after.getExchange());
-        assertEquals(object.getVal().getSubscriber(), after.getSubscriber());
-    }
-
-    /**
-     * Test using {@code PhoneNumber}.
-     */
-    @Test
-    public void testPhoneNumberNull() {
-        final KeyAndPhoneNumber object = new KeyAndPhoneNumber();
-        object.setVal(null);
-        assertBeforeAndAfterChange(false, object);
-    }
-
-    /**
-     * Test using {@code PhoneNumber}.
-     */
-    @Test
-    public void testPhoneNumberAllNull() {
-        final KeyAndPhoneNumber object = new KeyAndPhoneNumber();
-        object.setVal(new PhoneNumber(null, null, null));
-
-        final PhoneNumber after = assertBeforeAndAfterChange(null, object);
-        assertNull(after); //<- and empty object produces a null val
-    }
-
-    /**
-     * Test using {@code PhoneNumber}.
-     */
-    @Test
-    public void testKeyAndSpecialCharacterDelimitedierPhoneNumber() {
-        final KeyAndSpecialCharacterDelimitedierPhoneNumber object = new KeyAndSpecialCharacterDelimitedierPhoneNumber();
-        object.setVal(new PhoneNumber("206", "867", "5309"));
-        assertBeforeAndAfterChange(false, object);
-    }
-
-    /**
-     * Test using {@code PhoneNumber}.
-     */
-    @Test
-    public void testKeyAndDefaultDelimitederPhoneNumber() {
-        final KeyAndDefaultDelimitederPhoneNumber object = new KeyAndDefaultDelimitederPhoneNumber();
-        object.setVal(new PhoneNumber("206", "867", "5309"));
-        assertBeforeAndAfterChange(false, object);
-    }
-
-    /**
-     * Test using {@code PhoneNumber}.
-     */
-    @Test
-    public void testPhoneNumberDelimitedOnType() {
-        final KeyAndPhoneNumberDelimitedOnType object = new KeyAndPhoneNumberDelimitedOnType();
-        object.setVal(new KeyAndPhoneNumberDelimitedOnType.Value());
-        object.getVal().setAreaCode("206");
-        object.getVal().setExchange("266");
-        object.getVal().setSubscriber("1000");
-        assertBeforeAndAfterChange(false, object);
-    }
-
-    /**
-     * Test using {@code PhoneNumber}.
-     */
-    @Test(expected = DynamoDbMappingException.class)
-    public void testKeyAndNoAttributeNamesPhoneNumber() {
-        final KeyAndNoAttributeNamesPhoneNumber object = new KeyAndNoAttributeNamesPhoneNumber();
-        object.setVal(new PhoneNumber("206", "867", "5309"));
-        assertBeforeAndAfterChange(false, object);
-    }
-
-    /**
-     * Test using {@code PhoneNumber}.
-     */
-    @Test(expected = DynamoDbMappingException.class)
-    public void testExceptionOnPhoneNumberSet() {
-        final KeyAndPhoneNumberSet object = new KeyAndPhoneNumberSet();
-        object.setVal(Collections.<PhoneNumber>singleton(new PhoneNumber("206", "266", "1000")));
-        assertBeforeAndAfterChange(false, object);
-    }
-
-    /**
-     * Test using {@code DateRange}.
-     */
-    @Test
-    public void testFormatDateRange() throws Exception {
-        final KeyAndFormatDateRange object = new KeyAndFormatDateRange();
-        object.setVal(new KeyAndFormatDateRange.FormatDateRange());
-        object.getVal().setStart(new Date(System.currentTimeMillis() - 6000L));
-        object.getVal().setEnd(new Date(System.currentTimeMillis() + 6000L));
-        assertBeforeAndAfterChange(false, object);
-    }
-
-    /**
-     * Test using {@code DateRange}.
-     */
-    @Test
-    public void testFormatDateRangeStartNull() throws Exception {
-        final KeyAndFormatDateRange object = new KeyAndFormatDateRange();
-        object.setVal(new KeyAndFormatDateRange.FormatDateRange());
-        object.getVal().setStart(null);
-        object.getVal().setEnd(new Date());
-        assertBeforeAndAfterChange(false, object);
-    }
-
-    /**
-     * Test using {@code DateRange}.
-     */
-    @Test
-    public void testFormatDateRangeEndNull() throws Exception {
-        final KeyAndFormatDateRange object = new KeyAndFormatDateRange();
-        object.setVal(new KeyAndFormatDateRange.FormatDateRange());
-        object.getVal().setStart(new Date());
-        object.getVal().setEnd(null);
-        assertBeforeAndAfterChange(false, object);
-    }
-
-    /**
-     * Test using {@code DateRange}.
-     */
-    @Test
-    public void testFormatDateRangeStartAndEndNull() {
-        final KeyAndFormatDateRange object = new KeyAndFormatDateRange();
-        object.setVal(new KeyAndFormatDateRange.FormatDateRange());
-        object.getVal().setStart(null);
-        object.getVal().setEnd(null);
-
-        final KeyAndFormatDateRange.FormatDateRange after = assertBeforeAndAfterChange(null, object);
-        assertNull(after); //<- and empty object produces a null val
-    }
-
-    /**
-     * Test using {@code DateRange}.
-     */
-    @Test
-    @Ignore("Behavior is different with java.time; cannot parse 'yyyMMdd' formatted date to ZonedDateTime.")
-    public void testDelimitedKeyAndDate() {
-        final DelimitedKeyAndDate object = new DelimitedKeyAndDate();
-        object.setKey(new DelimitedKeyAndDate.Key());
-        object.getKey().setKey(UUID.randomUUID().toString());
-        object.getKey().setVal(new Date());
-        assertBeforeAndAfterChange(true, object);
-    }
-
-    /**
-     * Test marshalling.
-     */
-    @Test
-    public void testKeyAndCurrency() {
-        final KeyAndCurrency object = new KeyAndCurrency();
-        object.setVal(new Currency(12.95D, "USD"));
-        assertBeforeAndAfterChange(false, object);
-    }
-
-    /**
-     * Test marshalling.
-     */
-    @Test(expected = DynamoDbMappingException.class)
-    public void testKeyAndNestedCurrency() {
-        final KeyAndNestedCurrency object = new KeyAndNestedCurrency();
-        object.setVal(new KeyAndNestedCurrency.Value());
-        object.getVal().setKey(UUID.randomUUID().toString());
-        object.getVal().setVal(new Currency(12.95D, "USD"));
-        assertBeforeAndAfterChange(false, object);
-    }
-
-    /**
-     * An object with {@code PhoneNumber}.
-     */
-    @DynamoDbTable(tableName = "aws-java-sdk-util")
-    public static class KeyAndSpecialCharacterDelimitedierPhoneNumber extends AutoKeyAndVal<PhoneNumber> {
-        @DynamoDbDelimited(attributeNames = {"areaCode", "exchange", "subscriber"}, delimiter = '\\')
-        public PhoneNumber getVal() {
-            return super.getVal();
-        }
-
-        @Override
-        public void setVal(final PhoneNumber val) {
-            super.setVal(val);
-        }
-    }
-
-    /**
-     * An object with {@code PhoneNumber}.
-     */
-    @DynamoDbTable(tableName = "aws-java-sdk-util")
-    public static class KeyAndDefaultDelimitederPhoneNumber extends AutoKeyAndVal<PhoneNumber> {
-        @DynamoDbDelimited(attributeNames = {"areaCode", "exchange", "subscriber"})
-        public PhoneNumber getVal() {
-            return super.getVal();
-        }
-
-        @Override
-        public void setVal(final PhoneNumber val) {
-            super.setVal(val);
-        }
-    }
-
-    /**
-     * An object with {@code PhoneNumber}.
-     */
-    @DynamoDbTable(tableName = "aws-java-sdk-util")
-    public static class KeyAndPhoneNumber extends AutoKeyAndVal<PhoneNumber> {
-        @DynamoDbDelimited(attributeNames = {"areaCode", "exchange", "subscriber"}, delimiter = '-')
-        public PhoneNumber getVal() {
-            return super.getVal();
-        }
-
-        @Override
-        public void setVal(final PhoneNumber val) {
-            super.setVal(val);
-        }
-    }
-
-    /**
-     * An object with {@code PhoneNumber}.
-     */
-    @DynamoDbTable(tableName = "aws-java-sdk-util")
-    public static class KeyAndPhoneNumberDelimitedOnType extends AutoKeyAndVal<KeyAndPhoneNumberDelimitedOnType.Value> {
-        public Value getVal() {
-            return super.getVal();
-        }
-
-        @Override
-        public void setVal(final Value val) {
-            super.setVal(val);
-        }
-
-        @DynamoDbDelimited(attributeNames = {"areaCode", "exchange", "subscriber"}, delimiter = '.')
-        public static class Value extends PhoneNumber {
-        }
-    }
-
-    /**
-     * An object with {@code PhoneNumber}.
-     */
-    @DynamoDbTable(tableName = "aws-java-sdk-util")
-    public static class KeyAndNoAttributeNamesPhoneNumber extends AutoKeyAndVal<PhoneNumber> {
-        @DynamoDbDelimited(attributeNames = {})
-        public PhoneNumber getVal() {
-            return super.getVal();
-        }
-
-        @Override
-        public void setVal(final PhoneNumber val) {
-            super.setVal(val);
-        }
-    }
-
-    /**
-     * An object with {@code PhoneNumber}.
-     */
-    @DynamoDbTable(tableName = "aws-java-sdk-util")
-    public static class KeyAndPhoneNumberSet extends AutoKeyAndVal<Set<PhoneNumber>> {
-        @DynamoDbDelimited(attributeNames = {"areaCode", "exchange", "subscriber"}, delimiter = '-')
-        public Set<PhoneNumber> getVal() {
-            return super.getVal();
-        }
-
-        @Override
-        public void setVal(final Set<PhoneNumber> val) {
-            super.setVal(val);
-        }
-    }
-
-    /**
-     * An object with {@code DateRange}.
-     */
-    @DynamoDbTable(tableName = "aws-java-sdk-util")
-    public static class KeyAndDateRange extends AutoKeyAndVal<DateRange> {
-        @DynamoDbDelimited(attributeNames = {"start", "end"})
-        public DateRange getVal() {
-            return super.getVal();
-        }
-
-        @Override
-        public void setVal(final DateRange val) {
-            super.setVal(val);
-        }
-    }
-
-    /**
-     * An object with {@code DateRange}.
-     */
-    @DynamoDbTable(tableName = "aws-java-sdk-util")
-    public static class KeyAndFormatDateRange extends AutoKeyAndVal<KeyAndFormatDateRange.FormatDateRange> {
-        @DynamoDbDelimited(attributeNames = {"start", "end"})
-        public FormatDateRange getVal() {
-            return super.getVal();
-        }
-
-        @Override
-        public void setVal(final FormatDateRange val) {
-            super.setVal(val);
-        }
-
-        public static class FormatDateRange extends DateRange {
-            @DynamoDbTypeConvertedTimestamp(pattern = "yyyy MMddHHmmssSSS")
-            public Date getStart() {
-                return super.getStart();
-            }
-
-            @DynamoDbTypeConvertedTimestamp(pattern = "yyyy MMddHHmmssSSS")
-            public Date getEnd() {
-                return super.getEnd();
-            }
-        }
-    }
-
-    /**
-     * An object with {@code DateRange}.
-     */
-    @DynamoDbTable(tableName = "aws-java-sdk-util")
-    public static class DelimitedKeyAndDate extends KeyAndVal<DelimitedKeyAndDate.Key, Date> {
-        @DynamoDbHashKey
-        @DynamoDbDelimited(attributeNames = {"key", "val"})
-        public DelimitedKeyAndDate.Key getKey() {
-            return super.getKey();
-        }
-
-        @Override
-        public void setKey(final DelimitedKeyAndDate.Key key) {
-            super.setKey(key);
-        }
-
-        @DynamoDbAutoGeneratedTimestamp
-        public Date getVal() {
-            return super.getVal();
-        }
-
-        @Override
-        public void setVal(final Date val) {
-            super.setVal(val);
-        }
-
-        public static class Key extends KeyAndVal<String, Date> {
-            @Override
-            public String getKey() {
-                return super.getKey();
-            }
-
-            @Override
-            public void setKey(final String key) {
-                super.setKey(key);
-            }
-
-            @DynamoDbTypeConvertedTimestamp(pattern = "yyyyMMdd")
-            public Date getVal() {
-                return super.getVal();
-            }
-
-            @Override
-            public void setVal(final Date val) {
-                super.setVal(val);
-            }
-        }
-    }
-
-    /**
-     * An object with a complex type.
-     */
-    @DynamoDbTable(tableName = "aws-java-sdk-util")
-    public static class KeyAndCurrency extends AutoKeyAndVal<Currency> {
-        @DynamoDbDelimited(attributeNames = {"amount", "unit"}, delimiter = '$')
-        public Currency getVal() {
-            return super.getVal();
-        }
-
-        @Override
-        public void setVal(final Currency val) {
-            super.setVal(val);
-        }
-    }
-
-    /**
-     * An object with a complex type.
-     */
-    @DynamoDbTable(tableName = "aws-java-sdk-util")
-    public static class KeyAndNestedCurrency extends AutoKeyAndVal<KeyAndNestedCurrency.Value> {
-        @DynamoDbDelimited(attributeNames = {"key", "val"}, delimiter = '#')
-        public KeyAndNestedCurrency.Value getVal() {
-            return super.getVal();
-        }
-
-        @Override
-        public void setVal(final KeyAndNestedCurrency.Value val) {
-            super.setVal(val);
-        }
-
-        public static class Value extends KeyAndVal<String, Currency> {
-            @Override
-            public String getKey() {
-                return super.getKey();
-            }
-
-            @Override
-            public void setKey(final String key) {
-                super.setKey(key);
-            }
-
-            @Override
-            public Currency getVal() {
-                return super.getVal();
-            }
-
-            @Override
-            public void setVal(final Currency val) {
-                super.setVal(val);
-            }
-        }
-    }
-
-}
diff --git a/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/ExceptionHandlingIntegrationTest.java b/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/ExceptionHandlingIntegrationTest.java
deleted file mode 100644
index 08548ff85f98..000000000000
--- a/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/ExceptionHandlingIntegrationTest.java
+++ /dev/null
@@ -1,564 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.mapper;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import org.junit.Test;
-import software.amazon.awssdk.services.dynamodb.DynamoDBMapperIntegrationTestBase;
-import software.amazon.awssdk.services.dynamodb.datamodeling.ConversionSchemas;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbAutoGeneratedKey;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbHashKey;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMapper;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMapperConfig;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMappingException;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbRangeKey;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbTable;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbVersionAttribute;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-import software.amazon.awssdk.services.dynamodb.model.PutItemRequest;
-
-/**
- * Tests of exception handling
- */
-public class ExceptionHandlingIntegrationTest extends DynamoDBMapperIntegrationTestBase {
-
-    @Test(expected = DynamoDbMappingException.class)
-    public void testNoTableAnnotation() throws Exception {
-        DynamoDbMapper util = new DynamoDbMapper(dynamo);
-        util.save(new NoTableAnnotation());
-    }
-
-    @Test(expected = DynamoDbMappingException.class)
-    public void testNoTableAnnotationLoad() throws Exception {
-        DynamoDbMapper util = new DynamoDbMapper(dynamo);
-        util.load(NoTableAnnotation.class, "abc");
-    }
-
-    @Test(expected = DynamoDbMappingException.class)
-    public void testNoDefaultConstructor() {
-        DynamoDbMapper util = new DynamoDbMapper(dynamo);
-        NoDefaultConstructor obj = new NoDefaultConstructor("" + startKey++, "abc");
-        util.save(obj);
-        util.load(NoDefaultConstructor.class, obj.getKey());
-    }
-
-    @Test(expected = DynamoDbMappingException.class)
-    public void testNoHashKeyGetter() throws Exception {
-        DynamoDbMapper util = new DynamoDbMapper(dynamo);
-        util.save(new NoKeyGetterDefined());
-    }
-
-    @Test(expected = DynamoDbMappingException.class)
-    public void testNoHashKeyGetterLoad() throws Exception {
-        DynamoDbMapper util = new DynamoDbMapper(dynamo);
-        util.load(NoKeyGetterDefined.class, "abc");
-    }
-
-    @Test(expected = DynamoDbMappingException.class)
-    public void testPrivateKeyGetter() throws Exception {
-        DynamoDbMapper util = new DynamoDbMapper(dynamo);
-        util.save(new PrivateKeyGetter());
-    }
-
-    @Test(expected = DynamoDbMappingException.class)
-    public void testPrivateKeyGetterLoad() throws Exception {
-        DynamoDbMapper util = new DynamoDbMapper(dynamo);
-        util.load(PrivateKeyGetter.class, "abc");
-    }
-
-    @Test(expected = DynamoDbMappingException.class)
-    public void testPrivateKeySetter() throws Exception {
-        DynamoDbMapper util = new DynamoDbMapper(dynamo);
-        util.save(new PrivateKeySetter());
-    }
-
-    /*
-     * To trigger this error, we need for a service object to be present, so
-     * we'll insert one manually.
-     */
-    @Test(expected = DynamoDbMappingException.class)
-    public void testPrivateKeySetterLoad() throws Exception {
-        Map<String, AttributeValue> attr = new HashMap<String, AttributeValue>();
-        attr.put(KEY_NAME, AttributeValue.builder().s("abc").build());
-        dynamo.putItem(PutItemRequest.builder().tableName("aws-java-sdk-util").item(attr).build());
-        DynamoDbMapper util = new DynamoDbMapper(dynamo);
-        util.load(PrivateKeySetter.class, "abc");
-    }
-
-    @Test(expected = DynamoDbMappingException.class)
-    public void testPrivateSetterLoad() throws Exception {
-        DynamoDbMapper util = new DynamoDbMapper(dynamo);
-        PrivateSetter object = new PrivateSetter();
-        object.setStringProperty("value");
-        util.save(object);
-        util.load(PrivateSetter.class, object.getKey());
-    }
-
-    @Test(expected = DynamoDbMappingException.class)
-    public void testOverloadedSetter() {
-        OverloadedSetter obj = new OverloadedSetter();
-        obj.setKey("" + startKey++);
-        obj.setAttribute("abc", "123");
-        DynamoDbMapper mapper = new DynamoDbMapper(dynamo);
-        mapper.save(obj);
-
-        mapper.load(OverloadedSetter.class, obj.getKey());
-    }
-
-    @Test(expected = DynamoDbMappingException.class)
-    public void testWrongTypeForSetter() {
-        WrongTypeForSetter obj = new WrongTypeForSetter();
-        obj.setKey("" + startKey++);
-        obj.setAttribute(123);
-        DynamoDbMapper mapper = new DynamoDbMapper(dynamo);
-        mapper.save(obj);
-
-        mapper.load(WrongTypeForSetter.class, obj.getKey());
-    }
-
-    @Test(expected = DynamoDbMappingException.class)
-    public void testWrongDataType() {
-        Map<String, AttributeValue> attr = new HashMap<String, AttributeValue>();
-        attr.put("integerProperty", AttributeValue.builder().s("abc").build());
-        attr.put(KEY_NAME, AttributeValue.builder().s("" + startKey++).build());
-        dynamo.putItem(PutItemRequest.builder().tableName("aws-java-sdk-util").item(attr).build());
-        DynamoDbMapper util = new DynamoDbMapper(dynamo);
-        util.load(NumericFields.class, attr.get(KEY_NAME).s());
-    }
-
-    @Test(expected = DynamoDbMappingException.class)
-    public void testWrongDataType2() {
-        Map<String, AttributeValue> attr = new HashMap<String, AttributeValue>();
-        attr.put("integerProperty", AttributeValue.builder().ns("1", "2", "3").build());
-        attr.put(KEY_NAME, AttributeValue.builder().s("" + startKey++).build());
-        dynamo.putItem(PutItemRequest.builder().tableName("aws-java-sdk-util").item(attr).build());
-        DynamoDbMapper util = new DynamoDbMapper(dynamo);
-        util.load(NumericFields.class, attr.get(KEY_NAME).s());
-    }
-
-    // Complex types are not supported by the V1 conversion schema
-    @Test(expected = DynamoDbMappingException.class)
-    public void testComplexTypeFailure() {
-        DynamoDbMapperConfig config = new DynamoDbMapperConfig(ConversionSchemas.V1);
-        DynamoDbMapper util = new DynamoDbMapper(dynamo, config);
-
-        ComplexType complexType = new ComplexType("" + startKey++, new ComplexType("" + startKey++, null));
-        util.save(complexType);
-    }
-
-    @Test(expected = DynamoDbMappingException.class)
-    public void testUnsupportedHashKeyType() {
-        ComplexType complexType = new ComplexType("" + startKey++, new ComplexType("" + startKey++, null));
-        ComplexHashKeyType obj = new ComplexHashKeyType();
-        obj.setKey(complexType);
-        obj.setAttribute("abc");
-        DynamoDbMapper util = new DynamoDbMapper(dynamo);
-        util.save(obj);
-    }
-
-    // Lists are not supported by the V1 conversion schema.
-    @Test(expected = DynamoDbMappingException.class)
-    public void testNonsetCollection() {
-        DynamoDbMapperConfig config = new DynamoDbMapperConfig(ConversionSchemas.V1);
-        DynamoDbMapper mapper = new DynamoDbMapper(dynamo, config);
-
-        NonSetCollectionType obj = new NonSetCollectionType();
-        obj.setKey("" + startKey++);
-        obj.setBadlyMapped(new ArrayList<String>());
-        obj.getBadlyMapped().add("abc");
-        mapper.save(obj);
-    }
-
-    @Test(expected = DynamoDbMappingException.class)
-    public void testFractionalVersionAttribute() {
-        FractionalVersionAttribute obj = new FractionalVersionAttribute();
-        obj.setKey("" + startKey++);
-        obj.setVersion(0d);
-        DynamoDbMapper mapper = new DynamoDbMapper(dynamo);
-        mapper.save(obj);
-    }
-
-    @Test(expected = DynamoDbMappingException.class)
-    public void testAutoGeneratedIntegerHashKey() {
-        AutoGeneratedIntegerKey obj = new AutoGeneratedIntegerKey();
-        obj.setValue("fdgfdsgf");
-        DynamoDbMapper mapper = new DynamoDbMapper(dynamo);
-        mapper.save(obj);
-    }
-
-    @Test(expected = DynamoDbMappingException.class)
-    public void testAutoGeneratedIntegerRangeKey() {
-        AutoGeneratedIntegerRangeKey obj = new AutoGeneratedIntegerRangeKey();
-        obj.setKey("Bldadsfa");
-        obj.setValue("fdgfdsgf");
-        DynamoDbMapper mapper = new DynamoDbMapper(dynamo);
-        mapper.save(obj);
-    }
-
-    public static class NoTableAnnotation {
-
-        private String key;
-
-        @DynamoDbHashKey
-        public String getKey() {
-            return key;
-        }
-
-        public void setKey(String key) {
-            this.key = key;
-        }
-
-    }
-
-    @DynamoDbTable(tableName = "aws-java-sdk-util")
-    public static class NoDefaultConstructor {
-
-        private String key;
-        private String attribute;
-
-        public NoDefaultConstructor(String key, String attribute) {
-            super();
-            this.key = key;
-            this.attribute = attribute;
-        }
-
-        @DynamoDbHashKey
-        public String getKey() {
-            return key;
-        }
-
-        public void setKey(String key) {
-            this.key = key;
-        }
-
-        public String getAttribute() {
-            return attribute;
-        }
-
-        public void setAttribute(String attribute) {
-            this.attribute = attribute;
-        }
-    }
-
-    @DynamoDbTable(tableName = "aws-java-sdk-util")
-    public static class NoKeyGetterDefined {
-
-        @SuppressWarnings("unused")
-        private String key;
-    }
-
-    @DynamoDbTable(tableName = "aws-java-sdk-util")
-    public static class PrivateKeyGetter {
-
-        private String key;
-
-        @SuppressWarnings("unused")
-        @DynamoDbHashKey
-        private String getKey() {
-            return key;
-        }
-
-        @SuppressWarnings("unused")
-        private void setKey(String key) {
-            this.key = key;
-        }
-    }
-
-    @DynamoDbTable(tableName = "aws-java-sdk-util")
-    public static class PrivateKeySetter {
-
-        private String key;
-
-        @DynamoDbHashKey
-        @DynamoDbAutoGeneratedKey
-        public String getKey() {
-            return key;
-        }
-
-        @SuppressWarnings("unused")
-        private void setKey(String key) {
-            this.key = key;
-        }
-    }
-
-    @DynamoDbTable(tableName = "aws-java-sdk-util")
-    public static class PrivateSetter {
-
-        private String key;
-        private String stringProperty;
-
-        @DynamoDbHashKey
-        public String getKey() {
-            return key;
-        }
-
-        public void setKey(String key) {
-            this.key = key;
-        }
-
-        public String stringProperty() {
-            return stringProperty;
-        }
-
-        private void setStringProperty(String stringProperty) {
-            this.stringProperty = stringProperty;
-        }
-    }
-
-    @DynamoDbTable(tableName = "aws-java-sdk-util")
-    public static class OverloadedSetter {
-
-        private String key;
-        private String attribute;
-
-        @DynamoDbHashKey
-        public String getKey() {
-            return key;
-        }
-
-        public void setKey(String key) {
-            this.key = key;
-        }
-
-        public String getAttribute() {
-            return attribute;
-        }
-
-        public void setAttribute(String attribute, String unused) {
-            this.attribute = attribute;
-        }
-    }
-
-    @DynamoDbTable(tableName = "aws-java-sdk-util")
-    public static class WrongTypeForSetter {
-
-        private String key;
-        private String attribute;
-
-        @DynamoDbHashKey
-        public String getKey() {
-            return key;
-        }
-
-        public void setKey(String key) {
-            this.key = key;
-        }
-
-        public String getAttribute() {
-            return attribute;
-        }
-
-        public void setAttribute(Integer attribute) {
-            this.attribute = String.valueOf(attribute);
-        }
-
-    }
-
-    @DynamoDbTable(tableName = "aws-java-sdk-util")
-    public static class NumericFields {
-
-        private String key;
-        private Integer integerProperty;
-
-        @DynamoDbHashKey
-        public String getKey() {
-            return key;
-        }
-
-        public void setKey(String key) {
-            this.key = key;
-        }
-
-        public Integer getIntegerProperty() {
-            return integerProperty;
-        }
-
-        public void setIntegerProperty(Integer integerProperty) {
-            this.integerProperty = integerProperty;
-        }
-
-    }
-
-    @DynamoDbTable(tableName = "aws-java-sdk-util")
-    public static class ComplexType {
-
-        public String key;
-        public ComplexType type;
-
-        public ComplexType(String key, ComplexType type) {
-            super();
-            this.key = key;
-            this.type = type;
-        }
-
-        @DynamoDbHashKey
-        public String getKey() {
-            return key;
-        }
-
-        public void setKey(String key) {
-            this.key = key;
-        }
-
-        public ComplexType getType() {
-            return type;
-        }
-
-        public void setType(ComplexType type) {
-            this.type = type;
-        }
-    }
-
-    @DynamoDbTable(tableName = "aws-java-sdk-util")
-    public static class ComplexHashKeyType {
-
-        private ComplexType key;
-        private String attribute;
-
-        @DynamoDbHashKey
-        public ComplexType getKey() {
-            return key;
-        }
-
-        public void setKey(ComplexType key) {
-            this.key = key;
-        }
-
-        public String getAttribute() {
-            return attribute;
-        }
-
-        public void setAttribute(String attribute) {
-            this.attribute = attribute;
-        }
-    }
-
-    @DynamoDbTable(tableName = "aws-java-sdk-util")
-    public static class NonSetCollectionType {
-
-        private String key;
-        private List<String> badlyMapped;
-
-        @DynamoDbHashKey
-        public String getKey() {
-            return key;
-        }
-
-        public void setKey(String key) {
-            this.key = key;
-        }
-
-        public List<String> getBadlyMapped() {
-            return badlyMapped;
-        }
-
-        public void setBadlyMapped(List<String> badlyMapped) {
-            this.badlyMapped = badlyMapped;
-        }
-    }
-
-    @DynamoDbTable(tableName = "aws-java-sdk-util")
-    public static class FractionalVersionAttribute {
-
-        private String key;
-        private Double version;
-
-        @DynamoDbHashKey
-        public String getKey() {
-            return key;
-        }
-
-        public void setKey(String key) {
-            this.key = key;
-        }
-
-        @DynamoDbVersionAttribute
-        public Double getVersion() {
-            return version;
-        }
-
-        public void setVersion(Double version) {
-            this.version = version;
-        }
-
-    }
-
-    @DynamoDbTable(tableName = "aws-java-sdk-util")
-    public static class AutoGeneratedIntegerKey {
-
-        private Integer key;
-        private String value;
-
-        @DynamoDbHashKey
-        @DynamoDbAutoGeneratedKey
-        public Integer getKey() {
-            return key;
-        }
-
-        public void setKey(Integer key) {
-            this.key = key;
-        }
-
-        public String value() {
-            return value;
-        }
-
-        public void setValue(String value) {
-            this.value = value;
-        }
-
-    }
-
-    @DynamoDbTable(tableName = "aws-java-sdk-util")
-    public static class AutoGeneratedIntegerRangeKey {
-
-        private String key;
-        private Integer rangekey;
-        private String value;
-
-        @DynamoDbHashKey
-        public String getKey() {
-            return key;
-        }
-
-        public void setKey(String key) {
-            this.key = key;
-        }
-
-        @DynamoDbAutoGeneratedKey
-        @DynamoDbRangeKey
-        public Integer getRangekey() {
-            return rangekey;
-        }
-
-        public void setRangekey(Integer rangekey) {
-            this.rangekey = rangekey;
-        }
-
-        public String value() {
-            return value;
-        }
-
-        public void setValue(String value) {
-            this.value = value;
-        }
-
-    }
-
-}
diff --git a/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/FlattenedIntegrationTest.java b/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/FlattenedIntegrationTest.java
deleted file mode 100644
index 3779b1358886..000000000000
--- a/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/FlattenedIntegrationTest.java
+++ /dev/null
@@ -1,317 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.mapper;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-
-import java.util.Collections;
-import java.util.Date;
-import java.util.List;
-import java.util.Set;
-import org.junit.Test;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbAttribute;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbAutoGenerateStrategy;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbAutoGeneratedTimestamp;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbFlattened;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMappingException;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbTable;
-import software.amazon.awssdk.services.dynamodb.pojos.AuditRecord;
-import software.amazon.awssdk.services.dynamodb.pojos.AutoKeyAndVal;
-import software.amazon.awssdk.services.dynamodb.pojos.Currency;
-import software.amazon.awssdk.services.dynamodb.pojos.DateRange;
-
-/**
- * Tests updating component attribute fields correctly.
- */
-public class FlattenedIntegrationTest extends AbstractKeyAndValIntegrationTestCase {
-
-    /**
-     * Test the mappings.
-     */
-    @Test
-    public void testAuditRecord() {
-        final KeyAndAuditRecord object = new KeyAndAuditRecord();
-        final AuditRecord auditRecord = assertBeforeAndAfterChange(true, object);
-        assertNotNull(auditRecord.getCreatedDate());
-        assertNotNull(auditRecord.getLastModifiedDate());
-        assertEquals(Long.valueOf(1L), auditRecord.getVersionNumber());
-    }
-
-    /**
-     * Test using {@code DateRange}.
-     */
-    @Test
-    public void testDateRange() throws Exception {
-        final KeyAndDateRange object = new KeyAndDateRange();
-        object.setVal(new DateRange(new Date(), -60000L, 60000L));
-
-        assertBeforeAndAfterChange(false, object);
-    }
-
-    /**
-     * Test using {@code DateRange}.
-     */
-    @Test
-    public void testDateRangeIsNull() {
-        final KeyAndDateRange object = new KeyAndDateRange();
-
-        assertBeforeAndAfterChange(false, object);
-    }
-
-    /**
-     * Test using {@code DateRange}.
-     */
-    @Test
-    public void testDateRangeStartAndEndIsNull() {
-        final KeyAndDateRange object = new KeyAndDateRange();
-        object.setVal(new DateRange());
-
-        final DateRange after = assertBeforeAndAfterChange(null, object);
-        assertNull(after); //<- an empty date range produces null object
-    }
-
-    /**
-     * Test using {@code DateRange}.
-     */
-    @Test
-    public void testDateRangeStartIsNull() throws Exception {
-        final KeyAndDateRange object = new KeyAndDateRange();
-        object.setVal(new DateRange(null, new Date()));
-
-        assertBeforeAndAfterChange(false, object);
-    }
-
-    /**
-     * Test using {@code DateRange}.
-     */
-    @Test
-    public void testDateRangeEndIsNull() throws Exception {
-        final KeyAndDateRange object = new KeyAndDateRange();
-        object.setVal(new DateRange(new Date(), null));
-
-        assertBeforeAndAfterChange(false, object);
-    }
-
-    /**
-     * Test using {@code DateRange}.
-     */
-    @Test
-    public void testAutoDateRange() throws Exception {
-        final KeyAndAutoDateRange object = new KeyAndAutoDateRange();
-
-        assertBeforeAndAfterChange(true, object);
-    }
-
-    /**
-     * Test using {@code DateRange}.
-     */
-    @Test(expected = DynamoDbMappingException.class)
-    public void testKeyAndUnknownAttribute() {
-        final KeyAndUnknownAttribute object = new KeyAndUnknownAttribute();
-        object.setVal(new DateRange(new Date(), -60000L, 60000L));
-
-        assertBeforeAndAfterChange(false, object);
-    }
-
-    /**
-     * Test using {@code DateRange}.
-     */
-    @Test(expected = DynamoDbMappingException.class)
-    public void testDateRangeSet() {
-        final KeyAndDateRangeSet object = new KeyAndDateRangeSet();
-        object.setVal(Collections.<DateRange>singleton(new DateRange(new Date(), -60000L, 60000L)));
-
-        assertBeforeAndAfterChange(false, object);
-    }
-
-    /**
-     * Test using {@code DateRange}.
-     */
-    @Test(expected = DynamoDbMappingException.class)
-    public void testDateRangeList() {
-        final KeyAndDateRangeList object = new KeyAndDateRangeList();
-        object.setVal(Collections.<DateRange>singletonList(new DateRange(new Date(), -60000L, 60000L)));
-
-        assertBeforeAndAfterChange(false, object);
-    }
-
-    /**
-     * Test using {@code Currency}.
-     */
-    @Test
-    public void testKeyAndCurrencies() {
-        final KeyAndCurrencies object = new KeyAndCurrencies();
-        object.setVal(new Currency(1000000D, "CAD"));
-        object.setOther(new Currency(99.99D, "USD"));
-
-        assertBeforeAndAfterChange(false, object);
-
-        final KeyAndCurrencies reload = util.load(object.getClass(), object.getKey());
-        assertEquals(object.getVal(), reload.getVal());
-        assertEquals(object.getOther(), reload.getOther());
-    }
-
-    /**
-     * test object.
-     */
-    @DynamoDbTable(tableName = "aws-java-sdk-util")
-    public static class KeyAndAuditRecord extends AutoKeyAndVal<AuditRecord> {
-        public AuditRecord getVal() {
-            return super.getVal();
-        }
-
-        @Override
-        public void setVal(final AuditRecord val) {
-            super.setVal(val);
-        }
-    }
-
-    /**
-     * An object with {@code DateRange}.
-     */
-    @DynamoDbTable(tableName = "aws-java-sdk-util")
-    public static class KeyAndDateRange extends AutoKeyAndVal<DateRange> {
-        @DynamoDbFlattened(attributes = {
-                @DynamoDbAttribute(mappedBy = "start", attributeName = "DateRangeStart"),
-                @DynamoDbAttribute(mappedBy = "end", attributeName = "DateRangeEnd")})
-        public DateRange getVal() {
-            return super.getVal();
-        }
-
-        @Override
-        public void setVal(final DateRange val) {
-            super.setVal(val);
-        }
-    }
-
-    /**
-     * An object with {@code DateRange}.
-     */
-    @DynamoDbTable(tableName = "aws-java-sdk-util")
-    public static class KeyAndAutoDateRange extends AutoKeyAndVal<KeyAndAutoDateRange.AutoDateRange> {
-        @DynamoDbFlattened(attributes = {
-                @DynamoDbAttribute(mappedBy = "start", attributeName = "CreatedDate"),
-                @DynamoDbAttribute(mappedBy = "end", attributeName = "LastModifiedDate")})
-        public AutoDateRange getVal() {
-            return super.getVal();
-        }
-
-        @Override
-        public void setVal(final AutoDateRange val) {
-            super.setVal(val);
-        }
-
-        public static class AutoDateRange extends DateRange {
-            @DynamoDbAutoGeneratedTimestamp(strategy = DynamoDbAutoGenerateStrategy.CREATE)
-            public Date start() {
-                return super.getStart();
-            }
-
-            @DynamoDbAutoGeneratedTimestamp(strategy = DynamoDbAutoGenerateStrategy.ALWAYS)
-            public Date getEnd() {
-                return super.getEnd();
-            }
-        }
-    }
-
-    /**
-     * An object with {@code DateRange}.
-     */
-    @DynamoDbTable(tableName = "aws-java-sdk-util")
-    public static class KeyAndUnknownAttribute extends AutoKeyAndVal<DateRange> {
-        @DynamoDbFlattened(attributes = {
-                @DynamoDbAttribute(mappedBy = "xstart", attributeName = "DateRangeStart"),
-                @DynamoDbAttribute(mappedBy = "end", attributeName = "DateRangeEnd")})
-        public DateRange getVal() {
-            return super.getVal();
-        }
-
-        @Override
-        public void setVal(final DateRange val) {
-            super.setVal(val);
-        }
-    }
-
-    /**
-     * An object with {@code DateRange}.
-     */
-    @DynamoDbTable(tableName = "aws-java-sdk-util")
-    public static class KeyAndDateRangeSet extends AutoKeyAndVal<Set<DateRange>> {
-        @DynamoDbFlattened(attributes = {
-                @DynamoDbAttribute(mappedBy = "start", attributeName = "starts"),
-                @DynamoDbAttribute(mappedBy = "end", attributeName = "ends")})
-        public Set<DateRange> getVal() {
-            return super.getVal();
-        }
-
-        @Override
-        public void setVal(final Set<DateRange> val) {
-            super.setVal(val);
-        }
-    }
-
-    /**
-     * An object with {@code DateRange}.
-     */
-    @DynamoDbTable(tableName = "aws-java-sdk-util")
-    public static class KeyAndDateRangeList extends AutoKeyAndVal<List<DateRange>> {
-        @DynamoDbFlattened(attributes = {
-                @DynamoDbAttribute(mappedBy = "start", attributeName = "starts"),
-                @DynamoDbAttribute(mappedBy = "end", attributeName = "ends")})
-        public List<DateRange> getVal() {
-            return super.getVal();
-        }
-
-        @Override
-        public void setVal(final List<DateRange> val) {
-            super.setVal(val);
-        }
-    }
-
-    /**
-     * An object with {@code Currency}.
-     */
-    @DynamoDbTable(tableName = "aws-java-sdk-util")
-    public static class KeyAndCurrencies extends AutoKeyAndVal<Currency> {
-        private Currency other;
-
-        @DynamoDbFlattened(attributes = {
-                @DynamoDbAttribute(mappedBy = "amount", attributeName = "firstAmount"),
-                @DynamoDbAttribute(mappedBy = "unit", attributeName = "firstUnit")})
-        public Currency getVal() {
-            return super.getVal();
-        }
-
-        @Override
-        public void setVal(final Currency val) {
-            super.setVal(val);
-        }
-
-        @DynamoDbFlattened(attributes = {
-                @DynamoDbAttribute(mappedBy = "amount", attributeName = "secondAmount"),
-                @DynamoDbAttribute(mappedBy = "unit", attributeName = "secondUnit")})
-        public Currency getOther() {
-            return this.other;
-        }
-
-        public void setOther(final Currency other) {
-            this.other = other;
-        }
-    }
-
-}
diff --git a/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/GenerateCreateTableRequestIntegrationTest.java b/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/GenerateCreateTableRequestIntegrationTest.java
deleted file mode 100644
index 85c3589763ff..000000000000
--- a/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/GenerateCreateTableRequestIntegrationTest.java
+++ /dev/null
@@ -1,260 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.mapper;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import software.amazon.awssdk.services.dynamodb.ImmutableObjectUtils;
-import software.amazon.awssdk.services.dynamodb.TableUtils;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMapper;
-import software.amazon.awssdk.services.dynamodb.model.AttributeDefinition;
-import software.amazon.awssdk.services.dynamodb.model.CreateTableRequest;
-import software.amazon.awssdk.services.dynamodb.model.DeleteTableRequest;
-import software.amazon.awssdk.services.dynamodb.model.GlobalSecondaryIndex;
-import software.amazon.awssdk.services.dynamodb.model.GlobalSecondaryIndexDescription;
-import software.amazon.awssdk.services.dynamodb.model.KeySchemaElement;
-import software.amazon.awssdk.services.dynamodb.model.KeyType;
-import software.amazon.awssdk.services.dynamodb.model.LocalSecondaryIndex;
-import software.amazon.awssdk.services.dynamodb.model.LocalSecondaryIndexDescription;
-import software.amazon.awssdk.services.dynamodb.model.ProvisionedThroughput;
-import software.amazon.awssdk.services.dynamodb.model.ScalarAttributeType;
-import software.amazon.awssdk.services.dynamodb.model.TableDescription;
-import software.amazon.awssdk.testutils.UnorderedCollectionComparator;
-import utils.test.util.DynamoDBTestBase;
-
-/**
- * Tests that the CreateTableRequest generated by DynamoDBMapper.generateCreateTableRequest
- * correctly creates the expected table.
- */
-public class GenerateCreateTableRequestIntegrationTest extends DynamoDBTestBase {
-
-    private static final ProvisionedThroughput DEFAULT_CAPACITY = ProvisionedThroughput.builder().readCapacityUnits(5L).writeCapacityUnits(5L).build();
-    private static DynamoDbMapper mapper;
-    private static Set<String> testedTableName = new HashSet<>();
-
-    @BeforeClass
-    public static void setUp() throws Exception {
-        DynamoDBTestBase.setUpTestBase();
-        mapper = new DynamoDbMapper(dynamo);
-    }
-
-    @AfterClass
-    public static void tearDown() {
-        for (String tableName : testedTableName) {
-            dynamo.deleteTable(DeleteTableRequest.builder().tableName(tableName).build());
-        }
-    }
-
-    private static void setProvisionedThroughput(CreateTableRequest request, ProvisionedThroughput throughput) {
-        ImmutableObjectUtils.setObjectMember(request, "provisionedThroughput", throughput);
-        //request.setProvisionedThroughput(throughput);
-        if (request.globalSecondaryIndexes() != null) {
-            for (GlobalSecondaryIndex gsi : request.globalSecondaryIndexes()) {
-                ImmutableObjectUtils.setObjectMember(gsi, "provisionedThroughput", throughput);
-                //gsi.setProvisionedThroughput(throughput);
-            }
-        }
-    }
-
-    private static boolean equalLsi(Collection<LocalSecondaryIndex> a, Collection<LocalSecondaryIndexDescription> b) {
-        return UnorderedCollectionComparator.equalUnorderedCollections(a, b, new LocalSecondaryIndexDefinitionComparator());
-    }
-
-    private static boolean equalGsi(Collection<GlobalSecondaryIndex> a, Collection<GlobalSecondaryIndexDescription> b) {
-        return UnorderedCollectionComparator.equalUnorderedCollections(a, b, new GlobalSecondaryIndexDefinitionComparator());
-    }
-
-    private static String appendCurrentTimeToTableName(CreateTableRequest request) {
-        String appendedName = String.format("%s-%d", request.tableName(), System.currentTimeMillis());
-        ImmutableObjectUtils.setObjectMember(request, "tableName", appendedName);
-        /// /request.setTableName(appendedName);
-        return appendedName;
-    }
-
-    @Test
-    public void testParseIndexRangeKeyClass() throws Exception {
-        CreateTableRequest request = mapper.generateCreateTableRequest(IndexRangeKeyClass.class);
-        String createdTableName = appendCurrentTimeToTableName(request);
-        testedTableName.add(createdTableName);
-        setProvisionedThroughput(request, DEFAULT_CAPACITY);
-
-        TableDescription createdTableDescription = dynamo.createTable(request).tableDescription();
-
-        assertEquals(createdTableName, createdTableDescription.tableName());
-        List<KeySchemaElement> expectedKeyElements = Arrays.asList(
-                KeySchemaElement.builder().attributeName("key").keyType(KeyType.HASH).build(),
-                KeySchemaElement.builder().attributeName("rangeKey").keyType(KeyType.RANGE).build()
-        );
-        assertEquals(expectedKeyElements, createdTableDescription.keySchema());
-
-        List<AttributeDefinition> expectedAttrDefinitions = Arrays.asList(
-                AttributeDefinition.builder().attributeName("key").attributeType(ScalarAttributeType.N).build(),
-                AttributeDefinition.builder().attributeName("rangeKey").attributeType(ScalarAttributeType.N).build(),
-                AttributeDefinition.builder().attributeName("indexFooRangeKey").attributeType(ScalarAttributeType.N).build(),
-                AttributeDefinition.builder().attributeName("indexBarRangeKey").attributeType(ScalarAttributeType.N).build(),
-                AttributeDefinition.builder().attributeName("multipleIndexRangeKey").attributeType(ScalarAttributeType.N).build()
-        );
-        assertTrue(UnorderedCollectionComparator.equalUnorderedCollections(
-                expectedAttrDefinitions,
-                createdTableDescription.attributeDefinitions()));
-
-        List<LocalSecondaryIndex> expectedLsi = Arrays.asList(
-                LocalSecondaryIndex.builder()
-                                   .indexName("index_foo")
-                                   .keySchema(
-                                           KeySchemaElement.builder().attributeName("key").keyType(KeyType.HASH).build(),
-                                           KeySchemaElement.builder().attributeName("indexFooRangeKey").keyType(KeyType.RANGE).build()).build(),
-                LocalSecondaryIndex.builder()
-                                   .indexName("index_bar")
-                                   .keySchema(
-                                           KeySchemaElement.builder().attributeName("key").keyType(KeyType.HASH).build(),
-                                           KeySchemaElement.builder().attributeName("indexBarRangeKey").keyType(KeyType.RANGE).build()).build(),
-                LocalSecondaryIndex.builder()
-                                   .indexName("index_foo_copy")
-                                   .keySchema(
-                                           KeySchemaElement.builder().attributeName("key").keyType(KeyType.HASH).build(),
-                                           KeySchemaElement.builder().attributeName("multipleIndexRangeKey").keyType(KeyType.RANGE).build()).build(),
-                LocalSecondaryIndex.builder()
-                                   .indexName("index_bar_copy")
-                                   .keySchema(
-                                           KeySchemaElement.builder().attributeName("key").keyType(KeyType.HASH).build(),
-                                           KeySchemaElement.builder().attributeName("multipleIndexRangeKey").keyType(KeyType.RANGE).build()).build());
-        assertTrue(equalLsi(expectedLsi, createdTableDescription.localSecondaryIndexes()));
-
-        assertNull(request.globalSecondaryIndexes());
-        assertEquals(DEFAULT_CAPACITY, request.provisionedThroughput());
-
-        // Only one table with indexes can be created simultaneously
-        TableUtils.waitUntilActive(dynamo, createdTableName);
-    }
-
-    @Test
-    public void testComplexIndexedHashRangeClass() throws Exception {
-        CreateTableRequest request = mapper.generateCreateTableRequest(MapperQueryExpressionTest.HashRangeClass.class);
-        String createdTableName = appendCurrentTimeToTableName(request);
-        testedTableName.add(createdTableName);
-        setProvisionedThroughput(request, DEFAULT_CAPACITY);
-
-        TableDescription createdTableDescription = dynamo.createTable(request).tableDescription();
-
-        assertEquals(createdTableName, createdTableDescription.tableName());
-        List<KeySchemaElement> expectedKeyElements = Arrays.asList(
-                KeySchemaElement.builder().attributeName("primaryHashKey").keyType(KeyType.HASH).build(),
-                KeySchemaElement.builder().attributeName("primaryRangeKey").keyType(KeyType.RANGE).build()
-        );
-        assertEquals(expectedKeyElements, createdTableDescription.keySchema());
-
-        List<AttributeDefinition> expectedAttrDefinitions = Arrays.asList(
-                AttributeDefinition.builder().attributeName("primaryHashKey").attributeType(ScalarAttributeType.S).build(),
-                AttributeDefinition.builder().attributeName("indexHashKey").attributeType(ScalarAttributeType.S).build(),
-                AttributeDefinition.builder().attributeName("primaryRangeKey").attributeType(ScalarAttributeType.S).build(),
-                AttributeDefinition.builder().attributeName("indexRangeKey").attributeType(ScalarAttributeType.S).build(),
-                AttributeDefinition.builder().attributeName("anotherIndexRangeKey").attributeType(ScalarAttributeType.S).build()
-        );
-        assertTrue(UnorderedCollectionComparator.equalUnorderedCollections(
-                expectedAttrDefinitions,
-                createdTableDescription.attributeDefinitions()));
-
-        List<LocalSecondaryIndex> expectedLsi = Arrays.asList(
-                LocalSecondaryIndex.builder()
-                                   .indexName("LSI-primary-range")
-                                   .keySchema(
-                                           KeySchemaElement.builder().attributeName("primaryHashKey").keyType(KeyType.HASH).build(),
-                                           KeySchemaElement.builder().attributeName("primaryRangeKey").keyType(KeyType.RANGE).build()).build(),
-                LocalSecondaryIndex.builder()
-                                   .indexName("LSI-index-range-1")
-                                   .keySchema(
-                                           KeySchemaElement.builder().attributeName("primaryHashKey").keyType(KeyType.HASH).build(),
-                                           KeySchemaElement.builder().attributeName("indexRangeKey").keyType(KeyType.RANGE).build()).build(),
-                LocalSecondaryIndex.builder()
-                                   .indexName("LSI-index-range-2")
-                                   .keySchema(
-                                           KeySchemaElement.builder().attributeName("primaryHashKey").keyType(KeyType.HASH).build(),
-                                           KeySchemaElement.builder().attributeName("indexRangeKey").keyType(KeyType.RANGE).build()).build(),
-                LocalSecondaryIndex.builder()
-                                   .indexName("LSI-index-range-3")
-                                   .keySchema(
-                                           KeySchemaElement.builder().attributeName("primaryHashKey").keyType(KeyType.HASH).build(),
-                                           KeySchemaElement.builder().attributeName("anotherIndexRangeKey").keyType(KeyType.RANGE).build()).build());
-        assertTrue(equalLsi(expectedLsi, createdTableDescription.localSecondaryIndexes()));
-
-        List<GlobalSecondaryIndex> expectedGsi = Arrays.asList(
-                GlobalSecondaryIndex.builder()
-                                    .indexName("GSI-primary-hash-index-range-1")
-                                    .keySchema(
-                                            KeySchemaElement.builder().attributeName("primaryHashKey").keyType(KeyType.HASH).build(),
-                                            KeySchemaElement.builder().attributeName("indexRangeKey").keyType(KeyType.RANGE).build()).build(),
-                GlobalSecondaryIndex.builder()
-                                    .indexName("GSI-primary-hash-index-range-2")
-                                    .keySchema(
-                                            KeySchemaElement.builder().attributeName("primaryHashKey").keyType(KeyType.HASH).build(),
-                                            KeySchemaElement.builder().attributeName("anotherIndexRangeKey").keyType(KeyType.RANGE).build()).build(),
-                GlobalSecondaryIndex.builder()
-                                    .indexName("GSI-index-hash-primary-range")
-                                    .keySchema(
-                                            KeySchemaElement.builder().attributeName("indexHashKey").keyType(KeyType.HASH).build(),
-                                            KeySchemaElement.builder().attributeName("primaryRangeKey").keyType(KeyType.RANGE).build()).build(),
-                GlobalSecondaryIndex.builder()
-                                    .indexName("GSI-index-hash-index-range-1")
-                                    .keySchema(
-                                            KeySchemaElement.builder().attributeName("indexHashKey").keyType(KeyType.HASH).build(),
-                                            KeySchemaElement.builder().attributeName("indexRangeKey").keyType(KeyType.RANGE).build()).build(),
-                GlobalSecondaryIndex.builder()
-                                    .indexName("GSI-index-hash-index-range-2")
-                                    .keySchema(
-                                            KeySchemaElement.builder().attributeName("indexHashKey").keyType(KeyType.HASH).build(),
-                                            KeySchemaElement.builder().attributeName("indexRangeKey").keyType(KeyType.RANGE).build()).build());
-        assertTrue(equalGsi(expectedGsi, createdTableDescription.globalSecondaryIndexes()));
-
-        assertEquals(DEFAULT_CAPACITY, request.provisionedThroughput());
-
-        // Only one table with indexes can be created simultaneously
-        TableUtils.waitUntilActive(dynamo, createdTableName);
-    }
-
-    private static class LocalSecondaryIndexDefinitionComparator
-            implements
-            UnorderedCollectionComparator.CrossTypeComparator<LocalSecondaryIndex, LocalSecondaryIndexDescription> {
-
-        @Override
-        public boolean equals(LocalSecondaryIndex a, LocalSecondaryIndexDescription b) {
-            return a.indexName().equals(b.indexName())
-                   && a.keySchema().equals(b.keySchema());
-        }
-
-    }
-
-    private static class GlobalSecondaryIndexDefinitionComparator
-            implements
-            UnorderedCollectionComparator.CrossTypeComparator<GlobalSecondaryIndex, GlobalSecondaryIndexDescription> {
-
-        @Override
-        public boolean equals(GlobalSecondaryIndex a, GlobalSecondaryIndexDescription b) {
-            return a.indexName().equals(b.indexName())
-                   && a.keySchema().equals(b.keySchema());
-        }
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/HashKeyOnlyTableWithGSIIntegrationTest.java b/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/HashKeyOnlyTableWithGSIIntegrationTest.java
deleted file mode 100644
index 07c67da56270..000000000000
--- a/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/HashKeyOnlyTableWithGSIIntegrationTest.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.mapper;
-
-import static org.junit.Assert.assertEquals;
-
-import java.util.ArrayList;
-import java.util.List;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import software.amazon.awssdk.services.dynamodb.DynamoDBMapperIntegrationTestBase;
-import software.amazon.awssdk.services.dynamodb.TableUtils;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbHashKey;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbIndexHashKey;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbIndexRangeKey;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMapper;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbQueryExpression;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbTable;
-import software.amazon.awssdk.services.dynamodb.datamodeling.PaginatedQueryList;
-import software.amazon.awssdk.services.dynamodb.model.AttributeDefinition;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-import software.amazon.awssdk.services.dynamodb.model.ComparisonOperator;
-import software.amazon.awssdk.services.dynamodb.model.Condition;
-import software.amazon.awssdk.services.dynamodb.model.CreateTableRequest;
-import software.amazon.awssdk.services.dynamodb.model.DeleteTableRequest;
-import software.amazon.awssdk.services.dynamodb.model.GlobalSecondaryIndex;
-import software.amazon.awssdk.services.dynamodb.model.KeySchemaElement;
-import software.amazon.awssdk.services.dynamodb.model.KeyType;
-import software.amazon.awssdk.services.dynamodb.model.Projection;
-import software.amazon.awssdk.services.dynamodb.model.ProjectionType;
-import software.amazon.awssdk.services.dynamodb.model.ProvisionedThroughput;
-import software.amazon.awssdk.services.dynamodb.model.ScalarAttributeType;
-import utils.test.util.DynamoDBTestBase;
-
-/**
- * Integration test for GSI support with a table that has no primary range key (only a primary hash key).
- */
-public class HashKeyOnlyTableWithGSIIntegrationTest extends DynamoDBMapperIntegrationTestBase {
-
-    public static final String HASH_KEY_ONLY_TABLE_NAME = "no-primary-range-key-gsi-test";
-
-
-    @BeforeClass
-    public static void setUp() throws Exception {
-        DynamoDBTestBase.setUpTestBase();
-        List<KeySchemaElement> keySchema = new ArrayList<KeySchemaElement>();
-        keySchema.add(KeySchemaElement.builder().attributeName("id").keyType(KeyType.HASH).build());
-
-        CreateTableRequest req = CreateTableRequest.builder()
-                .tableName(HASH_KEY_ONLY_TABLE_NAME)
-                .keySchema(keySchema)
-                .provisionedThroughput(ProvisionedThroughput.builder().readCapacityUnits(10L).writeCapacityUnits(10L).build())
-                .attributeDefinitions(
-                        AttributeDefinition.builder().attributeName("id").attributeType(ScalarAttributeType.S).build(),
-                        AttributeDefinition.builder().attributeName("status").attributeType(ScalarAttributeType.S).build(),
-                        AttributeDefinition.builder().attributeName("ts").attributeType(ScalarAttributeType.S).build())
-                .globalSecondaryIndexes(
-                        GlobalSecondaryIndex.builder()
-                                .provisionedThroughput(ProvisionedThroughput.builder().readCapacityUnits(10L).writeCapacityUnits(10L).build())
-                                .indexName("statusAndCreation")
-                                .keySchema(
-                                        KeySchemaElement.builder().attributeName("status").keyType(KeyType.HASH).build(),
-                                        KeySchemaElement.builder().attributeName("ts").keyType(KeyType.RANGE).build())
-                                .projection(
-                                        Projection.builder().projectionType(ProjectionType.ALL).build()).build()).build();
-
-        TableUtils.createTableIfNotExists(dynamo, req);
-        TableUtils.waitUntilActive(dynamo, HASH_KEY_ONLY_TABLE_NAME);
-    }
-
-    @AfterClass
-    public static void tearDown() throws Exception {
-        dynamo.deleteTable(DeleteTableRequest.builder().tableName(HASH_KEY_ONLY_TABLE_NAME).build());
-    }
-
-    /**
-     * Tests that we can query using the hash/range GSI on our hash-key only table.
-     */
-    @Test
-    public void testGSIQuery() throws Exception {
-        DynamoDbMapper mapper = new DynamoDbMapper(dynamo);
-        String status = "foo-status";
-
-        User user = new User();
-        user.setId("123");
-        user.setStatus(status);
-        user.setTs("321");
-        mapper.save(user);
-
-        DynamoDbQueryExpression<User> expr = new DynamoDbQueryExpression<User>()
-                .withIndexName("statusAndCreation")
-                .withLimit(100)
-                .withConsistentRead(false)
-                .withHashKeyValues(user)
-                .withRangeKeyCondition("ts",
-                                       Condition.builder()
-                                               .comparisonOperator(ComparisonOperator.GT)
-                                               .attributeValueList(AttributeValue.builder().s("100").build()).build());
-
-        PaginatedQueryList<User> query = mapper.query(User.class, expr);
-        assertEquals(1, query.size());
-        assertEquals(status, query.get(0).getStatus());
-    }
-
-    @DynamoDbTable(tableName = HASH_KEY_ONLY_TABLE_NAME)
-    public static class User {
-        private String id;
-        private String status;
-        private String ts;
-
-        @DynamoDbHashKey
-        public String getId() {
-            return id;
-        }
-
-        public void setId(String id) {
-            this.id = id;
-        }
-
-        @DynamoDbIndexHashKey(globalSecondaryIndexName = "statusAndCreation")
-        public String getStatus() {
-            return status;
-        }
-
-        public void setStatus(String status) {
-            this.status = status;
-        }
-
-        @DynamoDbIndexRangeKey(globalSecondaryIndexName = "statusAndCreation")
-        public String getTs() {
-            return ts;
-        }
-
-        public void setTs(String ts) {
-            this.ts = ts;
-        }
-    }
-
-}
diff --git a/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/IndexRangeKeyAttributesIntegrationTest.java b/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/IndexRangeKeyAttributesIntegrationTest.java
deleted file mode 100644
index 7733f9d575bd..000000000000
--- a/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/IndexRangeKeyAttributesIntegrationTest.java
+++ /dev/null
@@ -1,439 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-/*
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *    http://aws.amazon.com/apache2.0
- *
- * 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.mapper;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import software.amazon.awssdk.services.dynamodb.DynamoDBMapperIntegrationTestBase;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMapper;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMapperConfig;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMapperConfig.ConsistentRead;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMappingException;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbQueryExpression;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-import software.amazon.awssdk.services.dynamodb.model.ComparisonOperator;
-import software.amazon.awssdk.services.dynamodb.model.Condition;
-import software.amazon.awssdk.services.dynamodb.model.PutItemRequest;
-
-/**
- * Tests that index range keys are properly handled as common attribute
- * when items are loaded, saved/updated by using primary key.
- * Also tests using index range keys for queries.
- */
-public class IndexRangeKeyAttributesIntegrationTest extends DynamoDBMapperIntegrationTestBase {
-
-    private static final String RANGE_KEY = "rangeKey";
-    private static final String INDEX_FOO_RANGE_KEY = "indexFooRangeKey";
-    private static final String INDEX_BAR_RANGE_KEY = "indexBarRangeKey";
-    private static final String MULTIPLE_INDEX_RANGE_KEY = "multipleIndexRangeKey";
-    private static final String FOO_ATTRIBUTE = "fooAttribute";
-    private static final String BAR_ATTRIBUTE = "barAttribute";
-    private static final String VERSION_ATTRIBUTE = "version";
-    private static final List<Map<String, AttributeValue>> attrs = new LinkedList<Map<String, AttributeValue>>();
-    private static final List<Long> hashKeyValues = new LinkedList<Long>();
-    private static final int totalHash = 5;
-    private static final int rangePerHash = 64;
-    private static final int indexFooRangeStep = 2;
-    private static final int indexBarRangeStep = 4;
-    private static final int multipleIndexRangeStep = 8;
-    private static DynamoDbMapper mapper;
-    // We don't start with the current system millis like other tests because
-    // it's out of the range of some data types
-    private static int start = 1;
-
-    // Test data
-    static {
-        for (int i = 0; i < totalHash; i++) {
-            long hashKeyValue = startKey++;
-            hashKeyValues.add(hashKeyValue);
-            for (int j = 0; j < rangePerHash; j++) {
-                Map<String, AttributeValue> attr = new HashMap<String, AttributeValue>();
-                attr.put(KEY_NAME, AttributeValue.builder().n("" + hashKeyValue).build());
-                attr.put(RANGE_KEY, AttributeValue.builder().n("" + j).build());
-                if (j % indexFooRangeStep == 0) {
-                    attr.put(INDEX_FOO_RANGE_KEY, AttributeValue.builder().n("" + j).build());
-                }
-                if (j % indexBarRangeStep == 0) {
-                    attr.put(INDEX_BAR_RANGE_KEY, AttributeValue.builder().n("" + j).build());
-                }
-                if (j % multipleIndexRangeStep == 0) {
-                    attr.put(MULTIPLE_INDEX_RANGE_KEY, AttributeValue.builder().n("" + j).build());
-                }
-                attr.put(FOO_ATTRIBUTE, AttributeValue.builder().s(UUID.randomUUID().toString()).build());
-                attr.put(BAR_ATTRIBUTE, AttributeValue.builder().s(UUID.randomUUID().toString()).build());
-                attr.put(VERSION_ATTRIBUTE, AttributeValue.builder().n("1").build());
-
-                attrs.add(attr);
-            }
-        }
-    }
-
-    ;
-
-    @BeforeClass
-    public static void setUp() throws Exception {
-        boolean recreateTable = false;
-        setUpTableWithIndexRangeAttribute(recreateTable);
-
-        // Insert the data
-        for (Map<String, AttributeValue> attr : attrs) {
-            dynamo.putItem(PutItemRequest.builder().tableName(TABLE_WITH_INDEX_RANGE_ATTRIBUTE).item(attr).build());
-        }
-
-        mapper = new DynamoDbMapper(dynamo,
-                                    new DynamoDbMapperConfig(ConsistentRead.CONSISTENT));
-    }
-
-    /**
-     * Tests that attribute annotated with @DynamoDBIndexRangeKey is properly set in the loaded object.
-     */
-    @Test
-    public void testLoad() throws Exception {
-        for (Map<String, AttributeValue> attr : attrs) {
-            IndexRangeKeyClass x = mapper.load(newIndexRangeKey(Long.parseLong(attr.get(KEY_NAME).n()),
-                                                                Double.parseDouble(attr.get(RANGE_KEY).n())));
-
-            // Convert all numbers to the most inclusive type for easy
-            // comparison
-            assertEquals(new BigDecimal(x.getKey()), new BigDecimal(attr.get(KEY_NAME).n()));
-            assertEquals(new BigDecimal(x.getRangeKey()), new BigDecimal(attr.get(RANGE_KEY).n()));
-            if (null == attr.get(INDEX_FOO_RANGE_KEY)) {
-                assertNull(x.getIndexFooRangeKeyWithFakeName());
-            } else {
-                assertEquals(new BigDecimal(x.getIndexFooRangeKeyWithFakeName()),
-                             new BigDecimal(attr.get(INDEX_FOO_RANGE_KEY).n()));
-            }
-            if (null == attr.get(INDEX_BAR_RANGE_KEY)) {
-                assertNull(x.getIndexBarRangeKey());
-            } else {
-                assertEquals(new BigDecimal(x.getIndexBarRangeKey()), new BigDecimal(attr.get(INDEX_BAR_RANGE_KEY).n()));
-            }
-            assertEquals(new BigDecimal(x.getVersion()), new BigDecimal(attr.get(VERSION_ATTRIBUTE).n()));
-            assertEquals(x.getFooAttribute(), attr.get(FOO_ATTRIBUTE).s());
-            assertEquals(x.getBarAttribute(), attr.get(BAR_ATTRIBUTE).s());
-
-        }
-    }
-
-    private IndexRangeKeyClass newIndexRangeKey(long hashKey, double rangeKey) {
-        IndexRangeKeyClass obj = new IndexRangeKeyClass();
-        obj.setKey(hashKey);
-        obj.setRangeKey(rangeKey);
-        return obj;
-    }
-
-    /**
-     * Tests that attribute annotated with @DynamoDBIndexRangeKey is properly saved.
-     */
-    @Test
-    public void testSave() throws Exception {
-        List<IndexRangeKeyClass> objs = new ArrayList<IndexRangeKeyClass>();
-        for (int i = 0; i < 5; i++) {
-            IndexRangeKeyClass obj = getUniqueObject();
-            objs.add(obj);
-        }
-
-        for (IndexRangeKeyClass obj : objs) {
-            mapper.save(obj);
-        }
-
-        for (IndexRangeKeyClass obj : objs) {
-            IndexRangeKeyClass loaded = mapper.load(IndexRangeKeyClass.class, obj.getKey(), obj.getRangeKey());
-            assertEquals(obj, loaded);
-        }
-    }
-
-    /**
-     * Tests that version attribute is still working as expected.
-     */
-    @Test
-    public void testUpdate() throws Exception {
-        List<IndexRangeKeyClass> objs = new ArrayList<IndexRangeKeyClass>();
-        for (int i = 0; i < 5; i++) {
-            IndexRangeKeyClass obj = getUniqueObject();
-            objs.add(obj);
-        }
-
-        for (IndexRangeKeyClass obj : objs) {
-            mapper.save(obj);
-        }
-
-        for (IndexRangeKeyClass obj : objs) {
-            IndexRangeKeyClass replacement = getUniqueObject();
-            replacement.setKey(obj.getKey());
-            replacement.setRangeKey(obj.getRangeKey());
-            replacement.setVersion(obj.getVersion());
-            mapper.save(replacement);
-
-            IndexRangeKeyClass loadedObject = mapper.load(IndexRangeKeyClass.class, obj.getKey(), obj.getRangeKey());
-            assertEquals(replacement, loadedObject);
-
-            // If we try to update the old version, we should get an error
-            replacement.setVersion(replacement.getVersion() - 1);
-            try {
-                mapper.save(replacement);
-                fail("Should have thrown an exception");
-            } catch (Exception expected) {
-                // Ignored or expected.
-            }
-        }
-    }
-
-    /**
-     * Tests making queries on local secondary index
-     */
-    @Test
-    public void testQueryWithIndexRangekey() {
-        int indexFooRangePerHash = rangePerHash / indexFooRangeStep;
-        int indexBarRangePerHash = rangePerHash / indexBarRangeStep;
-        for (long hashKeyValue : hashKeyValues) {
-            IndexRangeKeyClass hashKeyItem = new IndexRangeKeyClass();
-            hashKeyItem.setKey(hashKeyValue);
-
-            /**
-             * Query items by primary range key
-             */
-            List<IndexRangeKeyClass> result = mapper.query(IndexRangeKeyClass.class,
-                                                           new DynamoDbQueryExpression<IndexRangeKeyClass>()
-                                                                   .withHashKeyValues(hashKeyItem)
-                                                                   .withRangeKeyCondition(RANGE_KEY,
-                                                                                          Condition.builder()
-                                                                                                  .attributeValueList(
-                                                                                                          AttributeValue.builder()
-                                                                                                                  .n("0").build())
-                                                                                                  .comparisonOperator(
-                                                                                                          ComparisonOperator.GE
-                                                                                                                  .toString()).build()));
-            assertTrue(rangePerHash == result.size());
-            // check that all attributes are retrieved
-            for (IndexRangeKeyClass itemInFooIndex : result) {
-                assertNotNull(itemInFooIndex.getFooAttribute());
-                assertNotNull(itemInFooIndex.getBarAttribute());
-            }
-
-            /**
-             * Query items on index_foo
-             */
-            result = mapper.query(IndexRangeKeyClass.class,
-                                  new DynamoDbQueryExpression<IndexRangeKeyClass>()
-                                          .withHashKeyValues(hashKeyItem)
-                                          .withRangeKeyCondition(INDEX_FOO_RANGE_KEY,
-                                                                 Condition.builder()
-                                                                         .attributeValueList(AttributeValue.builder().n("0").build())
-                                                                         .comparisonOperator(
-                                                                                 ComparisonOperator.GE.toString()).build()));
-            assertTrue(indexFooRangePerHash == result.size());
-            // check that only the projected attributes are retrieved
-            for (IndexRangeKeyClass itemInFooIndex : result) {
-                assertNotNull(itemInFooIndex.getFooAttribute());
-                assertNull(itemInFooIndex.getBarAttribute());
-            }
-
-            /**
-             * Query items on index_bar
-             */
-            result = mapper.query(IndexRangeKeyClass.class,
-                                  new DynamoDbQueryExpression<IndexRangeKeyClass>()
-                                          .withHashKeyValues(hashKeyItem)
-                                          .withRangeKeyCondition(INDEX_BAR_RANGE_KEY,
-                                                                 Condition.builder()
-                                                                         .attributeValueList(AttributeValue.builder().n("0").build())
-                                                                         .comparisonOperator(
-                                                                                 ComparisonOperator.GE.toString()).build()));
-            assertTrue(indexBarRangePerHash == result.size());
-            // check that only the projected attributes are retrieved
-            for (IndexRangeKeyClass itemInBarIndex : result) {
-                assertNull(itemInBarIndex.getFooAttribute());
-                assertNotNull(itemInBarIndex.getBarAttribute());
-            }
-        }
-    }
-
-    /**
-     * Tests the exception when user specifies an invalid range key name in the query.
-     */
-    @Test
-    public void testInvalidRangeKeyNameException() {
-        IndexRangeKeyClass hashKeyItem = new IndexRangeKeyClass();
-        hashKeyItem.setKey(0);
-        try {
-            mapper.query(IndexRangeKeyClass.class,
-                         new DynamoDbQueryExpression<IndexRangeKeyClass>()
-                                 .withHashKeyValues(hashKeyItem)
-                                 .withRangeKeyCondition("some_range_key",
-                                                        Condition.builder()
-                                                                .attributeValueList(AttributeValue.builder().n("0").build())
-                                                                .comparisonOperator(ComparisonOperator.GE.toString()).build()));
-            fail("some_range_key is not a valid range key name.");
-        } catch (DynamoDbMappingException e) {
-            System.out.println(e.getMessage());
-        } catch (Exception e) {
-            fail("Should trigger an DynamoDBMappingException.");
-        }
-    }
-
-    /**
-     * Tests the exception when user specifies an invalid index name in the query.
-     */
-    @Test
-    public void testInvalidIndexNameException() {
-        IndexRangeKeyClass hashKeyItem = new IndexRangeKeyClass();
-        hashKeyItem.setKey(0);
-        try {
-            mapper.query(IndexRangeKeyClass.class,
-                         new DynamoDbQueryExpression<IndexRangeKeyClass>()
-                                 .withHashKeyValues(hashKeyItem)
-                                 .withRangeKeyCondition(INDEX_BAR_RANGE_KEY,
-                                                        Condition.builder()
-                                                                .attributeValueList(AttributeValue.builder().n("0").build())
-                                                                .comparisonOperator(ComparisonOperator.GE.toString()).build())
-                                 .withIndexName("some_index"));
-            fail("some_index is not a valid index name.");
-        } catch (IllegalArgumentException iae) {
-            System.out.println(iae.getMessage());
-        } catch (Exception e) {
-            fail("Should trigger an IllegalArgumentException.");
-        }
-    }
-
-    /**
-     * Tests making queries by using range key that is shared by multiple indexes.
-     */
-    @Test
-    public void testQueryWithRangeKeyForMultipleIndexes() {
-        int multipleIndexRangePerHash = rangePerHash / multipleIndexRangeStep;
-        for (long hashKeyValue : hashKeyValues) {
-            IndexRangeKeyClass hashKeyItem = new IndexRangeKeyClass();
-            hashKeyItem.setKey(hashKeyValue);
-
-            /**
-             * Query items by a range key that is shared by multiple indexes
-             */
-            List<IndexRangeKeyClass> result = mapper.query(IndexRangeKeyClass.class,
-                                                           new DynamoDbQueryExpression<IndexRangeKeyClass>()
-                                                                   .withHashKeyValues(hashKeyItem)
-                                                                   .withRangeKeyCondition(MULTIPLE_INDEX_RANGE_KEY,
-                                                                                          Condition.builder()
-                                                                                                  .attributeValueList(
-                                                                                                          AttributeValue.builder()
-                                                                                                                  .n("0").build())
-                                                                                                  .comparisonOperator(
-                                                                                                          ComparisonOperator.GE
-                                                                                                                  .toString()).build())
-                                                                   .withIndexName("index_foo_copy"));
-            assertTrue(multipleIndexRangePerHash == result.size());
-            // check that only the projected attributes are retrieved
-            for (IndexRangeKeyClass itemInFooIndex : result) {
-                assertNotNull(itemInFooIndex.getFooAttribute());
-                assertNull(itemInFooIndex.getBarAttribute());
-            }
-            result = mapper.query(IndexRangeKeyClass.class,
-                                  new DynamoDbQueryExpression<IndexRangeKeyClass>()
-                                          .withHashKeyValues(hashKeyItem)
-                                          .withRangeKeyCondition(MULTIPLE_INDEX_RANGE_KEY,
-                                                                 Condition.builder()
-                                                                         .attributeValueList(AttributeValue.builder().n("0").build())
-                                                                         .comparisonOperator(
-                                                                                 ComparisonOperator.GE.toString()).build())
-                                          .withIndexName("index_bar_copy"));
-            assertTrue(multipleIndexRangePerHash == result.size());
-            // check that only the projected attributes are retrieved
-            for (IndexRangeKeyClass itemInFooIndex : result) {
-                assertNull(itemInFooIndex.getFooAttribute());
-                assertNotNull(itemInFooIndex.getBarAttribute());
-            }
-
-            /**
-             * Exception when user doesn't specify which index to use
-             */
-            try {
-                mapper.query(IndexRangeKeyClass.class,
-                             new DynamoDbQueryExpression<IndexRangeKeyClass>()
-                                     .withHashKeyValues(hashKeyItem)
-                                     .withRangeKeyCondition(MULTIPLE_INDEX_RANGE_KEY,
-                                                            Condition.builder()
-                                                                    .attributeValueList(AttributeValue.builder().n("0").build())
-                                                                    .comparisonOperator(ComparisonOperator.GE.toString()).build()));
-                fail("No index name is specified when query with a range key shared by multiple indexes");
-            } catch (IllegalArgumentException iae) {
-                System.out.println(iae.getMessage());
-            } catch (Exception e) {
-                fail("Should trigger an IllegalArgumentException.");
-            }
-
-            /**
-             * Exception when user uses an invalid index name
-             */
-            try {
-                mapper.query(IndexRangeKeyClass.class,
-                             new DynamoDbQueryExpression<IndexRangeKeyClass>()
-                                     .withHashKeyValues(hashKeyItem)
-                                     .withRangeKeyCondition(MULTIPLE_INDEX_RANGE_KEY,
-                                                            Condition.builder()
-                                                                    .attributeValueList(AttributeValue.builder().n("0").build())
-                                                                    .comparisonOperator(ComparisonOperator.GE.toString()).build())
-                                     .withIndexName("index_foo"));
-                fail("index_foo is not annotated as part of the localSecondaryIndexNames in " +
-                     "the @DynamoDBIndexRangeKey annotation of multipleIndexRangeKey");
-            } catch (IllegalArgumentException iae) {
-                System.out.println(iae.getMessage());
-            } catch (Exception e) {
-                fail("Should trigger an IllegalArgumentException.");
-            }
-        }
-
-    }
-
-
-    private IndexRangeKeyClass getUniqueObject() {
-        IndexRangeKeyClass obj = new IndexRangeKeyClass();
-        obj.setKey(startKey++);
-        obj.setRangeKey((double) start++);
-        obj.setIndexFooRangeKeyWithFakeName((double) start++);
-        obj.setIndexBarRangeKey((double) start++);
-        obj.setFooAttribute("" + startKey++);
-        obj.setBarAttribute("" + startKey++);
-        return obj;
-    }
-
-}
diff --git a/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/InheritanceIntegrationTest.java b/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/InheritanceIntegrationTest.java
deleted file mode 100644
index ec8097b12cf0..000000000000
--- a/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/InheritanceIntegrationTest.java
+++ /dev/null
@@ -1,325 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.mapper;
-
-import static org.junit.Assert.assertEquals;
-
-import java.util.ArrayList;
-import java.util.List;
-import org.junit.Test;
-import software.amazon.awssdk.services.dynamodb.DynamoDBMapperIntegrationTestBase;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbAttribute;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbHashKey;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMapper;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMappingException;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbTable;
-
-/**
- * Tests inheritance behavior in DynamoDB mapper.
- */
-public class InheritanceIntegrationTest extends DynamoDBMapperIntegrationTestBase {
-
-    @Test
-    public void testSubClass() throws Exception {
-        List<Object> objs = new ArrayList<Object>();
-        for (int i = 0; i < 5; i++) {
-            SubClass obj = getUniqueObject(new SubClass());
-            obj.setSubField("" + startKey++);
-            objs.add(obj);
-        }
-
-        DynamoDbMapper util = new DynamoDbMapper(dynamo);
-        for (Object obj : objs) {
-            util.save(obj);
-            assertEquals(util.load(SubClass.class, ((SubClass) obj).getKey()), obj);
-        }
-    }
-
-    @Test
-    public void testSubsubClass() throws Exception {
-        List<SubsubClass> objs = new ArrayList<SubsubClass>();
-        for (int i = 0; i < 5; i++) {
-            SubsubClass obj = getUniqueObject(new SubsubClass());
-            obj.setSubField("" + startKey++);
-            obj.setSubsubField("" + startKey++);
-            objs.add(obj);
-        }
-
-        DynamoDbMapper util = new DynamoDbMapper(dynamo);
-        for (SubsubClass obj : objs) {
-            util.save(obj);
-            assertEquals(util.load(SubsubClass.class, obj.getKey()), obj);
-        }
-    }
-
-    @Test(expected = DynamoDbMappingException.class)
-    public void testImplementation() throws Exception {
-        List<Implementation> objs = new ArrayList<Implementation>();
-        for (int i = 0; i < 5; i++) {
-            Implementation obj = new Implementation();
-            obj.setKey("" + startKey++);
-            obj.setAttribute("" + startKey++);
-            objs.add(obj);
-        }
-
-        // Saving new objects with a null version field should populate it
-        DynamoDbMapper util = new DynamoDbMapper(dynamo);
-        for (Interface obj : objs) {
-            util.save(obj);
-            assertEquals(util.load(Implementation.class, obj.getKey()), obj);
-        }
-    }
-
-    private <T extends BaseClass> T getUniqueObject(T obj) {
-        obj.setKey("" + startKey++);
-        obj.setNormalStringAttribute("" + startKey++);
-        return obj;
-    }
-
-    @DynamoDbTable(tableName = "aws-java-sdk-util")
-    public static interface Interface {
-
-        @DynamoDbHashKey
-        public String getKey();
-
-        public void setKey(String key);
-
-        @DynamoDbAttribute
-        public String getAttribute();
-
-        public void setAttribute(String attribute);
-    }
-
-    @DynamoDbTable(tableName = "aws-java-sdk-util")
-    public static class BaseClass {
-
-        protected String key;
-        protected String normalStringAttribute;
-
-        @DynamoDbHashKey
-        public String getKey() {
-            return key;
-        }
-
-        public void setKey(String key) {
-            this.key = key;
-        }
-
-        @DynamoDbAttribute
-        public String getNormalStringAttribute() {
-            return normalStringAttribute;
-        }
-
-        public void setNormalStringAttribute(String normalStringAttribute) {
-            this.normalStringAttribute = normalStringAttribute;
-        }
-
-        @Override
-        public int hashCode() {
-            final int prime = 31;
-            int result = 1;
-            result = prime * result + ((key == null) ? 0 : key.hashCode());
-            result = prime * result + ((normalStringAttribute == null) ? 0 : normalStringAttribute.hashCode());
-            return result;
-        }
-
-        @Override
-        public boolean equals(Object obj) {
-            if (this == obj) {
-                return true;
-            }
-            if (obj == null) {
-                return false;
-            }
-            if (getClass() != obj.getClass()) {
-                return false;
-            }
-            BaseClass other = (BaseClass) obj;
-            if (key == null) {
-                if (other.key != null) {
-                    return false;
-                }
-            } else if (!key.equals(other.key)) {
-                return false;
-            }
-            if (normalStringAttribute == null) {
-                if (other.normalStringAttribute != null) {
-                    return false;
-                }
-            } else if (!normalStringAttribute.equals(other.normalStringAttribute)) {
-                return false;
-            }
-            return true;
-        }
-    }
-
-    public static class SubClass extends BaseClass {
-
-        private String subField;
-
-        public String getSubField() {
-            return subField;
-        }
-
-        public void setSubField(String subField) {
-            this.subField = subField;
-        }
-
-        /*
-         * (non-Javadoc)
-         *
-         * @see java.lang.Object#hashCode()
-         */
-        @Override
-        public int hashCode() {
-            final int prime = 31;
-            int result = super.hashCode();
-            result = prime * result + ((subField == null) ? 0 : subField.hashCode());
-            return result;
-        }
-
-        /*
-         * (non-Javadoc)
-         *
-         * @see java.lang.Object#equals(java.lang.Object)
-         */
-        @Override
-        public boolean equals(Object obj) {
-            if (this == obj) {
-                return true;
-            }
-            if (!super.equals(obj)) {
-                return false;
-            }
-            if (getClass() != obj.getClass()) {
-                return false;
-            }
-            SubClass other = (SubClass) obj;
-            if (subField == null) {
-                if (other.subField != null) {
-                    return false;
-                }
-            } else if (!subField.equals(other.subField)) {
-                return false;
-            }
-            return true;
-        }
-
-    }
-
-    public static class SubsubClass extends SubClass {
-
-        private String subsubField;
-
-        public String getSubsubField() {
-            return subsubField;
-        }
-
-        public void setSubsubField(String subsubField) {
-            this.subsubField = subsubField;
-        }
-
-        @Override
-        public int hashCode() {
-            final int prime = 31;
-            int result = super.hashCode();
-            result = prime * result + ((subsubField == null) ? 0 : subsubField.hashCode());
-            return result;
-        }
-
-        @Override
-        public boolean equals(Object obj) {
-            if (this == obj) {
-                return true;
-            }
-            if (!super.equals(obj)) {
-                return false;
-            }
-            if (getClass() != obj.getClass()) {
-                return false;
-            }
-            SubsubClass other = (SubsubClass) obj;
-            if (subsubField == null) {
-                if (other.subsubField != null) {
-                    return false;
-                }
-            } else if (!subsubField.equals(other.subsubField)) {
-                return false;
-            }
-            return true;
-        }
-    }
-
-    public static class Implementation implements Interface {
-
-        private String key;
-        private String attribute;
-
-        public String getKey() {
-            return key;
-        }
-
-        public void setKey(String key) {
-            this.key = key;
-        }
-
-        public String getAttribute() {
-            return attribute;
-        }
-
-        public void setAttribute(String attribute) {
-            this.attribute = attribute;
-        }
-
-        @Override
-        public int hashCode() {
-            final int prime = 31;
-            int result = 1;
-            result = prime * result + ((attribute == null) ? 0 : attribute.hashCode());
-            result = prime * result + ((key == null) ? 0 : key.hashCode());
-            return result;
-        }
-
-        @Override
-        public boolean equals(Object obj) {
-            if (this == obj) {
-                return true;
-            }
-            if (obj == null) {
-                return false;
-            }
-            if (getClass() != obj.getClass()) {
-                return false;
-            }
-            Implementation other = (Implementation) obj;
-            if (attribute == null) {
-                if (other.attribute != null) {
-                    return false;
-                }
-            } else if (!attribute.equals(other.attribute)) {
-                return false;
-            }
-            if (key == null) {
-                if (other.key != null) {
-                    return false;
-                }
-            } else if (!key.equals(other.key)) {
-                return false;
-            }
-            return true;
-        }
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/KeyOnlyPutIntegrationTest.java b/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/KeyOnlyPutIntegrationTest.java
deleted file mode 100644
index 256670bfaaa3..000000000000
--- a/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/KeyOnlyPutIntegrationTest.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.mapper;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.fail;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import org.junit.Test;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbAttribute;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbHashKey;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMapper;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbSaveExpression;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbTable;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-import software.amazon.awssdk.services.dynamodb.model.ConditionalCheckFailedException;
-import software.amazon.awssdk.services.dynamodb.model.ExpectedAttributeValue;
-import utils.test.util.DynamoDBIntegrationTestBase;
-
-public class KeyOnlyPutIntegrationTest extends DynamoDBIntegrationTestBase {
-    @Test
-    public void testKeyOnlyPut() throws Exception {
-        /*
-         * Testing this scenario
-         *     (1) An empty table with the schema:
-         *
-         *    "key" (HASH)
-         *
-         *    (2) A POJO class:
-         *    "key" (HASH), "attribute" (NON-KEY)
-         *
-         *    (3) Save operation by some user:
-         *     - item : {"key" : "some value"}
-         *     - user-specified expected values : {"attribute" : {Exist : true}}
-         *     - SaveBehavior : UPDATE (default)
-         *
-         *    (4) Expected behavior
-         *    ConditionalCheckFailedException, and the table should remain empty.
-         */
-        List<HashAndAttribute> objs = new ArrayList<HashAndAttribute>();
-        for (int i = 0; i < 5; i++) {
-            HashAndAttribute obj = getUniqueObject(new HashAndAttribute());
-            objs.add(obj);
-        }
-
-        DynamoDbMapper util = new DynamoDbMapper(dynamo);
-        for (HashAndAttribute obj : objs) {
-            try {
-                DynamoDbSaveExpression saveExpression = new DynamoDbSaveExpression();
-                Map<String, ExpectedAttributeValue> expected = new HashMap<String, ExpectedAttributeValue>();
-                ExpectedAttributeValue expectedVersion = ExpectedAttributeValue.builder()
-                        .value(AttributeValue.builder()
-                                           .s("SomeNonExistantValue").build())
-                        .exists(true).build();
-                expected.put("normalStringAttribute", expectedVersion);
-                saveExpression.setExpected(expected);
-
-                util.save(obj, saveExpression);
-                fail("This should fail, expected clause should block an insert.");
-            } catch (ConditionalCheckFailedException e) {
-                // Ignored or expected.
-            }
-            assertNull(util.load(HashAndAttribute.class, obj.getKey()));
-
-            //this should succeed without the expected clause
-            obj.setNormalStringAttribute("to-be-deleted");
-            util.save(obj);
-            obj.setNormalStringAttribute(null);
-            util.save(obj);
-            Object loaded = util.load(HashAndAttribute.class, obj.getKey());
-            assertEquals("Expected " + obj.toString() + ", but was " + loaded.toString(), obj, loaded);
-        }
-    }
-
-    private <T extends HashAndAttribute> T getUniqueObject(T obj) {
-        obj.setKey("" + startKey++);
-        return obj;
-    }
-
-    @DynamoDbTable(tableName = "aws-java-sdk-util")
-    public static class HashAndAttribute {
-
-        protected String key;
-        protected String normalStringAttribute;
-
-        @DynamoDbHashKey
-        public String getKey() {
-            return key;
-        }
-
-        public void setKey(String key) {
-            this.key = key;
-        }
-
-        @DynamoDbAttribute
-        public String normalStringAttribute() {
-            return normalStringAttribute;
-        }
-
-        public void setNormalStringAttribute(String normalStringAttribute) {
-            this.normalStringAttribute = normalStringAttribute;
-        }
-
-        @Override
-        public int hashCode() {
-            final int prime = 31;
-            int result = 1;
-            result = prime * result + ((key == null) ? 0 : key.hashCode());
-            result = prime * result + ((normalStringAttribute == null) ? 0 : normalStringAttribute.hashCode());
-            return result;
-        }
-
-        @Override
-        public boolean equals(Object obj) {
-            if (this == obj) {
-                return true;
-            }
-            if (obj == null) {
-                return false;
-            }
-            if (getClass() != obj.getClass()) {
-                return false;
-            }
-            HashAndAttribute other = (HashAndAttribute) obj;
-            if (key == null) {
-                if (other.key != null) {
-                    return false;
-                }
-            } else if (!key.equals(other.key)) {
-                return false;
-            }
-            if (normalStringAttribute == null) {
-                if (other.normalStringAttribute != null) {
-                    return false;
-                }
-            } else if (!normalStringAttribute.equals(other.normalStringAttribute)) {
-                return false;
-            }
-            return true;
-        }
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/MapperLoadingStrategyConfigIntegrationTest.java b/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/MapperLoadingStrategyConfigIntegrationTest.java
deleted file mode 100644
index d466637c1dce..000000000000
--- a/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/MapperLoadingStrategyConfigIntegrationTest.java
+++ /dev/null
@@ -1,351 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.mapper;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.List;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import software.amazon.awssdk.services.dynamodb.DynamoDBMapperIntegrationTestBase;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMapper;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMapperConfig;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMapperConfig.ConsistentRead;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMapperConfig.PaginationLoadingStrategy;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbQueryExpression;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbScanExpression;
-import software.amazon.awssdk.services.dynamodb.datamodeling.PaginatedList;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-import software.amazon.awssdk.services.dynamodb.model.ComparisonOperator;
-import software.amazon.awssdk.services.dynamodb.model.Condition;
-import software.amazon.awssdk.services.dynamodb.pojos.RangeKeyClass;
-
-/**
- * Integration tests for PaginationLoadingStrategy configuration
- */
-public class MapperLoadingStrategyConfigIntegrationTest extends DynamoDBMapperIntegrationTestBase {
-
-    private static long hashKey = System.currentTimeMillis();
-    private static int PAGE_SIZE = 5;
-    private static int PARALLEL_SEGMENT = 3;
-    private static int OBJECTS_NUM = 50;
-    private static int RESULTS_NUM = OBJECTS_NUM - 2; // condition: rangeKey > 1.0
-
-    @BeforeClass
-    public static void setUp() throws Exception {
-        setUpTableWithRangeAttribute();
-        createTestData();
-    }
-
-    private static void createTestData() {
-        DynamoDbMapper mapper = new DynamoDbMapper(dynamo);
-
-        List<RangeKeyClass> objs = new ArrayList<RangeKeyClass>();
-        for (int i = 0; i < OBJECTS_NUM; i++) {
-            RangeKeyClass obj = new RangeKeyClass();
-            obj.setKey(hashKey);
-            obj.setRangeKey(i);
-            objs.add(obj);
-        }
-
-        mapper.batchSave(objs);
-    }
-
-    private static PaginatedList<RangeKeyClass> getTestPaginatedQueryList(PaginationLoadingStrategy paginationLoadingStrategy) {
-        DynamoDbMapperConfig mapperConfig = new DynamoDbMapperConfig(ConsistentRead.CONSISTENT);
-        DynamoDbMapper mapper = new DynamoDbMapper(dynamo, mapperConfig);
-
-        // Construct the query expression for the tested hash-key value and any range-key value greater that 1.0
-        RangeKeyClass keyObject = new RangeKeyClass();
-        keyObject.setKey(hashKey);
-        DynamoDbQueryExpression<RangeKeyClass> queryExpression = new DynamoDbQueryExpression<RangeKeyClass>()
-                .withHashKeyValues(keyObject);
-        queryExpression.withRangeKeyCondition("rangeKey",
-                                              Condition.builder().comparisonOperator(ComparisonOperator.GT.toString())
-                                                             .attributeValueList(
-                                                                     AttributeValue.builder().n("1.0").build()).build()).withLimit(PAGE_SIZE);
-
-        return mapper.query(RangeKeyClass.class, queryExpression, new DynamoDbMapperConfig(paginationLoadingStrategy));
-    }
-
-    private static PaginatedList<RangeKeyClass> getTestPaginatedScanList(PaginationLoadingStrategy paginationLoadingStrategy) {
-        DynamoDbMapperConfig mapperConfig = new DynamoDbMapperConfig(ConsistentRead.CONSISTENT);
-        DynamoDbMapper mapper = new DynamoDbMapper(dynamo, mapperConfig);
-
-        // Construct the scan expression with the exact same conditions
-        DynamoDbScanExpression scanExpression = new DynamoDbScanExpression();
-        scanExpression.addFilterCondition("key",
-                                          Condition.builder().comparisonOperator(ComparisonOperator.EQ).attributeValueList(
-                                                  AttributeValue.builder().n(Long.toString(hashKey)).build()).build());
-        scanExpression.addFilterCondition("rangeKey",
-                                          Condition.builder().comparisonOperator(ComparisonOperator.GT).attributeValueList(
-                                                  AttributeValue.builder().n("1.0").build()).build());
-        scanExpression.setLimit(PAGE_SIZE);
-
-        return mapper.scan(RangeKeyClass.class, scanExpression, new DynamoDbMapperConfig(paginationLoadingStrategy));
-    }
-
-    private static PaginatedList<RangeKeyClass> getTestPaginatedParallelScanList(
-            PaginationLoadingStrategy paginationLoadingStrategy) {
-        DynamoDbMapperConfig mapperConfig = new DynamoDbMapperConfig(ConsistentRead.CONSISTENT);
-        DynamoDbMapper mapper = new DynamoDbMapper(dynamo, mapperConfig);
-
-        // Construct the scan expression with the exact same conditions
-        DynamoDbScanExpression scanExpression = new DynamoDbScanExpression();
-        scanExpression.addFilterCondition("key",
-                                          Condition.builder().comparisonOperator(ComparisonOperator.EQ).attributeValueList(
-                                                  AttributeValue.builder().n(Long.toString(hashKey)).build()).build());
-        scanExpression.addFilterCondition("rangeKey",
-                                          Condition.builder().comparisonOperator(ComparisonOperator.GT).attributeValueList(
-                                                  AttributeValue.builder().n("1.0").build()).build());
-        scanExpression.setLimit(PAGE_SIZE);
-
-        return mapper.parallelScan(RangeKeyClass.class, scanExpression, PARALLEL_SEGMENT,
-                                   new DynamoDbMapperConfig(paginationLoadingStrategy));
-    }
-
-    private static void testAllPaginatedListOperations(PaginatedList<RangeKeyClass> list) {
-
-        // (1) isEmpty()
-        assertFalse(list.isEmpty());
-
-        // (2) get(int n)
-        assertNotNull(list.get(RESULTS_NUM / 2));
-
-        // (3) contains(Object org0)
-        RangeKeyClass obj = new RangeKeyClass();
-        obj.setKey(hashKey);
-        obj.setRangeKey(0);
-        assertFalse(list.contains(obj));
-        obj.setRangeKey(2);
-        assertTrue(list.contains(obj));
-
-        // (4) subList(int org0, int arg1)
-        List<RangeKeyClass> subList = list.subList(0, RESULTS_NUM);
-        assertEquals(RESULTS_NUM, subList.size());
-        try {
-            list.subList(0, RESULTS_NUM + 1);
-            fail("IndexOutOfBoundsException is IndexOutOfBoundsException but not thrown");
-        } catch (IndexOutOfBoundsException e) {
-            // Ignored or expected.
-        }
-
-        // (5) indexOf(Object org0)
-        assertTrue(list.indexOf(obj) < RESULTS_NUM);
-
-        // (6) loadAllResults()
-        list.loadAllResults();
-
-        // (7) size()
-        assertEquals(RESULTS_NUM, list.size());
-
-    }
-
-    private static void testPaginatedListIterator(PaginatedList<RangeKeyClass> list) {
-        for (RangeKeyClass item : list) {
-            assertEquals(hashKey, item.getKey());
-            assertTrue(item.getRangeKey() < OBJECTS_NUM);
-        }
-
-        // make sure the list could be iterated again
-        for (RangeKeyClass item : list) {
-            assertEquals(hashKey, item.getKey());
-            assertTrue(item.getRangeKey() < OBJECTS_NUM);
-        }
-    }
-
-    private static void testIterationOnlyPaginatedListOperations(PaginatedList<RangeKeyClass> list) {
-
-        // Unsupported operations
-
-        // (1) isEmpty()
-        try {
-            list.isEmpty();
-            fail("UnsupportedOperationException expected but is not thrown");
-        } catch (UnsupportedOperationException e) {
-            // Ignored or expected.
-        }
-
-        // (2) get(int n)
-        try {
-            list.get(RESULTS_NUM / 2);
-            fail("UnsupportedOperationException expected but is not thrown");
-        } catch (UnsupportedOperationException e) {
-            // Ignored or expected.
-        }
-
-        // (3) contains(Object org0)
-        try {
-            list.contains(new RangeKeyClass());
-            fail("UnsupportedOperationException expected but is not thrown");
-        } catch (UnsupportedOperationException e) {
-            // Ignored or expected.
-        }
-
-        // (4) subList(int org0, int arg1)
-        try {
-            list.subList(0, RESULTS_NUM);
-            fail("UnsupportedOperationException expected but is not thrown");
-        } catch (UnsupportedOperationException e) {
-            // Ignored or expected.
-        }
-
-        // (5) indexOf(Object org0)
-        try {
-            list.indexOf(new RangeKeyClass());
-            fail("UnsupportedOperationException expected but is not thrown");
-        } catch (UnsupportedOperationException e) {
-            // Ignored or expected.
-        }
-
-        // (6) loadAllResults()
-        try {
-            list.loadAllResults();
-            fail("UnsupportedOperationException expected but is not thrown");
-        } catch (UnsupportedOperationException e) {
-            // Ignored or expected.
-        }
-
-        // (7) size()
-        try {
-            list.size();
-            fail("UnsupportedOperationException expected but is not thrown");
-        } catch (UnsupportedOperationException e) {
-            // Ignored or expected.
-        }
-        ;
-
-        // Could be iterated once
-        for (RangeKeyClass item : list) {
-            assertEquals(hashKey, item.getKey());
-            assertTrue(item.getRangeKey() < OBJECTS_NUM);
-            // At most one page of results in memeory
-            assertTrue(loadedResultsNumber(list) <= PAGE_SIZE);
-        }
-
-        // not twice
-        try {
-            for (@SuppressWarnings("unused") RangeKeyClass item : list) {
-                fail("UnsupportedOperationException expected but is not thrown");
-            }
-        } catch (UnsupportedOperationException e) {
-            // Ignored or expected.
-        }
-
-    }
-
-    /**
-     * Use reflection to get the size of the private allResults field
-     **/
-    @SuppressWarnings("unchecked")
-    private static int loadedResultsNumber(PaginatedList<RangeKeyClass> list) {
-        Field privateAllResults = null;
-        try {
-            privateAllResults = list.getClass().getSuperclass().getDeclaredField("allResults");
-        } catch (SecurityException e) {
-            fail(e.getMessage());
-        } catch (NoSuchFieldException e) {
-            fail(e.getMessage());
-        }
-        privateAllResults.setAccessible(true);
-        List<RangeKeyClass> allResults = null;
-        try {
-            allResults = (List<RangeKeyClass>) privateAllResults.get(list);
-        } catch (IllegalArgumentException e) {
-            fail(e.getMessage());
-        } catch (IllegalAccessException e) {
-            fail(e.getMessage());
-        }
-        return allResults.size();
-    }
-
-    @Test
-    public void testLazyLoading() {
-        // Get all the paginated lists using the tested loading strategy
-        PaginatedList<RangeKeyClass> queryList = getTestPaginatedQueryList(PaginationLoadingStrategy.LAZY_LOADING);
-        PaginatedList<RangeKeyClass> scanList = getTestPaginatedScanList(PaginationLoadingStrategy.LAZY_LOADING);
-        PaginatedList<RangeKeyClass> parallelScanList = getTestPaginatedParallelScanList(PaginationLoadingStrategy.LAZY_LOADING);
-
-        // check that only at most one page of results are loaded up to this point
-        assertTrue(loadedResultsNumber(queryList) <= PAGE_SIZE);
-        assertTrue(loadedResultsNumber(scanList) <= PAGE_SIZE);
-        assertTrue(loadedResultsNumber(parallelScanList) <= PAGE_SIZE * PARALLEL_SEGMENT);
-
-        testAllPaginatedListOperations(queryList);
-        testAllPaginatedListOperations(scanList);
-        testAllPaginatedListOperations(parallelScanList);
-
-        // Re-construct the paginated lists and test the iterator behavior
-        queryList = getTestPaginatedQueryList(PaginationLoadingStrategy.LAZY_LOADING);
-        scanList = getTestPaginatedScanList(PaginationLoadingStrategy.LAZY_LOADING);
-        parallelScanList = getTestPaginatedParallelScanList(PaginationLoadingStrategy.LAZY_LOADING);
-
-        testPaginatedListIterator(queryList);
-        testPaginatedListIterator(scanList);
-        testPaginatedListIterator(parallelScanList);
-
-    }
-
-    @Test
-    public void testEagerLoading() {
-        // Get all the paginated lists using the tested loading strategy
-        PaginatedList<RangeKeyClass> queryList = getTestPaginatedQueryList(PaginationLoadingStrategy.EAGER_LOADING);
-        PaginatedList<RangeKeyClass> scanList = getTestPaginatedScanList(PaginationLoadingStrategy.EAGER_LOADING);
-        PaginatedList<RangeKeyClass> parallelScanList = getTestPaginatedParallelScanList(PaginationLoadingStrategy.EAGER_LOADING);
-
-        // check that all results have been loaded
-        assertEquals(RESULTS_NUM, loadedResultsNumber(queryList));
-        assertEquals(RESULTS_NUM, loadedResultsNumber(scanList));
-        assertEquals(RESULTS_NUM, loadedResultsNumber(parallelScanList));
-
-        testAllPaginatedListOperations(queryList);
-        testAllPaginatedListOperations(scanList);
-        testAllPaginatedListOperations(parallelScanList);
-
-        // Re-construct the paginated lists and test the iterator behavior
-        queryList = getTestPaginatedQueryList(PaginationLoadingStrategy.LAZY_LOADING);
-        scanList = getTestPaginatedScanList(PaginationLoadingStrategy.LAZY_LOADING);
-        parallelScanList = getTestPaginatedParallelScanList(PaginationLoadingStrategy.LAZY_LOADING);
-
-        testPaginatedListIterator(queryList);
-        testPaginatedListIterator(scanList);
-        testPaginatedListIterator(parallelScanList);
-    }
-
-    @Test
-    public void testIterationOnly() {
-        // Get all the paginated lists using the tested loading strategy
-        PaginatedList<RangeKeyClass> queryList = getTestPaginatedQueryList(PaginationLoadingStrategy.ITERATION_ONLY);
-        PaginatedList<RangeKeyClass> scanList = getTestPaginatedScanList(PaginationLoadingStrategy.ITERATION_ONLY);
-        PaginatedList<RangeKeyClass> parallelScanList = getTestPaginatedParallelScanList(
-                PaginationLoadingStrategy.ITERATION_ONLY);
-
-        // check that only at most one page of results are loaded up to this point
-        assertTrue(loadedResultsNumber(queryList) <= PAGE_SIZE);
-        assertTrue(loadedResultsNumber(scanList) <= PAGE_SIZE);
-        assertTrue(loadedResultsNumber(parallelScanList) <= PAGE_SIZE * PARALLEL_SEGMENT);
-
-        testIterationOnlyPaginatedListOperations(queryList);
-        testIterationOnlyPaginatedListOperations(scanList);
-        testIterationOnlyPaginatedListOperations(parallelScanList);
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/MapperSaveConfigIntegrationTest.java b/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/MapperSaveConfigIntegrationTest.java
deleted file mode 100644
index cf4feaa0f0fe..000000000000
--- a/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/MapperSaveConfigIntegrationTest.java
+++ /dev/null
@@ -1,537 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.mapper;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-import org.junit.Test;
-import software.amazon.awssdk.awscore.exception.AwsServiceException;
-import software.amazon.awssdk.core.exception.SdkServiceException;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-import software.amazon.awssdk.services.dynamodb.model.PutItemRequest;
-
-/**
- * Tests the behavior of save method of DynamoDBMapper under different
- * SaveBehavior configurations.
- */
-public class MapperSaveConfigIntegrationTest extends MapperSaveConfigTestBase {
-
-    /*********************************************
-     **          UPDATE (default)               **
-     *********************************************/
-
-    private static TestItem putRandomUniqueItem(String nonKeyAttributeValue, Set<String> stringSetAttributeValue) {
-        String hashKeyValue = UUID.randomUUID().toString();
-        Long rangeKeyValue = System.currentTimeMillis();
-        Map<String, AttributeValue> item = new HashMap<String, AttributeValue>();
-        item.put(hashKeyName, AttributeValue.builder().s(hashKeyValue).build());
-        item.put(rangeKeyName, AttributeValue.builder().n(rangeKeyValue.toString()).build());
-        if (null != nonKeyAttributeValue) {
-            item.put(nonKeyAttributeName, AttributeValue.builder().s(nonKeyAttributeValue).build());
-        }
-        if (null != stringSetAttributeValue) {
-            item.put(stringSetAttributeName, AttributeValue.builder().ss(stringSetAttributeValue).build());
-        }
-        dynamo.putItem(PutItemRequest.builder().tableName(tableName).item(item).build());
-
-        /* Returns the item as a modeled object. */
-        TestItem testItem = new TestItem();
-        testItem.setHashKey(hashKeyValue);
-        testItem.setRangeKey(rangeKeyValue);
-        testItem.setNonKeyAttribute(nonKeyAttributeValue);
-        testItem.setStringSetAttribute(stringSetAttributeValue);
-        return testItem;
-    }
-
-    private static Set<String> generateRandomStringSet(int size) {
-        Set<String> result = new HashSet<String>();
-        for (int i = 0; i < size; i++) {
-            result.add(UUID.randomUUID().toString());
-        }
-        return result;
-    }
-
-    private static boolean assertSetEquals(Set<?> expected, Set<?> actual) {
-        if (expected == null || actual == null) {
-            return (expected == null && actual == null);
-        }
-        if (expected.size() != actual.size()) {
-            return false;
-        }
-        for (Object item : expected) {
-            if (!actual.contains(item)) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Tests that a key-only object could be saved with
-     * UPDATE configuration, even when the key has already existed in the table.
-     */
-    @Test
-    public void testDefaultWithOnlyKeyAttributesSpecifiedRecordInTable()
-            throws Exception {
-
-        /* First put a new item (with non-key attribute)*/
-        TestItem testItem = putRandomUniqueItem("foo", null);
-
-        /* Put an key-only object with the same key. */
-        testItem.setNonKeyAttribute(null);
-
-        dynamoMapper.save(testItem, defaultConfig);
-
-        /* The non-key attribute should be nulled out. */
-        TestItem returnedObject = (TestItem) dynamoMapper.load(testItem);
-        assertNotNull(returnedObject);
-        assertEquals(testItem.getHashKey(), returnedObject.getHashKey());
-        assertEquals(testItem.getRangeKey(), returnedObject.getRangeKey());
-        assertNull(returnedObject.getNonKeyAttribute());
-    }
-
-    /*********************************************
-     **      UPDATE_SKIP_NULL_ATTRIBUTES        **
-     *********************************************/
-
-    /**
-     * Tests an edge case that we have fixed according a forum bug report. If
-     * the object is only specified with key attributes, and such key is not
-     * present in the table, we should add this object by a key-only put
-     * request even if it is using UPDATE configuration.
-     */
-    @Test
-    public void testDefaultWithOnlyKeyAttributesSpecifiedRecordNotInTable()
-            throws Exception {
-        TestItem testItem = new TestItem();
-        testItem.setHashKey(UUID.randomUUID().toString());
-        testItem.setRangeKey(System.currentTimeMillis());
-
-        dynamoMapper.save(testItem, defaultConfig);
-
-        TestItem returnedObject = (TestItem) dynamoMapper.load(testItem);
-
-        assertNotNull(returnedObject);
-        assertEquals(testItem.getHashKey(), returnedObject.getHashKey());
-        assertEquals(testItem.getRangeKey(), returnedObject.getRangeKey());
-        assertNull(returnedObject.getNonKeyAttribute());
-    }
-
-    /**
-     * Update an existing item in the table.
-     */
-    @Test
-    public void testDefaultWithKeyAndNonKeyAttributesSpecifiedRecordInTable()
-            throws Exception {
-
-        /* First put a new item (without non-key attribute)*/
-        TestItem testItem = putRandomUniqueItem(null, null);
-        String hashKeyValue = testItem.getHashKey();
-        Long rangeKeyValue = testItem.getRangeKey();
-
-        TestItem returnedObject = (TestItem) dynamoMapper.load(testItem);
-
-        assertNotNull(returnedObject);
-        assertEquals(hashKeyValue, returnedObject.getHashKey());
-        assertEquals(rangeKeyValue, returnedObject.getRangeKey());
-        assertNull(returnedObject.getNonKeyAttribute());
-
-        /* Put an updated object with the same key and an additional non-key attribute. */
-        testItem.setHashKey(hashKeyValue);
-        testItem.setRangeKey(rangeKeyValue);
-        testItem.setNonKeyAttribute("update");
-
-        dynamoMapper.save(testItem, defaultConfig);
-        returnedObject = (TestItem) dynamoMapper.load(testItem);
-
-        assertNotNull(returnedObject);
-        assertEquals(testItem.getHashKey(), returnedObject.getHashKey());
-        assertEquals(testItem.getRangeKey(), returnedObject.getRangeKey());
-        assertEquals(testItem.getNonKeyAttribute(), returnedObject.getNonKeyAttribute());
-    }
-
-    /**
-     * Use UPDATE to put a new item in the table.
-     */
-    @Test
-    public void testDefaultWithKeyAndNonKeyAttributesSpecifiedRecordNotInTable()
-            throws Exception {
-        TestItem testItem = new TestItem();
-        testItem.setHashKey(UUID.randomUUID().toString());
-        testItem.setRangeKey(System.currentTimeMillis());
-        testItem.setNonKeyAttribute("new item");
-
-        dynamoMapper.save(testItem, defaultConfig);
-
-        TestItem returnedObject = (TestItem) dynamoMapper.load(testItem);
-
-        assertNotNull(returnedObject);
-        assertEquals(testItem.getHashKey(), returnedObject.getHashKey());
-        assertEquals(testItem.getRangeKey(), returnedObject.getRangeKey());
-        assertEquals(testItem.getNonKeyAttribute(), returnedObject.getNonKeyAttribute());
-    }
-
-    /**
-     * When using UPDATE_SKIP_NULL_ATTRIBUTES, key-only update on existing item
-     * should not affect the item at all, since all the null-valued non-key
-     * attributes are ignored.
-     */
-    @Test
-    public void testUpdateSkipNullWithOnlyKeyAttributesSpecifiedRecordInTable()
-            throws Exception {
-
-        /* First put a new item (with non-key attribute)*/
-        TestItem testItem = putRandomUniqueItem("foo", null);
-
-        /* Put an key-only object with the same key. */
-        testItem.setNonKeyAttribute(null);
-
-        dynamoMapper.save(testItem, updateSkipNullConfig);
-
-        TestItem returnedObject = (TestItem) dynamoMapper.load(testItem);
-
-        /* The non-key attribute should not be removed. */
-        assertNotNull(returnedObject);
-        assertEquals(testItem.getHashKey(), returnedObject.getHashKey());
-        assertEquals(testItem.getRangeKey(), returnedObject.getRangeKey());
-        assertEquals("foo", returnedObject.getNonKeyAttribute());
-    }
-
-    /*********************************************
-     **               APPEND_SET                **
-     *********************************************/
-
-    /**
-     * The behavior should be the same as UPDATE.
-     */
-    @Test
-    public void testUpdateSkipNullWithOnlyKeyAttributesSpecifiedRecordNotInTable()
-            throws Exception {
-        TestItem testItem = new TestItem();
-        testItem.setHashKey(UUID.randomUUID().toString());
-        testItem.setRangeKey(System.currentTimeMillis());
-
-        dynamoMapper.save(testItem, updateSkipNullConfig);
-
-        TestItem returnedObject = (TestItem) dynamoMapper.load(testItem);
-
-        assertNotNull(returnedObject);
-        assertEquals(testItem.getHashKey(), returnedObject.getHashKey());
-        assertEquals(testItem.getRangeKey(), returnedObject.getRangeKey());
-        assertNull(returnedObject.getNonKeyAttribute());
-    }
-
-    /**
-     * Use UPDATE_SKIP_NULL_ATTRIBUTES to update an existing item in the table.
-     */
-    @Test
-    public void testUpdateSkipNullWithKeyAndNonKeyAttributesSpecifiedRecordInTable()
-            throws Exception {
-
-        /* First put a new item (without non-key attribute)*/
-        TestItem testItem = putRandomUniqueItem(null, null);
-        String hashKeyValue = testItem.getHashKey();
-        Long rangeKeyValue = testItem.getRangeKey();
-
-        TestItem returnedObject = (TestItem) dynamoMapper.load(testItem);
-
-        assertNotNull(returnedObject);
-        assertEquals(hashKeyValue, returnedObject.getHashKey());
-        assertEquals(rangeKeyValue, returnedObject.getRangeKey());
-        assertNull(returnedObject.getNonKeyAttribute());
-
-        /* Put an updated object with the same key and an additional non-key attribute. */
-        String nonKeyAttributeValue = "update";
-        testItem.setHashKey(hashKeyValue);
-        testItem.setRangeKey(rangeKeyValue);
-        testItem.setNonKeyAttribute(nonKeyAttributeValue);
-
-        dynamoMapper.save(testItem, updateSkipNullConfig);
-        returnedObject = (TestItem) dynamoMapper.load(testItem);
-
-        assertNotNull(returnedObject);
-        assertEquals(testItem.getHashKey(), returnedObject.getHashKey());
-        assertEquals(testItem.getRangeKey(), returnedObject.getRangeKey());
-        assertEquals(testItem.getNonKeyAttribute(), returnedObject.getNonKeyAttribute());
-
-        /* At last, save the object again, but with non-key attribute set as null.
-         * This should not change the existing item.
-         */
-        testItem.setNonKeyAttribute(null);
-        dynamoMapper.save(testItem, updateSkipNullConfig);
-        returnedObject = (TestItem) dynamoMapper.load(testItem);
-
-        assertNotNull(returnedObject);
-        assertEquals(testItem.getHashKey(), returnedObject.getHashKey());
-        assertEquals(testItem.getRangeKey(), returnedObject.getRangeKey());
-        assertEquals(nonKeyAttributeValue, returnedObject.getNonKeyAttribute());
-    }
-
-    /**
-     * Use UPDATE_SKIP_NULL_ATTRIBUTES to put a new item in the table.
-     */
-    @Test
-    public void testUpdateSkipNullWithKeyAndNonKeyAttributesSpecifiedRecordNotInTable()
-            throws Exception {
-        TestItem testItem = new TestItem();
-        testItem.setHashKey(UUID.randomUUID().toString());
-        testItem.setRangeKey(System.currentTimeMillis());
-        testItem.setNonKeyAttribute("new item");
-
-        dynamoMapper.save(testItem, updateSkipNullConfig);
-
-        TestItem returnedObject = (TestItem) dynamoMapper.load(testItem);
-
-        assertNotNull(returnedObject);
-        assertEquals(testItem.getHashKey(), returnedObject.getHashKey());
-        assertEquals(testItem.getRangeKey(), returnedObject.getRangeKey());
-        assertEquals(testItem.getNonKeyAttribute(), returnedObject.getNonKeyAttribute());
-    }
-
-    /**
-     * The behavior should be the same as UPDATE_SKIP_NULL_ATTRIBUTES.
-     */
-    @Test
-    public void testAppendSetWithOnlyKeyAttributesSpecifiedRecordInTable()
-            throws Exception {
-
-        /* First put a new item (with non-key attributes)*/
-        Set<String> randomSet = generateRandomStringSet(3);
-        TestItem testItem = putRandomUniqueItem("foo", randomSet);
-
-        /* Put an key-only object with the same key. */
-        testItem.setNonKeyAttribute(null);
-        testItem.setStringSetAttribute(null);
-
-        dynamoMapper.save(testItem, appendSetConfig);
-
-        TestItem returnedObject = (TestItem) dynamoMapper.load(testItem);
-
-        /* The non-key attribute should not be removed. */
-        assertNotNull(returnedObject);
-        assertEquals(testItem.getHashKey(), returnedObject.getHashKey());
-        assertEquals(testItem.getRangeKey(), returnedObject.getRangeKey());
-        assertEquals("foo", returnedObject.getNonKeyAttribute());
-        assertTrue(assertSetEquals(randomSet, returnedObject.getStringSetAttribute()));
-    }
-
-    /*********************************************
-     **                 CLOBBER                 **
-     *********************************************/
-
-    /**
-     * The behavior should be the same as UPDATE and UPDATE_SKIP_NULL_ATTRIBUTES.
-     */
-    @Test
-    public void testAppendSetWithOnlyKeyAttributesSpecifiedRecordNotInTable()
-            throws Exception {
-        TestItem testItem = new TestItem();
-        testItem.setHashKey(UUID.randomUUID().toString());
-        testItem.setRangeKey(System.currentTimeMillis());
-
-        dynamoMapper.save(testItem, appendSetConfig);
-
-        TestItem returnedObject = (TestItem) dynamoMapper.load(testItem);
-
-        assertNotNull(returnedObject);
-        assertEquals(testItem.getHashKey(), returnedObject.getHashKey());
-        assertEquals(testItem.getRangeKey(), returnedObject.getRangeKey());
-        assertNull(returnedObject.getNonKeyAttribute());
-        assertNull(returnedObject.getStringSetAttribute());
-    }
-
-    /**
-     * Use APPEND_SET to update an existing item in the table.
-     */
-    @Test
-    public void testAppendSetWithKeyAndNonKeyAttributesSpecifiedRecordInTable()
-            throws Exception {
-
-        /* First put a new item (without non-key attribute)*/
-        TestItem testItem = putRandomUniqueItem(null, null);
-        String hashKeyValue = testItem.getHashKey();
-        Long rangeKeyValue = testItem.getRangeKey();
-
-        TestItem returnedObject = (TestItem) dynamoMapper.load(testItem);
-
-        assertNotNull(returnedObject);
-        assertEquals(hashKeyValue, returnedObject.getHashKey());
-        assertEquals(rangeKeyValue, returnedObject.getRangeKey());
-        assertNull(returnedObject.getNonKeyAttribute());
-        assertNull(returnedObject.getStringSetAttribute());
-
-        /* Put an updated object with the same key and an additional non-key attribute. */
-        String nonKeyAttributeValue = "update";
-        Set<String> stringSetAttributeValue = generateRandomStringSet(3);
-        testItem.setHashKey(hashKeyValue);
-        testItem.setRangeKey(rangeKeyValue);
-        testItem.setNonKeyAttribute(nonKeyAttributeValue);
-        testItem.setStringSetAttribute(stringSetAttributeValue);
-
-        dynamoMapper.save(testItem, appendSetConfig);
-        returnedObject = (TestItem) dynamoMapper.load(testItem);
-
-        assertNotNull(returnedObject);
-        assertEquals(testItem.getHashKey(), returnedObject.getHashKey());
-        assertEquals(testItem.getRangeKey(), returnedObject.getRangeKey());
-        assertEquals(testItem.getNonKeyAttribute(), returnedObject.getNonKeyAttribute());
-        assertTrue(assertSetEquals(testItem.getStringSetAttribute(), returnedObject.getStringSetAttribute()));
-
-        /* Override nonKeyAttribute and append stringSetAttribute. */
-        testItem.setNonKeyAttribute("blabla");
-        Set<String> appendSetAttribute = generateRandomStringSet(3);
-        testItem.setStringSetAttribute(appendSetAttribute);
-        dynamoMapper.save(testItem, appendSetConfig);
-        returnedObject = (TestItem) dynamoMapper.load(testItem);
-
-        assertNotNull(returnedObject);
-        assertEquals(testItem.getHashKey(), returnedObject.getHashKey());
-        assertEquals(testItem.getRangeKey(), returnedObject.getRangeKey());
-        assertEquals("blabla", returnedObject.getNonKeyAttribute());
-        // expected set after the append
-        stringSetAttributeValue.addAll(appendSetAttribute);
-        assertTrue(assertSetEquals(stringSetAttributeValue, returnedObject.getStringSetAttribute()));
-
-        /* Append on an existing scalar attribute would result in an exception. */
-        TestAppendToScalarItem testAppendToScalarItem = new TestAppendToScalarItem();
-        testAppendToScalarItem.setHashKey(testItem.getHashKey());
-        testAppendToScalarItem.setRangeKey(testItem.getRangeKey());
-        // this fake set attribute actually points to a scalar attribute
-        testAppendToScalarItem.setFakeStringSetAttribute(generateRandomStringSet(1));
-        try {
-            dynamoMapper.save(testAppendToScalarItem, appendSetConfig);
-            fail("Should have thrown a 'Type mismatch' service exception.");
-        } catch (AwsServiceException exception) {
-            assertEquals("ValidationException", exception.awsErrorDetails().errorCode());
-        }
-    }
-
-    /**
-     * Use APPEND_SET to put a new item in the table.
-     */
-    @Test
-    public void testAppendSetWithKeyAndNonKeyAttributesSpecifiedRecordNotInTable()
-            throws Exception {
-        TestItem testItem = new TestItem();
-        testItem.setHashKey(UUID.randomUUID().toString());
-        testItem.setRangeKey(System.currentTimeMillis());
-        testItem.setNonKeyAttribute("new item");
-        testItem.setStringSetAttribute(generateRandomStringSet(3));
-
-        dynamoMapper.save(testItem, appendSetConfig);
-
-        TestItem returnedObject = (TestItem) dynamoMapper.load(testItem);
-
-        assertNotNull(returnedObject);
-        assertEquals(testItem.getHashKey(), returnedObject.getHashKey());
-        assertEquals(testItem.getRangeKey(), returnedObject.getRangeKey());
-        assertEquals(testItem.getNonKeyAttribute(), returnedObject.getNonKeyAttribute());
-        assertEquals(testItem.getStringSetAttribute(), returnedObject.getStringSetAttribute());
-
-    }
-
-    /**
-     * Use CLOBBER to override the existing item by saving a key-only object.
-     */
-    @Test
-    public void testClobberWithOnlyKeyAttributesSpecifiedRecordInTable()
-            throws Exception {
-        /* Put the item with non-key attribute. */
-        TestItem testItem = putRandomUniqueItem("foo", null);
-
-        /* Override the item by saving a key-only object. */
-        testItem.setNonKeyAttribute(null);
-        dynamoMapper.save(testItem, clobberConfig);
-
-        TestItem returnedObject = (TestItem) dynamoMapper.load(testItem);
-
-        assertNotNull(returnedObject);
-        assertEquals(testItem.getHashKey(), returnedObject.getHashKey());
-        assertEquals(testItem.getRangeKey(), returnedObject.getRangeKey());
-        assertNull(returnedObject.getNonKeyAttribute());
-    }
-
-    /**
-     * Use CLOBBER to put a new item with only key attributes.
-     */
-    @Test
-    public void testClobberWithOnlyKeyAttributesSpecifiedRecordNotInTable()
-            throws Exception {
-        TestItem testItem = new TestItem();
-        testItem.setHashKey(UUID.randomUUID().toString());
-        testItem.setRangeKey(System.currentTimeMillis());
-
-        dynamoMapper.save(testItem, clobberConfig);
-
-        TestItem returnedObject = (TestItem) dynamoMapper.load(testItem);
-
-        assertNotNull(returnedObject);
-        assertEquals(testItem.getHashKey(), returnedObject.getHashKey());
-        assertEquals(testItem.getRangeKey(), returnedObject.getRangeKey());
-        assertNull(returnedObject.getNonKeyAttribute());
-    }
-
-    /**
-     * Use CLOBBER to override the existing item.
-     */
-    @Test
-    public void testClobberWithKeyAndNonKeyAttributesSpecifiedRecordInTable()
-            throws Exception {
-        /* Put the item with non-key attribute. */
-        TestItem testItem = putRandomUniqueItem("foo", null);
-
-        /* Override the item. */
-        testItem.setNonKeyAttribute("not foo");
-        dynamoMapper.save(testItem, clobberConfig);
-
-        TestItem returnedObject = (TestItem) dynamoMapper.load(testItem);
-
-        assertNotNull(returnedObject);
-        assertEquals(testItem.getHashKey(), returnedObject.getHashKey());
-        assertEquals(testItem.getRangeKey(), returnedObject.getRangeKey());
-        assertEquals(testItem.getNonKeyAttribute(), returnedObject.getNonKeyAttribute());
-    }
-
-    /**
-     * Use CLOBBER to put a new item.
-     */
-    @Test
-    public void testClobberWithKeyAndNonKeyAttributesSpecifiedRecordNotInTable()
-            throws Exception {
-        TestItem testItem = new TestItem();
-        testItem.setHashKey(UUID.randomUUID().toString());
-        testItem.setRangeKey(System.currentTimeMillis());
-        testItem.setNonKeyAttribute("new item");
-
-        dynamoMapper.save(testItem, clobberConfig);
-
-        TestItem returnedObject = (TestItem) dynamoMapper.load(testItem);
-
-        assertNotNull(returnedObject);
-        assertEquals(testItem.getHashKey(), returnedObject.getHashKey());
-        assertEquals(testItem.getRangeKey(), returnedObject.getRangeKey());
-        assertEquals(testItem.getNonKeyAttribute(), returnedObject.getNonKeyAttribute());
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/MapperSaveConfigTestBase.java b/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/MapperSaveConfigTestBase.java
deleted file mode 100644
index 723dfd941c4a..000000000000
--- a/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/MapperSaveConfigTestBase.java
+++ /dev/null
@@ -1,208 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.mapper;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import java.util.Set;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
-import software.amazon.awssdk.services.dynamodb.TableUtils;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbAttribute;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbHashKey;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMapper;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMapperConfig;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMapperConfig.SaveBehavior;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbRangeKey;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbTable;
-import software.amazon.awssdk.services.dynamodb.model.AttributeDefinition;
-import software.amazon.awssdk.services.dynamodb.model.CreateTableRequest;
-import software.amazon.awssdk.services.dynamodb.model.DeleteTableRequest;
-import software.amazon.awssdk.services.dynamodb.model.KeySchemaElement;
-import software.amazon.awssdk.services.dynamodb.model.KeyType;
-import software.amazon.awssdk.services.dynamodb.model.ProvisionedThroughput;
-import software.amazon.awssdk.services.dynamodb.model.ScalarAttributeType;
-import software.amazon.awssdk.services.dynamodb.model.TableDescription;
-import utils.test.util.DynamoDBIntegrationTestBase;
-
-public class MapperSaveConfigTestBase extends DynamoDBIntegrationTestBase {
-
-    protected static final DynamoDbMapperConfig defaultConfig = new DynamoDbMapperConfig(
-            SaveBehavior.UPDATE);
-    protected static final DynamoDbMapperConfig updateSkipNullConfig = new DynamoDbMapperConfig(
-            SaveBehavior.UPDATE_SKIP_NULL_ATTRIBUTES);
-    protected static final DynamoDbMapperConfig appendSetConfig = new DynamoDbMapperConfig(
-            SaveBehavior.APPEND_SET);
-    protected static final DynamoDbMapperConfig clobberConfig = new DynamoDbMapperConfig(
-            SaveBehavior.CLOBBER);
-    protected static final String tableName = "aws-java-sdk-dynamodb-mapper-save-config-test";
-    protected static final String hashKeyName = "hashKey";
-    protected static final String rangeKeyName = "rangeKey";
-    protected static final String nonKeyAttributeName = "nonKeyAttribute";
-    protected static final String stringSetAttributeName = "stringSetAttribute";
-    /**
-     * Read capacity for the test table being created in Amazon DynamoDB.
-     */
-    protected static final Long READ_CAPACITY = 10L;
-    /**
-     * Write capacity for the test table being created in Amazon DynamoDB.
-     */
-    protected static final Long WRITE_CAPACITY = 5L;
-    /**
-     * Provisioned Throughput for the test table created in Amazon DynamoDB
-     */
-    protected static final ProvisionedThroughput DEFAULT_PROVISIONED_THROUGHPUT = ProvisionedThroughput.builder()
-            .readCapacityUnits(READ_CAPACITY).writeCapacityUnits(
-                    WRITE_CAPACITY).build();
-    protected static DynamoDbMapper dynamoMapper;
-
-    @BeforeClass
-    public static void setUp() throws Exception {
-        setUpCredentials();
-        dynamo = DynamoDbClient.builder().credentialsProvider(CREDENTIALS_PROVIDER_CHAIN).build();
-        dynamoMapper = new DynamoDbMapper(dynamo);
-
-        createTestTable(DEFAULT_PROVISIONED_THROUGHPUT);
-        TableUtils.waitUntilActive(dynamo, tableName);
-    }
-
-    @AfterClass
-    public static void tearDown() {
-        dynamo.deleteTable(DeleteTableRequest.builder().tableName(tableName).build());
-    }
-
-    /**
-     * Helper method to create a table in Amazon DynamoDB
-     */
-    protected static void createTestTable(
-            ProvisionedThroughput provisionedThroughput) {
-        CreateTableRequest createTableRequest = CreateTableRequest.builder()
-                .tableName(tableName)
-                .keySchema(
-                        KeySchemaElement.builder().attributeName(
-                                hashKeyName).keyType(
-                                KeyType.HASH).build(),
-                        KeySchemaElement.builder().attributeName(
-                                rangeKeyName).keyType(
-                                KeyType.RANGE).build())
-                .attributeDefinitions(
-                        AttributeDefinition.builder().attributeName(
-                                hashKeyName).attributeType(
-                                ScalarAttributeType.S).build(),
-                        AttributeDefinition.builder().attributeName(
-                                rangeKeyName).attributeType(
-                                ScalarAttributeType.N).build())
-                .provisionedThroughput(provisionedThroughput)
-                .build();
-
-        TableDescription createdTableDescription = dynamo.createTable(
-                createTableRequest).tableDescription();
-        System.out.println("Created Table: " + createdTableDescription);
-        assertEquals(tableName, createdTableDescription.tableName());
-        assertNotNull(createdTableDescription.tableStatus());
-        assertEquals(hashKeyName, createdTableDescription
-                .keySchema().get(0).attributeName());
-        assertEquals(KeyType.HASH, createdTableDescription
-                .keySchema().get(0).keyType());
-        assertEquals(rangeKeyName, createdTableDescription
-                .keySchema().get(1).attributeName());
-        assertEquals(KeyType.RANGE, createdTableDescription
-                .keySchema().get(1).keyType());
-    }
-
-    @DynamoDbTable(tableName = tableName)
-    public static class TestItem {
-
-        private String hashKey;
-        private Long rangeKey;
-        private String nonKeyAttribute;
-        private Set<String> stringSetAttribute;
-
-        @DynamoDbHashKey(attributeName = hashKeyName)
-        public String getHashKey() {
-            return hashKey;
-        }
-
-        public void setHashKey(String hashKey) {
-            this.hashKey = hashKey;
-        }
-
-        @DynamoDbRangeKey(attributeName = rangeKeyName)
-        public Long getRangeKey() {
-            return rangeKey;
-        }
-
-        public void setRangeKey(Long rangeKey) {
-            this.rangeKey = rangeKey;
-        }
-
-        @DynamoDbAttribute(attributeName = nonKeyAttributeName)
-        public String getNonKeyAttribute() {
-            return nonKeyAttribute;
-        }
-
-        public void setNonKeyAttribute(String nonKeyAttribute) {
-            this.nonKeyAttribute = nonKeyAttribute;
-        }
-
-        @DynamoDbAttribute(attributeName = stringSetAttributeName)
-        public Set<String> getStringSetAttribute() {
-            return stringSetAttribute;
-        }
-
-        public void setStringSetAttribute(Set<String> stringSetAttribute) {
-            this.stringSetAttribute = stringSetAttribute;
-        }
-
-    }
-
-    @DynamoDbTable(tableName = tableName)
-    public static class TestAppendToScalarItem {
-
-        private String hashKey;
-        private Long rangeKey;
-        private Set<String> fakeStringSetAttribute;
-
-        @DynamoDbHashKey(attributeName = hashKeyName)
-        public String getHashKey() {
-            return hashKey;
-        }
-
-        public void setHashKey(String hashKey) {
-            this.hashKey = hashKey;
-        }
-
-        @DynamoDbRangeKey(attributeName = rangeKeyName)
-        public Long getRangeKey() {
-            return rangeKey;
-        }
-
-        public void setRangeKey(Long rangeKey) {
-            this.rangeKey = rangeKey;
-        }
-
-        @DynamoDbAttribute(attributeName = nonKeyAttributeName)
-        public Set<String> getFakeStringSetAttribute() {
-            return fakeStringSetAttribute;
-        }
-
-        public void setFakeStringSetAttribute(Set<String> stringSetAttribute) {
-            this.fakeStringSetAttribute = stringSetAttribute;
-        }
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/NoSuchTableClass.java b/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/NoSuchTableClass.java
deleted file mode 100644
index d3d91bfb4f80..000000000000
--- a/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/NoSuchTableClass.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.mapper;
-
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbHashKey;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbTable;
-
-@DynamoDbTable(tableName = "tableNotExist")
-public class NoSuchTableClass {
-
-    private String key;
-
-    @DynamoDbHashKey
-    public String getKey() {
-        return key;
-    }
-
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-}
diff --git a/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/NumberAttributeClass.java b/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/NumberAttributeClass.java
deleted file mode 100644
index 858c6692f634..000000000000
--- a/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/NumberAttributeClass.java
+++ /dev/null
@@ -1,375 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.mapper;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.util.Calendar;
-import java.util.Date;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbAttribute;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbAutoGeneratedKey;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbHashKey;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbIgnore;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbTable;
-
-/**
- * Simple domain class with numeric attributes
- */
-@DynamoDbTable(tableName = "aws-java-sdk-util")
-public class NumberAttributeClass {
-
-    private String key;
-    private int intAttribute;
-    private Integer integerAttribute;
-    private double doubleAttribute;
-    private Double doubleObjectAttribute;
-    private float floatAttribute;
-    private Float floatObjectAttribute;
-    private BigDecimal bigDecimalAttribute;
-    private BigInteger bigIntegerAttribute;
-    private long longAttribute;
-    private Long longObjectAttribute;
-    private short shortAttribute;
-    private Short shortObjectAttribute;
-    private byte byteAttribute;
-    private Byte byteObjectAttribute;
-    private Date dateAttribute;
-    private Calendar calendarAttribute;
-    private Boolean booleanObjectAttribute;
-    private boolean booleanAttribute;
-    private String ignored = "notSent";
-
-    @DynamoDbAutoGeneratedKey
-    @DynamoDbHashKey
-    public String getKey() {
-        return key;
-    }
-
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    public int getIntAttribute() {
-        return intAttribute;
-    }
-
-    public void setIntAttribute(int intAttribute) {
-        this.intAttribute = intAttribute;
-    }
-
-    public Integer getIntegerAttribute() {
-        return integerAttribute;
-    }
-
-    public void setIntegerAttribute(Integer integerAttribute) {
-        this.integerAttribute = integerAttribute;
-    }
-
-    public double getDoubleAttribute() {
-        return doubleAttribute;
-    }
-
-    public void setDoubleAttribute(double doubleAttribute) {
-        this.doubleAttribute = doubleAttribute;
-    }
-
-    public Double getDoubleObjectAttribute() {
-        return doubleObjectAttribute;
-    }
-
-    public void setDoubleObjectAttribute(Double doubleObjectAttribute) {
-        this.doubleObjectAttribute = doubleObjectAttribute;
-    }
-
-    @DynamoDbAttribute
-    public float getFloatAttribute() {
-        return floatAttribute;
-    }
-
-    public void setFloatAttribute(float floatAttribute) {
-        this.floatAttribute = floatAttribute;
-    }
-
-    public Float getFloatObjectAttribute() {
-        return floatObjectAttribute;
-    }
-
-    public void setFloatObjectAttribute(Float floatObjectAttribute) {
-        this.floatObjectAttribute = floatObjectAttribute;
-    }
-
-    public BigDecimal getBigDecimalAttribute() {
-        return bigDecimalAttribute;
-    }
-
-    public void setBigDecimalAttribute(BigDecimal bigDecimalAttribute) {
-        this.bigDecimalAttribute = bigDecimalAttribute;
-    }
-
-    public BigInteger getBigIntegerAttribute() {
-        return bigIntegerAttribute;
-    }
-
-    public void setBigIntegerAttribute(BigInteger bigIntegerAttribute) {
-        this.bigIntegerAttribute = bigIntegerAttribute;
-    }
-
-    public long getLongAttribute() {
-        return longAttribute;
-    }
-
-    public void setLongAttribute(long longAttribute) {
-        this.longAttribute = longAttribute;
-    }
-
-    public Long getLongObjectAttribute() {
-        return longObjectAttribute;
-    }
-
-    public void setLongObjectAttribute(Long longObjectAttribute) {
-        this.longObjectAttribute = longObjectAttribute;
-    }
-
-    public byte getByteAttribute() {
-        return byteAttribute;
-    }
-
-    public void setByteAttribute(byte byteAttribute) {
-        this.byteAttribute = byteAttribute;
-    }
-
-    public Byte getByteObjectAttribute() {
-        return byteObjectAttribute;
-    }
-
-    public void setByteObjectAttribute(Byte byteObjectAttribute) {
-        this.byteObjectAttribute = byteObjectAttribute;
-    }
-
-    public Date getDateAttribute() {
-        return dateAttribute;
-    }
-
-    public void setDateAttribute(Date dateAttribute) {
-        this.dateAttribute = dateAttribute;
-    }
-
-    public Calendar getCalendarAttribute() {
-        return calendarAttribute;
-    }
-
-    public void setCalendarAttribute(Calendar calendarAttribute) {
-        this.calendarAttribute = calendarAttribute;
-    }
-
-    public Boolean getBooleanObjectAttribute() {
-        return booleanObjectAttribute;
-    }
-
-    public void setBooleanObjectAttribute(Boolean booleanObjectAttribute) {
-        this.booleanObjectAttribute = booleanObjectAttribute;
-    }
-
-    public boolean isBooleanAttribute() {
-        return booleanAttribute;
-    }
-
-    public void setBooleanAttribute(boolean booleanAttribute) {
-        this.booleanAttribute = booleanAttribute;
-    }
-
-    @DynamoDbIgnore
-    public String getIgnored() {
-        return ignored;
-    }
-
-    public void setIgnored(String ignored) {
-        this.ignored = ignored;
-    }
-
-    public short getShortAttribute() {
-        return shortAttribute;
-    }
-
-    public void setShortAttribute(short shortAttribute) {
-        this.shortAttribute = shortAttribute;
-    }
-
-    public Short getShortObjectAttribute() {
-        return shortObjectAttribute;
-    }
-
-    public void setShortObjectAttribute(Short shortObjectAttribute) {
-        this.shortObjectAttribute = shortObjectAttribute;
-    }
-
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + ((bigDecimalAttribute == null) ? 0 : bigDecimalAttribute.hashCode());
-        result = prime * result + ((bigIntegerAttribute == null) ? 0 : bigIntegerAttribute.hashCode());
-        result = prime * result + (booleanAttribute ? 1231 : 1237);
-        result = prime * result + ((booleanObjectAttribute == null) ? 0 : booleanObjectAttribute.hashCode());
-        result = prime * result + byteAttribute;
-        result = prime * result + ((byteObjectAttribute == null) ? 0 : byteObjectAttribute.hashCode());
-        result = prime * result + ((calendarAttribute == null) ? 0 : calendarAttribute.hashCode());
-        result = prime * result + ((dateAttribute == null) ? 0 : dateAttribute.hashCode());
-        long temp;
-        temp = Double.doubleToLongBits(doubleAttribute);
-        result = prime * result + (int) (temp ^ (temp >>> 32));
-        result = prime * result + ((doubleObjectAttribute == null) ? 0 : doubleObjectAttribute.hashCode());
-        result = prime * result + Float.floatToIntBits(floatAttribute);
-        result = prime * result + ((floatObjectAttribute == null) ? 0 : floatObjectAttribute.hashCode());
-        result = prime * result + ((ignored == null) ? 0 : ignored.hashCode());
-        result = prime * result + intAttribute;
-        result = prime * result + ((integerAttribute == null) ? 0 : integerAttribute.hashCode());
-        result = prime * result + ((key == null) ? 0 : key.hashCode());
-        result = prime * result + (int) (longAttribute ^ (longAttribute >>> 32));
-        result = prime * result + ((longObjectAttribute == null) ? 0 : longObjectAttribute.hashCode());
-        result = prime * result + shortAttribute;
-        result = prime * result + ((shortObjectAttribute == null) ? 0 : shortObjectAttribute.hashCode());
-        return result;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        NumberAttributeClass other = (NumberAttributeClass) obj;
-        if (bigDecimalAttribute == null) {
-            if (other.bigDecimalAttribute != null) {
-                return false;
-            }
-        } else if (!bigDecimalAttribute.equals(other.bigDecimalAttribute)) {
-            return false;
-        }
-        if (bigIntegerAttribute == null) {
-            if (other.bigIntegerAttribute != null) {
-                return false;
-            }
-        } else if (!bigIntegerAttribute.equals(other.bigIntegerAttribute)) {
-            return false;
-        }
-        if (booleanAttribute != other.booleanAttribute) {
-            return false;
-        }
-        if (booleanObjectAttribute == null) {
-            if (other.booleanObjectAttribute != null) {
-                return false;
-            }
-        } else if (!booleanObjectAttribute.equals(other.booleanObjectAttribute)) {
-            return false;
-        }
-        if (byteAttribute != other.byteAttribute) {
-            return false;
-        }
-        if (byteObjectAttribute == null) {
-            if (other.byteObjectAttribute != null) {
-                return false;
-            }
-        } else if (!byteObjectAttribute.equals(other.byteObjectAttribute)) {
-            return false;
-        }
-        if (calendarAttribute == null) {
-            if (other.calendarAttribute != null) {
-                return false;
-            }
-        } else if (!calendarAttribute.equals(other.calendarAttribute)) {
-            return false;
-        }
-        if (dateAttribute == null) {
-            if (other.dateAttribute != null) {
-                return false;
-            }
-        } else if (!dateAttribute.equals(other.dateAttribute)) {
-            return false;
-        }
-        if (Double.doubleToLongBits(doubleAttribute) != Double.doubleToLongBits(other.doubleAttribute)) {
-            return false;
-        }
-        if (doubleObjectAttribute == null) {
-            if (other.doubleObjectAttribute != null) {
-                return false;
-            }
-        } else if (!doubleObjectAttribute.equals(other.doubleObjectAttribute)) {
-            return false;
-        }
-        if (Float.floatToIntBits(floatAttribute) != Float.floatToIntBits(other.floatAttribute)) {
-            return false;
-        }
-        if (floatObjectAttribute == null) {
-            if (other.floatObjectAttribute != null) {
-                return false;
-            }
-        } else if (!floatObjectAttribute.equals(other.floatObjectAttribute)) {
-            return false;
-        }
-        if (ignored == null) {
-            if (other.ignored != null) {
-                return false;
-            }
-        } else if (!ignored.equals(other.ignored)) {
-            return false;
-        }
-        if (intAttribute != other.intAttribute) {
-            return false;
-        }
-        if (integerAttribute == null) {
-            if (other.integerAttribute != null) {
-                return false;
-            }
-        } else if (!integerAttribute.equals(other.integerAttribute)) {
-            return false;
-        }
-        if (key == null) {
-            if (other.key != null) {
-                return false;
-            }
-        } else if (!key.equals(other.key)) {
-            return false;
-        }
-        if (longAttribute != other.longAttribute) {
-            return false;
-        }
-        if (longObjectAttribute == null) {
-            if (other.longObjectAttribute != null) {
-                return false;
-            }
-        } else if (!longObjectAttribute.equals(other.longObjectAttribute)) {
-            return false;
-        }
-        if (shortAttribute != other.shortAttribute) {
-            return false;
-        }
-        if (shortObjectAttribute == null) {
-            if (other.shortObjectAttribute != null) {
-                return false;
-            }
-        } else if (!shortObjectAttribute.equals(other.shortObjectAttribute)) {
-            return false;
-        }
-        return true;
-    }
-
-}
diff --git a/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/NumberSetAttributeClass.java b/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/NumberSetAttributeClass.java
deleted file mode 100644
index a1fbfb4ac27f..000000000000
--- a/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/NumberSetAttributeClass.java
+++ /dev/null
@@ -1,267 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.mapper;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.Set;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbAttribute;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbHashKey;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbTable;
-
-/**
- * Simple domain class with numeric attributes
- */
-@DynamoDbTable(tableName = "aws-java-sdk-util")
-public class NumberSetAttributeClass {
-
-    private String key;
-    private Set<Integer> integerAttribute;
-    private Set<Double> doubleObjectAttribute;
-    private Set<Float> floatObjectAttribute;
-    private Set<BigDecimal> bigDecimalAttribute;
-    private Set<BigInteger> bigIntegerAttribute;
-    private Set<Long> longObjectAttribute;
-    private Set<Byte> byteObjectAttribute;
-    private Set<Date> dateAttribute;
-    private Set<Calendar> calendarAttribute;
-    private Set<Boolean> booleanAttribute;
-
-    @DynamoDbHashKey
-    public String getKey() {
-        return key;
-    }
-
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    @DynamoDbAttribute
-    public Set<Integer> getIntegerAttribute() {
-        return integerAttribute;
-    }
-
-    public void setIntegerAttribute(Set<Integer> integerAttribute) {
-        this.integerAttribute = integerAttribute;
-    }
-
-    @DynamoDbAttribute
-    public Set<Double> getDoubleObjectAttribute() {
-        return doubleObjectAttribute;
-    }
-
-    public void setDoubleObjectAttribute(Set<Double> doubleObjectAttribute) {
-        this.doubleObjectAttribute = doubleObjectAttribute;
-    }
-
-    @DynamoDbAttribute
-    public Set<Float> getFloatObjectAttribute() {
-        return floatObjectAttribute;
-    }
-
-    public void setFloatObjectAttribute(Set<Float> floatObjectAttribute) {
-        this.floatObjectAttribute = floatObjectAttribute;
-    }
-
-    @DynamoDbAttribute
-    public Set<BigDecimal> getBigDecimalAttribute() {
-        return bigDecimalAttribute;
-    }
-
-    public void setBigDecimalAttribute(Set<BigDecimal> bigDecimalAttribute) {
-        this.bigDecimalAttribute = bigDecimalAttribute;
-    }
-
-    @DynamoDbAttribute
-    public Set<BigInteger> getBigIntegerAttribute() {
-        return bigIntegerAttribute;
-    }
-
-    public void setBigIntegerAttribute(Set<BigInteger> bigIntegerAttribute) {
-        this.bigIntegerAttribute = bigIntegerAttribute;
-    }
-
-    @DynamoDbAttribute
-    public Set<Long> getLongObjectAttribute() {
-        return longObjectAttribute;
-    }
-
-    public void setLongObjectAttribute(Set<Long> longObjectAttribute) {
-        this.longObjectAttribute = longObjectAttribute;
-    }
-
-    @DynamoDbAttribute
-    public Set<Byte> getByteObjectAttribute() {
-        return byteObjectAttribute;
-    }
-
-    public void setByteObjectAttribute(Set<Byte> byteObjectAttribute) {
-        this.byteObjectAttribute = byteObjectAttribute;
-    }
-
-    @DynamoDbAttribute
-    public Set<Date> getDateAttribute() {
-        return dateAttribute;
-    }
-
-    public void setDateAttribute(Set<Date> dateAttribute) {
-        this.dateAttribute = dateAttribute;
-    }
-
-    @DynamoDbAttribute
-    public Set<Calendar> getCalendarAttribute() {
-        return calendarAttribute;
-    }
-
-    public void setCalendarAttribute(Set<Calendar> calendarAttribute) {
-        this.calendarAttribute = calendarAttribute;
-    }
-
-    @DynamoDbAttribute
-    public Set<Boolean> getBooleanAttribute() {
-        return booleanAttribute;
-    }
-
-    public void setBooleanAttribute(Set<Boolean> booleanAttribute) {
-        this.booleanAttribute = booleanAttribute;
-    }
-
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + ((bigDecimalAttribute == null) ? 0 : bigDecimalAttribute.hashCode());
-        result = prime * result + ((bigIntegerAttribute == null) ? 0 : bigIntegerAttribute.hashCode());
-        result = prime * result + ((booleanAttribute == null) ? 0 : booleanAttribute.hashCode());
-        result = prime * result + ((byteObjectAttribute == null) ? 0 : byteObjectAttribute.hashCode());
-        result = prime * result + ((calendarAttribute == null) ? 0 : calendarAttribute.hashCode());
-        result = prime * result + ((dateAttribute == null) ? 0 : dateAttribute.hashCode());
-        result = prime * result + ((doubleObjectAttribute == null) ? 0 : doubleObjectAttribute.hashCode());
-        result = prime * result + ((floatObjectAttribute == null) ? 0 : floatObjectAttribute.hashCode());
-        result = prime * result + ((integerAttribute == null) ? 0 : integerAttribute.hashCode());
-        result = prime * result + ((key == null) ? 0 : key.hashCode());
-        result = prime * result + ((longObjectAttribute == null) ? 0 : longObjectAttribute.hashCode());
-        return result;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        NumberSetAttributeClass other = (NumberSetAttributeClass) obj;
-        if (bigDecimalAttribute == null) {
-            if (other.bigDecimalAttribute != null) {
-                return false;
-            }
-        } else if (!bigDecimalAttribute.equals(other.bigDecimalAttribute)) {
-            return false;
-        }
-        if (bigIntegerAttribute == null) {
-            if (other.bigIntegerAttribute != null) {
-                return false;
-            }
-        } else if (!bigIntegerAttribute.equals(other.bigIntegerAttribute)) {
-            return false;
-        }
-        if (booleanAttribute == null) {
-            if (other.booleanAttribute != null) {
-                return false;
-            }
-        } else if (!booleanAttribute.equals(other.booleanAttribute)) {
-            return false;
-        }
-        if (byteObjectAttribute == null) {
-            if (other.byteObjectAttribute != null) {
-                return false;
-            }
-        } else if (!byteObjectAttribute.equals(other.byteObjectAttribute)) {
-            return false;
-        }
-        if (calendarAttribute == null) {
-            if (other.calendarAttribute != null) {
-                return false;
-            }
-        } else if (!calendarAttribute.equals(other.calendarAttribute)) {
-            return false;
-        }
-        if (dateAttribute == null) {
-            if (other.dateAttribute != null) {
-                return false;
-            }
-        } else if (!dateAttribute.equals(other.dateAttribute)) {
-            return false;
-        }
-        if (doubleObjectAttribute == null) {
-            if (other.doubleObjectAttribute != null) {
-                return false;
-            }
-        } else if (!doubleObjectAttribute.equals(other.doubleObjectAttribute)) {
-            return false;
-        }
-        if (floatObjectAttribute == null) {
-            if (other.floatObjectAttribute != null) {
-                return false;
-            }
-        } else if (!floatObjectAttribute.equals(other.floatObjectAttribute)) {
-            return false;
-        }
-        if (integerAttribute == null) {
-            if (other.integerAttribute != null) {
-                return false;
-            }
-        } else if (!integerAttribute.equals(other.integerAttribute)) {
-            return false;
-        }
-        if (key == null) {
-            if (other.key != null) {
-                return false;
-            }
-        } else if (!key.equals(other.key)) {
-            return false;
-        }
-        if (longObjectAttribute == null) {
-            if (other.longObjectAttribute != null) {
-                return false;
-            }
-        } else if (!longObjectAttribute.equals(other.longObjectAttribute)) {
-            return false;
-        }
-        return true;
-    }
-
-    /* (non-Javadoc)
-     * @see java.lang.Object#toString()
-     */
-    @Override
-    public String toString() {
-        return "NumberSetAttributeClass [key=" + key;
-        //        + ", integerAttribute=" + integerAttribute
-        //                + ", doubleObjectAttribute=" + doubleObjectAttribute + ", floatObjectAttribute=" + floatObjectAttribute
-        //                + ", bigDecimalAttribute=" + bigDecimalAttribute + ", bigIntegerAttribute=" + bigIntegerAttribute
-        //                + ", longObjectAttribute=" + longObjectAttribute + ", byteObjectAttribute=" + byteObjectAttribute
-        //                + ", dateAttribute=" + dateAttribute + ", calendarAttribute=" + calendarAttribute
-        //                + ", booleanAttribute=" + booleanAttribute + "]";
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/NumericSetAttributesIntegrationTest.java b/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/NumericSetAttributesIntegrationTest.java
deleted file mode 100644
index 8b7138d72058..000000000000
--- a/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/NumericSetAttributesIntegrationTest.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.mapper;
-
-import static org.junit.Assert.assertEquals;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import software.amazon.awssdk.services.dynamodb.DynamoDBMapperIntegrationTestBase;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMapper;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-import software.amazon.awssdk.services.dynamodb.model.PutItemRequest;
-
-/**
- * Tests string set attributes
- */
-public class NumericSetAttributesIntegrationTest extends DynamoDBMapperIntegrationTestBase {
-
-    private static final String INTEGER_ATTRIBUTE = "integerAttribute";
-    private static final String FLOAT_OBJECT_ATTRIBUTE = "floatObjectAttribute";
-    private static final String DOUBLE_OBJECT_ATTRIBUTE = "doubleObjectAttribute";
-    private static final String BIG_INTEGER_ATTRIBUTE = "bigIntegerAttribute";
-    private static final String BIG_DECIMAL_ATTRIBUTE = "bigDecimalAttribute";
-    private static final String LONG_OBJECT_ATTRIBUTE = "longObjectAttribute";
-    private static final String BYTE_OBJECT_ATTRIBUTE = "byteObjectAttribute";
-    private static final String BOOLEAN_ATTRIBUTE = "booleanAttribute";
-    private static final List<Map<String, AttributeValue>> attrs = new LinkedList<Map<String, AttributeValue>>();
-    // We don't start with the current system millis like other tests because
-    // it's out of the range of some data types
-    private static int start = 1;
-    private static int byteStart = 1;
-
-    // Test data
-    static {
-        for (int i = 0; i < 5; i++) {
-            Map<String, AttributeValue> attr = new HashMap<String, AttributeValue>();
-            attr.put(KEY_NAME, AttributeValue.builder().s("" + start++).build());
-            attr.put(INTEGER_ATTRIBUTE, AttributeValue.builder().ns("" + start++, "" + start++, "" + start++).build());
-            attr.put(FLOAT_OBJECT_ATTRIBUTE, AttributeValue.builder().ns("" + start++, "" + start++, "" + start++).build());
-            attr.put(DOUBLE_OBJECT_ATTRIBUTE, AttributeValue.builder().ns("" + start++, "" + start++, "" + start++).build());
-            attr.put(BIG_INTEGER_ATTRIBUTE, AttributeValue.builder().ns("" + start++, "" + start++, "" + start++).build());
-            attr.put(BIG_DECIMAL_ATTRIBUTE, AttributeValue.builder().ns("" + start++, "" + start++, "" + start++).build());
-            attr.put(LONG_OBJECT_ATTRIBUTE, AttributeValue.builder().ns("" + start++, "" + start++, "" + start++).build());
-            attr.put(BYTE_OBJECT_ATTRIBUTE, AttributeValue.builder().ns("" + byteStart++, "" + byteStart++, "" + byteStart++).build());
-            attr.put(BOOLEAN_ATTRIBUTE, AttributeValue.builder().ns("0", "1").build());
-            attrs.add(attr);
-        }
-    }
-
-    ;
-
-    @BeforeClass
-    public static void setUp() throws Exception {
-        DynamoDBMapperIntegrationTestBase.setUp();
-
-        // Insert the data
-        for (Map<String, AttributeValue> attr : attrs) {
-            dynamo.putItem(PutItemRequest.builder().tableName(TABLE_NAME).item(attr).build());
-        }
-    }
-
-    @Test
-    public void testLoad() throws Exception {
-        DynamoDbMapper util = new DynamoDbMapper(dynamo);
-
-        for (Map<String, AttributeValue> attr : attrs) {
-            NumberSetAttributeClass x = util.load(NumberSetAttributeClass.class, attr.get(KEY_NAME).s());
-            assertEquals(x.getKey(), attr.get(KEY_NAME).s());
-
-            // Convert all numbers to the most inclusive type for easy comparison
-            assertNumericSetsEquals(x.getBigDecimalAttribute(), attr.get(BIG_DECIMAL_ATTRIBUTE).ns());
-            assertNumericSetsEquals(x.getBigIntegerAttribute(), attr.get(BIG_INTEGER_ATTRIBUTE).ns());
-            assertNumericSetsEquals(x.getFloatObjectAttribute(), attr.get(FLOAT_OBJECT_ATTRIBUTE).ns());
-            assertNumericSetsEquals(x.getDoubleObjectAttribute(), attr.get(DOUBLE_OBJECT_ATTRIBUTE).ns());
-            assertNumericSetsEquals(x.getIntegerAttribute(), attr.get(INTEGER_ATTRIBUTE).ns());
-            assertNumericSetsEquals(x.getLongObjectAttribute(), attr.get(LONG_OBJECT_ATTRIBUTE).ns());
-            assertNumericSetsEquals(x.getByteObjectAttribute(), attr.get(BYTE_OBJECT_ATTRIBUTE).ns());
-            assertSetsEqual(toSet("0", "1"), attr.get(BOOLEAN_ATTRIBUTE).ns());
-        }
-    }
-
-    @Test
-    public void testSave() throws Exception {
-        List<NumberSetAttributeClass> objs = new ArrayList<NumberSetAttributeClass>();
-        for (int i = 0; i < 5; i++) {
-            NumberSetAttributeClass obj = getUniqueObject();
-            objs.add(obj);
-        }
-
-        DynamoDbMapper util = new DynamoDbMapper(dynamo);
-        for (NumberSetAttributeClass obj : objs) {
-            util.save(obj);
-        }
-
-        for (NumberSetAttributeClass obj : objs) {
-            NumberSetAttributeClass loaded = util.load(NumberSetAttributeClass.class, obj.getKey());
-            assertEquals(obj, loaded);
-        }
-    }
-
-    @Test
-    public void testUpdate() throws Exception {
-        List<NumberSetAttributeClass> objs = new ArrayList<NumberSetAttributeClass>();
-        for (int i = 0; i < 5; i++) {
-            NumberSetAttributeClass obj = getUniqueObject();
-            objs.add(obj);
-        }
-
-        DynamoDbMapper util = new DynamoDbMapper(dynamo);
-        for (NumberSetAttributeClass obj : objs) {
-            util.save(obj);
-        }
-
-        for (NumberSetAttributeClass obj : objs) {
-            NumberSetAttributeClass replacement = getUniqueObject();
-            replacement.setKey(obj.getKey());
-            util.save(replacement);
-            assertEquals(replacement, util.load(NumberSetAttributeClass.class, obj.getKey()));
-        }
-    }
-
-    private NumberSetAttributeClass getUniqueObject() {
-        NumberSetAttributeClass obj = new NumberSetAttributeClass();
-        obj.setKey(String.valueOf(startKey++));
-        obj.setBigDecimalAttribute(toSet(new BigDecimal(startKey++), new BigDecimal(startKey++), new BigDecimal(startKey++)));
-        obj.setBigIntegerAttribute(
-                toSet(new BigInteger("" + startKey++), new BigInteger("" + startKey++), new BigInteger("" + startKey++)));
-        obj.setByteObjectAttribute(toSet(new Byte("" + byteStart++), new Byte("" + byteStart++), new Byte("" + byteStart++)));
-        obj.setDoubleObjectAttribute(toSet(new Double("" + start++), new Double("" + start++), new Double("" + start++)));
-        obj.setFloatObjectAttribute(toSet(new Float("" + start++), new Float("" + start++), new Float("" + start++)));
-        obj.setIntegerAttribute(toSet(new Integer("" + start++), new Integer("" + start++), new Integer("" + start++)));
-        obj.setLongObjectAttribute(toSet(new Long("" + start++), new Long("" + start++), new Long("" + start++)));
-        obj.setBooleanAttribute(toSet(true, false));
-        obj.setDateAttribute(toSet(new Date(startKey++), new Date(startKey++), new Date(startKey++)));
-        Set<Calendar> cals = new HashSet<Calendar>();
-        for (Date d : obj.getDateAttribute()) {
-            Calendar cal = GregorianCalendar.getInstance();
-            cal.setTime(d);
-            cals.add(cal);
-        }
-        obj.setCalendarAttribute(toSet(cals));
-        return obj;
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/QueryIntegrationTest.java b/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/QueryIntegrationTest.java
deleted file mode 100644
index fc5838014dca..000000000000
--- a/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/QueryIntegrationTest.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.mapper;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Random;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import software.amazon.awssdk.services.dynamodb.DynamoDBMapperIntegrationTestBase;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMapper;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMapperConfig;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbQueryExpression;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-import software.amazon.awssdk.services.dynamodb.model.ComparisonOperator;
-import software.amazon.awssdk.services.dynamodb.model.Condition;
-import software.amazon.awssdk.services.dynamodb.pojos.RangeKeyClass;
-
-/**
- * Integration tests for the query operation on DynamoDBMapper.
- */
-public class QueryIntegrationTest extends DynamoDBMapperIntegrationTestBase {
-
-    private static final long HASH_KEY = System.currentTimeMillis();
-    private static final int TEST_ITEM_NUMBER = 500;
-    private static RangeKeyClass hashKeyObject;
-    private static DynamoDbMapper mapper;
-
-    @BeforeClass
-    public static void setUp() throws Exception {
-        setUpTableWithRangeAttribute();
-
-        DynamoDbMapperConfig mapperConfig = new DynamoDbMapperConfig(DynamoDbMapperConfig.ConsistentRead.CONSISTENT);
-        mapper = new DynamoDbMapper(dynamo, mapperConfig);
-
-        putTestData(mapper, TEST_ITEM_NUMBER);
-
-        hashKeyObject = new RangeKeyClass();
-        hashKeyObject.setKey(HASH_KEY);
-    }
-
-    /**
-     * Use BatchSave to put some test data into the tested table. Each item is
-     * hash-keyed by the same value, and range-keyed by numbers starting from 0.
-     */
-    private static void putTestData(DynamoDbMapper mapper, int itemNumber) {
-        List<RangeKeyClass> objs = new ArrayList<RangeKeyClass>();
-        for (int i = 0; i < itemNumber; i++) {
-            RangeKeyClass obj = new RangeKeyClass();
-            obj.setKey(HASH_KEY);
-            obj.setRangeKey(i);
-            obj.setBigDecimalAttribute(new BigDecimal(i));
-            objs.add(obj);
-        }
-        mapper.batchSave(objs);
-    }
-
-    @Test
-    public void testQueryWithPrimaryRangeKey() throws Exception {
-        DynamoDbQueryExpression<RangeKeyClass> queryExpression =
-                new DynamoDbQueryExpression<RangeKeyClass>()
-                        .withHashKeyValues(hashKeyObject)
-                        .withRangeKeyCondition(
-                                "rangeKey",
-                                Condition.builder()
-                                        .comparisonOperator(ComparisonOperator.GT)
-                                        .attributeValueList(AttributeValue.builder().n("1.0").build()).build())
-                        .withLimit(11);
-        List<RangeKeyClass> list = mapper.query(RangeKeyClass.class, queryExpression);
-
-        int count = 0;
-        Iterator<RangeKeyClass> iterator = list.iterator();
-        while (iterator.hasNext()) {
-            count++;
-            RangeKeyClass next = iterator.next();
-            assertTrue(next.getRangeKey() > 1.00);
-        }
-
-        int numMatchingObjects = TEST_ITEM_NUMBER - 2;
-        assertEquals(count, numMatchingObjects);
-        assertEquals(numMatchingObjects, list.size());
-
-        assertNotNull(list.get(list.size() / 2));
-        assertTrue(list.contains(list.get(list.size() / 2)));
-        assertEquals(numMatchingObjects, list.toArray().length);
-
-        Thread.sleep(250);
-        int totalCount = mapper.count(RangeKeyClass.class, queryExpression);
-        assertEquals(numMatchingObjects, totalCount);
-
-        /**
-         * Tests query with only hash key
-         */
-        queryExpression = new DynamoDbQueryExpression<RangeKeyClass>().withHashKeyValues(hashKeyObject);
-        list = mapper.query(RangeKeyClass.class, queryExpression);
-        assertEquals(TEST_ITEM_NUMBER, list.size());
-    }
-
-    /**
-     * Tests making queries using query filter on non-key attributes.
-     */
-    @Test
-    public void testQueryFilter() {
-        // A random filter condition to be applied to the query.
-        Random random = new Random();
-        int randomFilterValue = random.nextInt(TEST_ITEM_NUMBER);
-        Condition filterCondition = Condition.builder()
-                .comparisonOperator(ComparisonOperator.LT)
-                .attributeValueList(
-                        AttributeValue.builder().n(Integer.toString(randomFilterValue)).build()).build();
-
-        /*
-         * (1) Apply the filter on the range key, in form of key condition
-         */
-        DynamoDbQueryExpression<RangeKeyClass> queryWithRangeKeyCondition =
-                new DynamoDbQueryExpression<RangeKeyClass>()
-                        .withHashKeyValues(hashKeyObject)
-                        .withRangeKeyCondition("rangeKey", filterCondition);
-        List<RangeKeyClass> rangeKeyConditionResult = mapper.query(RangeKeyClass.class, queryWithRangeKeyCondition);
-
-        /*
-         * (2) Apply the filter on the bigDecimalAttribute, in form of query filter
-         */
-        DynamoDbQueryExpression<RangeKeyClass> queryWithQueryFilterCondition =
-                new DynamoDbQueryExpression<RangeKeyClass>()
-                        .withHashKeyValues(hashKeyObject)
-                        .withQueryFilter(Collections.singletonMap("bigDecimalAttribute", filterCondition));
-        List<RangeKeyClass> queryFilterResult = mapper.query(RangeKeyClass.class, queryWithQueryFilterCondition);
-
-        assertEquals(rangeKeyConditionResult.size(), queryFilterResult.size());
-        for (int i = 0; i < rangeKeyConditionResult.size(); i++) {
-            assertEquals(rangeKeyConditionResult.get(i), queryFilterResult.get(i));
-        }
-    }
-
-    /**
-     * Tests that exception should be raised when user provides an index name
-     * when making query with the primary range key.
-     */
-    @Test
-    public void testUnnecessaryIndexNameException() {
-        try {
-            DynamoDbMapper mapper = new DynamoDbMapper(dynamo);
-            long hashKey = System.currentTimeMillis();
-            RangeKeyClass keyObject = new RangeKeyClass();
-            keyObject.setKey(hashKey);
-            DynamoDbQueryExpression<RangeKeyClass> queryExpression = new DynamoDbQueryExpression<RangeKeyClass>()
-                    .withHashKeyValues(keyObject);
-            queryExpression.withRangeKeyCondition("rangeKey",
-                                                  Condition.builder().comparisonOperator(ComparisonOperator.GT.toString())
-                                                                 .attributeValueList(
-                                                                         AttributeValue.builder().n("1.0").build()).build()).withLimit(11)
-                           .withIndexName("some_index");
-            mapper.query(RangeKeyClass.class, queryExpression);
-            fail("User should not provide index name when making query with the primary range key");
-        } catch (IllegalArgumentException expected) {
-            System.out.println(expected.getMessage());
-        } catch (Exception e) {
-            fail("Should trigger SdkClientException.");
-        }
-
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/RangeKeyAttributesIntegrationTest.java b/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/RangeKeyAttributesIntegrationTest.java
deleted file mode 100644
index 32f1f6f642f0..000000000000
--- a/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/RangeKeyAttributesIntegrationTest.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.mapper;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import software.amazon.awssdk.services.dynamodb.DynamoDBMapperIntegrationTestBase;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMapper;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-import software.amazon.awssdk.services.dynamodb.model.PutItemRequest;
-import software.amazon.awssdk.services.dynamodb.pojos.RangeKeyClass;
-
-/**
- * Tests range and hash key combination
- */
-public class RangeKeyAttributesIntegrationTest extends DynamoDBMapperIntegrationTestBase {
-
-    private static final String RANGE_KEY = "rangeKey";
-    private static final String INTEGER_ATTRIBUTE = "integerSetAttribute";
-    private static final String BIG_DECIMAL_ATTRIBUTE = "bigDecimalAttribute";
-    private static final String STRING_SET_ATTRIBUTE = "stringSetAttribute";
-    private static final String STRING_ATTRIBUTE = "stringAttribute";
-    private static final String VERSION_ATTRIBUTE = "version";
-    private static final List<Map<String, AttributeValue>> attrs = new LinkedList<Map<String, AttributeValue>>();
-    // We don't start with the current system millis like other tests because
-    // it's out of the range of some data types
-    private static int start = 1;
-
-    // Test data
-    static {
-        for (int i = 0; i < 5; i++) {
-            Map<String, AttributeValue> attr = new HashMap<String, AttributeValue>();
-            attr.put(KEY_NAME, AttributeValue.builder().n("" + startKey++).build());
-            attr.put(RANGE_KEY, AttributeValue.builder().n("" + start++).build());
-            attr.put(INTEGER_ATTRIBUTE, AttributeValue.builder().ns("" + start++, "" + start++, "" + start++).build());
-            attr.put(BIG_DECIMAL_ATTRIBUTE, AttributeValue.builder().n("" + start++).build());
-            attr.put(STRING_ATTRIBUTE, AttributeValue.builder().s("" + start++).build());
-            attr.put(STRING_SET_ATTRIBUTE, AttributeValue.builder().ss("" + start++, "" + start++, "" + start++).build());
-            attr.put(VERSION_ATTRIBUTE, AttributeValue.builder().n("1").build());
-
-            attrs.add(attr);
-        }
-    }
-
-    ;
-
-    @BeforeClass
-    public static void setUp() throws Exception {
-        setUpTableWithRangeAttribute();
-
-        // Insert the data
-        for (Map<String, AttributeValue> attr : attrs) {
-            dynamo.putItem(PutItemRequest.builder().tableName(TABLE_WITH_RANGE_ATTRIBUTE).item(attr).build());
-        }
-    }
-
-    @Test
-    public void testLoad() throws Exception {
-        DynamoDbMapper util = new DynamoDbMapper(dynamo);
-
-        for (Map<String, AttributeValue> attr : attrs) {
-            RangeKeyClass x = util.load(newRangeKey(Long.parseLong(attr.get(KEY_NAME).n()),
-                                                    Double.parseDouble(attr.get(RANGE_KEY).n())));
-
-            // Convert all numbers to the most inclusive type for easy
-            // comparison
-            assertEquals(new BigDecimal(x.getKey()), new BigDecimal(attr.get(KEY_NAME).n()));
-            assertEquals(new BigDecimal(x.getRangeKey()), new BigDecimal(attr.get(RANGE_KEY).n()));
-            assertEquals(new BigDecimal(x.getVersion()), new BigDecimal(attr.get(VERSION_ATTRIBUTE).n()));
-            assertEquals(x.getBigDecimalAttribute(), new BigDecimal(attr.get(BIG_DECIMAL_ATTRIBUTE).n()));
-            assertNumericSetsEquals(x.getIntegerAttribute(), attr.get(INTEGER_ATTRIBUTE).ns());
-            assertEquals(x.getStringAttribute(), attr.get(STRING_ATTRIBUTE).s());
-            assertSetsEqual(x.getStringSetAttribute(), toSet(attr.get(STRING_SET_ATTRIBUTE).ss()));
-        }
-    }
-
-    private RangeKeyClass newRangeKey(long hashKey, double rangeKey) {
-        RangeKeyClass obj = new RangeKeyClass();
-        obj.setKey(hashKey);
-        obj.setRangeKey(rangeKey);
-        return obj;
-    }
-
-    @Test
-    public void testSave() throws Exception {
-        List<RangeKeyClass> objs = new ArrayList<RangeKeyClass>();
-        for (int i = 0; i < 5; i++) {
-            RangeKeyClass obj = getUniqueObject();
-            objs.add(obj);
-        }
-
-        DynamoDbMapper util = new DynamoDbMapper(dynamo);
-        for (RangeKeyClass obj : objs) {
-            util.save(obj);
-        }
-
-        for (RangeKeyClass obj : objs) {
-            RangeKeyClass loaded = util.load(RangeKeyClass.class, obj.getKey(), obj.getRangeKey());
-            assertEquals(obj, loaded);
-        }
-    }
-
-    @Test
-    public void testUpdate() throws Exception {
-        List<RangeKeyClass> objs = new ArrayList<RangeKeyClass>();
-        for (int i = 0; i < 5; i++) {
-            RangeKeyClass obj = getUniqueObject();
-            objs.add(obj);
-        }
-
-        DynamoDbMapper util = new DynamoDbMapper(dynamo);
-        for (RangeKeyClass obj : objs) {
-            util.save(obj);
-        }
-
-        for (RangeKeyClass obj : objs) {
-            RangeKeyClass replacement = getUniqueObject();
-            replacement.setKey(obj.getKey());
-            replacement.setRangeKey(obj.getRangeKey());
-            replacement.setVersion(obj.getVersion());
-            util.save(replacement);
-
-            RangeKeyClass loadedObject = util.load(RangeKeyClass.class, obj.getKey(), obj.getRangeKey());
-            assertEquals(replacement, loadedObject);
-
-            // If we try to update the old version, we should get an error
-            replacement.setVersion(replacement.getVersion() - 1);
-            try {
-                util.save(replacement);
-                fail("Should have thrown an exception");
-            } catch (Exception expected) {
-                // Ignored or expected.
-            }
-        }
-    }
-
-    private RangeKeyClass getUniqueObject() {
-        RangeKeyClass obj = new RangeKeyClass();
-        obj.setKey(startKey++);
-        obj.setIntegerAttribute(toSet(start++, start++, start++));
-        obj.setBigDecimalAttribute(new BigDecimal(startKey++));
-        obj.setRangeKey(start++);
-        obj.setStringAttribute("" + startKey++);
-        obj.setStringSetAttribute(toSet("" + startKey++, "" + startKey++, "" + startKey++));
-        return obj;
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/ScalarAttributeIntegrationTest.java b/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/ScalarAttributeIntegrationTest.java
deleted file mode 100644
index 840daaf8a03b..000000000000
--- a/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/ScalarAttributeIntegrationTest.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.mapper;
-
-import java.util.UUID;
-import org.junit.Test;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbScalarAttribute;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbTable;
-import software.amazon.awssdk.services.dynamodb.model.ScalarAttributeType;
-import software.amazon.awssdk.services.dynamodb.pojos.AutoKeyAndVal;
-
-/**
- * Status tests for {@code ScalarAttribute}.
- */
-public class ScalarAttributeIntegrationTest extends AbstractKeyAndValIntegrationTestCase {
-
-    /**
-     * Test with a non-null enum val.
-     */
-    @Test
-    public void testMarshalling() {
-        final KeyAndBinaryUuid object = new KeyAndBinaryUuid();
-        object.setVal(UUID.randomUUID());
-        assertBeforeAndAfterChange(false, object);
-    }
-
-    /**
-     * An object with an enumeration.
-     */
-    @DynamoDbTable(tableName = "aws-java-sdk-util")
-    public static class KeyAndBinaryUuid extends AutoKeyAndVal<UUID> {
-        @DynamoDbScalarAttribute(type = ScalarAttributeType.B)
-        public UUID getVal() {
-            return super.getVal();
-        }
-
-        @Override
-        public void setVal(final UUID val) {
-            super.setVal(val);
-        }
-    }
-
-}
diff --git a/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/ScanIntegrationTest.java b/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/ScanIntegrationTest.java
deleted file mode 100644
index 2c1a5a8515b6..000000000000
--- a/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/ScanIntegrationTest.java
+++ /dev/null
@@ -1,313 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.mapper;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-import java.util.UUID;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import software.amazon.awssdk.awscore.exception.AwsServiceException;
-import software.amazon.awssdk.utils.ImmutableMap;
-import software.amazon.awssdk.services.dynamodb.DynamoDBMapperIntegrationTestBase;
-import software.amazon.awssdk.services.dynamodb.TableUtils;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbHashKey;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMapper;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbScanExpression;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbTable;
-import software.amazon.awssdk.services.dynamodb.datamodeling.PaginatedParallelScanList;
-import software.amazon.awssdk.services.dynamodb.datamodeling.PaginatedScanList;
-import software.amazon.awssdk.services.dynamodb.datamodeling.ScanResultPage;
-import software.amazon.awssdk.services.dynamodb.model.AttributeDefinition;
-import software.amazon.awssdk.services.dynamodb.model.ComparisonOperator;
-import software.amazon.awssdk.services.dynamodb.model.Condition;
-import software.amazon.awssdk.services.dynamodb.model.ConditionalOperator;
-import software.amazon.awssdk.services.dynamodb.model.CreateTableRequest;
-import software.amazon.awssdk.services.dynamodb.model.KeySchemaElement;
-import software.amazon.awssdk.services.dynamodb.model.KeyType;
-import software.amazon.awssdk.services.dynamodb.model.ProvisionedThroughput;
-import software.amazon.awssdk.services.dynamodb.model.ScalarAttributeType;
-
-/**
- * Integration tests for the scan operation on DynamoDBMapper.
- */
-public class ScanIntegrationTest extends DynamoDBMapperIntegrationTestBase {
-
-    private static final String TABLE_NAME = "aws-java-sdk-util-scan";
-    /**
-     * We set a small limit in order to test the behavior of PaginatedList
-     * when it could not load all the scan result in one batch.
-     */
-    private static final int SCAN_LIMIT = 10;
-    private static final int PARALLEL_SCAN_SEGMENTS = 5;
-
-    private static void createTestData() throws Exception {
-        DynamoDbMapper util = new DynamoDbMapper(dynamo);
-        for (int i = 0; i < 500; i++) {
-            util.save(new SimpleClass(Integer.toString(i), Integer.toString(i)));
-        }
-    }
-
-    @BeforeClass
-    public static void setUpTestData() throws Exception {
-        String keyName = "id";
-        CreateTableRequest createTableRequest = CreateTableRequest.builder()
-                .tableName(TABLE_NAME)
-                .keySchema(KeySchemaElement.builder().attributeName(keyName).keyType(KeyType.HASH).build())
-                .attributeDefinitions(
-                        AttributeDefinition.builder().attributeName(keyName).attributeType(
-                                ScalarAttributeType.S).build())
-                .provisionedThroughput(ProvisionedThroughput.builder()
-                        .readCapacityUnits(10L)
-                        .writeCapacityUnits(5L).build())
-                .build();
-
-        TableUtils.createTableIfNotExists(dynamo, createTableRequest);
-        TableUtils.waitUntilActive(dynamo, TABLE_NAME);
-
-        createTestData();
-    }
-
-
-    @Test
-    public void testScan() throws Exception {
-        DynamoDbMapper util = new DynamoDbMapper(dynamo);
-
-        DynamoDbScanExpression scanExpression = new DynamoDbScanExpression().withLimit(SCAN_LIMIT);
-        scanExpression
-                .addFilterCondition("value", Condition.builder().comparisonOperator(ComparisonOperator.NOT_NULL.toString()).build());
-        scanExpression
-                .addFilterCondition("extraData", Condition.builder().comparisonOperator(ComparisonOperator.NOT_NULL.toString()).build());
-        List<SimpleClass> list = util.scan(SimpleClass.class, scanExpression);
-
-        int count = 0;
-        Iterator<SimpleClass> iterator = list.iterator();
-        while (iterator.hasNext()) {
-            count++;
-            SimpleClass next = iterator.next();
-            assertNotNull(next.getExtraData());
-            assertNotNull(next.getValue());
-        }
-
-        int totalCount = util.count(SimpleClass.class, scanExpression);
-
-        assertNotNull(list.get(totalCount / 2));
-        assertEquals(totalCount, count);
-        assertEquals(totalCount, list.size());
-
-        assertTrue(list.contains(list.get(list.size() / 2)));
-        assertEquals(count, list.toArray().length);
-    }
-
-    /**
-     * Tests scanning the table with AND/OR logic operator.
-     */
-    @Test
-    public void testScanWithConditionalOperator() {
-        DynamoDbMapper mapper = new DynamoDbMapper(dynamo);
-
-        DynamoDbScanExpression scanExpression = new DynamoDbScanExpression()
-                .withLimit(SCAN_LIMIT)
-                .withScanFilter(ImmutableMap.of(
-                        "value", Condition.builder().comparisonOperator(ComparisonOperator.NOT_NULL).build(),
-                        "non-existent-field", Condition.builder().comparisonOperator(ComparisonOperator.NOT_NULL).build()
-                                               ))
-                .withConditionalOperator(ConditionalOperator.AND);
-
-        List<SimpleClass> andConditionResult = mapper.scan(SimpleClass.class, scanExpression);
-        assertTrue(andConditionResult.isEmpty());
-
-        List<SimpleClass> orConditionResult = mapper.scan(SimpleClass.class,
-                                                          scanExpression.withConditionalOperator(ConditionalOperator.OR));
-        assertFalse(orConditionResult.isEmpty());
-    }
-
-    @Test
-    public void testParallelScan() throws Exception {
-        DynamoDbMapper util = new DynamoDbMapper(dynamo);
-
-        DynamoDbScanExpression scanExpression = new DynamoDbScanExpression().withLimit(SCAN_LIMIT);
-        scanExpression
-                .addFilterCondition("value", Condition.builder().comparisonOperator(ComparisonOperator.NOT_NULL.toString()).build());
-        scanExpression
-                .addFilterCondition("extraData", Condition.builder().comparisonOperator(ComparisonOperator.NOT_NULL.toString()).build());
-
-        PaginatedParallelScanList<SimpleClass> parallelScanList = util
-                .parallelScan(SimpleClass.class, scanExpression, PARALLEL_SCAN_SEGMENTS);
-        int count = 0;
-        Iterator<SimpleClass> iterator = parallelScanList.iterator();
-        HashMap<String, Boolean> allDataAppearance = new HashMap<String, Boolean>();
-        for (int i = 0; i < 500; i++) {
-            allDataAppearance.put("" + i, false);
-        }
-        while (iterator.hasNext()) {
-            count++;
-            SimpleClass next = iterator.next();
-            assertNotNull(next.getExtraData());
-            assertNotNull(next.getValue());
-            allDataAppearance.put(next.getId(), true);
-        }
-        assertFalse(allDataAppearance.values().contains(false));
-
-        int totalCount = util.count(SimpleClass.class, scanExpression);
-
-        assertNotNull(parallelScanList.get(totalCount / 2));
-        assertEquals(totalCount, count);
-        assertEquals(totalCount, parallelScanList.size());
-
-        assertTrue(parallelScanList.contains(parallelScanList.get(parallelScanList.size() / 2)));
-        assertEquals(count, parallelScanList.toArray().length);
-
-    }
-
-    @Test
-    public void testParallelScanPerformance() throws Exception {
-        DynamoDbMapper util = new DynamoDbMapper(dynamo);
-
-        DynamoDbScanExpression scanExpression = new DynamoDbScanExpression().withLimit(SCAN_LIMIT);
-        scanExpression
-                .addFilterCondition("value", Condition.builder().comparisonOperator(ComparisonOperator.NOT_NULL.toString()).build());
-        scanExpression
-                .addFilterCondition("extraData", Condition.builder().comparisonOperator(ComparisonOperator.NOT_NULL.toString()).build());
-
-        long startTime = System.currentTimeMillis();
-        PaginatedScanList<SimpleClass> scanList = util.scan(SimpleClass.class, scanExpression);
-        scanList.loadAllResults();
-        long fullTableScanTime = System.currentTimeMillis() - startTime;
-        startTime = System.currentTimeMillis();
-        PaginatedParallelScanList<SimpleClass> parallelScanList = util
-                .parallelScan(SimpleClass.class, scanExpression, PARALLEL_SCAN_SEGMENTS);
-        parallelScanList.loadAllResults();
-        long parallelScanTime = System.currentTimeMillis() - startTime;
-        assertEquals(scanList.size(), parallelScanList.size());
-        assertTrue(fullTableScanTime > parallelScanTime);
-        System.out.println("fullTableScanTime : " + fullTableScanTime + "(ms), parallelScanTime : " + parallelScanTime + "(ms).");
-    }
-
-    @Test
-    public void testParallelScanExceptionHandling() {
-        DynamoDbMapper util = new DynamoDbMapper(dynamo);
-        int INVALID_LIMIT = 0;
-        DynamoDbScanExpression scanExpression = new DynamoDbScanExpression().withLimit(INVALID_LIMIT);
-        try {
-            PaginatedParallelScanList<SimpleClass> parallelScanList = util
-                    .parallelScan(SimpleClass.class, scanExpression, PARALLEL_SCAN_SEGMENTS);
-            fail("Should have seen the SdkServiceException");
-        } catch (AwsServiceException exception) {
-            assertNotNull(exception.awsErrorDetails().errorCode());
-            assertNotNull(exception.getMessage());
-        } catch (Exception e) {
-            fail("Should have seen the SdkServiceException");
-        }
-
-    }
-
-    @Test
-    public void testScanPage() throws Exception {
-        DynamoDbMapper util = new DynamoDbMapper(dynamo);
-
-        DynamoDbScanExpression scanExpression = new DynamoDbScanExpression();
-        scanExpression.addFilterCondition("value",
-                                          Condition.builder().comparisonOperator(ComparisonOperator.NOT_NULL.toString()).build());
-        scanExpression.addFilterCondition("extraData",
-                                          Condition.builder().comparisonOperator(ComparisonOperator.NOT_NULL.toString()).build());
-        int limit = 3;
-        scanExpression.setLimit(limit);
-        ScanResultPage<SimpleClass> result = util.scanPage(SimpleClass.class, scanExpression);
-
-        int count = 0;
-        Iterator<SimpleClass> iterator = result.getResults().iterator();
-        Set<SimpleClass> seen = new HashSet<SimpleClass>();
-        while (iterator.hasNext()) {
-            count++;
-            SimpleClass next = iterator.next();
-            assertNotNull(next.getExtraData());
-            assertNotNull(next.getValue());
-            assertTrue(seen.add(next));
-        }
-
-        assertEquals(limit, count);
-        assertEquals(count, result.getResults().toArray().length);
-
-        scanExpression.setExclusiveStartKey(result.lastEvaluatedKey());
-        result = util.scanPage(SimpleClass.class, scanExpression);
-
-        iterator = result.getResults().iterator();
-        count = 0;
-        while (iterator.hasNext()) {
-            count++;
-            SimpleClass next = iterator.next();
-            assertNotNull(next.getExtraData());
-            assertNotNull(next.getValue());
-            assertTrue(seen.add(next));
-        }
-
-        assertEquals(limit, count);
-        assertEquals(count, result.getResults().toArray().length);
-
-    }
-
-    @DynamoDbTable(tableName = "aws-java-sdk-util-scan")
-    public static final class SimpleClass {
-        private String id;
-        private String value;
-        private String extraData;
-
-
-        public SimpleClass() {
-        }
-
-        public SimpleClass(String id, String value) {
-            this.id = id;
-            this.value = value;
-            this.extraData = UUID.randomUUID().toString();
-        }
-
-        @DynamoDbHashKey
-        public String getId() {
-            return id;
-        }
-
-        public void setId(String id) {
-            this.id = id;
-        }
-
-        public String getValue() {
-            return value;
-        }
-
-        public void setValue(String value) {
-            this.value = value;
-        }
-
-        public String getExtraData() {
-            return extraData;
-        }
-
-        public void setExtraData(String extraData) {
-            this.extraData = extraData;
-        }
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/SimpleNumericAttributesIntegrationTest.java b/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/SimpleNumericAttributesIntegrationTest.java
deleted file mode 100644
index 8a2f023bcde6..000000000000
--- a/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/SimpleNumericAttributesIntegrationTest.java
+++ /dev/null
@@ -1,279 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.mapper;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import software.amazon.awssdk.services.dynamodb.DynamoDBMapperIntegrationTestBase;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMapper;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-import software.amazon.awssdk.services.dynamodb.model.GetItemRequest;
-import software.amazon.awssdk.services.dynamodb.model.GetItemResponse;
-import software.amazon.awssdk.services.dynamodb.model.PutItemRequest;
-
-/**
- * Tests numeric attributes
- */
-public class SimpleNumericAttributesIntegrationTest extends DynamoDBMapperIntegrationTestBase {
-
-    private static final String INT_ATTRIBUTE = "intAttribute";
-    private static final String INTEGER_ATTRIBUTE = "integerAttribute";
-    private static final String FLOAT_ATTRIBUTE = "floatAttribute";
-    private static final String FLOAT_OBJECT_ATTRIBUTE = "floatObjectAttribute";
-    private static final String DOUBLE_ATTRIBUTE = "doubleAttribute";
-    private static final String DOUBLE_OBJECT_ATTRIBUTE = "doubleObjectAttribute";
-    private static final String BIG_INTEGER_ATTRIBUTE = "bigIntegerAttribute";
-    private static final String BIG_DECIMAL_ATTRIBUTE = "bigDecimalAttribute";
-    private static final String LONG_ATTRIBUTE = "longAttribute";
-    private static final String LONG_OBJECT_ATTRIBUTE = "longObjectAttribute";
-    private static final String BYTE_ATTRIBUTE = "byteAttribute";
-    private static final String BYTE_OBJECT_ATTRIBUTE = "byteObjectAttribute";
-    private static final String BOOLEAN_ATTRIBUTE = "booleanAttribute";
-    private static final String BOOLEAN_OBJECT_ATTRIBUTE = "booleanObjectAttribute";
-    private static final String SHORT_ATTRIBUTE = "shortAttribute";
-    private static final String SHORT_OBJECT_ATTRIBUTE = "shortObjectAttribute";
-    private static final List<Map<String, AttributeValue>> attrs = new LinkedList<Map<String, AttributeValue>>();
-    // We don't start with the current system millis like other tests because
-    // it's out of the range of some data types
-    private static int start = 1;
-    private static int byteStart = -127;
-
-    // Test data
-    static {
-        for (int i = 0; i < 5; i++) {
-            Map<String, AttributeValue> attr = new HashMap<String, AttributeValue>();
-            attr.put(KEY_NAME, AttributeValue.builder().s("" + start++).build());
-            attr.put(INT_ATTRIBUTE, AttributeValue.builder().n("" + start++).build());
-            attr.put(INTEGER_ATTRIBUTE, AttributeValue.builder().n("" + start++).build());
-            attr.put(FLOAT_ATTRIBUTE, AttributeValue.builder().n("" + start++).build());
-            attr.put(FLOAT_OBJECT_ATTRIBUTE, AttributeValue.builder().n("" + start++).build());
-            attr.put(DOUBLE_ATTRIBUTE, AttributeValue.builder().n("" + start++).build());
-            attr.put(DOUBLE_OBJECT_ATTRIBUTE, AttributeValue.builder().n("" + start++).build());
-            attr.put(BIG_INTEGER_ATTRIBUTE, AttributeValue.builder().n("" + start++).build());
-            attr.put(BIG_DECIMAL_ATTRIBUTE, AttributeValue.builder().n("" + start++).build());
-            attr.put(LONG_ATTRIBUTE, AttributeValue.builder().n("" + start++).build());
-            attr.put(LONG_OBJECT_ATTRIBUTE, AttributeValue.builder().n("" + start++).build());
-            attr.put(BYTE_ATTRIBUTE, AttributeValue.builder().n("" + byteStart++).build());
-            attr.put(BYTE_OBJECT_ATTRIBUTE, AttributeValue.builder().n("" + byteStart++).build());
-            attr.put(BOOLEAN_ATTRIBUTE, AttributeValue.builder().n(start++ % 2 == 0 ? "1" : "0").build());
-            attr.put(BOOLEAN_OBJECT_ATTRIBUTE, AttributeValue.builder().n(start++ % 2 == 0 ? "1" : "0").build());
-            attr.put(SHORT_ATTRIBUTE, AttributeValue.builder().n("" + byteStart++).build());
-            attr.put(SHORT_OBJECT_ATTRIBUTE, AttributeValue.builder().n("" + byteStart++).build());
-            attrs.add(attr);
-        }
-    }
-
-    ;
-
-    @BeforeClass
-    public static void setUp() throws Exception {
-        DynamoDBMapperIntegrationTestBase.setUp();
-
-        // Insert the data
-        for (Map<String, AttributeValue> attr : attrs) {
-            dynamo.putItem(PutItemRequest.builder().tableName(TABLE_NAME).item(attr).build());
-        }
-    }
-
-    private NumberAttributeClass getKeyObject(String key) {
-        NumberAttributeClass obj = new NumberAttributeClass();
-        obj.setKey(key);
-        return obj;
-    }
-
-    @Test
-    public void testLoad() throws Exception {
-        DynamoDbMapper util = new DynamoDbMapper(dynamo);
-
-        for (Map<String, AttributeValue> attr : attrs) {
-            NumberAttributeClass x = util.load(getKeyObject(attr.get(KEY_NAME).s()));
-            assertEquals(x.getKey(), attr.get(KEY_NAME).s());
-
-            // Convert all numbers to the most inclusive type for easy comparison
-            assertEquals(x.getBigDecimalAttribute(), new BigDecimal(attr.get(BIG_DECIMAL_ATTRIBUTE).n()));
-            assertEquals(new BigDecimal(x.getBigIntegerAttribute()), new BigDecimal(attr.get(BIG_INTEGER_ATTRIBUTE).n()));
-            assertEquals(new BigDecimal(x.getFloatAttribute()), new BigDecimal(attr.get(FLOAT_ATTRIBUTE).n()));
-            assertEquals(new BigDecimal(x.getFloatObjectAttribute()), new BigDecimal(attr.get(FLOAT_OBJECT_ATTRIBUTE).n()));
-            assertEquals(new BigDecimal(x.getDoubleAttribute()), new BigDecimal(attr.get(DOUBLE_ATTRIBUTE).n()));
-            assertEquals(new BigDecimal(x.getDoubleObjectAttribute()), new BigDecimal(attr.get(DOUBLE_OBJECT_ATTRIBUTE).n()));
-            assertEquals(new BigDecimal(x.getIntAttribute()), new BigDecimal(attr.get(INT_ATTRIBUTE).n()));
-            assertEquals(new BigDecimal(x.getIntegerAttribute()), new BigDecimal(attr.get(INTEGER_ATTRIBUTE).n()));
-            assertEquals(new BigDecimal(x.getLongAttribute()), new BigDecimal(attr.get(LONG_ATTRIBUTE).n()));
-            assertEquals(new BigDecimal(x.getLongObjectAttribute()), new BigDecimal(attr.get(LONG_OBJECT_ATTRIBUTE).n()));
-            assertEquals(new BigDecimal(x.getByteAttribute()), new BigDecimal(attr.get(BYTE_ATTRIBUTE).n()));
-            assertEquals(new BigDecimal(x.getByteObjectAttribute()), new BigDecimal(attr.get(BYTE_OBJECT_ATTRIBUTE).n()));
-            assertEquals(new BigDecimal(x.getShortAttribute()), new BigDecimal(attr.get(SHORT_ATTRIBUTE).n()));
-            assertEquals(new BigDecimal(x.getShortObjectAttribute()), new BigDecimal(attr.get(SHORT_OBJECT_ATTRIBUTE).n()));
-            assertEquals(x.isBooleanAttribute(), attr.get(BOOLEAN_ATTRIBUTE).n().equals("1"));
-            assertEquals(x.getBooleanObjectAttribute(), attr.get(BOOLEAN_OBJECT_ATTRIBUTE).n().equals("1"));
-        }
-
-        // Test loading an object that doesn't exist
-        assertNull(util.load(getKeyObject("does not exist")));
-    }
-
-    @Test
-    public void testSave() throws Exception {
-        List<NumberAttributeClass> objs = new ArrayList<NumberAttributeClass>();
-        for (int i = 0; i < 5; i++) {
-            NumberAttributeClass obj = getUniqueObject();
-            objs.add(obj);
-        }
-
-        DynamoDbMapper util = new DynamoDbMapper(dynamo);
-        for (NumberAttributeClass obj : objs) {
-            util.save(obj);
-        }
-
-        for (NumberAttributeClass obj : objs) {
-            NumberAttributeClass loaded = util.load(obj);
-            loaded.setIgnored(obj.getIgnored());
-            assertEquals(obj, loaded);
-        }
-    }
-
-    @Test
-    public void testUpdate() throws Exception {
-        List<NumberAttributeClass> objs = new ArrayList<NumberAttributeClass>();
-        for (int i = 0; i < 5; i++) {
-            NumberAttributeClass obj = getUniqueObject();
-            objs.add(obj);
-        }
-
-        DynamoDbMapper util = new DynamoDbMapper(dynamo);
-        for (NumberAttributeClass obj : objs) {
-            util.save(obj);
-        }
-
-        for (NumberAttributeClass obj : objs) {
-            NumberAttributeClass replacement = getUniqueObject();
-            replacement.setKey(obj.getKey());
-            util.save(replacement);
-
-            NumberAttributeClass loadedObject = util.load(obj);
-
-            // The ignored attribute isn't handled by big bird, so we have to
-            // set it manually here before doing the comparison.
-            assertFalse(replacement.getIgnored().equals(loadedObject.getIgnored()));
-            loadedObject.setIgnored(replacement.getIgnored());
-            assertEquals(replacement, loadedObject);
-        }
-    }
-
-    /**
-     * Tests automatically setting a hash key upon saving.
-     */
-    @Test
-    public void testSetHashKey() throws Exception {
-        List<NumberAttributeClass> objs = new ArrayList<NumberAttributeClass>();
-        for (int i = 0; i < 5; i++) {
-            NumberAttributeClass obj = getUniqueObject();
-            obj.setKey(null);
-            objs.add(obj);
-        }
-
-        DynamoDbMapper util = new DynamoDbMapper(dynamo);
-        for (NumberAttributeClass obj : objs) {
-            assertNull(obj.getKey());
-            util.save(obj);
-            assertNotNull(obj.getKey());
-            NumberAttributeClass loadedObject = util.load(obj);
-
-            // The ignored attribute isn't handled by big bird, so we have to
-            // set it manually here before doing the comparison.
-            assertFalse(obj.getIgnored().equals(loadedObject.getIgnored()));
-            loadedObject.setIgnored(obj.getIgnored());
-            assertEquals(obj, loadedObject);
-        }
-    }
-
-    @Test
-    public void testDelete() throws Exception {
-        NumberAttributeClass obj = getUniqueObject();
-        DynamoDbMapper util = new DynamoDbMapper(dynamo);
-        util.save(obj);
-
-        NumberAttributeClass loaded = util.load(NumberAttributeClass.class, obj.getKey());
-        loaded.setIgnored(obj.getIgnored());
-        assertEquals(obj, loaded);
-
-        util.delete(obj);
-        assertNull(util.load(NumberAttributeClass.class, obj.getKey()));
-    }
-
-    @Test
-    public void performanceTest() throws Exception {
-        NumberAttributeClass obj = getUniqueObject();
-        DynamoDbMapper mapper = new DynamoDbMapper(dynamo);
-        mapper.save(obj);
-
-        GetItemResponse item = dynamo.getItem(GetItemRequest.builder().tableName("aws-java-sdk-util").key(
-                mapKey(KEY_NAME, AttributeValue.builder().s(obj.getKey()).build())).build());
-
-        long start = System.currentTimeMillis();
-        for (int i = 0; i < 10000; i++) {
-            mapper.marshallIntoObject(NumberAttributeClass.class, item.item());
-        }
-
-        long end = System.currentTimeMillis();
-
-        System.err.println("time: " + (end - start));
-    }
-
-    private NumberAttributeClass getUniqueObject() {
-        NumberAttributeClass obj = new NumberAttributeClass();
-        obj.setKey(String.valueOf(startKey++));
-        obj.setBigDecimalAttribute(new BigDecimal(startKey++));
-        obj.setBigIntegerAttribute(new BigInteger("" + startKey++));
-        obj.setByteAttribute((byte) byteStart++);
-        obj.setByteObjectAttribute(new Byte("" + byteStart++));
-        obj.setDoubleAttribute(new Double("" + start++));
-        obj.setDoubleObjectAttribute(new Double("" + start++));
-        obj.setFloatAttribute(new Float("" + start++));
-        obj.setFloatObjectAttribute(new Float("" + start++));
-        obj.setIntAttribute(new Integer("" + start++));
-        obj.setIntegerAttribute(new Integer("" + start++));
-        obj.setLongAttribute(new Long("" + start++));
-        obj.setLongObjectAttribute(new Long("" + start++));
-        obj.setShortAttribute(new Short("" + start++));
-        obj.setShortObjectAttribute(new Short("" + start++));
-        obj.setDateAttribute(new Date(startKey++));
-        obj.setBooleanAttribute(start++ % 2 == 0);
-        obj.setBooleanObjectAttribute(start++ % 2 == 0);
-        obj.setIgnored("" + start++);
-        Calendar cal = GregorianCalendar.getInstance();
-        cal.setTime(new Date(startKey++));
-        obj.setCalendarAttribute(cal);
-        return obj;
-    }
-
-
-}
diff --git a/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/SimpleStringAttributesIntegrationTest.java b/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/SimpleStringAttributesIntegrationTest.java
deleted file mode 100644
index f65fff6ffd7a..000000000000
--- a/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/SimpleStringAttributesIntegrationTest.java
+++ /dev/null
@@ -1,217 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.mapper;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import software.amazon.awssdk.services.dynamodb.DynamoDBMapperIntegrationTestBase;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbHashKey;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMapper;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMapperConfig;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMapperConfig.ConsistentRead;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMapperConfig.SaveBehavior;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbTable;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-import software.amazon.awssdk.services.dynamodb.model.PutItemRequest;
-import software.amazon.awssdk.services.dynamodb.pojos.StringAttributeClass;
-
-/**
- * Tests simple string attributes
- */
-public class SimpleStringAttributesIntegrationTest extends DynamoDBMapperIntegrationTestBase {
-
-    private static final String ORIGINAL_NAME_ATTRIBUTE = "originalName";
-    private static final String STRING_ATTRIBUTE = "stringAttribute";
-    private static final List<Map<String, AttributeValue>> attrs = new LinkedList<Map<String, AttributeValue>>();
-
-    // Test data
-    static {
-        for (int i = 0; i < 5; i++) {
-            Map<String, AttributeValue> attr = new HashMap<String, AttributeValue>();
-            attr.put(KEY_NAME, AttributeValue.builder().s("" + startKey++).build());
-            attr.put(STRING_ATTRIBUTE, AttributeValue.builder().s("" + startKey++).build());
-            attr.put(ORIGINAL_NAME_ATTRIBUTE, AttributeValue.builder().s("" + startKey++).build());
-            attrs.add(attr);
-        }
-    }
-
-    ;
-
-    @BeforeClass
-    public static void setUp() throws Exception {
-        DynamoDBMapperIntegrationTestBase.setUp();
-
-        // Insert the data
-        for (Map<String, AttributeValue> attr : attrs) {
-            dynamo.putItem(PutItemRequest.builder().tableName(TABLE_NAME).item(attr).build());
-        }
-    }
-
-    @Test
-    public void testLoad() throws Exception {
-        DynamoDbMapper util = new DynamoDbMapper(dynamo);
-
-        for (Map<String, AttributeValue> attr : attrs) {
-            StringAttributeClass x = util.load(StringAttributeClass.class, attr.get(KEY_NAME).s());
-            assertEquals(x.getKey(), attr.get(KEY_NAME).s());
-            assertEquals(x.getStringAttribute(), attr.get(STRING_ATTRIBUTE).s());
-            assertEquals(x.getRenamedAttribute(), attr.get(ORIGINAL_NAME_ATTRIBUTE).s());
-        }
-
-    }
-
-    @Test
-    public void testSave() {
-        List<StringAttributeClass> objs = new ArrayList<StringAttributeClass>();
-        for (int i = 0; i < 5; i++) {
-            StringAttributeClass obj = getUniqueObject();
-            objs.add(obj);
-        }
-
-        DynamoDbMapper util = new DynamoDbMapper(dynamo);
-        for (StringAttributeClass obj : objs) {
-            util.save(obj);
-        }
-
-        for (StringAttributeClass obj : objs) {
-            StringAttributeClass loaded = util.load(StringAttributeClass.class, obj.getKey());
-            assertEquals(obj, loaded);
-        }
-    }
-
-    /**
-     * Tests saving an incomplete object into DynamoDB
-     */
-    @Test
-    public void testIncompleteObject() {
-        StringAttributeClass obj = getUniqueObject();
-        obj.setStringAttribute(null);
-        DynamoDbMapper util = new DynamoDbMapper(dynamo);
-        util.save(obj);
-
-        assertEquals(obj, util.load(StringAttributeClass.class, obj.getKey()));
-
-        // test removing an attribute
-        assertNotNull(obj.getRenamedAttribute());
-        obj.setRenamedAttribute(null);
-        util.save(obj);
-        assertEquals(obj, util.load(StringAttributeClass.class, obj.getKey()));
-    }
-
-    @Test
-    public void testUpdate() {
-        List<StringAttributeClass> objs = new ArrayList<StringAttributeClass>();
-        for (int i = 0; i < 5; i++) {
-            StringAttributeClass obj = getUniqueObject();
-            objs.add(obj);
-        }
-
-        DynamoDbMapper util = new DynamoDbMapper(dynamo);
-        for (StringAttributeClass obj : objs) {
-            util.save(obj);
-        }
-
-        for (StringAttributeClass obj : objs) {
-            StringAttributeClass replacement = getUniqueObject();
-            replacement.setKey(obj.getKey());
-            util.save(replacement);
-
-            assertEquals(replacement, util.load(StringAttributeClass.class, obj.getKey()));
-        }
-    }
-
-    @Test
-    public void testSaveOnlyKey() {
-        KeyOnly obj = new KeyOnly();
-        obj.setKey("" + startKey++);
-        DynamoDbMapper mapper = new DynamoDbMapper(dynamo);
-        mapper.save(obj);
-
-        KeyOnly loaded = mapper.load(KeyOnly.class, obj.getKey(), new DynamoDbMapperConfig(
-                DynamoDbMapperConfig.ConsistentRead.CONSISTENT));
-        assertEquals(obj, loaded);
-
-        // saving again shouldn't be an error
-        mapper.save(obj);
-    }
-
-    @Test
-    public void testSaveOnlyKeyClobber() {
-        KeyOnly obj = new KeyOnly();
-        obj.setKey("" + startKey++);
-        DynamoDbMapper mapper = new DynamoDbMapper(dynamo);
-        mapper.save(obj, new DynamoDbMapperConfig(SaveBehavior.CLOBBER));
-
-        KeyOnly loaded = mapper.load(KeyOnly.class, obj.getKey(), new DynamoDbMapperConfig(ConsistentRead.CONSISTENT));
-        assertEquals(obj, loaded);
-
-        // saving again shouldn't be an error
-        mapper.save(obj, new DynamoDbMapperConfig(SaveBehavior.CLOBBER));
-    }
-
-    private StringAttributeClass getUniqueObject() {
-        StringAttributeClass obj = new StringAttributeClass();
-        obj.setKey(String.valueOf(startKey++));
-        obj.setRenamedAttribute(String.valueOf(startKey++));
-        obj.setStringAttribute(String.valueOf(startKey++));
-        return obj;
-    }
-
-    @DynamoDbTable(tableName = "aws-java-sdk-util")
-    public static final class KeyOnly {
-        private String key;
-
-        @DynamoDbHashKey
-        public String getKey() {
-            return key;
-        }
-
-        public void setKey(String key) {
-            this.key = key;
-        }
-
-        @Override
-        public boolean equals(Object obj) {
-            if (this == obj) {
-                return true;
-            }
-            if (obj == null) {
-                return false;
-            }
-            if (getClass() != obj.getClass()) {
-                return false;
-            }
-            KeyOnly other = (KeyOnly) obj;
-            if (key == null) {
-                if (other.key != null) {
-                    return false;
-                }
-            } else if (!key.equals(other.key)) {
-                return false;
-            }
-            return true;
-        }
-    }
-
-}
diff --git a/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/StringSetAttributesIntegrationTest.java b/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/StringSetAttributesIntegrationTest.java
deleted file mode 100644
index 0033006f1c81..000000000000
--- a/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/StringSetAttributesIntegrationTest.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.mapper;
-
-import static org.junit.Assert.assertEquals;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import software.amazon.awssdk.services.dynamodb.DynamoDBMapperIntegrationTestBase;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMapper;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-import software.amazon.awssdk.services.dynamodb.model.PutItemRequest;
-import software.amazon.awssdk.services.dynamodb.pojos.StringSetAttributeClass;
-
-
-/**
- * Tests string set attributes
- */
-public class StringSetAttributesIntegrationTest extends DynamoDBMapperIntegrationTestBase {
-
-    private static final String ORIGINAL_NAME_ATTRIBUTE = "originalName";
-    private static final String STRING_SET_ATTRIBUTE = "stringSetAttribute";
-    private static final String EXTRA_ATTRIBUTE = "extra";
-    private static final List<Map<String, AttributeValue>> attrs = new LinkedList<Map<String, AttributeValue>>();
-
-    // Test data
-    static {
-        for (int i = 0; i < 5; i++) {
-            Map<String, AttributeValue> attr = new HashMap<String, AttributeValue>();
-            attr.put(KEY_NAME, AttributeValue.builder().s("" + startKey++).build());
-            attr.put(STRING_SET_ATTRIBUTE, AttributeValue.builder().ss("" + ++startKey, "" + ++startKey, "" + ++startKey).build());
-            attr.put(ORIGINAL_NAME_ATTRIBUTE, AttributeValue.builder().ss("" + ++startKey, "" + ++startKey, "" + ++startKey).build());
-            attr.put(EXTRA_ATTRIBUTE, AttributeValue.builder().ss("" + ++startKey, "" + ++startKey, "" + ++startKey).build());
-            attrs.add(attr);
-        }
-    }
-
-    ;
-
-    @BeforeClass
-    public static void setUp() throws Exception {
-        DynamoDBMapperIntegrationTestBase.setUp();
-
-        // Insert the data
-        for (Map<String, AttributeValue> attr : attrs) {
-            dynamo.putItem(PutItemRequest.builder().tableName(TABLE_NAME).item(attr).build());
-        }
-    }
-
-    @Test
-    public void testLoad() throws Exception {
-        DynamoDbMapper util = new DynamoDbMapper(dynamo);
-
-        for (Map<String, AttributeValue> attr : attrs) {
-            StringSetAttributeClass x = util.load(StringSetAttributeClass.class, attr.get(KEY_NAME).s());
-            assertEquals(x.getKey(), attr.get(KEY_NAME).s());
-            assertSetsEqual(x.getStringSetAttribute(), toSet(attr.get(STRING_SET_ATTRIBUTE).ss()));
-            assertSetsEqual(x.getStringSetAttributeRenamed(), toSet(attr.get(ORIGINAL_NAME_ATTRIBUTE).ss()));
-        }
-    }
-
-    /**
-     * Tests saving only some attributes of an object.
-     */
-    @Test
-    public void testIncompleteObject() {
-        DynamoDbMapper util = new DynamoDbMapper(dynamo);
-
-        StringSetAttributeClass obj = getUniqueObject();
-        obj.setStringSetAttribute(null);
-        util.save(obj);
-
-        assertEquals(obj, util.load(StringSetAttributeClass.class, obj.getKey()));
-
-        obj.setStringSetAttributeRenamed(null);
-        util.save(obj);
-        assertEquals(obj, util.load(StringSetAttributeClass.class, obj.getKey()));
-    }
-
-    @Test
-    public void testSave() throws Exception {
-        List<StringSetAttributeClass> objs = new ArrayList<StringSetAttributeClass>();
-        for (int i = 0; i < 5; i++) {
-            StringSetAttributeClass obj = getUniqueObject();
-            objs.add(obj);
-        }
-
-        DynamoDbMapper util = new DynamoDbMapper(dynamo);
-        for (StringSetAttributeClass obj : objs) {
-            util.save(obj);
-        }
-
-        for (StringSetAttributeClass obj : objs) {
-            StringSetAttributeClass loaded = util.load(StringSetAttributeClass.class, obj.getKey());
-            assertEquals(obj, loaded);
-        }
-    }
-
-    @Test
-    public void testUpdate() throws Exception {
-        List<StringSetAttributeClass> objs = new ArrayList<StringSetAttributeClass>();
-        for (int i = 0; i < 5; i++) {
-            StringSetAttributeClass obj = getUniqueObject();
-            objs.add(obj);
-        }
-
-        DynamoDbMapper util = new DynamoDbMapper(dynamo);
-        for (StringSetAttributeClass obj : objs) {
-            util.save(obj);
-        }
-
-        for (StringSetAttributeClass obj : objs) {
-            StringSetAttributeClass replacement = getUniqueObject();
-            replacement.setKey(obj.getKey());
-            util.save(replacement);
-
-            assertEquals(replacement, util.load(StringSetAttributeClass.class, obj.getKey()));
-        }
-    }
-
-    private StringSetAttributeClass getUniqueObject() {
-        StringSetAttributeClass obj = new StringSetAttributeClass();
-        obj.setKey(String.valueOf(startKey++));
-        obj.setStringSetAttribute(toSet(String.valueOf(startKey++), String.valueOf(startKey++), String.valueOf(startKey++)));
-        obj.setStringSetAttributeRenamed(
-                toSet(String.valueOf(startKey++), String.valueOf(startKey++), String.valueOf(startKey++)));
-        return obj;
-    }
-
-}
diff --git a/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/TableMapperIntegrationTest.java b/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/TableMapperIntegrationTest.java
deleted file mode 100644
index da07c518f590..000000000000
--- a/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/TableMapperIntegrationTest.java
+++ /dev/null
@@ -1,459 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.mapper;
-
-import static org.junit.Assert.assertEquals;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Date;
-import java.util.List;
-import java.util.UUID;
-import org.junit.Test;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbAttribute;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbAutoGeneratedTimestamp;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbQueryExpression;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbTable;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbTableMapper;
-import software.amazon.awssdk.services.dynamodb.model.ConditionalCheckFailedException;
-import software.amazon.awssdk.services.dynamodb.pojos.AutoKeyAndVal;
-
-/**
- * Tests updating component attribute fields correctly.
- */
-public class TableMapperIntegrationTest extends AbstractKeyAndValIntegrationTestCase {
-
-    /**
-     * Test using {@code Date}.
-     */
-    @Test
-    public void testSaveIfNotExists() {
-        final DynamoDbTableMapper<KeyAndDateValue, String, ?> mapper = util.newTableMapper(KeyAndDateValue.class);
-
-        final KeyAndDateValue object = new KeyAndDateValue();
-
-        mapper.saveIfNotExists(object);
-    }
-
-    /**
-     * Test using {@code Date}.
-     */
-    @Test(expected = ConditionalCheckFailedException.class)
-    public void testSaveIfNotExistsWhenExists() {
-        final DynamoDbTableMapper<KeyAndDateValue, String, ?> mapper = util.newTableMapper(KeyAndDateValue.class);
-
-        final KeyAndDateValue object = new KeyAndDateValue();
-
-        mapper.saveIfNotExists(object);
-        mapper.saveIfNotExists(object);
-    }
-
-    /**
-     * Test using {@code Date}.
-     */
-    @Test
-    public void testSaveWhenExists() {
-        final DynamoDbTableMapper<KeyAndDateValue, String, ?> mapper = util.newTableMapper(KeyAndDateValue.class);
-
-        final KeyAndDateValue object = new KeyAndDateValue();
-
-        mapper.saveIfNotExists(object);
-        mapper.save(object);
-    }
-
-    /**
-     * Test using {@code Date}.
-     */
-    @Test(expected = ConditionalCheckFailedException.class)
-    public void testSaveIfExistsWhenNotExists() {
-        final DynamoDbTableMapper<KeyAndDateValue, String, ?> mapper = util.newTableMapper(KeyAndDateValue.class);
-
-        final KeyAndDateValue object = new KeyAndDateValue();
-        object.setKey(UUID.randomUUID().toString());
-
-        mapper.saveIfExists(object);
-    }
-
-    /**
-     * Test using {@code Date}.
-     */
-    @Test
-    public void testDeleteIfExistsWhenExists() {
-        final DynamoDbTableMapper<KeyAndDateValue, String, ?> mapper = util.newTableMapper(KeyAndDateValue.class);
-
-        final KeyAndDateValue object = new KeyAndDateValue();
-
-        mapper.saveIfNotExists(object);
-        mapper.deleteIfExists(object);
-    }
-
-    /**
-     * Test using {@code Date}.
-     */
-    @Test(expected = ConditionalCheckFailedException.class)
-    public void testDeleteIfExistsWhenNotExists() {
-        final DynamoDbTableMapper<KeyAndDateValue, String, ?> mapper = util.newTableMapper(KeyAndDateValue.class);
-
-        final KeyAndDateValue object = new KeyAndDateValue();
-        object.setKey(UUID.randomUUID().toString());
-
-        mapper.deleteIfExists(object);
-    }
-
-    /**
-     * Test batch load with no results.
-     */
-    @Test
-    public void testBatchLoadItemList() {
-        final DynamoDbTableMapper<KeyAndDateValue, String, ?> mapper = util.newTableMapper(KeyAndDateValue.class);
-
-        final KeyAndDateValue object1 = new KeyAndDateValue();
-        final KeyAndDateValue object2 = new KeyAndDateValue();
-
-        assertEquals(0, mapper.batchSave(Arrays.asList(object1, object2)).size());
-        assertEquals(2, mapper.batchLoad(Arrays.asList(object1, object2)).size());
-        assertEquals(0, mapper.batchDelete(Arrays.asList(object1, object2)).size());
-        assertEquals(0, mapper.batchLoad(Arrays.asList(object1, object2)).size());
-    }
-
-    /**
-     * Test batch load with no results.
-     */
-    @Test
-    public void testBatchLoadItemListOnNull() {
-        final DynamoDbTableMapper<KeyAndDateValue, String, ?> mapper = util.newTableMapper(KeyAndDateValue.class);
-
-        assertEquals(0, mapper.batchLoad((List<KeyAndDateValue>) null).size());
-    }
-
-    /**
-     * Test batch load with no results.
-     */
-    @Test
-    public void testBatchLoadItemListOnEmpty() {
-        final DynamoDbTableMapper<KeyAndDateValue, String, ?> mapper = util.newTableMapper(KeyAndDateValue.class);
-
-        assertEquals(0, mapper.batchLoad(Collections.<KeyAndDateValue>emptyList()).size());
-    }
-
-    /**
-     * Test a query.
-     */
-    @Test
-    public void testQueryCount() {
-        final DynamoDbTableMapper<KeyAndDateValue, String, ?> mapper = util.newTableMapper(KeyAndDateValue.class);
-
-        final KeyAndDateValue object = new KeyAndDateValue();
-        object.setQueryDate(new Date());
-
-        mapper.saveIfNotExists(object);
-
-        assertEquals(1, mapper.count(new DynamoDbQueryExpression<KeyAndDateValue>()
-                                             .withHashKeyValues(object).withConsistentRead(true)));
-    }
-
-    /**
-     * Test a query.
-     */
-    @Test
-    public void testQueryBeginsWith() {
-        final DynamoDbTableMapper<KeyAndDateValue, String, ?> mapper = util.newTableMapper(KeyAndDateValue.class);
-
-        final KeyAndDateValue object = new KeyAndDateValue();
-        object.setQueryDate(new Date());
-
-        mapper.saveIfNotExists(object);
-
-        assertEquals(1, mapper.queryPage(new DynamoDbQueryExpression<KeyAndDateValue>()
-                                                 .withHashKeyValues(object).withConsistentRead(true)
-                                                 .withQueryFilterEntry("queryDate", mapper.field("queryDate")
-                                                                                          .beginsWith(object.getQueryDate()))
-                                        ).getResults().size());
-    }
-
-    /**
-     * Test a query.
-     */
-    @Test
-    public void testQueryBetween() {
-        final DynamoDbTableMapper<KeyAndDateValue, String, ?> mapper = util.newTableMapper(KeyAndDateValue.class);
-
-        final KeyAndDateValue object = new KeyAndDateValue();
-        object.setQueryDate(new Date());
-
-        mapper.saveIfNotExists(object);
-
-        assertEquals(1, mapper.queryPage(new DynamoDbQueryExpression<KeyAndDateValue>()
-                                                 .withHashKeyValues(object).withConsistentRead(true)
-                                                 .withQueryFilterEntry("queryDate", mapper.field("queryDate")
-                                                                                          .between(object.getQueryDate(), object.getQueryDate()))
-                                        ).getResults().size());
-    }
-
-    /**
-     * Test a query.
-     */
-    @Test
-    public void testQueryGreaterThanOrEqualTo() {
-        final DynamoDbTableMapper<KeyAndDateValue, String, ?> mapper = util.newTableMapper(KeyAndDateValue.class);
-
-        final KeyAndDateValue object = new KeyAndDateValue();
-        object.setQueryDate(new Date());
-
-        mapper.saveIfNotExists(object);
-
-        assertEquals(1, mapper.queryPage(new DynamoDbQueryExpression<KeyAndDateValue>()
-                                                 .withHashKeyValues(object).withConsistentRead(true)
-                                                 .withQueryFilterEntry("queryDate",
-                                                                       mapper.field("queryDate").ge(object.getQueryDate()))
-                                        ).getResults().size());
-    }
-
-    /**
-     * Test a query.
-     */
-    @Test
-    public void testQueryGreaterThan() {
-        final DynamoDbTableMapper<KeyAndDateValue, String, ?> mapper = util.newTableMapper(KeyAndDateValue.class);
-
-        final KeyAndDateValue object = new KeyAndDateValue();
-        object.setQueryDate(new Date());
-
-        mapper.saveIfNotExists(object);
-
-        assertEquals(0, mapper.queryPage(new DynamoDbQueryExpression<KeyAndDateValue>()
-                                                 .withHashKeyValues(object).withConsistentRead(true)
-                                                 .withQueryFilterEntry("queryDate",
-                                                                       mapper.field("queryDate").gt(object.getQueryDate()))
-                                        ).getResults().size());
-    }
-
-    /**
-     * Test a query.
-     */
-    @Test
-    public void testQueryEqualTo() {
-        final DynamoDbTableMapper<KeyAndDateValue, String, ?> mapper = util.newTableMapper(KeyAndDateValue.class);
-
-        final KeyAndDateValue object = new KeyAndDateValue();
-        object.setQueryDate(new Date());
-
-        mapper.saveIfNotExists(object);
-
-        assertEquals(1, mapper.queryPage(new DynamoDbQueryExpression<KeyAndDateValue>()
-                                                 .withHashKeyValues(object).withConsistentRead(true)
-                                                 .withQueryFilterEntry("queryDate",
-                                                                       mapper.field("queryDate").eq(object.getQueryDate()))
-                                        ).getResults().size());
-    }
-
-    /**
-     * Test a query.
-     */
-    @Test
-    public void testQueryIn() {
-        final DynamoDbTableMapper<KeyAndDateValue, String, ?> mapper = util.newTableMapper(KeyAndDateValue.class);
-
-        final KeyAndDateValue object = new KeyAndDateValue();
-        object.setQueryDate(new Date());
-
-        mapper.saveIfNotExists(object);
-
-        assertEquals(1, mapper.queryPage(new DynamoDbQueryExpression<KeyAndDateValue>()
-                                                 .withHashKeyValues(object).withConsistentRead(true)
-                                                 .withQueryFilterEntry("queryDate",
-                                                                       mapper.field("queryDate").in(object.getQueryDate()))
-                                        ).getResults().size());
-    }
-
-    /**
-     * Test a query.
-     */
-    @Test
-    public void testQueryIsNull() {
-        final DynamoDbTableMapper<KeyAndDateValue, String, ?> mapper = util.newTableMapper(KeyAndDateValue.class);
-
-        final KeyAndDateValue object = new KeyAndDateValue();
-        object.setQueryDate(new Date());
-
-        mapper.saveIfNotExists(object);
-
-        assertEquals(0, mapper.queryPage(new DynamoDbQueryExpression<KeyAndDateValue>()
-                                                 .withHashKeyValues(object).withConsistentRead(true)
-                                                 .withQueryFilterEntry("queryDate", mapper.field("queryDate").isNull())
-                                        ).getResults().size());
-    }
-
-    /**
-     * Test a query.
-     */
-    @Test
-    public void testQueryLessThanOrEqualTo() {
-        final DynamoDbTableMapper<KeyAndDateValue, String, ?> mapper = util.newTableMapper(KeyAndDateValue.class);
-
-        final KeyAndDateValue object = new KeyAndDateValue();
-        object.setQueryDate(new Date());
-
-        mapper.saveIfNotExists(object);
-
-        assertEquals(1, mapper.queryPage(new DynamoDbQueryExpression<KeyAndDateValue>()
-                                                 .withHashKeyValues(object).withConsistentRead(true)
-                                                 .withQueryFilterEntry("queryDate",
-                                                                       mapper.field("queryDate").le(object.getQueryDate()))
-                                        ).getResults().size());
-    }
-
-    /**
-     * Test a query.
-     */
-    @Test
-    public void testQueryLessThan() {
-        final DynamoDbTableMapper<KeyAndDateValue, String, ?> mapper = util.newTableMapper(KeyAndDateValue.class);
-
-        final KeyAndDateValue object = new KeyAndDateValue();
-        object.setQueryDate(new Date());
-
-        mapper.saveIfNotExists(object);
-
-        assertEquals(0, mapper.queryPage(new DynamoDbQueryExpression<KeyAndDateValue>()
-                                                 .withHashKeyValues(object).withConsistentRead(true)
-                                                 .withQueryFilterEntry("queryDate",
-                                                                       mapper.field("queryDate").lt(object.getQueryDate()))
-                                        ).getResults().size());
-    }
-
-    /**
-     * Test a query.
-     */
-    @Test
-    public void testQueryNotEqualTo() {
-        final DynamoDbTableMapper<KeyAndDateValue, String, ?> mapper = util.newTableMapper(KeyAndDateValue.class);
-
-        final KeyAndDateValue object = new KeyAndDateValue();
-        object.setQueryDate(new Date());
-
-        mapper.saveIfNotExists(object);
-
-        assertEquals(0, mapper.queryPage(new DynamoDbQueryExpression<KeyAndDateValue>()
-                                                 .withHashKeyValues(object).withConsistentRead(true)
-                                                 .withQueryFilterEntry("queryDate",
-                                                                       mapper.field("queryDate").ne(object.getQueryDate()))
-                                        ).getResults().size());
-    }
-
-    /**
-     * Test a query.
-     */
-    @Test
-    public void testQueryNotNull() {
-        final DynamoDbTableMapper<KeyAndDateValue, String, ?> mapper = util.newTableMapper(KeyAndDateValue.class);
-
-        final KeyAndDateValue object = new KeyAndDateValue();
-        object.setQueryDate(new Date());
-
-        mapper.saveIfNotExists(object);
-
-        assertEquals(1, mapper.queryPage(new DynamoDbQueryExpression<KeyAndDateValue>()
-                                                 .withHashKeyValues(object).withConsistentRead(true)
-                                                 .withQueryFilterEntry("queryDate", mapper.field("queryDate").notNull())
-                                        ).getResults().size());
-    }
-
-    /**
-     * Test a query.
-     */
-    @Test
-    public void testQueryAnyBetween() {
-        final DynamoDbTableMapper<KeyAndDateValue, String, ?> mapper = util.newTableMapper(KeyAndDateValue.class);
-
-        final KeyAndDateValue object = new KeyAndDateValue();
-        object.setQueryDate(new Date());
-
-        mapper.saveIfNotExists(object);
-
-        assertEquals(1, mapper.queryPage(new DynamoDbQueryExpression<KeyAndDateValue>()
-                                                 .withHashKeyValues(object).withConsistentRead(true)
-                                                 .withQueryFilterEntry("queryDate", mapper.field("queryDate")
-                                                                                          .betweenAny(object.getQueryDate(), object.getQueryDate()))
-                                        ).getResults().size());
-    }
-
-    /**
-     * Test a query.
-     */
-    @Test
-    public void testQueryAnyBetweenLoNull() {
-        final DynamoDbTableMapper<KeyAndDateValue, String, ?> mapper = util.newTableMapper(KeyAndDateValue.class);
-
-        final KeyAndDateValue object = new KeyAndDateValue();
-        object.setQueryDate(new Date());
-
-        mapper.saveIfNotExists(object);
-
-        assertEquals(1, mapper.queryPage(new DynamoDbQueryExpression<KeyAndDateValue>()
-                                                 .withHashKeyValues(object).withConsistentRead(true)
-                                                 .withQueryFilterEntry("queryDate", mapper.field("queryDate")
-                                                                                          .betweenAny(null, object.getQueryDate()))
-                                        ).getResults().size());
-    }
-
-    /**
-     * Test a query.
-     */
-    @Test
-    public void testQueryAnyBetweenHiNull() {
-        final DynamoDbTableMapper<KeyAndDateValue, String, ?> mapper = util.newTableMapper(KeyAndDateValue.class);
-
-        final KeyAndDateValue object = new KeyAndDateValue();
-        object.setQueryDate(new Date());
-
-        mapper.saveIfNotExists(object);
-
-        assertEquals(1, mapper.queryPage(new DynamoDbQueryExpression<KeyAndDateValue>()
-                                                 .withHashKeyValues(object).withConsistentRead(true)
-                                                 .withQueryFilterEntry("queryDate", mapper.field("queryDate")
-                                                                                          .betweenAny(object.getQueryDate(), null))
-                                        ).getResults().size());
-    }
-
-    /**
-     * An object with {@code Date}.
-     */
-    @DynamoDbTable(tableName = "aws-java-sdk-util")
-    public static class KeyAndDateValue extends AutoKeyAndVal<Date> {
-        private Date queryDate;
-
-        @DynamoDbAutoGeneratedTimestamp
-        public Date getVal() {
-            return super.getVal();
-        }
-
-        @Override
-        public void setVal(final Date val) {
-            super.setVal(val);
-        }
-
-        @DynamoDbAttribute(attributeName = "queryDate")
-        public Date getQueryDate() {
-            return this.queryDate;
-        }
-
-        public void setQueryDate(final Date queryDate) {
-            this.queryDate = queryDate;
-        }
-    }
-
-}
diff --git a/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/TypeConvertedJsonIntegrationTest.java b/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/TypeConvertedJsonIntegrationTest.java
deleted file mode 100644
index 55b483691315..000000000000
--- a/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/TypeConvertedJsonIntegrationTest.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.mapper;
-
-import static org.junit.Assert.assertNotNull;
-
-import java.util.ArrayList;
-import java.util.List;
-import org.junit.Test;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbTable;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbTypeConvertedJson;
-import software.amazon.awssdk.services.dynamodb.pojos.AutoKeyAndVal;
-import software.amazon.awssdk.services.dynamodb.pojos.Currency;
-
-/**
- * Integration tests for {@code DynamoDBTypeConvertedJson}.
- */
-public class TypeConvertedJsonIntegrationTest extends AbstractKeyAndValIntegrationTestCase {
-
-    /**
-     * Test marshalling.
-     */
-    @Test
-    public void testMarshalling() {
-        final KeyAndCurrency object = new KeyAndCurrency();
-        object.setVal(new Currency(12.95D, "USD"));
-        assertBeforeAndAfterChange(false, object);
-    }
-
-    /**
-     * Test marshalling a list.
-     */
-    @Test
-    public void testListMarshalling() {
-        final KeyAndCurrencyList object = new KeyAndCurrencyList();
-        object.setVal(new ArrayList<Currency>());
-        object.getVal().add(new Currency(1.99D, "CAD"));
-        object.getVal().add(new Currency(2.99D, "CAD"));
-
-        final List<Currency> after = assertBeforeAndAfterChange(false, object);
-        for (final Currency currency : after) {
-            assertNotNull(currency.getAmount());
-            assertNotNull(currency.getUnit());
-        }
-    }
-
-    /**
-     * An object with a complex type.
-     */
-    @DynamoDbTable(tableName = "aws-java-sdk-util")
-    public static class KeyAndCurrency extends AutoKeyAndVal<Currency> {
-        @DynamoDbTypeConvertedJson
-        public Currency getVal() {
-            return super.getVal();
-        }
-
-        @Override
-        public void setVal(final Currency val) {
-            super.setVal(val);
-        }
-    }
-
-    /**
-     * An object with a complex type.
-     */
-    @DynamoDbTable(tableName = "aws-java-sdk-util")
-    public static class KeyAndCurrencyList extends AutoKeyAndVal<List<Currency>> {
-        @DynamoDbTypeConvertedJson(targetType = CurrencyListType.class)
-        public List<Currency> getVal() {
-            return super.getVal();
-        }
-
-        @Override
-        public void setVal(final List<Currency> val) {
-            super.setVal(val);
-        }
-
-        public static final class CurrencyListType extends ArrayList<Currency> {
-        }
-    }
-
-}
diff --git a/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/TypeConvertedTimestampIntegrationTest.java b/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/TypeConvertedTimestampIntegrationTest.java
deleted file mode 100644
index 4a1109a992ba..000000000000
--- a/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/TypeConvertedTimestampIntegrationTest.java
+++ /dev/null
@@ -1,312 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.mapper;
-
-import java.time.format.DateTimeParseException;
-import java.util.Calendar;
-import java.util.Date;
-import org.junit.Ignore;
-import org.junit.Test;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMappingException;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbTable;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbTypeConvertedTimestamp;
-import software.amazon.awssdk.services.dynamodb.pojos.AutoKeyAndVal;
-
-/**
- * Tests updating component attribute fields correctly.
- */
-public class TypeConvertedTimestampIntegrationTest extends AbstractKeyAndValIntegrationTestCase {
-
-    /**
-     * Test timestamp formatting.
-     */
-    @Test
-    public void testCalendarTimestamp() throws Exception {
-        final KeyAndCalendarTimestamp object = new KeyAndCalendarTimestamp();
-        object.setVal(Calendar.getInstance());
-        assertBeforeAndAfterChange(false, object);
-    }
-
-    /**
-     * Test timestamp formatting.
-     */
-    @Test
-    public void testCalendarTimestampNull() {
-        final KeyAndCalendarTimestamp object = new KeyAndCalendarTimestamp();
-        assertBeforeAndAfterChange(false, object);
-    }
-
-    /**
-     * Test timestamp formatting.
-     */
-    @Test
-    public void testDateTimestamp() throws Exception {
-        final KeyAndDateTimestamp object = new KeyAndDateTimestamp();
-        object.setVal(Calendar.getInstance().getTime());
-        assertBeforeAndAfterChange(false, object);
-    }
-
-    /**
-     * Test timestamp formatting.
-     */
-    @Test
-    public void testDateTimestampNull() {
-        final KeyAndDateTimestamp object = new KeyAndDateTimestamp();
-        assertBeforeAndAfterChange(false, object);
-    }
-
-    /**
-     * Test timestamp formatting.
-     */
-    @Test
-    public void testLongTimestamp() throws Exception {
-        final KeyAndLongTimestamp object = new KeyAndLongTimestamp();
-        object.setVal(Calendar.getInstance().getTime().getTime());
-        assertBeforeAndAfterChange(false, object);
-    }
-
-    /**
-     * Test timestamp formatting.
-     */
-    @Test
-    public void testLongTimestampNull() {
-        final KeyAndLongTimestamp object = new KeyAndLongTimestamp();
-        assertBeforeAndAfterChange(false, object);
-    }
-
-    /**
-     * Test timestamp formatting.
-     */
-    @Test
-    public void testEstCalendarTimestamp() throws Exception {
-        final KeyAndEstCalendarTimestamp object = new KeyAndEstCalendarTimestamp();
-        object.setVal(Calendar.getInstance());
-        assertBeforeAndAfterChange(false, object);
-    }
-
-    /**
-     * Test timestamp formatting.
-     */
-    @Test
-    public void testEstDateTimestamp() {
-        final KeyAndEstDateTimestamp object = new KeyAndEstDateTimestamp();
-        object.setVal(Calendar.getInstance().getTime());
-        assertBeforeAndAfterChange(false, object);
-    }
-
-    /**
-     * Test timestamp formatting.
-     */
-    @Test
-    public void testEstLongTimestamp() {
-        final KeyAndEstLongTimestamp object = new KeyAndEstLongTimestamp();
-        object.setVal(Calendar.getInstance().getTime().getTime());
-        assertBeforeAndAfterChange(false, object);
-    }
-
-    /**
-     * Test timestamp formatting.
-     */
-    @Test(expected = DateTimeParseException.class)
-    public void testStringNotTimestamp() {
-        final KeyAndStringTimestamp object = new KeyAndStringTimestamp();
-        object.setVal("NotTimestamp");
-        assertBeforeAndAfterChange(false, object);
-    }
-
-    /**
-     * Test timestamp formatting.
-     */
-    @Test(expected = DynamoDbMappingException.class)
-    @Ignore("This behavior is different with the java.time classes because you can construct a formatter using an empty "
-            + "string as a pattern.")
-    public void testEmptyPattern() throws Exception {
-        final KeyAndEmptyPattern object = new KeyAndEmptyPattern();
-        object.setVal(Calendar.getInstance().getTime());
-        assertBeforeAndAfterChange(false, object);
-    }
-
-    /**
-     * Test timestamp formatting.
-     */
-    @Test(expected = DynamoDbMappingException.class)
-    public void testInvalidPattern() throws Exception {
-        final KeyAndInvalidPattern object = new KeyAndInvalidPattern();
-        object.setVal(Calendar.getInstance().getTime());
-        assertBeforeAndAfterChange(false, object);
-    }
-
-    /**
-     * An object with {@code Calendar}.
-     */
-    @DynamoDbTable(tableName = "aws-java-sdk-util")
-    public static class KeyAndCalendarTimestamp extends AutoKeyAndVal<Calendar> {
-        @DynamoDbTypeConvertedTimestamp(pattern = "yyyy MMddHHmmssSSSz")
-        public Calendar getVal() {
-            return super.getVal();
-        }
-
-        @Override
-        public void setVal(final Calendar val) {
-            super.setVal(val);
-        }
-    }
-
-    /**
-     * An object with {@code Date}.
-     */
-    @DynamoDbTable(tableName = "aws-java-sdk-util")
-    public static class KeyAndDateTimestamp extends AutoKeyAndVal<Date> {
-        @DynamoDbTypeConvertedTimestamp(pattern = "yyyy MMddHHmmssSSSz")
-        public Date getVal() {
-            return super.getVal();
-        }
-
-        @Override
-        public void setVal(final Date val) {
-            super.setVal(val);
-        }
-    }
-
-    /**
-     * An object with {@code Long}.
-     */
-    @DynamoDbTable(tableName = "aws-java-sdk-util")
-    public static class KeyAndLongTimestamp extends AutoKeyAndVal<Long> {
-        @DynamoDbTypeConvertedTimestamp(pattern = "yyyy MMddHHmmssSSSz")
-        public Long getVal() {
-            return super.getVal();
-        }
-
-        @Override
-        public void setVal(final Long val) {
-            super.setVal(val);
-        }
-    }
-
-    /**
-     * An object with {@code Calendar}.
-     */
-    @DynamoDbTable(tableName = "aws-java-sdk-util")
-    public static class KeyAndEstCalendarTimestamp extends AutoKeyAndVal<Calendar> {
-        @DynamoDbTypeConvertedTimestamp(pattern = "yyyy MMddHHmmssSSSz", timeZone = "America/New_York")
-        public Calendar getVal() {
-            return super.getVal();
-        }
-
-        @Override
-        public void setVal(final Calendar val) {
-            super.setVal(val);
-        }
-    }
-
-    /**
-     * An object with {@code Date}.
-     */
-    @DynamoDbTable(tableName = "aws-java-sdk-util")
-    public static class KeyAndEstDateTimestamp extends AutoKeyAndVal<Date> {
-        @DynamoDbTypeConvertedTimestamp(pattern = "yyyy MMddHHmmssSSSz", timeZone = "America/New_York")
-        public Date getVal() {
-            return super.getVal();
-        }
-
-        @Override
-        public void setVal(final Date val) {
-            super.setVal(val);
-        }
-    }
-
-    /**
-     * An object with {@code Long}.
-     */
-    @DynamoDbTable(tableName = "aws-java-sdk-util")
-    public static class KeyAndEstLongTimestamp extends AutoKeyAndVal<Long> {
-        @DynamoDbTypeConvertedTimestamp(pattern = "yyyy MMddHHmmssSSSz", timeZone = "America/New_York")
-        public Long getVal() {
-            return super.getVal();
-        }
-
-        @Override
-        public void setVal(final Long val) {
-            super.setVal(val);
-        }
-    }
-
-    /**
-     * An object with {@code String}.
-     */
-    @DynamoDbTable(tableName = "aws-java-sdk-util")
-    public static class KeyAndStringTimestamp extends AutoKeyAndVal<String> {
-        @DynamoDbTypeConvertedTimestamp(pattern = "yyyy MMddHHmmssSSSz")
-        public String getVal() {
-            return super.getVal();
-        }
-
-        @Override
-        public void setVal(final String val) {
-            super.setVal(val);
-        }
-    }
-
-    /**
-     * An object with {@code Date}.
-     */
-    @DynamoDbTable(tableName = "aws-java-sdk-util")
-    public static class KeyAndEmptyPattern extends KeyAndDateTimestamp {
-        @DynamoDbTypeConvertedTimestamp(pattern = "")
-        public Date getVal() {
-            return super.getVal();
-        }
-
-        @Override
-        public void setVal(final Date val) {
-            super.setVal(val);
-        }
-    }
-
-    /**
-     * An object with {@code Date}.
-     */
-    @DynamoDbTable(tableName = "aws-java-sdk-util")
-    public static class KeyAndEmptyTimeZone extends KeyAndDateTimestamp {
-        @DynamoDbTypeConvertedTimestamp(pattern = "yyyy MMddHHmmssSSSz", timeZone = "")
-        public Date getVal() {
-            return super.getVal();
-        }
-
-        @Override
-        public void setVal(final Date val) {
-            super.setVal(val);
-        }
-    }
-
-    /**
-     * An object with {@code Date}.
-     */
-    @DynamoDbTable(tableName = "aws-java-sdk-util")
-    public static class KeyAndInvalidPattern extends KeyAndDateTimestamp {
-        @DynamoDbTypeConvertedTimestamp(pattern = "invalid")
-        public Date getVal() {
-            return super.getVal();
-        }
-
-        @Override
-        public void setVal(final Date val) {
-            super.setVal(val);
-        }
-    }
-
-}
diff --git a/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/TypeConverterIntegrationTest.java b/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/TypeConverterIntegrationTest.java
deleted file mode 100644
index e11f8a17dcdd..000000000000
--- a/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/TypeConverterIntegrationTest.java
+++ /dev/null
@@ -1,343 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.mapper;
-
-import static org.junit.Assert.assertEquals;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
-import org.junit.Test;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMappingException;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbTable;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbTypeConverted;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbTypeConverter;
-import software.amazon.awssdk.services.dynamodb.pojos.AutoKeyAndVal;
-import software.amazon.awssdk.services.dynamodb.pojos.Currency;
-
-/**
- * Tests updating component attribute fields correctly.
- */
-public class TypeConverterIntegrationTest extends AbstractKeyAndValIntegrationTestCase {
-
-    /**
-     * Test using {@code Currency}.
-     */
-    @Test
-    public void testStringCurrency() {
-        final KeyAndStringCurrency object = new KeyAndStringCurrency();
-        object.setVal(new Currency(79.99D, "CAD"));
-        assertBeforeAndAfterChange(false, object);
-    }
-
-    /**
-     * Test using {@code Currency}.
-     */
-    @Test
-    public void testStringCurrencyNull() {
-        final KeyAndStringCurrency object = new KeyAndStringCurrency();
-        assertBeforeAndAfterChange(false, object);
-    }
-
-    /**
-     * Test using {@code Currency}.
-     */
-    @Test(expected = DynamoDbMappingException.class) //<- does not yet support lists/maps
-    public void testCurrency() {
-        final KeyAndCurrency object = new KeyAndCurrency();
-        object.setVal(new Currency(69.99D, "CAD"));
-        assertBeforeAndAfterChange(false, object);
-    }
-
-    /**
-     * Test using {@code Currency}.
-     */
-    @Test
-    public void testStringSetCurrency() {
-        final KeyAndStringSetCurrency object = new KeyAndStringSetCurrency();
-        object.setVal(new HashSet<Currency>(Arrays.asList(new Currency(4.99D, "USD"), new Currency(5.99D, "USD"))));
-        assertBeforeAndAfterChange(false, object);
-    }
-
-    /**
-     * Test using {@code Currency}.
-     */
-    @Test
-    public void testStringSetCurrencyNull() {
-        final KeyAndStringSetCurrency object = new KeyAndStringSetCurrency();
-        assertBeforeAndAfterChange(false, object);
-    }
-
-    /**
-     * Test using {@code Currency}.
-     */
-    @Test
-    public void testDoubleCurrency() {
-        final KeyAndDoubleCurrency object = new KeyAndDoubleCurrency();
-        object.setVal(new Currency(99.99D, "CAD"));
-
-        final Currency currency = assertBeforeAndAfterChange(null, object);
-        assertEquals(object.getVal().getAmount(), currency.getAmount());
-        assertEquals("USD", currency.getUnit());
-    }
-
-    /**
-     * Test using {@code Currency}.
-     */
-    @Test
-    public void testDoubleCurrencyNull() {
-        final KeyAndDoubleCurrency object = new KeyAndDoubleCurrency();
-        assertBeforeAndAfterChange(false, object);
-    }
-
-    /**
-     * Test using {@code Currency}.
-     */
-    @Test
-    public void testDoubleSetCurrency() {
-        final KeyAndDoubleSetCurrency object = new KeyAndDoubleSetCurrency();
-        object.setVal(new HashSet<Currency>(Arrays.asList(new Currency(28.99D, "USD"), new Currency(29.99D, "USD"))));
-        assertBeforeAndAfterChange(false, object);
-    }
-
-    /**
-     * Test using {@code Currency}.
-     */
-    @Test
-    public void testDoubleSetCurrencyNull() {
-        final KeyAndDoubleSetCurrency object = new KeyAndDoubleSetCurrency();
-        assertBeforeAndAfterChange(false, object);
-    }
-
-    /**
-     * An object with {@code Currency}.
-     */
-    @DynamoDbTable(tableName = "aws-java-sdk-util")
-    public static class KeyAndStringCurrency extends AutoKeyAndVal<Currency> {
-        @CurrencyFormat(separator = "-")
-        public Currency getVal() {
-            return super.getVal();
-        }
-
-        @Override
-        public void setVal(final Currency val) {
-            super.setVal(val);
-        }
-
-        @DynamoDbTypeConverted(converter = StringCurrencyConverter.class)
-        @Retention(RetentionPolicy.RUNTIME)
-        @Target({ElementType.METHOD, ElementType.TYPE})
-        public static @interface CurrencyFormat {
-            String separator() default " ";
-        }
-
-        public static final class StringCurrencyConverter implements DynamoDbTypeConverter<String, Currency> {
-            private final CurrencyFormat f;
-
-            public StringCurrencyConverter(final Class<Currency> targetType, final CurrencyFormat f) {
-                this.f = f;
-            }
-
-            @Override
-            public String convert(final Currency object) {
-                return new StringBuilder().append(object.getAmount()).append(f.separator()).append(object.getUnit()).toString();
-            }
-
-            @Override
-            public Currency unconvert(final String object) {
-                final String[] splits = object.split(f.separator());
-                return new Currency(Double.valueOf(splits[0]), splits[1]);
-            }
-        }
-    }
-
-    /**
-     * An object with {@code Currency}.
-     */
-    @DynamoDbTable(tableName = "aws-java-sdk-util")
-    public static class KeyAndCurrency extends AutoKeyAndVal<Currency> {
-        @DynamoDbTypeConverted(converter = NoConvertCurrencyConverter.class)
-        public Currency getVal() {
-            return super.getVal();
-        }
-
-        @Override
-        public void setVal(final Currency val) {
-            super.setVal(val);
-        }
-
-        public static final class NoConvertCurrencyConverter implements DynamoDbTypeConverter<Currency, Currency> {
-            @Override
-            public Currency convert(final Currency object) {
-                return object;
-            }
-
-            @Override
-            public Currency unconvert(final Currency object) {
-                return object;
-            }
-        }
-    }
-
-    /**
-     * An object with {@code Currency}.
-     */
-    @DynamoDbTable(tableName = "aws-java-sdk-util")
-    public static class KeyAndStringSetCurrency extends AutoKeyAndVal<Set<Currency>> {
-        @CurrencyFormat(separator = "-")
-        public Set<Currency> getVal() {
-            return super.getVal();
-        }
-
-        @Override
-        public void setVal(final Set<Currency> val) {
-            super.setVal(val);
-        }
-
-        @DynamoDbTypeConverted(converter = StringSetCurrencyConverter.class)
-        @Retention(RetentionPolicy.RUNTIME)
-        @Target({ElementType.METHOD, ElementType.TYPE})
-        public static @interface CurrencyFormat {
-            String separator() default " ";
-        }
-
-        public static final class StringSetCurrencyConverter implements DynamoDbTypeConverter<Set<String>, Set<Currency>> {
-            private final CurrencyFormat f;
-
-            public StringSetCurrencyConverter(final Class<Currency> targetType, final CurrencyFormat f) {
-                this.f = f;
-            }
-
-            @Override
-            public Set<String> convert(final Set<Currency> object) {
-                final Set<String> objects = new HashSet<String>();
-                for (final Currency o : object) {
-                    objects.add(new StringBuilder().append(o.getAmount()).append(f.separator()).append(o.getUnit()).toString());
-                }
-                return objects;
-            }
-
-            @Override
-            public Set<Currency> unconvert(final Set<String> object) {
-                final Set<Currency> objects = new HashSet<Currency>();
-                for (final String o : object) {
-                    final String[] splits = o.split(f.separator());
-                    objects.add(new Currency(Double.valueOf(splits[0]), splits[1]));
-                }
-                return objects;
-            }
-        }
-    }
-
-    /**
-     * An object with {@code Currency}.
-     */
-    @DynamoDbTable(tableName = "aws-java-sdk-util")
-    public static class KeyAndDoubleCurrency extends AutoKeyAndVal<Currency> {
-        @CurrencyFormat
-        public Currency getVal() {
-            return super.getVal();
-        }
-
-        @Override
-        public void setVal(final Currency val) {
-            super.setVal(val);
-        }
-
-        @DynamoDbTypeConverted(converter = DoubleCurrencyConverter.class)
-        @Retention(RetentionPolicy.RUNTIME)
-        @Target({ElementType.METHOD, ElementType.TYPE})
-        public static @interface CurrencyFormat {
-            String separator() default " ";
-
-            String unit() default "USD";
-        }
-
-        public static final class DoubleCurrencyConverter implements DynamoDbTypeConverter<Double, Currency> {
-            private final CurrencyFormat f;
-
-            public DoubleCurrencyConverter(final Class<Currency> targetType, final CurrencyFormat f) {
-                this.f = f;
-            }
-
-            @Override
-            public Double convert(final Currency object) {
-                return object.getAmount();
-            }
-
-            @Override
-            public Currency unconvert(final Double object) {
-                return new Currency(object, f.unit());
-            }
-        }
-    }
-
-    /**
-     * An object with {@code Currency}.
-     */
-    @DynamoDbTable(tableName = "aws-java-sdk-util")
-    public static class KeyAndDoubleSetCurrency extends AutoKeyAndVal<Set<Currency>> {
-        @CurrencyFormat
-        public Set<Currency> getVal() {
-            return super.getVal();
-        }
-
-        @Override
-        public void setVal(final Set<Currency> val) {
-            super.setVal(val);
-        }
-
-        @DynamoDbTypeConverted(converter = DoubleSetCurrencyConverter.class)
-        @Retention(RetentionPolicy.RUNTIME)
-        @Target({ElementType.METHOD, ElementType.TYPE})
-        public static @interface CurrencyFormat {
-            String separator() default " ";
-
-            String unit() default "USD";
-        }
-
-        public static final class DoubleSetCurrencyConverter implements DynamoDbTypeConverter<Set<Double>, Set<Currency>> {
-            private final CurrencyFormat f;
-
-            public DoubleSetCurrencyConverter(final Class<Currency> targetType, final CurrencyFormat f) {
-                this.f = f;
-            }
-
-            @Override
-            public Set<Double> convert(final Set<Currency> object) {
-                final Set<Double> objects = new HashSet<Double>();
-                for (final Currency o : object) {
-                    objects.add(o.getAmount());
-                }
-                return objects;
-            }
-
-            @Override
-            public Set<Currency> unconvert(final Set<Double> object) {
-                final Set<Currency> objects = new HashSet<Currency>();
-                for (final Double o : object) {
-                    objects.add(new Currency(o, f.unit()));
-                }
-                return objects;
-            }
-        }
-    }
-
-}
diff --git a/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/TypedIntegrationTest.java b/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/TypedIntegrationTest.java
deleted file mode 100644
index 926e84d39075..000000000000
--- a/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/TypedIntegrationTest.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.mapper;
-
-import static org.junit.Assert.assertEquals;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
-import org.junit.Test;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbAutoGeneratedDefault;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMapperFieldModel.DynamoDbAttributeType;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbTable;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbTyped;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-import software.amazon.awssdk.services.dynamodb.pojos.AutoKeyAndVal;
-
-/**
- * Status tests for {@code Typed}.
- */
-public class TypedIntegrationTest extends AbstractKeyAndValIntegrationTestCase {
-
-    /**
-     * Test the mappings.
-     */
-    @Test
-    public void testMarshalling() {
-        final KeyAndBinaryUuid object = new KeyAndBinaryUuid();
-        object.setVal(UUID.randomUUID());
-        assertBeforeAndAfterChange(false, object);
-    }
-
-    /**
-     * Test with a null enum val.
-     */
-    @Test
-    public void testNullEnumValue() {
-        final KeyAndStatus object = new KeyAndStatus();
-        assertBeforeAndAfterChange(false, object);
-    }
-
-    /**
-     * Test with a non-null enum val.
-     */
-    @Test
-    public void testEnumMarshalling() {
-        final KeyAndStatus object = new KeyAndStatus();
-        object.setVal(KeyAndStatus.Status.Y);
-        assertBeforeAndAfterChange(false, object);
-    }
-
-    /**
-     * Test with a null enum val.
-     */
-    @Test
-    public void testDefaultEnumValue() {
-        final KeyAndDefaultStatus object = new KeyAndDefaultStatus();
-        final KeyAndStatus.Status value = assertBeforeAndAfterChange(true, object);
-        assertEquals(KeyAndStatus.Status.Z, value);
-    }
-
-    /**
-     * Test the mappings.
-     */
-    @Test
-    public void testNativeMap() {
-        final Map<String, AttributeValue> map = new HashMap<String, AttributeValue>();
-        map.put("A", AttributeValue.builder().n("123").build());
-
-        final KeyAndNativeValue object = new KeyAndNativeValue();
-        object.setVal(AttributeValue.builder().m(map).build());
-        assertBeforeAndAfterChange(false, object);
-    }
-
-    /**
-     * test object.
-     */
-    @DynamoDbTable(tableName = "aws-java-sdk-util")
-    public static class KeyAndBinaryUuid extends AutoKeyAndVal<UUID> {
-        @DynamoDbTyped(DynamoDbAttributeType.B)
-        public UUID getVal() {
-            return super.getVal();
-        }
-
-        @Override
-        public void setVal(final UUID val) {
-            super.setVal(val);
-        }
-    }
-
-    /**
-     * An object with an enumeration.
-     */
-    @DynamoDbTable(tableName = "aws-java-sdk-util")
-    public static class KeyAndStatus extends AutoKeyAndVal<KeyAndStatus.Status> {
-        @DynamoDbTyped(DynamoDbAttributeType.S)
-        public Status getVal() {
-            return super.getVal();
-        }
-
-        ;
-
-        @Override
-        public void setVal(final Status val) {
-            super.setVal(val);
-        }
-
-        public static enum Status {
-            X,
-            Y,
-            Z
-        }
-    }
-
-    /**
-     * An object with an enumeration.
-     */
-    @DynamoDbTable(tableName = "aws-java-sdk-util")
-    public static class KeyAndDefaultStatus extends KeyAndStatus {
-        @DynamoDbAutoGeneratedDefault("Z")
-        @DynamoDbTyped(DynamoDbAttributeType.S)
-        public Status getVal() {
-            return super.getVal();
-        }
-    }
-
-    /**
-     * test object.
-     */
-    @DynamoDbTable(tableName = "aws-java-sdk-util")
-    public static class KeyAndNativeValue extends AutoKeyAndVal<AttributeValue> {
-        @DynamoDbTyped(DynamoDbAttributeType.M)
-        public AttributeValue getVal() {
-            return super.getVal();
-        }
-
-        @Override
-        public void setVal(final AttributeValue val) {
-            super.setVal(val);
-        }
-    }
-
-}
diff --git a/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/VersionAttributeUpdateIntegrationTest.java b/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/VersionAttributeUpdateIntegrationTest.java
deleted file mode 100644
index a41864745597..000000000000
--- a/test/dynamodbmapper-v1/src/it/java/software/amazon/awssdk/services/dynamodb/mapper/VersionAttributeUpdateIntegrationTest.java
+++ /dev/null
@@ -1,664 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.mapper;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.fail;
-
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import org.junit.Test;
-import software.amazon.awssdk.utils.ImmutableMap;
-import software.amazon.awssdk.services.dynamodb.DynamoDBMapperIntegrationTestBase;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbAttribute;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbDeleteExpression;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbHashKey;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMapper;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMapperConfig;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMapperConfig.SaveBehavior;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMappingException;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbSaveExpression;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbTable;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbVersionAttribute;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-import software.amazon.awssdk.services.dynamodb.model.ConditionalCheckFailedException;
-import software.amazon.awssdk.services.dynamodb.model.ConditionalOperator;
-import software.amazon.awssdk.services.dynamodb.model.ExpectedAttributeValue;
-
-/**
- * Tests updating version fields correctly
- */
-public class VersionAttributeUpdateIntegrationTest extends DynamoDBMapperIntegrationTestBase {
-
-    @Test(expected = DynamoDbMappingException.class)
-    public void testStringVersion() throws Exception {
-        List<StringVersionField> objs = new ArrayList<StringVersionField>();
-        for (int i = 0; i < 5; i++) {
-            StringVersionField obj = getUniqueObject(new StringVersionField());
-            objs.add(obj);
-        }
-
-        // Saving new objects with a null version field should populate it
-        DynamoDbMapper util = new DynamoDbMapper(dynamo);
-        for (StringVersionField obj : objs) {
-            assertNull(obj.getVersion());
-            util.save(obj);
-            assertNotNull(obj.getVersion());
-            assertEquals(obj, util.load(StringVersionField.class, obj.getKey()));
-        }
-    }
-
-    @Test
-    public void testBigIntegerVersion() {
-        List<BigIntegerVersionField> objs = new ArrayList<BigIntegerVersionField>();
-        for (int i = 0; i < 5; i++) {
-            BigIntegerVersionField obj = getUniqueObject(new BigIntegerVersionField());
-            objs.add(obj);
-        }
-
-        // Saving new objects with a null version field should populate it
-        DynamoDbMapper util = new DynamoDbMapper(dynamo);
-        for (BigIntegerVersionField obj : objs) {
-            assertNull(obj.getVersion());
-            util.save(obj);
-            assertNotNull(obj.getVersion());
-
-            assertEquals(obj, util.load(BigIntegerVersionField.class, obj.getKey()));
-        }
-
-        for (BigIntegerVersionField obj : objs) {
-            BigIntegerVersionField replacement = getUniqueObject(new BigIntegerVersionField());
-            replacement.setKey(obj.getKey());
-            replacement.setVersion(obj.getVersion());
-
-            util.save(replacement);
-            // The version field should have changed in memory
-            assertFalse(obj.getVersion().equals(replacement.getVersion()));
-
-            BigIntegerVersionField loadedObject = util.load(BigIntegerVersionField.class, obj.getKey());
-            assertEquals(replacement, loadedObject);
-
-            // Trying to update the object again should trigger a concurrency
-            // exception
-            try {
-                util.save(obj);
-                fail("Should have thrown an exception");
-            } catch (Exception expected) {
-                // Ignored or expected.
-            }
-
-            // Now try again overlaying the correct version number by using a saveExpression
-            // this should not throw the conditional check failed exception
-            try {
-                DynamoDbSaveExpression saveExpression = new DynamoDbSaveExpression();
-                Map<String, ExpectedAttributeValue> expected = new HashMap<String, ExpectedAttributeValue>();
-                ExpectedAttributeValue expectedVersion = ExpectedAttributeValue.builder()
-                        .value(AttributeValue.builder()
-                                           .n(obj.getVersion().add(BigInteger.valueOf(1)).toString()).build()).build();
-                expected.put("version", expectedVersion);
-                saveExpression.setExpected(expected);
-                util.save(obj, saveExpression);
-            } catch (Exception expected) {
-                fail("This should succeed, version was updated.");
-            }
-        }
-    }
-
-    @Test
-    public void testIntegerVersion() {
-        List<IntegerVersionField> objs = new ArrayList<IntegerVersionField>();
-        for (int i = 0; i < 5; i++) {
-            IntegerVersionField obj = getUniqueObject(new IntegerVersionField());
-            objs.add(obj);
-        }
-
-        // Saving new objects with a null version field should populate it
-        DynamoDbMapper util = new DynamoDbMapper(dynamo);
-        for (IntegerVersionField obj : objs) {
-            assertNull(obj.getNotCalledVersion());
-            util.save(obj);
-            assertNotNull(obj.getNotCalledVersion());
-
-            assertEquals(obj, util.load(IntegerVersionField.class, obj.getKey()));
-        }
-
-        for (IntegerVersionField obj : objs) {
-            IntegerVersionField replacement = getUniqueObject(new IntegerVersionField());
-            replacement.setKey(obj.getKey());
-            replacement.setNotCalledVersion(obj.getNotCalledVersion());
-
-            util.save(replacement);
-            // The version field should have changed in memory
-            assertFalse(obj.getNotCalledVersion().equals(replacement.getNotCalledVersion()));
-
-            IntegerVersionField loadedObject = util.load(IntegerVersionField.class, obj.getKey());
-            assertEquals(replacement, loadedObject);
-
-            // Trying to update the object again should trigger a concurrency
-            // exception
-            try {
-                util.save(obj);
-                fail("Should have thrown an exception");
-            } catch (Exception expected) {
-                // Ignored or expected.
-            }
-
-            // Trying to delete the object should also fail
-            try {
-                util.delete(obj);
-                fail("Should have thrown an exception");
-            } catch (Exception expected) {
-                // Ignored or expected.
-            }
-
-            // But specifying CLOBBER will allow deletion
-            util.save(obj, new DynamoDbMapperConfig(SaveBehavior.CLOBBER));
-
-            // Trying to delete with the wrong version should fail
-            try {
-                //version is now 2 in db, set object version to 3.
-                obj.setNotCalledVersion(3);
-                util.delete(obj);
-                fail("Should have thrown an exception");
-            } catch (Exception expected) {
-                // Ignored or expected.
-            }
-
-            // Now try deleting again overlaying the correct version number by using a deleteExpression
-            // this should not throw the conditional check failed exception
-            try {
-                DynamoDbDeleteExpression deleteExpression = new DynamoDbDeleteExpression();
-                Map<String, ExpectedAttributeValue> expected = new HashMap<String, ExpectedAttributeValue>();
-                ExpectedAttributeValue expectedVersion = ExpectedAttributeValue.builder()
-                        .value(AttributeValue.builder()
-                                           .n("2").build()).build();  //version is still 2 in db
-                expected.put("version", expectedVersion);
-                deleteExpression.setExpected(expected);
-                util.delete(obj, deleteExpression);
-            } catch (Exception expected) {
-                fail("This should succeed, version was updated.");
-            }
-        }
-    }
-
-    /**
-     * Tests providing additional expected conditions when saving and deleting
-     * item with versioned fields.
-     */
-    @Test
-    public void testVersionedAttributeWithUserProvidedExpectedConditions() {
-        DynamoDbMapper mapper = new DynamoDbMapper(dynamo);
-        IntegerVersionField versionedObject = getUniqueObject(new IntegerVersionField());
-        assertNull(versionedObject.getNotCalledVersion());
-
-        // Add additional expected conditions via DynamoDBSaveExpression.
-        // Expected conditions joined by AND are compatible with the conditions
-        // for auto-generated keys.
-        DynamoDbSaveExpression saveExpression = new DynamoDbSaveExpression()
-                .withExpected(Collections.singletonMap(
-                        "otherAttribute", ExpectedAttributeValue.builder().exists(false).build()))
-                .withConditionalOperator(ConditionalOperator.AND);
-        // The save should succeed since the user provided conditions are joined by AND.
-        mapper.save(versionedObject, saveExpression);
-        // The version field should be populated
-        assertNotNull(versionedObject.getNotCalledVersion());
-        IntegerVersionField other = mapper.load(IntegerVersionField.class, versionedObject.getKey());
-        assertEquals(other, versionedObject);
-
-        // delete should also work
-        DynamoDbDeleteExpression deleteExpression = new DynamoDbDeleteExpression()
-                .withExpected(Collections.singletonMap(
-                        "otherAttribute", ExpectedAttributeValue.builder().exists(false).build()))
-                .withConditionalOperator(ConditionalOperator.AND);
-        mapper.delete(versionedObject, deleteExpression);
-
-        // Change the conditional operator to OR.
-        // IllegalArgumentException is expected since the additional expected
-        // conditions cannot be joined with the conditions for auto-generated
-        // keys.
-        saveExpression.setConditionalOperator(ConditionalOperator.OR);
-        deleteExpression.setConditionalOperator(ConditionalOperator.OR);
-        try {
-            mapper.save(getUniqueObject(new IntegerVersionField()), saveExpression);
-        } catch (IllegalArgumentException expected) {
-            // Ignored or expected.
-        }
-        try {
-            mapper.delete(getUniqueObject(new IntegerVersionField()), deleteExpression);
-        } catch (IllegalArgumentException expected) {
-            // Ignored or expected.
-        }
-
-        // User-provided OR conditions should work if they completely override
-        // the generated conditions for the version field.
-        Map<String, ExpectedAttributeValue> goodConditions =
-                ImmutableMap.of(
-                        "otherAttribute", ExpectedAttributeValue.builder().exists(false).build(),
-                        "version", ExpectedAttributeValue.builder().exists(false).build()
-                               );
-        Map<String, ExpectedAttributeValue> badConditions =
-                ImmutableMap.of(
-                        "otherAttribute", ExpectedAttributeValue.builder().value(AttributeValue.builder().s("non-existent-value").build()).build(),
-                        "version", ExpectedAttributeValue.builder().value(AttributeValue.builder().n("-1").build()).build()
-                               );
-
-        IntegerVersionField newObj = getUniqueObject(new IntegerVersionField());
-        saveExpression.setExpected(badConditions);
-        try {
-            mapper.save(newObj, saveExpression);
-        } catch (ConditionalCheckFailedException expected) {
-            // Ignored or expected.
-        }
-
-        saveExpression.setExpected(goodConditions);
-        mapper.save(newObj, saveExpression);
-
-        deleteExpression.setExpected(badConditions);
-        try {
-            mapper.delete(newObj, deleteExpression);
-        } catch (ConditionalCheckFailedException expected) {
-            // Ignored or expected.
-        }
-
-        deleteExpression.setExpected(goodConditions);
-        mapper.delete(newObj, deleteExpression);
-    }
-
-    @Test
-    public void testByteVersion() {
-        List<ByteVersionField> objs = new ArrayList<ByteVersionField>();
-        for (int i = 0; i < 5; i++) {
-            ByteVersionField obj = getUniqueObject(new ByteVersionField());
-            objs.add(obj);
-        }
-
-        // Saving new objects with a null version field should populate it
-        DynamoDbMapper util = new DynamoDbMapper(dynamo);
-        for (ByteVersionField obj : objs) {
-            assertNull(obj.getVersion());
-            util.save(obj);
-            assertNotNull(obj.getVersion());
-
-            assertEquals(obj, util.load(ByteVersionField.class, obj.getKey()));
-        }
-
-        for (ByteVersionField obj : objs) {
-            ByteVersionField replacement = getUniqueObject(new ByteVersionField());
-            replacement.setKey(obj.getKey());
-            replacement.setVersion(obj.getVersion());
-
-            util.save(replacement);
-            // The version field should have changed in memory
-            assertFalse(obj.getVersion().equals(replacement.getVersion()));
-
-            ByteVersionField loadedObject = util.load(ByteVersionField.class, obj.getKey());
-            assertEquals(replacement, loadedObject);
-
-            // Trying to update the object again should trigger a concurrency
-            // exception
-            try {
-                util.save(obj);
-                fail("Should have thrown an exception");
-            } catch (Exception expected) {
-                // Ignored or expected.
-            }
-        }
-    }
-
-    @Test
-    public void testLongVersion() {
-        List<LongVersionField> objs = new ArrayList<LongVersionField>();
-        for (int i = 0; i < 5; i++) {
-            LongVersionField obj = getUniqueObject(new LongVersionField());
-            objs.add(obj);
-        }
-
-        // Saving new objects with a null version field should populate it
-        DynamoDbMapper util = new DynamoDbMapper(dynamo);
-        for (LongVersionField obj : objs) {
-            assertNull(obj.getVersion());
-            util.save(obj);
-            assertNotNull(obj.getVersion());
-
-            assertEquals(obj, util.load(LongVersionField.class, obj.getKey()));
-        }
-
-        for (LongVersionField obj : objs) {
-            LongVersionField replacement = getUniqueObject(new LongVersionField());
-            replacement.setKey(obj.getKey());
-            replacement.setVersion(obj.getVersion());
-
-            util.save(replacement);
-            // The version field should have changed in memory
-            assertFalse(obj.getVersion().equals(replacement.getVersion()));
-
-            LongVersionField loadedObject = util.load(LongVersionField.class, obj.getKey());
-            assertEquals(replacement, loadedObject);
-
-            // Trying to update the object again should trigger a concurrency
-            // exception
-            try {
-                util.save(obj);
-                fail("Should have thrown an exception");
-            } catch (Exception expected) {
-                // Ignored or expected.
-            }
-        }
-    }
-
-    private <T extends VersionFieldBaseClass> T getUniqueObject(T obj) {
-        obj.setKey("" + startKey++);
-        obj.setNormalStringAttribute("" + startKey++);
-        return obj;
-    }
-
-    @DynamoDbTable(tableName = "aws-java-sdk-util")
-    public static class VersionFieldBaseClass {
-
-        protected String key;
-        protected String normalStringAttribute;
-
-        @DynamoDbHashKey
-        public String getKey() {
-            return key;
-        }
-
-        public void setKey(String key) {
-            this.key = key;
-        }
-
-        @DynamoDbAttribute
-        public String getNormalStringAttribute() {
-            return normalStringAttribute;
-        }
-
-        public void setNormalStringAttribute(String normalStringAttribute) {
-            this.normalStringAttribute = normalStringAttribute;
-        }
-
-        @Override
-        public int hashCode() {
-            final int prime = 31;
-            int result = 1;
-            result = prime * result + ((key == null) ? 0 : key.hashCode());
-            result = prime * result + ((normalStringAttribute == null) ? 0 : normalStringAttribute.hashCode());
-            return result;
-        }
-
-        @Override
-        public boolean equals(Object obj) {
-            if (this == obj) {
-                return true;
-            }
-            if (obj == null) {
-                return false;
-            }
-            if (getClass() != obj.getClass()) {
-                return false;
-            }
-            VersionFieldBaseClass other = (VersionFieldBaseClass) obj;
-            if (key == null) {
-                if (other.key != null) {
-                    return false;
-                }
-            } else if (!key.equals(other.key)) {
-                return false;
-            }
-            if (normalStringAttribute == null) {
-                if (other.normalStringAttribute != null) {
-                    return false;
-                }
-            } else if (!normalStringAttribute.equals(other.normalStringAttribute)) {
-                return false;
-            }
-            return true;
-        }
-    }
-
-    public static class StringVersionField extends VersionFieldBaseClass {
-
-        private String version;
-
-        @DynamoDbVersionAttribute
-        public String getVersion() {
-            return version;
-        }
-
-        public void setVersion(String version) {
-            this.version = version;
-        }
-
-        @Override
-        public int hashCode() {
-            final int prime = 31;
-            int result = super.hashCode();
-            result = prime * result + ((version == null) ? 0 : version.hashCode());
-            return result;
-        }
-
-        @Override
-        public boolean equals(Object obj) {
-            if (this == obj) {
-                return true;
-            }
-            if (!super.equals(obj)) {
-                return false;
-            }
-            if (getClass() != obj.getClass()) {
-                return false;
-            }
-            StringVersionField other = (StringVersionField) obj;
-            if (version == null) {
-                if (other.version != null) {
-                    return false;
-                }
-            } else if (!version.equals(other.version)) {
-                return false;
-            }
-            return true;
-        }
-    }
-
-    public static class BigIntegerVersionField extends VersionFieldBaseClass {
-
-        private BigInteger version;
-
-        @DynamoDbVersionAttribute
-        public BigInteger getVersion() {
-            return version;
-        }
-
-        public void setVersion(BigInteger version) {
-            this.version = version;
-        }
-
-        @Override
-        public int hashCode() {
-            final int prime = 31;
-            int result = super.hashCode();
-            result = prime * result + ((version == null) ? 0 : version.hashCode());
-            return result;
-        }
-
-        @Override
-        public boolean equals(Object obj) {
-            if (this == obj) {
-                return true;
-            }
-            if (!super.equals(obj)) {
-                return false;
-            }
-            if (getClass() != obj.getClass()) {
-                return false;
-            }
-            BigIntegerVersionField other = (BigIntegerVersionField) obj;
-            if (version == null) {
-                if (other.version != null) {
-                    return false;
-                }
-            } else if (!version.equals(other.version)) {
-                return false;
-            }
-            return true;
-        }
-
-        @Override
-        public String toString() {
-            return "BigIntegerVersionField [version=" + version + ", key=" + key + ", normalStringAttribute="
-                   + normalStringAttribute + "]";
-        }
-    }
-
-    public static final class IntegerVersionField extends VersionFieldBaseClass {
-
-        private Integer notCalledVersion;
-
-        // Making sure that we can substitute attribute names as necessary
-        @DynamoDbVersionAttribute(attributeName = "version")
-        public Integer getNotCalledVersion() {
-            return notCalledVersion;
-        }
-
-        public void setNotCalledVersion(Integer getNotCalledVersion) {
-            this.notCalledVersion = getNotCalledVersion;
-        }
-
-        @Override
-        public int hashCode() {
-            final int prime = 31;
-            int result = super.hashCode();
-            result = prime * result + ((notCalledVersion == null) ? 0 : notCalledVersion.hashCode());
-            return result;
-        }
-
-        @Override
-        public boolean equals(Object obj) {
-            if (this == obj) {
-                return true;
-            }
-            if (!super.equals(obj)) {
-                return false;
-            }
-            if (getClass() != obj.getClass()) {
-                return false;
-            }
-            IntegerVersionField other = (IntegerVersionField) obj;
-            if (notCalledVersion == null) {
-                if (other.notCalledVersion != null) {
-                    return false;
-                }
-            } else if (!notCalledVersion.equals(other.notCalledVersion)) {
-                return false;
-            }
-            return true;
-        }
-    }
-
-    public static final class ByteVersionField extends VersionFieldBaseClass {
-
-        private Byte version;
-
-        @DynamoDbVersionAttribute
-        public Byte getVersion() {
-            return version;
-        }
-
-        public void setVersion(Byte version) {
-            this.version = version;
-        }
-
-        @Override
-        public int hashCode() {
-            final int prime = 31;
-            int result = super.hashCode();
-            result = prime * result + ((version == null) ? 0 : version.hashCode());
-            return result;
-        }
-
-        @Override
-        public boolean equals(Object obj) {
-            if (this == obj) {
-                return true;
-            }
-            if (!super.equals(obj)) {
-                return false;
-            }
-            if (getClass() != obj.getClass()) {
-                return false;
-            }
-            ByteVersionField other = (ByteVersionField) obj;
-            if (version == null) {
-                if (other.version != null) {
-                    return false;
-                }
-            } else if (!version.equals(other.version)) {
-                return false;
-            }
-            return true;
-        }
-    }
-
-    public static final class LongVersionField extends VersionFieldBaseClass {
-
-        private Long version;
-
-        @DynamoDbVersionAttribute
-        public Long getVersion() {
-            return version;
-        }
-
-        public void setVersion(Long version) {
-            this.version = version;
-        }
-
-        @Override
-        public int hashCode() {
-            final int prime = 31;
-            int result = super.hashCode();
-            result = prime * result + ((version == null) ? 0 : version.hashCode());
-            return result;
-        }
-
-        @Override
-        public boolean equals(Object obj) {
-            if (this == obj) {
-                return true;
-            }
-            if (!super.equals(obj)) {
-                return false;
-            }
-            if (getClass() != obj.getClass()) {
-                return false;
-            }
-            LongVersionField other = (LongVersionField) obj;
-            if (version == null) {
-                if (other.version != null) {
-                    return false;
-                }
-            } else if (!version.equals(other.version)) {
-                return false;
-            }
-            return true;
-        }
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/ConvenientMapSetterTest.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/ConvenientMapSetterTest.java
deleted file mode 100644
index c10c5a41bcbd..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/ConvenientMapSetterTest.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb;
-
-import org.junit.Test;
-
-/**
- * Tests on using convenient map setters.
- */
-public class ConvenientMapSetterTest {
-
-    /** Test on using map entry adder method. */
-    @Test
-    public void testMapEntryAdderMethod() {
-// NOTE(dongie): Convenience setters are not generated
-//        PutItemRequest putItemRequest = new PutItemRequest()
-//                .addItemEntry("hash-key", AttributeValue.builder().withS("1"))
-//                .addItemEntry("range-key", AttributeValue.builder().withS("2"))
-//                .addItemEntry("attribute", AttributeValue.builder().withS("3"));
-//
-//        Map<String, AttributeValue> item = putItemRequest.getItem();
-//        assertEquals(3, item.size());
-//        assertEquals("1", item.get("hash-key").s());
-//        assertEquals("2", item.get("range-key").s());
-//        assertEquals("3", item.get("attribute").s());
-//
-//        putItemRequest.clearItemEntries();
-//        assertNull(putItemRequest.getItem());
-//    }
-//
-//    /** Test on using predefined map entry setter to provide map parameter. */
-//    @Test
-//    public void testPredefinedMapEntryMethod() {
-//        ScanRequest scanRequest = new ScanRequest().withExclusiveStartKey(
-//                new AbstractMap.SimpleEntry<String, AttributeValue>("hash-key", AttributeValue.builder().withS("1")),
-//                new AbstractMap.SimpleEntry<String, AttributeValue>("range-key", AttributeValue.builder().withS("2")));
-//
-//        Map<String, AttributeValue> item = scanRequest.getExclusiveStartKey();
-//        assertEquals(2, item.size());
-//        assertEquals("1", item.get("hash-key").s());
-//        assertEquals("2", item.get("range-key").s());
-//    }
-//
-//    /** Test on IllegalArgumentException when providing duplicated keys. */
-//    @Test(expected = IllegalArgumentException.class)
-//    public void testDuplicatedKeysException() {
-//        new PutItemRequest()
-//                .addItemEntry("hash-key", AttributeValue.builder().withS("1"))
-//                .addItemEntry("hash-key", AttributeValue.builder().withS("2"));
-//    }
-//
-//    /** Test on handling null entry objects. */
-//    @Test
-//    public void testNullEntryException() {
-//        // hashKey is set as not nullable, and rangeKey is nullable
-//        // so this call should be fine.
-//        ScanRequest scanRequest = new ScanRequest().withExclusiveStartKey(
-//                new AbstractMap.SimpleEntry<String, AttributeValue>("hash-key", AttributeValue.builder().withS("1")),
-//                null);
-//
-//        // but this call should throw IllegalArgumentException.
-//        try {
-//            scanRequest.withExclusiveStartKey(
-//                    null,
-//                    new AbstractMap.SimpleEntry<String, AttributeValue>("hash-key", AttributeValue.builder().withS("1")));
-//            fail("Should throw IllegalArgumentException.");
-//        } catch (IllegalArgumentException iae) {
-//            // Ignored or expected.
-//        }
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/ImmutableObjectUtils.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/ImmutableObjectUtils.java
deleted file mode 100644
index 4139283ae24d..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/ImmutableObjectUtils.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb;
-
-import java.util.Arrays;
-import software.amazon.awssdk.annotations.SdkProtectedApi;
-
-@SdkProtectedApi
-public final class ImmutableObjectUtils {
-
-    private ImmutableObjectUtils() {
-    }
-
-    public static <T> void setObjectMember(Object o, String memberName, T value) {
-        Arrays.stream(o.getClass().getDeclaredFields())
-              .filter(f -> f.getName().equals(memberName))
-              .findFirst()
-              .ifPresent(f -> {
-                  f.setAccessible(true);
-                  try {
-                      f.set(o, value);
-                  } catch (IllegalAccessException e) {
-                      throw new RuntimeException("Unable to reflectively set member " + memberName);
-                  }
-              });
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/TypeConvertedJsonTest.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/TypeConvertedJsonTest.java
deleted file mode 100644
index f612e462af29..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/TypeConvertedJsonTest.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb;
-
-import static org.junit.Assert.assertEquals;
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.when;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
-import software.amazon.awssdk.utils.ImmutableMap;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbHashKey;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMapper;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbTable;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbTypeConvertedJson;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-import software.amazon.awssdk.services.dynamodb.model.GetItemRequest;
-import software.amazon.awssdk.services.dynamodb.model.GetItemResponse;
-
-@RunWith(MockitoJUnitRunner.class)
-public class TypeConvertedJsonTest {
-
-    private static final String HASH_KEY = "1234";
-
-    @Mock
-    private DynamoDbClient ddb;
-
-    @Test
-    public void responseWithUnmappedField_IgnoresUnknownFieldAndUnmarshallsCorrectly() {
-        final DynamoDbMapper mapper = new DynamoDbMapper(ddb);
-        when(ddb.getItem(any(GetItemRequest.class)))
-                .thenReturn(GetItemResponse.builder().item(
-                        ImmutableMap.of("hashKey", AttributeValue.builder().s(HASH_KEY).build(),
-                                        "jsonMappedPojo", AttributeValue.builder().s(
-                                        "{\"knownField\": \"knownValue\", \"unknownField\": \"unknownValue\"}").build()
-                                       )).build());
-
-        final TopLevelPojo pojo = mapper.load(new TopLevelPojo().setHashKey(HASH_KEY));
-        assertEquals("knownValue", pojo.getJsonMappedPojo().getKnownField());
-    }
-
-    @DynamoDbTable(tableName = "TestTable")
-    public static class TopLevelPojo {
-
-        @DynamoDbHashKey
-        private String hashKey;
-
-        @DynamoDbTypeConvertedJson
-        private JsonMappedPojo jsonMappedPojo;
-
-        public String getHashKey() {
-            return hashKey;
-        }
-
-        public TopLevelPojo setHashKey(String hashKey) {
-            this.hashKey = hashKey;
-            return this;
-        }
-
-        public JsonMappedPojo getJsonMappedPojo() {
-            return jsonMappedPojo;
-        }
-
-        public void setJsonMappedPojo(JsonMappedPojo jsonMappedPojo) {
-            this.jsonMappedPojo = jsonMappedPojo;
-        }
-    }
-
-    public static class JsonMappedPojo {
-
-        private String knownField;
-
-        public String getKnownField() {
-            return knownField;
-        }
-
-        public void setKnownField(String knownField) {
-            this.knownField = knownField;
-        }
-    }
-
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/AbstractDynamoDbMapper.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/AbstractDynamoDbMapper.java
deleted file mode 100644
index 0956648cab9f..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/AbstractDynamoDbMapper.java
+++ /dev/null
@@ -1,336 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import software.amazon.awssdk.regions.Region;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMapper.FailedBatch;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-import software.amazon.awssdk.services.dynamodb.model.CreateTableRequest;
-import software.amazon.awssdk.services.dynamodb.model.DeleteTableRequest;
-
-/**
- * Abstract implementation of {@code IDynamoDBMapper}. Convenient method forms pass through to the
- * corresponding overload that takes a request object, which throws an
- * {@code UnsupportedOperationException}.
- */
-public class AbstractDynamoDbMapper implements IDynamoDbMapper {
-
-    private final DynamoDbMapperConfig config;
-
-    protected AbstractDynamoDbMapper(final DynamoDbMapperConfig defaults) {
-        this.config = DynamoDbMapperConfig.DEFAULT.merge(defaults);
-    }
-
-    protected AbstractDynamoDbMapper() {
-        this(DynamoDbMapperConfig.DEFAULT);
-    }
-
-    protected final String getTableName(Class<?> clazz, Object object, DynamoDbMapperConfig config) {
-        if (object != null && config.getObjectTableNameResolver() != null) {
-            return config.getObjectTableNameResolver().getTableName(object, config);
-        }
-        return getTableName(clazz, config);
-    }
-
-    protected final String getTableName(Class<?> clazz, DynamoDbMapperConfig config) {
-        if (config.getTableNameResolver() == null) {
-            return DynamoDbMapperConfig.DefaultTableNameResolver.INSTANCE.getTableName(clazz, config);
-        }
-        return config.getTableNameResolver().getTableName(clazz, config);
-    }
-
-    protected final DynamoDbMapperConfig mergeConfig(DynamoDbMapperConfig overrides) {
-        return this.config.merge(overrides);
-    }
-
-    @Override
-    public <T extends Object> DynamoDbMapperTableModel<T> getTableModel(Class<T> clazz) {
-        return getTableModel(clazz, config);
-    }
-
-    @Override
-    public <T extends Object> DynamoDbMapperTableModel<T> getTableModel(Class<T> clazz, DynamoDbMapperConfig config) {
-        throw new UnsupportedOperationException("operation not supported in " + getClass());
-    }
-
-    @Override
-    public <T> T load(Class<T> clazz, Object hashKey, DynamoDbMapperConfig config) {
-        return load(clazz, hashKey, (Object) null, config);
-    }
-
-    @Override
-    public <T> T load(Class<T> clazz, Object hashKey) {
-        return load(clazz, hashKey, (Object) null, config);
-    }
-
-    @Override
-    public <T> T load(Class<T> clazz, Object hashKey, Object rangeKey) {
-        return load(clazz, hashKey, rangeKey, config);
-    }
-
-    @Override
-    public <T> T load(Class<T> clazz, Object hashKey, Object rangeKey, DynamoDbMapperConfig config) {
-        throw new UnsupportedOperationException("operation not supported in " + getClass());
-    }
-
-    @Override
-    public <T> T load(T keyObject) {
-        return load(keyObject, config);
-    }
-
-    @Override
-    public <T> T load(T keyObject, DynamoDbMapperConfig config) {
-        throw new UnsupportedOperationException("operation not supported in " + getClass());
-    }
-
-    @Override
-    public <T> T marshallIntoObject(Class<T> clazz, Map<String, AttributeValue> itemAttributes) {
-        return marshallIntoObject(clazz, itemAttributes, config);
-    }
-
-    public <T> T marshallIntoObject(Class<T> clazz, Map<String, AttributeValue> itemAttributes, DynamoDbMapperConfig config) {
-        throw new UnsupportedOperationException("operation not supported in " + getClass());
-    }
-
-    @Override
-    public <T> List<T> marshallIntoObjects(Class<T> clazz, List<Map<String, AttributeValue>> itemAttributes) {
-        return marshallIntoObjects(clazz, itemAttributes, config);
-    }
-
-    public <T> List<T> marshallIntoObjects(Class<T> clazz, List<Map<String, AttributeValue>> itemAttributes,
-                                           DynamoDbMapperConfig config) {
-        throw new UnsupportedOperationException("operation not supported in " + getClass());
-    }
-
-    @Override
-    public <T> void save(T object) {
-        save(object, (DynamoDbSaveExpression) null, config);
-    }
-
-    @Override
-    public <T> void save(T object, DynamoDbSaveExpression saveExpression) {
-        save(object, saveExpression, config);
-    }
-
-    @Override
-    public <T> void save(T object, DynamoDbMapperConfig config) {
-        save(object, (DynamoDbSaveExpression) null, config);
-    }
-
-    @Override
-    public <T> void save(T object, DynamoDbSaveExpression saveExpression, DynamoDbMapperConfig config) {
-        throw new UnsupportedOperationException("operation not supported in " + getClass());
-    }
-
-    @Override
-    public void delete(Object object) {
-        delete(object, (DynamoDbDeleteExpression) null, config);
-    }
-
-    @Override
-    public void delete(Object object, DynamoDbDeleteExpression deleteExpression) {
-        delete(object, deleteExpression, config);
-    }
-
-    @Override
-    public void delete(Object object, DynamoDbMapperConfig config) {
-        delete(object, (DynamoDbDeleteExpression) null, config);
-    }
-
-    @Override
-    public <T> void delete(T object, DynamoDbDeleteExpression deleteExpression, DynamoDbMapperConfig config) {
-        throw new UnsupportedOperationException("operation not supported in " + getClass());
-    }
-
-    @Override
-    public List<FailedBatch> batchDelete(Iterable<? extends Object> objectsToDelete) {
-        return batchWrite(Collections.emptyList(), objectsToDelete, config);
-    }
-
-    @Override
-    public List<FailedBatch> batchDelete(Object... objectsToDelete) {
-        return batchWrite(Collections.emptyList(), Arrays.asList(objectsToDelete), config);
-    }
-
-    @Override
-    public List<FailedBatch> batchSave(Iterable<? extends Object> objectsToSave) {
-        return batchWrite(objectsToSave, Collections.emptyList(), config);
-    }
-
-    @Override
-    public List<FailedBatch> batchSave(Object... objectsToSave) {
-        return batchWrite(Arrays.asList(objectsToSave), Collections.emptyList(), config);
-    }
-
-    @Override
-    public List<FailedBatch> batchWrite(Iterable<? extends Object> objectsToWrite,
-                                        Iterable<? extends Object> objectsToDelete) {
-        return batchWrite(objectsToWrite, objectsToDelete, config);
-    }
-
-    @Override
-    public List<FailedBatch> batchWrite(Iterable<? extends Object> objectsToWrite,
-                                        Iterable<? extends Object> objectsToDelete,
-                                        DynamoDbMapperConfig config) {
-        throw new UnsupportedOperationException("operation not supported in " + getClass());
-    }
-
-    @Override
-    public Map<String, List<Object>> batchLoad(Iterable<? extends Object> itemsToGet) {
-        return batchLoad(itemsToGet, config);
-    }
-
-    @Override
-    public Map<String, List<Object>> batchLoad(Iterable<? extends Object> itemsToGet, DynamoDbMapperConfig config) {
-        throw new UnsupportedOperationException("operation not supported in " + getClass());
-    }
-
-    @Override
-    public Map<String, List<Object>> batchLoad(Map<Class<?>, List<KeyPair>> itemsToGet) {
-        return batchLoad(itemsToGet, config);
-    }
-
-    @Override
-    public Map<String, List<Object>> batchLoad(Map<Class<?>, List<KeyPair>> itemsToGet, DynamoDbMapperConfig config) {
-        throw new UnsupportedOperationException("operation not supported in " + getClass());
-    }
-
-    @Override
-    public <T> PaginatedScanList<T> scan(Class<T> clazz, DynamoDbScanExpression scanExpression) {
-        return scan(clazz, scanExpression, config);
-    }
-
-    @Override
-    public <T> PaginatedScanList<T> scan(Class<T> clazz,
-                                         DynamoDbScanExpression scanExpression,
-                                         DynamoDbMapperConfig config) {
-        throw new UnsupportedOperationException("operation not supported in " + getClass());
-    }
-
-    @Override
-    public <T> PaginatedParallelScanList<T> parallelScan(Class<T> clazz,
-                                                         DynamoDbScanExpression scanExpression,
-                                                         int totalSegments) {
-        return parallelScan(clazz, scanExpression, totalSegments, config);
-    }
-
-    @Override
-    public <T> PaginatedParallelScanList<T> parallelScan(Class<T> clazz,
-                                                         DynamoDbScanExpression scanExpression,
-                                                         int totalSegments,
-                                                         DynamoDbMapperConfig config) {
-        throw new UnsupportedOperationException("operation not supported in " + getClass());
-    }
-
-    @Override
-    public <T> ScanResultPage<T> scanPage(Class<T> clazz, DynamoDbScanExpression scanExpression) {
-        return scanPage(clazz, scanExpression, config);
-    }
-
-    @Override
-    public <T> ScanResultPage<T> scanPage(Class<T> clazz,
-                                          DynamoDbScanExpression scanExpression,
-                                          DynamoDbMapperConfig config) {
-        throw new UnsupportedOperationException("operation not supported in " + getClass());
-    }
-
-    @Override
-    public int count(Class<?> clazz, DynamoDbScanExpression scanExpression) {
-        return count(clazz, scanExpression, config);
-    }
-
-    @Override
-    public int count(Class<?> clazz, DynamoDbScanExpression scanExpression, DynamoDbMapperConfig config) {
-        throw new UnsupportedOperationException("operation not supported in " + getClass());
-    }
-
-    @Override
-    public <T> int count(Class<T> clazz, DynamoDbQueryExpression<T> queryExpression) {
-        return count(clazz, queryExpression, config);
-    }
-
-    @Override
-    public <T> int count(Class<T> clazz, DynamoDbQueryExpression<T> queryExpression, DynamoDbMapperConfig config) {
-        throw new UnsupportedOperationException("operation not supported in " + getClass());
-    }
-
-    @Override
-    public <T> PaginatedQueryList<T> query(Class<T> clazz, DynamoDbQueryExpression<T> queryExpression) {
-        return query(clazz, queryExpression, config);
-    }
-
-    @Override
-    public <T> PaginatedQueryList<T> query(Class<T> clazz,
-                                           DynamoDbQueryExpression<T> queryExpression,
-                                           DynamoDbMapperConfig config) {
-        throw new UnsupportedOperationException("operation not supported in " + getClass());
-    }
-
-    @Override
-    public <T> QueryResultPage<T> queryPage(Class<T> clazz, DynamoDbQueryExpression<T> queryExpression) {
-        return queryPage(clazz, queryExpression, config);
-    }
-
-    @Override
-    public <T> QueryResultPage<T> queryPage(Class<T> clazz,
-                                            DynamoDbQueryExpression<T> queryExpression,
-                                            DynamoDbMapperConfig config) {
-        throw new UnsupportedOperationException("operation not supported in " + getClass());
-    }
-
-    @Override
-    public S3ClientCache s3ClientCache() {
-        throw new UnsupportedOperationException("operation not supported in " + getClass());
-    }
-
-    @Override
-    public S3Link createS3Link(String bucketName, String key) {
-        return createS3Link((Region) null, bucketName, key);
-    }
-
-    @Override
-    public S3Link createS3Link(Region s3region, String bucketName, String key) {
-        throw new UnsupportedOperationException("operation not supported in " + getClass());
-    }
-
-    @Override
-    public S3Link createS3Link(String s3region, String bucketName, String key) {
-        throw new UnsupportedOperationException("operation not supported in " + getClass());
-    }
-
-    @Override
-    public CreateTableRequest generateCreateTableRequest(Class<?> clazz) {
-        return generateCreateTableRequest(clazz, config);
-    }
-
-    public <T> CreateTableRequest generateCreateTableRequest(Class<T> clazz, DynamoDbMapperConfig config) {
-        throw new UnsupportedOperationException("operation not supported in " + getClass());
-    }
-
-    @Override
-    public DeleteTableRequest generateDeleteTableRequest(Class<?> clazz) {
-        return generateDeleteTableRequest(clazz, config);
-    }
-
-    public <T> DeleteTableRequest generateDeleteTableRequest(Class<T> clazz, DynamoDbMapperConfig config) {
-        throw new UnsupportedOperationException("operation not supported in " + getClass());
-    }
-
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/AbstractEnumMarshaller.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/AbstractEnumMarshaller.java
deleted file mode 100644
index 0bca5de2c7b3..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/AbstractEnumMarshaller.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-import static software.amazon.awssdk.core.internal.util.ThrowableUtils.failure;
-
-/**
- * Generic marshaller for enumerations.
- *
- * Please note, there are some risks in distributed systems when using
- * enumerations as attributes intead of simply using a String.
- * When adding new values to the enumeration, the enum only changes must
- * be deployed before the enumeration value can be persisted. This will
- * ensure that all systems have the correct code to map it from the item
- * record in DynamoDB to your objects.
- *
- * @see DynamoDbMarshaller
- *
- * @deprecated Replaced by {@link DynamoDbTypeConvertedEnum}
- */
-@Deprecated
-public abstract class AbstractEnumMarshaller<T extends Enum<T>> implements DynamoDbMarshaller<T> {
-
-    @Override
-    public String marshall(final T obj) {
-        try {
-            return obj.name();
-        } catch (final RuntimeException e) {
-            throw failure(e, "Unable to marshall the instance of " + obj.getClass() + " into a string");
-        }
-    }
-
-    @Override
-    public T unmarshall(final Class<T> clazz, final String obj) {
-        try {
-            return Enum.valueOf(clazz, obj);
-        } catch (final RuntimeException e) {
-            throw failure(e, "Unable to unmarshall the string " + obj + " into " + clazz);
-        }
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/ArgumentMarshaller.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/ArgumentMarshaller.java
deleted file mode 100644
index 250b043ce8ac..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/ArgumentMarshaller.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-
-/**
- * Interface to make it possible to cache the expensive type determination
- * behavior.
- */
-public interface ArgumentMarshaller {
-
-    /**
-     * Marshalls the object given into an AttributeValue.
-     */
-    AttributeValue marshall(Object obj);
-
-    interface BooleanAttributeMarshaller extends ArgumentMarshaller {
-    }
-
-    interface StringAttributeMarshaller extends ArgumentMarshaller {
-    }
-
-    interface NumberAttributeMarshaller extends ArgumentMarshaller {
-    }
-
-    interface BinaryAttributeMarshaller extends ArgumentMarshaller {
-    }
-
-    interface StringSetAttributeMarshaller extends ArgumentMarshaller {
-    }
-
-    interface NumberSetAttributeMarshaller extends ArgumentMarshaller {
-    }
-
-    interface BinarySetAttributeMarshaller extends ArgumentMarshaller {
-    }
-
-    interface ListAttributeMarshaller extends ArgumentMarshaller {
-    }
-
-    interface MapAttributeMarshaller extends ArgumentMarshaller {
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/ArgumentUnmarshaller.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/ArgumentUnmarshaller.java
deleted file mode 100644
index 85f74ed3c169..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/ArgumentUnmarshaller.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-import java.lang.reflect.Method;
-import java.text.ParseException;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-
-/**
- * Unmarshaller interface to make it possible to cache the expensive
- * type-determination behavior necessary when turning a service result back
- * into an object.
- */
-public interface ArgumentUnmarshaller {
-
-    /**
-     * Asserts that the value given can be processed using the setter given.
-     */
-    void typeCheck(AttributeValue value, Method setter);
-
-    /**
-     * Unmarshalls the {@link AttributeValue} given into an instance of the
-     * appropriate type, as determined by  {@link DynamoDbMapper}
-     *
-     * @throws ParseException when unable to parse a date string
-     */
-    Object unmarshall(AttributeValue value) throws ParseException;
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/AttributeTransformer.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/AttributeTransformer.java
deleted file mode 100644
index 0a97c4ed7b20..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/AttributeTransformer.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-import java.util.Map;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-
-/**
- * A hook allowing a custom transform/untransform of the raw attribute
- * values immediately before writing them into DynamoDB and immediately
- * after reading them out of DynamoDB, but with extra context about
- * the model class not available at the raw DynamoDbClient level.
- * <p>
- * This interface contains both a {@code transform} method and a corresponding
- * {@code untransform} method. These methods SHOULD be inverses, such that
- * untransform(transform(value)) == value.
- */
-public interface AttributeTransformer {
-    /**
-     * Transforms the input set of attribute values derived from the model
-     * object before writing them into DynamoDB.
-     *
-     * @param parameters transformation parameters
-     * @return the transformed attribute value map
-     */
-    Map<String, AttributeValue> transform(Parameters<?> parameters);
-
-    /**
-     * Untransform the input set of attribute values read from DynamoDB before
-     * creating a model object from them.
-     *
-     * @param parameters transformation parameters
-     * @return the untransformed attribute value map
-     */
-    Map<String, AttributeValue> untransform(Parameters<?> parameters);
-
-    /**
-     * Parameters for the {@code transform} and {@code untransform} methods,
-     * so we don't have to break the interface in order to add additional
-     * parameters.
-     * <p>
-     * Consuming code should NOT implement this interface.
-     */
-    interface Parameters<T> {
-        /**
-         * Returns the raw attribute values to be transformed or untransformed.
-         * The returned map is not modifiable.
-         *
-         * @return the raw attribute values to transform or untransform
-         */
-        Map<String, AttributeValue> getAttributeValues();
-
-        /**
-         * Returns true if this transformation is being called as part of a
-         * partial update operation. If true, the attributes returned by
-         * {@link #getAttributeValues()} do not represent the entire new
-         * item, but only a snapshot of the attributes which are getting
-         * new values.
-         * <p>
-         * Implementations which do not support transforming a partial
-         * view of an item (for example, because they need to calculate a
-         * signature based on all of the item's attributes that won't be valid
-         * if only a subset of the attributes are taken into consideration)
-         * should check this flag and throw an exception rather than than
-         * corrupting the data in DynamoDB.
-         * <p>
-         * This method always returns {@code false} for instances passed to
-         * {@link AttributeTransformer#untransform(Parameters)}.
-         *
-         * @return true if this operation is a partial update, false otherwise
-         */
-        boolean isPartialUpdate();
-
-        /**
-         * @return the type of the model class we're transforming to or from
-         */
-        Class<T> modelClass();
-
-        /**
-         * @return the mapper config for this operation
-         */
-        DynamoDbMapperConfig mapperConfig();
-
-        /**
-         * @return the name of the DynamoDB table the attributes were read
-         *         from or will be written to
-         */
-        String getTableName();
-
-        /**
-         * @return the name of the hash key for the table
-         */
-        String getHashKeyName();
-
-        /**
-         * @return the name of the range key for the table, if it has one,
-         *         otherwise {@code null}
-         */
-        String getRangeKeyName();
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/AttributeTransformerChain.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/AttributeTransformerChain.java
deleted file mode 100644
index e6ae9badba01..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/AttributeTransformerChain.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-
-/**
- * A virtual {@code AttributeTransformer} that transforms and untransforms
- * attributes by running them through a cascading series of child
- * {@code AttributeTransformer} instances.
- */
-public class AttributeTransformerChain implements AttributeTransformer {
-
-    private final List<AttributeTransformer> transformers;
-
-    /**
-     * Creates a new transformer chain from the given array of transformers.
-     * When transforming attributes, these transformers are invoked from first
-     * to last; when untransforming they are invoked in the opposite order.
-     *
-     * @param transformers the chain of transformers.
-     */
-    public AttributeTransformerChain(
-            final AttributeTransformer... transformers) {
-
-        this(Arrays.asList(transformers));
-    }
-
-    /**
-     * Creates a new transformer chain from the given list of transformers.
-     * When transforming attributes, these transformers are invoked from first
-     * to last; when untransforming they are invoked in the opposite order.
-     *
-     * @param transformers the chain of transformers.
-     */
-    public AttributeTransformerChain(
-            final List<AttributeTransformer> transformers) {
-
-        this.transformers = Collections.unmodifiableList(
-                new ArrayList<AttributeTransformer>(transformers));
-    }
-
-    /**
-     * @return the transformers in this chain
-     */
-    public List<AttributeTransformer> getTransformers() {
-        return transformers;
-    }
-
-    @Override
-    public Map<String, AttributeValue> transform(
-            final Parameters<?> parameters) {
-
-        ProxyParameters<?> proxy = new ProxyParameters(parameters);
-
-        for (int i = 0; i < transformers.size(); ++i) {
-            proxy.setAttributeValues(transformers.get(i).transform(proxy));
-        }
-
-        return proxy.getAttributeValues();
-    }
-
-    @Override
-    public Map<String, AttributeValue> untransform(
-            final Parameters<?> parameters) {
-
-        ProxyParameters<?> proxy = new ProxyParameters(parameters);
-
-        for (int i = transformers.size() - 1; i >= 0; --i) {
-            proxy.setAttributeValues(transformers.get(i).untransform(proxy));
-        }
-
-        return proxy.getAttributeValues();
-    }
-
-    @Override
-    public String toString() {
-        return transformers.toString();
-    }
-
-    /**
-     * A {@code Parameters} proxy that intercepts calls to
-     * {@code getAttributeValues} and overrides the return value.
-     */
-    private static class ProxyParameters<T> implements Parameters<T> {
-
-        private final Parameters<T> delegate;
-        private Map<String, AttributeValue> values;
-
-        /**
-         * Create a new proxy wrapping the given {@code Parameters} object.
-         *
-         * @param delegate the parameters object to wrap
-         */
-        ProxyParameters(final Parameters<T> delegate) {
-            this.delegate = delegate;
-            this.values = delegate.getAttributeValues();
-        }
-
-        @Override
-        public Map<String, AttributeValue> getAttributeValues() {
-            return values;
-        }
-
-        /**
-         * Changes the attribute values for this instance.
-         *
-         * @param values the new values
-         */
-        public void setAttributeValues(
-                final Map<String, AttributeValue> values) {
-            this.values = Collections.unmodifiableMap(values);
-        }
-
-        @Override
-        public boolean isPartialUpdate() {
-            return delegate.isPartialUpdate();
-        }
-
-        @Override
-        public Class<T> modelClass() {
-            return delegate.modelClass();
-        }
-
-        @Override
-        public DynamoDbMapperConfig mapperConfig() {
-            return delegate.mapperConfig();
-        }
-
-        @Override
-        public String getTableName() {
-            return delegate.getTableName();
-        }
-
-        @Override
-        public String getHashKeyName() {
-            return delegate.getHashKeyName();
-        }
-
-        @Override
-        public String getRangeKeyName() {
-            return delegate.getRangeKeyName();
-        }
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/AttributeTransformerChainTest.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/AttributeTransformerChainTest.java
deleted file mode 100644
index d5be9c5680bb..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/AttributeTransformerChainTest.java
+++ /dev/null
@@ -1,193 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import org.junit.Assert;
-import org.junit.Test;
-import software.amazon.awssdk.services.dynamodb.datamodeling.AttributeTransformer.Parameters;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-
-public class AttributeTransformerChainTest {
-    @Test
-    public void testTransformEmptyChain() {
-
-        AttributeTransformer transformer = new AttributeTransformerChain(
-                Collections.<AttributeTransformer>emptyList()
-        );
-
-        Map<String, AttributeValue> values =
-                new HashMap<String, AttributeValue>();
-
-        Parameters<?> params = new TestParameters<Object>(values);
-
-        Map<String, AttributeValue> result = transformer.transform(params);
-        Assert.assertSame(values, result);
-        Assert.assertTrue(values.isEmpty());
-    }
-
-    @Test
-    public void testUntransformEmptyChain() {
-
-        AttributeTransformer transformer = new AttributeTransformerChain(
-                Collections.<AttributeTransformer>emptyList()
-        );
-
-        Map<String, AttributeValue> values =
-                new HashMap<String, AttributeValue>();
-
-        Parameters<?> params = new TestParameters<Object>(values);
-
-        Map<String, AttributeValue> result = transformer.untransform(params);
-        Assert.assertSame(values, result);
-        Assert.assertTrue(values.isEmpty());
-    }
-
-    @Test
-    public void testTransform() {
-
-        AttributeTransformer transformer1 = new TestTransformer(".one");
-        AttributeTransformer transformer2 = new TestTransformer(".two");
-
-        AttributeTransformer chain =
-                new AttributeTransformerChain(transformer1, transformer2);
-
-        Map<String, AttributeValue> values =
-                new HashMap<String, AttributeValue>();
-
-        values.put("test1", AttributeValue.builder().s("foo").build());
-        values.put("test2", AttributeValue.builder().s("bar").build());
-
-        Parameters<?> params = new TestParameters<Object>(values);
-
-        Map<String, AttributeValue> result = chain.transform(params);
-
-        Assert.assertNotNull(result);
-        Assert.assertEquals(2, result.size());
-
-        Assert.assertEquals("foo.one.two", result.get("test1").s());
-        Assert.assertEquals("bar.one.two", result.get("test2").s());
-    }
-
-    @Test
-    public void testUntransform() {
-
-        AttributeTransformer transformer1 = new TestTransformer(".one");
-        AttributeTransformer transformer2 = new TestTransformer(".two");
-
-        AttributeTransformer chain =
-                new AttributeTransformerChain(transformer1, transformer2);
-
-        Map<String, AttributeValue> values =
-                new HashMap<String, AttributeValue>();
-
-        values.put("test1", AttributeValue.builder().s("foo.one.two").build());
-        values.put("test2", AttributeValue.builder().s("bar.one.two").build());
-
-        Parameters<?> params = new TestParameters<Object>(values);
-
-        Map<String, AttributeValue> result = chain.untransform(params);
-
-        Assert.assertNotNull(result);
-        Assert.assertEquals(2, result.size());
-
-        Assert.assertEquals("foo", result.get("test1").s());
-        Assert.assertEquals("bar", result.get("test2").s());
-    }
-
-    @Test
-    public void testRoundTrip() {
-
-        AttributeTransformer transformer1 = new TestTransformer(".one");
-        AttributeTransformer transformer2 = new TestTransformer(".two");
-
-        AttributeTransformer chain =
-                new AttributeTransformerChain(transformer1, transformer2);
-
-        Map<String, AttributeValue> values =
-                new HashMap<String, AttributeValue>();
-
-        values.put("test1", AttributeValue.builder().s("foo").build());
-        values.put("test2", AttributeValue.builder().s("bar").build());
-
-        Parameters<?> params = new TestParameters<Object>(values);
-
-        Map<String, AttributeValue> result = chain.transform(params);
-
-        params = new TestParameters<Object>(result);
-
-        result = chain.untransform(params);
-
-        Assert.assertEquals(values, result);
-    }
-
-    private static class TestTransformer implements AttributeTransformer {
-
-        private final String appendMe;
-
-        public TestTransformer(final String appendMe) {
-            this.appendMe = appendMe;
-        }
-
-        @Override
-        public Map<String, AttributeValue> transform(
-                final Parameters<?> parameters) {
-
-            Map<String, AttributeValue> rval =
-                    new HashMap<String, AttributeValue>();
-
-            for (Map.Entry<String, AttributeValue> entry
-                    : parameters.getAttributeValues().entrySet()) {
-
-                rval.put(entry.getKey(), transform(entry.getValue()));
-            }
-
-            return rval;
-        }
-
-        @Override
-        public Map<String, AttributeValue> untransform(
-                final Parameters<?> parameters) {
-
-            Map<String, AttributeValue> rval =
-                    new HashMap<String, AttributeValue>();
-
-            for (Map.Entry<String, AttributeValue> entry
-                    : parameters.getAttributeValues().entrySet()) {
-
-                rval.put(entry.getKey(), untransform(entry.getValue()));
-            }
-
-            return rval;
-        }
-
-        private AttributeValue transform(AttributeValue value) {
-            return AttributeValue.builder().s(value.s() + appendMe).build();
-        }
-
-        private AttributeValue untransform(AttributeValue value) {
-            String s = value.s();
-            if (s.endsWith(appendMe)) {
-                return AttributeValue.builder().s(
-                        s.substring(0, s.length() - appendMe.length())).build();
-            } else {
-                return value;
-            }
-        }
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/BatchLoadContext.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/BatchLoadContext.java
deleted file mode 100644
index 8a9375d401a3..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/BatchLoadContext.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-import software.amazon.awssdk.services.dynamodb.model.BatchGetItemRequest;
-import software.amazon.awssdk.services.dynamodb.model.BatchGetItemResponse;
-import software.amazon.awssdk.utils.Validate;
-
-
-/**
- * Container object that has information about the batch load request made to DynamoDB.
- *
- * @author avinam
- */
-public class BatchLoadContext {
-    /**
-     * The BatchGetItemRequest.
-     */
-    private BatchGetItemRequest batchGetItemRequest;
-    /**
-     * The BatchGetItemResponse returned by the DynamoDB client.
-     */
-    private BatchGetItemResponse batchGetItemResponse;
-    /**
-     * The number of times the request has been retried.
-     */
-    private int retriesAttempted;
-
-    /**
-     * Instantiates a new BatchLoadContext.
-     *  @param batchGetItemRequest  see {@link BatchGetItemRequest}.
-     * */
-    public BatchLoadContext(BatchGetItemRequest batchGetItemRequest) {
-        this.batchGetItemRequest = Validate.paramNotNull(batchGetItemRequest, "batchGetItemRequest");
-        this.batchGetItemResponse = null;
-        this.retriesAttempted = 0;
-    }
-
-    public BatchGetItemRequest getBatchGetItemRequest() {
-        return batchGetItemRequest;
-    }
-
-    public void setBatchGetItemRequest(BatchGetItemRequest batchGetItemRequest) {
-        this.batchGetItemRequest = batchGetItemRequest;
-    }
-
-    /**
-     * @return the BatchGetItemResponse
-     */
-    public BatchGetItemResponse batchGetItemResponse() {
-        return batchGetItemResponse;
-    }
-
-    /**
-     * @return the BatchGetItemResponse
-     */
-    public void setBatchGetItemResponse(BatchGetItemResponse batchGetItemResponse) {
-        this.batchGetItemResponse = batchGetItemResponse;
-    }
-
-
-    /**
-     * @return the BatchGetItemRequest.
-     */
-    public BatchGetItemRequest batchGetItemRequest() {
-        return batchGetItemRequest;
-    }
-
-    /**
-     * Gets the retriesAttempted.
-     *
-     * @return the retriesAttempted
-     */
-    public int getRetriesAttempted() {
-        return retriesAttempted;
-    }
-
-    /**
-     * Sets retriesAttempted.
-     *
-     * @param retriesAttempted the number of retries attempted
-     */
-    public void setRetriesAttempted(int retriesAttempted) {
-        this.retriesAttempted = retriesAttempted;
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/BatchLoadRetryStrategyTest.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/BatchLoadRetryStrategyTest.java
deleted file mode 100644
index 43f9aab165f0..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/BatchLoadRetryStrategyTest.java
+++ /dev/null
@@ -1,278 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.runners.MockitoJUnitRunner;
-
-// Commenting out the test class as its broken and we don't support mapper yet
-@RunWith(MockitoJUnitRunner.class)
-public class BatchLoadRetryStrategyTest {
-
-    @Test
-    public void dummyTest() {
-
-    }
-
-//    private static final String TABLE_NAME = "tableName";
-//    private static final String TABLE_NAME2 = "tableName2";
-//    private static final String TABLE_NAME3 = "tableName3";
-//    private static final String HASH_ATTR = "hash";
-//
-//    // private static BatchGetItemResponse batchGetItemResponse;
-//    private static List<Object> itemsToGet;
-//
-//    static {
-//
-//        itemsToGet = new ArrayList<Object>();
-//        itemsToGet.add(new Item3("Bruce Wayne"));
-//        itemsToGet.add(new Item2("Is"));
-//        itemsToGet.add(new Item("Batman"));
-//    }
-//
-//    @Rule
-//    public final ExpectedException thrown = ExpectedException.none();
-//
-//    @Mock
-//    private DynamoDbClient ddbMock;
-//    @Mock
-//    private BatchGetItemRequest mockItemRequest;
-//    @Mock
-//    private BatchGetItemResponse mockItemResult;
-//
-//    @Test
-//    public void testBatchReadCallFailure_NoRetry() {
-//        when(ddbMock.batchGetItem(any(DynamoDbRequest.class)))
-//            .thenReturn(buildDefaultGetItemResponse().toBuilder().unprocessedKeys(buildUnprocessedKeysMap(1)).build());
-//        DynamoDbMapperConfig config =
-//                getConfigWithCustomBatchLoadRetryStrategy(new DynamoDbMapperConfig.NoRetryBatchLoadRetryStrategy());
-//        DynamoDbMapper mapper = new DynamoDbMapper(ddbMock, config);
-//
-//        thrown.expect(BatchGetItemException.class);
-//        mapper.batchLoad(itemsToGet);
-//        verify(ddbMock, times(1)).batchGetItem(any(BatchGetItemRequest.class));
-//    }
-//
-//    @Test
-//    public void testBatchReadCallFailure_Retry() {
-//        when(ddbMock.batchGetItem(any(BatchGetItemRequest.class)))
-//                .thenReturn(buildDefaultGetItemResponse().toBuilder().unprocessedKeys(buildUnprocessedKeysMap(1)).build());
-//
-//        DynamoDbMapper mapper = new DynamoDbMapper(ddbMock, getConfigWithCustomBatchLoadRetryStrategy(new BatchLoadRetryStrategyWithNoDelay(3)));
-//
-//
-//        thrown.expect(BatchGetItemException.class);
-//        mapper.batchLoad(itemsToGet);
-//        verify(ddbMock, times(4)).batchGetItem(any(BatchGetItemRequest.class));
-//    }
-//
-//    @Test
-//    public void testBatchReadCallSuccess_Retry() {
-//        when(ddbMock.batchGetItem(any(BatchGetItemRequest.class)))
-//            .thenReturn(buildDefaultGetItemResponse().toBuilder().unprocessedKeys(new HashMap<>(1)).build());
-//
-//        DynamoDbMapperConfig config =
-//                getConfigWithCustomBatchLoadRetryStrategy(new DynamoDbMapperConfig.DefaultBatchLoadRetryStrategy());
-//        DynamoDbMapper mapper = new DynamoDbMapper(ddbMock, config);
-//
-//        mapper.batchLoad(itemsToGet);
-//        verify(ddbMock, times(1)).batchGetItem(any(BatchGetItemRequest.class));
-//    }
-//
-//    @Test
-//    public void testBatchReadCallFailure_Retry_RetryOnCompleteFailure() {
-//        when(ddbMock.batchGetItem(any(BatchGetItemRequest.class)))
-//                .thenReturn(buildDefaultGetItemResponse().toBuilder().unprocessedKeys(buildUnprocessedKeysMap(3)).build());
-//        DynamoDbMapperConfig config =
-//                getConfigWithCustomBatchLoadRetryStrategy(new DynamoDbMapperConfig.DefaultBatchLoadRetryStrategy());
-//        DynamoDbMapper mapper = new DynamoDbMapper(ddbMock, config);
-//
-//        thrown.expect(BatchGetItemException.class);
-//        mapper.batchLoad(itemsToGet);
-//        verify(ddbMock, times(6)).batchGetItem(any(BatchGetItemRequest.class));
-//    }
-//
-//    @Test
-//    public void testBatchReadCallFailure_NoRetry_RetryOnCompleteFailure() {
-//        when(ddbMock.batchGetItem(any(BatchGetItemRequest.class)))
-//                .thenReturn(buildDefaultGetItemResponse().toBuilder().unprocessedKeys(buildUnprocessedKeysMap(3)).build());
-//        DynamoDbMapperConfig config =
-//                getConfigWithCustomBatchLoadRetryStrategy(new DynamoDbMapperConfig.NoRetryBatchLoadRetryStrategy());
-//        DynamoDbMapper mapper = new DynamoDbMapper(ddbMock, config);
-//
-//        thrown.expect(BatchGetItemException.class);
-//        mapper.batchLoad(itemsToGet);
-//        verify(ddbMock, times(1)).batchGetItem(any(BatchGetItemRequest.class));
-//    }
-//
-//    @Test
-//    public void testNoDelayOnPartialFailure_DefaultRetry() {
-//        BatchLoadRetryStrategy defaultRetryStrategy = new DynamoDbMapperConfig.DefaultBatchLoadRetryStrategy();
-//        when(mockItemResult.unprocessedKeys()).thenReturn(buildUnprocessedKeysMap(2));
-//        when(mockItemRequest.requestItems()).thenReturn(buildUnprocessedKeysMap(3));
-//        BatchLoadContext context = new BatchLoadContext(mockItemRequest);
-//        context.setBatchGetItemResponse(mockItemResult);
-//        context.setRetriesAttempted(2);
-//        assertEquals(0, defaultRetryStrategy.getDelayBeforeNextRetry(context));
-//    }
-//
-//    @Test
-//    public void testDelayOnPartialFailure_DefaultRetry() {
-//        BatchLoadRetryStrategy defaultRetryStrategy = new DynamoDbMapperConfig.DefaultBatchLoadRetryStrategy();
-//        when(mockItemResult.unprocessedKeys()).thenReturn(buildUnprocessedKeysMap(3));
-//        when(mockItemRequest.requestItems()).thenReturn(buildUnprocessedKeysMap(3));
-//
-//        BatchLoadContext context = new BatchLoadContext(mockItemRequest);
-//        context.setBatchGetItemResponse(mockItemResult);
-//        context.setRetriesAttempted(2);
-//        assertTrue(defaultRetryStrategy.getDelayBeforeNextRetry(context) > 0);
-//    }
-//
-//    private DynamoDbMapperConfig getConfigWithCustomBatchLoadRetryStrategy(final BatchLoadRetryStrategy batchReadRetryStrategy) {
-//        return new DynamoDbMapperConfig.Builder().withBatchLoadRetryStrategy(batchReadRetryStrategy).build();
-//    }
-//
-//    private Map<String, KeysAndAttributes> buildUnprocessedKeysMap(final int size) {
-//        final Map<String, KeysAndAttributes> unproccessedKeys = new HashMap<String, KeysAndAttributes>(size);
-//        for (int i = 0; i < size; i++) {
-//            unproccessedKeys.put("test" + i, KeysAndAttributes.builder().build());
-//        }
-//
-//        return unproccessedKeys;
-//    }
-//
-//    private BatchGetItemResponse buildDefaultGetItemResponse() {
-//
-//        final Map<String, List<Map<String, AttributeValue>>> map = new HashMap<String, List<Map<String, AttributeValue>>>();
-//        return BatchGetItemResponse.builder().responses(map).build();
-//
-//    }
-//
-//    static class BatchLoadRetryStrategyWithNoDelay implements BatchLoadRetryStrategy {
-//
-//        private final int maxRetry;
-//
-//        public BatchLoadRetryStrategyWithNoDelay(final int maxRetry) {
-//            this.maxRetry = maxRetry;
-//        }
-//
-//        /**
-//         * @see BatchLoadRetryStrategy#maxRetryOnUnprocessedKeys(java.util.Map, java.util.Map)
-//         */
-//        @Override
-//        public boolean shouldRetry(final BatchLoadContext batchLoadContext) {
-//            return batchLoadContext.getRetriesAttempted() < maxRetry;
-//        }
-//
-//        /**
-//         * @see BatchLoadRetryStrategy#getDelayBeforeNextRetry(java.util.Map, int)
-//         */
-//        @Override
-//        public long getDelayBeforeNextRetry(final BatchLoadContext batchLoadContext) {
-//            return 0;
-//        }
-//
-//
-//    }
-//
-//    @DynamoDbTable(tableName = TABLE_NAME)
-//    public static class Item {
-//
-//        private String hash;
-//
-//        public Item(final String hash) {
-//            this.hash = hash;
-//        }
-//
-//        @DynamoDbAttribute(attributeName = HASH_ATTR)
-//        @DynamoDbHashKey
-//        public String getHash() {
-//            return hash;
-//        }
-//
-//        public void setHash(final String hash) {
-//            this.hash = hash;
-//        }
-//
-//        public WriteRequest toPutSaveRequest() {
-//            return WriteRequest.builder()
-//                    .putRequest(PutRequest.builder()
-//                        .item(Collections.singletonMap(HASH_ATTR, AttributeValue.builder().s(hash).build()))
-//                        .build())
-//                    .build();
-//        }
-//    }
-//
-//    @DynamoDbTable(tableName = TABLE_NAME2)
-//    public static class Item2 {
-//
-//        private String hash;
-//
-//        public Item2(final String hash) {
-//            this.hash = hash;
-//        }
-//
-//        @DynamoDbAttribute(attributeName = HASH_ATTR)
-//        @DynamoDbHashKey
-//        public String getHash() {
-//            return hash;
-//        }
-//
-//        public void setHash(final String hash) {
-//            this.hash = hash;
-//        }
-//
-//        public WriteRequest toPutSaveRequest() {
-//            return WriteRequest.builder()
-//                    .putRequest(PutRequest.builder()
-//                            .item(Collections.singletonMap(HASH_ATTR, AttributeValue.builder().s(hash)
-//                                    .build()))
-//                            .build())
-//                    .build();
-//        }
-//    }
-//
-//    @DynamoDbTable(tableName = TABLE_NAME3)
-//    public static class Item3 {
-//
-//        private String hash;
-//
-//        public Item3(final String hash) {
-//            this.hash = hash;
-//        }
-//
-//        @DynamoDbAttribute(attributeName = HASH_ATTR)
-//        @DynamoDbHashKey
-//        public String getHash() {
-//            return hash;
-//        }
-//
-//        public void setHash(final String hash) {
-//            this.hash = hash;
-//        }
-//
-//        public WriteRequest toPutSaveRequest() {
-//            return WriteRequest.builder()
-//                    .putRequest(PutRequest.builder()
-//                            .item(Collections.singletonMap(HASH_ATTR, AttributeValue.builder()
-//                                    .s(hash)
-//                                    .build()))
-//                            .build())
-//                    .build();
-//        }
-//    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/BatchWriteRetryStrategyTest.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/BatchWriteRetryStrategyTest.java
deleted file mode 100644
index 5d69001b2412..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/BatchWriteRetryStrategyTest.java
+++ /dev/null
@@ -1,192 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-import junit.framework.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
-import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMapper.FailedBatch;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMapperConfig.BatchWriteRetryStrategy;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-import software.amazon.awssdk.services.dynamodb.model.BatchWriteItemRequest;
-import software.amazon.awssdk.services.dynamodb.model.BatchWriteItemResponse;
-import software.amazon.awssdk.services.dynamodb.model.PutRequest;
-import software.amazon.awssdk.services.dynamodb.model.WriteRequest;
-
-@RunWith(MockitoJUnitRunner.class)
-public class BatchWriteRetryStrategyTest {
-
-    private static final int MAX_RETRY = 10;
-    private static final String TABLE_NAME = "tableName";
-    private static final String HASH_ATTR = "hash";
-
-    private static Map<String, List<WriteRequest>> unprocessedItems;
-
-    static {
-        WriteRequest writeReq = WriteRequest.builder()
-                .putRequest(PutRequest.builder()
-                        .item(Collections.singletonMap(
-                                HASH_ATTR,
-                                AttributeValue.builder().s("foo").build()))
-                        .build())
-                .build();
-
-        unprocessedItems = Collections.singletonMap(TABLE_NAME,
-                                                    Arrays.asList(writeReq));
-    }
-
-    @Mock
-    private DynamoDbClient ddbMock;
-
-    private DynamoDbMapper mapper;
-
-    @Before
-    public void setup() {
-        mapper = new DynamoDbMapper(
-                ddbMock,
-                getConfigWithCustomBatchWriteRetryStrategy(
-                        new BatchWriteRetryStrategyWithNoDelay(MAX_RETRY)));
-    }
-
-    @Test
-    public void testBatchWriteItemCallSuccess_NoRetry() {
-        when(ddbMock.batchWriteItem(any(BatchWriteItemRequest.class)))
-            .thenReturn(BatchWriteItemResponse.builder().unprocessedItems(Collections.<String, List<WriteRequest>>emptyMap()).build());
-
-        List<FailedBatch> failedBatches = mapper.batchSave(new Item("foo"));
-
-        verify(ddbMock, times(1)).batchWriteItem(any(BatchWriteItemRequest.class));
-        Assert.assertEquals(0, failedBatches.size());
-    }
-
-    @Test
-    public void testUnprocessedItemReturned_BatchWriteItemCallNotExceedMaxRetry() {
-        when(ddbMock.batchWriteItem(any(BatchWriteItemRequest.class)))
-            .thenReturn(BatchWriteItemResponse.builder().unprocessedItems(unprocessedItems).build());
-
-        List<FailedBatch> failedBatches = mapper.batchSave(new Item("foo"));
-        verify(ddbMock, times(MAX_RETRY + 1)).batchWriteItem(any(BatchWriteItemRequest.class));
-
-        Assert.assertEquals(1, failedBatches.size());
-        FailedBatch failedBatch = failedBatches.get(0);
-
-        Assert.assertEquals(
-                "Failed batch should contain the same UnprocessedItems returned in the BatchWriteItem response.",
-                unprocessedItems,
-                failedBatch.getUnprocessedItems());
-        Assert.assertNull(
-                "No exception should be set if the batch failed after max retry",
-                failedBatch.getException());
-    }
-
-    @Test
-    public void testExceptionThrown_NoRetry() {
-
-        RuntimeException exception = new RuntimeException("BOOM");
-
-        when(ddbMock.batchWriteItem(any(BatchWriteItemRequest.class))).thenThrow(exception);
-
-        // put a random item
-        Item item = new Item(UUID.randomUUID().toString());
-        List<FailedBatch> failedBatches = mapper.batchSave(item);
-
-        Assert.assertEquals(1, failedBatches.size());
-        FailedBatch failedBatch = failedBatches.get(0);
-
-        Assert.assertEquals(
-                "Failed batch should contain all the input items for batchWrite",
-                Collections.singletonMap(TABLE_NAME, Arrays.asList(item.toPutSaveRequest())),
-                failedBatch.getUnprocessedItems());
-        Assert.assertSame(
-                "The exception should be the same as one thrown by BatchWriteItem",
-                exception,
-                failedBatch.getException());
-    }
-
-    private DynamoDbMapperConfig getConfigWithCustomBatchWriteRetryStrategy(
-            BatchWriteRetryStrategy batchWriteRetryStrategy) {
-        return new DynamoDbMapperConfig.Builder()
-                .withBatchWriteRetryStrategy(batchWriteRetryStrategy)
-                .build();
-    }
-
-    private static class BatchWriteRetryStrategyWithNoDelay implements
-                                                            BatchWriteRetryStrategy {
-
-        private final int maxRetry;
-
-        public BatchWriteRetryStrategyWithNoDelay(int maxRety) {
-            this.maxRetry = maxRety;
-        }
-
-        @Override
-        public int maxRetryOnUnprocessedItems(
-                Map<String, List<WriteRequest>> batchWriteItemInput) {
-            return maxRetry;
-        }
-
-        @Override
-        public long getDelayBeforeRetryUnprocessedItems(
-                Map<String, List<WriteRequest>> unprocessedItems,
-                int retriesAttempted) {
-            return 0;
-        }
-
-    }
-
-    @DynamoDbTable(tableName = TABLE_NAME)
-    public static class Item {
-
-        private String hash;
-
-        public Item(String hash) {
-            this.hash = hash;
-        }
-
-        @DynamoDbHashKey
-        @DynamoDbAttribute(attributeName = HASH_ATTR)
-        public String getHash() {
-            return hash;
-        }
-
-        public void setHash(String hash) {
-            this.hash = hash;
-        }
-
-        public WriteRequest toPutSaveRequest() {
-            return WriteRequest.builder()
-                    .putRequest(PutRequest.builder()
-                            .item(Collections.singletonMap(HASH_ATTR, AttributeValue.builder().s(hash).build()))
-                            .build())
-                    .build();
-        }
-    }
-
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/CachingMarshallerSetTest.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/CachingMarshallerSetTest.java
deleted file mode 100644
index 621d59254c8b..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/CachingMarshallerSetTest.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-import java.lang.reflect.Method;
-import java.lang.reflect.Type;
-import java.util.ArrayDeque;
-import java.util.Deque;
-import org.junit.Assert;
-import org.junit.Test;
-import software.amazon.awssdk.services.dynamodb.datamodeling.ConversionSchemas.CachingMarshallerSet;
-import software.amazon.awssdk.services.dynamodb.datamodeling.ConversionSchemas.MarshallerSet;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-import software.amazon.awssdk.services.dynamodb.pojos.TestClass;
-
-public class CachingMarshallerSetTest {
-
-    private static final TestMarshallerSet MOCK = new TestMarshallerSet();
-    private static final MarshallerSet SUT = new CachingMarshallerSet(MOCK);
-
-    @Test
-    public void testIt() throws Exception {
-        ArgumentMarshaller marshaller = new ArgumentMarshaller() {
-            @Override
-            public AttributeValue marshall(Object value) {
-                return null;
-            }
-        };
-
-        MOCK.queue.add(marshaller);
-
-        ArgumentMarshaller result = SUT.marshaller(
-                TestClass.class.getMethod("getString"));
-
-        Assert.assertSame(marshaller, result);
-
-        result = SUT.marshaller(TestClass.class.getMethod("getString"));
-
-        Assert.assertSame(marshaller, result);
-
-        ArgumentMarshaller marshaller2 = new ArgumentMarshaller() {
-            @Override
-            public AttributeValue marshall(Object value) {
-                return null;
-            }
-        };
-
-        MOCK.queue.add(marshaller2);
-
-        result = SUT.marshaller(TestClass.class.getMethod("getInt"));
-
-        Assert.assertSame(marshaller2, result);
-    }
-
-    private static class TestMarshallerSet implements MarshallerSet {
-
-        private final Deque<ArgumentMarshaller> queue =
-                new ArrayDeque<ArgumentMarshaller>();
-
-        private final Deque<ArgumentMarshaller> memberQueue =
-                new ArrayDeque<ArgumentMarshaller>();
-
-        @Override
-        public ArgumentMarshaller marshaller(Method getter) {
-            return queue.remove();
-        }
-
-        @Override
-        public ArgumentMarshaller memberMarshaller(Type memberType) {
-            return memberQueue.remove();
-        }
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/CachingUnmarshallerSetTest.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/CachingUnmarshallerSetTest.java
deleted file mode 100644
index cb1afce82b2e..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/CachingUnmarshallerSetTest.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-import java.lang.reflect.Method;
-import java.lang.reflect.Type;
-import java.util.ArrayDeque;
-import java.util.Deque;
-import org.junit.Assert;
-import org.junit.Test;
-import software.amazon.awssdk.services.dynamodb.datamodeling.ConversionSchemas.CachingUnmarshallerSet;
-import software.amazon.awssdk.services.dynamodb.datamodeling.ConversionSchemas.UnmarshallerSet;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-import software.amazon.awssdk.services.dynamodb.pojos.TestClass;
-
-public class CachingUnmarshallerSetTest {
-
-    private static final TestUnmarshallerSet MOCK = new TestUnmarshallerSet();
-    private static final UnmarshallerSet SUT = new CachingUnmarshallerSet(MOCK);
-
-    @Test
-    public void testIt() throws Exception {
-        ArgumentUnmarshaller unmarshaller = new ArgumentUnmarshaller() {
-            @Override
-            public void typeCheck(AttributeValue value, Method setter) {
-            }
-
-            @Override
-            public Object unmarshall(AttributeValue value) {
-                return null;
-            }
-        };
-
-        MOCK.queue.add(unmarshaller);
-
-        ArgumentUnmarshaller result = SUT.getUnmarshaller(
-                TestClass.class.getMethod("getString"),
-                TestClass.class.getMethod("setString", String.class));
-
-        Assert.assertSame(unmarshaller, result);
-
-        result = SUT.getUnmarshaller(
-                TestClass.class.getMethod("getString"),
-                TestClass.class.getMethod("setString", String.class));
-
-        Assert.assertSame(unmarshaller, result);
-
-        ArgumentUnmarshaller unmarshaller2 = new ArgumentUnmarshaller() {
-            @Override
-            public void typeCheck(AttributeValue value, Method setter) {
-            }
-
-            @Override
-            public Object unmarshall(AttributeValue value) {
-                return null;
-            }
-        };
-
-        MOCK.queue.add(unmarshaller2);
-
-        result = SUT.getUnmarshaller(
-                TestClass.class.getMethod("getInt"),
-                TestClass.class.getMethod("setInt", int.class));
-
-        Assert.assertSame(unmarshaller2, result);
-    }
-
-    private static class TestUnmarshallerSet implements UnmarshallerSet {
-
-        private final Deque<ArgumentUnmarshaller> queue =
-                new ArrayDeque<ArgumentUnmarshaller>();
-
-        private final Deque<ArgumentUnmarshaller> memberQueue =
-                new ArrayDeque<ArgumentUnmarshaller>();
-
-        @Override
-        public ArgumentUnmarshaller getUnmarshaller(Method getter, Method setter) {
-            return queue.remove();
-        }
-
-        @Override
-        public ArgumentUnmarshaller memberUnmarshaller(Type type) {
-            return memberQueue.remove();
-        }
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/ConfigureS3LinksTest.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/ConfigureS3LinksTest.java
deleted file mode 100644
index 34e9f14eb9ef..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/ConfigureS3LinksTest.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-
-import org.junit.Before;
-import org.junit.Test;
-import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
-import software.amazon.awssdk.regions.Region;
-
-public class ConfigureS3LinksTest {
-
-    private S3ClientCache s3cc;
-
-    @Before
-    public void setUp() throws Exception {
-        s3cc = new S3ClientCache(AwsBasicCredentials.create("mock", "mock"));
-    }
-
-    @Test
-    public void testS3LinkWithStringRegion() {
-        CorrectTestClass obj = new CorrectTestClass();
-        S3Link s3 = new S3Link(s3cc, "ap-southeast-1", "nonexisting-test-bucketname2", "key");
-        obj.setS3(s3);
-
-        assertNotNull(obj.s3());
-        assertEquals("nonexisting-test-bucketname2", obj.s3().bucketName());
-        assertSame(Region.AP_SOUTHEAST_1.id(), obj.s3().s3Region().id());
-        assertSame("ap-southeast-1", obj.s3().getRegion());
-    }
-
-    @Test
-    public void testManyS3LinksClass() {
-        ManyS3LinksTestClass obj = new ManyS3LinksTestClass();
-        assertNull(obj.s31());
-    }
-
-    @DynamoDbTable(tableName = "nonexisting-test-tablename")
-    public static class CorrectTestClass {
-
-        private String hk;
-        private S3Link s3;
-
-        public CorrectTestClass() {
-        }
-
-        @DynamoDbHashKey
-        public String getHk() {
-            return hk;
-        }
-
-        public void setHk(String hk) {
-            this.hk = hk;
-        }
-
-        public S3Link s3() {
-            return s3;
-        }
-
-        public void setS3(S3Link s3) {
-            this.s3 = s3;
-        }
-    }
-
-    @DynamoDbTable(tableName = "nonexisting-test-tablename")
-    public static class ManyS3LinksTestClass {
-
-        private String hk;
-        private S3Link s31;
-        private S3Link s32;
-        private S3Link s33;
-        private S3Link s34;
-        private S3Link s35;
-        private S3Link s36;
-
-        public ManyS3LinksTestClass() {
-        }
-
-        @DynamoDbHashKey
-        public String getHk() {
-            return hk;
-        }
-
-        public void setHk(String hk) {
-            this.hk = hk;
-        }
-
-        public S3Link s31() {
-            return s31;
-        }
-
-        public void setS31(S3Link s31) {
-            this.s31 = s31;
-        }
-
-        public S3Link s32() {
-            return s32;
-        }
-
-        public void setS32(S3Link s32) {
-            this.s32 = s32;
-        }
-
-        public S3Link s33() {
-            return s33;
-        }
-
-        public void setS33(S3Link s33) {
-            this.s33 = s33;
-        }
-
-        public S3Link s34() {
-            return s34;
-        }
-
-        public void setS34(S3Link s34) {
-            this.s34 = s34;
-        }
-
-        public S3Link s35() {
-            return s35;
-        }
-
-        public void setS35(S3Link s35) {
-            this.s35 = s35;
-        }
-
-        public S3Link s36() {
-            return s36;
-        }
-
-        public void setS36(S3Link s36) {
-            this.s36 = s36;
-        }
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/ConversionSchema.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/ConversionSchema.java
deleted file mode 100644
index 5aa31c40fbeb..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/ConversionSchema.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * A strategy for mapping between Java types and DynamoDB types. Serves as a
- * factory for {@code ItemConverter} instances that implement this mapping.
- * Standard implementations are available in the {@link ConversionSchemas}
- * class.
- */
-public interface ConversionSchema {
-
-    /**
-     * Creates an {@code ItemConverter}, injecting dependencies from the
-     * {@code DynamoDBMapper} that needs it.
-     *
-     * @param dependencies the dependencies to inject
-     * @return a new ItemConverter
-     */
-    ItemConverter getConverter(Dependencies dependencies);
-
-    /**
-     * Dependency injection for the {@code ItemConverter}s that this
-     * {@code ConversionSchema} generates.
-     */
-    class Dependencies {
-
-        private final Map<Class<?>, Object> values;
-
-        public Dependencies() {
-            values = new HashMap<Class<?>, Object>();
-        }
-
-        @SuppressWarnings("unchecked")
-        public <T> T get(Class<T> clazz) {
-            return (T) values.get(clazz);
-        }
-
-        public <T> Dependencies with(Class<T> clazz, T value) {
-            values.put(clazz, value);
-            return this;
-        }
-
-        @Override
-        public String toString() {
-            return values.toString();
-        }
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/ConversionSchemas.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/ConversionSchemas.java
deleted file mode 100644
index 4249ecce85e6..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/ConversionSchemas.java
+++ /dev/null
@@ -1,1493 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-import java.lang.reflect.Method;
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.nio.ByteBuffer;
-import java.text.ParseException;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import software.amazon.awssdk.services.dynamodb.datamodeling.ArgumentMarshaller.BinaryAttributeMarshaller;
-import software.amazon.awssdk.services.dynamodb.datamodeling.ArgumentMarshaller.BinarySetAttributeMarshaller;
-import software.amazon.awssdk.services.dynamodb.datamodeling.ArgumentMarshaller.BooleanAttributeMarshaller;
-import software.amazon.awssdk.services.dynamodb.datamodeling.ArgumentMarshaller.ListAttributeMarshaller;
-import software.amazon.awssdk.services.dynamodb.datamodeling.ArgumentMarshaller.MapAttributeMarshaller;
-import software.amazon.awssdk.services.dynamodb.datamodeling.ArgumentMarshaller.NumberAttributeMarshaller;
-import software.amazon.awssdk.services.dynamodb.datamodeling.ArgumentMarshaller.NumberSetAttributeMarshaller;
-import software.amazon.awssdk.services.dynamodb.datamodeling.ArgumentMarshaller.StringAttributeMarshaller;
-import software.amazon.awssdk.services.dynamodb.datamodeling.ArgumentMarshaller.StringSetAttributeMarshaller;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMapperFieldModel.DynamoDbAttributeType;
-import software.amazon.awssdk.services.dynamodb.datamodeling.StandardBeanProperties.Bean;
-import software.amazon.awssdk.services.dynamodb.datamodeling.StandardModelFactories.Rule;
-import software.amazon.awssdk.services.dynamodb.datamodeling.StandardModelFactories.RuleFactory;
-import software.amazon.awssdk.services.dynamodb.datamodeling.marshallers.BooleanSetToNumberSetMarshaller;
-import software.amazon.awssdk.services.dynamodb.datamodeling.marshallers.BooleanToBooleanMarshaller;
-import software.amazon.awssdk.services.dynamodb.datamodeling.marshallers.BooleanToNumberMarshaller;
-import software.amazon.awssdk.services.dynamodb.datamodeling.marshallers.ByteArraySetToBinarySetMarshaller;
-import software.amazon.awssdk.services.dynamodb.datamodeling.marshallers.ByteArrayToBinaryMarshaller;
-import software.amazon.awssdk.services.dynamodb.datamodeling.marshallers.ByteBufferSetToBinarySetMarshaller;
-import software.amazon.awssdk.services.dynamodb.datamodeling.marshallers.ByteBufferToBinaryMarshaller;
-import software.amazon.awssdk.services.dynamodb.datamodeling.marshallers.CalendarSetToStringSetMarshaller;
-import software.amazon.awssdk.services.dynamodb.datamodeling.marshallers.CalendarToStringMarshaller;
-import software.amazon.awssdk.services.dynamodb.datamodeling.marshallers.CollectionToListMarshaller;
-import software.amazon.awssdk.services.dynamodb.datamodeling.marshallers.CustomMarshaller;
-import software.amazon.awssdk.services.dynamodb.datamodeling.marshallers.DateSetToStringSetMarshaller;
-import software.amazon.awssdk.services.dynamodb.datamodeling.marshallers.DateToStringMarshaller;
-import software.amazon.awssdk.services.dynamodb.datamodeling.marshallers.MapToMapMarshaller;
-import software.amazon.awssdk.services.dynamodb.datamodeling.marshallers.NumberSetToNumberSetMarshaller;
-import software.amazon.awssdk.services.dynamodb.datamodeling.marshallers.NumberToNumberMarshaller;
-import software.amazon.awssdk.services.dynamodb.datamodeling.marshallers.ObjectSetToStringSetMarshaller;
-import software.amazon.awssdk.services.dynamodb.datamodeling.marshallers.ObjectToMapMarshaller;
-import software.amazon.awssdk.services.dynamodb.datamodeling.marshallers.ObjectToStringMarshaller;
-import software.amazon.awssdk.services.dynamodb.datamodeling.marshallers.S3LinkToStringMarshaller;
-import software.amazon.awssdk.services.dynamodb.datamodeling.marshallers.StringSetToStringSetMarshaller;
-import software.amazon.awssdk.services.dynamodb.datamodeling.marshallers.StringToStringMarshaller;
-import software.amazon.awssdk.services.dynamodb.datamodeling.marshallers.UuidSetToStringSetMarshaller;
-import software.amazon.awssdk.services.dynamodb.datamodeling.unmarshallers.BigDecimalSetUnmarshaller;
-import software.amazon.awssdk.services.dynamodb.datamodeling.unmarshallers.BigDecimalUnmarshaller;
-import software.amazon.awssdk.services.dynamodb.datamodeling.unmarshallers.BigIntegerSetUnmarshaller;
-import software.amazon.awssdk.services.dynamodb.datamodeling.unmarshallers.BigIntegerUnmarshaller;
-import software.amazon.awssdk.services.dynamodb.datamodeling.unmarshallers.BooleanSetUnmarshaller;
-import software.amazon.awssdk.services.dynamodb.datamodeling.unmarshallers.BooleanUnmarshaller;
-import software.amazon.awssdk.services.dynamodb.datamodeling.unmarshallers.ByteArraySetUnmarshaller;
-import software.amazon.awssdk.services.dynamodb.datamodeling.unmarshallers.ByteArrayUnmarshaller;
-import software.amazon.awssdk.services.dynamodb.datamodeling.unmarshallers.ByteBufferSetUnmarshaller;
-import software.amazon.awssdk.services.dynamodb.datamodeling.unmarshallers.ByteBufferUnmarshaller;
-import software.amazon.awssdk.services.dynamodb.datamodeling.unmarshallers.ByteSetUnmarshaller;
-import software.amazon.awssdk.services.dynamodb.datamodeling.unmarshallers.ByteUnmarshaller;
-import software.amazon.awssdk.services.dynamodb.datamodeling.unmarshallers.CalendarSetUnmarshaller;
-import software.amazon.awssdk.services.dynamodb.datamodeling.unmarshallers.CalendarUnmarshaller;
-import software.amazon.awssdk.services.dynamodb.datamodeling.unmarshallers.CustomUnmarshaller;
-import software.amazon.awssdk.services.dynamodb.datamodeling.unmarshallers.DateSetUnmarshaller;
-import software.amazon.awssdk.services.dynamodb.datamodeling.unmarshallers.DateUnmarshaller;
-import software.amazon.awssdk.services.dynamodb.datamodeling.unmarshallers.DoubleSetUnmarshaller;
-import software.amazon.awssdk.services.dynamodb.datamodeling.unmarshallers.DoubleUnmarshaller;
-import software.amazon.awssdk.services.dynamodb.datamodeling.unmarshallers.FloatSetUnmarshaller;
-import software.amazon.awssdk.services.dynamodb.datamodeling.unmarshallers.FloatUnmarshaller;
-import software.amazon.awssdk.services.dynamodb.datamodeling.unmarshallers.IntegerSetUnmarshaller;
-import software.amazon.awssdk.services.dynamodb.datamodeling.unmarshallers.IntegerUnmarshaller;
-import software.amazon.awssdk.services.dynamodb.datamodeling.unmarshallers.ListUnmarshaller;
-import software.amazon.awssdk.services.dynamodb.datamodeling.unmarshallers.LongSetUnmarshaller;
-import software.amazon.awssdk.services.dynamodb.datamodeling.unmarshallers.LongUnmarshaller;
-import software.amazon.awssdk.services.dynamodb.datamodeling.unmarshallers.MapUnmarshaller;
-import software.amazon.awssdk.services.dynamodb.datamodeling.unmarshallers.NullableUnmarshaller;
-import software.amazon.awssdk.services.dynamodb.datamodeling.unmarshallers.ObjectSetUnmarshaller;
-import software.amazon.awssdk.services.dynamodb.datamodeling.unmarshallers.ObjectUnmarshaller;
-import software.amazon.awssdk.services.dynamodb.datamodeling.unmarshallers.S3LinkUnmarshaller;
-import software.amazon.awssdk.services.dynamodb.datamodeling.unmarshallers.ShortSetUnmarshaller;
-import software.amazon.awssdk.services.dynamodb.datamodeling.unmarshallers.ShortUnmarshaller;
-import software.amazon.awssdk.services.dynamodb.datamodeling.unmarshallers.StringSetUnmarshaller;
-import software.amazon.awssdk.services.dynamodb.datamodeling.unmarshallers.StringUnmarshaller;
-import software.amazon.awssdk.services.dynamodb.datamodeling.unmarshallers.UuidSetUnmarshaller;
-import software.amazon.awssdk.services.dynamodb.datamodeling.unmarshallers.UuidUnmarshaller;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-
-/**
- * Pre-defined strategies for mapping between Java types and DynamoDB types.
- */
-public final class ConversionSchemas {
-
-    /**
-     * The V1 schema mapping, which retains strict backwards compatibility with
-     * the original DynamoDB data model. In particular, it marshals Java
-     * Booleans as DynamoDB Numbers rather than the newer Boolean type, and does
-     * not support marshaling Lists or Maps. It <em>can</em> unmarshal
-     * values written in newer formats to ease migration.
-     * <p>
-     * Use me if you have other code still using an old version of the SDK that
-     * does not understand the new List and Map types and want to ensure that
-     * you don't accidentally start writing values using these types.
-     */
-    public static final ConversionSchema V1 = v1Builder("V1ConversionSchema").build();
-    /**
-     * A V2 conversion schema which retains backwards compatibility with the
-     * V1 conversion schema for existing DynamoDB types, but adds the ability
-     * to marshall recursive structures using the new List and Map types. This
-     * is currently the default conversion schema.
-     */
-    public static final ConversionSchema V2_COMPATIBLE = v2CompatibleBuilder(
-            "V2CompatibleConversionSchema").build();
-    /**
-     * The native V2 conversion schema. This schema breaks compatibility with
-     * older versions of the mapper that only support the V1 schema by
-     * storing booleans as native DynamoDB Booleans rather than as a 1 or 0
-     * in a DynamoDB Number. Switching to the V2 schema will prevent older
-     * versions of the mapper from reading items you write that contain
-     * booleans.
-     */
-    public static final ConversionSchema V2 = v2Builder("V2ConversionSchema").build();
-    static final ConversionSchema DEFAULT = V2_COMPATIBLE;
-    private static final Logger log =
-            LoggerFactory.getLogger(ConversionSchemas.class);
-
-    ConversionSchemas() {
-        throw new UnsupportedOperationException();
-    }
-
-    /**
-     * A ConversionSchema builder that defaults to building {@link #V1}.
-     */
-    public static Builder v1Builder(String name) {
-        return new Builder(name, V1MarshallerSet.marshallers(), V1MarshallerSet.setMarshallers(),
-                           StandardUnmarshallerSet.unmarshallers(),
-                           StandardUnmarshallerSet.setUnmarshallers());
-    }
-
-    /**
-     * A ConversionSchema builder that defaults to building {@link #V2_COMPATIBLE}.
-     */
-    public static Builder v2CompatibleBuilder(String name) {
-        return new Builder(name, V2CompatibleMarshallerSet.marshallers(),
-                           V2CompatibleMarshallerSet.setMarshallers(),
-                           StandardUnmarshallerSet.unmarshallers(),
-                           StandardUnmarshallerSet.setUnmarshallers());
-    }
-
-    /**
-     * A ConversionSchema builder that defaults to building {@link #V2}.
-     */
-    public static Builder v2Builder(String name) {
-        return new Builder(name, V2MarshallerSet.marshallers(), V2MarshallerSet.setMarshallers(),
-                           StandardUnmarshallerSet.unmarshallers(),
-                           StandardUnmarshallerSet.setUnmarshallers());
-    }
-
-    private static void addStandardDateMarshallers(
-            List<Pair<ArgumentMarshaller>> list) {
-
-        list.add(Pair.of(Date.class,
-                         DateToStringMarshaller.instance()));
-        list.add(Pair.of(Calendar.class,
-                         CalendarToStringMarshaller.instance()));
-    }
-
-    private static void addV1BooleanMarshallers(
-            List<Pair<ArgumentMarshaller>> list) {
-
-        list.add(Pair.of(Boolean.class,
-                         BooleanToNumberMarshaller.instance()));
-        list.add(Pair.of(boolean.class,
-                         BooleanToNumberMarshaller.instance()));
-    }
-
-    private static void addV2BooleanMarshallers(
-            List<Pair<ArgumentMarshaller>> list) {
-
-        list.add(Pair.of(Boolean.class,
-                         BooleanToBooleanMarshaller.instance()));
-        list.add(Pair.of(boolean.class,
-                         BooleanToBooleanMarshaller.instance()));
-    }
-
-    private static void addStandardNumberMarshallers(
-            List<Pair<ArgumentMarshaller>> list) {
-
-        list.add(Pair.of(Number.class,
-                         NumberToNumberMarshaller.instance()));
-        list.add(Pair.of(byte.class,
-                         NumberToNumberMarshaller.instance()));
-        list.add(Pair.of(short.class,
-                         NumberToNumberMarshaller.instance()));
-        list.add(Pair.of(int.class,
-                         NumberToNumberMarshaller.instance()));
-        list.add(Pair.of(long.class,
-                         NumberToNumberMarshaller.instance()));
-        list.add(Pair.of(float.class,
-                         NumberToNumberMarshaller.instance()));
-        list.add(Pair.of(double.class,
-                         NumberToNumberMarshaller.instance()));
-    }
-
-    private static void addStandardStringMarshallers(
-            List<Pair<ArgumentMarshaller>> list) {
-
-        list.add(Pair.of(String.class,
-                         StringToStringMarshaller.instance()));
-
-        list.add(Pair.of(UUID.class,
-                         ObjectToStringMarshaller.instance()));
-    }
-
-    private static void addStandardBinaryMarshallers(
-            List<Pair<ArgumentMarshaller>> list) {
-
-        list.add(Pair.of(ByteBuffer.class,
-                         ByteBufferToBinaryMarshaller.instance()));
-        list.add(Pair.of(byte[].class,
-                         ByteArrayToBinaryMarshaller.instance()));
-    }
-
-    private static void addStandardS3LinkMarshallers(
-            List<Pair<ArgumentMarshaller>> list) {
-
-        list.add(Pair.of(S3Link.class,
-                         S3LinkToStringMarshaller.instance()));
-    }
-
-    private static void addStandardDateSetMarshallers(
-            List<Pair<ArgumentMarshaller>> list) {
-
-        list.add(Pair.of(Date.class,
-                         DateSetToStringSetMarshaller.instance()));
-        list.add(Pair.of(Calendar.class,
-                         CalendarSetToStringSetMarshaller.instance()));
-    }
-
-    private static void addStandardNumberSetMarshallers(
-            List<Pair<ArgumentMarshaller>> list) {
-
-        list.add(Pair.of(Number.class,
-                         NumberSetToNumberSetMarshaller.instance()));
-        list.add(Pair.of(byte.class,
-                         NumberSetToNumberSetMarshaller.instance()));
-        list.add(Pair.of(short.class,
-                         NumberSetToNumberSetMarshaller.instance()));
-        list.add(Pair.of(int.class,
-                         NumberSetToNumberSetMarshaller.instance()));
-        list.add(Pair.of(long.class,
-                         NumberSetToNumberSetMarshaller.instance()));
-        list.add(Pair.of(float.class,
-                         NumberSetToNumberSetMarshaller.instance()));
-        list.add(Pair.of(double.class,
-                         NumberSetToNumberSetMarshaller.instance()));
-    }
-
-    private static void addStandardStringSetMarshallers(
-            List<Pair<ArgumentMarshaller>> list) {
-
-        list.add(Pair.of(String.class,
-                         StringSetToStringSetMarshaller.instance()));
-
-        list.add(Pair.of(UUID.class,
-                         UuidSetToStringSetMarshaller.instance()));
-    }
-
-    private static void addStandardBinarySetMarshallers(
-            List<Pair<ArgumentMarshaller>> list) {
-
-        list.add(Pair.of(ByteBuffer.class,
-                         ByteBufferSetToBinarySetMarshaller.instance()));
-        list.add(Pair.of(byte[].class,
-                         ByteArraySetToBinarySetMarshaller.instance()));
-    }
-
-    private static void addV1BooleanSetMarshallers(
-            List<Pair<ArgumentMarshaller>> list) {
-
-        list.add(Pair.of(Boolean.class,
-                         BooleanSetToNumberSetMarshaller.instance()));
-        list.add(Pair.of(boolean.class,
-                         BooleanSetToNumberSetMarshaller.instance()));
-    }
-
-    private static Class<?> unwrapGenericSetParam(Type setType) {
-        if (!(setType instanceof ParameterizedType)) {
-            log.warn("Set type {} is not a ParameterizedType, using default marshaller and unmarshaller", setType);
-            return Object.class;
-        }
-
-        ParameterizedType ptype = (ParameterizedType) setType;
-        Type[] arguments = ptype.getActualTypeArguments();
-
-        if (arguments.length != 1) {
-            log.warn("Set type {} does not have exactly one type argument, using default marshaller and unmarshaller", setType);
-            return Object.class;
-        }
-
-        if (arguments[0].toString().equals("byte[]")) {
-            return byte[].class;
-        } else {
-            return (Class<?>) arguments[0];
-        }
-    }
-
-    private static Class<?> resolveClass(Type type) {
-        Type localType = type;
-        if (localType instanceof ParameterizedType) {
-            localType = ((ParameterizedType) type).getRawType();
-        }
-        if (!(localType instanceof Class)) {
-            throw new DynamoDbMappingException("Cannot resolve class for type "
-                                               + type);
-        }
-        return (Class<?>) localType;
-    }
-
-    private static <T> T find(Class<?> needle, List<Pair<T>> haystack) {
-        for (Pair<? extends T> pair : haystack) {
-            if (pair.key.isAssignableFrom(needle)) {
-                return pair.value;
-            }
-        }
-        return null;
-    }
-
-    interface MarshallerSet {
-        ArgumentMarshaller marshaller(Method getter);
-
-        ArgumentMarshaller memberMarshaller(Type memberType);
-    }
-
-    interface UnmarshallerSet {
-        ArgumentUnmarshaller getUnmarshaller(Method getter, Method setter);
-
-        ArgumentUnmarshaller memberUnmarshaller(Type memberType);
-    }
-
-    public static class Builder {
-
-        private final String name;
-        private final List<Pair<ArgumentMarshaller>> marshallers;
-        private final List<Pair<ArgumentMarshaller>> setMarshallers;
-        private final List<Pair<ArgumentUnmarshaller>> unmarshallers;
-        private final List<Pair<ArgumentUnmarshaller>> setUnmarshallers;
-
-        Builder(String name, List<Pair<ArgumentMarshaller>> marshallers,
-                List<Pair<ArgumentMarshaller>> setMarshallers,
-                List<Pair<ArgumentUnmarshaller>> unmarshallers,
-                List<Pair<ArgumentUnmarshaller>> setUnmarshallers) {
-            this.name = name;
-            this.marshallers = marshallers;
-            this.setMarshallers = setMarshallers;
-            this.unmarshallers = unmarshallers;
-            this.setUnmarshallers = setUnmarshallers;
-        }
-
-        /**
-         * Adds marshaling of a type to the schema. Types are in LIFO order, so the last type added
-         * will be the first matched.
-         */
-        public Builder addFirstType(Class<?> clazz, ArgumentMarshaller marshaller,
-                                    ArgumentUnmarshaller unmarshaller) {
-            this.marshallers.add(0, Pair.of(clazz, marshaller));
-            this.unmarshallers.add(0, Pair.of(clazz, unmarshaller));
-            return this;
-        }
-
-        /**
-         * Adds marshaling of a Set of a type to the schema. Types are in LIFO order, so the last
-         * type added will be the first matched.
-         */
-        public Builder addFirstSetType(Class<?> clazz, ArgumentMarshaller marshaller,
-                                       ArgumentUnmarshaller unmarshaller) {
-            this.setMarshallers.add(0, Pair.of(clazz, marshaller));
-            this.setUnmarshallers.add(0, Pair.of(clazz, unmarshaller));
-            return this;
-        }
-
-        public ConversionSchema build() {
-            return new StandardConversionSchema(name, new AbstractMarshallerSet(marshallers,
-                                                                                setMarshallers),
-                                                new StandardUnmarshallerSet(unmarshallers,
-                                                                            setUnmarshallers));
-        }
-    }
-
-    static class StandardConversionSchema implements ConversionSchema {
-
-        private final String name;
-        private final MarshallerSet marshallers;
-        private final UnmarshallerSet unmarshallers;
-
-        StandardConversionSchema(
-                String name,
-                MarshallerSet marshallers,
-                UnmarshallerSet unmarshallers) {
-
-            this.name = name;
-            this.marshallers = new CachingMarshallerSet(
-                    new AnnotationAwareMarshallerSet(marshallers));
-
-            this.unmarshallers = new CachingUnmarshallerSet(
-                    new AnnotationAwareUnmarshallerSet(unmarshallers));
-        }
-
-        @Override
-        public ItemConverter getConverter(Dependencies dependencies) {
-
-            S3ClientCache s3cc = dependencies.get(S3ClientCache.class);
-
-            return new StandardItemConverter(
-                    marshallers,
-                    unmarshallers,
-                    s3cc);
-        }
-
-        @Override
-        public String toString() {
-            return name;
-        }
-    }
-
-    static class StandardItemConverter implements ItemConverter {
-
-        private final MarshallerSet marshallerSet;
-        private final UnmarshallerSet unmarshallerSet;
-        private final S3ClientCache s3cc;
-
-        StandardItemConverter(
-                MarshallerSet marshallerSet,
-                UnmarshallerSet unmarshallerSet,
-                S3ClientCache s3cc) {
-
-            this.marshallerSet = marshallerSet;
-            this.unmarshallerSet = unmarshallerSet;
-            this.s3cc = s3cc;
-        }
-
-        private static Object unmarshall(
-                ArgumentUnmarshaller unmarshaller,
-                Method setter,
-                AttributeValue value) {
-
-            unmarshaller.typeCheck(value, setter);
-
-            try {
-
-                return unmarshaller.unmarshall(value);
-
-            } catch (IllegalArgumentException e) {
-                throw new DynamoDbMappingException(
-                        "Couldn't unmarshall value " + value + " for " + setter,
-                        e);
-
-            } catch (ParseException e) {
-                throw new DynamoDbMappingException(
-                        "Error attempting to parse date string " + value + " for "
-                        + setter,
-                        e);
-            }
-        }
-
-        private static <T> T createObject(Class<T> clazz) {
-            try {
-
-                return clazz.newInstance();
-
-            } catch (InstantiationException e) {
-                throw new DynamoDbMappingException(
-                        "Failed to instantiate new instance of class", e);
-
-            } catch (IllegalAccessException e) {
-                throw new DynamoDbMappingException(
-                        "Failed to instantiate new instance of class", e);
-            }
-        }
-
-        @Override
-        public DynamoDbMapperFieldModel getFieldModel(Method getter) {
-            final ArgumentMarshaller marshaller = marshaller(getter);
-
-            final DynamoDbAttributeType attributeType;
-            if (marshaller instanceof StringAttributeMarshaller) {
-                attributeType = DynamoDbAttributeType.S;
-            } else if (marshaller instanceof NumberAttributeMarshaller) {
-                attributeType = DynamoDbAttributeType.N;
-            } else if (marshaller instanceof BinaryAttributeMarshaller) {
-                attributeType = DynamoDbAttributeType.B;
-            } else if (marshaller instanceof StringSetAttributeMarshaller) {
-                attributeType = DynamoDbAttributeType.SS;
-            } else if (marshaller instanceof NumberSetAttributeMarshaller) {
-                attributeType = DynamoDbAttributeType.NS;
-            } else if (marshaller instanceof BinarySetAttributeMarshaller) {
-                attributeType = DynamoDbAttributeType.BS;
-            } else if (marshaller instanceof BooleanAttributeMarshaller) {
-                attributeType = DynamoDbAttributeType.BOOL;
-            } else if (marshaller instanceof ListAttributeMarshaller) {
-                attributeType = DynamoDbAttributeType.L;
-            } else if (marshaller instanceof MapAttributeMarshaller) {
-                attributeType = DynamoDbAttributeType.M;
-            } else {
-                throw new DynamoDbMappingException(
-                        "Unrecognized marshaller type for " + getter + ": "
-                        + marshaller);
-            }
-
-            // Note, generating the attribute name using this method is not
-            // actually correct for @DynamoDBFlattened attributes, however,
-            // its the best that can be done given only the method. The
-            // proper way to get this information is using the model factory.
-            final StandardAnnotationMaps.FieldMap annotations = StandardAnnotationMaps.of(getter, null);
-            final DynamoDbMapperFieldModel.Builder builder = new DynamoDbMapperFieldModel.Builder(void.class, annotations);
-            builder.with(attributeType);
-            return builder.build();
-        }
-
-        @Override
-        public AttributeValue convert(Method getter, Object object) {
-            if (object == null) {
-                return null;
-            }
-
-            ArgumentMarshaller marshaller = marshaller(getter);
-            return marshaller.marshall(object);
-        }
-
-        @Override
-        public Map<String, AttributeValue> convert(Object object) {
-            if (object == null) {
-                return null;
-            }
-
-            Class<Object> clazz = (Class<Object>) object.getClass();
-            Map<String, AttributeValue> result =
-                    new HashMap<String, AttributeValue>();
-
-            for (final Bean<Object, Object> bean : StandardBeanProperties.of(clazz).map().values()) {
-                Object getterResult = bean.reflect().get(object);
-                if (getterResult != null) {
-                    AttributeValue value = convert(bean.type().getter(), getterResult);
-                    if (value != null) {
-                        result.put(bean.properties().attributeName(), value);
-                    }
-                }
-            }
-
-            return result;
-        }
-
-        private ArgumentMarshaller marshaller(Method getter) {
-            ArgumentMarshaller marshaller =
-                    marshallerSet.marshaller(getter);
-
-            marshaller = augment(getter.getGenericReturnType(), marshaller);
-
-            return marshaller;
-        }
-
-        private ArgumentMarshaller memberMarshaller(Type type) {
-            ArgumentMarshaller marshaller =
-                    marshallerSet.memberMarshaller(type);
-
-            marshaller = augment(type, marshaller);
-
-            return marshaller;
-        }
-
-        private ArgumentMarshaller augment(
-                Type type,
-                ArgumentMarshaller marshaller) {
-
-            if (marshaller instanceof CollectionToListMarshaller) {
-                return getCollectionToListMarshaller(type);
-            }
-
-            if (marshaller instanceof MapToMapMarshaller) {
-                return mapToMapMarshaller(type);
-            }
-            if (marshaller instanceof ObjectToMapMarshaller) {
-                return getObjectToMapMarshaller(type);
-            }
-
-            return marshaller;
-        }
-
-        private ArgumentMarshaller getCollectionToListMarshaller(Type type) {
-            if (!(type instanceof ParameterizedType)) {
-                throw new DynamoDbMappingException(
-                        "Cannot tell what type of objects belong in the "
-                        + "Collection type " + type + ", which is not "
-                        + "parameterized.");
-            }
-
-            ParameterizedType ptype = (ParameterizedType) type;
-            Type[] args = ptype.getActualTypeArguments();
-
-            if (args == null || args.length != 1) {
-                throw new DynamoDbMappingException(
-                        "Cannot tell what type of objects belong in the "
-                        + "Collection type " + type + "; unexpected number of "
-                        + "type arguments.");
-            }
-
-            ArgumentMarshaller memberMarshaller =
-                    memberMarshaller(args[0]);
-
-            return new CollectionToListMarshaller(memberMarshaller);
-        }
-
-        private ArgumentMarshaller mapToMapMarshaller(Type type) {
-            if (!(type instanceof ParameterizedType)) {
-                throw new DynamoDbMappingException(
-                        "Cannot tell what type of objects belong in the Map "
-                        + "type " + type + ", which is not parameterized.");
-            }
-
-            ParameterizedType ptype = (ParameterizedType) type;
-            Type[] args = ptype.getActualTypeArguments();
-
-            if (args == null || args.length != 2) {
-                throw new DynamoDbMappingException(
-                        "Cannot tell what type of objects belong in the Map "
-                        + "type " + type + "; unexpected number of type "
-                        + "arguments.");
-            }
-
-            if (args[0] != String.class) {
-                throw new DynamoDbMappingException(
-                        "Only Map<String, ?> is supported.");
-            }
-
-            ArgumentMarshaller memberMarshaller =
-                    memberMarshaller(args[1]);
-
-            return new MapToMapMarshaller(memberMarshaller);
-        }
-
-        private ArgumentMarshaller getObjectToMapMarshaller(Type type) {
-            Type localType = type;
-            if (localType instanceof ParameterizedType) {
-                localType = ((ParameterizedType) localType).getRawType();
-            }
-
-            if (!(localType instanceof Class)) {
-                throw new DynamoDbMappingException(
-                        "Cannot convert " + type + " to a class");
-            }
-
-            Class<?> clazz = (Class<?>) localType;
-            if (StandardAnnotationMaps.of(clazz).attributeType() != DynamoDbAttributeType.M) {
-                throw new DynamoDbMappingException(
-                        "Cannot marshall type " + type
-                        + " without a custom marshaler or @DynamoDBDocument "
-                        + "annotation.");
-            }
-
-            return new ObjectToMapMarshaller(this);
-        }
-
-        @Override
-        public Object unconvert(
-                Method getter,
-                Method setter,
-                AttributeValue value) {
-
-            ArgumentUnmarshaller unmarshaller = getUnmarshaller(getter, setter);
-            return unmarshall(unmarshaller, setter, value);
-        }
-
-        @Override
-        public <T> T unconvert(
-                Class<T> clazz,
-                Map<String, AttributeValue> value) {
-
-            T result = createObject(clazz);
-            if (value == null || value.isEmpty()) {
-                return result;
-            }
-
-            for (final Bean<T, Object> bean : StandardBeanProperties.of(clazz).map().values()) {
-                AttributeValue av = value.get(bean.properties().attributeName());
-                if (av != null) {
-                    ArgumentUnmarshaller unmarshaller = getUnmarshaller(bean.type().getter(), bean.type().setter());
-                    Object unmarshalled = unmarshall(unmarshaller, bean.type().setter(), av);
-                    bean.reflect().set(result, unmarshalled);
-                }
-            }
-
-            return result;
-        }
-
-        private ArgumentUnmarshaller getUnmarshaller(
-                Method getter,
-                Method setter) {
-
-            ArgumentUnmarshaller unmarshaller =
-                    unmarshallerSet.getUnmarshaller(getter, setter);
-
-            unmarshaller = augment(
-                    setter.getGenericParameterTypes()[0], unmarshaller);
-
-            return new NullableUnmarshaller(unmarshaller);
-        }
-
-        private ArgumentUnmarshaller memberUnmarshaller(Type type) {
-            ArgumentUnmarshaller unmarshaller =
-                    unmarshallerSet.memberUnmarshaller(type);
-
-            unmarshaller = augment(type, unmarshaller);
-
-            return new NullableUnmarshaller(unmarshaller);
-        }
-
-        private ArgumentUnmarshaller augment(
-                Type type,
-                ArgumentUnmarshaller unmarshaller) {
-
-            // Inject our s3 client cache if it's an S3LinkUnmarshaller.
-            if (unmarshaller instanceof S3LinkUnmarshaller) {
-                return new S3LinkUnmarshaller(s3cc);
-            }
-
-            // Inject an appropriate member-type unmarshaller if it's a list,
-            // object-set, or map unmarshaller.
-            if (unmarshaller instanceof ObjectSetUnmarshaller) {
-                return getObjectSetUnmarshaller(type);
-            }
-
-            if (unmarshaller instanceof ListUnmarshaller) {
-                return listUnmarshaller(type);
-            }
-
-            if (unmarshaller instanceof MapUnmarshaller) {
-                return mapUnmarshaller(type);
-            }
-
-            // Inject ourselves to recursively unmarshall things if it's an
-            // ObjectUnmarshaller.
-            if (unmarshaller instanceof ObjectUnmarshaller) {
-                return getObjectUnmarshaller(type);
-            }
-
-            return unmarshaller;
-        }
-
-        private ArgumentUnmarshaller getObjectSetUnmarshaller(Type type) {
-            if (!(type instanceof ParameterizedType)) {
-                throw new DynamoDbMappingException(
-                        "Cannot tell what type of objects belong in the Set "
-                        + "type " + type + ", which is not parameterized.");
-            }
-
-            ParameterizedType ptype = (ParameterizedType) type;
-            Type[] args = ptype.getActualTypeArguments();
-
-            if (args == null || args.length != 1) {
-                throw new DynamoDbMappingException(
-                        "Cannot tell what type of objects belong in the Set "
-                        + "type " + type + "; unexpected number of type "
-                        + "arguments.");
-            }
-
-            ArgumentUnmarshaller memberUnmarshaller =
-                    memberUnmarshaller(args[0]);
-
-            return new ObjectSetUnmarshaller(memberUnmarshaller);
-        }
-
-        private ArgumentUnmarshaller listUnmarshaller(Type type) {
-            if (!(type instanceof ParameterizedType)) {
-                throw new DynamoDbMappingException(
-                        "Cannot tell what type of objects belong in the List "
-                        + "type " + type + ", which is not parameterized.");
-            }
-
-            ParameterizedType ptype = (ParameterizedType) type;
-            Type[] args = ptype.getActualTypeArguments();
-
-            if (args == null || args.length != 1) {
-                throw new DynamoDbMappingException(
-                        "Cannot tell what type of objects belong in the List "
-                        + "type " + type + "; unexpected number of type "
-                        + "arguments.");
-            }
-
-            ArgumentUnmarshaller memberUnmarshaller =
-                    memberUnmarshaller(args[0]);
-
-            return new ListUnmarshaller(memberUnmarshaller);
-        }
-
-        private ArgumentUnmarshaller mapUnmarshaller(Type type) {
-            if (!(type instanceof ParameterizedType)) {
-                throw new DynamoDbMappingException(
-                        "Cannot tell what type of objects belong in the Map "
-                        + "type " + type + ", which is not parameterized.");
-            }
-
-            ParameterizedType ptype = (ParameterizedType) type;
-            Type[] args = ptype.getActualTypeArguments();
-
-            if (args == null || args.length != 2) {
-                throw new DynamoDbMappingException(
-                        "Cannot tell what type of objects belong in the Map "
-                        + "type " + type + "; unexpected number of type "
-                        + "arguments.");
-            }
-
-            if (args[0] != String.class) {
-                throw new DynamoDbMappingException(
-                        "Only Map<String, ?> is supported.");
-            }
-
-            ArgumentUnmarshaller memberUnmarshaller =
-                    memberUnmarshaller(args[1]);
-
-            return new MapUnmarshaller(memberUnmarshaller);
-        }
-
-        private ArgumentUnmarshaller getObjectUnmarshaller(Type type) {
-            Type localType = type;
-            if (localType instanceof ParameterizedType) {
-                localType = ((ParameterizedType) type).getRawType();
-            }
-
-            if (!(localType instanceof Class)) {
-                throw new DynamoDbMappingException(
-                        "Cannot convert " + type + " to a class");
-            }
-
-            Class<?> clazz = (Class<?>) localType;
-            if (StandardAnnotationMaps.of(clazz).attributeType() != DynamoDbAttributeType.M) {
-                throw new DynamoDbMappingException(
-                        "Cannot unmarshall to type " + type
-                        + " without a custom marshaler or @DynamoDBDocument "
-                        + "annotation.");
-            }
-
-            return new ObjectUnmarshaller(this, clazz);
-        }
-
-    }
-
-    static final class V2MarshallerSet {
-
-        private static List<Pair<ArgumentMarshaller>> marshallers() {
-            List<Pair<ArgumentMarshaller>> list =
-                    new ArrayList<Pair<ArgumentMarshaller>>();
-
-            // Use the new V2 boolean marshallers.
-            addStandardDateMarshallers(list);
-            addV2BooleanMarshallers(list);
-            addStandardNumberMarshallers(list);
-            addStandardStringMarshallers(list);
-            addStandardBinaryMarshallers(list);
-            addStandardS3LinkMarshallers(list);
-
-            // Add marshallers for the new list and map types.
-            list.add(Pair.of(List.class, CollectionToListMarshaller.instance()));
-            list.add(Pair.of(Map.class, MapToMapMarshaller.instance()));
-
-            // Make sure I'm last since I'll catch anything.
-            list.add(Pair.of(Object.class, ObjectToMapMarshaller.instance()));
-
-            return list;
-        }
-
-        private static List<Pair<ArgumentMarshaller>> setMarshallers() {
-            List<Pair<ArgumentMarshaller>> list =
-                    new ArrayList<Pair<ArgumentMarshaller>>();
-
-            // No more Set<Boolean> -> NS or Set<Object> -> SS marshallers
-            addStandardDateSetMarshallers(list);
-            addStandardNumberSetMarshallers(list);
-            addStandardStringSetMarshallers(list);
-            addStandardBinarySetMarshallers(list);
-
-            // Make sure I'm last since I'll catch anything.
-            list.add(Pair.of(
-                    Object.class,
-                    CollectionToListMarshaller.instance()));
-
-            return list;
-        }
-    }
-
-    static final class V2CompatibleMarshallerSet {
-
-        private static List<Pair<ArgumentMarshaller>> marshallers() {
-            List<Pair<ArgumentMarshaller>> list =
-                    new ArrayList<Pair<ArgumentMarshaller>>();
-
-            // Keep the old v1 boolean marshallers for compatibility.
-            addStandardDateMarshallers(list);
-            addV1BooleanMarshallers(list);
-            addStandardNumberMarshallers(list);
-            addStandardStringMarshallers(list);
-            addStandardBinaryMarshallers(list);
-            addStandardS3LinkMarshallers(list);
-
-            // Add marshallers for the new list and map types.
-            list.add(Pair.of(List.class, CollectionToListMarshaller.instance()));
-            list.add(Pair.of(Map.class, MapToMapMarshaller.instance()));
-
-            // Make sure I'm last since I'll catch anything.
-            list.add(Pair.of(Object.class, ObjectToMapMarshaller.instance()));
-
-            return list;
-        }
-
-        private static List<Pair<ArgumentMarshaller>> setMarshallers() {
-            List<Pair<ArgumentMarshaller>> list =
-                    new ArrayList<Pair<ArgumentMarshaller>>();
-
-            addStandardDateSetMarshallers(list);
-            addV1BooleanSetMarshallers(list);
-            addStandardNumberSetMarshallers(list);
-            addStandardStringSetMarshallers(list);
-            addStandardBinarySetMarshallers(list);
-
-            // If all else fails, fall back to this default marshaler to
-            // retain backwards-compatible behavior.
-            list.add(Pair.of(Object.class, ObjectSetToStringSetMarshaller.instance()));
-
-            return list;
-        }
-    }
-
-    static final class V1MarshallerSet {
-
-        private static List<Pair<ArgumentMarshaller>> marshallers() {
-            List<Pair<ArgumentMarshaller>> list =
-                    new ArrayList<Pair<ArgumentMarshaller>>();
-
-            addStandardDateMarshallers(list);
-            addV1BooleanMarshallers(list);
-            addStandardNumberMarshallers(list);
-            addStandardStringMarshallers(list);
-            addStandardBinaryMarshallers(list);
-            addStandardS3LinkMarshallers(list);
-
-            return list;
-        }
-
-        private static List<Pair<ArgumentMarshaller>> setMarshallers() {
-            List<Pair<ArgumentMarshaller>> list =
-                    new ArrayList<Pair<ArgumentMarshaller>>();
-
-            addStandardDateSetMarshallers(list);
-            addV1BooleanSetMarshallers(list);
-            addStandardNumberSetMarshallers(list);
-            addStandardStringSetMarshallers(list);
-            addStandardBinarySetMarshallers(list);
-
-            // If all else fails, fall back to this default marshaler to
-            // retain backwards-compatible behavior.
-            list.add(Pair.of(Object.class,
-                             ObjectSetToStringSetMarshaller.instance()));
-
-            return list;
-        }
-    }
-
-    private static class AbstractMarshallerSet implements MarshallerSet {
-
-        private final List<Pair<ArgumentMarshaller>> marshallers;
-        private final List<Pair<ArgumentMarshaller>> setMarshallers;
-
-        AbstractMarshallerSet(
-                List<Pair<ArgumentMarshaller>> marshallers,
-                List<Pair<ArgumentMarshaller>> setMarshallers) {
-
-            this.marshallers = marshallers;
-            this.setMarshallers = setMarshallers;
-        }
-
-        @Override
-        public ArgumentMarshaller marshaller(Method getter) {
-            Class<?> returnType = getter.getReturnType();
-
-            if (Set.class.isAssignableFrom(returnType)) {
-                Class<?> memberType =
-                        unwrapGenericSetParam(getter.getGenericReturnType());
-
-                return set(getter, memberType);
-            } else {
-                return scalar(getter, returnType);
-            }
-        }
-
-        @Override
-        public ArgumentMarshaller memberMarshaller(Type memberType) {
-            Class<?> clazz = resolveClass(memberType);
-            if (Set.class.isAssignableFrom(clazz)) {
-                Class<?> setMemberType = unwrapGenericSetParam(memberType);
-                return set(null, setMemberType);
-            } else {
-                return scalar(null, clazz);
-            }
-        }
-
-        private ArgumentMarshaller scalar(Method getter, Class<?> type) {
-            ArgumentMarshaller marshaller = find(type, marshallers);
-            if (marshaller == null) {
-
-                String className = "?";
-                String methodName = "?";
-                if (getter != null) {
-                    className = getter.getDeclaringClass().toString();
-                    methodName = getter.getName();
-                }
-
-                throw new DynamoDbMappingException(
-                        "Cannot marshall return type " + type
-                        + " of method " + className + "." + methodName
-                        + " without a custom marshaler.");
-            }
-
-            return marshaller;
-        }
-
-        private ArgumentMarshaller set(Method getter, Class<?> memberType) {
-            ArgumentMarshaller marshaller = find(memberType, setMarshallers);
-            if (marshaller == null) {
-
-                String className = "?";
-                String methodName = "?";
-                if (getter != null) {
-                    className = getter.getDeclaringClass().toString();
-                    methodName = getter.getName();
-                }
-
-                throw new DynamoDbMappingException(
-                        "Cannot marshall return type Set<" + memberType
-                        + "> of method " + className + "." + methodName
-                        + " without a custom marshaller.");
-            }
-
-            return marshaller;
-        }
-    }
-
-    static class StandardUnmarshallerSet implements UnmarshallerSet {
-
-        private final List<Pair<ArgumentUnmarshaller>> unmarshallers;
-        private final List<Pair<ArgumentUnmarshaller>> setUnmarshallers;
-
-        StandardUnmarshallerSet() {
-            this(unmarshallers(), setUnmarshallers());
-        }
-
-        StandardUnmarshallerSet(
-                List<Pair<ArgumentUnmarshaller>> unmarshallers,
-                List<Pair<ArgumentUnmarshaller>> setUnmarshallers) {
-
-            this.unmarshallers = unmarshallers;
-            this.setUnmarshallers = setUnmarshallers;
-        }
-
-        private static List<Pair<ArgumentUnmarshaller>> unmarshallers() {
-            List<Pair<ArgumentUnmarshaller>> list =
-                    new ArrayList<Pair<ArgumentUnmarshaller>>();
-
-            list.add(Pair.of(double.class, DoubleUnmarshaller.instance()));
-            list.add(Pair.of(Double.class, DoubleUnmarshaller.instance()));
-
-            list.add(Pair.of(BigDecimal.class,
-                             BigDecimalUnmarshaller.instance()));
-            list.add(Pair.of(BigInteger.class,
-                             BigIntegerUnmarshaller.instance()));
-
-            list.add(Pair.of(int.class, IntegerUnmarshaller.instance()));
-            list.add(Pair.of(Integer.class, IntegerUnmarshaller.instance()));
-
-            list.add(Pair.of(float.class, FloatUnmarshaller.instance()));
-            list.add(Pair.of(Float.class, FloatUnmarshaller.instance()));
-
-            list.add(Pair.of(byte.class, ByteUnmarshaller.instance()));
-            list.add(Pair.of(Byte.class, ByteUnmarshaller.instance()));
-
-            list.add(Pair.of(long.class, LongUnmarshaller.instance()));
-            list.add(Pair.of(Long.class, LongUnmarshaller.instance()));
-
-            list.add(Pair.of(short.class, ShortUnmarshaller.instance()));
-            list.add(Pair.of(Short.class, ShortUnmarshaller.instance()));
-
-            list.add(Pair.of(boolean.class, BooleanUnmarshaller.instance()));
-            list.add(Pair.of(Boolean.class, BooleanUnmarshaller.instance()));
-
-            list.add(Pair.of(Date.class, DateUnmarshaller.instance()));
-            list.add(Pair.of(Calendar.class, CalendarUnmarshaller.instance()));
-
-            list.add(Pair.of(ByteBuffer.class,
-                             ByteBufferUnmarshaller.instance()));
-            list.add(Pair.of(byte[].class,
-                             ByteArrayUnmarshaller.instance()));
-
-            list.add(Pair.of(S3Link.class, S3LinkUnmarshaller.instance()));
-            list.add(Pair.of(UUID.class, UuidUnmarshaller.instance()));
-            list.add(Pair.of(String.class, StringUnmarshaller.instance()));
-
-            list.add(Pair.of(List.class, ListUnmarshaller.instance()));
-            list.add(Pair.of(Map.class, MapUnmarshaller.instance()));
-
-            // Make sure I'm last since I'll catch all other types.
-            list.add(Pair.of(Object.class, ObjectUnmarshaller.instance()));
-
-            return list;
-        }
-
-        private static List<Pair<ArgumentUnmarshaller>> setUnmarshallers() {
-            List<Pair<ArgumentUnmarshaller>> list =
-                    new ArrayList<Pair<ArgumentUnmarshaller>>();
-
-            list.add(Pair.of(double.class, DoubleSetUnmarshaller.instance()));
-            list.add(Pair.of(Double.class, DoubleSetUnmarshaller.instance()));
-
-            list.add(Pair.of(BigDecimal.class,
-                             BigDecimalSetUnmarshaller.instance()));
-            list.add(Pair.of(BigInteger.class,
-                             BigIntegerSetUnmarshaller.instance()));
-
-            list.add(Pair.of(int.class, IntegerSetUnmarshaller.instance()));
-            list.add(Pair.of(Integer.class, IntegerSetUnmarshaller.instance()));
-
-            list.add(Pair.of(float.class, FloatSetUnmarshaller.instance()));
-            list.add(Pair.of(Float.class, FloatSetUnmarshaller.instance()));
-
-            list.add(Pair.of(byte.class, ByteSetUnmarshaller.instance()));
-            list.add(Pair.of(Byte.class, ByteSetUnmarshaller.instance()));
-
-            list.add(Pair.of(long.class, LongSetUnmarshaller.instance()));
-            list.add(Pair.of(Long.class, LongSetUnmarshaller.instance()));
-
-            list.add(Pair.of(short.class, ShortSetUnmarshaller.instance()));
-            list.add(Pair.of(Short.class, ShortSetUnmarshaller.instance()));
-
-            list.add(Pair.of(boolean.class, BooleanSetUnmarshaller.instance()));
-            list.add(Pair.of(Boolean.class, BooleanSetUnmarshaller.instance()));
-
-            list.add(Pair.of(Date.class, DateSetUnmarshaller.instance()));
-            list.add(Pair.of(Calendar.class,
-                             CalendarSetUnmarshaller.instance()));
-
-            list.add(Pair.of(ByteBuffer.class,
-                             ByteBufferSetUnmarshaller.instance()));
-            list.add(Pair.of(byte[].class,
-                             ByteArraySetUnmarshaller.instance()));
-
-            list.add(Pair.of(UUID.class, UuidSetUnmarshaller.instance()));
-            list.add(Pair.of(String.class, StringSetUnmarshaller.instance()));
-
-            // Make sure I'm last since I'll catch all other types.
-            list.add(Pair.of(Object.class, ObjectSetUnmarshaller.instance()));
-
-            return list;
-        }
-
-        @Override
-        public ArgumentUnmarshaller getUnmarshaller(
-                Method getter,
-                Method setter) {
-
-            if (setter.getParameterTypes().length != 1) {
-                throw new DynamoDbMappingException(
-                        "Expected exactly one agument to " + setter);
-            }
-            Class<?> paramType = setter.getParameterTypes()[0];
-
-            if (Set.class.isAssignableFrom(paramType)) {
-
-                paramType = unwrapGenericSetParam(
-                        setter.getGenericParameterTypes()[0]);
-
-                return set(setter, paramType);
-
-            } else {
-                return scalar(setter, paramType);
-            }
-        }
-
-        @Override
-        public ArgumentUnmarshaller memberUnmarshaller(Type memberType) {
-            Class<?> clazz = resolveClass(memberType);
-            if (Set.class.isAssignableFrom(clazz)) {
-                Class<?> setMemberType = unwrapGenericSetParam(memberType);
-                return set(null, setMemberType);
-            } else {
-                return scalar(null, clazz);
-            }
-        }
-
-        private ArgumentUnmarshaller set(Method setter, Class<?> paramType) {
-            ArgumentUnmarshaller unmarshaller =
-                    find(paramType, setUnmarshallers);
-
-            String className = "?";
-            String methodName = "?";
-            if (setter != null) {
-                className = setter.getDeclaringClass().toString();
-                methodName = setter.getName();
-            }
-
-            if (unmarshaller == null) {
-                throw new DynamoDbMappingException(
-                        "Cannot unmarshall to parameter type Set<"
-                        + paramType + "> of method "
-                        + className + "." + methodName + " without a custom "
-                        + "unmarshaler.");
-            }
-
-            return unmarshaller;
-        }
-
-        private ArgumentUnmarshaller scalar(Method setter, Class<?> type) {
-            ArgumentUnmarshaller unmarshaller = find(type, unmarshallers);
-
-            String className = "?";
-            String methodName = "?";
-            if (setter != null) {
-                className = setter.getDeclaringClass().toString();
-                methodName = setter.getName();
-            }
-
-            if (unmarshaller == null) {
-                throw new DynamoDbMappingException(
-                        "Cannot unmarshall to parameter type " + type
-                        + "of method " + className + "." + methodName
-                        + " without a custom unmarshaler.");
-            }
-
-            return unmarshaller;
-        }
-    }
-
-    private static class Pair<T> {
-
-        public final Class<?> key;
-        public final T value;
-
-        private Pair(Class<?> key, T value) {
-            this.key = key;
-            this.value = value;
-        }
-
-        public static Pair<ArgumentMarshaller> of(
-                Class<?> key,
-                ArgumentMarshaller value) {
-
-            return new Pair<ArgumentMarshaller>(key, value);
-        }
-
-        public static Pair<ArgumentUnmarshaller> of(
-                Class<?> key,
-                ArgumentUnmarshaller value) {
-
-            return new Pair<ArgumentUnmarshaller>(key, value);
-        }
-    }
-
-    static class AnnotationAwareMarshallerSet
-            implements MarshallerSet {
-
-        private final MarshallerSet wrapped;
-
-        AnnotationAwareMarshallerSet(MarshallerSet wrapped) {
-            this.wrapped = wrapped;
-        }
-
-        @Override
-        public ArgumentMarshaller marshaller(Method getter) {
-            final StandardAnnotationMaps.FieldMap<?> annotations = StandardAnnotationMaps.of(getter, null);
-            final DynamoDbMarshalling marshalling = annotations.actualOf(DynamoDbMarshalling.class);
-            if (marshalling != null) {
-                return new CustomMarshaller(marshalling.marshallerClass());
-            } else if (annotations.actualOf(DynamoDbNativeBoolean.class) != null) {
-                return BooleanToBooleanMarshaller.instance();
-            }
-            return wrapped.marshaller(getter);
-        }
-
-        @Override
-        public ArgumentMarshaller memberMarshaller(Type memberType) {
-            return wrapped.memberMarshaller(memberType);
-        }
-    }
-
-    static class AnnotationAwareUnmarshallerSet
-            implements UnmarshallerSet {
-
-        private final UnmarshallerSet wrapped;
-
-        AnnotationAwareUnmarshallerSet(UnmarshallerSet wrapped) {
-            this.wrapped = wrapped;
-        }
-
-        @Override
-        public ArgumentUnmarshaller getUnmarshaller(
-                Method getter,
-                Method setter) {
-            final StandardAnnotationMaps.FieldMap<?> annotations = StandardAnnotationMaps.of(getter, null);
-            final DynamoDbMarshalling marshalling = annotations.actualOf(DynamoDbMarshalling.class);
-            if (marshalling != null) {
-                return new CustomUnmarshaller(getter.getReturnType(), marshalling.marshallerClass());
-            }
-            return wrapped.getUnmarshaller(getter, setter);
-        }
-
-        @Override
-        public ArgumentUnmarshaller memberUnmarshaller(Type c) {
-            return wrapped.memberUnmarshaller(c);
-        }
-    }
-
-    static class CachingMarshallerSet implements MarshallerSet {
-
-        private final Map<Method, ArgumentMarshaller> cache =
-                new HashMap<Method, ArgumentMarshaller>();
-
-        private final Map<Type, ArgumentMarshaller> memberCache =
-                new HashMap<Type, ArgumentMarshaller>();
-
-        private final MarshallerSet wrapped;
-
-        CachingMarshallerSet(MarshallerSet wrapped) {
-            this.wrapped = wrapped;
-        }
-
-        @Override
-        public ArgumentMarshaller marshaller(Method getter) {
-            synchronized (cache) {
-                ArgumentMarshaller marshaler = cache.get(getter);
-                if (marshaler != null) {
-                    return marshaler;
-                }
-
-                marshaler = wrapped.marshaller(getter);
-                cache.put(getter, marshaler);
-                return marshaler;
-            }
-        }
-
-        @Override
-        public ArgumentMarshaller memberMarshaller(Type memberType) {
-            synchronized (memberCache) {
-                ArgumentMarshaller marshaller = memberCache.get(memberType);
-                if (marshaller != null) {
-                    return marshaller;
-                }
-
-                marshaller = wrapped.memberMarshaller(memberType);
-                memberCache.put(memberType, marshaller);
-                return marshaller;
-            }
-        }
-    }
-
-    static class CachingUnmarshallerSet implements UnmarshallerSet {
-
-        private final Map<Method, ArgumentUnmarshaller> cache =
-                new HashMap<Method, ArgumentUnmarshaller>();
-
-        private final Map<Type, ArgumentUnmarshaller> memberCache =
-                new HashMap<Type, ArgumentUnmarshaller>();
-
-        private final UnmarshallerSet wrapped;
-
-        CachingUnmarshallerSet(UnmarshallerSet wrapped) {
-            this.wrapped = wrapped;
-        }
-
-        @Override
-        public ArgumentUnmarshaller getUnmarshaller(
-                Method getter,
-                Method setter) {
-
-            synchronized (cache) {
-                ArgumentUnmarshaller unmarshaler = cache.get(getter);
-                if (unmarshaler != null) {
-                    return unmarshaler;
-                }
-
-                unmarshaler = wrapped.getUnmarshaller(getter, setter);
-                cache.put(getter, unmarshaler);
-                return unmarshaler;
-            }
-        }
-
-        @Override
-        public ArgumentUnmarshaller memberUnmarshaller(Type memberType) {
-            synchronized (memberCache) {
-                ArgumentUnmarshaller unmarshaller = memberCache.get(memberType);
-                if (unmarshaller != null) {
-                    return unmarshaller;
-                }
-
-                unmarshaller = wrapped.memberUnmarshaller(memberType);
-                memberCache.put(memberType, unmarshaller);
-                return unmarshaller;
-            }
-        }
-    }
-
-    /**
-     * {@link AttributeValue} converter with {@link ItemConverter}
-     */
-    static class ItemConverterRuleFactory<V> implements RuleFactory<V> {
-        private final RuleFactory<V> typeConverters;
-        private final ItemConverter converter;
-        private final boolean customSchema;
-
-        ItemConverterRuleFactory(DynamoDbMapperConfig config, S3Link.Factory s3Links, RuleFactory<V> typeConverters) {
-            final ConversionSchema.Dependencies depends =
-                    new ConversionSchema.Dependencies().with(S3ClientCache.class, s3Links.s3ClientCache());
-            final ConversionSchema schema = config.getConversionSchema();
-
-            this.customSchema = (schema != V1 && schema != V2_COMPATIBLE && schema != V2);
-            this.converter = schema.getConverter(depends);
-            this.typeConverters = typeConverters;
-        }
-
-        @Override
-        public Rule<V> getRule(ConvertibleType<V> type) {
-            if (customSchema && type.typeConverter() == null) {
-                return new ItemConverterRule<V>(type);
-            } else {
-                return typeConverters.getRule(type);
-            }
-        }
-
-        private final class ItemConverterRule<V> implements Rule<V>, DynamoDbTypeConverter<AttributeValue, V> {
-            private final ConvertibleType<V> type;
-
-            private ItemConverterRule(final ConvertibleType<V> type) {
-                this.type = type;
-            }
-
-            @Override
-            public boolean isAssignableFrom(ConvertibleType<?> type) {
-                return true;
-            }
-
-            @Override
-            public DynamoDbTypeConverter<AttributeValue, V> newConverter(ConvertibleType<V> type) {
-                return this;
-            }
-
-            @Override
-            public DynamoDbAttributeType getAttributeType() {
-                try {
-                    return converter.getFieldModel(type.getter()).attributeType();
-                } catch (final DynamoDbMappingException no) {
-                    // Ignored or expected.
-                }
-                return DynamoDbAttributeType.NULL;
-            }
-
-            @Override
-            public AttributeValue convert(final V object) {
-                return converter.convert(type.getter(), object);
-            }
-
-            @Override
-            public V unconvert(final AttributeValue object) {
-                return (V) converter.unconvert(type.getter(), type.setter(), object);
-            }
-        }
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/ConversionToAttributeValuesTest.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/ConversionToAttributeValuesTest.java
deleted file mode 100644
index c17b4012a848..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/ConversionToAttributeValuesTest.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-import static org.junit.Assert.assertEquals;
-
-import java.util.Map;
-import org.junit.Before;
-import org.junit.Test;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-
-public class ConversionToAttributeValuesTest {
-
-    private DynamoDbMapperModelFactory models;
-    private DynamoDbMapperConfig finalConfig;
-
-    public static boolean equals(Object o1, Object o2) {
-        if (o1 == o2) {
-            return true;
-        }
-        if (o1 != null) {
-            return o1.equals(o2);
-        }
-        return false;
-    }
-
-    public static int hash(Object... objs) {
-        int hash = 7;
-        for (int i = 0; i < objs.length; ++i) {
-            hash = hash * 31 + objs[i].hashCode();
-        }
-        return hash;
-    }
-
-    @Before
-    public void setUp() throws Exception {
-        finalConfig = new DynamoDbMapperConfig.Builder()
-                .withTypeConverterFactory(DynamoDbMapperConfig.DEFAULT.getTypeConverterFactory())
-                .withConversionSchema(ConversionSchemas.V2)
-                .build();
-        this.models = StandardModelFactories.of(S3Link.Factory.of(null));
-    }
-
-    @Test
-    public void converterFailsForSubProperty() throws Exception {
-        DynamoDbMapperTableModel<ConverterData> tableModel = getTable(ConverterData.class);
-        Map<String, AttributeValue> withSubData = tableModel.convert(new ConverterData());
-        assertEquals("bar", tableModel.unconvert(withSubData).subDocument().getaData().value());
-    }
-
-    private <T> DynamoDbMapperTableModel<T> getTable(Class<T> clazz) {
-        return this.models.getTableFactory(finalConfig).getTable(clazz);
-    }
-
-    @DynamoDbTable(tableName = "test")
-    public static class ConverterData {
-
-        @DynamoDbTypeConverted(converter = CustomDataConverter.class)
-        CustomData customConverted;
-        @DynamoDbHashKey
-        private String key;
-        private ConverterSubDocument subDocument;
-
-        public ConverterData() {
-            customConverted = new CustomData("foo");
-            subDocument = new ConverterSubDocument();
-            subDocument.setaData(new CustomData("bar"));
-        }
-
-        public String getKey() {
-            return key;
-        }
-
-        public void setKey(String key) {
-            this.key = key;
-        }
-
-        public ConverterSubDocument subDocument() {
-            return subDocument;
-        }
-
-        public void setSubDocument(ConverterSubDocument subProperty) {
-            this.subDocument = subProperty;
-        }
-
-        public CustomData getCustomConverted() {
-            return customConverted;
-        }
-
-        public void setCustomConverted(CustomData customConverted) {
-            this.customConverted = customConverted;
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            if (this == o) {
-                return true;
-            }
-            if (o == null || getClass() != o.getClass()) {
-                return false;
-            }
-            ConverterData that = (ConverterData) o;
-            return ConversionToAttributeValuesTest.equals(subDocument, that.subDocument);
-        }
-
-        @Override
-        public int hashCode() {
-            return ConversionToAttributeValuesTest.hash(subDocument);
-        }
-
-    }
-
-    @DynamoDbDocument
-    public static class ConverterSubDocument {
-
-        @DynamoDbTypeConverted(converter = CustomDataConverter.class)
-        private CustomData aData;
-
-        public CustomData getaData() {
-            return aData;
-        }
-
-        public void setaData(CustomData aData) {
-            this.aData = aData;
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            if (this == o) {
-                return true;
-            }
-            if (o == null || getClass() != o.getClass()) {
-                return false;
-            }
-            ConverterSubDocument that = (ConverterSubDocument) o;
-            return ConversionToAttributeValuesTest.equals(aData, that.aData);
-        }
-
-        @Override
-        public int hashCode() {
-            return ConversionToAttributeValuesTest.hash(aData);
-        }
-    }
-
-    public static class CustomData {
-
-        private final String value;
-
-        public CustomData(String value) {
-            this.value = value;
-        }
-
-        public String value() {
-            return value;
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            if (this == o) {
-                return true;
-            }
-            if (o == null || getClass() != o.getClass()) {
-                return false;
-            }
-            CustomData that = (CustomData) o;
-            return ConversionToAttributeValuesTest.equals(value, that.value);
-        }
-
-        @Override
-        public int hashCode() {
-            return ConversionToAttributeValuesTest.hash(value);
-        }
-    }
-
-    public static class CustomDataConverter implements DynamoDbTypeConverter<String, CustomData> {
-
-        public String convert(CustomData object) {
-            return object.value();
-        }
-
-        public CustomData unconvert(String object) {
-            return new CustomData(object);
-        }
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/ConvertibleType.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/ConvertibleType.java
deleted file mode 100644
index 8fdc4bfd8f39..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/ConvertibleType.java
+++ /dev/null
@@ -1,219 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-import java.lang.reflect.Method;
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
-import software.amazon.awssdk.annotations.SdkInternalApi;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMapperFieldModel.DynamoDbAttributeType;
-import software.amazon.awssdk.services.dynamodb.datamodeling.StandardAnnotationMaps.TypedMap;
-import software.amazon.awssdk.services.dynamodb.datamodeling.StandardTypeConverters.Scalar;
-import software.amazon.awssdk.services.dynamodb.datamodeling.StandardTypeConverters.Vector;
-import software.amazon.awssdk.services.dynamodb.model.ScalarAttributeType;
-
-/**
- * Generic type helper.
- */
-@SdkInternalApi
-final class ConvertibleType<T> {
-
-    private final DynamoDbTypeConverter<?, T> typeConverter;
-    private final DynamoDbAttributeType attributeType;
-    private final ConvertibleType<T>[] params;
-    private final Class<T> targetType;
-
-    @Deprecated
-    private final Method getter;
-
-    @Deprecated
-    private final Method setter;
-
-    /**
-     * Constructs a new parameter type.
-     */
-    @SuppressWarnings("unchecked")
-    private ConvertibleType(Type genericType, TypedMap<T> annotations, Method getter) {
-        this.typeConverter = annotations.typeConverter();
-        this.attributeType = annotations.attributeType();
-
-        if (typeConverter != null) {
-            final ConvertibleType<T> target = ConvertibleType.<T>of(typeConverter);
-            this.targetType = target.targetType;
-            this.params = target.params;
-        } else if (genericType instanceof ParameterizedType) {
-            final Type[] paramTypes = ((ParameterizedType) genericType).getActualTypeArguments();
-            this.targetType = annotations.targetType();
-            this.params = new ConvertibleType[paramTypes.length];
-            for (int i = 0; i < paramTypes.length; i++) {
-                this.params[i] = ConvertibleType.<T>of(paramTypes[i]);
-            }
-        } else {
-            this.targetType = annotations.targetType();
-            this.params = new ConvertibleType[0];
-        }
-
-        this.setter = getter == null ? null : StandardBeanProperties.MethodReflect.setterOf(getter);
-        this.getter = getter;
-    }
-
-    /**
-     * Returns the conversion type for the method and annotations.
-     */
-    static <T> ConvertibleType<T> of(Method getter, TypedMap<T> annotations) {
-        return new ConvertibleType<T>(getter.getGenericReturnType(), annotations, getter);
-    }
-
-    /**
-     * Returns the conversion type for the converter.
-     */
-    private static <T> ConvertibleType<T> of(final DynamoDbTypeConverter<?, T> converter) {
-        final Class<?> clazz = converter.getClass();
-        if (!clazz.isInterface()) {
-            for (Class<?> c = clazz; Object.class != c; c = c.getSuperclass()) {
-                for (final Type genericType : c.getGenericInterfaces()) {
-                    final ConvertibleType<T> type = ConvertibleType.<T>of(genericType);
-                    if (type.is(DynamoDbTypeConverter.class)) {
-                        if (type.params.length == 2 && type.param(0).targetType() != Object.class) {
-                            return type.param(0);
-                        }
-                    }
-                }
-            }
-            final ConvertibleType<T> type = ConvertibleType.<T>of(clazz.getGenericSuperclass());
-            if (type.is(DynamoDbTypeConverter.class)) {
-                if (type.params.length > 0 && type.param(0).targetType() != Object.class) {
-                    return type.param(0);
-                }
-            }
-        }
-        throw new DynamoDbMappingException("could not resolve type of " + clazz);
-    }
-
-    /**
-     * Returns the conversion type for the generic type.
-     */
-    private static <T> ConvertibleType<T> of(Type genericType) {
-        final Class<T> targetType;
-        if (genericType instanceof Class) {
-            targetType = (Class<T>) genericType;
-        } else if (genericType instanceof ParameterizedType) {
-            targetType = (Class<T>) ((ParameterizedType) genericType).getRawType();
-        } else if (genericType.toString().equals("byte[]")) {
-            targetType = (Class<T>) byte[].class;
-        } else {
-            targetType = (Class<T>) Object.class;
-        }
-        final TypedMap<T> annotations = StandardAnnotationMaps.<T>of(targetType);
-        return new ConvertibleType<T>(genericType, annotations, null);
-    }
-
-    /**
-     * Gets the target custom type-converter.
-     */
-    <S> DynamoDbTypeConverter<S, T> typeConverter() {
-        return (DynamoDbTypeConverter<S, T>) this.typeConverter;
-    }
-
-    /**
-     * Gets the overriding attribute type.
-     */
-    DynamoDbAttributeType attributeType() {
-        return this.attributeType;
-    }
-
-    /**
-     * Gets the getter method.
-     */
-    @Deprecated
-    Method getter() {
-        return this.getter;
-    }
-
-    /**
-     * Gets the setter method.
-     */
-    @Deprecated
-    Method setter() {
-        return this.setter;
-    }
-
-    /**
-     * Gets the scalar parameter types.
-     */
-    <U> ConvertibleType<U> param(final int index) {
-        return this.params.length > index ? (ConvertibleType<U>) this.params[index] : null;
-    }
-
-    /**
-     * Returns true if the types match.
-     */
-    boolean is(ScalarAttributeType scalarAttributeType, Vector vector) {
-        return param(0) != null && param(0).is(scalarAttributeType) && is(vector);
-    }
-
-    /**
-     * Returns true if the types match.
-     */
-    boolean is(ScalarAttributeType scalarAttributeType) {
-        return Scalar.of(targetType()).is(scalarAttributeType);
-    }
-
-    /**
-     * Returns true if the types match.
-     */
-    boolean is(Scalar scalar) {
-        return scalar.is(targetType());
-    }
-
-    /**
-     * Returns true if the types match.
-     */
-    boolean is(Vector vector) {
-        return vector.is(targetType());
-    }
-
-    /**
-     * Returns true if the types match.
-     */
-    boolean is(Class<?> type) {
-        return type.isAssignableFrom(targetType());
-    }
-
-    /**
-     * Gets the raw scalar type.
-     */
-    Class<T> targetType() {
-        return this.targetType;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String toString() {
-        final StringBuilder builder = new StringBuilder(targetType().getSimpleName());
-        if (this.params.length > 0) {
-            builder.append("<");
-            for (int i = 0; i < this.params.length; i++) {
-                builder.append(i == 0 ? "" : ",").append(this.params[i]);
-            }
-            builder.append(">");
-        }
-        return builder.toString();
-    }
-
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDb.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDb.java
deleted file mode 100644
index 752f78a75661..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDb.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Annotation to mark other annotations as being part of DynamoDB.
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.ANNOTATION_TYPE)
-public @interface DynamoDb {
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbAttribute.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbAttribute.java
deleted file mode 100644
index 2204f11207e9..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbAttribute.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Interface for marking a class property as an attribute in a DynamoDB table.
- * Applied to the getter method or the class field for a modeled property. If
- * the annotation is applied directly to the class field, the corresponding
- * getter and setter must be declared in the same class.
- * <p>
- * This annotation is optional when the name of the DynamoDB attribute matches
- * the name of the property declared in the class. When they differ, use this
- * annotation with the attributeName() parameter to specify which DynamoDB
- * attribute this property corresponds to. Furthermore, the
- * {@link DynamoDbMapper} class assumes Java naming conventions, and will
- * lower-case the first character of a getter method's property name to
- * determine the name of the property. E.g., a method value() will map to the
- * DynamoDB attribute "value". Similarly, a method isValid() maps to the
- * DynamoDB attribute "valid".
- * <p>
- * Even getter method not marked with this annotation are assumed to be modeled
- * properties, unless marked with {@link DynamoDbIgnore}.
- */
-@DynamoDb
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.FIELD, ElementType.METHOD})
-public @interface DynamoDbAttribute {
-
-    /**
-     * Optional parameter when the name of the attribute as stored in DynamoDB
-     * should differ from the name used by the getter / setter.
-     */
-    String attributeName() default "";
-
-    /**
-     * Optional parameter when using {@link DynamoDbFlattened}; identifies
-     * the field/property name on the target class to map as the attribute.
-     * @see DynamoDbFlattened
-     */
-    String mappedBy() default "";
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbAutoGenerateStrategy.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbAutoGenerateStrategy.java
deleted file mode 100644
index 085c350c7890..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbAutoGenerateStrategy.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-/**
- * Enumeration of possible auto-generation strategies.
- * @see DynamoDbAutoGeneratedTimestamp
- */
-public enum DynamoDbAutoGenerateStrategy {
-
-    /**
-     * Instructs to always generate both on create and update.
-     */
-    ALWAYS,
-
-    /**
-     * Instructs to generate on create only.
-     */
-    CREATE;
-
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbAutoGenerated.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbAutoGenerated.java
deleted file mode 100644
index fb4638496d31..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbAutoGenerated.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Annotation to mark a property as using a custom auto-generator.
- *
- * <p>May be annotated on a user-defined annotation to pass additional
- * properties to the {@link DynamoDbAutoGenerator}.</p>
- *
- * <pre class="brush: java">
- * &#064;DynamoDBHashKey
- * &#064;CustomGeneratedKey(prefix=&quot;test-&quot;) //&lt;- user-defined annotation
- * public String getKey()
- * </pre>
- *
- * <p>Where,</p>
- * <pre class="brush: java">
- * &#064;DynamoDBAutoGenerated(generator=CustomGeneratedKey.Generator.class)
- * &#064;Retention(RetentionPolicy.RUNTIME)
- * &#064;Target({ElementType.METHOD})
- * public &#064;interface CustomGeneratedKey {
- *     String prefix() default &quot;&quot;;
- *
- *     public static class Generator implements DynamoDBAutoGenerator&lt;String&gt; {
- *         private final String prefix;
- *         public Generator(final Class&lt;String&gt; targetType, final CustomGeneratedKey annotation) {
- *             this.prefix = annotation.prefix();
- *         }
- *         public Generator() { //&lt;- required if annotating directly
- *             this.prefix = "";
- *         }
- *         &#064;Override
- *         public DynamoDBAutoGenerateStrategy getGenerateStrategy() {
- *             return DynamoDBAutoGenerateStrategy.CREATE;
- *         }
- *         &#064;Override
- *         public final String generate(final String currentValue) {
- *             return prefix + UUID.randomUUID.toString();
- *         }
- *     }
- * }
- * </pre>
- *
- * <p>Alternately, the property/field may be annotated directly (which requires
- * the generator to provide a default constructor),</p>
- * <pre class="brush: java">
- * &#064;DynamoDBAutoGenerated(generator=CustomGeneratedKey.Generator.class)
- * public String getKey()
- * </pre>
- *
- * <p>May be used as a meta-annotation.</p>
- */
-@DynamoDb
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.TYPE, ElementType.FIELD, ElementType.METHOD, ElementType.ANNOTATION_TYPE})
-public @interface DynamoDbAutoGenerated {
-
-    /**
-     * The auto-generator class for this property.
-     */
-    @SuppressWarnings("rawtypes")
-    Class<? extends DynamoDbAutoGenerator> generator();
-
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbAutoGeneratedDefault.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbAutoGeneratedDefault.java
deleted file mode 100644
index 6d67662b062d..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbAutoGeneratedDefault.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Annotation to assign a default value on creation if value is null.
- *
- * <pre class="brush: java">
- * &#064;DynamoDBAutoGeneratedDefault(&quot;OPEN&quot;)
- * public String status()
- * </pre>
- *
- * <p>Only compatible with standard string types.</p>
- *
- */
-@DynamoDb
-@DynamoDbAutoGenerated(generator = DynamoDbAutoGeneratedDefault.Generator.class)
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.FIELD, ElementType.METHOD})
-public @interface DynamoDbAutoGeneratedDefault {
-
-    /**
-     * The default value.
-     */
-    String value();
-
-
-    /**
-     * Default generator.
-     */
-    final class Generator<T> extends DynamoDbAutoGenerator.AbstractGenerator<T> {
-        private final DynamoDbTypeConverter<T, String> converter;
-        private final String defaultValue;
-
-        Generator(Class<T> targetType, DynamoDbAutoGeneratedDefault annotation) {
-            super(DynamoDbAutoGenerateStrategy.CREATE);
-            this.converter = StandardTypeConverters.factory().getConverter(targetType, String.class);
-            this.defaultValue = annotation.value();
-        }
-
-        @Override
-        public T generate(T currentValue) {
-            return converter.convert(defaultValue);
-        }
-    }
-
-
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbAutoGeneratedKey.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbAutoGeneratedKey.java
deleted file mode 100644
index 64d4d0bc4e5b..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbAutoGeneratedKey.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Annotation for marking a hash key or range key property in a class to
- * auto-generate this key. Only String typed keys can be auto generated, and are
- * given a random UUID. The annotation can be applied to either the getter
- * method or the class field for the auto-generated key property. If the
- * annotation is applied directly to the class field, the corresponding getter
- * and setter must be declared in the same class. This annotation can be applied
- * to both primary and index keys.
- *
- * @see DynamoDbGeneratedUuid
- * @see java.util.UUID
- */
-@DynamoDbGeneratedUuid(DynamoDbAutoGenerateStrategy.CREATE)
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.FIELD, ElementType.METHOD})
-public @interface DynamoDbAutoGeneratedKey {
-
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbAutoGeneratedTimestamp.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbAutoGeneratedTimestamp.java
deleted file mode 100644
index 553573def7b8..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbAutoGeneratedTimestamp.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-import java.util.Date;
-
-/**
- * Annotation for auto-generating a date/timestamp.
- *
- * <pre class="brush: java">
- * &#064;DynamoDBAutoGeneratedTimestamp(strategy=DynamoDBAutoGenerateStrategy.CREATE)
- * public Date getCreatedDate() { return createdDate; }
- * public void setCreatedDate(Date createdDate) { this.createdDate = createdDate; }
- *
- * &#064;DynamoDBAutoGeneratedTimestamp(strategy=DynamoDBAutoGenerateStrategy.ALWAYS)
- * public Date lastUpdatedDate() { return lastUpdatedDate; }
- * public void setLastUpdatedDate(Date lastUpdatedDate) { this.lastUpdatedDate = lastUpdatedDate; }
- * </pre>
- *
- * <p>Supports the standard {@link Date} type-conversions; such as
- * {@link java.util.Calendar}, {@link Long}.</p>
- *
- * <p>Primitives such as {@code long} are not supported since the unset
- * (or null) state can't be detected.</p>
- *
- * <p>Compatible with {@link DynamoDbTypeConvertedTimestamp}</p>
- */
-@DynamoDbAutoGenerated(generator = DynamoDbAutoGeneratedTimestamp.Generator.class)
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.FIELD, ElementType.METHOD})
-public @interface DynamoDbAutoGeneratedTimestamp {
-
-    /**
-     * The auto-generation strategy; default is {@code ALWAYS}.
-     * @see DynamoDbAutoGenerateStrategy
-     */
-    DynamoDbAutoGenerateStrategy strategy() default DynamoDbAutoGenerateStrategy.ALWAYS;
-
-    /**
-     * Default generator.
-     */
-    final class Generator<T> extends DynamoDbAutoGenerator.AbstractGenerator<T> {
-        private final DynamoDbTypeConverter<T, Date> converter;
-
-        Generator(Class<T> targetType, DynamoDbAutoGeneratedTimestamp annotation) {
-            super(annotation.strategy());
-            this.converter = StandardTypeConverters.factory().getConverter(targetType, Date.class);
-        }
-
-        @Override
-        public T generate(T currentValue) {
-            return converter.convert(new Date());
-        }
-    }
-
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbAutoGenerator.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbAutoGenerator.java
deleted file mode 100644
index 56c1dd17b6ac..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbAutoGenerator.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-import software.amazon.awssdk.annotations.SdkInternalApi;
-
-/**
- * Generator interface for auto-generating attribute values.
- *
- * <p>Auto-generation may be controlled by {@link DynamoDbAutoGenerateStrategy},
-
- * <p>{@link DynamoDbAutoGenerateStrategy#CREATE}, instructs to generate when
- * creating the item. The mapper, determines an item is new, or overwriting,
- * if it's current value is {@code null}. There is a limitiation when performing
- * partial updates using either,
- * {@link DynamoDbMapperConfig.SaveBehavior#UPDATE_SKIP_NULL_ATTRIBUTES}, or
- * {@link DynamoDbMapperConfig.SaveBehavior#APPEND_SET}. A new value will only
- * be generated if the mapper is also generating the key.</p>
- *
- * <p>{@link DynamoDbAutoGenerateStrategy#ALWAYS}, instructs to always generate
- * a new value, applied on any save or batch write operation.</li>
- *
- * <p>May be used in combination with {@link DynamoDbAutoGenerated}.</p>
- *
- * @param <T> The object's field/property value type.
- *
- * @see DynamoDbAutoGenerated
- */
-public interface DynamoDbAutoGenerator<T extends Object> {
-
-    /**
-     * Gets the auto-generate strategy.
-     */
-    DynamoDbAutoGenerateStrategy getGenerateStrategy();
-
-    /**
-     * Generates a new value given the current value (or null) if applicable.
-     */
-    T generate(T currentValue);
-
-    /**
-     * A generator which holds the {@link DynamoDbAutoGenerateStrategy}.
-     */
-    @SdkInternalApi
-    abstract class AbstractGenerator<T> implements DynamoDbAutoGenerator<T> {
-        private final DynamoDbAutoGenerateStrategy strategy;
-
-        protected AbstractGenerator(DynamoDbAutoGenerateStrategy strategy) {
-            this.strategy = strategy;
-        }
-
-        @Override
-        public DynamoDbAutoGenerateStrategy getGenerateStrategy() {
-            return this.strategy;
-        }
-    }
-
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbConvertedBool.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbConvertedBool.java
deleted file mode 100644
index 85020102d6a0..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbConvertedBool.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Annotation to convert a {@link Boolean} to the DynamoDB {@code S} type.
- *
- * <pre class="brush: java">
- * &#064;DynamoDBConvertedBool(DynamoDBConvertedBool.Format.Y_N)
- * public boolean isTesting()
- * </pre>
- *
- * <p>The standard V1 and V2 compatible conversion schemas will, by default,
- * serialize booleans using the DynamoDB {@code N} type, with a value of '1'
- * representing 'true' and a value of '0' representing 'false'. To force the
- * {@code N} conversion in other schemas,
- * <pre class="brush: java">
- * &#064;DynamoDBTyped(DynamoDBAttributeType.N)
- * public boolean isTesting()
- * </pre>
- *
- * <p>The standard V2 conversion schema will by default serialize booleans
- * natively using the DynamoDB {@code BOOL} type. To force the native
- * {@code BOOL} conversion in other schemas,
- * <pre class="brush: java">
- * &#064;DynamoDBTyped(DynamoDBAttributeType.BOOL)
- * public boolean isTesting()
- * </pre>
- *
- * <p>May be used as a meta-annotation.</p>
- */
-@DynamoDb
-@DynamoDbTypeConverted(converter = DynamoDbConvertedBool.Converter.class)
-@DynamoDbTyped(DynamoDbMapperFieldModel.DynamoDbAttributeType.S)
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.FIELD, ElementType.METHOD, ElementType.ANNOTATION_TYPE})
-public @interface DynamoDbConvertedBool {
-
-    /**
-     * The format type for converting to and from {@link String}.
-     */
-    Format value();
-
-
-
-    /**
-     * Enumeration of the supported format options.
-     */
-    enum Format {
-        true_false, T_F, Y_N
-    }
-
-    /**
-     * Boolean type converter.
-     */
-    final class Converter implements DynamoDbTypeConverter<String, Boolean> {
-        private final String valueTrue;
-        private final String valueFalse;
-
-        Converter(Class<Boolean> targetType, DynamoDbConvertedBool annotation) {
-            this.valueTrue = annotation.value().name().split("_")[0];
-            this.valueFalse = annotation.value().name().split("_")[1];
-        }
-
-        @Override
-        public String convert(final Boolean object) {
-            return Boolean.TRUE.equals(object) ? valueTrue : valueFalse;
-        }
-
-        @Override
-        public Boolean unconvert(final String object) {
-            return valueTrue.equals(object) ? Boolean.TRUE : Boolean.FALSE;
-        }
-    }
-
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbDeleteExpression.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbDeleteExpression.java
deleted file mode 100644
index 63669c53b280..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbDeleteExpression.java
+++ /dev/null
@@ -1,340 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-import java.util.HashMap;
-import java.util.Map;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-import software.amazon.awssdk.services.dynamodb.model.ConditionalOperator;
-import software.amazon.awssdk.services.dynamodb.model.DeleteItemRequest;
-import software.amazon.awssdk.services.dynamodb.model.ExpectedAttributeValue;
-
-/**
- * Enables adding options to a delete operation.
- * For example, you may want to delete only if an attribute has a particular value.
- * @see DynamoDbMapper#delete(Object, DynamoDbDeleteExpression)
- */
-public class DynamoDbDeleteExpression {
-
-    /** Optional expected attributes. */
-    private Map<String, ExpectedAttributeValue> expectedAttributes;
-
-    /** The logical operator on the expected attribute conditions. */
-    private String conditionalOperator;
-
-    /**
-     * A condition that must be satisfied in order for a conditional
-     * DeleteItem to succeed.
-     */
-    private String conditionExpression;
-
-    /**
-     * One or more substitution variables for simplifying complex
-     * expressions.
-     */
-    private java.util.Map<String, String> expressionAttributeNames;
-
-    /**
-     * One or more values that can be substituted in an expression.
-     */
-    private java.util.Map<String, AttributeValue> expressionAttributeValues;
-
-    /**
-     * Gets the map of attribute names to expected attribute values to check on delete.
-     *
-     * @return The map of attribute names to expected attribute value conditions to check on delete
-     */
-    public Map<String, ExpectedAttributeValue> getExpected() {
-        return expectedAttributes;
-    }
-
-    /**
-     * Sets the expected condition to the map of attribute names to expected attribute values given.
-     *
-     * @param expectedAttributes
-     *            The map of attribute names to expected attribute value conditions to check on delete
-     */
-    public void setExpected(Map<String, ExpectedAttributeValue> expectedAttributes) {
-        this.expectedAttributes = expectedAttributes;
-    }
-
-    /**
-     * Sets the expected condition to the map of attribute names to expected
-     * attribute values given and returns a pointer to this object for
-     * method-chaining.
-     *
-     * @param expectedAttributes
-     *            The map of attribute names to expected attribute value
-     *            conditions to check on delete
-     */
-    public DynamoDbDeleteExpression withExpected(Map<String, ExpectedAttributeValue> expectedAttributes) {
-        setExpected(expectedAttributes);
-        return this;
-    }
-
-    /**
-     * Adds one entry to the expected conditions and returns a pointer to this
-     * object for method-chaining.
-     *
-     * @param attributeName
-     *            The name of the attribute.
-     * @param expected
-     *            The expected attribute value.
-     */
-    public DynamoDbDeleteExpression withExpectedEntry(String attributeName, ExpectedAttributeValue expected) {
-        if (expectedAttributes == null) {
-            expectedAttributes = new HashMap<String, ExpectedAttributeValue>();
-        }
-        expectedAttributes.put(attributeName, expected);
-        return this;
-    }
-
-    /**
-     * Returns the logical operator on the expected attribute conditions of this
-     * delete operation.
-     */
-    public String getConditionalOperator() {
-        return conditionalOperator;
-    }
-
-    /**
-     * Sets the logical operator on the expected attribute conditions of this
-     * delete operation.
-     */
-    public void setConditionalOperator(String conditionalOperator) {
-        this.conditionalOperator = conditionalOperator;
-    }
-
-    /**
-     * Sets the logical operator on the expected attribute conditions of this
-     * delete operation.
-     */
-    public void setConditionalOperator(ConditionalOperator conditionalOperator) {
-        setConditionalOperator(conditionalOperator.toString());
-    }
-
-    /**
-     * Sets the logical operator on the expected attribute conditions of this
-     * delete operation and returns a pointer to this object for
-     * method-chaining.
-     */
-    public DynamoDbDeleteExpression withConditionalOperator(String conditionalOperator) {
-        setConditionalOperator(conditionalOperator);
-        return this;
-    }
-
-    /**
-     * Sets the logical operator on the expected attribute conditions of this
-     * delete operation and returns a pointer to this object for
-     * method-chaining.
-     */
-    public DynamoDbDeleteExpression withConditionalOperator(ConditionalOperator conditionalOperator) {
-        return withConditionalOperator(conditionalOperator.toString());
-    }
-
-    /**
-     * A condition that must be satisfied in order for a conditional DeleteItem
-     * to succeed.
-     *
-     * @see DeleteItemRequest#getConditionExpression()
-     */
-    public String getConditionExpression() {
-        return conditionExpression;
-    }
-
-    /**
-     * A condition that must be satisfied in order for a conditional DeleteItem
-     * to succeed.
-     *
-     * @see DeleteItemRequest#setConditionExpression()
-     */
-    public void setConditionExpression(String conditionExpression) {
-        this.conditionExpression = conditionExpression;
-    }
-
-    /**
-     * A condition that must be satisfied in order for a conditional DeleteItem
-     * to succeed.
-     *
-     * @return A reference to this updated object so that method calls can be
-     *         chained together.
-     *
-     * @see DeleteItemRequest#withConditionExpression(String)
-     */
-    public DynamoDbDeleteExpression withConditionExpression(
-            String conditionExpression) {
-        this.conditionExpression = conditionExpression;
-        return this;
-    }
-
-    /**
-     * One or more substitution variables for simplifying complex expressions.
-     *
-     * @return One or more substitution variables for simplifying complex
-     *         expressions.
-     * @see DeleteItemRequest#getExpressionAttributeNames()
-     */
-    public java.util.Map<String, String> getExpressionAttributeNames() {
-
-        return expressionAttributeNames;
-    }
-
-    /**
-     * One or more substitution variables for simplifying complex expressions.
-     *
-     * @param expressionAttributeNames
-     *            One or more substitution variables for simplifying complex
-     *            expressions.
-     * @see DeleteItemRequest#setExpressionAttributeNames(Map)
-     */
-    public void setExpressionAttributeNames(
-            java.util.Map<String, String> expressionAttributeNames) {
-        this.expressionAttributeNames = expressionAttributeNames;
-    }
-
-    /**
-     * One or more substitution variables for simplifying complex expressions.
-     *
-     * @param expressionAttributeNames
-     *            One or more substitution variables for simplifying complex
-     *            expressions.
-     *
-     * @return A reference to this updated object so that method calls can be
-     *         chained together.
-     * @see DeleteItemRequest#withExpressionAttributeNames(Map)
-     */
-    public DynamoDbDeleteExpression withExpressionAttributeNames(
-            java.util.Map<String, String> expressionAttributeNames) {
-        setExpressionAttributeNames(expressionAttributeNames);
-        return this;
-    }
-
-    /**
-     * One or more substitution variables for simplifying complex expressions.
-     * The method adds a new key-value pair into ExpressionAttributeNames
-     * parameter, and returns a reference to this object so that method calls
-     * can be chained together.
-     *
-     * @param key
-     *            The key of the entry to be added into
-     *            ExpressionAttributeNames.
-     * @param value
-     *            The corresponding value of the entry to be added into
-     *            ExpressionAttributeNames.
-     *
-     * @see DeleteItemRequest#addExpressionAttributeNamesEntry(String, String)
-     */
-    public DynamoDbDeleteExpression addExpressionAttributeNamesEntry(
-            String key, String value) {
-        if (null == this.expressionAttributeNames) {
-            this.expressionAttributeNames = new java.util.HashMap<String, String>();
-        }
-        if (this.expressionAttributeNames.containsKey(key)) {
-            throw new IllegalArgumentException("Duplicated keys (" + key + ") are provided.");
-        }
-        this.expressionAttributeNames.put(key, value);
-        return this;
-    }
-
-    /**
-     * Removes all the entries added into ExpressionAttributeNames.
-     * <p>
-     * Returns a reference to this object so that method calls can be chained
-     * together.
-     */
-    public DynamoDbDeleteExpression clearExpressionAttributeNamesEntries() {
-        this.expressionAttributeNames = null;
-        return this;
-    }
-
-    /**
-     * One or more values that can be substituted in an expression.
-     *
-     * @return One or more values that can be substituted in an expression.
-     * @see DeleteItemRequest#getExpressionAttributeValues()
-     */
-    public java.util.Map<String, AttributeValue> getExpressionAttributeValues() {
-        return expressionAttributeValues;
-    }
-
-    /**
-     * One or more values that can be substituted in an expression.
-     *
-     * @param expressionAttributeValues
-     *            One or more values that can be substituted in an expression.
-     *
-     * @see DeleteItemRequest#setExpressionAttributeValues(Map)
-     */
-    public void setExpressionAttributeValues(
-            java.util.Map<String, AttributeValue> expressionAttributeValues) {
-        this.expressionAttributeValues = expressionAttributeValues;
-    }
-
-    /**
-     * One or more values that can be substituted in an expression.
-     *
-     * @param expressionAttributeValues
-     *            One or more values that can be substituted in an expression.
-     *
-     * @return A reference to this updated object so that method calls can be
-     *         chained together.
-     * @see DeleteItemRequest#withExpressionAttributeValues(Map)
-     */
-    public DynamoDbDeleteExpression withExpressionAttributeValues(
-            java.util.Map<String, AttributeValue> expressionAttributeValues) {
-        setExpressionAttributeValues(expressionAttributeValues);
-        return this;
-    }
-
-    /**
-     * One or more values that can be substituted in an expression. The method
-     * adds a new key-value pair into ExpressionAttributeValues parameter, and
-     * returns a reference to this object so that method calls can be chained
-     * together.
-     *
-     * @param key
-     *            The key of the entry to be added into
-     *            ExpressionAttributeValues.
-     * @param value
-     *            The corresponding value of the entry to be added into
-     *            ExpressionAttributeValues.
-     *
-     * @see DeleteItemRequest#addExpressionAttributeValuesEntry(String,
-     *      AttributeValue)
-     */
-    public DynamoDbDeleteExpression addExpressionAttributeValuesEntry(
-            String key, AttributeValue value) {
-        if (null == this.expressionAttributeValues) {
-            this.expressionAttributeValues = new java.util.HashMap<String, AttributeValue>();
-        }
-        if (this.expressionAttributeValues.containsKey(key)) {
-            throw new IllegalArgumentException("Duplicated keys (" + key + ") are provided.");
-        }
-        this.expressionAttributeValues.put(key, value);
-        return this;
-    }
-
-    /**
-     * Removes all the entries added into ExpressionAttributeValues.
-     * <p>
-     * Returns a reference to this object so that method calls can be chained
-     * together.
-     */
-    public DynamoDbDeleteExpression clearExpressionAttributeValuesEntries() {
-        this.expressionAttributeValues = null;
-        return this;
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbDelimited.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbDelimited.java
deleted file mode 100644
index fe7f91664570..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbDelimited.java
+++ /dev/null
@@ -1,205 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-import java.util.regex.Pattern;
-import software.amazon.awssdk.services.dynamodb.datamodeling.StandardBeanProperties.Bean;
-import software.amazon.awssdk.services.dynamodb.datamodeling.StandardBeanProperties.BeanMap;
-
-/**
- * Annotation to convert an object into a single delimited {@link String}
- * attribute.
- *
- * <pre class="brush: java">
- * &#064;DynamoDBDelimited(
- *     attributeNames={&quot;areaCode&quot;,&quot;exchange&quot;,&quot;subscriber&quot;},
- *     delimiter='-'
- * )
- * public PhoneNumber getPhoneNumber()
- * </pre>
- *
- * <p>Where,</p>
- * <pre class="brush: java">
- * public class PhoneNumber {
- *     private String areaCode;
- *     private String exchange;
- *     private String subscriber;
- *
- *     public String getAreaCode() { return areaCode; }
- *     public void setAreaCode(String areaCode) { this.areaCode = areaCode; }
- *
- *     public String getExchange() { return exchange; }
- *     public void setExchange(String exchange) { this.exchange = exchange; }
- *
- *     public String subscriber() { return subscriber; }
- *     public void setSubscriber(String subscriber) { this.subscriber = subscriber; }
- * }
- * </pre>
- *
- * <p>Would write,</p>
- * <ul>
- *     <li><code>PhoneNumber("206","266","1000")</code> = <code>"206-266-1000"</code></li>
- *     <li><code>PhoneNumber("206",null,"1000")</code> = <code>"206--1000"</code></li>
- *     <li><code>PhoneNumber("206",null,null)</code> = <code>"206--"</code></li>
- *     <li><code>PhoneNumber(null,"266","1000")</code> = <code>"-266-1000"</code></li>
- *     <li><code>PhoneNumber(null,"266",null)</code> = <code>"-266-"</code></li>
- *     <li><code>PhoneNumber(null,null,"1000")</code> = <code>"--1000"</code></li>
- *     <li><code>PhoneNumber(null,null,null)</code> = <code>null</code></li>
- *     <li><code>null</code> = <code>null</code></li>
- * </ul>
- *
- * Conversely, reading not fully formatted values from DynamoDB given,
- * <ul>
- *     <li><code>""</code> = <code>empty string not allowed by DDB but would produce empty object</code></li>
- *     <li><code>"--"</code> = <code>PhoneNumber(null,null,null)</code></li>
- *     <li><code>"-----"</code> = <code>PhoneNumber(null,null,null)</code></li>
- *     <li><code>"206"</code> = <code>PhoneNumber("206",null,null)</code></li>
- *     <li><code>"206-266"</code> = <code>PhoneNumber("206","266",null)</code></li>
- *     <li><code>"206-266-1000-1234-5678"</code> = <code>PhoneNumber("206","266","1000")</code></li>
- * </ul>
- *
- * <p>The converter does not protect against values which may also contain the
- * delimiter. If more advanced conversion is required, consider implementing,
- * a custom {@link DynamoDbTypeConverter}.</p>
- *
- * <p>New delimited values may always be appended to the string, however, there
- * are some risks in distributed systems where, if one system has updated
- * delimiting instructions and begins to persist new values, other systems,
- * which also persist that same data, would effectively truncate it back to the
- * original format.</p>
- *
- * <p>Auto-generated annotations are not supported on field/property.</p>
- *
- * <p>TYpe-converted annotations, annotated by {@link DynamoDbTypeConverted},
- * where the output type is {@link String} are supported.
- *
- * <p>May be used as a meta-annotation.</p>
- */
-@DynamoDb
-@DynamoDbTypeConverted(converter = DynamoDbDelimited.Converter.class)
-@DynamoDbTyped(DynamoDbMapperFieldModel.DynamoDbAttributeType.S)
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.TYPE, ElementType.FIELD, ElementType.METHOD, ElementType.ANNOTATION_TYPE})
-public @interface DynamoDbDelimited {
-
-    /**
-     * The delimiter for separating attribute values; default is <code>|</code>.
-     */
-    char delimiter() default '|';
-
-    /**
-     * The ordered list of attribute/field names.
-     */
-    String[] attributeNames();
-
-    /**
-     * Type converter for string delimited attributes.
-     */
-    final class Converter<T> implements DynamoDbTypeConverter<String, T> {
-        private final Field<T, Object>[] fields;
-        private final Class<T> targetType;
-        private final String delimiter;
-
-        Converter(Class<T> targetType, DynamoDbDelimited annotation) {
-            final BeanMap<T, Object> beans = new BeanMap<T, Object>(targetType, true);
-
-            final String[] names = annotation.attributeNames();
-            if (names.length <= 1) {
-                throw new DynamoDbMappingException(targetType +
-                                                   " missing attributeNames in @DynamoDBDelimited; must specify two or " +
-                                                   "more attribute names");
-            }
-
-            this.delimiter = String.valueOf(annotation.delimiter());
-            this.fields = new Field[names.length];
-            this.targetType = targetType;
-
-            for (int i = 0; i < fields.length; i++) {
-                if (beans.containsKey(names[i]) == false) {
-                    throw new DynamoDbMappingException(targetType + " does not map %s on model " + names[i]);
-                }
-                this.fields[i] = new Field<T, Object>(targetType, beans.get(names[i]));
-            }
-        }
-
-        @Override
-        public String convert(final T object) {
-            final StringBuilder string = new StringBuilder();
-            for (int i = 0; i < fields.length; i++) {
-                if (i > 0) {
-                    string.append(delimiter);
-                }
-                final String value = fields[i].get(object);
-                if (value != null) {
-                    if (value.contains(delimiter)) {
-                        throw new DynamoDbMappingException(String.format(
-                                "%s[%s] field value \"%s\" must not contain delimiter %s",
-                                targetType, fields[i].bean.properties().attributeName(), value, delimiter
-                                                                        ));
-                    }
-                    string.append(value);
-                }
-            }
-            return string.length() < fields.length ? null : string.toString();
-        }
-
-        @Override
-        public T unconvert(final String string) {
-            final T object = StandardBeanProperties.DeclaringReflect.<T>newInstance(targetType);
-            final String[] values = string.split(Pattern.quote(delimiter));
-            for (int i = 0, its = Math.min(fields.length, values.length); i < its; i++) {
-                fields[i].set(object, values[i]);
-            }
-            return object;
-        }
-
-        private static final class Field<T, V> {
-            private final DynamoDbTypeConverter<String, V> converter;
-            private final Bean<T, V> bean;
-
-            private Field(final Class<T> type, final Bean<T, V> bean) {
-                if (bean.type().typeConverter() == null) {
-                    this.converter = StandardTypeConverters.factory().getConverter(String.class, bean.type().targetType());
-                } else {
-                    this.converter = bean.type().<String>typeConverter();
-                }
-                this.bean = bean;
-            }
-
-            private String get(final T object) {
-                final V value = bean.reflect().get(object);
-                if (value == null) {
-                    return null;
-                }
-                return converter.convert(value);
-            }
-
-            private void set(final T object, final String string) {
-                if (!string.isEmpty()) {
-                    final V value = converter.unconvert(string);
-                    if (value != null) {
-                        bean.reflect().set(object, value);
-                    }
-                }
-            }
-        }
-    }
-
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbDocument.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbDocument.java
deleted file mode 100644
index 3ba251997c4b..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbDocument.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * An annotation that marks a class which can be serialized to a DynamoDB
- * document or sub-document. Behaves exactly the same as {@link DynamoDbTable},
- * but without requiring you to specify a {@code tableName}.
- */
-@DynamoDb
-@DynamoDbTyped(DynamoDbMapperFieldModel.DynamoDbAttributeType.M)
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.TYPE)
-@Inherited
-public @interface DynamoDbDocument {
-
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbFlattened.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbFlattened.java
deleted file mode 100644
index b8fec9e0febb..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbFlattened.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Annotation for flattening a complex type.
- *
- * <pre class="brush: java">
- * &#064;DynamoDBFlattened(attributes={
- *     &#064;DynamoDBAttribute(mappedBy=&quot;start&quot;, attributeName=&quot;effectiveStartDate&quot;),
- *     &#064;DynamoDBAttribute(mappedBy=&quot;end&quot;, attributeName=&quot;effectiveEndDate&quot;)})
- * public DateRange getEffectiveRange() { return effectiveRange; }
- * public void setEffectiveRange(DateRange effectiveRange) { this.effectiveRange = effectiveRange; }
- *
- * &#064;DynamoDBFlattened(attributes={
- *     &#064;DynamoDBAttribute(mappedBy=&quot;start&quot;, attributeName=&quot;extensionstartDate&quot;),
- *     &#064;DynamoDBAttribute(mappedBy=&quot;end&quot;, attributeName=&quot;extensionEndDate&quot;)})
- * public DateRange getExtensionRange() { return extensionRange; }
- * public void setExtensionRange(DateRange extensionRange) { this.extensionRange = extensionRange; }
- * </pre>
- *
- * <p>Where,</p>
- * <pre class="brush: java">
- * public class DateRange {
- *     private Date start;
- *     private Date end;
- *
- *     public Date start() { return start; }
- *     public void setStart(Date start) { this.start = start; }
- *
- *     public Date getEnd() { return end; }
- *     public void setEnd(Date end) { this.end = end; }
- * }
- * </pre>
- *
- * <p>Attributes defined within the complex type may also be annotated.</p>
- *
- * <p>May be used as a meta-annotation.</p>
- */
-@DynamoDb
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.TYPE, ElementType.FIELD, ElementType.METHOD, ElementType.ANNOTATION_TYPE})
-public @interface DynamoDbFlattened {
-
-    /**
-     * Indicates the attributes that should be flattened.
-     */
-    DynamoDbAttribute[] attributes() default {};
-
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbGeneratedUuid.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbGeneratedUuid.java
deleted file mode 100644
index d3dd5dec6ddc..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbGeneratedUuid.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-import java.util.UUID;
-
-/**
- * Annotation for auto-generating a {@link UUID}.
- *
- * <pre class="brush: java">
- * &#064;DynamoDBGeneratedUuid(DynamoDBAutoGenerateStrategy.CREATE)
- * public UUID getKey()
- * </pre>
- *
- * <p>When applied to a key field, only the strategy
- * {@link DynamoDbAutoGenerateStrategy#CREATE} is supported.</p>
- *
- * <p>The short-formed {@link DynamoDbAutoGeneratedKey} may also be used for
- * create only.</p>
- *
- * <p>May be used as a meta-annotation.</p>
- *
- * @see java.util.UUID
- */
-@DynamoDb
-@DynamoDbAutoGenerated(generator = DynamoDbGeneratedUuid.Generator.class)
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.FIELD, ElementType.METHOD, ElementType.ANNOTATION_TYPE})
-public @interface DynamoDbGeneratedUuid {
-
-    /**
-     * The auto-generation strategy.
-     */
-    DynamoDbAutoGenerateStrategy value();
-
-    /**
-     * Default generator.
-     */
-    final class Generator<T> extends DynamoDbAutoGenerator.AbstractGenerator<T> {
-        private final DynamoDbTypeConverter<T, UUID> converter;
-
-        Generator(Class<T> targetType, DynamoDbGeneratedUuid annotation) {
-            super(annotation.value());
-            this.converter = StandardTypeConverters.factory().getConverter(targetType, UUID.class);
-        }
-
-        @Override
-        public T generate(final T currentValue) {
-            return converter.convert(UUID.randomUUID());
-        }
-    }
-
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbHashKey.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbHashKey.java
deleted file mode 100644
index fcb5473b6684..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbHashKey.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Annotation for marking a property as the hash key for a modeled class.
- * Applied to the getter method or the class field for a hash key property. If
- * the annotation is applied directly to the class field, the corresponding
- * getter and setter must be declared in the same class.
- * <p>
- * This annotation is required.
- */
-@DynamoDb
-@DynamoDbKeyed(software.amazon.awssdk.services.dynamodb.model.KeyType.HASH)
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.FIELD, ElementType.METHOD})
-public @interface DynamoDbHashKey {
-
-    /**
-     * Optional parameter when the name of the attribute as stored in DynamoDB
-     * should differ from the name used by the getter / setter.
-     */
-    String attributeName() default "";
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbIgnore.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbIgnore.java
deleted file mode 100644
index 3768eafb0645..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbIgnore.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Annotation for marking a class property as non-modeled. Applied to the getter
- * method or the class field for a non-modeled property. If the annotation is
- * applied directly to the class field, the corresponding getter and setter must
- * be declared in the same class.
- * <p>
- * All getter methods not marked with this annotation are assumed to be modeled
- * properties and included in any save() requests.
- */
-@DynamoDb
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.FIELD, ElementType.METHOD})
-public @interface DynamoDbIgnore {
-
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbIndexHashKey.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbIndexHashKey.java
deleted file mode 100644
index 820dabe58360..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbIndexHashKey.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Annotation for marking a property in a class as the attribute to be used as
- * the hash key for one or more global secondary indexes on a DynamoDB table.
- * Applied to the getter method or the class field for the index hash key
- * property. If the annotation is applied directly to the class field, the
- * corresponding getter and setter must be declared in the same class.
- * <p>
- * This annotation is required if this attribute will be used as index key for
- * item queries.
- */
-@DynamoDb
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.FIELD, ElementType.METHOD})
-public @interface DynamoDbIndexHashKey {
-
-    /**
-     * Optional parameter when the name of the attribute as stored in DynamoDB
-     * should differ from the name used by the getter / setter.
-     */
-    String attributeName() default "";
-
-    /**
-     * Parameter for the name of the global secondary index.
-     * <p>
-     * This is required if this attribute is the index key for only one global secondary
-     * index.
-     */
-    String globalSecondaryIndexName() default "";
-
-    /**
-     * Parameter for the names of the global secondary indexes.
-     * This is required if this attribute is the index key for multiple global secondary
-     * indexes.
-     */
-    String[] globalSecondaryIndexNames() default {};
-
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbIndexRangeKey.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbIndexRangeKey.java
deleted file mode 100644
index f107796dbb63..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbIndexRangeKey.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Annotation for marking a property in a class as the attribute to be used as
- * range key for one or more local secondary indexes on a DynamoDB table.
- * Applied to the getter method or the class field for the indexed range key
- * property. If the annotation is applied directly to the class field, the
- * corresponding getter and setter must be declared in the same class.
- * <p>
- * This annotation is required if this attribute will be used as index key for
- * item queries.
- */
-@DynamoDb
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.FIELD, ElementType.METHOD})
-public @interface DynamoDbIndexRangeKey {
-
-    /**
-     * Optional parameter when the name of the attribute as stored in DynamoDB
-     * should differ from the name used by the getter / setter.
-     */
-    String attributeName() default "";
-
-    /**
-     * Parameter for the name of the local secondary index.
-     * <p>
-     * This is required if this attribute is the index key for only one local secondary
-     * index.
-     */
-    String localSecondaryIndexName() default "";
-
-    /**
-     * Parameter for the names of the local secondary indexes.
-     * <p>
-     * This is required if this attribute is the index key for multiple local secondary
-     * indexes.
-     */
-    String[] localSecondaryIndexNames() default {};
-
-    /**
-     * Parameter for the name of the global secondary index.
-     * <p>
-     * This is required if this attribute is the index key for only one global secondary
-     * index.
-     */
-    String globalSecondaryIndexName() default "";
-
-    /**
-     * Parameter for the names of the global secondary indexes.
-     * <p>
-     * This is required if this attribute is the index key for multiple global secondary
-     * indexes.
-     */
-    String[] globalSecondaryIndexNames() default {};
-
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbKeyed.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbKeyed.java
deleted file mode 100644
index f22b8a490de1..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbKeyed.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-import software.amazon.awssdk.services.dynamodb.model.KeyType;
-
-/**
- * Annotation for marking a property a key for a modeled class.
- *
- * <pre class="brush: java">
- * &#064;DynamoDBKeyed(KeyType.HASH)
- * public UUID getKey()
- * </pre>
- *
- * <p>Alternately, the short-formed {@link DynamoDbHashKey}, and
- * {@link DynamoDbRangeKey} may be used directly on the field/getter.</p>
- *
- * <p>May be used as a meta-annotation.</p>
- */
-@DynamoDb
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.FIELD, ElementType.METHOD, ElementType.ANNOTATION_TYPE})
-public @interface DynamoDbKeyed {
-
-    /**
-     * The primary key type; either {@code HASH} or {@code RANGE}.
-     */
-    KeyType value();
-
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbMapper.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbMapper.java
deleted file mode 100644
index cf0ba352910e..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbMapper.java
+++ /dev/null
@@ -1,2367 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-import static java.util.stream.Collectors.toMap;
-import static software.amazon.awssdk.services.dynamodb.model.KeyType.HASH;
-import static software.amazon.awssdk.services.dynamodb.model.KeyType.RANGE;
-
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedHashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;
-import software.amazon.awssdk.awscore.AwsRequest;
-import software.amazon.awssdk.awscore.AwsRequestOverrideConfiguration;
-import software.amazon.awssdk.core.exception.SdkClientException;
-import software.amazon.awssdk.core.exception.SdkServiceException;
-import software.amazon.awssdk.core.retry.RetryUtils;
-import software.amazon.awssdk.core.util.SdkAutoConstructMap;
-import software.amazon.awssdk.core.util.VersionInfo;
-import software.amazon.awssdk.regions.Region;
-import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMapperConfig.BatchLoadRetryStrategy;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMapperConfig.BatchWriteRetryStrategy;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMapperConfig.ConsistentRead;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMapperConfig.SaveBehavior;
-import software.amazon.awssdk.services.dynamodb.model.AttributeAction;
-import software.amazon.awssdk.services.dynamodb.model.AttributeDefinition;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValueUpdate;
-import software.amazon.awssdk.services.dynamodb.model.BatchGetItemRequest;
-import software.amazon.awssdk.services.dynamodb.model.BatchGetItemResponse;
-import software.amazon.awssdk.services.dynamodb.model.BatchWriteItemRequest;
-import software.amazon.awssdk.services.dynamodb.model.BatchWriteItemResponse;
-import software.amazon.awssdk.services.dynamodb.model.Condition;
-import software.amazon.awssdk.services.dynamodb.model.ConditionalCheckFailedException;
-import software.amazon.awssdk.services.dynamodb.model.ConditionalOperator;
-import software.amazon.awssdk.services.dynamodb.model.CreateTableRequest;
-import software.amazon.awssdk.services.dynamodb.model.DeleteItemRequest;
-import software.amazon.awssdk.services.dynamodb.model.DeleteRequest;
-import software.amazon.awssdk.services.dynamodb.model.DeleteTableRequest;
-import software.amazon.awssdk.services.dynamodb.model.ExpectedAttributeValue;
-import software.amazon.awssdk.services.dynamodb.model.GetItemRequest;
-import software.amazon.awssdk.services.dynamodb.model.GetItemResponse;
-import software.amazon.awssdk.services.dynamodb.model.KeySchemaElement;
-import software.amazon.awssdk.services.dynamodb.model.KeysAndAttributes;
-import software.amazon.awssdk.services.dynamodb.model.PutItemRequest;
-import software.amazon.awssdk.services.dynamodb.model.PutItemResponse;
-import software.amazon.awssdk.services.dynamodb.model.PutRequest;
-import software.amazon.awssdk.services.dynamodb.model.QueryRequest;
-import software.amazon.awssdk.services.dynamodb.model.QueryResponse;
-import software.amazon.awssdk.services.dynamodb.model.ReturnValue;
-import software.amazon.awssdk.services.dynamodb.model.ScalarAttributeType;
-import software.amazon.awssdk.services.dynamodb.model.ScanRequest;
-import software.amazon.awssdk.services.dynamodb.model.ScanResponse;
-import software.amazon.awssdk.services.dynamodb.model.Select;
-import software.amazon.awssdk.services.dynamodb.model.UpdateItemRequest;
-import software.amazon.awssdk.services.dynamodb.model.UpdateItemResponse;
-import software.amazon.awssdk.services.dynamodb.model.WriteRequest;
-
-/**
- * Object mapper for domain-object interaction with DynamoDB.
- * <p>
- * To use, define a domain class that represents an item in a DynamoDB table and
- * annotate it with the annotations found in the
- * software.amazon.awssdk.services.dynamodbv2.datamodeling package. In order to allow the
- * mapper to correctly persist the data, each modeled property in the domain
- * class should be accessible via getter and setter methods, and each property
- * annotation should be either applied to the getter method or the class field.
- * A minimal example using getter annotations:
- *
- * <pre class="brush: java">
- * &#064;DynamoDBTable(tableName = &quot;TestTable&quot;)
- * public class TestClass {
- *
- *     private Long key;
- *     private double rangeKey;
- *     private Long version;
- *
- *     private Set&lt;Integer&gt; integerSetAttribute;
- *
- *     &#064;DynamoDBHashKey
- *     public Long getKey() {
- *         return key;
- *     }
- *
- *     public void setKey(Long key) {
- *         this.key = key;
- *     }
- *
- *     &#064;DynamoDBRangeKey
- *     public double getRangeKey() {
- *         return rangeKey;
- *     }
- *
- *     public void setRangeKey(double rangeKey) {
- *         this.rangeKey = rangeKey;
- *     }
- *
- *     &#064;DynamoDBAttribute(attributeName = &quot;integerSetAttribute&quot;)
- *     public Set&lt;Integer&gt; getIntegerAttribute() {
- *         return integerSetAttribute;
- *     }
- *
- *     public void setIntegerAttribute(Set&lt;Integer&gt; integerAttribute) {
- *         this.integerSetAttribute = integerAttribute;
- *     }
- *
- *     &#064;DynamoDBVersionAttribute
- *     public Long getVersion() {
- *         return version;
- *     }
- *
- *     public void setVersion(Long version) {
- *         this.version = version;
- *     }
- * }
- * </pre>
- * <p>
- * Save instances of annotated classes to DynamoDB, retrieve them, and delete
- * them using the {@link DynamoDbMapper} class, as in the following example.
- *
- * <pre class="brush: java">
- * DynamoDBMapper mapper = new DynamoDBMapper(dynamoDBClient);
- * Long hashKey = 105L;
- * double rangeKey = 1.0d;
- * TestClass obj = mapper.load(TestClass.class, hashKey, rangeKey);
- * obj.getIntegerAttribute().add(42);
- * mapper.save(obj);
- * mapper.delete(obj);
- * </pre>
- * <p>
- * If you don't have your DynamoDB table set up yet, you can use
- * {@link DynamoDbMapper#generateCreateTableRequest(Class)} to construct the
- * {@link CreateTableRequest} for the table represented by your annotated class.
- *
- * <pre class="brush: java">
- * DynamoDbClient dynamoDBClient = new AmazonDynamoDbClient();
- * DynamoDBMapper mapper = new DynamoDBMapper(dynamoDBClient);
- * CreateTableRequest req = mapper.generateCreateTableRequest(TestClass.class);
- * // Table provision throughput is still required since it cannot be specified in your POJO
- * req.setProvisionedThroughput(new ProvisionedThroughput(5L, 5L));
- * // Fire off the CreateTableRequest using the low-level client
- * dynamoDBClient.createTable(req);
- * </pre>
- * <p>
- * When using the save, load, and delete methods, {@link DynamoDbMapper} will
- * throw {@link DynamoDbMappingException}s to indicate that domain classes are
- * incorrectly annotated or otherwise incompatible with this class. Service
- * exceptions will always be propagated as {@link SdkClientException}, and
- * DynamoDB-specific subclasses such as {@link ConditionalCheckFailedException}
- * will be used when possible.
- * <p>
- * This class is thread-safe and can be shared between threads. It's also very
- * lightweight, so it doesn't need to be.
- *
- * @see DynamoDbTable
- * @see DynamoDbHashKey
- * @see DynamoDbRangeKey
- * @see DynamoDbAutoGeneratedKey
- * @see DynamoDbAttribute
- * @see DynamoDbVersionAttribute
- * @see DynamoDbIgnore
- * @see DynamoDbMarshalling
- * @see DynamoDbMapperConfig
- */
-public class DynamoDbMapper extends AbstractDynamoDbMapper {
-
-    /**
-     * The max back off time for batch get. The configuration for batch write
-     * has been moved to DynamoDBMapperConfig
-     */
-    protected static final long MAX_BACKOFF_IN_MILLISECONDS = 1000 * 3L;
-    /** The max number of items allowed in a BatchWrite request. */
-    protected static final int MAX_ITEMS_PER_BATCH = 25;
-    /**
-     * This retry count is applicable only when every batch get item request
-     * results in no data retrieved from server and the un processed keys is
-     * same as request items
-     */
-    protected static final int BATCH_GET_MAX_RETRY_COUNT_ALL_KEYS = 5;
-    /**
-     * User agent for requests made using the {@link DynamoDbMapper}.
-     */
-    private static final String USER_AGENT_NAME =
-        DynamoDbMapper.class.getName();
-    private static final String USER_AGENT_BATCH_OPERATION_NAME =
-            DynamoDbMapper.class.getName() + "_batch_operation";
-    private static final Logger log = LoggerFactory.getLogger(DynamoDbMapper.class);
-    private final DynamoDbClient db;
-    private final DynamoDbMapperModelFactory models;
-    private final S3Link.Factory s3Links;
-    private final AttributeTransformer transformer;
-
-    /**
-     * Constructs a new mapper with the service object given, using the default
-     * configuration.
-     *
-     * @param dynamoDb
-     *            The service object to use for all service calls.
-     * @see DynamoDbMapperConfig#DEFAULT
-     */
-    public DynamoDbMapper(final DynamoDbClient dynamoDb) {
-        this(dynamoDb, DynamoDbMapperConfig.DEFAULT, null, null);
-    }
-
-
-    /**
-     * Constructs a new mapper with the service object and configuration given.
-     *
-     * @param dynamoDb
-     *            The service object to use for all service calls.
-     * @param config
-     *            The default configuration to use for all service calls. It can
-     *            be overridden on a per-operation basis.
-     */
-    public DynamoDbMapper(
-            final DynamoDbClient dynamoDb,
-            final DynamoDbMapperConfig config) {
-
-        this(dynamoDb, config, null, null);
-    }
-
-    /**
-     * Constructs a new mapper with the service object and S3 client cache
-     * given, using the default configuration.
-     *
-     * @param ddb
-     *            The service object to use for all service calls.
-     * @param s3CredentialProvider
-     *            The credentials provider for accessing S3.
-     *            Relevant only if {@link S3Link} is involved.
-     * @see DynamoDbMapperConfig#DEFAULT
-     */
-    public DynamoDbMapper(
-            final DynamoDbClient ddb,
-            final AwsCredentialsProvider s3CredentialProvider) {
-
-        this(ddb, DynamoDbMapperConfig.DEFAULT, s3CredentialProvider);
-    }
-
-    /**
-     * Constructs a new mapper with the given service object, configuration,
-     * and transform hook.
-     *
-     * @param dynamoDb
-     *            the service object to use for all service calls
-     * @param config
-     *            the default configuration to use for all service calls. It
-     *            can be overridden on a per-operation basis
-     * @param transformer
-     *            The custom attribute transformer to invoke when serializing or
-     *            deserializing an object.
-     */
-    public DynamoDbMapper(
-            final DynamoDbClient dynamoDb,
-            final DynamoDbMapperConfig config,
-            final AttributeTransformer transformer) {
-
-        this(dynamoDb, config, transformer, null);
-    }
-
-    /**
-     * Constructs a new mapper with the service object, configuration, and S3
-     * client cache given.
-     *
-     * @param dynamoDb
-     *            The service object to use for all service calls.
-     * @param config
-     *            The default configuration to use for all service calls. It can
-     *            be overridden on a per-operation basis.
-     * @param s3CredentialProvider
-     *            The credentials provider for accessing S3.
-     *            Relevant only if {@link S3Link} is involved.
-     */
-    public DynamoDbMapper(
-            final DynamoDbClient dynamoDb,
-            final DynamoDbMapperConfig config,
-            final AwsCredentialsProvider s3CredentialProvider) {
-
-        this(dynamoDb, config, null, validate(s3CredentialProvider));
-    }
-
-    /**
-     * Constructor with all parameters.
-     *
-     * @param dynamoDb
-     *            The service object to use for all service calls.
-     * @param config
-     *            The default configuration to use for all service calls. It can
-     *            be overridden on a per-operation basis.
-     * @param transformer
-     *            The custom attribute transformer to invoke when serializing or
-     *            deserializing an object.
-     * @param s3CredentialsProvider
-     *            The credentials provider for accessing S3.
-     *            Relevant only if {@link S3Link} is involved.
-     */
-    public DynamoDbMapper(
-            final DynamoDbClient dynamoDb,
-            final DynamoDbMapperConfig config,
-            final AttributeTransformer transformer,
-            final AwsCredentialsProvider s3CredentialsProvider) {
-        super(config);
-
-        failFastOnIncompatibleSubclass(getClass());
-
-        this.db = dynamoDb;
-        this.transformer = transformer;
-
-        this.s3Links = S3Link.Factory.of(s3CredentialsProvider);
-
-        this.models = StandardModelFactories.of(this.s3Links);
-    }
-
-    /**
-     * Fail fast when trying to create a subclass of the DynamoDBMapper that
-     * attempts to override one of the old {@code transformAttributes} methods.
-     */
-    private static void failFastOnIncompatibleSubclass(Class<?> clazz) {
-        while (clazz != DynamoDbMapper.class) {
-            Class<?>[] classOverride = new Class<?>[] {
-                Class.class,
-                Map.class
-            };
-            Class<?>[] nameOverride = new Class<?>[] {
-                String.class,
-                String.class,
-                Map.class
-            };
-
-            for (Method method : clazz.getDeclaredMethods()) {
-                if (method.getName().equals("transformAttributes")) {
-                    Class<?>[] params = method.getParameterTypes();
-                    if (Arrays.equals(params, classOverride)
-                        || Arrays.equals(params, nameOverride)) {
-
-                        throw new IllegalStateException(
-                                "The deprecated transformAttributes method is "
-                                + "no longer supported as of 1.9.0. Use an "
-                                + "AttributeTransformer to inject custom "
-                                + "attribute transformation logic.");
-                    }
-                }
-            }
-
-            clazz = clazz.getSuperclass();
-        }
-    }
-
-    /**
-     * Throws an exception if the given credentials provider is {@code null}.
-     */
-    private static AwsCredentialsProvider validate(
-            final AwsCredentialsProvider provider) {
-        if (provider == null) {
-            throw new IllegalArgumentException(
-                    "s3 credentials provider must not be null");
-        }
-        return provider;
-    }
-
-    private static <K, V> boolean isNullOrEmpty(Map<K, V> map) {
-        return map == null || map.isEmpty();
-    }
-
-    /**
-     * Determnes if any of the primary keys require auto-generation.
-     */
-    private static <T> boolean anyKeyGeneratable(
-            final DynamoDbMapperTableModel<T> model,
-            final T object,
-            final SaveBehavior saveBehavior) {
-        for (final DynamoDbMapperFieldModel<T, Object> field : model.keys()) {
-            if (canGenerate(model, object, saveBehavior, field)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Determines if the mapping value can be auto-generated.
-     */
-    private static <T> boolean canGenerate(
-            final DynamoDbMapperTableModel<T> model,
-            final T object,
-            final SaveBehavior saveBehavior,
-            final DynamoDbMapperFieldModel<T, Object> field) {
-        if (field.getGenerateStrategy() == null) {
-            return false;
-        } else if (field.getGenerateStrategy() == DynamoDbAutoGenerateStrategy.ALWAYS) {
-            return true;
-        } else if (field.get(object) != null) {
-            return false;
-        } else if (field.keyType() != null || field.indexed()) {
-            return true;
-        } else if (saveBehavior == SaveBehavior.CLOBBER) {
-            return true;
-        } else if (saveBehavior == SaveBehavior.UPDATE) {
-            return true;
-        } else if (anyKeyGeneratable(model, object, saveBehavior)) {
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Utility method for checking the validity of both hash and range key
-     * conditions. It also tries to infer the correct index name from the POJO
-     * annotation, if such information is not directly specified by the user.
-     *
-     * @param clazz
-     *            The domain class of the queried items.
-     * @param queryRequest
-     *            The QueryRequest object to be sent to service.
-     * @param hashKeyConditions
-     *            All the hash key EQ conditions extracted from the POJO object.
-     *            The mapper will choose one of them that could be applied together with
-     *            the user-specified (if any) index name and range key conditions. Or it
-     *            throws error if more than one conditions are applicable for the query.
-     * @param rangeKeyConditions
-     *            The range conditions specified by the user. We currently only
-     *            allow at most one range key condition.
-     */
-    private static <T> QueryRequest processKeyConditions(
-            QueryRequest queryRequest,
-            final DynamoDbQueryExpression<T> expression,
-            final DynamoDbMapperTableModel<T> model) {
-        // Hash key (primary or index) condition
-        final Map<String, Condition> hashKeyConditions = new LinkedHashMap<String, Condition>();
-        if (expression.getHashKeyValues() != null) {
-            for (final DynamoDbMapperFieldModel<T, Object> field : model.fields()) {
-                if (field.keyType() == HASH || !field.globalSecondaryIndexNames(HASH).isEmpty()) {
-                    final Object value = field.get(expression.getHashKeyValues());
-                    if (value != null) {
-                        hashKeyConditions.put(field.name(), field.eq(value));
-                    }
-                }
-            }
-        }
-
-        // Range key (primary or index) conditions
-        final Map<String, Condition> rangeKeyConditions = expression.getRangeKeyConditions();
-
-        // There should be least one hash key condition.
-        final String keyCondExpression = queryRequest.keyConditionExpression();
-        if (keyCondExpression == null) {
-            if (isNullOrEmpty(hashKeyConditions)) {
-                throw new IllegalArgumentException("Illegal query expression: No hash key condition is found in the query");
-            }
-        } else {
-            if (!isNullOrEmpty(hashKeyConditions)) {
-                throw new IllegalArgumentException("Illegal query expression: Either the hash key conditions or the key " +
-                                                   "condition expression must be specified but not both.");
-            }
-            if (!isNullOrEmpty(rangeKeyConditions)) {
-                throw new IllegalArgumentException("Illegal query expression: The range key conditions can only be specified " +
-                                                   "when the key condition expression is not specified.");
-            }
-            // key condition expression is in use
-            return queryRequest;
-        }
-        // We don't allow multiple range key conditions.
-        if (rangeKeyConditions != null && rangeKeyConditions.size() > 1) {
-            throw new IllegalArgumentException(
-                    "Illegal query expression: Conditions on multiple range keys ("
-                    + rangeKeyConditions.keySet().toString()
-                    + ") are found in the query. DynamoDB service only accepts up to ONE range key condition.");
-        }
-        final boolean hasRangeKeyCondition = (rangeKeyConditions != null)
-                                             && (!rangeKeyConditions.isEmpty());
-        final String userProvidedIndexName = queryRequest.indexName();
-        final String primaryHashKeyName = model.hashKey().name();
-
-        // First collect the names of all the global/local secondary indexes that could be applied to this query.
-        // If the user explicitly specified an index name, we also need to
-        //   1) check the index is applicable for both hash and range key conditions
-        //   2) choose one hash key condition if there are more than one of them
-        boolean hasPrimaryHashKeyCondition = false;
-        final Map<String, Set<String>> annotatedGsisOnHashKeys = new HashMap<String, Set<String>>();
-        String hashKeyNameForThisQuery = null;
-
-        boolean hasPrimaryRangeKeyCondition = false;
-        final Set<String> annotatedLsisOnRangeKey = new HashSet<String>();
-        final Set<String> annotatedGsisOnRangeKey = new HashSet<String>();
-
-        // Range key condition
-        String rangeKeyNameForThisQuery = null;
-        if (hasRangeKeyCondition) {
-            for (String rangeKeyName : rangeKeyConditions.keySet()) {
-                rangeKeyNameForThisQuery = rangeKeyName;
-
-                final DynamoDbMapperFieldModel<T, Object> rk = model.field(rangeKeyName);
-
-                if (rk.keyType() == RANGE) {
-                    hasPrimaryRangeKeyCondition = true;
-                }
-
-                annotatedLsisOnRangeKey.addAll(rk.localSecondaryIndexNames());
-                annotatedGsisOnRangeKey.addAll(rk.globalSecondaryIndexNames(RANGE));
-            }
-
-            if (!hasPrimaryRangeKeyCondition
-                && annotatedLsisOnRangeKey.isEmpty()
-                && annotatedGsisOnRangeKey.isEmpty()) {
-                throw new DynamoDbMappingException(
-                        "The query contains a condition on a range key (" +
-                        rangeKeyNameForThisQuery + ") " +
-                        "that is not annotated with either @DynamoDBRangeKey or @DynamoDBIndexRangeKey.");
-            }
-        }
-
-        final boolean userProvidedLsiWithRangeKeyCondition = (userProvidedIndexName != null)
-                                                             && (annotatedLsisOnRangeKey.contains(userProvidedIndexName));
-        final boolean hashOnlyLsiQuery = (userProvidedIndexName != null)
-                                         && (!hasRangeKeyCondition)
-                                         && model.localSecondaryIndex(userProvidedIndexName) != null;
-        final boolean userProvidedLsi = userProvidedLsiWithRangeKeyCondition || hashOnlyLsiQuery;
-
-        final boolean userProvidedGsiWithRangeKeyCondition = (userProvidedIndexName != null)
-                                                             && (annotatedGsisOnRangeKey.contains(userProvidedIndexName));
-        final boolean hashOnlyGsiQuery = (userProvidedIndexName != null)
-                                         && (!hasRangeKeyCondition)
-                                         && model.globalSecondaryIndex(userProvidedIndexName) != null;
-        final boolean userProvidedGsi = userProvidedGsiWithRangeKeyCondition || hashOnlyGsiQuery;
-
-        if (userProvidedLsi && userProvidedGsi) {
-            throw new DynamoDbMappingException(
-                    "Invalid query: " +
-                    "Index \"" + userProvidedIndexName + "\" " +
-                    "is annotateded as both a LSI and a GSI for attribute.");
-        }
-
-        // Hash key conditions
-        for (String hashKeyName : hashKeyConditions.keySet()) {
-            if (hashKeyName.equals(primaryHashKeyName)) {
-                hasPrimaryHashKeyCondition = true;
-            }
-
-            final DynamoDbMapperFieldModel<T, Object> hk = model.field(hashKeyName);
-
-            Collection<String> annotatedGsiNames = hk.globalSecondaryIndexNames(HASH);
-            annotatedGsisOnHashKeys.put(hashKeyName,
-                                        annotatedGsiNames == null ? new HashSet<>() : new HashSet<>(annotatedGsiNames));
-
-            // Additional validation if the user provided an index name.
-            if (userProvidedIndexName != null) {
-                boolean foundHashKeyConditionValidWithUserProvidedIndex = false;
-                if (userProvidedLsi && hashKeyName.equals(primaryHashKeyName)) {
-                    // found an applicable hash key condition (primary hash + LSI range)
-                    foundHashKeyConditionValidWithUserProvidedIndex = true;
-                } else if (userProvidedGsi &&
-                           annotatedGsiNames != null && annotatedGsiNames.contains(userProvidedIndexName)) {
-                    // found an applicable hash key condition (GSI hash + range)
-                    foundHashKeyConditionValidWithUserProvidedIndex = true;
-                }
-                if (foundHashKeyConditionValidWithUserProvidedIndex) {
-                    if (hashKeyNameForThisQuery != null) {
-                        throw new IllegalArgumentException(
-                                "Ambiguous query expression: More than one hash key EQ conditions (" +
-                                hashKeyNameForThisQuery + ", " + hashKeyName +
-                                ") are applicable to the specified index ("
-                                + userProvidedIndexName + "). " +
-                                "Please provide only one of them in the query expression.");
-                    } else {
-                        // found an applicable hash key condition
-                        hashKeyNameForThisQuery = hashKeyName;
-                    }
-                }
-            }
-        }
-
-        // Collate all the key conditions
-        Map<String, Condition> keyConditions = new HashMap<String, Condition>();
-
-        // With user-provided index name
-        if (userProvidedIndexName != null) {
-            if (hasRangeKeyCondition
-                && (!userProvidedLsi)
-                && (!userProvidedGsi)) {
-                throw new IllegalArgumentException(
-                        "Illegal query expression: No range key condition is applicable to the specified index ("
-                        + userProvidedIndexName + "). ");
-            }
-            if (hashKeyNameForThisQuery == null) {
-                throw new IllegalArgumentException(
-                        "Illegal query expression: No hash key condition is applicable to the specified index ("
-                        + userProvidedIndexName + "). ");
-            }
-
-            keyConditions.put(hashKeyNameForThisQuery, hashKeyConditions.get(hashKeyNameForThisQuery));
-            if (hasRangeKeyCondition) {
-                keyConditions.putAll(rangeKeyConditions);
-            }
-        } else {
-            // Infer the index name by finding the index shared by both hash and range key annotations.
-            if (hasRangeKeyCondition) {
-                String inferredIndexName = null;
-                hashKeyNameForThisQuery = null;
-                if (hasPrimaryHashKeyCondition && hasPrimaryRangeKeyCondition) {
-                    // Found valid query: primary hash + range key conditions
-                    hashKeyNameForThisQuery = primaryHashKeyName;
-                } else {
-                    // Intersect the set of all the indexes applicable to the range key
-                    // with the set of indexes applicable to each hash key condition.
-                    for (Map.Entry<String, Set<String>> indexedHashKeys : annotatedGsisOnHashKeys.entrySet()) {
-                        String hashKeyName = indexedHashKeys.getKey();
-                        Set<String> annotatedGsisOnHashKey = indexedHashKeys.getValue();
-
-                        boolean foundValidQueryExpressionWithInferredIndex = false;
-                        String indexNameInferredByThisHashKey = null;
-                        if (hashKeyName.equals(primaryHashKeyName)) {
-                            if (annotatedLsisOnRangeKey.size() == 1) {
-                                // Found valid query (Primary hash + LSI range conditions)
-                                foundValidQueryExpressionWithInferredIndex = true;
-                                indexNameInferredByThisHashKey = annotatedLsisOnRangeKey.iterator().next();
-                            }
-                        }
-
-                        // We don't need the data in annotatedGSIsOnHashKeys afterwards,
-                        // so it's safe to do the intersection in-place.
-                        annotatedGsisOnHashKey.retainAll(annotatedGsisOnRangeKey);
-                        if (annotatedGsisOnHashKey.size() == 1) {
-                            // Found valid query (Hash + range conditions on a GSI)
-                            if (foundValidQueryExpressionWithInferredIndex) {
-                                hashKeyNameForThisQuery = hashKeyName;
-                                inferredIndexName = indexNameInferredByThisHashKey;
-                            }
-
-                            foundValidQueryExpressionWithInferredIndex = true;
-                            indexNameInferredByThisHashKey = annotatedGsisOnHashKey.iterator().next();
-                        }
-
-                        if (foundValidQueryExpressionWithInferredIndex) {
-                            if (hashKeyNameForThisQuery != null) {
-                                throw new IllegalArgumentException(
-                                        "Ambiguous query expression: Found multiple valid queries: " +
-                                        "(Hash: \"" + hashKeyNameForThisQuery + "\", Range: \"" + rangeKeyNameForThisQuery +
-                                        "\", Index: \"" + inferredIndexName + "\") and " +
-                                        "(Hash: \"" + hashKeyName + "\", Range: \"" + rangeKeyNameForThisQuery +
-                                        "\", Index: \"" + indexNameInferredByThisHashKey + "\").");
-                            } else {
-                                hashKeyNameForThisQuery = hashKeyName;
-                                inferredIndexName = indexNameInferredByThisHashKey;
-                            }
-                        }
-                    }
-                }
-
-                if (hashKeyNameForThisQuery != null) {
-                    keyConditions.put(hashKeyNameForThisQuery, hashKeyConditions.get(hashKeyNameForThisQuery));
-                    keyConditions.putAll(rangeKeyConditions);
-                    queryRequest = queryRequest.toBuilder().indexName(inferredIndexName).build();
-                } else {
-                    throw new IllegalArgumentException(
-                            "Illegal query expression: Cannot infer the index name from the query expression.");
-                }
-
-            } else {
-                // No range key condition is specified.
-                if (hashKeyConditions.size() > 1) {
-                    if (hasPrimaryHashKeyCondition) {
-                        keyConditions.put(primaryHashKeyName, hashKeyConditions.get(primaryHashKeyName));
-                    } else {
-                        throw new IllegalArgumentException(
-                                "Ambiguous query expression: More than one index hash key EQ conditions (" +
-                                hashKeyConditions.keySet() + ") are applicable to the query. Please provide only one of them " +
-                                "in the query expression, or specify the appropriate index name.");
-                    }
-
-                } else {
-                    // Only one hash key condition
-                    Entry<String, Set<String>> entry = annotatedGsisOnHashKeys.entrySet().iterator().next();
-                    String hashKeyName = entry.getKey();
-                    Set<String> annotatedGsisOnHashkey = entry.getValue();
-                    if (!hasPrimaryHashKeyCondition) {
-                        if (annotatedGsisOnHashkey.size() == 1) {
-                            // Set the index if the index hash key is only annotated with one GSI.
-                            queryRequest = queryRequest.toBuilder().indexName(annotatedGsisOnHashkey.iterator().next()).build();
-                        } else if (annotatedGsisOnHashkey.size() > 1) {
-                            throw new IllegalArgumentException(
-                                    "Ambiguous query expression: More than one GSIs (" +
-                                    annotatedGsisOnHashkey +
-                                    ") are applicable to the query. " +
-                                    "Please specify one of them in your query expression.");
-                        } else {
-                            throw new IllegalArgumentException(
-                                    "Illegal query expression: No GSI is found in the @DynamoDBIndexHashKey annotation for " +
-                                    "attribute \"" + hashKeyName + "\".");
-                        }
-                    }
-                    keyConditions.putAll(hashKeyConditions);
-                }
-
-            }
-        }
-
-        return queryRequest.toBuilder().keyConditions(keyConditions).build();
-    }
-
-    /**
-     * Returns a new map object that merges the two sets of expected value
-     * conditions (user-specified or imposed by the internal implementation of
-     * DynamoDBMapper). Internal assertion on an attribute will be overridden by
-     * any user-specified condition on the same attribute.
-     * <p>
-     * Exception is thrown if the two sets of conditions cannot be combined
-     * together.
-     */
-    private static Map<String, ExpectedAttributeValue> mergeExpectedAttributeValueConditions(
-            Map<String, ExpectedAttributeValue> internalAssertions,
-            Map<String, ExpectedAttributeValue> userProvidedConditions,
-            String userProvidedConditionOperator) {
-        // If any of the condition map is null, simply return a copy of the other one.
-        if ((internalAssertions == null || internalAssertions.isEmpty())
-            && (userProvidedConditions == null || userProvidedConditions.isEmpty())) {
-            return null;
-        } else if (internalAssertions == null) {
-            return new HashMap<>(userProvidedConditions);
-        } else if (userProvidedConditions == null) {
-            return new HashMap<>(internalAssertions);
-        }
-
-        // Start from a copy of the internal conditions
-        Map<String, ExpectedAttributeValue> mergedExpectedValues =
-                new HashMap<String, ExpectedAttributeValue>(internalAssertions);
-
-        // Remove internal conditions that are going to be overlaid by user-provided ones.
-        for (String attrName : userProvidedConditions.keySet()) {
-            mergedExpectedValues.remove(attrName);
-        }
-
-        // All the generated internal conditions must be joined by AND.
-        // Throw an exception if the user specifies an OR operator, and that the
-        // internal conditions are not totally overlaid by the user-provided
-        // ones.
-        if (ConditionalOperator.OR.toString().equals(userProvidedConditionOperator)
-            && !mergedExpectedValues.isEmpty()) {
-            throw new IllegalArgumentException("Unable to assert the value of the fields " + mergedExpectedValues.keySet() +
-                                               ", since the expected value conditions cannot be combined with user-specified " +
-                                               "conditions joined by \"OR\". You can use SaveBehavior.CLOBBER to " +
-                                               "skip the assertion on these fields.");
-        }
-
-        mergedExpectedValues.putAll(userProvidedConditions);
-
-        return mergedExpectedValues;
-    }
-
-    static <X extends AwsRequest> X applyUserAgent(X request) {
-        final AwsRequestOverrideConfiguration newCfg = request.overrideConfiguration()
-                                                              .map(c -> c.toBuilder())
-                                                              .orElse(AwsRequestOverrideConfiguration.builder())
-                                                              .addApiName(apiName -> apiName.name(USER_AGENT_NAME).version(VersionInfo.SDK_VERSION))
-                                                              .build();
-
-        return (X) request.toBuilder()
-                .overrideConfiguration(newCfg)
-                .build();
-    }
-
-    static <X extends AwsRequest> X applyBatchOperationUserAgent(X request) {
-        final AwsRequestOverrideConfiguration newCfg = request.overrideConfiguration()
-                                                              .map(c -> c.toBuilder())
-                                                              .orElse(AwsRequestOverrideConfiguration.builder())
-                                                              .addApiName(apiName -> apiName.name(USER_AGENT_BATCH_OPERATION_NAME).version(VersionInfo.SDK_VERSION))
-                                                              .build();
-
-        return (X) request.toBuilder()
-                .overrideConfiguration(newCfg)
-                .build();
-    }
-
-    /**
-     * Batch pause.
-     */
-    private static void pause(long delay) {
-        if (delay <= 0) {
-            return;
-        }
-        try {
-            Thread.sleep(delay);
-        } catch (InterruptedException e) {
-            Thread.currentThread().interrupt();
-            throw SdkClientException.builder().message(e.getMessage()).cause(e).build();
-        }
-    }
-
-    @Override
-    public <T extends Object> DynamoDbMapperTableModel<T> getTableModel(Class<T> clazz, DynamoDbMapperConfig config) {
-        return this.models.getTableFactory(config).getTable(clazz);
-    }
-
-    @Override
-    public <T extends Object> T load(T keyObject, DynamoDbMapperConfig config) {
-        @SuppressWarnings("unchecked")
-        Class<T> clazz = (Class<T>) keyObject.getClass();
-
-        config = mergeConfig(config);
-        final DynamoDbMapperTableModel<T> model = getTableModel(clazz, config);
-
-        String tableName = getTableName(clazz, keyObject, config);
-
-        GetItemRequest.Builder rqBuilder = GetItemRequest.builder();
-
-        Map<String, AttributeValue> key = model.convertKey(keyObject);
-
-        rqBuilder.key(key);
-        rqBuilder.tableName(tableName);
-        rqBuilder.consistentRead(config.getConsistentRead() == ConsistentRead.CONSISTENT);
-
-        GetItemRequest rq = rqBuilder.build();
-
-        GetItemResponse item = db.getItem(applyUserAgent(rq));
-        Map<String, AttributeValue> itemAttributes = item.item();
-        if (itemAttributes == null) {
-            return null;
-        }
-
-        T object = privateMarshallIntoObject(
-                toParameters(itemAttributes, clazz, tableName, config));
-
-        return object;
-    }
-
-    @Override
-    public <T extends Object> T load(Class<T> clazz, Object hashKey, Object rangeKey, DynamoDbMapperConfig config) {
-        config = mergeConfig(config);
-        final DynamoDbMapperTableModel<T> model = getTableModel(clazz, config);
-        T keyObject = model.createKey(hashKey, rangeKey);
-        return load(keyObject, config);
-    }
-
-    @Override
-    public <T> T marshallIntoObject(Class<T> clazz, Map<String, AttributeValue> itemAttributes, DynamoDbMapperConfig config) {
-        config = mergeConfig(config);
-
-        String tableName = getTableName(clazz, config);
-
-        return privateMarshallIntoObject(
-                toParameters(itemAttributes, clazz, tableName, config));
-    }
-
-    /**
-     * The one true implementation of marshallIntoObject.
-     */
-    private <T> T privateMarshallIntoObject(
-            AttributeTransformer.Parameters<T> parameters) {
-
-        Class<T> clazz = parameters.modelClass();
-        Map<String, AttributeValue> values = untransformAttributes(parameters);
-
-        final DynamoDbMapperTableModel<T> model = getTableModel(clazz, parameters.mapperConfig());
-        return model.unconvert(values);
-    }
-
-    @Override
-    public <T> List<T> marshallIntoObjects(Class<T> clazz, List<Map<String, AttributeValue>> itemAttributes,
-                                           DynamoDbMapperConfig config) {
-        // If config is used in the future, be sure to mergeConfig.
-        // config = mergeConfig(config);
-
-        List<T> result = new ArrayList<T>(itemAttributes.size());
-        for (Map<String, AttributeValue> item : itemAttributes) {
-            result.add(marshallIntoObject(clazz, item));
-        }
-        return result;
-    }
-
-    /**
-     * A replacement for {@link #marshallIntoObjects(Class, List)} that takes
-     * an extra set of parameters to be tunneled through to
-     * {@code privateMarshalIntoObject} (if nothing along the way is
-     * overridden). It's package-private because some of the Paginated*List
-     * classes call back into it, but final because no one, even in this
-     * package, should ever override it.
-     */
-    final <T> List<T> marshallIntoObjects(
-            final List<AttributeTransformer.Parameters<T>> parameters) {
-        List<T> result = new ArrayList<T>(parameters.size());
-
-        for (AttributeTransformer.Parameters<T> entry : parameters) {
-            result.add(privateMarshallIntoObject(entry));
-        }
-
-        return result;
-    }
-
-    @Override
-    public <T extends Object> void save(T object,
-                                        DynamoDbSaveExpression saveExpression,
-                                        final DynamoDbMapperConfig config) {
-        final DynamoDbMapperConfig finalConfig = mergeConfig(config);
-
-        @SuppressWarnings("unchecked")
-        Class<T> clazz = (Class<T>) object.getClass();
-        String tableName = getTableName(clazz, object, finalConfig);
-
-        final DynamoDbMapperTableModel<T> model = getTableModel(clazz, finalConfig);
-
-        /*
-         * We force a putItem request instead of updateItem request either when
-         * CLOBBER is configured, or part of the primary key of the object needs
-         * to be auto-generated.
-         */
-        boolean forcePut = (finalConfig.saveBehavior() == SaveBehavior.CLOBBER)
-                           || anyKeyGeneratable(model, object, finalConfig.saveBehavior());
-
-        SaveObjectHandler saveObjectHandler;
-
-        if (forcePut) {
-            saveObjectHandler = this.new SaveObjectHandler(clazz, object,
-                                                           tableName, finalConfig, saveExpression) {
-
-                @Override
-                protected void onPrimaryKeyAttributeValue(String attributeName,
-                                                          AttributeValue keyAttributeValue) {
-                    /* Treat key values as common attribute value updates. */
-                    getAttributeValueUpdates().put(attributeName,
-                                                   AttributeValueUpdate.builder()
-                                                           .value(keyAttributeValue)
-                                                           .action("PUT").build());
-                }
-
-                /* Use default implementation of onNonKeyAttribute(...) */
-
-                @Override
-                protected void onNullNonKeyAttribute(String attributeName) {
-                    /* When doing a force put, we can safely ignore the null-valued attributes. */
-                    return;
-                }
-
-                @Override
-                protected void executeLowLevelRequest() {
-                    /* Send a putItem request. */
-                    doPutItem();
-                }
-            };
-        } else {
-            saveObjectHandler = this.new SaveObjectHandler(clazz, object,
-                                                           tableName, finalConfig, saveExpression) {
-
-                @Override
-                protected void onPrimaryKeyAttributeValue(String attributeName,
-                                                          AttributeValue keyAttributeValue) {
-                    /* Put it in the key collection which is later used in the updateItem request. */
-                    getPrimaryKeyAttributeValues().put(attributeName, keyAttributeValue);
-                }
-
-
-                @Override
-                protected void onNonKeyAttribute(String attributeName,
-                                                 AttributeValue currentValue) {
-                    /* If it's a set attribute and the mapper is configured with APPEND_SET,
-                     * we do an "ADD" update instead of the default "PUT".
-                     */
-                    if (localSaveBehavior() == SaveBehavior.APPEND_SET) {
-                        if (currentValue.bs() != null
-                            || currentValue.ns() != null
-                            || currentValue.ss() != null) {
-                            getAttributeValueUpdates().put(
-                                    attributeName,
-                                    AttributeValueUpdate.builder().value(
-                                            currentValue).action("ADD").build());
-                            return;
-                        }
-                    }
-                    /* Otherwise, we do the default "PUT" update. */
-                    super.onNonKeyAttribute(attributeName, currentValue);
-                }
-
-                @Override
-                protected void onNullNonKeyAttribute(String attributeName) {
-                    /*
-                     * If UPDATE_SKIP_NULL_ATTRIBUTES or APPEND_SET is
-                     * configured, we don't delete null value attributes.
-                     */
-                    if (localSaveBehavior() == SaveBehavior.UPDATE_SKIP_NULL_ATTRIBUTES
-                        || localSaveBehavior() == SaveBehavior.APPEND_SET) {
-                        return;
-                    } else {
-                        /* Delete attributes that are set as null in the object. */
-                        getAttributeValueUpdates()
-                                .put(attributeName,
-                                     AttributeValueUpdate.builder()
-                                             .action("DELETE")
-                                             .build());
-                    }
-                }
-
-                @Override
-                protected void executeLowLevelRequest() {
-                    UpdateItemResponse updateItemResult = doUpdateItem();
-
-                    // The UpdateItem request is specified to return ALL_NEW
-                    // attributes of the affected item. So if the returned
-                    // UpdateItemResponse does not include any ReturnedAttributes,
-                    // it indicates the UpdateItem failed silently (e.g. the
-                    // key-only-put nightmare -
-                    // https://forums.aws.amazon.com/thread.jspa?threadID=86798&tstart=25),
-                    // in which case we should re-send a PutItem
-                    // request instead.
-                    if (updateItemResult.attributes() == null
-                        || updateItemResult.attributes().isEmpty()) {
-                        // Before we proceed with PutItem, we need to put all
-                        // the key attributes (prepared for the
-                        // UpdateItemRequest) into the AttributeValueUpdates
-                        // collection.
-                        for (String keyAttributeName : getPrimaryKeyAttributeValues().keySet()) {
-                            AttributeValueUpdate value = AttributeValueUpdate.builder()
-                                    .value(getPrimaryKeyAttributeValues().get(keyAttributeName))
-                                    .action("PUT").build();
-                            getAttributeValueUpdates().put(keyAttributeName, value);
-                        }
-
-                        doPutItem();
-                    }
-                }
-            };
-        }
-
-        saveObjectHandler.execute();
-    }
-
-    @Override
-    public <T> void delete(T object, DynamoDbDeleteExpression deleteExpression, DynamoDbMapperConfig config) {
-        config = mergeConfig(config);
-
-        @SuppressWarnings("unchecked")
-        Class<T> clazz = (Class<T>) object.getClass();
-        final DynamoDbMapperTableModel<T> model = getTableModel(clazz, config);
-
-        String tableName = getTableName(clazz, object, config);
-
-        Map<String, AttributeValue> key = model.convertKey(object);
-
-        /*
-         * If there is a version field, make sure we assert its value. If the
-         * version field is null (only should happen in unusual circumstances),
-         * pretend it doesn't have a version field after all.
-         */
-        Map<String, ExpectedAttributeValue> internalAssertions = new HashMap<String, ExpectedAttributeValue>();
-        if (config.saveBehavior() != SaveBehavior.CLOBBER && model.versioned()) {
-            for (final DynamoDbMapperFieldModel<T, Object> field : model.versions()) {
-                final AttributeValue current = field.getAndConvert(object);
-                if (current == null) {
-                    internalAssertions.put(field.name(), ExpectedAttributeValue.builder().exists(false).build());
-                } else {
-                    internalAssertions.put(field.name(), ExpectedAttributeValue.builder().exists(true).value(current).build());
-                }
-                break;
-            }
-        }
-
-        DeleteItemRequest req = DeleteItemRequest.builder()
-                .key(key)
-                .tableName(tableName)
-                .expected(internalAssertions)
-                .build();
-
-        if (deleteExpression != null) {
-            String conditionalExpression = deleteExpression.getConditionExpression();
-
-            if (conditionalExpression != null) {
-                if (!internalAssertions.isEmpty()) {
-                    throw SdkClientException.builder()
-                                            .message("Condition Expressions cannot be used if a versioned attribute is present")
-                                            .build();
-                }
-
-                req = req.toBuilder()
-                        .conditionExpression(conditionalExpression)
-                        .expressionAttributeNames(
-                                deleteExpression.getExpressionAttributeNames())
-                        .expressionAttributeValues(
-                                deleteExpression.getExpressionAttributeValues())
-                        .build();
-            }
-
-            req = req.toBuilder()
-                    .expected(
-                    mergeExpectedAttributeValueConditions(internalAssertions,
-                                                          deleteExpression.getExpected(),
-                                                          deleteExpression.getConditionalOperator()))
-                     .conditionalOperator(
-                             deleteExpression.getConditionalOperator())
-                    .build();
-
-        }
-        db.deleteItem(applyUserAgent(req));
-    }
-
-    @Override
-    public List<FailedBatch> batchWrite(Iterable<? extends Object> objectsToWrite,
-                                        Iterable<? extends Object> objectsToDelete,
-                                        DynamoDbMapperConfig config) {
-        config = mergeConfig(config);
-
-        List<FailedBatch> totalFailedBatches = new LinkedList<FailedBatch>();
-
-        StringListMap<WriteRequest> requestItems = new StringListMap<WriteRequest>();
-
-        List<ValueUpdate> inMemoryUpdates = new LinkedList<ValueUpdate>();
-        for (Object toWrite : objectsToWrite) {
-            Class<Object> clazz = (Class<Object>) toWrite.getClass();
-            String tableName = getTableName(clazz, toWrite, config);
-
-            Map<String, AttributeValue> attributeValues = new HashMap<String, AttributeValue>();
-
-            // Look at every getter and construct a value object for it
-            final DynamoDbMapperTableModel<Object> model = getTableModel(clazz, config);
-            for (final DynamoDbMapperFieldModel<Object, Object> field : model.fields()) {
-                AttributeValue currentValue;
-                if (canGenerate(model, toWrite, config.saveBehavior(), field) && !field.versioned()) {
-                    currentValue = field.convert(field.generate(field.get(toWrite)));
-                    inMemoryUpdates.add(new ValueUpdate(field, currentValue, toWrite));
-                } else {
-                    currentValue = field.convert(field.get(toWrite));
-                }
-                if (currentValue != null) {
-                    attributeValues.put(field.name(), currentValue);
-                }
-            }
-
-            if (!requestItems.containsKey(tableName)) {
-                requestItems.put(tableName, new LinkedList<WriteRequest>());
-            }
-
-            AttributeTransformer.Parameters<?> parameters =
-                    toParameters(attributeValues, clazz, tableName, config);
-
-            requestItems.add(tableName,
-                    WriteRequest.builder()
-                            .putRequest(PutRequest.builder()
-                                    .item(transformAttributes(parameters))
-                                    .build())
-                            .build());
-        }
-
-        for (Object toDelete : objectsToDelete) {
-            Class<Object> clazz = (Class<Object>) toDelete.getClass();
-
-            String tableName = getTableName(clazz, toDelete, config);
-            final DynamoDbMapperTableModel<Object> model = getTableModel(clazz, config);
-
-            Map<String, AttributeValue> key = model.convertKey(toDelete);
-
-            requestItems.add(tableName, WriteRequest.builder()
-                    .deleteRequest(DeleteRequest.builder()
-                            .key(key)
-                            .build())
-                    .build());
-        }
-
-        // Break into chunks of 25 items and make service requests to DynamoDB
-        for (final StringListMap<WriteRequest> batch : requestItems.subMaps(MAX_ITEMS_PER_BATCH, true)) {
-            List<FailedBatch> failedBatches = writeOneBatch(batch, config.batchWriteRetryStrategy());
-            totalFailedBatches.addAll(failedBatches);
-
-            // If contains throttling exception, we do a backoff
-            if (containsThrottlingException(failedBatches)) {
-                pause(config.batchWriteRetryStrategy().getDelayBeforeRetryUnprocessedItems(
-                        Collections.unmodifiableMap(batch), 0));
-            }
-        }
-
-        // Once the entire batch is processed, update assigned keys in memory
-        for (ValueUpdate update : inMemoryUpdates) {
-            update.apply();
-        }
-
-        return totalFailedBatches;
-    }
-
-    /**
-     * Process one batch of requests(max 25). It will divide the batch if
-     * receives request too large exception(the total size of the request is beyond 1M).
-     */
-    private List<FailedBatch> writeOneBatch(
-            StringListMap<WriteRequest> batch,
-            BatchWriteRetryStrategy batchWriteRetryStrategy) {
-
-        List<FailedBatch> failedBatches = new LinkedList<FailedBatch>();
-        FailedBatch failedBatch = doBatchWriteItemWithRetry(batch, batchWriteRetryStrategy);
-
-        if (failedBatch != null) {
-            // If the exception is request entity too large, we divide the batch
-            // into smaller parts.
-
-            if (failedBatch.isRequestEntityTooLarge()) {
-
-                // If only one item left, the item size must beyond 64k, which
-                // exceedes the limit.
-
-                if (failedBatch.size() == 1) {
-                    failedBatches.add(failedBatch);
-                } else {
-                    for (final StringListMap<WriteRequest> subBatch : batch.subMaps(2, false)) {
-                        failedBatches.addAll(writeOneBatch(subBatch, batchWriteRetryStrategy));
-                    }
-                }
-
-            } else {
-                failedBatches.add(failedBatch);
-            }
-
-        }
-        return failedBatches;
-    }
-
-    /**
-     * Check whether there are throttling exception in the failed batches.
-     */
-    private boolean containsThrottlingException(List<FailedBatch> failedBatches) {
-        for (FailedBatch failedBatch : failedBatches) {
-            if (failedBatch.isThrottling()) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Continue trying to process the batch and retry on UnproccessedItems as
-     * according to the specified BatchWriteRetryStrategy
-     */
-    private FailedBatch doBatchWriteItemWithRetry(
-            Map<String, List<WriteRequest>> batch,
-            BatchWriteRetryStrategy batchWriteRetryStrategy) {
-
-        BatchWriteItemResponse result = null;
-        int retries = 0;
-        int maxRetries = batchWriteRetryStrategy
-                .maxRetryOnUnprocessedItems(Collections
-                                                       .unmodifiableMap(batch));
-
-        FailedBatch failedBatch = null;
-        Map<String, List<WriteRequest>> pendingItems = batch;
-
-        while (true) {
-            try {
-                result = db.batchWriteItem(applyBatchOperationUserAgent(
-                        BatchWriteItemRequest.builder().requestItems(pendingItems).build()));
-            } catch (Exception e) {
-                failedBatch = new FailedBatch();
-                failedBatch.setUnprocessedItems(pendingItems);
-                failedBatch.setException(e);
-                return failedBatch;
-            }
-            pendingItems = result.unprocessedItems();
-
-            if (pendingItems.size() > 0) {
-
-                // return pendingItems as a FailedBatch if we have exceeded max retry
-                if (maxRetries >= 0 && retries >= maxRetries) {
-                    failedBatch = new FailedBatch();
-                    failedBatch.setUnprocessedItems(pendingItems);
-                    failedBatch.setException(null);
-                    return failedBatch;
-                }
-
-                pause(batchWriteRetryStrategy.getDelayBeforeRetryUnprocessedItems(
-                        Collections.unmodifiableMap(pendingItems), retries));
-                retries++;
-            } else {
-                break;
-            }
-        }
-        return failedBatch;
-    }
-
-    @Override
-    public Map<String, List<Object>> batchLoad(Iterable<? extends Object> itemsToGet, DynamoDbMapperConfig config) {
-        config = mergeConfig(config);
-        boolean consistentReads = (config.getConsistentRead() == ConsistentRead.CONSISTENT);
-
-        if (itemsToGet == null) {
-            return new HashMap<>();
-        }
-
-        Map<String, Collection<Map<String, AttributeValue>>> requestItemLists = new HashMap<>();
-        Map<String, Class<?>> classesByTableName = new HashMap<String, Class<?>>();
-        Map<String, List<Object>> resultSet = new HashMap<String, List<Object>>();
-        int count = 0;
-
-        for (Object keyObject : itemsToGet) {
-            Class<Object> clazz = (Class<Object>) keyObject.getClass();
-            final DynamoDbMapperTableModel<Object> model = getTableModel(clazz, config);
-
-            String tableName = getTableName(clazz, keyObject, config);
-            classesByTableName.put(tableName, clazz);
-
-            requestItemLists.computeIfAbsent(tableName, ignored -> new LinkedList<>()).add(model.convertKey(keyObject));
-
-            // Reach the maximum number which can be handled in a single batchGet
-            if (++count == 100) {
-                Map<String, KeysAndAttributes> requestItems = batchRequestItems(consistentReads, requestItemLists);
-                processBatchGetRequest(classesByTableName, requestItems, resultSet, config);
-                requestItemLists.clear();
-                count = 0;
-            }
-        }
-
-        if (count > 0) {
-            Map<String, KeysAndAttributes> requestItems = batchRequestItems(consistentReads, requestItemLists);
-            processBatchGetRequest(classesByTableName, requestItems, resultSet, config);
-        }
-
-        return resultSet;
-    }
-
-    private Map<String, KeysAndAttributes> batchRequestItems(
-            boolean consistentReads,
-            Map<String, Collection<Map<String, AttributeValue>>> requestItemLists) {
-        return requestItemLists.entrySet().stream()
-                               .collect(toMap(Entry::getKey, e -> KeysAndAttributes.builder()
-                                                                                   .consistentRead(consistentReads)
-                                                                                   .keys(e.getValue())
-                                                                                   .build()));
-    }
-
-    @Override
-    public Map<String, List<Object>> batchLoad(Map<Class<?>, List<KeyPair>> itemsToGet, DynamoDbMapperConfig config) {
-        config = mergeConfig(config);
-        List<Object> keys = new ArrayList<Object>();
-        if (itemsToGet != null) {
-            for (Map.Entry<Class<?>, List<KeyPair>> item : itemsToGet.entrySet()) {
-                Class<?> clazz = item.getKey();
-                List<KeyPair> value = item.getValue();
-                if (value != null) {
-                    final DynamoDbMapperTableModel model = getTableModel(clazz, config);
-                    for (KeyPair keyPair : value) {
-                        keys.add(model.createKey(keyPair.getHashKey(), keyPair.getRangeKey()));
-                    }
-                }
-            }
-        }
-        return batchLoad(keys, config);
-    }
-
-    /**
-     * @param config never null
-     */
-    private void processBatchGetRequest(
-            final Map<String, Class<?>> classesByTableName,
-            final Map<String, KeysAndAttributes> requestItems,
-            final Map<String, List<Object>> resultSet,
-            final DynamoDbMapperConfig config) {
-
-        BatchGetItemResponse batchGetItemResponse = null;
-        BatchGetItemRequest batchGetItemRequest = BatchGetItemRequest.builder()
-                .requestItems(requestItems)
-                .build();
-
-        BatchLoadRetryStrategy batchLoadStrategy = config.batchLoadRetryStrategy();
-
-        BatchLoadContext batchLoadContext = new BatchLoadContext(batchGetItemRequest);
-
-        int retries = 0;
-
-        do {
-            if (batchGetItemResponse != null) {
-                retries++;
-                batchLoadContext.setRetriesAttempted(retries);
-                if (!isNullOrEmpty(batchGetItemResponse.unprocessedKeys())) {
-                    pause(batchLoadStrategy.getDelayBeforeNextRetry(batchLoadContext));
-                    batchGetItemRequest = batchGetItemRequest.toBuilder()
-                            .requestItems(batchGetItemResponse.unprocessedKeys())
-                            .build();
-                    batchLoadContext.setBatchGetItemRequest(batchGetItemRequest);
-                }
-            }
-
-            batchGetItemResponse = db.batchGetItem(applyBatchOperationUserAgent(batchGetItemRequest));
-
-            Map<String, List<Map<String, AttributeValue>>> responses = batchGetItemResponse.responses();
-            for (Map.Entry<String, List<Map<String, AttributeValue>>> entries : responses.entrySet()) {
-                String tableName = entries.getKey();
-                List<Map<String, AttributeValue>> items = entries.getValue();
-
-                List<Object> objects = resultSet.getOrDefault(tableName, new LinkedList<>());
-                Class<?> clazz = classesByTableName.get(tableName);
-
-                for (Map<String, AttributeValue> item : items) {
-                    AttributeTransformer.Parameters<?> parameters = toParameters(item, clazz, tableName, config);
-                    objects.add(privateMarshallIntoObject(parameters));
-                }
-
-                resultSet.put(tableName, objects);
-            }
-
-            batchLoadContext.setBatchGetItemResponse(batchGetItemResponse);
-
-            // the number of unprocessed keys and  Batch Load Strategy will drive the number of retries
-        } while (batchLoadStrategy.shouldRetry(batchLoadContext));
-
-        if (!isNullOrEmpty(batchGetItemResponse.unprocessedKeys())) {
-            throw new BatchGetItemException("The BatchGetItemResponse has unprocessed keys after max retry attempts. Catch the " +
-                                            "BatchGetItemException to get the list of unprocessed keys.",
-                                            batchGetItemResponse.unprocessedKeys(), resultSet);
-        }
-    }
-
-    @Override
-    public <T> PaginatedScanList<T> scan(Class<T> clazz,
-                                         DynamoDbScanExpression scanExpression,
-                                         DynamoDbMapperConfig config) {
-        config = mergeConfig(config);
-
-        ScanRequest scanRequest = createScanRequestFromExpression(clazz, scanExpression, config);
-
-        ScanResponse scanResult = db.scan(applyUserAgent(scanRequest));
-        return new PaginatedScanList<>(this, clazz, db, scanRequest, scanResult, config.getPaginationLoadingStrategy(), config);
-    }
-
-    @Override
-    public <T> PaginatedParallelScanList<T> parallelScan(Class<T> clazz,
-                                                         DynamoDbScanExpression scanExpression,
-                                                         int totalSegments,
-                                                         DynamoDbMapperConfig config) {
-        config = mergeConfig(config);
-
-        // Create hard copies of the original scan request with difference segment number.
-        List<ScanRequest> parallelScanRequests = createParallelScanRequestsFromExpression(clazz, scanExpression,
-                                                                                          totalSegments, config);
-        ParallelScanTask parallelScanTask = new ParallelScanTask(db, parallelScanRequests);
-
-        return new PaginatedParallelScanList<T>(this, clazz, db, parallelScanTask, config.getPaginationLoadingStrategy(), config);
-    }
-
-    @Override
-    public <T> ScanResultPage<T> scanPage(Class<T> clazz,
-                                          DynamoDbScanExpression scanExpression,
-                                          DynamoDbMapperConfig config) {
-        config = mergeConfig(config);
-
-        ScanRequest scanRequest = createScanRequestFromExpression(clazz, scanExpression, config);
-
-        ScanResponse scanResult = db.scan(applyUserAgent(scanRequest));
-        ScanResultPage<T> result = new ScanResultPage<T>();
-        List<AttributeTransformer.Parameters<T>> parameters =
-                toParameters(scanResult.items(), clazz, scanRequest.tableName(), config);
-
-        result.setResults(marshallIntoObjects(parameters));
-        result.setLastEvaluatedKey(scanResult.lastEvaluatedKey());
-        result.setCount(scanResult.count());
-        result.setScannedCount(scanResult.scannedCount());
-        result.setConsumedCapacity(scanResult.consumedCapacity());
-
-        return result;
-    }
-
-    @Override
-    public <T> PaginatedQueryList<T> query(Class<T> clazz,
-                                           DynamoDbQueryExpression<T> queryExpression,
-                                           DynamoDbMapperConfig config) {
-        config = mergeConfig(config);
-
-        QueryRequest queryRequest = createQueryRequestFromExpression(clazz, queryExpression, config);
-
-        QueryResponse queryResult = db.query(applyUserAgent(queryRequest));
-        return new PaginatedQueryList<T>(this, clazz, db, queryRequest, queryResult,
-                                         config.getPaginationLoadingStrategy(), config);
-    }
-
-    @Override
-    public <T> QueryResultPage<T> queryPage(Class<T> clazz,
-                                            DynamoDbQueryExpression<T> queryExpression,
-                                            DynamoDbMapperConfig config) {
-        config = mergeConfig(config);
-
-        QueryRequest queryRequest = createQueryRequestFromExpression(clazz, queryExpression, config);
-
-        QueryResponse queryResult = db.query(applyUserAgent(queryRequest));
-        QueryResultPage<T> result = new QueryResultPage<T>();
-        List<AttributeTransformer.Parameters<T>> parameters =
-                toParameters(queryResult.items(), clazz, queryRequest.tableName(), config);
-
-        result.setResults(marshallIntoObjects(parameters));
-        result.setLastEvaluatedKey(queryResult.lastEvaluatedKey());
-        result.setCount(queryResult.count());
-        result.setScannedCount(queryResult.scannedCount());
-        result.setConsumedCapacity(queryResult.consumedCapacity());
-
-        return result;
-    }
-
-    @Override
-    public int count(Class<?> clazz, DynamoDbScanExpression scanExpression, DynamoDbMapperConfig config) {
-        config = mergeConfig(config);
-
-        ScanRequest scanRequest = createScanRequestFromExpression(clazz, scanExpression, config);
-        scanRequest = scanRequest.toBuilder().select(Select.COUNT).build();
-
-        // Count scans can also be truncated for large datasets
-        int count = 0;
-        ScanResponse scanResult;
-        do {
-            scanResult = db.scan(applyUserAgent(scanRequest));
-            count += scanResult.count();
-            scanRequest = scanRequest.toBuilder().exclusiveStartKey(scanResult.lastEvaluatedKey()).build();
-        } while (!(scanResult.lastEvaluatedKey() instanceof SdkAutoConstructMap));
-
-        return count;
-    }
-
-    @Override
-    public <T> int count(Class<T> clazz, DynamoDbQueryExpression<T> queryExpression, DynamoDbMapperConfig config) {
-        config = mergeConfig(config);
-
-        QueryRequest queryRequest = createQueryRequestFromExpression(clazz, queryExpression, config);
-        queryRequest = queryRequest.toBuilder().select(Select.COUNT).build();
-
-        // Count queries can also be truncated for large datasets
-        int count = 0;
-        QueryResponse queryResult;
-        do {
-            queryResult = db.query(applyUserAgent(queryRequest));
-            count += queryResult.count();
-            queryRequest = queryRequest.toBuilder().exclusiveStartKey(queryResult.lastEvaluatedKey()).build();
-        } while (!(queryResult.lastEvaluatedKey() instanceof SdkAutoConstructMap));
-
-        return count;
-    }
-
-    /**
-     * @param config never null
-     */
-    private ScanRequest createScanRequestFromExpression(Class<?> clazz, DynamoDbScanExpression scanExpression,
-                                                        DynamoDbMapperConfig config) {
-        ScanRequest scanRequest = ScanRequest.builder()
-                .tableName(getTableName(clazz, config))
-                .indexName(scanExpression.getIndexName())
-                .scanFilter(scanExpression.scanFilter())
-                .limit(scanExpression.limit())
-                .exclusiveStartKey(scanExpression.getExclusiveStartKey())
-                .totalSegments(scanExpression.getTotalSegments())
-                .segment(scanExpression.segment())
-                .conditionalOperator(scanExpression.getConditionalOperator())
-                .filterExpression(scanExpression.getFilterExpression())
-                .expressionAttributeNames(scanExpression.getExpressionAttributeNames())
-                .expressionAttributeValues(scanExpression.getExpressionAttributeValues())
-                .select(scanExpression.select())
-                .projectionExpression(scanExpression.getProjectionExpression())
-                .returnConsumedCapacity(scanExpression.getReturnConsumedCapacity())
-                .consistentRead(scanExpression.isConsistentRead())
-                .build();
-
-        return applyUserAgent(scanRequest);
-    }
-
-    /**
-     * @param config never null
-     */
-    private List<ScanRequest> createParallelScanRequestsFromExpression(Class<?> clazz, DynamoDbScanExpression scanExpression,
-                                                                       int totalSegments, DynamoDbMapperConfig config) {
-        if (totalSegments < 1) {
-            throw new IllegalArgumentException("Parallel scan should have at least one scan segment.");
-        }
-        if (scanExpression.getExclusiveStartKey() != null) {
-            log.info("The ExclusiveStartKey parameter specified in the DynamoDBScanExpression is ignored,"
-                     + " since the individual parallel scan request on each segment is applied on a separate key scope.");
-        }
-        if (scanExpression.segment() != null || scanExpression.getTotalSegments() != null) {
-            log.info("The Segment and TotalSegments parameters specified in the DynamoDBScanExpression are ignored.");
-        }
-
-        List<ScanRequest> parallelScanRequests = new LinkedList<ScanRequest>();
-        for (int segment = 0; segment < totalSegments; segment++) {
-            ScanRequest scanRequest = createScanRequestFromExpression(clazz, scanExpression, config)
-                    .toBuilder()
-                    .segment(segment)
-                    .totalSegments(totalSegments)
-                    .exclusiveStartKey(null)
-                    .build();
-            parallelScanRequests.add(scanRequest);
-        }
-        return parallelScanRequests;
-    }
-
-    private <T> QueryRequest createQueryRequestFromExpression(Class<T> clazz,
-                                                              DynamoDbQueryExpression<T> xpress, DynamoDbMapperConfig config) {
-
-        final DynamoDbMapperTableModel<T> model = getTableModel(clazz, config);
-
-        QueryRequest request = QueryRequest.builder()
-                .consistentRead(xpress.isConsistentRead())
-                .tableName(getTableName(clazz, xpress.getHashKeyValues(), config))
-                .indexName(xpress.getIndexName())
-                .keyConditionExpression(xpress.getKeyConditionExpression())
-                .build();
-
-        request = processKeyConditions(request, xpress, model);
-
-        request = request.toBuilder()
-                .scanIndexForward(xpress.isScanIndexForward())
-               .limit(xpress.limit())
-               .exclusiveStartKey(xpress.getExclusiveStartKey())
-               .queryFilter(xpress.getQueryFilter())
-               .conditionalOperator(xpress.getConditionalOperator())
-               .select(xpress.select())
-               .projectionExpression(xpress.getProjectionExpression())
-               .filterExpression(xpress.getFilterExpression())
-               .expressionAttributeNames(xpress.getExpressionAttributeNames())
-               .expressionAttributeValues(xpress.getExpressionAttributeValues())
-               .returnConsumedCapacity(xpress.getReturnConsumedCapacity())
-               .build();
-
-        return applyUserAgent(request);
-    }
-
-    private <T> AttributeTransformer.Parameters<T> toParameters(
-            final Map<String, AttributeValue> attributeValues,
-            final Class<T> modelClass,
-            final String tableName,
-            final DynamoDbMapperConfig mapperConfig) {
-
-        return toParameters(attributeValues, false, modelClass, tableName, mapperConfig);
-    }
-
-    private <T> AttributeTransformer.Parameters<T> toParameters(
-            final Map<String, AttributeValue> attributeValues,
-            final boolean partialUpdate,
-            final Class<T> modelClass,
-            final String tableName,
-            final DynamoDbMapperConfig mapperConfig) {
-
-        return new TransformerParameters<T>(
-                getTableModel(modelClass, mapperConfig),
-                attributeValues,
-                partialUpdate,
-                modelClass,
-                mapperConfig,
-                tableName);
-    }
-
-    final <T> List<AttributeTransformer.Parameters<T>> toParameters(
-            final List<Map<String, AttributeValue>> attributeValues,
-            final Class<T> modelClass,
-            final String tableName,
-            final DynamoDbMapperConfig mapperConfig) {
-        List<AttributeTransformer.Parameters<T>> rval =
-                new ArrayList<AttributeTransformer.Parameters<T>>(
-                        attributeValues.size());
-
-        for (Map<String, AttributeValue> item : attributeValues) {
-            rval.add(toParameters(item, modelClass, tableName, mapperConfig));
-        }
-
-        return rval;
-    }
-
-    private Map<String, AttributeValue> untransformAttributes(
-            final AttributeTransformer.Parameters<?> parameters) {
-        if (transformer != null) {
-            return transformer.untransform(parameters);
-        } else {
-            return parameters.getAttributeValues();
-        }
-    }
-
-    private Map<String, AttributeValue> transformAttributes(
-            final AttributeTransformer.Parameters<?> parameters) {
-
-        if (transformer != null) {
-            return transformer.transform(parameters);
-        } else {
-            return parameters.getAttributeValues();
-        }
-    }
-
-    @Override
-    public S3ClientCache s3ClientCache() {
-        return s3Links.s3ClientCache();
-    }
-
-    @Override
-    public S3Link createS3Link(Region s3region, String bucketName, String key) {
-        return s3Links.createS3Link(s3region, bucketName, key);
-    }
-
-    @Override
-    public S3Link createS3Link(String s3region, String bucketName, String key) {
-        return s3Links.createS3Link(s3region, bucketName, key);
-    }
-
-    @Override
-    public <T> CreateTableRequest generateCreateTableRequest(Class<T> clazz, DynamoDbMapperConfig config) {
-        config = mergeConfig(config);
-        final DynamoDbMapperTableModel<T> model = getTableModel(clazz, config);
-
-        List<KeySchemaElement> keySchemas = new ArrayList<>();
-        keySchemas.add(KeySchemaElement.builder().attributeName(model.hashKey().name()).keyType(HASH).build());
-
-        final CreateTableRequest.Builder requestBuilder = CreateTableRequest.builder()
-                .tableName(getTableName(clazz, config));
-
-        if (model.rangeKeyIfExists() != null) {
-            keySchemas.add(KeySchemaElement.builder()
-                                           .attributeName(model.rangeKey().name())
-                                           .keyType(RANGE)
-                                           .build());
-        }
-        requestBuilder.globalSecondaryIndexes(model.globalSecondaryIndexes())
-            .localSecondaryIndexes(model.localSecondaryIndexes());
-
-        List<AttributeDefinition> attributeDefinitions = new ArrayList<>();
-        for (final DynamoDbMapperFieldModel<T, Object> field : model.fields()) {
-            if (field.keyType() != null || field.indexed()) {
-                AttributeDefinition attributeDefinition = AttributeDefinition.builder()
-                        .attributeType(ScalarAttributeType.valueOf(field.attributeType().name()))
-                        .attributeName(field.name())
-                        .build();
-
-                attributeDefinitions.add(attributeDefinition);
-            }
-        }
-
-        requestBuilder.keySchema(keySchemas);
-        requestBuilder.attributeDefinitions(attributeDefinitions);
-        return requestBuilder.build();
-    }
-
-    @Override
-    public <T> DeleteTableRequest generateDeleteTableRequest(Class<T> clazz, DynamoDbMapperConfig config) {
-        config = mergeConfig(config);
-        DeleteTableRequest deleteTableRequest = DeleteTableRequest.builder()
-                .tableName(getTableName(clazz, config))
-                .build();
-        return deleteTableRequest;
-    }
-
-    /**
-     * Creates a new table mapper using this mapper to perform operations.
-     * @param <T> The object type which this mapper operates.
-     * @param <H> The hash key value type.
-     * @param <R> The range key value type; use <code>?</code> if no range key.
-     * @param clazz The object class.
-     * @return The table mapper.
-     */
-    public <T, H, R> DynamoDbTableMapper<T, H, R> newTableMapper(Class<T> clazz) {
-        DynamoDbMapperConfig config = mergeConfig(null);
-        return new DynamoDbTableMapper<T, H, R>(this.db, this, config, getTableModel(clazz, config));
-    }
-
-    /**
-     * The one true implementation of AttributeTransformer.Parameters.
-     */
-    private static class TransformerParameters<T>
-            implements AttributeTransformer.Parameters<T> {
-
-        private final DynamoDbMapperTableModel<T> model;
-        private final Map<String, AttributeValue> attributeValues;
-        private final boolean partialUpdate;
-        private final Class<T> modelClass;
-        private final DynamoDbMapperConfig mapperConfig;
-        private final String tableName;
-
-        TransformerParameters(
-                final DynamoDbMapperTableModel<T> model,
-                final Map<String, AttributeValue> attributeValues,
-                final boolean partialUpdate,
-                final Class<T> modelClass,
-                final DynamoDbMapperConfig mapperConfig,
-                final String tableName) {
-
-            this.model = model;
-            this.attributeValues =
-                    Collections.unmodifiableMap(attributeValues);
-            this.partialUpdate = partialUpdate;
-            this.modelClass = modelClass;
-            this.mapperConfig = mapperConfig;
-            this.tableName = tableName;
-        }
-
-        @Override
-        public Map<String, AttributeValue> getAttributeValues() {
-            return attributeValues;
-        }
-
-        @Override
-        public boolean isPartialUpdate() {
-            return partialUpdate;
-        }
-
-        @Override
-        public Class<T> modelClass() {
-            return modelClass;
-        }
-
-        @Override
-        public DynamoDbMapperConfig mapperConfig() {
-            return mapperConfig;
-        }
-
-        @Override
-        public String getTableName() {
-            return tableName;
-        }
-
-        @Override
-        public String getHashKeyName() {
-            return model.hashKey().name();
-        }
-
-        @Override
-        public String getRangeKeyName() {
-            return model.rangeKeyIfExists() == null ? null : model.rangeKey().name();
-        }
-    }
-
-    /**
-     * The return type of batchWrite, batchDelete and batchSave.
-     *
-     * It contains the information about the unprocessed items and the
-     * exception causing the failure.
-     */
-    public static class FailedBatch {
-        private Map<String, List<WriteRequest>> unprocessedItems;
-        private Exception exception;
-
-        public Map<String, List<WriteRequest>> getUnprocessedItems() {
-            return unprocessedItems;
-        }
-
-        public void setUnprocessedItems(Map<String, List<WriteRequest>> unprocessedItems) {
-            this.unprocessedItems = unprocessedItems;
-        }
-
-        public Exception getException() {
-            return exception;
-        }
-
-        public void setException(Exception excetpion) {
-            this.exception = excetpion;
-        }
-
-        private boolean isRequestEntityTooLarge() {
-            return exception instanceof SdkServiceException &&
-                   RetryUtils.isRequestEntityTooLargeException((SdkServiceException) exception);
-        }
-
-        private boolean isThrottling() {
-            return exception instanceof SdkServiceException && ((SdkServiceException) exception).isThrottlingException();
-        }
-
-        private int size() {
-            int size = 0;
-            for (final List<WriteRequest> values : unprocessedItems.values()) {
-                size += values.size();
-            }
-            return size;
-        }
-    }
-
-    /**
-     * Used for batch operations where request data is grouped by table name.
-     */
-    static final class StringListMap<T> extends LinkedHashMap<String, List<T>> {
-        private static final long serialVersionUID = -1L;
-
-        public List<T> getPutIfNotExists(final String key) {
-            List<T> list = get(key);
-            if (list == null) {
-                list = new LinkedList<>();
-                put(key, list);
-            }
-            return list;
-        }
-
-        public boolean add(final String key, final T value) {
-            return getPutIfNotExists(key).add(value);
-        }
-
-        public List<StringListMap<T>> subMaps(final int size, boolean perMap) {
-            final LinkedList<StringListMap<T>> maps = new LinkedList<StringListMap<T>>();
-            int index = 0;
-            int count = 0;
-            for (final Entry<String, List<T>> entry : entrySet()) {
-                for (final T value : entry.getValue()) {
-                    if (index == maps.size()) {
-                        maps.add(new StringListMap<T>());
-                    }
-                    maps.get(index).add(entry.getKey(), value);
-                    index = perMap ? (++count / size) : (++index % size);
-                }
-            }
-            return maps;
-        }
-    }
-
-    public static final class BatchGetItemException extends SdkClientException {
-        private transient Map<String, KeysAndAttributes> unprocessedKeys;
-        private transient Map<String, List<Object>> responses;
-
-        public BatchGetItemException(String message, Map<String, KeysAndAttributes> unprocessedKeys,
-                                     Map<String, List<Object>> responses) {
-            super(SdkClientException.builder().message(message));
-            this.unprocessedKeys = unprocessedKeys;
-            this.responses = responses;
-        }
-
-        /**
-         * Returns a map of tables and their respective keys that were not processed during the operation..
-         */
-        public Map<String, KeysAndAttributes> getUnprocessedKeys() {
-            return unprocessedKeys;
-        }
-
-        /**
-         * Returns a map of the loaded objects. Each key in the map is the name of a DynamoDB table.
-         * Each value in the map is a list of objects that have been loaded from that table. All
-         * objects for each table can be cast to the associated user defined type that is
-         * annotated as mapping that table.
-         */
-        public Map<String, List<Object>> getResponses() {
-            return responses;
-        }
-    }
-
-    /**
-     * The handler for saving object using DynamoDBMapper. Caller should
-     * implement the abstract methods to provide the expected behavior on each
-     * scenario, and this handler will take care of all the other basic workflow
-     * and common operations.
-     */
-    protected abstract class SaveObjectHandler {
-
-        protected final Object object;
-        protected final Class<?> clazz;
-        /**
-         * Additional expected value conditions specified by the user.
-         */
-        protected final Map<String, ExpectedAttributeValue> userProvidedExpectedValueConditions;
-        /**
-         * Condition operator on the additional expected value conditions
-         * specified by the user.
-         */
-        protected final String userProvidedConditionOperator;
-        private final String tableName;
-        private final DynamoDbMapperConfig saveConfig;
-        private final Map<String, AttributeValue> primaryKeys;
-        private final Map<String, AttributeValueUpdate> updateValues;
-        /**
-         * Any expected value conditions specified by the implementation of
-         * DynamoDBMapper, e.g. value assertions on versioned attributes.
-         */
-        private final Map<String, ExpectedAttributeValue> internalExpectedValueAssertions;
-        private final List<ValueUpdate> inMemoryUpdates;
-
-        /**
-         * Constructs a handler for saving the specified model object.
-         *
-         * @param object            The model object to be saved.
-         * @param clazz             The domain class of the object.
-         * @param tableName         The table name.
-         * @param saveConfig        The mapper configuration used for this save.
-         * @param saveExpression    The save expression, including the user-provided conditions and an optional logic operator.
-         */
-        public SaveObjectHandler(
-                Class<?> clazz,
-                Object object,
-                String tableName,
-                DynamoDbMapperConfig saveConfig,
-                DynamoDbSaveExpression saveExpression) {
-
-            this.clazz = clazz;
-            this.object = object;
-            this.tableName = tableName;
-            this.saveConfig = saveConfig;
-
-            if (saveExpression != null) {
-                userProvidedExpectedValueConditions = saveExpression
-                        .getExpected();
-                userProvidedConditionOperator = saveExpression
-                        .getConditionalOperator();
-            } else {
-                userProvidedExpectedValueConditions = null;
-                userProvidedConditionOperator = null;
-            }
-
-            updateValues = new HashMap<>();
-            internalExpectedValueAssertions = new HashMap<>();
-            inMemoryUpdates = new LinkedList<>();
-            primaryKeys = new HashMap<>();
-        }
-
-        /**
-         * The general workflow of a save operation.
-         */
-        public void execute() {
-            final DynamoDbMapperTableModel<Object> model = getTableModel((Class<Object>) clazz, saveConfig);
-            for (final DynamoDbMapperFieldModel<Object, Object> field : model.fields()) {
-                if (canGenerate(model, object, localSaveBehavior(), field)) {
-                    if (field.keyType() != null || field.indexed()) {
-                        onAutoGenerateAssignableKey(field);
-                    } else if (field.versioned()) {
-                        onVersionAttribute(field);
-                    } else {
-                        onAutoGenerate(field);
-                    }
-                } else if (field.keyType() != null) {
-                    AttributeValue newAttributeValue = field.convert(field.get(object));
-                    if (newAttributeValue == null) {
-                        throw new DynamoDbMappingException(
-                                clazz.getSimpleName() + "[" + field.name() + "]; null or empty value for primary key"
-                        );
-                    }
-                    onPrimaryKeyAttributeValue(field.name(), newAttributeValue);
-                } else {
-                    AttributeValue currentValue = field.convert(field.get(object));
-                    if (currentValue != null) {
-                        onNonKeyAttribute(field.name(), currentValue);
-                    } else {
-                        onNullNonKeyAttribute(field.name());
-                    }
-                }
-            }
-
-            /*
-             * Execute the implementation of the low level request.
-             */
-            executeLowLevelRequest();
-
-            /*
-             * Finally, after the service call has succeeded, update the
-             * in-memory object with new field values as appropriate. This
-             * currently takes into account of auto-generated keys and versioned
-             * attributes.
-             */
-            for (ValueUpdate update : inMemoryUpdates) {
-                update.apply();
-            }
-        }
-
-        /**
-         * Implement this method to do the necessary operations when a primary key
-         * attribute is set with some value.
-         *
-         * @param attributeName
-         *            The name of the primary key attribute.
-         * @param keyAttributeValue
-         *            The AttributeValue of the primary key attribute as specified in
-         *            the object.
-         */
-        protected abstract void onPrimaryKeyAttributeValue(String attributeName, AttributeValue keyAttributeValue);
-
-        /**
-         * Implement this method for necessary operations when a non-key
-         * attribute is set a non-null value in the object.
-         * The default implementation simply adds a "PUT" update for the given attribute.
-         *
-         * @param attributeName
-         *            The name of the non-key attribute.
-         * @param currentValue
-         *            The updated value of the given attribute.
-         */
-        protected void onNonKeyAttribute(String attributeName, AttributeValue currentValue) {
-            updateValues.put(attributeName, AttributeValueUpdate.builder()
-                    .value(currentValue)
-                    .action("PUT")
-                    .build());
-        }
-
-        /**
-         * Implement this method for necessary operations when a non-key
-         * attribute is set null in the object.
-         *
-         * @param attributeName
-         *            The name of the non-key attribute.
-         */
-        protected abstract void onNullNonKeyAttribute(String attributeName);
-
-        /**
-         * Implement this method to send the low-level request that is necessary
-         * to complete the save operation.
-         */
-        protected abstract void executeLowLevelRequest();
-
-        /** Get the SaveBehavior used locally for this save operation. **/
-        protected SaveBehavior localSaveBehavior() {
-            return saveConfig.saveBehavior();
-        }
-
-        /** Get the table name **/
-        protected String getTableName() {
-            return tableName;
-        }
-
-        /** Get the map of all the specified primamry keys of the saved object. **/
-        protected Map<String, AttributeValue> getPrimaryKeyAttributeValues() {
-            return primaryKeys;
-        }
-
-        /** Get the map of AttributeValueUpdate on each modeled attribute. **/
-        protected Map<String, AttributeValueUpdate> getAttributeValueUpdates() {
-            return updateValues;
-        }
-
-        /**
-         * Merge and return all the expected value conditions (either
-         * user-specified or imposed by the internal implementation of
-         * DynamoDBMapper) for this save operation.
-         */
-        protected Map<String, ExpectedAttributeValue> mergeExpectedAttributeValueConditions() {
-            return DynamoDbMapper.mergeExpectedAttributeValueConditions(
-                    internalExpectedValueAssertions,
-                    userProvidedExpectedValueConditions,
-                    userProvidedConditionOperator);
-        }
-
-        /** Get the list of all the necessary in-memory update on the object. **/
-        protected List<ValueUpdate> getInMemoryUpdates() {
-            return inMemoryUpdates;
-        }
-
-        /**
-         * Save the item using a UpdateItem request. The handler will call this
-         * method if
-         * <ul>
-         * <li>CLOBBER configuration is not being used;
-         * <li>AND the item does not contain auto-generated key value;
-         * </ul>
-         * <p>
-         * The ReturnedValues parameter for the UpdateItem request is set as
-         * ALL_NEW, which means the service should return all of the attributes
-         * of the new version of the item after the update. The handler will use
-         * the returned attributes to detect silent failure on the server-side.
-         */
-        protected UpdateItemResponse doUpdateItem() {
-            UpdateItemRequest req = UpdateItemRequest.builder()
-                    .tableName(getTableName())
-                    .key(getPrimaryKeyAttributeValues())
-                    .attributeUpdates(
-                            transformAttributeUpdates(
-                                    this.clazz,
-                                    getTableName(),
-                                    getPrimaryKeyAttributeValues(),
-                                    getAttributeValueUpdates(),
-                                    saveConfig))
-                    .expected(mergeExpectedAttributeValueConditions())
-                    .conditionalOperator(userProvidedConditionOperator)
-                    .returnValues(ReturnValue.ALL_NEW)
-                    .build();
-
-            return db.updateItem(applyUserAgent(req));
-        }
-
-        /**
-         * Save the item using a PutItem request. The handler will call this
-         * method if
-         * <ul>
-         *  <li> CLOBBER configuration is being used;
-         *  <li> OR the item contains auto-generated key value;
-         *  <li> OR an UpdateItem request has silently failed (200 response with
-         *          no affected attribute), which indicates the key-only-put scenario
-         *          that we used to handle by the keyOnlyPut(...) hack.
-         * </ul>
-         */
-        protected PutItemResponse doPutItem() {
-            Map<String, AttributeValue> attributeValues = convertToItem(getAttributeValueUpdates());
-
-            attributeValues = transformAttributes(
-                    toParameters(attributeValues,
-                                 this.clazz,
-                                 getTableName(),
-                                 saveConfig));
-            PutItemRequest req = PutItemRequest.builder()
-                    .tableName(getTableName())
-                    .item(attributeValues)
-                    .expected(mergeExpectedAttributeValueConditions())
-                    .conditionalOperator(userProvidedConditionOperator)
-                    .build();
-
-            return db.putItem(applyUserAgent(req));
-        }
-
-        /**
-         * Auto-generates the attribute value.
-         * @param field The mapping details.
-         */
-        private void onAutoGenerate(DynamoDbMapperFieldModel<Object, Object> field) {
-            AttributeValue value = field.convert(field.generate(field.get(object)));
-            updateValues.put(field.name(), AttributeValueUpdate.builder().action("PUT").value(value).build());
-            inMemoryUpdates.add(new ValueUpdate(field, value, object));
-        }
-
-        /**
-         * Auto-generates the key.
-         */
-        private void onAutoGenerateAssignableKey(DynamoDbMapperFieldModel<Object, Object> field) {
-            // Generate the new key value first, then ensure it doesn't exist.
-            onAutoGenerate(field);
-
-            if (localSaveBehavior() != SaveBehavior.CLOBBER
-                && !internalExpectedValueAssertions.containsKey(field.name())
-                && field.getGenerateStrategy() != DynamoDbAutoGenerateStrategy.ALWAYS) {
-                // Add an expect clause to make sure that the item
-                // doesn't already exist, since it's supposed to be new
-                internalExpectedValueAssertions.put(field.name(),
-                                                    ExpectedAttributeValue.builder()
-                                                            .exists(false)
-                                                            .build());
-            }
-        }
-
-        /**
-         * Auto-generates the version.
-         * @param field The mapping details.
-         */
-        private void onVersionAttribute(DynamoDbMapperFieldModel<Object, Object> field) {
-            if (localSaveBehavior() != SaveBehavior.CLOBBER
-                && !internalExpectedValueAssertions.containsKey(field.name())) {
-                // First establish the expected (current) value for the
-                // update call
-                // For new objects, insist that the value doesn't exist.
-                // For existing ones, insist it has the old value.
-                final Object current = field.get(object);
-                if (current == null) {
-                    internalExpectedValueAssertions.put(field.name(),
-                                                        ExpectedAttributeValue.builder()
-                                                                .exists(false)
-                                                                .build());
-                } else {
-                    internalExpectedValueAssertions.put(field.name(),
-                                                        ExpectedAttributeValue.builder()
-                                                                .exists(true)
-                                                                .value(field.convert(current))
-                                                                .build());
-                }
-            }
-
-            // Generate the new version value
-            onAutoGenerate(field);
-        }
-
-        /**
-         * Converts the {@link AttributeValueUpdate} map given to an equivalent
-         * {@link AttributeValue} map.
-         */
-        private Map<String, AttributeValue> convertToItem(Map<String, AttributeValueUpdate> putValues) {
-            Map<String, AttributeValue> map = new HashMap<String, AttributeValue>();
-            for (Entry<String, AttributeValueUpdate> entry : putValues.entrySet()) {
-                String attributeName = entry.getKey();
-                AttributeValue attributeValue = entry.getValue().value();
-                String attributeAction = entry.getValue().actionAsString();
-
-                /*
-                 * AttributeValueUpdate allows nulls for its values, since they are
-                 * semantically meaningful. AttributeValues never have null values.
-                 */
-                if (attributeValue != null
-                    && !AttributeAction.DELETE.toString().equals(attributeAction)) {
-                    map.put(attributeName, attributeValue);
-                }
-            }
-            return map;
-        }
-
-        private Map<String, AttributeValueUpdate> transformAttributeUpdates(
-                final Class<?> clazz,
-                final String tableName,
-                final Map<String, AttributeValue> keys,
-                final Map<String, AttributeValueUpdate> updateValues,
-                final DynamoDbMapperConfig config) {
-            Map<String, AttributeValue> item = convertToItem(updateValues);
-
-            HashSet<String> keysAdded = new HashSet<String>();
-            for (Map.Entry<String, AttributeValue> e : keys.entrySet()) {
-                if (!item.containsKey(e.getKey())) {
-                    keysAdded.add(e.getKey());
-                    item.put(e.getKey(), e.getValue());
-                }
-            }
-
-            AttributeTransformer.Parameters<?> parameters =
-                    toParameters(item, true, clazz, tableName, config);
-
-            String hashKey = parameters.getHashKeyName();
-
-            if (!item.containsKey(hashKey)) {
-                item.put(hashKey, keys.get(hashKey));
-            }
-
-            item = transformAttributes(parameters);
-
-            for (Map.Entry<String, AttributeValue> entry : item.entrySet()) {
-                if (keysAdded.contains(entry.getKey())) {
-                    // This was added in for context before calling
-                    // transformAttributes, but isn't actually being changed.
-                    continue;
-                }
-
-                AttributeValueUpdate update = updateValues.get(entry.getKey());
-                if (update != null) {
-                    AttributeValue value = update.value().toBuilder()
-                          .b(entry.getValue().b())
-                          .bs(entry.getValue().bs())
-                          .n(entry.getValue().n())
-                          .ns(entry.getValue().ns())
-                          .s(entry.getValue().s())
-                          .ss(entry.getValue().ss())
-                          .m(entry.getValue().m())
-                          .l(entry.getValue().l())
-                          .nul(entry.getValue().nul())
-                          .bool(entry.getValue().bool()).build();
-
-                    update = update.toBuilder().value(value).build();
-                    updateValues.put(entry.getKey(), update);
-                } else {
-                    updateValues.put(entry.getKey(), AttributeValueUpdate.builder()
-                            .value(entry.getValue())
-                            .action("PUT")
-                            .build());
-                }
-            }
-
-            return updateValues;
-        }
-    }
-
-    private static final class ValueUpdate {
-        private final DynamoDbMapperFieldModel<Object, Object> field;
-        private final AttributeValue newValue;
-        private final Object target;
-
-        ValueUpdate(
-            DynamoDbMapperFieldModel<Object, Object> field,
-            AttributeValue newValue,
-            Object target) {
-
-            this.field = field;
-            this.newValue = newValue;
-            this.target = target;
-        }
-
-        public void apply() {
-            field.set(target, field.unconvert(newValue));
-        }
-    }
-
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbMapperConfig.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbMapperConfig.java
deleted file mode 100644
index 783d51e814e5..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbMapperConfig.java
+++ /dev/null
@@ -1,1134 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-import java.security.SecureRandom;
-import java.util.List;
-import java.util.Map;
-import java.util.Random;
-import software.amazon.awssdk.services.dynamodb.model.KeysAndAttributes;
-import software.amazon.awssdk.services.dynamodb.model.WriteRequest;
-
-/**
- * Immutable configuration object for service call behavior. An instance of this
- * configuration is supplied to every {@link DynamoDbMapper} at construction; if
- * not provided explicitly, {@link DynamoDbMapperConfig#DEFAULT} is used. New
- * instances can be given to the mapper object on individual save, load, and
- * delete operations to override the defaults. For example:
- *
- * <pre class="brush: java">
- * DynamoDBMapper mapper = new DynamoDBMapper(dynamoDBClient);
- * // Force this read to be consistent
- * DomainClass obj = mapper.load(DomainClass.class, key, ConsistentRead.CONSISTENT.config());
- * // Force this save operation to use putItem rather than updateItem
- * mapper.save(obj, SaveBehavior.CLOBBER.config());
- * // Save the object into a different table
- * mapper.save(obj, new TableNameOverride("AnotherTable").config());
- * // Delete the object even if the version field is out of date
- * mapper.delete(obj, SaveBehavior.CLOBBER.config());
- * </pre>
- */
-public class DynamoDbMapperConfig {
-
-    /**
-     * Default configuration; these defaults are also applied by the mapper
-     * when only partial configurations are specified.
-     *
-     * @see SaveBehavior#UPDATE
-     * @see ConsistentRead#EVENTUAL
-     * @see PaginationLoadingStrategy#LAZY_LOADING
-     * @see DefaultTableNameResolver#INSTANCE
-     * @see DefaultBatchWriteRetryStrategy#INSTANCE
-     * @see DefaultBatchLoadRetryStrategy#INSTANCE
-     * @see DynamoDbTypeConverterFactory#standard
-     * @see ConversionSchemas#DEFAULT
-     */
-    public static final DynamoDbMapperConfig DEFAULT = builder()
-            .withSaveBehavior(SaveBehavior.UPDATE)
-            .withConsistentReads(ConsistentRead.EVENTUAL)
-            .withPaginationLoadingStrategy(PaginationLoadingStrategy.LAZY_LOADING)
-            .withTableNameResolver(DefaultTableNameResolver.INSTANCE)
-            .withBatchWriteRetryStrategy(DefaultBatchWriteRetryStrategy.INSTANCE)
-            .withBatchLoadRetryStrategy(DefaultBatchLoadRetryStrategy.INSTANCE)
-            .withTypeConverterFactory(DynamoDbTypeConverterFactory.standard())
-            .withConversionSchema(ConversionSchemas.DEFAULT)
-            .build();
-    private final SaveBehavior saveBehavior;
-    private final ConsistentRead consistentRead;
-    private final TableNameOverride tableNameOverride;
-    private final TableNameResolver tableNameResolver;
-    private final ObjectTableNameResolver objectTableNameResolver;
-    private final PaginationLoadingStrategy paginationLoadingStrategy;
-    private final ConversionSchema conversionschema;
-    private final BatchWriteRetryStrategy batchWriteRetryStrategy;
-    private final BatchLoadRetryStrategy batchLoadRetryStrategy;
-    private final DynamoDbTypeConverterFactory typeConverterFactory;
-
-    /**
-     * Internal constructor; builds from the builder.
-     */
-    private DynamoDbMapperConfig(final DynamoDbMapperConfig.Builder builder) {
-        this.saveBehavior = builder.saveBehavior;
-        this.consistentRead = builder.consistentRead;
-        this.tableNameOverride = builder.tableNameOverride;
-        this.tableNameResolver = builder.tableNameResolver;
-        this.objectTableNameResolver = builder.objectTableNameResolver;
-        this.paginationLoadingStrategy = builder.paginationLoadingStrategy;
-        this.conversionschema = builder.conversionschema;
-        this.batchWriteRetryStrategy = builder.batchWriteRetryStrategy;
-        this.batchLoadRetryStrategy = builder.batchLoadRetryStrategy;
-        this.typeConverterFactory = builder.typeConverterFactory;
-    }
-
-    private DynamoDbMapperConfig(
-            SaveBehavior saveBehavior,
-            ConsistentRead consistentRead,
-            TableNameOverride tableNameOverride,
-            TableNameResolver tableNameResolver,
-            ObjectTableNameResolver objectTableNameResolver,
-            PaginationLoadingStrategy paginationLoadingStrategy,
-            ConversionSchema conversionschema,
-            BatchWriteRetryStrategy batchWriteRetryStrategy,
-            BatchLoadRetryStrategy batchLoadRetryStrategy) {
-
-        this.saveBehavior = saveBehavior;
-        this.consistentRead = consistentRead;
-        this.tableNameOverride = tableNameOverride;
-        this.tableNameResolver = tableNameResolver;
-        this.objectTableNameResolver = objectTableNameResolver;
-        this.paginationLoadingStrategy = paginationLoadingStrategy;
-        this.conversionschema = conversionschema;
-        this.batchWriteRetryStrategy = batchWriteRetryStrategy;
-        this.batchLoadRetryStrategy = batchLoadRetryStrategy;
-        this.typeConverterFactory = null;
-    }
-
-    /**
-     * Constructs a new configuration object with the save behavior given.
-     * @see SaveBehavior#config
-     */
-    @Deprecated
-    public DynamoDbMapperConfig(SaveBehavior saveBehavior) {
-        this(saveBehavior, null, null, null, null, null,
-             DEFAULT.getConversionSchema(), DEFAULT.batchWriteRetryStrategy(), DEFAULT.batchLoadRetryStrategy());
-    }
-
-    /**
-     * Constructs a new configuration object with the consistent read behavior
-     * given.
-     * @see ConsistentRead#config
-     */
-    @Deprecated
-    public DynamoDbMapperConfig(ConsistentRead consistentRead) {
-        this(null, consistentRead, null, null, null, null,
-             DEFAULT.getConversionSchema(), DEFAULT.batchWriteRetryStrategy(), DEFAULT.batchLoadRetryStrategy());
-    }
-
-    /**
-     * Constructs a new configuration object with the table name override given.
-     * @see TableNameOverride#config
-     */
-    @Deprecated
-    public DynamoDbMapperConfig(TableNameOverride tableNameOverride) {
-        this(null, null, tableNameOverride, null, null, null,
-             DEFAULT.getConversionSchema(), DEFAULT.batchWriteRetryStrategy(), DEFAULT.batchLoadRetryStrategy());
-    }
-
-    /**
-     * Constructs a new configuration object with the table name resolver strategy given.
-     * @see DynamoDBConfig#builder
-     */
-    @Deprecated
-    public DynamoDbMapperConfig(TableNameResolver tableNameResolver) {
-        this(null, null, null, tableNameResolver, null, null,
-             DEFAULT.getConversionSchema(), DEFAULT.batchWriteRetryStrategy(), DEFAULT.batchLoadRetryStrategy());
-    }
-
-    /**
-     * Constructs a new configuration object with the object table name resolver strategy given.
-     * @see DynamoDBConfig#builder
-     */
-    @Deprecated
-    public DynamoDbMapperConfig(ObjectTableNameResolver objectTableNameResolver) {
-        this(null, null, null, null, objectTableNameResolver, null,
-             DEFAULT.getConversionSchema(), DEFAULT.batchWriteRetryStrategy(), DEFAULT.batchLoadRetryStrategy());
-    }
-
-    /**
-     * Constructs a new configuration object with the table name resolver strategies given.
-     * @see DynamoDBConfig#builder
-     */
-    @Deprecated
-    public DynamoDbMapperConfig(TableNameResolver tableNameResolver, ObjectTableNameResolver objectTableNameResolver) {
-        this(null, null, null, tableNameResolver, objectTableNameResolver, null,
-             DEFAULT.getConversionSchema(), DEFAULT.batchWriteRetryStrategy(), DEFAULT.batchLoadRetryStrategy());
-    }
-
-    /**
-     * Constructs a new configuration object with the pagination loading
-     * strategy given.
-     * @see PaginationLoadingStrategy#config
-     */
-    @Deprecated
-    public DynamoDbMapperConfig(
-            PaginationLoadingStrategy paginationLoadingStrategy) {
-
-        this(null, null, null, null, null, paginationLoadingStrategy,
-             DEFAULT.getConversionSchema(), DEFAULT.batchWriteRetryStrategy(), DEFAULT.batchLoadRetryStrategy());
-    }
-
-    /**
-     * Constructs a new configuration object with the conversion schema given.
-     * @see DynamoDBConfig#builder
-     */
-    @Deprecated
-    public DynamoDbMapperConfig(ConversionSchema conversionschema) {
-        this(null, null, null, null, null, null,
-             conversionschema, DEFAULT.batchWriteRetryStrategy(), DEFAULT.batchLoadRetryStrategy());
-    }
-
-    /**
-     * Constructs a new configuration object from two others: a set of defaults
-     * and a set of overrides. Any non-null overrides will be applied to the
-     * defaults.
-     * <p>
-     * Used internally to merge the {@link DynamoDbMapperConfig} provided at
-     * construction with an overriding object for a particular operation.
-     *
-     * @param defaults
-     *            The default mapper configuration values.
-     * @param overrides
-     *            The overridden mapper configuration values. Any non-null
-     *            config settings will be applied to the returned object.
-     * @see DynamoDBConfig#builder
-     */
-    @Deprecated
-    public DynamoDbMapperConfig(
-            DynamoDbMapperConfig defaults,
-            DynamoDbMapperConfig overrides) {
-        this(builder().merge(defaults).merge(overrides));
-    }
-
-    /**
-     * Creates a new empty builder.
-     */
-    public static Builder builder() {
-        return new Builder(false);
-    }
-
-    /**
-     * Merges these configuration values with the specified overrides; may
-     * simply return this instance if overrides are the same or null.
-     * @param overrides The overrides to merge.
-     * @return This if the overrides are same or null, or a new merged config.
-     */
-    final DynamoDbMapperConfig merge(final DynamoDbMapperConfig overrides) {
-        return overrides == null || this.equals(overrides) ? this : builder().merge(this).merge(overrides).build();
-    }
-
-    public BatchLoadRetryStrategy batchLoadRetryStrategy() {
-        return batchLoadRetryStrategy;
-    }
-
-    /**
-     * Returns the save behavior for this configuration.
-     */
-    public SaveBehavior saveBehavior() {
-        return saveBehavior;
-    }
-
-    /**
-     * Returns the consistent read behavior for this configuration.
-     */
-    public ConsistentRead getConsistentRead() {
-        return consistentRead;
-    }
-
-    /**
-     * Returns the table name override for this configuration. This value will
-     * override the table name specified in a {@link DynamoDbTable} annotation,
-     * either by replacing the table name entirely or else by pre-pending a
-     * string to each table name. This is useful for partitioning data in
-     * multiple tables at runtime.
-     *
-     * @see TableNameOverride#withTableNamePrefix(String)
-     * @see TableNameOverride#withTableNameReplacement(String)
-     */
-    public TableNameOverride getTableNameOverride() {
-        return tableNameOverride;
-    }
-
-    /**
-     * Returns the table name resolver for this configuration. This value will
-     * be used to determine the table name for classes. It can be
-     * used for more powerful customization of table name than is possible using
-     * only {@link TableNameOverride}.
-     *
-     * @see TableNameResolver#getTableName(Class, DynamoDbMapperConfig)
-     */
-    public TableNameResolver getTableNameResolver() {
-        return tableNameResolver;
-    }
-
-    /**
-     * Returns the object table name resolver for this configuration. This value will
-     * be used to determine the table name for objects. It can be
-     * used for more powerful customization of table name than is possible using
-     * only {@link TableNameOverride}.
-     *
-     * @see ObjectTableNameResolver#getTableName(Object, DynamoDbMapperConfig)
-     */
-    public ObjectTableNameResolver getObjectTableNameResolver() {
-        return objectTableNameResolver;
-    }
-
-    /**
-     * Returns the pagination loading strategy for this configuration.
-     */
-    public PaginationLoadingStrategy getPaginationLoadingStrategy() {
-        return paginationLoadingStrategy;
-    }
-
-    /**
-     * @return the conversion schema for this config object
-     */
-    public ConversionSchema getConversionSchema() {
-        return conversionschema;
-    }
-
-    /**
-     * @return the BatchWriteRetryStrategy for this config object
-     */
-    public BatchWriteRetryStrategy batchWriteRetryStrategy() {
-        return batchWriteRetryStrategy;
-    }
-
-    /**
-     * @return the current type-converter factory
-     */
-    public final DynamoDbTypeConverterFactory getTypeConverterFactory() {
-        return typeConverterFactory;
-    }
-
-    /**
-     * Enumeration of behaviors for the save operation.
-     */
-    public enum SaveBehavior {
-        /**
-         * UPDATE will not affect unmodeled attributes on a save operation and a
-         * null value for the modeled attribute will remove it from that item in
-         * DynamoDB.
-         * <p>
-         * Because of the limitation of updateItem request, the implementation
-         * of UPDATE will send a putItem request when a key-only object is being
-         * saved, and it will send another updateItem request if the given
-         * key(s) already exists in the table.
-         * <p>
-         * By default, the mapper uses UPDATE.
-         */
-        UPDATE,
-
-        /**
-         * UPDATE_SKIP_NULL_ATTRIBUTES is similar to UPDATE, except that it
-         * ignores any null value attribute(s) and will NOT remove them from
-         * that item in DynamoDB. It also guarantees to send only one single
-         * updateItem request, no matter the object is key-only or not.
-         */
-        UPDATE_SKIP_NULL_ATTRIBUTES,
-
-        /**
-         * CLOBBER will clear and replace all attributes, included unmodeled
-         * ones, (delete and recreate) on save. Versioned field constraints will
-         * also be disregarded.
-         */
-        CLOBBER,
-
-        /**
-         * APPEND_SET treats scalar attributes (String, Number, Binary) the same
-         * as UPDATE_SKIP_NULL_ATTRIBUTES does. However, for set attributes, it
-         * will append to the existing attribute value, instead of overriding
-         * it. Caller needs to make sure that the modeled attribute type matches
-         * the existing set type, otherwise it would result in a service
-         * exception.
-         */
-        APPEND_SET;
-
-        private final DynamoDbMapperConfig config = builder().withSaveBehavior(this).build();
-
-        public final DynamoDbMapperConfig config() {
-            return this.config;
-        }
-    }
-
-    /**
-     * Enumeration of consistent read behavior.
-     * <p>
-     * CONSISTENT uses consistent reads, EVENTUAL does not. Consistent reads
-     * have implications for performance and billing; see the service
-     * documentation for details.
-     * <p>
-     * By default, the mapper uses eventual consistency.
-     */
-    public enum ConsistentRead {
-        CONSISTENT,
-        EVENTUAL;
-
-        private final DynamoDbMapperConfig config = builder().withConsistentReads(this).build();
-
-        public final DynamoDbMapperConfig config() {
-            return this.config;
-        }
-    }
-
-    /**
-     * Enumeration of pagination loading strategy.
-     */
-    public enum PaginationLoadingStrategy {
-        /**
-         * Paginated list is lazily loaded when possible, and all loaded results
-         * are kept in the memory.
-         * <p>
-         * By default, the mapper uses LAZY_LOADING.
-         */
-        LAZY_LOADING,
-
-        /**
-         * Only supports using iterator to read from the paginated list. All
-         * other list operations will return UnsupportedOperationException
-         * immediately. During the iteration, the list will clear all the
-         * previous results before loading the next page, so that the list will
-         * keep at most one page of the loaded results in memory. This also
-         * means the list could only be iterated once.
-         * <p>
-         * Use this configuration to reduce the memory overhead when handling
-         * large DynamoDB items.
-         */
-        ITERATION_ONLY,
-
-        /**
-         * Paginated list will eagerly load all the paginated results from
-         * DynamoDB as soon as the list is initialized.
-         */
-        EAGER_LOADING;
-
-        private final DynamoDbMapperConfig config = builder().withPaginationLoadingStrategy(this).build();
-
-        public final DynamoDbMapperConfig config() {
-            return this.config;
-        }
-    }
-
-    /**
-     * Interface for a strategy used to determine the table name of an object based on it's class.
-     * This resolver is used when an object isn't available such as in
-     * {@link DynamoDbMapper#query(Class, DynamoDbQueryExpression)}
-     *
-     * @see ObjectTableNameResolver
-     * @author Raniz
-     */
-    public interface TableNameResolver {
-
-        /**
-         * Get the table name for a class. This method is used when an object is not available
-         * such as when creating requests for scan or query operations.
-         *
-         * @param clazz The class to get the table name for
-         * @param config The {@link DynamoDbMapperConfig}
-         * @return The table name to use for instances of clazz
-         */
-        String getTableName(Class<?> clazz, DynamoDbMapperConfig config);
-    }
-
-    /**
-     * Interface for a strategy used to determine the table name of an object based on it's class.
-     * This resolver is used when an object is available such as in
-     * {@link DynamoDbMapper#316
-     * (java.util.List)}.
-     *
-     * If no table name resolver for objects is set, {@link DynamoDbMapper} reverts to using the
-     * {@link TableNameResolver} on each object's class.
-     *
-     * @see TableNameResolver
-     * @author Raniz
-     */
-    public interface ObjectTableNameResolver {
-
-        /**
-         * Get the table name for an object.
-         *
-         * @param object The object to get the table name for
-         * @param config The {@link DynamoDbMapperConfig}
-         * @return The table name to use for object
-         */
-        String getTableName(Object object, DynamoDbMapperConfig config);
-
-    }
-
-    /**
-     * DynamoDBMapper#batchWrite takes arbitrary number of save/delete requests
-     * and breaks them into smaller chunks that can be accepted by the service
-     * API. Each chunk will be sent to DynamoDB via the BatchWriteItem API, and
-     * if it fails because the table's provisioned throughput is exceeded or an
-     * internal processing failure occurs, the failed requests are returned in
-     * the UnprocessedItems response parameter. This interface allows you to
-     * control the retry strategy when such scenario occurs.
-     *
-     * @see DynamoDbMapper#batchWrite(List, List, DynamoDbMapperConfig)
-     * @see <a href="http://docs.aws.amazon.com/amazondynamodb/latest/APIReference/API_BatchWriteItem.html">DynamoDB service API reference -- BatchWriteItem</a>
-     */
-    public interface BatchWriteRetryStrategy {
-
-        /**
-         * Returns the max number of retries to be performed if the service
-         * returns UnprocessedItems in the response.
-         *
-         * @param batchWriteItemInput
-         *            the one batch of write requests that is being sent to the
-         *            BatchWriteItem API.
-         * @return max number of retries to be performed if the service returns
-         *         UnprocessedItems in the response, or a negative value if you
-         *         want it to keep retrying until all the UnprocessedItems are
-         *         fulfilled.
-         */
-        int maxRetryOnUnprocessedItems(
-            Map<String, List<WriteRequest>> batchWriteItemInput);
-
-        /**
-         * Returns the delay (in milliseconds) before retrying on
-         * UnprocessedItems.
-         *
-         * @param unprocessedItems
-         *            the UnprocessedItems returned by the service in the last
-         *            BatchWriteItem call
-         * @param retriesAttempted
-         *            The number of times we have attempted to resend
-         *            UnprocessedItems.
-         * @return the delay (in milliseconds) before resending
-         *         UnprocessedItems.
-         */
-        long getDelayBeforeRetryUnprocessedItems(
-            Map<String, List<WriteRequest>> unprocessedItems,
-            int retriesAttempted);
-    }
-
-    /**
-     * {@link DynamoDbMapper#batchLoad(List)} breaks the requested items in batches of maximum size 100.
-     * When calling the Dyanmo Db client, there is a chance that due to throttling, some unprocessed keys will be returned.
-     * This interfaces controls whether we need to retry these unprocessed keys and it also controls the strategy as to how
-     * retries should be handled.
-     */
-    public interface BatchLoadRetryStrategy {
-        /**
-         * Checks if the batch load request should be retried.
-         * @param batchLoadContext see {@link BatchLoadContext}
-         *
-         * @return a boolean true or false value.
-         */
-        boolean shouldRetry(BatchLoadContext batchLoadContext);
-
-        /**
-         * Returns delay(in milliseconds) before retrying Unprocessed keys
-         *
-         * @param batchLoadContext see {@link BatchLoadContext}
-         * @return delay(in milliseconds) before attempting to read unprocessed keys
-         */
-        long getDelayBeforeNextRetry(BatchLoadContext batchLoadContext);
-    }
-
-    /**
-     * A fluent builder for DynamoDBMapperConfig objects.
-     */
-    public static class Builder {
-
-        private SaveBehavior saveBehavior;
-        private ConsistentRead consistentRead;
-        private TableNameOverride tableNameOverride;
-        private TableNameResolver tableNameResolver;
-        private ObjectTableNameResolver objectTableNameResolver;
-        private PaginationLoadingStrategy paginationLoadingStrategy;
-        private ConversionSchema conversionschema;
-        private BatchWriteRetryStrategy batchWriteRetryStrategy;
-        private BatchLoadRetryStrategy batchLoadRetryStrategy;
-        private DynamoDbTypeConverterFactory typeConverterFactory;
-
-        /**
-         * Creates a new builder initialized with the {@link #DEFAULT} values.
-         */
-        public Builder() {
-            this(true);
-        }
-
-        /**
-         * Creates a new builder, optionally initialized with the defaults.
-         */
-        private Builder(final boolean defaults) {
-            if (defaults == true) {
-                saveBehavior = DEFAULT.saveBehavior();
-                consistentRead = DEFAULT.getConsistentRead();
-                paginationLoadingStrategy = DEFAULT.getPaginationLoadingStrategy();
-                conversionschema = DEFAULT.getConversionSchema();
-                batchWriteRetryStrategy = DEFAULT.batchWriteRetryStrategy();
-                batchLoadRetryStrategy = DEFAULT.batchLoadRetryStrategy();
-            }
-        }
-
-        /**
-         * Merges any non-null configuration values for the specified overrides.
-         */
-        private Builder merge(final DynamoDbMapperConfig o) {
-            if (o == null) {
-                return this;
-            }
-            if (o.saveBehavior != null) {
-                saveBehavior = o.saveBehavior;
-            }
-            if (o.consistentRead != null) {
-                consistentRead = o.consistentRead;
-            }
-            if (o.tableNameOverride != null) {
-                tableNameOverride = o.tableNameOverride;
-            }
-            if (o.tableNameResolver != null) {
-                tableNameResolver = o.tableNameResolver;
-            }
-            if (o.objectTableNameResolver != null) {
-                objectTableNameResolver = o.objectTableNameResolver;
-            }
-            if (o.paginationLoadingStrategy != null) {
-                paginationLoadingStrategy = o.paginationLoadingStrategy;
-            }
-            if (o.conversionschema != null) {
-                conversionschema = o.conversionschema;
-            }
-            if (o.batchWriteRetryStrategy != null) {
-                batchWriteRetryStrategy = o.batchWriteRetryStrategy;
-            }
-            if (o.batchLoadRetryStrategy != null) {
-                batchLoadRetryStrategy = o.batchLoadRetryStrategy;
-            }
-            if (o.typeConverterFactory != null) {
-                typeConverterFactory = o.typeConverterFactory;
-            }
-            return this;
-        }
-
-        /**
-         * @return the currently-configured save behavior
-         */
-        public SaveBehavior saveBehavior() {
-            return saveBehavior;
-        }
-
-        /**
-         * @param value the new save behavior
-         */
-        public void setSaveBehavior(SaveBehavior value) {
-            saveBehavior = value;
-        }
-
-        /**
-         * @param value the new save behavior
-         * @return this builder
-         */
-        public Builder withSaveBehavior(SaveBehavior value) {
-            setSaveBehavior(value);
-            return this;
-        }
-
-
-        /**
-         * Returns the consistent read behavior. Currently
-         * this value is applied only in load and batch load operations of the
-         * DynamoDBMapper.
-         * @return the currently-configured consistent read behavior.
-         */
-        public ConsistentRead getConsistentRead() {
-            return consistentRead;
-        }
-
-        /**
-         * Sets the consistent read behavior. Currently
-         * this value is applied only in load and batch load operations of the
-         * DynamoDBMapper.
-         * @param value the new consistent read behavior.
-         */
-        public void setConsistentRead(ConsistentRead value) {
-            consistentRead = value;
-        }
-
-        /**
-         * Sets the consistent read behavior. Currently
-         * this value is applied only in load and batch load operations of the
-         * DynamoDBMapper.
-         * @param value the new consistent read behavior
-         * @return this builder.
-         *
-         */
-        public Builder withConsistentReads(ConsistentRead value) {
-            setConsistentRead(value);
-            return this;
-        }
-
-
-        /**
-         * @return the current table name override
-         */
-        public TableNameOverride getTableNameOverride() {
-            return tableNameOverride;
-        }
-
-        /**
-         * @param value the new table name override
-         */
-        public void setTableNameOverride(TableNameOverride value) {
-            tableNameOverride = value;
-        }
-
-        /**
-         * @param value the new table name override
-         * @return this builder
-         */
-        public Builder withTableNameOverride(TableNameOverride value) {
-            setTableNameOverride(value);
-            return this;
-        }
-
-
-        /**
-         * @return the current table name resolver
-         */
-        public TableNameResolver getTableNameResolver() {
-            return tableNameResolver;
-        }
-
-        /**
-         * @param value the new table name resolver
-         */
-        public void setTableNameResolver(TableNameResolver value) {
-            tableNameResolver = value;
-        }
-
-        /**
-         * @param value the new table name resolver
-         * @return this builder
-         */
-        public Builder withTableNameResolver(TableNameResolver value) {
-            setTableNameResolver(value);
-            return this;
-        }
-
-
-        /**
-         * @return the current object table name resolver
-         */
-        public ObjectTableNameResolver getObjectTableNameResolver() {
-            return objectTableNameResolver;
-        }
-
-        /**
-         * @param value the new object table name resolver
-         */
-        public void setObjectTableNameResolver(ObjectTableNameResolver value) {
-            objectTableNameResolver = value;
-        }
-
-        /**
-         * @param value the new object table name resolver
-         * @return this builder
-         */
-        public Builder withObjectTableNameResolver(ObjectTableNameResolver value) {
-            setObjectTableNameResolver(value);
-            return this;
-        }
-
-        /**
-         * @return the currently-configured pagination loading strategy
-         */
-        public PaginationLoadingStrategy getPaginationLoadingStrategy() {
-            return paginationLoadingStrategy;
-        }
-
-        /**
-         * @param value the new pagination loading strategy
-         */
-        public void setPaginationLoadingStrategy(
-                PaginationLoadingStrategy value) {
-
-            paginationLoadingStrategy = value;
-        }
-
-        /**
-         * @param value the new pagination loading strategy
-         * @return this builder
-         */
-        public Builder withPaginationLoadingStrategy(
-                PaginationLoadingStrategy value) {
-
-            setPaginationLoadingStrategy(value);
-            return this;
-        }
-
-        /**
-         * @return the current conversion schema
-         */
-        public ConversionSchema getConversionSchema() {
-            return conversionschema;
-        }
-
-        /**
-         * @param value the new conversion schema
-         */
-        public void setConversionSchema(ConversionSchema value) {
-            conversionschema = value;
-        }
-
-        /**
-         * @param value the new conversion schema
-         * @return this builder
-         */
-        public Builder withConversionSchema(ConversionSchema value) {
-            setConversionSchema(value);
-            return this;
-        }
-
-        /**
-         * @return the current BatchWriteRetryStrategy
-         */
-        public BatchWriteRetryStrategy batchWriteRetryStrategy() {
-            return batchWriteRetryStrategy;
-        }
-
-        /**
-         * @param value the new BatchWriteRetryStrategy
-         */
-        public void setBatchWriteRetryStrategy(
-                BatchWriteRetryStrategy value) {
-            this.batchWriteRetryStrategy = value;
-        }
-
-        /**
-         * @param value the new BatchWriteRetryStrategy
-         * @return this builder
-         */
-        public Builder withBatchWriteRetryStrategy(
-                BatchWriteRetryStrategy value) {
-            setBatchWriteRetryStrategy(value);
-            return this;
-        }
-
-        public BatchLoadRetryStrategy batchLoadRetryStrategy() {
-            return batchLoadRetryStrategy;
-        }
-
-        /**
-         * @param value the new BatchLoadRetryStrategy
-         */
-        public void setBatchLoadRetryStrategy(
-                BatchLoadRetryStrategy value) {
-            this.batchLoadRetryStrategy = value;
-        }
-
-        /**
-         * @param value the new BatchLoadRetryStrategy
-         * @return this builder
-         */
-        public Builder withBatchLoadRetryStrategy(
-                BatchLoadRetryStrategy value) {
-            //set the no retry strategy if the user overrides the default with null
-            if (value == null) {
-                value = NoRetryBatchLoadRetryStrategy.INSTANCE;
-            }
-            setBatchLoadRetryStrategy(value);
-            return this;
-        }
-
-        /**
-         * @return the current type-converter factory
-         */
-        public final DynamoDbTypeConverterFactory getTypeConverterFactory() {
-            return typeConverterFactory;
-        }
-
-        /**
-         * @param value the new type-converter factory
-         */
-        public final void setTypeConverterFactory(DynamoDbTypeConverterFactory value) {
-            this.typeConverterFactory = value;
-        }
-
-        /**
-         * The type-converter factory for scalar conversions.
-         * <p>To override standard type-conversions,</p>
-         * <pre class="brush: java">
-         * DynamoDBMapperConfig config = DynamoDBMapperConfig.builder()
-         *     .withTypeConverterFactory(DynamoDBTypeConverterFactory.standard().override()
-         *         .with(String.class, MyObject.class, new StringToMyObjectConverter())
-         *         .build())
-         *     .build();
-         * </pre>
-         * <p>Then, on the property, specify the attribute binding,</p>
-         * <pre class="brush: java">
-         * &#064;DynamoDBTyped(DynamoDBAttributeType.S)
-         * public MyObject myObject()
-         * </pre>
-         * @param value the new type-converter factory
-         * @return this builder
-         */
-        public final Builder withTypeConverterFactory(DynamoDbTypeConverterFactory value) {
-            setTypeConverterFactory(value);
-            return this;
-        }
-
-        /**
-         * Builds a new {@code DynamoDBMapperConfig} object.
-         *
-         * @return the new, immutable config object
-         */
-        public DynamoDbMapperConfig build() {
-            return new DynamoDbMapperConfig(this);
-        }
-    }
-
-    /**
-     * Allows overriding the table name declared on a domain class by the
-     * {@link DynamoDbTable} annotation.
-     */
-    public static final class TableNameOverride {
-
-        private final String tableNameOverride;
-        private final String tableNamePrefix;
-        private final DynamoDbMapperConfig config = builder().withTableNameOverride(this).build();
-
-        private TableNameOverride(String tableNameOverride, String tableNamePrefix) {
-            this.tableNameOverride = tableNameOverride;
-            this.tableNamePrefix = tableNamePrefix;
-        }
-
-        /**
-         * @see TableNameOverride#withTableNameReplacement(String)
-         */
-        public TableNameOverride(String tableNameOverride) {
-            this(tableNameOverride, null);
-        }
-
-        /**
-         * Returns a new {@link TableNameOverride} object that will prepend the
-         * given string to every table name.
-         */
-        public static TableNameOverride withTableNamePrefix(
-                String tableNamePrefix) {
-
-            return new TableNameOverride(null, tableNamePrefix);
-        }
-
-        /**
-         * Returns a new {@link TableNameOverride} object that will replace
-         * every table name in requests with the given string.
-         */
-        public static TableNameOverride withTableNameReplacement(
-                String tableNameReplacement) {
-
-            return new TableNameOverride(tableNameReplacement, null);
-        }
-
-        /**
-         * Returns the table name to use for all requests. Exclusive with
-         * {@link TableNameOverride#getTableNamePrefix()}
-         *
-         * @see DynamoDbMapperConfig#getTableNameOverride()
-         */
-        public String getTableName() {
-            return tableNameOverride;
-        }
-
-        /**
-         * Returns the table name prefix to prepend the table name for all
-         * requests. Exclusive with {@link TableNameOverride#getTableName()}
-         *
-         * @see DynamoDbMapperConfig#getTableNameOverride()
-         */
-        public String getTableNamePrefix() {
-            return tableNamePrefix;
-        }
-
-        public DynamoDbMapperConfig config() {
-            return this.config;
-        }
-    }
-
-    /**
-     * Default implementation of {@link TableNameResolver} that mimics the behavior
-     * of DynamoDBMapper before the addition of {@link TableNameResolver}.
-     *
-     * @author Raniz
-     */
-    public static class DefaultTableNameResolver implements TableNameResolver {
-        public static final DefaultTableNameResolver INSTANCE = new DefaultTableNameResolver();
-        private final DynamoDbMapperConfig config = builder().withTableNameResolver(this).build();
-
-        @Override
-        public String getTableName(Class<?> clazz, DynamoDbMapperConfig config) {
-            final TableNameOverride override = config.getTableNameOverride();
-
-            if (override != null) {
-                final String tableName = override.getTableName();
-                if (tableName != null) {
-                    return tableName;
-                }
-            }
-
-            final StandardBeanProperties.Beans<?> beans = StandardBeanProperties.of(clazz);
-            if (beans.properties().tableName() == null) {
-                throw new DynamoDbMappingException(clazz + " not annotated with @DynamoDBTable");
-            }
-
-            final String prefix = override == null ? null : override.getTableNamePrefix();
-            return prefix == null ? beans.properties().tableName() : prefix + beans.properties().tableName();
-        }
-
-        public final DynamoDbMapperConfig config() {
-            return this.config;
-        }
-    }
-
-    /**
-     * This strategy, like name suggests will not attempt any retries on Unprocessed keys
-     *
-     * @author smihir
-     *
-     */
-    public static class NoRetryBatchLoadRetryStrategy implements BatchLoadRetryStrategy {
-        public static final NoRetryBatchLoadRetryStrategy INSTANCE = new NoRetryBatchLoadRetryStrategy();
-        private final DynamoDbMapperConfig config = builder().withBatchLoadRetryStrategy(this).build();
-
-        /* (non-Javadoc)
-         * @see BatchLoadRetryStrategy#maxRetryOnUnprocessedKeys(java.util.Map, java.util.Map)
-         */
-        @Override
-        public boolean shouldRetry(final BatchLoadContext batchLoadContext) {
-            return false;
-        }
-
-        /* (non-Javadoc)
-         * @see BatchLoadRetryStrategy#getDelayBeforeNextRetry(java.util.Map, int)
-         */
-        @Override
-        public long getDelayBeforeNextRetry(final BatchLoadContext batchLoadContext) {
-            return -1;
-        }
-
-        public final DynamoDbMapperConfig config() {
-            return this.config;
-        }
-    }
-
-    /**
-     * This is the default strategy.
-     * If unprocessed keys is equal to requested keys, the request will retried 5 times with a back off strategy
-     * with maximum back off of 3 seconds
-     * If few of the keys have been processed, the retries happen without a delay.
-     *
-     * @author smihir
-     *
-     */
-    public static class DefaultBatchLoadRetryStrategy implements BatchLoadRetryStrategy {
-        public static final DefaultBatchLoadRetryStrategy INSTANCE = new DefaultBatchLoadRetryStrategy();
-
-        private static final int MAX_RETRIES = 5;
-        private static final long MAX_BACKOFF_IN_MILLISECONDS = 1000 * 3L;
-        private final DynamoDbMapperConfig config = builder().withBatchLoadRetryStrategy(this).build();
-
-        @Override
-        public long getDelayBeforeNextRetry(final BatchLoadContext batchLoadContext) {
-            Map<String, KeysAndAttributes> requestedKeys = batchLoadContext.batchGetItemRequest().requestItems();
-            Map<String, KeysAndAttributes> unprocessedKeys = batchLoadContext.batchGetItemResponse()
-                                                                             .unprocessedKeys();
-
-            long delay = 0;
-            //Exponential backoff only when all keys are unprocessed
-            if (unprocessedKeys != null && requestedKeys != null && unprocessedKeys.size() == requestedKeys.size()) {
-                Random random = new SecureRandom();
-                long scaleFactor = 500L + random.nextInt(100);
-                int retriesAttempted = batchLoadContext.getRetriesAttempted();
-                delay = (long) (Math.pow(2, retriesAttempted) * scaleFactor);
-                delay = Math.min(delay, MAX_BACKOFF_IN_MILLISECONDS);
-            }
-            return delay;
-        }
-
-        @Override
-        public boolean shouldRetry(BatchLoadContext batchLoadContext) {
-            Map<String, KeysAndAttributes> unprocessedKeys = batchLoadContext.batchGetItemResponse().unprocessedKeys();
-            return unprocessedKeys != null && unprocessedKeys.size() > 0 && batchLoadContext.getRetriesAttempted() < MAX_RETRIES;
-        }
-
-        public final DynamoDbMapperConfig config() {
-            return this.config;
-        }
-    }
-
-    /**
-     * The default BatchWriteRetryStrategy which always retries on
-     * UnprocessedItem up to a maximum number of times and use exponential
-     * backoff with random scale factor.
-     */
-    public static class DefaultBatchWriteRetryStrategy implements BatchWriteRetryStrategy {
-        public static final DefaultBatchWriteRetryStrategy INSTANCE = new DefaultBatchWriteRetryStrategy();
-
-        private static final long MAX_BACKOFF_IN_MILLISECONDS = 1_000 * 3L;
-        private static final int DEFAULT_MAX_RETRY = -1;
-
-        private final int maxRetry;
-        private final DynamoDbMapperConfig config = builder().withBatchWriteRetryStrategy(this).build();
-
-        /**
-         * Keep retrying until success, with default backoff.
-         */
-        public DefaultBatchWriteRetryStrategy() {
-            this(DEFAULT_MAX_RETRY);
-        }
-
-        public DefaultBatchWriteRetryStrategy(int maxRetry) {
-            this.maxRetry = maxRetry;
-        }
-
-        @Override
-        public int maxRetryOnUnprocessedItems(
-                Map<String, List<WriteRequest>> batchWriteItemInput) {
-            return maxRetry;
-        }
-
-        @Override
-        public long getDelayBeforeRetryUnprocessedItems(
-                Map<String, List<WriteRequest>> unprocessedItems,
-                int retriesAttempted) {
-
-            if (retriesAttempted < 0) {
-                return 0;
-            }
-
-            Random random = new SecureRandom();
-            long scaleFactor = 1_000L + random.nextInt(200);
-            long delay = (long) (Math.pow(2, retriesAttempted) * scaleFactor);
-            return Math.min(delay, MAX_BACKOFF_IN_MILLISECONDS);
-        }
-
-        public final DynamoDbMapperConfig config() {
-            return this.config;
-        }
-    }
-
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbMapperFieldModel.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbMapperFieldModel.java
deleted file mode 100644
index 991f2d32a03d..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbMapperFieldModel.java
+++ /dev/null
@@ -1,514 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-import static software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbAutoGenerateStrategy.ALWAYS;
-import static software.amazon.awssdk.services.dynamodb.datamodeling.StandardTypeConverters.Vector.LIST;
-import static software.amazon.awssdk.services.dynamodb.model.ComparisonOperator.BEGINS_WITH;
-import static software.amazon.awssdk.services.dynamodb.model.ComparisonOperator.BETWEEN;
-import static software.amazon.awssdk.services.dynamodb.model.ComparisonOperator.CONTAINS;
-import static software.amazon.awssdk.services.dynamodb.model.ComparisonOperator.EQ;
-import static software.amazon.awssdk.services.dynamodb.model.ComparisonOperator.GE;
-import static software.amazon.awssdk.services.dynamodb.model.ComparisonOperator.GT;
-import static software.amazon.awssdk.services.dynamodb.model.ComparisonOperator.IN;
-import static software.amazon.awssdk.services.dynamodb.model.ComparisonOperator.LE;
-import static software.amazon.awssdk.services.dynamodb.model.ComparisonOperator.LT;
-import static software.amazon.awssdk.services.dynamodb.model.ComparisonOperator.NE;
-import static software.amazon.awssdk.services.dynamodb.model.ComparisonOperator.NOT_CONTAINS;
-import static software.amazon.awssdk.services.dynamodb.model.ComparisonOperator.NOT_NULL;
-import static software.amazon.awssdk.services.dynamodb.model.ComparisonOperator.NULL;
-
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-import software.amazon.awssdk.services.dynamodb.model.Condition;
-import software.amazon.awssdk.services.dynamodb.model.KeyType;
-
-/**
- * Field model.
- *
- * @param <T> The object type.
- * @param <V> The field model type.
- */
-public class DynamoDbMapperFieldModel<T, V> implements DynamoDbAutoGenerator<V>, DynamoDbTypeConverter<AttributeValue, V> {
-
-    private final DynamoDbMapperFieldModel.Properties<V> properties;
-
-
-    private final DynamoDbTypeConverter<AttributeValue, V> converter;
-    private final DynamoDbAttributeType attributeType;
-    private final DynamoDbMapperFieldModel.Reflect<T, V> reflect;
-
-    /**
-     * Creates a new field model instance.
-     * @param builder The builder.
-     */
-    private DynamoDbMapperFieldModel(final DynamoDbMapperFieldModel.Builder<T, V> builder) {
-        this.properties = builder.properties;
-        this.converter = builder.converter;
-        this.attributeType = builder.attributeType;
-        this.reflect = builder.reflect;
-    }
-
-    /**
-     * @deprecated replaced by {@link DynamoDbMapperFieldModel#name}
-     */
-    @Deprecated
-    public String getDynamoDbAttributeName() {
-        return properties.attributeName();
-    }
-
-    /**
-     * @deprecated replaced by {@link DynamoDbMapperFieldModel#attributeType}
-     */
-    @Deprecated
-    public DynamoDbAttributeType getDynamoDbAttributeType() {
-        return attributeType;
-    }
-
-    /**
-     * Gets the attribute name.
-     * @return The attribute name.
-     */
-    public final String name() {
-        return properties.attributeName();
-    }
-
-    /**
-     * Gets the value from the object instance.
-     * @param object The object instance.
-     * @return The value.
-     */
-    public final V get(final T object) {
-        return reflect.get(object);
-    }
-
-    /**
-     * Sets the value on the object instance.
-     * @param object The object instance.
-     * @param value The value.
-     */
-    public final void set(final T object, final V value) {
-        reflect.set(object, value);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public final DynamoDbAutoGenerateStrategy getGenerateStrategy() {
-        if (properties.autoGenerator() != null) {
-            return properties.autoGenerator().getGenerateStrategy();
-        }
-        return null;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public final V generate(final V currentValue) {
-        return properties.autoGenerator().generate(currentValue);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public final AttributeValue convert(final V object) {
-        AttributeValue v = converter.convert(object);
-        return v;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public final V unconvert(final AttributeValue object) {
-        return converter.unconvert(object);
-    }
-
-    /**
-     * Get the current value from the object and convert it.
-     * @param object The object instance.
-     * @return The converted value.
-     */
-    public final AttributeValue getAndConvert(final T object) {
-        return convert(get(object));
-    }
-
-    /**
-     * Unconverts the value and sets it on the object.
-     * @param object The object instance.
-     * @param value The attribute value.
-     */
-    public final void unconvertAndSet(final T object, final AttributeValue value) {
-        set(object, unconvert(value));
-    }
-
-    /**
-     * Gets the DynamoDB attribute type.
-     * @return The DynamoDB attribute type.
-     */
-    public final DynamoDbAttributeType attributeType() {
-        return attributeType;
-    }
-
-    /**
-     * Gets the key type.
-     * @return The key type if a key field, null otherwise.
-     */
-    public final KeyType keyType() {
-        return properties.keyType();
-    }
-
-    /**
-     * Indicates if this attribute is a version attribute.
-     * @return True if it is, false otherwise.
-     */
-    public final boolean versioned() {
-        return properties.versioned();
-    }
-
-    /**
-     * Gets the global secondary indexes.
-     * @param keyType The key type.
-     * @return The list of global secondary indexes.
-     */
-    public final List<String> globalSecondaryIndexNames(final KeyType keyType) {
-        if (properties.globalSecondaryIndexNames().containsKey(keyType)) {
-            return properties.globalSecondaryIndexNames().get(keyType);
-        }
-        return Collections.emptyList();
-    }
-
-    /**
-     * Gets the local secondary indexes.
-     * @return The list of local secondary indexes.
-     */
-    public final List<String> localSecondaryIndexNames() {
-        return properties.localSecondaryIndexNames();
-    }
-
-    /**
-     * Returns true if the field has any indexes.
-     * @return True if the propery matches.
-     */
-    public final boolean indexed() {
-        return !properties.globalSecondaryIndexNames().isEmpty() || !properties.localSecondaryIndexNames().isEmpty();
-    }
-
-    /**
-     * Creates a condition which filters on the specified value.
-     * @param value The value.
-     * @return The condition.
-     * @see software.amazon.awssdk.services.dynamodb.model.ComparisonOperator#BEGINS_WITH
-     * @see software.amazon.awssdk.services.dynamodb.model.Condition
-     */
-    public final Condition beginsWith(final V value) {
-        return Condition.builder().comparisonOperator(BEGINS_WITH).attributeValueList(convert(value)).build();
-    }
-
-    /**
-     * Creates a condition which filters on the specified values.
-     * @param lo The start of the range (inclusive).
-     * @param hi The end of the range (inclusive).
-     * @return The condition.
-     * @see software.amazon.awssdk.services.dynamodb.model.ComparisonOperator#BETWEEN
-     * @see software.amazon.awssdk.services.dynamodb.model.Condition
-     */
-    public final Condition between(final V lo, final V hi) {
-        return Condition.builder().comparisonOperator(BETWEEN).attributeValueList(convert(lo), convert(hi)).build();
-    }
-
-    /**
-     * Creates a condition which filters on the specified value.
-     * @param value The value.
-     * @return The condition.
-     * @see software.amazon.awssdk.services.dynamodb.model.ComparisonOperator#CONTAINS
-     * @see software.amazon.awssdk.services.dynamodb.model.Condition
-     */
-    public final Condition contains(final V value) {
-        return Condition.builder().comparisonOperator(CONTAINS).attributeValueList(convert(value)).build();
-    }
-
-    /**
-     * Creates a condition which filters on the specified value.
-     * @param value The value.
-     * @return The condition.
-     * @see software.amazon.awssdk.services.dynamodb.model.ComparisonOperator#EQ
-     * @see software.amazon.awssdk.services.dynamodb.model.Condition
-     */
-    public final Condition eq(final V value) {
-        return Condition.builder().comparisonOperator(EQ).attributeValueList(convert(value)).build();
-    }
-
-    /**
-     * Creates a condition which filters on the specified value.
-     * @param value The value.
-     * @return The condition.
-     * @see software.amazon.awssdk.services.dynamodb.model.ComparisonOperator#GE
-     * @see software.amazon.awssdk.services.dynamodb.model.Condition
-     */
-    public final Condition ge(final V value) {
-        return Condition.builder().comparisonOperator(GE).attributeValueList(convert(value)).build();
-    }
-
-    /**
-     * Creates a condition which filters on the specified value.
-     * @param value The value.
-     * @return The condition.
-     * @see software.amazon.awssdk.services.dynamodb.model.ComparisonOperator#GT
-     * @see software.amazon.awssdk.services.dynamodb.model.Condition
-     */
-    public final Condition gt(final V value) {
-        return Condition.builder().comparisonOperator(GT).attributeValueList(convert(value)).build();
-    }
-
-    /**
-     * Creates a condition which filters on the specified values.
-     * @param values The values.
-     * @return The condition.
-     * @see software.amazon.awssdk.services.dynamodb.model.ComparisonOperator#IN
-     * @see software.amazon.awssdk.services.dynamodb.model.Condition
-     */
-    public final Condition in(final Collection<V> values) {
-        return Condition.builder().comparisonOperator(IN).attributeValueList(LIST.convert(values, this)).build();
-    }
-
-    /**
-     * Creates a condition which filters on the specified values.
-     * @param values The values.
-     * @return The condition.
-     * @see software.amazon.awssdk.services.dynamodb.model.ComparisonOperator#IN
-     * @see software.amazon.awssdk.services.dynamodb.model.Condition
-     */
-    public final Condition in(final V... values) {
-        return in(Arrays.asList(values));
-    }
-
-    /**
-     * Creates a condition which filters on the specified value.
-     * @return The condition.
-     * @see software.amazon.awssdk.services.dynamodb.model.ComparisonOperator#NULL
-     * @see software.amazon.awssdk.services.dynamodb.model.Condition
-     */
-    public final Condition isNull() {
-        return Condition.builder().comparisonOperator(NULL).build();
-    }
-
-    /**
-     * Creates a condition which filters on the specified value.
-     * @param value The value.
-     * @return The condition.
-     * @see software.amazon.awssdk.services.dynamodb.model.ComparisonOperator#LE
-     * @see software.amazon.awssdk.services.dynamodb.model.Condition
-     */
-    public final Condition le(final V value) {
-        return Condition.builder().comparisonOperator(LE).attributeValueList(convert(value)).build();
-    }
-
-    /**
-     * Creates a condition which filters on the specified value.
-     * @param value The value.
-     * @return The condition.
-     * @see software.amazon.awssdk.services.dynamodb.model.ComparisonOperator#LT
-     * @see software.amazon.awssdk.services.dynamodb.model.Condition
-     */
-    public final Condition lt(final V value) {
-        return Condition.builder().comparisonOperator(LT).attributeValueList(convert(value)).build();
-    }
-
-    /**
-     * Creates a condition which filters on the specified value.
-     * @param value The value.
-     * @return The condition.
-     * @see software.amazon.awssdk.services.dynamodb.model.ComparisonOperator#NE
-     * @see software.amazon.awssdk.services.dynamodb.model.Condition
-     */
-    public final Condition ne(final V value) {
-        return Condition.builder().comparisonOperator(NE).attributeValueList(convert(value)).build();
-    }
-
-    /**
-     * Creates a condition which filters on the specified value.
-     * @param value The value.
-     * @return The condition.
-     * @see software.amazon.awssdk.services.dynamodb.model.ComparisonOperator#NOT_CONTAINS
-     * @see software.amazon.awssdk.services.dynamodb.model.Condition
-     */
-    public final Condition notContains(final V value) {
-        return Condition.builder().comparisonOperator(NOT_CONTAINS).attributeValueList(convert(value)).build();
-    }
-
-    /**
-     * Creates a condition which filters on the specified value.
-     * @return The condition.
-     * @see software.amazon.awssdk.services.dynamodb.model.ComparisonOperator#NOT_NULL
-     * @see software.amazon.awssdk.services.dynamodb.model.Condition
-     */
-    public final Condition notNull() {
-        return Condition.builder().comparisonOperator(NOT_NULL).build();
-    }
-
-    /**
-     * Creates a condition which filters on any non-null argument; if {@code lo}
-     * is null a {@code LE} condition is applied on {@code hi}, if {@code hi}
-     * is null a {@code GE} condition is applied on {@code lo}.
-     * @param lo The start of the range (inclusive).
-     * @param hi The end of the range (inclusive).
-     * @return The condition or null if both arguments are null.
-     * @see software.amazon.awssdk.services.dynamodb.model.ComparisonOperator#BETWEEN
-     * @see software.amazon.awssdk.services.dynamodb.model.ComparisonOperator#EQ
-     * @see software.amazon.awssdk.services.dynamodb.model.ComparisonOperator#GE
-     * @see software.amazon.awssdk.services.dynamodb.model.ComparisonOperator#LE
-     * @see software.amazon.awssdk.services.dynamodb.model.Condition
-     */
-    public final Condition betweenAny(final V lo, final V hi) {
-        return lo == null ? (hi == null ? null : le(hi)) : (hi == null ? ge(lo) : (lo.equals(hi) ? eq(lo) : between(lo, hi)));
-    }
-
-    public enum DynamoDbAttributeType {
-        B, N, S, BS, NS, SS, BOOL, NULL, L, M
-    }
-
-    /**
-     * The field model properties.
-     */
-    interface Properties<V> {
-        String attributeName();
-
-        KeyType keyType();
-
-        boolean versioned();
-
-        Map<KeyType, List<String>> globalSecondaryIndexNames();
-
-        List<String> localSecondaryIndexNames();
-
-        DynamoDbAutoGenerator<V> autoGenerator();
-
-        final class Immutable<V> implements Properties<V> {
-            private final String attributeName;
-            private final KeyType keyType;
-            private final boolean versioned;
-            private final Map<KeyType, List<String>> globalSecondaryIndexNames;
-            private final List<String> localSecondaryIndexNames;
-            private final DynamoDbAutoGenerator<V> autoGenerator;
-
-            Immutable(final Properties<V> properties) {
-                this.attributeName = properties.attributeName();
-                this.keyType = properties.keyType();
-                this.versioned = properties.versioned();
-                this.globalSecondaryIndexNames = properties.globalSecondaryIndexNames();
-                this.localSecondaryIndexNames = properties.localSecondaryIndexNames();
-                this.autoGenerator = properties.autoGenerator();
-            }
-
-            @Override
-            public String attributeName() {
-                return this.attributeName;
-            }
-
-            @Override
-            public KeyType keyType() {
-                return this.keyType;
-            }
-
-            @Override
-            public boolean versioned() {
-                return this.versioned;
-            }
-
-            @Override
-            public Map<KeyType, List<String>> globalSecondaryIndexNames() {
-                return this.globalSecondaryIndexNames;
-            }
-
-            @Override
-            public List<String> localSecondaryIndexNames() {
-                return this.localSecondaryIndexNames;
-            }
-
-            @Override
-            public DynamoDbAutoGenerator<V> autoGenerator() {
-                return this.autoGenerator;
-            }
-        }
-    }
-
-    /**
-     * Get/set reflection operations.
-     * @param <T> The object type.
-     * @param <V> The value type.
-     */
-    interface Reflect<T, V> {
-        V get(T object);
-
-        void set(T object, V value);
-    }
-
-    /**
-     * {@link DynamoDbMapperFieldModel} builder.
-     */
-    static class Builder<T, V> {
-        private final DynamoDbMapperFieldModel.Properties<V> properties;
-        private DynamoDbTypeConverter<AttributeValue, V> converter;
-        private DynamoDbMapperFieldModel.Reflect<T, V> reflect;
-        private DynamoDbAttributeType attributeType;
-        private Class<T> targetType;
-
-        Builder(Class<T> targetType, DynamoDbMapperFieldModel.Properties<V> properties) {
-            this.properties = properties;
-            this.targetType = targetType;
-        }
-
-        public final Builder<T, V> with(DynamoDbTypeConverter<AttributeValue, V> converter) {
-            this.converter = converter;
-            return this;
-        }
-
-        public final Builder<T, V> with(DynamoDbAttributeType attributeType) {
-            this.attributeType = attributeType;
-            return this;
-        }
-
-        public final Builder<T, V> with(DynamoDbMapperFieldModel.Reflect<T, V> reflect) {
-            this.reflect = reflect;
-            return this;
-        }
-
-        public final DynamoDbMapperFieldModel<T, V> build() {
-            final DynamoDbMapperFieldModel<T, V> result = new DynamoDbMapperFieldModel<T, V>(this);
-            if ((result.keyType() != null || result.indexed()) && !result.attributeType().name().matches("[BNS]")) {
-                throw new DynamoDbMappingException(String.format(
-                        "%s[%s]; only scalar (B, N, or S) type allowed for key",
-                        targetType.getSimpleName(), result.name()
-                                                                ));
-            } else if (result.keyType() != null && result.getGenerateStrategy() == ALWAYS) {
-                throw new DynamoDbMappingException(String.format(
-                        "%s[%s]; auto-generated key and ALWAYS not allowed",
-                        targetType.getSimpleName(), result.name()
-                                                                ));
-            }
-            return result;
-        }
-    }
-
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbMapperModelFactory.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbMapperModelFactory.java
deleted file mode 100644
index d8a2b337bcb8..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbMapperModelFactory.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-import software.amazon.awssdk.annotations.SdkInternalApi;
-
-/**
- * {@link DynamoDbMapper} table model factory.
- */
-@SdkInternalApi
-public interface DynamoDbMapperModelFactory {
-
-    /**
-     * Gets/creates the mapper's model factory.
-     */
-    TableFactory getTableFactory(DynamoDbMapperConfig config);
-
-    /**
-     * {@link DynamoDbMapperModelFactory} factory.
-     */
-    interface TableFactory {
-        /**
-         * Gets the table model for the given type and configuration.
-         */
-        <T> DynamoDbMapperTableModel<T> getTable(Class<T> clazz);
-    }
-
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbMapperTableModel.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbMapperTableModel.java
deleted file mode 100644
index cddf08f518f5..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbMapperTableModel.java
+++ /dev/null
@@ -1,505 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-import static software.amazon.awssdk.services.dynamodb.model.KeyType.HASH;
-import static software.amazon.awssdk.services.dynamodb.model.KeyType.RANGE;
-import static software.amazon.awssdk.services.dynamodb.model.ProjectionType.KEYS_ONLY;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.EnumMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-import software.amazon.awssdk.services.dynamodb.model.GlobalSecondaryIndex;
-import software.amazon.awssdk.services.dynamodb.model.KeySchemaElement;
-import software.amazon.awssdk.services.dynamodb.model.KeyType;
-import software.amazon.awssdk.services.dynamodb.model.LocalSecondaryIndex;
-import software.amazon.awssdk.services.dynamodb.model.Projection;
-
-/**
- * Table model.
- *
- * @param <T> The object type.
- */
-public final class DynamoDbMapperTableModel<T> implements DynamoDbTypeConverter<Map<String, AttributeValue>, T> {
-
-    private final Map<String, GlobalSecondaryIndex> globalSecondaryIndexes;
-    private final Map<String, LocalSecondaryIndex> localSecondaryIndexes;
-    private final Map<String, DynamoDbMapperFieldModel<T, Object>> versions;
-    private final Map<String, DynamoDbMapperFieldModel<T, Object>> fields;
-    private final Map<KeyType, DynamoDbMapperFieldModel<T, Object>> keys;
-    private final Class<T> targetType;
-
-    /**
-     * Constructs a new table model for the specified class.
-     * @param builder The builder.
-     */
-    private DynamoDbMapperTableModel(final DynamoDbMapperTableModel.Builder<T> builder) {
-        this.globalSecondaryIndexes = builder.globalSecondaryIndexes();
-        this.localSecondaryIndexes = builder.localSecondaryIndexes();
-        this.versions = builder.versions();
-        this.fields = builder.fields();
-        this.keys = builder.keys();
-        this.targetType = builder.targetType;
-    }
-
-    /**
-     * Gets the object type.
-     * @return The object type.
-     */
-    public Class<T> targetType() {
-        return this.targetType;
-    }
-
-    /**
-     * Gets all the field models for the given class.
-     * @return The field models.
-     */
-    public Collection<DynamoDbMapperFieldModel<T, Object>> fields() {
-        return fields.values();
-    }
-
-    /**
-     * Gets the field model for a given attribute.
-     * @param <V> The field model's value type.
-     * @param attributeName The attribute name.
-     * @return The field model.
-     */
-    @SuppressWarnings("unchecked")
-    public <V> DynamoDbMapperFieldModel<T, V> field(final String attributeName) {
-        final DynamoDbMapperFieldModel<T, V> field = (DynamoDbMapperFieldModel<T, V>) fields.get(attributeName);
-        if (field == null) {
-            throw new DynamoDbMappingException(
-                    targetType.getSimpleName() + "[" + attributeName + "]; no mapping for attribute by name"
-            );
-        }
-        return field;
-    }
-
-    /**
-     * Gets all the key field models for the given class.
-     * @return The field models.
-     */
-    public Collection<DynamoDbMapperFieldModel<T, Object>> keys() {
-        return keys.values();
-    }
-
-    /**
-     * Gets the hash key field model for the specified type.
-     * @param <H> The hash key type.
-     * @return The hash key field model.
-     * @throws DynamoDbMappingException If the hash key is not present.
-     */
-    @SuppressWarnings("unchecked")
-    public <H> DynamoDbMapperFieldModel<T, H> hashKey() {
-        final DynamoDbMapperFieldModel<T, H> field = (DynamoDbMapperFieldModel<T, H>) keys.get(HASH);
-        if (field == null) {
-            throw new DynamoDbMappingException(
-                    targetType.getSimpleName() + "; no mapping for HASH key"
-            );
-        }
-        return field;
-    }
-
-    /**
-     * Gets the range key field model for the specified type.
-     * @param <R> The range key type.
-     * @return The range key field model.
-     * @throws DynamoDbMappingException If the range key is not present.
-     */
-    @SuppressWarnings("unchecked")
-    public <R> DynamoDbMapperFieldModel<T, R> rangeKey() {
-        final DynamoDbMapperFieldModel<T, R> field = (DynamoDbMapperFieldModel<T, R>) keys.get(RANGE);
-        if (field == null) {
-            throw new DynamoDbMappingException(
-                    targetType.getSimpleName() + "; no mapping for RANGE key"
-            );
-        }
-        return field;
-    }
-
-    /**
-     * Gets the range key field model for the specified type.
-     * @param <R> The range key type.
-     * @return The range key field model, or null if not present.
-     */
-    @SuppressWarnings("unchecked")
-    public <R> DynamoDbMapperFieldModel<T, R> rangeKeyIfExists() {
-        return (DynamoDbMapperFieldModel<T, R>) keys.get(RANGE);
-    }
-
-    /**
-     * Gets all the version fields for the given class.
-     * @return The field models.
-     */
-    public Collection<DynamoDbMapperFieldModel<T, Object>> versions() {
-        return versions.values();
-    }
-
-    /**
-     * Indicates if this table has any versioned attributes.
-     * @return True if any versioned attributes, false otherwise.
-     */
-    public boolean versioned() {
-        return !versions.isEmpty();
-    }
-
-    /**
-     * Gets the global secondary indexes for the given class.
-     * @return The map of index name to GlobalSecondaryIndexes.
-     */
-    public Collection<GlobalSecondaryIndex> globalSecondaryIndexes() {
-        if (globalSecondaryIndexes.isEmpty()) {
-            return null;
-        }
-        final Collection<GlobalSecondaryIndex> copies = new ArrayList<GlobalSecondaryIndex>(globalSecondaryIndexes.size());
-        for (final String indexName : globalSecondaryIndexes.keySet()) {
-            copies.add(globalSecondaryIndex(indexName));
-        }
-        return copies;
-    }
-
-    /**
-     * Gets the global secondary index.
-     * @param indexName The index name.
-     * @return The global secondary index or null.
-     */
-    public GlobalSecondaryIndex globalSecondaryIndex(final String indexName) {
-        if (!globalSecondaryIndexes.containsKey(indexName)) {
-            return null;
-        }
-        final GlobalSecondaryIndex gsi = globalSecondaryIndexes.get(indexName);
-        final GlobalSecondaryIndex.Builder copyBuilder = GlobalSecondaryIndex.builder()
-                .indexName(gsi.indexName())
-                .projection(Projection.builder()
-                        .projectionType(gsi.projection().projectionType())
-                        .build());
-        List<KeySchemaElement> keySchemas = new ArrayList<>();
-        for (final KeySchemaElement key : gsi.keySchema()) {
-            keySchemas.add(KeySchemaElement.builder().attributeName(key.attributeName()).keyType(key.keyType()).build());
-        }
-        copyBuilder.keySchema(keySchemas);
-        return copyBuilder.build();
-    }
-
-    /**
-     * Gets the local secondary indexes for the given class.
-     * @return The map of index name to LocalSecondaryIndexes.
-     */
-    public Collection<LocalSecondaryIndex> localSecondaryIndexes() {
-        if (localSecondaryIndexes.isEmpty()) {
-            return null;
-        }
-        final Collection<LocalSecondaryIndex> copies = new ArrayList<LocalSecondaryIndex>(localSecondaryIndexes.size());
-        for (final String indexName : localSecondaryIndexes.keySet()) {
-            copies.add(localSecondaryIndex(indexName));
-        }
-        return copies;
-    }
-
-    /**
-     * Gets the local secondary index by name.
-     * @param indexName The index name.
-     * @return The local secondary index, or null.
-     */
-    public LocalSecondaryIndex localSecondaryIndex(final String indexName) {
-        if (!localSecondaryIndexes.containsKey(indexName)) {
-            return null;
-        }
-        final LocalSecondaryIndex lsi = localSecondaryIndexes.get(indexName);
-        final LocalSecondaryIndex.Builder copyBuilder = LocalSecondaryIndex.builder()
-                .indexName(lsi.indexName())
-                .projection(Projection.builder()
-                        .projectionType(lsi.projection().projectionType())
-                        .build());
-
-        List<KeySchemaElement> keySchemas = new ArrayList<>();
-        for (final KeySchemaElement key : lsi.keySchema()) {
-            keySchemas.add(KeySchemaElement.builder()
-                                           .attributeName(key.attributeName())
-                                           .keyType(key.keyType())
-                                           .build());
-        }
-        copyBuilder.keySchema(keySchemas);
-        return copyBuilder.build();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public Map<String, AttributeValue> convert(final T object) {
-        final Map<String, AttributeValue> map = new LinkedHashMap<String, AttributeValue>();
-        for (final DynamoDbMapperFieldModel<T, Object> field : fields()) {
-            try {
-                final AttributeValue value = field.getAndConvert(object);
-                if (value != null) {
-                    map.put(field.name(), value);
-                }
-            } catch (final RuntimeException e) {
-                throw new DynamoDbMappingException(
-                        targetType.getSimpleName() + "[" + field.name() + "]; could not convert attribute", e
-                );
-            }
-        }
-        return map;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public T unconvert(final Map<String, AttributeValue> object) {
-        final T result = StandardBeanProperties.DeclaringReflect.<T>newInstance(targetType);
-        if (!object.isEmpty()) {
-            for (final DynamoDbMapperFieldModel<T, Object> field : fields()) {
-                try {
-                    final AttributeValue value = object.get(field.name());
-                    if (value != null) {
-                        field.unconvertAndSet(result, value);
-                    }
-                } catch (final RuntimeException e) {
-                    throw new DynamoDbMappingException(
-                            targetType.getSimpleName() + "[" + field.name() + "]; could not unconvert attribute", e
-                    );
-                }
-            }
-        }
-        return result;
-    }
-
-    /**
-     * Creates a new object instance with the keys populated.
-     * @param <H> The hash key type.
-     * @param <R> The range key type.
-     * @param hashKey The hash key.
-     * @param rangeKey The range key (optional if not present on table).
-     * @return The new instance.
-     */
-    public <H, R> T createKey(final H hashKey, final R rangeKey) {
-        final T key = StandardBeanProperties.DeclaringReflect.<T>newInstance(targetType);
-        if (hashKey != null) {
-            final DynamoDbMapperFieldModel<T, H> hk = hashKey();
-            hk.set(key, hashKey);
-        }
-        if (rangeKey != null) {
-            final DynamoDbMapperFieldModel<T, R> rk = rangeKey();
-            rk.set(key, rangeKey);
-        }
-        return key;
-    }
-
-    /**
-     * Creates a new key map from the specified object.
-     * @param <H> The hash key type.
-     * @param <R> The range key type.
-     * @return The key map.
-     */
-    public <H, R> Map<String, AttributeValue> convertKey(final T key) {
-        final DynamoDbMapperFieldModel<T, H> hk = this.<H>hashKey();
-        final DynamoDbMapperFieldModel<T, R> rk = this.<R>rangeKeyIfExists();
-        return this.<H, R>convertKey(hk.get(key), (rk == null ? (R) null : rk.get(key)));
-    }
-
-    /**
-     * Creates a new key map from the specified hash and range key.
-     * @param <H> The hash key type.
-     * @param <R> The range key type.
-     * @param hashKey The hash key.
-     * @param rangeKey The range key (optional if not present on table).
-     * @return The key map.
-     */
-    public <H, R> Map<String, AttributeValue> convertKey(final H hashKey, final R rangeKey) {
-        final Map<String, AttributeValue> key = new LinkedHashMap<String, AttributeValue>(4);
-        final DynamoDbMapperFieldModel<T, H> hk = this.<H>hashKey();
-        final AttributeValue hkValue = hashKey == null ? null : hk.convert(hashKey);
-        if (hkValue != null) {
-            key.put(hk.name(), hkValue);
-        } else {
-            throw new DynamoDbMappingException(
-                    targetType.getSimpleName() + "[" + hk.name() + "]; no HASH key value present"
-            );
-        }
-        final DynamoDbMapperFieldModel<T, R> rk = this.<R>rangeKeyIfExists();
-        final AttributeValue rkValue = rangeKey == null ? null : rk.convert(rangeKey);
-        if (rkValue != null) {
-            key.put(rk.name(), rkValue);
-        } else if (rk != null) {
-            throw new DynamoDbMappingException(
-                    targetType.getSimpleName() + "[" + rk.name() + "]; no RANGE key value present"
-            );
-        }
-        return key;
-    }
-
-    /**
-     * The table model properties.
-     */
-    interface Properties<T> {
-        String tableName();
-
-        final class Immutable<T> implements Properties<T> {
-            private final String tableName;
-
-            Immutable(final Properties<T> properties) {
-                this.tableName = properties.tableName();
-            }
-
-            @Override
-            public String tableName() {
-                return this.tableName;
-            }
-        }
-    }
-
-    /**
-     * {@link DynamoDbMapperTableModel} builder.
-     */
-    static class Builder<T> {
-        private final Map<String, DynamoDbMapperFieldModel<T, Object>> versions;
-        private final Map<String, DynamoDbMapperFieldModel<T, Object>> fields;
-        private final Map<KeyType, DynamoDbMapperFieldModel<T, Object>> keys;
-        private final Properties properties;
-        private final Class<T> targetType;
-
-        Builder(Class<T> targetType, Properties<T> properties) {
-            this.versions = new LinkedHashMap<String, DynamoDbMapperFieldModel<T, Object>>(4);
-            this.fields = new LinkedHashMap<String, DynamoDbMapperFieldModel<T, Object>>();
-            this.keys = new EnumMap<KeyType, DynamoDbMapperFieldModel<T, Object>>(KeyType.class);
-            this.properties = properties;
-            this.targetType = targetType;
-        }
-
-        public Builder<T> with(final DynamoDbMapperFieldModel<T, Object> field) {
-            fields.put(field.name(), field);
-            if (field.keyType() != null) {
-                keys.put(field.keyType(), field);
-            }
-            if (field.versioned()) {
-                versions.put(field.name(), field);
-            }
-            return this;
-        }
-
-        public Map<String, GlobalSecondaryIndex> globalSecondaryIndexes() {
-            final Map<String, GlobalSecondaryIndex> map = new LinkedHashMap<String, GlobalSecondaryIndex>();
-            for (final DynamoDbMapperFieldModel<T, Object> field : fields.values()) {
-                for (final String indexName : field.globalSecondaryIndexNames(HASH)) {
-                    final GlobalSecondaryIndex.Builder gsiBuilder = GlobalSecondaryIndex.builder()
-                            .indexName(indexName)
-                            .projection(Projection.builder()
-                                    .projectionType(KEYS_ONLY)
-                                    .build())
-                            .keySchema(KeySchemaElement.builder()
-                                    .attributeName(field.name())
-                                    .keyType(HASH).build());
-                    if (map.put(indexName, gsiBuilder.build()) != null) {
-                        throw new DynamoDbMappingException(
-                                targetType.getSimpleName() + "[" + field.name() + "]; must not duplicate GSI " + indexName
-                        );
-                    }
-                }
-            }
-            for (final DynamoDbMapperFieldModel<T, Object> field : fields.values()) {
-                for (final String indexName : field.globalSecondaryIndexNames(RANGE)) {
-                    final GlobalSecondaryIndex gsi = map.get(indexName);
-                    if (gsi == null) {
-                        throw new DynamoDbMappingException(
-                                targetType.getSimpleName() + "[" + field.name() + "]; no HASH key for GSI " + indexName
-                        );
-                    }
-
-                    List<KeySchemaElement> keySchemas = new ArrayList<>();
-                    keySchemas.addAll(gsi.keySchema());
-
-                    keySchemas.add(KeySchemaElement.builder()
-                                            .attributeName(field.name())
-                                            .keyType(RANGE).build());
-
-                    map.put(indexName,
-                            gsi.toBuilder()
-                                    .keySchema(keySchemas).build());
-                }
-            }
-            if (map.isEmpty()) {
-                return Collections.<String, GlobalSecondaryIndex>emptyMap();
-            }
-            return Collections.unmodifiableMap(map);
-        }
-
-        public Map<String, LocalSecondaryIndex> localSecondaryIndexes() {
-            final Map<String, LocalSecondaryIndex> map = new LinkedHashMap<String, LocalSecondaryIndex>();
-            for (final DynamoDbMapperFieldModel<T, Object> field : fields.values()) {
-                for (final String indexName : field.localSecondaryIndexNames()) {
-                    final LocalSecondaryIndex.Builder lsiBuilder = LocalSecondaryIndex.builder()
-                            .indexName(indexName)
-                            .projection(Projection.builder()
-                                    .projectionType(KEYS_ONLY)
-                                    .build())
-                            .keySchema(KeySchemaElement.builder()
-                                            .attributeName(keys.get(HASH).name())
-                                            .keyType(HASH).build(),
-                                    KeySchemaElement.builder()
-                                            .attributeName(field.name())
-                                            .keyType(RANGE).build());
-                    if (map.put(indexName, lsiBuilder.build()) != null) {
-                        throw new DynamoDbMappingException(
-                                targetType.getSimpleName() + "[" + field.name() + "]; must not duplicate LSI " + indexName
-                        );
-                    }
-                }
-            }
-            if (map.isEmpty()) {
-                return Collections.<String, LocalSecondaryIndex>emptyMap();
-            }
-            return Collections.unmodifiableMap(map);
-        }
-
-        private Map<String, DynamoDbMapperFieldModel<T, Object>> versions() {
-            if (versions.isEmpty()) {
-                return Collections.<String, DynamoDbMapperFieldModel<T, Object>>emptyMap();
-            }
-            return Collections.unmodifiableMap(versions);
-        }
-
-        public Map<String, DynamoDbMapperFieldModel<T, Object>> fields() {
-            if (fields.isEmpty()) {
-                return Collections.<String, DynamoDbMapperFieldModel<T, Object>>emptyMap();
-            }
-            return Collections.unmodifiableMap(fields);
-        }
-
-        public Map<KeyType, DynamoDbMapperFieldModel<T, Object>> keys() {
-            if (keys.isEmpty()) {
-                return Collections.<KeyType, DynamoDbMapperFieldModel<T, Object>>emptyMap();
-            }
-            return Collections.unmodifiableMap(keys);
-        }
-
-        public DynamoDbMapperTableModel<T> build() {
-            final DynamoDbMapperTableModel<T> result = new DynamoDbMapperTableModel<T>(this);
-            if (properties.tableName() != null) {
-                result.hashKey(); //<- make sure the hash key is present
-            }
-            return result;
-        }
-    }
-
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbMappingException.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbMappingException.java
deleted file mode 100644
index 054e93a5a54c..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbMappingException.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-/**
- * Generic exception for problems occurring when mapping DynamoDB items to Java
- * objects or vice versa. Excludes service exceptions.
- */
-public class DynamoDbMappingException extends RuntimeException {
-
-    private static final long serialVersionUID = -4883173289978517967L;
-
-    public DynamoDbMappingException() {
-        super();
-    }
-
-    public DynamoDbMappingException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    public DynamoDbMappingException(String message) {
-        super(message);
-    }
-
-    public DynamoDbMappingException(Throwable cause) {
-        super(cause);
-    }
-
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbMappingsRegistry.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbMappingsRegistry.java
deleted file mode 100644
index bdf8b3b31c55..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbMappingsRegistry.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-import java.lang.reflect.Method;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-import software.amazon.awssdk.annotations.SdkInternalApi;
-import software.amazon.awssdk.services.dynamodb.datamodeling.StandardBeanProperties.Bean;
-
-/**
- * Reflection assistant for {@link DynamoDbMapper}
- *
- * @deprecated Replaced by {@link StandardBeanProperties}/{@link StandardModelFactories}
- */
-@Deprecated
-@SdkInternalApi
-final class DynamoDbMappingsRegistry {
-
-    /**
-     * The default instance.
-     */
-    private static final DynamoDbMappingsRegistry INSTANCE = new DynamoDbMappingsRegistry();
-    /**
-     * The cache of class to mapping definition.
-     */
-    private final ConcurrentMap<Class<?>, Mappings> mappings = new ConcurrentHashMap<Class<?>, Mappings>();
-
-    /**
-     * Gets the default instance.
-     * @return The default instance.
-     */
-    static DynamoDbMappingsRegistry instance() {
-        return INSTANCE;
-    }
-
-    /**
-     * Gets the mapping definition for a given class.
-     * @param clazz The class.
-     * @return The mapping definition.
-     */
-    Mappings mappingsOf(final Class<?> clazz) {
-        if (!mappings.containsKey(clazz)) {
-            mappings.putIfAbsent(clazz, new Mappings(clazz));
-        }
-        return mappings.get(clazz);
-    }
-
-    /**
-     * Holds the properties for mapping an object.
-     */
-    static final class Mappings {
-        private final Map<String, Mapping> byNames = new HashMap<String, Mapping>();
-
-        private Mappings(final Class<?> clazz) {
-            for (final Map.Entry<String, Bean<Object, Object>> bean :
-                    StandardBeanProperties.of((Class<Object>) clazz).map().entrySet()) {
-                final Mapping mapping = new Mapping(bean.getValue());
-                byNames.put(mapping.getAttributeName(), mapping);
-            }
-        }
-
-        Collection<Mapping> mappings() {
-            return byNames.values();
-        }
-    }
-
-    /**
-     * Holds the properties for mapping an object attribute.
-     */
-    static final class Mapping {
-        private final Bean<Object, Object> bean;
-
-        private Mapping(final Bean<Object, Object> bean) {
-            this.bean = bean;
-        }
-
-        Method getter() {
-            return bean.type().getter();
-        }
-
-        boolean isPrimaryKey() {
-            return bean.properties().keyType() != null;
-        }
-
-        boolean isVersion() {
-            return bean.properties().versioned();
-        }
-
-        String getAttributeName() {
-            return bean.properties().attributeName();
-        }
-    }
-
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbMarshaller.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbMarshaller.java
deleted file mode 100644
index 20251661db39..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbMarshaller.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-/**
- * Marshaller interface for storing complex types in DynamoDB as Strings.
- * Implementors provide methods to transform instances of a class to and from
- * Strings.
- *
- * @deprecated Replaced by {@link DynamoDbTypeConverter}
- *
- * <p>A {@link DynamoDbTypeConverted} with {@link String} as source would
- * perform the same conversion. Please consider, if your marshaller is thread
- * safe before replacing. In the new implementation, a single instance of
- * {@link DynamoDbTypeConverted} is created per field/attribute. In the old,
- * an new instance of the marshaller was created for each call to
- * {@code marshall} and {@code unmarshall}. If your marshaller/converter is not
- * thread safe, it is recommended to specify a converter which will instantiate
- * a new marshaller per call.</p>
- *
- * <pre class="brush: java">
- * public class CustomConverter&lt;T&gt; implements DynamoDBTypeConverter&lt;String,T&gt; {
- *     &#064;Override
- *     public final String convert(final T object) {
- *         return ...
- *     }
- *     &#064;Override
- *     public final T unconvert(final String object) {
- *         return ...
- *     }
- * }
- * </pre>
- */
-@Deprecated
-public interface DynamoDbMarshaller<T extends Object> {
-
-    /**
-     * Turns an object of type T into its String representation.
-     */
-    String marshall(T getterReturnResult);
-
-    /**
-     * Turns a String representation of an object of type T into an object.
-     */
-    T unmarshall(Class<T> clazz, String obj);
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbMarshalling.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbMarshalling.java
deleted file mode 100644
index 7480280a6218..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbMarshalling.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-import java.util.Set;
-
-/**
- * Annotation to mark a property as using a custom marshaller. This is required
- * when storing anything other than {@link String}s, {@link Number}s, and
- * {@link Set}s of the same to DynamoDB. Any object that can be converted into a
- * String representation and vice versa can be saved in this manner. This
- * annotation can be applied to either the getter method or the class field for
- * the specific property. If the annotation is applied directly to the class
- * field, the corresponding getter and setter must be declared in the same
- * class.
- *
- * @see DynamoDbMarshaller
- * @see JsonMarshaller
- *
- * @deprecated Replaced by {@link DynamoDbTypeConverted}
- *
- * <p>A {@link DynamoDbTypeConverted} with {@link String} as source would
- * perform the same conversion. Please consider, if your marshaller is thread
- * safe before replacing. In the new implementation, a single instance of
- * {@link DynamoDbTypeConverted} is created per field/attribute. In the old,
- * an new instance of the marshaller was created for each call to
- * {@code marshall} and {@code unmarshall}. If your marshaller/converter is not
- * thread safe, it is recommended to specify a converter which will instantiate
- * a new marshaller per call.</p>
- *
- * <pre class="brush: java">
- * public class CustomConverter&lt;T&gt; implements DynamoDBTypeConverter&lt;String,T&gt; {
- *     &#064;Override
- *     public final String convert(final T object) {
- *         return ...
- *     }
- *     &#064;Override
- *     public final T unconvert(final String object) {
- *         return ...
- *     }
- * }
- * </pre>
- */
-@Deprecated
-@DynamoDb
-@DynamoDbTypeConverted(converter = DynamoDbMarshalling.Converter.class)
-@DynamoDbTyped(DynamoDbMapperFieldModel.DynamoDbAttributeType.S)
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.FIELD, ElementType.METHOD})
-public @interface DynamoDbMarshalling {
-
-    /**
-     * The class of the Marshaller that converts this property to and from a
-     * String.
-     */
-    Class<? extends DynamoDbMarshaller<? extends Object>> marshallerClass();
-
-    /**
-     * Marshalling type converter.
-     */
-    final class Converter<T> implements DynamoDbTypeConverter<String, T> {
-        private final Class<DynamoDbMarshaller<T>> marshallerClass;
-        private final Class<T> targetType;
-
-        Converter(final Class<T> targetType, final DynamoDbMarshalling annotation) {
-            this.marshallerClass = (Class<DynamoDbMarshaller<T>>) annotation.marshallerClass();
-            this.targetType = targetType;
-        }
-
-        @Override
-        public String convert(final T object) {
-            return marshaller().marshall(object);
-        }
-
-        @Override
-        public T unconvert(final String object) {
-            return marshaller().unmarshall(targetType, object);
-        }
-
-        private DynamoDbMarshaller<T> marshaller() {
-            try {
-                return marshallerClass.newInstance();
-            } catch (final Exception e) {
-                throw new DynamoDbMappingException("Unable to instantiate marshaller " + marshallerClass, e);
-            }
-        }
-    }
-
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbNamed.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbNamed.java
deleted file mode 100644
index 31ad11254c47..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbNamed.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Annotation for overriding a property's DynamoDB attribute name.
- *
- * <pre class="brush: java">
- * &#064;DynamoDBNamed(&quot;InternalStatus&quot;)
- * public String status()
- * </pre>
- *
- * <p>This annotation has the lowest precedence among other property/field
- * annotations where {@code attributeName} may be specified.</p>
- *
- * <p>May be used as a meta-annotation.</p>
- */
-@DynamoDb
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.FIELD, ElementType.METHOD, ElementType.ANNOTATION_TYPE})
-public @interface DynamoDbNamed {
-
-    /**
-     * Use when the name of the attribute as stored in DynamoDB should differ
-     * from the name used by the getter / setter.
-     */
-    String value();
-
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbNativeBoolean.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbNativeBoolean.java
deleted file mode 100644
index 3a3aaa330354..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbNativeBoolean.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * An annotation that marks a {@code boolean} or {@code Boolean} attribute
- * of a modeled class which should be serialized as a DynamoDB BOOL. For
- * backwards compatibility with old versions of the {@code DynamoDBMapper},
- * by default booleans are serialized using the DynamoDB N type, with a value
- * of '1' representing 'true' and a value of '0' representing 'false'.
- * <p/>
- * Using this annotation on the field definition or getter method definition
- * for the attribute will cause it to be serialized as DynamoDB-native BOOL
- * type. Old versions of the {@code DynamoDBMapper} which do not know about the
- * BOOL type will be unable to read items containing BOOLs, so don't use me
- * unless all readers of your table are using an updated version of the mapper.
- *
- * @deprecated - Replaced by {@link DynamoDbTyped}
- */
-@Deprecated
-@DynamoDb
-@DynamoDbTyped(DynamoDbMapperFieldModel.DynamoDbAttributeType.BOOL)
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.FIELD, ElementType.METHOD})
-public @interface DynamoDbNativeBoolean {
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbQueryExpression.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbQueryExpression.java
deleted file mode 100644
index d67fa1f1c71a..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbQueryExpression.java
+++ /dev/null
@@ -1,1325 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-import java.util.HashMap;
-import java.util.Map;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-import software.amazon.awssdk.services.dynamodb.model.Condition;
-import software.amazon.awssdk.services.dynamodb.model.ConditionalOperator;
-import software.amazon.awssdk.services.dynamodb.model.QueryRequest;
-import software.amazon.awssdk.services.dynamodb.model.ReturnConsumedCapacity;
-import software.amazon.awssdk.services.dynamodb.model.Select;
-
-/**
- * A query expression.
- */
-public class DynamoDbQueryExpression<T> {
-
-    private boolean consistentRead = true;
-    private boolean scanIndexForward = true;
-    private T hashKeyValues;
-    private Map<String, Condition> rangeKeyConditions;
-    private Map<String, AttributeValue> exclusiveStartKey;
-    private Integer limit;
-    private String indexName;
-    private Map<String, Condition> queryFilter;
-    private String conditionalOperator;
-
-    /**
-     * Evaluates the query results and returns only the desired values.
-     * <p>
-     * The condition you specify is applied to the items queried; any items that
-     * do not match the expression are not returned.
-     */
-    private String filterExpression;
-
-    /**
-     * The condition that specifies the key value(s) for items to be retrieved
-     * by the <i>Query</i> action.
-     */
-    private String keyConditionExpression;
-
-    /**
-     * One or more substitution variables for simplifying complex expressions.
-     */
-    private Map<String, String> expressionAttributeNames;
-
-    /**
-     * One or more values that can be substituted in an expression.
-     */
-    private Map<String, AttributeValue> expressionAttributeValues;
-
-    /**
-     * The attributes to be returned in the result. You can retrieve all item
-     * attributes, specific item attributes, the count of matching items, or
-     * in the case of an index, some or all of the attributes projected into
-     * the index. <ul> <li> <p><code>ALL_ATTRIBUTES</code> - Returns all of
-     * the item attributes from the specified table or index. If you query a
-     * local secondary index, then for each matching item in the index
-     * DynamoDB will fetch the entire item from the parent table. If the
-     * index is configured to project all item attributes, then all of the
-     * data can be obtained from the local secondary index, and no fetching
-     * is required. </li> <li> <p><code>ALL_PROJECTED_ATTRIBUTES</code> -
-     * Allowed only when querying an index. Retrieves all attributes that
-     * have been projected into the index. If the index is configured to
-     * project all attributes, this return value is equivalent to specifying
-     * <code>ALL_ATTRIBUTES</code>. </li> <li> <p><code>COUNT</code> -
-     * Returns the number of matching items, rather than the matching items
-     * themselves. </li> <li> <p> <code>SPECIFIC_ATTRIBUTES</code> - Returns
-     * only the attributes listed in <i>AttributesToGet</i>. This return
-     * value is equivalent to specifying <i>AttributesToGet</i> without
-     * specifying any value for <i>Select</i>. <p>If you query a local
-     * secondary index and request only attributes that are projected into
-     * that index, the operation will read only the index and not the table.
-     * If any of the requested attributes are not projected into the local
-     * secondary index, DynamoDB will fetch each of these attributes from the
-     * parent table. This extra fetching incurs additional throughput cost
-     * and latency. <p>If you query a global secondary index, you can only
-     * request attributes that are projected into the index. Global secondary
-     * index queries cannot fetch attributes from the parent table. </li>
-     * </ul> <p>If neither <i>Select</i> nor <i>AttributesToGet</i> are
-     * specified, DynamoDB defaults to <code>ALL_ATTRIBUTES</code> when
-     * accessing a table, and <code>ALL_PROJECTED_ATTRIBUTES</code> when
-     * accessing an index. You cannot use both <i>Select</i> and
-     * <i>AttributesToGet</i> together in a single request, unless the value
-     * for <i>Select</i> is <code>SPECIFIC_ATTRIBUTES</code>. (This usage is
-     * equivalent to specifying <i>AttributesToGet</i> without any value for
-     * <i>Select</i>.)
-     * <p>
-     * <b>Constraints:</b><br/>
-     * <b>Allowed Values: </b>ALL_ATTRIBUTES, ALL_PROJECTED_ATTRIBUTES, SPECIFIC_ATTRIBUTES, COUNT
-     */
-    private String select;
-
-    /**
-     * A string that identifies one or more attributes to retrieve from the
-     * table. These attributes can include scalars, sets, or elements of a
-     * JSON document. The attributes in the expression must be separated by
-     * commas. <p>If no attribute names are specified, then all attributes
-     * will be returned. If any of the requested attributes are not found,
-     * they will not appear in the result. <p>For more information, go to <a
-     * href="http://docs.aws.amazon.com/amazondynamodb/latest/developerguide/Expressions.AccessingItemAttributes.html">Accessing
-     * Item Attributes</a> in the <i>Amazon DynamoDB Developer Guide</i>.
-     */
-    private String projectionExpression;
-
-    /**
-     * A value that if set to <code>TOTAL</code>, the response includes
-     * <i>ConsumedCapacity</i> data for tables and indexes. If set to
-     * <code>INDEXES</code>, the response includes <i>ConsumedCapacity</i>
-     * for indexes. If set to <code>NONE</code> (the default),
-     * <i>ConsumedCapacity</i> is not included in the response.
-     * <p>
-     * <b>Constraints:</b><br/>
-     * <b>Allowed Values: </b>INDEXES, TOTAL, NONE
-     * <p>
-     * If enabled, the underlying request to DynamoDB will include the
-     * configured parameter value and the low-level response from DynamoDB will
-     * include the amount of capacity consumed by the query. Currently, the
-     * consumed capacity is only exposed through the DynamoDBMapper when you
-     * call {@code DynamoDBMapper.queryPage}, not {@code DynamoDBMapper.query}.
-     */
-    private String returnConsumedCapacity;
-
-    /**
-     * Returns whether this query uses consistent reads.
-     */
-    public boolean isConsistentRead() {
-        return consistentRead;
-    }
-
-    /**
-     * Sets whether this query uses consistent reads.
-     */
-    public void setConsistentRead(boolean consistentRead) {
-        this.consistentRead = consistentRead;
-    }
-
-    /**
-     * Sets whether this query uses consistent reads and returns a pointer to
-     * this object for method-chaining.
-     */
-    public DynamoDbQueryExpression<T> withConsistentRead(boolean consistentRead) {
-        this.consistentRead = consistentRead;
-        return this;
-    }
-
-    /**
-     * Returns whether this query scans forward.
-     */
-    public boolean isScanIndexForward() {
-        return scanIndexForward;
-    }
-
-    /**
-     * Sets whether this query scans forward.
-     */
-    public void setScanIndexForward(boolean scanIndexForward) {
-        this.scanIndexForward = scanIndexForward;
-    }
-
-    /**
-     * Sets whether this query scans forward and returns a pointer to this
-     * object for method-chaining.
-     */
-    public DynamoDbQueryExpression<T> withScanIndexForward(boolean scanIndexForward) {
-        this.scanIndexForward = scanIndexForward;
-        return this;
-    }
-
-    /**
-     * Returns the exclusive start key for this query.
-     */
-    public Map<String, AttributeValue> getExclusiveStartKey() {
-        return exclusiveStartKey;
-    }
-
-    /**
-     * Sets the exclusive start key for this query.
-     */
-    public void setExclusiveStartKey(Map<String, AttributeValue> exclusiveStartKey) {
-        this.exclusiveStartKey = exclusiveStartKey;
-    }
-
-    /**
-     * Sets the exclusive start key for this query and returns a pointer to this
-     * object for method-chaining.
-     */
-    public DynamoDbQueryExpression<T> withExclusiveStartKey(Map<String, AttributeValue> exclusiveStartKey) {
-        this.exclusiveStartKey = exclusiveStartKey;
-        return this;
-    }
-
-    /**
-     * Returns the maximum number of items to retrieve in each service request
-     * to DynamoDB.
-     * <p>
-     * Note that when calling {@code DynamoDBMapper.query}, multiple requests
-     * are made to DynamoDB if needed to retrieve the entire result set. Setting
-     * this will limit the number of items retrieved by each request, NOT
-     * the total number of results that will be retrieved. Use
-     * {@code DynamoDBMapper.queryPage} to retrieve a single page of items from
-     * DynamoDB.
-     */
-    public Integer limit() {
-        return limit;
-    }
-
-    /**
-     * Sets the maximum number of items to retrieve in each service request to
-     * DynamoDB.
-     * <p>
-     * Note that when calling {@code DynamoDBMapper.query}, multiple requests
-     * are made to DynamoDB if needed to retrieve the entire result set. Setting
-     * this will limit the number of items retrieved by each request, NOT
-     * the total number of results that will be retrieved. Use
-     * {@code DynamoDBMapper.queryPage} to retrieve a single page of items from
-     * DynamoDB.
-     */
-    public void setLimit(Integer limit) {
-        this.limit = limit;
-    }
-
-    /**
-     * Sets the maximum number of items to retrieve in each service request to
-     * DynamoDB and returns a pointer to this object for method-chaining.
-     * <p>
-     * Note that when calling {@code DynamoDBMapper.query}, multiple requests
-     * are made to DynamoDB if needed to retrieve the entire result set. Setting
-     * this will limit the number of items retrieved by each request, NOT
-     * the total number of results that will be retrieved. Use
-     * {@code DynamoDBMapper.queryPage} to retrieve a single page of items from
-     * DynamoDB.
-     */
-    public DynamoDbQueryExpression<T> withLimit(Integer limit) {
-        this.limit = limit;
-        return this;
-    }
-
-    /**
-     * Gets the hash key value(s) for this query. All hash key attributes for
-     * the table must be specified with this key object.
-     */
-    public T getHashKeyValues() {
-        return hashKeyValues;
-    }
-
-
-    /**
-     * Sets the hash key value(s) for this query. All hash key attributes for
-     * the table must be specified with this key object.
-     *
-     * Note 1: Currently the DynamoDBMapper supports only one value per hash key.
-     * Note 2: Currently the Amazon DynamoDB supports only one hash key per
-     *         table/index.
-     */
-    public void setHashKeyValues(T hashKeyValues) {
-        this.hashKeyValues = hashKeyValues;
-    }
-
-    /**
-     * Sets the hash key value(s) for this query. All hash key attributes for
-     * the table must be specified with this key object.
-     */
-    public DynamoDbQueryExpression<T> withHashKeyValues(T hashKObject) {
-        setHashKeyValues(hashKObject);
-        return this;
-    }
-
-    /**
-     * Gets the range key condition for this query. All range key attributes for
-     * the table must be specified by attribute name in the map.
-     */
-    public Map<String, Condition> getRangeKeyConditions() {
-        return rangeKeyConditions;
-    }
-
-    /**
-     * Sets the range key condition for this query. All range key attributes for
-     * the table must be specified by attribute name in the map.
-     *
-     * @param rangeKeyConditions a map from key name to condition
-     *             NOTE: The current DynamoDB service only allows up to one
-     *          range key condition per query. Providing more than one
-     *          range key condition will result in a SdkClientException.
-     */
-    public void setRangeKeyConditions(Map<String, Condition> rangeKeyConditions) {
-        this.rangeKeyConditions = rangeKeyConditions;
-    }
-
-    /**
-     * Sets the range key condition for this query. All range key attributes for
-     * the table must be specified by attribute name in the map.
-     *
-     * @param rangeKeyConditions a map from key name to condition
-     *         NOTE: The current DynamoDB service only allows up to one range
-     *         key condition per query. Providing more than one range key
-     *         condition will result in a SdkClientException.
-     */
-    public DynamoDbQueryExpression<T> withRangeKeyConditions(Map<String, Condition> rangeKeyConditions) {
-        setRangeKeyConditions(rangeKeyConditions);
-        return this;
-    }
-
-    /**
-     * Sets one range key condition for this query, using the attribute name of
-     * the range key. All range key attributes for the table must be specified
-     * by using {@link DynamoDbRangeKey} or {@link DynamoDbIndexRangeKey} annotations
-     * before executing the query.
-     * <dl>
-     *   <dt>If the attribute is the primary range key</dt>
-     *   <dd>users should NOT set any index name for this query.</dd>
-     *   <dt>If the attribute is an index range key</dt>
-     *      <dd>
-     *       {@link DynamoDbMapper} will automatically set the index name if the
-     *       range key is annotated as only used by one local secondary index,
-     *       otherwise users must set the index name manually by either
-     *       {@link DynamoDbQueryExpression#setIndexName(String)} or
-     *       {@link DynamoDbQueryExpression#withIndexName(String)}.
-     *   </dd>
-     * </dl>
-     *
-     * @param rangeKeyAttributeName
-     *             This can be either the primary range key of the table or an
-     *          index range key.
-     *
-     * @param rangeKeyCondition
-     *             Condition specified on the given range key for this query.
-     */
-    public DynamoDbQueryExpression<T> withRangeKeyCondition(String rangeKeyAttributeName, Condition rangeKeyCondition) {
-        if (rangeKeyConditions == null) {
-            rangeKeyConditions = new HashMap<String, Condition>();
-        }
-        rangeKeyConditions.put(rangeKeyAttributeName, rangeKeyCondition);
-        return this;
-    }
-
-    /**
-     * Returns the name of the index to be used by this query.
-     */
-    public String getIndexName() {
-        return indexName;
-    }
-
-    /**
-     * Sets the name of the index to be used by this query. The hash key
-     * and/or range key of the index must be specified by adding
-     * {@link DynamoDbIndexHashKey} or {@code DynamoDBIndexRangeKey}
-     * annotations to the appropriate getter methods of the mapped
-     * object.
-     */
-    public void setIndexName(String indexName) {
-        this.indexName = indexName;
-    }
-
-    /**
-     * Sets the name of the index to be used by this query. The hash key
-     * and/or range key of the index must be specified by adding
-     * {@link DynamoDbIndexHashKey} or {@code DynamoDBIndexRangeKey}
-     * annotations to the appropriate getter methods of the mapped
-     * object.
-     * <p>
-     * Returns a pointer to this object for method-chaining.
-     */
-    public DynamoDbQueryExpression<T> withIndexName(String indexName) {
-        setIndexName(indexName);
-        return this;
-    }
-
-    /**
-     * Returns the query filter applied on this query.
-     */
-    public Map<String, Condition> getQueryFilter() {
-        return queryFilter;
-    }
-
-    /**
-     * Sets the query filter applied on this query.
-     */
-    public void setQueryFilter(Map<String, Condition> queryFilter) {
-        this.queryFilter = queryFilter;
-    }
-
-    /**
-     * Sets the query filter applied on this query.
-     * <p>Returns a pointer to this object for method-chaining.
-     */
-    public DynamoDbQueryExpression<T> withQueryFilter(Map<String, Condition> queryFilter) {
-        setQueryFilter(queryFilter);
-        return this;
-    }
-
-    /**
-     * Adds a new condition to the the query filter.
-     * <p>Returns a pointer to this object for method-chaining.
-     *
-     * @param attributeName
-     *            The name of the attribute on which the specified condition
-     *            operates.
-     * @param condition
-     *            The filter condition applied on the attribute.
-     */
-    public DynamoDbQueryExpression<T> withQueryFilterEntry(String attributeName, Condition condition) {
-        if (queryFilter == null) {
-            queryFilter = new HashMap<String, Condition>();
-        }
-        queryFilter.put(attributeName, condition);
-        return this;
-    }
-
-    /**
-     * Returns the logical operator on the query filter conditions.
-     */
-    public String getConditionalOperator() {
-        return conditionalOperator;
-    }
-
-    /**
-     * Sets the logical operator on the query filter conditions.
-     */
-    public void setConditionalOperator(String conditionalOperator) {
-        this.conditionalOperator = conditionalOperator;
-    }
-
-    /**
-     * Sets the logical operator on the query filter conditions.
-     */
-    public void setConditionalOperator(ConditionalOperator conditionalOperator) {
-        this.conditionalOperator = conditionalOperator.toString();
-    }
-
-    /**
-     * Sets the logical operator on the query filter conditions.
-     * <p>Returns a pointer to this object for method-chaining.
-     */
-    public DynamoDbQueryExpression<T> withConditionalOperator(String conditionalOperator) {
-        setConditionalOperator(conditionalOperator);
-        return this;
-    }
-
-    /**
-     * Sets the logical operator on the query filter conditions.
-     * <p>Returns a pointer to this object for method-chaining.
-     */
-    public DynamoDbQueryExpression<T> withConditionalOperator(ConditionalOperator conditionalOperator) {
-        setConditionalOperator(conditionalOperator);
-        return this;
-    }
-
-    /**
-     * Evaluates the query results and returns only the desired values.
-     * <p>
-     * The condition you specify is applied to the items queried; any items that
-     * do not match the expression are not returned.
-     *
-     * @return Evaluates the query results and returns only the desired values.
-     *         <p>
-     *         The condition you specify is applied to the items queried; any
-     *         items that do not match the expression are not returned.
-     * @see QueryRequest#getFilterExpression()
-     */
-    public String getFilterExpression() {
-        return filterExpression;
-    }
-
-    /**
-     * Evaluates the query results and returns only the desired values.
-     * <p>
-     * The condition you specify is applied to the items queried; any items that
-     * do not match the expression are not returned.
-     *
-     * @param filterExpression
-     *            Evaluates the query results and returns only the desired
-     *            values.
-     *            <p>
-     *            The condition you specify is applied to the items queried; any
-     *            items that do not match the expression are not returned.
-     * @see QueryRequest#setFilterExpression(String)
-     */
-    public void setFilterExpression(String filterExpression) {
-        this.filterExpression = filterExpression;
-    }
-
-    /**
-     * Evaluates the query results and returns only the desired values.
-     * <p>
-     * The condition you specify is applied to the items queried; any items that
-     * do not match the expression are not returned.
-     * <p>
-     * Returns a reference to this object so that method calls can be chained
-     * together.
-     *
-     * @param filterExpression
-     *            Evaluates the query results and returns only the desired
-     *            values.
-     *            <p>
-     *            The condition you specify is applied to the items queried; any
-     *            items that do not match the expression are not returned.
-     *
-     * @return A reference to this updated object so that method calls can be
-     *         chained together.
-     * @see QueryRequest#withFilterExpression(String)
-     */
-    public DynamoDbQueryExpression<T> withFilterExpression(
-            String filterExpression) {
-        this.filterExpression = filterExpression;
-        return this;
-    }
-
-    /**
-     * Returns the condition that specifies the key value(s) for items to be
-     * retrieved by the <i>Query</i> action.
-     * <p>
-     * The condition must perform an equality test on a single hash key value.
-     * The condition can also test for one or more range key values. A
-     * <i>Query</i> can use <i>KeyConditionExpression</i> to retrieve a single
-     * item with a given hash and range key value, or several items that have
-     * the same hash key value but different range key values.
-     * <p>
-     * The hash key equality test is required, and must be specified in the
-     * following format:
-     * <p>
-     * <code>hashAttributeName</code> <i>=</i> <code>:hashval</code>
-     * <p>
-     * If you also want to provide a range key condition, it must be combined
-     * using <i>AND</i> with the hash key condition. Following is an example,
-     * using the <b>=</b> comparison operator for the range key:
-     * <p>
-     * <code>hashAttributeName</code> <i>=</i> <code>:hashval</code> <i>AND</i>
-     * <code>rangeAttributeName</code> <i>=</i> <code>:rangeval</code>
-     * <p>
-     * Valid comparisons for the range key condition are as follows:
-     * <ul>
-     * <li>
-     * <p>
-     * <code>rangeAttributeName</code> <i>=</i> <code>:rangeval</code> - true if
-     * the range key is equal to <code>:rangeval</code>.</li>
-     * <li>
-     * <p>
-     * <code>rangeAttributeName</code> <i>&lt;</i> <code>:rangeval</code> - true if
-     * the range key is less than <code>:rangeval</code>.</li>
-     * <li>
-     * <p>
-     * <code>rangeAttributeName</code> <i>&lt;=</i> <code>:rangeval</code> - true
-     * if the range key is less than or equal to <code>:rangeval</code>.</li>
-     * <li>
-     * <p>
-     * <code>rangeAttributeName</code> <i>&gt;</i> <code>:rangeval</code> - true if
-     * the range key is greater than <code>:rangeval</code>.</li>
-     * <li>
-     * <p>
-     * <code>rangeAttributeName</code> <i>&gt;=</i><code>:rangeval</code> - true
-     * if the range key is greater than or equal to <code>:rangeval</code>.</li>
-     * <li>
-     * <p>
-     * <code>rangeAttributeName</code> <i>BETWEEN</i> <code>:rangeval1</code>
-     * <i>AND</i> <code>:rangeval2</code> - true if the range key is less than
-     * or greater than <code>:rangeval1</code>, and less than or equal to
-     * <code>:rangeval2</code>.</li>
-     * <li>
-     * <p>
-     * <i>begins_with (</i><code>rangeAttributeName</code>,
-     * <code>:rangeval</code><i>)</i> - true if the range key begins with a
-     * particular operand. Note that the function name <code>begins_with</code>
-     * is case-sensitive.</li>
-     * </ul>
-     * <p>
-     * Use <i>ExpressionAttributeValues</i> (via {@link #withExpressionAttributeValues(Map)}) to
-     * replace tokens such as <code>:hashval</code> and <code>:rangeval</code>
-     * with actual values at runtime.
-     * <p>
-     * You can optionally use <i>ExpressionAttributeNames</i> (via
-     * {@link #withExpressionAttributeNames(Map)}) to replace the names of the hash and range
-     * attributes with placeholder tokens. This might be necessary if an
-     * attribute name conflicts with a DynamoDB reserved word. For example, the
-     * following <i>KeyConditionExpression</i> causes an error because
-     * <i>Size</i> is a reserved word:
-     * <ul>
-     * <li> <code>Size = :myval</code></li>
-     * </ul>
-     * <p>
-     * To work around this, define a placeholder (such a <code>#myval</code>) to
-     * represent the attribute name <i>Size</i>. <i>KeyConditionExpression</i>
-     * then is as follows:
-     * <ul>
-     * <li> <code>#S =
-     * :myval</code></li>
-     * </ul>
-     * <p>
-     * For a list of reserved words, see <a href=
-     * "http://docs.aws.amazon.com/amazondynamodb/latest/developerguide/ReservedWords.html"
-     * >Reserved Words</a> in the <i>Amazon DynamoDB Developer Guide</i>.
-     * <p>
-     * For more information on <i>ExpressionAttributeNames</i> and
-     * <i>ExpressionAttributeValues</i>, see <a href=
-     * "http://docs.aws.amazon.com/amazondynamodb/latest/developerguide/ExpressionPlaceholders.html"
-     * >Using Placeholders for Attribute Names and Values</a> in the <i>Amazon
-     * DynamoDB Developer Guide</i>. <note>
-     * <p>
-     * <i>KeyConditionExpression</i> replaces the legacy <i>KeyConditions</i>
-     * parameter. </note>
-     *
-     * @return The condition that specifies the key value(s) for items to be
-     *         retrieved by the <i>Query</i> action.
-     *         <p>
-     *         The condition must perform an equality test on a single hash key
-     *         value. The condition can also test for one or more range key
-     *         values. A <i>Query</i> can use <i>KeyConditionExpression</i> to
-     *         retrieve a single item with a given hash and range key value, or
-     *         several items that have the same hash key value but different
-     *         range key values.
-     *         <p>
-     *         The hash key equality test is required, and must be specified in
-     *         the following format:
-     *         <p>
-     *         <code>hashAttributeName</code> <i>=</i> <code>:hashval</code>
-     *         <p>
-     *         If you also want to provide a range key condition, it must be
-     *         combined using <i>AND</i> with the hash key condition. Following
-     *         is an example, using the <b>=</b> comparison operator for the
-     *         range key:
-     *         <p>
-     *         <code>hashAttributeName</code> <i>=</i> <code>:hashval</code>
-     *         <i>AND</i> <code>rangeAttributeName</code> <i>=</i>
-     *         <code>:rangeval</code>
-     *         <p>
-     *         Valid comparisons for the range key condition are as follows:
-     *         <ul>
-     *         <li>
-     *         <p>
-     *         <code>rangeAttributeName</code> <i>=</i> <code>:rangeval</code> -
-     *         true if the range key is equal to <code>:rangeval</code>.</li>
-     *         <li>
-     *         <p>
-     *         <code>rangeAttributeName</code> <i><</i> <code>:rangeval</code> -
-     *         true if the range key is less than <code>:rangeval</code>.</li>
-     *         <li>
-     *         <p>
-     *         <code>rangeAttributeName</code> <i><=</i> <code>:rangeval</code>
-     *         - true if the range key is less than or equal to
-     *         <code>:rangeval</code>.</li>
-     *         <li>
-     *         <p>
-     *         <code>rangeAttributeName</code> <i>></i> <code>:rangeval</code> -
-     *         true if the range key is greater than <code>:rangeval</code>.</li>
-     *         <li>
-     *         <p>
-     *         <code>rangeAttributeName</code> <i>>= </i><code>:rangeval</code>
-     *         - true if the range key is greater than or equal to
-     *         <code>:rangeval</code>.</li>
-     *         <li>
-     *         <p>
-     *         <code>rangeAttributeName</code> <i>BETWEEN</i>
-     *         <code>:rangeval1</code> <i>AND</i> <code>:rangeval2</code> - true
-     *         if the range key is less than or greater than
-     *         <code>:rangeval1</code>, and less than or equal to
-     *         <code>:rangeval2</code>.</li>
-     *         <li>
-     *         <p>
-     *         <i>begins_with (</i><code>rangeAttributeName</code>,
-     *         <code>:rangeval</code><i>)</i> - true if the range key begins
-     *         with a particular operand. Note that the function name
-     *         <code>begins_with</code> is case-sensitive.</li>
-     *         </ul>
-     *         <p>
-     *         Use <i>ExpressionAttributeValues</i> (via
-     *         {@link #withExpressionAttributeValues(Map)}) to replace tokens such as
-     *         <code>:hashval</code> and <code>:rangeval</code> with actual
-     *         values at runtime.
-     *         <p>
-     *         You can optionally use <i>ExpressionAttributeNames</i> (via
-     *         {@link #withExpressionAttributeNames(Map)}) to replace the names of the hash and
-     *         range attributes with placeholder tokens. This might be necessary
-     *         if an attribute name conflicts with a DynamoDB reserved word. For
-     *         example, the following <i>KeyConditionExpression</i> causes an
-     *         error because <i>Size</i> is a reserved word:
-     *         <ul>
-     *         <li> <code>Size = :myval</code></li>
-     *         </ul>
-     *         <p>
-     *         To work around this, define a placeholder (such a
-     *         <code>#myval</code>) to represent the attribute name <i>Size</i>.
-     *         <i>KeyConditionExpression</i> then is as follows:
-     *         <ul>
-     *         <li> <code>#S =
-     *         :myval</code></li>
-     *         </ul>
-     *         <p>
-     *         For a list of reserved words, see <a href=
-     *         "http://docs.aws.amazon.com/amazondynamodb/latest/developerguide/ReservedWords.html"
-     *         >Reserved Words</a> in the <i>Amazon DynamoDB Developer
-     *         Guide</i>.
-     *         <p>
-     *         For more information on <i>ExpressionAttributeNames</i> and
-     *         <i>ExpressionAttributeValues</i>, see <a href=
-     *         "http://docs.aws.amazon.com/amazondynamodb/latest/developerguide/ExpressionPlaceholders.html"
-     *         >Using Placeholders for Attribute Names and Values</a> in the
-     *         <i>Amazon DynamoDB Developer Guide</i>. <note>
-     *         <p>
-     *         <i>KeyConditionExpression</i> replaces the legacy
-     *         <i>KeyConditions</i> parameter. </note>
-     */
-    public String getKeyConditionExpression() {
-        return keyConditionExpression;
-    }
-
-    /**
-     * Sets the condition that specifies the key value(s) for items to be
-     * retrieved by the <i>Query</i> action.
-     * <p>
-     * The condition must perform an equality test on a single hash key value.
-     * The condition can also test for one or more range key values. A
-     * <i>Query</i> can use <i>KeyConditionExpression</i> to retrieve a single
-     * item with a given hash and range key value, or several items that have
-     * the same hash key value but different range key values.
-     * <p>
-     * The hash key equality test is required, and must be specified in the
-     * following format:
-     * <p>
-     * <code>hashAttributeName</code> <i>=</i> <code>:hashval</code>
-     * <p>
-     * If you also want to provide a range key condition, it must be combined
-     * using <i>AND</i> with the hash key condition. Following is an example,
-     * using the <b>=</b> comparison operator for the range key:
-     * <p>
-     * <code>hashAttributeName</code> <i>=</i> <code>:hashval</code> <i>AND</i>
-     * <code>rangeAttributeName</code> <i>=</i> <code>:rangeval</code>
-     * <p>
-     * Valid comparisons for the range key condition are as follows:
-     * <ul>
-     * <li>
-     * <p>
-     * <code>rangeAttributeName</code> <i>=</i> <code>:rangeval</code> - true if
-     * the range key is equal to <code>:rangeval</code>.</li>
-     * <li>
-     * <p>
-     * <code>rangeAttributeName</code> <i><</i> <code>:rangeval</code> - true if
-     * the range key is less than <code>:rangeval</code>.</li>
-     * <li>
-     * <p>
-     * <code>rangeAttributeName</code> <i><=</i> <code>:rangeval</code> - true
-     * if the range key is less than or equal to <code>:rangeval</code>.</li>
-     * <li>
-     * <p>
-     * <code>rangeAttributeName</code> <i>></i> <code>:rangeval</code> - true if
-     * the range key is greater than <code>:rangeval</code>.</li>
-     * <li>
-     * <p>
-     * <code>rangeAttributeName</code> <i>>= </i><code>:rangeval</code> - true
-     * if the range key is greater than or equal to <code>:rangeval</code>.</li>
-     * <li>
-     * <p>
-     * <code>rangeAttributeName</code> <i>BETWEEN</i> <code>:rangeval1</code>
-     * <i>AND</i> <code>:rangeval2</code> - true if the range key is less than
-     * or greater than <code>:rangeval1</code>, and less than or equal to
-     * <code>:rangeval2</code>.</li>
-     * <li>
-     * <p>
-     * <i>begins_with (</i><code>rangeAttributeName</code>,
-     * <code>:rangeval</code><i>)</i> - true if the range key begins with a
-     * particular operand. Note that the function name <code>begins_with</code>
-     * is case-sensitive.</li>
-     * </ul>
-     * <p>
-     * Use <i>ExpressionAttributeValues</i> (via {@link #withExpressionAttributeValues(Map)}) to
-     * replace tokens such as <code>:hashval</code> and <code>:rangeval</code>
-     * with actual values at runtime.
-     * <p>
-     * You can optionally use <i>ExpressionAttributeNames</i> via
-     * {@link #withExpressionAttributeNames(Map)}) to replace the names of the hash and range
-     * attributes with placeholder tokens. This might be necessary if an
-     * attribute name conflicts with a DynamoDB reserved word. For example, the
-     * following <i>KeyConditionExpression</i> causes an error because
-     * <i>Size</i> is a reserved word:
-     * <ul>
-     * <li> <code>Size = :myval</code></li>
-     * </ul>
-     * <p>
-     * To work around this, define a placeholder (such a <code>#myval</code>) to
-     * represent the attribute name <i>Size</i>. <i>KeyConditionExpression</i>
-     * then is as follows:
-     * <ul>
-     * <li> <code>#S =
-     * :myval</code></li>
-     * </ul>
-     * <p>
-     * For a list of reserved words, see <a href=
-     * "http://docs.aws.amazon.com/amazondynamodb/latest/developerguide/ReservedWords.html"
-     * >Reserved Words</a> in the <i>Amazon DynamoDB Developer Guide</i>.
-     * <p>
-     * For more information on <i>ExpressionAttributeNames</i> and
-     * <i>ExpressionAttributeValues</i>, see <a href=
-     * "http://docs.aws.amazon.com/amazondynamodb/latest/developerguide/ExpressionPlaceholders.html"
-     * >Using Placeholders for Attribute Names and Values</a> in the <i>Amazon
-     * DynamoDB Developer Guide</i>. <note>
-     * <p>
-     * <i>KeyConditionExpression</i> replaces the legacy <i>KeyConditions</i>
-     * parameter. </note>
-     * <p>
-     * When a key expression is specified, the corresponding name-map and
-     * value-map can optionally be specified via {@link #withExpressionAttributeNames(Map)} and
-     * {@link #withExpressionAttributeValues(Map)}.
-     */
-    public void setKeyConditionExpression(String keyConditionExpression) {
-        this.keyConditionExpression = keyConditionExpression;
-    }
-
-    public DynamoDbQueryExpression<T> withKeyConditionExpression(
-            String keyConditionExpression) {
-        this.keyConditionExpression = keyConditionExpression;
-        return this;
-    }
-
-    /**
-     * One or more substitution variables for simplifying complex expressions.
-     *
-     * @return One or more substitution variables for simplifying complex
-     *         expressions.
-     * @see QueryRequest#getExpressionAttributeNames()
-     */
-    public java.util.Map<String, String> getExpressionAttributeNames() {
-
-        return expressionAttributeNames;
-    }
-
-    /**
-     * One or more substitution variables for simplifying complex expressions.
-     *
-     * @param expressionAttributeNames
-     *            One or more substitution variables for simplifying complex
-     *            expressions.
-     * @see QueryRequest#setExpressionAttributeNames(Map)
-     */
-    public void setExpressionAttributeNames(
-            java.util.Map<String, String> expressionAttributeNames) {
-        this.expressionAttributeNames = expressionAttributeNames;
-    }
-
-    /**
-     * One or more substitution variables for simplifying complex expressions.
-     *
-     * @param expressionAttributeNames
-     *            One or more substitution variables for simplifying complex
-     *            expressions.
-     *
-     * @return A reference to this updated object so that method calls can be
-     *         chained together.
-     * @see QueryRequest#withExpressionAttributeNames(Map)
-     */
-    public DynamoDbQueryExpression<T> withExpressionAttributeNames(
-            java.util.Map<String, String> expressionAttributeNames) {
-        setExpressionAttributeNames(expressionAttributeNames);
-        return this;
-    }
-
-    /**
-     * One or more substitution variables for simplifying complex expressions.
-     * The method adds a new key-value pair into ExpressionAttributeNames
-     * parameter, and returns a reference to this object so that method calls
-     * can be chained together.
-     *
-     * @param key
-     *            The key of the entry to be added into
-     *            ExpressionAttributeNames.
-     * @param value
-     *            The corresponding value of the entry to be added into
-     *            ExpressionAttributeNames.
-     *
-     * @see QueryRequest#addExpressionAttributeNamesEntry(String, String)
-     */
-    public DynamoDbQueryExpression<T> addExpressionAttributeNamesEntry(
-            String key, String value) {
-        if (null == this.expressionAttributeNames) {
-            this.expressionAttributeNames = new java.util.HashMap<String, String>();
-        }
-        if (this.expressionAttributeNames.containsKey(key)) {
-            throw new IllegalArgumentException("Duplicated keys (" + key + ") are provided.");
-        }
-        this.expressionAttributeNames.put(key, value);
-        return this;
-    }
-
-    /**
-     * Removes all the entries added into ExpressionAttributeNames.
-     * <p>
-     * Returns a reference to this object so that method calls can be chained
-     * together.
-     */
-    public DynamoDbQueryExpression<T> clearExpressionAttributeNamesEntries() {
-        this.expressionAttributeNames = null;
-        return this;
-    }
-
-    /**
-     * One or more values that can be substituted in an expression.
-     *
-     * @return One or more values that can be substituted in an expression.
-     *
-     * @see QueryRequest#getExpressionAttributeValues()
-     */
-    public java.util.Map<String, AttributeValue> getExpressionAttributeValues() {
-
-        return expressionAttributeValues;
-    }
-
-    /**
-     * One or more values that can be substituted in an expression.
-     *
-     * @param expressionAttributeValues
-     *            One or more values that can be substituted in an expression.
-     *
-     * @see QueryRequest#setExpressionAttributeValues(Map)
-     */
-    public void setExpressionAttributeValues(
-            java.util.Map<String, AttributeValue> expressionAttributeValues) {
-        this.expressionAttributeValues = expressionAttributeValues;
-    }
-
-    /**
-     * One or more values that can be substituted in an expression.
-     *
-     * @param expressionAttributeValues
-     *            One or more values that can be substituted in an expression.
-     *
-     * @return A reference to this updated object so that method calls can be
-     *         chained together.
-     * @see QueryRequest#withExpressionAttributeValues(Map)
-     */
-    public DynamoDbQueryExpression<T> withExpressionAttributeValues(
-            java.util.Map<String, AttributeValue> expressionAttributeValues) {
-        setExpressionAttributeValues(expressionAttributeValues);
-        return this;
-    }
-
-    /**
-     * One or more values that can be substituted in an expression. The method
-     * adds a new key-value pair into ExpressionAttributeValues parameter, and
-     * returns a reference to this object so that method calls can be chained
-     * together.
-     *
-     * @param key
-     *            The key of the entry to be added into
-     *            ExpressionAttributeValues.
-     * @param value
-     *            The corresponding value of the entry to be added into
-     *            ExpressionAttributeValues.
-     *
-     * @see QueryRequest#addExpressionAttributeValuesEntry(String,
-     *      AttributeValue)
-     */
-    public DynamoDbQueryExpression<T> addExpressionAttributeValuesEntry(
-            String key, AttributeValue value) {
-        if (null == this.expressionAttributeValues) {
-            this.expressionAttributeValues = new java.util.HashMap<String, AttributeValue>();
-        }
-        if (this.expressionAttributeValues.containsKey(key)) {
-            throw new IllegalArgumentException("Duplicated keys (" + key + ") are provided.");
-        }
-        this.expressionAttributeValues.put(key, value);
-        return this;
-    }
-
-    /**
-     * Removes all the entries added into ExpressionAttributeValues.
-     * <p>
-     * Returns a reference to this object so that method calls can be chained
-     * together.
-     */
-    public DynamoDbQueryExpression<T> clearExpressionAttributeValuesEntries() {
-        this.expressionAttributeValues = null;
-        return this;
-    }
-
-    /**
-     * The attributes to be returned in the result. You can retrieve all item
-     * attributes, specific item attributes, the count of matching items, or
-     * in the case of an index, some or all of the attributes projected into
-     * the index.
-     * <p>
-     * <b>Constraints:</b><br/>
-     * <b>Allowed Values: </b>ALL_ATTRIBUTES, ALL_PROJECTED_ATTRIBUTES, SPECIFIC_ATTRIBUTES, COUNT
-     *
-     * @return The attributes to be returned in the result. You can retrieve all item
-     *         attributes, specific item attributes, the count of matching items, or
-     *         in the case of an index, some or all of the attributes projected into
-     *         the index.
-     *
-     * @see software.amazon.awssdk.services.dynamodb.model.Select
-     */
-    public String select() {
-        return select;
-    }
-
-    /**
-     * The attributes to be returned in the result. You can retrieve all item
-     * attributes, specific item attributes, the count of matching items, or
-     * in the case of an index, some or all of the attributes projected into
-     * the index.
-     * <p>
-     * <b>Constraints:</b><br/>
-     * <b>Allowed Values: </b>ALL_ATTRIBUTES, ALL_PROJECTED_ATTRIBUTES, SPECIFIC_ATTRIBUTES, COUNT
-     *
-     * @param select The attributes to be returned in the result. You can retrieve all item
-     *         attributes, specific item attributes, the count of matching items, or
-     *         in the case of an index, some or all of the attributes projected into
-     *         the index.
-     *
-     * @see software.amazon.awssdk.services.dynamodb.model.Select
-     */
-    public void setSelect(String select) {
-        this.select = select;
-    }
-
-    /**
-     * The attributes to be returned in the result. You can retrieve all item
-     * attributes, specific item attributes, the count of matching items, or
-     * in the case of an index, some or all of the attributes projected into
-     * the index.
-     * <p>
-     * <b>Constraints:</b><br/>
-     * <b>Allowed Values: </b>ALL_ATTRIBUTES, ALL_PROJECTED_ATTRIBUTES, SPECIFIC_ATTRIBUTES, COUNT
-     *
-     * @param select The attributes to be returned in the result. You can retrieve all item
-     *         attributes, specific item attributes, the count of matching items, or
-     *         in the case of an index, some or all of the attributes projected into
-     *         the index.
-     *
-     * @see software.amazon.awssdk.services.dynamodb.model.Select
-     */
-    public void setSelect(Select select) {
-        this.select = select.toString();
-    }
-
-    /**
-     * The attributes to be returned in the result. You can retrieve all item
-     * attributes, specific item attributes, the count of matching items, or
-     * in the case of an index, some or all of the attributes projected into
-     * the index.
-     * <p>
-     * Returns a reference to this object so that method calls can be chained together.
-     * <p>
-     * <b>Constraints:</b><br/>
-     * <b>Allowed Values: </b>ALL_ATTRIBUTES, ALL_PROJECTED_ATTRIBUTES, SPECIFIC_ATTRIBUTES, COUNT
-     *
-     * @param select The attributes to be returned in the result. You can retrieve all item
-     *         attributes, specific item attributes, the count of matching items, or
-     *         in the case of an index, some or all of the attributes projected into
-     *         the index.
-     *
-     * @return A reference to this updated object so that method calls can be chained
-     *         together.
-     *
-     * @see software.amazon.awssdk.services.dynamodb.model.Select
-     */
-    public DynamoDbQueryExpression<T> withSelect(String select) {
-        this.select = select;
-        return this;
-    }
-
-    /**
-     * The attributes to be returned in the result. You can retrieve all item
-     * attributes, specific item attributes, the count of matching items, or
-     * in the case of an index, some or all of the attributes projected into
-     * the index.
-     * <p>
-     * Returns a reference to this object so that method calls can be chained together.
-     * <p>
-     * <b>Constraints:</b><br/>
-     * <b>Allowed Values: </b>ALL_ATTRIBUTES, ALL_PROJECTED_ATTRIBUTES, SPECIFIC_ATTRIBUTES, COUNT
-     *
-     * @param select The attributes to be returned in the result. You can retrieve all item
-     *         attributes, specific item attributes, the count of matching items, or
-     *         in the case of an index, some or all of the attributes projected into
-     *         the index.
-     *
-     * @return A reference to this updated object so that method calls can be chained
-     *         together.
-     *
-     * @see software.amazon.awssdk.services.dynamodb.model.Select
-     */
-    public DynamoDbQueryExpression<T> withSelect(Select select) {
-        this.select = select.toString();
-        return this;
-    }
-
-    /**
-     * A string that identifies one or more attributes to retrieve from the
-     * table. These attributes can include scalars, sets, or elements of a
-     * JSON document. The attributes in the expression must be separated by
-     * commas. <p>If no attribute names are specified, then all attributes
-     * will be returned. If any of the requested attributes are not found,
-     * they will not appear in the result. <p>For more information, go to <a
-     * href="http://docs.aws.amazon.com/amazondynamodb/latest/developerguide/Expressions.AccessingItemAttributes.html">Accessing
-     * Item Attributes</a> in the <i>Amazon DynamoDB Developer Guide</i>.
-     *
-     * @return A string that identifies one or more attributes to retrieve from the
-     *         table. These attributes can include scalars, sets, or elements of a
-     *         JSON document. The attributes in the expression must be separated by
-     *         commas. <p>If no attribute names are specified, then all attributes
-     *         will be returned. If any of the requested attributes are not found,
-     *         they will not appear in the result. <p>For more information, go to <a
-     *         href="http://docs.aws.amazon.com/amazondynamodb/latest/developerguide/Expressions.AccessingItemAttributes.html">Accessing
-     *         Item Attributes</a> in the <i>Amazon DynamoDB Developer Guide</i>.
-     */
-    public String getProjectionExpression() {
-        return projectionExpression;
-    }
-
-    /**
-     * A string that identifies one or more attributes to retrieve from the
-     * table. These attributes can include scalars, sets, or elements of a
-     * JSON document. The attributes in the expression must be separated by
-     * commas. <p>If no attribute names are specified, then all attributes
-     * will be returned. If any of the requested attributes are not found,
-     * they will not appear in the result. <p>For more information, go to <a
-     * href="http://docs.aws.amazon.com/amazondynamodb/latest/developerguide/Expressions.AccessingItemAttributes.html">Accessing
-     * Item Attributes</a> in the <i>Amazon DynamoDB Developer Guide</i>.
-     *
-     * @param projectionExpression A string that identifies one or more attributes to retrieve from the
-     *         table. These attributes can include scalars, sets, or elements of a
-     *         JSON document. The attributes in the expression must be separated by
-     *         commas. <p>If no attribute names are specified, then all attributes
-     *         will be returned. If any of the requested attributes are not found,
-     *         they will not appear in the result. <p>For more information, go to <a
-     *         href="http://docs.aws.amazon.com/amazondynamodb/latest/developerguide/Expressions.AccessingItemAttributes.html">Accessing
-     *         Item Attributes</a> in the <i>Amazon DynamoDB Developer Guide</i>.
-     */
-    public void setProjectionExpression(String projectionExpression) {
-        this.projectionExpression = projectionExpression;
-    }
-
-    /**
-     * A string that identifies one or more attributes to retrieve from the
-     * table. These attributes can include scalars, sets, or elements of a
-     * JSON document. The attributes in the expression must be separated by
-     * commas. <p>If no attribute names are specified, then all attributes
-     * will be returned. If any of the requested attributes are not found,
-     * they will not appear in the result. <p>For more information, go to <a
-     * href="http://docs.aws.amazon.com/amazondynamodb/latest/developerguide/Expressions.AccessingItemAttributes.html">Accessing
-     * Item Attributes</a> in the <i>Amazon DynamoDB Developer Guide</i>.
-     * <p>
-     * Returns a reference to this object so that method calls can be chained together.
-     *
-     * @param projectionExpression A string that identifies one or more attributes to retrieve from the
-     *         table. These attributes can include scalars, sets, or elements of a
-     *         JSON document. The attributes in the expression must be separated by
-     *         commas. <p>If no attribute names are specified, then all attributes
-     *         will be returned. If any of the requested attributes are not found,
-     *         they will not appear in the result. <p>For more information, go to <a
-     *         href="http://docs.aws.amazon.com/amazondynamodb/latest/developerguide/Expressions.AccessingItemAttributes.html">Accessing
-     *         Item Attributes</a> in the <i>Amazon DynamoDB Developer Guide</i>.
-     *
-     * @return A reference to this updated object so that method calls can be chained
-     *         together.
-     */
-    public DynamoDbQueryExpression<T> withProjectionExpression(String projectionExpression) {
-        this.projectionExpression = projectionExpression;
-        return this;
-    }
-
-    /**
-     * A value that if set to <code>TOTAL</code>, the response includes
-     * <i>ConsumedCapacity</i> data for tables and indexes. If set to
-     * <code>INDEXES</code>, the response includes <i>ConsumedCapacity</i>
-     * for indexes. If set to <code>NONE</code> (the default),
-     * <i>ConsumedCapacity</i> is not included in the response.
-     * <p>
-     * <b>Constraints:</b><br/>
-     * <b>Allowed Values: </b>INDEXES, TOTAL, NONE
-     * <p>
-     * If enabled, the underlying request to DynamoDB will include the
-     * configured parameter value and the low-level response from DynamoDB will
-     * include the amount of capacity consumed by the query. Currently, the
-     * consumed capacity is only exposed through the DynamoDBMapper when you
-     * call {@code DynamoDBMapper.queryPage}, not {@code DynamoDBMapper.query}.
-     *
-     * @return A value that if set to <code>TOTAL</code>, the response includes
-     *         <i>ConsumedCapacity</i> data for tables and indexes. If set to
-     *         <code>INDEXES</code>, the response includes <i>ConsumedCapacity</i>
-     *         for indexes. If set to <code>NONE</code> (the default),
-     *         <i>ConsumedCapacity</i> is not included in the response.
-     *
-     * @see software.amazon.awssdk.services.dynamodb.model.ReturnConsumedCapacity
-     */
-    public String getReturnConsumedCapacity() {
-        return returnConsumedCapacity;
-    }
-
-    /**
-     * A value that if set to <code>TOTAL</code>, the response includes
-     * <i>ConsumedCapacity</i> data for tables and indexes. If set to
-     * <code>INDEXES</code>, the response includes <i>ConsumedCapacity</i>
-     * for indexes. If set to <code>NONE</code> (the default),
-     * <i>ConsumedCapacity</i> is not included in the response.
-     * <p>
-     * <b>Constraints:</b><br/>
-     * <b>Allowed Values: </b>INDEXES, TOTAL, NONE
-     * <p>
-     * If enabled, the underlying request to DynamoDB will include the
-     * configured parameter value and the low-level response from DynamoDB will
-     * include the amount of capacity consumed by the query. Currently, the
-     * consumed capacity is only exposed through the DynamoDBMapper when you
-     * call {@code DynamoDBMapper.queryPage}, not {@code DynamoDBMapper.query}.
-     *
-     * @param returnConsumedCapacity A value that if set to <code>TOTAL</code>, the response includes
-     *         <i>ConsumedCapacity</i> data for tables and indexes. If set to
-     *         <code>INDEXES</code>, the response includes <i>ConsumedCapacity</i>
-     *         for indexes. If set to <code>NONE</code> (the default),
-     *         <i>ConsumedCapacity</i> is not included in the response.
-     *
-     * @see software.amazon.awssdk.services.dynamodb.model.ReturnConsumedCapacity
-     */
-    public void setReturnConsumedCapacity(String returnConsumedCapacity) {
-        this.returnConsumedCapacity = returnConsumedCapacity;
-    }
-
-    /**
-     * A value that if set to <code>TOTAL</code>, the response includes
-     * <i>ConsumedCapacity</i> data for tables and indexes. If set to
-     * <code>INDEXES</code>, the response includes <i>ConsumedCapacity</i>
-     * for indexes. If set to <code>NONE</code> (the default),
-     * <i>ConsumedCapacity</i> is not included in the response.
-     * <p>
-     * <b>Constraints:</b><br/>
-     * <b>Allowed Values: </b>INDEXES, TOTAL, NONE
-     * <p>
-     * If enabled, the underlying request to DynamoDB will include the
-     * configured parameter value and the low-level response from DynamoDB will
-     * include the amount of capacity consumed by the query. Currently, the
-     * consumed capacity is only exposed through the DynamoDBMapper when you
-     * call {@code DynamoDBMapper.queryPage}, not {@code DynamoDBMapper.query}.
-     *
-     * @param returnConsumedCapacity A value that if set to <code>TOTAL</code>, the response includes
-     *         <i>ConsumedCapacity</i> data for tables and indexes. If set to
-     *         <code>INDEXES</code>, the response includes <i>ConsumedCapacity</i>
-     *         for indexes. If set to <code>NONE</code> (the default),
-     *         <i>ConsumedCapacity</i> is not included in the response.
-     *
-     * @see software.amazon.awssdk.services.dynamodb.model.ReturnConsumedCapacity
-     */
-    public void setReturnConsumedCapacity(ReturnConsumedCapacity returnConsumedCapacity) {
-        this.returnConsumedCapacity = returnConsumedCapacity.toString();
-    }
-
-    /**
-     * A value that if set to <code>TOTAL</code>, the response includes
-     * <i>ConsumedCapacity</i> data for tables and indexes. If set to
-     * <code>INDEXES</code>, the response includes <i>ConsumedCapacity</i>
-     * for indexes. If set to <code>NONE</code> (the default),
-     * <i>ConsumedCapacity</i> is not included in the response.
-     * <p>
-     * Returns a reference to this object so that method calls can be chained together.
-     * <p>
-     * <b>Constraints:</b><br/>
-     * <b>Allowed Values: </b>INDEXES, TOTAL, NONE
-     * <p>
-     * If enabled, the underlying request to DynamoDB will include the
-     * configured parameter value and the low-level response from DynamoDB will
-     * include the amount of capacity consumed by the query. Currently, the
-     * consumed capacity is only exposed through the DynamoDBMapper when you
-     * call {@code DynamoDBMapper.queryPage}, not {@code DynamoDBMapper.query}.
-     *
-     * @param returnConsumedCapacity A value that if set to <code>TOTAL</code>, the response includes
-     *         <i>ConsumedCapacity</i> data for tables and indexes. If set to
-     *         <code>INDEXES</code>, the response includes <i>ConsumedCapacity</i>
-     *         for indexes. If set to <code>NONE</code> (the default),
-     *         <i>ConsumedCapacity</i> is not included in the response.
-     *
-     * @return A reference to this updated object so that method calls can be chained
-     *         together.
-     *
-     * @see software.amazon.awssdk.services.dynamodb.model.ReturnConsumedCapacity
-     */
-    public DynamoDbQueryExpression<T> withReturnConsumedCapacity(String returnConsumedCapacity) {
-        this.returnConsumedCapacity = returnConsumedCapacity;
-        return this;
-    }
-
-    /**
-     * A value that if set to <code>TOTAL</code>, the response includes
-     * <i>ConsumedCapacity</i> data for tables and indexes. If set to
-     * <code>INDEXES</code>, the response includes <i>ConsumedCapacity</i>
-     * for indexes. If set to <code>NONE</code> (the default),
-     * <i>ConsumedCapacity</i> is not included in the response.
-     * <p>
-     * Returns a reference to this object so that method calls can be chained together.
-     * <p>
-     * <b>Constraints:</b><br/>
-     * <b>Allowed Values: </b>INDEXES, TOTAL, NONE
-     * <p>
-     * If enabled, the underlying request to DynamoDB will include the
-     * configured parameter value and the low-level response from DynamoDB will
-     * include the amount of capacity consumed by the query. Currently, the
-     * consumed capacity is only exposed through the DynamoDBMapper when you
-     * call {@code DynamoDBMapper.queryPage}, not {@code DynamoDBMapper.query}.
-     *
-     * @param returnConsumedCapacity A value that if set to <code>TOTAL</code>, the response includes
-     *         <i>ConsumedCapacity</i> data for tables and indexes. If set to
-     *         <code>INDEXES</code>, the response includes <i>ConsumedCapacity</i>
-     *         for indexes. If set to <code>NONE</code> (the default),
-     *         <i>ConsumedCapacity</i> is not included in the response.
-     *
-     * @return A reference to this updated object so that method calls can be chained
-     *         together.
-     *
-     * @see software.amazon.awssdk.services.dynamodb.model.ReturnConsumedCapacity
-     */
-    public DynamoDbQueryExpression<T> withReturnConsumedCapacity(ReturnConsumedCapacity returnConsumedCapacity) {
-        this.returnConsumedCapacity = returnConsumedCapacity.toString();
-        return this;
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbRangeKey.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbRangeKey.java
deleted file mode 100644
index c2912a8017a8..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbRangeKey.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Annotation for marking a property in a class as the range key for a DynamoDB
- * table. Applied to the getter method or the class field for the range key
- * property. If the annotation is applied directly to the class field, the
- * corresponding getter and setter must be declared in the same class.
- * <p>
- * This annotation is required for tables that use a range key.
- */
-@DynamoDb
-@DynamoDbKeyed(software.amazon.awssdk.services.dynamodb.model.KeyType.RANGE)
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.FIELD, ElementType.METHOD})
-public @interface DynamoDbRangeKey {
-
-    /**
-     * Optional parameter when the name of the attribute as stored in DynamoDB
-     * should differ from the name used by the getter / setter.
-     */
-    String attributeName() default "";
-
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbSaveExpression.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbSaveExpression.java
deleted file mode 100644
index 1b4bd98cb763..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbSaveExpression.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-import java.util.HashMap;
-import java.util.Map;
-import software.amazon.awssdk.services.dynamodb.model.ConditionalOperator;
-import software.amazon.awssdk.services.dynamodb.model.ExpectedAttributeValue;
-
-/**
- * Enables adding options to a save operation.
- * For example, you may want to save only if an attribute has a particular value.
- * @see DynamoDbMapper#save(Object, DynamoDbSaveExpression)
- */
-public class DynamoDbSaveExpression {
-
-    /** Optional expected attributes. */
-    private Map<String, ExpectedAttributeValue> expectedAttributes;
-
-    /**
-     * The logical operator on the expected value conditions of this save
-     * operation.
-     */
-    private String conditionalOperator;
-
-    /**
-     * Gets the map of attribute names to expected attribute values to check on save.
-     *
-     * @return The map of attribute names to expected attribute value conditions to check on save
-     */
-    public Map<String, ExpectedAttributeValue> getExpected() {
-        return expectedAttributes;
-    }
-
-    /**
-     * Sets the expected condition to the map of attribute names to expected attribute values given.
-     *
-     * @param expectedAttributes
-     *            The map of attribute names to expected attribute value conditions to check on save
-     */
-    public void setExpected(Map<String, ExpectedAttributeValue> expectedAttributes) {
-        this.expectedAttributes = expectedAttributes;
-    }
-
-    /**
-     * Sets the expected condition to the map of attribute names to expected
-     * attribute values given and returns a pointer to this object for
-     * method-chaining.
-     *
-     * @param expectedAttributes
-     *            The map of attribute names to expected attribute value
-     *            conditions to check on save
-     */
-    public DynamoDbSaveExpression withExpected(Map<String, ExpectedAttributeValue> expectedAttributes) {
-        setExpected(expectedAttributes);
-        return this;
-    }
-
-    /**
-     * Adds one entry to the expected conditions and returns a pointer to this
-     * object for method-chaining.
-     *
-     * @param attributeName
-     *            The name of the attribute.
-     * @param expected
-     *            The expected attribute value.
-     */
-    public DynamoDbSaveExpression withExpectedEntry(String attributeName, ExpectedAttributeValue expected) {
-        if (expectedAttributes == null) {
-            expectedAttributes = new HashMap<String, ExpectedAttributeValue>();
-        }
-        expectedAttributes.put(attributeName, expected);
-        return this;
-    }
-
-    /**
-     * Returns the logical operator on the expected value conditions of this save
-     * operation.
-     */
-    public String getConditionalOperator() {
-        return conditionalOperator;
-    }
-
-    /**
-     * Sets the logical operator on the expected value conditions of this save
-     * operation.
-     */
-    public void setConditionalOperator(String conditionalOperator) {
-        this.conditionalOperator = conditionalOperator;
-    }
-
-    /**
-     * Sets the logical operator on the expected value conditions of this save
-     * operation.
-     */
-    public void setConditionalOperator(ConditionalOperator conditionalOperator) {
-        setConditionalOperator(conditionalOperator.toString());
-    }
-
-    /**
-     * Sets the logical operator on the expected value conditions of this save
-     * operation and returns a pointer to this object for method-chaining.
-     */
-    public DynamoDbSaveExpression withConditionalOperator(String conditionalOperator) {
-        setConditionalOperator(conditionalOperator);
-        return this;
-    }
-
-    /**
-     * Sets the logical operator on the expected value conditions of this save
-     * operation and returns a pointer to this object for method-chaining.
-     */
-    public DynamoDbSaveExpression withConditionalOperator(ConditionalOperator conditionalOperator) {
-        return withConditionalOperator(conditionalOperator.toString());
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbScalarAttribute.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbScalarAttribute.java
deleted file mode 100644
index 7844543ca3b9..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbScalarAttribute.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-import software.amazon.awssdk.services.dynamodb.model.ScalarAttributeType;
-
-/**
- * @Deprecated - Replaced by {@link DynamoDbTyped}
- */
-@Deprecated
-@DynamoDb
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.FIELD, ElementType.METHOD})
-public @interface DynamoDbScalarAttribute {
-
-    /**
-     * Optional parameter when the name of the attribute as stored in DynamoDB
-     * should differ from the name used by the getter / setter.
-     */
-    String attributeName() default "";
-
-    /**
-     * The scalar attribute type.
-     * @see software.amazon.awssdk.services.dynamodb.model.ScalarAttributeType
-     */
-    ScalarAttributeType type();
-
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbScanExpression.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbScanExpression.java
deleted file mode 100644
index fe1facd5c22f..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbScanExpression.java
+++ /dev/null
@@ -1,1017 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-import java.util.HashMap;
-import java.util.Map;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-import software.amazon.awssdk.services.dynamodb.model.ComparisonOperator;
-import software.amazon.awssdk.services.dynamodb.model.Condition;
-import software.amazon.awssdk.services.dynamodb.model.ConditionalOperator;
-import software.amazon.awssdk.services.dynamodb.model.ReturnConsumedCapacity;
-import software.amazon.awssdk.services.dynamodb.model.ScanRequest;
-import software.amazon.awssdk.services.dynamodb.model.Select;
-
-/**
- * Options for filtering results from a scan operation. For example, callers can
- * specify filter conditions so that only objects whose attributes match
- * different conditions are returned (see {@link ComparisonOperator} for more
- * information on the available comparison types).
- *
- * @see DynamoDbMapper#scan(Class, DynamoDbScanExpression)
- */
-public class DynamoDbScanExpression {
-
-    /** Optional filter to limit the results of the scan. */
-    private Map<String, Condition> scanFilter;
-
-    /** The exclusive start key for this scan. */
-    private Map<String, AttributeValue> exclusiveStartKey;
-
-    /** The limit of items to scan during this scan. */
-    private Integer limit;
-
-    /**
-     * The total number of segments into which the scan will be divided.
-     * Only required for parallel scan operation.
-     */
-    private Integer totalSegments;
-
-    /**
-     * The ID (zero-based) of the segment to be scanned.
-     * Only required for parallel scan operation.
-     */
-    private Integer segment;
-
-    /**
-     * The logical operator on the filter conditions of this scan.
-     */
-    private String conditionalOperator;
-
-    /**
-     * Evaluates the scan results and returns only the desired values. <p>The
-     * condition you specify is applied to the items scanned; any items that
-     * do not match the expression are not returned.
-     */
-    private String filterExpression;
-
-    /**
-     * One or more substitution variables for simplifying complex
-     * expressions. The following are some use cases for an
-     * ExpressionAttributeName: <ul> <li> <p>Shorten an attribute name that
-     * is very long or unwieldy in an expression. </li> <li> <p>Create a
-     * placeholder for repeating occurrences of an attribute name in an
-     * expression. </li> <li> <p>Prevent special characters in an attribute
-     * name from being misinterpreted in an expression. </li> </ul> <p>Use
-     * the <b>#</b> character in an expression to dereference an attribute
-     * name. For example, consider the following expression:
-     * <ul><li><p><code>order.customerInfo.LastName = "Smith" OR
-     * order.customerInfo.LastName = "Jones"</code></li></ul> <p>Now suppose
-     * that you specified the following for <i>ExpressionAttributeNames</i>:
-     * <ul><li><p><code>{"n":"order.customerInfo.LastName"}</code></li></ul>
-     * <p>The expression can now be simplified as follows:
-     * <ul><li><p><code>#n = "Smith" OR #n = "Jones"</code></li></ul>
-     */
-    private java.util.Map<String, String> expressionAttributeNames;
-
-    /**
-     * One or more values that can be substituted in an expression. <p>Use
-     * the <b>:</b> character in an expression to dereference an attribute
-     * value. For example, consider the following expression:
-     * <ul><li><p><code>ProductStatus IN
-     * ("Available","Backordered","Discontinued")</code></li></ul> <p>Now
-     * suppose that you specified the following for
-     * <i>ExpressionAttributeValues</i>: <ul><li><p><code>{
-     * "a":{"S":"Available"}, "b":{"S":"Backordered"},
-     * "d":{"S":"Discontinued"} }</code></li></ul> <p>The expression can now
-     * be simplified as follows: <ul><li> <p><code>ProductStatus IN
-     * (:a,:b,:c)</code></li></ul>
-     */
-    private java.util.Map<String, AttributeValue> expressionAttributeValues;
-
-    /**
-     * The attributes to be returned in the result. You can retrieve all item
-     * attributes, specific item attributes, the count of matching items, or
-     * in the case of an index, some or all of the attributes projected into
-     * the index. <ul> <li> <p><code>ALL_ATTRIBUTES</code> - Returns all of
-     * the item attributes from the specified table or index. If you query a
-     * local secondary index, then for each matching item in the index
-     * DynamoDB will fetch the entire item from the parent table. If the
-     * index is configured to project all item attributes, then all of the
-     * data can be obtained from the local secondary index, and no fetching
-     * is required. </li> <li> <p><code>ALL_PROJECTED_ATTRIBUTES</code> -
-     * Allowed only when querying an index. Retrieves all attributes that
-     * have been projected into the index. If the index is configured to
-     * project all attributes, this return value is equivalent to specifying
-     * <code>ALL_ATTRIBUTES</code>. </li> <li> <p><code>COUNT</code> -
-     * Returns the number of matching items, rather than the matching items
-     * themselves. </li> <li> <p> <code>SPECIFIC_ATTRIBUTES</code> - Returns
-     * only the attributes listed in <i>AttributesToGet</i>. This return
-     * value is equivalent to specifying <i>AttributesToGet</i> without
-     * specifying any value for <i>Select</i>. <p>If you query a local
-     * secondary index and request only attributes that are projected into
-     * that index, the operation will read only the index and not the table.
-     * If any of the requested attributes are not projected into the local
-     * secondary index, DynamoDB will fetch each of these attributes from the
-     * parent table. This extra fetching incurs additional throughput cost
-     * and latency. <p>If you query a global secondary index, you can only
-     * request attributes that are projected into the index. Global secondary
-     * index queries cannot fetch attributes from the parent table. </li>
-     * </ul> <p>If neither <i>Select</i> nor <i>AttributesToGet</i> are
-     * specified, DynamoDB defaults to <code>ALL_ATTRIBUTES</code> when
-     * accessing a table, and <code>ALL_PROJECTED_ATTRIBUTES</code> when
-     * accessing an index. You cannot use both <i>Select</i> and
-     * <i>AttributesToGet</i> together in a single request, unless the value
-     * for <i>Select</i> is <code>SPECIFIC_ATTRIBUTES</code>. (This usage is
-     * equivalent to specifying <i>AttributesToGet</i> without any value for
-     * <i>Select</i>.)
-     * <p>
-     * <b>Constraints:</b><br/>
-     * <b>Allowed Values: </b>ALL_ATTRIBUTES, ALL_PROJECTED_ATTRIBUTES, SPECIFIC_ATTRIBUTES, COUNT
-     */
-    private String select;
-
-    /**
-     * A string that identifies one or more attributes to retrieve from the
-     * table. These attributes can include scalars, sets, or elements of a
-     * JSON document. The attributes in the expression must be separated by
-     * commas. <p>If no attribute names are specified, then all attributes
-     * will be returned. If any of the requested attributes are not found,
-     * they will not appear in the result. <p>For more information, go to <a
-     * href="http://docs.aws.amazon.com/amazondynamodb/latest/developerguide/Expressions.AccessingItemAttributes.html">Accessing
-     * Item Attributes</a> in the <i>Amazon DynamoDB Developer Guide</i>.
-     */
-    private String projectionExpression;
-
-    /**
-     * A value that if set to <code>TOTAL</code>, the response includes
-     * <i>ConsumedCapacity</i> data for tables and indexes. If set to
-     * <code>INDEXES</code>, the response includes <i>ConsumedCapacity</i>
-     * for indexes. If set to <code>NONE</code> (the default),
-     * <i>ConsumedCapacity</i> is not included in the response.
-     * <p>
-     * <b>Constraints:</b><br/>
-     * <b>Allowed Values: </b>INDEXES, TOTAL, NONE
-     * <p>
-     * If enabled, the underlying request to DynamoDB will include the
-     * configured parameter value and the low-level response from DynamoDB will
-     * include the amount of capacity consumed by the scan. Currently, the
-     * consumed capacity is only exposed through the DynamoDBMapper when you
-     * call {@code DynamoDBMapper.scanPage}, not {@code DynamoDBMapper.scan}.
-     */
-    private String returnConsumedCapacity;
-
-    /**
-     * Optional index name that can be specified for the scan operation.
-     */
-    private String indexName;
-
-    private Boolean consistentRead;
-
-    /**
-     * Returns the name of the index to be used by this scan; or null if there
-     * is none.
-     */
-    public String getIndexName() {
-        return indexName;
-    }
-
-    /**
-     * Sets the name of the index to be used by this scan.
-     */
-    public void setIndexName(String indexName) {
-        this.indexName = indexName;
-    }
-
-    /**
-     * Sets the name of the index to be used by this scan.
-     * <p>
-     * Returns a pointer to this object for method-chaining.
-     */
-    public DynamoDbScanExpression withIndexName(String indexName) {
-        setIndexName(indexName);
-        return this;
-    }
-
-    /**
-     * Returns the scan filter as a map of attribute names to conditions.
-     *
-     * @return The scan filter as a map of attribute names to conditions.
-     */
-    public Map<String, Condition> scanFilter() {
-        return scanFilter;
-    }
-
-    /**
-     * Sets the scan filter to the map of attribute names to conditions given.
-     *
-     * @param scanFilter
-     *            The map of attribute names to conditions to use when filtering
-     *            scan results.
-     */
-    public void setScanFilter(Map<String, Condition> scanFilter) {
-        this.scanFilter = scanFilter;
-    }
-
-    /**
-     * Sets the scan filter to the map of attribute names to conditions given
-     * and returns a pointer to this object for method-chaining.
-     *
-     * @param scanFilter
-     *            The map of attribute names to conditions to use when filtering
-     *            scan results.
-     */
-    public DynamoDbScanExpression withScanFilter(Map<String, Condition> scanFilter) {
-        setScanFilter(scanFilter);
-        return this;
-    }
-
-    /**
-     * Adds a new filter condition to the current scan filter.
-     *
-     * @param attributeName
-     *            The name of the attribute on which the specified condition
-     *            operates.
-     * @param condition
-     *            The condition which describes how the specified attribute is
-     *            compared and if a row of data is included in the results
-     *            returned by the scan operation.
-     */
-    public void addFilterCondition(String attributeName, Condition condition) {
-        if (scanFilter == null) {
-            scanFilter = new HashMap<String, Condition>();
-        }
-
-        scanFilter.put(attributeName, condition);
-    }
-
-    /**
-     * Adds a new filter condition to the current scan filter and returns a
-     * pointer to this object for method-chaining.
-     *
-     * @param attributeName
-     *            The name of the attribute on which the specified condition
-     *            operates.
-     * @param condition
-     *            The condition which describes how the specified attribute is
-     *            compared and if a row of data is included in the results
-     *            returned by the scan operation.
-     */
-    public DynamoDbScanExpression withFilterConditionEntry(String attributeName, Condition condition) {
-        if (scanFilter == null) {
-            scanFilter = new HashMap<String, Condition>();
-        }
-
-        scanFilter.put(attributeName, condition);
-        return this;
-    }
-
-
-    /**
-     * Returns the exclusive start key for this scan.
-     */
-    public Map<String, AttributeValue> getExclusiveStartKey() {
-        return exclusiveStartKey;
-    }
-
-    /**
-     * Sets the exclusive start key for this scan.
-     */
-    public void setExclusiveStartKey(Map<String, AttributeValue> exclusiveStartKey) {
-        this.exclusiveStartKey = exclusiveStartKey;
-    }
-
-    /**
-     * Sets the exclusive start key for this scan and returns a pointer to this
-     * object for method-chaining.
-     */
-    public DynamoDbScanExpression withExclusiveStartKey(Map<String, AttributeValue> exclusiveStartKey) {
-        this.exclusiveStartKey = exclusiveStartKey;
-        return this;
-    }
-
-    /**
-     * Returns the limit of items to scan during this scan.
-     * <p>
-     * Use with caution. Please note that this is <b>not</b> the same as the
-     * number of items to return from the scan operation -- the operation will
-     * cease and return as soon as this many items are scanned, even if no
-     * matching results are found. Furthermore, {@link PaginatedScanList} will
-     * execute as many scan operations as necessary until it either reaches the
-     * end of the result set as indicated by DynamoDB or enough elements are
-     * available to fulfill the list operation (e.g. iteration). Therefore,
-     * except when scanning without a scan filter, it's usually bad practice to
-     * set a low limit, since doing so will often generate the same amount of
-     * traffic to DynamoDB but with a greater number of round trips and
-     * therefore more overall latency.
-     */
-    public Integer limit() {
-        return limit;
-    }
-
-    /**
-     * Sets the limit of items to scan during this scan. Please note that this
-     * is <b>not</b> the same as the number of items to return from the scan
-     * operation -- the operation will cease and return as soon as this many
-     * items are scanned, even if no matching results are found.
-     *
-     * @see DynamoDbScanExpression#limit()
-     */
-    public void setLimit(Integer limit) {
-        this.limit = limit;
-    }
-
-    /**
-     * Sets the limit of items to scan and returns a pointer to this object for
-     * method-chaining. Please note that this is <b>not</b> the same as the
-     * number of items to return from the scan operation -- the operation will
-     * cease and return as soon as this many items are scanned, even if no
-     * matching results are found.
-     *
-     * @see DynamoDbScanExpression#limit()
-     */
-    public DynamoDbScanExpression withLimit(Integer limit) {
-        this.limit = limit;
-        return this;
-    }
-
-    /**
-     * Returns the total number of segments into which the scan will be divided.
-     */
-    public Integer getTotalSegments() {
-        return totalSegments;
-    }
-
-    /**
-     * Sets the total number of segments into which the scan will be divided.
-     */
-    public void setTotalSegments(Integer totalSegments) {
-        this.totalSegments = totalSegments;
-    }
-
-    /**
-     * Sets the total number of segments into which the scan will be divided and
-     * returns a pointer to this object for method-chaining.
-     */
-    public DynamoDbScanExpression withTotalSegments(Integer totalSegments) {
-        setTotalSegments(totalSegments);
-        return this;
-    }
-
-    /**
-     * Returns the ID of the segment to be scanned.
-     */
-    public Integer segment() {
-        return segment;
-    }
-
-    /**
-     * Sets the ID of the segment to be scanned.
-     */
-    public void setSegment(Integer segment) {
-        this.segment = segment;
-    }
-
-    /**
-     * Sets the ID of the segment to be scanned and returns a pointer to this
-     * object for method-chaining.
-     */
-    public DynamoDbScanExpression withSegment(Integer segment) {
-        setSegment(segment);
-        return this;
-    }
-
-    /**
-     * Returns the logical operator on the filter conditions of this scan.
-     */
-    public String getConditionalOperator() {
-        return conditionalOperator;
-    }
-
-    /**
-     * Sets the logical operator on the filter conditions of this scan.
-     */
-    public void setConditionalOperator(String conditionalOperator) {
-        this.conditionalOperator = conditionalOperator;
-    }
-
-    /**
-     * Sets the logical operator on the filter conditions of this scan.
-     */
-    public void setConditionalOperator(ConditionalOperator conditionalOperator) {
-        setConditionalOperator(conditionalOperator.toString());
-    }
-
-    /**
-     * Sets the logical operator on the filter conditions of this scan and
-     * returns a pointer to this object for method-chaining.
-     */
-    public DynamoDbScanExpression withConditionalOperator(String conditionalOperator) {
-        setConditionalOperator(conditionalOperator);
-        return this;
-    }
-
-    /**
-     * Sets the logical operator on the filter conditions of this scan and
-     * returns a pointer to this object for method-chaining.
-     */
-    public DynamoDbScanExpression withConditionalOperator(ConditionalOperator conditionalOperator) {
-        return withConditionalOperator(conditionalOperator.toString());
-    }
-
-    /**
-     * Evaluates the query results and returns only the desired values.
-     * <p>
-     * The condition you specify is applied to the items queried; any items that
-     * do not match the expression are not returned.
-     *
-     * @return Evaluates the query results and returns only the desired values.
-     *         <p>
-     *         The condition you specify is applied to the items queried; any
-     *         items that do not match the expression are not returned.
-     * @see ScanRequest#getFilterExpression()
-     */
-    public String getFilterExpression() {
-        return filterExpression;
-    }
-
-    /**
-     * Evaluates the query results and returns only the desired values.
-     * <p>
-     * The condition you specify is applied to the items queried; any items that
-     * do not match the expression are not returned.
-     *
-     * @param filterExpression
-     *            Evaluates the query results and returns only the desired
-     *            values.
-     *            <p>
-     *            The condition you specify is applied to the items queried; any
-     *            items that do not match the expression are not returned.
-     * @see ScanRequest#setFilterExpression(String)
-     */
-    public void setFilterExpression(String filterExpression) {
-        this.filterExpression = filterExpression;
-    }
-
-    /**
-     * Evaluates the query results and returns only the desired values.
-     * <p>
-     * The condition you specify is applied to the items queried; any items that
-     * do not match the expression are not returned.
-     * <p>
-     * Returns a reference to this object so that method calls can be chained
-     * together.
-     *
-     * @param filterExpression
-     *            Evaluates the query results and returns only the desired
-     *            values.
-     *            <p>
-     *            The condition you specify is applied to the items queried; any
-     *            items that do not match the expression are not returned.
-     *
-     * @return A reference to this updated object so that method calls can be
-     *         chained together.
-     * @see ScanRequest#withFilterExpression(String)
-     */
-    public DynamoDbScanExpression withFilterExpression(String filterExpression) {
-        this.filterExpression = filterExpression;
-        return this;
-    }
-
-    /**
-     * One or more substitution variables for simplifying complex expressions.
-     *
-     * @return One or more substitution variables for simplifying complex
-     *         expressions.
-     * @see scanRequest#getExpressionAttributeNames()
-     */
-    public java.util.Map<String, String> getExpressionAttributeNames() {
-
-        return expressionAttributeNames;
-    }
-
-    /**
-     * One or more substitution variables for simplifying complex expressions.
-     *
-     * @param expressionAttributeNames
-     *            One or more substitution variables for simplifying complex
-     *            expressions.
-     * @see ScanRequest#setExpressionAttributeNames(Map)
-     */
-    public void setExpressionAttributeNames(
-            java.util.Map<String, String> expressionAttributeNames) {
-        this.expressionAttributeNames = expressionAttributeNames;
-    }
-
-    /**
-     * One or more substitution variables for simplifying complex expressions.
-     *
-     * @param expressionAttributeNames
-     *            One or more substitution variables for simplifying complex
-     *            expressions.
-     *
-     * @return A reference to this updated object so that method calls can be
-     *         chained together.
-     * @see ScanRequest#withExpressionAttributeNames(Map)
-     */
-    public DynamoDbScanExpression withExpressionAttributeNames(
-            java.util.Map<String, String> expressionAttributeNames) {
-        setExpressionAttributeNames(expressionAttributeNames);
-        return this;
-    }
-
-    /**
-     * One or more substitution variables for simplifying complex expressions.
-     * The method adds a new key-value pair into ExpressionAttributeNames
-     * parameter, and returns a reference to this object so that method calls
-     * can be chained together.
-     *
-     * @param key
-     *            The key of the entry to be added into
-     *            ExpressionAttributeNames.
-     * @param value
-     *            The corresponding value of the entry to be added into
-     *            ExpressionAttributeNames.
-     *
-     * @see ScanRequest#addExpressionAttributeNamesEntry(String, String)
-     */
-    public DynamoDbScanExpression addExpressionAttributeNamesEntry(String key,
-                                                                   String value) {
-        if (null == this.expressionAttributeNames) {
-            this.expressionAttributeNames = new java.util.HashMap<String, String>();
-        }
-        if (this.expressionAttributeNames.containsKey(key)) {
-            throw new IllegalArgumentException("Duplicated keys (" + key + ") are provided.");
-        }
-        this.expressionAttributeNames.put(key, value);
-        return this;
-    }
-
-    /**
-     * Removes all the entries added into ExpressionAttributeNames.
-     * <p>
-     * Returns a reference to this object so that method calls can be chained
-     * together.
-     */
-    public DynamoDbScanExpression clearExpressionAttributeNamesEntries() {
-        this.expressionAttributeNames = null;
-        return this;
-    }
-
-    /**
-     * One or more values that can be substituted in an expression.
-     *
-     * @return One or more values that can be substituted in an expression.
-     *
-     * @see ScanRequest#getExpressionAttributeValues()
-     */
-    public java.util.Map<String, AttributeValue> getExpressionAttributeValues() {
-
-        return expressionAttributeValues;
-    }
-
-    /**
-     * One or more values that can be substituted in an expression.
-     *
-     * @param expressionAttributeValues
-     *            One or more values that can be substituted in an expression.
-     *
-     * @see ScanRequest#setExpressionAttributeValues(Map)
-     */
-    public void setExpressionAttributeValues(
-            java.util.Map<String, AttributeValue> expressionAttributeValues) {
-        this.expressionAttributeValues = expressionAttributeValues;
-    }
-
-    /**
-     * One or more values that can be substituted in an expression.
-     *
-     * @param expressionAttributeValues
-     *            One or more values that can be substituted in an expression.
-     *
-     * @return A reference to this updated object so that method calls can be
-     *         chained together.
-     * @see ScanRequest#withExpressionAttributeValues(Map)
-     */
-    public DynamoDbScanExpression withExpressionAttributeValues(
-            java.util.Map<String, AttributeValue> expressionAttributeValues) {
-        setExpressionAttributeValues(expressionAttributeValues);
-        return this;
-    }
-
-    /**
-     * One or more values that can be substituted in an expression. The method
-     * adds a new key-value pair into ExpressionAttributeValues parameter, and
-     * returns a reference to this object so that method calls can be chained
-     * together.
-     *
-     * @param key
-     *            The key of the entry to be added into
-     *            ExpressionAttributeValues.
-     * @param value
-     *            The corresponding value of the entry to be added into
-     *            ExpressionAttributeValues.
-     *
-     * @see ScanRequest#addExpressionAttributeValuesEntry(String,
-     *      AttributeValue)
-     */
-    public DynamoDbScanExpression addExpressionAttributeValuesEntry(String key,
-                                                                    AttributeValue value) {
-        if (null == this.expressionAttributeValues) {
-            this.expressionAttributeValues = new java.util.HashMap<String, AttributeValue>();
-        }
-        if (this.expressionAttributeValues.containsKey(key)) {
-            throw new IllegalArgumentException("Duplicated keys (" + key + ") are provided.");
-        }
-        this.expressionAttributeValues.put(key, value);
-        return this;
-    }
-
-    /**
-     * Removes all the entries added into ExpressionAttributeValues.
-     * <p>
-     * Returns a reference to this object so that method calls can be chained
-     * together.
-     */
-    public DynamoDbScanExpression clearExpressionAttributeValuesEntries() {
-        this.expressionAttributeValues = null;
-        return this;
-    }
-
-    /**
-     * The attributes to be returned in the result. You can retrieve all item
-     * attributes, specific item attributes, the count of matching items, or
-     * in the case of an index, some or all of the attributes projected into
-     * the index.
-     * <p>
-     * <b>Constraints:</b><br/>
-     * <b>Allowed Values: </b>ALL_ATTRIBUTES, ALL_PROJECTED_ATTRIBUTES, SPECIFIC_ATTRIBUTES, COUNT
-     *
-     * @return The attributes to be returned in the result. You can retrieve all item
-     *         attributes, specific item attributes, the count of matching items, or
-     *         in the case of an index, some or all of the attributes projected into
-     *         the index.
-     *
-     * @see software.amazon.awssdk.services.dynamodb.model.Select
-     */
-    public String select() {
-        return select;
-    }
-
-    /**
-     * The attributes to be returned in the result. You can retrieve all item
-     * attributes, specific item attributes, the count of matching items, or
-     * in the case of an index, some or all of the attributes projected into
-     * the index.
-     * <p>
-     * <b>Constraints:</b><br/>
-     * <b>Allowed Values: </b>ALL_ATTRIBUTES, ALL_PROJECTED_ATTRIBUTES, SPECIFIC_ATTRIBUTES, COUNT
-     *
-     * @param select The attributes to be returned in the result. You can retrieve all item
-     *         attributes, specific item attributes, the count of matching items, or
-     *         in the case of an index, some or all of the attributes projected into
-     *         the index.
-     *
-     * @see software.amazon.awssdk.services.dynamodb.model.Select
-     */
-    public void setSelect(String select) {
-        this.select = select;
-    }
-
-    /**
-     * The attributes to be returned in the result. You can retrieve all item
-     * attributes, specific item attributes, the count of matching items, or
-     * in the case of an index, some or all of the attributes projected into
-     * the index.
-     * <p>
-     * <b>Constraints:</b><br/>
-     * <b>Allowed Values: </b>ALL_ATTRIBUTES, ALL_PROJECTED_ATTRIBUTES, SPECIFIC_ATTRIBUTES, COUNT
-     *
-     * @param select The attributes to be returned in the result. You can retrieve all item
-     *         attributes, specific item attributes, the count of matching items, or
-     *         in the case of an index, some or all of the attributes projected into
-     *         the index.
-     *
-     * @see software.amazon.awssdk.services.dynamodb.model.Select
-     */
-    public void setSelect(Select select) {
-        this.select = select.toString();
-    }
-
-    /**
-     * The attributes to be returned in the result. You can retrieve all item
-     * attributes, specific item attributes, the count of matching items, or
-     * in the case of an index, some or all of the attributes projected into
-     * the index.
-     * <p>
-     * Returns a reference to this object so that method calls can be chained together.
-     * <p>
-     * <b>Constraints:</b><br/>
-     * <b>Allowed Values: </b>ALL_ATTRIBUTES, ALL_PROJECTED_ATTRIBUTES, SPECIFIC_ATTRIBUTES, COUNT
-     *
-     * @param select The attributes to be returned in the result. You can retrieve all item
-     *         attributes, specific item attributes, the count of matching items, or
-     *         in the case of an index, some or all of the attributes projected into
-     *         the index.
-     *
-     * @return A reference to this updated object so that method calls can be chained
-     *         together.
-     *
-     * @see software.amazon.awssdk.services.dynamodb.model.Select
-     */
-    public DynamoDbScanExpression withSelect(String select) {
-        this.select = select;
-        return this;
-    }
-
-    /**
-     * The attributes to be returned in the result. You can retrieve all item
-     * attributes, specific item attributes, the count of matching items, or
-     * in the case of an index, some or all of the attributes projected into
-     * the index.
-     * <p>
-     * Returns a reference to this object so that method calls can be chained together.
-     * <p>
-     * <b>Constraints:</b><br/>
-     * <b>Allowed Values: </b>ALL_ATTRIBUTES, ALL_PROJECTED_ATTRIBUTES, SPECIFIC_ATTRIBUTES, COUNT
-     *
-     * @param select The attributes to be returned in the result. You can retrieve all item
-     *         attributes, specific item attributes, the count of matching items, or
-     *         in the case of an index, some or all of the attributes projected into
-     *         the index.
-     *
-     * @return A reference to this updated object so that method calls can be chained
-     *         together.
-     *
-     * @see software.amazon.awssdk.services.dynamodb.model.Select
-     */
-    public DynamoDbScanExpression withSelect(Select select) {
-        this.select = select.toString();
-        return this;
-    }
-
-    /**
-     * A string that identifies one or more attributes to retrieve from the
-     * table. These attributes can include scalars, sets, or elements of a
-     * JSON document. The attributes in the expression must be separated by
-     * commas. <p>If no attribute names are specified, then all attributes
-     * will be returned. If any of the requested attributes are not found,
-     * they will not appear in the result. <p>For more information, go to <a
-     * href="http://docs.aws.amazon.com/amazondynamodb/latest/developerguide/Expressions.AccessingItemAttributes.html">Accessing
-     * Item Attributes</a> in the <i>Amazon DynamoDB Developer Guide</i>.
-     *
-     * @return A string that identifies one or more attributes to retrieve from the
-     *         table. These attributes can include scalars, sets, or elements of a
-     *         JSON document. The attributes in the expression must be separated by
-     *         commas. <p>If no attribute names are specified, then all attributes
-     *         will be returned. If any of the requested attributes are not found,
-     *         they will not appear in the result. <p>For more information, go to <a
-     *         href="http://docs.aws.amazon.com/amazondynamodb/latest/developerguide/Expressions.AccessingItemAttributes.html">Accessing
-     *         Item Attributes</a> in the <i>Amazon DynamoDB Developer Guide</i>.
-     */
-    public String getProjectionExpression() {
-        return projectionExpression;
-    }
-
-    /**
-     * A string that identifies one or more attributes to retrieve from the
-     * table. These attributes can include scalars, sets, or elements of a
-     * JSON document. The attributes in the expression must be separated by
-     * commas. <p>If no attribute names are specified, then all attributes
-     * will be returned. If any of the requested attributes are not found,
-     * they will not appear in the result. <p>For more information, go to <a
-     * href="http://docs.aws.amazon.com/amazondynamodb/latest/developerguide/Expressions.AccessingItemAttributes.html">Accessing
-     * Item Attributes</a> in the <i>Amazon DynamoDB Developer Guide</i>.
-     *
-     * @param projectionExpression A string that identifies one or more attributes to retrieve from the
-     *         table. These attributes can include scalars, sets, or elements of a
-     *         JSON document. The attributes in the expression must be separated by
-     *         commas. <p>If no attribute names are specified, then all attributes
-     *         will be returned. If any of the requested attributes are not found,
-     *         they will not appear in the result. <p>For more information, go to <a
-     *         href="http://docs.aws.amazon.com/amazondynamodb/latest/developerguide/Expressions.AccessingItemAttributes.html">Accessing
-     *         Item Attributes</a> in the <i>Amazon DynamoDB Developer Guide</i>.
-     */
-    public void setProjectionExpression(String projectionExpression) {
-        this.projectionExpression = projectionExpression;
-    }
-
-    /**
-     * A string that identifies one or more attributes to retrieve from the
-     * table. These attributes can include scalars, sets, or elements of a
-     * JSON document. The attributes in the expression must be separated by
-     * commas. <p>If no attribute names are specified, then all attributes
-     * will be returned. If any of the requested attributes are not found,
-     * they will not appear in the result. <p>For more information, go to <a
-     * href="http://docs.aws.amazon.com/amazondynamodb/latest/developerguide/Expressions.AccessingItemAttributes.html">Accessing
-     * Item Attributes</a> in the <i>Amazon DynamoDB Developer Guide</i>.
-     * <p>
-     * Returns a reference to this object so that method calls can be chained together.
-     *
-     * @param projectionExpression A string that identifies one or more attributes to retrieve from the
-     *         table. These attributes can include scalars, sets, or elements of a
-     *         JSON document. The attributes in the expression must be separated by
-     *         commas. <p>If no attribute names are specified, then all attributes
-     *         will be returned. If any of the requested attributes are not found,
-     *         they will not appear in the result. <p>For more information, go to <a
-     *         href="http://docs.aws.amazon.com/amazondynamodb/latest/developerguide/Expressions.AccessingItemAttributes.html">Accessing
-     *         Item Attributes</a> in the <i>Amazon DynamoDB Developer Guide</i>.
-     *
-     * @return A reference to this updated object so that method calls can be chained
-     *         together.
-     */
-    public DynamoDbScanExpression withProjectionExpression(String projectionExpression) {
-        this.projectionExpression = projectionExpression;
-        return this;
-    }
-
-    /**
-     * A value that if set to <code>TOTAL</code>, the response includes
-     * <i>ConsumedCapacity</i> data for tables and indexes. If set to
-     * <code>INDEXES</code>, the response includes <i>ConsumedCapacity</i>
-     * for indexes. If set to <code>NONE</code> (the default),
-     * <i>ConsumedCapacity</i> is not included in the response.
-     * <p>
-     * <b>Constraints:</b><br/>
-     * <b>Allowed Values: </b>INDEXES, TOTAL, NONE
-     * <p>
-     * If enabled, the underlying request to DynamoDB will include the
-     * configured parameter value and the low-level response from DynamoDB will
-     * include the amount of capacity consumed by the scan. Currently, the
-     * consumed capacity is only exposed through the DynamoDBMapper when you
-     * call {@code DynamoDBMapper.scanPage}, not {@code DynamoDBMapper.scan}.
-     *
-     * @return A value that if set to <code>TOTAL</code>, the response includes
-     *         <i>ConsumedCapacity</i> data for tables and indexes. If set to
-     *         <code>INDEXES</code>, the response includes <i>ConsumedCapacity</i>
-     *         for indexes. If set to <code>NONE</code> (the default),
-     *         <i>ConsumedCapacity</i> is not included in the response.
-     *
-     * @see software.amazon.awssdk.services.dynamodb.model.ReturnConsumedCapacity
-     */
-    public String getReturnConsumedCapacity() {
-        return returnConsumedCapacity;
-    }
-
-    /**
-     * A value that if set to <code>TOTAL</code>, the response includes
-     * <i>ConsumedCapacity</i> data for tables and indexes. If set to
-     * <code>INDEXES</code>, the response includes <i>ConsumedCapacity</i>
-     * for indexes. If set to <code>NONE</code> (the default),
-     * <i>ConsumedCapacity</i> is not included in the response.
-     * <p>
-     * <b>Constraints:</b><br/>
-     * <b>Allowed Values: </b>INDEXES, TOTAL, NONE
-     * <p>
-     * If enabled, the underlying request to DynamoDB will include the
-     * configured parameter value and the low-level response from DynamoDB will
-     * include the amount of capacity consumed by the scan. Currently, the
-     * consumed capacity is only exposed through the DynamoDBMapper when you
-     * call {@code DynamoDBMapper.scanPage}, not {@code DynamoDBMapper.scan}.
-     *
-     * @param returnConsumedCapacity A value that if set to <code>TOTAL</code>, the response includes
-     *         <i>ConsumedCapacity</i> data for tables and indexes. If set to
-     *         <code>INDEXES</code>, the response includes <i>ConsumedCapacity</i>
-     *         for indexes. If set to <code>NONE</code> (the default),
-     *         <i>ConsumedCapacity</i> is not included in the response.
-     *
-     * @see software.amazon.awssdk.services.dynamodb.model.ReturnConsumedCapacity
-     */
-    public void setReturnConsumedCapacity(String returnConsumedCapacity) {
-        this.returnConsumedCapacity = returnConsumedCapacity;
-    }
-
-    /**
-     * A value that if set to <code>TOTAL</code>, the response includes
-     * <i>ConsumedCapacity</i> data for tables and indexes. If set to
-     * <code>INDEXES</code>, the response includes <i>ConsumedCapacity</i>
-     * for indexes. If set to <code>NONE</code> (the default),
-     * <i>ConsumedCapacity</i> is not included in the response.
-     * <p>
-     * <b>Constraints:</b><br/>
-     * <b>Allowed Values: </b>INDEXES, TOTAL, NONE
-     * <p>
-     * If enabled, the underlying request to DynamoDB will include the
-     * configured parameter value and the low-level response from DynamoDB will
-     * include the amount of capacity consumed by the scan. Currently, the
-     * consumed capacity is only exposed through the DynamoDBMapper when you
-     * call {@code DynamoDBMapper.scanPage}, not {@code DynamoDBMapper.scan}.
-     *
-     * @param returnConsumedCapacity A value that if set to <code>TOTAL</code>, the response includes
-     *         <i>ConsumedCapacity</i> data for tables and indexes. If set to
-     *         <code>INDEXES</code>, the response includes <i>ConsumedCapacity</i>
-     *         for indexes. If set to <code>NONE</code> (the default),
-     *         <i>ConsumedCapacity</i> is not included in the response.
-     *
-     * @see software.amazon.awssdk.services.dynamodb.model.ReturnConsumedCapacity
-     */
-    public void setReturnConsumedCapacity(ReturnConsumedCapacity returnConsumedCapacity) {
-        this.returnConsumedCapacity = returnConsumedCapacity.toString();
-    }
-
-    /**
-     * A value that if set to <code>TOTAL</code>, the response includes
-     * <i>ConsumedCapacity</i> data for tables and indexes. If set to
-     * <code>INDEXES</code>, the response includes <i>ConsumedCapacity</i>
-     * for indexes. If set to <code>NONE</code> (the default),
-     * <i>ConsumedCapacity</i> is not included in the response.
-     * <p>
-     * Returns a reference to this object so that method calls can be chained together.
-     * <p>
-     * <b>Constraints:</b><br/>
-     * <b>Allowed Values: </b>INDEXES, TOTAL, NONE
-     * <p>
-     * If enabled, the underlying request to DynamoDB will include the
-     * configured parameter value and the low-level response from DynamoDB will
-     * include the amount of capacity consumed by the scan. Currently, the
-     * consumed capacity is only exposed through the DynamoDBMapper when you
-     * call {@code DynamoDBMapper.scanPage}, not {@code DynamoDBMapper.scan}.
-     *
-     * @param returnConsumedCapacity A value that if set to <code>TOTAL</code>, the response includes
-     *         <i>ConsumedCapacity</i> data for tables and indexes. If set to
-     *         <code>INDEXES</code>, the response includes <i>ConsumedCapacity</i>
-     *         for indexes. If set to <code>NONE</code> (the default),
-     *         <i>ConsumedCapacity</i> is not included in the response.
-     *
-     * @return A reference to this updated object so that method calls can be chained
-     *         together.
-     *
-     * @see software.amazon.awssdk.services.dynamodb.model.ReturnConsumedCapacity
-     */
-    public DynamoDbScanExpression withReturnConsumedCapacity(String returnConsumedCapacity) {
-        this.returnConsumedCapacity = returnConsumedCapacity;
-        return this;
-    }
-
-    /**
-     * A value that if set to <code>TOTAL</code>, the response includes
-     * <i>ConsumedCapacity</i> data for tables and indexes. If set to
-     * <code>INDEXES</code>, the response includes <i>ConsumedCapacity</i>
-     * for indexes. If set to <code>NONE</code> (the default),
-     * <i>ConsumedCapacity</i> is not included in the response.
-     * <p>
-     * Returns a reference to this object so that method calls can be chained together.
-     * <p>
-     * <b>Constraints:</b><br/>
-     * <b>Allowed Values: </b>INDEXES, TOTAL, NONE
-     * <p>
-     * If enabled, the underlying request to DynamoDB will include the
-     * configured parameter value and the low-level response from DynamoDB will
-     * include the amount of capacity consumed by the scan. Currently, the
-     * consumed capacity is only exposed through the DynamoDBMapper when you
-     * call {@code DynamoDBMapper.scanPage}, not {@code DynamoDBMapper.scan}.
-     *
-     * @param returnConsumedCapacity A value that if set to <code>TOTAL</code>, the response includes
-     *         <i>ConsumedCapacity</i> data for tables and indexes. If set to
-     *         <code>INDEXES</code>, the response includes <i>ConsumedCapacity</i>
-     *         for indexes. If set to <code>NONE</code> (the default),
-     *         <i>ConsumedCapacity</i> is not included in the response.
-     *
-     * @return A reference to this updated object so that method calls can be chained
-     *         together.
-     *
-     * @see software.amazon.awssdk.services.dynamodb.model.ReturnConsumedCapacity
-     */
-    public DynamoDbScanExpression withReturnConsumedCapacity(ReturnConsumedCapacity returnConsumedCapacity) {
-        this.returnConsumedCapacity = returnConsumedCapacity.toString();
-        return this;
-    }
-
-    /**
-     * Returns whether this scan uses consistent reads.
-     *
-     * @see ScanRequest#isConsistentRead()
-     */
-    public Boolean isConsistentRead() {
-        return consistentRead;
-    }
-
-    /**
-     * Sets whether this scan uses consistent reads.
-     */
-    public void setConsistentRead(Boolean consistentRead) {
-        this.consistentRead = consistentRead;
-    }
-
-    /**
-     * Sets whether this scan uses consistent reads and returns a reference
-     * to this object for method chaining.
-     */
-    public DynamoDbScanExpression withConsistentRead(Boolean consistentRead) {
-        this.consistentRead = consistentRead;
-        return this;
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbTable.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbTable.java
deleted file mode 100644
index 56dfb28eb356..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbTable.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMapperConfig.TableNameOverride;
-
-
-/**
- * Annotation to mark a class as a DynamoDB table.
- * <p>
- * This annotation is inherited by subclasses, and can be overridden by them as
- * well.
- *
- * @see TableNameOverride
- */
-@DynamoDb
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.TYPE)
-@Inherited
-public @interface DynamoDbTable {
-
-    /**
-     * The name of the table to use for this class.
-     */
-    String tableName();
-
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbTableMapper.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbTableMapper.java
deleted file mode 100644
index cac526178e23..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbTableMapper.java
+++ /dev/null
@@ -1,518 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
-import software.amazon.awssdk.services.dynamodb.model.ConditionalCheckFailedException;
-import software.amazon.awssdk.services.dynamodb.model.CreateTableRequest;
-import software.amazon.awssdk.services.dynamodb.model.DescribeTableRequest;
-import software.amazon.awssdk.services.dynamodb.model.ExpectedAttributeValue;
-import software.amazon.awssdk.services.dynamodb.model.GlobalSecondaryIndex;
-import software.amazon.awssdk.services.dynamodb.model.ProvisionedThroughput;
-import software.amazon.awssdk.services.dynamodb.model.ResourceInUseException;
-import software.amazon.awssdk.services.dynamodb.model.ResourceNotFoundException;
-import software.amazon.awssdk.services.dynamodb.model.TableDescription;
-
-/**
- * A wrapper for {@code DynamoDBMapper} which operates only on a specified
- * class/table.  All calls are forwarded to the underlying
- * {@code DynamoDBMapper} which was used to create this table mapper.
- *
- * A minimal example using get annotations,
- * <pre class="brush: java">
- * &#064;DynamoDBTable(tableName=&quot;TestTable&quot;)
- * public class TestClass {
- *     private Long key;
- *     private String rangeKey;
- *     private Double amount;
- *     private Long version;
- *
- *     &#064;DynamoDBHashKey
- *     public Long getKey() { return key; }
- *     public void setKey(Long key) { this.key = key; }
- *
- *     &#064;DynamoDBRangeKey
- *     public String getRangeKey() { return rangeKey; }
- *     public void setRangeKey(String rangeKey) { this.rangeKey = rangeKey; }
- *
- *     &#064;DynamoDBAttribute(attributeName=&quot;amount&quot;)
- *     public Double getAmount() { return amount; }
- *     public void setAmount(Double amount) { this.amount = amount; }
- *
- *     &#064;DynamoDBVersionAttribute
- *     public Long getVersion() { return version; }
- *     public void setVersion(Long version) { this.version = version; }
- * }
- * </pre>
- *
- * Initialize the DynamoDB mapper,
- * <pre class="brush: java">
- * DynamoDbClient dbClient = new AmazonDynamoDbClient();
- * DynamoDBMapper dbMapper = new DynamoDBMapper(dbClient);
- * </pre>
- *
- * Then, create a new table mapper with hash and range key,
- * <pre class="brush: java">
- * DynamoDBTableMapper&lt;TestClass,Long,String&gt; mapper = dbMapper.newTableMapper(TestClass.class);
- * </pre>
- *
- * Or, if the table does not have a range key,
- * <pre class="brush: java">
- * DynamoDBTableMapper&lt;TestClass,Long,?&gt; table = dbMapper.newTableMapper(TestClass.class);
- * </pre>
- *
- * If you don't have your DynamoDB table set up yet, you can use,
- * <pre class="brush: java">
- * table.createTableIfNotExists(new ProvisionedThroughput(25L, 25L));
- * </pre>
- *
- * Save instances of annotated classes and retrieve them,
- * <pre class="brush: java">
- * TestClass object = new TestClass();
- * object.setKey(1234L);
- * object.setRangeKey(&quot;ABCD&quot;);
- * object.setAmount(101D);
- *
- * try {
- *     table.saveIfNotExists(object);
- * } catch (ConditionalCheckFailedException e) {
- *     // handle already existing
- * }
- * </pre>
- *
- * Execute a query operation,
- * <pre class="brush: java">
- * int limit = 10;
- * List&lt;TestClass&gt; objects = new ArrayList&lt;TestClass&gt;(limit);
- *
- * DynamoDBQueryExpression&lt;TestClass&gt; query = new DynamoDBQueryExpression()
- *     .withRangeKeyCondition(table.rangeKey().name(), table.rangeKey().ge(&quot;ABAA&quot;))
- *     .withQueryFilterEntry(&quot;amount&quot;, table.field(&quot;amount&quot;).gt(100D))
- *     .withHashKeyValues(1234L)
- *     .withConsistentReads(true);
- *
- * QueryResponsePage&lt;TestClass&gt; results = new QueryResponsePage&lt;TestClass&gt;();
- *
- * do {
- *     if (results.lastEvaluatedKey() != null) {
- *         query.setExclusiveStartKey(results.lastEvaluatedKey());
- *     }
- *     query.setLimit(limit - objects.size());
- *     results = mapper.query(query);
- *     for (TestClass object : results.getResults()) {
- *         objects.add(object);
- *     }
- * } while (results.lastEvaluatedKey() != null &amp;&amp; objects.size() &lt; limit)
- * </pre>
- *
- * @param <T> The object type which this mapper operates.
- * @param <H> The hash key value type.
- * @param <R> The range key value type; use <code>?</code> if no range key.
- *
- * @see DynamoDbMapper
- * @see DynamoDbClient
- */
-public final class DynamoDbTableMapper<T extends Object, H extends Object, R extends Object> {
-
-    private static final Logger log = LoggerFactory.getLogger(DynamoDbTableMapper.class);
-
-    private final DynamoDbMapperTableModel<T> model;
-    private final DynamoDbMapperFieldModel<T, H> hk;
-    private final DynamoDbMapperFieldModel<T, R> rk;
-    private final DynamoDbMapperConfig config;
-    private final DynamoDbMapper mapper;
-    private final DynamoDbClient db;
-
-    /**
-     * Constructs a new table mapper for the given class.
-     * @param model The field model factory.
-     * @param mapper The DynamoDB mapper.
-     * @param db The service object to use for all service calls.
-     */
-    protected DynamoDbTableMapper(DynamoDbClient db, DynamoDbMapper mapper, final DynamoDbMapperConfig config,
-                                  final DynamoDbMapperTableModel<T> model) {
-        this.rk = model.rangeKeyIfExists();
-        this.hk = model.hashKey();
-        this.model = model;
-        this.config = config;
-        this.mapper = mapper;
-        this.db = db;
-    }
-
-    /**
-     * Gets the field model for a given attribute.
-     * @param <V> The field model's value type.
-     * @param attributeName The attribute name.
-     * @return The field model.
-     */
-    public <V> DynamoDbMapperFieldModel<T, V> field(String attributeName) {
-        return this.model.field(attributeName);
-    }
-
-    /**
-     * Gets the hash key field model for the specified type.
-     * @param <H> The hash key type.
-     * @return The hash key field model.
-     * @throws DynamoDbMappingException If the hash key is not present.
-     */
-    public DynamoDbMapperFieldModel<T, H> hashKey() {
-        return this.model.hashKey();
-    }
-
-    /**
-     * Gets the range key field model for the specified type.
-     * @param <R> The range key type.
-     * @return The range key field model.
-     * @throws DynamoDbMappingException If the range key is not present.
-     */
-    public DynamoDbMapperFieldModel<T, R> rangeKey() {
-        return this.model.rangeKey();
-    }
-
-    /**
-     * Retrieves multiple items from the table using their primary keys.
-     * @param itemsToGet The items to get.
-     * @return The list of objects.
-     * @see DynamoDbMapper#batchLoad
-     */
-    public List<T> batchLoad(Iterable<T> itemsToGet) {
-        final Map<String, List<Object>> results = mapper.batchLoad(itemsToGet);
-        if (results.isEmpty()) {
-            return Collections.<T>emptyList();
-        }
-        return (List<T>) results.get(mapper.getTableName(model.targetType(), config));
-    }
-
-    /**
-     * Saves the objects given using one or more calls to the batchWriteItem API.
-     * @param objectsToSave The objects to save.
-     * @return The list of failed batches.
-     * @see DynamoDbMapper#batchSave
-     */
-    public List<DynamoDbMapper.FailedBatch> batchSave(Iterable<T> objectsToSave) {
-        return mapper.batchWrite(objectsToSave, (Iterable<T>) Collections.<T>emptyList());
-    }
-
-    /**
-     * Deletes the objects given using one or more calls to the batchWtiteItem API.
-     * @param objectsToDelete The objects to delete.
-     * @return The list of failed batches.
-     * @see DynamoDbMapper#batchDelete
-     */
-    public List<DynamoDbMapper.FailedBatch> batchDelete(Iterable<T> objectsToDelete) {
-        return mapper.batchWrite((Iterable<T>) Collections.<T>emptyList(), objectsToDelete);
-    }
-
-    /**
-     * Saves and deletes the objects given using one or more calls to the
-     * batchWriteItem API.
-     * @param objectsToWrite The objects to write.
-     * @param objectsToDelete The objects to delete.
-     * @return The list of failed batches.
-     * @see DynamoDbMapper#batchWrite
-     */
-    public List<DynamoDbMapper.FailedBatch> batchWrite(Iterable<T> objectsToWrite, Iterable<T> objectsToDelete) {
-        return mapper.batchWrite(objectsToWrite, objectsToDelete);
-    }
-
-    /**
-     * Loads an object with the hash key given.
-     * @param hashKey The hash key value.
-     * @return The object.
-     * @see DynamoDbMapper#load
-     */
-    public T load(H hashKey) {
-        return mapper.<T>load(model.targetType(), hashKey);
-    }
-
-    /**
-     * Loads an object with the hash and range key.
-     * @param hashKey The hash key value.
-     * @param rangeKey The range key value.
-     * @return The object.
-     * @see DynamoDbMapper#load
-     */
-    public T load(H hashKey, R rangeKey) {
-        return mapper.<T>load(model.targetType(), hashKey, rangeKey);
-    }
-
-    /**
-     * Saves the object given into DynamoDB.
-     * @param object The object to save.
-     * @see DynamoDbMapper#save
-     */
-    public void save(T object) {
-        mapper.<T>save(object);
-    }
-
-    /**
-     * Saves the object given into DynamoDB using the specified saveExpression.
-     * @param object The object to save.
-     * @param saveExpression The save expression.
-     * @see DynamoDbMapper#save
-     */
-    public void save(T object, DynamoDbSaveExpression saveExpression) {
-        mapper.<T>save(object, saveExpression);
-    }
-
-    /**
-     * Saves the object given into DynamoDB with the condition that the hash
-     * and if applicable, the range key, does not already exist.
-     * @param object The object to create.
-     * @throws ConditionalCheckFailedException If the object exists.
-     * @see DynamoDbMapper#save
-     * @see DynamoDbSaveExpression
-     * @see software.amazon.awssdk.services.dynamodb.model.ExpectedAttributeValue
-     */
-    public void saveIfNotExists(T object) throws ConditionalCheckFailedException {
-        final DynamoDbSaveExpression saveExpression = new DynamoDbSaveExpression();
-        for (final DynamoDbMapperFieldModel<T, Object> key : model.keys()) {
-            saveExpression.withExpectedEntry(key.name(), ExpectedAttributeValue.builder()
-                    .exists(false).build());
-        }
-        mapper.<T>save(object, saveExpression);
-    }
-
-    /**
-     * Saves the object given into DynamoDB with the condition that the hash
-     * and, if applicable, the range key, already exist.
-     * @param object The object to update.
-     * @throws ConditionalCheckFailedException If the object does not exist.
-     * @see DynamoDbMapper#save
-     * @see DynamoDbSaveExpression
-     * @see software.amazon.awssdk.services.dynamodb.model.ExpectedAttributeValue
-     */
-    public void saveIfExists(T object) throws ConditionalCheckFailedException {
-        final DynamoDbSaveExpression saveExpression = new DynamoDbSaveExpression();
-        for (final DynamoDbMapperFieldModel<T, Object> key : model.keys()) {
-            saveExpression.withExpectedEntry(key.name(), ExpectedAttributeValue.builder()
-                    .exists(true).value(key.convert(key.get(object))).build());
-        }
-        mapper.<T>save(object, saveExpression);
-    }
-
-    /**
-     * Deletes the given object from its DynamoDB table.
-     * @param object The object to delete.
-     * @see DynamoDbMapper#delete
-     */
-    public void delete(final T object) {
-        mapper.delete(object);
-    }
-
-    /**
-     * Deletes the given object from its DynamoDB table using the specified
-     * deleteExpression.
-     * @param object The object to delete.
-     * @param deleteExpression The delete expression.
-     * @see DynamoDbMapper#delete
-     */
-    public void delete(final T object, final DynamoDbDeleteExpression deleteExpression) {
-        mapper.delete(object, deleteExpression);
-    }
-
-    /**
-     * Deletes the given object from its DynamoDB table with the condition that
-     * the hash and, if applicable, the range key, already exist.
-     * @param object The object to delete.
-     * @throws ConditionalCheckFailedException If the object does not exist.
-     * @see DynamoDbMapper#delete
-     * @see DynamoDbDeleteExpression
-     * @see software.amazon.awssdk.services.dynamodb.model.ExpectedAttributeValue
-     */
-    public void deleteIfExists(T object) throws ConditionalCheckFailedException {
-        final DynamoDbDeleteExpression deleteExpression = new DynamoDbDeleteExpression();
-        for (final DynamoDbMapperFieldModel<T, Object> key : model.keys()) {
-            deleteExpression.withExpectedEntry(key.name(), ExpectedAttributeValue.builder()
-                    .exists(true).value(key.convert(key.get(object))).build());
-        }
-        mapper.delete(object, deleteExpression);
-    }
-
-    /**
-     * Evaluates the specified query expression and returns the count of matching
-     * items, without returning any of the actual item data
-     * @param queryExpression The query expression.
-     * @return The count.
-     * @see DynamoDbMapper#count
-     */
-    public int count(DynamoDbQueryExpression<T> queryExpression) {
-        return mapper.<T>count(model.targetType(), queryExpression);
-    }
-
-    /**
-     * Queries an Amazon DynamoDB table and returns the matching results as an
-     * unmodifiable list of instantiated objects.
-     * @param queryExpression The query expression.
-     * @return The query results.
-     * @see DynamoDbMapper#query
-     */
-    public PaginatedQueryList<T> query(DynamoDbQueryExpression<T> queryExpression) {
-        return mapper.<T>query(model.targetType(), queryExpression);
-    }
-
-    /**
-     * Queries an Amazon DynamoDB table and returns a single page of matching
-     * results.
-     * @param queryExpression The query expression.
-     * @return The query results.
-     * @see DynamoDbMapper#query
-     */
-    public QueryResultPage<T> queryPage(DynamoDbQueryExpression<T> queryExpression) {
-        return mapper.<T>queryPage(model.targetType(), queryExpression);
-    }
-
-    /**
-     * Evaluates the specified scan expression and returns the count of matching
-     * items, without returning any of the actual item data.
-     * @param scanExpression The scan expression.
-     * @return The count.
-     * @see DynamoDbMapper#count
-     */
-    public int count(DynamoDbScanExpression scanExpression) {
-        return mapper.count(model.targetType(), scanExpression);
-    }
-
-    /**
-     * Scans through an Amazon DynamoDB table and returns the matching results
-     * as an unmodifiable list of instantiated objects.
-     * @param scanExpression The scan expression.
-     * @return The scan results.
-     * @see DynamoDbMapper#scan
-     */
-    public PaginatedScanList<T> scan(DynamoDbScanExpression scanExpression) {
-        return mapper.<T>scan(model.targetType(), scanExpression);
-    }
-
-    /**
-     * Scans through an Amazon DynamoDB table and returns a single page of
-     * matching results.
-     * @param scanExpression The scan expression.
-     * @return The scan results.
-     * @see DynamoDbMapper#scanPage
-     */
-    public ScanResultPage<T> scanPage(DynamoDbScanExpression scanExpression) {
-        return mapper.<T>scanPage(model.targetType(), scanExpression);
-    }
-
-    /**
-     * Scans through an Amazon DynamoDB table on logically partitioned segments
-     * in parallel and returns the matching results in one unmodifiable list of
-     * instantiated objects.
-     * @param scanExpression The scan expression.
-     * @param totalSegments The total segments.
-     * @return The scan results.
-     * @see DynamoDbMapper#parallelScan
-     */
-    public PaginatedParallelScanList<T> parallelScan(DynamoDbScanExpression scanExpression, int totalSegments) {
-        return mapper.<T>parallelScan(model.targetType(), scanExpression, totalSegments);
-    }
-
-    /**
-     * Returns information about the table, including the current status of the
-     * table, when it was created, the primary key schema, and any indexes on
-     * the table.
-     * @return The describe table results.
-     * @see DynamoDbClient#describeTable
-     */
-    public TableDescription describeTable() {
-        return db.describeTable(DescribeTableRequest.builder()
-                .tableName(mapper.getTableName(model.targetType(), config))
-                .build())
-                .table();
-    }
-
-    /**
-     * Creates the table with the specified throughput; also populates the same
-     * throughput for all global secondary indexes.
-     * @param throughput The provisioned throughput.
-     * @return The table decription.
-     * @see DynamoDbClient#createTable
-     * @see software.amazon.awssdk.services.dynamodb.model.CreateTableRequest
-     */
-    public TableDescription createTable(ProvisionedThroughput throughput) {
-        CreateTableRequest request = mapper.generateCreateTableRequest(model.targetType());
-        CreateTableRequest.Builder modified = request.toBuilder()
-                .provisionedThroughput(throughput);
-        if (request.globalSecondaryIndexes() != null) {
-            modified.globalSecondaryIndexes((Collection<GlobalSecondaryIndex>) null);
-            for (GlobalSecondaryIndex gsi : request.globalSecondaryIndexes()) {
-                gsi = gsi.toBuilder().provisionedThroughput(throughput).build();
-                modified.globalSecondaryIndexes(gsi);
-            }
-        }
-        request = modified.build();
-        return db.createTable(request).tableDescription();
-    }
-
-    /**
-     * Creates the table and ignores the {@code ResourceInUseException} if it
-     * ialready exists.
-     * @param throughput The provisioned throughput.
-     * @return True if created, or false if the table already existed.
-     * @see DynamoDbClient#createTable
-     * @see software.amazon.awssdk.services.dynamodb.model.CreateTableRequest
-     */
-    public boolean createTableIfNotExists(ProvisionedThroughput throughput) {
-        try {
-            createTable(throughput);
-        } catch (final ResourceInUseException e) {
-            if (log.isTraceEnabled()) {
-                log.trace("Table already exists, no need to create", e);
-            }
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Deletes the table.
-     * @return The table decription.
-     * @see DynamoDbClient#deleteTable
-     * @see software.amazon.awssdk.services.dynamodb.model.DeleteTableRequest
-     */
-    public TableDescription deleteTable() {
-        return db.deleteTable(
-                mapper.generateDeleteTableRequest(model.targetType())
-                             ).tableDescription();
-    }
-
-    /**
-     * Deletes the table and ignores the {@code ResourceNotFoundException} if
-     * it does not already exist.
-     * @return True if the table was deleted, or false if the table did not exist.
-     * @see DynamoDbClient#deleteTable
-     * @see software.amazon.awssdk.services.dynamodb.model.DeleteTableRequest
-     */
-    public boolean deleteTableIfExists() {
-        try {
-            deleteTable();
-        } catch (final ResourceNotFoundException e) {
-            if (log.isTraceEnabled()) {
-                log.trace("Table does not exist, no need to delete", e);
-            }
-            return false;
-        }
-        return true;
-    }
-
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbTypeConverted.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbTypeConverted.java
deleted file mode 100644
index 01b5e0758408..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbTypeConverted.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Annotation to mark a property as using a custom type-converter.
- *
- * <p>May be annotated on a user-defined annotation to pass additional
- * properties to the {@link DynamoDbTypeConverter}.</p>
- *
- * <pre class="brush: java">
- * &#064;CurrencyFormat(separator=&quot; &quot;) //&lt;- user-defined annotation
- * public Currency getCurrency()
- * </pre>
- *
- * <p>Where,</p>
- * <pre class="brush: java">
- * public class Currency {
- *     private Double amount;
- *     private String unit;
- *
- *     public Double getAmount() { return amount; }
- *     public void setAmount(Double amount) { this.amount = amount; }
- *
- *     public String getUnit() { return unit; }
- *     public void setUnit(String unit) { this.unit = unit; }
- * }
- * </pre>
- *
- * <p>And user-defined annotation,</p>
- * <pre class="brush: java">
- * &#064;Target({ElementType.METHOD})
- * &#064;Retention(RetentionPolicy.RUNTIME)
- * &#064;DynamoDBTypeConverted(converter=CurrencyFormat.Converter.class)
- * public &#064;interface CurrencyFormat {
- *
- *     String separator() default &quot; &quot;;
- *
- *     public static class Converter implements DynamoDBTypeConverter&lt;String,Currency&gt; {
- *         private final String separator;
- *         public Converter(final Class&lt;Currency&gt; targetType, final CurrencyFormat annotation) {
- *             this.separator = annotation.separator();
- *         }
- *         public Converter() {
- *             this.separator = &quot;|&quot;;
- *         }
- *         &#064;Override
- *         public String convert(final Currency o) {
- *             return String.valueOf(o.getAmount()) + separator + o.getUnit();
- *         }
- *         &#064;Override
- *         public Currency unconvert(final String o) {
- *             final String[] strings = o.split(separator);
- *             final Currency currency = new Currency();
- *             currency.setAmount(Double.valueOf(strings[0]));
- *             currency.setUnit(strings[1]);
- *             return currency;
- *         }
- *     }
- * }
- * </pre>
- *
- * <p>Alternately, the property/field may be annotated directly (which
- * requires the converter to provide a default constructor or a constructor
- * with only the {@code targetType}),</p>
- * <pre class="brush: java">
- * &#064;DynamoDBTypeConverted(converter=CurrencyFormat.Converter.class)
- * public Currency getCurrency() { return currency; }
- * </pre>
- *
- * <p>All converters are null-safe, a {@code null} value will never be passed
- * to {@link DynamoDbTypeConverter#convert}
- * or {@link DynamoDbTypeConverter#unconvert}.</p>
- *
- * <p>Precedence for selecting a type-converter first goes to getter annotations,
- * then field, then finally type.</p>
- *
- * <p>May be used in combination with {@link DynamoDbTyped} to specify the
- * attribute type binding.</p>
- * <p>Compatible with {@link DynamoDbAutoGeneratedTimestamp}</p>
- *
- * <p>May be used as a meta-annotation.</p>
- */
-@DynamoDb
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.TYPE, ElementType.FIELD, ElementType.METHOD, ElementType.ANNOTATION_TYPE})
-public @interface DynamoDbTypeConverted {
-
-    /**
-     * The class of the converter for this property.
-     */
-    @SuppressWarnings("rawtypes")
-    Class<? extends DynamoDbTypeConverter> converter();
-
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbTypeConvertedEnum.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbTypeConvertedEnum.java
deleted file mode 100644
index a05e63d1bb4d..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbTypeConvertedEnum.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Annotation to convert the enumeration value to a string.
- *
- * <p>Alternately, the {@link DynamoDbTyped} annotation may be used,</p>
- * <pre class="brush: java">
- * public static enum Status { OPEN, PENDING, CLOSED }
- *
- * &#064;DynamoDBTyped(DynamoDBAttributeType.S)
- * public Status status()
- * </pre>
- *
- * <p>Please note, there are some risks in distributed systems when using
- * enumerations as attributes intead of simply using a String.
- * When adding new values to the enumeration, the enum only changes must
- * be deployed before the enumeration value can be persisted. This will
- * ensure that all systems have the correct code to map it from the item
- * record in DynamoDB to your objects.</p>
- *
- * @see DynamoDbTypeConverted
- */
-@DynamoDbTyped(DynamoDbMapperFieldModel.DynamoDbAttributeType.S)
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.TYPE, ElementType.FIELD, ElementType.METHOD})
-public @interface DynamoDbTypeConvertedEnum {
-
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbTypeConvertedJson.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbTypeConvertedJson.java
deleted file mode 100644
index 721ccd7badcd..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbTypeConvertedJson.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * A simple JSON converter that uses the Jackson JSON processor.
- *
- * <p>It shares all limitations of that library. For more information about
- * Jackson, see: http://wiki.fasterxml.com/JacksonHome</p>
- *
- * <pre class="brush: java">
- * &#064;DynamoDBTypeConvertedJson
- * public Currency getCurrency()
- * </pre>
- *
- * <p>Where,</p>
- * <pre class="brush: java">
- * public class Currency {
- *     private Double amount;
- *     private String unit;
- *
- *     public Double getAmount() { return amount; }
- *     public void setAmount(Double amount) { this.amount = amount; }
- *
- *     public String getUnit() { return unit; }
- *     public void setUnit(String unit) { this.unit = unit; }
- * }
- * </pre>
- *
- * <p>Would write the following value to DynamoDB given,</p>
- * <ul>
- *     <li><code>Currency(79.99,"USD")</code> = <code> "{\"amount\":79.99,\"unit\":\"USD\"}"</code></li>
- * </ul>
- *
- * @see DynamoDbTypeConverted
- */
-@DynamoDbTypeConverted(converter = DynamoDbTypeConvertedJson.Converter.class)
-@DynamoDbTyped(DynamoDbMapperFieldModel.DynamoDbAttributeType.S)
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.TYPE, ElementType.FIELD, ElementType.METHOD})
-public @interface DynamoDbTypeConvertedJson {
-
-    /**
-     * The value type to use when calling the JSON mapper's {@code readValue};
-     * a value of {@code Void.class} indicates to use the getter's type.
-     */
-    Class<? extends Object> targetType() default void.class;
-
-    /**
-     * JSON type converter.
-     */
-    final class Converter<T> implements DynamoDbTypeConverter<String, T> {
-        private static final ObjectMapper MAPPER = new ObjectMapper().disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
-        private final Class<T> targetType;
-
-        Converter(Class<T> targetType, DynamoDbTypeConvertedJson annotation) {
-            this.targetType = annotation.targetType() == void.class ? targetType : (Class<T>) annotation.targetType();
-        }
-
-        @Override
-        public String convert(final T object) {
-            try {
-                return MAPPER.writeValueAsString(object);
-            } catch (final Exception e) {
-                throw new DynamoDbMappingException("Unable to write object to JSON", e);
-            }
-        }
-
-        @Override
-        public T unconvert(final String object) {
-            try {
-                return MAPPER.readValue(object, targetType);
-            } catch (final Exception e) {
-                throw new DynamoDbMappingException("Unable to read JSON string", e);
-            }
-        }
-    }
-
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbTypeConvertedTimestamp.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbTypeConvertedTimestamp.java
deleted file mode 100644
index b6a6429a94d6..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbTypeConvertedTimestamp.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-import static software.amazon.awssdk.services.dynamodb.datamodeling.StandardTypeConverters.Scalar.TIME_ZONE;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-import java.time.ZonedDateTime;
-import java.time.format.DateTimeFormatter;
-import java.time.format.DateTimeFormatterBuilder;
-import java.util.Date;
-import java.util.TimeZone;
-
-/**
- * Annotation to format a timestamp object using Java's standard date and time
- * patterns.
- *
- * <pre class="brush: java">
- * &#064;DynamoDBTypeConvertedTimestamp(pattern=&quot;yyyyMMddHHmmssSSS&quot;, timeZone=&quot;UTC&quot;)
- * public Date getCreatedDate()
- * </pre>
- *
- * <p>Supports the standard {@link Date} type-conversions; such as
- * {@link java.util.Calendar}, {@link Long}.</p>
- *
- * <p>Primitives such as {@code long} are not supported since the unset
- * (or null) state can't be detected.</p>
- *
- * <p>Compatible with {@link DynamoDbAutoGeneratedTimestamp}</p>
- *
- * @see DynamoDbAutoGeneratedTimestamp
- * @see DynamoDbTypeConverted
- * @see java.text.SimpleDateFormat
- * @see java.util.TimeZone
- */
-@DynamoDbTypeConverted(converter = DynamoDbTypeConvertedTimestamp.Converter.class)
-@DynamoDbTyped(DynamoDbMapperFieldModel.DynamoDbAttributeType.S)
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.TYPE, ElementType.FIELD, ElementType.METHOD})
-public @interface DynamoDbTypeConvertedTimestamp {
-
-    /**
-     * The pattern format; default is ISO8601.
-     * @see java.text.SimpleDateFormat
-     */
-    String pattern() default "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'";
-
-    /**
-     * The time zone; default is {@code UTC}.
-     * @see java.util.TimeZone
-     */
-    String timeZone() default "UTC";
-
-    /**
-     * Timestamp format converter.
-     */
-    final class Converter<T> implements DynamoDbTypeConverter<String, T> {
-        private final DynamoDbTypeConverter<ZonedDateTime, T> converter;
-        private final DateTimeFormatter formatter;
-
-        Converter(Class<T> targetType, DynamoDbTypeConvertedTimestamp annotation) {
-            this.formatter = new DateTimeFormatterBuilder()
-                                 .appendPattern(annotation.pattern()).toFormatter()
-                                 .withZone(TIME_ZONE.<TimeZone>convert(annotation.timeZone()).toZoneId());
-            this.converter = StandardTypeConverters.factory().getConverter(ZonedDateTime.class, targetType);
-        }
-
-        @Override
-        public String convert(final T object) {
-            return formatter.format(converter.convert(object));
-        }
-
-        @Override
-        public T unconvert(final String object) {
-            return converter.unconvert(ZonedDateTime.parse(object, formatter));
-        }
-    }
-
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbTypeConverter.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbTypeConverter.java
deleted file mode 100644
index 747f5e2d51f9..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbTypeConverter.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-import software.amazon.awssdk.annotations.SdkInternalApi;
-
-/**
- * Interface for converting types.
- *
- * @param <S> The DynamoDB standard type.
- * @param <T> The object's field/property type.
- */
-public interface DynamoDbTypeConverter<S extends Object, T extends Object> {
-
-    /**
-     * Turns an object of type T into an object of type S.
-     */
-    S convert(T object);
-
-    /**
-     * Turns an object of type S into an object of type T.
-     */
-    T unconvert(S object);
-
-    /**
-     * An abstract converter with additional general purpose functions.
-     */
-    @SdkInternalApi
-    abstract class AbstractConverter<S, T> implements DynamoDbTypeConverter<S, T> {
-        public static <S, U, T> ExtendedConverter<S, U, T> join(DynamoDbTypeConverter<S, U> source,
-                                                                DynamoDbTypeConverter<U, T> target) {
-            return new ExtendedConverter<S, U, T>(source, target);
-        }
-
-        public static <S, T> NullSafeConverter<S, T> nullSafe(DynamoDbTypeConverter<S, T> converter) {
-            return new NullSafeConverter<S, T>(converter);
-        }
-
-        public <U> DynamoDbTypeConverter<S, U> joinAll(DynamoDbTypeConverter<T, U>... targets) {
-            AbstractConverter<S, U> converter = (AbstractConverter<S, U>) nullSafe();
-            for (DynamoDbTypeConverter<T, U> target : targets) {
-                if (target != null) {
-                    converter = converter.join((DynamoDbTypeConverter<U, U>) nullSafe(target));
-                }
-            }
-            return converter;
-        }
-
-        public <U> ExtendedConverter<S, T, U> join(DynamoDbTypeConverter<T, U> target) {
-            return AbstractConverter.<S, T, U>join(this, target);
-        }
-
-        public NullSafeConverter<S, T> nullSafe() {
-            return AbstractConverter.<S, T>nullSafe(this);
-        }
-    }
-
-    /**
-     * A converter which wraps a source and target converter.
-     */
-    class ExtendedConverter<S, U, T> extends AbstractConverter<S, T> {
-        private final DynamoDbTypeConverter<S, U> source;
-        private final DynamoDbTypeConverter<U, T> target;
-
-        public ExtendedConverter(DynamoDbTypeConverter<S, U> source, DynamoDbTypeConverter<U, T> target) {
-            this.source = source;
-            this.target = target;
-        }
-
-        @Override
-        public S convert(final T o) {
-            U o1 = target.convert(o);
-            S o2 = source.convert(o1);
-            return o2;
-            //return source.convert(target.convert(o));
-        }
-
-        @Override
-        public T unconvert(final S o) {
-            return target.unconvert(source.unconvert(o));
-        }
-    }
-
-    /**
-     * A general purpose delegating converter.
-     */
-    class DelegateConverter<S, T> extends AbstractConverter<S, T> {
-        private final DynamoDbTypeConverter<S, T> delegate;
-
-        public DelegateConverter(DynamoDbTypeConverter<S, T> delegate) {
-            this.delegate = delegate;
-        }
-
-        @Override
-        public S convert(final T object) {
-            return delegate.convert(object);
-        }
-
-        @Override
-        public T unconvert(final S object) {
-            return delegate.unconvert(object);
-        }
-    }
-
-    /**
-     * A converter which evaluates nullability before convert/unconvert.
-     */
-    class NullSafeConverter<S, T> extends DelegateConverter<S, T> {
-        public NullSafeConverter(DynamoDbTypeConverter<S, T> delegate) {
-            super(delegate);
-        }
-
-        @Override
-        public S convert(final T object) {
-            return object == null ? null : super.convert(object);
-        }
-
-        @Override
-        public T unconvert(final S object) {
-            return object == null ? null : super.unconvert(object);
-        }
-    }
-
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbTypeConverterFactory.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbTypeConverterFactory.java
deleted file mode 100644
index 604b94406e28..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbTypeConverterFactory.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-import java.util.AbstractMap.SimpleImmutableEntry;
-import java.util.LinkedHashMap;
-import java.util.Map.Entry;
-import software.amazon.awssdk.services.dynamodb.datamodeling.StandardTypeConverters.Vector;
-
-/**
- * {@link DynamoDbTypeConverter} factory and supporting classes.
- *
- * <p>To override standard type-conversions,</p>
- * <pre class="brush: java">
- * DynamoDBMapperConfig config = DynamoDBMapperConfig.builder()
- *     .withTypeConverterFactory(DynamoDBTypeConverterFactory.standard().override()
- *         .with(String.class, MyObject.class, new StringToMyObjectConverter())
- *         .build())
- *     .build();
- * </pre>
- * <p>Then, on the property, specify the attribute binding,</p>
- * <pre class="brush: java">
- * &#064;DynamoDBTyped(DynamoDBAttributeType.S)
- * public MyObject myObject()
- * </pre>
- *
- * @see DynamoDbMapperConfig
- */
-public abstract class DynamoDbTypeConverterFactory {
-
-    /**
-     * Returns the standard type-converter factory. To override, the factory,
-     * @see DynamoDbTypeConverterFactory#override
-     */
-    public static DynamoDbTypeConverterFactory standard() {
-        return StandardTypeConverters.factory();
-    }
-
-    /**
-     * Gets the type-converter matching the target conversion type.
-     * @param <S> The DynamoDB standard type.
-     * @param <T> The object's field/property type.
-     * @param sourceType The source conversion type.
-     * @param targetType The target conversion type.
-     * @return The type-converter, or null if no match.
-     */
-    public abstract <S, T> DynamoDbTypeConverter<S, T> getConverter(Class<S> sourceType, Class<T> targetType);
-
-    /**
-     * Creates a type-converter factory builder using this factory as defaults.
-     */
-    public final Builder override() {
-        return new Builder(this);
-    }
-
-    /**
-     * Builder for overriding type-converters.
-     */
-    public static final class Builder {
-        private final ConverterMap overrides = new ConverterMap();
-        private final DynamoDbTypeConverterFactory defaults;
-
-        private Builder(DynamoDbTypeConverterFactory defaults) {
-            this.defaults = defaults;
-        }
-
-        public <S, T> Builder with(Class<S> sourceType, Class<T> targetType,
-                                   DynamoDbTypeConverter<? extends S, ? extends T> converter) {
-            if (Vector.SET.is(sourceType) || Vector.LIST.is(sourceType) || Vector.MAP.is(sourceType)) {
-                throw new DynamoDbMappingException("type [" + sourceType + "] is not supported" +
-                                                   "; type-converter factory only supports scalar conversions");
-            }
-            overrides.put(sourceType, targetType, converter);
-            return this;
-        }
-
-        public DynamoDbTypeConverterFactory build() {
-            return new OverrideFactory(defaults, overrides);
-        }
-    }
-
-    /**
-     * A delegating {@link DynamoDbTypeConverterFactory}.
-     */
-    public static class DelegateFactory extends DynamoDbTypeConverterFactory {
-        private final DynamoDbTypeConverterFactory delegate;
-
-        public DelegateFactory(DynamoDbTypeConverterFactory delegate) {
-            this.delegate = delegate;
-        }
-
-        @Override
-        public <S, T> DynamoDbTypeConverter<S, T> getConverter(Class<S> sourceType, Class<T> targetType) {
-            return delegate.<S, T>getConverter(sourceType, targetType);
-        }
-    }
-
-    /**
-     * Delegate factory to allow selected types to be overridden.
-     */
-    private static class OverrideFactory extends DelegateFactory {
-        private final ConverterMap overrides;
-
-        OverrideFactory(DynamoDbTypeConverterFactory defaults, ConverterMap overrides) {
-            super(defaults);
-            this.overrides = overrides;
-        }
-
-        @Override
-        public <S, T> DynamoDbTypeConverter<S, T> getConverter(Class<S> sourceType, Class<T> targetType) {
-            DynamoDbTypeConverter<S, T> converter = overrides.<S, T>get(sourceType, targetType);
-            if (converter == null) {
-                converter = super.<S, T>getConverter(sourceType, targetType);
-            }
-            return converter;
-        }
-    }
-
-    /**
-     * Map of source and target pairs to the converter.
-     */
-    private static final class ConverterMap extends LinkedHashMap<Key<?, ?>, DynamoDbTypeConverter<?, ?>> {
-        private static final long serialVersionUID = -1L;
-
-        public <S, T> void put(Class<S> sourceType, Class<T> targetType,
-                               DynamoDbTypeConverter<? extends S, ? extends T> converter) {
-            put(Key.of(sourceType, targetType), converter);
-        }
-
-        @SuppressWarnings("unchecked")
-        public <S, T> DynamoDbTypeConverter<S, T> get(Class<S> sourceType, Class<T> targetType) {
-            for (final Entry<Key<?, ?>, DynamoDbTypeConverter<?, ?>> entry : entrySet()) {
-                if (entry.getKey().isAssignableFrom(sourceType, targetType)) {
-                    return (DynamoDbTypeConverter<S, T>) entry.getValue();
-                }
-            }
-            return null;
-        }
-    }
-
-    /**
-     * Source and target conversion type pair.
-     */
-    private static final class Key<S, T> extends SimpleImmutableEntry<Class<S>, Class<T>> {
-        private static final long serialVersionUID = -1L;
-
-        private Key(Class<S> sourceType, Class<T> targetType) {
-            super(sourceType, targetType);
-        }
-
-        public static <S, T> Key<S, T> of(Class<S> sourceType, Class<T> targetType) {
-            return new Key<S, T>(sourceType, targetType);
-        }
-
-        public boolean isAssignableFrom(Class<?> sourceType, Class<?> targetType) {
-            return getKey().isAssignableFrom(sourceType) && getValue().isAssignableFrom(targetType);
-        }
-    }
-
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbTyped.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbTyped.java
deleted file mode 100644
index 0deb4cedc976..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbTyped.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMapperFieldModel.DynamoDbAttributeType;
-
-/**
- * Annotation to override the standard attribute type binding.
- *
- * <pre class="brush: java">
- * &#064;DynamoDBTyped(DynamoDBAttributeType.S)
- * public MyObject myObject()
- * </pre>
-
- * <p><b>Standard Types</b></p>
- * <p>Standard types do not require the annotation if applying the default
- * attribute binding for that type.</p>
- * <p>String/{@code S} types,</p>
- * <ul>
- *     <li>{@link java.lang.Character}/{@code char}</li>
- *     <li>{@link java.lang.String}</li>
- *     <li>{@link java.net.URL}</li>
- *     <li>{@link java.net.URI}</li>
- *     <li>{@link java.util.Calendar}</li>
- *     <li>{@link java.util.Currency}</li>
- *     <li>{@link java.util.Date}</li>
- *     <li>{@link java.util.Locale}</li>
- *     <li>{@link java.util.TimeZone}</li>
- *     <li>{@link java.util.UUID}</li>
- *     <li>{@link S3Link}</li>
- * </ul>
- * <p>Number/{@code N} types,</p>
- * <ul>
- *     <li>{@link java.math.BigDecimal}</li>
- *     <li>{@link java.math.BigInteger}</li>
- *     <li>{@link java.lang.Boolean}/{@code boolean}</li>
- *     <li>{@link java.lang.Byte}/{@code byte}</li>
- *     <li>{@link java.lang.Double}/{@code double}</li>
- *     <li>{@link java.lang.Float}/{@code float}</li>
- *     <li>{@link java.lang.Integer}/{@code int}</li>
- *     <li>{@link java.lang.Long}/{@code long}</li>
- *     <li>{@link java.lang.Short}/{@code short}</li>
- * </ul>
- * <p>Binary/{@code B} types,</p>
- * <ul>
- *     <li>{@link java.nio.ByteBuffer}</li>
- *     <li>{@code byte[]}</li>
- * </ul>
- *
- * <p><b>{@link DynamoDbTypeConverter}</b></p>
- * <p>A custom type-converter maybe applied to any attribute, either by
- * annotation or by overriding the standard type-converter factory.</p>
- * <pre class="brush: java">
- * DynamoDBMapperConfig config = DynamoDBMapperConfig.builder()
- *     .withTypeConverterFactory(DynamoDBTypeConverterFactory.standard().override()
- *         .with(String.class, MyObject.class, new StringToMyObjectConverter())
- *         .build())
- *     .build();
- * </pre>
- * <p>If the converter being applied is already a supported data type and
- * the conversion is of the same attribute type, for instance,
- * {@link java.util.Date} to {@link String} to {@code S},
- * the annotation may be omitted. The annotation is require for all non-standard
- * types or if the attribute type binding is being overridden.</p>
- *
- * <p><b>{@link software.amazon.awssdk.services.dynamodb.model.AttributeValue}</b></p>
- * <p>Direct native conversion is supported by default in all schemas.
- * If the attribute is a primary or index key, it must specify either
- * {@code B}, {@code N}, or {@code S}, otherwise, it may be omitted.</p>
- *
- * <p><b>{@link Boolean} to {@code BOOL}</b></p>
- * <p>The standard V2 conversion schema will by default serialize booleans
- * natively using the DynamoDB {@code BOOL} type.</p>
- * <pre class="brush: java">
- * &#064;DynamoDBTyped(DynamoDBAttributeType.BOOL)
- * public boolean isTesting()
- * </pre>
- *
- * <p><b>{@link Boolean} to {@code N}</b></p>
- * <p>The standard V1 and V2 compatible conversion schemas will by default
- * serialize booleans using the DynamoDB {@code N} type, with a value of '1'
- * representing 'true' and a value of '0' representing 'false'.</p>
- * <pre class="brush: java">
- * &#064;DynamoDBTyped(DynamoDBAttributeType.N)
- * public boolean isTesting()
- * </pre>
- *
- * <p><b>{@link Enum} to {@code S}</b></p>
- * <p>The {@code enum} type is only supported by override or custom converter.
- * There are some risks in distributed systems when using enumerations as
- * attributes intead of simply using a String. When adding new values to the
- * enumeration, the enum only changes must deployed before the enumeration
- * value can be persisted. This will ensure that all systems have the correct
- * code to map it from the item record in DynamoDB to your objects.</p>
- * <pre class="brush: java">
- * public enum Status { OPEN, PENDING, CLOSED };
- *
- * &#064;DynamoDBTyped(DynamoDBAttributeType.S)
- * public Status status()
- * </pre>
- *
- * <p><b>{@link UUID} to {@code B}</b></p>
- * <p>The {@code UUID} type will serialize to {@link String}/{@code S} by
- * default in all conversion schemas. The schemas do support serializing to
- * {@link ByteBuffer}/{@code B} by override.</p>
- * <pre class="brush: java">
- * &#064;DynamoDBTyped(DynamoDBAttributeType.B)
- * public UUID getKey()
- * </pre>
- *
- * <p><b>{@link Set} to {@code L}</b></p>
- * <p>The standard V1 and V2 compatible conversion schemas do not by default
- * support non-scalar {@code Set} types. They are supported in V2.  In
- * non-supported schemas, the {@link List}/{@code L} override may be applied
- * to any {@code Set} type.</p>
- * <pre class="brush: java">
- * &#064;DynamoDBTyped(DynamoDBAttributeType.L)
- * public Set&lt;MyObject&gt; myObjects()
- * </pre>
- *
- * <p><b>{@link Object} to {@code M}</b></p>
- * <p>Also supported as {@link DynamoDbDocument}.</p>
- * <pre class="brush: java">
- * &#064;DynamoDBTyped(DynamoDBAttributeType.M)
- * public MyObject myObject()
- * </pre>
- *
- * <p>May be combined with {@link DynamoDbTypeConverted}.</p>
- *
- * <p>May be used as a meta-annotation.</p>
- *
- * @see DynamoDbTypeConverted
- * @see DynamoDbTypeConverterFactory
- */
-@DynamoDb
-@Inherited
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.TYPE, ElementType.FIELD, ElementType.METHOD, ElementType.ANNOTATION_TYPE})
-public @interface DynamoDbTyped {
-
-    /**
-     * Use when the type of the attribute as stored in DynamoDB should differ
-     * from the standard type assigned by DynamoDBMapper.
-     */
-    DynamoDbAttributeType value() default DynamoDbAttributeType.NULL;
-
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbVersionAttribute.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbVersionAttribute.java
deleted file mode 100644
index bc1edd0ae667..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbVersionAttribute.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
-
-/**
- * Annotation for marking a property as an optimistic locking version attribute.
- *
- * <p>Applied to the getter method or the class field for the class's version
- * property. If the annotation is applied directly to the class field, the
- * corresponding getter and setter must be declared in the same class.
- *
- * <p>Alternately, the meta-annotation {@link DynamoDbVersioned} may be used
- * to annotate a custom annotation, or directly to the field/getter.</p>
- *
- * <p>Only nullable, integral numeric types (e.g. Integer, Long) can be used as
- * version properties. On a save() operation, the {@link DynamoDbMapper} will
- * attempt to increment the version property and assert that the service's value
- * matches the client's. New objects will be assigned a version of 1 when saved.
- * <p>
- * Note that for batchWrite, and by extension batchSave and batchDelete, <b>no
- * version checks are performed</b>, as required by the
- * {@link DynamoDbClient#batchWriteItem(BatchWriteItemRequest)}
- * API.
- *
- * @see DynamoDbVersioned
- */
-@DynamoDb
-@DynamoDbVersioned
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.FIELD, ElementType.METHOD})
-public @interface DynamoDbVersionAttribute {
-
-    /**
-     * Optional parameter when the name of the attribute as stored in DynamoDB
-     * should differ from the name used by the getter / setter.
-     */
-    String attributeName() default "";
-
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbVersioned.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbVersioned.java
deleted file mode 100644
index 5a7fd63b1503..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/DynamoDbVersioned.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-import java.math.BigInteger;
-import java.util.Arrays;
-import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
-import software.amazon.awssdk.services.dynamodb.datamodeling.StandardTypeConverters.Scalar;
-
-/**
- * Annotation for marking a property as an optimistic locking version attribute.
- *
- * <pre class="brush: java">
- * &#064;DynamoDBVersioned
- * public Long getRecordVersionNumber()
- * </pre>
- *
- * <p>Alternately, the convinience annotation {@link DynamoDbVersionAttribute}
- * may be used if combining with an attribute name on a field/getter.</p>
- *
- * <p>Only nullable, integral numeric types (e.g. Integer, Long) can be used as
- * version properties. On a save() operation, the {@link DynamoDbMapper} will
- * attempt to increment the version property and assert that the service's value
- * matches the client's.</p>
- *
- * <p>New objects will be assigned a version of 1 when saved.</p>
- *
- * <p>Note that for batchWrite, and by extension batchSave and batchDelete,
- * <b>no version checks are performed</b>, as required by the
- * {@link DynamoDbClient#batchWriteItem(BatchWriteItemRequest)}
- * API.</p>
- *
- * <p>May be used as a meta-annotation.</p>
- *
- * @see DynamoDbVersionAttribute
- */
-@DynamoDb
-@DynamoDbAutoGenerated(generator = DynamoDbVersioned.Generator.class)
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.FIELD, ElementType.METHOD, ElementType.ANNOTATION_TYPE})
-public @interface DynamoDbVersioned {
-
-    /**
-     * Version auto-generator.
-     */
-    final class Generator<T> extends DynamoDbAutoGenerator.AbstractGenerator<T> {
-        private final Sequence<T> sequence;
-
-        Generator(Class<T> targetType, DynamoDbVersioned annotation) {
-            super(DynamoDbAutoGenerateStrategy.ALWAYS);
-            this.sequence = Sequences.of(targetType);
-        }
-
-        @Override
-        public T generate(final T currentValue) {
-            return currentValue == null ? sequence.init() : sequence.next(currentValue);
-        }
-
-        private enum Sequences {
-            BIG_INTEGER(Scalar.BIG_INTEGER, new Sequence<BigInteger>() {
-                @Override
-                public BigInteger init() {
-                    return BigInteger.ONE;
-                }
-
-                @Override
-                public BigInteger next(final BigInteger o) {
-                    return o.add(BigInteger.ONE);
-                }
-            }),
-
-            BYTE(Scalar.BYTE, new Sequence<Byte>() {
-                @Override
-                public Byte init() {
-                    return Byte.valueOf((byte) 1);
-                }
-
-                @Override
-                public Byte next(final Byte o) {
-                    return (byte) ((o + 1) % Byte.MAX_VALUE);
-                }
-            }),
-
-            INTEGER(Scalar.INTEGER, new Sequence<Integer>() {
-                @Override
-                public Integer init() {
-                    return Integer.valueOf(1);
-                }
-
-                @Override
-                public Integer next(final Integer o) {
-                    return o + 1;
-                }
-            }),
-
-            LONG(Scalar.LONG, new Sequence<Long>() {
-                @Override
-                public Long init() {
-                    return Long.valueOf(1L);
-                }
-
-                @Override
-                public Long next(final Long o) {
-                    return o + 1L;
-                }
-            }),
-
-            SHORT(Scalar.SHORT, new Sequence<Short>() {
-                @Override
-                public Short init() {
-                    return Short.valueOf((short) 1);
-                }
-
-                @Override
-                public Short next(final Short o) {
-                    return (short) (o + 1);
-                }
-            });
-
-            private final Sequence<?> sequence;
-            private final Scalar scalar;
-
-            Sequences(final Scalar scalar, final Sequence<?> sequence) {
-                this.sequence = sequence;
-                this.scalar = scalar;
-            }
-
-            private static <T> Sequence<T> of(final Class<T> targetType) {
-                for (final Sequences s : Sequences.values()) {
-                    if (s.scalar.is(targetType)) {
-                        return (Sequence<T>) s.sequence;
-                    }
-                }
-                throw new DynamoDbMappingException(
-                        "type [" + targetType + "] is not supported; allowed only " + Arrays.toString(Sequences.values())
-                );
-            }
-        }
-
-        interface Sequence<T> {
-            T init();
-
-            T next(T o);
-        }
-    }
-
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/GenerateDeleteTableRequestTest.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/GenerateDeleteTableRequestTest.java
deleted file mode 100644
index 03688421a463..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/GenerateDeleteTableRequestTest.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-import software.amazon.awssdk.services.dynamodb.model.DeleteTableRequest;
-
-/**
- * Unit tests for {@link DynamoDbMapper#generateDeleteTableRequest(Class)}.
- */
-public class GenerateDeleteTableRequestTest {
-
-    private static final String TABLE_PREFIX = "DEV-";
-    private static final String TABLE_NAME = "OBJECTORMEXAMPLE";
-
-    @Test
-    public void tableNameNotOverriden_UsesTableNameAttributeInAnnotation() {
-        DynamoDbMapper dynamoDBMapper = new DynamoDbMapper(null);
-        DeleteTableRequest deleteTableRequest = dynamoDBMapper.generateDeleteTableRequest(ObjectORMExample.class);
-        assertEquals(deleteTableRequest.tableName(), TABLE_NAME);
-    }
-
-    @Test
-    public void tableNameOverriddenInConfig_UsesPrefixedOverrideTableName() {
-        DynamoDbMapperConfig.TableNameOverride tableNameOverride = DynamoDbMapperConfig.TableNameOverride
-                .withTableNamePrefix(TABLE_PREFIX);
-        DynamoDbMapperConfig config = new DynamoDbMapperConfig(tableNameOverride);
-        DynamoDbMapper dynamoDBMapper = new DynamoDbMapper(null, config);
-
-        DeleteTableRequest deleteTableRequest = dynamoDBMapper.generateDeleteTableRequest(ObjectORMExample.class);
-        assertEquals(deleteTableRequest.tableName(), TABLE_PREFIX.concat(TABLE_NAME));
-    }
-
-    @DynamoDbTable(tableName = TABLE_NAME)
-    private static class ObjectORMExample {
-        private String id;
-
-        @DynamoDbHashKey
-        public final String getId() {
-            return this.id;
-        }
-
-        public final void setId(String id) {
-            this.id = id;
-        }
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/IDynamoDbMapper.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/IDynamoDbMapper.java
deleted file mode 100644
index 090615becfdd..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/IDynamoDbMapper.java
+++ /dev/null
@@ -1,690 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-import java.util.List;
-import java.util.Map;
-import software.amazon.awssdk.regions.Region;
-import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMapper.FailedBatch;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMapperConfig.PaginationLoadingStrategy;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMapperConfig.SaveBehavior;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-import software.amazon.awssdk.services.dynamodb.model.BatchGetItemRequest;
-import software.amazon.awssdk.services.dynamodb.model.BatchWriteItemRequest;
-import software.amazon.awssdk.services.dynamodb.model.CreateTableRequest;
-import software.amazon.awssdk.services.dynamodb.model.DeleteTableRequest;
-import software.amazon.awssdk.services.dynamodb.model.PutItemRequest;
-import software.amazon.awssdk.services.dynamodb.model.UpdateItemRequest;
-
-/**
- * Interface for DynamoDBMapper.
- *
- * <p>
- * <b>Note:</b> Do not implement this interface, extend from {@link AbstractDynamoDbMapper} instead.
- * </p>
- *
- * @see DynamoDbMapper
- * @see AbstractDynamoDbMapper
- */
-public interface IDynamoDbMapper {
-    /**
-     * Get the table model for the class, using the default configuration.
-     *
-     * @see DynamoDbMapper#getTableModel(Class, DynamoDbMapperConfig)
-     */
-    <T extends Object> DynamoDbMapperTableModel<T> getTableModel(Class<T> clazz);
-
-    /**
-     * Get the table model for the class using the provided configuration override.
-     */
-    <T extends Object> DynamoDbMapperTableModel<T> getTableModel(Class<T> clazz, DynamoDbMapperConfig config);
-
-    /**
-     * Loads an object with the hash key given and a configuration override. This configuration
-     * overrides the default provided at object construction.
-     *
-     * @see DynamoDbMapper#load(Class, Object, Object, DynamoDbMapperConfig)
-     */
-    <T extends Object> T load(Class<T> clazz, Object hashKey, DynamoDbMapperConfig config);
-
-    /**
-     * Loads an object with the hash key given, using the default configuration.
-     *
-     * @see DynamoDbMapper#load(Class, Object, Object, DynamoDbMapperConfig)
-     */
-    <T extends Object> T load(Class<T> clazz, Object hashKey);
-
-    /**
-     * Loads an object with a hash and range key, using the default configuration.
-     *
-     * @see DynamoDbMapper#load(Class, Object, Object, DynamoDbMapperConfig)
-     */
-    <T extends Object> T load(Class<T> clazz, Object hashKey, Object rangeKey);
-
-    /**
-     * Returns an object whose keys match those of the prototype key object given, or null if no
-     * such item exists.
-     *
-     * @param keyObject
-     *            An object of the class to load with the keys values to match.
-     * @see DynamoDbMapper#load(Object, DynamoDbMapperConfig)
-     */
-    <T extends Object> T load(T keyObject);
-
-    /**
-     * Returns an object whose keys match those of the prototype key object given, or null if no
-     * such item exists.
-     *
-     * @param keyObject
-     *            An object of the class to load with the keys values to match.
-     * @param config
-     *            Configuration for the service call to retrieve the object from DynamoDB. This
-     *            configuration overrides the default given at construction.
-     */
-    <T extends Object> T load(T keyObject, DynamoDbMapperConfig config);
-
-    /**
-     * Returns an object with the given hash key, or null if no such object exists.
-     *
-     * @param clazz
-     *            The class to load, corresponding to a DynamoDB table.
-     * @param hashKey
-     *            The key of the object.
-     * @param rangeKey
-     *            The range key of the object, or null for tables without a range key.
-     * @param config
-     *            Configuration for the service call to retrieve the object from DynamoDB. This
-     *            configuration overrides the default given at construction.
-     */
-    <T extends Object> T load(Class<T> clazz, Object hashKey, Object rangeKey, DynamoDbMapperConfig config);
-
-    /**
-     * Creates and fills in the attributes on an instance of the class given with the attributes
-     * given.
-     * <p>
-     * This is accomplished by looking for getter methods annotated with an appropriate annotation,
-     * then looking for matching attribute names in the item attribute map.
-     * <p>
-     * This method is no longer called by load/scan/query methods. If you are overriding this
-     * method, please switch to using an AttributeTransformer
-     *
-     * @param clazz
-     *            The class to instantiate and hydrate
-     * @param itemAttributes
-     *            The set of item attributes, keyed by attribute name.
-     */
-    <T> T marshallIntoObject(Class<T> clazz, Map<String, AttributeValue> itemAttributes);
-
-    /**
-     * Unmarshalls the list of item attributes into objects of type clazz.
-     * <p>
-     * This method is no longer called by load/scan/query methods. If you are overriding this
-     * method, please switch to using an AttributeTransformer
-     *
-     * @see DynamoDbMapper#marshallIntoObject(Class, Map)
-     */
-    <T> List<T> marshallIntoObjects(Class<T> clazz, List<Map<String, AttributeValue>> itemAttributes);
-
-    /**
-     * Saves the object given into DynamoDB, using the default configuration.
-     *
-     * @see DynamoDbMapper#save(Object, DynamoDbSaveExpression, DynamoDbMapperConfig)
-     */
-    <T extends Object> void save(T object);
-
-    /**
-     * Saves the object given into DynamoDB, using the default configuration and the specified
-     * saveExpression.
-     *
-     * @see DynamoDbMapper#save(Object, DynamoDbSaveExpression, DynamoDbMapperConfig)
-     */
-    <T extends Object> void save(T object, DynamoDbSaveExpression saveExpression);
-
-    /**
-     * Saves the object given into DynamoDB, using the specified configuration.
-     *
-     * @see DynamoDbMapper#save(Object, DynamoDbSaveExpression, DynamoDbMapperConfig)
-     */
-    <T extends Object> void save(T object, DynamoDbMapperConfig config);
-
-    /**
-     * Saves an item in DynamoDB. The service method used is determined by the
-     * {@link DynamoDbMapperConfig#saveBehavior()} value, to use either
-     * {@link DynamoDbClient#putItem(PutItemRequest)} or
-     * {@link DynamoDbClient#updateItem(UpdateItemRequest)}:
-     * <ul>
-     * <li><b>UPDATE</b> (default) : UPDATE will not affect unmodeled attributes on a save operation
-     * and a null value for the modeled attribute will remove it from that item in DynamoDB. Because
-     * of the limitation of updateItem request, the implementation of UPDATE will send a putItem
-     * request when a key-only object is being saved, and it will send another updateItem request if
-     * the given key(s) already exists in the table.</li>
-     * <li><b>UPDATE_SKIP_NULL_ATTRIBUTES</b> : Similar to UPDATE except that it ignores any null
-     * value attribute(s) and will NOT remove them from that item in DynamoDB. It also guarantees to
-     * send only one single updateItem request, no matter the object is key-only or not.</li>
-     * <li><b>CLOBBER</b> : CLOBBER will clear and replace all attributes, included unmodeled ones,
-     * (delete and recreate) on save. Versioned field constraints will also be disregarded.</li>
-     * </ul>
-     * Any options specified in the saveExpression parameter will be overlaid on any constraints due
-     * to versioned attributes.
-     *
-     * @param object
-     *            The object to save into DynamoDB
-     * @param saveExpression
-     *            The options to apply to this save request
-     * @param config
-     *            The configuration to use, which overrides the default provided at object
-     *            construction.
-     * @see DynamoDbMapperConfig.SaveBehavior
-     */
-    <T extends Object> void save(T object, DynamoDbSaveExpression saveExpression, DynamoDbMapperConfig config);
-
-    /**
-     * Deletes the given object from its DynamoDB table using the default configuration.
-     */
-    void delete(Object object);
-
-    /**
-     * Deletes the given object from its DynamoDB table using the specified deleteExpression and
-     * default configuration.
-     */
-    void delete(Object object, DynamoDbDeleteExpression deleteExpression);
-
-    /**
-     * Deletes the given object from its DynamoDB table using the specified configuration.
-     */
-    void delete(Object object, DynamoDbMapperConfig config);
-
-    /**
-     * Deletes the given object from its DynamoDB table using the provided deleteExpression and
-     * provided configuration. Any options specified in the deleteExpression parameter will be
-     * overlaid on any constraints due to versioned attributes.
-     *
-     * @param deleteExpression
-     *            The options to apply to this delete request
-     * @param config
-     *            Config override object. If {@link SaveBehavior#CLOBBER} is supplied, version
-     *            fields will not be considered when deleting the object.
-     */
-    <T> void delete(T object, DynamoDbDeleteExpression deleteExpression, DynamoDbMapperConfig config);
-
-    /**
-     * Deletes the objects given using one or more calls to the
-     * {@link DynamoDbClient#batchWriteItem(BatchWriteItemRequest)} API. <b>No version checks are
-     * performed</b>, as required by the API.
-     *
-     * @see DynamoDbMapper#batchWrite(Iterable, Iterable)
-     */
-    List<FailedBatch> batchDelete(Iterable<? extends Object> objectsToDelete);
-
-    /**
-     * Deletes the objects given using one or more calls to the
-     * {@link DynamoDbClient#batchWriteItem(BatchWriteItemRequest)} API. <b>No version checks are
-     * performed</b>, as required by the API.
-     *
-     * @see DynamoDbMapper#batchWrite(Iterable, Iterable)
-     */
-    List<FailedBatch> batchDelete(Object... objectsToDelete);
-
-    /**
-     * Saves the objects given using one or more calls to the
-     * {@link DynamoDbClient#batchWriteItem(BatchWriteItemRequest)} API. <b>No version checks are
-     * performed</b>, as required by the API.
-     * <p/>
-     * <b>This method ignores any SaveBehavior set on the mapper</b>, and always behaves as if
-     * SaveBehavior.CLOBBER was specified, as the DynamoDbClient.batchWriteItem() request does not
-     * support updating existing items.
-     * <p>
-     * This method fails to save the batch if the size of an individual object in the batch exceeds
-     * 400 KB. For more information on batch restrictions see, http://docs.aws.amazon
-     * .com/amazondynamodb/latest/APIReference/API_BatchWriteItem.html
-     * </p>
-     *
-     * @see DynamoDbMapper#batchWrite(Iterable, Iterable)
-     */
-    List<FailedBatch> batchSave(Iterable<? extends Object> objectsToSave);
-
-    /**
-     * Saves the objects given using one or more calls to the
-     * {@link DynamoDbClient#batchWriteItem(BatchWriteItemRequest)} API. <b>No version checks are
-     * performed</b>, as required by the API.
-     * <p/>
-     * <b>This method ignores any SaveBehavior set on the mapper</b>, and always behaves as if
-     * SaveBehavior.CLOBBER was specified, as the DynamoDbClient.batchWriteItem() request does not
-     * support updating existing items. *
-     * <p>
-     * This method fails to save the batch if the size of an individual object in the batch exceeds
-     * 400 KB. For more information on batch restrictions see, http://docs.aws.amazon
-     * .com/amazondynamodb/latest/APIReference/API_BatchWriteItem.html
-     * </p>
-     *
-     * @see DynamoDbMapper#batchWrite(Iterable, Iterable)
-     */
-    List<FailedBatch> batchSave(Object... objectsToSave);
-
-    /**
-     * Saves and deletes the objects given using one or more calls to the
-     * {@link DynamoDbClient#batchWriteItem(BatchWriteItemRequest)} API. <b>No version checks are
-     * performed</b>, as required by the API.
-     * <p/>
-     * <b>This method ignores any SaveBehavior set on the mapper</b>, and always behaves as if
-     * SaveBehavior.CLOBBER was specified, as the DynamoDbClient.batchWriteItem() request does not
-     * support updating existing items.
-     * <p>
-     * This method fails to save the batch if the size of an individual object in the batch exceeds
-     * 400 KB. For more information on batch restrictions see, http://docs.aws.amazon
-     * .com/amazondynamodb/latest/APIReference/API_BatchWriteItem.html
-     * </p>
-     * <p>
-     * If one of the write requests is for a table that is not present, this method does not throw a
-     * ResourceNotFoundException but returns a FailedBatch which includes this exception and the
-     * unprocessed items.
-     * </p>
-     *
-     * @see DynamoDbMapper#batchWrite(Iterable, Iterable)
-     */
-    List<FailedBatch> batchWrite(Iterable<? extends Object> objectsToWrite, Iterable<? extends Object> objectsToDelete);
-
-    /**
-     * Saves and deletes the objects given using one or more calls to the
-     * {@link DynamoDbClient#batchWriteItem(BatchWriteItemRequest)} API. Use mapper config to
-     * control the retry strategy when UnprocessedItems are returned by the BatchWriteItem API
-     * <p>
-     * This method fails to save the batch if the size of an individual object in the batch exceeds
-     * 400 KB. For more information on batch restrictions see, http://docs.aws.amazon
-     * .com/amazondynamodb/latest/APIReference/API_BatchWriteItem.html
-     * </p>
-     * <p>
-     * If one of the write requests is for a table that is not present, this method does not throw a
-     * ResourceNotFoundException but returns a FailedBatch which includes this exception and the
-     * unprocessed items.
-     * </p>
-     *
-     * @param objectsToWrite
-     *            A list of objects to save to DynamoDB. <b>No version checks are performed</b>, as
-     *            required by the {@link DynamoDbClient#batchWriteItem(BatchWriteItemRequest)} API.
-     * @param objectsToDelete
-     *            A list of objects to delete from DynamoDB. <b>No version checks are performed</b>,
-     *            as required by the {@link DynamoDbClient#batchWriteItem(BatchWriteItemRequest)}
-     *            API.
-     * @param config
-     *            Only {@link DynamoDbMapperConfig#getTableNameOverride()} and
-     *            {@link DynamoDbMapperConfig#batchWriteRetryStrategy()} are considered. If
-     *            TableNameOverride is specified, all objects in the two parameter lists will be
-     *            considered to belong to the given table override. In particular, this method
-     *            <b>always acts as if SaveBehavior.CLOBBER was specified</b> regardless of the
-     *            value of the config parameter.
-     * @return A list of failed batches which includes the unprocessed items and the exceptions
-     *         causing the failure.
-     * @see DynamoDbMapperConfig#getTableNameOverride()
-     * @see DynamoDbMapperConfig#batchWriteRetryStrategy()
-     */
-    List<FailedBatch> batchWrite(Iterable<? extends Object> objectsToWrite,
-                                 Iterable<? extends Object> objectsToDelete,
-                                 DynamoDbMapperConfig config);
-
-    /**
-     * Retrieves multiple items from multiple tables using their primary keys.
-     *
-     * @see DynamoDbMapper#batchLoad(List, DynamoDbMapperConfig)
-     * @return A map of the loaded objects. Each key in the map is the name of a DynamoDB table.
-     *         Each value in the map is a list of objects that have been loaded from that table. All
-     *         objects for each table can be cast to the associated user defined type that is
-     *         annotated as mapping that table.
-     * @throws DynamoDbMapper.BatchGetItemException if all the requested items are not processed
-     *         within the maximum number of retries.
-     */
-    Map<String, List<Object>> batchLoad(Iterable<? extends Object> itemsToGet);
-
-    /**
-     * Retrieves multiple items from multiple tables using their primary keys.
-     *
-     * @param itemsToGet
-     *            Key objects, corresponding to the class to fetch, with their primary key values
-     *            set.
-     * @param config
-     *            Only {@link DynamoDbMapperConfig#getTableNameOverride()} and
-     *            {@link DynamoDbMapperConfig#getConsistentRead()} are considered.
-     * @return A map of the loaded objects. Each key in the map is the name of a DynamoDB table.
-     *         Each value in the map is a list of objects that have been loaded from that table. All
-     *         objects for each table can be cast to the associated user defined type that is
-     *         annotated as mapping that table.
-     * @throws DynamoDbMapper.BatchGetItemException if all the requested items are not processed
-     *         within the maximum number of retries.
-     */
-    Map<String, List<Object>> batchLoad(Iterable<? extends Object> itemsToGet, DynamoDbMapperConfig config);
-
-    /**
-     * Retrieves the attributes for multiple items from multiple tables using their primary keys.
-     * {@link DynamoDbClient#batchGetItem(BatchGetItemRequest)} API.
-     *
-     * @return A map of the loaded objects. Each key in the map is the name of a DynamoDB table.
-     *         Each value in the map is a list of objects that have been loaded from that table. All
-     *         objects for each table can be cast to the associated user defined type that is
-     *         annotated as mapping that table.
-     * @throws DynamoDbMapper.BatchGetItemException if all the requested items are not processed
-     *         within the maximum number of retries.
-     * @see #batchLoad(List, DynamoDbMapperConfig)
-     * @see #batchLoad(Map, DynamoDbMapperConfig)
-     */
-    Map<String, List<Object>> batchLoad(Map<Class<?>, List<KeyPair>> itemsToGet);
-
-    /**
-     * Retrieves multiple items from multiple tables using their primary keys. Valid only for tables
-     * with a single hash key, or a single hash and range key. For other schemas, use
-     * {@link DynamoDbMapper#batchLoad(List, DynamoDbMapperConfig)}
-     *
-     * @param itemsToGet
-     *            Map from class to load to list of primary key attributes.
-     * @param config
-     *            Only {@link DynamoDbMapperConfig#getTableNameOverride()} and
-     *            {@link DynamoDbMapperConfig#getConsistentRead()} are considered.
-     * @return A map of the loaded objects. Each key in the map is the name of a DynamoDB table.
-     *         Each value in the map is a list of objects that have been loaded from that table. All
-     *         objects for each table can be cast to the associated user defined type that is
-     *         annotated as mapping that table.
-     * @throws DynamoDbMapper.BatchGetItemException if all the requested items are not processed
-     *         within the maximum number of retries.
-     */
-    Map<String, List<Object>> batchLoad(Map<Class<?>, List<KeyPair>> itemsToGet, DynamoDbMapperConfig config);
-
-    /**
-     * Scans through an Amazon DynamoDB table and returns the matching results as an unmodifiable
-     * list of instantiated objects, using the default configuration.
-     *
-     * @see DynamoDbMapper#scan(Class, DynamoDbScanExpression, DynamoDbMapperConfig)
-     */
-    <T> PaginatedScanList<T> scan(Class<T> clazz, DynamoDbScanExpression scanExpression);
-
-    /**
-     * Scans through an Amazon DynamoDB table and returns the matching results as an unmodifiable
-     * list of instantiated objects. The table to scan is determined by looking at the annotations
-     * on the specified class, which declares where to store the object data in Amazon DynamoDB, and
-     * the scan expression parameter allows the caller to filter results and control how the scan is
-     * executed.
-     * <p>
-     * Callers should be aware that the returned list is unmodifiable, and any attempts to modify
-     * the list will result in an UnsupportedOperationException.
-     * <p>
-     * You can specify the pagination loading strategy for this scan operation. By default, the list
-     * returned is lazily loaded when possible.
-     *
-     * @param <T>
-     *            The type of the objects being returned.
-     * @param clazz
-     *            The class annotated with DynamoDB annotations describing how to store the object
-     *            data in Amazon DynamoDB.
-     * @param scanExpression
-     *            Details on how to run the scan, including any filters to apply to limit results.
-     * @param config
-     *            The configuration to use for this scan, which overrides the default provided at
-     *            object construction.
-     * @return An unmodifiable list of the objects constructed from the results of the scan
-     *         operation.
-     * @see PaginatedScanList
-     * @see PaginationLoadingStrategy
-     */
-    <T> PaginatedScanList<T> scan(Class<T> clazz, DynamoDbScanExpression scanExpression, DynamoDbMapperConfig config);
-
-    /**
-     * Scans through an Amazon DynamoDB table on logically partitioned segments in parallel and
-     * returns the matching results in one unmodifiable list of instantiated objects, using the
-     * default configuration.
-     *
-     * @see DynamoDbMapper#parallelScan(Class, DynamoDbScanExpression, int, DynamoDbMapperConfig)
-     */
-    <T> PaginatedParallelScanList<T> parallelScan(Class<T> clazz,
-                                                  DynamoDbScanExpression scanExpression,
-                                                  int totalSegments);
-
-    /**
-     * Scans through an Amazon DynamoDB table on logically partitioned segments in parallel. This
-     * method will create a thread pool of the specified size, and each thread will issue scan
-     * requests for its assigned segment, following the returned continuation token, until the end
-     * of its segment. Callers should be responsible for setting the appropriate number of total
-     * segments. More scan segments would result in better performance but more consumed capacity of
-     * the table. The results are returned in one unmodifiable list of instantiated objects. The
-     * table to scan is determined by looking at the annotations on the specified class, which
-     * declares where to store the object data in Amazon DynamoDB, and the scan expression parameter
-     * allows the caller to filter results and control how the scan is executed.
-     * <p>
-     * Callers should be aware that the returned list is unmodifiable, and any attempts to modify
-     * the list will result in an UnsupportedOperationException.
-     * <p>
-     * You can specify the pagination loading strategy for this parallel scan operation. By default,
-     * the list returned is lazily loaded when possible.
-     *
-     * @param <T>
-     *            The type of the objects being returned.
-     * @param clazz
-     *            The class annotated with DynamoDB annotations describing how to store the object
-     *            data in Amazon DynamoDB.
-     * @param scanExpression
-     *            Details on how to run the scan, including any filters to apply to limit results.
-     * @param totalSegments
-     *            Number of total parallel scan segments. <b>Range: </b>1 - 4096
-     * @param config
-     *            The configuration to use for this scan, which overrides the default provided at
-     *            object construction.
-     * @return An unmodifiable list of the objects constructed from the results of the scan
-     *         operation.
-     * @see PaginatedParallelScanList
-     * @see PaginationLoadingStrategy
-     */
-    <T> PaginatedParallelScanList<T> parallelScan(Class<T> clazz,
-                                                  DynamoDbScanExpression scanExpression,
-                                                  int totalSegments,
-                                                  DynamoDbMapperConfig config);
-
-    /**
-     * Scans through an Amazon DynamoDB table and returns a single page of matching results. The
-     * table to scan is determined by looking at the annotations on the specified class, which
-     * declares where to store the object data in AWS DynamoDB, and the scan expression parameter
-     * allows the caller to filter results and control how the scan is executed.
-     *
-     * @param <T>
-     *            The type of the objects being returned.
-     * @param clazz
-     *            The class annotated with DynamoDB annotations describing how to store the object
-     *            data in Amazon DynamoDB.
-     * @param scanExpression
-     *            Details on how to run the scan, including any filters to apply to limit results.
-     * @param config
-     *            The configuration to use for this scan, which overrides the default provided at
-     *            object construction.
-     */
-    <T> ScanResultPage<T> scanPage(Class<T> clazz, DynamoDbScanExpression scanExpression, DynamoDbMapperConfig config);
-
-    /**
-     * Scans through an Amazon DynamoDB table and returns a single page of matching results.
-     *
-     * @see DynamoDbMapper#scanPage(Class, DynamoDbScanExpression, DynamoDbMapperConfig)
-     */
-    <T> ScanResultPage<T> scanPage(Class<T> clazz, DynamoDbScanExpression scanExpression);
-
-    /**
-     * Queries an Amazon DynamoDB table and returns the matching results as an unmodifiable list of
-     * instantiated objects, using the default configuration.
-     *
-     * @see DynamoDbMapper#query(Class, DynamoDbQueryExpression, DynamoDbMapperConfig)
-     */
-    <T> PaginatedQueryList<T> query(Class<T> clazz, DynamoDbQueryExpression<T> queryExpression);
-
-    /**
-     * Queries an Amazon DynamoDB table and returns the matching results as an unmodifiable list of
-     * instantiated objects. The table to query is determined by looking at the annotations on the
-     * specified class, which declares where to store the object data in Amazon DynamoDB, and the
-     * query expression parameter allows the caller to filter results and control how the query is
-     * executed.
-     * <p>
-     * When the query is on any local/global secondary index, callers should be aware that the
-     * returned object(s) will only contain item attributes that are projected into the index. All
-     * the other unprojected attributes will be saved as type default values.
-     * <p>
-     * Callers should also be aware that the returned list is unmodifiable, and any attempts to
-     * modify the list will result in an UnsupportedOperationException.
-     * <p>
-     * You can specify the pagination loading strategy for this query operation. By default, the
-     * list returned is lazily loaded when possible.
-     *
-     * @param <T>
-     *            The type of the objects being returned.
-     * @param clazz
-     *            The class annotated with DynamoDB annotations describing how to store the object
-     *            data in Amazon DynamoDB.
-     * @param queryExpression
-     *            Details on how to run the query, including any conditions on the key values
-     * @param config
-     *            The configuration to use for this query, which overrides the default provided at
-     *            object construction.
-     * @return An unmodifiable list of the objects constructed from the results of the query
-     *         operation.
-     * @see PaginatedQueryList
-     * @see PaginationLoadingStrategy
-     */
-    <T> PaginatedQueryList<T> query(Class<T> clazz,
-                                    DynamoDbQueryExpression<T> queryExpression,
-                                    DynamoDbMapperConfig config);
-
-    /**
-     * Queries an Amazon DynamoDB table and returns a single page of matching results. The table to
-     * query is determined by looking at the annotations on the specified class, which declares
-     * where to store the object data in Amazon DynamoDB, and the query expression parameter allows
-     * the caller to filter results and control how the query is executed.
-     *
-     * @see DynamoDbMapper#queryPage(Class, DynamoDbQueryExpression, DynamoDbMapperConfig)
-     */
-    <T> QueryResultPage<T> queryPage(Class<T> clazz, DynamoDbQueryExpression<T> queryExpression);
-
-    /**
-     * Queries an Amazon DynamoDB table and returns a single page of matching results. The table to
-     * query is determined by looking at the annotations on the specified class, which declares
-     * where to store the object data in Amazon DynamoDB, and the query expression parameter allows
-     * the caller to filter results and control how the query is executed.
-     *
-     * @param <T>
-     *            The type of the objects being returned.
-     * @param clazz
-     *            The class annotated with DynamoDB annotations describing how to store the object
-     *            data in AWS DynamoDB.
-     * @param queryExpression
-     *            Details on how to run the query, including any conditions on the key values
-     * @param config
-     *            The configuration to use for this query, which overrides the default provided at
-     *            object construction.
-     */
-    <T> QueryResultPage<T> queryPage(Class<T> clazz,
-                                     DynamoDbQueryExpression<T> queryExpression,
-                                     DynamoDbMapperConfig config);
-
-    /**
-     * Evaluates the specified scan expression and returns the count of matching items, without
-     * returning any of the actual item data, using the default configuration.
-     *
-     * @see DynamoDbMapper#count(Class, DynamoDbScanExpression, DynamoDbMapperConfig)
-     */
-    int count(Class<?> clazz, DynamoDbScanExpression scanExpression);
-
-    /**
-     * Evaluates the specified scan expression and returns the count of matching items, without
-     * returning any of the actual item data.
-     * <p>
-     * This operation will scan your entire table, and can therefore be very expensive. Use with
-     * caution.
-     *
-     * @param clazz
-     *            The class mapped to a DynamoDB table.
-     * @param scanExpression
-     *            The parameters for running the scan.
-     * @param config
-     *            The configuration to use for this scan, which overrides the default provided at
-     *            object construction.
-     * @return The count of matching items, without returning any of the actual item data.
-     */
-    int count(Class<?> clazz, DynamoDbScanExpression scanExpression, DynamoDbMapperConfig config);
-
-    /**
-     * Evaluates the specified query expression and returns the count of matching items, without
-     * returning any of the actual item data, using the default configuration.
-     *
-     * @see DynamoDbMapper#count(Class, DynamoDbQueryExpression, DynamoDbMapperConfig)
-     */
-    <T> int count(Class<T> clazz, DynamoDbQueryExpression<T> queryExpression);
-
-    /**
-     * Evaluates the specified query expression and returns the count of matching items, without
-     * returning any of the actual item data.
-     *
-     * @param clazz
-     *            The class mapped to a DynamoDB table.
-     * @param queryExpression
-     *            The parameters for running the scan.
-     * @param config
-     *            The mapper configuration to use for the query, which overrides the default
-     *            provided at object construction.
-     * @return The count of matching items, without returning any of the actual item data.
-     */
-    <T> int count(Class<T> clazz, DynamoDbQueryExpression<T> queryExpression, DynamoDbMapperConfig config);
-
-    /**
-     * Returns the underlying {@link S3ClientCache} for accessing S3.
-     */
-    S3ClientCache s3ClientCache();
-
-    /**
-     * Creates an S3Link with the specified bucket name and key using the default S3 region. This
-     * method requires the mapper to have been initialized with the necessary credentials for
-     * accessing S3.
-     *
-     * @throws IllegalStateException
-     *             if the mapper has not been constructed with the necessary S3 AWS credentials.
-     */
-    S3Link createS3Link(String bucketName, String key);
-
-    /**
-     * Creates an S3Link with the specified region, bucket name and key. This method requires the
-     * mapper to have been initialized with the necessary credentials for accessing S3.
-     *
-     * @throws IllegalStateException
-     *             if the mapper has not been constructed with the necessary S3 AWS credentials.
-     */
-    S3Link createS3Link(Region s3region, String bucketName, String key);
-
-    /**
-     * Creates an S3Link with the specified region, bucket name and key. This method requires the
-     * mapper to have been initialized with the necessary credentials for accessing S3.
-     *
-     * @throws IllegalStateException
-     *             if the mapper has not been constructed with the necessary S3 AWS credentials.
-     */
-    S3Link createS3Link(String s3region, String bucketName, String key);
-
-    /**
-     * Parse the given POJO class and return the CreateTableRequest for the DynamoDB table it
-     * represents. Note that the returned request does not include the required
-     * ProvisionedThroughput parameters for the primary table and the GSIs, and that all secondary
-     * indexes are initialized with the default projection type - KEY_ONLY.
-     */
-    CreateTableRequest generateCreateTableRequest(Class<?> clazz);
-
-
-    /**
-     * Parse the given POJO class and return the DeleteTableRequest for the DynamoDB table it
-     * represents.
-     */
-    DeleteTableRequest generateDeleteTableRequest(Class<?> clazz);
-
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/IncompatibleSubclassTest.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/IncompatibleSubclassTest.java
deleted file mode 100644
index f60ef765494e..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/IncompatibleSubclassTest.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-import java.util.Map;
-import org.junit.Test;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-
-/**
- * Verify that we fail fast in case of incompatible subclasses that try to
- * override the (now-removed) transformAttributes method.
- */
-public class IncompatibleSubclassTest {
-
-    @Test
-    public void testCompatibleSubclass() {
-        // Doesn't try to override one of the deprecated/removed
-        // transformAttributes methods; should be fine.
-        new CompatibleDynamoDbMapper();
-    }
-
-    @Test(expected = IllegalStateException.class)
-    public void testIncompatibleSubclass1() {
-        // "Overrides" transformAttributes(Class, Map); should fail fast.
-        new IncompatibleDynamoDbMapper1();
-    }
-
-    @Test(expected = IllegalStateException.class)
-    public void testIncompatibleSubclass2() {
-        // "Overrides" transformAttributes(String, String, Map); should fail
-        // fast.
-        new IncompatibleDynamoDbMapper2();
-    }
-
-    private static class CompatibleDynamoDbMapper extends DynamoDbMapper {
-
-        public CompatibleDynamoDbMapper() {
-            super(null);
-        }
-
-        protected void transformAttributes(boolean innocuous) {
-        }
-    }
-
-    private static class IncompatibleDynamoDbMapper1 extends DynamoDbMapper {
-
-        public IncompatibleDynamoDbMapper1() {
-            super(null);
-        }
-
-        protected Map<String, AttributeValue> transformAttributes(
-                Class<?> clazz,
-                Map<String, AttributeValue> attributeValues) {
-
-            return null;
-        }
-    }
-
-    private static class IncompatibleDynamoDbMapper2 extends DynamoDbMapper {
-
-        public IncompatibleDynamoDbMapper2() {
-            super(null);
-        }
-
-        protected Map<String, AttributeValue> transformAttributes(
-                String hashKey,
-                String rangeKey,
-                Map<String, AttributeValue> attributeValues) {
-
-            return null;
-        }
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/ItemConverter.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/ItemConverter.java
deleted file mode 100644
index d866365ec657..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/ItemConverter.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-import java.lang.reflect.Method;
-import java.util.Map;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-
-/**
- * The concrete realization of a strategy for converting between Java objects
- * and DynamoDB AttributeValues. Typically created by a
- * {@link ConversionSchema}.
- */
-public interface ItemConverter {
-    /**
-     * Returns the metadata (e.g. name, type) of the DynamoDB attribute that the
-     * return value of the given getter will be converted to.
-     *
-     * @param getter the getter method to inspect
-     * @return the metadata of the DynamoDB attribute that the result of the
-     *         getter will be converted to
-     */
-    DynamoDbMapperFieldModel getFieldModel(Method getter);
-
-    /**
-     * Converts a Java object into a DynamoDB AttributeValue. Potentially able
-     * to handle both scalar and complex types.
-     *
-     * @param getter the getter that returned the value to be converted
-     * @param value the value to be converted
-     * @return the converted AttributeValue
-     */
-    AttributeValue convert(Method getter, Object value);
-
-    /**
-     * Converts an appropriately-annotated POJO into a Map of AttributeValues.
-     *
-     * @param value the POJO to convert
-     * @return the resulting map of attribute values
-     */
-    Map<String, AttributeValue> convert(Object value);
-
-    /**
-     * Reverses the {@link #convert(Method, Object)} method, turning a
-     * DynamoDB AttributeValue back into a Java object suitable for passing
-     * to the given setter.
-     *
-     * @param getter the getter for the value to be unconverted
-     * @param setter the setter for the value to be unconverted
-     * @param value the attribute value to be unconverted
-     * @return the unconverted Java object
-     */
-    Object unconvert(Method getter, Method setter, AttributeValue value);
-
-    /**
-     * Reverses the {@link #convert(Object)} method, turning a map of attribute
-     * values back into a POJO of the given class.
-     *
-     * @param <T> the compile-time type of the object to create
-     * @param clazz the runtime type of the object to create
-     * @param values the the map of attribute values to unconvert
-     * @return the unconverted POJO
-     */
-    <T> T unconvert(Class<T> clazz, Map<String, AttributeValue> values);
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/JsonMarshaller.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/JsonMarshaller.java
deleted file mode 100644
index dd9da70b6f4d..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/JsonMarshaller.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-import static software.amazon.awssdk.core.internal.util.ThrowableUtils.failure;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.ObjectWriter;
-
-/**
- * A simple JSON marshaller that uses the Jackson JSON processor. It shares all limitations of that
- * library. For more information about Jackson, see: http://wiki.fasterxml.com/JacksonHome
- *
- * @deprecated Replaced by {@link DynamoDbTypeConvertedJson}
- */
-@Deprecated
-public class JsonMarshaller<T extends Object> implements DynamoDbMarshaller<T> {
-
-    private static final ObjectMapper MAPPER = new ObjectMapper();
-    private static final ObjectWriter WRITER = MAPPER.writer();
-
-    /**
-     * The value type.
-     */
-    private final Class<T> valueType;
-
-    /**
-     * Constructs the JSON marshaller instance.
-     * @param valueType The value type (for generic type erasure).
-     */
-    public JsonMarshaller(final Class<T> valueType) {
-        this.valueType = valueType;
-    }
-
-    /**
-     * Constructs the JSON marshaller instance.
-     */
-    public JsonMarshaller() {
-        this(null);
-    }
-
-    /**
-     * Gets the value type.
-     * @return The value type.
-     */
-    protected final Class<T> valueType() {
-        return this.valueType;
-    }
-
-    @Override
-    public String marshall(T obj) {
-
-        try {
-            return WRITER.writeValueAsString(obj);
-        } catch (JsonProcessingException e) {
-            throw failure(e,
-                          "Unable to marshall the instance of " + obj.getClass()
-                          + "into a string");
-        }
-    }
-
-    @Override
-    public T unmarshall(Class<T> clazz, String json) {
-        try {
-            return MAPPER.readValue(json, (valueType() == null ? clazz : valueType()));
-        } catch (Exception e) {
-            throw failure(e, "Unable to unmarshall the string " + json
-                             + "into " + clazz);
-        }
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/KeyPair.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/KeyPair.java
deleted file mode 100644
index b1afbfee7de3..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/KeyPair.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-public class KeyPair {
-    private Object hashKey;
-    private Object rangeKey;
-
-    public KeyPair withHashKey(Object hashkey) {
-        this.hashKey = hashkey;
-        return this;
-    }
-
-    public KeyPair withRangeKey(Object rangeKey) {
-        this.rangeKey = rangeKey;
-        return this;
-    }
-
-    public Object getHashKey() {
-        return this.hashKey;
-    }
-
-    public void setHashKey(Object hashKey) {
-        this.hashKey = hashKey;
-    }
-
-    public Object getRangeKey() {
-        return this.rangeKey;
-    }
-
-    public void setRangeKey(Object rangeKey) {
-        this.rangeKey = rangeKey;
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/PaginatedList.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/PaginatedList.java
deleted file mode 100644
index 249cf1e68a33..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/PaginatedList.java
+++ /dev/null
@@ -1,528 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.NoSuchElementException;
-import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMapperConfig.PaginationLoadingStrategy;
-
-/**
- * Unmodifiable list supporting paginated result sets from Amazon DynamoDB.
- * <p>
- * Pages of results are fetched lazily from DynamoDB as they are needed. Some
- * methods, such as {@link PaginatedList#size()} and
- * {@link PaginatedList#toArray()}, require fetching the entire result set
- * eagerly. See the javadoc of individual methods for details on which are lazy.
- *
- * @param <T>
- *            The domain object type stored in this list.
- */
-public abstract class PaginatedList<T> implements List<T> {
-
-    private static final String UNMODIFIABLE_MESSAGE = "This is an unmodifiable list";
-
-    private static final String ITERATION_ONLY_UNSUPPORTED_OPERATION_MESSAGE =
-            " is not supported when using ITERATION_ONLY configuration.";
-
-    /**
-     * Reference to the DynamoDB mapper for marshalling DynamoDB attributes back
-     * into objects
-     */
-    protected final DynamoDbMapper mapper;
-
-    /**
-     * The class annotated with DynamoDB tags declaring how to load/store
-     * objects into DynamoDB
-     */
-    protected final Class<T> clazz;
-
-    /** The client for working with DynamoDB. */
-    protected final DynamoDbClient dynamo;
-
-    /** Tracks if all results have been loaded yet or not. */
-    protected boolean allResultsLoaded = false;
-
-    /**
-     * All currently loaded results for this list.
-     *
-     * In ITERATION_ONLY mode, this list will at most keep one page of the
-     * loaded results, and all previous results will be cleared from the memory.
-     */
-    protected final List<T> allResults;
-    /** Lazily loaded next results waiting to be added into allResults. */
-    protected final List<T> nextResults = new LinkedList<T>();
-    /** The pagination loading strategy for this paginated list **/
-    private final PaginationLoadingStrategy paginationLoadingStrategy;
-    /**
-     * Keeps track on whether an iterator of the list has been retrieved.
-     * Only updated and checked when the list is in ITERATION_ONLY mode.
-     */
-    private boolean iterationstarted = false;
-
-    /**
-     * Constructs a PaginatedList instance using the default PaginationLoadingStrategy
-     */
-    public PaginatedList(DynamoDbMapper mapper, Class<T> clazz, DynamoDbClient dynamo) {
-        this(mapper, clazz, dynamo, null);
-    }
-
-    /**
-     * Constructs a PaginatedList instance.
-     *
-     * @param mapper
-     *            The mapper for marshalling DynamoDB attributes into objects.
-     * @param clazz
-     *            The class of the annotated model.
-     * @param dynamo
-     *            The DynamoDB client for making low-level request calls.
-     * @param paginationLoadingStrategy
-     *            The strategy used for loading paginated results. Caller has to
-     *            explicitly set this parameter, since the DynamoDBMapperConfig
-     *            set in the mapper is not accessible here. If null value is
-     *            provided, LAZY_LOADING will be set by default.
-     */
-    public PaginatedList(DynamoDbMapper mapper, Class<T> clazz, DynamoDbClient dynamo,
-                         PaginationLoadingStrategy paginationLoadingStrategy) {
-        this.mapper = mapper;
-        this.clazz = clazz;
-        this.dynamo = dynamo;
-        this.paginationLoadingStrategy = paginationLoadingStrategy == null ?
-                                         PaginationLoadingStrategy.LAZY_LOADING : paginationLoadingStrategy;
-
-        this.allResults = new ArrayList<T>();
-
-        // Ideally, we should eagerly load all results here as soon as EAGER_LOADING is configured.
-        // But the implementation of loadAllResults() relies on a fully initialized sub-class object.
-        // So we have to do this in each sub-class constructor.
-    }
-
-    /**
-     * Eagerly loads all results for this list.
-     * <p>
-     * Not supported in ITERATION_ONLY mode.
-     * </p>
-     */
-    public synchronized void loadAllResults() {
-        checkUnsupportedOperationForIterationOnlyMode("loadAllResults()");
-
-        if (allResultsLoaded) {
-            return;
-        }
-
-        while (nextResultsAvailable()) {
-            // Keep all loaded results
-            moveNextResults(false);
-        }
-
-        allResultsLoaded = true;
-    }
-
-    /**
-     * Returns whether there are more results available not yet included in the
-     * allResults member field. These could already have been fetched and are
-     * sitting in the nextResults buffer, or they could be fetched from the
-     * service opportunistically at the time this method is called. A return
-     * value of true guarantees that nextResults is non-empty.
-     */
-    private boolean nextResultsAvailable() {
-        return !nextResults.isEmpty() || loadNextResults();
-    }
-
-    /**
-     * Attempts to load the next batch of results, if there are any, into the
-     * nextResults buffer. Returns whether there were any results to load. A
-     * return value of true guarantees that nextResults had items added to it.
-     */
-    private synchronized boolean loadNextResults() {
-        if (atEndOfResults()) {
-            return false;
-        }
-
-        do {
-            nextResults.addAll(fetchNextPage());
-        } while (!atEndOfResults() && nextResults.isEmpty());
-
-        return !nextResults.isEmpty();
-    }
-
-    /**
-     * Moves the contents of the nextResults buffer into allResults and resets
-     * the buffer.
-     *
-     * @param clearPreviousResults
-     *            Whether it should clear previous results in allResults field.
-     */
-    private void moveNextResults(boolean clearPreviousResults) {
-        if (clearPreviousResults) {
-            allResults.clear();
-        }
-        allResults.addAll(nextResults);
-        nextResults.clear();
-    }
-
-    /**
-     * Fetches the next page of results (which may be empty) and returns any
-     * items found.
-     */
-    protected abstract List<T> fetchNextPage();
-
-    /**
-     * Returns whether we have reached the end of the result set.
-     */
-    protected abstract boolean atEndOfResults();
-
-    /**
-     * Returns an iterator over this list that lazily initializes results as
-     * necessary.
-     * <p>
-     * If it configured with ITERARTION_ONLY mode, then the iterator
-     * could be only retrieved once, and any previously loaded results will be
-     * cleared in the memory during the iteration.
-     * </p>
-     */
-    @Override
-    public Iterator<T> iterator() {
-        return new PaginatedListIterator(paginationLoadingStrategy == PaginationLoadingStrategy.ITERATION_ONLY);
-    }
-
-    /**
-     * Returns whether the collection is empty. At most one (non-empty) page of
-     * results is loaded to make the check.
-     * <p>
-     * Not supported in ITERATION_ONLY mode.
-     * </p>
-     */
-    @Override
-    public boolean isEmpty() {
-        checkUnsupportedOperationForIterationOnlyMode("isEmpty()");
-
-        return !iterator().hasNext();
-    }
-
-    /**
-     * Returns the Nth element of the list. Results are loaded until N elements
-     * are present, if necessary.
-     * <p>
-     * Not supported in ITERATION_ONLY mode.
-     * </p>
-     */
-    @Override
-    public T get(int n) {
-        checkUnsupportedOperationForIterationOnlyMode("get(int n)");
-
-        while (allResults.size() <= n && nextResultsAvailable()) {
-            moveNextResults(false);
-        }
-
-        return allResults.get(n);
-    }
-
-    /**
-     * Returns whether the collection contains the given element. Results are
-     * loaded and checked incrementally until a match is found or the end of the
-     * result set is reached.
-     * <p>
-     * Not supported in ITERATION_ONLY mode.
-     * </p>
-     */
-    @Override
-    public boolean contains(Object arg0) {
-        checkUnsupportedOperationForIterationOnlyMode("contains(Object arg0)");
-
-        if (allResults.contains(arg0)) {
-            return true;
-        }
-
-        while (nextResultsAvailable()) {
-            boolean found = nextResults.contains(arg0);
-            moveNextResults(false);
-            if (found) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Returns a sub-list in the range specified, loading more results as
-     * necessary.
-     * <p>
-     * Not supported in ITERATION_ONLY mode.
-     * </p>
-     */
-    @Override
-    public List<T> subList(int arg0, int arg1) {
-        checkUnsupportedOperationForIterationOnlyMode("subList(int arg0, int arg1)");
-
-        while (allResults.size() < arg1 && nextResultsAvailable()) {
-            moveNextResults(false);
-        }
-
-        return Collections.unmodifiableList(allResults.subList(arg0, arg1));
-    }
-
-    /**
-     * Returns the first index of the object given in the list. Additional
-     * results are loaded incrementally as necessary.
-     * <p>
-     * Not supported in ITERATION_ONLY mode.
-     * </p>
-     */
-    @Override
-    public int indexOf(Object arg0) {
-        checkUnsupportedOperationForIterationOnlyMode("indexOf(Object org0)");
-
-        int indexOf = allResults.indexOf(arg0);
-        if (indexOf >= 0) {
-            return indexOf;
-        }
-
-        while (nextResultsAvailable()) {
-            indexOf = nextResults.indexOf(arg0);
-            int size = allResults.size();
-            moveNextResults(false);
-            if (indexOf >= 0) {
-                return indexOf + size;
-            }
-        }
-
-        return -1;
-    }
-
-    @Override
-    public int size() {
-        loadAllResults();
-        return allResults.size();
-    }
-
-    // Operations requiring the entire result set
-
-    @Override
-    public boolean containsAll(Collection<?> arg0) {
-        loadAllResults();
-        return allResults.containsAll(arg0);
-    }
-
-    @Override
-    public int lastIndexOf(Object arg0) {
-        loadAllResults();
-        return allResults.lastIndexOf(arg0);
-    }
-
-    @Override
-    public Object[] toArray() {
-        loadAllResults();
-        return allResults.toArray();
-    }
-
-    @Override
-    public <X> X[] toArray(X[] a) {
-        loadAllResults();
-        return allResults.toArray(a);
-    }
-
-    @Override
-    public ListIterator<T> listIterator() {
-        throw new UnsupportedOperationException("ListIterators are not supported for this list");
-    }
-
-    // Unsupported Operations
-
-    @Override
-    public ListIterator<T> listIterator(int arg0) {
-        throw new UnsupportedOperationException("ListIterators are not supported for this list");
-    }
-
-    @Override
-    public boolean remove(Object arg0) {
-        throw new UnsupportedOperationException(UNMODIFIABLE_MESSAGE);
-    }
-
-    @Override
-    public T remove(int arg0) {
-        throw new UnsupportedOperationException(UNMODIFIABLE_MESSAGE);
-    }
-
-    @Override
-    public boolean removeAll(Collection<?> arg0) {
-        throw new UnsupportedOperationException(UNMODIFIABLE_MESSAGE);
-    }
-
-    @Override
-    public boolean retainAll(Collection<?> arg0) {
-        throw new UnsupportedOperationException(UNMODIFIABLE_MESSAGE);
-    }
-
-    @Override
-    public T set(int arg0, T arg1) {
-        throw new UnsupportedOperationException(UNMODIFIABLE_MESSAGE);
-    }
-
-    @Override
-    public boolean add(T arg0) {
-        throw new UnsupportedOperationException(UNMODIFIABLE_MESSAGE);
-    }
-
-    @Override
-    public void add(int arg0, T arg1) {
-        throw new UnsupportedOperationException(UNMODIFIABLE_MESSAGE);
-    }
-
-    @Override
-    public boolean addAll(Collection<? extends T> arg0) {
-        throw new UnsupportedOperationException(UNMODIFIABLE_MESSAGE);
-    }
-
-    @Override
-    public boolean addAll(int arg0, Collection<? extends T> arg1) {
-        throw new UnsupportedOperationException(UNMODIFIABLE_MESSAGE);
-    }
-
-    @Override
-    public void clear() {
-        throw new UnsupportedOperationException(UNMODIFIABLE_MESSAGE);
-    }
-
-    private void checkUnsupportedOperationForIterationOnlyMode(String methodSignature) {
-        if (this.paginationLoadingStrategy == PaginationLoadingStrategy.ITERATION_ONLY) {
-            throw new UnsupportedOperationException(methodSignature + ITERATION_ONLY_UNSUPPORTED_OPERATION_MESSAGE);
-        }
-    }
-
-    private class PaginatedListIterator implements Iterator<T> {
-        /**
-         * Whether this iterator is constructed by a PaginatedList in
-         * ITERATION_ONLY mode.
-         */
-        private final boolean iterationOnly;
-
-        /**
-         * A hard copy of the allResults list to prevent
-         * ConcurrentModificationExceptions.
-         * Only needed when the list is not in ITERNATION_ONLY mode.
-         */
-        private final List<T> allResultsCopy;
-
-        private Iterator<T> innerIterator;
-
-        private int pos = 0;
-
-        PaginatedListIterator(boolean iterationOnly) {
-            this.iterationOnly = iterationOnly;
-
-            if (iterationOnly) {
-                synchronized (PaginatedList.this) {
-                    if (iterationstarted) {
-                        throw new UnsupportedOperationException("The list could only be iterated once in ITERATION_ONLY mode.");
-                    }
-                    iterationstarted = true;
-                }
-
-                allResultsCopy = null; // not needed for ITERATION_ONLY mode
-                innerIterator = allResults.iterator();
-            } else {
-                /*
-                 * We make a copy of the allResults list to iterate over in order to
-                 * avoid ConcurrentModificationExceptions caused by other methods
-                 * loading more results into the list while someone iterates over it.
-                 * This is a more severe problem than it might seem, because even
-                 * innocuous-seeming operations such as contains() can modify the
-                 * underlying result set.
-                 */
-                allResultsCopy = new ArrayList<T>();
-                allResultsCopy.addAll(allResults);
-                innerIterator = allResultsCopy.iterator();
-            }
-        }
-
-        @Override
-        public boolean hasNext() {
-            return innerIterator.hasNext() || shouldSyncWithAllResultsList() ||
-                   nextResultsAvailable();
-        }
-
-        /**
-         * If we aren't in ITERATION_ONLY mode then allResults is the authoriative source of
-         * results. If it's size has increased since this iterator was last synched with it then we
-         * have more results to process and need to re-sync allResultsCopy with allResults.
-         *
-         * @return True if more results are available in allResults then what we have currently
-         *     snapshoted in the iterator, false otherwise.
-         */
-        private boolean shouldSyncWithAllResultsList() {
-            return !iterationOnly && allResults.size() > allResultsCopy.size();
-        }
-
-        @Override
-        public T next() {
-            if (!innerIterator.hasNext()) {
-                /*
-                 * We need to immediately fetch more results from the service,
-                 * if
-                 *   -- it's in ITERATION_ONLY mode (which means innerIterator
-                 *      is always pointing at the "real" list of loaded results)
-                 *   OR it's not in ITERATION_ONLY and our private copy of the
-                 *      result list is already up to date with the full one.
-                 */
-                if (iterationOnly
-                    || allResults.size() == allResultsCopy.size()) {
-                    if (!nextResultsAvailable()) {
-                        throw new NoSuchElementException();
-                    }
-                    /* Clear previous results if it's in ITERATION_ONLY mode. */
-                    boolean clearPreviousResults = iterationOnly;
-                    moveNextResults(clearPreviousResults);
-                }
-
-                if (iterationOnly) {
-                    /*
-                     * allResults has been replaced with the latest page of results.
-                     */
-                    innerIterator = allResults.iterator();
-                } else {
-                    /*
-                     * Update our private results copy, and then update the inner iterator
-                     */
-                    if (allResults.size() > allResultsCopy.size()) {
-                        allResultsCopy.addAll(allResults.subList(allResultsCopy.size(),
-                                                                 allResults.size()));
-                    }
-
-                    innerIterator = allResultsCopy.listIterator(pos);
-                }
-            }
-
-            pos++;
-            return innerIterator.next();
-        }
-
-        @Override
-        public void remove() {
-            throw new UnsupportedOperationException(UNMODIFIABLE_MESSAGE);
-        }
-
-    }
-
-    ;
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/PaginatedParallelScanList.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/PaginatedParallelScanList.java
deleted file mode 100644
index 41638d43a9d3..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/PaginatedParallelScanList.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-import java.util.LinkedList;
-import java.util.List;
-import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMapperConfig.PaginationLoadingStrategy;
-import software.amazon.awssdk.services.dynamodb.model.ScanResponse;
-
-/**
- * Implementation of the List interface that represents the results from a parallel scan
- * in AWS DynamoDB. Paginated results are loaded on demand when the user
- * executes an operation that requires them. Some operations, such as size(),
- * must fetch the entire list, but results are lazily fetched page by page when
- * possible.
- * <p>
- * This is an unmodifiable list, so callers should not invoke any operations
- * that modify this list, otherwise they will throw an
- * UnsupportedOperationException.
- *
- * @param <T>
- *            The type of objects held in this list.
- * @see PaginatedList
- */
-public class PaginatedParallelScanList<T> extends PaginatedList<T> {
-
-    /** The current parallel scan task which contains all the information about the scan request. */
-    private final ParallelScanTask parallelScanTask;
-
-    private final DynamoDbMapperConfig config;
-
-    public PaginatedParallelScanList(
-            DynamoDbMapper mapper,
-            Class<T> clazz,
-            DynamoDbClient dynamo,
-            ParallelScanTask parallelScanTask,
-            PaginationLoadingStrategy paginationLoadingStrategy,
-            DynamoDbMapperConfig config) {
-        super(mapper, clazz, dynamo, paginationLoadingStrategy);
-
-        this.parallelScanTask = parallelScanTask;
-        this.config = config;
-
-        // Marshall the first batch of results in all Results
-        allResults.addAll(marshalParallelScanResponsesIntoObjects(parallelScanTask.nextBatchOfScanResponses()));
-
-        // If the results should be eagerly loaded at once
-        if (paginationLoadingStrategy == PaginationLoadingStrategy.EAGER_LOADING) {
-            loadAllResults();
-        }
-    }
-
-    @Override
-    protected boolean atEndOfResults() {
-        return parallelScanTask.isAllSegmentScanFinished();
-    }
-
-    @Override
-    protected List<T> fetchNextPage() {
-        return marshalParallelScanResponsesIntoObjects(parallelScanTask.nextBatchOfScanResponses());
-    }
-
-    private List<T> marshalParallelScanResponsesIntoObjects(List<ScanResponse> scanResults) {
-        List<T> allItems = new LinkedList<T>();
-        for (ScanResponse scanResult : scanResults) {
-            if (null != scanResult) {
-                allItems.addAll(mapper.marshallIntoObjects(
-                        mapper.toParameters(
-                                scanResult.items(),
-                                clazz,
-                                parallelScanTask.getTableName(),
-                                config)));
-            }
-        }
-        return allItems;
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/PaginatedQueryList.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/PaginatedQueryList.java
deleted file mode 100644
index 9b2cf6a9e25d..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/PaginatedQueryList.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-import java.util.List;
-
-import software.amazon.awssdk.core.util.SdkAutoConstructMap;
-import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMapperConfig.PaginationLoadingStrategy;
-import software.amazon.awssdk.services.dynamodb.model.QueryRequest;
-import software.amazon.awssdk.services.dynamodb.model.QueryResponse;
-
-/**
- * Implementation of the List interface that represents the results from a query
- * in AWS DynamoDB. Paginated results are loaded on demand when the user
- * executes an operation that requires them. Some operations, such as size(),
- * must fetch the entire list, but results are lazily fetched page by page when
- * possible.
- * <p>
- * This is an unmodifiable list, so callers should not invoke any operations
- * that modify this list, otherwise they will throw an
- * UnsupportedOperationException.
- *
- * @param <T>
- *            The type of objects held in this list.
- * @see PaginatedList
- */
-public class PaginatedQueryList<T> extends PaginatedList<T> {
-
-    /** The current query request. */
-    private QueryRequest queryRequest;
-
-    private final DynamoDbMapperConfig config;
-
-    /** The current results for the last executed query operation. */
-    private QueryResponse queryResult;
-
-    public PaginatedQueryList(
-            DynamoDbMapper mapper,
-            Class<T> clazz,
-            DynamoDbClient dynamo,
-            QueryRequest queryRequest,
-            QueryResponse queryResult,
-            PaginationLoadingStrategy paginationLoadingStrategy,
-            DynamoDbMapperConfig config) {
-        super(mapper, clazz, dynamo, paginationLoadingStrategy);
-
-        this.queryRequest = queryRequest;
-        this.queryResult = queryResult;
-        this.config = config;
-
-
-        allResults.addAll(mapper.marshallIntoObjects(
-                mapper.toParameters(
-                        queryResult.items(),
-                        clazz,
-                        queryRequest.tableName(),
-                        config)));
-
-        // If the results should be eagerly loaded at once
-        if (paginationLoadingStrategy == PaginationLoadingStrategy.EAGER_LOADING) {
-            loadAllResults();
-        }
-    }
-
-    @Override
-    protected synchronized boolean atEndOfResults() {
-        return queryResult.lastEvaluatedKey() instanceof SdkAutoConstructMap;
-    }
-
-    @Override
-    protected synchronized List<T> fetchNextPage() {
-        queryRequest = queryRequest.toBuilder().exclusiveStartKey(queryResult.lastEvaluatedKey()).build();
-        queryResult = dynamo.query(DynamoDbMapper.applyUserAgent(queryRequest));
-        return mapper.marshallIntoObjects(mapper.toParameters(
-                queryResult.items(),
-                clazz,
-                queryRequest.tableName(),
-                config));
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/PaginatedScanList.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/PaginatedScanList.java
deleted file mode 100644
index 24d6a615389a..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/PaginatedScanList.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-import java.util.List;
-
-import software.amazon.awssdk.core.util.SdkAutoConstructMap;
-import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMapperConfig.PaginationLoadingStrategy;
-import software.amazon.awssdk.services.dynamodb.model.ScanRequest;
-import software.amazon.awssdk.services.dynamodb.model.ScanResponse;
-
-/**
- * Implementation of the List interface that represents the results from a scan
- * in AWS DynamoDB. Paginated results are loaded on demand when the user
- * executes an operation that requires them. Some operations, such as size(),
- * must fetch the entire list, but results are lazily fetched page by page when
- * possible.
- * <p>
- * This is an unmodifiable list, so callers should not invoke any operations
- * that modify this list, otherwise they will throw an
- * UnsupportedOperationException.
- *
- * @param <T>
- *            The type of objects held in this list.
- * @see PaginatedList
- */
-public class PaginatedScanList<T> extends PaginatedList<T> {
-
-    /** The current scan request. */
-    private ScanRequest scanRequest;
-
-    private final DynamoDbMapperConfig config;
-
-    /** The current results for the last executed scan operation. */
-    private ScanResponse scanResult;
-
-    public PaginatedScanList(
-            DynamoDbMapper mapper,
-            Class<T> clazz,
-            DynamoDbClient dynamo,
-            ScanRequest scanRequest,
-            ScanResponse scanResult,
-            PaginationLoadingStrategy paginationLoadingStrategy,
-            DynamoDbMapperConfig config) {
-        super(mapper, clazz, dynamo, paginationLoadingStrategy);
-
-        this.scanRequest = scanRequest;
-        this.scanResult = scanResult;
-        this.config = config;
-
-        allResults.addAll(mapper.marshallIntoObjects(
-                mapper.toParameters(
-                        scanResult.items(),
-                        clazz,
-                        scanRequest.tableName(),
-                        config)));
-
-        // If the results should be eagerly loaded at once
-        if (paginationLoadingStrategy == PaginationLoadingStrategy.EAGER_LOADING) {
-            loadAllResults();
-        }
-    }
-
-    @Override
-    protected synchronized boolean atEndOfResults() {
-        return scanResult.lastEvaluatedKey() instanceof SdkAutoConstructMap;
-    }
-
-    @Override
-    protected synchronized List<T> fetchNextPage() {
-        scanRequest = scanRequest.toBuilder().exclusiveStartKey(scanResult.lastEvaluatedKey()).build();
-        scanResult = dynamo.scan(DynamoDbMapper.applyUserAgent(scanRequest));
-        return mapper.marshallIntoObjects(mapper.toParameters(
-                scanResult.items(),
-                clazz,
-                scanRequest.tableName(),
-                config));
-    }
-
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/PaginatedScanTaskTest.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/PaginatedScanTaskTest.java
deleted file mode 100644
index 6740d6b59b8e..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/PaginatedScanTaskTest.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.mockito.Matchers.argThat;
-import static org.mockito.Mockito.when;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.TimeUnit;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.ArgumentMatcher;
-import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
-import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-import software.amazon.awssdk.services.dynamodb.model.ProvisionedThroughputExceededException;
-import software.amazon.awssdk.services.dynamodb.model.ScanRequest;
-import software.amazon.awssdk.services.dynamodb.model.ScanResponse;
-
-@RunWith(MockitoJUnitRunner.class)
-public class PaginatedScanTaskTest {
-
-    private static final String TABLE_NAME = "FooTable";
-
-    private static final int TOTAL_SEGMENTS = 5;
-
-    private ParallelScanTask parallelScanTask;
-
-    private ExecutorService executorService;
-
-    @Mock
-    private DynamoDbClient dynamoDB;
-
-    /**
-     * Custom matcher to match argument based on it's segment number
-     *
-     * @param segmentNumber Segment number to match for this stub.
-     * @return Stubbed argument matcher
-     */
-    private static ScanRequest isSegmentNumber(int segmentNumber) {
-        return argThat(new SegmentArgumentMatcher(segmentNumber));
-    }
-
-    @Before
-    public void setup() {
-        executorService = Executors.newSingleThreadExecutor();
-        parallelScanTask = new ParallelScanTask(dynamoDB, createScanRequests(), executorService);
-    }
-
-    /**
-     * A failed segment makes the scan task unusable and will always rethrow the same exception. In
-     * this case it makes sense to shutdown the executor so that applications can shutdown faster. A
-     * future enhancement could be to either retry failed segments, explicitly resume a failed scan,
-     * or include metadata in the thrown exception about the state of the scan at the time it was
-     * aborted. See <a href="https://github.com/aws/aws-sdk-java/pull/624">PR #624</a> and <a
-     * href="https://github.com/aws/aws-sdk-java/issues/624">Issue #624</a> for more details.
-     */
-    @Test
-    public void segmentFailsToScan_ExecutorServiceIsShutdown() throws InterruptedException {
-        stubsuccessfulScan(0);
-        stubsuccessfulScan(1);
-        when(dynamoDB.scan(isSegmentNumber(2)))
-                .thenThrow(ProvisionedThroughputExceededException.builder().message("Slow Down!").build());
-        stubsuccessfulScan(3);
-        stubsuccessfulScan(4);
-
-        try {
-            parallelScanTask.nextBatchOfScanResponses();
-            fail("Expected ProvisionedThroughputExceededException");
-        } catch (ProvisionedThroughputExceededException expected) {
-            // Ignored or expected.
-        }
-
-        executorService.awaitTermination(10, TimeUnit.SECONDS);
-        assertTrue(executorService.isShutdown());
-    }
-
-    /**
-     * Stub a successful scan of a segment with a precanned item to return.
-     *
-     * @param segmentNumber Segment to stub.
-     */
-    private void stubsuccessfulScan(int segmentNumber) {
-        when(dynamoDB.scan(isSegmentNumber(segmentNumber)))
-                .thenReturn(ScanResponse.builder().items(generateItems()).build());
-    }
-
-    private Map<String, AttributeValue> generateItems() {
-        final int numItems = 10;
-        Map<String, AttributeValue> items = new HashMap<String, AttributeValue>(numItems);
-        for (int i = 0; i < numItems; i++) {
-            items.put(UUID.randomUUID().toString(), AttributeValue.builder().s("foo").build());
-        }
-        return items;
-    }
-
-    private List<ScanRequest> createScanRequests() {
-        final List<ScanRequest> scanRequests = new ArrayList<ScanRequest>(TOTAL_SEGMENTS);
-        for (int i = 0; i < TOTAL_SEGMENTS; i++) {
-            scanRequests.add(createScanRequest(i));
-        }
-        return scanRequests;
-    }
-
-    private ScanRequest createScanRequest(int segmentNumber) {
-        return ScanRequest.builder()
-                .tableName(TABLE_NAME)
-                .segment(segmentNumber)
-                .totalSegments(TOTAL_SEGMENTS)
-                .build();
-    }
-
-    /**
-     * Custom argument matcher to match a {@link ScanRequest} on the segment number.
-     */
-    private static class SegmentArgumentMatcher extends ArgumentMatcher<ScanRequest> {
-
-        private final int matchingSegmentNumber;
-
-        private SegmentArgumentMatcher(int matchingSegmentNumber) {
-            this.matchingSegmentNumber = matchingSegmentNumber;
-        }
-
-        @Override
-        public boolean matches(Object argument) {
-            if (!(argument instanceof ScanRequest)) {
-                return false;
-            }
-            return matchingSegmentNumber == ((ScanRequest) argument).segment();
-        }
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/ParallelScanTask.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/ParallelScanTask.java
deleted file mode 100644
index 27ca9b46af00..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/ParallelScanTask.java
+++ /dev/null
@@ -1,287 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import software.amazon.awssdk.annotations.SdkTestInternalApi;
-import software.amazon.awssdk.core.exception.SdkClientException;
-import software.amazon.awssdk.core.exception.SdkServiceException;
-import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
-import software.amazon.awssdk.services.dynamodb.model.ScanRequest;
-import software.amazon.awssdk.services.dynamodb.model.ScanResponse;
-
-public class ParallelScanTask {
-
-    /**
-     * The list of hard copies of ScanRequest with different segment number.
-     */
-    private final List<ScanRequest> parallelScanRequests;
-
-    private final int totalSegments;
-
-    /**
-     * Cache all the future tasks, so that we can extract the exception when
-     * we see failed segment scan.
-     */
-    private final List<Future<ScanResponse>> segmentScanFutureTasks;
-
-    /**
-     * Cache all the most recent ScanResponse on each segment.
-     */
-    private final List<ScanResponse> segmentScanResponses;
-
-    /**
-     * The current state of the scan on each segment.
-     * Used as the monitor for synchronization.
-     */
-    private final List<SegmentScanstate> segmentScanstates;
-    private final DynamoDbClient dynamo;
-    private ExecutorService executorService;
-
-    @Deprecated
-    public ParallelScanTask(DynamoDbMapper mapper, DynamoDbClient dynamo, List<ScanRequest> parallelScanRequests) {
-        this(dynamo, parallelScanRequests);
-    }
-
-    ParallelScanTask(DynamoDbClient dynamo, List<ScanRequest> parallelScanRequests) {
-        this(dynamo, parallelScanRequests, Executors.newCachedThreadPool());
-    }
-
-    @SdkTestInternalApi
-    ParallelScanTask(DynamoDbClient dynamo, List<ScanRequest> parallelScanRequests,
-                     ExecutorService executorService) {
-        this.dynamo = dynamo;
-        this.parallelScanRequests = parallelScanRequests;
-        this.totalSegments = parallelScanRequests.size();
-        this.executorService = executorService;
-
-        // Create synchronized views of the list to guarantee any changes are visible across all threads.
-        segmentScanFutureTasks = Collections
-                .synchronizedList(new ArrayList<Future<ScanResponse>>(totalSegments));
-        segmentScanResponses = Collections.synchronizedList(new ArrayList<ScanResponse>(totalSegments));
-        segmentScanstates = Collections
-                .synchronizedList(new ArrayList<SegmentScanstate>(totalSegments));
-
-        initSegmentScanstates();
-    }
-
-    String getTableName() {
-        return parallelScanRequests.get(0).tableName();
-    }
-
-    public boolean isAllSegmentScanFinished() {
-        synchronized (segmentScanstates) {
-            for (int segment = 0; segment < totalSegments; segment++) {
-                if (segmentScanstates.get(segment) != SegmentScanstate.SegmentScanCompleted) {
-                    return false;
-                }
-            }
-            // Shut down if all data have been scanned and loaded.
-            executorService.shutdown();
-            return true;
-        }
-    }
-
-    public List<ScanResponse> nextBatchOfScanResponses() throws SdkClientException {
-        /**
-         * Kick-off all the parallel scan tasks.
-         */
-        startScanNextPages();
-        /**
-         * Wait till all the tasks have finished.
-         */
-        synchronized (segmentScanstates) {
-            while (segmentScanstates.contains(SegmentScanstate.Waiting)
-                   || segmentScanstates.contains(SegmentScanstate.Scanning)) {
-                try {
-                    segmentScanstates.wait();
-                } catch (InterruptedException ie) {
-                    throw SdkClientException.builder()
-                                            .message("Parallel scan interrupted by other thread.")
-                                            .cause(ie)
-                                            .build();
-                }
-            }
-            /**
-             *  Keep the lock on segmentScanstates until all the cached results are marshaled and returned.
-             */
-            return marshalParallelScanResponses();
-        }
-
-    }
-
-    private void startScanNextPages() {
-        for (int segment = 0; segment < totalSegments; segment++) {
-            final int currentSegment = segment;
-            final SegmentScanstate currentSegmentState = segmentScanstates.get(currentSegment);
-            /**
-             * Assert: Should never see any task in state of "Scanning" when starting a new batch.
-             */
-            if (currentSegmentState == SegmentScanstate.Scanning) {
-
-                throw SdkClientException.builder()
-                                        .message("Should never see a 'Scanning' state when starting parallel scans.")
-                                        .build();
-
-            } else if (currentSegmentState == SegmentScanstate.Failed ||
-                     currentSegmentState == SegmentScanstate.SegmentScanCompleted) {
-                /**
-                 * Skip any failed or completed segment, and clear the corresponding cached result.
-                 */
-                segmentScanResponses.set(currentSegment, null);
-                continue;
-            } else {
-                /**
-                 * Otherwise, submit a new future task and save it in segmentScanFutureTasks.
-                 */
-                // Update the state to "Scanning" and notify any waiting thread.
-                synchronized (segmentScanstates) {
-                    segmentScanstates.set(currentSegment, SegmentScanstate.Scanning);
-                    segmentScanstates.notifyAll();
-                }
-                Future<ScanResponse> futureTask = executorService.submit(() -> {
-                    try {
-                        if (currentSegmentState == SegmentScanstate.HasNextPage) {
-                            return scanNextPageOfSegment(currentSegment, true);
-                        } else if (currentSegmentState == SegmentScanstate.Waiting) {
-                            return scanNextPageOfSegment(currentSegment, false);
-                        } else {
-                            throw SdkClientException.builder().message("Should not start a new future task").build();
-                        }
-                    } catch (Exception e) {
-                        synchronized (segmentScanstates) {
-                            segmentScanstates.set(currentSegment, SegmentScanstate.Failed);
-                            segmentScanstates.notifyAll();
-                            executorService.shutdown();
-                        }
-                        throw e;
-                    }
-                });
-                // Cache the future task (for getting the Exceptions in the working thread).
-                segmentScanFutureTasks.set(currentSegment, futureTask);
-            }
-        }
-    }
-
-    private List<ScanResponse> marshalParallelScanResponses() {
-        List<ScanResponse> scanResults = new LinkedList<ScanResponse>();
-        for (int segment = 0; segment < totalSegments; segment++) {
-            SegmentScanstate currentSegmentState = segmentScanstates.get(segment);
-            /**
-             * Rethrow the exception from any failed segment scan.
-             */
-            if (currentSegmentState == SegmentScanstate.Failed) {
-                try {
-                    segmentScanFutureTasks.get(segment).get();
-                    throw SdkClientException.builder().message("No Exception found in the failed scan task.").build();
-                } catch (ExecutionException ee) {
-                    Throwable cause = ee.getCause();
-                    if (cause instanceof SdkServiceException) {
-                        throw (SdkServiceException) cause;
-                    } else {
-                        throw SdkClientException.builder()
-                                                .message("Internal error during the scan on segment #" + segment + ".")
-                                                .build();
-                    }
-                } catch (Exception e) {
-                    throw SdkClientException.builder()
-                                            .message("Error during the scan on segment #" + segment + ".")
-                                            .cause(e)
-                                            .build();
-                }
-            } else if (currentSegmentState == SegmentScanstate.HasNextPage ||
-                       currentSegmentState == SegmentScanstate.SegmentScanCompleted) {
-                /**
-                 * Get the ScanResponse from cache if the segment scan has finished.
-                 */
-                ScanResponse scanResult = segmentScanResponses.get(segment);
-                scanResults.add(scanResult);
-            } else if (currentSegmentState == SegmentScanstate.Waiting
-                       || currentSegmentState == SegmentScanstate.Scanning) {
-                throw SdkClientException.builder()
-                                        .message("Should never see a 'Scanning' or 'Waiting' state when marshalling parallel " +
-                                                 "scan results.")
-                                        .build();
-            }
-        }
-        return scanResults;
-    }
-
-    private ScanResponse scanNextPageOfSegment(int currentSegment, boolean checkLastEvaluatedKey) {
-        ScanRequest segmentScanRequest = parallelScanRequests.get(currentSegment);
-        if (checkLastEvaluatedKey) {
-            ScanResponse lastScanResult = segmentScanResponses.get(currentSegment);
-            segmentScanRequest = segmentScanRequest.toBuilder().exclusiveStartKey(lastScanResult.lastEvaluatedKey()).build();
-        } else {
-            segmentScanRequest = segmentScanRequest.toBuilder().exclusiveStartKey(null).build();
-        }
-        ScanResponse scanResult = dynamo.scan(DynamoDbMapper.applyUserAgent(segmentScanRequest));
-
-        /**
-         * Cache the scan result in segmentScanResponses.
-         * We should never try to get these scan results by calling get() on the cached future tasks.
-         */
-        segmentScanResponses.set(currentSegment, scanResult);
-
-        /**
-         * Update the state and notify any waiting thread.
-         */
-        synchronized (segmentScanstates) {
-            if (null == scanResult.lastEvaluatedKey()) {
-                segmentScanstates.set(currentSegment, SegmentScanstate.SegmentScanCompleted);
-            } else {
-                segmentScanstates.set(currentSegment, SegmentScanstate.HasNextPage);
-            }
-            segmentScanstates.notifyAll();
-        }
-        return scanResult;
-    }
-
-    private void initSegmentScanstates() {
-        for (int segment = 0; segment < totalSegments; segment++) {
-            segmentScanFutureTasks.add(null);
-            segmentScanResponses.add(null);
-            segmentScanstates.add(SegmentScanstate.Waiting);
-        }
-    }
-
-    /**
-     * Enumeration of the possible states of the scan on a segment.
-     */
-    private enum SegmentScanstate {
-        /** The scan on the segment is waiting for resources to execute and has not started yet. */
-        Waiting,
-
-        /** The scan is in process, and hasn't finished yet. */
-        Scanning,
-
-        /** The scan has already failed. */
-        Failed,
-
-        /** The scan on the current page has finished, but there are more pages in the segment to be scanned. */
-        HasNextPage,
-
-        /** The scan on the whole segment has completed. */
-        SegmentScanCompleted,
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/QueryResultPage.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/QueryResultPage.java
deleted file mode 100644
index 569de37430a1..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/QueryResultPage.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-import java.util.List;
-import java.util.Map;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-import software.amazon.awssdk.services.dynamodb.model.ConsumedCapacity;
-
-/**
- * Container for a page of query results
- */
-public class QueryResultPage<T> {
-
-    private List<T> results;
-    private Map<String, AttributeValue> lastEvaluatedKey;
-
-    private Integer count;
-    private Integer scannedCount;
-    private ConsumedCapacity consumedCapacity;
-
-    /**
-     * Returns all matching items for this page of query results.
-     */
-    public List<T> getResults() {
-        return results;
-    }
-
-    public void setResults(List<T> results) {
-        this.results = results;
-    }
-
-    /**
-     * Returns the last evaluated key, which can be used as the
-     * exclusiveStartKey to fetch the next page of results. Returns null if this
-     * is the last page of results.
-     *
-     * @return The key-value pairs which map from the attribute name of each component
-     *             of the primary key to its value.
-     */
-    public Map<String, AttributeValue> lastEvaluatedKey() {
-        return lastEvaluatedKey;
-    }
-
-    public void setLastEvaluatedKey(Map<String, AttributeValue> lastEvaluatedKey) {
-        this.lastEvaluatedKey = lastEvaluatedKey;
-    }
-
-    /**
-     * The number of items in the response. <p>If you used a
-     * <i>QueryFilter</i> in the request, then <i>Count</i> is the number of
-     * items returned after the filter was applied, and <i>ScannedCount</i>
-     * is the number of matching items before> the filter was applied. <p>If
-     * you did not use a filter in the request, then <i>Count</i> and
-     * <i>ScannedCount</i> are the same.
-     *
-     * @return The number of items in the response. <p>If you used a
-     *         <i>QueryFilter</i> in the request, then <i>Count</i> is the number of
-     *         items returned after the filter was applied, and <i>ScannedCount</i>
-     *         is the number of matching items before> the filter was applied. <p>If
-     *         you did not use a filter in the request, then <i>Count</i> and
-     *         <i>ScannedCount</i> are the same.
-     */
-    public Integer getCount() {
-        return count;
-    }
-
-    public void setCount(Integer count) {
-        this.count = count;
-    }
-
-    /**
-     * The number of items evaluated, before any <i>QueryFilter</i> is
-     * applied. A high <i>ScannedCount</i> value with few, or no,
-     * <i>Count</i> results indicates an inefficient <i>Query</i> operation.
-     * For more information, see <a
-     * href="http://docs.aws.amazon.com/amazondynamodb/latest/developerguide/QueryAndScan.html#Count">Count
-     * and ScannedCount</a> in the <i>Amazon DynamoDB Developer Guide</i>.
-     * <p>If you did not use a filter in the request, then
-     * <i>ScannedCount</i> is the same as <i>Count</i>.
-     *
-     * @return The number of items evaluated, before any <i>QueryFilter</i> is
-     *         applied. A high <i>ScannedCount</i> value with few, or no,
-     *         <i>Count</i> results indicates an inefficient <i>Query</i> operation.
-     *         For more information, see <a
-     *         href="http://docs.aws.amazon.com/amazondynamodb/latest/developerguide/QueryAndScan.html#Count">Count
-     *         and ScannedCount</a> in the <i>Amazon DynamoDB Developer Guide</i>.
-     *         <p>If you did not use a filter in the request, then
-     *         <i>ScannedCount</i> is the same as <i>Count</i>.
-     */
-    public Integer scannedCount() {
-        return scannedCount;
-    }
-
-    public void setScannedCount(Integer scannedCount) {
-        this.scannedCount = scannedCount;
-    }
-
-    /**
-     * The capacity units consumed by an operation. The data returned
-     * includes the total provisioned throughput consumed, along with
-     * statistics for the table and any indexes involved in the operation.
-     * <i>ConsumedCapacity</i> is only returned if the request asked for it.
-     * For more information, see <a
-     * href="http://docs.aws.amazon.com/amazondynamodb/latest/developerguide/ProvisionedThroughputIntro.html">Provisioned
-     * Throughput</a> in the <i>Amazon DynamoDB Developer Guide</i>.
-     *
-     * @return The capacity units consumed by an operation. The data returned
-     *         includes the total provisioned throughput consumed, along with
-     *         statistics for the table and any indexes involved in the operation.
-     *         <i>ConsumedCapacity</i> is only returned if the request asked for it.
-     *         For more information, see <a
-     *         href="http://docs.aws.amazon.com/amazondynamodb/latest/developerguide/ProvisionedThroughputIntro.html">Provisioned
-     *         Throughput</a> in the <i>Amazon DynamoDB Developer Guide</i>.
-     */
-    public ConsumedCapacity getConsumedCapacity() {
-        return consumedCapacity;
-    }
-
-    public void setConsumedCapacity(ConsumedCapacity consumedCapacity) {
-        this.consumedCapacity = consumedCapacity;
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/RandomUuidMarshaller.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/RandomUuidMarshaller.java
deleted file mode 100644
index 4a66bc8ec5aa..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/RandomUuidMarshaller.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-import java.util.UUID;
-
-public class RandomUuidMarshaller implements DynamoDbMarshaller<Object>, DynamoDbTypeConverter<String, Object> {
-
-    public static final String randomUUID = UUID.randomUUID().toString();
-
-    @Override
-    public String marshall(Object getterReturnResult) {
-        return randomUUID;
-    }
-
-    @Override
-    public Object unmarshall(Class<Object> clazz, String obj) {
-        return null;
-    }
-
-    @Override
-    public String convert(final Object object) {
-        return randomUUID;
-    }
-
-    @Override
-    public Object unconvert(final String object) {
-        return null;
-    }
-
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/ReflectionUtils.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/ReflectionUtils.java
deleted file mode 100644
index 9727ed0a6afd..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/ReflectionUtils.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import software.amazon.awssdk.utils.StringUtils;
-
-/**
- * @deprecated Replaced by {@link StandardBeanProperties}
- */
-@Deprecated
-class ReflectionUtils {
-
-    /**
-     * Returns the field name that corresponds to the given getter method,
-     * according to the Java naming convention.
-     *
-     * @param getter
-     *            The getter method.
-     * @param forceCamelCase
-     *            True if the returned field name should be in camel-case, i.e.
-     *            the first letter is lower-cased.
-     */
-    static String getFieldNameByGetter(Method getter, boolean forceCamelCase) {
-        String getterName = getter.getName();
-
-        String fieldNameWithUpperCamelCase = "";
-        if (getterName.startsWith("get")) {
-            fieldNameWithUpperCamelCase = getterName.substring("get".length());
-        } else if (getterName.startsWith("is")) {
-            fieldNameWithUpperCamelCase = getterName.substring("is".length());
-        }
-
-        if (fieldNameWithUpperCamelCase.length() == 0) {
-            throw new DynamoDbMappingException(
-                    "Getter must begin with 'get' or 'is', and the field name must contain at least one character.");
-        }
-
-        if (forceCamelCase) {
-            // Lowercase the first letter of the name
-            return StringUtils.lowerCase(fieldNameWithUpperCamelCase.substring(0, 1)) + fieldNameWithUpperCamelCase.substring(1);
-        } else {
-            return fieldNameWithUpperCamelCase;
-        }
-
-    }
-
-    /**
-     * Returns the Field object for the specified field name declared in the
-     * specified class. Returns null if no such field can be found.
-     *
-     * @param clazz
-     *            The declaring class where the field will be reflected. This
-     *            method will NOT attempt to reflect its superclass if such
-     *            field is not found in this class.
-     * @param fieldName
-     *            The case-sensitive name of the field to be searched.
-     */
-    static Field getClassFieldByName(Class<?> clazz, String fieldName) {
-        try {
-            return clazz.getDeclaredField(fieldName);
-        } catch (SecurityException e) {
-            throw new DynamoDbMappingException(
-                    "Denied access to the [" + fieldName + "] field in class [" + clazz + "].", e);
-        } catch (NoSuchFieldException e) {
-            return null;
-        }
-    }
-
-    /**
-     * This method searches for a specific type of annotation that is applied to
-     * either the specified getter method or its corresponding class field.
-     * Returns the annotation if it is found, else null.
-     */
-    static <T extends Annotation> T getAnnotationFromGetterOrField(
-            Method getter, Class<T> annotationClass) {
-        // Check annotation on the getter method
-        T onGetter = getter.getAnnotation(annotationClass);
-        if (onGetter != null) {
-            return onGetter;
-        }
-
-        // Check annotation on the corresponding field
-        String fieldName = getFieldNameByGetter(getter, true);
-        // Only consider the field declared in the same class where getter is defined.
-        Field field = getClassFieldByName(getter.getDeclaringClass(), fieldName);
-        T onField = null;
-        if (field != null) {
-            onField = field.getAnnotation(annotationClass);
-        }
-        return onField;
-    }
-
-    /**
-     * Returns true if an annotation for the specified type is found on the
-     * getter method or its corresponding class field.
-     */
-    static <T extends Annotation> boolean getterOrFieldHasAnnotation(
-            Method getter, Class<T> annotationClass) {
-        return getAnnotationFromGetterOrField(getter, annotationClass) != null;
-    }
-
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/S3ClientCache.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/S3ClientCache.java
deleted file mode 100644
index 9d2d1da59649..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/S3ClientCache.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-import software.amazon.awssdk.auth.credentials.AwsCredentials;
-import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;
-import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
-import software.amazon.awssdk.regions.Region;
-import software.amazon.awssdk.services.s3.S3Client;
-import software.amazon.awssdk.services.s3.S3Configuration;
-
-/**
- * A smart Map for {@link S3Client} objects. {@link S3ClientCache} keeps the
- * clients organized by region, and if provided {@link AwsCredentials} will
- * create clients on the fly. Otherwise it just return clients given to it with
- * {@link #useClient(S3Client, Region)}.
- */
-public class S3ClientCache {
-    private final ConcurrentMap<String, S3Client> clientsByRegion = new ConcurrentHashMap<String, S3Client>();
-
-    private final AwsCredentialsProvider awscredentialsProvider;
-
-    @Deprecated
-    S3ClientCache(AwsCredentials credentials) {
-        this(StaticCredentialsProvider.create(credentials));
-    }
-
-    /**
-     * Create a client cache using the given AWSCredentialsProvider. If
-     * {@link #getClient(Region)} is called and a client has not been
-     * provided for the region, the cache will instantiate one from the
-     * provided {@link AwsCredentialsProvider}.
-     *
-     * @param awsCredentialsProvider
-     *            The credentials provider to use when creating new
-     *            {@link S3Client}.
-     */
-    S3ClientCache(AwsCredentialsProvider awsCredentialsProvider) {
-        this.awscredentialsProvider = awsCredentialsProvider;
-    }
-
-
-    /**
-     * Force the client cache to provide a certain client for the region which
-     * that client is configured. This can be useful to provide clients with
-     * different {@link S3Configuration}.
-     *
-     * @param client
-     *            An {@link S3Client} to use in the cache. Its region will
-     *            be detected automatically.
-     */
-    public void useClient(S3Client client, Region region) {
-        clientsByRegion.put(region.id(), client);
-    }
-
-    /**
-     * Returns a client for the requested region, or throws an exception when
-     * unable.
-     *
-     * @param region
-     *            The region the returned {@link S3Client} will be
-     *            configured to use.
-     * @return A client for the given region from the cache, either instantiated
-     *         automatically from the provided {@link AwsCredentials} or
-     *         provided with {@link #useClient(S3Client, Region)}.
-     * @throws IllegalArgumentException
-     *             When a region is requested that has not been provided to the
-     *             cache with {@link #useClient(S3Client, Region)}, and the cache
-     *             has no {@link AwsCredentials} with which a client may be
-     *             instantiated.
-     */
-    public S3Client getClient(Region region) {
-        if (region == null) {
-            throw new IllegalArgumentException("S3 region must be specified");
-        }
-        return getClient(region.id());
-    }
-
-    /**
-     * Returns a client for the requested region, or throws an exception when
-     * unable.
-     *
-     * @param region
-     *            The region the returned {@link S3Client} will be
-     *            configured to use.
-     * @return A client for the given region from the cache, either instantiated
-     *         automatically from the provided {@link AwsCredentials} or
-     *         provided with {@link #useClient(S3Client, Region)}.
-     * @throws IllegalArgumentException
-     *             When a region is requested that has not been provided to the
-     *             cache with {@link #useClient(S3Client, Region)}, and the cache
-     *             has no {@link AwsCredentials} with which a client may be
-     *             instantiated.
-     */
-    public S3Client getClient(String region) {
-        if (region == null) {
-            throw new IllegalArgumentException("S3 region must be specified");
-        }
-        S3Client client = clientsByRegion.get(region);
-        return client != null ? client : cacheClient(region);
-    }
-
-    /**
-     * Returns a new client with region configured to
-     * region.
-     * Also updates the clientsByRegion map by associating the
-     * new client with region.
-     *
-     * @param region
-     *            The region the returned {@link S3Client} will be
-     *            configured to use.
-     * @return A new {@link S3Client} client with region set to region.
-     */
-    private S3Client cacheClient(String region) {
-        if (awscredentialsProvider == null) {
-            throw new IllegalArgumentException("No credentials provider found to connect to S3");
-        }
-        S3Client client = S3Client.builder().credentialsProvider(awscredentialsProvider).region(Region.of(region)).build();
-        clientsByRegion.put(region, client);
-        return client;
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/S3Link.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/S3Link.java
deleted file mode 100644
index a316bb0d44d0..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/S3Link.java
+++ /dev/null
@@ -1,449 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import java.io.File;
-import java.io.OutputStream;
-import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;
-import software.amazon.awssdk.core.sync.RequestBody;
-import software.amazon.awssdk.core.sync.ResponseTransformer;
-import software.amazon.awssdk.core.util.json.JacksonUtils;
-import software.amazon.awssdk.regions.Region;
-import software.amazon.awssdk.services.s3.S3Client;
-import software.amazon.awssdk.services.s3.model.AccessControlPolicy;
-import software.amazon.awssdk.services.s3.model.GetObjectRequest;
-import software.amazon.awssdk.services.s3.model.GetObjectResponse;
-import software.amazon.awssdk.services.s3.model.ObjectCannedACL;
-import software.amazon.awssdk.services.s3.model.PutObjectAclRequest;
-import software.amazon.awssdk.services.s3.model.PutObjectRequest;
-import software.amazon.awssdk.services.s3.model.PutObjectResponse;
-
-/**
- * An S3 Link that works with {@link DynamoDbMapper}.
- * An S3 link is persisted as a JSON string in DynamoDB.
- * This link object can be used directly to upload/download files to S3.
- * Alternatively, the underlying
- * {@link S3Client} can be retrieved to
- * provide full access API to S3.
- * <p>
- * For example:
- * <pre class="brush: java">
- * AWSCredentialsProvider s3CredentialProvider = ...;
- * DynamoDBMapper mapper = new DynamoDBMapper(..., s3CredentialProvider);
- * String username = "jamestkirk";
- *
- * User user = new User();
- * user.setUsername(username);
- *
- * // S3 region can be specified, but is optional
- * S3Link s3link = mapper.createS3Link("my-company-user-avatars", username + ".jpg");
- * user.setAvatar(s3link);
- *
- * // All meta information of the S3 resource is persisted in DynamoDB, including
- * // region, bucket, and key
- * mapper.save(user);
- *
- * // Upload file to S3 with the link saved in DynamoDB
- * s3link.uploadFrom(new File("/path/to/all/those/user/avatars/" + username + ".jpg"));
- * // Download file from S3 via an S3Link
- * s3link.downloadTo(new File("/path/to/downloads/" + username + ".jpg"));
- *
- * // Full S3 API is available via the canonical AmazonS3Client and TransferManager API.
- * // For example:
- * AmazonS3Client s3 = s3link.getAmazonS3Client();
- * TransferManager s3m = s3link.getTransferManager();
- * // etc.
- * </pre>The User pojo class used above:<pre class="brush: java">
- * &commat;DynamoDBTable(tableName = "user-table")
- * public class User {
- *     private String username;
- *     private S3Link avatar;
- *
- *     &commat;DynamoDBHashKey
- *     public String getUsername() {
- *         return username;
- *     }
- *
- *     public void setUsername(String username) {
- *         this.username = username;
- *     }
- *
- *     public S3Link getAvatar() {
- *         return avatar;
- *     }
- *
- *     public void setAvatar(S3Link avatar) {
- *         this.avatar = avatar;
- *     }
- * }
- * </pre>
- */
-public class S3Link {
-    private final S3ClientCache s3cc;
-    private final Id id;
-
-    S3Link(S3ClientCache s3cc, String bucketName, String key) {
-        this(s3cc, new Id(bucketName, key));
-    }
-
-    S3Link(S3ClientCache s3cc, String region, String bucketName, String key) {
-        this(s3cc, new Id(region, bucketName, key));
-    }
-
-    private S3Link(S3ClientCache s3cc, Id id) {
-        this.s3cc = s3cc;
-        this.id = id;
-
-        if (s3cc == null) {
-            throw new IllegalArgumentException("S3ClientCache must be configured for use with S3Link");
-        }
-        if (id == null || id.bucket() == null || id.getKey() == null) {
-            throw new IllegalArgumentException("Bucket and key must be specified for S3Link");
-        }
-    }
-
-    /**
-     * Deserializes from a JSON string.
-     */
-    public static S3Link fromJson(S3ClientCache s3cc, String json) {
-        Id id = JacksonUtils.fromJsonString(json, Id.class);
-        return new S3Link(s3cc, id);
-    }
-
-    private static String convertRegionToString(Region region) {
-        return region.id();
-    }
-
-    public String getKey() {
-        return id.getKey();
-    }
-
-    public String bucketName() {
-        return id.bucket();
-    }
-
-    /**
-     * Returns the S3 region in {@link Region} format.
-     * <p>
-     *     Do not use this method if {@link S3Link} is created with a region not in {@link Region} enum.
-     *     Use {@link #getRegion()} instead.
-     * </p>
-     *
-     * @return S3 region.
-     */
-    public Region s3Region() {
-        return Region.of(getRegion());
-    }
-
-    /**
-     * Returns the S3 region as string.
-     *
-     * @return region provided when creating the S3Link object.
-     *         If no region is provided during S3Link creation, returns us-east-1.
-     */
-    public String getRegion() {
-        return id.getRegionId() == null ? "us-east-1" : id.getRegionId();
-    }
-
-    /**
-     * Serializes into a JSON string.
-     *
-     * @return The string representation of the link to the S3 resource.
-     */
-    public String toJson() {
-        return id.toJson();
-    }
-
-    public S3Client getAmazonS3Client() {
-        return s3cc.getClient(getRegion());
-    }
-
-    /**
-     * Convenience method to synchronously upload from the given file to the
-     * Amazon S3 object represented by this S3Link.
-     *
-     * @param source
-     *            source file to upload from
-     *
-     * @return A {@link PutObjectResponse} object containing the information
-     *         returned by Amazon S3 for the newly created object.
-     */
-    public PutObjectResponse uploadFrom(final File source) {
-        return getAmazonS3Client().putObject(PutObjectRequest.builder()
-                                                             .bucket(bucketName())
-                                                             .key(getKey())
-                                                             .build(), RequestBody.fromFile(source));
-    }
-
-    /**
-     * Convenience method to synchronously upload from the given buffer to the
-     * Amazon S3 object represented by this S3Link.
-     *
-     * @param buffer
-     *            The buffer containing the data to upload.
-     *
-     * @return A {@link PutObjectResponse} object containing the information
-     *         returned by Amazon S3 for the newly created object.
-     */
-    public PutObjectResponse uploadFrom(final byte[] buffer) {
-        return getAmazonS3Client().putObject(PutObjectRequest.builder()
-                                                             .bucket(bucketName())
-                                                             .key(getKey())
-                                                             .contentLength((long) buffer.length)
-                                                             .build(), RequestBody.fromBytes(buffer));
-    }
-
-    /**
-     * Sets the access control list for the object represented by this S3Link.
-     *
-     * Note: Executing this method requires that the object already exists in
-     * Amazon S3.
-     *
-     * @param acl
-     *            The access control list describing the new permissions for the
-     *            object represented by this S3Link.
-     */
-    public void setAcl(ObjectCannedACL acl) {
-        getAmazonS3Client().putObjectAcl(PutObjectAclRequest.builder().bucket(bucketName()).key(getKey()).acl(acl).build());
-    }
-
-    public void setAcl(AccessControlPolicy acl) {
-        getAmazonS3Client().putObjectAcl(PutObjectAclRequest.builder()
-                                                            .accessControlPolicy(acl)
-                                                            .bucket(bucketName())
-                                                            .key(getKey())
-                                                            .build());
-    }
-
-    /**
-     * Convenient method to synchronously download to the specified file from
-     * the S3 object represented by this S3Link.
-     *
-     * @param destination destination file to download to
-     *
-     * @return All S3 object metadata for the specified object.
-     *     Returns null if constraints were specified but not met.
-     */
-    public GetObjectResponse downloadTo(final File destination) {
-        return getAmazonS3Client().getObject(GetObjectRequest.builder()
-                                                             .bucket(bucketName())
-                                                             .key(getKey())
-                                                             .build(),
-                                             ResponseTransformer.toFile(destination.toPath()));
-    }
-
-    /**
-     * Downloads the data from the object represented by this S3Link to the
-     * specified output stream.
-     *
-     * @param output
-     *            The output stream to write the object's data to.
-     *
-     * @return The object's metadata.
-     */
-    public GetObjectResponse downloadTo(final OutputStream output) {
-        return getAmazonS3Client().getObject(GetObjectRequest.builder()
-                                                             .bucket(bucketName())
-                                                             .key(getKey())
-                                                             .build(),
-                                             ResponseTransformer.toOutputStream(output));
-    }
-
-    /**
-     * JSON wrapper of an {@link S3Link} identifier,
-     * which consists of the S3 region id, bucket name and key.
-     * Sample JSON serialized form:
-     * <pre>
-     * {"s3":{"bucket":"mybucket","key":"mykey","region":"us-west-2"}}
-     * {"s3":{"bucket":"mybucket","key":"mykey","region":null}}
-     * </pre>
-     * Note for S3 a null region means US standard.
-     * <p>
-     *  @see Region
-     */
-    static class Id {
-        @JsonProperty("s3")
-        private S3 s3;
-
-        Id() {
-        } // used by Jackson to unmarshall
-
-        Id(String bucketName, String key) {
-            this.s3 = new S3(bucketName, key);
-        }
-
-        Id(String region, String bucketName, String key) {
-            this.s3 = new S3(region, bucketName, key);
-        }
-
-        Id(S3 s3) {
-            this.s3 = s3;
-        }
-
-        @JsonProperty("s3")
-        public S3 s3() {
-            return s3;
-        }
-
-        @JsonIgnore
-        public String getRegionId() {
-            return s3.getRegionId();
-        }
-
-        @JsonIgnore
-        public String bucket() {
-            return s3.bucket();
-        }
-
-        @JsonIgnore
-        public String getKey() {
-            return s3.getKey();
-        }
-
-        String toJson() {
-            return JacksonUtils.toJsonString(this);
-        }
-    }
-
-    /**
-     * Internal class for JSON serialization purposes.
-     * <p>
-     * @see Id
-     */
-    private static class S3 {
-
-        /**
-         * The name of the S3 bucket containing the object to retrieve.
-         */
-        @JsonProperty("bucket")
-        private String bucket;
-
-        /**
-         * The key under which the desired S3 object is stored.
-         */
-        @JsonProperty("key")
-        private String key;
-
-        /**
-         * The region id of {@link Region} where the S3 object is stored.
-         */
-        @JsonProperty("region")
-        private String regionId;
-
-        @SuppressWarnings("unused")
-        S3() {
-        }  // used by Jackson to unmarshall
-
-        /**
-         * Constructs a new {@link S3} with all the required parameters.
-         *
-         * @param bucket
-         *            The name of the bucket containing the desired object.
-         * @param key
-         *            The key in the specified bucket under which the object is
-         *            stored.
-         */
-        S3(String bucket, String key) {
-            this(null, bucket, key);
-        }
-
-        /**
-         * Constructs a new {@link S3} with all the required parameters.
-         *
-         * @param region
-         *            The region where the S3 object is stored.
-         * @param bucket
-         *            The name of the bucket containing the desired object.
-         * @param key
-         *            The key in the specified bucket under which the object is
-         *            stored.
-         */
-        S3(String region, String bucket, String key) {
-            this.regionId = region;
-            this.bucket = bucket;
-            this.key = key;
-        }
-
-        /**
-         * Gets the name of the bucket containing the object to be downloaded.
-         *
-         * @return The name of the bucket containing the object to be downloaded.
-         */
-        @JsonProperty("bucket")
-        public String bucket() {
-            return bucket;
-        }
-
-        /**
-         * Gets the key under which the object to be downloaded is stored.
-         *
-         * @return The key under which the object to be downloaded is stored.
-         */
-        @JsonProperty("key")
-        public String getKey() {
-            return key;
-        }
-
-        @JsonProperty("region")
-        public String getRegionId() {
-            return regionId;
-        }
-    }
-
-    /**
-     * {@link S3Link} factory.
-     */
-    public static final class Factory implements DynamoDbTypeConverter<String, S3Link> {
-        static final Factory DEFAULT = new Factory((S3ClientCache) null);
-        private final S3ClientCache s3cc;
-
-        public Factory(final S3ClientCache s3cc) {
-            this.s3cc = s3cc;
-        }
-
-        public static Factory of(final AwsCredentialsProvider provider) {
-            return provider == null ? DEFAULT : new Factory(new S3ClientCache(provider));
-        }
-
-        public S3Link createS3Link(Region s3region, String bucketName, String key) {
-            return createS3Link(convertRegionToString(s3region), bucketName, key);
-        }
-
-        public S3Link createS3Link(String s3region, String bucketName, String key) {
-            if (s3ClientCache() == null) {
-                throw new IllegalStateException("Mapper must be constructed with S3 AWS Credentials to create S3Link");
-            }
-            return new S3Link(s3ClientCache(), s3region, bucketName, key);
-        }
-
-        public S3ClientCache s3ClientCache() {
-            return this.s3cc;
-        }
-
-        @Override
-        public String convert(final S3Link o) {
-            return o.bucketName() == null || o.getKey() == null ? null : o.toJson();
-        }
-
-        @Override
-        public S3Link unconvert(final String o) {
-            return S3Link.fromJson(s3ClientCache(), o);
-        }
-    }
-
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/S3LinkIdTest.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/S3LinkIdTest.java
deleted file mode 100644
index fd8b4d42ddc3..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/S3LinkIdTest.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-import software.amazon.awssdk.core.util.json.JacksonUtils;
-
-public class S3LinkIdTest {
-
-    @Test
-    public void testToFromJson() {
-        String region = "ap-northeast-1";
-        S3Link.Id id = new S3Link.Id(region, "bucket", "key");
-        String json = id.toJson();
-        S3Link.Id twin = JacksonUtils.fromJsonString(json, S3Link.Id.class);
-        assertEquals("bucket", twin.bucket());
-        assertEquals("key", twin.getKey());
-        assertEquals(region, twin.getRegionId());
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/S3LinkTest.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/S3LinkTest.java
deleted file mode 100644
index 8b5789868846..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/S3LinkTest.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
-import software.amazon.awssdk.auth.credentials.AwsCredentials;
-import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
-import software.amazon.awssdk.regions.Region;
-import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
-
-@Ignore // FIXME: Setup fails with "region cannot be null"
-public class S3LinkTest {
-    private DynamoDbMapper mapper;
-
-    @Before
-    public void setUp() {
-        AwsCredentials credentials = AwsBasicCredentials.create("mock", "mock");
-        DynamoDbClient db = DynamoDbClient.builder()
-                                          .credentialsProvider(StaticCredentialsProvider.create(credentials))
-                                          .region(Region.US_WEST_2)
-                                          .build();
-        mapper = new DynamoDbMapper(db, StaticCredentialsProvider.create(credentials));
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void nullKey() {
-        mapper.createS3Link("bucket", null);
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void nullBucketName() {
-        mapper.createS3Link(null, "key");
-    }
-
-    @Test
-    public void testToJson() {
-        S3Link testLink = mapper.createS3Link("bucket", "key");
-        String json = testLink.toJson();
-
-        assertEquals(json,
-                     "{\"s3\":{\"bucket\":\"bucket\",\"key\":\"key\",\"region\":\"us-east-1\"}}",
-                     json);
-        testLink = mapper.createS3Link("bucket", "testKey");
-        json = testLink.toJson();
-        assertEquals(json,
-                     "{\"s3\":{\"bucket\":\"bucket\",\"key\":\"testKey\",\"region\":\"us-east-1\"}}",
-                     json);
-
-        testLink = mapper.createS3Link(Region.AP_SOUTHEAST_2, "bucket", "testKey");
-        json = testLink.toJson();
-        assertEquals(json,
-                     "{\"s3\":{\"bucket\":\"bucket\",\"key\":\"testKey\",\"region\":\"ap-southeast-2\"}}",
-                     json);
-
-        testLink = mapper.createS3Link(Region.AP_SOUTHEAST_2, "test-bucket", "testKey");
-        json = testLink.toJson();
-        assertEquals(json,
-                     "{\"s3\":{\"bucket\":\"test-bucket\",\"key\":\"testKey\",\"region\":\"ap-southeast-2\"}}",
-                     json);
-
-        testLink = mapper.createS3Link(Region.AP_SOUTHEAST_2, "test-bucket", "test/key/with/slashes");
-        json = testLink.toJson();
-        assertEquals(json,
-                     "{\"s3\":{\"bucket\":\"test-bucket\",\"key\":\"test/key/with/slashes\",\"region\":\"ap-southeast-2\"}}",
-                     json);
-
-        testLink = mapper.createS3Link("test-bucket", "test/key/with/slashes");
-        json = testLink.toJson();
-        assertEquals(json,
-                     "{\"s3\":{\"bucket\":\"test-bucket\",\"key\":\"test/key/with/slashes\",\"region\":\"us-east-1\"}}",
-                     json);
-        testLink = mapper.createS3Link(Region.AP_SOUTHEAST_2, "test-bucket", "test/key/with/slashes");
-        json = testLink.toJson();
-        assertEquals(json,
-                     "{\"s3\":{\"bucket\":\"test-bucket\",\"key\":\"test/key/with/slashes\",\"region\":\"ap-southeast-2\"}}",
-                     json);
-    }
-
-    @Test
-    public void testFromJson() {
-        String json = "{\"s3\":{\"region\":\"ap-southeast-2\",\"bucket\":\"test-bucket\",\"key\":\"testKey\"}}";
-        S3Link s3link = S3Link.fromJson(mapper.s3ClientCache(), json);
-        assertEquals("test-bucket", s3link.bucketName());
-        assertEquals("ap-southeast-2", s3link.getRegion());
-        assertEquals("testKey", s3link.getKey());
-    }
-
-    @Test
-    public void testDefaultRegion() {
-        S3Link testLink1 = mapper.createS3Link("bucket", "key");
-        String json = testLink1.toJson();
-        // Default to US_STANDARD if not specified
-        assertEquals(json,
-                     "{\"s3\":{\"bucket\":\"bucket\",\"key\":\"key\",\"region\":\"us-east-1\"}}",
-                     json);
-        // Default region changed to GovCloud
-        testLink1 = mapper.createS3Link(Region.US_GOV_WEST_1, "bucket", "key");
-        json = testLink1.toJson();
-        assertEquals(json,
-                     "{\"s3\":{\"bucket\":\"bucket\",\"key\":\"key\",\"region\":\"us-gov-west-1\"}}",
-                     json);
-    }
-
-    @Test
-    public void testGetRegion_ReturnsUsEast1_Whens3LinkCreated_WithNullRegion() {
-        S3Link s3Link = mapper.createS3Link("bucket", "key");
-
-        assertEquals("us-east-1", s3Link.s3Region().id());
-        assertEquals("us-east-1", s3Link.getRegion());
-    }
-
-    @Test
-    public void testGetRegion_ReturnsUsEast1_WhenS3LinkCreated_WithUsStandardRegion() {
-        S3Link s3Link = mapper.createS3Link(Region.US_EAST_1, "bucket", "key");
-
-        assertEquals("us-east-1", s3Link.s3Region().id());
-        assertEquals("us-east-1", s3Link.getRegion());
-    }
-
-    @Test
-    public void testGetRegion_ReturnsUsEast1_Whens3LinkCreated_WithUsEast1Region() {
-        S3Link s3Link = mapper.createS3Link("us-east-1", "bucket", "key");
-
-        assertEquals("us-east-1", s3Link.s3Region().id());
-        assertEquals("us-east-1", s3Link.getRegion());
-    }
-
-    @Test
-    public void testGetRegion_WithNonUsStandardRegion() {
-        S3Link s3Link = mapper.createS3Link(Region.EU_WEST_2, "bucket", "key");
-
-        assertEquals(Region.EU_WEST_2, s3Link.s3Region());
-        assertEquals(Region.EU_WEST_2.id(), s3Link.getRegion());
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/ScanResultPage.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/ScanResultPage.java
deleted file mode 100644
index d3a8b28f722b..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/ScanResultPage.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-import java.util.List;
-import java.util.Map;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-import software.amazon.awssdk.services.dynamodb.model.ConsumedCapacity;
-
-/**
- * Container for a page of scan results.
- */
-public class ScanResultPage<T> {
-
-    private List<T> results;
-    private Map<String, AttributeValue> lastEvaluatedKey;
-
-    private Integer count;
-    private Integer scannedCount;
-    private ConsumedCapacity consumedCapacity;
-
-    /**
-     * Returns all matching items for this page of scan results, which may be
-     * empty.
-     */
-    public List<T> getResults() {
-        return results;
-    }
-
-    public void setResults(List<T> results) {
-        this.results = results;
-    }
-
-    /**
-     * Returns the last evaluated key, which can be used as the
-     * exclusiveStartKey to fetch the next page of results. Returns null if this
-     * is the last page of results.
-     *
-     * @return The key-value pairs which map from the attribute name of each component
-     *             of the primary key to its value.
-     */
-    public Map<String, AttributeValue> lastEvaluatedKey() {
-        return lastEvaluatedKey;
-    }
-
-    public void setLastEvaluatedKey(Map<String, AttributeValue> lastEvaluatedKey) {
-        this.lastEvaluatedKey = lastEvaluatedKey;
-    }
-
-    /**
-     * The number of items in the response. <p>If you set <i>ScanFilter</i>
-     * in the request, then <i>Count</i> is the number of items returned
-     * after the filter was applied, and <i>ScannedCount</i> is the number of
-     * matching items before the filter was applied. <p>If you did not use a
-     * filter in the request, then <i>Count</i> is the same as
-     * <i>ScannedCount</i>.
-     *
-     * @return The number of items in the response. <p>If you set <i>ScanFilter</i>
-     *         in the request, then <i>Count</i> is the number of items returned
-     *         after the filter was applied, and <i>ScannedCount</i> is the number of
-     *         matching items before the filter was applied. <p>If you did not use a
-     *         filter in the request, then <i>Count</i> is the same as
-     *         <i>ScannedCount</i>.
-     */
-    public Integer getCount() {
-        return count;
-    }
-
-    public void setCount(Integer count) {
-        this.count = count;
-    }
-
-    /**
-     * The number of items evaluated, before any <i>ScanFilter</i> is
-     * applied. A high <i>ScannedCount</i> value with few, or no,
-     * <i>Count</i> results indicates an inefficient <i>Scan</i> operation.
-     * For more information, see <a
-     * href="http://docs.aws.amazon.com/amazondynamodb/latest/developerguide/QueryAndScan.html#Count">Count
-     * and ScannedCount</a> in the <i>Amazon DynamoDB Developer Guide</i>.
-     * <p>If you did not use a filter in the request, then
-     * <i>ScannedCount</i> is the same as <i>Count</i>.
-     *
-     * @return The number of items evaluated, before any <i>ScanFilter</i> is
-     *         applied. A high <i>ScannedCount</i> value with few, or no,
-     *         <i>Count</i> results indicates an inefficient <i>Scan</i> operation.
-     *         For more information, see <a
-     *         href="http://docs.aws.amazon.com/amazondynamodb/latest/developerguide/QueryAndScan.html#Count">Count
-     *         and ScannedCount</a> in the <i>Amazon DynamoDB Developer Guide</i>.
-     *         <p>If you did not use a filter in the request, then
-     *         <i>ScannedCount</i> is the same as <i>Count</i>.
-     */
-    public Integer scannedCount() {
-        return scannedCount;
-    }
-
-    public void setScannedCount(Integer scannedCount) {
-        this.scannedCount = scannedCount;
-    }
-
-    /**
-     * The capacity units consumed by an operation. The data returned
-     * includes the total provisioned throughput consumed, along with
-     * statistics for the table and any indexes involved in the operation.
-     * <i>ConsumedCapacity</i> is only returned if the request asked for it.
-     * For more information, see <a
-     * href="http://docs.aws.amazon.com/amazondynamodb/latest/developerguide/ProvisionedThroughputIntro.html">Provisioned
-     * Throughput</a> in the <i>Amazon DynamoDB Developer Guide</i>.
-     *
-     * @return The capacity units consumed by an operation. The data returned
-     *         includes the total provisioned throughput consumed, along with
-     *         statistics for the table and any indexes involved in the operation.
-     *         <i>ConsumedCapacity</i> is only returned if the request asked for it.
-     *         For more information, see <a
-     *         href="http://docs.aws.amazon.com/amazondynamodb/latest/developerguide/ProvisionedThroughputIntro.html">Provisioned
-     *         Throughput</a> in the <i>Amazon DynamoDB Developer Guide</i>.
-     */
-    public ConsumedCapacity getConsumedCapacity() {
-        return consumedCapacity;
-    }
-
-    public void setConsumedCapacity(ConsumedCapacity consumedCapacity) {
-        this.consumedCapacity = consumedCapacity;
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/StandardAnnotationMaps.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/StandardAnnotationMaps.java
deleted file mode 100644
index 392753341a10..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/StandardAnnotationMaps.java
+++ /dev/null
@@ -1,459 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-import static software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbAutoGenerateStrategy.CREATE;
-import static software.amazon.awssdk.services.dynamodb.model.KeyType.HASH;
-import static software.amazon.awssdk.services.dynamodb.model.KeyType.RANGE;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.AnnotatedElement;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.EnumMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import software.amazon.awssdk.annotations.SdkInternalApi;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMapperFieldModel.DynamoDbAttributeType;
-import software.amazon.awssdk.services.dynamodb.model.KeyType;
-
-/**
- * Map of DynamoDB annotations.
- */
-@SdkInternalApi
-final class StandardAnnotationMaps {
-
-    /**
-     * Gets all the DynamoDB annotations for a given class.
-     */
-    static <T> TableMap<T> of(Class<T> clazz) {
-        final TableMap<T> annotations = new TableMap<T>(clazz);
-        annotations.putAll(clazz);
-        return annotations;
-    }
-
-    /**
-     * Gets all the DynamoDB annotations; method annotations override field
-     * level annotations which override class/type level annotations.
-     */
-    static <T> FieldMap<T> of(Method getter, String defaultName) {
-        final Class<T> targetType = (Class<T>) getter.getReturnType();
-        final String fieldName = StandardBeanProperties.fieldNameOf(getter);
-
-        Field declaredField = null;
-        try {
-            declaredField = getter.getDeclaringClass().getDeclaredField(fieldName);
-        } catch (final NoSuchFieldException no) {
-            // Ignored or expected.
-        } catch (final SecurityException e) {
-            throw new DynamoDbMappingException("no access to field for " + getter, e);
-        }
-
-        if (defaultName == null) {
-            defaultName = fieldName;
-        }
-
-        final FieldMap<T> annotations = new FieldMap<T>(targetType, defaultName);
-        annotations.putAll(targetType);
-        annotations.putAll(declaredField);
-        annotations.putAll(getter);
-        return annotations;
-    }
-
-    /**
-     * Creates a new instance of the clazz with the target type and annotation
-     * as parameters if available.
-     */
-    private static <T> T overrideOf(Class<T> clazz, Class<?> targetType, Annotation annotation) {
-        try {
-            if (annotation != null) {
-                try {
-                    Constructor<T> c = clazz.getDeclaredConstructor(Class.class, annotation.annotationType());
-                    return c.newInstance(targetType, annotation);
-                } catch (final NoSuchMethodException no) {
-                    // Ignored or expected.
-                }
-            }
-            try {
-                return clazz.getDeclaredConstructor(Class.class).newInstance(targetType);
-            } catch (final NoSuchMethodException no) {
-                // Ignored or expected.
-            }
-            return clazz.newInstance();
-        } catch (final IllegalAccessException | InstantiationException | InvocationTargetException | RuntimeException e) {
-            throw new DynamoDbMappingException("could not instantiate " + clazz, e);
-        }
-    }
-
-    /**
-     * Common type-conversions properties.
-     */
-    private abstract static class AbstractAnnotationMap {
-        private final Annotations map = new Annotations();
-
-        /**
-         * Gets the actual annotation by type; if the type is not directly
-         * mapped then the meta-annotation is returned.
-         */
-        final <A extends Annotation> A actualOf(final Class<A> annotationType) {
-            final Annotation annotation = this.map.get(annotationType);
-            if (annotation == null || annotation.annotationType() == annotationType) {
-                return (A) annotation;
-            } else if (annotation.annotationType().isAnnotationPresent(annotationType)) {
-                return annotation.annotationType().getAnnotation(annotationType);
-            }
-            throw new DynamoDbMappingException(
-                    "could not resolve annotation by type" +
-                    "; @" + annotationType.getSimpleName() + " not present on " + annotation
-            );
-        }
-
-        /**
-         * Puts all DynamoDB annotations into the map.
-         */
-        final void putAll(AnnotatedElement annotated) {
-            if (annotated != null) {
-                this.map.putAll(new Annotations().putAll(annotated.getAnnotations()));
-            }
-        }
-    }
-
-    /**
-     * Common type-conversions properties.
-     */
-    abstract static class TypedMap<T> extends AbstractAnnotationMap {
-        private final Class<T> targetType;
-
-        private TypedMap(final Class<T> targetType) {
-            this.targetType = targetType;
-        }
-
-        /**
-         * Gets the target type.
-         */
-        final Class<T> targetType() {
-            return this.targetType;
-        }
-
-        /**
-         * Gets the attribute type from the {@link DynamoDbTyped} annotation
-         * if present.
-         */
-        public DynamoDbAttributeType attributeType() {
-            final DynamoDbTyped annotation = actualOf(DynamoDbTyped.class);
-            if (annotation != null) {
-                return annotation.value();
-            }
-            return null;
-        }
-
-        /**
-         * Creates a new type-converter form the {@link DynamoDbTypeConverted}
-         * annotation if present.
-         */
-        public <S> DynamoDbTypeConverter<S, T> typeConverter() {
-            Annotation annotation = super.map.get(DynamoDbTypeConverted.class);
-            if (annotation != null) {
-                final DynamoDbTypeConverted converted = actualOf(DynamoDbTypeConverted.class);
-                annotation = (converted == annotation ? null : annotation);
-                return overrideOf(converted.converter(), targetType, annotation);
-            }
-            return null;
-        }
-
-        /**
-         * Creates a new auto-generator from the {@link DynamoDbAutoGenerated}
-         * annotation if present.
-         */
-        public DynamoDbAutoGenerator<T> autoGenerator() {
-            Annotation annotation = super.map.get(DynamoDbAutoGenerated.class);
-            if (annotation != null) {
-                final DynamoDbAutoGenerated generated = actualOf(DynamoDbAutoGenerated.class);
-                annotation = (generated == annotation ? null : annotation);
-                DynamoDbAutoGenerator<T> generator = overrideOf(generated.generator(), targetType, annotation);
-                if (generator.getGenerateStrategy() == CREATE && targetType.isPrimitive()) {
-                    throw new DynamoDbMappingException(
-                            "type [" + targetType + "] is not supported for auto-generation" +
-                            "; primitives are not allowed when auto-generate strategy is CREATE"
-                    );
-                }
-                return generator;
-            }
-            return null;
-        }
-
-        /**
-         * Maps the attributes from the {@link DynamoDbFlattened} annotation.
-         */
-        public Map<String, String> attributes() {
-            final Map<String, String> attributes = new LinkedHashMap<String, String>();
-            for (final DynamoDbAttribute a : actualOf(DynamoDbFlattened.class).attributes()) {
-                if (a.mappedBy().isEmpty() || a.attributeName().isEmpty()) {
-                    throw new DynamoDbMappingException("@DynamoDBFlattened must specify mappedBy and attributeName");
-                } else if (attributes.put(a.mappedBy(), a.attributeName()) != null) {
-                    throw new DynamoDbMappingException("@DynamoDBFlattened must not duplicate mappedBy=" + a.mappedBy());
-                }
-            }
-            if (attributes.isEmpty()) {
-                throw new DynamoDbMappingException("@DynamoDBFlattened must specify one or more attributes");
-            }
-            return attributes;
-        }
-
-        /**
-         * Returns true if the {@link DynamoDbFlattened} annotation is present.
-         */
-        public boolean flattened() {
-            return actualOf(DynamoDbFlattened.class) != null;
-        }
-    }
-
-    /**
-     * {@link DynamoDbMapperTableModel} annotations.
-     */
-    static final class TableMap<T> extends TypedMap<T> implements DynamoDbMapperTableModel.Properties<T> {
-        private TableMap(final Class<T> targetType) {
-            super(targetType);
-        }
-
-        /**
-         * {@inheritDoc}
-         */
-        @Override
-        public DynamoDbAttributeType attributeType() {
-            DynamoDbAttributeType attributeType = super.attributeType();
-            if (attributeType == null && actualOf(DynamoDbTable.class) != null) {
-                attributeType = DynamoDbAttributeType.M;
-            }
-            return attributeType;
-        }
-
-        /**
-         * {@inheritDoc}
-         */
-        @Override
-        public String tableName() {
-            final DynamoDbTable annotation = actualOf(DynamoDbTable.class);
-            if (annotation != null && !annotation.tableName().isEmpty()) {
-                return annotation.tableName();
-            }
-            return null;
-        }
-    }
-
-    /**
-     * {@link DynamoDbMapperFieldModel} annotations.
-     */
-    static final class FieldMap<T> extends TypedMap<T> implements DynamoDbMapperFieldModel.Properties<T> {
-        private final String defaultName;
-
-        private FieldMap(Class<T> targetType, String defaultName) {
-            super(targetType);
-            this.defaultName = defaultName;
-        }
-
-        /**
-         * Returns true if the {@link DynamoDbIgnore} annotation is present.
-         */
-        public boolean ignored() {
-            return actualOf(DynamoDbIgnore.class) != null;
-        }
-
-        /**
-         * {@inheritDoc}
-         */
-        @Override
-        public DynamoDbAttributeType attributeType() {
-            final DynamoDbScalarAttribute annotation = actualOf(DynamoDbScalarAttribute.class);
-            if (annotation != null) {
-                if (Set.class.isAssignableFrom(targetType())) {
-                    return DynamoDbAttributeType.valueOf(annotation.type().name() + "S");
-                } else {
-                    return DynamoDbAttributeType.valueOf(annotation.type().name());
-                }
-            }
-            return super.attributeType();
-        }
-
-        /**
-         * {@inheritDoc}
-         */
-        @Override
-        public String attributeName() {
-            final DynamoDbHashKey hashKey = actualOf(DynamoDbHashKey.class);
-            if (hashKey != null && !hashKey.attributeName().isEmpty()) {
-                return hashKey.attributeName();
-            }
-            final DynamoDbIndexHashKey indexHashKey = actualOf(DynamoDbIndexHashKey.class);
-            if (indexHashKey != null && !indexHashKey.attributeName().isEmpty()) {
-                return indexHashKey.attributeName();
-            }
-            final DynamoDbRangeKey rangeKey = actualOf(DynamoDbRangeKey.class);
-            if (rangeKey != null && !rangeKey.attributeName().isEmpty()) {
-                return rangeKey.attributeName();
-            }
-            final DynamoDbIndexRangeKey indexRangeKey = actualOf(DynamoDbIndexRangeKey.class);
-            if (indexRangeKey != null && !indexRangeKey.attributeName().isEmpty()) {
-                return indexRangeKey.attributeName();
-            }
-            final DynamoDbAttribute attribute = actualOf(DynamoDbAttribute.class);
-            if (attribute != null && !attribute.attributeName().isEmpty()) {
-                return attribute.attributeName();
-            }
-            final DynamoDbVersionAttribute versionAttribute = actualOf(DynamoDbVersionAttribute.class);
-            if (versionAttribute != null && !versionAttribute.attributeName().isEmpty()) {
-                return versionAttribute.attributeName();
-            }
-            final DynamoDbScalarAttribute scalarAttribute = actualOf(DynamoDbScalarAttribute.class);
-            if (scalarAttribute != null && !scalarAttribute.attributeName().isEmpty()) {
-                return scalarAttribute.attributeName();
-            }
-            final DynamoDbNamed annotation = actualOf(DynamoDbNamed.class);
-            if (annotation != null && !annotation.value().isEmpty()) {
-                return annotation.value();
-            }
-            return this.defaultName;
-        }
-
-        /**
-         * {@inheritDoc}
-         */
-        @Override
-        public KeyType keyType() {
-            final DynamoDbKeyed annotation = actualOf(DynamoDbKeyed.class);
-            if (annotation != null) {
-                return annotation.value();
-            }
-            return null;
-        }
-
-        /**
-         * {@inheritDoc}
-         */
-        @Override
-        public boolean versioned() {
-            return actualOf(DynamoDbVersioned.class) != null;
-        }
-
-        /**
-         * {@inheritDoc}
-         */
-        @Override
-        public Map<KeyType, List<String>> globalSecondaryIndexNames() {
-            final Map<KeyType, List<String>> gsis = new EnumMap<KeyType, List<String>>(KeyType.class);
-            final DynamoDbIndexHashKey indexHashKey = actualOf(DynamoDbIndexHashKey.class);
-            if (indexHashKey != null) {
-                if (!indexHashKey.globalSecondaryIndexName().isEmpty()) {
-                    if (indexHashKey.globalSecondaryIndexNames().length > 0) {
-                        throw new DynamoDbMappingException("@DynamoDBIndexHashKey must not specify both HASH GSI name/names");
-                    }
-                    gsis.put(HASH, Collections.singletonList(indexHashKey.globalSecondaryIndexName()));
-                } else if (indexHashKey.globalSecondaryIndexNames().length > 0) {
-                    gsis.put(HASH, Collections.unmodifiableList(Arrays.asList(indexHashKey.globalSecondaryIndexNames())));
-                } else {
-                    throw new DynamoDbMappingException("@DynamoDBIndexHashKey must specify one of HASH GSI name/names");
-                }
-            }
-            final DynamoDbIndexRangeKey indexRangeKey = actualOf(DynamoDbIndexRangeKey.class);
-            if (indexRangeKey != null) {
-                if (!indexRangeKey.globalSecondaryIndexName().isEmpty()) {
-                    if (indexRangeKey.globalSecondaryIndexNames().length > 0) {
-                        throw new DynamoDbMappingException("@DynamoDBIndexRangeKey must not specify both RANGE GSI name/names");
-                    }
-                    gsis.put(RANGE, Collections.singletonList(indexRangeKey.globalSecondaryIndexName()));
-                } else if (indexRangeKey.globalSecondaryIndexNames().length > 0) {
-                    gsis.put(RANGE, Collections.unmodifiableList(Arrays.asList(indexRangeKey.globalSecondaryIndexNames())));
-                } else if (localSecondaryIndexNames().isEmpty()) {
-                    throw new DynamoDbMappingException("@DynamoDBIndexRangeKey must specify RANGE GSI and/or LSI name/names");
-                }
-            }
-            if (!gsis.isEmpty()) {
-                return Collections.unmodifiableMap(gsis);
-            }
-            return Collections.<KeyType, List<String>>emptyMap();
-        }
-
-        /**
-         * {@inheritDoc}
-         */
-        @Override
-        public List<String> localSecondaryIndexNames() {
-            final DynamoDbIndexRangeKey annotation = actualOf(DynamoDbIndexRangeKey.class);
-            if (annotation != null) {
-                if (!annotation.localSecondaryIndexName().isEmpty()) {
-                    if (annotation.localSecondaryIndexNames().length > 0) {
-                        throw new DynamoDbMappingException("@DynamoDBIndexRangeKey must not specify both LSI name/names");
-                    }
-                    return Collections.singletonList(annotation.localSecondaryIndexName());
-                } else if (annotation.localSecondaryIndexNames().length > 0) {
-                    return Collections.unmodifiableList(Arrays.asList(annotation.localSecondaryIndexNames()));
-                }
-            }
-            return Collections.<String>emptyList();
-        }
-    }
-
-    /**
-     * A map of annotation type to annotation. It will map any first level
-     * custom annotations to any DynamoDB annotation types that are present.
-     * It will support up to two levels of compounded DynamoDB annotations.
-     */
-    private static final class Annotations extends LinkedHashMap<Class<? extends Annotation>, Annotation> {
-        private static final long serialVersionUID = -1L;
-
-        /**
-         * Puts the annotation if it's DynamoDB; ensures there are no conflicts.
-         */
-        public boolean putIfAnnotated(Class<? extends Annotation> annotationType, Annotation annotation) {
-            if (!annotationType.isAnnotationPresent(DynamoDb.class)) {
-                return false;
-            } else {
-                annotation = put(annotationType, annotation);
-                if (annotation == null) {
-                    return true;
-                }
-            }
-            throw new DynamoDbMappingException(
-                    "conflicting annotations " + annotation + " and " + get(annotationType) +
-                    "; allowed only one of @" + annotationType.getSimpleName()
-            );
-        }
-
-        /**
-         * Puts all DynamoDB annotations and meta-annotations in the map.
-         */
-        public Annotations putAll(Annotation... annotations) {
-            for (final Annotation a1 : annotations) {
-                putIfAnnotated(a1.annotationType(), a1);
-                for (final Annotation a2 : a1.annotationType().getAnnotations()) {
-                    if (putIfAnnotated(a2.annotationType(), a1)) {
-                        for (final Annotation a3 : a2.annotationType().getAnnotations()) {
-                            putIfAnnotated(a3.annotationType(), a2);
-                        }
-                    }
-                }
-            }
-            return this;
-        }
-    }
-
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/StandardBeanProperties.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/StandardBeanProperties.java
deleted file mode 100644
index 2283cddfddcf..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/StandardBeanProperties.java
+++ /dev/null
@@ -1,276 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-import java.lang.reflect.Method;
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-import software.amazon.awssdk.annotations.SdkInternalApi;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMapperFieldModel.Reflect;
-import software.amazon.awssdk.services.dynamodb.datamodeling.StandardAnnotationMaps.FieldMap;
-import software.amazon.awssdk.services.dynamodb.datamodeling.StandardAnnotationMaps.TableMap;
-import software.amazon.awssdk.utils.StringUtils;
-
-/**
- * Reflection assistant for {@link DynamoDbMapper}
- */
-@SdkInternalApi
-final class StandardBeanProperties {
-
-    /**
-     * Returns the bean mappings for a given class (caches the results).
-     */
-    @SuppressWarnings("unchecked")
-    static <T> Beans<T> of(Class<T> clazz) {
-        return ((CachedBeans<T>) CachedBeans.CACHE).beans(clazz);
-    }
-
-    /**
-     * Gets the field name given the getter method.
-     */
-    static String fieldNameOf(Method getter) {
-        final String name = getter.getName().replaceFirst("^(get|is)", "");
-        return StringUtils.lowerCase(name.substring(0, 1)) + name.substring(1);
-    }
-
-    /**
-     * Cache of {@link Beans} by class type.
-     */
-    private static final class CachedBeans<T> {
-        private static final CachedBeans<Object> CACHE = new CachedBeans<Object>();
-        private final ConcurrentMap<Class<T>, Beans<T>> cache = new ConcurrentHashMap<Class<T>, Beans<T>>();
-
-        private Beans<T> beans(Class<T> clazz) {
-            if (!cache.containsKey(clazz)) {
-                final TableMap<T> annotations = StandardAnnotationMaps.<T>of(clazz);
-                final BeanMap<T, Object> map = new BeanMap<T, Object>(clazz, false);
-                cache.putIfAbsent(clazz, new Beans<T>(annotations, map));
-            }
-            return cache.get(clazz);
-        }
-    }
-
-    /**
-     * Cache of {@link Bean} mappings by class type.
-     */
-    static final class Beans<T> {
-        private final DynamoDbMapperTableModel.Properties<T> properties;
-        private final Map<String, Bean<T, Object>> map;
-
-        private Beans(TableMap<T> annotations, Map<String, Bean<T, Object>> map) {
-            this.properties = new DynamoDbMapperTableModel.Properties.Immutable<T>(annotations);
-            this.map = Collections.unmodifiableMap(map);
-        }
-
-        DynamoDbMapperTableModel.Properties<T> properties() {
-            return this.properties;
-        }
-
-        Map<String, Bean<T, Object>> map() {
-            return this.map;
-        }
-    }
-
-    /**
-     * Holds the reflection bean properties for a given property.
-     */
-    static final class Bean<T, V> {
-        private final DynamoDbMapperFieldModel.Properties<V> properties;
-        private final ConvertibleType<V> type;
-        private final Reflect<T, V> reflect;
-
-        private Bean(FieldMap<V> annotations, Reflect<T, V> reflect, Method getter) {
-            this.properties = new DynamoDbMapperFieldModel.Properties.Immutable<V>(annotations);
-            this.type = ConvertibleType.<V>of(getter, annotations);
-            this.reflect = reflect;
-        }
-
-        DynamoDbMapperFieldModel.Properties<V> properties() {
-            return this.properties;
-        }
-
-        ConvertibleType<V> type() {
-            return this.type;
-        }
-
-        Reflect<T, V> reflect() {
-            return this.reflect;
-        }
-    }
-
-    /**
-     * Get/set reflection operations.
-     */
-    static final class MethodReflect<T, V> implements Reflect<T, V> {
-        private final Method getter;
-        private final Method setter;
-
-        private MethodReflect(Method getter) {
-            this.setter = setterOf(getter);
-            this.getter = getter;
-        }
-
-        static Method setterOf(Method getter) {
-            try {
-                final String name = "set" + getter.getName().replaceFirst("^(get|is)", "");
-                return getter.getDeclaringClass().getMethod(name, getter.getReturnType());
-            } catch (NoSuchMethodException | RuntimeException no) {
-                // Ignored or expected.
-            }
-            return null;
-        }
-
-        @Override
-        public V get(T object) {
-            try {
-                return (V) getter.invoke(object);
-            } catch (final Exception e) {
-                throw new DynamoDbMappingException("could not invoke " + getter + " on " + object.getClass(), e);
-            }
-        }
-
-        @Override
-        public void set(T object, V value) {
-            try {
-                setter.invoke(object, value);
-            } catch (final Exception e) {
-                throw new DynamoDbMappingException("could not invoke " + setter + " on " + object.getClass() +
-                                                   " with value " + value + " of type " +
-                                                   (value == null ? null : value.getClass()), e);
-            }
-        }
-    }
-
-    /**
-     * Get/set reflection operations with a declaring property.
-     */
-    static final class DeclaringReflect<T, V> implements Reflect<T, V> {
-        private final Reflect<T, V> reflect;
-        private final Reflect<T, T> declaring;
-        private final Class<T> targetType;
-
-        private DeclaringReflect(Method getter, Reflect<T, T> declaring, Class<T> targetType) {
-            this.reflect = new MethodReflect<T, V>(getter);
-            this.declaring = declaring;
-            this.targetType = targetType;
-        }
-
-        static <T> T newInstance(Class<T> targetType) {
-            try {
-                return targetType.newInstance();
-            } catch (final Exception e) {
-                throw new DynamoDbMappingException("could not instantiate " + targetType, e);
-            }
-        }
-
-        @Override
-        public V get(T object) {
-            final T declaringObject = declaring.get(object);
-            if (declaringObject == null) {
-                return null;
-            }
-            return reflect.get(declaringObject);
-        }
-
-        @Override
-        public void set(T object, V value) {
-            T declaringObject = declaring.get(object);
-            if (declaringObject == null) {
-                declaringObject = newInstance(targetType);
-                declaring.set(object, declaringObject);
-            }
-            reflect.set(declaringObject, value);
-        }
-    }
-
-    /**
-     * {@link Map} of {@link Bean}
-     */
-    static final class BeanMap<T, V> extends LinkedHashMap<String, Bean<T, V>> {
-        public static final long serialVersionUID = 1L;
-
-        private final Class<T> clazz;
-
-        BeanMap(Class<T> clazz, boolean inherited) {
-            this.clazz = clazz;
-            putAll(clazz, inherited);
-        }
-
-        private void putAll(Class<T> clazz, boolean inherited) {
-            for (final Method method : clazz.getMethods()) {
-                if (canMap(method, inherited)) {
-                    final FieldMap<V> annotations = StandardAnnotationMaps.<V>of(method, null);
-                    if (!annotations.ignored()) {
-                        final Reflect<T, V> reflect = new MethodReflect<T, V>(method);
-                        putOrFlatten(annotations, reflect, method);
-                    }
-                }
-            }
-        }
-
-        private void putOrFlatten(FieldMap<V> annotations, Reflect<T, V> reflect, Method getter) {
-            if (annotations.flattened()) {
-                flatten((Class<T>) annotations.targetType(), annotations.attributes(), (Reflect<T, T>) reflect);
-            } else {
-                final Bean<T, V> bean = new Bean<T, V>(annotations, reflect, getter);
-                if (put(bean.properties().attributeName(), bean) != null) {
-                    throw new DynamoDbMappingException("duplicate attribute name");
-                }
-            }
-        }
-
-        private void flatten(Class<T> targetType, Map<String, String> attributes, Reflect<T, T> declaring) {
-            for (final Method method : targetType.getMethods()) {
-                if (canMap(method, true)) {
-                    String name = fieldNameOf(method);
-                    name = attributes.remove(name);
-                    if (name == null) {
-                        continue;
-                    }
-                    final FieldMap<V> annotations = StandardAnnotationMaps.of(method, name);
-                    if (!annotations.ignored()) {
-                        final Reflect<T, V> reflect = new DeclaringReflect<T, V>(method, declaring, targetType);
-                        putOrFlatten(annotations, reflect, method);
-                    }
-                }
-            }
-            if (!attributes.isEmpty()) { //<- this should be empty by now
-                throw new DynamoDbMappingException("contains unknown flattened attribute(s): " + attributes);
-            }
-        }
-
-        private boolean canMap(Method method, boolean inherited) {
-            if (method.getName().matches("^(get|is).+") == false) {
-                return false;
-            } else if (method.getParameterTypes().length != 0) {
-                return false;
-            } else if (method.isBridge() || method.isSynthetic()) {
-                return false;
-            } else if (method.getDeclaringClass() == Object.class) {
-                return false;
-            } else if (!inherited && method.getDeclaringClass() != this.clazz &&
-                       StandardAnnotationMaps.of(method.getDeclaringClass()).attributeType() == null) {
-                return false;
-            } else {
-                return true;
-            }
-        }
-    }
-
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/StandardModelFactories.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/StandardModelFactories.java
deleted file mode 100644
index bc5d9e8d08a1..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/StandardModelFactories.java
+++ /dev/null
@@ -1,801 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-import static java.util.stream.Collectors.toList;
-import static software.amazon.awssdk.services.dynamodb.datamodeling.StandardTypeConverters.Scalar.BOOLEAN;
-import static software.amazon.awssdk.services.dynamodb.datamodeling.StandardTypeConverters.Scalar.DEFAULT;
-import static software.amazon.awssdk.services.dynamodb.datamodeling.StandardTypeConverters.Scalar.STRING;
-import static software.amazon.awssdk.services.dynamodb.datamodeling.StandardTypeConverters.Vector.LIST;
-import static software.amazon.awssdk.services.dynamodb.datamodeling.StandardTypeConverters.Vector.MAP;
-import static software.amazon.awssdk.services.dynamodb.datamodeling.StandardTypeConverters.Vector.SET;
-import static software.amazon.awssdk.services.dynamodb.model.ScalarAttributeType.B;
-import static software.amazon.awssdk.services.dynamodb.model.ScalarAttributeType.N;
-import static software.amazon.awssdk.services.dynamodb.model.ScalarAttributeType.S;
-
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import software.amazon.awssdk.annotations.SdkInternalApi;
-import software.amazon.awssdk.core.SdkBytes;
-import software.amazon.awssdk.services.dynamodb.ImmutableObjectUtils;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMapperFieldModel.DynamoDbAttributeType;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMapperFieldModel.Reflect;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMapperModelFactory.TableFactory;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbTypeConverter.AbstractConverter;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbTypeConverter.DelegateConverter;
-import software.amazon.awssdk.services.dynamodb.datamodeling.StandardBeanProperties.Bean;
-import software.amazon.awssdk.services.dynamodb.datamodeling.StandardBeanProperties.Beans;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-
-/**
- * Pre-defined strategies for mapping between Java types and DynamoDB types.
- */
-@SdkInternalApi
-final class StandardModelFactories {
-
-    private static final Logger log = LoggerFactory.getLogger(StandardModelFactories.class);
-
-    /**
-     * Creates the standard {@link DynamoDbMapperModelFactory} factory.
-     */
-    static DynamoDbMapperModelFactory of(S3Link.Factory s3Links) {
-        return new StandardModelFactory(s3Links);
-    }
-
-    /**
-     * Creates a new set of conversion rules based on the configuration.
-     */
-    private static <T> RuleFactory<T> rulesOf(DynamoDbMapperConfig config, S3Link.Factory s3Links,
-                                              DynamoDbMapperModelFactory models) {
-        final boolean ver1 = (config.getConversionSchema() == ConversionSchemas.V1);
-        final boolean ver2 = (config.getConversionSchema() == ConversionSchemas.V2);
-        final boolean v2Compatible = (config.getConversionSchema() == ConversionSchemas.V2_COMPATIBLE);
-
-        final DynamoDbTypeConverterFactory.Builder scalars = config.getTypeConverterFactory().override();
-        scalars.with(String.class, S3Link.class, s3Links);
-
-        final Rules<T> factory = new Rules<T>(scalars.build());
-        factory.add(factory.new NativeType(!ver1));
-        factory.add(factory.new V2CompatibleBool(v2Compatible));
-        factory.add(factory.new NativeBool(ver2));
-        factory.add(factory.new StringScalar(true));
-        factory.add(factory.new NumberScalar(true));
-        factory.add(factory.new BinaryScalar(true));
-        factory.add(factory.new NativeBoolSet(ver2));
-        factory.add(factory.new StringScalarSet(true));
-        factory.add(factory.new NumberScalarSet(true));
-        factory.add(factory.new BinaryScalarSet(true));
-        factory.add(factory.new ObjectSet(ver2));
-        factory.add(factory.new ObjectStringSet(!ver2));
-        factory.add(factory.new ObjectList(!ver1));
-        factory.add(factory.new ObjectMap(!ver1));
-        factory.add(factory.new ObjectDocumentMap(!ver1, models, config));
-        return factory;
-    }
-
-    /**
-     * Attribute value conversion.
-     */
-    interface Rule<T> {
-        boolean isAssignableFrom(ConvertibleType<?> type);
-
-        DynamoDbTypeConverter<AttributeValue, T> newConverter(ConvertibleType<T> type);
-
-        DynamoDbAttributeType getAttributeType();
-    }
-
-    /**
-     * Attribute value conversion factory.
-     */
-    interface RuleFactory<T> {
-        Rule<T> getRule(ConvertibleType<T> type);
-    }
-
-    /**
-     * {@link TableFactory} mapped by {@link ConversionSchema}.
-     */
-    private static final class StandardModelFactory implements DynamoDbMapperModelFactory {
-        private final ConcurrentMap<ConversionSchema, TableFactory> cache;
-        private final S3Link.Factory s3Links;
-
-        private StandardModelFactory(S3Link.Factory s3Links) {
-            this.cache = new ConcurrentHashMap<ConversionSchema, TableFactory>();
-            this.s3Links = s3Links;
-        }
-
-        @Override
-        public TableFactory getTableFactory(DynamoDbMapperConfig config) {
-            final ConversionSchema schema = config.getConversionSchema();
-            if (!cache.containsKey(schema)) {
-                RuleFactory<Object> rules = rulesOf(config, s3Links, this);
-                rules = new ConversionSchemas.ItemConverterRuleFactory<Object>(config, s3Links, rules);
-                cache.putIfAbsent(schema, new StandardTableFactory(rules));
-            }
-            return cache.get(schema);
-        }
-    }
-
-    /**
-     * {@link DynamoDbMapperTableModel} mapped by the clazz.
-     */
-    private static final class StandardTableFactory implements TableFactory {
-        private final ConcurrentMap<Class<?>, DynamoDbMapperTableModel<?>> cache;
-        private final RuleFactory<Object> rules;
-
-        private StandardTableFactory(RuleFactory<Object> rules) {
-            this.cache = new ConcurrentHashMap<Class<?>, DynamoDbMapperTableModel<?>>();
-            this.rules = rules;
-        }
-
-        @Override
-        @SuppressWarnings("unchecked")
-        public <T> DynamoDbMapperTableModel<T> getTable(Class<T> clazz) {
-            if (!this.cache.containsKey(clazz)) {
-                this.cache.putIfAbsent(clazz, new TableBuilder<T>(clazz, rules).build());
-            }
-            return (DynamoDbMapperTableModel<T>) this.cache.get(clazz);
-        }
-    }
-
-    /**
-     * {@link DynamoDbMapperTableModel} builder.
-     */
-    private static final class TableBuilder<T> extends DynamoDbMapperTableModel.Builder<T> {
-        private TableBuilder(Class<T> clazz, Beans<T> beans, RuleFactory<Object> rules) {
-            super(clazz, beans.properties());
-            for (final Bean<T, Object> bean : beans.map().values()) {
-                try {
-                    with(new FieldBuilder<T, Object>(clazz, bean, rules.getRule(bean.type())).build());
-                } catch (final RuntimeException e) {
-                    throw new DynamoDbMappingException(String.format(
-                            "%s[%s] could not be mapped for type %s",
-                            clazz.getSimpleName(), bean.properties().attributeName(), bean.type()
-                                                                    ), e);
-                }
-            }
-        }
-
-        private TableBuilder(Class<T> clazz, RuleFactory<Object> rules) {
-            this(clazz, StandardBeanProperties.<T>of(clazz), rules);
-        }
-    }
-
-    /**
-     * {@link DynamoDbMapperFieldModel} builder.
-     */
-    private static final class FieldBuilder<T, V> extends DynamoDbMapperFieldModel.Builder<T, V> {
-        private FieldBuilder(Class<T> clazz, Bean<T, V> bean, Rule<V> rule) {
-            super(clazz, bean.properties());
-            if (bean.type().attributeType() != null) {
-                with(bean.type().attributeType());
-            } else {
-                with(rule.getAttributeType());
-            }
-            with(rule.newConverter(bean.type()));
-            with(bean.reflect());
-        }
-    }
-
-    /**
-     * Groups the conversion rules to be evaluated.
-     */
-    private static final class Rules<T> implements RuleFactory<T> {
-        private final Set<Rule<T>> rules = new LinkedHashSet<Rule<T>>();
-        private final DynamoDbTypeConverterFactory scalars;
-
-        private Rules(DynamoDbTypeConverterFactory scalars) {
-            this.scalars = scalars;
-        }
-
-        @SuppressWarnings("unchecked")
-        private void add(Rule<?> rule) {
-            this.rules.add((Rule<T>) rule);
-        }
-
-        @Override
-        public Rule<T> getRule(ConvertibleType<T> type) {
-            for (final Rule<T> rule : rules) {
-                if (rule.isAssignableFrom(type)) {
-                    return rule;
-                }
-            }
-            return new NotSupported();
-        }
-
-        /**
-         * Gets the scalar converter for the given source and target types.
-         */
-        private <S> DynamoDbTypeConverter<S, T> getConverter(Class<S> sourceType, ConvertibleType<T> type) {
-            return scalars.getConverter(sourceType, type.targetType());
-        }
-
-        /**
-         * Gets the nested converter for the given conversion type.
-         * Also wraps the resulting converter with a nullable converter.
-         */
-        private DynamoDbTypeConverter<AttributeValue, T> getConverter(ConvertibleType<T> type) {
-            return new DelegateConverter<AttributeValue, T>(getRule(type).newConverter(type)) {
-                public AttributeValue convert(T o) {
-                    return o == null ? AttributeValue.builder().nul(true).build() : super.convert(o);
-                }
-            };
-        }
-
-        /**
-         * Native {@link AttributeValue} conversion.
-         */
-        private class NativeType extends AbstractRule<AttributeValue, T> {
-            private NativeType(boolean supported) {
-                super(DynamoDbAttributeType.NULL, supported);
-            }
-
-            @Override
-            public boolean isAssignableFrom(ConvertibleType<?> type) {
-                return super.supported && type.is(AttributeValue.class);
-            }
-
-            @Override
-            public DynamoDbTypeConverter<AttributeValue, T> newConverter(ConvertibleType<T> type) {
-                return joinAll(type.<AttributeValue>typeConverter());
-            }
-
-            @Override
-            public AttributeValue get(AttributeValue o) {
-                return o;
-            }
-
-            @Override
-            public void set(AttributeValue value, AttributeValue o) {
-                ImmutableObjectUtils.setObjectMember(value, "s", o.s());
-                ImmutableObjectUtils.setObjectMember(value, "n", o.n());
-                ImmutableObjectUtils.setObjectMember(value, "b", o.b());
-                ImmutableObjectUtils.setObjectMember(value, "ss", o.ss());
-                ImmutableObjectUtils.setObjectMember(value, "ns", o.ns());
-                ImmutableObjectUtils.setObjectMember(value, "bs", o.bs());
-                ImmutableObjectUtils.setObjectMember(value, "bool", o.bool());
-                ImmutableObjectUtils.setObjectMember(value, "l", o.l());
-                ImmutableObjectUtils.setObjectMember(value, "m", o.m());
-                ImmutableObjectUtils.setObjectMember(value, "nul", o.nul());
-            }
-        }
-
-        /**
-         * {@code S} conversion
-         */
-        private class StringScalar extends AbstractRule<String, T> {
-            private StringScalar(boolean supported) {
-                super(DynamoDbAttributeType.S, supported);
-            }
-
-            @Override
-            public boolean isAssignableFrom(ConvertibleType<?> type) {
-                return super.isAssignableFrom(type) && (type.attributeType() != null || type.is(S));
-            }
-
-            @Override
-            public DynamoDbTypeConverter<AttributeValue, T> newConverter(ConvertibleType<T> type) {
-                return joinAll(getConverter(String.class, type), type.<String>typeConverter());
-            }
-
-            @Override
-            public String get(AttributeValue value) {
-                return value.s();
-            }
-
-            @Override
-            public void set(AttributeValue value, String o) {
-                ImmutableObjectUtils.setObjectMember(value, "s", o);
-            }
-
-            @Override
-            public AttributeValue convert(String o) {
-                return o.length() == 0 ? null : super.convert(o);
-            }
-        }
-
-        /**
-         * {@code N} conversion
-         */
-        private class NumberScalar extends AbstractRule<String, T> {
-            private NumberScalar(boolean supported) {
-                super(DynamoDbAttributeType.N, supported);
-            }
-
-            @Override
-            public boolean isAssignableFrom(ConvertibleType<?> type) {
-                return super.isAssignableFrom(type) && (type.attributeType() != null || type.is(N));
-            }
-
-            @Override
-            public DynamoDbTypeConverter<AttributeValue, T> newConverter(ConvertibleType<T> type) {
-                return joinAll(getConverter(String.class, type), type.<String>typeConverter());
-            }
-
-            @Override
-            public String get(AttributeValue value) {
-                return value.n();
-            }
-
-            @Override
-            public void set(AttributeValue value, String o) {
-                ImmutableObjectUtils.setObjectMember(value, "n", o);
-                //value.setN(o);
-            }
-        }
-
-        /**
-         * {@code B} conversion
-         */
-        private class BinaryScalar extends AbstractRule<ByteBuffer, T> {
-            private BinaryScalar(boolean supported) {
-                super(DynamoDbAttributeType.B, supported);
-            }
-
-            @Override
-            public boolean isAssignableFrom(ConvertibleType<?> type) {
-                return super.isAssignableFrom(type) && (type.attributeType() != null || type.is(B));
-            }
-
-            @Override
-            public DynamoDbTypeConverter<AttributeValue, T> newConverter(ConvertibleType<T> type) {
-                return joinAll(getConverter(ByteBuffer.class, type), type.<ByteBuffer>typeConverter());
-            }
-
-            @Override
-            public ByteBuffer get(AttributeValue value) {
-                return value.b() == null ? null : value.b().asByteBuffer();
-            }
-
-            @Override
-            public void set(AttributeValue value, ByteBuffer o) {
-                ImmutableObjectUtils.setObjectMember(value, "b", SdkBytes.fromByteBuffer(o));
-                //value.setB(o);
-            }
-        }
-
-        /**
-         * {@code SS} conversion
-         */
-        private class StringScalarSet extends AbstractRule<List<String>, Collection<T>> {
-            private StringScalarSet(boolean supported) {
-                super(DynamoDbAttributeType.SS, supported);
-            }
-
-            @Override
-            public boolean isAssignableFrom(ConvertibleType<?> type) {
-                return super.isAssignableFrom(type) && (type.attributeType() != null || type.is(S, SET));
-            }
-
-            @Override
-            public DynamoDbTypeConverter<AttributeValue, Collection<T>> newConverter(ConvertibleType<Collection<T>> type) {
-                return joinAll(SET.join(getConverter(String.class, type.<T>param(0))), type.<List<String>>typeConverter());
-            }
-
-            @Override
-            public List<String> get(AttributeValue value) {
-                return value.ss();
-            }
-
-            @Override
-            public void set(AttributeValue value, List<String> o) {
-                ImmutableObjectUtils.setObjectMember(value, "ss", o);
-                //value.setSS(o);
-            }
-        }
-
-        /**
-         * {@code NS} conversion
-         */
-        private class NumberScalarSet extends AbstractRule<List<String>, Collection<T>> {
-            private NumberScalarSet(boolean supported) {
-                super(DynamoDbAttributeType.NS, supported);
-            }
-
-            @Override
-            public boolean isAssignableFrom(ConvertibleType<?> type) {
-                return super.isAssignableFrom(type) && (type.attributeType() != null || type.is(N, SET));
-            }
-
-            @Override
-            public DynamoDbTypeConverter<AttributeValue, Collection<T>> newConverter(ConvertibleType<Collection<T>> type) {
-                return joinAll(SET.join(getConverter(String.class, type.<T>param(0))), type.<List<String>>typeConverter());
-            }
-
-            @Override
-            public List<String> get(AttributeValue value) {
-                return value.ns();
-            }
-
-            @Override
-            public void set(AttributeValue value, List<String> o) {
-                ImmutableObjectUtils.setObjectMember(value, "ns", o);
-                //value.setNS(o);
-            }
-        }
-
-        /**
-         * {@code BS} conversion
-         */
-        private class BinaryScalarSet extends AbstractRule<List<ByteBuffer>, Collection<T>> {
-            private BinaryScalarSet(boolean supported) {
-                super(DynamoDbAttributeType.BS, supported);
-            }
-
-            @Override
-            public boolean isAssignableFrom(ConvertibleType<?> type) {
-                return super.isAssignableFrom(type) && (type.attributeType() != null || type.is(B, SET));
-            }
-
-            @Override
-            public DynamoDbTypeConverter<AttributeValue, Collection<T>> newConverter(ConvertibleType<Collection<T>> type) {
-                return joinAll(SET.join(getConverter(ByteBuffer.class, type.param(0))), type.typeConverter());
-            }
-
-            @Override
-            public List<ByteBuffer> get(AttributeValue value) {
-                return Optional.ofNullable(value.bs())
-                               .map(bs -> bs.stream()
-                                            .map(SdkBytes::asByteBuffer)
-                                            .collect(toList()))
-                               .orElse(null);
-            }
-
-            @Override
-            public void set(AttributeValue value, List<ByteBuffer> o) {
-                ImmutableObjectUtils.setObjectMember(value, "bs", o.stream().map(SdkBytes::fromByteBuffer).collect(toList()));
-                //value.setBS(o);
-            }
-        }
-
-        /**
-         * {@code SS} conversion
-         */
-        private class ObjectStringSet extends StringScalarSet {
-            private ObjectStringSet(boolean supported) {
-                super(supported);
-            }
-
-            @Override
-            public boolean isAssignableFrom(ConvertibleType<?> type) {
-                return type.attributeType() == null && super.supported && type.is(SET);
-            }
-
-            @Override
-            public DynamoDbTypeConverter<AttributeValue, Collection<T>> newConverter(ConvertibleType<Collection<T>> type) {
-                log.warn("Marshaling a set of non-String objects to a DynamoDB "
-                         + "StringSet. You won't be able to read these objects back "
-                         + "out of DynamoDB unless you REALLY know what you're doing: "
-                         + "it's probably a bug. If you DO know what you're doing feel"
-                         + "free to ignore this warning, but consider using a custom "
-                         + "marshaler for this instead.");
-                return joinAll(SET.join(scalars.getConverter(String.class, DEFAULT.type())), type.typeConverter());
-            }
-        }
-
-        /**
-         * Native boolean conversion.
-         */
-        private class NativeBool extends AbstractRule<Boolean, T> {
-            private NativeBool(boolean supported) {
-                super(DynamoDbAttributeType.BOOL, supported);
-            }
-
-            @Override
-            public boolean isAssignableFrom(ConvertibleType<?> type) {
-                return super.isAssignableFrom(type) && type.is(BOOLEAN);
-            }
-
-            @Override
-            public DynamoDbTypeConverter<AttributeValue, T> newConverter(ConvertibleType<T> type) {
-                return joinAll(getConverter(Boolean.class, type), type.typeConverter());
-            }
-
-            @Override
-            public Boolean get(AttributeValue o) {
-                return o.bool();
-            }
-
-            @Override
-            public void set(AttributeValue o, Boolean value) {
-                ImmutableObjectUtils.setObjectMember(o, "bool", value);
-                //o.setBOOL(value);
-            }
-
-            @Override
-            public Boolean unconvert(AttributeValue o) {
-                if (o.bool() == null && o.n() != null) {
-                    return BOOLEAN.<Boolean>convert(o.n());
-                }
-                return super.unconvert(o);
-            }
-        }
-
-        /**
-         * Native boolean conversion.
-         */
-        private class V2CompatibleBool extends AbstractRule<String, T> {
-            private V2CompatibleBool(boolean supported) {
-                super(DynamoDbAttributeType.N, supported);
-            }
-
-            @Override
-            public boolean isAssignableFrom(ConvertibleType<?> type) {
-                return super.isAssignableFrom(type) && type.is(BOOLEAN);
-            }
-
-            @Override
-            public DynamoDbTypeConverter<AttributeValue, T> newConverter(ConvertibleType<T> type) {
-                return joinAll(getConverter(String.class, type), type.<String>typeConverter());
-            }
-
-            /**
-             * For V2 Compatible schema we support loading booleans from a numeric attribute value (0/1) or the native boolean
-             * type.
-             */
-            @Override
-            public String get(AttributeValue o) {
-                if (o.bool() != null) {
-                    // Handle native bools, transform to expected numeric representation.
-                    return o.bool() ? "1" : "0";
-                }
-                return o.n();
-            }
-
-            /**
-             * For the V2 compatible schema we save as a numeric attribute value unless overridden by {@link
-             * DynamoDbNativeBoolean} or {@link DynamoDbTyped}.
-             */
-            @Override
-            public void set(AttributeValue o, String value) {
-                ImmutableObjectUtils.setObjectMember(o, "n", value);
-                //o.setN(value);
-            }
-        }
-
-        /**
-         * Any {@link Set} conversions.
-         */
-        private class ObjectSet extends AbstractRule<List<AttributeValue>, Collection<T>> {
-            private ObjectSet(boolean supported) {
-                super(DynamoDbAttributeType.L, supported);
-            }
-
-            @Override
-            public boolean isAssignableFrom(ConvertibleType<?> type) {
-                return super.isAssignableFrom(type) && type.param(0) != null && type.is(SET);
-            }
-
-            @Override
-            public DynamoDbTypeConverter<AttributeValue, Collection<T>> newConverter(ConvertibleType<Collection<T>> type) {
-                return joinAll(SET.join(getConverter(type.<T>param(0))), type.<List<AttributeValue>>typeConverter());
-            }
-
-            @Override
-            public List<AttributeValue> get(AttributeValue value) {
-                return value.l();
-            }
-
-            @Override
-            public void set(AttributeValue value, List<AttributeValue> o) {
-                ImmutableObjectUtils.setObjectMember(value, "l", o);
-                //value.setL(o);
-            }
-        }
-
-        /**
-         * Native bool {@link Set} conversions.
-         */
-        private class NativeBoolSet extends ObjectSet {
-            private NativeBoolSet(boolean supported) {
-                super(supported);
-            }
-
-            @Override
-            public boolean isAssignableFrom(ConvertibleType<?> type) {
-                return super.isAssignableFrom(type) && type.param(0).is(BOOLEAN);
-            }
-
-            @Override
-            public List<AttributeValue> unconvert(AttributeValue o) {
-                if (o.l() == null && o.ns() != null) {
-                    return LIST.convert(o.ns(), new NativeBool(true).join(scalars.getConverter(Boolean.class, String.class)));
-                }
-                return super.unconvert(o);
-            }
-        }
-
-        /**
-         * Any {@link List} conversions.
-         */
-        private class ObjectList extends AbstractRule<List<AttributeValue>, List<T>> {
-            private ObjectList(boolean supported) {
-                super(DynamoDbAttributeType.L, supported);
-            }
-
-            @Override
-            public boolean isAssignableFrom(ConvertibleType<?> type) {
-                return super.isAssignableFrom(type) && type.param(0) != null && type.is(LIST);
-            }
-
-            @Override
-            public DynamoDbTypeConverter<AttributeValue, List<T>> newConverter(ConvertibleType<List<T>> type) {
-                return joinAll(LIST.join(getConverter(type.<T>param(0))), type.<List<AttributeValue>>typeConverter());
-            }
-
-            @Override
-            public List<AttributeValue> get(AttributeValue value) {
-                return value.l();
-            }
-
-            @Override
-            public void set(AttributeValue value, List<AttributeValue> o) {
-                ImmutableObjectUtils.setObjectMember(value, "l", o);
-                //value.setL(o);
-            }
-        }
-
-        /**
-         * Any {@link Map} conversions.
-         */
-        private class ObjectMap extends AbstractRule<Map<String, AttributeValue>, Map<String, T>> {
-            private ObjectMap(boolean supported) {
-                super(DynamoDbAttributeType.M, supported);
-            }
-
-            @Override
-            public boolean isAssignableFrom(ConvertibleType<?> type) {
-                return super.isAssignableFrom(type) && type.param(1) != null && type.is(MAP) && type.param(0).is(STRING);
-            }
-
-            @Override
-            public DynamoDbTypeConverter<AttributeValue, Map<String, T>> newConverter(ConvertibleType<Map<String, T>> type) {
-                return joinAll(
-                        MAP.<String, AttributeValue, T>join(getConverter(type.<T>param(1))),
-                        type.<Map<String, AttributeValue>>typeConverter()
-                              );
-            }
-
-            @Override
-            public Map<String, AttributeValue> get(AttributeValue value) {
-                return value.m();
-            }
-
-            @Override
-            public void set(AttributeValue value, Map<String, AttributeValue> o) {
-                ImmutableObjectUtils.setObjectMember(value, "m", o);
-                //value.setM(o);
-            }
-        }
-
-        /**
-         * All object conversions.
-         */
-        private class ObjectDocumentMap extends AbstractRule<Map<String, AttributeValue>, T> {
-            private final DynamoDbMapperModelFactory models;
-            private final DynamoDbMapperConfig config;
-
-            private ObjectDocumentMap(boolean supported, DynamoDbMapperModelFactory models, DynamoDbMapperConfig config) {
-                super(DynamoDbAttributeType.M, supported);
-                this.models = models;
-                this.config = config;
-            }
-
-            @Override
-            public boolean isAssignableFrom(ConvertibleType<?> type) {
-                return type.attributeType() == getAttributeType() && super.supported && !type.is(MAP);
-            }
-
-            @Override
-            public DynamoDbTypeConverter<AttributeValue, T> newConverter(final ConvertibleType<T> type) {
-                return joinAll(new DynamoDbTypeConverter<Map<String, AttributeValue>, T>() {
-                    public Map<String, AttributeValue> convert(final T o) {
-                        return models.getTableFactory(config).getTable(type.targetType()).convert(o);
-                    }
-
-                    public T unconvert(final Map<String, AttributeValue> o) {
-                        return models.getTableFactory(config).getTable(type.targetType()).unconvert(o);
-                    }
-                }, type.<Map<String, AttributeValue>>typeConverter());
-            }
-
-            @Override
-            public Map<String, AttributeValue> get(AttributeValue value) {
-                return value.m();
-            }
-
-            @Override
-            public void set(AttributeValue value, Map<String, AttributeValue> o) {
-                ImmutableObjectUtils.setObjectMember(value, "m", o);
-                //value.setM(o);
-            }
-        }
-
-        /**
-         * Default conversion when no match could be determined.
-         */
-        private class NotSupported extends AbstractRule<T, T> {
-            private NotSupported() {
-                super(DynamoDbAttributeType.NULL, false);
-            }
-
-            @Override
-            public DynamoDbTypeConverter<AttributeValue, T> newConverter(ConvertibleType<T> type) {
-                return this;
-            }
-
-            @Override
-            public T get(AttributeValue value) {
-                throw new DynamoDbMappingException("not supported; requires @DynamoDBTyped or @DynamoDBTypeConverted");
-            }
-
-            @Override
-            public void set(AttributeValue value, T o) {
-                throw new DynamoDbMappingException("not supported; requires @DynamoDBTyped or @DynamoDBTypeConverted");
-            }
-        }
-    }
-
-    /**
-     * Basic attribute value conversion functions.
-     */
-    private abstract static class AbstractRule<S, T> extends AbstractConverter<AttributeValue, S>
-            implements Reflect<AttributeValue, S>, Rule<T> {
-        protected final DynamoDbAttributeType attributeType;
-        protected final boolean supported;
-
-        protected AbstractRule(DynamoDbAttributeType attributeType, boolean supported) {
-            this.attributeType = attributeType;
-            this.supported = supported;
-        }
-
-        @Override
-        public boolean isAssignableFrom(ConvertibleType<?> type) {
-            return type.attributeType() == null ? supported : type.attributeType() == attributeType;
-        }
-
-        @Override
-        public DynamoDbAttributeType getAttributeType() {
-            return this.attributeType;
-        }
-
-        @Override
-        public AttributeValue convert(final S o) {
-            final AttributeValue value = AttributeValue.builder().build();
-            set(value, o);
-            return value;
-        }
-
-        @Override
-        public S unconvert(final AttributeValue o) {
-            final S value = get(o);
-            if (value == null && o.nul() == null) {
-                throw new DynamoDbMappingException("expected " + attributeType + " in value " + o);
-            }
-            return value;
-        }
-    }
-
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/StandardModelFactoriesOverrideTest.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/StandardModelFactoriesOverrideTest.java
deleted file mode 100644
index 8358e9404815..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/StandardModelFactoriesOverrideTest.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-import java.lang.reflect.Method;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-
-public class StandardModelFactoriesOverrideTest extends StandardModelFactoriesV2Test {
-
-    private final DynamoDbMapperConfig config = new DynamoDbMapperConfig.Builder()
-            .withTypeConverterFactory(DynamoDbMapperConfig.DEFAULT.getTypeConverterFactory())
-            .withConversionSchema(ConversionSchemas.v2Builder("V2Override").build())
-            .build();
-
-    private final DynamoDbMapperModelFactory factory = StandardModelFactories.of(S3Link.Factory.of(null));
-    private final DynamoDbMapperModelFactory.TableFactory models = factory.getTableFactory(config);
-
-    @Override
-    protected <T> AttributeValue convert(Class<T> clazz, Method getter, Object value) {
-        final StandardAnnotationMaps.FieldMap<Object> map = StandardAnnotationMaps.of(getter, null);
-        return models.getTable(clazz).field(map.attributeName()).convert(value);
-    }
-
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/StandardModelFactoriesTest.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/StandardModelFactoriesTest.java
deleted file mode 100644
index 88da788e305e..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/StandardModelFactoriesTest.java
+++ /dev/null
@@ -1,2053 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import java.util.Calendar;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.TimeZone;
-import java.util.UUID;
-import java.util.concurrent.TimeUnit;
-import org.junit.Test;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMapperFieldModel.DynamoDbAttributeType;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-import software.amazon.awssdk.services.dynamodb.model.KeyType;
-import software.amazon.awssdk.services.dynamodb.model.ScalarAttributeType;
-import software.amazon.awssdk.services.dynamodb.pojos.AutoKeyAndVal;
-import software.amazon.awssdk.services.dynamodb.pojos.Currency;
-import software.amazon.awssdk.services.dynamodb.pojos.DateRange;
-import software.amazon.awssdk.services.dynamodb.pojos.KeyAndVal;
-
-/**
- * Unit tests for {@link DynamoDbMapperModelFactory.TableFactory}.
- */
-public class StandardModelFactoriesTest {
-
-    private static final DynamoDbMapperModelFactory factory = StandardModelFactories.of(S3Link.Factory.of(null));
-    private static final DynamoDbMapperModelFactory.TableFactory models = factory.getTableFactory(DynamoDbMapperConfig.DEFAULT);
-
-    @SuppressWarnings("unchecked")
-    private static <T> DynamoDbMapperTableModel<T> getTable(T object) {
-        return models.getTable((Class<T>) object.getClass());
-    }
-
-    /**
-     * Assert that the field key properties are correct.
-     */
-    private static <T, V> void assertFieldKeyType(KeyType keyType, DynamoDbMapperFieldModel<T, V> field,
-                                                  DynamoDbMapperTableModel<T> model) {
-        assertEquals(keyType, field.keyType());
-        if (keyType != null) {
-            if (keyType == KeyType.HASH) {
-                assertEquals(field, model.hashKey());
-            } else if (keyType == KeyType.RANGE) {
-                assertEquals(field, model.rangeKeyIfExists());
-                assertEquals(field, model.rangeKey());
-            }
-        }
-    }
-
-    /**
-     * Assert that the field contains the LSIs.
-     */
-    private static <T, V> void assertFieldGsiNames(List<String> names, KeyType keyType, DynamoDbMapperFieldModel<T, V> field,
-                                                   DynamoDbMapperTableModel<T> model) {
-        assertEquals(names == null ? 0 : names.size(), field.globalSecondaryIndexNames(keyType).size());
-        assertEquals(true, field.indexed());
-        if (names != null) {
-            for (final String name : names) {
-                assertEquals(true, field.globalSecondaryIndexNames(keyType).contains(name));
-                assertEquals(true, model.globalSecondaryIndex(name) != null);
-                assertEquals(true, !model.globalSecondaryIndexes().isEmpty());
-            }
-        }
-    }
-
-    /**
-     * Assert that the field contains the LSIs.
-     */
-    private static <T, V> void assertFieldLsiNames(List<String> names, DynamoDbMapperFieldModel<T, V> field,
-                                                   DynamoDbMapperTableModel<T> model) {
-        assertEquals(names == null ? 0 : names.size(), field.localSecondaryIndexNames().size());
-        assertEquals(true, field.indexed());
-        if (names != null) {
-            for (final String name : names) {
-                assertEquals(true, field.localSecondaryIndexNames().contains(name));
-                assertEquals(true, model.localSecondaryIndex(name) != null);
-                assertEquals(true, !model.localSecondaryIndexes().isEmpty());
-            }
-        }
-    }
-
-    /**
-     * Test mappings.
-     */
-    @Test
-    public void testHashAndRangeKey() {
-        final Object obj = new AutoKeyAndVal<String>() {
-            @DynamoDbHashKey(attributeName = "hk")
-            public String getKey() {
-                return super.getKey();
-            }
-
-            @DynamoDbRangeKey(attributeName = "rk")
-            public String getVal() {
-                return super.getVal();
-            }
-
-            public void setVal(final String val) {
-                super.setVal(val);
-            }
-        };
-        final DynamoDbMapperTableModel<Object> model = getTable(obj);
-        assertFieldKeyType(KeyType.HASH, model.field("hk"), model);
-        assertFieldKeyType(KeyType.RANGE, model.field("rk"), model);
-    }
-
-    /**
-     * Test mappings.
-     */
-    @Test(expected = DynamoDbMappingException.class)
-    public void testHashAndRangeKeyConflict() {
-        final Object obj = new AutoKeyAndVal<String>() {
-            @DynamoDbHashKey
-            @DynamoDbRangeKey
-            public String getKey() {
-                return super.getKey();
-            }
-        };
-        getTable(obj);
-    }
-
-    /**
-     * Test mappings.
-     */
-    @Test
-    public void testNamed() {
-        final Object obj = new AutoKeyAndVal<String>() {
-            @DynamoDbNamed("value")
-            public String getVal() {
-                return super.getVal();
-            }
-
-            public void setVal(final String val) {
-                super.setVal(val);
-            }
-        };
-        final DynamoDbMapperTableModel<Object> model = getTable(obj);
-        assertEquals(2, model.fields().size());
-        assertNotNull(model.field("key"));
-        assertNotNull(model.field("value"));
-    }
-
-    /**
-     * Test mappings.
-     */
-    @Test
-    public void testAttributeTypeAsNumber() {
-        final Object obj = new AutoKeyAndVal<String>() {
-            @DynamoDbTyped(DynamoDbAttributeType.N)
-            public String getVal() {
-                return super.getVal();
-            }
-
-            public void setVal(final String val) {
-                super.setVal(val);
-            }
-        };
-        final DynamoDbMapperTableModel<Object> model = getTable(obj);
-        final DynamoDbMapperFieldModel<Object, Object> val = model.field("val");
-        assertEquals(DynamoDbAttributeType.N, val.attributeType());
-    }
-
-    @Test
-    public void testAttributeTypeAsAttributeValueNumber() {
-        final Object obj = new AutoKeyAndVal<AttributeValue>() {
-            @DynamoDbTyped(DynamoDbAttributeType.N)
-            public AttributeValue getVal() {
-                return super.getVal();
-            }
-
-            public void setVal(final AttributeValue val) {
-                super.setVal(val);
-            }
-        };
-        final DynamoDbMapperTableModel<Object> model = getTable(obj);
-        final DynamoDbMapperFieldModel<Object, AttributeValue> val = model.field("val");
-        assertEquals(DynamoDbAttributeType.N, val.attributeType());
-        assertEquals("123", val.convert(AttributeValue.builder().n("123").build()).n());
-        assertEquals("123", val.unconvert(AttributeValue.builder().n("123").build()).n());
-    }
-
-    @Test
-    public void testAttributeTypeAsAttributeValueMap() {
-        final Object obj = new AutoKeyAndVal<AttributeValue>() {
-            @DynamoDbTyped(DynamoDbAttributeType.M)
-            public AttributeValue getVal() {
-                return super.getVal();
-            }
-
-            public void setVal(final AttributeValue val) {
-                super.setVal(val);
-            }
-        };
-        final DynamoDbMapperTableModel<Object> model = getTable(obj);
-        final DynamoDbMapperFieldModel<Object, AttributeValue> val = model.field("val");
-        assertEquals(DynamoDbAttributeType.M, val.attributeType());
-
-        Map<String, AttributeValue> map = new HashMap<String, AttributeValue>();
-        map.put("A", AttributeValue.builder().n("123").build());
-        map = Collections.unmodifiableMap(map);
-
-        assertEquals("123", val.convert(AttributeValue.builder().m(map).build()).m().get("A").n());
-        assertEquals("123", val.unconvert(AttributeValue.builder().m(map).build()).m().get("A").n());
-    }
-
-    /**
-     * Test mappings.
-     */
-    @Test
-    public void testScalarAttributeStringTimeZone() {
-        final Object obj = new AutoKeyAndVal<TimeZone>() {
-            @DynamoDbHashKey
-            public String getKey() {
-                return super.getKey();
-            }
-
-            @DynamoDbScalarAttribute(type = ScalarAttributeType.S)
-            public TimeZone getVal() {
-                return super.getVal();
-            }
-
-            public void setVal(final TimeZone val) {
-                super.setVal(val);
-            }
-        };
-        final DynamoDbMapperTableModel<Object> model = getTable(obj);
-        final DynamoDbMapperFieldModel<Object, TimeZone> val = model.field("val");
-        assertEquals(DynamoDbAttributeType.S, val.attributeType());
-        assertEquals("America/New_York", val.convert(TimeZone.getTimeZone("America/New_York")).s());
-        assertEquals("America/New_York", val.unconvert(AttributeValue.builder().s("America/New_York").build()).getID());
-    }
-
-    /**
-     * Test mappings.
-     */
-    @Test
-    public void testScalarAttributeStringLocale() {
-        final Object obj = new AutoKeyAndVal<Locale>() {
-            @DynamoDbHashKey
-            public String getKey() {
-                return super.getKey();
-            }
-
-            @DynamoDbScalarAttribute(type = ScalarAttributeType.S)
-            public Locale getVal() {
-                return super.getVal();
-            }
-
-            public void setVal(final Locale val) {
-                super.setVal(val);
-            }
-        };
-        final DynamoDbMapperTableModel<Object> model = getTable(obj);
-        final DynamoDbMapperFieldModel<Object, Locale> val = model.field("val");
-        assertEquals(DynamoDbAttributeType.S, val.attributeType());
-        assertEquals("en-CA", val.convert(new Locale("en", "CA")).s());
-        assertEquals("en-CA", val.unconvert(AttributeValue.builder().s("en-CA").build()).toString().replaceAll("_", "-"));
-    }
-
-    /**
-     * Test mappings.
-     */
-    @Test
-    public void testScalarAttributeBinaryUuid() {
-        final Object obj = new AutoKeyAndVal<UUID>() {
-            @DynamoDbHashKey
-            public String getKey() {
-                return super.getKey();
-            }
-
-            @DynamoDbScalarAttribute(type = ScalarAttributeType.B)
-            public UUID getVal() {
-                return super.getVal();
-            }
-
-            public void setVal(final UUID val) {
-                super.setVal(val);
-            }
-        };
-        final DynamoDbMapperTableModel<Object> model = getTable(obj);
-        assertEquals(DynamoDbAttributeType.B, model.field("val").attributeType());
-        final UUID val = UUID.randomUUID();
-        final AttributeValue converted = model.field("val").convert(val);
-        assertNotNull(converted.b());
-        assertEquals(val, model.field("val").unconvert(converted));
-    }
-
-    @Test
-    public void testScalarAttributeAttributeName() {
-        final Object obj = new AutoKeyAndVal<String>() {
-            @DynamoDbHashKey
-            public String getKey() {
-                return super.getKey();
-            }
-
-            @DynamoDbScalarAttribute(attributeName = "value", type = ScalarAttributeType.S)
-            public String getVal() {
-                return super.getVal();
-            }
-
-            public void setVal(final String val) {
-                super.setVal(val);
-            }
-        };
-        final DynamoDbMapperTableModel<Object> model = models.getTable((Class<Object>) obj.getClass());
-        final DynamoDbMapperFieldModel<Object, String> val = model.field("value");
-        assertEquals(DynamoDbAttributeType.S, val.attributeType());
-    }
-
-    /**
-     * Test mappings.
-     */
-    @Test
-    public void testIgnore() {
-        final Object obj = new AutoKeyAndVal<String>() {
-            private String ignore;
-
-            @DynamoDbAttribute(attributeName = "value")
-            public String getVal() {
-                return super.getVal();
-            }
-
-            public void setVal(final String val) {
-                super.setVal(val);
-            }
-
-            @DynamoDbIgnore
-            @DynamoDbAttribute(attributeName = "ignore")
-            public String getIgnore() {
-                return this.ignore;
-            }
-
-            public void setIgnore(final String ignore) {
-                this.ignore = ignore;
-            }
-        };
-        final DynamoDbMapperTableModel<Object> model = getTable(obj);
-        assertEquals(2, model.fields().size());
-        assertNotNull(model.field("key"));
-        assertNotNull(model.field("value"));
-    }
-
-    /**
-     * Test mappings.
-     */
-    @Test
-    public void testConvertedBool() {
-        final Object obj = new AutoKeyAndVal<Boolean>() {
-            @DynamoDbConvertedBool(DynamoDbConvertedBool.Format.Y_N)
-            public Boolean getVal() {
-                return super.getVal();
-            }
-
-            public void setVal(final Boolean val) {
-                super.setVal(val);
-            }
-        };
-        final DynamoDbMapperTableModel<Object> model = getTable(obj);
-        final DynamoDbMapperFieldModel<Object, Boolean> val = model.field("val");
-        assertEquals(DynamoDbAttributeType.S, val.attributeType());
-        assertEquals("Y", val.convert(Boolean.TRUE).s());
-        assertEquals(Boolean.TRUE, val.unconvert(AttributeValue.builder().s("Y").build()));
-        assertEquals("N", val.convert(Boolean.FALSE).s());
-        assertEquals(Boolean.FALSE, val.unconvert(AttributeValue.builder().s("N").build()));
-        assertEquals(null, val.convert(null));
-    }
-
-    /**
-     * Test mappings.
-     */
-    @Test
-    public void testAutoGeneratedHashKeyString() {
-        final Object obj = new AutoKeyAndVal<String>() {
-            @DynamoDbAttribute
-            public String getVal() {
-                return super.getVal();
-            }
-
-            public void setVal(final String val) {
-                super.setVal(val);
-            }
-        };
-        final DynamoDbMapperTableModel<Object> model = getTable(obj);
-        final DynamoDbMapperFieldModel<Object, Object> key = model.field("key");
-        assertFieldKeyType(KeyType.HASH, key, model);
-        assertEquals(DynamoDbAutoGenerateStrategy.CREATE, key.getGenerateStrategy());
-        assertNotNull(key.generate(null));
-        assertNotNull(key.generate(UUID.randomUUID().toString()));
-    }
-
-    /**
-     * Test mappings.
-     */
-    @Test
-    public void testAutoGeneratedRangeKeyUuid() {
-        final Object obj = new AutoKeyAndVal<UUID>() {
-            @DynamoDbRangeKey
-            @DynamoDbAutoGeneratedKey
-            public UUID getVal() {
-                return super.getVal();
-            }
-
-            public void setVal(final UUID val) {
-                super.setVal(val);
-            }
-        };
-        final DynamoDbMapperTableModel<Object> model = getTable(obj);
-        final DynamoDbMapperFieldModel<Object, Object> val = model.field("val");
-        assertFieldKeyType(KeyType.RANGE, val, model);
-        assertEquals(DynamoDbAutoGenerateStrategy.CREATE, val.getGenerateStrategy());
-        assertNotNull(val.generate(null));
-        assertNotNull(val.generate(UUID.randomUUID()));
-    }
-
-    /**
-     * Test mappings.
-     */
-    @Test(expected = DynamoDbMappingException.class)
-    public void testAutoGeneratedConflict() {
-        final Object obj = new AutoKeyAndVal<String>() {
-            @DynamoDbHashKey
-            @DynamoDbAutoGeneratedKey
-            @DynamoDbVersionAttribute
-            public String getKey() {
-                return super.getKey();
-            }
-        };
-        final DynamoDbMapperTableModel<Object> model = getTable(obj);
-    }
-
-    /**
-     * Test mappings.
-     */
-    @Test(expected = DynamoDbMappingException.class)
-    public void testAutoGeneratedVersionUuid() {
-        final Object obj = new AutoKeyAndVal<UUID>() {
-            @DynamoDbVersionAttribute
-            public UUID getVal() {
-                return super.getVal();
-            }
-
-            public void setVal(final UUID val) {
-                super.setVal(val);
-            }
-        };
-        final DynamoDbMapperTableModel<Object> model = getTable(obj);
-        final DynamoDbMapperFieldModel<Object, Object> val = model.field("val");
-        val.generate(null); //<- should fail
-    }
-
-    /**
-     * Test mappings.
-     */
-    @Test
-    public void testAutoGeneratedVersionBigInteger() {
-        final Object obj = new AutoKeyAndVal<BigInteger>() {
-            @DynamoDbVersionAttribute
-            public BigInteger getVal() {
-                return super.getVal();
-            }
-
-            public void setVal(final BigInteger val) {
-                super.setVal(val);
-            }
-        };
-        final DynamoDbMapperTableModel<Object> model = getTable(obj);
-        final DynamoDbMapperFieldModel<Object, Object> val = model.field("val");
-        assertEquals(true, val.versioned());
-        assertEquals(DynamoDbAutoGenerateStrategy.ALWAYS, val.getGenerateStrategy());
-        assertEquals(BigInteger.ONE, val.generate(null));
-        assertEquals(BigInteger.valueOf((int) 2), val.generate(BigInteger.ONE));
-    }
-
-    /**
-     * Test mappings.
-     */
-    @Test
-    public void testAutoGeneratedVersionByte() {
-        final Object obj = new AutoKeyAndVal<Byte>() {
-            @DynamoDbVersionAttribute
-            public Byte getVal() {
-                return super.getVal();
-            }
-
-            public void setVal(final Byte val) {
-                super.setVal(val);
-            }
-        };
-        final DynamoDbMapperTableModel<Object> model = getTable(obj);
-        final DynamoDbMapperFieldModel<Object, Object> val = model.field("val");
-        assertEquals(true, val.versioned());
-        assertEquals(DynamoDbAutoGenerateStrategy.ALWAYS, val.getGenerateStrategy());
-        assertEquals(Byte.valueOf((byte) 1), val.generate(null));
-        assertEquals(Byte.valueOf((byte) 2), val.generate(Byte.valueOf((byte) 1)));
-    }
-
-    /**
-     * Test mappings.
-     */
-    @Test
-    public void testAutoGeneratedVersionBytePrimitive() {
-        final Object obj = new AutoKeyAndVal<String>() {
-            private byte rvn;
-
-            @DynamoDbAttribute
-            public String getVal() {
-                return super.getVal();
-            }
-
-            public void setVal(final String val) {
-                super.setVal(val);
-            }
-
-            @DynamoDbVersionAttribute
-            public byte getRvn() {
-                return this.rvn;
-            }
-
-            public void setRvn(final byte rvn) {
-                this.rvn = rvn;
-            }
-        };
-        final DynamoDbMapperTableModel<Object> model = getTable(obj);
-        final DynamoDbMapperFieldModel<Object, Object> rvn = model.field("rvn");
-        assertEquals(true, rvn.versioned());
-        assertEquals(DynamoDbAutoGenerateStrategy.ALWAYS, rvn.getGenerateStrategy());
-        assertEquals(Byte.valueOf((byte) 1), rvn.generate(null));
-        assertEquals(Byte.valueOf((byte) 2), rvn.generate(Byte.valueOf((byte) 1)));
-    }
-
-    /**
-     * Test mappings.
-     */
-    @Test
-    public void testAutoGeneratedVersionInteger() {
-        final Object obj = new AutoKeyAndVal<Integer>() {
-            @DynamoDbVersionAttribute
-            public Integer getVal() {
-                return super.getVal();
-            }
-
-            public void setVal(final Integer val) {
-                super.setVal(val);
-            }
-        };
-        final DynamoDbMapperTableModel<Object> model = getTable(obj);
-        final DynamoDbMapperFieldModel<Object, Object> val = model.field("val");
-        assertEquals(true, val.versioned());
-        assertEquals(DynamoDbAutoGenerateStrategy.ALWAYS, val.getGenerateStrategy());
-        assertEquals(Integer.valueOf((int) 1), val.generate(null));
-        assertEquals(Integer.valueOf((int) 2), val.generate(Integer.valueOf((int) 1)));
-    }
-
-    /**
-     * Test mappings.
-     */
-    @Test
-    public void testAutoGeneratedVersionIntegerPrimitive() {
-        final Object obj = new AutoKeyAndVal<String>() {
-            private int rvn;
-
-            @DynamoDbAttribute
-            public String getVal() {
-                return super.getVal();
-            }
-
-            public void setVal(final String val) {
-                super.setVal(val);
-            }
-
-            @DynamoDbVersionAttribute
-            public int getRvn() {
-                return this.rvn;
-            }
-
-            public void setRvn(final int rvn) {
-                this.rvn = rvn;
-            }
-        };
-        final DynamoDbMapperTableModel<Object> model = getTable(obj);
-        final DynamoDbMapperFieldModel<Object, Object> rvn = model.field("rvn");
-        assertEquals(true, rvn.versioned());
-        assertEquals(DynamoDbAutoGenerateStrategy.ALWAYS, rvn.getGenerateStrategy());
-        assertEquals(Integer.valueOf((int) 1), rvn.generate(null));
-        assertEquals(Integer.valueOf((int) 2), rvn.generate(Integer.valueOf((int) 1)));
-    }
-
-    /**
-     * Test mappings.
-     */
-    @Test
-    public void testAutoGeneratedVersionLong() {
-        final Object obj = new AutoKeyAndVal<Long>() {
-            @DynamoDbVersionAttribute
-            public Long getVal() {
-                return super.getVal();
-            }
-
-            public void setVal(final Long val) {
-                super.setVal(val);
-            }
-        };
-        final DynamoDbMapperTableModel<Object> model = getTable(obj);
-        final DynamoDbMapperFieldModel<Object, Object> val = model.field("val");
-        assertEquals(true, val.versioned());
-        assertEquals(DynamoDbAutoGenerateStrategy.ALWAYS, val.getGenerateStrategy());
-        assertEquals(Long.valueOf((long) 1), val.generate(null));
-        assertEquals(Long.valueOf((long) 2), val.generate(Long.valueOf((long) 1)));
-    }
-
-    /**
-     * Test mappings.
-     */
-    @Test
-    public void testAutoGeneratedVersionLongPrimitive() {
-        final Object obj = new AutoKeyAndVal<String>() {
-            private long rvn;
-
-            @DynamoDbAttribute
-            public String getVal() {
-                return super.getVal();
-            }
-
-            public void setVal(final String val) {
-                super.setVal(val);
-            }
-
-            @DynamoDbVersionAttribute
-            public long getRvn() {
-                return this.rvn;
-            }
-
-            public void setRvn(final long rvn) {
-                this.rvn = rvn;
-            }
-        };
-        final DynamoDbMapperTableModel<Object> model = getTable(obj);
-        final DynamoDbMapperFieldModel<Object, Object> rvn = model.field("rvn");
-        assertEquals(true, rvn.versioned());
-        assertEquals(DynamoDbAutoGenerateStrategy.ALWAYS, rvn.getGenerateStrategy());
-        assertEquals(Long.valueOf((long) 1), rvn.generate(null));
-        assertEquals(Long.valueOf((long) 2), rvn.generate(Long.valueOf((long) 1)));
-    }
-
-    /**
-     * Test mappings.
-     */
-    @Test
-    public void testAutoGeneratedVersionshort() {
-        final Object obj = new AutoKeyAndVal<Short>() {
-            @DynamoDbVersionAttribute
-            public Short getVal() {
-                return super.getVal();
-            }
-
-            public void setVal(final Short val) {
-                super.setVal(val);
-            }
-        };
-        final DynamoDbMapperTableModel<Object> model = getTable(obj);
-        final DynamoDbMapperFieldModel<Object, Object> val = model.field("val");
-        assertEquals(true, val.versioned());
-        assertEquals(DynamoDbAutoGenerateStrategy.ALWAYS, val.getGenerateStrategy());
-        assertEquals(Short.valueOf((short) 1), val.generate(null));
-        assertEquals(Short.valueOf((short) 2), val.generate(Short.valueOf((short) 1)));
-    }
-
-    /**
-     * Test mappings.
-     */
-    @Test
-    public void testAutoGeneratedVersionshortPrimitive() {
-        final Object obj = new AutoKeyAndVal<String>() {
-            private short rvn;
-
-            @DynamoDbAttribute
-            public String getVal() {
-                return super.getVal();
-            }
-
-            public void setVal(final String val) {
-                super.setVal(val);
-            }
-
-            @DynamoDbVersionAttribute
-            public short getRvn() {
-                return this.rvn;
-            }
-
-            public void setRvn(final short rvn) {
-                this.rvn = rvn;
-            }
-        };
-        final DynamoDbMapperTableModel<Object> model = getTable(obj);
-        final DynamoDbMapperFieldModel<Object, Object> rvn = model.field("rvn");
-        assertEquals(true, rvn.versioned());
-        assertEquals(DynamoDbAutoGenerateStrategy.ALWAYS, rvn.getGenerateStrategy());
-        assertEquals(Short.valueOf((short) 1), rvn.generate(null));
-        assertEquals(Short.valueOf((short) 2), rvn.generate(Short.valueOf((short) 1)));
-    }
-
-    /**
-     * Test mappings.
-     */
-    @Test(expected = DynamoDbMappingException.class)
-    public void testAutoGeneratedTimestampUuid() {
-        final Object obj = new AutoKeyAndVal<UUID>() {
-            @DynamoDbAutoGeneratedTimestamp
-            public UUID getVal() {
-                return super.getVal();
-            }
-
-            public void setVal(final UUID val) {
-                super.setVal(val);
-            }
-        };
-        final DynamoDbMapperTableModel<Object> model = getTable(obj);
-    }
-
-    /**
-     * Test mappings.
-     */
-    @Test
-    public void testAutoGeneratedTimestampCalendar() {
-        final Object obj = new AutoKeyAndVal<Calendar>() {
-            @DynamoDbAutoGeneratedTimestamp
-            public Calendar getVal() {
-                return super.getVal();
-            }
-
-            public void setVal(final Calendar val) {
-                super.setVal(val);
-            }
-        };
-        final DynamoDbMapperTableModel<Object> model = getTable(obj);
-        final DynamoDbMapperFieldModel<Object, Object> val = model.field("val");
-        assertEquals(DynamoDbAutoGenerateStrategy.ALWAYS, val.getGenerateStrategy());
-        assertNotNull(val.generate(null));
-        assertNotNull(val.generate(Calendar.getInstance()));
-    }
-
-    /**
-     * Test mappings.
-     */
-    @Test
-    public void testAutoGeneratedTimestampDateKey() {
-        final Object obj = new AutoKeyAndVal<Date>() {
-            @DynamoDbRangeKey
-            @DynamoDbAutoGeneratedTimestamp(strategy = DynamoDbAutoGenerateStrategy.CREATE)
-            public Date getVal() {
-                return super.getVal();
-            }
-
-            public void setVal(final Date val) {
-                super.setVal(val);
-            }
-        };
-        final DynamoDbMapperTableModel<Object> model = getTable(obj);
-        final DynamoDbMapperFieldModel<Object, Object> val = model.field("val");
-        assertFieldKeyType(KeyType.RANGE, val, model);
-        assertEquals(DynamoDbAutoGenerateStrategy.CREATE, val.getGenerateStrategy());
-        assertNotNull(val.generate(null));
-        assertNotNull(val.generate(new Date()));
-    }
-
-    /**
-     * Test mappings.
-     */
-    @Test
-    public void testAutoGeneratedTimestampDateVal() {
-        final Object obj = new AutoKeyAndVal<Date>() {
-            @DynamoDbAutoGeneratedTimestamp
-            public Date getVal() {
-                return super.getVal();
-            }
-
-            public void setVal(final Date val) {
-                super.setVal(val);
-            }
-        };
-        final DynamoDbMapperTableModel<Object> model = getTable(obj);
-        final DynamoDbMapperFieldModel<Object, Object> val = model.field("val");
-        assertEquals(DynamoDbAutoGenerateStrategy.ALWAYS, val.getGenerateStrategy());
-        assertNotNull(val.generate(null));
-        assertNotNull(val.generate(new Date()));
-    }
-
-    /**
-     * Test mappings.
-     */
-    @Test
-    public void testAutoGeneratedTimestampLong() {
-        final Object obj = new AutoKeyAndVal<Long>() {
-            @DynamoDbAutoGeneratedTimestamp
-            public Long getVal() {
-                return super.getVal();
-            }
-
-            public void setVal(final Long val) {
-                super.setVal(val);
-            }
-        };
-        final DynamoDbMapperTableModel<Object> model = getTable(obj);
-        final DynamoDbMapperFieldModel<Object, Object> val = model.field("val");
-        assertEquals(DynamoDbAutoGenerateStrategy.ALWAYS, val.getGenerateStrategy());
-        assertNotNull(val.generate(null));
-        assertNotNull(val.generate(System.currentTimeMillis()));
-    }
-
-    /**
-     * Test mappings.
-     */
-    @Test
-    public void testAutoGeneratedDefaultByteBuffer() {
-        final Object obj = new AutoKeyAndVal<ByteBuffer>() {
-            @DynamoDbAutoGeneratedDefault("default-val")
-            public ByteBuffer getVal() {
-                return super.getVal();
-            }
-
-            public void setVal(final ByteBuffer val) {
-                super.setVal(val);
-            }
-        };
-        final DynamoDbMapperTableModel<Object> model = getTable(obj);
-        final DynamoDbMapperFieldModel<Object, Object> val = model.field("val");
-        assertEquals(DynamoDbAutoGenerateStrategy.CREATE, val.getGenerateStrategy());
-        assertNotNull(val.generate(null));
-    }
-
-    /**
-     * Test mappings.
-     */
-    @Test
-    public void testAutoGeneratedDefaultBigDecimal() {
-        final Object obj = new AutoKeyAndVal<BigDecimal>() {
-            @DynamoDbAutoGeneratedDefault("1234.5")
-            public BigDecimal getVal() {
-                return super.getVal();
-            }
-
-            public void setVal(final BigDecimal val) {
-                super.setVal(val);
-            }
-        };
-        final DynamoDbMapperTableModel<Object> model = getTable(obj);
-        final DynamoDbMapperFieldModel<Object, Object> val = model.field("val");
-        assertEquals(DynamoDbAutoGenerateStrategy.CREATE, val.getGenerateStrategy());
-        assertEquals(BigDecimal.valueOf(1234.5D), val.generate(null));
-    }
-
-    /**
-     * Test mappings.
-     */
-    @Test
-    public void testAutoGeneratedDefaultBigInteger() {
-        final Object obj = new AutoKeyAndVal<BigInteger>() {
-            @DynamoDbAutoGeneratedDefault("1234")
-            public BigInteger getVal() {
-                return super.getVal();
-            }
-
-            public void setVal(final BigInteger val) {
-                super.setVal(val);
-            }
-        };
-        final DynamoDbMapperTableModel<Object> model = getTable(obj);
-        final DynamoDbMapperFieldModel<Object, Object> val = model.field("val");
-        assertEquals(DynamoDbAutoGenerateStrategy.CREATE, val.getGenerateStrategy());
-        assertEquals(BigInteger.valueOf(1234), val.generate(null));
-    }
-
-    /**
-     * Test mappings.
-     */
-    @Test
-    public void testAutoGeneratedDefaultBoolean_true() {
-        final Object obj = new AutoKeyAndVal<Boolean>() {
-            @DynamoDbAutoGeneratedDefault("true")
-            public Boolean getVal() {
-                return super.getVal();
-            }
-
-            public void setVal(final Boolean val) {
-                super.setVal(val);
-            }
-        };
-        final DynamoDbMapperTableModel<Object> model = getTable(obj);
-        final DynamoDbMapperFieldModel<Object, Object> val = model.field("val");
-        assertEquals(DynamoDbAutoGenerateStrategy.CREATE, val.getGenerateStrategy());
-        assertEquals(Boolean.TRUE, val.generate(null));
-    }
-
-    /**
-     * Test mappings.
-     */
-    @Test
-    public void testAutoGeneratedDefaultBoolean_0() {
-        final Object obj = new AutoKeyAndVal<Boolean>() {
-            @DynamoDbAutoGeneratedDefault("0")
-            public Boolean getVal() {
-                return super.getVal();
-            }
-
-            public void setVal(final Boolean val) {
-                super.setVal(val);
-            }
-        };
-        final DynamoDbMapperTableModel<Object> model = getTable(obj);
-        final DynamoDbMapperFieldModel<Object, Object> val = model.field("val");
-        assertEquals(DynamoDbAutoGenerateStrategy.CREATE, val.getGenerateStrategy());
-        assertEquals(Boolean.FALSE, val.generate(null));
-    }
-
-    /**
-     * Test mappings.
-     */
-    @Test
-    public void testAutoGeneratedDefaultBoolean_1() {
-        final Object obj = new AutoKeyAndVal<Boolean>() {
-            @DynamoDbAutoGeneratedDefault("1")
-            public Boolean getVal() {
-                return super.getVal();
-            }
-
-            public void setVal(final Boolean val) {
-                super.setVal(val);
-            }
-        };
-        final DynamoDbMapperTableModel<Object> model = getTable(obj);
-        final DynamoDbMapperFieldModel<Object, Object> val = model.field("val");
-        assertEquals(DynamoDbAutoGenerateStrategy.CREATE, val.getGenerateStrategy());
-        assertEquals(Boolean.TRUE, val.generate(null));
-    }
-
-    /**
-     * Test mappings.
-     */
-    @Test
-    public void testAutoGeneratedDefaultBoolean_y() {
-        final Object obj = new AutoKeyAndVal<Boolean>() {
-            @DynamoDbAutoGeneratedDefault("y")
-            public Boolean getVal() {
-                return super.getVal();
-            }
-
-            public void setVal(final Boolean val) {
-                super.setVal(val);
-            }
-        };
-        final DynamoDbMapperTableModel<Object> model = getTable(obj);
-        final DynamoDbMapperFieldModel<Object, Object> val = model.field("val");
-        assertEquals(DynamoDbAutoGenerateStrategy.CREATE, val.getGenerateStrategy());
-        assertEquals(Boolean.TRUE, val.generate(null));
-    }
-
-    /**
-     * Test mappings.
-     */
-    @Test
-    public void testAutoGeneratedDefaultBoolean_Y() {
-        final Object obj = new AutoKeyAndVal<Boolean>() {
-            @DynamoDbAutoGeneratedDefault("Y")
-            public Boolean getVal() {
-                return super.getVal();
-            }
-
-            public void setVal(final Boolean val) {
-                super.setVal(val);
-            }
-        };
-        final DynamoDbMapperTableModel<Object> model = getTable(obj);
-        final DynamoDbMapperFieldModel<Object, Object> val = model.field("val");
-        assertEquals(DynamoDbAutoGenerateStrategy.CREATE, val.getGenerateStrategy());
-        assertEquals(Boolean.TRUE, val.generate(null));
-    }
-
-    /**
-     * Test mappings.
-     */
-    @Test
-    public void testAutoGeneratedDefaultByte() {
-        final Object obj = new AutoKeyAndVal<Byte>() {
-            @DynamoDbAutoGeneratedDefault("1")
-            public Byte getVal() {
-                return super.getVal();
-            }
-
-            public void setVal(final Byte val) {
-                super.setVal(val);
-            }
-        };
-        final DynamoDbMapperTableModel<Object> model = getTable(obj);
-        final DynamoDbMapperFieldModel<Object, Object> val = model.field("val");
-        assertEquals(DynamoDbAutoGenerateStrategy.CREATE, val.getGenerateStrategy());
-        assertEquals(Byte.valueOf((byte) 1), val.generate(null));
-    }
-
-    /**
-     * Test mappings.
-     */
-    @Test
-    public void testAutoGeneratedDefaultCharacter() {
-        final Object obj = new AutoKeyAndVal<Character>() {
-            @DynamoDbAutoGeneratedDefault("A")
-            public Character getVal() {
-                return super.getVal();
-            }
-
-            public void setVal(final Character val) {
-                super.setVal(val);
-            }
-        };
-        final DynamoDbMapperTableModel<Object> model = getTable(obj);
-        final DynamoDbMapperFieldModel<Object, Object> val = model.field("val");
-        assertEquals(DynamoDbAutoGenerateStrategy.CREATE, val.getGenerateStrategy());
-        assertEquals(Character.valueOf('A'), val.generate(null));
-    }
-
-    /**
-     * Test mappings.
-     */
-    @Test
-    public void testAutoGeneratedDefaultCurrency() {
-        final Object obj = new AutoKeyAndVal<java.util.Currency>() {
-            @DynamoDbAutoGeneratedDefault("CAD")
-            public java.util.Currency getVal() {
-                return super.getVal();
-            }
-
-            public void setVal(final java.util.Currency val) {
-                super.setVal(val);
-            }
-        };
-        final DynamoDbMapperTableModel<Object> model = getTable(obj);
-        final DynamoDbMapperFieldModel<Object, Object> val = model.field("val");
-        assertEquals(DynamoDbAutoGenerateStrategy.CREATE, val.getGenerateStrategy());
-        assertEquals(java.util.Currency.getInstance("CAD"), val.generate(null));
-    }
-
-    /**
-     * Test mappings.
-     */
-    @Test
-    public void testAutoGeneratedDefaultDouble() {
-        final Object obj = new AutoKeyAndVal<Double>() {
-            @DynamoDbAutoGeneratedDefault("1234.5")
-            public Double getVal() {
-                return super.getVal();
-            }
-
-            public void setVal(final Double val) {
-                super.setVal(val);
-            }
-        };
-        final DynamoDbMapperTableModel<Object> model = getTable(obj);
-        final DynamoDbMapperFieldModel<Object, Object> val = model.field("val");
-        assertEquals(DynamoDbAutoGenerateStrategy.CREATE, val.getGenerateStrategy());
-        assertEquals(Double.valueOf(1234.5D), val.generate(null));
-    }
-
-    /**
-     * Test mappings.
-     */
-    @Test
-    public void testAutoGeneratedDefaultEnum() {
-        final Object obj = new AutoKeyAndVal<TimeUnit>() {
-            @DynamoDbTypeConvertedEnum
-            @DynamoDbAutoGeneratedDefault("SECONDS")
-            public TimeUnit getVal() {
-                return super.getVal();
-            }
-
-            public void setVal(final TimeUnit val) {
-                super.setVal(val);
-            }
-        };
-        final DynamoDbMapperTableModel<Object> model = getTable(obj);
-        final DynamoDbMapperFieldModel<Object, Object> val = model.field("val");
-        assertEquals(DynamoDbAutoGenerateStrategy.CREATE, val.getGenerateStrategy());
-        assertEquals(TimeUnit.SECONDS, val.generate(null));
-        assertEquals(TimeUnit.SECONDS, val.generate(TimeUnit.MILLISECONDS));
-    }
-
-    /**
-     * Test mappings.
-     */
-    @Test
-    public void testAutoGeneratedDefaultFloat() {
-        final Object obj = new AutoKeyAndVal<Float>() {
-            @DynamoDbAutoGeneratedDefault("1234.5")
-            public Float getVal() {
-                return super.getVal();
-            }
-
-            public void setVal(final Float val) {
-                super.setVal(val);
-            }
-        };
-        final DynamoDbMapperTableModel<Object> model = getTable(obj);
-        final DynamoDbMapperFieldModel<Object, Object> val = model.field("val");
-        assertEquals(DynamoDbAutoGenerateStrategy.CREATE, val.getGenerateStrategy());
-        assertEquals(Float.valueOf(1234.5F), val.generate(null));
-    }
-
-    /**
-     * Test mappings.
-     */
-    @Test
-    public void testAutoGeneratedDefaultInteger() {
-        final Object obj = new AutoKeyAndVal<Integer>() {
-            @DynamoDbAutoGeneratedDefault("1234")
-            public Integer getVal() {
-                return super.getVal();
-            }
-
-            public void setVal(final Integer val) {
-                super.setVal(val);
-            }
-        };
-        final DynamoDbMapperTableModel<Object> model = getTable(obj);
-        final DynamoDbMapperFieldModel<Object, Object> val = model.field("val");
-        assertEquals(DynamoDbAutoGenerateStrategy.CREATE, val.getGenerateStrategy());
-        assertEquals(Integer.valueOf((int) 1234), val.generate(null));
-    }
-
-    /**
-     * Test mappings.
-     */
-    @Test
-    public void testAutoGeneratedDefaultLong() {
-        final Object obj = new AutoKeyAndVal<Long>() {
-            @DynamoDbAutoGeneratedDefault("1234")
-            public Long getVal() {
-                return super.getVal();
-            }
-
-            public void setVal(final Long val) {
-                super.setVal(val);
-            }
-        };
-        final DynamoDbMapperTableModel<Object> model = getTable(obj);
-        final DynamoDbMapperFieldModel<Object, Object> val = model.field("val");
-        assertEquals(DynamoDbAutoGenerateStrategy.CREATE, val.getGenerateStrategy());
-        assertEquals(Long.valueOf((long) 1234), val.generate(null));
-    }
-
-    /**
-     * Test mappings.
-     */
-    @Test
-    public void testAutoGeneratedDefaultShort() {
-        final Object obj = new AutoKeyAndVal<Short>() {
-            @DynamoDbAutoGeneratedDefault("1234")
-            public Short getVal() {
-                return super.getVal();
-            }
-
-            public void setVal(final Short val) {
-                super.setVal(val);
-            }
-        };
-        final DynamoDbMapperTableModel<Object> model = getTable(obj);
-        final DynamoDbMapperFieldModel<Object, Object> val = model.field("val");
-        assertEquals(DynamoDbAutoGenerateStrategy.CREATE, val.getGenerateStrategy());
-        assertEquals(Short.valueOf((short) 1234), val.generate(null));
-    }
-
-    /**
-     * Test mappings.
-     */
-    @Test
-    public void testAutoGeneratedDefaultString() {
-        final Object obj = new AutoKeyAndVal<String>() {
-            @DynamoDbAutoGeneratedDefault("default-val")
-            public String getVal() {
-                return super.getVal();
-            }
-
-            public void setVal(final String val) {
-                super.setVal(val);
-            }
-        };
-        final DynamoDbMapperTableModel<Object> model = getTable(obj);
-        final DynamoDbMapperFieldModel<Object, Object> val = model.field("val");
-        assertEquals(DynamoDbAutoGenerateStrategy.CREATE, val.getGenerateStrategy());
-        assertEquals("default-val", val.generate(null));
-        assertEquals("default-val", val.generate("not-default"));
-    }
-
-    /**
-     * Test mappings.
-     */
-    @Test
-    public void testAutoGeneratedDefaultTimeZone() {
-        final Object obj = new AutoKeyAndVal<TimeZone>() {
-            @DynamoDbAutoGeneratedDefault("America/New_York")
-            public TimeZone getVal() {
-                return super.getVal();
-            }
-
-            public void setVal(final TimeZone val) {
-                super.setVal(val);
-            }
-        };
-        final DynamoDbMapperTableModel<Object> model = getTable(obj);
-        final DynamoDbMapperFieldModel<Object, Object> val = model.field("val");
-        assertEquals(DynamoDbAutoGenerateStrategy.CREATE, val.getGenerateStrategy());
-        assertEquals(TimeZone.getTimeZone("America/New_York"), val.generate(null));
-        assertEquals(TimeZone.getTimeZone("America/New_York"), val.generate(TimeZone.getTimeZone("America/Los_Angeles")));
-    }
-
-    /**
-     * Test mappings.
-     */
-    @Test
-    public void testAutoGeneratedDefaultUuid() {
-        final Object obj = new AutoKeyAndVal<UUID>() {
-            @DynamoDbAutoGeneratedDefault("12345678-1234-1234-1234-123456789012")
-            public UUID getVal() {
-                return super.getVal();
-            }
-
-            public void setVal(final UUID val) {
-                super.setVal(val);
-            }
-        };
-        final DynamoDbMapperTableModel<Object> model = getTable(obj);
-        final DynamoDbMapperFieldModel<Object, Object> val = model.field("val");
-        assertEquals(DynamoDbAutoGenerateStrategy.CREATE, val.getGenerateStrategy());
-        assertEquals(UUID.fromString("12345678-1234-1234-1234-123456789012"), val.generate(null));
-    }
-
-    /**
-     * Test mappings.
-     */
-    @Test
-    public void testIndexHashKeyGlobalSecondaryIndexName() {
-        final Object obj = new AutoKeyAndVal<String>() {
-            @DynamoDbIndexHashKey(attributeName = "gsi_hk", globalSecondaryIndexName = "gsi")
-            public String getVal() {
-                return super.getVal();
-            }
-
-            public void setVal(final String val) {
-                super.setVal(val);
-            }
-        };
-        final DynamoDbMapperTableModel<Object> model = getTable(obj);
-        final DynamoDbMapperFieldModel<Object, Object> gsi_hk = model.field("gsi_hk");
-        assertFieldGsiNames(Arrays.asList("gsi"), KeyType.HASH, gsi_hk, model);
-        assertFieldGsiNames(null, KeyType.RANGE, gsi_hk, model);
-        assertFieldLsiNames(null, gsi_hk, model);
-    }
-
-    /**
-     * Test mappings.
-     */
-    @Test
-    public void testIndexHashKeyGlobalSecondaryIndexNames() {
-        final Object obj = new AutoKeyAndVal<String>() {
-            @DynamoDbIndexHashKey(attributeName = "gsi_hk", globalSecondaryIndexNames = "gsi")
-            public String getVal() {
-                return super.getVal();
-            }
-
-            public void setVal(final String val) {
-                super.setVal(val);
-            }
-        };
-        final DynamoDbMapperTableModel<Object> model = getTable(obj);
-        final DynamoDbMapperFieldModel<Object, Object> gsi_hk = model.field("gsi_hk");
-        assertFieldGsiNames(Arrays.asList("gsi"), KeyType.HASH, gsi_hk, model);
-        assertFieldGsiNames(null, KeyType.RANGE, gsi_hk, model);
-        assertFieldLsiNames(null, gsi_hk, model);
-    }
-
-    /**
-     * Test mappings.
-     */
-    @Test
-    public void testIndexRangeKeyGlobalSecondaryIndexName() {
-        final Object obj = new AutoKeyAndVal<String>() {
-            private String gsi;
-
-            @DynamoDbIndexHashKey(attributeName = "gsi_hk", globalSecondaryIndexName = "gsi")
-            public String getVal() {
-                return super.getVal();
-            }
-
-            public void setVal(final String val) {
-                super.setVal(val);
-            }
-
-            @DynamoDbIndexRangeKey(attributeName = "gsi_rk", globalSecondaryIndexName = "gsi")
-            public String getGsi() {
-                return this.gsi;
-            }
-
-            public void setGsi(final String gsi) {
-                this.gsi = gsi;
-            }
-        };
-        final DynamoDbMapperTableModel<Object> model = getTable(obj);
-        final DynamoDbMapperFieldModel<Object, Object> gsi_hk = model.field("gsi_hk");
-        assertFieldGsiNames(Arrays.asList("gsi"), KeyType.HASH, gsi_hk, model);
-        assertFieldGsiNames(null, KeyType.RANGE, gsi_hk, model);
-        assertFieldLsiNames(null, gsi_hk, model);
-        final DynamoDbMapperFieldModel<Object, Object> gsi_rk = model.field("gsi_rk");
-        assertFieldGsiNames(null, KeyType.HASH, gsi_rk, model);
-        assertFieldGsiNames(Arrays.asList("gsi"), KeyType.RANGE, gsi_rk, model);
-        assertFieldLsiNames(null, gsi_rk, model);
-    }
-
-    /**
-     * Test mappings.
-     */
-    @Test
-    public void testIndexRangeKeyGlobalSecondaryIndexNames() {
-        final Object obj = new AutoKeyAndVal<String>() {
-            private String gsi;
-
-            @DynamoDbIndexHashKey(attributeName = "gsi_hk", globalSecondaryIndexName = "gsi")
-            public String getVal() {
-                return super.getVal();
-            }
-
-            public void setVal(final String val) {
-                super.setVal(val);
-            }
-
-            @DynamoDbIndexRangeKey(attributeName = "gsi_rk", globalSecondaryIndexNames = "gsi")
-            public String getGsi() {
-                return this.gsi;
-            }
-
-            public void setGsi(final String gsi) {
-                this.gsi = gsi;
-            }
-        };
-        final DynamoDbMapperTableModel<Object> model = getTable(obj);
-        final DynamoDbMapperFieldModel<Object, Object> gsi_hk = model.field("gsi_hk");
-        assertFieldGsiNames(Arrays.asList("gsi"), KeyType.HASH, gsi_hk, model);
-        assertFieldGsiNames(null, KeyType.RANGE, gsi_hk, model);
-        assertFieldLsiNames(null, gsi_hk, model);
-        final DynamoDbMapperFieldModel<Object, Object> gsi_rk = model.field("gsi_rk");
-        assertFieldGsiNames(null, KeyType.HASH, gsi_rk, model);
-        assertFieldGsiNames(Arrays.asList("gsi"), KeyType.RANGE, gsi_rk, model);
-        assertFieldLsiNames(null, gsi_rk, model);
-    }
-
-    /**
-     * Test mappings.
-     */
-    @Test
-    public void testIndexRangeKeyiLocalSecondaryIndexName() {
-        final Object obj = new AutoKeyAndVal<String>() {
-            @DynamoDbIndexRangeKey(attributeName = "lsi_rk", localSecondaryIndexName = "lsi")
-            public String getVal() {
-                return super.getVal();
-            }
-
-            public void setVal(final String val) {
-                super.setVal(val);
-            }
-        };
-        final DynamoDbMapperTableModel<Object> model = getTable(obj);
-        final DynamoDbMapperFieldModel<Object, Object> lsi_rk = model.field("lsi_rk");
-        assertFieldLsiNames(Arrays.asList("lsi"), lsi_rk, model);
-    }
-
-    /**
-     * Test mappings.
-     */
-    @Test
-    public void testIndexRangeKeyLocalSecondaryIndexNames() {
-        final Object obj = new AutoKeyAndVal<String>() {
-            @DynamoDbIndexRangeKey(attributeName = "lsi_rk", localSecondaryIndexNames = "lsi")
-            public String getVal() {
-                return super.getVal();
-            }
-
-            public void setVal(final String val) {
-                super.setVal(val);
-            }
-        };
-        final DynamoDbMapperTableModel<Object> model = getTable(obj);
-        final DynamoDbMapperFieldModel<Object, Object> lsi_rk = model.field("lsi_rk");
-        assertFieldLsiNames(Arrays.asList("lsi"), lsi_rk, model);
-    }
-
-    @Test
-    public void testFlattened() {
-        final Object obj = new AutoKeyAndVal<DateRange>() {
-            @DynamoDbFlattened(attributes = {
-                    @DynamoDbAttribute(mappedBy = "start", attributeName = "DateRangeStart"),
-                    @DynamoDbAttribute(mappedBy = "end", attributeName = "DateRangeEnd")})
-            public DateRange getVal() {
-                return super.getVal();
-            }
-
-            public void setVal(final DateRange val) {
-                super.setVal(val);
-            }
-        };
-        final DynamoDbMapperTableModel<Object> model = getTable(obj);
-        assertEquals(3, model.fields().size());
-        assertEquals("DateRangeStart", model.field("DateRangeStart").name());
-        assertEquals("DateRangeEnd", model.field("DateRangeEnd").name());
-    }
-
-    /**
-     * Test mappings.
-     */
-    @Test
-    public void testFlattenedNotAllSpecified() {
-        final Object obj = new AutoKeyAndVal<DateRange>() {
-            @DynamoDbFlattened(attributes = {
-                    @DynamoDbAttribute(mappedBy = "start", attributeName = "DateRangeStart")})
-            public DateRange getVal() {
-                return super.getVal();
-            }
-
-            public void setVal(final DateRange val) {
-                super.setVal(val);
-            }
-        };
-        final DynamoDbMapperTableModel<Object> model = getTable(obj);
-        assertEquals(2, model.fields().size());
-        assertEquals("DateRangeStart", model.field("DateRangeStart").name());
-    }
-
-    /**
-     * Test mappings.
-     */
-    @Test(expected = DynamoDbMappingException.class)
-    public void testFlattenedInvalidMappedBy() {
-        final Object obj = new AutoKeyAndVal<DateRange>() {
-            @DynamoDbFlattened(attributes = {
-                    @DynamoDbAttribute(mappedBy = "xstart", attributeName = "DateRangeStart"),
-                    @DynamoDbAttribute(mappedBy = "xend", attributeName = "DateRangeEnd")})
-            public DateRange getVal() {
-                return super.getVal();
-            }
-
-            public void setVal(final DateRange val) {
-                super.setVal(val);
-            }
-        };
-        getTable(obj);
-    }
-
-    /**
-     * Test mappings.
-     */
-    @Test
-    public void testFlattenedMultipleSameType() {
-        final Object obj = new AutoKeyAndVal<Currency>() {
-            private Currency other;
-
-            @DynamoDbFlattened(attributes = {
-                    @DynamoDbAttribute(mappedBy = "amount", attributeName = "firstAmount"),
-                    @DynamoDbAttribute(mappedBy = "unit", attributeName = "firstUnit")})
-            public Currency getVal() {
-                return super.getVal();
-            }
-
-            public void setVal(final Currency val) {
-                super.setVal(val);
-            }
-
-            @DynamoDbFlattened(attributes = {
-                    @DynamoDbAttribute(mappedBy = "amount", attributeName = "secondAmount"),
-                    @DynamoDbAttribute(mappedBy = "unit", attributeName = "secondUnit")})
-            public Currency getOther() {
-                return this.other;
-            }
-
-            public void setOther(final Currency other) {
-                this.other = other;
-            }
-        };
-        final DynamoDbMapperTableModel<Object> model = getTable(obj);
-        assertEquals(5, model.fields().size());
-        assertEquals("firstAmount", model.field("firstAmount").name());
-        assertEquals("firstUnit", model.field("firstUnit").name());
-        assertEquals("secondAmount", model.field("secondAmount").name());
-        assertEquals("secondUnit", model.field("secondUnit").name());
-    }
-
-    /**
-     * Test mappings.
-     */
-    @Test
-    public void testTableAndDocument() {
-        models.getTable(TableAndDocument.class);
-    }
-
-    /**
-     * Test mappings.
-     */
-    @Test
-    public void testInheritedWithNoTable() {
-        final Object obj = new KeyAndVal<String, String>() {
-            @DynamoDbHashKey(attributeName = "hk")
-            public String getKey() {
-                return super.getKey();
-            }
-
-            public void setKey(String key) {
-                super.setKey(key);
-            }
-
-            @DynamoDbAttribute(attributeName = "value")
-            public String getVal() {
-                return super.getVal();
-            }
-
-            public void setVal(String val) {
-                super.setVal(val);
-            }
-        };
-        final DynamoDbMapperTableModel<Object> model = getTable(obj);
-
-        final DynamoDbMapperFieldModel<Object, Object> key = model.field("hk");
-        assertNotNull(key);
-        assertEquals(KeyType.HASH, key.keyType());
-        assertEquals(DynamoDbAttributeType.S, key.attributeType());
-
-        final DynamoDbMapperFieldModel<Object, Object> val = model.field("value");
-        assertNotNull(val);
-        assertEquals(DynamoDbAttributeType.S, val.attributeType());
-    }
-
-    /**
-     * Test mappings to make sure the bridge method is ruled out.
-     */
-    @Test
-    public void testFindRelevantGettersWithBridgeMethod() {
-        final DynamoDbMapperTableModel<SubClass> model = models.getTable(SubClass.class);
-        assertEquals("only two getter should be returned", 2, model.fields().size());
-        assertEquals("return type should be Integer rather than Object", DynamoDbAttributeType.N, model.field("t").attributeType());
-    }
-
-    /**
-     * Test mappings.
-     */
-    @Test
-    public void testNonMappedInheritedProperties() {
-        final DynamoDbMapperTableModel<NonMappedInheritedProperties> model = models.getTable(NonMappedInheritedProperties.class);
-        assertEquals(2, model.fields().size());
-        assertNotNull(model.field("doUse"));
-    }
-
-    /**
-     * Test mappings.
-     */
-    @Test
-    public void testInheritedProperties() {
-        final DynamoDbMapperTableModel<BaseTablePojo> model1 = models.getTable(BaseTablePojo.class);
-        assertEquals(3, model1.fields().size());
-        assertNotNull(model1.field("hashKeyOnField"));
-        assertNotNull(model1.field("rangeKeyOnGetter"));
-        final DynamoDbMapperTableModel<TablePojoSubclass> model2 = models.getTable(TablePojoSubclass.class);
-        assertEquals(4, model2.fields().size());
-        assertNotNull(model2.field("hashKeyOnField"));
-        assertNotNull(model2.field("rangeKeyOnGetter"));
-    }
-
-    /**
-     * Test mappings.
-     */
-    @Test
-    public void testPojoWithGetterAnnotations() {
-        PojoAsserts.assertAll(models.getTable(PojoWithGetterAnnotations.class));
-    }
-
-    /**
-     * Test mappings.
-     */
-    @Test
-    public void testPojoWithFieldAnnotations() {
-        PojoAsserts.assertAll(models.getTable(PojoWithFieldAnnotations.class));
-    }
-
-    /**
-     * Test mappings.
-     */
-    @Test
-    public void testPojoWithMixedAnnotations() {
-        PojoAsserts.assertAll(models.getTable(PojoWithMixedAnnotations.class));
-    }
-
-    /**
-     * Pojo field assertions.
-     */
-    private static enum PojoAsserts {
-        hashKey(KeyType.HASH, null),
-        rangeKey(KeyType.RANGE, DynamoDbAutoGenerateStrategy.CREATE),
-        indexHashKey(null, null),
-        indexRangeKey(null, null),
-        actualAttrName(null, null),
-        versionedAttr(null, DynamoDbAutoGenerateStrategy.ALWAYS),
-        marshallingAttr(null, null);
-        private final DynamoDbAutoGenerateStrategy generateStrategy;
-        private final KeyType keyType;
-
-        private PojoAsserts(final KeyType keyType, final DynamoDbAutoGenerateStrategy generateStrategy) {
-            this.generateStrategy = generateStrategy;
-            this.keyType = keyType;
-        }
-
-        public static <T> void assertAll(final DynamoDbMapperTableModel<T> model) {
-            for (final PojoAsserts asserts : PojoAsserts.values()) {
-                final DynamoDbMapperFieldModel<T, Object> field = model.field(asserts.name());
-                assertNotNull(field);
-                assertFieldKeyType(asserts.keyType, field, model);
-                assertEquals(asserts.generateStrategy, field.getGenerateStrategy());
-                assertEquals(0, field.localSecondaryIndexNames().size());
-            }
-            assertEquals(PojoAsserts.values().length, model.fields().size());
-        }
-    }
-
-    @DynamoDbDocument
-    @DynamoDbTable(tableName = "")
-    public static class TableAndDocument extends AutoKeyAndVal<String> {
-        public String getVal() {
-            return super.getVal();
-        }
-
-        public void setVal(final String val) {
-            super.setVal(val);
-        }
-    }
-
-    @DynamoDbTable(tableName = "")
-    private abstract static class SuperGenericClass<T> {
-        private String id;
-
-        @DynamoDbHashKey
-        public final String getId() {
-            return this.id;
-        }
-
-        public final void setId(String id) {
-            this.id = id;
-        }
-
-        public abstract T getT();
-
-        public abstract void setT(T t);
-    }
-
-    @DynamoDbTable(tableName = "GenericString")
-    private static class SubClass extends SuperGenericClass<Integer> {
-        private Integer t;
-
-        @Override
-        public Integer getT() {
-            return t;
-        }
-
-        @Override
-        public void setT(Integer t) {
-            this.t = t;
-        }
-    }
-
-    @DynamoDbTable(tableName = "table")
-    private static class BaseTablePojo {
-        @DynamoDbHashKey
-        private String hashKeyOnField;
-        private String rangeKeyOnGetter;
-        private String attrNoAnnotation;
-        @DynamoDbIgnore
-        private String ignoredAttr;
-
-        public String getHashKeyOnField() {
-            return hashKeyOnField;
-        }
-
-        public void setHashKeyOnField(String hashKeyOnField) {
-            this.hashKeyOnField = hashKeyOnField;
-        }
-
-        @DynamoDbRangeKey
-        public String getRangeKeyOnGetter() {
-            return rangeKeyOnGetter;
-        }
-
-        public void setRangeKeyOnGetter(String rangeKeyOnGetter) {
-            this.rangeKeyOnGetter = rangeKeyOnGetter;
-        }
-
-        public String getAttrNoAnnotation() {
-            return attrNoAnnotation;
-        }
-
-        public void setAttrNoAnnotation(String attrNoAnnotation) {
-            this.attrNoAnnotation = attrNoAnnotation;
-        }
-
-        public String getIgnoredAttr() {
-            return ignoredAttr;
-        }
-
-        public void setIgnoredAttr(String ignoredAttr) {
-            this.ignoredAttr = ignoredAttr;
-        }
-    }
-
-    @DynamoDbTable(tableName = "table")
-    private static class TablePojoSubclass extends BaseTablePojo {
-        private String ignoredAttr;
-
-        @Override
-        public String getIgnoredAttr() {
-            return ignoredAttr;
-        }
-
-        @Override
-        public void setIgnoredAttr(String ignoredAttr) {
-            this.ignoredAttr = ignoredAttr;
-        }
-    }
-
-    /**
-     * A POJO model that uses getter annotations.
-     */
-    @DynamoDbTable(tableName = "table")
-    private static class PojoWithGetterAnnotations {
-        private String hashKey;
-        private String rangeKey;
-        private String indexHashKey;
-        private String indexRangeKey;
-        private String annotatedAttr;
-        private Long versionedAttr;
-        private String marshallingAttr;
-        private String ignoredAttr;
-
-        @DynamoDbHashKey
-        public String getHashKey() {
-            return hashKey;
-        }
-
-        public void setHashKey(String hashKey) {
-            this.hashKey = hashKey;
-        }
-
-        @DynamoDbRangeKey
-        @DynamoDbAutoGeneratedKey
-        public String getRangeKey() {
-            return rangeKey;
-        }
-
-        public void setRangeKey(String rangeKey) {
-            this.rangeKey = rangeKey;
-        }
-
-        @DynamoDbIndexHashKey(globalSecondaryIndexName = "index")
-        public String getIndexHashKey() {
-            return indexHashKey;
-        }
-
-        public void setIndexHashKey(String indexHashKey) {
-            this.indexHashKey = indexHashKey;
-        }
-
-        @DynamoDbIndexRangeKey(globalSecondaryIndexName = "index")
-        public String getIndexRangeKey() {
-            return indexRangeKey;
-        }
-
-        public void setIndexRangeKey(String indexRangeKey) {
-            this.indexRangeKey = indexRangeKey;
-        }
-
-        @DynamoDbAttribute(attributeName = "actualAttrName")
-        public String getAnnotatedAttr() {
-            return annotatedAttr;
-        }
-
-        public void setAnnotatedAttr(String annotatedAttr) {
-            this.annotatedAttr = annotatedAttr;
-        }
-
-        @DynamoDbVersionAttribute
-        public Long getVersionedAttr() {
-            return versionedAttr;
-        }
-
-        public void setVersionedAttr(Long versionedAttr) {
-            this.versionedAttr = versionedAttr;
-        }
-
-        @DynamoDbTypeConverted(converter = RandomUuidMarshaller.class)
-        public String getMarshallingAttr() {
-            return marshallingAttr;
-        }
-
-        public void setMarshallingAttr(String marshallingAttr) {
-            this.marshallingAttr = marshallingAttr;
-        }
-
-        @DynamoDbIgnore
-        public String getIgnoredAttr() {
-            return ignoredAttr;
-        }
-
-        public void setIgnoredAttr(String ignoredAttr) {
-            this.ignoredAttr = ignoredAttr;
-        }
-    }
-
-    /**
-     * The same model as defined in PojoWithGetterAnnotations, but uses field
-     * annotations instead.
-     */
-    @DynamoDbTable(tableName = "table")
-    private static class PojoWithFieldAnnotations {
-        @DynamoDbHashKey
-        private String hashKey;
-        @DynamoDbRangeKey
-        @DynamoDbAutoGeneratedKey
-        private String rangeKey;
-        @DynamoDbIndexHashKey(globalSecondaryIndexName = "index")
-        private String indexHashKey;
-        @DynamoDbIndexRangeKey(globalSecondaryIndexName = "index")
-        private String indexRangeKey;
-        @DynamoDbAttribute(attributeName = "actualAttrName")
-        private String annotatedAttr;
-        @DynamoDbVersionAttribute
-        private Long versionedAttr;
-        @DynamoDbTypeConverted(converter = RandomUuidMarshaller.class)
-        private String marshallingAttr;
-        @DynamoDbIgnore
-        private String ignoredAttr;
-
-        public String getHashKey() {
-            return hashKey;
-        }
-
-        public void setHashKey(String hashKey) {
-            this.hashKey = hashKey;
-        }
-
-        public String getRangeKey() {
-            return rangeKey;
-        }
-
-        public void setRangeKey(String rangeKey) {
-            this.rangeKey = rangeKey;
-        }
-
-        public String getIndexHashKey() {
-            return indexHashKey;
-        }
-
-        public void setIndexHashKey(String indexHashKey) {
-            this.indexHashKey = indexHashKey;
-        }
-
-        public String getIndexRangeKey() {
-            return indexRangeKey;
-        }
-
-        public void setIndexRangeKey(String indexRangeKey) {
-            this.indexRangeKey = indexRangeKey;
-        }
-
-        public String getAnnotatedAttr() {
-            return annotatedAttr;
-        }
-
-        public void setAnnotatedAttr(String annotatedAttr) {
-            this.annotatedAttr = annotatedAttr;
-        }
-
-        public Long getVersionedAttr() {
-            return versionedAttr;
-        }
-
-        public void setVersionedAttr(Long versionedAttr) {
-            this.versionedAttr = versionedAttr;
-        }
-
-        public String getMarshallingAttr() {
-            return marshallingAttr;
-        }
-
-        public void setMarshallingAttr(String marshallingAttr) {
-            this.marshallingAttr = marshallingAttr;
-        }
-
-        public String getIgnoredAttr() {
-            return ignoredAttr;
-        }
-
-        public void setIgnoredAttr(String ignoredAttr) {
-            this.ignoredAttr = ignoredAttr;
-        }
-    }
-
-    /**
-     * The same model as defined in PojoWithGetterAnnotations, but uses both getter and field
-     * annotations.
-     */
-    @DynamoDbTable(tableName = "table")
-    private static class PojoWithMixedAnnotations {
-        @DynamoDbHashKey
-        private String hashKey;
-        private String rangeKey;
-        @DynamoDbIndexHashKey(globalSecondaryIndexName = "index")
-        private String indexHashKey;
-        private String indexRangeKey;
-        @DynamoDbAttribute(attributeName = "actualAttrName")
-        private String annotatedAttr;
-        private Long versionedAttr;
-        @DynamoDbTypeConverted(converter = RandomUuidMarshaller.class)
-        private String marshallingAttr;
-        private String ignoredAttr;
-
-        public String getHashKey() {
-            return hashKey;
-        }
-
-        public void setHashKey(String hashKey) {
-            this.hashKey = hashKey;
-        }
-
-        @DynamoDbRangeKey
-        @DynamoDbAutoGeneratedKey
-        public String getRangeKey() {
-            return rangeKey;
-        }
-
-        public void setRangeKey(String rangeKey) {
-            this.rangeKey = rangeKey;
-        }
-
-        public String getIndexHashKey() {
-            return indexHashKey;
-        }
-
-        public void setIndexHashKey(String indexHashKey) {
-            this.indexHashKey = indexHashKey;
-        }
-
-        @DynamoDbIndexRangeKey(globalSecondaryIndexName = "index")
-        public String getIndexRangeKey() {
-            return indexRangeKey;
-        }
-
-        public void setIndexRangeKey(String indexRangeKey) {
-            this.indexRangeKey = indexRangeKey;
-        }
-
-        public String getAnnotatedAttr() {
-            return annotatedAttr;
-        }
-
-        public void setAnnotatedAttr(String annotatedAttr) {
-            this.annotatedAttr = annotatedAttr;
-        }
-
-        @DynamoDbVersionAttribute
-        public Long getVersionedAttr() {
-            return versionedAttr;
-        }
-
-        public void setVersionedAttr(Long versionedAttr) {
-            this.versionedAttr = versionedAttr;
-        }
-
-        public String getMarshallingAttr() {
-            return marshallingAttr;
-        }
-
-        public void setMarshallingAttr(String marshallingAttr) {
-            this.marshallingAttr = marshallingAttr;
-        }
-
-        @DynamoDbIgnore
-        public String getIgnoredAttr() {
-            return ignoredAttr;
-        }
-
-        public void setIgnoredAttr(String ignoredAttr) {
-            this.ignoredAttr = ignoredAttr;
-        }
-    }
-
-    public abstract class AbstractNonMappedInheritedProperties {
-        private String doNotUse;
-
-        public String getDoNotUse() {
-            return this.doNotUse;
-        }
-
-        public void setDoNotUse(final String doNotUse) {
-            this.doNotUse = doNotUse;
-        }
-    }
-
-    @DynamoDbTable(tableName = "aws-java-sdk-test")
-    public class NonMappedInheritedProperties extends AbstractNonMappedInheritedProperties {
-        private String id;
-        private String doUse;
-
-        @DynamoDbHashKey
-        public final String getId() {
-            return this.id;
-        }
-
-        public final void setId(String id) {
-            this.id = id;
-        }
-
-        public String getDoUse() {
-            return this.doUse;
-        }
-
-        public void setDoUse(final String doUse) {
-            this.doUse = doUse;
-        }
-    }
-
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/StandardModelFactoriesV1Test.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/StandardModelFactoriesV1Test.java
deleted file mode 100644
index 94b53ba96582..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/StandardModelFactoriesV1Test.java
+++ /dev/null
@@ -1,332 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-import static org.junit.Assert.assertEquals;
-
-import java.lang.reflect.Method;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import java.util.Calendar;
-import java.util.Collections;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.LinkedHashSet;
-import java.util.TreeSet;
-import java.util.UUID;
-import org.junit.Assert;
-import org.junit.Test;
-import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;
-import software.amazon.awssdk.core.SdkBytes;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-import software.amazon.awssdk.services.dynamodb.pojos.SubClass;
-import software.amazon.awssdk.services.dynamodb.pojos.TestClass;
-import software.amazon.awssdk.services.dynamodb.pojos.UnannotatedSubClass;
-
-public class StandardModelFactoriesV1Test {
-
-    protected static final DynamoDbMapperConfig CONFIG = new DynamoDbMapperConfig.Builder()
-            .withTypeConverterFactory(DynamoDbMapperConfig.DEFAULT.getTypeConverterFactory())
-            .withConversionSchema(ConversionSchemas.V1)
-            .build();
-
-    private static final DynamoDbMapperModelFactory factory = StandardModelFactories.of(S3Link.Factory.of(null));
-    private static final DynamoDbMapperModelFactory.TableFactory models = factory.getTableFactory(CONFIG);
-
-    protected <T> AttributeValue convert(Class<T> clazz, Method getter, Object value) {
-        final StandardAnnotationMaps.FieldMap<Object> map = StandardAnnotationMaps.of(getter, null);
-        return models.getTable(clazz).field(map.attributeName()).convert(value);
-    }
-
-    @Test
-    public void testBoolean() {
-        assertEquals("1", convert("getBoolean", true).n());
-        assertEquals("0", convert("getBoolean", false).n());
-        assertEquals("1", convert("getBoxedBoolean", true).n());
-        assertEquals("0", convert("getBoxedBoolean", false).n());
-
-        assertEquals(true, convert("getNativeBoolean", true).bool());
-        assertEquals(false, convert("getNativeBoolean", false).bool());
-    }
-
-    @Test
-    public void testString() {
-        assertEquals("abc", convert("getString", "abc").s());
-
-        assertEquals(RandomUuidMarshaller.randomUUID,
-                     convert("getCustomString", "abc").s());
-    }
-
-    @Test
-    public void testUuid() {
-        UUID uuid = UUID.randomUUID();
-        assertEquals(uuid.toString(), convert("getUuid", uuid).s());
-    }
-
-    @Test
-    public void testDate() {
-        assertEquals("1970-01-01T00:00:00.001Z",
-                     convert("getDate", new Date(1)).s());
-
-        Calendar c = GregorianCalendar.getInstance();
-        c.setTimeInMillis(1);
-
-        assertEquals("1970-01-01T00:00:00.001Z",
-                     convert("getCalendar", c).s());
-    }
-
-    @Test
-    public void testNumbers() {
-        assertEquals("0", convert("getByte", (byte) 0).n());
-        assertEquals("1", convert("getByte", (byte) 1).n());
-        assertEquals("0", convert("getBoxedByte", (byte) 0).n());
-        assertEquals("1", convert("getBoxedByte", (byte) 1).n());
-
-        assertEquals("0", convert("getShort", (short) 0).n());
-        assertEquals("1", convert("getShort", (short) 1).n());
-        assertEquals("0", convert("getBoxedShort", (short) 0).n());
-        assertEquals("1", convert("getBoxedShort", (short) 1).n());
-
-        assertEquals("0", convert("getInt", 0).n());
-        assertEquals("1", convert("getInt", 1).n());
-        assertEquals("0", convert("getBoxedInt", 0).n());
-        assertEquals("1", convert("getBoxedInt", 1).n());
-
-        assertEquals("0", convert("getLong", 0l).n());
-        assertEquals("1", convert("getLong", 1l).n());
-        assertEquals("0", convert("getBoxedLong", 0l).n());
-        assertEquals("1", convert("getBoxedLong", 1l).n());
-
-        assertEquals("0", convert("getBigInt", BigInteger.ZERO).n());
-        assertEquals("1", convert("getBigInt", BigInteger.ONE).n());
-
-        assertEquals("0.0", convert("getFloat", 0f).n());
-        assertEquals("1.0", convert("getFloat", 1f).n());
-        assertEquals("0.0", convert("getBoxedFloat", 0f).n());
-        assertEquals("1.0", convert("getBoxedFloat", 1f).n());
-
-        assertEquals("0.0", convert("getDouble", 0d).n());
-        assertEquals("1.0", convert("getDouble", 1d).n());
-        assertEquals("0.0", convert("getBoxedDouble", 0d).n());
-        assertEquals("1.0", convert("getBoxedDouble", 1d).n());
-
-        assertEquals("0", convert("getBigDecimal", BigDecimal.ZERO).n());
-        assertEquals("1", convert("getBigDecimal", BigDecimal.ONE).n());
-    }
-
-    @Test
-    public void testBinary() {
-        SdkBytes value = SdkBytes.fromUtf8String("value");
-        assertEquals(value, convert("getByteArray", value.asByteArray()).b());
-        assertEquals(value, convert("getByteBuffer", value.asByteBuffer()).b());
-    }
-
-    @Test
-    public void testBooleanSet() {
-        assertEquals(Collections.singletonList("1"),
-                     convert("getBooleanSet", Collections.singleton(true)).ns());
-
-        assertEquals(Collections.singletonList("0"),
-                     convert("getBooleanSet", Collections.singleton(false)).ns());
-
-        assertEquals(Arrays.asList("0", "1"),
-                     convert("getBooleanSet", new TreeSet<Boolean>() {{
-                         add(true);
-                         add(false);
-                     }}).ns());
-    }
-
-    @Test
-    public void testStringSet() {
-        assertEquals(Collections.singletonList("a"),
-                     convert("getStringSet", Collections.singleton("a")).ss());
-        assertEquals(Collections.singletonList("b"),
-                     convert("getStringSet", Collections.singleton("b")).ss());
-
-        assertEquals(Arrays.asList("a", "b", "c"),
-                     convert("getStringSet", new TreeSet<String>() {{
-                         add("a");
-                         add("b");
-                         add("c");
-                     }}).ss());
-    }
-
-    @Test
-    public void testUuidSet() {
-        final UUID one = UUID.randomUUID();
-        final UUID two = UUID.randomUUID();
-        final UUID three = UUID.randomUUID();
-
-        assertEquals(Collections.singletonList(one.toString()),
-                     convert("getUuidSet", Collections.singleton(one)).ss());
-
-        assertEquals(Collections.singletonList(two.toString()),
-                     convert("getUuidSet", Collections.singleton(two)).ss());
-
-        assertEquals(
-                Arrays.asList(
-                        one.toString(),
-                        two.toString(),
-                        three.toString()),
-                convert("getUuidSet", new LinkedHashSet<UUID>() {{
-                    add(one);
-                    add(two);
-                    add(three);
-                }}).ss());
-    }
-
-    @Test
-    public void testDateSet() {
-        assertEquals(Collections.singletonList("1970-01-01T00:00:00.001Z"),
-                     convert("getDateSet", Collections.singleton(new Date(1)))
-                             .ss());
-
-        Calendar c = GregorianCalendar.getInstance();
-        c.setTimeInMillis(1);
-
-        assertEquals(Collections.singletonList("1970-01-01T00:00:00.001Z"),
-                     convert("getCalendarSet", Collections.singleton(c))
-                             .ss());
-    }
-
-    @Test
-    public void testNumberSet() {
-        assertEquals(Collections.singletonList("0"),
-                     convert("getByteSet", Collections.singleton((byte) 0)).ns());
-        assertEquals(Collections.singletonList("0"),
-                     convert("getShortSet", Collections.singleton((short) 0)).ns());
-        assertEquals(Collections.singletonList("0"),
-                     convert("getIntSet", Collections.singleton(0)).ns());
-        assertEquals(Collections.singletonList("0"),
-                     convert("getLongSet", Collections.singleton(0l)).ns());
-        assertEquals(Collections.singletonList("0"),
-                     convert("getBigIntegerSet", Collections.singleton(BigInteger.ZERO))
-                             .ns());
-        assertEquals(Collections.singletonList("0.0"),
-                     convert("getFloatSet", Collections.singleton(0f)).ns());
-        assertEquals(Collections.singletonList("0.0"),
-                     convert("getDoubleSet", Collections.singleton(0d)).ns());
-        assertEquals(Collections.singletonList("0"),
-                     convert("getBigDecimalSet", Collections.singleton(BigDecimal.ZERO))
-                             .ns());
-
-        assertEquals(Arrays.asList("0", "1", "2"),
-                     convert("getLongSet", new TreeSet<Number>() {{
-                         add(0);
-                         add(1);
-                         add(2);
-                     }}).ns());
-    }
-
-    @Test
-    public void testBinarySet() {
-        SdkBytes test = SdkBytes.fromUtf8String("test");
-        SdkBytes test2 = SdkBytes.fromUtf8String("test2");
-
-        assertEquals(Collections.singletonList(test),
-                     convert("getByteArraySet", Collections.singleton(test.asByteArray())).bs());
-
-        assertEquals(Collections.singletonList(test),
-                     convert("getByteBufferSet", Collections.singleton(test.asByteBuffer())).bs());
-
-        assertEquals(Arrays.asList(test, test2),
-                     convert("getByteBufferSet", new TreeSet<ByteBuffer>() {{
-                         add(test.asByteBuffer());
-                         add(test2.asByteBuffer());
-                     }}).bs());
-    }
-
-    @Test
-    public void testObjectSet() {
-        Object o = new Object() {
-            @Override
-            public String toString() {
-                return "hello";
-            }
-        };
-
-        assertEquals(Collections.singletonList("hello"),
-                     convert("getObjectSet", Collections.singleton(o)).ss());
-    }
-
-    @Test
-    public void testList() {
-        try {
-            convert("getList", Arrays.asList("a", "b", "c"));
-            Assert.fail("Expected DynamoDBMappingException");
-        } catch (DynamoDbMappingException e) {
-            // Ignored or expected.
-        }
-    }
-
-    @Test
-    public void testMap() {
-        try {
-            convert("getMap", Collections.singletonMap("a", "b"));
-            Assert.fail("Expected DynamoDBMappingException");
-        } catch (DynamoDbMappingException e) {
-            // Ignored or expected.
-        }
-    }
-
-    @Test
-    public void testObject() {
-        try {
-            convert("getObject", new SubClass());
-            Assert.fail("Expected DynamoDBMappingException");
-        } catch (DynamoDbMappingException e) {
-            // Ignored or expected.
-        }
-    }
-
-    @Test
-    public void testUnannotatedObject() throws Exception {
-        try {
-            convert(UnannotatedSubClass.class, UnannotatedSubClass.class.getMethod("getChild"),
-                    new UnannotatedSubClass());
-
-            Assert.fail("Expected DynamoDBMappingException");
-        } catch (DynamoDbMappingException e) {
-            // Ignored or expected.
-        }
-    }
-
-    @Test
-    public void testS3Link() {
-        S3ClientCache cache = new S3ClientCache((AwsCredentialsProvider) null);
-        S3Link link = new S3Link(cache, "bucket", "key");
-
-        assertEquals("{\"s3\":{"
-                     + "\"bucket\":\"bucket\","
-                     + "\"key\":\"key\","
-                     + "\"region\":null}}",
-                     convert("getS3Link", link).s());
-    }
-
-    private AttributeValue convert(String getter, Object value) {
-        try {
-            return convert(TestClass.class, TestClass.class.getMethod(getter), value);
-
-        } catch (RuntimeException e) {
-            throw e;
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/StandardModelFactoriesV2CompatibleTest.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/StandardModelFactoriesV2CompatibleTest.java
deleted file mode 100644
index b967a91f0e31..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/StandardModelFactoriesV2CompatibleTest.java
+++ /dev/null
@@ -1,379 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-import static org.junit.Assert.assertEquals;
-
-import java.lang.reflect.Method;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import java.util.Calendar;
-import java.util.Collections;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.HashMap;
-import java.util.LinkedHashSet;
-import java.util.Set;
-import java.util.TimeZone;
-import java.util.TreeSet;
-import java.util.UUID;
-import org.junit.Assert;
-import org.junit.Test;
-import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;
-import software.amazon.awssdk.core.SdkBytes;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-import software.amazon.awssdk.services.dynamodb.pojos.SubClass;
-import software.amazon.awssdk.services.dynamodb.pojos.TestClass;
-import software.amazon.awssdk.services.dynamodb.pojos.UnannotatedSubClass;
-
-public class StandardModelFactoriesV2CompatibleTest {
-
-    protected static final DynamoDbMapperConfig CONFIG = new DynamoDbMapperConfig.Builder()
-            .withTypeConverterFactory(DynamoDbMapperConfig.DEFAULT.getTypeConverterFactory())
-            .withConversionSchema(ConversionSchemas.V2_COMPATIBLE)
-            .build();
-
-    private static final DynamoDbMapperModelFactory factory = StandardModelFactories.of(S3Link.Factory.of(null));
-    private static final DynamoDbMapperModelFactory.TableFactory models = factory.getTableFactory(CONFIG);
-
-    protected <T> AttributeValue convert(Class<T> clazz, Method getter, Object value) {
-        final StandardAnnotationMaps.FieldMap<Object> map = StandardAnnotationMaps.of(getter, null);
-        return models.getTable(clazz).field(map.attributeName()).convert(value);
-    }
-
-    @Test
-    public void testBoolean() {
-        assertEquals("1", convert("getBoolean", true).n());
-        assertEquals("0", convert("getBoolean", false).n());
-        assertEquals("1", convert("getBoxedBoolean", true).n());
-        assertEquals("0", convert("getBoxedBoolean", false).n());
-
-        assertEquals(true, convert("getNativeBoolean", true).bool());
-        assertEquals(false, convert("getNativeBoolean", false).bool());
-    }
-
-    @Test
-    public void testString() {
-        assertEquals("abc", convert("getString", "abc").s());
-
-        assertEquals(RandomUuidMarshaller.randomUUID,
-                     convert("getCustomString", "abc").s());
-    }
-
-    @Test
-    public void testUuid() {
-        UUID uuid = UUID.randomUUID();
-        assertEquals(uuid.toString(), convert("getUuid", uuid).s());
-    }
-
-    @Test
-    public void testDate() {
-        assertEquals("1970-01-01T00:00:00.001Z",
-                     convert("getDate", new Date(1)).s());
-    }
-
-    @Test
-    public void testCalendar() {
-        Calendar c = GregorianCalendar.getInstance();
-        c.setTimeInMillis(0);
-        c.setTimeZone(TimeZone.getTimeZone("Z"));
-
-        assertEquals("1970-01-01T00:00:00Z",
-            convert("getCalendar", c).s());
-    }
-
-    @Test
-    public void testNumbers() {
-        assertEquals("0", convert("getByte", (byte) 0).n());
-        assertEquals("1", convert("getByte", (byte) 1).n());
-        assertEquals("0", convert("getBoxedByte", (byte) 0).n());
-        assertEquals("1", convert("getBoxedByte", (byte) 1).n());
-
-        assertEquals("0", convert("getShort", (short) 0).n());
-        assertEquals("1", convert("getShort", (short) 1).n());
-        assertEquals("0", convert("getBoxedShort", (short) 0).n());
-        assertEquals("1", convert("getBoxedShort", (short) 1).n());
-
-        assertEquals("0", convert("getInt", 0).n());
-        assertEquals("1", convert("getInt", 1).n());
-        assertEquals("0", convert("getBoxedInt", 0).n());
-        assertEquals("1", convert("getBoxedInt", 1).n());
-
-        assertEquals("0", convert("getLong", 0l).n());
-        assertEquals("1", convert("getLong", 1l).n());
-        assertEquals("0", convert("getBoxedLong", 0l).n());
-        assertEquals("1", convert("getBoxedLong", 1l).n());
-
-        assertEquals("0", convert("getBigInt", BigInteger.ZERO).n());
-        assertEquals("1", convert("getBigInt", BigInteger.ONE).n());
-
-        assertEquals("0.0", convert("getFloat", 0f).n());
-        assertEquals("1.0", convert("getFloat", 1f).n());
-        assertEquals("0.0", convert("getBoxedFloat", 0f).n());
-        assertEquals("1.0", convert("getBoxedFloat", 1f).n());
-
-        assertEquals("0.0", convert("getDouble", 0d).n());
-        assertEquals("1.0", convert("getDouble", 1d).n());
-        assertEquals("0.0", convert("getBoxedDouble", 0d).n());
-        assertEquals("1.0", convert("getBoxedDouble", 1d).n());
-
-        assertEquals("0", convert("getBigDecimal", BigDecimal.ZERO).n());
-        assertEquals("1", convert("getBigDecimal", BigDecimal.ONE).n());
-    }
-
-    @Test
-    public void testBinary() {
-        SdkBytes value = SdkBytes.fromUtf8String("value");
-        assertEquals(value, convert("getByteArray", value.asByteArray()).b());
-        assertEquals(value, convert("getByteBuffer", value.asByteBuffer()).b());
-    }
-
-    @Test
-    public void testBooleanSet() {
-        assertEquals(Collections.singletonList("1"),
-                     convert("getBooleanSet", Collections.singleton(true)).ns());
-
-        assertEquals(Collections.singletonList("0"),
-                     convert("getBooleanSet", Collections.singleton(false)).ns());
-
-        assertEquals(Arrays.asList("0", "1"),
-                     convert("getBooleanSet", new TreeSet<Boolean>() {{
-                         add(true);
-                         add(false);
-                     }}).ns());
-    }
-
-    @Test
-    public void testStringSet() {
-        assertEquals(Collections.singletonList("a"),
-                     convert("getStringSet", Collections.singleton("a")).ss());
-        assertEquals(Collections.singletonList("b"),
-                     convert("getStringSet", Collections.singleton("b")).ss());
-
-        assertEquals(Arrays.asList("a", "b", "c"),
-                     convert("getStringSet", new TreeSet<String>() {{
-                         add("a");
-                         add("b");
-                         add("c");
-                     }}).ss());
-    }
-
-    @Test
-    public void testUuidSet() {
-        final UUID one = UUID.randomUUID();
-        final UUID two = UUID.randomUUID();
-        final UUID three = UUID.randomUUID();
-
-        assertEquals(Collections.singletonList(one.toString()),
-                     convert("getUuidSet", Collections.singleton(one)).ss());
-
-        assertEquals(Collections.singletonList(two.toString()),
-                     convert("getUuidSet", Collections.singleton(two)).ss());
-
-        assertEquals(
-                Arrays.asList(
-                        one.toString(),
-                        two.toString(),
-                        three.toString()),
-                convert("getUuidSet", new LinkedHashSet<UUID>() {{
-                    add(one);
-                    add(two);
-                    add(three);
-                }}).ss());
-    }
-
-    @Test
-    public void testDateSet() {
-        assertEquals(Collections.singletonList("1970-01-01T00:00:00.001Z"),
-                     convert("getDateSet", Collections.singleton(new Date(1)))
-                             .ss());
-
-        Calendar c = GregorianCalendar.getInstance();
-        c.setTimeInMillis(1);
-
-        assertEquals(Collections.singletonList("1970-01-01T00:00:00.001Z"),
-                     convert("getCalendarSet", Collections.singleton(c))
-                             .ss());
-    }
-
-    @Test
-    public void testNumberSet() {
-        assertEquals(Collections.singletonList("0"),
-                     convert("getByteSet", Collections.singleton((byte) 0)).ns());
-        assertEquals(Collections.singletonList("0"),
-                     convert("getShortSet", Collections.singleton((short) 0)).ns());
-        assertEquals(Collections.singletonList("0"),
-                     convert("getIntSet", Collections.singleton(0)).ns());
-        assertEquals(Collections.singletonList("0"),
-                     convert("getLongSet", Collections.singleton(0l)).ns());
-        assertEquals(Collections.singletonList("0"),
-                     convert("getBigIntegerSet", Collections.singleton(BigInteger.ZERO))
-                             .ns());
-        assertEquals(Collections.singletonList("0.0"),
-                     convert("getFloatSet", Collections.singleton(0f)).ns());
-        assertEquals(Collections.singletonList("0.0"),
-                     convert("getDoubleSet", Collections.singleton(0d)).ns());
-        assertEquals(Collections.singletonList("0"),
-                     convert("getBigDecimalSet", Collections.singleton(BigDecimal.ZERO))
-                             .ns());
-
-        assertEquals(Arrays.asList("0", "1", "2"),
-                     convert("getLongSet", new TreeSet<Number>() {{
-                         add(0);
-                         add(1);
-                         add(2);
-                     }}).ns());
-    }
-
-    @Test
-    public void testBinarySet() {
-        SdkBytes test = SdkBytes.fromUtf8String("test");
-        SdkBytes test2 = SdkBytes.fromUtf8String("test2");
-
-        assertEquals(Collections.singletonList(test),
-                     convert("getByteArraySet", Collections.singleton(test.asByteArray())).bs());
-
-        assertEquals(Collections.singletonList(test),
-                     convert("getByteBufferSet", Collections.singleton(test.asByteBuffer())).bs());
-
-        assertEquals(Arrays.asList(test, test2),
-                     convert("getByteBufferSet", new TreeSet<ByteBuffer>() {{
-                         add(test.asByteBuffer());
-                         add(test2.asByteBuffer());
-                     }}).bs());
-    }
-
-    @Test
-    public void testObjectSet() {
-        Object o = new Object() {
-            @Override
-            public String toString() {
-                return "hello";
-            }
-        };
-
-        assertEquals(Collections.singletonList("hello"),
-                     convert("getObjectSet", Collections.singleton(o)).ss());
-    }
-
-    @Test
-    public void testList() {
-        assertEquals(Arrays.asList(
-                AttributeValue.builder().s("a").build(),
-                AttributeValue.builder().s("b").build(),
-                AttributeValue.builder().s("c").build()),
-                     convert("getList", Arrays.asList("a", "b", "c")).l());
-
-        assertEquals(Arrays.asList(AttributeValue.builder().nul(true).build()),
-                     convert("getList", Collections.<String>singletonList(null)).l());
-    }
-
-    @Test
-    public void testSetList() {
-        assertEquals(Arrays.asList(
-                AttributeValue.builder().ss("a").build(),
-                AttributeValue.builder().ss("b").build(),
-                AttributeValue.builder().ss("c").build()),
-                     convert("getSetList", Arrays.asList(
-                             Collections.singleton("a"),
-                             Collections.singleton("b"),
-                             Collections.singleton("c"))).l());
-    }
-
-    @Test
-    public void testMap() {
-        assertEquals(new HashMap<String, AttributeValue>() {{
-                         put("a", AttributeValue.builder().s("b").build());
-                         put("c", AttributeValue.builder().s("d").build());
-                         put("e", AttributeValue.builder().s("f").build());
-                     }},
-                     convert("getMap", new HashMap<String, String>() {{
-                         put("a", "b");
-                         put("c", "d");
-                         put("e", "f");
-                     }}).m());
-
-        assertEquals(Collections.singletonMap("a", AttributeValue.builder().nul(true).build()),
-                     convert("getMap", Collections.<String, String>singletonMap("a", null)).m());
-    }
-
-    @Test
-    public void testSetMap() {
-        assertEquals(new HashMap<String, AttributeValue>() {{
-                         put("a", AttributeValue.builder().ss("a", "b").build());
-                     }},
-                     convert("getSetMap", new HashMap<String, Set<String>>() {{
-                         put("a", new TreeSet<String>(Arrays.asList("a", "b")));
-                     }}).m());
-
-        assertEquals(new HashMap<String, AttributeValue>() {{
-                         put("a", AttributeValue.builder().ss("a").build());
-                         put("b", AttributeValue.builder().nul(true).build());
-                     }},
-                     convert("getSetMap", new HashMap<String, Set<String>>() {{
-                         put("a", new TreeSet<String>(Arrays.asList("a")));
-                         put("b", null);
-                     }}).m());
-    }
-
-    @Test
-    public void testObject() {
-        assertEquals(new HashMap<String, AttributeValue>() {{
-                         put("name", AttributeValue.builder().s("name").build());
-                         put("value", AttributeValue.builder().n("123").build());
-                     }},
-                     convert("getObject", new SubClass()).m());
-    }
-
-    @Test
-    public void testUnannotatedObject() throws Exception {
-        try {
-            convert(UnannotatedSubClass.class, UnannotatedSubClass.class.getMethod("getChild"),
-                    new UnannotatedSubClass());
-
-            Assert.fail("Expected DynamoDBMappingException");
-        } catch (DynamoDbMappingException e) {
-            // Ignored or expected.
-        }
-    }
-
-    @Test
-    public void testS3Link() {
-        S3ClientCache cache = new S3ClientCache((AwsCredentialsProvider) null);
-        S3Link link = new S3Link(cache, "bucket", "key");
-
-        assertEquals("{\"s3\":{"
-                     + "\"bucket\":\"bucket\","
-                     + "\"key\":\"key\","
-                     + "\"region\":null}}",
-                     convert("getS3Link", link).s());
-    }
-
-    private AttributeValue convert(String getter, Object value) {
-        try {
-
-            return convert(TestClass.class, TestClass.class.getMethod(getter), value);
-
-        } catch (RuntimeException e) {
-            throw e;
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/StandardModelFactoriesV2Test.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/StandardModelFactoriesV2Test.java
deleted file mode 100644
index e0d60beb151f..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/StandardModelFactoriesV2Test.java
+++ /dev/null
@@ -1,392 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-import static org.junit.Assert.assertEquals;
-
-import java.lang.reflect.Method;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Calendar;
-import java.util.Collections;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.HashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.TreeSet;
-import java.util.UUID;
-import org.junit.Assert;
-import org.junit.Test;
-import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;
-import software.amazon.awssdk.core.SdkBytes;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-import software.amazon.awssdk.services.dynamodb.pojos.SubClass;
-import software.amazon.awssdk.services.dynamodb.pojos.TestClass;
-import software.amazon.awssdk.services.dynamodb.pojos.UnannotatedSubClass;
-
-public class StandardModelFactoriesV2Test {
-
-    protected static final DynamoDbMapperConfig CONFIG = new DynamoDbMapperConfig.Builder()
-            .withTypeConverterFactory(DynamoDbMapperConfig.DEFAULT.getTypeConverterFactory())
-            .withConversionSchema(ConversionSchemas.V2)
-            .build();
-
-    private static final DynamoDbMapperModelFactory factory = StandardModelFactories.of(S3Link.Factory.of(null));
-    private static final DynamoDbMapperModelFactory.TableFactory models = factory.getTableFactory(CONFIG);
-
-    protected <T> AttributeValue convert(Class<T> clazz, Method getter, Object value) {
-        final StandardAnnotationMaps.FieldMap<Object> map = StandardAnnotationMaps.of(getter, null);
-        return models.getTable(clazz).field(map.attributeName()).convert(value);
-    }
-
-    @Test
-    public void testBoolean() {
-        // These are all native booleans by default in the v2 schema
-        assertEquals(true, convert("getBoolean", true).bool());
-        assertEquals(false, convert("getBoolean", false).bool());
-        assertEquals(true, convert("getBoxedBoolean", true).bool());
-        assertEquals(false, convert("getBoxedBoolean", false).bool());
-        assertEquals(true, convert("getNativeBoolean", true).bool());
-        assertEquals(false, convert("getNativeBoolean", false).bool());
-    }
-
-    @Test
-    public void testString() {
-        assertEquals("abc", convert("getString", "abc").s());
-
-        assertEquals(RandomUuidMarshaller.randomUUID,
-                     convert("getCustomString", "abc").s());
-    }
-
-    @Test
-    public void testUuid() {
-        UUID uuid = UUID.randomUUID();
-        assertEquals(uuid.toString(), convert("getUuid", uuid).s());
-    }
-
-    @Test
-    public void testDate() {
-        assertEquals("1970-01-01T00:00:00Z",
-                     convert("getDate", new Date(0)).s());
-
-        Calendar c = GregorianCalendar.getInstance();
-        c.setTimeInMillis(0);
-
-        assertEquals("1970-01-01T00:00:00Z",
-                     convert("getCalendar", c).s());
-    }
-
-    @Test
-    public void testNumbers() {
-        assertEquals("0", convert("getByte", (byte) 0).n());
-        assertEquals("1", convert("getByte", (byte) 1).n());
-        assertEquals("0", convert("getBoxedByte", (byte) 0).n());
-        assertEquals("1", convert("getBoxedByte", (byte) 1).n());
-
-        assertEquals("0", convert("getShort", (short) 0).n());
-        assertEquals("1", convert("getShort", (short) 1).n());
-        assertEquals("0", convert("getBoxedShort", (short) 0).n());
-        assertEquals("1", convert("getBoxedShort", (short) 1).n());
-
-        assertEquals("0", convert("getInt", 0).n());
-        assertEquals("1", convert("getInt", 1).n());
-        assertEquals("0", convert("getBoxedInt", 0).n());
-        assertEquals("1", convert("getBoxedInt", 1).n());
-
-        assertEquals("0", convert("getLong", 0l).n());
-        assertEquals("1", convert("getLong", 1l).n());
-        assertEquals("0", convert("getBoxedLong", 0l).n());
-        assertEquals("1", convert("getBoxedLong", 1l).n());
-
-        assertEquals("0", convert("getBigInt", BigInteger.ZERO).n());
-        assertEquals("1", convert("getBigInt", BigInteger.ONE).n());
-
-        assertEquals("0.0", convert("getFloat", 0f).n());
-        assertEquals("1.0", convert("getFloat", 1f).n());
-        assertEquals("0.0", convert("getBoxedFloat", 0f).n());
-        assertEquals("1.0", convert("getBoxedFloat", 1f).n());
-
-        assertEquals("0.0", convert("getDouble", 0d).n());
-        assertEquals("1.0", convert("getDouble", 1d).n());
-        assertEquals("0.0", convert("getBoxedDouble", 0d).n());
-        assertEquals("1.0", convert("getBoxedDouble", 1d).n());
-
-        assertEquals("0", convert("getBigDecimal", BigDecimal.ZERO).n());
-        assertEquals("1", convert("getBigDecimal", BigDecimal.ONE).n());
-    }
-
-    @Test
-    public void testBinary() {
-        SdkBytes value = SdkBytes.fromUtf8String("value");
-        assertEquals(value, convert("getByteArray", value.asByteArray()).b());
-        assertEquals(value, convert("getByteBuffer", value.asByteBuffer()).b());
-    }
-
-    @Test
-    public void testBooleanSet() {
-        // Set<Boolean> (which is silly but technically valid) gets mapped to
-        // a List of Booleans now via the ObjectSetToListMarshaller.
-        AttributeValue value =
-                convert("getBooleanSet", Collections.singleton(true));
-
-        Assert.assertEquals(1, value.l().size());
-        Assert.assertEquals(true, value.l().get(0).bool());
-    }
-
-    @Test
-    public void testStringSet() {
-        assertEquals(Collections.singletonList("a"),
-                     convert("getStringSet", Collections.singleton("a")).ss());
-        assertEquals(Collections.singletonList("b"),
-                     convert("getStringSet", Collections.singleton("b")).ss());
-
-        assertEquals(Arrays.asList("a", "b", "c"),
-                     convert("getStringSet", new TreeSet<String>() {{
-                         add("a");
-                         add("b");
-                         add("c");
-                     }}).ss());
-    }
-
-    @Test
-    public void testUuidSet() {
-        final UUID one = UUID.randomUUID();
-        final UUID two = UUID.randomUUID();
-        final UUID three = UUID.randomUUID();
-
-        assertEquals(Collections.singletonList(one.toString()),
-                     convert("getUuidSet", Collections.singleton(one)).ss());
-
-        assertEquals(Collections.singletonList(two.toString()),
-                     convert("getUuidSet", Collections.singleton(two)).ss());
-
-        assertEquals(
-                Arrays.asList(
-                        one.toString(),
-                        two.toString(),
-                        three.toString()),
-                convert("getUuidSet", new LinkedHashSet<UUID>() {{
-                    add(one);
-                    add(two);
-                    add(three);
-                }}).ss());
-    }
-
-    @Test
-    public void testDateSet() {
-        assertEquals(Collections.singletonList("1970-01-01T00:00:00Z"),
-                     convert("getDateSet", Collections.singleton(new Date(0)))
-                             .ss());
-
-        Calendar c = GregorianCalendar.getInstance();
-        c.setTimeInMillis(0);
-
-        assertEquals(Collections.singletonList("1970-01-01T00:00:00Z"),
-                     convert("getCalendarSet", Collections.singleton(c))
-                             .ss());
-    }
-
-    @Test
-    public void testNumberSet() {
-        assertEquals(Collections.singletonList("0"),
-                     convert("getByteSet", Collections.singleton((byte) 0)).ns());
-        assertEquals(Collections.singletonList("0"),
-                     convert("getShortSet", Collections.singleton((short) 0)).ns());
-        assertEquals(Collections.singletonList("0"),
-                     convert("getIntSet", Collections.singleton(0)).ns());
-        assertEquals(Collections.singletonList("0"),
-                     convert("getLongSet", Collections.singleton(0l)).ns());
-        assertEquals(Collections.singletonList("0"),
-                     convert("getBigIntegerSet", Collections.singleton(BigInteger.ZERO))
-                             .ns());
-        assertEquals(Collections.singletonList("0.0"),
-                     convert("getFloatSet", Collections.singleton(0f)).ns());
-        assertEquals(Collections.singletonList("0.0"),
-                     convert("getDoubleSet", Collections.singleton(0d)).ns());
-        assertEquals(Collections.singletonList("0"),
-                     convert("getBigDecimalSet", Collections.singleton(BigDecimal.ZERO))
-                             .ns());
-
-        assertEquals(Arrays.asList("0", "1", "2"),
-                     convert("getLongSet", new TreeSet<Number>() {{
-                         add(0);
-                         add(1);
-                         add(2);
-                     }}).ns());
-    }
-
-    @Test
-    public void testBinarySet() {
-        SdkBytes test = SdkBytes.fromUtf8String("test");
-        SdkBytes test2 = SdkBytes.fromUtf8String("test2");
-
-        assertEquals(Collections.singletonList(test),
-                     convert("getByteArraySet", Collections.singleton(test.asByteArray())).bs());
-
-        assertEquals(Collections.singletonList(test),
-                     convert("getByteBufferSet", Collections.singleton(test.asByteBuffer())).bs());
-
-        assertEquals(Arrays.asList(test, test2),
-                     convert("getByteBufferSet", new TreeSet<ByteBuffer>() {{
-                         add(test.asByteBuffer());
-                         add(test2.asByteBuffer());
-                     }}).bs());
-    }
-
-    @Test
-    public void testObjectSet() {
-        AttributeValue value =
-                convert("getObjectSet", Collections.singleton(new SubClass()));
-
-        assertEquals(1, value.l().size());
-        assertEquals(new HashMap<String, AttributeValue>() {{
-                         put("name", AttributeValue.builder().s("name").build());
-                         put("value", AttributeValue.builder().n("123").build());
-                     }},
-                     value.l().get(0).m());
-
-        assertEquals(Arrays.asList(AttributeValue.builder().nul(true).build()),
-                     convert("getObjectSet", Collections.<SubClass>singleton(null)).l());
-    }
-
-    @Test
-    public void testList() {
-        assertEquals(Arrays.asList(
-                AttributeValue.builder().s("a").build(),
-                AttributeValue.builder().s("b").build(),
-                AttributeValue.builder().s("c").build()),
-                     convert("getList", Arrays.asList("a", "b", "c")).l());
-
-        assertEquals(Arrays.asList(AttributeValue.builder().nul(true).build()),
-                     convert("getList", Collections.<String>singletonList(null)).l());
-    }
-
-    @Test
-    public void testObjectList() {
-        AttributeValue value = convert(
-                "getObjectList",
-                Collections.singletonList(new SubClass()));
-
-        assertEquals(1, value.l().size());
-        assertEquals(new HashMap<String, AttributeValue>() {{
-                         put("name", AttributeValue.builder().s("name").build());
-                         put("value", AttributeValue.builder().n("123").build());
-                     }},
-                     value.l().get(0).m());
-    }
-
-    @Test
-    public void testSetList() {
-        assertEquals(
-                Arrays.asList(AttributeValue.builder().ss("a").build()),
-                convert("getSetList", Arrays.asList(
-                        Collections.<String>singleton("a"))).l());
-
-        List<Set<String>> list = new ArrayList<Set<String>>();
-        list.add(null);
-
-        assertEquals(
-                Arrays.asList(AttributeValue.builder().nul(true).build()),
-                convert("getSetList", list).l());
-    }
-
-    @Test
-    public void testMap() {
-        assertEquals(new HashMap<String, AttributeValue>() {{
-                         put("a", AttributeValue.builder().s("b").build());
-                         put("c", AttributeValue.builder().s("d").build());
-                         put("e", AttributeValue.builder().s("f").build());
-                     }},
-                     convert("getMap", new HashMap<String, String>() {{
-                         put("a", "b");
-                         put("c", "d");
-                         put("e", "f");
-                     }}).m());
-
-        assertEquals(Collections.singletonMap("a", AttributeValue.builder().nul(true).build()),
-                     convert("getMap", Collections.<String, String>singletonMap("a", null)).m());
-    }
-
-    @Test
-    public void testSetMap() {
-        assertEquals(new HashMap<String, AttributeValue>() {{
-                         put("a", AttributeValue.builder().ss("a", "b").build());
-                     }},
-                     convert("getSetMap", new HashMap<String, Set<String>>() {{
-                         put("a", new TreeSet<String>(Arrays.asList("a", "b")));
-                     }}).m());
-
-        assertEquals(new HashMap<String, AttributeValue>() {{
-                         put("a", AttributeValue.builder().ss("a").build());
-                         put("b", AttributeValue.builder().nul(true).build());
-                     }},
-                     convert("getSetMap", new HashMap<String, Set<String>>() {{
-                         put("a", new TreeSet<String>(Arrays.asList("a")));
-                         put("b", null);
-                     }}).m());
-    }
-
-    @Test
-    public void testObject() {
-        assertEquals(new HashMap<String, AttributeValue>() {{
-                         put("name", AttributeValue.builder().s("name").build());
-                         put("value", AttributeValue.builder().n("123").build());
-                     }},
-                     convert("getObject", new SubClass()).m());
-    }
-
-    @Test
-    public void testUnannotatedObject() throws Exception {
-        try {
-            convert(UnannotatedSubClass.class, UnannotatedSubClass.class.getMethod("getChild"),
-                    new UnannotatedSubClass());
-
-            Assert.fail("Expected DynamoDBMappingException");
-        } catch (DynamoDbMappingException e) {
-            // Ignored or expected.
-        }
-    }
-
-    @Test
-    public void testS3Link() {
-        S3ClientCache cache = new S3ClientCache((AwsCredentialsProvider) null);
-        S3Link link = new S3Link(cache, "bucket", "key");
-
-        assertEquals("{\"s3\":{"
-                     + "\"bucket\":\"bucket\","
-                     + "\"key\":\"key\","
-                     + "\"region\":null}}",
-                     convert("getS3Link", link).s());
-    }
-
-    private AttributeValue convert(String getter, Object value) {
-        try {
-
-            return convert(TestClass.class, TestClass.class.getMethod(getter), value);
-
-        } catch (RuntimeException e) {
-            throw e;
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/StandardModelFactoriesV2UnconvertTest.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/StandardModelFactoriesV2UnconvertTest.java
deleted file mode 100644
index 9e73b4583dc0..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/StandardModelFactoriesV2UnconvertTest.java
+++ /dev/null
@@ -1,545 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-
-import java.lang.reflect.Method;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.nio.ByteBuffer;
-import java.time.Instant;
-import java.util.Arrays;
-import java.util.Calendar;
-import java.util.Collections;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.TreeSet;
-import java.util.UUID;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;
-import software.amazon.awssdk.core.SdkBytes;
-import software.amazon.awssdk.regions.Region;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-import software.amazon.awssdk.services.dynamodb.pojos.SubClass;
-import software.amazon.awssdk.services.dynamodb.pojos.TestClass;
-import software.amazon.awssdk.services.dynamodb.pojos.UnannotatedSubClass;
-
-public class StandardModelFactoriesV2UnconvertTest {
-
-    protected static final DynamoDbMapperConfig CONFIG = new DynamoDbMapperConfig.Builder()
-            .withTypeConverterFactory(DynamoDbMapperConfig.DEFAULT.getTypeConverterFactory())
-            .withConversionSchema(ConversionSchemas.V2)
-            .build();
-
-    private static final DynamoDbMapperModelFactory factory = StandardModelFactories.of(new S3Link.Factory(new S3ClientCache((AwsCredentialsProvider) null)));
-    private static final DynamoDbMapperModelFactory.TableFactory models = factory.getTableFactory(CONFIG);
-
-    protected <T> Object unconvert(Class<T> clazz, Method getter, Method setter, AttributeValue value) {
-        final StandardAnnotationMaps.FieldMap<Object> map = StandardAnnotationMaps.of(getter, null);
-        return models.getTable(clazz).field(map.attributeName()).unconvert(value);
-    }
-
-    @Test
-    public void testBoolean() {
-        assertEquals(false, unconvert("getBoolean", "setBoolean",
-                                      AttributeValue.builder().n("0").build()));
-
-        assertEquals(true, unconvert("getBoolean", "setBoolean",
-                                     AttributeValue.builder().n("1").build()));
-
-        assertEquals(false, unconvert("getBoolean", "setBoolean",
-                                      AttributeValue.builder().bool(false).build()));
-
-        assertEquals(true, unconvert("getBoolean", "setBoolean",
-                                     AttributeValue.builder().bool(true).build()));
-
-        assertEquals(false, unconvert("getBoxedBoolean", "setBoxedBoolean",
-                                      AttributeValue.builder().n("0").build()));
-
-        assertEquals(true, unconvert("getBoxedBoolean", "setBoxedBoolean",
-                                     AttributeValue.builder().n("1").build()));
-
-        assertEquals(false, unconvert("getBoxedBoolean", "setBoxedBoolean",
-                                      AttributeValue.builder().bool(false).build()));
-
-        assertEquals(true, unconvert("getBoxedBoolean", "setBoxedBoolean",
-                                     AttributeValue.builder().bool(true).build()));
-    }
-
-    @Test
-    public void testString() {
-        assertEquals("test", unconvert("getString", "setString",
-                                       AttributeValue.builder().s("test").build()));
-
-        Assert.assertNull(unconvert("getCustomString", "setCustomString",
-                                    AttributeValue.builder().s("ignoreme").build()));
-    }
-
-    @Test
-    public void testUuid() {
-        UUID uuid = UUID.randomUUID();
-        assertEquals(uuid, unconvert("getUuid", "setUuid",
-                                     AttributeValue.builder().s(uuid.toString()).build()));
-    }
-
-    @Test
-    public void testDate() {
-        Date date = Date.from(Instant.ofEpochMilli(0));
-        assertEquals(date, unconvert("getDate", "setDate",
-                                            AttributeValue.builder().s("1970-01-01T00:00:00Z").build()));
-    }
-
-    @Test
-    public void testCalendar() {
-        Calendar c = GregorianCalendar.getInstance();
-        c.setTimeInMillis(1);
-
-        assertEquals(c, unconvert("getCalendar", "setCalendar",
-                                  AttributeValue.builder().s("1970-01-01T00:00:00.001Z").build()));
-    }
-
-    @Test
-    public void testNumbers() {
-        assertEquals((byte) 1, unconvert("getByte", "setByte",
-                                         AttributeValue.builder().n("1").build()));
-        assertEquals((byte) 1, unconvert("getBoxedByte", "setBoxedByte",
-                                         AttributeValue.builder().n("1").build()));
-
-        assertEquals((short) 1, unconvert("getShort", "setShort",
-                                          AttributeValue.builder().n("1").build()));
-        assertEquals((short) 1, unconvert("getBoxedShort", "setBoxedShort",
-                                          AttributeValue.builder().n("1").build()));
-
-        assertEquals(1, unconvert("getInt", "setInt",
-                                  AttributeValue.builder().n("1").build()));
-        assertEquals(1, unconvert("getBoxedInt", "setBoxedInt",
-                                  AttributeValue.builder().n("1").build()));
-
-        assertEquals(1l, unconvert("getLong", "setLong",
-                                   AttributeValue.builder().n("1").build()));
-        assertEquals(1l, unconvert("getBoxedLong", "setBoxedLong",
-                                   AttributeValue.builder().n("1").build()));
-
-        assertEquals(BigInteger.ONE, unconvert("getBigInt", "setBigInt",
-                                               AttributeValue.builder().n("1").build()));
-
-        assertEquals(1.5f, unconvert("getFloat", "setFloat",
-                                     AttributeValue.builder().n("1.5").build()));
-        assertEquals(1.5f, unconvert("getBoxedFloat", "setBoxedFloat",
-                                     AttributeValue.builder().n("1.5").build()));
-
-        assertEquals(1.5d, unconvert("getDouble", "setDouble",
-                                     AttributeValue.builder().n("1.5").build()));
-        assertEquals(1.5d, unconvert("getBoxedDouble", "setBoxedDouble",
-                                     AttributeValue.builder().n("1.5").build()));
-
-        assertEquals(BigDecimal.ONE, unconvert("getBigDecimal", "setBigDecimal",
-                                               AttributeValue.builder().n("1").build()));
-    }
-
-    @Test
-    public void testBinary() {
-        SdkBytes test = SdkBytes.fromUtf8String("test");
-        assertArrayEquals(test.asByteArray(),
-                          (byte[]) unconvert("getByteArray", "setByteArray", AttributeValue.builder().b(test).build()));
-
-        assertEquals(test.asByteBuffer(),
-                     unconvert("getByteBuffer", "setByteBuffer", AttributeValue.builder().b(test).build()));
-    }
-
-    @Test
-    @Ignore // No longer works because mapper is not aware of auto construct lists
-    public void testBooleanSet() {
-        assertEquals(new HashSet<Boolean>() {{
-                         add(true);
-                     }},
-                     unconvert("getBooleanSet", "setBooleanSet",
-                               AttributeValue.builder().ns("1").build()));
-
-        assertEquals(new HashSet<Boolean>() {{
-                         add(false);
-                     }},
-                     unconvert("getBooleanSet", "setBooleanSet",
-                               AttributeValue.builder().ns("0").build()));
-
-        assertEquals(new HashSet<Boolean>() {{
-                         add(true);
-                         add(false);
-                     }},
-                     unconvert("getBooleanSet", "setBooleanSet",
-                               AttributeValue.builder().ns("0", "1").build()));
-
-        assertEquals(new HashSet<Boolean>() {{
-                         add(true);
-                     }},
-                     unconvert("getBooleanSet", "setBooleanSet",
-                               AttributeValue.builder().l(
-                                       AttributeValue.builder().bool(true).build()).build()));
-
-        assertEquals(new HashSet<Boolean>() {{
-                         add(false);
-                     }},
-                     unconvert("getBooleanSet", "setBooleanSet",
-                               AttributeValue.builder().l(
-                                       AttributeValue.builder().bool(false).build()).build()));
-
-        assertEquals(new HashSet<Boolean>() {{
-                         add(false);
-                         add(true);
-                     }},
-                     unconvert("getBooleanSet", "setBooleanSet",
-                               AttributeValue.builder().l(
-                                       AttributeValue.builder().bool(false).build(),
-                                       AttributeValue.builder().bool(true).build()).build()));
-
-        assertEquals(new HashSet<Boolean>() {{
-                         add(null);
-                     }},
-                     unconvert("getBooleanSet", "setBooleanSet",
-                               AttributeValue.builder().l(
-                                       AttributeValue.builder().nul(true).build()).build()));
-    }
-
-    @Test
-    @Ignore // No longer works because mapper is not aware of auto construct lists
-    public void testStringSet() {
-        Assert.assertNull(unconvert("getStringSet", "setStringSet",
-                                    AttributeValue.builder().nul(true).build()));
-
-        assertEquals(new HashSet<String>() {{
-                         add("a");
-                         add("b");
-                     }},
-                     unconvert("getStringSet", "setStringSet",
-                               AttributeValue.builder().ss("a", "b").build()));
-    }
-
-    @Test
-    @Ignore // No longer works because mapper is not aware of auto construct lists
-    public void testUuidSet() {
-        Assert.assertNull(unconvert("getUuidSet", "setUuidSet",
-                                    AttributeValue.builder().nul(true).build()));
-
-        final UUID one = UUID.randomUUID();
-        final UUID two = UUID.randomUUID();
-
-        assertEquals(new HashSet<UUID>() {{
-                         add(one);
-                         add(two);
-                     }},
-                     unconvert("getUuidSet", "setUuidSet",
-                               AttributeValue.builder().ss(
-                                       one.toString(),
-                                       two.toString()).build()));
-    }
-
-    @Test
-    public void testDateSet() {
-        assertEquals(Collections.singleton(new Date(0)),
-                     unconvert("getDateSet", "setDateSet", AttributeValue.builder()
-                             .ss("1970-01-01T00:00:00.000Z").build()));
-
-        Calendar c = GregorianCalendar.getInstance();
-        c.setTimeInMillis(0);
-
-        assertEquals(Collections.singleton(c),
-                     unconvert("getCalendarSet", "setCalendarSet",
-                               AttributeValue.builder()
-                                       .ss("1970-01-01T00:00:00.000Z").build()));
-    }
-
-    @Test
-    @Ignore // No longer works because mapper is not aware of auto construct lists
-    public void testNumberSet() {
-        Assert.assertNull(unconvert("getByteSet", "setByteSet",
-                                    AttributeValue.builder().nul(true).build()));
-        Assert.assertNull(unconvert("getShortSet", "setShortSet",
-                                    AttributeValue.builder().nul(true).build()));
-        Assert.assertNull(unconvert("getIntSet", "setIntSet",
-                                    AttributeValue.builder().nul(true).build()));
-        Assert.assertNull(unconvert("getLongSet", "setLongSet",
-                                    AttributeValue.builder().nul(true).build()));
-        Assert.assertNull(unconvert("getBigIntegerSet", "setBigIntegerSet",
-                                    AttributeValue.builder().nul(true).build()));
-        Assert.assertNull(unconvert("getFloatSet", "setFloatSet",
-                                    AttributeValue.builder().nul(true).build()));
-        Assert.assertNull(unconvert("getDoubleSet", "setDoubleSet",
-                                    AttributeValue.builder().nul(true).build()));
-        Assert.assertNull(unconvert("getBigDecimalSet", "setBigDecimalSet",
-                                    AttributeValue.builder().nul(true).build()));
-
-
-        assertEquals(new HashSet<Byte>() {{
-                         add((byte) 1);
-                     }},
-                     unconvert("getByteSet", "setByteSet",
-                               AttributeValue.builder().ns("1").build()));
-
-        assertEquals(new HashSet<Short>() {{
-                         add((short) 1);
-                     }},
-                     unconvert("getShortSet", "setShortSet",
-                               AttributeValue.builder().ns("1").build()));
-
-        assertEquals(new HashSet<Integer>() {{
-                         add(1);
-                     }},
-                     unconvert("getIntSet", "setIntSet",
-                               AttributeValue.builder().ns("1").build()));
-
-        assertEquals(new HashSet<Long>() {{
-                         add(1l);
-                     }},
-                     unconvert("getLongSet", "setLongSet",
-                               AttributeValue.builder().ns("1").build()));
-
-        assertEquals(new HashSet<BigInteger>() {{
-                         add(BigInteger.ONE);
-                     }},
-                     unconvert("getBigIntegerSet", "setBigIntegerSet",
-                               AttributeValue.builder().ns("1").build()));
-
-        assertEquals(new HashSet<Float>() {{
-                         add(1.5f);
-                     }},
-                     unconvert("getFloatSet", "setFloatSet",
-                               AttributeValue.builder().ns("1.5").build()));
-
-        assertEquals(new HashSet<Double>() {{
-                         add(1.5d);
-                     }},
-                     unconvert("getDoubleSet", "setDoubleSet",
-                               AttributeValue.builder().ns("1.5").build()));
-
-        assertEquals(new HashSet<BigDecimal>() {{
-                         add(BigDecimal.ONE);
-                     }},
-                     unconvert("getBigDecimalSet", "setBigDecimalSet",
-                               AttributeValue.builder().ns("1").build()));
-    }
-
-    @Test
-    @Ignore // No longer works because mapper is not aware of auto construct lists
-    public void testBinarySet() {
-        Assert.assertNull(unconvert("getByteArraySet", "setByteArraySet",
-                                    AttributeValue.builder().nul(true).build()));
-        Assert.assertNull(unconvert("getByteBufferSet", "setByteBufferSet",
-                                    AttributeValue.builder().nul(true).build()));
-
-        ByteBuffer test = ByteBuffer.wrap("test".getBytes());
-
-        Set<byte[]> result = (Set<byte[]>) unconvert(
-                "getByteArraySet", "setByteArraySet",
-                AttributeValue.builder().bs(SdkBytes.fromByteBuffer(test.slice())).build());
-
-        assertEquals(1, result.size());
-        Assert.assertTrue(Arrays.equals(
-                "test".getBytes(),
-                result.iterator().next()));
-
-        Assert.assertEquals(Collections.singleton(test.slice()),
-                            unconvert("getByteBufferSet", "setByteBufferSet",
-                                      AttributeValue.builder().bs(SdkBytes.fromByteBuffer(test.slice())).build()));
-    }
-
-    @Test
-    @Ignore // No longer works because the converters aren't aware of auto construct maps
-    public void testObjectSet() {
-        Object result = unconvert("getObjectSet", "setObjectSet",
-                                  AttributeValue.builder().l(AttributeValue.builder().m(
-                                          new HashMap<String, AttributeValue>() {{
-                                              put("name", AttributeValue.builder().s("name").build());
-                                              put("value", AttributeValue.builder().n("123").build());
-                                              put("null", AttributeValue.builder().nul(true).build());
-                                          }}
-                                                                                       )
-                                          .build())
-                                          .build());
-
-        assertEquals(Collections.singleton(new SubClass()), result);
-
-        result = unconvert("getObjectSet", "setObjectSet",
-                           AttributeValue.builder().l(
-                               AttributeValue.builder()
-                               .nul(true)
-                               .build())
-                           .build());
-
-        assertEquals(Collections.<SubClass>singleton(null), result);
-    }
-
-    @Test
-    @Ignore // No longer works because the converters aren't aware of auto construct maps
-    public void testList() {
-        Assert.assertNull(unconvert("getList", "setList",
-                                    AttributeValue.builder().nul(true).build()));
-
-        assertEquals(Arrays.asList("a", "b", "c"),
-                     unconvert("getList", "setList", AttributeValue.builder().l(
-                             AttributeValue.builder().s("a").build(),
-                             AttributeValue.builder().s("b").build(),
-                             AttributeValue.builder().s("c").build())
-                         .build()));
-
-        assertEquals(Arrays.asList("a", null),
-                     unconvert("getList", "setList", AttributeValue.builder().l(
-                             AttributeValue.builder().s("a").build(),
-                             AttributeValue.builder().nul(true).build()).build()));
-    }
-
-    @Test
-    @Ignore // No longer works because the converters aren't aware of auto construct maps
-    public void testObjectList() {
-        Assert.assertNull(unconvert("getObjectList", "setObjectList",
-                                    AttributeValue.builder().nul(true).build()));
-
-        assertEquals(Arrays.asList(new SubClass(), null),
-                     unconvert("getObjectList", "setObjectList",
-                               AttributeValue.builder().l(
-                                       AttributeValue.builder().m(new HashMap<String, AttributeValue>() {{
-                                           put("name", AttributeValue.builder().s("name").build());
-                                           put("value", AttributeValue.builder().n("123").build());
-                                           put("null", AttributeValue.builder().nul(true).build());
-                                       }}).build(),
-                                       AttributeValue.builder().nul(true).build()).build()));
-    }
-
-    @Test
-    @Ignore // No longer works because mapper is not aware of auto construct lists
-    public void testSetList() {
-        Assert.assertNull(unconvert("getSetList", "setSetList",
-                                    AttributeValue.builder().nul(true).build()));
-
-        assertEquals(Arrays.asList(new Set[] {null}),
-                     unconvert("getSetList", "setSetList", AttributeValue.builder().l(
-                             AttributeValue.builder().nul(true).build()).build()));
-
-        assertEquals(Arrays.asList(Collections.singleton("a")),
-                     unconvert("getSetList", "setSetList", AttributeValue.builder().l(
-                             AttributeValue.builder().ss("a").build()).build()));
-    }
-
-    @Test
-    @Ignore // No longer works because the converters aren't aware of auto construct maps
-    public void testMap() {
-        Assert.assertNull(unconvert("getMap", "setMap",
-                                    AttributeValue.builder().nul(true).build()));
-
-        assertEquals(new HashMap<String, String>() {{
-                         put("a", "b");
-                         put("c", "d");
-                     }},
-                     unconvert("getMap", "setMap", AttributeValue.builder().m(
-                             new HashMap<String, AttributeValue>() {{
-                                 put("a", AttributeValue.builder().s("b").build());
-                                 put("c", AttributeValue.builder().s("d").build());
-                             }}).build()));
-
-        assertEquals(new HashMap<String, String>() {{
-                         put("a", null);
-                     }},
-                     unconvert("getMap", "setMap", AttributeValue.builder().m(
-                             new HashMap<String, AttributeValue>() {{
-                                 put("a", AttributeValue.builder().nul(true).build());
-                             }}).build()));
-    }
-
-    @Test
-    @Ignore // No longer works because the converters aren't aware of auto construct maps
-    public void testSetMap() {
-        Assert.assertNull(unconvert("getSetMap", "setSetMap",
-                                    AttributeValue.builder().nul(true).build()));
-
-        assertEquals(new HashMap<String, Set<String>>() {{
-                         put("a", null);
-                         put("b", new TreeSet<String>(Arrays.asList("a", "b")));
-                     }},
-                     unconvert("getSetMap", "setSetMap", AttributeValue.builder().m(
-                             new HashMap<String, AttributeValue>() {{
-                                 put("a", AttributeValue.builder().nul(true).build());
-                                 put("b", AttributeValue.builder().ss("a", "b").build());
-                             }}).build()));
-    }
-
-    @Test
-    @Ignore // No longer works because the converters aren't aware of auto construct maps
-    public void testObject() {
-        Assert.assertNull(unconvert("getObject", "setObject",
-                                    AttributeValue.builder().nul(true).build()));
-
-        assertEquals(new SubClass(), unconvert("getObject", "setObject",
-                                               AttributeValue.builder().m(new HashMap<String, AttributeValue>() {{
-                                                   put("name", AttributeValue.builder().s("name").build());
-                                                   put("value", AttributeValue.builder().n("123").build());
-                                               }}).build()));
-
-        assertEquals(new SubClass(), unconvert("getObject", "setObject",
-                                               AttributeValue.builder().m(new HashMap<String, AttributeValue>() {{
-                                                   put("name", AttributeValue.builder().s("name").build());
-                                                   put("value", AttributeValue.builder().n("123").build());
-                                                   put("null", AttributeValue.builder().nul(true).build());
-                                               }}).build()));
-    }
-
-    @Test
-    public void testUnannotatedObject() throws Exception {
-        Method getter = UnannotatedSubClass.class.getMethod("getChild");
-        Method setter = UnannotatedSubClass.class
-                .getMethod("setChild", UnannotatedSubClass.class);
-
-        try {
-            unconvert(UnannotatedSubClass.class, getter, setter, AttributeValue.builder().s("").build());
-            Assert.fail("Expected DynamoDBMappingException");
-        } catch (DynamoDbMappingException e) {
-            // Ignored or expected.
-        }
-    }
-
-    @Test
-    public void testS3Link() {
-        S3Link link = (S3Link) unconvert("getS3Link", "setS3Link",
-                                         AttributeValue.builder().s("{\"s3\":{"
-                                                            + "\"bucket\":\"bucket\","
-                                                            + "\"key\":\"key\","
-                                                            + "\"region\":null}}").build());
-
-        assertEquals("bucket", link.bucketName());
-        assertEquals("key", link.getKey());
-        assertEquals(Region.US_EAST_1, link.s3Region());
-    }
-
-    public Object unconvert(String getter, String setter, AttributeValue value) {
-        try {
-
-            Method gm = TestClass.class.getMethod(getter);
-            Method sm = TestClass.class.getMethod(setter, gm.getReturnType());
-            return unconvert(TestClass.class, gm, sm, value);
-
-        } catch (RuntimeException e) {
-            throw e;
-        } catch (Exception e) {
-            throw new RuntimeException("BOOM", e);
-        }
-    }
-
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/StandardTypeConverters.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/StandardTypeConverters.java
deleted file mode 100644
index 43b9cbb3e0ce..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/StandardTypeConverters.java
+++ /dev/null
@@ -1,1137 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-import static java.time.format.DateTimeFormatter.ISO_DATE_TIME;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.nio.ByteBuffer;
-import java.nio.charset.Charset;
-import java.time.Instant;
-import java.time.ZoneId;
-import java.time.ZoneOffset;
-import java.time.ZonedDateTime;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Collection;
-import java.util.Currency;
-import java.util.Date;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Set;
-import java.util.TimeZone;
-import java.util.regex.Pattern;
-import software.amazon.awssdk.annotations.SdkInternalApi;
-import software.amazon.awssdk.utils.DateUtils;
-import software.amazon.awssdk.services.dynamodb.model.ScalarAttributeType;
-
-/**
- * Type conversions.
- *
- * @see DynamoDbTypeConverter
- */
-@SdkInternalApi
-final class StandardTypeConverters extends DynamoDbTypeConverterFactory {
-
-    /**
-     * Standard scalar type-converter factory.
-     */
-    private static final DynamoDbTypeConverterFactory FACTORY = new StandardTypeConverters();
-
-    static DynamoDbTypeConverterFactory factory() {
-        return StandardTypeConverters.FACTORY;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public <S, T> DynamoDbTypeConverter<S, T> getConverter(Class<S> sourceType, Class<T> targetType) {
-        final Scalar source = Scalar.of(sourceType);
-        final Scalar target = Scalar.of(targetType);
-        final Converter<S, T> toSource = source.getConverter(sourceType, target.<T>type());
-        final Converter<T, S> toTarget = target.getConverter(targetType, source.<S>type());
-        return new StandardDynamoDbTypeConverter<>(toSource, toTarget);
-    }
-
-    /**
-     * Standard scalar types.
-     */
-    enum Scalar {
-        /**
-         * {@link BigDecimal}
-         */
-        BIG_DECIMAL(ScalarAttributeType.N, new ConverterMap(BigDecimal.class, null)
-                .with(Number.class, ToBigDecimal.FROM_STRING.join(ToString.FROM_NUMBER))
-                .with(String.class, ToBigDecimal.FROM_STRING)
-        ),
-
-        /**
-         * {@link BigInteger}
-         */
-        BIG_INTEGER(ScalarAttributeType.N, new ConverterMap(BigInteger.class, null)
-                .with(Number.class, ToBigInteger.FROM_STRING.join(ToString.FROM_NUMBER))
-                .with(String.class, ToBigInteger.FROM_STRING)
-        ),
-
-        /**
-         * {@link Boolean}
-         */
-        BOOLEAN(ScalarAttributeType.N, new ConverterMap(Boolean.class, Boolean.TYPE)
-                .with(Number.class, ToBoolean.FROM_STRING.join(ToString.FROM_NUMBER))
-                .with(String.class, ToBoolean.FROM_STRING)
-        ),
-
-        /**
-         * {@link Byte}
-         */
-        BYTE(ScalarAttributeType.N, new ConverterMap(Byte.class, Byte.TYPE)
-                .with(Number.class, ToByte.FROM_NUMBER)
-                .with(String.class, ToByte.FROM_STRING)
-        ),
-
-        /**
-         * {@link Byte} array
-         */
-        BYTE_ARRAY(ScalarAttributeType.B, new ConverterMap(byte[].class, null)
-                .with(ByteBuffer.class, ToByteArray.FROM_BYTE_BUFFER)
-                .with(String.class, ToByteArray.FROM_STRING)
-        ),
-
-        /**
-         * {@link ByteBuffer}
-         */
-        BYTE_BUFFER(ScalarAttributeType.B, new ConverterMap(ByteBuffer.class, null)
-                .with(byte[].class, ToByteBuffer.FROM_BYTE_ARRAY)
-                .with(String.class, ToByteBuffer.FROM_BYTE_ARRAY.join(ToByteArray.FROM_STRING))
-                .with(java.util.UUID.class, ToByteBuffer.FROM_UUID)
-        ),
-
-        /**
-         * {@link Calendar}
-         */
-        CALENDAR(ScalarAttributeType.S, new ConverterMap(Calendar.class, null)
-                .with(Date.class, ToCalendar.FROM_DATE)
-                .with(Instant.class, ToCalendar.FROM_INSTANT)
-                .with(ZonedDateTime.class, ToCalendar.FROM_INSTANT.join(ToInstant.FROM_ZONEDDATETIME))
-                .with(Long.class, ToCalendar.FROM_INSTANT.join(ToInstant.FROM_LONG))
-                .with(String.class, ToCalendar.FROM_INSTANT.join(ToInstant.FROM_STRING))
-        ),
-
-        /**
-         * {@link Character}
-         */
-        CHARACTER(ScalarAttributeType.S, new ConverterMap(Character.class, Character.TYPE)
-                .with(String.class, ToCharacter.FROM_STRING)
-        ),
-
-        /**
-         * {@link Currency}
-         */
-        CURRENCY(ScalarAttributeType.S, new ConverterMap(Currency.class, null)
-                .with(String.class, ToCurrency.FROM_STRING)
-        ),
-
-        /**
-         * {@link Instant}
-         */
-        INSTANT(ScalarAttributeType.S, new ConverterMap(Instant.class, null)
-                .with(Calendar.class, ToInstant.FROM_CALENDAR)
-                .with(ZonedDateTime.class, ToInstant.FROM_ZONEDDATETIME)
-                .with(Long.class, ToInstant.FROM_LONG)
-                .with(String.class, ToInstant.FROM_STRING)
-        ),
-        /**
-         * {@link Date}
-         */
-        DATE(ScalarAttributeType.S, new ConverterMap(Date.class, null)
-                .with(Instant.class, ToDate.FROM_INSTANT)
-                .with(Calendar.class, ToDate.FROM_CALENDAR)
-                .with(ZonedDateTime.class, ToDate.FROM_INSTANT.join(ToInstant.FROM_ZONEDDATETIME))
-                .with(Long.class, ToDate.FROM_INSTANT.join(ToInstant.FROM_LONG))
-                .with(String.class, ToDate.FROM_STRING)
-        ),
-
-        /**
-         * {@link ZonedDateTime}
-         */
-        ZONED_DATE_TIME(/*ScalarAttributeType.S*/null, new ConverterMap(ZonedDateTime.class, null)
-                .with(Calendar.class, ToDateTime.FROM_CALENDAR)
-                .with(Date.class, ToDateTime.FROM_DATE)
-                .with(Long.class, ToDateTime.FROM_INSTANT_AT_UTC.join(ToInstant.FROM_LONG))
-                .with(String.class, ToDateTime.FROM_INSTANT_AT_UTC.join(ToInstant.FROM_STRING))
-        ),
-
-        /**
-         * {@link Double}
-         */
-        DOUBLE(ScalarAttributeType.N, new ConverterMap(Double.class, Double.TYPE)
-                .with(Number.class, ToDouble.FROM_NUMBER)
-                .with(String.class, ToDouble.FROM_STRING)
-        ),
-
-        /**
-         * {@link Float}
-         */
-        FLOAT(ScalarAttributeType.N, new ConverterMap(Float.class, Float.TYPE)
-                .with(Number.class, ToFloat.FROM_NUMBER)
-                .with(String.class, ToFloat.FROM_STRING)
-        ),
-
-        /**
-         * {@link Integer}
-         */
-        INTEGER(ScalarAttributeType.N, new ConverterMap(Integer.class, Integer.TYPE)
-                .with(Number.class, ToInteger.FROM_NUMBER)
-                .with(String.class, ToInteger.FROM_STRING)
-        ),
-
-        /**
-         * {@link Locale}
-         */
-        LOCALE(ScalarAttributeType.S, new ConverterMap(Locale.class, null)
-                .with(String.class, ToLocale.FROM_STRING)
-        ),
-
-        /**
-         * {@link Long}
-         */
-        LONG(ScalarAttributeType.N, new ConverterMap(Long.class, Long.TYPE)
-                .with(Date.class, ToLong.FROM_DATE)
-                .with(ZonedDateTime.class, ToLong.FROM_TEMPORAL_ACCESSOR.join(ToInstant.FROM_ZONEDDATETIME))
-                .with(Number.class, ToLong.FROM_NUMBER)
-                .with(String.class, ToLong.FROM_STRING)
-        ),
-
-        /**
-         * {@link S3Link}
-         */
-        S3_LINK(ScalarAttributeType.S, new ConverterMap(S3Link.class, null)),
-
-        /**
-         * {@link Short}
-         */
-        SHORT(ScalarAttributeType.N, new ConverterMap(Short.class, Short.TYPE)
-                .with(Number.class, ToShort.FROM_NUMBER)
-                .with(String.class, ToShort.FROM_STRING)
-        ),
-
-        /**
-         * {@link String}
-         */
-        STRING(ScalarAttributeType.S, new ConverterMap(String.class, null)
-                .with(Boolean.class, ToString.FROM_BOOLEAN)
-                .with(byte[].class, ToString.FROM_BYTE_ARRAY)
-                .with(ByteBuffer.class, ToString.FROM_BYTE_ARRAY.join(ToByteArray.FROM_BYTE_BUFFER))
-                .with(Calendar.class, ToString.FROM_DATE.join(ToDate.FROM_CALENDAR))
-                .with(Date.class, ToString.FROM_DATE)
-                .with(ZonedDateTime.class, ToString.FROM_DATE_TIME)
-                .with(Enum.class, ToString.FROM_ENUM)
-                .with(Locale.class, ToString.FROM_LOCALE)
-                .with(TimeZone.class, ToString.FROM_TIME_ZONE)
-                .with(ZoneId.class, ToString.FROM_ZONE_ID)
-                .with(Object.class, ToString.FROM_OBJECT)
-        ),
-
-        /**
-         * {@link TimeZone}
-         */
-        TIME_ZONE(ScalarAttributeType.S, new ConverterMap(TimeZone.class, null)
-                .with(String.class, ToTimeZone.FROM_STRING)
-        ),
-        /**
-         * {@link ZoneId}
-         */
-        ZONE_ID(ScalarAttributeType.S, new ConverterMap(ZoneId.class, null)
-                .with(String.class, ToZoneId.FROM_STRING)
-        ),
-
-        /**
-         * {@link java.net.URL}
-         */
-        URL(ScalarAttributeType.S, new ConverterMap(java.net.URL.class, null)
-                .with(String.class, ToUrl.FROM_STRING)
-        ),
-
-        /**
-         * {@link java.net.URI}
-         */
-        URI(ScalarAttributeType.S, new ConverterMap(java.net.URI.class, null)
-                .with(String.class, ToUri.FROM_STRING)
-        ),
-
-        /**
-         * {@link java.util.UUID}
-         */
-        UUID(ScalarAttributeType.S, new ConverterMap(java.util.UUID.class, null)
-                .with(ByteBuffer.class, ToUuid.FROM_BYTE_BUFFER)
-                .with(String.class, ToUuid.FROM_STRING)
-        ),
-
-        /**
-         * {@link Object}; default must be last
-         */
-        DEFAULT(null, new ConverterMap(Object.class, null)) {
-            @Override
-            <S, T> Converter<S, T> getConverter(Class<S> sourceType, Class<T> targetType) {
-                if (sourceType.isEnum() && STRING.map.isAssignableFrom(targetType)) {
-                    return (Converter<S, T>) new ToEnum.FromString(sourceType);
-                }
-                return super.<S, T>getConverter(sourceType, targetType);
-            }
-        };
-
-        /**
-         * The scalar attribute type.
-         */
-        private final ScalarAttributeType scalarAttributeType;
-
-        /**
-         * The mapping of conversion functions for this scalar.
-         */
-        private final ConverterMap map;
-
-        /**
-         * Constructs a new scalar with the specified conversion mappings.
-         */
-        Scalar(ScalarAttributeType scalarAttributeType, ConverterMap map) {
-            this.scalarAttributeType = scalarAttributeType;
-            this.map = map;
-        }
-
-        /**
-         * Returns the first matching scalar, which may be the same as or a
-         * supertype of the specified target class.
-         */
-        static Scalar of(Class<?> type) {
-            for (final Scalar scalar : Scalar.values()) {
-                if (scalar.is(type)) {
-                    return scalar;
-                }
-            }
-            return DEFAULT;
-        }
-
-        /**
-         * Returns the function to convert from the specified target class to
-         * this scalar type.
-         */
-        <S, T> Converter<S, T> getConverter(Class<S> sourceType, Class<T> targetType) {
-            return map.<S, T>getConverter(targetType);
-        }
-
-        /**
-         * Converts the target instance using the standard type-conversions.
-         */
-        @SuppressWarnings("unchecked")
-        <S> S convert(Object o) {
-            return getConverter(this.<S>type(), (Class<Object>) o.getClass()).convert(o);
-        }
-
-        /**
-         * Determines if the scalar is of the specified scalar attribute type.
-         */
-        boolean is(final ScalarAttributeType scalarAttributeType) {
-            return this.scalarAttributeType == scalarAttributeType;
-        }
-
-        /**
-         * Determines if the class represented by this scalar is either the
-         * same as or a supertype of the specified target type.
-         */
-        boolean is(final Class<?> type) {
-            return this.map.isAssignableFrom(type);
-        }
-
-        /**
-         * Returns the primary reference type.
-         */
-        @SuppressWarnings("unchecked")
-        <S> Class<S> type() {
-            return (Class<S>) this.map.referenceType;
-        }
-    }
-
-    /**
-     * Standard vector types.
-     */
-    abstract static class Vector {
-        /**
-         * {@link List}
-         */
-        static final ToList LIST = new ToList();
-        /**
-         * {@link Map}
-         */
-        static final ToMap MAP = new ToMap();
-        /**
-         * {@link Set}
-         */
-        static final ToSet SET = new ToSet();
-
-        /**
-         * Determines if the class represented by this vector is either the
-         * same as or a supertype of the specified target type.
-         */
-        abstract boolean is(Class<?> type);
-
-        static final class ToList extends Vector {
-            <S, T> DynamoDbTypeConverter<List<S>, List<T>> join(final DynamoDbTypeConverter<S, T> scalar) {
-                return new ListTypeConverter<>(scalar);
-            }
-
-            <S, T> List<S> convert(Collection<T> o, DynamoDbTypeConverter<S, T> scalar) {
-                final List<S> vector = new ArrayList<S>(o.size());
-                for (final T t : o) {
-                    vector.add(scalar.convert(t));
-                }
-                return vector;
-            }
-
-            <S, T> List<T> unconvert(Collection<S> o, DynamoDbTypeConverter<S, T> scalar) {
-                final List<T> vector = new ArrayList<T>(o.size());
-                for (final S s : o) {
-                    vector.add(scalar.unconvert(s));
-                }
-                return vector;
-            }
-
-            @Override
-            boolean is(final Class<?> type) {
-                return List.class.isAssignableFrom(type);
-            }
-
-            private static class ListTypeConverter<S, T> implements DynamoDbTypeConverter<List<S>, List<T>> {
-                private final DynamoDbTypeConverter<S, T> scalar;
-
-                ListTypeConverter(DynamoDbTypeConverter<S, T> scalar) {
-                    this.scalar = scalar;
-                }
-
-                @Override
-                public final List<S> convert(final List<T> o) {
-                    return LIST.convert(o, scalar);
-                }
-
-                @Override
-                public final List<T> unconvert(final List<S> o) {
-                    return LIST.unconvert(o, scalar);
-                }
-            }
-        }
-
-        static final class ToMap extends Vector {
-            <K, S, T> DynamoDbTypeConverter<Map<K, S>, Map<K, T>> join(final DynamoDbTypeConverter<S, T> scalar) {
-                return new MapTypeConverter<>(scalar);
-            }
-
-            <K, S, T> Map<K, S> convert(Map<K, T> o, DynamoDbTypeConverter<S, T> scalar) {
-                final Map<K, S> vector = new LinkedHashMap<K, S>();
-                for (final Map.Entry<K, T> t : o.entrySet()) {
-                    vector.put(t.getKey(), scalar.convert(t.getValue()));
-                }
-                return vector;
-            }
-
-            <K, S, T> Map<K, T> unconvert(Map<K, S> o, DynamoDbTypeConverter<S, T> scalar) {
-                final Map<K, T> vector = new LinkedHashMap<K, T>();
-                for (final Map.Entry<K, S> s : o.entrySet()) {
-                    vector.put(s.getKey(), scalar.unconvert(s.getValue()));
-                }
-                return vector;
-            }
-
-            boolean is(final Class<?> type) {
-                return Map.class.isAssignableFrom(type);
-            }
-
-            private static class MapTypeConverter<K, S, T> implements DynamoDbTypeConverter<Map<K, S>, Map<K, T>> {
-                private final DynamoDbTypeConverter<S, T> scalar;
-
-                MapTypeConverter(DynamoDbTypeConverter<S, T> scalar) {
-                    this.scalar = scalar;
-                }
-
-                @Override
-                public final Map<K, S> convert(final Map<K, T> o) {
-                    return MAP.convert(o, scalar);
-                }
-
-                @Override
-                public final Map<K, T> unconvert(final Map<K, S> o) {
-                    return MAP.unconvert(o, scalar);
-                }
-            }
-        }
-
-        static final class ToSet extends Vector {
-            <S, T> DynamoDbTypeConverter<List<S>, Collection<T>> join(final DynamoDbTypeConverter<S, T> target) {
-                return new SetTypeConverter<>(target);
-            }
-
-            <S, T> Set<T> unconvert(Collection<S> o, DynamoDbTypeConverter<S, T> scalar) {
-                final Set<T> vector = new LinkedHashSet<T>();
-                for (final S s : o) {
-                    if (vector.add(scalar.unconvert(s)) == false) {
-                        throw new DynamoDbMappingException("duplicate value (" + s + ")");
-                    }
-                }
-                return vector;
-            }
-
-            boolean is(final Class<?> type) {
-                return Set.class.isAssignableFrom(type);
-            }
-
-            private static class SetTypeConverter<S, T> implements DynamoDbTypeConverter<List<S>, Collection<T>> {
-                private final DynamoDbTypeConverter<S, T> target;
-
-                SetTypeConverter(DynamoDbTypeConverter<S, T> target) {
-                    this.target = target;
-                }
-
-                @Override
-                public List<S> convert(final Collection<T> o) {
-                    return LIST.convert(o, target);
-                }
-
-                @Override
-                public Collection<T> unconvert(final List<S> o) {
-                    return SET.unconvert(o, target);
-                }
-            }
-        }
-    }
-
-    /**
-     * Converter map.
-     */
-    private static class ConverterMap extends LinkedHashMap<Class<?>, Converter<?, ?>> {
-        private static final long serialVersionUID = -1L;
-        private final Class<?> referenceType;
-        private final Class<?> primitiveType;
-
-        private ConverterMap(Class<?> referenceType, Class<?> primitiveType) {
-            this.referenceType = referenceType;
-            this.primitiveType = primitiveType;
-        }
-
-        private <S, T> ConverterMap with(Class<T> targetType, Converter<S, T> converter) {
-            put(targetType, converter);
-            return this;
-        }
-
-        private boolean isAssignableFrom(Class<?> type) {
-            return type.isPrimitive() ? primitiveType == type : referenceType.isAssignableFrom(type);
-        }
-
-        @SuppressWarnings("unchecked")
-        private <S, T> Converter<S, T> getConverter(Class<T> targetType) {
-            for (final Map.Entry<Class<?>, Converter<?, ?>> entry : entrySet()) {
-                if (entry.getKey().isAssignableFrom(targetType)) {
-                    return (Converter<S, T>) entry.getValue();
-                }
-            }
-            if (isAssignableFrom(targetType)) {
-                return (Converter<S, T>) ToObject.FROM_OBJECT;
-            }
-            throw new DynamoDbMappingException(
-                    "type [" + targetType + "] is not supported; no conversion from " + referenceType
-            );
-        }
-    }
-
-    /**
-     * {@link BigDecimal} conversion functions.
-     */
-    private abstract static class ToBigDecimal<T> extends Converter<BigDecimal, T> {
-        private static final ToBigDecimal<String> FROM_STRING = new ToBigDecimal<String>() {
-            @Override
-            public BigDecimal convert(final String o) {
-                return new BigDecimal(o);
-            }
-        };
-    }
-
-    /**
-     * {@link BigInteger} conversion functions.
-     */
-    private abstract static class ToBigInteger<T> extends Converter<BigInteger, T> {
-        private static final ToBigInteger<String> FROM_STRING = new ToBigInteger<String>() {
-            @Override
-            public BigInteger convert(final String o) {
-                return new BigInteger(o);
-            }
-        };
-    }
-
-    /**
-     * {@link Boolean} conversion functions.
-     */
-    private abstract static class ToBoolean<T> extends Converter<Boolean, T> {
-        private static final ToBoolean<String> FROM_STRING = new ToBoolean<String>() {
-            private final Pattern n0 = Pattern.compile("(?i)[N0]");
-            private final Pattern y1 = Pattern.compile("(?i)[Y1]");
-
-            @Override
-            public Boolean convert(final String o) {
-                return n0.matcher(o).matches() ? Boolean.FALSE : y1.matcher(o).matches() ? Boolean.TRUE : Boolean.valueOf(o);
-            }
-        };
-    }
-
-    /**
-     * {@link Byte} conversion functions.
-     */
-    private abstract static class ToByte<T> extends Converter<Byte, T> {
-        private static final ToByte<Number> FROM_NUMBER = new ToByte<Number>() {
-            @Override
-            public Byte convert(final Number o) {
-                return o.byteValue();
-            }
-        };
-
-        private static final ToByte<String> FROM_STRING = new ToByte<String>() {
-            @Override
-            public Byte convert(final String o) {
-                return Byte.valueOf(o);
-            }
-        };
-    }
-
-    /**
-     * {@link byte} array conversion functions.
-     */
-    private abstract static class ToByteArray<T> extends Converter<byte[], T> {
-        private static final ToByteArray<ByteBuffer> FROM_BYTE_BUFFER = new ToByteArray<ByteBuffer>() {
-            @Override
-            public byte[] convert(final ByteBuffer o) {
-                if (o.hasArray()) {
-                    return o.array();
-                }
-                final byte[] value = new byte[o.remaining()];
-                o.get(value);
-                return value;
-            }
-        };
-
-        private static final ToByteArray<String> FROM_STRING = new ToByteArray<String>() {
-            @Override
-            public byte[] convert(final String o) {
-                return o.getBytes(Charset.forName("UTF-8"));
-            }
-        };
-    }
-
-    /**
-     * {@link ByteBuffer} conversion functions.
-     */
-    private abstract static class ToByteBuffer<T> extends Converter<ByteBuffer, T> {
-        private static final ToByteBuffer<byte[]> FROM_BYTE_ARRAY = new ToByteBuffer<byte[]>() {
-            @Override
-            public ByteBuffer convert(final byte[] o) {
-                return ByteBuffer.wrap(o);
-            }
-        };
-
-        private static final ToByteBuffer<java.util.UUID> FROM_UUID = new ToByteBuffer<java.util.UUID>() {
-            @Override
-            public ByteBuffer convert(final java.util.UUID o) {
-                final ByteBuffer value = ByteBuffer.allocate(16);
-                value.putLong(o.getMostSignificantBits()).putLong(o.getLeastSignificantBits());
-                value.position(0);
-                return value;
-            }
-        };
-    }
-
-    /**
-     * {@link Calendar} conversion functions.
-     */
-    private abstract static class ToCalendar<T> extends Converter<Calendar, T> {
-        private static final ToCalendar<Date> FROM_DATE = new ToCalendar<Date>() {
-            @Override
-            public Calendar convert(final Date o) {
-                final Calendar value = Calendar.getInstance();
-                value.setTime(o);
-                return value;
-            }
-        };
-        private static final ToCalendar<Instant> FROM_INSTANT = new ToCalendar<Instant>() {
-            @Override
-            public Calendar convert(Instant o) {
-                Calendar cal = Calendar.getInstance();
-                cal.setTimeInMillis(o.toEpochMilli());
-                return cal;
-            }
-        };
-    }
-
-    /**
-     * {@link Character} conversion functions.
-     */
-    private abstract static class ToCharacter<T> extends Converter<Character, T> {
-        private static final ToCharacter<String> FROM_STRING = new ToCharacter<String>() {
-            @Override
-            public Character convert(final String o) {
-                return Character.valueOf(o.charAt(0));
-            }
-        };
-    }
-
-    /**
-     * {@link Currency} conversion functions.
-     */
-    private abstract static class ToCurrency<T> extends Converter<Currency, T> {
-        private static final ToCurrency<String> FROM_STRING = new ToCurrency<String>() {
-            @Override
-            public Currency convert(final String o) {
-                return Currency.getInstance(o);
-            }
-        };
-    }
-
-    private abstract static class ToDate<T> extends Converter<Date, T> {
-        private static final ToDate<Instant> FROM_INSTANT = new ToDate<Instant>() {
-            @Override
-            public Date convert(Instant o) {
-                return Date.from(o);
-            }
-        };
-        private static final ToDate<Calendar> FROM_CALENDAR = new ToDate<Calendar>() {
-            @Override
-            public Date convert(Calendar o) {
-                return o.getTime();
-            }
-        };
-        private static final ToDate<String> FROM_STRING = new ToDate<String>() {
-            @Override
-            public Date convert(String s) {
-                return Date.from(DateUtils.parseIso8601Date(s));
-            }
-        };
-    }
-
-    /**
-     * {@link Instant} conversion functions.
-     */
-    private abstract static class ToInstant<T> extends Converter<Instant, T> {
-        private static final ToInstant<Calendar> FROM_CALENDAR = new ToInstant<Calendar>() {
-            @Override
-            public Instant convert(final Calendar o) {
-                return o.toInstant();
-            }
-        };
-
-        private static final ToInstant<ZonedDateTime> FROM_ZONEDDATETIME = new ToInstant<ZonedDateTime>() {
-            @Override
-            public Instant convert(final ZonedDateTime o) {
-                return o.toInstant();
-            }
-        };
-
-        private static final ToInstant<Long> FROM_LONG = new ToInstant<Long>() {
-            @Override
-            public Instant convert(final Long o) {
-                return Instant.ofEpochMilli(o);
-            }
-        };
-
-        private static final ToInstant<String> FROM_STRING = new ToInstant<String>() {
-            @Override
-            public Instant convert(final String o) {
-                return DateUtils.parseIso8601Date(o);
-            }
-        };
-    }
-
-    /**
-     * {@link java.time.ZonedDateTime} conversion functions.
-     */
-    private abstract static class ToDateTime<T> extends Converter<ZonedDateTime, T> {
-        private static final ToDateTime<Date> FROM_DATE = new ToDateTime<Date>() {
-            public ZonedDateTime convert(final Date o) {
-                return ZonedDateTime.ofInstant(o.toInstant(), ZoneOffset.UTC);
-            }
-        };
-        private static final ToDateTime<Instant> FROM_INSTANT_AT_UTC = new ToDateTime<Instant>() {
-            public ZonedDateTime convert(final Instant o) {
-                return ZonedDateTime.ofInstant(o, ZoneOffset.UTC);
-            }
-        };
-
-        private static final ToDateTime<Calendar> FROM_CALENDAR = new ToDateTime<Calendar>() {
-            @Override
-            public ZonedDateTime convert(Calendar o) {
-                return ZonedDateTime.ofInstant(Instant.ofEpochMilli(o.getTimeInMillis()), o.getTimeZone().toZoneId());
-            }
-        };
-    }
-
-    /**
-     * {@link Double} conversion functions.
-     */
-    private abstract static class ToDouble<T> extends Converter<Double, T> {
-        private static final ToDouble<Number> FROM_NUMBER = new ToDouble<Number>() {
-            @Override
-            public Double convert(final Number o) {
-                return o.doubleValue();
-            }
-        };
-
-        private static final ToDouble<String> FROM_STRING = new ToDouble<String>() {
-            @Override
-            public Double convert(final String o) {
-                return Double.valueOf(o);
-            }
-        };
-    }
-
-    /**
-     * {@link Enum} from {@link String}
-     */
-    private abstract static class ToEnum<S extends Enum<S>, T> extends Converter<S, T> {
-        private static final class FromString<S extends Enum<S>> extends ToEnum<S, String> {
-            private final Class<S> sourceType;
-
-            private FromString(final Class<S> sourceType) {
-                this.sourceType = sourceType;
-            }
-
-            @Override
-            public S convert(final String o) {
-                return Enum.valueOf(sourceType, o);
-            }
-        }
-    }
-
-    /**
-     * {@link Float} conversion functions.
-     */
-    private abstract static class ToFloat<T> extends Converter<Float, T> {
-        private static final ToFloat<Number> FROM_NUMBER = new ToFloat<Number>() {
-            @Override
-            public Float convert(final Number o) {
-                return o.floatValue();
-            }
-        };
-
-        private static final ToFloat<String> FROM_STRING = new ToFloat<String>() {
-            @Override
-            public Float convert(final String o) {
-                return Float.valueOf(o);
-            }
-        };
-    }
-
-    /**
-     * {@link Integer} conversion functions.
-     */
-    private abstract static class ToInteger<T> extends Converter<Integer, T> {
-        private static final ToInteger<Number> FROM_NUMBER = new ToInteger<Number>() {
-            @Override
-            public Integer convert(final Number o) {
-                return o.intValue();
-            }
-        };
-
-        private static final ToInteger<String> FROM_STRING = new ToInteger<String>() {
-            @Override
-            public Integer convert(final String o) {
-                return Integer.valueOf(o);
-            }
-        };
-    }
-
-    /**
-     * {@link Locale} conversion functions.
-     */
-    private abstract static class ToLocale<T> extends Converter<Locale, T> {
-        private static final ToLocale<String> FROM_STRING = new ToLocale<String>() {
-            @Override
-            public Locale convert(final String o) {
-                final String[] value = o.split("-", 3);
-                if (value.length == 3) {
-                    return new Locale(value[0], value[1], value[2]);
-                }
-                if (value.length == 2) {
-                    return new Locale(value[0], value[1]);
-                }
-                return new Locale(value[0]); //JDK7+: return Locale.forLanguageTag(o);
-            }
-        };
-    }
-
-    /**
-     * {@link Long} conversion functions.
-     */
-    private abstract static class ToLong<T> extends Converter<Long, T> {
-        private static final ToLong<Date> FROM_DATE = new ToLong<Date>() {
-            @Override
-            public Long convert(final Date o) {
-                return o.getTime();
-            }
-        };
-        private static final ToLong<Instant> FROM_TEMPORAL_ACCESSOR = new ToLong<Instant>() {
-            @Override
-            public Long convert(final Instant o) {
-                return o.toEpochMilli();
-            }
-        };
-
-        private static final ToLong<Number> FROM_NUMBER = new ToLong<Number>() {
-            @Override
-            public Long convert(final Number o) {
-                return o.longValue();
-            }
-        };
-
-        private static final ToLong<String> FROM_STRING = new ToLong<String>() {
-            @Override
-            public Long convert(final String o) {
-                return Long.valueOf(o);
-            }
-        };
-    }
-
-    /**
-     * {@link Short} conversion functions.
-     */
-    private abstract static class ToShort<T> extends Converter<Short, T> {
-        private static final ToShort<Number> FROM_NUMBER = new ToShort<Number>() {
-            @Override
-            public Short convert(final Number o) {
-                return o.shortValue();
-            }
-        };
-
-        private static final ToShort<String> FROM_STRING = new ToShort<String>() {
-            @Override
-            public Short convert(final String o) {
-                return Short.valueOf(o);
-            }
-        };
-    }
-
-    /**
-     * {@link String} conversion functions.
-     */
-    private abstract static class ToString<T> extends Converter<String, T> {
-        private static final ToString<Boolean> FROM_BOOLEAN = new ToString<Boolean>() {
-            @Override
-            public String convert(final Boolean o) {
-                return Boolean.TRUE.equals(o) ? "1" : "0";
-            }
-        };
-
-        private static final ToString<byte[]> FROM_BYTE_ARRAY = new ToString<byte[]>() {
-            @Override
-            public String convert(final byte[] o) {
-                return new String(o, Charset.forName("UTF-8"));
-            }
-        };
-
-        private static final ToString<Date> FROM_DATE = new ToString<Date>() {
-            @Override
-            public String convert(final Date o) {
-                return DateUtils.formatIso8601Date(o.toInstant());
-            }
-        };
-
-        private static final ToString<Enum> FROM_ENUM = new ToString<Enum>() {
-            @Override
-            public String convert(final Enum o) {
-                return o.name();
-            }
-        };
-
-        private static final ToString<Locale> FROM_LOCALE = new ToString<Locale>() {
-            @Override
-            public String convert(final Locale o) {
-                final StringBuilder value = new StringBuilder(o.getLanguage());
-                if (!o.getCountry().isEmpty() || !o.getVariant().isEmpty()) {
-                    value.append("-").append(o.getCountry());
-                }
-                if (!o.getVariant().isEmpty()) {
-                    value.append("-").append(o.getVariant());
-                }
-                return value.toString(); //JDK7+: return o.toLanguageTag();
-            }
-        };
-
-        private static final ToString<Number> FROM_NUMBER = new ToString<Number>() {
-            @Override
-            public String convert(final Number o) {
-                return o.toString();
-            }
-        };
-
-        private static final ToString<TimeZone> FROM_TIME_ZONE = new ToString<TimeZone>() {
-            @Override
-            public String convert(final TimeZone o) {
-                return o.getID();
-            }
-        };
-        private static final ToString<ZoneId> FROM_ZONE_ID = new ToString<ZoneId>() {
-            @Override
-            public String convert(final ZoneId o) {
-                return o.getId();
-            }
-        };
-
-        private static final ToString<Object> FROM_OBJECT = new ToString<Object>() {
-            @Override
-            public String convert(final Object o) {
-                return o.toString();
-            }
-        };
-
-        private static final ToString<ZonedDateTime> FROM_DATE_TIME = new ToString<ZonedDateTime>() {
-            @Override
-            public String convert(ZonedDateTime o) {
-                return ISO_DATE_TIME.format(o);
-            }
-        };
-    }
-
-    /**
-     * {@link TimeZone} conversion functions.
-     */
-    private abstract static class ToTimeZone<T> extends Converter<TimeZone, T> {
-        private static final ToTimeZone<String> FROM_STRING = new ToTimeZone<String>() {
-            @Override
-            public TimeZone convert(final String o) {
-                return TimeZone.getTimeZone(o);
-            }
-        };
-    }
-
-    /**
-     * {@link ZoneId} conversion functions.
-     */
-    private abstract static class ToZoneId<T> extends Converter<ZoneId, T> {
-        private static final ToZoneId<String> FROM_STRING = new ToZoneId<String>() {
-            @Override
-            public ZoneId convert(final String o) {
-                return ZoneId.of(o);
-            }
-        };
-    }
-
-    /**
-     * {@link java.net.URL} conversion functions.
-     */
-    private abstract static class ToUrl<T> extends Converter<java.net.URL, String> {
-        private static final ToUrl<String> FROM_STRING = new ToUrl<String>() {
-            @Override
-            public java.net.URL convert(final String o) {
-                try {
-                    return new java.net.URL(o);
-                } catch (final java.net.MalformedURLException e) {
-                    throw new IllegalArgumentException("malformed URL", e);
-                }
-            }
-        };
-    }
-
-    /**
-     * {@link java.net.URI} conversion functions.
-     */
-    private abstract static class ToUri<T> extends Converter<java.net.URI, T> {
-        private static final ToUri<String> FROM_STRING = new ToUri<String>() {
-            @Override
-            public java.net.URI convert(final String o) {
-                try {
-                    return new java.net.URI(o);
-                } catch (final java.net.URISyntaxException e) {
-                    throw new IllegalArgumentException("malformed URI", e);
-                }
-            }
-        };
-    }
-
-    /**
-     * {@link java.util.UUID} conversion functions.
-     */
-    private abstract static class ToUuid<T> extends Converter<java.util.UUID, T> {
-        private static final ToUuid<ByteBuffer> FROM_BYTE_BUFFER = new ToUuid<ByteBuffer>() {
-            @Override
-            public java.util.UUID convert(final ByteBuffer o) {
-                return new java.util.UUID(o.getLong(), o.getLong());
-            }
-        };
-
-        private static final ToUuid<String> FROM_STRING = new ToUuid<String>() {
-            @Override
-            public java.util.UUID convert(final String o) {
-                return java.util.UUID.fromString(o);
-            }
-        };
-    }
-
-    /**
-     * {@link Object} conversion functions.
-     */
-    private abstract static class ToObject<T> extends Converter<Object, T> {
-        private static final ToObject<Object> FROM_OBJECT = new ToObject<Object>() {
-            @Override
-            public Object convert(final Object o) {
-                return o;
-            }
-        };
-    }
-
-    /**
-     * One-way type-converter.
-     */
-    abstract static class Converter<S, T> {
-        final <U> Converter<S, U> join(final Converter<T, U> target) {
-            final Converter<S, T> source = this;
-            return new Converter<S, U>() {
-                @Override
-                public S convert(final U o) {
-                    return source.convert(target.convert(o));
-                }
-            };
-        }
-
-        public abstract S convert(T o);
-    }
-
-    private static class StandardDynamoDbTypeConverter<S, T> implements DynamoDbTypeConverter<S, T> {
-        private final Converter<S, T> toSource;
-        private final Converter<T, S> toTarget;
-
-        StandardDynamoDbTypeConverter(Converter<S, T> toSource, Converter<T, S> toTarget) {
-            this.toSource = toSource;
-            this.toTarget = toTarget;
-        }
-
-        @Override
-        public final S convert(final T o) {
-            return toSource.convert(o);
-        }
-
-        @Override
-        public final T unconvert(final S o) {
-            return toTarget.convert(o);
-        }
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/StringListMapTest.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/StringListMapTest.java
deleted file mode 100644
index 69d478e13a2e..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/StringListMapTest.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-import static org.junit.Assert.assertEquals;
-
-import java.util.List;
-import org.junit.Test;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMapper.StringListMap;
-
-/**
- * Unit tests for {@link StringListMap}.
- */
-public class StringListMapTest {
-
-    private StringListMap<Integer> map() {
-        final StringListMap<Integer> map = new StringListMap<Integer>();
-        for (int i = 1, its = 1; i <= its; i++) {
-            map.add("A", Integer.valueOf(i));
-        }
-        for (int i = 1, its = 25; i <= its; i++) {
-            map.add("B", Integer.valueOf(i));
-        }
-        for (int i = 1, its = 10; i <= its; i++) {
-            map.add("C", Integer.valueOf(i));
-        }
-        for (int i = 1, its = 5; i <= its; i++) {
-            map.add("D", Integer.valueOf(i));
-        }
-        for (int i = 1, its = 10; i <= its; i++) {
-            map.add("E", Integer.valueOf(i));
-        }
-        for (int i = 1, its = 25; i <= its; i++) {
-            map.add("F", Integer.valueOf(i));
-        }
-        for (int i = 1, its = 1; i <= its; i++) {
-            map.add("G", Integer.valueOf(i));
-        }
-        assertEquals(7, map.size());
-        return map;
-    }
-
-    @Test
-    public void testSubMaps20PerMap() {
-        assertSizes(map().subMaps(20, true), new int[][] {{1, 19}, {6, 10, 4}, {1, 10, 9}, {16, 1}});
-    }
-
-    @Test
-    public void testSubMaps11PerMap() {
-        assertSizes(map().subMaps(11, true), new int[][] {{1, 10}, {11}, {4, 7}, {3, 5, 3}, {7, 4}, {11}, {10, 1}});
-    }
-
-    @Test
-    public void testSubMapsInto4() {
-        assertSizes(map().subMaps(4, false), new int[][] {{1, 6, 2, 2, 2, 6, 1}, {7, 2, 1, 3, 6}, {6, 3, 1, 3, 6}, {6, 3, 1, 2, 7}});
-    }
-
-    private void assertSizes(List<StringListMap<Integer>> subMaps, int[][] sizes) {
-        try {
-            assertEquals(sizes.length, subMaps.size());
-
-            for (int mapIndex = 0, keyIndex = 0; mapIndex < sizes.length; mapIndex++, keyIndex = 0) {
-                final StringListMap<Integer> subMap = subMaps.get(mapIndex);
-                assertEquals("subMaps[" + mapIndex + "]", sizes[mapIndex].length, subMap.size());
-
-                for (final List<Integer> values : subMap.values()) {
-                    assertEquals("subMaps[" + mapIndex + "][" + keyIndex + "]", sizes[mapIndex][keyIndex], values.size());
-                    keyIndex++;
-                }
-            }
-        } catch (final Error e) {
-            System.out.println("subMaps=" + subMaps);
-            throw e;
-        }
-    }
-
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/TestParameters.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/TestParameters.java
deleted file mode 100644
index 0ba70d9924d7..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/TestParameters.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-import java.util.Map;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-
-public class TestParameters<T>
-        implements AttributeTransformer.Parameters<T> {
-
-    private Map<String, AttributeValue> attributeValues;
-
-    public TestParameters() {
-        this(null);
-    }
-
-    public TestParameters(Map<String, AttributeValue> attributeValues) {
-        this.attributeValues = attributeValues;
-    }
-
-    public Map<String, AttributeValue> getAttributeValues() {
-        return attributeValues;
-    }
-
-    public boolean isPartialUpdate() {
-        return false;
-    }
-
-    public Class<T> modelClass() {
-        return null;
-    }
-
-    public DynamoDbMapperConfig mapperConfig() {
-        return null;
-    }
-
-    public String getTableName() {
-        return null;
-    }
-
-    public String getHashKeyName() {
-        return null;
-    }
-
-    public String getRangeKeyName() {
-        return null;
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/UnmarshallerTest.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/UnmarshallerTest.java
deleted file mode 100644
index 3fed28fc67e2..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/UnmarshallerTest.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-import java.lang.reflect.Method;
-import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-
-public class UnmarshallerTest extends StandardModelFactoriesV2UnconvertTest {
-
-    private static final ItemConverter CONVERTER = CONFIG.getConversionSchema().getConverter(
-            new ConversionSchema.Dependencies().with(S3ClientCache.class, new S3ClientCache((AwsCredentialsProvider) null)));
-
-    @Override
-    protected <T> Object unconvert(Class<T> clazz, Method getter, Method setter, AttributeValue value) {
-        return CONVERTER.unconvert(getter, setter, value);
-    }
-
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/V1MarshallerTest.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/V1MarshallerTest.java
deleted file mode 100644
index f3166984e6fd..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/V1MarshallerTest.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-import java.lang.reflect.Method;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-
-public class V1MarshallerTest extends StandardModelFactoriesV1Test {
-
-    private static final ItemConverter CONVERTER = CONFIG.getConversionSchema().getConverter(
-            new ConversionSchema.Dependencies());
-
-    @Override
-    protected <T> AttributeValue convert(Class<T> clazz, Method getter, Object value) {
-        return CONVERTER.convert(getter, value);
-    }
-
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/V2CompatMarshallerTest.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/V2CompatMarshallerTest.java
deleted file mode 100644
index 78ded601a426..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/V2CompatMarshallerTest.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-import java.lang.reflect.Method;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-
-public class V2CompatMarshallerTest extends StandardModelFactoriesV2CompatibleTest {
-
-    private static final ItemConverter CONVERTER = CONFIG.getConversionSchema().getConverter(
-            new ConversionSchema.Dependencies());
-
-    @Override
-    protected <T> AttributeValue convert(Class<T> clazz, Method getter, Object value) {
-        return CONVERTER.convert(getter, value);
-    }
-
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/V2MarshallerTest.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/V2MarshallerTest.java
deleted file mode 100644
index cf879edceb8c..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/V2MarshallerTest.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling;
-
-import java.lang.reflect.Method;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-
-public class V2MarshallerTest extends StandardModelFactoriesV2Test {
-
-    private static final ItemConverter CONVERTER = CONFIG.getConversionSchema().getConverter(
-            new ConversionSchema.Dependencies());
-
-    @Override
-    protected <T> AttributeValue convert(Class<T> clazz, Method getter, Object value) {
-        return CONVERTER.convert(getter, value);
-    }
-
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/marshallers/BooleanSetToNumberSetMarshaller.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/marshallers/BooleanSetToNumberSetMarshaller.java
deleted file mode 100644
index beff5cf7f943..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/marshallers/BooleanSetToNumberSetMarshaller.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling.marshallers;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-import software.amazon.awssdk.services.dynamodb.datamodeling.ArgumentMarshaller.NumberSetAttributeMarshaller;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-
-/**
- * A legacy marshaller that marshals sets of Java {@code Booleans} into DynamoDB
- * NumberSets, representing {@code true} as '1' and {@code false} as '0'.
- * Retained for backwards compatibility with older versions of the mapper which
- * don't know about the DynamoDB BOOL type.
- */
-public class BooleanSetToNumberSetMarshaller
-        implements NumberSetAttributeMarshaller {
-
-    private static final BooleanSetToNumberSetMarshaller INSTANCE =
-            new BooleanSetToNumberSetMarshaller();
-
-    private BooleanSetToNumberSetMarshaller() {
-    }
-
-    public static BooleanSetToNumberSetMarshaller instance() {
-        return INSTANCE;
-    }
-
-    @Override
-    public AttributeValue marshall(Object obj) {
-        @SuppressWarnings("unchecked")
-        Set<Boolean> booleans = (Set<Boolean>) obj;
-        List<String> booleanAttributes = new ArrayList<String>(booleans.size());
-
-        for (Boolean b : booleans) {
-            if (b == null || b == false) {
-                booleanAttributes.add("0");
-            } else {
-                booleanAttributes.add("1");
-            }
-        }
-
-        return AttributeValue.builder().ns(booleanAttributes).build();
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/marshallers/BooleanToBooleanMarshaller.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/marshallers/BooleanToBooleanMarshaller.java
deleted file mode 100644
index 0045ee31fa23..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/marshallers/BooleanToBooleanMarshaller.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling.marshallers;
-
-import software.amazon.awssdk.services.dynamodb.datamodeling.ArgumentMarshaller.BooleanAttributeMarshaller;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-
-/**
- * A marshaller that marshals Java {@code Boolean} objects to Dynamodb-native
- * {@code BOOL} attribute values.
- */
-public class BooleanToBooleanMarshaller implements BooleanAttributeMarshaller {
-
-    private static final BooleanToBooleanMarshaller INSTANCE =
-            new BooleanToBooleanMarshaller();
-
-    private BooleanToBooleanMarshaller() {
-    }
-
-    public static BooleanToBooleanMarshaller instance() {
-        return INSTANCE;
-    }
-
-    @Override
-    public AttributeValue marshall(Object obj) {
-        return AttributeValue.builder().bool((Boolean) obj).build();
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/marshallers/BooleanToNumberMarshaller.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/marshallers/BooleanToNumberMarshaller.java
deleted file mode 100644
index c757e3d79a40..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/marshallers/BooleanToNumberMarshaller.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling.marshallers;
-
-import software.amazon.awssdk.services.dynamodb.datamodeling.ArgumentMarshaller.NumberAttributeMarshaller;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-
-/**
- * A legacy marshaller that marshals Java {@code Booleans} into DynamoDB
- * Numbers, representing {@code true} as '1' and {@code false} as '0'. Retained
- * for backwards compatibility with older versions of the mapper which don't
- * know about the DynamoDB BOOL type.
- */
-public class BooleanToNumberMarshaller implements NumberAttributeMarshaller {
-
-    private static final BooleanToNumberMarshaller INSTANCE =
-            new BooleanToNumberMarshaller();
-
-    private BooleanToNumberMarshaller() {
-    }
-
-    public static BooleanToNumberMarshaller instance() {
-        return INSTANCE;
-    }
-
-    @Override
-    public AttributeValue marshall(Object obj) {
-        Boolean bool = (Boolean) obj;
-        if (bool == null || bool == false) {
-            return AttributeValue.builder().n("0").build();
-        } else {
-            return AttributeValue.builder().n("1").build();
-        }
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/marshallers/ByteArraySetToBinarySetMarshaller.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/marshallers/ByteArraySetToBinarySetMarshaller.java
deleted file mode 100644
index 4b4db1f7fd23..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/marshallers/ByteArraySetToBinarySetMarshaller.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling.marshallers;
-
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-import software.amazon.awssdk.core.SdkBytes;
-import software.amazon.awssdk.services.dynamodb.datamodeling.ArgumentMarshaller.BinarySetAttributeMarshaller;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-
-/**
- * A marshaller that marshals sets of Java {@code byte[]}s into DynamoDB
- * BinarySet attributes.
- */
-public class ByteArraySetToBinarySetMarshaller
-        implements BinarySetAttributeMarshaller {
-
-    private static final ByteArraySetToBinarySetMarshaller INSTANCE =
-            new ByteArraySetToBinarySetMarshaller();
-
-    private ByteArraySetToBinarySetMarshaller() {
-    }
-
-    public static ByteArraySetToBinarySetMarshaller instance() {
-        return INSTANCE;
-    }
-
-    @Override
-    public AttributeValue marshall(Object obj) {
-        @SuppressWarnings("unchecked")
-        Set<byte[]> buffers = (Set<byte[]>) obj;
-        List<SdkBytes> attributes = new ArrayList<>(buffers.size());
-
-        for (byte[] b : buffers) {
-            attributes.add(SdkBytes.fromByteArray(b));
-        }
-
-        return AttributeValue.builder().bs(attributes).build();
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/marshallers/ByteArrayToBinaryMarshaller.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/marshallers/ByteArrayToBinaryMarshaller.java
deleted file mode 100644
index f188d8a486af..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/marshallers/ByteArrayToBinaryMarshaller.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling.marshallers;
-
-import software.amazon.awssdk.core.SdkBytes;
-import software.amazon.awssdk.services.dynamodb.datamodeling.ArgumentMarshaller.BinaryAttributeMarshaller;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-
-/**
- * A marshaller that marshals Java {@code byte[]}s into DynamoDB Binary
- * attributes.
- */
-public class ByteArrayToBinaryMarshaller implements BinaryAttributeMarshaller {
-
-    private static final ByteArrayToBinaryMarshaller INSTANCE =
-            new ByteArrayToBinaryMarshaller();
-
-    private ByteArrayToBinaryMarshaller() {
-    }
-
-    public static ByteArrayToBinaryMarshaller instance() {
-        return INSTANCE;
-    }
-
-    @Override
-    public AttributeValue marshall(Object obj) {
-        return AttributeValue.builder().b(SdkBytes.fromByteArray((byte[]) obj)).build();
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/marshallers/ByteBufferSetToBinarySetMarshaller.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/marshallers/ByteBufferSetToBinarySetMarshaller.java
deleted file mode 100644
index f305ac86a507..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/marshallers/ByteBufferSetToBinarySetMarshaller.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling.marshallers;
-
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-import software.amazon.awssdk.core.SdkBytes;
-import software.amazon.awssdk.services.dynamodb.datamodeling.ArgumentMarshaller.BinarySetAttributeMarshaller;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-
-/**
- * A marshaller that marshals sets of Java {@code ByteBuffer}s into DynamoDB
- * BinarySet attributes.
- */
-public class ByteBufferSetToBinarySetMarshaller
-        implements BinarySetAttributeMarshaller {
-
-    private static final ByteBufferSetToBinarySetMarshaller INSTANCE =
-            new ByteBufferSetToBinarySetMarshaller();
-
-    private ByteBufferSetToBinarySetMarshaller() {
-    }
-
-    public static ByteBufferSetToBinarySetMarshaller instance() {
-        return INSTANCE;
-    }
-
-    @Override
-    public AttributeValue marshall(Object obj) {
-        @SuppressWarnings("unchecked")
-        Set<ByteBuffer> buffers = (Set<ByteBuffer>) obj;
-        List<SdkBytes> attributes = new ArrayList<SdkBytes>(buffers.size());
-
-        for (ByteBuffer b : buffers) {
-            attributes.add(SdkBytes.fromByteBuffer(b));
-        }
-
-        return AttributeValue.builder().bs(attributes).build();
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/marshallers/ByteBufferToBinaryMarshaller.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/marshallers/ByteBufferToBinaryMarshaller.java
deleted file mode 100644
index 2f9d7fcd3aa6..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/marshallers/ByteBufferToBinaryMarshaller.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling.marshallers;
-
-import java.nio.ByteBuffer;
-import software.amazon.awssdk.core.SdkBytes;
-import software.amazon.awssdk.services.dynamodb.datamodeling.ArgumentMarshaller.BinaryAttributeMarshaller;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-
-/**
- * A marshaller that marshals Java {@code ByteBuffer}s into DynamoDB Binary
- * attributes.
- */
-public class ByteBufferToBinaryMarshaller implements BinaryAttributeMarshaller {
-
-    private static final ByteBufferToBinaryMarshaller INSTANCE =
-            new ByteBufferToBinaryMarshaller();
-
-    private ByteBufferToBinaryMarshaller() {
-    }
-
-    public static ByteBufferToBinaryMarshaller instance() {
-        return INSTANCE;
-    }
-
-    @Override
-    public AttributeValue marshall(Object obj) {
-        return AttributeValue.builder().b(SdkBytes.fromByteBuffer((ByteBuffer) obj)).build();
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/marshallers/CalendarSetToStringSetMarshaller.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/marshallers/CalendarSetToStringSetMarshaller.java
deleted file mode 100644
index ad5b1fa63330..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/marshallers/CalendarSetToStringSetMarshaller.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling.marshallers;
-
-import static software.amazon.awssdk.utils.DateUtils.formatIso8601Date;
-
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.List;
-import java.util.Set;
-import software.amazon.awssdk.services.dynamodb.datamodeling.ArgumentMarshaller.StringSetAttributeMarshaller;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-
-/**
- * A marshaller that marshals sets of Java {@code Calendar} objects into
- * DynamoDB StringSets (in ISO 8601 format, ie {"2014-01-01T00:00:00Z", ...}).
- */
-public class CalendarSetToStringSetMarshaller
-        implements StringSetAttributeMarshaller {
-
-    private static final CalendarSetToStringSetMarshaller INSTANCE =
-            new CalendarSetToStringSetMarshaller();
-
-    private CalendarSetToStringSetMarshaller() {
-    }
-
-    public static CalendarSetToStringSetMarshaller instance() {
-        return INSTANCE;
-    }
-
-    @Override
-    public AttributeValue marshall(Object obj) {
-        @SuppressWarnings("unchecked")
-        Set<Calendar> dates = (Set<Calendar>) obj;
-
-        List<String> timestamps = new ArrayList<String>(dates.size());
-        for (Calendar calendar : dates) {
-            timestamps.add(formatIso8601Date(calendar.toInstant()));
-        }
-
-        return AttributeValue.builder().ss(timestamps).build();
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/marshallers/CalendarToStringMarshaller.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/marshallers/CalendarToStringMarshaller.java
deleted file mode 100644
index 1c734f99b29e..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/marshallers/CalendarToStringMarshaller.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling.marshallers;
-
-import static software.amazon.awssdk.utils.DateUtils.formatIso8601Date;
-
-import java.util.Calendar;
-import software.amazon.awssdk.services.dynamodb.datamodeling.ArgumentMarshaller.StringAttributeMarshaller;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-
-/**
- * A marshaller that marshals Java {@code Calendar} objects into DynamoDB
- * Strings (in ISO 8601 format, ie "2014-01-01T00:00:00Z").
- */
-public class CalendarToStringMarshaller implements StringAttributeMarshaller {
-
-    private static final CalendarToStringMarshaller INSTANCE =
-            new CalendarToStringMarshaller();
-
-    private CalendarToStringMarshaller() {
-    }
-
-    public static CalendarToStringMarshaller instance() {
-        return INSTANCE;
-    }
-
-    @Override
-    public AttributeValue marshall(Object obj) {
-        Calendar calendar = (Calendar) obj;
-        return AttributeValue.builder().s(
-                formatIso8601Date(calendar.toInstant())).build();
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/marshallers/CollectionToListMarshaller.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/marshallers/CollectionToListMarshaller.java
deleted file mode 100644
index 7135d06ef751..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/marshallers/CollectionToListMarshaller.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling.marshallers;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import software.amazon.awssdk.services.dynamodb.datamodeling.ArgumentMarshaller;
-import software.amazon.awssdk.services.dynamodb.datamodeling.ArgumentMarshaller.ListAttributeMarshaller;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-
-public class CollectionToListMarshaller implements ListAttributeMarshaller {
-
-    private static final CollectionToListMarshaller INSTANCE =
-            new CollectionToListMarshaller();
-    private final ArgumentMarshaller memberMarshaller;
-
-
-    private CollectionToListMarshaller() {
-        this(null);
-    }
-
-    public CollectionToListMarshaller(ArgumentMarshaller memberMarshaller) {
-        this.memberMarshaller = memberMarshaller;
-    }
-
-    public static CollectionToListMarshaller instance() {
-        return INSTANCE;
-    }
-
-    @Override
-    public AttributeValue marshall(Object obj) {
-        if (memberMarshaller == null) {
-            throw new IllegalStateException(
-                    "No member marshaller configured!");
-        }
-
-        Collection<?> objects = (Collection<?>) obj;
-        List<AttributeValue> values =
-                new ArrayList<AttributeValue>(objects.size());
-
-        for (Object o : objects) {
-            AttributeValue value;
-            if (o == null) {
-                value = AttributeValue.builder().nul(true).build();
-            } else {
-                value = memberMarshaller.marshall(o);
-            }
-
-            values.add(value);
-        }
-
-        AttributeValue result = AttributeValue.builder().l(values).build();
-        return result;
-    }
-
-    public ArgumentMarshaller memberMarshaller() {
-        return memberMarshaller;
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/marshallers/CustomMarshaller.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/marshallers/CustomMarshaller.java
deleted file mode 100644
index 61cf9f93bb45..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/marshallers/CustomMarshaller.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling.marshallers;
-
-import software.amazon.awssdk.services.dynamodb.datamodeling.ArgumentMarshaller.StringAttributeMarshaller;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMappingException;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMarshaller;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-
-/**
- * A marshaller that delegates to an instance of a
- * {@code DynamoDBMarshalling}-derived custom marshaler.
- */
-public class CustomMarshaller implements StringAttributeMarshaller {
-
-    private final Class<? extends DynamoDbMarshaller<?>> marshallerClass;
-
-    public CustomMarshaller(
-            Class<? extends DynamoDbMarshaller<?>> marshallerClass) {
-
-        this.marshallerClass = marshallerClass;
-    }
-
-    @SuppressWarnings("unchecked")
-    private static DynamoDbMarshaller<Object> createMarshaller(Class<?> clazz) {
-        try {
-
-            return (DynamoDbMarshaller<Object>) clazz.newInstance();
-
-        } catch (InstantiationException e) {
-            throw new DynamoDbMappingException(
-                    "Failed to instantiate custom marshaler for class " + clazz,
-                    e);
-
-        } catch (IllegalAccessException e) {
-            throw new DynamoDbMappingException(
-                    "Failed to instantiate custom marshaler for class " + clazz,
-                    e);
-        }
-    }
-
-    @Override
-    public AttributeValue marshall(Object obj) {
-
-        // TODO: Would be nice to cache this object, but not sure if we can
-        // do that now without a breaking change; user's marshalers might
-        // not all be thread-safe.
-
-        DynamoDbMarshaller<Object> marshaler =
-                createMarshaller(marshallerClass);
-
-        String stringValue = marshaler.marshall(obj);
-
-        if (stringValue == null) {
-            return null;
-        } else {
-            return AttributeValue.builder().s(stringValue).build();
-        }
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/marshallers/DateSetToStringSetMarshaller.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/marshallers/DateSetToStringSetMarshaller.java
deleted file mode 100644
index 51e942c16bb9..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/marshallers/DateSetToStringSetMarshaller.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling.marshallers;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Set;
-import software.amazon.awssdk.utils.DateUtils;
-import software.amazon.awssdk.services.dynamodb.datamodeling.ArgumentMarshaller.StringSetAttributeMarshaller;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-
-/**
- * A marshaller that marshals sets of Java {@code Date} objects into DynamoDB
- * StringSets (in ISO 8601 format, ie {"2014-01-01T00:00:00Z", ...}).
- */
-public class DateSetToStringSetMarshaller
-        implements StringSetAttributeMarshaller {
-
-    private static final DateSetToStringSetMarshaller INSTANCE =
-            new DateSetToStringSetMarshaller();
-
-    private DateSetToStringSetMarshaller() {
-    }
-
-    public static DateSetToStringSetMarshaller instance() {
-        return INSTANCE;
-    }
-
-    @Override
-    public AttributeValue marshall(Object obj) {
-        @SuppressWarnings("unchecked")
-        Set<Date> dates = (Set<Date>) obj;
-
-        List<String> timestamps = new ArrayList<String>(dates.size());
-        for (Date date : dates) {
-            timestamps.add(DateUtils.formatIso8601Date(date.toInstant()));
-        }
-
-        return AttributeValue.builder().ss(timestamps).build();
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/marshallers/DateToStringMarshaller.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/marshallers/DateToStringMarshaller.java
deleted file mode 100644
index 304bd6e606e6..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/marshallers/DateToStringMarshaller.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling.marshallers;
-
-import static software.amazon.awssdk.utils.DateUtils.formatIso8601Date;
-
-import java.util.Date;
-import software.amazon.awssdk.services.dynamodb.datamodeling.ArgumentMarshaller.StringAttributeMarshaller;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-
-/**
- * A marshaller that marshals Java {@code Date} objects into DynamoDB Strings
- * (in ISO 8601 format, ie "2014-01-01T00:00:00Z").
- */
-public class DateToStringMarshaller implements StringAttributeMarshaller {
-
-    private static final DateToStringMarshaller INSTANCE =
-            new DateToStringMarshaller();
-
-    private DateToStringMarshaller() {
-    }
-
-    public static DateToStringMarshaller instance() {
-        return INSTANCE;
-    }
-
-    @Override
-    public AttributeValue marshall(Object obj) {
-        return AttributeValue.builder().s(
-                formatIso8601Date(Date.class.cast(obj).toInstant()))
-                .build();
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/marshallers/MapToMapMarshaller.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/marshallers/MapToMapMarshaller.java
deleted file mode 100644
index 4a35b2a9c15d..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/marshallers/MapToMapMarshaller.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling.marshallers;
-
-import java.util.HashMap;
-import java.util.Map;
-import software.amazon.awssdk.services.dynamodb.datamodeling.ArgumentMarshaller;
-import software.amazon.awssdk.services.dynamodb.datamodeling.ArgumentMarshaller.MapAttributeMarshaller;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-
-public class MapToMapMarshaller implements MapAttributeMarshaller {
-
-    private static final MapToMapMarshaller INSTANCE =
-            new MapToMapMarshaller();
-    private final ArgumentMarshaller memberMarshaller;
-
-
-    private MapToMapMarshaller() {
-        memberMarshaller = null;
-    }
-
-    public MapToMapMarshaller(ArgumentMarshaller memberMarshaller) {
-        if (memberMarshaller == null) {
-            throw new NullPointerException("memberMarshaller");
-        }
-        this.memberMarshaller = memberMarshaller;
-    }
-
-    public static MapToMapMarshaller instance() {
-        return INSTANCE;
-    }
-
-    @Override
-    public AttributeValue marshall(Object obj) {
-        if (memberMarshaller == null) {
-            throw new IllegalStateException(
-                    "No member marshaller configured!");
-        }
-
-        @SuppressWarnings("unchecked")
-        Map<String, ?> map = (Map<String, ?>) obj;
-        Map<String, AttributeValue> values =
-                new HashMap<String, AttributeValue>();
-
-        for (Map.Entry<String, ?> entry : map.entrySet()) {
-            AttributeValue value;
-            if (entry.getValue() == null) {
-                value = AttributeValue.builder().nul(true).build();
-            } else {
-                value = memberMarshaller.marshall(entry.getValue());
-            }
-
-            values.put(entry.getKey(), value);
-        }
-
-        AttributeValue result = AttributeValue.builder().m(values).build();
-        //result.setM(values);
-        return result;
-    }
-
-    public ArgumentMarshaller memberMarshaller() {
-        return memberMarshaller;
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/marshallers/NumberSetToNumberSetMarshaller.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/marshallers/NumberSetToNumberSetMarshaller.java
deleted file mode 100644
index ccf4b4ced273..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/marshallers/NumberSetToNumberSetMarshaller.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling.marshallers;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-import software.amazon.awssdk.services.dynamodb.datamodeling.ArgumentMarshaller.NumberSetAttributeMarshaller;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-
-/**
- * A marshaller that marshals sets of Java {@code Number}s into DynamoDB
- * NumberSets.
- */
-public class NumberSetToNumberSetMarshaller
-        implements NumberSetAttributeMarshaller {
-
-    private static final NumberSetToNumberSetMarshaller INSTANCE =
-            new NumberSetToNumberSetMarshaller();
-
-    private NumberSetToNumberSetMarshaller() {
-    }
-
-    public static NumberSetToNumberSetMarshaller instance() {
-        return INSTANCE;
-    }
-
-    @Override
-    public AttributeValue marshall(Object obj) {
-        @SuppressWarnings("unchecked")
-        Set<? extends Number> numbers = (Set<? extends Number>) obj;
-        List<String> numberAttributes = new ArrayList<String>(numbers.size());
-
-        for (Number n : numbers) {
-            numberAttributes.add(n.toString());
-        }
-
-        return AttributeValue.builder().ns(numberAttributes).build();
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/marshallers/NumberToNumberMarshaller.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/marshallers/NumberToNumberMarshaller.java
deleted file mode 100644
index c23322942a57..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/marshallers/NumberToNumberMarshaller.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling.marshallers;
-
-import software.amazon.awssdk.services.dynamodb.datamodeling.ArgumentMarshaller.NumberAttributeMarshaller;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-
-/**
- * A marshaller that marshals any Java {@code Number} to a DynamoDB number.
- */
-public class NumberToNumberMarshaller implements NumberAttributeMarshaller {
-
-    private static final NumberToNumberMarshaller INSTANCE =
-            new NumberToNumberMarshaller();
-
-    private NumberToNumberMarshaller() {
-    }
-
-    public static NumberToNumberMarshaller instance() {
-        return INSTANCE;
-    }
-
-    @Override
-    public AttributeValue marshall(Object obj) {
-        Number number = (Number) obj;
-        return AttributeValue.builder().n(number.toString()).build();
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/marshallers/ObjectSetToStringSetMarshaller.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/marshallers/ObjectSetToStringSetMarshaller.java
deleted file mode 100644
index 9d028316dced..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/marshallers/ObjectSetToStringSetMarshaller.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling.marshallers;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import software.amazon.awssdk.services.dynamodb.datamodeling.ArgumentMarshaller.StringSetAttributeMarshaller;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-
-/**
- * A legacy marshaller that marshals sets of arbitrary Java objects into
- * DynamoDB StringSets by using {@link String#valueOf(Object)}. Retained for
- * backwards compatibility in case someone is relying on this, but logs a
- * warning if ever used since we only know how to unmarshal back to Java
- * Strings.
- */
-public class ObjectSetToStringSetMarshaller
-        implements StringSetAttributeMarshaller {
-
-    private static final Logger log =
-            LoggerFactory.getLogger(ObjectSetToStringSetMarshaller.class);
-
-    private static final ObjectSetToStringSetMarshaller INSTANCE =
-            new ObjectSetToStringSetMarshaller();
-
-    private ObjectSetToStringSetMarshaller() {
-    }
-
-    public static ObjectSetToStringSetMarshaller instance() {
-        return INSTANCE;
-    }
-
-    @Override
-    public AttributeValue marshall(Object obj) {
-        Set<?> set = (Set<?>) obj;
-
-        log.warn("Marshaling a set of non-String objects to a DynamoDB "
-                 + "StringSet. You won't be able to read these objects back "
-                 + "out of DynamoDB unless you REALLY know what you're doing: "
-                 + "it's probably a bug. If you DO know what you're doing feel"
-                 + "free to ignore this warning, but consider using a custom "
-                 + "marshaler for this instead.");
-
-        List<String> strings = new ArrayList<String>(set.size());
-        for (Object o : set) {
-            strings.add(String.valueOf(o));
-        }
-
-        return AttributeValue.builder().ss(strings).build();
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/marshallers/ObjectToMapMarshaller.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/marshallers/ObjectToMapMarshaller.java
deleted file mode 100644
index 2075a16d00d7..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/marshallers/ObjectToMapMarshaller.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling.marshallers;
-
-import java.util.Map;
-import software.amazon.awssdk.services.dynamodb.datamodeling.ArgumentMarshaller.MapAttributeMarshaller;
-import software.amazon.awssdk.services.dynamodb.datamodeling.ItemConverter;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-
-public class ObjectToMapMarshaller implements MapAttributeMarshaller {
-
-    private static final ObjectToMapMarshaller INSTANCE =
-            new ObjectToMapMarshaller();
-    private final ItemConverter converter;
-
-    private ObjectToMapMarshaller() {
-        converter = null;
-    }
-
-    public ObjectToMapMarshaller(ItemConverter converter) {
-        if (converter == null) {
-            throw new NullPointerException("converter");
-        }
-        this.converter = converter;
-    }
-
-    public static ObjectToMapMarshaller instance() {
-        return INSTANCE;
-    }
-
-    @Override
-    public AttributeValue marshall(Object obj) {
-        Map<String, AttributeValue> values = converter.convert(obj);
-        return AttributeValue.builder().m(values).build();
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/marshallers/ObjectToStringMarshaller.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/marshallers/ObjectToStringMarshaller.java
deleted file mode 100644
index 16869104f830..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/marshallers/ObjectToStringMarshaller.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling.marshallers;
-
-import software.amazon.awssdk.services.dynamodb.datamodeling.ArgumentMarshaller.StringAttributeMarshaller;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-
-/**
- * A marshaller that marshals Java {@code Object} objects into DynamoDB
- * Strings.
- *
- * @author Sergei Egorov
- */
-public class ObjectToStringMarshaller implements StringAttributeMarshaller {
-
-    private static final ObjectToStringMarshaller INSTANCE =
-            new ObjectToStringMarshaller();
-
-    private ObjectToStringMarshaller() {
-    }
-
-    public static ObjectToStringMarshaller instance() {
-        return INSTANCE;
-    }
-
-    @Override
-    public AttributeValue marshall(Object obj) {
-        return AttributeValue.builder().s(obj.toString()).build();
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/marshallers/S3LinkToStringMarshaller.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/marshallers/S3LinkToStringMarshaller.java
deleted file mode 100644
index e91d640e9042..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/marshallers/S3LinkToStringMarshaller.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling.marshallers;
-
-import software.amazon.awssdk.services.dynamodb.datamodeling.ArgumentMarshaller.StringAttributeMarshaller;
-import software.amazon.awssdk.services.dynamodb.datamodeling.S3Link;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-
-/**
- * A marshaller that marshals {@code S3Link} objects to DynamoDB Strings,
- * using a JSON encoding. For example: {"s3":{"region":"us-west-2",
- *  "bucket":"my-bucket-name", "key": "foo/bar/baz.txt"}}.
- */
-public class S3LinkToStringMarshaller implements StringAttributeMarshaller {
-
-    private static final S3LinkToStringMarshaller INSTANCE =
-            new S3LinkToStringMarshaller();
-
-    private S3LinkToStringMarshaller() {
-    }
-
-    public static S3LinkToStringMarshaller instance() {
-        return INSTANCE;
-    }
-
-    @Override
-    public AttributeValue marshall(Object obj) {
-        S3Link s3link = (S3Link) obj;
-
-        if (s3link.bucketName() == null || s3link.getKey() == null) {
-            // insufficient S3 resource specification
-            return null;
-        }
-
-        return AttributeValue.builder().s(s3link.toJson()).build();
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/marshallers/StringSetToStringSetMarshaller.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/marshallers/StringSetToStringSetMarshaller.java
deleted file mode 100644
index aae6155c4e6f..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/marshallers/StringSetToStringSetMarshaller.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling.marshallers;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-import software.amazon.awssdk.services.dynamodb.datamodeling.ArgumentMarshaller.StringSetAttributeMarshaller;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-
-/**
- * A marshaller that marshals sets of Java {@code String}s to DynamoDB
- * StringSets.
- */
-public class StringSetToStringSetMarshaller
-        implements StringSetAttributeMarshaller {
-
-    private static final StringSetToStringSetMarshaller INSTANCE =
-            new StringSetToStringSetMarshaller();
-
-    private StringSetToStringSetMarshaller() {
-    }
-
-    public static StringSetToStringSetMarshaller instance() {
-        return INSTANCE;
-    }
-
-    @Override
-    public AttributeValue marshall(Object obj) {
-        @SuppressWarnings("unchecked")
-        Set<String> set = (Set<String>) obj;
-
-        List<String> strings = new ArrayList<String>(set.size());
-        for (String s : set) {
-            strings.add(s);
-        }
-
-        return AttributeValue.builder().ss(strings).build();
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/marshallers/StringToStringMarshaller.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/marshallers/StringToStringMarshaller.java
deleted file mode 100644
index abd03f07182f..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/marshallers/StringToStringMarshaller.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling.marshallers;
-
-import software.amazon.awssdk.services.dynamodb.datamodeling.ArgumentMarshaller.StringAttributeMarshaller;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-
-/**
- * A marshaller that marshals Java {@code String} objects to DynamoDB Strings.
- */
-public class StringToStringMarshaller implements StringAttributeMarshaller {
-
-    private static final StringToStringMarshaller INSTANCE =
-            new StringToStringMarshaller();
-
-    private StringToStringMarshaller() {
-    }
-
-    public static StringToStringMarshaller instance() {
-        return INSTANCE;
-    }
-
-    @Override
-    public AttributeValue marshall(Object obj) {
-        String string = (String) obj;
-        if (string.length() == 0) {
-            // Sticking with the legacy behavior for now.
-            return null;
-        }
-
-        return AttributeValue.builder().s(string).build();
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/marshallers/UuidSetToStringSetMarshaller.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/marshallers/UuidSetToStringSetMarshaller.java
deleted file mode 100644
index cae6047ff8ac..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/marshallers/UuidSetToStringSetMarshaller.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling.marshallers;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-import java.util.UUID;
-import software.amazon.awssdk.services.dynamodb.datamodeling.ArgumentMarshaller.StringSetAttributeMarshaller;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-
-/**
- * A marshaller that marshals sets of Java {@code Object} objects into
- * DynamoDB StringSets.
- */
-public class UuidSetToStringSetMarshaller
-        implements StringSetAttributeMarshaller {
-
-    private static final UuidSetToStringSetMarshaller INSTANCE =
-            new UuidSetToStringSetMarshaller();
-
-    private UuidSetToStringSetMarshaller() {
-    }
-
-    public static UuidSetToStringSetMarshaller instance() {
-        return INSTANCE;
-    }
-
-    @Override
-    public AttributeValue marshall(Object obj) {
-        @SuppressWarnings("unchecked")
-        Set<UUID> uuids = (Set<UUID>) obj;
-
-        List<String> strings = new ArrayList<String>(uuids.size());
-        for (UUID uuid : uuids) {
-            strings.add(uuid.toString());
-        }
-
-        return AttributeValue.builder().ss(strings).build();
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/marshallers/package-info.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/marshallers/package-info.java
deleted file mode 100644
index be3929bcef17..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/marshallers/package-info.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-/**
- * Standard implementations of {@code ArgumentMarshaller}.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling.marshallers;
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/BUnmarshaller.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/BUnmarshaller.java
deleted file mode 100644
index 535403cb2dc5..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/BUnmarshaller.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling.unmarshallers;
-
-import java.lang.reflect.Method;
-import software.amazon.awssdk.services.dynamodb.datamodeling.ArgumentUnmarshaller;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMappingException;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-
-abstract class BUnmarshaller implements ArgumentUnmarshaller {
-
-    @Override
-    public void typeCheck(AttributeValue value, Method setter) {
-        if (value.b() == null) {
-            throw new DynamoDbMappingException("Expected B in value " + value + " when invoking " + setter);
-        }
-    }
-
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/BigDecimalSetUnmarshaller.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/BigDecimalSetUnmarshaller.java
deleted file mode 100644
index a4300cfe3dbe..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/BigDecimalSetUnmarshaller.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling.unmarshallers;
-
-import java.math.BigDecimal;
-import java.util.HashSet;
-import java.util.Set;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-
-/**
- * An unmarshaller that unmarshals DynamoDB NumberSets into sets of Java
- * {@code BigDecimal}s.
- */
-public class BigDecimalSetUnmarshaller extends NsUnmarshaller {
-
-    private static final BigDecimalSetUnmarshaller INSTANCE =
-            new BigDecimalSetUnmarshaller();
-
-    private BigDecimalSetUnmarshaller() {
-    }
-
-    public static BigDecimalSetUnmarshaller instance() {
-        return INSTANCE;
-    }
-
-    @Override
-    public Object unmarshall(AttributeValue value) {
-        Set<BigDecimal> result = new HashSet<BigDecimal>();
-        for (String s : value.ns()) {
-            result.add(new BigDecimal(s));
-        }
-        return result;
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/BigDecimalUnmarshaller.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/BigDecimalUnmarshaller.java
deleted file mode 100644
index 2ff631e45575..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/BigDecimalUnmarshaller.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling.unmarshallers;
-
-import java.math.BigDecimal;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-
-/**
- * An unmarshaller that unmarshals DynamoDB Numbers into Java
- * {@code BigDecimal}s.
- */
-public class BigDecimalUnmarshaller extends NUnmarshaller {
-
-    private static final BigDecimalUnmarshaller INSTANCE =
-            new BigDecimalUnmarshaller();
-
-    private BigDecimalUnmarshaller() {
-    }
-
-    public static BigDecimalUnmarshaller instance() {
-        return INSTANCE;
-    }
-
-    @Override
-    public Object unmarshall(AttributeValue value) {
-        return new BigDecimal(value.n());
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/BigIntegerSetUnmarshaller.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/BigIntegerSetUnmarshaller.java
deleted file mode 100644
index d008cbb327de..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/BigIntegerSetUnmarshaller.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling.unmarshallers;
-
-import java.math.BigInteger;
-import java.util.HashSet;
-import java.util.Set;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-
-/**
- * An unmarshaller that unmarshals DynamoDB NumberSets into sets of Java
- * {@code BigInteger}s.
- */
-public class BigIntegerSetUnmarshaller extends NsUnmarshaller {
-
-    private static final BigIntegerSetUnmarshaller INSTANCE =
-            new BigIntegerSetUnmarshaller();
-
-    private BigIntegerSetUnmarshaller() {
-    }
-
-    public static BigIntegerSetUnmarshaller instance() {
-        return INSTANCE;
-    }
-
-    @Override
-    public Object unmarshall(AttributeValue value) {
-        Set<BigInteger> result = new HashSet<BigInteger>();
-        for (String s : value.ns()) {
-            result.add(new BigInteger(s));
-        }
-        return result;
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/BigIntegerUnmarshaller.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/BigIntegerUnmarshaller.java
deleted file mode 100644
index 3ec56b6cc1b0..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/BigIntegerUnmarshaller.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling.unmarshallers;
-
-import java.math.BigInteger;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-
-/**
- * An unmarshaller that unmarshals DynamoDB Numbers into Java
- * {@code BigInteger}s.
- */
-public class BigIntegerUnmarshaller extends NUnmarshaller {
-
-    private static final BigIntegerUnmarshaller INSTANCE =
-            new BigIntegerUnmarshaller();
-
-    private BigIntegerUnmarshaller() {
-    }
-
-    public static BigIntegerUnmarshaller instance() {
-        return INSTANCE;
-    }
-
-    @Override
-    public Object unmarshall(AttributeValue value) {
-        return new BigInteger(value.n());
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/BooleanSetUnmarshaller.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/BooleanSetUnmarshaller.java
deleted file mode 100644
index 8a0577601bb0..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/BooleanSetUnmarshaller.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling.unmarshallers;
-
-import java.lang.reflect.Method;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import software.amazon.awssdk.services.dynamodb.datamodeling.ArgumentUnmarshaller;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMappingException;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-
-/**
- * A special unmarshaller for Set&lt;Boolean>, which the V1 schema stores as
- * an NS using 0/1 for true/false. In the V2 schema these fall through to
- * the {@code ObjectSetToListMarshaller} which stores them as an L or BOOLs.
- */
-public class BooleanSetUnmarshaller implements ArgumentUnmarshaller {
-
-    private static final BooleanSetUnmarshaller INSTANCE =
-            new BooleanSetUnmarshaller();
-
-    private BooleanSetUnmarshaller() {
-    }
-
-    public static BooleanSetUnmarshaller instance() {
-        return INSTANCE;
-    }
-
-    @Override
-    public void typeCheck(AttributeValue value, Method setter) {
-        if (value.ns() == null && value.l() == null) {
-            throw new DynamoDbMappingException(
-                    "Expected either L or NS in value " + value
-                    + " when invoking " + setter);
-        }
-    }
-
-    @Override
-    public Object unmarshall(AttributeValue value) {
-        if (value.l() != null) {
-            return unmarshallList(value.l());
-        } else {
-            return unmarshallNs(value.ns());
-        }
-    }
-
-    private Set<Boolean> unmarshallList(List<AttributeValue> values) {
-        Set<Boolean> result = new HashSet<Boolean>();
-
-        for (AttributeValue value : values) {
-            Boolean bool;
-            if (Boolean.TRUE.equals(value.nul())) {
-                bool = null;
-            } else {
-                bool = value.bool();
-                if (bool == null) {
-                    throw new DynamoDbMappingException(
-                            value + " is not a boolean");
-                }
-            }
-
-            if (!result.add(bool)) {
-                throw new DynamoDbMappingException(
-                        "Duplicate value (" + bool + ") found in "
-                        + values);
-            }
-        }
-
-        return result;
-    }
-
-    private Set<Boolean> unmarshallNs(List<String> values) {
-        Set<Boolean> result = new HashSet<Boolean>();
-
-        for (String s : values) {
-            if ("1".equals(s)) {
-                result.add(Boolean.TRUE);
-            } else if ("0".equals(s)) {
-                result.add(Boolean.FALSE);
-            } else {
-                throw new IllegalArgumentException(
-                        "Expected '1' or '0' for boolean value, was " + s);
-            }
-        }
-
-        return result;
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/BooleanUnmarshaller.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/BooleanUnmarshaller.java
deleted file mode 100644
index 35a0cc49b702..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/BooleanUnmarshaller.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling.unmarshallers;
-
-import java.lang.reflect.Method;
-import software.amazon.awssdk.services.dynamodb.datamodeling.ArgumentUnmarshaller;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMappingException;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-
-/**
- * An unmarshaller that unmarshals DynamoDB Bools (or Numbers) into Java
- * {@code Boolean}s. Numbers are handled for backwards compatibility with
- * versions of the mapper written before the DynamoDB native Boolean type
- * was added, which stored Java {@code Boolean}s as either the Number 0 (false)
- * or 1 (true).
- */
-public class BooleanUnmarshaller implements ArgumentUnmarshaller {
-
-    private static final BooleanUnmarshaller INSTANCE =
-            new BooleanUnmarshaller();
-
-    private BooleanUnmarshaller() {
-    }
-
-    public static BooleanUnmarshaller instance() {
-        return INSTANCE;
-    }
-
-    @Override
-    public void typeCheck(AttributeValue value, Method setter) {
-        if (value.n() == null && value.bool() == null) {
-            throw new DynamoDbMappingException(
-                    "Expected either N or BOOL in value " + value
-                    + " when invoking " + setter);
-        }
-    }
-
-    @Override
-    public Object unmarshall(AttributeValue value) {
-        if (value.bool() != null) {
-            return value.bool();
-        }
-        if ("1".equals(value.n())) {
-            return Boolean.TRUE;
-        }
-        if ("0".equals(value.n())) {
-            return Boolean.FALSE;
-        }
-
-        throw new IllegalArgumentException(
-                "Expected '1', '0', or BOOL value for boolean value, was "
-                + value);
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/BsUnmarshaller.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/BsUnmarshaller.java
deleted file mode 100644
index 9529d8857679..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/BsUnmarshaller.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling.unmarshallers;
-
-import java.lang.reflect.Method;
-import software.amazon.awssdk.services.dynamodb.datamodeling.ArgumentUnmarshaller;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMappingException;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-
-abstract class BsUnmarshaller implements ArgumentUnmarshaller {
-
-    @Override
-    public void typeCheck(AttributeValue value, Method setter) {
-        if (value.bs() == null) {
-            throw new DynamoDbMappingException("Expected BS in value " + value + " when invoking " + setter);
-        }
-    }
-
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/ByteArraySetUnmarshaller.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/ByteArraySetUnmarshaller.java
deleted file mode 100644
index 129136773ed9..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/ByteArraySetUnmarshaller.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling.unmarshallers;
-
-import java.nio.ByteBuffer;
-import java.util.HashSet;
-import java.util.Set;
-import software.amazon.awssdk.core.SdkBytes;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-
-/**
- * An unmarshaller that unmarshals BinarySet values as sets of Java
- * {@code byte[]}s.
- */
-public class ByteArraySetUnmarshaller extends BsUnmarshaller {
-
-    private static final ByteArraySetUnmarshaller INSTANCE =
-            new ByteArraySetUnmarshaller();
-
-    private ByteArraySetUnmarshaller() {
-    }
-
-    public static ByteArraySetUnmarshaller instance() {
-        return INSTANCE;
-    }
-
-    @Override
-    public Object unmarshall(AttributeValue value) {
-        Set<byte[]> result = new HashSet<byte[]>();
-
-        for (SdkBytes bytesBuffer : value.bs()) {
-            ByteBuffer buffer = bytesBuffer.asByteBuffer();
-            if (buffer.hasArray()) {
-                result.add(buffer.array());
-            } else {
-                byte[] array = new byte[buffer.remaining()];
-                buffer.get(array);
-                result.add(array);
-            }
-        }
-
-        return result;
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/ByteArrayUnmarshaller.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/ByteArrayUnmarshaller.java
deleted file mode 100644
index 14454a43beee..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/ByteArrayUnmarshaller.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling.unmarshallers;
-
-import java.nio.ByteBuffer;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-
-/**
- * An unmarshaller that unmarshals Binary values as Java {@code byte[]}s.
- */
-public class ByteArrayUnmarshaller extends BUnmarshaller {
-
-    private static final ByteArrayUnmarshaller INSTANCE =
-            new ByteArrayUnmarshaller();
-
-    private ByteArrayUnmarshaller() {
-    }
-
-    public static ByteArrayUnmarshaller instance() {
-        return INSTANCE;
-    }
-
-    @Override
-    public Object unmarshall(AttributeValue value) {
-        return value.b().asByteArray();
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/ByteBufferSetUnmarshaller.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/ByteBufferSetUnmarshaller.java
deleted file mode 100644
index 0b85b70edde2..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/ByteBufferSetUnmarshaller.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling.unmarshallers;
-
-import java.util.stream.Collectors;
-import software.amazon.awssdk.core.SdkBytes;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-
-/**
- * An unmarshaller that unmarshals BinarySet values as sets of Java
- * {@code ByteBuffer}s.
- */
-public class ByteBufferSetUnmarshaller extends BsUnmarshaller {
-
-    private static final ByteBufferSetUnmarshaller INSTANCE =
-            new ByteBufferSetUnmarshaller();
-
-    private ByteBufferSetUnmarshaller() {
-    }
-
-    public static ByteBufferSetUnmarshaller instance() {
-        return INSTANCE;
-    }
-
-    @Override
-    public Object unmarshall(AttributeValue value) {
-        return value.bs().stream()
-                    .map(SdkBytes::asByteBuffer)
-                    .collect(Collectors.toSet());
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/ByteBufferUnmarshaller.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/ByteBufferUnmarshaller.java
deleted file mode 100644
index cc5b986226ed..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/ByteBufferUnmarshaller.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling.unmarshallers;
-
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-
-/**
- * An unmarshaller that unmarshals Binary values as Java {@code ByteBuffer}s.
- */
-public class ByteBufferUnmarshaller extends BUnmarshaller {
-
-    private static final ByteBufferUnmarshaller INSTANCE =
-            new ByteBufferUnmarshaller();
-
-    private ByteBufferUnmarshaller() {
-    }
-
-    public static ByteBufferUnmarshaller instance() {
-        return INSTANCE;
-    }
-
-    @Override
-    public Object unmarshall(AttributeValue value) {
-        return value.b().asByteBuffer();
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/ByteSetUnmarshaller.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/ByteSetUnmarshaller.java
deleted file mode 100644
index 1e29eaeaac0f..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/ByteSetUnmarshaller.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling.unmarshallers;
-
-import java.util.HashSet;
-import java.util.Set;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-
-/**
- * An unmarshaller that unmarshals DynamoDB NumberSets into sets of Java
- * {@code Byte}s.
- */
-public class ByteSetUnmarshaller extends NsUnmarshaller {
-
-    private static final ByteSetUnmarshaller INSTANCE =
-            new ByteSetUnmarshaller();
-
-    private ByteSetUnmarshaller() {
-    }
-
-    public static ByteSetUnmarshaller instance() {
-        return INSTANCE;
-    }
-
-    @Override
-    public Object unmarshall(AttributeValue value) {
-        Set<Byte> result = new HashSet<Byte>();
-        for (String s : value.ns()) {
-            result.add(Byte.valueOf(s));
-        }
-        return result;
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/ByteUnmarshaller.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/ByteUnmarshaller.java
deleted file mode 100644
index 55773a6459f4..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/ByteUnmarshaller.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling.unmarshallers;
-
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-
-/**
- * An unmarshaller that unmarshals DynamoDB Numbers into Java
- * {@code Byte}s.
- */
-public class ByteUnmarshaller extends NUnmarshaller {
-
-    private static final ByteUnmarshaller INSTANCE =
-            new ByteUnmarshaller();
-
-    private ByteUnmarshaller() {
-    }
-
-    public static ByteUnmarshaller instance() {
-        return INSTANCE;
-    }
-
-    @Override
-    public Object unmarshall(AttributeValue value) {
-        return Byte.valueOf(value.n());
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/CalendarSetUnmarshaller.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/CalendarSetUnmarshaller.java
deleted file mode 100644
index b1c9da0a10ec..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/CalendarSetUnmarshaller.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling.unmarshallers;
-
-import java.sql.Date;
-import java.util.Calendar;
-import java.util.GregorianCalendar;
-import java.util.HashSet;
-import java.util.Set;
-import software.amazon.awssdk.utils.DateUtils;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-
-/**
- * An unmarshaller that unmarshals sets of ISO-8601-formatted dates as sets of
- * Java {@code Calendar} objects.
- */
-public class CalendarSetUnmarshaller extends SsUnmarshaller {
-
-    private static final CalendarSetUnmarshaller INSTANCE =
-            new CalendarSetUnmarshaller();
-
-    private CalendarSetUnmarshaller() {
-    }
-
-    public static CalendarSetUnmarshaller instance() {
-        return INSTANCE;
-    }
-
-    @Override
-    public Object unmarshall(AttributeValue value) {
-        Set<Calendar> result = new HashSet<Calendar>();
-
-        for (String s : value.ss()) {
-            Calendar cal = GregorianCalendar.getInstance();
-            cal.setTime(Date.from(DateUtils.parseIso8601Date(s)));
-            result.add(cal);
-        }
-
-        return result;
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/CalendarUnmarshaller.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/CalendarUnmarshaller.java
deleted file mode 100644
index 95d3bbe211a2..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/CalendarUnmarshaller.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling.unmarshallers;
-
-import java.util.Calendar;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import software.amazon.awssdk.utils.DateUtils;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-
-/**
- * An unmarshaller that unmarshals ISO-8601-formatted dates as Java
- * {@code Calendar} objects.
- */
-public class CalendarUnmarshaller extends SUnmarshaller {
-
-    private static final CalendarUnmarshaller INSTANCE =
-            new CalendarUnmarshaller();
-
-    private CalendarUnmarshaller() {
-    }
-
-    public static CalendarUnmarshaller instance() {
-        return INSTANCE;
-    }
-
-    @Override
-    public Object unmarshall(AttributeValue value) {
-        Calendar cal = GregorianCalendar.getInstance();
-        cal.setTime(Date.from(DateUtils.parseIso8601Date(value.s())));
-        return cal;
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/CustomUnmarshaller.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/CustomUnmarshaller.java
deleted file mode 100644
index 6ed62268bacc..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/CustomUnmarshaller.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling.unmarshallers;
-
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMappingException;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMarshaller;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-
-/**
- * An unmarshaller that delegates to an instance of a
- * {@code DynamoDBMarshaller}-derived custom marshaler.
- */
-public class CustomUnmarshaller extends SUnmarshaller {
-
-    private final Class<?> targetClass;
-    private final Class<? extends DynamoDbMarshaller<?>> unmarshallerClass;
-
-    public CustomUnmarshaller(
-            Class<?> targetClass,
-            Class<? extends DynamoDbMarshaller<?>> unmarshallerClass) {
-
-        this.targetClass = targetClass;
-        this.unmarshallerClass = unmarshallerClass;
-    }
-
-    @SuppressWarnings({"rawtypes"})
-    private static DynamoDbMarshaller createUnmarshaller(Class<?> clazz) {
-        try {
-
-            return (DynamoDbMarshaller) clazz.newInstance();
-
-        } catch (InstantiationException e) {
-            throw new DynamoDbMappingException(
-                    "Failed to instantiate custom marshaler for class " + clazz,
-                    e);
-
-        } catch (IllegalAccessException e) {
-            throw new DynamoDbMappingException(
-                    "Failed to instantiate custom marshaler for class " + clazz,
-                    e);
-        }
-    }
-
-    @Override
-    @SuppressWarnings({"rawtypes", "unchecked"})
-    public Object unmarshall(AttributeValue value) {
-
-        // TODO: Would be nice to cache this object, but not sure if we can
-        // do that now without a breaking change; user's unmarshallers
-        // might not all be thread-safe.
-
-        DynamoDbMarshaller unmarshaller =
-                createUnmarshaller(unmarshallerClass);
-
-        return unmarshaller.unmarshall(targetClass, value.s());
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/DateSetUnmarshaller.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/DateSetUnmarshaller.java
deleted file mode 100644
index defa461a1444..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/DateSetUnmarshaller.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling.unmarshallers;
-
-import java.util.Date;
-import java.util.HashSet;
-import java.util.Set;
-import software.amazon.awssdk.utils.DateUtils;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-
-/**
- * An unmarshaller that unmarshals sets of ISO-8601-formatted dates as sets of
- * Java {@code Date} objects.
- */
-public class DateSetUnmarshaller extends SsUnmarshaller {
-
-    private static final DateSetUnmarshaller INSTANCE =
-            new DateSetUnmarshaller();
-
-    private DateSetUnmarshaller() {
-    }
-
-    public static DateSetUnmarshaller instance() {
-        return INSTANCE;
-    }
-
-    @Override
-    public Object unmarshall(AttributeValue value) {
-        Set<Date> result = new HashSet<Date>();
-
-        for (String s : value.ss()) {
-            result.add(Date.from(DateUtils.parseIso8601Date(s)));
-        }
-
-        return result;
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/DateUnmarshaller.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/DateUnmarshaller.java
deleted file mode 100644
index da650b7a5906..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/DateUnmarshaller.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling.unmarshallers;
-
-import java.util.Date;
-import software.amazon.awssdk.utils.DateUtils;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-
-/**
- * An unmarshaller that unmarshals ISO-8601-formatted dates as Java
- * {@code Date} objects.
- */
-public class DateUnmarshaller extends SUnmarshaller {
-
-    private static final DateUnmarshaller INSTANCE =
-            new DateUnmarshaller();
-
-    private DateUnmarshaller() {
-    }
-
-    public static DateUnmarshaller instance() {
-        return INSTANCE;
-    }
-
-    @Override
-    public Object unmarshall(AttributeValue value) {
-        return Date.from(DateUtils.parseIso8601Date(value.s()));
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/DoubleSetUnmarshaller.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/DoubleSetUnmarshaller.java
deleted file mode 100644
index 77397c9db8de..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/DoubleSetUnmarshaller.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling.unmarshallers;
-
-import java.util.HashSet;
-import java.util.Set;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-
-/**
- * An unmarshaller that unmarshals DynamoDB NumberSets into sets of Java
- * {@code Double}s.
- */
-public class DoubleSetUnmarshaller extends NsUnmarshaller {
-
-    private static final DoubleSetUnmarshaller INSTANCE =
-            new DoubleSetUnmarshaller();
-
-    private DoubleSetUnmarshaller() {
-    }
-
-    public static DoubleSetUnmarshaller instance() {
-        return INSTANCE;
-    }
-
-    @Override
-    public Object unmarshall(AttributeValue value) {
-        Set<Double> result = new HashSet<Double>();
-        for (String s : value.ns()) {
-            result.add(Double.valueOf(s));
-        }
-        return result;
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/DoubleUnmarshaller.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/DoubleUnmarshaller.java
deleted file mode 100644
index 9527458c812c..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/DoubleUnmarshaller.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling.unmarshallers;
-
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-
-/**
- * An unmarshaller that unmarshals DynamoDB Numbers into Java {@code Double}s.
- */
-public class DoubleUnmarshaller extends NUnmarshaller {
-
-    private static final DoubleUnmarshaller INSTANCE =
-            new DoubleUnmarshaller();
-
-    private DoubleUnmarshaller() {
-    }
-
-    public static DoubleUnmarshaller instance() {
-        return INSTANCE;
-    }
-
-    @Override
-    public Object unmarshall(AttributeValue value) {
-        return Double.valueOf(value.n());
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/FloatSetUnmarshaller.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/FloatSetUnmarshaller.java
deleted file mode 100644
index 65a21f6d502b..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/FloatSetUnmarshaller.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling.unmarshallers;
-
-import java.util.HashSet;
-import java.util.Set;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-
-/**
- * An unmarshaller that unmarshals DynamoDB NumberSets into sets of Java
- * {@code Float}s.
- */
-public class FloatSetUnmarshaller extends NsUnmarshaller {
-
-    private static final FloatSetUnmarshaller INSTANCE =
-            new FloatSetUnmarshaller();
-
-    private FloatSetUnmarshaller() {
-    }
-
-    public static FloatSetUnmarshaller instance() {
-        return INSTANCE;
-    }
-
-    @Override
-    public Object unmarshall(AttributeValue value) {
-        Set<Float> result = new HashSet<Float>();
-        for (String s : value.ns()) {
-            result.add(Float.valueOf(s));
-        }
-        return result;
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/FloatUnmarshaller.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/FloatUnmarshaller.java
deleted file mode 100644
index f38466798a2f..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/FloatUnmarshaller.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling.unmarshallers;
-
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-
-/**
- * An unmarshaller that unmarshals DynamoDB Numbers into Java
- * {@code Float}s.
- */
-public class FloatUnmarshaller extends NUnmarshaller {
-
-    private static final FloatUnmarshaller INSTANCE =
-            new FloatUnmarshaller();
-
-    private FloatUnmarshaller() {
-    }
-
-    public static FloatUnmarshaller instance() {
-        return INSTANCE;
-    }
-
-    @Override
-    public Object unmarshall(AttributeValue value) {
-        return Float.valueOf(value.n());
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/IntegerSetUnmarshaller.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/IntegerSetUnmarshaller.java
deleted file mode 100644
index 5a6a25e70109..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/IntegerSetUnmarshaller.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling.unmarshallers;
-
-import java.util.HashSet;
-import java.util.Set;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-
-/**
- * An unmarshaller that unmarshals DynamoDB NumberSets into sets of Java
- * {@code Integer}s.
- */
-public class IntegerSetUnmarshaller extends NsUnmarshaller {
-
-    private static final IntegerSetUnmarshaller INSTANCE =
-            new IntegerSetUnmarshaller();
-
-    private IntegerSetUnmarshaller() {
-    }
-
-    public static IntegerSetUnmarshaller instance() {
-        return INSTANCE;
-    }
-
-    @Override
-    public Object unmarshall(AttributeValue value) {
-        Set<Integer> result = new HashSet<Integer>();
-        for (String s : value.ns()) {
-            result.add(Integer.valueOf(s));
-        }
-        return result;
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/IntegerUnmarshaller.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/IntegerUnmarshaller.java
deleted file mode 100644
index 1a873aefdc3f..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/IntegerUnmarshaller.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling.unmarshallers;
-
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-
-/**
- * An unmarshaller that unmarshals DynamoDB Numbers into Java
- * {@code Integer}s.
- */
-public class IntegerUnmarshaller extends NUnmarshaller {
-
-    private static final IntegerUnmarshaller INSTANCE =
-            new IntegerUnmarshaller();
-
-    private IntegerUnmarshaller() {
-    }
-
-    public static IntegerUnmarshaller instance() {
-        return INSTANCE;
-    }
-
-    @Override
-    public Object unmarshall(AttributeValue value) {
-        return Integer.valueOf(value.n());
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/LUnmarshaller.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/LUnmarshaller.java
deleted file mode 100644
index 302610c8db3f..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/LUnmarshaller.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling.unmarshallers;
-
-import java.lang.reflect.Method;
-import software.amazon.awssdk.services.dynamodb.datamodeling.ArgumentUnmarshaller;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMappingException;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-
-abstract class LUnmarshaller implements ArgumentUnmarshaller {
-
-    @Override
-    public void typeCheck(AttributeValue value, Method setter) {
-        if (value.l() == null) {
-            throw new DynamoDbMappingException("Expected L in value " + value + " when invoking " + setter);
-        }
-    }
-
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/ListUnmarshaller.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/ListUnmarshaller.java
deleted file mode 100644
index 49d490061b5a..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/ListUnmarshaller.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling.unmarshallers;
-
-import java.text.ParseException;
-import java.util.ArrayList;
-import java.util.List;
-import software.amazon.awssdk.services.dynamodb.datamodeling.ArgumentUnmarshaller;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-
-/**
- * An unmarshaller that unmarshals Lists into Java {@code Lists}.
- */
-public class ListUnmarshaller extends LUnmarshaller {
-
-    private static final ListUnmarshaller INSTANCE = new ListUnmarshaller();
-    private final ArgumentUnmarshaller memberUnmarshaller;
-
-    private ListUnmarshaller() {
-        memberUnmarshaller = null;
-    }
-
-    public ListUnmarshaller(ArgumentUnmarshaller memberUnmarshaller) {
-        if (memberUnmarshaller == null) {
-            throw new NullPointerException("memberUnmarshaller");
-        }
-        this.memberUnmarshaller = memberUnmarshaller;
-    }
-
-    public static ListUnmarshaller instance() {
-        return INSTANCE;
-    }
-
-    @Override
-    public Object unmarshall(AttributeValue value) throws ParseException {
-        List<AttributeValue> values = value.l();
-        List<Object> objects = new ArrayList<Object>(values.size());
-
-        for (AttributeValue v : values) {
-            memberUnmarshaller.typeCheck(v, null);
-            objects.add(memberUnmarshaller.unmarshall(v));
-        }
-
-        return objects;
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/LongSetUnmarshaller.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/LongSetUnmarshaller.java
deleted file mode 100644
index fd3baa590c56..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/LongSetUnmarshaller.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling.unmarshallers;
-
-import java.util.HashSet;
-import java.util.Set;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-
-/**
- * An unmarshaller that unmarshals DynamoDB NumberSets into sets of Java
- * {@code Long}s.
- */
-public class LongSetUnmarshaller extends NsUnmarshaller {
-
-    private static final LongSetUnmarshaller INSTANCE =
-            new LongSetUnmarshaller();
-
-    private LongSetUnmarshaller() {
-    }
-
-    public static LongSetUnmarshaller instance() {
-        return INSTANCE;
-    }
-
-    @Override
-    public Object unmarshall(AttributeValue value) {
-        Set<Long> result = new HashSet<Long>();
-        for (String s : value.ns()) {
-            result.add(Long.valueOf(s));
-        }
-        return result;
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/LongUnmarshaller.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/LongUnmarshaller.java
deleted file mode 100644
index 4c0a6923e5f2..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/LongUnmarshaller.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling.unmarshallers;
-
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-
-/**
- * An unmarshaller that unmarshals DynamoDB Numbers into Java
- * {@code Long}s.
- */
-public class LongUnmarshaller extends NUnmarshaller {
-
-    private static final LongUnmarshaller INSTANCE =
-            new LongUnmarshaller();
-
-    private LongUnmarshaller() {
-    }
-
-    public static LongUnmarshaller instance() {
-        return INSTANCE;
-    }
-
-    @Override
-    public Object unmarshall(AttributeValue value) {
-        return Long.valueOf(value.n());
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/MUnmarshaller.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/MUnmarshaller.java
deleted file mode 100644
index a6901461a0c5..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/MUnmarshaller.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling.unmarshallers;
-
-import java.lang.reflect.Method;
-import software.amazon.awssdk.services.dynamodb.datamodeling.ArgumentUnmarshaller;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMappingException;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-
-abstract class MUnmarshaller implements ArgumentUnmarshaller {
-
-    @Override
-    public void typeCheck(AttributeValue value, Method setter) {
-        if (value.m() == null) {
-            throw new DynamoDbMappingException("Expected M in value " + value + " when invoking " + setter);
-        }
-    }
-
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/MapUnmarshaller.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/MapUnmarshaller.java
deleted file mode 100644
index 7aaddf400e4a..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/MapUnmarshaller.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling.unmarshallers;
-
-import java.text.ParseException;
-import java.util.HashMap;
-import java.util.Map;
-import software.amazon.awssdk.services.dynamodb.datamodeling.ArgumentUnmarshaller;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-
-public class MapUnmarshaller extends MUnmarshaller {
-
-    private static final MapUnmarshaller INSTANCE = new MapUnmarshaller();
-    private final ArgumentUnmarshaller memberUnmarshaller;
-
-    private MapUnmarshaller() {
-        memberUnmarshaller = null;
-    }
-
-    public MapUnmarshaller(ArgumentUnmarshaller memberUnmarshaller) {
-        if (memberUnmarshaller == null) {
-            throw new NullPointerException("memberUnmarshaller");
-        }
-        this.memberUnmarshaller = memberUnmarshaller;
-    }
-
-    public static MapUnmarshaller instance() {
-        return INSTANCE;
-    }
-
-    @Override
-    public Object unmarshall(AttributeValue value) throws ParseException {
-        Map<String, AttributeValue> map = value.m();
-        Map<String, Object> result = new HashMap<String, Object>();
-
-        for (Map.Entry<String, AttributeValue> entry : map.entrySet()) {
-            memberUnmarshaller.typeCheck(entry.getValue(), null);
-            result.put(entry.getKey(),
-                       memberUnmarshaller.unmarshall(entry.getValue()));
-        }
-
-        return result;
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/NUnmarshaller.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/NUnmarshaller.java
deleted file mode 100644
index f4a624922ac3..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/NUnmarshaller.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling.unmarshallers;
-
-import java.lang.reflect.Method;
-import software.amazon.awssdk.services.dynamodb.datamodeling.ArgumentUnmarshaller;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMappingException;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-
-abstract class NUnmarshaller implements ArgumentUnmarshaller {
-
-    @Override
-    public void typeCheck(AttributeValue value, Method setter) {
-        if (value.n() == null) {
-            throw new DynamoDbMappingException("Expected N in value " + value + " when invoking " + setter);
-        }
-    }
-
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/NsUnmarshaller.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/NsUnmarshaller.java
deleted file mode 100644
index 5940f8eb3670..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/NsUnmarshaller.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling.unmarshallers;
-
-import java.lang.reflect.Method;
-import software.amazon.awssdk.services.dynamodb.datamodeling.ArgumentUnmarshaller;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMappingException;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-
-abstract class NsUnmarshaller implements ArgumentUnmarshaller {
-
-    @Override
-    public void typeCheck(AttributeValue value, Method setter) {
-        if (value.ns() == null) {
-            throw new DynamoDbMappingException("Expected NS in value " + value + " when invoking " + setter);
-        }
-    }
-
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/NullableUnmarshaller.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/NullableUnmarshaller.java
deleted file mode 100644
index 897680ab882f..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/NullableUnmarshaller.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling.unmarshallers;
-
-import java.lang.reflect.Method;
-import java.text.ParseException;
-import software.amazon.awssdk.services.dynamodb.datamodeling.ArgumentUnmarshaller;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-
-public class NullableUnmarshaller implements ArgumentUnmarshaller {
-
-    private final ArgumentUnmarshaller wrapped;
-
-    public NullableUnmarshaller(ArgumentUnmarshaller wrapped) {
-        if (wrapped == null) {
-            throw new NullPointerException("wrapped");
-        }
-        this.wrapped = wrapped;
-    }
-
-    @Override
-    public void typeCheck(AttributeValue value, Method setter) {
-        if (value.nul() == null) {
-            wrapped.typeCheck(value, setter);
-        }
-    }
-
-    @Override
-    public Object unmarshall(AttributeValue value) throws ParseException {
-        if (value.nul() != null) {
-            return null;
-        }
-        return wrapped.unmarshall(value);
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/ObjectSetUnmarshaller.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/ObjectSetUnmarshaller.java
deleted file mode 100644
index 91627e6979ce..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/ObjectSetUnmarshaller.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling.unmarshallers;
-
-import java.text.ParseException;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Set;
-import software.amazon.awssdk.services.dynamodb.datamodeling.ArgumentUnmarshaller;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMappingException;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-
-public class ObjectSetUnmarshaller extends LUnmarshaller {
-
-    private static final ObjectSetUnmarshaller INSTANCE =
-            new ObjectSetUnmarshaller();
-    private final ArgumentUnmarshaller memberUnmarshaller;
-
-    private ObjectSetUnmarshaller() {
-        memberUnmarshaller = null;
-    }
-
-    public ObjectSetUnmarshaller(ArgumentUnmarshaller memberUnmarshaller) {
-        if (memberUnmarshaller == null) {
-            throw new NullPointerException("memberUnmarshaller");
-        }
-        this.memberUnmarshaller = memberUnmarshaller;
-    }
-
-    public static ObjectSetUnmarshaller instance() {
-        return INSTANCE;
-    }
-
-    @Override
-    public Object unmarshall(AttributeValue value) throws ParseException {
-        List<AttributeValue> values = value.l();
-
-        // As in the LinkedHashSet(Collection) constructor.
-        int size = Math.max(values.size() * 2, 11);
-        Set<Object> objects = new LinkedHashSet<Object>(size);
-
-        for (AttributeValue v : values) {
-            memberUnmarshaller.typeCheck(v, null);
-            Object o = memberUnmarshaller.unmarshall(v);
-            if (!objects.add(o)) {
-                throw new DynamoDbMappingException(
-                        "Duplicate value (" + o + ") found in " + values);
-            }
-        }
-
-        return objects;
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/ObjectUnmarshaller.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/ObjectUnmarshaller.java
deleted file mode 100644
index 9c2415285747..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/ObjectUnmarshaller.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling.unmarshallers;
-
-import java.text.ParseException;
-import java.util.Map;
-import software.amazon.awssdk.services.dynamodb.datamodeling.ItemConverter;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-
-public class ObjectUnmarshaller extends MUnmarshaller {
-
-    private static final ObjectUnmarshaller INSTANCE = new ObjectUnmarshaller();
-    private final ItemConverter converter;
-    private final Class<?> clazz;
-
-    private ObjectUnmarshaller() {
-        converter = null;
-        clazz = null;
-    }
-
-    public ObjectUnmarshaller(ItemConverter converter, Class<?> clazz) {
-        if (converter == null) {
-            throw new NullPointerException("converter");
-        }
-        if (clazz == null) {
-            throw new NullPointerException("clazz");
-        }
-
-        this.converter = converter;
-        this.clazz = clazz;
-    }
-
-    public static ObjectUnmarshaller instance() {
-        return INSTANCE;
-    }
-
-    @Override
-    public Object unmarshall(AttributeValue value) throws ParseException {
-        Map<String, AttributeValue> map = value.m();
-        return converter.unconvert(clazz, map);
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/S3LinkUnmarshaller.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/S3LinkUnmarshaller.java
deleted file mode 100644
index 488777f8ee7b..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/S3LinkUnmarshaller.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling.unmarshallers;
-
-import software.amazon.awssdk.services.dynamodb.datamodeling.S3ClientCache;
-import software.amazon.awssdk.services.dynamodb.datamodeling.S3Link;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-
-public class S3LinkUnmarshaller extends SUnmarshaller {
-
-    private static final S3LinkUnmarshaller INSTANCE = new S3LinkUnmarshaller();
-    private final S3ClientCache clientCache;
-
-
-    private S3LinkUnmarshaller() {
-        this(null);
-    }
-
-    public S3LinkUnmarshaller(S3ClientCache clientCache) {
-        this.clientCache = clientCache;
-    }
-
-    public static S3LinkUnmarshaller instance() {
-        return INSTANCE;
-    }
-
-    @Override
-    public Object unmarshall(AttributeValue value) {
-        if (clientCache == null) {
-            throw new IllegalStateException(
-                    "Mapper must be constructed with S3 AWS Credentials to "
-                    + "load S3Link");
-        }
-
-        return S3Link.fromJson(clientCache, value.s());
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/SUnmarshaller.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/SUnmarshaller.java
deleted file mode 100644
index 385172193459..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/SUnmarshaller.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling.unmarshallers;
-
-import java.lang.reflect.Method;
-import software.amazon.awssdk.services.dynamodb.datamodeling.ArgumentUnmarshaller;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMappingException;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-
-abstract class SUnmarshaller implements ArgumentUnmarshaller {
-
-    @Override
-    public void typeCheck(AttributeValue value, Method setter) {
-        if (value.s() == null) {
-            throw new DynamoDbMappingException("Expected S in value " + value + " when invoking " + setter);
-        }
-    }
-
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/ShortSetUnmarshaller.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/ShortSetUnmarshaller.java
deleted file mode 100644
index 889eb5a1588c..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/ShortSetUnmarshaller.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling.unmarshallers;
-
-import java.util.HashSet;
-import java.util.Set;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-
-/**
- * An unmarshaller that unmarshals DynamoDB NumberSets into sets of Java
- * {@code Short}s.
- */
-public class ShortSetUnmarshaller extends NsUnmarshaller {
-
-    private static final ShortSetUnmarshaller INSTANCE =
-            new ShortSetUnmarshaller();
-
-    private ShortSetUnmarshaller() {
-    }
-
-    public static ShortSetUnmarshaller instance() {
-        return INSTANCE;
-    }
-
-    @Override
-    public Object unmarshall(AttributeValue value) {
-        Set<Short> result = new HashSet<Short>();
-        for (String s : value.ns()) {
-            result.add(Short.valueOf(s));
-        }
-        return result;
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/ShortUnmarshaller.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/ShortUnmarshaller.java
deleted file mode 100644
index d0068a4cccd3..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/ShortUnmarshaller.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling.unmarshallers;
-
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-
-/**
- * An unmarshaller that unmarshals DynamoDB Numbers into Java
- * {@code Short}s.
- */
-public class ShortUnmarshaller extends NUnmarshaller {
-
-    private static final ShortUnmarshaller INSTANCE =
-            new ShortUnmarshaller();
-
-    private ShortUnmarshaller() {
-    }
-
-    public static ShortUnmarshaller instance() {
-        return INSTANCE;
-    }
-
-    @Override
-    public Object unmarshall(AttributeValue value) {
-        return Short.valueOf(value.n());
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/SsUnmarshaller.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/SsUnmarshaller.java
deleted file mode 100644
index b8244c1e82a5..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/SsUnmarshaller.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling.unmarshallers;
-
-import java.lang.reflect.Method;
-import software.amazon.awssdk.services.dynamodb.datamodeling.ArgumentUnmarshaller;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMappingException;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-
-abstract class SsUnmarshaller implements ArgumentUnmarshaller {
-
-    @Override
-    public void typeCheck(AttributeValue value, Method setter) {
-        if (value.ss() == null) {
-            throw new DynamoDbMappingException("Expected SS in value " + value + " when invoking " + setter);
-        }
-    }
-
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/StringSetUnmarshaller.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/StringSetUnmarshaller.java
deleted file mode 100644
index e53f02a160d1..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/StringSetUnmarshaller.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling.unmarshallers;
-
-import java.util.HashSet;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-
-/**
- * An unmarshaller that unmarshals DynamoDB StringSets as sets of Java
- * {@code String} objects.
- */
-public class StringSetUnmarshaller extends SsUnmarshaller {
-
-    private static final StringSetUnmarshaller INSTANCE =
-            new StringSetUnmarshaller();
-
-    private StringSetUnmarshaller() {
-    }
-
-    public static StringSetUnmarshaller instance() {
-        return INSTANCE;
-    }
-
-    @Override
-    public Object unmarshall(AttributeValue value) {
-        return new HashSet<String>(value.ss());
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/StringUnmarshaller.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/StringUnmarshaller.java
deleted file mode 100644
index cf7195b86fcc..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/StringUnmarshaller.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling.unmarshallers;
-
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-
-/**
- * An unmarshaller that unmarshals DynamoDB Strings as Java {@code String}
- * objects.
- */
-public class StringUnmarshaller extends SUnmarshaller {
-
-    private static final StringUnmarshaller INSTANCE =
-            new StringUnmarshaller();
-
-    private StringUnmarshaller() {
-    }
-
-    public static StringUnmarshaller instance() {
-        return INSTANCE;
-    }
-
-    @Override
-    public Object unmarshall(AttributeValue value) {
-        return value.s();
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/UuidSetUnmarshaller.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/UuidSetUnmarshaller.java
deleted file mode 100644
index ceda8d596532..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/UuidSetUnmarshaller.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling.unmarshallers;
-
-import java.util.HashSet;
-import java.util.Set;
-import java.util.UUID;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-
-/**
- * An unmarshaller that unmarshals sets of UUIDs as sets of
- * Java {@code UUID} objects.
- */
-public class UuidSetUnmarshaller extends SsUnmarshaller {
-
-    private static final UuidSetUnmarshaller INSTANCE =
-            new UuidSetUnmarshaller();
-
-    private UuidSetUnmarshaller() {
-    }
-
-    public static UuidSetUnmarshaller instance() {
-        return INSTANCE;
-    }
-
-    @Override
-    public Set<UUID> unmarshall(AttributeValue value) {
-        Set<UUID> result = new HashSet<UUID>();
-
-        for (String s : value.ss()) {
-            result.add(UUID.fromString(s));
-        }
-
-        return result;
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/UuidUnmarshaller.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/UuidUnmarshaller.java
deleted file mode 100644
index 32b8f55dd0cb..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/UuidUnmarshaller.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling.unmarshallers;
-
-import java.util.UUID;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-
-/**
- * An unmarshaller that unmarshals UUIDs as Java
- * {@code UUID} objects.
- */
-public class UuidUnmarshaller extends SUnmarshaller {
-
-    private static final UuidUnmarshaller INSTANCE =
-            new UuidUnmarshaller();
-
-    private UuidUnmarshaller() {
-    }
-
-    public static UuidUnmarshaller instance() {
-        return INSTANCE;
-    }
-
-    @Override
-    public UUID unmarshall(AttributeValue value) {
-        return UUID.fromString(value.s());
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/package-info.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/package-info.java
deleted file mode 100644
index ae581f3569b1..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/datamodeling/unmarshallers/package-info.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-/**
- * Standard implementations of {@code ArgumentUnmarshaller}.
- */
-
-package software.amazon.awssdk.services.dynamodb.datamodeling.unmarshallers;
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/mapper/GenerateCreateTableRequestTest.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/mapper/GenerateCreateTableRequestTest.java
deleted file mode 100644
index c30986e5d931..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/mapper/GenerateCreateTableRequestTest.java
+++ /dev/null
@@ -1,214 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.mapper;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
-import software.amazon.awssdk.auth.credentials.AnonymousCredentialsProvider;
-import software.amazon.awssdk.regions.Region;
-import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMapper;
-import software.amazon.awssdk.services.dynamodb.model.AttributeDefinition;
-import software.amazon.awssdk.services.dynamodb.model.CreateTableRequest;
-import software.amazon.awssdk.services.dynamodb.model.GlobalSecondaryIndex;
-import software.amazon.awssdk.services.dynamodb.model.KeySchemaElement;
-import software.amazon.awssdk.services.dynamodb.model.KeyType;
-import software.amazon.awssdk.services.dynamodb.model.LocalSecondaryIndex;
-import software.amazon.awssdk.services.dynamodb.model.ScalarAttributeType;
-import software.amazon.awssdk.testutils.UnorderedCollectionComparator;
-import utils.test.util.DynamoDBTestBase;
-
-/**
- * Tests on the DynamoDBMapper.generateCreateTableRequest method.
- */
-public class GenerateCreateTableRequestTest extends DynamoDBTestBase {
-
-    private static DynamoDbMapper mapper;
-
-    @BeforeClass
-    public static void setUp() {
-        dynamo = DynamoDbClient.builder()
-                .credentialsProvider(AnonymousCredentialsProvider.create())
-                .region(Region.US_WEST_2)
-                .build();
-        mapper = new DynamoDbMapper(dynamo);
-    }
-
-    private static boolean equalLsi(Collection<LocalSecondaryIndex> a, Collection<LocalSecondaryIndex> b) {
-        return UnorderedCollectionComparator.equalUnorderedCollections(a, b, new LocalSecondaryIndexDefinitionComparator());
-    }
-
-    private static boolean equalGsi(Collection<GlobalSecondaryIndex> a, Collection<GlobalSecondaryIndex> b) {
-        return UnorderedCollectionComparator.equalUnorderedCollections(a, b, new GlobalSecondaryIndexDefinitionComparator());
-    }
-
-    @Test
-    @Ignore // No longer works because mapper is not aware of auto construct lists
-    public void testParseIndexRangeKeyClass() {
-        CreateTableRequest request = mapper.generateCreateTableRequest(IndexRangeKeyClass.class);
-
-        assertEquals("aws-java-sdk-index-range-test", request.tableName());
-        List<KeySchemaElement> expectedKeyElements = Arrays.asList(
-                KeySchemaElement.builder().attributeName("key").keyType(KeyType.HASH).build(),
-                KeySchemaElement.builder().attributeName("rangeKey").keyType(KeyType.RANGE).build()
-                                                                  );
-        assertEquals(expectedKeyElements, request.keySchema());
-
-        List<AttributeDefinition> expectedAttrDefinitions = Arrays.asList(
-                AttributeDefinition.builder().attributeName("key").attributeType(ScalarAttributeType.N).build(),
-                AttributeDefinition.builder().attributeName("rangeKey").attributeType(ScalarAttributeType.N).build(),
-                AttributeDefinition.builder().attributeName("indexFooRangeKey").attributeType(ScalarAttributeType.N).build(),
-                AttributeDefinition.builder().attributeName("indexBarRangeKey").attributeType(ScalarAttributeType.N).build(),
-                AttributeDefinition.builder().attributeName("multipleIndexRangeKey").attributeType(ScalarAttributeType.N).build()
-                                                                         );
-        assertTrue(UnorderedCollectionComparator.equalUnorderedCollections(
-                expectedAttrDefinitions,
-                request.attributeDefinitions()));
-
-        List<LocalSecondaryIndex> expectedLsi = Arrays.asList(
-                LocalSecondaryIndex.builder()
-                        .indexName("index_foo")
-                        .keySchema(
-                                KeySchemaElement.builder().attributeName("key").keyType(KeyType.HASH).build(),
-                                KeySchemaElement.builder().attributeName("indexFooRangeKey").keyType(KeyType.RANGE).build()).build(),
-                LocalSecondaryIndex.builder()
-                        .indexName("index_bar")
-                        .keySchema(
-                                KeySchemaElement.builder().attributeName("key").keyType(KeyType.HASH).build(),
-                                KeySchemaElement.builder().attributeName("indexBarRangeKey").keyType(KeyType.RANGE).build()).build(),
-                LocalSecondaryIndex.builder()
-                        .indexName("index_foo_copy")
-                        .keySchema(
-                                KeySchemaElement.builder().attributeName("key").keyType(KeyType.HASH).build(),
-                                KeySchemaElement.builder().attributeName("multipleIndexRangeKey").keyType(KeyType.RANGE).build()).build(),
-                LocalSecondaryIndex.builder()
-                        .indexName("index_bar_copy")
-                        .keySchema(
-                                KeySchemaElement.builder().attributeName("key").keyType(KeyType.HASH).build(),
-                                KeySchemaElement.builder().attributeName("multipleIndexRangeKey").keyType(KeyType.RANGE).build()).build());
-        assertTrue(equalLsi(expectedLsi, request.localSecondaryIndexes()));
-
-        assertNull(request.globalSecondaryIndexes());
-        assertNull(request.provisionedThroughput());
-    }
-
-    @Test
-    public void testComplexIndexedHashRangeClass() {
-        CreateTableRequest request = mapper.generateCreateTableRequest(MapperQueryExpressionTest.HashRangeClass.class);
-
-        assertEquals("table_name", request.tableName());
-        List<KeySchemaElement> expectedKeyElements = Arrays.asList(
-                KeySchemaElement.builder().attributeName("primaryHashKey").keyType(KeyType.HASH).build(),
-                KeySchemaElement.builder().attributeName("primaryRangeKey").keyType(KeyType.RANGE).build()
-                                                                  );
-        assertEquals(expectedKeyElements, request.keySchema());
-
-        List<AttributeDefinition> expectedAttrDefinitions = Arrays.asList(
-                AttributeDefinition.builder().attributeName("primaryHashKey").attributeType(ScalarAttributeType.S).build(),
-                AttributeDefinition.builder().attributeName("indexHashKey").attributeType(ScalarAttributeType.S).build(),
-                AttributeDefinition.builder().attributeName("primaryRangeKey").attributeType(ScalarAttributeType.S).build(),
-                AttributeDefinition.builder().attributeName("indexRangeKey").attributeType(ScalarAttributeType.S).build(),
-                AttributeDefinition.builder().attributeName("anotherIndexRangeKey").attributeType(ScalarAttributeType.S).build()
-                                                                         );
-        assertTrue(UnorderedCollectionComparator.equalUnorderedCollections(
-                expectedAttrDefinitions,
-                request.attributeDefinitions()));
-
-        List<LocalSecondaryIndex> expectedLsi = Arrays.asList(
-                LocalSecondaryIndex.builder()
-                        .indexName("LSI-primary-range")
-                        .keySchema(
-                                KeySchemaElement.builder().attributeName("primaryHashKey").keyType(KeyType.HASH).build(),
-                                KeySchemaElement.builder().attributeName("primaryRangeKey").keyType(KeyType.RANGE).build()).build(),
-                LocalSecondaryIndex.builder()
-                        .indexName("LSI-index-range-1")
-                        .keySchema(
-                                KeySchemaElement.builder().attributeName("primaryHashKey").keyType(KeyType.HASH).build(),
-                                KeySchemaElement.builder().attributeName("indexRangeKey").keyType(KeyType.RANGE).build()).build(),
-                LocalSecondaryIndex.builder()
-                        .indexName("LSI-index-range-2")
-                        .keySchema(
-                                KeySchemaElement.builder().attributeName("primaryHashKey").keyType(KeyType.HASH).build(),
-                                KeySchemaElement.builder().attributeName("indexRangeKey").keyType(KeyType.RANGE).build()).build(),
-                LocalSecondaryIndex.builder()
-                        .indexName("LSI-index-range-3")
-                        .keySchema(
-                                KeySchemaElement.builder().attributeName("primaryHashKey").keyType(KeyType.HASH).build(),
-                                KeySchemaElement.builder().attributeName("anotherIndexRangeKey").keyType(KeyType.RANGE).build()).build());
-        assertTrue(equalLsi(expectedLsi, request.localSecondaryIndexes()));
-
-        List<GlobalSecondaryIndex> expectedGsi = Arrays.asList(
-                GlobalSecondaryIndex.builder()
-                        .indexName("GSI-primary-hash-index-range-1")
-                        .keySchema(
-                                KeySchemaElement.builder().attributeName("primaryHashKey").keyType(KeyType.HASH).build(),
-                                KeySchemaElement.builder().attributeName("indexRangeKey").keyType(KeyType.RANGE).build()).build(),
-                GlobalSecondaryIndex.builder()
-                        .indexName("GSI-primary-hash-index-range-2")
-                        .keySchema(
-                                KeySchemaElement.builder().attributeName("primaryHashKey").keyType(KeyType.HASH).build(),
-                                KeySchemaElement.builder().attributeName("anotherIndexRangeKey").keyType(KeyType.RANGE).build()).build(),
-                GlobalSecondaryIndex.builder()
-                        .indexName("GSI-index-hash-primary-range")
-                        .keySchema(
-                                KeySchemaElement.builder().attributeName("indexHashKey").keyType(KeyType.HASH).build(),
-                                KeySchemaElement.builder().attributeName("primaryRangeKey").keyType(KeyType.RANGE).build()).build(),
-                GlobalSecondaryIndex.builder()
-                        .indexName("GSI-index-hash-index-range-1")
-                        .keySchema(
-                                KeySchemaElement.builder().attributeName("indexHashKey").keyType(KeyType.HASH).build(),
-                                KeySchemaElement.builder().attributeName("indexRangeKey").keyType(KeyType.RANGE).build()).build(),
-                GlobalSecondaryIndex.builder()
-                        .indexName("GSI-index-hash-index-range-2")
-                        .keySchema(
-                                KeySchemaElement.builder().attributeName("indexHashKey").keyType(KeyType.HASH).build(),
-                                KeySchemaElement.builder().attributeName("indexRangeKey").keyType(KeyType.RANGE).build()).build());
-        assertTrue(equalGsi(expectedGsi, request.globalSecondaryIndexes()));
-
-        assertNull(request.provisionedThroughput());
-    }
-
-    private static class LocalSecondaryIndexDefinitionComparator
-            implements
-            UnorderedCollectionComparator.CrossTypeComparator<LocalSecondaryIndex, LocalSecondaryIndex> {
-
-        @Override
-        public boolean equals(LocalSecondaryIndex a, LocalSecondaryIndex b) {
-            return a.indexName().equals(b.indexName())
-                   && a.keySchema().equals(b.keySchema());
-        }
-
-    }
-
-    private static class GlobalSecondaryIndexDefinitionComparator
-            implements
-            UnorderedCollectionComparator.CrossTypeComparator<GlobalSecondaryIndex, GlobalSecondaryIndex> {
-
-        @Override
-        public boolean equals(GlobalSecondaryIndex a, GlobalSecondaryIndex b) {
-            return a.indexName().equals(b.indexName())
-                   && a.keySchema().equals(b.keySchema());
-        }
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/mapper/IndexRangeKeyClass.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/mapper/IndexRangeKeyClass.java
deleted file mode 100644
index 9364b6134d09..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/mapper/IndexRangeKeyClass.java
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.mapper;
-
-
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbAttribute;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbHashKey;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbIndexRangeKey;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbRangeKey;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbTable;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbVersionAttribute;
-
-/**
- * Comprehensive domain class
- */
-@DynamoDbTable(tableName = "aws-java-sdk-index-range-test")
-public class IndexRangeKeyClass {
-
-    private long key;
-    private double rangeKey;
-    private Double indexFooRangeKey;
-    private Double indexBarRangeKey;
-    private Double multipleIndexRangeKey;
-    private Long version;
-
-    private String fooAttribute;
-    private String barAttribute;
-
-    @DynamoDbHashKey
-    public long getKey() {
-        return key;
-    }
-
-    public void setKey(long key) {
-        this.key = key;
-    }
-
-    @DynamoDbRangeKey
-    public double getRangeKey() {
-        return rangeKey;
-    }
-
-    public void setRangeKey(double rangeKey) {
-        this.rangeKey = rangeKey;
-    }
-
-    @DynamoDbIndexRangeKey(
-            localSecondaryIndexName = "index_foo",
-            attributeName = "indexFooRangeKey"
-    )
-    public Double getIndexFooRangeKeyWithFakeName() {
-        return indexFooRangeKey;
-    }
-
-    public void setIndexFooRangeKeyWithFakeName(Double indexFooRangeKey) {
-        this.indexFooRangeKey = indexFooRangeKey;
-    }
-
-    @DynamoDbIndexRangeKey(
-            localSecondaryIndexName = "index_bar"
-    )
-    public Double getIndexBarRangeKey() {
-        return indexBarRangeKey;
-    }
-
-    public void setIndexBarRangeKey(Double indexBarRangeKey) {
-        this.indexBarRangeKey = indexBarRangeKey;
-    }
-
-    @DynamoDbIndexRangeKey(
-            localSecondaryIndexNames = {"index_foo_copy", "index_bar_copy"}
-    )
-    public Double getMultipleIndexRangeKey() {
-        return multipleIndexRangeKey;
-    }
-
-    public void setMultipleIndexRangeKey(Double multipleIndexRangeKey) {
-        this.multipleIndexRangeKey = multipleIndexRangeKey;
-    }
-
-    @DynamoDbAttribute
-    public String getFooAttribute() {
-        return fooAttribute;
-    }
-
-    public void setFooAttribute(String fooAttribute) {
-        this.fooAttribute = fooAttribute;
-    }
-
-    @DynamoDbAttribute
-    public String getBarAttribute() {
-        return barAttribute;
-    }
-
-    public void setBarAttribute(String barAttribute) {
-        this.barAttribute = barAttribute;
-    }
-
-    @DynamoDbVersionAttribute
-    public Long getVersion() {
-        return version;
-    }
-
-    public void setVersion(Long version) {
-        this.version = version;
-    }
-
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + ((fooAttribute == null) ? 0 : fooAttribute.hashCode());
-        result = prime * result + ((barAttribute == null) ? 0 : barAttribute.hashCode());
-        result = prime * result + (int) (key ^ (key >>> 32));
-        long temp;
-        temp = Double.doubleToLongBits(rangeKey);
-        result = prime * result + (int) (temp ^ (temp >>> 32));
-        temp = Double.doubleToLongBits(indexFooRangeKey);
-        result = prime * result + (int) (temp ^ (temp >>> 32));
-        temp = Double.doubleToLongBits(indexBarRangeKey);
-        result = prime * result + (int) (temp ^ (temp >>> 32));
-        result = prime * result + ((version == null) ? 0 : version.hashCode());
-        return result;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        IndexRangeKeyClass other = (IndexRangeKeyClass) obj;
-        if (fooAttribute == null) {
-            if (other.fooAttribute != null) {
-                return false;
-            }
-        } else if (!fooAttribute.equals(other.fooAttribute)) {
-            return false;
-        }
-        if (barAttribute == null) {
-            if (other.barAttribute != null) {
-                return false;
-            }
-        } else if (!barAttribute.equals(other.barAttribute)) {
-            return false;
-        }
-        if (key != other.key) {
-            return false;
-        }
-        if (Double.doubleToLongBits(rangeKey) != Double.doubleToLongBits(other.rangeKey)) {
-            return false;
-        }
-        if (Double.doubleToLongBits(indexFooRangeKey) != Double.doubleToLongBits(other.indexFooRangeKey)) {
-            return false;
-        }
-        if (Double.doubleToLongBits(indexBarRangeKey) != Double.doubleToLongBits(other.indexBarRangeKey)) {
-            return false;
-        }
-        if (version == null) {
-            if (other.version != null) {
-                return false;
-            }
-        } else if (!version.equals(other.version)) {
-            return false;
-        }
-        return true;
-    }
-
-    @Override
-    public String toString() {
-        return "IndexRangeKeyClass [key=" + key + ", rangeKey=" + rangeKey + ", version=" + version
-               + ", indexFooRangeKey=" + indexFooRangeKey + ", indexBarRangeKey=" + indexBarRangeKey
-               + ", fooAttribute=" + fooAttribute + ", barAttribute=" + barAttribute + "]";
-    }
-
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/mapper/MapperQueryExpressionTest.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/mapper/MapperQueryExpressionTest.java
deleted file mode 100644
index e122d3377146..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/mapper/MapperQueryExpressionTest.java
+++ /dev/null
@@ -1,554 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.mapper;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.atLeastOnce;
-
-import java.util.ArrayList;
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Mockito;
-import software.amazon.awssdk.utils.ImmutableMap;
-import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbHashKey;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbIndexHashKey;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbIndexRangeKey;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMapper;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMapperConfig;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbQueryExpression;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbRangeKey;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbTable;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-import software.amazon.awssdk.services.dynamodb.model.ComparisonOperator;
-import software.amazon.awssdk.services.dynamodb.model.Condition;
-import software.amazon.awssdk.services.dynamodb.model.QueryRequest;
-import software.amazon.awssdk.services.dynamodb.model.QueryResponse;
-
-
-/**
- * Unit test for the private method DynamoDBMapper#createQueryRequestFromExpression
- */
-public class MapperQueryExpressionTest {
-
-    private static final String TABLE_NAME = "table_name";
-    private static final Condition RANGE_KEY_CONDITION = Condition.builder()
-            .attributeValueList(AttributeValue.builder().s("some value").build())
-            .comparisonOperator(ComparisonOperator.EQ).build();
-
-    private static DynamoDbClient mockClient;
-    private static DynamoDbMapper mapper;
-
-    @Before
-    public void setUp() throws SecurityException, NoSuchMethodException {
-        mockClient = Mockito.mock(DynamoDbClient.class);
-        mapper = new DynamoDbMapper(mockClient);
-    }
-
-    private static <T> QueryRequest testCreateQueryRequestFromExpression(
-            Class<T> clazz, DynamoDbQueryExpression<T> queryExpression) {
-        return testCreateQueryRequestFromExpression(clazz, queryExpression, null);
-    }
-
-    private static <T> QueryRequest testCreateQueryRequestFromExpression(
-            Class<T> clazz, DynamoDbQueryExpression<T> queryExpression,
-            String expectedErrorMessage) {
-        try {
-            Mockito.when(mockClient.query(any(QueryRequest.class))).thenReturn(QueryResponse.builder().items(new ArrayList<>()).build());
-
-            mapper.queryPage(clazz, queryExpression, DynamoDbMapperConfig.DEFAULT);
-            if (expectedErrorMessage != null) {
-                fail("Exception containing messsage ("
-                     + expectedErrorMessage + ") is expected.");
-            }
-
-            ArgumentCaptor<QueryRequest> request = ArgumentCaptor.forClass(QueryRequest.class);
-            Mockito.verify(mockClient, atLeastOnce()).query(request.capture());
-            return request.getValue();
-        } catch (RuntimeException e) {
-            if (expectedErrorMessage != null && e.getMessage() != null) {
-                assertTrue("Exception message [" + e.getMessage() + "] does not contain " +
-                           "the expected message [" + expectedErrorMessage + "].",
-                           e.getMessage().contains(expectedErrorMessage));
-            } else {
-                e.printStackTrace();
-                fail("Internal error when calling createQueryRequestFromExpressio method");
-            }
-        } catch (Exception e) {
-            fail(e.getMessage());
-        }
-        return null;
-    }
-
-    /**
-     * Tests different scenarios of hash-only query
-     **/
-    @Test
-    public void testHashConditionOnly() {
-        // Primary hash only
-        QueryRequest queryRequest = testCreateQueryRequestFromExpression(
-                HashOnlyClass.class,
-                new DynamoDbQueryExpression<HashOnlyClass>()
-                        .withHashKeyValues(new HashOnlyClass("foo", null, null)));
-        assertTrue(queryRequest.keyConditions().size() == 1);
-        assertEquals("primaryHashKey", queryRequest.keyConditions().keySet().iterator().next());
-        assertEquals(
-                Condition.builder().attributeValueList(AttributeValue.builder().s("foo").build())
-                               .comparisonOperator(ComparisonOperator.EQ).build(),
-                queryRequest.keyConditions().get("primaryHashKey"));
-        assertNull(queryRequest.indexName());
-
-        // Primary hash used for a GSI
-        queryRequest = testCreateQueryRequestFromExpression(
-                HashOnlyClass.class,
-                new DynamoDbQueryExpression<HashOnlyClass>()
-                        .withHashKeyValues(new HashOnlyClass("foo", null, null))
-                        .withIndexName("GSI-primary-hash"));
-        assertTrue(queryRequest.keyConditions().size() == 1);
-        assertEquals("primaryHashKey", queryRequest.keyConditions().keySet().iterator().next());
-        assertEquals(
-                Condition.builder().attributeValueList(AttributeValue.builder().s("foo").build())
-                               .comparisonOperator(ComparisonOperator.EQ).build(),
-                queryRequest.keyConditions().get("primaryHashKey"));
-        assertEquals("GSI-primary-hash", queryRequest.indexName());
-
-        // Primary hash query takes higher priority then index hash query
-        queryRequest = testCreateQueryRequestFromExpression(
-                HashOnlyClass.class,
-                new DynamoDbQueryExpression<HashOnlyClass>()
-                        .withHashKeyValues(new HashOnlyClass("foo", "bar", null)));
-        assertTrue(queryRequest.keyConditions().size() == 1);
-        assertEquals("primaryHashKey", queryRequest.keyConditions().keySet().iterator().next());
-        assertEquals(
-                Condition.builder().attributeValueList(AttributeValue.builder().s("foo").build())
-                               .comparisonOperator(ComparisonOperator.EQ).build(),
-                queryRequest.keyConditions().get("primaryHashKey"));
-        assertNull(queryRequest.indexName());
-
-        // Ambiguous query on multiple index hash keys
-        queryRequest = testCreateQueryRequestFromExpression(
-                HashOnlyClass.class,
-                new DynamoDbQueryExpression<HashOnlyClass>()
-                        .withHashKeyValues(new HashOnlyClass(null, "bar", "charlie")),
-                "Ambiguous query expression: More than one index hash key EQ conditions");
-
-        // Ambiguous query when not specifying index name
-        queryRequest = testCreateQueryRequestFromExpression(
-                HashOnlyClass.class,
-                new DynamoDbQueryExpression<HashOnlyClass>()
-                        .withHashKeyValues(new HashOnlyClass(null, "bar", null)),
-                "Ambiguous query expression: More than one GSIs");
-
-        // Explicitly specify a GSI.
-        queryRequest = testCreateQueryRequestFromExpression(
-                HashOnlyClass.class,
-                new DynamoDbQueryExpression<HashOnlyClass>()
-                        .withHashKeyValues(new HashOnlyClass("foo", "bar", null))
-                        .withIndexName("GSI-index-hash-1"));
-        assertTrue(queryRequest.keyConditions().size() == 1);
-        assertEquals("indexHashKey", queryRequest.keyConditions().keySet().iterator().next());
-        assertEquals(
-                Condition.builder().attributeValueList(AttributeValue.builder().s("bar").build())
-                               .comparisonOperator(ComparisonOperator.EQ).build(),
-                queryRequest.keyConditions().get("indexHashKey"));
-        assertEquals("GSI-index-hash-1", queryRequest.indexName());
-
-        // Non-existent GSI
-        queryRequest = testCreateQueryRequestFromExpression(
-                HashOnlyClass.class,
-                new DynamoDbQueryExpression<HashOnlyClass>()
-                        .withHashKeyValues(new HashOnlyClass("foo", "bar", null))
-                        .withIndexName("some fake gsi"),
-                "No hash key condition is applicable to the specified index");
-
-        // No hash key condition specified
-        queryRequest = testCreateQueryRequestFromExpression(
-                HashOnlyClass.class,
-                new DynamoDbQueryExpression<HashOnlyClass>()
-                        .withHashKeyValues(new HashOnlyClass(null, null, null)),
-                "Illegal query expression: No hash key condition is found in the query");
-    }
-
-    /**
-     * Tests hash + range query
-     **/
-    @Test
-    public void testHashAndRangeCondition() {
-        // Primary hash + primary range
-        QueryRequest queryRequest = testCreateQueryRequestFromExpression(
-                HashRangeClass.class,
-                new DynamoDbQueryExpression<HashRangeClass>()
-                        .withHashKeyValues(new HashRangeClass("foo", null))
-                        .withRangeKeyCondition("primaryRangeKey", RANGE_KEY_CONDITION));
-        assertTrue(queryRequest.keyConditions().size() == 2);
-        assertTrue(queryRequest.keyConditions().containsKey("primaryHashKey"));
-        assertEquals(
-                Condition.builder().attributeValueList(AttributeValue.builder().s("foo").build())
-                               .comparisonOperator(ComparisonOperator.EQ).build(),
-                queryRequest.keyConditions().get("primaryHashKey"));
-        assertTrue(queryRequest.keyConditions().containsKey("primaryRangeKey"));
-        assertEquals(RANGE_KEY_CONDITION, queryRequest.keyConditions().get("primaryRangeKey"));
-        assertNull(queryRequest.indexName());
-
-        // Primary hash + primary range on a LSI
-        queryRequest = testCreateQueryRequestFromExpression(
-                HashRangeClass.class,
-                new DynamoDbQueryExpression<HashRangeClass>()
-                        .withHashKeyValues(new HashRangeClass("foo", null))
-                        .withRangeKeyCondition("primaryRangeKey", RANGE_KEY_CONDITION)
-                        .withIndexName("LSI-primary-range"));
-        assertTrue(queryRequest.keyConditions().size() == 2);
-        assertTrue(queryRequest.keyConditions().containsKey("primaryHashKey"));
-        assertEquals(
-                Condition.builder().attributeValueList(AttributeValue.builder().s("foo").build())
-                               .comparisonOperator(ComparisonOperator.EQ).build(),
-                queryRequest.keyConditions().get("primaryHashKey"));
-        assertTrue(queryRequest.keyConditions().containsKey("primaryRangeKey"));
-        assertEquals(RANGE_KEY_CONDITION, queryRequest.keyConditions().get("primaryRangeKey"));
-        assertEquals("LSI-primary-range", queryRequest.indexName());
-
-        // Primary hash + index range used by multiple LSI. But also a GSI hash + range
-        queryRequest = testCreateQueryRequestFromExpression(
-                HashRangeClass.class,
-                new DynamoDbQueryExpression<HashRangeClass>()
-                        .withHashKeyValues(new HashRangeClass("foo", null))
-                        .withRangeKeyCondition("indexRangeKey", RANGE_KEY_CONDITION));
-        assertTrue(queryRequest.keyConditions().size() == 2);
-        assertTrue(queryRequest.keyConditions().containsKey("primaryHashKey"));
-        assertEquals(
-                Condition.builder().attributeValueList(AttributeValue.builder().s("foo").build())
-                               .comparisonOperator(ComparisonOperator.EQ).build(),
-                queryRequest.keyConditions().get("primaryHashKey"));
-        assertTrue(queryRequest.keyConditions().containsKey("indexRangeKey"));
-        assertEquals(RANGE_KEY_CONDITION, queryRequest.keyConditions().get("indexRangeKey"));
-        assertEquals("GSI-primary-hash-index-range-1", queryRequest.indexName());
-
-
-        // Primary hash + index range on a LSI
-        queryRequest = testCreateQueryRequestFromExpression(
-                HashRangeClass.class,
-                new DynamoDbQueryExpression<HashRangeClass>()
-                        .withHashKeyValues(new HashRangeClass("foo", null))
-                        .withRangeKeyCondition("indexRangeKey", RANGE_KEY_CONDITION)
-                        .withIndexName("LSI-index-range-1"));
-        assertTrue(queryRequest.keyConditions().size() == 2);
-        assertTrue(queryRequest.keyConditions().containsKey("primaryHashKey"));
-        assertEquals(
-                Condition.builder().attributeValueList(AttributeValue.builder().s("foo").build())
-                               .comparisonOperator(ComparisonOperator.EQ).build(),
-                queryRequest.keyConditions().get("primaryHashKey"));
-        assertTrue(queryRequest.keyConditions().containsKey("indexRangeKey"));
-        assertEquals(RANGE_KEY_CONDITION, queryRequest.keyConditions().get("indexRangeKey"));
-        assertEquals("LSI-index-range-1", queryRequest.indexName());
-
-        // Non-existent LSI
-        queryRequest = testCreateQueryRequestFromExpression(
-                HashRangeClass.class,
-                new DynamoDbQueryExpression<HashRangeClass>()
-                        .withHashKeyValues(new HashRangeClass("foo", null))
-                        .withRangeKeyCondition("indexRangeKey", RANGE_KEY_CONDITION)
-                        .withIndexName("some fake lsi"),
-                "No range key condition is applicable to the specified index");
-
-        // Illegal query: Primary hash + primary range on a GSI
-        queryRequest = testCreateQueryRequestFromExpression(
-                HashRangeClass.class,
-                new DynamoDbQueryExpression<HashRangeClass>()
-                        .withHashKeyValues(new HashRangeClass("foo", null))
-                        .withRangeKeyCondition("indexRangeKey", RANGE_KEY_CONDITION)
-                        .withIndexName("GSI-index-hash-index-range-1"),
-                "Illegal query expression: No hash key condition is applicable to the specified index");
-
-        // GSI hash + GSI range
-        queryRequest = testCreateQueryRequestFromExpression(
-                HashRangeClass.class,
-                new DynamoDbQueryExpression<HashRangeClass>()
-                        .withHashKeyValues(new HashRangeClass(null, "foo"))
-                        .withRangeKeyCondition("primaryRangeKey", RANGE_KEY_CONDITION));
-        assertTrue(queryRequest.keyConditions().size() == 2);
-        assertTrue(queryRequest.keyConditions().containsKey("indexHashKey"));
-        assertEquals(
-                Condition.builder().attributeValueList(AttributeValue.builder().s("foo").build())
-                               .comparisonOperator(ComparisonOperator.EQ).build(),
-                queryRequest.keyConditions().get("indexHashKey"));
-        assertTrue(queryRequest.keyConditions().containsKey("primaryRangeKey"));
-        assertEquals(RANGE_KEY_CONDITION, queryRequest.keyConditions().get("primaryRangeKey"));
-        assertEquals("GSI-index-hash-primary-range", queryRequest.indexName());
-
-        // Ambiguous query: GSI hash + index range used by multiple GSIs
-        queryRequest = testCreateQueryRequestFromExpression(
-                HashRangeClass.class,
-                new DynamoDbQueryExpression<HashRangeClass>()
-                        .withHashKeyValues(new HashRangeClass(null, "foo"))
-                        .withRangeKeyCondition("indexRangeKey", RANGE_KEY_CONDITION),
-                "Illegal query expression: Cannot infer the index name from the query expression.");
-
-        // Explicitly specify the GSI name
-        queryRequest = testCreateQueryRequestFromExpression(
-                HashRangeClass.class,
-                new DynamoDbQueryExpression<HashRangeClass>()
-                        .withHashKeyValues(new HashRangeClass(null, "foo"))
-                        .withRangeKeyCondition("indexRangeKey", RANGE_KEY_CONDITION)
-                        .withIndexName("GSI-index-hash-index-range-2"));
-        assertTrue(queryRequest.keyConditions().size() == 2);
-        assertTrue(queryRequest.keyConditions().containsKey("indexHashKey"));
-        assertEquals(
-                Condition.builder().attributeValueList(AttributeValue.builder().s("foo").build())
-                               .comparisonOperator(ComparisonOperator.EQ).build(),
-                queryRequest.keyConditions().get("indexHashKey"));
-        assertTrue(queryRequest.keyConditions().containsKey("indexRangeKey"));
-        assertEquals(RANGE_KEY_CONDITION, queryRequest.keyConditions().get("indexRangeKey"));
-        assertEquals("GSI-index-hash-index-range-2", queryRequest.indexName());
-
-        // Ambiguous query: (1) primary hash + LSI range OR (2) GSI hash + range
-        queryRequest = testCreateQueryRequestFromExpression(
-                HashRangeClass.class,
-                new DynamoDbQueryExpression<HashRangeClass>()
-                        .withHashKeyValues(new HashRangeClass("foo", null))
-                        .withRangeKeyCondition("anotherIndexRangeKey", RANGE_KEY_CONDITION),
-                "Ambiguous query expression: Found multiple valid queries:");
-
-        // Multiple range key conditions specified
-        queryRequest = testCreateQueryRequestFromExpression(
-                HashRangeClass.class,
-                new DynamoDbQueryExpression<HashRangeClass>()
-                        .withHashKeyValues(new HashRangeClass("foo", null))
-                        .withRangeKeyConditions(
-                                ImmutableMap.of(
-                                        "primaryRangeKey", RANGE_KEY_CONDITION,
-                                        "indexRangeKey", RANGE_KEY_CONDITION)),
-                "Illegal query expression: Conditions on multiple range keys");
-
-        // Using an un-annotated range key
-        queryRequest = testCreateQueryRequestFromExpression(
-                HashRangeClass.class,
-                new DynamoDbQueryExpression<HashRangeClass>()
-                        .withHashKeyValues(new HashRangeClass("foo", null))
-                        .withRangeKeyCondition("indexHashKey", RANGE_KEY_CONDITION),
-                "not annotated with either @DynamoDBRangeKey or @DynamoDBIndexRangeKey.");
-    }
-
-    @Test
-    public void testHashOnlyQueryOnHashRangeTable() {
-        // Primary hash only query on a Hash+Range table
-        QueryRequest queryRequest = testCreateQueryRequestFromExpression(
-                LSIRangeKeyClass.class,
-                new DynamoDbQueryExpression<LSIRangeKeyClass>()
-                        .withHashKeyValues(new LSIRangeKeyClass("foo", null)));
-        assertTrue(queryRequest.keyConditions().size() == 1);
-        assertTrue(queryRequest.keyConditions().containsKey("primaryHashKey"));
-        assertNull(queryRequest.indexName());
-
-        // Hash+Range query on a LSI
-        queryRequest = testCreateQueryRequestFromExpression(
-                LSIRangeKeyClass.class,
-                new DynamoDbQueryExpression<LSIRangeKeyClass>()
-                        .withHashKeyValues(new LSIRangeKeyClass("foo", null))
-                        .withRangeKeyCondition("lsiRangeKey", RANGE_KEY_CONDITION)
-                        .withIndexName("LSI"));
-        assertTrue(queryRequest.keyConditions().size() == 2);
-        assertTrue(queryRequest.keyConditions().containsKey("primaryHashKey"));
-        assertTrue(queryRequest.keyConditions().containsKey("lsiRangeKey"));
-        assertEquals("LSI", queryRequest.indexName());
-
-        // Hash-only query on a LSI
-        queryRequest = testCreateQueryRequestFromExpression(
-                LSIRangeKeyClass.class,
-                new DynamoDbQueryExpression<LSIRangeKeyClass>()
-                        .withHashKeyValues(new LSIRangeKeyClass("foo", null))
-                        .withIndexName("LSI"));
-        assertTrue(queryRequest.keyConditions().size() == 1);
-        assertTrue(queryRequest.keyConditions().containsKey("primaryHashKey"));
-        assertEquals("LSI", queryRequest.indexName());
-    }
-
-    @DynamoDbTable(tableName = TABLE_NAME)
-    public final class HashOnlyClass {
-
-        @DynamoDbHashKey
-        @DynamoDbIndexHashKey(
-                globalSecondaryIndexNames = "GSI-primary-hash"
-        )
-        private String primaryHashKey;
-
-        @DynamoDbIndexHashKey(
-                globalSecondaryIndexNames = {"GSI-index-hash-1", "GSI-index-hash-2"}
-        )
-        private String indexHashKey;
-
-        @DynamoDbIndexHashKey(
-                globalSecondaryIndexNames = {"GSI-another-index-hash"}
-        )
-        private String anotherIndexHashKey;
-
-        public HashOnlyClass(String primaryHashKey, String indexHashKey, String anotherIndexHashKey) {
-            this.primaryHashKey = primaryHashKey;
-            this.indexHashKey = indexHashKey;
-            this.anotherIndexHashKey = anotherIndexHashKey;
-        }
-
-        public String getPrimaryHashKey() {
-            return primaryHashKey;
-        }
-
-        public void setPrimaryHashKey(String primaryHashKey) {
-            this.primaryHashKey = primaryHashKey;
-        }
-
-        public String getIndexHashKey() {
-            return indexHashKey;
-        }
-
-        public void setIndexHashKey(String indexHashKey) {
-            this.indexHashKey = indexHashKey;
-        }
-
-        public String getAnotherIndexHashKey() {
-            return anotherIndexHashKey;
-        }
-
-        public void setAnotherIndexHashKey(String anotherIndexHashKey) {
-            this.anotherIndexHashKey = anotherIndexHashKey;
-        }
-    }
-
-    @DynamoDbTable(tableName = TABLE_NAME)
-    public final class HashRangeClass {
-        private String primaryHashKey;
-        private String indexHashKey;
-        private String primaryRangeKey;
-        private String indexRangeKey;
-        private String anotherIndexRangeKey;
-
-        public HashRangeClass(String primaryHashKey, String indexHashKey) {
-            this.primaryHashKey = primaryHashKey;
-            this.indexHashKey = indexHashKey;
-        }
-
-        @DynamoDbHashKey
-        @DynamoDbIndexHashKey(
-                globalSecondaryIndexNames = {
-                        "GSI-primary-hash-index-range-1",
-                        "GSI-primary-hash-index-range-2"}
-        )
-        public String getPrimaryHashKey() {
-            return primaryHashKey;
-        }
-
-        public void setPrimaryHashKey(String primaryHashKey) {
-            this.primaryHashKey = primaryHashKey;
-        }
-
-        @DynamoDbIndexHashKey(
-                globalSecondaryIndexNames = {
-                        "GSI-index-hash-primary-range",
-                        "GSI-index-hash-index-range-1",
-                        "GSI-index-hash-index-range-2"}
-        )
-        public String getIndexHashKey() {
-            return indexHashKey;
-        }
-
-        public void setIndexHashKey(String indexHashKey) {
-            this.indexHashKey = indexHashKey;
-        }
-
-        @DynamoDbRangeKey
-        @DynamoDbIndexRangeKey(
-                globalSecondaryIndexNames = {"GSI-index-hash-primary-range"},
-                localSecondaryIndexName = "LSI-primary-range"
-        )
-        public String getPrimaryRangeKey() {
-            return primaryRangeKey;
-        }
-
-        public void setPrimaryRangeKey(String primaryRangeKey) {
-            this.primaryRangeKey = primaryRangeKey;
-        }
-
-        @DynamoDbIndexRangeKey(
-                globalSecondaryIndexNames = {
-                        "GSI-primary-hash-index-range-1",
-                        "GSI-index-hash-index-range-1",
-                        "GSI-index-hash-index-range-2"},
-                localSecondaryIndexNames = {"LSI-index-range-1", "LSI-index-range-2"}
-        )
-        public String getIndexRangeKey() {
-            return indexRangeKey;
-        }
-
-        public void setIndexRangeKey(String indexRangeKey) {
-            this.indexRangeKey = indexRangeKey;
-        }
-
-        @DynamoDbIndexRangeKey(
-                localSecondaryIndexName = "LSI-index-range-3",
-                globalSecondaryIndexName = "GSI-primary-hash-index-range-2"
-        )
-        public String getAnotherIndexRangeKey() {
-            return anotherIndexRangeKey;
-        }
-
-        public void setAnotherIndexRangeKey(String anotherIndexRangeKey) {
-            this.anotherIndexRangeKey = anotherIndexRangeKey;
-        }
-    }
-
-    @DynamoDbTable(tableName = TABLE_NAME)
-    public final class LSIRangeKeyClass {
-        private String primaryHashKey;
-        private String primaryRangeKey;
-        private String lsiRangeKey;
-
-        public LSIRangeKeyClass(String primaryHashKey, String primaryRangeKey) {
-            this.primaryHashKey = primaryHashKey;
-            this.primaryRangeKey = primaryRangeKey;
-        }
-
-        @DynamoDbHashKey
-        public String getPrimaryHashKey() {
-            return primaryHashKey;
-        }
-
-        public void setPrimaryHashKey(String primaryHashKey) {
-            this.primaryHashKey = primaryHashKey;
-        }
-
-        @DynamoDbRangeKey
-        public String getPrimaryRangeKey() {
-            return primaryRangeKey;
-        }
-
-        public void setPrimaryRangeKey(String primaryRangeKey) {
-            this.primaryRangeKey = primaryRangeKey;
-        }
-
-        @DynamoDbIndexRangeKey(localSecondaryIndexName = "LSI")
-        public String getLsiRangeKey() {
-            return lsiRangeKey;
-        }
-
-        public void setLsiRangeKey(String lsiRangeKey) {
-            this.lsiRangeKey = lsiRangeKey;
-        }
-    }
-
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/mapper/V2CompatibleBooleansTest.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/mapper/V2CompatibleBooleansTest.java
deleted file mode 100644
index e4aa0dab9cab..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/mapper/V2CompatibleBooleansTest.java
+++ /dev/null
@@ -1,404 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.mapper;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import java.util.Arrays;
-import java.util.List;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
-import software.amazon.awssdk.utils.ImmutableMap;
-import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
-import software.amazon.awssdk.services.dynamodb.datamodeling.ConversionSchema;
-import software.amazon.awssdk.services.dynamodb.datamodeling.ConversionSchemas;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbAttribute;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbHashKey;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMapper;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMapperConfig;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMapperFieldModel;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMappingException;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbNativeBoolean;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbTable;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbTyped;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-import software.amazon.awssdk.services.dynamodb.model.GetItemRequest;
-import software.amazon.awssdk.services.dynamodb.model.GetItemResponse;
-import software.amazon.awssdk.services.dynamodb.model.UpdateItemRequest;
-import software.amazon.awssdk.services.dynamodb.model.UpdateItemResponse;
-
-/**
- * The default converters should be able to unmarshall both V1 booleans (numeric 0/1) and native Dynamo booleans. When using the
- * standard converters booleans should be marshalled as numeric attribute values.
- */
-@RunWith(MockitoJUnitRunner.class)
-public class V2CompatibleBooleansTest {
-
-    private static final String HASH_KEY = "1234";
-
-    @Mock
-    private DynamoDbClient ddb;
-
-    /**
-     * Mapper with default config.
-     */
-    private DynamoDbMapper defaultMapper;
-
-    /**
-     * Mapper explicitly using {@link ConversionSchemas#V2_COMPATIBLE}
-     */
-    private DynamoDbMapper v2CompatMapper;
-
-    /**
-     * Mapper explicitly using {@link ConversionSchemas#V1}
-     */
-    private DynamoDbMapper v1Mapper;
-
-    /**
-     * Mapper explicitly using {@link ConversionSchemas#V2}
-     */
-    private DynamoDbMapper v2Mapper;
-
-    @Before
-    public void setup() {
-        defaultMapper = new DynamoDbMapper(ddb);
-        v2CompatMapper = buildMapper(ConversionSchemas.V2_COMPATIBLE);
-        v1Mapper = buildMapper(ConversionSchemas.V1);
-        v2Mapper = buildMapper(ConversionSchemas.V2);
-        // Just stub dummy response for all save related tests
-        when(ddb.updateItem(any(UpdateItemRequest.class))).thenReturn(UpdateItemResponse.builder().build());
-    }
-
-    private DynamoDbMapper buildMapper(ConversionSchema schema) {
-        return new DynamoDbMapper(ddb, DynamoDbMapperConfig.builder()
-                .withConversionSchema(schema)
-                .build());
-    }
-
-    /**
-     * Without coercion from an annotation the default mapping should marshall booleans as a number.
-     */
-    @Test
-    public void saveBooleanUsingDefaultConverters_MarshallsIntoNumber() {
-        defaultMapper.save(new UnitTestPojo().setHashKey(HASH_KEY).setBooleanAttr(true));
-        verifyAttributeUpdatedWithValue("booleanAttr", AttributeValue.builder().n("1").build());
-    }
-
-    @Test
-    public void saveBooleanUsingV1Schema_MarshallsIntoNumber() {
-        v1Mapper.save(new UnitTestPojo().setHashKey(HASH_KEY).setBooleanAttr(true));
-        verifyAttributeUpdatedWithValue("booleanAttr", AttributeValue.builder().n("1").build());
-    }
-
-    @Test
-    public void saveBooleanUsingV2Compat_MarshallsIntoNumber() {
-        v2CompatMapper.save(new UnitTestPojo().setHashKey(HASH_KEY).setBooleanAttr(true));
-        verifyAttributeUpdatedWithValue("booleanAttr", AttributeValue.builder().n("1").build());
-    }
-
-    @Test
-    public void saveBooleanUsingV2Schema_MarshallsIntoNativeBool() {
-        v2Mapper.save(new UnitTestPojo().setHashKey(HASH_KEY).setBooleanAttr(true));
-        verifyAttributeUpdatedWithValue("booleanAttr", AttributeValue.builder().bool(true).build());
-    }
-
-    /**
-     * {@link DynamoDbNativeBoolean} or {@link DynamoDbTyped} can force
-     * native
-     * boolean marshalling.
-     */
-    @Test
-    public void saveCoercedNativeBooleanUsingDefaultConverters_MarshallsIntoNativeBool() {
-        saveCoercedNativeBoolean_MarshallsIntoNativeBoolean(defaultMapper);
-    }
-
-    @Test
-    public void saveCoercedNativeBooleanUsingV1Schema_MarshallsIntoNativeBool() {
-        saveCoercedNativeBoolean_MarshallsIntoNativeBoolean(v1Mapper);
-    }
-
-    @Test
-    public void saveCoercedNativeBooleanUsingV2CompatSchema_MarshallsIntoNativeBool() {
-        saveCoercedNativeBoolean_MarshallsIntoNativeBoolean(v2CompatMapper);
-    }
-
-    @Test
-    public void saveCoercedNativeBooleanUsingV2_MarshallsIntoNativeBool() {
-        saveCoercedNativeBoolean_MarshallsIntoNativeBoolean(v2Mapper);
-    }
-
-    private void saveCoercedNativeBoolean_MarshallsIntoNativeBoolean(DynamoDbMapper mapper) {
-        mapper.save(new UnitTestPojo().setNativeBoolean(true).setHashKey(HASH_KEY));
-        verifyAttributeUpdatedWithValue("nativeBoolean", AttributeValue.builder().bool(true).build());
-    }
-
-    /**
-     * {@link DynamoDbTyped} can force numeric boolean conversion even when using V2 schema.
-     */
-    @Test
-    public void saveCoercedNumericBooleanUsingDefaultConverters_MarshallsIntoNumericBool() {
-        saveCoercedNumericBoolean_MarshallsIntoNumericBoolean(defaultMapper);
-    }
-
-    @Test
-    public void saveCoercedNumericBooleanUsingV1Schema_MarshallsIntoNumericBool() {
-        saveCoercedNumericBoolean_MarshallsIntoNumericBoolean(v1Mapper);
-    }
-
-    @Test
-    public void saveCoercedNumericBooleanUsingV2CompatSchema_MarshallsIntoNumericBool() {
-        saveCoercedNumericBoolean_MarshallsIntoNumericBoolean(v2CompatMapper);
-    }
-
-    @Test
-    public void saveCoercedNumericBooleanUsingV2_MarshallsIntoNumericBool() {
-        saveCoercedNumericBoolean_MarshallsIntoNumericBoolean(v2Mapper);
-    }
-
-    private void saveCoercedNumericBoolean_MarshallsIntoNumericBoolean(DynamoDbMapper mapper) {
-        mapper.save(new UnitTestPojo().setNumericBoolean(true).setHashKey(HASH_KEY));
-        verifyAttributeUpdatedWithValue("numericBoolean", AttributeValue.builder().n("1").build());
-    }
-
-    @Test
-    public void saveBooleanListUsingDefaultConverters_MarshallsIntoListOfNumbers() {
-        defaultMapper.save(new UnitTestPojoWithList()
-                .setBooleanList(Arrays.asList(Boolean.FALSE, Boolean.TRUE))
-                .setHashKey(HASH_KEY));
-        verifyAttributeUpdatedWithValue("booleanList", AttributeValue.builder()
-                .l(
-                        AttributeValue.builder().n("0").build(),
-                        AttributeValue.builder().n("1").build())
-                .build());
-    }
-
-    /**
-     * Verifies the mapper results in an update item call that has an update for the appropriate attribute.
-     *
-     * @param attributeName Attribute expected to be updated.
-     * @param expected      Expected value of update action.
-     */
-    private void verifyAttributeUpdatedWithValue(String attributeName, AttributeValue expected) {
-        ArgumentCaptor<UpdateItemRequest> updateItemRequestCaptor = ArgumentCaptor.forClass(UpdateItemRequest.class);
-        verify(ddb).updateItem(updateItemRequestCaptor.capture());
-        assertEquals(expected, updateItemRequestCaptor.getValue().attributeUpdates().get(attributeName).value());
-    }
-
-    @Test
-    public void loadNumericBooleanUsingDefaultConverters_UnmarshallsCorrectly() {
-        stubGetItemRequest("booleanAttr", AttributeValue.builder().n("1").build());
-        final UnitTestPojo pojo = loadPojo(defaultMapper);
-        assertTrue(pojo.getBooleanAttr());
-    }
-
-    @Test
-    public void loadNumericBooleanUsingV1Schema_UnmarshallsCorrectly() {
-        stubGetItemRequest("booleanAttr", AttributeValue.builder().n("1").build());
-        final UnitTestPojo pojo = loadPojo(v1Mapper);
-        assertTrue(pojo.getBooleanAttr());
-    }
-
-    @Test
-    public void loadNumericBooleanUsingV2CompatSchema_UnmarshallsCorrectly() {
-        stubGetItemRequest("booleanAttr", AttributeValue.builder().n("1").build());
-        final UnitTestPojo pojo = loadPojo(v2CompatMapper);
-        assertTrue(pojo.getBooleanAttr());
-    }
-
-    @Test
-    public void loadNumericBooleanUsingV2_UnmarshallsCorrectly() {
-        stubGetItemRequest("booleanAttr", AttributeValue.builder().n("1").build());
-        final UnitTestPojo pojo = loadPojo(v2Mapper);
-        assertTrue(pojo.getBooleanAttr());
-    }
-
-    @Test
-    public void loadNativeBooleanUsingDefaultConverters_UnmarshallsCorrectly() {
-        stubGetItemRequest("booleanAttr", AttributeValue.builder().bool(true).build());
-        final UnitTestPojo pojo = loadPojo(defaultMapper);
-        assertTrue(pojo.getBooleanAttr());
-    }
-//
-    /**
-     * V1 schema does not handle native bool types by default
-     */
-    @Test(expected = DynamoDbMappingException.class)
-    public void loadNativeBooleanUsingV1Schema_FailsToUnmarshall() {
-        stubGetItemRequest("booleanAttr", AttributeValue.builder().bool(true).build());
-        loadPojo(v1Mapper);
-    }
-
-    /**
-     * Native bool support can be forced in V1 schema with @{@link DynamoDbTyped}.
-     */
-    @Test
-    public void loadCoercedNativeBooleanUsingV1Schema_UnmarshallsCorrectly() {
-        stubGetItemRequest("nativeBoolean", AttributeValue.builder().bool(true).build());
-        final UnitTestPojo pojo = loadPojo(v1Mapper);
-        assertTrue(pojo.getNativeBoolean());
-    }
-
-    @Test
-    public void loadNativeBooleanUsingV2CompatSchema_UnmarshallsCorrectly() {
-        stubGetItemRequest("booleanAttr", AttributeValue.builder().bool(true).build());
-        final UnitTestPojo pojo = loadPojo(v2CompatMapper);
-        assertTrue(pojo.getBooleanAttr());
-    }
-
-    @Test
-    public void loadNativeBooleanUsingV2_UnmarshallsCorrectly() {
-        stubGetItemRequest("booleanAttr", AttributeValue.builder().bool(true).build());
-        final UnitTestPojo pojo = loadPojo(v2Mapper);
-        assertTrue(pojo.getBooleanAttr());
-    }
-
-    @Test
-    public void loadNativeBooleanListUsingDefaultConverters_UnmarshallsCorrectly() {
-        stubGetItemRequest("booleanList", AttributeValue.builder()
-                .l(
-                        AttributeValue.builder().bool(true).build(),
-                        AttributeValue.builder().bool(false).build()
-                ).build());
-        final UnitTestPojoWithList pojo = loadListPojo(defaultMapper);
-
-        assertTrue(pojo.getBooleanList().get(0));
-        assertFalse(pojo.getBooleanList().get(1));
-    }
-
-    @Test
-    public void loadNumericBooleanListUsingDefaultConverters_UnmarshallsCorrectly() {
-        stubGetItemRequest("booleanList", AttributeValue.builder()
-                .l(
-                        AttributeValue.builder().n("1").build(),
-                        AttributeValue.builder().n("0").build()
-                ).build());
-        final UnitTestPojoWithList pojo = loadListPojo(defaultMapper);
-
-        assertTrue(pojo.getBooleanList().get(0));
-        assertFalse(pojo.getBooleanList().get(1));
-    }
-
-    private UnitTestPojoWithList loadListPojo(DynamoDbMapper mapper) {
-        UnitTestPojoWithList pojo = new UnitTestPojoWithList();
-        pojo.setHashKey(HASH_KEY);
-        return mapper.load(pojo);
-    }
-
-    private UnitTestPojo loadPojo(DynamoDbMapper mapper) {
-        return mapper.load(new UnitTestPojo().setHashKey(HASH_KEY));
-    }
-
-    /**
-     * Stub a call to getItem to return a result with the given attribute value in the item.
-     *
-     * @param attributeName  Attribute name to return in result (in addition to hash key)
-     * @param attributeValue Attribute value to return in result (in addition to hash key)
-     */
-    private void stubGetItemRequest(String attributeName, AttributeValue attributeValue) {
-        when(ddb.getItem(any(GetItemRequest.class))).thenReturn(createGetItemResponse(attributeName, attributeValue));
-    }
-
-    /**
-     * Create a {@link GetItemResponse} with the hash key value ({@value #HASH_KEY} and the additional attribute.
-     *
-     * @param attributeName  Additional attribute to include in created {@link GetItemResponse}.
-     * @param attributeValue Value of additional attribute.
-     */
-    private GetItemResponse createGetItemResponse(String attributeName, AttributeValue attributeValue) {
-        return GetItemResponse.builder().item(
-                ImmutableMap.of("hashKey", AttributeValue.builder().s(HASH_KEY).build(),
-                                attributeName, attributeValue)).build();
-    }
-
-    @DynamoDbTable(tableName = "UnitTestTable")
-    public static class UnitTestPojo {
-
-        @DynamoDbHashKey
-        private String hashKey;
-
-        @DynamoDbAttribute
-        private Boolean booleanAttr;
-
-        @DynamoDbTyped(DynamoDbMapperFieldModel.DynamoDbAttributeType.BOOL)
-        private Boolean nativeBoolean;
-
-        @DynamoDbTyped(DynamoDbMapperFieldModel.DynamoDbAttributeType.N)
-        private Boolean numericBoolean;
-
-
-        public String getHashKey() {
-            return hashKey;
-        }
-
-        public UnitTestPojo setHashKey(String hashKey) {
-            this.hashKey = hashKey;
-            return this;
-        }
-
-        public Boolean getBooleanAttr() {
-            return booleanAttr;
-        }
-
-        public UnitTestPojo setBooleanAttr(Boolean booleanAttr) {
-            this.booleanAttr = booleanAttr;
-            return this;
-        }
-
-        public Boolean getNativeBoolean() {
-            return nativeBoolean;
-        }
-
-        public UnitTestPojo setNativeBoolean(Boolean nativeBoolean) {
-            this.nativeBoolean = nativeBoolean;
-            return this;
-        }
-
-        public Boolean getNumericBoolean() {
-            return numericBoolean;
-        }
-
-        public UnitTestPojo setNumericBoolean(Boolean numericBoolean) {
-            this.numericBoolean = numericBoolean;
-            return this;
-        }
-
-    }
-
-    public static class UnitTestPojoWithList extends UnitTestPojo {
-
-        @DynamoDbAttribute
-        private List<Boolean> booleanList;
-
-        public List<Boolean> getBooleanList() {
-            return booleanList;
-        }
-
-        public UnitTestPojo setBooleanList(List<Boolean> booleanList) {
-            this.booleanList = booleanList;
-            return this;
-        }
-    }
-
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/model/Item.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/model/Item.java
deleted file mode 100644
index c1f9d713e591..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/model/Item.java
+++ /dev/null
@@ -1,379 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.model;
-
-import static java.util.stream.Collectors.toList;
-import static software.amazon.awssdk.utils.CollectionUtils.toMap;
-
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import software.amazon.awssdk.core.SdkBytes;
-import software.amazon.awssdk.utils.builder.SdkBuilder;
-
-/**
- * Used to build a DynamoDB item map.
- *
- * For example to pass to a {@link PutItemRequest.Builder#item(Map)}.
- */
-//TODO : May want to do this a different way
-public final class Item extends HashMap<String, AttributeValue> {
-
-    private Item(Builder builder) {
-        putAll(builder.item);
-    }
-
-    /**
-     * Create a new instance of the {@link Builder}.
-     *
-     * @return a new instance of the {@link Builder}
-     */
-    public static Builder builder() {
-        return new Builder();
-    }
-
-    public static class Builder implements SdkBuilder<Builder, Item> {
-        private final Map<String, AttributeValue> item = new HashMap<>();
-
-        private Builder() {
-        }
-
-        /**
-         * Build a {@link Map} representing a DyanmoDB item.
-         *
-         * @return a {@link Map} representing a DyanmoDB item
-         */
-        @Override
-        public Item build() {
-            return new Item(this);
-        }
-
-        /**
-         * Adds an {@link AttributeValue} representing a String to the item with the specified key.
-         *
-         * Equivalent of:
-         * <pre><code>
-         * itemMap.put(key, AttributeValue.builder().s(stringValue).build());
-         * </code></pre>
-         *
-         * @param key the key of this attribute
-         * @param stringValue the string value of the attribute
-         * @return the builder for method chaining
-         */
-        public Builder attribute(String key, String stringValue) {
-            item.put(key, AttributeValue.builder().s(stringValue).build());
-            return this;
-        }
-
-        /**
-         * Adds an {@link AttributeValue} representing a Boolean to the item with the specified key.
-         *
-         * Equivalent of:
-         * <pre><code>
-         * itemMap.put(key, AttributeValue.builder().bool(booleanValue).build());
-         * </code></pre>
-         *
-         * @param key the key of this attribute
-         * @param booleanValue the boolean value of the attribute
-         * @return the builder for method chaining
-         */
-        public Builder attribute(String key, Boolean booleanValue) {
-            item.put(key, AttributeValue.builder().bool(booleanValue).build());
-            return this;
-        }
-
-        /**
-         * Adds an {@link AttributeValue} representing a Number to the item with the specified key.
-         *
-         * Equivalent of:
-         * <pre><code>
-         * itemMap.put(key, AttributeValue.builder().n(String.valueOf(numericValue)).build());
-         * </code></pre>
-         *
-         * @param key the key of this attribute
-         * @param numericValue the numeric value of the attribute
-         * @return the builder for method chaining
-         */
-        public Builder attribute(String key, Number numericValue) {
-            item.put(key, AttributeValue.builder().n(String.valueOf(numericValue)).build());
-            return this;
-        }
-
-        /**
-         * Adds an {@link AttributeValue} representing binary data to the item with the specified key.
-         *
-         * Equivalent of:
-         * <pre><code>
-         * itemMap.put(key, AttributeValue.builder().b(ByteBuffer.wrap(binaryValue)).build());
-         * </code></pre>
-         *
-         * @param key the key of this attribute
-         * @param binaryValue the binary value of the attribute
-         * @return the builder for method chaining
-         */
-        public Builder attribute(String key, byte[] binaryValue) {
-            return attribute(key, ByteBuffer.wrap(binaryValue));
-        }
-
-        /**
-         * Adds an {@link AttributeValue} representing binary data to the item with the specified key.
-         *
-         * Equivalent of:
-         * <pre><code>
-         * itemMap.put(key, AttributeValue.builder().b(binaryValue).build());
-         * </code></pre>
-         *
-         * @param key the key of this attribute
-         * @param binaryValue the binary value of the attribute
-         * @return the builder for method chaining
-         */
-        public Builder attribute(String key, ByteBuffer binaryValue) {
-            item.put(key, AttributeValue.builder().b(SdkBytes.fromByteBuffer(binaryValue)).build());
-            return this;
-        }
-
-        /**
-         * Adds an {@link AttributeValue} representing a list of AttributeValues to the item with the specified key.
-         *
-         * This will attempt to infer the of of the {@link AttributeValue} for each given {@link Object} in the list
-         * based on the type. Supported types are:
-         * <ul>
-         * <li><strong>{@link AttributeValue}</strong> which is unaltered</li>
-         * <li><strong>{@link String}</strong> becomes {@link AttributeValue#s()}</li>
-         * <li><strong>{@link Number}</strong> (and anything that can be automatically boxed to {@link Number} including
-         * int, long, float etc.) becomes {@link AttributeValue#n()}</li>
-         * <li><strong>{@link Boolean}</strong> (and bool) becomes {@link AttributeValue#bool()}</li>
-         * <li><strong>byte[]</strong> becomes {@link AttributeValue#b()}</li>
-         * <li><strong>{@link ByteBuffer}</strong> becomes {@link AttributeValue#b()}</li>
-         * <li><strong>{@link List}&lt;Object&gt;</strong> (where the containing objects are one of the types in
-         * this list) becomes {@link AttributeValue#l()}</li>
-         * <li><strong>{@link Map}&lt;String, Object&gt;</strong> (where the containing object values are one of the types
-         * in this list) becomes {@link AttributeValue#m()}</li>
-         * </ul>
-         *
-         * @param key the key of this attribute
-         * @param values the object values
-         * @return the builder for method chaining
-         */
-        public Builder attribute(String key, List<?> values) {
-            item.put(key, fromObject(values));
-            return this;
-        }
-
-        /**
-         * Adds an {@link AttributeValue} representing a map of string to AttributeValues to the item with the specified key.
-         *
-         * This will attempt to infer the most appropriate {@link AttributeValue} for each given {@link Object} value in the map
-         * based on the type. Supported types are:
-         * <ul>
-         * <li><strong>{@link AttributeValue}</strong> which is unaltered</li>
-         * <li><strong>{@link String}</strong> becomes {@link AttributeValue#s()}</li>
-         * <li><strong>{@link Number}</strong> (and anything that can be automatically boxed to {@link Number} including
-         * int, long, float etc.) becomes {@link AttributeValue#n()}</li>
-         * <li><strong>{@link Boolean}</strong> (and bool) becomes {@link AttributeValue#bool()}</li>
-         * <li><strong>byte[]</strong> becomes {@link AttributeValue#b()}</li>
-         * <li><strong>{@link ByteBuffer}</strong> becomes {@link AttributeValue#b()}</li>
-         * <li><strong>{@link List}&lt;Object&gt;</strong> (where the containing objects are one of the types in
-         * this list) becomes {@link AttributeValue#l()}</li>
-         * <li><strong>{@link Map}&lt;String, Object&gt;</strong> (where the containing object values are one of the types
-         * in this list) becomes {@link AttributeValue#m()}</li>
-         * </ul>
-         *
-         * @param key the key of this attribute
-         * @param values the map of key to object
-         * @return the builder for method chaining
-         */
-        public Builder attribute(String key, Map<String, ?> values) {
-            item.put(key, fromObject(values));
-            return this;
-        }
-
-        /**
-         * Adds an {@link AttributeValue} representing a list of strings to the item with the specified key.
-         *
-         * Equivalent of:
-         * <pre><code>
-         * itemMap.put(key, AttributeValue.builder().ss(stringValue1, stringValue2, ...).build());
-         * </code></pre>
-         *
-         * @param key the key of this attribute
-         * @param stringValues the string values of the attribute
-         * @return the builder for method chaining
-         */
-        public Builder strings(String key, String... stringValues) {
-            return strings(key, Arrays.asList(stringValues));
-        }
-
-        /**
-         * Adds an {@link AttributeValue} representing a list of strings to the item with the specified key.
-         *
-         * Equivalent of:
-         * <pre><code>
-         * itemMap.put(key, AttributeValue.builder().ss(stringValues).build());
-         * </code></pre>
-         *
-         * @param key the key of this attribute
-         * @param stringValues the string values of the attribute
-         * @return the builder for method chaining
-         */
-        public Builder strings(String key, Collection<String> stringValues) {
-            item.put(key, AttributeValue.builder().ss(stringValues).build());
-            return this;
-        }
-
-        /**
-         * Adds an {@link AttributeValue} representing a list of numbers to the item with the specified key.
-         *
-         * Equivalent of:
-         * <pre><code>
-         * itemMap.put(key, AttributeValue.builder().ns(numberValues1, numberValues2, ...).build());
-         * </code></pre>
-         *
-         * @param key the key of this attribute
-         * @param numberValues the number values of the attribute
-         * @return the builder for method chaining
-         */
-        public Builder numbers(String key, Number... numberValues) {
-            return numbers(key, Arrays.asList(numberValues));
-        }
-
-        /**
-         * Adds an {@link AttributeValue} representing a list of numbers to the item with the specified key.
-         *
-         * Equivalent of:
-         * <pre><code>
-         * itemMap.put(key, AttributeValue.builder().ns(numberValues).build());
-         * </code></pre>
-         *
-         * @param key the key of this attribute
-         * @param numberValues the number values of the attribute
-         * @return the builder for method chaining
-         */
-        public Builder numbers(String key, Collection<? extends Number> numberValues) {
-            item.put(key, AttributeValue.builder().ns(numberValues.stream().map(String::valueOf).collect(toList())).build());
-            return this;
-        }
-
-        /**
-         * Adds an {@link AttributeValue} representing a list of binary data to the item with the specified key.
-         *
-         * Equivalent of:
-         * <pre><code>
-         * itemMap.put(key, AttributeValue.builder().bs(Arrays.stream(byteArrays)
-         *                                                    .map(ByteBuffer::wrap)
-         *                                                    .collect(Collectors.toList())).build());
-         * </code></pre>
-         *
-         * @param key the key of this attribute
-         * @param byteArrays the binary values of the attribute
-         * @return the builder for method chaining
-         */
-        public Builder byteArrays(String key, byte[]... byteArrays) {
-            return byteArrays(key, Arrays.asList(byteArrays));
-        }
-
-        /**
-         * Adds an {@link AttributeValue} representing a list of binary data to the item with the specified key.
-         *
-         * Equivalent of:
-         * <pre><code>
-         * itemMap.put(key, AttributeValue.builder().bs(byteArrays.stream()
-         *                                                        .map(ByteBuffer::wrap)
-         *                                                        .collect(Collectors.toList())).build());
-         * </code></pre>
-         *
-         * @param key the key of this attribute
-         * @param byteArrays the binary values of the attribute
-         * @return the builder for method chaining
-         */
-        public Builder byteArrays(String key, Collection<byte[]> byteArrays) {
-            return byteBuffers(key, byteArrays.stream().map(ByteBuffer::wrap).collect(Collectors.toList()));
-        }
-
-        /**
-         * Adds an {@link AttributeValue} representing a list of binary data to the item with the specified key.
-         *
-         * Equivalent of:
-         * <pre><code>
-         * itemMap.put(key, AttributeValue.builder().bs(binaryValues1, binaryValues2, ...)).build());
-         * </code></pre>
-         *
-         * @param key the key of this attribute
-         * @param binaryValues the binary values of the attribute
-         * @return the builder for method chaining
-         */
-        public Builder byteBuffers(String key, ByteBuffer... binaryValues) {
-            return byteBuffers(key, Arrays.asList(binaryValues));
-        }
-
-        /**
-         * Adds an {@link AttributeValue} representing a list of binary data to the item with the specified key.
-         *
-         * Equivalent of:
-         * <pre><code>
-         * itemMap.put(key, AttributeValue.builder().bs(binaryValues).build());
-         * </code></pre>
-         *
-         * @param key the key of this attribute
-         * @param binaryValues the binary values of the attribute
-         * @return the builder for method chaining
-         */
-        public Builder byteBuffers(String key, Collection<? extends ByteBuffer> binaryValues) {
-            item.put(key, AttributeValue.builder().bs(binaryValues.stream().map(SdkBytes::fromByteBuffer).collect(toList())).build());
-            return this;
-        }
-
-        private static AttributeValue fromObject(Object object) {
-            if (object instanceof AttributeValue) {
-                return (AttributeValue) object;
-            }
-            if (object instanceof String) {
-                return AttributeValue.builder().s((String) object).build();
-            }
-            if (object instanceof Number) {
-                return AttributeValue.builder().n(String.valueOf((Number) object)).build();
-            }
-            if (object instanceof byte[]) {
-                return AttributeValue.builder().b(SdkBytes.fromByteArray((byte[]) object)).build();
-            }
-            if (object instanceof ByteBuffer) {
-                return AttributeValue.builder().b(SdkBytes.fromByteBuffer((ByteBuffer) object)).build();
-            }
-            if (object instanceof Boolean) {
-                return AttributeValue.builder().bool((Boolean) object).build();
-            }
-            if (object instanceof List) {
-                List<AttributeValue> attributeValues = ((List<?>) object).stream()
-                                                                         .map(Builder::fromObject)
-                                                                         .collect(toList());
-                return AttributeValue.builder().l(attributeValues).build();
-            }
-            if (object instanceof Map) {
-                Map<String, AttributeValue> attributeValues =
-                    ((Map<String, ?>) object).entrySet()
-                                             .stream()
-                                             .map(e -> new SimpleImmutableEntry<>(e.getKey(), fromObject(e.getValue())))
-                                             .collect(toMap());
-                return AttributeValue.builder().m(attributeValues).build();
-            }
-            throw new IllegalArgumentException("Unsupported type: " + object.getClass());
-        }
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/model/ItemTest.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/model/ItemTest.java
deleted file mode 100644
index ad980c4837a5..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/model/ItemTest.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.model;
-
-import static java.nio.charset.StandardCharsets.UTF_8;
-import static java.util.Collections.singletonMap;
-import static org.assertj.core.api.Assertions.assertThat;
-
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import org.assertj.core.api.Condition;
-import org.junit.Test;
-
-public class ItemTest {
-
-    public static final byte[] BYTES1 = "value1".getBytes(UTF_8);
-    public static final byte[] BYTES2 = "value2".getBytes(UTF_8);
-
-    @Test
-    public void testItemBuilder() {
-
-        Map<String, Object> testMap = new HashMap<>();
-        testMap.put("String", "stringValue");
-        testMap.put("int", 15);
-        testMap.put("byteArray", BYTES1);
-        testMap.put("ByteBuffer", ByteBuffer.wrap(BYTES2));
-        testMap.put("bool", true);
-
-        List<Long> longs = Arrays.asList(1l, 2l, 3l);
-
-        Map<String, AttributeValue> item =
-            Item.builder()
-                .attribute("String", "stringValue")
-                .attribute("int", 15)
-                .attribute("long", 200L)
-                .attribute("float", 15.5)
-                .attribute("Integer", new Integer(15))
-                .attribute("Long", new Long(200))
-                .attribute("Float", new Float(15.5))
-                .attribute("bool", true)
-                .attribute("Boolean", Boolean.TRUE)
-                .attribute("bytes", BYTES1)
-                .attribute("ByteBuffer", ByteBuffer.wrap(BYTES1))
-                .strings("StringsVarArgs", "value1", "value2")
-                .strings("StringsCollection", Arrays.asList("value1", "value2"))
-                .numbers("NumbersVarArgs", 1, 2.0, 3L)
-                .numbers("NumbersCollection", Arrays.asList(1, 2.0, 3L))
-                .numbers("LongCollection", longs)
-                .byteArrays("bytesVarArgs", BYTES1, BYTES2)
-                .byteArrays("bytesCollection", Arrays.asList(BYTES1, BYTES2))
-                .byteBuffers("ByteBuffersVarArgs", ByteBuffer.wrap(BYTES1), ByteBuffer.wrap(BYTES2))
-                .byteBuffers("ByteBuffersCollection", Arrays.asList(ByteBuffer.wrap(BYTES1), ByteBuffer.wrap(BYTES2)))
-                .attribute("list", Arrays.asList(15, 200L, 15.5, "stringValue", BYTES1, ByteBuffer.wrap(BYTES2), true))
-                .attribute("map", testMap)
-                .attribute("nested", Arrays.asList(15, singletonMap("nestedList", Arrays.asList("stringValue", BYTES1))))
-                .build();
-
-
-        assertThat(item).containsEntry("String", AttributeValue.builder().s("stringValue").build());
-        assertThat(item).containsEntry("int", AttributeValue.builder().n("15").build());
-        assertThat(item).containsEntry("long", AttributeValue.builder().n("200").build());
-        assertThat(item).containsEntry("float", AttributeValue.builder().n("15.5").build());
-        assertThat(item).containsEntry("Integer", AttributeValue.builder().n("15").build());
-        assertThat(item).containsEntry("Long", AttributeValue.builder().n("200").build());
-        assertThat(item).containsEntry("Float", AttributeValue.builder().n("15.5").build());
-        assertThat(item).containsEntry("bool", AttributeValue.builder().bool(true).build());
-        assertThat(item).containsEntry("Boolean", AttributeValue.builder().bool(true).build());
-        assertThat(item).containsEntry("StringsVarArgs", AttributeValue.builder().ss("value1", "value2").build());
-        assertThat(item).containsEntry("StringsCollection", AttributeValue.builder().ss("value1", "value2").build());
-        assertThat(item).containsEntry("NumbersVarArgs", AttributeValue.builder().ns("1", "2.0", "3").build());
-        assertThat(item).containsEntry("NumbersCollection", AttributeValue.builder().ns("1", "2.0", "3").build());
-        assertThat(item).containsEntry("LongCollection", AttributeValue.builder().ns("1", "2", "3").build());
-
-        assertThat(item).hasEntrySatisfying("bytes", bytesMatching(BYTES1));
-        assertThat(item).hasEntrySatisfying("ByteBuffer", bytesMatching(BYTES1));
-        assertThat(item).hasEntrySatisfying("bytesVarArgs", bytesMatching(BYTES1, BYTES2));
-        assertThat(item).hasEntrySatisfying("bytesCollection", bytesMatching(BYTES1, BYTES2));
-        assertThat(item).hasEntrySatisfying("ByteBuffersVarArgs", bytesMatching(BYTES1, BYTES2));
-        assertThat(item).hasEntrySatisfying("ByteBuffersCollection", bytesMatching(BYTES1, BYTES2));
-
-        assertThat(item.get("list").l()).hasSize(7);
-        assertThat(item.get("list").l().get(0)).isEqualTo(AttributeValue.builder().n("15").build());
-        assertThat(item.get("list").l().get(1)).isEqualTo(AttributeValue.builder().n("200").build());
-        assertThat(item.get("list").l().get(2)).isEqualTo(AttributeValue.builder().n("15.5").build());
-        assertThat(item.get("list").l().get(3)).isEqualTo(AttributeValue.builder().s("stringValue").build());
-        assertThat(item.get("list").l().get(4)).has(bytesMatching(BYTES1));
-        assertThat(item.get("list").l().get(5)).has(bytesMatching(BYTES2));
-        assertThat(item.get("list").l().get(6)).isEqualTo(AttributeValue.builder().bool(true).build());
-
-        assertThat(item.get("map").m().entrySet()).hasSize(5);
-        assertThat(item.get("map").m().get("String")).isEqualTo(AttributeValue.builder().s("stringValue").build());
-        assertThat(item.get("map").m().get("int")).isEqualTo(AttributeValue.builder().n("15").build());
-        assertThat(item.get("map").m().get("byteArray")).has(bytesMatching(BYTES1));
-        assertThat(item.get("map").m().get("ByteBuffer")).has(bytesMatching(BYTES2));
-        assertThat(item.get("map").m().get("bool")).isEqualTo(AttributeValue.builder().bool(true).build());
-
-        assertThat(item.get("nested").l()).hasSize(2);
-        assertThat(item.get("nested").l().get(0)).isEqualTo(AttributeValue.builder().n("15").build());
-        assertThat(item.get("nested").l().get(1).m().entrySet()).hasSize(1);
-        assertThat(item.get("nested").l().get(1).m().get("nestedList").l()).hasSize(2);
-        assertThat(item.get("nested").l().get(1).m().get("nestedList").l().get(0)).isEqualTo(AttributeValue.builder().s("stringValue").build());
-        assertThat(item.get("nested").l().get(1).m().get("nestedList").l().get(1)).has(bytesMatching(BYTES1));
-    }
-
-    private static Condition<AttributeValue> bytesMatching(byte[] bytes) {
-        return new Condition<>(item -> byteBufferEquals(item.b().asByteBuffer(), bytes), "bytes matching");
-    }
-
-    private static Condition<AttributeValue> bytesMatching(byte[] firstByteArray, byte[] secondByteArray) {
-        return new Condition<>(item -> {
-            return item.bs().size() == 2 &&
-                   byteBufferEquals(item.bs().get(0).asByteBuffer(), firstByteArray) &&
-                   byteBufferEquals(item.bs().get(1).asByteBuffer(), secondByteArray);
-        }, "List<" + String.valueOf(firstByteArray) + ", " + String.valueOf(secondByteArray) + ">");
-    }
-
-    private static boolean byteBufferEquals(ByteBuffer byteBuffer, byte[] bytes) {
-        if (byteBuffer.remaining() != bytes.length) {
-            return false;
-        }
-        byte[] actual = new byte[bytes.length];
-        byteBuffer.duplicate().get(actual);
-        return Arrays.equals(actual, bytes);
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/pojos/AuditRecord.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/pojos/AuditRecord.java
deleted file mode 100644
index 3cd0a6efb1be..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/pojos/AuditRecord.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.pojos;
-
-import java.util.Date;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbAttribute;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbAutoGenerateStrategy;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbAutoGeneratedTimestamp;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbFlattened;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbVersionAttribute;
-
-@DynamoDbFlattened(attributes = {@DynamoDbAttribute(mappedBy = "createdDate", attributeName = "RCD"),
-                                 @DynamoDbAttribute(mappedBy = "lastModifiedDate", attributeName = "RMD"),
-                                 @DynamoDbAttribute(mappedBy = "versionNumber", attributeName = "RVN")})
-public class AuditRecord {
-
-    private Date createdDate;
-    private Date lastModifiedDate;
-    private Long versionNumber;
-
-    @DynamoDbAutoGeneratedTimestamp(strategy = DynamoDbAutoGenerateStrategy.CREATE)
-    public Date getCreatedDate() {
-        return this.createdDate;
-    }
-
-    public void setCreatedDate(final Date createdDate) {
-        this.createdDate = createdDate;
-    }
-
-    @DynamoDbAutoGeneratedTimestamp(strategy = DynamoDbAutoGenerateStrategy.ALWAYS)
-    public Date getLastModifiedDate() {
-        return this.lastModifiedDate;
-    }
-
-    public void setLastModifiedDate(final Date lastModifiedDate) {
-        this.lastModifiedDate = lastModifiedDate;
-    }
-
-    @DynamoDbVersionAttribute
-    public Long getVersionNumber() {
-        return this.versionNumber;
-    }
-
-    public void setVersionNumber(final Long versionNumber) {
-        this.versionNumber = versionNumber;
-    }
-
-    @Override
-    public final boolean equals(final Object o) {
-        if (o == this) {
-            return true;
-        }
-        if (!(o instanceof AuditRecord)) {
-            return false;
-        }
-        AuditRecord that = (AuditRecord) o;
-        return (createdDate == null ? that.createdDate == null : createdDate.equals(that.createdDate)) &&
-               (lastModifiedDate == null ? that.lastModifiedDate == null : lastModifiedDate.equals(that.lastModifiedDate)) &&
-               (versionNumber == null ? that.versionNumber == null : versionNumber.equals(that.versionNumber));
-    }
-
-    @Override
-    public final int hashCode() {
-        return 1 + (createdDate == null ? 0 : createdDate.hashCode()) +
-               (lastModifiedDate == null ? 0 : lastModifiedDate.hashCode()) +
-               (versionNumber == null ? 0 : versionNumber.hashCode());
-    }
-
-    @Override
-    public final String toString() {
-        return getClass().getName() + "{" +
-               "createdDate=" + createdDate + "," +
-               "lastModifiedDate=" + lastModifiedDate + "," +
-               "versionNumber=" + versionNumber +
-               "}";
-    }
-
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/pojos/AutoKeyAndVal.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/pojos/AutoKeyAndVal.java
deleted file mode 100644
index 18806bb29d15..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/pojos/AutoKeyAndVal.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.pojos;
-
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbAutoGeneratedKey;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbHashKey;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbTable;
-
-/**
- * Auto-generated string key and value.
- */
-@DynamoDbTable(tableName = "aws-java-sdk-util")
-public class AutoKeyAndVal<V> extends KeyAndVal<String, V> {
-    @Override
-    @DynamoDbHashKey
-    @DynamoDbAutoGeneratedKey
-    public String getKey() {
-        return super.getKey();
-    }
-
-    @Override
-    public void setKey(final String key) {
-        super.setKey(key);
-    }
-
-    @Override
-    public V getVal() {
-        return super.getVal();
-    }
-
-    @Override
-    public void setVal(final V val) {
-        super.setVal(val);
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/pojos/BinaryAttributeByteArrayClass.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/pojos/BinaryAttributeByteArrayClass.java
deleted file mode 100644
index e4f575ee529e..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/pojos/BinaryAttributeByteArrayClass.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.pojos;
-
-import java.util.Set;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbAttribute;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbHashKey;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbTable;
-
-/**
- * Test domain class with byte[] attribute, byte[] set and a string key
- */
-@DynamoDbTable(tableName = "aws-java-sdk-util")
-public class BinaryAttributeByteArrayClass {
-
-    private String key;
-    private byte[] binaryAttribute;
-    private Set<byte[]> binarySetAttribute;
-
-    @DynamoDbHashKey(attributeName = "key")
-    public String getKey() {
-        return key;
-    }
-
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    @DynamoDbAttribute(attributeName = "binaryAttribute")
-    public byte[] getBinaryAttribute() {
-        return binaryAttribute;
-    }
-
-    public void setBinaryAttribute(byte[] binaryAttribute) {
-        this.binaryAttribute = binaryAttribute;
-    }
-
-    @DynamoDbAttribute(attributeName = "binarySetAttribute")
-    public Set<byte[]> getBinarySetAttribute() {
-        return binarySetAttribute;
-    }
-
-    public void setBinarySetAttribute(Set<byte[]> binarySetAttribute) {
-        this.binarySetAttribute = binarySetAttribute;
-    }
-
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + ((key == null) ? 0 : key.hashCode());
-        result = prime * result + ((binaryAttribute == null) ? 0 : binaryAttribute.hashCode());
-        result = prime * result + ((binarySetAttribute == null) ? 0 : binarySetAttribute.hashCode());
-        return result;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        BinaryAttributeByteArrayClass other = (BinaryAttributeByteArrayClass) obj;
-        if (key == null) {
-            if (other.key != null) {
-                return false;
-            }
-        } else if (!key.equals(other.key)) {
-            return false;
-        }
-        if (binaryAttribute == null) {
-            if (other.binaryAttribute != null) {
-                return false;
-            }
-        } else if (!binaryAttribute.equals(other.binaryAttribute)) {
-            return false;
-        }
-        if (binarySetAttribute == null) {
-            if (other.binarySetAttribute != null) {
-                return false;
-            }
-        } else if (!binarySetAttribute.equals(other.binarySetAttribute)) {
-            return false;
-        }
-        return true;
-    }
-
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/pojos/BinaryAttributeByteBufferClass.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/pojos/BinaryAttributeByteBufferClass.java
deleted file mode 100644
index 4f4433fd6c37..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/pojos/BinaryAttributeByteBufferClass.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.pojos;
-
-import java.nio.ByteBuffer;
-import java.util.Set;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbAttribute;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbHashKey;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbTable;
-
-/**
- * Test domain class with byteBuffer attribute, byteBuffer set and a string key
- */
-@DynamoDbTable(tableName = "aws-java-sdk-util")
-public class BinaryAttributeByteBufferClass {
-
-    private String key;
-    private ByteBuffer binaryAttribute;
-    private Set<ByteBuffer> binarySetAttribute;
-
-    @DynamoDbHashKey(attributeName = "key")
-    public String getKey() {
-        return key;
-    }
-
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    @DynamoDbAttribute(attributeName = "binaryAttribute")
-    public ByteBuffer getBinaryAttribute() {
-        return binaryAttribute;
-    }
-
-    public void setBinaryAttribute(ByteBuffer binaryAttribute) {
-        this.binaryAttribute = binaryAttribute;
-    }
-
-    @DynamoDbAttribute(attributeName = "binarySetAttribute")
-    public Set<ByteBuffer> getBinarySetAttribute() {
-        return binarySetAttribute;
-    }
-
-    public void setBinarySetAttribute(Set<ByteBuffer> binarySetAttribute) {
-        this.binarySetAttribute = binarySetAttribute;
-    }
-
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + ((key == null) ? 0 : key.hashCode());
-        result = prime * result + ((binaryAttribute == null) ? 0 : binaryAttribute.hashCode());
-        result = prime * result + ((binarySetAttribute == null) ? 0 : binarySetAttribute.hashCode());
-        return result;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        BinaryAttributeByteBufferClass other = (BinaryAttributeByteBufferClass) obj;
-        if (key == null) {
-            if (other.key != null) {
-                return false;
-            }
-        } else if (!key.equals(other.key)) {
-            return false;
-        }
-        if (binaryAttribute == null) {
-            if (other.binaryAttribute != null) {
-                return false;
-            }
-        } else if (!binaryAttribute.equals(other.binaryAttribute)) {
-            return false;
-        }
-        if (binarySetAttribute == null) {
-            if (other.binarySetAttribute != null) {
-                return false;
-            }
-        } else if (!binarySetAttribute.equals(other.binarySetAttribute)) {
-            return false;
-        }
-        return true;
-    }
-
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/pojos/CrossSdkVerificationClass.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/pojos/CrossSdkVerificationClass.java
deleted file mode 100644
index 8f52e8af1289..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/pojos/CrossSdkVerificationClass.java
+++ /dev/null
@@ -1,490 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.pojos;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.Set;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbHashKey;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbRangeKey;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbTable;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbVersionAttribute;
-
-/**
- * Exhaustive exercise of DynamoDB domain mapping, exercising every supported
- * data type.
- */
-@DynamoDbTable(tableName = "aws-xsdk")
-public class CrossSdkVerificationClass {
-
-    private String key;
-    private String rangeKey;
-    private Long version;
-    private String lastUpdater;
-
-    private Integer integerAttribute;
-    private Long longAttribute;
-    private Double doubleAttribute;
-    private Float floatAttribute;
-    private BigDecimal bigDecimalAttribute;
-    private BigInteger bigIntegerAttribute;
-    private Byte byteAttribute;
-    private Date dateAttribute;
-    private Calendar calendarAttribute;
-    private Boolean booleanAttribute;
-
-    private Set<String> stringSetAttribute;
-    private Set<Integer> integerSetAttribute;
-    private Set<Double> doubleSetAttribute;
-    private Set<Float> floatSetAttribute;
-    private Set<BigDecimal> bigDecimalSetAttribute;
-    private Set<BigInteger> bigIntegerSetAttribute;
-    private Set<Long> longSetAttribute;
-    private Set<Byte> byteSetAttribute;
-    private Set<Date> dateSetAttribute;
-    private Set<Calendar> calendarSetAttribute;
-
-    // these are kind of pointless, but here for completeness
-    private Set<Boolean> booleanSetAttribute;
-
-    @DynamoDbHashKey
-    public String getKey() {
-        return key;
-    }
-
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    @DynamoDbRangeKey
-    public String getRangeKey() {
-        return rangeKey;
-    }
-
-    public void setRangeKey(String rangeKey) {
-        this.rangeKey = rangeKey;
-    }
-
-    @DynamoDbVersionAttribute
-    public Long getVersion() {
-        return version;
-    }
-
-    public void setVersion(Long version) {
-        this.version = version;
-    }
-
-    public String lastUpdater() {
-        return lastUpdater;
-    }
-
-    public void setLastUpdater(String lastUpdater) {
-        this.lastUpdater = lastUpdater;
-    }
-
-    public Integer getIntegerAttribute() {
-        return integerAttribute;
-    }
-
-    public void setIntegerAttribute(Integer integerAttribute) {
-        this.integerAttribute = integerAttribute;
-    }
-
-    public Long longAttribute() {
-        return longAttribute;
-    }
-
-    public void setLongAttribute(Long longAttribute) {
-        this.longAttribute = longAttribute;
-    }
-
-    public Double getDoubleAttribute() {
-        return doubleAttribute;
-    }
-
-    public void setDoubleAttribute(Double doubleAttribute) {
-        this.doubleAttribute = doubleAttribute;
-    }
-
-    public Float getFloatAttribute() {
-        return floatAttribute;
-    }
-
-    public void setFloatAttribute(Float floatAttribute) {
-        this.floatAttribute = floatAttribute;
-    }
-
-    public BigDecimal bigDecimalAttribute() {
-        return bigDecimalAttribute;
-    }
-
-    public void setBigDecimalAttribute(BigDecimal bigDecimalAttribute) {
-        this.bigDecimalAttribute = bigDecimalAttribute;
-    }
-
-    public BigInteger bigIntegerAttribute() {
-        return bigIntegerAttribute;
-    }
-
-    public void setBigIntegerAttribute(BigInteger bigIntegerAttribute) {
-        this.bigIntegerAttribute = bigIntegerAttribute;
-    }
-
-    public Byte byteAttribute() {
-        return byteAttribute;
-    }
-
-    public void setByteAttribute(Byte byteAttribute) {
-        this.byteAttribute = byteAttribute;
-    }
-
-    public Date getDateAttribute() {
-        return dateAttribute;
-    }
-
-    public void setDateAttribute(Date dateAttribute) {
-        this.dateAttribute = dateAttribute;
-    }
-
-    public Calendar getCalendarAttribute() {
-        return calendarAttribute;
-    }
-
-    public void setCalendarAttribute(Calendar calendarAttribute) {
-        this.calendarAttribute = calendarAttribute;
-    }
-
-    public Boolean booleanAttribute() {
-        return booleanAttribute;
-    }
-
-    public void setBooleanAttribute(Boolean booleanAttribute) {
-        this.booleanAttribute = booleanAttribute;
-    }
-
-    public Set<Integer> getIntegerSetAttribute() {
-        return integerSetAttribute;
-    }
-
-    public void setIntegerSetAttribute(Set<Integer> integerSetAttribute) {
-        this.integerSetAttribute = integerSetAttribute;
-    }
-
-    public Set<Double> getDoubleSetAttribute() {
-        return doubleSetAttribute;
-    }
-
-    public void setDoubleSetAttribute(Set<Double> doubleSetAttribute) {
-        this.doubleSetAttribute = doubleSetAttribute;
-    }
-
-    public Set<Float> getFloatSetAttribute() {
-        return floatSetAttribute;
-    }
-
-    public void setFloatSetAttribute(Set<Float> floatSetAttribute) {
-        this.floatSetAttribute = floatSetAttribute;
-    }
-
-    public Set<BigDecimal> bigDecimalSetAttribute() {
-        return bigDecimalSetAttribute;
-    }
-
-    public void setBigDecimalSetAttribute(Set<BigDecimal> bigDecimalSetAttribute) {
-        this.bigDecimalSetAttribute = bigDecimalSetAttribute;
-    }
-
-    public Set<BigInteger> bigIntegerSetAttribute() {
-        return bigIntegerSetAttribute;
-    }
-
-    public void setBigIntegerSetAttribute(Set<BigInteger> bigIntegerSetAttribute) {
-        this.bigIntegerSetAttribute = bigIntegerSetAttribute;
-    }
-
-    public Set<Long> longSetAttribute() {
-        return longSetAttribute;
-    }
-
-    public void setLongSetAttribute(Set<Long> longSetAttribute) {
-        this.longSetAttribute = longSetAttribute;
-    }
-
-    public Set<Byte> byteSetAttribute() {
-        return byteSetAttribute;
-    }
-
-    public void setByteSetAttribute(Set<Byte> byteSetAttribute) {
-        this.byteSetAttribute = byteSetAttribute;
-    }
-
-    public Set<Date> getDateSetAttribute() {
-        return dateSetAttribute;
-    }
-
-    public void setDateSetAttribute(Set<Date> dateSetAttribute) {
-        this.dateSetAttribute = dateSetAttribute;
-    }
-
-    public Set<Calendar> getCalendarSetAttribute() {
-        return calendarSetAttribute;
-    }
-
-    public void setCalendarSetAttribute(Set<Calendar> calendarSetAttribute) {
-        this.calendarSetAttribute = calendarSetAttribute;
-    }
-
-    public Set<Boolean> booleanSetAttribute() {
-        return booleanSetAttribute;
-    }
-
-    public void setBooleanSetAttribute(Set<Boolean> booleanSetAttribute) {
-        this.booleanSetAttribute = booleanSetAttribute;
-    }
-
-    public Set<String> stringSetAttribute() {
-        return stringSetAttribute;
-    }
-
-    public void setStringSetAttribute(Set<String> stringSetAttribute) {
-        this.stringSetAttribute = stringSetAttribute;
-    }
-
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + ((bigDecimalAttribute == null) ? 0 : bigDecimalAttribute.hashCode());
-        result = prime * result + ((bigDecimalSetAttribute == null) ? 0 : bigDecimalSetAttribute.hashCode());
-        result = prime * result + ((bigIntegerAttribute == null) ? 0 : bigIntegerAttribute.hashCode());
-        result = prime * result + ((bigIntegerSetAttribute == null) ? 0 : bigIntegerSetAttribute.hashCode());
-        result = prime * result + ((booleanAttribute == null) ? 0 : booleanAttribute.hashCode());
-        result = prime * result + ((booleanSetAttribute == null) ? 0 : booleanSetAttribute.hashCode());
-        result = prime * result + ((byteAttribute == null) ? 0 : byteAttribute.hashCode());
-        result = prime * result + ((byteSetAttribute == null) ? 0 : byteSetAttribute.hashCode());
-        result = prime * result + ((calendarAttribute == null) ? 0 : calendarAttribute.hashCode());
-        result = prime * result + ((calendarSetAttribute == null) ? 0 : calendarSetAttribute.hashCode());
-        result = prime * result + ((dateAttribute == null) ? 0 : dateAttribute.hashCode());
-        result = prime * result + ((dateSetAttribute == null) ? 0 : dateSetAttribute.hashCode());
-        result = prime * result + ((doubleAttribute == null) ? 0 : doubleAttribute.hashCode());
-        result = prime * result + ((doubleSetAttribute == null) ? 0 : doubleSetAttribute.hashCode());
-        result = prime * result + ((floatAttribute == null) ? 0 : floatAttribute.hashCode());
-        result = prime * result + ((floatSetAttribute == null) ? 0 : floatSetAttribute.hashCode());
-        result = prime * result + ((integerAttribute == null) ? 0 : integerAttribute.hashCode());
-        result = prime * result + ((integerSetAttribute == null) ? 0 : integerSetAttribute.hashCode());
-        result = prime * result + ((key == null) ? 0 : key.hashCode());
-        result = prime * result + ((lastUpdater == null) ? 0 : lastUpdater.hashCode());
-        result = prime * result + ((longAttribute == null) ? 0 : longAttribute.hashCode());
-        result = prime * result + ((longSetAttribute == null) ? 0 : longSetAttribute.hashCode());
-        result = prime * result + ((rangeKey == null) ? 0 : rangeKey.hashCode());
-        result = prime * result + ((stringSetAttribute == null) ? 0 : stringSetAttribute.hashCode());
-        result = prime * result + ((version == null) ? 0 : version.hashCode());
-        return result;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        CrossSdkVerificationClass other = (CrossSdkVerificationClass) obj;
-        if (bigDecimalAttribute == null) {
-            if (other.bigDecimalAttribute != null) {
-                return false;
-            }
-        } else if (!bigDecimalAttribute.equals(other.bigDecimalAttribute)) {
-            return false;
-        }
-        if (bigDecimalSetAttribute == null) {
-            if (other.bigDecimalSetAttribute != null) {
-                return false;
-            }
-        } else if (!bigDecimalSetAttribute.equals(other.bigDecimalSetAttribute)) {
-            return false;
-        }
-        if (bigIntegerAttribute == null) {
-            if (other.bigIntegerAttribute != null) {
-                return false;
-            }
-        } else if (!bigIntegerAttribute.equals(other.bigIntegerAttribute)) {
-            return false;
-        }
-        if (bigIntegerSetAttribute == null) {
-            if (other.bigIntegerSetAttribute != null) {
-                return false;
-            }
-        } else if (!bigIntegerSetAttribute.equals(other.bigIntegerSetAttribute)) {
-            return false;
-        }
-        if (booleanAttribute == null) {
-            if (other.booleanAttribute != null) {
-                return false;
-            }
-        } else if (!booleanAttribute.equals(other.booleanAttribute)) {
-            return false;
-        }
-        if (booleanSetAttribute == null) {
-            if (other.booleanSetAttribute != null) {
-                return false;
-            }
-        } else if (!booleanSetAttribute.equals(other.booleanSetAttribute)) {
-            return false;
-        }
-        if (byteAttribute == null) {
-            if (other.byteAttribute != null) {
-                return false;
-            }
-        } else if (!byteAttribute.equals(other.byteAttribute)) {
-            return false;
-        }
-        if (byteSetAttribute == null) {
-            if (other.byteSetAttribute != null) {
-                return false;
-            }
-        } else if (!byteSetAttribute.equals(other.byteSetAttribute)) {
-            return false;
-        }
-        if (calendarAttribute == null) {
-            if (other.calendarAttribute != null) {
-                return false;
-            }
-        } else if (!calendarAttribute.equals(other.calendarAttribute)) {
-            return false;
-        }
-        if (calendarSetAttribute == null) {
-            if (other.calendarSetAttribute != null) {
-                return false;
-            }
-        } else if (!calendarSetAttribute.equals(other.calendarSetAttribute)) {
-            return false;
-        }
-        if (dateAttribute == null) {
-            if (other.dateAttribute != null) {
-                return false;
-            }
-        } else if (!dateAttribute.equals(other.dateAttribute)) {
-            return false;
-        }
-        if (dateSetAttribute == null) {
-            if (other.dateSetAttribute != null) {
-                return false;
-            }
-        } else if (!dateSetAttribute.equals(other.dateSetAttribute)) {
-            return false;
-        }
-        if (doubleAttribute == null) {
-            if (other.doubleAttribute != null) {
-                return false;
-            }
-        } else if (!doubleAttribute.equals(other.doubleAttribute)) {
-            return false;
-        }
-        if (doubleSetAttribute == null) {
-            if (other.doubleSetAttribute != null) {
-                return false;
-            }
-        } else if (!doubleSetAttribute.equals(other.doubleSetAttribute)) {
-            return false;
-        }
-        if (floatAttribute == null) {
-            if (other.floatAttribute != null) {
-                return false;
-            }
-        } else if (!floatAttribute.equals(other.floatAttribute)) {
-            return false;
-        }
-        if (floatSetAttribute == null) {
-            if (other.floatSetAttribute != null) {
-                return false;
-            }
-        } else if (!floatSetAttribute.equals(other.floatSetAttribute)) {
-            return false;
-        }
-        if (integerAttribute == null) {
-            if (other.integerAttribute != null) {
-                return false;
-            }
-        } else if (!integerAttribute.equals(other.integerAttribute)) {
-            return false;
-        }
-        if (integerSetAttribute == null) {
-            if (other.integerSetAttribute != null) {
-                return false;
-            }
-        } else if (!integerSetAttribute.equals(other.integerSetAttribute)) {
-            return false;
-        }
-        if (key == null) {
-            if (other.key != null) {
-                return false;
-            }
-        } else if (!key.equals(other.key)) {
-            return false;
-        }
-        if (lastUpdater == null) {
-            if (other.lastUpdater != null) {
-                return false;
-            }
-        } else if (!lastUpdater.equals(other.lastUpdater)) {
-            return false;
-        }
-        if (longAttribute == null) {
-            if (other.longAttribute != null) {
-                return false;
-            }
-        } else if (!longAttribute.equals(other.longAttribute)) {
-            return false;
-        }
-        if (longSetAttribute == null) {
-            if (other.longSetAttribute != null) {
-                return false;
-            }
-        } else if (!longSetAttribute.equals(other.longSetAttribute)) {
-            return false;
-        }
-        if (rangeKey == null) {
-            if (other.rangeKey != null) {
-                return false;
-            }
-        } else if (!rangeKey.equals(other.rangeKey)) {
-            return false;
-        }
-        if (stringSetAttribute == null) {
-            if (other.stringSetAttribute != null) {
-                return false;
-            }
-        } else if (!stringSetAttribute.equals(other.stringSetAttribute)) {
-            return false;
-        }
-        if (version == null) {
-            if (other.version != null) {
-                return false;
-            }
-        } else if (!version.equals(other.version)) {
-            return false;
-        }
-        return true;
-    }
-
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/pojos/Currency.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/pojos/Currency.java
deleted file mode 100644
index 8b5936b6f6c5..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/pojos/Currency.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.pojos;
-
-/**
- * A currency object.
- */
-public class Currency {
-    private KeyAndVal<Double, String> kav;
-
-    public Currency(final Double amount, final String unit) {
-        this.kav = new KeyAndVal(amount, unit);
-    }
-
-    public Currency() {
-        this((Double) null, (String) null);
-    }
-
-    public Double getAmount() {
-        return kav.getKey();
-    }
-
-    public void setAmount(final Double amount) {
-        kav.setKey(amount);
-    }
-
-    public String getUnit() {
-        return kav.getVal();
-    }
-
-    public void setUnit(final String unit) {
-        kav.setVal(unit);
-    }
-
-    @Override
-    public final boolean equals(final Object o) {
-        return (o == this || (o instanceof Currency && kav.equals(((Currency) o).kav)));
-    }
-
-    @Override
-    public final int hashCode() {
-        return kav.hashCode();
-    }
-
-    @Override
-    public final String toString() {
-        return kav.toString();
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/pojos/DateRange.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/pojos/DateRange.java
deleted file mode 100644
index b40269c8021d..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/pojos/DateRange.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.pojos;
-
-import java.util.Date;
-
-/**
- * A date range object.
- */
-public class DateRange {
-    private KeyAndVal<Date, Date> kav;
-
-    public DateRange(final Date start, final Date end) {
-        this.kav = new KeyAndVal(start, end);
-    }
-
-    public DateRange(final Date date, final Long start, final Long end) {
-        this(start == null ? null : new Date(date.getTime() + start), end == null ? null : new Date(date.getTime() + end));
-    }
-
-    public DateRange() {
-        this((Date) null, (Date) null);
-    }
-
-    public Date getStart() {
-        return kav.getKey();
-    }
-
-    public void setStart(final Date start) {
-        kav.setKey(start);
-    }
-
-    public Date getEnd() {
-        return kav.getVal();
-    }
-
-    public void setEnd(final Date end) {
-        kav.setVal(end);
-    }
-
-    @Override
-    public final boolean equals(final Object o) {
-        return (o == this || (o instanceof DateRange && kav.equals(((DateRange) o).kav)));
-    }
-
-    @Override
-    public final int hashCode() {
-        return kav.hashCode();
-    }
-
-    @Override
-    public final String toString() {
-        return kav.toString();
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/pojos/GsiWithAlwaysUpdateTimestamp.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/pojos/GsiWithAlwaysUpdateTimestamp.java
deleted file mode 100644
index 84f1179cd02a..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/pojos/GsiWithAlwaysUpdateTimestamp.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.pojos;
-
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbAutoGenerateStrategy;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbAutoGeneratedTimestamp;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbHashKey;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbIndexHashKey;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbRangeKey;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbTable;
-
-@DynamoDbTable(tableName = "Foo")
-public class GsiWithAlwaysUpdateTimestamp {
-
-    @DynamoDbHashKey
-    private String hashKey;
-
-    @DynamoDbRangeKey
-    private String rangeKey;
-
-    @DynamoDbAutoGeneratedTimestamp(strategy = DynamoDbAutoGenerateStrategy.ALWAYS)
-    @DynamoDbIndexHashKey(globalSecondaryIndexName = "last-mod-date")
-    private Long lastModifiedDate;
-
-    public String getHashKey() {
-        return hashKey;
-    }
-
-    public GsiWithAlwaysUpdateTimestamp setHashKey(String hashKey) {
-        this.hashKey = hashKey;
-        return this;
-    }
-
-    public String getRangeKey() {
-        return rangeKey;
-    }
-
-    public GsiWithAlwaysUpdateTimestamp setRangeKey(String rangeKey) {
-        this.rangeKey = rangeKey;
-        return this;
-    }
-
-    public Long getLastModifiedDate() {
-        return lastModifiedDate;
-    }
-
-    public GsiWithAlwaysUpdateTimestamp setLastModifiedDate(Long lastModifiedDate) {
-        this.lastModifiedDate = lastModifiedDate;
-        return this;
-    }
-
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/pojos/KeyAndVal.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/pojos/KeyAndVal.java
deleted file mode 100644
index fed9940c8b08..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/pojos/KeyAndVal.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.pojos;
-
-/**
- * Simple key-val domain class.
- */
-public class KeyAndVal<K, V> {
-    private K key;
-    private V val;
-
-    public KeyAndVal(final K key, final V val) {
-        this.key = key;
-        this.val = val;
-    }
-
-    public KeyAndVal() {
-        this((K) null, (V) null);
-    }
-
-    public K getKey() {
-        return this.key;
-    }
-
-    public void setKey(final K key) {
-        this.key = key;
-    }
-
-    public V getVal() {
-        return this.val;
-    }
-
-    public void setVal(final V val) {
-        this.val = val;
-    }
-
-    public final boolean keyEquals(final Object o) {
-        return key == o || (key != null && key.equals(o));
-    }
-
-    public final boolean valEquals(final Object o) {
-        return val == o || (val != null && val.equals(o));
-    }
-
-    @Override
-    public final boolean equals(final Object o) {
-        return o == this || (o instanceof KeyAndVal && keyEquals(((KeyAndVal) o).key) && valEquals(((KeyAndVal) o).val));
-    }
-
-    @Override
-    public final int hashCode() {
-        return 1 + (key == null ? 0 : key.hashCode()) + (val == null ? 0 : val.hashCode());
-    }
-
-    @Override
-    public final String toString() {
-        return "[" + key + "," + val + "]";
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/pojos/PhoneNumber.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/pojos/PhoneNumber.java
deleted file mode 100644
index 5c023a9f84bf..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/pojos/PhoneNumber.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.pojos;
-
-/**
- * A phone number object.
- */
-public class PhoneNumber {
-
-    private String areaCode;
-    private String exchange;
-    private String subscriber;
-
-    public PhoneNumber(final String areaCode, final String exchange, final String subscriber) {
-        setAreaCode(areaCode);
-        setExchange(exchange);
-        setSubscriber(subscriber);
-    }
-
-    public PhoneNumber() {
-        this(null, null, null);
-    }
-
-    public String getAreaCode() {
-        return this.areaCode;
-    }
-
-    public void setAreaCode(final String areaCode) {
-        this.areaCode = areaCode;
-    }
-
-    public String getExchange() {
-        return this.exchange;
-    }
-
-    public void setExchange(final String exchange) {
-        this.exchange = exchange;
-    }
-
-    public String getSubscriber() {
-        return this.subscriber;
-    }
-
-    public void setSubscriber(String subscriber) {
-        this.subscriber = subscriber;
-    }
-
-    public final boolean areaCodeEquals(final Object o) {
-        return (areaCode == o || (areaCode != null && areaCode.equals(o)));
-    }
-
-    public final boolean exchangeEquals(final Object o) {
-        return (exchange == o || (exchange != null && exchange.equals(o)));
-    }
-
-    public final boolean subscriberEquals(final Object o) {
-        return (subscriber == o || (subscriber != null && subscriber.equals(o)));
-    }
-
-    @Override
-    public final boolean equals(final Object o) {
-        return (o == this || (o instanceof PhoneNumber && areaCodeEquals(((PhoneNumber) o).areaCode) && exchangeEquals(((PhoneNumber) o).exchange) && subscriberEquals(((PhoneNumber) o).subscriber)));
-    }
-
-    @Override
-    public final int hashCode() {
-        return (1 + (areaCode == null ? 0 : areaCode.hashCode()) + (exchange == null ? 0 : exchange.hashCode()) + (subscriber == null ? 0 : subscriber.hashCode()));
-    }
-
-    @Override
-    public final String toString() {
-        return (getClass().getName() + "{areaCode=" + areaCode + ",exchange=" + exchange + ",subscriber=" + subscriber + "}");
-    }
-
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/pojos/RangeKeyClass.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/pojos/RangeKeyClass.java
deleted file mode 100644
index fdeb5940d0a3..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/pojos/RangeKeyClass.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.pojos;
-
-import java.math.BigDecimal;
-import java.util.Set;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbAttribute;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbHashKey;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbRangeKey;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbTable;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbVersionAttribute;
-
-/**
- * Comprehensive domain class
- */
-@DynamoDbTable(tableName = "aws-java-sdk-range-test")
-public class RangeKeyClass {
-
-    private long key;
-    private double rangeKey;
-    private Long version;
-
-    private Set<Integer> integerSetAttribute;
-    private Set<String> stringSetAttribute;
-    private BigDecimal bigDecimalAttribute;
-    private String stringAttribute;
-
-    @DynamoDbHashKey
-    public long getKey() {
-        return key;
-    }
-
-    public void setKey(long key) {
-        this.key = key;
-    }
-
-    @DynamoDbRangeKey
-    public double getRangeKey() {
-        return rangeKey;
-    }
-
-    public void setRangeKey(double rangeKey) {
-        this.rangeKey = rangeKey;
-    }
-
-    @DynamoDbAttribute(attributeName = "integerSetAttribute")
-    public Set<Integer> getIntegerAttribute() {
-        return integerSetAttribute;
-    }
-
-    public void setIntegerAttribute(Set<Integer> integerAttribute) {
-        this.integerSetAttribute = integerAttribute;
-    }
-
-    @DynamoDbAttribute
-    public Set<String> getStringSetAttribute() {
-        return stringSetAttribute;
-    }
-
-    public void setStringSetAttribute(Set<String> stringSetAttribute) {
-        this.stringSetAttribute = stringSetAttribute;
-    }
-
-    @DynamoDbAttribute
-    public BigDecimal getBigDecimalAttribute() {
-        return bigDecimalAttribute;
-    }
-
-    public void setBigDecimalAttribute(BigDecimal bigDecimalAttribute) {
-        this.bigDecimalAttribute = bigDecimalAttribute;
-    }
-
-    @DynamoDbAttribute
-    public String getStringAttribute() {
-        return stringAttribute;
-    }
-
-    public void setStringAttribute(String stringAttribute) {
-        this.stringAttribute = stringAttribute;
-    }
-
-    @DynamoDbVersionAttribute
-    public Long getVersion() {
-        return version;
-    }
-
-    public void setVersion(Long version) {
-        this.version = version;
-    }
-
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + ((bigDecimalAttribute == null) ? 0 : bigDecimalAttribute.hashCode());
-        result = prime * result + ((integerSetAttribute == null) ? 0 : integerSetAttribute.hashCode());
-        result = prime * result + (int) (key ^ (key >>> 32));
-        long temp;
-        temp = Double.doubleToLongBits(rangeKey);
-        result = prime * result + (int) (temp ^ (temp >>> 32));
-        result = prime * result + ((stringAttribute == null) ? 0 : stringAttribute.hashCode());
-        result = prime * result + ((stringSetAttribute == null) ? 0 : stringSetAttribute.hashCode());
-        result = prime * result + ((version == null) ? 0 : version.hashCode());
-        return result;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        RangeKeyClass other = (RangeKeyClass) obj;
-        if (bigDecimalAttribute == null) {
-            if (other.bigDecimalAttribute != null) {
-                return false;
-            }
-        } else if (!bigDecimalAttribute.equals(other.bigDecimalAttribute)) {
-            return false;
-        }
-        if (integerSetAttribute == null) {
-            if (other.integerSetAttribute != null) {
-                return false;
-            }
-        } else if (!integerSetAttribute.equals(other.integerSetAttribute)) {
-            return false;
-        }
-        if (key != other.key) {
-            return false;
-        }
-        if (Double.doubleToLongBits(rangeKey) != Double.doubleToLongBits(other.rangeKey)) {
-            return false;
-        }
-        if (stringAttribute == null) {
-            if (other.stringAttribute != null) {
-                return false;
-            }
-        } else if (!stringAttribute.equals(other.stringAttribute)) {
-            return false;
-        }
-        if (stringSetAttribute == null) {
-            if (other.stringSetAttribute != null) {
-                return false;
-            }
-        } else if (!stringSetAttribute.equals(other.stringSetAttribute)) {
-            return false;
-        }
-        if (version == null) {
-            if (other.version != null) {
-                return false;
-            }
-        } else if (!version.equals(other.version)) {
-            return false;
-        }
-        return true;
-    }
-
-    @Override
-    public String toString() {
-        return "RangeKeyClass [key=" + key + ", rangeKey=" + rangeKey + ", version=" + version
-               + ", integerSetAttribute=" + integerSetAttribute + ", stringSetAttribute=" + stringSetAttribute
-               + ", bigDecimalAttribute=" + bigDecimalAttribute + ", stringAttribute=" + stringAttribute + "]";
-    }
-
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/pojos/S3LinksTestClass.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/pojos/S3LinksTestClass.java
deleted file mode 100644
index 11ef37ee2eb9..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/pojos/S3LinksTestClass.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.pojos;
-
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbHashKey;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbTable;
-import software.amazon.awssdk.services.dynamodb.datamodeling.S3Link;
-
-/**
- * Test domain class with a single string key, and two S3Links
- */
-@DynamoDbTable(tableName = "aws-java-sdk-util")
-public class S3LinksTestClass {
-
-    private String key;
-    private S3Link s3LinkWest;
-    private S3Link s3LinkEast;
-
-    @DynamoDbHashKey
-    public String getKey() {
-        return key;
-    }
-
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    public S3LinksTestClass withKey(String key) {
-        setKey(key);
-        return this;
-    }
-
-    public S3Link s3LinkWest() {
-        return s3LinkWest;
-    }
-
-    public void setS3LinkWest(S3Link s3LinkAttribute) {
-        this.s3LinkWest = s3LinkAttribute;
-    }
-
-    public S3Link s3LinkEast() {
-        return s3LinkEast;
-    }
-
-    public void setS3LinkEast(S3Link s3LinkEast) {
-        this.s3LinkEast = s3LinkEast;
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/pojos/StringAttributeClass.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/pojos/StringAttributeClass.java
deleted file mode 100644
index 9df6e653868d..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/pojos/StringAttributeClass.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.pojos;
-
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbAttribute;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbHashKey;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbTable;
-
-/**
- * Test domain class with a single string attribute and a string key
- */
-@DynamoDbTable(tableName = "aws-java-sdk-util")
-public class StringAttributeClass {
-
-    private String key;
-    private String stringAttribute;
-    private String renamedAttribute;
-
-    @DynamoDbHashKey
-    public String getKey() {
-        return key;
-    }
-
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    @DynamoDbAttribute
-    public String getStringAttribute() {
-        return stringAttribute;
-    }
-
-    public void setStringAttribute(String stringAttribute) {
-        this.stringAttribute = stringAttribute;
-    }
-
-    @DynamoDbAttribute(attributeName = "originalName")
-    public String getRenamedAttribute() {
-        return renamedAttribute;
-    }
-
-    public void setRenamedAttribute(String renamedAttribute) {
-        this.renamedAttribute = renamedAttribute;
-    }
-
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + ((key == null) ? 0 : key.hashCode());
-        result = prime * result + ((renamedAttribute == null) ? 0 : renamedAttribute.hashCode());
-        result = prime * result + ((stringAttribute == null) ? 0 : stringAttribute.hashCode());
-        return result;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        StringAttributeClass other = (StringAttributeClass) obj;
-        if (key == null) {
-            if (other.key != null) {
-                return false;
-            }
-        } else if (!key.equals(other.key)) {
-            return false;
-        }
-        if (renamedAttribute == null) {
-            if (other.renamedAttribute != null) {
-                return false;
-            }
-        } else if (!renamedAttribute.equals(other.renamedAttribute)) {
-            return false;
-        }
-        if (stringAttribute == null) {
-            if (other.stringAttribute != null) {
-                return false;
-            }
-        } else if (!stringAttribute.equals(other.stringAttribute)) {
-            return false;
-        }
-        return true;
-    }
-
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/pojos/StringSetAttributeClass.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/pojos/StringSetAttributeClass.java
deleted file mode 100644
index 716c3512c19e..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/pojos/StringSetAttributeClass.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.pojos;
-
-import java.util.Set;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbAttribute;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbHashKey;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbTable;
-
-/**
- * Test domain class with a string set attribute and a string key
- */
-@DynamoDbTable(tableName = "aws-java-sdk-util")
-public class StringSetAttributeClass {
-
-    private String key;
-    private Set<String> stringSetAttribute;
-    private Set<String> StringSetAttributeRenamed;
-
-    @DynamoDbHashKey
-    public String getKey() {
-        return key;
-    }
-
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    @DynamoDbAttribute
-    public Set<String> getStringSetAttribute() {
-        return stringSetAttribute;
-    }
-
-    public void setStringSetAttribute(Set<String> stringSetAttribute) {
-        this.stringSetAttribute = stringSetAttribute;
-    }
-
-    @DynamoDbAttribute(attributeName = "originalName")
-    public Set<String> getStringSetAttributeRenamed() {
-        return StringSetAttributeRenamed;
-    }
-
-    public void setStringSetAttributeRenamed(Set<String> stringSetAttributeRenamed) {
-        StringSetAttributeRenamed = stringSetAttributeRenamed;
-    }
-
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + ((StringSetAttributeRenamed == null) ? 0 : StringSetAttributeRenamed.hashCode());
-        result = prime * result + ((key == null) ? 0 : key.hashCode());
-        result = prime * result + ((stringSetAttribute == null) ? 0 : stringSetAttribute.hashCode());
-        return result;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        StringSetAttributeClass other = (StringSetAttributeClass) obj;
-        if (StringSetAttributeRenamed == null) {
-            if (other.StringSetAttributeRenamed != null) {
-                return false;
-            }
-        } else if (!StringSetAttributeRenamed.equals(other.StringSetAttributeRenamed)) {
-            return false;
-        }
-        if (key == null) {
-            if (other.key != null) {
-                return false;
-            }
-        } else if (!key.equals(other.key)) {
-            return false;
-        }
-        if (stringSetAttribute == null) {
-            if (other.stringSetAttribute != null) {
-                return false;
-            }
-        } else if (!stringSetAttribute.equals(other.stringSetAttribute)) {
-            return false;
-        }
-        return true;
-    }
-
-
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/pojos/SubClass.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/pojos/SubClass.java
deleted file mode 100644
index a0eec5bd30fb..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/pojos/SubClass.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.pojos;
-
-import java.nio.ByteBuffer;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbDocument;
-
-@DynamoDbDocument
-public class SubClass {
-
-    private String name;
-    private Integer value;
-    private ByteBuffer bb;
-
-    public SubClass() {
-        name = "name";
-        value = 123;
-    }
-
-    public static <T> boolean equals(T one, T two) {
-        if (one == null) {
-            return (two == null);
-        } else {
-            return one.equals(two);
-        }
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String n) {
-        name = n;
-    }
-
-    public Integer getValue() {
-        return value;
-    }
-
-    public void setValue(Integer i) {
-        value = i;
-    }
-
-    public ByteBuffer getNull() {
-        return bb;
-    }
-
-    public void setNull(ByteBuffer b) {
-        bb = b;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (!(o instanceof SubClass)) {
-            return false;
-        }
-
-        SubClass that = (SubClass) o;
-
-        return equals(this.name, that.name)
-                && equals(this.value, that.value)
-                && equals(this.bb, that.bb);
-    }
-
-    @Override
-    public String toString() {
-        return "{name=" + name + ", value=" + value + ", bb=" + bb + "}";
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/pojos/TestClass.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/pojos/TestClass.java
deleted file mode 100644
index c426da394976..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/pojos/TestClass.java
+++ /dev/null
@@ -1,382 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.pojos;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.nio.ByteBuffer;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbHashKey;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbMarshalling;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbNativeBoolean;
-import software.amazon.awssdk.services.dynamodb.datamodeling.DynamoDbTable;
-import software.amazon.awssdk.services.dynamodb.datamodeling.RandomUuidMarshaller;
-import software.amazon.awssdk.services.dynamodb.datamodeling.S3Link;
-
-@DynamoDbTable(tableName = "nonexisting-test-tablename")
-public class TestClass {
-
-    @DynamoDbHashKey
-    public String getId() {
-        return null;
-    }
-
-    public void setId(String id) {
-    }
-
-    public boolean getBoolean() {
-        return false;
-    }
-
-    public void setBoolean(boolean value) {
-    }
-
-    public Boolean getBoxedBoolean() {
-        return false;
-    }
-
-    public void setBoxedBoolean(Boolean value) {
-    }
-
-    @DynamoDbNativeBoolean
-    public boolean getNativeBoolean() {
-        return false;
-    }
-
-    public void setNativeBoolean(boolean value) {
-    }
-
-    public String getString() {
-        return null;
-    }
-
-    public void setString(String value) {
-    }
-
-    public UUID getUuid() {
-        return null;
-    }
-
-    public void setUuid(UUID u) {
-    }
-
-    @DynamoDbMarshalling(marshallerClass = RandomUuidMarshaller.class)
-    public String getCustomString() {
-        return null;
-    }
-
-    public void setCustomString(String s) {
-    }
-
-    public Date getDate() {
-        return null;
-    }
-
-    public void setDate(Date d) {
-    }
-
-    public Calendar getCalendar() {
-        return null;
-    }
-
-    public void setCalendar(Calendar c) {
-    }
-
-    public byte getByte() {
-        return 0;
-    }
-
-    public void setByte(byte b) {
-    }
-
-    public Byte getBoxedByte() {
-        return 0;
-    }
-
-    public void setBoxedByte(Byte b) {
-    }
-
-    public short getShort() {
-        return 0;
-    }
-
-    public void setShort(short s) {
-    }
-
-    public Short getBoxedShort() {
-        return 0;
-    }
-
-    public void setBoxedShort(Short s) {
-    }
-
-    public int getInt() {
-        return 0;
-    }
-
-    public void setInt(int i) {
-    }
-
-    public Integer getBoxedInt() {
-        return 0;
-    }
-
-    public void setBoxedInt(Integer i) {
-    }
-
-    public long getLong() {
-        return 0;
-    }
-
-    public void setLong(long l) {
-    }
-
-    public Long getBoxedLong() {
-        return 0l;
-    }
-
-    public void setBoxedLong(Long l) {
-    }
-
-    public BigInteger getBigInt() {
-        return BigInteger.ZERO;
-    }
-
-    public void setBigInt(BigInteger i) {
-    }
-
-    public float getFloat() {
-        return 0;
-    }
-
-    public void setFloat(float f) {
-    }
-
-    public Float getBoxedFloat() {
-        return 0f;
-    }
-
-    public void setBoxedFloat(Float f) {
-    }
-
-    public double getDouble() {
-        return 0;
-    }
-
-    public void setDouble(double d) {
-    }
-
-    public Double getBoxedDouble() {
-        return 0d;
-    }
-
-    public void setBoxedDouble(Double d) {
-    }
-
-    public BigDecimal getBigDecimal() {
-        return BigDecimal.ZERO;
-    }
-
-    public void setBigDecimal(BigDecimal d) {
-    }
-
-    public byte[] getByteArray() {
-        return null;
-    }
-
-    public void setByteArray(byte[] b) {
-    }
-
-    public ByteBuffer getByteBuffer() {
-        return null;
-    }
-
-    public void setByteBuffer(ByteBuffer b) {
-    }
-
-    public Set<Boolean> getBooleanSet() {
-        return null;
-    }
-
-    public void setBooleanSet(Set<Boolean> s) {
-    }
-
-    public Set<UUID> getUuidSet() {
-        return null;
-    }
-
-    public void setUuidSet(Set<UUID> s) {
-    }
-
-    public Set<String> getStringSet() {
-        return null;
-    }
-
-    public void setStringSet(Set<String> s) {
-    }
-
-    public Set<Date> getDateSet() {
-        return null;
-    }
-
-    public void setDateSet(Set<Date> d) {
-    }
-
-    public Set<Calendar> getCalendarSet() {
-        return null;
-    }
-
-    public void setCalendarSet(Set<Calendar> c) {
-    }
-
-    public Set<Byte> getByteSet() {
-        return null;
-    }
-
-    public void setByteSet(Set<Byte> s) {
-    }
-
-    public Set<Short> getShortSet() {
-        return null;
-    }
-
-    public void setShortSet(Set<Short> s) {
-    }
-
-    public Set<Integer> getIntSet() {
-        return null;
-    }
-
-    public void setIntSet(Set<Integer> s) {
-    }
-
-    public Set<Long> getLongSet() {
-        return null;
-    }
-
-    public void setLongSet(Set<Long> s) {
-    }
-
-    public Set<BigInteger> getBigIntegerSet() {
-        return null;
-    }
-
-    public void setBigIntegerSet(Set<BigInteger> s) {
-    }
-
-    public Set<Float> getFloatSet() {
-        return null;
-    }
-
-    public void setFloatSet(Set<Float> s) {
-    }
-
-    public Set<Double> getDoubleSet() {
-        return null;
-    }
-
-    public void setDoubleSet(Set<Double> s) {
-    }
-
-    public Set<BigDecimal> getBigDecimalSet() {
-        return null;
-    }
-
-    public void setBigDecimalSet(Set<BigDecimal> s) {
-    }
-
-    public Set<byte[]> getByteArraySet() {
-        return null;
-    }
-
-    public void setByteArraySet(Set<byte[]> s) {
-    }
-
-    public Set<ByteBuffer> getByteBufferSet() {
-        return null;
-    }
-
-    public void setByteBufferSet(Set<ByteBuffer> s) {
-    }
-
-    public Set<SubClass> getObjectSet() {
-        return null;
-    }
-
-    public void setObjectSet(Set<SubClass> s) {
-    }
-
-    public List<String> getList() {
-        return null;
-    }
-
-    public void setList(List<String> l) {
-    }
-
-    public List<SubClass> getObjectList() {
-        return null;
-    }
-
-    public void setObjectList(List<SubClass> l) {
-    }
-
-    public List<Set<String>> getSetList() {
-        return null;
-    }
-
-    public void setSetList(List<Set<String>> l) {
-    }
-
-    public Map<String, String> getMap() {
-        return null;
-    }
-
-    public void setMap(Map<String, String> m) {
-    }
-
-    public Map<String, Set<String>> getSetMap() {
-        return null;
-    }
-
-    public void setSetMap(Map<String, Set<String>> m) {
-    }
-
-    public Map<Object, Object> getBogusMap() {
-        return null;
-    }
-
-    public void setBogusMap(Map<Object, Object> m) {
-    }
-
-    public SubClass getObject() {
-        return null;
-    }
-
-    public void setObject(SubClass c) {
-    }
-
-    public S3Link getS3Link() {
-        return null;
-    }
-
-    public void setS3Link(S3Link link) {
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/pojos/UnannotatedSubClass.java b/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/pojos/UnannotatedSubClass.java
deleted file mode 100644
index bb6247319954..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/software/amazon/awssdk/services/dynamodb/pojos/UnannotatedSubClass.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package software.amazon.awssdk.services.dynamodb.pojos;
-
-public class UnannotatedSubClass {
-    public UnannotatedSubClass getChild() {
-        return null;
-    }
-
-    public void setChild(UnannotatedSubClass c) {
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/utils/resources/RequiredResources.java b/test/dynamodbmapper-v1/src/test/java/utils/resources/RequiredResources.java
deleted file mode 100644
index 71d3f3f6434f..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/utils/resources/RequiredResources.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package utils.resources;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Annotation for resources required for the test case. It could be applied to
- * either a type (test class) or a method (test method).
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.METHOD, ElementType.TYPE})
-public @interface RequiredResources {
-
-    /**
-     * An array of RequiredResource annotations
-     */
-    RequiredResource[] value() default {};
-
-    enum ResourceCreationPolicy {
-        /**
-         * Existing resource will be reused if it matches the required resource
-         * definition (i.e. TestResource.getResourceStatus() returns AVAILABLE).
-         */
-        REUSE_EXISTING,
-        /**
-         * Always destroy existing resources (if any) and then recreate new ones for test.
-         */
-        ALWAYS_RECREATE;
-    }
-
-    enum ResourceRetentionPolicy {
-        /**
-         * Do not delete the created resource after test.
-         */
-        KEEP,
-        /**
-         * When used for @RequiredAnnota
-         */
-        DESTROY_IMMEDIATELY,
-        DESTROY_AFTER_ALL_TESTS;
-    }
-
-    @interface RequiredResource {
-
-        /**
-         * The Class object of the TestResource class
-         */
-        Class<? extends TestResource> resource();
-
-        /**
-         * How the resource should be created before the test starts.
-         */
-        ResourceCreationPolicy creationPolicy();
-
-        /**
-         * Retention policy after the test is done.
-         */
-        ResourceRetentionPolicy retentionPolicy();
-    }
-
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/utils/resources/ResourceCentricBlockJUnit4ClassRunner.java b/test/dynamodbmapper-v1/src/test/java/utils/resources/ResourceCentricBlockJUnit4ClassRunner.java
deleted file mode 100644
index 0cb576b15a18..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/utils/resources/ResourceCentricBlockJUnit4ClassRunner.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package utils.resources;
-
-import java.util.HashSet;
-import java.util.Set;
-import org.junit.Ignore;
-import org.junit.runner.Description;
-import org.junit.runner.notification.Failure;
-import org.junit.runner.notification.RunNotifier;
-import org.junit.runners.BlockJUnit4ClassRunner;
-import org.junit.runners.model.FrameworkMethod;
-import org.junit.runners.model.InitializationError;
-import org.junit.runners.model.Statement;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import utils.resources.RequiredResources.RequiredResource;
-import utils.resources.RequiredResources.ResourceRetentionPolicy;
-
-public class ResourceCentricBlockJUnit4ClassRunner extends BlockJUnit4ClassRunner {
-
-    private final Set<TestResource> resourcesToBeDestroyedAfterAllTests;
-
-    private final RequiredResources classRequiredResourcesAnnotation;
-
-    private final Logger log = LoggerFactory.getLogger(ResourceCentricBlockJUnit4ClassRunner.class);
-
-    public ResourceCentricBlockJUnit4ClassRunner(Class<?> klass)
-            throws InitializationError {
-        super(klass);
-
-        classRequiredResourcesAnnotation = klass.getAnnotation(RequiredResources.class);
-        resourcesToBeDestroyedAfterAllTests = new HashSet<TestResource>();
-    }
-
-    /**
-     *
-     */
-    private static TestResource createResourceInstance(RequiredResource resourceAnnotation)
-            throws InstantiationException, IllegalAccessException {
-        Class<? extends TestResource> resourceClazz = resourceAnnotation.resource();
-        if (resourceClazz == null) {
-            throw new IllegalArgumentException(
-                    "resource parameter is missing for the @RequiredResource annotation.");
-        }
-        return resourceClazz.newInstance();
-    }
-
-    @Override
-    protected void runChild(final FrameworkMethod method, RunNotifier notifier) {
-        Description description = describeChild(method);
-        if (method.getAnnotation(Ignore.class) != null) {
-            notifier.fireTestIgnored(description);
-        } else {
-            RequiredResources annotation = method.getAnnotation(RequiredResources.class);
-            if (annotation != null) {
-                try {
-                    beforeRunLeaf(annotation.value());
-                } catch (Exception e) {
-                    notifier.fireTestFailure(new Failure(description, e));
-                }
-
-            }
-
-            runLeaf(methodBlock(method), description, notifier);
-
-            if (annotation != null) {
-                try {
-                    afterRunLeaf(annotation.value());
-                } catch (Exception e) {
-                    notifier.fireTestFailure(new Failure(description, e));
-                }
-            }
-        }
-    }
-
-    /**
-     * Override the withBeforeClasses method to inject executing resource
-     * creation between @BeforeClass methods and test methods.
-     */
-    @Override
-    protected Statement withBeforeClasses(final Statement statement) {
-        Statement withRequiredResourcesCreation = new Statement() {
-
-            @Override
-            public void evaluate() throws Throwable {
-                if (classRequiredResourcesAnnotation != null) {
-                    beforeRunClass(classRequiredResourcesAnnotation.value());
-                }
-                statement.evaluate();
-            }
-        };
-        return super.withBeforeClasses(withRequiredResourcesCreation);
-    }
-
-    /**
-     * Override the withAfterClasses method to inject executing resource
-     * creation between test methods and the @AfterClass methods.
-     */
-    @Override
-    protected Statement withAfterClasses(final Statement statement) {
-        Statement withRequiredResourcesDeletion = new Statement() {
-
-            @Override
-            public void evaluate() throws Throwable {
-                statement.evaluate();
-                afterRunClass();
-            }
-        };
-        return super.withAfterClasses(withRequiredResourcesDeletion);
-    }
-
-    private void beforeRunClass(RequiredResource[] resourcesAnnotation)
-            throws InstantiationException, IllegalAccessException, InterruptedException {
-        log.debug("Processing @RequiredResources before running the test class...");
-        for (RequiredResource resourceAnnotation : resourcesAnnotation) {
-            TestResource resource = createResourceInstance(resourceAnnotation);
-            TestResourceUtils.createResource(resource, resourceAnnotation.creationPolicy());
-
-            if (resourceAnnotation.retentionPolicy() != ResourceRetentionPolicy.KEEP) {
-                resourcesToBeDestroyedAfterAllTests.add(resource);
-            }
-        }
-    }
-
-    private void afterRunClass()
-            throws InstantiationException, IllegalAccessException, InterruptedException {
-        log.debug("Processing @RequiredResources after running the test class...");
-        for (TestResource resource : resourcesToBeDestroyedAfterAllTests) {
-            TestResourceUtils.deleteResource(resource);
-        }
-    }
-
-    private void beforeRunLeaf(RequiredResource[] resourcesAnnotation)
-            throws InstantiationException, IllegalAccessException, InterruptedException {
-        log.debug("Processing @RequiredResources before running the test...");
-        for (RequiredResource resourceAnnotation : resourcesAnnotation) {
-            TestResource resource = createResourceInstance(resourceAnnotation);
-            TestResourceUtils.createResource(resource, resourceAnnotation.creationPolicy());
-
-            if (resourceAnnotation.retentionPolicy() == ResourceRetentionPolicy.DESTROY_AFTER_ALL_TESTS) {
-                resourcesToBeDestroyedAfterAllTests.add(resource);
-            }
-        }
-    }
-
-    private void afterRunLeaf(RequiredResource[] resourcesAnnotation)
-            throws InstantiationException, IllegalAccessException, InterruptedException {
-        log.debug("Processing @RequiredResources after running the test...");
-        for (RequiredResource resourceAnnotation : resourcesAnnotation) {
-            TestResource resource = createResourceInstance(resourceAnnotation);
-
-            if (resourceAnnotation.retentionPolicy() == ResourceRetentionPolicy.DESTROY_IMMEDIATELY) {
-                TestResourceUtils.deleteResource(resource);
-            }
-        }
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/utils/resources/TestResource.java b/test/dynamodbmapper-v1/src/test/java/utils/resources/TestResource.java
deleted file mode 100644
index 98736d15a401..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/utils/resources/TestResource.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package utils.resources;
-
-/**
- * An interface which represents a resource to be used in a test case.
- * <p>
- * Note that sub-classes implementing this interface must provide a no-arg
- * constructor.
- */
-public interface TestResource {
-
-    /**
-     * Create/initialize the resource which this TestResource represents.
-     *
-     * @param waitTillFinished Whether this method should block until the resource is fully
-     *                         initialized.
-     */
-    void create(boolean waitTillFinished);
-
-    /**
-     * Delete the resource which this TestResource represents.
-     *
-     * @param waitTillFinished Whether this method should block until the resource is fully
-     *                         initialized.
-     */
-    void delete(boolean waitTillFinished);
-
-    /**
-     * Returns the current status of the resource which this TestResource
-     * represents.
-     */
-    ResourceStatus getResourceStatus();
-
-    /**
-     * Enum of all the generalized resource statuses.
-     */
-    enum ResourceStatus {
-        /**
-         * The resource is currently available, and it is compatible with the
-         * required resource.
-         */
-        AVAILABLE,
-        /**
-         * The resource does not exist and there is no existing resource that is
-         * incompatible.
-         */
-        NOT_EXIST,
-        /**
-         * There is an existing resource that has to be removed before creating
-         * the required resource. For example, DDB table with the same name but
-         * different table schema.
-         */
-        EXIST_INCOMPATIBLE_RESOURCE,
-        /**
-         * The resource is in transient state (e.g. creating/deleting/updating)
-         */
-        TRANSIENT,
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/utils/resources/TestResourceUtils.java b/test/dynamodbmapper-v1/src/test/java/utils/resources/TestResourceUtils.java
deleted file mode 100644
index 5f11cb7244c5..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/utils/resources/TestResourceUtils.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package utils.resources;
-
-import software.amazon.awssdk.testutils.Waiter;
-import software.amazon.awssdk.utils.Logger;
-import utils.resources.RequiredResources.ResourceCreationPolicy;
-import utils.resources.TestResource.ResourceStatus;
-
-
-public class TestResourceUtils {
-    private static final Logger log = Logger.loggerFor(TestResourceUtils.class);
-
-    public static void createResource(TestResource resource, ResourceCreationPolicy policy) throws InterruptedException {
-        TestResource.ResourceStatus finalizedStatus = waitForFinalizedStatus(resource);
-        if (policy == ResourceCreationPolicy.ALWAYS_RECREATE) {
-            if (finalizedStatus != ResourceStatus.NOT_EXIST) {
-                resource.delete(true);
-            }
-            resource.create(true);
-        } else if (policy == ResourceCreationPolicy.REUSE_EXISTING) {
-            switch (finalizedStatus) {
-                case AVAILABLE:
-                    log.info(() -> "Found existing resource " + resource + " that could be reused...");
-                    return;
-                case EXIST_INCOMPATIBLE_RESOURCE:
-                    resource.delete(true);
-                    resource.create(true);
-                    // fallthru
-                case NOT_EXIST:
-                    resource.create(true);
-                    break;
-                default:
-                    break;
-            }
-        }
-    }
-
-    public static void deleteResource(TestResource resource) throws InterruptedException {
-        ResourceStatus finalizedStatus = waitForFinalizedStatus(resource);
-        if (finalizedStatus != ResourceStatus.NOT_EXIST) {
-            resource.delete(false);
-        }
-    }
-
-    public static ResourceStatus waitForFinalizedStatus(TestResource resource) throws InterruptedException {
-        return Waiter.run(resource::getResourceStatus)
-                     .until(status -> status != ResourceStatus.TRANSIENT)
-                     .orFail();
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/utils/resources/tables/BasicTempTable.java b/test/dynamodbmapper-v1/src/test/java/utils/resources/tables/BasicTempTable.java
deleted file mode 100644
index 979df80e14a2..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/utils/resources/tables/BasicTempTable.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package utils.resources.tables;
-
-import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
-import software.amazon.awssdk.services.dynamodb.model.AttributeDefinition;
-import software.amazon.awssdk.services.dynamodb.model.CreateTableRequest;
-import software.amazon.awssdk.services.dynamodb.model.KeySchemaElement;
-import software.amazon.awssdk.services.dynamodb.model.KeyType;
-import software.amazon.awssdk.services.dynamodb.model.ProvisionedThroughput;
-import software.amazon.awssdk.services.dynamodb.model.ScalarAttributeType;
-import utils.test.resources.DynamoDBTableResource;
-import utils.test.util.DynamoDBTestBase;
-
-public class BasicTempTable extends DynamoDBTableResource {
-
-    public static final String TEMP_TABLE_NAME = "java-sdk-" + System.currentTimeMillis();
-    public static final String HASH_KEY_NAME = "hash";
-    public static final Long READ_CAPACITY = 10L;
-    public static final Long WRITE_CAPACITY = 5L;
-    public static final ProvisionedThroughput DEFAULT_PROVISIONED_THROUGHPUT =
-            ProvisionedThroughput.builder().readCapacityUnits(READ_CAPACITY).writeCapacityUnits(WRITE_CAPACITY).build();
-
-    @Override
-    protected DynamoDbClient getClient() {
-        return DynamoDBTestBase.getClient();
-    }
-
-    @Override
-    protected CreateTableRequest getCreateTableRequest() {
-        CreateTableRequest request = CreateTableRequest.builder()
-                .tableName(TEMP_TABLE_NAME)
-                .keySchema(
-                        KeySchemaElement.builder().attributeName(HASH_KEY_NAME)
-                                              .keyType(KeyType.HASH).build())
-                .attributeDefinitions(
-                        AttributeDefinition.builder().attributeName(
-                                HASH_KEY_NAME).attributeType(
-                                ScalarAttributeType.S).build())
-                .provisionedThroughput(DEFAULT_PROVISIONED_THROUGHPUT).build();
-        return request;
-    }
-
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/utils/resources/tables/BasicTempTableWithLowThroughput.java b/test/dynamodbmapper-v1/src/test/java/utils/resources/tables/BasicTempTableWithLowThroughput.java
deleted file mode 100644
index e5bfbe2ee97f..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/utils/resources/tables/BasicTempTableWithLowThroughput.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package utils.resources.tables;
-
-import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
-import software.amazon.awssdk.services.dynamodb.model.AttributeDefinition;
-import software.amazon.awssdk.services.dynamodb.model.CreateTableRequest;
-import software.amazon.awssdk.services.dynamodb.model.KeySchemaElement;
-import software.amazon.awssdk.services.dynamodb.model.KeyType;
-import software.amazon.awssdk.services.dynamodb.model.ProvisionedThroughput;
-import software.amazon.awssdk.services.dynamodb.model.ScalarAttributeType;
-import utils.test.resources.DynamoDBTableResource;
-import utils.test.util.DynamoDBTestBase;
-
-/**
- * DynamoDB table used by {@link ProvisionedThroughputThrottlingIntegrationTest}
- */
-public class BasicTempTableWithLowThroughput extends DynamoDBTableResource {
-
-    public static final String TEMP_TABLE_NAME = "java-sdk-low-throughput-" + System.currentTimeMillis();
-    public static final String HASH_KEY_NAME = "hash";
-    public static final Long READ_CAPACITY = 1L;
-    public static final Long WRITE_CAPACITY = 1L;
-    public static final ProvisionedThroughput DEFAULT_PROVISIONED_THROUGHPUT =
-            ProvisionedThroughput.builder().readCapacityUnits(READ_CAPACITY).writeCapacityUnits(WRITE_CAPACITY).build();
-
-    @Override
-    protected DynamoDbClient getClient() {
-        return DynamoDBTestBase.getClient();
-    }
-
-    @Override
-    protected CreateTableRequest getCreateTableRequest() {
-        CreateTableRequest request = CreateTableRequest.builder()
-                .tableName(TEMP_TABLE_NAME)
-                .keySchema(
-                        KeySchemaElement.builder().attributeName(HASH_KEY_NAME)
-                                              .keyType(KeyType.HASH).build())
-                .attributeDefinitions(
-                        AttributeDefinition.builder().attributeName(
-                                HASH_KEY_NAME).attributeType(
-                                ScalarAttributeType.S).build())
-                .provisionedThroughput(DEFAULT_PROVISIONED_THROUGHPUT)
-                .build();
-        return request;
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/utils/resources/tables/TempTableWithBinaryKey.java b/test/dynamodbmapper-v1/src/test/java/utils/resources/tables/TempTableWithBinaryKey.java
deleted file mode 100644
index 1e1c38d58629..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/utils/resources/tables/TempTableWithBinaryKey.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package utils.resources.tables;
-
-import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
-import software.amazon.awssdk.services.dynamodb.model.AttributeDefinition;
-import software.amazon.awssdk.services.dynamodb.model.CreateTableRequest;
-import software.amazon.awssdk.services.dynamodb.model.KeySchemaElement;
-import software.amazon.awssdk.services.dynamodb.model.KeyType;
-import software.amazon.awssdk.services.dynamodb.model.ProvisionedThroughput;
-import software.amazon.awssdk.services.dynamodb.model.ScalarAttributeType;
-import utils.test.resources.DynamoDBTableResource;
-import utils.test.util.DynamoDBTestBase;
-
-public class TempTableWithBinaryKey extends DynamoDBTableResource {
-
-    public static final String TEMP_BINARY_TABLE_NAME = "java-sdk-binary-" + System.currentTimeMillis();
-    public static final String HASH_KEY_NAME = "hash";
-    public static final Long READ_CAPACITY = 10L;
-    public static final Long WRITE_CAPACITY = 5L;
-    public static final ProvisionedThroughput DEFAULT_PROVISIONED_THROUGHPUT =
-            ProvisionedThroughput.builder().readCapacityUnits(READ_CAPACITY).writeCapacityUnits(WRITE_CAPACITY).build();
-
-    @Override
-    protected DynamoDbClient getClient() {
-        return DynamoDBTestBase.getClient();
-    }
-
-    @Override
-    protected CreateTableRequest getCreateTableRequest() {
-        CreateTableRequest request = CreateTableRequest.builder()
-                .tableName(TEMP_BINARY_TABLE_NAME)
-                .keySchema(
-                        KeySchemaElement.builder().attributeName(HASH_KEY_NAME)
-                                              .keyType(KeyType.HASH).build())
-                .attributeDefinitions(
-                        AttributeDefinition.builder().attributeName(
-                                HASH_KEY_NAME).attributeType(
-                                ScalarAttributeType.B).build())
-                .provisionedThroughput(DEFAULT_PROVISIONED_THROUGHPUT)
-                .build();
-        return request;
-    }
-
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/utils/resources/tables/TempTableWithSecondaryIndexes.java b/test/dynamodbmapper-v1/src/test/java/utils/resources/tables/TempTableWithSecondaryIndexes.java
deleted file mode 100644
index 07d827c164db..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/utils/resources/tables/TempTableWithSecondaryIndexes.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package utils.resources.tables;
-
-import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
-import software.amazon.awssdk.services.dynamodb.model.AttributeDefinition;
-import software.amazon.awssdk.services.dynamodb.model.CreateTableRequest;
-import software.amazon.awssdk.services.dynamodb.model.GlobalSecondaryIndex;
-import software.amazon.awssdk.services.dynamodb.model.KeySchemaElement;
-import software.amazon.awssdk.services.dynamodb.model.KeyType;
-import software.amazon.awssdk.services.dynamodb.model.LocalSecondaryIndex;
-import software.amazon.awssdk.services.dynamodb.model.Projection;
-import software.amazon.awssdk.services.dynamodb.model.ProjectionType;
-import software.amazon.awssdk.services.dynamodb.model.ProvisionedThroughput;
-import software.amazon.awssdk.services.dynamodb.model.ScalarAttributeType;
-import utils.test.resources.DynamoDBTableResource;
-import utils.test.util.DynamoDBTestBase;
-
-/**
- * The table used by SecondaryIndexesIntegrationTest
- */
-public class TempTableWithSecondaryIndexes extends DynamoDBTableResource {
-
-    public static final String TEMP_TABLE_NAME = "java-sdk-indexes-" + System.currentTimeMillis();
-    public static final String HASH_KEY_NAME = "hash_key";
-    public static final String RANGE_KEY_NAME = "range_key";
-    public static final String LSI_NAME = "local_secondary_index";
-    public static final String LSI_RANGE_KEY_NAME = "local_secondary_index_attribute";
-    public static final String GSI_NAME = "global_secondary_index";
-    public static final String GSI_HASH_KEY_NAME = "global_secondary_index_hash_attribute";
-    public static final String GSI_RANGE_KEY_NAME = "global_secondary_index_range_attribute";
-    public static final ProvisionedThroughput GSI_PROVISIONED_THROUGHPUT = ProvisionedThroughput.builder()
-            .readCapacityUnits(5L)
-            .writeCapacityUnits(5L)
-            .build();
-
-    @Override
-    protected DynamoDbClient getClient() {
-        return DynamoDBTestBase.getClient();
-    }
-
-    /**
-     * Table schema:
-     *      Hash Key : HASH_KEY_NAME (S)
-     *      Range Key : RANGE_KEY_NAME (N)
-     * LSI schema:
-     *      Hash Key : HASH_KEY_NAME (S)
-     *      Range Key : LSI_RANGE_KEY_NAME (N)
-     * GSI schema:
-     *      Hash Key : GSI_HASH_KEY_NAME (N)
-     *      Range Key : GSI_RANGE_KEY_NAME (N)
-     */
-    @Override
-    protected CreateTableRequest getCreateTableRequest() {
-        CreateTableRequest createTableRequest = CreateTableRequest.builder()
-                .tableName(TEMP_TABLE_NAME)
-                .keySchema(
-                        KeySchemaElement.builder()
-                            .attributeName(HASH_KEY_NAME)
-                            .keyType(KeyType.HASH)
-                            .build(),
-                        KeySchemaElement.builder()
-                                .attributeName(RANGE_KEY_NAME)
-                                .keyType(KeyType.RANGE)
-                                .build())
-                .attributeDefinitions(
-                        AttributeDefinition.builder().attributeName(
-                                HASH_KEY_NAME).attributeType(
-                                ScalarAttributeType.S).build(),
-                        AttributeDefinition.builder().attributeName(
-                                RANGE_KEY_NAME).attributeType(
-                                ScalarAttributeType.N).build(),
-                        AttributeDefinition.builder().attributeName(
-                                LSI_RANGE_KEY_NAME).attributeType(
-                                ScalarAttributeType.N).build(),
-                        AttributeDefinition.builder().attributeName(
-                                GSI_HASH_KEY_NAME).attributeType(
-                                ScalarAttributeType.S).build(),
-                        AttributeDefinition.builder().attributeName(
-                                GSI_RANGE_KEY_NAME).attributeType(
-                                ScalarAttributeType.N).build())
-                .provisionedThroughput(BasicTempTable.DEFAULT_PROVISIONED_THROUGHPUT)
-                .localSecondaryIndexes(
-                        LocalSecondaryIndex.builder()
-                                .indexName(LSI_NAME)
-                                .keySchema(
-                                        KeySchemaElement.builder()
-                                                .attributeName(
-                                                        HASH_KEY_NAME)
-                                                .keyType(KeyType.HASH).build(),
-                                        KeySchemaElement.builder()
-                                                .attributeName(
-                                                        LSI_RANGE_KEY_NAME)
-                                                .keyType(KeyType.RANGE).build())
-                                .projection(
-                                        Projection.builder()
-                                                .projectionType(ProjectionType.KEYS_ONLY).build()).build())
-                .globalSecondaryIndexes(
-                        GlobalSecondaryIndex.builder().indexName(GSI_NAME)
-                                                  .keySchema(
-                                                          KeySchemaElement.builder()
-                                                                  .attributeName(
-                                                                          GSI_HASH_KEY_NAME)
-                                                                  .keyType(KeyType.HASH).build(),
-                                                          KeySchemaElement.builder()
-                                                                  .attributeName(
-                                                                          GSI_RANGE_KEY_NAME)
-                                                                  .keyType(KeyType.RANGE).build())
-                                                  .projection(
-                                                          Projection.builder()
-                                                                  .projectionType(ProjectionType.KEYS_ONLY).build())
-                                                  .provisionedThroughput(
-                                                          GSI_PROVISIONED_THROUGHPUT).build())
-                .build();
-        return createTableRequest;
-    }
-
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/utils/resources/tables/TestTableForParallelScan.java b/test/dynamodbmapper-v1/src/test/java/utils/resources/tables/TestTableForParallelScan.java
deleted file mode 100644
index e35c885e225f..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/utils/resources/tables/TestTableForParallelScan.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package utils.resources.tables;
-
-import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
-import software.amazon.awssdk.services.dynamodb.model.AttributeDefinition;
-import software.amazon.awssdk.services.dynamodb.model.CreateTableRequest;
-import software.amazon.awssdk.services.dynamodb.model.KeySchemaElement;
-import software.amazon.awssdk.services.dynamodb.model.KeyType;
-import software.amazon.awssdk.services.dynamodb.model.ProvisionedThroughput;
-import software.amazon.awssdk.services.dynamodb.model.ScalarAttributeType;
-import utils.test.resources.DynamoDBTableResource;
-import utils.test.util.DynamoDBTestBase;
-
-/**
- * Test table for {@link ParallelScanIntegrationTest}
- */
-public class TestTableForParallelScan extends DynamoDBTableResource {
-
-    public static final String TABLE_NAME = "java-sdk-parallel-scan";
-    public static final String HASH_KEY_NAME = "hash";
-    public static final Long READ_CAPACITY = 10L;
-    public static final Long WRITE_CAPACITY = 5L;
-    public static final ProvisionedThroughput DEFAULT_PROVISIONED_THROUGHPUT =
-            ProvisionedThroughput.builder().readCapacityUnits(READ_CAPACITY).writeCapacityUnits(WRITE_CAPACITY).build();
-
-    @Override
-    protected DynamoDbClient getClient() {
-        return DynamoDBTestBase.getClient();
-    }
-
-    @Override
-    protected CreateTableRequest getCreateTableRequest() {
-        CreateTableRequest createTableRequest = CreateTableRequest.builder()
-                .tableName(TABLE_NAME)
-                .keySchema(
-                        KeySchemaElement.builder().attributeName(HASH_KEY_NAME)
-                                              .keyType(KeyType.HASH).build())
-                .attributeDefinitions(
-                        AttributeDefinition.builder().attributeName(
-                                HASH_KEY_NAME).attributeType(
-                                ScalarAttributeType.N).build())
-                .provisionedThroughput(DEFAULT_PROVISIONED_THROUGHPUT)
-                .build();
-        return createTableRequest;
-    }
-
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/utils/test/resources/DynamoDBTableResource.java b/test/dynamodbmapper-v1/src/test/java/utils/test/resources/DynamoDBTableResource.java
deleted file mode 100644
index 9a822568601a..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/utils/test/resources/DynamoDBTableResource.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package utils.test.resources;
-
-import java.util.List;
-
-import software.amazon.awssdk.awscore.exception.AwsServiceException;
-import software.amazon.awssdk.core.exception.SdkServiceException;
-import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
-import software.amazon.awssdk.services.dynamodb.TableUtils;
-import software.amazon.awssdk.services.dynamodb.model.CreateTableRequest;
-import software.amazon.awssdk.services.dynamodb.model.DeleteTableRequest;
-import software.amazon.awssdk.services.dynamodb.model.DescribeTableRequest;
-import software.amazon.awssdk.services.dynamodb.model.GlobalSecondaryIndex;
-import software.amazon.awssdk.services.dynamodb.model.GlobalSecondaryIndexDescription;
-import software.amazon.awssdk.services.dynamodb.model.LocalSecondaryIndex;
-import software.amazon.awssdk.services.dynamodb.model.LocalSecondaryIndexDescription;
-import software.amazon.awssdk.services.dynamodb.model.Projection;
-import software.amazon.awssdk.services.dynamodb.model.TableDescription;
-import software.amazon.awssdk.services.dynamodb.model.TableStatus;
-import software.amazon.awssdk.testutils.UnorderedCollectionComparator;
-import software.amazon.awssdk.utils.Logger;
-import utils.resources.TestResource;
-import utils.test.util.DynamoDBTestBase;
-
-public abstract class DynamoDBTableResource implements TestResource {
-    private static final Logger log = Logger.loggerFor(DynamoDBTableResource.class);
-
-    /**
-     * Returns true if the two lists of GlobalSecondaryIndex and
-     * GlobalSecondaryIndexDescription share the same set of:
-     * 1) indexName
-     * 2) projection
-     * 3) keySchema (compared as unordered lists)
-     */
-    static boolean equalUnorderedGsiLists(List<GlobalSecondaryIndex> listA, List<GlobalSecondaryIndexDescription> listB) {
-        return UnorderedCollectionComparator.equalUnorderedCollections(
-                listA, listB,
-                new UnorderedCollectionComparator.CrossTypeComparator<GlobalSecondaryIndex, GlobalSecondaryIndexDescription>() {
-                    @Override
-                    public boolean equals(GlobalSecondaryIndex a, GlobalSecondaryIndexDescription b) {
-                        return a.indexName().equals(b.indexName())
-                               && equalProjections(a.projection(), b.projection())
-                               && UnorderedCollectionComparator.equalUnorderedCollections(a.keySchema(), b.keySchema());
-                    }
-                });
-    }
-
-    /**
-     * Returns true if the two lists of LocalSecondaryIndex and
-     * LocalSecondaryIndexDescription share the same set of:
-     * 1) indexName
-     * 2) projection
-     * 3) keySchema (compared as unordered lists)
-     */
-    static boolean equalUnorderedLsiLists(List<LocalSecondaryIndex> listA, List<LocalSecondaryIndexDescription> listB) {
-        return UnorderedCollectionComparator.equalUnorderedCollections(
-                listA, listB,
-                new UnorderedCollectionComparator.CrossTypeComparator<LocalSecondaryIndex, LocalSecondaryIndexDescription>() {
-                    @Override
-                    public boolean equals(LocalSecondaryIndex a, LocalSecondaryIndexDescription b) {
-                        // Project parameter might not be specified in the
-                        // CreateTableRequest. But it should be treated as equal
-                        // to the default projection type - KEYS_ONLY.
-                        return a.indexName().equals(b.indexName())
-                               && equalProjections(a.projection(), b.projection())
-                               && UnorderedCollectionComparator.equalUnorderedCollections(a.keySchema(), b.keySchema());
-                    }
-                });
-    }
-
-    /**
-     * Compares the Projection parameter included in the CreateTableRequest,
-     * with the one returned from DescribeTableResponse.
-     */
-    static boolean equalProjections(Projection fromCreateTableRequest, Projection fromDescribeTableResponse) {
-        if (fromCreateTableRequest == null || fromDescribeTableResponse == null) {
-            throw new IllegalStateException("The projection parameter should never be null.");
-        }
-
-        return fromCreateTableRequest.projectionType().equals(
-                fromDescribeTableResponse.projectionType())
-               && UnorderedCollectionComparator.equalUnorderedCollections(
-                fromCreateTableRequest.nonKeyAttributes(),
-                fromDescribeTableResponse.nonKeyAttributes());
-    }
-
-    protected abstract DynamoDbClient getClient();
-
-    protected abstract CreateTableRequest getCreateTableRequest();
-
-    /**
-     * Implementation of TestResource interfaces
-     */
-
-    @Override
-    public void create(boolean waitTillFinished) {
-        log.info(() -> "Creating " + this + "...");
-        getClient().createTable(getCreateTableRequest());
-
-        if (waitTillFinished) {
-            log.info(() -> "Waiting for " + this + " to become active...");
-            try {
-                TableUtils.waitUntilActive(getClient(), getCreateTableRequest().tableName());
-            } catch (InterruptedException e) {
-                Thread.currentThread().interrupt();
-            }
-        }
-    }
-
-    @Override
-    public void delete(boolean waitTillFinished) {
-        log.info(() -> "Deleting " + this + "...");
-        getClient().deleteTable(DeleteTableRequest.builder().tableName(getCreateTableRequest().tableName()).build());
-
-        if (waitTillFinished) {
-            log.info(() -> "Waiting for " + this + " to become deleted...");
-            DynamoDBTestBase.waitForTableToBecomeDeleted(getClient(), getCreateTableRequest().tableName());
-        }
-    }
-
-    @Override
-    public ResourceStatus getResourceStatus() {
-        CreateTableRequest createRequest = getCreateTableRequest();
-        TableDescription table = null;
-        try {
-            table = getClient().describeTable(DescribeTableRequest.builder().tableName(
-                    createRequest.tableName()).build()).table();
-        } catch (AwsServiceException exception) {
-            if (exception.awsErrorDetails().errorCode().equalsIgnoreCase("ResourceNotFoundException")) {
-                return ResourceStatus.NOT_EXIST;
-            }
-        }
-
-        TableStatus tableStatus = table.tableStatus();
-
-        if (tableStatus == TableStatus.ACTIVE) {
-            // returns AVAILABLE only if table KeySchema + LSIs + GSIs all match.
-            if (UnorderedCollectionComparator.equalUnorderedCollections(createRequest.keySchema(), table.keySchema())
-                && equalUnorderedGsiLists(createRequest.globalSecondaryIndexes(), table.globalSecondaryIndexes())
-                && equalUnorderedLsiLists(createRequest.localSecondaryIndexes(), table.localSecondaryIndexes())) {
-                return ResourceStatus.AVAILABLE;
-            } else {
-                return ResourceStatus.EXIST_INCOMPATIBLE_RESOURCE;
-            }
-        } else if (tableStatus == TableStatus.CREATING
-                   || tableStatus == TableStatus.UPDATING
-                   || tableStatus == TableStatus.DELETING) {
-            return ResourceStatus.TRANSIENT;
-        } else {
-            return ResourceStatus.NOT_EXIST;
-        }
-    }
-
-    /**
-     * Object interfaces
-     */
-    @Override
-    public String toString() {
-        return "DynamoDB Table [" + getCreateTableRequest().tableName() + "]";
-    }
-
-    @Override
-    public int hashCode() {
-        return getCreateTableRequest().hashCode();
-    }
-
-    @Override
-    public boolean equals(Object other) {
-        if (!(other instanceof DynamoDBTableResource)) {
-            return false;
-        }
-        return getCreateTableRequest().equals(
-                ((DynamoDBTableResource) other).getCreateTableRequest());
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/utils/test/util/DynamoDBIntegrationTestBase.java b/test/dynamodbmapper-v1/src/test/java/utils/test/util/DynamoDBIntegrationTestBase.java
deleted file mode 100644
index 2ff2029118b2..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/utils/test/util/DynamoDBIntegrationTestBase.java
+++ /dev/null
@@ -1,230 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package utils.test.util;
-
-import org.junit.BeforeClass;
-import software.amazon.awssdk.regions.Region;
-import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
-import software.amazon.awssdk.services.dynamodb.TableUtils;
-import software.amazon.awssdk.services.dynamodb.model.AttributeDefinition;
-import software.amazon.awssdk.services.dynamodb.model.CreateTableRequest;
-import software.amazon.awssdk.services.dynamodb.model.DeleteTableRequest;
-import software.amazon.awssdk.services.dynamodb.model.KeySchemaElement;
-import software.amazon.awssdk.services.dynamodb.model.KeyType;
-import software.amazon.awssdk.services.dynamodb.model.ListTablesRequest;
-import software.amazon.awssdk.services.dynamodb.model.ListTablesResponse;
-import software.amazon.awssdk.services.dynamodb.model.LocalSecondaryIndex;
-import software.amazon.awssdk.services.dynamodb.model.Projection;
-import software.amazon.awssdk.services.dynamodb.model.ProjectionType;
-import software.amazon.awssdk.services.dynamodb.model.ProvisionedThroughput;
-import software.amazon.awssdk.services.dynamodb.model.ScalarAttributeType;
-
-public class DynamoDBIntegrationTestBase extends DynamoDBTestBase {
-
-    protected static final String KEY_NAME = "key";
-    protected static final String TABLE_NAME = "aws-java-sdk-util";
-    protected static final String TABLE_WITH_RANGE_ATTRIBUTE = "aws-java-sdk-range-test";
-    protected static final String TABLE_WITH_INDEX_RANGE_ATTRIBUTE = "aws-java-sdk-index-range-test";
-    protected static long startKey = System.currentTimeMillis();
-
-    @BeforeClass
-    public static void setUp() throws Exception {
-        setUpCredentials();
-        dynamo = DynamoDbClient.builder().region(Region.US_EAST_1).credentialsProvider(CREDENTIALS_PROVIDER_CHAIN).build();
-
-        // Create a table
-        String keyName = KEY_NAME;
-        CreateTableRequest createTableRequest = CreateTableRequest.builder()
-                .tableName(TABLE_NAME)
-                .keySchema(KeySchemaElement.builder()
-                        .attributeName(keyName)
-                        .keyType(KeyType.HASH)
-                        .build())
-                .attributeDefinitions(
-                        AttributeDefinition.builder().attributeName(keyName)
-                                .attributeType(ScalarAttributeType.S)
-                                .build())
-                .provisionedThroughput(ProvisionedThroughput.builder()
-                        .readCapacityUnits(10L)
-                        .writeCapacityUnits(5L).build())
-                .build();
-
-        if (TableUtils.createTableIfNotExists(dynamo, createTableRequest)) {
-            TableUtils.waitUntilActive(dynamo, TABLE_NAME);
-        }
-    }
-
-    /**
-     * Quick utility method to delete all tables when we have too much capacity
-     * reserved for the region.
-     */
-    public static void deleteAllTables() {
-        ListTablesResponse listTables = dynamo.listTables(ListTablesRequest.builder().build());
-        for (String name : listTables.tableNames()) {
-            dynamo.deleteTable(DeleteTableRequest.builder().tableName(name).build());
-        }
-    }
-
-    protected static void setUpTableWithRangeAttribute() throws Exception {
-        setUp();
-
-        String keyName = DynamoDBIntegrationTestBase.KEY_NAME;
-        String rangeKeyAttributeName = "rangeKey";
-        CreateTableRequest createTableRequest = CreateTableRequest.builder()
-                .tableName(TABLE_WITH_RANGE_ATTRIBUTE)
-                .keySchema(
-                        KeySchemaElement.builder()
-                                .attributeName(keyName)
-                                .keyType(KeyType.HASH)
-                                .build(),
-                        KeySchemaElement.builder()
-                                .attributeName(rangeKeyAttributeName)
-                                .keyType(KeyType.RANGE)
-                                .build())
-                .attributeDefinitions(
-                        AttributeDefinition.builder()
-                                .attributeName(keyName)
-                                .attributeType(ScalarAttributeType.N)
-                                .build(),
-                        AttributeDefinition.builder()
-                                .attributeName(rangeKeyAttributeName)
-                                .attributeType(ScalarAttributeType.N)
-                                .build())
-                .provisionedThroughput(ProvisionedThroughput.builder()
-                        .readCapacityUnits(10L)
-                        .writeCapacityUnits(5L).build())
-                .build();
-
-        if (TableUtils.createTableIfNotExists(dynamo, createTableRequest)) {
-            TableUtils.waitUntilActive(dynamo, TABLE_WITH_RANGE_ATTRIBUTE);
-        }
-    }
-
-    protected static void setUpTableWithIndexRangeAttribute(boolean recreateTable) throws Exception {
-        setUp();
-        if (recreateTable) {
-            dynamo.deleteTable(DeleteTableRequest.builder().tableName(TABLE_WITH_INDEX_RANGE_ATTRIBUTE).build());
-            waitForTableToBecomeDeleted(TABLE_WITH_INDEX_RANGE_ATTRIBUTE);
-        }
-
-        String keyName = DynamoDBIntegrationTestBase.KEY_NAME;
-        String rangeKeyAttributeName = "rangeKey";
-        String indexFooRangeKeyAttributeName = "indexFooRangeKey";
-        String indexBarRangeKeyAttributeName = "indexBarRangeKey";
-        String multipleIndexRangeKeyAttributeName = "multipleIndexRangeKey";
-        String fooAttributeName = "fooAttribute";
-        String barAttributeName = "barAttribute";
-        String indexFooName = "index_foo";
-        String indexBarName = "index_bar";
-        String indexFooCopyName = "index_foo_copy";
-        String indexBarCopyName = "index_bar_copy";
-
-        CreateTableRequest createTableRequest = CreateTableRequest.builder()
-                .tableName(TABLE_WITH_INDEX_RANGE_ATTRIBUTE)
-                .keySchema(
-                        KeySchemaElement.builder()
-                                .attributeName(keyName)
-                                .keyType(KeyType.HASH)
-                                .build(),
-                        KeySchemaElement.builder()
-                                .attributeName(rangeKeyAttributeName)
-                                .keyType(KeyType.RANGE)
-                                .build())
-                .localSecondaryIndexes(
-                        LocalSecondaryIndex.builder()
-                                .indexName(indexFooName)
-                                .keySchema(
-                                        KeySchemaElement.builder()
-                                                .attributeName(keyName)
-                                                .keyType(KeyType.HASH)
-                                                .build(),
-                                        KeySchemaElement.builder()
-                                                .attributeName(indexFooRangeKeyAttributeName)
-                                                .keyType(KeyType.RANGE)
-                                                .build())
-                                .projection(Projection.builder()
-                                        .projectionType(ProjectionType.INCLUDE)
-                                        .nonKeyAttributes(fooAttributeName)
-                                        .build())
-                                .build(),
-                        LocalSecondaryIndex.builder()
-                                .indexName(indexBarName)
-                                .keySchema(
-                                        KeySchemaElement.builder()
-                                                .attributeName(keyName)
-                                                .keyType(KeyType.HASH)
-                                                .build(),
-                                        KeySchemaElement.builder()
-                                                .attributeName(indexBarRangeKeyAttributeName)
-                                                .keyType(KeyType.RANGE)
-                                                .build())
-                                .projection(Projection.builder()
-                                        .projectionType(ProjectionType.INCLUDE)
-                                        .nonKeyAttributes(barAttributeName)
-                                        .build())
-                                .build(),
-                        LocalSecondaryIndex.builder()
-                                .indexName(indexFooCopyName)
-                                .keySchema(
-                                        KeySchemaElement.builder()
-                                                .attributeName(keyName)
-                                                .keyType(KeyType.HASH)
-                                                .build(),
-                                        KeySchemaElement.builder()
-                                                .attributeName(multipleIndexRangeKeyAttributeName)
-                                                .keyType(KeyType.RANGE)
-                                                .build())
-                                .projection(Projection.builder()
-                                        .projectionType(ProjectionType.INCLUDE)
-                                        .nonKeyAttributes(fooAttributeName)
-                                        .build())
-                                .build(),
-                        LocalSecondaryIndex.builder()
-                                .indexName(indexBarCopyName)
-                                .keySchema(
-                                        KeySchemaElement.builder()
-                                                .attributeName(keyName)
-                                                .keyType(KeyType.HASH)
-                                                .build(),
-                                        KeySchemaElement.builder()
-                                                .attributeName(multipleIndexRangeKeyAttributeName)
-                                                .keyType(KeyType.RANGE)
-                                                .build())
-                                .projection(Projection.builder()
-                                        .projectionType(ProjectionType.INCLUDE)
-                                        .nonKeyAttributes(barAttributeName)
-                                        .build())
-                                .build())
-                .attributeDefinitions(
-                        AttributeDefinition.builder().attributeName(keyName).attributeType(ScalarAttributeType.N).build(),
-                        AttributeDefinition.builder().attributeName(rangeKeyAttributeName)
-                                                 .attributeType(ScalarAttributeType.N).build(),
-                        AttributeDefinition.builder().attributeName(indexFooRangeKeyAttributeName)
-                                                 .attributeType(ScalarAttributeType.N).build(),
-                        AttributeDefinition.builder().attributeName(indexBarRangeKeyAttributeName)
-                                                 .attributeType(ScalarAttributeType.N).build(),
-                        AttributeDefinition.builder().attributeName(multipleIndexRangeKeyAttributeName)
-                                                 .attributeType(ScalarAttributeType.N).build())
-                .provisionedThroughput(ProvisionedThroughput.builder()
-                        .readCapacityUnits(10L)
-                        .writeCapacityUnits(5L).build())
-                .build();
-
-        if (TableUtils.createTableIfNotExists(dynamo, createTableRequest)) {
-            TableUtils.waitUntilActive(dynamo, TABLE_WITH_INDEX_RANGE_ATTRIBUTE);
-        }
-    }
-}
diff --git a/test/dynamodbmapper-v1/src/test/java/utils/test/util/DynamoDBTestBase.java b/test/dynamodbmapper-v1/src/test/java/utils/test/util/DynamoDBTestBase.java
deleted file mode 100644
index 5dd0d283a7bd..000000000000
--- a/test/dynamodbmapper-v1/src/test/java/utils/test/util/DynamoDBTestBase.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Copyright 2010-2019 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.
- */
-
-package utils.test.util;
-
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.math.BigDecimal;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import software.amazon.awssdk.core.exception.SdkClientException;
-import software.amazon.awssdk.regions.Region;
-import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
-import software.amazon.awssdk.services.dynamodb.model.ResourceNotFoundException;
-import software.amazon.awssdk.testutils.Waiter;
-import software.amazon.awssdk.testutils.service.AwsTestBase;
-import software.amazon.awssdk.utils.Logger;
-
-public class DynamoDBTestBase extends AwsTestBase {
-    protected static final String ENDPOINT = "http://dynamodb.us-east-1.amazonaws.com/";
-
-    protected static DynamoDbClient dynamo;
-
-    private static final Logger log = Logger.loggerFor(DynamoDBTestBase.class);
-
-    public static void setUpTestBase() {
-        try {
-            setUpCredentials();
-        } catch (Exception e) {
-            throw SdkClientException.builder().message("Unable to load credential property file.").cause(e).build();
-        }
-
-        dynamo = DynamoDbClient.builder().region(Region.US_EAST_1).credentialsProvider(CREDENTIALS_PROVIDER_CHAIN).build();
-    }
-
-    public static DynamoDbClient getClient() {
-        if (dynamo == null) {
-            setUpTestBase();
-        }
-        return dynamo;
-    }
-
-    protected static void waitForTableToBecomeDeleted(String tableName) {
-        waitForTableToBecomeDeleted(dynamo, tableName);
-    }
-
-    public static void waitForTableToBecomeDeleted(DynamoDbClient dynamo, String tableName) {
-        log.info(() -> "Waiting for " + tableName + " to become Deleted...");
-
-        Waiter.run(() -> dynamo.describeTable(r -> r.tableName(tableName)))
-              .untilException(ResourceNotFoundException.class)
-              .orFail();
-    }
-
-    protected static <T extends Object> void assertSetsEqual(Collection<T> expected, Collection<T> given) {
-        Set<T> givenCopy = new HashSet<T>(given);
-        for (T e : expected) {
-            if (!givenCopy.remove(e)) {
-                fail("Expected element not found: " + e);
-            }
-        }
-
-        assertTrue("Unexpected elements found: " + givenCopy, givenCopy.isEmpty());
-    }
-
-    /**
-     * Only valid for whole numbers
-     */
-    protected static void assertNumericSetsEquals(Set<? extends Number> expected, Collection<String> given) {
-        Set<BigDecimal> givenCopy = new HashSet<BigDecimal>();
-        for (String s : given) {
-            BigDecimal bd = new BigDecimal(s);
-            givenCopy.add(bd.setScale(0));
-        }
-
-        Set<BigDecimal> expectedCopy = new HashSet<BigDecimal>();
-        for (Number n : expected) {
-            BigDecimal bd = new BigDecimal(n.toString());
-            expectedCopy.add(bd.setScale(0));
-        }
-
-        assertSetsEqual(expectedCopy, givenCopy);
-    }
-
-    protected static <T extends Object> Set<T> toSet(T... array) {
-        Set<T> set = new HashSet<T>();
-        for (T t : array) {
-            set.add(t);
-        }
-        return set;
-    }
-
-    protected static <T extends Object> Set<T> toSet(Collection<T> collection) {
-        Set<T> set = new HashSet<T>();
-        for (T t : collection) {
-            set.add(t);
-        }
-        return set;
-    }
-
-    protected static byte[] generateByteArray(int length) {
-        byte[] bytes = new byte[length];
-        for (int i = 0; i < length; i++) {
-            bytes[i] = (byte) (i % Byte.MAX_VALUE);
-        }
-        return bytes;
-    }
-
-    /**
-     * Gets a map of key values for the single hash key attribute value given.
-     */
-    protected Map<String, AttributeValue> mapKey(String attributeName, AttributeValue value) {
-        HashMap<String, AttributeValue> map = new HashMap<String, AttributeValue>();
-        map.put(attributeName, value);
-        return map;
-    }
-
-}
diff --git a/test/http-client-tests/pom.xml b/test/http-client-tests/pom.xml
index 99521c27319c..c27a55cb6171 100644
--- a/test/http-client-tests/pom.xml
+++ b/test/http-client-tests/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>aws-sdk-java-pom</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>http-client-tests</artifactId>
diff --git a/test/http-client-tests/src/main/java/software/amazon/awssdk/http/HttpTestUtils.java b/test/http-client-tests/src/main/java/software/amazon/awssdk/http/HttpTestUtils.java
new file mode 100644
index 000000000000..e858a6bc145f
--- /dev/null
+++ b/test/http-client-tests/src/main/java/software/amazon/awssdk/http/HttpTestUtils.java
@@ -0,0 +1,49 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.http;
+
+import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig;
+
+import com.github.tomakehurst.wiremock.WireMockServer;
+import java.io.InputStream;
+import java.net.URL;
+import java.security.KeyStore;
+
+public class HttpTestUtils {
+    private HttpTestUtils() {
+    }
+
+    public static WireMockServer createSelfSignedServer() {
+        URL selfSignedJks = SdkHttpClientTestSuite.class.getResource("/selfSigned.jks");
+
+        return new WireMockServer(wireMockConfig()
+                                      .dynamicHttpsPort()
+                                      .keystorePath(selfSignedJks.toString())
+                                      .keystorePassword("changeit")
+                                      .keystoreType("jks")
+        );
+    }
+
+    public static KeyStore getSelfSignedKeyStore() throws Exception {
+        URL selfSignedJks = SdkHttpClientTestSuite.class.getResource("/selfSigned.jks");
+        KeyStore keyStore = KeyStore.getInstance("jks");
+        try (InputStream stream = selfSignedJks.openStream()) {
+            keyStore.load(stream, "changeit".toCharArray());
+        }
+
+        return keyStore;
+    }
+}
diff --git a/test/http-client-tests/src/main/java/software/amazon/awssdk/http/SdkHttpClientTestSuite.java b/test/http-client-tests/src/main/java/software/amazon/awssdk/http/SdkHttpClientTestSuite.java
index b935a1c95858..b8e6b3e28b22 100644
--- a/test/http-client-tests/src/main/java/software/amazon/awssdk/http/SdkHttpClientTestSuite.java
+++ b/test/http-client-tests/src/main/java/software/amazon/awssdk/http/SdkHttpClientTestSuite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -25,6 +25,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
+import com.github.tomakehurst.wiremock.WireMockServer;
 import com.github.tomakehurst.wiremock.client.ResponseDefinitionBuilder;
 import com.github.tomakehurst.wiremock.http.RequestMethod;
 import com.github.tomakehurst.wiremock.junit.WireMockRule;
@@ -35,6 +36,8 @@
 import java.net.URI;
 import java.nio.charset.StandardCharsets;
 import javax.net.ssl.SSLHandshakeException;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.TrustManagerFactory;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -58,7 +61,7 @@ public void supportsResponseCode200() throws Exception {
     }
 
     @Test
-    public void supportsResponseCode200HEAD() throws Exception {
+    public void supportsResponseCode200Head() throws Exception {
         // HEAD is special due to closing of the connection immediately and streams are null
         testForResponseCode(HttpURLConnection.HTTP_FORBIDDEN, SdkHttpMethod.HEAD);
     }
@@ -74,7 +77,7 @@ public void supportsResponseCode403() throws Exception {
     }
 
     @Test
-    public void supportsResponseCode403HEAD() throws Exception {
+    public void supportsResponseCode403Head() throws Exception {
         testForResponseCode(HttpURLConnection.HTTP_FORBIDDEN, SdkHttpMethod.HEAD);
     }
 
@@ -103,6 +106,45 @@ public void validatesHttpsCertificateIssuer() throws Exception {
                 .isInstanceOf(SSLHandshakeException.class);
     }
 
+    @Test
+    public void testCustomTlsTrustManager() throws Exception {
+        WireMockServer selfSignedServer = HttpTestUtils.createSelfSignedServer();
+
+        TrustManagerFactory managerFactory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
+        managerFactory.init(HttpTestUtils.getSelfSignedKeyStore());
+
+        SdkHttpClientOptions httpClientOptions = new SdkHttpClientOptions();
+        httpClientOptions.tlsTrustManagersProvider(managerFactory::getTrustManagers);
+
+        selfSignedServer.start();
+
+        try {
+            SdkHttpClient client = createSdkHttpClient(httpClientOptions);
+            SdkHttpFullRequest request = mockSdkRequest("https://localhost:" + selfSignedServer.httpsPort(), SdkHttpMethod.POST);
+
+            client.prepareRequest(HttpExecuteRequest.builder().request(request).build()).call();
+        } finally {
+            selfSignedServer.stop();
+        }
+    }
+
+    @Test
+    public void testTrustAllWorks() throws Exception {
+        SdkHttpClientOptions httpClientOptions = new SdkHttpClientOptions();
+        httpClientOptions.trustAll(true);
+
+        testForResponseCodeUsingHttps(createSdkHttpClient(httpClientOptions), HttpURLConnection.HTTP_OK);
+    }
+
+    @Test
+    public void testCustomTlsTrustManagerAndTrustAllFails() throws Exception {
+        SdkHttpClientOptions httpClientOptions = new SdkHttpClientOptions();
+        httpClientOptions.tlsTrustManagersProvider(() -> new TrustManager[0]);
+        httpClientOptions.trustAll(true);
+
+        assertThatThrownBy(() -> createSdkHttpClient(httpClientOptions)).isInstanceOf(IllegalArgumentException.class);
+    }
+
     private void testForResponseCode(int returnCode) throws Exception {
         testForResponseCode(returnCode, SdkHttpMethod.POST);
     }
@@ -206,6 +248,23 @@ protected final SdkHttpClient createSdkHttpClient() {
      * The options that should be considered when creating the client via {@link #createSdkHttpClient(SdkHttpClientOptions)}.
      */
     protected static final class SdkHttpClientOptions {
+        private TlsTrustManagersProvider tlsTrustManagersProvider = null;
+        private boolean trustAll = false;
+
+        public TlsTrustManagersProvider tlsTrustManagersProvider() {
+            return tlsTrustManagersProvider;
+        }
+
+        public void tlsTrustManagersProvider(TlsTrustManagersProvider tlsTrustManagersProvider) {
+            this.tlsTrustManagersProvider = tlsTrustManagersProvider;
+        }
 
+        public boolean trustAll() {
+            return trustAll;
+        }
+
+        public void trustAll(boolean trustAll) {
+            this.trustAll = trustAll;
+        }
     }
 }
diff --git a/test/http-client-tests/src/main/resources/selfSigned.jks b/test/http-client-tests/src/main/resources/selfSigned.jks
new file mode 100644
index 000000000000..fe0f9eb32d46
Binary files /dev/null and b/test/http-client-tests/src/main/resources/selfSigned.jks differ
diff --git a/test/module-path-tests/pom.xml b/test/module-path-tests/pom.xml
index a6c6473cc849..c7d76a1c31e9 100644
--- a/test/module-path-tests/pom.xml
+++ b/test/module-path-tests/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>aws-sdk-java-pom</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/test/module-path-tests/src/main/java/module-info.java b/test/module-path-tests/src/main/java/module-info.java
index 28b2d281038f..9b2d7c36c49d 100644
--- a/test/module-path-tests/src/main/java/module-info.java
+++ b/test/module-path-tests/src/main/java/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/module-path-tests/src/main/java/software/amazon/awssdk/modulepath/tests/IntegTestsRunner.java b/test/module-path-tests/src/main/java/software/amazon/awssdk/modulepath/tests/IntegTestsRunner.java
index 07a5d381b5aa..5716f26d525a 100644
--- a/test/module-path-tests/src/main/java/software/amazon/awssdk/modulepath/tests/IntegTestsRunner.java
+++ b/test/module-path-tests/src/main/java/software/amazon/awssdk/modulepath/tests/IntegTestsRunner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/module-path-tests/src/main/java/software/amazon/awssdk/modulepath/tests/MockTestsRunner.java b/test/module-path-tests/src/main/java/software/amazon/awssdk/modulepath/tests/MockTestsRunner.java
index d7d3ed04bfa5..5dcb2799b76f 100644
--- a/test/module-path-tests/src/main/java/software/amazon/awssdk/modulepath/tests/MockTestsRunner.java
+++ b/test/module-path-tests/src/main/java/software/amazon/awssdk/modulepath/tests/MockTestsRunner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/module-path-tests/src/main/java/software/amazon/awssdk/modulepath/tests/integtests/BaseApiCall.java b/test/module-path-tests/src/main/java/software/amazon/awssdk/modulepath/tests/integtests/BaseApiCall.java
index d06303550ca4..8329874379f6 100644
--- a/test/module-path-tests/src/main/java/software/amazon/awssdk/modulepath/tests/integtests/BaseApiCall.java
+++ b/test/module-path-tests/src/main/java/software/amazon/awssdk/modulepath/tests/integtests/BaseApiCall.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/module-path-tests/src/main/java/software/amazon/awssdk/modulepath/tests/integtests/S3ApiCall.java b/test/module-path-tests/src/main/java/software/amazon/awssdk/modulepath/tests/integtests/S3ApiCall.java
index 9788a7feca9d..0278ba0dd059 100644
--- a/test/module-path-tests/src/main/java/software/amazon/awssdk/modulepath/tests/integtests/S3ApiCall.java
+++ b/test/module-path-tests/src/main/java/software/amazon/awssdk/modulepath/tests/integtests/S3ApiCall.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/module-path-tests/src/main/java/software/amazon/awssdk/modulepath/tests/mocktests/BaseMockApiCall.java b/test/module-path-tests/src/main/java/software/amazon/awssdk/modulepath/tests/mocktests/BaseMockApiCall.java
index 6593707d0275..51f42446f4df 100644
--- a/test/module-path-tests/src/main/java/software/amazon/awssdk/modulepath/tests/mocktests/BaseMockApiCall.java
+++ b/test/module-path-tests/src/main/java/software/amazon/awssdk/modulepath/tests/mocktests/BaseMockApiCall.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/module-path-tests/src/main/java/software/amazon/awssdk/modulepath/tests/mocktests/JsonProtocolApiCall.java b/test/module-path-tests/src/main/java/software/amazon/awssdk/modulepath/tests/mocktests/JsonProtocolApiCall.java
index bafade1a561a..30aa945fc82e 100644
--- a/test/module-path-tests/src/main/java/software/amazon/awssdk/modulepath/tests/mocktests/JsonProtocolApiCall.java
+++ b/test/module-path-tests/src/main/java/software/amazon/awssdk/modulepath/tests/mocktests/JsonProtocolApiCall.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/module-path-tests/src/main/java/software/amazon/awssdk/modulepath/tests/mocktests/MockAyncHttpClient.java b/test/module-path-tests/src/main/java/software/amazon/awssdk/modulepath/tests/mocktests/MockAyncHttpClient.java
index 021e9253e106..6634bda0c0f1 100644
--- a/test/module-path-tests/src/main/java/software/amazon/awssdk/modulepath/tests/mocktests/MockAyncHttpClient.java
+++ b/test/module-path-tests/src/main/java/software/amazon/awssdk/modulepath/tests/mocktests/MockAyncHttpClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/module-path-tests/src/main/java/software/amazon/awssdk/modulepath/tests/mocktests/MockHttpClient.java b/test/module-path-tests/src/main/java/software/amazon/awssdk/modulepath/tests/mocktests/MockHttpClient.java
index e1aa9f76fb1f..3cbc7582c884 100644
--- a/test/module-path-tests/src/main/java/software/amazon/awssdk/modulepath/tests/mocktests/MockHttpClient.java
+++ b/test/module-path-tests/src/main/java/software/amazon/awssdk/modulepath/tests/mocktests/MockHttpClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/module-path-tests/src/main/java/software/amazon/awssdk/modulepath/tests/mocktests/XmlProtocolApiCall.java b/test/module-path-tests/src/main/java/software/amazon/awssdk/modulepath/tests/mocktests/XmlProtocolApiCall.java
index cb2ff9e7d6e9..11864c6e0abf 100644
--- a/test/module-path-tests/src/main/java/software/amazon/awssdk/modulepath/tests/mocktests/XmlProtocolApiCall.java
+++ b/test/module-path-tests/src/main/java/software/amazon/awssdk/modulepath/tests/mocktests/XmlProtocolApiCall.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/protocol-tests-core/pom.xml b/test/protocol-tests-core/pom.xml
index 1ba03ae9d8b9..801d4f5fc3ef 100644
--- a/test/protocol-tests-core/pom.xml
+++ b/test/protocol-tests-core/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>aws-sdk-java-pom</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/ProtocolTestSuiteLoader.java b/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/ProtocolTestSuiteLoader.java
index a68ec5c24dfc..8a28a297b542 100644
--- a/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/ProtocolTestSuiteLoader.java
+++ b/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/ProtocolTestSuiteLoader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/asserts/marshalling/CompositeMarshallingAssertion.java b/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/asserts/marshalling/CompositeMarshallingAssertion.java
index 87e9921cd797..69743909a8b3 100644
--- a/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/asserts/marshalling/CompositeMarshallingAssertion.java
+++ b/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/asserts/marshalling/CompositeMarshallingAssertion.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/asserts/marshalling/HeadersAssertion.java b/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/asserts/marshalling/HeadersAssertion.java
index dd90caaabc7a..c4eb088fa845 100644
--- a/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/asserts/marshalling/HeadersAssertion.java
+++ b/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/asserts/marshalling/HeadersAssertion.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -51,13 +51,13 @@ protected void doAssert(LoggedRequest actual) throws Exception {
     }
 
     private void assertHeadersContains(HttpHeaders actual) {
-        contains.entrySet().stream().forEach(e -> {
+        contains.entrySet().forEach(e -> {
             assertEquals(e.getValue(), actual.getHeader(e.getKey()).firstValue());
         });
     }
 
     private void assertDoesNotContainHeaders(HttpHeaders actual) {
-        doesNotContain.stream().forEach(headerName -> {
+        doesNotContain.forEach(headerName -> {
             assertFalse(String.format("Header '%s' was expected to be absent", headerName),
                         actual.getHeader(headerName).isPresent());
         });
diff --git a/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/asserts/marshalling/HttpMethodAssertion.java b/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/asserts/marshalling/HttpMethodAssertion.java
index 46e2f2d913fe..463efef444e4 100644
--- a/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/asserts/marshalling/HttpMethodAssertion.java
+++ b/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/asserts/marshalling/HttpMethodAssertion.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/asserts/marshalling/IonBodyAssertion.java b/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/asserts/marshalling/IonBodyAssertion.java
index 39be79cb419d..84fabc6460cf 100644
--- a/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/asserts/marshalling/IonBodyAssertion.java
+++ b/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/asserts/marshalling/IonBodyAssertion.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/asserts/marshalling/JsonBodyAssertion.java b/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/asserts/marshalling/JsonBodyAssertion.java
index 7ead8d4fa401..240e21f19192 100644
--- a/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/asserts/marshalling/JsonBodyAssertion.java
+++ b/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/asserts/marshalling/JsonBodyAssertion.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/asserts/marshalling/MarshallingAssertion.java b/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/asserts/marshalling/MarshallingAssertion.java
index 3b1905916f8a..9ec645a77e6c 100644
--- a/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/asserts/marshalling/MarshallingAssertion.java
+++ b/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/asserts/marshalling/MarshallingAssertion.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/asserts/marshalling/QueryParamsAssertion.java b/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/asserts/marshalling/QueryParamsAssertion.java
index c59d5482681f..abed2aefda25 100644
--- a/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/asserts/marshalling/QueryParamsAssertion.java
+++ b/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/asserts/marshalling/QueryParamsAssertion.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -93,8 +93,8 @@ private Map<String, List<String>> parseQueryParams(LoggedRequest actual) {
      * Group the list of {@link NameValuePair} by parameter name.
      */
     private Map<String, List<String>> toQueryParamMap(List<NameValuePair> queryParams) {
-        return queryParams.stream().collect(Collectors.groupingBy(p -> p.getName(), Collectors
-                .mapping(p -> p.getValue(), Collectors.toList())));
+        return queryParams.stream().collect(Collectors.groupingBy(NameValuePair::getName, Collectors
+                .mapping(NameValuePair::getValue, Collectors.toList())));
     }
 
     private List<NameValuePair> parseNameValuePairsFromQuery(LoggedRequest actual) {
@@ -106,22 +106,18 @@ private List<NameValuePair> parseNameValuePairsFromQuery(LoggedRequest actual) {
     }
 
     private void assertContains(Map<String, List<String>> actualParams) {
-        contains.entrySet().forEach(e -> {
-            assertThat(actualParams.get(e.getKey()), containsInAnyOrder(e.getValue().toArray()));
-        });
+        contains.entrySet().forEach(e -> assertThat(actualParams.get(e.getKey()), containsInAnyOrder(e.getValue().toArray())));
     }
 
     private void assertDoesNotContain(Map<String, List<String>> actualParams) {
-        doesNotContain.forEach(key -> {
-            assertThat(actualParams, not(hasKey(key)));
-        });
+        doesNotContain.forEach(key -> assertThat(actualParams, not(hasKey(key))));
     }
 
     private void assertContainsOnly(Map<String, List<String>> actualParams) {
         assertThat(actualParams.keySet(), equalTo(containsOnly.keySet()));
-        containsOnly.entrySet().forEach(e -> {
-            assertThat(actualParams.get(e.getKey()), containsInAnyOrder(e.getValue().toArray()));
-        });
+        containsOnly.entrySet().forEach(e -> assertThat(
+            actualParams.get(e.getKey()), containsInAnyOrder(e.getValue().toArray())
+        ));
     }
 
 }
diff --git a/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/asserts/marshalling/RawBodyAssertion.java b/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/asserts/marshalling/RawBodyAssertion.java
index cb481c78644e..3a11cd4c2b55 100644
--- a/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/asserts/marshalling/RawBodyAssertion.java
+++ b/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/asserts/marshalling/RawBodyAssertion.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/asserts/marshalling/RequestBodyAssertion.java b/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/asserts/marshalling/RequestBodyAssertion.java
index 8da2546170d8..701643ba2d7a 100644
--- a/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/asserts/marshalling/RequestBodyAssertion.java
+++ b/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/asserts/marshalling/RequestBodyAssertion.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/asserts/marshalling/SerializedAs.java b/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/asserts/marshalling/SerializedAs.java
index 4d3099cd1b52..e34d9979f7e7 100644
--- a/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/asserts/marshalling/SerializedAs.java
+++ b/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/asserts/marshalling/SerializedAs.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/asserts/marshalling/UriAssertion.java b/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/asserts/marshalling/UriAssertion.java
index e340941a3712..c45ab5f434f6 100644
--- a/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/asserts/marshalling/UriAssertion.java
+++ b/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/asserts/marshalling/UriAssertion.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/asserts/marshalling/XmlAsserts.java b/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/asserts/marshalling/XmlAsserts.java
index 2d56fc3f27cd..aa292bf85244 100644
--- a/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/asserts/marshalling/XmlAsserts.java
+++ b/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/asserts/marshalling/XmlAsserts.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -63,9 +63,9 @@ private static void doAssertXmlEquals(String expectedXml, String actualXml) thro
         Diff diff = new Diff(expectedXml, actualXml);
         diff.overrideElementQualifier(new RecursiveElementNameAndTextQualifier());
         if (!diff.similar()) {
-            fail(String.format("\nExpected the following XML\n" + formatXml(expectedXml) +
-                               "\nbut actual XML was\n\n" +
-                               formatXml(actualXml)));
+            fail("\nExpected the following XML\n" + formatXml(expectedXml) +
+                 "\nbut actual XML was\n\n" +
+                 formatXml(actualXml));
         }
     }
 
diff --git a/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/asserts/marshalling/XmlBodyAssertion.java b/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/asserts/marshalling/XmlBodyAssertion.java
index 0ad6cf466dff..31718d67745d 100644
--- a/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/asserts/marshalling/XmlBodyAssertion.java
+++ b/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/asserts/marshalling/XmlBodyAssertion.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/asserts/unmarshalling/UnmarshalledResultAssertion.java b/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/asserts/unmarshalling/UnmarshalledResultAssertion.java
index 906e7422a096..9e0355f292ad 100644
--- a/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/asserts/unmarshalling/UnmarshalledResultAssertion.java
+++ b/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/asserts/unmarshalling/UnmarshalledResultAssertion.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/asserts/unmarshalling/UnmarshallingAssertion.java b/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/asserts/unmarshalling/UnmarshallingAssertion.java
index d324097020c5..a380dfea9c7a 100644
--- a/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/asserts/unmarshalling/UnmarshallingAssertion.java
+++ b/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/asserts/unmarshalling/UnmarshallingAssertion.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/asserts/unmarshalling/UnmarshallingTestContext.java b/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/asserts/unmarshalling/UnmarshallingTestContext.java
index 24c3776e2e3c..ee5d1e22987e 100644
--- a/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/asserts/unmarshalling/UnmarshallingTestContext.java
+++ b/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/asserts/unmarshalling/UnmarshallingTestContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/model/Given.java b/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/model/Given.java
index a43e1abe11e3..325e1c48f0e6 100644
--- a/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/model/Given.java
+++ b/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/model/Given.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/model/GivenResponse.java b/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/model/GivenResponse.java
index 9914619123c6..bc35f4050be7 100644
--- a/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/model/GivenResponse.java
+++ b/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/model/GivenResponse.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/model/SdkHttpMethodDeserializer.java b/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/model/SdkHttpMethodDeserializer.java
index 0f41108d2874..860b25be91e0 100644
--- a/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/model/SdkHttpMethodDeserializer.java
+++ b/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/model/SdkHttpMethodDeserializer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/model/TestCase.java b/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/model/TestCase.java
index ffd090a9d5e1..ada33479876a 100644
--- a/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/model/TestCase.java
+++ b/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/model/TestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/model/TestSuite.java b/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/model/TestSuite.java
index ef91d172b751..bd4b2a0ace26 100644
--- a/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/model/TestSuite.java
+++ b/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/model/TestSuite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/model/Then.java b/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/model/Then.java
index bff7bfb65ad6..7d7e934cf030 100644
--- a/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/model/Then.java
+++ b/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/model/Then.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/model/When.java b/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/model/When.java
index 4c660845889c..9611a8ba42fa 100644
--- a/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/model/When.java
+++ b/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/model/When.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/model/WhenAction.java b/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/model/WhenAction.java
index 515dc9303b4c..0304b2e2a741 100644
--- a/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/model/WhenAction.java
+++ b/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/model/WhenAction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/model/WhenActionDeserialzer.java b/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/model/WhenActionDeserialzer.java
index ec1d66d33db7..98bfaa1b3fe2 100644
--- a/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/model/WhenActionDeserialzer.java
+++ b/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/model/WhenActionDeserialzer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/reflect/ClientReflector.java b/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/reflect/ClientReflector.java
index 00b664f0b281..4ec4433087c3 100644
--- a/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/reflect/ClientReflector.java
+++ b/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/reflect/ClientReflector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/reflect/ShapeModelReflector.java b/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/reflect/ShapeModelReflector.java
index 410694da2e96..88eb31d98837 100644
--- a/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/reflect/ShapeModelReflector.java
+++ b/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/reflect/ShapeModelReflector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/reflect/TestCaseReflectionException.java b/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/reflect/TestCaseReflectionException.java
index a22a920aa9bb..cc92d3a90dad 100644
--- a/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/reflect/TestCaseReflectionException.java
+++ b/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/reflect/TestCaseReflectionException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/runners/MarshallingTestRunner.java b/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/runners/MarshallingTestRunner.java
index 65514637e13c..6f01690e5e10 100644
--- a/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/runners/MarshallingTestRunner.java
+++ b/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/runners/MarshallingTestRunner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/runners/ProtocolTestRunner.java b/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/runners/ProtocolTestRunner.java
index d7dbded04a47..38b3c280cdef 100644
--- a/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/runners/ProtocolTestRunner.java
+++ b/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/runners/ProtocolTestRunner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -23,7 +23,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import software.amazon.awssdk.codegen.model.intermediate.IntermediateModel;
-import software.amazon.awssdk.core.util.IdempotentUtils;
 import software.amazon.awssdk.protocol.model.TestCase;
 import software.amazon.awssdk.protocol.reflect.ClientReflector;
 import software.amazon.awssdk.protocol.wiremock.WireMockUtils;
@@ -48,7 +47,6 @@ public ProtocolTestRunner(String intermediateModelLocation) {
         this.clientReflector = new ClientReflector(model);
         this.marshallingTestRunner = new MarshallingTestRunner(model, clientReflector);
         this.unmarshallingTestRunner = new UnmarshallingTestRunner(model, clientReflector);
-        IdempotentUtils.setGenerator(() -> "00000000-0000-4000-8000-000000000000");
     }
 
     private IntermediateModel loadModel(String intermedidateModelLocation) {
diff --git a/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/runners/UnmarshallingTestRunner.java b/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/runners/UnmarshallingTestRunner.java
index 729406b09851..46d1cd0a96cf 100644
--- a/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/runners/UnmarshallingTestRunner.java
+++ b/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/runners/UnmarshallingTestRunner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/wiremock/WireMockUtils.java b/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/wiremock/WireMockUtils.java
index b41e6777ae30..c0a7fd241793 100644
--- a/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/wiremock/WireMockUtils.java
+++ b/test/protocol-tests-core/src/main/java/software/amazon/awssdk/protocol/wiremock/WireMockUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/protocol-tests-core/src/main/resources/software/amazon/awssdk/protocol/suites/cases/rest-core-input.json b/test/protocol-tests-core/src/main/resources/software/amazon/awssdk/protocol/suites/cases/rest-core-input.json
index f70c28ae76a9..4c58440beb23 100644
--- a/test/protocol-tests-core/src/main/resources/software/amazon/awssdk/protocol/suites/cases/rest-core-input.json
+++ b/test/protocol-tests-core/src/main/resources/software/amazon/awssdk/protocol/suites/cases/rest-core-input.json
@@ -469,6 +469,24 @@
       }
     }
   },
+  {
+    "description": "GET operation does not have content-type header",
+    "given": {
+      "input": {
+      }
+    },
+    "when": {
+      "action": "marshall",
+      "operation": "MembersInQueryParams"
+    },
+    "then": {
+      "serializedAs": {
+        "headers": {
+          "doesNotContain": [ "content-type" ]
+        }
+      }
+    }
+  },
   {
       "description": "Input with greedy label in path",
       "given": {
diff --git a/test/protocol-tests/pom.xml b/test/protocol-tests/pom.xml
index 8d3a21a91011..7d7815fc278e 100644
--- a/test/protocol-tests/pom.xml
+++ b/test/protocol-tests/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>aws-sdk-java-pom</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/AsyncFaultTest.java b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/AsyncFaultTest.java
index 8d0376ca41f4..b76bfd1bb0cb 100644
--- a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/AsyncFaultTest.java
+++ b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/AsyncFaultTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/AsyncResponseThreadingTest.java b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/AsyncResponseThreadingTest.java
index 610704442044..67e6a3b1bae6 100644
--- a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/AsyncResponseThreadingTest.java
+++ b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/AsyncResponseThreadingTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/AsyncResponseTransformerTest.java b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/AsyncResponseTransformerTest.java
index b78da7277e9d..126e7edb4a21 100644
--- a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/AsyncResponseTransformerTest.java
+++ b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/AsyncResponseTransformerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/AwsJsonProtocolTest.java b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/AwsJsonProtocolTest.java
index 50976fa4c190..8c8ed70ccf98 100644
--- a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/AwsJsonProtocolTest.java
+++ b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/AwsJsonProtocolTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -20,7 +20,7 @@
 import software.amazon.awssdk.protocol.ProtocolTestSuiteLoader;
 import software.amazon.awssdk.protocol.runners.ProtocolTestRunner;
 
-public class AwsJsonProtocolTest {
+public class AwsJsonProtocolTest extends ProtocolTestBase {
 
     private static final ProtocolTestSuiteLoader TEST_SUITE_LOADER = new ProtocolTestSuiteLoader();
     private static ProtocolTestRunner testRunner;
diff --git a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/Ec2ProtocolTest.java b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/Ec2ProtocolTest.java
index 9cd421f06a6b..86da7910d88f 100644
--- a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/Ec2ProtocolTest.java
+++ b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/Ec2ProtocolTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -20,7 +20,7 @@
 import software.amazon.awssdk.protocol.ProtocolTestSuiteLoader;
 import software.amazon.awssdk.protocol.runners.ProtocolTestRunner;
 
-public class Ec2ProtocolTest {
+public class Ec2ProtocolTest extends ProtocolTestBase {
 
     private static final ProtocolTestSuiteLoader testSuiteLoader = new ProtocolTestSuiteLoader();
     private static ProtocolTestRunner testRunner;
diff --git a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/EnumTest.java b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/EnumTest.java
index 2924b26ed177..f71809b652ba 100644
--- a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/EnumTest.java
+++ b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/EnumTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/EventTransformTest.java b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/EventTransformTest.java
index 0f823f13ef19..04a30f3b538b 100644
--- a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/EventTransformTest.java
+++ b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/EventTransformTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -29,6 +29,7 @@
 import software.amazon.awssdk.http.AbortableInputStream;
 import software.amazon.awssdk.http.SdkHttpFullRequest;
 import software.amazon.awssdk.http.SdkHttpFullResponse;
+import software.amazon.awssdk.protocols.json.AwsJsonProtocol;
 import software.amazon.awssdk.protocols.json.AwsJsonProtocolFactory;
 import software.amazon.awssdk.protocols.json.JsonOperationMetadata;
 import software.amazon.awssdk.services.protocolrestjson.model.InputEvent;
@@ -46,10 +47,12 @@ public class EventTransformTest {
     @BeforeClass
     public static void setup() {
         protocolFactory = AwsJsonProtocolFactory.builder()
-                .clientConfiguration(SdkClientConfiguration.builder()
-                        .option(SdkClientOption.ENDPOINT, URI.create("http://foo.amazonaws.com"))
-                        .build())
-                .build();
+                                                .clientConfiguration(
+                                                    SdkClientConfiguration.builder()
+                                                                          .option(SdkClientOption.ENDPOINT, URI.create("http://foo.amazonaws.com"))
+                                                                          .build())
+                                                .protocol(AwsJsonProtocol.AWS_JSON)
+                                                .build();
     }
 
     @Test
diff --git a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/ExecutionInterceptorTest.java b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/ExecutionInterceptorTest.java
index 0e951c5385bb..7d6a69323dd4 100644
--- a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/ExecutionInterceptorTest.java
+++ b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/ExecutionInterceptorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -25,9 +25,7 @@
 import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-import static org.assertj.core.api.Assertions.in;
 import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.isA;
 import static org.mockito.Mockito.CALLS_REAL_METHODS;
 import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.mock;
diff --git a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/ImmutableModelTest.java b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/ImmutableModelTest.java
index 7be4219e1dbd..430f57f8bc02 100644
--- a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/ImmutableModelTest.java
+++ b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/ImmutableModelTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/ProtocolTestBase.java b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/ProtocolTestBase.java
new file mode 100644
index 000000000000..fce62275dc6f
--- /dev/null
+++ b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/ProtocolTestBase.java
@@ -0,0 +1,31 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.protocol.tests;
+
+import org.junit.BeforeClass;
+
+import software.amazon.awssdk.core.util.IdempotentUtils;
+
+/**
+ * All protocol tests should extend this class to ensure that the idempotency generator is overridden before the
+ * client class is loaded and the generator is cached, otherwise some tests in this suite can break.
+ */
+public class ProtocolTestBase {
+    @BeforeClass
+    public static void overrideIdempotencyTokenGenerator() {
+        IdempotentUtils.setGenerator(() -> "00000000-0000-4000-8000-000000000000");
+    }
+}
diff --git a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/QueryMetadataTest.java b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/QueryMetadataTest.java
index af9e0b308f6b..1fe3cc39e3bb 100644
--- a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/QueryMetadataTest.java
+++ b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/QueryMetadataTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -35,7 +35,7 @@
 import software.amazon.awssdk.services.protocolquery.model.ProtocolQueryResponse;
 import software.amazon.awssdk.utils.builder.SdkBuilder;
 
-public class QueryMetadataTest {
+public class QueryMetadataTest extends ProtocolTestBase {
 
     private static final String REQUEST_ID = "abcd";
 
diff --git a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/QueryProtocolTest.java b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/QueryProtocolTest.java
index 97869e0519df..35c56920704f 100644
--- a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/QueryProtocolTest.java
+++ b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/QueryProtocolTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -20,7 +20,7 @@
 import software.amazon.awssdk.protocol.ProtocolTestSuiteLoader;
 import software.amazon.awssdk.protocol.runners.ProtocolTestRunner;
 
-public class QueryProtocolTest {
+public class QueryProtocolTest extends ProtocolTestBase {
 
     private static final ProtocolTestSuiteLoader testSuiteLoader = new ProtocolTestSuiteLoader();
     private static ProtocolTestRunner testRunner;
diff --git a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/QueryRequestTransformTest.java b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/QueryRequestTransformTest.java
new file mode 100644
index 000000000000..c9187907a3d8
--- /dev/null
+++ b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/QueryRequestTransformTest.java
@@ -0,0 +1,102 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.protocol.tests;
+
+import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
+import static com.github.tomakehurst.wiremock.client.WireMock.anyUrl;
+import static com.github.tomakehurst.wiremock.client.WireMock.containing;
+import static com.github.tomakehurst.wiremock.client.WireMock.equalTo;
+import static com.github.tomakehurst.wiremock.client.WireMock.getAllServeEvents;
+import static com.github.tomakehurst.wiremock.client.WireMock.matching;
+import static com.github.tomakehurst.wiremock.client.WireMock.post;
+import static com.github.tomakehurst.wiremock.client.WireMock.postRequestedFor;
+import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
+import static com.github.tomakehurst.wiremock.client.WireMock.verify;
+
+import com.github.tomakehurst.wiremock.junit.WireMockRule;
+import com.github.tomakehurst.wiremock.stubbing.ServeEvent;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
+import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
+import software.amazon.awssdk.http.Header;
+import software.amazon.awssdk.regions.Region;
+import software.amazon.awssdk.services.protocolquery.ProtocolQueryAsyncClient;
+import software.amazon.awssdk.services.protocolquery.ProtocolQueryClient;
+import software.amazon.awssdk.services.protocolquery.model.IdempotentOperationRequest;
+
+import java.net.URI;
+import java.util.List;
+
+public class QueryRequestTransformTest extends ProtocolTestBase {
+
+    @Rule
+    public WireMockRule wireMock = new WireMockRule(0);
+
+    private ProtocolQueryClient client;
+    private ProtocolQueryAsyncClient asyncClient;
+
+    @Before
+    public void setupClient() {
+        client = ProtocolQueryClient.builder()
+                                    .credentialsProvider(StaticCredentialsProvider.create(
+                                            AwsBasicCredentials.create("akid", "skid")))
+                                    .region(Region.US_EAST_1)
+                                    .endpointOverride(URI.create("http://localhost:" + wireMock.port()))
+                                    .build();
+
+        asyncClient = ProtocolQueryAsyncClient.builder()
+                                              .credentialsProvider(StaticCredentialsProvider.create(
+                                                      AwsBasicCredentials.create("akid", "skid")))
+                                              .region(Region.US_EAST_1)
+                                              .endpointOverride(URI.create("http://localhost:" + wireMock.port()))
+                                              .build();
+    }
+
+    @Test
+    public void syncRequest_isMovingParamsToBodyStage() {
+        stubSimpleResponse();
+        IdempotentOperationRequest request = IdempotentOperationRequest.builder().idempotencyToken("test").build();
+        client.idempotentOperation(request);
+        verifyResponseMetadata();
+    }
+
+    @Test
+    public void asyncRequest_isMovingParamsToBodyStage() {
+        stubSimpleResponse();
+        IdempotentOperationRequest request = IdempotentOperationRequest.builder().idempotencyToken("test").build();
+        asyncClient.idempotentOperation(request).join();
+        verifyResponseMetadata();
+    }
+
+    private void verifyResponseMetadata() {
+        verify(postRequestedFor(anyUrl())
+                       .withHeader(Header.CONTENT_TYPE, equalTo("application/x-www-form-urlencoded; charset=UTF-8"))
+                       .withHeader(Header.CONTENT_LENGTH, matching("\\d+"))
+                       .withUrl("/")
+                       .withRequestBody(containing("Action=IdempotentOperation"))
+                       .withRequestBody(containing("Version="))
+                       .withRequestBody(containing("IdempotencyToken=test")));
+    }
+
+    private void stubSimpleResponse() {
+        stubFor(post(anyUrl()).willReturn(aResponse()
+                                                  .withStatus(200)
+                                                  .withBody("<IdempotentOperationResponse/>")));
+    }
+
+}
diff --git a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/ResourceManagementTest.java b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/ResourceManagementTest.java
index 31dd2c093770..72ce1323b8de 100644
--- a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/ResourceManagementTest.java
+++ b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/ResourceManagementTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/ResponseTransformerTest.java b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/ResponseTransformerTest.java
index 49c0a131236e..ffe38a7a54e4 100644
--- a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/ResponseTransformerTest.java
+++ b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/ResponseTransformerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/RestJsonProtocolTest.java b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/RestJsonProtocolTest.java
index 33bd2418d61d..9d362c2cfec0 100644
--- a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/RestJsonProtocolTest.java
+++ b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/RestJsonProtocolTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -20,7 +20,7 @@
 import software.amazon.awssdk.protocol.ProtocolTestSuiteLoader;
 import software.amazon.awssdk.protocol.runners.ProtocolTestRunner;
 
-public class RestJsonProtocolTest {
+public class RestJsonProtocolTest extends ProtocolTestBase {
 
     private static final ProtocolTestSuiteLoader testSuiteLoader = new ProtocolTestSuiteLoader();
     private static ProtocolTestRunner testRunner;
diff --git a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/RestXmlProtocolTest.java b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/RestXmlProtocolTest.java
index 8e8e585b8d29..76be738498c2 100644
--- a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/RestXmlProtocolTest.java
+++ b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/RestXmlProtocolTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -20,7 +20,7 @@
 import software.amazon.awssdk.protocol.ProtocolTestSuiteLoader;
 import software.amazon.awssdk.protocol.runners.ProtocolTestRunner;
 
-public class RestXmlProtocolTest {
+public class RestXmlProtocolTest extends ProtocolTestBase {
 
     private static final ProtocolTestSuiteLoader testSuiteLoader = new ProtocolTestSuiteLoader();
     private static ProtocolTestRunner testRunner;
diff --git a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/SdkHttpResponseTest.java b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/SdkHttpResponseTest.java
index 8c0affd74aaa..73d4a16667d8 100644
--- a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/SdkHttpResponseTest.java
+++ b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/SdkHttpResponseTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/XmlMetadataTest.java b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/XmlMetadataTest.java
index b9b673a0ed5f..9a978fa71879 100644
--- a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/XmlMetadataTest.java
+++ b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/XmlMetadataTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/clockskew/ClockSkewAdjustmentTest.java b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/clockskew/ClockSkewAdjustmentTest.java
index 57f4b2119c21..30858d40d893 100644
--- a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/clockskew/ClockSkewAdjustmentTest.java
+++ b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/clockskew/ClockSkewAdjustmentTest.java
@@ -1,3 +1,18 @@
+/*
+ * 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.
+ */
+
 package software.amazon.awssdk.protocol.tests.clockskew;
 
 import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
diff --git a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/connection/SyncClientConnectionTest.java b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/connection/SyncClientConnectionTest.java
index 5e9d587c12be..f8a8944738f3 100644
--- a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/connection/SyncClientConnectionTest.java
+++ b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/connection/SyncClientConnectionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/crc32/AwsJsonAsyncCrc32ChecksumTests.java b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/crc32/AwsJsonAsyncCrc32ChecksumTests.java
index dc45e820a072..4f46d4cd7265 100644
--- a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/crc32/AwsJsonAsyncCrc32ChecksumTests.java
+++ b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/crc32/AwsJsonAsyncCrc32ChecksumTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/crc32/AwsJsonCrc32ChecksumTests.java b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/crc32/AwsJsonCrc32ChecksumTests.java
index 4d712557d493..94700e129295 100644
--- a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/crc32/AwsJsonCrc32ChecksumTests.java
+++ b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/crc32/AwsJsonCrc32ChecksumTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/crc32/RestJsonCrc32ChecksumTests.java b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/crc32/RestJsonCrc32ChecksumTests.java
index 8a3907d84d2e..cdf611bd8f8f 100644
--- a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/crc32/RestJsonCrc32ChecksumTests.java
+++ b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/crc32/RestJsonCrc32ChecksumTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/endpoint/EndpointTraitTest.java b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/endpoint/EndpointTraitTest.java
index 7a2fe897afe6..ed9a3aea63f7 100644
--- a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/endpoint/EndpointTraitTest.java
+++ b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/endpoint/EndpointTraitTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/exception/AwsJsonExceptionTest.java b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/exception/AwsJsonExceptionTest.java
index fc5b00362b15..a988c735bb1c 100644
--- a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/exception/AwsJsonExceptionTest.java
+++ b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/exception/AwsJsonExceptionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/exception/Ec2ExceptionTests.java b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/exception/Ec2ExceptionTests.java
index 964189198a0f..8ecb5e5d38c6 100644
--- a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/exception/Ec2ExceptionTests.java
+++ b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/exception/Ec2ExceptionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/exception/QueryExceptionTests.java b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/exception/QueryExceptionTests.java
index 4aa40ada2e6a..9d3f75ebf8b0 100644
--- a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/exception/QueryExceptionTests.java
+++ b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/exception/QueryExceptionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/exception/RestJsonExceptionTests.java b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/exception/RestJsonExceptionTests.java
index 6fbffb6226c3..5a82e4ff0bd5 100644
--- a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/exception/RestJsonExceptionTests.java
+++ b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/exception/RestJsonExceptionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/exception/RestXmlExceptionTests.java b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/exception/RestXmlExceptionTests.java
index 2ae90c212afd..b4d53596fa3d 100644
--- a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/exception/RestXmlExceptionTests.java
+++ b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/exception/RestXmlExceptionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/retry/AsyncAwsJsonRetryTest.java b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/retry/AsyncAwsJsonRetryTest.java
index 7a23f6ac13d6..53d78e1f15bd 100644
--- a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/retry/AsyncAwsJsonRetryTest.java
+++ b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/retry/AsyncAwsJsonRetryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/retry/AwsJsonRetryTest.java b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/retry/AwsJsonRetryTest.java
index b429bf4d3375..6ea489b2c3b8 100644
--- a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/retry/AwsJsonRetryTest.java
+++ b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/retry/AwsJsonRetryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/timeout/BaseApiCallAttemptTimeoutTest.java b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/timeout/BaseApiCallAttemptTimeoutTest.java
index 9a50fcc3bced..9c1bb3921a0a 100644
--- a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/timeout/BaseApiCallAttemptTimeoutTest.java
+++ b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/timeout/BaseApiCallAttemptTimeoutTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/timeout/BaseApiCallTimeoutTest.java b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/timeout/BaseApiCallTimeoutTest.java
index c6ae0306da33..db6fd019d313 100644
--- a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/timeout/BaseApiCallTimeoutTest.java
+++ b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/timeout/BaseApiCallTimeoutTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/timeout/BaseTimeoutTest.java b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/timeout/BaseTimeoutTest.java
index a3ed476b98c6..77a1644af0c3 100644
--- a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/timeout/BaseTimeoutTest.java
+++ b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/timeout/BaseTimeoutTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/timeout/async/AsyncApiCallAttemptsTimeoutTest.java b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/timeout/async/AsyncApiCallAttemptsTimeoutTest.java
index aa6749991e0d..51dc46619793 100644
--- a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/timeout/async/AsyncApiCallAttemptsTimeoutTest.java
+++ b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/timeout/async/AsyncApiCallAttemptsTimeoutTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/timeout/async/AsyncApiCallTimeoutTest.java b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/timeout/async/AsyncApiCallTimeoutTest.java
index 3fc78ee51baf..7ad0319a2c7b 100644
--- a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/timeout/async/AsyncApiCallTimeoutTest.java
+++ b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/timeout/async/AsyncApiCallTimeoutTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/timeout/async/AsyncTimeoutTest.java b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/timeout/async/AsyncTimeoutTest.java
index 82a907826ca5..15108cd8892e 100644
--- a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/timeout/async/AsyncTimeoutTest.java
+++ b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/timeout/async/AsyncTimeoutTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/timeout/sync/BaseSyncStreamingTimeoutTest.java b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/timeout/sync/BaseSyncStreamingTimeoutTest.java
index 3312f4bc8aad..9c710900217b 100644
--- a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/timeout/sync/BaseSyncStreamingTimeoutTest.java
+++ b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/timeout/sync/BaseSyncStreamingTimeoutTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/timeout/sync/SyncApiCallAttemptTimeoutTest.java b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/timeout/sync/SyncApiCallAttemptTimeoutTest.java
index e3349099f4dc..2e2872339302 100644
--- a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/timeout/sync/SyncApiCallAttemptTimeoutTest.java
+++ b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/timeout/sync/SyncApiCallAttemptTimeoutTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/timeout/sync/SyncApiCallTimeoutTest.java b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/timeout/sync/SyncApiCallTimeoutTest.java
index 5dd84b101203..c1e6c8168baa 100644
--- a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/timeout/sync/SyncApiCallTimeoutTest.java
+++ b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/timeout/sync/SyncApiCallTimeoutTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/timeout/sync/SyncStreamingOperationApiCallAttemptTimeoutTest.java b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/timeout/sync/SyncStreamingOperationApiCallAttemptTimeoutTest.java
index d867b0700ed9..e309b3100405 100644
--- a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/timeout/sync/SyncStreamingOperationApiCallAttemptTimeoutTest.java
+++ b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/timeout/sync/SyncStreamingOperationApiCallAttemptTimeoutTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/timeout/sync/SyncStreamingOperationApiCallTimeoutTest.java b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/timeout/sync/SyncStreamingOperationApiCallTimeoutTest.java
index 0ce165a4c818..47cf5d32a445 100644
--- a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/timeout/sync/SyncStreamingOperationApiCallTimeoutTest.java
+++ b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/timeout/sync/SyncStreamingOperationApiCallTimeoutTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/timeout/sync/SyncTimeoutTests.java b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/timeout/sync/SyncTimeoutTests.java
index 2e2a74eed020..43d4cd3c3aea 100644
--- a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/timeout/sync/SyncTimeoutTests.java
+++ b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/timeout/sync/SyncTimeoutTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/util/ClosableStringInputStream.java b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/util/ClosableStringInputStream.java
index 283338fefd91..4102c4050a03 100644
--- a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/util/ClosableStringInputStream.java
+++ b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/util/ClosableStringInputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/util/MockHttpClient.java b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/util/MockHttpClient.java
index be6f2734e129..1e14512adf46 100644
--- a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/util/MockHttpClient.java
+++ b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/util/MockHttpClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/util/exception/ExceptionTestUtils.java b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/util/exception/ExceptionTestUtils.java
index 944a397b56ba..2c1a61181bb6 100644
--- a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/util/exception/ExceptionTestUtils.java
+++ b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/util/exception/ExceptionTestUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/protocol-tests/src/test/resources/jetty-logging.properties b/test/protocol-tests/src/test/resources/jetty-logging.properties
index 0b7cafa3b426..6d7baed3e770 100644
--- a/test/protocol-tests/src/test/resources/jetty-logging.properties
+++ b/test/protocol-tests/src/test/resources/jetty-logging.properties
@@ -1,3 +1,18 @@
+#
+# 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.
+#
+
 # Set up logging implementation
 org.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.StdErrLog
 org.eclipse.jetty.LEVEL=INFO
diff --git a/test/protocol-tests/src/test/resources/log4j.properties b/test/protocol-tests/src/test/resources/log4j.properties
index 8f2c94485487..99a265bdc713 100644
--- a/test/protocol-tests/src/test/resources/log4j.properties
+++ b/test/protocol-tests/src/test/resources/log4j.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/test/sdk-benchmarks/pom.xml b/test/sdk-benchmarks/pom.xml
index 93fe84b28ed2..713a4aa83535 100755
--- a/test/sdk-benchmarks/pom.xml
+++ b/test/sdk-benchmarks/pom.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -19,7 +19,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -134,6 +134,17 @@
             <artifactId>netty-nio-client</artifactId>
             <version>${awsjavasdk.version}</version>
         </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>dynamodb-enhanced</artifactId>
+            <!-- TODO: Remove '-PREVIEW' when the client is GA -->
+            <version>${awsjavasdk.version}-PREVIEW</version>
+        </dependency>
+        <dependency>
+            <groupId>com.amazonaws</groupId>
+            <artifactId>aws-java-sdk-dynamodb</artifactId>
+            <version>1.11.748</version>
+        </dependency>
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-tcnative-boringssl-static</artifactId>
diff --git a/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/BenchmarkResultProcessor.java b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/BenchmarkResultProcessor.java
index 04452d3e8c4d..f74fa66261dc 100644
--- a/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/BenchmarkResultProcessor.java
+++ b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/BenchmarkResultProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -20,6 +20,7 @@
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
+import java.io.IOException;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -76,7 +77,16 @@ List<String> processBenchmarkResult(Collection<RunResult> results) {
             SdkBenchmarkResult sdkBenchmarkData = constructSdkBenchmarkResult(result);
 
             if (baselineResult == null) {
-                log.warn(() -> "Unable to find the baseline for " + benchmarkId + " Skipping regression validation");
+                log.warn(() -> {
+                    String benchmarkResultJson = null;
+                    try {
+                        benchmarkResultJson = OBJECT_MAPPER.writeValueAsString(sdkBenchmarkData);
+                    } catch (IOException e) {
+                        log.error(() -> "Unable to serialize result data to JSON");
+                    }
+                    return String.format("Unable to find the baseline for %s. Skipping regression validation. " +
+                            "Results were: %s", benchmarkId, benchmarkResultJson);
+                });
                 continue;
             }
 
diff --git a/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/BenchmarkRunner.java b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/BenchmarkRunner.java
index d7be410f13a3..6f815db83983 100644
--- a/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/BenchmarkRunner.java
+++ b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/BenchmarkRunner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -36,6 +36,14 @@
 import software.amazon.awssdk.benchmark.apicall.protocol.XmlProtocolBenchmark;
 import software.amazon.awssdk.benchmark.coldstart.V2DefaultClientCreationBenchmark;
 import software.amazon.awssdk.benchmark.coldstart.V2OptimizedClientCreationBenchmark;
+import software.amazon.awssdk.benchmark.enhanced.dynamodb.EnhancedClientDeleteV1MapperComparisonBenchmark;
+import software.amazon.awssdk.benchmark.enhanced.dynamodb.EnhancedClientGetOverheadBenchmark;
+import software.amazon.awssdk.benchmark.enhanced.dynamodb.EnhancedClientGetV1MapperComparisonBenchmark;
+import software.amazon.awssdk.benchmark.enhanced.dynamodb.EnhancedClientPutOverheadBenchmark;
+import software.amazon.awssdk.benchmark.enhanced.dynamodb.EnhancedClientPutV1MapperComparisonBenchmark;
+import software.amazon.awssdk.benchmark.enhanced.dynamodb.EnhancedClientQueryV1MapperComparisonBenchmark;
+import software.amazon.awssdk.benchmark.enhanced.dynamodb.EnhancedClientScanV1MapperComparisonBenchmark;
+import software.amazon.awssdk.benchmark.enhanced.dynamodb.EnhancedClientUpdateV1MapperComparisonBenchmark;
 import software.amazon.awssdk.utils.Logger;
 
 
@@ -58,6 +66,17 @@ public class BenchmarkRunner {
         V2OptimizedClientCreationBenchmark.class.getSimpleName(),
         V2DefaultClientCreationBenchmark.class.getSimpleName());
 
+    private static final List<String> MAPPER_BENCHMARKS = Arrays.asList(
+            EnhancedClientGetOverheadBenchmark.class.getSimpleName(),
+            EnhancedClientPutOverheadBenchmark.class.getSimpleName(),
+            EnhancedClientGetV1MapperComparisonBenchmark.class.getSimpleName(),
+            EnhancedClientPutV1MapperComparisonBenchmark.class.getSimpleName(),
+            EnhancedClientUpdateV1MapperComparisonBenchmark.class.getSimpleName(),
+            EnhancedClientDeleteV1MapperComparisonBenchmark.class.getSimpleName(),
+            EnhancedClientScanV1MapperComparisonBenchmark.class.getSimpleName(),
+            EnhancedClientQueryV1MapperComparisonBenchmark.class.getSimpleName()
+    );
+
     private static final Logger log = Logger.loggerFor(BenchmarkRunner.class);
 
     private final List<String> benchmarksToRun;
@@ -74,6 +93,7 @@ public static void main(String... args) throws RunnerException, JsonProcessingEx
         benchmarksToRun.addAll(ASYNC_BENCHMARKS);
         benchmarksToRun.addAll(PROTOCOL_BENCHMARKS);
         benchmarksToRun.addAll(COLD_START_BENCHMARKS);
+        benchmarksToRun.addAll(MAPPER_BENCHMARKS);
 
         BenchmarkRunner runner = new BenchmarkRunner(benchmarksToRun);
 
diff --git a/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/apicall/httpclient/SdkHttpClientBenchmark.java b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/apicall/httpclient/SdkHttpClientBenchmark.java
index 7aa8e4a5fc2f..c8448dfb37bc 100644
--- a/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/apicall/httpclient/SdkHttpClientBenchmark.java
+++ b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/apicall/httpclient/SdkHttpClientBenchmark.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -38,5 +38,6 @@ public interface SdkHttpClientBenchmark {
      *
      * @param blackhole the blackhole
      */
-    default void concurrentApiCall(Blackhole blackhole) {}
+    default void concurrentApiCall(Blackhole blackhole) {
+    }
 }
diff --git a/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/apicall/httpclient/async/AwsCrtClientBenchmark.java b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/apicall/httpclient/async/AwsCrtClientBenchmark.java
index 3bb6393a2060..377446824981 100644
--- a/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/apicall/httpclient/async/AwsCrtClientBenchmark.java
+++ b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/apicall/httpclient/async/AwsCrtClientBenchmark.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/apicall/httpclient/async/BaseNettyBenchmark.java b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/apicall/httpclient/async/BaseNettyBenchmark.java
index 02aab48c03b9..fc84cffedac7 100644
--- a/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/apicall/httpclient/async/BaseNettyBenchmark.java
+++ b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/apicall/httpclient/async/BaseNettyBenchmark.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/apicall/httpclient/async/NettyClientH1NonTlsBenchmark.java b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/apicall/httpclient/async/NettyClientH1NonTlsBenchmark.java
index 64331db4bb84..0ed7c72e2775 100644
--- a/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/apicall/httpclient/async/NettyClientH1NonTlsBenchmark.java
+++ b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/apicall/httpclient/async/NettyClientH1NonTlsBenchmark.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/apicall/httpclient/async/NettyHttpClientH1Benchmark.java b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/apicall/httpclient/async/NettyHttpClientH1Benchmark.java
index a5f25615ec20..57217beba818 100644
--- a/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/apicall/httpclient/async/NettyHttpClientH1Benchmark.java
+++ b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/apicall/httpclient/async/NettyHttpClientH1Benchmark.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/apicall/httpclient/async/NettyHttpClientH2Benchmark.java b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/apicall/httpclient/async/NettyHttpClientH2Benchmark.java
index cf4751eecdee..97c42bde324f 100644
--- a/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/apicall/httpclient/async/NettyHttpClientH2Benchmark.java
+++ b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/apicall/httpclient/async/NettyHttpClientH2Benchmark.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/apicall/httpclient/sync/ApacheHttpClientBenchmark.java b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/apicall/httpclient/sync/ApacheHttpClientBenchmark.java
index 3f6597b682b0..9dc7319184a9 100644
--- a/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/apicall/httpclient/sync/ApacheHttpClientBenchmark.java
+++ b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/apicall/httpclient/sync/ApacheHttpClientBenchmark.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/apicall/httpclient/sync/UrlConnectionHttpClientBenchmark.java b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/apicall/httpclient/sync/UrlConnectionHttpClientBenchmark.java
index bc9f5130eaae..3ff99b5dcd0b 100644
--- a/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/apicall/httpclient/sync/UrlConnectionHttpClientBenchmark.java
+++ b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/apicall/httpclient/sync/UrlConnectionHttpClientBenchmark.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/apicall/protocol/Ec2ProtocolBenchmark.java b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/apicall/protocol/Ec2ProtocolBenchmark.java
index 99d3a97c59a3..e62142e97600 100644
--- a/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/apicall/protocol/Ec2ProtocolBenchmark.java
+++ b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/apicall/protocol/Ec2ProtocolBenchmark.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/apicall/protocol/JsonProtocolBenchmark.java b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/apicall/protocol/JsonProtocolBenchmark.java
index 30a0095c52e7..0229c628b92a 100644
--- a/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/apicall/protocol/JsonProtocolBenchmark.java
+++ b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/apicall/protocol/JsonProtocolBenchmark.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/apicall/protocol/QueryProtocolBenchmark.java b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/apicall/protocol/QueryProtocolBenchmark.java
index 744c1df6566a..10844a61fd95 100644
--- a/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/apicall/protocol/QueryProtocolBenchmark.java
+++ b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/apicall/protocol/QueryProtocolBenchmark.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/apicall/protocol/SdkProtocolBenchmark.java b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/apicall/protocol/SdkProtocolBenchmark.java
index 84aa5e178ffc..30b2d7c0d421 100644
--- a/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/apicall/protocol/SdkProtocolBenchmark.java
+++ b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/apicall/protocol/SdkProtocolBenchmark.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/apicall/protocol/XmlProtocolBenchmark.java b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/apicall/protocol/XmlProtocolBenchmark.java
index 7d87e434ff3a..e141bb8a5385 100644
--- a/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/apicall/protocol/XmlProtocolBenchmark.java
+++ b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/apicall/protocol/XmlProtocolBenchmark.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/coldstart/SdkClientCreationBenchmark.java b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/coldstart/SdkClientCreationBenchmark.java
index 1fd711c87b9e..84a9a2cb8e62 100644
--- a/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/coldstart/SdkClientCreationBenchmark.java
+++ b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/coldstart/SdkClientCreationBenchmark.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/coldstart/V1ClientCreationBenchmark.java b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/coldstart/V1ClientCreationBenchmark.java
index fedfe59e46c8..46bfa00ca8a8 100644
--- a/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/coldstart/V1ClientCreationBenchmark.java
+++ b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/coldstart/V1ClientCreationBenchmark.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/coldstart/V2DefaultClientCreationBenchmark.java b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/coldstart/V2DefaultClientCreationBenchmark.java
index dd7e8c6bc988..f966642a23ce 100644
--- a/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/coldstart/V2DefaultClientCreationBenchmark.java
+++ b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/coldstart/V2DefaultClientCreationBenchmark.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/coldstart/V2OptimizedClientCreationBenchmark.java b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/coldstart/V2OptimizedClientCreationBenchmark.java
index 816e2adaf2df..b22a7c39119e 100644
--- a/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/coldstart/V2OptimizedClientCreationBenchmark.java
+++ b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/coldstart/V2OptimizedClientCreationBenchmark.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/enhanced/dynamodb/EnhancedClientDeleteV1MapperComparisonBenchmark.java b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/enhanced/dynamodb/EnhancedClientDeleteV1MapperComparisonBenchmark.java
new file mode 100644
index 000000000000..063b78bffd0a
--- /dev/null
+++ b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/enhanced/dynamodb/EnhancedClientDeleteV1MapperComparisonBenchmark.java
@@ -0,0 +1,120 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.benchmark.enhanced.dynamodb;
+
+import com.amazonaws.services.dynamodbv2.AmazonDynamoDB;
+import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapper;
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.BenchmarkMode;
+import org.openjdk.jmh.annotations.Fork;
+import org.openjdk.jmh.annotations.Measurement;
+import org.openjdk.jmh.annotations.Mode;
+import org.openjdk.jmh.annotations.Param;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.Warmup;
+import org.openjdk.jmh.infra.Blackhole;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClient;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbTable;
+import software.amazon.awssdk.enhanced.dynamodb.Key;
+import software.amazon.awssdk.enhanced.dynamodb.TableSchema;
+import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
+
+@BenchmarkMode(Mode.Throughput)
+@Warmup(iterations = 5)
+@Measurement(iterations = 5)
+@Fork(2)
+@State(Scope.Benchmark)
+public class EnhancedClientDeleteV1MapperComparisonBenchmark {
+    @Benchmark
+    public void v2Delete(TestState s) {
+        s.v2Table.deleteItem(s.key);
+    }
+
+    @Benchmark
+    public void v1Delete(TestState s) {
+        s.v1DdbMapper.delete(s.testItem.v1Key);
+    }
+
+    private static DynamoDbClient getV2Client(Blackhole bh) {
+        return new V2TestDynamoDbDeleteItemClient(bh);
+    }
+
+    private static AmazonDynamoDB getV1Client(Blackhole bh) {
+        return new V1TestDynamoDbDeleteItemClient(bh);
+    }
+
+    @State(Scope.Benchmark)
+    public static class TestState {
+        @Param({"TINY", "SMALL", "HUGE", "HUGE_FLAT"})
+        public TestItem testItem;
+
+        private final Key key = Key.builder().partitionValue("key").build();
+
+        private DynamoDbTable v2Table;
+        private DynamoDBMapper v1DdbMapper;
+
+
+        @Setup
+        public void setup(Blackhole bh) {
+            DynamoDbEnhancedClient v2DdbEnh = DynamoDbEnhancedClient.builder()
+                    .dynamoDbClient(getV2Client(bh))
+                    .build();
+
+            v2Table = v2DdbEnh.table(testItem.name(), testItem.schema);
+
+            v1DdbMapper = new DynamoDBMapper(getV1Client(bh));
+        }
+
+        public enum TestItem {
+            TINY(
+                    V2ItemFactory.TINY_BEAN_TABLE_SCHEMA,
+                    new V1ItemFactory.V1TinyBean("hashKey")
+            ),
+
+            SMALL(
+                    V2ItemFactory.SMALL_BEAN_TABLE_SCHEMA,
+                    new V1ItemFactory.V1SmallBean("hashKey")
+            ),
+
+            HUGE(
+                    V2ItemFactory.HUGE_BEAN_TABLE_SCHEMA,
+                    new V1ItemFactory.V1HugeBean("hashKey")
+
+            ),
+
+            HUGE_FLAT(
+                    V2ItemFactory.HUGE_BEAN_FLAT_TABLE_SCHEMA,
+                    new V1ItemFactory.V1HugeBeanFlat("hashKey")
+            ),
+            ;
+
+            // V2
+            private TableSchema schema;
+
+            // V1
+            private Object v1Key;
+
+            TestItem(TableSchema<?> schema,
+                             Object v1Key) {
+                this.schema = schema;
+
+                this.v1Key = v1Key;
+            }
+        }
+    }
+}
diff --git a/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/enhanced/dynamodb/EnhancedClientGetOverheadBenchmark.java b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/enhanced/dynamodb/EnhancedClientGetOverheadBenchmark.java
new file mode 100644
index 000000000000..ce2fdf38786a
--- /dev/null
+++ b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/enhanced/dynamodb/EnhancedClientGetOverheadBenchmark.java
@@ -0,0 +1,149 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.benchmark.enhanced.dynamodb;
+
+import static software.amazon.awssdk.core.client.config.SdkClientOption.ENDPOINT;
+
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.net.URI;
+import java.util.Map;
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.BenchmarkMode;
+import org.openjdk.jmh.annotations.Fork;
+import org.openjdk.jmh.annotations.Measurement;
+import org.openjdk.jmh.annotations.Mode;
+import org.openjdk.jmh.annotations.Param;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.Warmup;
+import org.openjdk.jmh.infra.Blackhole;
+import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
+import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
+import software.amazon.awssdk.benchmark.utils.MockHttpClient;
+import software.amazon.awssdk.core.client.config.SdkClientConfiguration;
+import software.amazon.awssdk.core.interceptor.Context;
+import software.amazon.awssdk.core.interceptor.ExecutionAttributes;
+import software.amazon.awssdk.core.interceptor.ExecutionInterceptor;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClient;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbTable;
+import software.amazon.awssdk.enhanced.dynamodb.Key;
+import software.amazon.awssdk.enhanced.dynamodb.TableSchema;
+import software.amazon.awssdk.protocols.json.AwsJsonProtocol;
+import software.amazon.awssdk.protocols.json.AwsJsonProtocolFactory;
+import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+import software.amazon.awssdk.services.dynamodb.model.DynamoDbException;
+import software.amazon.awssdk.services.dynamodb.model.GetItemRequest;
+import software.amazon.awssdk.services.dynamodb.model.PutItemRequest;
+import software.amazon.awssdk.services.dynamodb.transform.PutItemRequestMarshaller;
+import software.amazon.awssdk.utils.IoUtils;
+
+@BenchmarkMode(Mode.Throughput)
+@Warmup(iterations = 5)
+@Measurement(iterations = 5)
+@Fork(2)
+@State(Scope.Benchmark)
+public class EnhancedClientGetOverheadBenchmark {
+    private static final AwsJsonProtocolFactory JSON_PROTOCOL_FACTORY = AwsJsonProtocolFactory
+            .builder()
+            .clientConfiguration(SdkClientConfiguration.builder()
+                    .option(ENDPOINT, URI.create("https://dynamodb.amazonaws.com"))
+                    .build())
+            .defaultServiceExceptionSupplier(DynamoDbException::builder)
+            .protocol(AwsJsonProtocol.AWS_JSON)
+            .protocolVersion("1.0")
+            .build();
+
+    private static final PutItemRequestMarshaller PUT_ITEM_REQUEST_MARSHALLER =
+            new PutItemRequestMarshaller(JSON_PROTOCOL_FACTORY);
+
+    private static final V2ItemFactory ITEM_FACTORY = new V2ItemFactory();
+
+    private final Key testKey = Key.builder().partitionValue("key").build();
+
+
+    @Benchmark
+    public Object lowLevelGet(TestState s) {
+        return s.dynamoDb.getItem(GetItemRequest.builder().build());
+    }
+
+    @Benchmark
+    public Object enhanceGet(TestState s) {
+        return s.table.getItem(testKey);
+    }
+
+    @State(Scope.Benchmark)
+    public static class TestState {
+        private DynamoDbClient dynamoDb;
+
+        @Param({"TINY", "SMALL", "HUGE", "HUGE_FLAT"})
+        private TestItem testItem;
+
+        private DynamoDbTable table;
+
+        @Setup
+        public void setup(Blackhole bh) {
+            dynamoDb = DynamoDbClient.builder()
+                    .credentialsProvider(StaticCredentialsProvider.create(
+                            AwsBasicCredentials.create("akid", "skid")))
+                    .httpClient(new MockHttpClient(testItem.responseContent, "{}"))
+                    .overrideConfiguration(o -> o.addExecutionInterceptor(new ExecutionInterceptor() {
+                        @Override
+                        public void afterUnmarshalling(Context.AfterUnmarshalling context,
+                                                       ExecutionAttributes executionAttributes) {
+                            bh.consume(context);
+                            bh.consume(executionAttributes);
+                        }
+                    }))
+                    .build();
+
+            DynamoDbEnhancedClient ddbEnh = DynamoDbEnhancedClient.builder()
+                    .dynamoDbClient(dynamoDb)
+                    .build();
+
+            table = ddbEnh.table(testItem.name(), testItem.tableSchema);
+        }
+    }
+
+    public enum TestItem {
+        TINY(marshall(ITEM_FACTORY.tiny()), V2ItemFactory.TINY_BEAN_TABLE_SCHEMA),
+        SMALL(marshall(ITEM_FACTORY.small()), V2ItemFactory.SMALL_BEAN_TABLE_SCHEMA),
+        HUGE(marshall(ITEM_FACTORY.huge()), V2ItemFactory.HUGE_BEAN_TABLE_SCHEMA),
+        HUGE_FLAT(marshall(ITEM_FACTORY.hugeFlat()), V2ItemFactory.HUGE_BEAN_FLAT_TABLE_SCHEMA)
+        ;
+
+        private String responseContent;
+        private TableSchema tableSchema;
+
+        TestItem(String responseContent, TableSchema tableSchema) {
+            this.responseContent = responseContent;
+            this.tableSchema = tableSchema;
+        }
+    }
+
+    private static String marshall(Map<String, AttributeValue> item) {
+        return PUT_ITEM_REQUEST_MARSHALLER.marshall(PutItemRequest.builder().item(item).build())
+                .contentStreamProvider().map(cs -> {
+                    try {
+                        return IoUtils.toUtf8String(cs.newStream());
+                    } catch (IOException e) {
+                        throw new UncheckedIOException(e);
+                    }
+                }).orElse(null);
+    }
+}
diff --git a/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/enhanced/dynamodb/EnhancedClientGetV1MapperComparisonBenchmark.java b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/enhanced/dynamodb/EnhancedClientGetV1MapperComparisonBenchmark.java
new file mode 100644
index 000000000000..12bc62d18454
--- /dev/null
+++ b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/enhanced/dynamodb/EnhancedClientGetV1MapperComparisonBenchmark.java
@@ -0,0 +1,143 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.benchmark.enhanced.dynamodb;
+
+import com.amazonaws.services.dynamodbv2.AmazonDynamoDB;
+import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapper;
+import com.amazonaws.services.dynamodbv2.model.GetItemResult;
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.BenchmarkMode;
+import org.openjdk.jmh.annotations.Fork;
+import org.openjdk.jmh.annotations.Measurement;
+import org.openjdk.jmh.annotations.Mode;
+import org.openjdk.jmh.annotations.Param;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.Warmup;
+import org.openjdk.jmh.infra.Blackhole;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClient;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbTable;
+import software.amazon.awssdk.enhanced.dynamodb.Key;
+import software.amazon.awssdk.enhanced.dynamodb.TableSchema;
+import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
+import software.amazon.awssdk.services.dynamodb.model.GetItemResponse;
+
+@BenchmarkMode(Mode.Throughput)
+@Warmup(iterations = 5)
+@Measurement(iterations = 5)
+@Fork(2)
+@State(Scope.Benchmark)
+public class EnhancedClientGetV1MapperComparisonBenchmark {
+    private static final V2ItemFactory V2_ITEM_FACTORY = new V2ItemFactory();
+    private static final V1ItemFactory V1_ITEM_FACTORY = new V1ItemFactory();
+
+    @Benchmark
+    public Object v2Get(TestState s) {
+        return s.v2Table.getItem(s.key);
+    }
+
+    @Benchmark
+    public Object v1Get(TestState s) {
+        return s.v1DdbMapper.load(s.testItem.v1Key);
+    }
+
+    private static DynamoDbClient getV2Client(Blackhole bh, GetItemResponse getItemResponse) {
+        return new V2TestDynamoDbGetItemClient(bh, getItemResponse);
+    }
+
+    private static AmazonDynamoDB getV1Client(Blackhole bh, GetItemResult getItemResult) {
+        return new V1TestDynamoDbGetItemClient(bh, getItemResult);
+    }
+
+    @State(Scope.Benchmark)
+    public static class TestState {
+        @Param({"TINY", "SMALL", "HUGE", "HUGE_FLAT"})
+        public TestItem testItem;
+
+        private final Key key = Key.builder().partitionValue("key").build();
+
+        private DynamoDbTable<?> v2Table;
+        private DynamoDBMapper v1DdbMapper;
+
+
+        @Setup
+        public void setup(Blackhole bh) {
+            DynamoDbEnhancedClient v2DdbEnh = DynamoDbEnhancedClient.builder()
+                    .dynamoDbClient(getV2Client(bh, testItem.v2Response))
+                    .build();
+
+            v2Table = v2DdbEnh.table(testItem.name(), testItem.schema);
+
+            v1DdbMapper = new DynamoDBMapper(getV1Client(bh, testItem.v1Response));
+        }
+
+        public enum TestItem {
+            TINY(
+                    V2ItemFactory.TINY_BEAN_TABLE_SCHEMA,
+                    GetItemResponse.builder().item(V2_ITEM_FACTORY.tiny()).build(),
+
+                    new V1ItemFactory.V1TinyBean("hashKey"),
+                    new GetItemResult().withItem(V1_ITEM_FACTORY.tiny())
+            ),
+
+            SMALL(
+                    V2ItemFactory.SMALL_BEAN_TABLE_SCHEMA,
+                    GetItemResponse.builder().item(V2_ITEM_FACTORY.small()).build(),
+
+                    new V1ItemFactory.V1SmallBean("hashKey"),
+                    new GetItemResult().withItem(V1_ITEM_FACTORY.small())
+            ),
+
+            HUGE(
+                    V2ItemFactory.HUGE_BEAN_TABLE_SCHEMA,
+                    GetItemResponse.builder().item(V2_ITEM_FACTORY.huge()).build(),
+
+                    new V1ItemFactory.V1HugeBean("hashKey"),
+                    new GetItemResult().withItem(V1_ITEM_FACTORY.huge())
+            ),
+
+            HUGE_FLAT(
+                    V2ItemFactory.HUGE_BEAN_FLAT_TABLE_SCHEMA,
+                    GetItemResponse.builder().item(V2_ITEM_FACTORY.hugeFlat()).build(),
+
+                    new V1ItemFactory.V1HugeBeanFlat("hashKey"),
+                    new GetItemResult().withItem(V1_ITEM_FACTORY.hugeFlat())
+            ),
+            ;
+
+            // V2
+            private TableSchema<?> schema;
+            private GetItemResponse v2Response;
+
+            // V1
+            private Object v1Key;
+            private GetItemResult v1Response;
+
+            TestItem(TableSchema<?> schema,
+                             GetItemResponse v2Response,
+
+                             Object v1Key,
+                             GetItemResult v1Response) {
+                this.schema = schema;
+                this.v2Response = v2Response;
+
+                this.v1Key = v1Key;
+                this.v1Response = v1Response;
+            }
+        }
+    }
+}
diff --git a/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/enhanced/dynamodb/EnhancedClientPutOverheadBenchmark.java b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/enhanced/dynamodb/EnhancedClientPutOverheadBenchmark.java
new file mode 100644
index 000000000000..a6e0f93c2924
--- /dev/null
+++ b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/enhanced/dynamodb/EnhancedClientPutOverheadBenchmark.java
@@ -0,0 +1,122 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.benchmark.enhanced.dynamodb;
+
+import java.util.Map;
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.BenchmarkMode;
+import org.openjdk.jmh.annotations.Fork;
+import org.openjdk.jmh.annotations.Measurement;
+import org.openjdk.jmh.annotations.Mode;
+import org.openjdk.jmh.annotations.Param;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.Warmup;
+import org.openjdk.jmh.infra.Blackhole;
+import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
+import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
+import software.amazon.awssdk.benchmark.utils.MockHttpClient;
+import software.amazon.awssdk.core.interceptor.Context;
+import software.amazon.awssdk.core.interceptor.ExecutionAttributes;
+import software.amazon.awssdk.core.interceptor.ExecutionInterceptor;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClient;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbTable;
+import software.amazon.awssdk.enhanced.dynamodb.TableSchema;
+import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+
+@BenchmarkMode(Mode.Throughput)
+@Warmup(iterations = 5)
+@Measurement(iterations = 5)
+@Fork(2)
+@State(Scope.Benchmark)
+public class EnhancedClientPutOverheadBenchmark {
+    @Benchmark
+    public void lowLevelPut(TestState s) {
+        s.ddb.putItem(r -> r.item(s.testItem.av));
+    }
+
+    @Benchmark
+    public void enhancedPut(TestState s) {
+        s.enhTable.putItem(s.testItem.bean);
+    }
+
+    @State(Scope.Benchmark)
+    public static class TestState {
+        @Param({"TINY", "SMALL", "HUGE", "HUGE_FLAT"})
+        private TestItem testItem;
+        private DynamoDbClient ddb;
+
+        private DynamoDbTable enhTable;
+
+        @Setup
+        public void setup(Blackhole bh) {
+            ddb = DynamoDbClient.builder()
+                    .credentialsProvider(StaticCredentialsProvider.create(
+                            AwsBasicCredentials.create("akid", "skid")))
+                    .httpClient(new MockHttpClient("{}", "{}"))
+                    .overrideConfiguration(c -> c.addExecutionInterceptor(new ExecutionInterceptor() {
+                        @Override
+                        public void afterUnmarshalling(Context.AfterUnmarshalling context,
+                                                       ExecutionAttributes executionAttributes) {
+                            bh.consume(context);
+                            bh.consume(executionAttributes);
+                        }
+                    }))
+                    .build();
+
+            DynamoDbEnhancedClient ddbEnh = DynamoDbEnhancedClient.builder()
+                    .dynamoDbClient(ddb)
+                    .build();
+
+            enhTable = ddbEnh.table(testItem.name(), testItem.tableSchema);
+        }
+    }
+
+    public enum TestItem {
+        TINY,
+        SMALL,
+        HUGE,
+        HUGE_FLAT
+        ;
+
+        private static final V2ItemFactory FACTORY = new V2ItemFactory();
+
+        private Map<String, AttributeValue> av;
+
+        private TableSchema tableSchema;
+        private Object bean;
+
+        static {
+            TINY.av = FACTORY.tiny();
+            TINY.tableSchema = V2ItemFactory.TINY_BEAN_TABLE_SCHEMA;
+            TINY.bean = FACTORY.tinyBean();
+
+            SMALL.av = FACTORY.small();
+            SMALL.tableSchema = V2ItemFactory.SMALL_BEAN_TABLE_SCHEMA;
+            SMALL.bean = FACTORY.smallBean();
+
+            HUGE.av = FACTORY.huge();
+            HUGE.tableSchema = V2ItemFactory.HUGE_BEAN_TABLE_SCHEMA;
+            HUGE.bean = FACTORY.hugeBean();
+
+            HUGE_FLAT.av = FACTORY.hugeFlat();
+            HUGE_FLAT.tableSchema = V2ItemFactory.HUGE_BEAN_FLAT_TABLE_SCHEMA;
+            HUGE_FLAT.bean = FACTORY.hugeBeanFlat();
+        }
+    }
+}
diff --git a/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/enhanced/dynamodb/EnhancedClientPutV1MapperComparisonBenchmark.java b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/enhanced/dynamodb/EnhancedClientPutV1MapperComparisonBenchmark.java
new file mode 100644
index 000000000000..cd233506b282
--- /dev/null
+++ b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/enhanced/dynamodb/EnhancedClientPutV1MapperComparisonBenchmark.java
@@ -0,0 +1,136 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.benchmark.enhanced.dynamodb;
+
+import com.amazonaws.services.dynamodbv2.AmazonDynamoDB;
+import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapper;
+import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperConfig;
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.BenchmarkMode;
+import org.openjdk.jmh.annotations.Fork;
+import org.openjdk.jmh.annotations.Measurement;
+import org.openjdk.jmh.annotations.Mode;
+import org.openjdk.jmh.annotations.Param;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.Warmup;
+import org.openjdk.jmh.infra.Blackhole;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClient;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbTable;
+import software.amazon.awssdk.enhanced.dynamodb.TableSchema;
+import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
+
+@BenchmarkMode(Mode.Throughput)
+@Warmup(iterations = 5)
+@Measurement(iterations = 5)
+@Fork(2)
+@State(Scope.Benchmark)
+public class EnhancedClientPutV1MapperComparisonBenchmark {
+    private static final V2ItemFactory V2_ITEM_FACTORY = new V2ItemFactory();
+    private static final V1ItemFactory V1_ITEM_FACTORY = new V1ItemFactory();
+    private static final DynamoDBMapperConfig MAPPER_CONFIG =
+        DynamoDBMapperConfig.builder()
+                            .withSaveBehavior(DynamoDBMapperConfig.SaveBehavior.PUT)
+                            .build();
+
+    @Benchmark
+    public void v2Put(TestState s) {
+        s.v2Table.putItem(s.testItem.v2Bean);
+    }
+
+    @Benchmark
+    public void v1Put(TestState s) {
+        s.v1DdbMapper.save(s.testItem.v1Bean);
+    }
+
+    private static DynamoDbClient getV2Client(Blackhole bh) {
+        return new V2TestDynamoDbPutItemClient(bh);
+    }
+
+    private static AmazonDynamoDB getV1Client(Blackhole bh) {
+        return new V1TestDynamoDbPutItemClient(bh);
+    }
+
+    @State(Scope.Benchmark)
+    public static class TestState {
+        @Param({"TINY", "SMALL", "HUGE", "HUGE_FLAT"})
+        public TestItem testItem;
+
+        private DynamoDbTable v2Table;
+        private DynamoDBMapper v1DdbMapper;
+
+
+        @Setup
+        public void setup(Blackhole bh) {
+            DynamoDbEnhancedClient v2DdbEnh = DynamoDbEnhancedClient.builder()
+                    .dynamoDbClient(getV2Client(bh))
+                    .build();
+
+            v2Table = v2DdbEnh.table(testItem.name(), testItem.schema);
+
+            v1DdbMapper = new DynamoDBMapper(getV1Client(bh), MAPPER_CONFIG);
+        }
+
+        public enum TestItem {
+            TINY(
+                    V2ItemFactory.TINY_BEAN_TABLE_SCHEMA,
+                    V2_ITEM_FACTORY.tinyBean(),
+
+                    V1_ITEM_FACTORY.v1TinyBean()
+            ),
+
+            SMALL(
+                    V2ItemFactory.SMALL_BEAN_TABLE_SCHEMA,
+                    V2_ITEM_FACTORY.smallBean(),
+
+                    V1_ITEM_FACTORY.v1SmallBean()
+            ),
+
+            HUGE(
+                    V2ItemFactory.HUGE_BEAN_TABLE_SCHEMA,
+                    V2_ITEM_FACTORY.hugeBean(),
+
+                    V1_ITEM_FACTORY.v1hugeBean()
+            ),
+
+            HUGE_FLAT(
+                    V2ItemFactory.HUGE_BEAN_FLAT_TABLE_SCHEMA,
+                    V2_ITEM_FACTORY.hugeBeanFlat(),
+
+                    V1_ITEM_FACTORY.v1HugeBeanFlat()
+            ),
+            ;
+
+            // V2
+            private TableSchema<?> schema;
+            private Object v2Bean;
+
+            // V1
+            private Object v1Bean;
+
+            TestItem(TableSchema<?> schema,
+                             Object v2Bean,
+
+                             Object v1Bean) {
+                this.schema = schema;
+                this.v2Bean = v2Bean;
+
+                this.v1Bean = v1Bean;
+            }
+        }
+    }
+}
diff --git a/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/enhanced/dynamodb/EnhancedClientQueryV1MapperComparisonBenchmark.java b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/enhanced/dynamodb/EnhancedClientQueryV1MapperComparisonBenchmark.java
new file mode 100644
index 000000000000..b25b560dbdc6
--- /dev/null
+++ b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/enhanced/dynamodb/EnhancedClientQueryV1MapperComparisonBenchmark.java
@@ -0,0 +1,175 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.benchmark.enhanced.dynamodb;
+
+import com.amazonaws.services.dynamodbv2.AmazonDynamoDB;
+import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapper;
+import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBQueryExpression;
+import com.amazonaws.services.dynamodbv2.model.QueryResult;
+import java.util.Arrays;
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.BenchmarkMode;
+import org.openjdk.jmh.annotations.Fork;
+import org.openjdk.jmh.annotations.Measurement;
+import org.openjdk.jmh.annotations.Mode;
+import org.openjdk.jmh.annotations.Param;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.Warmup;
+import org.openjdk.jmh.infra.Blackhole;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClient;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbTable;
+import software.amazon.awssdk.enhanced.dynamodb.Key;
+import software.amazon.awssdk.enhanced.dynamodb.TableSchema;
+import software.amazon.awssdk.enhanced.dynamodb.model.QueryConditional;
+import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
+import software.amazon.awssdk.services.dynamodb.model.QueryResponse;
+
+@BenchmarkMode(Mode.Throughput)
+@Warmup(iterations = 5)
+@Measurement(iterations = 5)
+@Fork(2)
+@State(Scope.Benchmark)
+public class EnhancedClientQueryV1MapperComparisonBenchmark {
+    private static final V2ItemFactory V2_ITEM_FACTORY = new V2ItemFactory();
+    private static final V1ItemFactory V1_ITEM_FACTORY = new V1ItemFactory();
+
+    @Benchmark
+    public Object v2Query(TestState s) {
+        return s.v2Table.query(QueryConditional.keyEqualTo(s.key)).iterator().next();
+    }
+
+    @Benchmark
+    public Object v1Query(TestState s) {
+        return s.v1DdbMapper.query(s.testItem.getV1BeanClass(), s.testItem.v1QueryExpression).iterator().next();
+    }
+
+    private static DynamoDbClient getV2Client(Blackhole bh, QueryResponse queryResponse) {
+        return new V2TestDynamoDbQueryClient(bh, queryResponse);
+    }
+
+    private static AmazonDynamoDB getV1Client(Blackhole bh, QueryResult queryResult) {
+        return new V1TestDynamoDbQueryClient(bh, queryResult);
+    }
+
+    @State(Scope.Benchmark)
+    public static class TestState {
+        @Param({"TINY", "SMALL", "HUGE", "HUGE_FLAT"})
+        public TestItem testItem;
+
+        private DynamoDbTable<?> v2Table;
+        private DynamoDBMapper v1DdbMapper;
+
+        private final Key key = Key.builder().partitionValue("key").build();
+
+        @Setup
+        public void setup(Blackhole bh) {
+            DynamoDbEnhancedClient v2DdbEnh = DynamoDbEnhancedClient.builder()
+                    .dynamoDbClient(getV2Client(bh, testItem.v2Response))
+                    .build();
+
+            v2Table = v2DdbEnh.table(testItem.name(), testItem.schema);
+
+            v1DdbMapper = new DynamoDBMapper(getV1Client(bh, testItem.v1Response));
+        }
+
+        public enum TestItem {
+            TINY(
+                    V2ItemFactory.TINY_BEAN_TABLE_SCHEMA,
+                    QueryResponse.builder()
+                                .items(Arrays.asList(V2_ITEM_FACTORY.tiny(),
+                                                     V2_ITEM_FACTORY.tiny(),
+                                                     V2_ITEM_FACTORY.tiny()))
+                                .build(),
+
+                    V1ItemFactory.V1TinyBean.class,
+                    new DynamoDBQueryExpression().withHashKeyValues(new V1ItemFactory.V1TinyBean("hashKey")),
+                    new QueryResult().withItems(
+                        Arrays.asList(V1_ITEM_FACTORY.tiny(), V1_ITEM_FACTORY.tiny(), V1_ITEM_FACTORY.tiny()))
+            ),
+            SMALL(
+                    V2ItemFactory.SMALL_BEAN_TABLE_SCHEMA,
+                    QueryResponse.builder()
+                                .items(Arrays.asList(V2_ITEM_FACTORY.small(),
+                                                     V2_ITEM_FACTORY.small(),
+                                                     V2_ITEM_FACTORY.small()))
+                                .build(),
+
+                    V1ItemFactory.V1SmallBean.class,
+                    new DynamoDBQueryExpression().withHashKeyValues(new V1ItemFactory.V1SmallBean("hashKey")),
+                    new QueryResult().withItems(
+                        Arrays.asList(V1_ITEM_FACTORY.small(), V1_ITEM_FACTORY.small(), V1_ITEM_FACTORY.small()))
+            ),
+
+            HUGE(
+                    V2ItemFactory.HUGE_BEAN_TABLE_SCHEMA,
+                    QueryResponse.builder()
+                                .items(Arrays.asList(V2_ITEM_FACTORY.huge(),
+                                                     V2_ITEM_FACTORY.huge(),
+                                                     V2_ITEM_FACTORY.huge()))
+                                .build(),
+
+                    V1ItemFactory.V1HugeBean.class,
+                    new DynamoDBQueryExpression().withHashKeyValues(new V1ItemFactory.V1HugeBean("hashKey")),
+                    new QueryResult().withItems(
+                        Arrays.asList(V1_ITEM_FACTORY.huge(), V1_ITEM_FACTORY.huge(), V1_ITEM_FACTORY.huge()))
+            ),
+
+            HUGE_FLAT(
+                    V2ItemFactory.HUGE_BEAN_FLAT_TABLE_SCHEMA,
+                    QueryResponse.builder()
+                                .items(Arrays.asList(V2_ITEM_FACTORY.hugeFlat(),
+                                                     V2_ITEM_FACTORY.hugeFlat(),
+                                                     V2_ITEM_FACTORY.hugeFlat()))
+                                .build(),
+
+                    V1ItemFactory.V1HugeBeanFlat.class,
+                    new DynamoDBQueryExpression().withHashKeyValues(new V1ItemFactory.V1HugeBeanFlat("hashKey")),
+                    new QueryResult().withItems(
+                        Arrays.asList(V1_ITEM_FACTORY.hugeFlat(), V1_ITEM_FACTORY.hugeFlat(), V1_ITEM_FACTORY.hugeFlat()))
+            ),
+            ;
+
+            // V2
+            private TableSchema<?> schema;
+            private QueryResponse v2Response;
+
+            // V1
+            private Class<?> v1BeanClass;
+            private DynamoDBQueryExpression v1QueryExpression;
+            private QueryResult v1Response;
+
+            TestItem(TableSchema<?> schema,
+                     QueryResponse v2Response,
+
+                     Class<?> v1BeanClass,
+                     DynamoDBQueryExpression v1QueryExpression,
+                     QueryResult v1Response) {
+                this.schema = schema;
+                this.v2Response = v2Response;
+
+                this.v1BeanClass = v1BeanClass;
+                this.v1QueryExpression = v1QueryExpression;
+                this.v1Response = v1Response;
+            }
+
+            public Class<?> getV1BeanClass() {
+                return v1BeanClass;
+            }
+        }
+    }
+}
diff --git a/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/enhanced/dynamodb/EnhancedClientScanV1MapperComparisonBenchmark.java b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/enhanced/dynamodb/EnhancedClientScanV1MapperComparisonBenchmark.java
new file mode 100644
index 000000000000..f1875255adc2
--- /dev/null
+++ b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/enhanced/dynamodb/EnhancedClientScanV1MapperComparisonBenchmark.java
@@ -0,0 +1,166 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.benchmark.enhanced.dynamodb;
+
+import com.amazonaws.services.dynamodbv2.AmazonDynamoDB;
+import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapper;
+import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBScanExpression;
+import com.amazonaws.services.dynamodbv2.model.ScanResult;
+import java.util.Arrays;
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.BenchmarkMode;
+import org.openjdk.jmh.annotations.Fork;
+import org.openjdk.jmh.annotations.Measurement;
+import org.openjdk.jmh.annotations.Mode;
+import org.openjdk.jmh.annotations.Param;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.Warmup;
+import org.openjdk.jmh.infra.Blackhole;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClient;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbTable;
+import software.amazon.awssdk.enhanced.dynamodb.TableSchema;
+import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
+import software.amazon.awssdk.services.dynamodb.model.ScanResponse;
+
+@BenchmarkMode(Mode.Throughput)
+@Warmup(iterations = 5)
+@Measurement(iterations = 5)
+@Fork(2)
+@State(Scope.Benchmark)
+public class EnhancedClientScanV1MapperComparisonBenchmark {
+    private static final V2ItemFactory V2_ITEM_FACTORY = new V2ItemFactory();
+    private static final V1ItemFactory V1_ITEM_FACTORY = new V1ItemFactory();
+    private static final DynamoDBScanExpression V1_SCAN_EXPRESSION = new DynamoDBScanExpression();
+
+    @Benchmark
+    public Object v2Scan(TestState s) {
+        return s.v2Table.scan().iterator().next();
+    }
+
+    @Benchmark
+    public Object v1Scan(TestState s) {
+        return s.v1DdbMapper.scan(s.testItem.getV1BeanClass(), V1_SCAN_EXPRESSION).iterator().next();
+    }
+
+    private static DynamoDbClient getV2Client(Blackhole bh, ScanResponse scanResponse) {
+        return new V2TestDynamoDbScanClient(bh, scanResponse);
+    }
+
+    private static AmazonDynamoDB getV1Client(Blackhole bh, ScanResult scanResult) {
+        return new V1TestDynamoDbScanClient(bh, scanResult);
+    }
+
+    @State(Scope.Benchmark)
+    public static class TestState {
+        @Param({"TINY", "SMALL", "HUGE", "HUGE_FLAT"})
+        public TestItem testItem;
+
+        private DynamoDbTable<?> v2Table;
+        private DynamoDBMapper v1DdbMapper;
+
+
+        @Setup
+        public void setup(Blackhole bh) {
+            DynamoDbEnhancedClient v2DdbEnh = DynamoDbEnhancedClient.builder()
+                    .dynamoDbClient(getV2Client(bh, testItem.v2Response))
+                    .build();
+
+            v2Table = v2DdbEnh.table(testItem.name(), testItem.schema);
+
+            v1DdbMapper = new DynamoDBMapper(getV1Client(bh, testItem.v1Response));
+        }
+
+        public enum TestItem {
+            TINY(
+                    V2ItemFactory.TINY_BEAN_TABLE_SCHEMA,
+                    ScanResponse.builder()
+                                .items(Arrays.asList(V2_ITEM_FACTORY.tiny(),
+                                                     V2_ITEM_FACTORY.tiny(),
+                                                     V2_ITEM_FACTORY.tiny()))
+                                .build(),
+
+                    V1ItemFactory.V1TinyBean.class,
+                    new ScanResult().withItems(
+                        Arrays.asList(V1_ITEM_FACTORY.tiny(), V1_ITEM_FACTORY.tiny(), V1_ITEM_FACTORY.tiny()))
+            ),
+            SMALL(
+                    V2ItemFactory.SMALL_BEAN_TABLE_SCHEMA,
+                    ScanResponse.builder()
+                                .items(Arrays.asList(V2_ITEM_FACTORY.small(),
+                                                     V2_ITEM_FACTORY.small(),
+                                                     V2_ITEM_FACTORY.small()))
+                                .build(),
+
+                    V1ItemFactory.V1SmallBean.class,
+                    new ScanResult().withItems(
+                        Arrays.asList(V1_ITEM_FACTORY.small(), V1_ITEM_FACTORY.small(), V1_ITEM_FACTORY.small()))
+            ),
+
+            HUGE(
+                    V2ItemFactory.HUGE_BEAN_TABLE_SCHEMA,
+                    ScanResponse.builder()
+                                .items(Arrays.asList(V2_ITEM_FACTORY.huge(),
+                                                     V2_ITEM_FACTORY.huge(),
+                                                     V2_ITEM_FACTORY.huge()))
+                                .build(),
+
+                    V1ItemFactory.V1HugeBean.class,
+                    new ScanResult().withItems(
+                        Arrays.asList(V1_ITEM_FACTORY.huge(), V1_ITEM_FACTORY.huge(), V1_ITEM_FACTORY.huge()))
+            ),
+
+            HUGE_FLAT(
+                    V2ItemFactory.HUGE_BEAN_FLAT_TABLE_SCHEMA,
+                    ScanResponse.builder()
+                                .items(Arrays.asList(V2_ITEM_FACTORY.hugeFlat(),
+                                                     V2_ITEM_FACTORY.hugeFlat(),
+                                                     V2_ITEM_FACTORY.hugeFlat()))
+                                .build(),
+
+                    V1ItemFactory.V1HugeBeanFlat.class,
+                    new ScanResult().withItems(
+                        Arrays.asList(V1_ITEM_FACTORY.hugeFlat(), V1_ITEM_FACTORY.hugeFlat(), V1_ITEM_FACTORY.hugeFlat()))
+            ),
+            ;
+
+            // V2
+            private TableSchema<?> schema;
+            private ScanResponse v2Response;
+
+            // V1
+            private Class<?> v1BeanClass;
+            private ScanResult v1Response;
+
+            TestItem(TableSchema<?> schema,
+                     ScanResponse v2Response,
+
+                     Class<?> v1BeanClass,
+                     ScanResult v1Response) {
+                this.schema = schema;
+                this.v2Response = v2Response;
+
+                this.v1BeanClass = v1BeanClass;
+                this.v1Response = v1Response;
+            }
+
+            public Class<?> getV1BeanClass() {
+                return v1BeanClass;
+            }
+        }
+    }
+}
diff --git a/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/enhanced/dynamodb/EnhancedClientUpdateV1MapperComparisonBenchmark.java b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/enhanced/dynamodb/EnhancedClientUpdateV1MapperComparisonBenchmark.java
new file mode 100644
index 000000000000..a538526b6470
--- /dev/null
+++ b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/enhanced/dynamodb/EnhancedClientUpdateV1MapperComparisonBenchmark.java
@@ -0,0 +1,152 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.benchmark.enhanced.dynamodb;
+
+import com.amazonaws.services.dynamodbv2.AmazonDynamoDB;
+import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapper;
+import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperConfig;
+import com.amazonaws.services.dynamodbv2.model.UpdateItemResult;
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.BenchmarkMode;
+import org.openjdk.jmh.annotations.Fork;
+import org.openjdk.jmh.annotations.Measurement;
+import org.openjdk.jmh.annotations.Mode;
+import org.openjdk.jmh.annotations.Param;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.Warmup;
+import org.openjdk.jmh.infra.Blackhole;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClient;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbTable;
+import software.amazon.awssdk.enhanced.dynamodb.TableSchema;
+import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
+import software.amazon.awssdk.services.dynamodb.model.UpdateItemResponse;
+
+@BenchmarkMode(Mode.Throughput)
+@Warmup(iterations = 5)
+@Measurement(iterations = 5)
+@Fork(2)
+@State(Scope.Benchmark)
+public class EnhancedClientUpdateV1MapperComparisonBenchmark {
+    private static final V2ItemFactory V2_ITEM_FACTORY = new V2ItemFactory();
+    private static final V1ItemFactory V1_ITEM_FACTORY = new V1ItemFactory();
+    private static final DynamoDBMapperConfig MAPPER_CONFIG =
+        DynamoDBMapperConfig.builder()
+                            .withSaveBehavior(DynamoDBMapperConfig.SaveBehavior.UPDATE)
+                            .build();
+
+    @Benchmark
+    public void v2Update(TestState s) {
+        s.v2Table.updateItem(s.testItem.v2Bean);
+    }
+
+    @Benchmark
+    public void v1Update(TestState s) {
+        s.v1DdbMapper.save(s.testItem.v1Bean);
+    }
+
+    private static DynamoDbClient getV2Client(Blackhole bh, UpdateItemResponse updateItemResponse) {
+        return new V2TestDynamoDbUpdateItemClient(bh, updateItemResponse);
+    }
+
+    private static AmazonDynamoDB getV1Client(Blackhole bh, UpdateItemResult updateItemResult) {
+        return new V1TestDynamoDbUpdateItemClient(bh, updateItemResult);
+    }
+
+    @State(Scope.Benchmark)
+    public static class TestState {
+        @Param({"TINY", "SMALL", "HUGE", "HUGE_FLAT"})
+        public TestItem testItem;
+
+        private DynamoDbTable v2Table;
+        private DynamoDBMapper v1DdbMapper;
+
+
+        @Setup
+        public void setup(Blackhole bh) {
+            DynamoDbEnhancedClient v2DdbEnh = DynamoDbEnhancedClient.builder()
+                    .dynamoDbClient(getV2Client(bh, testItem.v2UpdateItemResponse))
+                    .build();
+
+            v2Table = v2DdbEnh.table(testItem.name(), testItem.schema);
+
+            v1DdbMapper = new DynamoDBMapper(getV1Client(bh, testItem.v1UpdateItemResult), MAPPER_CONFIG);
+        }
+
+        public enum TestItem {
+            TINY(
+                    V2ItemFactory.TINY_BEAN_TABLE_SCHEMA,
+                    V2_ITEM_FACTORY.tinyBean(),
+                    UpdateItemResponse.builder().attributes(V2_ITEM_FACTORY.tiny()).build(),
+
+                    V1_ITEM_FACTORY.v1TinyBean(),
+                    new UpdateItemResult().withAttributes(V1_ITEM_FACTORY.tiny())
+            ),
+
+            SMALL(
+                    V2ItemFactory.SMALL_BEAN_TABLE_SCHEMA,
+                    V2_ITEM_FACTORY.smallBean(),
+                    UpdateItemResponse.builder().attributes(V2_ITEM_FACTORY.small()).build(),
+
+                    V1_ITEM_FACTORY.v1SmallBean(),
+                    new UpdateItemResult().withAttributes(V1_ITEM_FACTORY.small())
+            ),
+
+            HUGE(
+                    V2ItemFactory.HUGE_BEAN_TABLE_SCHEMA,
+                    V2_ITEM_FACTORY.hugeBean(),
+                    UpdateItemResponse.builder().attributes(V2_ITEM_FACTORY.huge()).build(),
+
+                    V1_ITEM_FACTORY.v1hugeBean(),
+                    new UpdateItemResult().withAttributes(V1_ITEM_FACTORY.huge())
+            ),
+
+            HUGE_FLAT(
+                    V2ItemFactory.HUGE_BEAN_FLAT_TABLE_SCHEMA,
+                    V2_ITEM_FACTORY.hugeBeanFlat(),
+                    UpdateItemResponse.builder().attributes(V2_ITEM_FACTORY.hugeFlat()).build(),
+
+                    V1_ITEM_FACTORY.v1HugeBeanFlat(),
+                    new UpdateItemResult().withAttributes(V1_ITEM_FACTORY.hugeFlat())
+            ),
+            ;
+
+            // V2
+            private TableSchema schema;
+            private Object v2Bean;
+            private UpdateItemResponse v2UpdateItemResponse;
+
+            // V1
+            private Object v1Bean;
+            private UpdateItemResult v1UpdateItemResult;
+
+            TestItem(TableSchema<?> schema,
+                             Object v2Bean,
+                             UpdateItemResponse v2UpdateItemResponse,
+
+                             Object v1Bean,
+                             UpdateItemResult v1UpdateItemResult) {
+                this.schema = schema;
+                this.v2Bean = v2Bean;
+                this.v2UpdateItemResponse = v2UpdateItemResponse;
+
+                this.v1Bean = v1Bean;
+                this.v1UpdateItemResult = v1UpdateItemResult;
+            }
+        }
+    }
+}
diff --git a/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/enhanced/dynamodb/ItemFactory.java b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/enhanced/dynamodb/ItemFactory.java
new file mode 100755
index 000000000000..4ac7ecc8d6bd
--- /dev/null
+++ b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/enhanced/dynamodb/ItemFactory.java
@@ -0,0 +1,860 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.benchmark.enhanced.dynamodb;
+
+import com.amazonaws.util.ImmutableMapParameter;
+import java.lang.reflect.Method;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+import software.amazon.awssdk.core.SdkBytes;
+
+abstract class ItemFactory<T> {
+    private static final String ALPHA = "abcdefghijklmnopqrstuvwxyz";
+
+    private static final Random RNG = new Random();
+
+    public final Map<String, T> tiny() {
+        return asItem(tinyBean());
+    }
+
+    public final Map<String, T> small() {
+        return asItem(smallBean());
+    }
+
+    public final Map<String, T> huge() {
+        return asItem(hugeBean());
+    }
+
+    public final Map<String, T> hugeFlat() {
+        return asItem(hugeBeanFlat());
+    }
+
+    public final TinyBean tinyBean() {
+        TinyBean b = new TinyBean();
+        b.setStringAttr(randomS());
+        return b;
+    }
+
+    public final SmallBean smallBean() {
+        SmallBean b = new SmallBean();
+        b.setStringAttr(randomS());
+        b.setBinaryAttr(randomBytes());
+        b.setListAttr(Arrays.asList(randomS(), randomS(), randomS()));
+        return b;
+    }
+
+    public final HugeBean hugeBean() {
+        HugeBean b = new HugeBean();
+        b.setHashKey(randomS());
+        b.setStringAttr(randomS());
+        b.setBinaryAttr(randomBytes());
+        b.setListAttr(IntStream.range(0, 32).mapToObj(i -> randomS()).collect(Collectors.toList()));
+
+        Map<String, SdkBytes> mapAttr1 = new HashMap<>();
+        mapAttr1.put("key1", randomBytes());
+        mapAttr1.put("key2", randomBytes());
+        mapAttr1.put("key3", randomBytes());
+
+        b.setMapAttr1(mapAttr1);
+
+        Map<String, List<SdkBytes>> mapAttr2 = new HashMap<>();
+        mapAttr2.put("key1", Arrays.asList(randomBytes()));
+        mapAttr2.put("key2", IntStream.range(0, 2).mapToObj(i -> randomBytes()).collect(Collectors.toList()));
+        mapAttr2.put("key3", IntStream.range(0, 4).mapToObj(i -> randomBytes()).collect(Collectors.toList()));
+        mapAttr2.put("key4", IntStream.range(0, 8).mapToObj(i -> randomBytes()).collect(Collectors.toList()));
+        mapAttr2.put("key5", IntStream.range(0, 16).mapToObj(i -> randomBytes()).collect(Collectors.toList()));
+
+        b.setMapAttr2(mapAttr2);
+
+        ImmutableMapParameter.Builder<String, List<Map<String, List<SdkBytes>>>> mapAttr3Builder =
+                ImmutableMapParameter.builder();
+
+        List<Map<String, List<SdkBytes>>> value = Arrays.asList(
+                ImmutableMapParameter.<String, List<SdkBytes>>builder()
+                        .put("key1", IntStream.range(0, 2).mapToObj(i -> randomBytes()).collect(Collectors.toList()))
+                        .build(),
+                ImmutableMapParameter.<String, List<SdkBytes>>builder()
+                        .put("key2", IntStream.range(0, 4).mapToObj(i -> randomBytes()).collect(Collectors.toList()))
+                        .build(),
+                ImmutableMapParameter.<String, List<SdkBytes>>builder()
+                        .put("key3", IntStream.range(0, 8).mapToObj(i -> randomBytes()).collect(Collectors.toList()))
+                        .build()
+        );
+
+        mapAttr3Builder.put("key1", value)
+                       .put("key2", value)
+                       .build();
+
+        b.setMapAttr3(mapAttr3Builder.build());
+
+        return b;
+    }
+
+    public HugeBeanFlat hugeBeanFlat() {
+        HugeBeanFlat b = new HugeBeanFlat();
+        Class<HugeBeanFlat> clazz = HugeBeanFlat.class;
+        for (int i = 1; i <= 63; ++i) {
+            try {
+                Method setter = clazz.getMethod("setStringAttr" + i, String.class);
+                setter.setAccessible(true);
+                setter.invoke(b, randomS());
+            } catch (Throwable t) {
+                throw new RuntimeException(t);
+            }
+        }
+        return b;
+    }
+
+    protected abstract Map<String, T> asItem(TinyBean b);
+
+    protected abstract Map<String, T> asItem(SmallBean b);
+
+    protected abstract Map<String, T> asItem(HugeBean b);
+
+    protected final Map<String, T> asItem(HugeBeanFlat b) {
+        Map<String, T> item = new HashMap<>();
+        Class<HugeBeanFlat> clazz = HugeBeanFlat.class;
+        for (int i = 1; i <= 63; ++i) {
+            try {
+                Method getter = clazz.getMethod("getStringAttr" + i);
+                getter.setAccessible(true);
+                item.put("stringAttr" + i, av((String) getter.invoke(b)));
+            } catch (Throwable t) {
+                throw new RuntimeException(t);
+            }
+        }
+        return item;
+    }
+
+    protected abstract T av(String val);
+
+    protected abstract T av(List<T> val);
+
+    protected abstract T av(Map<String, T> val);
+
+    protected abstract T av(SdkBytes val);
+
+    private static String randomS(int len) {
+        StringBuilder sb = new StringBuilder(len);
+        for (int i = 0; i < len; ++i) {
+            sb.append(ALPHA.charAt(RNG.nextInt(ALPHA.length())));
+        }
+        return sb.toString();
+    }
+
+    private static String randomS() {
+        return randomS(16);
+    }
+
+    private static ByteBuffer randomB(int len) {
+        byte[] b = new byte[len];
+        RNG.nextBytes(b);
+        return ByteBuffer.wrap(b);
+    }
+
+    private static ByteBuffer randomB() {
+        return randomB(16);
+    }
+
+    private static SdkBytes randomBytes() {
+        return SdkBytes.fromByteBuffer(randomB());
+    }
+
+    public static class TinyBean {
+        private String stringAttr;
+
+        public String getStringAttr() {
+            return stringAttr;
+        }
+
+        public void setStringAttr(String stringAttr) {
+            this.stringAttr = stringAttr;
+        }
+    }
+
+    public static class SmallBean {
+        private String stringAttr;
+        private SdkBytes binaryAttr;
+        private List<String> listAttr;
+
+        public String getStringAttr() {
+            return stringAttr;
+        }
+
+        public void setStringAttr(String stringAttr) {
+            this.stringAttr = stringAttr;
+        }
+
+        public SdkBytes getBinaryAttr() {
+            return binaryAttr;
+        }
+
+        public void setBinaryAttr(SdkBytes binaryAttr) {
+            this.binaryAttr = binaryAttr;
+        }
+
+        public List<String> getListAttr() {
+            return listAttr;
+        }
+
+        public void setListAttr(List<String> listAttr) {
+            this.listAttr = listAttr;
+        }
+    }
+
+    public static class HugeBean {
+        private String hashKey;
+        private String stringAttr;
+        private SdkBytes binaryAttr;
+        private List<String> listAttr;
+
+        private Map<String, SdkBytes> mapAttr1;
+        private Map<String, List<SdkBytes>> mapAttr2;
+        private Map<String, List<Map<String, List<SdkBytes>>>> mapAttr3;
+
+        public String getHashKey() {
+            return hashKey;
+        }
+
+        public void setHashKey(String hashKey) {
+            this.hashKey = hashKey;
+        }
+
+        public String getStringAttr() {
+            return stringAttr;
+        }
+
+        public void setStringAttr(String stringAttr) {
+            this.stringAttr = stringAttr;
+        }
+
+        public SdkBytes getBinaryAttr() {
+            return binaryAttr;
+        }
+
+        public void setBinaryAttr(SdkBytes binaryAttr) {
+            this.binaryAttr = binaryAttr;
+        }
+
+        public List<String> getListAttr() {
+            return listAttr;
+        }
+
+        public void setListAttr(List<String> listAttr) {
+            this.listAttr = listAttr;
+        }
+
+        public Map<String, SdkBytes> getMapAttr1() {
+            return mapAttr1;
+        }
+
+        public void setMapAttr1(Map<String, SdkBytes> mapAttr1) {
+            this.mapAttr1 = mapAttr1;
+        }
+
+        public Map<String, List<SdkBytes>> getMapAttr2() {
+            return mapAttr2;
+        }
+
+        public void setMapAttr2(Map<String, List<SdkBytes>> mapAttr2) {
+            this.mapAttr2 = mapAttr2;
+        }
+
+        public Map<String, List<Map<String, List<SdkBytes>>>> getMapAttr3() {
+            return mapAttr3;
+        }
+
+        public void setMapAttr3(Map<String, List<Map<String, List<SdkBytes>>>> mapAttr3) {
+            this.mapAttr3 = mapAttr3;
+        }
+    }
+
+    public static class HugeBeanFlat {
+        private String stringAttr1;
+        private String stringAttr2;
+        private String stringAttr3;
+        private String stringAttr4;
+        private String stringAttr5;
+        private String stringAttr6;
+        private String stringAttr7;
+        private String stringAttr8;
+        private String stringAttr9;
+        private String stringAttr10;
+        private String stringAttr11;
+        private String stringAttr12;
+        private String stringAttr13;
+        private String stringAttr14;
+        private String stringAttr15;
+        private String stringAttr16;
+        private String stringAttr17;
+        private String stringAttr18;
+        private String stringAttr19;
+        private String stringAttr20;
+        private String stringAttr21;
+        private String stringAttr22;
+        private String stringAttr23;
+        private String stringAttr24;
+        private String stringAttr25;
+        private String stringAttr26;
+        private String stringAttr27;
+        private String stringAttr28;
+        private String stringAttr29;
+        private String stringAttr30;
+        private String stringAttr31;
+        private String stringAttr32;
+        private String stringAttr33;
+        private String stringAttr34;
+        private String stringAttr35;
+        private String stringAttr36;
+        private String stringAttr37;
+        private String stringAttr38;
+        private String stringAttr39;
+        private String stringAttr40;
+        private String stringAttr41;
+        private String stringAttr42;
+        private String stringAttr43;
+        private String stringAttr44;
+        private String stringAttr45;
+        private String stringAttr46;
+        private String stringAttr47;
+        private String stringAttr48;
+        private String stringAttr49;
+        private String stringAttr50;
+        private String stringAttr51;
+        private String stringAttr52;
+        private String stringAttr53;
+        private String stringAttr54;
+        private String stringAttr55;
+        private String stringAttr56;
+        private String stringAttr57;
+        private String stringAttr58;
+        private String stringAttr59;
+        private String stringAttr60;
+        private String stringAttr61;
+        private String stringAttr62;
+        private String stringAttr63;
+
+        public String getStringAttr1() {
+            return stringAttr1;
+        }
+
+        public void setStringAttr1(String stringAttr1) {
+            this.stringAttr1 = stringAttr1;
+        }
+
+        public String getStringAttr2() {
+            return stringAttr2;
+        }
+
+        public void setStringAttr2(String stringAttr2) {
+            this.stringAttr2 = stringAttr2;
+        }
+
+        public String getStringAttr3() {
+            return stringAttr3;
+        }
+
+        public void setStringAttr3(String stringAttr3) {
+            this.stringAttr3 = stringAttr3;
+        }
+
+        public String getStringAttr4() {
+            return stringAttr4;
+        }
+
+        public void setStringAttr4(String stringAttr4) {
+            this.stringAttr4 = stringAttr4;
+        }
+
+        public String getStringAttr5() {
+            return stringAttr5;
+        }
+
+        public void setStringAttr5(String stringAttr5) {
+            this.stringAttr5 = stringAttr5;
+        }
+
+        public String getStringAttr6() {
+            return stringAttr6;
+        }
+
+        public void setStringAttr6(String stringAttr6) {
+            this.stringAttr6 = stringAttr6;
+        }
+
+        public String getStringAttr7() {
+            return stringAttr7;
+        }
+
+        public void setStringAttr7(String stringAttr7) {
+            this.stringAttr7 = stringAttr7;
+        }
+
+        public String getStringAttr8() {
+            return stringAttr8;
+        }
+
+        public void setStringAttr8(String stringAttr8) {
+            this.stringAttr8 = stringAttr8;
+        }
+
+        public String getStringAttr9() {
+            return stringAttr9;
+        }
+
+        public void setStringAttr9(String stringAttr9) {
+            this.stringAttr9 = stringAttr9;
+        }
+
+        public String getStringAttr10() {
+            return stringAttr10;
+        }
+
+        public void setStringAttr10(String stringAttr10) {
+            this.stringAttr10 = stringAttr10;
+        }
+
+        public String getStringAttr11() {
+            return stringAttr11;
+        }
+
+        public void setStringAttr11(String stringAttr11) {
+            this.stringAttr11 = stringAttr11;
+        }
+
+        public String getStringAttr12() {
+            return stringAttr12;
+        }
+
+        public void setStringAttr12(String stringAttr12) {
+            this.stringAttr12 = stringAttr12;
+        }
+
+        public String getStringAttr13() {
+            return stringAttr13;
+        }
+
+        public void setStringAttr13(String stringAttr13) {
+            this.stringAttr13 = stringAttr13;
+        }
+
+        public String getStringAttr14() {
+            return stringAttr14;
+        }
+
+        public void setStringAttr14(String stringAttr14) {
+            this.stringAttr14 = stringAttr14;
+        }
+
+        public String getStringAttr15() {
+            return stringAttr15;
+        }
+
+        public void setStringAttr15(String stringAttr15) {
+            this.stringAttr15 = stringAttr15;
+        }
+
+        public String getStringAttr16() {
+            return stringAttr16;
+        }
+
+        public void setStringAttr16(String stringAttr16) {
+            this.stringAttr16 = stringAttr16;
+        }
+
+        public String getStringAttr17() {
+            return stringAttr17;
+        }
+
+        public void setStringAttr17(String stringAttr17) {
+            this.stringAttr17 = stringAttr17;
+        }
+
+        public String getStringAttr18() {
+            return stringAttr18;
+        }
+
+        public void setStringAttr18(String stringAttr18) {
+            this.stringAttr18 = stringAttr18;
+        }
+
+        public String getStringAttr19() {
+            return stringAttr19;
+        }
+
+        public void setStringAttr19(String stringAttr19) {
+            this.stringAttr19 = stringAttr19;
+        }
+
+        public String getStringAttr20() {
+            return stringAttr20;
+        }
+
+        public void setStringAttr20(String stringAttr20) {
+            this.stringAttr20 = stringAttr20;
+        }
+
+        public String getStringAttr21() {
+            return stringAttr21;
+        }
+
+        public void setStringAttr21(String stringAttr21) {
+            this.stringAttr21 = stringAttr21;
+        }
+
+        public String getStringAttr22() {
+            return stringAttr22;
+        }
+
+        public void setStringAttr22(String stringAttr22) {
+            this.stringAttr22 = stringAttr22;
+        }
+
+        public String getStringAttr23() {
+            return stringAttr23;
+        }
+
+        public void setStringAttr23(String stringAttr23) {
+            this.stringAttr23 = stringAttr23;
+        }
+
+        public String getStringAttr24() {
+            return stringAttr24;
+        }
+
+        public void setStringAttr24(String stringAttr24) {
+            this.stringAttr24 = stringAttr24;
+        }
+
+        public String getStringAttr25() {
+            return stringAttr25;
+        }
+
+        public void setStringAttr25(String stringAttr25) {
+            this.stringAttr25 = stringAttr25;
+        }
+
+        public String getStringAttr26() {
+            return stringAttr26;
+        }
+
+        public void setStringAttr26(String stringAttr26) {
+            this.stringAttr26 = stringAttr26;
+        }
+
+        public String getStringAttr27() {
+            return stringAttr27;
+        }
+
+        public void setStringAttr27(String stringAttr27) {
+            this.stringAttr27 = stringAttr27;
+        }
+
+        public String getStringAttr28() {
+            return stringAttr28;
+        }
+
+        public void setStringAttr28(String stringAttr28) {
+            this.stringAttr28 = stringAttr28;
+        }
+
+        public String getStringAttr29() {
+            return stringAttr29;
+        }
+
+        public void setStringAttr29(String stringAttr29) {
+            this.stringAttr29 = stringAttr29;
+        }
+
+        public String getStringAttr30() {
+            return stringAttr30;
+        }
+
+        public void setStringAttr30(String stringAttr30) {
+            this.stringAttr30 = stringAttr30;
+        }
+
+        public String getStringAttr31() {
+            return stringAttr31;
+        }
+
+        public void setStringAttr31(String stringAttr31) {
+            this.stringAttr31 = stringAttr31;
+        }
+
+        public String getStringAttr32() {
+            return stringAttr32;
+        }
+
+        public void setStringAttr32(String stringAttr32) {
+            this.stringAttr32 = stringAttr32;
+        }
+
+        public String getStringAttr33() {
+            return stringAttr33;
+        }
+
+        public void setStringAttr33(String stringAttr33) {
+            this.stringAttr33 = stringAttr33;
+        }
+
+        public String getStringAttr34() {
+            return stringAttr34;
+        }
+
+        public void setStringAttr34(String stringAttr34) {
+            this.stringAttr34 = stringAttr34;
+        }
+
+        public String getStringAttr35() {
+            return stringAttr35;
+        }
+
+        public void setStringAttr35(String stringAttr35) {
+            this.stringAttr35 = stringAttr35;
+        }
+
+        public String getStringAttr36() {
+            return stringAttr36;
+        }
+
+        public void setStringAttr36(String stringAttr36) {
+            this.stringAttr36 = stringAttr36;
+        }
+
+        public String getStringAttr37() {
+            return stringAttr37;
+        }
+
+        public void setStringAttr37(String stringAttr37) {
+            this.stringAttr37 = stringAttr37;
+        }
+
+        public String getStringAttr38() {
+            return stringAttr38;
+        }
+
+        public void setStringAttr38(String stringAttr38) {
+            this.stringAttr38 = stringAttr38;
+        }
+
+        public String getStringAttr39() {
+            return stringAttr39;
+        }
+
+        public void setStringAttr39(String stringAttr39) {
+            this.stringAttr39 = stringAttr39;
+        }
+
+        public String getStringAttr40() {
+            return stringAttr40;
+        }
+
+        public void setStringAttr40(String stringAttr40) {
+            this.stringAttr40 = stringAttr40;
+        }
+
+        public String getStringAttr41() {
+            return stringAttr41;
+        }
+
+        public void setStringAttr41(String stringAttr41) {
+            this.stringAttr41 = stringAttr41;
+        }
+
+        public String getStringAttr42() {
+            return stringAttr42;
+        }
+
+        public void setStringAttr42(String stringAttr42) {
+            this.stringAttr42 = stringAttr42;
+        }
+
+        public String getStringAttr43() {
+            return stringAttr43;
+        }
+
+        public void setStringAttr43(String stringAttr43) {
+            this.stringAttr43 = stringAttr43;
+        }
+
+        public String getStringAttr44() {
+            return stringAttr44;
+        }
+
+        public void setStringAttr44(String stringAttr44) {
+            this.stringAttr44 = stringAttr44;
+        }
+
+        public String getStringAttr45() {
+            return stringAttr45;
+        }
+
+        public void setStringAttr45(String stringAttr45) {
+            this.stringAttr45 = stringAttr45;
+        }
+
+        public String getStringAttr46() {
+            return stringAttr46;
+        }
+
+        public void setStringAttr46(String stringAttr46) {
+            this.stringAttr46 = stringAttr46;
+        }
+
+        public String getStringAttr47() {
+            return stringAttr47;
+        }
+
+        public void setStringAttr47(String stringAttr47) {
+            this.stringAttr47 = stringAttr47;
+        }
+
+        public String getStringAttr48() {
+            return stringAttr48;
+        }
+
+        public void setStringAttr48(String stringAttr48) {
+            this.stringAttr48 = stringAttr48;
+        }
+
+        public String getStringAttr49() {
+            return stringAttr49;
+        }
+
+        public void setStringAttr49(String stringAttr49) {
+            this.stringAttr49 = stringAttr49;
+        }
+
+        public String getStringAttr50() {
+            return stringAttr50;
+        }
+
+        public void setStringAttr50(String stringAttr50) {
+            this.stringAttr50 = stringAttr50;
+        }
+
+        public String getStringAttr51() {
+            return stringAttr51;
+        }
+
+        public void setStringAttr51(String stringAttr51) {
+            this.stringAttr51 = stringAttr51;
+        }
+
+        public String getStringAttr52() {
+            return stringAttr52;
+        }
+
+        public void setStringAttr52(String stringAttr52) {
+            this.stringAttr52 = stringAttr52;
+        }
+
+        public String getStringAttr53() {
+            return stringAttr53;
+        }
+
+        public void setStringAttr53(String stringAttr53) {
+            this.stringAttr53 = stringAttr53;
+        }
+
+        public String getStringAttr54() {
+            return stringAttr54;
+        }
+
+        public void setStringAttr54(String stringAttr54) {
+            this.stringAttr54 = stringAttr54;
+        }
+
+        public String getStringAttr55() {
+            return stringAttr55;
+        }
+
+        public void setStringAttr55(String stringAttr55) {
+            this.stringAttr55 = stringAttr55;
+        }
+
+        public String getStringAttr56() {
+            return stringAttr56;
+        }
+
+        public void setStringAttr56(String stringAttr56) {
+            this.stringAttr56 = stringAttr56;
+        }
+
+        public String getStringAttr57() {
+            return stringAttr57;
+        }
+
+        public void setStringAttr57(String stringAttr57) {
+            this.stringAttr57 = stringAttr57;
+        }
+
+        public String getStringAttr58() {
+            return stringAttr58;
+        }
+
+        public void setStringAttr58(String stringAttr58) {
+            this.stringAttr58 = stringAttr58;
+        }
+
+        public String getStringAttr59() {
+            return stringAttr59;
+        }
+
+        public void setStringAttr59(String stringAttr59) {
+            this.stringAttr59 = stringAttr59;
+        }
+
+        public String getStringAttr60() {
+            return stringAttr60;
+        }
+
+        public void setStringAttr60(String stringAttr60) {
+            this.stringAttr60 = stringAttr60;
+        }
+
+        public String getStringAttr61() {
+            return stringAttr61;
+        }
+
+        public void setStringAttr61(String stringAttr61) {
+            this.stringAttr61 = stringAttr61;
+        }
+
+        public String getStringAttr62() {
+            return stringAttr62;
+        }
+
+        public void setStringAttr62(String stringAttr62) {
+            this.stringAttr62 = stringAttr62;
+        }
+
+        public String getStringAttr63() {
+            return stringAttr63;
+        }
+
+        public void setStringAttr63(String stringAttr63) {
+            this.stringAttr63 = stringAttr63;
+        }
+    }
+}
diff --git a/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/enhanced/dynamodb/V1ItemFactory.java b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/enhanced/dynamodb/V1ItemFactory.java
new file mode 100644
index 000000000000..0acac1290fab
--- /dev/null
+++ b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/enhanced/dynamodb/V1ItemFactory.java
@@ -0,0 +1,703 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.benchmark.enhanced.dynamodb;
+
+import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBAttribute;
+import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBHashKey;
+import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTable;
+import com.amazonaws.services.dynamodbv2.model.AttributeValue;
+import com.amazonaws.util.ImmutableMapParameter;
+import java.lang.reflect.Method;
+import java.nio.ByteBuffer;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import software.amazon.awssdk.core.SdkBytes;
+
+public final class V1ItemFactory extends ItemFactory<AttributeValue> {
+    public V1HugeBean v1hugeBean() {
+        return V1HugeBean.fromHugeBean(super.hugeBean());
+    }
+
+    public V1TinyBean v1TinyBean() {
+        return V1TinyBean.fromTinyBean(super.tinyBean());
+    }
+
+    public V1SmallBean v1SmallBean() {
+        return V1SmallBean.fromSmallBean(super.smallBean());
+    }
+
+    public V1HugeBeanFlat v1HugeBeanFlat() {
+        return V1HugeBeanFlat.fromHugeBeanFlat(super.hugeBeanFlat());
+    }
+
+    @Override
+    protected Map<String, AttributeValue> asItem(TinyBean b) {
+        ImmutableMapParameter.Builder<String, AttributeValue> builder = ImmutableMapParameter.builder();
+
+        builder.put("stringAttr", av(b.getStringAttr()));
+
+        return builder.build();
+    }
+
+    @Override
+    protected Map<String, AttributeValue> asItem(SmallBean b) {
+        ImmutableMapParameter.Builder<String, AttributeValue> builder = ImmutableMapParameter.builder();
+
+        builder.put("stringAttr", av(b.getStringAttr()));
+        builder.put("binaryAttr", av(b.getBinaryAttr()));
+
+        List<AttributeValue> listAttr = b.getListAttr().stream().map(this::av).collect(Collectors.toList());
+
+        builder.put("listAttr", av(listAttr));
+
+        return builder.build();
+    }
+
+    @Override
+    protected Map<String, AttributeValue> asItem(HugeBean b) {
+        ImmutableMapParameter.Builder<String, AttributeValue> builder = ImmutableMapParameter.builder();
+
+        builder.put("hashKey", av(b.getHashKey()));
+        builder.put("stringAttr", av(b.getStringAttr()));
+        builder.put("binaryAttr", av(b.getBinaryAttr()));
+
+        List<AttributeValue> listAttr = b.getListAttr().stream().map(this::av).collect(Collectors.toList());
+
+        builder.put("listAttr", av(listAttr));
+
+        Map<String, AttributeValue> mapAttr1 = b.getMapAttr1().entrySet().stream().collect(
+                Collectors.toMap(Map.Entry::getKey,
+                    e -> av(e.getValue())));
+
+        builder.put("mapAttr1", av(mapAttr1));
+
+
+        Map<String, AttributeValue> mapAttr2 = b.getMapAttr2().entrySet().stream().collect(
+                Collectors.toMap(Map.Entry::getKey,
+                    e -> av(e.getValue().stream().map(this::av).collect(Collectors.toList()))));
+
+        builder.put("mapAttr2", av(mapAttr2));
+
+        Map<String, AttributeValue> mapAttr3 = b.getMapAttr3().entrySet().stream().collect(Collectors.toMap(Map.Entry::getKey,
+            e -> {
+                List<Map<String, List<SdkBytes>>> value = e.getValue();
+                AttributeValue valueAv = av(value.stream().map(m -> av(m.entrySet().stream()
+                        .collect(Collectors.toMap(Map.Entry::getKey,
+                            ee -> av(ee.getValue().stream().map(this::av).collect(Collectors.toList()))))))
+                        .collect(Collectors.toList()));
+                return valueAv;
+            }));
+
+        builder.put("mapAttr3", av(mapAttr3));
+
+        return builder.build();
+    }
+
+    @Override
+    protected AttributeValue av(String val) {
+        return new AttributeValue()
+                .withS(val);
+    }
+
+    @Override
+    protected AttributeValue av(List<AttributeValue> val) {
+        return new AttributeValue()
+                .withL(val);
+    }
+
+    @Override
+    protected AttributeValue av(Map<String, AttributeValue> val) {
+        return new AttributeValue()
+                .withM(val);
+    }
+
+    @Override
+    protected AttributeValue av(SdkBytes val) {
+        return new AttributeValue()
+                .withB(val.asByteBuffer());
+    }
+
+    @DynamoDBTable(tableName = "V1TinyBean")
+    public static class V1TinyBean extends ItemFactory.TinyBean {
+        public V1TinyBean() {
+        }
+
+        public V1TinyBean(String stringAttr) {
+            super.setStringAttr(stringAttr);
+        }
+
+        @DynamoDBHashKey
+        @Override
+        public String getStringAttr() {
+            return super.getStringAttr();
+        }
+
+        private static V1TinyBean fromTinyBean(TinyBean tb) {
+            V1TinyBean b = new V1TinyBean();
+            b.setStringAttr(tb.getStringAttr());
+            return b;
+        }
+    }
+
+    @DynamoDBTable(tableName = "V1SmallBean")
+    public static class V1SmallBean extends ItemFactory.SmallBean {
+        private ByteBuffer binaryAttr;
+
+        public V1SmallBean() {
+        }
+
+        public V1SmallBean(String stringAttr) {
+            super.setStringAttr(stringAttr);
+        }
+
+        @DynamoDBHashKey
+        @Override
+        public String getStringAttr() {
+            return super.getStringAttr();
+        }
+
+        @DynamoDBAttribute(attributeName = "binaryAttr")
+        public ByteBuffer getBinaryAttrV1() {
+            return binaryAttr;
+        }
+
+        @DynamoDBAttribute(attributeName = "binaryAttr")
+        public void setBinaryAttrV1(ByteBuffer binaryAttr) {
+            this.binaryAttr = binaryAttr;
+        }
+
+        @DynamoDBAttribute
+        @Override
+        public List<String> getListAttr() {
+            return super.getListAttr();
+        }
+
+        private static V1SmallBean fromSmallBean(SmallBean sb) {
+            V1SmallBean b = new V1SmallBean();
+            b.setStringAttr(sb.getStringAttr());
+            b.setBinaryAttrV1(sb.getBinaryAttr().asByteBuffer());
+            b.setListAttr(sb.getListAttr());
+            return b;
+        }
+    }
+
+    @DynamoDBTable(tableName = "V1HugeBean")
+    public static class V1HugeBean extends ItemFactory.HugeBean {
+        private ByteBuffer binaryAttr;
+        private Map<String, ByteBuffer> mapAttr1;
+        private Map<String, List<ByteBuffer>> mapAttr2;
+        private Map<String, List<Map<String, List<ByteBuffer>>>> mapAttr3;
+
+        public V1HugeBean() {
+        }
+
+        public V1HugeBean(String stringAttr) {
+            super.setStringAttr(stringAttr);
+        }
+
+        @DynamoDBHashKey
+        @Override
+        public String getStringAttr() {
+            return super.getStringAttr();
+        }
+
+        @DynamoDBAttribute
+        @Override
+        public String getHashKey() {
+            return super.getHashKey();
+        }
+
+        @DynamoDBAttribute(attributeName = "binaryAttr")
+        public ByteBuffer getBinaryAttrV1() {
+            return binaryAttr;
+        }
+
+        @DynamoDBAttribute(attributeName = "binaryAttr")
+        public void setBinaryAttrV1(ByteBuffer binaryAttr) {
+            this.binaryAttr = binaryAttr;
+        }
+
+        @DynamoDBAttribute
+        @Override
+        public List<String> getListAttr() {
+            return super.getListAttr();
+        }
+
+        @DynamoDBAttribute(attributeName = "mapAttr1")
+        public Map<String, ByteBuffer> getMapAttr1V1() {
+            return mapAttr1;
+        }
+
+        @DynamoDBAttribute(attributeName = "mapAttr1")
+        public void setMapAttr1V1(Map<String, ByteBuffer> mapAttr1) {
+            this.mapAttr1 = mapAttr1;
+        }
+
+        @DynamoDBAttribute(attributeName = "mapAttr2")
+        public Map<String, List<ByteBuffer>> getMapAttr2V1() {
+            return mapAttr2;
+        }
+
+        @DynamoDBAttribute(attributeName = "mapAttr2")
+        public void setMapAttr2V1(Map<String, List<ByteBuffer>> mapAttr2) {
+            this.mapAttr2 = mapAttr2;
+        }
+
+        @DynamoDBAttribute(attributeName = "mapAttr3")
+        public Map<String, List<Map<String, List<ByteBuffer>>>> getMapAttr3V1() {
+            return mapAttr3;
+        }
+
+        @DynamoDBAttribute(attributeName = "mapAttr3")
+        public void setMapAttr3V1(Map<String, List<Map<String, List<ByteBuffer>>>> mapAttr3) {
+            this.mapAttr3 = mapAttr3;
+        }
+
+        private static V1HugeBean fromHugeBean(HugeBean hb) {
+            V1HugeBean b = new V1HugeBean();
+            b.setHashKey(hb.getHashKey());
+            b.setStringAttr(hb.getStringAttr());
+            b.setBinaryAttrV1(hb.getBinaryAttr().asByteBuffer());
+            b.setListAttr(hb.getListAttr());
+
+            b.setMapAttr1V1(hb.getMapAttr1()
+                    .entrySet().stream()
+                    .collect(Collectors.toMap(Map.Entry::getKey, e -> e.getValue().asByteBuffer())));
+
+            b.setMapAttr2V1(hb.getMapAttr2()
+                    .entrySet().stream()
+                    .collect(Collectors.toMap(Map.Entry::getKey,
+                        e -> e.getValue().stream().map(SdkBytes::asByteBuffer).collect(Collectors.toList()))));
+
+            Map<String, List<Map<String, List<ByteBuffer>>>> mapAttr3V1 = hb.getMapAttr3()
+                    .entrySet().stream()
+                    .collect(Collectors.toMap(Map.Entry::getKey, e -> e.getValue().stream()
+                            .map(m -> m.entrySet().stream().collect(Collectors.toMap(Map.Entry::getKey, ee ->
+                                    ee.getValue().stream().map(SdkBytes::asByteBuffer).collect(Collectors.toList())
+                            )))
+                            .collect(Collectors.toList())));
+
+            b.setMapAttr3V1(mapAttr3V1);
+
+            return b;
+        }
+    }
+
+    @DynamoDBTable(tableName = "V1HugeBeanFlat")
+    public static class V1HugeBeanFlat extends HugeBeanFlat {
+        public V1HugeBeanFlat() {
+        }
+
+        public V1HugeBeanFlat(String stringAttr) {
+            this.setStringAttr1(stringAttr);
+        }
+
+        @DynamoDBAttribute(attributeName = "stringAttr1")
+        @DynamoDBHashKey
+        @Override
+        public String getStringAttr1() {
+            return super.getStringAttr1();
+        }
+
+        @DynamoDBAttribute(attributeName = "stringAttr2")
+        @Override
+        public String getStringAttr2() {
+            return super.getStringAttr2();
+        }
+
+        @DynamoDBAttribute(attributeName = "stringAttr3")
+        @Override
+        public String getStringAttr3() {
+            return super.getStringAttr3();
+        }
+
+        @DynamoDBAttribute(attributeName = "stringAttr4")
+        @Override
+        public String getStringAttr4() {
+            return super.getStringAttr4();
+        }
+
+        @DynamoDBAttribute(attributeName = "stringAttr5")
+        @Override
+        public String getStringAttr5() {
+            return super.getStringAttr5();
+        }
+
+        @DynamoDBAttribute(attributeName = "stringAttr6")
+        @Override
+        public String getStringAttr6() {
+            return super.getStringAttr6();
+        }
+
+        @DynamoDBAttribute(attributeName = "stringAttr7")
+        @Override
+        public String getStringAttr7() {
+            return super.getStringAttr7();
+        }
+
+        @DynamoDBAttribute(attributeName = "stringAttr8")
+        @Override
+        public String getStringAttr8() {
+            return super.getStringAttr8();
+        }
+
+        @DynamoDBAttribute(attributeName = "stringAttr9")
+        @Override
+        public String getStringAttr9() {
+            return super.getStringAttr9();
+        }
+
+        @DynamoDBAttribute(attributeName = "stringAttr10")
+        @Override
+        public String getStringAttr10() {
+            return super.getStringAttr10();
+        }
+
+        @DynamoDBAttribute(attributeName = "stringAttr11")
+        @Override
+        public String getStringAttr11() {
+            return super.getStringAttr11();
+        }
+
+        @DynamoDBAttribute(attributeName = "stringAttr12")
+        @Override
+        public String getStringAttr12() {
+            return super.getStringAttr12();
+        }
+
+        @DynamoDBAttribute(attributeName = "stringAttr13")
+        @Override
+        public String getStringAttr13() {
+            return super.getStringAttr13();
+        }
+
+        @DynamoDBAttribute(attributeName = "stringAttr14")
+        @Override
+        public String getStringAttr14() {
+            return super.getStringAttr14();
+        }
+
+        @DynamoDBAttribute(attributeName = "stringAttr15")
+        @Override
+        public String getStringAttr15() {
+            return super.getStringAttr15();
+        }
+
+        @DynamoDBAttribute(attributeName = "stringAttr16")
+        @Override
+        public String getStringAttr16() {
+            return super.getStringAttr16();
+        }
+
+        @DynamoDBAttribute(attributeName = "stringAttr17")
+        @Override
+        public String getStringAttr17() {
+            return super.getStringAttr17();
+        }
+
+        @DynamoDBAttribute(attributeName = "stringAttr18")
+        @Override
+        public String getStringAttr18() {
+            return super.getStringAttr18();
+        }
+
+        @DynamoDBAttribute(attributeName = "stringAttr19")
+        @Override
+        public String getStringAttr19() {
+            return super.getStringAttr19();
+        }
+
+        @DynamoDBAttribute(attributeName = "stringAttr20")
+        @Override
+        public String getStringAttr20() {
+            return super.getStringAttr20();
+        }
+
+        @DynamoDBAttribute(attributeName = "stringAttr21")
+        @Override
+        public String getStringAttr21() {
+            return super.getStringAttr21();
+        }
+
+        @DynamoDBAttribute(attributeName = "stringAttr22")
+        @Override
+        public String getStringAttr22() {
+            return super.getStringAttr22();
+        }
+
+        @DynamoDBAttribute(attributeName = "stringAttr23")
+        @Override
+        public String getStringAttr23() {
+            return super.getStringAttr23();
+        }
+
+        @DynamoDBAttribute(attributeName = "stringAttr24")
+        @Override
+        public String getStringAttr24() {
+            return super.getStringAttr24();
+        }
+
+        @DynamoDBAttribute(attributeName = "stringAttr25")
+        @Override
+        public String getStringAttr25() {
+            return super.getStringAttr25();
+        }
+
+        @DynamoDBAttribute(attributeName = "stringAttr26")
+        @Override
+        public String getStringAttr26() {
+            return super.getStringAttr26();
+        }
+
+        @DynamoDBAttribute(attributeName = "stringAttr27")
+        @Override
+        public String getStringAttr27() {
+            return super.getStringAttr27();
+        }
+
+        @DynamoDBAttribute(attributeName = "stringAttr28")
+        @Override
+        public String getStringAttr28() {
+            return super.getStringAttr28();
+        }
+
+        @DynamoDBAttribute(attributeName = "stringAttr29")
+        @Override
+        public String getStringAttr29() {
+            return super.getStringAttr29();
+        }
+
+        @DynamoDBAttribute(attributeName = "stringAttr30")
+        @Override
+        public String getStringAttr30() {
+            return super.getStringAttr30();
+        }
+
+        @DynamoDBAttribute(attributeName = "stringAttr31")
+        @Override
+        public String getStringAttr31() {
+            return super.getStringAttr31();
+        }
+
+        @DynamoDBAttribute(attributeName = "stringAttr32")
+        @Override
+        public String getStringAttr32() {
+            return super.getStringAttr32();
+        }
+
+        @DynamoDBAttribute(attributeName = "stringAttr33")
+        @Override
+        public String getStringAttr33() {
+            return super.getStringAttr33();
+        }
+
+        @DynamoDBAttribute(attributeName = "stringAttr34")
+        @Override
+        public String getStringAttr34() {
+            return super.getStringAttr34();
+        }
+
+        @DynamoDBAttribute(attributeName = "stringAttr35")
+        @Override
+        public String getStringAttr35() {
+            return super.getStringAttr35();
+        }
+
+        @DynamoDBAttribute(attributeName = "stringAttr36")
+        @Override
+        public String getStringAttr36() {
+            return super.getStringAttr36();
+        }
+
+        @DynamoDBAttribute(attributeName = "stringAttr37")
+        @Override
+        public String getStringAttr37() {
+            return super.getStringAttr37();
+        }
+
+        @DynamoDBAttribute(attributeName = "stringAttr38")
+        @Override
+        public String getStringAttr38() {
+            return super.getStringAttr38();
+        }
+
+        @DynamoDBAttribute(attributeName = "stringAttr39")
+        @Override
+        public String getStringAttr39() {
+            return super.getStringAttr39();
+        }
+
+        @DynamoDBAttribute(attributeName = "stringAttr40")
+        @Override
+        public String getStringAttr40() {
+            return super.getStringAttr40();
+        }
+
+        @DynamoDBAttribute(attributeName = "stringAttr41")
+        @Override
+        public String getStringAttr41() {
+            return super.getStringAttr41();
+        }
+
+        @DynamoDBAttribute(attributeName = "stringAttr42")
+        @Override
+        public String getStringAttr42() {
+            return super.getStringAttr42();
+        }
+
+        @DynamoDBAttribute(attributeName = "stringAttr43")
+        @Override
+        public String getStringAttr43() {
+            return super.getStringAttr43();
+        }
+
+        @DynamoDBAttribute(attributeName = "stringAttr44")
+        @Override
+        public String getStringAttr44() {
+            return super.getStringAttr44();
+        }
+
+        @DynamoDBAttribute(attributeName = "stringAttr45")
+        @Override
+        public String getStringAttr45() {
+            return super.getStringAttr45();
+        }
+
+        @DynamoDBAttribute(attributeName = "stringAttr46")
+        @Override
+        public String getStringAttr46() {
+            return super.getStringAttr46();
+        }
+
+        @DynamoDBAttribute(attributeName = "stringAttr47")
+        @Override
+        public String getStringAttr47() {
+            return super.getStringAttr47();
+        }
+
+        @DynamoDBAttribute(attributeName = "stringAttr48")
+        @Override
+        public String getStringAttr48() {
+            return super.getStringAttr48();
+        }
+
+        @DynamoDBAttribute(attributeName = "stringAttr49")
+        @Override
+        public String getStringAttr49() {
+            return super.getStringAttr49();
+        }
+
+        @DynamoDBAttribute(attributeName = "stringAttr50")
+        @Override
+        public String getStringAttr50() {
+            return super.getStringAttr50();
+        }
+
+        @DynamoDBAttribute(attributeName = "stringAttr51")
+        @Override
+        public String getStringAttr51() {
+            return super.getStringAttr51();
+        }
+
+        @DynamoDBAttribute(attributeName = "stringAttr52")
+        @Override
+        public String getStringAttr52() {
+            return super.getStringAttr52();
+        }
+
+        @DynamoDBAttribute(attributeName = "stringAttr53")
+        @Override
+        public String getStringAttr53() {
+            return super.getStringAttr53();
+        }
+
+        @Override
+        @DynamoDBAttribute(attributeName = "stringAttr54")
+        public String getStringAttr54() {
+            return super.getStringAttr54();
+        }
+
+        @DynamoDBAttribute(attributeName = "stringAttr55")
+        @Override
+        public String getStringAttr55() {
+            return super.getStringAttr55();
+        }
+
+        @DynamoDBAttribute(attributeName = "stringAttr56")
+        @Override
+        public String getStringAttr56() {
+            return super.getStringAttr56();
+        }
+
+        @DynamoDBAttribute(attributeName = "stringAttr57")
+        @Override
+        public String getStringAttr57() {
+            return super.getStringAttr57();
+        }
+
+        @DynamoDBAttribute(attributeName = "stringAttr58")
+        @Override
+        public String getStringAttr58() {
+            return super.getStringAttr58();
+        }
+
+        @DynamoDBAttribute(attributeName = "stringAttr59")
+        @Override
+        public String getStringAttr59() {
+            return super.getStringAttr59();
+        }
+
+        @DynamoDBAttribute(attributeName = "stringAttr60")
+        @Override
+        public String getStringAttr60() {
+            return super.getStringAttr60();
+        }
+
+        @DynamoDBAttribute(attributeName = "stringAttr61")
+        @Override
+        public String getStringAttr61() {
+            return super.getStringAttr61();
+        }
+
+        @DynamoDBAttribute(attributeName = "stringAttr62")
+        @Override
+        public String getStringAttr62() {
+            return super.getStringAttr62();
+        }
+
+        @DynamoDBAttribute(attributeName = "stringAttr63")
+        @Override
+        public String getStringAttr63() {
+            return super.getStringAttr63();
+        }
+
+        public static V1HugeBeanFlat fromHugeBeanFlat(HugeBeanFlat b) {
+            V1HugeBeanFlat bean = new V1HugeBeanFlat();
+            for (int i = 1; i <= 63; ++i) {
+                try {
+                    Method setter = V1HugeBeanFlat.class.getMethod("setStringAttr" + i, String.class);
+                    Method getter = HugeBeanFlat.class.getMethod("getStringAttr" + i);
+                    setter.setAccessible(true);
+                    setter.invoke(bean, getter.invoke(b));
+                } catch (Throwable t) {
+                    throw new RuntimeException(t);
+                }
+            }
+            return bean;
+        }
+    }
+}
diff --git a/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/enhanced/dynamodb/V1TestDynamoDbBaseClient.java b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/enhanced/dynamodb/V1TestDynamoDbBaseClient.java
new file mode 100644
index 000000000000..b3cbb5213b05
--- /dev/null
+++ b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/enhanced/dynamodb/V1TestDynamoDbBaseClient.java
@@ -0,0 +1,27 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.benchmark.enhanced.dynamodb;
+
+import com.amazonaws.services.dynamodbv2.AbstractAmazonDynamoDB;
+import org.openjdk.jmh.infra.Blackhole;
+
+abstract class V1TestDynamoDbBaseClient extends AbstractAmazonDynamoDB {
+    protected final Blackhole bh;
+
+    protected V1TestDynamoDbBaseClient(Blackhole bh) {
+        this.bh = bh;
+    }
+}
diff --git a/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/enhanced/dynamodb/V1TestDynamoDbDeleteItemClient.java b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/enhanced/dynamodb/V1TestDynamoDbDeleteItemClient.java
new file mode 100644
index 000000000000..cafcfdcdff47
--- /dev/null
+++ b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/enhanced/dynamodb/V1TestDynamoDbDeleteItemClient.java
@@ -0,0 +1,34 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.benchmark.enhanced.dynamodb;
+
+import com.amazonaws.services.dynamodbv2.model.DeleteItemRequest;
+import com.amazonaws.services.dynamodbv2.model.DeleteItemResult;
+import org.openjdk.jmh.infra.Blackhole;
+
+public class V1TestDynamoDbDeleteItemClient extends V1TestDynamoDbBaseClient {
+    private static final DeleteItemResult DELETE_ITEM_RESULT = new DeleteItemResult();
+
+    public V1TestDynamoDbDeleteItemClient(Blackhole bh) {
+        super(bh);
+    }
+
+    @Override
+    public DeleteItemResult deleteItem(DeleteItemRequest request) {
+        bh.consume(request);
+        return DELETE_ITEM_RESULT;
+    }
+}
diff --git a/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/enhanced/dynamodb/V1TestDynamoDbGetItemClient.java b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/enhanced/dynamodb/V1TestDynamoDbGetItemClient.java
new file mode 100644
index 000000000000..a2994ae9bb8b
--- /dev/null
+++ b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/enhanced/dynamodb/V1TestDynamoDbGetItemClient.java
@@ -0,0 +1,35 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.benchmark.enhanced.dynamodb;
+
+import com.amazonaws.services.dynamodbv2.model.GetItemRequest;
+import com.amazonaws.services.dynamodbv2.model.GetItemResult;
+import org.openjdk.jmh.infra.Blackhole;
+
+public class V1TestDynamoDbGetItemClient extends V1TestDynamoDbBaseClient {
+    private final GetItemResult getItemResult;
+
+    public V1TestDynamoDbGetItemClient(Blackhole bh, GetItemResult getItemResult) {
+        super(bh);
+        this.getItemResult = getItemResult;
+    }
+
+    @Override
+    public GetItemResult getItem(GetItemRequest request) {
+        bh.consume(request);
+        return getItemResult;
+    }
+}
diff --git a/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/enhanced/dynamodb/V1TestDynamoDbPutItemClient.java b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/enhanced/dynamodb/V1TestDynamoDbPutItemClient.java
new file mode 100644
index 000000000000..3cc51c551ce3
--- /dev/null
+++ b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/enhanced/dynamodb/V1TestDynamoDbPutItemClient.java
@@ -0,0 +1,34 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.benchmark.enhanced.dynamodb;
+
+import com.amazonaws.services.dynamodbv2.model.PutItemRequest;
+import com.amazonaws.services.dynamodbv2.model.PutItemResult;
+import org.openjdk.jmh.infra.Blackhole;
+
+public class V1TestDynamoDbPutItemClient extends V1TestDynamoDbBaseClient {
+    private static final PutItemResult PUT_ITEM_RESULT = new PutItemResult();
+
+    public V1TestDynamoDbPutItemClient(Blackhole bh) {
+        super(bh);
+    }
+
+    @Override
+    public PutItemResult putItem(PutItemRequest request) {
+        bh.consume(request);
+        return PUT_ITEM_RESULT;
+    }
+}
diff --git a/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/enhanced/dynamodb/V1TestDynamoDbQueryClient.java b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/enhanced/dynamodb/V1TestDynamoDbQueryClient.java
new file mode 100644
index 000000000000..b64a18edbcd0
--- /dev/null
+++ b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/enhanced/dynamodb/V1TestDynamoDbQueryClient.java
@@ -0,0 +1,35 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.benchmark.enhanced.dynamodb;
+
+import com.amazonaws.services.dynamodbv2.model.QueryRequest;
+import com.amazonaws.services.dynamodbv2.model.QueryResult;
+import org.openjdk.jmh.infra.Blackhole;
+
+public class V1TestDynamoDbQueryClient extends V1TestDynamoDbBaseClient {
+    private final QueryResult queryResult;
+
+    public V1TestDynamoDbQueryClient(Blackhole bh, QueryResult queryResult) {
+        super(bh);
+        this.queryResult = queryResult;
+    }
+
+    @Override
+    public QueryResult query(QueryRequest request) {
+        bh.consume(request);
+        return queryResult;
+    }
+}
diff --git a/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/enhanced/dynamodb/V1TestDynamoDbScanClient.java b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/enhanced/dynamodb/V1TestDynamoDbScanClient.java
new file mode 100644
index 000000000000..c7f4370d8b3e
--- /dev/null
+++ b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/enhanced/dynamodb/V1TestDynamoDbScanClient.java
@@ -0,0 +1,35 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.benchmark.enhanced.dynamodb;
+
+import com.amazonaws.services.dynamodbv2.model.ScanRequest;
+import com.amazonaws.services.dynamodbv2.model.ScanResult;
+import org.openjdk.jmh.infra.Blackhole;
+
+public class V1TestDynamoDbScanClient extends V1TestDynamoDbBaseClient {
+    private final ScanResult scanResult;
+
+    public V1TestDynamoDbScanClient(Blackhole bh, ScanResult scanResult) {
+        super(bh);
+        this.scanResult = scanResult;
+    }
+
+    @Override
+    public ScanResult scan(ScanRequest request) {
+        bh.consume(request);
+        return scanResult;
+    }
+}
diff --git a/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/enhanced/dynamodb/V1TestDynamoDbUpdateItemClient.java b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/enhanced/dynamodb/V1TestDynamoDbUpdateItemClient.java
new file mode 100644
index 000000000000..ded1121b3060
--- /dev/null
+++ b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/enhanced/dynamodb/V1TestDynamoDbUpdateItemClient.java
@@ -0,0 +1,35 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.benchmark.enhanced.dynamodb;
+
+import com.amazonaws.services.dynamodbv2.model.UpdateItemRequest;
+import com.amazonaws.services.dynamodbv2.model.UpdateItemResult;
+import org.openjdk.jmh.infra.Blackhole;
+
+public class V1TestDynamoDbUpdateItemClient extends V1TestDynamoDbBaseClient {
+    private final UpdateItemResult updateItemResult;
+
+    public V1TestDynamoDbUpdateItemClient(Blackhole bh, UpdateItemResult updateItemResult) {
+        super(bh);
+        this.updateItemResult = updateItemResult;
+    }
+
+    @Override
+    public UpdateItemResult updateItem(UpdateItemRequest request) {
+        bh.consume(request);
+        return updateItemResult;
+    }
+}
diff --git a/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/enhanced/dynamodb/V2ItemFactory.java b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/enhanced/dynamodb/V2ItemFactory.java
new file mode 100644
index 000000000000..ab3ec136d9c1
--- /dev/null
+++ b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/enhanced/dynamodb/V2ItemFactory.java
@@ -0,0 +1,355 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.benchmark.enhanced.dynamodb;
+
+import static software.amazon.awssdk.enhanced.dynamodb.mapper.StaticAttributeTags.primaryPartitionKey;
+
+import com.amazonaws.util.ImmutableMapParameter;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import software.amazon.awssdk.core.SdkBytes;
+import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
+import software.amazon.awssdk.enhanced.dynamodb.TableSchema;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+
+public final class V2ItemFactory extends ItemFactory<AttributeValue> {
+    public static final TableSchema<ItemFactory.TinyBean> TINY_BEAN_TABLE_SCHEMA =
+            TableSchema.builder(ItemFactory.TinyBean.class)
+                    .newItemSupplier(ItemFactory.TinyBean::new)
+                    .addAttribute(String.class, a -> a.name("stringAttr")
+                            .getter(ItemFactory.TinyBean::getStringAttr)
+                            .setter(ItemFactory.TinyBean::setStringAttr)
+                            .tags(primaryPartitionKey()))
+                    .build();
+
+    public static final TableSchema<ItemFactory.SmallBean> SMALL_BEAN_TABLE_SCHEMA =
+            TableSchema.builder(ItemFactory.SmallBean.class)
+                    .newItemSupplier(ItemFactory.SmallBean::new)
+                    .addAttribute(String.class, a -> a.name("stringAttr")
+                            .getter(ItemFactory.SmallBean::getStringAttr)
+                            .setter(ItemFactory.SmallBean::setStringAttr)
+                            .tags(primaryPartitionKey()))
+                    .addAttribute(SdkBytes.class, a -> a.name("binaryAttr")
+                            .getter(ItemFactory.SmallBean::getBinaryAttr)
+                            .setter(ItemFactory.SmallBean::setBinaryAttr))
+                    .addAttribute(EnhancedType.listOf(String.class), a -> a.name("listAttr")
+                            .getter(ItemFactory.SmallBean::getListAttr)
+                            .setter(ItemFactory.SmallBean::setListAttr))
+                    .build();
+
+    public static final TableSchema<ItemFactory.HugeBean> HUGE_BEAN_TABLE_SCHEMA =
+            TableSchema.builder(ItemFactory.HugeBean.class)
+                    .newItemSupplier(ItemFactory.HugeBean::new)
+                    .addAttribute(String.class, a -> a.name("stringAttr")
+                            .getter(ItemFactory.HugeBean::getStringAttr)
+                            .setter(ItemFactory.HugeBean::setStringAttr)
+                            .tags(primaryPartitionKey()))
+                    .addAttribute(String.class, a -> a.name("hashKey")
+                            .getter(ItemFactory.HugeBean::getHashKey)
+                            .setter(ItemFactory.HugeBean::setHashKey))
+                    .addAttribute(SdkBytes.class, a -> a.name("binaryAttr")
+                            .getter(ItemFactory.HugeBean::getBinaryAttr)
+                            .setter(ItemFactory.HugeBean::setBinaryAttr))
+                    .addAttribute(EnhancedType.listOf(String.class), a -> a.name("listAttr")
+                            .getter(ItemFactory.HugeBean::getListAttr)
+                            .setter(ItemFactory.HugeBean::setListAttr))
+                    .addAttribute(new EnhancedType<Map<String, SdkBytes>>() {
+                    }, a -> a.name("mapAttr1")
+                            .getter(ItemFactory.HugeBean::getMapAttr1)
+                            .setter(ItemFactory.HugeBean::setMapAttr1))
+                    .addAttribute(new EnhancedType<Map<String, List<SdkBytes>>>() {
+                    }, a -> a.name("mapAttr2")
+                            .getter(ItemFactory.HugeBean::getMapAttr2)
+                            .setter(ItemFactory.HugeBean::setMapAttr2))
+                    .addAttribute(new EnhancedType<Map<String, List<Map<String, List<SdkBytes>>>>>() {
+                    }, a -> a.name("mapAttr3")
+                            .getter(ItemFactory.HugeBean::getMapAttr3)
+                            .setter(ItemFactory.HugeBean::setMapAttr3))
+                    .build();
+
+    public static final TableSchema<ItemFactory.HugeBeanFlat> HUGE_BEAN_FLAT_TABLE_SCHEMA =
+            TableSchema.builder(ItemFactory.HugeBeanFlat.class)
+                    .newItemSupplier(ItemFactory.HugeBeanFlat::new)
+                    .addAttribute(String.class, a -> a.name("stringAttr")
+                            .getter(ItemFactory.HugeBeanFlat::getStringAttr1)
+                            .setter(ItemFactory.HugeBeanFlat::setStringAttr1)
+                            .tags(primaryPartitionKey()))
+                    .addAttribute(String.class, a -> a.name("stringAttr2")
+                            .getter(ItemFactory.HugeBeanFlat::getStringAttr2)
+                            .setter(ItemFactory.HugeBeanFlat::setStringAttr2))
+                    .addAttribute(String.class, a -> a.name("stringAttr3")
+                            .getter(ItemFactory.HugeBeanFlat::getStringAttr3)
+                            .setter(ItemFactory.HugeBeanFlat::setStringAttr3))
+                    .addAttribute(String.class, a -> a.name("stringAttr4")
+                            .getter(ItemFactory.HugeBeanFlat::getStringAttr4)
+                            .setter(ItemFactory.HugeBeanFlat::setStringAttr4))
+                    .addAttribute(String.class, a -> a.name("stringAttr5")
+                            .getter(ItemFactory.HugeBeanFlat::getStringAttr5)
+                            .setter(ItemFactory.HugeBeanFlat::setStringAttr5))
+                    .addAttribute(String.class, a -> a.name("stringAttr6")
+                            .getter(ItemFactory.HugeBeanFlat::getStringAttr6)
+                            .setter(ItemFactory.HugeBeanFlat::setStringAttr6))
+                    .addAttribute(String.class, a -> a.name("stringAttr7")
+                            .getter(ItemFactory.HugeBeanFlat::getStringAttr7)
+                            .setter(ItemFactory.HugeBeanFlat::setStringAttr7))
+                    .addAttribute(String.class, a -> a.name("stringAttr8")
+                            .getter(ItemFactory.HugeBeanFlat::getStringAttr8)
+                            .setter(ItemFactory.HugeBeanFlat::setStringAttr8))
+                    .addAttribute(String.class, a -> a.name("stringAttr9")
+                            .getter(ItemFactory.HugeBeanFlat::getStringAttr9)
+                            .setter(ItemFactory.HugeBeanFlat::setStringAttr9))
+                    .addAttribute(String.class, a -> a.name("stringAttr10")
+                            .getter(ItemFactory.HugeBeanFlat::getStringAttr10)
+                            .setter(ItemFactory.HugeBeanFlat::setStringAttr10))
+                    .addAttribute(String.class, a -> a.name("stringAttr11")
+                            .getter(ItemFactory.HugeBeanFlat::getStringAttr11)
+                            .setter(ItemFactory.HugeBeanFlat::setStringAttr11))
+                    .addAttribute(String.class, a -> a.name("stringAttr12")
+                            .getter(ItemFactory.HugeBeanFlat::getStringAttr12)
+                            .setter(ItemFactory.HugeBeanFlat::setStringAttr12))
+                    .addAttribute(String.class, a -> a.name("stringAttr13")
+                            .getter(ItemFactory.HugeBeanFlat::getStringAttr13)
+                            .setter(ItemFactory.HugeBeanFlat::setStringAttr13))
+                    .addAttribute(String.class, a -> a.name("stringAttr14")
+                            .getter(ItemFactory.HugeBeanFlat::getStringAttr14)
+                            .setter(ItemFactory.HugeBeanFlat::setStringAttr14))
+                    .addAttribute(String.class, a -> a.name("stringAttr15")
+                            .getter(ItemFactory.HugeBeanFlat::getStringAttr15)
+                            .setter(ItemFactory.HugeBeanFlat::setStringAttr15))
+                    .addAttribute(String.class, a -> a.name("stringAttr16")
+                            .getter(ItemFactory.HugeBeanFlat::getStringAttr16)
+                            .setter(ItemFactory.HugeBeanFlat::setStringAttr16))
+                    .addAttribute(String.class, a -> a.name("stringAttr17")
+                            .getter(ItemFactory.HugeBeanFlat::getStringAttr17)
+                            .setter(ItemFactory.HugeBeanFlat::setStringAttr17))
+                    .addAttribute(String.class, a -> a.name("stringAttr18")
+                            .getter(ItemFactory.HugeBeanFlat::getStringAttr18)
+                            .setter(ItemFactory.HugeBeanFlat::setStringAttr18))
+                    .addAttribute(String.class, a -> a.name("stringAttr19")
+                            .getter(ItemFactory.HugeBeanFlat::getStringAttr19)
+                            .setter(ItemFactory.HugeBeanFlat::setStringAttr19))
+                    .addAttribute(String.class, a -> a.name("stringAttr20")
+                            .getter(ItemFactory.HugeBeanFlat::getStringAttr20)
+                            .setter(ItemFactory.HugeBeanFlat::setStringAttr20))
+                    .addAttribute(String.class, a -> a.name("stringAttr21")
+                            .getter(ItemFactory.HugeBeanFlat::getStringAttr21)
+                            .setter(ItemFactory.HugeBeanFlat::setStringAttr21))
+                    .addAttribute(String.class, a -> a.name("stringAttr22")
+                            .getter(ItemFactory.HugeBeanFlat::getStringAttr22)
+                            .setter(ItemFactory.HugeBeanFlat::setStringAttr22))
+                    .addAttribute(String.class, a -> a.name("stringAttr23")
+                            .getter(ItemFactory.HugeBeanFlat::getStringAttr23)
+                            .setter(ItemFactory.HugeBeanFlat::setStringAttr23))
+                    .addAttribute(String.class, a -> a.name("stringAttr24")
+                            .getter(ItemFactory.HugeBeanFlat::getStringAttr24)
+                            .setter(ItemFactory.HugeBeanFlat::setStringAttr24))
+                    .addAttribute(String.class, a -> a.name("stringAttr25")
+                            .getter(ItemFactory.HugeBeanFlat::getStringAttr25)
+                            .setter(ItemFactory.HugeBeanFlat::setStringAttr25))
+                    .addAttribute(String.class, a -> a.name("stringAttr26")
+                            .getter(ItemFactory.HugeBeanFlat::getStringAttr26)
+                            .setter(ItemFactory.HugeBeanFlat::setStringAttr26))
+                    .addAttribute(String.class, a -> a.name("stringAttr27")
+                            .getter(ItemFactory.HugeBeanFlat::getStringAttr27)
+                            .setter(ItemFactory.HugeBeanFlat::setStringAttr27))
+                    .addAttribute(String.class, a -> a.name("stringAttr28")
+                            .getter(ItemFactory.HugeBeanFlat::getStringAttr28)
+                            .setter(ItemFactory.HugeBeanFlat::setStringAttr28))
+                    .addAttribute(String.class, a -> a.name("stringAttr29")
+                            .getter(ItemFactory.HugeBeanFlat::getStringAttr29)
+                            .setter(ItemFactory.HugeBeanFlat::setStringAttr29))
+                    .addAttribute(String.class, a -> a.name("stringAttr30")
+                            .getter(ItemFactory.HugeBeanFlat::getStringAttr30)
+                            .setter(ItemFactory.HugeBeanFlat::setStringAttr30))
+                    .addAttribute(String.class, a -> a.name("stringAttr31")
+                            .getter(ItemFactory.HugeBeanFlat::getStringAttr31)
+                            .setter(ItemFactory.HugeBeanFlat::setStringAttr31))
+                    .addAttribute(String.class, a -> a.name("stringAttr32")
+                            .getter(ItemFactory.HugeBeanFlat::getStringAttr32)
+                            .setter(ItemFactory.HugeBeanFlat::setStringAttr32))
+                    .addAttribute(String.class, a -> a.name("stringAttr33")
+                            .getter(ItemFactory.HugeBeanFlat::getStringAttr33)
+                            .setter(ItemFactory.HugeBeanFlat::setStringAttr33))
+                    .addAttribute(String.class, a -> a.name("stringAttr34")
+                            .getter(ItemFactory.HugeBeanFlat::getStringAttr34)
+                            .setter(ItemFactory.HugeBeanFlat::setStringAttr34))
+                    .addAttribute(String.class, a -> a.name("stringAttr35")
+                            .getter(ItemFactory.HugeBeanFlat::getStringAttr35)
+                            .setter(ItemFactory.HugeBeanFlat::setStringAttr35))
+                    .addAttribute(String.class, a -> a.name("stringAttr36")
+                            .getter(ItemFactory.HugeBeanFlat::getStringAttr36)
+                            .setter(ItemFactory.HugeBeanFlat::setStringAttr36))
+                    .addAttribute(String.class, a -> a.name("stringAttr37")
+                            .getter(ItemFactory.HugeBeanFlat::getStringAttr37)
+                            .setter(ItemFactory.HugeBeanFlat::setStringAttr37))
+                    .addAttribute(String.class, a -> a.name("stringAttr38")
+                            .getter(ItemFactory.HugeBeanFlat::getStringAttr38)
+                            .setter(ItemFactory.HugeBeanFlat::setStringAttr38))
+                    .addAttribute(String.class, a -> a.name("stringAttr39")
+                            .getter(ItemFactory.HugeBeanFlat::getStringAttr39)
+                            .setter(ItemFactory.HugeBeanFlat::setStringAttr39))
+                    .addAttribute(String.class, a -> a.name("stringAttr40")
+                            .getter(ItemFactory.HugeBeanFlat::getStringAttr40)
+                            .setter(ItemFactory.HugeBeanFlat::setStringAttr40))
+                    .addAttribute(String.class, a -> a.name("stringAttr41")
+                            .getter(ItemFactory.HugeBeanFlat::getStringAttr41)
+                            .setter(ItemFactory.HugeBeanFlat::setStringAttr41))
+                    .addAttribute(String.class, a -> a.name("stringAttr42")
+                            .getter(ItemFactory.HugeBeanFlat::getStringAttr42)
+                            .setter(ItemFactory.HugeBeanFlat::setStringAttr42))
+                    .addAttribute(String.class, a -> a.name("stringAttr43")
+                            .getter(ItemFactory.HugeBeanFlat::getStringAttr43)
+                            .setter(ItemFactory.HugeBeanFlat::setStringAttr43))
+                    .addAttribute(String.class, a -> a.name("stringAttr44")
+                            .getter(ItemFactory.HugeBeanFlat::getStringAttr44)
+                            .setter(ItemFactory.HugeBeanFlat::setStringAttr44))
+                    .addAttribute(String.class, a -> a.name("stringAttr45")
+                            .getter(ItemFactory.HugeBeanFlat::getStringAttr45)
+                            .setter(ItemFactory.HugeBeanFlat::setStringAttr45))
+                    .addAttribute(String.class, a -> a.name("stringAttr46")
+                            .getter(ItemFactory.HugeBeanFlat::getStringAttr46)
+                            .setter(ItemFactory.HugeBeanFlat::setStringAttr46))
+                    .addAttribute(String.class, a -> a.name("stringAttr47")
+                            .getter(ItemFactory.HugeBeanFlat::getStringAttr47)
+                            .setter(ItemFactory.HugeBeanFlat::setStringAttr47))
+                    .addAttribute(String.class, a -> a.name("stringAttr48")
+                            .getter(ItemFactory.HugeBeanFlat::getStringAttr48)
+                            .setter(ItemFactory.HugeBeanFlat::setStringAttr48))
+                    .addAttribute(String.class, a -> a.name("stringAttr49")
+                            .getter(ItemFactory.HugeBeanFlat::getStringAttr49)
+                            .setter(ItemFactory.HugeBeanFlat::setStringAttr49))
+                    .addAttribute(String.class, a -> a.name("stringAttr50")
+                            .getter(ItemFactory.HugeBeanFlat::getStringAttr50)
+                            .setter(ItemFactory.HugeBeanFlat::setStringAttr50))
+                    .addAttribute(String.class, a -> a.name("stringAttr51")
+                            .getter(ItemFactory.HugeBeanFlat::getStringAttr51)
+                            .setter(ItemFactory.HugeBeanFlat::setStringAttr51))
+                    .addAttribute(String.class, a -> a.name("stringAttr52")
+                            .getter(ItemFactory.HugeBeanFlat::getStringAttr52)
+                            .setter(ItemFactory.HugeBeanFlat::setStringAttr52))
+                    .addAttribute(String.class, a -> a.name("stringAttr53")
+                            .getter(ItemFactory.HugeBeanFlat::getStringAttr53)
+                            .setter(ItemFactory.HugeBeanFlat::setStringAttr53))
+                    .addAttribute(String.class, a -> a.name("stringAttr54")
+                            .getter(ItemFactory.HugeBeanFlat::getStringAttr54)
+                            .setter(ItemFactory.HugeBeanFlat::setStringAttr54))
+                    .addAttribute(String.class, a -> a.name("stringAttr55")
+                            .getter(ItemFactory.HugeBeanFlat::getStringAttr55)
+                            .setter(ItemFactory.HugeBeanFlat::setStringAttr55))
+                    .addAttribute(String.class, a -> a.name("stringAttr56")
+                            .getter(ItemFactory.HugeBeanFlat::getStringAttr56)
+                            .setter(ItemFactory.HugeBeanFlat::setStringAttr56))
+                    .addAttribute(String.class, a -> a.name("stringAttr57")
+                            .getter(ItemFactory.HugeBeanFlat::getStringAttr57)
+                            .setter(ItemFactory.HugeBeanFlat::setStringAttr57))
+                    .addAttribute(String.class, a -> a.name("stringAttr58")
+                            .getter(ItemFactory.HugeBeanFlat::getStringAttr58)
+                            .setter(ItemFactory.HugeBeanFlat::setStringAttr58))
+                    .addAttribute(String.class, a -> a.name("stringAttr59")
+                            .getter(ItemFactory.HugeBeanFlat::getStringAttr59)
+                            .setter(ItemFactory.HugeBeanFlat::setStringAttr59))
+                    .addAttribute(String.class, a -> a.name("stringAttr60")
+                            .getter(ItemFactory.HugeBeanFlat::getStringAttr60)
+                            .setter(ItemFactory.HugeBeanFlat::setStringAttr60))
+                    .addAttribute(String.class, a -> a.name("stringAttr61")
+                            .getter(ItemFactory.HugeBeanFlat::getStringAttr61)
+                            .setter(ItemFactory.HugeBeanFlat::setStringAttr61))
+                    .addAttribute(String.class, a -> a.name("stringAttr62")
+                            .getter(ItemFactory.HugeBeanFlat::getStringAttr62)
+                            .setter(ItemFactory.HugeBeanFlat::setStringAttr62))
+                    .addAttribute(String.class, a -> a.name("stringAttr63")
+                            .getter(ItemFactory.HugeBeanFlat::getStringAttr63)
+                            .setter(ItemFactory.HugeBeanFlat::setStringAttr63))
+                    .build();
+
+
+    protected Map<String, AttributeValue> asItem(TinyBean b) {
+        ImmutableMapParameter.Builder<String, AttributeValue> builder = ImmutableMapParameter.builder();
+
+        builder.put("stringAttr", av(b.getStringAttr()));
+
+        return builder.build();
+    }
+
+    protected Map<String, AttributeValue> asItem(SmallBean b) {
+        ImmutableMapParameter.Builder<String, AttributeValue> builder = ImmutableMapParameter.builder();
+
+        builder.put("stringAttr", av(b.getStringAttr()));
+        builder.put("binaryAttr", av(b.getBinaryAttr()));
+
+        List<AttributeValue> listAttr = b.getListAttr().stream().map(this::av).collect(Collectors.toList());
+
+        builder.put("listAttr", av(listAttr));
+
+        return builder.build();
+    }
+
+    protected Map<String, AttributeValue> asItem(HugeBean b) {
+        ImmutableMapParameter.Builder<String, AttributeValue> builder = ImmutableMapParameter.builder();
+
+        builder.put("hashKey", av(b.getHashKey()));
+        builder.put("stringAttr", av(b.getStringAttr()));
+        builder.put("binaryAttr", av(b.getBinaryAttr()));
+
+        List<AttributeValue> listAttr = b.getListAttr().stream().map(this::av).collect(Collectors.toList());
+
+        builder.put("listAttr", av(listAttr));
+
+        Map<String, AttributeValue> mapAttr1 = b.getMapAttr1().entrySet().stream().collect(
+                Collectors.toMap(Map.Entry::getKey,
+                    e -> av(e.getValue())));
+
+        builder.put("mapAttr1", av(mapAttr1));
+
+
+        Map<String, AttributeValue> mapAttr2 = b.getMapAttr2().entrySet().stream().collect(
+                Collectors.toMap(Map.Entry::getKey,
+                    e -> av(e.getValue().stream().map(this::av).collect(Collectors.toList()))));
+
+        builder.put("mapAttr2", av(mapAttr2));
+
+        Map<String, AttributeValue> mapAttr3 = b.getMapAttr3().entrySet().stream().collect(Collectors.toMap(Map.Entry::getKey,
+            e -> {
+                List<Map<String, List<SdkBytes>>> value = e.getValue();
+                AttributeValue valueAv = av(value.stream().map(m -> av(m.entrySet().stream()
+                        .collect(Collectors.toMap(Map.Entry::getKey,
+                            ee -> av(ee.getValue().stream().map(this::av).collect(Collectors.toList()))))))
+                        .collect(Collectors.toList()));
+                return valueAv;
+            }));
+
+        builder.put("mapAttr3", av(mapAttr3));
+
+        return builder.build();
+    }
+
+    protected AttributeValue av(String val) {
+        return AttributeValue.builder().s(val).build();
+    }
+
+    protected AttributeValue av(List<AttributeValue> val) {
+        return AttributeValue.builder().l(val).build();
+    }
+
+    protected AttributeValue av(Map<String, AttributeValue> val) {
+        return AttributeValue.builder().m(val).build();
+    }
+
+    protected AttributeValue av(SdkBytes val) {
+        return AttributeValue.builder().b(val).build();
+    }
+}
diff --git a/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/enhanced/dynamodb/V2TestDynamoDbBaseClient.java b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/enhanced/dynamodb/V2TestDynamoDbBaseClient.java
new file mode 100644
index 000000000000..f05ab204f49d
--- /dev/null
+++ b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/enhanced/dynamodb/V2TestDynamoDbBaseClient.java
@@ -0,0 +1,36 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.benchmark.enhanced.dynamodb;
+
+import org.openjdk.jmh.infra.Blackhole;
+import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
+
+abstract class V2TestDynamoDbBaseClient implements DynamoDbClient {
+    protected final Blackhole bh;
+
+    protected V2TestDynamoDbBaseClient(Blackhole bh) {
+        this.bh = bh;
+    }
+
+    @Override
+    public String serviceName() {
+        return "DynamoDB";
+    }
+
+    @Override
+    public void close() {
+    }
+}
diff --git a/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/enhanced/dynamodb/V2TestDynamoDbDeleteItemClient.java b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/enhanced/dynamodb/V2TestDynamoDbDeleteItemClient.java
new file mode 100644
index 000000000000..8694e79a5bff
--- /dev/null
+++ b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/enhanced/dynamodb/V2TestDynamoDbDeleteItemClient.java
@@ -0,0 +1,34 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.benchmark.enhanced.dynamodb;
+
+import org.openjdk.jmh.infra.Blackhole;
+import software.amazon.awssdk.services.dynamodb.model.DeleteItemRequest;
+import software.amazon.awssdk.services.dynamodb.model.DeleteItemResponse;
+
+public final class V2TestDynamoDbDeleteItemClient extends V2TestDynamoDbBaseClient {
+    private static final DeleteItemResponse DELETE_ITEM_RESPONSE = DeleteItemResponse.builder().build();
+
+    public V2TestDynamoDbDeleteItemClient(Blackhole bh) {
+        super(bh);
+    }
+
+    @Override
+    public DeleteItemResponse deleteItem(DeleteItemRequest deleteItemRequest) {
+        bh.consume(deleteItemRequest);
+        return DELETE_ITEM_RESPONSE;
+    }
+}
diff --git a/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/enhanced/dynamodb/V2TestDynamoDbGetItemClient.java b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/enhanced/dynamodb/V2TestDynamoDbGetItemClient.java
new file mode 100644
index 000000000000..2017d876d4e7
--- /dev/null
+++ b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/enhanced/dynamodb/V2TestDynamoDbGetItemClient.java
@@ -0,0 +1,35 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.benchmark.enhanced.dynamodb;
+
+import org.openjdk.jmh.infra.Blackhole;
+import software.amazon.awssdk.services.dynamodb.model.GetItemRequest;
+import software.amazon.awssdk.services.dynamodb.model.GetItemResponse;
+
+public final class V2TestDynamoDbGetItemClient extends V2TestDynamoDbBaseClient {
+    private final GetItemResponse getItemResponse;
+
+    public V2TestDynamoDbGetItemClient(Blackhole bh, GetItemResponse getItemResponse) {
+        super(bh);
+        this.getItemResponse = getItemResponse;
+    }
+
+    @Override
+    public GetItemResponse getItem(GetItemRequest getItemRequest) {
+        bh.consume(getItemRequest);
+        return getItemResponse;
+    }
+}
diff --git a/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/enhanced/dynamodb/V2TestDynamoDbPutItemClient.java b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/enhanced/dynamodb/V2TestDynamoDbPutItemClient.java
new file mode 100644
index 000000000000..5b2d611f641b
--- /dev/null
+++ b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/enhanced/dynamodb/V2TestDynamoDbPutItemClient.java
@@ -0,0 +1,34 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.benchmark.enhanced.dynamodb;
+
+import org.openjdk.jmh.infra.Blackhole;
+import software.amazon.awssdk.services.dynamodb.model.PutItemRequest;
+import software.amazon.awssdk.services.dynamodb.model.PutItemResponse;
+
+public final class V2TestDynamoDbPutItemClient extends V2TestDynamoDbBaseClient {
+    private static final PutItemResponse PUT_ITEM_RESPONSE = PutItemResponse.builder().build();
+
+    public V2TestDynamoDbPutItemClient(Blackhole bh) {
+        super(bh);
+    }
+
+    @Override
+    public PutItemResponse putItem(PutItemRequest putItemRequest) {
+        bh.consume(putItemRequest);
+        return PUT_ITEM_RESPONSE;
+    }
+}
diff --git a/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/enhanced/dynamodb/V2TestDynamoDbQueryClient.java b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/enhanced/dynamodb/V2TestDynamoDbQueryClient.java
new file mode 100644
index 000000000000..c925c50a490c
--- /dev/null
+++ b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/enhanced/dynamodb/V2TestDynamoDbQueryClient.java
@@ -0,0 +1,41 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.benchmark.enhanced.dynamodb;
+
+import org.openjdk.jmh.infra.Blackhole;
+import software.amazon.awssdk.services.dynamodb.model.QueryRequest;
+import software.amazon.awssdk.services.dynamodb.model.QueryResponse;
+import software.amazon.awssdk.services.dynamodb.paginators.QueryIterable;
+
+public final class V2TestDynamoDbQueryClient extends V2TestDynamoDbBaseClient {
+    private final QueryResponse queryResponse;
+
+    public V2TestDynamoDbQueryClient(Blackhole bh, QueryResponse queryResponse) {
+        super(bh);
+        this.queryResponse = queryResponse;
+    }
+
+    @Override
+    public QueryResponse query(QueryRequest queryRequest) {
+        bh.consume(queryRequest);
+        return this.queryResponse;
+    }
+
+    @Override
+    public QueryIterable queryPaginator(QueryRequest queryRequest) {
+        return new QueryIterable(this, queryRequest);
+    }
+}
diff --git a/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/enhanced/dynamodb/V2TestDynamoDbScanClient.java b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/enhanced/dynamodb/V2TestDynamoDbScanClient.java
new file mode 100644
index 000000000000..c6d4a4d40bc5
--- /dev/null
+++ b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/enhanced/dynamodb/V2TestDynamoDbScanClient.java
@@ -0,0 +1,41 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.benchmark.enhanced.dynamodb;
+
+import org.openjdk.jmh.infra.Blackhole;
+import software.amazon.awssdk.services.dynamodb.model.ScanRequest;
+import software.amazon.awssdk.services.dynamodb.model.ScanResponse;
+import software.amazon.awssdk.services.dynamodb.paginators.ScanIterable;
+
+public final class V2TestDynamoDbScanClient extends V2TestDynamoDbBaseClient {
+    private final ScanResponse scanResponse;
+
+    public V2TestDynamoDbScanClient(Blackhole bh, ScanResponse scanResponse) {
+        super(bh);
+        this.scanResponse = scanResponse;
+    }
+
+    @Override
+    public ScanResponse scan(ScanRequest scanRequest) {
+        bh.consume(scanRequest);
+        return this.scanResponse;
+    }
+
+    @Override
+    public ScanIterable scanPaginator(ScanRequest scanRequest) {
+        return new ScanIterable(this, scanRequest);
+    }
+}
diff --git a/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/enhanced/dynamodb/V2TestDynamoDbUpdateItemClient.java b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/enhanced/dynamodb/V2TestDynamoDbUpdateItemClient.java
new file mode 100644
index 000000000000..77a9238240ed
--- /dev/null
+++ b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/enhanced/dynamodb/V2TestDynamoDbUpdateItemClient.java
@@ -0,0 +1,35 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.benchmark.enhanced.dynamodb;
+
+import org.openjdk.jmh.infra.Blackhole;
+import software.amazon.awssdk.services.dynamodb.model.UpdateItemRequest;
+import software.amazon.awssdk.services.dynamodb.model.UpdateItemResponse;
+
+public final class V2TestDynamoDbUpdateItemClient extends V2TestDynamoDbBaseClient {
+    private final UpdateItemResponse updateItemResponse;
+
+    public V2TestDynamoDbUpdateItemClient(Blackhole bh, UpdateItemResponse updateItemResponse) {
+        super(bh);
+        this.updateItemResponse = updateItemResponse;
+    }
+
+    @Override
+    public UpdateItemResponse updateItem(UpdateItemRequest updateItemRequest) {
+        bh.consume(updateItemRequest);
+        return this.updateItemResponse;
+    }
+}
diff --git a/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/marshaller/dynamodb/AbstractItemFactory.java b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/marshaller/dynamodb/AbstractItemFactory.java
index a3805803ff52..d6ff2f869ccb 100755
--- a/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/marshaller/dynamodb/AbstractItemFactory.java
+++ b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/marshaller/dynamodb/AbstractItemFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/marshaller/dynamodb/V1DynamoDbAttributeValue.java b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/marshaller/dynamodb/V1DynamoDbAttributeValue.java
index 03d8034493db..dde41a3596cf 100755
--- a/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/marshaller/dynamodb/V1DynamoDbAttributeValue.java
+++ b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/marshaller/dynamodb/V1DynamoDbAttributeValue.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/marshaller/dynamodb/V1ItemFactory.java b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/marshaller/dynamodb/V1ItemFactory.java
index 2d6d2870e655..f0273f388b7b 100755
--- a/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/marshaller/dynamodb/V1ItemFactory.java
+++ b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/marshaller/dynamodb/V1ItemFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/marshaller/dynamodb/V2DynamoDbAttributeValue.java b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/marshaller/dynamodb/V2DynamoDbAttributeValue.java
index a68c3afa4905..93eaad9e4e71 100755
--- a/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/marshaller/dynamodb/V2DynamoDbAttributeValue.java
+++ b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/marshaller/dynamodb/V2DynamoDbAttributeValue.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/marshaller/dynamodb/V2ItemFactory.java b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/marshaller/dynamodb/V2ItemFactory.java
index dbb4163bbbfa..3eaee2ea3030 100755
--- a/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/marshaller/dynamodb/V2ItemFactory.java
+++ b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/marshaller/dynamodb/V2ItemFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/marshaller/ec2/V1Ec2MarshallerBenchmark.java b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/marshaller/ec2/V1Ec2MarshallerBenchmark.java
index dda717fb632f..d6eb7ac0b96e 100755
--- a/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/marshaller/ec2/V1Ec2MarshallerBenchmark.java
+++ b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/marshaller/ec2/V1Ec2MarshallerBenchmark.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/marshaller/ec2/V1ItemFactory.java b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/marshaller/ec2/V1ItemFactory.java
index 2af350ecc803..c18545b6ae4c 100755
--- a/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/marshaller/ec2/V1ItemFactory.java
+++ b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/marshaller/ec2/V1ItemFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/marshaller/ec2/V2Ec2MarshallerBenchmark.java b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/marshaller/ec2/V2Ec2MarshallerBenchmark.java
index 585d88b5e305..37d789e7559e 100755
--- a/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/marshaller/ec2/V2Ec2MarshallerBenchmark.java
+++ b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/marshaller/ec2/V2Ec2MarshallerBenchmark.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/marshaller/ec2/V2ItemFactory.java b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/marshaller/ec2/V2ItemFactory.java
index 277a6ae0b053..d46f844bb121 100755
--- a/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/marshaller/ec2/V2ItemFactory.java
+++ b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/marshaller/ec2/V2ItemFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/stats/SdkBenchmarkParams.java b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/stats/SdkBenchmarkParams.java
index c68cdb136887..f419405bb690 100644
--- a/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/stats/SdkBenchmarkParams.java
+++ b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/stats/SdkBenchmarkParams.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/stats/SdkBenchmarkResult.java b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/stats/SdkBenchmarkResult.java
index b14ab23faf08..f974e3dc82bb 100644
--- a/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/stats/SdkBenchmarkResult.java
+++ b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/stats/SdkBenchmarkResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/stats/SdkBenchmarkStatistics.java b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/stats/SdkBenchmarkStatistics.java
index d665cc46a52c..643ad6118bbd 100644
--- a/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/stats/SdkBenchmarkStatistics.java
+++ b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/stats/SdkBenchmarkStatistics.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/utils/AlwaysSuccessServlet.java b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/utils/AlwaysSuccessServlet.java
index 528d736b7ed3..206e63eeda0a 100644
--- a/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/utils/AlwaysSuccessServlet.java
+++ b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/utils/AlwaysSuccessServlet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/utils/BaseMockServer.java b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/utils/BaseMockServer.java
index 9a38bfbb14bb..65cdfafa353e 100644
--- a/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/utils/BaseMockServer.java
+++ b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/utils/BaseMockServer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/utils/BenchmarkConstant.java b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/utils/BenchmarkConstant.java
index 7f6df3a74a23..c241ac25b4b3 100644
--- a/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/utils/BenchmarkConstant.java
+++ b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/utils/BenchmarkConstant.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/utils/BenchmarkUtils.java b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/utils/BenchmarkUtils.java
index 6be31ac3c0eb..3ef40c7af475 100644
--- a/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/utils/BenchmarkUtils.java
+++ b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/utils/BenchmarkUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/utils/MockH2Server.java b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/utils/MockH2Server.java
index b24f65ea46ee..5b1f20817940 100644
--- a/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/utils/MockH2Server.java
+++ b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/utils/MockH2Server.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/utils/MockHttpClient.java b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/utils/MockHttpClient.java
index 90947addac40..1f3f9d8d5853 100644
--- a/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/utils/MockHttpClient.java
+++ b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/utils/MockHttpClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/utils/MockServer.java b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/utils/MockServer.java
index d49b4a689068..15cca300789c 100644
--- a/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/utils/MockServer.java
+++ b/test/sdk-benchmarks/src/main/java/software/amazon/awssdk/benchmark/utils/MockServer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/sdk-benchmarks/src/main/resources/jetty-logging.properties b/test/sdk-benchmarks/src/main/resources/jetty-logging.properties
index a3863a282b11..4ee410e7fa92 100644
--- a/test/sdk-benchmarks/src/main/resources/jetty-logging.properties
+++ b/test/sdk-benchmarks/src/main/resources/jetty-logging.properties
@@ -1,3 +1,18 @@
+#
+# 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.
+#
+
 # Set up logging implementation
 org.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.StdErrLog
 org.eclipse.jetty.LEVEL=OFF
diff --git a/test/sdk-benchmarks/src/main/resources/log4j.properties b/test/sdk-benchmarks/src/main/resources/log4j.properties
index b12d4e3360bc..e02a5de3252a 100644
--- a/test/sdk-benchmarks/src/main/resources/log4j.properties
+++ b/test/sdk-benchmarks/src/main/resources/log4j.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/test/sdk-benchmarks/src/main/resources/software/amazon/awssdk/benchmark/baseline.json b/test/sdk-benchmarks/src/main/resources/software/amazon/awssdk/benchmark/baseline.json
index aab954caa3b5..c09d97fbbfc4 100644
--- a/test/sdk-benchmarks/src/main/resources/software/amazon/awssdk/benchmark/baseline.json
+++ b/test/sdk-benchmarks/src/main/resources/software/amazon/awssdk/benchmark/baseline.json
@@ -2,361 +2,1864 @@
   {
     "id": "apicall.httpclient.async.NettyClientH1NonTlsBenchmark.concurrentApiCall-Throughput",
     "params": {
-      "sdkVersion": "2.9.11",
+      "sdkVersion": "2.10.89",
       "jdkVersion": "1.8.0_222",
       "jvmName": "OpenJDK 64-Bit Server VM",
       "jvmVersion": "25.222-b10",
       "mode": "Throughput",
-      "date": "2019-10-01T20:07:52.539"
+      "date": "2020-03-18T20:11:42.308"
     },
     "statistics": {
-      "mean": 11953.741893432696,
-      "variance": 47530.034301188265,
-      "standardDeviation": 218.01383970103427,
-      "max": 12372.362415239815,
-      "min": 11719.587724827139,
+      "mean": 11083.712145086858,
+      "variance": 8687.140893505537,
+      "standardDeviation": 93.20483299435463,
+      "max": 11201.90868543306,
+      "min": 10902.251879180842,
       "n": 10,
-      "sum": 119537.41893432697
+      "sum": 110837.12145086858
     }
-  },
-  {
+  }, {
     "id": "apicall.httpclient.async.NettyClientH1NonTlsBenchmark.sequentialApiCall-Throughput",
     "params": {
-      "sdkVersion": "2.9.11",
+      "sdkVersion": "2.10.89",
       "jdkVersion": "1.8.0_222",
       "jvmName": "OpenJDK 64-Bit Server VM",
       "jvmVersion": "25.222-b10",
       "mode": "Throughput",
-      "date": "2019-10-01T20:07:52.544"
+      "date": "2020-03-18T20:11:42.314"
     },
     "statistics": {
-      "mean": 3474.8929618663287,
-      "variance": 712.0377962331736,
-      "standardDeviation": 26.684036355716007,
-      "max": 3505.5433448106787,
-      "min": 3415.4832560499217,
+      "mean": 3133.078992847664,
+      "variance": 1068.4543621730531,
+      "standardDeviation": 32.687220165885215,
+      "max": 3168.0172510726,
+      "min": 3074.6431126456655,
       "n": 10,
-      "sum": 34748.929618663286
+      "sum": 31330.78992847664
     }
-  },
-  {
+  }, {
     "id": "apicall.httpclient.async.NettyHttpClientH1Benchmark.concurrentApiCall-Throughput-sslProviderValue-jdk",
     "params": {
-      "sdkVersion": "2.9.11",
+      "sdkVersion": "2.10.89",
       "jdkVersion": "1.8.0_222",
       "jvmName": "OpenJDK 64-Bit Server VM",
       "jvmVersion": "25.222-b10",
       "mode": "Throughput",
-      "date": "2019-10-01T20:07:52.544"
+      "date": "2020-03-18T20:11:42.314"
     },
     "statistics": {
-      "mean": 9699.896431884776,
-      "variance": 76032.40025479376,
-      "standardDeviation": 275.73973281845645,
-      "max": 10206.843184671103,
-      "min": 9468.303441931195,
+      "mean": 9400.788325804802,
+      "variance": 1622.9542174492854,
+      "standardDeviation": 40.28590594053068,
+      "max": 9457.777847805768,
+      "min": 9341.909058431082,
       "n": 10,
-      "sum": 96998.96431884775
+      "sum": 94007.88325804802
     }
-  },
-  {
+  }, {
     "id": "apicall.httpclient.async.NettyHttpClientH1Benchmark.concurrentApiCall-Throughput-sslProviderValue-openssl",
     "params": {
-      "sdkVersion": "2.9.11",
+      "sdkVersion": "2.10.89",
       "jdkVersion": "1.8.0_222",
       "jvmName": "OpenJDK 64-Bit Server VM",
       "jvmVersion": "25.222-b10",
       "mode": "Throughput",
-      "date": "2019-10-01T20:07:52.544"
+      "date": "2020-03-18T20:11:42.314"
     },
     "statistics": {
-      "mean": 10446.03380714306,
-      "variance": 66413.66363464146,
-      "standardDeviation": 257.7084857637432,
-      "max": 10923.23707364524,
-      "min": 10204.627718853411,
+      "mean": 10081.234880927226,
+      "variance": 2505.9361253161246,
+      "standardDeviation": 50.05932605735044,
+      "max": 10172.340399895851,
+      "min": 10022.546988640313,
       "n": 10,
-      "sum": 104460.3380714306
+      "sum": 100812.34880927225
     }
-  },
-  {
+  }, {
     "id": "apicall.httpclient.async.NettyHttpClientH1Benchmark.sequentialApiCall-Throughput-sslProviderValue-jdk",
     "params": {
-      "sdkVersion": "2.9.11",
+      "sdkVersion": "2.10.89",
       "jdkVersion": "1.8.0_222",
       "jvmName": "OpenJDK 64-Bit Server VM",
       "jvmVersion": "25.222-b10",
       "mode": "Throughput",
-      "date": "2019-10-01T20:07:52.544"
+      "date": "2020-03-18T20:11:42.315"
     },
     "statistics": {
-      "mean": 2512.7905373200633,
-      "variance": 91.50695734966303,
-      "standardDeviation": 9.565926894434382,
-      "max": 2526.984094567836,
-      "min": 2495.5718551901746,
+      "mean": 2318.064309904416,
+      "variance": 1794.725237106914,
+      "standardDeviation": 42.36419758601494,
+      "max": 2362.020636579015,
+      "min": 2217.173827814984,
       "n": 10,
-      "sum": 25127.905373200632
+      "sum": 23180.64309904416
     }
-  },
-  {
+  }, {
     "id": "apicall.httpclient.async.NettyHttpClientH1Benchmark.sequentialApiCall-Throughput-sslProviderValue-openssl",
     "params": {
-      "sdkVersion": "2.9.11",
+      "sdkVersion": "2.10.89",
       "jdkVersion": "1.8.0_222",
       "jvmName": "OpenJDK 64-Bit Server VM",
       "jvmVersion": "25.222-b10",
       "mode": "Throughput",
-      "date": "2019-10-01T20:07:52.544"
+      "date": "2020-03-18T20:11:42.315"
     },
     "statistics": {
-      "mean": 2784.4975432258934,
-      "variance": 450.46863826270305,
-      "standardDeviation": 21.22424647102231,
-      "max": 2818.4210467256917,
-      "min": 2744.7963740556124,
+      "mean": 2668.2980888540214,
+      "variance": 10194.040190854324,
+      "standardDeviation": 100.96553962047805,
+      "max": 2787.7737717880227,
+      "min": 2556.3548857046126,
       "n": 10,
-      "sum": 27844.975432258936
+      "sum": 26682.980888540213
     }
-  },
-  {
+  }, {
     "id": "apicall.httpclient.async.NettyHttpClientH2Benchmark.concurrentApiCall-Throughput-sslProviderValue-jdk",
     "params": {
-      "sdkVersion": "2.9.11",
+      "sdkVersion": "2.10.89",
       "jdkVersion": "1.8.0_222",
       "jvmName": "OpenJDK 64-Bit Server VM",
       "jvmVersion": "25.222-b10",
       "mode": "Throughput",
-      "date": "2019-10-01T20:07:52.544"
+      "date": "2020-03-18T20:11:42.315"
     },
     "statistics": {
-      "mean": 7283.504799574257,
-      "variance": 2940.452504351831,
-      "standardDeviation": 54.22593940497325,
-      "max": 7341.573192234993,
-      "min": 7160.770039331679,
+      "mean": 6452.047990499835,
+      "variance": 844.6625223962324,
+      "standardDeviation": 29.063078336546393,
+      "max": 6499.658012694073,
+      "min": 6401.143996944477,
       "n": 10,
-      "sum": 72835.04799574257
+      "sum": 64520.47990499835
     }
-  },
-  {
+  }, {
     "id": "apicall.httpclient.async.NettyHttpClientH2Benchmark.concurrentApiCall-Throughput-sslProviderValue-openssl",
     "params": {
-      "sdkVersion": "2.9.11",
+      "sdkVersion": "2.10.89",
       "jdkVersion": "1.8.0_222",
       "jvmName": "OpenJDK 64-Bit Server VM",
       "jvmVersion": "25.222-b10",
       "mode": "Throughput",
-      "date": "2019-10-01T20:07:52.545"
+      "date": "2020-03-18T20:11:42.315"
     },
     "statistics": {
-      "mean": 8384.82208375372,
-      "variance": 916.1282854797893,
-      "standardDeviation": 30.267611162425574,
-      "max": 8426.604455073824,
-      "min": 8321.092978907209,
+      "mean": 7299.549654768969,
+      "variance": 6802.210622023329,
+      "standardDeviation": 82.47551528801338,
+      "max": 7377.236551369815,
+      "min": 7142.628565890159,
       "n": 10,
-      "sum": 83848.22083753718
+      "sum": 72995.49654768969
     }
-  },
-  {
+  }, {
     "id": "apicall.httpclient.async.NettyHttpClientH2Benchmark.sequentialApiCall-Throughput-sslProviderValue-jdk",
     "params": {
-      "sdkVersion": "2.9.11",
+      "sdkVersion": "2.10.89",
       "jdkVersion": "1.8.0_222",
       "jvmName": "OpenJDK 64-Bit Server VM",
       "jvmVersion": "25.222-b10",
       "mode": "Throughput",
-      "date": "2019-10-01T20:07:52.545"
+      "date": "2020-03-18T20:11:42.315"
     },
     "statistics": {
-      "mean": 2477.2975472033204,
-      "variance": 840.2618882518038,
-      "standardDeviation": 28.987271141861626,
-      "max": 2521.960405726022,
-      "min": 2428.703690483765,
+      "mean": 2253.2698214846414,
+      "variance": 440.12404468422363,
+      "standardDeviation": 20.979133554182443,
+      "max": 2277.64629879439,
+      "min": 2214.79534117503,
       "n": 10,
-      "sum": 24772.975472033202
+      "sum": 22532.698214846412
     }
-  },
-  {
+  }, {
     "id": "apicall.httpclient.async.NettyHttpClientH2Benchmark.sequentialApiCall-Throughput-sslProviderValue-openssl",
     "params": {
-      "sdkVersion": "2.9.11",
+      "sdkVersion": "2.10.89",
       "jdkVersion": "1.8.0_222",
       "jvmName": "OpenJDK 64-Bit Server VM",
       "jvmVersion": "25.222-b10",
       "mode": "Throughput",
-      "date": "2019-10-01T20:07:52.545"
+      "date": "2020-03-18T20:11:42.316"
     },
     "statistics": {
-      "mean": 2590.8112289580376,
-      "variance": 454.61212848034586,
-      "standardDeviation": 21.321635220600363,
-      "max": 2616.8156380507344,
-      "min": 2540.5786144254553,
+      "mean": 2349.62389971199,
+      "variance": 605.1860304937383,
+      "standardDeviation": 24.600529069386663,
+      "max": 2387.296816018288,
+      "min": 2305.4407773762227,
       "n": 10,
-      "sum": 25908.11228958038
+      "sum": 23496.238997119897
     }
-  },
-  {
+  }, {
     "id": "apicall.httpclient.sync.ApacheHttpClientBenchmark.concurrentApiCall-Throughput",
     "params": {
-      "sdkVersion": "2.9.11",
+      "sdkVersion": "2.10.89",
       "jdkVersion": "1.8.0_222",
       "jvmName": "OpenJDK 64-Bit Server VM",
       "jvmVersion": "25.222-b10",
       "mode": "Throughput",
-      "date": "2019-10-01T20:07:52.545"
+      "date": "2020-03-18T20:11:42.316"
     },
     "statistics": {
-      "mean": 16866.337334610893,
-      "variance": 101462.03409398827,
-      "standardDeviation": 318.531056718161,
-      "max": 17190.064649926695,
-      "min": 16269.141724682142,
+      "mean": 15097.57607845867,
+      "variance": 765986.0501891866,
+      "standardDeviation": 875.2062900763377,
+      "max": 16056.36834170701,
+      "min": 14137.646966796729,
       "n": 10,
-      "sum": 168663.37334610894
+      "sum": 150975.7607845867
     }
-  },
-  {
+  }, {
     "id": "apicall.httpclient.sync.ApacheHttpClientBenchmark.sequentialApiCall-Throughput",
     "params": {
-      "sdkVersion": "2.9.11",
+      "sdkVersion": "2.10.89",
       "jdkVersion": "1.8.0_222",
       "jvmName": "OpenJDK 64-Bit Server VM",
       "jvmVersion": "25.222-b10",
       "mode": "Throughput",
-      "date": "2019-10-01T20:07:52.545"
+      "date": "2020-03-18T20:11:42.316"
     },
     "statistics": {
-      "mean": 4226.017857222098,
-      "variance": 3066.661807525882,
-      "standardDeviation": 55.37744854655081,
-      "max": 4305.988492552596,
-      "min": 4134.085450279892,
+      "mean": 3932.902248629381,
+      "variance": 3061.581931234147,
+      "standardDeviation": 55.331563607349345,
+      "max": 4034.253595323324,
+      "min": 3860.187186029488,
       "n": 10,
-      "sum": 42260.17857222098
+      "sum": 39329.02248629381
     }
-  },
-  {
+  }, {
     "id": "apicall.httpclient.sync.UrlConnectionHttpClientBenchmark.sequentialApiCall-Throughput",
     "params": {
-      "sdkVersion": "2.9.11",
+      "sdkVersion": "2.10.89",
       "jdkVersion": "1.8.0_222",
       "jvmName": "OpenJDK 64-Bit Server VM",
       "jvmVersion": "25.222-b10",
       "mode": "Throughput",
-      "date": "2019-10-01T20:07:52.545"
+      "date": "2020-03-18T20:11:42.316"
     },
     "statistics": {
-      "mean": 174.7664801674713,
-      "variance": 12.515295546405632,
-      "standardDeviation": 3.5376963615332553,
-      "max": 178.6770241537442,
-      "min": 166.3421471658005,
+      "mean": 769.724367683772,
+      "variance": 57.31368679644894,
+      "standardDeviation": 7.570580347400649,
+      "max": 788.1624697524128,
+      "min": 761.9236689968031,
       "n": 10,
-      "sum": 1747.6648016747129
+      "sum": 7697.24367683772
     }
-  },
-  {
+  }, {
     "id": "apicall.protocol.Ec2ProtocolBenchmark.successfulResponse-Throughput",
     "params": {
-      "sdkVersion": "2.9.11",
+      "sdkVersion": "2.10.89",
       "jdkVersion": "1.8.0_222",
       "jvmName": "OpenJDK 64-Bit Server VM",
       "jvmVersion": "25.222-b10",
       "mode": "Throughput",
-      "date": "2019-10-01T20:07:52.545"
+      "date": "2020-03-18T20:11:42.317"
     },
     "statistics": {
-      "mean": 9841.459076464273,
-      "variance": 10949.247996138049,
-      "standardDeviation": 104.63865440714558,
-      "max": 9965.24912712474,
-      "min": 9722.623015204204,
+      "mean": 9487.796808217518,
+      "variance": 574.9827758049166,
+      "standardDeviation": 23.978798464579427,
+      "max": 9527.963191787714,
+      "min": 9447.731608355678,
       "n": 10,
-      "sum": 98414.59076464272
+      "sum": 94877.96808217518
     }
-  },
-  {
+  }, {
     "id": "apicall.protocol.JsonProtocolBenchmark.successfulResponse-Throughput",
     "params": {
-      "sdkVersion": "2.9.11",
+      "sdkVersion": "2.10.89",
       "jdkVersion": "1.8.0_222",
       "jvmName": "OpenJDK 64-Bit Server VM",
       "jvmVersion": "25.222-b10",
       "mode": "Throughput",
-      "date": "2019-10-01T20:07:52.546"
+      "date": "2020-03-18T20:11:42.317"
     },
     "statistics": {
-      "mean": 16430.407523053836,
-      "variance": 29331.706560699487,
-      "standardDeviation": 171.26501849677152,
-      "max": 16638.092602848086,
-      "min": 16262.768049018146,
+      "mean": 15239.050304507653,
+      "variance": 5086.056215892704,
+      "standardDeviation": 71.31659144892375,
+      "max": 15346.02562533864,
+      "min": 15154.244391844419,
       "n": 10,
-      "sum": 164304.07523053835
+      "sum": 152390.50304507653
     }
-  },
-  {
+  }, {
     "id": "apicall.protocol.QueryProtocolBenchmark.successfulResponse-Throughput",
     "params": {
-      "sdkVersion": "2.9.11",
+      "sdkVersion": "2.10.89",
       "jdkVersion": "1.8.0_222",
       "jvmName": "OpenJDK 64-Bit Server VM",
       "jvmVersion": "25.222-b10",
       "mode": "Throughput",
-      "date": "2019-10-01T20:07:52.546"
+      "date": "2020-03-18T20:11:42.317"
     },
     "statistics": {
-      "mean": 10599.011117216372,
-      "variance": 975.0013823076044,
-      "standardDeviation": 31.225012126620616,
-      "max": 10644.281296039415,
-      "min": 10551.650476781753,
+      "mean": 10511.163793405529,
+      "variance": 11710.799056333717,
+      "standardDeviation": 108.21644540611061,
+      "max": 10633.736168153604,
+      "min": 10382.859111007954,
       "n": 10,
-      "sum": 105990.11117216373
+      "sum": 105111.63793405528
     }
-  },
-  {
+  }, {
     "id": "apicall.protocol.XmlProtocolBenchmark.successfulResponse-Throughput",
     "params": {
-      "sdkVersion": "2.9.11",
+      "sdkVersion": "2.10.89",
       "jdkVersion": "1.8.0_222",
       "jvmName": "OpenJDK 64-Bit Server VM",
       "jvmVersion": "25.222-b10",
       "mode": "Throughput",
-      "date": "2019-10-01T20:07:52.546"
+      "date": "2020-03-18T20:11:42.317"
     },
     "statistics": {
-      "mean": 9303.178155788462,
-      "variance": 21561.58218389355,
-      "standardDeviation": 146.83862633480862,
-      "max": 9463.863235819606,
-      "min": 9137.897225156119,
+      "mean": 8484.220376124444,
+      "variance": 27557.34797047023,
+      "standardDeviation": 166.00406010236685,
+      "max": 8658.753596062446,
+      "min": 8296.688244439016,
       "n": 10,
-      "sum": 93031.78155788462
+      "sum": 84842.20376124444
     }
-  },
-  {
+  }, {
     "id": "coldstart.V2OptimizedClientCreationBenchmark.createClient-SampleTime",
     "params": {
-      "sdkVersion": "2.9.11",
+      "sdkVersion": "2.10.89",
       "jdkVersion": "1.8.0_222",
       "jvmName": "OpenJDK 64-Bit Server VM",
       "jvmVersion": "25.222-b10",
       "mode": "SampleTime",
-      "date": "2019-10-01T20:07:52.56"
+      "date": "2020-03-18T20:11:42.33"
+    },
+    "statistics": {
+      "mean": 0.19604848685545748,
+      "variance": 15.024731435678909,
+      "standardDeviation": 3.876174845860144,
+      "max": 1572.864,
+      "min": 0.169216,
+      "n": 771613,
+      "sum": 151273.5610880001
+    }
+  }, {
+    "id": "enhanced.dynamodb.EnhancedClientGetOverheadBenchmark.enhanceGet-Throughput-testItem-TINY",
+    "params": {
+      "sdkVersion": "2.11.2-SNAPSHOT",
+      "jdkVersion": "1.8.0_242",
+      "jvmName": "OpenJDK 64-Bit Server VM",
+      "jvmVersion": "25.242-b08",
+      "mode": "Throughput",
+      "date": "2020-03-26T21:54:38.779"
+    },
+    "statistics": {
+      "mean": 21861.411294887475,
+      "variance": 3163.9728423574056,
+      "standardDeviation": 56.24920303753117,
+      "max": 21931.163358835558,
+      "min": 21783.74564645071,
+      "n": 10,
+      "sum": 218614.11294887474
+    }
+  }, {
+    "id": "enhanced.dynamodb.EnhancedClientGetOverheadBenchmark.enhanceGet-Throughput-testItem-SMALL",
+    "params": {
+      "sdkVersion": "2.11.2-SNAPSHOT",
+      "jdkVersion": "1.8.0_242",
+      "jvmName": "OpenJDK 64-Bit Server VM",
+      "jvmVersion": "25.242-b08",
+      "mode": "Throughput",
+      "date": "2020-03-26T21:54:38.798"
+    },
+    "statistics": {
+      "mean": 19194.404041731374,
+      "variance": 1931.7305489412388,
+      "standardDeviation": 43.951456732868806,
+      "max": 19301.311007353008,
+      "min": 19154.59785578245,
+      "n": 10,
+      "sum": 191944.04041731375
+    }
+  }, {
+    "id": "enhanced.dynamodb.EnhancedClientGetOverheadBenchmark.enhanceGet-Throughput-testItem-HUGE",
+    "params": {
+      "sdkVersion": "2.11.2-SNAPSHOT",
+      "jdkVersion": "1.8.0_242",
+      "jvmName": "OpenJDK 64-Bit Server VM",
+      "jvmVersion": "25.242-b08",
+      "mode": "Throughput",
+      "date": "2020-03-26T21:54:38.801"
+    },
+    "statistics": {
+      "mean": 5742.760128972843,
+      "variance": 3812.4529097450204,
+      "standardDeviation": 61.7450638492262,
+      "max": 5818.06705484057,
+      "min": 5673.681434809584,
+      "n": 10,
+      "sum": 57427.60128972843
+    }
+  }, {
+    "id": "enhanced.dynamodb.EnhancedClientGetOverheadBenchmark.enhanceGet-Throughput-testItem-HUGE_FLAT",
+    "params": {
+      "sdkVersion": "2.11.2-SNAPSHOT",
+      "jdkVersion": "1.8.0_242",
+      "jvmName": "OpenJDK 64-Bit Server VM",
+      "jvmVersion": "25.242-b08",
+      "mode": "Throughput",
+      "date": "2020-03-26T21:54:38.803"
+    },
+    "statistics": {
+      "mean": 9123.68471587034,
+      "variance": 39381.407506045354,
+      "standardDeviation": 198.44749307069958,
+      "max": 9324.8313949261,
+      "min": 8916.525076502701,
+      "n": 10,
+      "sum": 91236.8471587034
+    }
+  }, {
+    "id": "enhanced.dynamodb.EnhancedClientGetOverheadBenchmark.lowLevelGet-Throughput-testItem-TINY",
+    "params": {
+      "sdkVersion": "2.11.2-SNAPSHOT",
+      "jdkVersion": "1.8.0_242",
+      "jvmName": "OpenJDK 64-Bit Server VM",
+      "jvmVersion": "25.242-b08",
+      "mode": "Throughput",
+      "date": "2020-03-26T21:54:38.805"
+    },
+    "statistics": {
+      "mean": 23727.653183389055,
+      "variance": 1302.5647136172183,
+      "standardDeviation": 36.091061408847736,
+      "max": 23790.896842117898,
+      "min": 23676.50791476011,
+      "n": 10,
+      "sum": 237276.53183389056
+    }
+  }, {
+    "id": "enhanced.dynamodb.EnhancedClientGetOverheadBenchmark.lowLevelGet-Throughput-testItem-SMALL",
+    "params": {
+      "sdkVersion": "2.11.2-SNAPSHOT",
+      "jdkVersion": "1.8.0_242",
+      "jvmName": "OpenJDK 64-Bit Server VM",
+      "jvmVersion": "25.242-b08",
+      "mode": "Throughput",
+      "date": "2020-03-26T21:54:38.807"
+    },
+    "statistics": {
+      "mean": 21204.570979007094,
+      "variance": 1805.7357256611479,
+      "standardDeviation": 42.49394928294083,
+      "max": 21261.432335576043,
+      "min": 21148.45805269659,
+      "n": 10,
+      "sum": 212045.70979007095
+    }
+  }, {
+    "id": "enhanced.dynamodb.EnhancedClientGetOverheadBenchmark.lowLevelGet-Throughput-testItem-HUGE",
+    "params": {
+      "sdkVersion": "2.11.2-SNAPSHOT",
+      "jdkVersion": "1.8.0_242",
+      "jvmName": "OpenJDK 64-Bit Server VM",
+      "jvmVersion": "25.242-b08",
+      "mode": "Throughput",
+      "date": "2020-03-26T21:54:38.809"
+    },
+    "statistics": {
+      "mean": 6631.846341687633,
+      "variance": 9642.265611299274,
+      "standardDeviation": 98.19503862873762,
+      "max": 6736.785800028154,
+      "min": 6531.270517561989,
+      "n": 10,
+      "sum": 66318.46341687633
+    }
+  }, {
+    "id": "enhanced.dynamodb.EnhancedClientGetOverheadBenchmark.lowLevelGet-Throughput-testItem-HUGE_FLAT",
+    "params": {
+      "sdkVersion": "2.11.2-SNAPSHOT",
+      "jdkVersion": "1.8.0_242",
+      "jvmName": "OpenJDK 64-Bit Server VM",
+      "jvmVersion": "25.242-b08",
+      "mode": "Throughput",
+      "date": "2020-03-26T21:54:38.811"
+    },
+    "statistics": {
+      "mean": 10065.700621509586,
+      "variance": 5477.304848411613,
+      "standardDeviation": 74.00881601817187,
+      "max": 10148.047716366358,
+      "min": 9983.316684342379,
+      "n": 10,
+      "sum": 100657.00621509585
+    }
+  }, {
+    "id": "enhanced.dynamodb.EnhancedClientPutOverheadBenchmark.enhancedPut-Throughput-testItem-TINY",
+    "params": {
+      "sdkVersion": "2.11.2-SNAPSHOT",
+      "jdkVersion": "1.8.0_242",
+      "jvmName": "OpenJDK 64-Bit Server VM",
+      "jvmVersion": "25.242-b08",
+      "mode": "Throughput",
+      "date": "2020-03-26T21:54:38.813"
+    },
+    "statistics": {
+      "mean": 23635.986227776833,
+      "variance": 95075.34657500139,
+      "standardDeviation": 308.3429042073149,
+      "max": 23938.47823573249,
+      "min": 23304.441614334046,
+      "n": 10,
+      "sum": 236359.86227776835
+    }
+  }, {
+    "id": "enhanced.dynamodb.EnhancedClientPutOverheadBenchmark.enhancedPut-Throughput-testItem-SMALL",
+    "params": {
+      "sdkVersion": "2.11.2-SNAPSHOT",
+      "jdkVersion": "1.8.0_242",
+      "jvmName": "OpenJDK 64-Bit Server VM",
+      "jvmVersion": "25.242-b08",
+      "mode": "Throughput",
+      "date": "2020-03-26T21:54:38.816"
+    },
+    "statistics": {
+      "mean": 20950.69006280451,
+      "variance": 883.8583335563803,
+      "standardDeviation": 29.729755020120503,
+      "max": 20994.25580029217,
+      "min": 20908.858362596562,
+      "n": 10,
+      "sum": 209506.9006280451
+    }
+  }, {
+    "id": "enhanced.dynamodb.EnhancedClientPutOverheadBenchmark.enhancedPut-Throughput-testItem-HUGE",
+    "params": {
+      "sdkVersion": "2.11.2-SNAPSHOT",
+      "jdkVersion": "1.8.0_242",
+      "jvmName": "OpenJDK 64-Bit Server VM",
+      "jvmVersion": "25.242-b08",
+      "mode": "Throughput",
+      "date": "2020-03-26T21:54:38.818"
+    },
+    "statistics": {
+      "mean": 6947.0547317414,
+      "variance": 2054.540956290902,
+      "standardDeviation": 45.3270444248343,
+      "max": 6992.094904618327,
+      "min": 6897.3604801922065,
+      "n": 10,
+      "sum": 69470.547317414
+    }
+  }, {
+    "id": "enhanced.dynamodb.EnhancedClientPutOverheadBenchmark.enhancedPut-Throughput-testItem-HUGE_FLAT",
+    "params": {
+      "sdkVersion": "2.11.2-SNAPSHOT",
+      "jdkVersion": "1.8.0_242",
+      "jvmName": "OpenJDK 64-Bit Server VM",
+      "jvmVersion": "25.242-b08",
+      "mode": "Throughput",
+      "date": "2020-03-26T21:54:38.819"
+    },
+    "statistics": {
+      "mean": 9651.438384939946,
+      "variance": 21265.37256778877,
+      "standardDeviation": 145.82651531113527,
+      "max": 9810.960459690477,
+      "min": 9505.341211373996,
+      "n": 10,
+      "sum": 96514.38384939946
+    }
+  }, {
+    "id": "enhanced.dynamodb.EnhancedClientPutOverheadBenchmark.lowLevelPut-Throughput-testItem-TINY",
+    "params": {
+      "sdkVersion": "2.11.2-SNAPSHOT",
+      "jdkVersion": "1.8.0_242",
+      "jvmName": "OpenJDK 64-Bit Server VM",
+      "jvmVersion": "25.242-b08",
+      "mode": "Throughput",
+      "date": "2020-03-26T21:54:38.821"
+    },
+    "statistics": {
+      "mean": 24474.133695525416,
+      "variance": 2418.272421611502,
+      "standardDeviation": 49.175933357807274,
+      "max": 24560.246261229124,
+      "min": 24391.482959504494,
+      "n": 10,
+      "sum": 244741.33695525417
+    }
+  }, {
+    "id": "enhanced.dynamodb.EnhancedClientPutOverheadBenchmark.lowLevelPut-Throughput-testItem-SMALL",
+    "params": {
+      "sdkVersion": "2.11.2-SNAPSHOT",
+      "jdkVersion": "1.8.0_242",
+      "jvmName": "OpenJDK 64-Bit Server VM",
+      "jvmVersion": "25.242-b08",
+      "mode": "Throughput",
+      "date": "2020-03-26T21:54:38.823"
+    },
+    "statistics": {
+      "mean": 21708.256095745754,
+      "variance": 33817.56629349679,
+      "standardDeviation": 183.89553092312164,
+      "max": 21896.648516991783,
+      "min": 21515.476349143923,
+      "n": 10,
+      "sum": 217082.56095745755
+    }
+  }, {
+    "id": "enhanced.dynamodb.EnhancedClientPutOverheadBenchmark.lowLevelPut-Throughput-testItem-HUGE",
+    "params": {
+      "sdkVersion": "2.11.2-SNAPSHOT",
+      "jdkVersion": "1.8.0_242",
+      "jvmName": "OpenJDK 64-Bit Server VM",
+      "jvmVersion": "25.242-b08",
+      "mode": "Throughput",
+      "date": "2020-03-26T21:54:38.824"
+    },
+    "statistics": {
+      "mean": 7831.76449879679,
+      "variance": 556.5114846450683,
+      "standardDeviation": 23.590495642208715,
+      "max": 7862.726711793453,
+      "min": 7801.301995363553,
+      "n": 10,
+      "sum": 78317.6449879679
+    }
+  }, {
+    "id": "enhanced.dynamodb.EnhancedClientPutOverheadBenchmark.lowLevelPut-Throughput-testItem-HUGE_FLAT",
+    "params": {
+      "sdkVersion": "2.11.2-SNAPSHOT",
+      "jdkVersion": "1.8.0_242",
+      "jvmName": "OpenJDK 64-Bit Server VM",
+      "jvmVersion": "25.242-b08",
+      "mode": "Throughput",
+      "date": "2020-03-26T21:54:38.826"
     },
     "statistics": {
-      "mean": 0.11715317741749746,
-      "variance": 24.391494667328747,
-      "standardDeviation": 4.9387746119183,
-      "max": 3544.1868799999997,
-      "min": 0.09088,
-      "n": 1293869,
-      "sum": 151580.86451200003
+      "mean": 10432.187037993292,
+      "variance": 6156.945597980833,
+      "standardDeviation": 78.4662067260858,
+      "max": 10544.74583687034,
+      "min": 10338.349564607815,
+      "n": 10,
+      "sum": 104321.87037993292
+    }
+  }, {
+    "id": "enhanced.dynamodb.V1MapperComparisonBenchmark.v1Get-Throughput-testItem-TINY",
+    "params": {
+      "sdkVersion": "2.11.2-SNAPSHOT",
+      "jdkVersion": "1.8.0_242",
+      "jvmName": "OpenJDK 64-Bit Server VM",
+      "jvmVersion": "25.242-b08",
+      "mode": "Throughput",
+      "date": "2020-03-26T21:54:38.83"
+    },
+    "statistics": {
+      "mean": 4216269.465030504,
+      "variance": 7577381680.455024,
+      "standardDeviation": 87048.1572490482,
+      "max": 4304995.187978772,
+      "min": 4127750.465031905,
+      "n": 10,
+      "sum": 42162694.65030504
+    }
+  }, {
+    "id": "enhanced.dynamodb.V1MapperComparisonBenchmark.v1Get-Throughput-testItem-SMALL",
+    "params": {
+      "sdkVersion": "2.11.2-SNAPSHOT",
+      "jdkVersion": "1.8.0_242",
+      "jvmName": "OpenJDK 64-Bit Server VM",
+      "jvmVersion": "25.242-b08",
+      "mode": "Throughput",
+      "date": "2020-03-26T21:54:38.831"
+    },
+    "statistics": {
+      "mean": 2548116.917228338,
+      "variance": 39596645.65844414,
+      "standardDeviation": 6292.586563444649,
+      "max": 2553688.8961462937,
+      "min": 2536667.0775304707,
+      "n": 10,
+      "sum": 25481169.172283377
+    }
+  }, {
+    "id": "enhanced.dynamodb.V1MapperComparisonBenchmark.v1Get-Throughput-testItem-HUGE",
+    "params": {
+      "sdkVersion": "2.11.2-SNAPSHOT",
+      "jdkVersion": "1.8.0_242",
+      "jvmName": "OpenJDK 64-Bit Server VM",
+      "jvmVersion": "25.242-b08",
+      "mode": "Throughput",
+      "date": "2020-03-26T21:54:38.833"
+    },
+    "statistics": {
+      "mean": 271517.73760595697,
+      "variance": 2372265.138141567,
+      "standardDeviation": 1540.2159388025975,
+      "max": 273137.05391642277,
+      "min": 269843.99771755247,
+      "n": 10,
+      "sum": 2715177.37605957
+    }
+  }, {
+    "id": "enhanced.dynamodb.V1MapperComparisonBenchmark.v1Get-Throughput-testItem-HUGE_FLAT",
+    "params": {
+      "sdkVersion": "2.11.2-SNAPSHOT",
+      "jdkVersion": "1.8.0_242",
+      "jvmName": "OpenJDK 64-Bit Server VM",
+      "jvmVersion": "25.242-b08",
+      "mode": "Throughput",
+      "date": "2020-03-26T21:54:38.835"
+    },
+    "statistics": {
+      "mean": 347920.5003151236,
+      "variance": 595046205.154461,
+      "standardDeviation": 24393.56893024186,
+      "max": 371195.38010237005,
+      "min": 324573.14439857507,
+      "n": 10,
+      "sum": 3479205.003151236
+    }
+  }, {
+    "id": "enhanced.dynamodb.V1MapperComparisonBenchmark.v1Put-Throughput-testItem-TINY",
+    "params": {
+      "sdkVersion": "2.11.2-SNAPSHOT",
+      "jdkVersion": "1.8.0_242",
+      "jvmName": "OpenJDK 64-Bit Server VM",
+      "jvmVersion": "25.242-b08",
+      "mode": "Throughput",
+      "date": "2020-03-26T21:54:38.836"
+    },
+    "statistics": {
+      "mean": 1768330.9260150697,
+      "variance": 1939469873.1268594,
+      "standardDeviation": 44039.412724590904,
+      "max": 1811149.0295745614,
+      "min": 1724510.13860136,
+      "n": 10,
+      "sum": 17683309.260150697
+    }
+  }, {
+    "id": "enhanced.dynamodb.V1MapperComparisonBenchmark.v1Put-Throughput-testItem-SMALL",
+    "params": {
+      "sdkVersion": "2.11.2-SNAPSHOT",
+      "jdkVersion": "1.8.0_242",
+      "jvmName": "OpenJDK 64-Bit Server VM",
+      "jvmVersion": "25.242-b08",
+      "mode": "Throughput",
+      "date": "2020-03-26T21:54:38.838"
+    },
+    "statistics": {
+      "mean": 1164870.7035331992,
+      "variance": 52647682.835541315,
+      "standardDeviation": 7255.8723001126,
+      "max": 1174402.0970783627,
+      "min": 1155823.7219991074,
+      "n": 10,
+      "sum": 11648707.035331992
+    }
+  }, {
+    "id": "enhanced.dynamodb.V1MapperComparisonBenchmark.v1Put-Throughput-testItem-HUGE",
+    "params": {
+      "sdkVersion": "2.11.2-SNAPSHOT",
+      "jdkVersion": "1.8.0_242",
+      "jvmName": "OpenJDK 64-Bit Server VM",
+      "jvmVersion": "25.242-b08",
+      "mode": "Throughput",
+      "date": "2020-03-26T21:54:38.839"
+    },
+    "statistics": {
+      "mean": 210052.38869182704,
+      "variance": 1798030.11996659,
+      "standardDeviation": 1340.9064545920382,
+      "max": 211619.30915467444,
+      "min": 208695.9982500961,
+      "n": 10,
+      "sum": 2100523.8869182705
+    }
+  }, {
+    "id": "enhanced.dynamodb.V1MapperComparisonBenchmark.v1Put-Throughput-testItem-HUGE_FLAT",
+    "params": {
+      "sdkVersion": "2.11.2-SNAPSHOT",
+      "jdkVersion": "1.8.0_242",
+      "jvmName": "OpenJDK 64-Bit Server VM",
+      "jvmVersion": "25.242-b08",
+      "mode": "Throughput",
+      "date": "2020-03-26T21:54:38.841"
+    },
+    "statistics": {
+      "mean": 114978.94801995096,
+      "variance": 1371813.7644851753,
+      "standardDeviation": 1171.244536587119,
+      "max": 116329.77786560146,
+      "min": 113730.43393826579,
+      "n": 10,
+      "sum": 1149789.4801995095
+    }
+  }, {
+    "id": "enhanced.dynamodb.V1MapperComparisonBenchmark.v2Get-Throughput-testItem-TINY",
+    "params": {
+      "sdkVersion": "2.11.2-SNAPSHOT",
+      "jdkVersion": "1.8.0_242",
+      "jvmName": "OpenJDK 64-Bit Server VM",
+      "jvmVersion": "25.242-b08",
+      "mode": "Throughput",
+      "date": "2020-03-26T21:54:38.842"
+    },
+    "statistics": {
+      "mean": 3662576.5648506857,
+      "variance": 7409482642.244276,
+      "standardDeviation": 86078.35176305525,
+      "max": 3748802.8826729953,
+      "min": 3575363.8664258076,
+      "n": 10,
+      "sum": 36625765.64850686
+    }
+  }, {
+    "id": "enhanced.dynamodb.V1MapperComparisonBenchmark.v2Get-Throughput-testItem-SMALL",
+    "params": {
+      "sdkVersion": "2.11.2-SNAPSHOT",
+      "jdkVersion": "1.8.0_242",
+      "jvmName": "OpenJDK 64-Bit Server VM",
+      "jvmVersion": "25.242-b08",
+      "mode": "Throughput",
+      "date": "2020-03-26T21:54:38.844"
+    },
+    "statistics": {
+      "mean": 1646303.6313321758,
+      "variance": 1574901387.9625113,
+      "standardDeviation": 39685.027251628686,
+      "max": 1686779.9815694,
+      "min": 1607103.7820484997,
+      "n": 10,
+      "sum": 16463036.313321758
+    }
+  }, {
+    "id": "enhanced.dynamodb.V1MapperComparisonBenchmark.v2Get-Throughput-testItem-HUGE",
+    "params": {
+      "sdkVersion": "2.11.2-SNAPSHOT",
+      "jdkVersion": "1.8.0_242",
+      "jvmName": "OpenJDK 64-Bit Server VM",
+      "jvmVersion": "25.242-b08",
+      "mode": "Throughput",
+      "date": "2020-03-26T21:54:38.845"
+    },
+    "statistics": {
+      "mean": 129737.87890043444,
+      "variance": 139476.8830297755,
+      "standardDeviation": 373.466039995306,
+      "max": 130343.97849463933,
+      "min": 129275.2611792706,
+      "n": 10,
+      "sum": 1297378.7890043445
+    }
+  }, {
+    "id": "enhanced.dynamodb.V1MapperComparisonBenchmark.v2Get-Throughput-testItem-HUGE_FLAT",
+    "params": {
+      "sdkVersion": "2.11.2-SNAPSHOT",
+      "jdkVersion": "1.8.0_242",
+      "jvmName": "OpenJDK 64-Bit Server VM",
+      "jvmVersion": "25.242-b08",
+      "mode": "Throughput",
+      "date": "2020-03-26T21:54:38.847"
+    },
+    "statistics": {
+      "mean": 276472.2259425583,
+      "variance": 2020459.345500282,
+      "standardDeviation": 1421.4286283525748,
+      "max": 278228.1324706078,
+      "min": 274914.59156783926,
+      "n": 10,
+      "sum": 2764722.2594255833
+    }
+  }, {
+    "id": "enhanced.dynamodb.V1MapperComparisonBenchmark.v2Put-Throughput-testItem-TINY",
+    "params": {
+      "sdkVersion": "2.11.2-SNAPSHOT",
+      "jdkVersion": "1.8.0_242",
+      "jvmName": "OpenJDK 64-Bit Server VM",
+      "jvmVersion": "25.242-b08",
+      "mode": "Throughput",
+      "date": "2020-03-26T21:54:38.848"
+    },
+    "statistics": {
+      "mean": 3971820.2835967117,
+      "variance": 17460612994.02266,
+      "standardDeviation": 132138.61280497332,
+      "max": 4108330.055204355,
+      "min": 3840104.0305961887,
+      "n": 10,
+      "sum": 39718202.835967116
+    }
+  }, {
+    "id": "enhanced.dynamodb.V1MapperComparisonBenchmark.v2Put-Throughput-testItem-SMALL",
+    "params": {
+      "sdkVersion": "2.11.2-SNAPSHOT",
+      "jdkVersion": "1.8.0_242",
+      "jvmName": "OpenJDK 64-Bit Server VM",
+      "jvmVersion": "25.242-b08",
+      "mode": "Throughput",
+      "date": "2020-03-26T21:54:38.849"
+    },
+    "statistics": {
+      "mean": 1493615.511958485,
+      "variance": 9028125.181795087,
+      "standardDeviation": 3004.6838738534684,
+      "max": 1498786.274708349,
+      "min": 1488510.4353162742,
+      "n": 10,
+      "sum": 14936155.11958485
+    }
+  }, {
+    "id": "enhanced.dynamodb.V1MapperComparisonBenchmark.v2Put-Throughput-testItem-HUGE",
+    "params": {
+      "sdkVersion": "2.11.2-SNAPSHOT",
+      "jdkVersion": "1.8.0_242",
+      "jvmName": "OpenJDK 64-Bit Server VM",
+      "jvmVersion": "25.242-b08",
+      "mode": "Throughput",
+      "date": "2020-03-26T21:54:38.851"
+    },
+    "statistics": {
+      "mean": 119057.84161286886,
+      "variance": 175279.77046631582,
+      "standardDeviation": 418.66426939292995,
+      "max": 119543.18118979972,
+      "min": 118539.26235554788,
+      "n": 10,
+      "sum": 1190578.4161286885
+    }
+  }, {
+    "id": "enhanced.dynamodb.V1MapperComparisonBenchmark.v2Put-Throughput-testItem-HUGE_FLAT",
+    "params": {
+      "sdkVersion": "2.11.2-SNAPSHOT",
+      "jdkVersion": "1.8.0_242",
+      "jvmName": "OpenJDK 64-Bit Server VM",
+      "jvmVersion": "25.242-b08",
+      "mode": "Throughput",
+      "date": "2020-03-26T21:54:38.852"
+    },
+    "statistics": {
+      "mean": 146022.84478369894,
+      "variance": 327890156.19659877,
+      "standardDeviation": 18107.737467629653,
+      "max": 163566.06331238395,
+      "min": 128721.90017507998,
+      "n": 10,
+      "sum": 1460228.4478369893
+    }
+  }, {
+    "id": "enhanced.dynamodb.EnhancedClientDeleteV1MapperComparisonBenchmark.v1Delete-Throughput-testItem-TINY",
+    "params": {
+      "sdkVersion": "2.11.5-SNAPSHOT",
+      "jdkVersion": "1.8.0_242",
+      "jvmName": "OpenJDK 64-Bit Server VM",
+      "jvmVersion": "25.242-b08",
+      "mode": "Throughput",
+      "date": "2020-03-31T20:56:25.606"
+    },
+    "statistics": {
+      "mean": 6829142.946589122,
+      "variance": 4.8591555126432484E8,
+      "standardDeviation": 22043.492265617188,
+      "max": 6863185.870054239,
+      "min": 6799116.445357319,
+      "n": 10,
+      "sum": 6.829142946589121E7
+    }
+  }, {
+    "id": "enhanced.dynamodb.EnhancedClientDeleteV1MapperComparisonBenchmark.v1Delete-Throughput-testItem-SMALL",
+    "params": {
+      "sdkVersion": "2.11.5-SNAPSHOT",
+      "jdkVersion": "1.8.0_242",
+      "jvmName": "OpenJDK 64-Bit Server VM",
+      "jvmVersion": "25.242-b08",
+      "mode": "Throughput",
+      "date": "2020-03-31T20:56:25.624"
+    },
+    "statistics": {
+      "mean": 6808359.910172634,
+      "variance": 2.000208296099299E8,
+      "standardDeviation": 14142.87204247885,
+      "max": 6828977.335348215,
+      "min": 6786067.374609099,
+      "n": 10,
+      "sum": 6.808359910172634E7
+    }
+  }, {
+    "id": "enhanced.dynamodb.EnhancedClientDeleteV1MapperComparisonBenchmark.v1Delete-Throughput-testItem-HUGE",
+    "params": {
+      "sdkVersion": "2.11.5-SNAPSHOT",
+      "jdkVersion": "1.8.0_242",
+      "jvmName": "OpenJDK 64-Bit Server VM",
+      "jvmVersion": "25.242-b08",
+      "mode": "Throughput",
+      "date": "2020-03-31T20:56:25.625"
+    },
+    "statistics": {
+      "mean": 6760046.190670421,
+      "variance": 9.75658503627617E7,
+      "standardDeviation": 9877.542728976763,
+      "max": 6769841.418495995,
+      "min": 6737158.221512942,
+      "n": 10,
+      "sum": 6.760046190670422E7
+    }
+  }, {
+    "id": "enhanced.dynamodb.EnhancedClientDeleteV1MapperComparisonBenchmark.v1Delete-Throughput-testItem-HUGE_FLAT",
+    "params": {
+      "sdkVersion": "2.11.5-SNAPSHOT",
+      "jdkVersion": "1.8.0_242",
+      "jvmName": "OpenJDK 64-Bit Server VM",
+      "jvmVersion": "25.242-b08",
+      "mode": "Throughput",
+      "date": "2020-03-31T20:56:25.625"
+    },
+    "statistics": {
+      "mean": 7063555.657198062,
+      "variance": 6.158453354962092E9,
+      "standardDeviation": 78475.81382159788,
+      "max": 7153269.815249109,
+      "min": 6982305.90267853,
+      "n": 10,
+      "sum": 7.063555657198063E7
+    }
+  }, {
+    "id": "enhanced.dynamodb.EnhancedClientDeleteV1MapperComparisonBenchmark.v2Delete-Throughput-testItem-TINY",
+    "params": {
+      "sdkVersion": "2.11.5-SNAPSHOT",
+      "jdkVersion": "1.8.0_242",
+      "jvmName": "OpenJDK 64-Bit Server VM",
+      "jvmVersion": "25.242-b08",
+      "mode": "Throughput",
+      "date": "2020-03-31T20:56:25.625"
+    },
+    "statistics": {
+      "mean": 5218929.153482059,
+      "variance": 3.1478391403761997E9,
+      "standardDeviation": 56105.6070315276,
+      "max": 5273880.789650345,
+      "min": 5160076.774620201,
+      "n": 10,
+      "sum": 5.2189291534820594E7
+    }
+  }, {
+    "id": "enhanced.dynamodb.EnhancedClientDeleteV1MapperComparisonBenchmark.v2Delete-Throughput-testItem-SMALL",
+    "params": {
+      "sdkVersion": "2.11.5-SNAPSHOT",
+      "jdkVersion": "1.8.0_242",
+      "jvmName": "OpenJDK 64-Bit Server VM",
+      "jvmVersion": "25.242-b08",
+      "mode": "Throughput",
+      "date": "2020-03-31T20:56:25.626"
+    },
+    "statistics": {
+      "mean": 5269447.416256654,
+      "variance": 2.1756235980490078E10,
+      "standardDeviation": 147499.9524762299,
+      "max": 5418528.555564518,
+      "min": 5118992.6530110575,
+      "n": 10,
+      "sum": 5.269447416256654E7
+    }
+  }, {
+    "id": "enhanced.dynamodb.EnhancedClientDeleteV1MapperComparisonBenchmark.v2Delete-Throughput-testItem-HUGE",
+    "params": {
+      "sdkVersion": "2.11.5-SNAPSHOT",
+      "jdkVersion": "1.8.0_242",
+      "jvmName": "OpenJDK 64-Bit Server VM",
+      "jvmVersion": "25.242-b08",
+      "mode": "Throughput",
+      "date": "2020-03-31T20:56:25.626"
+    },
+    "statistics": {
+      "mean": 5233493.1041884385,
+      "variance": 2.4967218721697645E9,
+      "standardDeviation": 49967.20796852436,
+      "max": 5285980.226391762,
+      "min": 5183225.859548674,
+      "n": 10,
+      "sum": 5.2334931041884385E7
+    }
+  }, {
+    "id": "enhanced.dynamodb.EnhancedClientDeleteV1MapperComparisonBenchmark.v2Delete-Throughput-testItem-HUGE_FLAT",
+    "params": {
+      "sdkVersion": "2.11.5-SNAPSHOT",
+      "jdkVersion": "1.8.0_242",
+      "jvmName": "OpenJDK 64-Bit Server VM",
+      "jvmVersion": "25.242-b08",
+      "mode": "Throughput",
+      "date": "2020-03-31T20:56:25.626"
+    },
+    "statistics": {
+      "mean": 5333879.183913028,
+      "variance": 3.8387871248915306E10,
+      "standardDeviation": 195928.2298417339,
+      "max": 5527130.395795353,
+      "min": 5146070.989876449,
+      "n": 10,
+      "sum": 5.333879183913028E7
+    }
+  }, {
+    "id": "enhanced.dynamodb.EnhancedClientGetV1MapperComparisonBenchmark.v1Get-Throughput-testItem-TINY",
+    "params": {
+      "sdkVersion": "2.11.5-SNAPSHOT",
+      "jdkVersion": "1.8.0_242",
+      "jvmName": "OpenJDK 64-Bit Server VM",
+      "jvmVersion": "25.242-b08",
+      "mode": "Throughput",
+      "date": "2020-03-31T20:56:25.632"
+    },
+    "statistics": {
+      "mean": 4254457.087292329,
+      "variance": 4.95382992951288E8,
+      "standardDeviation": 22257.200923550292,
+      "max": 4275041.386231237,
+      "min": 4212061.286162632,
+      "n": 10,
+      "sum": 4.254457087292329E7
+    }
+  }, {
+    "id": "enhanced.dynamodb.EnhancedClientGetV1MapperComparisonBenchmark.v1Get-Throughput-testItem-SMALL",
+    "params": {
+      "sdkVersion": "2.11.5-SNAPSHOT",
+      "jdkVersion": "1.8.0_242",
+      "jvmName": "OpenJDK 64-Bit Server VM",
+      "jvmVersion": "25.242-b08",
+      "mode": "Throughput",
+      "date": "2020-03-31T20:56:25.632"
+    },
+    "statistics": {
+      "mean": 2541003.3761009574,
+      "variance": 4.786259780180736E9,
+      "standardDeviation": 69182.7997422823,
+      "max": 2611159.8604039275,
+      "min": 2472696.999220222,
+      "n": 10,
+      "sum": 2.5410033761009574E7
+    }
+  }, {
+    "id": "enhanced.dynamodb.EnhancedClientGetV1MapperComparisonBenchmark.v1Get-Throughput-testItem-HUGE",
+    "params": {
+      "sdkVersion": "2.11.5-SNAPSHOT",
+      "jdkVersion": "1.8.0_242",
+      "jvmName": "OpenJDK 64-Bit Server VM",
+      "jvmVersion": "25.242-b08",
+      "mode": "Throughput",
+      "date": "2020-03-31T20:56:25.632"
+    },
+    "statistics": {
+      "mean": 276072.8892665714,
+      "variance": 4934364.084565594,
+      "standardDeviation": 2221.3428561493142,
+      "max": 278598.68048084766,
+      "min": 273875.57772019814,
+      "n": 10,
+      "sum": 2760728.8926657136
+    }
+  }, {
+    "id": "enhanced.dynamodb.EnhancedClientGetV1MapperComparisonBenchmark.v1Get-Throughput-testItem-HUGE_FLAT",
+    "params": {
+      "sdkVersion": "2.11.5-SNAPSHOT",
+      "jdkVersion": "1.8.0_242",
+      "jvmName": "OpenJDK 64-Bit Server VM",
+      "jvmVersion": "25.242-b08",
+      "mode": "Throughput",
+      "date": "2020-03-31T20:56:25.632"
+    },
+    "statistics": {
+      "mean": 334086.66986329446,
+      "variance": 472003.25447557855,
+      "standardDeviation": 687.024930024798,
+      "max": 334829.371548133,
+      "min": 333094.44110854296,
+      "n": 10,
+      "sum": 3340866.6986329444
+    }
+  }, {
+    "id": "enhanced.dynamodb.EnhancedClientGetV1MapperComparisonBenchmark.v2Get-Throughput-testItem-TINY",
+    "params": {
+      "sdkVersion": "2.11.5-SNAPSHOT",
+      "jdkVersion": "1.8.0_242",
+      "jvmName": "OpenJDK 64-Bit Server VM",
+      "jvmVersion": "25.242-b08",
+      "mode": "Throughput",
+      "date": "2020-03-31T20:56:25.632"
+    },
+    "statistics": {
+      "mean": 3668470.1459464533,
+      "variance": 1.8762186153251028E9,
+      "standardDeviation": 43315.33926134139,
+      "max": 3720709.233930492,
+      "min": 3625326.4459771872,
+      "n": 10,
+      "sum": 3.6684701459464535E7
+    }
+  }, {
+    "id": "enhanced.dynamodb.EnhancedClientGetV1MapperComparisonBenchmark.v2Get-Throughput-testItem-SMALL",
+    "params": {
+      "sdkVersion": "2.11.5-SNAPSHOT",
+      "jdkVersion": "1.8.0_242",
+      "jvmName": "OpenJDK 64-Bit Server VM",
+      "jvmVersion": "25.242-b08",
+      "mode": "Throughput",
+      "date": "2020-03-31T20:56:25.633"
+    },
+    "statistics": {
+      "mean": 1705518.9560612484,
+      "variance": 1.4169945463025673E10,
+      "standardDeviation": 119037.58004523476,
+      "max": 1820514.4691287102,
+      "min": 1585840.1952959616,
+      "n": 10,
+      "sum": 1.7055189560612485E7
+    }
+  }, {
+    "id": "enhanced.dynamodb.EnhancedClientGetV1MapperComparisonBenchmark.v2Get-Throughput-testItem-HUGE",
+    "params": {
+      "sdkVersion": "2.11.5-SNAPSHOT",
+      "jdkVersion": "1.8.0_242",
+      "jvmName": "OpenJDK 64-Bit Server VM",
+      "jvmVersion": "25.242-b08",
+      "mode": "Throughput",
+      "date": "2020-03-31T20:56:25.633"
+    },
+    "statistics": {
+      "mean": 136996.69293126452,
+      "variance": 799817.5891452621,
+      "standardDeviation": 894.3252144188165,
+      "max": 138025.7200620876,
+      "min": 136055.1512978183,
+      "n": 10,
+      "sum": 1369966.9293126452
+    }
+  }, {
+    "id": "enhanced.dynamodb.EnhancedClientGetV1MapperComparisonBenchmark.v2Get-Throughput-testItem-HUGE_FLAT",
+    "params": {
+      "sdkVersion": "2.11.5-SNAPSHOT",
+      "jdkVersion": "1.8.0_242",
+      "jvmName": "OpenJDK 64-Bit Server VM",
+      "jvmVersion": "25.242-b08",
+      "mode": "Throughput",
+      "date": "2020-03-31T20:56:25.633"
+    },
+    "statistics": {
+      "mean": 283351.0162156861,
+      "variance": 1.0298588244596072E7,
+      "standardDeviation": 3209.1413562814696,
+      "max": 286589.6531841922,
+      "min": 280136.4515638473,
+      "n": 10,
+      "sum": 2833510.1621568613
+    }
+  }, {
+    "id": "enhanced.dynamodb.EnhancedClientPutV1MapperComparisonBenchmark.v1Put-Throughput-testItem-TINY",
+    "params": {
+      "sdkVersion": "2.11.5-SNAPSHOT",
+      "jdkVersion": "1.8.0_242",
+      "jvmName": "OpenJDK 64-Bit Server VM",
+      "jvmVersion": "25.242-b08",
+      "mode": "Throughput",
+      "date": "2020-03-31T20:56:25.636"
+    },
+    "statistics": {
+      "mean": 3989391.9219655544,
+      "variance": 3.417569254965252E8,
+      "standardDeviation": 18486.668858843263,
+      "max": 4010282.791681061,
+      "min": 3965936.2642360986,
+      "n": 10,
+      "sum": 3.989391921965554E7
+    }
+  }, {
+    "id": "enhanced.dynamodb.EnhancedClientPutV1MapperComparisonBenchmark.v1Put-Throughput-testItem-SMALL",
+    "params": {
+      "sdkVersion": "2.11.5-SNAPSHOT",
+      "jdkVersion": "1.8.0_242",
+      "jvmName": "OpenJDK 64-Bit Server VM",
+      "jvmVersion": "25.242-b08",
+      "mode": "Throughput",
+      "date": "2020-03-31T20:56:25.637"
+    },
+    "statistics": {
+      "mean": 2171253.7675951715,
+      "variance": 3.6857165241080485E7,
+      "standardDeviation": 6071.0102323320525,
+      "max": 2178298.2850115495,
+      "min": 2163119.833040153,
+      "n": 10,
+      "sum": 2.1712537675951716E7
+    }
+  }, {
+    "id": "enhanced.dynamodb.EnhancedClientPutV1MapperComparisonBenchmark.v1Put-Throughput-testItem-HUGE",
+    "params": {
+      "sdkVersion": "2.11.5-SNAPSHOT",
+      "jdkVersion": "1.8.0_242",
+      "jvmName": "OpenJDK 64-Bit Server VM",
+      "jvmVersion": "25.242-b08",
+      "mode": "Throughput",
+      "date": "2020-03-31T20:56:25.637"
+    },
+    "statistics": {
+      "mean": 244529.021162057,
+      "variance": 2376417.2502670567,
+      "standardDeviation": 1541.5632488701385,
+      "max": 246111.53410013518,
+      "min": 242947.81433874564,
+      "n": 10,
+      "sum": 2445290.21162057
+    }
+  }, {
+    "id": "enhanced.dynamodb.EnhancedClientPutV1MapperComparisonBenchmark.v1Put-Throughput-testItem-HUGE_FLAT",
+    "params": {
+      "sdkVersion": "2.11.5-SNAPSHOT",
+      "jdkVersion": "1.8.0_242",
+      "jvmName": "OpenJDK 64-Bit Server VM",
+      "jvmVersion": "25.242-b08",
+      "mode": "Throughput",
+      "date": "2020-03-31T20:56:25.637"
+    },
+    "statistics": {
+      "mean": 176271.52763779167,
+      "variance": 5.385414480327478E7,
+      "standardDeviation": 7338.5383288005505,
+      "max": 183889.15456415596,
+      "min": 169198.1849380892,
+      "n": 10,
+      "sum": 1762715.2763779168
+    }
+  }, {
+    "id": "enhanced.dynamodb.EnhancedClientPutV1MapperComparisonBenchmark.v2Put-Throughput-testItem-TINY",
+    "params": {
+      "sdkVersion": "2.11.5-SNAPSHOT",
+      "jdkVersion": "1.8.0_242",
+      "jvmName": "OpenJDK 64-Bit Server VM",
+      "jvmVersion": "25.242-b08",
+      "mode": "Throughput",
+      "date": "2020-03-31T20:56:25.637"
+    },
+    "statistics": {
+      "mean": 3980473.869357331,
+      "variance": 1.240006254392538E10,
+      "standardDeviation": 111355.56808676152,
+      "max": 4093377.541940185,
+      "min": 3863525.2091401936,
+      "n": 10,
+      "sum": 3.980473869357331E7
+    }
+  }, {
+    "id": "enhanced.dynamodb.EnhancedClientPutV1MapperComparisonBenchmark.v2Put-Throughput-testItem-SMALL",
+    "params": {
+      "sdkVersion": "2.11.5-SNAPSHOT",
+      "jdkVersion": "1.8.0_242",
+      "jvmName": "OpenJDK 64-Bit Server VM",
+      "jvmVersion": "25.242-b08",
+      "mode": "Throughput",
+      "date": "2020-03-31T20:56:25.638"
+    },
+    "statistics": {
+      "mean": 1537572.9568381808,
+      "variance": 2.4221168643443692E8,
+      "standardDeviation": 15563.151558551273,
+      "max": 1553592.9100167484,
+      "min": 1520555.0802638964,
+      "n": 10,
+      "sum": 1.5375729568381809E7
+    }
+  }, {
+    "id": "enhanced.dynamodb.EnhancedClientPutV1MapperComparisonBenchmark.v2Put-Throughput-testItem-HUGE",
+    "params": {
+      "sdkVersion": "2.11.5-SNAPSHOT",
+      "jdkVersion": "1.8.0_242",
+      "jvmName": "OpenJDK 64-Bit Server VM",
+      "jvmVersion": "25.242-b08",
+      "mode": "Throughput",
+      "date": "2020-03-31T20:56:25.638"
+    },
+    "statistics": {
+      "mean": 122705.30057333391,
+      "variance": 9716028.256289382,
+      "standardDeviation": 3117.0544198472667,
+      "max": 125727.08296444424,
+      "min": 119636.09183915379,
+      "n": 10,
+      "sum": 1227053.005733339
+    }
+  }, {
+    "id": "enhanced.dynamodb.EnhancedClientPutV1MapperComparisonBenchmark.v2Put-Throughput-testItem-HUGE_FLAT",
+    "params": {
+      "sdkVersion": "2.11.5-SNAPSHOT",
+      "jdkVersion": "1.8.0_242",
+      "jvmName": "OpenJDK 64-Bit Server VM",
+      "jvmVersion": "25.242-b08",
+      "mode": "Throughput",
+      "date": "2020-03-31T20:56:25.638"
+    },
+    "statistics": {
+      "mean": 149741.39277360524,
+      "variance": 2.650470812611804E8,
+      "standardDeviation": 16280.266621317367,
+      "max": 165654.0707152279,
+      "min": 134059.54954768566,
+      "n": 10,
+      "sum": 1497413.9277360525
+    }
+  }, {
+    "id": "enhanced.dynamodb.EnhancedClientQueryV1MapperComparisonBenchmark.v1Query-Throughput-testItem-TINY",
+    "params": {
+      "sdkVersion": "2.11.5-SNAPSHOT",
+      "jdkVersion": "1.8.0_242",
+      "jvmName": "OpenJDK 64-Bit Server VM",
+      "jvmVersion": "25.242-b08",
+      "mode": "Throughput",
+      "date": "2020-03-31T20:56:25.638"
+    },
+    "statistics": {
+      "mean": 1252512.7584237454,
+      "variance": 3.138983828405156E9,
+      "standardDeviation": 56026.63499091442,
+      "max": 1307114.8285281677,
+      "min": 1197753.879018399,
+      "n": 10,
+      "sum": 1.2525127584237454E7
+    }
+  }, {
+    "id": "enhanced.dynamodb.EnhancedClientQueryV1MapperComparisonBenchmark.v1Query-Throughput-testItem-SMALL",
+    "params": {
+      "sdkVersion": "2.11.5-SNAPSHOT",
+      "jdkVersion": "1.8.0_242",
+      "jvmName": "OpenJDK 64-Bit Server VM",
+      "jvmVersion": "25.242-b08",
+      "mode": "Throughput",
+      "date": "2020-03-31T20:56:25.638"
+    },
+    "statistics": {
+      "mean": 696709.8287589755,
+      "variance": 1020982.5317724581,
+      "standardDeviation": 1010.4368024633991,
+      "max": 697947.9778716824,
+      "min": 694879.5744542086,
+      "n": 10,
+      "sum": 6967098.287589755
+    }
+  }, {
+    "id": "enhanced.dynamodb.EnhancedClientQueryV1MapperComparisonBenchmark.v1Query-Throughput-testItem-HUGE",
+    "params": {
+      "sdkVersion": "2.11.5-SNAPSHOT",
+      "jdkVersion": "1.8.0_242",
+      "jvmName": "OpenJDK 64-Bit Server VM",
+      "jvmVersion": "25.242-b08",
+      "mode": "Throughput",
+      "date": "2020-03-31T20:56:25.638"
+    },
+    "statistics": {
+      "mean": 87840.49274328267,
+      "variance": 910501.0389601943,
+      "standardDeviation": 954.20178105063,
+      "max": 88811.92214743672,
+      "min": 86825.8942896014,
+      "n": 10,
+      "sum": 878404.9274328267
+    }
+  }, {
+    "id": "enhanced.dynamodb.EnhancedClientQueryV1MapperComparisonBenchmark.v1Query-Throughput-testItem-HUGE_FLAT",
+    "params": {
+      "sdkVersion": "2.11.5-SNAPSHOT",
+      "jdkVersion": "1.8.0_242",
+      "jvmName": "OpenJDK 64-Bit Server VM",
+      "jvmVersion": "25.242-b08",
+      "mode": "Throughput",
+      "date": "2020-03-31T20:56:25.639"
+    },
+    "statistics": {
+      "mean": 98567.58634308925,
+      "variance": 512461.66059423453,
+      "standardDeviation": 715.8642752604956,
+      "max": 99409.22741703335,
+      "min": 97780.25847544703,
+      "n": 10,
+      "sum": 985675.8634308925
+    }
+  }, {
+    "id": "enhanced.dynamodb.EnhancedClientQueryV1MapperComparisonBenchmark.v2Query-Throughput-testItem-TINY",
+    "params": {
+      "sdkVersion": "2.11.5-SNAPSHOT",
+      "jdkVersion": "1.8.0_242",
+      "jvmName": "OpenJDK 64-Bit Server VM",
+      "jvmVersion": "25.242-b08",
+      "mode": "Throughput",
+      "date": "2020-03-31T20:56:25.639"
+    },
+    "statistics": {
+      "mean": 559019.8433378737,
+      "variance": 2.2290777068769585E7,
+      "standardDeviation": 4721.3109481127785,
+      "max": 564241.3270141733,
+      "min": 554165.3844559088,
+      "n": 10,
+      "sum": 5590198.433378737
+    }
+  }, {
+    "id": "enhanced.dynamodb.EnhancedClientQueryV1MapperComparisonBenchmark.v2Query-Throughput-testItem-SMALL",
+    "params": {
+      "sdkVersion": "2.11.5-SNAPSHOT",
+      "jdkVersion": "1.8.0_242",
+      "jvmName": "OpenJDK 64-Bit Server VM",
+      "jvmVersion": "25.242-b08",
+      "mode": "Throughput",
+      "date": "2020-03-31T20:56:25.639"
+    },
+    "statistics": {
+      "mean": 333270.58140860766,
+      "variance": 2.1224538043119207E7,
+      "standardDeviation": 4607.009663883852,
+      "max": 338138.9613235646,
+      "min": 328731.43888478086,
+      "n": 10,
+      "sum": 3332705.8140860763
+    }
+  }, {
+    "id": "enhanced.dynamodb.EnhancedClientQueryV1MapperComparisonBenchmark.v2Query-Throughput-testItem-HUGE",
+    "params": {
+      "sdkVersion": "2.11.5-SNAPSHOT",
+      "jdkVersion": "1.8.0_242",
+      "jvmName": "OpenJDK 64-Bit Server VM",
+      "jvmVersion": "25.242-b08",
+      "mode": "Throughput",
+      "date": "2020-03-31T20:56:25.639"
+    },
+    "statistics": {
+      "mean": 37840.02739826469,
+      "variance": 1.078376036635714E7,
+      "standardDeviation": 3283.863633946626,
+      "max": 40994.11267324832,
+      "min": 34707.83375925676,
+      "n": 10,
+      "sum": 378400.2739826469
+    }
+  }, {
+    "id": "enhanced.dynamodb.EnhancedClientQueryV1MapperComparisonBenchmark.v2Query-Throughput-testItem-HUGE_FLAT",
+    "params": {
+      "sdkVersion": "2.11.5-SNAPSHOT",
+      "jdkVersion": "1.8.0_242",
+      "jvmName": "OpenJDK 64-Bit Server VM",
+      "jvmVersion": "25.242-b08",
+      "mode": "Throughput",
+      "date": "2020-03-31T20:56:25.639"
+    },
+    "statistics": {
+      "mean": 87298.81206391682,
+      "variance": 7797412.220043027,
+      "standardDeviation": 2792.3846833921407,
+      "max": 90058.97987038516,
+      "min": 84505.01102617542,
+      "n": 10,
+      "sum": 872988.1206391682
+    }
+  }, {
+    "id": "enhanced.dynamodb.EnhancedClientScanV1MapperComparisonBenchmark.v1Scan-Throughput-testItem-TINY",
+    "params": {
+      "sdkVersion": "2.11.5-SNAPSHOT",
+      "jdkVersion": "1.8.0_242",
+      "jvmName": "OpenJDK 64-Bit Server VM",
+      "jvmVersion": "25.242-b08",
+      "mode": "Throughput",
+      "date": "2020-03-31T20:56:25.639"
+    },
+    "statistics": {
+      "mean": 1816952.3977204207,
+      "variance": 9.556202520739132E9,
+      "standardDeviation": 97755.83113420464,
+      "max": 1911328.3244720402,
+      "min": 1719772.0220435418,
+      "n": 10,
+      "sum": 1.8169523977204207E7
+    }
+  }, {
+    "id": "enhanced.dynamodb.EnhancedClientScanV1MapperComparisonBenchmark.v1Scan-Throughput-testItem-SMALL",
+    "params": {
+      "sdkVersion": "2.11.5-SNAPSHOT",
+      "jdkVersion": "1.8.0_242",
+      "jvmName": "OpenJDK 64-Bit Server VM",
+      "jvmVersion": "25.242-b08",
+      "mode": "Throughput",
+      "date": "2020-03-31T20:56:25.64"
+    },
+    "statistics": {
+      "mean": 967205.4743976349,
+      "variance": 1.3978351648120623E7,
+      "standardDeviation": 3738.7633848801697,
+      "max": 972027.7812119337,
+      "min": 962347.443999356,
+      "n": 10,
+      "sum": 9672054.743976349
+    }
+  }, {
+    "id": "enhanced.dynamodb.EnhancedClientScanV1MapperComparisonBenchmark.v1Scan-Throughput-testItem-HUGE",
+    "params": {
+      "sdkVersion": "2.11.5-SNAPSHOT",
+      "jdkVersion": "1.8.0_242",
+      "jvmName": "OpenJDK 64-Bit Server VM",
+      "jvmVersion": "25.242-b08",
+      "mode": "Throughput",
+      "date": "2020-03-31T20:56:25.64"
+    },
+    "statistics": {
+      "mean": 91879.33897708468,
+      "variance": 24930.40149699446,
+      "standardDeviation": 157.89363982439082,
+      "max": 92166.21433729483,
+      "min": 91599.279501587,
+      "n": 10,
+      "sum": 918793.3897708468
+    }
+  }, {
+    "id": "enhanced.dynamodb.EnhancedClientScanV1MapperComparisonBenchmark.v1Scan-Throughput-testItem-HUGE_FLAT",
+    "params": {
+      "sdkVersion": "2.11.5-SNAPSHOT",
+      "jdkVersion": "1.8.0_242",
+      "jvmName": "OpenJDK 64-Bit Server VM",
+      "jvmVersion": "25.242-b08",
+      "mode": "Throughput",
+      "date": "2020-03-31T20:56:25.64"
+    },
+    "statistics": {
+      "mean": 116637.4994496019,
+      "variance": 158699.03677887947,
+      "standardDeviation": 398.37047679123947,
+      "max": 117246.77112486717,
+      "min": 116185.84450622648,
+      "n": 10,
+      "sum": 1166374.994496019
+    }
+  }, {
+    "id": "enhanced.dynamodb.EnhancedClientScanV1MapperComparisonBenchmark.v2Scan-Throughput-testItem-TINY",
+    "params": {
+      "sdkVersion": "2.11.5-SNAPSHOT",
+      "jdkVersion": "1.8.0_242",
+      "jvmName": "OpenJDK 64-Bit Server VM",
+      "jvmVersion": "25.242-b08",
+      "mode": "Throughput",
+      "date": "2020-03-31T20:56:25.64"
+    },
+    "statistics": {
+      "mean": 2410421.1020664377,
+      "variance": 2.804147820060836E8,
+      "standardDeviation": 16745.58992708479,
+      "max": 2432181.1127997516,
+      "min": 2390376.4629096705,
+      "n": 10,
+      "sum": 2.410421102066438E7
+    }
+  }, {
+    "id": "enhanced.dynamodb.EnhancedClientScanV1MapperComparisonBenchmark.v2Scan-Throughput-testItem-SMALL",
+    "params": {
+      "sdkVersion": "2.11.5-SNAPSHOT",
+      "jdkVersion": "1.8.0_242",
+      "jvmName": "OpenJDK 64-Bit Server VM",
+      "jvmVersion": "25.242-b08",
+      "mode": "Throughput",
+      "date": "2020-03-31T20:56:25.64"
+    },
+    "statistics": {
+      "mean": 750074.5784853816,
+      "variance": 8.396679536063066E7,
+      "standardDeviation": 9163.339749274315,
+      "max": 759160.8566629316,
+      "min": 740079.8184763982,
+      "n": 10,
+      "sum": 7500745.784853815
+    }
+  }, {
+    "id": "enhanced.dynamodb.EnhancedClientScanV1MapperComparisonBenchmark.v2Scan-Throughput-testItem-HUGE",
+    "params": {
+      "sdkVersion": "2.11.5-SNAPSHOT",
+      "jdkVersion": "1.8.0_242",
+      "jvmName": "OpenJDK 64-Bit Server VM",
+      "jvmVersion": "25.242-b08",
+      "mode": "Throughput",
+      "date": "2020-03-31T20:56:25.64"
+    },
+    "statistics": {
+      "mean": 42561.66188409884,
+      "variance": 1.5191447556632824E7,
+      "standardDeviation": 3897.620755875669,
+      "max": 46321.96537040448,
+      "min": 38791.36393438352,
+      "n": 10,
+      "sum": 425616.6188409884
+    }
+  }, {
+    "id": "enhanced.dynamodb.EnhancedClientScanV1MapperComparisonBenchmark.v2Scan-Throughput-testItem-HUGE_FLAT",
+    "params": {
+      "sdkVersion": "2.11.5-SNAPSHOT",
+      "jdkVersion": "1.8.0_242",
+      "jvmName": "OpenJDK 64-Bit Server VM",
+      "jvmVersion": "25.242-b08",
+      "mode": "Throughput",
+      "date": "2020-03-31T20:56:25.641"
+    },
+    "statistics": {
+      "mean": 96898.57710736312,
+      "variance": 553760.3709290832,
+      "standardDeviation": 744.1507716377664,
+      "max": 97657.81360405144,
+      "min": 96100.91050397762,
+      "n": 10,
+      "sum": 968985.7710736311
+    }
+  }, {
+    "id": "enhanced.dynamodb.EnhancedClientUpdateV1MapperComparisonBenchmark.v1Update-Throughput-testItem-TINY",
+    "params": {
+      "sdkVersion": "2.11.5-SNAPSHOT",
+      "jdkVersion": "1.8.0_242",
+      "jvmName": "OpenJDK 64-Bit Server VM",
+      "jvmVersion": "25.242-b08",
+      "mode": "Throughput",
+      "date": "2020-03-31T20:56:25.641"
+    },
+    "statistics": {
+      "mean": 2661602.8279100014,
+      "variance": 1.2703172099024662E10,
+      "standardDeviation": 112708.34973073052,
+      "max": 2774023.757066647,
+      "min": 2548193.0483390293,
+      "n": 10,
+      "sum": 2.6616028279100016E7
+    }
+  }, {
+    "id": "enhanced.dynamodb.EnhancedClientUpdateV1MapperComparisonBenchmark.v1Update-Throughput-testItem-SMALL",
+    "params": {
+      "sdkVersion": "2.11.5-SNAPSHOT",
+      "jdkVersion": "1.8.0_242",
+      "jvmName": "OpenJDK 64-Bit Server VM",
+      "jvmVersion": "25.242-b08",
+      "mode": "Throughput",
+      "date": "2020-03-31T20:56:25.641"
+    },
+    "statistics": {
+      "mean": 1507250.535625762,
+      "variance": 5.655196829680228E8,
+      "standardDeviation": 23780.65774885175,
+      "max": 1532785.2783910045,
+      "min": 1483174.272510075,
+      "n": 10,
+      "sum": 1.5072505356257621E7
+    }
+  }, {
+    "id": "enhanced.dynamodb.EnhancedClientUpdateV1MapperComparisonBenchmark.v1Update-Throughput-testItem-HUGE",
+    "params": {
+      "sdkVersion": "2.11.5-SNAPSHOT",
+      "jdkVersion": "1.8.0_242",
+      "jvmName": "OpenJDK 64-Bit Server VM",
+      "jvmVersion": "25.242-b08",
+      "mode": "Throughput",
+      "date": "2020-03-31T20:56:25.641"
+    },
+    "statistics": {
+      "mean": 219532.91136539596,
+      "variance": 866308.2840868158,
+      "standardDeviation": 930.756834026383,
+      "max": 220708.66325981263,
+      "min": 218469.68829126397,
+      "n": 10,
+      "sum": 2195329.1136539597
+    }
+  }, {
+    "id": "enhanced.dynamodb.EnhancedClientUpdateV1MapperComparisonBenchmark.v1Update-Throughput-testItem-HUGE_FLAT",
+    "params": {
+      "sdkVersion": "2.11.5-SNAPSHOT",
+      "jdkVersion": "1.8.0_242",
+      "jvmName": "OpenJDK 64-Bit Server VM",
+      "jvmVersion": "25.242-b08",
+      "mode": "Throughput",
+      "date": "2020-03-31T20:56:25.641"
+    },
+    "statistics": {
+      "mean": 145165.8982342992,
+      "variance": 6301083.691173323,
+      "standardDeviation": 2510.1959467685633,
+      "max": 147743.46373358855,
+      "min": 142678.49316236615,
+      "n": 10,
+      "sum": 1451658.982342992
+    }
+  }, {
+    "id": "enhanced.dynamodb.EnhancedClientUpdateV1MapperComparisonBenchmark.v2Update-Throughput-testItem-TINY",
+    "params": {
+      "sdkVersion": "2.11.5-SNAPSHOT",
+      "jdkVersion": "1.8.0_242",
+      "jvmName": "OpenJDK 64-Bit Server VM",
+      "jvmVersion": "25.242-b08",
+      "mode": "Throughput",
+      "date": "2020-03-31T20:56:25.641"
+    },
+    "statistics": {
+      "mean": 1335244.2925506658,
+      "variance": 9.767359974615078E8,
+      "standardDeviation": 31252.775836099867,
+      "max": 1365680.545124737,
+      "min": 1304606.9981228167,
+      "n": 10,
+      "sum": 1.3352442925506659E7
+    }
+  }, {
+    "id": "enhanced.dynamodb.EnhancedClientUpdateV1MapperComparisonBenchmark.v2Update-Throughput-testItem-SMALL",
+    "params": {
+      "sdkVersion": "2.11.5-SNAPSHOT",
+      "jdkVersion": "1.8.0_242",
+      "jvmName": "OpenJDK 64-Bit Server VM",
+      "jvmVersion": "25.242-b08",
+      "mode": "Throughput",
+      "date": "2020-03-31T20:56:25.642"
+    },
+    "statistics": {
+      "mean": 233466.6326390164,
+      "variance": 2551174.8672474767,
+      "standardDeviation": 1597.2397651096333,
+      "max": 235398.290118424,
+      "min": 231742.0022814813,
+      "n": 10,
+      "sum": 2334666.326390164
+    }
+  }, {
+    "id": "enhanced.dynamodb.EnhancedClientUpdateV1MapperComparisonBenchmark.v2Update-Throughput-testItem-HUGE",
+    "params": {
+      "sdkVersion": "2.11.5-SNAPSHOT",
+      "jdkVersion": "1.8.0_242",
+      "jvmName": "OpenJDK 64-Bit Server VM",
+      "jvmVersion": "25.242-b08",
+      "mode": "Throughput",
+      "date": "2020-03-31T20:56:25.642"
+    },
+    "statistics": {
+      "mean": 38060.01754411877,
+      "variance": 122853.00414046083,
+      "standardDeviation": 350.5039288516761,
+      "max": 38432.896736590395,
+      "min": 37715.230222863865,
+      "n": 10,
+      "sum": 380600.1754411877
+    }
+  }, {
+    "id": "enhanced.dynamodb.EnhancedClientUpdateV1MapperComparisonBenchmark.v2Update-Throughput-testItem-HUGE_FLAT",
+    "params": {
+      "sdkVersion": "2.11.5-SNAPSHOT",
+      "jdkVersion": "1.8.0_242",
+      "jvmName": "OpenJDK 64-Bit Server VM",
+      "jvmVersion": "25.242-b08",
+      "mode": "Throughput",
+      "date": "2020-03-31T20:56:25.642"
+    },
+    "statistics": {
+      "mean": 16831.633221796015,
+      "variance": 2523.4549523643527,
+      "standardDeviation": 50.23400195449645,
+      "max": 16909.85307725241,
+      "min": 16772.938959396386,
+      "n": 10,
+      "sum": 168316.33221796015
     }
   }
-]
\ No newline at end of file
+]
diff --git a/test/service-test-utils/pom.xml b/test/service-test-utils/pom.xml
index 945b629ee590..fbdbdc5d1a85 100644
--- a/test/service-test-utils/pom.xml
+++ b/test/service-test-utils/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>service-test-utils</artifactId>
diff --git a/test/service-test-utils/src/main/java/software/amazon/awssdk/testutils/service/AwsIntegrationTestBase.java b/test/service-test-utils/src/main/java/software/amazon/awssdk/testutils/service/AwsIntegrationTestBase.java
index 7357e9214420..01a8a1738615 100644
--- a/test/service-test-utils/src/main/java/software/amazon/awssdk/testutils/service/AwsIntegrationTestBase.java
+++ b/test/service-test-utils/src/main/java/software/amazon/awssdk/testutils/service/AwsIntegrationTestBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/service-test-utils/src/main/java/software/amazon/awssdk/testutils/service/AwsTestBase.java b/test/service-test-utils/src/main/java/software/amazon/awssdk/testutils/service/AwsTestBase.java
index 5045d67fab6d..1186728f2604 100644
--- a/test/service-test-utils/src/main/java/software/amazon/awssdk/testutils/service/AwsTestBase.java
+++ b/test/service-test-utils/src/main/java/software/amazon/awssdk/testutils/service/AwsTestBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/service-test-utils/src/main/java/software/amazon/awssdk/testutils/service/S3BucketUtils.java b/test/service-test-utils/src/main/java/software/amazon/awssdk/testutils/service/S3BucketUtils.java
index 560f8ce309f8..d3c77d914b79 100644
--- a/test/service-test-utils/src/main/java/software/amazon/awssdk/testutils/service/S3BucketUtils.java
+++ b/test/service-test-utils/src/main/java/software/amazon/awssdk/testutils/service/S3BucketUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -24,7 +24,8 @@ public final class S3BucketUtils {
     private static final Random RANDOM = new Random();
     private static final int MAX_BUCKET_NAME_LENGTH = 63;
 
-    private S3BucketUtils() { }
+    private S3BucketUtils() {
+    }
 
     /**
      * Creates a temporary bucket name using the class name of the calling class as a prefix.
diff --git a/test/service-test-utils/src/main/java/software/amazon/awssdk/testutils/service/http/MockHttpClient.java b/test/service-test-utils/src/main/java/software/amazon/awssdk/testutils/service/http/MockHttpClient.java
index 20b493c4de11..9e40c23830e1 100644
--- a/test/service-test-utils/src/main/java/software/amazon/awssdk/testutils/service/http/MockHttpClient.java
+++ b/test/service-test-utils/src/main/java/software/amazon/awssdk/testutils/service/http/MockHttpClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/stability-tests/pom.xml b/test/stability-tests/pom.xml
index 56cf4f67f331..d0fb2e2922ad 100644
--- a/test/stability-tests/pom.xml
+++ b/test/stability-tests/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>aws-sdk-java-pom</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/test/stability-tests/src/it/assembly/assembly.xml b/test/stability-tests/src/it/assembly/assembly.xml
index 27bf73ff2f41..ed17a4ca630a 100644
--- a/test/stability-tests/src/it/assembly/assembly.xml
+++ b/test/stability-tests/src/it/assembly/assembly.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
diff --git a/test/stability-tests/src/it/java/software/amazon/awssdk/stability/tests/ExceptionCounter.java b/test/stability-tests/src/it/java/software/amazon/awssdk/stability/tests/ExceptionCounter.java
index b7ff50c25739..22b643ddc2d1 100644
--- a/test/stability-tests/src/it/java/software/amazon/awssdk/stability/tests/ExceptionCounter.java
+++ b/test/stability-tests/src/it/java/software/amazon/awssdk/stability/tests/ExceptionCounter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/stability-tests/src/it/java/software/amazon/awssdk/stability/tests/TestResult.java b/test/stability-tests/src/it/java/software/amazon/awssdk/stability/tests/TestResult.java
index 676dc04b1e7f..d67104513a04 100644
--- a/test/stability-tests/src/it/java/software/amazon/awssdk/stability/tests/TestResult.java
+++ b/test/stability-tests/src/it/java/software/amazon/awssdk/stability/tests/TestResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/stability-tests/src/it/java/software/amazon/awssdk/stability/tests/TestRunner.java b/test/stability-tests/src/it/java/software/amazon/awssdk/stability/tests/TestRunner.java
index e46d717cbb0c..db93009bf3a7 100644
--- a/test/stability-tests/src/it/java/software/amazon/awssdk/stability/tests/TestRunner.java
+++ b/test/stability-tests/src/it/java/software/amazon/awssdk/stability/tests/TestRunner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/stability-tests/src/it/java/software/amazon/awssdk/stability/tests/cloudwatch/CloudWatchAsyncStabilityTest.java b/test/stability-tests/src/it/java/software/amazon/awssdk/stability/tests/cloudwatch/CloudWatchAsyncStabilityTest.java
index fa0d944efb38..826bef2e49fe 100644
--- a/test/stability-tests/src/it/java/software/amazon/awssdk/stability/tests/cloudwatch/CloudWatchAsyncStabilityTest.java
+++ b/test/stability-tests/src/it/java/software/amazon/awssdk/stability/tests/cloudwatch/CloudWatchAsyncStabilityTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/stability-tests/src/it/java/software/amazon/awssdk/stability/tests/cloudwatch/CloudWatchBaseStabilityTest.java b/test/stability-tests/src/it/java/software/amazon/awssdk/stability/tests/cloudwatch/CloudWatchBaseStabilityTest.java
index 534de1ea0d55..d2fbfe87d8eb 100644
--- a/test/stability-tests/src/it/java/software/amazon/awssdk/stability/tests/cloudwatch/CloudWatchBaseStabilityTest.java
+++ b/test/stability-tests/src/it/java/software/amazon/awssdk/stability/tests/cloudwatch/CloudWatchBaseStabilityTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/stability-tests/src/it/java/software/amazon/awssdk/stability/tests/exceptions/StabilityTestsRetryableException.java b/test/stability-tests/src/it/java/software/amazon/awssdk/stability/tests/exceptions/StabilityTestsRetryableException.java
index 1fe45c21a20d..7714259601ba 100644
--- a/test/stability-tests/src/it/java/software/amazon/awssdk/stability/tests/exceptions/StabilityTestsRetryableException.java
+++ b/test/stability-tests/src/it/java/software/amazon/awssdk/stability/tests/exceptions/StabilityTestsRetryableException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/stability-tests/src/it/java/software/amazon/awssdk/stability/tests/kinesis/KinesisStabilityTest.java b/test/stability-tests/src/it/java/software/amazon/awssdk/stability/tests/kinesis/KinesisStabilityTest.java
index 79b5b30ca895..3889ffdd095f 100644
--- a/test/stability-tests/src/it/java/software/amazon/awssdk/stability/tests/kinesis/KinesisStabilityTest.java
+++ b/test/stability-tests/src/it/java/software/amazon/awssdk/stability/tests/kinesis/KinesisStabilityTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/stability-tests/src/it/java/software/amazon/awssdk/stability/tests/s3/S3AsyncStabilityTest.java b/test/stability-tests/src/it/java/software/amazon/awssdk/stability/tests/s3/S3AsyncStabilityTest.java
index 5d6578b81a91..9b5b94398f7b 100644
--- a/test/stability-tests/src/it/java/software/amazon/awssdk/stability/tests/s3/S3AsyncStabilityTest.java
+++ b/test/stability-tests/src/it/java/software/amazon/awssdk/stability/tests/s3/S3AsyncStabilityTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/stability-tests/src/it/java/software/amazon/awssdk/stability/tests/s3/S3BaseStabilityTest.java b/test/stability-tests/src/it/java/software/amazon/awssdk/stability/tests/s3/S3BaseStabilityTest.java
index a304d1c06350..178f8394c229 100644
--- a/test/stability-tests/src/it/java/software/amazon/awssdk/stability/tests/s3/S3BaseStabilityTest.java
+++ b/test/stability-tests/src/it/java/software/amazon/awssdk/stability/tests/s3/S3BaseStabilityTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/stability-tests/src/it/java/software/amazon/awssdk/stability/tests/sqs/SqsAsyncStabilityTest.java b/test/stability-tests/src/it/java/software/amazon/awssdk/stability/tests/sqs/SqsAsyncStabilityTest.java
index cebe32fd8ad3..a2c881e86814 100644
--- a/test/stability-tests/src/it/java/software/amazon/awssdk/stability/tests/sqs/SqsAsyncStabilityTest.java
+++ b/test/stability-tests/src/it/java/software/amazon/awssdk/stability/tests/sqs/SqsAsyncStabilityTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/stability-tests/src/it/java/software/amazon/awssdk/stability/tests/sqs/SqsBaseStabilityTest.java b/test/stability-tests/src/it/java/software/amazon/awssdk/stability/tests/sqs/SqsBaseStabilityTest.java
index c4df2db6e7c6..18a52afd56e1 100644
--- a/test/stability-tests/src/it/java/software/amazon/awssdk/stability/tests/sqs/SqsBaseStabilityTest.java
+++ b/test/stability-tests/src/it/java/software/amazon/awssdk/stability/tests/sqs/SqsBaseStabilityTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/stability-tests/src/it/java/software/amazon/awssdk/stability/tests/transcribestreaming/TranscribeStreamingStabilityTest.java b/test/stability-tests/src/it/java/software/amazon/awssdk/stability/tests/transcribestreaming/TranscribeStreamingStabilityTest.java
index 4a59c99f9c83..988be1ab18c5 100644
--- a/test/stability-tests/src/it/java/software/amazon/awssdk/stability/tests/transcribestreaming/TranscribeStreamingStabilityTest.java
+++ b/test/stability-tests/src/it/java/software/amazon/awssdk/stability/tests/transcribestreaming/TranscribeStreamingStabilityTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/stability-tests/src/it/java/software/amazon/awssdk/stability/tests/utils/RetryableTest.java b/test/stability-tests/src/it/java/software/amazon/awssdk/stability/tests/utils/RetryableTest.java
index a88ae5a722bc..710a22cf94cc 100644
--- a/test/stability-tests/src/it/java/software/amazon/awssdk/stability/tests/utils/RetryableTest.java
+++ b/test/stability-tests/src/it/java/software/amazon/awssdk/stability/tests/utils/RetryableTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/stability-tests/src/it/java/software/amazon/awssdk/stability/tests/utils/RetryableTestExtension.java b/test/stability-tests/src/it/java/software/amazon/awssdk/stability/tests/utils/RetryableTestExtension.java
index de12d3be8142..7d30cfd0f7cd 100644
--- a/test/stability-tests/src/it/java/software/amazon/awssdk/stability/tests/utils/RetryableTestExtension.java
+++ b/test/stability-tests/src/it/java/software/amazon/awssdk/stability/tests/utils/RetryableTestExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/stability-tests/src/it/java/software/amazon/awssdk/stability/tests/utils/StabilityTestRunner.java b/test/stability-tests/src/it/java/software/amazon/awssdk/stability/tests/utils/StabilityTestRunner.java
index 15bf12a7f9d1..c657e069bd28 100644
--- a/test/stability-tests/src/it/java/software/amazon/awssdk/stability/tests/utils/StabilityTestRunner.java
+++ b/test/stability-tests/src/it/java/software/amazon/awssdk/stability/tests/utils/StabilityTestRunner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -22,6 +22,7 @@
 import java.lang.management.ManagementFactory;
 import java.lang.management.MemoryPoolMXBean;
 import java.lang.management.MemoryUsage;
+import java.lang.management.ThreadInfo;
 import java.lang.management.ThreadMXBean;
 import java.time.Duration;
 import java.util.Arrays;
@@ -296,7 +297,7 @@ private TestResult generateTestResult(int totalRequestNumber, String testName, E
      *
      * @param testResult the result to process.
      */
-    private static void processResult(TestResult testResult) {
+    private void processResult(TestResult testResult) {
         log.info(() -> "TestResult: " + testResult);
 
         int clientExceptionCount = testResult.clientExceptionCount();
@@ -330,7 +331,25 @@ private static void processResult(TestResult testResult) {
         if (testResult.peakThreadCount() > ALLOWED_PEAK_THREAD_COUNT) {
             String errorMessage = String.format("The number of peak thread exceeds the allowed peakThread threshold %s",
                                                 ALLOWED_PEAK_THREAD_COUNT);
+
+
+            threadDump(testResult.testName());
             throw new AssertionError(errorMessage);
         }
     }
+
+    private void threadDump(String testName) {
+        StringBuilder threadDump = new StringBuilder("\n============").append(testName)
+                                                                      .append(" Thread Dump:=============\n");
+        ThreadInfo[] threadInfoList = threadMXBean.getThreadInfo(threadMXBean.getAllThreadIds(), 100);
+        for (ThreadInfo threadInfo : threadInfoList) {
+            threadDump.append('"');
+            threadDump.append(threadInfo.getThreadName());
+            threadDump.append("\":");
+            threadDump.append(threadInfo.getThreadState());
+            threadDump.append("\n");
+        }
+        threadDump.append("==================================");
+        log.info(threadDump::toString);
+    }
 }
diff --git a/test/stability-tests/src/it/java/software/amazon/awssdk/stability/tests/utils/StabilityTestsRunnerTest.java b/test/stability-tests/src/it/java/software/amazon/awssdk/stability/tests/utils/StabilityTestsRunnerTest.java
index e38c6026f6df..22c6abb9e6f5 100644
--- a/test/stability-tests/src/it/java/software/amazon/awssdk/stability/tests/utils/StabilityTestsRunnerTest.java
+++ b/test/stability-tests/src/it/java/software/amazon/awssdk/stability/tests/utils/StabilityTestsRunnerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/stability-tests/src/it/java/software/amazon/awssdk/stability/tests/utils/TestEventStreamingResponseHandler.java b/test/stability-tests/src/it/java/software/amazon/awssdk/stability/tests/utils/TestEventStreamingResponseHandler.java
index ea814dcad5ec..545073be4948 100644
--- a/test/stability-tests/src/it/java/software/amazon/awssdk/stability/tests/utils/TestEventStreamingResponseHandler.java
+++ b/test/stability-tests/src/it/java/software/amazon/awssdk/stability/tests/utils/TestEventStreamingResponseHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/stability-tests/src/it/java/software/amazon/awssdk/stability/tests/utils/TestTranscribeStreamingSubscription.java b/test/stability-tests/src/it/java/software/amazon/awssdk/stability/tests/utils/TestTranscribeStreamingSubscription.java
index 2f8b447a2c45..ece52ae6dd95 100644
--- a/test/stability-tests/src/it/java/software/amazon/awssdk/stability/tests/utils/TestTranscribeStreamingSubscription.java
+++ b/test/stability-tests/src/it/java/software/amazon/awssdk/stability/tests/utils/TestTranscribeStreamingSubscription.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/stability-tests/src/it/resources/log4j.properties b/test/stability-tests/src/it/resources/log4j.properties
index 54d9f575c3c5..a64ac55843a0 100644
--- a/test/stability-tests/src/it/resources/log4j.properties
+++ b/test/stability-tests/src/it/resources/log4j.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/test/test-utils/build.properties b/test/test-utils/build.properties
index ecf2dae6fcb1..15ec2da1fc71 100644
--- a/test/test-utils/build.properties
+++ b/test/test-utils/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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.
diff --git a/test/test-utils/pom.xml b/test/test-utils/pom.xml
index 64abfc278171..11a1d9288399 100644
--- a/test/test-utils/pom.xml
+++ b/test/test-utils/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>test-utils</artifactId>
diff --git a/test/test-utils/src/main/java/software/amazon/awssdk/core/auth/policy/Action.java b/test/test-utils/src/main/java/software/amazon/awssdk/core/auth/policy/Action.java
index e2192eae3153..1706890dbbaa 100644
--- a/test/test-utils/src/main/java/software/amazon/awssdk/core/auth/policy/Action.java
+++ b/test/test-utils/src/main/java/software/amazon/awssdk/core/auth/policy/Action.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/test-utils/src/main/java/software/amazon/awssdk/core/auth/policy/Condition.java b/test/test-utils/src/main/java/software/amazon/awssdk/core/auth/policy/Condition.java
index 8b96b2604e36..2ff580763a1b 100644
--- a/test/test-utils/src/main/java/software/amazon/awssdk/core/auth/policy/Condition.java
+++ b/test/test-utils/src/main/java/software/amazon/awssdk/core/auth/policy/Condition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/test-utils/src/main/java/software/amazon/awssdk/core/auth/policy/Policy.java b/test/test-utils/src/main/java/software/amazon/awssdk/core/auth/policy/Policy.java
index a4edd56fc458..d40497219ee2 100644
--- a/test/test-utils/src/main/java/software/amazon/awssdk/core/auth/policy/Policy.java
+++ b/test/test-utils/src/main/java/software/amazon/awssdk/core/auth/policy/Policy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -59,7 +59,7 @@ public class Policy {
 
     private String id;
     private String version = DEFAULT_POLICY_VERSION;
-    private List<Statement> statements = new ArrayList<Statement>();
+    private List<Statement> statements = new ArrayList<>();
 
     /**
      * Constructs an empty AWS access control policy ready to be populated with
@@ -193,7 +193,7 @@ public Collection<Statement> getStatements() {
      *            The collection of statements included in this policy.
      */
     public void setStatements(Collection<Statement> statements) {
-        this.statements = new ArrayList<Statement>(statements);
+        this.statements = new ArrayList<>(statements);
         assignUniqueStatementIds();
     }
 
@@ -231,7 +231,7 @@ public String toJson() {
     }
 
     private void assignUniqueStatementIds() {
-        Set<String> usedStatementIds = new HashSet<String>();
+        Set<String> usedStatementIds = new HashSet<>();
         for (Statement statement : statements) {
             if (statement.getId() != null) {
                 usedStatementIds.add(statement.getId());
diff --git a/test/test-utils/src/main/java/software/amazon/awssdk/core/auth/policy/Principal.java b/test/test-utils/src/main/java/software/amazon/awssdk/core/auth/policy/Principal.java
index c836798ab34b..36c362de40d8 100644
--- a/test/test-utils/src/main/java/software/amazon/awssdk/core/auth/policy/Principal.java
+++ b/test/test-utils/src/main/java/software/amazon/awssdk/core/auth/policy/Principal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/test-utils/src/main/java/software/amazon/awssdk/core/auth/policy/Resource.java b/test/test-utils/src/main/java/software/amazon/awssdk/core/auth/policy/Resource.java
index 182153a643d2..3c7b408146e9 100644
--- a/test/test-utils/src/main/java/software/amazon/awssdk/core/auth/policy/Resource.java
+++ b/test/test-utils/src/main/java/software/amazon/awssdk/core/auth/policy/Resource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/test-utils/src/main/java/software/amazon/awssdk/core/auth/policy/Statement.java b/test/test-utils/src/main/java/software/amazon/awssdk/core/auth/policy/Statement.java
index b06840e67958..e74a2015a3c2 100644
--- a/test/test-utils/src/main/java/software/amazon/awssdk/core/auth/policy/Statement.java
+++ b/test/test-utils/src/main/java/software/amazon/awssdk/core/auth/policy/Statement.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -61,10 +61,10 @@ public class Statement {
 
     private String id;
     private Effect effect;
-    private List<Principal> principals = new ArrayList<Principal>();
-    private List<Action> actions = new ArrayList<Action>();
+    private List<Principal> principals = new ArrayList<>();
+    private List<Action> actions = new ArrayList<>();
     private List<Resource> resources;
-    private List<Condition> conditions = new ArrayList<Condition>();
+    private List<Condition> conditions = new ArrayList<>();
 
     /**
      * Constructs a new access control policy statement with the specified
@@ -196,7 +196,7 @@ public List<Action> getActions() {
      *            The list of actions to which this policy statement applies.
      */
     public void setActions(Collection<Action> actions) {
-        this.actions = new ArrayList<Action>(actions);
+        this.actions = new ArrayList<>(actions);
     }
 
     /**
@@ -247,7 +247,7 @@ public List<Resource> getResources() {
      *            The resources associated with this policy statement.
      */
     public void setResources(Collection<Resource> resources) {
-        this.resources = new ArrayList<Resource>(resources);
+        this.resources = new ArrayList<>(resources);
     }
 
     /**
@@ -363,7 +363,7 @@ public List<Principal> getPrincipals() {
      *            The list of principals associated with this policy statement.
      */
     public void setPrincipals(Collection<Principal> principals) {
-        this.principals = new ArrayList<Principal>(principals);
+        this.principals = new ArrayList<>(principals);
     }
 
     /**
@@ -378,7 +378,7 @@ public void setPrincipals(Collection<Principal> principals) {
      *            The list of principals associated with this policy statement.
      */
     public void setPrincipals(Principal... principals) {
-        setPrincipals(new ArrayList<Principal>(Arrays.asList(principals)));
+        setPrincipals(new ArrayList<>(Arrays.asList(principals)));
     }
 
     /**
diff --git a/test/test-utils/src/main/java/software/amazon/awssdk/core/auth/policy/conditions/ArnCondition.java b/test/test-utils/src/main/java/software/amazon/awssdk/core/auth/policy/conditions/ArnCondition.java
index db2f596eebf3..a0deca2d8cf9 100644
--- a/test/test-utils/src/main/java/software/amazon/awssdk/core/auth/policy/conditions/ArnCondition.java
+++ b/test/test-utils/src/main/java/software/amazon/awssdk/core/auth/policy/conditions/ArnCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -66,7 +66,7 @@ public class ArnCondition extends Condition {
     public ArnCondition(ArnComparisonType type, String key, String value) {
         super.type = type.toString();
         super.conditionKey = key;
-        super.values = Arrays.asList(new String[] {value});
+        super.values = Arrays.asList(value);
     }
 
     ;
diff --git a/test/test-utils/src/main/java/software/amazon/awssdk/core/auth/policy/conditions/ConditionFactory.java b/test/test-utils/src/main/java/software/amazon/awssdk/core/auth/policy/conditions/ConditionFactory.java
index 5cac8d01fd95..07ac214965e2 100644
--- a/test/test-utils/src/main/java/software/amazon/awssdk/core/auth/policy/conditions/ConditionFactory.java
+++ b/test/test-utils/src/main/java/software/amazon/awssdk/core/auth/policy/conditions/ConditionFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/test-utils/src/main/java/software/amazon/awssdk/core/auth/policy/conditions/DateCondition.java b/test/test-utils/src/main/java/software/amazon/awssdk/core/auth/policy/conditions/DateCondition.java
index dc216bd933b7..7396cbf3f4ce 100644
--- a/test/test-utils/src/main/java/software/amazon/awssdk/core/auth/policy/conditions/DateCondition.java
+++ b/test/test-utils/src/main/java/software/amazon/awssdk/core/auth/policy/conditions/DateCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/test-utils/src/main/java/software/amazon/awssdk/core/auth/policy/conditions/IpAddressCondition.java b/test/test-utils/src/main/java/software/amazon/awssdk/core/auth/policy/conditions/IpAddressCondition.java
index be7dfd04032c..e2ba561700ef 100644
--- a/test/test-utils/src/main/java/software/amazon/awssdk/core/auth/policy/conditions/IpAddressCondition.java
+++ b/test/test-utils/src/main/java/software/amazon/awssdk/core/auth/policy/conditions/IpAddressCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -71,7 +71,7 @@ public IpAddressCondition(String ipAddressRange) {
     public IpAddressCondition(IpAddressComparisonType type, String ipAddressRange) {
         super.type = type.toString();
         super.conditionKey = ConditionFactory.SOURCE_IP_CONDITION_KEY;
-        super.values = Arrays.asList(new String[] {ipAddressRange});
+        super.values = Arrays.asList(ipAddressRange);
     }
 
     /**
diff --git a/test/test-utils/src/main/java/software/amazon/awssdk/core/auth/policy/conditions/StringCondition.java b/test/test-utils/src/main/java/software/amazon/awssdk/core/auth/policy/conditions/StringCondition.java
index 5d8c3c77022c..ee4121874450 100644
--- a/test/test-utils/src/main/java/software/amazon/awssdk/core/auth/policy/conditions/StringCondition.java
+++ b/test/test-utils/src/main/java/software/amazon/awssdk/core/auth/policy/conditions/StringCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -45,7 +45,7 @@ public class StringCondition extends Condition {
     public StringCondition(StringComparisonType type, String key, String value) {
         super.type = type.toString();
         super.conditionKey = key;
-        super.values = Arrays.asList(new String[] {value});
+        super.values = Arrays.asList(value);
     }
 
     /**
diff --git a/test/test-utils/src/main/java/software/amazon/awssdk/core/auth/policy/internal/JacksonUtils.java b/test/test-utils/src/main/java/software/amazon/awssdk/core/auth/policy/internal/JacksonUtils.java
index 98568809aa28..dd8320f6bc6f 100644
--- a/test/test-utils/src/main/java/software/amazon/awssdk/core/auth/policy/internal/JacksonUtils.java
+++ b/test/test-utils/src/main/java/software/amazon/awssdk/core/auth/policy/internal/JacksonUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -34,7 +34,8 @@ public final class JacksonUtils {
         OBJECT_MAPPER.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
     }
 
-    private JacksonUtils() {}
+    private JacksonUtils() {
+    }
 
     /**
      * Returns the deserialized object from the given json string and target
diff --git a/test/test-utils/src/main/java/software/amazon/awssdk/core/auth/policy/internal/JsonDocumentField.java b/test/test-utils/src/main/java/software/amazon/awssdk/core/auth/policy/internal/JsonDocumentField.java
index 0fc1859a4f47..4da308dab047 100644
--- a/test/test-utils/src/main/java/software/amazon/awssdk/core/auth/policy/internal/JsonDocumentField.java
+++ b/test/test-utils/src/main/java/software/amazon/awssdk/core/auth/policy/internal/JsonDocumentField.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/test-utils/src/main/java/software/amazon/awssdk/core/auth/policy/internal/JsonPolicyReader.java b/test/test-utils/src/main/java/software/amazon/awssdk/core/auth/policy/internal/JsonPolicyReader.java
index 9e2ca41cfbf5..ddf8c12b81b4 100644
--- a/test/test-utils/src/main/java/software/amazon/awssdk/core/auth/policy/internal/JsonPolicyReader.java
+++ b/test/test-utils/src/main/java/software/amazon/awssdk/core/auth/policy/internal/JsonPolicyReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -303,7 +303,7 @@ private void convertConditionRecord(List<Condition> conditions,
         Iterator<JsonNode> elements;
 
         while (mapOfFields.hasNext()) {
-            values = new LinkedList<String>();
+            values = new LinkedList<>();
             field = mapOfFields.next();
             fieldValue = field.getValue();
 
diff --git a/test/test-utils/src/main/java/software/amazon/awssdk/core/auth/policy/internal/JsonPolicyWriter.java b/test/test-utils/src/main/java/software/amazon/awssdk/core/auth/policy/internal/JsonPolicyWriter.java
index c9af29f4e818..850e9c30e7a8 100644
--- a/test/test-utils/src/main/java/software/amazon/awssdk/core/auth/policy/internal/JsonPolicyWriter.java
+++ b/test/test-utils/src/main/java/software/amazon/awssdk/core/auth/policy/internal/JsonPolicyWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -179,7 +179,7 @@ private void writeConditions(List<Condition> conditions) throws IOException {
      */
     private void writeResources(List<Resource> resources) throws IOException {
 
-        List<String> resourceStrings = new ArrayList<String>();
+        List<String> resourceStrings = new ArrayList<>();
 
         for (Resource resource : resources) {
             resourceStrings.add(resource.getId());
@@ -194,7 +194,7 @@ private void writeResources(List<Resource> resources) throws IOException {
      *            the list of the actions to be written.
      */
     private void writeActions(List<Action> actions) throws IOException {
-        List<String> actionStrings = new ArrayList<String>();
+        List<String> actionStrings = new ArrayList<>();
 
         for (Action action : actions) {
             actionStrings.add(action.getActionName());
@@ -240,14 +240,14 @@ private void writePrincipals(List<Principal> principals) throws IOException {
      */
     private Map<String, List<String>> groupPrincipalByScheme(
             List<Principal> principals) {
-        Map<String, List<String>> principalsByScheme = new LinkedHashMap<String, List<String>>();
+        Map<String, List<String>> principalsByScheme = new LinkedHashMap<>();
 
         String provider;
         List<String> principalValues;
         for (Principal principal : principals) {
             provider = principal.getProvider();
             if (!principalsByScheme.containsKey(provider)) {
-                principalsByScheme.put(provider, new ArrayList<String>());
+                principalsByScheme.put(provider, new ArrayList<>());
             }
             principalValues = principalsByScheme.get(provider);
             principalValues.add(principal.getId());
@@ -266,7 +266,7 @@ private Map<String, List<String>> groupPrincipalByScheme(
      */
     private Map<String, ConditionsByKey> groupConditionsByTypeAndKey(
             List<Condition> conditions) {
-        Map<String, ConditionsByKey> conditionsByType = new LinkedHashMap<String, ConditionsByKey>();
+        Map<String, ConditionsByKey> conditionsByType = new LinkedHashMap<>();
 
         String type;
         String key;
@@ -367,7 +367,7 @@ static class ConditionsByKey {
         private Map<String, List<String>> conditionsByKey;
 
         ConditionsByKey() {
-            conditionsByKey = new LinkedHashMap<String, List<String>>();
+            conditionsByKey = new LinkedHashMap<>();
         }
 
         public Map<String, List<String>> getConditionsByKey() {
@@ -394,7 +394,7 @@ public void addValuesToKey(String key, List<String> values) {
 
             List<String> conditionValues = getConditionsByKey(key);
             if (conditionValues == null) {
-                conditionsByKey.put(key, new ArrayList<String>(values));
+                conditionsByKey.put(key, new ArrayList<>(values));
             } else {
                 conditionValues.addAll(values);
             }
diff --git a/test/test-utils/src/main/java/software/amazon/awssdk/core/waiters/AcceptorPathMatcher.java b/test/test-utils/src/main/java/software/amazon/awssdk/core/waiters/AcceptorPathMatcher.java
index 4f64e18fdbf6..5e6abf7a840b 100644
--- a/test/test-utils/src/main/java/software/amazon/awssdk/core/waiters/AcceptorPathMatcher.java
+++ b/test/test-utils/src/main/java/software/amazon/awssdk/core/waiters/AcceptorPathMatcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/test-utils/src/main/java/software/amazon/awssdk/core/waiters/CompositeAcceptor.java b/test/test-utils/src/main/java/software/amazon/awssdk/core/waiters/CompositeAcceptor.java
index 03aa48c5333e..7a06074a335b 100644
--- a/test/test-utils/src/main/java/software/amazon/awssdk/core/waiters/CompositeAcceptor.java
+++ b/test/test-utils/src/main/java/software/amazon/awssdk/core/waiters/CompositeAcceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/test-utils/src/main/java/software/amazon/awssdk/core/waiters/FixedDelayStrategy.java b/test/test-utils/src/main/java/software/amazon/awssdk/core/waiters/FixedDelayStrategy.java
index 1876c8d0aba7..5fd8cceb92a6 100644
--- a/test/test-utils/src/main/java/software/amazon/awssdk/core/waiters/FixedDelayStrategy.java
+++ b/test/test-utils/src/main/java/software/amazon/awssdk/core/waiters/FixedDelayStrategy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/test-utils/src/main/java/software/amazon/awssdk/core/waiters/MaxAttemptsRetryStrategy.java b/test/test-utils/src/main/java/software/amazon/awssdk/core/waiters/MaxAttemptsRetryStrategy.java
index f129dc12e049..02db1c7d139f 100644
--- a/test/test-utils/src/main/java/software/amazon/awssdk/core/waiters/MaxAttemptsRetryStrategy.java
+++ b/test/test-utils/src/main/java/software/amazon/awssdk/core/waiters/MaxAttemptsRetryStrategy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/test-utils/src/main/java/software/amazon/awssdk/core/waiters/PollingStrategy.java b/test/test-utils/src/main/java/software/amazon/awssdk/core/waiters/PollingStrategy.java
index 45cfa2613b98..ce2e1030b4f7 100644
--- a/test/test-utils/src/main/java/software/amazon/awssdk/core/waiters/PollingStrategy.java
+++ b/test/test-utils/src/main/java/software/amazon/awssdk/core/waiters/PollingStrategy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/test-utils/src/main/java/software/amazon/awssdk/core/waiters/PollingStrategyContext.java b/test/test-utils/src/main/java/software/amazon/awssdk/core/waiters/PollingStrategyContext.java
index 5250dfb17b8d..0a250a03a21f 100644
--- a/test/test-utils/src/main/java/software/amazon/awssdk/core/waiters/PollingStrategyContext.java
+++ b/test/test-utils/src/main/java/software/amazon/awssdk/core/waiters/PollingStrategyContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/test-utils/src/main/java/software/amazon/awssdk/core/waiters/SdkFunction.java b/test/test-utils/src/main/java/software/amazon/awssdk/core/waiters/SdkFunction.java
index c0f100cc1e3b..9b5c3136a961 100644
--- a/test/test-utils/src/main/java/software/amazon/awssdk/core/waiters/SdkFunction.java
+++ b/test/test-utils/src/main/java/software/amazon/awssdk/core/waiters/SdkFunction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/test-utils/src/main/java/software/amazon/awssdk/core/waiters/Waiter.java b/test/test-utils/src/main/java/software/amazon/awssdk/core/waiters/Waiter.java
index 4f0b97206d9d..38d83873df94 100644
--- a/test/test-utils/src/main/java/software/amazon/awssdk/core/waiters/Waiter.java
+++ b/test/test-utils/src/main/java/software/amazon/awssdk/core/waiters/Waiter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/test-utils/src/main/java/software/amazon/awssdk/core/waiters/WaiterAcceptor.java b/test/test-utils/src/main/java/software/amazon/awssdk/core/waiters/WaiterAcceptor.java
index 0ac4d8088900..9970db2529f0 100644
--- a/test/test-utils/src/main/java/software/amazon/awssdk/core/waiters/WaiterAcceptor.java
+++ b/test/test-utils/src/main/java/software/amazon/awssdk/core/waiters/WaiterAcceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/test-utils/src/main/java/software/amazon/awssdk/core/waiters/WaiterBuilder.java b/test/test-utils/src/main/java/software/amazon/awssdk/core/waiters/WaiterBuilder.java
index 832a500ec75b..abcae155a5f1 100644
--- a/test/test-utils/src/main/java/software/amazon/awssdk/core/waiters/WaiterBuilder.java
+++ b/test/test-utils/src/main/java/software/amazon/awssdk/core/waiters/WaiterBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/test-utils/src/main/java/software/amazon/awssdk/core/waiters/WaiterExecution.java b/test/test-utils/src/main/java/software/amazon/awssdk/core/waiters/WaiterExecution.java
index 1143b6d92fb3..1f2762e21313 100644
--- a/test/test-utils/src/main/java/software/amazon/awssdk/core/waiters/WaiterExecution.java
+++ b/test/test-utils/src/main/java/software/amazon/awssdk/core/waiters/WaiterExecution.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/test-utils/src/main/java/software/amazon/awssdk/core/waiters/WaiterExecutionBuilder.java b/test/test-utils/src/main/java/software/amazon/awssdk/core/waiters/WaiterExecutionBuilder.java
index 93848aec5df6..7d7ba9c6601c 100644
--- a/test/test-utils/src/main/java/software/amazon/awssdk/core/waiters/WaiterExecutionBuilder.java
+++ b/test/test-utils/src/main/java/software/amazon/awssdk/core/waiters/WaiterExecutionBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/test-utils/src/main/java/software/amazon/awssdk/core/waiters/WaiterHandler.java b/test/test-utils/src/main/java/software/amazon/awssdk/core/waiters/WaiterHandler.java
index d8390e5005ea..e98c7f6d0dc7 100644
--- a/test/test-utils/src/main/java/software/amazon/awssdk/core/waiters/WaiterHandler.java
+++ b/test/test-utils/src/main/java/software/amazon/awssdk/core/waiters/WaiterHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/test-utils/src/main/java/software/amazon/awssdk/core/waiters/WaiterImpl.java b/test/test-utils/src/main/java/software/amazon/awssdk/core/waiters/WaiterImpl.java
index 9fd10a8d1f59..98a6804cf2b6 100644
--- a/test/test-utils/src/main/java/software/amazon/awssdk/core/waiters/WaiterImpl.java
+++ b/test/test-utils/src/main/java/software/amazon/awssdk/core/waiters/WaiterImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/test-utils/src/main/java/software/amazon/awssdk/core/waiters/WaiterParameters.java b/test/test-utils/src/main/java/software/amazon/awssdk/core/waiters/WaiterParameters.java
index f41c06802ed7..c038420bdaa5 100644
--- a/test/test-utils/src/main/java/software/amazon/awssdk/core/waiters/WaiterParameters.java
+++ b/test/test-utils/src/main/java/software/amazon/awssdk/core/waiters/WaiterParameters.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -58,7 +58,7 @@ private WaiterParameters(InputT request, PollingStrategy pollingStrategy) {
      * @return WaiterParameters Object
      */
     public WaiterParameters<InputT> withRequest(InputT request) {
-        return new WaiterParameters<InputT>(request, this.pollingStrategy);
+        return new WaiterParameters<>(request, this.pollingStrategy);
     }
 
     /**
@@ -68,7 +68,7 @@ public WaiterParameters<InputT> withRequest(InputT request) {
      * @return WaiterParameters Object
      */
     public WaiterParameters<InputT> withPollingStrategy(PollingStrategy pollingStrategy) {
-        return new WaiterParameters<InputT>(this.request, pollingStrategy);
+        return new WaiterParameters<>(this.request, pollingStrategy);
     }
 
     /**
diff --git a/test/test-utils/src/main/java/software/amazon/awssdk/core/waiters/WaiterState.java b/test/test-utils/src/main/java/software/amazon/awssdk/core/waiters/WaiterState.java
index 288a89cf6ba0..c603db4772eb 100644
--- a/test/test-utils/src/main/java/software/amazon/awssdk/core/waiters/WaiterState.java
+++ b/test/test-utils/src/main/java/software/amazon/awssdk/core/waiters/WaiterState.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/test-utils/src/main/java/software/amazon/awssdk/core/waiters/WaiterTimedOutException.java b/test/test-utils/src/main/java/software/amazon/awssdk/core/waiters/WaiterTimedOutException.java
index 65317cdbe99b..b3c0a6804b61 100644
--- a/test/test-utils/src/main/java/software/amazon/awssdk/core/waiters/WaiterTimedOutException.java
+++ b/test/test-utils/src/main/java/software/amazon/awssdk/core/waiters/WaiterTimedOutException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/test-utils/src/main/java/software/amazon/awssdk/core/waiters/WaiterUnrecoverableException.java b/test/test-utils/src/main/java/software/amazon/awssdk/core/waiters/WaiterUnrecoverableException.java
index 5a1d2e585379..41d6a190b51a 100644
--- a/test/test-utils/src/main/java/software/amazon/awssdk/core/waiters/WaiterUnrecoverableException.java
+++ b/test/test-utils/src/main/java/software/amazon/awssdk/core/waiters/WaiterUnrecoverableException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/test-utils/src/main/java/software/amazon/awssdk/testutils/DateUtils.java b/test/test-utils/src/main/java/software/amazon/awssdk/testutils/DateUtils.java
index 06404ba3c846..af605478072a 100644
--- a/test/test-utils/src/main/java/software/amazon/awssdk/testutils/DateUtils.java
+++ b/test/test-utils/src/main/java/software/amazon/awssdk/testutils/DateUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/test-utils/src/main/java/software/amazon/awssdk/testutils/EnvironmentVariableHelper.java b/test/test-utils/src/main/java/software/amazon/awssdk/testutils/EnvironmentVariableHelper.java
index c90cdcc81aa9..13f67785017c 100644
--- a/test/test-utils/src/main/java/software/amazon/awssdk/testutils/EnvironmentVariableHelper.java
+++ b/test/test-utils/src/main/java/software/amazon/awssdk/testutils/EnvironmentVariableHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/test-utils/src/main/java/software/amazon/awssdk/testutils/InputStreamUtils.java b/test/test-utils/src/main/java/software/amazon/awssdk/testutils/InputStreamUtils.java
index 7e1e978fc76f..598b68f94b54 100644
--- a/test/test-utils/src/main/java/software/amazon/awssdk/testutils/InputStreamUtils.java
+++ b/test/test-utils/src/main/java/software/amazon/awssdk/testutils/InputStreamUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/test-utils/src/main/java/software/amazon/awssdk/testutils/LogCaptor.java b/test/test-utils/src/main/java/software/amazon/awssdk/testutils/LogCaptor.java
index 0e6b8d23a6dc..2f9e1357fa49 100644
--- a/test/test-utils/src/main/java/software/amazon/awssdk/testutils/LogCaptor.java
+++ b/test/test-utils/src/main/java/software/amazon/awssdk/testutils/LogCaptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/test-utils/src/main/java/software/amazon/awssdk/testutils/Memory.java b/test/test-utils/src/main/java/software/amazon/awssdk/testutils/Memory.java
index 30527842f409..a0cb638f70cf 100644
--- a/test/test-utils/src/main/java/software/amazon/awssdk/testutils/Memory.java
+++ b/test/test-utils/src/main/java/software/amazon/awssdk/testutils/Memory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -19,7 +19,6 @@
 import java.lang.management.MemoryPoolMXBean;
 import java.lang.management.MemoryType;
 import java.lang.management.MemoryUsage;
-import java.util.Iterator;
 
 /**
  * Used to retrieve information about the JVM memory.
@@ -51,21 +50,18 @@ public static String poolSummaries() {
         // How ? http://stackoverflow.com/questions/697336/how-do-i-programmatically-find-out-my-permgen-space-usage
         //       http://stackoverflow.com/questions/8356416/xxmaxpermsize-with-or-without-xxpermsize
         StringBuilder sb = new StringBuilder();
-        Iterator<MemoryPoolMXBean> iter =
-                ManagementFactory.getMemoryPoolMXBeans().iterator();
-        while (iter.hasNext()) {
-            MemoryPoolMXBean item = iter.next();
+        for (MemoryPoolMXBean item : ManagementFactory.getMemoryPoolMXBeans()) {
             String name = item.getName();
             MemoryType type = item.getType();
             MemoryUsage usage = item.getUsage();
             MemoryUsage peak = item.getPeakUsage();
             MemoryUsage collections = item.getCollectionUsage();
-            sb.append(String.format("Memory pool name: " + name
-                                    + ", type: " + type
-                                    + ", usage: " + usage
-                                    + ", peak: " + peak
-                                    + ", collections: " + collections
-                                    + "\n"));
+            sb.append("Memory pool name: " + name
+                      + ", type: " + type
+                      + ", usage: " + usage
+                      + ", peak: " + peak
+                      + ", collections: " + collections
+                      + "\n");
         }
         return sb.toString();
     }
diff --git a/test/test-utils/src/main/java/software/amazon/awssdk/testutils/RandomInputStream.java b/test/test-utils/src/main/java/software/amazon/awssdk/testutils/RandomInputStream.java
index b8f94189a793..e70aea1d5811 100644
--- a/test/test-utils/src/main/java/software/amazon/awssdk/testutils/RandomInputStream.java
+++ b/test/test-utils/src/main/java/software/amazon/awssdk/testutils/RandomInputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/test-utils/src/main/java/software/amazon/awssdk/testutils/RandomTempFile.java b/test/test-utils/src/main/java/software/amazon/awssdk/testutils/RandomTempFile.java
index f5dad5cba072..072123de6080 100644
--- a/test/test-utils/src/main/java/software/amazon/awssdk/testutils/RandomTempFile.java
+++ b/test/test-utils/src/main/java/software/amazon/awssdk/testutils/RandomTempFile.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/test-utils/src/main/java/software/amazon/awssdk/testutils/SdkAsserts.java b/test/test-utils/src/main/java/software/amazon/awssdk/testutils/SdkAsserts.java
index 1188f9668409..fb3faafd0f41 100644
--- a/test/test-utils/src/main/java/software/amazon/awssdk/testutils/SdkAsserts.java
+++ b/test/test-utils/src/main/java/software/amazon/awssdk/testutils/SdkAsserts.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/test-utils/src/main/java/software/amazon/awssdk/testutils/UnorderedCollectionComparator.java b/test/test-utils/src/main/java/software/amazon/awssdk/testutils/UnorderedCollectionComparator.java
index 771e1d1638b6..ebb50fb20e4f 100644
--- a/test/test-utils/src/main/java/software/amazon/awssdk/testutils/UnorderedCollectionComparator.java
+++ b/test/test-utils/src/main/java/software/amazon/awssdk/testutils/UnorderedCollectionComparator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -54,10 +54,8 @@ public static <A, B> boolean equalUnorderedCollections(
         }
 
         // Add all elements into sets to remove duplicates.
-        Set<A> setA = new HashSet<A>();
-        setA.addAll(colA);
-        Set<B> setB = new HashSet<B>();
-        setB.addAll(colB);
+        Set<A> setA = new HashSet<>(colA);
+        Set<B> setB = new HashSet<>(colB);
 
         if (setA.size() != setB.size()) {
             return false;
diff --git a/test/test-utils/src/main/java/software/amazon/awssdk/testutils/UnreliableRandomInputStream.java b/test/test-utils/src/main/java/software/amazon/awssdk/testutils/UnreliableRandomInputStream.java
index 58866ac7bc43..8338a3b4d56f 100644
--- a/test/test-utils/src/main/java/software/amazon/awssdk/testutils/UnreliableRandomInputStream.java
+++ b/test/test-utils/src/main/java/software/amazon/awssdk/testutils/UnreliableRandomInputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/test-utils/src/main/java/software/amazon/awssdk/testutils/Waiter.java b/test/test-utils/src/main/java/software/amazon/awssdk/testutils/Waiter.java
index be62a17b8ef7..859e9121be54 100644
--- a/test/test-utils/src/main/java/software/amazon/awssdk/testutils/Waiter.java
+++ b/test/test-utils/src/main/java/software/amazon/awssdk/testutils/Waiter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/test-utils/src/main/java/software/amazon/awssdk/testutils/hamcrest/CollectionContainsOnly.java b/test/test-utils/src/main/java/software/amazon/awssdk/testutils/hamcrest/CollectionContainsOnly.java
index 4023f871ff59..1667edc60827 100644
--- a/test/test-utils/src/main/java/software/amazon/awssdk/testutils/hamcrest/CollectionContainsOnly.java
+++ b/test/test-utils/src/main/java/software/amazon/awssdk/testutils/hamcrest/CollectionContainsOnly.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -30,7 +30,7 @@ private CollectionContainsOnly(List<Matcher<? extends T>> matchers) {
     }
 
     static <T> TypeSafeMatcher<Collection<T>> containsOnly(List<Matcher<? extends T>> matchers) {
-        return new CollectionContainsOnly<T>(matchers);
+        return new CollectionContainsOnly<>(matchers);
     }
 
     @Override
diff --git a/test/test-utils/src/main/java/software/amazon/awssdk/testutils/hamcrest/CollectionContainsOnlyInOrder.java b/test/test-utils/src/main/java/software/amazon/awssdk/testutils/hamcrest/CollectionContainsOnlyInOrder.java
index c7ece829f132..a913289f6020 100644
--- a/test/test-utils/src/main/java/software/amazon/awssdk/testutils/hamcrest/CollectionContainsOnlyInOrder.java
+++ b/test/test-utils/src/main/java/software/amazon/awssdk/testutils/hamcrest/CollectionContainsOnlyInOrder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -32,7 +32,7 @@ private CollectionContainsOnlyInOrder(List<Matcher<? extends T>> matchers) {
     }
 
     static <T> TypeSafeMatcher<Collection<T>> containsOnlyInOrder(List<Matcher<? extends T>> matchers) {
-        return new CollectionContainsOnlyInOrder<T>(matchers);
+        return new CollectionContainsOnlyInOrder<>(matchers);
     }
 
     @Override
diff --git a/test/test-utils/src/main/java/software/amazon/awssdk/testutils/hamcrest/Matchers.java b/test/test-utils/src/main/java/software/amazon/awssdk/testutils/hamcrest/Matchers.java
index 05d8c39f0492..f3cc9cf35eea 100644
--- a/test/test-utils/src/main/java/software/amazon/awssdk/testutils/hamcrest/Matchers.java
+++ b/test/test-utils/src/main/java/software/amazon/awssdk/testutils/hamcrest/Matchers.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/test-utils/src/main/java/software/amazon/awssdk/testutils/retry/AssertCallable.java b/test/test-utils/src/main/java/software/amazon/awssdk/testutils/retry/AssertCallable.java
index 84917ade112f..50ff643e900e 100644
--- a/test/test-utils/src/main/java/software/amazon/awssdk/testutils/retry/AssertCallable.java
+++ b/test/test-utils/src/main/java/software/amazon/awssdk/testutils/retry/AssertCallable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/test-utils/src/main/java/software/amazon/awssdk/testutils/retry/NonRetryableException.java b/test/test-utils/src/main/java/software/amazon/awssdk/testutils/retry/NonRetryableException.java
index 425a9d3909c6..c7def12671ec 100644
--- a/test/test-utils/src/main/java/software/amazon/awssdk/testutils/retry/NonRetryableException.java
+++ b/test/test-utils/src/main/java/software/amazon/awssdk/testutils/retry/NonRetryableException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/test-utils/src/main/java/software/amazon/awssdk/testutils/retry/RetryRule.java b/test/test-utils/src/main/java/software/amazon/awssdk/testutils/retry/RetryRule.java
index 2894f6ca2dea..733e809a3858 100644
--- a/test/test-utils/src/main/java/software/amazon/awssdk/testutils/retry/RetryRule.java
+++ b/test/test-utils/src/main/java/software/amazon/awssdk/testutils/retry/RetryRule.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/test-utils/src/main/java/software/amazon/awssdk/testutils/retry/RetryableAction.java b/test/test-utils/src/main/java/software/amazon/awssdk/testutils/retry/RetryableAction.java
index 0332ec8148f8..0ffc77fb43db 100644
--- a/test/test-utils/src/main/java/software/amazon/awssdk/testutils/retry/RetryableAction.java
+++ b/test/test-utils/src/main/java/software/amazon/awssdk/testutils/retry/RetryableAction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -44,7 +44,7 @@ private RetryableAction(Callable<T> delegate, RetryableParams params) {
     public static <T> T doRetryableAction(Callable<T> callable, RetryableParams params) throws
                                                                                         Exception {
         Validate.isTrue(params.getMaxAttempts() > 0, "maxAttempts");
-        return new RetryableAction<T>(callable, params).call();
+        return new RetryableAction<>(callable, params).call();
     }
 
     private T call() throws Exception {
diff --git a/test/test-utils/src/main/java/software/amazon/awssdk/testutils/retry/RetryableAssertion.java b/test/test-utils/src/main/java/software/amazon/awssdk/testutils/retry/RetryableAssertion.java
index 4d3a7bc9334b..5f941d414df1 100644
--- a/test/test-utils/src/main/java/software/amazon/awssdk/testutils/retry/RetryableAssertion.java
+++ b/test/test-utils/src/main/java/software/amazon/awssdk/testutils/retry/RetryableAssertion.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/test-utils/src/main/java/software/amazon/awssdk/testutils/retry/RetryableError.java b/test/test-utils/src/main/java/software/amazon/awssdk/testutils/retry/RetryableError.java
index 4168e1e79bcd..8301cec3c8c7 100644
--- a/test/test-utils/src/main/java/software/amazon/awssdk/testutils/retry/RetryableError.java
+++ b/test/test-utils/src/main/java/software/amazon/awssdk/testutils/retry/RetryableError.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/test-utils/src/main/java/software/amazon/awssdk/testutils/retry/RetryableParams.java b/test/test-utils/src/main/java/software/amazon/awssdk/testutils/retry/RetryableParams.java
index 88deaa1e6e65..344651639098 100644
--- a/test/test-utils/src/main/java/software/amazon/awssdk/testutils/retry/RetryableParams.java
+++ b/test/test-utils/src/main/java/software/amazon/awssdk/testutils/retry/RetryableParams.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/test-utils/src/main/java/software/amazon/awssdk/testutils/smoketest/ReflectionUtils.java b/test/test-utils/src/main/java/software/amazon/awssdk/testutils/smoketest/ReflectionUtils.java
index 9af4793cf2ce..6aa216f4d527 100644
--- a/test/test-utils/src/main/java/software/amazon/awssdk/testutils/smoketest/ReflectionUtils.java
+++ b/test/test-utils/src/main/java/software/amazon/awssdk/testutils/smoketest/ReflectionUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -67,12 +67,7 @@ public static <T> T newInstance(Class<T> clazz, Object... params) {
 
             return constructor.newInstance(params);
 
-        } catch (InstantiationException ex) {
-            throw new IllegalStateException(
-                    "Could not invoke " + constructor.toGenericString(),
-                    ex);
-
-        } catch (IllegalAccessException ex) {
+        } catch (InstantiationException | IllegalAccessException ex) {
             throw new IllegalStateException(
                     "Could not invoke " + constructor.toGenericString(),
                     ex);
@@ -155,7 +150,7 @@ public static Object getByPath(Object target, List<String> path) {
      * @return the list of matching values
      */
     public static List<Object> getAllByPath(Object target, List<String> path) {
-        List<Object> results = new LinkedList<Object>();
+        List<Object> results = new LinkedList<>();
 
         // TODO: Can we unroll this and do it iteratively?
         getAllByPath(target, path, 0, results);
@@ -577,7 +572,7 @@ public static <T> Object getField(T instance, Field field) {
     }
 
     public static <T> T newInstanceWithAllFieldsSet(Class<T> clz) {
-        List<RandomSupplier<?>> emptyRandomSuppliers = new ArrayList<RandomSupplier<?>>();
+        List<RandomSupplier<?>> emptyRandomSuppliers = new ArrayList<>();
         return newInstanceWithAllFieldsSet(clz, emptyRandomSuppliers);
     }
 
@@ -610,7 +605,7 @@ public static <T> T newInstanceWithAllFieldsSet(Class<T> clz, List<RandomSupplie
                 if (bool == null) {
                     setField(instance, field, RANDOM.nextBoolean());
                 } else {
-                    setField(instance, field, !Boolean.valueOf(bool.toString()));
+                    setField(instance, field, !Boolean.parseBoolean(bool.toString()));
                 }
             } else if (type.isAssignableFrom(String.class)) {
                 setField(instance, field, UUID.randomUUID().toString());
diff --git a/test/test-utils/src/test/java/software/amazon/awssdk/core/auth/policy/PolicyReaderTest.java b/test/test-utils/src/test/java/software/amazon/awssdk/core/auth/policy/PolicyReaderTest.java
index 8e28b1655870..85ff8e5882c0 100644
--- a/test/test-utils/src/test/java/software/amazon/awssdk/core/auth/policy/PolicyReaderTest.java
+++ b/test/test-utils/src/test/java/software/amazon/awssdk/core/auth/policy/PolicyReaderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/test-utils/src/test/java/software/amazon/awssdk/core/auth/policy/PolicyTest.java b/test/test-utils/src/test/java/software/amazon/awssdk/core/auth/policy/PolicyTest.java
index 16b2cb5a3f03..ebf90ab6e0f6 100644
--- a/test/test-utils/src/test/java/software/amazon/awssdk/core/auth/policy/PolicyTest.java
+++ b/test/test-utils/src/test/java/software/amazon/awssdk/core/auth/policy/PolicyTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/test-utils/src/test/java/software/amazon/awssdk/testutils/DateUtilsTest.java b/test/test-utils/src/test/java/software/amazon/awssdk/testutils/DateUtilsTest.java
index 76d43d0d1440..785e2f05292c 100644
--- a/test/test-utils/src/test/java/software/amazon/awssdk/testutils/DateUtilsTest.java
+++ b/test/test-utils/src/test/java/software/amazon/awssdk/testutils/DateUtilsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/test-utils/src/test/java/software/amazon/awssdk/testutils/EnvironmentVariableHelperTest.java b/test/test-utils/src/test/java/software/amazon/awssdk/testutils/EnvironmentVariableHelperTest.java
index 1aa7ece563cc..3dd91e0a33e0 100644
--- a/test/test-utils/src/test/java/software/amazon/awssdk/testutils/EnvironmentVariableHelperTest.java
+++ b/test/test-utils/src/test/java/software/amazon/awssdk/testutils/EnvironmentVariableHelperTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/test-utils/src/test/java/software/amazon/awssdk/testutils/MemoryTest.java b/test/test-utils/src/test/java/software/amazon/awssdk/testutils/MemoryTest.java
index 46b758ee0b87..f2de039256c6 100644
--- a/test/test-utils/src/test/java/software/amazon/awssdk/testutils/MemoryTest.java
+++ b/test/test-utils/src/test/java/software/amazon/awssdk/testutils/MemoryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/test-utils/src/test/java/software/amazon/awssdk/testutils/UnorderedCollectionComparatorTest.java b/test/test-utils/src/test/java/software/amazon/awssdk/testutils/UnorderedCollectionComparatorTest.java
index 3ed003d8bf94..b0c73783a769 100644
--- a/test/test-utils/src/test/java/software/amazon/awssdk/testutils/UnorderedCollectionComparatorTest.java
+++ b/test/test-utils/src/test/java/software/amazon/awssdk/testutils/UnorderedCollectionComparatorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/test-utils/src/test/java/software/amazon/awssdk/testutils/hamcrest/CollectionContainsOnlyInOrderTest.java b/test/test-utils/src/test/java/software/amazon/awssdk/testutils/hamcrest/CollectionContainsOnlyInOrderTest.java
index 7ff33ae3b757..597674423705 100644
--- a/test/test-utils/src/test/java/software/amazon/awssdk/testutils/hamcrest/CollectionContainsOnlyInOrderTest.java
+++ b/test/test-utils/src/test/java/software/amazon/awssdk/testutils/hamcrest/CollectionContainsOnlyInOrderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/test-utils/src/test/java/software/amazon/awssdk/testutils/hamcrest/CollectionContainsOnlyTest.java b/test/test-utils/src/test/java/software/amazon/awssdk/testutils/hamcrest/CollectionContainsOnlyTest.java
index 1ede5d83e89c..95d50af6cd33 100644
--- a/test/test-utils/src/test/java/software/amazon/awssdk/testutils/hamcrest/CollectionContainsOnlyTest.java
+++ b/test/test-utils/src/test/java/software/amazon/awssdk/testutils/hamcrest/CollectionContainsOnlyTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/test-utils/src/test/java/software/amazon/awssdk/testutils/retry/RetryableActionTest.java b/test/test-utils/src/test/java/software/amazon/awssdk/testutils/retry/RetryableActionTest.java
index 1ddea37eaf82..885c42ec0a63 100644
--- a/test/test-utils/src/test/java/software/amazon/awssdk/testutils/retry/RetryableActionTest.java
+++ b/test/test-utils/src/test/java/software/amazon/awssdk/testutils/retry/RetryableActionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/test-utils/src/test/java/software/amazon/awssdk/testutils/retry/RetryableAssertionTest.java b/test/test-utils/src/test/java/software/amazon/awssdk/testutils/retry/RetryableAssertionTest.java
index fe45bf706daf..80fbcb83e225 100644
--- a/test/test-utils/src/test/java/software/amazon/awssdk/testutils/retry/RetryableAssertionTest.java
+++ b/test/test-utils/src/test/java/software/amazon/awssdk/testutils/retry/RetryableAssertionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/test-utils/src/test/java/software/amazon/awssdk/testutils/smoketest/ReflectionUtilsTest.java b/test/test-utils/src/test/java/software/amazon/awssdk/testutils/smoketest/ReflectionUtilsTest.java
index 6779cd820ff7..51696359e240 100644
--- a/test/test-utils/src/test/java/software/amazon/awssdk/testutils/smoketest/ReflectionUtilsTest.java
+++ b/test/test-utils/src/test/java/software/amazon/awssdk/testutils/smoketest/ReflectionUtilsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/test/tests-coverage-reporting/pom.xml b/test/tests-coverage-reporting/pom.xml
index 21043d18fe46..a0c3bb2cc33c 100644
--- a/test/tests-coverage-reporting/pom.xml
+++ b/test/tests-coverage-reporting/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>aws-sdk-java-pom</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -147,6 +147,11 @@
             <groupId>software.amazon.awssdk</groupId>
             <version>${awsjavasdk.version}</version>
         </dependency>
+        <dependency>
+            <artifactId>dynamodb-enhanced</artifactId>
+            <groupId>software.amazon.awssdk</groupId>
+            <version>${awsjavasdk.version}-PREVIEW</version>
+        </dependency>
 
         <!-- Need to explicitly add service modules to aggregate the tests coverage
         and a few services that we know with more tests should be sufficient
diff --git a/utils/pom.xml b/utils/pom.xml
index ad41134cfd11..9bd146a01696 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~ 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.
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>aws-sdk-java-pom</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.10.7-SNAPSHOT</version>
+        <version>2.11.8-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/utils/src/main/java/software/amazon/awssdk/utils/AttributeMap.java b/utils/src/main/java/software/amazon/awssdk/utils/AttributeMap.java
index dc4e6fd02f9f..32169bd3bc0c 100644
--- a/utils/src/main/java/software/amazon/awssdk/utils/AttributeMap.java
+++ b/utils/src/main/java/software/amazon/awssdk/utils/AttributeMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/utils/src/main/java/software/amazon/awssdk/utils/BinaryUtils.java b/utils/src/main/java/software/amazon/awssdk/utils/BinaryUtils.java
index 8737b88d0514..6724b773be05 100644
--- a/utils/src/main/java/software/amazon/awssdk/utils/BinaryUtils.java
+++ b/utils/src/main/java/software/amazon/awssdk/utils/BinaryUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -28,6 +28,7 @@
  */
 @SdkProtectedApi
 public final class BinaryUtils {
+    private static final byte[] EMPTY_BYTE_ARRAY = new byte[0];
 
     private BinaryUtils() {
     }
@@ -150,6 +151,29 @@ public static byte[] copyAllBytesFrom(ByteBuffer bb) {
         return dst;
     }
 
+    public static byte[] copyRemainingBytesFrom(ByteBuffer bb) {
+        if (bb == null) {
+            return null;
+        }
+
+        if (!bb.hasRemaining()) {
+            return EMPTY_BYTE_ARRAY;
+        }
+
+        if (bb.hasArray()) {
+            int endIdx = bb.arrayOffset() + bb.limit();
+            int startIdx = endIdx - bb.remaining();
+            return Arrays.copyOfRange(bb.array(), startIdx, endIdx);
+        }
+
+        ByteBuffer copy = bb.asReadOnlyBuffer();
+
+        byte[] dst = new byte[copy.remaining()];
+        copy.get(dst);
+
+        return dst;
+    }
+
     /**
      * Returns a copy of the bytes from the given <code>ByteBuffer</code>,
      * ranging from the the buffer's current position to the buffer's limit; or
diff --git a/utils/src/main/java/software/amazon/awssdk/utils/CollectionUtils.java b/utils/src/main/java/software/amazon/awssdk/utils/CollectionUtils.java
index 36300d4cace1..2931eb231de4 100644
--- a/utils/src/main/java/software/amazon/awssdk/utils/CollectionUtils.java
+++ b/utils/src/main/java/software/amazon/awssdk/utils/CollectionUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -48,7 +48,7 @@ public static boolean isNullOrEmpty(Map<?, ?> map) {
      * Returns a new list containing the second list appended to the first list.
      */
     public static <T> List<T> mergeLists(List<T> list1, List<T> list2) {
-        List<T> merged = new LinkedList<T>();
+        List<T> merged = new LinkedList<>();
         if (list1 != null) {
             merged.addAll(list1);
         }
diff --git a/utils/src/main/java/software/amazon/awssdk/utils/ComparableUtils.java b/utils/src/main/java/software/amazon/awssdk/utils/ComparableUtils.java
index b06be754c850..eb9ea323d18a 100644
--- a/utils/src/main/java/software/amazon/awssdk/utils/ComparableUtils.java
+++ b/utils/src/main/java/software/amazon/awssdk/utils/ComparableUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -20,7 +20,8 @@
 
 @SdkProtectedApi
 public final class ComparableUtils {
-    private ComparableUtils() {}
+    private ComparableUtils() {
+    }
 
     /**
      * Does a safe comparison of two {@link Comparable} objects accounting for nulls
diff --git a/utils/src/main/java/software/amazon/awssdk/utils/CompletableFutureUtils.java b/utils/src/main/java/software/amazon/awssdk/utils/CompletableFutureUtils.java
index 5b208d6b6a7c..e679b9e9fe60 100644
--- a/utils/src/main/java/software/amazon/awssdk/utils/CompletableFutureUtils.java
+++ b/utils/src/main/java/software/amazon/awssdk/utils/CompletableFutureUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -17,7 +17,6 @@
 
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionException;
-
 import software.amazon.awssdk.annotations.SdkProtectedApi;
 
 /**
diff --git a/utils/src/main/java/software/amazon/awssdk/utils/DaemonThreadFactory.java b/utils/src/main/java/software/amazon/awssdk/utils/DaemonThreadFactory.java
index 43f9b74fa9dc..2666f4a09f2d 100644
--- a/utils/src/main/java/software/amazon/awssdk/utils/DaemonThreadFactory.java
+++ b/utils/src/main/java/software/amazon/awssdk/utils/DaemonThreadFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/utils/src/main/java/software/amazon/awssdk/utils/DateUtils.java b/utils/src/main/java/software/amazon/awssdk/utils/DateUtils.java
index 3cce546af00c..eeb2ca168181 100644
--- a/utils/src/main/java/software/amazon/awssdk/utils/DateUtils.java
+++ b/utils/src/main/java/software/amazon/awssdk/utils/DateUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/utils/src/main/java/software/amazon/awssdk/utils/Either.java b/utils/src/main/java/software/amazon/awssdk/utils/Either.java
index bb397d8e15d6..c1d08b570fe9 100644
--- a/utils/src/main/java/software/amazon/awssdk/utils/Either.java
+++ b/utils/src/main/java/software/amazon/awssdk/utils/Either.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/utils/src/main/java/software/amazon/awssdk/utils/ExecutorUtils.java b/utils/src/main/java/software/amazon/awssdk/utils/ExecutorUtils.java
index c85da879ba8d..6e52bb667e4c 100644
--- a/utils/src/main/java/software/amazon/awssdk/utils/ExecutorUtils.java
+++ b/utils/src/main/java/software/amazon/awssdk/utils/ExecutorUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -28,7 +28,8 @@
  */
 @SdkProtectedApi
 public final class ExecutorUtils {
-    private ExecutorUtils() {}
+    private ExecutorUtils() {
+    }
 
     /**
      * Create a bounded-queue executor with one thread for performing background tasks. The thread in the service is marked as a
diff --git a/utils/src/main/java/software/amazon/awssdk/utils/FunctionalUtils.java b/utils/src/main/java/software/amazon/awssdk/utils/FunctionalUtils.java
index 1e61f50c922a..1fb02de2d258 100644
--- a/utils/src/main/java/software/amazon/awssdk/utils/FunctionalUtils.java
+++ b/utils/src/main/java/software/amazon/awssdk/utils/FunctionalUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/utils/src/main/java/software/amazon/awssdk/utils/ImmutableMap.java b/utils/src/main/java/software/amazon/awssdk/utils/ImmutableMap.java
index 06ccbe605574..8a5614a4e343 100644
--- a/utils/src/main/java/software/amazon/awssdk/utils/ImmutableMap.java
+++ b/utils/src/main/java/software/amazon/awssdk/utils/ImmutableMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -279,7 +279,7 @@ public static class Builder<K, V> {
         private final Map<K, V> entries;
 
         public Builder() {
-            this.entries = new HashMap<K, V>();
+            this.entries = new HashMap<>();
         }
 
         /**
diff --git a/utils/src/main/java/software/amazon/awssdk/utils/IoUtils.java b/utils/src/main/java/software/amazon/awssdk/utils/IoUtils.java
index fc487e2a9e69..cdc44a270b40 100644
--- a/utils/src/main/java/software/amazon/awssdk/utils/IoUtils.java
+++ b/utils/src/main/java/software/amazon/awssdk/utils/IoUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -41,16 +41,13 @@ private IoUtils() {
      * Caller is responsible for closing the given input stream.
      */
     public static byte[] toByteArray(InputStream is) throws IOException {
-        ByteArrayOutputStream output = new ByteArrayOutputStream();
-        try {
+        try (ByteArrayOutputStream output = new ByteArrayOutputStream()) {
             byte[] b = new byte[BUFFER_SIZE];
             int n = 0;
             while ((n = is.read(b)) != -1) {
                 output.write(b, 0, n);
             }
             return output.toByteArray();
-        } finally {
-            output.close();
         }
     }
 
diff --git a/utils/src/main/java/software/amazon/awssdk/utils/JavaSystemSetting.java b/utils/src/main/java/software/amazon/awssdk/utils/JavaSystemSetting.java
index 0ee5966d4b1a..67b88c0ba375 100644
--- a/utils/src/main/java/software/amazon/awssdk/utils/JavaSystemSetting.java
+++ b/utils/src/main/java/software/amazon/awssdk/utils/JavaSystemSetting.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/utils/src/main/java/software/amazon/awssdk/utils/Lazy.java b/utils/src/main/java/software/amazon/awssdk/utils/Lazy.java
new file mode 100644
index 000000000000..6923ab8a0bd9
--- /dev/null
+++ b/utils/src/main/java/software/amazon/awssdk/utils/Lazy.java
@@ -0,0 +1,56 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.utils;
+
+import java.util.function.Supplier;
+import software.amazon.awssdk.annotations.SdkPublicApi;
+
+/**
+ * A class that lazily constructs a value the first time {@link #getValue()} is invoked.
+ */
+@SdkPublicApi
+public class Lazy<T> {
+    private final Supplier<T> initializer;
+
+    private volatile T value;
+
+    public Lazy(Supplier<T> initializer) {
+        this.initializer = initializer;
+    }
+
+    public T getValue() {
+        T result = value;
+        if (result == null) {
+            synchronized (this) {
+                result = value;
+                if (result == null) {
+                    result = initializer.get();
+                    value = result;
+                }
+            }
+        }
+
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        T value = this.value;
+        return ToString.builder("Lazy")
+                       .add("value", value == null ? "Uninitialized" : value)
+                       .build();
+    }
+}
diff --git a/utils/src/main/java/software/amazon/awssdk/utils/Logger.java b/utils/src/main/java/software/amazon/awssdk/utils/Logger.java
index a914f2f55fab..08f895496982 100644
--- a/utils/src/main/java/software/amazon/awssdk/utils/Logger.java
+++ b/utils/src/main/java/software/amazon/awssdk/utils/Logger.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/utils/src/main/java/software/amazon/awssdk/utils/Md5Utils.java b/utils/src/main/java/software/amazon/awssdk/utils/Md5Utils.java
index c8859d4cff0a..e01425132ff9 100644
--- a/utils/src/main/java/software/amazon/awssdk/utils/Md5Utils.java
+++ b/utils/src/main/java/software/amazon/awssdk/utils/Md5Utils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/utils/src/main/java/software/amazon/awssdk/utils/NamedThreadFactory.java b/utils/src/main/java/software/amazon/awssdk/utils/NamedThreadFactory.java
index fa683dfec008..8e043357d1e4 100644
--- a/utils/src/main/java/software/amazon/awssdk/utils/NamedThreadFactory.java
+++ b/utils/src/main/java/software/amazon/awssdk/utils/NamedThreadFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/utils/src/main/java/software/amazon/awssdk/utils/NumericUtils.java b/utils/src/main/java/software/amazon/awssdk/utils/NumericUtils.java
index 39be54c76cf6..47aab28f2b7a 100644
--- a/utils/src/main/java/software/amazon/awssdk/utils/NumericUtils.java
+++ b/utils/src/main/java/software/amazon/awssdk/utils/NumericUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -15,6 +15,7 @@
 
 package software.amazon.awssdk.utils;
 
+import java.time.Duration;
 import software.amazon.awssdk.annotations.SdkProtectedApi;
 
 @SdkProtectedApi
@@ -41,4 +42,12 @@ public static int saturatedCast(long value) {
         return (int) value;
     }
 
+    public static Duration min(Duration a, Duration b) {
+        return (a.compareTo(b) < 0) ? a : b;
+    }
+
+    public static Duration max(Duration a, Duration b) {
+        return (a.compareTo(b) > 0) ? a : b;
+    }
+
 }
diff --git a/utils/src/main/java/software/amazon/awssdk/utils/OptionalUtils.java b/utils/src/main/java/software/amazon/awssdk/utils/OptionalUtils.java
index 0f079f488fc2..6225f597bc8c 100644
--- a/utils/src/main/java/software/amazon/awssdk/utils/OptionalUtils.java
+++ b/utils/src/main/java/software/amazon/awssdk/utils/OptionalUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -27,7 +27,8 @@ public final class OptionalUtils {
     /**
      * This class should be used statically.
      */
-    private OptionalUtils() {}
+    private OptionalUtils() {
+    }
 
     /**
      * Attempt to find a present-valued optional in a list of optionals.
diff --git a/utils/src/main/java/software/amazon/awssdk/utils/Pair.java b/utils/src/main/java/software/amazon/awssdk/utils/Pair.java
index 7cf82f43eb03..e02202f24baa 100644
--- a/utils/src/main/java/software/amazon/awssdk/utils/Pair.java
+++ b/utils/src/main/java/software/amazon/awssdk/utils/Pair.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/utils/src/main/java/software/amazon/awssdk/utils/Platform.java b/utils/src/main/java/software/amazon/awssdk/utils/Platform.java
index 63f2ee2e933d..6a14b59bf5b4 100644
--- a/utils/src/main/java/software/amazon/awssdk/utils/Platform.java
+++ b/utils/src/main/java/software/amazon/awssdk/utils/Platform.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -19,7 +19,8 @@
 
 @SdkProtectedApi
 public class Platform {
-    private Platform() {}
+    private Platform() {
+    }
  
     /**
      * Determine whether the current operation system seems to be Windows.
diff --git a/utils/src/main/java/software/amazon/awssdk/utils/ProxySystemSetting.java b/utils/src/main/java/software/amazon/awssdk/utils/ProxySystemSetting.java
index d443189de822..52362dc33d17 100644
--- a/utils/src/main/java/software/amazon/awssdk/utils/ProxySystemSetting.java
+++ b/utils/src/main/java/software/amazon/awssdk/utils/ProxySystemSetting.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/utils/src/main/java/software/amazon/awssdk/utils/ReflectionMethodInvoker.java b/utils/src/main/java/software/amazon/awssdk/utils/ReflectionMethodInvoker.java
index 987a6f1185d0..5523b6e63fd0 100644
--- a/utils/src/main/java/software/amazon/awssdk/utils/ReflectionMethodInvoker.java
+++ b/utils/src/main/java/software/amazon/awssdk/utils/ReflectionMethodInvoker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/utils/src/main/java/software/amazon/awssdk/utils/SdkAutoCloseable.java b/utils/src/main/java/software/amazon/awssdk/utils/SdkAutoCloseable.java
index 933e4414b3bc..5e3f9b946337 100644
--- a/utils/src/main/java/software/amazon/awssdk/utils/SdkAutoCloseable.java
+++ b/utils/src/main/java/software/amazon/awssdk/utils/SdkAutoCloseable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/utils/src/main/java/software/amazon/awssdk/utils/StringInputStream.java b/utils/src/main/java/software/amazon/awssdk/utils/StringInputStream.java
index 7b66bedb47a2..f0d595c681e3 100644
--- a/utils/src/main/java/software/amazon/awssdk/utils/StringInputStream.java
+++ b/utils/src/main/java/software/amazon/awssdk/utils/StringInputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/utils/src/main/java/software/amazon/awssdk/utils/StringUtils.java b/utils/src/main/java/software/amazon/awssdk/utils/StringUtils.java
index 0c41b1845f79..5ed50d28b492 100644
--- a/utils/src/main/java/software/amazon/awssdk/utils/StringUtils.java
+++ b/utils/src/main/java/software/amazon/awssdk/utils/StringUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -606,7 +606,6 @@ public static String replacePrefixIgnoreCase(String str, String prefix, String r
         return str.replaceFirst("(?i)" + prefix, replacement);
     }
 
-
     /**
      * Searches a string for the first occurrence of a character specified by a list of characters.
      * @param s The string to search.
@@ -625,4 +624,18 @@ public static Character findFirstOccurrence(String s, char ...charsToMatch) {
 
         return lowestIndex == Integer.MAX_VALUE ? null : s.charAt(lowestIndex);
     }
-}
+
+    /**
+     * Convert a string to boolean safely (as opposed to the less strict {@link Boolean#parseBoolean(String)}). If a customer
+     * specifies a boolean value it should be "true" or "false" (case insensitive) or an exception will be thrown.
+     */
+    public static boolean safeStringToBoolean(String value) {
+        if (value.equalsIgnoreCase("true")) {
+            return true;
+        } else if (value.equalsIgnoreCase("false")) {
+            return false;
+        }
+
+        throw new IllegalArgumentException("Value was defined as '" + value + "', but should be 'false' or 'true'");
+    }
+}
\ No newline at end of file
diff --git a/utils/src/main/java/software/amazon/awssdk/utils/SystemSetting.java b/utils/src/main/java/software/amazon/awssdk/utils/SystemSetting.java
index d58d0562796f..c5e3dff8df86 100644
--- a/utils/src/main/java/software/amazon/awssdk/utils/SystemSetting.java
+++ b/utils/src/main/java/software/amazon/awssdk/utils/SystemSetting.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -67,6 +67,32 @@ default String getStringValueOrThrow() {
                                           + "property " + property() + " must be set."));
     }
 
+    /**
+     * Attempt to load a system setting from {@link System#getProperty(String)} and {@link System#getenv(String)}. This should be
+     * used in favor of those methods because the SDK should support both methods of configuration.
+     *
+     * The result will be converted to an integer.
+     *
+     * {@link System#getProperty(String)} takes precedent over {@link System#getenv(String)} if both are specified.
+     *
+     * @return The requested setting, or {@link Optional#empty()} if the values were not set, or the security manager did not
+     *         allow reading the setting.
+     */
+    default Optional<Integer> getIntegerValue() {
+        return getStringValue().map(Integer::parseInt);
+    }
+
+
+    /**
+     * Load the requested system setting as per the documentation in {@link #getIntegerValue()}, throwing an exception if the
+     * value was not set and had no default.
+     *
+     * @return The requested setting.
+     */
+    default Integer getIntegerValueOrThrow() {
+        return Integer.parseInt(getStringValueOrThrow());
+    }
+
     /**
      * Attempt to load a system setting from {@link System#getProperty(String)} and {@link System#getenv(String)}. This should be
      * used in favor of those methods because the SDK should support both methods of configuration.
diff --git a/utils/src/main/java/software/amazon/awssdk/utils/ThreadFactoryBuilder.java b/utils/src/main/java/software/amazon/awssdk/utils/ThreadFactoryBuilder.java
index 6909fe4b2335..606d6aaa0bea 100644
--- a/utils/src/main/java/software/amazon/awssdk/utils/ThreadFactoryBuilder.java
+++ b/utils/src/main/java/software/amazon/awssdk/utils/ThreadFactoryBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/utils/src/main/java/software/amazon/awssdk/utils/ToString.java b/utils/src/main/java/software/amazon/awssdk/utils/ToString.java
index 5dec11985066..6b6fbbbe7a55 100644
--- a/utils/src/main/java/software/amazon/awssdk/utils/ToString.java
+++ b/utils/src/main/java/software/amazon/awssdk/utils/ToString.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/utils/src/main/java/software/amazon/awssdk/utils/Validate.java b/utils/src/main/java/software/amazon/awssdk/utils/Validate.java
index 960aa9d455ab..22f326ca6891 100644
--- a/utils/src/main/java/software/amazon/awssdk/utils/Validate.java
+++ b/utils/src/main/java/software/amazon/awssdk/utils/Validate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -643,6 +643,36 @@ public static Duration isPositiveOrNull(Duration duration, String fieldName) {
         return isPositive(duration, fieldName);
     }
 
+    /**
+     * Asserts that the given boxed integer is positive (non-negative and non-zero) or null.
+     *
+     * @param num Boxed integer to validate
+     * @param fieldName Field name to display in exception message if not positive.
+     * @return Duration if positive or null.
+     */
+    public static Integer isPositiveOrNull(Integer num, String fieldName) {
+        if (num == null) {
+            return null;
+        }
+
+        return isPositive(num, fieldName);
+    }
+
+    /**
+     * Asserts that the given boxed long is positive (non-negative and non-zero) or null.
+     *
+     * @param num Boxed long to validate
+     * @param fieldName Field name to display in exception message if not positive.
+     * @return Duration if positive or null.
+     */
+    public static Long isPositiveOrNull(Long num, String fieldName) {
+        if (num == null) {
+            return null;
+        }
+
+        return isPositive(num, fieldName);
+    }
+
     /**
      * Asserts that the given duration is positive (non-negative and non-zero).
      *
diff --git a/utils/src/main/java/software/amazon/awssdk/utils/async/BufferingSubscriber.java b/utils/src/main/java/software/amazon/awssdk/utils/async/BufferingSubscriber.java
index 568e0ca81d2f..8917aa29cea1 100644
--- a/utils/src/main/java/software/amazon/awssdk/utils/async/BufferingSubscriber.java
+++ b/utils/src/main/java/software/amazon/awssdk/utils/async/BufferingSubscriber.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/utils/src/main/java/software/amazon/awssdk/utils/async/DelegatingSubscriber.java b/utils/src/main/java/software/amazon/awssdk/utils/async/DelegatingSubscriber.java
index 8b5c7391ba19..72b2fbe9269c 100644
--- a/utils/src/main/java/software/amazon/awssdk/utils/async/DelegatingSubscriber.java
+++ b/utils/src/main/java/software/amazon/awssdk/utils/async/DelegatingSubscriber.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/utils/src/main/java/software/amazon/awssdk/utils/async/DelegatingSubscription.java b/utils/src/main/java/software/amazon/awssdk/utils/async/DelegatingSubscription.java
index 32689e3813e9..141776587b70 100644
--- a/utils/src/main/java/software/amazon/awssdk/utils/async/DelegatingSubscription.java
+++ b/utils/src/main/java/software/amazon/awssdk/utils/async/DelegatingSubscription.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/utils/src/main/java/software/amazon/awssdk/utils/async/FilteringSubscriber.java b/utils/src/main/java/software/amazon/awssdk/utils/async/FilteringSubscriber.java
index bde08af7e7a7..d054ab632e51 100644
--- a/utils/src/main/java/software/amazon/awssdk/utils/async/FilteringSubscriber.java
+++ b/utils/src/main/java/software/amazon/awssdk/utils/async/FilteringSubscriber.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/utils/src/main/java/software/amazon/awssdk/utils/async/FlatteningSubscriber.java b/utils/src/main/java/software/amazon/awssdk/utils/async/FlatteningSubscriber.java
index a2cd0bd0f1ef..08c11556a836 100644
--- a/utils/src/main/java/software/amazon/awssdk/utils/async/FlatteningSubscriber.java
+++ b/utils/src/main/java/software/amazon/awssdk/utils/async/FlatteningSubscriber.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/utils/src/main/java/software/amazon/awssdk/utils/async/LimitingSubscriber.java b/utils/src/main/java/software/amazon/awssdk/utils/async/LimitingSubscriber.java
index a4b35876f682..f83e1f7a9fb2 100644
--- a/utils/src/main/java/software/amazon/awssdk/utils/async/LimitingSubscriber.java
+++ b/utils/src/main/java/software/amazon/awssdk/utils/async/LimitingSubscriber.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/utils/src/main/java/software/amazon/awssdk/utils/async/SequentialSubscriber.java b/utils/src/main/java/software/amazon/awssdk/utils/async/SequentialSubscriber.java
index 87297dff8efe..e66afb50d2bd 100644
--- a/utils/src/main/java/software/amazon/awssdk/utils/async/SequentialSubscriber.java
+++ b/utils/src/main/java/software/amazon/awssdk/utils/async/SequentialSubscriber.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/utils/src/main/java/software/amazon/awssdk/utils/builder/Buildable.java b/utils/src/main/java/software/amazon/awssdk/utils/builder/Buildable.java
index 961deea9f439..22b3f4115c15 100644
--- a/utils/src/main/java/software/amazon/awssdk/utils/builder/Buildable.java
+++ b/utils/src/main/java/software/amazon/awssdk/utils/builder/Buildable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/utils/src/main/java/software/amazon/awssdk/utils/builder/CopyableBuilder.java b/utils/src/main/java/software/amazon/awssdk/utils/builder/CopyableBuilder.java
index d0882d9984d3..9fa215b4a7ff 100644
--- a/utils/src/main/java/software/amazon/awssdk/utils/builder/CopyableBuilder.java
+++ b/utils/src/main/java/software/amazon/awssdk/utils/builder/CopyableBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/utils/src/main/java/software/amazon/awssdk/utils/builder/SdkBuilder.java b/utils/src/main/java/software/amazon/awssdk/utils/builder/SdkBuilder.java
index 4cbd82babaca..806dde79afd4 100644
--- a/utils/src/main/java/software/amazon/awssdk/utils/builder/SdkBuilder.java
+++ b/utils/src/main/java/software/amazon/awssdk/utils/builder/SdkBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/utils/src/main/java/software/amazon/awssdk/utils/builder/ToCopyableBuilder.java b/utils/src/main/java/software/amazon/awssdk/utils/builder/ToCopyableBuilder.java
index df2050687140..ec7d3a0dc312 100644
--- a/utils/src/main/java/software/amazon/awssdk/utils/builder/ToCopyableBuilder.java
+++ b/utils/src/main/java/software/amazon/awssdk/utils/builder/ToCopyableBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/utils/src/main/java/software/amazon/awssdk/utils/cache/CachedSupplier.java b/utils/src/main/java/software/amazon/awssdk/utils/cache/CachedSupplier.java
index 26b214297119..1d243aa0949c 100644
--- a/utils/src/main/java/software/amazon/awssdk/utils/cache/CachedSupplier.java
+++ b/utils/src/main/java/software/amazon/awssdk/utils/cache/CachedSupplier.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -202,6 +202,7 @@ public interface PrefetchStrategy extends SdkAutoCloseable {
          * Free any resources associated with the strategy. This is invoked when the {@link CachedSupplier#close()} method is
          * invoked.
          */
-        default void close() {}
+        default void close() {
+        }
     }
 }
diff --git a/utils/src/main/java/software/amazon/awssdk/utils/cache/NonBlocking.java b/utils/src/main/java/software/amazon/awssdk/utils/cache/NonBlocking.java
index 00c3c8c74bd6..afb4ba85675b 100644
--- a/utils/src/main/java/software/amazon/awssdk/utils/cache/NonBlocking.java
+++ b/utils/src/main/java/software/amazon/awssdk/utils/cache/NonBlocking.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/utils/src/main/java/software/amazon/awssdk/utils/cache/OneCallerBlocks.java b/utils/src/main/java/software/amazon/awssdk/utils/cache/OneCallerBlocks.java
index 3568900ae347..e0da620e582e 100644
--- a/utils/src/main/java/software/amazon/awssdk/utils/cache/OneCallerBlocks.java
+++ b/utils/src/main/java/software/amazon/awssdk/utils/cache/OneCallerBlocks.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/utils/src/main/java/software/amazon/awssdk/utils/cache/RefreshResult.java b/utils/src/main/java/software/amazon/awssdk/utils/cache/RefreshResult.java
index b7904d7265df..aa969a207bae 100644
--- a/utils/src/main/java/software/amazon/awssdk/utils/cache/RefreshResult.java
+++ b/utils/src/main/java/software/amazon/awssdk/utils/cache/RefreshResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/utils/src/main/java/software/amazon/awssdk/utils/http/SdkHttpUtils.java b/utils/src/main/java/software/amazon/awssdk/utils/http/SdkHttpUtils.java
index 2d738b13b37a..5263849188f7 100644
--- a/utils/src/main/java/software/amazon/awssdk/utils/http/SdkHttpUtils.java
+++ b/utils/src/main/java/software/amazon/awssdk/utils/http/SdkHttpUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -27,6 +27,7 @@
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Optional;
+import java.util.Set;
 import java.util.function.UnaryOperator;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -56,7 +57,18 @@ public final class SdkHttpUtils {
                             "|" +
                             Pattern.quote("%2F"));
 
-    private SdkHttpUtils() {}
+    // List of headers that may appear only once in a request; i.e. is not a list of values.
+    // Taken from https://github.com/apache/httpcomponents-client/blob/81c1bc4dc3ca5a3134c5c60e8beff08be2fd8792/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/HttpTestUtils.java#L69-L85 with modifications:
+    // removed: accept-ranges, if-match, if-none-match, vary since it looks like they're defined as lists
+    private static final Set<String> SINGLE_HEADERS = Stream.of("age", "authorization",
+            "content-length", "content-location", "content-md5", "content-range", "content-type",
+            "date", "etag", "expires", "from", "host", "if-modified-since", "if-range",
+            "if-unmodified-since", "last-modified", "location", "max-forwards",
+            "proxy-authorization", "range", "referer", "retry-after", "server", "user-agent")
+            .collect(Collectors.toSet());
+
+    private SdkHttpUtils() {
+    }
 
     /**
      * Encode a string according to RFC 3986: encoding for URI paths, query strings, etc.
@@ -297,4 +309,8 @@ public static Stream<String> allMatchingHeaders(Map<String, List<String>> header
     public static Optional<String> firstMatchingHeader(Map<String, List<String>> headers, String header) {
         return allMatchingHeaders(headers, header).findFirst();
     }
+
+    public static boolean isSingleHeader(String h) {
+        return SINGLE_HEADERS.contains(StringUtils.lowerCase(h));
+    }
 }
diff --git a/utils/src/main/java/software/amazon/awssdk/utils/internal/Base16.java b/utils/src/main/java/software/amazon/awssdk/utils/internal/Base16.java
index 325a2c79372b..dfd402d4a092 100644
--- a/utils/src/main/java/software/amazon/awssdk/utils/internal/Base16.java
+++ b/utils/src/main/java/software/amazon/awssdk/utils/internal/Base16.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/utils/src/main/java/software/amazon/awssdk/utils/internal/Base16Codec.java b/utils/src/main/java/software/amazon/awssdk/utils/internal/Base16Codec.java
index 81bef40e551b..ea0e5566f074 100644
--- a/utils/src/main/java/software/amazon/awssdk/utils/internal/Base16Codec.java
+++ b/utils/src/main/java/software/amazon/awssdk/utils/internal/Base16Codec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -77,7 +77,7 @@ protected int pos(byte in) {
         if (pos > -1) {
             return pos;
         }
-        throw new IllegalArgumentException("Invalid base 16 character: \'" + (char) in + "\'");
+        throw new IllegalArgumentException("Invalid base 16 character: '" + (char) in + "'");
     }
 
     private static class LazyHolder {
diff --git a/utils/src/main/java/software/amazon/awssdk/utils/internal/Base16Lower.java b/utils/src/main/java/software/amazon/awssdk/utils/internal/Base16Lower.java
index 6cb01bd6294d..cd8e76027f10 100644
--- a/utils/src/main/java/software/amazon/awssdk/utils/internal/Base16Lower.java
+++ b/utils/src/main/java/software/amazon/awssdk/utils/internal/Base16Lower.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/utils/src/main/java/software/amazon/awssdk/utils/internal/CodecUtils.java b/utils/src/main/java/software/amazon/awssdk/utils/internal/CodecUtils.java
index 12677d4c5a29..9da4ac850f1f 100644
--- a/utils/src/main/java/software/amazon/awssdk/utils/internal/CodecUtils.java
+++ b/utils/src/main/java/software/amazon/awssdk/utils/internal/CodecUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/utils/src/main/java/software/amazon/awssdk/utils/internal/CodegenNamingUtils.java b/utils/src/main/java/software/amazon/awssdk/utils/internal/CodegenNamingUtils.java
new file mode 100644
index 000000000000..6ffa5ca6ec6e
--- /dev/null
+++ b/utils/src/main/java/software/amazon/awssdk/utils/internal/CodegenNamingUtils.java
@@ -0,0 +1,69 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.utils.internal;
+
+import static java.util.stream.Collectors.joining;
+
+import java.util.stream.Stream;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.utils.StringUtils;
+
+/**
+ * Internal class used by the code generator and release scripts to produce sanitized names.
+ *
+ * In the future, we should consider adding a build-utils module for tools used at build time
+ * by multiple modules so that we don't have these at runtime when they aren't needed.
+ */
+@SdkInternalApi
+public final class CodegenNamingUtils {
+
+    private CodegenNamingUtils() {
+    }
+
+    public static String[] splitOnWordBoundaries(String toSplit) {
+        String result = toSplit;
+
+        // All non-alphanumeric characters are spaces
+        result = result.replaceAll("[^A-Za-z0-9]+", " "); // acm-success -> "acm success"
+
+        // If a number has a standalone v in front of it, separate it out (version).
+        result = result.replaceAll("([^a-z]{2,})v([0-9]+)", "$1 v$2 ") // TESTv4 -> "TEST v4 "
+                       .replaceAll("([^A-Z]{2,})V([0-9]+)", "$1 V$2 "); // TestV4 -> "Test V4 "
+
+        // Add a space between camelCased words
+        result = String.join(" ", result.split("(?<=[a-z])(?=[A-Z]([a-zA-Z]|[0-9]))")); // AcmSuccess -> // "Acm Success"
+
+        // Add a space after acronyms
+        result = result.replaceAll("([A-Z]+)([A-Z][a-z])", "$1 $2"); // ACMSuccess -> "ACM Success"
+
+        // Add space after a number in the middle of a word
+        result = result.replaceAll("([0-9])([a-zA-Z])", "$1 $2"); // s3ec2 -> "s3 ec2"
+
+        // Remove extra spaces - multiple consecutive ones or those and the beginning/end of words
+        result = result.replaceAll(" +", " ") // "Foo  Bar" -> "Foo Bar"
+                       .trim(); // " Foo " -> Foo
+
+        return result.split(" ");
+    }
+
+    public static String pascalCase(String word) {
+        return Stream.of(splitOnWordBoundaries(word)).map(StringUtils::lowerCase).map(StringUtils::capitalize).collect(joining());
+    }
+
+    public static String pascalCase(String... words) {
+        return Stream.of(words).map(StringUtils::lowerCase).map(StringUtils::capitalize).collect(joining());
+    }
+}
diff --git a/utils/src/main/java/software/amazon/awssdk/utils/internal/ReflectionUtils.java b/utils/src/main/java/software/amazon/awssdk/utils/internal/ReflectionUtils.java
new file mode 100644
index 000000000000..a5e81254bd83
--- /dev/null
+++ b/utils/src/main/java/software/amazon/awssdk/utils/internal/ReflectionUtils.java
@@ -0,0 +1,55 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.utils.internal;
+
+import java.util.Map;
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.utils.ImmutableMap;
+
+/**
+ * Utilities that assist with Java language reflection.
+ */
+@SdkInternalApi
+public final class ReflectionUtils {
+    private static final Map<Class<?>, Class<?>> PRIMITIVES_TO_WRAPPERS = new ImmutableMap.Builder<Class<?>, Class<?>>()
+        .put(boolean.class, Boolean.class)
+        .put(byte.class, Byte.class)
+        .put(char.class, Character.class)
+        .put(double.class, Double.class)
+        .put(float.class, Float.class)
+        .put(int.class, Integer.class)
+        .put(long.class, Long.class)
+        .put(short.class, Short.class)
+        .put(void.class, Void.class)
+        .build();
+
+    private ReflectionUtils() {
+    }
+
+    /**
+     * Returns the wrapped class type associated with a primitive if one is known.
+     * @param clazz The class to get the wrapped class for.
+     * @return If the input class is a primitive class, an associated non-primitive wrapped class type will be returned,
+     *         otherwise the same class will be returned indicating that no wrapping class is known.
+     */
+    public static Class<?> getWrappedClass(Class<?> clazz) {
+        if (!clazz.isPrimitive()) {
+            return clazz;
+        }
+
+        return PRIMITIVES_TO_WRAPPERS.getOrDefault(clazz, clazz);
+    }
+}
diff --git a/utils/src/main/java/software/amazon/awssdk/utils/internal/SystemSettingUtils.java b/utils/src/main/java/software/amazon/awssdk/utils/internal/SystemSettingUtils.java
index 50c406369fd7..5efc17d8c72d 100644
--- a/utils/src/main/java/software/amazon/awssdk/utils/internal/SystemSettingUtils.java
+++ b/utils/src/main/java/software/amazon/awssdk/utils/internal/SystemSettingUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -30,7 +30,8 @@
 public final class SystemSettingUtils {
     private static final Logger LOG = LoggerFactory.getLogger(SystemSettingUtils.class);
 
-    private SystemSettingUtils() {}
+    private SystemSettingUtils() {
+    }
 
     /**
      * Resolve the value of this system setting, loading it from the System by checking:
diff --git a/utils/src/test/java/software/amazon/awssdk/utils/AttributeMapTest.java b/utils/src/test/java/software/amazon/awssdk/utils/AttributeMapTest.java
index 3baec1b2c5de..b2f033c34278 100644
--- a/utils/src/test/java/software/amazon/awssdk/utils/AttributeMapTest.java
+++ b/utils/src/test/java/software/amazon/awssdk/utils/AttributeMapTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/utils/src/test/java/software/amazon/awssdk/utils/Base16CodecTest.java b/utils/src/test/java/software/amazon/awssdk/utils/Base16CodecTest.java
index b39afcd2cc3a..04d9d55b8d78 100644
--- a/utils/src/test/java/software/amazon/awssdk/utils/Base16CodecTest.java
+++ b/utils/src/test/java/software/amazon/awssdk/utils/Base16CodecTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/utils/src/test/java/software/amazon/awssdk/utils/Base16LowerCodecTest.java b/utils/src/test/java/software/amazon/awssdk/utils/Base16LowerCodecTest.java
index 159ec43400db..3c0ade83597e 100644
--- a/utils/src/test/java/software/amazon/awssdk/utils/Base16LowerCodecTest.java
+++ b/utils/src/test/java/software/amazon/awssdk/utils/Base16LowerCodecTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/utils/src/test/java/software/amazon/awssdk/utils/Base64UtilsCodecTest.java b/utils/src/test/java/software/amazon/awssdk/utils/Base64UtilsCodecTest.java
index fbdfe00d6b01..f15bec124719 100644
--- a/utils/src/test/java/software/amazon/awssdk/utils/Base64UtilsCodecTest.java
+++ b/utils/src/test/java/software/amazon/awssdk/utils/Base64UtilsCodecTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/utils/src/test/java/software/amazon/awssdk/utils/BinaryUtilsTest.java b/utils/src/test/java/software/amazon/awssdk/utils/BinaryUtilsTest.java
index ed2987ebc5f1..fcacdf221ef5 100644
--- a/utils/src/test/java/software/amazon/awssdk/utils/BinaryUtilsTest.java
+++ b/utils/src/test/java/software/amazon/awssdk/utils/BinaryUtilsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -15,6 +15,7 @@
 
 package software.amazon.awssdk.utils;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
@@ -159,4 +160,45 @@ public void testCopyBytesFrom_DirectByteBuffer_Idempotent() {
         assertTrue(partial1.length == 3);
         assertTrue(Arrays.equals(new byte[] {2, 3, 4}, partial1));
     }
+
+    @Test
+    public void testCopyRemainingBytesFrom_nullBuffer() {
+        assertThat(BinaryUtils.copyRemainingBytesFrom(null)).isNull();
+    }
+
+    @Test
+    public void testCopyRemainingBytesFrom_noRemainingBytes() {
+        ByteBuffer bb = ByteBuffer.allocate(1);
+        bb.put(new byte[]{1});
+        bb.flip();
+
+        bb.get();
+
+        assertThat(BinaryUtils.copyRemainingBytesFrom(bb)).hasSize(0);
+    }
+
+    @Test
+    public void testCopyRemainingBytesFrom_fullBuffer() {
+        ByteBuffer bb = ByteBuffer.allocate(4);
+        bb.put(new byte[]{1, 2, 3, 4});
+        bb.flip();
+
+        byte[] copy = BinaryUtils.copyRemainingBytesFrom(bb);
+        assertThat(bb).isEqualTo(ByteBuffer.wrap(copy));
+        assertThat(copy).hasSize(4);
+    }
+
+    @Test
+    public void testCopyRemainingBytesFrom_partiallyReadBuffer() {
+        ByteBuffer bb = ByteBuffer.allocate(4);
+        bb.put(new byte[]{1, 2, 3, 4});
+        bb.flip();
+
+        bb.get();
+        bb.get();
+
+        byte[] copy = BinaryUtils.copyRemainingBytesFrom(bb);
+        assertThat(bb).isEqualTo(ByteBuffer.wrap(copy));
+        assertThat(copy).hasSize(2);
+    }
 }
diff --git a/utils/src/test/java/software/amazon/awssdk/utils/CollectionUtilsTest.java b/utils/src/test/java/software/amazon/awssdk/utils/CollectionUtilsTest.java
index fa8c321bc908..b4fdc06e5110 100644
--- a/utils/src/test/java/software/amazon/awssdk/utils/CollectionUtilsTest.java
+++ b/utils/src/test/java/software/amazon/awssdk/utils/CollectionUtilsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/utils/src/test/java/software/amazon/awssdk/utils/ComparableUtilsTest.java b/utils/src/test/java/software/amazon/awssdk/utils/ComparableUtilsTest.java
index 38faec7b8bc5..bfc5fa003e68 100644
--- a/utils/src/test/java/software/amazon/awssdk/utils/ComparableUtilsTest.java
+++ b/utils/src/test/java/software/amazon/awssdk/utils/ComparableUtilsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/utils/src/test/java/software/amazon/awssdk/utils/CompletableFutureUtilsTest.java b/utils/src/test/java/software/amazon/awssdk/utils/CompletableFutureUtilsTest.java
index edac667a7c1c..14bea8844dc3 100644
--- a/utils/src/test/java/software/amazon/awssdk/utils/CompletableFutureUtilsTest.java
+++ b/utils/src/test/java/software/amazon/awssdk/utils/CompletableFutureUtilsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/utils/src/test/java/software/amazon/awssdk/utils/DateUtilsTest.java b/utils/src/test/java/software/amazon/awssdk/utils/DateUtilsTest.java
index c3aa7a5d3c91..cc9acf425e14 100644
--- a/utils/src/test/java/software/amazon/awssdk/utils/DateUtilsTest.java
+++ b/utils/src/test/java/software/amazon/awssdk/utils/DateUtilsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/utils/src/test/java/software/amazon/awssdk/utils/EitherTest.java b/utils/src/test/java/software/amazon/awssdk/utils/EitherTest.java
index 9f774f9a9d13..bf9fbc8cdeb6 100644
--- a/utils/src/test/java/software/amazon/awssdk/utils/EitherTest.java
+++ b/utils/src/test/java/software/amazon/awssdk/utils/EitherTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/utils/src/test/java/software/amazon/awssdk/utils/FunctionalUtilsTest.java b/utils/src/test/java/software/amazon/awssdk/utils/FunctionalUtilsTest.java
index 5212b89dc156..bc93d70034ad 100644
--- a/utils/src/test/java/software/amazon/awssdk/utils/FunctionalUtilsTest.java
+++ b/utils/src/test/java/software/amazon/awssdk/utils/FunctionalUtilsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/utils/src/test/java/software/amazon/awssdk/utils/ImmutableMapTest.java b/utils/src/test/java/software/amazon/awssdk/utils/ImmutableMapTest.java
index a9ae2caee38a..33703971b66b 100644
--- a/utils/src/test/java/software/amazon/awssdk/utils/ImmutableMapTest.java
+++ b/utils/src/test/java/software/amazon/awssdk/utils/ImmutableMapTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/utils/src/test/java/software/amazon/awssdk/utils/IoUtilsTest.java b/utils/src/test/java/software/amazon/awssdk/utils/IoUtilsTest.java
index 66879e227fa5..b3e5f499d2c1 100644
--- a/utils/src/test/java/software/amazon/awssdk/utils/IoUtilsTest.java
+++ b/utils/src/test/java/software/amazon/awssdk/utils/IoUtilsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/utils/src/test/java/software/amazon/awssdk/utils/LazyTest.java b/utils/src/test/java/software/amazon/awssdk/utils/LazyTest.java
new file mode 100644
index 000000000000..288f74ce9d38
--- /dev/null
+++ b/utils/src/test/java/software/amazon/awssdk/utils/LazyTest.java
@@ -0,0 +1,95 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.utils;
+
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.mockito.Mockito.times;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.function.Supplier;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mockito;
+
+public class LazyTest {
+    private Lazy<String> lazy;
+    private Supplier<String> mockDelegate;
+
+    @Before
+    public void setup() {
+        mockDelegate = Mockito.mock(Supplier.class);
+        lazy = new Lazy<>(mockDelegate);
+    }
+
+    @Test
+    public void delegateNotCalledOnCreation() {
+        Mockito.verifyZeroInteractions(mockDelegate);
+    }
+
+    @Test
+    public void nullIsNotCached() {
+        Mockito.when(mockDelegate.get()).thenReturn(null);
+        lazy.getValue();
+        lazy.getValue();
+        Mockito.verify(mockDelegate, times(2)).get();
+    }
+
+    @Test
+    public void exceptionsAreNotCached() {
+        IllegalStateException exception = new IllegalStateException();
+        Mockito.when(mockDelegate.get()).thenThrow(exception);
+        assertThatThrownBy(lazy::getValue).isEqualTo(exception);
+        assertThatThrownBy(lazy::getValue).isEqualTo(exception);
+        Mockito.verify(mockDelegate, times(2)).get();
+    }
+
+    @Test(timeout = 10_000)
+    public void delegateCalledOnlyOnce() throws Exception {
+        final int threads = 5;
+        ExecutorService executor = Executors.newFixedThreadPool(threads);
+        try {
+            for (int i = 0; i < 1000; ++i) {
+                mockDelegate = Mockito.mock(Supplier.class);
+                Mockito.when(mockDelegate.get()).thenReturn("");
+                lazy = new Lazy<>(mockDelegate);
+
+                CountDownLatch everyoneIsWaitingLatch = new CountDownLatch(threads);
+                CountDownLatch everyoneIsDoneLatch = new CountDownLatch(threads);
+                CountDownLatch callGetValueLatch = new CountDownLatch(1);
+
+                for (int j = 0; j < threads; ++j) {
+                    executor.submit(() -> {
+                        everyoneIsWaitingLatch.countDown();
+                        callGetValueLatch.await();
+                        lazy.getValue();
+                        everyoneIsDoneLatch.countDown();
+                        return null;
+                    });
+                }
+
+                everyoneIsWaitingLatch.await();
+                callGetValueLatch.countDown();
+                everyoneIsDoneLatch.await();
+
+                Mockito.verify(mockDelegate, times(1)).get();
+            }
+        } finally {
+            executor.shutdownNow();
+        }
+    }
+}
\ No newline at end of file
diff --git a/utils/src/test/java/software/amazon/awssdk/utils/Md5UtilsTest.java b/utils/src/test/java/software/amazon/awssdk/utils/Md5UtilsTest.java
index 588ef5c23308..0df5a8e4c3e7 100644
--- a/utils/src/test/java/software/amazon/awssdk/utils/Md5UtilsTest.java
+++ b/utils/src/test/java/software/amazon/awssdk/utils/Md5UtilsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/utils/src/test/java/software/amazon/awssdk/utils/NumericUtilsTest.java b/utils/src/test/java/software/amazon/awssdk/utils/NumericUtilsTest.java
new file mode 100644
index 000000000000..5f4a54b8f279
--- /dev/null
+++ b/utils/src/test/java/software/amazon/awssdk/utils/NumericUtilsTest.java
@@ -0,0 +1,85 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.utils;
+
+import java.time.Duration;
+
+import org.junit.Test;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.*;
+import static software.amazon.awssdk.utils.NumericUtils.max;
+import static software.amazon.awssdk.utils.NumericUtils.min;
+
+public class NumericUtilsTest {
+
+    private final Duration SHORT_DURATION = Duration.ofMillis(10);
+    private final Duration SHORT_SAME_DURATION = Duration.ofMillis(10);
+    private final Duration LONG_DURATION = Duration.ofMillis(100);
+    private final Duration NEGATIVE_SHORT_DURATION = Duration.ofMillis(-10);
+    private final Duration NEGATIVE_SHORT_SAME_DURATION = Duration.ofMillis(-10);
+    private final Duration NEGATIVE_LONG_DURATION = Duration.ofMillis(-100);
+
+    @Test
+    public void minTestDifferentDurations() {
+        assertThat(min(SHORT_DURATION, LONG_DURATION), is(SHORT_DURATION));
+    }
+
+    @Test
+    public void minTestDifferentDurationsReverse() {
+        assertThat(min(LONG_DURATION, SHORT_DURATION), is(SHORT_DURATION));
+    }
+
+    @Test
+    public void minTestSameDurations() {
+        assertThat(min(SHORT_DURATION, SHORT_SAME_DURATION), is(SHORT_SAME_DURATION));
+    }
+
+    @Test
+    public void minTestDifferentNegativeDurations() {
+        assertThat(min(NEGATIVE_SHORT_DURATION, NEGATIVE_LONG_DURATION), is(NEGATIVE_LONG_DURATION));
+    }
+
+    @Test
+    public void minTestNegativeSameDurations() {
+        assertThat(min(NEGATIVE_SHORT_DURATION, NEGATIVE_SHORT_SAME_DURATION), is(NEGATIVE_SHORT_DURATION));
+    }
+
+    @Test
+    public void maxTestDifferentDurations() {
+        assertThat(max(LONG_DURATION, SHORT_DURATION), is(LONG_DURATION));
+    }
+
+    @Test
+    public void maxTestDifferentDurationsReverse() {
+        assertThat(max(SHORT_DURATION, LONG_DURATION), is(LONG_DURATION));
+    }
+
+    @Test
+    public void maxTestSameDurations() {
+        assertThat(max(SHORT_DURATION, SHORT_SAME_DURATION), is(SHORT_SAME_DURATION));
+    }
+
+    @Test
+    public void maxTestDifferentNegativeDurations() {
+        assertThat(max(NEGATIVE_SHORT_DURATION, NEGATIVE_LONG_DURATION), is(NEGATIVE_SHORT_DURATION));
+    }
+
+    @Test
+    public void maxTestNegativeSameDurations() {
+        assertThat(max(NEGATIVE_SHORT_DURATION, NEGATIVE_SHORT_SAME_DURATION), is(NEGATIVE_SHORT_DURATION));
+    }
+}
\ No newline at end of file
diff --git a/utils/src/test/java/software/amazon/awssdk/utils/PairTest.java b/utils/src/test/java/software/amazon/awssdk/utils/PairTest.java
index aa8222cbe467..08ce26e62997 100644
--- a/utils/src/test/java/software/amazon/awssdk/utils/PairTest.java
+++ b/utils/src/test/java/software/amazon/awssdk/utils/PairTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/utils/src/test/java/software/amazon/awssdk/utils/ReflectionMethodInvokerTest.java b/utils/src/test/java/software/amazon/awssdk/utils/ReflectionMethodInvokerTest.java
index caf811e490f1..de1393eb9b89 100644
--- a/utils/src/test/java/software/amazon/awssdk/utils/ReflectionMethodInvokerTest.java
+++ b/utils/src/test/java/software/amazon/awssdk/utils/ReflectionMethodInvokerTest.java
@@ -1,11 +1,11 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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
+ *  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
diff --git a/utils/src/test/java/software/amazon/awssdk/utils/SdkHttpUtilsTest.java b/utils/src/test/java/software/amazon/awssdk/utils/SdkHttpUtilsTest.java
index ac0d9d6e233d..99accd9ac2b4 100644
--- a/utils/src/test/java/software/amazon/awssdk/utils/SdkHttpUtilsTest.java
+++ b/utils/src/test/java/software/amazon/awssdk/utils/SdkHttpUtilsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/utils/src/test/java/software/amazon/awssdk/utils/StringUtilsTest.java b/utils/src/test/java/software/amazon/awssdk/utils/StringUtilsTest.java
index 9caec555cdd8..151f3ba36f91 100644
--- a/utils/src/test/java/software/amazon/awssdk/utils/StringUtilsTest.java
+++ b/utils/src/test/java/software/amazon/awssdk/utils/StringUtilsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -21,6 +21,7 @@
 import static org.junit.Assert.assertTrue;
 import static software.amazon.awssdk.utils.StringUtils.replacePrefixIgnoreCase;
 
+import org.assertj.core.api.Assertions;
 import org.junit.Test;
 
 /**
@@ -135,4 +136,19 @@ public void findFirstOccurrence() {
     public void findFirstOccurrence_NoMatch() {
         assertNull(StringUtils.findFirstOccurrence("abc", ':'));
     }
+
+    @Test
+    public void safeStringTooBoolean_mixedSpaceTrue_shouldReturnTrue() {
+        assertTrue(StringUtils.safeStringToBoolean("TrUe"));
+    }
+
+    @Test
+    public void safeStringTooBoolean_mixedSpaceFalse_shouldReturnFalse() {
+        assertFalse(StringUtils.safeStringToBoolean("fAlSE"));
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void safeStringTooBoolean_invalidValue_shouldThrowException() {
+        assertFalse(StringUtils.safeStringToBoolean("foobar"));
+    }
 }
diff --git a/utils/src/test/java/software/amazon/awssdk/utils/ThreadFactoryBuilderTest.java b/utils/src/test/java/software/amazon/awssdk/utils/ThreadFactoryBuilderTest.java
index 359d9622f3bd..679e05fa8401 100644
--- a/utils/src/test/java/software/amazon/awssdk/utils/ThreadFactoryBuilderTest.java
+++ b/utils/src/test/java/software/amazon/awssdk/utils/ThreadFactoryBuilderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/utils/src/test/java/software/amazon/awssdk/utils/ToStringTest.java b/utils/src/test/java/software/amazon/awssdk/utils/ToStringTest.java
index 14e91f5a71dd..815b1c5c03b2 100644
--- a/utils/src/test/java/software/amazon/awssdk/utils/ToStringTest.java
+++ b/utils/src/test/java/software/amazon/awssdk/utils/ToStringTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/utils/src/test/java/software/amazon/awssdk/utils/ValidateTest.java b/utils/src/test/java/software/amazon/awssdk/utils/ValidateTest.java
index fbfc5f8c51d2..331248d0471c 100644
--- a/utils/src/test/java/software/amazon/awssdk/utils/ValidateTest.java
+++ b/utils/src/test/java/software/amazon/awssdk/utils/ValidateTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
@@ -16,6 +16,7 @@
 package software.amazon.awssdk.utils;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.fail;
 
@@ -25,7 +26,9 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.ExpectedException;
 
 /**
  * Unit tests {@link Validate}.
@@ -33,6 +36,8 @@
  * Adapted from https://github.com/apache/commons-lang.
  */
 public class ValidateTest  {
+    @Rule
+    public ExpectedException expected = ExpectedException.none();
 
     //-----------------------------------------------------------------------
     @Test
@@ -523,4 +528,53 @@ public void mutuallyExclusive_MultipleProvided_DoesNotThrow() {
         Validate.mutuallyExclusive("error", null, "foo", "bar");
     }
 
+    @Test
+    public void isPositiveOrNullInteger_null_returnsNull() {
+        assertNull(Validate.isPositiveOrNull((Integer) null, "foo"));
+    }
+
+    @Test
+    public void isPositiveOrNullInteger_positive_returnsInteger() {
+        Integer num = 42;
+        assertEquals(num, Validate.isPositiveOrNull(num, "foo"));
+    }
+
+    @Test
+    public void isPositiveOrNullInteger_zero_throws() {
+        expected.expect(IllegalArgumentException.class);
+        expected.expectMessage("foo");
+        Validate.isPositiveOrNull(0, "foo");
+    }
+
+    @Test
+    public void isPositiveOrNullInteger_negative_throws() {
+        expected.expect(IllegalArgumentException.class);
+        expected.expectMessage("foo");
+        Validate.isPositiveOrNull(-1, "foo");
+    }
+
+    @Test
+    public void isPositiveOrNullLong_null_returnsNull() {
+        assertNull(Validate.isPositiveOrNull((Long) null, "foo"));
+    }
+
+    @Test
+    public void isPositiveOrNullLong_positive_returnsInteger() {
+        Long num = 42L;
+        assertEquals(num, Validate.isPositiveOrNull(num, "foo"));
+    }
+
+    @Test
+    public void isPositiveOrNullLong_zero_throws() {
+        expected.expect(IllegalArgumentException.class);
+        expected.expectMessage("foo");
+        Validate.isPositiveOrNull(0L, "foo");
+    }
+
+    @Test
+    public void isPositiveOrNullLong_negative_throws() {
+        expected.expect(IllegalArgumentException.class);
+        expected.expectMessage("foo");
+        Validate.isPositiveOrNull(-1L, "foo");
+    }
 }
diff --git a/utils/src/test/java/software/amazon/awssdk/utils/async/BufferingSubscriberTest.java b/utils/src/test/java/software/amazon/awssdk/utils/async/BufferingSubscriberTest.java
index b2235d94295d..416019706d47 100644
--- a/utils/src/test/java/software/amazon/awssdk/utils/async/BufferingSubscriberTest.java
+++ b/utils/src/test/java/software/amazon/awssdk/utils/async/BufferingSubscriberTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/utils/src/test/java/software/amazon/awssdk/utils/builder/CopyableBuilderTest.java b/utils/src/test/java/software/amazon/awssdk/utils/builder/CopyableBuilderTest.java
index 07447eaf3c64..3583437f33e1 100644
--- a/utils/src/test/java/software/amazon/awssdk/utils/builder/CopyableBuilderTest.java
+++ b/utils/src/test/java/software/amazon/awssdk/utils/builder/CopyableBuilderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/utils/src/test/java/software/amazon/awssdk/utils/cache/CachedSupplierTest.java b/utils/src/test/java/software/amazon/awssdk/utils/cache/CachedSupplierTest.java
index e69c540590ef..dcd393b5f3c8 100644
--- a/utils/src/test/java/software/amazon/awssdk/utils/cache/CachedSupplierTest.java
+++ b/utils/src/test/java/software/amazon/awssdk/utils/cache/CachedSupplierTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 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.
diff --git a/utils/src/test/java/software/amazon/awssdk/utils/internal/ReflectionUtilsTest.java b/utils/src/test/java/software/amazon/awssdk/utils/internal/ReflectionUtilsTest.java
new file mode 100644
index 000000000000..96ed72b3e8f8
--- /dev/null
+++ b/utils/src/test/java/software/amazon/awssdk/utils/internal/ReflectionUtilsTest.java
@@ -0,0 +1,35 @@
+/*
+ * 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.
+ */
+
+package software.amazon.awssdk.utils.internal;
+
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+
+public class ReflectionUtilsTest {
+
+    @Test
+    public void getWrappedClass_primitiveClass_returnsWrappedClass() {
+        assertThat(ReflectionUtils.getWrappedClass(int.class), is(equalTo(Integer.class)));
+    }
+
+    @Test
+    public void getWrappedClass_nonPrimitiveClass_returnsSameClass() {
+        assertThat(ReflectionUtils.getWrappedClass(String.class), is(equalTo(String.class)));
+    }
+}
\ No newline at end of file